diff --git a/.configurations/configuration.dsc.yaml b/.configurations/configuration.dsc.yaml
index 780b1dfa959..c41f115aff9 100644
--- a/.configurations/configuration.dsc.yaml
+++ b/.configurations/configuration.dsc.yaml
@@ -18,17 +18,6 @@ properties:
         id: OpenJS.NodeJS.LTS
         version: "20.14.0"
         source: winget
-    - resource: NpmDsc/NpmPackage
-      id: yarn
-      dependsOn:
-        - npm
-      directives:
-        description: Install Yarn
-        allowPrerelease: true
-      settings:
-        Name: 'yarn'
-        Global: true
-        PackageDirectory: '${WinGetConfigRoot}\..\'
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       directives:
         description: Install Python 3.10
@@ -56,7 +45,7 @@ properties:
         includeRecommended: true
         components:
           - Microsoft.VisualStudio.Workload.VCTools
-    - resource: YarnDsc/YarnInstall
+    - resource: NpmDsc/NpmInstall
       dependsOn:
         - npm
       directives:
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 31d67db5fac..9be15a6afa1 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/typescript-node:18-bookworm
+FROM mcr.microsoft.com/devcontainers/typescript-node:20-bookworm
 
 ADD install-vscode.sh /root/
 RUN /root/install-vscode.sh
@@ -7,8 +7,8 @@ RUN git config --system codespaces-theme.hide-status 1
 
 USER node
 RUN npm install -g node-gyp
-RUN YARN_CACHE="$(yarn cache dir)" && rm -rf "$YARN_CACHE" && ln -s /vscode-dev/yarn-cache "$YARN_CACHE"
+RUN NPM_CACHE="$(npm config get cache)" && rm -rf "$NPM_CACHE" && ln -s /vscode-dev/npm-cache "$NPM_CACHE"
 RUN echo 'export DISPLAY="${DISPLAY:-:1}"' | tee -a ~/.bashrc >> ~/.zshrc
 
 USER root
-CMD chown node:node /vscode-dev && sudo -u node mkdir -p /vscode-dev/yarn-cache && sleep inf
+CMD chown node:node /vscode-dev && sudo -u node mkdir -p /vscode-dev/npm-cache && sleep inf
diff --git a/.devcontainer/README.md b/.devcontainer/README.md
index 44965693380..5f6e1cd99f3 100644
--- a/.devcontainer/README.md
+++ b/.devcontainer/README.md
@@ -24,7 +24,7 @@ If you already have VS Code and Docker installed, you can click the badge above
 
 4. Press <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> or <kbd>F1</kbd> and select **Dev Containers: Clone Repository in Container Volume...**.
 
-   > **Tip:** While you can use your local source tree instead, operations like `yarn install` can be slow on macOS or when using the Hyper-V engine on Windows. We recommend using the WSL filesystem on Windows or the "clone repository in container" approach on Windows and macOS instead since it uses "named volume" rather than the local filesystem.
+   > **Tip:** While you can use your local source tree instead, operations like `npm i` can be slow on macOS or when using the Hyper-V engine on Windows. We recommend using the WSL filesystem on Windows or the "clone repository in container" approach on Windows and macOS instead since it uses "named volume" rather than the local filesystem.
 
 5. Type `https://github.com/microsoft/vscode` (or a branch or PR URL) in the input box and press <kbd>Enter</kbd>.
 
@@ -85,7 +85,7 @@ To start working with Code - OSS, follow these steps:
 1. In your local VS Code client, open a terminal (<kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>\`</kbd>) and type the following commands:
 
    ```bash
-   yarn install
+   npm i
    bash scripts/code.sh
    ```
 
diff --git a/.devcontainer/devcontainer-lock.json b/.devcontainer/devcontainer-lock.json
index cbcde9bb109..fdd03c400cc 100644
--- a/.devcontainer/devcontainer-lock.json
+++ b/.devcontainer/devcontainer-lock.json
@@ -4,6 +4,11 @@
       "version": "1.0.8",
       "resolved": "ghcr.io/devcontainers/features/desktop-lite@sha256:e7dc4d37ab9e3d6e7ebb221bac741f5bfe07dae47025399d038b17af2ed8ddb7",
       "integrity": "sha256:e7dc4d37ab9e3d6e7ebb221bac741f5bfe07dae47025399d038b17af2ed8ddb7"
+    },
+    "ghcr.io/devcontainers/features/rust:1": {
+      "version": "1.1.3",
+      "resolved": "ghcr.io/devcontainers/features/rust@sha256:aba6f47303b197976902bf544c786b5efecc03c238ff593583e5e74dfa9c7ccb",
+      "integrity": "sha256:aba6f47303b197976902bf544c786b5efecc03c238ff593583e5e74dfa9c7ccb"
     }
   }
 }
\ No newline at end of file
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index f5adc4e1c46..75076a0f8b6 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -4,7 +4,8 @@
 		"dockerfile": "Dockerfile"
 	},
 	"features": {
-		"ghcr.io/devcontainers/features/desktop-lite:1": {}
+		"ghcr.io/devcontainers/features/desktop-lite:1": {},
+		"ghcr.io/devcontainers/features/rust:1": {}
 	},
 	"containerEnv": {
 		"DISPLAY": "" // Allow the Dev Containers extension to set DISPLAY, post-create.sh will add it back in ~/.bashrc and ~/.zshrc if not set.
diff --git a/.devcontainer/post-create.sh b/.devcontainer/post-create.sh
index 5b2deee6674..4e39a71c49d 100755
--- a/.devcontainer/post-create.sh
+++ b/.devcontainer/post-create.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-yarn install --network-timeout 180000
-yarn electron
+npm i
+npm run electron
diff --git a/.eslintignore b/.eslintignore
index 12da4a432e1..a742b0ae304 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -31,6 +31,7 @@
 **/src/vs/base/test/common/filters.perf.data.js
 **/src/vs/loader.js
 **/test/unit/assert.js
+**/test/unit/assert-esm.js
 **/test/automation/out/**
 **/typings/**
 !.vscode
diff --git a/.eslintplugin/code-ensure-no-disposables-leak-in-test.ts b/.eslintplugin/code-ensure-no-disposables-leak-in-test.ts
index ae3089036a6..9d3044f50f4 100644
--- a/.eslintplugin/code-ensure-no-disposables-leak-in-test.ts
+++ b/.eslintplugin/code-ensure-no-disposables-leak-in-test.ts
@@ -12,7 +12,8 @@ export = new class EnsureNoDisposablesAreLeakedInTestSuite implements eslint.Rul
 		type: 'problem',
 		messages: {
 			ensure: 'Suites should include a call to `ensureNoDisposablesAreLeakedInTestSuite()` to ensure no disposables are leaked in tests.'
-		}
+		},
+		fixable: 'code'
 	};
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
@@ -30,6 +31,10 @@ export = new class EnsureNoDisposablesAreLeakedInTestSuite implements eslint.Rul
 					context.report({
 						node,
 						messageId: 'ensure',
+						fix: (fixer) => {
+							const updatedSrc = src.replace(/(suite\(.*\n)/, '$1\n\tensureNoDisposablesAreLeakedInTestSuite();\n');
+							return fixer.replaceText(node, updatedSrc);
+						}
 					});
 				}
 			},
diff --git a/.eslintplugin/code-import-patterns.ts b/.eslintplugin/code-import-patterns.ts
index 1f08bb4a4e8..460409514bc 100644
--- a/.eslintplugin/code-import-patterns.ts
+++ b/.eslintplugin/code-import-patterns.ts
@@ -12,19 +12,19 @@ import { createImportRuleListener } from './utils';
 const REPO_ROOT = path.normalize(path.join(__dirname, '../'));
 
 interface ConditionalPattern {
-	when?: 'hasBrowser' | 'hasNode' | 'test';
+	when?: 'hasBrowser' | 'hasNode' | 'hasElectron' | 'test';
 	pattern: string;
 }
 
 interface RawImportPatternsConfig {
 	target: string;
-	layer?: 'common' | 'worker' | 'browser' | 'electron-sandbox' | 'node' | 'electron-main';
+	layer?: 'common' | 'worker' | 'browser' | 'electron-sandbox' | 'node' | 'electron-utility' | 'electron-main';
 	test?: boolean;
 	restrictions: string | (string | ConditionalPattern)[];
 }
 
 interface LayerAllowRule {
-	when: 'hasBrowser' | 'hasNode' | 'test';
+	when: 'hasBrowser' | 'hasNode' | 'hasElectron' | 'test';
 	allow: string[];
 }
 
@@ -44,7 +44,9 @@ 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/.eslintrc.json'
+			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'
@@ -77,13 +79,14 @@ export = new class implements eslint.Rule.RuleModule {
 			return this._optionsCache.get(options)!;
 		}
 
-		type Layer = 'common' | 'worker' | 'browser' | 'electron-sandbox' | 'node' | 'electron-main';
+		type Layer = 'common' | 'worker' | 'browser' | 'electron-sandbox' | 'node' | 'electron-utility' | 'electron-main';
 
 		interface ILayerRule {
 			layer: Layer;
 			deps: string;
 			isBrowser?: boolean;
 			isNode?: boolean;
+			isElectron?: boolean;
 		}
 
 		function orSegment(variants: Layer[]): string {
@@ -96,11 +99,13 @@ export = new class implements eslint.Rule.RuleModule {
 			{ layer: 'browser', deps: orSegment(['common', 'browser']), isBrowser: true },
 			{ layer: 'electron-sandbox', deps: orSegment(['common', 'browser', 'electron-sandbox']), isBrowser: true },
 			{ layer: 'node', deps: orSegment(['common', 'node']), isNode: true },
-			{ layer: 'electron-main', deps: orSegment(['common', 'node', 'electron-main']), isNode: true },
+			{ layer: 'electron-utility', deps: orSegment(['common', 'node', 'electron-utility']), isNode: true, isElectron: true },
+			{ layer: 'electron-main', deps: orSegment(['common', 'node', 'electron-utility', 'electron-main']), isNode: true, isElectron: true },
 		];
 
 		let browserAllow: string[] = [];
 		let nodeAllow: string[] = [];
+		let electronAllow: string[] = [];
 		let testAllow: string[] = [];
 		for (const option of options) {
 			if (isLayerAllowRule(option)) {
@@ -108,6 +113,8 @@ export = new class implements eslint.Rule.RuleModule {
 					browserAllow = option.allow.slice(0);
 				} else if (option.when === 'hasNode') {
 					nodeAllow = option.allow.slice(0);
+				} else if (option.when === 'hasElectron') {
+					electronAllow = option.allow.slice(0);
 				} else if (option.when === 'test') {
 					testAllow = option.allow.slice(0);
 				}
@@ -135,9 +142,13 @@ export = new class implements eslint.Rule.RuleModule {
 				restrictions.push(...nodeAllow);
 			}
 
+			if (layerRule.isElectron) {
+				restrictions.push(...electronAllow);
+			}
+
 			for (const rawRestriction of rawRestrictions) {
 				let importPattern: string;
-				let when: 'hasBrowser' | 'hasNode' | 'test' | undefined = undefined;
+				let when: 'hasBrowser' | 'hasNode' | 'hasElectron' | 'test' | undefined = undefined;
 				if (typeof rawRestriction === 'string') {
 					importPattern = rawRestriction;
 				} else {
@@ -147,6 +158,7 @@ export = new class implements eslint.Rule.RuleModule {
 				if (typeof when === 'undefined'
 					|| (when === 'hasBrowser' && layerRule.isBrowser)
 					|| (when === 'hasNode' && layerRule.isNode)
+					|| (when === 'hasElectron' && layerRule.isElectron)
 				) {
 					restrictions.push(importPattern.replace(/\/\~$/, `/${layerRule.deps}/**`));
 					testRestrictions.push(importPattern.replace(/\/\~$/, `/test/${layerRule.deps}/**`));
@@ -181,8 +193,8 @@ export = new class implements eslint.Rule.RuleModule {
 
 			if (targetIsVS) {
 				// Always add "vs/nls" and "vs/amdX"
-				restrictions.push('vs/nls');
-				restrictions.push('vs/amdX'); // TODO@jrieken remove after ESM is real
+				restrictions.push('vs/nls.js');
+				restrictions.push('vs/amdX.js'); // TODO@jrieken remove after ESM is real
 			}
 
 			if (targetIsVS && option.layer) {
@@ -212,6 +224,25 @@ export = new class implements eslint.Rule.RuleModule {
 	}
 
 	private _checkImport(context: eslint.Rule.RuleContext, config: ImportPatternsConfig, node: TSESTree.Node, importPath: string) {
+		const targetIsVS = /^src\/vs\//.test(getRelativeFilename(context));
+		if (targetIsVS) {
+
+			// ESM: check for import ending with ".js" or ".css"
+			if (importPath[0] === '.' && !importPath.endsWith('.js') && !importPath.endsWith('.css')) {
+				context.report({
+					loc: node.loc,
+					messageId: 'badExtension',
+				});
+			}
+
+			// check for import being relative
+			if (importPath.startsWith('vs/')) {
+				context.report({
+					loc: node.loc,
+					messageId: 'badAbsolute',
+				});
+			}
+		}
 
 		// resolve relative paths
 		if (importPath[0] === '.') {
diff --git a/.eslintplugin/code-limited-top-functions.ts b/.eslintplugin/code-limited-top-functions.ts
new file mode 100644
index 00000000000..97eef9a6e9d
--- /dev/null
+++ b/.eslintplugin/code-limited-top-functions.ts
@@ -0,0 +1,70 @@
+/*---------------------------------------------------------------------------------------------
+ *  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(', ')}.`
+						});
+					}
+				}
+			}
+		}
+	}
+};
diff --git a/.eslintplugin/code-no-look-behind-regex.ts b/.eslintplugin/code-no-look-behind-regex.ts
deleted file mode 100644
index 800b59b6479..00000000000
--- a/.eslintplugin/code-no-look-behind-regex.ts
+++ /dev/null
@@ -1,50 +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 { TSESTree } from '@typescript-eslint/experimental-utils';
-import * as ESTree from 'estree';
-
-//------------------------------------------------------------------------------
-// Rule Definition
-//------------------------------------------------------------------------------
-
-const _positiveLookBehind = /\(\?<=.+/;
-const _negativeLookBehind = /\(\?<!.+/;
-
-function _containsLookBehind(pattern: string | unknown): boolean {
-	if (typeof pattern !== 'string') {
-		return false;
-	}
-	return _positiveLookBehind.test(pattern) || _negativeLookBehind.test(pattern);
-}
-
-module.exports = {
-
-	create(context: eslint.Rule.RuleContext) {
-		return {
-			// /.../
-			['Literal[regex]']: (node: any) => {
-				type RegexLiteral = TSESTree.Literal & { regex: { pattern: string; flags: string } };
-				const pattern = (<RegexLiteral>node).regex?.pattern;
-				if (_containsLookBehind(pattern)) {
-					context.report({
-						node,
-						message: 'Look behind assertions are not yet supported in all browsers'
-					});
-				}
-			},
-			// new Regex("...")
-			['NewExpression[callee.name="RegExp"] Literal']: (node: ESTree.Literal) => {
-				if (_containsLookBehind(node.value)) {
-					context.report({
-						node,
-						message: 'Look behind assertions are not yet supported in all browsers'
-					});
-				}
-			}
-		};
-	}
-};
diff --git a/.eslintplugin/code-no-static-self-ref.ts b/.eslintplugin/code-no-static-self-ref.ts
new file mode 100644
index 00000000000..7c6e13032ae
--- /dev/null
+++ b/.eslintplugin/code-no-static-self-ref.ts
@@ -0,0 +1,56 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { TSESTree } from '@typescript-eslint/experimental-utils';
+
+/**
+ * WORKAROUND for https://github.com/evanw/esbuild/issues/3823
+ */
+export = new class implements eslint.Rule.RuleModule {
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+
+		function checkProperty(inNode: any) {
+
+			const classDeclaration = context.getAncestors().find(node => node.type === 'ClassDeclaration');
+			const propertyDefinition = <TSESTree.PropertyDefinition>inNode;
+
+			if (!classDeclaration || !classDeclaration.id?.name) {
+				return;
+			}
+
+			if (!propertyDefinition.value) {
+				return;
+			}
+
+			const classCtor = classDeclaration.body.body.find(node => node.type === 'MethodDefinition' && node.kind === 'constructor')
+
+			if (!classCtor) {
+				return;
+			}
+
+			const name = classDeclaration.id.name;
+			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
+				}
+
+				context.report({
+					loc: propertyDefinition.value.loc,
+					message: `Static properties in decorated classes should not reference the class they are defined in. Use 'this' instead. This is a workaround for https://github.com/evanw/esbuild/issues/3823.`
+				});
+			}
+
+		}
+
+		return {
+			'PropertyDefinition[static=true]': checkProperty,
+		};
+	}
+};
diff --git a/.eslintrc.json b/.eslintrc.json
index 1a9117cfaeb..89c0b00d8ce 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -92,9 +92,14 @@
 					"common",
 					"browser"
 				],
-				"electron-main": [
+				"electron-utility": [
 					"common",
 					"node"
+				],
+				"electron-main": [
+					"common",
+					"node",
+					"electron-utility"
 				]
 			}
 		],
@@ -141,6 +146,14 @@
 				]
 			}
 		},
+		{
+			"files": [
+				"src/**/*.ts"
+			],
+			"rules": {
+				"local/code-no-static-self-ref": "warn"
+			}
+		},
 		{
 			"files": [
 				"src/vs/**/*.test.ts"
@@ -603,12 +616,64 @@
 				]
 			}
 		},
+		{
+			"files": [
+				"src/**/electron-utility/**/*.ts"
+			],
+			"rules": {
+				"no-restricted-imports": [
+					"warn",
+					{
+						"paths": [
+							{
+								"name": "electron",
+								"importNames": [
+									"app",
+									"autoUpdater",
+									"BaseWindow",
+									"BrowserWindow",
+									"contentTracing",
+									"desktopCapturer",
+									"dialog",
+									"globalShortcut",
+									"inAppPurchase",
+									"ipcMain",
+									"Menu",
+									"MenuItem",
+									"MessageChannelMain",
+									"MessagePortMain",
+									"nativeTheme",
+									"netLog",
+									"Notification",
+									"powerMonitor",
+									"powerSaveBlocker",
+									"protocol",
+									"pushNotifications",
+									"safeStorage",
+									"screen",
+									"session",
+									"ShareMenu",
+									"TouchBar",
+									"Tray",
+									"utilityProcess",
+									"View",
+									"webContents",
+									"webFrameMain",
+									"webContentsView",
+									"default"
+								],
+								"message": "Only net and system-preferences are allowed to be imported from electron"
+							}
+						]
+					}
+				]
+			}
+		},
 		{
 			"files": [
 				"src/**/*.ts"
 			],
 			"rules": {
-				"local/code-no-look-behind-regex": "warn",
 				"local/code-import-patterns": [
 					"warn",
 					{
@@ -616,13 +681,12 @@
 						// - browser
 						// - electron-sandbox
 						"when": "hasBrowser",
-						"allow": [
-							"vs/css!./**/*"
-						]
+						"allow": []
 					},
 					{
 						// imports that are allowed in all files of layers:
 						// - node
+						// - electron-utility
 						// - electron-main
 						"when": "hasNode",
 						"allow": [
@@ -641,13 +705,13 @@
 							"cookie",
 							"crypto",
 							"dns",
-							"electron",
 							"events",
 							"fs",
 							"fs/promises",
 							"http",
 							"https",
 							"minimist",
+							"node:module",
 							"native-keymap",
 							"native-watchdog",
 							"net",
@@ -679,11 +743,20 @@
 							"zlib"
 						]
 					},
+					{
+						// imports that are allowed in all files of layers:
+						// - electron-utility
+						// - electron-main
+						"when": "hasElectron",
+						"allow": [
+							"electron"
+						]
+					},
 					{
 						// imports that are allowed in all /test/ files
 						"when": "test",
 						"allow": [
-							"vs/css.build",
+							"vs/css.build.js",
 							"assert",
 							"sinon",
 							"sinon-test"
@@ -738,7 +811,8 @@
 							"vs/platform/*/~",
 							"tas-client-umd", // node module allowed even in /common/
 							"@microsoft/1ds-core-js", // node module allowed even in /common/
-							"@microsoft/1ds-post-js" // node module allowed even in /common/
+							"@microsoft/1ds-post-js", // node module allowed even in /common/
+							"@xterm/headless" // node module allowed even in /common/
 						]
 					},
 					{
@@ -747,7 +821,8 @@
 							"vs/base/~",
 							"vs/base/parts/*/~",
 							"vs/platform/*/~",
-							"vs/editor/~"
+							"vs/editor/~",
+							"@vscode/tree-sitter-wasm" // node module allowed even in /common/
 						]
 					},
 					{
@@ -768,7 +843,8 @@
 							"vs/platform/*/~",
 							"vs/editor/~",
 							"vs/editor/contrib/*/~",
-							"vs/editor/standalone/~"
+							"vs/editor/standalone/~",
+							"@vscode/tree-sitter-wasm" // type import
 						]
 					},
 					{
@@ -854,6 +930,7 @@
 							"tas-client-umd", // node module allowed even in /common/
 							"vscode-textmate", // node module allowed even in /common/
 							"@vscode/vscode-languagedetection", // node module allowed even in /common/
+							"@vscode/tree-sitter-wasm", // type import
 							{
 								"when": "hasBrowser",
 								"pattern": "@xterm/xterm"
@@ -871,7 +948,10 @@
 							"vs/workbench/~",
 							"vs/workbench/services/*/~",
 							"vs/workbench/contrib/*/~",
+							"vs/workbench/contrib/terminal/terminalContribChatExports*",
+							"vs/workbench/contrib/terminal/terminalContribExports*",
 							"vscode-notebook-renderer", // Type only import
+							"@vscode/tree-sitter-wasm", // type import
 							{
 								"when": "hasBrowser",
 								"pattern": "@xterm/xterm"
@@ -912,7 +992,8 @@
 							{
 								"when": "hasBrowser",
 								"pattern": "vscode-textmate"
-							} // node module allowed even in /browser/
+							}, // node module allowed even in /browser/
+							"@xterm/headless" // node module allowed even in /common/ and /browser/
 						]
 					},
 					{
@@ -926,7 +1007,11 @@
 							"vs/code/~",
 							{
 								"when": "hasBrowser",
-								"pattern": "vs/workbench/workbench.web.main"
+								"pattern": "vs/workbench/workbench.web.main.js"
+							},
+							{
+								"when": "hasBrowser",
+								"pattern": "vs/workbench/workbench.web.main.internal.js"
 							},
 							{
 								"when": "hasBrowser",
@@ -958,6 +1043,21 @@
 							"vs/workbench/contrib/**"
 						]
 					},
+					{
+						"target": "src/vs/workbench/contrib/terminal/terminalContribChatExports.ts",
+						"layer": "browser",
+						"restrictions": [
+							"vs/workbench/contrib/terminalContrib/*/~"
+						]
+					},
+					{
+						"target": "src/vs/workbench/contrib/terminal/terminalContribExports.ts",
+						"layer": "browser",
+						"restrictions": [
+							"vs/platform/*/~",
+							"vs/workbench/contrib/terminalContrib/*/~"
+						]
+					},
 					{
 						"target": "src/vs/workbench/workbench.common.main.ts",
 						"layer": "browser",
@@ -967,12 +1067,12 @@
 							"vs/platform/*/~",
 							"vs/editor/~",
 							"vs/editor/contrib/*/~",
-							"vs/editor/editor.all",
+							"vs/editor/editor.all.js",
 							"vs/workbench/~",
 							"vs/workbench/api/~",
 							"vs/workbench/services/*/~",
 							"vs/workbench/contrib/*/~",
-							"vs/workbench/contrib/terminal/terminal.all"
+							"vs/workbench/contrib/terminal/terminal.all.js"
 						]
 					},
 					{
@@ -984,12 +1084,29 @@
 							"vs/platform/*/~",
 							"vs/editor/~",
 							"vs/editor/contrib/*/~",
-							"vs/editor/editor.all",
+							"vs/editor/editor.all.js",
 							"vs/workbench/~",
 							"vs/workbench/api/~",
 							"vs/workbench/services/*/~",
 							"vs/workbench/contrib/*/~",
-							"vs/workbench/workbench.common.main"
+							"vs/workbench/workbench.common.main.js"
+						]
+					},
+					{
+						"target": "src/vs/workbench/workbench.web.main.internal.ts",
+						"layer": "browser",
+						"restrictions": [
+							"vs/base/~",
+							"vs/base/parts/*/~",
+							"vs/platform/*/~",
+							"vs/editor/~",
+							"vs/editor/contrib/*/~",
+							"vs/editor/editor.all.js",
+							"vs/workbench/~",
+							"vs/workbench/api/~",
+							"vs/workbench/services/*/~",
+							"vs/workbench/contrib/*/~",
+							"vs/workbench/workbench.common.main.js"
 						]
 					},
 					{
@@ -1001,12 +1118,12 @@
 							"vs/platform/*/~",
 							"vs/editor/~",
 							"vs/editor/contrib/*/~",
-							"vs/editor/editor.all",
+							"vs/editor/editor.all.js",
 							"vs/workbench/~",
 							"vs/workbench/api/~",
 							"vs/workbench/services/*/~",
 							"vs/workbench/contrib/*/~",
-							"vs/workbench/workbench.common.main"
+							"vs/workbench/workbench.common.main.js"
 						]
 					},
 					{
@@ -1016,11 +1133,7 @@
 						]
 					},
 					{
-						"target": "src/vs/workbench/{workbench.desktop.main.nls.js,workbench.web.main.nls.js}",
-						"restrictions": []
-					},
-					{
-						"target": "src/vs/{loader.d.ts,css.ts,css.build.ts,monaco.d.ts,nls.ts,nls.build.ts,nls.mock.ts}",
+						"target": "src/vs/{loader.d.ts,css.ts,css.build.ts,monaco.d.ts,nls.ts,nls.messages.ts}",
 						"restrictions": []
 					},
 					{
@@ -1028,8 +1141,18 @@
 						"restrictions": []
 					},
 					{
-						"target": "src/{bootstrap-amd.js,bootstrap-fork.js,bootstrap-node.js,bootstrap-window.js,bootstrap.js,cli.js,main.js,server-cli.js,server-main.js}",
+						"target": "src/bootstrap-window.ts",
 						"restrictions": []
+					},
+					{
+						"target": "src/{bootstrap-cli.ts,bootstrap-esm.ts,bootstrap-fork.ts,bootstrap-import.ts,bootstrap-meta.ts,bootstrap-node.ts,bootstrap-server.ts,cli.ts,main.ts,server-cli.ts,server-main.ts}",
+						"restrictions": [
+							"vs/**/common/*",
+							"vs/**/node/*",
+							"vs/nls.js",
+							"src/*.js",
+							"*" // node.js
+						]
 					}
 				]
 			}
@@ -1094,7 +1217,18 @@
 				"local/code-no-runtime-import": [
 					"error",
 					{
-						"src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts": ["**/*"]
+						"src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts": [
+							"**/*"
+						]
+					}
+				],
+				"local/code-limited-top-functions": [
+					"error",
+					{
+						"src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts": [
+							"webviewPreloads",
+							"preloadsScriptStr"
+						]
 					}
 				]
 			}
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index c0c9a544148..203e213b629 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -26,3 +26,6 @@ ee1655a82ebdfd38bf8792088a6602c69f7bbd94
 
 # jrieken: new eslint-rule
 4a130c40ed876644ed8af2943809d08221375408
+
+# bpasero: ESM migration
+6b924c51528e663dda5091a1493229a361676aca
diff --git a/.github/classifier.json b/.github/classifier.json
index 44514039e1e..5f322e25edd 100644
--- a/.github/classifier.json
+++ b/.github/classifier.json
@@ -32,7 +32,7 @@
 		"debug": {"assign": ["roblourens"]},
 		"debug-disassembly": {"assign": []},
 		"dialogs": {"assign": ["sbatten"]},
-		"diff-editor": {"assign": ["alexdima"]},
+		"diff-editor": {"assign": ["hediet"]},
 		"dropdown": {"assign": ["lramos15"]},
 		"editor-api": {"assign": ["alexdima"]},
 		"editor-autoclosing": {"assign": ["alexdima"]},
@@ -116,7 +116,7 @@
 		"json": {"assign": ["aeschli"]},
 		"json-sorting": {"assign": ["aiday-mar"]},
 		"keybindings": {"assign": ["ulugbekna"]},
-		"keybindings-editor": {"assign": ["sandy081"]},
+		"keybindings-editor": {"assign": ["ulugbekna"]},
 		"keyboard-layout": {"assign": ["ulugbekna"]},
 		"L10N": {"assign": ["TylerLeonhardt", "csigs"]},
 		"l10n-platform": {"assign": ["TylerLeonhardt"]},
@@ -124,7 +124,7 @@
 		"languages-basic": {"assign": ["aeschli"]},
 		"languages-diagnostics": {"assign": ["jrieken"]},
 		"languages-guessing": {"assign": ["TylerLeonhardt"]},
-		"layout": {"assign": ["sbatten"]},
+		"layout": {"assign": ["benibenj"]},
 		"lcd-text-rendering": {"assign": []},
 		"list-widget": {"assign": ["joaomoreno"]},
 		"live-preview": {"assign": ["andreamah"]},
@@ -249,7 +249,7 @@
 		"timeline": {"assign": ["lramos15"]},
 		"timeline-git": {"assign": ["lszomoru"]},
 		"timeline-local-history": {"assign": ["bpasero"]},
-		"titlebar": {"assign": ["sbatten"]},
+		"titlebar": {"assign": ["benibenj"]},
 		"tokenization": {"assign": ["alexdima"]},
 		"touch/pointer": {"assign": []},
 		"trackpad/scroll": {"assign": []},
@@ -278,7 +278,7 @@
 		"workbench-cli": {"assign": ["bpasero"]},
 		"workbench-diagnostics": {"assign": ["Tyriar"]},
 		"workbench-dnd": {"assign": ["bpasero"]},
-		"workbench-editor-grid": {"assign": ["sbatten"]},
+		"workbench-editor-grid": {"assign": ["benibenj"]},
 		"workbench-editor-groups": {"assign": ["bpasero"]},
 		"workbench-editor-resolver": {"assign": ["lramos15"]},
 		"workbench-editors": {"assign": ["bpasero"]},
@@ -299,11 +299,11 @@
 		"workbench-tabs": {"assign": ["benibenj"]},
 		"workbench-touchbar": {"assign": ["bpasero"]},
 		"workbench-untitled-editors": {"assign": ["bpasero"]},
-		"workbench-views": {"assign": ["sbatten"]},
+		"workbench-views": {"assign": ["benibenj"]},
 		"workbench-welcome": {"assign": ["lramos15"]},
 		"workbench-window": {"assign": ["bpasero"]},
 		"workbench-workspace": {"assign": []},
-		"workbench-zen": {"assign": ["sbatten"]},
+		"workbench-zen": {"assign": ["benibenj"]},
 		"workspace-edit": {"assign": ["jrieken"]},
 		"workspace-symbols": {"assign": []},
 		"workspace-trust": {"assign": ["lszomoru", "sbatten"]},
diff --git a/.github/commands.json b/.github/commands.json
index df9fc791fd5..38da97915a2 100644
--- a/.github/commands.json
+++ b/.github/commands.json
@@ -156,6 +156,37 @@
 		"addLabel": "confirmation-pending",
 		"removeLabel": "confirmed"
 	},
+	{
+		"type": "comment",
+		"name": "needsMoreInfo",
+		"allowUsers": [
+			"cleidigh",
+			"usernamehw",
+			"gjsjohnmurray",
+			"IllusionMH"
+		],
+		"action": "updateLabels",
+		"addLabel": "~info-needed"
+	},
+	{
+		"type": "comment",
+		"name": "needsPerfInfo",
+		"allowUsers": [
+			"cleidigh",
+			"usernamehw",
+			"gjsjohnmurray",
+			"IllusionMH"
+		],
+		"addLabel": "info-needed",
+		"comment": "Thanks for creating this issue regarding performance! Please follow this guide to help us diagnose performance issues: https://github.com/microsoft/vscode/wiki/Performance-Issues \n\nHappy Coding!"
+	},
+	{
+		"type": "comment",
+		"name": "jsDebugLogs",
+		"action": "updateLabels",
+		"addLabel": "info-needed",
+		"comment": "Please collect trace logs using the following instructions:\n\n> If you're able to, add `\"trace\": true` to your `launch.json` and reproduce the issue. The location of the log file on your disk will be written to the Debug Console. Share that with us.\n>\n> ⚠️ This log file will not contain source code, but will contain file paths. You can drop it into https://microsoft.github.io/vscode-pwa-analyzer/index.html to see what it contains. If you'd rather not share the log publicly, you can email it to connor@xbox.com"
+	},
 	{
 		"type": "comment",
 		"name": "closedWith",
@@ -169,6 +200,19 @@
 		"reason": "completed",
 		"addLabel": "unreleased"
 	},
+	{
+		"type": "comment",
+		"name": "spam",
+		"allowUsers": [
+			"cleidigh",
+			"usernamehw",
+			"gjsjohnmurray",
+			"IllusionMH"
+		],
+		"action": "close",
+		"reason": "not_planned",
+		"addLabel": "invalid"
+	},
 	{
 		"type": "comment",
 		"name": "a11ymas",
@@ -414,6 +458,32 @@
 		"addLabel": "*caused-by-extension",
 		"comment": "It looks like this is caused by the Copilot extension. Please file the issue in the [Copilot Discussion Forum](https://github.com/community/community/discussions/categories/copilot). Make sure to check their issue reporting template and provide them relevant information such as the extension version you're using. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting) for more information.\n\nHappy Coding!"
 	},
+	{
+		"type": "comment",
+		"name": "gifPlease",
+		"allowUsers": [
+			"cleidigh",
+			"usernamehw",
+			"gjsjohnmurray",
+			"IllusionMH"
+		],
+		"action": "comment",
+		"addLabel": "info-needed",
+		"comment": "Thanks for reporting this issue! Unfortunately, it's hard for us to understand what issue you're seeing. Please help us out by providing a screen recording showing exactly what isn't working as expected. While we can work with most standard formats, `.gif` files are preferred as they are displayed inline on GitHub. You may find https://gifcap.dev helpful as a browser-based gif recording tool.\n\nIf the issue depends on keyboard input, you can help us by enabling screencast mode for the recording (`Developer: Toggle Screencast Mode` in the command palette). Lastly, please attach this file via the GitHub web interface as emailed responses will strip files out from the issue.\n\nHappy coding!"
+	},
+	{
+		"type": "comment",
+		"name": "confirmPlease",
+		"allowUsers": [
+			"cleidigh",
+			"usernamehw",
+			"gjsjohnmurray",
+			"IllusionMH"
+		],
+		"action": "comment",
+		"addLabel": "info-needed",
+		"comment": "Please diagnose the root cause of the issue by running the command `F1 > Help: Troubleshoot Issue` and following the instructions. Once you have done that, please update the issue with the results.\n\nHappy Coding!"
+	},
 	{
 		"__comment__": "Allows folks on the team to label issues by commenting: `\\label My-Label` ",
 		"type": "comment",
@@ -444,5 +514,29 @@
 		"addLabel": "verification-steps-needed",
 		"removeLabel": "~verification-steps-needed",
 		"comment": "Friendly ping! Looks like this issue requires some further steps to be verified. Please provide us with the steps necessary to verify this issue."
+	},
+	{
+		"type": "label",
+		"name": "~info-needed",
+		"action": "updateLabels",
+		"addLabel": "info-needed",
+		"removeLabel": "~info-needed",
+		"comment": "Thanks for creating this issue! We figured it's missing some basic information or in some other way doesn't follow our [issue reporting guidelines](https://aka.ms/vscodeissuereporting). Please take the time to review these and update the issue.\n\nHappy Coding!"
+	},
+	{
+		"type": "label",
+		"name": "~version-info-needed",
+		"action": "updateLabels",
+		"addLabel": "info-needed",
+		"removeLabel": "~version-info-needed",
+		"comment": "Thanks for creating this issue! We figured it's missing some basic information, such as a version number, or in some other way doesn't follow our [issue reporting guidelines](https://aka.ms/vscodeissuereporting). Please take the time to review these and update the issue.\n\nHappy Coding!"
+	},
+	{
+		"type": "label",
+		"name": "~confirmation-needed",
+		"action": "updateLabels",
+		"addLabel": "info-needed",
+		"removeLabel": "~confirmation-needed",
+		"comment": "Please diagnose the root cause of the issue by running the command `F1 > Help: Troubleshoot Issue` and following the instructions. Once you have done that, please update the issue with the results.\n\nHappy Coding!"
 	}
 ]
diff --git a/.github/workflows/author-verified.yml b/.github/workflows/author-verified.yml
deleted file mode 100644
index f914be2f71b..00000000000
--- a/.github/workflows/author-verified.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: Author Verified
-on:
-  issues:
-    types: [closed]
-
-# also make changes in ./on-label.yml
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Actions
-        if: contains(github.event.issue.labels.*.name, 'author-verification-requested') && contains(github.event.issue.labels.*.name, 'insiders-released')
-        uses: actions/checkout@v4
-        with:
-          repository: "microsoft/vscode-github-triage-actions"
-          ref: stable
-          path: ./actions
-      - name: Install Actions
-        if: contains(github.event.issue.labels.*.name, 'author-verification-requested') && contains(github.event.issue.labels.*.name, 'insiders-released')
-        run: npm install --production --prefix ./actions
-      - name: Run Author Verified
-        if: contains(github.event.issue.labels.*.name, 'author-verification-requested') && contains(github.event.issue.labels.*.name, 'insiders-released')
-        uses: ./actions/author-verified
-        with:
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          requestVerificationComment: "This bug has been fixed in the latest release of [VS Code Insiders](https://code.visualstudio.com/insiders/)!\n\n@${author}, you can help us out by commenting `/verified` if things are now working as expected.\n\nIf things still don't seem right, please ensure you're on version ${commit} of Insiders (today's or later - you can use `Help: About` in the command palette to check), and leave a comment letting us know what isn't working as expected.\n\nHappy Coding!"
-          releasedLabel: insiders-released
-          verifiedLabel: verified
-          authorVerificationRequestedLabel: author-verification-requested
diff --git a/.github/workflows/bad-tag.yml b/.github/workflows/bad-tag.yml
deleted file mode 100644
index bc964fb0582..00000000000
--- a/.github/workflows/bad-tag.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Bad Tag
-on:
-  create
-
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    if: github.event.ref == '1.999.0'
-    steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v4
-        with:
-          repository: "microsoft/vscode-github-triage-actions"
-          ref: stable
-          path: ./actions
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-      - name: Run Bad Tag
-        uses: ./actions/tag-alert
-        with:
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          tag-name: '1.999.0'
diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml
index 8448d05c3b8..d5f166a4aae 100644
--- a/.github/workflows/basic.yml
+++ b/.github/workflows/basic.yml
@@ -42,26 +42,26 @@ jobs:
         with:
           path: "**/node_modules"
           key: ${{ runner.os }}-cacheNodeModulesLinux-${{ steps.nodeModulesCacheKey.outputs.value }}
-      - name: Get yarn cache directory path
-        id: yarnCacheDirPath
+      - name: Get npm cache directory path
+        id: npmCacheDirPath
         if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
-      - name: Cache yarn directory
+        run: echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
+      - name: Cache npm directory
         if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
         uses: actions/cache@v4
         with:
-          path: ${{ steps.yarnCacheDirPath.outputs.dir }}
-          key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
-          restore-keys: ${{ runner.os }}-yarnCacheDir-
-      - name: Execute yarn
+          path: ${{ steps.npmCacheDirPath.outputs.dir }}
+          key: ${{ runner.os }}-npmCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
+          restore-keys: ${{ runner.os }}-npmCacheDir-
+      - name: Execute npm
         if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
         env:
           PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
           ELECTRON_SKIP_BINARY_DOWNLOAD: 1
-        run: yarn --frozen-lockfile --network-timeout 180000
+        run: npm ci
 
       - name: Compile and Download
-        run: yarn npm-run-all --max-old-space-size=4095 -lp compile "electron x64"
+        run: npm exec -- npm-run-all -lp compile "electron x64"
 
       - name: Run Unit Tests
         id: electron-unit-tests
@@ -94,44 +94,45 @@ jobs:
         with:
           path: "**/node_modules"
           key: ${{ runner.os }}-cacheNodeModulesLinux-${{ steps.nodeModulesCacheKey.outputs.value }}
-      - name: Get yarn cache directory path
-        id: yarnCacheDirPath
+      - name: Get npm cache directory path
+        id: npmCacheDirPath
         if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
-      - name: Cache yarn directory
+        run: echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
+      - name: Cache npm directory
         if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
         uses: actions/cache@v4
         with:
-          path: ${{ steps.yarnCacheDirPath.outputs.dir }}
-          key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
-          restore-keys: ${{ runner.os }}-yarnCacheDir-
-      - name: Execute yarn
+          path: ${{ steps.npmCacheDirPath.outputs.dir }}
+          key: ${{ runner.os }}-npmCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
+          restore-keys: ${{ runner.os }}-npmCacheDir-
+      - name: Execute npm
         if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
         env:
           PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
           ELECTRON_SKIP_BINARY_DOWNLOAD: 1
-        run: yarn --frozen-lockfile --network-timeout 180000
+        run: npm ci
 
       - name: Run Hygiene Checks
-        run: yarn gulp hygiene
+        run: npm run gulp hygiene
 
       - name: Run Valid Layers Checks
-        run: yarn valid-layers-check
+        run: npm run valid-layers-check
 
       - name: Compile /build/
-        run: yarn --cwd build compile
+        run: npm run compile
+        working-directory: build
 
       - name: Check clean git state
         run: ./.github/workflows/check-clean-git-state.sh
 
       - name: Run eslint
-        run: yarn eslint
+        run: npm run eslint
 
       - name: Run vscode-dts Compile Checks
-        run: yarn vscode-dts-compile-check
+        run: npm run vscode-dts-compile-check
 
       - name: Run Trusted Types Checks
-        run: yarn tsec-compile-check
+        run: npm run tsec-compile-check
 
   warm-cache:
     name: Warm up node modules cache
@@ -156,20 +157,20 @@ jobs:
         with:
           path: "**/node_modules"
           key: ${{ runner.os }}-cacheNodeModulesLinux-${{ steps.nodeModulesCacheKey.outputs.value }}
-      - name: Get yarn cache directory path
-        id: yarnCacheDirPath
+      - name: Get npm cache directory path
+        id: npmCacheDirPath
         if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
-      - name: Cache yarn directory
+        run: echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
+      - name: Cache npm directory
         if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
         uses: actions/cache@v4
         with:
-          path: ${{ steps.yarnCacheDirPath.outputs.dir }}
-          key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
-          restore-keys: ${{ runner.os }}-yarnCacheDir-
-      - name: Execute yarn
+          path: ${{ steps.npmCacheDirPath.outputs.dir }}
+          key: ${{ runner.os }}-npmCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
+          restore-keys: ${{ runner.os }}-npmCacheDir-
+      - name: Execute npm
         if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
         env:
           PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
           ELECTRON_SKIP_BINARY_DOWNLOAD: 1
-        run: yarn --frozen-lockfile --network-timeout 180000
+        run: npm ci
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 097bdcf8c2c..b80196eab08 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,23 +43,23 @@ jobs:
       - name: Extract node_modules archive
         if: ${{ steps.cacheNodeModules.outputs.cache-hit == 'true' }}
         run: 7z.exe x .build/node_modules_cache/cache.7z -aos
-      - name: Get yarn cache directory path
-        id: yarnCacheDirPath
+      - name: Get npm cache directory path
+        id: npmCacheDirPath
         if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
-      - name: Cache yarn directory
+        run: echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
+      - name: Cache npm directory
         if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
         uses: actions/cache@v4
         with:
-          path: ${{ steps.yarnCacheDirPath.outputs.dir }}
-          key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
-          restore-keys: ${{ runner.os }}-yarnCacheDir-
-      - name: Execute yarn
+          path: ${{ steps.npmCacheDirPath.outputs.dir }}
+          key: ${{ runner.os }}-npmCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
+          restore-keys: ${{ runner.os }}-npmCacheDir-
+      - name: Execute npm
         if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
         env:
           PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
           ELECTRON_SKIP_BINARY_DOWNLOAD: 1
-        run: yarn --frozen-lockfile --network-timeout 180000
+        run: npm ci
       - name: Create node_modules archive
         if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
         run: |
@@ -69,19 +69,20 @@ jobs:
           7z.exe a .build/node_modules_cache/cache.7z -mx3 `@.build/node_modules_list.txt
 
       - name: Compile and Download
-        run: yarn npm-run-all --max-old-space-size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions
+        run: npm exec -- npm-run-all -lp compile "electron x64" playwright-install download-builtin-extensions
 
       - name: Compile Integration Tests
-        run: yarn --cwd test/integration/browser compile
+        run: npm run compile
+        working-directory: test/integration/browser
 
       - name: Run Unit Tests (Electron)
         run: .\scripts\test.bat
 
       - name: Run Unit Tests (node.js)
-        run: yarn test-node
+        run: npm run test-node
 
       - name: Run Unit Tests (Browser, Chromium)
-        run: yarn test-browser-no-install --browser chromium
+        run: npm run test-browser-no-install --browser chromium
 
       - name: Run Integration Tests (Electron)
         run: .\scripts\test-integration.bat
@@ -126,29 +127,30 @@ jobs:
         with:
           path: "**/node_modules"
           key: ${{ runner.os }}-cacheNodeModulesLinux-${{ steps.nodeModulesCacheKey.outputs.value }}
-      - name: Get yarn cache directory path
-        id: yarnCacheDirPath
+      - name: Get npm cache directory path
+        id: npmCacheDirPath
         if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
-      - name: Cache yarn directory
+        run: echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
+      - name: Cache npm directory
         if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
         uses: actions/cache@v4
         with:
-          path: ${{ steps.yarnCacheDirPath.outputs.dir }}
-          key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
-          restore-keys: ${{ runner.os }}-yarnCacheDir-
-      - name: Execute yarn
+          path: ${{ steps.npmCacheDirPath.outputs.dir }}
+          key: ${{ runner.os }}-npmCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
+          restore-keys: ${{ runner.os }}-npmCacheDir-
+      - name: Execute npm
         if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
         env:
           PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
           ELECTRON_SKIP_BINARY_DOWNLOAD: 1
-        run: yarn --frozen-lockfile --network-timeout 180000
+        run: npm ci
 
       - name: Compile and Download
-        run: yarn npm-run-all --max-old-space-size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions
+        run: npm exec -- npm-run-all -lp compile "electron x64" playwright-install download-builtin-extensions
 
       - name: Compile Integration Tests
-        run: yarn --cwd test/integration/browser compile
+        run: npm run compile
+        working-directory: test/integration/browser
 
       - name: Run Unit Tests (Electron)
         id: electron-unit-tests
@@ -156,11 +158,11 @@ jobs:
 
       - name: Run Unit Tests (node.js)
         id: nodejs-unit-tests
-        run: yarn test-node
+        run: npm run test-node
 
       - name: Run Unit Tests (Browser, Chromium)
         id: browser-unit-tests
-        run: DISPLAY=:10 yarn test-browser-no-install --browser chromium
+        run: DISPLAY=:10 npm run test-browser-no-install --browser chromium
 
       - name: Run Integration Tests (Electron)
         id: electron-integration-tests
@@ -197,29 +199,30 @@ jobs:
         with:
           path: "**/node_modules"
           key: ${{ runner.os }}-cacheNodeModulesMacOS-${{ steps.nodeModulesCacheKey.outputs.value }}
-      - name: Get yarn cache directory path
-        id: yarnCacheDirPath
+      - name: Get npm cache directory path
+        id: npmCacheDirPath
         if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
-      - name: Cache yarn directory
+        run: echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
+      - name: Cache npm directory
         if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
         uses: actions/cache@v4
         with:
-          path: ${{ steps.yarnCacheDirPath.outputs.dir }}
-          key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
-          restore-keys: ${{ runner.os }}-yarnCacheDir-
-      - name: Execute yarn
+          path: ${{ steps.npmCacheDirPath.outputs.dir }}
+          key: ${{ runner.os }}-npmCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
+          restore-keys: ${{ runner.os }}-npmCacheDir-
+      - name: Execute npm
         if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
         env:
           PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
           ELECTRON_SKIP_BINARY_DOWNLOAD: 1
-        run: yarn --frozen-lockfile --network-timeout 180000
+        run: npm ci
 
       - name: Compile and Download
-        run: yarn npm-run-all --max-old-space-size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions
+        run: npm exec -- npm-run-all -lp compile "electron x64" playwright-install download-builtin-extensions
 
       - name: Compile Integration Tests
-        run: yarn --cwd test/integration/browser compile
+        run: npm run compile
+        working-directory: test/integration/browser
 
       # This is required for SecretStorage unittests
       - name: Create temporary keychain
@@ -232,10 +235,10 @@ jobs:
         run: DISPLAY=:10 ./scripts/test.sh
 
       - name: Run Unit Tests (node.js)
-        run: yarn test-node
+        run: npm run test-node
 
       - name: Run Unit Tests (Browser, Chromium)
-        run: DISPLAY=:10 yarn test-browser-no-install --browser chromium
+        run: DISPLAY=:10 npm run test-browser-no-install --browser chromium
 
       - name: Run Integration Tests (Electron)
         run: DISPLAY=:10 ./scripts/test-integration.sh
@@ -269,44 +272,45 @@ jobs:
         with:
           path: "**/node_modules"
           key: ${{ runner.os }}-cacheNodeModulesLinux-${{ steps.nodeModulesCacheKey.outputs.value }}
-      - name: Get yarn cache directory path
-        id: yarnCacheDirPath
+      - name: Get npm cache directory path
+        id: npmCacheDirPath
         if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
-      - name: Cache yarn directory
+        run: echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
+      - name: Cache npm directory
         if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
         uses: actions/cache@v4
         with:
-          path: ${{ steps.yarnCacheDirPath.outputs.dir }}
-          key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
-          restore-keys: ${{ runner.os }}-yarnCacheDir-
-      - name: Execute yarn
+          path: ${{ steps.npmCacheDirPath.outputs.dir }}
+          key: ${{ runner.os }}-npmCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
+          restore-keys: ${{ runner.os }}-npmCacheDir-
+      - name: Execute npm
         if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
         env:
           PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
           ELECTRON_SKIP_BINARY_DOWNLOAD: 1
-        run: yarn --frozen-lockfile --network-timeout 180000
+        run: npm ci
 
       - name: Download Playwright
-        run: yarn playwright-install
+        run: npm run playwright-install
 
       - name: Run Hygiene Checks
-        run: yarn gulp hygiene
+        run: npm run gulp hygiene
 
       - name: Run Valid Layers Checks
-        run: yarn valid-layers-check
+        run: npm run valid-layers-check
 
       - name: Compile /build/
-        run: yarn --cwd build compile
+        run: npm run compile
+        working-directory: build
 
       - name: Check clean git state
         run: ./.github/workflows/check-clean-git-state.sh
 
       - name: Run eslint
-        run: yarn eslint
+        run: npm run eslint
 
       - name: Run vscode-dts Compile Checks
-        run: yarn vscode-dts-compile-check
+        run: npm run vscode-dts-compile-check
 
       - name: Run Trusted Types Checks
-        run: yarn tsec-compile-check
+        run: npm run tsec-compile-check
diff --git a/.github/workflows/deep-classifier-assign-monitor.yml b/.github/workflows/deep-classifier-assign-monitor.yml
deleted file mode 100644
index cfd9abc374a..00000000000
--- a/.github/workflows/deep-classifier-assign-monitor.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: "Deep Classifier: Assign Monitor"
-on:
-  issues:
-    types: [assigned]
-
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    if: ${{ contains(github.event.issue.labels.*.name, 'triage-needed') }}
-    steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v4
-        with:
-          repository: "microsoft/vscode-github-triage-actions"
-          ref: stable
-          path: ./actions
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-      - name: "Run Classifier: Monitor"
-        uses: ./actions/classifier-deep/monitor
-        with:
-          botName: VSCodeTriageBot
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
diff --git a/.github/workflows/deep-classifier-runner.yml b/.github/workflows/deep-classifier-runner.yml
deleted file mode 100644
index 81fd3516751..00000000000
--- a/.github/workflows/deep-classifier-runner.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-name: "Deep Classifier: Runner"
-
-permissions:
-  id-token: write
-  contents: read
-
-on:
-  schedule:
-    - cron: 0 * * * *
-  workflow_dispatch:
-  repository_dispatch:
-    types: [trigger-deep-classifier-runner]
-
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    environment: main
-    steps:
-      - uses: azure/login@v2
-        with:
-            client-id: ${{ vars.AZURE_CLIENT_ID }}
-            tenant-id: ${{ vars.AZURE_TENANT_ID }}
-            allow-no-subscriptions: true
-      - name: Checkout Actions
-        uses: actions/checkout@v4
-        with:
-          repository: "microsoft/vscode-github-triage-actions"
-          ref: stable
-          path: ./actions
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-      - name: Install Additional Dependencies
-        # Pulls in a bunch of other packages that arent needed for the rest of the actions
-        run: npm install @azure/storage-blob@12.1.1 mongodb@2.2.31
-      - name: "Run Classifier: Scraper"
-        uses: ./actions/classifier-deep/apply/fetch-sources
-        with:
-          # slightly overlapping to protect against issues slipping through the cracks if a run is delayed
-          until: 5
-          excludeLabels: feature-request|testplan-item
-          configPath: classifier
-          blobContainerName: vscode-issue-classifier
-          blobStorageKey: ${{secrets.AZURE_BLOB_STORAGE_CONNECTION_STRING}}
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.7
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install --upgrade numpy==1.20.0 scipy==1.6.0 scikit-learn==0.24.1 joblib==1.0.0 nltk==3.5 simpletransformers==0.51.16 torch==1.7.1 torchvision==0.8.2
-      - name: "Run Classifier: Generator"
-        run: python ./actions/classifier-deep/apply/generate-labels/main.py
-      - name: "Run Classifier: Labeler"
-        uses: ./actions/classifier-deep/apply/apply-labels
-        with:
-          configPath: classifier
-          allowLabels: "info-needed|new release|error-telemetry|*english-please|translation-required"
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
diff --git a/.github/workflows/deep-classifier-scraper.yml b/.github/workflows/deep-classifier-scraper.yml
deleted file mode 100644
index e21061549d9..00000000000
--- a/.github/workflows/deep-classifier-scraper.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: "Deep Classifier: Scraper"
-on:
-  schedule:
-    - cron: 0 0 15 * * # 15th of the month
-  workflow_dispatch:
-  repository_dispatch:
-    types: [trigger-deep-classifier-scraper]
-
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v4
-        with:
-          repository: "microsoft/vscode-github-triage-actions"
-          ref: stable
-          path: ./actions
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-      - name: Install Additional Dependencies
-        # Pulls in a bunch of other packages that arent needed for the rest of the actions
-        run: npm install @azure/storage-blob@12.1.1
-      - name: "Run Classifier: Scraper"
-        uses: ./actions/classifier-deep/train/fetch-issues
-        with:
-          blobContainerName: vscode-issue-classifier
-          blobStorageKey: ${{secrets.AZURE_BLOB_STORAGE_CONNECTION_STRING}}
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
diff --git a/.github/workflows/deep-classifier-unassign-monitor.yml b/.github/workflows/deep-classifier-unassign-monitor.yml
deleted file mode 100644
index d0e14e936c2..00000000000
--- a/.github/workflows/deep-classifier-unassign-monitor.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: "Deep Classifier: Unassign Monitor"
-on:
-  issues:
-    types: [unassigned]
-
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    if: ${{ ! contains(github.event.issue.labels.*.name, 'triage-needed') }}
-    steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v4
-        with:
-          repository: "microsoft/vscode-github-triage-actions"
-          ref: stable
-          path: ./actions
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-      - name: "Run Classifier: Monitor"
-        uses: ./actions/classifier-deep/monitor
-        with:
-          botName: VSCodeTriageBot
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
diff --git a/.github/workflows/english-please.yml b/.github/workflows/english-please.yml
deleted file mode 100644
index 9e04d6d549c..00000000000
--- a/.github/workflows/english-please.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: English Please
-on:
-  issues:
-    types: [edited]
-
-# also make changes in ./on-label.yml and ./on-open.yml
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    if: contains(github.event.issue.labels.*.name, '*english-please')
-    steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v4
-        with:
-          repository: "microsoft/vscode-github-triage-actions"
-          ref: stable
-          path: ./actions
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-      - name: Run English Please
-        uses: ./actions/english-please
-        with:
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          cognitiveServicesAPIKey: ${{secrets.AZURE_TEXT_TRANSLATOR_KEY}}
-          nonEnglishLabel: "*english-please"
-          needsMoreInfoLabel: "info-needed"
-          translatorRequestedLabelPrefix: "translation-required-"
-          translatorRequestedLabelColor: "c29cff"
diff --git a/.github/workflows/feature-request.yml b/.github/workflows/feature-request.yml
deleted file mode 100644
index 83c0a9705c5..00000000000
--- a/.github/workflows/feature-request.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: Feature Request Manager
-on:
-  repository_dispatch:
-    types: [trigger-feature-request-manager]
-  issues:
-    types: [milestoned]
-  schedule:
-    - cron: 20 2 * * * # 4:20am Zurich
-
-# also make changes in ./on-label.yml
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Actions
-        if: github.event_name != 'issues' || contains(github.event.issue.labels.*.name, 'feature-request')
-        uses: actions/checkout@v4
-        with:
-          repository: "microsoft/vscode-github-triage-actions"
-          path: ./actions
-          ref: stable
-      - name: Install Actions
-        if: github.event_name != 'issues' || contains(github.event.issue.labels.*.name, 'feature-request')
-        run: npm install --production --prefix ./actions
-      - name: Run Feature Request Manager
-        if: github.event_name != 'issues' || contains(github.event.issue.labels.*.name, 'feature-request')
-        uses: ./actions/feature-request
-        with:
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          candidateMilestoneID: 107
-          candidateMilestoneName: Backlog Candidates
-          backlogMilestoneID: 8
-          featureRequestLabel: feature-request
-          upvotesRequired: 20
-          numCommentsOverride: 20
-          initComment: "This feature request is now a candidate for our backlog. The community has 60 days to [upvote](https://github.com/microsoft/vscode/wiki/Issues-Triaging#up-voting-a-feature-request) the issue. If it receives 20 upvotes we will move it to our backlog. If not, we will close it. To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding!"
-          warnComment: "This feature request has not yet received the 20 community [upvotes](https://github.com/microsoft/vscode/wiki/Issues-Triaging#up-voting-a-feature-request) it takes to make to our backlog. 10 days to go. To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding!"
-          acceptComment: ":slightly_smiling_face: This feature request received a sufficient number of community upvotes and we moved it to our backlog. To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding!"
-          rejectComment: ":slightly_frowning_face: In the last 60 days, this feature request has received less than 20 community upvotes and we closed it. Still a big Thank You to you for taking the time to create this issue! To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding!"
-          warnDays: 10
-          closeDays: 60
-          milestoneDelaySeconds: 60
diff --git a/.github/workflows/latest-release-monitor.yml b/.github/workflows/latest-release-monitor.yml
deleted file mode 100644
index f7392dc24a8..00000000000
--- a/.github/workflows/latest-release-monitor.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: Latest Release Monitor
-on:
-  schedule:
-    - cron: 0/5 * * * *
-  repository_dispatch:
-    types: [trigger-latest-release-monitor]
-
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v4
-        with:
-          repository: "microsoft/vscode-github-triage-actions"
-          path: ./actions
-          ref: stable
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-      - name: Install Storage Module
-        run: npm install @azure/storage-blob@12.1.1
-      - name: Run Latest Release Monitor
-        uses: ./actions/latest-release-monitor
-        with:
-          storageKey: ${{secrets.AZURE_BLOB_STORAGE_CONNECTION_STRING}}
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
diff --git a/.github/workflows/locker.yml b/.github/workflows/locker.yml
deleted file mode 100644
index ef775ce8fdf..00000000000
--- a/.github/workflows/locker.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: Locker
-on:
-  schedule:
-    - cron: 20 23 * * * # 4:20pm Redmond
-  repository_dispatch:
-    types: [trigger-locker]
-
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v4
-        with:
-          repository: "microsoft/vscode-github-triage-actions"
-          path: ./actions
-          ref: stable
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-      - name: Run Locker
-        uses: ./actions/locker
-        with:
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          daysSinceClose: 45
-          daysSinceUpdate: 3
-          ignoredLabel: "*out-of-scope,accessibility"
-          ignoreLabelUntil: "author-verification-requested"
-          ignoredMilestones: "Backlog Candidates"
-          labelUntil: "verified"
diff --git a/.github/workflows/monaco-editor.yml b/.github/workflows/monaco-editor.yml
index 8c8ae7b743d..426999ce43b 100644
--- a/.github/workflows/monaco-editor.yml
+++ b/.github/workflows/monaco-editor.yml
@@ -34,43 +34,42 @@ jobs:
           path: "**/node_modules"
           key: ${{ runner.os }}-cacheNodeModules20-${{ steps.nodeModulesCacheKey.outputs.value }}
           restore-keys: ${{ runner.os }}-cacheNodeModules20-
-      - name: Get yarn cache directory path
-        id: yarnCacheDirPath
+      - name: Get npm cache directory path
+        id: npmCacheDirPath
         if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
-      - name: Cache yarn directory
+        run: echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
+      - name: Cache npm directory
         if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
         uses: actions/cache@v4
         with:
-          path: ${{ steps.yarnCacheDirPath.outputs.dir }}
-          key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
-          restore-keys: ${{ runner.os }}-yarnCacheDir-
+          path: ${{ steps.npmCacheDirPath.outputs.dir }}
+          key: ${{ runner.os }}-npmCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
+          restore-keys: ${{ runner.os }}-npmCacheDir-
       - name: Install libkrb5-dev
         if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
         run: |
           sudo apt update
           sudo apt install -y libkrb5-dev
-      - name: Execute yarn
+      - name: Execute npm
         if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
         env:
           PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
           ELECTRON_SKIP_BINARY_DOWNLOAD: 1
         run: |
-          npm i -g node-gyp@9.4.0
-          yarn --frozen-lockfile --network-timeout 180000
+          npm ci
 
       - name: Download Playwright
-        run: yarn playwright-install
+        run: npm run playwright-install
 
       - name: Run Monaco Editor Checks
-        run: yarn monaco-compile-check
+        run: npm run monaco-compile-check
 
       - name: Editor Distro & ESM
-        run: yarn gulp editor-esm
+        run: npm run gulp editor-esm
 
       - name: Editor ESM sources check
         working-directory: ./test/monaco
-        run: yarn run esm-check
+        run: npm run esm-check
 
       - name: Typings validation prep
         run: |
@@ -79,20 +78,20 @@ jobs:
       - name: Typings validation
         working-directory: ./typings-test
         run: |
-          yarn init -yp
+          npm init -yp
           ../node_modules/.bin/tsc --init
           echo "import '../out-monaco-editor-core';" > a.ts
           ../node_modules/.bin/tsc --noEmit
 
       - name: Package Editor with Webpack
         working-directory: ./test/monaco
-        run: yarn run bundle-webpack
+        run: npm run bundle-webpack
 
       - name: Compile Editor Tests
         working-directory: ./test/monaco
-        run: yarn run compile
+        run: npm run compile
 
       - name: Run Editor Tests
         timeout-minutes: 5
         working-directory: ./test/monaco
-        run: yarn test
+        run: npm run test
diff --git a/.github/workflows/needs-more-info-closer.yml b/.github/workflows/needs-more-info-closer.yml
deleted file mode 100644
index 8db8a4246a3..00000000000
--- a/.github/workflows/needs-more-info-closer.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: info-needed Closer
-on:
-  schedule:
-    - cron: 20 11 * * * # 4:20am Redmond
-  repository_dispatch:
-    types: [trigger-needs-more-info]
-
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v4
-        with:
-          repository: "microsoft/vscode-github-triage-actions"
-          path: ./actions
-          ref: stable
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-      - name: Run info-needed Closer
-        uses: ./actions/needs-more-info-closer
-        with:
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          label: info-needed
-          closeDays: 7
-          additionalTeam: "cleidigh|usernamehw|gjsjohnmurray|IllusionMH"
-          closeComment: "This issue has been closed automatically because it needs more information and has not had recent activity. See also our [issue reporting](https://aka.ms/vscodeissuereporting) guidelines.\n\nHappy Coding!"
-          pingDays: 80
-          pingComment: "Hey @${assignee}, this issue might need further attention.\n\n@${author}, you can help us out by closing this issue if the problem no longer exists, or adding more information."
diff --git a/.github/workflows/no-package-lock-changes.yml b/.github/workflows/no-package-lock-changes.yml
new file mode 100644
index 00000000000..45d5d17407b
--- /dev/null
+++ b/.github/workflows/no-package-lock-changes.yml
@@ -0,0 +1,31 @@
+name: Prevent package-lock.json changes in PRs
+on: [pull_request]
+
+jobs:
+  main:
+    name: Prevent package-lock.json changes in PRs
+    runs-on: ubuntu-latest
+    steps:
+      - uses: octokit/request-action@v2.x
+        id: get_permissions
+        with:
+          route: GET /repos/microsoft/vscode/collaborators/{username}/permission
+          username: ${{ github.event.pull_request.user.login }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Set control output variable
+        id: control
+        run: |
+          echo "user: ${{ github.event.pull_request.user.login }}"
+          echo "role: ${{ fromJson(steps.get_permissions.outputs.data).permission }}"
+          echo "is dependabot: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }}"
+          echo "should_run: ${{ !contains(fromJson('["admin", "maintain", "write"]'), fromJson(steps.get_permissions.outputs.data).permission) }}"
+          echo "should_run=${{ !contains(fromJson('["admin", "maintain", "write"]'), fromJson(steps.get_permissions.outputs.data).permission) && github.event.pull_request.user.login != 'dependabot[bot]' }}" >> $GITHUB_OUTPUT
+      - name: Get file changes
+        uses: trilom/file-changes-action@ce38c8ce2459ca3c303415eec8cb0409857b4272
+        if: ${{ steps.control.outputs.should_run == 'true' }}
+      - name: Check for lockfile changes
+        if: ${{ steps.control.outputs.should_run == 'true' }}
+        run: |
+          cat $HOME/files.json | jq -e 'any(test("package-lock\\.json$|Cargo\\.lock$")) | not' \
+            || (echo "Changes to package-lock.json/Cargo.lock files aren't allowed in PRs." && exit 1)
diff --git a/.github/workflows/on-comment.yml b/.github/workflows/on-comment.yml
deleted file mode 100644
index 089aa77c1e7..00000000000
--- a/.github/workflows/on-comment.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: On Comment
-on:
-  issue_comment:
-    types: [created]
-
-# also make changes in ./on-label.yml
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v4
-        with:
-          repository: "microsoft/vscode-github-triage-actions"
-          path: ./actions
-          ref: stable
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-      - name: Run Commands
-        uses: ./actions/commands
-        with:
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          config-path: commands
-      - name: "Run Release Pipeline Labeler"
-        uses: ./actions/release-pipeline
-        with:
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
-          notYetReleasedLabel: unreleased
-          insidersReleasedLabel: insiders-released
diff --git a/.github/workflows/on-label.yml b/.github/workflows/on-label.yml
deleted file mode 100644
index bf563734017..00000000000
--- a/.github/workflows/on-label.yml
+++ /dev/null
@@ -1,83 +0,0 @@
-name: On Label
-on:
-  issues:
-    types: [labeled]
-
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v4
-        with:
-          repository: "microsoft/vscode-github-triage-actions"
-          ref: stable
-          path: ./actions
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-
-      # source of truth in ./author-verified.yml
-      - name: Run Author Verified
-        if: contains(github.event.issue.labels.*.name, 'author-verification-requested') && contains(github.event.issue.labels.*.name, 'insiders-released')
-        uses: ./actions/author-verified
-        with:
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          requestVerificationComment: "This bug has been fixed in the latest release of [VS Code Insiders](https://code.visualstudio.com/insiders/)!\n\n@${author}, you can help us out by commenting `/verified` if things are now working as expected.\n\nIf things still don't seem right, please ensure you're on version ${commit} of Insiders (today's or later - you can use `Help: About` in the command palette to check), and leave a comment letting us know what isn't working as expected.\n\nHappy Coding!"
-          releasedLabel: insiders-released
-          verifiedLabel: verified
-          authorVerificationRequestedLabel: author-verification-requested
-
-
-      # also make changes in ./on-comment.yml
-      - name: Run Commands
-        uses: ./actions/commands
-        with:
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          config-path: commands
-
-      # source of truth in ./feature-request.yml
-      - name: Run Feature Request Manager
-        if: contains(github.event.issue.labels.*.name, 'feature-request')
-        uses: ./actions/feature-request
-        with:
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          candidateMilestoneID: 107
-          candidateMilestoneName: Backlog Candidates
-          backlogMilestoneID: 8
-          featureRequestLabel: feature-request
-          upvotesRequired: 20
-          numCommentsOverride: 20
-          initComment: "This feature request is now a candidate for our backlog. The community has 60 days to upvote the issue. If it receives 20 upvotes we will move it to our backlog. If not, we will close it. To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding!"
-          warnComment: "This feature request has not yet received the 20 community upvotes it takes to make to our backlog. 10 days to go. To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding"
-          acceptComment: ":slightly_smiling_face: This feature request received a sufficient number of community upvotes and we moved it to our backlog. To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding!"
-          rejectComment: ":slightly_frowning_face: In the last 60 days, this feature request has received less than 20 community upvotes and we closed it. Still a big Thank You to you for taking the time to create this issue! To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding!"
-          warnDays: 10
-          closeDays: 60
-          milestoneDelaySeconds: 60
-
-      # source of truth in ./test-plan-item-validator.yml
-      - name: Run Test Plan Item Validator
-        if: contains(github.event.issue.labels.*.name, 'testplan-item') || contains(github.event.issue.labels.*.name, 'invalid-testplan-item')
-        uses: ./actions/test-plan-item-validator
-        with:
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          refLabel: on-testplan
-          label: testplan-item
-          invalidLabel: invalid-testplan-item
-          comment: Invalid test plan item. See errors below and the [test plan item spec](https://github.com/microsoft/vscode/wiki/Writing-Test-Plan-Items) for more information. This comment will go away when the issues are resolved.
-
-      # source of truth in ./english-please.yml
-      - name: Run English Please
-        if: contains(github.event.issue.labels.*.name, '*english-please')
-        uses: ./actions/english-please
-        with:
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          cognitiveServicesAPIKey: ${{secrets.AZURE_TEXT_TRANSLATOR_KEY}}
-          nonEnglishLabel: "*english-please"
-          needsMoreInfoLabel: "info-needed"
-          translatorRequestedLabelPrefix: "translation-required-"
-          translatorRequestedLabelColor: "c29cff"
diff --git a/.github/workflows/on-open.yml b/.github/workflows/on-open.yml
deleted file mode 100644
index 361ac11b946..00000000000
--- a/.github/workflows/on-open.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-name: On Open
-on:
-  issues:
-    types: [opened]
-
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v4
-        with:
-          repository: "microsoft/vscode-github-triage-actions"
-          ref: stable
-          path: ./actions
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-
-      - name: Run CopyCat (VSCodeTriageBot/testissues)
-        uses: ./actions/copycat
-        with:
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          owner: VSCodeTriageBot
-          repo: testissues
-
-      - name: Run New Release
-        uses: ./actions/new-release
-        with:
-          label: new release
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
-          labelColor: "006b75"
-          labelDescription: Issues found in a recent release of VS Code
-          oldVersionMessage: "Thanks for creating this issue! It looks like you may be using an old version of VS Code, the latest stable release is {currentVersion}. Please try upgrading to the latest version and checking whether this issue remains.\n\nHappy Coding!"
-          days: 5
-
-      - name: Run Clipboard Labeler
-        uses: ./actions/regex-labeler
-        with:
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
-          label: "invalid"
-          mustNotMatch: "^We have written the needed data into your clipboard because it was too large to send\\. Please paste\\.$"
-          comment: "It looks like you're using the VS Code Issue Reporter but did not paste the text generated into the created issue. We've closed this issue, please open a new one containing the text we placed in your clipboard.\n\nHappy Coding!"
-
-      - name: Run Clipboard Labeler (Chinese)
-        uses: ./actions/regex-labeler
-        with:
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
-          label: "invalid"
-          mustNotMatch: "^所需的数据太大，无法直接发送。我们已经将其写入剪贴板，请粘贴。$"
-          comment: "看起来您正在使用 VS Code 问题报告程序，但是没有将生成的文本粘贴到创建的问题中。我们将关闭这个问题，请使用剪贴板中的内容创建一个新的问题。\n\n祝您使用愉快！"
-
-      # source of truth in ./english-please.yml
-      - name: Run English Please
-        uses: ./actions/english-please
-        with:
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
-          cognitiveServicesAPIKey: ${{secrets.AZURE_TEXT_TRANSLATOR_KEY}}
-          nonEnglishLabel: "*english-please"
-          needsMoreInfoLabel: "info-needed"
-          translatorRequestedLabelPrefix: "translation-required-"
-          translatorRequestedLabelColor: "c29cff"
-            # source of truth in ./test-plan-item-validator.yml
-      - name: Run Test Plan Item Validator
-        uses: ./actions/test-plan-item-validator
-        with:
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          refLabel: on-testplan
-          label: testplan-item
-          invalidLabel: invalid-testplan-item
-          comment: Invalid test plan item. See errors below and the [test plan item spec](https://github.com/microsoft/vscode/wiki/Writing-Test-Plan-Items) for more information. This comment will go away when the issues are resolved.
-
diff --git a/.github/workflows/release-pipeline-labeler.yml b/.github/workflows/release-pipeline-labeler.yml
deleted file mode 100644
index 87e188a02ab..00000000000
--- a/.github/workflows/release-pipeline-labeler.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: "Release Pipeline Labeler"
-on:
-  issues:
-    types: [closed, reopened]
-  repository_dispatch:
-    types: [released-insider]
-
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v4
-        with:
-          repository: "microsoft/vscode-github-triage-actions"
-          ref: stable
-          path: ./actions
-      - name: Checkout Repo
-        if: github.event_name != 'issues'
-        uses: actions/checkout@v4
-        with:
-          path: ./repo
-          fetch-depth: 0
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-      - name: "Run Release Pipeline Labeler"
-        uses: ./actions/release-pipeline
-        with:
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
-          notYetReleasedLabel: unreleased
-          insidersReleasedLabel: insiders-released
diff --git a/.github/workflows/rich-navigation.yml.off b/.github/workflows/rich-navigation.yml.off
index 73d073f4d7b..cc22d83030d 100644
--- a/.github/workflows/rich-navigation.yml.off
+++ b/.github/workflows/rich-navigation.yml.off
@@ -18,7 +18,7 @@ jobs:
         name: Cache VS Code dependencies
         with:
           path: node_modules
-          key: ${{ runner.os }}-dependencies-${{ hashfiles('yarn.lock') }}
+          key: ${{ runner.os }}-dependencies-${{ hashfiles('package-lock.json') }}
           restore-keys: ${{ runner.os }}-dependencies-
 
       - uses: actions/setup-node@v3
@@ -27,7 +27,7 @@ jobs:
 
       - name: Install dependencies
         if: steps.caching-stage.outputs.cache-hit != 'true'
-        run: yarn --frozen-lockfile
+        run: npm ci
         env:
           CHILD_CONCURRENCY: 1
 
diff --git a/.github/workflows/telemetry.yml b/.github/workflows/telemetry.yml
index d463a0e2eca..d29ea6c58da 100644
--- a/.github/workflows/telemetry.yml
+++ b/.github/workflows/telemetry.yml
@@ -16,4 +16,4 @@ jobs:
       - name: 'Run vscode-telemetry-extractor'
         run: 'npx --package=@vscode/telemetry-extractor --yes vscode-telemetry-extractor -s .'
         env:
-          GITHUB_TOKEN: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/test-plan-item-validator.yml b/.github/workflows/test-plan-item-validator.yml
deleted file mode 100644
index 117eaf6908a..00000000000
--- a/.github/workflows/test-plan-item-validator.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: Test Plan Item Validator
-on:
-  issues:
-    types: [edited]
-
-# also edit in ./on-label.yml and ./on-open.yml
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Actions
-        if: contains(github.event.issue.labels.*.name, 'testplan-item') || contains(github.event.issue.labels.*.name, 'invalid-testplan-item')
-        uses: actions/checkout@v4
-        with:
-          repository: "microsoft/vscode-github-triage-actions"
-          path: ./actions
-          ref: stable
-      - name: Install Actions
-        if: contains(github.event.issue.labels.*.name, 'testplan-item') || contains(github.event.issue.labels.*.name, 'invalid-testplan-item')
-        run: npm install --production --prefix ./actions
-      - name: Run Test Plan Item Validator
-        if: contains(github.event.issue.labels.*.name, 'testplan-item') || contains(github.event.issue.labels.*.name, 'invalid-testplan-item')
-        uses: ./actions/test-plan-item-validator
-        with:
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          refLabel: on-testplan
-          label: testplan-item
-          invalidLabel: invalid-testplan-item
-          comment: Invalid test plan item. See errors below and the [test plan item spec](https://github.com/microsoft/vscode/wiki/Writing-Test-Plan-Items) for more information. This comment will go away when the issues are resolved.
diff --git a/.gitignore b/.gitignore
index 123b3567059..b73ce578e7f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,7 @@ build/node_modules
 coverage/
 test_data/
 test-results/
-yarn-error.log
+test-results.xml
 vscode.lsif
 vscode.db
 /.profile-oss
diff --git a/.npmrc b/.npmrc
new file mode 100644
index 00000000000..b54679bde3c
--- /dev/null
+++ b/.npmrc
@@ -0,0 +1,7 @@
+disturl="https://electronjs.org/headers"
+target="30.5.1"
+ms_build_id="10306386"
+runtime="electron"
+build_from_source="true"
+legacy-peer-deps="true"
+timeout=180000
diff --git a/.nvmrc b/.nvmrc
index bc78e9f2695..8ce7030825b 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-20.12.1
+20.16.0
diff --git a/.vscode-test.js b/.vscode-test.js
index f2db8d695fe..89e1b855ee0 100644
--- a/.vscode-test.js
+++ b/.vscode-test.js
@@ -45,6 +45,10 @@ const extensions = [
 		label: 'github-authentication',
 		workspaceFolder: path.join(os.tmpdir(), `msft-auth-${Math.floor(Math.random() * 100000)}`),
 		mocha: { timeout: 60_000 }
+	},
+	{
+		label: 'microsoft-authentication',
+		mocha: { timeout: 60_000 }
 	}
 ];
 
diff --git a/.vscode/extensions/vscode-selfhost-import-aid/.vscode/launch.json b/.vscode/extensions/vscode-selfhost-import-aid/.vscode/launch.json
new file mode 100644
index 00000000000..50b8aedaf72
--- /dev/null
+++ b/.vscode/extensions/vscode-selfhost-import-aid/.vscode/launch.json
@@ -0,0 +1,16 @@
+{
+	"configurations": [
+		{
+			"args": [
+				"--extensionDevelopmentPath=${workspaceFolder}",
+				"--enable-proposed-api=ms-vscode.vscode-selfhost-import-aid"
+			],
+			"name": "Launch Extension",
+			"outFiles": [
+				"${workspaceFolder}/out/**/*.js"
+			],
+			"request": "launch",
+			"type": "extensionHost"
+		}
+	]
+}
diff --git a/.vscode/extensions/vscode-selfhost-import-aid/.vscode/settings.json b/.vscode/extensions/vscode-selfhost-import-aid/.vscode/settings.json
new file mode 100644
index 00000000000..e4429caeee4
--- /dev/null
+++ b/.vscode/extensions/vscode-selfhost-import-aid/.vscode/settings.json
@@ -0,0 +1,7 @@
+{
+	"editor.formatOnSave": true,
+	"editor.defaultFormatter": "vscode.typescript-language-features",
+	"editor.codeActionsOnSave": {
+		"source.organizeImports": "always"
+	}
+}
diff --git a/.vscode/extensions/vscode-selfhost-import-aid/package-lock.json b/.vscode/extensions/vscode-selfhost-import-aid/package-lock.json
new file mode 100644
index 00000000000..5f526aca3e9
--- /dev/null
+++ b/.vscode/extensions/vscode-selfhost-import-aid/package-lock.json
@@ -0,0 +1,31 @@
+{
+  "name": "vscode-selfhost-import-aid",
+  "version": "0.0.1",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "vscode-selfhost-import-aid",
+      "version": "0.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "typescript": "5.5.4"
+      },
+      "engines": {
+        "vscode": "^1.88.0"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "5.5.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
+      "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    }
+  }
+}
diff --git a/.vscode/extensions/vscode-selfhost-import-aid/package.json b/.vscode/extensions/vscode-selfhost-import-aid/package.json
new file mode 100644
index 00000000000..30f09f9c8e5
--- /dev/null
+++ b/.vscode/extensions/vscode-selfhost-import-aid/package.json
@@ -0,0 +1,29 @@
+{
+  "name": "vscode-selfhost-import-aid",
+  "displayName": "VS Code Selfhost Import Aid",
+  "description": "Util to improve dealing with imports",
+  "engines": {
+    "vscode": "^1.88.0"
+  },
+  "version": "0.0.1",
+  "publisher": "ms-vscode",
+  "categories": [
+    "Other"
+  ],
+  "activationEvents": [
+    "onLanguage:typescript"
+  ],
+  "main": "./out/extension.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/microsoft/vscode.git"
+  },
+  "license": "MIT",
+  "scripts": {
+    "compile": "gulp compile-extension:vscode-selfhost-import-aid",
+    "watch": "gulp watch-extension:vscode-selfhost-import-aid"
+  },
+  "dependencies": {
+    "typescript": "5.5.4"
+  }
+}
diff --git a/.vscode/extensions/vscode-selfhost-import-aid/src/extension.ts b/.vscode/extensions/vscode-selfhost-import-aid/src/extension.ts
new file mode 100644
index 00000000000..91627e69f34
--- /dev/null
+++ b/.vscode/extensions/vscode-selfhost-import-aid/src/extension.ts
@@ -0,0 +1,234 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import * as ts from 'typescript';
+import * as path from 'path';
+
+export async function activate(context: vscode.ExtensionContext) {
+
+	const fileIndex = new class {
+
+		private _currentRun?: Thenable<void>;
+
+		private _disposables: vscode.Disposable[] = [];
+
+		private readonly _index = new Map<string, vscode.Uri>();
+
+		constructor() {
+			const watcher = vscode.workspace.createFileSystemWatcher('**/*.ts', false, true, false);
+			this._disposables.push(watcher.onDidChange(e => { this._index.set(e.toString(), e); }));
+			this._disposables.push(watcher.onDidDelete(e => { this._index.delete(e.toString()); }));
+			this._disposables.push(watcher);
+
+			this._refresh(false);
+		}
+
+		dispose(): void {
+			for (const disposable of this._disposables) {
+				disposable.dispose();
+			}
+			this._disposables = [];
+			this._index.clear();
+		}
+
+		async all(token: vscode.CancellationToken) {
+
+			await Promise.race([this._currentRun, new Promise<void>(resolve => token.onCancellationRequested(resolve))]);
+
+			if (token.isCancellationRequested) {
+				return undefined;
+			}
+
+			return Array.from(this._index.values());
+		}
+
+		private _refresh(clear: boolean) {
+			// TODO@jrieken LATEST API! findFiles2New
+			this._currentRun = vscode.workspace.findFiles('src/vs/**/*.ts', '{**/node_modules/**,**/extensions/**}').then(all => {
+				if (clear) {
+					this._index.clear();
+				}
+				for (const item of all) {
+					this._index.set(item.toString(), item);
+				}
+			});
+		}
+	};
+
+	const selector: vscode.DocumentSelector = 'typescript';
+
+	function findNodeAtPosition(document: vscode.TextDocument, node: ts.Node, position: vscode.Position): ts.Node | undefined {
+		if (node.getStart() <= document.offsetAt(position) && node.getEnd() >= document.offsetAt(position)) {
+			return ts.forEachChild(node, child => findNodeAtPosition(document, child, position)) || node;
+		}
+		return undefined;
+	}
+
+	function findImportAt(document: vscode.TextDocument, position: vscode.Position): ts.ImportDeclaration | undefined {
+		const sourceFile = ts.createSourceFile(document.fileName, document.getText(), ts.ScriptTarget.Latest, true);
+		const node = findNodeAtPosition(document, sourceFile, position);
+		if (node && ts.isStringLiteral(node) && ts.isImportDeclaration(node.parent)) {
+			return node.parent;
+		}
+		return undefined;
+	}
+
+	const completionProvider = new class implements vscode.CompletionItemProvider {
+		async provideCompletionItems(document: vscode.TextDocument, position: vscode.Position, token: vscode.CancellationToken): Promise<vscode.CompletionList | undefined> {
+
+			const index = document.getText().lastIndexOf(' from \'');
+			if (index < 0 || document.positionAt(index).line < position.line) {
+				// line after last import is before position
+				// -> no completion, safe a parse call
+				return undefined;
+			}
+
+			const node = findImportAt(document, position);
+			if (!node) {
+				return undefined;
+			}
+
+			const range = new vscode.Range(document.positionAt(node.moduleSpecifier.pos), document.positionAt(node.moduleSpecifier.end));
+			const uris = await fileIndex.all(token);
+
+			if (!uris) {
+				return undefined;
+			}
+
+			const result = new vscode.CompletionList();
+			result.isIncomplete = true;
+
+			for (const item of uris) {
+
+				if (!item.path.endsWith('.ts')) {
+					continue;
+				}
+
+				let relativePath = path.relative(path.dirname(document.uri.path), item.path);
+				relativePath = relativePath.startsWith('.') ? relativePath : `./${relativePath}`;
+
+				const label = path.basename(item.path, path.extname(item.path));
+				const insertText = ` '${relativePath.replace(/\.ts$/, '.js')}'`;
+				const filterText = ` '${label}'`;
+
+				const completion = new vscode.CompletionItem({
+					label: label,
+					description: vscode.workspace.asRelativePath(item),
+				});
+				completion.kind = vscode.CompletionItemKind.File;
+				completion.insertText = insertText;
+				completion.filterText = filterText;
+				completion.range = range;
+
+				result.items.push(completion);
+			}
+
+			return result;
+		}
+	};
+
+	class ImportCodeActions implements vscode.CodeActionProvider {
+
+		static FixKind = vscode.CodeActionKind.QuickFix.append('esmImport');
+
+		static SourceKind = vscode.CodeActionKind.SourceFixAll.append('esmImport');
+
+		async provideCodeActions(document: vscode.TextDocument, range: vscode.Range | vscode.Selection, context: vscode.CodeActionContext, token: vscode.CancellationToken): Promise<vscode.CodeAction[] | undefined> {
+
+			if (context.only && ImportCodeActions.SourceKind.intersects(context.only)) {
+				return this._provideFixAll(document, context, token);
+			}
+
+			return this._provideFix(document, range, context, token);
+		}
+
+		private async _provideFixAll(document: vscode.TextDocument, context: vscode.CodeActionContext, token: vscode.CancellationToken): Promise<vscode.CodeAction[] | undefined> {
+
+			const diagnostics = context.diagnostics
+				.filter(d => d.code === 2307)
+				.sort((a, b) => b.range.start.compareTo(a.range.start));
+
+			if (diagnostics.length === 0) {
+				return undefined;
+			}
+
+			const uris = await fileIndex.all(token);
+			if (!uris) {
+				return undefined;
+			}
+
+			const result = new vscode.CodeAction(`Fix All ESM Imports`, ImportCodeActions.SourceKind);
+			result.edit = new vscode.WorkspaceEdit();
+			result.diagnostics = [];
+
+			for (const diag of diagnostics) {
+
+				const actions = this._provideFixesForDiag(document, diag, uris);
+
+				if (actions.length === 0) {
+					console.log(`ESM: no fixes for "${diag.message}"`);
+					continue;
+				}
+
+				if (actions.length > 1) {
+					console.log(`ESM: more than one fix for "${diag.message}", taking first`);
+					console.log(actions);
+				}
+
+				const [first] = actions;
+				result.diagnostics.push(diag);
+
+				for (const [uri, edits] of first.edit!.entries()) {
+					result.edit.set(uri, edits);
+				}
+			}
+			// console.log(result.edit.get(document.uri));
+			return [result];
+		}
+
+		private async _provideFix(document: vscode.TextDocument, range: vscode.Range | vscode.Selection, context: vscode.CodeActionContext, token: vscode.CancellationToken): Promise<vscode.CodeAction[] | undefined> {
+			const uris = await fileIndex.all(token);
+			if (!uris) {
+				return [];
+			}
+
+			const diag = context.diagnostics.find(d => d.code === 2307 && d.range.intersection(range));
+			return diag && this._provideFixesForDiag(document, diag, uris);
+		}
+
+		private _provideFixesForDiag(document: vscode.TextDocument, diag: vscode.Diagnostic, uris: Iterable<vscode.Uri>): vscode.CodeAction[] {
+
+			const node = findImportAt(document, diag.range.start)?.moduleSpecifier;
+			if (!node || !ts.isStringLiteral(node)) {
+				return [];
+			}
+
+			const nodeRange = new vscode.Range(document.positionAt(node.pos), document.positionAt(node.end));
+			const name = path.basename(node.text, path.extname(node.text));
+
+			const result: vscode.CodeAction[] = [];
+
+			for (const item of uris) {
+				if (path.basename(item.path, path.extname(item.path)) === name) {
+					let relativePath = path.relative(path.dirname(document.uri.path), item.path).replace(/\.ts$/, '.js');
+					relativePath = relativePath.startsWith('.') ? relativePath : `./${relativePath}`;
+
+					const action = new vscode.CodeAction(`Fix to '${relativePath}'`, ImportCodeActions.FixKind);
+					action.edit = new vscode.WorkspaceEdit();
+					action.edit.replace(document.uri, nodeRange, ` '${relativePath}'`);
+					action.diagnostics = [diag];
+					result.push(action);
+				}
+			}
+
+			return result;
+		}
+	}
+
+	context.subscriptions.push(fileIndex);
+	context.subscriptions.push(vscode.languages.registerCompletionItemProvider(selector, completionProvider));
+	context.subscriptions.push(vscode.languages.registerCodeActionsProvider(selector, new ImportCodeActions(), { providedCodeActionKinds: [ImportCodeActions.FixKind, ImportCodeActions.SourceKind] }));
+}
diff --git a/.vscode/extensions/vscode-selfhost-import-aid/tsconfig.json b/.vscode/extensions/vscode-selfhost-import-aid/tsconfig.json
new file mode 100644
index 00000000000..bbca76708ca
--- /dev/null
+++ b/.vscode/extensions/vscode-selfhost-import-aid/tsconfig.json
@@ -0,0 +1,14 @@
+{
+	"extends": "../../../extensions/tsconfig.base.json",
+	"compilerOptions": {
+		"outDir": "./out",
+		"types": [
+			"node",
+			"mocha",
+		]
+	},
+	"include": [
+		"src/**/*",
+		"../../../src/vscode-dts/vscode.d.ts"
+	]
+}
diff --git a/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json b/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json
new file mode 100644
index 00000000000..a71a68e4e36
--- /dev/null
+++ b/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json
@@ -0,0 +1,101 @@
+{
+  "name": "vscode-selfhost-test-provider",
+  "version": "0.4.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "vscode-selfhost-test-provider",
+      "version": "0.4.0",
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "ansi-styles": "^5.2.0",
+        "cockatiel": "^3.1.3",
+        "istanbul-to-vscode": "^2.0.1"
+      },
+      "devDependencies": {
+        "@types/mocha": "^10.0.6",
+        "@types/node": "20.x"
+      },
+      "engines": {
+        "vscode": "^1.88.0"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
+    "node_modules/@types/istanbul-lib-coverage": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
+      "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w=="
+    },
+    "node_modules/@types/mocha": {
+      "version": "10.0.6",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.6.tgz",
+      "integrity": "sha512-dJvrYWxP/UcXm36Qn36fxhUKu8A/xMRXVT2cliFF1Z7UA9liG5Psj3ezNSZw+5puH2czDXRLcXQxf8JbJt0ejg==",
+      "dev": true
+    },
+    "node_modules/@types/node": {
+      "version": "20.12.11",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.11.tgz",
+      "integrity": "sha512-vDg9PZ/zi+Nqp6boSOT7plNuthRugEKixDv5sFTIpkE89MmNtEArAShI4mxuX2+UrLEe9pxC1vm2cjm9YlWbJw==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/cockatiel": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/cockatiel/-/cockatiel-3.1.3.tgz",
+      "integrity": "sha512-xC759TpZ69d7HhfDp8m2WkRwEUiCkxY8Ee2OQH/3H6zmy2D/5Sm+zSTbPRa+V2QyjDtpMvjOIAOVjA2gp6N1kQ==",
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/istanbul-to-vscode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-to-vscode/-/istanbul-to-vscode-2.0.1.tgz",
+      "integrity": "sha512-V9Hhr7kX3UvkvkaT1lK3AmCRPkaIAIogQBrduTpNiLTkp1eVsybnJhWiDSVeCQap/3aGeZ2019oIivhX9MNsCQ==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.6"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    }
+  }
+}
diff --git a/.vscode/extensions/vscode-selfhost-test-provider/package.json b/.vscode/extensions/vscode-selfhost-test-provider/package.json
index f472098cd14..3548b00ba81 100644
--- a/.vscode/extensions/vscode-selfhost-test-provider/package.json
+++ b/.vscode/extensions/vscode-selfhost-test-provider/package.json
@@ -4,6 +4,7 @@
   "description": "Test provider for the VS Code project",
   "enabledApiProposals": [
     "testObserver",
+    "testRelatedCode",
     "attributableCoverage"
   ],
   "engines": {
@@ -83,6 +84,7 @@
   "dependencies": {
     "@jridgewell/trace-mapping": "^0.3.25",
     "ansi-styles": "^5.2.0",
+    "cockatiel": "^3.1.3",
     "istanbul-to-vscode": "^2.0.1"
   }
 }
diff --git a/.vscode/extensions/vscode-selfhost-test-provider/src/coverageProvider.ts b/.vscode/extensions/vscode-selfhost-test-provider/src/coverageProvider.ts
index 7280782c10a..3fff7c5b637 100644
--- a/.vscode/extensions/vscode-selfhost-test-provider/src/coverageProvider.ts
+++ b/.vscode/extensions/vscode-selfhost-test-provider/src/coverageProvider.ts
@@ -5,7 +5,7 @@
 
 import { IstanbulCoverageContext } from 'istanbul-to-vscode';
 import * as vscode from 'vscode';
-import { SourceLocationMapper, SourceMapStore } from './testOutputScanner';
+import { SearchStrategy, SourceLocationMapper, SourceMapStore } from './testOutputScanner';
 import { IScriptCoverage, OffsetToPosition, RangeCoverageTracker } from './v8CoverageWrangling';
 
 export const istanbulCoverageContext = new IstanbulCoverageContext();
@@ -18,7 +18,7 @@ export const istanbulCoverageContext = new IstanbulCoverageContext();
 export class PerTestCoverageTracker {
 	private readonly scripts = new Map</* script ID */ string, Script>();
 
-	constructor(private readonly maps: SourceMapStore) {}
+	constructor(private readonly maps: SourceMapStore) { }
 
 	public add(coverage: IScriptCoverage, test?: vscode.TestItem) {
 		const script = this.scripts.get(coverage.scriptId);
@@ -71,11 +71,7 @@ class Script {
 	public async report(run: vscode.TestRun) {
 		const mapper = await this.maps.getSourceLocationMapper(this.uri.toString());
 		const originalUri = (await this.maps.getSourceFile(this.uri.toString())) || this.uri;
-
-		run.addCoverage(this.overall.report(originalUri, this.converter, mapper));
-		for (const [test, projection] of this.perItem) {
-			run.addCoverage(projection.report(originalUri, this.converter, mapper, test));
-		}
+		run.addCoverage(this.overall.report(originalUri, this.converter, mapper, this.perItem));
 	}
 }
 
@@ -88,6 +84,43 @@ class ScriptCoverageTracker {
 		}
 	}
 
+	public *toDetails(
+		uri: vscode.Uri,
+		convert: OffsetToPosition,
+		mapper: SourceLocationMapper | undefined,
+	) {
+		for (const range of this.coverage) {
+			if (range.start === range.end) {
+				continue;
+			}
+
+			const startCov = convert.toLineColumn(range.start);
+			let start = new vscode.Position(startCov.line, startCov.column);
+
+			const endCov = convert.toLineColumn(range.end);
+			let end = new vscode.Position(endCov.line, endCov.column);
+			if (mapper) {
+				const startMap = mapper(start.line, start.character, SearchStrategy.FirstAfter);
+				const endMap = startMap && mapper(end.line, end.character, SearchStrategy.FirstBefore);
+				if (!endMap || uri.toString().toLowerCase() !== endMap.uri.toString().toLowerCase()) {
+					continue;
+				}
+				start = startMap.range.start;
+				end = endMap.range.end;
+			}
+
+			for (let i = start.line; i <= end.line; i++) {
+				yield new vscode.StatementCoverage(
+					range.covered,
+					new vscode.Range(
+						new vscode.Position(i, i === start.line ? start.character : 0),
+						new vscode.Position(i, i === end.line ? end.character : Number.MAX_SAFE_INTEGER)
+					)
+				);
+			}
+		}
+	}
+
 	/**
 	 * Generates the script's coverage for the test run.
 	 *
@@ -98,53 +131,27 @@ class ScriptCoverageTracker {
 		uri: vscode.Uri,
 		convert: OffsetToPosition,
 		mapper: SourceLocationMapper | undefined,
-		item?: vscode.TestItem
+		items: Map<vscode.TestItem, ScriptCoverageTracker>,
 	): V8CoverageFile {
-		const file = new V8CoverageFile(uri, item);
-
-		for (const range of this.coverage) {
-			if (range.start === range.end) {
-				continue;
-			}
-
-			const startCov = convert.toLineColumn(range.start);
-			let start = new vscode.Position(startCov.line, startCov.column);
-
-			const endCov = convert.toLineColumn(range.end);
-			let end = new vscode.Position(endCov.line, endCov.column);
-			if (mapper) {
-				const startMap = mapper(start.line, start.character);
-				const endMap = startMap && mapper(end.line, end.character);
-				if (!endMap || uri.toString().toLowerCase() !== endMap.uri.toString().toLowerCase()) {
-					continue;
-				}
-				start = startMap.range.start;
-				end = endMap.range.end;
-			}
-
-			for (let i = start.line; i <= end.line; i++) {
-				file.add(
-					new vscode.StatementCoverage(
-						range.covered,
-						new vscode.Range(
-							new vscode.Position(i, i === start.line ? start.character : 0),
-							new vscode.Position(i, i === end.line ? end.character : Number.MAX_SAFE_INTEGER)
-						)
-					)
-				);
-			}
+		const file = new V8CoverageFile(uri, items, convert, mapper);
+		for (const detail of this.toDetails(uri, convert, mapper)) {
+			file.add(detail);
 		}
 
 		return file;
 	}
 }
 
-export class V8CoverageFile extends vscode.FileCoverage {
+export class V8CoverageFile extends vscode.FileCoverage2 {
 	public details: vscode.StatementCoverage[] = [];
 
-	constructor(uri: vscode.Uri, item?: vscode.TestItem) {
-		super(uri, { covered: 0, total: 0 });
-		(this as vscode.FileCoverage2).testItem = item;
+	constructor(
+		uri: vscode.Uri,
+		private readonly perTest: Map<vscode.TestItem, ScriptCoverageTracker>,
+		private readonly convert: OffsetToPosition,
+		private readonly mapper: SourceLocationMapper | undefined,
+	) {
+		super(uri, { covered: 0, total: 0 }, undefined, undefined, [...perTest.keys()]);
 	}
 
 	public add(detail: vscode.StatementCoverage) {
@@ -154,4 +161,9 @@ export class V8CoverageFile extends vscode.FileCoverage {
 			this.statementCoverage.covered++;
 		}
 	}
+
+	public testDetails(test: vscode.TestItem): vscode.FileCoverageDetail[] {
+		const t = this.perTest.get(test);
+		return t ? [...t.toDetails(this.uri, this.convert, this.mapper)] : [];
+	}
 }
diff --git a/.vscode/extensions/vscode-selfhost-test-provider/src/extension.ts b/.vscode/extensions/vscode-selfhost-test-provider/src/extension.ts
index c61fd565146..2732ef3b3f6 100644
--- a/.vscode/extensions/vscode-selfhost-test-provider/src/extension.ts
+++ b/.vscode/extensions/vscode-selfhost-test-provider/src/extension.ts
@@ -20,6 +20,7 @@ import {
 	itemData,
 } from './testTree';
 import { BrowserTestRunner, PlatformTestRunner, VSCodeTestRunner } from './vscodeTestRunner';
+import { ImportGraph } from './importGraph';
 
 const TEST_FILE_PATTERN = 'src/vs/**/*.{test,integrationTest}.ts';
 
@@ -44,17 +45,22 @@ export async function activate(context: vscode.ExtensionContext) {
 	context.subscriptions.push(vscode.tests.registerTestFollowupProvider({
 		async provideFollowup(_result, test, taskIndex, messageIndex, _token) {
 			return [{
-				title: '$(sparkle) Ask copilot for help',
+				title: '$(sparkle) Fix with Copilot',
 				command: 'github.copilot.tests.fixTestFailure',
 				arguments: [{ source: 'peekFollowup', test, message: test.taskStates[taskIndex].messages[messageIndex] }]
 			}];
 		},
 	}));
 
-
-	ctrl.resolveHandler = async test => {
+	let initialWatchPromise: Promise<vscode.Disposable> | undefined;
+	const resolveHandler = async (test?: vscode.TestItem) => {
 		if (!test) {
-			context.subscriptions.push(await startWatchingWorkspace(ctrl, fileChangedEmitter));
+			if (!initialWatchPromise) {
+				initialWatchPromise = startWatchingWorkspace(ctrl, fileChangedEmitter);
+				context.subscriptions.push(await initialWatchPromise);
+			} else {
+				await initialWatchPromise;
+			}
 			return;
 		}
 
@@ -66,10 +72,24 @@ export async function activate(context: vscode.ExtensionContext) {
 		}
 	};
 
+	ctrl.resolveHandler = resolveHandler;
+
 	guessWorkspaceFolder().then(folder => {
-		if (folder) {
-			context.subscriptions.push(new FailureTracker(context, folder.uri.fsPath));
+		if (!folder) {
+			return;
 		}
+
+		const graph = new ImportGraph(
+			folder.uri, async () => {
+				await resolveHandler();
+				return [...ctrl.items].map(([, item]) => item);
+			}, uri => ctrl.items.get(uri.toString().toLowerCase()));
+		ctrl.relatedCodeProvider = graph;
+
+		context.subscriptions.push(
+			new FailureTracker(context, folder.uri.fsPath),
+			fileChangedEmitter.event(e => graph.didChange(e.uri, e.removed)),
+		);
 	});
 
 	const createRunHandler = (
@@ -196,13 +216,8 @@ export async function activate(context: vscode.ExtensionContext) {
 		true
 	);
 
-	coverage.loadDetailedCoverage = async (_run, coverage) => {
-		if (coverage instanceof V8CoverageFile) {
-			return coverage.details;
-		}
-
-		return [];
-	};
+	coverage.loadDetailedCoverage = async (_run, coverage) => coverage instanceof V8CoverageFile ? coverage.details : [];
+	coverage.loadDetailedCoverageForTest = async (_run, coverage, test) => coverage instanceof V8CoverageFile ? coverage.testDetails(test) : [];
 
 	for (const [name, arg] of browserArgs) {
 		const cfg = ctrl.createRunProfile(
diff --git a/.vscode/extensions/vscode-selfhost-test-provider/src/importGraph.ts b/.vscode/extensions/vscode-selfhost-test-provider/src/importGraph.ts
new file mode 100644
index 00000000000..ab3c25720ac
--- /dev/null
+++ b/.vscode/extensions/vscode-selfhost-test-provider/src/importGraph.ts
@@ -0,0 +1,239 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { join } from 'path';
+import * as vscode from 'vscode';
+import { bulkhead } from 'cockatiel';
+import { promises as fs } from 'fs';
+
+const maxInt32 = 2 ** 31 - 1;
+
+// limit concurrency to avoid overwhelming the filesystem during discovery
+const discoverLimiter = bulkhead(8, Infinity);
+
+// Max import distance when listing related code to improve relevancy.
+const defaultMaxDistance = 3;
+
+/**
+ * Maintains a graph of imports in the codebase. This works lazily resolving
+ * imports and re-parsing files only on request.
+ *
+ * This is a rough, file-level graph derived from simple regex matching on
+ * source files to avoid having to parse the AST of every file in the codebase,
+ * which is possible but more intensive. (See: all the years of work from the
+ * TS language server.)
+ *
+ * A more advanced implementation could use references from the language server.
+ */
+export class ImportGraph implements vscode.TestRelatedCodeProvider {
+	private graph = new Map<string, FileNode>();
+
+	constructor(
+		private readonly root: vscode.Uri,
+		private readonly discoverWorkspaceTests: () => Thenable<vscode.TestItem[]>,
+		private readonly getTestNodeForDoc: (uri: vscode.Uri) => vscode.TestItem | undefined,
+	) { }
+
+	/** @inheritdoc */
+	public async provideRelatedCode(test: vscode.TestItem, token: vscode.CancellationToken): Promise<vscode.Location[]> {
+		// this is kind of a stub for this implementation. Naive following imports
+		// isn't that useful for finding a test's related code.
+		const node = await this.discoverOutwards(test.uri, new Set(), defaultMaxDistance, token);
+		if (!node) {
+			return [];
+		}
+
+		const imports = new Set<string>();
+		const queue = [{ distance: 0, next: node.imports }];
+		while (queue.length) {
+			const { distance, next } = queue.shift()!;
+			for (const imp of next) {
+				if (imports.has(imp.path)) {
+					continue;
+				}
+
+				imports.add(imp.path);
+				if (distance < defaultMaxDistance) {
+					queue.push({ next: imp.imports, distance: distance + 1 });
+				}
+			}
+		}
+
+		return [...imports].map(importPath =>
+			new vscode.Location(
+				vscode.Uri.file(join(this.root.fsPath, 'src', `${importPath}.ts`)),
+				new vscode.Range(0, 0, maxInt32, 0),
+			),
+		);
+	}
+
+	/** @inheritdoc */
+	public async provideRelatedTests(document: vscode.TextDocument, _position: vscode.Position, token: vscode.CancellationToken): Promise<vscode.TestItem[]> {
+		// Expand all known tests to ensure imports of this file are realized.
+		const rootTests = await this.discoverWorkspaceTests();
+		const seen = new Set<string>();
+		await Promise.all(rootTests.map(v => v.uri && this.discoverOutwards(v.uri, seen, defaultMaxDistance, token)));
+
+		const node = this.getNode(document.uri);
+		if (!node) {
+			return [];
+		}
+
+		const tests: vscode.TestItem[] = [];
+		const queue: { next: FileNode; distance: number }[] = [{ next: node, distance: 0 }];
+		const visited = new Set<FileNode>();
+		let maxDistance = Infinity;
+
+		while (queue.length) {
+			const { next, distance } = queue.shift()!;
+			if (visited.has(next)) {
+				continue;
+			}
+
+			visited.add(next);
+			const testForDoc = this.getTestNodeForDoc(next.uri);
+			if (testForDoc) {
+				tests.push(testForDoc);
+				// only look for tests half again as far away as the closest test to keep things relevant
+				if (!Number.isFinite(maxDistance)) {
+					maxDistance = distance * 3 / 2;
+				}
+			}
+
+			if (distance < maxDistance) {
+				for (const importedByNode of next.importedBy) {
+					queue.push({ next: importedByNode, distance: distance + 1 });
+				}
+			}
+		}
+
+		return tests;
+	}
+
+	public didChange(uri: vscode.Uri, deleted: boolean) {
+		const rel = this.uriToImportPath(uri);
+		const node = rel && this.graph.get(rel);
+		if (!node) {
+			return;
+		}
+
+		if (deleted) {
+			this.graph.delete(rel);
+			for (const imp of node.imports) {
+				imp.importedBy.delete(node);
+			}
+		} else {
+			node.isSynced = false;
+		}
+	}
+
+	private getNode(uri: vscode.Uri | undefined): FileNode | undefined {
+		const rel = this.uriToImportPath(uri);
+		return rel ? this.graph.get(rel) : undefined;
+	}
+
+	/** Discover all nodes that import the file */
+	private async discoverOutwards(uri: vscode.Uri | undefined, seen: Set<string>, maxDistance: number, token: vscode.CancellationToken): Promise<FileNode | undefined> {
+		const rel = this.uriToImportPath(uri);
+		if (!rel) {
+			return undefined;
+		}
+
+		let node = this.graph.get(rel);
+		if (!node) {
+			node = new FileNode(uri!, rel);
+			this.graph.set(rel, node);
+		}
+
+		await this.discoverOutwardsInner(node, seen, maxDistance, token);
+		return node;
+	}
+
+	private async discoverOutwardsInner(node: FileNode, seen: Set<string>, maxDistance: number, token: vscode.CancellationToken) {
+		if (seen.has(node.path) || maxDistance === 0) {
+			return;
+		}
+
+		seen.add(node.path);
+		if (node.isSynced === false) {
+			await this.syncNode(node);
+		} else if (node.isSynced instanceof Promise) {
+			await node.isSynced;
+		}
+
+		if (token.isCancellationRequested) {
+			return;
+		}
+		await Promise.all([...node.imports].map(i => this.discoverOutwardsInner(i, seen, maxDistance - 1, token)));
+	}
+
+	private async syncNode(node: FileNode) {
+		node.isSynced = discoverLimiter.execute(async () => {
+			const doc = vscode.workspace.textDocuments.find(d => d.uri.toString() === node.uri.toString());
+
+			let text: string;
+			if (doc) {
+				text = doc.getText();
+			} else {
+				try {
+					text = await fs.readFile(node.uri.fsPath, 'utf8');
+				} catch {
+					text = '';
+				}
+			}
+
+			for (const imp of node.imports) {
+				imp.importedBy.delete(node);
+			}
+			node.imports.clear();
+
+			for (const [, importPath] of text.matchAll(IMPORT_RE)) {
+				let imp = this.graph.get(importPath);
+				if (!imp) {
+					imp = new FileNode(this.importPathToUri(importPath), importPath);
+					this.graph.set(importPath, imp);
+				}
+
+				imp.importedBy.add(node);
+				node.imports.add(imp);
+			}
+
+			node.isSynced = true;
+		});
+
+		await node.isSynced;
+	}
+
+	private uriToImportPath(uri: vscode.Uri | undefined) {
+		if (!uri) {
+			return undefined;
+		}
+
+		const relativePath = vscode.workspace.asRelativePath(uri).replaceAll('\\', '/');
+		if (!relativePath.startsWith('src/vs/') || !relativePath.endsWith('.ts')) {
+			return undefined;
+		}
+
+		return relativePath.slice('src/'.length, -'.ts'.length);
+	}
+
+	private importPathToUri(importPath: string) {
+		return vscode.Uri.file(join(this.root.fsPath, 'src', `${importPath}.ts`));
+	}
+}
+
+const IMPORT_RE = /import .*? from ["'](vs\/[^"']+)/g;
+
+class FileNode {
+	public imports = new Set<FileNode>();
+	public importedBy = new Set<FileNode>();
+	public isSynced: boolean | Promise<void> = false;
+
+	// Path is the *import path* starting with `vs/`
+	constructor(
+		public readonly uri: vscode.Uri,
+		public readonly path: string,
+	) { }
+}
diff --git a/.vscode/extensions/vscode-selfhost-test-provider/src/sourceUtils.ts b/.vscode/extensions/vscode-selfhost-test-provider/src/sourceUtils.ts
index 56b26cafda8..3ed21cf5810 100644
--- a/.vscode/extensions/vscode-selfhost-test-provider/src/sourceUtils.ts
+++ b/.vscode/extensions/vscode-selfhost-test-provider/src/sourceUtils.ts
@@ -8,6 +8,7 @@ import * as vscode from 'vscode';
 import { TestCase, TestConstruct, TestSuite, VSCodeTest } from './testTree';
 
 const suiteNames = new Set(['suite', 'flakySuite']);
+const testNames = new Set(['test']);
 
 export const enum Action {
 	Skip,
@@ -19,22 +20,19 @@ export const extractTestFromNode = (src: ts.SourceFile, node: ts.Node, parent: V
 		return Action.Recurse;
 	}
 
-	let lhs = node.expression;
-	if (isSkipCall(lhs)) {
+	const asSuite = identifyCall(node.expression, suiteNames);
+	const asTest = identifyCall(node.expression, testNames);
+	const either = asSuite || asTest;
+	if (either === IdentifiedCall.Skipped) {
 		return Action.Skip;
 	}
-
-	if (isPropertyCall(lhs) && lhs.name.text === 'only') {
-		lhs = lhs.expression;
+	if (either === IdentifiedCall.Nothing) {
+		return Action.Recurse;
 	}
 
 	const name = node.arguments[0];
 	const func = node.arguments[1];
-	if (!name || !ts.isIdentifier(lhs) || !ts.isStringLiteralLike(name)) {
-		return Action.Recurse;
-	}
-
-	if (!func) {
+	if (!name || !ts.isStringLiteralLike(name) || !func) {
 		return Action.Recurse;
 	}
 
@@ -46,23 +44,45 @@ export const extractTestFromNode = (src: ts.SourceFile, node: ts.Node, parent: V
 	);
 
 	const cparent = parent instanceof TestConstruct ? parent : undefined;
-	if (lhs.escapedText === 'test') {
+
+	// we know this is either a suite or a test because we checked for skipped/nothing above
+
+	if (asTest) {
 		return new TestCase(name.text, range, cparent);
 	}
 
-	if (suiteNames.has(lhs.escapedText.toString())) {
+	if (asSuite) {
 		return new TestSuite(name.text, range, cparent);
 	}
 
-	return Action.Recurse;
+	throw new Error('unreachable');
+};
+
+const enum IdentifiedCall {
+	Nothing,
+	Skipped,
+	IsThing,
+}
+
+const identifyCall = (lhs: ts.Node, needles: ReadonlySet<string>): IdentifiedCall => {
+	if (ts.isIdentifier(lhs)) {
+		return needles.has(lhs.escapedText || lhs.text) ? IdentifiedCall.IsThing : IdentifiedCall.Nothing;
+	}
+
+	if (isPropertyCall(lhs) && lhs.name.text === 'skip') {
+		return needles.has(lhs.expression.text) ? IdentifiedCall.Skipped : IdentifiedCall.Nothing;
+	}
+
+	if (ts.isParenthesizedExpression(lhs) && ts.isConditionalExpression(lhs.expression)) {
+		return Math.max(identifyCall(lhs.expression.whenTrue, needles), identifyCall(lhs.expression.whenFalse, needles));
+	}
+
+	return IdentifiedCall.Nothing;
 };
 
 const isPropertyCall = (
-	lhs: ts.LeftHandSideExpression
+	lhs: ts.Node
 ): lhs is ts.PropertyAccessExpression & { expression: ts.Identifier; name: ts.Identifier } =>
 	ts.isPropertyAccessExpression(lhs) &&
 	ts.isIdentifier(lhs.expression) &&
 	ts.isIdentifier(lhs.name);
-
-const isSkipCall = (lhs: ts.LeftHandSideExpression) =>
-	isPropertyCall(lhs) && suiteNames.has(lhs.expression.text) && lhs.name.text === 'skip';
diff --git a/.vscode/extensions/vscode-selfhost-test-provider/src/stackTraceParser.ts b/.vscode/extensions/vscode-selfhost-test-provider/src/stackTraceParser.ts
new file mode 100644
index 00000000000..ca3236ce96a
--- /dev/null
+++ b/.vscode/extensions/vscode-selfhost-test-provider/src/stackTraceParser.ts
@@ -0,0 +1,60 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// Copied from https://github.com/microsoft/vscode-js-debug/blob/1d104b5184736677ab5cc280c70bbd227403850c/src/common/stackTraceParser.ts#L18
+
+// Either match lines like
+// "    at fulfilled (/Users/roblou/code/testapp-node2/out/app.js:5:58)"
+// or
+// "    at /Users/roblou/code/testapp-node2/out/app.js:60:23"
+// and replace the path in them
+const re1 = /^(\W*at .*\()(.*):(\d+):(\d+)(\))$/;
+const re2 = /^(\W*at )(.*):(\d+):(\d+)$/;
+
+const getLabelRe = /^\W*at (.*) \($/;
+
+/**
+ * Parses a textual stack trace.
+ */
+export class StackTraceParser {
+    /** Gets whether the stacktrace has any locations in it. */
+    public static isStackLike(str: string) {
+        return re1.test(str) || re2.test(str);
+    }
+    constructor(private readonly stack: string) { }
+
+    /** Iterates over segments of text and locations in the stack. */
+    *[Symbol.iterator]() {
+        for (const line of this.stack.split('\n')) {
+            const match = re1.exec(line) || re2.exec(line);
+            if (!match) {
+                yield line + '\n';
+                continue;
+            }
+
+            const [, prefix, url, lineNo, columnNo, suffix] = match;
+            if (prefix) {
+                yield prefix;
+            }
+
+            yield new StackTraceLocation(getLabelRe.exec(prefix)?.[1], url, Number(lineNo), Number(columnNo));
+
+            if (suffix) {
+                yield suffix;
+            }
+
+            yield '\n';
+        }
+    }
+}
+
+export class StackTraceLocation {
+    constructor(
+        public readonly label: string | undefined,
+        public readonly path: string,
+        public readonly lineBase1: number,
+        public readonly columnBase1: number,
+    ) { }
+}
\ No newline at end of file
diff --git a/.vscode/extensions/vscode-selfhost-test-provider/src/testOutputScanner.ts b/.vscode/extensions/vscode-selfhost-test-provider/src/testOutputScanner.ts
index 74013dcd561..296ed1e9f12 100644
--- a/.vscode/extensions/vscode-selfhost-test-provider/src/testOutputScanner.ts
+++ b/.vscode/extensions/vscode-selfhost-test-provider/src/testOutputScanner.ts
@@ -16,6 +16,7 @@ import * as vscode from 'vscode';
 import { istanbulCoverageContext, PerTestCoverageTracker } from './coverageProvider';
 import { attachTestMessageMetadata } from './metadata';
 import { snapshotComment } from './snapshot';
+import { StackTraceLocation, StackTraceParser } from './stackTraceParser';
 import { StreamSplitter } from './streamSplitter';
 import { getContentFromFilesystem } from './testTree';
 import { IScriptCoverage } from './v8CoverageWrangling';
@@ -288,7 +289,7 @@ export async function scanTestOutput(
 
 							enqueueExitBlocker(
 								(async () => {
-									const location = await tryDeriveStackLocation(store, rawErr, tcase!);
+									const stackInfo = await deriveStackLocations(store, rawErr, tcase!);
 									let message: vscode.TestMessage;
 
 									if (hasDiff) {
@@ -310,7 +311,8 @@ export async function scanTestOutput(
 										);
 									}
 
-									message.location = location ?? testFirstLine;
+									message.location = stackInfo.primary ?? testFirstLine;
+									message.stackTrace = stackInfo.stack;
 									task.failed(tcase!, message, duration);
 								})()
 							);
@@ -424,36 +426,62 @@ const tryMakeMarkdown = (message: string) => {
 const inlineSourcemapRe = /^\/\/# sourceMappingURL=data:application\/json;base64,(.+)/m;
 const sourceMapBiases = [GREATEST_LOWER_BOUND, LEAST_UPPER_BOUND] as const;
 
-export type SourceLocationMapper = (line: number, col: number) => vscode.Location | undefined;
+export const enum SearchStrategy {
+	FirstBefore = -1,
+	FirstAfter = 1,
+}
+
+export type SourceLocationMapper = (line: number, col: number, strategy: SearchStrategy) => vscode.Location | undefined;
 
 export class SourceMapStore {
 	private readonly cache = new Map</* file uri */ string, Promise<TraceMap | undefined>>();
 
-	async getSourceLocationMapper(fileUri: string) {
+	async getSourceLocationMapper(fileUri: string): Promise<SourceLocationMapper> {
 		const sourceMap = await this.loadSourceMap(fileUri);
-		return (line: number, col: number) => {
+		return (line, col, strategy) => {
 			if (!sourceMap) {
 				return undefined;
 			}
 
-			let smLine = line + 1;
+			// 1. Look for the ideal position on this line if it exists
+			const idealPosition = originalPositionFor(sourceMap, { column: col, line: line + 1, bias: SearchStrategy.FirstAfter ? GREATEST_LOWER_BOUND : LEAST_UPPER_BOUND });
+			if (idealPosition.line !== null && idealPosition.column !== null && idealPosition.source !== null) {
+				return new vscode.Location(
+					this.completeSourceMapUrl(sourceMap, idealPosition.source),
+					new vscode.Position(idealPosition.line - 1, idealPosition.column)
+				);
+			}
 
-			// if the range is after the end of mappings, adjust it to the last mapped line
+			// Otherwise get the first/last valid mapping on another line.
 			const decoded = decodedMappings(sourceMap);
-			if (decoded.length <= line) {
-				smLine = decoded.length; // base 1, no -1 needed
-				col = Number.MAX_SAFE_INTEGER;
+			const enum MapField {
+				COLUMN = 0,
+				SOURCES_INDEX = 1,
+				SOURCE_LINE = 2,
+				SOURCE_COLUMN = 3,
 			}
 
-			for (const bias of sourceMapBiases) {
-				const position = originalPositionFor(sourceMap, { column: col, line: smLine, bias });
-				if (position.line !== null && position.column !== null && position.source !== null) {
-					return new vscode.Location(
-						this.completeSourceMapUrl(sourceMap, position.source),
-						new vscode.Position(position.line - 1, position.column)
-					);
+			do {
+				line += strategy;
+				const segments = decoded[line];
+				if (!segments?.length) {
+					continue;
 				}
-			}
+
+				const index = strategy === SearchStrategy.FirstBefore
+					? findLastIndex(segments, s => s.length !== 1)
+					: segments.findIndex(s => s.length !== 1);
+				const segment = segments[index];
+
+				if (!segment || segment.length === 1) {
+					continue;
+				}
+
+				return new vscode.Location(
+					this.completeSourceMapUrl(sourceMap, sourceMap.sources[segment[MapField.SOURCES_INDEX]]!),
+					new vscode.Position(segment[MapField.SOURCE_LINE] - 1, segment[MapField.SOURCE_COLUMN])
+				);
+			} while (strategy === SearchStrategy.FirstBefore ? line > 0 : line < decoded.length);
 
 			return undefined;
 		};
@@ -461,7 +489,31 @@ export class SourceMapStore {
 
 	/** Gets an original location from a base 0 line and column */
 	async getSourceLocation(fileUri: string, line: number, col = 0) {
-		return this.getSourceLocationMapper(fileUri).then(m => m(line, col));
+		const sourceMap = await this.loadSourceMap(fileUri);
+		if (!sourceMap) {
+			return undefined;
+		}
+
+		let smLine = line + 1;
+
+		// if the range is after the end of mappings, adjust it to the last mapped line
+		const decoded = decodedMappings(sourceMap);
+		if (decoded.length <= line) {
+			smLine = decoded.length; // base 1, no -1 needed
+			col = Number.MAX_SAFE_INTEGER;
+		}
+
+		for (const bias of sourceMapBiases) {
+			const position = originalPositionFor(sourceMap, { column: col, line: smLine, bias });
+			if (position.line !== null && position.column !== null && position.source !== null) {
+				return new vscode.Location(
+					this.completeSourceMapUrl(sourceMap, position.source),
+					new vscode.Position(position.line - 1, position.column)
+				);
+			}
+		}
+
+		return undefined;
 	}
 
 	async getSourceFile(compiledUri: string) {
@@ -558,47 +610,51 @@ async function replaceAllLocations(store: SourceMapStore, str: string) {
 	return values.join('');
 }
 
-async function tryDeriveStackLocation(
+async function deriveStackLocations(
 	store: SourceMapStore,
 	stack: string,
 	tcase: vscode.TestItem
 ) {
 	locationRe.lastIndex = 0;
 
-	return new Promise<vscode.Location | undefined>(resolve => {
-		const matches = [...stack.matchAll(locationRe)];
-		let todo = matches.length;
-		if (todo === 0) {
-			return resolve(undefined);
-		}
+	const locationsRaw = [...new StackTraceParser(stack)].filter(t => t instanceof StackTraceLocation);
+	const locationsMapped = await Promise.all(locationsRaw.map(async location => {
+		const mapped = location.path.startsWith('file:') ? await store.getSourceLocation(location.path, location.lineBase1 - 1, location.columnBase1 - 1) : undefined;
+		const stack = new vscode.TestMessageStackFrame(location.label || '<anonymous>', mapped?.uri, mapped?.range.start || new vscode.Position(location.lineBase1 - 1, location.columnBase1 - 1));
+		return { location: mapped, stack };
+	}));
 
-		let best: undefined | { location: vscode.Location; i: number; score: number };
-		for (const [i, match] of matches.entries()) {
-			deriveSourceLocation(store, match)
-				.catch(() => undefined)
-				.then(location => {
-					if (location) {
-						let score = 0;
-						if (tcase.uri && tcase.uri.toString() === location.uri.toString()) {
-							score = 1;
-							if (tcase.range && tcase.range.contains(location?.range)) {
-								score = 2;
-							}
-						}
-						if (!best || score > best.score || (score === best.score && i < best.i)) {
-							best = { location, i, score };
-						}
-					}
-
-					if (!--todo) {
-						resolve(best?.location);
-					}
-				});
+	let best: undefined | { location: vscode.Location; score: number };
+	for (const { location } of locationsMapped) {
+		if (!location) {
+			continue;
 		}
-	});
+		let score = 0;
+		if (tcase.uri && tcase.uri.toString() === location.uri.toString()) {
+			score = 1;
+			if (tcase.range && tcase.range.contains(location?.range)) {
+				score = 2;
+			}
+		}
+		if (!best || score > best.score) {
+			best = { location, score };
+		}
+	}
+
+	return { stack: locationsMapped.map(s => s.stack), primary: best?.location };
 }
 
 async function deriveSourceLocation(store: SourceMapStore, parts: RegExpMatchArray) {
 	const [, fileUri, line, col] = parts;
 	return store.getSourceLocation(fileUri, Number(line) - 1, Number(col));
 }
+
+function findLastIndex<T>(arr: T[], predicate: (value: T) => boolean) {
+	for (let i = arr.length - 1; i >= 0; i--) {
+		if (predicate(arr[i])) {
+			return i;
+		}
+	}
+
+	return -1;
+}
diff --git a/.vscode/extensions/vscode-selfhost-test-provider/src/vscodeTestRunner.ts b/.vscode/extensions/vscode-selfhost-test-provider/src/vscodeTestRunner.ts
index 954b847f4a8..b5ffd440b33 100644
--- a/.vscode/extensions/vscode-selfhost-test-provider/src/vscodeTestRunner.ts
+++ b/.vscode/extensions/vscode-selfhost-test-provider/src/vscodeTestRunner.ts
@@ -63,7 +63,7 @@ export abstract class VSCodeTestRunner {
 		const cp = spawn(await this.binaryPath(), args, {
 			cwd: this.repoLocation.uri.fsPath,
 			stdio: 'pipe',
-			env: this.getEnvironment(),
+			env: this.getEnvironment(port),
 		});
 
 		// Register a descriptor factory that signals the server when any
@@ -139,7 +139,7 @@ export abstract class VSCodeTestRunner {
 		});
 	}
 
-	protected getEnvironment(): NodeJS.ProcessEnv {
+	protected getEnvironment(_remoteDebugPort?: number): NodeJS.ProcessEnv {
 		return {
 			...process.env,
 			ELECTRON_RUN_AS_NODE: undefined,
@@ -261,9 +261,10 @@ export class BrowserTestRunner extends VSCodeTestRunner {
 	}
 
 	/** @override */
-	protected override getEnvironment() {
+	protected override getEnvironment(remoteDebugPort?: number) {
 		return {
-			...super.getEnvironment(),
+			...super.getEnvironment(remoteDebugPort),
+			PLAYWRIGHT_CHROMIUM_DEBUG_PORT: remoteDebugPort ? String(remoteDebugPort) : undefined,
 			ELECTRON_RUN_AS_NODE: '1',
 		};
 	}
diff --git a/.vscode/extensions/vscode-selfhost-test-provider/tsconfig.json b/.vscode/extensions/vscode-selfhost-test-provider/tsconfig.json
index b95a70145c0..56d6859c3e3 100644
--- a/.vscode/extensions/vscode-selfhost-test-provider/tsconfig.json
+++ b/.vscode/extensions/vscode-selfhost-test-provider/tsconfig.json
@@ -11,7 +11,7 @@
 		"src/**/*",
 		"../../../src/vscode-dts/vscode.d.ts",
 		"../../../src/vscode-dts/vscode.proposed.testObserver.d.ts",
-		"../../../src/vscode-dts/vscode.proposed.attributableCoverage.d.ts",
-		"../../../src/vscode-dts/vscode.proposed.testRunInDebug.d.ts",
+		"../../../src/vscode-dts/vscode.proposed.testRelatedCode.d.ts",
+		"../../../src/vscode-dts/vscode.proposed.attributableCoverage.d.ts"
 	]
 }
diff --git a/.vscode/extensions/vscode-selfhost-test-provider/yarn.lock b/.vscode/extensions/vscode-selfhost-test-provider/yarn.lock
deleted file mode 100644
index 50478f52c73..00000000000
--- a/.vscode/extensions/vscode-selfhost-test-provider/yarn.lock
+++ /dev/null
@@ -1,55 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@jridgewell/resolve-uri@^3.1.0":
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6"
-  integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
-
-"@jridgewell/sourcemap-codec@^1.4.14":
-  version "1.4.15"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
-  integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
-
-"@jridgewell/trace-mapping@^0.3.25":
-  version "0.3.25"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0"
-  integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==
-  dependencies:
-    "@jridgewell/resolve-uri" "^3.1.0"
-    "@jridgewell/sourcemap-codec" "^1.4.14"
-
-"@types/istanbul-lib-coverage@^2.0.6":
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz#7739c232a1fee9b4d3ce8985f314c0c6d33549d7"
-  integrity sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==
-
-"@types/mocha@^10.0.6":
-  version "10.0.6"
-  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-10.0.6.tgz#818551d39113081048bdddbef96701b4e8bb9d1b"
-  integrity sha512-dJvrYWxP/UcXm36Qn36fxhUKu8A/xMRXVT2cliFF1Z7UA9liG5Psj3ezNSZw+5puH2czDXRLcXQxf8JbJt0ejg==
-
-"@types/node@20.x":
-  version "20.12.11"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.11.tgz#c4ef00d3507000d17690643278a60dc55a9dc9be"
-  integrity sha512-vDg9PZ/zi+Nqp6boSOT7plNuthRugEKixDv5sFTIpkE89MmNtEArAShI4mxuX2+UrLEe9pxC1vm2cjm9YlWbJw==
-  dependencies:
-    undici-types "~5.26.4"
-
-ansi-styles@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
-  integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
-
-istanbul-to-vscode@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/istanbul-to-vscode/-/istanbul-to-vscode-2.0.1.tgz#84994d06e604b68cac7301840f338b1e74eb888b"
-  integrity sha512-V9Hhr7kX3UvkvkaT1lK3AmCRPkaIAIogQBrduTpNiLTkp1eVsybnJhWiDSVeCQap/3aGeZ2019oIivhX9MNsCQ==
-  dependencies:
-    "@types/istanbul-lib-coverage" "^2.0.6"
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
diff --git a/.vscode/notebooks/api.github-issues b/.vscode/notebooks/api.github-issues
index 2ac7d699582..6b6a41f5135 100644
--- a/.vscode/notebooks/api.github-issues
+++ b/.vscode/notebooks/api.github-issues
@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPO=repo:microsoft/vscode\n$MILESTONE=milestone:\"May 2024\""
+    "value": "$REPO=repo:microsoft/vscode\n$MILESTONE=milestone:\"September 2024\""
   },
   {
     "kind": 1,
diff --git a/.vscode/notebooks/endgame.github-issues b/.vscode/notebooks/endgame.github-issues
index d7836922bad..9f6624a1323 100644
--- a/.vscode/notebooks/endgame.github-issues
+++ b/.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\n\n$MILESTONE=milestone:\"May 2024\""
+    "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,
@@ -32,7 +32,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS -$MILESTONE is:issue is:closed reason:completed label:bug label:insiders-released -label:verified -label:*duplicate -label:*as-designed -label:z-author-verified -label:on-testplan"
+    "value": "$REPOS -$MILESTONE is:issue is:closed reason:completed label:bug label:insiders-released -label:verified -label:*duplicate -label:*as-designed -label:z-author-verified -label:on-testplan -label:error-telemetry"
   },
   {
     "kind": 1,
diff --git a/.vscode/notebooks/my-endgame.github-issues b/.vscode/notebooks/my-endgame.github-issues
index 3bf56fffce4..f17345ed7f6 100644
--- a/.vscode/notebooks/my-endgame.github-issues
+++ b/.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:\"May 2024\"\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,
@@ -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: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"
+    "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,
diff --git a/.vscode/notebooks/my-work.github-issues b/.vscode/notebooks/my-work.github-issues
index 091c6e8a886..5f54a2e5d91 100644
--- a/.vscode/notebooks/my-work.github-issues
+++ b/.vscode/notebooks/my-work.github-issues
@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "// list of repos we work in\n$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// current milestone name\n$MILESTONE=milestone:\"May 2024\"\n"
+    "value": "// list of repos we work in\n$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// current milestone name\n$MILESTONE=milestone:\"September 2024\"\n"
   },
   {
     "kind": 1,
@@ -102,7 +102,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode assignee:@me is:open type:issue -label:\"info-needed\" -label:api -label:api-finalization -label:api-proposal -label:authentication -label:bisect-ext -label:bracket-pair-colorization -label:bracket-pair-guides -label:breadcrumbs -label:callhierarchy -label:chrome-devtools -label:code-lens -label:command-center -label:comments -label:config -label:context-keys -label:custom-editors -label:debug -label:debug-console -label:debug-disassembly -label:dialogs -label:diff-editor -label:dropdown -label:editor-api -label:editor-autoclosing -label:editor-autoindent -label:editor-bracket-matching -label:editor-clipboard -label:editor-code-actions -label:editor-color-picker -label:editor-columnselect -label:editor-commands -label:editor-comments -label:editor-contrib -label:editor-core -label:editor-drag-and-drop -label:editor-error-widget -label:editor-find -label:editor-folding -label:editor-highlight -label:editor-hover -label:editor-indent-detection -label:editor-indent-guides -label:editor-input -label:editor-input-IME -label:editor-insets -label:editor-minimap -label:editor-multicursor -label:editor-parameter-hints -label:editor-render-whitespace -label:editor-rendering -label:editor-RTL -label:editor-scrollbar -label:editor-sorting -label:editor-sticky-scroll -label:editor-sticky-scroll-decorations -label:editor-symbols -label:editor-synced-region -label:editor-textbuffer -label:editor-theming -label:editor-wordnav -label:editor-wrapping -label:emmet-parse -label:extension-activation -label:extension-host -label:extension-prerelease -label:extension-recommendations -label:extension-signature -label:extensions -label:extensions-development -label:file-decorations -label:file-encoding -label:file-explorer -label:file-glob -label:file-io -label:file-nesting -label:file-watcher -label:font-rendering -label:formatting -label:getting-started -label:ghost-text -label:git -label:github -label:github-repositories -label:gpu -label:grammar -label:grid-widget -label:icon-brand -label:icons-product -label:icons-widget -label:inlay-hints -label:inline-chat -label:inline-completions -label:install-update -label:intellisense-config -label:interactive-playground -label:interactive-window -label:javascript -label:json -label:json-sorting -label:keybindings -label:keybindings-editor -label:keyboard-layout -label:L10N -label:l10n-platform -label:label-provider -label:languages-basic -label:languages-diagnostics -label:languages-guessing -label:layout -label:lcd-text-rendering -label:list-widget -label:live-preview -label:log -label:markdown -label:marketplace -label:menus -label:merge-conflict -label:merge-editor -label:merge-editor-workbench -label:monaco-editor -label:multi-monitor -label:native-file-dialog -label:network -label:notebook -label:notebook-accessibility -label:notebook-api -label:notebook-builtin-renderers -label:notebook-cell-editor -label:notebook-celltoolbar -label:notebook-clipboard -label:notebook-commands -label:notebook-commenting -label:notebook-debugging -label:notebook-diff -label:notebook-dnd -label:notebook-execution -label:notebook-find -label:notebook-folding -label:notebook-getting-started -label:notebook-globaltoolbar -label:notebook-ipynb -label:notebook-kernel -label:notebook-kernel-picker -label:notebook-language -label:notebook-layout -label:notebook-markdown -label:notebook-math -label:notebook-minimap -label:notebook-multiselect -label:notebook-output -label:notebook-perf -label:notebook-remote -label:notebook-rendering -label:notebook-serialization -label:notebook-serverless-web -label:notebook-statusbar -label:notebook-sticky-scroll -label:notebook-toc-outline -label:notebook-undo-redo -label:notebook-variables -label:notebook-workbench-integration -label:notebook-workflow -label:open-editors -label:opener -label:outline -label:output -label:packaging -label:panel-chat -label:perf -label:perf-bloat -label:perf-startup -label:php -label:portable-mode -label:proxy -label:quick-open -label:quick-pick -label:quickpick-chat -label:references-viewlet -label:release-notes -label:remote -label:remote-connection -label:remote-desktop -label:remote-explorer -label:remote-tunnel -label:rename -label:runCommands -label:sandbox -label:sash-widget -label:scm -label:screencast-mode -label:search -label:search-api -label:search-editor -label:search-replace -label:semantic-tokens -label:server -label:settings-editor -label:settings-search -label:settings-sync -label:settings-sync-server -label:shared-process -label:simple-file-dialog -label:smart-select -label:snap -label:snippets -label:splitview-widget -label:ssh -label:suggest -label:system-context-menu -label:table-widget -label:tasks -label:telemetry -label:terminal -label:terminal-accessibility -label:terminal-conpty -label:terminal-editors -label:terminal-external -label:terminal-find -label:terminal-input -label:terminal-layout -label:terminal-links -label:terminal-local-echo -label:terminal-persistence -label:terminal-process -label:terminal-profiles -label:terminal-quick-fix -label:terminal-rendering -label:terminal-shell-bash -label:terminal-shell-cmd -label:terminal-shell-fish -label:terminal-shell-git-bash -label:terminal-shell-integration -label:terminal-shell-pwsh -label:terminal-shell-zsh -label:terminal-tabs -label:terminal-winpty -label:testing -label:themes -label:timeline -label:timeline-git -label:timeline-local-history -label:titlebar -label:tokenization -label:touch/pointer -label:trackpad/scroll -label:tree-views -label:tree-widget -label:typescript -label:unc -label:undo-redo -label:unicode-highlight -label:uri -label:user-profiles -label:ux -label:variable-resolving -label:VIM -label:virtual-documents -label:virtual-workspaces -label:vscode-website -label:vscode.dev -label:web -label:webview -label:webview-views -label:workbench-actions -label:workbench-auxwindow -label:workbench-banner -label:workbench-cli -label:workbench-diagnostics -label:workbench-dnd -label:workbench-editor-grid -label:workbench-editor-groups -label:workbench-editor-resolver -label:workbench-editors -label:workbench-electron -label:workbench-feedback -label:workbench-fonts -label:workbench-history -label:workbench-hot-exit -label:workbench-hover -label:workbench-launch -label:workbench-link -label:workbench-multiroot -label:workbench-notifications -label:workbench-os-integration -label:workbench-rapid-render -label:workbench-run-as-admin -label:workbench-state -label:workbench-status -label:workbench-tabs -label:workbench-touchbar -label:workbench-untitled-editors -label:workbench-views -label:workbench-voice -label:workbench-welcome -label:workbench-window -label:workbench-workspace -label:workbench-zen -label:workspace-edit -label:workspace-symbols -label:workspace-trust -label:zoom -label:error-list -label:winget"
+    "value": "repo:microsoft/vscode assignee:@me is:open type:issue -label:\"info-needed\" -label:api -label:api-finalization -label:api-proposal -label:authentication -label:bisect-ext -label:bracket-pair-colorization -label:bracket-pair-guides -label:breadcrumbs -label:callhierarchy -label:chrome-devtools -label:code-lens -label:command-center -label:comments -label:config -label:context-keys -label:custom-editors -label:debug -label:debug-console -label:debug-disassembly -label:dialogs -label:diff-editor -label:dropdown -label:editor-api -label:editor-autoclosing -label:editor-autoindent -label:editor-bracket-matching -label:editor-clipboard -label:editor-code-actions -label:editor-color-picker -label:editor-columnselect -label:editor-commands -label:editor-comments -label:editor-contrib -label:editor-core -label:editor-drag-and-drop -label:editor-error-widget -label:editor-find -label:editor-folding -label:editor-highlight -label:editor-hover -label:editor-indent-detection -label:editor-indent-guides -label:editor-input -label:editor-input-IME -label:editor-insets -label:editor-minimap -label:editor-multicursor -label:editor-parameter-hints -label:editor-render-whitespace -label:editor-rendering -label:editor-RTL -label:editor-scrollbar -label:editor-sorting -label:editor-sticky-scroll -label:editor-sticky-scroll-decorations -label:editor-symbols -label:editor-synced-region -label:editor-textbuffer -label:editor-theming -label:editor-wordnav -label:editor-wrapping -label:emmet-parse -label:extension-activation -label:extension-host -label:extension-prerelease -label:extension-recommendations -label:extension-signature -label:extensions -label:extensions-development -label:file-decorations -label:file-encoding -label:file-explorer -label:file-glob -label:file-io -label:file-nesting -label:file-watcher -label:font-rendering -label:formatting -label:getting-started -label:ghost-text -label:git -label:github -label:github-repositories -label:gpu -label:grammar -label:grid-widget -label:icon-brand -label:icons-product -label:icons-widget -label:inlay-hints -label:inline-chat -label:inline-completions -label:install-update -label:intellisense-config -label:interactive-playground -label:interactive-window -label:javascript -label:json -label:json-sorting -label:keybindings -label:keybindings-editor -label:keyboard-layout -label:L10N -label:l10n-platform -label:label-provider -label:languages-basic -label:languages-diagnostics -label:languages-guessing -label:layout -label:lcd-text-rendering -label:list-widget -label:live-preview -label:log -label:markdown -label:marketplace -label:menus -label:merge-conflict -label:merge-editor -label:merge-editor-workbench -label:monaco-editor -label:multi-monitor -label:native-file-dialog -label:network -label:notebook -label:notebook-accessibility -label:notebook-api -label:notebook-builtin-renderers -label:notebook-cell-editor -label:notebook-celltoolbar -label:notebook-clipboard -label:notebook-code-actions -label:notebook-commands -label:notebook-commenting -label:notebook-debugging -label:notebook-diff -label:notebook-dnd -label:notebook-execution -label:notebook-find -label:notebook-folding -label:notebook-format -label:notebook-getting-started -label:notebook-globaltoolbar -label:notebook-ipynb -label:notebook-kernel -label:notebook-kernel-picker -label:notebook-language -label:notebook-layout -label:notebook-markdown -label:notebook-minimap -label:notebook-multiselect -label:notebook-output -label:notebook-perf -label:notebook-remote -label:notebook-rendering -label:notebook-serialization -label:notebook-statusbar -label:notebook-sticky-scroll -label:notebook-toc-outline -label:notebook-undo-redo -label:notebook-variables -label:notebook-workbench-integration -label:notebook-workflow -label:open-editors -label:opener -label:outline -label:output -label:packaging -label:panel-chat -label:perf -label:perf-bloat -label:perf-startup -label:php -label:portable-mode -label:proxy -label:quick-open -label:quick-pick -label:quickpick-chat -label:references-viewlet -label:release-notes -label:remote -label:remote-connection -label:remote-desktop -label:remote-explorer -label:remote-tunnel -label:rename -label:runCommands -label:sandbox -label:sash-widget -label:scm -label:screencast-mode -label:search -label:search-api -label:search-editor -label:search-replace -label:semantic-tokens -label:server -label:settings-editor -label:settings-search -label:settings-sync -label:settings-sync-server -label:shared-process -label:simple-file-dialog -label:smart-select -label:snap -label:snippets -label:splitview-widget -label:ssh -label:suggest -label:system-context-menu -label:table-widget -label:tasks -label:telemetry -label:terminal -label:terminal-accessibility -label:terminal-conpty -label:terminal-editors -label:terminal-external -label:terminal-find -label:terminal-input -label:terminal-layout -label:terminal-links -label:terminal-local-echo -label:terminal-persistence -label:terminal-process -label:terminal-profiles -label:terminal-quick-fix -label:terminal-rendering -label:terminal-shell-bash -label:terminal-shell-cmd -label:terminal-shell-fish -label:terminal-shell-git-bash -label:terminal-shell-integration -label:terminal-shell-pwsh -label:terminal-shell-zsh -label:terminal-tabs -label:testing -label:themes -label:timeline -label:timeline-git -label:timeline-local-history -label:titlebar -label:tokenization -label:touch/pointer -label:trackpad/scroll -label:tree-views -label:tree-widget -label:typescript -label:unc -label:undo-redo -label:unicode-highlight -label:uri -label:user-profiles -label:ux -label:variable-resolving -label:VIM -label:virtual-documents -label:virtual-workspaces -label:vscode-website -label:vscode.dev -label:web -label:webview -label:webview-views -label:workbench-actions -label:workbench-auxwindow -label:workbench-banner -label:workbench-cli -label:workbench-diagnostics -label:workbench-dnd -label:workbench-editor-grid -label:workbench-editor-groups -label:workbench-editor-resolver -label:workbench-editors -label:workbench-electron -label:workbench-fonts -label:workbench-history -label:workbench-hot-exit -label:workbench-hover -label:workbench-launch -label:workbench-link -label:workbench-multiroot -label:workbench-notifications -label:workbench-os-integration -label:workbench-rapid-render -label:workbench-run-as-admin -label:workbench-state -label:workbench-status -label:workbench-tabs -label:workbench-touchbar -label:workbench-untitled-editors -label:workbench-views -label:workbench-voice -label:workbench-welcome -label:workbench-window -label:workbench-workspace -label:workbench-zen -label:workspace-edit -label:workspace-symbols -label:workspace-trust -label:zoom -label:error-list -label:winget"
   },
   {
     "kind": 1,
diff --git a/.vscode/notebooks/vscode-dev.github-issues b/.vscode/notebooks/vscode-dev.github-issues
index 53fad82e6d9..db480b64bd8 100644
--- a/.vscode/notebooks/vscode-dev.github-issues
+++ b/.vscode/notebooks/vscode-dev.github-issues
@@ -2,7 +2,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$milestone=milestone:\"November 2023\""
+    "value": "$milestone=milestone:\"August 2024\""
   },
   {
     "kind": 1,
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 5d5d1f27589..14236b479e2 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -8,6 +8,7 @@
 		"**/.DS_Store": true,
 		".vscode-test": true,
 		"cli/target": true,
+		"build/**/*.js.map": true,
 		"build/**/*.js": {
 			"when": "$(basename).ts"
 		}
@@ -32,16 +33,15 @@
 		"src/vs/base/test/common/filters.perf.data.js": true,
 		"src/vs/base/test/node/uri.perf.data.txt": true,
 		"src/vs/workbench/api/test/browser/extHostDocumentData.test.perf-data.ts": true,
+		"src/vs/base/test/node/uri.test.data.txt": true,
 		"src/vs/editor/test/node/diffing/fixtures/**": true,
+		"build/loader.min": true
 	},
 	"files.readonlyInclude": {
 		"**/node_modules/**/*.*": true,
 		"**/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,
-		"src/vs/workbench/workbench.desktop.main.nls.js": true,
-		"src/vs/workbench/workbench.web.main.nls.js": true,
 		"build/**/*.js": true,
 		"out/**": true,
 		"out-build/**": true,
@@ -51,7 +51,7 @@
 		"extensions/**/out/**": true,
 		"test/smoke/out/**": true,
 		"test/automation/out/**": true,
-		"test/integration/browser/out/**": true,
+		"test/integration/browser/out/**": true
 	},
 	"files.readonlyExclude": {
 		"build/builtin/*.js": true,
@@ -74,9 +74,8 @@
 	],
 	"typescript.tsdk": "node_modules/typescript/lib",
 	"npm.exclude": "**/extensions/**",
-	"npm.packageManager": "yarn",
 	"emmet.excludeLanguages": [],
-	"typescript.preferences.importModuleSpecifier": "non-relative",
+	"typescript.preferences.importModuleSpecifier": "relative",
 	"typescript.preferences.quoteStyle": "single",
 	"json.schemas": [
 		{
@@ -162,13 +161,12 @@
 		"@xterm/headless",
 		"node-pty",
 		"vscode-notebook-renderer",
-		"src/vs/workbench/workbench.web.main.ts",
-		"src/vs/workbench/api/common/extHostTypes.ts"
+		"src/vs/workbench/workbench.web.main.internal.ts"
 	],
 	"[github-issues]": {
 		"editor.wordWrap": "on"
 	},
 	"css.format.spaceAroundSelectorSeparator": true,
-	"inlineChat.mode": "live",
-	"typescript.enablePromptUseWorkspaceTsdk": true
+	"typescript.enablePromptUseWorkspaceTsdk": true,
+	"chat.commandCenter.enabled": true
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 666edb3fb2c..3bcb5d5c6fc 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -113,7 +113,7 @@
 			"problemMatcher": []
 		},
 		{
-			"label": "Kill VS Code - Build, Yarn, VS Code - Build",
+			"label": "Kill VS Code - Build, Npm, VS Code - Build",
 			"dependsOn": [
 				"Kill VS Code - Build",
 				"npm: install",
diff --git a/.yarnrc b/.yarnrc
deleted file mode 100644
index b40fb7e7f58..00000000000
--- a/.yarnrc
+++ /dev/null
@@ -1,5 +0,0 @@
-disturl "https://electronjs.org/headers"
-target "29.4.0"
-ms_build_id "9593362"
-runtime "electron"
-build_from_source "true"
diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index 2e3f2610f46..da3989dd371 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -263,6 +263,34 @@ suitability for any purpose.
 
 ---------------------------------------------------------
 
+cacheable-request 7.0.4 - MIT
+
+
+Copyright (c) cacheable-request authors
+
+MIT License
+
+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.
+---------------------------------------------------------
+
+---------------------------------------------------------
+
 Colorsublime-Themes 0.1.0
 https://github.com/Colorsublime/Colorsublime-Themes
 
@@ -412,6 +440,580 @@ Title to copyright in this work will at all times remain with copyright holders.
 
 ---------------------------------------------------------
 
+dompurify 3.0.5 - Apache 2.0
+https://github.com/cure53/DOMPurify
+
+DOMPurify
+Copyright 2024 Dr.-Ing. Mario Heiderich, Cure53
+
+DOMPurify is free software; you can redistribute it and/or modify it under the
+terms of either:
+
+a) the Apache License Version 2.0, or
+b) the Mozilla Public License Version 2.0
+
+-----------------------------------------------------------------------------
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   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.
+
+-----------------------------------------------------------------------------
+Mozilla Public License, version 2.0
+
+1. Definitions
+
+1.1. "Contributor"
+
+     means each individual or legal entity that creates, contributes to the
+     creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+
+     means the combination of the Contributions of others (if any) used by a
+     Contributor and that particular Contributor’s Contribution.
+
+1.3. "Contribution"
+
+     means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+
+     means Source Code Form to which the initial Contributor has attached the
+     notice in Exhibit A, the Executable Form of such Source Code Form, and
+     Modifications of such Source Code Form, in each case including portions
+     thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+     means
+
+     a. that the initial Contributor has attached the notice described in
+        Exhibit B to the Covered Software; or
+
+     b. that the Covered Software was made available under the terms of version
+        1.1 or earlier of the License, but not also under the terms of a
+        Secondary License.
+
+1.6. "Executable Form"
+
+     means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+
+     means a work that combines Covered Software with other material, in a separate
+     file or files, that is not Covered Software.
+
+1.8. "License"
+
+     means this document.
+
+1.9. "Licensable"
+
+     means having the right to grant, to the maximum extent possible, whether at the
+     time of the initial grant or subsequently, any and all of the rights conveyed by
+     this License.
+
+1.10. "Modifications"
+
+     means any of the following:
+
+     a. any file in Source Code Form that results from an addition to, deletion
+        from, or modification of the contents of Covered Software; or
+
+     b. any new file in Source Code Form that contains any Covered Software.
+
+1.11. "Patent Claims" of a Contributor
+
+      means any patent claim(s), including without limitation, method, process,
+      and apparatus claims, in any patent Licensable by such Contributor that
+      would be infringed, but for the grant of the License, by the making,
+      using, selling, offering for sale, having made, import, or transfer of
+      either its Contributions or its Contributor Version.
+
+1.12. "Secondary License"
+
+      means either the GNU General Public License, Version 2.0, the GNU Lesser
+      General Public License, Version 2.1, the GNU Affero General Public
+      License, Version 3.0, or any later versions of those licenses.
+
+1.13. "Source Code Form"
+
+      means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+
+      means an individual or a legal entity exercising rights under this
+      License. For legal entities, "You" includes any entity that controls, is
+      controlled by, or is under common control with You. For purposes of this
+      definition, "control" means (a) the power, direct or indirect, to cause
+      the direction or management of such entity, whether by contract or
+      otherwise, or (b) ownership of more than fifty percent (50%) of the
+      outstanding shares or beneficial ownership of such entity.
+
+
+2. License Grants and Conditions
+
+2.1. Grants
+
+     Each Contributor hereby grants You a world-wide, royalty-free,
+     non-exclusive license:
+
+     a. under intellectual property rights (other than patent or trademark)
+        Licensable by such Contributor to use, reproduce, make available,
+        modify, display, perform, distribute, and otherwise exploit its
+        Contributions, either on an unmodified basis, with Modifications, or as
+        part of a Larger Work; and
+
+     b. under Patent Claims of such Contributor to make, use, sell, offer for
+        sale, have made, import, and otherwise transfer either its Contributions
+        or its Contributor Version.
+
+2.2. Effective Date
+
+     The licenses granted in Section 2.1 with respect to any Contribution become
+     effective for each Contribution on the date the Contributor first distributes
+     such Contribution.
+
+2.3. Limitations on Grant Scope
+
+     The licenses granted in this Section 2 are the only rights granted under this
+     License. No additional rights or licenses will be implied from the distribution
+     or licensing of Covered Software under this License. Notwithstanding Section
+     2.1(b) above, no patent license is granted by a Contributor:
+
+     a. for any code that a Contributor has removed from Covered Software; or
+
+     b. for infringements caused by: (i) Your and any other third party’s
+        modifications of Covered Software, or (ii) the combination of its
+        Contributions with other software (except as part of its Contributor
+        Version); or
+
+     c. under Patent Claims infringed by Covered Software in the absence of its
+        Contributions.
+
+     This License does not grant any rights in the trademarks, service marks, or
+     logos of any Contributor (except as may be necessary to comply with the
+     notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+     No Contributor makes additional grants as a result of Your choice to
+     distribute the Covered Software under a subsequent version of this License
+     (see Section 10.2) or under the terms of a Secondary License (if permitted
+     under the terms of Section 3.3).
+
+2.5. Representation
+
+     Each Contributor represents that the Contributor believes its Contributions
+     are its original creation(s) or it has sufficient rights to grant the
+     rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+     This License is not intended to limit any rights You have under applicable
+     copyright doctrines of fair use, fair dealing, or other equivalents.
+
+2.7. Conditions
+
+     Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
+     Section 2.1.
+
+
+3. Responsibilities
+
+3.1. Distribution of Source Form
+
+     All distribution of Covered Software in Source Code Form, including any
+     Modifications that You create or to which You contribute, must be under the
+     terms of this License. You must inform recipients that the Source Code Form
+     of the Covered Software is governed by the terms of this License, and how
+     they can obtain a copy of this License. You may not attempt to alter or
+     restrict the recipients’ rights in the Source Code Form.
+
+3.2. Distribution of Executable Form
+
+     If You distribute Covered Software in Executable Form then:
+
+     a. such Covered Software must also be made available in Source Code Form,
+        as described in Section 3.1, and You must inform recipients of the
+        Executable Form how they can obtain a copy of such Source Code Form by
+        reasonable means in a timely manner, at a charge no more than the cost
+        of distribution to the recipient; and
+
+     b. You may distribute such Executable Form under the terms of this License,
+        or sublicense it under different terms, provided that the license for
+        the Executable Form does not attempt to limit or alter the recipients’
+        rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+     You may create and distribute a Larger Work under terms of Your choice,
+     provided that You also comply with the requirements of this License for the
+     Covered Software. If the Larger Work is a combination of Covered Software
+     with a work governed by one or more Secondary Licenses, and the Covered
+     Software is not Incompatible With Secondary Licenses, this License permits
+     You to additionally distribute such Covered Software under the terms of
+     such Secondary License(s), so that the recipient of the Larger Work may, at
+     their option, further distribute the Covered Software under the terms of
+     either this License or such Secondary License(s).
+
+3.4. Notices
+
+     You may not remove or alter the substance of any license notices (including
+     copyright notices, patent notices, disclaimers of warranty, or limitations
+     of liability) contained within the Source Code Form of the Covered
+     Software, except that You may alter any license notices to the extent
+     required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+     You may choose to offer, and to charge a fee for, warranty, support,
+     indemnity or liability obligations to one or more recipients of Covered
+     Software. However, You may do so only on Your own behalf, and not on behalf
+     of any Contributor. You must make it absolutely clear that any such
+     warranty, support, indemnity, or liability obligation is offered by You
+     alone, and You hereby agree to indemnify every Contributor for any
+     liability incurred by such Contributor as a result of warranty, support,
+     indemnity or liability terms You offer. You may include additional
+     disclaimers of warranty and limitations of liability specific to any
+     jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+
+   If it is impossible for You to comply with any of the terms of this License
+   with respect to some or all of the Covered Software due to statute, judicial
+   order, or regulation then You must: (a) comply with the terms of this License
+   to the maximum extent possible; and (b) describe the limitations and the code
+   they affect. Such description must be placed in a text file included with all
+   distributions of the Covered Software under this License. Except to the
+   extent prohibited by statute or regulation, such description must be
+   sufficiently detailed for a recipient of ordinary skill to be able to
+   understand it.
+
+5. Termination
+
+5.1. The rights granted under this License will terminate automatically if You
+     fail to comply with any of its terms. However, if You become compliant,
+     then the rights granted under this License from a particular Contributor
+     are reinstated (a) provisionally, unless and until such Contributor
+     explicitly and finally terminates Your grants, and (b) on an ongoing basis,
+     if such Contributor fails to notify You of the non-compliance by some
+     reasonable means prior to 60 days after You have come back into compliance.
+     Moreover, Your grants from a particular Contributor are reinstated on an
+     ongoing basis if such Contributor notifies You of the non-compliance by
+     some reasonable means, this is the first time You have received notice of
+     non-compliance with this License from such Contributor, and You become
+     compliant prior to 30 days after Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+     infringement claim (excluding declaratory judgment actions, counter-claims,
+     and cross-claims) alleging that a Contributor Version directly or
+     indirectly infringes any patent, then the rights granted to You by any and
+     all Contributors for the Covered Software under Section 2.1 of this License
+     shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
+     license agreements (excluding distributors and resellers) which have been
+     validly granted by You or Your distributors under this License prior to
+     termination shall survive termination.
+
+6. Disclaimer of Warranty
+
+   Covered Software is provided under this License on an "as is" basis, without
+   warranty of any kind, either expressed, implied, or statutory, including,
+   without limitation, warranties that the Covered Software is free of defects,
+   merchantable, fit for a particular purpose or non-infringing. The entire
+   risk as to the quality and performance of the Covered Software is with You.
+   Should any Covered Software prove defective in any respect, You (not any
+   Contributor) assume the cost of any necessary servicing, repair, or
+   correction. This disclaimer of warranty constitutes an essential part of this
+   License. No use of  any Covered Software is authorized under this License
+   except under this disclaimer.
+
+7. Limitation of Liability
+
+   Under no circumstances and under no legal theory, whether tort (including
+   negligence), contract, or otherwise, shall any Contributor, or anyone who
+   distributes Covered Software as permitted above, be liable to You for any
+   direct, indirect, special, incidental, or consequential damages of any
+   character including, without limitation, damages for lost profits, loss of
+   goodwill, work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses, even if such party shall have been
+   informed of the possibility of such damages. This limitation of liability
+   shall not apply to liability for death or personal injury resulting from such
+   party’s negligence to the extent applicable law prohibits such limitation.
+   Some jurisdictions do not allow the exclusion or limitation of incidental or
+   consequential damages, so this exclusion and limitation may not apply to You.
+
+8. Litigation
+
+   Any litigation relating to this License may be brought only in the courts of
+   a jurisdiction where the defendant maintains its principal place of business
+   and such litigation shall be governed by laws of that jurisdiction, without
+   reference to its conflict-of-law provisions. Nothing in this Section shall
+   prevent a party’s ability to bring cross-claims or counter-claims.
+
+9. Miscellaneous
+
+   This License represents the complete agreement concerning the subject matter
+   hereof. If any provision of this License is held to be unenforceable, such
+   provision shall be reformed only to the extent necessary to make it
+   enforceable. Any law or regulation which provides that the language of a
+   contract shall be construed against the drafter shall not be used to construe
+   this License against a Contributor.
+
+
+10. Versions of the License
+
+10.1. New Versions
+
+      Mozilla Foundation is the license steward. Except as provided in Section
+      10.3, no one other than the license steward has the right to modify or
+      publish new versions of this License. Each version will be given a
+      distinguishing version number.
+
+10.2. Effect of New Versions
+
+      You may distribute the Covered Software under the terms of the version of
+      the License under which You originally received the Covered Software, or
+      under the terms of any subsequent version published by the license
+      steward.
+
+10.3. Modified Versions
+
+      If you create software not governed by this License, and you want to
+      create a new license for such software, you may create and use a modified
+      version of this License if you rename the license and remove any
+      references to the name of the license steward (except to note that such
+      modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses
+      If You choose to distribute Source Code Form that is Incompatible With
+      Secondary Licenses under the terms of this version of the License, the
+      notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+
+      This Source Code Form is subject to the
+      terms of the Mozilla Public License, v.
+      2.0. If a copy of the MPL was not
+      distributed with this file, You can
+      obtain one at
+      http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular file, then
+You may include the notice in a location (such as a LICENSE file in a relevant
+directory) where a recipient would be likely to look for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+
+      This Source Code Form is "Incompatible
+      With Secondary Licenses", as defined by
+      the Mozilla Public License, v. 2.0.
+---------------------------------------------------------
+
+---------------------------------------------------------
+
 dotnet/csharp-tmLanguage 0.1.0 - MIT
 https://github.com/dotnet/csharp-tmLanguage
 
@@ -517,7 +1119,7 @@ to the base-name name of the original file, and an extension of txt, html, or si
 
 ---------------------------------------------------------
 
-go-syntax 0.6.6 - MIT
+go-syntax 0.7.6 - MIT
 https://github.com/worlpaker/go-syntax
 
 MIT License
@@ -833,7 +1435,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-jlelong/vscode-latex-basics 1.7.0 - MIT
+jlelong/vscode-latex-basics 1.9.0 - MIT
 https://github.com/jlelong/vscode-latex-basics
 
 Copyright (c) vscode-latex-basics authors
@@ -890,7 +1492,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ---------------------------------------------------------
 
-JuliaEditorSupport/atom-language-julia 0.22.1 - MIT
+JuliaEditorSupport/atom-language-julia 0.23.0 - MIT
 https://github.com/JuliaEditorSupport/atom-language-julia
 
 The atom-language-julia package is licensed under the MIT "Expat" License:
@@ -1241,7 +1843,7 @@ THE SOFTWARE.
 
 ---------------------------------------------------------
 
-marked 4.1.0 - MIT
+marked 14.0.0 - MIT
 https://github.com/markedjs/marked
 
 information
@@ -1506,6 +2108,22 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
+RedCMD/YAML-Syntax-Highlighter 1.1.2 - MIT
+https://github.com/RedCMD/YAML-Syntax-Highlighter
+
+MIT License
+
+Copyright 2024 RedCMD
+
+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.
+---------------------------------------------------------
+
+---------------------------------------------------------
+
 redhat-developer/vscode-java 1.26.0 - MIT
 https://github.com/redhat-developer/vscode-java
 
@@ -1928,31 +2546,6 @@ to the base-name name of the original file, and an extension of txt, html, or si
 
 ---------------------------------------------------------
 
-textmate/yaml.tmbundle 0.0.0 - TextMate Bundle License
-https://github.com/textmate/yaml.tmbundle
-
-Copyright (c) 2015 FichteFoll <fichtefoll2@googlemail.com>
-
-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.
----------------------------------------------------------
-
----------------------------------------------------------
-
 trond-snekvik/vscode-rst 1.5.3 - MIT
 https://github.com/trond-snekvik/vscode-rst
 
diff --git a/build/.cachesalt b/build/.cachesalt
index 4a19f329eb1..3c6029dc2f4 100644
--- a/build/.cachesalt
+++ b/build/.cachesalt
@@ -1 +1 @@
-2024-05-25T03:29:59.419Z
+2024-09-04T10:21:29.952Z
diff --git a/build/.gitignore b/build/.gitignore
index 7cc357379e5..61cf49cb9a1 100644
--- a/build/.gitignore
+++ b/build/.gitignore
@@ -1,2 +1 @@
-.yarnrc
 *.js.map
diff --git a/build/.moduleignore b/build/.moduleignore
index 32fb3bd21c5..97b504d8522 100644
--- a/build/.moduleignore
+++ b/build/.moduleignore
@@ -96,10 +96,13 @@ node-pty/lib/*.test.js
 node-pty/tools/**
 node-pty/deps/**
 node-pty/scripts/**
+node-pty/third_party/**
 !node-pty/build/Release/spawn-helper
 !node-pty/build/Release/*.exe
 !node-pty/build/Release/*.dll
 !node-pty/build/Release/*.node
+!node-pty/build/Release/conpty/conpty.dll
+!node-pty/build/Release/conpty/OpenConsole.exe
 
 @parcel/watcher/binding.gyp
 @parcel/watcher/build/**
diff --git a/build/.npmrc b/build/.npmrc
new file mode 100644
index 00000000000..1b073e71a83
--- /dev/null
+++ b/build/.npmrc
@@ -0,0 +1,5 @@
+disturl="https://nodejs.org/dist"
+runtime="node"
+build_from_source="true"
+legacy-peer-deps="true"
+timeout=180000
diff --git a/build/.webignore b/build/.webignore
index 15935edce8a..d42f9775ba9 100644
--- a/build/.webignore
+++ b/build/.webignore
@@ -38,6 +38,7 @@ vscode-textmate/webpack.config.js
 
 # This makes sure the model is included in the package
 !@vscode/vscode-languagedetection/model/**
+!@vscode/tree-sitter-wasm/wasm/**
 
 # Ensure only the required telemetry pieces are loaded in web to reduce bundle size
 @microsoft/1ds-core-js/**
@@ -45,7 +46,9 @@ vscode-textmate/webpack.config.js
 @microsoft/applicationinsights-core-js/**
 @microsoft/applicationinsights-shims/**
 !@microsoft/1ds-core-js/dist/ms.core.min.js
+!@microsoft/1ds-core-js/bundle/ms.core.min.js
 !@microsoft/1ds-post-js/dist/ms.post.min.js
+!@microsoft/1ds-post-js/bundle/ms.post.min.js
 !@microsoft/applicationinsights-core-js/browser/applicationinsights-core-js.min.js
 !@microsoft/applicationinsights-shims/dist/umd/applicationinsights-shims.min.js
 
diff --git a/build/azure-pipelines/alpine/cli-build-alpine.yml b/build/azure-pipelines/alpine/cli-build-alpine.yml
index a6442dfe290..07321ebcd97 100644
--- a/build/azure-pipelines/alpine/cli-build-alpine.yml
+++ b/build/azure-pipelines/alpine/cli-build-alpine.yml
@@ -19,17 +19,9 @@ steps:
       nodejsMirror: https://github.com/joaomoreno/node-mirror/releases/download
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    # Install yarn as the ARM64 build agent is using vanilla Ubuntu
-    - ${{ if eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true) }}:
-      - task: Npm@1
-        displayName: Install yarn
-        inputs:
-          command: custom
-          customCommand: install --global yarn
-
     - script: |
         set -e
-        yarn --frozen-lockfile --ignore-optional
+        npm ci
       workingDirectory: build
       displayName: Install pipeline build
 
diff --git a/build/azure-pipelines/alpine/product-build-alpine.yml b/build/azure-pipelines/alpine/product-build-alpine.yml
index 2c55132a9f9..077ec0ba11b 100644
--- a/build/azure-pipelines/alpine/product-build-alpine.yml
+++ b/build/azure-pipelines/alpine/product-build-alpine.yml
@@ -7,7 +7,7 @@ steps:
 
   - template: ../distro/download-distro.yml@self
 
-  - task: AzureKeyVault@1
+  - task: AzureKeyVault@2
     displayName: "Azure Key Vault: Get Secrets"
     inputs:
       azureSubscription: "vscode-builds-subscription"
@@ -27,12 +27,12 @@ steps:
     condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Registry
 
-  - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.js alpine $VSCODE_ARCH > .build/yarnlockhash
+  - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.js alpine $VSCODE_ARCH > .build/packagelockhash
     displayName: Prepare node_modules cache key
 
   - task: Cache@2
     inputs:
-      key: '"node_modules" | .build/yarnlockhash'
+      key: '"node_modules" | .build/packagelockhash'
       path: .build/node_modules_cache
       cacheHitVar: NODE_MODULES_RESTORED
     displayName: Restore node_modules cache
@@ -43,18 +43,17 @@ steps:
 
   - script: |
       set -e
-      npm config set registry "$NPM_REGISTRY" --location=project
-      # npm >v7 deprecated the `always-auth` config option, refs npm/cli@72a7eeb
-      # following is a workaround for yarn to send authorization header
-      # for GET requests to the registry.
-      echo "always-auth=true" >> .npmrc
-      yarn config set registry "$NPM_REGISTRY"
+      # Set the private NPM registry to the global npmrc file
+      # so that authentication works for subfolders like build/, remote/, extensions/ etc
+      # which does not have their own .npmrc file
+      npm config set registry "$NPM_REGISTRY"
+      echo "##vso[task.setvariable variable=NPMRC_PATH]$(npm config get userconfig)"
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
-    displayName: Setup NPM & Yarn
+    displayName: Setup NPM
 
   - task: npmAuthenticate@0
     inputs:
-      workingFile: .npmrc
+      workingFile: $(NPMRC_PATH)
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Authentication
 
@@ -75,12 +74,12 @@ steps:
   - script: |
       set -e
       for i in {1..5}; do # try 5 times
-        yarn --frozen-lockfile --check-files && break
-        if [ $i -eq 3 ]; then
-          echo "Yarn failed too many times" >&2
+        npm ci && break
+        if [ $i -eq 5 ]; then
+          echo "Npm install failed too many times" >&2
           exit 1
         fi
-        echo "Yarn failed $i, trying again..."
+        echo "Npm install failed $i, trying again..."
       done
     env:
       npm_config_arch: $(NPM_ARCH)
@@ -89,7 +88,7 @@ steps:
       GITHUB_TOKEN: "$(github-distro-mixin-password)"
       VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME: vscodehub.azurecr.io/vscode-linux-build-agent:alpine-$(VSCODE_ARCH)
       VSCODE_HOST_MOUNT: "/mnt/vss/_work/1/s"
-    displayName: Install build dependencies
+    displayName: Install dependencies
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
   - script: node build/azure-pipelines/distro/mixin-npm
@@ -112,7 +111,7 @@ steps:
   - script: |
       set -e
       TARGET=$([ "$VSCODE_ARCH" == "x64" ] && echo "linux-alpine" || echo "alpine-arm64") # TODO@joaomoreno
-      yarn gulp vscode-reh-$TARGET-min-ci
+      npm run gulp vscode-reh-$TARGET-min-ci
       (cd .. && mv vscode-reh-$TARGET vscode-server-$TARGET) # TODO@joaomoreno
       ARCHIVE_PATH=".build/linux/server/vscode-server-$TARGET.tar.gz"
       DIR_PATH="$(realpath ../vscode-server-$TARGET)"
@@ -127,7 +126,7 @@ steps:
   - script: |
       set -e
       TARGET=$([ "$VSCODE_ARCH" == "x64" ] && echo "linux-alpine" || echo "alpine-arm64")
-      yarn gulp vscode-reh-web-$TARGET-min-ci
+      npm run gulp vscode-reh-web-$TARGET-min-ci
       (cd .. && mv vscode-reh-web-$TARGET vscode-server-$TARGET-web) # TODO@joaomoreno
       ARCHIVE_PATH=".build/linux/web/vscode-server-$TARGET-web.tar.gz"
       DIR_PATH="$(realpath ../vscode-server-$TARGET-web)"
diff --git a/build/azure-pipelines/cli/cli-compile.yml b/build/azure-pipelines/cli/cli-compile.yml
index 267682f7f6d..e77ba78a999 100644
--- a/build/azure-pipelines/cli/cli-compile.yml
+++ b/build/azure-pipelines/cli/cli-compile.yml
@@ -49,16 +49,22 @@ steps:
               export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER="$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/bin/aarch64-linux-gnu-gcc"
               export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUSTFLAGS="-C link-arg=--sysroot=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot"
               export CC_aarch64_unknown_linux_gnu="$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/bin/aarch64-linux-gnu-gcc --sysroot=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot"
+              export PKG_CONFIG_LIBDIR_aarch64_unknown_linux_gnu="$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot/usr/lib/aarch64-linux-gnu/pkgconfig:$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot/usr/share/pkgconfig"
+              export PKG_CONFIG_SYSROOT_DIR_aarch64_unknown_linux_gnu="$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot"
               export OBJDUMP="$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/bin/objdump"
             elif [ "$SYSROOT_ARCH" == "amd64" ]; then
               export CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER="$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/bin/x86_64-linux-gnu-gcc"
               export CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS="-C link-arg=--sysroot=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot -C link-arg=-L$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot/usr/lib/x86_64-linux-gnu"
               export CC_x86_64_unknown_linux_gnu="$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/bin/x86_64-linux-gnu-gcc --sysroot=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot"
+              export PKG_CONFIG_LIBDIR_x86_64_unknown_linux_gnu="$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot/usr/lib/x86_64-linux-gnu/pkgconfig:$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot/usr/share/pkgconfig"
+              export PKG_CONFIG_SYSROOT_DIR_x86_64_unknown_linux_gnu="$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot"
               export OBJDUMP="$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/bin/objdump"
             elif [ "$SYSROOT_ARCH" == "armhf" ]; then
               export CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER="$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-gcc"
               export CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_RUSTFLAGS="-C link-arg=--sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot"
               export CC_armv7_unknown_linux_gnueabihf="$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-gcc --sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot"
+              export PKG_CONFIG_LIBDIR_armv7_unknown_linux_gnueabihf="$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot/usr/lib/arm-rpi-linux-gnueabihf/pkgconfig:$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot/usr/share/pkgconfig"
+              export PKG_CONFIG_SYSROOT_DIR_armv7_unknown_linux_gnueabihf="$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot"
               export OBJDUMP="$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/bin/objdump"
             fi
           fi
@@ -78,7 +84,7 @@ steps:
               fi
             done < <("$OBJDUMP" -T "$PWD/target/${{ parameters.VSCODE_CLI_TARGET }}/release/code")
             if [[ "$glibc_version" != "2.17" ]]; then
-              echo "Error: binary has dependency on GLIBC > 2.17"
+              echo "Error: binary has dependency on GLIBC > 2.17, found $glibc_version"
               exit 1
             fi
           fi
diff --git a/build/azure-pipelines/cli/cli-darwin-sign.yml b/build/azure-pipelines/cli/cli-darwin-sign.yml
index 75a8235ff3a..b6dc424d690 100644
--- a/build/azure-pipelines/cli/cli-darwin-sign.yml
+++ b/build/azure-pipelines/cli/cli-darwin-sign.yml
@@ -4,7 +4,7 @@ parameters:
     default: []
 
 steps:
-  - task: AzureKeyVault@1
+  - task: AzureKeyVault@2
     displayName: "Azure Key Vault: Get Secrets"
     inputs:
       azureSubscription: "vscode-builds-subscription"
diff --git a/build/azure-pipelines/cli/cli-win32-sign.yml b/build/azure-pipelines/cli/cli-win32-sign.yml
index f8d11e806f2..e39df13c998 100644
--- a/build/azure-pipelines/cli/cli-win32-sign.yml
+++ b/build/azure-pipelines/cli/cli-win32-sign.yml
@@ -4,7 +4,7 @@ parameters:
     default: []
 
 steps:
-  - task: AzureKeyVault@1
+  - task: AzureKeyVault@2
     displayName: "Azure Key Vault: Get Secrets"
     inputs:
       azureSubscription: "vscode-builds-subscription"
diff --git a/build/azure-pipelines/cli/install-rust-posix.yml b/build/azure-pipelines/cli/install-rust-posix.yml
index 89867143938..fee56e028f7 100644
--- a/build/azure-pipelines/cli/install-rust-posix.yml
+++ b/build/azure-pipelines/cli/install-rust-posix.yml
@@ -1,7 +1,7 @@
 parameters:
   - name: channel
     type: string
-    default: 1.77
+    default: 1.81
   - name: targets
     default: []
     type: object
diff --git a/build/azure-pipelines/cli/install-rust-win32.yml b/build/azure-pipelines/cli/install-rust-win32.yml
index 22fba8d7f6a..45a1cfd188e 100644
--- a/build/azure-pipelines/cli/install-rust-win32.yml
+++ b/build/azure-pipelines/cli/install-rust-win32.yml
@@ -1,7 +1,7 @@
 parameters:
   - name: channel
     type: string
-    default: 1.77
+    default: 1.81
   - name: targets
     default: []
     type: object
diff --git a/build/azure-pipelines/common/computeNodeModulesCacheKey.js b/build/azure-pipelines/common/computeNodeModulesCacheKey.js
index fe84d03e1d7..976e096fad2 100644
--- a/build/azure-pipelines/common/computeNodeModulesCacheKey.js
+++ b/build/azure-pipelines/common/computeNodeModulesCacheKey.js
@@ -11,9 +11,10 @@ const { dirs } = require('../../npm/dirs');
 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, '.yarnrc')));
-shasum.update(fs.readFileSync(path.join(ROOT, 'remote/.yarnrc')));
-// Add `package.json` and `yarn.lock` files
+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.join(ROOT, dir, 'package.json');
     const packageJson = JSON.parse(fs.readFileSync(packageJsonPath).toString());
@@ -25,8 +26,8 @@ for (const dir of dirs) {
         distro: packageJson.distro
     };
     shasum.update(JSON.stringify(relevantPackageJsonSections));
-    const yarnLockPath = path.join(ROOT, dir, 'yarn.lock');
-    shasum.update(fs.readFileSync(yarnLockPath));
+    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++) {
diff --git a/build/azure-pipelines/common/computeNodeModulesCacheKey.ts b/build/azure-pipelines/common/computeNodeModulesCacheKey.ts
index 16bf76796f9..0940c929b54 100644
--- a/build/azure-pipelines/common/computeNodeModulesCacheKey.ts
+++ b/build/azure-pipelines/common/computeNodeModulesCacheKey.ts
@@ -13,10 +13,11 @@ 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, '.yarnrc')));
-shasum.update(fs.readFileSync(path.join(ROOT, 'remote/.yarnrc')));
+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 `yarn.lock` files
+// Add `package.json` and `package-lock.json` files
 for (const dir of dirs) {
 	const packageJsonPath = path.join(ROOT, dir, 'package.json');
 	const packageJson = JSON.parse(fs.readFileSync(packageJsonPath).toString());
@@ -29,8 +30,8 @@ for (const dir of dirs) {
 	};
 	shasum.update(JSON.stringify(relevantPackageJsonSections));
 
-	const yarnLockPath = path.join(ROOT, dir, 'yarn.lock');
-	shasum.update(fs.readFileSync(yarnLockPath));
+	const packageLockPath = path.join(ROOT, dir, 'package-lock.json');
+	shasum.update(fs.readFileSync(packageLockPath));
 }
 
 // Add any other command line arguments
diff --git a/build/azure-pipelines/common/publish.js b/build/azure-pipelines/common/publish.js
index c990e3a7146..aa185ed8369 100644
--- a/build/azure-pipelines/common/publish.js
+++ b/build/azure-pipelines/common/publish.js
@@ -389,14 +389,8 @@ function getPlatform(product, os, arch, type, isLegacy) {
                     }
                 }
                 case 'server':
-                    if (arch === 'arm64') {
-                        throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
-                    }
                     return `server-win32-${arch}`;
                 case 'web':
-                    if (arch === 'arm64') {
-                        throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
-                    }
                     return `server-win32-${arch}-web`;
                 case 'cli':
                     return `cli-win32-${arch}`;
diff --git a/build/azure-pipelines/common/publish.ts b/build/azure-pipelines/common/publish.ts
index 75065ffa2d3..652cd168335 100644
--- a/build/azure-pipelines/common/publish.ts
+++ b/build/azure-pipelines/common/publish.ts
@@ -550,14 +550,8 @@ function getPlatform(product: string, os: string, arch: string, type: string, is
 					}
 				}
 				case 'server':
-					if (arch === 'arm64') {
-						throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
-					}
 					return `server-win32-${arch}`;
 				case 'web':
-					if (arch === 'arm64') {
-						throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
-					}
 					return `server-win32-${arch}-web`;
 				case 'cli':
 					return `cli-win32-${arch}`;
diff --git a/build/azure-pipelines/darwin/helper-plugin-entitlements.plist b/build/azure-pipelines/darwin/helper-plugin-entitlements.plist
index 1cc1a152c74..48f7bf5cece 100644
--- a/build/azure-pipelines/darwin/helper-plugin-entitlements.plist
+++ b/build/azure-pipelines/darwin/helper-plugin-entitlements.plist
@@ -6,8 +6,6 @@
 	<true/>
 	<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
 	<true/>
-	<key>com.apple.security.cs.allow-dyld-environment-variables</key>
-	<true/>
 	<key>com.apple.security.cs.disable-library-validation</key>
 	<true/>
 </dict>
diff --git a/build/azure-pipelines/darwin/product-build-darwin-cli-sign.yml b/build/azure-pipelines/darwin/product-build-darwin-cli-sign.yml
index 80e90a52bac..32615c58463 100644
--- a/build/azure-pipelines/darwin/product-build-darwin-cli-sign.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin-cli-sign.yml
@@ -17,31 +17,30 @@ steps:
 
   - script: |
       set -e
-      npm config set registry "$NPM_REGISTRY" --location=project
-      # npm >v7 deprecated the `always-auth` config option, refs npm/cli@72a7eeb
-      # following is a workaround for yarn to send authorization header
-      # for GET requests to the registry.
-      echo "always-auth=true" >> .npmrc
-      yarn config set registry "$NPM_REGISTRY"
-    workingDirectory: build
+      # Set the private NPM registry to the global npmrc file
+      # so that authentication works for subfolders like build/, remote/, extensions/ etc
+      # which does not have their own .npmrc file
+      npm config set registry "$NPM_REGISTRY"
+      echo "##vso[task.setvariable variable=NPMRC_PATH]$(npm config get userconfig)"
     condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
-    displayName: Setup NPM & Yarn
+    displayName: Setup NPM
 
   - task: npmAuthenticate@0
     inputs:
-      workingFile: build/.npmrc
+      workingFile: $(NPMRC_PATH)
     condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Authentication
 
   - script: |
       set -e
+
       for i in {1..5}; do # try 5 times
-        yarn --frozen-lockfile --check-files && break
-        if [ $i -eq 3 ]; then
-          echo "Yarn failed too many times" >&2
+        npm ci && break
+        if [ $i -eq 5 ]; then
+          echo "Npm install failed too many times" >&2
           exit 1
         fi
-        echo "Yarn failed $i, trying again..."
+        echo "Npm install failed $i, trying again..."
       done
     workingDirectory: build
     displayName: Install build dependencies
diff --git a/build/azure-pipelines/darwin/product-build-darwin-sign.yml b/build/azure-pipelines/darwin/product-build-darwin-sign.yml
index fb8cf8341c3..82a1e89f2ab 100644
--- a/build/azure-pipelines/darwin/product-build-darwin-sign.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin-sign.yml
@@ -13,7 +13,7 @@ steps:
     continueOnError: true
     displayName: Download ESRPClient
 
-  - task: AzureKeyVault@1
+  - task: AzureKeyVault@2
     displayName: "Azure Key Vault: Get Secrets"
     inputs:
       azureSubscription: "vscode-builds-subscription"
diff --git a/build/azure-pipelines/darwin/product-build-darwin-test.yml b/build/azure-pipelines/darwin/product-build-darwin-test.yml
index ed6d0236516..359aa460a59 100644
--- a/build/azure-pipelines/darwin/product-build-darwin-test.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin-test.yml
@@ -9,7 +9,7 @@ parameters:
     type: boolean
 
 steps:
-  - script: yarn npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
+  - script: npm exec -- npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
     env:
       GITHUB_TOKEN: "$(github-distro-mixin-password)"
     displayName: Download Electron and Playwright
@@ -20,12 +20,10 @@ steps:
       - script: ./scripts/test.sh --tfs "Unit Tests"
         displayName: Run unit tests (Electron)
         timeoutInMinutes: 15
-
-      - script: yarn test-node
+      - script: npm run test-node
         displayName: Run unit tests (node.js)
         timeoutInMinutes: 15
-
-      - script: yarn test-browser-no-install --sequential --browser chromium --browser webkit --tfs "Browser Unit Tests"
+      - script: npm run test-browser-no-install -- --sequential --browser chromium --browser webkit --tfs "Browser Unit Tests"
         env:
           DEBUG: "*browser*"
         displayName: Run unit tests (Browser, Chromium & Webkit)
@@ -35,12 +33,10 @@ steps:
       - script: ./scripts/test.sh --build --tfs "Unit Tests"
         displayName: Run unit tests (Electron)
         timeoutInMinutes: 15
-
-      - script: yarn test-node --build
+      - script: npm run test-node -- --build
         displayName: Run unit tests (node.js)
         timeoutInMinutes: 15
-
-      - script: yarn test-browser-no-install --sequential --build --browser chromium --browser webkit --tfs "Browser Unit Tests"
+      - script: npm run test-browser-no-install -- --sequential --build --browser chromium --browser webkit --tfs "Browser Unit Tests"
         env:
           DEBUG: "*browser*"
         displayName: Run unit tests (Browser, Chromium & Webkit)
@@ -49,7 +45,7 @@ steps:
   - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}:
     - script: |
         set -e
-        yarn gulp \
+        npm run gulp \
           compile-extension:configuration-editing \
           compile-extension:css-language-features-server \
           compile-extension:emmet \
@@ -59,7 +55,6 @@ steps:
           compile-extension:ipynb \
           compile-extension:notebook-renderers \
           compile-extension:json-language-features-server \
-          compile-extension:markdown-language-features-server \
           compile-extension:markdown-language-features \
           compile-extension-media \
           compile-extension:microsoft-authentication \
@@ -70,7 +65,7 @@ steps:
       displayName: Build integration tests
 
     - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-      - script: ./scripts/test-integration.sh --tfs "Integration Tests"
+      - script: ./scripts/test-integration --tfs "Integration Tests"
         displayName: Run integration tests (Electron)
         timeoutInMinutes: 20
 
@@ -113,13 +108,14 @@ steps:
       condition: succeededOrFailed()
 
     - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-      - script: yarn --cwd test/smoke compile
+      - script: npm run compile
+        workingDirectory: test/smoke
         displayName: Compile smoke tests
 
-      - script: yarn gulp compile-extension-media
+      - script: npm run gulp compile-extension-media
         displayName: Compile extensions for smoke tests
 
-      - script: yarn smoketest-no-compile --tracing
+      - script: npm run smoketest-no-compile -- --tracing
         timeoutInMinutes: 20
         displayName: Run smoke tests (Electron)
 
@@ -128,11 +124,11 @@ steps:
           set -e
           APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
           APP_NAME="`ls $APP_ROOT | head -n 1`"
-          yarn smoketest-no-compile --tracing --build "$APP_ROOT/$APP_NAME"
+          npm run smoketest-no-compile -- --tracing --build "$APP_ROOT/$APP_NAME"
         timeoutInMinutes: 20
         displayName: Run smoke tests (Electron)
 
-      - script: yarn smoketest-no-compile --web --tracing --headless
+      - script: npm run smoketest-no-compile -- --web --tracing --headless
         env:
           VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)-web
         timeoutInMinutes: 20
@@ -140,10 +136,10 @@ steps:
 
       - script: |
           set -e
-          yarn gulp compile-extension:vscode-test-resolver
+          npm run gulp compile-extension:vscode-test-resolver
           APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
           APP_NAME="`ls $APP_ROOT | head -n 1`"
-          yarn smoketest-no-compile --tracing --remote --build "$APP_ROOT/$APP_NAME"
+          npm run smoketest-no-compile -- --tracing --remote --build "$APP_ROOT/$APP_NAME"
         env:
           VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)
         timeoutInMinutes: 20
diff --git a/build/azure-pipelines/darwin/product-build-darwin-universal.yml b/build/azure-pipelines/darwin/product-build-darwin-universal.yml
index f8b201f40d4..f8c10a03cec 100644
--- a/build/azure-pipelines/darwin/product-build-darwin-universal.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin-universal.yml
@@ -7,7 +7,7 @@ steps:
 
   - template: ../distro/download-distro.yml@self
 
-  - task: AzureKeyVault@1
+  - task: AzureKeyVault@2
     displayName: "Azure Key Vault: Get Secrets"
     inputs:
       azureSubscription: "vscode-builds-subscription"
@@ -20,31 +20,30 @@ steps:
 
   - script: |
       set -e
-      npm config set registry "$NPM_REGISTRY" --location=project
-      # npm >v7 deprecated the `always-auth` config option, refs npm/cli@72a7eeb
-      # following is a workaround for yarn to send authorization header
-      # for GET requests to the registry.
-      echo "always-auth=true" >> .npmrc
-      yarn config set registry "$NPM_REGISTRY"
-    workingDirectory: build
+      # Set the private NPM registry to the global npmrc file
+      # so that authentication works for subfolders like build/, remote/, extensions/ etc
+      # which does not have their own .npmrc file
+      npm config set registry "$NPM_REGISTRY"
+      echo "##vso[task.setvariable variable=NPMRC_PATH]$(npm config get userconfig)"
     condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
-    displayName: Setup NPM & Yarn
+    displayName: Setup NPM
 
   - task: npmAuthenticate@0
     inputs:
-      workingFile: build/.npmrc
+      workingFile: $(NPMRC_PATH)
     condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Authentication
 
   - script: |
       set -e
+
       for i in {1..5}; do # try 5 times
-        yarn --frozen-lockfile --check-files && break
-        if [ $i -eq 3 ]; then
-          echo "Yarn failed too many times" >&2
+        npm ci && break
+        if [ $i -eq 5 ]; then
+          echo "Npm install failed too many times" >&2
           exit 1
         fi
-        echo "Yarn failed $i, trying again..."
+        echo "Npm install failed $i, trying again..."
       done
     workingDirectory: build
     displayName: Install build dependencies
diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml
index 8b4bda1c6a2..c863c60d502 100644
--- a/build/azure-pipelines/darwin/product-build-darwin.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin.yml
@@ -25,7 +25,7 @@ steps:
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
     - template: ../distro/download-distro.yml@self
 
-    - task: AzureKeyVault@1
+    - task: AzureKeyVault@2
       displayName: "Azure Key Vault: Get Secrets"
       inputs:
         azureSubscription: "vscode-builds-subscription"
@@ -45,12 +45,12 @@ steps:
     condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Registry
 
-  - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.js darwin $VSCODE_ARCH > .build/yarnlockhash
+  - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.js darwin $VSCODE_ARCH > .build/packagelockhash
     displayName: Prepare node_modules cache key
 
   - task: Cache@2
     inputs:
-      key: '"node_modules" | .build/yarnlockhash'
+      key: '"node_modules" | .build/packagelockhash'
       path: .build/node_modules_cache
       cacheHitVar: NODE_MODULES_RESTORED
     displayName: Restore node_modules cache
@@ -61,38 +61,50 @@ steps:
 
   - script: |
       set -e
-      npm config set registry "$NPM_REGISTRY" --location=project
-      # npm >v7 deprecated the `always-auth` config option, refs npm/cli@72a7eeb
-      # following is a workaround for yarn to send authorization header
-      # for GET requests to the registry.
-      echo "always-auth=true" >> .npmrc
-      yarn config set registry "$NPM_REGISTRY"
+      # Set the private NPM registry to the global npmrc file
+      # so that authentication works for subfolders like build/, remote/, extensions/ etc
+      # which does not have their own .npmrc file
+      npm config set registry "$NPM_REGISTRY"
+      echo "##vso[task.setvariable variable=NPMRC_PATH]$(npm config get userconfig)"
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
-    displayName: Setup NPM & Yarn
+    displayName: Setup NPM
 
   - task: npmAuthenticate@0
     inputs:
-      workingFile: .npmrc
+      workingFile: $(NPMRC_PATH)
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Authentication
 
   - script: |
       set -e
+      # Refs https://github.com/microsoft/vscode/issues/219893#issuecomment-2209313109
+      sudo xcode-select --switch /Applications/Xcode_15.2.app
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Switch to Xcode >= 15.1
+
+  - script: |
+      set -e
+      c++ --version
       python3 -m pip install setuptools
 
       for i in {1..5}; do # try 5 times
-        yarn --frozen-lockfile --check-files && break
-        if [ $i -eq 3 ]; then
-          echo "Yarn failed too many times" >&2
+        npm ci && break
+        if [ $i -eq 5 ]; then
+          echo "Npm install failed too many times" >&2
           exit 1
         fi
-        echo "Yarn failed $i, trying again..."
+        echo "Npm install failed $i, trying again..."
       done
     env:
       npm_config_arch: $(VSCODE_ARCH)
       ELECTRON_SKIP_BINARY_DOWNLOAD: 1
       PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
       GITHUB_TOKEN: "$(github-distro-mixin-password)"
+      # Avoid using dlopen to load Kerberos on macOS which can cause missing libraries
+      # https://github.com/mongodb-js/kerberos/commit/04044d2814ad1d01e77f1ce87f26b03d86692cf2
+      # flipped the default to support legacy linux distros which shouldn't happen
+      # on macOS.
+      GYP_DEFINES: "kerberos_use_rtld=false"
     displayName: Install dependencies
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
@@ -118,7 +130,7 @@ steps:
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
     - script: |
         set -e
-        yarn gulp vscode-darwin-$(VSCODE_ARCH)-min-ci
+        npm run gulp vscode-darwin-$(VSCODE_ARCH)-min-ci
         echo "##vso[task.setvariable variable=BUILT_CLIENT]true"
       env:
         GITHUB_TOKEN: "$(github-distro-mixin-password)"
@@ -126,7 +138,7 @@ steps:
 
     - script: |
         set -e
-        yarn gulp vscode-reh-darwin-$(VSCODE_ARCH)-min-ci
+        npm run gulp vscode-reh-darwin-$(VSCODE_ARCH)-min-ci
         mv ../vscode-reh-darwin-$(VSCODE_ARCH) ../vscode-server-darwin-$(VSCODE_ARCH) # TODO@joaomoreno
         ARCHIVE_PATH=".build/darwin/server/vscode-server-darwin-$(VSCODE_ARCH).zip"
         mkdir -p $(dirname $ARCHIVE_PATH)
@@ -138,7 +150,7 @@ steps:
 
     - script: |
         set -e
-        yarn gulp vscode-reh-web-darwin-$(VSCODE_ARCH)-min-ci
+        npm run gulp vscode-reh-web-darwin-$(VSCODE_ARCH)-min-ci
         mv ../vscode-reh-web-darwin-$(VSCODE_ARCH) ../vscode-server-darwin-$(VSCODE_ARCH)-web # TODO@joaomoreno
         ARCHIVE_PATH=".build/darwin/server/vscode-server-darwin-$(VSCODE_ARCH)-web.zip"
         mkdir -p $(dirname $ARCHIVE_PATH)
@@ -149,7 +161,7 @@ steps:
       displayName: Build server (web)
 
   - ${{ else }}:
-      - script: yarn gulp transpile-client-swc transpile-extensions
+      - script: npm run gulp transpile-client-swc transpile-extensions
         env:
           GITHUB_TOKEN: "$(github-distro-mixin-password)"
         displayName: Transpile
diff --git a/build/azure-pipelines/distro-build.yml b/build/azure-pipelines/distro-build.yml
index ee5dd5d9919..ae11345bb6d 100644
--- a/build/azure-pipelines/distro-build.yml
+++ b/build/azure-pipelines/distro-build.yml
@@ -1,5 +1,6 @@
 pool:
-  vmImage: "ubuntu-latest"
+  name: 1es-ubuntu-22.04-x64
+  os: linux
 
 trigger:
   branches:
diff --git a/build/azure-pipelines/distro/download-distro.yml b/build/azure-pipelines/distro/download-distro.yml
index a703992aab2..92325762a60 100644
--- a/build/azure-pipelines/distro/download-distro.yml
+++ b/build/azure-pipelines/distro/download-distro.yml
@@ -1,5 +1,5 @@
 steps:
-  - task: AzureKeyVault@1
+  - task: AzureKeyVault@2
     displayName: "Azure Key Vault: Get Secrets"
     inputs:
       azureSubscription: "vscode-builds-subscription"
@@ -51,6 +51,5 @@ steps:
 
       unzip $ArchivePath -d .build
       mv .build/microsoft-vscode-distro-$DistroVersion .build/distro
-      cp remote/.yarnrc .build/distro/npm/remote/.yarnrc
     condition: and(succeeded(), not(contains(variables['Agent.OS'], 'windows')))
     displayName: Download distro (non-Windows)
diff --git a/build/azure-pipelines/linux/apt-retry.sh b/build/azure-pipelines/linux/apt-retry.sh
new file mode 100755
index 00000000000..358f34cd308
--- /dev/null
+++ b/build/azure-pipelines/linux/apt-retry.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+################################################################################
+##  Copied from https://github.com/actions/runner-images/blob/ubuntu22/20240825.1/images/ubuntu/scripts/build/configure-apt-mock.sh
+################################################################################
+
+i=1
+while [ $i -le 30 ];do
+  err=$(mktemp)
+  "$@" 2>$err
+
+  # no errors, break the loop and continue normal flow
+  test -f $err || break
+  cat $err >&2
+
+  retry=false
+
+  if grep -q 'Could not get lock' $err;then
+    # apt db locked needs retry
+    retry=true
+  elif grep -q 'Could not open file /var/lib/apt/lists' $err;then
+    # apt update is not completed, needs retry
+    retry=true
+  elif grep -q 'IPC connect call failed' $err;then
+    # the delay should help with gpg-agent not ready
+    retry=true
+  elif grep -q 'Temporary failure in name resolution' $err;then
+    # It looks like DNS is not updated with random generated hostname yet
+    retry=true
+  elif grep -q 'dpkg frontend is locked by another process' $err;then
+    # dpkg process is busy by another process
+    retry=true
+  fi
+
+  rm $err
+  if [ $retry = false ]; then
+    break
+  fi
+
+  sleep 5
+  echo "...retry $i"
+  i=$((i + 1))
+done
diff --git a/build/azure-pipelines/linux/cli-build-linux.yml b/build/azure-pipelines/linux/cli-build-linux.yml
index f3e2ef88b9d..89bc8a39e24 100644
--- a/build/azure-pipelines/linux/cli-build-linux.yml
+++ b/build/azure-pipelines/linux/cli-build-linux.yml
@@ -40,24 +40,23 @@ steps:
     displayName: Extract openssl prebuilt
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: node build/setup-npm-registry.js $NPM_REGISTRY
+    - script: node build/setup-npm-registry.js $NPM_REGISTRY build
       condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
       displayName: Setup NPM Registry
 
     - script: |
         set -e
-        npm config set registry "$NPM_REGISTRY" --location=project
-        # npm >v7 deprecated the `always-auth` config option, refs npm/cli@72a7eeb
-        # following is a workaround for yarn to send authorization header
-        # for GET requests to the registry.
-        echo "always-auth=true" >> .npmrc
-        yarn config set registry "$NPM_REGISTRY"
+        # Set the private NPM registry to the global npmrc file
+        # so that authentication works for subfolders like build/, remote/, extensions/ etc
+        # which does not have their own .npmrc file
+        npm config set registry "$NPM_REGISTRY"
+        echo "##vso[task.setvariable variable=NPMRC_PATH]$(npm config get userconfig)"
       condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
-      displayName: Setup NPM & Yarn
+      displayName: Setup NPM
 
     - task: npmAuthenticate@0
       inputs:
-        workingFile: .npmrc
+        workingFile: $(NPMRC_PATH)
       condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
       displayName: Setup NPM Authentication
 
@@ -65,13 +64,14 @@ steps:
       set -e
 
       for i in {1..5}; do # try 5 times
-        yarn --cwd build --frozen-lockfile --check-files && break
-        if [ $i -eq 3 ]; then
-          echo "Yarn failed too many times" >&2
+        npm ci && break
+        if [ $i -eq 5 ]; then
+          echo "Npm install failed too many times" >&2
           exit 1
         fi
-        echo "Yarn failed $i, trying again..."
+        echo "Npm install failed $i, trying again..."
       done
+    workingDirectory: build
     displayName: Install build dependencies
 
   - script: |
diff --git a/build/azure-pipelines/linux/product-build-linux-legacy-server.yml b/build/azure-pipelines/linux/product-build-linux-legacy-server.yml
index dc8424f26ee..649a3d224d9 100644
--- a/build/azure-pipelines/linux/product-build-linux-legacy-server.yml
+++ b/build/azure-pipelines/linux/product-build-linux-legacy-server.yml
@@ -15,7 +15,7 @@ steps:
 
   - template: ../distro/download-distro.yml
 
-  - task: AzureKeyVault@1
+  - task: AzureKeyVault@2
     displayName: "Azure Key Vault: Get Secrets"
     inputs:
       azureSubscription: "vscode-builds-subscription"
@@ -34,8 +34,8 @@ steps:
   - script: |
       set -e
       # Start X server
-      sudo apt-get update
-      sudo apt-get install -y pkg-config \
+      ./build/azure-pipelines/linux/apt-retry.sh sudo apt-get update
+      ./build/azure-pipelines/linux/apt-retry.sh sudo apt-get install -y pkg-config \
         dbus \
         xvfb \
         libgtk-3-0 \
@@ -59,18 +59,17 @@ steps:
 
   - script: |
       set -e
-      npm config set registry "$NPM_REGISTRY" --location=project
-      # npm >v7 deprecated the `always-auth` config option, refs npm/cli@72a7eeb
-      # following is a workaround for yarn to send authorization header
-      # for GET requests to the registry.
-      echo "always-auth=true" >> .npmrc
-      yarn config set registry "$NPM_REGISTRY"
+      # Set the private NPM registry to the global npmrc file
+      # so that authentication works for subfolders like build/, remote/, extensions/ etc
+      # which does not have their own .npmrc file
+      npm config set registry "$NPM_REGISTRY"
+      echo "##vso[task.setvariable variable=NPMRC_PATH]$(npm config get userconfig)"
     condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
-    displayName: Setup NPM & Yarn
+    displayName: Setup NPM
 
   - task: npmAuthenticate@0
     inputs:
-      workingFile: .npmrc
+      workingFile: $(NPMRC_PATH)
     condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Authentication
 
@@ -84,40 +83,33 @@ steps:
         imageName: vscode-linux-build-agent:centos7-devtoolset8-$(VSCODE_ARCH)
         containerCommand: uname
 
-  - ${{ if eq(parameters.VSCODE_ARCH, 'armhf') }}:
-    - task: Docker@1
-      displayName: "Pull Docker image"
-      inputs:
-        azureSubscriptionEndpoint: "vscode-builds-subscription"
-        azureContainerRegistry: vscodehub.azurecr.io
-        command: "Run an image"
-        imageName: vscode-linux-build-agent:bionic-arm32v7
-        containerCommand: uname
+  - script: |
+      set -e
+
+      for i in {1..5}; do # try 5 times
+        npm ci && break
+        if [ $i -eq 5 ]; then
+          echo "Npm install failed too many times" >&2
+          exit 1
+        fi
+        echo "Npm install failed $i, trying again..."
+      done
+    workingDirectory: build
+    displayName: Install build dependencies
 
   - script: |
       set -e
-      # To workaround the issue of yarn not respecting the registry value from .npmrc
-      yarn config set registry "$NPM_REGISTRY"
-
-      for i in {1..5}; do # try 5 times
-        yarn --cwd build --frozen-lockfile --check-files && break
-        if [ $i -eq 3 ]; then
-          echo "Yarn failed too many times" >&2
-          exit 1
-        fi
-        echo "Yarn failed $i, trying again..."
-      done
 
       export VSCODE_SYSROOT_PREFIX='-glibc-2.17'
       source ./build/azure-pipelines/linux/setup-env.sh --only-remote
 
       for i in {1..5}; do # try 5 times
-        yarn --frozen-lockfile --check-files && break
-        if [ $i -eq 3 ]; then
-          echo "Yarn failed too many times" >&2
+        npm ci && break
+        if [ $i -eq 5 ]; then
+          echo "Npm install failed too many times" >&2
           exit 1
         fi
-        echo "Yarn failed $i, trying again..."
+        echo "Npm install failed $i, trying again..."
       done
     env:
       npm_config_arch: $(NPM_ARCH)
@@ -129,18 +121,8 @@ steps:
       VSCODE_HOST_MOUNT: "/mnt/vss/_work/1/s"
       ${{ if or(eq(parameters.VSCODE_ARCH, 'x64'), eq(parameters.VSCODE_ARCH, 'arm64')) }}:
         VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME: vscodehub.azurecr.io/vscode-linux-build-agent:centos7-devtoolset8-$(VSCODE_ARCH)
-      ${{ if eq(parameters.VSCODE_ARCH, 'armhf') }}:
-        VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME: vscodehub.azurecr.io/vscode-linux-build-agent:bionic-arm32v7
     displayName: Install dependencies
 
-  - ${{ if or(eq(parameters.VSCODE_ARCH, 'x64'), eq(parameters.VSCODE_ARCH, 'arm64')) }}:
-    - script: |
-        set -e
-        EXPECTED_GLIBC_VERSION="2.17" \
-        EXPECTED_GLIBCXX_VERSION="3.4.19" \
-        ./build/azure-pipelines/linux/verify-glibc-requirements.sh
-      displayName: Check GLIBC and GLIBCXX dependencies in remote/node_modules
-
   - script: node build/azure-pipelines/distro/mixin-npm
     displayName: Mixin distro node modules
 
@@ -151,7 +133,7 @@ steps:
 
   - script: |
       set -e
-      yarn gulp vscode-linux-$(VSCODE_ARCH)-min-ci
+      npm run gulp vscode-linux-$(VSCODE_ARCH)-min-ci
       ARCHIVE_PATH=".build/linux/client/code-${{ parameters.VSCODE_QUALITY }}-$(VSCODE_ARCH)-$(date +%s).tar.gz"
       mkdir -p $(dirname $ARCHIVE_PATH)
       echo "##vso[task.setvariable variable=CLIENT_PATH]$ARCHIVE_PATH"
@@ -169,12 +151,14 @@ steps:
   - script: |
       set -e
       export VSCODE_NODE_GLIBC="-glibc-2.17"
-      yarn gulp vscode-reh-linux-$(VSCODE_ARCH)-min-ci
+      npm run gulp vscode-reh-linux-$(VSCODE_ARCH)-min-ci
       mv ../vscode-reh-linux-$(VSCODE_ARCH) ../vscode-server-linux-$(VSCODE_ARCH) # TODO@joaomoreno
       ARCHIVE_PATH=".build/linux/server/vscode-server-linux-legacy-$(VSCODE_ARCH).tar.gz"
+      UNARCHIVE_PATH="`pwd`/../vscode-server-linux-$(VSCODE_ARCH)"
       mkdir -p $(dirname $ARCHIVE_PATH)
       tar --owner=0 --group=0 -czf $ARCHIVE_PATH -C .. vscode-server-linux-$(VSCODE_ARCH)
       echo "##vso[task.setvariable variable=SERVER_PATH]$ARCHIVE_PATH"
+      echo "##vso[task.setvariable variable=SERVER_UNARCHIVE_PATH]$UNARCHIVE_PATH"
     env:
       GITHUB_TOKEN: "$(github-distro-mixin-password)"
     displayName: Build server
@@ -182,7 +166,7 @@ steps:
   - script: |
       set -e
       export VSCODE_NODE_GLIBC="-glibc-2.17"
-      yarn gulp vscode-reh-web-linux-$(VSCODE_ARCH)-min-ci
+      npm run gulp vscode-reh-web-linux-$(VSCODE_ARCH)-min-ci
       mv ../vscode-reh-web-linux-$(VSCODE_ARCH) ../vscode-server-linux-$(VSCODE_ARCH)-web # TODO@joaomoreno
       ARCHIVE_PATH=".build/linux/web/vscode-server-linux-legacy-$(VSCODE_ARCH)-web.tar.gz"
       mkdir -p $(dirname $ARCHIVE_PATH)
@@ -192,6 +176,26 @@ steps:
       GITHUB_TOKEN: "$(github-distro-mixin-password)"
     displayName: Build server (web)
 
+  - ${{ if or(eq(parameters.VSCODE_ARCH, 'x64'), eq(parameters.VSCODE_ARCH, 'arm64')) }}:
+    - script: |
+        set -e
+        EXPECTED_GLIBC_VERSION="2.17" \
+        EXPECTED_GLIBCXX_VERSION="3.4.19" \
+        ./build/azure-pipelines/linux/verify-glibc-requirements.sh
+      env:
+        SEARCH_PATH: $(SERVER_UNARCHIVE_PATH)
+      displayName: Check GLIBC and GLIBCXX dependencies in server archive
+
+  - ${{ else }}:
+    - script: |
+        set -e
+        EXPECTED_GLIBC_VERSION="2.17" \
+        EXPECTED_GLIBCXX_VERSION="3.4.22" \
+        ./build/azure-pipelines/linux/verify-glibc-requirements.sh
+      env:
+        SEARCH_PATH: $(SERVER_UNARCHIVE_PATH)
+      displayName: Check GLIBC and GLIBCXX dependencies in server archive
+
   - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}:
     - template: product-build-linux-test.yml
       parameters:
diff --git a/build/azure-pipelines/linux/product-build-linux-test.yml b/build/azure-pipelines/linux/product-build-linux-test.yml
index f5c00aa0cf0..5f7381d487c 100644
--- a/build/azure-pipelines/linux/product-build-linux-test.yml
+++ b/build/azure-pipelines/linux/product-build-linux-test.yml
@@ -12,7 +12,7 @@ parameters:
     default: PublishPipelineArtifact@0
 
 steps:
-  - script: yarn npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
+  - script: npm exec -- npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
     env:
       GITHUB_TOKEN: "$(github-distro-mixin-password)"
     displayName: Download Electron and Playwright
@@ -38,27 +38,24 @@ steps:
           DISPLAY: ":10"
         displayName: Run unit tests (Electron)
         timeoutInMinutes: 15
-
-      - script: yarn test-node
+      - script: npm run test-node
         displayName: Run unit tests (node.js)
         timeoutInMinutes: 15
-
-      - script: yarn test-browser-no-install --browser chromium --tfs "Browser Unit Tests"
+      - script: npm run test-browser-no-install -- --browser chromium --tfs "Browser Unit Tests"
         env:
           DEBUG: "*browser*"
         displayName: Run unit tests (Browser, Chromium)
         timeoutInMinutes: 15
 
+
     - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
       - script: ./scripts/test.sh --build --tfs "Unit Tests"
         displayName: Run unit tests (Electron)
         timeoutInMinutes: 15
-
-      - script: yarn test-node --build
+      - script: npm run test-node -- --build
         displayName: Run unit tests (node.js)
         timeoutInMinutes: 15
-
-      - script: yarn test-browser-no-install --build --browser chromium --tfs "Browser Unit Tests"
+      - script: npm run test-browser-no-install -- --build --browser chromium --tfs "Browser Unit Tests"
         env:
           DEBUG: "*browser*"
         displayName: Run unit tests (Browser, Chromium)
@@ -67,7 +64,7 @@ steps:
   - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}:
     - script: |
         set -e
-        yarn gulp \
+        npm run gulp \
           compile-extension:configuration-editing \
           compile-extension:css-language-features-server \
           compile-extension:emmet \
@@ -77,7 +74,6 @@ steps:
           compile-extension:ipynb \
           compile-extension:notebook-renderers \
           compile-extension:json-language-features-server \
-          compile-extension:markdown-language-features-server \
           compile-extension:markdown-language-features \
           compile-extension-media \
           compile-extension:microsoft-authentication \
@@ -148,34 +144,35 @@ steps:
       condition: succeededOrFailed()
 
     - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-      - script: yarn --cwd test/smoke compile
+      - script: npm run compile
+        workingDirectory: test/smoke
         displayName: Compile smoke tests
 
-      - script: yarn gulp compile-extension:markdown-language-features compile-extension-media compile-extension:vscode-test-resolver
+      - script: npm run gulp compile-extension:markdown-language-features compile-extension:ipynb compile-extension-media compile-extension:vscode-test-resolver
         displayName: Build extensions for smoke tests
 
-      - script: yarn gulp node
+      - script: npm run gulp node
         displayName: Download node.js for remote smoke tests
         retryCountOnTaskFailure: 3
 
-      - script: yarn smoketest-no-compile --tracing
+      - script: npm run smoketest-no-compile -- --tracing
         timeoutInMinutes: 20
         displayName: Run smoke tests (Electron)
 
-      - script: yarn smoketest-no-compile --web --tracing --headless --electronArgs="--disable-dev-shm-usage"
+      - script: npm run smoketest-no-compile -- --web --tracing --headless --electronArgs="--disable-dev-shm-usage"
         timeoutInMinutes: 20
         displayName: Run smoke tests (Browser, Chromium)
 
-      - script: yarn smoketest-no-compile --remote --tracing
+      - script: npm run smoketest-no-compile -- --remote --tracing
         timeoutInMinutes: 20
         displayName: Run smoke tests (Remote)
 
     - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-      - script: yarn smoketest-no-compile --tracing --build "$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)"
+      - script: npm run smoketest-no-compile -- --tracing --build "$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)"
         timeoutInMinutes: 20
         displayName: Run smoke tests (Electron)
 
-      - script: yarn smoketest-no-compile --web --tracing --headless --electronArgs="--disable-dev-shm-usage"
+      - script: npm run smoketest-no-compile -- --web --tracing --headless --electronArgs="--disable-dev-shm-usage"
         env:
           VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH)-web
         timeoutInMinutes: 20
@@ -183,10 +180,10 @@ steps:
 
       - script: |
           set -e
-          yarn gulp compile-extension:vscode-test-resolver
+          npm run gulp compile-extension:vscode-test-resolver
           APP_PATH=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
           VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH)" \
-          yarn smoketest-no-compile --tracing --remote --build "$APP_PATH"
+          npm run smoketest-no-compile -- --tracing --remote --build "$APP_PATH"
         timeoutInMinutes: 20
         displayName: Run smoke tests (Remote)
 
diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml
index 352b31360f8..3fb7b4fe679 100644
--- a/build/azure-pipelines/linux/product-build-linux.yml
+++ b/build/azure-pipelines/linux/product-build-linux.yml
@@ -27,7 +27,7 @@ steps:
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
     - template: ../distro/download-distro.yml@self
 
-    - task: AzureKeyVault@1
+    - task: AzureKeyVault@2
       displayName: "Azure Key Vault: Get Secrets"
       inputs:
         azureSubscription: "vscode-builds-subscription"
@@ -46,8 +46,8 @@ steps:
   - script: |
       set -e
       # Start X server
-      sudo apt-get update
-      sudo apt-get install -y pkg-config \
+      ./build/azure-pipelines/linux/apt-retry.sh sudo apt-get update
+      ./build/azure-pipelines/linux/apt-retry.sh sudo apt-get install -y pkg-config \
         dbus \
         xvfb \
         libgtk-3-0 \
@@ -69,12 +69,12 @@ steps:
     condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Registry
 
-  - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.js linux $VSCODE_ARCH > .build/yarnlockhash
+  - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.js linux $VSCODE_ARCH > .build/packagelockhash
     displayName: Prepare node_modules cache key
 
   - task: Cache@2
     inputs:
-      key: '"node_modules" | .build/yarnlockhash'
+      key: '"node_modules" | .build/packagelockhash'
       path: .build/node_modules_cache
       cacheHitVar: NODE_MODULES_RESTORED
     displayName: Restore node_modules cache
@@ -85,18 +85,17 @@ steps:
 
   - script: |
       set -e
-      npm config set registry "$NPM_REGISTRY" --location=project
-      # npm >v7 deprecated the `always-auth` config option, refs npm/cli@72a7eeb
-      # following is a workaround for yarn to send authorization header
-      # for GET requests to the registry.
-      echo "always-auth=true" >> .npmrc
-      yarn config set registry "$NPM_REGISTRY"
+      # Set the private NPM registry to the global npmrc file
+      # so that authentication works for subfolders like build/, remote/, extensions/ etc
+      # which does not have their own .npmrc file
+      npm config set registry "$NPM_REGISTRY"
+      echo "##vso[task.setvariable variable=NPMRC_PATH]$(npm config get userconfig)"
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
-    displayName: Setup NPM & Yarn
+    displayName: Setup NPM
 
   - task: npmAuthenticate@0
     inputs:
-      workingFile: .npmrc
+      workingFile: $(NPMRC_PATH)
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Authentication
 
@@ -104,23 +103,44 @@ steps:
       set -e
 
       for i in {1..5}; do # try 5 times
-        yarn --cwd build --frozen-lockfile --check-files && break
-        if [ $i -eq 3 ]; then
-          echo "Yarn failed too many times" >&2
+        npm ci && break
+        if [ $i -eq 5 ]; then
+          echo "Npm install failed too many times" >&2
           exit 1
         fi
-        echo "Yarn failed $i, trying again..."
+        echo "Npm install failed $i, trying again..."
       done
+    workingDirectory: build
+    displayName: Install build dependencies
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
+
+  # Step will be used by both Install dependencies and building rpm package,
+  # hence avoid adding it behind NODE_MODULES_RESTORED condition.
+  - script: |
+      set -e
+      SYSROOT_ARCH=$VSCODE_ARCH
+      if [ "$SYSROOT_ARCH" == "x64" ]; then
+        SYSROOT_ARCH="amd64"
+      fi
+      export VSCODE_SYSROOT_DIR=$(Build.SourcesDirectory)/.build/sysroots
+      SYSROOT_ARCH="$SYSROOT_ARCH" node -e '(async () => { const { getVSCodeSysroot } = require("./build/linux/debian/install-sysroot.js"); await getVSCodeSysroot(process.env["SYSROOT_ARCH"]); })()'
+    env:
+      VSCODE_ARCH: $(VSCODE_ARCH)
+      GITHUB_TOKEN: "$(github-distro-mixin-password)"
+    displayName: Download vscode sysroots
+
+  - script: |
+      set -e
 
       source ./build/azure-pipelines/linux/setup-env.sh
 
       for i in {1..5}; do # try 5 times
-        yarn --frozen-lockfile --check-files && break
-        if [ $i -eq 3 ]; then
-          echo "Yarn failed too many times" >&2
+        npm ci && break
+        if [ $i -eq 5 ]; then
+          echo "Npm install failed too many times" >&2
           exit 1
         fi
-        echo "Yarn failed $i, trying again..."
+        echo "Npm install failed $i, trying again..."
       done
     env:
       npm_config_arch: $(NPM_ARCH)
@@ -131,16 +151,6 @@ steps:
     displayName: Install dependencies
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
-  - script: |
-      set -e
-
-      EXPECTED_GLIBC_VERSION="2.28" \
-      EXPECTED_GLIBCXX_VERSION="3.4.25" \
-      ./build/azure-pipelines/linux/verify-glibc-requirements.sh
-    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
-    displayName: Check GLIBC and GLIBCXX dependencies in remote/node_modules
-
-
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
     - script: node build/azure-pipelines/distro/mixin-npm
       condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
@@ -177,7 +187,7 @@ steps:
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
     - script: |
         set -e
-        yarn gulp vscode-linux-$(VSCODE_ARCH)-min-ci
+        npm run gulp vscode-linux-$(VSCODE_ARCH)-min-ci
         ARCHIVE_PATH=".build/linux/client/code-${{ parameters.VSCODE_QUALITY }}-$(VSCODE_ARCH)-$(date +%s).tar.gz"
         mkdir -p $(dirname $ARCHIVE_PATH)
         echo "##vso[task.setvariable variable=CLIENT_PATH]$ARCHIVE_PATH"
@@ -210,19 +220,21 @@ steps:
 
     - script: |
         set -e
-        yarn gulp vscode-reh-linux-$(VSCODE_ARCH)-min-ci
+        npm run gulp vscode-reh-linux-$(VSCODE_ARCH)-min-ci
         mv ../vscode-reh-linux-$(VSCODE_ARCH) ../vscode-server-linux-$(VSCODE_ARCH) # TODO@joaomoreno
         ARCHIVE_PATH=".build/linux/server/vscode-server-linux-$(VSCODE_ARCH).tar.gz"
+        UNARCHIVE_PATH="`pwd`/../vscode-server-linux-$(VSCODE_ARCH)"
         mkdir -p $(dirname $ARCHIVE_PATH)
         tar --owner=0 --group=0 -czf $ARCHIVE_PATH -C .. vscode-server-linux-$(VSCODE_ARCH)
         echo "##vso[task.setvariable variable=SERVER_PATH]$ARCHIVE_PATH"
+        echo "##vso[task.setvariable variable=SERVER_UNARCHIVE_PATH]$UNARCHIVE_PATH"
       env:
         GITHUB_TOKEN: "$(github-distro-mixin-password)"
       displayName: Build server
 
     - script: |
         set -e
-        yarn gulp vscode-reh-web-linux-$(VSCODE_ARCH)-min-ci
+        npm run gulp vscode-reh-web-linux-$(VSCODE_ARCH)-min-ci
         mv ../vscode-reh-web-linux-$(VSCODE_ARCH) ../vscode-server-linux-$(VSCODE_ARCH)-web # TODO@joaomoreno
         ARCHIVE_PATH=".build/linux/web/vscode-server-linux-$(VSCODE_ARCH)-web.tar.gz"
         mkdir -p $(dirname $ARCHIVE_PATH)
@@ -232,8 +244,38 @@ steps:
         GITHUB_TOKEN: "$(github-distro-mixin-password)"
       displayName: Build server (web)
 
+    - ${{ if or(eq(parameters.VSCODE_ARCH, 'x64'), eq(parameters.VSCODE_ARCH, 'arm64')) }}:
+      - script: |
+          set -e
+
+          source ./build/azure-pipelines/linux/setup-env.sh
+
+          EXPECTED_GLIBC_VERSION="2.28" \
+          EXPECTED_GLIBCXX_VERSION="3.4.25" \
+          ./build/azure-pipelines/linux/verify-glibc-requirements.sh
+        env:
+          SEARCH_PATH: $(SERVER_UNARCHIVE_PATH)
+          npm_config_arch: $(NPM_ARCH)
+          VSCODE_ARCH: $(VSCODE_ARCH)
+        displayName: Check GLIBC and GLIBCXX dependencies in server archive
+
+    - ${{ else }}:
+      - script: |
+          set -e
+
+          source ./build/azure-pipelines/linux/setup-env.sh
+
+          EXPECTED_GLIBC_VERSION="2.28" \
+          EXPECTED_GLIBCXX_VERSION="3.4.26" \
+          ./build/azure-pipelines/linux/verify-glibc-requirements.sh
+        env:
+          SEARCH_PATH: $(SERVER_UNARCHIVE_PATH)
+          npm_config_arch: $(NPM_ARCH)
+          VSCODE_ARCH: $(VSCODE_ARCH)
+        displayName: Check GLIBC and GLIBCXX dependencies in server archive
+
   - ${{ else }}:
-    - script: yarn gulp "transpile-client-swc" "transpile-extensions"
+    - script: npm run gulp "transpile-client-swc" "transpile-extensions"
       env:
         GITHUB_TOKEN: "$(github-distro-mixin-password)"
       displayName: Transpile client and extensions
@@ -251,31 +293,43 @@ steps:
   - ${{ if and(ne(parameters.VSCODE_CIBUILD, true), ne(parameters.VSCODE_QUALITY, 'oss')) }}:
     - script:  |
         set -e
-        yarn gulp "vscode-linux-$(VSCODE_ARCH)-prepare-deb"
+        npm run gulp "vscode-linux-$(VSCODE_ARCH)-prepare-deb"
       env:
         GITHUB_TOKEN: "$(github-distro-mixin-password)"
       displayName: Prepare deb package
 
     - script:  |
         set -e
-        yarn gulp "vscode-linux-$(VSCODE_ARCH)-build-deb"
+        npm run gulp "vscode-linux-$(VSCODE_ARCH)-build-deb"
         echo "##vso[task.setvariable variable=DEB_PATH]$(ls .build/linux/deb/*/deb/*.deb)"
       displayName: Build deb package
 
     - script:  |
         set -e
-        yarn gulp "vscode-linux-$(VSCODE_ARCH)-prepare-rpm"
+        TRIPLE=""
+        if [ "$VSCODE_ARCH" == "x64" ]; then
+          TRIPLE="x86_64-linux-gnu"
+        elif [ "$VSCODE_ARCH" == "arm64" ]; then
+          TRIPLE="aarch64-linux-gnu"
+        elif [ "$VSCODE_ARCH" == "armhf" ]; then
+          TRIPLE="arm-rpi-linux-gnueabihf"
+        fi
+        export VSCODE_SYSROOT_DIR=$(Build.SourcesDirectory)/.build/sysroots
+        export STRIP="$VSCODE_SYSROOT_DIR/$TRIPLE/$TRIPLE/bin/strip"
+        npm run gulp "vscode-linux-$(VSCODE_ARCH)-prepare-rpm"
+      env:
+        VSCODE_ARCH: $(VSCODE_ARCH)
       displayName: Prepare rpm package
 
     - script:  |
         set -e
-        yarn gulp "vscode-linux-$(VSCODE_ARCH)-build-rpm"
+        npm run gulp "vscode-linux-$(VSCODE_ARCH)-build-rpm"
         echo "##vso[task.setvariable variable=RPM_PATH]$(ls .build/linux/rpm/*/*.rpm)"
       displayName: Build rpm package
 
     - script: |
         set -e
-        yarn gulp "vscode-linux-$(VSCODE_ARCH)-prepare-snap"
+        npm run gulp "vscode-linux-$(VSCODE_ARCH)-prepare-snap"
         ARCHIVE_PATH=".build/linux/snap-tarball/snap-$(VSCODE_ARCH).tar.gz"
         mkdir -p $(dirname $ARCHIVE_PATH)
         tar -czf $ARCHIVE_PATH -C .build/linux snap
diff --git a/build/azure-pipelines/linux/setup-env.sh b/build/azure-pipelines/linux/setup-env.sh
index 9bfbf9ab41a..1ce3ba742c1 100755
--- a/build/azure-pipelines/linux/setup-env.sh
+++ b/build/azure-pipelines/linux/setup-env.sh
@@ -8,12 +8,17 @@ if [ "$SYSROOT_ARCH" == "x64" ]; then
 fi
 
 export VSCODE_SYSROOT_DIR=$PWD/.build/sysroots
-SYSROOT_ARCH="$SYSROOT_ARCH" node -e '(async () => { const { getVSCodeSysroot } = require("./build/linux/debian/install-sysroot.js"); await getVSCodeSysroot(process.env["SYSROOT_ARCH"]); })()'
+if [ -d "$VSCODE_SYSROOT_DIR" ]; then
+  echo "Using cached sysroot"
+else
+  echo "Downloading sysroot"
+  SYSROOT_ARCH="$SYSROOT_ARCH" node -e '(async () => { const { getVSCodeSysroot } = require("./build/linux/debian/install-sysroot.js"); await getVSCodeSysroot(process.env["SYSROOT_ARCH"]); })()'
+fi
 
 if [ "$npm_config_arch" == "x64" ]; then
   if [ "$(echo "$@" | grep -c -- "--only-remote")" -eq 0 ]; then
     # Download clang based on chromium revision used by vscode
-    curl -s https://raw.githubusercontent.com/chromium/chromium/122.0.6261.156/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux
+    curl -s https://raw.githubusercontent.com/chromium/chromium/124.0.6367.243/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux
 
     # Download libcxx headers and objects from upstream electron releases
     DEBUG=libcxx-fetcher \
@@ -25,9 +30,9 @@ if [ "$npm_config_arch" == "x64" ]; then
 
     # Set compiler toolchain
     # Flags for the client build are based on
-    # https://source.chromium.org/chromium/chromium/src/+/refs/tags/122.0.6261.156:build/config/arm.gni
-    # https://source.chromium.org/chromium/chromium/src/+/refs/tags/122.0.6261.156:build/config/compiler/BUILD.gn
-    # https://source.chromium.org/chromium/chromium/src/+/refs/tags/122.0.6261.156:build/config/c++/BUILD.gn
+    # https://source.chromium.org/chromium/chromium/src/+/refs/tags/124.0.6367.243:build/config/arm.gni
+    # https://source.chromium.org/chromium/chromium/src/+/refs/tags/124.0.6367.243:build/config/compiler/BUILD.gn
+    # https://source.chromium.org/chromium/chromium/src/+/refs/tags/124.0.6367.243:build/config/c++/BUILD.gn
     export CC="$PWD/.build/CR_Clang/bin/clang --gcc-toolchain=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu"
     export CXX="$PWD/.build/CR_Clang/bin/clang++ --gcc-toolchain=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu"
     export CXXFLAGS="-nostdinc++ -D__NO_INLINE__ -I$PWD/.build/libcxx_headers -isystem$PWD/.build/libcxx_headers/include -isystem$PWD/.build/libcxxabi_headers/include -fPIC -flto=thin -fsplit-lto-unit -D_LIBCPP_ABI_NAMESPACE=Cr -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE --sysroot=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot"
@@ -54,17 +59,15 @@ elif [ "$npm_config_arch" == "arm64" ]; then
     export VSCODE_REMOTE_LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot -L$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot/usr/lib/aarch64-linux-gnu -L$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot/lib/aarch64-linux-gnu"
   fi
 elif [ "$npm_config_arch" == "arm" ]; then
-  if [ "$(echo "$@" | grep -c -- "--only-remote")" -eq 0 ]; then
-    # Set compiler toolchain for client native modules
-    export CC=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-gcc
-    export CXX=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-g++
-    export CXXFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot"
-    export LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot -L$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot/usr/lib/arm-linux-gnueabihf -L$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot/lib/arm-linux-gnueabihf"
+  # Set compiler toolchain for client native modules
+  export CC=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-gcc
+  export CXX=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-g++
+  export CXXFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot"
+  export LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot -L$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot/usr/lib/arm-linux-gnueabihf -L$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot/lib/arm-linux-gnueabihf"
 
-    # Set compiler toolchain for remote server
-    export VSCODE_REMOTE_CC=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-gcc
-    export VSCODE_REMOTE_CXX=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-g++
-    export VSCODE_REMOTE_CXXFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot"
-    export VSCODE_REMOTE_LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot -L$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot/usr/lib/arm-linux-gnueabihf -L$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot/lib/arm-linux-gnueabihf"
-  fi
+  # Set compiler toolchain for remote server
+  export VSCODE_REMOTE_CC=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-gcc
+  export VSCODE_REMOTE_CXX=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-g++
+  export VSCODE_REMOTE_CXXFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot"
+  export VSCODE_REMOTE_LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot -L$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot/usr/lib/arm-linux-gnueabihf -L$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot/lib/arm-linux-gnueabihf"
 fi
diff --git a/build/azure-pipelines/linux/snap-build-linux.yml b/build/azure-pipelines/linux/snap-build-linux.yml
index 033058163f9..3582be07cca 100644
--- a/build/azure-pipelines/linux/snap-build-linux.yml
+++ b/build/azure-pipelines/linux/snap-build-linux.yml
@@ -5,11 +5,11 @@ steps:
       versionFilePath: .nvmrc
       nodejsMirror: https://github.com/joaomoreno/node-mirror/releases/download
 
-  - task: DownloadPipelineArtifact@0
+  - task: DownloadPipelineArtifact@2
     displayName: "Download Pipeline Artifact"
     inputs:
-      artifactName: snap-$(VSCODE_ARCH)
-      targetPath: .build/linux/snap-tarball
+      artifact: snap-$(VSCODE_ARCH)
+      path: .build/linux/snap-tarball
 
   - script: |
       set -e
@@ -22,17 +22,11 @@ steps:
       sudo apt-get upgrade -y
       sudo apt-get install -y curl apt-transport-https ca-certificates
 
-      # Yarn
-      curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
-      echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
-      sudo apt-get update
-      sudo apt-get install -y yarn
-
       # Define variables
       SNAP_ROOT="$(pwd)/.build/linux/snap/$(VSCODE_ARCH)"
 
       # Install build dependencies
-      (cd build && yarn)
+      (cd build && npm ci)
 
       # Unpack snap tarball artifact, in order to preserve file perms
       (cd .build/linux && tar -xzf snap-tarball/snap-$(VSCODE_ARCH).tar.gz)
diff --git a/build/azure-pipelines/linux/verify-glibc-requirements.sh b/build/azure-pipelines/linux/verify-glibc-requirements.sh
index f07c0ba71b0..c655ce74c7e 100755
--- a/build/azure-pipelines/linux/verify-glibc-requirements.sh
+++ b/build/azure-pipelines/linux/verify-glibc-requirements.sh
@@ -9,8 +9,8 @@ elif [ "$VSCODE_ARCH" == "armhf" ]; then
   TRIPLE="arm-rpi-linux-gnueabihf"
 fi
 
-# Get all files with .node extension from remote/node_modules folder
-files=$(find remote/node_modules -name "*.node" -not -path "*prebuilds*")
+# Get all files with .node extension from server folder
+files=$(find $SEARCH_PATH -name "*.node" -not -path "*prebuilds*" -not -path "*extensions/node_modules/@parcel/watcher*" -o -type f -executable -name "node")
 
 echo "Verifying requirements for files: $files"
 
@@ -19,13 +19,13 @@ for file in $files; do
   glibcxx_version="$EXPECTED_GLIBCXX_VERSION"
   while IFS= read -r line; do
     if [[ $line == *"GLIBC_"* ]]; then
-      version=$(echo "$line" | awk '{print $5}' | tr -d '()')
+      version=$(echo "$line" | awk '{if ($5 ~ /^[0-9a-fA-F]+$/) print $6; else print $5}' | tr -d '()')
       version=${version#*_}
       if [[ $(printf "%s\n%s" "$version" "$glibc_version" | sort -V | tail -n1) == "$version" ]]; then
         glibc_version=$version
       fi
     elif [[ $line == *"GLIBCXX_"* ]]; then
-      version=$(echo "$line" | awk '{print $5}' | tr -d '()')
+      version=$(echo "$line" | awk '{if ($5 ~ /^[0-9a-fA-F]+$/) print $6; else print $5}' | tr -d '()')
       version=${version#*_}
       if [[ $(printf "%s\n%s" "$version" "$glibcxx_version" | sort -V | tail -n1) == "$version" ]]; then
         glibcxx_version=$version
@@ -34,11 +34,11 @@ for file in $files; do
   done < <("$PWD/.build/sysroots/$TRIPLE/$TRIPLE/bin/objdump" -T "$file")
 
   if [[ "$glibc_version" != "$EXPECTED_GLIBC_VERSION" ]]; then
-    echo "Error: File $file has dependency on GLIBC > $EXPECTED_GLIBC_VERSION"
+    echo "Error: File $file has dependency on GLIBC > $EXPECTED_GLIBC_VERSION, found $glibc_version"
     exit 1
   fi
   if [[ "$glibcxx_version" != "$EXPECTED_GLIBCXX_VERSION" ]]; then
-    echo "Error: File $file has dependency on GLIBCXX > $EXPECTED_GLIBCXX_VERSION"
+    echo "Error: File $file has dependency on GLIBCXX > $EXPECTED_GLIBCXX_VERSION, found $glibcxx_version"
     exit 1
   fi
 done
diff --git a/build/azure-pipelines/oss/product-build-pr-cache-linux.yml b/build/azure-pipelines/oss/product-build-pr-cache-linux.yml
index 9f207f75220..3186c09b455 100644
--- a/build/azure-pipelines/oss/product-build-pr-cache-linux.yml
+++ b/build/azure-pipelines/oss/product-build-pr-cache-linux.yml
@@ -13,12 +13,12 @@ steps:
     condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Registry
 
-  - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.js linux $VSCODE_ARCH > .build/yarnlockhash
+  - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.js linux $VSCODE_ARCH > .build/packagelockhash
     displayName: Prepare node_modules cache key
 
   - task: Cache@2
     inputs:
-      key: '"node_modules" | .build/yarnlockhash'
+      key: '"node_modules" | .build/packagelockhash'
       path: .build/node_modules_cache
       cacheHitVar: NODE_MODULES_RESTORED
     displayName: Restore node_modules cache
@@ -29,34 +29,36 @@ steps:
 
   - script: |
       set -e
-      npm config set registry "$NPM_REGISTRY" --location=project
-      # npm >v7 deprecated the `always-auth` config option, refs npm/cli@72a7eeb
-      # following is a workaround for yarn to send authorization header
-      # for GET requests to the registry.
-      echo "always-auth=true" >> .npmrc
-      yarn config set registry "$NPM_REGISTRY"
+      # Set the private NPM registry to the global npmrc file
+      # so that authentication works for subfolders like build/, remote/, extensions/ etc
+      # which does not have their own .npmrc file
+      npm config set registry "$NPM_REGISTRY"
+      echo "##vso[task.setvariable variable=NPMRC_PATH]$(npm config get userconfig)"
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
-    displayName: Setup NPM & Yarn
+    displayName: Setup NPM
 
   - task: npmAuthenticate@0
     inputs:
-      workingFile: .npmrc
+      workingFile: $(NPMRC_PATH)
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Authentication
 
-  - script: sudo apt-get update && sudo apt-get install -y libkrb5-dev
-    displayName: Install build dependencies
+  - script: |
+      set -e
+      ../linux/apt-retry.sh sudo apt-get update
+      ../linux/apt-retry.sh sudo apt-get install -y libkrb5-dev
+    displayName: Setup system services
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
   - script: |
       set -e
       for i in {1..5}; do # try 5 times
-        yarn --frozen-lockfile --check-files && break
-        if [ $i -eq 3 ]; then
-          echo "Yarn failed too many times" >&2
+        npm ci && break
+        if [ $i -eq 5 ]; then
+          echo "Npm install failed too many times" >&2
           exit 1
         fi
-        echo "Yarn failed $i, trying again..."
+        echo "Npm install failed $i, trying again..."
       done
     env:
       ELECTRON_SKIP_BINARY_DOWNLOAD: 1
diff --git a/build/azure-pipelines/oss/product-build-pr-cache-win32.yml b/build/azure-pipelines/oss/product-build-pr-cache-win32.yml
index b084c5e97c5..e1c8305bbb2 100644
--- a/build/azure-pipelines/oss/product-build-pr-cache-win32.yml
+++ b/build/azure-pipelines/oss/product-build-pr-cache-win32.yml
@@ -15,12 +15,12 @@ steps:
 
   - pwsh: |
       mkdir .build -ea 0
-      node build/azure-pipelines/common/computeNodeModulesCacheKey.js win32 $(VSCODE_ARCH) > .build/yarnlockhash
+      node build/azure-pipelines/common/computeNodeModulesCacheKey.js win32 $(VSCODE_ARCH) > .build/packagelockhash
     displayName: Prepare node_modules cache key
 
   - task: Cache@2
     inputs:
-      key: '"node_modules" | .build/yarnlockhash'
+      key: '"node_modules" | .build/packagelockhash'
       path: .build/node_modules_cache
       cacheHitVar: NODE_MODULES_RESTORED
     displayName: Restore node_modules cache
@@ -32,18 +32,18 @@ steps:
   - powershell: |
       . build/azure-pipelines/win32/exec.ps1
       $ErrorActionPreference = "Stop"
-      exec { npm config set registry "$env:NPM_REGISTRY" --location=project }
-      # npm >v7 deprecated the `always-auth` config option, refs npm/cli@72a7eeb
-      # following is a workaround for yarn to send authorization header
-      # for GET requests to the registry.
-      exec { Add-Content -Path .npmrc -Value "always-auth=true" }
-      exec { yarn config set registry "$env:NPM_REGISTRY" }
+      # Set the private NPM registry to the global npmrc file
+      # so that authentication works for subfolders like build/, remote/, extensions/ etc
+      # which does not have their own .npmrc file
+      exec { npm config set registry "$env:NPM_REGISTRY" }
+      $NpmrcPath = (npm config get userconfig)
+      echo "##vso[task.setvariable variable=NPMRC_PATH]$NpmrcPath"
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
-    displayName: Setup NPM & Yarn
+    displayName: Setup NPM
 
   - task: npmAuthenticate@0
     inputs:
-      workingFile: .npmrc
+      workingFile: $(NPMRC_PATH)
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Authentication
 
@@ -53,7 +53,7 @@ steps:
       $ErrorActionPreference = "Stop"
       $env:npm_config_arch="$(VSCODE_ARCH)"
       $env:CHILD_CONCURRENCY="1"
-      retry { exec { yarn --frozen-lockfile --check-files } }
+      retry { exec { npm ci } }
     env:
       ELECTRON_SKIP_BINARY_DOWNLOAD: 1
       PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
diff --git a/build/azure-pipelines/product-build-pr.yml b/build/azure-pipelines/product-build-pr.yml
index 7dce4d20265..2d66ff3945d 100644
--- a/build/azure-pipelines/product-build-pr.yml
+++ b/build/azure-pipelines/product-build-pr.yml
@@ -26,7 +26,7 @@ jobs:
   - ${{ if ne(variables['VSCODE_CIBUILD'], true) }}:
     - job: Compile
       displayName: Compile & Hygiene
-      pool: 1es-oss-ubuntu-20.04-x64
+      pool: 1es-oss-ubuntu-22.04-x64
       timeoutInMinutes: 30
       variables:
         VSCODE_ARCH: x64
@@ -37,7 +37,7 @@ jobs:
 
     - job: Linuxx64UnitTest
       displayName: Linux (Unit Tests)
-      pool: 1es-oss-ubuntu-20.04-x64
+      pool: 1es-oss-ubuntu-22.04-x64
       timeoutInMinutes: 30
       variables:
         VSCODE_ARCH: x64
@@ -55,7 +55,7 @@ jobs:
 
     - job: Linuxx64IntegrationTest
       displayName: Linux (Integration Tests)
-      pool: 1es-oss-ubuntu-20.04-x64
+      pool: 1es-oss-ubuntu-22.04-x64
       timeoutInMinutes: 30
       variables:
         VSCODE_ARCH: x64
@@ -73,7 +73,7 @@ jobs:
 
     - job: Linuxx64SmokeTest
       displayName: Linux (Smoke Tests)
-      pool: 1es-oss-ubuntu-20.04-x64
+      pool: 1es-oss-ubuntu-22.04-x64
       timeoutInMinutes: 30
       variables:
         VSCODE_ARCH: x64
@@ -91,14 +91,14 @@ jobs:
 
     - job: LinuxCLI
       displayName: Linux (CLI)
-      pool: 1es-oss-ubuntu-20.04-x64
+      pool: 1es-oss-ubuntu-22.04-x64
       timeoutInMinutes: 30
       steps:
         - template: cli/test.yml@self
 
     - job: Windowsx64UnitTests
       displayName: Windows (Unit Tests)
-      pool: 1es-oss-windows-2019-x64
+      pool: 1es-oss-windows-2022-x64
       timeoutInMinutes: 30
       variables:
         VSCODE_ARCH: x64
@@ -115,8 +115,8 @@ jobs:
 
     - job: Windowsx64IntegrationTests
       displayName: Windows (Integration Tests)
-      pool: 1es-oss-windows-2019-x64
-      timeoutInMinutes: 30
+      pool: 1es-oss-windows-2022-x64
+      timeoutInMinutes: 60
       variables:
         VSCODE_ARCH: x64
         NPM_ARCH: x64
@@ -132,7 +132,7 @@ jobs:
 
     # - job: Windowsx64SmokeTests
     #   displayName: Windows (Smoke Tests)
-    #   pool: 1es-oss-windows-2019-x64
+    #   pool: 1es-oss-windows-2022-x64
     #   timeoutInMinutes: 30
     #   variables:
     #     VSCODE_ARCH: x64
@@ -149,7 +149,7 @@ jobs:
   - ${{ if eq(variables['VSCODE_CIBUILD'], true) }}:
     - job: Linuxx64MaintainNodeModulesCache
       displayName: Linux (Maintain node_modules cache)
-      pool: 1es-oss-ubuntu-20.04-x64
+      pool: 1es-oss-ubuntu-22.04-x64
       timeoutInMinutes: 30
       variables:
         VSCODE_ARCH: x64
@@ -158,7 +158,7 @@ jobs:
 
     - job: Windowsx64MaintainNodeModulesCache
       displayName: Windows (Maintain node_modules cache)
-      pool: 1es-oss-windows-2019-x64
+      pool: 1es-oss-windows-2022-x64
       timeoutInMinutes: 30
       variables:
         VSCODE_ARCH: x64
diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
index 0508059fcd7..a061c23e8dc 100644
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -148,6 +148,8 @@ variables:
     value: microsoft/vscode-distro
   - name: skipComponentGovernanceDetection
     value: true
+  - name: ComponentDetection.Timeout
+    value: 600
   - name: Codeql.SkipTaskAutoInjection
     value: true
   - name: ARTIFACT_PREFIX
@@ -182,9 +184,10 @@ extends:
           validateToolOutput: None
           allTools: true
       codeql:
-        compiled:
-          enabled: true
         runSourceLanguagesInSourceAnalysis: true
+        compiled:
+          enabled: false
+          justificationForDisabling: "CodeQL breaks ESRP CodeSign on macOS (ICM #520035761, githubcustomers/microsoft-codeql-support#198)"
       credscan:
         suppressionsFile: $(Build.SourcesDirectory)/build/azure-pipelines/config/CredScanSuppressions.json
       eslint:
@@ -192,6 +195,7 @@ extends:
         enableExclusions: true
         exclusionsFilePath: $(Build.SourcesDirectory)/.eslintignore
       sourceAnalysisPool: 1es-windows-2022-x64
+      createAdoIssuesForJustificationsForDisablement: false
     containers:
       snapcraft:
         image: vscodehub.azurecr.io/vscode-linux-build-agent:snapcraft-x64
@@ -207,7 +211,7 @@ extends:
           - job: Compile
             timeoutInMinutes: 90
             pool:
-              name: 1es-ubuntu-20.04-x64
+              name: 1es-ubuntu-22.04-x64
               os: linux
             variables:
               VSCODE_ARCH: x64
@@ -216,110 +220,128 @@ extends:
                 parameters:
                   VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
 
-      - stage: CompileCLI
-        dependsOn: []
-        jobs:
-          - ${{ if eq(parameters.VSCODE_BUILD_LINUX, true) }}:
-            - job: CLILinuxX64
-              pool:
-                name: 1es-ubuntu-20.04-x64
-                os: linux
-              steps:
-                - template: build/azure-pipelines/linux/cli-build-linux.yml@self
-                  parameters:
-                    VSCODE_CHECK_ONLY: ${{ variables.VSCODE_CIBUILD }}
-                    VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                    VSCODE_BUILD_LINUX: ${{ parameters.VSCODE_BUILD_LINUX }}
+      - ${{ if or(eq(parameters.VSCODE_BUILD_LINUX, true),eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true),eq(parameters.VSCODE_BUILD_LINUX_ARM64, true),eq(parameters.VSCODE_BUILD_ALPINE, true),eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true),eq(parameters.VSCODE_BUILD_MACOS, true),eq(parameters.VSCODE_BUILD_MACOS_ARM64, true),eq(parameters.VSCODE_BUILD_WIN32, true),eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}:
+        - stage: CompileCLI
+          dependsOn: []
+          jobs:
+            - ${{ if eq(parameters.VSCODE_BUILD_LINUX, true) }}:
+              - job: CLILinuxX64
+                pool:
+                  name: 1es-ubuntu-22.04-x64
+                  os: linux
+                steps:
+                  - template: build/azure-pipelines/linux/cli-build-linux.yml@self
+                    parameters:
+                      VSCODE_CHECK_ONLY: ${{ variables.VSCODE_CIBUILD }}
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_BUILD_LINUX: ${{ parameters.VSCODE_BUILD_LINUX }}
 
-          - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), or(eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true), eq(parameters.VSCODE_BUILD_LINUX_ARM64, true))) }}:
-            - job: CLILinuxGnuARM
-              pool:
-                name: 1es-ubuntu-20.04-x64
-                os: linux
-              steps:
-                - template: build/azure-pipelines/linux/cli-build-linux.yml@self
-                  parameters:
-                    VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                    VSCODE_BUILD_LINUX_ARMHF: ${{ parameters.VSCODE_BUILD_LINUX_ARMHF }}
-                    VSCODE_BUILD_LINUX_ARM64: ${{ parameters.VSCODE_BUILD_LINUX_ARM64 }}
+            - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), or(eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true), eq(parameters.VSCODE_BUILD_LINUX_ARM64, true))) }}:
+              - job: CLILinuxGnuARM
+                pool:
+                  name: 1es-ubuntu-22.04-x64
+                  os: linux
+                steps:
+                  - template: build/azure-pipelines/linux/cli-build-linux.yml@self
+                    parameters:
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_BUILD_LINUX_ARMHF: ${{ parameters.VSCODE_BUILD_LINUX_ARMHF }}
+                      VSCODE_BUILD_LINUX_ARM64: ${{ parameters.VSCODE_BUILD_LINUX_ARM64 }}
 
-          - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_ALPINE, true)) }}:
-            - job: CLIAlpineX64
-              pool:
-                name: 1es-ubuntu-20.04-x64
-                os: linux
-              steps:
-                - template: build/azure-pipelines/alpine/cli-build-alpine.yml@self
-                  parameters:
-                    VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                    VSCODE_BUILD_ALPINE: ${{ parameters.VSCODE_BUILD_ALPINE }}
+            - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_ALPINE, true)) }}:
+              - job: CLIAlpineX64
+                pool:
+                  name: 1es-ubuntu-22.04-x64
+                  os: linux
+                steps:
+                  - template: build/azure-pipelines/alpine/cli-build-alpine.yml@self
+                    parameters:
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_BUILD_ALPINE: ${{ parameters.VSCODE_BUILD_ALPINE }}
 
-          - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true)) }}:
-            - job: CLIAlpineARM64
-              pool:
-                name: 1es-mariner-2.0-arm64
-                os: linux
-                hostArchitecture: arm64
-              container: ubuntu-2004-arm64
-              steps:
-                - template: build/azure-pipelines/alpine/cli-build-alpine.yml@self
-                  parameters:
-                    VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                    VSCODE_BUILD_ALPINE_ARM64: ${{ parameters.VSCODE_BUILD_ALPINE_ARM64 }}
+            - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true)) }}:
+              - job: CLIAlpineARM64
+                pool:
+                  name: 1es-mariner-2.0-arm64
+                  os: linux
+                  hostArchitecture: arm64
+                container: ubuntu-2004-arm64
+                steps:
+                  - template: build/azure-pipelines/alpine/cli-build-alpine.yml@self
+                    parameters:
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_BUILD_ALPINE_ARM64: ${{ parameters.VSCODE_BUILD_ALPINE_ARM64 }}
 
-          - ${{ if eq(parameters.VSCODE_BUILD_MACOS, true) }}:
-            - job: CLIMacOSX64
-              pool:
-                name: Azure Pipelines
-                image: macOS-11
-                os: macOS
-              steps:
-                - template: build/azure-pipelines/darwin/cli-build-darwin.yml@self
-                  parameters:
-                    VSCODE_CHECK_ONLY: ${{ variables.VSCODE_CIBUILD }}
-                    VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                    VSCODE_BUILD_MACOS: ${{ parameters.VSCODE_BUILD_MACOS }}
+            - ${{ if eq(parameters.VSCODE_BUILD_MACOS, true) }}:
+              - job: CLIMacOSX64
+                pool:
+                  name: Azure Pipelines
+                  image: macOS-13
+                  os: macOS
+                steps:
+                  - template: build/azure-pipelines/darwin/cli-build-darwin.yml@self
+                    parameters:
+                      VSCODE_CHECK_ONLY: ${{ variables.VSCODE_CIBUILD }}
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_BUILD_MACOS: ${{ parameters.VSCODE_BUILD_MACOS }}
 
-          - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_MACOS_ARM64, true)) }}:
-            - job: CLIMacOSARM64
-              pool:
-                name: Azure Pipelines
-                image: macOS-11
-                os: macOS
-              steps:
-                - template: build/azure-pipelines/darwin/cli-build-darwin.yml@self
-                  parameters:
-                    VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                    VSCODE_BUILD_MACOS_ARM64: ${{ parameters.VSCODE_BUILD_MACOS_ARM64 }}
+            - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_MACOS_ARM64, true)) }}:
+              - job: CLIMacOSARM64
+                pool:
+                  name: Azure Pipelines
+                  image: macOS-13
+                  os: macOS
+                steps:
+                  - template: build/azure-pipelines/darwin/cli-build-darwin.yml@self
+                    parameters:
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_BUILD_MACOS_ARM64: ${{ parameters.VSCODE_BUILD_MACOS_ARM64 }}
 
-          - ${{ if eq(parameters.VSCODE_BUILD_WIN32, true) }}:
-            - job: CLIWindowsX64
-              pool:
-                name: 1es-windows-2019-x64
-                os: windows
-              steps:
-                - template: build/azure-pipelines/win32/cli-build-win32.yml@self
-                  parameters:
-                    VSCODE_CHECK_ONLY: ${{ variables.VSCODE_CIBUILD }}
-                    VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                    VSCODE_BUILD_WIN32: ${{ parameters.VSCODE_BUILD_WIN32 }}
+            - ${{ if eq(parameters.VSCODE_BUILD_WIN32, true) }}:
+              - job: CLIWindowsX64
+                pool:
+                  name: 1es-windows-2019-x64
+                  os: windows
+                steps:
+                  - template: build/azure-pipelines/win32/cli-build-win32.yml@self
+                    parameters:
+                      VSCODE_CHECK_ONLY: ${{ variables.VSCODE_CIBUILD }}
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_BUILD_WIN32: ${{ parameters.VSCODE_BUILD_WIN32 }}
 
-          - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}:
-            - job: CLIWindowsARM64
-              pool:
-                name: 1es-windows-2019-x64
-                os: windows
+            - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}:
+              - job: CLIWindowsARM64
+                pool:
+                  name: 1es-windows-2019-x64
+                  os: windows
+                steps:
+                  - template: build/azure-pipelines/win32/cli-build-win32.yml@self
+                    parameters:
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_BUILD_WIN32_ARM64: ${{ parameters.VSCODE_BUILD_WIN32_ARM64 }}
+
+      - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_COMPILE_ONLY, false)) }}:
+        - stage: CustomSDL
+          dependsOn: []
+          pool:
+            name: 1es-windows-2019-x64
+            os: windows
+          jobs:
+            - job: WindowsSDL
+              variables:
+                - group: 'API Scan'
               steps:
-                - template: build/azure-pipelines/win32/cli-build-win32.yml@self
+                - template: build/azure-pipelines/win32/sdl-scan-win32.yml@self
                   parameters:
+                    VSCODE_ARCH: x64
                     VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                    VSCODE_BUILD_WIN32_ARM64: ${{ parameters.VSCODE_BUILD_WIN32_ARM64 }}
 
       - ${{ if and(eq(parameters.VSCODE_COMPILE_ONLY, false), eq(variables['VSCODE_BUILD_STAGE_WINDOWS'], true)) }}:
         - stage: Windows
           dependsOn:
             - Compile
-            - CompileCLI
+            - ${{ if or(eq(parameters.VSCODE_BUILD_LINUX, true),eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true),eq(parameters.VSCODE_BUILD_LINUX_ARM64, true),eq(parameters.VSCODE_BUILD_ALPINE, true),eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true),eq(parameters.VSCODE_BUILD_MACOS, true),eq(parameters.VSCODE_BUILD_MACOS_ARM64, true),eq(parameters.VSCODE_BUILD_WIN32, true),eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}:
+              - CompileCLI
           pool:
             name: 1es-windows-2019-x64
             os: windows
@@ -410,9 +432,10 @@ extends:
         - stage: Linux
           dependsOn:
             - Compile
-            - CompileCLI
+            - ${{ if or(eq(parameters.VSCODE_BUILD_LINUX, true),eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true),eq(parameters.VSCODE_BUILD_LINUX_ARM64, true),eq(parameters.VSCODE_BUILD_ALPINE, true),eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true),eq(parameters.VSCODE_BUILD_MACOS, true),eq(parameters.VSCODE_BUILD_MACOS_ARM64, true),eq(parameters.VSCODE_BUILD_WIN32, true),eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}:
+              - CompileCLI
           pool:
-            name: 1es-ubuntu-20.04-x64
+            name: 1es-ubuntu-22.04-x64
             os: linux
           jobs:
             - ${{ if eq(variables['VSCODE_CIBUILD'], true) }}:
@@ -568,9 +591,10 @@ extends:
         - stage: Alpine
           dependsOn:
             - Compile
-            - CompileCLI
+            - ${{ if or(eq(parameters.VSCODE_BUILD_LINUX, true),eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true),eq(parameters.VSCODE_BUILD_LINUX_ARM64, true),eq(parameters.VSCODE_BUILD_ALPINE, true),eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true),eq(parameters.VSCODE_BUILD_MACOS, true),eq(parameters.VSCODE_BUILD_MACOS_ARM64, true),eq(parameters.VSCODE_BUILD_WIN32, true),eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}:
+              - CompileCLI
           pool:
-            name: 1es-ubuntu-20.04-x64
+            name: 1es-ubuntu-22.04-x64
             os: linux
           jobs:
             - ${{ if eq(parameters.VSCODE_BUILD_ALPINE, true) }}:
@@ -594,10 +618,11 @@ extends:
         - stage: macOS
           dependsOn:
             - Compile
-            - CompileCLI
+            - ${{ if or(eq(parameters.VSCODE_BUILD_LINUX, true),eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true),eq(parameters.VSCODE_BUILD_LINUX_ARM64, true),eq(parameters.VSCODE_BUILD_ALPINE, true),eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true),eq(parameters.VSCODE_BUILD_MACOS, true),eq(parameters.VSCODE_BUILD_MACOS_ARM64, true),eq(parameters.VSCODE_BUILD_WIN32, true),eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}:
+              - CompileCLI
           pool:
             name: Azure Pipelines
-            image: macOS-11
+            image: macOS-13
             os: macOS
           variables:
             BUILDSECMON_OPT_IN: true
@@ -736,7 +761,7 @@ extends:
           dependsOn:
             - Compile
           pool:
-            name: 1es-ubuntu-20.04-x64
+            name: 1es-ubuntu-22.04-x64
             os: linux
           jobs:
             - ${{ if eq(parameters.VSCODE_BUILD_WEB, true) }}:
@@ -766,7 +791,7 @@ extends:
           - stage: ApproveRelease
             dependsOn: [] # run in parallel to compile stage
             pool:
-              name: 1es-ubuntu-20.04-x64
+              name: 1es-ubuntu-22.04-x64
               os: linux
             jobs:
               - deployment: ApproveRelease
@@ -787,7 +812,7 @@ extends:
               - ${{ if and(parameters.VSCODE_RELEASE, eq(variables['VSCODE_PRIVATE_BUILD'], false)) }}:
                 - ApproveRelease
             pool:
-              name: 1es-ubuntu-20.04-x64
+              name: 1es-ubuntu-22.04-x64
               os: linux
             jobs:
               - job: ReleaseBuild
diff --git a/build/azure-pipelines/product-compile.yml b/build/azure-pipelines/product-compile.yml
index 9a3748ed6fc..facc7af4bc2 100644
--- a/build/azure-pipelines/product-compile.yml
+++ b/build/azure-pipelines/product-compile.yml
@@ -12,7 +12,7 @@ steps:
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
     - template: ./distro/download-distro.yml@self
 
-    - task: AzureKeyVault@1
+    - task: AzureKeyVault@2
       displayName: "Azure Key Vault: Get Secrets"
       inputs:
         azureSubscription: "vscode-builds-subscription"
@@ -23,12 +23,12 @@ steps:
     condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Registry
 
-  - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.js compile > .build/yarnlockhash
+  - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.js compile > .build/packagelockhash
     displayName: Prepare node_modules cache key
 
   - task: Cache@2
     inputs:
-      key: '"node_modules" | .build/yarnlockhash'
+      key: '"node_modules" | .build/packagelockhash'
       path: .build/node_modules_cache
       cacheHitVar: NODE_MODULES_RESTORED
     displayName: Restore node_modules cache
@@ -39,18 +39,17 @@ steps:
 
   - script: |
       set -e
-      npm config set registry "$NPM_REGISTRY" --location=project
-      # npm >v7 deprecated the `always-auth` config option, refs npm/cli@72a7eeb
-      # following is a workaround for yarn to send authorization header
-      # for GET requests to the registry.
-      echo "always-auth=true" >> .npmrc
-      yarn config set registry "$NPM_REGISTRY"
+      # Set the private NPM registry to the global npmrc file
+      # so that authentication works for subfolders like build/, remote/, extensions/ etc
+      # which does not have their own .npmrc file
+      npm config set registry "$NPM_REGISTRY"
+      echo "##vso[task.setvariable variable=NPMRC_PATH]$(npm config get userconfig)"
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
-    displayName: Setup NPM & Yarn
+    displayName: Setup NPM
 
   - task: npmAuthenticate@0
     inputs:
-      workingFile: .npmrc
+      workingFile: $(NPMRC_PATH)
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Authentication
 
@@ -60,15 +59,14 @@ steps:
 
   - script: |
       set -e
-      npm i -g node-gyp@9.4.0
 
       for i in {1..5}; do # try 5 times
-        yarn --frozen-lockfile --check-files && break
-        if [ $i -eq 3 ]; then
-          echo "Yarn failed too many times" >&2
+        npm ci && break
+        if [ $i -eq 5 ]; then
+          echo "Npm install failed too many times" >&2
           exit 1
         fi
-        echo "Yarn failed $i, trying again..."
+        echo "Npm install failed $i, trying again..."
       done
     env:
       ELECTRON_SKIP_BINARY_DOWNLOAD: 1
@@ -91,7 +89,11 @@ steps:
     displayName: Create node_modules archive
 
   - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: yarn --cwd build compile && ./.github/workflows/check-clean-git-state.sh
+    - script: npm run compile
+      workingDirectory: build
+      displayName: Compile /build/ folder
+
+    - script: .github/workflows/check-clean-git-state.sh
       displayName: Check /build/ folder
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
@@ -101,24 +103,29 @@ steps:
   - template: common/install-builtin-extensions.yml@self
 
   - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: yarn npm-run-all -lp core-ci-pr extensions-ci-pr hygiene eslint valid-layers-check vscode-dts-compile-check tsec-compile-check
+    - script: npm exec -- npm-run-all -lp core-ci-pr extensions-ci-pr hygiene eslint valid-layers-check vscode-dts-compile-check tsec-compile-check
       env:
         GITHUB_TOKEN: "$(github-distro-mixin-password)"
-        DISABLE_V8_COMPILE_CACHE: 1 # Disable v8 cache used by yarn v1.x, refs https://github.com/nodejs/node/issues/51555
       displayName: Compile & Hygiene (OSS)
   - ${{ else }}:
-    - script: yarn npm-run-all -lp core-ci extensions-ci hygiene eslint valid-layers-check vscode-dts-compile-check tsec-compile-check
+    - script: npm exec -- npm-run-all -lp core-ci extensions-ci hygiene eslint valid-layers-check vscode-dts-compile-check tsec-compile-check
       env:
         GITHUB_TOKEN: "$(github-distro-mixin-password)"
-        DISABLE_V8_COMPILE_CACHE: 1 # Disable v8 cache used by yarn v1.x, refs https://github.com/nodejs/node/issues/51555
       displayName: Compile & Hygiene (non-OSS)
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
     - script: |
         set -e
-        yarn --cwd test/smoke compile
-        yarn --cwd test/integration/browser compile
-      displayName: Compile test suites (non-OSS)
+        npm run compile
+      displayName: Compile smoke test suites (non-OSS)
+      workingDirectory: test/smoke
+      condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+
+    - script: |
+        set -e
+        npm run compile
+      displayName: Compile integration test suites (non-OSS)
+      workingDirectory: test/integration/browser
       condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
     - task: AzureCLI@2
@@ -164,7 +171,7 @@ steps:
         sbomEnabled: false
       displayName: Publish compilation artifact
 
-    - script: yarn download-builtin-extensions-cg
+    - script: npm run download-builtin-extensions-cg
       env:
         GITHUB_TOKEN: "$(github-distro-mixin-password)"
       displayName: Download component details of built-in extensions
diff --git a/build/azure-pipelines/product-publish.yml b/build/azure-pipelines/product-publish.yml
index 2c57e131c1a..59012a938ac 100644
--- a/build/azure-pipelines/product-publish.yml
+++ b/build/azure-pipelines/product-publish.yml
@@ -8,14 +8,14 @@ steps:
   - task: SFP.build-tasks.esrpclient-tools-task.EsrpClientTool@2
     displayName: "Use EsrpClient"
 
-  - task: AzureKeyVault@1
+  - task: AzureKeyVault@2
     displayName: "Azure Key Vault: Get Secrets"
     inputs:
       azureSubscription: "vscode-builds-subscription"
       KeyVaultName: vscode-build-secrets
       SecretsFilter: "github-distro-mixin-password,esrp-aad-username,esrp-aad-password"
 
-  - task: AzureKeyVault@1
+  - task: AzureKeyVault@2
     displayName: "Azure Key Vault: Get Secrets"
     inputs:
       azureSubscription: "vscode-builds-subscription"
@@ -26,10 +26,8 @@ steps:
   - pwsh: Write-Host "##vso[build.addbuildtag]🚀"
     displayName: Add build tag
 
-  - pwsh: node build/npm/setupBuildYarnrc
-    displayName: Prepare build dependencies
-
-  - pwsh: yarn
+  - pwsh: |
+      npm ci
     workingDirectory: build
     displayName: Install build dependencies
 
diff --git a/build/azure-pipelines/product-release.yml b/build/azure-pipelines/product-release.yml
index dc084f5a04c..8afdcf10053 100644
--- a/build/azure-pipelines/product-release.yml
+++ b/build/azure-pipelines/product-release.yml
@@ -23,7 +23,12 @@ steps:
 
   - script: |
       set -e
-      (cd build ; yarn)
+      npm ci
+    workingDirectory: build
+    displayName: Install /build dependencies
+
+  - script: |
+      set -e
       AZURE_TENANT_ID="$(AZURE_TENANT_ID)" \
       AZURE_CLIENT_ID="$(AZURE_CLIENT_ID)" \
       AZURE_CLIENT_SECRET="$(AZURE_CLIENT_SECRET)" \
diff --git a/build/azure-pipelines/publish-types/publish-types.yml b/build/azure-pipelines/publish-types/publish-types.yml
index 4fc31fb6b37..5f60ae5a262 100644
--- a/build/azure-pipelines/publish-types/publish-types.yml
+++ b/build/azure-pipelines/publish-types/publish-types.yml
@@ -34,7 +34,7 @@ steps:
 
   - bash: |
       # Install build dependencies
-      (cd build && yarn)
+      (cd build && npm ci)
       node build/azure-pipelines/publish-types/check-version.js
     displayName: Check version
 
diff --git a/build/azure-pipelines/sdl-scan.yml b/build/azure-pipelines/sdl-scan.yml
deleted file mode 100644
index 927cd5e04ae..00000000000
--- a/build/azure-pipelines/sdl-scan.yml
+++ /dev/null
@@ -1,296 +0,0 @@
-trigger: none
-pr: none
-
-parameters:
-  - name: NPM_REGISTRY
-    displayName: "Custom NPM Registry"
-    type: string
-    default: "https://pkgs.dev.azure.com/monacotools/Monaco/_packaging/vscode/npm/registry/"
-  - name: SCAN_WINDOWS
-    displayName: "Scan Windows"
-    type: boolean
-    default: true
-  - name: SCAN_LINUX
-    displayName: "Scan Linux"
-    type: boolean
-    default: false
-
-variables:
-  - name: NPM_REGISTRY
-    value: ${{ parameters.NPM_REGISTRY }}
-  - name: SCAN_WINDOWS
-    value: ${{ eq(parameters.SCAN_WINDOWS, true) }}
-  - name: SCAN_LINUX
-    value: ${{ eq(parameters.SCAN_LINUX, true) }}
-  - name: VSCODE_MIXIN_REPO
-    value: microsoft/vscode-distro
-  - name: skipComponentGovernanceDetection
-    value: true
-  - name: NPM_ARCH
-    value: x64
-  - name: VSCODE_ARCH
-    value: x64
-  - name: Codeql.enabled
-    value: true
-  - name: Codeql.TSAEnabled
-    value: true
-  - name: Codeql.TSAOptionsPath
-    value: '$(Build.SourcesDirectory)\build\azure-pipelines\config\tsaoptions.json'
-
-stages:
-  - stage: Windows
-    condition: eq(variables.SCAN_WINDOWS, 'true')
-    pool: 1es-windows-2019-x64
-    jobs:
-      - job: WindowsJob
-        timeoutInMinutes: 0
-        steps:
-          - task: CredScan@3
-            continueOnError: true
-            inputs:
-              scanFolder: "$(Build.SourcesDirectory)"
-              outputFormat: "pre"
-
-          - task: NodeTool@0
-            inputs:
-              versionSource: fromFile
-              versionFilePath: .nvmrc
-              nodejsMirror: https://github.com/joaomoreno/node-mirror/releases/download
-
-          - template: ./distro/download-distro.yml
-
-          - task: AzureKeyVault@1
-            displayName: "Azure Key Vault: Get Secrets"
-            inputs:
-              azureSubscription: "vscode-builds-subscription"
-              KeyVaultName: vscode-build-secrets
-              SecretsFilter: "github-distro-mixin-password"
-
-          - powershell: |
-              . build/azure-pipelines/win32/exec.ps1
-              $ErrorActionPreference = "Stop"
-              exec { npm config set registry "$env:NPM_REGISTRY" --location=project }
-              # npm >v7 deprecated the `always-auth` config option, refs npm/cli@72a7eeb
-              # following is a workaround for yarn to send authorization header
-              # for GET requests to the registry.
-              exec { Add-Content -Path .npmrc -Value "always-auth=true" }
-              exec { yarn config set registry "$env:NPM_REGISTRY" }
-            condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
-            displayName: Setup NPM & Yarn
-
-          - task: npmAuthenticate@0
-            inputs:
-              workingFile: .npmrc
-            condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
-            displayName: Setup NPM Authentication
-
-          - powershell: |
-              . build/azure-pipelines/win32/exec.ps1
-              $ErrorActionPreference = "Stop"
-              exec { node build/setup-npm-registry.js $env:NPM_REGISTRY }
-            condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
-            displayName: Setup NPM Registry
-
-          - task: CodeQL3000Init@0
-            displayName: CodeQL Initialize
-            condition: eq(variables['Codeql.enabled'], 'True')
-
-          - powershell: |
-              . build/azure-pipelines/win32/exec.ps1
-              . build/azure-pipelines/win32/retry.ps1
-              $ErrorActionPreference = "Stop"
-              # TODO: remove custom node-gyp when updating to Node v20,
-              # refs https://github.com/npm/cli/releases/tag/v10.2.3 which is available with Node >= 20.10.0
-              $nodeGypDir = "$(Agent.TempDirectory)/custom-packages"
-              mkdir "$nodeGypDir"
-              npm install node-gyp@10.0.1 -g --prefix "$nodeGypDir"
-              $env:npm_config_node_gyp = "${nodeGypDir}/node_modules/node-gyp/bin/node-gyp.js"
-              $env:npm_config_arch = "$(NPM_ARCH)"
-              retry { exec { yarn --frozen-lockfile --check-files } }
-            env:
-              PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
-              GITHUB_TOKEN: "$(github-distro-mixin-password)"
-              CHILD_CONCURRENCY: 1
-            displayName: Install dependencies
-
-          - script: node build/azure-pipelines/distro/mixin-npm
-            displayName: Mixin distro node modules
-
-          - script: node build/azure-pipelines/distro/mixin-quality
-            displayName: Mixin distro quality
-            env:
-              VSCODE_QUALITY: stable
-
-          - powershell: yarn compile
-            displayName: Compile
-
-          - task: CodeQL3000Finalize@0
-            displayName: CodeQL Finalize
-            condition: eq(variables['Codeql.enabled'], 'True')
-
-          - powershell: yarn gulp "vscode-symbols-win32-$(VSCODE_ARCH)"
-            env:
-              GITHUB_TOKEN: "$(github-distro-mixin-password)"
-            displayName: Download Symbols
-
-          - task: PSScriptAnalyzer@1
-            inputs:
-              Path: '$(Build.SourcesDirectory)'
-              Settings: required
-              Recurse: true
-
-          - task: BinSkim@4
-            inputs:
-              InputType: "Basic"
-              Function: "analyze"
-              TargetPattern: "guardianGlob"
-              AnalyzeIgnorePdbLoadError: true
-              AnalyzeTargetGlob: '$(agent.builddirectory)\scanbin\**.dll;$(agent.builddirectory)\scanbin\**.exe;$(agent.builddirectory)\scanbin\**.node'
-              AnalyzeLocalSymbolDirectories: '$(agent.builddirectory)\scanbin\VSCode-win32-$(VSCODE_ARCH)\pdb'
-
-          - task: AntiMalware@4
-            inputs:
-              InputType: Basic
-              ScanType: CustomScan
-              FileDirPath: '$(Build.SourcesDirectory)'
-              EnableServices: true
-              SupportLogOnError: false
-              TreatSignatureUpdateFailureAs: 'Warning'
-              SignatureFreshness: 'OneDay'
-              TreatStaleSignatureAs: 'Error'
-
-          - task: PublishSecurityAnalysisLogs@3
-            inputs:
-              ArtifactName: CodeAnalysisLogs
-              ArtifactType: Container
-              PublishProcessedResults: false
-              AllTools: true
-
-          - task: TSAUpload@2
-            inputs:
-              GdnPublishTsaOnboard: true
-              GdnPublishTsaConfigFile: '$(Build.SourcesDirectory)\build\azure-pipelines\config\tsaoptions.json'
-
-  - stage: Linux
-    dependsOn: []
-    condition: eq(variables.SCAN_LINUX, 'true')
-    pool:
-      vmImage: "Ubuntu-18.04"
-    jobs:
-      - job: LinuxJob
-        steps:
-          - task: CredScan@2
-            inputs:
-              toolMajorVersion: "V2"
-          - task: NodeTool@0
-            inputs:
-              versionSource: fromFile
-              versionFilePath: .nvmrc
-              nodejsMirror: https://github.com/joaomoreno/node-mirror/releases/download
-
-          - template: ./distro/download-distro.yml
-
-          - task: AzureKeyVault@1
-            displayName: "Azure Key Vault: Get Secrets"
-            inputs:
-              azureSubscription: "vscode-builds-subscription"
-              KeyVaultName: vscode-build-secrets
-              SecretsFilter: "github-distro-mixin-password"
-
-          - script: |
-              set -e
-              npm config set registry "$NPM_REGISTRY" --location=project
-              # npm >v7 deprecated the `always-auth` config option, refs npm/cli@72a7eeb
-              # following is a workaround for yarn to send authorization header
-              # for GET requests to the registry.
-              echo "always-auth=true" >> .npmrc
-              yarn config set registry "$NPM_REGISTRY"
-            condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
-            displayName: Setup NPM & Yarn
-
-          - task: npmAuthenticate@0
-            inputs:
-              workingFile: .npmrc
-            condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
-            displayName: Setup NPM Authentication
-
-          - script: node build/setup-npm-registry.js $NPM_REGISTRY
-            condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
-            displayName: Setup NPM Registry
-
-          - script: |
-              set -e
-              for i in {1..5}; do # try 5 times
-                yarn --cwd build --frozen-lockfile --check-files && break
-                if [ $i -eq 3 ]; then
-                  echo "Yarn failed too many times" >&2
-                  exit 1
-                fi
-                echo "Yarn failed $i, trying again..."
-              done
-            displayName: Install build dependencies
-
-          - script: |
-              set -e
-              export npm_config_arch=$(NPM_ARCH)
-
-              if [ -z "$CC" ] || [ -z "$CXX" ]; then
-                # Download clang based on chromium revision used by vscode
-                curl -s https://raw.githubusercontent.com/chromium/chromium/96.0.4664.110/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux
-                # Download libcxx headers and objects from upstream electron releases
-                DEBUG=libcxx-fetcher \
-                VSCODE_LIBCXX_OBJECTS_DIR=$PWD/.build/libcxx-objects \
-                VSCODE_LIBCXX_HEADERS_DIR=$PWD/.build/libcxx_headers  \
-                VSCODE_LIBCXXABI_HEADERS_DIR=$PWD/.build/libcxxabi_headers \
-                VSCODE_ARCH="$(NPM_ARCH)" \
-                node build/linux/libcxx-fetcher.js
-                # Set compiler toolchain
-                export CC=$PWD/.build/CR_Clang/bin/clang
-                export CXX=$PWD/.build/CR_Clang/bin/clang++
-                export CXXFLAGS="-std=c++17 -nostdinc++ -D__NO_INLINE__ -I$PWD/.build/libcxx_headers -isystem$PWD/.build/libcxx_headers/include -isystem$PWD/.build/libcxxabi_headers/include -fPIC -flto=thin -fsplit-lto-unit -D_LIBCPP_ABI_NAMESPACE=Cr"
-                export LDFLAGS="-stdlib=libc++ -fuse-ld=lld -flto=thin -fsplit-lto-unit -L$PWD/.build/libcxx-objects -lc++abi"
-                export VSCODE_REMOTE_CC=$(which gcc)
-                export VSCODE_REMOTE_CXX=$(which g++)
-              fi
-
-              for i in {1..5}; do # try 5 times
-                yarn --frozen-lockfile --check-files && break
-                if [ $i -eq 3 ]; then
-                  echo "Yarn failed too many times" >&2
-                  exit 1
-                fi
-                echo "Yarn failed $i, trying again..."
-              done
-            env:
-              PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
-              GITHUB_TOKEN: "$(github-distro-mixin-password)"
-            displayName: Install dependencies
-
-          - script: yarn --frozen-lockfile --check-files
-            workingDirectory: .build/distro/npm
-            env:
-              npm_config_arch: $(NPM_ARCH)
-            displayName: Install distro node modules
-
-          - script: node build/azure-pipelines/distro/mixin-npm
-            displayName: Mixin distro node modules
-
-          - script: node build/azure-pipelines/distro/mixin-quality
-            displayName: Mixin distro quality
-            env:
-              VSCODE_QUALITY: stable
-
-          - script: yarn gulp vscode-symbols-linux-$(VSCODE_ARCH)
-            env:
-              GITHUB_TOKEN: "$(github-distro-mixin-password)"
-            displayName: Build
-
-          - task: BinSkim@3
-            inputs:
-              toolVersion: Latest
-              InputType: CommandLine
-              arguments: analyze $(agent.builddirectory)\scanbin\exe\*.* --recurse --local-symbol-directories $(agent.builddirectory)\scanbin\VSCode-linux-$(VSCODE_ARCH)\pdb
-
-          - task: TSAUpload@2
-            inputs:
-              GdnPublishTsaConfigFile: '$(Build.SourceDirectory)\build\azure-pipelines\config\tsaoptions.json'
diff --git a/build/azure-pipelines/upload-configuration.js b/build/azure-pipelines/upload-configuration.js
deleted file mode 100644
index 39a44dc5c41..00000000000
--- a/build/azure-pipelines/upload-configuration.js
+++ /dev/null
@@ -1,112 +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.getSettingsSearchBuildId = exports.shouldSetupSettingsSearch = void 0;
-const path = require("path");
-const os = require("os");
-const cp = require("child_process");
-const vfs = require("vinyl-fs");
-const util = require("../lib/util");
-const identity_1 = require("@azure/identity");
-const azure = require('gulp-azure-storage');
-const packageJson = require("../../package.json");
-const commit = process.env['BUILD_SOURCEVERSION'];
-function generateVSCodeConfigurationTask() {
-    return new Promise((resolve, reject) => {
-        const buildDir = process.env['AGENT_BUILDDIRECTORY'];
-        if (!buildDir) {
-            return reject(new Error('$AGENT_BUILDDIRECTORY not set'));
-        }
-        if (!shouldSetupSettingsSearch()) {
-            console.log(`Only runs on main and release branches, not ${process.env.BUILD_SOURCEBRANCH}`);
-            return resolve(undefined);
-        }
-        if (process.env.VSCODE_QUALITY !== 'insider' && process.env.VSCODE_QUALITY !== 'stable') {
-            console.log(`Only runs on insider and stable qualities, not ${process.env.VSCODE_QUALITY}`);
-            return resolve(undefined);
-        }
-        const result = path.join(os.tmpdir(), 'configuration.json');
-        const userDataDir = path.join(os.tmpdir(), 'tmpuserdata');
-        const extensionsDir = path.join(os.tmpdir(), 'tmpextdir');
-        const arch = process.env['VSCODE_ARCH'];
-        const appRoot = path.join(buildDir, `VSCode-darwin-${arch}`);
-        const appName = process.env.VSCODE_QUALITY === 'insider' ? 'Visual\\ Studio\\ Code\\ -\\ Insiders.app' : 'Visual\\ Studio\\ Code.app';
-        const appPath = path.join(appRoot, appName, 'Contents', 'Resources', 'app', 'bin', 'code');
-        const codeProc = cp.exec(`${appPath} --export-default-configuration='${result}' --wait --user-data-dir='${userDataDir}' --extensions-dir='${extensionsDir}'`, (err, stdout, stderr) => {
-            clearTimeout(timer);
-            if (err) {
-                console.log(`err: ${err} ${err.message} ${err.toString()}`);
-                reject(err);
-            }
-            if (stdout) {
-                console.log(`stdout: ${stdout}`);
-            }
-            if (stderr) {
-                console.log(`stderr: ${stderr}`);
-            }
-            resolve(result);
-        });
-        const timer = setTimeout(() => {
-            codeProc.kill();
-            reject(new Error('export-default-configuration process timed out'));
-        }, 60 * 1000);
-        codeProc.on('error', err => {
-            clearTimeout(timer);
-            reject(err);
-        });
-    });
-}
-function shouldSetupSettingsSearch() {
-    const branch = process.env.BUILD_SOURCEBRANCH;
-    return !!(branch && (/\/main$/.test(branch) || branch.indexOf('/release/') >= 0));
-}
-exports.shouldSetupSettingsSearch = shouldSetupSettingsSearch;
-function getSettingsSearchBuildId(packageJson) {
-    try {
-        const branch = process.env.BUILD_SOURCEBRANCH;
-        const branchId = branch.indexOf('/release/') >= 0 ? 0 :
-            /\/main$/.test(branch) ? 1 :
-                2; // Some unexpected branch
-        const out = cp.execSync(`git rev-list HEAD --count`);
-        const count = parseInt(out.toString());
-        // <version number><commit count><branchId (avoid unlikely conflicts)>
-        // 1.25.1, 1,234,567 commits, main = 1250112345671
-        return util.versionStringToNumber(packageJson.version) * 1e8 + count * 10 + branchId;
-    }
-    catch (e) {
-        throw new Error('Could not determine build number: ' + e.toString());
-    }
-}
-exports.getSettingsSearchBuildId = getSettingsSearchBuildId;
-async function main() {
-    const configPath = await generateVSCodeConfigurationTask();
-    if (!configPath) {
-        return;
-    }
-    const settingsSearchBuildId = getSettingsSearchBuildId(packageJson);
-    if (!settingsSearchBuildId) {
-        throw new Error('Failed to compute build number');
-    }
-    const credential = new identity_1.ClientSecretCredential(process.env['AZURE_TENANT_ID'], process.env['AZURE_CLIENT_ID'], process.env['AZURE_CLIENT_SECRET']);
-    return new Promise((c, e) => {
-        vfs.src(configPath)
-            .pipe(azure.upload({
-            account: process.env.AZURE_STORAGE_ACCOUNT,
-            credential,
-            container: 'configuration',
-            prefix: `${settingsSearchBuildId}/${commit}/`
-        }))
-            .on('end', () => c())
-            .on('error', (err) => e(err));
-    });
-}
-if (require.main === module) {
-    main().catch(err => {
-        console.error(err);
-        process.exit(1);
-    });
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBsb2FkLWNvbmZpZ3VyYXRpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJ1cGxvYWQtY29uZmlndXJhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7OztBQUVoRyw2QkFBNkI7QUFDN0IseUJBQXlCO0FBQ3pCLG9DQUFvQztBQUNwQyxnQ0FBZ0M7QUFDaEMsb0NBQW9DO0FBQ3BDLDhDQUF5RDtBQUN6RCxNQUFNLEtBQUssR0FBRyxPQUFPLENBQUMsb0JBQW9CLENBQUMsQ0FBQztBQUM1QyxrREFBa0Q7QUFFbEQsTUFBTSxNQUFNLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDO0FBRWxELFNBQVMsK0JBQStCO0lBQ3ZDLE9BQU8sSUFBSSxPQUFPLENBQUMsQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQUU7UUFDdEMsTUFBTSxRQUFRLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxzQkFBc0IsQ0FBQyxDQUFDO1FBQ3JELElBQUksQ0FBQyxRQUFRLEVBQUU7WUFDZCxPQUFPLE1BQU0sQ0FBQyxJQUFJLEtBQUssQ0FBQywrQkFBK0IsQ0FBQyxDQUFDLENBQUM7U0FDMUQ7UUFFRCxJQUFJLENBQUMseUJBQXlCLEVBQUUsRUFBRTtZQUNqQyxPQUFPLENBQUMsR0FBRyxDQUFDLCtDQUErQyxPQUFPLENBQUMsR0FBRyxDQUFDLGtCQUFrQixFQUFFLENBQUMsQ0FBQztZQUM3RixPQUFPLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQztTQUMxQjtRQUVELElBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLEtBQUssU0FBUyxJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsY0FBYyxLQUFLLFFBQVEsRUFBRTtZQUN4RixPQUFPLENBQUMsR0FBRyxDQUFDLGtEQUFrRCxPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsRUFBRSxDQUFDLENBQUM7WUFDNUYsT0FBTyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7U0FDMUI7UUFFRCxNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxvQkFBb0IsQ0FBQyxDQUFDO1FBQzVELE1BQU0sV0FBVyxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLE1BQU0sRUFBRSxFQUFFLGFBQWEsQ0FBQyxDQUFDO1FBQzFELE1BQU0sYUFBYSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLE1BQU0sRUFBRSxFQUFFLFdBQVcsQ0FBQyxDQUFDO1FBQzFELE1BQU0sSUFBSSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDeEMsTUFBTSxPQUFPLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsaUJBQWlCLElBQUksRUFBRSxDQUFDLENBQUM7UUFDN0QsTUFBTSxPQUFPLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQywyQ0FBMkMsQ0FBQyxDQUFDLENBQUMsNEJBQTRCLENBQUM7UUFDdEksTUFBTSxPQUFPLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsT0FBTyxFQUFFLFVBQVUsRUFBRSxXQUFXLEVBQUUsS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLENBQUMsQ0FBQztRQUMzRixNQUFNLFFBQVEsR0FBRyxFQUFFLENBQUMsSUFBSSxDQUN2QixHQUFHLE9BQU8sb0NBQW9DLE1BQU0sNkJBQTZCLFdBQVcsdUJBQXVCLGFBQWEsR0FBRyxFQUNuSSxDQUFDLEdBQUcsRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLEVBQUU7WUFDdkIsWUFBWSxDQUFDLEtBQUssQ0FBQyxDQUFDO1lBQ3BCLElBQUksR0FBRyxFQUFFO2dCQUNSLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUSxHQUFHLElBQUksR0FBRyxDQUFDLE9BQU8sSUFBSSxHQUFHLENBQUMsUUFBUSxFQUFFLEVBQUUsQ0FBQyxDQUFDO2dCQUM1RCxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7YUFDWjtZQUVELElBQUksTUFBTSxFQUFFO2dCQUNYLE9BQU8sQ0FBQyxHQUFHLENBQUMsV0FBVyxNQUFNLEVBQUUsQ0FBQyxDQUFDO2FBQ2pDO1lBRUQsSUFBSSxNQUFNLEVBQUU7Z0JBQ1gsT0FBTyxDQUFDLEdBQUcsQ0FBQyxXQUFXLE1BQU0sRUFBRSxDQUFDLENBQUM7YUFDakM7WUFFRCxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDakIsQ0FBQyxDQUNELENBQUM7UUFDRixNQUFNLEtBQUssR0FBRyxVQUFVLENBQUMsR0FBRyxFQUFFO1lBQzdCLFFBQVEsQ0FBQyxJQUFJLEVBQUUsQ0FBQztZQUNoQixNQUFNLENBQUMsSUFBSSxLQUFLLENBQUMsZ0RBQWdELENBQUMsQ0FBQyxDQUFDO1FBQ3JFLENBQUMsRUFBRSxFQUFFLEdBQUcsSUFBSSxDQUFDLENBQUM7UUFFZCxRQUFRLENBQUMsRUFBRSxDQUFDLE9BQU8sRUFBRSxHQUFHLENBQUMsRUFBRTtZQUMxQixZQUFZLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDcEIsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ2IsQ0FBQyxDQUFDLENBQUM7SUFDSixDQUFDLENBQUMsQ0FBQztBQUNKLENBQUM7QUFFRCxTQUFnQix5QkFBeUI7SUFDeEMsTUFBTSxNQUFNLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxrQkFBa0IsQ0FBQztJQUM5QyxPQUFPLENBQUMsQ0FBQyxDQUFDLE1BQU0sSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksTUFBTSxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ25GLENBQUM7QUFIRCw4REFHQztBQUVELFNBQWdCLHdCQUF3QixDQUFDLFdBQWdDO0lBQ3hFLElBQUk7UUFDSCxNQUFNLE1BQU0sR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLGtCQUFtQixDQUFDO1FBQy9DLE1BQU0sUUFBUSxHQUFHLE1BQU0sQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUN0RCxTQUFTLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztnQkFDM0IsQ0FBQyxDQUFDLENBQUMseUJBQXlCO1FBRTlCLE1BQU0sR0FBRyxHQUFHLEVBQUUsQ0FBQyxRQUFRLENBQUMsMkJBQTJCLENBQUMsQ0FBQztRQUNyRCxNQUFNLEtBQUssR0FBRyxRQUFRLENBQUMsR0FBRyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7UUFFdkMsc0VBQXNFO1FBQ3RFLGtEQUFrRDtRQUNsRCxPQUFPLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDLEdBQUcsR0FBRyxHQUFHLEtBQUssR0FBRyxFQUFFLEdBQUcsUUFBUSxDQUFDO0tBQ3JGO0lBQUMsT0FBTyxDQUFDLEVBQUU7UUFDWCxNQUFNLElBQUksS0FBSyxDQUFDLG9DQUFvQyxHQUFHLENBQUMsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDO0tBQ3JFO0FBQ0YsQ0FBQztBQWhCRCw0REFnQkM7QUFFRCxLQUFLLFVBQVUsSUFBSTtJQUNsQixNQUFNLFVBQVUsR0FBRyxNQUFNLCtCQUErQixFQUFFLENBQUM7SUFFM0QsSUFBSSxDQUFDLFVBQVUsRUFBRTtRQUNoQixPQUFPO0tBQ1A7SUFFRCxNQUFNLHFCQUFxQixHQUFHLHdCQUF3QixDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBRXBFLElBQUksQ0FBQyxxQkFBcUIsRUFBRTtRQUMzQixNQUFNLElBQUksS0FBSyxDQUFDLGdDQUFnQyxDQUFDLENBQUM7S0FDbEQ7SUFFRCxNQUFNLFVBQVUsR0FBRyxJQUFJLGlDQUFzQixDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsaUJBQWlCLENBQUUsRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLGlCQUFpQixDQUFFLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxxQkFBcUIsQ0FBRSxDQUFDLENBQUM7SUFFckosT0FBTyxJQUFJLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRTtRQUMzQixHQUFHLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQzthQUNqQixJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQztZQUNsQixPQUFPLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxxQkFBcUI7WUFDMUMsVUFBVTtZQUNWLFNBQVMsRUFBRSxlQUFlO1lBQzFCLE1BQU0sRUFBRSxHQUFHLHFCQUFxQixJQUFJLE1BQU0sR0FBRztTQUM3QyxDQUFDLENBQUM7YUFDRixFQUFFLENBQUMsS0FBSyxFQUFFLEdBQUcsRUFBRSxDQUFDLENBQUMsRUFBRSxDQUFDO2FBQ3BCLEVBQUUsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxHQUFRLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO0lBQ3JDLENBQUMsQ0FBQyxDQUFDO0FBQ0osQ0FBQztBQUVELElBQUksT0FBTyxDQUFDLElBQUksS0FBSyxNQUFNLEVBQUU7SUFDNUIsSUFBSSxFQUFFLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxFQUFFO1FBQ2xCLE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDbkIsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNqQixDQUFDLENBQUMsQ0FBQztDQUNIIn0=
\ No newline at end of file
diff --git a/build/azure-pipelines/upload-nlsmetadata.js b/build/azure-pipelines/upload-nlsmetadata.js
index 34c2005a30f..5b6cd3ed1fd 100644
--- a/build/azure-pipelines/upload-nlsmetadata.js
+++ b/build/azure-pipelines/upload-nlsmetadata.js
@@ -16,13 +16,33 @@ const commit = process.env['BUILD_SOURCEVERSION'];
 const credential = new identity_1.ClientSecretCredential(process.env['AZURE_TENANT_ID'], process.env['AZURE_CLIENT_ID'], process.env['AZURE_CLIENT_SECRET']);
 function main() {
     return new Promise((c, e) => {
-        es.merge(vfs.src('out-vscode-web-min/nls.metadata.json', { base: 'out-vscode-web-min' }), vfs.src('.build/extensions/**/nls.metadata.json', { base: '.build/extensions' }), vfs.src('.build/extensions/**/nls.metadata.header.json', { base: '.build/extensions' }), vfs.src('.build/extensions/**/package.nls.json', { base: '.build/extensions' }))
+        const combinedMetadataJson = es.merge(
+        // vscode: we are not using `out-build/nls.metadata.json` here because
+        // it includes metadata for translators for `keys`. but for our purpose
+        // we want only the `keys` and `messages` as `string`.
+        es.merge(vfs.src('out-build/nls.keys.json', { base: 'out-build' }), vfs.src('out-build/nls.messages.json', { base: 'out-build' }))
             .pipe(merge({
+            fileName: 'vscode.json',
+            jsonSpace: '',
+            concatArrays: true,
+            edit: (parsedJson, file) => {
+                if (file.base === 'out-build') {
+                    if (file.basename === 'nls.keys.json') {
+                        return { keys: parsedJson };
+                    }
+                    else {
+                        return { messages: parsedJson };
+                    }
+                }
+            }
+        })), 
+        // extensions
+        vfs.src('.build/extensions/**/nls.metadata.json', { base: '.build/extensions' }), vfs.src('.build/extensions/**/nls.metadata.header.json', { base: '.build/extensions' }), vfs.src('.build/extensions/**/package.nls.json', { base: '.build/extensions' })).pipe(merge({
             fileName: 'combined.nls.metadata.json',
             jsonSpace: '',
             concatArrays: true,
             edit: (parsedJson, file) => {
-                if (file.base === 'out-vscode-web-min') {
+                if (file.basename === 'vscode.json') {
                     return { vscode: parsedJson };
                 }
                 // Handle extensions and follow the same structure as the Core nls file.
@@ -72,13 +92,15 @@ function main() {
                 const key = manifestJson.publisher + '.' + manifestJson.name;
                 return { [key]: parsedJson };
             },
-        }))
+        }));
+        const nlsMessagesJs = vfs.src('out-build/nls.messages.js', { base: 'out-build' });
+        es.merge(combinedMetadataJson, nlsMessagesJs)
             .pipe(gzip({ append: false }))
             .pipe(vfs.dest('./nlsMetadata'))
             .pipe(es.through(function (data) {
             console.log(`Uploading ${data.path}`);
             // trigger artifact upload
-            console.log(`##vso[artifact.upload containerfolder=nlsmetadata;artifactname=combined.nls.metadata.json]${data.path}`);
+            console.log(`##vso[artifact.upload containerfolder=nlsmetadata;artifactname=${data.basename}]${data.path}`);
             this.emit('data', data);
         }))
             .pipe(azure.upload({
diff --git a/build/azure-pipelines/upload-nlsmetadata.ts b/build/azure-pipelines/upload-nlsmetadata.ts
index 416d0eec408..030cc8f0e5a 100644
--- a/build/azure-pipelines/upload-nlsmetadata.ts
+++ b/build/azure-pipelines/upload-nlsmetadata.ts
@@ -24,79 +24,103 @@ interface NlsMetadata {
 
 function main(): Promise<void> {
 	return new Promise((c, e) => {
-
-		es.merge(
-			vfs.src('out-vscode-web-min/nls.metadata.json', { base: 'out-vscode-web-min' }),
-			vfs.src('.build/extensions/**/nls.metadata.json', { base: '.build/extensions' }),
-			vfs.src('.build/extensions/**/nls.metadata.header.json', { base: '.build/extensions' }),
-			vfs.src('.build/extensions/**/package.nls.json', { base: '.build/extensions' }))
-			.pipe(merge({
-				fileName: 'combined.nls.metadata.json',
-				jsonSpace: '',
-				concatArrays: true,
-				edit: (parsedJson, file) => {
-					if (file.base === 'out-vscode-web-min') {
-						return { vscode: parsedJson };
-					}
-
-					// Handle extensions and follow the same structure as the Core nls file.
-					switch (file.basename) {
-						case 'package.nls.json':
-							// put package.nls.json content in Core NlsMetadata format
-							// language packs use the key "package" to specify that
-							// translations are for the package.json file
-							parsedJson = {
-								messages: {
-									package: Object.values(parsedJson)
-								},
-								keys: {
-									package: Object.keys(parsedJson)
-								},
-								bundles: {
-									main: ['package']
-								}
-							};
-							break;
-
-						case 'nls.metadata.header.json':
-							parsedJson = { header: parsedJson };
-							break;
-
-						case 'nls.metadata.json': {
-							// put nls.metadata.json content in Core NlsMetadata format
-							const modules = Object.keys(parsedJson);
-
-							const json: NlsMetadata = {
-								keys: {},
-								messages: {},
-								bundles: {
-									main: []
-								}
-							};
-							for (const module of modules) {
-								json.messages[module] = parsedJson[module].messages;
-								json.keys[module] = parsedJson[module].keys;
-								json.bundles.main.push(module);
+		const combinedMetadataJson = es.merge(
+			// vscode: we are not using `out-build/nls.metadata.json` here because
+			// it includes metadata for translators for `keys`. but for our purpose
+			// we want only the `keys` and `messages` as `string`.
+			es.merge(
+				vfs.src('out-build/nls.keys.json', { base: 'out-build' }),
+				vfs.src('out-build/nls.messages.json', { base: 'out-build' }))
+				.pipe(merge({
+					fileName: 'vscode.json',
+					jsonSpace: '',
+					concatArrays: true,
+					edit: (parsedJson, file) => {
+						if (file.base === 'out-build') {
+							if (file.basename === 'nls.keys.json') {
+								return { keys: parsedJson };
+							} else {
+								return { messages: parsedJson };
 							}
-							parsedJson = json;
-							break;
 						}
 					}
+				})),
 
-					// Get extension id and use that as the key
-					const folderPath = path.join(file.base, file.relative.split('/')[0]);
-					const manifest = readFileSync(path.join(folderPath, 'package.json'), 'utf-8');
-					const manifestJson = JSON.parse(manifest);
-					const key = manifestJson.publisher + '.' + manifestJson.name;
-					return { [key]: parsedJson };
-				},
-			}))
+			// extensions
+			vfs.src('.build/extensions/**/nls.metadata.json', { base: '.build/extensions' }),
+			vfs.src('.build/extensions/**/nls.metadata.header.json', { base: '.build/extensions' }),
+			vfs.src('.build/extensions/**/package.nls.json', { base: '.build/extensions' })
+		).pipe(merge({
+			fileName: 'combined.nls.metadata.json',
+			jsonSpace: '',
+			concatArrays: true,
+			edit: (parsedJson, file) => {
+				if (file.basename === 'vscode.json') {
+					return { vscode: parsedJson };
+				}
+
+				// Handle extensions and follow the same structure as the Core nls file.
+				switch (file.basename) {
+					case 'package.nls.json':
+						// put package.nls.json content in Core NlsMetadata format
+						// language packs use the key "package" to specify that
+						// translations are for the package.json file
+						parsedJson = {
+							messages: {
+								package: Object.values(parsedJson)
+							},
+							keys: {
+								package: Object.keys(parsedJson)
+							},
+							bundles: {
+								main: ['package']
+							}
+						};
+						break;
+
+					case 'nls.metadata.header.json':
+						parsedJson = { header: parsedJson };
+						break;
+
+					case 'nls.metadata.json': {
+						// put nls.metadata.json content in Core NlsMetadata format
+						const modules = Object.keys(parsedJson);
+
+						const json: NlsMetadata = {
+							keys: {},
+							messages: {},
+							bundles: {
+								main: []
+							}
+						};
+						for (const module of modules) {
+							json.messages[module] = parsedJson[module].messages;
+							json.keys[module] = parsedJson[module].keys;
+							json.bundles.main.push(module);
+						}
+						parsedJson = json;
+						break;
+					}
+				}
+
+				// Get extension id and use that as the key
+				const folderPath = path.join(file.base, file.relative.split('/')[0]);
+				const manifest = readFileSync(path.join(folderPath, 'package.json'), 'utf-8');
+				const manifestJson = JSON.parse(manifest);
+				const key = manifestJson.publisher + '.' + manifestJson.name;
+				return { [key]: parsedJson };
+			},
+		}));
+
+		const nlsMessagesJs = vfs.src('out-build/nls.messages.js', { base: 'out-build' });
+
+		es.merge(combinedMetadataJson, nlsMessagesJs)
 			.pipe(gzip({ append: false }))
 			.pipe(vfs.dest('./nlsMetadata'))
 			.pipe(es.through(function (data: Vinyl) {
 				console.log(`Uploading ${data.path}`);
 				// trigger artifact upload
-				console.log(`##vso[artifact.upload containerfolder=nlsmetadata;artifactname=combined.nls.metadata.json]${data.path}`);
+				console.log(`##vso[artifact.upload containerfolder=nlsmetadata;artifactname=${data.basename}]${data.path}`);
 				this.emit('data', data);
 			}))
 			.pipe(azure.upload({
diff --git a/build/azure-pipelines/upload-sourcemaps.js b/build/azure-pipelines/upload-sourcemaps.js
index 7cd68398734..83c1cae596d 100644
--- a/build/azure-pipelines/upload-sourcemaps.js
+++ b/build/azure-pipelines/upload-sourcemaps.js
@@ -31,7 +31,7 @@ function main() {
         const vs = src('out-vscode-min'); // client source-maps only
         sources.push(vs);
         const productionDependencies = deps.getProductionDependencies(root);
-        const productionDependenciesSrc = productionDependencies.map(d => path.relative(root, d.path)).map(d => `./${d}/**/*.map`);
+        const productionDependenciesSrc = productionDependencies.map(d => path.relative(root, d)).map(d => `./${d}/**/*.map`);
         const nodeModules = vfs.src(productionDependenciesSrc, { base: '.' })
             .pipe(util.cleanNodeModules(path.join(root, 'build', '.moduleignore')))
             .pipe(util.cleanNodeModules(path.join(root, 'build', `.moduleignore.${process.platform}`)));
diff --git a/build/azure-pipelines/upload-sourcemaps.ts b/build/azure-pipelines/upload-sourcemaps.ts
index 366ad945499..8e148c6095f 100644
--- a/build/azure-pipelines/upload-sourcemaps.ts
+++ b/build/azure-pipelines/upload-sourcemaps.ts
@@ -36,8 +36,8 @@ function main(): Promise<void> {
 		const vs = src('out-vscode-min'); // client source-maps only
 		sources.push(vs);
 
-		const productionDependencies: { name: string; path: string; version: string }[] = deps.getProductionDependencies(root);
-		const productionDependenciesSrc = productionDependencies.map(d => path.relative(root, d.path)).map(d => `./${d}/**/*.map`);
+		const productionDependencies = deps.getProductionDependencies(root);
+		const productionDependenciesSrc = productionDependencies.map(d => path.relative(root, d)).map(d => `./${d}/**/*.map`);
 		const nodeModules = vfs.src(productionDependenciesSrc, { base: '.' })
 			.pipe(util.cleanNodeModules(path.join(root, 'build', '.moduleignore')))
 			.pipe(util.cleanNodeModules(path.join(root, 'build', `.moduleignore.${process.platform}`)));
diff --git a/build/azure-pipelines/web/product-build-web.yml b/build/azure-pipelines/web/product-build-web.yml
index 5e423d077c7..2c5753ec89c 100644
--- a/build/azure-pipelines/web/product-build-web.yml
+++ b/build/azure-pipelines/web/product-build-web.yml
@@ -7,7 +7,7 @@ steps:
 
   - template: ../distro/download-distro.yml@self
 
-  - task: AzureKeyVault@1
+  - task: AzureKeyVault@2
     displayName: "Azure Key Vault: Get Secrets"
     inputs:
       azureSubscription: "vscode-builds-subscription"
@@ -27,12 +27,12 @@ steps:
     condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Registry
 
-  - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.js web > .build/yarnlockhash
+  - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.js web > .build/packagelockhash
     displayName: Prepare node_modules cache key
 
   - task: Cache@2
     inputs:
-      key: '"node_modules" | .build/yarnlockhash'
+      key: '"node_modules" | .build/packagelockhash'
       path: .build/node_modules_cache
       cacheHitVar: NODE_MODULES_RESTORED
     displayName: Restore node_modules cache
@@ -43,34 +43,36 @@ steps:
 
   - script: |
       set -e
-      npm config set registry "$NPM_REGISTRY" --location=project
-      # npm >v7 deprecated the `always-auth` config option, refs npm/cli@72a7eeb
-      # following is a workaround for yarn to send authorization header
-      # for GET requests to the registry.
-      echo "always-auth=true" >> .npmrc
-      yarn config set registry "$NPM_REGISTRY"
+      # Set the private NPM registry to the global npmrc file
+      # so that authentication works for subfolders like build/, remote/, extensions/ etc
+      # which does not have their own .npmrc file
+      npm config set registry "$NPM_REGISTRY"
+      echo "##vso[task.setvariable variable=NPMRC_PATH]$(npm config get userconfig)"
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
-    displayName: Setup NPM & Yarn
+    displayName: Setup NPM
 
   - task: npmAuthenticate@0
     inputs:
-      workingFile: .npmrc
+      workingFile: $(NPMRC_PATH)
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Authentication
 
-  - script: sudo apt-get update && sudo apt-get install -y libkrb5-dev
-    displayName: Install build dependencies
+  - script: |
+      set -e
+      ../linux/apt-retry.sh sudo apt-get update
+      ../linux/apt-retry.sh sudo apt-get install -y libkrb5-dev
+    displayName: Setup system services
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
   - script: |
       set -e
       for i in {1..5}; do # try 5 times
-        yarn --frozen-lockfile --check-files && break
-        if [ $i -eq 3 ]; then
-          echo "Yarn failed too many times" >&2
+        npm ci && break
+        if [ $i -eq 5 ]; then
+          echo "Npm install failed too many times" >&2
           exit 1
         fi
-        echo "Yarn failed $i, trying again..."
+        echo "Npm install failed $i, trying again..."
       done
     env:
       ELECTRON_SKIP_BINARY_DOWNLOAD: 1
@@ -98,13 +100,12 @@ steps:
 
   - script: |
       set -e
-      yarn gulp vscode-web-min-ci
+      npm run gulp vscode-web-min-ci
       ARCHIVE_PATH=".build/web/vscode-web.tar.gz"
       mkdir -p $(dirname $ARCHIVE_PATH)
       tar --owner=0 --group=0 -czf $ARCHIVE_PATH -C .. vscode-web
       echo "##vso[task.setvariable variable=WEB_PATH]$ARCHIVE_PATH"
     env:
-      DISABLE_V8_COMPILE_CACHE: 1 # Disable v8 cache used by yarn v1.x, refs https://github.com/nodejs/node/issues/51555
       GITHUB_TOKEN: "$(github-distro-mixin-password)"
     displayName: Build
 
@@ -152,7 +153,7 @@ steps:
 
   - script: |
       set -e
-      AZURE_STORAGE_ACCOUNT="ticino" \
+      AZURE_STORAGE_ACCOUNT="vscodeweb" \
       AZURE_TENANT_ID="$(AZURE_TENANT_ID)" \
       AZURE_CLIENT_ID="$(AZURE_CLIENT_ID)" \
       AZURE_CLIENT_SECRET="$(AZURE_CLIENT_SECRET)" \
diff --git a/build/azure-pipelines/win32/product-build-win32-cli-sign.yml b/build/azure-pipelines/win32/product-build-win32-cli-sign.yml
index 3b5668d0082..62b1b715af2 100644
--- a/build/azure-pipelines/win32/product-build-win32-cli-sign.yml
+++ b/build/azure-pipelines/win32/product-build-win32-cli-sign.yml
@@ -17,21 +17,20 @@ steps:
     displayName: Setup NPM Registry
 
   - powershell: |
-      . azure-pipelines/win32/exec.ps1
+      . build/azure-pipelines/win32/exec.ps1
       $ErrorActionPreference = "Stop"
-      exec { npm config set registry "$env:NPM_REGISTRY" --location=project }
-      # npm >v7 deprecated the `always-auth` config option, refs npm/cli@72a7eeb
-      # following is a workaround for yarn to send authorization header
-      # for GET requests to the registry.
-      exec { Add-Content -Path .npmrc -Value "always-auth=true" }
-      exec { yarn config set registry "$env:NPM_REGISTRY" }
-    workingDirectory: build
+      # Set the private NPM registry to the global npmrc file
+      # so that authentication works for subfolders like build/, remote/, extensions/ etc
+      # which does not have their own .npmrc file
+      exec { npm config set registry "$env:NPM_REGISTRY" }
+      $NpmrcPath = (npm config get userconfig)
+      echo "##vso[task.setvariable variable=NPMRC_PATH]$NpmrcPath"
     condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
-    displayName: Setup NPM & Yarn
+    displayName: Setup NPM
 
   - task: npmAuthenticate@0
     inputs:
-      workingFile: build/.npmrc
+      workingFile: $(NPMRC_PATH)
     condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Authentication
 
@@ -40,7 +39,7 @@ steps:
       . azure-pipelines/win32/retry.ps1
       $ErrorActionPreference = "Stop"
       $env:CHILD_CONCURRENCY="1"
-      retry { exec { yarn --frozen-lockfile --check-files } }
+      retry { exec { npm ci } }
     workingDirectory: build
     displayName: Install build dependencies
 
diff --git a/build/azure-pipelines/win32/product-build-win32-test.yml b/build/azure-pipelines/win32/product-build-win32-test.yml
index a3b251b71ac..cdcccd7684b 100644
--- a/build/azure-pipelines/win32/product-build-win32-test.yml
+++ b/build/azure-pipelines/win32/product-build-win32-test.yml
@@ -14,7 +14,7 @@ parameters:
     default: PublishPipelineArtifact@0
 
 steps:
-  - powershell: yarn npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
+  - powershell: npm exec -- npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
     env:
       GITHUB_TOKEN: "$(github-distro-mixin-password)"
     displayName: Download Electron and Playwright
@@ -25,11 +25,9 @@ steps:
       - powershell: .\scripts\test.bat --tfs "Unit Tests"
         displayName: Run unit tests (Electron)
         timeoutInMinutes: 15
-
-      - powershell: yarn test-node
+      - powershell: npm run test-node
         displayName: Run unit tests (node.js)
         timeoutInMinutes: 15
-
       - powershell: node test/unit/browser/index.js --sequential --browser chromium --tfs "Browser Unit Tests"
         displayName: Run unit tests (Browser, Chromium)
         timeoutInMinutes: 20
@@ -38,12 +36,10 @@ steps:
       - powershell: .\scripts\test.bat --build --tfs "Unit Tests"
         displayName: Run unit tests (Electron)
         timeoutInMinutes: 15
-
-      - powershell: yarn test-node --build
+      - powershell: npm run test-node -- --build
         displayName: Run unit tests (node.js)
         timeoutInMinutes: 15
-
-      - powershell: yarn test-browser-no-install --sequential --build --browser chromium --tfs "Browser Unit Tests"
+      - powershell: npm run test-browser-no-install -- --sequential --build --browser chromium --tfs "Browser Unit Tests"
         displayName: Run unit tests (Browser, Chromium)
         timeoutInMinutes: 20
 
@@ -51,7 +47,7 @@ steps:
     - powershell: |
         . build/azure-pipelines/win32/exec.ps1
         $ErrorActionPreference = "Stop"
-        exec { yarn gulp `
+        exec { npm run gulp `
           compile-extension:configuration-editing `
           compile-extension:css-language-features-server `
           compile-extension:emmet `
@@ -61,7 +57,6 @@ steps:
           compile-extension:ipynb `
           compile-extension:notebook-renderers `
           compile-extension:json-language-features-server `
-          compile-extension:markdown-language-features-server `
           compile-extension:markdown-language-features `
           compile-extension-media `
           compile-extension:microsoft-authentication `
@@ -72,13 +67,18 @@ steps:
         }
       displayName: Build integration tests
 
+    - powershell: .\build\azure-pipelines\win32\listprocesses.bat
+      displayName: Diagnostics before integration test runs
+      continueOnError: true
+      condition: succeededOrFailed()
+
     - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
       - powershell: .\scripts\test-integration.bat --tfs "Integration Tests"
         displayName: Run integration tests (Electron)
         timeoutInMinutes: 20
 
-      - powershell: .\scripts\test-web-integration.bat --browser firefox
-        displayName: Run integration tests (Browser, Firefox)
+      - powershell: .\scripts\test-web-integration.bat --browser chromium
+        displayName: Run integration tests (Browser, Chromium)
         timeoutInMinutes: 20
 
       - powershell: .\scripts\test-remote-integration.bat
@@ -121,6 +121,11 @@ steps:
         displayName: Run integration tests (Remote)
         timeoutInMinutes: 20
 
+      - powershell: .\build\azure-pipelines\win32\listprocesses.bat
+        displayName: Diagnostics after integration test runs
+        continueOnError: true
+        condition: succeededOrFailed()
+
   - ${{ if eq(parameters.VSCODE_RUN_SMOKE_TESTS, true) }}:
     - powershell: .\build\azure-pipelines\win32\listprocesses.bat
       displayName: Diagnostics before smoke test run
@@ -128,32 +133,33 @@ steps:
       condition: succeededOrFailed()
 
     - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-      - powershell: yarn --cwd test/smoke compile
+      - powershell: npm run compile
+        workingDirectory: test/smoke
         displayName: Compile smoke tests
 
-      - powershell: yarn gulp compile-extension-media
+      - powershell: npm run gulp compile-extension-media
         displayName: Build extensions for smoke tests
 
-      - powershell: yarn smoketest-no-compile --tracing
+      - powershell: npm run smoketest-no-compile -- --tracing
         displayName: Run smoke tests (Electron)
         timeoutInMinutes: 20
 
     - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-      - powershell: yarn smoketest-no-compile --tracing --build "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
+      - powershell: npm run smoketest-no-compile -- --tracing --build "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
         displayName: Run smoke tests (Electron)
         timeoutInMinutes: 20
 
-      - powershell: yarn smoketest-no-compile --web --tracing --headless
+      - powershell: npm run smoketest-no-compile -- --web --tracing --headless
         env:
           VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)\vscode-server-win32-$(VSCODE_ARCH)-web
         displayName: Run smoke tests (Browser, Chromium)
         timeoutInMinutes: 20
 
-      - powershell: yarn gulp compile-extension:vscode-test-resolver
+      - powershell: npm run gulp compile-extension:vscode-test-resolver
         displayName: Compile test resolver extension
         timeoutInMinutes: 20
 
-      - powershell: yarn smoketest-no-compile --tracing --remote --build "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
+      - powershell: npm run smoketest-no-compile -- --tracing --remote --build "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
         env:
           VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)\vscode-server-win32-$(VSCODE_ARCH)
         displayName: Run smoke tests (Remote)
diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml
index d3827b930f8..a30d4ca8029 100644
--- a/build/azure-pipelines/win32/product-build-win32.yml
+++ b/build/azure-pipelines/win32/product-build-win32.yml
@@ -32,7 +32,7 @@ steps:
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
     - template: ../distro/download-distro.yml@self
 
-    - task: AzureKeyVault@1
+    - task: AzureKeyVault@2
       displayName: "Azure Key Vault: Get Secrets"
       inputs:
         azureSubscription: "vscode-builds-subscription"
@@ -57,12 +57,12 @@ steps:
 
   - pwsh: |
       mkdir .build -ea 0
-      node build/azure-pipelines/common/computeNodeModulesCacheKey.js win32 $(VSCODE_ARCH) > .build/yarnlockhash
+      node build/azure-pipelines/common/computeNodeModulesCacheKey.js win32 $(VSCODE_ARCH) > .build/packagelockhash
     displayName: Prepare node_modules cache key
 
   - task: Cache@2
     inputs:
-      key: '"node_modules" | .build/yarnlockhash'
+      key: '"node_modules" | .build/packagelockhash'
       path: .build/node_modules_cache
       cacheHitVar: NODE_MODULES_RESTORED
     displayName: Restore node_modules cache
@@ -74,18 +74,18 @@ steps:
   - powershell: |
       . build/azure-pipelines/win32/exec.ps1
       $ErrorActionPreference = "Stop"
-      exec { npm config set registry "$env:NPM_REGISTRY" --location=project }
-      # npm >v7 deprecated the `always-auth` config option, refs npm/cli@72a7eeb
-      # following is a workaround for yarn to send authorization header
-      # for GET requests to the registry.
-      exec { Add-Content -Path .npmrc -Value "always-auth=true" }
-      exec { yarn config set registry "$env:NPM_REGISTRY" }
+      # Set the private NPM registry to the global npmrc file
+      # so that authentication works for subfolders like build/, remote/, extensions/ etc
+      # which does not have their own .npmrc file
+      exec { npm config set registry "$env:NPM_REGISTRY" }
+      $NpmrcPath = (npm config get userconfig)
+      echo "##vso[task.setvariable variable=NPMRC_PATH]$NpmrcPath"
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
-    displayName: Setup NPM & Yarn
+    displayName: Setup NPM
 
   - task: npmAuthenticate@0
     inputs:
-      workingFile: .npmrc
+      workingFile: $(NPMRC_PATH)
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Authentication
 
@@ -93,7 +93,7 @@ steps:
       . build/azure-pipelines/win32/exec.ps1
       . build/azure-pipelines/win32/retry.ps1
       $ErrorActionPreference = "Stop"
-      retry { exec { yarn --frozen-lockfile --check-files } }
+      retry { exec { npm ci } }
     env:
       npm_config_arch: $(VSCODE_ARCH)
       CHILD_CONCURRENCY: 1
@@ -129,7 +129,7 @@ steps:
       retryCountOnTaskFailure: 3
 
   - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-    - powershell: yarn gulp "transpile-client-swc" "transpile-extensions"
+    - powershell: npm run gulp "transpile-client-swc" "transpile-extensions"
       env:
         GITHUB_TOKEN: "$(github-distro-mixin-password)"
       displayName: Transpile client and extensions
@@ -142,8 +142,8 @@ steps:
     - powershell: |
         . build/azure-pipelines/win32/exec.ps1
         $ErrorActionPreference = "Stop"
-        exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-min-ci" }
-        exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-inno-updater" }
+        exec { npm run gulp "vscode-win32-$(VSCODE_ARCH)-min-ci" }
+        exec { npm run gulp "vscode-win32-$(VSCODE_ARCH)-inno-updater" }
         echo "##vso[task.setvariable variable=BUILT_CLIENT]true"
         echo "##vso[task.setvariable variable=CodeSigningFolderPath]$(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH)"
       env:
@@ -153,25 +153,23 @@ steps:
     - powershell: |
         . build/azure-pipelines/win32/exec.ps1
         $ErrorActionPreference = "Stop"
-        exec { yarn gulp "vscode-reh-win32-$(VSCODE_ARCH)-min-ci" }
+        exec { npm run gulp "vscode-reh-win32-$(VSCODE_ARCH)-min-ci" }
         mv ..\vscode-reh-win32-$(VSCODE_ARCH) ..\vscode-server-win32-$(VSCODE_ARCH) # TODO@joaomoreno
         echo "##vso[task.setvariable variable=BUILT_SERVER]true"
         echo "##vso[task.setvariable variable=CodeSigningFolderPath]$(CodeSigningFolderPath),$(agent.builddirectory)/vscode-server-win32-$(VSCODE_ARCH)"
       env:
         GITHUB_TOKEN: "$(github-distro-mixin-password)"
       displayName: Build server
-      condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64'))
 
     - powershell: |
         . build/azure-pipelines/win32/exec.ps1
         $ErrorActionPreference = "Stop"
-        exec { yarn gulp "vscode-reh-web-win32-$(VSCODE_ARCH)-min-ci" }
+        exec { npm run gulp "vscode-reh-web-win32-$(VSCODE_ARCH)-min-ci" }
         mv ..\vscode-reh-web-win32-$(VSCODE_ARCH) ..\vscode-server-win32-$(VSCODE_ARCH)-web # TODO@joaomoreno
         echo "##vso[task.setvariable variable=BUILT_WEB]true"
       env:
         GITHUB_TOKEN: "$(github-distro-mixin-password)"
       displayName: Build server (web)
-      condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64'))
 
   - ${{ if or(eq(parameters.VSCODE_RUN_UNIT_TESTS, true), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}:
     - template: product-build-win32-test.yml@self
@@ -273,7 +271,7 @@ steps:
           $env:ESRPPKI = "$(ESRP-PKI)"
           $env:ESRPAADUsername = "$(esrp-aad-username)"
           $env:ESRPAADPassword = "$(esrp-aad-password)"
-          exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-system-setup" --sign }
+          exec { npm run -- gulp "vscode-win32-$(VSCODE_ARCH)-system-setup" --sign }
           $SetupPath = ".build\win32-$(VSCODE_ARCH)\system-setup\VSCodeSetup-$(VSCODE_ARCH)-$(VSCODE_VERSION).exe"
           mv .build\win32-$(VSCODE_ARCH)\system-setup\VSCodeSetup.exe $SetupPath
           echo "##vso[task.setvariable variable=SYSTEM_SETUP_PATH]$SetupPath"
@@ -285,7 +283,7 @@ steps:
           $env:ESRPPKI = "$(ESRP-PKI)"
           $env:ESRPAADUsername = "$(esrp-aad-username)"
           $env:ESRPAADPassword = "$(esrp-aad-password)"
-          exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-user-setup" --sign }
+          exec { npm run -- gulp "vscode-win32-$(VSCODE_ARCH)-user-setup" --sign }
           $SetupPath = ".build\win32-$(VSCODE_ARCH)\user-setup\VSCodeUserSetup-$(VSCODE_ARCH)-$(VSCODE_VERSION).exe"
           mv .build\win32-$(VSCODE_ARCH)\user-setup\VSCodeSetup.exe $SetupPath
           echo "##vso[task.setvariable variable=USER_SETUP_PATH]$SetupPath"
@@ -312,7 +310,7 @@ steps:
           sbomBuildDropPath: $(Agent.BuildDirectory)/vscode-server-win32-$(VSCODE_ARCH)
           sbomPackageName: "VS Code Windows $(VSCODE_ARCH) Server"
           sbomPackageVersion: $(Build.SourceVersion)
-        condition: and(succeededOrFailed(), ne(variables['SERVER_PATH'], ''), ne(variables['VSCODE_ARCH'], 'arm64'))
+        condition: and(succeededOrFailed(), ne(variables['SERVER_PATH'], ''))
         displayName: Publish server archive
 
       - task: 1ES.PublishPipelineArtifact@1
@@ -322,7 +320,7 @@ steps:
           sbomBuildDropPath: $(Agent.BuildDirectory)/vscode-server-win32-$(VSCODE_ARCH)-web
           sbomPackageName: "VS Code Windows $(VSCODE_ARCH) Web"
           sbomPackageVersion: $(Build.SourceVersion)
-        condition: and(succeededOrFailed(), ne(variables['WEB_PATH'], ''), ne(variables['VSCODE_ARCH'], 'arm64'))
+        condition: and(succeededOrFailed(), ne(variables['WEB_PATH'], ''))
         displayName: Publish web server archive
 
       - task: 1ES.PublishPipelineArtifact@1
diff --git a/build/azure-pipelines/win32/sdl-scan-win32.yml b/build/azure-pipelines/win32/sdl-scan-win32.yml
new file mode 100644
index 00000000000..fc40b9a0e60
--- /dev/null
+++ b/build/azure-pipelines/win32/sdl-scan-win32.yml
@@ -0,0 +1,162 @@
+parameters:
+  - name: VSCODE_ARCH
+    type: string
+  - name: VSCODE_QUALITY
+    type: string
+
+steps:
+  - task: NodeTool@0
+    inputs:
+      versionSource: fromFile
+      versionFilePath: .nvmrc
+      nodejsMirror: https://github.com/joaomoreno/node-mirror/releases/download
+
+  - task: UsePythonVersion@0
+    inputs:
+      versionSpec: "3.x"
+      addToPath: true
+
+  - template: ../distro/download-distro.yml@self
+
+  - task: AzureKeyVault@2
+    displayName: "Azure Key Vault: Get Secrets"
+    inputs:
+      azureSubscription: "vscode-builds-subscription"
+      KeyVaultName: vscode-build-secrets
+      SecretsFilter: "github-distro-mixin-password"
+
+  - powershell: node build/setup-npm-registry.js $env:NPM_REGISTRY
+    condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
+    displayName: Setup NPM Registry
+
+  - powershell: |
+      . build/azure-pipelines/win32/exec.ps1
+      $ErrorActionPreference = "Stop"
+      # Set the private NPM registry to the global npmrc file
+      # so that authentication works for subfolders like build/, remote/, extensions/ etc
+      # which does not have their own .npmrc file
+      exec { npm config set registry "$env:NPM_REGISTRY" }
+      $NpmrcPath = (npm config get userconfig)
+      echo "##vso[task.setvariable variable=NPMRC_PATH]$NpmrcPath"
+    condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
+    displayName: Setup NPM
+
+  - task: npmAuthenticate@0
+    inputs:
+      workingFile: $(NPMRC_PATH)
+    condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
+    displayName: Setup NPM Authentication
+
+  - pwsh: |
+      $includes = @'
+        {
+          'target_defaults': {
+            'conditions': [
+              ['OS=="win"', {
+                'msvs_settings': {
+                  'VCCLCompilerTool': {
+                    'AdditionalOptions': [
+                      '/Zi',
+                      '/FS'
+                    ],
+                  },
+                  'VCLinkerTool': {
+                    'AdditionalOptions': [
+                      '/profile'
+                    ]
+                  }
+                }
+              }]
+            ]
+          }
+        }
+      '@
+
+      if (!(Test-Path "~/.gyp")) {
+        mkdir "~/.gyp"
+      }
+      echo $includes > "~/.gyp/include.gypi"
+    displayName: Create include.gypi
+
+  - powershell: |
+      . build/azure-pipelines/win32/exec.ps1
+      . build/azure-pipelines/win32/retry.ps1
+      $ErrorActionPreference = "Stop"
+      retry { exec { npm ci } }
+    env:
+      npm_config_arch: ${{ parameters.VSCODE_ARCH }}
+      CHILD_CONCURRENCY: 1
+      ELECTRON_SKIP_BINARY_DOWNLOAD: 1
+      PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
+      GITHUB_TOKEN: "$(github-distro-mixin-password)"
+    displayName: Install dependencies
+
+  - script: node build/azure-pipelines/distro/mixin-npm
+    displayName: Mixin distro node modules
+
+  - script: node build/azure-pipelines/distro/mixin-quality
+    displayName: Mixin distro quality
+    env:
+      VSCODE_QUALITY: ${{ parameters.VSCODE_QUALITY }}
+
+  - powershell: npm run compile
+    displayName: Compile
+
+  - powershell: |
+      Get-ChildItem '$(Build.SourcesDirectory)' -Recurse -Filter "*.exe"
+      Get-ChildItem '$(Build.SourcesDirectory)' -Recurse -Filter "*.dll"
+      Get-ChildItem '$(Build.SourcesDirectory)' -Recurse -Filter "*.node"
+      Get-ChildItem '$(Build.SourcesDirectory)' -Recurse -Filter "*.pdb"
+    displayName: List files
+
+  - powershell: npm run gulp "vscode-symbols-win32-${{ parameters.VSCODE_ARCH }}"
+    env:
+      GITHUB_TOKEN: "$(github-distro-mixin-password)"
+    displayName: Download Symbols
+
+  - powershell: |
+      Get-ChildItem '$(Agent.BuildDirectory)\scanbin' -Recurse -Filter "*.exe"
+      Get-ChildItem '$(Agent.BuildDirectory)\scanbin' -Recurse -Filter "*.dll"
+      Get-ChildItem '$(Agent.BuildDirectory)\scanbin' -Recurse -Filter "*.node"
+      Get-ChildItem '$(Agent.BuildDirectory)\scanbin' -Recurse -Filter "*.pdb"
+    displayName: List files again
+
+  - task: BinSkim@4
+    inputs:
+      InputType: "Basic"
+      Function: "analyze"
+      TargetPattern: "guardianGlob"
+      AnalyzeIgnorePdbLoadError: true
+      AnalyzeTargetGlob: '$(Agent.BuildDirectory)\scanbin\**.dll;$(Agent.BuildDirectory)\scanbin\**.exe;$(Agent.BuildDirectory)\scanbin\**.node'
+      AnalyzeLocalSymbolDirectories: '$(Agent.BuildDirectory)\scanbin\VSCode-win32-${{ parameters.VSCODE_ARCH }}\pdb'
+
+  - task: CopyFiles@2
+    displayName: 'Collect Symbols for API Scan'
+    inputs:
+      SourceFolder: $(Agent.BuildDirectory)
+      Contents: 'scanbin\**\*.pdb'
+      TargetFolder: '$(Agent.BuildDirectory)\symbols'
+      flattenFolders: true
+    condition: succeeded()
+
+  - task: APIScan@2
+    inputs:
+      softwareFolder: $(Agent.BuildDirectory)\scanbin
+      softwareName: 'vscode-client'
+      softwareVersionNum: '1'
+      symbolsFolder: 'srv*https://symweb.azurefd.net;$(Agent.BuildDirectory)\symbols'
+      isLargeApp: false
+      toolVersion: 'Latest'
+      azureSubscription: 'vscode-apiscan'
+    displayName: Run ApiScan
+    condition: succeeded()
+    env:
+      AzureServicesAuthConnectionString: $(apiscan-connectionstring)
+      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+
+  - task: PublishSecurityAnalysisLogs@3
+    inputs:
+      ArtifactName: CodeAnalysisLogs
+      ArtifactType: Container
+      PublishProcessedResults: false
+      AllTools: true
diff --git a/build/buildfile.js b/build/buildfile.js
new file mode 100644
index 00000000000..d49a5394cad
--- /dev/null
+++ b/build/buildfile.js
@@ -0,0 +1,68 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/**
+ * @param {string} name
+ * @param {string[]=} exclude
+ * @returns {import('./lib/bundle').IEntryPoint}
+ */
+function createModuleDescription(name, exclude) {
+
+	let excludes = ['vs/css'];
+	if (Array.isArray(exclude) && exclude.length > 0) {
+		excludes = excludes.concat(exclude);
+	}
+
+	return {
+		name,
+		include: [],
+		exclude: excludes
+	};
+}
+
+/**
+ * @param {string} name
+ */
+function createEditorWorkerModuleDescription(name) {
+	return createModuleDescription(name, ['vs/base/common/worker/simpleWorker', 'vs/editor/common/services/editorSimpleWorker']);
+}
+
+exports.workerEditor = createEditorWorkerModuleDescription('vs/editor/common/services/editorSimpleWorkerMain');
+exports.workerExtensionHost = createEditorWorkerModuleDescription('vs/workbench/api/worker/extensionHostWorkerMain');
+exports.workerNotebook = createEditorWorkerModuleDescription('vs/workbench/contrib/notebook/common/services/notebookSimpleWorkerMain');
+exports.workerLanguageDetection = createEditorWorkerModuleDescription('vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorkerMain');
+exports.workerLocalFileSearch = createEditorWorkerModuleDescription('vs/workbench/services/search/worker/localFileSearchMain');
+exports.workerProfileAnalysis = createEditorWorkerModuleDescription('vs/platform/profiling/electron-sandbox/profileAnalysisWorkerMain');
+exports.workerOutputLinks = createEditorWorkerModuleDescription('vs/workbench/contrib/output/common/outputLinkComputerMain');
+exports.workerBackgroundTokenization = createEditorWorkerModuleDescription('vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.workerMain');
+
+exports.workbenchDesktop = [
+	createModuleDescription('vs/workbench/contrib/debug/node/telemetryApp'),
+	createModuleDescription('vs/platform/files/node/watcher/watcherMain'),
+	createModuleDescription('vs/platform/terminal/node/ptyHostMain'),
+	createModuleDescription('vs/workbench/api/node/extensionHostProcess'),
+	createModuleDescription('vs/workbench/contrib/issue/electron-sandbox/issueReporterMain'),
+	createModuleDescription('vs/workbench/workbench.desktop.main')
+];
+
+exports.workbenchWeb = createModuleDescription('vs/workbench/workbench.web.main');
+
+exports.keyboardMaps = [
+	createModuleDescription('vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.linux'),
+	createModuleDescription('vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.darwin'),
+	createModuleDescription('vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.win')
+];
+
+exports.code = [
+	// 'vs/code/electron-main/main' is not included here because it comes in via ./src/main.js
+	// 'vs/code/node/cli' is not included here because it comes in via ./src/cli.js
+	createModuleDescription('vs/code/node/cliProcessMain'),
+	createModuleDescription('vs/code/electron-utility/sharedProcess/sharedProcessMain'),
+	createModuleDescription('vs/code/electron-sandbox/processExplorer/processExplorerMain')
+];
+
+exports.codeWeb = createModuleDescription('vs/code/browser/workbench/workbench');
+
+exports.entrypoint = createModuleDescription;
diff --git a/build/checksums/electron.txt b/build/checksums/electron.txt
index a80aa1531f1..53654213809 100644
--- a/build/checksums/electron.txt
+++ b/build/checksums/electron.txt
@@ -1,75 +1,75 @@
-3d3d8bb185d7b63b0db910661fdd69d6381afb8c97742bbd2526a9c932e1f8ca *chromedriver-v29.4.0-darwin-arm64.zip
-c3d075943d87604ffa50382cc8d5798485349544ca391cab88c892f889d3b14c *chromedriver-v29.4.0-darwin-x64.zip
-6d62d2dba55e4419fa003d45f93dad1324ec29a4d3eb84fd9fd5fd7a64339389 *chromedriver-v29.4.0-linux-arm64.zip
-81bb3d362331c7296f700b1b0e8f07c4c7739b1151f698cd56af927bedda59e7 *chromedriver-v29.4.0-linux-armv7l.zip
-ab593cc39aefac8c5abd259e31f6add4b2b70c52231724a6c08ac1872b4a0edf *chromedriver-v29.4.0-linux-x64.zip
-705d42ccc05b2c48b0673b9dcf63eb78772bb79dba078a523d384ed2481bc9c0 *chromedriver-v29.4.0-mas-arm64.zip
-956a7caa28eeeb0c02eb7638a53215ffd89b4f12880f0893ff10f497ca1a8117 *chromedriver-v29.4.0-mas-x64.zip
-1f070176aa33e0139d61a3d758fd2f015f09bb275577293fe93564749b6310ba *chromedriver-v29.4.0-win32-arm64.zip
-38a71526d243bcb73c28cb648bd4816d70b5e643df52f9f86a83416014589744 *chromedriver-v29.4.0-win32-ia32.zip
-f90750d3589cb3c9f6f0ebc70d5e025cf81c382e8c23fa47a54570696a478ef0 *chromedriver-v29.4.0-win32-x64.zip
-05dffc90dd1341cc7a6b50127985e4e217fef7f50a173c7d0ff34039dd2d81b6 *electron-api.json
-7f63f7cf675ba6dec3a5e4173d729bd53c75f81e612f809641d9d0c4d9791649 *electron-v29.4.0-darwin-arm64-dsym-snapshot.zip
-aa29530fcafa4db364978d4f414a6ec2005ea695f7fee70ffbe5e114e9e453f0 *electron-v29.4.0-darwin-arm64-dsym.zip
-8d12fb6d9bcdf5bbfc93dbcd1cac348735dc6f98aa450ee03ec7837a01a8a938 *electron-v29.4.0-darwin-arm64-symbols.zip
-c16d05f1231bb3c77da05ab236b454b3a2b6a642403be51e7c9b16cd2c421a19 *electron-v29.4.0-darwin-arm64.zip
-2dfc1017831ab2f6e9ddb575d3b9cff5a0d56f16a335a3c0df508e964e2db963 *electron-v29.4.0-darwin-x64-dsym-snapshot.zip
-025de6aa39d98762928e1b700f46177e74be20101b27457659b938e2c69db326 *electron-v29.4.0-darwin-x64-dsym.zip
-ec4eb0a618207233985ceaab297be34b3d4f0813d88801d5637295b238dd661a *electron-v29.4.0-darwin-x64-symbols.zip
-8ed7924f77a5c43c137a57097c5c47c2e8e9a78197e18af11a767c98035c123e *electron-v29.4.0-darwin-x64.zip
-bde1772fa8ac4850e108012a9edd3bd93472bad8f68ddd55fca355dad81dde4f *electron-v29.4.0-linux-arm64-debug.zip
-dfe7852a7423196efb2205c788d942db3ffc9de6ce52577e173bcf7ca6973d48 *electron-v29.4.0-linux-arm64-symbols.zip
-c3764d6c3799950e3418e8e5a5a5b2c41abe421dd8bcdebf054c7c85798d9860 *electron-v29.4.0-linux-arm64.zip
-bde1772fa8ac4850e108012a9edd3bd93472bad8f68ddd55fca355dad81dde4f *electron-v29.4.0-linux-armv7l-debug.zip
-360668ba669cb2c01c2f960cdee76c29670e6ce907ccc0718e971a04af594ce9 *electron-v29.4.0-linux-armv7l-symbols.zip
-c5e92943ad78b4e41a32ae53c679e148ea2ae09f95f914b1834dbdbae578ba91 *electron-v29.4.0-linux-armv7l.zip
-375be885426bcbd272bd068bfcef41a83296c2f8e61e633233d2a9e9a69242fc *electron-v29.4.0-linux-x64-debug.zip
-847e0f75624616c2918b33de2eefeec63419bd250685610d3f52fa115527d2b9 *electron-v29.4.0-linux-x64-symbols.zip
-91e5eb374c2c85a07c2d4e99a89eb18515ff0169a49c3fa75289800e1225729e *electron-v29.4.0-linux-x64.zip
-098f973537c3d9679a69409d0b84bcc1a6113bb2002ee60068e2c22f335a3855 *electron-v29.4.0-mas-arm64-dsym-snapshot.zip
-2724aa32eb441eea21680d95fc1efdd75ac473fa19623c7acf3d546419e96154 *electron-v29.4.0-mas-arm64-dsym.zip
-98dd81914752a57da4cbaad1f0aa94b16335f9b8f997be9aa049be90b96b2886 *electron-v29.4.0-mas-arm64-symbols.zip
-fd2663f65c1f995304e3eb65870b7146adfefef07cf82bf44de75855fd4f36e8 *electron-v29.4.0-mas-arm64.zip
-237983b2169e69bb73aa0987e871e3e486755904b71ebe36c3e902377f92754a *electron-v29.4.0-mas-x64-dsym-snapshot.zip
-a5d59599827d32ef322b99eee8416e39235f4c7a0ada78342a885665e0b732dd *electron-v29.4.0-mas-x64-dsym.zip
-5182e7697ac0591e0b95c33f70316af24093c9100f442be2cee0039660e959ac *electron-v29.4.0-mas-x64-symbols.zip
-e0ee7057aff0240a70b9ed75ff44d55aeae9af67fbc8915f741711a8bb6fe744 *electron-v29.4.0-mas-x64.zip
-2802872dfc6de0f0e2e8cef9d2f4f384e3d82b20ad36fc981c4e725dd2f2abcd *electron-v29.4.0-win32-arm64-pdb.zip
-d49c954dc25ae9e4c75e61af80b9718014c52f016f43a29071913f0e7100c7bd *electron-v29.4.0-win32-arm64-symbols.zip
-c9f31ae6408aa6936b5d683eda601773789185890375cd097e61e924d4fed77a *electron-v29.4.0-win32-arm64-toolchain-profile.zip
-483d692efbe4fb1231ff63afb8a236b2e22b486fbe5ac6abbc8b208abf94a4d3 *electron-v29.4.0-win32-arm64.zip
-98458f49ba67a08e473d475a68a2818d9df076a5246fbc9b45403e8796f9d35b *electron-v29.4.0-win32-ia32-pdb.zip
-69d505d4ae59d9dddf83c4e530e45dd7c5bc64d6da90cf4f851e523be9e51014 *electron-v29.4.0-win32-ia32-symbols.zip
-c9f31ae6408aa6936b5d683eda601773789185890375cd097e61e924d4fed77a *electron-v29.4.0-win32-ia32-toolchain-profile.zip
-d5a21a17a64e9638f49f057356af23b51f56bd6a7fea3c2e0a28ff3186a7bc41 *electron-v29.4.0-win32-ia32.zip
-521ee7b3398c4dc395b43dac86cd099e86a6123de2b43636ee805b7da014ed3f *electron-v29.4.0-win32-x64-pdb.zip
-e33848ebd6c6e4ce431aa367bef887050947a136e883677cfc524ca5cabc1e98 *electron-v29.4.0-win32-x64-symbols.zip
-c9f31ae6408aa6936b5d683eda601773789185890375cd097e61e924d4fed77a *electron-v29.4.0-win32-x64-toolchain-profile.zip
-e4ef85aa3608221f8a3e011c1b1c2d2d36093ad19bda12d16b3816929fb6c99b *electron-v29.4.0-win32-x64.zip
-707ee08593289ee83514b4fc55123611309f995788f38a5ec03e285741aac1c8 *electron.d.ts
-281b5f4a49de55fdb86b1662530f07f2ced1252c878eb7a941c88ede545339e0 *ffmpeg-v29.4.0-darwin-arm64.zip
-0b735912df9b2ff3d03eb23942e03bc0116d82f1291d0a45cbde14177c2f3066 *ffmpeg-v29.4.0-darwin-x64.zip
-4e2ba537d7c131abbd34168bce2c28cc9ef6262b217d5f4085afccfdf9635da6 *ffmpeg-v29.4.0-linux-arm64.zip
-4aa56ad5d849f4e61af22678a179346b68aec9100282e1b8a43df25d95721677 *ffmpeg-v29.4.0-linux-armv7l.zip
-0558e6e1f78229d303e16d4d8c290794baa9adc619fdd2ddccadb3ea241a1df4 *ffmpeg-v29.4.0-linux-x64.zip
-224f15d8f96c75348cd7f1b85c4eab63468fae1e50ff4b1381e08011cf76e4f7 *ffmpeg-v29.4.0-mas-arm64.zip
-175ec79f0dc4c5966d9a0ca6ec1674106340ecc64503585c12c2f854249af06f *ffmpeg-v29.4.0-mas-x64.zip
-5fa13744b87fef1bfd24a37513677f446143e085504541f8ce97466803bd1893 *ffmpeg-v29.4.0-win32-arm64.zip
-d7ba316bb7e13025c9db29e0acafebb540b7716c9f111e469733615d8521186a *ffmpeg-v29.4.0-win32-ia32.zip
-35c70a28bcfd4f0b1f8c985d3d1348936bd60767d231ce28ba38f3daeeef64bb *ffmpeg-v29.4.0-win32-x64.zip
-8c7228ea0ecab25a1f7fcd1ba9680684d19f9671a497113d71a851a53867b048 *hunspell_dictionaries.zip
-7552547c8d585b9bc43518d239d7ce3ad7c5cad0346b07cdcfc1eab638b2b794 *libcxx-objects-v29.4.0-linux-arm64.zip
-76054a779d4845ad752b625213ce8990f08dcc5b89aa20660dd4f2e817ba30a8 *libcxx-objects-v29.4.0-linux-armv7l.zip
-761c317a9c874bd3d1118d0ecad33c4be23727f538cfbb42a08dd87c68da6039 *libcxx-objects-v29.4.0-linux-x64.zip
-f98f9972cc30200b8e05815f5a9cd5cec04bdeee0e48ae2143cdaeff5db9d71d *libcxx_headers.zip
-f0b0dd2be579baaf97901322ef489d03fae69a0b8524ea77b24fb3c896f73dd9 *libcxxabi_headers.zip
-5da864ea23d70538298a40e0d037a5a461a6b74984e72fd4f0cd20904bccaed1 *mksnapshot-v29.4.0-darwin-arm64.zip
-bde97bd7c69209ed6bf4cf1cdf7de622e3a9f50fe6b4dc4b5618eee868f47c62 *mksnapshot-v29.4.0-darwin-x64.zip
-a3df9b9e6ef14efe5827d0256d8ecaebe6d8be130cfc3faac0dea76eb53b9b11 *mksnapshot-v29.4.0-linux-arm64-x64.zip
-648b9dbca21194d663ddb706e6086a166e691263c764c80f836ae02c27e3657a *mksnapshot-v29.4.0-linux-armv7l-x64.zip
-e7a4201cda3956380facc2b5b9d0b1020cc5e654fba44129fc7429a982411cc1 *mksnapshot-v29.4.0-linux-x64.zip
-ffb44c45733675e0378f45fce25dafa95697d0c86179f8e46742ada16bc11aa1 *mksnapshot-v29.4.0-mas-arm64.zip
-0242da3ca193206e56b88eb108502244bae35dcc587210bd0a32d9fa4cb71041 *mksnapshot-v29.4.0-mas-x64.zip
-1445806dca6effbc60072bbde7997cefb62bdb7a9e295a090d26f27c3882685f *mksnapshot-v29.4.0-win32-arm64-x64.zip
-09599adc3afb0a13ae87fc4b8ab97c729fe3689faa6a4f5f7a4a3cf0d9cc49d3 *mksnapshot-v29.4.0-win32-ia32.zip
-84f80683d95665d29284386509bb104e840ff0b797bfbbd19da86b84d370aa49 *mksnapshot-v29.4.0-win32-x64.zip
+3de7da4462c7690f75680aecac8fddedc4b998d0da769136d8eff2932b36004e *chromedriver-v30.5.1-darwin-arm64.zip
+d89b89f7c2ba45cb10df7fc23722bacf6f77e13002c42648762cd18ae3fa9182 *chromedriver-v30.5.1-darwin-x64.zip
+3722d46929fd2c7b33c17d37464a08150e60d9269053eb67195795254fb5e947 *chromedriver-v30.5.1-linux-arm64.zip
+a786d51f834c24b768bd415bf9a2fc5c1d9abdf9dc0b1a091bf9a8ff101becfe *chromedriver-v30.5.1-linux-armv7l.zip
+688e4da8dbcb7dbfacab6f29341d96736e6d06e4c8029835b83ef30b69885b01 *chromedriver-v30.5.1-linux-x64.zip
+786a7c2659ad97d5a09866b9aafd55edc015cb17a87bd8d72aa5925f2bfcf55a *chromedriver-v30.5.1-mas-arm64.zip
+398759d1dc02fc4928d48ff0f8fbade8811347e1a51d1cedcb2ba9350fbed04d *chromedriver-v30.5.1-mas-x64.zip
+65766f1270d1876e2a81acfb4b1130dc4a41eb7165842afa8f41ea438bf2fecb *chromedriver-v30.5.1-win32-arm64.zip
+ca9fe0abd1032ebd51497049cb1bb2ae1dd9592697b278f6b1ee2a1a25148891 *chromedriver-v30.5.1-win32-ia32.zip
+b6b6ea2202e0139ea436288add736d19078bfb190fc0b22937283927f3024bb9 *chromedriver-v30.5.1-win32-x64.zip
+50e8b2d59916bc180873324fdbeb8227dbb8b2375cc936e58b7c9885fb23376d *electron-api.json
+595db4fa3f755432bf59cbbaf591ee44b576e15952d014d83d3748646b2e338c *electron-v30.5.1-darwin-arm64-dsym-snapshot.zip
+c1beb80553f3c9575e638625ce0ffbfdb87b6f8b23799eb132954b2bb74a9a2f *electron-v30.5.1-darwin-arm64-dsym.zip
+cba315d6d6f607a2ee6cfc437b46f92da88daded86f0130d85129adb4742bc48 *electron-v30.5.1-darwin-arm64-symbols.zip
+d312544ea29844cf328b44b9dbde12f4fdced90cb442dfca6df36c098dbb6e7a *electron-v30.5.1-darwin-arm64.zip
+fd24d585d28909c082d703db3fcc5ffa0b55e1077ff320e25ed510f36e6a3761 *electron-v30.5.1-darwin-x64-dsym-snapshot.zip
+4d1a2adea4b98c4d0b03c6561fca146aab102d636d359e48ce418c465df891ae *electron-v30.5.1-darwin-x64-dsym.zip
+d9065eaf659f4c3e8a75f5453ceb65269763b2e57110bdcc01904b9a1e33a62c *electron-v30.5.1-darwin-x64-symbols.zip
+faf9dcc20d525607ea205f2f6a1dfe3270f6268aa439bb0ba5646c7e4fbbd842 *electron-v30.5.1-darwin-x64.zip
+b85dba1cdb49591542dcecff3e710f29b81285569c8c5db8c1181c3ed818ba44 *electron-v30.5.1-linux-arm64-debug.zip
+5e97cc105282783d1c20d8e8dd4ca1134342839235288840cb50f314ca7a6ede *electron-v30.5.1-linux-arm64-symbols.zip
+eb31470c0d7cd6e23e7ce0d89cc93a2356c9dac8bcc997e335353b8aa995afa0 *electron-v30.5.1-linux-arm64.zip
+b85dba1cdb49591542dcecff3e710f29b81285569c8c5db8c1181c3ed818ba44 *electron-v30.5.1-linux-armv7l-debug.zip
+137548cd73cd648107f6e01c777e411838173309848a492b42825857cec7d110 *electron-v30.5.1-linux-armv7l-symbols.zip
+224bd46983e503101c756c72d10b195f14712a7a56438718acb126017dd04edf *electron-v30.5.1-linux-armv7l.zip
+1f87fadebc444c9c0de43f52972a3f61af83ca0594c3de368f7579ce613fcb60 *electron-v30.5.1-linux-x64-debug.zip
+aae78654f599a68310bdbdc0e3de8db644320ef44e58a5c6e5c693dff5cd1970 *electron-v30.5.1-linux-x64-symbols.zip
+ec4707783d39e86005f42899e30ae59e50dd5d9c7f28531ed494eb43f2361403 *electron-v30.5.1-linux-x64.zip
+c61f3121e52fd29987814b7805b597ef3fc78b2ce891eba5e3fc6bbe14128f23 *electron-v30.5.1-mas-arm64-dsym-snapshot.zip
+f934e55ef6c986d3ec56626b2605fed16030efc45efcd8b05afa9322d625ec56 *electron-v30.5.1-mas-arm64-dsym.zip
+3cc36e99f2cd59d7cb2f47b52d19609c2a2358f6ddde35fd832872abe241cc8d *electron-v30.5.1-mas-arm64-symbols.zip
+c5085ab1fb74dfa4a4e463dcb688989bc63baf44007419fd96db4e7c974fb6db *electron-v30.5.1-mas-arm64.zip
+47102b6dcd5892de734be2b48e40bbbdbc5e0a228bf5fec33071661d2724d946 *electron-v30.5.1-mas-x64-dsym-snapshot.zip
+607091ddfd313ed27bb5a0acb6fa58b0d65cb87e6c6ce9b373949b4b152476d8 *electron-v30.5.1-mas-x64-dsym.zip
+ac49568635d41e1075bca39c97aca1f2fcede702f721ddce5d80f18cc2dd1067 *electron-v30.5.1-mas-x64-symbols.zip
+3746bc4ba32ab9c11398a393d54ba81733088729ae7cef4e5dccf1e64dc82b0a *electron-v30.5.1-mas-x64.zip
+930ad941c8bc0aa5e4e3457b235f104846939974d71bde5b42a8980de2d4a35d *electron-v30.5.1-win32-arm64-pdb.zip
+11c1252547b381ab6e40cc032ee60c5209dee9ea1102d1b47ad3fcd4da03049f *electron-v30.5.1-win32-arm64-symbols.zip
+7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v30.5.1-win32-arm64-toolchain-profile.zip
+f18baa98ba9c04b346fda9f40fc3150a57b539d0cd510971a073983f78e0a20c *electron-v30.5.1-win32-arm64.zip
+b03c7297dc61aa234ab2273c419d9ae064e52c2c0c3dd56f09135f81964630b5 *electron-v30.5.1-win32-ia32-pdb.zip
+8fc570c7f4d97eb6b745fb4af5932311d1da57058da8f39a3d97d6e099cd6982 *electron-v30.5.1-win32-ia32-symbols.zip
+7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v30.5.1-win32-ia32-toolchain-profile.zip
+20845163bf9d5a4ead03c5f0280c9bae71f0ab1fc03362f3406ed12620e4d9cd *electron-v30.5.1-win32-ia32.zip
+019f3ae97a69dc837d89c44d25e0e5dadc88564b74202c5a3524fc6ab59490bc *electron-v30.5.1-win32-x64-pdb.zip
+2eb4889fe275e5ea42cf6f51821bcceb833d5714aa1b45ad7915495afb447e94 *electron-v30.5.1-win32-x64-symbols.zip
+7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v30.5.1-win32-x64-toolchain-profile.zip
+443119bb559fc2ca297a57cf79f2bce532e853ada070c1e71460c9657c13b4b3 *electron-v30.5.1-win32-x64.zip
+deecdc1f3f5ea9548ef73774f412c7af489afeb7dca1c394b5add10e929aff42 *electron.d.ts
+14319b51118a5c94e108731f6b5c4e701c700212e790198ba22242eb9674a334 *ffmpeg-v30.5.1-darwin-arm64.zip
+bfd5110457438fa8b113a8806db45f30b8975304d95e5efb1b71b0f5e46757fe *ffmpeg-v30.5.1-darwin-x64.zip
+44ebf3185fc24404647da0c1f9e496effefd32ff3dbc2499c022164b919d06ed *ffmpeg-v30.5.1-linux-arm64.zip
+4f7583513d48b48c44a2cbc4430cbc9a33d8f9728622166db688e3de61190821 *ffmpeg-v30.5.1-linux-armv7l.zip
+154900e5db5810f63e38fd4551cfff3d88d6eac39226e06e12e1e43558d360a4 *ffmpeg-v30.5.1-linux-x64.zip
+14319b51118a5c94e108731f6b5c4e701c700212e790198ba22242eb9674a334 *ffmpeg-v30.5.1-mas-arm64.zip
+bfd5110457438fa8b113a8806db45f30b8975304d95e5efb1b71b0f5e46757fe *ffmpeg-v30.5.1-mas-x64.zip
+f2169c4b6b9f073c20652953599f2453947936e851ff25c9f2719e7d889faea3 *ffmpeg-v30.5.1-win32-arm64.zip
+90745f1422ae0431b295cb5d27ff03e69c890f3572ef6c4655774b892419e94f *ffmpeg-v30.5.1-win32-ia32.zip
+567fe8952f17b224d4492980af741b470e86b31d58e7c6a9262258eeae490122 *ffmpeg-v30.5.1-win32-x64.zip
+8bbbadb52a19f074d9f8bd533891e2bacbe4813101ae6c344cfc88e28b1429a3 *hunspell_dictionaries.zip
+61137508aee6837c70a2ead2e31dd106d753ec5fac01b49e7e8701be0e09e7aa *libcxx-objects-v30.5.1-linux-arm64.zip
+3c285f012f256f767e777550a1f18054cfcffc4e13ad6fa4e4e90dd58ec22069 *libcxx-objects-v30.5.1-linux-armv7l.zip
+9b96b53c8dfbc70a0f617f78dde89a1e8510ae2261bcddfbf7c12c61eb5a3d73 *libcxx-objects-v30.5.1-linux-x64.zip
+1b5cbe24d6356a388e166bff60d7452583019ea7dec85f593c552eb287346f43 *libcxx_headers.zip
+eae200a0d1fd0d4b881358bdef600111891c75ecc4db679b680b0cbaf87ecfc3 *libcxxabi_headers.zip
+ed1f7463b5869acf57dd388208918652182b049b2846f572d52ed47e7c091d54 *mksnapshot-v30.5.1-darwin-arm64.zip
+bc80de1f29b869cdb2676d2dc08cbb4bd6228a6825b1b0bfc13acee0b070ac3e *mksnapshot-v30.5.1-darwin-x64.zip
+5e526ca4f4250a9b9b040d6eb60f1d2b8db974ab68c27e46198f4bf8dc1ef347 *mksnapshot-v30.5.1-linux-arm64-x64.zip
+c40ca2a45cc9ab4e1668f063860ba243baef8c192a253638e4c93aaccb0ef8da *mksnapshot-v30.5.1-linux-armv7l-x64.zip
+a3134e0b0980547167dd3ca2f17dd2f40a7db697ab563ba6257534f9ad0d256d *mksnapshot-v30.5.1-linux-x64.zip
+82776eafcb3e4d053e275ad50d84151f41a651986baacda20c6ed722854cb8fb *mksnapshot-v30.5.1-mas-arm64.zip
+9d6d95d4cb121a29fd68d64557edd8c9859345ac37d0645de8aff518391755ed *mksnapshot-v30.5.1-mas-x64.zip
+94b9ce6cb40ae001962b77525d12483c3458776066a69a4e714b327bab1decfc *mksnapshot-v30.5.1-win32-arm64-x64.zip
+4d89d06c2e85b25d52bb64f48258ad5d05b98ac21697ae9c49ccd19bad9d7d94 *mksnapshot-v30.5.1-win32-ia32.zip
+ccfd322bafde0485a0ac6b0acc3669c7b08f30003a1c2e044eebc1bf02289de3 *mksnapshot-v30.5.1-win32-x64.zip
diff --git a/build/checksums/nodejs.txt b/build/checksums/nodejs.txt
index bcc9340406d..3436ff37cc5 100644
--- a/build/checksums/nodejs.txt
+++ b/build/checksums/nodejs.txt
@@ -1,7 +1,7 @@
-e0065c61f340e85106a99c4b54746c5cee09d59b08c5712f67f99e92aa44995d  node-v20.11.1-darwin-arm64.tar.gz
-c52e7fb0709dbe63a4cbe08ac8af3479188692937a7bd8e776e0eedfa33bb848  node-v20.11.1-darwin-x64.tar.gz
-e34ab2fc2726b4abd896bcbff0250e9b2da737cbd9d24267518a802ed0606f3b  node-v20.11.1-linux-arm64.tar.gz
-e42791f76ece283c7a4b97fbf716da72c5128c54a9779f10f03ae74a4bcfb8f6  node-v20.11.1-linux-armv7l.tar.gz
-bf3a779bef19452da90fb88358ec2c57e0d2f882839b20dc6afc297b6aafc0d7  node-v20.11.1-linux-x64.tar.gz
-a5a9d30a8f7d56e00ccb27c1a7d24c8d0bc96a2689ebba8eb7527698793496f1  win-arm64/node.exe
-bc585910690318aaebe3c57669cb83ca9d1e5791efd63195e238f54686e6c2ec  win-x64/node.exe
+fc7355e778b181575153b7dea4879e8021776eeb376c43c50f65893d2ea70aa3  node-v20.16.0-darwin-arm64.tar.gz
+e18942cd706e4d69a4845ddacee2f1c17a72e853a229e3d2623d2edeb7efde72  node-v20.16.0-darwin-x64.tar.gz
+551588f8f5ca05c04efb53f1b2bb7d9834603327bdc82d60a944d385569866e1  node-v20.16.0-linux-arm64.tar.gz
+1c77c52ab507ddee479012f0b4bf523dd8400df4504447d623632353076e2e27  node-v20.16.0-linux-armv7l.tar.gz
+b3f874ea84e440d69ed02ca92429d0eccd17737fde86db69c1c153d16ec654f2  node-v20.16.0-linux-x64.tar.gz
+7e773fba3a19eac5ccbe85c1f87a05d7b112ecf41440076e6b6de1c7bffa0fdf  win-arm64/node.exe
+ba221658a3b68bd583e3068903eb675b5206d86a883c084ed95502e8f634b82a  win-x64/node.exe
diff --git a/build/darwin/create-universal-app.js b/build/darwin/create-universal-app.js
index 7da8e55c908..a3daf1878b0 100644
--- a/build/darwin/create-universal-app.js
+++ b/build/darwin/create-universal-app.js
@@ -6,6 +6,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const fs = require("fs");
+const minimatch = require("minimatch");
 const vscode_universal_bundler_1 = require("vscode-universal-bundler");
 const cross_spawn_promise_1 = require("@malept/cross-spawn-promise");
 const root = path.dirname(path.dirname(__dirname));
@@ -18,26 +19,29 @@ async function main(buildDir) {
     const appName = product.nameLong + '.app';
     const x64AppPath = path.join(buildDir, 'VSCode-darwin-x64', appName);
     const arm64AppPath = path.join(buildDir, 'VSCode-darwin-arm64', appName);
-    const x64AsarPath = path.join(x64AppPath, 'Contents', 'Resources', 'app', 'node_modules.asar');
-    const arm64AsarPath = path.join(arm64AppPath, 'Contents', 'Resources', 'app', 'node_modules.asar');
+    const asarRelativePath = path.join('Contents', 'Resources', 'app', 'node_modules.asar');
     const outAppPath = path.join(buildDir, `VSCode-darwin-${arch}`, appName);
     const productJsonPath = path.resolve(outAppPath, 'Contents', 'Resources', 'app', 'product.json');
+    const filesToSkip = [
+        '**/CodeResources',
+        '**/Credits.rtf',
+    ];
     await (0, vscode_universal_bundler_1.makeUniversalApp)({
         x64AppPath,
         arm64AppPath,
-        x64AsarPath,
-        arm64AsarPath,
-        filesToSkip: [
-            'product.json',
-            'Credits.rtf',
-            'CodeResources',
-            'fsevents.node',
-            'Info.plist', // TODO@deepak1556: regressed with 11.4.2 internal builds
-            'MainMenu.nib', // Generated sequence is not deterministic with Xcode 13
-            '.npmrc'
-        ],
+        asarPath: asarRelativePath,
         outAppPath,
-        force: true
+        force: true,
+        mergeASARs: true,
+        x64ArchFiles: '*/kerberos.node',
+        filesToSkipComparison: (file) => {
+            for (const expected of filesToSkip) {
+                if (minimatch(file, expected)) {
+                    return true;
+                }
+            }
+            return false;
+        }
     });
     const productJson = JSON.parse(fs.readFileSync(productJsonPath, 'utf8'));
     Object.assign(productJson, {
diff --git a/build/darwin/create-universal-app.ts b/build/darwin/create-universal-app.ts
index ffba8952cd8..94b8a23b9e5 100644
--- a/build/darwin/create-universal-app.ts
+++ b/build/darwin/create-universal-app.ts
@@ -5,6 +5,7 @@
 
 import * as path from 'path';
 import * as fs from 'fs';
+import * as minimatch from 'minimatch';
 import { makeUniversalApp } from 'vscode-universal-bundler';
 import { spawn } from '@malept/cross-spawn-promise';
 
@@ -21,27 +22,31 @@ async function main(buildDir?: string) {
 	const appName = product.nameLong + '.app';
 	const x64AppPath = path.join(buildDir, 'VSCode-darwin-x64', appName);
 	const arm64AppPath = path.join(buildDir, 'VSCode-darwin-arm64', appName);
-	const x64AsarPath = path.join(x64AppPath, 'Contents', 'Resources', 'app', 'node_modules.asar');
-	const arm64AsarPath = path.join(arm64AppPath, 'Contents', 'Resources', 'app', 'node_modules.asar');
+	const asarRelativePath = path.join('Contents', 'Resources', 'app', 'node_modules.asar');
 	const outAppPath = path.join(buildDir, `VSCode-darwin-${arch}`, appName);
 	const productJsonPath = path.resolve(outAppPath, 'Contents', 'Resources', 'app', 'product.json');
 
+	const filesToSkip = [
+		'**/CodeResources',
+		'**/Credits.rtf',
+	];
+
 	await makeUniversalApp({
 		x64AppPath,
 		arm64AppPath,
-		x64AsarPath,
-		arm64AsarPath,
-		filesToSkip: [
-			'product.json',
-			'Credits.rtf',
-			'CodeResources',
-			'fsevents.node',
-			'Info.plist', // TODO@deepak1556: regressed with 11.4.2 internal builds
-			'MainMenu.nib', // Generated sequence is not deterministic with Xcode 13
-			'.npmrc'
-		],
+		asarPath: asarRelativePath,
 		outAppPath,
-		force: true
+		force: true,
+		mergeASARs: true,
+		x64ArchFiles: '*/kerberos.node',
+		filesToSkipComparison: (file: string) => {
+			for (const expected of filesToSkip) {
+				if (minimatch(file, expected)) {
+					return true;
+				}
+			}
+			return false;
+		}
 	});
 
 	const productJson = JSON.parse(fs.readFileSync(productJsonPath, 'utf8'));
diff --git a/build/darwin/sign.js b/build/darwin/sign.js
index f5913b73ab8..feb5834ff85 100644
--- a/build/darwin/sign.js
+++ b/build/darwin/sign.js
@@ -10,8 +10,8 @@ const codesign = require("electron-osx-sign");
 const cross_spawn_promise_1 = require("@malept/cross-spawn-promise");
 const root = path.dirname(path.dirname(__dirname));
 function getElectronVersion() {
-    const yarnrc = fs.readFileSync(path.join(root, '.yarnrc'), 'utf8');
-    const target = /^target "(.*)"$/m.exec(yarnrc)[1];
+    const npmrc = fs.readFileSync(path.join(root, '.npmrc'), 'utf8');
+    const target = /^target="(.*)"$/m.exec(npmrc)[1];
     return target;
 }
 async function main(buildDir) {
diff --git a/build/darwin/sign.ts b/build/darwin/sign.ts
index 01e9ebf2d4b..5b3413b79e1 100644
--- a/build/darwin/sign.ts
+++ b/build/darwin/sign.ts
@@ -11,8 +11,8 @@ import { spawn } from '@malept/cross-spawn-promise';
 const root = path.dirname(path.dirname(__dirname));
 
 function getElectronVersion(): string {
-	const yarnrc = fs.readFileSync(path.join(root, '.yarnrc'), 'utf8');
-	const target = /^target "(.*)"$/m.exec(yarnrc)![1];
+	const npmrc = fs.readFileSync(path.join(root, '.npmrc'), 'utf8');
+	const target = /^target="(.*)"$/m.exec(npmrc)![1];
 	return target;
 }
 
diff --git a/build/eslint.js b/build/eslint.js
index 288917b35bf..55e11b277d9 100644
--- a/build/eslint.js
+++ b/build/eslint.js
@@ -8,17 +8,11 @@ const vfs = require('vinyl-fs');
 const { eslintFilter } = require('./filters');
 
 function eslint() {
-	const gulpeslint = require('gulp-eslint');
+	const eslint = require('./gulp-eslint');
 	return vfs
 		.src(eslintFilter, { base: '.', follow: true, allowEmpty: true })
 		.pipe(
-			gulpeslint({
-				configFile: '.eslintrc.json'
-			})
-		)
-		.pipe(gulpeslint.formatEach('compact'))
-		.pipe(
-			gulpeslint.results((results) => {
+			eslint((results) => {
 				if (results.warningCount > 0 || results.errorCount > 0) {
 					throw new Error('eslint failed with warnings and/or errors');
 				}
diff --git a/build/filters.js b/build/filters.js
index c7be2d818d9..4e5049f23f0 100644
--- a/build/filters.js
+++ b/build/filters.js
@@ -77,7 +77,9 @@ module.exports.indentationFilter = [
 	'!src/vs/base/common/semver/semver.js',
 	'!src/vs/base/node/terminateProcess.sh',
 	'!src/vs/base/node/cpuUsage.sh',
+	'!src/vs/editor/common/languages/highlights/*.scm',
 	'!test/unit/assert.js',
+	'!test/unit/assert-esm.js',
 	'!resources/linux/snap/electron-launch',
 	'!build/ext.js',
 	'!build/npm/gyp/patches/gyp_spectre_mitigation_support.patch',
@@ -99,8 +101,7 @@ module.exports.indentationFilter = [
 
 	// except multiple specific files
 	'!**/package.json',
-	'!**/yarn.lock',
-	'!**/yarn-error.log',
+	'!**/package-lock.json',
 
 	// except multiple specific folders
 	'!**/codicon/**',
@@ -117,7 +118,7 @@ module.exports.indentationFilter = [
 	'!src/vs/*/**/*.d.ts',
 	'!src/typings/**/*.d.ts',
 	'!extensions/**/*.d.ts',
-	'!**/*.{svg,exe,png,bmp,jpg,scpt,bat,cmd,cur,ttf,woff,eot,md,ps1,template,yaml,yml,d.ts.recipe,ico,icns,plist,opus,admx,adml,wasm}',
+	'!**/*.{svg,exe,png,bmp,jpg,scpt,bat,cmd,cur,ttf,woff,eot,md,ps1,psm1,template,yaml,yml,d.ts.recipe,ico,icns,plist,opus,admx,adml,wasm}',
 	'!build/{lib,download,linux,darwin}/**/*.js',
 	'!build/**/*.sh',
 	'!build/azure-pipelines/**/*.js',
@@ -199,7 +200,7 @@ module.exports.eslintFilter = [
 		.toString().split(/\r\n|\n/)
 		.filter(line => !line.startsWith('#'))
 		.filter(line => !!line)
-		.map(line => `!${line}`)
+		.map(line => line.startsWith('!') ? line.slice(1) : `!${line}`)
 ];
 
 module.exports.stylelintFilter = [
diff --git a/build/gulp-eslint.js b/build/gulp-eslint.js
new file mode 100644
index 00000000000..3373171671b
--- /dev/null
+++ b/build/gulp-eslint.js
@@ -0,0 +1,78 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+const { ESLint } = require('eslint');
+const { Transform } = require('stream');
+const { relative } = require('path');
+const fancyLog = require('fancy-log');
+
+/**
+ * @param {Function} action - A function to handle all ESLint results
+ * @returns {stream} gulp file stream
+ */
+function eslint(action) {
+	const linter = new ESLint();
+	const formatter = linter.loadFormatter('compact');
+
+	const results = [];
+	results.errorCount = 0;
+	results.warningCount = 0;
+
+	return transform(
+		async (file, enc, cb) => {
+			const filePath = relative(process.cwd(), file.path);
+
+			if (file.isNull()) {
+				cb(null, file);
+				return;
+			}
+
+			if (file.isStream()) {
+				cb(new Error('vinyl files with Stream contents are not supported'));
+				return;
+			}
+
+			try {
+				// TODO: Should this be checked?
+				if (await linter.isPathIgnored(filePath)) {
+					cb(null, file);
+					return;
+				}
+
+				const result = (await linter.lintText(file.contents.toString(), { filePath }))[0];
+				results.push(result);
+				results.errorCount += result.errorCount;
+				results.warningCount += result.warningCount;
+
+				const message = (await formatter).format([result]);
+				if (message) {
+					fancyLog(message);
+				}
+				cb(null, file);
+			} catch (error) {
+				cb(error);
+			}
+		},
+		(done) => {
+			try {
+				action(results);
+				done();
+			} catch (error) {
+				done(error);
+			}
+		});
+}
+
+function transform(transform, flush) {
+	return new Transform({
+		objectMode: true,
+		transform,
+		flush
+	});
+}
+
+module.exports = eslint;
diff --git a/build/gulpfile.cli.js b/build/gulpfile.cli.js
index 86646fdb274..592fc74516c 100644
--- a/build/gulpfile.cli.js
+++ b/build/gulpfile.cli.js
@@ -5,8 +5,6 @@
 
 'use strict';
 
-//@ts-check
-
 const es = require('event-stream');
 const gulp = require('gulp');
 const path = require('path');
@@ -24,7 +22,6 @@ const createReporter = require('./lib/reporter').createReporter;
 const root = 'cli';
 const rootAbs = path.resolve(__dirname, '..', root);
 const src = `${root}/src`;
-const targetCliPath = path.join(root, 'target', 'debug', process.platform === 'win32' ? 'code.exe' : 'code');
 
 const platformOpensslDirName =
 	process.platform === 'win32' ? (
diff --git a/build/gulpfile.compile.js b/build/gulpfile.compile.js
index c4947e76cbf..e40b05f8d39 100644
--- a/build/gulpfile.compile.js
+++ b/build/gulpfile.compile.js
@@ -3,21 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+//@ts-check
 'use strict';
 
 const gulp = require('gulp');
 const util = require('./lib/util');
+const date = require('./lib/date');
 const task = require('./lib/task');
 const compilation = require('./lib/compilation');
-const optimize = require('./lib/optimize');
 
+/**
+ * @param {boolean} disableMangle
+ */
 function makeCompileBuildTask(disableMangle) {
 	return task.series(
 		util.rimraf('out-build'),
-		util.buildWebNodePaths('out-build'),
+		date.writeISODate('out-build'),
 		compilation.compileApiProposalNamesTask,
-		compilation.compileTask('src', 'out-build', true, { disableMangle }),
-		optimize.optimizeLoaderTask('out-build', 'out-build', true)
+		compilation.compileTask('src', 'out-build', true, { disableMangle })
 	);
 }
 
diff --git a/build/gulpfile.editor.js b/build/gulpfile.editor.js
index 22b70a953df..0a6231dbfb0 100644
--- a/build/gulpfile.editor.js
+++ b/build/gulpfile.editor.js
@@ -29,19 +29,17 @@ const editorEntryPoints = [
 	{
 		name: 'vs/editor/editor.main',
 		include: [],
-		exclude: ['vs/css', 'vs/nls'],
+		exclude: ['vs/css'],
 		prepend: [
-			{ path: 'out-editor-build/vs/css.js', amdModuleId: 'vs/css' },
-			{ path: 'out-editor-build/vs/nls.js', amdModuleId: 'vs/nls' }
+			{ path: 'out-editor-build/vs/css.js', amdModuleId: 'vs/css' }
 		],
 	},
 	{
 		name: 'vs/base/common/worker/simpleWorker',
 		include: ['vs/editor/common/services/editorSimpleWorker'],
-		exclude: ['vs/nls'],
+		exclude: [],
 		prepend: [
 			{ path: 'vs/loader.js' },
-			{ path: 'vs/nls.js', amdModuleId: 'vs/nls' },
 			{ path: 'vs/base/worker/workerMain.js' }
 		],
 		dest: 'vs/base/worker/workerMain.js'
@@ -79,33 +77,25 @@ const extractEditorSrcTask = task.define('extract-editor-src', () => {
 			extrausages
 		],
 		shakeLevel: 2, // 0-Files, 1-InnerFile, 2-ClassMembers
-		importIgnorePattern: /(^vs\/css!)/,
+		importIgnorePattern: /\.css$/,
 		destRoot: path.join(root, 'out-editor-src'),
-		redirects: []
+		redirects: {
+			'@vscode/tree-sitter-wasm': '../node_modules/@vscode/tree-sitter-wasm/wasm/tree-sitter-web',
+		}
 	});
 });
 
 // Disable mangling for the editor, as it complicates debugging & quite a few users rely on private/protected fields.
-const compileEditorAMDTask = task.define('compile-editor-amd', compilation.compileTask('out-editor-src', 'out-editor-build', true, { disableMangle: true }));
+// Disable NLS task to remove english strings to preserve backwards compatibility when we removed the `vs/nls!` AMD plugin.
+const compileEditorAMDTask = task.define('compile-editor-amd', compilation.compileTask('out-editor-src', 'out-editor-build', true, { disableMangle: true, preserveEnglish: true }));
 
 const optimizeEditorAMDTask = task.define('optimize-editor-amd', optimize.optimizeTask(
 	{
 		out: 'out-editor',
-		amd: {
+		esm: {
 			src: 'out-editor-build',
 			entryPoints: editorEntryPoints,
-			resources: editorResources,
-			loaderConfig: {
-				paths: {
-					'vs': 'out-editor-build/vs',
-					'vs/css': 'out-editor-build/vs/css.build',
-					'vs/nls': 'out-editor-build/vs/nls.build',
-					'vscode': 'empty:'
-				}
-			},
-			header: BUNDLED_FILE_HEADER,
-			bundleInfo: true,
-			languages
+			resources: editorResources
 		}
 	}
 ));
@@ -124,7 +114,6 @@ const createESMSourcesAndResourcesTask = task.define('extract-editor-esm', () =>
 			'vs/base/worker/workerMain.ts',
 		],
 		renames: {
-			'vs/nls.mock.ts': 'vs/nls.ts'
 		}
 	});
 });
@@ -136,7 +125,8 @@ const compileEditorESMTask = task.define('compile-editor-esm', () => {
 	let result;
 	if (process.platform === 'win32') {
 		result = cp.spawnSync(`..\\node_modules\\.bin\\tsc.cmd`, {
-			cwd: path.join(__dirname, '../out-editor-esm')
+			cwd: path.join(__dirname, '../out-editor-esm'),
+			shell: true
 		});
 	} else {
 		result = cp.spawnSync(`node`, [`../node_modules/.bin/tsc`], {
@@ -198,49 +188,11 @@ const compileEditorESMTask = task.define('compile-editor-esm', () => {
 			}
 
 			console.log(`Open in VS Code the folder at '${destPath}' and you can analyze the compilation error`);
-			throw new Error('Standalone Editor compilation failed. If this is the build machine, simply launch `yarn run gulp editor-distro` on your machine to further analyze the compilation problem.');
+			throw new Error('Standalone Editor compilation failed. If this is the build machine, simply launch `npm run gulp editor-distro` on your machine to further analyze the compilation problem.');
 		});
 	}
 });
 
-/**
- * Go over all .js files in `/out-monaco-editor-core/esm/` and make sure that all imports
- * use `.js` at the end in order to be ESM compliant.
- */
-const appendJSToESMImportsTask = task.define('append-js-to-esm-imports', () => {
-	const SRC_DIR = path.join(__dirname, '../out-monaco-editor-core/esm');
-	const files = util.rreddir(SRC_DIR);
-	for (const file of files) {
-		const filePath = path.join(SRC_DIR, file);
-		if (!/\.js$/.test(filePath)) {
-			continue;
-		}
-
-		const contents = fs.readFileSync(filePath).toString();
-		const lines = contents.split(/\r\n|\r|\n/g);
-		const /** @type {string[]} */result = [];
-		for (const line of lines) {
-			if (!/^import/.test(line) && !/^export \* from/.test(line)) {
-				// not an import
-				result.push(line);
-				continue;
-			}
-			if (/^import '[^']+\.css';/.test(line)) {
-				// CSS import
-				result.push(line);
-				continue;
-			}
-			const modifiedLine = (
-				line
-					.replace(/^import(.*)\'([^']+)\'/, `import$1'$2.js'`)
-					.replace(/^export \* from \'([^']+)\'/, `export * from '$1.js'`)
-			);
-			result.push(modifiedLine);
-		}
-		fs.writeFileSync(filePath, result.join('\n'));
-	}
-});
-
 /**
  * @param {string} contents
  */
@@ -413,7 +365,6 @@ gulp.task('editor-distro',
 			task.series(
 				createESMSourcesAndResourcesTask,
 				compileEditorESMTask,
-				appendJSToESMImportsTask
 			)
 		),
 		finalEditorResourcesTask
@@ -430,7 +381,6 @@ gulp.task('editor-esm',
 		extractEditorSrcTask,
 		createESMSourcesAndResourcesTask,
 		compileEditorESMTask,
-		appendJSToESMImportsTask,
 	)
 );
 
diff --git a/build/gulpfile.extensions.js b/build/gulpfile.extensions.js
index b85425bccfc..4f745aebdc7 100644
--- a/build/gulpfile.extensions.js
+++ b/build/gulpfile.extensions.js
@@ -48,7 +48,6 @@ const compilations = [
 	'extensions/json-language-features/client/tsconfig.json',
 	'extensions/json-language-features/server/tsconfig.json',
 	'extensions/markdown-language-features/preview-src/tsconfig.json',
-	'extensions/markdown-language-features/server/tsconfig.json',
 	'extensions/markdown-language-features/tsconfig.json',
 	'extensions/markdown-math/tsconfig.json',
 	'extensions/media-preview/tsconfig.json',
@@ -69,6 +68,7 @@ const compilations = [
 	'extensions/vscode-test-resolver/tsconfig.json',
 
 	'.vscode/extensions/vscode-selfhost-test-provider/tsconfig.json',
+	'.vscode/extensions/vscode-selfhost-import-aid/tsconfig.json',
 ];
 
 const getBaseUrl = out => `https://main.vscode-cdn.net/sourcemaps/${commit}/${out}`;
@@ -101,7 +101,6 @@ const tasks = compilations.map(function (tsconfigFile) {
 	}
 
 	function createPipeline(build, emitError, transpileOnly) {
-		const nlsDev = require('vscode-nls-dev');
 		const tsb = require('./lib/tsb');
 		const sourcemaps = require('gulp-sourcemaps');
 
@@ -126,7 +125,6 @@ const tasks = compilations.map(function (tsconfigFile) {
 				.pipe(tsFilter)
 				.pipe(util.loadSourcemaps())
 				.pipe(compilation())
-				.pipe(build ? nlsDev.rewriteLocalizeCalls() : es.through())
 				.pipe(build ? util.stripSourceMappingURL() : es.through())
 				.pipe(sourcemaps.write('.', {
 					sourceMappingURL: !build ? null : f => `${baseUrl}/${f.relative}.map`,
@@ -136,9 +134,6 @@ const tasks = compilations.map(function (tsconfigFile) {
 					sourceRoot: '../src/',
 				}))
 				.pipe(tsFilter.restore)
-				.pipe(build ? nlsDev.bundleMetaDataFiles(headerId, headerOut) : es.through())
-				// Filter out *.nls.json file. We needed them only to bundle meta data file.
-				.pipe(filter(['**', '!**/*.nls.json'], { dot: true }))
 				.pipe(reporter.end(emitError));
 
 			return es.duplex(input, output);
diff --git a/build/gulpfile.js b/build/gulpfile.js
index e945c06eed4..73f7f23cc0b 100644
--- a/build/gulpfile.js
+++ b/build/gulpfile.js
@@ -20,18 +20,18 @@ gulp.task(compileApiProposalNamesTask);
 gulp.task(watchApiProposalNamesTask);
 
 // SWC Client Transpile
-const transpileClientSWCTask = task.define('transpile-client-swc', task.series(util.rimraf('out'), util.buildWebNodePaths('out'), transpileTask('src', 'out', true)));
+const transpileClientSWCTask = task.define('transpile-client-swc', task.series(util.rimraf('out'), transpileTask('src', 'out', true)));
 gulp.task(transpileClientSWCTask);
 
 // Transpile only
-const transpileClientTask = task.define('transpile-client', task.series(util.rimraf('out'), util.buildWebNodePaths('out'), transpileTask('src', 'out')));
+const transpileClientTask = task.define('transpile-client', task.series(util.rimraf('out'), transpileTask('src', 'out')));
 gulp.task(transpileClientTask);
 
 // Fast compile for development time
-const compileClientTask = task.define('compile-client', task.series(util.rimraf('out'), util.buildWebNodePaths('out'), compileApiProposalNamesTask, compileTask('src', 'out', false)));
+const compileClientTask = task.define('compile-client', task.series(util.rimraf('out'), compileApiProposalNamesTask, compileTask('src', 'out', false)));
 gulp.task(compileClientTask);
 
-const watchClientTask = task.define('watch-client', task.series(util.rimraf('out'), util.buildWebNodePaths('out'), task.parallel(watchTask('out', false), watchApiProposalNamesTask)));
+const watchClientTask = task.define('watch-client', task.series(util.rimraf('out'), task.parallel(watchTask('out', false), watchApiProposalNamesTask)));
 gulp.task(watchClientTask);
 
 // All
diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
index 4ab7dcbc4b6..94f7004fd14 100644
--- a/build/gulpfile.reh.js
+++ b/build/gulpfile.reh.js
@@ -12,11 +12,13 @@ const util = require('./lib/util');
 const { getVersion } = require('./lib/getVersion');
 const task = require('./lib/task');
 const optimize = require('./lib/optimize');
+const { inlineMeta } = require('./lib/inlineMeta');
 const product = require('../product.json');
 const rename = require('gulp-rename');
 const replace = require('gulp-replace');
 const filter = require('gulp-filter');
 const { getProductionDependencies } = require('./lib/dependencies');
+const { readISODate } = require('./lib/date');
 const vfs = require('vinyl-fs');
 const packageJson = require('../package.json');
 const flatmap = require('gulp-flatmap');
@@ -26,9 +28,10 @@ const fs = require('fs');
 const glob = require('glob');
 const { compileBuildTask } = require('./gulpfile.compile');
 const { compileExtensionsBuildTask, compileExtensionMediaBuildTask } = require('./gulpfile.extensions');
-const { vscodeWebEntryPoints, vscodeWebResourceIncludes, createVSCodeWebFileContentMapper } = require('./gulpfile.vscode.web');
+const { vscodeWebResourceIncludes, createVSCodeWebFileContentMapper } = require('./gulpfile.vscode.web');
 const cp = require('child_process');
 const log = require('fancy-log');
+const buildfile = require('./buildfile');
 
 const REPO_ROOT = path.dirname(__dirname);
 const commit = getVersion(REPO_ROOT);
@@ -39,6 +42,7 @@ const REMOTE_FOLDER = path.join(REPO_ROOT, 'remote');
 
 const BUILD_TARGETS = [
 	{ platform: 'win32', arch: 'x64' },
+	{ platform: 'win32', arch: 'arm64' },
 	{ platform: 'darwin', arch: 'x64' },
 	{ platform: 'darwin', arch: 'arm64' },
 	{ platform: 'linux', arch: 'x64' },
@@ -50,95 +54,108 @@ const BUILD_TARGETS = [
 	{ platform: 'linux', arch: 'alpine' },
 ];
 
-const serverResources = [
+const serverResourceIncludes = [
 
-	// Bootstrap
-	'out-build/bootstrap.js',
-	'out-build/bootstrap-fork.js',
-	'out-build/bootstrap-amd.js',
-	'out-build/bootstrap-node.js',
-
-	// Performance
-	'out-build/vs/base/common/performance.js',
+	// NLS
+	'out-build/nls.messages.json',
 
 	// Process monitor
 	'out-build/vs/base/node/cpuUsage.sh',
 	'out-build/vs/base/node/ps.sh',
 
 	// Terminal shell integration
-	'out-build/vs/workbench/contrib/terminal/browser/media/shellIntegration.ps1',
-	'out-build/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh',
-	'out-build/vs/workbench/contrib/terminal/browser/media/shellIntegration-env.zsh',
-	'out-build/vs/workbench/contrib/terminal/browser/media/shellIntegration-profile.zsh',
-	'out-build/vs/workbench/contrib/terminal/browser/media/shellIntegration-rc.zsh',
-	'out-build/vs/workbench/contrib/terminal/browser/media/shellIntegration-login.zsh',
-	'out-build/vs/workbench/contrib/terminal/browser/media/fish_xdg_data/fish/vendor_conf.d/shellIntegration.fish',
+	'out-build/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1',
+	'out-build/vs/workbench/contrib/terminal/common/scripts/CodeTabExpansion.psm1',
+	'out-build/vs/workbench/contrib/terminal/common/scripts/GitTabExpansion.psm1',
+	'out-build/vs/workbench/contrib/terminal/common/scripts/shellIntegration-bash.sh',
+	'out-build/vs/workbench/contrib/terminal/common/scripts/shellIntegration-env.zsh',
+	'out-build/vs/workbench/contrib/terminal/common/scripts/shellIntegration-profile.zsh',
+	'out-build/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh',
+	'out-build/vs/workbench/contrib/terminal/common/scripts/shellIntegration-login.zsh',
+	'out-build/vs/workbench/contrib/terminal/common/scripts/fish_xdg_data/fish/vendor_conf.d/shellIntegration.fish',
 
+];
+
+const serverResourceExcludes = [
+	'!out-build/vs/**/{electron-sandbox,electron-main,electron-utility}/**',
+	'!out-build/vs/editor/standalone/**',
+	'!out-build/vs/workbench/**/*-tb.png',
 	'!**/test/**'
 ];
 
-const serverWithWebResources = [
+const serverResources = [
+	...serverResourceIncludes,
+	...serverResourceExcludes
+];
 
-	// Include all of server...
-	...serverResources,
-
-	// ...and all of web
+const serverWithWebResourceIncludes = [
+	...serverResourceIncludes,
+	'out-build/vs/code/browser/workbench/*.html',
 	...vscodeWebResourceIncludes
 ];
 
+const serverWithWebResourceExcludes = [
+	...serverResourceExcludes,
+	'!out-build/vs/code/**/*-dev.html'
+];
+
+const serverWithWebResources = [
+	...serverWithWebResourceIncludes,
+	...serverWithWebResourceExcludes
+];
+
 const serverEntryPoints = [
-	{
-		name: 'vs/server/node/server.main',
-		exclude: ['vs/css', 'vs/nls']
-	},
-	{
-		name: 'vs/server/node/server.cli',
-		exclude: ['vs/css', 'vs/nls']
-	},
+	// 'vs/server/node/server.main' is not included here because it gets inlined via ./src/server-main.js
+	// 'vs/server/node/server.cli' is not included here because it gets inlined via ./src/server-cli.js
 	{
 		name: 'vs/workbench/api/node/extensionHostProcess',
-		exclude: ['vs/css', 'vs/nls']
+		exclude: ['vs/css']
 	},
 	{
 		name: 'vs/platform/files/node/watcher/watcherMain',
-		exclude: ['vs/css', 'vs/nls']
+		exclude: ['vs/css']
 	},
 	{
 		name: 'vs/platform/terminal/node/ptyHostMain',
-		exclude: ['vs/css', 'vs/nls']
+		exclude: ['vs/css']
 	}
 ];
 
+const webEntryPoints = [
+	buildfile.workerEditor,
+	buildfile.workerExtensionHost,
+	buildfile.workerNotebook,
+	buildfile.workerLanguageDetection,
+	buildfile.workerLocalFileSearch,
+	buildfile.workerOutputLinks,
+	buildfile.workerBackgroundTokenization,
+	buildfile.keyboardMaps,
+	buildfile.codeWeb
+].flat();
+
 const serverWithWebEntryPoints = [
 
 	// Include all of server
 	...serverEntryPoints,
 
-	// Include workbench web
-	...vscodeWebEntryPoints
+	// Include all of web
+	...webEntryPoints,
+].flat();
+
+const bootstrapEntryPoints = [
+	'out-build/server-main.js',
+	'out-build/server-cli.js',
+	'out-build/bootstrap-fork.js'
 ];
 
 function getNodeVersion() {
-	const yarnrc = fs.readFileSync(path.join(REPO_ROOT, 'remote', '.yarnrc'), 'utf8');
-	const nodeVersion = /^target "(.*)"$/m.exec(yarnrc)[1];
-	const internalNodeVersion = /^ms_build_id "(.*)"$/m.exec(yarnrc)[1];
+	const npmrc = fs.readFileSync(path.join(REPO_ROOT, 'remote', '.npmrc'), 'utf8');
+	const nodeVersion = /^target="(.*)"$/m.exec(npmrc)[1];
+	const internalNodeVersion = /^ms_build_id="(.*)"$/m.exec(npmrc)[1];
 	return { nodeVersion, internalNodeVersion };
 }
 
-function getNodeChecksum(nodeVersion, platform, arch, glibcPrefix) {
-	let expectedName;
-	switch (platform) {
-		case 'win32':
-			expectedName = `win-${arch}/node.exe`;
-			break;
-
-		case 'darwin':
-		case 'alpine':
-		case 'linux':
-			expectedName = `node-v${nodeVersion}${glibcPrefix}-${platform}-${arch}.tar.gz`;
-			break;
-	}
-
+function getNodeChecksum(expectedName) {
 	const nodeJsChecksums = fs.readFileSync(path.join(REPO_ROOT, 'build', 'checksums', 'nodejs.txt'), 'utf8');
 	for (const line of nodeJsChecksums.split('\n')) {
 		const [checksum, name] = line.split(/\s+/);
@@ -182,7 +199,6 @@ if (defaultNodeTask) {
 function nodejs(platform, arch) {
 	const { fetchUrls, fetchGithub } = require('./lib/fetch');
 	const untar = require('gulp-untar');
-	const crypto = require('crypto');
 
 	if (arch === 'armhf') {
 		arch = 'armv7l';
@@ -194,7 +210,24 @@ function nodejs(platform, arch) {
 	log(`Downloading node.js ${nodeVersion} ${platform} ${arch} from ${product.nodejsRepository}...`);
 
 	const glibcPrefix = process.env['VSCODE_NODE_GLIBC'] ?? '';
-	const checksumSha256 = getNodeChecksum(nodeVersion, platform, arch, glibcPrefix);
+	let expectedName;
+	switch (platform) {
+		case 'win32':
+			expectedName = product.nodejsRepository !== 'https://nodejs.org' ?
+				`win-${arch}-node.exe` : `win-${arch}/node.exe`;
+			break;
+
+		case 'darwin':
+			expectedName = `node-v${nodeVersion}-${platform}-${arch}.tar.gz`;
+			break;
+		case 'linux':
+			expectedName = `node-v${nodeVersion}${glibcPrefix}-${platform}-${arch}.tar.gz`;
+			break;
+		case 'alpine':
+			expectedName = `node-v${nodeVersion}-linux-${arch}-musl.tar.gz`;
+			break;
+	}
+	const checksumSha256 = getNodeChecksum(expectedName);
 
 	if (checksumSha256) {
 		log(`Using SHA256 checksum for checking integrity: ${checksumSha256}`);
@@ -205,13 +238,13 @@ function nodejs(platform, arch) {
 	switch (platform) {
 		case 'win32':
 			return (product.nodejsRepository !== 'https://nodejs.org' ?
-				fetchGithub(product.nodejsRepository, { version: `${nodeVersion}-${internalNodeVersion}`, name: `win-${arch}-node.exe`, checksumSha256 }) :
+				fetchGithub(product.nodejsRepository, { version: `${nodeVersion}-${internalNodeVersion}`, name: expectedName, checksumSha256 }) :
 				fetchUrls(`/dist/v${nodeVersion}/win-${arch}/node.exe`, { base: 'https://nodejs.org', checksumSha256 }))
 				.pipe(rename('node.exe'));
 		case 'darwin':
 		case 'linux':
 			return (product.nodejsRepository !== 'https://nodejs.org' ?
-				fetchGithub(product.nodejsRepository, { version: `${nodeVersion}-${internalNodeVersion}`, name: `node-v${nodeVersion}${glibcPrefix}-${platform}-${arch}.tar.gz`, checksumSha256 }) :
+				fetchGithub(product.nodejsRepository, { version: `${nodeVersion}-${internalNodeVersion}`, name: expectedName, checksumSha256 }) :
 				fetchUrls(`/dist/v${nodeVersion}/node-v${nodeVersion}-${platform}-${arch}.tar.gz`, { base: 'https://nodejs.org', checksumSha256 })
 			).pipe(flatmap(stream => stream.pipe(gunzip()).pipe(untar())))
 				.pipe(filter('**/node'))
@@ -219,7 +252,7 @@ function nodejs(platform, arch) {
 				.pipe(rename('node'));
 		case 'alpine':
 			return product.nodejsRepository !== 'https://nodejs.org' ?
-				fetchGithub(product.nodejsRepository, { version: `${nodeVersion}-${internalNodeVersion}`, name: `node-v${nodeVersion}-${platform}-${arch}.tar.gz`, checksumSha256 })
+				fetchGithub(product.nodejsRepository, { version: `${nodeVersion}-${internalNodeVersion}`, name: expectedName, checksumSha256 })
 					.pipe(flatmap(stream => stream.pipe(gunzip()).pipe(untar())))
 					.pipe(filter('**/node'))
 					.pipe(util.setExecutableBit('**'))
@@ -288,23 +321,32 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
 		}
 
 		const name = product.nameShort;
+
+		let packageJsonContents;
 		const packageJsonStream = gulp.src(['remote/package.json'], { base: 'remote' })
-			.pipe(json({ name, version, dependencies: undefined, optionalDependencies: undefined }));
-
-		const date = new Date().toISOString();
+			.pipe(json({ name, version, dependencies: undefined, optionalDependencies: undefined, ...{ type: 'module' } })) // TODO@esm this should be configured in the top level package.json
+			.pipe(es.through(function (file) {
+				packageJsonContents = file.contents.toString();
+				this.emit('data', file);
+			}));
 
+		let productJsonContents;
 		const productJsonStream = gulp.src(['product.json'], { base: '.' })
-			.pipe(json({ commit, date, version }));
+			.pipe(json({ commit, date: readISODate('out-build'), version }))
+			.pipe(es.through(function (file) {
+				productJsonContents = file.contents.toString();
+				this.emit('data', file);
+			}));
 
 		const license = gulp.src(['remote/LICENSE'], { base: 'remote', allowEmpty: true });
 
 		const jsFilter = util.filter(data => !data.isDirectory() && /\.js$/.test(data.path));
 
 		const productionDependencies = getProductionDependencies(REMOTE_FOLDER);
-		const dependenciesSrc = productionDependencies.map(d => path.relative(REPO_ROOT, d.path)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`, `!${d}/.bin/**`]).flat();
+		const dependenciesSrc = productionDependencies.map(d => path.relative(REPO_ROOT, d)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`, `!${d}/.bin/**`]).flat();
 		const deps = gulp.src(dependenciesSrc, { base: 'remote', dot: true })
 			// filter out unnecessary files, no source maps in server build
-			.pipe(filter(['**', '!**/package-lock.json', '!**/yarn.lock', '!**/*.js.map']))
+			.pipe(filter(['**', '!**/package-lock.json', '!**/*.js.map']))
 			.pipe(util.cleanNodeModules(path.join(__dirname, '.moduleignore')))
 			.pipe(util.cleanNodeModules(path.join(__dirname, `.moduleignore.${process.platform}`)))
 			.pipe(jsFilter)
@@ -387,6 +429,12 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
 			);
 		}
 
+		result = inlineMeta(result, {
+			targetPaths: bootstrapEntryPoints,
+			packageJsonFn: () => packageJsonContents,
+			productJsonFn: () => productJsonContents
+		});
+
 		return result.pipe(vfs.dest(destination));
 	};
 }
@@ -406,31 +454,14 @@ function tweakProductForServerWeb(product) {
 		optimize.optimizeTask(
 			{
 				out: `out-vscode-${type}`,
-				amd: {
-					src: 'out-build',
-					entryPoints: (type === 'reh' ? serverEntryPoints : serverWithWebEntryPoints).flat(),
-					otherSources: [],
-					resources: type === 'reh' ? serverResources : serverWithWebResources,
-					loaderConfig: optimize.loaderConfig(),
-					inlineAmdImages: true,
-					bundleInfo: undefined,
-					fileContentMapper: createVSCodeWebFileContentMapper('.build/extensions', type === 'reh-web' ? tweakProductForServerWeb(product) : product)
-				},
-				commonJS: {
+				esm: {
 					src: 'out-build',
 					entryPoints: [
-						'out-build/server-main.js',
-						'out-build/server-cli.js'
+						...(type === 'reh' ? serverEntryPoints : serverWithWebEntryPoints),
+						...bootstrapEntryPoints
 					],
-					platform: 'node',
-					external: [
-						'minimist',
-						// TODO: we cannot inline `product.json` because
-						// it is being changed during build time at a later
-						// point in time (such as `checksums`)
-						'../product.json',
-						'../package.json'
-					]
+					resources: type === 'reh' ? serverResources : serverWithWebResources,
+					fileContentMapper: createVSCodeWebFileContentMapper('.build/extensions', type === 'reh-web' ? tweakProductForServerWeb(product) : product)
 				}
 			}
 		)
diff --git a/build/gulpfile.scan.js b/build/gulpfile.scan.js
index 6f8144b0954..582481bf1eb 100644
--- a/build/gulpfile.scan.js
+++ b/build/gulpfile.scan.js
@@ -26,6 +26,9 @@ const BUILD_TARGETS = [
 	{ platform: 'linux', arch: 'arm64' },
 ];
 
+// The following files do not have PDBs downloaded for them during the download symbols process.
+const excludedCheckList = ['d3dcompiler_47.dll'];
+
 BUILD_TARGETS.forEach(buildTarget => {
 	const dashed = (/** @type {string | null} */ str) => (str ? `-${str}` : ``);
 	const platform = buildTarget.platform;
@@ -46,7 +49,6 @@ BUILD_TARGETS.forEach(buildTarget => {
 	if (platform === 'win32') {
 		tasks.push(
 			() => electron.dest(destinationPdb, { ...config, platform, arch: arch === 'armhf' ? 'arm' : arch, pdbs: true }),
-			util.rimraf(path.join(destinationExe, 'd3dcompiler_47.dll')),
 			() => confirmPdbsExist(destinationExe, destinationPdb)
 		);
 	}
@@ -71,7 +73,7 @@ BUILD_TARGETS.forEach(buildTarget => {
 
 function nodeModules(destinationExe, destinationPdb, platform) {
 	const productionDependencies = deps.getProductionDependencies(root);
-	const dependenciesSrc = productionDependencies.map(d => path.relative(root, d.path)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`]).flat();
+	const dependenciesSrc = productionDependencies.map(d => path.relative(root, d)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`]).flat();
 
 	const exe = () => {
 		return gulp.src(dependenciesSrc, { base: '.', dot: true })
@@ -110,6 +112,10 @@ function nodeModules(destinationExe, destinationPdb, platform) {
 
 function confirmPdbsExist(destinationExe, destinationPdb) {
 	readdirSync(destinationExe).forEach(file => {
+		if (excludedCheckList.includes(file)) {
+			return;
+		}
+
 		if (file.endsWith('.dll') || file.endsWith('.exe')) {
 			const pdb = `${file}.pdb`;
 			if (!existsSync(path.join(destinationPdb, pdb))) {
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index c6202c70883..03f446fdc2b 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -6,10 +6,7 @@
 'use strict';
 
 const gulp = require('gulp');
-const merge = require('gulp-merge-json');
 const fs = require('fs');
-const os = require('os');
-const cp = require('child_process');
 const path = require('path');
 const es = require('event-stream');
 const vfs = require('vinyl-fs');
@@ -18,9 +15,11 @@ const replace = require('gulp-replace');
 const filter = require('gulp-filter');
 const util = require('./lib/util');
 const { getVersion } = require('./lib/getVersion');
+const { readISODate } = require('./lib/date');
 const task = require('./lib/task');
-const buildfile = require('../src/buildfile');
+const buildfile = require('./buildfile');
 const optimize = require('./lib/optimize');
+const { inlineMeta } = require('./lib/inlineMeta');
 const root = path.dirname(__dirname);
 const commit = getVersion(root);
 const packageJson = require('../package.json');
@@ -39,44 +38,84 @@ const rcedit = promisify(require('rcedit'));
 
 // Build
 const vscodeEntryPoints = [
-	buildfile.entrypoint('vs/workbench/workbench.desktop.main'),
-	buildfile.base,
+	buildfile.workerEditor,
 	buildfile.workerExtensionHost,
 	buildfile.workerNotebook,
 	buildfile.workerLanguageDetection,
 	buildfile.workerLocalFileSearch,
 	buildfile.workerProfileAnalysis,
+	buildfile.workerOutputLinks,
+	buildfile.workerBackgroundTokenization,
 	buildfile.workbenchDesktop,
 	buildfile.code
 ].flat();
 
-const vscodeResources = [
-	'out-build/bootstrap.js',
-	'out-build/bootstrap-fork.js',
-	'out-build/bootstrap-amd.js',
-	'out-build/bootstrap-node.js',
-	'out-build/bootstrap-window.js',
-	'out-build/vs/**/*.{svg,png,html,jpg,mp3}',
-	'!out-build/vs/code/browser/**/*.html',
-	'!out-build/vs/code/**/*-dev.html',
-	'!out-build/vs/editor/standalone/**/*.svg',
-	'out-build/vs/base/common/performance.js',
-	'out-build/vs/base/node/{stdForkStart.js,terminateProcess.sh,cpuUsage.sh,ps.sh}',
-	'out-build/vs/base/browser/ui/codicons/codicon/**',
+const vscodeResourceIncludes = [
+
+	// NLS
+	'out-build/nls.messages.json',
+	'out-build/nls.keys.json',
+
+	// Workbench
+	'out-build/vs/code/electron-sandbox/workbench/workbench.html',
+
+	// Electron Preload
 	'out-build/vs/base/parts/sandbox/electron-sandbox/preload.js',
 	'out-build/vs/base/parts/sandbox/electron-sandbox/preload-aux.js',
-	'out-build/vs/workbench/browser/media/*-theme.css',
-	'out-build/vs/workbench/contrib/debug/**/*.json',
+
+	// Node Scripts
+	'out-build/vs/base/node/{terminateProcess.sh,cpuUsage.sh,ps.sh}',
+
+	// Touchbar
+	'out-build/vs/workbench/browser/parts/editor/media/*.png',
+	'out-build/vs/workbench/contrib/debug/browser/media/*.png',
+
+	// External Terminal
 	'out-build/vs/workbench/contrib/externalTerminal/**/*.scpt',
-	'out-build/vs/workbench/contrib/terminal/browser/media/fish_xdg_data/fish/vendor_conf.d/*.fish',
-	'out-build/vs/workbench/contrib/terminal/browser/media/*.ps1',
-	'out-build/vs/workbench/contrib/terminal/browser/media/*.sh',
-	'out-build/vs/workbench/contrib/terminal/browser/media/*.zsh',
-	'out-build/vs/workbench/contrib/webview/browser/pre/*.js',
-	'!out-build/vs/workbench/contrib/issue/browser/*.html',
+
+	// Terminal shell integration
+	'out-build/vs/workbench/contrib/terminal/common/scripts/fish_xdg_data/fish/vendor_conf.d/*.fish',
+	'out-build/vs/workbench/contrib/terminal/common/scripts/*.ps1',
+	'out-build/vs/workbench/contrib/terminal/common/scripts/*.psm1',
+	'out-build/vs/workbench/contrib/terminal/common/scripts/*.sh',
+	'out-build/vs/workbench/contrib/terminal/common/scripts/*.zsh',
+
+	// Accessibility Signals
+	'out-build/vs/platform/accessibilitySignal/browser/media/*.mp3',
+
+	// Welcome
+	'out-build/vs/workbench/contrib/welcomeGettingStarted/common/media/**/*.{svg,png}',
+
+	// Extensions
+	'out-build/vs/workbench/contrib/extensions/browser/media/{theme-icon.png,language-icon.svg}',
+	'out-build/vs/workbench/services/extensionManagement/common/media/*.{svg,png}',
+
+	// Webview
+	'out-build/vs/workbench/contrib/webview/browser/pre/*.{js,html}',
+
+	// Extension Host Worker
+	'out-build/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html',
+
+	// Process Explorer
+	'out-build/vs/code/electron-sandbox/processExplorer/processExplorer.html',
+
+	// Tree Sitter highlights
+	'out-build/vs/editor/common/languages/highlights/*.scm',
+
+	// Issue Reporter
+	'out-build/vs/workbench/contrib/issue/electron-sandbox/issueReporter.html'
+];
+
+const vscodeResources = [
+
+	// Includes
+	...vscodeResourceIncludes,
+
+	// Excludes
+	'!out-build/vs/code/browser/**',
+	'!out-build/vs/editor/standalone/**',
+	'!out-build/vs/code/**/*-dev.html',
 	'!out-build/vs/workbench/contrib/issue/**/*-dev.html',
-	'out-build/vs/**/markdown.css',
-	'out-build/vs/workbench/contrib/tasks/**/*.json',
 	'!**/test/**'
 ];
 
@@ -84,43 +123,31 @@ const vscodeResources = [
 // be inlined into the target window file in this order
 // and they depend on each other in this way.
 const windowBootstrapFiles = [
-	'out-build/bootstrap.js',
-	'out-build/vs/loader.js',
 	'out-build/bootstrap-window.js'
 ];
 
+const bootstrapEntryPoints = [
+	'out-build/main.js',
+	'out-build/cli.js',
+	'out-build/bootstrap-fork.js'
+];
+
 const optimizeVSCodeTask = task.define('optimize-vscode', task.series(
 	util.rimraf('out-vscode'),
 	// Optimize: bundles source files automatically based on
-	// AMD and CommonJS import statements based on the passed
-	// in entry points. In addition, concat window related
-	// bootstrap files into a single file.
+	// import statements based on the passed in entry points.
+	// In addition, concat window related bootstrap files into
+	// a single file.
 	optimize.optimizeTask(
 		{
 			out: 'out-vscode',
-			amd: {
-				src: 'out-build',
-				entryPoints: vscodeEntryPoints,
-				resources: vscodeResources,
-				loaderConfig: optimize.loaderConfig(),
-				bundleInfo: undefined
-			},
-			commonJS: {
+			esm: {
 				src: 'out-build',
 				entryPoints: [
-					'out-build/main.js',
-					'out-build/cli.js'
+					...vscodeEntryPoints,
+					...bootstrapEntryPoints
 				],
-				platform: 'node',
-				external: [
-					'electron',
-					'minimist',
-					// TODO: we cannot inline `product.json` because
-					// it is being changed during build time at a later
-					// point in time (such as `checksums`)
-					'../product.json',
-					'../package.json',
-				]
+				resources: vscodeResources
 			},
 			manual: [
 				{ src: [...windowBootstrapFiles, 'out-build/vs/code/electron-sandbox/workbench/workbench.js'], out: 'vs/code/electron-sandbox/workbench/workbench.js' },
@@ -242,21 +269,28 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 		}
 
 		const name = product.nameShort;
-		const packageJsonUpdates = { name, version };
+		const packageJsonUpdates = { name, version, ...{ type: 'module', main: 'out/main.js' } }; // TODO@esm this should be configured in the top level package.json
 
 		// for linux url handling
 		if (platform === 'linux') {
 			packageJsonUpdates.desktopName = `${product.applicationName}-url-handler.desktop`;
 		}
 
+		let packageJsonContents;
 		const packageJsonStream = gulp.src(['package.json'], { base: '.' })
-			.pipe(json(packageJsonUpdates));
-
-		const date = new Date().toISOString();
-		const productJsonUpdate = { commit, date, checksums, version };
+			.pipe(json(packageJsonUpdates))
+			.pipe(es.through(function (file) {
+				packageJsonContents = file.contents.toString();
+				this.emit('data', file);
+			}));
 
+		let productJsonContents;
 		const productJsonStream = gulp.src(['product.json'], { base: '.' })
-			.pipe(json(productJsonUpdate));
+			.pipe(json({ commit, date: readISODate('out-build'), checksums, version }))
+			.pipe(es.through(function (file) {
+				productJsonContents = file.contents.toString();
+				this.emit('data', file);
+			}));
 
 		const license = gulp.src([product.licenseFileName, 'ThirdPartyNotices.txt', 'licenses/**'], { base: '.', allowEmpty: true });
 
@@ -268,7 +302,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 		const jsFilter = util.filter(data => !data.isDirectory() && /\.js$/.test(data.path));
 		const root = path.resolve(path.join(__dirname, '..'));
 		const productionDependencies = getProductionDependencies(root);
-		const dependenciesSrc = productionDependencies.map(d => path.relative(root, d.path)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`]).flat();
+		const dependenciesSrc = productionDependencies.map(d => path.relative(root, d)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`, `!**/*.mk`]).flat();
 
 		const deps = gulp.src(dependenciesSrc, { base: '.', dot: true })
 			.pipe(filter(['**', `!**/${config.version}/**`, '!**/bin/darwin-arm64-87/**', '!**/package-lock.json', '!**/yarn.lock', '!**/*.js.map']))
@@ -281,10 +315,16 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 				'**/*.node',
 				'**/@vscode/ripgrep/bin/*',
 				'**/node-pty/build/Release/*',
+				'**/node-pty/build/Release/conpty/*',
 				'**/node-pty/lib/worker/conoutSocketWorker.js',
 				'**/node-pty/lib/shared/conout.js',
 				'**/*.wasm',
 				'**/@vscode/vsce-sign/bin/*',
+			], [
+				'**/*.mk',
+				'!node_modules/vsda/**' // stay compatible with extensions that depend on us shipping `vsda` into ASAR
+			], [
+				'node_modules/vsda/**' // retain copy of `vsda` in node_modules for internal use
 			], 'node_modules.asar'));
 
 		let all = es.merge(
@@ -389,6 +429,12 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 				.pipe(rename('bin/' + product.applicationName)));
 		}
 
+		result = inlineMeta(result, {
+			targetPaths: bootstrapEntryPoints,
+			packageJsonFn: () => packageJsonContents,
+			productJsonFn: () => productJsonContents
+		});
+
 		return result.pipe(vfs.dest(destination));
 	};
 }
@@ -397,7 +443,7 @@ function patchWin32DependenciesTask(destinationFolderName) {
 	const cwd = path.join(path.dirname(root), destinationFolderName);
 
 	return async () => {
-		const deps = await glob('**/*.node', { cwd });
+		const deps = await glob('**/*.node', { cwd, ignore: 'extensions/node_modules/@parcel/watcher/**' });
 		const packageJson = JSON.parse(await fs.promises.readFile(path.join(cwd, 'resources', 'app', 'package.json'), 'utf8'));
 		const product = JSON.parse(await fs.promises.readFile(path.join(cwd, 'resources', 'app', 'product.json'), 'utf8'));
 		const baseVersion = packageJson.version.replace(/-.*$/, '');
@@ -496,17 +542,12 @@ gulp.task(task.define(
 		core,
 		compileExtensionsBuildTask,
 		function () {
-			const pathToMetadata = './out-vscode/nls.metadata.json';
-			const pathToRehWebMetadata = './out-vscode-reh-web/nls.metadata.json';
+			const pathToMetadata = './out-build/nls.metadata.json';
 			const pathToExtensions = '.build/extensions/*';
 			const pathToSetup = 'build/win32/i18n/messages.en.isl';
 
 			return es.merge(
-				gulp.src([pathToMetadata, pathToRehWebMetadata]).pipe(merge({
-					fileName: 'nls.metadata.json',
-					jsonSpace: '',
-					concatArrays: true
-				})).pipe(i18n.createXlfFilesForCoreBundle()),
+				gulp.src(pathToMetadata).pipe(i18n.createXlfFilesForCoreBundle()),
 				gulp.src(pathToSetup).pipe(i18n.createXlfFilesForIsl()),
 				gulp.src(pathToExtensions).pipe(i18n.createXlfFilesForExtensions())
 			).pipe(vfs.dest('../vscode-translations-export'));
diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
index 28ddfb04c3d..5fa5a5d136e 100644
--- a/build/gulpfile.vscode.linux.js
+++ b/build/gulpfile.vscode.linux.js
@@ -108,7 +108,11 @@ function prepareDebPackage(arch) {
 			.pipe(replace('@@NAME@@', product.applicationName))
 			.pipe(rename('DEBIAN/postinst'));
 
-		const all = es.merge(control, postinst, postrm, prerm, desktops, appdata, workspaceMime, icon, bash_completion, zsh_completion, code);
+		const templates = gulp.src('resources/linux/debian/templates.template', { base: '.' })
+			.pipe(replace('@@NAME@@', product.applicationName))
+			.pipe(rename('DEBIAN/templates'));
+
+		const all = es.merge(control, templates, postinst, postrm, prerm, desktops, appdata, workspaceMime, icon, bash_completion, zsh_completion, code);
 
 		return all.pipe(vfs.dest(destination));
 	};
@@ -148,6 +152,7 @@ function getRpmPackageArch(arch) {
 function prepareRpmPackage(arch) {
 	const binaryDir = '../VSCode-linux-' + arch;
 	const rpmArch = getRpmPackageArch(arch);
+	const stripBinary = process.env['STRIP'] ?? '/usr/bin/strip';
 
 	return function () {
 		const desktop = gulp.src('resources/linux/code.desktop', { base: '.' })
@@ -204,6 +209,7 @@ function prepareRpmPackage(arch) {
 					.pipe(replace('@@QUALITY@@', product.quality || '@@QUALITY@@'))
 					.pipe(replace('@@UPDATEURL@@', product.updateUrl || '@@UPDATEURL@@'))
 					.pipe(replace('@@DEPENDENCIES@@', dependencies.join(', ')))
+					.pipe(replace('@@STRIP@@', stripBinary))
 					.pipe(rename('SPECS/' + product.applicationName + '.spec'))
 					.pipe(es.through(function (f) { that.emit('data', f); }, function () { that.emit('end'); }));
 			}));
diff --git a/build/gulpfile.vscode.web.js b/build/gulpfile.vscode.web.js
index 50c7e6fb631..ce65c7e028b 100644
--- a/build/gulpfile.vscode.web.js
+++ b/build/gulpfile.vscode.web.js
@@ -12,15 +12,16 @@ const util = require('./lib/util');
 const { getVersion } = require('./lib/getVersion');
 const task = require('./lib/task');
 const optimize = require('./lib/optimize');
+const { readISODate } = require('./lib/date');
 const product = require('../product.json');
 const rename = require('gulp-rename');
 const filter = require('gulp-filter');
 const { getProductionDependencies } = require('./lib/dependencies');
 const vfs = require('vinyl-fs');
-const replace = require('gulp-replace');
 const packageJson = require('../package.json');
 const { compileBuildTask } = require('./gulpfile.compile');
 const extensions = require('./lib/extensions');
+const VinylFile = require('vinyl');
 
 const REPO_ROOT = path.dirname(__dirname);
 const BUILD_ROOT = path.dirname(REPO_ROOT);
@@ -31,21 +32,28 @@ const quality = product.quality;
 const version = (quality && quality !== 'stable') ? `${packageJson.version}-${quality}` : packageJson.version;
 
 const vscodeWebResourceIncludes = [
-	// Workbench
-	'out-build/vs/{base,platform,editor,workbench}/**/*.{svg,png,jpg,mp3}',
-	'out-build/vs/code/browser/workbench/*.html',
-	'out-build/vs/base/browser/ui/codicons/codicon/**/*.ttf',
-	'out-build/vs/**/markdown.css',
+
+	// NLS
+	'out-build/nls.messages.js',
+
+	// Accessibility Signals
+	'out-build/vs/platform/accessibilitySignal/browser/media/*.mp3',
+
+	// Welcome
+	'out-build/vs/workbench/contrib/welcomeGettingStarted/common/media/**/*.{svg,png}',
+
+	// Extensions
+	'out-build/vs/workbench/contrib/extensions/browser/media/{theme-icon.png,language-icon.svg}',
+	'out-build/vs/workbench/services/extensionManagement/common/media/*.{svg,png}',
 
 	// Webview
-	'out-build/vs/workbench/contrib/webview/browser/pre/*.js',
-	'out-build/vs/workbench/contrib/webview/browser/pre/*.html',
+	'out-build/vs/workbench/contrib/webview/browser/pre/*.{js,html}',
 
-	// Extension Worker
+	// Tree Sitter highlights
+	'out-build/vs/editor/common/languages/highlights/*.scm',
+
+	// Extension Host Worker
 	'out-build/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html',
-
-	// Web node paths (needed for integration tests)
-	'out-build/vs/webPackagePaths.js',
 ];
 exports.vscodeWebResourceIncludes = vscodeWebResourceIncludes;
 
@@ -55,28 +63,27 @@ const vscodeWebResources = [
 	...vscodeWebResourceIncludes,
 
 	// Excludes
-	'!out-build/vs/**/{node,electron-sandbox,electron-main}/**',
+	'!out-build/vs/**/{node,electron-sandbox,electron-main,electron-utility}/**',
 	'!out-build/vs/editor/standalone/**',
 	'!out-build/vs/workbench/**/*-tb.png',
+	'!out-build/vs/code/**/*-dev.html',
 	'!**/test/**'
 ];
 
-const buildfile = require('../src/buildfile');
+const buildfile = require('./buildfile');
 
 const vscodeWebEntryPoints = [
-	buildfile.entrypoint('vs/workbench/workbench.web.main'),
-	buildfile.base,
+	buildfile.workerEditor,
 	buildfile.workerExtensionHost,
 	buildfile.workerNotebook,
 	buildfile.workerLanguageDetection,
 	buildfile.workerLocalFileSearch,
-	buildfile.workerProfileAnalysis,
+	buildfile.workerOutputLinks,
+	buildfile.workerBackgroundTokenization,
 	buildfile.keyboardMaps,
-	buildfile.workbenchWeb
+	buildfile.workbenchWeb,
+	buildfile.entrypoint('vs/workbench/workbench.web.main.internal') // TODO@esm remove line when we stop supporting web-amd-esm-bridge
 ].flat();
-exports.vscodeWebEntryPoints = vscodeWebEntryPoints;
-
-const buildDate = new Date().toISOString();
 
 /**
  * @param {object} product The parsed product.json file contents
@@ -93,7 +100,7 @@ const createVSCodeWebProductConfigurationPatcher = (product) => {
 				...product,
 				version,
 				commit,
-				date: buildDate
+				date: readISODate('out-build')
 			});
 			return content.replace('/*BUILD->INSERT_PRODUCT_CONFIGURATION*/', () => productConfiguration.substr(1, productConfiguration.length - 2) /* without { and }*/);
 		}
@@ -157,15 +164,10 @@ const optimizeVSCodeWebTask = task.define('optimize-vscode-web', task.series(
 	optimize.optimizeTask(
 		{
 			out: 'out-vscode-web',
-			amd: {
+			esm: {
 				src: 'out-build',
-				entryPoints: vscodeWebEntryPoints.flat(),
-				otherSources: [],
+				entryPoints: vscodeWebEntryPoints,
 				resources: vscodeWebResources,
-				loaderConfig: optimize.loaderConfig(),
-				externalLoaderInfo: util.createExternalLoaderConfig(product.webEndpointUrl, commit, quality),
-				inlineAmdImages: true,
-				bundleInfo: undefined,
 				fileContentMapper: createVSCodeWebFileContentMapper('.build/web/extensions', product)
 			}
 		}
@@ -190,8 +192,21 @@ function packageTask(sourceFolderName, destinationFolderName) {
 
 		const extensions = gulp.src('.build/web/extensions/**', { base: '.build/web', dot: true });
 
-		const sources = es.merge(src, extensions)
-			.pipe(filter(['**', '!**/*.js.map'], { dot: true }));
+		const loader = gulp.src('build/loader.min', { base: 'build', dot: true }).pipe(rename('out/vs/loader.js')); // TODO@esm remove line when we stop supporting web-amd-esm-bridge
+
+		const sources = es.merge(src, extensions, loader)
+			.pipe(filter(['**', '!**/*.js.map'], { dot: true }))
+			// TODO@esm remove me once we stop supporting our web-esm-bridge
+			.pipe(es.through(function (file) {
+				if (file.relative === 'out/vs/workbench/workbench.web.main.internal.css') {
+					this.emit('data', new VinylFile({
+						contents: file.contents,
+						path: file.path.replace('workbench.web.main.internal.css', 'workbench.web.main.css'),
+						base: file.base
+					}));
+				}
+				this.emit('data', file);
+			}));
 
 		const name = product.nameShort;
 		const packageJsonStream = gulp.src(['remote/web/package.json'], { base: 'remote/web' })
@@ -200,7 +215,7 @@ function packageTask(sourceFolderName, destinationFolderName) {
 		const license = gulp.src(['remote/LICENSE'], { base: 'remote', allowEmpty: true });
 
 		const productionDependencies = getProductionDependencies(WEB_FOLDER);
-		const dependenciesSrc = productionDependencies.map(d => path.relative(REPO_ROOT, d.path)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`, `!${d}/.bin/**`]).flat();
+		const dependenciesSrc = productionDependencies.map(d => path.relative(REPO_ROOT, d)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`, `!${d}/.bin/**`]).flat();
 
 		const deps = gulp.src(dependenciesSrc, { base: 'remote/web', dot: true })
 			.pipe(filter(['**', '!**/package-lock.json']))
diff --git a/build/gulpfile.vscode.win32.js b/build/gulpfile.vscode.win32.js
index 5adfdfbfe18..98175f530dd 100644
--- a/build/gulpfile.vscode.win32.js
+++ b/build/gulpfile.vscode.win32.js
@@ -16,7 +16,6 @@ const pkg = require('../package.json');
 const product = require('../product.json');
 const vfs = require('vinyl-fs');
 const rcedit = require('rcedit');
-const mkdirp = require('mkdirp');
 
 const repoPath = path.dirname(__dirname);
 const buildPath = (/** @type {string} */ arch) => path.join(path.dirname(repoPath), `VSCode-win32-${arch}`);
@@ -75,7 +74,7 @@ function buildWin32Setup(arch, target) {
 
 		const sourcePath = buildPath(arch);
 		const outputPath = setupDir(arch, target);
-		mkdirp.sync(outputPath);
+		fs.mkdirSync(outputPath, { recursive: true });
 
 		const originalProductJsonPath = path.join(sourcePath, 'resources/app/product.json');
 		const productJsonPath = path.join(outputPath, 'product.json');
diff --git a/build/hygiene.js b/build/hygiene.js
index bc64a11f8e9..2edd9470c0b 100644
--- a/build/hygiene.js
+++ b/build/hygiene.js
@@ -21,7 +21,7 @@ const copyrightHeaderLines = [
 ];
 
 function hygiene(some, linting = true) {
-	const gulpeslint = require('gulp-eslint');
+	const eslint = require('./gulp-eslint');
 	const gulpstylelint = require('./stylelint');
 	const formatter = require('./lib/formatter');
 
@@ -145,11 +145,13 @@ function hygiene(some, linting = true) {
 
 	const productJsonFilter = filter('product.json', { restore: true });
 	const snapshotFilter = filter(['**', '!**/*.snap', '!**/*.snap.actual']);
+	const yarnLockFilter = filter(['**', '!**/yarn.lock']);
 	const unicodeFilterStream = filter(unicodeFilter, { restore: true });
 
 	const result = input
 		.pipe(filter((f) => !f.stat.isDirectory()))
 		.pipe(snapshotFilter)
+		.pipe(yarnLockFilter)
 		.pipe(productJsonFilter)
 		.pipe(process.env['BUILD_SOURCEVERSION'] ? es.through() : productJson)
 		.pipe(productJsonFilter.restore)
@@ -170,13 +172,7 @@ function hygiene(some, linting = true) {
 			result
 				.pipe(filter(eslintFilter))
 				.pipe(
-					gulpeslint({
-						configFile: '.eslintrc.json'
-					})
-				)
-				.pipe(gulpeslint.formatEach('compact'))
-				.pipe(
-					gulpeslint.results((results) => {
+					eslint((results) => {
 						errorCount += results.warningCount;
 						errorCount += results.errorCount;
 					})
diff --git a/build/lib/asar.js b/build/lib/asar.js
index 31845f2f2dd..19285ef7100 100644
--- a/build/lib/asar.js
+++ b/build/lib/asar.js
@@ -11,7 +11,7 @@ const pickle = require('chromium-pickle-js');
 const Filesystem = require('asar/lib/filesystem');
 const VinylFile = require("vinyl");
 const minimatch = require("minimatch");
-function createAsar(folderPath, unpackGlobs, destFilename) {
+function createAsar(folderPath, unpackGlobs, skipGlobs, duplicateGlobs, destFilename) {
     const shouldUnpackFile = (file) => {
         for (let i = 0; i < unpackGlobs.length; i++) {
             if (minimatch(file.relative, unpackGlobs[i])) {
@@ -20,6 +20,24 @@ function createAsar(folderPath, unpackGlobs, destFilename) {
         }
         return false;
     };
+    const shouldSkipFile = (file) => {
+        for (const skipGlob of skipGlobs) {
+            if (minimatch(file.relative, skipGlob)) {
+                return true;
+            }
+        }
+        return false;
+    };
+    // Files that should be duplicated between
+    // node_modules.asar and node_modules
+    const shouldDuplicateFile = (file) => {
+        for (const duplicateGlob of duplicateGlobs) {
+            if (minimatch(file.relative, duplicateGlob)) {
+                return true;
+            }
+        }
+        return false;
+    };
     const filesystem = new Filesystem(folderPath);
     const out = [];
     // Keep track of pending inserts
@@ -64,6 +82,23 @@ function createAsar(folderPath, unpackGlobs, destFilename) {
         if (!file.stat.isFile()) {
             throw new Error(`unknown item in stream!`);
         }
+        if (shouldSkipFile(file)) {
+            this.queue(new VinylFile({
+                base: '.',
+                path: file.path,
+                stat: file.stat,
+                contents: file.contents
+            }));
+            return;
+        }
+        if (shouldDuplicateFile(file)) {
+            this.queue(new VinylFile({
+                base: '.',
+                path: file.path,
+                stat: file.stat,
+                contents: file.contents
+            }));
+        }
         const shouldUnpack = shouldUnpackFile(file);
         insertFile(file.relative, { size: file.contents.length, mode: file.stat.mode }, shouldUnpack);
         if (shouldUnpack) {
diff --git a/build/lib/asar.ts b/build/lib/asar.ts
index 44a6416bdfb..0b225ab1624 100644
--- a/build/lib/asar.ts
+++ b/build/lib/asar.ts
@@ -17,7 +17,7 @@ declare class AsarFilesystem {
 	insertFile(path: string, shouldUnpack: boolean, file: { stat: { size: number; mode: number } }, options: {}): Promise<void>;
 }
 
-export function createAsar(folderPath: string, unpackGlobs: string[], destFilename: string): NodeJS.ReadWriteStream {
+export function createAsar(folderPath: string, unpackGlobs: string[], skipGlobs: string[], duplicateGlobs: string[], destFilename: string): NodeJS.ReadWriteStream {
 
 	const shouldUnpackFile = (file: VinylFile): boolean => {
 		for (let i = 0; i < unpackGlobs.length; i++) {
@@ -28,6 +28,26 @@ export function createAsar(folderPath: string, unpackGlobs: string[], destFilena
 		return false;
 	};
 
+	const shouldSkipFile = (file: VinylFile): boolean => {
+		for (const skipGlob of skipGlobs) {
+			if (minimatch(file.relative, skipGlob)) {
+				return true;
+			}
+		}
+		return false;
+	};
+
+	// Files that should be duplicated between
+	// node_modules.asar and node_modules
+	const shouldDuplicateFile = (file: VinylFile): boolean => {
+		for (const duplicateGlob of duplicateGlobs) {
+			if (minimatch(file.relative, duplicateGlob)) {
+				return true;
+			}
+		}
+		return false;
+	};
+
 	const filesystem = new Filesystem(folderPath);
 	const out: Buffer[] = [];
 
@@ -78,6 +98,23 @@ export function createAsar(folderPath: string, unpackGlobs: string[], destFilena
 		if (!file.stat.isFile()) {
 			throw new Error(`unknown item in stream!`);
 		}
+		if (shouldSkipFile(file)) {
+			this.queue(new VinylFile({
+				base: '.',
+				path: file.path,
+				stat: file.stat,
+				contents: file.contents
+			}));
+			return;
+		}
+		if (shouldDuplicateFile(file)) {
+			this.queue(new VinylFile({
+				base: '.',
+				path: file.path,
+				stat: file.stat,
+				contents: file.contents
+			}));
+		}
 		const shouldUnpack = shouldUnpackFile(file);
 		insertFile(file.relative, { size: file.contents.length, mode: file.stat.mode }, shouldUnpack);
 
diff --git a/build/lib/builtInExtensions.js b/build/lib/builtInExtensions.js
index 463ce16e18d..ac784c03506 100644
--- a/build/lib/builtInExtensions.js
+++ b/build/lib/builtInExtensions.js
@@ -16,7 +16,6 @@ const vfs = require("vinyl-fs");
 const ext = require("./extensions");
 const fancyLog = require("fancy-log");
 const ansiColors = require("ansi-colors");
-const mkdirp = require('mkdirp');
 const root = path.dirname(path.dirname(__dirname));
 const productjson = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8'));
 const builtInExtensions = productjson.builtInExtensions || [];
@@ -107,7 +106,7 @@ function readControlFile() {
     }
 }
 function writeControlFile(control) {
-    mkdirp.sync(path.dirname(controlFilePath));
+    fs.mkdirSync(path.dirname(controlFilePath), { recursive: true });
     fs.writeFileSync(controlFilePath, JSON.stringify(control, null, 2));
 }
 function getBuiltInExtensions() {
diff --git a/build/lib/builtInExtensions.ts b/build/lib/builtInExtensions.ts
index fefed436bb9..8b831d42d44 100644
--- a/build/lib/builtInExtensions.ts
+++ b/build/lib/builtInExtensions.ts
@@ -15,8 +15,6 @@ import * as fancyLog from 'fancy-log';
 import * as ansiColors from 'ansi-colors';
 import { Stream } from 'stream';
 
-const mkdirp = require('mkdirp');
-
 export interface IExtensionDefinition {
 	name: string;
 	version: string;
@@ -147,7 +145,7 @@ function readControlFile(): IControlFile {
 }
 
 function writeControlFile(control: IControlFile): void {
-	mkdirp.sync(path.dirname(controlFilePath));
+	fs.mkdirSync(path.dirname(controlFilePath), { recursive: true });
 	fs.writeFileSync(controlFilePath, JSON.stringify(control, null, 2));
 }
 
diff --git a/build/lib/builtInExtensionsCG.js b/build/lib/builtInExtensionsCG.js
index 30b6791b3a0..6a1e5ea539e 100644
--- a/build/lib/builtInExtensionsCG.js
+++ b/build/lib/builtInExtensionsCG.js
@@ -15,7 +15,7 @@ const builtInExtensions = productjson.builtInExtensions || [];
 const webBuiltInExtensions = productjson.webBuiltInExtensions || [];
 const token = process.env['GITHUB_TOKEN'];
 const contentBasePath = 'raw.githubusercontent.com';
-const contentFileNames = ['package.json', 'package-lock.json', 'yarn.lock'];
+const contentFileNames = ['package.json', 'package-lock.json'];
 async function downloadExtensionDetails(extension) {
     const extensionLabel = `${extension.name}@${extension.version}`;
     const repository = url.parse(extension.repo).path.substr(1);
@@ -58,9 +58,8 @@ async function downloadExtensionDetails(extension) {
     if (!results.find(r => r.fileName === 'package.json')?.body) {
         // throw new Error(`The "package.json" file could not be found for the built-in extension - ${extensionLabel}`);
     }
-    if (!results.find(r => r.fileName === 'package-lock.json')?.body &&
-        !results.find(r => r.fileName === 'yarn.lock')?.body) {
-        // throw new Error(`The "package-lock.json"/"yarn.lock" could not be found for the built-in extension - ${extensionLabel}`);
+    if (!results.find(r => r.fileName === 'package-lock.json')?.body) {
+        // throw new Error(`The "package-lock.json" could not be found for the built-in extension - ${extensionLabel}`);
     }
 }
 async function main() {
diff --git a/build/lib/builtInExtensionsCG.ts b/build/lib/builtInExtensionsCG.ts
index 62d09498221..9d11dea3dca 100644
--- a/build/lib/builtInExtensionsCG.ts
+++ b/build/lib/builtInExtensionsCG.ts
@@ -17,7 +17,7 @@ const webBuiltInExtensions = <IExtensionDefinition[]>productjson.webBuiltInExten
 const token = process.env['GITHUB_TOKEN'];
 
 const contentBasePath = 'raw.githubusercontent.com';
-const contentFileNames = ['package.json', 'package-lock.json', 'yarn.lock'];
+const contentFileNames = ['package.json', 'package-lock.json'];
 
 async function downloadExtensionDetails(extension: IExtensionDefinition): Promise<void> {
 	const extensionLabel = `${extension.name}@${extension.version}`;
@@ -61,9 +61,8 @@ async function downloadExtensionDetails(extension: IExtensionDefinition): Promis
 	if (!results.find(r => r.fileName === 'package.json')?.body) {
 		// throw new Error(`The "package.json" file could not be found for the built-in extension - ${extensionLabel}`);
 	}
-	if (!results.find(r => r.fileName === 'package-lock.json')?.body &&
-		!results.find(r => r.fileName === 'yarn.lock')?.body) {
-		// throw new Error(`The "package-lock.json"/"yarn.lock" could not be found for the built-in extension - ${extensionLabel}`);
+	if (!results.find(r => r.fileName === 'package-lock.json')?.body) {
+		// throw new Error(`The "package-lock.json" could not be found for the built-in extension - ${extensionLabel}`);
 	}
 }
 
diff --git a/build/lib/bundle.js b/build/lib/bundle.js
index 1a2f870991f..627b9966700 100644
--- a/build/lib/bundle.js
+++ b/build/lib/bundle.js
@@ -5,6 +5,7 @@
  *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bundle = bundle;
+exports.removeAllTSBoilerplate = removeAllTSBoilerplate;
 const fs = require("fs");
 const path = require("path");
 const vm = require("vm");
@@ -36,14 +37,10 @@ function bundle(entryPoints, config, callback) {
     const loader = loaderModule.exports;
     config.isBuild = true;
     config.paths = config.paths || {};
-    if (!config.paths['vs/nls']) {
-        config.paths['vs/nls'] = 'out-build/vs/nls.build';
-    }
     if (!config.paths['vs/css']) {
         config.paths['vs/css'] = 'out-build/vs/css.build';
     }
     config.buildForceInvokeFactory = config.buildForceInvokeFactory || {};
-    config.buildForceInvokeFactory['vs/nls'] = true;
     config.buildForceInvokeFactory['vs/css'] = true;
     loader.config(config);
     loader(['require'], (localRequire) => {
@@ -53,15 +50,11 @@ function bundle(entryPoints, config, callback) {
                 r += '.js';
             }
             // avoid packaging the build version of plugins:
-            r = r.replace('vs/nls.build.js', 'vs/nls.js');
             r = r.replace('vs/css.build.js', 'vs/css.js');
             return { path: r, amdModuleId: entry.amdModuleId };
         };
         for (const moduleId in entryPointsMap) {
             const entryPoint = entryPointsMap[moduleId];
-            if (entryPoint.append) {
-                entryPoint.append = entryPoint.append.map(resolvePath);
-            }
             if (entryPoint.prepend) {
                 entryPoint.prepend = entryPoint.prepend.map(resolvePath);
             }
@@ -109,7 +102,7 @@ function emitEntryPoints(modules, entryPoints) {
             return allDependencies[module];
         });
         bundleData.bundles[moduleToBundle] = includedModules;
-        const res = emitEntryPoint(modulesMap, modulesGraph, moduleToBundle, includedModules, info.prepend || [], info.append || [], info.dest);
+        const res = emitEntryPoint(modulesMap, modulesGraph, moduleToBundle, includedModules, info.prepend || [], info.dest);
         result = result.concat(res.files);
         for (const pluginName in res.usedPlugins) {
             usedPlugins[pluginName] = usedPlugins[pluginName] || res.usedPlugins[pluginName];
@@ -132,7 +125,7 @@ function emitEntryPoints(modules, entryPoints) {
     });
     return {
         // TODO@TS 2.1.2
-        files: extractStrings(removeDuplicateTSBoilerplate(result)),
+        files: extractStrings(removeAllDuplicateTSBoilerplate(result)),
         bundleData: bundleData
     };
 }
@@ -221,61 +214,68 @@ function extractStrings(destFiles) {
     });
     return destFiles;
 }
-function removeDuplicateTSBoilerplate(destFiles) {
-    // Taken from typescript compiler => emitFiles
-    const BOILERPLATE = [
-        { start: /^var __extends/, end: /^}\)\(\);$/ },
-        { start: /^var __assign/, end: /^};$/ },
-        { start: /^var __decorate/, end: /^};$/ },
-        { start: /^var __metadata/, end: /^};$/ },
-        { start: /^var __param/, end: /^};$/ },
-        { start: /^var __awaiter/, end: /^};$/ },
-        { start: /^var __generator/, end: /^};$/ },
-        { start: /^var __createBinding/, end: /^}\)\);$/ },
-        { start: /^var __setModuleDefault/, end: /^}\);$/ },
-        { start: /^var __importStar/, end: /^};$/ },
-    ];
+function removeAllDuplicateTSBoilerplate(destFiles) {
     destFiles.forEach((destFile) => {
         const SEEN_BOILERPLATE = [];
         destFile.sources.forEach((source) => {
-            const lines = source.contents.split(/\r\n|\n|\r/);
-            const newLines = [];
-            let IS_REMOVING_BOILERPLATE = false, END_BOILERPLATE;
-            for (let i = 0; i < lines.length; i++) {
-                const line = lines[i];
-                if (IS_REMOVING_BOILERPLATE) {
-                    newLines.push('');
-                    if (END_BOILERPLATE.test(line)) {
-                        IS_REMOVING_BOILERPLATE = false;
-                    }
-                }
-                else {
-                    for (let j = 0; j < BOILERPLATE.length; j++) {
-                        const boilerplate = BOILERPLATE[j];
-                        if (boilerplate.start.test(line)) {
-                            if (SEEN_BOILERPLATE[j]) {
-                                IS_REMOVING_BOILERPLATE = true;
-                                END_BOILERPLATE = boilerplate.end;
-                            }
-                            else {
-                                SEEN_BOILERPLATE[j] = true;
-                            }
-                        }
-                    }
-                    if (IS_REMOVING_BOILERPLATE) {
-                        newLines.push('');
-                    }
-                    else {
-                        newLines.push(line);
-                    }
-                }
-            }
-            source.contents = newLines.join('\n');
+            source.contents = removeDuplicateTSBoilerplate(source.contents, SEEN_BOILERPLATE);
         });
     });
     return destFiles;
 }
-function emitEntryPoint(modulesMap, deps, entryPoint, includedModules, prepend, append, dest) {
+function removeAllTSBoilerplate(source) {
+    const seen = new Array(BOILERPLATE.length).fill(true, 0, 10);
+    return removeDuplicateTSBoilerplate(source, seen);
+}
+// Taken from typescript compiler => emitFiles
+const BOILERPLATE = [
+    { start: /^var __extends/, end: /^}\)\(\);$/ },
+    { start: /^var __assign/, end: /^};$/ },
+    { start: /^var __decorate/, end: /^};$/ },
+    { start: /^var __metadata/, end: /^};$/ },
+    { start: /^var __param/, end: /^};$/ },
+    { start: /^var __awaiter/, end: /^};$/ },
+    { start: /^var __generator/, end: /^};$/ },
+    { start: /^var __createBinding/, end: /^}\)\);$/ },
+    { start: /^var __setModuleDefault/, end: /^}\);$/ },
+    { start: /^var __importStar/, end: /^};$/ },
+];
+function removeDuplicateTSBoilerplate(source, SEEN_BOILERPLATE = []) {
+    const lines = source.split(/\r\n|\n|\r/);
+    const newLines = [];
+    let IS_REMOVING_BOILERPLATE = false, END_BOILERPLATE;
+    for (let i = 0; i < lines.length; i++) {
+        const line = lines[i];
+        if (IS_REMOVING_BOILERPLATE) {
+            newLines.push('');
+            if (END_BOILERPLATE.test(line)) {
+                IS_REMOVING_BOILERPLATE = false;
+            }
+        }
+        else {
+            for (let j = 0; j < BOILERPLATE.length; j++) {
+                const boilerplate = BOILERPLATE[j];
+                if (boilerplate.start.test(line)) {
+                    if (SEEN_BOILERPLATE[j]) {
+                        IS_REMOVING_BOILERPLATE = true;
+                        END_BOILERPLATE = boilerplate.end;
+                    }
+                    else {
+                        SEEN_BOILERPLATE[j] = true;
+                    }
+                }
+            }
+            if (IS_REMOVING_BOILERPLATE) {
+                newLines.push('');
+            }
+            else {
+                newLines.push(line);
+            }
+        }
+    }
+    return newLines.join('\n');
+}
+function emitEntryPoint(modulesMap, deps, entryPoint, includedModules, prepend, dest) {
     if (!dest) {
         dest = entryPoint + '.js';
     }
@@ -349,8 +349,7 @@ function emitEntryPoint(modulesMap, deps, entryPoint, includedModules, prepend,
         };
     };
     const toPrepend = (prepend || []).map(toIFile);
-    const toAppend = (append || []).map(toIFile);
-    mainResult.sources = toPrepend.concat(mainResult.sources).concat(toAppend);
+    mainResult.sources = toPrepend.concat(mainResult.sources);
     return {
         files: results,
         usedPlugins: usedPlugins
diff --git a/build/lib/bundle.ts b/build/lib/bundle.ts
index 2efa081b471..58995b7d5d1 100644
--- a/build/lib/bundle.ts
+++ b/build/lib/bundle.ts
@@ -51,8 +51,8 @@ export interface IEntryPoint {
 	name: string;
 	include?: string[];
 	exclude?: string[];
+	/** @deprecated unsupported by ESM */
 	prepend?: IExtraFile[];
-	append?: IExtraFile[];
 	dest?: string;
 }
 
@@ -138,14 +138,10 @@ export function bundle(entryPoints: IEntryPoint[], config: ILoaderConfig, callba
 	const loader: any = loaderModule.exports;
 	config.isBuild = true;
 	config.paths = config.paths || {};
-	if (!config.paths['vs/nls']) {
-		config.paths['vs/nls'] = 'out-build/vs/nls.build';
-	}
 	if (!config.paths['vs/css']) {
 		config.paths['vs/css'] = 'out-build/vs/css.build';
 	}
 	config.buildForceInvokeFactory = config.buildForceInvokeFactory || {};
-	config.buildForceInvokeFactory['vs/nls'] = true;
 	config.buildForceInvokeFactory['vs/css'] = true;
 	loader.config(config);
 
@@ -156,15 +152,11 @@ export function bundle(entryPoints: IEntryPoint[], config: ILoaderConfig, callba
 				r += '.js';
 			}
 			// avoid packaging the build version of plugins:
-			r = r.replace('vs/nls.build.js', 'vs/nls.js');
 			r = r.replace('vs/css.build.js', 'vs/css.js');
 			return { path: r, amdModuleId: entry.amdModuleId };
 		};
 		for (const moduleId in entryPointsMap) {
 			const entryPoint = entryPointsMap[moduleId];
-			if (entryPoint.append) {
-				entryPoint.append = entryPoint.append.map(resolvePath);
-			}
 			if (entryPoint.prepend) {
 				entryPoint.prepend = entryPoint.prepend.map(resolvePath);
 			}
@@ -228,7 +220,6 @@ function emitEntryPoints(modules: IBuildModuleInfo[], entryPoints: IEntryPointMa
 			moduleToBundle,
 			includedModules,
 			info.prepend || [],
-			info.append || [],
 			info.dest
 		);
 
@@ -256,7 +247,7 @@ function emitEntryPoints(modules: IBuildModuleInfo[], entryPoints: IEntryPointMa
 
 	return {
 		// TODO@TS 2.1.2
-		files: extractStrings(removeDuplicateTSBoilerplate(result)),
+		files: extractStrings(removeAllDuplicateTSBoilerplate(result)),
 		bundleData: bundleData
 	};
 }
@@ -355,61 +346,70 @@ function extractStrings(destFiles: IConcatFile[]): IConcatFile[] {
 	return destFiles;
 }
 
-function removeDuplicateTSBoilerplate(destFiles: IConcatFile[]): IConcatFile[] {
-	// Taken from typescript compiler => emitFiles
-	const BOILERPLATE = [
-		{ start: /^var __extends/, end: /^}\)\(\);$/ },
-		{ start: /^var __assign/, end: /^};$/ },
-		{ start: /^var __decorate/, end: /^};$/ },
-		{ start: /^var __metadata/, end: /^};$/ },
-		{ start: /^var __param/, end: /^};$/ },
-		{ start: /^var __awaiter/, end: /^};$/ },
-		{ start: /^var __generator/, end: /^};$/ },
-		{ start: /^var __createBinding/, end: /^}\)\);$/ },
-		{ start: /^var __setModuleDefault/, end: /^}\);$/ },
-		{ start: /^var __importStar/, end: /^};$/ },
-	];
-
+function removeAllDuplicateTSBoilerplate(destFiles: IConcatFile[]): IConcatFile[] {
 	destFiles.forEach((destFile) => {
 		const SEEN_BOILERPLATE: boolean[] = [];
 		destFile.sources.forEach((source) => {
-			const lines = source.contents.split(/\r\n|\n|\r/);
-			const newLines: string[] = [];
-			let IS_REMOVING_BOILERPLATE = false, END_BOILERPLATE: RegExp;
-
-			for (let i = 0; i < lines.length; i++) {
-				const line = lines[i];
-				if (IS_REMOVING_BOILERPLATE) {
-					newLines.push('');
-					if (END_BOILERPLATE!.test(line)) {
-						IS_REMOVING_BOILERPLATE = false;
-					}
-				} else {
-					for (let j = 0; j < BOILERPLATE.length; j++) {
-						const boilerplate = BOILERPLATE[j];
-						if (boilerplate.start.test(line)) {
-							if (SEEN_BOILERPLATE[j]) {
-								IS_REMOVING_BOILERPLATE = true;
-								END_BOILERPLATE = boilerplate.end;
-							} else {
-								SEEN_BOILERPLATE[j] = true;
-							}
-						}
-					}
-					if (IS_REMOVING_BOILERPLATE) {
-						newLines.push('');
-					} else {
-						newLines.push(line);
-					}
-				}
-			}
-			source.contents = newLines.join('\n');
+			source.contents = removeDuplicateTSBoilerplate(source.contents, SEEN_BOILERPLATE);
 		});
 	});
 
 	return destFiles;
 }
 
+export function removeAllTSBoilerplate(source: string) {
+	const seen = new Array<boolean>(BOILERPLATE.length).fill(true, 0, 10);
+	return removeDuplicateTSBoilerplate(source, seen);
+}
+
+// Taken from typescript compiler => emitFiles
+const BOILERPLATE = [
+	{ start: /^var __extends/, end: /^}\)\(\);$/ },
+	{ start: /^var __assign/, end: /^};$/ },
+	{ start: /^var __decorate/, end: /^};$/ },
+	{ start: /^var __metadata/, end: /^};$/ },
+	{ start: /^var __param/, end: /^};$/ },
+	{ start: /^var __awaiter/, end: /^};$/ },
+	{ start: /^var __generator/, end: /^};$/ },
+	{ start: /^var __createBinding/, end: /^}\)\);$/ },
+	{ start: /^var __setModuleDefault/, end: /^}\);$/ },
+	{ start: /^var __importStar/, end: /^};$/ },
+];
+
+function removeDuplicateTSBoilerplate(source: string, SEEN_BOILERPLATE: boolean[] = []): string {
+	const lines = source.split(/\r\n|\n|\r/);
+	const newLines: string[] = [];
+	let IS_REMOVING_BOILERPLATE = false, END_BOILERPLATE: RegExp;
+
+	for (let i = 0; i < lines.length; i++) {
+		const line = lines[i];
+		if (IS_REMOVING_BOILERPLATE) {
+			newLines.push('');
+			if (END_BOILERPLATE!.test(line)) {
+				IS_REMOVING_BOILERPLATE = false;
+			}
+		} else {
+			for (let j = 0; j < BOILERPLATE.length; j++) {
+				const boilerplate = BOILERPLATE[j];
+				if (boilerplate.start.test(line)) {
+					if (SEEN_BOILERPLATE[j]) {
+						IS_REMOVING_BOILERPLATE = true;
+						END_BOILERPLATE = boilerplate.end;
+					} else {
+						SEEN_BOILERPLATE[j] = true;
+					}
+				}
+			}
+			if (IS_REMOVING_BOILERPLATE) {
+				newLines.push('');
+			} else {
+				newLines.push(line);
+			}
+		}
+	}
+	return newLines.join('\n');
+}
+
 interface IPluginMap {
 	[moduleId: string]: ILoaderPlugin;
 }
@@ -425,7 +425,6 @@ function emitEntryPoint(
 	entryPoint: string,
 	includedModules: string[],
 	prepend: IExtraFile[],
-	append: IExtraFile[],
 	dest: string | undefined
 ): IEmitEntryPointResult {
 	if (!dest) {
@@ -511,9 +510,8 @@ function emitEntryPoint(
 	};
 
 	const toPrepend = (prepend || []).map(toIFile);
-	const toAppend = (append || []).map(toIFile);
 
-	mainResult.sources = toPrepend.concat(mainResult.sources).concat(toAppend);
+	mainResult.sources = toPrepend.concat(mainResult.sources);
 
 	return {
 		files: results,
diff --git a/build/lib/compilation.js b/build/lib/compilation.js
index b44cbefe78a..e6fe4b592a6 100644
--- a/build/lib/compilation.js
+++ b/build/lib/compilation.js
@@ -41,7 +41,7 @@ function getTypeScriptCompilerOptions(src) {
     options.newLine = /\r\n/.test(fs.readFileSync(__filename, 'utf8')) ? 0 : 1;
     return options;
 }
-function createCompile(src, build, emitError, transpileOnly) {
+function createCompile(src, { build, emitError, transpileOnly, preserveEnglish }) {
     const tsb = require('./tsb');
     const sourcemaps = require('gulp-sourcemaps');
     const projectPath = path.join(__dirname, '../../', src, 'tsconfig.json');
@@ -71,7 +71,7 @@ function createCompile(src, build, emitError, transpileOnly) {
             .pipe(util.loadSourcemaps())
             .pipe(compilation(token))
             .pipe(noDeclarationsFilter)
-            .pipe(util.$if(build, nls.nls()))
+            .pipe(util.$if(build, nls.nls({ preserveEnglish })))
             .pipe(noDeclarationsFilter.restore)
             .pipe(util.$if(!transpileOnly, sourcemaps.write('.', {
             addComment: false,
@@ -90,7 +90,7 @@ function createCompile(src, build, emitError, transpileOnly) {
 }
 function transpileTask(src, out, swc) {
     const task = () => {
-        const transpile = createCompile(src, false, true, { swc });
+        const transpile = createCompile(src, { build: false, emitError: true, transpileOnly: { swc }, preserveEnglish: false });
         const srcPipe = gulp.src(`${src}/**`, { base: `${src}` });
         return srcPipe
             .pipe(transpile())
@@ -104,7 +104,7 @@ function compileTask(src, out, build, options = {}) {
         if (os.totalmem() < 4_000_000_000) {
             throw new Error('compilation requires 4GB of RAM');
         }
-        const compile = createCompile(src, build, true, false);
+        const compile = createCompile(src, { build, emitError: true, transpileOnly: false, preserveEnglish: !!options.preserveEnglish });
         const srcPipe = gulp.src(`${src}/**`, { base: `${src}` });
         const generator = new MonacoGenerator(false);
         if (src === 'src') {
@@ -139,11 +139,11 @@ function compileTask(src, out, build, options = {}) {
     task.taskName = `compile-${path.basename(src)}`;
     return task;
 }
-function watchTask(out, build) {
+function watchTask(out, build, srcPath = 'src') {
     const task = () => {
-        const compile = createCompile('src', build, false, false);
-        const src = gulp.src('src/**', { base: 'src' });
-        const watchSrc = watch('src/**', { base: 'src', readDelay: 200 });
+        const compile = createCompile(srcPath, { build, emitError: false, transpileOnly: false, preserveEnglish: false });
+        const src = gulp.src(`${srcPath}/**`, { base: srcPath });
+        const watchSrc = watch(`${srcPath}/**`, { base: srcPath, readDelay: 200 });
         const generator = new MonacoGenerator(true);
         generator.execute();
         return watchSrc
@@ -234,7 +234,7 @@ class MonacoGenerator {
 function generateApiProposalNames() {
     let eol;
     try {
-        const src = fs.readFileSync('src/vs/workbench/services/extensions/common/extensionsApiProposals.ts', 'utf-8');
+        const src = fs.readFileSync('src/vs/platform/extensions/common/extensionsApiProposals.ts', 'utf-8');
         const match = /\r?\n/m.exec(src);
         eol = match ? match[0] : os.EOL;
     }
@@ -242,18 +242,27 @@ function generateApiProposalNames() {
         eol = os.EOL;
     }
     const pattern = /vscode\.proposed\.([a-zA-Z\d]+)\.d\.ts$/;
-    const proposalNames = new Set();
+    const versionPattern = /^\s*\/\/\s*version\s*:\s*(\d+)\s*$/mi;
+    const proposals = new Map();
     const input = es.through();
     const output = input
         .pipe(util.filter((f) => pattern.test(f.path)))
         .pipe(es.through((f) => {
         const name = path.basename(f.path);
         const match = pattern.exec(name);
-        if (match) {
-            proposalNames.add(match[1]);
+        if (!match) {
+            return;
         }
+        const proposalName = match[1];
+        const contents = f.contents.toString('utf8');
+        const versionMatch = versionPattern.exec(contents);
+        const version = versionMatch ? versionMatch[1] : undefined;
+        proposals.set(proposalName, {
+            proposal: `https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.${proposalName}.d.ts`,
+            version: version ? parseInt(version) : undefined
+        });
     }, function () {
-        const names = [...proposalNames.values()].sort();
+        const names = [...proposals.keys()].sort();
         const contents = [
             '/*---------------------------------------------------------------------------------------------',
             ' *  Copyright (c) Microsoft Corporation. All rights reserved.',
@@ -262,14 +271,18 @@ function generateApiProposalNames() {
             '',
             '// THIS IS A GENERATED FILE. DO NOT EDIT DIRECTLY.',
             '',
-            'export const allApiProposals = Object.freeze({',
-            `${names.map(name => `\t${name}: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.${name}.d.ts'`).join(`,${eol}`)}`,
-            '});',
-            'export type ApiProposalName = keyof typeof allApiProposals;',
+            'const _allApiProposals = {',
+            `${names.map(proposalName => {
+                const proposal = proposals.get(proposalName);
+                return `\t${proposalName}: {${eol}\t\tproposal: '${proposal.proposal}',${eol}${proposal.version ? `\t\tversion: ${proposal.version}${eol}` : ''}\t}`;
+            }).join(`,${eol}`)}`,
+            '};',
+            'export const allApiProposals = Object.freeze<{ [proposalName: string]: Readonly<{ proposal: string; version?: number }> }>(_allApiProposals);',
+            'export type ApiProposalName = keyof typeof _allApiProposals;',
             '',
         ].join(eol);
         this.emit('data', new File({
-            path: 'vs/workbench/services/extensions/common/extensionsApiProposals.ts',
+            path: 'vs/platform/extensions/common/extensionsApiProposals.ts',
             contents: Buffer.from(contents)
         }));
         this.emit('end');
diff --git a/build/lib/compilation.ts b/build/lib/compilation.ts
index b88d0d29003..978fb15df9e 100644
--- a/build/lib/compilation.ts
+++ b/build/lib/compilation.ts
@@ -42,7 +42,14 @@ function getTypeScriptCompilerOptions(src: string): ts.CompilerOptions {
 	return options;
 }
 
-function createCompile(src: string, build: boolean, emitError: boolean, transpileOnly: boolean | { swc: boolean }) {
+interface ICompileTaskOptions {
+	readonly build: boolean;
+	readonly emitError: boolean;
+	readonly transpileOnly: boolean | { swc: boolean };
+	readonly preserveEnglish: boolean;
+}
+
+function createCompile(src: string, { build, emitError, transpileOnly, preserveEnglish }: ICompileTaskOptions) {
 	const tsb = require('./tsb') as typeof import('./tsb');
 	const sourcemaps = require('gulp-sourcemaps') as typeof import('gulp-sourcemaps');
 
@@ -79,7 +86,7 @@ function createCompile(src: string, build: boolean, emitError: boolean, transpil
 			.pipe(util.loadSourcemaps())
 			.pipe(compilation(token))
 			.pipe(noDeclarationsFilter)
-			.pipe(util.$if(build, nls.nls()))
+			.pipe(util.$if(build, nls.nls({ preserveEnglish })))
 			.pipe(noDeclarationsFilter.restore)
 			.pipe(util.$if(!transpileOnly, sourcemaps.write('.', {
 				addComment: false,
@@ -102,7 +109,7 @@ export function transpileTask(src: string, out: string, swc: boolean): task.Stre
 
 	const task = () => {
 
-		const transpile = createCompile(src, false, true, { swc });
+		const transpile = createCompile(src, { build: false, emitError: true, transpileOnly: { swc }, preserveEnglish: false });
 		const srcPipe = gulp.src(`${src}/**`, { base: `${src}` });
 
 		return srcPipe
@@ -114,7 +121,7 @@ export function transpileTask(src: string, out: string, swc: boolean): task.Stre
 	return task;
 }
 
-export function compileTask(src: string, out: string, build: boolean, options: { disableMangle?: boolean } = {}): task.StreamTask {
+export function compileTask(src: string, out: string, build: boolean, options: { disableMangle?: boolean; preserveEnglish?: boolean } = {}): task.StreamTask {
 
 	const task = () => {
 
@@ -122,7 +129,7 @@ export function compileTask(src: string, out: string, build: boolean, options: {
 			throw new Error('compilation requires 4GB of RAM');
 		}
 
-		const compile = createCompile(src, build, true, false);
+		const compile = createCompile(src, { build, emitError: true, transpileOnly: false, preserveEnglish: !!options.preserveEnglish });
 		const srcPipe = gulp.src(`${src}/**`, { base: `${src}` });
 		const generator = new MonacoGenerator(false);
 		if (src === 'src') {
@@ -163,13 +170,13 @@ export function compileTask(src: string, out: string, build: boolean, options: {
 	return task;
 }
 
-export function watchTask(out: string, build: boolean): task.StreamTask {
+export function watchTask(out: string, build: boolean, srcPath: string = 'src'): task.StreamTask {
 
 	const task = () => {
-		const compile = createCompile('src', build, false, false);
+		const compile = createCompile(srcPath, { build, emitError: false, transpileOnly: false, preserveEnglish: false });
 
-		const src = gulp.src('src/**', { base: 'src' });
-		const watchSrc = watch('src/**', { base: 'src', readDelay: 200 });
+		const src = gulp.src(`${srcPath}/**`, { base: srcPath });
+		const watchSrc = watch(`${srcPath}/**`, { base: srcPath, readDelay: 200 });
 
 		const generator = new MonacoGenerator(true);
 		generator.execute();
@@ -275,7 +282,7 @@ function generateApiProposalNames() {
 	let eol: string;
 
 	try {
-		const src = fs.readFileSync('src/vs/workbench/services/extensions/common/extensionsApiProposals.ts', 'utf-8');
+		const src = fs.readFileSync('src/vs/platform/extensions/common/extensionsApiProposals.ts', 'utf-8');
 		const match = /\r?\n/m.exec(src);
 		eol = match ? match[0] : os.EOL;
 	} catch {
@@ -283,7 +290,8 @@ function generateApiProposalNames() {
 	}
 
 	const pattern = /vscode\.proposed\.([a-zA-Z\d]+)\.d\.ts$/;
-	const proposalNames = new Set<string>();
+	const versionPattern = /^\s*\/\/\s*version\s*:\s*(\d+)\s*$/mi;
+	const proposals = new Map<string, { proposal: string; version?: number }>();
 
 	const input = es.through();
 	const output = input
@@ -292,11 +300,22 @@ function generateApiProposalNames() {
 			const name = path.basename(f.path);
 			const match = pattern.exec(name);
 
-			if (match) {
-				proposalNames.add(match[1]);
+			if (!match) {
+				return;
 			}
+
+			const proposalName = match[1];
+
+			const contents = f.contents.toString('utf8');
+			const versionMatch = versionPattern.exec(contents);
+			const version = versionMatch ? versionMatch[1] : undefined;
+
+			proposals.set(proposalName, {
+				proposal: `https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.${proposalName}.d.ts`,
+				version: version ? parseInt(version) : undefined
+			});
 		}, function () {
-			const names = [...proposalNames.values()].sort();
+			const names = [...proposals.keys()].sort();
 			const contents = [
 				'/*---------------------------------------------------------------------------------------------',
 				' *  Copyright (c) Microsoft Corporation. All rights reserved.',
@@ -305,15 +324,19 @@ function generateApiProposalNames() {
 				'',
 				'// THIS IS A GENERATED FILE. DO NOT EDIT DIRECTLY.',
 				'',
-				'export const allApiProposals = Object.freeze({',
-				`${names.map(name => `\t${name}: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.${name}.d.ts'`).join(`,${eol}`)}`,
-				'});',
-				'export type ApiProposalName = keyof typeof allApiProposals;',
+				'const _allApiProposals = {',
+				`${names.map(proposalName => {
+					const proposal = proposals.get(proposalName)!;
+					return `\t${proposalName}: {${eol}\t\tproposal: '${proposal.proposal}',${eol}${proposal.version ? `\t\tversion: ${proposal.version}${eol}` : ''}\t}`;
+				}).join(`,${eol}`)}`,
+				'};',
+				'export const allApiProposals = Object.freeze<{ [proposalName: string]: Readonly<{ proposal: string; version?: number }> }>(_allApiProposals);',
+				'export type ApiProposalName = keyof typeof _allApiProposals;',
 				'',
 			].join(eol);
 
 			this.emit('data', new File({
-				path: 'vs/workbench/services/extensions/common/extensionsApiProposals.ts',
+				path: 'vs/platform/extensions/common/extensionsApiProposals.ts',
 				contents: Buffer.from(contents)
 			}));
 			this.emit('end');
diff --git a/build/lib/date.js b/build/lib/date.js
new file mode 100644
index 00000000000..77fff0e5073
--- /dev/null
+++ b/build/lib/date.js
@@ -0,0 +1,32 @@
+"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.writeISODate = writeISODate;
+exports.readISODate = readISODate;
+const path = require("path");
+const fs = require("fs");
+const root = path.join(__dirname, '..', '..');
+/**
+ * Writes a `outDir/date` file with the contents of the build
+ * so that other tasks during the build process can use it and
+ * all use the same date.
+ */
+function writeISODate(outDir) {
+    const result = () => new Promise((resolve, _) => {
+        const outDirectory = path.join(root, outDir);
+        fs.mkdirSync(outDirectory, { recursive: true });
+        const date = new Date().toISOString();
+        fs.writeFileSync(path.join(outDirectory, 'date'), date, 'utf8');
+        resolve();
+    });
+    result.taskName = 'build-date-file';
+    return result;
+}
+function readISODate(outDir) {
+    const outDirectory = path.join(root, outDir);
+    return fs.readFileSync(path.join(outDirectory, 'date'), 'utf8');
+}
+//# sourceMappingURL=date.js.map
\ No newline at end of file
diff --git a/build/lib/date.ts b/build/lib/date.ts
new file mode 100644
index 00000000000..998e89f8e6a
--- /dev/null
+++ b/build/lib/date.ts
@@ -0,0 +1,33 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as path from 'path';
+import * as fs from 'fs';
+
+const root = path.join(__dirname, '..', '..');
+
+/**
+ * Writes a `outDir/date` file with the contents of the build
+ * so that other tasks during the build process can use it and
+ * all use the same date.
+ */
+export function writeISODate(outDir: string) {
+	const result = () => new Promise<void>((resolve, _) => {
+		const outDirectory = path.join(root, outDir);
+		fs.mkdirSync(outDirectory, { recursive: true });
+
+		const date = new Date().toISOString();
+		fs.writeFileSync(path.join(outDirectory, 'date'), date, 'utf8');
+
+		resolve();
+	});
+	result.taskName = 'build-date-file';
+	return result;
+}
+
+export function readISODate(outDir: string): string {
+	const outDirectory = path.join(root, outDir);
+	return fs.readFileSync(path.join(outDirectory, 'date'), 'utf8');
+}
diff --git a/build/lib/dependencies.js b/build/lib/dependencies.js
index 1f2dd75d68c..9bcd1204eab 100644
--- a/build/lib/dependencies.js
+++ b/build/lib/dependencies.js
@@ -8,64 +8,43 @@ exports.getProductionDependencies = getProductionDependencies;
 const fs = require("fs");
 const path = require("path");
 const cp = require("child_process");
-const parseSemver = require('parse-semver');
 const root = fs.realpathSync(path.dirname(path.dirname(__dirname)));
-function asYarnDependency(prefix, tree) {
-    let parseResult;
+function getNpmProductionDependencies(folder) {
+    let raw;
     try {
-        parseResult = parseSemver(tree.name);
+        raw = cp.execSync('npm ls --all --omit=dev --parseable', { cwd: folder, encoding: 'utf8', env: { ...process.env, NODE_ENV: 'production' }, stdio: [null, null, null] });
     }
     catch (err) {
-        err.message += `: ${tree.name}`;
-        console.warn(`Could not parse semver: ${tree.name}`);
-        return null;
-    }
-    // not an actual dependency in disk
-    if (parseResult.version !== parseResult.range) {
-        return null;
-    }
-    const name = parseResult.name;
-    const version = parseResult.version;
-    const dependencyPath = path.join(prefix, name);
-    const children = [];
-    for (const child of (tree.children || [])) {
-        const dep = asYarnDependency(path.join(prefix, name, 'node_modules'), child);
-        if (dep) {
-            children.push(dep);
+        const regex = /^npm ERR! .*$/gm;
+        let match;
+        while (match = regex.exec(err.message)) {
+            if (/ELSPROBLEMS/.test(match[0])) {
+                continue;
+            }
+            else if (/invalid: xterm/.test(match[0])) {
+                continue;
+            }
+            else if (/A complete log of this run/.test(match[0])) {
+                continue;
+            }
+            else {
+                throw err;
+            }
         }
+        raw = err.stdout;
     }
-    return { name, version, path: dependencyPath, children };
-}
-function getYarnProductionDependencies(folderPath) {
-    const raw = cp.execSync('yarn list --json', { cwd: folderPath, encoding: 'utf8', env: { ...process.env, NODE_ENV: 'production' }, stdio: [null, null, 'inherit'] });
-    const match = /^{"type":"tree".*$/m.exec(raw);
-    if (!match || match.length !== 1) {
-        throw new Error('Could not parse result of `yarn list --json`');
-    }
-    const trees = JSON.parse(match[0]).data.trees;
-    return trees
-        .map(tree => asYarnDependency(path.join(folderPath, 'node_modules'), tree))
-        .filter((dep) => !!dep);
+    return raw.split(/\r?\n/).filter(line => {
+        return !!line.trim() && path.relative(root, line) !== path.relative(root, folder);
+    });
 }
 function getProductionDependencies(folderPath) {
-    const result = [];
-    const deps = getYarnProductionDependencies(folderPath);
-    const flatten = (dep) => { result.push({ name: dep.name, version: dep.version, path: dep.path }); dep.children.forEach(flatten); };
-    deps.forEach(flatten);
+    const result = getNpmProductionDependencies(folderPath);
     // Account for distro npm dependencies
     const realFolderPath = fs.realpathSync(folderPath);
     const relativeFolderPath = path.relative(root, realFolderPath);
-    const distroPackageJsonPath = `${root}/.build/distro/npm/${relativeFolderPath}/package.json`;
-    if (fs.existsSync(distroPackageJsonPath)) {
-        const distroPackageJson = JSON.parse(fs.readFileSync(distroPackageJsonPath, 'utf8'));
-        const distroDependencyNames = Object.keys(distroPackageJson.dependencies ?? {});
-        for (const name of distroDependencyNames) {
-            result.push({
-                name,
-                version: distroPackageJson.dependencies[name],
-                path: path.join(realFolderPath, 'node_modules', name)
-            });
-        }
+    const distroFolderPath = `${root}/.build/distro/npm/${relativeFolderPath}`;
+    if (fs.existsSync(distroFolderPath)) {
+        result.push(...getNpmProductionDependencies(distroFolderPath));
     }
     return [...new Set(result)];
 }
diff --git a/build/lib/dependencies.ts b/build/lib/dependencies.ts
index 3b314e7d0c5..45368ffd26d 100644
--- a/build/lib/dependencies.ts
+++ b/build/lib/dependencies.ts
@@ -6,93 +6,46 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import * as cp from 'child_process';
-const parseSemver = require('parse-semver');
 const root = fs.realpathSync(path.dirname(path.dirname(__dirname)));
 
-interface Tree {
-	readonly name: string;
-	readonly children?: Tree[];
-}
-
-interface FlatDependency {
-	readonly name: string;
-	readonly version: string;
-	readonly path: string;
-}
-
-interface Dependency extends FlatDependency {
-	readonly children: Dependency[];
-}
-
-function asYarnDependency(prefix: string, tree: Tree): Dependency | null {
-	let parseResult;
+function getNpmProductionDependencies(folder: string): string[] {
+	let raw: string;
 
 	try {
-		parseResult = parseSemver(tree.name);
+		raw = cp.execSync('npm ls --all --omit=dev --parseable', { cwd: folder, encoding: 'utf8', env: { ...process.env, NODE_ENV: 'production' }, stdio: [null, null, null] });
 	} catch (err) {
-		err.message += `: ${tree.name}`;
-		console.warn(`Could not parse semver: ${tree.name}`);
-		return null;
-	}
+		const regex = /^npm ERR! .*$/gm;
+		let match: RegExpExecArray | null;
 
-	// not an actual dependency in disk
-	if (parseResult.version !== parseResult.range) {
-		return null;
-	}
-
-	const name = parseResult.name;
-	const version = parseResult.version;
-	const dependencyPath = path.join(prefix, name);
-	const children = [];
-
-	for (const child of (tree.children || [])) {
-		const dep = asYarnDependency(path.join(prefix, name, 'node_modules'), child);
-
-		if (dep) {
-			children.push(dep);
+		while (match = regex.exec(err.message)) {
+			if (/ELSPROBLEMS/.test(match[0])) {
+				continue;
+			} else if (/invalid: xterm/.test(match[0])) {
+				continue;
+			} else if (/A complete log of this run/.test(match[0])) {
+				continue;
+			} else {
+				throw err;
+			}
 		}
+
+		raw = err.stdout;
 	}
 
-	return { name, version, path: dependencyPath, children };
+	return raw.split(/\r?\n/).filter(line => {
+		return !!line.trim() && path.relative(root, line) !== path.relative(root, folder);
+	});
 }
 
-function getYarnProductionDependencies(folderPath: string): Dependency[] {
-	const raw = cp.execSync('yarn list --json', { cwd: folderPath, encoding: 'utf8', env: { ...process.env, NODE_ENV: 'production' }, stdio: [null, null, 'inherit'] });
-	const match = /^{"type":"tree".*$/m.exec(raw);
-
-	if (!match || match.length !== 1) {
-		throw new Error('Could not parse result of `yarn list --json`');
-	}
-
-	const trees = JSON.parse(match[0]).data.trees as Tree[];
-
-	return trees
-		.map(tree => asYarnDependency(path.join(folderPath, 'node_modules'), tree))
-		.filter<Dependency>((dep): dep is Dependency => !!dep);
-}
-
-export function getProductionDependencies(folderPath: string): FlatDependency[] {
-	const result: FlatDependency[] = [];
-	const deps = getYarnProductionDependencies(folderPath);
-	const flatten = (dep: Dependency) => { result.push({ name: dep.name, version: dep.version, path: dep.path }); dep.children.forEach(flatten); };
-	deps.forEach(flatten);
-
+export function getProductionDependencies(folderPath: string): string[] {
+	const result = getNpmProductionDependencies(folderPath);
 	// Account for distro npm dependencies
 	const realFolderPath = fs.realpathSync(folderPath);
 	const relativeFolderPath = path.relative(root, realFolderPath);
-	const distroPackageJsonPath = `${root}/.build/distro/npm/${relativeFolderPath}/package.json`;
+	const distroFolderPath = `${root}/.build/distro/npm/${relativeFolderPath}`;
 
-	if (fs.existsSync(distroPackageJsonPath)) {
-		const distroPackageJson = JSON.parse(fs.readFileSync(distroPackageJsonPath, 'utf8'));
-		const distroDependencyNames = Object.keys(distroPackageJson.dependencies ?? {});
-
-		for (const name of distroDependencyNames) {
-			result.push({
-				name,
-				version: distroPackageJson.dependencies[name],
-				path: path.join(realFolderPath, 'node_modules', name)
-			});
-		}
+	if (fs.existsSync(distroFolderPath)) {
+		result.push(...getNpmProductionDependencies(distroFolderPath));
 	}
 
 	return [...new Set(result)];
diff --git a/build/lib/electron.js b/build/lib/electron.js
index 8524b18850c..99252e4e64a 100644
--- a/build/lib/electron.js
+++ b/build/lib/electron.js
@@ -54,7 +54,7 @@ function darwinBundleDocumentType(extensions, icon, nameOrSuffix, utis) {
         role: 'Editor',
         ostypes: ['TEXT', 'utxt', 'TUTX', '****'],
         extensions,
-        iconFile: 'resources/darwin/' + icon + '.icns',
+        iconFile: 'resources/darwin/' + icon.toLowerCase() + '.icns',
         utis
     };
 }
diff --git a/build/lib/electron.ts b/build/lib/electron.ts
index ba93c3a2af3..da2387f68f6 100644
--- a/build/lib/electron.ts
+++ b/build/lib/electron.ts
@@ -68,7 +68,7 @@ function darwinBundleDocumentType(extensions: string[], icon: string, nameOrSuff
 		role: 'Editor',
 		ostypes: ['TEXT', 'utxt', 'TUTX', '****'],
 		extensions,
-		iconFile: 'resources/darwin/' + icon + '.icns',
+		iconFile: 'resources/darwin/' + icon.toLowerCase() + '.icns',
 		utis
 	};
 }
@@ -93,7 +93,7 @@ function darwinBundleDocumentTypes(types: { [name: string]: string | string[] },
 			ostypes: ['TEXT', 'utxt', 'TUTX', '****'],
 			extensions: Array.isArray(extensions) ? extensions : [extensions],
 			iconFile: 'resources/darwin/' + icon + '.icns'
-		} as DarwinDocumentType;
+		};
 	});
 }
 
diff --git a/build/lib/extensions.js b/build/lib/extensions.js
index 58d4d3e9a7f..fbf11ee1ee4 100644
--- a/build/lib/extensions.js
+++ b/build/lib/extensions.js
@@ -97,7 +97,12 @@ function fromLocalWebpack(extensionPath, webpackConfigFileName, disableMangle) {
             }
         }
     }
-    vsce.listFiles({ cwd: extensionPath, packageManager: vsce.PackageManager.Yarn, packagedDependencies }).then(fileNames => {
+    // TODO: add prune support based on packagedDependencies to vsce.PackageManager.Npm similar
+    // to vsce.PackageManager.Yarn.
+    // A static analysis showed there are no webpack externals that are dependencies of the current
+    // local extensions so we can use the vsce.PackageManager.None config to ignore dependencies list
+    // as a temporary workaround.
+    vsce.listFiles({ cwd: extensionPath, packageManager: vsce.PackageManager.None, packagedDependencies }).then(fileNames => {
         const files = fileNames
             .map(fileName => path.join(extensionPath, fileName))
             .map(filePath => new File({
@@ -178,7 +183,7 @@ function fromLocalWebpack(extensionPath, webpackConfigFileName, disableMangle) {
 function fromLocalNormal(extensionPath) {
     const vsce = require('@vscode/vsce');
     const result = es.through();
-    vsce.listFiles({ cwd: extensionPath, packageManager: vsce.PackageManager.Yarn })
+    vsce.listFiles({ cwd: extensionPath, packageManager: vsce.PackageManager.Npm })
         .then(fileNames => {
         const files = fileNames
             .map(fileName => path.join(extensionPath, fileName))
@@ -303,7 +308,7 @@ function packageLocalExtensionsStream(forWeb, disableMangle) {
     else {
         // also include shared production node modules
         const productionDependencies = (0, dependencies_1.getProductionDependencies)('extensions/');
-        const dependenciesSrc = productionDependencies.map(d => path.relative(root, d.path)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`]).flat();
+        const dependenciesSrc = productionDependencies.map(d => path.relative(root, d)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`]).flat();
         result = es.merge(localExtensionsStream, gulp.src(dependenciesSrc, { base: '.' })
             .pipe(util2.cleanNodeModules(path.join(root, 'build', '.moduleignore')))
             .pipe(util2.cleanNodeModules(path.join(root, 'build', `.moduleignore.${process.platform}`))));
@@ -482,9 +487,6 @@ async function esbuildExtensions(taskName, isWatch, scripts) {
                     return reject(error);
                 }
                 reporter(stderr, script);
-                if (stderr) {
-                    return reject();
-                }
                 return resolve();
             });
             proc.stdout.on('data', (data) => {
diff --git a/build/lib/extensions.ts b/build/lib/extensions.ts
index 0582e0cb11e..628cf90c4c9 100644
--- a/build/lib/extensions.ts
+++ b/build/lib/extensions.ts
@@ -101,7 +101,12 @@ function fromLocalWebpack(extensionPath: string, webpackConfigFileName: string,
 		}
 	}
 
-	vsce.listFiles({ cwd: extensionPath, packageManager: vsce.PackageManager.Yarn, packagedDependencies }).then(fileNames => {
+	// TODO: add prune support based on packagedDependencies to vsce.PackageManager.Npm similar
+	// to vsce.PackageManager.Yarn.
+	// A static analysis showed there are no webpack externals that are dependencies of the current
+	// local extensions so we can use the vsce.PackageManager.None config to ignore dependencies list
+	// as a temporary workaround.
+	vsce.listFiles({ cwd: extensionPath, packageManager: vsce.PackageManager.None, packagedDependencies }).then(fileNames => {
 		const files = fileNames
 			.map(fileName => path.join(extensionPath, fileName))
 			.map(filePath => new File({
@@ -196,7 +201,7 @@ function fromLocalNormal(extensionPath: string): Stream {
 	const vsce = require('@vscode/vsce') as typeof import('@vscode/vsce');
 	const result = es.through();
 
-	vsce.listFiles({ cwd: extensionPath, packageManager: vsce.PackageManager.Yarn })
+	vsce.listFiles({ cwd: extensionPath, packageManager: vsce.PackageManager.Npm })
 		.then(fileNames => {
 			const files = fileNames
 				.map(fileName => path.join(extensionPath, fileName))
@@ -354,7 +359,7 @@ export function packageLocalExtensionsStream(forWeb: boolean, disableMangle: boo
 	} else {
 		// also include shared production node modules
 		const productionDependencies = getProductionDependencies('extensions/');
-		const dependenciesSrc = productionDependencies.map(d => path.relative(root, d.path)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`]).flat();
+		const dependenciesSrc = productionDependencies.map(d => path.relative(root, d)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`]).flat();
 
 		result = es.merge(
 			localExtensionsStream,
@@ -563,9 +568,6 @@ async function esbuildExtensions(taskName: string, isWatch: boolean, scripts: {
 					return reject(error);
 				}
 				reporter(stderr, script);
-				if (stderr) {
-					return reject();
-				}
 				return resolve();
 			});
 
diff --git a/build/lib/fetch.js b/build/lib/fetch.js
index 2fed63bca0e..b7da65f4af2 100644
--- a/build/lib/fetch.js
+++ b/build/lib/fetch.js
@@ -33,7 +33,7 @@ function fetchUrls(urls, options) {
     }));
 }
 async function fetchUrl(url, options, retries = 10, retryDelay = 1000) {
-    const verbose = !!options.verbose ?? (!!process.env['CI'] || !!process.env['BUILD_ARTIFACTSTAGINGDIRECTORY']);
+    const verbose = !!options.verbose || !!process.env['CI'] || !!process.env['BUILD_ARTIFACTSTAGINGDIRECTORY'];
     try {
         let startTime = 0;
         if (verbose) {
diff --git a/build/lib/fetch.ts b/build/lib/fetch.ts
index dc1de777e04..0c44b8e567f 100644
--- a/build/lib/fetch.ts
+++ b/build/lib/fetch.ts
@@ -42,7 +42,7 @@ export function fetchUrls(urls: string[] | string, options: IFetchOptions): es.T
 }
 
 export async function fetchUrl(url: string, options: IFetchOptions, retries = 10, retryDelay = 1000): Promise<VinylFile> {
-	const verbose = !!options.verbose ?? (!!process.env['CI'] || !!process.env['BUILD_ARTIFACTSTAGINGDIRECTORY']);
+	const verbose = !!options.verbose || !!process.env['CI'] || !!process.env['BUILD_ARTIFACTSTAGINGDIRECTORY'];
 	try {
 		let startTime = 0;
 		if (verbose) {
diff --git a/build/lib/i18n.js b/build/lib/i18n.js
index c33994987f0..6964616291b 100644
--- a/build/lib/i18n.js
+++ b/build/lib/i18n.js
@@ -23,6 +23,7 @@ const fancyLog = require("fancy-log");
 const ansiColors = require("ansi-colors");
 const iconv = require("@vscode/iconv-lite-umd");
 const l10n_dev_1 = require("@vscode/l10n-dev");
+const REPO_ROOT_PATH = path.join(__dirname, '../..');
 function log(message, ...rest) {
     fancyLog(ansiColors.green('[i18n]'), message, ...rest);
 }
@@ -63,6 +64,17 @@ var BundledFormat;
     }
     BundledFormat.is = is;
 })(BundledFormat || (BundledFormat = {}));
+var NLSKeysFormat;
+(function (NLSKeysFormat) {
+    function is(value) {
+        if (value === undefined) {
+            return false;
+        }
+        const candidate = value;
+        return Array.isArray(candidate) && Array.isArray(candidate[1]);
+    }
+    NLSKeysFormat.is = is;
+})(NLSKeysFormat || (NLSKeysFormat = {}));
 class Line {
     buffer = [];
     constructor(indent = 0) {
@@ -265,67 +277,8 @@ function stripComments(content) {
     });
     return result;
 }
-function escapeCharacters(value) {
-    const result = [];
-    for (let i = 0; i < value.length; i++) {
-        const ch = value.charAt(i);
-        switch (ch) {
-            case '\'':
-                result.push('\\\'');
-                break;
-            case '"':
-                result.push('\\"');
-                break;
-            case '\\':
-                result.push('\\\\');
-                break;
-            case '\n':
-                result.push('\\n');
-                break;
-            case '\r':
-                result.push('\\r');
-                break;
-            case '\t':
-                result.push('\\t');
-                break;
-            case '\b':
-                result.push('\\b');
-                break;
-            case '\f':
-                result.push('\\f');
-                break;
-            default:
-                result.push(ch);
-        }
-    }
-    return result.join('');
-}
-function processCoreBundleFormat(fileHeader, languages, json, emitter) {
-    const keysSection = json.keys;
-    const messageSection = json.messages;
-    const bundleSection = json.bundles;
-    const statistics = Object.create(null);
-    const defaultMessages = Object.create(null);
-    const modules = Object.keys(keysSection);
-    modules.forEach((module) => {
-        const keys = keysSection[module];
-        const messages = messageSection[module];
-        if (!messages || keys.length !== messages.length) {
-            emitter.emit('error', `Message for module ${module} corrupted. Mismatch in number of keys and messages.`);
-            return;
-        }
-        const messageMap = Object.create(null);
-        defaultMessages[module] = messageMap;
-        keys.map((key, i) => {
-            if (typeof key === 'string') {
-                messageMap[key] = messages[i];
-            }
-            else {
-                messageMap[key.key] = messages[i];
-            }
-        });
-    });
-    const languageDirectory = path.join(__dirname, '..', '..', '..', 'vscode-loc', 'i18n');
+function processCoreBundleFormat(base, fileHeader, languages, json, emitter) {
+    const languageDirectory = path.join(REPO_ROOT_PATH, '..', 'vscode-loc', 'i18n');
     if (!fs.existsSync(languageDirectory)) {
         log(`No VS Code localization repository found. Looking at ${languageDirectory}`);
         log(`To bundle translations please check out the vscode-loc repository as a sibling of the vscode repository.`);
@@ -335,8 +288,6 @@ function processCoreBundleFormat(fileHeader, languages, json, emitter) {
         if (process.env['VSCODE_BUILD_VERBOSE']) {
             log(`Generating nls bundles for: ${language.id}`);
         }
-        statistics[language.id] = 0;
-        const localizedModules = Object.create(null);
         const languageFolderName = language.translationId || language.id;
         const i18nFile = path.join(languageDirectory, `vscode-language-pack-${languageFolderName}`, 'translations', 'main.i18n.json');
         let allMessages;
@@ -344,87 +295,36 @@ function processCoreBundleFormat(fileHeader, languages, json, emitter) {
             const content = stripComments(fs.readFileSync(i18nFile, 'utf8'));
             allMessages = JSON.parse(content);
         }
-        modules.forEach((module) => {
-            const order = keysSection[module];
-            let moduleMessage;
-            if (allMessages) {
-                moduleMessage = allMessages.contents[module];
+        let nlsIndex = 0;
+        const nlsResult = [];
+        for (const [moduleId, nlsKeys] of json) {
+            const moduleTranslations = allMessages?.contents[moduleId];
+            for (const nlsKey of nlsKeys) {
+                nlsResult.push(moduleTranslations?.[nlsKey]); // pushing `undefined` is fine, as we keep english strings as fallback for monaco editor in the build
+                nlsIndex++;
             }
-            if (!moduleMessage) {
-                if (process.env['VSCODE_BUILD_VERBOSE']) {
-                    log(`No localized messages found for module ${module}. Using default messages.`);
-                }
-                moduleMessage = defaultMessages[module];
-                statistics[language.id] = statistics[language.id] + Object.keys(moduleMessage).length;
-            }
-            const localizedMessages = [];
-            order.forEach((keyInfo) => {
-                let key = null;
-                if (typeof keyInfo === 'string') {
-                    key = keyInfo;
-                }
-                else {
-                    key = keyInfo.key;
-                }
-                let message = moduleMessage[key];
-                if (!message) {
-                    if (process.env['VSCODE_BUILD_VERBOSE']) {
-                        log(`No localized message found for key ${key} in module ${module}. Using default message.`);
-                    }
-                    message = defaultMessages[module][key];
-                    statistics[language.id] = statistics[language.id] + 1;
-                }
-                localizedMessages.push(message);
-            });
-            localizedModules[module] = localizedMessages;
-        });
-        Object.keys(bundleSection).forEach((bundle) => {
-            const modules = bundleSection[bundle];
-            const contents = [
-                fileHeader,
-                `define("${bundle}.nls.${language.id}", {`
-            ];
-            modules.forEach((module, index) => {
-                contents.push(`\t"${module}": [`);
-                const messages = localizedModules[module];
-                if (!messages) {
-                    emitter.emit('error', `Didn't find messages for module ${module}.`);
-                    return;
-                }
-                messages.forEach((message, index) => {
-                    contents.push(`\t\t"${escapeCharacters(message)}${index < messages.length ? '",' : '"'}`);
-                });
-                contents.push(index < modules.length - 1 ? '\t],' : '\t]');
-            });
-            contents.push('});');
-            emitter.queue(new File({ path: bundle + '.nls.' + language.id + '.js', contents: Buffer.from(contents.join('\n'), 'utf-8') }));
-        });
-    });
-    Object.keys(statistics).forEach(key => {
-        const value = statistics[key];
-        log(`${key} has ${value} untranslated strings.`);
-    });
-    sortedLanguages.forEach(language => {
-        const stats = statistics[language.id];
-        if (!stats) {
-            log(`\tNo translations found for language ${language.id}. Using default language instead.`);
         }
+        emitter.queue(new File({
+            contents: Buffer.from(`${fileHeader}
+globalThis._VSCODE_NLS_MESSAGES=${JSON.stringify(nlsResult)};
+globalThis._VSCODE_NLS_LANGUAGE=${JSON.stringify(language.id)};`),
+            base,
+            path: `${base}/nls.messages.${language.id}.js`
+        }));
     });
 }
 function processNlsFiles(opts) {
     return (0, event_stream_1.through)(function (file) {
         const fileName = path.basename(file.path);
-        if (fileName === 'nls.metadata.json') {
-            let json = null;
-            if (file.isBuffer()) {
-                json = JSON.parse(file.contents.toString('utf8'));
+        if (fileName === 'bundleInfo.json') { // pick a root level file to put the core bundles (TODO@esm this file is not created anymore, pick another)
+            try {
+                const json = JSON.parse(fs.readFileSync(path.join(REPO_ROOT_PATH, opts.out, 'nls.keys.json')).toString());
+                if (NLSKeysFormat.is(json)) {
+                    processCoreBundleFormat(file.base, opts.fileHeader, opts.languages, json, this);
+                }
             }
-            else {
-                this.emit('error', `Failed to read component file: ${file.relative}`);
-                return;
-            }
-            if (BundledFormat.is(json)) {
-                processCoreBundleFormat(opts.fileHeader, opts.languages, json, this);
+            catch (error) {
+                this.emit('error', `Failed to read component file: ${error}`);
             }
         }
         this.queue(file);
diff --git a/build/lib/i18n.resources.json b/build/lib/i18n.resources.json
index b080b05f102..fb732ae1eaf 100644
--- a/build/lib/i18n.resources.json
+++ b/build/lib/i18n.resources.json
@@ -561,6 +561,14 @@
 		{
 			"name": "vs/workbench/contrib/authentication",
 			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/contrib/replNotebook",
+			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/contrib/list",
+			"project": "vscode-workbench"
 		}
 	]
 }
diff --git a/build/lib/i18n.ts b/build/lib/i18n.ts
index 444e3abe59c..cd7e522ad36 100644
--- a/build/lib/i18n.ts
+++ b/build/lib/i18n.ts
@@ -16,6 +16,8 @@ import * as ansiColors from 'ansi-colors';
 import * as iconv from '@vscode/iconv-lite-umd';
 import { l10nJsonFormat, getL10nXlf, l10nJsonDetails, getL10nFilesFromXlf, getL10nJson } from '@vscode/l10n-dev';
 
+const REPO_ROOT_PATH = path.join(__dirname, '../..');
+
 function log(message: any, ...rest: any[]): void {
 	fancyLog(ansiColors.green('[i18n]'), message, ...rest);
 }
@@ -91,6 +93,19 @@ module BundledFormat {
 	}
 }
 
+type NLSKeysFormat = [string /* module ID */, string[] /* keys */];
+
+module NLSKeysFormat {
+	export function is(value: any): value is NLSKeysFormat {
+		if (value === undefined) {
+			return false;
+		}
+
+		const candidate = value as NLSKeysFormat;
+		return Array.isArray(candidate) && Array.isArray(candidate[1]);
+	}
+}
+
 interface BundledExtensionFormat {
 	[key: string]: {
 		messages: string[];
@@ -329,70 +344,8 @@ function stripComments(content: string): string {
 	return result;
 }
 
-function escapeCharacters(value: string): string {
-	const result: string[] = [];
-	for (let i = 0; i < value.length; i++) {
-		const ch = value.charAt(i);
-		switch (ch) {
-			case '\'':
-				result.push('\\\'');
-				break;
-			case '"':
-				result.push('\\"');
-				break;
-			case '\\':
-				result.push('\\\\');
-				break;
-			case '\n':
-				result.push('\\n');
-				break;
-			case '\r':
-				result.push('\\r');
-				break;
-			case '\t':
-				result.push('\\t');
-				break;
-			case '\b':
-				result.push('\\b');
-				break;
-			case '\f':
-				result.push('\\f');
-				break;
-			default:
-				result.push(ch);
-		}
-	}
-	return result.join('');
-}
-
-function processCoreBundleFormat(fileHeader: string, languages: Language[], json: BundledFormat, emitter: ThroughStream) {
-	const keysSection = json.keys;
-	const messageSection = json.messages;
-	const bundleSection = json.bundles;
-
-	const statistics: Record<string, number> = Object.create(null);
-
-	const defaultMessages: Record<string, Record<string, string>> = Object.create(null);
-	const modules = Object.keys(keysSection);
-	modules.forEach((module) => {
-		const keys = keysSection[module];
-		const messages = messageSection[module];
-		if (!messages || keys.length !== messages.length) {
-			emitter.emit('error', `Message for module ${module} corrupted. Mismatch in number of keys and messages.`);
-			return;
-		}
-		const messageMap: Record<string, string> = Object.create(null);
-		defaultMessages[module] = messageMap;
-		keys.map((key, i) => {
-			if (typeof key === 'string') {
-				messageMap[key] = messages[i];
-			} else {
-				messageMap[key.key] = messages[i];
-			}
-		});
-	});
-
-	const languageDirectory = path.join(__dirname, '..', '..', '..', 'vscode-loc', 'i18n');
+function processCoreBundleFormat(base: string, fileHeader: string, languages: Language[], json: NLSKeysFormat, emitter: ThroughStream) {
+	const languageDirectory = path.join(REPO_ROOT_PATH, '..', 'vscode-loc', 'i18n');
 	if (!fs.existsSync(languageDirectory)) {
 		log(`No VS Code localization repository found. Looking at ${languageDirectory}`);
 		log(`To bundle translations please check out the vscode-loc repository as a sibling of the vscode repository.`);
@@ -403,8 +356,6 @@ function processCoreBundleFormat(fileHeader: string, languages: Language[], json
 			log(`Generating nls bundles for: ${language.id}`);
 		}
 
-		statistics[language.id] = 0;
-		const localizedModules: Record<string, string[]> = Object.create(null);
 		const languageFolderName = language.translationId || language.id;
 		const i18nFile = path.join(languageDirectory, `vscode-language-pack-${languageFolderName}`, 'translations', 'main.i18n.json');
 		let allMessages: I18nFormat | undefined;
@@ -412,86 +363,38 @@ function processCoreBundleFormat(fileHeader: string, languages: Language[], json
 			const content = stripComments(fs.readFileSync(i18nFile, 'utf8'));
 			allMessages = JSON.parse(content);
 		}
-		modules.forEach((module) => {
-			const order = keysSection[module];
-			let moduleMessage: { [messageKey: string]: string } | undefined;
-			if (allMessages) {
-				moduleMessage = allMessages.contents[module];
+
+		let nlsIndex = 0;
+		const nlsResult: Array<string | undefined> = [];
+		for (const [moduleId, nlsKeys] of json) {
+			const moduleTranslations = allMessages?.contents[moduleId];
+			for (const nlsKey of nlsKeys) {
+				nlsResult.push(moduleTranslations?.[nlsKey]); // pushing `undefined` is fine, as we keep english strings as fallback for monaco editor in the build
+				nlsIndex++;
 			}
-			if (!moduleMessage) {
-				if (process.env['VSCODE_BUILD_VERBOSE']) {
-					log(`No localized messages found for module ${module}. Using default messages.`);
-				}
-				moduleMessage = defaultMessages[module];
-				statistics[language.id] = statistics[language.id] + Object.keys(moduleMessage).length;
-			}
-			const localizedMessages: string[] = [];
-			order.forEach((keyInfo) => {
-				let key: string | null = null;
-				if (typeof keyInfo === 'string') {
-					key = keyInfo;
-				} else {
-					key = keyInfo.key;
-				}
-				let message: string = moduleMessage![key];
-				if (!message) {
-					if (process.env['VSCODE_BUILD_VERBOSE']) {
-						log(`No localized message found for key ${key} in module ${module}. Using default message.`);
-					}
-					message = defaultMessages[module][key];
-					statistics[language.id] = statistics[language.id] + 1;
-				}
-				localizedMessages.push(message);
-			});
-			localizedModules[module] = localizedMessages;
-		});
-		Object.keys(bundleSection).forEach((bundle) => {
-			const modules = bundleSection[bundle];
-			const contents: string[] = [
-				fileHeader,
-				`define("${bundle}.nls.${language.id}", {`
-			];
-			modules.forEach((module, index) => {
-				contents.push(`\t"${module}": [`);
-				const messages = localizedModules[module];
-				if (!messages) {
-					emitter.emit('error', `Didn't find messages for module ${module}.`);
-					return;
-				}
-				messages.forEach((message, index) => {
-					contents.push(`\t\t"${escapeCharacters(message)}${index < messages.length ? '",' : '"'}`);
-				});
-				contents.push(index < modules.length - 1 ? '\t],' : '\t]');
-			});
-			contents.push('});');
-			emitter.queue(new File({ path: bundle + '.nls.' + language.id + '.js', contents: Buffer.from(contents.join('\n'), 'utf-8') }));
-		});
-	});
-	Object.keys(statistics).forEach(key => {
-		const value = statistics[key];
-		log(`${key} has ${value} untranslated strings.`);
-	});
-	sortedLanguages.forEach(language => {
-		const stats = statistics[language.id];
-		if (!stats) {
-			log(`\tNo translations found for language ${language.id}. Using default language instead.`);
 		}
+
+		emitter.queue(new File({
+			contents: Buffer.from(`${fileHeader}
+globalThis._VSCODE_NLS_MESSAGES=${JSON.stringify(nlsResult)};
+globalThis._VSCODE_NLS_LANGUAGE=${JSON.stringify(language.id)};`),
+			base,
+			path: `${base}/nls.messages.${language.id}.js`
+		}));
 	});
 }
 
-export function processNlsFiles(opts: { fileHeader: string; languages: Language[] }): ThroughStream {
+export function processNlsFiles(opts: { out: string; fileHeader: string; languages: Language[] }): ThroughStream {
 	return through(function (this: ThroughStream, file: File) {
 		const fileName = path.basename(file.path);
-		if (fileName === 'nls.metadata.json') {
-			let json = null;
-			if (file.isBuffer()) {
-				json = JSON.parse((<Buffer>file.contents).toString('utf8'));
-			} else {
-				this.emit('error', `Failed to read component file: ${file.relative}`);
-				return;
-			}
-			if (BundledFormat.is(json)) {
-				processCoreBundleFormat(opts.fileHeader, opts.languages, json, this);
+		if (fileName === 'bundleInfo.json') { // pick a root level file to put the core bundles (TODO@esm this file is not created anymore, pick another)
+			try {
+				const json = JSON.parse(fs.readFileSync(path.join(REPO_ROOT_PATH, opts.out, 'nls.keys.json')).toString());
+				if (NLSKeysFormat.is(json)) {
+					processCoreBundleFormat(file.base, opts.fileHeader, opts.languages, json, this);
+				}
+			} catch (error) {
+				this.emit('error', `Failed to read component file: ${error}`);
 			}
 		}
 		this.queue(file);
diff --git a/build/lib/inlineMeta.js b/build/lib/inlineMeta.js
new file mode 100644
index 00000000000..f1dbfa83a7e
--- /dev/null
+++ b/build/lib/inlineMeta.js
@@ -0,0 +1,48 @@
+"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.inlineMeta = inlineMeta;
+const es = require("event-stream");
+const path_1 = require("path");
+const packageJsonMarkerId = 'BUILD_INSERT_PACKAGE_CONFIGURATION';
+// TODO@bpasero in order to inline `product.json`, more work is
+// needed to ensure that we cover all cases where modifications
+// are done to the product configuration during build. There are
+// at least 2 more changes that kick in very late:
+// - a `darwinUniversalAssetId` is added in`create-universal-app.ts`
+// - a `target` is added in `gulpfile.vscode.win32.js`
+// const productJsonMarkerId = 'BUILD_INSERT_PRODUCT_CONFIGURATION';
+function inlineMeta(result, ctx) {
+    return result.pipe(es.through(function (file) {
+        if (matchesFile(file, ctx)) {
+            let content = file.contents.toString();
+            let markerFound = false;
+            const packageMarker = `${packageJsonMarkerId}:"${packageJsonMarkerId}"`; // this needs to be the format after esbuild has processed the file (e.g. double quotes)
+            if (content.includes(packageMarker)) {
+                content = content.replace(packageMarker, JSON.stringify(JSON.parse(ctx.packageJsonFn())).slice(1, -1) /* trim braces */);
+                markerFound = true;
+            }
+            // const productMarker = `${productJsonMarkerId}:"${productJsonMarkerId}"`; // this needs to be the format after esbuild has processed the file (e.g. double quotes)
+            // if (content.includes(productMarker)) {
+            // 	content = content.replace(productMarker, JSON.stringify(JSON.parse(ctx.productJsonFn())).slice(1, -1) /* trim braces */);
+            // 	markerFound = true;
+            // }
+            if (markerFound) {
+                file.contents = Buffer.from(content);
+            }
+        }
+        this.emit('data', file);
+    }));
+}
+function matchesFile(file, ctx) {
+    for (const targetPath of ctx.targetPaths) {
+        if (file.basename === (0, path_1.basename)(targetPath)) { // TODO would be nicer to figure out root relative path to not match on false positives
+            return true;
+        }
+    }
+    return false;
+}
+//# sourceMappingURL=inlineMeta.js.map
\ No newline at end of file
diff --git a/build/lib/inlineMeta.ts b/build/lib/inlineMeta.ts
new file mode 100644
index 00000000000..ef3987fc32e
--- /dev/null
+++ b/build/lib/inlineMeta.ts
@@ -0,0 +1,60 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as es from 'event-stream';
+import { basename } from 'path';
+import * as File from 'vinyl';
+
+export interface IInlineMetaContext {
+	readonly targetPaths: string[];
+	readonly packageJsonFn: () => string;
+	readonly productJsonFn: () => string;
+}
+
+const packageJsonMarkerId = 'BUILD_INSERT_PACKAGE_CONFIGURATION';
+
+// TODO@bpasero in order to inline `product.json`, more work is
+// needed to ensure that we cover all cases where modifications
+// are done to the product configuration during build. There are
+// at least 2 more changes that kick in very late:
+// - a `darwinUniversalAssetId` is added in`create-universal-app.ts`
+// - a `target` is added in `gulpfile.vscode.win32.js`
+// const productJsonMarkerId = 'BUILD_INSERT_PRODUCT_CONFIGURATION';
+
+export function inlineMeta(result: NodeJS.ReadWriteStream, ctx: IInlineMetaContext): NodeJS.ReadWriteStream {
+	return result.pipe(es.through(function (file: File) {
+		if (matchesFile(file, ctx)) {
+			let content = file.contents.toString();
+			let markerFound = false;
+
+			const packageMarker = `${packageJsonMarkerId}:"${packageJsonMarkerId}"`; // this needs to be the format after esbuild has processed the file (e.g. double quotes)
+			if (content.includes(packageMarker)) {
+				content = content.replace(packageMarker, JSON.stringify(JSON.parse(ctx.packageJsonFn())).slice(1, -1) /* trim braces */);
+				markerFound = true;
+			}
+
+			// const productMarker = `${productJsonMarkerId}:"${productJsonMarkerId}"`; // this needs to be the format after esbuild has processed the file (e.g. double quotes)
+			// if (content.includes(productMarker)) {
+			// 	content = content.replace(productMarker, JSON.stringify(JSON.parse(ctx.productJsonFn())).slice(1, -1) /* trim braces */);
+			// 	markerFound = true;
+			// }
+
+			if (markerFound) {
+				file.contents = Buffer.from(content);
+			}
+		}
+
+		this.emit('data', file);
+	}));
+}
+
+function matchesFile(file: File, ctx: IInlineMetaContext): boolean {
+	for (const targetPath of ctx.targetPaths) {
+		if (file.basename === basename(targetPath)) { // TODO would be nicer to figure out root relative path to not match on false positives
+			return true;
+		}
+	}
+	return false;
+}
diff --git a/build/lib/layersChecker.js b/build/lib/layersChecker.js
index dce2b85d658..9b69794628c 100644
--- a/build/lib/layersChecker.js
+++ b/build/lib/layersChecker.js
@@ -68,7 +68,14 @@ const CORE_TYPES = [
     'fetch',
     'RequestInit',
     'Headers',
-    'Response'
+    'Response',
+    '__global',
+    'PerformanceMark',
+    'PerformanceObserver',
+    'ImportMeta',
+    // webcrypto has been available since Node.js 19, but still live in dom.d.ts
+    'Crypto',
+    'SubtleCrypto'
 ];
 // Types that are defined in a common layer but are known to be only
 // available in native environments should not be allowed in browser
@@ -116,6 +123,22 @@ const RULES = [
             '@types/node' // no node.js
         ]
     },
+    // Common: vs/base/common/performance.ts
+    {
+        target: '**/vs/base/common/performance.ts',
+        allowedTypes: [
+            ...CORE_TYPES,
+            // Safe access to Performance
+            'Performance',
+            'PerformanceEntry',
+            'PerformanceTiming'
+        ],
+        disallowedTypes: NATIVE_TYPES,
+        disallowedDefinitions: [
+            'lib.dom.d.ts', // no DOM
+            '@types/node' // no node.js
+        ]
+    },
     // Common: vs/platform/environment/common/*
     {
         target: '**/vs/platform/environment/common/*.ts',
@@ -170,59 +193,17 @@ const RULES = [
             '@types/node' // no node.js
         ]
     },
-    // Common: vs/workbench/api/common/extHostTypes.ts
+    // Common: vs/base/parts/sandbox/electron-sandbox/preload.ts
     {
-        target: '**/vs/workbench/api/common/extHostTypes.ts',
+        target: '**/vs/base/parts/sandbox/electron-sandbox/preload.ts',
         allowedTypes: [
             ...CORE_TYPES,
-            // Safe access to global
-            '__global'
+            // Safe access to a very small subset of node.js
+            'process',
+            'NodeJS'
         ],
         disallowedTypes: NATIVE_TYPES,
         disallowedDefinitions: [
-            'lib.dom.d.ts', // no DOM
-            '@types/node' // no node.js
-        ]
-    },
-    // Common: vs/workbench/api/common/extHostChatAgents2.ts
-    {
-        target: '**/vs/workbench/api/common/extHostChatAgents2.ts',
-        allowedTypes: [
-            ...CORE_TYPES,
-            // Safe access to global
-            '__global'
-        ],
-        disallowedTypes: NATIVE_TYPES,
-        disallowedDefinitions: [
-            'lib.dom.d.ts', // no DOM
-            '@types/node' // no node.js
-        ]
-    },
-    // Common: vs/workbench/api/common/extHostChatVariables.ts
-    {
-        target: '**/vs/workbench/api/common/extHostChatVariables.ts',
-        allowedTypes: [
-            ...CORE_TYPES,
-            // Safe access to global
-            '__global'
-        ],
-        disallowedTypes: NATIVE_TYPES,
-        disallowedDefinitions: [
-            'lib.dom.d.ts', // no DOM
-            '@types/node' // no node.js
-        ]
-    },
-    // Common: vs/workbench/api/common/extensionHostMain.ts
-    {
-        target: '**/vs/workbench/api/common/extensionHostMain.ts',
-        allowedTypes: [
-            ...CORE_TYPES,
-            // Safe access to global
-            '__global'
-        ],
-        disallowedTypes: NATIVE_TYPES,
-        disallowedDefinitions: [
-            'lib.dom.d.ts', // no DOM
             '@types/node' // no node.js
         ]
     },
@@ -273,6 +254,22 @@ const RULES = [
             '@types/node' // no node.js
         ]
     },
+    // Electron (utility)
+    {
+        target: '**/vs/**/electron-utility/**',
+        allowedTypes: [
+            ...CORE_TYPES,
+            // --> types from electron.d.ts that duplicate from lib.dom.d.ts
+            'Event',
+            'Request'
+        ],
+        disallowedTypes: [
+            'ipcMain' // not allowed, use validatedIpcMain instead
+        ],
+        disallowedDefinitions: [
+            'lib.dom.d.ts' // no DOM
+        ]
+    },
     // Electron (main)
     {
         target: '**/vs/**/electron-main/**',
diff --git a/build/lib/layersChecker.ts b/build/lib/layersChecker.ts
index 039f222135d..16b1e9f5101 100644
--- a/build/lib/layersChecker.ts
+++ b/build/lib/layersChecker.ts
@@ -69,7 +69,15 @@ const CORE_TYPES = [
 	'fetch',
 	'RequestInit',
 	'Headers',
-	'Response'
+	'Response',
+	'__global',
+	'PerformanceMark',
+	'PerformanceObserver',
+	'ImportMeta',
+
+	// webcrypto has been available since Node.js 19, but still live in dom.d.ts
+	'Crypto',
+	'SubtleCrypto'
 ];
 
 // Types that are defined in a common layer but are known to be only
@@ -125,6 +133,24 @@ const RULES: IRule[] = [
 		]
 	},
 
+	// Common: vs/base/common/performance.ts
+	{
+		target: '**/vs/base/common/performance.ts',
+		allowedTypes: [
+			...CORE_TYPES,
+
+			// Safe access to Performance
+			'Performance',
+			'PerformanceEntry',
+			'PerformanceTiming'
+		],
+		disallowedTypes: NATIVE_TYPES,
+		disallowedDefinitions: [
+			'lib.dom.d.ts', // no DOM
+			'@types/node'	// no node.js
+		]
+	},
+
 	// Common: vs/platform/environment/common/*
 	{
 		target: '**/vs/platform/environment/common/*.ts',
@@ -185,66 +211,18 @@ const RULES: IRule[] = [
 		]
 	},
 
-	// Common: vs/workbench/api/common/extHostTypes.ts
+	// Common: vs/base/parts/sandbox/electron-sandbox/preload.ts
 	{
-		target: '**/vs/workbench/api/common/extHostTypes.ts',
+		target: '**/vs/base/parts/sandbox/electron-sandbox/preload.ts',
 		allowedTypes: [
 			...CORE_TYPES,
 
-			// Safe access to global
-			'__global'
+			// Safe access to a very small subset of node.js
+			'process',
+			'NodeJS'
 		],
 		disallowedTypes: NATIVE_TYPES,
 		disallowedDefinitions: [
-			'lib.dom.d.ts', // no DOM
-			'@types/node'	// no node.js
-		]
-	},
-
-	// Common: vs/workbench/api/common/extHostChatAgents2.ts
-	{
-		target: '**/vs/workbench/api/common/extHostChatAgents2.ts',
-		allowedTypes: [
-			...CORE_TYPES,
-
-			// Safe access to global
-			'__global'
-		],
-		disallowedTypes: NATIVE_TYPES,
-		disallowedDefinitions: [
-			'lib.dom.d.ts', // no DOM
-			'@types/node'	// no node.js
-		]
-	},
-
-	// Common: vs/workbench/api/common/extHostChatVariables.ts
-	{
-		target: '**/vs/workbench/api/common/extHostChatVariables.ts',
-		allowedTypes: [
-			...CORE_TYPES,
-
-			// Safe access to global
-			'__global'
-		],
-		disallowedTypes: NATIVE_TYPES,
-		disallowedDefinitions: [
-			'lib.dom.d.ts', // no DOM
-			'@types/node'	// no node.js
-		]
-	},
-
-	// Common: vs/workbench/api/common/extensionHostMain.ts
-	{
-		target: '**/vs/workbench/api/common/extensionHostMain.ts',
-		allowedTypes: [
-			...CORE_TYPES,
-
-			// Safe access to global
-			'__global'
-		],
-		disallowedTypes: NATIVE_TYPES,
-		disallowedDefinitions: [
-			'lib.dom.d.ts', // no DOM
 			'@types/node'	// no node.js
 		]
 	},
@@ -301,6 +279,24 @@ const RULES: IRule[] = [
 		]
 	},
 
+	// Electron (utility)
+	{
+		target: '**/vs/**/electron-utility/**',
+		allowedTypes: [
+			...CORE_TYPES,
+
+			// --> types from electron.d.ts that duplicate from lib.dom.d.ts
+			'Event',
+			'Request'
+		],
+		disallowedTypes: [
+			'ipcMain' // not allowed, use validatedIpcMain instead
+		],
+		disallowedDefinitions: [
+			'lib.dom.d.ts'	// no DOM
+		]
+	},
+
 	// Electron (main)
 	{
 		target: '**/vs/**/electron-main/**',
diff --git a/build/lib/mangle/index.js b/build/lib/mangle/index.js
index bb6b414e845..1c2c8cc3dd3 100644
--- a/build/lib/mangle/index.js
+++ b/build/lib/mangle/index.js
@@ -14,7 +14,7 @@ const ts = require("typescript");
 const url_1 = require("url");
 const workerpool = require("workerpool");
 const staticLanguageServiceHost_1 = require("./staticLanguageServiceHost");
-const buildfile = require('../../../src/buildfile');
+const buildfile = require('../../buildfile');
 class ShortIdent {
     prefix;
     static _keywords = new Set(['await', 'break', 'case', 'catch', 'class', 'const', 'continue', 'debugger',
@@ -250,7 +250,6 @@ function isNameTakenInFile(node, name) {
 const skippedExportMangledFiles = [
     // Build
     'css.build',
-    'nls.build',
     // Monaco
     'editorCommon',
     'editorOptions',
@@ -264,17 +263,18 @@ const skippedExportMangledFiles = [
     'pfs',
     // entry points
     ...[
-        buildfile.entrypoint('vs/server/node/server.main', []),
-        buildfile.entrypoint('vs/workbench/workbench.desktop.main', []),
-        buildfile.base,
+        buildfile.workerEditor,
         buildfile.workerExtensionHost,
         buildfile.workerNotebook,
         buildfile.workerLanguageDetection,
         buildfile.workerLocalFileSearch,
         buildfile.workerProfileAnalysis,
+        buildfile.workerOutputLinks,
+        buildfile.workerBackgroundTokenization,
         buildfile.workbenchDesktop,
         buildfile.workbenchWeb,
-        buildfile.code
+        buildfile.code,
+        buildfile.codeWeb
     ].flat().map(x => x.name),
 ];
 const skippedExportMangledProjects = [
diff --git a/build/lib/mangle/index.ts b/build/lib/mangle/index.ts
index 4a7544f162b..f291bd63f6b 100644
--- a/build/lib/mangle/index.ts
+++ b/build/lib/mangle/index.ts
@@ -12,7 +12,7 @@ import * as ts from 'typescript';
 import { pathToFileURL } from 'url';
 import * as workerpool from 'workerpool';
 import { StaticLanguageServiceHost } from './staticLanguageServiceHost';
-const buildfile = require('../../../src/buildfile');
+const buildfile = require('../../buildfile');
 
 class ShortIdent {
 
@@ -279,11 +279,9 @@ function isNameTakenInFile(node: ts.Node, name: string): boolean {
 	return false;
 }
 
-
 const skippedExportMangledFiles = [
 	// Build
 	'css.build',
-	'nls.build',
 
 	// Monaco
 	'editorCommon',
@@ -301,17 +299,18 @@ const skippedExportMangledFiles = [
 
 	// entry points
 	...[
-		buildfile.entrypoint('vs/server/node/server.main', []),
-		buildfile.entrypoint('vs/workbench/workbench.desktop.main', []),
-		buildfile.base,
+		buildfile.workerEditor,
 		buildfile.workerExtensionHost,
 		buildfile.workerNotebook,
 		buildfile.workerLanguageDetection,
 		buildfile.workerLocalFileSearch,
 		buildfile.workerProfileAnalysis,
+		buildfile.workerOutputLinks,
+		buildfile.workerBackgroundTokenization,
 		buildfile.workbenchDesktop,
 		buildfile.workbenchWeb,
-		buildfile.code
+		buildfile.code,
+		buildfile.codeWeb
 	].flat().map(x => x.name),
 ];
 
diff --git a/build/lib/nls.js b/build/lib/nls.js
index 48ca84f2433..6ddcd46167a 100644
--- a/build/lib/nls.js
+++ b/build/lib/nls.js
@@ -10,6 +10,7 @@ const event_stream_1 = require("event-stream");
 const File = require("vinyl");
 const sm = require("source-map");
 const path = require("path");
+const sort = require("gulp-sort");
 var CollectStepResult;
 (function (CollectStepResult) {
     CollectStepResult[CollectStepResult["Yes"] = 0] = "Yes";
@@ -38,23 +39,15 @@ function clone(object) {
     }
     return result;
 }
-function template(lines) {
-    let indent = '', wrap = '';
-    if (lines.length > 1) {
-        indent = '\t';
-        wrap = '\n';
-    }
-    return `/*---------------------------------------------------------
- * Copyright (C) Microsoft Corporation. All rights reserved.
- *--------------------------------------------------------*/
-define([], [${wrap + lines.map(l => indent + l).join(',\n') + wrap}]);`;
-}
 /**
  * Returns a stream containing the patched JavaScript and source maps.
  */
-function nls() {
+function nls(options) {
+    let base;
     const input = (0, event_stream_1.through)();
-    const output = input.pipe((0, event_stream_1.through)(function (f) {
+    const output = input
+        .pipe(sort()) // IMPORTANT: to ensure stable NLS metadata generation, we must sort the files because NLS messages are globally extracted and indexed across all files
+        .pipe((0, event_stream_1.through)(function (f) {
         if (!f.sourceMap) {
             return this.emit('error', new Error(`File ${f.relative} does not have sourcemaps.`));
         }
@@ -70,7 +63,40 @@ function nls() {
         if (!typescript) {
             return this.emit('error', new Error(`File ${f.relative} does not have the original content in the source map.`));
         }
-        _nls.patchFiles(f, typescript).forEach(f => this.emit('data', f));
+        base = f.base;
+        this.emit('data', _nls.patchFile(f, typescript, options));
+    }, function () {
+        for (const file of [
+            new File({
+                contents: Buffer.from(JSON.stringify({
+                    keys: _nls.moduleToNLSKeys,
+                    messages: _nls.moduleToNLSMessages,
+                }, null, '\t')),
+                base,
+                path: `${base}/nls.metadata.json`
+            }),
+            new File({
+                contents: Buffer.from(JSON.stringify(_nls.allNLSMessages)),
+                base,
+                path: `${base}/nls.messages.json`
+            }),
+            new File({
+                contents: Buffer.from(JSON.stringify(_nls.allNLSModulesAndKeys)),
+                base,
+                path: `${base}/nls.keys.json`
+            }),
+            new File({
+                contents: Buffer.from(`/*---------------------------------------------------------
+ * Copyright (C) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------*/
+globalThis._VSCODE_NLS_MESSAGES=${JSON.stringify(_nls.allNLSMessages)};`),
+                base,
+                path: `${base}/nls.messages.js`
+            })
+        ]) {
+            this.emit('data', file);
+        }
+        this.emit('end');
     }));
     return (0, event_stream_1.duplex)(input, output);
 }
@@ -79,6 +105,11 @@ function isImportNode(ts, node) {
 }
 var _nls;
 (function (_nls) {
+    _nls.moduleToNLSKeys = {};
+    _nls.moduleToNLSMessages = {};
+    _nls.allNLSMessages = [];
+    _nls.allNLSModulesAndKeys = [];
+    let allNLSMessagesIndex = 0;
     function fileFrom(file, contents, path = file.path) {
         return new File({
             contents: Buffer.from(contents),
@@ -138,21 +169,14 @@ var _nls;
             .filter(n => n.kind === ts.SyntaxKind.ImportEqualsDeclaration)
             .map(n => n)
             .filter(d => d.moduleReference.kind === ts.SyntaxKind.ExternalModuleReference)
-            .filter(d => d.moduleReference.expression.getText() === '\'vs/nls\'');
+            .filter(d => d.moduleReference.expression.getText().endsWith(`/nls.js'`));
         // import ... from 'vs/nls';
         const importDeclarations = imports
             .filter(n => n.kind === ts.SyntaxKind.ImportDeclaration)
             .map(n => n)
             .filter(d => d.moduleSpecifier.kind === ts.SyntaxKind.StringLiteral)
-            .filter(d => d.moduleSpecifier.getText() === '\'vs/nls\'')
+            .filter(d => d.moduleSpecifier.getText().endsWith(`/nls.js'`))
             .filter(d => !!d.importClause && !!d.importClause.namedBindings);
-        const nlsExpressions = importEqualsDeclarations
-            .map(d => d.moduleReference.expression)
-            .concat(importDeclarations.map(d => d.moduleSpecifier))
-            .map(d => ({
-            start: ts.getLineAndCharacterOfPosition(sourceFile, d.getStart()),
-            end: ts.getLineAndCharacterOfPosition(sourceFile, d.getEnd())
-        }));
         // `nls.localize(...)` calls
         const nlsLocalizeCallExpressions = importDeclarations
             .filter(d => !!(d.importClause && d.importClause.namedBindings && d.importClause.namedBindings.kind === ts.SyntaxKind.NamespaceImport))
@@ -206,8 +230,7 @@ var _nls;
             value: a[1].getText()
         }));
         return {
-            localizeCalls: localizeCalls.toArray(),
-            nlsExpressions: nlsExpressions.toArray()
+            localizeCalls: localizeCalls.toArray()
         };
     }
     class TextModel {
@@ -262,14 +285,10 @@ var _nls;
                 .flatten().toArray().join('');
         }
     }
-    function patchJavascript(patches, contents, moduleId) {
+    function patchJavascript(patches, contents) {
         const model = new TextModel(contents);
         // patch the localize calls
         lazy(patches).reverse().each(p => model.apply(p));
-        // patch the 'vs/nls' imports
-        const firstLine = model.get(0);
-        const patchedFirstLine = firstLine.replace(/(['"])vs\/nls\1/g, `$1vs/nls!${moduleId}$1`);
-        model.set(0, patchedFirstLine);
         return model.toString();
     }
     function patchSourcemap(patches, rsm, smc) {
@@ -307,14 +326,21 @@ var _nls;
         }
         return JSON.parse(smg.toString());
     }
-    function patch(ts, moduleId, typescript, javascript, sourcemap) {
-        const { localizeCalls, nlsExpressions } = analyze(ts, typescript, 'localize');
-        const { localizeCalls: localize2Calls, nlsExpressions: nls2Expressions } = analyze(ts, typescript, 'localize2');
+    function parseLocalizeKeyOrValue(sourceExpression) {
+        // sourceValue can be "foo", 'foo', `foo` or { .... }
+        // in its evalulated form
+        // we want to return either the string or the object
+        // eslint-disable-next-line no-eval
+        return eval(`(${sourceExpression})`);
+    }
+    function patch(ts, typescript, javascript, sourcemap, options) {
+        const { localizeCalls } = analyze(ts, typescript, 'localize');
+        const { localizeCalls: localize2Calls } = analyze(ts, typescript, 'localize2');
         if (localizeCalls.length === 0 && localize2Calls.length === 0) {
             return { javascript, sourcemap };
         }
-        const nlsKeys = template(localizeCalls.map(lc => lc.key).concat(localize2Calls.map(lc => lc.key)));
-        const nls = template(localizeCalls.map(lc => lc.value).concat(localize2Calls.map(lc => lc.value)));
+        const nlsKeys = localizeCalls.map(lc => parseLocalizeKeyOrValue(lc.key)).concat(localize2Calls.map(lc => parseLocalizeKeyOrValue(lc.key)));
+        const nlsMessages = localizeCalls.map(lc => parseLocalizeKeyOrValue(lc.value)).concat(localize2Calls.map(lc => parseLocalizeKeyOrValue(lc.value)));
         const smc = new sm.SourceMapConsumer(sourcemap);
         const positionFrom = mappedPositionFrom.bind(null, sourcemap.sources[0]);
         // build patches
@@ -323,16 +349,18 @@ var _nls;
             const end = lcFrom(smc.generatedPositionFor(positionFrom(c.range.end)));
             return { span: { start, end }, content: c.content };
         };
-        let i = 0;
         const localizePatches = lazy(localizeCalls)
-            .map(lc => ([
-            { range: lc.keySpan, content: '' + (i++) },
+            .map(lc => (options.preserveEnglish ? [
+            { range: lc.keySpan, content: `${allNLSMessagesIndex++}` } // localize('key', "message") => localize(<index>, "message")
+        ] : [
+            { range: lc.keySpan, content: `${allNLSMessagesIndex++}` }, // localize('key', "message") => localize(<index>, null)
             { range: lc.valueSpan, content: 'null' }
         ]))
             .flatten()
             .map(toPatch);
         const localize2Patches = lazy(localize2Calls)
-            .map(lc => ({ range: lc.keySpan, content: '' + (i++) }))
+            .map(lc => ({ range: lc.keySpan, content: `${allNLSMessagesIndex++}` } // localize2('key', "message") => localize(<index>, "message")
+        ))
             .map(toPatch);
         // Sort patches by their start position
         const patches = localizePatches.concat(localize2Patches).toArray().sort((a, b) => {
@@ -352,34 +380,29 @@ var _nls;
                 return 0;
             }
         });
-        javascript = patchJavascript(patches, javascript, moduleId);
-        // since imports are not within the sourcemap information,
-        // we must do this MacGyver style
-        if (nlsExpressions.length || nls2Expressions.length) {
-            javascript = javascript.replace(/^define\(.*$/m, line => {
-                return line.replace(/(['"])vs\/nls\1/g, `$1vs/nls!${moduleId}$1`);
-            });
-        }
+        javascript = patchJavascript(patches, javascript);
         sourcemap = patchSourcemap(patches, sourcemap, smc);
-        return { javascript, sourcemap, nlsKeys, nls };
+        return { javascript, sourcemap, nlsKeys, nlsMessages };
     }
-    function patchFiles(javascriptFile, typescript) {
+    function patchFile(javascriptFile, typescript, options) {
         const ts = require('typescript');
         // hack?
         const moduleId = javascriptFile.relative
             .replace(/\.js$/, '')
             .replace(/\\/g, '/');
-        const { javascript, sourcemap, nlsKeys, nls } = patch(ts, moduleId, typescript, javascriptFile.contents.toString(), javascriptFile.sourceMap);
-        const result = [fileFrom(javascriptFile, javascript)];
-        result[0].sourceMap = sourcemap;
+        const { javascript, sourcemap, nlsKeys, nlsMessages } = patch(ts, typescript, javascriptFile.contents.toString(), javascriptFile.sourceMap, options);
+        const result = fileFrom(javascriptFile, javascript);
+        result.sourceMap = sourcemap;
         if (nlsKeys) {
-            result.push(fileFrom(javascriptFile, nlsKeys, javascriptFile.path.replace(/\.js$/, '.nls.keys.js')));
+            _nls.moduleToNLSKeys[moduleId] = nlsKeys;
+            _nls.allNLSModulesAndKeys.push([moduleId, nlsKeys.map(nlsKey => typeof nlsKey === 'string' ? nlsKey : nlsKey.key)]);
         }
-        if (nls) {
-            result.push(fileFrom(javascriptFile, nls, javascriptFile.path.replace(/\.js$/, '.nls.js')));
+        if (nlsMessages) {
+            _nls.moduleToNLSMessages[moduleId] = nlsMessages;
+            _nls.allNLSMessages.push(...nlsMessages);
         }
         return result;
     }
-    _nls.patchFiles = patchFiles;
+    _nls.patchFile = patchFile;
 })(_nls || (_nls = {}));
 //# sourceMappingURL=nls.js.map
\ No newline at end of file
diff --git a/build/lib/nls.ts b/build/lib/nls.ts
index c4ee031b2eb..cac832903a3 100644
--- a/build/lib/nls.ts
+++ b/build/lib/nls.ts
@@ -8,7 +8,8 @@ import * as lazy from 'lazy.js';
 import { duplex, through } from 'event-stream';
 import * as File from 'vinyl';
 import * as sm from 'source-map';
-import * as  path from 'path';
+import * as path from 'path';
+import * as sort from 'gulp-sort';
 
 declare class FileSourceMap extends File {
 	public sourceMap: sm.RawSourceMap;
@@ -41,54 +42,77 @@ function collect(ts: typeof import('typescript'), node: ts.Node, fn: (node: ts.N
 }
 
 function clone<T extends object>(object: T): T {
-	const result = <T>{};
+	const result = {} as any as T;
 	for (const id in object) {
 		result[id] = object[id];
 	}
 	return result;
 }
 
-function template(lines: string[]): string {
-	let indent = '', wrap = '';
-
-	if (lines.length > 1) {
-		indent = '\t';
-		wrap = '\n';
-	}
-
-	return `/*---------------------------------------------------------
- * Copyright (C) Microsoft Corporation. All rights reserved.
- *--------------------------------------------------------*/
-define([], [${wrap + lines.map(l => indent + l).join(',\n') + wrap}]);`;
-}
-
 /**
  * Returns a stream containing the patched JavaScript and source maps.
  */
-export function nls(): NodeJS.ReadWriteStream {
+export function nls(options: { preserveEnglish: boolean }): NodeJS.ReadWriteStream {
+	let base: string;
 	const input = through();
-	const output = input.pipe(through(function (f: FileSourceMap) {
-		if (!f.sourceMap) {
-			return this.emit('error', new Error(`File ${f.relative} does not have sourcemaps.`));
-		}
+	const output = input
+		.pipe(sort()) // IMPORTANT: to ensure stable NLS metadata generation, we must sort the files because NLS messages are globally extracted and indexed across all files
+		.pipe(through(function (f: FileSourceMap) {
+			if (!f.sourceMap) {
+				return this.emit('error', new Error(`File ${f.relative} does not have sourcemaps.`));
+			}
 
-		let source = f.sourceMap.sources[0];
-		if (!source) {
-			return this.emit('error', new Error(`File ${f.relative} does not have a source in the source map.`));
-		}
+			let source = f.sourceMap.sources[0];
+			if (!source) {
+				return this.emit('error', new Error(`File ${f.relative} does not have a source in the source map.`));
+			}
 
-		const root = f.sourceMap.sourceRoot;
-		if (root) {
-			source = path.join(root, source);
-		}
+			const root = f.sourceMap.sourceRoot;
+			if (root) {
+				source = path.join(root, source);
+			}
 
-		const typescript = f.sourceMap.sourcesContent![0];
-		if (!typescript) {
-			return this.emit('error', new Error(`File ${f.relative} does not have the original content in the source map.`));
-		}
+			const typescript = f.sourceMap.sourcesContent![0];
+			if (!typescript) {
+				return this.emit('error', new Error(`File ${f.relative} does not have the original content in the source map.`));
+			}
 
-		_nls.patchFiles(f, typescript).forEach(f => this.emit('data', f));
-	}));
+			base = f.base;
+			this.emit('data', _nls.patchFile(f, typescript, options));
+		}, function () {
+			for (const file of [
+				new File({
+					contents: Buffer.from(JSON.stringify({
+						keys: _nls.moduleToNLSKeys,
+						messages: _nls.moduleToNLSMessages,
+					}, null, '\t')),
+					base,
+					path: `${base}/nls.metadata.json`
+				}),
+				new File({
+					contents: Buffer.from(JSON.stringify(_nls.allNLSMessages)),
+					base,
+					path: `${base}/nls.messages.json`
+				}),
+				new File({
+					contents: Buffer.from(JSON.stringify(_nls.allNLSModulesAndKeys)),
+					base,
+					path: `${base}/nls.keys.json`
+				}),
+				new File({
+					contents: Buffer.from(`/*---------------------------------------------------------
+ * Copyright (C) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------*/
+globalThis._VSCODE_NLS_MESSAGES=${JSON.stringify(_nls.allNLSMessages)};`),
+					base,
+					path: `${base}/nls.messages.js`
+				})
+			]) {
+				this.emit('data', file);
+			}
+
+			this.emit('end');
+		}));
 
 	return duplex(input, output);
 }
@@ -99,11 +123,19 @@ function isImportNode(ts: typeof import('typescript'), node: ts.Node): boolean {
 
 module _nls {
 
-	interface INlsStringResult {
+	export const moduleToNLSKeys: { [name: string /* module ID */]: ILocalizeKey[] /* keys */ } = {};
+	export const moduleToNLSMessages: { [name: string /* module ID */]: string[] /* messages */ } = {};
+	export const allNLSMessages: string[] = [];
+	export const allNLSModulesAndKeys: Array<[string /* module ID */, string[] /* keys */]> = [];
+	let allNLSMessagesIndex = 0;
+
+	type ILocalizeKey = string | { key: string }; // key might contain metadata for translators and then is not just a string
+
+	interface INlsPatchResult {
 		javascript: string;
 		sourcemap: sm.RawSourceMap;
-		nls?: string;
-		nlsKeys?: string;
+		nlsMessages?: string[];
+		nlsKeys?: ILocalizeKey[];
 	}
 
 	interface ISpan {
@@ -120,7 +152,6 @@ module _nls {
 
 	interface ILocalizeAnalysisResult {
 		localizeCalls: ILocalizeCall[];
-		nlsExpressions: ISpan[];
 	}
 
 	interface IPatch {
@@ -200,24 +231,16 @@ module _nls {
 			.filter(n => n.kind === ts.SyntaxKind.ImportEqualsDeclaration)
 			.map(n => <ts.ImportEqualsDeclaration>n)
 			.filter(d => d.moduleReference.kind === ts.SyntaxKind.ExternalModuleReference)
-			.filter(d => (<ts.ExternalModuleReference>d.moduleReference).expression.getText() === '\'vs/nls\'');
+			.filter(d => (<ts.ExternalModuleReference>d.moduleReference).expression.getText().endsWith(`/nls.js'`));
 
 		// import ... from 'vs/nls';
 		const importDeclarations = imports
 			.filter(n => n.kind === ts.SyntaxKind.ImportDeclaration)
 			.map(n => <ts.ImportDeclaration>n)
 			.filter(d => d.moduleSpecifier.kind === ts.SyntaxKind.StringLiteral)
-			.filter(d => d.moduleSpecifier.getText() === '\'vs/nls\'')
+			.filter(d => d.moduleSpecifier.getText().endsWith(`/nls.js'`))
 			.filter(d => !!d.importClause && !!d.importClause.namedBindings);
 
-		const nlsExpressions = importEqualsDeclarations
-			.map(d => (<ts.ExternalModuleReference>d.moduleReference).expression)
-			.concat(importDeclarations.map(d => d.moduleSpecifier))
-			.map<ISpan>(d => ({
-				start: ts.getLineAndCharacterOfPosition(sourceFile, d.getStart()),
-				end: ts.getLineAndCharacterOfPosition(sourceFile, d.getEnd())
-			}));
-
 		// `nls.localize(...)` calls
 		const nlsLocalizeCallExpressions = importDeclarations
 			.filter(d => !!(d.importClause && d.importClause.namedBindings && d.importClause.namedBindings.kind === ts.SyntaxKind.NamespaceImport))
@@ -280,8 +303,7 @@ module _nls {
 			}));
 
 		return {
-			localizeCalls: localizeCalls.toArray(),
-			nlsExpressions: nlsExpressions.toArray()
+			localizeCalls: localizeCalls.toArray()
 		};
 	}
 
@@ -351,17 +373,12 @@ module _nls {
 		}
 	}
 
-	function patchJavascript(patches: IPatch[], contents: string, moduleId: string): string {
+	function patchJavascript(patches: IPatch[], contents: string): string {
 		const model = new TextModel(contents);
 
 		// patch the localize calls
 		lazy(patches).reverse().each(p => model.apply(p));
 
-		// patch the 'vs/nls' imports
-		const firstLine = model.get(0);
-		const patchedFirstLine = firstLine.replace(/(['"])vs\/nls\1/g, `$1vs/nls!${moduleId}$1`);
-		model.set(0, patchedFirstLine);
-
 		return model.toString();
 	}
 
@@ -410,16 +427,24 @@ module _nls {
 		return JSON.parse(smg.toString());
 	}
 
-	function patch(ts: typeof import('typescript'), moduleId: string, typescript: string, javascript: string, sourcemap: sm.RawSourceMap): INlsStringResult {
-		const { localizeCalls, nlsExpressions } = analyze(ts, typescript, 'localize');
-		const { localizeCalls: localize2Calls, nlsExpressions: nls2Expressions } = analyze(ts, typescript, 'localize2');
+	function parseLocalizeKeyOrValue(sourceExpression: string) {
+		// sourceValue can be "foo", 'foo', `foo` or { .... }
+		// in its evalulated form
+		// we want to return either the string or the object
+		// eslint-disable-next-line no-eval
+		return eval(`(${sourceExpression})`);
+	}
+
+	function patch(ts: typeof import('typescript'), typescript: string, javascript: string, sourcemap: sm.RawSourceMap, options: { preserveEnglish: boolean }): INlsPatchResult {
+		const { localizeCalls } = analyze(ts, typescript, 'localize');
+		const { localizeCalls: localize2Calls } = analyze(ts, typescript, 'localize2');
 
 		if (localizeCalls.length === 0 && localize2Calls.length === 0) {
 			return { javascript, sourcemap };
 		}
 
-		const nlsKeys = template(localizeCalls.map(lc => lc.key).concat(localize2Calls.map(lc => lc.key)));
-		const nls = template(localizeCalls.map(lc => lc.value).concat(localize2Calls.map(lc => lc.value)));
+		const nlsKeys = localizeCalls.map(lc => parseLocalizeKeyOrValue(lc.key)).concat(localize2Calls.map(lc => parseLocalizeKeyOrValue(lc.key)));
+		const nlsMessages = localizeCalls.map(lc => parseLocalizeKeyOrValue(lc.value)).concat(localize2Calls.map(lc => parseLocalizeKeyOrValue(lc.value)));
 		const smc = new sm.SourceMapConsumer(sourcemap);
 		const positionFrom = mappedPositionFrom.bind(null, sourcemap.sources[0]);
 
@@ -430,18 +455,20 @@ module _nls {
 			return { span: { start, end }, content: c.content };
 		};
 
-		let i = 0;
 		const localizePatches = lazy(localizeCalls)
-			.map(lc => ([
-				{ range: lc.keySpan, content: '' + (i++) },
-				{ range: lc.valueSpan, content: 'null' }
-			]))
+			.map(lc => (
+				options.preserveEnglish ? [
+					{ range: lc.keySpan, content: `${allNLSMessagesIndex++}` } 	// localize('key', "message") => localize(<index>, "message")
+				] : [
+					{ range: lc.keySpan, content: `${allNLSMessagesIndex++}` }, // localize('key', "message") => localize(<index>, null)
+					{ range: lc.valueSpan, content: 'null' }
+				]))
 			.flatten()
 			.map(toPatch);
 
 		const localize2Patches = lazy(localize2Calls)
 			.map(lc => (
-				{ range: lc.keySpan, content: '' + (i++) }
+				{ range: lc.keySpan, content: `${allNLSMessagesIndex++}` } // localize2('key', "message") => localize(<index>, "message")
 			))
 			.map(toPatch);
 
@@ -460,45 +487,39 @@ module _nls {
 			}
 		});
 
-		javascript = patchJavascript(patches, javascript, moduleId);
-
-		// since imports are not within the sourcemap information,
-		// we must do this MacGyver style
-		if (nlsExpressions.length || nls2Expressions.length) {
-			javascript = javascript.replace(/^define\(.*$/m, line => {
-				return line.replace(/(['"])vs\/nls\1/g, `$1vs/nls!${moduleId}$1`);
-			});
-		}
+		javascript = patchJavascript(patches, javascript);
 
 		sourcemap = patchSourcemap(patches, sourcemap, smc);
 
-		return { javascript, sourcemap, nlsKeys, nls };
+		return { javascript, sourcemap, nlsKeys, nlsMessages };
 	}
 
-	export function patchFiles(javascriptFile: File, typescript: string): File[] {
+	export function patchFile(javascriptFile: File, typescript: string, options: { preserveEnglish: boolean }): File {
 		const ts = require('typescript') as typeof import('typescript');
 		// hack?
 		const moduleId = javascriptFile.relative
 			.replace(/\.js$/, '')
 			.replace(/\\/g, '/');
 
-		const { javascript, sourcemap, nlsKeys, nls } = patch(
+		const { javascript, sourcemap, nlsKeys, nlsMessages } = patch(
 			ts,
-			moduleId,
 			typescript,
 			javascriptFile.contents.toString(),
-			(<any>javascriptFile).sourceMap
+			(<any>javascriptFile).sourceMap,
+			options
 		);
 
-		const result: File[] = [fileFrom(javascriptFile, javascript)];
-		(<any>result[0]).sourceMap = sourcemap;
+		const result = fileFrom(javascriptFile, javascript);
+		(<any>result).sourceMap = sourcemap;
 
 		if (nlsKeys) {
-			result.push(fileFrom(javascriptFile, nlsKeys, javascriptFile.path.replace(/\.js$/, '.nls.keys.js')));
+			moduleToNLSKeys[moduleId] = nlsKeys;
+			allNLSModulesAndKeys.push([moduleId, nlsKeys.map(nlsKey => typeof nlsKey === 'string' ? nlsKey : nlsKey.key)]);
 		}
 
-		if (nls) {
-			result.push(fileFrom(javascriptFile, nls, javascriptFile.path.replace(/\.js$/, '.nls.js')));
+		if (nlsMessages) {
+			moduleToNLSMessages[moduleId] = nlsMessages;
+			allNLSMessages.push(...nlsMessages);
 		}
 
 		return result;
diff --git a/build/lib/node.js b/build/lib/node.js
index 7209dffc134..74a54a3c170 100644
--- a/build/lib/node.js
+++ b/build/lib/node.js
@@ -7,9 +7,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const fs = require("fs");
 const root = path.dirname(path.dirname(__dirname));
-const yarnrcPath = path.join(root, 'remote', '.yarnrc');
-const yarnrc = fs.readFileSync(yarnrcPath, 'utf8');
-const version = /^target\s+"([^"]+)"$/m.exec(yarnrc)[1];
+const npmrcPath = path.join(root, 'remote', '.npmrc');
+const npmrc = fs.readFileSync(npmrcPath, 'utf8');
+const version = /^target="(.*)"$/m.exec(npmrc)[1];
 const platform = process.platform;
 const arch = process.arch;
 const node = platform === 'win32' ? 'node.exe' : 'node';
diff --git a/build/lib/node.ts b/build/lib/node.ts
index d1b0039b022..4beb13ae91b 100644
--- a/build/lib/node.ts
+++ b/build/lib/node.ts
@@ -7,9 +7,9 @@ import * as path from 'path';
 import * as fs from 'fs';
 
 const root = path.dirname(path.dirname(__dirname));
-const yarnrcPath = path.join(root, 'remote', '.yarnrc');
-const yarnrc = fs.readFileSync(yarnrcPath, 'utf8');
-const version = /^target\s+"([^"]+)"$/m.exec(yarnrc)![1];
+const npmrcPath = path.join(root, 'remote', '.npmrc');
+const npmrc = fs.readFileSync(npmrcPath, 'utf8');
+const version = /^target="(.*)"$/m.exec(npmrc)![1];
 
 const platform = process.platform;
 const arch = process.arch;
diff --git a/build/lib/optimize.js b/build/lib/optimize.js
index d48235ebf15..2bc923ba636 100644
--- a/build/lib/optimize.js
+++ b/build/lib/optimize.js
@@ -4,215 +4,145 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loaderConfig = loaderConfig;
-exports.optimizeLoaderTask = optimizeLoaderTask;
 exports.optimizeTask = optimizeTask;
 exports.minifyTask = minifyTask;
 const es = require("event-stream");
 const gulp = require("gulp");
 const concat = require("gulp-concat");
 const filter = require("gulp-filter");
-const fancyLog = require("fancy-log");
-const ansiColors = require("ansi-colors");
 const path = require("path");
+const fs = require("fs");
 const pump = require("pump");
 const VinylFile = require("vinyl");
 const bundle = require("./bundle");
-const i18n_1 = require("./i18n");
-const stats_1 = require("./stats");
-const util = require("./util");
 const postcss_1 = require("./postcss");
+const esbuild = require("esbuild");
+const sourcemaps = require("gulp-sourcemaps");
 const REPO_ROOT_PATH = path.join(__dirname, '../..');
-function log(prefix, message) {
-    fancyLog(ansiColors.cyan('[' + prefix + ']'), message);
-}
-function loaderConfig() {
-    const result = {
-        paths: {
-            'vs': 'out-build/vs',
-            'vscode': 'empty:'
-        },
-        amdModulesPattern: /^vs\//
-    };
-    result['vs/css'] = { inlineResources: true };
-    return result;
-}
-const IS_OUR_COPYRIGHT_REGEXP = /Copyright \(C\) Microsoft Corporation/i;
-function loaderPlugin(src, base, amdModuleId) {
-    return (gulp
-        .src(src, { base })
-        .pipe(es.through(function (data) {
-        if (amdModuleId) {
-            let contents = data.contents.toString('utf8');
-            contents = contents.replace(/^define\(/m, `define("${amdModuleId}",`);
-            data.contents = Buffer.from(contents);
-        }
-        this.emit('data', data);
-    })));
-}
-function loader(src, bundledFileHeader, bundleLoader, externalLoaderInfo) {
-    let loaderStream = gulp.src(`${src}/vs/loader.js`, { base: `${src}` });
-    if (bundleLoader) {
-        loaderStream = es.merge(loaderStream, loaderPlugin(`${src}/vs/css.js`, `${src}`, 'vs/css'), loaderPlugin(`${src}/vs/nls.js`, `${src}`, 'vs/nls'));
-    }
-    const files = [];
-    const order = (f) => {
-        if (f.path.endsWith('loader.js')) {
-            return 0;
-        }
-        if (f.path.endsWith('css.js')) {
-            return 1;
-        }
-        if (f.path.endsWith('nls.js')) {
-            return 2;
-        }
-        return 3;
-    };
-    return (loaderStream
-        .pipe(es.through(function (data) {
-        files.push(data);
-    }, function () {
-        files.sort((a, b) => {
-            return order(a) - order(b);
-        });
-        files.unshift(new VinylFile({
-            path: 'fake',
-            base: '.',
-            contents: Buffer.from(bundledFileHeader)
-        }));
-        if (externalLoaderInfo !== undefined) {
-            files.push(new VinylFile({
-                path: 'fake2',
-                base: '.',
-                contents: Buffer.from(emitExternalLoaderInfo(externalLoaderInfo))
-            }));
-        }
-        for (const file of files) {
-            this.emit('data', file);
-        }
-        this.emit('end');
-    }))
-        .pipe(concat('vs/loader.js')));
-}
-function emitExternalLoaderInfo(externalLoaderInfo) {
-    const externalBaseUrl = externalLoaderInfo.baseUrl;
-    externalLoaderInfo.baseUrl = '$BASE_URL';
-    // If defined, use the runtime configured baseUrl.
-    const code = `
-(function() {
-	const baseUrl = require.getConfig().baseUrl || ${JSON.stringify(externalBaseUrl)};
-	require.config(${JSON.stringify(externalLoaderInfo, undefined, 2)});
-})();`;
-    return code.replace('"$BASE_URL"', 'baseUrl');
-}
-function toConcatStream(src, bundledFileHeader, sources, dest, fileContentMapper) {
-    const useSourcemaps = /\.js$/.test(dest) && !/\.nls\.js$/.test(dest);
-    // If a bundle ends up including in any of the sources our copyright, then
-    // insert a fake source at the beginning of each bundle with our copyright
-    let containsOurCopyright = false;
-    for (let i = 0, len = sources.length; i < len; i++) {
-        const fileContents = sources[i].contents;
-        if (IS_OUR_COPYRIGHT_REGEXP.test(fileContents)) {
-            containsOurCopyright = true;
-            break;
-        }
-    }
-    if (containsOurCopyright) {
-        sources.unshift({
-            path: null,
-            contents: bundledFileHeader
-        });
-    }
-    const treatedSources = sources.map(function (source) {
-        const root = source.path ? REPO_ROOT_PATH.replace(/\\/g, '/') : '';
-        const base = source.path ? root + `/${src}` : '.';
-        const path = source.path ? root + '/' + source.path.replace(/\\/g, '/') : 'fake';
-        const contents = source.path ? fileContentMapper(source.contents, path) : source.contents;
-        return new VinylFile({
-            path: path,
-            base: base,
-            contents: Buffer.from(contents)
-        });
-    });
-    return es.readArray(treatedSources)
-        .pipe(useSourcemaps ? util.loadSourcemaps() : es.through())
-        .pipe(concat(dest))
-        .pipe((0, stats_1.createStatsStream)(dest));
-}
-function toBundleStream(src, bundledFileHeader, bundles, fileContentMapper) {
-    return es.merge(bundles.map(function (bundle) {
-        return toConcatStream(src, bundledFileHeader, bundle.sources, bundle.dest, fileContentMapper);
-    }));
-}
 const DEFAULT_FILE_HEADER = [
     '/*!--------------------------------------------------------',
     ' * Copyright (C) Microsoft Corporation. All rights reserved.',
     ' *--------------------------------------------------------*/'
 ].join('\n');
-function optimizeAMDTask(opts) {
-    const src = opts.src;
-    const entryPoints = opts.entryPoints;
-    const resources = opts.resources;
-    const loaderConfig = opts.loaderConfig;
-    const bundledFileHeader = opts.header || DEFAULT_FILE_HEADER;
-    const fileContentMapper = opts.fileContentMapper || ((contents, _path) => contents);
-    const sourcemaps = require('gulp-sourcemaps');
-    const bundlesStream = es.through(); // this stream will contain the bundled files
+function optimizeESMTask(opts) {
     const resourcesStream = es.through(); // this stream will contain the resources
-    const bundleInfoStream = es.through(); // this stream will contain bundleInfo.json
-    bundle.bundle(entryPoints, loaderConfig, function (err, result) {
-        if (err || !result) {
-            return bundlesStream.emit('error', JSON.stringify(err));
+    const bundlesStream = es.through(); // this stream will contain the bundled files
+    const entryPoints = opts.entryPoints.map(entryPoint => {
+        if (typeof entryPoint === 'string') {
+            return { name: path.parse(entryPoint).name };
         }
-        toBundleStream(src, bundledFileHeader, result.files, fileContentMapper).pipe(bundlesStream);
-        // Remove css inlined resources
-        const filteredResources = resources.slice();
-        result.cssInlinedResources.forEach(function (resource) {
-            if (process.env['VSCODE_BUILD_VERBOSE']) {
-                log('optimizer', 'excluding inlined: ' + resource);
-            }
-            filteredResources.push('!' + resource);
-        });
-        gulp.src(filteredResources, { base: `${src}`, allowEmpty: true }).pipe(resourcesStream);
-        const bundleInfoArray = [];
-        if (opts.bundleInfo) {
-            bundleInfoArray.push(new VinylFile({
-                path: 'bundleInfo.json',
-                base: '.',
-                contents: Buffer.from(JSON.stringify(result.bundleData, null, '\t'))
-            }));
-        }
-        es.readArray(bundleInfoArray).pipe(bundleInfoStream);
+        return entryPoint;
     });
-    const result = es.merge(loader(src, bundledFileHeader, false, opts.externalLoaderInfo), bundlesStream, resourcesStream, bundleInfoStream);
+    const allMentionedModules = new Set();
+    for (const entryPoint of entryPoints) {
+        allMentionedModules.add(entryPoint.name);
+        entryPoint.include?.forEach(allMentionedModules.add, allMentionedModules);
+        entryPoint.exclude?.forEach(allMentionedModules.add, allMentionedModules);
+    }
+    allMentionedModules.delete('vs/css'); // TODO@esm remove this when vs/css is removed
+    const bundleAsync = async () => {
+        const files = [];
+        const tasks = [];
+        for (const entryPoint of entryPoints) {
+            console.log(`[bundle] '${entryPoint.name}'`);
+            // support for 'dest' via esbuild#in/out
+            const dest = entryPoint.dest?.replace(/\.[^/.]+$/, '') ?? entryPoint.name;
+            // boilerplate massage
+            const banner = {
+                js: DEFAULT_FILE_HEADER,
+                css: DEFAULT_FILE_HEADER
+            };
+            const tslibPath = path.join(require.resolve('tslib'), '../tslib.es6.js');
+            banner.js += await fs.promises.readFile(tslibPath, 'utf-8');
+            const boilerplateTrimmer = {
+                name: 'boilerplate-trimmer',
+                setup(build) {
+                    build.onLoad({ filter: /\.js$/ }, async (args) => {
+                        const contents = await fs.promises.readFile(args.path, 'utf-8');
+                        const newContents = bundle.removeAllTSBoilerplate(contents);
+                        return { contents: newContents };
+                    });
+                }
+            };
+            const overrideExternalPlugin = {
+                name: 'override-external',
+                setup(build) {
+                    // We inline selected modules that are we depend on on startup without
+                    // a conditional `await import(...)` by hooking into the resolution.
+                    build.onResolve({ filter: /^minimist$/ }, () => {
+                        return { path: path.join(REPO_ROOT_PATH, 'node_modules', 'minimist', 'index.js'), external: false };
+                    });
+                },
+            };
+            const task = esbuild.build({
+                bundle: true,
+                external: entryPoint.exclude,
+                packages: 'external', // "external all the things", see https://esbuild.github.io/api/#packages
+                platform: 'neutral', // makes esm
+                format: 'esm',
+                sourcemap: 'external',
+                plugins: [boilerplateTrimmer, overrideExternalPlugin],
+                target: ['es2022'],
+                loader: {
+                    '.ttf': 'file',
+                    '.svg': 'file',
+                    '.png': 'file',
+                    '.sh': 'file',
+                },
+                assetNames: 'media/[name]', // moves media assets into a sub-folder "media"
+                banner: entryPoint.name === 'vs/workbench/workbench.web.main' ? undefined : banner, // TODO@esm remove line when we stop supporting web-amd-esm-bridge
+                entryPoints: [
+                    {
+                        in: path.join(REPO_ROOT_PATH, opts.src, `${entryPoint.name}.js`),
+                        out: dest,
+                    }
+                ],
+                outdir: path.join(REPO_ROOT_PATH, opts.src),
+                write: false, // enables res.outputFiles
+                metafile: true, // enables res.metafile
+            }).then(res => {
+                for (const file of res.outputFiles) {
+                    let contents = file.contents;
+                    let sourceMapFile = undefined;
+                    if (file.path.endsWith('.js')) {
+                        if (opts.fileContentMapper) {
+                            // UGLY the fileContentMapper is per file but at this point we have all files
+                            // bundled already. So, we call the mapper for the same contents but each file
+                            // that has been included in the bundle...
+                            let newText = file.text;
+                            for (const input of Object.keys(res.metafile.inputs)) {
+                                newText = opts.fileContentMapper(newText, input);
+                            }
+                            contents = Buffer.from(newText);
+                        }
+                        sourceMapFile = res.outputFiles.find(f => f.path === `${file.path}.map`);
+                    }
+                    const fileProps = {
+                        contents: Buffer.from(contents),
+                        sourceMap: sourceMapFile ? JSON.parse(sourceMapFile.text) : undefined, // support gulp-sourcemaps
+                        path: file.path,
+                        base: path.join(REPO_ROOT_PATH, opts.src)
+                    };
+                    files.push(new VinylFile(fileProps));
+                }
+            });
+            tasks.push(task);
+        }
+        await Promise.all(tasks);
+        return { files };
+    };
+    bundleAsync().then((output) => {
+        // bundle output (JS, CSS, SVG...)
+        es.readArray(output.files).pipe(bundlesStream);
+        // forward all resources
+        gulp.src(opts.resources ?? [], { base: `${opts.src}`, allowEmpty: true }).pipe(resourcesStream);
+    });
+    const result = es.merge(bundlesStream, resourcesStream);
     return result
         .pipe(sourcemaps.write('./', {
         sourceRoot: undefined,
         addComment: true,
         includeContent: true
-    }))
-        .pipe(opts.languages && opts.languages.length ? (0, i18n_1.processNlsFiles)({
-        fileHeader: bundledFileHeader,
-        languages: opts.languages
-    }) : es.through());
-}
-function optimizeCommonJSTask(opts) {
-    const esbuild = require('esbuild');
-    const src = opts.src;
-    const entryPoints = opts.entryPoints;
-    return gulp.src(entryPoints, { base: `${src}`, allowEmpty: true })
-        .pipe(es.map((f, cb) => {
-        esbuild.build({
-            entryPoints: [f.path],
-            bundle: true,
-            platform: opts.platform,
-            write: false,
-            external: opts.external
-        }).then(res => {
-            const jsFile = res.outputFiles[0];
-            f.contents = Buffer.from(jsFile.contents);
-            cb(undefined, f);
-        });
     }));
 }
 function optimizeManualTask(options) {
@@ -223,15 +153,10 @@ function optimizeManualTask(options) {
     });
     return es.merge(...concatenations);
 }
-function optimizeLoaderTask(src, out, bundleLoader, bundledFileHeader = '', externalLoaderInfo) {
-    return () => loader(src, bundledFileHeader, bundleLoader, externalLoaderInfo).pipe(gulp.dest(out));
-}
 function optimizeTask(opts) {
     return function () {
-        const optimizers = [optimizeAMDTask(opts.amd)];
-        if (opts.commonJS) {
-            optimizers.push(optimizeCommonJSTask(opts.commonJS));
-        }
+        const optimizers = [];
+        optimizers.push(optimizeESMTask(opts.esm));
         if (opts.manual) {
             optimizers.push(optimizeManualTask(opts.manual));
         }
@@ -239,11 +164,9 @@ function optimizeTask(opts) {
     };
 }
 function minifyTask(src, sourceMapBaseUrl) {
-    const esbuild = require('esbuild');
     const sourceMappingURL = sourceMapBaseUrl ? ((f) => `${sourceMapBaseUrl}/${f.relative}.map`) : undefined;
     return cb => {
         const cssnano = require('cssnano');
-        const sourcemaps = require('gulp-sourcemaps');
         const svgmin = require('gulp-svgmin');
         const jsFilter = filter('**/*.js', { restore: true });
         const cssFilter = filter('**/*.css', { restore: true });
@@ -255,7 +178,7 @@ function minifyTask(src, sourceMapBaseUrl) {
                 sourcemap: 'external',
                 outdir: '.',
                 platform: 'node',
-                target: ['esnext'],
+                target: ['es2022'],
                 write: false
             }).then(res => {
                 const jsFile = res.outputFiles.find(f => /\.js$/.test(f.path));
@@ -271,12 +194,7 @@ function minifyTask(src, sourceMapBaseUrl) {
                     cb(undefined, f);
                 }
             }, cb);
-        }), jsFilter.restore, cssFilter, (0, postcss_1.gulpPostcss)([cssnano({ preset: 'default' })]), cssFilter.restore, svgFilter, svgmin(), svgFilter.restore, sourcemaps.mapSources((sourcePath) => {
-            if (sourcePath === 'bootstrap-fork.js') {
-                return 'bootstrap-fork.orig.js';
-            }
-            return sourcePath;
-        }), sourcemaps.write('./', {
+        }), jsFilter.restore, cssFilter, (0, postcss_1.gulpPostcss)([cssnano({ preset: 'default' })]), cssFilter.restore, svgFilter, svgmin(), svgFilter.restore, sourcemaps.write('./', {
             sourceMappingURL,
             sourceRoot: undefined,
             includeContent: true,
diff --git a/build/lib/optimize.ts b/build/lib/optimize.ts
index 5b6dee9bf65..fc7a547ad71 100644
--- a/build/lib/optimize.ts
+++ b/build/lib/optimize.ts
@@ -7,200 +7,30 @@ import * as es from 'event-stream';
 import * as gulp from 'gulp';
 import * as concat from 'gulp-concat';
 import * as filter from 'gulp-filter';
-import * as fancyLog from 'fancy-log';
-import * as ansiColors from 'ansi-colors';
 import * as path from 'path';
+import * as fs from 'fs';
 import * as pump from 'pump';
 import * as VinylFile from 'vinyl';
 import * as bundle from './bundle';
-import { Language, processNlsFiles } from './i18n';
-import { createStatsStream } from './stats';
-import * as util from './util';
 import { gulpPostcss } from './postcss';
+import * as esbuild from 'esbuild';
+import * as sourcemaps from 'gulp-sourcemaps';
 
 const REPO_ROOT_PATH = path.join(__dirname, '../..');
 
-function log(prefix: string, message: string): void {
-	fancyLog(ansiColors.cyan('[' + prefix + ']'), message);
-}
-
-export function loaderConfig() {
-	const result: any = {
-		paths: {
-			'vs': 'out-build/vs',
-			'vscode': 'empty:'
-		},
-		amdModulesPattern: /^vs\//
-	};
-
-	result['vs/css'] = { inlineResources: true };
-
-	return result;
-}
-
-const IS_OUR_COPYRIGHT_REGEXP = /Copyright \(C\) Microsoft Corporation/i;
-
-function loaderPlugin(src: string, base: string, amdModuleId: string | undefined): NodeJS.ReadWriteStream {
-	return (
-		gulp
-			.src(src, { base })
-			.pipe(es.through(function (data: VinylFile) {
-				if (amdModuleId) {
-					let contents = data.contents.toString('utf8');
-					contents = contents.replace(/^define\(/m, `define("${amdModuleId}",`);
-					data.contents = Buffer.from(contents);
-				}
-				this.emit('data', data);
-			}))
-	);
-}
-
-function loader(src: string, bundledFileHeader: string, bundleLoader: boolean, externalLoaderInfo?: util.IExternalLoaderInfo): NodeJS.ReadWriteStream {
-	let loaderStream = gulp.src(`${src}/vs/loader.js`, { base: `${src}` });
-	if (bundleLoader) {
-		loaderStream = es.merge(
-			loaderStream,
-			loaderPlugin(`${src}/vs/css.js`, `${src}`, 'vs/css'),
-			loaderPlugin(`${src}/vs/nls.js`, `${src}`, 'vs/nls'),
-		);
-	}
-
-	const files: VinylFile[] = [];
-	const order = (f: VinylFile) => {
-		if (f.path.endsWith('loader.js')) {
-			return 0;
-		}
-		if (f.path.endsWith('css.js')) {
-			return 1;
-		}
-		if (f.path.endsWith('nls.js')) {
-			return 2;
-		}
-		return 3;
-	};
-
-	return (
-		loaderStream
-			.pipe(es.through(function (data) {
-				files.push(data);
-			}, function () {
-				files.sort((a, b) => {
-					return order(a) - order(b);
-				});
-				files.unshift(new VinylFile({
-					path: 'fake',
-					base: '.',
-					contents: Buffer.from(bundledFileHeader)
-				}));
-				if (externalLoaderInfo !== undefined) {
-					files.push(new VinylFile({
-						path: 'fake2',
-						base: '.',
-						contents: Buffer.from(emitExternalLoaderInfo(externalLoaderInfo))
-					}));
-				}
-				for (const file of files) {
-					this.emit('data', file);
-				}
-				this.emit('end');
-			}))
-			.pipe(concat('vs/loader.js'))
-	);
-}
-
-function emitExternalLoaderInfo(externalLoaderInfo: util.IExternalLoaderInfo): string {
-	const externalBaseUrl = externalLoaderInfo.baseUrl;
-	externalLoaderInfo.baseUrl = '$BASE_URL';
-
-	// If defined, use the runtime configured baseUrl.
-	const code = `
-(function() {
-	const baseUrl = require.getConfig().baseUrl || ${JSON.stringify(externalBaseUrl)};
-	require.config(${JSON.stringify(externalLoaderInfo, undefined, 2)});
-})();`;
-	return code.replace('"$BASE_URL"', 'baseUrl');
-}
-
-function toConcatStream(src: string, bundledFileHeader: string, sources: bundle.IFile[], dest: string, fileContentMapper: (contents: string, path: string) => string): NodeJS.ReadWriteStream {
-	const useSourcemaps = /\.js$/.test(dest) && !/\.nls\.js$/.test(dest);
-
-	// If a bundle ends up including in any of the sources our copyright, then
-	// insert a fake source at the beginning of each bundle with our copyright
-	let containsOurCopyright = false;
-	for (let i = 0, len = sources.length; i < len; i++) {
-		const fileContents = sources[i].contents;
-		if (IS_OUR_COPYRIGHT_REGEXP.test(fileContents)) {
-			containsOurCopyright = true;
-			break;
-		}
-	}
-
-	if (containsOurCopyright) {
-		sources.unshift({
-			path: null,
-			contents: bundledFileHeader
-		});
-	}
-
-	const treatedSources = sources.map(function (source) {
-		const root = source.path ? REPO_ROOT_PATH.replace(/\\/g, '/') : '';
-		const base = source.path ? root + `/${src}` : '.';
-		const path = source.path ? root + '/' + source.path.replace(/\\/g, '/') : 'fake';
-		const contents = source.path ? fileContentMapper(source.contents, path) : source.contents;
-
-		return new VinylFile({
-			path: path,
-			base: base,
-			contents: Buffer.from(contents)
-		});
-	});
-
-	return es.readArray(treatedSources)
-		.pipe(useSourcemaps ? util.loadSourcemaps() : es.through())
-		.pipe(concat(dest))
-		.pipe(createStatsStream(dest));
-}
-
-function toBundleStream(src: string, bundledFileHeader: string, bundles: bundle.IConcatFile[], fileContentMapper: (contents: string, path: string) => string): NodeJS.ReadWriteStream {
-	return es.merge(bundles.map(function (bundle) {
-		return toConcatStream(src, bundledFileHeader, bundle.sources, bundle.dest, fileContentMapper);
-	}));
-}
-
-export interface IOptimizeAMDTaskOpts {
+export interface IOptimizeESMTaskOpts {
 	/**
 	 * The folder to read files from.
 	 */
 	src: string;
 	/**
-	 * (for AMD files, will get bundled and get Copyright treatment)
+	 * The entry points to bundle.
 	 */
-	entryPoints: bundle.IEntryPoint[];
+	entryPoints: Array<bundle.IEntryPoint | string>;
 	/**
-	 * (svg, etc.)
+	 * Other resources to consider (svg, etc.)
 	 */
-	resources: string[];
-	loaderConfig: any;
-	/**
-	 * Additional info we append to the end of the loader
-	 */
-	externalLoaderInfo?: util.IExternalLoaderInfo;
-	/**
-	 * (true by default - append css and nls to loader)
-	 */
-	bundleLoader?: boolean;
-	/**
-	 * (basically the Copyright treatment)
-	 */
-	header?: string;
-	/**
-	 * (emit bundleInfo.json file)
-	 */
-	bundleInfo: boolean;
-	/**
-	 * Language configuration.
-	 */
-	languages?: Language[];
+	resources?: string[];
 	/**
 	 * File contents interceptor
 	 * @param contents The contents of the file
@@ -215,51 +45,146 @@ const DEFAULT_FILE_HEADER = [
 	' *--------------------------------------------------------*/'
 ].join('\n');
 
-function optimizeAMDTask(opts: IOptimizeAMDTaskOpts): NodeJS.ReadWriteStream {
-	const src = opts.src;
-	const entryPoints = opts.entryPoints;
-	const resources = opts.resources;
-	const loaderConfig = opts.loaderConfig;
-	const bundledFileHeader = opts.header || DEFAULT_FILE_HEADER;
-	const fileContentMapper = opts.fileContentMapper || ((contents: string, _path: string) => contents);
-
-	const sourcemaps = require('gulp-sourcemaps') as typeof import('gulp-sourcemaps');
-
-	const bundlesStream = es.through(); // this stream will contain the bundled files
+function optimizeESMTask(opts: IOptimizeESMTaskOpts): NodeJS.ReadWriteStream {
 	const resourcesStream = es.through(); // this stream will contain the resources
-	const bundleInfoStream = es.through(); // this stream will contain bundleInfo.json
+	const bundlesStream = es.through(); // this stream will contain the bundled files
 
-	bundle.bundle(entryPoints, loaderConfig, function (err, result) {
-		if (err || !result) { return bundlesStream.emit('error', JSON.stringify(err)); }
-
-		toBundleStream(src, bundledFileHeader, result.files, fileContentMapper).pipe(bundlesStream);
-
-		// Remove css inlined resources
-		const filteredResources = resources.slice();
-		result.cssInlinedResources.forEach(function (resource) {
-			if (process.env['VSCODE_BUILD_VERBOSE']) {
-				log('optimizer', 'excluding inlined: ' + resource);
-			}
-			filteredResources.push('!' + resource);
-		});
-		gulp.src(filteredResources, { base: `${src}`, allowEmpty: true }).pipe(resourcesStream);
-
-		const bundleInfoArray: VinylFile[] = [];
-		if (opts.bundleInfo) {
-			bundleInfoArray.push(new VinylFile({
-				path: 'bundleInfo.json',
-				base: '.',
-				contents: Buffer.from(JSON.stringify(result.bundleData, null, '\t'))
-			}));
+	const entryPoints = opts.entryPoints.map(entryPoint => {
+		if (typeof entryPoint === 'string') {
+			return { name: path.parse(entryPoint).name };
 		}
-		es.readArray(bundleInfoArray).pipe(bundleInfoStream);
+		return entryPoint;
+	});
+
+	const allMentionedModules = new Set<string>();
+	for (const entryPoint of entryPoints) {
+		allMentionedModules.add(entryPoint.name);
+		entryPoint.include?.forEach(allMentionedModules.add, allMentionedModules);
+		entryPoint.exclude?.forEach(allMentionedModules.add, allMentionedModules);
+	}
+
+	allMentionedModules.delete('vs/css'); // TODO@esm remove this when vs/css is removed
+
+	const bundleAsync = async () => {
+
+		const files: VinylFile[] = [];
+		const tasks: Promise<any>[] = [];
+
+		for (const entryPoint of entryPoints) {
+
+			console.log(`[bundle] '${entryPoint.name}'`);
+
+			// support for 'dest' via esbuild#in/out
+			const dest = entryPoint.dest?.replace(/\.[^/.]+$/, '') ?? entryPoint.name;
+
+			// boilerplate massage
+			const banner = {
+				js: DEFAULT_FILE_HEADER,
+				css: DEFAULT_FILE_HEADER
+			};
+			const tslibPath = path.join(require.resolve('tslib'), '../tslib.es6.js');
+			banner.js += await fs.promises.readFile(tslibPath, 'utf-8');
+
+			const boilerplateTrimmer: esbuild.Plugin = {
+				name: 'boilerplate-trimmer',
+				setup(build) {
+					build.onLoad({ filter: /\.js$/ }, async args => {
+						const contents = await fs.promises.readFile(args.path, 'utf-8');
+						const newContents = bundle.removeAllTSBoilerplate(contents);
+						return { contents: newContents };
+					});
+				}
+			};
+
+			const overrideExternalPlugin: esbuild.Plugin = {
+				name: 'override-external',
+				setup(build) {
+					// We inline selected modules that are we depend on on startup without
+					// a conditional `await import(...)` by hooking into the resolution.
+					build.onResolve({ filter: /^minimist$/ }, () => {
+						return { path: path.join(REPO_ROOT_PATH, 'node_modules', 'minimist', 'index.js'), external: false };
+					});
+				},
+			};
+
+			const task = esbuild.build({
+				bundle: true,
+				external: entryPoint.exclude,
+				packages: 'external', // "external all the things", see https://esbuild.github.io/api/#packages
+				platform: 'neutral', // makes esm
+				format: 'esm',
+				sourcemap: 'external',
+				plugins: [boilerplateTrimmer, overrideExternalPlugin],
+				target: ['es2022'],
+				loader: {
+					'.ttf': 'file',
+					'.svg': 'file',
+					'.png': 'file',
+					'.sh': 'file',
+				},
+				assetNames: 'media/[name]', // moves media assets into a sub-folder "media"
+				banner: entryPoint.name === 'vs/workbench/workbench.web.main' ? undefined : banner, // TODO@esm remove line when we stop supporting web-amd-esm-bridge
+				entryPoints: [
+					{
+						in: path.join(REPO_ROOT_PATH, opts.src, `${entryPoint.name}.js`),
+						out: dest,
+					}
+				],
+				outdir: path.join(REPO_ROOT_PATH, opts.src),
+				write: false, // enables res.outputFiles
+				metafile: true, // enables res.metafile
+
+			}).then(res => {
+				for (const file of res.outputFiles) {
+
+					let contents = file.contents;
+					let sourceMapFile: esbuild.OutputFile | undefined = undefined;
+
+					if (file.path.endsWith('.js')) {
+
+						if (opts.fileContentMapper) {
+							// UGLY the fileContentMapper is per file but at this point we have all files
+							// bundled already. So, we call the mapper for the same contents but each file
+							// that has been included in the bundle...
+							let newText = file.text;
+							for (const input of Object.keys(res.metafile.inputs)) {
+								newText = opts.fileContentMapper(newText, input);
+							}
+							contents = Buffer.from(newText);
+						}
+
+						sourceMapFile = res.outputFiles.find(f => f.path === `${file.path}.map`);
+					}
+
+					const fileProps = {
+						contents: Buffer.from(contents),
+						sourceMap: sourceMapFile ? JSON.parse(sourceMapFile.text) : undefined, // support gulp-sourcemaps
+						path: file.path,
+						base: path.join(REPO_ROOT_PATH, opts.src)
+					};
+					files.push(new VinylFile(fileProps));
+				}
+			});
+
+			tasks.push(task);
+		}
+
+		await Promise.all(tasks);
+		return { files };
+	};
+
+	bundleAsync().then((output) => {
+
+		// bundle output (JS, CSS, SVG...)
+		es.readArray(output.files).pipe(bundlesStream);
+
+		// forward all resources
+		gulp.src(opts.resources ?? [], { base: `${opts.src}`, allowEmpty: true }).pipe(resourcesStream);
 	});
 
 	const result = es.merge(
-		loader(src, bundledFileHeader, false, opts.externalLoaderInfo),
 		bundlesStream,
-		resourcesStream,
-		bundleInfoStream
+		resourcesStream
 	);
 
 	return result
@@ -267,52 +192,6 @@ function optimizeAMDTask(opts: IOptimizeAMDTaskOpts): NodeJS.ReadWriteStream {
 			sourceRoot: undefined,
 			addComment: true,
 			includeContent: true
-		}))
-		.pipe(opts.languages && opts.languages.length ? processNlsFiles({
-			fileHeader: bundledFileHeader,
-			languages: opts.languages
-		}) : es.through());
-}
-
-export interface IOptimizeCommonJSTaskOpts {
-	/**
-	 * The paths to consider for optimizing.
-	 */
-	entryPoints: string[];
-	/**
-	 * The folder to read files from.
-	 */
-	src: string;
-	/**
-	 * ESBuild `platform` option: https://esbuild.github.io/api/#platform
-	 */
-	platform: 'browser' | 'node' | 'neutral';
-	/**
-	 * ESBuild `external` option: https://esbuild.github.io/api/#external
-	 */
-	external: string[];
-}
-
-function optimizeCommonJSTask(opts: IOptimizeCommonJSTaskOpts): NodeJS.ReadWriteStream {
-	const esbuild = require('esbuild') as typeof import('esbuild');
-
-	const src = opts.src;
-	const entryPoints = opts.entryPoints;
-
-	return gulp.src(entryPoints, { base: `${src}`, allowEmpty: true })
-		.pipe(es.map((f: any, cb) => {
-			esbuild.build({
-				entryPoints: [f.path],
-				bundle: true,
-				platform: opts.platform,
-				write: false,
-				external: opts.external
-			}).then(res => {
-				const jsFile = res.outputFiles[0];
-				f.contents = Buffer.from(jsFile.contents);
-
-				cb(undefined, f);
-			});
 		}));
 }
 
@@ -338,23 +217,15 @@ function optimizeManualTask(options: IOptimizeManualTaskOpts[]): NodeJS.ReadWrit
 	return es.merge(...concatenations);
 }
 
-export function optimizeLoaderTask(src: string, out: string, bundleLoader: boolean, bundledFileHeader = '', externalLoaderInfo?: util.IExternalLoaderInfo): () => NodeJS.ReadWriteStream {
-	return () => loader(src, bundledFileHeader, bundleLoader, externalLoaderInfo).pipe(gulp.dest(out));
-}
-
 export interface IOptimizeTaskOpts {
 	/**
 	 * Destination folder for the optimized files.
 	 */
 	out: string;
 	/**
-	 * Optimize AMD modules (using our AMD loader).
-	 */
-	amd: IOptimizeAMDTaskOpts;
-	/**
-	 * Optimize CommonJS modules (using esbuild).
-	 */
-	commonJS?: IOptimizeCommonJSTaskOpts;
+	 * Optimize ESM modules (using esbuild).
+	*/
+	esm: IOptimizeESMTaskOpts;
 	/**
 	 * Optimize manually by concatenating files.
 	 */
@@ -363,10 +234,8 @@ export interface IOptimizeTaskOpts {
 
 export function optimizeTask(opts: IOptimizeTaskOpts): () => NodeJS.ReadWriteStream {
 	return function () {
-		const optimizers = [optimizeAMDTask(opts.amd)];
-		if (opts.commonJS) {
-			optimizers.push(optimizeCommonJSTask(opts.commonJS));
-		}
+		const optimizers: NodeJS.ReadWriteStream[] = [];
+		optimizers.push(optimizeESMTask(opts.esm));
 
 		if (opts.manual) {
 			optimizers.push(optimizeManualTask(opts.manual));
@@ -377,12 +246,10 @@ export function optimizeTask(opts: IOptimizeTaskOpts): () => NodeJS.ReadWriteStr
 }
 
 export function minifyTask(src: string, sourceMapBaseUrl?: string): (cb: any) => void {
-	const esbuild = require('esbuild') as typeof import('esbuild');
 	const sourceMappingURL = sourceMapBaseUrl ? ((f: any) => `${sourceMapBaseUrl}/${f.relative}.map`) : undefined;
 
 	return cb => {
 		const cssnano = require('cssnano') as typeof import('cssnano');
-		const sourcemaps = require('gulp-sourcemaps') as typeof import('gulp-sourcemaps');
 		const svgmin = require('gulp-svgmin') as typeof import('gulp-svgmin');
 
 		const jsFilter = filter('**/*.js', { restore: true });
@@ -400,7 +267,7 @@ export function minifyTask(src: string, sourceMapBaseUrl?: string): (cb: any) =>
 					sourcemap: 'external',
 					outdir: '.',
 					platform: 'node',
-					target: ['esnext'],
+					target: ['es2022'],
 					write: false
 				}).then(res => {
 					const jsFile = res.outputFiles.find(f => /\.js$/.test(f.path))!;
@@ -425,13 +292,6 @@ export function minifyTask(src: string, sourceMapBaseUrl?: string): (cb: any) =>
 			svgFilter,
 			svgmin(),
 			svgFilter.restore,
-			(<any>sourcemaps).mapSources((sourcePath: string) => {
-				if (sourcePath === 'bootstrap-fork.js') {
-					return 'bootstrap-fork.orig.js';
-				}
-
-				return sourcePath;
-			}),
 			sourcemaps.write('./', {
 				sourceMappingURL,
 				sourceRoot: undefined,
diff --git a/build/lib/preLaunch.js b/build/lib/preLaunch.js
index 1bfe7f573f6..4791514fdfe 100644
--- a/build/lib/preLaunch.js
+++ b/build/lib/preLaunch.js
@@ -8,7 +8,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
-const yarn = process.platform === 'win32' ? 'yarn.cmd' : 'yarn';
+const npm = process.platform === 'win32' ? 'npm.cmd' : 'npm';
 const rootDir = path.resolve(__dirname, '..', '..');
 function runProcess(command, args = []) {
     return new Promise((resolve, reject) => {
@@ -28,15 +28,15 @@ async function exists(subdir) {
 }
 async function ensureNodeModules() {
     if (!(await exists('node_modules'))) {
-        await runProcess(yarn);
+        await runProcess(npm, ['ci']);
     }
 }
 async function getElectron() {
-    await runProcess(yarn, ['electron']);
+    await runProcess(npm, ['run', 'electron']);
 }
 async function ensureCompiled() {
     if (!(await exists('out'))) {
-        await runProcess(yarn, ['compile']);
+        await runProcess(npm, ['run', 'compile']);
     }
 }
 async function main() {
diff --git a/build/lib/preLaunch.ts b/build/lib/preLaunch.ts
index d6776e62798..e0ea274458a 100644
--- a/build/lib/preLaunch.ts
+++ b/build/lib/preLaunch.ts
@@ -9,7 +9,7 @@ import * as path from 'path';
 import { spawn } from 'child_process';
 import { promises as fs } from 'fs';
 
-const yarn = process.platform === 'win32' ? 'yarn.cmd' : 'yarn';
+const npm = process.platform === 'win32' ? 'npm.cmd' : 'npm';
 const rootDir = path.resolve(__dirname, '..', '..');
 
 function runProcess(command: string, args: ReadonlyArray<string> = []) {
@@ -31,17 +31,17 @@ async function exists(subdir: string) {
 
 async function ensureNodeModules() {
 	if (!(await exists('node_modules'))) {
-		await runProcess(yarn);
+		await runProcess(npm, ['ci']);
 	}
 }
 
 async function getElectron() {
-	await runProcess(yarn, ['electron']);
+	await runProcess(npm, ['run', 'electron']);
 }
 
 async function ensureCompiled() {
 	if (!(await exists('out'))) {
-		await runProcess(yarn, ['compile']);
+		await runProcess(npm, ['run', 'compile']);
 	}
 }
 
diff --git a/build/lib/standalone.js b/build/lib/standalone.js
index dbc47db0833..b724a009e8a 100644
--- a/build/lib/standalone.js
+++ b/build/lib/standalone.js
@@ -51,7 +51,12 @@ function extractEditor(options) {
     // Add extra .d.ts files from `node_modules/@types/`
     if (Array.isArray(options.compilerOptions?.types)) {
         options.compilerOptions.types.forEach((type) => {
-            options.typings.push(`../node_modules/@types/${type}/index.d.ts`);
+            if (type === '@webgpu/types') {
+                options.typings.push(`../node_modules/${type}/dist/index.d.ts`);
+            }
+            else {
+                options.typings.push(`../node_modules/@types/${type}/index.d.ts`);
+            }
         });
     }
     const result = tss.shake(options);
@@ -79,13 +84,7 @@ function extractEditor(options) {
             const info = ts.preProcessFile(fileContents);
             for (let i = info.importedFiles.length - 1; i >= 0; i--) {
                 const importedFileName = info.importedFiles[i].fileName;
-                let importedFilePath;
-                if (/^vs\/css!/.test(importedFileName)) {
-                    importedFilePath = importedFileName.substr('vs/css!'.length) + '.css';
-                }
-                else {
-                    importedFilePath = importedFileName;
-                }
+                let importedFilePath = importedFileName;
                 if (/(^\.\/)|(^\.\.\/)/.test(importedFilePath)) {
                     importedFilePath = path.join(path.dirname(fileName), importedFilePath);
                 }
@@ -93,8 +92,9 @@ function extractEditor(options) {
                     transportCSS(importedFilePath, copyFile, writeOutputFile);
                 }
                 else {
-                    if (fs.existsSync(path.join(options.sourcesRoot, importedFilePath + '.js'))) {
-                        copyFile(importedFilePath + '.js');
+                    const pathToCopy = path.join(options.sourcesRoot, importedFilePath);
+                    if (fs.existsSync(pathToCopy) && !fs.statSync(pathToCopy).isDirectory()) {
+                        copyFile(importedFilePath);
                     }
                 }
             }
@@ -106,14 +106,10 @@ function extractEditor(options) {
         'vs/css.build.ts',
         'vs/css.ts',
         'vs/loader.js',
-        'vs/loader.d.ts',
-        'vs/nls.build.ts',
-        'vs/nls.ts',
-        'vs/nls.mock.ts',
+        'vs/loader.d.ts'
     ].forEach(copyFile);
 }
 function createESMSourcesAndResources2(options) {
-    const ts = require('typescript');
     const SRC_FOLDER = path.join(REPO_ROOT, options.srcFolder);
     const OUT_FOLDER = path.join(REPO_ROOT, options.outFolder);
     const OUT_RESOURCES_FOLDER = path.join(REPO_ROOT, options.outResourcesFolder);
@@ -134,58 +130,16 @@ function createESMSourcesAndResources2(options) {
         }
         if (file === 'tsconfig.json') {
             const tsConfig = JSON.parse(fs.readFileSync(path.join(SRC_FOLDER, file)).toString());
-            tsConfig.compilerOptions.module = 'es6';
+            tsConfig.compilerOptions.module = 'es2022';
             tsConfig.compilerOptions.outDir = path.join(path.relative(OUT_FOLDER, OUT_RESOURCES_FOLDER), 'vs').replace(/\\/g, '/');
             write(getDestAbsoluteFilePath(file), JSON.stringify(tsConfig, null, '\t'));
             continue;
         }
-        if (/\.d\.ts$/.test(file) || /\.css$/.test(file) || /\.js$/.test(file) || /\.ttf$/.test(file)) {
+        if (/\.ts$/.test(file) || /\.d\.ts$/.test(file) || /\.css$/.test(file) || /\.js$/.test(file) || /\.ttf$/.test(file)) {
             // Transport the files directly
             write(getDestAbsoluteFilePath(file), fs.readFileSync(path.join(SRC_FOLDER, file)));
             continue;
         }
-        if (/\.ts$/.test(file)) {
-            // Transform the .ts file
-            let fileContents = fs.readFileSync(path.join(SRC_FOLDER, file)).toString();
-            const info = ts.preProcessFile(fileContents);
-            for (let i = info.importedFiles.length - 1; i >= 0; i--) {
-                const importedFilename = info.importedFiles[i].fileName;
-                const pos = info.importedFiles[i].pos;
-                const end = info.importedFiles[i].end;
-                let importedFilepath;
-                if (/^vs\/css!/.test(importedFilename)) {
-                    importedFilepath = importedFilename.substr('vs/css!'.length) + '.css';
-                }
-                else {
-                    importedFilepath = importedFilename;
-                }
-                if (/(^\.\/)|(^\.\.\/)/.test(importedFilepath)) {
-                    importedFilepath = path.join(path.dirname(file), importedFilepath);
-                }
-                let relativePath;
-                if (importedFilepath === path.dirname(file).replace(/\\/g, '/')) {
-                    relativePath = '../' + path.basename(path.dirname(file));
-                }
-                else if (importedFilepath === path.dirname(path.dirname(file)).replace(/\\/g, '/')) {
-                    relativePath = '../../' + path.basename(path.dirname(path.dirname(file)));
-                }
-                else {
-                    relativePath = path.relative(path.dirname(file), importedFilepath);
-                }
-                relativePath = relativePath.replace(/\\/g, '/');
-                if (!/(^\.\/)|(^\.\.\/)/.test(relativePath)) {
-                    relativePath = './' + relativePath;
-                }
-                fileContents = (fileContents.substring(0, pos + 1)
-                    + relativePath
-                    + fileContents.substring(end + 1));
-            }
-            fileContents = fileContents.replace(/import ([a-zA-Z0-9]+) = require\(('[^']+')\);/g, function (_, m1, m2) {
-                return `import * as ${m1} from ${m2};`;
-            });
-            write(getDestAbsoluteFilePath(file), fileContents);
-            continue;
-        }
         console.log(`UNKNOWN FILE: ${file}`);
     }
     function walkDirRecursive(dir) {
diff --git a/build/lib/standalone.ts b/build/lib/standalone.ts
index 775a1be5996..9563cd6670b 100644
--- a/build/lib/standalone.ts
+++ b/build/lib/standalone.ts
@@ -59,7 +59,11 @@ export function extractEditor(options: tss.ITreeShakingOptions & { destRoot: str
 	// Add extra .d.ts files from `node_modules/@types/`
 	if (Array.isArray(options.compilerOptions?.types)) {
 		options.compilerOptions.types.forEach((type: string) => {
-			options.typings.push(`../node_modules/@types/${type}/index.d.ts`);
+			if (type === '@webgpu/types') {
+				options.typings.push(`../node_modules/${type}/dist/index.d.ts`);
+			} else {
+				options.typings.push(`../node_modules/@types/${type}/index.d.ts`);
+			}
 		});
 	}
 
@@ -90,12 +94,7 @@ export function extractEditor(options: tss.ITreeShakingOptions & { destRoot: str
 			for (let i = info.importedFiles.length - 1; i >= 0; i--) {
 				const importedFileName = info.importedFiles[i].fileName;
 
-				let importedFilePath: string;
-				if (/^vs\/css!/.test(importedFileName)) {
-					importedFilePath = importedFileName.substr('vs/css!'.length) + '.css';
-				} else {
-					importedFilePath = importedFileName;
-				}
+				let importedFilePath = importedFileName;
 				if (/(^\.\/)|(^\.\.\/)/.test(importedFilePath)) {
 					importedFilePath = path.join(path.dirname(fileName), importedFilePath);
 				}
@@ -103,8 +102,9 @@ export function extractEditor(options: tss.ITreeShakingOptions & { destRoot: str
 				if (/\.css$/.test(importedFilePath)) {
 					transportCSS(importedFilePath, copyFile, writeOutputFile);
 				} else {
-					if (fs.existsSync(path.join(options.sourcesRoot, importedFilePath + '.js'))) {
-						copyFile(importedFilePath + '.js');
+					const pathToCopy = path.join(options.sourcesRoot, importedFilePath);
+					if (fs.existsSync(pathToCopy) && !fs.statSync(pathToCopy).isDirectory()) {
+						copyFile(importedFilePath);
 					}
 				}
 			}
@@ -118,10 +118,7 @@ export function extractEditor(options: tss.ITreeShakingOptions & { destRoot: str
 		'vs/css.build.ts',
 		'vs/css.ts',
 		'vs/loader.js',
-		'vs/loader.d.ts',
-		'vs/nls.build.ts',
-		'vs/nls.ts',
-		'vs/nls.mock.ts',
+		'vs/loader.d.ts'
 	].forEach(copyFile);
 }
 
@@ -134,7 +131,6 @@ export interface IOptions2 {
 }
 
 export function createESMSourcesAndResources2(options: IOptions2): void {
-	const ts = require('typescript') as typeof import('typescript');
 
 	const SRC_FOLDER = path.join(REPO_ROOT, options.srcFolder);
 	const OUT_FOLDER = path.join(REPO_ROOT, options.outFolder);
@@ -160,66 +156,18 @@ export function createESMSourcesAndResources2(options: IOptions2): void {
 
 		if (file === 'tsconfig.json') {
 			const tsConfig = JSON.parse(fs.readFileSync(path.join(SRC_FOLDER, file)).toString());
-			tsConfig.compilerOptions.module = 'es6';
+			tsConfig.compilerOptions.module = 'es2022';
 			tsConfig.compilerOptions.outDir = path.join(path.relative(OUT_FOLDER, OUT_RESOURCES_FOLDER), 'vs').replace(/\\/g, '/');
 			write(getDestAbsoluteFilePath(file), JSON.stringify(tsConfig, null, '\t'));
 			continue;
 		}
 
-		if (/\.d\.ts$/.test(file) || /\.css$/.test(file) || /\.js$/.test(file) || /\.ttf$/.test(file)) {
+		if (/\.ts$/.test(file) || /\.d\.ts$/.test(file) || /\.css$/.test(file) || /\.js$/.test(file) || /\.ttf$/.test(file)) {
 			// Transport the files directly
 			write(getDestAbsoluteFilePath(file), fs.readFileSync(path.join(SRC_FOLDER, file)));
 			continue;
 		}
 
-		if (/\.ts$/.test(file)) {
-			// Transform the .ts file
-			let fileContents = fs.readFileSync(path.join(SRC_FOLDER, file)).toString();
-
-			const info = ts.preProcessFile(fileContents);
-
-			for (let i = info.importedFiles.length - 1; i >= 0; i--) {
-				const importedFilename = info.importedFiles[i].fileName;
-				const pos = info.importedFiles[i].pos;
-				const end = info.importedFiles[i].end;
-
-				let importedFilepath: string;
-				if (/^vs\/css!/.test(importedFilename)) {
-					importedFilepath = importedFilename.substr('vs/css!'.length) + '.css';
-				} else {
-					importedFilepath = importedFilename;
-				}
-				if (/(^\.\/)|(^\.\.\/)/.test(importedFilepath)) {
-					importedFilepath = path.join(path.dirname(file), importedFilepath);
-				}
-
-				let relativePath: string;
-				if (importedFilepath === path.dirname(file).replace(/\\/g, '/')) {
-					relativePath = '../' + path.basename(path.dirname(file));
-				} else if (importedFilepath === path.dirname(path.dirname(file)).replace(/\\/g, '/')) {
-					relativePath = '../../' + path.basename(path.dirname(path.dirname(file)));
-				} else {
-					relativePath = path.relative(path.dirname(file), importedFilepath);
-				}
-				relativePath = relativePath.replace(/\\/g, '/');
-				if (!/(^\.\/)|(^\.\.\/)/.test(relativePath)) {
-					relativePath = './' + relativePath;
-				}
-				fileContents = (
-					fileContents.substring(0, pos + 1)
-					+ relativePath
-					+ fileContents.substring(end + 1)
-				);
-			}
-
-			fileContents = fileContents.replace(/import ([a-zA-Z0-9]+) = require\(('[^']+')\);/g, function (_, m1, m2) {
-				return `import * as ${m1} from ${m2};`;
-			});
-
-			write(getDestAbsoluteFilePath(file), fileContents);
-			continue;
-		}
-
 		console.log(`UNKNOWN FILE: ${file}`);
 	}
 
diff --git a/build/lib/stylelint/vscode-known-variables.json b/build/lib/stylelint/vscode-known-variables.json
index 0c974a46e00..3f82544faa2 100644
--- a/build/lib/stylelint/vscode-known-variables.json
+++ b/build/lib/stylelint/vscode-known-variables.json
@@ -17,6 +17,10 @@
 		"--vscode-activityBarTop-dropBorder",
 		"--vscode-activityBarTop-foreground",
 		"--vscode-activityBarTop-inactiveForeground",
+		"--vscode-activityErrorBadge-background",
+		"--vscode-activityErrorBadge-foreground",
+		"--vscode-activityWarningBadge-background",
+		"--vscode-activityWarningBadge-foreground",
 		"--vscode-badge-background",
 		"--vscode-badge-foreground",
 		"--vscode-banner-background",
@@ -94,6 +98,7 @@
 		"--vscode-debugTokenExpression-name",
 		"--vscode-debugTokenExpression-number",
 		"--vscode-debugTokenExpression-string",
+		"--vscode-debugTokenExpression-type",
 		"--vscode-debugTokenExpression-value",
 		"--vscode-debugToolBar-background",
 		"--vscode-debugToolBar-border",
@@ -137,6 +142,7 @@
 		"--vscode-editor-findRangeHighlightBorder",
 		"--vscode-editor-focusedStackFrameHighlightBackground",
 		"--vscode-editor-foldBackground",
+		"--vscode-editor-foldPlaceholderForeground",
 		"--vscode-editor-foreground",
 		"--vscode-editor-hoverHighlightBackground",
 		"--vscode-editor-inactiveSelectionBackground",
@@ -148,6 +154,7 @@
 		"--vscode-editor-placeholder-foreground",
 		"--vscode-editor-rangeHighlightBackground",
 		"--vscode-editor-rangeHighlightBorder",
+		"--vscode-editor-compositionBorder",
 		"--vscode-editor-selectionBackground",
 		"--vscode-editor-selectionForeground",
 		"--vscode-editor-selectionHighlightBackground",
@@ -165,6 +172,10 @@
 		"--vscode-editor-wordHighlightStrongBorder",
 		"--vscode-editor-wordHighlightTextBackground",
 		"--vscode-editor-wordHighlightTextBorder",
+		"--vscode-editorActionList-background",
+		"--vscode-editorActionList-focusBackground",
+		"--vscode-editorActionList-focusForeground",
+		"--vscode-editorActionList-foreground",
 		"--vscode-editorActiveLineNumber-foreground",
 		"--vscode-editorBracketHighlight-foreground1",
 		"--vscode-editorBracketHighlight-foreground2",
@@ -337,7 +348,7 @@
 		"--vscode-icon-foreground",
 		"--vscode-inlineChat-background",
 		"--vscode-inlineChat-border",
-		"--vscode-inlineChat-regionHighlight",
+		"--vscode-inlineChat-foreground",
 		"--vscode-inlineChat-shadow",
 		"--vscode-inlineChatDiff-inserted",
 		"--vscode-inlineChatDiff-removed",
@@ -529,11 +540,27 @@
 		"--vscode-quickInputList-focusForeground",
 		"--vscode-quickInputList-focusIconForeground",
 		"--vscode-quickInputTitle-background",
+		"--vscode-radio-activeBackground",
+		"--vscode-radio-activeBorder",
+		"--vscode-radio-activeForeground",
+		"--vscode-radio-inactiveBackground",
+		"--vscode-radio-inactiveBorder",
+		"--vscode-radio-inactiveForeground",
+		"--vscode-radio-inactiveHoverBackground",
 		"--vscode-sash-hoverBorder",
-		"--vscode-scm-historyItemAdditionsForeground",
-		"--vscode-scm-historyItemDeletionsForeground",
-		"--vscode-scm-historyItemSelectedStatisticsBorder",
-		"--vscode-scm-historyItemStatisticsBorder",
+		"--vscode-scmGraph-foreground1",
+		"--vscode-scmGraph-foreground2",
+		"--vscode-scmGraph-foreground3",
+		"--vscode-scmGraph-foreground4",
+		"--vscode-scmGraph-foreground5",
+		"--vscode-scmGraph-historyItemBaseRefColor",
+		"--vscode-scmGraph-historyItemHoverAdditionsForeground",
+		"--vscode-scmGraph-historyItemHoverDefaultLabelBackground",
+		"--vscode-scmGraph-historyItemHoverDefaultLabelForeground",
+		"--vscode-scmGraph-historyItemHoverDeletionsForeground",
+		"--vscode-scmGraph-historyItemHoverLabelForeground",
+		"--vscode-scmGraph-historyItemRefColor",
+		"--vscode-scmGraph-historyItemRemoteRefColor",
 		"--vscode-scrollbar-shadow",
 		"--vscode-scrollbarSlider-activeBackground",
 		"--vscode-scrollbarSlider-background",
@@ -709,11 +736,14 @@
 		"--vscode-terminalCommandDecoration-defaultBackground",
 		"--vscode-terminalCommandDecoration-errorBackground",
 		"--vscode-terminalCommandDecoration-successBackground",
+		"--vscode-terminalCommandGuide-foreground",
 		"--vscode-terminalCursor-background",
 		"--vscode-terminalCursor-foreground",
+		"--vscode-terminalOverviewRuler-border",
 		"--vscode-terminalOverviewRuler-cursorForeground",
 		"--vscode-terminalOverviewRuler-findMatchForeground",
 		"--vscode-terminalStickyScroll-background",
+		"--vscode-terminalStickyScroll-border",
 		"--vscode-terminalStickyScrollHover-background",
 		"--vscode-testing-coverCountBadgeBackground",
 		"--vscode-testing-coverCountBadgeForeground",
@@ -808,6 +838,7 @@
 		"--testMessageDecorationFontFamily",
 		"--testMessageDecorationFontSize",
 		"--title-border-bottom-color",
+		"--title-wco-width",
 		"--vscode-chat-list-background",
 		"--vscode-editorCodeLens-fontFamily",
 		"--vscode-editorCodeLens-fontFamilyDefault",
@@ -818,8 +849,6 @@
 		"--vscode-hover-maxWidth",
 		"--vscode-hover-sourceWhiteSpace",
 		"--vscode-hover-whiteSpace",
-		"--vscode-inline-chat-quick-voice-height",
-		"--vscode-inline-chat-quick-voice-width",
 		"--vscode-editor-dictation-widget-height",
 		"--vscode-editor-dictation-widget-width",
 		"--vscode-interactive-session-foreground",
@@ -834,6 +863,8 @@
 		"--vscode-editorStickyScroll-scrollableWidth",
 		"--vscode-editorStickyScroll-foldingOpacityTransition",
 		"--window-border-color",
+		"--vscode-parameterHintsWidget-editorFontFamily",
+		"--vscode-parameterHintsWidget-editorFontFamilyDefault",
 		"--workspace-trust-check-color",
 		"--workspace-trust-selected-color",
 		"--workspace-trust-unselected-color",
@@ -853,6 +884,8 @@
 		"--z-index-notebook-scrollbar",
 		"--z-index-run-button-container",
 		"--zoom-factor",
-		"--test-bar-width"
+		"--test-bar-width",
+		"--widget-color",
+		"--text-link-decoration"
 	]
 }
\ No newline at end of file
diff --git a/build/lib/treeshaking.js b/build/lib/treeshaking.js
index c8e95511877..af06f4e3ec5 100644
--- a/build/lib/treeshaking.js
+++ b/build/lib/treeshaking.js
@@ -100,35 +100,36 @@ function discoverAndReadFiles(ts, options) {
     options.entryPoints.forEach((entryPoint) => enqueue(entryPoint));
     while (queue.length > 0) {
         const moduleId = queue.shift();
-        const dts_filename = path.join(options.sourcesRoot, moduleId + '.d.ts');
+        let redirectedModuleId = moduleId;
+        if (options.redirects[moduleId]) {
+            redirectedModuleId = options.redirects[moduleId];
+        }
+        const dts_filename = path.join(options.sourcesRoot, redirectedModuleId + '.d.ts');
         if (fs.existsSync(dts_filename)) {
             const dts_filecontents = fs.readFileSync(dts_filename).toString();
             FILES[`${moduleId}.d.ts`] = dts_filecontents;
             continue;
         }
-        const js_filename = path.join(options.sourcesRoot, moduleId + '.js');
+        const js_filename = path.join(options.sourcesRoot, redirectedModuleId + '.js');
         if (fs.existsSync(js_filename)) {
             // This is an import for a .js file, so ignore it...
             continue;
         }
-        let ts_filename;
-        if (options.redirects[moduleId]) {
-            ts_filename = path.join(options.sourcesRoot, options.redirects[moduleId] + '.ts');
-        }
-        else {
-            ts_filename = path.join(options.sourcesRoot, moduleId + '.ts');
-        }
+        const ts_filename = path.join(options.sourcesRoot, redirectedModuleId + '.ts');
         const ts_filecontents = fs.readFileSync(ts_filename).toString();
         const info = ts.preProcessFile(ts_filecontents);
         for (let i = info.importedFiles.length - 1; i >= 0; i--) {
             const importedFileName = info.importedFiles[i].fileName;
             if (options.importIgnorePattern.test(importedFileName)) {
-                // Ignore vs/css! imports
+                // Ignore *.css imports
                 continue;
             }
             let importedModuleId = importedFileName;
             if (/(^\.\/)|(^\.\.\/)/.test(importedModuleId)) {
                 importedModuleId = path.join(path.dirname(moduleId), importedModuleId);
+                if (importedModuleId.endsWith('.js')) { // ESM: code imports require to be relative and have a '.js' file extension
+                    importedModuleId = importedModuleId.substr(0, importedModuleId.length - 3);
+                }
             }
             enqueue(importedModuleId);
         }
@@ -455,6 +456,9 @@ function markNodes(ts, languageService, options) {
         const nodeSourceFile = node.getSourceFile();
         let fullPath;
         if (/(^\.\/)|(^\.\.\/)/.test(importText)) {
+            if (importText.endsWith('.js')) { // ESM: code imports require to be relative and to have a '.js' file extension
+                importText = importText.substr(0, importText.length - 3);
+            }
             fullPath = path.join(path.dirname(nodeSourceFile.fileName), importText) + '.ts';
         }
         else {
diff --git a/build/lib/treeshaking.ts b/build/lib/treeshaking.ts
index 020e567eb72..cd17c5f0278 100644
--- a/build/lib/treeshaking.ts
+++ b/build/lib/treeshaking.ts
@@ -53,7 +53,7 @@ export interface ITreeShakingOptions {
 	 */
 	shakeLevel: ShakeLevel;
 	/**
-	 * regex pattern to ignore certain imports e.g. `vs/css!` imports
+	 * regex pattern to ignore certain imports e.g. `.css` imports
 	 */
 	importIgnorePattern: RegExp;
 
@@ -155,38 +155,43 @@ function discoverAndReadFiles(ts: typeof import('typescript'), options: ITreeSha
 
 	while (queue.length > 0) {
 		const moduleId = queue.shift()!;
-		const dts_filename = path.join(options.sourcesRoot, moduleId + '.d.ts');
+		let redirectedModuleId: string = moduleId;
+		if (options.redirects[moduleId]) {
+			redirectedModuleId = options.redirects[moduleId];
+		}
+
+		const dts_filename = path.join(options.sourcesRoot, redirectedModuleId + '.d.ts');
 		if (fs.existsSync(dts_filename)) {
 			const dts_filecontents = fs.readFileSync(dts_filename).toString();
 			FILES[`${moduleId}.d.ts`] = dts_filecontents;
 			continue;
 		}
 
-		const js_filename = path.join(options.sourcesRoot, moduleId + '.js');
+
+		const js_filename = path.join(options.sourcesRoot, redirectedModuleId + '.js');
 		if (fs.existsSync(js_filename)) {
 			// This is an import for a .js file, so ignore it...
 			continue;
 		}
 
-		let ts_filename: string;
-		if (options.redirects[moduleId]) {
-			ts_filename = path.join(options.sourcesRoot, options.redirects[moduleId] + '.ts');
-		} else {
-			ts_filename = path.join(options.sourcesRoot, moduleId + '.ts');
-		}
+		const ts_filename = path.join(options.sourcesRoot, redirectedModuleId + '.ts');
+
 		const ts_filecontents = fs.readFileSync(ts_filename).toString();
 		const info = ts.preProcessFile(ts_filecontents);
 		for (let i = info.importedFiles.length - 1; i >= 0; i--) {
 			const importedFileName = info.importedFiles[i].fileName;
 
 			if (options.importIgnorePattern.test(importedFileName)) {
-				// Ignore vs/css! imports
+				// Ignore *.css imports
 				continue;
 			}
 
 			let importedModuleId = importedFileName;
 			if (/(^\.\/)|(^\.\.\/)/.test(importedModuleId)) {
 				importedModuleId = path.join(path.dirname(moduleId), importedModuleId);
+				if (importedModuleId.endsWith('.js')) { // ESM: code imports require to be relative and have a '.js' file extension
+					importedModuleId = importedModuleId.substr(0, importedModuleId.length - 3);
+				}
 			}
 			enqueue(importedModuleId);
 		}
@@ -565,6 +570,9 @@ function markNodes(ts: typeof import('typescript'), languageService: ts.Language
 		const nodeSourceFile = node.getSourceFile();
 		let fullPath: string;
 		if (/(^\.\/)|(^\.\.\/)/.test(importText)) {
+			if (importText.endsWith('.js')) { // ESM: code imports require to be relative and to have a '.js' file extension
+				importText = importText.substr(0, importText.length - 3);
+			}
 			fullPath = path.join(path.dirname(nodeSourceFile.fileName), importText) + '.ts';
 		} else {
 			fullPath = importText + '.ts';
diff --git a/build/lib/tsb/builder.js b/build/lib/tsb/builder.js
index fc74bfa8acc..cee2758e896 100644
--- a/build/lib/tsb/builder.js
+++ b/build/lib/tsb/builder.js
@@ -355,7 +355,7 @@ function createTypeScriptBuilder(config, projectFile, cmd) {
             // print stats
             const headNow = process.memoryUsage().heapUsed;
             const MB = 1024 * 1024;
-            _log('[tsb]', `time:  ${colors.yellow((Date.now() - t1) + 'ms')} + \nmem:  ${colors.cyan(Math.ceil(headNow / MB) + 'MB')} ${colors.bgCyan('delta: ' + Math.ceil((headNow - headUsed) / MB))}`);
+            _log('[tsb]', `time:  ${colors.yellow((Date.now() - t1) + 'ms')} + \nmem:  ${colors.cyan(Math.ceil(headNow / MB) + 'MB')} ${colors.bgcyan('delta: ' + Math.ceil((headNow - headUsed) / MB))}`);
             headUsed = headNow;
         });
     }
@@ -550,7 +550,10 @@ class LanguageServiceHost {
             let found = false;
             while (!found && dirname.indexOf(stopDirname) === 0) {
                 dirname = path.dirname(dirname);
-                const resolvedPath = path.resolve(dirname, ref.fileName);
+                let resolvedPath = path.resolve(dirname, ref.fileName);
+                if (resolvedPath.endsWith('.js')) {
+                    resolvedPath = resolvedPath.slice(0, -3);
+                }
                 const normalizedPath = normalize(resolvedPath);
                 if (this.getScriptSnapshot(normalizedPath + '.ts')) {
                     this._dependencies.inertEdge(filename, normalizedPath + '.ts');
diff --git a/build/lib/tsb/builder.ts b/build/lib/tsb/builder.ts
index 9fc476ae702..70c71591a6e 100644
--- a/build/lib/tsb/builder.ts
+++ b/build/lib/tsb/builder.ts
@@ -427,7 +427,7 @@ export function createTypeScriptBuilder(config: IConfiguration, projectFile: str
 			const MB = 1024 * 1024;
 			_log(
 				'[tsb]',
-				`time:  ${colors.yellow((Date.now() - t1) + 'ms')} + \nmem:  ${colors.cyan(Math.ceil(headNow / MB) + 'MB')} ${colors.bgCyan('delta: ' + Math.ceil((headNow - headUsed) / MB))}`
+				`time:  ${colors.yellow((Date.now() - t1) + 'ms')} + \nmem:  ${colors.cyan(Math.ceil(headNow / MB) + 'MB')} ${colors.bgcyan('delta: ' + Math.ceil((headNow - headUsed) / MB))}`
 			);
 			headUsed = headNow;
 		});
@@ -660,7 +660,10 @@ class LanguageServiceHost implements ts.LanguageServiceHost {
 
 			while (!found && dirname.indexOf(stopDirname) === 0) {
 				dirname = path.dirname(dirname);
-				const resolvedPath = path.resolve(dirname, ref.fileName);
+				let resolvedPath = path.resolve(dirname, ref.fileName);
+				if (resolvedPath.endsWith('.js')) {
+					resolvedPath = resolvedPath.slice(0, -3);
+				}
 				const normalizedPath = normalize(resolvedPath);
 
 				if (this.getScriptSnapshot(normalizedPath + '.ts')) {
diff --git a/build/lib/tsb/transpiler.js b/build/lib/tsb/transpiler.js
index 5dcc4ca1ed3..100b1bac972 100644
--- a/build/lib/tsb/transpiler.js
+++ b/build/lib/tsb/transpiler.js
@@ -62,7 +62,7 @@ class OutputFileNameOracle {
             catch (err) {
                 console.error(file, cmdLine.fileNames);
                 console.error(err);
-                throw new err;
+                throw err;
             }
         };
     }
diff --git a/build/lib/tsb/transpiler.ts b/build/lib/tsb/transpiler.ts
index cbc3d9e8eee..b6a9deeb3c7 100644
--- a/build/lib/tsb/transpiler.ts
+++ b/build/lib/tsb/transpiler.ts
@@ -84,7 +84,7 @@ class OutputFileNameOracle {
 			} catch (err) {
 				console.error(file, cmdLine.fileNames);
 				console.error(err);
-				throw new err;
+				throw err;
 			}
 		};
 	}
diff --git a/build/lib/util.js b/build/lib/util.js
index 02ce049b00b..82e4189dd1a 100644
--- a/build/lib/util.js
+++ b/build/lib/util.js
@@ -21,12 +21,8 @@ exports.rreddir = rreddir;
 exports.ensureDir = ensureDir;
 exports.rebase = rebase;
 exports.filter = filter;
-exports.versionStringToNumber = versionStringToNumber;
 exports.streamToPromise = streamToPromise;
 exports.getElectronVersion = getElectronVersion;
-exports.acquireWebNodePaths = acquireWebNodePaths;
-exports.createExternalLoaderConfig = createExternalLoaderConfig;
-exports.buildWebNodePaths = buildWebNodePaths;
 const es = require("event-stream");
 const _debounce = require("debounce");
 const _filter = require("gulp-filter");
@@ -300,14 +296,6 @@ function filter(fn) {
     result.restore = es.through();
     return result;
 }
-function versionStringToNumber(versionStr) {
-    const semverRegex = /(\d+)\.(\d+)\.(\d+)/;
-    const match = versionStr.match(semverRegex);
-    if (!match) {
-        throw new Error('Version string is not properly formatted: ' + versionStr);
-    }
-    return parseInt(match[1], 10) * 1e4 + parseInt(match[2], 10) * 1e2 + parseInt(match[3], 10);
-}
 function streamToPromise(stream) {
     return new Promise((c, e) => {
         stream.on('error', err => e(err));
@@ -315,93 +303,9 @@ function streamToPromise(stream) {
     });
 }
 function getElectronVersion() {
-    const yarnrc = fs.readFileSync(path.join(root, '.yarnrc'), 'utf8');
-    const electronVersion = /^target "(.*)"$/m.exec(yarnrc)[1];
-    const msBuildId = /^ms_build_id "(.*)"$/m.exec(yarnrc)[1];
+    const npmrc = fs.readFileSync(path.join(root, '.npmrc'), 'utf8');
+    const electronVersion = /^target="(.*)"$/m.exec(npmrc)[1];
+    const msBuildId = /^ms_build_id="(.*)"$/m.exec(npmrc)[1];
     return { electronVersion, msBuildId };
 }
-function acquireWebNodePaths() {
-    const root = path.join(__dirname, '..', '..');
-    const webPackageJSON = path.join(root, '/remote/web', 'package.json');
-    const webPackages = JSON.parse(fs.readFileSync(webPackageJSON, 'utf8')).dependencies;
-    const distroWebPackageJson = path.join(root, '.build/distro/npm/remote/web/package.json');
-    if (fs.existsSync(distroWebPackageJson)) {
-        const distroWebPackages = JSON.parse(fs.readFileSync(distroWebPackageJson, 'utf8')).dependencies;
-        Object.assign(webPackages, distroWebPackages);
-    }
-    const nodePaths = {};
-    for (const key of Object.keys(webPackages)) {
-        const packageJSON = path.join(root, 'node_modules', key, 'package.json');
-        const packageData = JSON.parse(fs.readFileSync(packageJSON, 'utf8'));
-        // Only cases where the browser is a string are handled
-        let entryPoint = typeof packageData.browser === 'string' ? packageData.browser : packageData.main;
-        // On rare cases a package doesn't have an entrypoint so we assume it has a dist folder with a min.js
-        if (!entryPoint) {
-            // TODO @lramos15 remove this when jschardet adds an entrypoint so we can warn on all packages w/out entrypoint
-            if (key !== 'jschardet') {
-                console.warn(`No entry point for ${key} assuming dist/${key}.min.js`);
-            }
-            entryPoint = `dist/${key}.min.js`;
-        }
-        // Remove any starting path information so it's all relative info
-        if (entryPoint.startsWith('./')) {
-            entryPoint = entryPoint.substring(2);
-        }
-        else if (entryPoint.startsWith('/')) {
-            entryPoint = entryPoint.substring(1);
-        }
-        // Search for a minified entrypoint as well
-        if (/(?<!\.min)\.js$/i.test(entryPoint)) {
-            const minEntryPoint = entryPoint.replace(/\.js$/i, '.min.js');
-            if (fs.existsSync(path.join(root, 'node_modules', key, minEntryPoint))) {
-                entryPoint = minEntryPoint;
-            }
-        }
-        nodePaths[key] = entryPoint;
-    }
-    // @TODO lramos15 can we make this dynamic like the rest of the node paths
-    // Add these paths as well for 1DS SDK dependencies.
-    // Not sure why given the 1DS entrypoint then requires these modules
-    // they are not fetched from the right location and instead are fetched from out/
-    nodePaths['@microsoft/dynamicproto-js'] = 'lib/dist/umd/dynamicproto-js.min.js';
-    nodePaths['@microsoft/applicationinsights-shims'] = 'dist/umd/applicationinsights-shims.min.js';
-    nodePaths['@microsoft/applicationinsights-core-js'] = 'browser/applicationinsights-core-js.min.js';
-    return nodePaths;
-}
-function createExternalLoaderConfig(webEndpoint, commit, quality) {
-    if (!webEndpoint || !commit || !quality) {
-        return undefined;
-    }
-    webEndpoint = webEndpoint + `/${quality}/${commit}`;
-    const nodePaths = acquireWebNodePaths();
-    Object.keys(nodePaths).map(function (key, _) {
-        nodePaths[key] = `../node_modules/${key}/${nodePaths[key]}`;
-    });
-    const externalLoaderConfig = {
-        baseUrl: `${webEndpoint}/out`,
-        recordStats: true,
-        paths: nodePaths
-    };
-    return externalLoaderConfig;
-}
-function buildWebNodePaths(outDir) {
-    const result = () => new Promise((resolve, _) => {
-        const root = path.join(__dirname, '..', '..');
-        const nodePaths = acquireWebNodePaths();
-        // Now we write the node paths to out/vs
-        const outDirectory = path.join(root, outDir, 'vs');
-        fs.mkdirSync(outDirectory, { recursive: true });
-        const headerWithGeneratedFileWarning = `/*---------------------------------------------------------------------------------------------
-	 *  Copyright (c) Microsoft Corporation. All rights reserved.
-	 *  Licensed under the MIT License. See License.txt in the project root for license information.
-	 *--------------------------------------------------------------------------------------------*/
-
-	// This file is generated by build/npm/postinstall.js. Do not edit.`;
-        const fileContents = `${headerWithGeneratedFileWarning}\nself.webPackagePaths = ${JSON.stringify(nodePaths, null, 2)};`;
-        fs.writeFileSync(path.join(outDirectory, 'webPackagePaths.js'), fileContents, 'utf8');
-        resolve();
-    });
-    result.taskName = 'build-web-node-paths';
-    return result;
-}
 //# sourceMappingURL=util.js.map
\ No newline at end of file
diff --git a/build/lib/util.ts b/build/lib/util.ts
index 6648ce42364..08921834676 100644
--- a/build/lib/util.ts
+++ b/build/lib/util.ts
@@ -367,16 +367,6 @@ export function filter(fn: (data: any) => boolean): FilterStream {
 	return result;
 }
 
-export function versionStringToNumber(versionStr: string) {
-	const semverRegex = /(\d+)\.(\d+)\.(\d+)/;
-	const match = versionStr.match(semverRegex);
-	if (!match) {
-		throw new Error('Version string is not properly formatted: ' + versionStr);
-	}
-
-	return parseInt(match[1], 10) * 1e4 + parseInt(match[2], 10) * 1e2 + parseInt(match[3], 10);
-}
-
 export function streamToPromise(stream: NodeJS.ReadWriteStream): Promise<void> {
 	return new Promise((c, e) => {
 		stream.on('error', err => e(err));
@@ -385,109 +375,8 @@ export function streamToPromise(stream: NodeJS.ReadWriteStream): Promise<void> {
 }
 
 export function getElectronVersion(): Record<string, string> {
-	const yarnrc = fs.readFileSync(path.join(root, '.yarnrc'), 'utf8');
-	const electronVersion = /^target "(.*)"$/m.exec(yarnrc)![1];
-	const msBuildId = /^ms_build_id "(.*)"$/m.exec(yarnrc)![1];
+	const npmrc = fs.readFileSync(path.join(root, '.npmrc'), 'utf8');
+	const electronVersion = /^target="(.*)"$/m.exec(npmrc)![1];
+	const msBuildId = /^ms_build_id="(.*)"$/m.exec(npmrc)![1];
 	return { electronVersion, msBuildId };
 }
-
-export function acquireWebNodePaths() {
-	const root = path.join(__dirname, '..', '..');
-	const webPackageJSON = path.join(root, '/remote/web', 'package.json');
-	const webPackages = JSON.parse(fs.readFileSync(webPackageJSON, 'utf8')).dependencies;
-
-	const distroWebPackageJson = path.join(root, '.build/distro/npm/remote/web/package.json');
-	if (fs.existsSync(distroWebPackageJson)) {
-		const distroWebPackages = JSON.parse(fs.readFileSync(distroWebPackageJson, 'utf8')).dependencies;
-		Object.assign(webPackages, distroWebPackages);
-	}
-
-	const nodePaths: { [key: string]: string } = {};
-	for (const key of Object.keys(webPackages)) {
-		const packageJSON = path.join(root, 'node_modules', key, 'package.json');
-		const packageData = JSON.parse(fs.readFileSync(packageJSON, 'utf8'));
-		// Only cases where the browser is a string are handled
-		let entryPoint: string = typeof packageData.browser === 'string' ? packageData.browser : packageData.main;
-
-		// On rare cases a package doesn't have an entrypoint so we assume it has a dist folder with a min.js
-		if (!entryPoint) {
-			// TODO @lramos15 remove this when jschardet adds an entrypoint so we can warn on all packages w/out entrypoint
-			if (key !== 'jschardet') {
-				console.warn(`No entry point for ${key} assuming dist/${key}.min.js`);
-			}
-
-			entryPoint = `dist/${key}.min.js`;
-		}
-
-		// Remove any starting path information so it's all relative info
-		if (entryPoint.startsWith('./')) {
-			entryPoint = entryPoint.substring(2);
-		} else if (entryPoint.startsWith('/')) {
-			entryPoint = entryPoint.substring(1);
-		}
-
-		// Search for a minified entrypoint as well
-		if (/(?<!\.min)\.js$/i.test(entryPoint)) {
-			const minEntryPoint = entryPoint.replace(/\.js$/i, '.min.js');
-
-			if (fs.existsSync(path.join(root, 'node_modules', key, minEntryPoint))) {
-				entryPoint = minEntryPoint;
-			}
-		}
-
-		nodePaths[key] = entryPoint;
-	}
-
-	// @TODO lramos15 can we make this dynamic like the rest of the node paths
-	// Add these paths as well for 1DS SDK dependencies.
-	// Not sure why given the 1DS entrypoint then requires these modules
-	// they are not fetched from the right location and instead are fetched from out/
-	nodePaths['@microsoft/dynamicproto-js'] = 'lib/dist/umd/dynamicproto-js.min.js';
-	nodePaths['@microsoft/applicationinsights-shims'] = 'dist/umd/applicationinsights-shims.min.js';
-	nodePaths['@microsoft/applicationinsights-core-js'] = 'browser/applicationinsights-core-js.min.js';
-	return nodePaths;
-}
-
-export interface IExternalLoaderInfo {
-	baseUrl: string;
-	paths: { [moduleId: string]: string };
-	[key: string]: any;
-}
-
-export function createExternalLoaderConfig(webEndpoint?: string, commit?: string, quality?: string): IExternalLoaderInfo | undefined {
-	if (!webEndpoint || !commit || !quality) {
-		return undefined;
-	}
-	webEndpoint = webEndpoint + `/${quality}/${commit}`;
-	const nodePaths = acquireWebNodePaths();
-	Object.keys(nodePaths).map(function (key, _) {
-		nodePaths[key] = `../node_modules/${key}/${nodePaths[key]}`;
-	});
-	const externalLoaderConfig: IExternalLoaderInfo = {
-		baseUrl: `${webEndpoint}/out`,
-		recordStats: true,
-		paths: nodePaths
-	};
-	return externalLoaderConfig;
-}
-
-export function buildWebNodePaths(outDir: string) {
-	const result = () => new Promise<void>((resolve, _) => {
-		const root = path.join(__dirname, '..', '..');
-		const nodePaths = acquireWebNodePaths();
-		// Now we write the node paths to out/vs
-		const outDirectory = path.join(root, outDir, 'vs');
-		fs.mkdirSync(outDirectory, { recursive: true });
-		const headerWithGeneratedFileWarning = `/*---------------------------------------------------------------------------------------------
-	 *  Copyright (c) Microsoft Corporation. All rights reserved.
-	 *  Licensed under the MIT License. See License.txt in the project root for license information.
-	 *--------------------------------------------------------------------------------------------*/
-
-	// This file is generated by build/npm/postinstall.js. Do not edit.`;
-		const fileContents = `${headerWithGeneratedFileWarning}\nself.webPackagePaths = ${JSON.stringify(nodePaths, null, 2)};`;
-		fs.writeFileSync(path.join(outDirectory, 'webPackagePaths.js'), fileContents, 'utf8');
-		resolve();
-	});
-	result.taskName = 'build-web-node-paths';
-	return result;
-}
diff --git a/build/linux/debian/dep-lists.js b/build/linux/debian/dep-lists.js
index d843c090063..3bb58fb1215 100644
--- a/build/linux/debian/dep-lists.js
+++ b/build/linux/debian/dep-lists.js
@@ -31,6 +31,7 @@ exports.referenceGeneratedDepsByArch = {
         'libc6 (>= 2.16)',
         'libc6 (>= 2.17)',
         'libc6 (>= 2.2.5)',
+        'libc6 (>= 2.25)',
         'libc6 (>= 2.28)',
         'libcairo2 (>= 1.6.0)',
         'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3',
@@ -39,10 +40,8 @@ exports.referenceGeneratedDepsByArch = {
         'libexpat1 (>= 2.1~beta3)',
         'libgbm1 (>= 17.1.0~rc2)',
         'libglib2.0-0 (>= 2.37.3)',
-        'libgssapi-krb5-2 (>= 1.17)',
         'libgtk-3-0 (>= 3.9.10)',
         'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
-        'libkrb5-3 (>= 1.6.dfsg.2)',
         'libnspr4 (>= 2:4.9-2~)',
         'libnss3 (>= 2:3.30)',
         'libnss3 (>= 3.26)',
@@ -67,6 +66,7 @@ exports.referenceGeneratedDepsByArch = {
         'libatspi2.0-0 (>= 2.9.90)',
         'libc6 (>= 2.16)',
         'libc6 (>= 2.17)',
+        'libc6 (>= 2.25)',
         'libc6 (>= 2.28)',
         'libc6 (>= 2.4)',
         'libc6 (>= 2.9)',
@@ -77,10 +77,8 @@ exports.referenceGeneratedDepsByArch = {
         'libexpat1 (>= 2.1~beta3)',
         'libgbm1 (>= 17.1.0~rc2)',
         'libglib2.0-0 (>= 2.37.3)',
-        'libgssapi-krb5-2 (>= 1.17)',
         'libgtk-3-0 (>= 3.9.10)',
         'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
-        'libkrb5-3 (>= 1.6.dfsg.2)',
         'libnspr4 (>= 2:4.9-2~)',
         'libnss3 (>= 2:3.30)',
         'libnss3 (>= 3.26)',
@@ -108,6 +106,7 @@ exports.referenceGeneratedDepsByArch = {
         'libatk1.0-0 (>= 2.2.0)',
         'libatspi2.0-0 (>= 2.9.90)',
         'libc6 (>= 2.17)',
+        'libc6 (>= 2.25)',
         'libc6 (>= 2.28)',
         'libcairo2 (>= 1.6.0)',
         'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3',
@@ -116,10 +115,8 @@ exports.referenceGeneratedDepsByArch = {
         'libexpat1 (>= 2.1~beta3)',
         'libgbm1 (>= 17.1.0~rc2)',
         'libglib2.0-0 (>= 2.37.3)',
-        'libgssapi-krb5-2 (>= 1.17)',
         'libgtk-3-0 (>= 3.9.10)',
         'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
-        'libkrb5-3 (>= 1.6.dfsg.2)',
         'libnspr4 (>= 2:4.9-2~)',
         'libnss3 (>= 2:3.30)',
         'libnss3 (>= 3.26)',
diff --git a/build/linux/debian/dep-lists.ts b/build/linux/debian/dep-lists.ts
index 4028370cd02..e3d78d1139a 100644
--- a/build/linux/debian/dep-lists.ts
+++ b/build/linux/debian/dep-lists.ts
@@ -31,6 +31,7 @@ export const referenceGeneratedDepsByArch = {
 		'libc6 (>= 2.16)',
 		'libc6 (>= 2.17)',
 		'libc6 (>= 2.2.5)',
+		'libc6 (>= 2.25)',
 		'libc6 (>= 2.28)',
 		'libcairo2 (>= 1.6.0)',
 		'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3',
@@ -39,10 +40,8 @@ export const referenceGeneratedDepsByArch = {
 		'libexpat1 (>= 2.1~beta3)',
 		'libgbm1 (>= 17.1.0~rc2)',
 		'libglib2.0-0 (>= 2.37.3)',
-		'libgssapi-krb5-2 (>= 1.17)',
 		'libgtk-3-0 (>= 3.9.10)',
 		'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
-		'libkrb5-3 (>= 1.6.dfsg.2)',
 		'libnspr4 (>= 2:4.9-2~)',
 		'libnss3 (>= 2:3.30)',
 		'libnss3 (>= 3.26)',
@@ -67,6 +66,7 @@ export const referenceGeneratedDepsByArch = {
 		'libatspi2.0-0 (>= 2.9.90)',
 		'libc6 (>= 2.16)',
 		'libc6 (>= 2.17)',
+		'libc6 (>= 2.25)',
 		'libc6 (>= 2.28)',
 		'libc6 (>= 2.4)',
 		'libc6 (>= 2.9)',
@@ -77,10 +77,8 @@ export const referenceGeneratedDepsByArch = {
 		'libexpat1 (>= 2.1~beta3)',
 		'libgbm1 (>= 17.1.0~rc2)',
 		'libglib2.0-0 (>= 2.37.3)',
-		'libgssapi-krb5-2 (>= 1.17)',
 		'libgtk-3-0 (>= 3.9.10)',
 		'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
-		'libkrb5-3 (>= 1.6.dfsg.2)',
 		'libnspr4 (>= 2:4.9-2~)',
 		'libnss3 (>= 2:3.30)',
 		'libnss3 (>= 3.26)',
@@ -108,6 +106,7 @@ export const referenceGeneratedDepsByArch = {
 		'libatk1.0-0 (>= 2.2.0)',
 		'libatspi2.0-0 (>= 2.9.90)',
 		'libc6 (>= 2.17)',
+		'libc6 (>= 2.25)',
 		'libc6 (>= 2.28)',
 		'libcairo2 (>= 1.6.0)',
 		'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3',
@@ -116,10 +115,8 @@ export const referenceGeneratedDepsByArch = {
 		'libexpat1 (>= 2.1~beta3)',
 		'libgbm1 (>= 17.1.0~rc2)',
 		'libglib2.0-0 (>= 2.37.3)',
-		'libgssapi-krb5-2 (>= 1.17)',
 		'libgtk-3-0 (>= 3.9.10)',
 		'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
-		'libkrb5-3 (>= 1.6.dfsg.2)',
 		'libnspr4 (>= 2:4.9-2~)',
 		'libnss3 (>= 2:3.30)',
 		'libnss3 (>= 3.26)',
diff --git a/build/linux/debian/install-sysroot.js b/build/linux/debian/install-sysroot.js
index feca7d3fa9d..77ff92151e8 100644
--- a/build/linux/debian/install-sysroot.js
+++ b/build/linux/debian/install-sysroot.js
@@ -29,9 +29,9 @@ const ghDownloadHeaders = {
     Accept: 'application/octet-stream',
 };
 function getElectronVersion() {
-    const yarnrc = fs.readFileSync(path.join(REPO_ROOT, '.yarnrc'), 'utf8');
-    const electronVersion = /^target "(.*)"$/m.exec(yarnrc)[1];
-    const msBuildId = /^ms_build_id "(.*)"$/m.exec(yarnrc)[1];
+    const npmrc = fs.readFileSync(path.join(REPO_ROOT, '.npmrc'), 'utf8');
+    const electronVersion = /^target="(.*)"$/m.exec(npmrc)[1];
+    const msBuildId = /^ms_build_id="(.*)"$/m.exec(npmrc)[1];
     return { electronVersion, msBuildId };
 }
 function getSha(filename) {
diff --git a/build/linux/debian/install-sysroot.ts b/build/linux/debian/install-sysroot.ts
index aa417dcc722..76a31d63cdb 100644
--- a/build/linux/debian/install-sysroot.ts
+++ b/build/linux/debian/install-sysroot.ts
@@ -38,9 +38,9 @@ interface IFetchOptions {
 }
 
 function getElectronVersion(): Record<string, string> {
-	const yarnrc = fs.readFileSync(path.join(REPO_ROOT, '.yarnrc'), 'utf8');
-	const electronVersion = /^target "(.*)"$/m.exec(yarnrc)![1];
-	const msBuildId = /^ms_build_id "(.*)"$/m.exec(yarnrc)![1];
+	const npmrc = fs.readFileSync(path.join(REPO_ROOT, '.npmrc'), 'utf8');
+	const electronVersion = /^target="(.*)"$/m.exec(npmrc)![1];
+	const msBuildId = /^ms_build_id="(.*)"$/m.exec(npmrc)![1];
 	return { electronVersion, msBuildId };
 }
 
diff --git a/build/linux/dependencies-generator.js b/build/linux/dependencies-generator.js
index bff0c9a25df..eec4bd790cd 100644
--- a/build/linux/dependencies-generator.js
+++ b/build/linux/dependencies-generator.js
@@ -23,7 +23,7 @@ const product = require("../../product.json");
 // The reference dependencies, which one has to update when the new dependencies
 // are valid, are in dep-lists.ts
 const FAIL_BUILD_FOR_NEW_DEPENDENCIES = true;
-// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/122.0.6261.156:chrome/installer/linux/BUILD.gn;l=64-80
+// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/124.0.6367.243:chrome/installer/linux/BUILD.gn;l=64-80
 // and the Linux Archive build
 // Shared library dependencies that we already bundle.
 const bundledDeps = [
@@ -43,7 +43,8 @@ async function getDependencies(packageType, buildDir, applicationName, arch) {
         throw new Error('Invalid RPM arch string ' + arch);
     }
     // Get the files for which we want to find dependencies.
-    const nativeModulesPath = path.join(buildDir, 'resources', 'app', 'node_modules.asar.unpacked');
+    const canAsar = false; // TODO@esm ASAR disabled in ESM
+    const nativeModulesPath = path.join(buildDir, 'resources', 'app', canAsar ? 'node_modules.asar.unpacked' : 'node_modules');
     const findResult = (0, child_process_1.spawnSync)('find', [nativeModulesPath, '-name', '*.node']);
     if (findResult.status) {
         console.error('Error finding files:');
diff --git a/build/linux/dependencies-generator.ts b/build/linux/dependencies-generator.ts
index 226310e1258..7faae4ba104 100644
--- a/build/linux/dependencies-generator.ts
+++ b/build/linux/dependencies-generator.ts
@@ -25,7 +25,7 @@ import product = require('../../product.json');
 // are valid, are in dep-lists.ts
 const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = true;
 
-// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/122.0.6261.156:chrome/installer/linux/BUILD.gn;l=64-80
+// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/124.0.6367.243:chrome/installer/linux/BUILD.gn;l=64-80
 // and the Linux Archive build
 // Shared library dependencies that we already bundle.
 const bundledDeps = [
@@ -47,7 +47,8 @@ export async function getDependencies(packageType: 'deb' | 'rpm', buildDir: stri
 	}
 
 	// Get the files for which we want to find dependencies.
-	const nativeModulesPath = path.join(buildDir, 'resources', 'app', 'node_modules.asar.unpacked');
+	const canAsar = false; // TODO@esm ASAR disabled in ESM
+	const nativeModulesPath = path.join(buildDir, 'resources', 'app', canAsar ? 'node_modules.asar.unpacked' : 'node_modules');
 	const findResult = spawnSync('find', [nativeModulesPath, '-name', '*.node']);
 	if (findResult.status) {
 		console.error('Error finding files:');
diff --git a/build/linux/rpm/dep-lists.js b/build/linux/rpm/dep-lists.js
index 8be477290bb..fa393808c53 100644
--- a/build/linux/rpm/dep-lists.js
+++ b/build/linux/rpm/dep-lists.js
@@ -45,12 +45,14 @@ exports.referenceGeneratedDepsByArch = {
         'libc.so.6(GLIBC_2.17)(64bit)',
         'libc.so.6(GLIBC_2.18)(64bit)',
         'libc.so.6(GLIBC_2.2.5)(64bit)',
+        'libc.so.6(GLIBC_2.25)(64bit)',
         'libc.so.6(GLIBC_2.28)(64bit)',
         'libc.so.6(GLIBC_2.3)(64bit)',
         'libc.so.6(GLIBC_2.3.2)(64bit)',
         'libc.so.6(GLIBC_2.3.3)(64bit)',
         'libc.so.6(GLIBC_2.3.4)(64bit)',
         'libc.so.6(GLIBC_2.4)(64bit)',
+        'libc.so.6(GLIBC_2.5)(64bit)',
         'libc.so.6(GLIBC_2.6)(64bit)',
         'libc.so.6(GLIBC_2.7)(64bit)',
         'libc.so.6(GLIBC_2.8)(64bit)',
@@ -71,11 +73,7 @@ exports.referenceGeneratedDepsByArch = {
         'libgio-2.0.so.0()(64bit)',
         'libglib-2.0.so.0()(64bit)',
         'libgobject-2.0.so.0()(64bit)',
-        'libgssapi_krb5.so.2()(64bit)',
-        'libgssapi_krb5.so.2(gssapi_krb5_2_MIT)(64bit)',
         'libgtk-3.so.0()(64bit)',
-        'libkrb5.so.3()(64bit)',
-        'libkrb5.so.3(krb5_3_MIT)(64bit)',
         'libm.so.6()(64bit)',
         'libm.so.6(GLIBC_2.2.5)(64bit)',
         'libnspr4.so()(64bit)',
@@ -140,8 +138,10 @@ exports.referenceGeneratedDepsByArch = {
         'libc.so.6(GLIBC_2.16)',
         'libc.so.6(GLIBC_2.17)',
         'libc.so.6(GLIBC_2.18)',
+        'libc.so.6(GLIBC_2.25)',
         'libc.so.6(GLIBC_2.28)',
         'libc.so.6(GLIBC_2.4)',
+        'libc.so.6(GLIBC_2.5)',
         'libc.so.6(GLIBC_2.6)',
         'libc.so.6(GLIBC_2.7)',
         'libc.so.6(GLIBC_2.8)',
@@ -162,12 +162,8 @@ exports.referenceGeneratedDepsByArch = {
         'libgio-2.0.so.0',
         'libglib-2.0.so.0',
         'libgobject-2.0.so.0',
-        'libgssapi_krb5.so.2',
-        'libgssapi_krb5.so.2(gssapi_krb5_2_MIT)',
         'libgtk-3.so.0',
         'libgtk-3.so.0()(64bit)',
-        'libkrb5.so.3',
-        'libkrb5.so.3(krb5_3_MIT)',
         'libm.so.6',
         'libm.so.6(GLIBC_2.4)',
         'libnspr4.so',
@@ -241,6 +237,7 @@ exports.referenceGeneratedDepsByArch = {
         'libc.so.6()(64bit)',
         'libc.so.6(GLIBC_2.17)(64bit)',
         'libc.so.6(GLIBC_2.18)(64bit)',
+        'libc.so.6(GLIBC_2.25)(64bit)',
         'libc.so.6(GLIBC_2.28)(64bit)',
         'libcairo.so.2()(64bit)',
         'libcurl.so.4()(64bit)',
@@ -259,11 +256,7 @@ exports.referenceGeneratedDepsByArch = {
         'libgio-2.0.so.0()(64bit)',
         'libglib-2.0.so.0()(64bit)',
         'libgobject-2.0.so.0()(64bit)',
-        'libgssapi_krb5.so.2()(64bit)',
-        'libgssapi_krb5.so.2(gssapi_krb5_2_MIT)(64bit)',
         'libgtk-3.so.0()(64bit)',
-        'libkrb5.so.3()(64bit)',
-        'libkrb5.so.3(krb5_3_MIT)(64bit)',
         'libm.so.6()(64bit)',
         'libm.so.6(GLIBC_2.17)(64bit)',
         'libnspr4.so()(64bit)',
diff --git a/build/linux/rpm/dep-lists.ts b/build/linux/rpm/dep-lists.ts
index 24b18d504c8..9eed3a79f7e 100644
--- a/build/linux/rpm/dep-lists.ts
+++ b/build/linux/rpm/dep-lists.ts
@@ -44,12 +44,14 @@ export const referenceGeneratedDepsByArch = {
 		'libc.so.6(GLIBC_2.17)(64bit)',
 		'libc.so.6(GLIBC_2.18)(64bit)',
 		'libc.so.6(GLIBC_2.2.5)(64bit)',
+		'libc.so.6(GLIBC_2.25)(64bit)',
 		'libc.so.6(GLIBC_2.28)(64bit)',
 		'libc.so.6(GLIBC_2.3)(64bit)',
 		'libc.so.6(GLIBC_2.3.2)(64bit)',
 		'libc.so.6(GLIBC_2.3.3)(64bit)',
 		'libc.so.6(GLIBC_2.3.4)(64bit)',
 		'libc.so.6(GLIBC_2.4)(64bit)',
+		'libc.so.6(GLIBC_2.5)(64bit)',
 		'libc.so.6(GLIBC_2.6)(64bit)',
 		'libc.so.6(GLIBC_2.7)(64bit)',
 		'libc.so.6(GLIBC_2.8)(64bit)',
@@ -70,11 +72,7 @@ export const referenceGeneratedDepsByArch = {
 		'libgio-2.0.so.0()(64bit)',
 		'libglib-2.0.so.0()(64bit)',
 		'libgobject-2.0.so.0()(64bit)',
-		'libgssapi_krb5.so.2()(64bit)',
-		'libgssapi_krb5.so.2(gssapi_krb5_2_MIT)(64bit)',
 		'libgtk-3.so.0()(64bit)',
-		'libkrb5.so.3()(64bit)',
-		'libkrb5.so.3(krb5_3_MIT)(64bit)',
 		'libm.so.6()(64bit)',
 		'libm.so.6(GLIBC_2.2.5)(64bit)',
 		'libnspr4.so()(64bit)',
@@ -139,8 +137,10 @@ export const referenceGeneratedDepsByArch = {
 		'libc.so.6(GLIBC_2.16)',
 		'libc.so.6(GLIBC_2.17)',
 		'libc.so.6(GLIBC_2.18)',
+		'libc.so.6(GLIBC_2.25)',
 		'libc.so.6(GLIBC_2.28)',
 		'libc.so.6(GLIBC_2.4)',
+		'libc.so.6(GLIBC_2.5)',
 		'libc.so.6(GLIBC_2.6)',
 		'libc.so.6(GLIBC_2.7)',
 		'libc.so.6(GLIBC_2.8)',
@@ -161,12 +161,8 @@ export const referenceGeneratedDepsByArch = {
 		'libgio-2.0.so.0',
 		'libglib-2.0.so.0',
 		'libgobject-2.0.so.0',
-		'libgssapi_krb5.so.2',
-		'libgssapi_krb5.so.2(gssapi_krb5_2_MIT)',
 		'libgtk-3.so.0',
 		'libgtk-3.so.0()(64bit)',
-		'libkrb5.so.3',
-		'libkrb5.so.3(krb5_3_MIT)',
 		'libm.so.6',
 		'libm.so.6(GLIBC_2.4)',
 		'libnspr4.so',
@@ -240,6 +236,7 @@ export const referenceGeneratedDepsByArch = {
 		'libc.so.6()(64bit)',
 		'libc.so.6(GLIBC_2.17)(64bit)',
 		'libc.so.6(GLIBC_2.18)(64bit)',
+		'libc.so.6(GLIBC_2.25)(64bit)',
 		'libc.so.6(GLIBC_2.28)(64bit)',
 		'libcairo.so.2()(64bit)',
 		'libcurl.so.4()(64bit)',
@@ -258,11 +255,7 @@ export const referenceGeneratedDepsByArch = {
 		'libgio-2.0.so.0()(64bit)',
 		'libglib-2.0.so.0()(64bit)',
 		'libgobject-2.0.so.0()(64bit)',
-		'libgssapi_krb5.so.2()(64bit)',
-		'libgssapi_krb5.so.2(gssapi_krb5_2_MIT)(64bit)',
 		'libgtk-3.so.0()(64bit)',
-		'libkrb5.so.3()(64bit)',
-		'libkrb5.so.3(krb5_3_MIT)(64bit)',
 		'libm.so.6()(64bit)',
 		'libm.so.6(GLIBC_2.17)(64bit)',
 		'libnspr4.so()(64bit)',
diff --git a/build/loader.min b/build/loader.min
new file mode 100644
index 00000000000..f9d21b58282
--- /dev/null
+++ b/build/loader.min
@@ -0,0 +1,10 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+"use strict";const _amdLoaderGlobal=this,_commonjsGlobal=typeof global=="object"?global:{};var AMDLoader;(function(d){d.global=_amdLoaderGlobal;class _{get isWindows(){return this._detect(),this._isWindows}get isNode(){return this._detect(),this._isNode}get isElectronRenderer(){return this._detect(),this._isElectronRenderer}get isWebWorker(){return this._detect(),this._isWebWorker}get isElectronNodeIntegrationWebWorker(){return this._detect(),this._isElectronNodeIntegrationWebWorker}constructor(){this._detected=!1,this._isWindows=!1,this._isNode=!1,this._isElectronRenderer=!1,this._isWebWorker=!1,this._isElectronNodeIntegrationWebWorker=!1}_detect(){this._detected||(this._detected=!0,this._isWindows=_._isWindows(),this._isNode=typeof module<"u"&&!!module.exports,this._isElectronRenderer=typeof process<"u"&&typeof process.versions<"u"&&typeof process.versions.electron<"u"&&process.type==="renderer",this._isWebWorker=typeof d.global.importScripts=="function",this._isElectronNodeIntegrationWebWorker=this._isWebWorker&&typeof process<"u"&&typeof process.versions<"u"&&typeof process.versions.electron<"u"&&process.type==="worker")}static _isWindows(){return typeof navigator<"u"&&navigator.userAgent&&navigator.userAgent.indexOf("Windows")>=0?!0:typeof process<"u"?process.platform==="win32":!1}}d.Environment=_})(AMDLoader||(AMDLoader={}));var AMDLoader;(function(d){class _{constructor(n,c,a){this.type=n,this.detail=c,this.timestamp=a}}d.LoaderEvent=_;class v{constructor(n){this._events=[new _(1,"",n)]}record(n,c){this._events.push(new _(n,c,d.Utilities.getHighPerformanceTimestamp()))}getEvents(){return this._events}}d.LoaderEventRecorder=v;class f{record(n,c){}getEvents(){return[]}}f.INSTANCE=new f,d.NullLoaderEventRecorder=f})(AMDLoader||(AMDLoader={}));var AMDLoader;(function(d){class _{static fileUriToFilePath(f,h){if(h=decodeURI(h).replace(/%23/g,"#"),f){if(/^file:\/\/\//.test(h))return h.substr(8);if(/^file:\/\//.test(h))return h.substr(5)}else if(/^file:\/\//.test(h))return h.substr(7);return h}static startsWith(f,h){return f.length>=h.length&&f.substr(0,h.length)===h}static endsWith(f,h){return f.length>=h.length&&f.substr(f.length-h.length)===h}static containsQueryString(f){return/^[^\#]*\?/gi.test(f)}static isAbsolutePath(f){return/^((http:\/\/)|(https:\/\/)|(file:\/\/)|(\/))/.test(f)}static forEachProperty(f,h){if(f){let n;for(n in f)f.hasOwnProperty(n)&&h(n,f[n])}}static isEmpty(f){let h=!0;return _.forEachProperty(f,()=>{h=!1}),h}static recursiveClone(f){if(!f||typeof f!="object"||f instanceof RegExp||!Array.isArray(f)&&Object.getPrototypeOf(f)!==Object.prototype)return f;let h=Array.isArray(f)?[]:{};return _.forEachProperty(f,(n,c)=>{c&&typeof c=="object"?h[n]=_.recursiveClone(c):h[n]=c}),h}static generateAnonymousModule(){return"===anonymous"+_.NEXT_ANONYMOUS_ID+++"==="}static isAnonymousModule(f){return _.startsWith(f,"===anonymous")}static getHighPerformanceTimestamp(){return this.PERFORMANCE_NOW_PROBED||(this.PERFORMANCE_NOW_PROBED=!0,this.HAS_PERFORMANCE_NOW=d.global.performance&&typeof d.global.performance.now=="function"),this.HAS_PERFORMANCE_NOW?d.global.performance.now():Date.now()}}_.NEXT_ANONYMOUS_ID=1,_.PERFORMANCE_NOW_PROBED=!1,_.HAS_PERFORMANCE_NOW=!1,d.Utilities=_})(AMDLoader||(AMDLoader={}));var AMDLoader;(function(d){function _(h){if(h instanceof Error)return h;const n=new Error(h.message||String(h)||"Unknown Error");return h.stack&&(n.stack=h.stack),n}d.ensureError=_;class v{static validateConfigurationOptions(n){function c(a){if(a.phase==="loading"){console.error('Loading "'+a.moduleId+'" failed'),console.error(a),console.error("Here are the modules that depend on it:"),console.error(a.neededBy);return}if(a.phase==="factory"){console.error('The factory function of "'+a.moduleId+'" has thrown an exception'),console.error(a),console.error("Here are the modules that depend on it:"),console.error(a.neededBy);return}}if(n=n||{},typeof n.baseUrl!="string"&&(n.baseUrl=""),typeof n.isBuild!="boolean"&&(n.isBuild=!1),typeof n.paths!="object"&&(n.paths={}),typeof n.config!="object"&&(n.config={}),typeof n.catchError>"u"&&(n.catchError=!1),typeof n.recordStats>"u"&&(n.recordStats=!1),typeof n.urlArgs!="string"&&(n.urlArgs=""),typeof n.onError!="function"&&(n.onError=c),Array.isArray(n.ignoreDuplicateModules)||(n.ignoreDuplicateModules=[]),n.baseUrl.length>0&&(d.Utilities.endsWith(n.baseUrl,"/")||(n.baseUrl+="/")),typeof n.cspNonce!="string"&&(n.cspNonce=""),typeof n.preferScriptTags>"u"&&(n.preferScriptTags=!1),n.nodeCachedData&&typeof n.nodeCachedData=="object"&&(typeof n.nodeCachedData.seed!="string"&&(n.nodeCachedData.seed="seed"),(typeof n.nodeCachedData.writeDelay!="number"||n.nodeCachedData.writeDelay<0)&&(n.nodeCachedData.writeDelay=1e3*7),!n.nodeCachedData.path||typeof n.nodeCachedData.path!="string")){const a=_(new Error("INVALID cached data configuration, 'path' MUST be set"));a.phase="configuration",n.onError(a),n.nodeCachedData=void 0}return n}static mergeConfigurationOptions(n=null,c=null){let a=d.Utilities.recursiveClone(c||{});return d.Utilities.forEachProperty(n,(t,e)=>{t==="ignoreDuplicateModules"&&typeof a.ignoreDuplicateModules<"u"?a.ignoreDuplicateModules=a.ignoreDuplicateModules.concat(e):t==="paths"&&typeof a.paths<"u"?d.Utilities.forEachProperty(e,(i,s)=>a.paths[i]=s):t==="config"&&typeof a.config<"u"?d.Utilities.forEachProperty(e,(i,s)=>a.config[i]=s):a[t]=d.Utilities.recursiveClone(e)}),v.validateConfigurationOptions(a)}}d.ConfigurationOptionsUtil=v;class f{constructor(n,c){if(this._env=n,this.options=v.mergeConfigurationOptions(c),this._createIgnoreDuplicateModulesMap(),this._createSortedPathsRules(),this.options.baseUrl===""&&this.options.nodeRequire&&this.options.nodeRequire.main&&this.options.nodeRequire.main.filename&&this._env.isNode){let a=this.options.nodeRequire.main.filename,t=Math.max(a.lastIndexOf("/"),a.lastIndexOf("\\"));this.options.baseUrl=a.substring(0,t+1)}}_createIgnoreDuplicateModulesMap(){this.ignoreDuplicateModulesMap={};for(let n=0;n<this.options.ignoreDuplicateModules.length;n++)this.ignoreDuplicateModulesMap[this.options.ignoreDuplicateModules[n]]=!0}_createSortedPathsRules(){this.sortedPathsRules=[],d.Utilities.forEachProperty(this.options.paths,(n,c)=>{Array.isArray(c)?this.sortedPathsRules.push({from:n,to:c}):this.sortedPathsRules.push({from:n,to:[c]})}),this.sortedPathsRules.sort((n,c)=>c.from.length-n.from.length)}cloneAndMerge(n){return new f(this._env,v.mergeConfigurationOptions(n,this.options))}getOptionsLiteral(){return this.options}_applyPaths(n){let c;for(let a=0,t=this.sortedPathsRules.length;a<t;a++)if(c=this.sortedPathsRules[a],d.Utilities.startsWith(n,c.from)){let e=[];for(let i=0,s=c.to.length;i<s;i++)e.push(c.to[i]+n.substr(c.from.length));return e}return[n]}_addUrlArgsToUrl(n){return d.Utilities.containsQueryString(n)?n+"&"+this.options.urlArgs:n+"?"+this.options.urlArgs}_addUrlArgsIfNecessaryToUrl(n){return this.options.urlArgs?this._addUrlArgsToUrl(n):n}_addUrlArgsIfNecessaryToUrls(n){if(this.options.urlArgs)for(let c=0,a=n.length;c<a;c++)n[c]=this._addUrlArgsToUrl(n[c]);return n}moduleIdToPaths(n){if(this._env.isNode&&this.options.amdModulesPattern instanceof RegExp&&!this.options.amdModulesPattern.test(n))return this.isBuild()?["empty:"]:["node|"+n];let c=n,a;if(!d.Utilities.endsWith(c,".js")&&!d.Utilities.isAbsolutePath(c)){a=this._applyPaths(c);for(let t=0,e=a.length;t<e;t++)this.isBuild()&&a[t]==="empty:"||(d.Utilities.isAbsolutePath(a[t])||(a[t]=this.options.baseUrl+a[t]),!d.Utilities.endsWith(a[t],".js")&&!d.Utilities.containsQueryString(a[t])&&(a[t]=a[t]+".js"))}else!d.Utilities.endsWith(c,".js")&&!d.Utilities.containsQueryString(c)&&(c=c+".js"),a=[c];return this._addUrlArgsIfNecessaryToUrls(a)}requireToUrl(n){let c=n;return d.Utilities.isAbsolutePath(c)||(c=this._applyPaths(c)[0],d.Utilities.isAbsolutePath(c)||(c=this.options.baseUrl+c)),this._addUrlArgsIfNecessaryToUrl(c)}isBuild(){return this.options.isBuild}shouldInvokeFactory(n){return!!(!this.options.isBuild||d.Utilities.isAnonymousModule(n)||this.options.buildForceInvokeFactory&&this.options.buildForceInvokeFactory[n])}isDuplicateMessageIgnoredFor(n){return this.ignoreDuplicateModulesMap.hasOwnProperty(n)}getConfigForModule(n){if(this.options.config)return this.options.config[n]}shouldCatchError(){return this.options.catchError}shouldRecordStats(){return this.options.recordStats}onError(n){this.options.onError(n)}}d.Configuration=f})(AMDLoader||(AMDLoader={}));var AMDLoader;(function(d){class _{constructor(e){this._env=e,this._scriptLoader=null,this._callbackMap={}}load(e,i,s,r){if(!this._scriptLoader)if(this._env.isWebWorker)this._scriptLoader=new h;else if(this._env.isElectronRenderer){const{preferScriptTags:u}=e.getConfig().getOptionsLiteral();u?this._scriptLoader=new v:this._scriptLoader=new n(this._env)}else this._env.isNode?this._scriptLoader=new n(this._env):this._scriptLoader=new v;let o={callback:s,errorback:r};if(this._callbackMap.hasOwnProperty(i)){this._callbackMap[i].push(o);return}this._callbackMap[i]=[o],this._scriptLoader.load(e,i,()=>this.triggerCallback(i),u=>this.triggerErrorback(i,u))}triggerCallback(e){let i=this._callbackMap[e];delete this._callbackMap[e];for(let s=0;s<i.length;s++)i[s].callback()}triggerErrorback(e,i){let s=this._callbackMap[e];delete this._callbackMap[e];for(let r=0;r<s.length;r++)s[r].errorback(i)}}class v{attachListeners(e,i,s){let r=()=>{e.removeEventListener("load",o),e.removeEventListener("error",u)},o=l=>{r(),i()},u=l=>{r(),s(l)};e.addEventListener("load",o),e.addEventListener("error",u)}load(e,i,s,r){if(/^node\|/.test(i)){let o=e.getConfig().getOptionsLiteral(),u=c(e.getRecorder(),o.nodeRequire||d.global.nodeRequire),l=i.split("|"),g=null;try{g=u(l[1])}catch(p){r(p);return}e.enqueueDefineAnonymousModule([],()=>g),s()}else{let o=document.createElement("script");o.setAttribute("async","async"),o.setAttribute("type","text/javascript"),this.attachListeners(o,s,r);const{trustedTypesPolicy:u}=e.getConfig().getOptionsLiteral();u&&(i=u.createScriptURL(i)),o.setAttribute("src",i);const{cspNonce:l}=e.getConfig().getOptionsLiteral();l&&o.setAttribute("nonce",l),document.getElementsByTagName("head")[0].appendChild(o)}}}function f(t){const{trustedTypesPolicy:e}=t.getConfig().getOptionsLiteral();try{return(e?self.eval(e.createScript("","true")):new Function("true")).call(self),!0}catch{return!1}}class h{constructor(){this._cachedCanUseEval=null}_canUseEval(e){return this._cachedCanUseEval===null&&(this._cachedCanUseEval=f(e)),this._cachedCanUseEval}load(e,i,s,r){if(/^node\|/.test(i)){const o=e.getConfig().getOptionsLiteral(),u=c(e.getRecorder(),o.nodeRequire||d.global.nodeRequire),l=i.split("|");let g=null;try{g=u(l[1])}catch(p){r(p);return}e.enqueueDefineAnonymousModule([],function(){return g}),s()}else{const{trustedTypesPolicy:o}=e.getConfig().getOptionsLiteral();if(!(/^((http:)|(https:)|(file:))/.test(i)&&i.substring(0,self.origin.length)!==self.origin)&&this._canUseEval(e)){fetch(i).then(l=>{if(l.status!==200)throw new Error(l.statusText);return l.text()}).then(l=>{l=`${l}
+//# sourceURL=${i}`,(o?self.eval(o.createScript("",l)):new Function(l)).call(self),s()}).then(void 0,r);return}try{o&&(i=o.createScriptURL(i)),importScripts(i),s()}catch(l){r(l)}}}}class n{constructor(e){this._env=e,this._didInitialize=!1,this._didPatchNodeRequire=!1}_init(e){this._didInitialize||(this._didInitialize=!0,this._fs=e("fs"),this._vm=e("vm"),this._path=e("path"),this._crypto=e("crypto"))}_initNodeRequire(e,i){const{nodeCachedData:s}=i.getConfig().getOptionsLiteral();if(!s||this._didPatchNodeRequire)return;this._didPatchNodeRequire=!0;const r=this,o=e("module");function u(l){const g=l.constructor;let p=function(y){try{return l.require(y)}finally{}};return p.resolve=function(y,E){return g._resolveFilename(y,l,!1,E)},p.resolve.paths=function(y){return g._resolveLookupPaths(y,l)},p.main=process.mainModule,p.extensions=g._extensions,p.cache=g._cache,p}o.prototype._compile=function(l,g){const p=o.wrap(l.replace(/^#!.*/,"")),m=i.getRecorder(),y=r._getCachedDataPath(s,g),E={filename:g};let R;try{const x=r._fs.readFileSync(y);R=x.slice(0,16),E.cachedData=x.slice(16),m.record(60,y)}catch{m.record(61,y)}const C=new r._vm.Script(p,E),I=C.runInThisContext(E),w=r._path.dirname(g),b=u(this),U=[this.exports,b,this,g,w,process,_commonjsGlobal,Buffer],P=I.apply(this.exports,U);return r._handleCachedData(C,p,y,!E.cachedData,i),r._verifyCachedData(C,p,y,R,i),P}}load(e,i,s,r){const o=e.getConfig().getOptionsLiteral(),u=c(e.getRecorder(),o.nodeRequire||d.global.nodeRequire),l=o.nodeInstrumenter||function(p){return p};this._init(u),this._initNodeRequire(u,e);let g=e.getRecorder();if(/^node\|/.test(i)){let p=i.split("|"),m=null;try{m=u(p[1])}catch(y){r(y);return}e.enqueueDefineAnonymousModule([],()=>m),s()}else{i=d.Utilities.fileUriToFilePath(this._env.isWindows,i);const p=this._path.normalize(i),m=this._getElectronRendererScriptPathOrUri(p),y=!!o.nodeCachedData,E=y?this._getCachedDataPath(o.nodeCachedData,i):void 0;this._readSourceAndCachedData(p,E,g,(R,C,I,w)=>{if(R){r(R);return}let b;C.charCodeAt(0)===n._BOM?b=n._PREFIX+C.substring(1)+n._SUFFIX:b=n._PREFIX+C+n._SUFFIX,b=l(b,p);const U={filename:m,cachedData:I},P=this._createAndEvalScript(e,b,U,s,r);this._handleCachedData(P,b,E,y&&!I,e),this._verifyCachedData(P,b,E,w,e)})}}_createAndEvalScript(e,i,s,r,o){const u=e.getRecorder();u.record(31,s.filename);const l=new this._vm.Script(i,s),g=l.runInThisContext(s),p=e.getGlobalAMDDefineFunc();let m=!1;const y=function(){return m=!0,p.apply(null,arguments)};return y.amd=p.amd,g.call(d.global,e.getGlobalAMDRequireFunc(),y,s.filename,this._path.dirname(s.filename)),u.record(32,s.filename),m?r():o(new Error(`Didn't receive define call in ${s.filename}!`)),l}_getElectronRendererScriptPathOrUri(e){if(!this._env.isElectronRenderer)return e;let i=e.match(/^([a-z])\:(.*)/i);return i?`file:///${(i[1].toUpperCase()+":"+i[2]).replace(/\\/g,"/")}`:`file://${e}`}_getCachedDataPath(e,i){const s=this._crypto.createHash("md5").update(i,"utf8").update(e.seed,"utf8").update(process.arch,"").digest("hex"),r=this._path.basename(i).replace(/\.js$/,"");return this._path.join(e.path,`${r}-${s}.code`)}_handleCachedData(e,i,s,r,o){e.cachedDataRejected?this._fs.unlink(s,u=>{o.getRecorder().record(62,s),this._createAndWriteCachedData(e,i,s,o),u&&o.getConfig().onError(u)}):r&&this._createAndWriteCachedData(e,i,s,o)}_createAndWriteCachedData(e,i,s,r){let o=Math.ceil(r.getConfig().getOptionsLiteral().nodeCachedData.writeDelay*(1+Math.random())),u=-1,l=0,g;const p=()=>{setTimeout(()=>{g||(g=this._crypto.createHash("md5").update(i,"utf8").digest());const m=e.createCachedData();if(!(m.length===0||m.length===u||l>=5)){if(m.length<u){p();return}u=m.length,this._fs.writeFile(s,Buffer.concat([g,m]),y=>{y&&r.getConfig().onError(y),r.getRecorder().record(63,s),p()})}},o*Math.pow(4,l++))};p()}_readSourceAndCachedData(e,i,s,r){if(!i)this._fs.readFile(e,{encoding:"utf8"},r);else{let o,u,l,g=2;const p=m=>{m?r(m):--g===0&&r(void 0,o,u,l)};this._fs.readFile(e,{encoding:"utf8"},(m,y)=>{o=y,p(m)}),this._fs.readFile(i,(m,y)=>{!m&&y&&y.length>0?(l=y.slice(0,16),u=y.slice(16),s.record(60,i)):s.record(61,i),p()})}}_verifyCachedData(e,i,s,r,o){r&&(e.cachedDataRejected||setTimeout(()=>{const u=this._crypto.createHash("md5").update(i,"utf8").digest();r.equals(u)||(o.getConfig().onError(new Error(`FAILED TO VERIFY CACHED DATA, deleting stale '${s}' now, but a RESTART IS REQUIRED`)),this._fs.unlink(s,l=>{l&&o.getConfig().onError(l)}))},Math.ceil(5e3*(1+Math.random()))))}}n._BOM=65279,n._PREFIX="(function (require, define, __filename, __dirname) { ",n._SUFFIX=`
+});`;function c(t,e){if(e.__$__isRecorded)return e;const i=function(r){t.record(33,r);try{return e(r)}finally{t.record(34,r)}};return i.__$__isRecorded=!0,i}d.ensureRecordedNodeRequire=c;function a(t){return new _(t)}d.createScriptLoader=a})(AMDLoader||(AMDLoader={}));var AMDLoader;(function(d){class _{constructor(t){let e=t.lastIndexOf("/");e!==-1?this.fromModulePath=t.substr(0,e+1):this.fromModulePath=""}static _normalizeModuleId(t){let e=t,i;for(i=/\/\.\//;i.test(e);)e=e.replace(i,"/");for(e=e.replace(/^\.\//g,""),i=/\/(([^\/])|([^\/][^\/\.])|([^\/\.][^\/])|([^\/][^\/][^\/]+))\/\.\.\//;i.test(e);)e=e.replace(i,"/");return e=e.replace(/^(([^\/])|([^\/][^\/\.])|([^\/\.][^\/])|([^\/][^\/][^\/]+))\/\.\.\//,""),e}resolveModule(t){let e=t;return d.Utilities.isAbsolutePath(e)||(d.Utilities.startsWith(e,"./")||d.Utilities.startsWith(e,"../"))&&(e=_._normalizeModuleId(this.fromModulePath+e)),e}}_.ROOT=new _(""),d.ModuleIdResolver=_;class v{constructor(t,e,i,s,r,o){this.id=t,this.strId=e,this.dependencies=i,this._callback=s,this._errorback=r,this.moduleIdResolver=o,this.exports={},this.error=null,this.exportsPassedIn=!1,this.unresolvedDependenciesCount=this.dependencies.length,this._isComplete=!1}static _safeInvokeFunction(t,e){try{return{returnedValue:t.apply(d.global,e),producedError:null}}catch(i){return{returnedValue:null,producedError:i}}}static _invokeFactory(t,e,i,s){return t.shouldInvokeFactory(e)?t.shouldCatchError()?this._safeInvokeFunction(i,s):{returnedValue:i.apply(d.global,s),producedError:null}:{returnedValue:null,producedError:null}}complete(t,e,i,s){this._isComplete=!0;let r=null;if(this._callback)if(typeof this._callback=="function"){t.record(21,this.strId);let o=v._invokeFactory(e,this.strId,this._callback,i);r=o.producedError,t.record(22,this.strId),!r&&typeof o.returnedValue<"u"&&(!this.exportsPassedIn||d.Utilities.isEmpty(this.exports))&&(this.exports=o.returnedValue)}else this.exports=this._callback;if(r){let o=d.ensureError(r);o.phase="factory",o.moduleId=this.strId,o.neededBy=s(this.id),this.error=o,e.onError(o)}this.dependencies=null,this._callback=null,this._errorback=null,this.moduleIdResolver=null}onDependencyError(t){return this._isComplete=!0,this.error=t,this._errorback?(this._errorback(t),!0):!1}isComplete(){return this._isComplete}}d.Module=v;class f{constructor(){this._nextId=0,this._strModuleIdToIntModuleId=new Map,this._intModuleIdToStrModuleId=[],this.getModuleId("exports"),this.getModuleId("module"),this.getModuleId("require")}getMaxModuleId(){return this._nextId}getModuleId(t){let e=this._strModuleIdToIntModuleId.get(t);return typeof e>"u"&&(e=this._nextId++,this._strModuleIdToIntModuleId.set(t,e),this._intModuleIdToStrModuleId[e]=t),e}getStrModuleId(t){return this._intModuleIdToStrModuleId[t]}}class h{constructor(t){this.id=t}}h.EXPORTS=new h(0),h.MODULE=new h(1),h.REQUIRE=new h(2),d.RegularDependency=h;class n{constructor(t,e,i){this.id=t,this.pluginId=e,this.pluginParam=i}}d.PluginDependency=n;class c{constructor(t,e,i,s,r=0){this._env=t,this._scriptLoader=e,this._loaderAvailableTimestamp=r,this._defineFunc=i,this._requireFunc=s,this._moduleIdProvider=new f,this._config=new d.Configuration(this._env),this._hasDependencyCycle=!1,this._modules2=[],this._knownModules2=[],this._inverseDependencies2=[],this._inversePluginDependencies2=new Map,this._currentAnonymousDefineCall=null,this._recorder=null,this._buildInfoPath=[],this._buildInfoDefineStack=[],this._buildInfoDependencies=[],this._requireFunc.moduleManager=this}reset(){return new c(this._env,this._scriptLoader,this._defineFunc,this._requireFunc,this._loaderAvailableTimestamp)}getGlobalAMDDefineFunc(){return this._defineFunc}getGlobalAMDRequireFunc(){return this._requireFunc}static _findRelevantLocationInStack(t,e){let i=o=>o.replace(/\\/g,"/"),s=i(t),r=e.split(/\n/);for(let o=0;o<r.length;o++){let u=r[o].match(/(.*):(\d+):(\d+)\)?$/);if(u){let l=u[1],g=u[2],p=u[3],m=Math.max(l.lastIndexOf(" ")+1,l.lastIndexOf("(")+1);if(l=l.substr(m),l=i(l),l===s){let y={line:parseInt(g,10),col:parseInt(p,10)};return y.line===1&&(y.col-=53),y}}}throw new Error("Could not correlate define call site for needle "+t)}getBuildInfo(){if(!this._config.isBuild())return null;let t=[],e=0;for(let i=0,s=this._modules2.length;i<s;i++){let r=this._modules2[i];if(!r)continue;let o=this._buildInfoPath[r.id]||null,u=this._buildInfoDefineStack[r.id]||null,l=this._buildInfoDependencies[r.id];t[e++]={id:r.strId,path:o,defineLocation:o&&u?c._findRelevantLocationInStack(o,u):null,dependencies:l,shim:null,exports:r.exports}}return t}getRecorder(){return this._recorder||(this._config.shouldRecordStats()?this._recorder=new d.LoaderEventRecorder(this._loaderAvailableTimestamp):this._recorder=d.NullLoaderEventRecorder.INSTANCE),this._recorder}getLoaderEvents(){return this.getRecorder().getEvents()}enqueueDefineAnonymousModule(t,e){if(this._currentAnonymousDefineCall!==null)throw new Error("Can only have one anonymous define call per script file");let i=null;this._config.isBuild()&&(i=new Error("StackLocation").stack||null),this._currentAnonymousDefineCall={stack:i,dependencies:t,callback:e}}defineModule(t,e,i,s,r,o=new _(t)){let u=this._moduleIdProvider.getModuleId(t);if(this._modules2[u]){this._config.isDuplicateMessageIgnoredFor(t)||console.warn("Duplicate definition of module '"+t+"'");return}let l=new v(u,t,this._normalizeDependencies(e,o),i,s,o);this._modules2[u]=l,this._config.isBuild()&&(this._buildInfoDefineStack[u]=r,this._buildInfoDependencies[u]=(l.dependencies||[]).map(g=>this._moduleIdProvider.getStrModuleId(g.id))),this._resolve(l)}_normalizeDependency(t,e){if(t==="exports")return h.EXPORTS;if(t==="module")return h.MODULE;if(t==="require")return h.REQUIRE;let i=t.indexOf("!");if(i>=0){let s=e.resolveModule(t.substr(0,i)),r=e.resolveModule(t.substr(i+1)),o=this._moduleIdProvider.getModuleId(s+"!"+r),u=this._moduleIdProvider.getModuleId(s);return new n(o,u,r)}return new h(this._moduleIdProvider.getModuleId(e.resolveModule(t)))}_normalizeDependencies(t,e){let i=[],s=0;for(let r=0,o=t.length;r<o;r++)i[s++]=this._normalizeDependency(t[r],e);return i}_relativeRequire(t,e,i,s){if(typeof e=="string")return this.synchronousRequire(e,t);this.defineModule(d.Utilities.generateAnonymousModule(),e,i,s,null,t)}synchronousRequire(t,e=new _(t)){let i=this._normalizeDependency(t,e),s=this._modules2[i.id];if(!s)throw new Error("Check dependency list! Synchronous require cannot resolve module '"+t+"'. This is the first mention of this module!");if(!s.isComplete())throw new Error("Check dependency list! Synchronous require cannot resolve module '"+t+"'. This module has not been resolved completely yet.");if(s.error)throw s.error;return s.exports}configure(t,e){let i=this._config.shouldRecordStats();e?this._config=new d.Configuration(this._env,t):this._config=this._config.cloneAndMerge(t),this._config.shouldRecordStats()&&!i&&(this._recorder=null)}getConfig(){return this._config}_onLoad(t){if(this._currentAnonymousDefineCall!==null){let e=this._currentAnonymousDefineCall;this._currentAnonymousDefineCall=null,this.defineModule(this._moduleIdProvider.getStrModuleId(t),e.dependencies,e.callback,null,e.stack)}}_createLoadError(t,e){let i=this._moduleIdProvider.getStrModuleId(t),s=(this._inverseDependencies2[t]||[]).map(o=>this._moduleIdProvider.getStrModuleId(o));const r=d.ensureError(e);return r.phase="loading",r.moduleId=i,r.neededBy=s,r}_onLoadError(t,e){const i=this._createLoadError(t,e);this._modules2[t]||(this._modules2[t]=new v(t,this._moduleIdProvider.getStrModuleId(t),[],()=>{},null,null));let s=[];for(let u=0,l=this._moduleIdProvider.getMaxModuleId();u<l;u++)s[u]=!1;let r=!1,o=[];for(o.push(t),s[t]=!0;o.length>0;){let u=o.shift(),l=this._modules2[u];l&&(r=l.onDependencyError(i)||r);let g=this._inverseDependencies2[u];if(g)for(let p=0,m=g.length;p<m;p++){let y=g[p];s[y]||(o.push(y),s[y]=!0)}}r||this._config.onError(i)}_hasDependencyPath(t,e){let i=this._modules2[t];if(!i)return!1;let s=[];for(let o=0,u=this._moduleIdProvider.getMaxModuleId();o<u;o++)s[o]=!1;let r=[];for(r.push(i),s[t]=!0;r.length>0;){let u=r.shift().dependencies;if(u)for(let l=0,g=u.length;l<g;l++){let p=u[l];if(p.id===e)return!0;let m=this._modules2[p.id];m&&!s[p.id]&&(s[p.id]=!0,r.push(m))}}return!1}_findCyclePath(t,e,i){if(t===e||i===50)return[t];let s=this._modules2[t];if(!s)return null;let r=s.dependencies;if(r)for(let o=0,u=r.length;o<u;o++){let l=this._findCyclePath(r[o].id,e,i+1);if(l!==null)return l.push(t),l}return null}_createRequire(t){let e=(i,s,r)=>this._relativeRequire(t,i,s,r);return e.toUrl=i=>this._config.requireToUrl(t.resolveModule(i)),e.getStats=()=>this.getLoaderEvents(),e.hasDependencyCycle=()=>this._hasDependencyCycle,e.config=(i,s=!1)=>{this.configure(i,s)},e.__$__nodeRequire=d.global.nodeRequire,e}_loadModule(t){if(this._modules2[t]||this._knownModules2[t])return;this._knownModules2[t]=!0;let e=this._moduleIdProvider.getStrModuleId(t),i=this._config.moduleIdToPaths(e),s=/^@[^\/]+\/[^\/]+$/;this._env.isNode&&(e.indexOf("/")===-1||s.test(e))&&i.push("node|"+e);let r=-1,o=u=>{if(r++,r>=i.length)this._onLoadError(t,u);else{let l=i[r],g=this.getRecorder();if(this._config.isBuild()&&l==="empty:"){this._buildInfoPath[t]=l,this.defineModule(this._moduleIdProvider.getStrModuleId(t),[],null,null,null),this._onLoad(t);return}g.record(10,l),this._scriptLoader.load(this,l,()=>{this._config.isBuild()&&(this._buildInfoPath[t]=l),g.record(11,l),this._onLoad(t)},p=>{g.record(12,l),o(p)})}};o(null)}_loadPluginDependency(t,e){if(this._modules2[e.id]||this._knownModules2[e.id])return;this._knownModules2[e.id]=!0;let i=s=>{this.defineModule(this._moduleIdProvider.getStrModuleId(e.id),[],s,null,null)};i.error=s=>{this._config.onError(this._createLoadError(e.id,s))},t.load(e.pluginParam,this._createRequire(_.ROOT),i,this._config.getOptionsLiteral())}_resolve(t){let e=t.dependencies;if(e)for(let i=0,s=e.length;i<s;i++){let r=e[i];if(r===h.EXPORTS){t.exportsPassedIn=!0,t.unresolvedDependenciesCount--;continue}if(r===h.MODULE){t.unresolvedDependenciesCount--;continue}if(r===h.REQUIRE){t.unresolvedDependenciesCount--;continue}let o=this._modules2[r.id];if(o&&o.isComplete()){if(o.error){t.onDependencyError(o.error);return}t.unresolvedDependenciesCount--;continue}if(this._hasDependencyPath(r.id,t.id)){this._hasDependencyCycle=!0,console.warn("There is a dependency cycle between '"+this._moduleIdProvider.getStrModuleId(r.id)+"' and '"+this._moduleIdProvider.getStrModuleId(t.id)+"'. The cyclic path follows:");let u=this._findCyclePath(r.id,t.id,0)||[];u.reverse(),u.push(r.id),console.warn(u.map(l=>this._moduleIdProvider.getStrModuleId(l)).join(` =>
+`)),t.unresolvedDependenciesCount--;continue}if(this._inverseDependencies2[r.id]=this._inverseDependencies2[r.id]||[],this._inverseDependencies2[r.id].push(t.id),r instanceof n){let u=this._modules2[r.pluginId];if(u&&u.isComplete()){this._loadPluginDependency(u.exports,r);continue}let l=this._inversePluginDependencies2.get(r.pluginId);l||(l=[],this._inversePluginDependencies2.set(r.pluginId,l)),l.push(r),this._loadModule(r.pluginId);continue}this._loadModule(r.id)}t.unresolvedDependenciesCount===0&&this._onModuleComplete(t)}_onModuleComplete(t){let e=this.getRecorder();if(t.isComplete())return;let i=t.dependencies,s=[];if(i)for(let l=0,g=i.length;l<g;l++){let p=i[l];if(p===h.EXPORTS){s[l]=t.exports;continue}if(p===h.MODULE){s[l]={id:t.strId,config:()=>this._config.getConfigForModule(t.strId)};continue}if(p===h.REQUIRE){s[l]=this._createRequire(t.moduleIdResolver);continue}let m=this._modules2[p.id];if(m){s[l]=m.exports;continue}s[l]=null}const r=l=>(this._inverseDependencies2[l]||[]).map(g=>this._moduleIdProvider.getStrModuleId(g));t.complete(e,this._config,s,r);let o=this._inverseDependencies2[t.id];if(this._inverseDependencies2[t.id]=null,o)for(let l=0,g=o.length;l<g;l++){let p=o[l],m=this._modules2[p];m.unresolvedDependenciesCount--,m.unresolvedDependenciesCount===0&&this._onModuleComplete(m)}let u=this._inversePluginDependencies2.get(t.id);if(u){this._inversePluginDependencies2.delete(t.id);for(let l=0,g=u.length;l<g;l++)this._loadPluginDependency(t.exports,u[l])}}}d.ModuleManager=c})(AMDLoader||(AMDLoader={}));var define,AMDLoader;(function(d){const _=new d.Environment;let v=null;const f=function(a,t,e){typeof a!="string"&&(e=t,t=a,a=null),(typeof t!="object"||!Array.isArray(t))&&(e=t,t=null),t||(t=["require","exports","module"]),a?v.defineModule(a,t,e,null,null):v.enqueueDefineAnonymousModule(t,e)};f.amd={jQuery:!0};const h=function(a,t=!1){v.configure(a,t)},n=function(){if(arguments.length===1){if(arguments[0]instanceof Object&&!Array.isArray(arguments[0])){h(arguments[0]);return}if(typeof arguments[0]=="string")return v.synchronousRequire(arguments[0])}if((arguments.length===2||arguments.length===3)&&Array.isArray(arguments[0])){v.defineModule(d.Utilities.generateAnonymousModule(),arguments[0],arguments[1],arguments[2],null);return}throw new Error("Unrecognized require call")};n.config=h,n.getConfig=function(){return v.getConfig().getOptionsLiteral()},n.reset=function(){v=v.reset()},n.getBuildInfo=function(){return v.getBuildInfo()},n.getStats=function(){return v.getLoaderEvents()},n.define=f;function c(){if(typeof d.global.require<"u"||typeof require<"u"){const a=d.global.require||require;if(typeof a=="function"&&typeof a.resolve=="function"){const t=d.ensureRecordedNodeRequire(v.getRecorder(),a);d.global.nodeRequire=t,n.nodeRequire=t,n.__$__nodeRequire=t}}_.isNode&&!_.isElectronRenderer&&!_.isElectronNodeIntegrationWebWorker?module.exports=n:(_.isElectronRenderer||(d.global.define=f),d.global.require=n)}d.init=c,(typeof d.global.define!="function"||!d.global.define.amd)&&(v=new d.ModuleManager(_,d.createScriptLoader(_),f,n,d.Utilities.getHighPerformanceTimestamp()),typeof d.global.require<"u"&&typeof d.global.require!="function"&&n.config(d.global.require),define=function(){return f.apply(null,arguments)},define.amd=f.amd,typeof doNotInitLoader>"u"&&c())})(AMDLoader||(AMDLoader={})),define("vs/css",["require","exports"],function(d,_){"use strict";Object.defineProperty(_,"__esModule",{value:!0}),_.load=v;function v(a,t,e,i){if(i=i||{},(i["vs/css"]||{}).disabled){e({});return}const r=t.toUrl(a+".css");f(a,r,()=>{e({})},o=>{typeof e.error=="function"&&e.error("Could not find "+r+".")})}function f(a,t,e,i){if(h(a,t)){e();return}n(a,t,e,i)}function h(a,t){const e=window.document.getElementsByTagName("link");for(let i=0,s=e.length;i<s;i++){const r=e[i].getAttribute("data-name"),o=e[i].getAttribute("href");if(r===a||o===t)return!0}return!1}function n(a,t,e,i){const s=document.createElement("link");s.setAttribute("rel","stylesheet"),s.setAttribute("type","text/css"),s.setAttribute("data-name",a),c(a,s,e,i),s.setAttribute("href",t),(window.document.head||window.document.getElementsByTagName("head")[0]).appendChild(s)}function c(a,t,e,i){const s=()=>{t.removeEventListener("load",r),t.removeEventListener("error",o)},r=u=>{s(),e()},o=u=>{s(),i(u)};t.addEventListener("load",r),t.addEventListener("error",o)}}),function(){const d=require.getConfig().baseUrl||"https://main.vscode-cdn.net/insider/336db9ece67f682159078ea1b54212de7636d88a/out";require.config({baseUrl:d,recordStats:!0,paths:{"@microsoft/1ds-core-js":"../node_modules/@microsoft/1ds-core-js/dist/ms.core.min.js","@microsoft/1ds-post-js":"../node_modules/@microsoft/1ds-post-js/dist/ms.post.min.js","@vscode/iconv-lite-umd":"../node_modules/@vscode/iconv-lite-umd/lib/iconv-lite-umd.js","@vscode/tree-sitter-wasm":"../node_modules/@vscode/tree-sitter-wasm/wasm/tree-sitter.js","@vscode/vscode-languagedetection":"../node_modules/@vscode/vscode-languagedetection/dist/lib/index.js","@xterm/addon-clipboard":"../node_modules/@xterm/addon-clipboard/lib/addon-clipboard.js","@xterm/addon-image":"../node_modules/@xterm/addon-image/lib/addon-image.js","@xterm/addon-search":"../node_modules/@xterm/addon-search/lib/addon-search.js","@xterm/addon-serialize":"../node_modules/@xterm/addon-serialize/lib/addon-serialize.js","@xterm/addon-unicode11":"../node_modules/@xterm/addon-unicode11/lib/addon-unicode11.js","@xterm/addon-webgl":"../node_modules/@xterm/addon-webgl/lib/addon-webgl.js","@xterm/xterm":"../node_modules/@xterm/xterm/lib/xterm.js",jschardet:"../node_modules/jschardet/dist/jschardet.min.js","tas-client-umd":"../node_modules/tas-client-umd/lib/tas-client-umd.js","vscode-oniguruma":"../node_modules/vscode-oniguruma/release/main.js","vscode-textmate":"../node_modules/vscode-textmate/release/main.js","vscode-regexp-languagedetection":"../node_modules/vscode-regexp-languagedetection/dist/index.js",vsda:"../node_modules/vsda/rust/web/vsda.js","@microsoft/dynamicproto-js":"../node_modules/@microsoft/dynamicproto-js/lib/dist/umd/dynamicproto-js.min.js","@microsoft/applicationinsights-shims":"../node_modules/@microsoft/applicationinsights-shims/dist/umd/applicationinsights-shims.min.js","@microsoft/applicationinsights-core-js":"../node_modules/@microsoft/applicationinsights-core-js/browser/applicationinsights-core-js.min.js"}})}();
+
+//# sourceMappingURL=https://main.vscode-cdn.net/sourcemaps/336db9ece67f682159078ea1b54212de7636d88a/core/vs/loader.js.map
diff --git a/build/monaco/monaco.d.ts.recipe b/build/monaco/monaco.d.ts.recipe
index a6eb3b7128f..ef5c2e39ae5 100644
--- a/build/monaco/monaco.d.ts.recipe
+++ b/build/monaco/monaco.d.ts.recipe
@@ -92,7 +92,7 @@ declare namespace monaco.editor {
 #includeAll(vs/editor/standalone/browser/standaloneEditor;languages.Token=>Token):
 #include(vs/editor/standalone/common/standaloneTheme): BuiltinTheme, IStandaloneThemeData, IColors
 #include(vs/editor/common/languages/supports/tokenization): ITokenThemeRule
-#include(vs/editor/browser/services/webWorker): MonacoWebWorker, IWebWorkerOptions
+#include(vs/editor/standalone/browser/standaloneWebWorker): MonacoWebWorker, IWebWorkerOptions
 #include(vs/editor/standalone/browser/standaloneCodeEditor): IActionDescriptor, IGlobalEditorOptions, IStandaloneEditorConstructionOptions, IStandaloneDiffEditorConstructionOptions, IStandaloneCodeEditor, IStandaloneDiffEditor
 export interface ICommandHandler {
 	(...args: any[]): void;
diff --git a/build/npm/dirs.js b/build/npm/dirs.js
index 372d546cd78..b9645e6e137 100644
--- a/build/npm/dirs.js
+++ b/build/npm/dirs.js
@@ -5,7 +5,7 @@
 
 const fs = require('fs');
 
-// Complete list of directories where yarn should be executed to install node modules
+// Complete list of directories where npm should be executed to install node modules
 const dirs = [
 	'',
 	'build',
@@ -29,7 +29,6 @@ const dirs = [
 	'extensions/jake',
 	'extensions/json-language-features',
 	'extensions/json-language-features/server',
-	'extensions/markdown-language-features/server',
 	'extensions/markdown-language-features',
 	'extensions/markdown-math',
 	'extensions/media-preview',
@@ -52,6 +51,7 @@ const dirs = [
 	'test/integration/browser',
 	'test/monaco',
 	'test/smoke',
+	'.vscode/extensions/vscode-selfhost-import-aid',
 	'.vscode/extensions/vscode-selfhost-test-provider',
 ];
 
diff --git a/build/npm/gyp/package-lock.json b/build/npm/gyp/package-lock.json
new file mode 100644
index 00000000000..a20d85c70dc
--- /dev/null
+++ b/build/npm/gyp/package-lock.json
@@ -0,0 +1,1321 @@
+{
+  "name": "code-oss-dev-build",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "code-oss-dev-build",
+      "version": "1.0.0",
+      "license": "MIT",
+      "devDependencies": {
+        "node-gyp": "^10.1.0"
+      }
+    },
+    "node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@npmcli/agent": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.2.tgz",
+      "integrity": "sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "agent-base": "^7.1.0",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.1",
+        "lru-cache": "^10.0.1",
+        "socks-proxy-agent": "^8.0.3"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@npmcli/fs": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz",
+      "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/abbrev": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz",
+      "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/agent-base": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/aggregate-error": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "clean-stack": "^2.0.0",
+        "indent-string": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/cacache": {
+      "version": "18.0.3",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.3.tgz",
+      "integrity": "sha512-qXCd4rh6I07cnDqh8V48/94Tc/WSfj+o3Gn6NZ0aZovS255bUx8O13uKxRFd2eWG0xgsco7+YItQNPaa5E85hg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@npmcli/fs": "^3.1.0",
+        "fs-minipass": "^3.0.0",
+        "glob": "^10.2.2",
+        "lru-cache": "^10.0.1",
+        "minipass": "^7.0.3",
+        "minipass-collect": "^2.0.1",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.4",
+        "p-map": "^4.0.0",
+        "ssri": "^10.0.0",
+        "tar": "^6.1.11",
+        "unique-filename": "^3.0.0"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/chownr": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/clean-stack": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/cross-spawn/node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/cross-spawn/node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
+      "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/encoding": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
+      "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "iconv-lite": "^0.6.2"
+      }
+    },
+    "node_modules/env-paths": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
+      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/err-code": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
+      "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/exponential-backoff": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz",
+      "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/foreground-child": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz",
+      "integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "cross-spawn": "^7.0.0",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/fs-minipass": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz",
+      "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^7.0.3"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/glob": {
+      "version": "10.4.2",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.2.tgz",
+      "integrity": "sha512-GwMlUF6PkPo3Gk21UxkCohOv0PLcIXVtKyLlpEI28R/cO/4eNOdmLk3CMW1wROV/WR/EsZOWAfBbBOqYvs88/w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.10",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/http-cache-semantics": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
+      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
+      "dev": true,
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/http-proxy-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/https-proxy-agent": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+      "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.0.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ip-address": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
+      "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "jsbn": "1.1.0",
+        "sprintf-js": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-lambda": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
+      "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/isexe": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
+      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/jackspeak": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.0.tgz",
+      "integrity": "sha512-JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
+    "node_modules/jsbn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
+      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lru-cache": {
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.3.0.tgz",
+      "integrity": "sha512-CQl19J/g+Hbjbv4Y3mFNNXFEL/5t/KCg8POCuUqd4rMKjGG+j1ybER83hxV58zL+dFI1PTkt3GNFSHRt+d8qEQ==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "14 || >=16.14"
+      }
+    },
+    "node_modules/make-fetch-happen": {
+      "version": "13.0.1",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz",
+      "integrity": "sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@npmcli/agent": "^2.0.0",
+        "cacache": "^18.0.0",
+        "http-cache-semantics": "^4.1.1",
+        "is-lambda": "^1.0.1",
+        "minipass": "^7.0.2",
+        "minipass-fetch": "^3.0.0",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.4",
+        "negotiator": "^0.6.3",
+        "proc-log": "^4.2.0",
+        "promise-retry": "^2.0.1",
+        "ssri": "^10.0.0"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/proc-log": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
+      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/minipass-collect": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz",
+      "integrity": "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^7.0.3"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/minipass-fetch": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz",
+      "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "minipass": "^7.0.3",
+        "minipass-sized": "^1.0.3",
+        "minizlib": "^2.1.2"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      },
+      "optionalDependencies": {
+        "encoding": "^0.1.13"
+      }
+    },
+    "node_modules/minipass-flush": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
+      "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/minipass-flush/node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minipass-pipeline": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
+      "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minipass-pipeline/node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minipass-sized": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
+      "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minipass-sized/node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minizlib": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "minipass": "^3.0.0",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/minizlib/node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/node-gyp": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.1.0.tgz",
+      "integrity": "sha512-B4J5M1cABxPc5PwfjhbV5hoy2DP9p8lFXASnEN6hugXOa61416tnTZ29x9sSwAd0o99XNIcpvDDy1swAExsVKA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "env-paths": "^2.2.0",
+        "exponential-backoff": "^3.1.1",
+        "glob": "^10.3.10",
+        "graceful-fs": "^4.2.6",
+        "make-fetch-happen": "^13.0.0",
+        "nopt": "^7.0.0",
+        "proc-log": "^3.0.0",
+        "semver": "^7.3.5",
+        "tar": "^6.1.2",
+        "which": "^4.0.0"
+      },
+      "bin": {
+        "node-gyp": "bin/node-gyp.js"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/nopt": {
+      "version": "7.2.1",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz",
+      "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "abbrev": "^2.0.0"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/p-map": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "aggregate-error": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/package-json-from-dist": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz",
+      "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==",
+      "dev": true,
+      "license": "BlueOak-1.0.0"
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-scurry": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "lru-cache": "^10.2.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/proc-log": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz",
+      "integrity": "sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/promise-retry": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
+      "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "err-code": "^2.0.2",
+        "retry": "^0.12.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/semver": {
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/semver/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
+      "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ip-address": "^9.0.5",
+        "smart-buffer": "^4.2.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks-proxy-agent": {
+      "version": "8.0.4",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz",
+      "integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.1",
+        "debug": "^4.3.4",
+        "socks": "^2.8.3"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/ssri": {
+      "version": "10.0.6",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz",
+      "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^7.0.3"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/string-width-cjs": {
+      "name": "string-width",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/string-width-cjs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/strip-ansi-cjs": {
+      "name": "strip-ansi",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/tar": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
+      "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "minipass": "^5.0.0",
+        "minizlib": "^2.1.1",
+        "mkdirp": "^1.0.3",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/tar/node_modules/fs-minipass": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/tar/node_modules/fs-minipass/node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/tar/node_modules/minipass": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
+      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/unique-filename": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz",
+      "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "unique-slug": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/unique-slug": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz",
+      "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "imurmurhash": "^0.1.4"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/which": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
+      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^3.1.1"
+      },
+      "bin": {
+        "node-which": "bin/which.js"
+      },
+      "engines": {
+        "node": "^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs": {
+      "name": "wrap-ansi",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true,
+      "license": "ISC"
+    }
+  }
+}
diff --git a/build/npm/gyp/package.json b/build/npm/gyp/package.json
index 3961e955a5f..a1564133a1e 100644
--- a/build/npm/gyp/package.json
+++ b/build/npm/gyp/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "license": "MIT",
   "devDependencies": {
-    "node-gyp": "^9.4.0"
+    "node-gyp": "^10.1.0"
   },
   "scripts": {}
 }
diff --git a/build/npm/gyp/yarn.lock b/build/npm/gyp/yarn.lock
deleted file mode 100644
index 96d132e7943..00000000000
--- a/build/npm/gyp/yarn.lock
+++ /dev/null
@@ -1,812 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@isaacs/cliui@^8.0.2":
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
-  integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==
-  dependencies:
-    string-width "^5.1.2"
-    string-width-cjs "npm:string-width@^4.2.0"
-    strip-ansi "^7.0.1"
-    strip-ansi-cjs "npm:strip-ansi@^6.0.1"
-    wrap-ansi "^8.1.0"
-    wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
-
-"@npmcli/fs@^3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-3.1.0.tgz#233d43a25a91d68c3a863ba0da6a3f00924a173e"
-  integrity sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==
-  dependencies:
-    semver "^7.3.5"
-
-"@pkgjs/parseargs@^0.11.0":
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
-  integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
-
-"@tootallnate/once@2":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
-  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
-
-abbrev@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
-
-agent-base@6, agent-base@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
-  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
-  dependencies:
-    debug "4"
-
-agentkeepalive@^4.2.1:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.3.0.tgz#bb999ff07412653c1803b3ced35e50729830a255"
-  integrity sha512-7Epl1Blf4Sy37j4v9f9FjICCh4+KAQOyXgHEwlyBiAQLbhKdq/i2QQU3amQalS/wPhdPzDXPL5DMR5bkn+YeWg==
-  dependencies:
-    debug "^4.1.0"
-    depd "^2.0.0"
-    humanize-ms "^1.2.1"
-
-aggregate-error@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
-  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
-  dependencies:
-    clean-stack "^2.0.0"
-    indent-string "^4.0.0"
-
-ansi-regex@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
-  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
-
-ansi-regex@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
-  integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
-
-ansi-styles@^4.0.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
-  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
-  dependencies:
-    color-convert "^2.0.1"
-
-ansi-styles@^6.1.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
-  integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
-
-"aproba@^1.0.3 || ^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
-  integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
-
-are-we-there-yet@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd"
-  integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^3.6.0"
-
-balanced-match@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
-  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
-
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-brace-expansion@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
-  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
-  dependencies:
-    balanced-match "^1.0.0"
-
-cacache@^17.0.0:
-  version "17.1.3"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-17.1.3.tgz#c6ac23bec56516a7c0c52020fd48b4909d7c7044"
-  integrity sha512-jAdjGxmPxZh0IipMdR7fK/4sDSrHMLUV0+GvVUsjwyGNKHsh79kW/otg+GkbXwl6Uzvy9wsvHOX4nUoWldeZMg==
-  dependencies:
-    "@npmcli/fs" "^3.1.0"
-    fs-minipass "^3.0.0"
-    glob "^10.2.2"
-    lru-cache "^7.7.1"
-    minipass "^5.0.0"
-    minipass-collect "^1.0.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    p-map "^4.0.0"
-    ssri "^10.0.0"
-    tar "^6.1.11"
-    unique-filename "^3.0.0"
-
-chownr@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
-  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
-
-clean-stack@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
-  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
-
-color-convert@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
-  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
-  dependencies:
-    color-name "~1.1.4"
-
-color-name@~1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
-  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-
-color-support@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
-  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
-
-console-control-strings@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
-
-cross-spawn@^7.0.0:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
-  dependencies:
-    path-key "^3.1.0"
-    shebang-command "^2.0.0"
-    which "^2.0.1"
-
-debug@4, debug@^4.1.0, debug@^4.3.3:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
-  dependencies:
-    ms "2.1.2"
-
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==
-
-depd@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
-  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
-
-eastasianwidth@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
-  integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
-
-emoji-regex@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
-  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
-
-emoji-regex@^9.2.2:
-  version "9.2.2"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
-  integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
-
-encoding@^0.1.13:
-  version "0.1.13"
-  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
-  integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
-  dependencies:
-    iconv-lite "^0.6.2"
-
-env-paths@^2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
-  integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
-
-err-code@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9"
-  integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==
-
-exponential-backoff@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.1.tgz#64ac7526fe341ab18a39016cd22c787d01e00bf6"
-  integrity sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==
-
-foreground-child@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d"
-  integrity sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==
-  dependencies:
-    cross-spawn "^7.0.0"
-    signal-exit "^4.0.1"
-
-fs-minipass@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
-  integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
-  dependencies:
-    minipass "^3.0.0"
-
-fs-minipass@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-3.0.2.tgz#5b383858efa8c1eb8c33b39e994f7e8555b8b3a3"
-  integrity sha512-2GAfyfoaCDRrM6jaOS3UsBts8yJ55VioXdWcOL7dK9zdAuKT71+WBA4ifnNYqVjYv+4SsPxjK0JT4yIIn4cA/g==
-  dependencies:
-    minipass "^5.0.0"
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
-
-gauge@^4.0.3:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
-  integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==
-  dependencies:
-    aproba "^1.0.3 || ^2.0.0"
-    color-support "^1.1.3"
-    console-control-strings "^1.1.0"
-    has-unicode "^2.0.1"
-    signal-exit "^3.0.7"
-    string-width "^4.2.3"
-    strip-ansi "^6.0.1"
-    wide-align "^1.1.5"
-
-glob@^10.2.2:
-  version "10.3.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.3.tgz#8360a4ffdd6ed90df84aa8d52f21f452e86a123b"
-  integrity sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==
-  dependencies:
-    foreground-child "^3.1.0"
-    jackspeak "^2.0.3"
-    minimatch "^9.0.1"
-    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
-    path-scurry "^1.10.1"
-
-glob@^7.1.3, glob@^7.1.4:
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
-  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.1.1"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-graceful-fs@^4.2.6:
-  version "4.2.10"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
-  integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
-
-has-unicode@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
-
-http-cache-semantics@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
-  integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
-
-http-proxy-agent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
-  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
-  dependencies:
-    "@tootallnate/once" "2"
-    agent-base "6"
-    debug "4"
-
-https-proxy-agent@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
-  integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
-  dependencies:
-    agent-base "6"
-    debug "4"
-
-humanize-ms@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
-  integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==
-  dependencies:
-    ms "^2.0.0"
-
-iconv-lite@^0.6.2:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
-  integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3.0.0"
-
-imurmurhash@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
-
-indent-string@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
-  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2, inherits@^2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-ip@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.1.tgz#e8f3595d33a3ea66490204234b77636965307105"
-  integrity sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==
-
-is-fullwidth-code-point@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
-  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
-
-is-lambda@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
-  integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
-
-jackspeak@^2.0.3:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.2.2.tgz#707c62733924b8dc2a0a629dc6248577788b5385"
-  integrity sha512-mgNtVv4vUuaKA97yxUHoA3+FkuhtxkjdXEWOyB/N76fjy0FjezEt34oy3epBtvCvS+7DyKwqCFWx/oJLV5+kCg==
-  dependencies:
-    "@isaacs/cliui" "^8.0.2"
-  optionalDependencies:
-    "@pkgjs/parseargs" "^0.11.0"
-
-lru-cache@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
-  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
-  dependencies:
-    yallist "^4.0.0"
-
-lru-cache@^7.7.1:
-  version "7.18.3"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89"
-  integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==
-
-"lru-cache@^9.1.1 || ^10.0.0":
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.0.tgz#b9e2a6a72a129d81ab317202d93c7691df727e61"
-  integrity sha512-svTf/fzsKHffP42sujkO/Rjs37BCIsQVRCeNYIm9WN8rgT7ffoUnRtZCqU+6BqcSBdv8gwJeTz8knJpgACeQMw==
-
-make-fetch-happen@^11.0.3:
-  version "11.1.1"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz#85ceb98079584a9523d4bf71d32996e7e208549f"
-  integrity sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==
-  dependencies:
-    agentkeepalive "^4.2.1"
-    cacache "^17.0.0"
-    http-cache-semantics "^4.1.1"
-    http-proxy-agent "^5.0.0"
-    https-proxy-agent "^5.0.0"
-    is-lambda "^1.0.1"
-    lru-cache "^7.7.1"
-    minipass "^5.0.0"
-    minipass-fetch "^3.0.0"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    negotiator "^0.6.3"
-    promise-retry "^2.0.1"
-    socks-proxy-agent "^7.0.0"
-    ssri "^10.0.0"
-
-minimatch@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimatch@^9.0.1:
-  version "9.0.3"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
-  integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
-  dependencies:
-    brace-expansion "^2.0.1"
-
-minipass-collect@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
-  integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-fetch@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-3.0.3.tgz#d9df70085609864331b533c960fd4ffaa78d15ce"
-  integrity sha512-n5ITsTkDqYkYJZjcRWzZt9qnZKCT7nKCosJhHoj7S7zD+BP4jVbWs+odsniw5TA3E0sLomhTKOKjF86wf11PuQ==
-  dependencies:
-    minipass "^5.0.0"
-    minipass-sized "^1.0.3"
-    minizlib "^2.1.2"
-  optionalDependencies:
-    encoding "^0.1.13"
-
-minipass-flush@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
-  integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-pipeline@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
-  integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-sized@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70"
-  integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass@^3.0.0:
-  version "3.3.6"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a"
-  integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==
-  dependencies:
-    yallist "^4.0.0"
-
-minipass@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
-  integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
-
-"minipass@^5.0.0 || ^6.0.2 || ^7.0.0":
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.2.tgz#58a82b7d81c7010da5bd4b2c0c85ac4b4ec5131e"
-  integrity sha512-eL79dXrE1q9dBbDCLg7xfn/vl7MS4F1gvJAgjJrQli/jbQWdUttuVawphqpffoIYfRdq78LHx6GP4bU/EQ2ATA==
-
-minizlib@^2.1.1, minizlib@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
-  integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
-  dependencies:
-    minipass "^3.0.0"
-    yallist "^4.0.0"
-
-mkdirp@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-
-ms@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-ms@^2.0.0:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
-  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
-
-negotiator@^0.6.3:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
-  integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
-
-node-gyp@^9.4.0:
-  version "9.4.0"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.4.0.tgz#2a7a91c7cba4eccfd95e949369f27c9ba704f369"
-  integrity sha512-dMXsYP6gc9rRbejLXmTbVRYjAHw7ppswsKyMxuxJxxOHzluIO1rGp9TOQgjFJ+2MCqcOcQTOPB/8Xwhr+7s4Eg==
-  dependencies:
-    env-paths "^2.2.0"
-    exponential-backoff "^3.1.1"
-    glob "^7.1.4"
-    graceful-fs "^4.2.6"
-    make-fetch-happen "^11.0.3"
-    nopt "^6.0.0"
-    npmlog "^6.0.0"
-    rimraf "^3.0.2"
-    semver "^7.3.5"
-    tar "^6.1.2"
-    which "^2.0.2"
-
-nopt@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d"
-  integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==
-  dependencies:
-    abbrev "^1.0.0"
-
-npmlog@^6.0.0:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
-  integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
-  dependencies:
-    are-we-there-yet "^3.0.0"
-    console-control-strings "^1.1.0"
-    gauge "^4.0.3"
-    set-blocking "^2.0.0"
-
-once@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
-  dependencies:
-    wrappy "1"
-
-p-map@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
-  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
-  dependencies:
-    aggregate-error "^3.0.0"
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
-
-path-key@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
-  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
-
-path-scurry@^1.10.1:
-  version "1.10.1"
-  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.1.tgz#9ba6bf5aa8500fe9fd67df4f0d9483b2b0bfc698"
-  integrity sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==
-  dependencies:
-    lru-cache "^9.1.1 || ^10.0.0"
-    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
-
-promise-retry@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22"
-  integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==
-  dependencies:
-    err-code "^2.0.2"
-    retry "^0.12.0"
-
-readable-stream@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
-  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
-retry@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
-  integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==
-
-rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
-safe-buffer@~5.2.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
-"safer-buffer@>= 2.1.2 < 3.0.0":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-
-semver@^7.3.5:
-  version "7.5.4"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
-  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
-  dependencies:
-    lru-cache "^6.0.0"
-
-set-blocking@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
-
-shebang-command@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
-  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
-  dependencies:
-    shebang-regex "^3.0.0"
-
-shebang-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
-  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
-
-signal-exit@^3.0.7:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
-  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
-
-signal-exit@^4.0.1:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
-  integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
-
-smart-buffer@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
-  integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
-
-socks-proxy-agent@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6"
-  integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==
-  dependencies:
-    agent-base "^6.0.2"
-    debug "^4.3.3"
-    socks "^2.6.2"
-
-socks@^2.6.2:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55"
-  integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==
-  dependencies:
-    ip "^2.0.0"
-    smart-buffer "^4.2.0"
-
-ssri@^10.0.0:
-  version "10.0.4"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-10.0.4.tgz#5a20af378be586df139ddb2dfb3bf992cf0daba6"
-  integrity sha512-12+IR2CB2C28MMAw0Ncqwj5QbTcs0nGIhgJzYWzDkb21vWmfNI83KS4f3Ci6GI98WreIfG7o9UXp3C0qbpA8nQ==
-  dependencies:
-    minipass "^5.0.0"
-
-"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-string-width@^5.0.1, string-width@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
-  integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
-  dependencies:
-    eastasianwidth "^0.2.0"
-    emoji-regex "^9.2.2"
-    strip-ansi "^7.0.1"
-
-string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
-  dependencies:
-    safe-buffer "~5.2.0"
-
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-ansi@^7.0.1:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
-  integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==
-  dependencies:
-    ansi-regex "^6.0.1"
-
-tar@^6.1.11, tar@^6.1.2:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a"
-  integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==
-  dependencies:
-    chownr "^2.0.0"
-    fs-minipass "^2.0.0"
-    minipass "^5.0.0"
-    minizlib "^2.1.1"
-    mkdirp "^1.0.3"
-    yallist "^4.0.0"
-
-unique-filename@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-3.0.0.tgz#48ba7a5a16849f5080d26c760c86cf5cf05770ea"
-  integrity sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==
-  dependencies:
-    unique-slug "^4.0.0"
-
-unique-slug@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-4.0.0.tgz#6bae6bb16be91351badd24cdce741f892a6532e3"
-  integrity sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==
-  dependencies:
-    imurmurhash "^0.1.4"
-
-util-deprecate@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
-
-which@^2.0.1, which@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
-  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
-  dependencies:
-    isexe "^2.0.0"
-
-wide-align@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
-  integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
-  dependencies:
-    string-width "^1.0.2 || 2 || 3 || 4"
-
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
-wrap-ansi@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
-  integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==
-  dependencies:
-    ansi-styles "^6.1.0"
-    string-width "^5.0.1"
-    strip-ansi "^7.0.1"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
-
-yallist@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
-  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
index bcac781e265..e38c2cb003e 100644
--- a/build/npm/postinstall.js
+++ b/build/npm/postinstall.js
@@ -8,12 +8,19 @@ const path = require('path');
 const os = require('os');
 const cp = require('child_process');
 const { dirs } = require('./dirs');
-const { setupBuildYarnrc } = require('./setupBuildYarnrc');
-const yarn = process.platform === 'win32' ? 'yarn.cmd' : 'yarn';
+const npm = process.platform === 'win32' ? 'npm.cmd' : 'npm';
 const root = path.dirname(path.dirname(__dirname));
 
+function log(dir, message) {
+	if (process.stdout.isTTY) {
+		console.log(`\x1b[34m[${dir}]\x1b[0m`, message);
+	} else {
+		console.log(`[${dir}]`, message);
+	}
+}
+
 function run(command, args, opts) {
-	console.log('$ ' + command + ' ' + args.join(' '));
+	log(opts.cwd || '.', '$ ' + command + ' ' + args.join(' '));
 
 	const result = cp.spawnSync(command, args, opts);
 
@@ -30,7 +37,7 @@ function run(command, args, opts) {
  * @param {string} dir
  * @param {*} [opts]
  */
-function yarnInstall(dir, opts) {
+function npmInstall(dir, opts) {
 	opts = {
 		env: { ...process.env },
 		...(opts ?? {}),
@@ -39,97 +46,95 @@ function yarnInstall(dir, opts) {
 		shell: true
 	};
 
-	const raw = process.env['npm_config_argv'] || '{}';
-	const argv = JSON.parse(raw);
-	const original = argv.original || [];
-	const args = original.filter(arg => arg === '--ignore-optional' || arg === '--frozen-lockfile' || arg === '--check-files');
-
-	if (opts.ignoreEngines) {
-		args.push('--ignore-engines');
-		delete opts.ignoreEngines;
-	}
+	const command = process.env['npm_command'] || 'install';
 
 	if (process.env['VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME'] && /^(.build\/distro\/npm\/)?remote$/.test(dir)) {
 		const userinfo = os.userInfo();
-		console.log(`Installing dependencies in ${dir} inside container ${process.env['VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME']}...`);
+		log(dir, `Installing dependencies inside container ${process.env['VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME']}...`);
 
 		opts.cwd = root;
-		if (process.env['npm_config_arch'] === 'arm64' || process.env['npm_config_arch'] === 'arm') {
+		if (process.env['npm_config_arch'] === 'arm64') {
 			run('sudo', ['docker', 'run', '--rm', '--privileged', 'multiarch/qemu-user-static', '--reset', '-p', 'yes'], opts);
 		}
-		if (process.env['npm_config_arch'] === 'arm') {
-			run('sudo', ['docker', 'run', '-e', 'GITHUB_TOKEN', '-e', 'npm_config_arch', '-v', `${process.env['VSCODE_HOST_MOUNT']}:/home/builduser`, '-v', `${process.env['VSCODE_HOST_MOUNT']}/.build/.netrc:/home/builduser/.netrc`, process.env['VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME'], 'yarn', '--cwd', dir, ...args], opts);
-		} else {
-			run('sudo', ['docker', 'run', '-e', 'GITHUB_TOKEN', '-e', 'npm_config_arch', '-v', `${process.env['VSCODE_HOST_MOUNT']}:/root/vscode`, '-v', `${process.env['VSCODE_HOST_MOUNT']}/.build/.netrc:/root/.netrc`, process.env['VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME'], 'yarn', '--cwd', dir, ...args], opts);
-		}
-		run('sudo', ['chown', '-R', `${userinfo.uid}:${userinfo.gid}`, `${dir}/node_modules`], opts);
+		run('sudo', ['docker', 'run', '-e', 'GITHUB_TOKEN', '-v', `${process.env['VSCODE_HOST_MOUNT']}:/root/vscode`, '-v', `${process.env['VSCODE_HOST_MOUNT']}/.build/.netrc:/root/.netrc`, '-w', path.resolve('/root/vscode', dir), process.env['VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME'], 'sh', '-c', `\"chown -R root:root ${path.resolve('/root/vscode', dir)} && npm i -g node-gyp-build && npm ci\"`], opts);
+		run('sudo', ['chown', '-R', `${userinfo.uid}:${userinfo.gid}`, `${path.resolve(root, dir)}`], opts);
 	} else {
-		console.log(`Installing dependencies in ${dir}...`);
-		run(yarn, args, opts);
+		log(dir, 'Installing dependencies...');
+		run(npm, [command], opts);
+	}
+}
+
+function setNpmrcConfig(dir, env) {
+	const npmrcPath = path.join(root, dir, '.npmrc');
+	const lines = fs.readFileSync(npmrcPath, 'utf8').split('\n');
+
+	for (const line of lines) {
+		const trimmedLine = line.trim();
+		if (trimmedLine && !trimmedLine.startsWith('#')) {
+			const [key, value] = trimmedLine.split('=');
+			env[`npm_config_${key}`] = value.replace(/^"(.*)"$/, '$1');
+		}
+	}
+
+	if (dir === 'build') {
+		env['npm_config_target'] = process.versions.node;
+		env['npm_config_arch'] = process.arch;
 	}
 }
 
 for (let dir of dirs) {
 
 	if (dir === '') {
-		// `yarn` already executed in root
-		continue;
-	}
-
-	if (/^.build\/distro\/npm(\/?)/.test(dir)) {
-		const ossPath = path.relative('.build/distro/npm', dir);
-		const ossYarnRc = path.join(ossPath, '.yarnrc');
-
-		if (fs.existsSync(ossYarnRc)) {
-			fs.cpSync(ossYarnRc, path.join(dir, '.yarnrc'));
-		}
-	}
-
-	if (/^(.build\/distro\/npm\/)?remote/.test(dir) && process.platform === 'win32' && (process.arch === 'arm64' || process.env['npm_config_arch'] === 'arm64')) {
-		// windows arm: do not execute `yarn` on remote folder
+		// already executed in root
 		continue;
 	}
 
 	let opts;
 
 	if (dir === 'build') {
-		const env = { ...process.env };
-		setupBuildYarnrc();
-		opts = { env };
-		if (process.env['CC']) { env['CC'] = 'gcc'; }
-		if (process.env['CXX']) { env['CXX'] = 'g++'; }
-		if (process.env['CXXFLAGS']) { env['CXXFLAGS'] = ''; }
-		if (process.env['LDFLAGS']) { env['LDFLAGS'] = ''; }
-		yarnInstall('build', opts);
+		opts = {
+			env: {
+				...process.env
+			},
+		}
+		if (process.env['CC']) { opts.env['CC'] = 'gcc'; }
+		if (process.env['CXX']) { opts.env['CXX'] = 'g++'; }
+		if (process.env['CXXFLAGS']) { opts.env['CXXFLAGS'] = ''; }
+		if (process.env['LDFLAGS']) { opts.env['LDFLAGS'] = ''; }
+
+		setNpmrcConfig('build', opts.env);
+		npmInstall('build', opts);
 		continue;
 	}
 
 	if (/^(.build\/distro\/npm\/)?remote$/.test(dir)) {
 		// node modules used by vscode server
-		const env = { ...process.env };
+		opts = {
+			env: {
+				...process.env
+			},
+		}
 		if (process.env['VSCODE_REMOTE_CC']) {
-			env['CC'] = process.env['VSCODE_REMOTE_CC'];
+			opts.env['CC'] = process.env['VSCODE_REMOTE_CC'];
 		} else {
-			delete env['CC'];
+			delete opts.env['CC'];
 		}
 		if (process.env['VSCODE_REMOTE_CXX']) {
-			env['CXX'] = process.env['VSCODE_REMOTE_CXX'];
+			opts.env['CXX'] = process.env['VSCODE_REMOTE_CXX'];
 		} else {
-			delete env['CXX'];
+			delete opts.env['CXX'];
 		}
-		if (process.env['CXXFLAGS']) { delete env['CXXFLAGS']; }
-		if (process.env['CFLAGS']) { delete env['CFLAGS']; }
-		if (process.env['LDFLAGS']) { delete env['LDFLAGS']; }
-		if (process.env['VSCODE_REMOTE_CXXFLAGS']) { env['CXXFLAGS'] = process.env['VSCODE_REMOTE_CXXFLAGS']; }
-		if (process.env['VSCODE_REMOTE_LDFLAGS']) { env['LDFLAGS'] = process.env['VSCODE_REMOTE_LDFLAGS']; }
-		if (process.env['VSCODE_REMOTE_NODE_GYP']) { env['npm_config_node_gyp'] = process.env['VSCODE_REMOTE_NODE_GYP']; }
+		if (process.env['CXXFLAGS']) { delete opts.env['CXXFLAGS']; }
+		if (process.env['CFLAGS']) { delete opts.env['CFLAGS']; }
+		if (process.env['LDFLAGS']) { delete opts.env['LDFLAGS']; }
+		if (process.env['VSCODE_REMOTE_CXXFLAGS']) { opts.env['CXXFLAGS'] = process.env['VSCODE_REMOTE_CXXFLAGS']; }
+		if (process.env['VSCODE_REMOTE_LDFLAGS']) { opts.env['LDFLAGS'] = process.env['VSCODE_REMOTE_LDFLAGS']; }
+		if (process.env['VSCODE_REMOTE_NODE_GYP']) { opts.env['npm_config_node_gyp'] = process.env['VSCODE_REMOTE_NODE_GYP']; }
 
-		opts = { env };
-	} else if (/^extensions\//.test(dir)) {
-		opts = { ignoreEngines: true };
+		setNpmrcConfig('remote', opts.env);
 	}
 
-	yarnInstall(dir, opts);
+	npmInstall(dir, opts);
 }
 
 cp.execSync('git config pull.rebase merges');
diff --git a/build/npm/preinstall.js b/build/npm/preinstall.js
index fdb01f579d6..b98f22977bf 100644
--- a/build/npm/preinstall.js
+++ b/build/npm/preinstall.js
@@ -2,7 +2,6 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-let err = false;
 
 const nodeVersion = /^(\d+)\.(\d+)\.(\d+)/.exec(process.versions.node);
 const majorNodeVersion = parseInt(nodeVersion[1]);
@@ -12,48 +11,25 @@ const patchNodeVersion = parseInt(nodeVersion[3]);
 if (!process.env['VSCODE_SKIP_NODE_VERSION_CHECK']) {
 	if (majorNodeVersion < 20) {
 		console.error('\x1b[1;31m*** Please use latest Node.js v20 LTS for development.\x1b[0;0m');
-		err = true;
+		throw new Error();
 	}
 }
 
+if (process.env['npm_execpath'].includes('yarn')) {
+	console.error('\x1b[1;31m*** Seems like you are using `yarn` which is not supported in this repo any more, please use `npm i` instead. ***\x1b[0;0m');
+	throw new Error();
+}
+
 const path = require('path');
 const fs = require('fs');
 const cp = require('child_process');
-const yarnVersion = cp.execSync('yarn -v', { encoding: 'utf8' }).trim();
-const parsedYarnVersion = /^(\d+)\.(\d+)\.(\d+)/.exec(yarnVersion);
-const majorYarnVersion = parseInt(parsedYarnVersion[1]);
-const minorYarnVersion = parseInt(parsedYarnVersion[2]);
-const patchYarnVersion = parseInt(parsedYarnVersion[3]);
-
-if (
-	majorYarnVersion < 1 ||
-	majorYarnVersion === 1 && (
-		minorYarnVersion < 10 || (minorYarnVersion === 10 && patchYarnVersion < 1)
-	) ||
-	majorYarnVersion >= 2
-) {
-	console.error('\x1b[1;31m*** Please use yarn >=1.10.1 and <2.\x1b[0;0m');
-	err = true;
-}
-
-if (!/yarn[\w-.]*\.c?js$|yarnpkg$/.test(process.env['npm_execpath'])) {
-	console.error('\x1b[1;31m*** Please use yarn to install dependencies.\x1b[0;0m');
-	err = true;
-}
 
 if (process.platform === 'win32') {
 	if (!hasSupportedVisualStudioVersion()) {
 		console.error('\x1b[1;31m*** Invalid C/C++ Compiler Toolchain. Please check https://github.com/microsoft/vscode/wiki/How-to-Contribute#prerequisites.\x1b[0;0m');
-		err = true;
+		throw new Error();
 	}
-	if (!err) {
-		installHeaders();
-	}
-}
-
-if (err) {
-	console.error('');
-	process.exit(1);
+	installHeaders();
 }
 
 function hasSupportedVisualStudioVersion() {
@@ -73,9 +49,9 @@ function hasSupportedVisualStudioVersion() {
 		const programFiles86Path = process.env['ProgramFiles(x86)'];
 		const programFiles64Path = process.env['ProgramFiles'];
 
+		const vsTypes = ['Enterprise', 'Professional', 'Community', 'Preview', 'BuildTools', 'IntPreview'];
 		if (programFiles64Path) {
 			vsPath = `${programFiles64Path}/Microsoft Visual Studio/${version}`;
-			const vsTypes = ['Enterprise', 'Professional', 'Community', 'Preview', 'BuildTools'];
 			if (vsTypes.some(vsType => fs.existsSync(path.join(vsPath, vsType)))) {
 				availableVersions.push(version);
 				break;
@@ -84,7 +60,6 @@ function hasSupportedVisualStudioVersion() {
 
 		if (programFiles86Path) {
 			vsPath = `${programFiles86Path}/Microsoft Visual Studio/${version}`;
-			const vsTypes = ['Enterprise', 'Professional', 'Community', 'Preview', 'BuildTools'];
 			if (vsTypes.some(vsType => fs.existsSync(path.join(vsPath, vsType)))) {
 				availableVersions.push(version);
 				break;
@@ -95,47 +70,28 @@ function hasSupportedVisualStudioVersion() {
 }
 
 function installHeaders() {
-	const yarn = 'yarn.cmd';
-	const yarnResult = cp.spawnSync(yarn, ['install'], {
+	cp.execSync(`npm.cmd ${process.env['npm_command'] || 'ci'}`, {
 		env: process.env,
 		cwd: path.join(__dirname, 'gyp'),
-		stdio: 'inherit',
-		shell: true
+		stdio: 'inherit'
 	});
-	if (yarnResult.error || yarnResult.status !== 0) {
-		console.error(`Installing node-gyp failed`);
-		err = true;
-		return;
-	}
 
-	// The node gyp package got installed using the above yarn command using the gyp/package.json
+	// The node gyp package got installed using the above npm command using the gyp/package.json
 	// file checked into our repository. So from that point it is save to construct the path
 	// to that executable
 	const node_gyp = path.join(__dirname, 'gyp', 'node_modules', '.bin', 'node-gyp.cmd');
 	const result = cp.execFileSync(node_gyp, ['list'], { encoding: 'utf8', shell: true });
 	const versions = new Set(result.split(/\n/g).filter(line => !line.startsWith('gyp info')).map(value => value));
 
-	const local = getHeaderInfo(path.join(__dirname, '..', '..', '.yarnrc'));
-	const remote = getHeaderInfo(path.join(__dirname, '..', '..', 'remote', '.yarnrc'));
+	const local = getHeaderInfo(path.join(__dirname, '..', '..', '.npmrc'));
+	const remote = getHeaderInfo(path.join(__dirname, '..', '..', 'remote', '.npmrc'));
 
 	if (local !== undefined && !versions.has(local.target)) {
 		// Both disturl and target come from a file checked into our repository
 		cp.execFileSync(node_gyp, ['install', '--dist-url', local.disturl, local.target], { shell: true });
 	}
 
-	// Avoid downloading headers for Windows arm64 till we move to Nodejs v19 in remote
-	// which is the first official release with support for the architecture. Downloading
-	// the headers for older versions now redirect to https://origin.nodejs.org/404.html
-	// which causes checksum validation error in node-gyp.
-	//
-	// gyp http 200 https://origin.nodejs.org/404.html
-	// gyp WARN install got an error, rolling back install
-	// gyp ERR! install error
-	// gyp ERR! stack Error: win-arm64/node.lib local checksum 4c62bed7a032f7b36984321b7ffdd60b596fac870672037ff879ae9ac9548fb7 not match remote undefined
-	//
-	if (remote !== undefined && !versions.has(remote.target) &&
-		process.env['npm_config_arch'] !== "arm64" &&
-		process.arch !== "arm64") {
+	if (remote !== undefined && !versions.has(remote.target)) {
 		// Both disturl and target come from a file checked into our repository
 		cp.execFileSync(node_gyp, ['install', '--dist-url', remote.disturl, remote.target], { shell: true });
 	}
@@ -149,11 +105,11 @@ function getHeaderInfo(rcFile) {
 	const lines = fs.readFileSync(rcFile, 'utf8').split(/\r\n?/g);
 	let disturl, target;
 	for (const line of lines) {
-		let match = line.match(/\s*disturl\s*\"(.*)\"\s*$/);
+		let match = line.match(/\s*disturl=*\"(.*)\"\s*$/);
 		if (match !== null && match.length >= 1) {
 			disturl = match[1];
 		}
-		match = line.match(/\s*target\s*\"(.*)\"\s*$/);
+		match = line.match(/\s*target=*\"(.*)\"\s*$/);
 		if (match !== null && match.length >= 1) {
 			target = match[1];
 		}
diff --git a/build/npm/setupBuildYarnrc.js b/build/npm/setupBuildYarnrc.js
deleted file mode 100644
index f8027dcfcb0..00000000000
--- a/build/npm/setupBuildYarnrc.js
+++ /dev/null
@@ -1,25 +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 path = require('path');
-const fs = require('fs');
-
-// make sure we install the deps of build for the system installed
-// node, since that is the driver of gulp
-function setupBuildYarnrc() {
-	const yarnrcPath = path.join(path.dirname(__dirname), '.yarnrc');
-	const yarnrc = `disturl "https://nodejs.org/download/release"
-target "${process.versions.node}"
-runtime "node"
-arch "${process.arch}"`;
-
-	fs.writeFileSync(yarnrcPath, yarnrc, 'utf8');
-}
-
-exports.setupBuildYarnrc = setupBuildYarnrc;
-
-if (require.main === module) {
-	setupBuildYarnrc();
-}
diff --git a/build/npm/update-all-grammars.mjs b/build/npm/update-all-grammars.mjs
index e0d34e42beb..7e303a655f7 100644
--- a/build/npm/update-all-grammars.mjs
+++ b/build/npm/update-all-grammars.mjs
@@ -16,7 +16,7 @@ async function spawn(cmd, args, opts) {
 }
 
 async function main() {
-	await spawn('yarn', [], { cwd: 'extensions' });
+	await spawn('npm', ['ci'], { cwd: 'extensions' });
 
 	for (const extension of readdirSync('extensions')) {
 		try {
diff --git a/build/package-lock.json b/build/package-lock.json
new file mode 100644
index 00000000000..4499f7cf541
--- /dev/null
+++ b/build/package-lock.json
@@ -0,0 +1,4630 @@
+{
+  "name": "code-oss-dev-build",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "code-oss-dev-build",
+      "version": "1.0.0",
+      "license": "MIT",
+      "devDependencies": {
+        "@azure/cosmos": "^3",
+        "@azure/identity": "^4.2.1",
+        "@azure/storage-blob": "^12.17.0",
+        "@electron/get": "^2.0.0",
+        "@types/ansi-colors": "^3.2.0",
+        "@types/byline": "^4.2.32",
+        "@types/debounce": "^1.0.0",
+        "@types/debug": "^4.1.5",
+        "@types/fancy-log": "^1.3.0",
+        "@types/fs-extra": "^9.0.12",
+        "@types/glob": "^7.1.1",
+        "@types/gulp": "^4.0.17",
+        "@types/gulp-concat": "^0.0.32",
+        "@types/gulp-filter": "^3.0.32",
+        "@types/gulp-gzip": "^0.0.31",
+        "@types/gulp-json-editor": "^2.2.31",
+        "@types/gulp-rename": "^0.0.33",
+        "@types/gulp-sort": "^2.0.4",
+        "@types/gulp-sourcemaps": "^0.0.32",
+        "@types/mime": "0.0.29",
+        "@types/minimatch": "^3.0.3",
+        "@types/minimist": "^1.2.1",
+        "@types/mocha": "^9.1.1",
+        "@types/node": "20.x",
+        "@types/pump": "^1.0.1",
+        "@types/rimraf": "^2.0.4",
+        "@types/through": "^0.0.29",
+        "@types/through2": "^2.0.36",
+        "@types/tmp": "^0.2.1",
+        "@types/workerpool": "^6.4.0",
+        "@types/xml2js": "0.0.33",
+        "@vscode/iconv-lite-umd": "0.7.0",
+        "@vscode/vsce": "2.20.1",
+        "byline": "^5.0.0",
+        "colors": "^1.4.0",
+        "commander": "^7.0.0",
+        "debug": "^4.3.2",
+        "electron-osx-sign": "^0.4.16",
+        "esbuild": "0.23.0",
+        "extract-zip": "^2.0.1",
+        "gulp-merge-json": "^2.1.1",
+        "gulp-sort": "^2.0.0",
+        "jsonc-parser": "^2.3.0",
+        "mime": "^1.4.1",
+        "source-map": "0.6.1",
+        "ternary-stream": "^3.0.0",
+        "through2": "^4.0.2",
+        "tmp": "^0.2.1",
+        "vscode-universal-bundler": "^0.1.3",
+        "workerpool": "^6.4.0",
+        "yauzl": "^2.10.0"
+      },
+      "optionalDependencies": {
+        "tree-sitter": "^0.20.5",
+        "tree-sitter-typescript": "^0.20.5",
+        "vscode-gulp-watch": "^5.0.3"
+      }
+    },
+    "node_modules/@azure/abort-controller": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-1.0.2.tgz",
+      "integrity": "sha512-XUyTo+bcyxHEf+jlN2MXA7YU9nxVehaubngHV1MIZZaqYmZqykkoeAz/JMMEeR7t3TcyDwbFa3Zw8BZywmIx4g==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@azure/core-asynciterator-polyfill": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@azure/core-asynciterator-polyfill/-/core-asynciterator-polyfill-1.0.0.tgz",
+      "integrity": "sha512-kmv8CGrPfN9SwMwrkiBK9VTQYxdFQEGe0BmQk+M8io56P9KNzpAxcWE/1fxJj7uouwN4kXF0BHW8DNlgx+wtCg==",
+      "dev": true
+    },
+    "node_modules/@azure/core-auth": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.5.0.tgz",
+      "integrity": "sha512-udzoBuYG1VBoHVohDTrvKjyzel34zt77Bhp7dQntVGGD0ehVq48owENbBG8fIgkHRNUBQH5k1r0hpoMu5L8+kw==",
+      "dev": true,
+      "dependencies": {
+        "@azure/abort-controller": "^1.0.0",
+        "@azure/core-util": "^1.1.0",
+        "tslib": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@azure/core-client": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@azure/core-client/-/core-client-1.5.0.tgz",
+      "integrity": "sha512-YNk8i9LT6YcFdFO+RRU0E4Ef+A8Y5lhXo6lz61rwbG8Uo7kSqh0YqK04OexiilM43xd6n3Y9yBhLnb1NFNI9dA==",
+      "dev": true,
+      "dependencies": {
+        "@azure/abort-controller": "^1.0.0",
+        "@azure/core-asynciterator-polyfill": "^1.0.0",
+        "@azure/core-auth": "^1.3.0",
+        "@azure/core-rest-pipeline": "^1.5.0",
+        "@azure/core-tracing": "1.0.0-preview.13",
+        "@azure/logger": "^1.0.0",
+        "tslib": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@azure/core-client/node_modules/@azure/core-tracing": {
+      "version": "1.0.0-preview.13",
+      "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.0.0-preview.13.tgz",
+      "integrity": "sha512-KxDlhXyMlh2Jhj2ykX6vNEU0Vou4nHr025KoSEiz7cS3BNiHNaZcdECk/DmLkEB0as5T7b/TpRcehJ5yV6NeXQ==",
+      "dev": true,
+      "dependencies": {
+        "@opentelemetry/api": "^1.0.1",
+        "tslib": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@azure/core-http": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@azure/core-http/-/core-http-3.0.4.tgz",
+      "integrity": "sha512-Fok9VVhMdxAFOtqiiAtg74fL0UJkt0z3D+ouUUxcRLzZNBioPRAMJFVxiWoJljYpXsRi4GDQHzQHDc9AiYaIUQ==",
+      "deprecated": "deprecating as we migrated to core v2",
+      "dev": true,
+      "dependencies": {
+        "@azure/abort-controller": "^1.0.0",
+        "@azure/core-auth": "^1.3.0",
+        "@azure/core-tracing": "1.0.0-preview.13",
+        "@azure/core-util": "^1.1.1",
+        "@azure/logger": "^1.0.0",
+        "@types/node-fetch": "^2.5.0",
+        "@types/tunnel": "^0.0.3",
+        "form-data": "^4.0.0",
+        "node-fetch": "^2.6.7",
+        "process": "^0.11.10",
+        "tslib": "^2.2.0",
+        "tunnel": "^0.0.6",
+        "uuid": "^8.3.0",
+        "xml2js": "^0.5.0"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@azure/core-http/node_modules/@azure/core-tracing": {
+      "version": "1.0.0-preview.13",
+      "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.0.0-preview.13.tgz",
+      "integrity": "sha512-KxDlhXyMlh2Jhj2ykX6vNEU0Vou4nHr025KoSEiz7cS3BNiHNaZcdECk/DmLkEB0as5T7b/TpRcehJ5yV6NeXQ==",
+      "dev": true,
+      "dependencies": {
+        "@opentelemetry/api": "^1.0.1",
+        "tslib": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@azure/core-lro": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.2.1.tgz",
+      "integrity": "sha512-HE6PBl+mlKa0eBsLwusHqAqjLc5n9ByxeDo3Hz4kF3B1hqHvRkBr4oMgoT6tX7Hc3q97KfDctDUon7EhvoeHPA==",
+      "dev": true,
+      "dependencies": {
+        "@azure/abort-controller": "^1.0.0",
+        "@azure/core-tracing": "1.0.0-preview.13",
+        "@azure/logger": "^1.0.0",
+        "tslib": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@azure/core-lro/node_modules/@azure/core-tracing": {
+      "version": "1.0.0-preview.13",
+      "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.0.0-preview.13.tgz",
+      "integrity": "sha512-KxDlhXyMlh2Jhj2ykX6vNEU0Vou4nHr025KoSEiz7cS3BNiHNaZcdECk/DmLkEB0as5T7b/TpRcehJ5yV6NeXQ==",
+      "dev": true,
+      "dependencies": {
+        "@opentelemetry/api": "^1.0.1",
+        "tslib": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@azure/core-paging": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@azure/core-paging/-/core-paging-1.1.3.tgz",
+      "integrity": "sha512-his7Ah40ThEYORSpIAwuh6B8wkGwO/zG7gqVtmSE4WAJ46e36zUDXTKReUCLBDc6HmjjApQQxxcRFy5FruG79A==",
+      "dev": true,
+      "dependencies": {
+        "@azure/core-asynciterator-polyfill": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@azure/core-rest-pipeline": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.7.0.tgz",
+      "integrity": "sha512-e2awPzwMKHrmvYgZ0qIKNkqnCM1QoDs7A0rOiS3OSAlOQOz/kL7PPKHXwFMuBeaRvS8i7fgobJn79q2Cji5f+Q==",
+      "dev": true,
+      "dependencies": {
+        "@azure/abort-controller": "^1.0.0",
+        "@azure/core-auth": "^1.3.0",
+        "@azure/core-tracing": "1.0.0-preview.13",
+        "@azure/logger": "^1.0.0",
+        "form-data": "^4.0.0",
+        "http-proxy-agent": "^4.0.1",
+        "https-proxy-agent": "^5.0.0",
+        "tslib": "^2.2.0",
+        "uuid": "^8.3.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@azure/core-rest-pipeline/node_modules/@azure/core-tracing": {
+      "version": "1.0.0-preview.13",
+      "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.0.0-preview.13.tgz",
+      "integrity": "sha512-KxDlhXyMlh2Jhj2ykX6vNEU0Vou4nHr025KoSEiz7cS3BNiHNaZcdECk/DmLkEB0as5T7b/TpRcehJ5yV6NeXQ==",
+      "dev": true,
+      "dependencies": {
+        "@opentelemetry/api": "^1.0.1",
+        "tslib": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@azure/core-tracing": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.0.1.tgz",
+      "integrity": "sha512-I5CGMoLtX+pI17ZdiFJZgxMJApsK6jjfm85hpgp3oazCdq5Wxgh4wMr7ge/TTWW1B5WBuvIOI1fMU/FrOAMKrw==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@azure/core-util": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@azure/core-util/-/core-util-1.9.0.tgz",
+      "integrity": "sha512-AfalUQ1ZppaKuxPPMsFEUdX6GZPB3d9paR9d/TTL7Ow2De8cJaC7ibi7kWVlFAVPCYo31OcnGymc0R89DX8Oaw==",
+      "dev": true,
+      "dependencies": {
+        "@azure/abort-controller": "^2.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@azure/core-util/node_modules/@azure/abort-controller": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-2.1.2.tgz",
+      "integrity": "sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@azure/cosmos": {
+      "version": "3.17.3",
+      "resolved": "https://registry.npmjs.org/@azure/cosmos/-/cosmos-3.17.3.tgz",
+      "integrity": "sha512-wBglkQ6Irjv5Vo2iw8fd6eYj60WYRSSg4/0DBkeOP6BwQ4RA91znsOHd6s3qG6UAbNgYuzC9Nnq07vlFFZkHEw==",
+      "dev": true,
+      "dependencies": {
+        "@azure/abort-controller": "^1.0.0",
+        "@azure/core-auth": "^1.3.0",
+        "@azure/core-rest-pipeline": "^1.2.0",
+        "@azure/core-tracing": "^1.0.0",
+        "debug": "^4.1.1",
+        "fast-json-stable-stringify": "^2.1.0",
+        "jsbi": "^3.1.3",
+        "node-abort-controller": "^3.0.0",
+        "priorityqueuejs": "^1.0.0",
+        "semaphore": "^1.0.5",
+        "tslib": "^2.2.0",
+        "universal-user-agent": "^6.0.0",
+        "uuid": "^8.3.0"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@azure/identity": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@azure/identity/-/identity-4.2.1.tgz",
+      "integrity": "sha512-U8hsyC9YPcEIzoaObJlRDvp7KiF0MGS7xcWbyJSVvXRkC/HXo1f0oYeBYmEvVgRfacw7GHf6D6yAoh9JHz6A5Q==",
+      "dev": true,
+      "dependencies": {
+        "@azure/abort-controller": "^1.0.0",
+        "@azure/core-auth": "^1.5.0",
+        "@azure/core-client": "^1.4.0",
+        "@azure/core-rest-pipeline": "^1.1.0",
+        "@azure/core-tracing": "^1.0.0",
+        "@azure/core-util": "^1.3.0",
+        "@azure/logger": "^1.0.0",
+        "@azure/msal-browser": "^3.11.1",
+        "@azure/msal-node": "^2.9.2",
+        "events": "^3.0.0",
+        "jws": "^4.0.0",
+        "open": "^8.0.0",
+        "stoppable": "^1.1.0",
+        "tslib": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@azure/logger": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@azure/logger/-/logger-1.0.1.tgz",
+      "integrity": "sha512-QYQeaJ+A5x6aMNu8BG5qdsVBnYBop9UMwgUvGihSjf1PdZZXB+c/oMdM2ajKwzobLBh9e9QuMQkN9iL+IxLBLA==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@azure/msal-browser": {
+      "version": "3.17.0",
+      "resolved": "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-3.17.0.tgz",
+      "integrity": "sha512-csccKXmW2z7EkZ0I3yAoW/offQt+JECdTIV/KrnRoZyM7wCSsQWODpwod8ZhYy7iOyamcHApR9uCh0oD1M+0/A==",
+      "dev": true,
+      "dependencies": {
+        "@azure/msal-common": "14.12.0"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/@azure/msal-common": {
+      "version": "14.12.0",
+      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.12.0.tgz",
+      "integrity": "sha512-IDDXmzfdwmDkv4SSmMEyAniJf6fDu3FJ7ncOjlxkDuT85uSnLEhZi3fGZpoR7T4XZpOMx9teM9GXBgrfJgyeBw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/@azure/msal-node": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.9.2.tgz",
+      "integrity": "sha512-8tvi6Cos3m+0KmRbPjgkySXi+UQU/QiuVRFnrxIwt5xZlEEFa69O04RTaNESGgImyBBlYbo2mfE8/U8Bbdk1WQ==",
+      "dev": true,
+      "dependencies": {
+        "@azure/msal-common": "14.12.0",
+        "jsonwebtoken": "^9.0.0",
+        "uuid": "^8.3.0"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@azure/storage-blob": {
+      "version": "12.17.0",
+      "resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.17.0.tgz",
+      "integrity": "sha512-sM4vpsCpcCApagRW5UIjQNlNylo02my2opgp0Emi8x888hZUvJ3dN69Oq20cEGXkMUWnoCrBaB0zyS3yeB87sQ==",
+      "dev": true,
+      "dependencies": {
+        "@azure/abort-controller": "^1.0.0",
+        "@azure/core-http": "^3.0.0",
+        "@azure/core-lro": "^2.2.0",
+        "@azure/core-paging": "^1.1.1",
+        "@azure/core-tracing": "1.0.0-preview.13",
+        "@azure/logger": "^1.0.0",
+        "events": "^3.0.0",
+        "tslib": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@azure/storage-blob/node_modules/@azure/core-tracing": {
+      "version": "1.0.0-preview.13",
+      "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.0.0-preview.13.tgz",
+      "integrity": "sha512-KxDlhXyMlh2Jhj2ykX6vNEU0Vou4nHr025KoSEiz7cS3BNiHNaZcdECk/DmLkEB0as5T7b/TpRcehJ5yV6NeXQ==",
+      "dev": true,
+      "dependencies": {
+        "@opentelemetry/api": "^1.0.1",
+        "tslib": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@electron/asar": {
+      "version": "3.2.10",
+      "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.2.10.tgz",
+      "integrity": "sha512-mvBSwIBUeiRscrCeJE1LwctAriBj65eUDm0Pc11iE5gRwzkmsdbS7FnZ1XUWjpSeQWL1L5g12Fc/SchPM9DUOw==",
+      "dev": true,
+      "dependencies": {
+        "commander": "^5.0.0",
+        "glob": "^7.1.6",
+        "minimatch": "^3.0.4"
+      },
+      "bin": {
+        "asar": "bin/asar.js"
+      },
+      "engines": {
+        "node": ">=10.12.0"
+      }
+    },
+    "node_modules/@electron/asar/node_modules/commander": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
+      "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/@electron/get": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.3.tgz",
+      "integrity": "sha512-Qkzpg2s9GnVV2I2BjRksUi43U5e6+zaQMcjoJy0C+C5oxaKl+fmckGDQFtRpZpZV0NQekuZZ+tGz7EA9TVnQtQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.1",
+        "env-paths": "^2.2.0",
+        "fs-extra": "^8.1.0",
+        "got": "^11.8.5",
+        "progress": "^2.0.3",
+        "semver": "^6.2.0",
+        "sumchecker": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "global-agent": "^3.0.0"
+      }
+    },
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.23.0.tgz",
+      "integrity": "sha512-3sG8Zwa5fMcA9bgqB8AfWPQ+HFke6uD3h1s3RIwUNK8EG7a4buxvuFTs3j1IMs2NXAk9F30C/FF4vxRgQCcmoQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.23.0.tgz",
+      "integrity": "sha512-+KuOHTKKyIKgEEqKbGTK8W7mPp+hKinbMBeEnNzjJGyFcWsfrXjSTNluJHCY1RqhxFurdD8uNXQDei7qDlR6+g==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.23.0.tgz",
+      "integrity": "sha512-EuHFUYkAVfU4qBdyivULuu03FhJO4IJN9PGuABGrFy4vUuzk91P2d+npxHcFdpUnfYKy0PuV+n6bKIpHOB3prQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.23.0.tgz",
+      "integrity": "sha512-WRrmKidLoKDl56LsbBMhzTTBxrsVwTKdNbKDalbEZr0tcsBgCLbEtoNthOW6PX942YiYq8HzEnb4yWQMLQuipQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.23.0.tgz",
+      "integrity": "sha512-YLntie/IdS31H54Ogdn+v50NuoWF5BDkEUFpiOChVa9UnKpftgwzZRrI4J132ETIi+D8n6xh9IviFV3eXdxfow==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.23.0.tgz",
+      "integrity": "sha512-IMQ6eme4AfznElesHUPDZ+teuGwoRmVuuixu7sv92ZkdQcPbsNHzutd+rAfaBKo8YK3IrBEi9SLLKWJdEvJniQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.23.0.tgz",
+      "integrity": "sha512-0muYWCng5vqaxobq6LB3YNtevDFSAZGlgtLoAc81PjUfiFz36n4KMpwhtAd4he8ToSI3TGyuhyx5xmiWNYZFyw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.23.0.tgz",
+      "integrity": "sha512-XKDVu8IsD0/q3foBzsXGt/KjD/yTKBCIwOHE1XwiXmrRwrX6Hbnd5Eqn/WvDekddK21tfszBSrE/WMaZh+1buQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.23.0.tgz",
+      "integrity": "sha512-SEELSTEtOFu5LPykzA395Mc+54RMg1EUgXP+iw2SJ72+ooMwVsgfuwXo5Fn0wXNgWZsTVHwY2cg4Vi/bOD88qw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.23.0.tgz",
+      "integrity": "sha512-j1t5iG8jE7BhonbsEg5d9qOYcVZv/Rv6tghaXM/Ug9xahM0nX/H2gfu6X6z11QRTMT6+aywOMA8TDkhPo8aCGw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.23.0.tgz",
+      "integrity": "sha512-P7O5Tkh2NbgIm2R6x1zGJJsnacDzTFcRWZyTTMgFdVit6E98LTxO+v8LCCLWRvPrjdzXHx9FEOA8oAZPyApWUA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.23.0.tgz",
+      "integrity": "sha512-InQwepswq6urikQiIC/kkx412fqUZudBO4SYKu0N+tGhXRWUqAx+Q+341tFV6QdBifpjYgUndV1hhMq3WeJi7A==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.23.0.tgz",
+      "integrity": "sha512-J9rflLtqdYrxHv2FqXE2i1ELgNjT+JFURt/uDMoPQLcjWQA5wDKgQA4t/dTqGa88ZVECKaD0TctwsUfHbVoi4w==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.23.0.tgz",
+      "integrity": "sha512-cShCXtEOVc5GxU0fM+dsFD10qZ5UpcQ8AM22bYj0u/yaAykWnqXJDpd77ublcX6vdDsWLuweeuSNZk4yUxZwtw==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.23.0.tgz",
+      "integrity": "sha512-HEtaN7Y5UB4tZPeQmgz/UhzoEyYftbMXrBCUjINGjh3uil+rB/QzzpMshz3cNUxqXN7Vr93zzVtpIDL99t9aRw==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.23.0.tgz",
+      "integrity": "sha512-WDi3+NVAuyjg/Wxi+o5KPqRbZY0QhI9TjrEEm+8dmpY9Xir8+HE/HNx2JoLckhKbFopW0RdO2D72w8trZOV+Wg==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.23.0.tgz",
+      "integrity": "sha512-a3pMQhUEJkITgAw6e0bWA+F+vFtCciMjW/LPtoj99MhVt+Mfb6bbL9hu2wmTZgNd994qTAEw+U/r6k3qHWWaOQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.23.0.tgz",
+      "integrity": "sha512-cRK+YDem7lFTs2Q5nEv/HHc4LnrfBCbH5+JHu6wm2eP+d8OZNoSMYgPZJq78vqQ9g+9+nMuIsAO7skzphRXHyw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.23.0.tgz",
+      "integrity": "sha512-suXjq53gERueVWu0OKxzWqk7NxiUWSUlrxoZK7usiF50C6ipColGR5qie2496iKGYNLhDZkPxBI3erbnYkU0rQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.23.0.tgz",
+      "integrity": "sha512-6p3nHpby0DM/v15IFKMjAaayFhqnXV52aEmv1whZHX56pdkK+MEaLoQWj+H42ssFarP1PcomVhbsR4pkz09qBg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.23.0.tgz",
+      "integrity": "sha512-BFelBGfrBwk6LVrmFzCq1u1dZbG4zy/Kp93w2+y83Q5UGYF1d8sCzeLI9NXjKyujjBBniQa8R8PzLFAUrSM9OA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.23.0.tgz",
+      "integrity": "sha512-lY6AC8p4Cnb7xYHuIxQ6iYPe6MfO2CC43XXKo9nBXDb35krYt7KGhQnOkRGar5psxYkircpCqfbNDB4uJbS2jQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.23.0.tgz",
+      "integrity": "sha512-7L1bHlOTcO4ByvI7OXVI5pNN6HSu6pUQq9yodga8izeuB1KcT2UkHaH6118QJwopExPn0rMHIseCTx1CRo/uNA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.23.0.tgz",
+      "integrity": "sha512-Arm+WgUFLUATuoxCJcahGuk6Yj9Pzxd6l11Zb/2aAuv5kWWvvfhLFo2fni4uSK5vzlUdCGZ/BdV5tH8klj8p8g==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@malept/cross-spawn-promise": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz",
+      "integrity": "sha512-1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/malept"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/subscription/pkg/npm-.malept-cross-spawn-promise?utm_medium=referral&utm_source=npm_fund"
+        }
+      ],
+      "dependencies": {
+        "cross-spawn": "^7.0.1"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      }
+    },
+    "node_modules/@opentelemetry/api": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.0.3.tgz",
+      "integrity": "sha512-puWxACExDe9nxbBB3lOymQFrLYml2dVOrd7USiVRnSbgXE+KwBu+HxFvxrzfqsiSda9IWsXJG1ef7C1O2/GmKQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@sindresorhus/is": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
+      "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/is?sponsor=1"
+      }
+    },
+    "node_modules/@szmarczak/http-timer": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
+      "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
+      "dev": true,
+      "dependencies": {
+        "defer-to-connect": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@tootallnate/once": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/@types/ansi-colors": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/@types/ansi-colors/-/ansi-colors-3.2.0.tgz",
+      "integrity": "sha512-0caWAhXht9N2lOdMzJLXybsSkYCx1QOdxx6pae48tswI9QV3DFX26AoOpy0JxwhCb+zISTqmd6H8t9Zby9BoZg==",
+      "dev": true
+    },
+    "node_modules/@types/byline": {
+      "version": "4.2.32",
+      "resolved": "https://registry.npmjs.org/@types/byline/-/byline-4.2.32.tgz",
+      "integrity": "sha512-qtlm/J6XOO9p+Ep/ZB5+mCFEDhzWDDHWU4a1eReN7lkPZXW9rkloq2jcAhvKKmlO5tL2GSvKROb+PTsNVhBiyQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/cacheable-request": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz",
+      "integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==",
+      "dev": true,
+      "dependencies": {
+        "@types/http-cache-semantics": "*",
+        "@types/keyv": "^3.1.4",
+        "@types/node": "*",
+        "@types/responselike": "^1.0.0"
+      }
+    },
+    "node_modules/@types/debounce": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@types/debounce/-/debounce-1.0.0.tgz",
+      "integrity": "sha1-QXVgIAMx4buE1y2oU5EQLC/NYbc= sha512-B7FcD9ry40L831t7iuHQyDfYi+qVEV75qkEI2ROOyfjb2PfkAspL+NK6B2A0BceMuNhiYRmtKTNnNP7Ul4N2Pg==",
+      "dev": true
+    },
+    "node_modules/@types/debug": {
+      "version": "4.1.9",
+      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.9.tgz",
+      "integrity": "sha512-8Hz50m2eoS56ldRlepxSBa6PWEVCtzUo/92HgLc2qTMnotJNIm7xP+UZhyWoYsyOdd5dxZ+NZLb24rsKyFs2ow==",
+      "dev": true,
+      "dependencies": {
+        "@types/ms": "*"
+      }
+    },
+    "node_modules/@types/events": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@types/events/-/events-1.2.0.tgz",
+      "integrity": "sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA==",
+      "dev": true
+    },
+    "node_modules/@types/expect": {
+      "version": "1.20.4",
+      "resolved": "https://registry.npmjs.org/@types/expect/-/expect-1.20.4.tgz",
+      "integrity": "sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg==",
+      "dev": true
+    },
+    "node_modules/@types/fancy-log": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@types/fancy-log/-/fancy-log-1.3.0.tgz",
+      "integrity": "sha512-mQjDxyOM1Cpocd+vm1kZBP7smwKZ4TNokFeds9LV7OZibmPJFEzY3+xZMrKfUdNT71lv8GoCPD6upKwHxubClw==",
+      "dev": true
+    },
+    "node_modules/@types/fs-extra": {
+      "version": "9.0.12",
+      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.12.tgz",
+      "integrity": "sha512-I+bsBr67CurCGnSenZZ7v94gd3tc3+Aj2taxMT4yu4ABLuOgOjeFxX3dokG24ztSRg5tnT00sL8BszO7gSMoIw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/glob": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz",
+      "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==",
+      "dev": true,
+      "dependencies": {
+        "@types/events": "*",
+        "@types/minimatch": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/glob-stream": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@types/glob-stream/-/glob-stream-6.1.0.tgz",
+      "integrity": "sha512-RHv6ZQjcTncXo3thYZrsbAVwoy4vSKosSWhuhuQxLOTv74OJuFQxXkmUuZCr3q9uNBEVCvIzmZL/FeRNbHZGUg==",
+      "dev": true,
+      "dependencies": {
+        "@types/glob": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/gulp": {
+      "version": "4.0.17",
+      "resolved": "https://registry.npmjs.org/@types/gulp/-/gulp-4.0.17.tgz",
+      "integrity": "sha512-+pKQynu2C/HS16kgmDlAicjtFYP8kaa86eE9P0Ae7GB5W29we/E2TIdbOWtEZD5XkpY+jr8fyqfwO6SWZecLpQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "@types/undertaker": ">=1.2.6",
+        "@types/vinyl-fs": "*",
+        "chokidar": "^3.3.1"
+      }
+    },
+    "node_modules/@types/gulp-concat": {
+      "version": "0.0.32",
+      "resolved": "https://registry.npmjs.org/@types/gulp-concat/-/gulp-concat-0.0.32.tgz",
+      "integrity": "sha512-CUCFADlITzzBfBa2bdGzhKtvBr4eFh+evb+4igVbvPoO5RyPfHifmyQlZl6lM7q19+OKncRlFXDU7B4X9Ayo2g==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/gulp-filter": {
+      "version": "3.0.32",
+      "resolved": "https://registry.npmjs.org/@types/gulp-filter/-/gulp-filter-3.0.32.tgz",
+      "integrity": "sha512-JvY4qTxXehoK2yCUxYVxTMvckVbDM5TWHWeUoYJyX31gwFqw4YDD6JNzhuTxI3yHPUTY4BBRTqgm6puQEZVCNg==",
+      "dev": true,
+      "dependencies": {
+        "@types/minimatch": "*",
+        "@types/node": "*",
+        "@types/vinyl": "*"
+      }
+    },
+    "node_modules/@types/gulp-gzip": {
+      "version": "0.0.31",
+      "resolved": "https://registry.npmjs.org/@types/gulp-gzip/-/gulp-gzip-0.0.31.tgz",
+      "integrity": "sha512-KQjHz1FTqLse8/EiktfhN/vo33vamX4gVAQhMTp55STDBA7UToW5CJqYyP7iRorkHK9/aJ2nL2hLkNZkY4M8+w==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/gulp-json-editor": {
+      "version": "2.2.31",
+      "resolved": "https://registry.npmjs.org/@types/gulp-json-editor/-/gulp-json-editor-2.2.31.tgz",
+      "integrity": "sha512-piis0ImYAy0dt18R4EtTbAY+RV8jwTq5VisnUV6OfP8kD4743aHGkAdAd08No4NY3rFa5mD6ytIu8L0YU7nL9w==",
+      "dev": true,
+      "dependencies": {
+        "@types/js-beautify": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/gulp-rename": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/@types/gulp-rename/-/gulp-rename-0.0.33.tgz",
+      "integrity": "sha512-FIZQvbZJj6V1gHPTzO+g/BCWpDur7fJrroae4gwV3LaoHBQ+MrR9sB+2HssK8fHv4WdY6hVNxkcft9bYatuPIA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/gulp-sort": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@types/gulp-sort/-/gulp-sort-2.0.4.tgz",
+      "integrity": "sha512-HUHxH+oMox1ct0SnxPqCXBni0MSws1ygcSAoLO4ISRmR/UuvNIz40rgNveZxwxQk+p78kw09z/qKQkgKJmNUOQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/gulp-util": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/gulp-sourcemaps": {
+      "version": "0.0.32",
+      "resolved": "https://registry.npmjs.org/@types/gulp-sourcemaps/-/gulp-sourcemaps-0.0.32.tgz",
+      "integrity": "sha512-+7BAmptW2bxyJnJcCEuie7vLoop3FwWgCdBMzyv7MYXED/HeNMeQuX7uPCkp4vfU1TTu4CYFH0IckNPvo0VePA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/gulp-util": {
+      "version": "3.0.41",
+      "resolved": "https://registry.npmjs.org/@types/gulp-util/-/gulp-util-3.0.41.tgz",
+      "integrity": "sha512-BK0kJZ8euQNlISsmD6mBr/1RZkB0mljdtBsz2usv+QHPV10alH2AJw5p05S9LU6S+VdTjbFmGU0OxpH++2W9/Q==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "@types/through2": "*",
+        "@types/vinyl": "*",
+        "chalk": "^2.2.0"
+      }
+    },
+    "node_modules/@types/http-cache-semantics": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz",
+      "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==",
+      "dev": true
+    },
+    "node_modules/@types/js-beautify": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/@types/js-beautify/-/js-beautify-1.8.0.tgz",
+      "integrity": "sha512-/siF86XrwDKLuHe8l7h6NhrAWgLdgqbxmjZv9NvGWmgYRZoTipkjKiWb0SQHy/jcR+ee0GvbG6uGd+LEBMGNvA==",
+      "dev": true
+    },
+    "node_modules/@types/keyv": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz",
+      "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/mime": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-0.0.29.tgz",
+      "integrity": "sha1-+8/TMFc7kS71nu7hRgK/rOYwdUs= sha512-EqWQSlonwbNgLMq2dMkokuzv/pwevb4q0JrPjfc7zzieG/cpqt+HsCE9dYoQd1snp2zlksl6k3rQ4LLfyQbQdA==",
+      "dev": true
+    },
+    "node_modules/@types/minimatch": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
+      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
+      "dev": true
+    },
+    "node_modules/@types/minimist": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz",
+      "integrity": "sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==",
+      "dev": true
+    },
+    "node_modules/@types/mocha": {
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.1.tgz",
+      "integrity": "sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==",
+      "dev": true
+    },
+    "node_modules/@types/ms": {
+      "version": "0.7.32",
+      "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.32.tgz",
+      "integrity": "sha512-xPSg0jm4mqgEkNhowKgZFBNtwoEwF6gJ4Dhww+GFpm3IgtNseHQZ5IqdNwnquZEoANxyDAKDRAdVo4Z72VvD/g==",
+      "dev": true
+    },
+    "node_modules/@types/node": {
+      "version": "20.11.24",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
+      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/@types/node-fetch": {
+      "version": "2.5.8",
+      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.8.tgz",
+      "integrity": "sha512-fbjI6ja0N5ZA8TV53RUqzsKNkl9fv8Oj3T7zxW7FGv1GSH7gwJaNF8dzCjrqKaxKeUpTz4yT1DaJFq/omNpGfw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "form-data": "^3.0.0"
+      }
+    },
+    "node_modules/@types/node-fetch/node_modules/form-data": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz",
+      "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==",
+      "dev": true,
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/@types/pump": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@types/pump/-/pump-1.0.1.tgz",
+      "integrity": "sha1-roFXzv7wTRpNJMHMkdQDwvXaXNA= sha512-WGcg4jdczx60mEh0pWLUhw/2215BFYfSob5fHp/fJFZ+UFOiOxIqCnqRGSLWRsJ6Hvh4u2SBokxHDQ0wF9ujqQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/responselike": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.3.tgz",
+      "integrity": "sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/rimraf": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@types/rimraf/-/rimraf-2.0.4.tgz",
+      "integrity": "sha512-8gBudvllD2A/c0CcEX/BivIDorHFt5UI5m46TsNj8DjWCCTTZT74kEe4g+QsY7P/B9WdO98d82zZgXO/RQzu2Q==",
+      "dev": true,
+      "dependencies": {
+        "@types/glob": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/through": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/through/-/through-0.0.29.tgz",
+      "integrity": "sha512-9a7C5VHh+1BKblaYiq+7Tfc+EOmjMdZaD1MYtkQjSoxgB69tBjW98ry6SKsi4zEIWztLOMRuL87A3bdT/Fc/4w==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/through2": {
+      "version": "2.0.36",
+      "resolved": "https://registry.npmjs.org/@types/through2/-/through2-2.0.36.tgz",
+      "integrity": "sha512-vuifQksQHJXhV9McpVsXKuhnf3lsoX70PnhcqIAbs9dqLH2NgrGz0DzZPDY3+Yh6eaRqcE1gnCQ6QhBn1/PT5A==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/tmp": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/@types/tmp/-/tmp-0.2.1.tgz",
+      "integrity": "sha512-7cTXwKP/HLOPVgjg+YhBdQ7bMiobGMuoBmrGmqwIWJv8elC6t1DfVc/mn4fD9UE1IjhwmhaQ5pGVXkmXbH0rhg==",
+      "dev": true
+    },
+    "node_modules/@types/tunnel": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/@types/tunnel/-/tunnel-0.0.3.tgz",
+      "integrity": "sha512-sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/undertaker": {
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/@types/undertaker/-/undertaker-1.2.11.tgz",
+      "integrity": "sha512-j1Z0V2ByRHr8ZK7eOeGq0LGkkdthNFW0uAZGY22iRkNQNL9/vAV0yFPr1QN3FM/peY5bxs9P+1f0PYJTQVa5iA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "@types/undertaker-registry": "*",
+        "async-done": "~1.3.2"
+      }
+    },
+    "node_modules/@types/undertaker-registry": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@types/undertaker-registry/-/undertaker-registry-1.0.1.tgz",
+      "integrity": "sha512-Z4TYuEKn9+RbNVk1Ll2SS4x1JeLHecolIbM/a8gveaHsW0Hr+RQMraZACwTO2VD7JvepgA6UO1A1VrbktQrIbQ==",
+      "dev": true
+    },
+    "node_modules/@types/vinyl": {
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.12.tgz",
+      "integrity": "sha512-Sr2fYMBUVGYq8kj3UthXFAu5UN6ZW+rYr4NACjZQJvHvj+c8lYv0CahmZ2P/r7iUkN44gGUBwqxZkrKXYPb7cw==",
+      "dev": true,
+      "dependencies": {
+        "@types/expect": "^1.20.4",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/vinyl-fs": {
+      "version": "2.4.9",
+      "resolved": "https://registry.npmjs.org/@types/vinyl-fs/-/vinyl-fs-2.4.9.tgz",
+      "integrity": "sha512-Q0EXd6c1fORjiOuK4ZaKdfFcMyFzJlTi56dqktwaWVLIDAzE49wUs3bKnYbZwzyMWoH+NcMWnRuR73S9A0jnRA==",
+      "dev": true,
+      "dependencies": {
+        "@types/events": "*",
+        "@types/glob-stream": "*",
+        "@types/node": "*",
+        "@types/vinyl": "*"
+      }
+    },
+    "node_modules/@types/workerpool": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/@types/workerpool/-/workerpool-6.4.0.tgz",
+      "integrity": "sha512-SIF2/169pDsLKeM8GQGHkOFifGalDbZgiBSaLUnnlVSRsAOenkAvQ6h4uhV2W+PZZczS+8LQxACwNkSykdT91A==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/xml2js": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/@types/xml2js/-/xml2js-0.0.33.tgz",
+      "integrity": "sha1-IMXdZGAkUoTWSlVpABW5XkCft94= sha512-6dx6V6EdddqLjhxGdQrNdSu+O+3F7tOlyj660SpkO4/5uDSZM+LXcGQKAFnIJbvTzkQ6d2g3rWxyEXVwYAUoJg==",
+      "dev": true
+    },
+    "node_modules/@types/yauzl": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.2.tgz",
+      "integrity": "sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@vscode/iconv-lite-umd": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz",
+      "integrity": "sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg==",
+      "dev": true
+    },
+    "node_modules/@vscode/vsce": {
+      "version": "2.20.1",
+      "resolved": "https://registry.npmjs.org/@vscode/vsce/-/vsce-2.20.1.tgz",
+      "integrity": "sha512-ilbvoqvR/1/zseRPBAzYR6aKqSJ+jvda4/BqIwOqTxajpvLtEpK3kMLs77+dJdrlygS+VrP7Yhad8j0ukyD96g==",
+      "dev": true,
+      "dependencies": {
+        "azure-devops-node-api": "^11.0.1",
+        "chalk": "^2.4.2",
+        "cheerio": "^1.0.0-rc.9",
+        "commander": "^6.1.0",
+        "glob": "^7.0.6",
+        "hosted-git-info": "^4.0.2",
+        "jsonc-parser": "^3.2.0",
+        "leven": "^3.1.0",
+        "markdown-it": "^12.3.2",
+        "mime": "^1.3.4",
+        "minimatch": "^3.0.3",
+        "parse-semver": "^1.1.1",
+        "read": "^1.0.7",
+        "semver": "^7.5.2",
+        "tmp": "^0.2.1",
+        "typed-rest-client": "^1.8.4",
+        "url-join": "^4.0.1",
+        "xml2js": "^0.5.0",
+        "yauzl": "^2.3.1",
+        "yazl": "^2.2.2"
+      },
+      "bin": {
+        "vsce": "vsce"
+      },
+      "engines": {
+        "node": ">= 14"
+      },
+      "optionalDependencies": {
+        "keytar": "^7.7.0"
+      }
+    },
+    "node_modules/@vscode/vsce/node_modules/commander": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
+      "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/@vscode/vsce/node_modules/jsonc-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
+      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
+      "dev": true
+    },
+    "node_modules/@vscode/vsce/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@xmldom/xmldom": {
+      "version": "0.8.10",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz",
+      "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/ansi-colors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+      "devOptional": true,
+      "dependencies": {
+        "ansi-wrap": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ansi-gray": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
+      "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE= sha512-HrgGIZUl8h2EHuZaU9hTR/cU5nhKxpVE1V6kdGsQ8e4zirElJ5fvtfc8N7Q1oq1aatO275i8pUFUCpNWCAnVWw==",
+      "optional": true,
+      "dependencies": {
+        "ansi-wrap": "0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ansi-wrap": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
+      "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768= sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw==",
+      "devOptional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "devOptional": true,
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA= sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "devOptional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+      "devOptional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
+      "devOptional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/async-done": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz",
+      "integrity": "sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==",
+      "dev": true,
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.2",
+        "process-nextick-args": "^2.0.0",
+        "stream-exhaust": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k= sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "dev": true
+    },
+    "node_modules/azure-devops-node-api": {
+      "version": "11.2.0",
+      "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-11.2.0.tgz",
+      "integrity": "sha512-XdiGPhrpaT5J8wdERRKs5g8E0Zy1pvOYTli7z9E8nmOn3YGp4FhtjhrOyFmX/8veWCwdI69mCHKJw6l+4J/bHA==",
+      "dev": true,
+      "dependencies": {
+        "tunnel": "0.0.6",
+        "typed-rest-client": "^1.8.4"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "devOptional": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/binary-extensions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "devOptional": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/bl": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "optional": true,
+      "dependencies": {
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
+      }
+    },
+    "node_modules/bluebird": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+      "dev": true
+    },
+    "node_modules/boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
+      "dev": true
+    },
+    "node_modules/boolean": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.1.2.tgz",
+      "integrity": "sha512-YN6UmV0FfLlBVvRvNPx3pz5W/mUoYB24J4WSXOKP/OOJpi+Oq6WYqPaNTHzjI0QzwWtnvEd5CGYyQPgp1jFxnw==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "devOptional": true,
+      "dependencies": {
+        "fill-range": "^7.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "optional": true,
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
+    "node_modules/buffer-alloc": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
+      "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
+      "dev": true,
+      "dependencies": {
+        "buffer-alloc-unsafe": "^1.1.0",
+        "buffer-fill": "^1.0.0"
+      }
+    },
+    "node_modules/buffer-alloc-unsafe": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
+      "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
+      "dev": true
+    },
+    "node_modules/buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/buffer-equal-constant-time": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+      "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk= sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==",
+      "dev": true
+    },
+    "node_modules/buffer-fill": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
+      "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw= sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ==",
+      "dev": true
+    },
+    "node_modules/byline": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/byline/-/byline-5.0.0.tgz",
+      "integrity": "sha1-dBxSFkaOrcRXsDQQEYrXfejB3bE= sha512-s6webAy+R4SR8XVuJWt2V2rGvhnrhxN+9S15GNuTK3wKPOXFF6RNc+8ug2XhH+2s4f+uudG4kUVYmYOQWL2g0Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/cacheable-lookup": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
+      "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.6.0"
+      }
+    },
+    "node_modules/cacheable-request": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz",
+      "integrity": "sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==",
+      "dev": true,
+      "dependencies": {
+        "clone-response": "^1.0.2",
+        "get-stream": "^5.1.0",
+        "http-cache-semantics": "^4.0.0",
+        "keyv": "^4.0.0",
+        "lowercase-keys": "^2.0.0",
+        "normalize-url": "^6.0.1",
+        "responselike": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/call-bind": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+      "dev": true,
+      "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/cheerio": {
+      "version": "1.0.0-rc.12",
+      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.12.tgz",
+      "integrity": "sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q==",
+      "dev": true,
+      "dependencies": {
+        "cheerio-select": "^2.1.0",
+        "dom-serializer": "^2.0.0",
+        "domhandler": "^5.0.3",
+        "domutils": "^3.0.1",
+        "htmlparser2": "^8.0.1",
+        "parse5": "^7.0.0",
+        "parse5-htmlparser2-tree-adapter": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 6"
+      },
+      "funding": {
+        "url": "https://github.com/cheeriojs/cheerio?sponsor=1"
+      }
+    },
+    "node_modules/cheerio-select": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-2.1.0.tgz",
+      "integrity": "sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "^1.0.0",
+        "css-select": "^5.1.0",
+        "css-what": "^6.1.0",
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3",
+        "domutils": "^3.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/chokidar": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
+      "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
+      "devOptional": true,
+      "dependencies": {
+        "anymatch": "~3.1.1",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.0",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.5.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.1"
+      }
+    },
+    "node_modules/chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "optional": true
+    },
+    "node_modules/clone": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+      "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18= sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
+      "devOptional": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/clone-buffer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
+      "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg= sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g==",
+      "devOptional": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/clone-response": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
+      "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= sha512-yjLXh88P599UOyPTFX0POsd7WxnbsVsGohcwzHOLspIhhpalPw1BcqED8NblyZLKcGrL8dTgMlcaZxV2jAD41Q==",
+      "dev": true,
+      "dependencies": {
+        "mimic-response": "^1.0.0"
+      }
+    },
+    "node_modules/clone-stats": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
+      "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA= sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag==",
+      "devOptional": true
+    },
+    "node_modules/cloneable-readable": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
+      "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
+      "devOptional": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "process-nextick-args": "^2.0.0",
+        "readable-stream": "^2.3.5"
+      }
+    },
+    "node_modules/cloneable-readable/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "devOptional": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true
+    },
+    "node_modules/color-support": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
+      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+      "optional": true,
+      "bin": {
+        "color-support": "bin.js"
+      }
+    },
+    "node_modules/colors": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.1.90"
+      }
+    },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/commander": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.0.0.tgz",
+      "integrity": "sha512-ovx/7NkTrnPuIV8sqk/GjUIIM1+iUQeqA3ye2VNpq9sVoiZsooObWlQy+OPWGI17GDaEoybuAGJm6U8yC077BA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/compare-version": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz",
+      "integrity": "sha1-AWLsLZNR9d3VmpICy6k1NmpyUIA= sha512-pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true
+    },
+    "node_modules/core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
+      "devOptional": true
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/css-select": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
+      "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "^1.0.0",
+        "css-what": "^6.1.0",
+        "domhandler": "^5.0.2",
+        "domutils": "^3.0.1",
+        "nth-check": "^2.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/css-what": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
+      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/decompress-response": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
+      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
+      "devOptional": true,
+      "dependencies": {
+        "mimic-response": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/decompress-response/node_modules/mimic-response": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
+      "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
+      "devOptional": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/deep-extend": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+      "optional": true,
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/defer-to-connect": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
+      "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/define-data-property": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "dev": true,
+      "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/define-lazy-prop": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
+      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "object-keys": "^1.0.12"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk= sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/detect-libc": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
+      "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==",
+      "optional": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/detect-node": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
+      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/dir-compare": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/dir-compare/-/dir-compare-4.2.0.tgz",
+      "integrity": "sha512-2xMCmOoMrdQIPHdsTawECdNPwlVFB9zGcz3kuhmBO6U3oU+UQjsue0i8ayLKpgBcm+hcXPMVSGUN9d+pvJ6+VQ==",
+      "dev": true,
+      "dependencies": {
+        "minimatch": "^3.0.5",
+        "p-limit": "^3.1.0 "
+      }
+    },
+    "node_modules/dom-serializer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
+      "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.2",
+        "entities": "^4.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+      }
+    },
+    "node_modules/domelementtype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ]
+    },
+    "node_modules/domhandler": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
+      "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.3.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
+      }
+    },
+    "node_modules/domutils": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.0.1.tgz",
+      "integrity": "sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==",
+      "dev": true,
+      "dependencies": {
+        "dom-serializer": "^2.0.0",
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
+      }
+    },
+    "node_modules/duplexify": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.2.tgz",
+      "integrity": "sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw==",
+      "dev": true,
+      "dependencies": {
+        "end-of-stream": "^1.4.1",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "node_modules/ecdsa-sig-formatter": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
+      "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/electron-osx-sign": {
+      "version": "0.4.16",
+      "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.4.16.tgz",
+      "integrity": "sha512-ziMWfc3NmQlwnWLW6EaZq8nH2BWVng/atX5GWsGwhexJYpdW6hsg//MkAfRTRx1kR3Veiqkeiog1ibkbA4x0rg==",
+      "deprecated": "Please use @electron/osx-sign moving forward. Be aware the API is slightly different",
+      "dev": true,
+      "dependencies": {
+        "bluebird": "^3.5.0",
+        "compare-version": "^0.1.2",
+        "debug": "^2.6.8",
+        "isbinaryfile": "^3.0.2",
+        "minimist": "^1.2.0",
+        "plist": "^3.0.1"
+      },
+      "bin": {
+        "electron-osx-flat": "bin/electron-osx-flat.js",
+        "electron-osx-sign": "bin/electron-osx-sign.js"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/electron-osx-sign/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/electron-osx-sign/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "devOptional": true,
+      "dependencies": {
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/entities": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz",
+      "integrity": "sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/env-paths": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
+      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/es-define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es6-error": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
+      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/esbuild": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.23.0.tgz",
+      "integrity": "sha512-1lvV17H2bMYda/WaFb2jLPeHU3zml2k4/yagNMG8Q/YtfMjCwEUZa2eXXMgZTVSL5q1n4H7sQ0X6CdJDqqeCFA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.23.0",
+        "@esbuild/android-arm": "0.23.0",
+        "@esbuild/android-arm64": "0.23.0",
+        "@esbuild/android-x64": "0.23.0",
+        "@esbuild/darwin-arm64": "0.23.0",
+        "@esbuild/darwin-x64": "0.23.0",
+        "@esbuild/freebsd-arm64": "0.23.0",
+        "@esbuild/freebsd-x64": "0.23.0",
+        "@esbuild/linux-arm": "0.23.0",
+        "@esbuild/linux-arm64": "0.23.0",
+        "@esbuild/linux-ia32": "0.23.0",
+        "@esbuild/linux-loong64": "0.23.0",
+        "@esbuild/linux-mips64el": "0.23.0",
+        "@esbuild/linux-ppc64": "0.23.0",
+        "@esbuild/linux-riscv64": "0.23.0",
+        "@esbuild/linux-s390x": "0.23.0",
+        "@esbuild/linux-x64": "0.23.0",
+        "@esbuild/netbsd-x64": "0.23.0",
+        "@esbuild/openbsd-arm64": "0.23.0",
+        "@esbuild/openbsd-x64": "0.23.0",
+        "@esbuild/sunos-x64": "0.23.0",
+        "@esbuild/win32-arm64": "0.23.0",
+        "@esbuild/win32-ia32": "0.23.0",
+        "@esbuild/win32-x64": "0.23.0"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/events": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.2.0.tgz",
+      "integrity": "sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.x"
+      }
+    },
+    "node_modules/expand-template": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
+      "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
+      "optional": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg= sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+      "devOptional": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extract-zip": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
+      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.1",
+        "get-stream": "^5.1.0",
+        "yauzl": "^2.10.0"
+      },
+      "bin": {
+        "extract-zip": "cli.js"
+      },
+      "engines": {
+        "node": ">= 10.17.0"
+      },
+      "optionalDependencies": {
+        "@types/yauzl": "^2.9.1"
+      }
+    },
+    "node_modules/fancy-log": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
+      "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
+      "optional": true,
+      "dependencies": {
+        "ansi-gray": "^0.1.1",
+        "color-support": "^1.1.3",
+        "parse-node-version": "^1.0.0",
+        "time-stamp": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "node_modules/fd-slicer": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4= sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
+      "dev": true,
+      "dependencies": {
+        "pend": "~1.2.0"
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "devOptional": true,
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/first-chunk-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz",
+      "integrity": "sha1-G97NuOCDwGZLkZRVgVd6Q6nzHXA= sha512-X8Z+b/0L4lToKYq+lwnKqi9X/Zek0NibLpsJgVsSxpoYq7JtiCtRb5HqKVEjEw/qAb/4AKKRLOwwKHlWNpm2Eg==",
+      "optional": true,
+      "dependencies": {
+        "readable-stream": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/first-chunk-stream/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "optional": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/fork-stream": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/fork-stream/-/fork-stream-0.0.4.tgz",
+      "integrity": "sha512-Pqq5NnT78ehvUnAk/We/Jr22vSvanRlFTpAmQ88xBY/M1TlHe+P0ILuEyXS595ysdGfaj22634LBkGMA2GTcpA==",
+      "dev": true
+    },
+    "node_modules/form-data": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "dev": true,
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/fs-constants": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+      "optional": true
+    },
+    "node_modules/fs-extra": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=6 <7 || >=8"
+      }
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8= sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+      "dev": true,
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-stream": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+      "dev": true,
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/github-from-package": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
+      "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==",
+      "optional": true
+    },
+    "node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "devOptional": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/global-agent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz",
+      "integrity": "sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "boolean": "^3.0.1",
+        "es6-error": "^4.1.1",
+        "matcher": "^3.0.0",
+        "roarr": "^2.15.3",
+        "semver": "^7.3.2",
+        "serialize-error": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=10.0"
+      }
+    },
+    "node_modules/global-agent/node_modules/semver": {
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/globalthis": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.2.tgz",
+      "integrity": "sha512-ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "define-properties": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/got": {
+      "version": "11.8.6",
+      "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz",
+      "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==",
+      "dev": true,
+      "dependencies": {
+        "@sindresorhus/is": "^4.0.0",
+        "@szmarczak/http-timer": "^4.0.5",
+        "@types/cacheable-request": "^6.0.1",
+        "@types/responselike": "^1.0.0",
+        "cacheable-lookup": "^5.0.3",
+        "cacheable-request": "^7.0.2",
+        "decompress-response": "^6.0.0",
+        "http2-wrapper": "^1.0.0-beta.5.2",
+        "lowercase-keys": "^2.0.0",
+        "p-cancelable": "^2.0.0",
+        "responselike": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.19.0"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/got?sponsor=1"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
+      "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==",
+      "devOptional": true
+    },
+    "node_modules/gulp-merge-json": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/gulp-merge-json/-/gulp-merge-json-2.1.1.tgz",
+      "integrity": "sha512-VhvAlcf+dcCb94j/2yDPWxJ3X7x4P/Xwcrv1dhjYuRgvADwFJmaQwl4zbuq+GDZvzMacbVncWtEdsETpUSkhYw==",
+      "dev": true,
+      "dependencies": {
+        "json5": "^2.1.3",
+        "lodash.mergewith": "^4.6.1",
+        "plugin-error": "^1.0.1",
+        "through": "^2.3.8",
+        "vinyl": "^2.1.0"
+      }
+    },
+    "node_modules/gulp-sort": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-sort/-/gulp-sort-2.0.0.tgz",
+      "integrity": "sha512-MyTel3FXOdh1qhw1yKhpimQrAmur9q1X0ZigLmCOxouQD+BD3za9/89O+HfbgBQvvh4igEbp0/PUWO+VqGYG1g==",
+      "dev": true,
+      "dependencies": {
+        "through2": "^2.0.1"
+      }
+    },
+    "node_modules/gulp-sort/node_modules/readable-stream": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/gulp-sort/node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0= sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "dev": true,
+      "dependencies": {
+        "es-define-property": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-proto": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/hosted-git-info": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/htmlparser2": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.1.tgz",
+      "integrity": "sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA==",
+      "dev": true,
+      "funding": [
+        "https://github.com/fb55/htmlparser2?sponsor=1",
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
+      "dependencies": {
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.2",
+        "domutils": "^3.0.1",
+        "entities": "^4.3.0"
+      }
+    },
+    "node_modules/http-cache-semantics": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
+      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
+      "dev": true
+    },
+    "node_modules/http-proxy-agent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+      "dev": true,
+      "dependencies": {
+        "@tootallnate/once": "1",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/http2-wrapper": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
+      "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",
+      "dev": true,
+      "dependencies": {
+        "quick-lru": "^5.1.1",
+        "resolve-alpn": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=10.19.0"
+      }
+    },
+    "node_modules/https-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "optional": true
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "devOptional": true
+    },
+    "node_modules/ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "optional": true
+    },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "devOptional": true,
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-docker": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "dev": true,
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "devOptional": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "devOptional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "devOptional": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "devOptional": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "devOptional": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-utf8": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI= sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==",
+      "optional": true
+    },
+    "node_modules/is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "dev": true,
+      "dependencies": {
+        "is-docker": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+      "devOptional": true
+    },
+    "node_modules/isbinaryfile": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz",
+      "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
+      "dev": true,
+      "dependencies": {
+        "buffer-alloc": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8= sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "devOptional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/jsbi": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/jsbi/-/jsbi-3.1.4.tgz",
+      "integrity": "sha512-52QRRFSsi9impURE8ZUbzAMCLjPm4THO7H2fcuIvaaeFTbSysvkodbQQXIVsNgq/ypDbq6dJiuGKL0vZ/i9hUg==",
+      "dev": true
+    },
+    "node_modules/json-buffer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+      "dev": true
+    },
+    "node_modules/json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/json5": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.2.tgz",
+      "integrity": "sha512-46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ==",
+      "dev": true,
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jsonc-parser": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.3.0.tgz",
+      "integrity": "sha512-b0EBt8SWFNnixVdvoR2ZtEGa9ZqLhbJnOjezn+WP+8kspFm+PFYDN8Z4Bc7pRlDjvuVcADSUkroIuTWWn/YiIA==",
+      "dev": true
+    },
+    "node_modules/jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
+      "dev": true,
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/jsonwebtoken": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz",
+      "integrity": "sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==",
+      "dev": true,
+      "dependencies": {
+        "jws": "^3.2.2",
+        "lodash": "^4.17.21",
+        "ms": "^2.1.1",
+        "semver": "^7.3.8"
+      },
+      "engines": {
+        "node": ">=12",
+        "npm": ">=6"
+      }
+    },
+    "node_modules/jsonwebtoken/node_modules/jwa": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz",
+      "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==",
+      "dev": true,
+      "dependencies": {
+        "buffer-equal-constant-time": "1.0.1",
+        "ecdsa-sig-formatter": "1.0.11",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/jsonwebtoken/node_modules/jws": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
+      "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==",
+      "dev": true,
+      "dependencies": {
+        "jwa": "^1.4.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/jsonwebtoken/node_modules/semver": {
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jwa": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz",
+      "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==",
+      "dev": true,
+      "dependencies": {
+        "buffer-equal-constant-time": "1.0.1",
+        "ecdsa-sig-formatter": "1.0.11",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/jws": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz",
+      "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==",
+      "dev": true,
+      "dependencies": {
+        "jwa": "^2.0.0",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/keytar": {
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.9.0.tgz",
+      "integrity": "sha512-VPD8mtVtm5JNtA2AErl6Chp06JBfy7diFQ7TQQhdpWOl6MrCRB+eRbvAZUsbGQS9kiMq0coJsy0W0vHpDCkWsQ==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "dependencies": {
+        "node-addon-api": "^4.3.0",
+        "prebuild-install": "^7.0.1"
+      }
+    },
+    "node_modules/keyv": {
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+      "dev": true,
+      "dependencies": {
+        "json-buffer": "3.0.1"
+      }
+    },
+    "node_modules/leven": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/linkify-it": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
+      "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
+      "dev": true,
+      "dependencies": {
+        "uc.micro": "^1.0.1"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
+    "node_modules/lodash.mergewith": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz",
+      "integrity": "sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==",
+      "dev": true
+    },
+    "node_modules/lowercase-keys": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
+      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "devOptional": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/markdown-it": {
+      "version": "12.3.2",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
+      "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1",
+        "entities": "~2.1.0",
+        "linkify-it": "^3.0.1",
+        "mdurl": "^1.0.1",
+        "uc.micro": "^1.0.5"
+      },
+      "bin": {
+        "markdown-it": "bin/markdown-it.js"
+      }
+    },
+    "node_modules/markdown-it/node_modules/entities": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
+      "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/matcher": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz",
+      "integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "escape-string-regexp": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/matcher/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/mdurl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
+      "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==",
+      "dev": true
+    },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true
+    },
+    "node_modules/mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "dev": true,
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/mime-db": {
+      "version": "1.45.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz",
+      "integrity": "sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.28",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz",
+      "integrity": "sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==",
+      "dev": true,
+      "dependencies": {
+        "mime-db": "1.45.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mimic-response": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
+      "devOptional": true
+    },
+    "node_modules/mkdirp-classic": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+      "optional": true
+    },
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/mute-stream": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
+      "dev": true
+    },
+    "node_modules/nan": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.19.0.tgz",
+      "integrity": "sha512-nO1xXxfh/RWNxfd/XPfbIfFk5vgLsAxUR9y5O0cHMJu/AW9U95JLXqthYHjEp+8gQ5p96K9jUp8nbVOxCdRbtw==",
+      "optional": true
+    },
+    "node_modules/napi-build-utils": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
+      "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==",
+      "optional": true
+    },
+    "node_modules/node-abi": {
+      "version": "3.30.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.30.0.tgz",
+      "integrity": "sha512-qWO5l3SCqbwQavymOmtTVuCWZE23++S+rxyoHjXqUmPyzRcaoI4lA2gO55/drddGnedAyjA7sk76SfQ5lfUMnw==",
+      "optional": true,
+      "dependencies": {
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/node-abi/node_modules/semver": {
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "optional": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/node-abort-controller": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.1.1.tgz",
+      "integrity": "sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==",
+      "dev": true
+    },
+    "node_modules/node-addon-api": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.3.0.tgz",
+      "integrity": "sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/node-fetch": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz",
+      "integrity": "sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==",
+      "dev": true,
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "devOptional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/normalize-url": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
+      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/nth-check": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
+      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/nth-check?sponsor=1"
+      }
+    },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
+      "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E= sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "devOptional": true,
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/open": {
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
+      "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==",
+      "dev": true,
+      "dependencies": {
+        "define-lazy-prop": "^2.0.0",
+        "is-docker": "^2.1.1",
+        "is-wsl": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-cancelable": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
+      "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/parse-node-version": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
+      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
+      "optional": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/parse-semver": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/parse-semver/-/parse-semver-1.1.1.tgz",
+      "integrity": "sha512-Eg1OuNntBMH0ojvEKSrvDSnwLmvVuUOSdylH/pSCPNMIspLlweJyIWXCE+k/5hm3cj/EBUYwmWkjhBALNP4LXQ==",
+      "dev": true,
+      "dependencies": {
+        "semver": "^5.1.0"
+      }
+    },
+    "node_modules/parse-semver/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/parse5": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
+      "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
+      "dev": true,
+      "dependencies": {
+        "entities": "^4.4.0"
+      },
+      "funding": {
+        "url": "https://github.com/inikulin/parse5?sponsor=1"
+      }
+    },
+    "node_modules/parse5-htmlparser2-tree-adapter": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.0.0.tgz",
+      "integrity": "sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g==",
+      "dev": true,
+      "dependencies": {
+        "domhandler": "^5.0.2",
+        "parse5": "^7.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/inikulin/parse5?sponsor=1"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18= sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA= sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
+      "dev": true
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
+      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
+      "devOptional": true,
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/plist": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/plist/-/plist-3.1.0.tgz",
+      "integrity": "sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==",
+      "dev": true,
+      "dependencies": {
+        "@xmldom/xmldom": "^0.8.8",
+        "base64-js": "^1.5.1",
+        "xmlbuilder": "^15.1.1"
+      },
+      "engines": {
+        "node": ">=10.4.0"
+      }
+    },
+    "node_modules/plugin-error": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+      "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+      "devOptional": true,
+      "dependencies": {
+        "ansi-colors": "^1.0.1",
+        "arr-diff": "^4.0.0",
+        "arr-union": "^3.1.0",
+        "extend-shallow": "^3.0.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/prebuild-install": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz",
+      "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==",
+      "optional": true,
+      "dependencies": {
+        "detect-libc": "^2.0.0",
+        "expand-template": "^2.0.3",
+        "github-from-package": "0.0.0",
+        "minimist": "^1.2.3",
+        "mkdirp-classic": "^0.5.3",
+        "napi-build-utils": "^1.0.1",
+        "node-abi": "^3.3.0",
+        "pump": "^3.0.0",
+        "rc": "^1.2.7",
+        "simple-get": "^4.0.0",
+        "tar-fs": "^2.0.0",
+        "tunnel-agent": "^0.6.0"
+      },
+      "bin": {
+        "prebuild-install": "bin.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/priorityqueuejs": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/priorityqueuejs/-/priorityqueuejs-1.0.0.tgz",
+      "integrity": "sha1-LuTyPCVgkT4IwHzlzN1t498sWvg= sha512-lg++21mreCEOuGWTbO5DnJKAdxfjrdN0S9ysoW9SzdSJvbkWpkaDdpG/cdsPCsEnoLUwmd9m3WcZhngW7yKA2g==",
+      "dev": true
+    },
+    "node_modules/process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI= sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "devOptional": true
+    },
+    "node_modules/progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "devOptional": true,
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "node_modules/qs": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
+      "dev": true,
+      "dependencies": {
+        "side-channel": "^1.0.6"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/quick-lru": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
+      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/rc": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+      "optional": true,
+      "dependencies": {
+        "deep-extend": "^0.6.0",
+        "ini": "~1.3.0",
+        "minimist": "^1.2.0",
+        "strip-json-comments": "~2.0.1"
+      },
+      "bin": {
+        "rc": "cli.js"
+      }
+    },
+    "node_modules/read": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
+      "integrity": "sha512-rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ==",
+      "dev": true,
+      "dependencies": {
+        "mute-stream": "~0.0.4"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "devOptional": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/readdirp": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
+      "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
+      "devOptional": true,
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/remove-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8= sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==",
+      "devOptional": true
+    },
+    "node_modules/replace-ext": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
+      "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
+      "devOptional": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/resolve-alpn": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
+      "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==",
+      "dev": true
+    },
+    "node_modules/responselike": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
+      "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==",
+      "dev": true,
+      "dependencies": {
+        "lowercase-keys": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/roarr": {
+      "version": "2.15.4",
+      "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz",
+      "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "boolean": "^3.0.1",
+        "detect-node": "^2.0.4",
+        "globalthis": "^1.0.1",
+        "json-stringify-safe": "^5.0.1",
+        "semver-compare": "^1.0.0",
+        "sprintf-js": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "devOptional": true
+    },
+    "node_modules/sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "dev": true
+    },
+    "node_modules/semaphore": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/semaphore/-/semaphore-1.1.0.tgz",
+      "integrity": "sha512-O4OZEaNtkMd/K0i6js9SL+gqy0ZCBMgUvlSqHKi4IBdjhe7wB8pwztUk1BbZ1fmrvpwFrPbHzqd2w5pTcJH6LA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/semver-compare": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
+      "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w= sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/serialize-error": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz",
+      "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "type-fest": "^0.13.1"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/set-function-length": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "dev": true,
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/side-channel": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4",
+        "object-inspect": "^1.13.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/simple-concat": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
+      "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "optional": true
+    },
+    "node_modules/simple-get": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz",
+      "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "optional": true,
+      "dependencies": {
+        "decompress-response": "^6.0.0",
+        "once": "^1.3.1",
+        "simple-concat": "^1.0.0"
+      }
+    },
+    "node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
+      "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/stoppable": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/stoppable/-/stoppable-1.1.0.tgz",
+      "integrity": "sha512-KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4",
+        "npm": ">=6"
+      }
+    },
+    "node_modules/stream-exhaust": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
+      "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==",
+      "dev": true
+    },
+    "node_modules/stream-shift": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
+      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
+      "dev": true
+    },
+    "node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "devOptional": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4= sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==",
+      "optional": true,
+      "dependencies": {
+        "is-utf8": "^0.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/strip-bom-buf": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom-buf/-/strip-bom-buf-1.0.0.tgz",
+      "integrity": "sha1-HLRar1dTD0yvhsf3UXnSyaUd1XI= sha512-1sUIL1jck0T1mhOLP2c696BIznzT525Lkub+n4jjMHjhjhoAQA6Ye659DxdlZBr0aLDMQoTxKIpnlqxgtwjsuQ==",
+      "optional": true,
+      "dependencies": {
+        "is-utf8": "^0.2.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/strip-bom-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-2.0.0.tgz",
+      "integrity": "sha1-+H217yYT9paKpUWr/h7HKLaoKco= sha512-yH0+mD8oahBZWnY43vxs4pSinn8SMKAdml/EOGBewoe1Y0Eitd0h2Mg3ZRiXruUW6L4P+lvZiEgbh0NgUGia1w==",
+      "optional": true,
+      "dependencies": {
+        "first-chunk-stream": "^2.0.0",
+        "strip-bom": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo= sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sumchecker": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz",
+      "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.0"
+      },
+      "engines": {
+        "node": ">= 8.0"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/tar-fs": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
+      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+      "optional": true,
+      "dependencies": {
+        "chownr": "^1.1.1",
+        "mkdirp-classic": "^0.5.2",
+        "pump": "^3.0.0",
+        "tar-stream": "^2.1.4"
+      }
+    },
+    "node_modules/tar-stream": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "optional": true,
+      "dependencies": {
+        "bl": "^4.0.3",
+        "end-of-stream": "^1.4.1",
+        "fs-constants": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ternary-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ternary-stream/-/ternary-stream-3.0.0.tgz",
+      "integrity": "sha512-oIzdi+UL/JdktkT+7KU5tSIQjj8pbShj3OASuvDEhm0NT5lppsm7aXWAmAq4/QMaBIyfuEcNLbAQA+HpaISobQ==",
+      "dev": true,
+      "dependencies": {
+        "duplexify": "^4.1.1",
+        "fork-stream": "^0.0.4",
+        "merge-stream": "^2.0.0",
+        "through2": "^3.0.1"
+      }
+    },
+    "node_modules/ternary-stream/node_modules/through2": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
+      "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.4",
+        "readable-stream": "2 || 3"
+      }
+    },
+    "node_modules/through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
+      "dev": true
+    },
+    "node_modules/through2": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
+      "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "3"
+      }
+    },
+    "node_modules/time-stamp": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
+      "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM= sha512-gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw==",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/tmp": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
+      "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.14"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "devOptional": true,
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+      "dev": true
+    },
+    "node_modules/tree-sitter": {
+      "version": "0.20.6",
+      "resolved": "https://registry.npmjs.org/tree-sitter/-/tree-sitter-0.20.6.tgz",
+      "integrity": "sha512-GxJodajVpfgb3UREzzIbtA1hyRnTxVbWVXrbC6sk4xTMH5ERMBJk9HJNq4c8jOJeUaIOmLcwg+t6mez/PDvGqg==",
+      "hasInstallScript": true,
+      "optional": true,
+      "dependencies": {
+        "nan": "^2.18.0",
+        "prebuild-install": "^7.1.1"
+      }
+    },
+    "node_modules/tree-sitter-typescript": {
+      "version": "0.20.5",
+      "resolved": "https://registry.npmjs.org/tree-sitter-typescript/-/tree-sitter-typescript-0.20.5.tgz",
+      "integrity": "sha512-RzK/Pc6k4GiXvInIBlo8ZggekP6rODfW2P6KHFCTSUHENsw6ynh+iacFhfkJRa4MT8EIN2WHygFJ7076/+eHKg==",
+      "hasInstallScript": true,
+      "optional": true,
+      "dependencies": {
+        "nan": "^2.18.0",
+        "tree-sitter": "^0.20.6"
+      }
+    },
+    "node_modules/tslib": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
+      "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==",
+      "dev": true
+    },
+    "node_modules/tunnel": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
+      }
+    },
+    "node_modules/tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
+      "optional": true,
+      "dependencies": {
+        "safe-buffer": "^5.0.1"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
+      "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/typed-rest-client": {
+      "version": "1.8.11",
+      "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.8.11.tgz",
+      "integrity": "sha512-5UvfMpd1oelmUPRbbaVnq+rHP7ng2cE4qoQkQeAqxRL6PklkxsM0g32/HL0yfvruK6ojQ5x8EE+HF4YV6DtuCA==",
+      "dev": true,
+      "dependencies": {
+        "qs": "^6.9.1",
+        "tunnel": "0.0.6",
+        "underscore": "^1.12.1"
+      }
+    },
+    "node_modules/uc.micro": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
+      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
+      "dev": true
+    },
+    "node_modules/underscore": {
+      "version": "1.13.7",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.7.tgz",
+      "integrity": "sha512-GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g==",
+      "dev": true
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    },
+    "node_modules/universal-user-agent": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
+      "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==",
+      "dev": true
+    },
+    "node_modules/universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/url-join": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz",
+      "integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==",
+      "dev": true
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "devOptional": true
+    },
+    "node_modules/uuid": {
+      "version": "8.3.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.1.tgz",
+      "integrity": "sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==",
+      "dev": true,
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/vinyl": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
+      "integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==",
+      "devOptional": true,
+      "dependencies": {
+        "clone": "^2.1.1",
+        "clone-buffer": "^1.0.0",
+        "clone-stats": "^1.0.0",
+        "cloneable-readable": "^1.0.0",
+        "remove-trailing-separator": "^1.0.1",
+        "replace-ext": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/vinyl-file": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/vinyl-file/-/vinyl-file-3.0.0.tgz",
+      "integrity": "sha1-sQTZ5ECf+jJfqt1SBkLQo7SIs2U= sha512-BoJDj+ca3D9xOuPEM6RWVtWQtvEPQiQYn82LvdxhLWplfQsBzBqtgK0yhCP0s1BNTi6dH9BO+dzybvyQIacifg==",
+      "optional": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "pify": "^2.3.0",
+        "strip-bom-buf": "^1.0.0",
+        "strip-bom-stream": "^2.0.0",
+        "vinyl": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/vscode-gulp-watch": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/vscode-gulp-watch/-/vscode-gulp-watch-5.0.3.tgz",
+      "integrity": "sha512-MTUp2yLE9CshhkNSNV58EQNxQSeF8lIj3mkXZX9a1vAk+EQNM2PAYdPUDSd/P/08W3PMHGznEiZyfK7JAjLosg==",
+      "optional": true,
+      "dependencies": {
+        "ansi-colors": "4.1.1",
+        "anymatch": "^3.1.1",
+        "chokidar": "3.5.1",
+        "fancy-log": "^1.3.3",
+        "glob-parent": "^5.1.1",
+        "normalize-path": "^3.0.0",
+        "object-assign": "^4.1.1",
+        "plugin-error": "1.0.1",
+        "readable-stream": "^3.6.0",
+        "vinyl": "^2.2.0",
+        "vinyl-file": "^3.0.0"
+      }
+    },
+    "node_modules/vscode-gulp-watch/node_modules/ansi-colors": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "optional": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/vscode-universal-bundler": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/vscode-universal-bundler/-/vscode-universal-bundler-0.1.3.tgz",
+      "integrity": "sha512-USXJqgD+ySROqgjl+KrGjlF7MvNnqsI6my1kUOsAXARmNqBjXk38w8g2BF6PEXVOYOQ+npRcTA7athXNU4Jjog==",
+      "dev": true,
+      "dependencies": {
+        "@electron/asar": "^3.2.7",
+        "@malept/cross-spawn-promise": "^2.0.0",
+        "debug": "^4.3.1",
+        "dir-compare": "^4.2.0",
+        "fs-extra": "^11.1.1",
+        "minimatch": "^9.0.3",
+        "plist": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=16.4"
+      }
+    },
+    "node_modules/vscode-universal-bundler/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/vscode-universal-bundler/node_modules/fs-extra": {
+      "version": "11.2.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=14.14"
+      }
+    },
+    "node_modules/vscode-universal-bundler/node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "dev": true,
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/vscode-universal-bundler/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/vscode-universal-bundler/node_modules/universalify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+      "dev": true
+    },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0= sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "dev": true,
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/workerpool": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.0.tgz",
+      "integrity": "sha512-r64Ea3glXY2RVzMeNxB+4J+0YHAVzUdV4cM5nHi4BBC2LvnO1pWFAIYKYuGcPElbg1/7eEiaPtZ/jzCjIUuGBg==",
+      "dev": true
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "devOptional": true
+    },
+    "node_modules/xml2js": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz",
+      "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==",
+      "dev": true,
+      "dependencies": {
+        "sax": ">=0.6.0",
+        "xmlbuilder": "~11.0.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/xml2js/node_modules/xmlbuilder": {
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/xmlbuilder": {
+      "version": "15.1.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz",
+      "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
+    "node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "devOptional": true
+    },
+    "node_modules/yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
+      "dev": true,
+      "dependencies": {
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.1.0"
+      }
+    },
+    "node_modules/yazl": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.5.1.tgz",
+      "integrity": "sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==",
+      "dev": true,
+      "dependencies": {
+        "buffer-crc32": "~0.2.3"
+      }
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    }
+  }
+}
diff --git a/build/package.json b/build/package.json
index fa37e89b6fa..7017b9144e0 100644
--- a/build/package.json
+++ b/build/package.json
@@ -4,7 +4,7 @@
   "license": "MIT",
   "devDependencies": {
     "@azure/cosmos": "^3",
-    "@azure/identity": "^3.4.1",
+    "@azure/identity": "^4.2.1",
     "@azure/storage-blob": "^12.17.0",
     "@electron/get": "^2.0.0",
     "@types/ansi-colors": "^3.2.0",
@@ -20,11 +20,11 @@
     "@types/gulp-gzip": "^0.0.31",
     "@types/gulp-json-editor": "^2.2.31",
     "@types/gulp-rename": "^0.0.33",
+    "@types/gulp-sort": "^2.0.4",
     "@types/gulp-sourcemaps": "^0.0.32",
     "@types/mime": "0.0.29",
     "@types/minimatch": "^3.0.3",
     "@types/minimist": "^1.2.1",
-    "@types/mkdirp": "^1.0.1",
     "@types/mocha": "^9.1.1",
     "@types/node": "20.x",
     "@types/pump": "^1.0.1",
@@ -35,26 +35,27 @@
     "@types/workerpool": "^6.4.0",
     "@types/xml2js": "0.0.33",
     "@vscode/iconv-lite-umd": "0.7.0",
-    "@vscode/vsce": "^2.16.0",
+    "@vscode/vsce": "2.20.1",
     "byline": "^5.0.0",
     "colors": "^1.4.0",
     "commander": "^7.0.0",
     "debug": "^4.3.2",
     "electron-osx-sign": "^0.4.16",
-    "esbuild": "0.20.0",
+    "esbuild": "0.23.0",
     "extract-zip": "^2.0.1",
     "gulp-merge-json": "^2.1.1",
+    "gulp-sort": "^2.0.0",
     "jsonc-parser": "^2.3.0",
     "mime": "^1.4.1",
-    "mkdirp": "^1.0.4",
     "source-map": "0.6.1",
     "ternary-stream": "^3.0.0",
     "through2": "^4.0.2",
     "tmp": "^0.2.1",
-    "vscode-universal-bundler": "^0.0.2",
+    "vscode-universal-bundler": "^0.1.3",
     "workerpool": "^6.4.0",
     "yauzl": "^2.10.0"
   },
+  "type": "commonjs",
   "scripts": {
     "compile": "../node_modules/.bin/tsc -p tsconfig.build.json",
     "watch": "../node_modules/.bin/tsc -p tsconfig.build.json --watch",
diff --git a/build/setup-npm-registry.js b/build/setup-npm-registry.js
index 98bc836b072..24c850dbb84 100644
--- a/build/setup-npm-registry.js
+++ b/build/setup-npm-registry.js
@@ -8,7 +8,7 @@
 const fs = require('fs').promises;
 const path = require('path');
 
-async function* getYarnLockFiles(dir) {
+async function* getPackageLockFiles(dir) {
 	const files = await fs.readdir(dir);
 
 	for (const file of files) {
@@ -16,8 +16,8 @@ async function* getYarnLockFiles(dir) {
 		const stat = await fs.stat(fullPath);
 
 		if (stat.isDirectory()) {
-			yield* getYarnLockFiles(fullPath);
-		} else if (file === 'yarn.lock') {
+			yield* getPackageLockFiles(fullPath);
+		} else if (file === 'package-lock.json') {
 			yield fullPath;
 		}
 	}
@@ -32,7 +32,7 @@ async function setup(url, file) {
 async function main(url, dir) {
 	const root = dir ?? process.cwd();
 
-	for await (const file of getYarnLockFiles(root)) {
+	for await (const file of getPackageLockFiles(root)) {
 		console.log(`Enabling custom NPM registry: ${path.relative(root, file)}`);
 		await setup(url, file);
 	}
diff --git a/build/yarn.lock b/build/yarn.lock
deleted file mode 100644
index 81cf7fcf3d5..00000000000
--- a/build/yarn.lock
+++ /dev/null
@@ -1,2787 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@azure/abort-controller@^1.0.0":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@azure/abort-controller/-/abort-controller-1.0.2.tgz#822405c966b2aec16fb62c1b19d37eaccf231995"
-  integrity sha512-XUyTo+bcyxHEf+jlN2MXA7YU9nxVehaubngHV1MIZZaqYmZqykkoeAz/JMMEeR7t3TcyDwbFa3Zw8BZywmIx4g==
-  dependencies:
-    tslib "^2.0.0"
-
-"@azure/core-asynciterator-polyfill@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@azure/core-asynciterator-polyfill/-/core-asynciterator-polyfill-1.0.0.tgz#dcccebb88406e5c76e0e1d52e8cc4c43a68b3ee7"
-  integrity sha512-kmv8CGrPfN9SwMwrkiBK9VTQYxdFQEGe0BmQk+M8io56P9KNzpAxcWE/1fxJj7uouwN4kXF0BHW8DNlgx+wtCg==
-
-"@azure/core-auth@^1.3.0":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@azure/core-auth/-/core-auth-1.3.2.tgz#6a2c248576c26df365f6c7881ca04b7f6d08e3d0"
-  integrity sha512-7CU6DmCHIZp5ZPiZ9r3J17lTKMmYsm/zGvNkjArQwPkrLlZ1TZ+EUYfGgh2X31OLMVAQCTJZW4cXHJi02EbJnA==
-  dependencies:
-    "@azure/abort-controller" "^1.0.0"
-    tslib "^2.2.0"
-
-"@azure/core-auth@^1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@azure/core-auth/-/core-auth-1.5.0.tgz#a41848c5c31cb3b7c84c409885267d55a2c92e44"
-  integrity sha512-udzoBuYG1VBoHVohDTrvKjyzel34zt77Bhp7dQntVGGD0ehVq48owENbBG8fIgkHRNUBQH5k1r0hpoMu5L8+kw==
-  dependencies:
-    "@azure/abort-controller" "^1.0.0"
-    "@azure/core-util" "^1.1.0"
-    tslib "^2.2.0"
-
-"@azure/core-client@^1.4.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@azure/core-client/-/core-client-1.5.0.tgz#7aabb87d20e08db3683a117191c844bc19adb74e"
-  integrity sha512-YNk8i9LT6YcFdFO+RRU0E4Ef+A8Y5lhXo6lz61rwbG8Uo7kSqh0YqK04OexiilM43xd6n3Y9yBhLnb1NFNI9dA==
-  dependencies:
-    "@azure/abort-controller" "^1.0.0"
-    "@azure/core-asynciterator-polyfill" "^1.0.0"
-    "@azure/core-auth" "^1.3.0"
-    "@azure/core-rest-pipeline" "^1.5.0"
-    "@azure/core-tracing" "1.0.0-preview.13"
-    "@azure/logger" "^1.0.0"
-    tslib "^2.2.0"
-
-"@azure/core-http@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@azure/core-http/-/core-http-3.0.0.tgz#345845f9ba479a5ee41efc3fd7a13e82d2a0ec47"
-  integrity sha512-BxI2SlGFPPz6J1XyZNIVUf0QZLBKFX+ViFjKOkzqD18J1zOINIQ8JSBKKr+i+v8+MB6LacL6Nn/sP/TE13+s2Q==
-  dependencies:
-    "@azure/abort-controller" "^1.0.0"
-    "@azure/core-auth" "^1.3.0"
-    "@azure/core-tracing" "1.0.0-preview.13"
-    "@azure/core-util" "^1.1.1"
-    "@azure/logger" "^1.0.0"
-    "@types/node-fetch" "^2.5.0"
-    "@types/tunnel" "^0.0.3"
-    form-data "^4.0.0"
-    node-fetch "^2.6.7"
-    process "^0.11.10"
-    tslib "^2.2.0"
-    tunnel "^0.0.6"
-    uuid "^8.3.0"
-    xml2js "^0.4.19"
-
-"@azure/core-lro@^2.2.0":
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/@azure/core-lro/-/core-lro-2.2.1.tgz#5527b41037c658d3aefc19d68633e51e53d6e6a3"
-  integrity sha512-HE6PBl+mlKa0eBsLwusHqAqjLc5n9ByxeDo3Hz4kF3B1hqHvRkBr4oMgoT6tX7Hc3q97KfDctDUon7EhvoeHPA==
-  dependencies:
-    "@azure/abort-controller" "^1.0.0"
-    "@azure/core-tracing" "1.0.0-preview.13"
-    "@azure/logger" "^1.0.0"
-    tslib "^2.2.0"
-
-"@azure/core-paging@^1.1.1":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@azure/core-paging/-/core-paging-1.1.3.tgz#3587c9898a0530cacb64bab216d7318468aa5efc"
-  integrity sha512-his7Ah40ThEYORSpIAwuh6B8wkGwO/zG7gqVtmSE4WAJ46e36zUDXTKReUCLBDc6HmjjApQQxxcRFy5FruG79A==
-  dependencies:
-    "@azure/core-asynciterator-polyfill" "^1.0.0"
-
-"@azure/core-rest-pipeline@^1.1.0", "@azure/core-rest-pipeline@^1.2.0":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@azure/core-rest-pipeline/-/core-rest-pipeline-1.3.2.tgz#82bfb4e960b4ecf4f1a1cdb1afde4ce9192aef09"
-  integrity sha512-kymICKESeHBpVLgQiAxllgWdSTopkqtmfPac8ITwMCxNEC6hzbSpqApYbjzxbBNkBMgoD4GESo6LLhR/sPh6kA==
-  dependencies:
-    "@azure/abort-controller" "^1.0.0"
-    "@azure/core-auth" "^1.3.0"
-    "@azure/core-tracing" "1.0.0-preview.13"
-    "@azure/logger" "^1.0.0"
-    form-data "^4.0.0"
-    http-proxy-agent "^4.0.1"
-    https-proxy-agent "^5.0.0"
-    tslib "^2.2.0"
-    uuid "^8.3.0"
-
-"@azure/core-rest-pipeline@^1.5.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@azure/core-rest-pipeline/-/core-rest-pipeline-1.7.0.tgz#71f42c19af160422cc84513809ff9668d8047087"
-  integrity sha512-e2awPzwMKHrmvYgZ0qIKNkqnCM1QoDs7A0rOiS3OSAlOQOz/kL7PPKHXwFMuBeaRvS8i7fgobJn79q2Cji5f+Q==
-  dependencies:
-    "@azure/abort-controller" "^1.0.0"
-    "@azure/core-auth" "^1.3.0"
-    "@azure/core-tracing" "1.0.0-preview.13"
-    "@azure/logger" "^1.0.0"
-    form-data "^4.0.0"
-    http-proxy-agent "^4.0.1"
-    https-proxy-agent "^5.0.0"
-    tslib "^2.2.0"
-    uuid "^8.3.0"
-
-"@azure/core-tracing@1.0.0-preview.13":
-  version "1.0.0-preview.13"
-  resolved "https://registry.yarnpkg.com/@azure/core-tracing/-/core-tracing-1.0.0-preview.13.tgz#55883d40ae2042f6f1e12b17dd0c0d34c536d644"
-  integrity sha512-KxDlhXyMlh2Jhj2ykX6vNEU0Vou4nHr025KoSEiz7cS3BNiHNaZcdECk/DmLkEB0as5T7b/TpRcehJ5yV6NeXQ==
-  dependencies:
-    "@opentelemetry/api" "^1.0.1"
-    tslib "^2.2.0"
-
-"@azure/core-tracing@^1.0.0":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@azure/core-tracing/-/core-tracing-1.0.1.tgz#352a38cbea438c4a83c86b314f48017d70ba9503"
-  integrity sha512-I5CGMoLtX+pI17ZdiFJZgxMJApsK6jjfm85hpgp3oazCdq5Wxgh4wMr7ge/TTWW1B5WBuvIOI1fMU/FrOAMKrw==
-  dependencies:
-    tslib "^2.2.0"
-
-"@azure/core-util@^1.1.0", "@azure/core-util@^1.6.1":
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/@azure/core-util/-/core-util-1.6.1.tgz#fea221c4fa43c26543bccf799beb30c1c7878f5a"
-  integrity sha512-h5taHeySlsV9qxuK64KZxy4iln1BtMYlNt5jbuEFN3UFSAd1EwKg/Gjl5a6tZ/W8t6li3xPnutOx7zbDyXnPmQ==
-  dependencies:
-    "@azure/abort-controller" "^1.0.0"
-    tslib "^2.2.0"
-
-"@azure/core-util@^1.1.1":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@azure/core-util/-/core-util-1.2.0.tgz#3499deba1fc36dda6f1912b791809b6f15d4a392"
-  integrity sha512-ffGIw+Qs8bNKNLxz5UPkz4/VBM/EZY07mPve1ZYFqYUdPwFqRj0RPk0U7LZMOfT7GCck9YjuT1Rfp1PApNl1ng==
-  dependencies:
-    "@azure/abort-controller" "^1.0.0"
-    tslib "^2.2.0"
-
-"@azure/cosmos@^3":
-  version "3.17.3"
-  resolved "https://registry.yarnpkg.com/@azure/cosmos/-/cosmos-3.17.3.tgz#380398496af8ef3473ae0a9ad8cdbab32d91eb08"
-  integrity sha512-wBglkQ6Irjv5Vo2iw8fd6eYj60WYRSSg4/0DBkeOP6BwQ4RA91znsOHd6s3qG6UAbNgYuzC9Nnq07vlFFZkHEw==
-  dependencies:
-    "@azure/abort-controller" "^1.0.0"
-    "@azure/core-auth" "^1.3.0"
-    "@azure/core-rest-pipeline" "^1.2.0"
-    "@azure/core-tracing" "^1.0.0"
-    debug "^4.1.1"
-    fast-json-stable-stringify "^2.1.0"
-    jsbi "^3.1.3"
-    node-abort-controller "^3.0.0"
-    priorityqueuejs "^1.0.0"
-    semaphore "^1.0.5"
-    tslib "^2.2.0"
-    universal-user-agent "^6.0.0"
-    uuid "^8.3.0"
-
-"@azure/identity@^3.4.1":
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/@azure/identity/-/identity-3.4.1.tgz#18ba48b7421c818ef8116e8eec3c03ec1a62649a"
-  integrity sha512-oQ/r5MBdfZTMIUcY5Ch8G7Vv9aIXDkEYyU4Dfqjim4MQN+LY2uiQ57P1JDopMLeHCsZxM4yy8lEdne3tM9Xhzg==
-  dependencies:
-    "@azure/abort-controller" "^1.0.0"
-    "@azure/core-auth" "^1.5.0"
-    "@azure/core-client" "^1.4.0"
-    "@azure/core-rest-pipeline" "^1.1.0"
-    "@azure/core-tracing" "^1.0.0"
-    "@azure/core-util" "^1.6.1"
-    "@azure/logger" "^1.0.0"
-    "@azure/msal-browser" "^3.5.0"
-    "@azure/msal-node" "^2.5.1"
-    events "^3.0.0"
-    jws "^4.0.0"
-    open "^8.0.0"
-    stoppable "^1.1.0"
-    tslib "^2.2.0"
-
-"@azure/logger@^1.0.0":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@azure/logger/-/logger-1.0.1.tgz#19b333203d1b2931353d8879e814b64a7274837a"
-  integrity sha512-QYQeaJ+A5x6aMNu8BG5qdsVBnYBop9UMwgUvGihSjf1PdZZXB+c/oMdM2ajKwzobLBh9e9QuMQkN9iL+IxLBLA==
-  dependencies:
-    tslib "^2.0.0"
-
-"@azure/msal-browser@^3.5.0":
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/@azure/msal-browser/-/msal-browser-3.5.0.tgz#eb64c931c78c2b75c70807f618e1284bbb183380"
-  integrity sha512-2NtMuel4CI3UEelCPKkNRXgKzpWEX48fvxIvPz7s0/sTcCaI08r05IOkH2GkXW+czUOtuY6+oGafJCpumnjRLg==
-  dependencies:
-    "@azure/msal-common" "14.4.0"
-
-"@azure/msal-common@14.4.0":
-  version "14.4.0"
-  resolved "https://registry.yarnpkg.com/@azure/msal-common/-/msal-common-14.4.0.tgz#f938c1d96bb73d65baab985c96faaa273c97cfd5"
-  integrity sha512-ffCymScQuMKVj+YVfwNI52A5Tu+uiZO2eTf+c+3TXxdAssks4nokJhtr+uOOMxH0zDi6d1OjFKFKeXODK0YLSg==
-
-"@azure/msal-node@^2.5.1":
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/@azure/msal-node/-/msal-node-2.5.1.tgz#d180a1ba5fdc611a318a8f018a2db3453e2e2898"
-  integrity sha512-PsPRISqCG253HQk1cAS7eJW7NWTbnBGpG+vcGGz5z4JYRdnM2EIXlj1aBpXCdozenEPtXEVvHn2ELleW1w82nQ==
-  dependencies:
-    "@azure/msal-common" "14.4.0"
-    jsonwebtoken "^9.0.0"
-    uuid "^8.3.0"
-
-"@azure/storage-blob@^12.17.0":
-  version "12.17.0"
-  resolved "https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.17.0.tgz#04aad7f59cb08dbbe5b1b672a9f5b6256c8c9006"
-  integrity sha512-sM4vpsCpcCApagRW5UIjQNlNylo02my2opgp0Emi8x888hZUvJ3dN69Oq20cEGXkMUWnoCrBaB0zyS3yeB87sQ==
-  dependencies:
-    "@azure/abort-controller" "^1.0.0"
-    "@azure/core-http" "^3.0.0"
-    "@azure/core-lro" "^2.2.0"
-    "@azure/core-paging" "^1.1.1"
-    "@azure/core-tracing" "1.0.0-preview.13"
-    "@azure/logger" "^1.0.0"
-    events "^3.0.0"
-    tslib "^2.2.0"
-
-"@electron/get@^2.0.0":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@electron/get/-/get-2.0.3.tgz#fba552683d387aebd9f3fcadbcafc8e12ee4f960"
-  integrity sha512-Qkzpg2s9GnVV2I2BjRksUi43U5e6+zaQMcjoJy0C+C5oxaKl+fmckGDQFtRpZpZV0NQekuZZ+tGz7EA9TVnQtQ==
-  dependencies:
-    debug "^4.1.1"
-    env-paths "^2.2.0"
-    fs-extra "^8.1.0"
-    got "^11.8.5"
-    progress "^2.0.3"
-    semver "^6.2.0"
-    sumchecker "^3.0.1"
-  optionalDependencies:
-    global-agent "^3.0.0"
-
-"@esbuild/aix-ppc64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.20.0.tgz#509621cca4e67caf0d18561a0c56f8b70237472f"
-  integrity sha512-fGFDEctNh0CcSwsiRPxiaqX0P5rq+AqE0SRhYGZ4PX46Lg1FNR6oCxJghf8YgY0WQEgQuh3lErUFE4KxLeRmmw==
-
-"@esbuild/android-arm64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.20.0.tgz#109a6fdc4a2783fc26193d2687827045d8fef5ab"
-  integrity sha512-aVpnM4lURNkp0D3qPoAzSG92VXStYmoVPOgXveAUoQBWRSuQzt51yvSju29J6AHPmwY1BjH49uR29oyfH1ra8Q==
-
-"@esbuild/android-arm@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.20.0.tgz#1397a2c54c476c4799f9b9073550ede496c94ba5"
-  integrity sha512-3bMAfInvByLHfJwYPJRlpTeaQA75n8C/QKpEaiS4HrFWFiJlNI0vzq/zCjBrhAYcPyVPG7Eo9dMrcQXuqmNk5g==
-
-"@esbuild/android-x64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.20.0.tgz#2b615abefb50dc0a70ac313971102f4ce2fdb3ca"
-  integrity sha512-uK7wAnlRvjkCPzh8jJ+QejFyrP8ObKuR5cBIsQZ+qbMunwR8sbd8krmMbxTLSrDhiPZaJYKQAU5Y3iMDcZPhyQ==
-
-"@esbuild/darwin-arm64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.20.0.tgz#5c122ed799eb0c35b9d571097f77254964c276a2"
-  integrity sha512-AjEcivGAlPs3UAcJedMa9qYg9eSfU6FnGHJjT8s346HSKkrcWlYezGE8VaO2xKfvvlZkgAhyvl06OJOxiMgOYQ==
-
-"@esbuild/darwin-x64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.20.0.tgz#9561d277002ba8caf1524f209de2b22e93d170c1"
-  integrity sha512-bsgTPoyYDnPv8ER0HqnJggXK6RyFy4PH4rtsId0V7Efa90u2+EifxytE9pZnsDgExgkARy24WUQGv9irVbTvIw==
-
-"@esbuild/freebsd-arm64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.0.tgz#84178986a3138e8500d17cc380044868176dd821"
-  integrity sha512-kQ7jYdlKS335mpGbMW5tEe3IrQFIok9r84EM3PXB8qBFJPSc6dpWfrtsC/y1pyrz82xfUIn5ZrnSHQQsd6jebQ==
-
-"@esbuild/freebsd-x64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.20.0.tgz#3f9ce53344af2f08d178551cd475629147324a83"
-  integrity sha512-uG8B0WSepMRsBNVXAQcHf9+Ko/Tr+XqmK7Ptel9HVmnykupXdS4J7ovSQUIi0tQGIndhbqWLaIL/qO/cWhXKyQ==
-
-"@esbuild/linux-arm64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.20.0.tgz#24efa685515689df4ecbc13031fa0a9dda910a11"
-  integrity sha512-uTtyYAP5veqi2z9b6Gr0NUoNv9F/rOzI8tOD5jKcCvRUn7T60Bb+42NDBCWNhMjkQzI0qqwXkQGo1SY41G52nw==
-
-"@esbuild/linux-arm@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.20.0.tgz#6b586a488e02e9b073a75a957f2952b3b6e87b4c"
-  integrity sha512-2ezuhdiZw8vuHf1HKSf4TIk80naTbP9At7sOqZmdVwvvMyuoDiZB49YZKLsLOfKIr77+I40dWpHVeY5JHpIEIg==
-
-"@esbuild/linux-ia32@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.20.0.tgz#84ce7864f762708dcebc1b123898a397dea13624"
-  integrity sha512-c88wwtfs8tTffPaoJ+SQn3y+lKtgTzyjkD8NgsyCtCmtoIC8RDL7PrJU05an/e9VuAke6eJqGkoMhJK1RY6z4w==
-
-"@esbuild/linux-loong64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.20.0.tgz#1922f571f4cae1958e3ad29439c563f7d4fd9037"
-  integrity sha512-lR2rr/128/6svngnVta6JN4gxSXle/yZEZL3o4XZ6esOqhyR4wsKyfu6qXAL04S4S5CgGfG+GYZnjFd4YiG3Aw==
-
-"@esbuild/linux-mips64el@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.20.0.tgz#7ca1bd9df3f874d18dbf46af009aebdb881188fe"
-  integrity sha512-9Sycc+1uUsDnJCelDf6ZNqgZQoK1mJvFtqf2MUz4ujTxGhvCWw+4chYfDLPepMEvVL9PDwn6HrXad5yOrNzIsQ==
-
-"@esbuild/linux-ppc64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.20.0.tgz#8f95baf05f9486343bceeb683703875d698708a4"
-  integrity sha512-CoWSaaAXOZd+CjbUTdXIJE/t7Oz+4g90A3VBCHLbfuc5yUQU/nFDLOzQsN0cdxgXd97lYW/psIIBdjzQIwTBGw==
-
-"@esbuild/linux-riscv64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.20.0.tgz#ca63b921d5fe315e28610deb0c195e79b1a262ca"
-  integrity sha512-mlb1hg/eYRJUpv8h/x+4ShgoNLL8wgZ64SUr26KwglTYnwAWjkhR2GpoKftDbPOCnodA9t4Y/b68H4J9XmmPzA==
-
-"@esbuild/linux-s390x@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.20.0.tgz#cb3d069f47dc202f785c997175f2307531371ef8"
-  integrity sha512-fgf9ubb53xSnOBqyvWEY6ukBNRl1mVX1srPNu06B6mNsNK20JfH6xV6jECzrQ69/VMiTLvHMicQR/PgTOgqJUQ==
-
-"@esbuild/linux-x64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.20.0.tgz#ac617e0dc14e9758d3d7efd70288c14122557dc7"
-  integrity sha512-H9Eu6MGse++204XZcYsse1yFHmRXEWgadk2N58O/xd50P9EvFMLJTQLg+lB4E1cF2xhLZU5luSWtGTb0l9UeSg==
-
-"@esbuild/netbsd-x64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.20.0.tgz#6cc778567f1513da6e08060e0aeb41f82eb0f53c"
-  integrity sha512-lCT675rTN1v8Fo+RGrE5KjSnfY0x9Og4RN7t7lVrN3vMSjy34/+3na0q7RIfWDAj0e0rCh0OL+P88lu3Rt21MQ==
-
-"@esbuild/openbsd-x64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.20.0.tgz#76848bcf76b4372574fb4d06cd0ed1fb29ec0fbe"
-  integrity sha512-HKoUGXz/TOVXKQ+67NhxyHv+aDSZf44QpWLa3I1lLvAwGq8x1k0T+e2HHSRvxWhfJrFxaaqre1+YyzQ99KixoA==
-
-"@esbuild/sunos-x64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.20.0.tgz#ea4cd0639bf294ad51bc08ffbb2dac297e9b4706"
-  integrity sha512-GDwAqgHQm1mVoPppGsoq4WJwT3vhnz/2N62CzhvApFD1eJyTroob30FPpOZabN+FgCjhG+AgcZyOPIkR8dfD7g==
-
-"@esbuild/win32-arm64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.20.0.tgz#a5c171e4a7f7e4e8be0e9947a65812c1535a7cf0"
-  integrity sha512-0vYsP8aC4TvMlOQYozoksiaxjlvUcQrac+muDqj1Fxy6jh9l9CZJzj7zmh8JGfiV49cYLTorFLxg7593pGldwQ==
-
-"@esbuild/win32-ia32@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.20.0.tgz#f8ac5650c412d33ea62d7551e0caf82da52b7f85"
-  integrity sha512-p98u4rIgfh4gdpV00IqknBD5pC84LCub+4a3MO+zjqvU5MVXOc3hqR2UgT2jI2nh3h8s9EQxmOsVI3tyzv1iFg==
-
-"@esbuild/win32-x64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.20.0.tgz#2efddf82828aac85e64cef62482af61c29561bee"
-  integrity sha512-NgJnesu1RtWihtTtXGFMU5YSE6JyyHPMxCwBZK7a6/8d31GuSo9l0Ss7w1Jw5QnKUawG6UEehs883kcXf5fYwg==
-
-"@malept/cross-spawn-promise@^1.1.0":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d"
-  integrity sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==
-  dependencies:
-    cross-spawn "^7.0.1"
-
-"@opentelemetry/api@^1.0.1":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.0.3.tgz#13a12ae9e05c2a782f7b5e84c3cbfda4225eaf80"
-  integrity sha512-puWxACExDe9nxbBB3lOymQFrLYml2dVOrd7USiVRnSbgXE+KwBu+HxFvxrzfqsiSda9IWsXJG1ef7C1O2/GmKQ==
-
-"@sindresorhus/is@^4.0.0":
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f"
-  integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==
-
-"@szmarczak/http-timer@^4.0.5":
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807"
-  integrity sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==
-  dependencies:
-    defer-to-connect "^2.0.0"
-
-"@tootallnate/once@1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
-  integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
-
-"@types/ansi-colors@^3.2.0":
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/@types/ansi-colors/-/ansi-colors-3.2.0.tgz#3e4fe85d9131ce1c6994f3040bd0b25306c16a6e"
-  integrity sha512-0caWAhXht9N2lOdMzJLXybsSkYCx1QOdxx6pae48tswI9QV3DFX26AoOpy0JxwhCb+zISTqmd6H8t9Zby9BoZg==
-
-"@types/byline@^4.2.32":
-  version "4.2.32"
-  resolved "https://registry.yarnpkg.com/@types/byline/-/byline-4.2.32.tgz#9d35ec15968056118548412ee24c2c3026c997dc"
-  integrity sha512-qtlm/J6XOO9p+Ep/ZB5+mCFEDhzWDDHWU4a1eReN7lkPZXW9rkloq2jcAhvKKmlO5tL2GSvKROb+PTsNVhBiyQ==
-  dependencies:
-    "@types/node" "*"
-
-"@types/cacheable-request@^6.0.1":
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.3.tgz#a430b3260466ca7b5ca5bfd735693b36e7a9d183"
-  integrity sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==
-  dependencies:
-    "@types/http-cache-semantics" "*"
-    "@types/keyv" "^3.1.4"
-    "@types/node" "*"
-    "@types/responselike" "^1.0.0"
-
-"@types/debounce@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@types/debounce/-/debounce-1.0.0.tgz#417560200331e1bb84d72da85391102c2fcd61b7"
-  integrity sha1-QXVgIAMx4buE1y2oU5EQLC/NYbc=
-
-"@types/debug@^4.1.5":
-  version "4.1.9"
-  resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.9.tgz#906996938bc672aaf2fb8c0d3733ae1dda05b005"
-  integrity sha512-8Hz50m2eoS56ldRlepxSBa6PWEVCtzUo/92HgLc2qTMnotJNIm7xP+UZhyWoYsyOdd5dxZ+NZLb24rsKyFs2ow==
-  dependencies:
-    "@types/ms" "*"
-
-"@types/events@*":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@types/events/-/events-1.2.0.tgz#81a6731ce4df43619e5c8c945383b3e62a89ea86"
-  integrity sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA==
-
-"@types/expect@^1.20.4":
-  version "1.20.4"
-  resolved "https://registry.yarnpkg.com/@types/expect/-/expect-1.20.4.tgz#8288e51737bf7e3ab5d7c77bfa695883745264e5"
-  integrity sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg==
-
-"@types/fancy-log@^1.3.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@types/fancy-log/-/fancy-log-1.3.0.tgz#a61ab476e5e628cd07a846330df53b85e05c8ce0"
-  integrity sha512-mQjDxyOM1Cpocd+vm1kZBP7smwKZ4TNokFeds9LV7OZibmPJFEzY3+xZMrKfUdNT71lv8GoCPD6upKwHxubClw==
-
-"@types/fs-extra@^9.0.12":
-  version "9.0.12"
-  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.12.tgz#9b8f27973df8a7a3920e8461517ebf8a7d4fdfaf"
-  integrity sha512-I+bsBr67CurCGnSenZZ7v94gd3tc3+Aj2taxMT4yu4ABLuOgOjeFxX3dokG24ztSRg5tnT00sL8BszO7gSMoIw==
-  dependencies:
-    "@types/node" "*"
-
-"@types/glob-stream@*":
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/@types/glob-stream/-/glob-stream-6.1.0.tgz#7ede8a33e59140534f8d8adfb8ac9edfb31897bc"
-  integrity sha512-RHv6ZQjcTncXo3thYZrsbAVwoy4vSKosSWhuhuQxLOTv74OJuFQxXkmUuZCr3q9uNBEVCvIzmZL/FeRNbHZGUg==
-  dependencies:
-    "@types/glob" "*"
-    "@types/node" "*"
-
-"@types/glob@*", "@types/glob@^7.1.1":
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
-  integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==
-  dependencies:
-    "@types/events" "*"
-    "@types/minimatch" "*"
-    "@types/node" "*"
-
-"@types/gulp-concat@^0.0.32":
-  version "0.0.32"
-  resolved "https://registry.yarnpkg.com/@types/gulp-concat/-/gulp-concat-0.0.32.tgz#72486028b1cf5faa94c8c1cf34c626531cecacd6"
-  integrity sha512-CUCFADlITzzBfBa2bdGzhKtvBr4eFh+evb+4igVbvPoO5RyPfHifmyQlZl6lM7q19+OKncRlFXDU7B4X9Ayo2g==
-  dependencies:
-    "@types/node" "*"
-
-"@types/gulp-filter@^3.0.32":
-  version "3.0.32"
-  resolved "https://registry.yarnpkg.com/@types/gulp-filter/-/gulp-filter-3.0.32.tgz#eeff3e9dbc092268fed01f2421ab00f6c8cb4848"
-  integrity sha512-JvY4qTxXehoK2yCUxYVxTMvckVbDM5TWHWeUoYJyX31gwFqw4YDD6JNzhuTxI3yHPUTY4BBRTqgm6puQEZVCNg==
-  dependencies:
-    "@types/minimatch" "*"
-    "@types/node" "*"
-    "@types/vinyl" "*"
-
-"@types/gulp-gzip@^0.0.31":
-  version "0.0.31"
-  resolved "https://registry.yarnpkg.com/@types/gulp-gzip/-/gulp-gzip-0.0.31.tgz#9358def25540442138fd61a7227f40d4c1e26760"
-  integrity sha512-KQjHz1FTqLse8/EiktfhN/vo33vamX4gVAQhMTp55STDBA7UToW5CJqYyP7iRorkHK9/aJ2nL2hLkNZkY4M8+w==
-  dependencies:
-    "@types/node" "*"
-
-"@types/gulp-json-editor@^2.2.31":
-  version "2.2.31"
-  resolved "https://registry.yarnpkg.com/@types/gulp-json-editor/-/gulp-json-editor-2.2.31.tgz#3c1a8950556c109a0e2d0ab11d5f2a2443665ed2"
-  integrity sha512-piis0ImYAy0dt18R4EtTbAY+RV8jwTq5VisnUV6OfP8kD4743aHGkAdAd08No4NY3rFa5mD6ytIu8L0YU7nL9w==
-  dependencies:
-    "@types/js-beautify" "*"
-    "@types/node" "*"
-
-"@types/gulp-rename@^0.0.33":
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/@types/gulp-rename/-/gulp-rename-0.0.33.tgz#38d146e97786569f74f5391a1b1f9b5198674b6c"
-  integrity sha512-FIZQvbZJj6V1gHPTzO+g/BCWpDur7fJrroae4gwV3LaoHBQ+MrR9sB+2HssK8fHv4WdY6hVNxkcft9bYatuPIA==
-  dependencies:
-    "@types/node" "*"
-
-"@types/gulp-sourcemaps@^0.0.32":
-  version "0.0.32"
-  resolved "https://registry.yarnpkg.com/@types/gulp-sourcemaps/-/gulp-sourcemaps-0.0.32.tgz#e79ee617e0cb15729874be4533fe59c07793a175"
-  integrity sha512-+7BAmptW2bxyJnJcCEuie7vLoop3FwWgCdBMzyv7MYXED/HeNMeQuX7uPCkp4vfU1TTu4CYFH0IckNPvo0VePA==
-  dependencies:
-    "@types/node" "*"
-
-"@types/gulp@^4.0.17":
-  version "4.0.17"
-  resolved "https://registry.yarnpkg.com/@types/gulp/-/gulp-4.0.17.tgz#b314c3762d08d8d69b7c0b86f78d069bafd65009"
-  integrity sha512-+pKQynu2C/HS16kgmDlAicjtFYP8kaa86eE9P0Ae7GB5W29we/E2TIdbOWtEZD5XkpY+jr8fyqfwO6SWZecLpQ==
-  dependencies:
-    "@types/node" "*"
-    "@types/undertaker" ">=1.2.6"
-    "@types/vinyl-fs" "*"
-    chokidar "^3.3.1"
-
-"@types/http-cache-semantics@*":
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz#b979ebad3919799c979b17c72621c0bc0a31c6c4"
-  integrity sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==
-
-"@types/js-beautify@*":
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/@types/js-beautify/-/js-beautify-1.8.0.tgz#0369d3d0e1f35a6aec07cb4da2ee2bcda111367c"
-  integrity sha512-/siF86XrwDKLuHe8l7h6NhrAWgLdgqbxmjZv9NvGWmgYRZoTipkjKiWb0SQHy/jcR+ee0GvbG6uGd+LEBMGNvA==
-
-"@types/keyv@^3.1.4":
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz#3ccdb1c6751b0c7e52300bcdacd5bcbf8faa75b6"
-  integrity sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==
-  dependencies:
-    "@types/node" "*"
-
-"@types/mime@0.0.29":
-  version "0.0.29"
-  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-0.0.29.tgz#fbcfd330573b912ef59eeee14602bface630754b"
-  integrity sha1-+8/TMFc7kS71nu7hRgK/rOYwdUs=
-
-"@types/minimatch@*", "@types/minimatch@^3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
-  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
-
-"@types/minimist@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.1.tgz#283f669ff76d7b8260df8ab7a4262cc83d988256"
-  integrity sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==
-
-"@types/mkdirp@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@types/mkdirp/-/mkdirp-1.0.1.tgz#0930b948914a78587de35458b86c907b6e98bbf6"
-  integrity sha512-HkGSK7CGAXncr8Qn/0VqNtExEE+PHMWb+qlR1faHMao7ng6P3tAaoWWBMdva0gL5h4zprjIO89GJOLXsMcDm1Q==
-  dependencies:
-    "@types/node" "*"
-
-"@types/mocha@^9.1.1":
-  version "9.1.1"
-  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-9.1.1.tgz#e7c4f1001eefa4b8afbd1eee27a237fee3bf29c4"
-  integrity sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==
-
-"@types/ms@*":
-  version "0.7.32"
-  resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.32.tgz#f6cd08939ae3ad886fcc92ef7f0109dacddf61ab"
-  integrity sha512-xPSg0jm4mqgEkNhowKgZFBNtwoEwF6gJ4Dhww+GFpm3IgtNseHQZ5IqdNwnquZEoANxyDAKDRAdVo4Z72VvD/g==
-
-"@types/node-fetch@^2.5.0":
-  version "2.5.8"
-  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.8.tgz#e199c835d234c7eb0846f6618012e558544ee2fb"
-  integrity sha512-fbjI6ja0N5ZA8TV53RUqzsKNkl9fv8Oj3T7zxW7FGv1GSH7gwJaNF8dzCjrqKaxKeUpTz4yT1DaJFq/omNpGfw==
-  dependencies:
-    "@types/node" "*"
-    form-data "^3.0.0"
-
-"@types/node@*":
-  version "8.0.51"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.51.tgz#b31d716fb8d58eeb95c068a039b9b6292817d5fb"
-  integrity sha512-El3+WJk2D/ppWNd2X05aiP5l2k4EwF7KwheknQZls+I26eSICoWRhRIJ56jGgw2dqNGQ5LtNajmBU2ajS28EvQ==
-
-"@types/node@20.x":
-  version "20.11.24"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792"
-  integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==
-  dependencies:
-    undici-types "~5.26.4"
-
-"@types/pump@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@types/pump/-/pump-1.0.1.tgz#ae8157cefef04d1a4d24c1cc91d403c2f5da5cd0"
-  integrity sha1-roFXzv7wTRpNJMHMkdQDwvXaXNA=
-  dependencies:
-    "@types/node" "*"
-
-"@types/responselike@^1.0.0":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.3.tgz#cc29706f0a397cfe6df89debfe4bf5cea159db50"
-  integrity sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==
-  dependencies:
-    "@types/node" "*"
-
-"@types/rimraf@^2.0.4":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.4.tgz#403887b0b53c6100a6c35d2ab24f6ccc042fec46"
-  integrity sha512-8gBudvllD2A/c0CcEX/BivIDorHFt5UI5m46TsNj8DjWCCTTZT74kEe4g+QsY7P/B9WdO98d82zZgXO/RQzu2Q==
-  dependencies:
-    "@types/glob" "*"
-    "@types/node" "*"
-
-"@types/through2@^2.0.36":
-  version "2.0.36"
-  resolved "https://registry.yarnpkg.com/@types/through2/-/through2-2.0.36.tgz#35fda0db635827d44c0e08e2c94653e647574a00"
-  integrity sha512-vuifQksQHJXhV9McpVsXKuhnf3lsoX70PnhcqIAbs9dqLH2NgrGz0DzZPDY3+Yh6eaRqcE1gnCQ6QhBn1/PT5A==
-  dependencies:
-    "@types/node" "*"
-
-"@types/through@^0.0.29":
-  version "0.0.29"
-  resolved "https://registry.yarnpkg.com/@types/through/-/through-0.0.29.tgz#72943aac922e179339c651fa34a4428a4d722f93"
-  integrity sha512-9a7C5VHh+1BKblaYiq+7Tfc+EOmjMdZaD1MYtkQjSoxgB69tBjW98ry6SKsi4zEIWztLOMRuL87A3bdT/Fc/4w==
-  dependencies:
-    "@types/node" "*"
-
-"@types/tmp@^0.2.1":
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/@types/tmp/-/tmp-0.2.1.tgz#83ecf4ec22a8c218c71db25f316619fe5b986011"
-  integrity sha512-7cTXwKP/HLOPVgjg+YhBdQ7bMiobGMuoBmrGmqwIWJv8elC6t1DfVc/mn4fD9UE1IjhwmhaQ5pGVXkmXbH0rhg==
-
-"@types/tunnel@^0.0.3":
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/@types/tunnel/-/tunnel-0.0.3.tgz#f109e730b072b3136347561fc558c9358bb8c6e9"
-  integrity sha512-sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA==
-  dependencies:
-    "@types/node" "*"
-
-"@types/undertaker-registry@*":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@types/undertaker-registry/-/undertaker-registry-1.0.1.tgz#4306d4a03d7acedb974b66530832b90729e1d1da"
-  integrity sha512-Z4TYuEKn9+RbNVk1Ll2SS4x1JeLHecolIbM/a8gveaHsW0Hr+RQMraZACwTO2VD7JvepgA6UO1A1VrbktQrIbQ==
-
-"@types/undertaker@>=1.2.6":
-  version "1.2.11"
-  resolved "https://registry.yarnpkg.com/@types/undertaker/-/undertaker-1.2.11.tgz#d9e08b72c4bea5fc40e5bad63ad5a1a2b675e3ca"
-  integrity sha512-j1Z0V2ByRHr8ZK7eOeGq0LGkkdthNFW0uAZGY22iRkNQNL9/vAV0yFPr1QN3FM/peY5bxs9P+1f0PYJTQVa5iA==
-  dependencies:
-    "@types/node" "*"
-    "@types/undertaker-registry" "*"
-    async-done "~1.3.2"
-
-"@types/vinyl-fs@*":
-  version "2.4.9"
-  resolved "https://registry.yarnpkg.com/@types/vinyl-fs/-/vinyl-fs-2.4.9.tgz#d312c24b5ba8d2db456d23ee4a66f9d016af82ea"
-  integrity sha512-Q0EXd6c1fORjiOuK4ZaKdfFcMyFzJlTi56dqktwaWVLIDAzE49wUs3bKnYbZwzyMWoH+NcMWnRuR73S9A0jnRA==
-  dependencies:
-    "@types/events" "*"
-    "@types/glob-stream" "*"
-    "@types/node" "*"
-    "@types/vinyl" "*"
-
-"@types/vinyl@*":
-  version "2.0.12"
-  resolved "https://registry.yarnpkg.com/@types/vinyl/-/vinyl-2.0.12.tgz#17642ca9a8ae10f3db018e9f885da4188db4c6e6"
-  integrity sha512-Sr2fYMBUVGYq8kj3UthXFAu5UN6ZW+rYr4NACjZQJvHvj+c8lYv0CahmZ2P/r7iUkN44gGUBwqxZkrKXYPb7cw==
-  dependencies:
-    "@types/expect" "^1.20.4"
-    "@types/node" "*"
-
-"@types/workerpool@^6.4.0":
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/@types/workerpool/-/workerpool-6.4.0.tgz#c79292915dd08350d10e78e74687b6f401f270b8"
-  integrity sha512-SIF2/169pDsLKeM8GQGHkOFifGalDbZgiBSaLUnnlVSRsAOenkAvQ6h4uhV2W+PZZczS+8LQxACwNkSykdT91A==
-  dependencies:
-    "@types/node" "*"
-
-"@types/xml2js@0.0.33":
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/@types/xml2js/-/xml2js-0.0.33.tgz#20c5dd6460245284d64a55690015b95e409fb7de"
-  integrity sha1-IMXdZGAkUoTWSlVpABW5XkCft94=
-
-"@types/yauzl@^2.9.1":
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.2.tgz#c48e5d56aff1444409e39fa164b0b4d4552a7b7a"
-  integrity sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==
-  dependencies:
-    "@types/node" "*"
-
-"@vscode/iconv-lite-umd@0.7.0":
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz#d2f1e0664ee6036408f9743fee264ea0699b0e48"
-  integrity sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg==
-
-"@vscode/vsce@^2.16.0":
-  version "2.16.0"
-  resolved "https://registry.yarnpkg.com/@vscode/vsce/-/vsce-2.16.0.tgz#a3ddcf7e84914576f35d891e236bc496c568776f"
-  integrity sha512-BhJ0zO7UxShLFBZM6jwOLt1ZVoqQ4r5Lj/kHNeYp0ICPXhz/erqBSMQnHkRgkjn2L/bh+TYFGkZyguhu/SKsjw==
-  dependencies:
-    azure-devops-node-api "^11.0.1"
-    chalk "^2.4.2"
-    cheerio "^1.0.0-rc.9"
-    commander "^6.1.0"
-    glob "^7.0.6"
-    hosted-git-info "^4.0.2"
-    leven "^3.1.0"
-    markdown-it "^12.3.2"
-    mime "^1.3.4"
-    minimatch "^3.0.3"
-    parse-semver "^1.1.1"
-    read "^1.0.7"
-    semver "^5.1.0"
-    tmp "^0.2.1"
-    typed-rest-client "^1.8.4"
-    url-join "^4.0.1"
-    xml2js "^0.4.23"
-    yauzl "^2.3.1"
-    yazl "^2.2.2"
-  optionalDependencies:
-    keytar "^7.7.0"
-
-agent-base@6:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
-  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
-  dependencies:
-    debug "4"
-
-ansi-colors@4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
-  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
-
-ansi-colors@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9"
-  integrity sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==
-  dependencies:
-    ansi-wrap "^0.1.0"
-
-ansi-gray@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"
-  integrity sha1-KWLPVOyXksSFEKPetSRDaGHvclE=
-  dependencies:
-    ansi-wrap "0.1.0"
-
-ansi-styles@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
-  dependencies:
-    color-convert "^1.9.0"
-
-ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
-  integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768=
-
-anymatch@^3.1.1, anymatch@~3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
-  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
-  dependencies:
-    normalize-path "^3.0.0"
-    picomatch "^2.0.4"
-
-anymatch@~3.1.2:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
-  integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
-  dependencies:
-    normalize-path "^3.0.0"
-    picomatch "^2.0.4"
-
-argparse@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
-  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
-
-arr-diff@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
-  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
-
-arr-union@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
-  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
-
-asar@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/asar/-/asar-3.0.3.tgz#1fef03c2d6d2de0cbad138788e4f7ae03b129c7b"
-  integrity sha512-k7zd+KoR+n8pl71PvgElcoKHrVNiSXtw7odKbyNpmgKe7EGRF9Pnu3uLOukD37EvavKwVFxOUpqXTIZC5B5Pmw==
-  dependencies:
-    chromium-pickle-js "^0.2.0"
-    commander "^5.0.0"
-    glob "^7.1.6"
-    minimatch "^3.0.4"
-  optionalDependencies:
-    "@types/glob" "^7.1.1"
-
-assign-symbols@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
-  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
-
-async-done@~1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/async-done/-/async-done-1.3.2.tgz#5e15aa729962a4b07414f528a88cdf18e0b290a2"
-  integrity sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.2"
-    process-nextick-args "^2.0.0"
-    stream-exhaust "^1.0.1"
-
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
-
-at-least-node@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
-  integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
-
-azure-devops-node-api@^11.0.1:
-  version "11.2.0"
-  resolved "https://registry.yarnpkg.com/azure-devops-node-api/-/azure-devops-node-api-11.2.0.tgz#bf04edbef60313117a0507415eed4790a420ad6b"
-  integrity sha512-XdiGPhrpaT5J8wdERRKs5g8E0Zy1pvOYTli7z9E8nmOn3YGp4FhtjhrOyFmX/8veWCwdI69mCHKJw6l+4J/bHA==
-  dependencies:
-    tunnel "0.0.6"
-    typed-rest-client "^1.8.4"
-
-balanced-match@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
-  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
-
-base64-js@^1.3.1, base64-js@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
-  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
-
-binary-extensions@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
-  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
-
-bl@^4.0.3:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
-  integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
-  dependencies:
-    buffer "^5.5.0"
-    inherits "^2.0.4"
-    readable-stream "^3.4.0"
-
-bluebird@^3.5.0:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
-  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
-
-boolbase@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
-  integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
-
-boolean@^3.0.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.1.2.tgz#e30f210a26b02458482a8cc353ab06f262a780c2"
-  integrity sha512-YN6UmV0FfLlBVvRvNPx3pz5W/mUoYB24J4WSXOKP/OOJpi+Oq6WYqPaNTHzjI0QzwWtnvEd5CGYyQPgp1jFxnw==
-
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-braces@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
-  dependencies:
-    fill-range "^7.0.1"
-
-buffer-alloc-unsafe@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
-  integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
-
-buffer-alloc@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
-  integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
-  dependencies:
-    buffer-alloc-unsafe "^1.1.0"
-    buffer-fill "^1.0.0"
-
-buffer-crc32@~0.2.3:
-  version "0.2.13"
-  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
-  integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
-
-buffer-equal-constant-time@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
-  integrity sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=
-
-buffer-equal@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe"
-  integrity sha1-WWFrSYME1Var1GaWayLu2j7KX74=
-
-buffer-fill@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
-  integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
-
-buffer@^5.5.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
-  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
-  dependencies:
-    base64-js "^1.3.1"
-    ieee754 "^1.1.13"
-
-byline@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
-  integrity sha1-dBxSFkaOrcRXsDQQEYrXfejB3bE=
-
-cacheable-lookup@^5.0.3:
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005"
-  integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==
-
-cacheable-request@^7.0.2:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.4.tgz#7a33ebf08613178b403635be7b899d3e69bbe817"
-  integrity sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==
-  dependencies:
-    clone-response "^1.0.2"
-    get-stream "^5.1.0"
-    http-cache-semantics "^4.0.0"
-    keyv "^4.0.0"
-    lowercase-keys "^2.0.0"
-    normalize-url "^6.0.1"
-    responselike "^2.0.0"
-
-call-bind@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
-  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
-  dependencies:
-    function-bind "^1.1.1"
-    get-intrinsic "^1.0.2"
-
-chalk@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-cheerio-select@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-2.1.0.tgz#4d8673286b8126ca2a8e42740d5e3c4884ae21b4"
-  integrity sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==
-  dependencies:
-    boolbase "^1.0.0"
-    css-select "^5.1.0"
-    css-what "^6.1.0"
-    domelementtype "^2.3.0"
-    domhandler "^5.0.3"
-    domutils "^3.0.1"
-
-cheerio@^1.0.0-rc.9:
-  version "1.0.0-rc.12"
-  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.12.tgz#788bf7466506b1c6bf5fae51d24a2c4d62e47683"
-  integrity sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q==
-  dependencies:
-    cheerio-select "^2.1.0"
-    dom-serializer "^2.0.0"
-    domhandler "^5.0.3"
-    domutils "^3.0.1"
-    htmlparser2 "^8.0.1"
-    parse5 "^7.0.0"
-    parse5-htmlparser2-tree-adapter "^7.0.0"
-
-chokidar@3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a"
-  integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==
-  dependencies:
-    anymatch "~3.1.1"
-    braces "~3.0.2"
-    glob-parent "~5.1.0"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.5.0"
-  optionalDependencies:
-    fsevents "~2.3.1"
-
-chokidar@^3.3.1:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
-  integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==
-  dependencies:
-    anymatch "~3.1.2"
-    braces "~3.0.2"
-    glob-parent "~5.1.2"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.6.0"
-  optionalDependencies:
-    fsevents "~2.3.2"
-
-chownr@^1.1.1:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
-  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
-
-chromium-pickle-js@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205"
-  integrity sha1-BKEGZywYsIWrd02YPfo+oTjyIgU=
-
-clone-buffer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
-  integrity sha1-4+JbIHrE5wGvch4staFnksrD3Fg=
-
-clone-response@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
-  integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=
-  dependencies:
-    mimic-response "^1.0.0"
-
-clone-stats@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680"
-  integrity sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=
-
-clone@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
-  integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
-
-cloneable-readable@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz#120a00cb053bfb63a222e709f9683ea2e11d8cec"
-  integrity sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==
-  dependencies:
-    inherits "^2.0.1"
-    process-nextick-args "^2.0.0"
-    readable-stream "^2.3.5"
-
-color-convert@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
-  dependencies:
-    color-name "1.1.3"
-
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
-
-color-support@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
-  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
-
-colors@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
-  integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=
-
-colors@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
-  integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
-
-combined-stream@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
-  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
-  dependencies:
-    delayed-stream "~1.0.0"
-
-commander@2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
-  integrity sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=
-  dependencies:
-    graceful-readlink ">= 1.0.0"
-
-commander@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
-  integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
-
-commander@^6.1.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"
-  integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==
-
-commander@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-7.0.0.tgz#3e2bbfd8bb6724760980988fb5b22b7ee6b71ab2"
-  integrity sha512-ovx/7NkTrnPuIV8sqk/GjUIIM1+iUQeqA3ye2VNpq9sVoiZsooObWlQy+OPWGI17GDaEoybuAGJm6U8yC077BA==
-
-compare-version@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080"
-  integrity sha1-AWLsLZNR9d3VmpICy6k1NmpyUIA=
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
-
-core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
-
-cross-spawn@^7.0.1:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
-  dependencies:
-    path-key "^3.1.0"
-    shebang-command "^2.0.0"
-    which "^2.0.1"
-
-css-select@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-5.1.0.tgz#b8ebd6554c3637ccc76688804ad3f6a6fdaea8a6"
-  integrity sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==
-  dependencies:
-    boolbase "^1.0.0"
-    css-what "^6.1.0"
-    domhandler "^5.0.2"
-    domutils "^3.0.1"
-    nth-check "^2.0.1"
-
-css-what@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4"
-  integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==
-
-debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
-  dependencies:
-    ms "2.1.2"
-
-debug@^2.6.8:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
-  dependencies:
-    ms "2.0.0"
-
-decompress-response@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc"
-  integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==
-  dependencies:
-    mimic-response "^3.1.0"
-
-deep-extend@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
-  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
-
-defer-to-connect@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587"
-  integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==
-
-define-lazy-prop@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
-  integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
-
-define-properties@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
-  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
-  dependencies:
-    object-keys "^1.0.12"
-
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
-
-detect-libc@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd"
-  integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==
-
-detect-node@^2.0.4:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
-  integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
-
-dir-compare@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz#785c41dc5f645b34343a4eafc50b79bac7f11631"
-  integrity sha512-l9hmu8x/rjVC9Z2zmGzkhOEowZvW7pmYws5CWHutg8u1JgvsKWMx7Q/UODeu4djLZ4FgW5besw5yvMQnBHzuCA==
-  dependencies:
-    buffer-equal "1.0.0"
-    colors "1.0.3"
-    commander "2.9.0"
-    minimatch "3.0.4"
-
-dom-serializer@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53"
-  integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==
-  dependencies:
-    domelementtype "^2.3.0"
-    domhandler "^5.0.2"
-    entities "^4.2.0"
-
-domelementtype@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
-  integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
-
-domhandler@^5.0.1, domhandler@^5.0.2, domhandler@^5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31"
-  integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==
-  dependencies:
-    domelementtype "^2.3.0"
-
-domutils@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.0.1.tgz#696b3875238338cb186b6c0612bd4901c89a4f1c"
-  integrity sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==
-  dependencies:
-    dom-serializer "^2.0.0"
-    domelementtype "^2.3.0"
-    domhandler "^5.0.1"
-
-duplexify@^4.1.1:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-4.1.2.tgz#18b4f8d28289132fa0b9573c898d9f903f81c7b0"
-  integrity sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw==
-  dependencies:
-    end-of-stream "^1.4.1"
-    inherits "^2.0.3"
-    readable-stream "^3.1.1"
-    stream-shift "^1.0.0"
-
-ecdsa-sig-formatter@1.0.11:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz#ae0f0fa2d85045ef14a817daa3ce9acd0489e5bf"
-  integrity sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==
-  dependencies:
-    safe-buffer "^5.0.1"
-
-electron-osx-sign@^0.4.16:
-  version "0.4.16"
-  resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.4.16.tgz#0be8e579b2d9fa4c12d2a21f063898294b3434aa"
-  integrity sha512-ziMWfc3NmQlwnWLW6EaZq8nH2BWVng/atX5GWsGwhexJYpdW6hsg//MkAfRTRx1kR3Veiqkeiog1ibkbA4x0rg==
-  dependencies:
-    bluebird "^3.5.0"
-    compare-version "^0.1.2"
-    debug "^2.6.8"
-    isbinaryfile "^3.0.2"
-    minimist "^1.2.0"
-    plist "^3.0.1"
-
-end-of-stream@^1.1.0, end-of-stream@^1.4.1:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
-  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
-  dependencies:
-    once "^1.4.0"
-
-entities@^4.2.0, entities@^4.3.0, entities@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174"
-  integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==
-
-entities@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
-  integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==
-
-env-paths@^2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
-  integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
-
-es6-error@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
-  integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==
-
-esbuild@0.20.0:
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.20.0.tgz#a7170b63447286cd2ff1f01579f09970e6965da4"
-  integrity sha512-6iwE3Y2RVYCME1jLpBqq7LQWK3MW6vjV2bZy6gt/WrqkY+WE74Spyc0ThAOYpMtITvnjX09CrC6ym7A/m9mebA==
-  optionalDependencies:
-    "@esbuild/aix-ppc64" "0.20.0"
-    "@esbuild/android-arm" "0.20.0"
-    "@esbuild/android-arm64" "0.20.0"
-    "@esbuild/android-x64" "0.20.0"
-    "@esbuild/darwin-arm64" "0.20.0"
-    "@esbuild/darwin-x64" "0.20.0"
-    "@esbuild/freebsd-arm64" "0.20.0"
-    "@esbuild/freebsd-x64" "0.20.0"
-    "@esbuild/linux-arm" "0.20.0"
-    "@esbuild/linux-arm64" "0.20.0"
-    "@esbuild/linux-ia32" "0.20.0"
-    "@esbuild/linux-loong64" "0.20.0"
-    "@esbuild/linux-mips64el" "0.20.0"
-    "@esbuild/linux-ppc64" "0.20.0"
-    "@esbuild/linux-riscv64" "0.20.0"
-    "@esbuild/linux-s390x" "0.20.0"
-    "@esbuild/linux-x64" "0.20.0"
-    "@esbuild/netbsd-x64" "0.20.0"
-    "@esbuild/openbsd-x64" "0.20.0"
-    "@esbuild/sunos-x64" "0.20.0"
-    "@esbuild/win32-arm64" "0.20.0"
-    "@esbuild/win32-ia32" "0.20.0"
-    "@esbuild/win32-x64" "0.20.0"
-
-escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-
-escape-string-regexp@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
-  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
-
-events@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379"
-  integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==
-
-expand-template@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c"
-  integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==
-
-extend-shallow@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
-  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
-  dependencies:
-    assign-symbols "^1.0.0"
-    is-extendable "^1.0.1"
-
-extract-zip@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a"
-  integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==
-  dependencies:
-    debug "^4.1.1"
-    get-stream "^5.1.0"
-    yauzl "^2.10.0"
-  optionalDependencies:
-    "@types/yauzl" "^2.9.1"
-
-fancy-log@^1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7"
-  integrity sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==
-  dependencies:
-    ansi-gray "^0.1.1"
-    color-support "^1.1.3"
-    parse-node-version "^1.0.0"
-    time-stamp "^1.0.0"
-
-fast-json-stable-stringify@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
-  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
-
-fd-slicer@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
-  integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=
-  dependencies:
-    pend "~1.2.0"
-
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
-  dependencies:
-    to-regex-range "^5.0.1"
-
-first-chunk-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz#1bdecdb8e083c0664b91945581577a43a9f31d70"
-  integrity sha1-G97NuOCDwGZLkZRVgVd6Q6nzHXA=
-  dependencies:
-    readable-stream "^2.0.2"
-
-fork-stream@^0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/fork-stream/-/fork-stream-0.0.4.tgz#db849fce77f6708a5f8f386ae533a0907b54ae70"
-  integrity sha512-Pqq5NnT78ehvUnAk/We/Jr22vSvanRlFTpAmQ88xBY/M1TlHe+P0ILuEyXS595ysdGfaj22634LBkGMA2GTcpA==
-
-form-data@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.0.tgz#31b7e39c85f1355b7139ee0c647cf0de7f83c682"
-  integrity sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.8"
-    mime-types "^2.1.12"
-
-form-data@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
-  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.8"
-    mime-types "^2.1.12"
-
-fs-constants@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
-  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
-
-fs-extra@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
-  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
-  dependencies:
-    graceful-fs "^4.2.0"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
-fs-extra@^9.0.1:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
-  integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
-  dependencies:
-    at-least-node "^1.0.0"
-    graceful-fs "^4.2.0"
-    jsonfile "^6.0.1"
-    universalify "^2.0.0"
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
-
-fsevents@~2.3.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
-  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
-
-fsevents@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
-  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
-
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
-
-get-intrinsic@^1.0.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385"
-  integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==
-  dependencies:
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.3"
-
-get-stream@^5.1.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
-  integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
-  dependencies:
-    pump "^3.0.0"
-
-github-from-package@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
-  integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=
-
-glob-parent@^5.1.1, glob-parent@~5.1.0, glob-parent@~5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
-  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
-  dependencies:
-    is-glob "^4.0.1"
-
-glob@^7.0.6:
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
-  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.1.1"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.1.3, glob@^7.1.6:
-  version "7.1.7"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
-  integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-global-agent@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6"
-  integrity sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==
-  dependencies:
-    boolean "^3.0.1"
-    es6-error "^4.1.1"
-    matcher "^3.0.0"
-    roarr "^2.15.3"
-    semver "^7.3.2"
-    serialize-error "^7.0.1"
-
-globalthis@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.2.tgz#2a235d34f4d8036219f7e34929b5de9e18166b8b"
-  integrity sha512-ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ==
-  dependencies:
-    define-properties "^1.1.3"
-
-got@^11.8.5:
-  version "11.8.6"
-  resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a"
-  integrity sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==
-  dependencies:
-    "@sindresorhus/is" "^4.0.0"
-    "@szmarczak/http-timer" "^4.0.5"
-    "@types/cacheable-request" "^6.0.1"
-    "@types/responselike" "^1.0.0"
-    cacheable-lookup "^5.0.3"
-    cacheable-request "^7.0.2"
-    decompress-response "^6.0.0"
-    http2-wrapper "^1.0.0-beta.5.2"
-    lowercase-keys "^2.0.0"
-    p-cancelable "^2.0.0"
-    responselike "^2.0.0"
-
-graceful-fs@^4.1.2:
-  version "4.2.10"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
-  integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
-
-graceful-fs@^4.1.6, graceful-fs@^4.2.0:
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
-  integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==
-
-"graceful-readlink@>= 1.0.0":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
-  integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=
-
-gulp-merge-json@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/gulp-merge-json/-/gulp-merge-json-2.1.1.tgz#cfb1d066467577545b8c1c289a278e6ef4b4e0de"
-  integrity sha512-VhvAlcf+dcCb94j/2yDPWxJ3X7x4P/Xwcrv1dhjYuRgvADwFJmaQwl4zbuq+GDZvzMacbVncWtEdsETpUSkhYw==
-  dependencies:
-    json5 "^2.1.3"
-    lodash.mergewith "^4.6.1"
-    plugin-error "^1.0.1"
-    through "^2.3.8"
-    vinyl "^2.1.0"
-
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
-
-has-symbols@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
-  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
-
-has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
-  dependencies:
-    function-bind "^1.1.1"
-
-hosted-git-info@^4.0.2:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"
-  integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==
-  dependencies:
-    lru-cache "^6.0.0"
-
-htmlparser2@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.1.tgz#abaa985474fcefe269bc761a779b544d7196d010"
-  integrity sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA==
-  dependencies:
-    domelementtype "^2.3.0"
-    domhandler "^5.0.2"
-    domutils "^3.0.1"
-    entities "^4.3.0"
-
-http-cache-semantics@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
-  integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
-
-http-proxy-agent@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
-  integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==
-  dependencies:
-    "@tootallnate/once" "1"
-    agent-base "6"
-    debug "4"
-
-http2-wrapper@^1.0.0-beta.5.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d"
-  integrity sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==
-  dependencies:
-    quick-lru "^5.1.1"
-    resolve-alpn "^1.0.0"
-
-https-proxy-agent@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
-  integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
-  dependencies:
-    agent-base "6"
-    debug "4"
-
-ieee754@^1.1.13:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
-  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-ini@~1.3.0:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
-  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
-
-is-binary-path@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
-  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
-  dependencies:
-    binary-extensions "^2.0.0"
-
-is-docker@^2.0.0, is-docker@^2.1.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
-  integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
-
-is-extendable@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
-  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
-  dependencies:
-    is-plain-object "^2.0.4"
-
-is-extglob@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
-
-is-glob@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
-  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
-  dependencies:
-    is-extglob "^2.1.1"
-
-is-glob@~4.0.1:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
-  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
-  dependencies:
-    is-extglob "^2.1.1"
-
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-
-is-plain-object@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
-  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
-  dependencies:
-    isobject "^3.0.1"
-
-is-utf8@^0.2.0, is-utf8@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
-  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
-
-is-wsl@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
-  integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
-  dependencies:
-    is-docker "^2.0.0"
-
-isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
-
-isbinaryfile@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80"
-  integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==
-  dependencies:
-    buffer-alloc "^1.2.0"
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
-
-isobject@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
-
-jsbi@^3.1.3:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/jsbi/-/jsbi-3.1.4.tgz#9654dd02207a66a4911b4e4bb74265bc2cbc9dd0"
-  integrity sha512-52QRRFSsi9impURE8ZUbzAMCLjPm4THO7H2fcuIvaaeFTbSysvkodbQQXIVsNgq/ypDbq6dJiuGKL0vZ/i9hUg==
-
-json-buffer@3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
-  integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
-
-json-stringify-safe@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
-
-json5@^2.1.3:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.2.tgz#64471c5bdcc564c18f7c1d4df2e2297f2457c5ab"
-  integrity sha512-46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ==
-
-jsonc-parser@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.3.0.tgz#7c7fc988ee1486d35734faaaa866fadb00fa91ee"
-  integrity sha512-b0EBt8SWFNnixVdvoR2ZtEGa9ZqLhbJnOjezn+WP+8kspFm+PFYDN8Z4Bc7pRlDjvuVcADSUkroIuTWWn/YiIA==
-
-jsonfile@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
-  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
-jsonfile@^6.0.1:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
-  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
-  dependencies:
-    universalify "^2.0.0"
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
-jsonwebtoken@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz#d0faf9ba1cc3a56255fe49c0961a67e520c1926d"
-  integrity sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==
-  dependencies:
-    jws "^3.2.2"
-    lodash "^4.17.21"
-    ms "^2.1.1"
-    semver "^7.3.8"
-
-jwa@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a"
-  integrity sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==
-  dependencies:
-    buffer-equal-constant-time "1.0.1"
-    ecdsa-sig-formatter "1.0.11"
-    safe-buffer "^5.0.1"
-
-jwa@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/jwa/-/jwa-2.0.0.tgz#a7e9c3f29dae94027ebcaf49975c9345593410fc"
-  integrity sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==
-  dependencies:
-    buffer-equal-constant-time "1.0.1"
-    ecdsa-sig-formatter "1.0.11"
-    safe-buffer "^5.0.1"
-
-jws@^3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304"
-  integrity sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==
-  dependencies:
-    jwa "^1.4.1"
-    safe-buffer "^5.0.1"
-
-jws@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/jws/-/jws-4.0.0.tgz#2d4e8cf6a318ffaa12615e9dec7e86e6c97310f4"
-  integrity sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==
-  dependencies:
-    jwa "^2.0.0"
-    safe-buffer "^5.0.1"
-
-keytar@^7.7.0:
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/keytar/-/keytar-7.9.0.tgz#4c6225708f51b50cbf77c5aae81721964c2918cb"
-  integrity sha512-VPD8mtVtm5JNtA2AErl6Chp06JBfy7diFQ7TQQhdpWOl6MrCRB+eRbvAZUsbGQS9kiMq0coJsy0W0vHpDCkWsQ==
-  dependencies:
-    node-addon-api "^4.3.0"
-    prebuild-install "^7.0.1"
-
-keyv@^4.0.0:
-  version "4.5.4"
-  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
-  integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
-  dependencies:
-    json-buffer "3.0.1"
-
-leven@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
-  integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
-
-linkify-it@^3.0.1:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.3.tgz#a98baf44ce45a550efb4d49c769d07524cc2fa2e"
-  integrity sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==
-  dependencies:
-    uc.micro "^1.0.1"
-
-lodash.mergewith@^4.6.1:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55"
-  integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==
-
-lodash@^4.17.21:
-  version "4.17.21"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
-  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
-
-lowercase-keys@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
-  integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
-
-lru-cache@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
-  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
-  dependencies:
-    yallist "^4.0.0"
-
-markdown-it@^12.3.2:
-  version "12.3.2"
-  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.3.2.tgz#bf92ac92283fe983fe4de8ff8abfb5ad72cd0c90"
-  integrity sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==
-  dependencies:
-    argparse "^2.0.1"
-    entities "~2.1.0"
-    linkify-it "^3.0.1"
-    mdurl "^1.0.1"
-    uc.micro "^1.0.5"
-
-matcher@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca"
-  integrity sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==
-  dependencies:
-    escape-string-regexp "^4.0.0"
-
-mdurl@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
-  integrity sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==
-
-merge-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
-  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
-
-mime-db@1.45.0:
-  version "1.45.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea"
-  integrity sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==
-
-mime-types@^2.1.12:
-  version "2.1.28"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.28.tgz#1160c4757eab2c5363888e005273ecf79d2a0ecd"
-  integrity sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==
-  dependencies:
-    mime-db "1.45.0"
-
-mime@^1.3.4, mime@^1.4.1:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
-  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
-
-mimic-response@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
-  integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
-
-mimic-response@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
-  integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==
-
-minimatch@3.0.4, minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimatch@^3.0.3, minimatch@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimist@^1.2.0, minimist@^1.2.3:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
-  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
-
-mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
-  integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
-
-mkdirp@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
-
-ms@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-ms@^2.1.1:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
-  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
-
-mute-stream@~0.0.4:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
-  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
-
-nan@^2.18.0:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.19.0.tgz#bb58122ad55a6c5bc973303908d5b16cfdd5a8c0"
-  integrity sha512-nO1xXxfh/RWNxfd/XPfbIfFk5vgLsAxUR9y5O0cHMJu/AW9U95JLXqthYHjEp+8gQ5p96K9jUp8nbVOxCdRbtw==
-
-napi-build-utils@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806"
-  integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==
-
-node-abi@^3.3.0:
-  version "3.30.0"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.30.0.tgz#d84687ad5d24ca81cdfa912a36f2c5c19b137359"
-  integrity sha512-qWO5l3SCqbwQavymOmtTVuCWZE23++S+rxyoHjXqUmPyzRcaoI4lA2gO55/drddGnedAyjA7sk76SfQ5lfUMnw==
-  dependencies:
-    semver "^7.3.5"
-
-node-abort-controller@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/node-abort-controller/-/node-abort-controller-3.1.1.tgz#a94377e964a9a37ac3976d848cb5c765833b8548"
-  integrity sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==
-
-node-addon-api@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f"
-  integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==
-
-node-fetch@^2.6.7:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.9.tgz#7c7f744b5cc6eb5fd404e0c7a9fec630a55657e6"
-  integrity sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==
-  dependencies:
-    whatwg-url "^5.0.0"
-
-normalize-path@^3.0.0, normalize-path@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
-  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
-
-normalize-url@^6.0.1:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
-  integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
-
-nth-check@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d"
-  integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==
-  dependencies:
-    boolbase "^1.0.0"
-
-object-assign@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
-
-object-inspect@^1.9.0:
-  version "1.12.2"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea"
-  integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==
-
-object-keys@^1.0.12:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
-  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
-
-once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
-  dependencies:
-    wrappy "1"
-
-open@^8.0.0:
-  version "8.4.0"
-  resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8"
-  integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==
-  dependencies:
-    define-lazy-prop "^2.0.0"
-    is-docker "^2.1.1"
-    is-wsl "^2.2.0"
-
-p-cancelable@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf"
-  integrity sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==
-
-parse-node-version@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
-  integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==
-
-parse-semver@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/parse-semver/-/parse-semver-1.1.1.tgz#9a4afd6df063dc4826f93fba4a99cf223f666cb8"
-  integrity sha512-Eg1OuNntBMH0ojvEKSrvDSnwLmvVuUOSdylH/pSCPNMIspLlweJyIWXCE+k/5hm3cj/EBUYwmWkjhBALNP4LXQ==
-  dependencies:
-    semver "^5.1.0"
-
-parse5-htmlparser2-tree-adapter@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.0.0.tgz#23c2cc233bcf09bb7beba8b8a69d46b08c62c2f1"
-  integrity sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g==
-  dependencies:
-    domhandler "^5.0.2"
-    parse5 "^7.0.0"
-
-parse5@^7.0.0:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32"
-  integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==
-  dependencies:
-    entities "^4.4.0"
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
-
-path-key@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
-  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
-
-pend@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
-  integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=
-
-picomatch@^2.0.4:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
-  integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==
-
-picomatch@^2.2.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
-  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
-
-pify@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-  integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==
-
-plist@^3.0.1:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.5.tgz#2cbeb52d10e3cdccccf0c11a63a85d830970a987"
-  integrity sha512-83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA==
-  dependencies:
-    base64-js "^1.5.1"
-    xmlbuilder "^9.0.7"
-
-plugin-error@1.0.1, plugin-error@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-1.0.1.tgz#77016bd8919d0ac377fdcdd0322328953ca5781c"
-  integrity sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==
-  dependencies:
-    ansi-colors "^1.0.1"
-    arr-diff "^4.0.0"
-    arr-union "^3.1.0"
-    extend-shallow "^3.0.2"
-
-prebuild-install@^7.0.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.1.tgz#de97d5b34a70a0c81334fd24641f2a1702352e45"
-  integrity sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==
-  dependencies:
-    detect-libc "^2.0.0"
-    expand-template "^2.0.3"
-    github-from-package "0.0.0"
-    minimist "^1.2.3"
-    mkdirp-classic "^0.5.3"
-    napi-build-utils "^1.0.1"
-    node-abi "^3.3.0"
-    pump "^3.0.0"
-    rc "^1.2.7"
-    simple-get "^4.0.0"
-    tar-fs "^2.0.0"
-    tunnel-agent "^0.6.0"
-
-prebuild-install@^7.1.1:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.2.tgz#a5fd9986f5a6251fbc47e1e5c65de71e68c0a056"
-  integrity sha512-UnNke3IQb6sgarcZIDU3gbMeTp/9SSU1DAIkil7PrqG1vZlBtY5msYccSKSHDqa3hNg436IXK+SNImReuA1wEQ==
-  dependencies:
-    detect-libc "^2.0.0"
-    expand-template "^2.0.3"
-    github-from-package "0.0.0"
-    minimist "^1.2.3"
-    mkdirp-classic "^0.5.3"
-    napi-build-utils "^1.0.1"
-    node-abi "^3.3.0"
-    pump "^3.0.0"
-    rc "^1.2.7"
-    simple-get "^4.0.0"
-    tar-fs "^2.0.0"
-    tunnel-agent "^0.6.0"
-
-priorityqueuejs@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/priorityqueuejs/-/priorityqueuejs-1.0.0.tgz#2ee4f23c2560913e08c07ce5ccdd6de3df2c5af8"
-  integrity sha1-LuTyPCVgkT4IwHzlzN1t498sWvg=
-
-process-nextick-args@^2.0.0, process-nextick-args@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
-  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
-
-process@^0.11.10:
-  version "0.11.10"
-  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
-  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
-
-progress@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
-  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
-
-pump@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
-  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
-qs@^6.9.1:
-  version "6.11.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a"
-  integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==
-  dependencies:
-    side-channel "^1.0.4"
-
-quick-lru@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
-  integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==
-
-rc@^1.2.7:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
-  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
-  dependencies:
-    deep-extend "^0.6.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
-
-read@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
-  integrity sha512-rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ==
-  dependencies:
-    mute-stream "~0.0.4"
-
-"readable-stream@2 || 3", readable-stream@3, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
-  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
-readable-stream@^2.0.2, readable-stream@^2.3.5:
-  version "2.3.7"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
-  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
-readdirp@~3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"
-  integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==
-  dependencies:
-    picomatch "^2.2.1"
-
-readdirp@~3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
-  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
-  dependencies:
-    picomatch "^2.2.1"
-
-remove-trailing-separator@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
-  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
-
-replace-ext@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a"
-  integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==
-
-resolve-alpn@^1.0.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9"
-  integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==
-
-responselike@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc"
-  integrity sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==
-  dependencies:
-    lowercase-keys "^2.0.0"
-
-rimraf@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
-roarr@^2.15.3:
-  version "2.15.4"
-  resolved "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz#f5fe795b7b838ccfe35dc608e0282b9eba2e7afd"
-  integrity sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==
-  dependencies:
-    boolean "^3.0.1"
-    detect-node "^2.0.4"
-    globalthis "^1.0.1"
-    json-stringify-safe "^5.0.1"
-    semver-compare "^1.0.0"
-    sprintf-js "^1.1.2"
-
-safe-buffer@^5.0.1, safe-buffer@~5.2.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
-safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-
-sax@>=0.6.0:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
-  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
-
-semaphore@^1.0.5:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/semaphore/-/semaphore-1.1.0.tgz#aaad8b86b20fe8e9b32b16dc2ee682a8cd26a8aa"
-  integrity sha512-O4OZEaNtkMd/K0i6js9SL+gqy0ZCBMgUvlSqHKi4IBdjhe7wB8pwztUk1BbZ1fmrvpwFrPbHzqd2w5pTcJH6LA==
-
-semver-compare@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
-  integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
-
-semver@^5.1.0:
-  version "5.7.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
-  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
-
-semver@^6.2.0:
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
-  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
-
-semver@^7.3.2, semver@^7.3.5, semver@^7.3.8:
-  version "7.5.4"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
-  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
-  dependencies:
-    lru-cache "^6.0.0"
-
-serialize-error@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18"
-  integrity sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==
-  dependencies:
-    type-fest "^0.13.1"
-
-shebang-command@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
-  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
-  dependencies:
-    shebang-regex "^3.0.0"
-
-shebang-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
-  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
-
-side-channel@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
-  integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
-  dependencies:
-    call-bind "^1.0.0"
-    get-intrinsic "^1.0.2"
-    object-inspect "^1.9.0"
-
-simple-concat@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f"
-  integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==
-
-simple-get@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.1.tgz#4a39db549287c979d352112fa03fd99fd6bc3543"
-  integrity sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==
-  dependencies:
-    decompress-response "^6.0.0"
-    once "^1.3.1"
-    simple-concat "^1.0.0"
-
-source-map@0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-
-sprintf-js@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
-  integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
-
-stoppable@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/stoppable/-/stoppable-1.1.0.tgz#32da568e83ea488b08e4d7ea2c3bcc9d75015d5b"
-  integrity sha512-KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw==
-
-stream-exhaust@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/stream-exhaust/-/stream-exhaust-1.0.2.tgz#acdac8da59ef2bc1e17a2c0ccf6c320d120e555d"
-  integrity sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==
-
-stream-shift@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
-  integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
-
-string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
-  dependencies:
-    safe-buffer "~5.2.0"
-
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
-  dependencies:
-    safe-buffer "~5.1.0"
-
-strip-bom-buf@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom-buf/-/strip-bom-buf-1.0.0.tgz#1cb45aaf57530f4caf86c7f75179d2c9a51dd572"
-  integrity sha1-HLRar1dTD0yvhsf3UXnSyaUd1XI=
-  dependencies:
-    is-utf8 "^0.2.1"
-
-strip-bom-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-2.0.0.tgz#f87db5ef2613f6968aa545abfe1ec728b6a829ca"
-  integrity sha1-+H217yYT9paKpUWr/h7HKLaoKco=
-  dependencies:
-    first-chunk-stream "^2.0.0"
-    strip-bom "^2.0.0"
-
-strip-bom@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
-  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
-  dependencies:
-    is-utf8 "^0.2.0"
-
-strip-json-comments@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
-
-sumchecker@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz#6377e996795abb0b6d348e9b3e1dfb24345a8e42"
-  integrity sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==
-  dependencies:
-    debug "^4.1.0"
-
-supports-color@^5.3.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
-  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
-  dependencies:
-    has-flag "^3.0.0"
-
-tar-fs@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"
-  integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==
-  dependencies:
-    chownr "^1.1.1"
-    mkdirp-classic "^0.5.2"
-    pump "^3.0.0"
-    tar-stream "^2.1.4"
-
-tar-stream@^2.1.4:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
-  integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
-  dependencies:
-    bl "^4.0.3"
-    end-of-stream "^1.4.1"
-    fs-constants "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^3.1.1"
-
-ternary-stream@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ternary-stream/-/ternary-stream-3.0.0.tgz#7951930ea9e823924d956f03d516151a2d516253"
-  integrity sha512-oIzdi+UL/JdktkT+7KU5tSIQjj8pbShj3OASuvDEhm0NT5lppsm7aXWAmAq4/QMaBIyfuEcNLbAQA+HpaISobQ==
-  dependencies:
-    duplexify "^4.1.1"
-    fork-stream "^0.0.4"
-    merge-stream "^2.0.0"
-    through2 "^3.0.1"
-
-through2@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.2.tgz#99f88931cfc761ec7678b41d5d7336b5b6a07bf4"
-  integrity sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==
-  dependencies:
-    inherits "^2.0.4"
-    readable-stream "2 || 3"
-
-through2@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-4.0.2.tgz#a7ce3ac2a7a8b0b966c80e7c49f0484c3b239764"
-  integrity sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==
-  dependencies:
-    readable-stream "3"
-
-through@^2.3.8:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
-
-time-stamp@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
-  integrity sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=
-
-tmp@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
-  integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
-  dependencies:
-    rimraf "^3.0.0"
-
-to-regex-range@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-  dependencies:
-    is-number "^7.0.0"
-
-tr46@~0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-  integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
-
-tree-sitter-typescript@^0.20.5:
-  version "0.20.5"
-  resolved "https://registry.yarnpkg.com/tree-sitter-typescript/-/tree-sitter-typescript-0.20.5.tgz#29e30c052bcb06cb992ffd2d392e010b0e1768b3"
-  integrity sha512-RzK/Pc6k4GiXvInIBlo8ZggekP6rODfW2P6KHFCTSUHENsw6ynh+iacFhfkJRa4MT8EIN2WHygFJ7076/+eHKg==
-  dependencies:
-    nan "^2.18.0"
-    tree-sitter "^0.20.6"
-
-tree-sitter@^0.20.5, tree-sitter@^0.20.6:
-  version "0.20.6"
-  resolved "https://registry.yarnpkg.com/tree-sitter/-/tree-sitter-0.20.6.tgz#fec52e5d7cc6c583135756479f2440dd89b25cbe"
-  integrity sha512-GxJodajVpfgb3UREzzIbtA1hyRnTxVbWVXrbC6sk4xTMH5ERMBJk9HJNq4c8jOJeUaIOmLcwg+t6mez/PDvGqg==
-  dependencies:
-    nan "^2.18.0"
-    prebuild-install "^7.1.1"
-
-tslib@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c"
-  integrity sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==
-
-tslib@^2.2.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
-  integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
-
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
-  dependencies:
-    safe-buffer "^5.0.1"
-
-tunnel@0.0.6, tunnel@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
-  integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
-
-type-fest@^0.13.1:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934"
-  integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==
-
-typed-rest-client@^1.8.4:
-  version "1.8.9"
-  resolved "https://registry.yarnpkg.com/typed-rest-client/-/typed-rest-client-1.8.9.tgz#e560226bcadfe71b0fb5c416b587f8da3b8f92d8"
-  integrity sha512-uSmjE38B80wjL85UFX3sTYEUlvZ1JgCRhsWj/fJ4rZ0FqDUFoIuodtiVeE+cUqiVTOKPdKrp/sdftD15MDek6g==
-  dependencies:
-    qs "^6.9.1"
-    tunnel "0.0.6"
-    underscore "^1.12.1"
-
-uc.micro@^1.0.1, uc.micro@^1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
-  integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
-
-underscore@^1.12.1:
-  version "1.13.6"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441"
-  integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
-
-universal-user-agent@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-6.0.0.tgz#3381f8503b251c0d9cd21bc1de939ec9df5480ee"
-  integrity sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==
-
-universalify@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
-  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
-
-universalify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
-  integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
-
-url-join@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.1.tgz#b642e21a2646808ffa178c4c5fda39844e12cde7"
-  integrity sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==
-
-util-deprecate@^1.0.1, util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
-
-uuid@^8.3.0:
-  version "8.3.1"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31"
-  integrity sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==
-
-vinyl-file@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/vinyl-file/-/vinyl-file-3.0.0.tgz#b104d9e4409ffa325faadd520642d0a3b488b365"
-  integrity sha1-sQTZ5ECf+jJfqt1SBkLQo7SIs2U=
-  dependencies:
-    graceful-fs "^4.1.2"
-    pify "^2.3.0"
-    strip-bom-buf "^1.0.0"
-    strip-bom-stream "^2.0.0"
-    vinyl "^2.0.1"
-
-vinyl@^2.0.1, vinyl@^2.1.0, vinyl@^2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.1.tgz#23cfb8bbab5ece3803aa2c0a1eb28af7cbba1974"
-  integrity sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==
-  dependencies:
-    clone "^2.1.1"
-    clone-buffer "^1.0.0"
-    clone-stats "^1.0.0"
-    cloneable-readable "^1.0.0"
-    remove-trailing-separator "^1.0.1"
-    replace-ext "^1.0.0"
-
-vscode-gulp-watch@^5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/vscode-gulp-watch/-/vscode-gulp-watch-5.0.3.tgz#1ca1c03581d43692ecb1fe0b9afd4256faeb701b"
-  integrity sha512-MTUp2yLE9CshhkNSNV58EQNxQSeF8lIj3mkXZX9a1vAk+EQNM2PAYdPUDSd/P/08W3PMHGznEiZyfK7JAjLosg==
-  dependencies:
-    ansi-colors "4.1.1"
-    anymatch "^3.1.1"
-    chokidar "3.5.1"
-    fancy-log "^1.3.3"
-    glob-parent "^5.1.1"
-    normalize-path "^3.0.0"
-    object-assign "^4.1.1"
-    plugin-error "1.0.1"
-    readable-stream "^3.6.0"
-    vinyl "^2.2.0"
-    vinyl-file "^3.0.0"
-
-vscode-universal-bundler@^0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/vscode-universal-bundler/-/vscode-universal-bundler-0.0.2.tgz#2c988dac681d3ffe6baec6defac0995cb833c55a"
-  integrity sha512-FPJcvKnQGBqFzy6M6Nm2yvAczNLUeXsfYM6GwCex/pUOkvIM2icIHmiSvtMJINlLW1iG+oEwE3/LVbABmcjEmQ==
-  dependencies:
-    "@malept/cross-spawn-promise" "^1.1.0"
-    asar "^3.0.3"
-    debug "^4.3.1"
-    dir-compare "^2.4.0"
-    fs-extra "^9.0.1"
-
-webidl-conversions@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-  integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
-
-whatwg-url@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
-  integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0=
-  dependencies:
-    tr46 "~0.0.3"
-    webidl-conversions "^3.0.0"
-
-which@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
-  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
-  dependencies:
-    isexe "^2.0.0"
-
-workerpool@^6.4.0:
-  version "6.5.0"
-  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.5.0.tgz#f8474762c5e2f81646994aa113685f6c424a2416"
-  integrity sha512-r64Ea3glXY2RVzMeNxB+4J+0YHAVzUdV4cM5nHi4BBC2LvnO1pWFAIYKYuGcPElbg1/7eEiaPtZ/jzCjIUuGBg==
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
-
-xml2js@^0.4.19, xml2js@^0.4.23:
-  version "0.4.23"
-  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66"
-  integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==
-  dependencies:
-    sax ">=0.6.0"
-    xmlbuilder "~11.0.0"
-
-xmlbuilder@^9.0.7:
-  version "9.0.7"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
-  integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
-
-xmlbuilder@~11.0.0:
-  version "11.0.1"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
-  integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
-
-yallist@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
-  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
-
-yauzl@^2.10.0, yauzl@^2.3.1:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
-  integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=
-  dependencies:
-    buffer-crc32 "~0.2.3"
-    fd-slicer "~1.1.0"
-
-yazl@^2.2.2:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/yazl/-/yazl-2.5.1.tgz#a3d65d3dd659a5b0937850e8609f22fffa2b5c35"
-  integrity sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==
-  dependencies:
-    buffer-crc32 "~0.2.3"
diff --git a/cglicenses.json b/cglicenses.json
index d90d55d7315..0b4e03e502b 100644
--- a/cglicenses.json
+++ b/cglicenses.json
@@ -1,7 +1,7 @@
 // -----------------------------------------------------------------------------------------
 // -----------------------------------------------------------------------------------------
 // This file overrides licenses only for OSS components which do not appear in `cgmanifest.json`.
-// i.e. for OSS components that are detected from `yarn.lock` or `Cargo.lock` files.
+// i.e. for OSS components that are detected from `package-lock.json` or `Cargo.lock` files.
 //
 // DO NOT EDIT THIS FILE UNLESS THE OSS TOOL INDICATES THAT YOU SHOULD.
 //
@@ -40,12 +40,6 @@
 			"Copyright (c) Microsoft Corporation. All rights reserved."
 		]
 	},
-	{
-		"name": "big-integer",
-		"prependLicenseText": [
-			"Copyright released to public domain"
-		]
-	},
 	{
 		// Reason: The license cannot be found by the tool due to access controls on the repository
 		"name": "vscode-tas-client",
@@ -247,33 +241,6 @@
 			"CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
 		]
 	},
-	{
-		// Reason: The substack org has been deleted on GH
-		"name": "mkdirp",
-		"fullLicenseText": [
-			"Copyright 2010 James Halliday (mail@substack.net)",
-			"",
-			"This project is free software released under the MIT/X11 license:",
-			"",
-			"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."
-		]
-	},
 	{
 		// Reason: repo URI is wrong on crate, pending https://github.com/warp-tech/russh/pull/53
 		"name": "russh-cryptovec",
@@ -567,6 +534,32 @@
 			"SOFTWARE"
 		]
 	},
+	{
+		"name":"vscode-markdown-languageserver",
+		"fullLicenseText": [
+			"MIT License",
+			"",
+			"Copyright (c) Microsoft Corporation.",
+			"",
+			"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"
+		]
+	},
 	{
 		// Reason: mono-repo where the individual packages are also dual-licensed under MIT and Apache-2.0
 		"name": "system-configuration",
diff --git a/cgmanifest.json b/cgmanifest.json
index 61747342eef..d81b79c0e0c 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "chromium",
 					"repositoryUrl": "https://chromium.googlesource.com/chromium/src",
-					"commitHash": "f1a45d7ded05d64ca8136cc142ddc0c271b1dd43"
+					"commitHash": "7fa4f6e14e0707c0e604cf7c1da33566e78169ce"
 				}
 			},
 			"licenseDetail": [
@@ -40,7 +40,7 @@
 				"SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 			],
 			"isOnlyProductionDependency": true,
-			"version": "122.0.6261.156"
+			"version": "124.0.6367.243"
 		},
 		{
 			"component": {
@@ -48,7 +48,7 @@
 				"git": {
 					"name": "ffmpeg",
 					"repositoryUrl": "https://chromium.googlesource.com/chromium/third_party/ffmpeg",
-					"commitHash": "17525de887d54b970ffdd421a0879c1db1952307"
+					"commitHash": "52d8ef3799b2f16b66351dd0972bb0bcee1648ac"
 				}
 			},
 			"isOnlyProductionDependency": true,
@@ -516,11 +516,11 @@
 				"git": {
 					"name": "nodejs",
 					"repositoryUrl": "https://github.com/nodejs/node",
-					"commitHash": "9b1bf44ea9e7785e38c93b7d22d32dbca262df6c"
+					"commitHash": "1968ef32415607643770efb320d7d4e941baaa25"
 				}
 			},
 			"isOnlyProductionDependency": true,
-			"version": "20.11.1"
+			"version": "20.16.0"
 		},
 		{
 			"component": {
@@ -528,12 +528,12 @@
 				"git": {
 					"name": "electron",
 					"repositoryUrl": "https://github.com/electron/electron",
-					"commitHash": "f9ed0eaee4b172733872c2f84e5061882dd08e5c"
+					"commitHash": "a07a70e8db21718dd76644d99892d3e15e0ed440"
 				}
 			},
 			"isOnlyProductionDependency": true,
 			"license": "MIT",
-			"version": "29.4.0"
+			"version": "30.5.1"
 		},
 		{
 			"component": {
@@ -732,6 +732,39 @@
 				"SOFTWARE."
 			],
 			"license": "MIT"
+		},
+		{
+			"component": {
+				"type": "npm",
+				"npm": {
+					"name": "cacheable-request",
+					"version": "7.0.4"
+				}
+			},
+			"licenseDetail": [
+				"Copyright (c) cacheable-request authors",
+				"",
+				"MIT License",
+				"",
+				"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."
+			],
+			"license": "MIT"
 		}
 	],
 	"version": 1
diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index 3be3815a748..27fe79896a2 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -1571,9 +1571,9 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.64"
+version = "0.10.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
+checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
 dependencies = [
  "bitflags 2.5.0",
  "cfg-if",
@@ -1603,9 +1603,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.102"
+version = "0.9.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2"
+checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
 dependencies = [
  "cc",
  "libc",
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index b820ffcc50f..2907ff3d7e7 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -81,4 +81,5 @@ codegen-units = 1
 
 [features]
 default = []
+vsda = []
 vscode-encrypt = []
diff --git a/cli/ThirdPartyNotices.txt b/cli/ThirdPartyNotices.txt
index 7a74fb503c5..4bbc90b30ee 100644
--- a/cli/ThirdPartyNotices.txt
+++ b/cli/ThirdPartyNotices.txt
@@ -22,31 +22,16 @@ required to debug changes to any libraries licensed under the GNU Lesser General
 addr2line 0.21.0 - Apache-2.0 OR MIT
 https://github.com/gimli-rs/addr2line
 
-Copyright (c) 2016-2018 The gimli Developers
+Licensed under either of
 
-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:
+  * Apache License, Version 2.0 ([`LICENSE-APACHE`](./LICENSE-APACHE) or https://www.apache.org/licenses/LICENSE-2.0)
+  * MIT license ([`LICENSE-MIT`](./LICENSE-MIT) or https://opensource.org/licenses/MIT)
 
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
+at your option.
 
-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.
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in the work by you, as defined in the Apache-2.0 license, shall be
+dual licensed as above, without any additional terms or conditions.
 ---------------------------------------------------------
 
 ---------------------------------------------------------
@@ -292,27 +277,18 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 async-broadcast 0.5.1 - MIT OR Apache-2.0
 https://github.com/smol-rs/async-broadcast
 
-The MIT License (MIT)
+<sup>
+Licensed under either of Apache License, Version
+2.0 (LICENSE-APACHE) or MIT license (LICENSE-MIT) at your option.
+</sup>
 
-Copyright (c) 2020 Yoshua Wuyts
+<br/>
 
-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.
+<sub>
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in this crate by you, as defined in the Apache-2.0 license, shall
+be dual licensed as above, without any additional terms or conditions.
+</sub>
 ---------------------------------------------------------
 
 ---------------------------------------------------------
@@ -320,29 +296,18 @@ SOFTWARE.
 async-channel 2.3.1 - Apache-2.0 OR MIT
 https://github.com/smol-rs/async-channel
 
-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:
+Licensed under either of
 
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
+ * Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
+ * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
 
-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.
+at your option.
+
+#### Contribution
+
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in the work by you, as defined in the Apache-2.0 license, shall be
+dual licensed as above, without any additional terms or conditions.
 ---------------------------------------------------------
 
 ---------------------------------------------------------
@@ -382,29 +347,18 @@ async-lock 2.8.0 - Apache-2.0 OR MIT
 async-lock 3.3.0 - Apache-2.0 OR MIT
 https://github.com/smol-rs/async-lock
 
-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:
+Licensed under either of
 
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
+ * Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
+ * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
 
-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.
+at your option.
+
+#### Contribution
+
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in the work by you, as defined in the Apache-2.0 license, shall be
+dual licensed as above, without any additional terms or conditions.
 ---------------------------------------------------------
 
 ---------------------------------------------------------
@@ -412,29 +366,18 @@ DEALINGS IN THE SOFTWARE.
 async-process 1.8.1 - Apache-2.0 OR MIT
 https://github.com/smol-rs/async-process
 
-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:
+Licensed under either of
 
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
+ * Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
+ * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
 
-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.
+at your option.
+
+#### Contribution
+
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in the work by you, as defined in the Apache-2.0 license, shall be
+dual licensed as above, without any additional terms or conditions.
 ---------------------------------------------------------
 
 ---------------------------------------------------------
@@ -442,29 +385,13 @@ DEALINGS IN THE SOFTWARE.
 async-recursion 1.1.1 - MIT OR Apache-2.0
 https://github.com/dcchut/async-recursion
 
-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:
+Licensed under either of
+ * Apache License, Version 2.0
+   ([LICENSE-APACHE](LICENSE-APACHE) or <http://www.apache.org/licenses/LICENSE-2.0>)
+ * MIT license
+   ([LICENSE-MIT](LICENSE-MIT) or <http://opensource.org/licenses/MIT>)
 
-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.
+at your option.
 ---------------------------------------------------------
 
 ---------------------------------------------------------
@@ -502,29 +429,18 @@ DEALINGS IN THE SOFTWARE.
 async-task 4.7.1 - Apache-2.0 OR MIT
 https://github.com/smol-rs/async-task
 
-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:
+Licensed under either of
 
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
+ * Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
+ * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
 
-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.
+at your option.
+
+#### Contribution
+
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in the work by you, as defined in the Apache-2.0 license, shall be
+dual licensed as above, without any additional terms or conditions.
 ---------------------------------------------------------
 
 ---------------------------------------------------------
@@ -1341,7 +1257,7 @@ SOFTWARE.
 ---------------------------------------------------------
 
 clap_derive 4.5.4 - MIT OR Apache-2.0
-https://github.com/clap-rs/clap/tree/master/clap_derive
+https://github.com/clap-rs/clap
 
 Copyright (c) Individual contributors
 
@@ -1367,7 +1283,7 @@ SOFTWARE.
 ---------------------------------------------------------
 
 clap_lex 0.7.0 - MIT OR Apache-2.0
-https://github.com/clap-rs/clap/tree/master/clap_lex
+https://github.com/clap-rs/clap
 
 Copyright (c) Individual contributors
 
@@ -3343,6 +3259,7 @@ Unless you explicitly state otherwise, any contribution intentionally submitted
 [`cmac`]: ./cmac
 [`hmac`]: ./hmac
 [`pmac`]: ./pmac
+[`retail-mac`]: ./retail-mac
 
 [//]: # (footnotes)
 
@@ -3355,6 +3272,7 @@ Unless you explicitly state otherwise, any contribution intentionally submitted
 [CMAC]: https://en.wikipedia.org/wiki/One-key_MAC
 [HMAC]: https://en.wikipedia.org/wiki/HMAC
 [PMAC]: https://en.wikipedia.org/wiki/PMAC_(cryptography)
+[Retail MAC]: https://en.wikipedia.org/wiki/ISO/IEC_9797-1#MAC_algorithm_3
 ---------------------------------------------------------
 
 ---------------------------------------------------------
@@ -3396,7 +3314,7 @@ https://github.com/hyperium/http-body
 
 The MIT License (MIT)
 
-Copyright (c) 2019 Hyper Contributors
+Copyright (c) 2019-2024 Sean McArthur & Hyper Contributors
 
 Permission is hereby granted, free of charge, to any
 person obtaining a copy of this software and associated
@@ -3428,7 +3346,7 @@ DEALINGS IN THE SOFTWARE.
 httparse 1.8.0 - MIT/Apache-2.0
 https://github.com/seanmonstar/httparse
 
-Copyright (c) 2015-2021 Sean McArthur
+Copyright (c) 2015-2024 Sean McArthur
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -4896,7 +4814,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 ---------------------------------------------------------
 
-openssl 0.10.64 - Apache-2.0
+openssl 0.10.66 - Apache-2.0
 https://github.com/sfackler/rust-openssl
 
 Copyright 2011-2017 Google Inc.
@@ -4975,7 +4893,7 @@ DEALINGS IN THE SOFTWARE.
 
 ---------------------------------------------------------
 
-openssl-sys 0.9.102 - MIT
+openssl-sys 0.9.103 - MIT
 https://github.com/sfackler/rust-openssl
 
 The MIT License (MIT)
@@ -8507,6 +8425,7 @@ subtle 2.5.0 - BSD-3-Clause
 https://github.com/dalek-cryptography/subtle
 
 Copyright (c) 2016-2017 Isis Agora Lovecruft, Henry de Valence. All rights reserved.
+Copyright (c) 2016-2024 Isis Agora Lovecruft. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
diff --git a/cli/src/async_pipe.rs b/cli/src/async_pipe.rs
index e9b710c1d68..78aed6fe3e7 100644
--- a/cli/src/async_pipe.rs
+++ b/cli/src/async_pipe.rs
@@ -227,7 +227,7 @@ impl hyper::server::accept::Accept for PollableAsyncListener {
 	}
 }
 
-/// Gets a random name for a pipe/socket on the paltform
+/// Gets a random name for a pipe/socket on the platform
 pub fn get_socket_name() -> PathBuf {
 	cfg_if::cfg_if! {
 		if #[cfg(unix)] {
diff --git a/cli/src/auth.rs b/cli/src/auth.rs
index 67f1bfa6bc7..51942c96c75 100644
--- a/cli/src/auth.rs
+++ b/cli/src/auth.rs
@@ -287,7 +287,7 @@ impl StorageImplementation for ThreadKeyringStorage {
 
 #[derive(Default)]
 struct KeyringStorage {
-	// keywring storage can be split into multiple entries due to entry length limits
+	// keyring storage can be split into multiple entries due to entry length limits
 	// on Windows https://github.com/microsoft/vscode-cli/issues/358
 	entries: Vec<keyring::Entry>,
 }
@@ -723,7 +723,7 @@ impl Auth {
 
 			match &init_code_json.message {
 				Some(m) => self.log.result(m),
-				None => self.log.result(&format!(
+				None => self.log.result(format!(
 					"To grant access to the server, please log into {} and use code {}",
 					init_code_json.verification_uri, init_code_json.user_code
 				)),
diff --git a/cli/src/commands/args.rs b/cli/src/commands/args.rs
index 79c4d3767a1..7a8cf1f4f62 100644
--- a/cli/src/commands/args.rs
+++ b/cli/src/commands/args.rs
@@ -64,7 +64,7 @@ pub struct IntegratedCli {
 	pub core: CliCore,
 }
 
-/// Common CLI shared between intergated and standalone interfaces.
+/// Common CLI shared between integrated and standalone interfaces.
 #[derive(Args, Debug, Default, Clone)]
 pub struct CliCore {
 	/// One or more files, folders, or URIs to open.
@@ -226,12 +226,15 @@ pub struct ServeWebArgs {
 
 #[derive(Args, Debug, Clone)]
 pub struct CommandShellArgs {
+	#[clap(flatten)]
+	pub server_args: BaseServerArgs,
+
 	/// Listen on a socket instead of stdin/stdout.
 	#[clap(long)]
 	pub on_socket: bool,
 	/// Listen on a host/port instead of stdin/stdout.
-	#[clap(long, num_args = 0..=1, default_missing_value = "0")]
-	pub on_port: Option<u16>,
+	#[clap(long, num_args = 0..=2, default_missing_value = "0")]
+	pub on_port: Vec<u16>,
 	/// Listen on a host/port instead of stdin/stdout.
 	#[clap[long]]
 	pub on_host: Option<String>,
@@ -619,7 +622,7 @@ pub enum OutputFormat {
 #[derive(Args, Clone, Debug, Default)]
 pub struct ExistingTunnelArgs {
 	/// Name you'd like to assign preexisting tunnel to use to connect the tunnel
-	/// Old option, new code sohuld just use `--name`.
+	/// Old option, new code should just use `--name`.
 	#[clap(long, hide = true)]
 	pub tunnel_name: Option<String>,
 
@@ -638,6 +641,9 @@ pub struct ExistingTunnelArgs {
 
 #[derive(Args, Debug, Clone, Default)]
 pub struct TunnelServeArgs {
+	#[clap(flatten)]
+	pub server_args: BaseServerArgs,
+
 	/// Optional details to connect to an existing tunnel
 	#[clap(flatten, next_help_heading = Some("ADVANCED OPTIONS"))]
 	pub tunnel: ExistingTunnelArgs,
@@ -661,7 +667,10 @@ pub struct TunnelServeArgs {
 	/// If set, the user accepts the server license terms and the server will be started without a user prompt.
 	#[clap(long)]
 	pub accept_server_license_terms: bool,
+}
 
+#[derive(Args, Debug, Clone, Default)]
+pub struct BaseServerArgs {
 	/// Requests that extensions be preloaded and installed on connecting servers.
 	#[clap(long)]
 	pub install_extension: Vec<String>,
@@ -675,8 +684,8 @@ pub struct TunnelServeArgs {
 	pub extensions_dir: Option<String>,
 }
 
-impl TunnelServeArgs {
-	pub fn apply_to_server_args(&self, csa: &mut CodeServerArgs) {
+impl BaseServerArgs {
+	pub fn apply_to(&self, csa: &mut CodeServerArgs) {
 		csa.install_extensions
 			.extend_from_slice(&self.install_extension);
 
diff --git a/cli/src/commands/serve_web.rs b/cli/src/commands/serve_web.rs
index 12c0cdafec9..4acb9a18c73 100644
--- a/cli/src/commands/serve_web.rs
+++ b/cli/src/commands/serve_web.rs
@@ -15,7 +15,7 @@ use std::time::{Duration, Instant};
 use hyper::service::{make_service_fn, service_fn};
 use hyper::{Body, Request, Response, Server};
 use tokio::io::{AsyncBufReadExt, BufReader};
-use tokio::pin;
+use tokio::{pin, time};
 
 use crate::async_pipe::{
 	get_socket_name, get_socket_rw_stream, listen_socket_rw_stream, AsyncPipe,
@@ -50,7 +50,7 @@ const SERVER_IDLE_TIMEOUT_SECS: u64 = 60 * 60;
 /// (should be large enough to basically never happen)
 const SERVER_ACTIVE_TIMEOUT_SECS: u64 = SERVER_IDLE_TIMEOUT_SECS * 24 * 30 * 12;
 /// How long to cache the "latest" version we get from the update service.
-const RELEASE_CACHE_SECS: u64 = 60 * 60;
+const RELEASE_CHECK_INTERVAL: u64 = 60 * 60;
 
 /// Number of bytes for the secret keys. See workbench.ts for their usage.
 const SECRET_KEY_BYTES: usize = 32;
@@ -71,16 +71,26 @@ pub async fn serve_web(ctx: CommandContext, mut args: ServeWebArgs) -> Result<i3
 
 	let platform: crate::update_service::Platform = PreReqChecker::new().verify().await?;
 	if !args.without_connection_token {
-		// Ensure there's a defined connection token, since if multiple server versions
-		// are excuted, they will need to have a single shared token.
-		let token_path = ctx.paths.root().join("serve-web-token");
-		let token = mint_connection_token(&token_path, args.connection_token.clone())
-			.map_err(CodeError::CouldNotCreateConnectionTokenFile)?;
-		args.connection_token = Some(token);
-		args.connection_token_file = Some(token_path.to_string_lossy().to_string());
+		if let Some(p) = args.connection_token_file.as_deref() {
+			let token = fs::read_to_string(PathBuf::from(p))
+				.map_err(CodeError::CouldNotReadConnectionTokenFile)?;
+			args.connection_token = Some(token.trim().to_string());
+		} else {
+			// Ensure there's a defined connection token, since if multiple server versions
+			// are executed, they will need to have a single shared token.
+			let token_path = ctx.paths.root().join("serve-web-token");
+			let token = mint_connection_token(&token_path, args.connection_token.clone())
+				.map_err(CodeError::CouldNotCreateConnectionTokenFile)?;
+			args.connection_token = Some(token);
+			args.connection_token_file = Some(token_path.to_string_lossy().to_string());
+		}
 	}
 
-	let cm = ConnectionManager::new(&ctx, platform, args.clone());
+	let cm: Arc<ConnectionManager> = ConnectionManager::new(&ctx, platform, args.clone());
+	let update_check_interval = 3600;
+	cm.clone()
+		.start_update_checker(Duration::from_secs(update_check_interval));
+
 	let key = get_server_key_half(&ctx.paths);
 	let make_svc = move || {
 		let ctx = HandleContext {
@@ -169,7 +179,7 @@ async fn handle_proxied(ctx: &HandleContext, req: Request<Body>) -> Response<Bod
 	let release = if let Some((r, _)) = get_release_from_path(req.uri().path(), ctx.cm.platform) {
 		r
 	} else {
-		match ctx.cm.get_latest_release().await {
+		match ctx.cm.get_release_from_cache().await {
 			Ok(r) => r,
 			Err(e) => {
 				error!(ctx.log, "error getting latest version: {}", e);
@@ -532,21 +542,67 @@ impl ConnectionManager {
 	pub fn new(ctx: &CommandContext, platform: Platform, args: ServeWebArgs) -> Arc<Self> {
 		let base_path = normalize_base_path(args.server_base_path.as_deref().unwrap_or_default());
 
+		let cache = DownloadCache::new(ctx.paths.web_server_storage());
+		let target_kind = TargetKind::Web;
+
+		let quality = VSCODE_CLI_QUALITY.map_or(Quality::Stable, |q| match Quality::try_from(q) {
+			Ok(q) => q,
+			Err(_) => Quality::Stable,
+		});
+
+		let latest_version = tokio::sync::Mutex::new(cache.get().first().map(|latest_commit| {
+			(
+				Instant::now() - Duration::from_secs(RELEASE_CHECK_INTERVAL),
+				Release {
+					name: String::from("0.0.0"), // Version information not stored on cache
+					commit: latest_commit.clone(),
+					platform,
+					target: target_kind,
+					quality,
+				},
+			)
+		}));
+
 		Arc::new(Self {
 			platform,
 			args,
 			base_path,
 			log: ctx.log.clone(),
-			cache: DownloadCache::new(ctx.paths.web_server_storage()),
+			cache,
 			update_service: UpdateService::new(
 				ctx.log.clone(),
 				Arc::new(ReqwestSimpleHttp::with_client(ctx.http.clone())),
 			),
 			state: ConnectionStateMap::default(),
-			latest_version: tokio::sync::Mutex::default(),
+			latest_version,
 		})
 	}
 
+	// spawns a task that checks for updates every n seconds duration
+	pub fn start_update_checker(self: Arc<Self>, duration: Duration) {
+		tokio::spawn(async move {
+			let mut interval = time::interval(duration);
+			loop {
+				interval.tick().await;
+
+				if let Err(e) = self.get_latest_release().await {
+					warning!(self.log, "error getting latest version: {}", e);
+				}
+			}
+		});
+	}
+
+	// Returns the latest release from the cache, if one exists.
+	pub async fn get_release_from_cache(&self) -> Result<Release, CodeError> {
+		let latest = self.latest_version.lock().await;
+		if let Some((_, release)) = &*latest {
+			return Ok(release.clone());
+		}
+
+		drop(latest);
+		self.get_latest_release().await
+	}
+
 	/// Gets a connection to a server version
 	pub async fn get_connection(
 		&self,
@@ -565,11 +621,7 @@ impl ConnectionManager {
 	pub async fn get_latest_release(&self) -> Result<Release, CodeError> {
 		let mut latest = self.latest_version.lock().await;
 		let now = Instant::now();
-		if let Some((checked_at, release)) = &*latest {
-			if checked_at.elapsed() < Duration::from_secs(RELEASE_CACHE_SECS) {
-				return Ok(release.clone());
-			}
-		}
+		let target_kind = TargetKind::Web;
 
 		let quality = VSCODE_CLI_QUALITY
 			.ok_or_else(|| CodeError::UpdatesNotConfigured("no configured quality"))
@@ -579,13 +631,14 @@ impl ConnectionManager {
 
 		let release = self
 			.update_service
-			.get_latest_commit(self.platform, TargetKind::Web, quality)
+			.get_latest_commit(self.platform, target_kind, quality)
 			.await
 			.map_err(|e| CodeError::UpdateCheckFailed(e.to_string()));
 
 		// If the update service is unavailable and we have stale data, use that
-		if let (Err(e), Some((_, previous))) = (&release, &*latest) {
+		if let (Err(e), Some((_, previous))) = (&release, latest.clone()) {
 			warning!(self.log, "error getting latest release, using stale: {}", e);
+			*latest = Some((now, previous.clone()));
 			return Ok(previous.clone());
 		}
 
diff --git a/cli/src/commands/tunnels.rs b/cli/src/commands/tunnels.rs
index 688f603f593..dc4206e8316 100644
--- a/cli/src/commands/tunnels.rs
+++ b/cli/src/commands/tunnels.rs
@@ -155,43 +155,54 @@ pub async fn command_shell(ctx: CommandContext, args: CommandShellArgs) -> Resul
 		code_server_args: (&ctx.args).into(),
 	};
 
-	let mut listener: Box<dyn AsyncRWAccepter> = match (args.on_port, &args.on_host, args.on_socket)
-	{
-		(_, _, true) => {
-			let socket = get_socket_name();
-			let listener = listen_socket_rw_stream(&socket)
-				.await
-				.map_err(|e| wrap(e, "error listening on socket"))?;
+	args.server_args.apply_to(&mut params.code_server_args);
 
-			params
-				.log
-				.result(format!("Listening on {}", socket.display()));
+	let mut listener: Box<dyn AsyncRWAccepter> =
+		match (args.on_port.first(), &args.on_host, args.on_socket) {
+			(_, _, true) => {
+				let socket = get_socket_name();
+				let listener = listen_socket_rw_stream(&socket)
+					.await
+					.map_err(|e| wrap(e, "error listening on socket"))?;
 
-			Box::new(listener)
-		}
-		(Some(_), _, _) | (_, Some(_), _) => {
-			let addr = SocketAddr::new(
-				args.on_host
+				params
+					.log
+					.result(format!("Listening on {}", socket.display()));
+
+				Box::new(listener)
+			}
+			(Some(_), _, _) | (_, Some(_), _) => {
+				let host = args
+					.on_host
 					.as_ref()
 					.map(|h| h.parse().map_err(CodeError::InvalidHostAddress))
-					.unwrap_or(Ok(IpAddr::V4(Ipv4Addr::LOCALHOST)))?,
-				args.on_port.unwrap_or_default(),
-			);
-			let listener = tokio::net::TcpListener::bind(addr)
-				.await
-				.map_err(|e| wrap(e, "error listening on port"))?;
+					.unwrap_or(Ok(IpAddr::V4(Ipv4Addr::LOCALHOST)))?;
 
-			params
-				.log
-				.result(format!("Listening on {}", listener.local_addr().unwrap()));
+				let lower_port = args.on_port.first().copied().unwrap_or_default();
+				let port_no = if let Some(upper) = args.on_port.get(1) {
+					find_unused_port(&host, lower_port, *upper)
+						.await
+						.unwrap_or_default()
+				} else {
+					lower_port
+				};
 
-			Box::new(listener)
-		}
-		_ => {
-			serve_stream(tokio::io::stdin(), tokio::io::stderr(), params).await;
-			return Ok(0);
-		}
-	};
+				let addr = SocketAddr::new(host, port_no);
+				let listener = tokio::net::TcpListener::bind(addr)
+					.await
+					.map_err(|e| wrap(e, "error listening on port"))?;
+
+				params
+					.log
+					.result(format!("Listening on {}", listener.local_addr().unwrap()));
+
+				Box::new(listener)
+			}
+			_ => {
+				serve_stream(tokio::io::stdin(), tokio::io::stderr(), params).await;
+				return Ok(0);
+			}
+		};
 
 	let mut servers = FuturesUnordered::new();
 
@@ -216,6 +227,21 @@ pub async fn command_shell(ctx: CommandContext, args: CommandShellArgs) -> Resul
 	}
 }
 
+async fn find_unused_port(host: &IpAddr, start_port: u16, end_port: u16) -> Option<u16> {
+	for port in start_port..=end_port {
+		if is_port_available(*host, port).await {
+			return Some(port);
+		}
+	}
+	None
+}
+
+async fn is_port_available(host: IpAddr, port: u16) -> bool {
+	tokio::net::TcpListener::bind(SocketAddr::new(host, port))
+		.await
+		.is_ok()
+}
+
 pub async fn service(
 	ctx: CommandContext,
 	service_args: TunnelServiceSubCommands,
@@ -416,7 +442,7 @@ pub async fn serve(ctx: CommandContext, gateway_args: TunnelServeArgs) -> Result
 	legal::require_consent(&paths, gateway_args.accept_server_license_terms)?;
 
 	let mut csa = (&args).into();
-	gateway_args.apply_to_server_args(&mut csa);
+	gateway_args.server_args.apply_to(&mut csa);
 	let result = serve_with_csa(paths, log, gateway_args, csa, TUNNEL_CLI_LOCK_NAME).await;
 	drop(no_sleep);
 
@@ -563,7 +589,7 @@ async fn serve_with_csa(
 			Ok(SingletonConnection::Client(stream)) => {
 				debug!(log, "starting as client to singleton");
 				if gateway_args.name.is_some()
-					|| !gateway_args.install_extension.is_empty()
+					|| !gateway_args.server_args.install_extension.is_empty()
 					|| gateway_args.tunnel.tunnel_id.is_some()
 				{
 					warning!(
diff --git a/cli/src/constants.rs b/cli/src/constants.rs
index 6f604e8876e..1e277a89d6a 100644
--- a/cli/src/constants.rs
+++ b/cli/src/constants.rs
@@ -13,7 +13,7 @@ use crate::options::Quality;
 
 pub const CONTROL_PORT: u16 = 31545;
 
-/// Protocol version sent to clients. This can be used to indiciate new or
+/// Protocol version sent to clients. This can be used to indicate new or
 /// changed capabilities that clients may wish to leverage.
 ///  1 - Initial protocol version
 ///  2 - Addition of `serve.compressed` property to control whether servermsg's
diff --git a/cli/src/download_cache.rs b/cli/src/download_cache.rs
index d3f05d2237f..cd02b02d75a 100644
--- a/cli/src/download_cache.rs
+++ b/cli/src/download_cache.rs
@@ -20,6 +20,7 @@ const KEEP_LRU: usize = 5;
 const STAGING_SUFFIX: &str = ".staging";
 const RENAME_ATTEMPTS: u32 = 20;
 const RENAME_DELAY: std::time::Duration = std::time::Duration::from_millis(200);
+const PERSISTED_STATE_FILE_NAME: &str = "lru.json";
 
 #[derive(Clone)]
 pub struct DownloadCache {
@@ -30,11 +31,16 @@ pub struct DownloadCache {
 impl DownloadCache {
 	pub fn new(path: PathBuf) -> DownloadCache {
 		DownloadCache {
-			state: PersistedState::new(path.join("lru.json")),
+			state: PersistedState::new(path.join(PERSISTED_STATE_FILE_NAME)),
 			path,
 		}
 	}
 
+	/// Gets the value stored on the state
+	pub fn get(&self) -> Vec<String> {
+		self.state.load()
+	}
+
 	/// Gets the download cache path. Names of cache entries can be formed by
 	/// joining them to the path.
 	pub fn path(&self) -> &Path {
diff --git a/cli/src/tunnels/code_server.rs b/cli/src/tunnels/code_server.rs
index 0579f8ef0dc..465f6e24230 100644
--- a/cli/src/tunnels/code_server.rs
+++ b/cli/src/tunnels/code_server.rs
@@ -674,7 +674,7 @@ where
 		let write_line = |line: &str| -> std::io::Result<()> {
 			if let Some(mut f) = log_file.as_ref() {
 				f.write_all(line.as_bytes())?;
-				f.write_all(&[b'\n'])?;
+				f.write_all(b"\n")?;
 			}
 			if write_directly {
 				println!("{}", line);
diff --git a/cli/src/tunnels/control_server.rs b/cli/src/tunnels/control_server.rs
index f42984cfac1..dfb5e381179 100644
--- a/cli/src/tunnels/control_server.rs
+++ b/cli/src/tunnels/control_server.rs
@@ -920,9 +920,14 @@ async fn handle_update(
 
 	info!(log, "Updating CLI to {}", latest_release);
 
-	updater
+	let r = updater
 		.do_update(&latest_release, SilentCopyProgress())
-		.await?;
+		.await;
+
+	if let Err(e) = r {
+		did_update.store(false, Ordering::SeqCst);
+		return Err(e);
+	}
 
 	Ok(UpdateResult {
 		up_to_date: true,
diff --git a/cli/src/update_service.rs b/cli/src/update_service.rs
index 4bec13d6e86..90339148188 100644
--- a/cli/src/update_service.rs
+++ b/cli/src/update_service.rs
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-use std::{ffi::OsStr, fmt, path::Path};
+use std::{fmt, path::Path};
 
 use serde::{Deserialize, Serialize};
 
@@ -11,10 +11,11 @@ use crate::{
 	constants::VSCODE_CLI_UPDATE_ENDPOINT,
 	debug, log, options, spanf,
 	util::{
-		errors::{AnyError, CodeError, WrappedError},
+		errors::{wrap, AnyError, CodeError, WrappedError},
 		http::{BoxedHttp, SimpleResponse},
 		io::ReportCopyProgress,
-		tar, zipper,
+		tar::{self, has_gzip_header},
+		zipper,
 	},
 };
 
@@ -178,10 +179,10 @@ pub fn unzip_downloaded_release<T>(
 where
 	T: ReportCopyProgress,
 {
-	if compressed_file.extension() == Some(OsStr::new("zip")) {
-		zipper::unzip_file(compressed_file, target_dir, reporter)
-	} else {
-		tar::decompress_tarball(compressed_file, target_dir, reporter)
+	match has_gzip_header(compressed_file) {
+		Ok((f, true)) => tar::decompress_tarball(f, target_dir, reporter),
+		Ok((f, false)) => zipper::unzip_file(f, target_dir, reporter),
+		Err(e) => Err(wrap(e, "error checking for gzip header")),
 	}
 }
 
@@ -249,7 +250,7 @@ impl Platform {
 			Platform::DarwinARM64 => "server-darwin-arm64",
 			Platform::WindowsX64 => "server-win32-x64",
 			Platform::WindowsX86 => "server-win32",
-			Platform::WindowsARM64 => "server-win32-x64", // we don't publish an arm64 server build yet
+			Platform::WindowsARM64 => "server-win32-arm64",
 		}
 		.to_owned()
 	}
diff --git a/cli/src/util/errors.rs b/cli/src/util/errors.rs
index 7d28ce9f741..67519d5437e 100644
--- a/cli/src/util/errors.rs
+++ b/cli/src/util/errors.rs
@@ -512,6 +512,8 @@ pub enum CodeError {
 	// todo: can be specialized when update service is moved to CodeErrors
 	#[error("Could not check for update: {0}")]
 	UpdateCheckFailed(String),
+	#[error("Could not read connection token file: {0}")]
+	CouldNotReadConnectionTokenFile(std::io::Error),
 	#[error("Could not write connection token file: {0}")]
 	CouldNotCreateConnectionTokenFile(std::io::Error),
 	#[error("A tunnel with the name {0} exists and is in-use. Please pick a different name or stop the existing tunnel.")]
diff --git a/cli/src/util/prereqs.rs b/cli/src/util/prereqs.rs
index 5d4953acbb2..0f49ab20887 100644
--- a/cli/src/util/prereqs.rs
+++ b/cli/src/util/prereqs.rs
@@ -19,12 +19,22 @@ lazy_static! {
 	static ref GENERIC_VERSION_RE: Regex = Regex::new(r"^([0-9]+)\.([0-9]+)$").unwrap();
 	static ref LIBSTD_CXX_VERSION_RE: BinRegex =
 		BinRegex::new(r"GLIBCXX_([0-9]+)\.([0-9]+)(?:\.([0-9]+))?").unwrap();
-	static ref MIN_CXX_VERSION: SimpleSemver = SimpleSemver::new(3, 4, 25);
-	static ref MIN_LEGACY_CXX_VERSION: SimpleSemver = SimpleSemver::new(3, 4, 19);
 	static ref MIN_LDD_VERSION: SimpleSemver = SimpleSemver::new(2, 28, 0);
 	static ref MIN_LEGACY_LDD_VERSION: SimpleSemver = SimpleSemver::new(2, 17, 0);
 }
 
+#[cfg(target_arch = "arm")]
+lazy_static! {
+	static ref MIN_CXX_VERSION: SimpleSemver = SimpleSemver::new(3, 4, 26);
+	static ref MIN_LEGACY_CXX_VERSION: SimpleSemver = SimpleSemver::new(3, 4, 22);
+}
+
+#[cfg(not(target_arch = "arm"))]
+lazy_static! {
+	static ref MIN_CXX_VERSION: SimpleSemver = SimpleSemver::new(3, 4, 25);
+	static ref MIN_LEGACY_CXX_VERSION: SimpleSemver = SimpleSemver::new(3, 4, 19);
+}
+
 const NIXOS_TEST_PATH: &str = "/etc/NIXOS";
 
 pub struct PreReqChecker {}
diff --git a/cli/src/util/tar.rs b/cli/src/util/tar.rs
index fe4d4269700..10577140325 100644
--- a/cli/src/util/tar.rs
+++ b/cli/src/util/tar.rs
@@ -5,8 +5,8 @@
 use crate::util::errors::{wrap, WrappedError};
 
 use flate2::read::GzDecoder;
-use std::fs;
-use std::io::Seek;
+use std::fs::{self, File};
+use std::io::{Read, Seek};
 use std::path::{Path, PathBuf};
 use tar::Archive;
 
@@ -57,16 +57,13 @@ fn should_skip_first_segment(file: &fs::File) -> Result<(bool, u64), WrappedErro
 }
 
 pub fn decompress_tarball<T>(
-	path: &Path,
+	mut tar_gz: File,
 	parent_path: &Path,
 	mut reporter: T,
 ) -> Result<(), WrappedError>
 where
 	T: ReportCopyProgress,
 {
-	let mut tar_gz = fs::File::open(path)
-		.map_err(|e| wrap(e, format!("error opening file {}", path.display())))?;
-
 	let (skip_first, num_entries) = should_skip_first_segment(&tar_gz)?;
 	let report_progress_every = num_entries / 20;
 	let mut entries_so_far = 0;
@@ -81,7 +78,7 @@ where
 	let mut archive = Archive::new(tar);
 	archive
 		.entries()
-		.map_err(|e| wrap(e, format!("error opening archive {}", path.display())))?
+		.map_err(|e| wrap(e, "error opening archive"))?
 		.filter_map(|e| e.ok())
 		.try_for_each::<_, Result<_, WrappedError>>(|mut entry| {
 			// approximate progress based on where we are in the archive:
@@ -118,3 +115,13 @@ where
 
 	Ok(())
 }
+
+pub fn has_gzip_header(path: &Path) -> std::io::Result<(File, bool)> {
+	let mut file = fs::File::open(path)?;
+	let mut header = [0; 2];
+	let _ = file.read_exact(&mut header);
+
+	file.rewind()?;
+
+	Ok((file, header[0] == 0x1f && header[1] == 0x8b))
+}
diff --git a/cli/src/util/zipper.rs b/cli/src/util/zipper.rs
index 69bcf2d23f6..5521fa42c54 100644
--- a/cli/src/util/zipper.rs
+++ b/cli/src/util/zipper.rs
@@ -44,15 +44,12 @@ fn should_skip_first_segment(archive: &mut ZipArchive<File>) -> bool {
 	archive.len() > 1 // prefix removal is invalid if there's only a single file
 }
 
-pub fn unzip_file<T>(path: &Path, parent_path: &Path, mut reporter: T) -> Result<(), WrappedError>
+pub fn unzip_file<T>(file: File, parent_path: &Path, mut reporter: T) -> Result<(), WrappedError>
 where
 	T: ReportCopyProgress,
 {
-	let file = fs::File::open(path)
-		.map_err(|e| wrap(e, format!("unable to open file {}", path.display())))?;
-
-	let mut archive = zip::ZipArchive::new(file)
-		.map_err(|e| wrap(e, format!("failed to open zip archive {}", path.display())))?;
+	let mut archive =
+		zip::ZipArchive::new(file).map_err(|e| wrap(e, "failed to open zip archive"))?;
 
 	let skip_segments_no = usize::from(should_skip_first_segment(&mut archive));
 	let report_progress_every = archive.len() / 20;
diff --git a/extensions/.npmrc b/extensions/.npmrc
new file mode 100644
index 00000000000..a9c57709666
--- /dev/null
+++ b/extensions/.npmrc
@@ -0,0 +1,2 @@
+legacy-peer-deps="true"
+timeout=180000
diff --git a/extensions/bat/yarn.lock b/extensions/bat/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/bat/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/clojure/yarn.lock b/extensions/clojure/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/clojure/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/coffeescript/yarn.lock b/extensions/coffeescript/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/coffeescript/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/configuration-editing/.npmrc b/extensions/configuration-editing/.npmrc
new file mode 100644
index 00000000000..a9c57709666
--- /dev/null
+++ b/extensions/configuration-editing/.npmrc
@@ -0,0 +1,2 @@
+legacy-peer-deps="true"
+timeout=180000
diff --git a/extensions/configuration-editing/.vscodeignore b/extensions/configuration-editing/.vscodeignore
index cfa2d155c50..679a6d6859f 100644
--- a/extensions/configuration-editing/.vscodeignore
+++ b/extensions/configuration-editing/.vscodeignore
@@ -4,7 +4,7 @@ tsconfig.json
 out/**
 extension.webpack.config.js
 extension-browser.webpack.config.js
-yarn.lock
+package-lock.json
 build/**
 schemas/devContainer.codespaces.schema.json
 schemas/devContainer.vscode.schema.json
diff --git a/extensions/configuration-editing/package-lock.json b/extensions/configuration-editing/package-lock.json
new file mode 100644
index 00000000000..199dcf7f755
--- /dev/null
+++ b/extensions/configuration-editing/package-lock.json
@@ -0,0 +1,296 @@
+{
+  "name": "configuration-editing",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "configuration-editing",
+      "version": "1.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/rest": "19.0.4",
+        "jsonc-parser": "^3.2.0",
+        "tunnel": "^0.0.6"
+      },
+      "devDependencies": {
+        "@types/node": "20.x"
+      },
+      "engines": {
+        "vscode": "^1.0.0"
+      }
+    },
+    "node_modules/@octokit/auth-token": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-3.0.4.tgz",
+      "integrity": "sha512-TWFX7cZF2LXoCvdmJWY7XVPi74aSY0+FfBZNSXEXFkMpjcqsQwDSYVv5FhRFaI0V1ECnwbz4j59T/G+rXNWaIQ==",
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@octokit/core": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-4.2.4.tgz",
+      "integrity": "sha512-rYKilwgzQ7/imScn3M9/pFfUf4I1AZEH3KhyJmtPdE2zfaXAn2mFfUy4FbKewzc2We5y/LlKLj36fWJLKC2SIQ==",
+      "dependencies": {
+        "@octokit/auth-token": "^3.0.0",
+        "@octokit/graphql": "^5.0.0",
+        "@octokit/request": "^6.0.0",
+        "@octokit/request-error": "^3.0.0",
+        "@octokit/types": "^9.0.0",
+        "before-after-hook": "^2.2.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@octokit/endpoint": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-7.0.6.tgz",
+      "integrity": "sha512-5L4fseVRUsDFGR00tMWD/Trdeeihn999rTMGRMC1G/Ldi1uWlWJzI98H4Iak5DB/RVvQuyMYKqSK/R6mbSOQyg==",
+      "dependencies": {
+        "@octokit/types": "^9.0.0",
+        "is-plain-object": "^5.0.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@octokit/graphql": {
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-5.0.6.tgz",
+      "integrity": "sha512-Fxyxdy/JH0MnIB5h+UQ3yCoh1FG4kWXfFKkpWqjZHw/p+Kc8Y44Hu/kCgNBT6nU1shNumEchmW/sUO1JuQnPcw==",
+      "dependencies": {
+        "@octokit/request": "^6.0.0",
+        "@octokit/types": "^9.0.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@octokit/openapi-types": {
+      "version": "18.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-18.0.0.tgz",
+      "integrity": "sha512-V8GImKs3TeQRxRtXFpG2wl19V7444NIOTDF24AWuIbmNaNYOQMWRbjcGDXV5B+0n887fgDcuMNOmlul+k+oJtw=="
+    },
+    "node_modules/@octokit/plugin-paginate-rest": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-4.3.1.tgz",
+      "integrity": "sha512-h8KKxESmSFTcXX409CAxlaOYscEDvN2KGQRsLCGT1NSqRW+D6EXLVQ8vuHhFznS9MuH9QYw1GfsUN30bg8hjVA==",
+      "dependencies": {
+        "@octokit/types": "^7.5.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      },
+      "peerDependencies": {
+        "@octokit/core": ">=4"
+      }
+    },
+    "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/openapi-types": {
+      "version": "13.13.1",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-13.13.1.tgz",
+      "integrity": "sha512-4EuKSk3N95UBWFau3Bz9b3pheQ8jQYbKmBL5+GSuY8YDPDwu03J4BjI+66yNi8aaX/3h1qDpb0mbBkLdr+cfGQ=="
+    },
+    "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/types": {
+      "version": "7.5.1",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-7.5.1.tgz",
+      "integrity": "sha512-Zk4OUMLCSpXNI8KZZn47lVLJSsgMyCimsWWQI5hyjZg7hdYm0kjotaIkbG0Pp8SfU2CofMBzonboTqvzn3FrJA==",
+      "dependencies": {
+        "@octokit/openapi-types": "^13.11.0"
+      }
+    },
+    "node_modules/@octokit/plugin-request-log": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz",
+      "integrity": "sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==",
+      "peerDependencies": {
+        "@octokit/core": ">=3"
+      }
+    },
+    "node_modules/@octokit/plugin-rest-endpoint-methods": {
+      "version": "6.8.1",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-6.8.1.tgz",
+      "integrity": "sha512-QrlaTm8Lyc/TbU7BL/8bO49vp+RZ6W3McxxmmQTgYxf2sWkO8ZKuj4dLhPNJD6VCUW1hetCmeIM0m6FTVpDiEg==",
+      "dependencies": {
+        "@octokit/types": "^8.1.1",
+        "deprecation": "^2.3.1"
+      },
+      "engines": {
+        "node": ">= 14"
+      },
+      "peerDependencies": {
+        "@octokit/core": ">=3"
+      }
+    },
+    "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/openapi-types": {
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-14.0.0.tgz",
+      "integrity": "sha512-HNWisMYlR8VCnNurDU6os2ikx0s0VyEjDYHNS/h4cgb8DeOxQ0n72HyinUtdDVxJhFy3FWLGl0DJhfEWk3P5Iw=="
+    },
+    "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types": {
+      "version": "8.2.1",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-8.2.1.tgz",
+      "integrity": "sha512-8oWMUji8be66q2B9PmEIUyQm00VPDPun07umUWSaCwxmeaquFBro4Hcc3ruVoDo3zkQyZBlRvhIMEYS3pBhanw==",
+      "dependencies": {
+        "@octokit/openapi-types": "^14.0.0"
+      }
+    },
+    "node_modules/@octokit/request": {
+      "version": "6.2.8",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-6.2.8.tgz",
+      "integrity": "sha512-ow4+pkVQ+6XVVsekSYBzJC0VTVvh/FCTUUgTsboGq+DTeWdyIFV8WSCdo0RIxk6wSkBTHqIK1mYuY7nOBXOchw==",
+      "dependencies": {
+        "@octokit/endpoint": "^7.0.0",
+        "@octokit/request-error": "^3.0.0",
+        "@octokit/types": "^9.0.0",
+        "is-plain-object": "^5.0.0",
+        "node-fetch": "^2.6.7",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@octokit/request-error": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-3.0.3.tgz",
+      "integrity": "sha512-crqw3V5Iy2uOU5Np+8M/YexTlT8zxCfI+qu+LxUB7SZpje4Qmx3mub5DfEKSO8Ylyk0aogi6TYdf6kxzh2BguQ==",
+      "dependencies": {
+        "@octokit/types": "^9.0.0",
+        "deprecation": "^2.0.0",
+        "once": "^1.4.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@octokit/rest": {
+      "version": "19.0.4",
+      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-19.0.4.tgz",
+      "integrity": "sha512-LwG668+6lE8zlSYOfwPj4FxWdv/qFXYBpv79TWIQEpBLKA9D/IMcWsF/U9RGpA3YqMVDiTxpgVpEW3zTFfPFTA==",
+      "dependencies": {
+        "@octokit/core": "^4.0.0",
+        "@octokit/plugin-paginate-rest": "^4.0.0",
+        "@octokit/plugin-request-log": "^1.0.4",
+        "@octokit/plugin-rest-endpoint-methods": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@octokit/types": {
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.3.2.tgz",
+      "integrity": "sha512-D4iHGTdAnEEVsB8fl95m1hiz7D5YiRdQ9b/OEb3BYRVwbLsGHcRVPz+u+BgRLNk0Q0/4iZCBqDN96j2XNxfXrA==",
+      "dependencies": {
+        "@octokit/openapi-types": "^18.0.0"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "20.11.24",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
+      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/before-after-hook": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.3.tgz",
+      "integrity": "sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ=="
+    },
+    "node_modules/deprecation": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
+      "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ=="
+    },
+    "node_modules/is-plain-object": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/jsonc-parser": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
+      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w=="
+    },
+    "node_modules/node-fetch": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+    },
+    "node_modules/tunnel": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
+      "engines": {
+        "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    },
+    "node_modules/universal-user-agent": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
+      "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w=="
+    },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+    },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+    }
+  }
+}
diff --git a/extensions/configuration-editing/package.json b/extensions/configuration-editing/package.json
index 8a00fda49b8..f6bfd751895 100644
--- a/extensions/configuration-editing/package.json
+++ b/extensions/configuration-editing/package.json
@@ -11,7 +11,9 @@
   "icon": "images/icon.png",
   "activationEvents": [
     "onProfile",
-    "onProfile:github"
+    "onProfile:github",
+    "onLanguage:json",
+    "onLanguage:jsonc"
   ],
   "enabledApiProposals": [
     "profileContentHandlers"
diff --git a/extensions/configuration-editing/schemas/devContainer.codespaces.schema.json b/extensions/configuration-editing/schemas/devContainer.codespaces.schema.json
index 681ca6105cf..3f8400a7bd4 100644
--- a/extensions/configuration-editing/schemas/devContainer.codespaces.schema.json
+++ b/extensions/configuration-editing/schemas/devContainer.codespaces.schema.json
@@ -180,6 +180,11 @@
 							"items": {
 								"type": "string"
 							}
+						},
+						"disableAutomaticConfiguration": {
+							"type": "boolean",
+							"description": "Disables the setup that is automatically run in a codespace if no `postCreateCommand` is specified.",
+							"default": false
 						}
 					}
 				}
diff --git a/extensions/configuration-editing/yarn.lock b/extensions/configuration-editing/yarn.lock
deleted file mode 100644
index 0e7d733c76f..00000000000
--- a/extensions/configuration-editing/yarn.lock
+++ /dev/null
@@ -1,205 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@octokit/auth-token@^3.0.0":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-3.0.4.tgz#70e941ba742bdd2b49bdb7393e821dea8520a3db"
-  integrity sha512-TWFX7cZF2LXoCvdmJWY7XVPi74aSY0+FfBZNSXEXFkMpjcqsQwDSYVv5FhRFaI0V1ECnwbz4j59T/G+rXNWaIQ==
-
-"@octokit/core@^4.0.0":
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/@octokit/core/-/core-4.2.4.tgz#d8769ec2b43ff37cc3ea89ec4681a20ba58ef907"
-  integrity sha512-rYKilwgzQ7/imScn3M9/pFfUf4I1AZEH3KhyJmtPdE2zfaXAn2mFfUy4FbKewzc2We5y/LlKLj36fWJLKC2SIQ==
-  dependencies:
-    "@octokit/auth-token" "^3.0.0"
-    "@octokit/graphql" "^5.0.0"
-    "@octokit/request" "^6.0.0"
-    "@octokit/request-error" "^3.0.0"
-    "@octokit/types" "^9.0.0"
-    before-after-hook "^2.2.0"
-    universal-user-agent "^6.0.0"
-
-"@octokit/endpoint@^7.0.0":
-  version "7.0.6"
-  resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-7.0.6.tgz#791f65d3937555141fb6c08f91d618a7d645f1e2"
-  integrity sha512-5L4fseVRUsDFGR00tMWD/Trdeeihn999rTMGRMC1G/Ldi1uWlWJzI98H4Iak5DB/RVvQuyMYKqSK/R6mbSOQyg==
-  dependencies:
-    "@octokit/types" "^9.0.0"
-    is-plain-object "^5.0.0"
-    universal-user-agent "^6.0.0"
-
-"@octokit/graphql@^5.0.0":
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-5.0.6.tgz#9eac411ac4353ccc5d3fca7d76736e6888c5d248"
-  integrity sha512-Fxyxdy/JH0MnIB5h+UQ3yCoh1FG4kWXfFKkpWqjZHw/p+Kc8Y44Hu/kCgNBT6nU1shNumEchmW/sUO1JuQnPcw==
-  dependencies:
-    "@octokit/request" "^6.0.0"
-    "@octokit/types" "^9.0.0"
-    universal-user-agent "^6.0.0"
-
-"@octokit/openapi-types@^13.11.0":
-  version "13.13.1"
-  resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-13.13.1.tgz#a783bacb1817c9f61a2a0c3f81ea22ad62340fdf"
-  integrity sha512-4EuKSk3N95UBWFau3Bz9b3pheQ8jQYbKmBL5+GSuY8YDPDwu03J4BjI+66yNi8aaX/3h1qDpb0mbBkLdr+cfGQ==
-
-"@octokit/openapi-types@^14.0.0":
-  version "14.0.0"
-  resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-14.0.0.tgz#949c5019028c93f189abbc2fb42f333290f7134a"
-  integrity sha512-HNWisMYlR8VCnNurDU6os2ikx0s0VyEjDYHNS/h4cgb8DeOxQ0n72HyinUtdDVxJhFy3FWLGl0DJhfEWk3P5Iw==
-
-"@octokit/openapi-types@^18.0.0":
-  version "18.0.0"
-  resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-18.0.0.tgz#f43d765b3c7533fd6fb88f3f25df079c24fccf69"
-  integrity sha512-V8GImKs3TeQRxRtXFpG2wl19V7444NIOTDF24AWuIbmNaNYOQMWRbjcGDXV5B+0n887fgDcuMNOmlul+k+oJtw==
-
-"@octokit/plugin-paginate-rest@^4.0.0":
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-4.3.1.tgz#553e653ee0318605acd23bf3a799c8bfafdedae3"
-  integrity sha512-h8KKxESmSFTcXX409CAxlaOYscEDvN2KGQRsLCGT1NSqRW+D6EXLVQ8vuHhFznS9MuH9QYw1GfsUN30bg8hjVA==
-  dependencies:
-    "@octokit/types" "^7.5.0"
-
-"@octokit/plugin-request-log@^1.0.4":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz#5e50ed7083a613816b1e4a28aeec5fb7f1462e85"
-  integrity sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==
-
-"@octokit/plugin-rest-endpoint-methods@^6.0.0":
-  version "6.8.1"
-  resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-6.8.1.tgz#97391fda88949eb15f68dc291957ccbe1d3e8ad1"
-  integrity sha512-QrlaTm8Lyc/TbU7BL/8bO49vp+RZ6W3McxxmmQTgYxf2sWkO8ZKuj4dLhPNJD6VCUW1hetCmeIM0m6FTVpDiEg==
-  dependencies:
-    "@octokit/types" "^8.1.1"
-    deprecation "^2.3.1"
-
-"@octokit/request-error@^3.0.0":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-3.0.3.tgz#ef3dd08b8e964e53e55d471acfe00baa892b9c69"
-  integrity sha512-crqw3V5Iy2uOU5Np+8M/YexTlT8zxCfI+qu+LxUB7SZpje4Qmx3mub5DfEKSO8Ylyk0aogi6TYdf6kxzh2BguQ==
-  dependencies:
-    "@octokit/types" "^9.0.0"
-    deprecation "^2.0.0"
-    once "^1.4.0"
-
-"@octokit/request@^6.0.0":
-  version "6.2.8"
-  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-6.2.8.tgz#aaf480b32ab2b210e9dadd8271d187c93171d8eb"
-  integrity sha512-ow4+pkVQ+6XVVsekSYBzJC0VTVvh/FCTUUgTsboGq+DTeWdyIFV8WSCdo0RIxk6wSkBTHqIK1mYuY7nOBXOchw==
-  dependencies:
-    "@octokit/endpoint" "^7.0.0"
-    "@octokit/request-error" "^3.0.0"
-    "@octokit/types" "^9.0.0"
-    is-plain-object "^5.0.0"
-    node-fetch "^2.6.7"
-    universal-user-agent "^6.0.0"
-
-"@octokit/rest@19.0.4":
-  version "19.0.4"
-  resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-19.0.4.tgz#fd8bed1cefffa486e9ae46a9dc608ce81bcfcbdd"
-  integrity sha512-LwG668+6lE8zlSYOfwPj4FxWdv/qFXYBpv79TWIQEpBLKA9D/IMcWsF/U9RGpA3YqMVDiTxpgVpEW3zTFfPFTA==
-  dependencies:
-    "@octokit/core" "^4.0.0"
-    "@octokit/plugin-paginate-rest" "^4.0.0"
-    "@octokit/plugin-request-log" "^1.0.4"
-    "@octokit/plugin-rest-endpoint-methods" "^6.0.0"
-
-"@octokit/types@^7.5.0":
-  version "7.5.1"
-  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-7.5.1.tgz#4e8b182933c17e1f41cc25d44757dbdb7bd76c1b"
-  integrity sha512-Zk4OUMLCSpXNI8KZZn47lVLJSsgMyCimsWWQI5hyjZg7hdYm0kjotaIkbG0Pp8SfU2CofMBzonboTqvzn3FrJA==
-  dependencies:
-    "@octokit/openapi-types" "^13.11.0"
-
-"@octokit/types@^8.1.1":
-  version "8.2.1"
-  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-8.2.1.tgz#a6de091ae68b5541f8d4fcf9a12e32836d4648aa"
-  integrity sha512-8oWMUji8be66q2B9PmEIUyQm00VPDPun07umUWSaCwxmeaquFBro4Hcc3ruVoDo3zkQyZBlRvhIMEYS3pBhanw==
-  dependencies:
-    "@octokit/openapi-types" "^14.0.0"
-
-"@octokit/types@^9.0.0":
-  version "9.3.2"
-  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-9.3.2.tgz#3f5f89903b69f6a2d196d78ec35f888c0013cac5"
-  integrity sha512-D4iHGTdAnEEVsB8fl95m1hiz7D5YiRdQ9b/OEb3BYRVwbLsGHcRVPz+u+BgRLNk0Q0/4iZCBqDN96j2XNxfXrA==
-  dependencies:
-    "@octokit/openapi-types" "^18.0.0"
-
-"@types/node@20.x":
-  version "20.11.24"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792"
-  integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==
-  dependencies:
-    undici-types "~5.26.4"
-
-before-after-hook@^2.2.0:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.3.tgz#c51e809c81a4e354084422b9b26bad88249c517c"
-  integrity sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==
-
-deprecation@^2.0.0, deprecation@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
-  integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
-
-is-plain-object@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
-  integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
-
-jsonc-parser@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76"
-  integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==
-
-node-fetch@^2.6.7:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d"
-  integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
-  dependencies:
-    whatwg-url "^5.0.0"
-
-once@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
-  dependencies:
-    wrappy "1"
-
-tr46@~0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-  integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
-
-tunnel@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
-  integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
-
-universal-user-agent@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-6.0.0.tgz#3381f8503b251c0d9cd21bc1de939ec9df5480ee"
-  integrity sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==
-
-webidl-conversions@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-  integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
-
-whatwg-url@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
-  integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
-  dependencies:
-    tr46 "~0.0.3"
-    webidl-conversions "^3.0.0"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
diff --git a/extensions/cpp/package.json b/extensions/cpp/package.json
index c1d3f4882f6..9f3c890a48b 100644
--- a/extensions/cpp/package.json
+++ b/extensions/cpp/package.json
@@ -30,9 +30,13 @@
         "id": "cpp",
         "extensions": [
           ".cpp",
+          ".cppm",
           ".cc",
+          ".ccm",
           ".cxx",
+          ".cxxm",
           ".c++",
+          ".c++m",
           ".hpp",
           ".hh",
           ".hxx",
diff --git a/extensions/cpp/yarn.lock b/extensions/cpp/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/cpp/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/csharp/cgmanifest.json b/extensions/csharp/cgmanifest.json
index 1c88bd17296..58a7408dbbe 100644
--- a/extensions/csharp/cgmanifest.json
+++ b/extensions/csharp/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "dotnet/csharp-tmLanguage",
 					"repositoryUrl": "https://github.com/dotnet/csharp-tmLanguage",
-					"commitHash": "7a7482ffc72a6677a87eb1ed76005593a4f7f131"
+					"commitHash": "d63e2661d4e0c83b6c7810eb1d0eedc5da843b04"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/csharp/syntaxes/csharp.tmLanguage.json b/extensions/csharp/syntaxes/csharp.tmLanguage.json
index 96dbe04473c..4a2497a064a 100644
--- a/extensions/csharp/syntaxes/csharp.tmLanguage.json
+++ b/extensions/csharp/syntaxes/csharp.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/dotnet/csharp-tmLanguage/commit/7a7482ffc72a6677a87eb1ed76005593a4f7f131",
+	"version": "https://github.com/dotnet/csharp-tmLanguage/commit/d63e2661d4e0c83b6c7810eb1d0eedc5da843b04",
 	"name": "C#",
 	"scopeName": "source.cs",
 	"patterns": [
@@ -512,6 +512,9 @@
 				{
 					"include": "#type-name"
 				},
+				{
+					"include": "#type-arguments"
+				},
 				{
 					"include": "#attribute-arguments"
 				}
diff --git a/extensions/csharp/yarn.lock b/extensions/csharp/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/csharp/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/css-language-features/.npmrc b/extensions/css-language-features/.npmrc
new file mode 100644
index 00000000000..a9c57709666
--- /dev/null
+++ b/extensions/css-language-features/.npmrc
@@ -0,0 +1,2 @@
+legacy-peer-deps="true"
+timeout=180000
diff --git a/extensions/css-language-features/.vscodeignore b/extensions/css-language-features/.vscodeignore
index a08d9b8dec7..f6411e76fdb 100644
--- a/extensions/css-language-features/.vscodeignore
+++ b/extensions/css-language-features/.vscodeignore
@@ -11,9 +11,9 @@ server/tsconfig.json
 server/test/**
 server/bin/**
 server/build/**
-server/yarn.lock
+server/package-lock.json
 server/.npmignore
-yarn.lock
+package-lock.json
 server/extension.webpack.config.js
 extension.webpack.config.js
 server/extension-browser.webpack.config.js
diff --git a/extensions/css-language-features/CONTRIBUTING.md b/extensions/css-language-features/CONTRIBUTING.md
index 1c3928b847a..d0f491be3b7 100644
--- a/extensions/css-language-features/CONTRIBUTING.md
+++ b/extensions/css-language-features/CONTRIBUTING.md
@@ -2,13 +2,13 @@
 ## Setup
 
 - Clone [microsoft/vscode](https://github.com/microsoft/vscode)
-- Run `yarn` at `/`, this will install
+- Run `npm i` at `/`, this will install
 	- Dependencies for `/extension/css-language-features/`
 	- Dependencies for `/extension/css-language-features/server/`
 	- devDependencies such as `gulp`
 
 - Open `/extensions/css-language-features/` as the workspace in VS Code
-- In `/extensions/css-language-features/` run `yarn compile`(or `yarn watch`) to build the client and server
+- In `/extensions/css-language-features/` run `npm run compile`(or `npm run watch`) to build the client and server
 - Run the [`Launch Extension`](https://github.com/microsoft/vscode/blob/master/extensions/css-language-features/.vscode/launch.json) debug target in the Debug View. This will:
 	- Launch a new VS Code instance with the `css-language-features` extension loaded
 - Open a `.css` file to activate the extension. The extension will start the CSS language server process.
@@ -30,14 +30,14 @@ However, within this extension, you can run a development version of `vscode-css
 #### Linking `vscode-css-languageservice` in `css-language-features/server/`
 
 - Clone [microsoft/vscode-css-languageservice](https://github.com/microsoft/vscode-css-languageservice)
-- Run `yarn` in `vscode-css-languageservice`
-- Run `yarn link` in `vscode-css-languageservice`. This will compile and link `vscode-css-languageservice`
-- In `css-language-features/server/`, run `yarn link vscode-css-languageservice`
+- Run `npm i` in `vscode-css-languageservice`
+- Run `npm link` in `vscode-css-languageservice`. This will compile and link `vscode-css-languageservice`
+- In `css-language-features/server/`, run `npm link vscode-css-languageservice`
 
 #### Testing the development version of `vscode-css-languageservice`
 
 - Open both `vscode-css-languageservice` and this extension in a single workspace with [multi-root workspace](https://code.visualstudio.com/docs/editor/multi-root-workspaces) feature
-- Run `yarn watch` in `vscode-css-languageservice` to recompile the extension whenever it changes
-- Run `yarn watch` at `css-language-features/server/` to recompile this extension with the linked version of `vscode-css-languageservice`
+- Run `npm run watch` in `vscode-css-languageservice` to recompile the extension whenever it changes
+- Run `npm run watch` at `css-language-features/server/` to recompile this extension with the linked version of `vscode-css-languageservice`
 - Make some changes in `vscode-css-languageservice`
 - Now when you run `Launch Extension` debug target, the launched instance will use your development version of `vscode-css-languageservice`. You can interactively test the language features.
diff --git a/extensions/css-language-features/client/src/browser/cssClientMain.ts b/extensions/css-language-features/client/src/browser/cssClientMain.ts
index 6522c786389..1d4153d9836 100644
--- a/extensions/css-language-features/client/src/browser/cssClientMain.ts
+++ b/extensions/css-language-features/client/src/browser/cssClientMain.ts
@@ -7,13 +7,7 @@ import { ExtensionContext, Uri, l10n } from 'vscode';
 import { BaseLanguageClient, LanguageClientOptions } from 'vscode-languageclient';
 import { startClient, LanguageClientConstructor } from '../cssClient';
 import { LanguageClient } from 'vscode-languageclient/browser';
-
-declare const Worker: {
-	new(stringUrl: string): any;
-};
-declare const TextDecoder: {
-	new(encoding?: string): { decode(buffer: ArrayBuffer): string };
-};
+import { registerDropOrPasteResourceSupport } from '../dropOrPaste/dropOrPasteResource';
 
 let client: BaseLanguageClient | undefined;
 
@@ -25,11 +19,12 @@ export async function activate(context: ExtensionContext) {
 		worker.postMessage({ i10lLocation: l10n.uri?.toString(false) ?? '' });
 
 		const newLanguageClient: LanguageClientConstructor = (id: string, name: string, clientOptions: LanguageClientOptions) => {
-			return new LanguageClient(id, name, clientOptions, worker);
+			return new LanguageClient(id, name, worker, clientOptions);
 		};
 
 		client = await startClient(context, newLanguageClient, { TextDecoder });
 
+		context.subscriptions.push(registerDropOrPasteResourceSupport({ language: 'css', scheme: '*' }));
 	} catch (e) {
 		console.log(e);
 	}
diff --git a/extensions/css-language-features/client/src/dropOrPaste/dropOrPasteResource.ts b/extensions/css-language-features/client/src/dropOrPaste/dropOrPasteResource.ts
new file mode 100644
index 00000000000..6a4c38d2417
--- /dev/null
+++ b/extensions/css-language-features/client/src/dropOrPaste/dropOrPasteResource.ts
@@ -0,0 +1,152 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as path from 'path';
+import * as vscode from 'vscode';
+import { getDocumentDir, Mimes, Schemes } from './shared';
+import { UriList } from './uriList';
+
+class DropOrPasteResourceProvider implements vscode.DocumentDropEditProvider, vscode.DocumentPasteEditProvider {
+	readonly kind = vscode.DocumentDropOrPasteEditKind.Empty.append('css', 'url');
+
+	async provideDocumentDropEdits(
+		document: vscode.TextDocument,
+		position: vscode.Position,
+		dataTransfer: vscode.DataTransfer,
+		token: vscode.CancellationToken,
+	): Promise<vscode.DocumentDropEdit | undefined> {
+		const uriList = await this.getUriList(dataTransfer);
+		if (!uriList.entries.length || token.isCancellationRequested) {
+			return;
+		}
+
+		const snippet = await this.createUriListSnippet(document.uri, uriList);
+		if (!snippet || token.isCancellationRequested) {
+			return;
+		}
+
+		return {
+			kind: this.kind,
+			title: snippet.label,
+			insertText: snippet.snippet.value,
+			yieldTo: this.pasteAsCssUrlByDefault(document, position) ? [] : [vscode.DocumentDropOrPasteEditKind.Empty.append('uri')]
+		};
+	}
+
+	async provideDocumentPasteEdits(
+		document: vscode.TextDocument,
+		ranges: readonly vscode.Range[],
+		dataTransfer: vscode.DataTransfer,
+		_context: vscode.DocumentPasteEditContext,
+		token: vscode.CancellationToken
+	): Promise<vscode.DocumentPasteEdit[] | undefined> {
+		const uriList = await this.getUriList(dataTransfer);
+		if (!uriList.entries.length || token.isCancellationRequested) {
+			return;
+		}
+
+		const snippet = await this.createUriListSnippet(document.uri, uriList);
+		if (!snippet || token.isCancellationRequested) {
+			return;
+		}
+
+		return [{
+			kind: this.kind,
+			title: snippet.label,
+			insertText: snippet.snippet.value,
+			yieldTo: this.pasteAsCssUrlByDefault(document, ranges[0].start) ? [] : [vscode.DocumentDropOrPasteEditKind.Empty.append('uri')]
+		}];
+	}
+
+	private async getUriList(dataTransfer: vscode.DataTransfer): Promise<UriList> {
+		const urlList = await dataTransfer.get(Mimes.uriList)?.asString();
+		if (urlList) {
+			return UriList.from(urlList);
+		}
+
+		// Find file entries
+		const uris: vscode.Uri[] = [];
+		for (const [_, entry] of dataTransfer) {
+			const file = entry.asFile();
+			if (file?.uri) {
+				uris.push(file.uri);
+			}
+		}
+
+		return new UriList(uris.map(uri => ({ uri, str: uri.toString(true) })));
+	}
+
+	private async createUriListSnippet(docUri: vscode.Uri, uriList: UriList): Promise<{ readonly snippet: vscode.SnippetString; readonly label: string } | undefined> {
+		if (!uriList.entries.length) {
+			return;
+		}
+
+		const snippet = new vscode.SnippetString();
+		for (let i = 0; i < uriList.entries.length; i++) {
+			const uri = uriList.entries[i];
+			const relativePath = getRelativePath(getDocumentDir(docUri), uri.uri);
+			const urlText = relativePath ?? uri.str;
+
+			snippet.appendText(`url(${urlText})`);
+			if (i !== uriList.entries.length - 1) {
+				snippet.appendText(' ');
+			}
+		}
+
+		return {
+			snippet,
+			label: uriList.entries.length > 1
+				? vscode.l10n.t('Insert url() Functions')
+				: vscode.l10n.t('Insert url() Function')
+		};
+	}
+
+	private pasteAsCssUrlByDefault(document: vscode.TextDocument, position: vscode.Position): boolean {
+		const regex = /url\(.+?\)/gi;
+		for (const match of Array.from(document.lineAt(position.line).text.matchAll(regex))) {
+			if (position.character > match.index && position.character < match.index + match[0].length) {
+				return false;
+			}
+		}
+		return true;
+	}
+}
+
+function getRelativePath(fromFile: vscode.Uri | undefined, toFile: vscode.Uri): string | undefined {
+	if (fromFile && fromFile.scheme === toFile.scheme && fromFile.authority === toFile.authority) {
+		if (toFile.scheme === Schemes.file) {
+			// On windows, we must use the native `path.relative` to generate the relative path
+			// so that drive-letters are resolved cast insensitively. However we then want to
+			// convert back to a posix path to insert in to the document
+			const relativePath = path.relative(fromFile.fsPath, toFile.fsPath);
+			return path.posix.normalize(relativePath.split(path.sep).join(path.posix.sep));
+		}
+
+		return path.posix.relative(fromFile.path, toFile.path);
+	}
+
+	return undefined;
+}
+
+export function registerDropOrPasteResourceSupport(selector: vscode.DocumentSelector): vscode.Disposable {
+	const provider = new DropOrPasteResourceProvider();
+
+	return vscode.Disposable.from(
+		vscode.languages.registerDocumentDropEditProvider(selector, provider, {
+			providedDropEditKinds: [provider.kind],
+			dropMimeTypes: [
+				Mimes.uriList,
+				'files'
+			]
+		}),
+		vscode.languages.registerDocumentPasteEditProvider(selector, provider, {
+			providedPasteEditKinds: [provider.kind],
+			pasteMimeTypes: [
+				Mimes.uriList,
+				'files'
+			]
+		})
+	);
+}
diff --git a/extensions/css-language-features/client/src/dropOrPaste/shared.ts b/extensions/css-language-features/client/src/dropOrPaste/shared.ts
new file mode 100644
index 00000000000..548bccfec69
--- /dev/null
+++ b/extensions/css-language-features/client/src/dropOrPaste/shared.ts
@@ -0,0 +1,42 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import { Utils } from 'vscode-uri';
+
+export const Schemes = Object.freeze({
+	file: 'file',
+	notebookCell: 'vscode-notebook-cell',
+	untitled: 'untitled',
+});
+
+export const Mimes = Object.freeze({
+	plain: 'text/plain',
+	uriList: 'text/uri-list',
+});
+
+
+export function getDocumentDir(uri: vscode.Uri): vscode.Uri | undefined {
+	const docUri = getParentDocumentUri(uri);
+	if (docUri.scheme === Schemes.untitled) {
+		return vscode.workspace.workspaceFolders?.[0]?.uri;
+	}
+	return Utils.dirname(docUri);
+}
+
+function getParentDocumentUri(uri: vscode.Uri): vscode.Uri {
+	if (uri.scheme === Schemes.notebookCell) {
+		// is notebook documents necessary?
+		for (const notebook of vscode.workspace.notebookDocuments) {
+			for (const cell of notebook.getCells()) {
+				if (cell.document.uri.toString() === uri.toString()) {
+					return notebook.uri;
+				}
+			}
+		}
+	}
+
+	return uri;
+}
diff --git a/extensions/css-language-features/client/src/dropOrPaste/uriList.ts b/extensions/css-language-features/client/src/dropOrPaste/uriList.ts
new file mode 100644
index 00000000000..ed20b1ee797
--- /dev/null
+++ b/extensions/css-language-features/client/src/dropOrPaste/uriList.ts
@@ -0,0 +1,38 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+
+function splitUriList(str: string): string[] {
+	return str.split('\r\n');
+}
+
+function parseUriList(str: string): string[] {
+	return splitUriList(str)
+		.filter(value => !value.startsWith('#')) // Remove comments
+		.map(value => value.trim());
+}
+
+export class UriList {
+
+	static from(str: string): UriList {
+		return new UriList(coalesce(parseUriList(str).map(line => {
+			try {
+				return { uri: vscode.Uri.parse(line), str: line };
+			} catch {
+				// Uri parse failure
+				return undefined;
+			}
+		})));
+	}
+
+	constructor(
+		public readonly entries: ReadonlyArray<{ readonly uri: vscode.Uri; readonly str: string }>
+	) { }
+}
+
+function coalesce<T>(array: ReadonlyArray<T | undefined | null>): T[] {
+	return <T[]>array.filter(e => !!e);
+}
diff --git a/extensions/css-language-features/client/src/node/cssClientMain.ts b/extensions/css-language-features/client/src/node/cssClientMain.ts
index 802b58ab286..96926979b2a 100644
--- a/extensions/css-language-features/client/src/node/cssClientMain.ts
+++ b/extensions/css-language-features/client/src/node/cssClientMain.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getNodeFSRequestService } from './nodeFs';
-import { ExtensionContext, extensions, l10n } from 'vscode';
-import { startClient, LanguageClientConstructor } from '../cssClient';
-import { ServerOptions, TransportKind, LanguageClientOptions, LanguageClient, BaseLanguageClient } from 'vscode-languageclient/node';
 import { TextDecoder } from 'util';
-
+import { ExtensionContext, extensions, l10n } from 'vscode';
+import { BaseLanguageClient, LanguageClient, LanguageClientOptions, ServerOptions, TransportKind } from 'vscode-languageclient/node';
+import { LanguageClientConstructor, startClient } from '../cssClient';
+import { getNodeFSRequestService } from './nodeFs';
+import { registerDropOrPasteResourceSupport } from '../dropOrPaste/dropOrPasteResource';
 
 let client: BaseLanguageClient | undefined;
 
@@ -37,6 +37,8 @@ export async function activate(context: ExtensionContext) {
 	process.env['VSCODE_L10N_BUNDLE_LOCATION'] = l10n.uri?.toString() ?? '';
 
 	client = await startClient(context, newLanguageClient, { fs: getNodeFSRequestService(), TextDecoder });
+
+	context.subscriptions.push(registerDropOrPasteResourceSupport({ language: 'css', scheme: '*' }));
 }
 
 export async function deactivate(): Promise<void> {
@@ -45,3 +47,4 @@ export async function deactivate(): Promise<void> {
 		client = undefined;
 	}
 }
+
diff --git a/extensions/css-language-features/client/tsconfig.json b/extensions/css-language-features/client/tsconfig.json
index 573b24b4aa6..17bf7e962a8 100644
--- a/extensions/css-language-features/client/tsconfig.json
+++ b/extensions/css-language-features/client/tsconfig.json
@@ -1,10 +1,14 @@
 {
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
-		"outDir": "./out"
+		"outDir": "./out",
+		"lib": [
+			"webworker"
+		]
 	},
 	"include": [
 		"src/**/*",
-		"../../../src/vscode-dts/vscode.d.ts"
+		"../../../src/vscode-dts/vscode.d.ts",
+		"../../../src/vscode-dts/vscode.proposed.documentPaste.d.ts"
 	]
 }
diff --git a/extensions/css-language-features/package-lock.json b/extensions/css-language-features/package-lock.json
new file mode 100644
index 00000000000..e13184cae57
--- /dev/null
+++ b/extensions/css-language-features/package-lock.json
@@ -0,0 +1,135 @@
+{
+  "name": "css-language-features",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "css-language-features",
+      "version": "1.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "vscode-languageclient": "10.0.0-next.8",
+        "vscode-uri": "^3.0.8"
+      },
+      "devDependencies": {
+        "@types/node": "20.x"
+      },
+      "engines": {
+        "vscode": "^1.77.0"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "20.11.24",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
+      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+    },
+    "node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/semver": {
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
+      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    },
+    "node_modules/vscode-jsonrpc": {
+      "version": "9.0.0-next.4",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.4.tgz",
+      "integrity": "sha512-zSVIr58lJSMYKIsZ5P7GtBbv1eEx25eNyOf0NmEzxmn1GhUNJAVAb5hkA1poKUwj1FRMwN6CeyWxZypmr8SsQQ==",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/vscode-languageclient": {
+      "version": "10.0.0-next.8",
+      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-10.0.0-next.8.tgz",
+      "integrity": "sha512-D9inIHgqKayO9Tv0MeLb3XIL76yTuWmKdHqcGZKzjtQrMGJgASJDYWTapu+yAjEpDp0gmVOaCYyIlLB86ncDoQ==",
+      "dependencies": {
+        "minimatch": "^9.0.3",
+        "semver": "^7.6.0",
+        "vscode-languageserver-protocol": "3.17.6-next.6"
+      },
+      "engines": {
+        "vscode": "^1.89.0"
+      }
+    },
+    "node_modules/vscode-languageserver-protocol": {
+      "version": "3.17.6-next.6",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.6.tgz",
+      "integrity": "sha512-naxM9kc/phpl0kAFNVPejMUWUtzFXdPYY/BtQTYtfbBbHf8sceHOrKkmf6yynZRu1A4oFtRZNqV3wyFRTWqUHw==",
+      "dependencies": {
+        "vscode-jsonrpc": "9.0.0-next.4",
+        "vscode-languageserver-types": "3.17.6-next.4"
+      }
+    },
+    "node_modules/vscode-languageserver-types": {
+      "version": "3.17.6-next.4",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.6-next.4.tgz",
+      "integrity": "sha512-SeJTpH/S14EbxOAVaOUoGVqPToqpRTld5QO5Ghig3AlbFJTFF9Wu7srHMfa85L0SX1RYAuuCSFKJVVCxDIk1/Q=="
+    },
+    "node_modules/vscode-uri": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz",
+      "integrity": "sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw=="
+    },
+    "node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    }
+  }
+}
diff --git a/extensions/css-language-features/package.json b/extensions/css-language-features/package.json
index f4f6adfb7f4..802e2fbf113 100644
--- a/extensions/css-language-features/package.json
+++ b/extensions/css-language-features/package.json
@@ -23,11 +23,14 @@
       "supported": true
     }
   },
+  "enabledApiProposals": [
+    "documentPaste"
+  ],
   "scripts": {
     "compile": "npx gulp compile-extension:css-language-features-client compile-extension:css-language-features-server",
     "watch": "npx gulp watch-extension:css-language-features-client watch-extension:css-language-features-server",
     "test": "node ../../node_modules/mocha/bin/mocha",
-    "install-client-next": "yarn add vscode-languageclient@next"
+    "install-client-next": "npm install vscode-languageclient@next"
   },
   "categories": [
     "Programming Languages"
@@ -994,7 +997,7 @@
     ]
   },
   "dependencies": {
-    "vscode-languageclient": "^10.0.0-next.5",
+    "vscode-languageclient": "10.0.0-next.8",
     "vscode-uri": "^3.0.8"
   },
   "devDependencies": {
diff --git a/extensions/css-language-features/schemas/package.schema.json b/extensions/css-language-features/schemas/package.schema.json
index 831149caa9e..6c4b91faa27 100644
--- a/extensions/css-language-features/schemas/package.schema.json
+++ b/extensions/css-language-features/schemas/package.schema.json
@@ -1,6 +1,5 @@
 {
 	"$schema": "http://json-schema.org/draft-07/schema#",
-	"title": "CSS contributions to package.json",
 	"type": "object",
 	"properties": {
 		"contributes": {
diff --git a/extensions/css-language-features/server/.npmrc b/extensions/css-language-features/server/.npmrc
new file mode 100644
index 00000000000..a9c57709666
--- /dev/null
+++ b/extensions/css-language-features/server/.npmrc
@@ -0,0 +1,2 @@
+legacy-peer-deps="true"
+timeout=180000
diff --git a/extensions/css-language-features/server/package-lock.json b/extensions/css-language-features/server/package-lock.json
new file mode 100644
index 00000000000..2f7cb932b0c
--- /dev/null
+++ b/extensions/css-language-features/server/package-lock.json
@@ -0,0 +1,111 @@
+{
+  "name": "vscode-css-languageserver",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "vscode-css-languageserver",
+      "version": "1.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "@vscode/l10n": "^0.0.18",
+        "vscode-css-languageservice": "^6.3.1",
+        "vscode-languageserver": "10.0.0-next.6",
+        "vscode-uri": "^3.0.8"
+      },
+      "devDependencies": {
+        "@types/mocha": "^9.1.1",
+        "@types/node": "20.x"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/@types/mocha": {
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.1.tgz",
+      "integrity": "sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==",
+      "dev": true
+    },
+    "node_modules/@types/node": {
+      "version": "20.11.24",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
+      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/@vscode/l10n": {
+      "version": "0.0.18",
+      "resolved": "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.18.tgz",
+      "integrity": "sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ=="
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    },
+    "node_modules/vscode-css-languageservice": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.1.tgz",
+      "integrity": "sha512-1BzTBuJfwMc3A0uX4JBdJgoxp74cjj4q2mDJdp49yD/GuAq4X0k5WtK6fNcMYr+FfJ9nqgR6lpfCSZDkARJ5qQ==",
+      "dependencies": {
+        "@vscode/l10n": "^0.0.18",
+        "vscode-languageserver-textdocument": "^1.0.12",
+        "vscode-languageserver-types": "3.17.5",
+        "vscode-uri": "^3.0.8"
+      }
+    },
+    "node_modules/vscode-jsonrpc": {
+      "version": "9.0.0-next.4",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.4.tgz",
+      "integrity": "sha512-zSVIr58lJSMYKIsZ5P7GtBbv1eEx25eNyOf0NmEzxmn1GhUNJAVAb5hkA1poKUwj1FRMwN6CeyWxZypmr8SsQQ==",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/vscode-languageserver": {
+      "version": "10.0.0-next.6",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-10.0.0-next.6.tgz",
+      "integrity": "sha512-0Lh1nhQfSxo5Ob+ayYO1QTIsDix2/Lc72Urm1KZrCFxK5zIFYaEh3QFeM9oZih4Rzs0ZkQPXXnoHtpvs5GT+Zw==",
+      "dependencies": {
+        "vscode-languageserver-protocol": "3.17.6-next.6"
+      },
+      "bin": {
+        "installServerIntoExtension": "bin/installServerIntoExtension"
+      }
+    },
+    "node_modules/vscode-languageserver-protocol": {
+      "version": "3.17.6-next.6",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.6.tgz",
+      "integrity": "sha512-naxM9kc/phpl0kAFNVPejMUWUtzFXdPYY/BtQTYtfbBbHf8sceHOrKkmf6yynZRu1A4oFtRZNqV3wyFRTWqUHw==",
+      "dependencies": {
+        "vscode-jsonrpc": "9.0.0-next.4",
+        "vscode-languageserver-types": "3.17.6-next.4"
+      }
+    },
+    "node_modules/vscode-languageserver-protocol/node_modules/vscode-languageserver-types": {
+      "version": "3.17.6-next.4",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.6-next.4.tgz",
+      "integrity": "sha512-SeJTpH/S14EbxOAVaOUoGVqPToqpRTld5QO5Ghig3AlbFJTFF9Wu7srHMfa85L0SX1RYAuuCSFKJVVCxDIk1/Q=="
+    },
+    "node_modules/vscode-languageserver-textdocument": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz",
+      "integrity": "sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA=="
+    },
+    "node_modules/vscode-languageserver-types": {
+      "version": "3.17.5",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz",
+      "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg=="
+    },
+    "node_modules/vscode-uri": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz",
+      "integrity": "sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw=="
+    }
+  }
+}
diff --git a/extensions/css-language-features/server/package.json b/extensions/css-language-features/server/package.json
index 0f1750e800a..4d8b9bd41ac 100644
--- a/extensions/css-language-features/server/package.json
+++ b/extensions/css-language-features/server/package.json
@@ -11,8 +11,8 @@
   "browser": "./dist/browser/cssServerMain",
   "dependencies": {
     "@vscode/l10n": "^0.0.18",
-    "vscode-css-languageservice": "^6.2.14",
-    "vscode-languageserver": "^10.0.0-next.3",
+    "vscode-css-languageservice": "^6.3.1",
+    "vscode-languageserver": "10.0.0-next.6",
     "vscode-uri": "^3.0.8"
   },
   "devDependencies": {
@@ -22,10 +22,10 @@
   "scripts": {
     "compile": "gulp compile-extension:css-language-features-server",
     "watch": "gulp watch-extension:css-language-features-server",
-    "install-service-next": "yarn add vscode-css-languageservice@next",
-    "install-service-local": "yarn link vscode-css-languageservice",
-    "install-server-next": "yarn add vscode-languageserver@next",
-    "install-server-local": "yarn link vscode-languageserver",
+    "install-service-next": "npm install vscode-css-languageservice@next",
+    "install-service-local": "npm link vscode-css-languageservice",
+    "install-server-next": "npm install vscode-languageserver@next",
+    "install-server-local": "npm install vscode-languageserver",
     "test": "node ./test/index.js"
   }
 }
diff --git a/extensions/css-language-features/server/yarn.lock b/extensions/css-language-features/server/yarn.lock
deleted file mode 100644
index 8d4c46d641e..00000000000
--- a/extensions/css-language-features/server/yarn.lock
+++ /dev/null
@@ -1,75 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@types/mocha@^9.1.1":
-  version "9.1.1"
-  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-9.1.1.tgz#e7c4f1001eefa4b8afbd1eee27a237fee3bf29c4"
-  integrity sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==
-
-"@types/node@20.x":
-  version "20.11.24"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792"
-  integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==
-  dependencies:
-    undici-types "~5.26.4"
-
-"@vscode/l10n@^0.0.18":
-  version "0.0.18"
-  resolved "https://registry.yarnpkg.com/@vscode/l10n/-/l10n-0.0.18.tgz#916d3a5e960dbab47c1c56f58a7cb5087b135c95"
-  integrity sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ==
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
-
-vscode-css-languageservice@^6.2.14:
-  version "6.2.14"
-  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-6.2.14.tgz#d44fe75c03942d865a9c1a5ff5fb4e8dec1f89d0"
-  integrity sha512-5UPQ9Y1sUTnuMyaMBpO7LrBkqjhEJb5eAwdUlDp+Uez8lry+Tspnk3+3p2qWS4LlNsr4p3v9WkZxUf1ltgFpgw==
-  dependencies:
-    "@vscode/l10n" "^0.0.18"
-    vscode-languageserver-textdocument "^1.0.11"
-    vscode-languageserver-types "3.17.5"
-    vscode-uri "^3.0.8"
-
-vscode-jsonrpc@9.0.0-next.2:
-  version "9.0.0-next.2"
-  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.2.tgz#29e9741c742c80329bba1c60ce38fd014651ba80"
-  integrity sha512-meIaXAgChCHzWy45QGU8YpCNyqnZQ/sYeCj32OLDDbUYsCF7AvgpdXx3nnZn9yzr8ed0Od9bW+NGphEmXsqvIQ==
-
-vscode-languageserver-protocol@3.17.6-next.4:
-  version "3.17.6-next.4"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.4.tgz#3c56f6eb588bb42fccc0ac54a0d5daf2d02f0a1b"
-  integrity sha512-/2bleKBxZLyRObS4mkpaWlVI9xGiUqMVmh/ztZ2vL4uP2XyIpraT45JBpn9AtXr0alqKJPKLuKr+/qcYULvm/w==
-  dependencies:
-    vscode-jsonrpc "9.0.0-next.2"
-    vscode-languageserver-types "3.17.6-next.3"
-
-vscode-languageserver-textdocument@^1.0.11:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.11.tgz#0822a000e7d4dc083312580d7575fe9e3ba2e2bf"
-  integrity sha512-X+8T3GoiwTVlJbicx/sIAF+yuJAqz8VvwJyoMVhwEMoEKE/fkDmrqUgDMyBECcM2A2frVZIUj5HI/ErRXCfOeA==
-
-vscode-languageserver-types@3.17.5:
-  version "3.17.5"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz#3273676f0cf2eab40b3f44d085acbb7f08a39d8a"
-  integrity sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==
-
-vscode-languageserver-types@3.17.6-next.3:
-  version "3.17.6-next.3"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.6-next.3.tgz#f71d6c57f18d921346cfe0c227aabd72eb8cd2f0"
-  integrity sha512-l5kNFXFRQGuzriXpuBqFpRmkf6f6A4VoU3h95OsVkqIOoi1k7KbwSo600cIdsKSJWrPg/+vX+QMPcMw1oI7ItA==
-
-vscode-languageserver@^10.0.0-next.3:
-  version "10.0.0-next.3"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-10.0.0-next.3.tgz#a63c5ea9fab1be93d7732ab0fdc18c9b37956e07"
-  integrity sha512-4x1qHImf6ePji4+8PX43lnBCBfBNdi2jneGX2k5FswJhx/cxaYYmusShmmtO/clyL1iurxJacrQoXfw9+ikhvg==
-  dependencies:
-    vscode-languageserver-protocol "3.17.6-next.4"
-
-vscode-uri@^3.0.8:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.8.tgz#1770938d3e72588659a172d0fd4642780083ff9f"
-  integrity sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==
diff --git a/extensions/css-language-features/yarn.lock b/extensions/css-language-features/yarn.lock
deleted file mode 100644
index 25a22d07ca6..00000000000
--- a/extensions/css-language-features/yarn.lock
+++ /dev/null
@@ -1,85 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@types/node@20.x":
-  version "20.11.24"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792"
-  integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==
-  dependencies:
-    undici-types "~5.26.4"
-
-balanced-match@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"
-  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
-
-brace-expansion@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz"
-  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
-  dependencies:
-    balanced-match "^1.0.0"
-
-lru-cache@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"
-  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
-  dependencies:
-    yallist "^4.0.0"
-
-minimatch@^9.0.3:
-  version "9.0.3"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
-  integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
-  dependencies:
-    brace-expansion "^2.0.1"
-
-semver@^7.6.0:
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
-  integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
-  dependencies:
-    lru-cache "^6.0.0"
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
-
-vscode-jsonrpc@9.0.0-next.2:
-  version "9.0.0-next.2"
-  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.2.tgz#29e9741c742c80329bba1c60ce38fd014651ba80"
-  integrity sha512-meIaXAgChCHzWy45QGU8YpCNyqnZQ/sYeCj32OLDDbUYsCF7AvgpdXx3nnZn9yzr8ed0Od9bW+NGphEmXsqvIQ==
-
-vscode-languageclient@^10.0.0-next.5:
-  version "10.0.0-next.5"
-  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-10.0.0-next.5.tgz#7431d88255a5fd99e9423659ac484b1f968200f3"
-  integrity sha512-JIf1WE7fvV0RElFM062bAummI433vcxuFwqoYAp+1zTVhta/jznxkTz1zs3Hbj2tiDfclf0TZ0qCxflAP1mY2Q==
-  dependencies:
-    minimatch "^9.0.3"
-    semver "^7.6.0"
-    vscode-languageserver-protocol "3.17.6-next.4"
-
-vscode-languageserver-protocol@3.17.6-next.4:
-  version "3.17.6-next.4"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.4.tgz#3c56f6eb588bb42fccc0ac54a0d5daf2d02f0a1b"
-  integrity sha512-/2bleKBxZLyRObS4mkpaWlVI9xGiUqMVmh/ztZ2vL4uP2XyIpraT45JBpn9AtXr0alqKJPKLuKr+/qcYULvm/w==
-  dependencies:
-    vscode-jsonrpc "9.0.0-next.2"
-    vscode-languageserver-types "3.17.6-next.3"
-
-vscode-languageserver-types@3.17.6-next.3:
-  version "3.17.6-next.3"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.6-next.3.tgz#f71d6c57f18d921346cfe0c227aabd72eb8cd2f0"
-  integrity sha512-l5kNFXFRQGuzriXpuBqFpRmkf6f6A4VoU3h95OsVkqIOoi1k7KbwSo600cIdsKSJWrPg/+vX+QMPcMw1oI7ItA==
-
-vscode-uri@^3.0.8:
-  version "3.0.8"
-  resolved "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz"
-  integrity sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==
-
-yallist@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"
-  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
diff --git a/extensions/css/yarn.lock b/extensions/css/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/css/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/dart/cgmanifest.json b/extensions/dart/cgmanifest.json
index df4e4f0aae9..da493cafa70 100644
--- a/extensions/dart/cgmanifest.json
+++ b/extensions/dart/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "dart-lang/dart-syntax-highlight",
 					"repositoryUrl": "https://github.com/dart-lang/dart-syntax-highlight",
-					"commitHash": "bb8f7eebf5a1028e70dbebcf35cfef738dddc7fe"
+					"commitHash": "e8b053f9834cb44db0f49ac4a4567177bd943dbf"
 				}
 			},
 			"licenseDetail": [
diff --git a/extensions/dart/syntaxes/dart.tmLanguage.json b/extensions/dart/syntaxes/dart.tmLanguage.json
index 5a4a9393bc7..32ea3f5b0c3 100644
--- a/extensions/dart/syntaxes/dart.tmLanguage.json
+++ b/extensions/dart/syntaxes/dart.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/dart-lang/dart-syntax-highlight/commit/bb8f7eebf5a1028e70dbebcf35cfef738dddc7fe",
+	"version": "https://github.com/dart-lang/dart-syntax-highlight/commit/e8b053f9834cb44db0f49ac4a4567177bd943dbf",
 	"name": "Dart",
 	"scopeName": "source.dart",
 	"patterns": [
@@ -212,7 +212,7 @@
 				},
 				{
 					"name": "constant.numeric.dart",
-					"match": "(?<!\\$)\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)\\b(?!\\$)"
+					"match": "(?<!\\$)\\b((0(x|X)[0-9a-fA-F][0-9a-fA-F_]*)|(([0-9][0-9_]*\\.?[0-9_]*)|(\\.[0-9][0-9_]*))((e|E)(\\+|-)?[0-9][0-9_]*)?)\\b(?!\\$)"
 				},
 				{
 					"include": "#class-identifier"
diff --git a/extensions/debug-auto-launch/.npmrc b/extensions/debug-auto-launch/.npmrc
new file mode 100644
index 00000000000..a9c57709666
--- /dev/null
+++ b/extensions/debug-auto-launch/.npmrc
@@ -0,0 +1,2 @@
+legacy-peer-deps="true"
+timeout=180000
diff --git a/extensions/debug-auto-launch/.vscodeignore b/extensions/debug-auto-launch/.vscodeignore
index 36e8b0714fa..360fcfd1c99 100644
--- a/extensions/debug-auto-launch/.vscodeignore
+++ b/extensions/debug-auto-launch/.vscodeignore
@@ -2,4 +2,4 @@ src/**
 tsconfig.json
 out/**
 extension.webpack.config.js
-yarn.lock
\ No newline at end of file
+package-lock.json
diff --git a/extensions/debug-auto-launch/package-lock.json b/extensions/debug-auto-launch/package-lock.json
new file mode 100644
index 00000000000..84a1daab83b
--- /dev/null
+++ b/extensions/debug-auto-launch/package-lock.json
@@ -0,0 +1,34 @@
+{
+  "name": "debug-auto-launch",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "debug-auto-launch",
+      "version": "1.0.0",
+      "license": "MIT",
+      "devDependencies": {
+        "@types/node": "20.x"
+      },
+      "engines": {
+        "vscode": "^1.5.0"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "20.11.24",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
+      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    }
+  }
+}
diff --git a/extensions/debug-auto-launch/src/extension.ts b/extensions/debug-auto-launch/src/extension.ts
index d947d4eb8b0..7d06c56d47f 100644
--- a/extensions/debug-auto-launch/src/extension.ts
+++ b/extensions/debug-auto-launch/src/extension.ts
@@ -283,7 +283,7 @@ async function destroyAttachServer() {
 
 interface CachedIpcState {
 	ipcAddress: string;
-	jsDebugPath: string;
+	jsDebugPath: string | undefined;
 	settingsValue: string;
 }
 
@@ -388,7 +388,7 @@ async function getIpcAddress(context: vscode.ExtensionContext) {
 		ipcAddress,
 		jsDebugPath,
 		settingsValue,
-	} as CachedIpcState);
+	} satisfies CachedIpcState);
 
 	return ipcAddress;
 }
diff --git a/extensions/debug-auto-launch/yarn.lock b/extensions/debug-auto-launch/yarn.lock
deleted file mode 100644
index 1f4b6c2e8b4..00000000000
--- a/extensions/debug-auto-launch/yarn.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@types/node@20.x":
-  version "20.11.24"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792"
-  integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==
-  dependencies:
-    undici-types "~5.26.4"
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
diff --git a/extensions/debug-server-ready/.npmrc b/extensions/debug-server-ready/.npmrc
new file mode 100644
index 00000000000..a9c57709666
--- /dev/null
+++ b/extensions/debug-server-ready/.npmrc
@@ -0,0 +1,2 @@
+legacy-peer-deps="true"
+timeout=180000
diff --git a/extensions/debug-server-ready/.vscodeignore b/extensions/debug-server-ready/.vscodeignore
index 609d4c28b22..536dd0720a3 100644
--- a/extensions/debug-server-ready/.vscodeignore
+++ b/extensions/debug-server-ready/.vscodeignore
@@ -2,5 +2,5 @@ src/**
 tsconfig.json
 out/**
 extension.webpack.config.js
-yarn.lock
-.vscode
\ No newline at end of file
+package-lock.json
+.vscode
diff --git a/extensions/debug-server-ready/package-lock.json b/extensions/debug-server-ready/package-lock.json
new file mode 100644
index 00000000000..29a149e0e16
--- /dev/null
+++ b/extensions/debug-server-ready/package-lock.json
@@ -0,0 +1,34 @@
+{
+  "name": "debug-server-ready",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "debug-server-ready",
+      "version": "1.0.0",
+      "license": "MIT",
+      "devDependencies": {
+        "@types/node": "20.x"
+      },
+      "engines": {
+        "vscode": "^1.32.0"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "20.11.24",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
+      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    }
+  }
+}
diff --git a/extensions/debug-server-ready/yarn.lock b/extensions/debug-server-ready/yarn.lock
deleted file mode 100644
index 1f4b6c2e8b4..00000000000
--- a/extensions/debug-server-ready/yarn.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@types/node@20.x":
-  version "20.11.24"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792"
-  integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==
-  dependencies:
-    undici-types "~5.26.4"
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
diff --git a/extensions/docker/yarn.lock b/extensions/docker/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/docker/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/emmet/.npmrc b/extensions/emmet/.npmrc
new file mode 100644
index 00000000000..a9c57709666
--- /dev/null
+++ b/extensions/emmet/.npmrc
@@ -0,0 +1,2 @@
+legacy-peer-deps="true"
+timeout=180000
diff --git a/extensions/emmet/.vscodeignore b/extensions/emmet/.vscodeignore
index f3165a5ba04..ccf478fb97f 100644
--- a/extensions/emmet/.vscodeignore
+++ b/extensions/emmet/.vscodeignore
@@ -7,5 +7,5 @@ extension.webpack.config.js
 extension-browser.webpack.config.js
 CONTRIBUTING.md
 cgmanifest.json
-yarn.lock
+package-lock.json
 .vscode
diff --git a/extensions/emmet/package-lock.json b/extensions/emmet/package-lock.json
new file mode 100644
index 00000000000..aa01c4104ca
--- /dev/null
+++ b/extensions/emmet/package-lock.json
@@ -0,0 +1,172 @@
+{
+  "name": "emmet",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "emmet",
+      "version": "1.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "@emmetio/css-parser": "ramya-rao-a/css-parser#vscode",
+        "@emmetio/html-matcher": "^0.3.3",
+        "@emmetio/math-expression": "^1.0.5",
+        "@vscode/emmet-helper": "^2.8.8",
+        "image-size": "~1.0.0",
+        "vscode-languageserver-textdocument": "^1.0.1"
+      },
+      "devDependencies": {
+        "@types/node": "20.x"
+      },
+      "engines": {
+        "vscode": "^1.13.0"
+      }
+    },
+    "node_modules/@emmetio/abbreviation": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/@emmetio/abbreviation/-/abbreviation-2.3.3.tgz",
+      "integrity": "sha512-mgv58UrU3rh4YgbE/TzgLQwJ3pFsHHhCLqY20aJq+9comytTXUDNGG/SMtSeMJdkpxgXSXunBGLD8Boka3JyVA==",
+      "dependencies": {
+        "@emmetio/scanner": "^1.0.4"
+      }
+    },
+    "node_modules/@emmetio/css-abbreviation": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/@emmetio/css-abbreviation/-/css-abbreviation-2.1.8.tgz",
+      "integrity": "sha512-s9yjhJ6saOO/uk1V74eifykk2CBYi01STTK3WlXWGOepyKa23ymJ053+DNQjpFcy1ingpaO7AxCcwLvHFY9tuw==",
+      "dependencies": {
+        "@emmetio/scanner": "^1.0.4"
+      }
+    },
+    "node_modules/@emmetio/css-parser": {
+      "version": "0.4.0",
+      "resolved": "git+ssh://git@github.com/ramya-rao-a/css-parser.git#370c480ac103bd17c7bcfb34bf5d577dc40d3660",
+      "dependencies": {
+        "@emmetio/stream-reader": "^2.2.0",
+        "@emmetio/stream-reader-utils": "^0.1.0"
+      }
+    },
+    "node_modules/@emmetio/html-matcher": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@emmetio/html-matcher/-/html-matcher-0.3.3.tgz",
+      "integrity": "sha1-C72twIguGFlQ8Dc33G2/j3vZByg= sha512-+aeGmFXoR36nk2qzqPhBnWjnB38BV+dreTh/tsfbWP9kHv7fqRa9XuG1BSQFbPtKzsjUsBvGXkgGU3G8MkMw6A==",
+      "dependencies": {
+        "@emmetio/stream-reader": "^2.0.0",
+        "@emmetio/stream-reader-utils": "^0.1.0"
+      }
+    },
+    "node_modules/@emmetio/math-expression": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@emmetio/math-expression/-/math-expression-1.0.5.tgz",
+      "integrity": "sha512-qf5SXD/ViS04rXSeDg9CRGM10xLC9dVaKIbMHrrwxYr5LNB/C0rOfokhGSBwnVQKcidLmdRJeNWH1V1tppZ84Q==",
+      "dependencies": {
+        "@emmetio/scanner": "^1.0.4"
+      }
+    },
+    "node_modules/@emmetio/scanner": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@emmetio/scanner/-/scanner-1.0.4.tgz",
+      "integrity": "sha512-IqRuJtQff7YHHBk4G8YZ45uB9BaAGcwQeVzgj/zj8/UdOhtQpEIupUhSk8dys6spFIWVZVeK20CzGEnqR5SbqA=="
+    },
+    "node_modules/@emmetio/stream-reader": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@emmetio/stream-reader/-/stream-reader-2.2.0.tgz",
+      "integrity": "sha1-Rs/+oRmgoAMxKiHC2bVijLX81EI= sha512-fXVXEyFA5Yv3M3n8sUGT7+fvecGrZP4k6FnWWMSZVQf69kAq0LLpaBQLGcPR30m3zMmKYhECP4k/ZkzvhEW5kw=="
+    },
+    "node_modules/@emmetio/stream-reader-utils": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/@emmetio/stream-reader-utils/-/stream-reader-utils-0.1.0.tgz",
+      "integrity": "sha1-JEywLHfsLnT3ipvTGCGKvJxQCmE= sha512-ZsZ2I9Vzso3Ho/pjZFsmmZ++FWeEd/txqybHTm4OgaZzdS8V9V/YYWQwg5TC38Z7uLWUV1vavpLLbjJtKubR1A=="
+    },
+    "node_modules/@types/node": {
+      "version": "20.11.24",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
+      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/@vscode/emmet-helper": {
+      "version": "2.9.3",
+      "resolved": "https://registry.npmjs.org/@vscode/emmet-helper/-/emmet-helper-2.9.3.tgz",
+      "integrity": "sha512-rB39LHWWPQYYlYfpv9qCoZOVioPCftKXXqrsyqN1mTWZM6dTnONT63Db+03vgrBbHzJN45IrgS/AGxw9iiqfEw==",
+      "dependencies": {
+        "emmet": "^2.4.3",
+        "jsonc-parser": "^2.3.0",
+        "vscode-languageserver-textdocument": "^1.0.1",
+        "vscode-languageserver-types": "^3.15.1",
+        "vscode-uri": "^2.1.2"
+      }
+    },
+    "node_modules/emmet": {
+      "version": "2.4.7",
+      "resolved": "https://registry.npmjs.org/emmet/-/emmet-2.4.7.tgz",
+      "integrity": "sha512-O5O5QNqtdlnQM2bmKHtJgyChcrFMgQuulI+WdiOw2NArzprUqqxUW6bgYtKvzKgrsYpuLWalOkdhNP+1jluhCA==",
+      "workspaces": [
+        "./packages/scanner",
+        "./packages/abbreviation",
+        "./packages/css-abbreviation",
+        "./"
+      ],
+      "dependencies": {
+        "@emmetio/abbreviation": "^2.3.3",
+        "@emmetio/css-abbreviation": "^2.1.8"
+      }
+    },
+    "node_modules/image-size": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/image-size/-/image-size-1.0.0.tgz",
+      "integrity": "sha512-JLJ6OwBfO1KcA+TvJT+v8gbE6iWbj24LyDNFgFEN0lzegn6cC6a/p3NIDaepMsJjQjlUWqIC7wJv8lBFxPNjcw==",
+      "dependencies": {
+        "queue": "6.0.2"
+      },
+      "bin": {
+        "image-size": "bin/image-size.js"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "node_modules/jsonc-parser": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.3.1.tgz",
+      "integrity": "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg=="
+    },
+    "node_modules/queue": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/queue/-/queue-6.0.2.tgz",
+      "integrity": "sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==",
+      "dependencies": {
+        "inherits": "~2.0.3"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    },
+    "node_modules/vscode-languageserver-textdocument": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.3.tgz",
+      "integrity": "sha512-ynEGytvgTb6HVSUwPJIAZgiHQmPCx8bZ8w5um5Lz+q5DjP0Zj8wTFhQpyg8xaMvefDytw2+HH5yzqS+FhsR28A=="
+    },
+    "node_modules/vscode-languageserver-types": {
+      "version": "3.17.3",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.3.tgz",
+      "integrity": "sha512-SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA=="
+    },
+    "node_modules/vscode-uri": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.1.2.tgz",
+      "integrity": "sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A=="
+    }
+  }
+}
diff --git a/extensions/emmet/package.json b/extensions/emmet/package.json
index 1783bc2ceaf..a390a86fc2e 100644
--- a/extensions/emmet/package.json
+++ b/extensions/emmet/package.json
@@ -476,7 +476,7 @@
   "scripts": {
     "watch": "gulp watch-extension:emmet",
     "compile": "gulp compile-extension:emmet",
-    "deps": "yarn add @vscode/emmet-helper"
+    "deps": "npm install @vscode/emmet-helper"
   },
   "devDependencies": {
     "@types/node": "20.x"
diff --git a/extensions/emmet/yarn.lock b/extensions/emmet/yarn.lock
deleted file mode 100644
index b75842fe4a4..00000000000
--- a/extensions/emmet/yarn.lock
+++ /dev/null
@@ -1,124 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@emmetio/abbreviation@^2.3.3":
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/@emmetio/abbreviation/-/abbreviation-2.3.3.tgz#ed2b88fe37b972292d6026c7c540aaf887cecb6e"
-  integrity sha512-mgv58UrU3rh4YgbE/TzgLQwJ3pFsHHhCLqY20aJq+9comytTXUDNGG/SMtSeMJdkpxgXSXunBGLD8Boka3JyVA==
-  dependencies:
-    "@emmetio/scanner" "^1.0.4"
-
-"@emmetio/css-abbreviation@^2.1.8":
-  version "2.1.8"
-  resolved "https://registry.yarnpkg.com/@emmetio/css-abbreviation/-/css-abbreviation-2.1.8.tgz#b785313486eba6cb7eb623ad39378c4e1063dc00"
-  integrity sha512-s9yjhJ6saOO/uk1V74eifykk2CBYi01STTK3WlXWGOepyKa23ymJ053+DNQjpFcy1ingpaO7AxCcwLvHFY9tuw==
-  dependencies:
-    "@emmetio/scanner" "^1.0.4"
-
-"@emmetio/css-parser@ramya-rao-a/css-parser#vscode":
-  version "0.4.0"
-  resolved "https://codeload.github.com/ramya-rao-a/css-parser/tar.gz/370c480ac103bd17c7bcfb34bf5d577dc40d3660"
-  dependencies:
-    "@emmetio/stream-reader" "^2.2.0"
-    "@emmetio/stream-reader-utils" "^0.1.0"
-
-"@emmetio/html-matcher@^0.3.3":
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/@emmetio/html-matcher/-/html-matcher-0.3.3.tgz#0bbdadc0882e185950f03737dc6dbf8f7bd90728"
-  integrity sha1-C72twIguGFlQ8Dc33G2/j3vZByg=
-  dependencies:
-    "@emmetio/stream-reader" "^2.0.0"
-    "@emmetio/stream-reader-utils" "^0.1.0"
-
-"@emmetio/math-expression@^1.0.5":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@emmetio/math-expression/-/math-expression-1.0.5.tgz#d0cc52ed453a107bc9b19c5d71d1390d3aecbe48"
-  integrity sha512-qf5SXD/ViS04rXSeDg9CRGM10xLC9dVaKIbMHrrwxYr5LNB/C0rOfokhGSBwnVQKcidLmdRJeNWH1V1tppZ84Q==
-  dependencies:
-    "@emmetio/scanner" "^1.0.4"
-
-"@emmetio/scanner@^1.0.4":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@emmetio/scanner/-/scanner-1.0.4.tgz#e9cdc67194fd91f8b7eb141014be4f2d086c15f1"
-  integrity sha512-IqRuJtQff7YHHBk4G8YZ45uB9BaAGcwQeVzgj/zj8/UdOhtQpEIupUhSk8dys6spFIWVZVeK20CzGEnqR5SbqA==
-
-"@emmetio/stream-reader-utils@^0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@emmetio/stream-reader-utils/-/stream-reader-utils-0.1.0.tgz#244cb02c77ec2e74f78a9bd318218abc9c500a61"
-  integrity sha1-JEywLHfsLnT3ipvTGCGKvJxQCmE=
-
-"@emmetio/stream-reader@^2.0.0", "@emmetio/stream-reader@^2.2.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@emmetio/stream-reader/-/stream-reader-2.2.0.tgz#46cffea119a0a003312a21c2d9b5628cb5fcd442"
-  integrity sha1-Rs/+oRmgoAMxKiHC2bVijLX81EI=
-
-"@types/node@20.x":
-  version "20.11.24"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792"
-  integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==
-  dependencies:
-    undici-types "~5.26.4"
-
-"@vscode/emmet-helper@^2.8.8":
-  version "2.9.3"
-  resolved "https://registry.yarnpkg.com/@vscode/emmet-helper/-/emmet-helper-2.9.3.tgz#8a8b228981fcf2d9346fdca77b9ad5a31dc09dba"
-  integrity sha512-rB39LHWWPQYYlYfpv9qCoZOVioPCftKXXqrsyqN1mTWZM6dTnONT63Db+03vgrBbHzJN45IrgS/AGxw9iiqfEw==
-  dependencies:
-    emmet "^2.4.3"
-    jsonc-parser "^2.3.0"
-    vscode-languageserver-textdocument "^1.0.1"
-    vscode-languageserver-types "^3.15.1"
-    vscode-uri "^2.1.2"
-
-emmet@^2.4.3:
-  version "2.4.7"
-  resolved "https://registry.yarnpkg.com/emmet/-/emmet-2.4.7.tgz#19893c34e6274af14ea3c5729101e3c4ed18f01e"
-  integrity sha512-O5O5QNqtdlnQM2bmKHtJgyChcrFMgQuulI+WdiOw2NArzprUqqxUW6bgYtKvzKgrsYpuLWalOkdhNP+1jluhCA==
-  dependencies:
-    "@emmetio/abbreviation" "^2.3.3"
-    "@emmetio/css-abbreviation" "^2.1.8"
-
-image-size@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/image-size/-/image-size-1.0.0.tgz#58b31fe4743b1cec0a0ac26f5c914d3c5b2f0750"
-  integrity sha512-JLJ6OwBfO1KcA+TvJT+v8gbE6iWbj24LyDNFgFEN0lzegn6cC6a/p3NIDaepMsJjQjlUWqIC7wJv8lBFxPNjcw==
-  dependencies:
-    queue "6.0.2"
-
-inherits@~2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-jsonc-parser@^2.3.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.3.1.tgz#59549150b133f2efacca48fe9ce1ec0659af2342"
-  integrity sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==
-
-queue@6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/queue/-/queue-6.0.2.tgz#b91525283e2315c7553d2efa18d83e76432fed65"
-  integrity sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==
-  dependencies:
-    inherits "~2.0.3"
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
-
-vscode-languageserver-textdocument@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.3.tgz#879f2649bfa5a6e07bc8b392c23ede2dfbf43eff"
-  integrity sha512-ynEGytvgTb6HVSUwPJIAZgiHQmPCx8bZ8w5um5Lz+q5DjP0Zj8wTFhQpyg8xaMvefDytw2+HH5yzqS+FhsR28A==
-
-vscode-languageserver-types@^3.15.1:
-  version "3.17.3"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.3.tgz#72d05e47b73be93acb84d6e311b5786390f13f64"
-  integrity sha512-SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA==
-
-vscode-uri@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-2.1.2.tgz#c8d40de93eb57af31f3c715dd650e2ca2c096f1c"
-  integrity sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A==
diff --git a/extensions/extension-editing/.npmrc b/extensions/extension-editing/.npmrc
new file mode 100644
index 00000000000..a9c57709666
--- /dev/null
+++ b/extensions/extension-editing/.npmrc
@@ -0,0 +1,2 @@
+legacy-peer-deps="true"
+timeout=180000
diff --git a/extensions/extension-editing/.vscodeignore b/extensions/extension-editing/.vscodeignore
index de8e6dc5913..8d4da76b9cb 100644
--- a/extensions/extension-editing/.vscodeignore
+++ b/extensions/extension-editing/.vscodeignore
@@ -4,4 +4,4 @@ tsconfig.json
 out/**
 extension.webpack.config.js
 extension-browser.webpack.config.js
-yarn.lock
+package-lock.json
diff --git a/extensions/extension-editing/package-lock.json b/extensions/extension-editing/package-lock.json
new file mode 100644
index 00000000000..3fa0c35e2d0
--- /dev/null
+++ b/extensions/extension-editing/package-lock.json
@@ -0,0 +1,110 @@
+{
+  "name": "extension-editing",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "extension-editing",
+      "version": "1.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "jsonc-parser": "^3.2.0",
+        "markdown-it": "^12.3.2",
+        "parse5": "^3.0.2"
+      },
+      "devDependencies": {
+        "@types/markdown-it": "0.0.2",
+        "@types/node": "20.x"
+      },
+      "engines": {
+        "vscode": "^1.4.0"
+      }
+    },
+    "node_modules/@types/markdown-it": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-0.0.2.tgz",
+      "integrity": "sha1-XZrRnm5lCM3S8llt+G/Qqt5ZhmA= sha512-A2seE+zJYSjGHy7L/v0EN/xRfgv2A60TuXOwI8tt5aZxF4UeoYIkM2jERnNH8w4VFr7oFEm0lElGOao7fZgygQ==",
+      "dev": true
+    },
+    "node_modules/@types/node": {
+      "version": "20.11.24",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
+      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+    },
+    "node_modules/entities": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
+      "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/jsonc-parser": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
+      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w=="
+    },
+    "node_modules/linkify-it": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
+      "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
+      "dependencies": {
+        "uc.micro": "^1.0.1"
+      }
+    },
+    "node_modules/markdown-it": {
+      "version": "12.3.2",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
+      "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
+      "dependencies": {
+        "argparse": "^2.0.1",
+        "entities": "~2.1.0",
+        "linkify-it": "^3.0.1",
+        "mdurl": "^1.0.1",
+        "uc.micro": "^1.0.5"
+      },
+      "bin": {
+        "markdown-it": "bin/markdown-it.js"
+      }
+    },
+    "node_modules/mdurl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
+      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4= sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g=="
+    },
+    "node_modules/parse5": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.2.tgz",
+      "integrity": "sha1-Be/1fw70V3+xRKefi5qWemzERRA= sha512-yQW05f47bKFJa0WdnyzP7vh7+B+w8jhVsFBBiaEbIfNDSSt8GADBhcQgsdYxatQ7rVs1nU9cmsYXURGWBH3Siw==",
+      "dependencies": {
+        "@types/node": "^6.0.46"
+      }
+    },
+    "node_modules/parse5/node_modules/@types/node": {
+      "version": "6.0.78",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.78.tgz",
+      "integrity": "sha512-+vD6E8ixntRzzZukoF3uP1iV+ZjVN3koTcaeK+BEoc/kSfGbLDIGC7RmCaUgVpUfN6cWvfczFRERCyKM9mkvXg=="
+    },
+    "node_modules/uc.micro": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
+      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    }
+  }
+}
diff --git a/extensions/extension-editing/src/extensionLinter.ts b/extensions/extension-editing/src/extensionLinter.ts
index dd1727edb7b..b69dac0e2dd 100644
--- a/extensions/extension-editing/src/extensionLinter.ts
+++ b/extensions/extension-editing/src/extensionLinter.ts
@@ -149,7 +149,8 @@ export class ExtensionLinter {
 					const effectiveProposalNames = extensionEnabledApiProposals[extensionId];
 					if (Array.isArray(effectiveProposalNames) && enabledApiProposals.children) {
 						for (const child of enabledApiProposals.children) {
-							if (child.type === 'string' && !effectiveProposalNames.includes(getNodeValue(child))) {
+							const proposalName = child.type === 'string' ? getNodeValue(child) : undefined;
+							if (typeof proposalName === 'string' && !effectiveProposalNames.includes(proposalName.split('@')[0])) {
 								const start = document.positionAt(child.offset);
 								const end = document.positionAt(child.offset + child.length);
 								diagnostics.push(new Diagnostic(new Range(start, end), apiProposalNotListed, DiagnosticSeverity.Error));
diff --git a/extensions/extension-editing/yarn.lock b/extensions/extension-editing/yarn.lock
deleted file mode 100644
index 00fad585fd1..00000000000
--- a/extensions/extension-editing/yarn.lock
+++ /dev/null
@@ -1,75 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@types/markdown-it@0.0.2":
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-0.0.2.tgz#5d9ad19e6e6508cdd2f2596df86fd0aade598660"
-  integrity sha1-XZrRnm5lCM3S8llt+G/Qqt5ZhmA=
-
-"@types/node@20.x":
-  version "20.11.24"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792"
-  integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==
-  dependencies:
-    undici-types "~5.26.4"
-
-"@types/node@^6.0.46":
-  version "6.0.78"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.78.tgz#5d4a3f579c1524e01ee21bf474e6fba09198f470"
-  integrity sha512-+vD6E8ixntRzzZukoF3uP1iV+ZjVN3koTcaeK+BEoc/kSfGbLDIGC7RmCaUgVpUfN6cWvfczFRERCyKM9mkvXg==
-
-argparse@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
-  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
-
-entities@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
-  integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==
-
-jsonc-parser@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76"
-  integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==
-
-linkify-it@^3.0.1:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.3.tgz#a98baf44ce45a550efb4d49c769d07524cc2fa2e"
-  integrity sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==
-  dependencies:
-    uc.micro "^1.0.1"
-
-markdown-it@^12.3.2:
-  version "12.3.2"
-  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.3.2.tgz#bf92ac92283fe983fe4de8ff8abfb5ad72cd0c90"
-  integrity sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==
-  dependencies:
-    argparse "^2.0.1"
-    entities "~2.1.0"
-    linkify-it "^3.0.1"
-    mdurl "^1.0.1"
-    uc.micro "^1.0.5"
-
-mdurl@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
-  integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
-
-parse5@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.2.tgz#05eff57f0ef4577fb144a79f8b9a967a6cc44510"
-  integrity sha1-Be/1fw70V3+xRKefi5qWemzERRA=
-  dependencies:
-    "@types/node" "^6.0.46"
-
-uc.micro@^1.0.1, uc.micro@^1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
-  integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
diff --git a/extensions/fsharp/cgmanifest.json b/extensions/fsharp/cgmanifest.json
index 524b3fa0d46..75e24896d8e 100644
--- a/extensions/fsharp/cgmanifest.json
+++ b/extensions/fsharp/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "ionide/ionide-fsgrammar",
 					"repositoryUrl": "https://github.com/ionide/ionide-fsgrammar",
-					"commitHash": "7d029a46f17637228b2ee85dd02e511c3e8039b3"
+					"commitHash": "c62c78404d0b2c14816aae61ac0688663a5990a3"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/fsharp/syntaxes/fsharp.tmLanguage.json b/extensions/fsharp/syntaxes/fsharp.tmLanguage.json
index 5063f1c5210..8ba555b7772 100644
--- a/extensions/fsharp/syntaxes/fsharp.tmLanguage.json
+++ b/extensions/fsharp/syntaxes/fsharp.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/ionide/ionide-fsgrammar/commit/7d029a46f17637228b2ee85dd02e511c3e8039b3",
+	"version": "https://github.com/ionide/ionide-fsgrammar/commit/c62c78404d0b2c14816aae61ac0688663a5990a3",
 	"name": "fsharp",
 	"scopeName": "source.fsharp",
 	"patterns": [
@@ -617,7 +617,7 @@
 				},
 				{
 					"name": "constant.numeric.float.fsharp",
-					"match": "\\b-?[0-9][0-9_]*((\\.([0-9][0-9_]*([eE][+-]??[0-9][0-9_]*)?)?)|([eE][+-]??[0-9][0-9_]*))"
+					"match": "\\b-?[0-9][0-9_]*((\\.(?!\\.)([0-9][0-9_]*([eE][+-]??[0-9][0-9_]*)?)?)|([eE][+-]??[0-9][0-9_]*))"
 				},
 				{
 					"name": "constant.numeric.integer.nativeint.fsharp",
@@ -635,7 +635,7 @@
 		},
 		"abstract_definition": {
 			"name": "abstract.definition.fsharp",
-			"begin": "\\b(abstract)\\s+(member)?(\\s+\\[\\<.*\\>\\])?\\s*([_[:alpha:]0-9,\\._`\\s]+)(<)?",
+			"begin": "\\b(static\\s+)?(abstract)\\s+(member)?(\\s+\\[\\<.*\\>\\])?\\s*([_[:alpha:]0-9,\\._`\\s]+)(<)?",
 			"end": "\\s*(with)\\b|=|$",
 			"beginCaptures": {
 				"1": {
@@ -645,6 +645,9 @@
 					"name": "keyword.fsharp"
 				},
 				"3": {
+					"name": "keyword.fsharp"
+				},
+				"4": {
 					"name": "support.function.attribute.fsharp"
 				},
 				"5": {
@@ -838,7 +841,7 @@
 							"name": "keyword.symbol.fsharp"
 						}
 					},
-					"end": "(\\)\\s*(([?[:alpha:]0-9'`^._ ]+))+)",
+					"end": "(\\)\\s*(([?[:alpha:]0-9'`^._ ]+))*)",
 					"endCaptures": {
 						"1": {
 							"name": "keyword.symbol.fsharp"
@@ -933,7 +936,7 @@
 			"patterns": [
 				{
 					"name": "binding.fsharp",
-					"begin": "\\b(let mutable|static let mutable|static let|let inline|let|and|member val|static member inline|static member|default|member|override|let!)(\\s+rec|mutable)?(\\s+\\[\\<.*\\>\\])?\\s*(private|internal|public)?\\s+(\\[[^-=]*\\]|[_[:alpha:]]([_[:alpha:]0-9\\._]+)*|``[_[:alpha:]]([_[:alpha:]0-9\\._`\\s]+|(?<=,)\\s)*)?",
+					"begin": "\\b(let mutable|static let mutable|static let|let inline|let|and|member val|member inline|static member inline|static member val|static member|default|member|override|let!)(\\s+rec|mutable)?(\\s+\\[\\<.*\\>\\])?\\s*(private|internal|public)?\\s+(\\[[^-=]*\\]|[_[:alpha:]]([_[:alpha:]0-9\\._]+)*|``[_[:alpha:]]([_[:alpha:]0-9\\._`\\s]+|(?<=,)\\s)*)?",
 					"end": "\\s*((with\\b)|(=|\\n+=|(?<=\\=)))",
 					"beginCaptures": {
 						"1": {
@@ -1008,7 +1011,7 @@
 				},
 				{
 					"name": "binding.fsharp",
-					"begin": "\\b(static val mutable|val mutable|val)(\\s+rec|mutable)?(\\s+\\[\\<.*\\>\\])?\\s*(private|internal|public)?\\s+(\\[[^-=]*\\]|[_[:alpha:]]([_[:alpha:]0-9,\\._]+)*|``[_[:alpha:]]([_[:alpha:]0-9,\\._`\\s]+|(?<=,)\\s)*)?",
+					"begin": "\\b(static val mutable|val mutable|val inline|val)(\\s+rec|mutable)?(\\s+\\[\\<.*\\>\\])?\\s*(private|internal|public)?\\s+(\\[[^-=]*\\]|[_[:alpha:]]([_[:alpha:]0-9,\\._]+)*|``[_[:alpha:]]([_[:alpha:]0-9,\\._`\\s]+|(?<=,)\\s)*)?",
 					"end": "\\n$",
 					"beginCaptures": {
 						"1": {
@@ -1130,7 +1133,7 @@
 				},
 				{
 					"name": "keyword.symbol.fsharp",
-					"match": "(&&&|\\|\\|\\||\\^\\^\\^|~~~|~\\+|~\\-|<<<|>>>|\\|>|:>|:\\?>|:|\\[|\\]|\\;|<>|=|@|\\|\\||&&|&|%|{|}|\\||_|\\.\\.|\\,|\\+|\\-|\\*|\\/|\\^|\\!|\\>|\\>\\=|\\>\\>|\\<|\\<\\=|\\(|\\)|\\<\\<)"
+					"match": "[.?]*(&&&|\\|\\|\\||\\^\\^\\^|~~~|~\\+|~\\-|<<<|>>>|\\|>|:>|:\\?>|:|\\[|\\]|\\;|<>|=|@|\\|\\||&&|&|%|{|}|\\||_|\\.\\.|\\,|\\+|\\-|\\*|\\/|\\^|\\!|\\>|\\>\\=|\\>\\>|\\<|\\<\\=|\\(|\\)|\\<\\<)[.?]*"
 				}
 			]
 		},
diff --git a/extensions/fsharp/yarn.lock b/extensions/fsharp/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/fsharp/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/git-base/.npmrc b/extensions/git-base/.npmrc
new file mode 100644
index 00000000000..a9c57709666
--- /dev/null
+++ b/extensions/git-base/.npmrc
@@ -0,0 +1,2 @@
+legacy-peer-deps="true"
+timeout=180000
diff --git a/extensions/git-base/package-lock.json b/extensions/git-base/package-lock.json
new file mode 100644
index 00000000000..f4b29739ca6
--- /dev/null
+++ b/extensions/git-base/package-lock.json
@@ -0,0 +1,34 @@
+{
+  "name": "git-base",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "git-base",
+      "version": "1.0.0",
+      "license": "MIT",
+      "devDependencies": {
+        "@types/node": "20.x"
+      },
+      "engines": {
+        "vscode": "0.10.x"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "20.11.24",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
+      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    }
+  }
+}
diff --git a/extensions/git-base/yarn.lock b/extensions/git-base/yarn.lock
deleted file mode 100644
index 1f4b6c2e8b4..00000000000
--- a/extensions/git-base/yarn.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@types/node@20.x":
-  version "20.11.24"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792"
-  integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==
-  dependencies:
-    undici-types "~5.26.4"
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
diff --git a/extensions/git/.npmrc b/extensions/git/.npmrc
new file mode 100644
index 00000000000..a9c57709666
--- /dev/null
+++ b/extensions/git/.npmrc
@@ -0,0 +1,2 @@
+legacy-peer-deps="true"
+timeout=180000
diff --git a/extensions/git/.vscodeignore b/extensions/git/.vscodeignore
index 94d2dc921e0..1e6130d5c7d 100644
--- a/extensions/git/.vscodeignore
+++ b/extensions/git/.vscodeignore
@@ -4,4 +4,4 @@ out/**
 tsconfig.json
 build/**
 extension.webpack.config.js
-yarn.lock
+package-lock.json
diff --git a/extensions/git/package-lock.json b/extensions/git/package-lock.json
new file mode 100644
index 00000000000..b15b708e618
--- /dev/null
+++ b/extensions/git/package-lock.json
@@ -0,0 +1,420 @@
+{
+  "name": "git",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "git",
+      "version": "1.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "@joaomoreno/unique-names-generator": "^5.1.0",
+        "@vscode/extension-telemetry": "^0.9.0",
+        "@vscode/iconv-lite-umd": "0.7.0",
+        "byline": "^5.0.0",
+        "file-type": "16.5.4",
+        "jschardet": "3.1.4",
+        "picomatch": "2.3.1",
+        "vscode-uri": "^2.0.0",
+        "which": "4.0.0"
+      },
+      "devDependencies": {
+        "@types/byline": "4.2.31",
+        "@types/mocha": "^9.1.1",
+        "@types/node": "20.x",
+        "@types/picomatch": "2.3.0",
+        "@types/which": "3.0.0"
+      },
+      "engines": {
+        "vscode": "^1.5.0"
+      }
+    },
+    "node_modules/@joaomoreno/unique-names-generator": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@joaomoreno/unique-names-generator/-/unique-names-generator-5.1.0.tgz",
+      "integrity": "sha512-KEVThTpUIKPb7dBKJ9mJ3WYnD1mJZZsEinCSp9CVEPlWbDagurFv1RKRjvvujrLfJzsGc0HkBHS9W8Bughao4A==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@microsoft/1ds-core-js": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.0.3.tgz",
+      "integrity": "sha512-FrxNLVAPsAvD7+l63TlNS/Kodvpct2WulpDSn1dI4Xuy0kF4E2H867kHdwL/iY1Bj3zA3FSy/jvE4+OcDws7ug==",
+      "dependencies": {
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/1ds-post-js": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.0.3.tgz",
+      "integrity": "sha512-uewvmUtXKd7ttypiKQGdYI6i7UUpPkOznLayzIFrJ4r2xnG6jhPjpKRncHFXPQcM4XSWO3yf5PQ3xAbPq9t7ZQ==",
+      "dependencies": {
+        "@microsoft/1ds-core-js": "4.0.3",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-channel-js": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.0.4.tgz",
+      "integrity": "sha512-6TlfExmErQ8Y+/ChbkyWl+jyt4wg3T6p7lwXDsUCB0LgZmlEWMaCUS0YlT73JCWmE8j7vxW8yUm0lgsgmHns3A==",
+      "dependencies": {
+        "@microsoft/applicationinsights-common": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-common": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.0.4.tgz",
+      "integrity": "sha512-r5gWaw/K9+tKfuo2GtDiDiKASgOkPOCrKW+wZzFvuR06uuwvWjbVQ6yW/YbnfuhRF5M65ksUiMi0eCMwEOGq7Q==",
+      "dependencies": {
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-core-js": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.0.4.tgz",
+      "integrity": "sha512-anxy5kEkqBmVoEqJiJzaaXXA0wzqZi9U4zGd05xFJ04lWckP8dG3zyT3+GGdg7rDelqLTNGxndeYoFmDv63u1g==",
+      "dependencies": {
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-shims": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
+      "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-web-basic": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.0.4.tgz",
+      "integrity": "sha512-KfoxPlLlf0JT12ADb23C5iGye/yFouoMgHEKULxkSQcYY9SsW/8rVrqqvoYKAL+u215CZU2A8Kc8sR3ehEaPCQ==",
+      "dependencies": {
+        "@microsoft/applicationinsights-channel-js": "3.0.4",
+        "@microsoft/applicationinsights-common": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/dynamicproto-js": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.2.tgz",
+      "integrity": "sha512-MB8trWaFREpmb037k/d0bB7T2BP7Ai24w1e1tbz3ASLB0/lwphsq3Nq8S9I5AsI5vs4zAQT+SB5nC5/dLYTiOg==",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+      }
+    },
+    "node_modules/@nevware21/ts-async": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.3.0.tgz",
+      "integrity": "sha512-ZUcgUH12LN/F6nzN0cYd0F/rJaMLmXr0EHVTyYfaYmK55bdwE4338uue4UiVoRqHVqNW4KDUrJc49iGogHKeWA==",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.10.0 < 2.x"
+      }
+    },
+    "node_modules/@nevware21/ts-utils": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.10.1.tgz",
+      "integrity": "sha512-pMny25NnF2/MJwdqC3Iyjm2pGIXNxni4AROpcqDeWa+td9JMUY4bUS9uU9XW+BoBRqTLUL+WURF9SOd/6OQzRg=="
+    },
+    "node_modules/@tokenizer/token": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@tokenizer/token/-/token-0.3.0.tgz",
+      "integrity": "sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A=="
+    },
+    "node_modules/@types/byline": {
+      "version": "4.2.31",
+      "resolved": "https://registry.npmjs.org/@types/byline/-/byline-4.2.31.tgz",
+      "integrity": "sha1-DmH8ucA+BH0hxEllVMcRYperYM0= sha512-TC6Ljn7tALesQMQyTNoMWoM44SNvWtCLkJDrA/TxcwE5ILkWt4zi5wbEokqiDk42S75eykAY1onPImWDybOkmQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/mocha": {
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.1.tgz",
+      "integrity": "sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==",
+      "dev": true
+    },
+    "node_modules/@types/node": {
+      "version": "20.11.24",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
+      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/@types/picomatch": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@types/picomatch/-/picomatch-2.3.0.tgz",
+      "integrity": "sha512-O397rnSS9iQI4OirieAtsDqvCj4+3eY1J+EPdNTKuHuRWIfUoGyzX294o8C4KJYaLqgSrd2o60c5EqCU8Zv02g==",
+      "dev": true
+    },
+    "node_modules/@types/which": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/which/-/which-3.0.0.tgz",
+      "integrity": "sha512-ASCxdbsrwNfSMXALlC3Decif9rwDMu+80KGp5zI2RLRotfMsTv7fHL8W8VDp24wymzDyIFudhUeSCugrgRFfHQ==",
+      "dev": true
+    },
+    "node_modules/@vscode/extension-telemetry": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.0.tgz",
+      "integrity": "sha512-37RxGHXrs3GoXPgCUKQhghEu0gxs8j27RLjQwwtSf4WhPdJKz8UrqMYzpsXlliQ05zURYmtdGZst9C6+hfWXaQ==",
+      "dependencies": {
+        "@microsoft/1ds-core-js": "^4.0.3",
+        "@microsoft/1ds-post-js": "^4.0.3",
+        "@microsoft/applicationinsights-web-basic": "^3.0.4"
+      },
+      "engines": {
+        "vscode": "^1.75.0"
+      }
+    },
+    "node_modules/@vscode/iconv-lite-umd": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz",
+      "integrity": "sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg=="
+    },
+    "node_modules/byline": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/byline/-/byline-5.0.0.tgz",
+      "integrity": "sha1-dBxSFkaOrcRXsDQQEYrXfejB3bE= sha512-s6webAy+R4SR8XVuJWt2V2rGvhnrhxN+9S15GNuTK3wKPOXFF6RNc+8ug2XhH+2s4f+uudG4kUVYmYOQWL2g0Q==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/file-type": {
+      "version": "16.5.4",
+      "resolved": "https://registry.npmjs.org/file-type/-/file-type-16.5.4.tgz",
+      "integrity": "sha512-/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw==",
+      "dependencies": {
+        "readable-web-to-node-stream": "^3.0.0",
+        "strtok3": "^6.2.4",
+        "token-types": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/file-type?sponsor=1"
+      }
+    },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "node_modules/isexe": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
+      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/jschardet": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-3.1.4.tgz",
+      "integrity": "sha512-/kmVISmrwVwtyYU40iQUOp3SUPk2dhNCMsZBQX0R1/jZ8maaXJ/oZIzUOiyOqcgtLnETFKYChbJ5iDC/eWmFHg==",
+      "license": "LGPL-2.1+",
+      "engines": {
+        "node": ">=0.1.90"
+      }
+    },
+    "node_modules/peek-readable": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-4.1.0.tgz",
+      "integrity": "sha512-ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg==",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/Borewit"
+      }
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/readable-web-to-node-stream": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz",
+      "integrity": "sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw==",
+      "dependencies": {
+        "readable-stream": "^3.6.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/Borewit"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/strtok3": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-6.3.0.tgz",
+      "integrity": "sha512-fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw==",
+      "dependencies": {
+        "@tokenizer/token": "^0.3.0",
+        "peek-readable": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/Borewit"
+      }
+    },
+    "node_modules/token-types": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/token-types/-/token-types-4.2.0.tgz",
+      "integrity": "sha512-P0rrp4wUpefLncNamWIef62J0v0kQR/GfDVji9WKY7GDCWy5YbVSrKUTam07iWPZQGy0zWNOfstYTykMmPNR7w==",
+      "dependencies": {
+        "@tokenizer/token": "^0.3.0",
+        "ieee754": "^1.2.1"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/Borewit"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+    },
+    "node_modules/vscode-uri": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.0.0.tgz",
+      "integrity": "sha512-lWXWofDSYD8r/TIyu64MdwB4FaSirQ608PP/TzUyslyOeHGwQ0eTHUZeJrK1ILOmwUHaJtV693m2JoUYroUDpw=="
+    },
+    "node_modules/which": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
+      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
+      "dependencies": {
+        "isexe": "^3.1.1"
+      },
+      "bin": {
+        "node-which": "bin/which.js"
+      },
+      "engines": {
+        "node": "^16.13.0 || >=18.0.0"
+      }
+    }
+  }
+}
diff --git a/extensions/git/package.json b/extensions/git/package.json
index 23b3220a00c..ee3a7a16d27 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -16,14 +16,15 @@
     "contribMergeEditorMenus",
     "contribMultiDiffEditorMenus",
     "contribDiffEditorGutterToolBarMenus",
-    "contribSourceControlHistoryItemGroupMenu",
     "contribSourceControlHistoryItemMenu",
+    "contribSourceControlHistoryTitleMenu",
     "contribSourceControlInputBoxMenu",
     "contribSourceControlTitleMenu",
     "contribViewsWelcome",
     "diffCommand",
     "editSessionIdentityProvider",
     "quickDiffProvider",
+    "quickInputButtonLocation",
     "quickPickSortByLabel",
     "scmActionButton",
     "scmHistoryProvider",
@@ -451,6 +452,12 @@
         "category": "Git",
         "enablement": "!operationInProgress"
       },
+      {
+        "command": "git.checkoutRefDetached",
+        "title": "%command.checkoutRefDetached%",
+        "category": "Git",
+        "enablement": "!operationInProgress"
+      },
       {
         "command": "git.branch",
         "title": "%command.branch%",
@@ -526,6 +533,7 @@
       {
         "command": "git.fetchAll",
         "title": "%command.fetchAll%",
+        "icon": "$(git-fetch)",
         "category": "Git",
         "enablement": "!operationInProgress"
       },
@@ -616,6 +624,12 @@
         "category": "Git",
         "enablement": "!operationInProgress"
       },
+      {
+        "command": "git.cherryPickRef",
+        "title": "%command.cherryPickRef%",
+        "category": "Git",
+        "enablement": "!operationInProgress"
+      },
       {
         "command": "git.addRemote",
         "title": "%command.addRemote%",
@@ -891,6 +905,16 @@
         "icon": "$(diff-multiple)",
         "category": "Git",
         "enablement": "!operationInProgress"
+      },
+      {
+        "command": "git.copyCommitId",
+        "title": "%command.timelineCopyCommitId%",
+        "category": "Git"
+      },
+      {
+        "command": "git.copyCommitMessage",
+        "title": "%command.timelineCopyCommitMessage%",
+        "category": "Git"
       }
     ],
     "continueEditSession": [
@@ -1426,6 +1450,22 @@
         {
           "command": "git.pushRef",
           "when": "false"
+        },
+        {
+          "command": "git.copyCommitId",
+          "when": "false"
+        },
+        {
+          "command": "git.copyCommitMessage",
+          "when": "false"
+        },
+        {
+          "command": "git.checkoutRefDetached",
+          "when": "false"
+        },
+        {
+          "command": "git.cherryPickRef",
+          "when": "false"
         }
       ],
       "scm/title": [
@@ -1915,100 +1955,43 @@
           "group": "1_modification@3"
         }
       ],
-      "scm/incomingChanges": [
+      "scm/history/title": [
         {
-          "command": "git.fetchRef",
-          "group": "navigation",
-          "when": "scmProvider == git"
-        },
-        {
-          "command": "git.pullRef",
-          "group": "navigation",
+          "command": "git.fetchAll",
+          "group": "navigation@999",
           "when": "scmProvider == git"
         }
       ],
-      "scm/incomingChanges/context": [
+      "scm/historyItem/context": [
         {
-          "command": "git.fetchRef",
-          "group": "1_modification@1",
-          "when": "scmProvider == git"
+          "command": "git.createTag",
+          "when": "scmProvider == git",
+          "group": "1_create@1"
         },
         {
-          "command": "git.pullRef",
-          "group": "1_modification@2",
-          "when": "scmProvider == git"
-        }
-      ],
-      "scm/incomingChanges/allChanges/context": [
-        {
-          "command": "git.viewAllChanges",
-          "when": "scmProvider == git && scmHistoryItemFileCount != 0 && config.multiDiffEditor.experimental.enabled",
-          "group": "inline@1"
+          "command": "git.branch",
+          "when": "scmProvider == git",
+          "group": "1_create@2"
         },
         {
-          "command": "git.viewAllChanges",
-          "when": "scmProvider == git && scmHistoryItemFileCount != 0 && config.multiDiffEditor.experimental.enabled",
-          "group": "1_view@1"
-        }
-      ],
-      "scm/incomingChanges/historyItem/context": [
-        {
-          "command": "git.viewCommit",
-          "when": "scmProvider == git && scmHistoryItemFileCount != 0 && config.multiDiffEditor.experimental.enabled",
-          "group": "inline@1"
+          "command": "git.cherryPickRef",
+          "when": "scmProvider == git",
+          "group": "2_modify@1"
         },
         {
-          "command": "git.viewCommit",
-          "when": "scmProvider == git && scmHistoryItemFileCount != 0 && config.multiDiffEditor.experimental.enabled",
-          "group": "1_view@1"
-        }
-      ],
-      "scm/outgoingChanges": [
-        {
-          "command": "git.pushRef",
-          "group": "navigation",
-          "when": "scmProvider == git && scmHistoryItemGroupHasUpstream"
+          "command": "git.checkoutRefDetached",
+          "when": "scmProvider == git",
+          "group": "2_modify@2"
         },
         {
-          "command": "git.publish",
-          "group": "navigation",
-          "when": "scmProvider == git && !scmHistoryItemGroupHasUpstream"
-        }
-      ],
-      "scm/outgoingChanges/context": [
-        {
-          "command": "git.pushRef",
-          "when": "scmProvider == git && scmHistoryItemGroupHasUpstream",
-          "group": "1_modification@1"
+          "command": "git.copyCommitId",
+          "when": "scmProvider == git && !listMultiSelection",
+          "group": "9_copy@1"
         },
         {
-          "command": "git.publish",
-          "when": "scmProvider == git && !scmHistoryItemGroupHasUpstream",
-          "group": "1_modification@1"
-        }
-      ],
-      "scm/outgoingChanges/allChanges/context": [
-        {
-          "command": "git.viewAllChanges",
-          "when": "scmProvider == git && scmHistoryItemFileCount != 0 && config.multiDiffEditor.experimental.enabled",
-          "group": "inline@1"
-        },
-        {
-          "command": "git.viewAllChanges",
-          "when": "scmProvider == git && scmHistoryItemFileCount != 0 && config.multiDiffEditor.experimental.enabled",
-          "group": "1_view@1"
-        }
-      ],
-      "scm/outgoingChanges/historyItem/context": [
-        {
-          "command": "git.viewCommit",
-          "when": "scmProvider == git && scmHistoryItemFileCount != 0 && config.multiDiffEditor.experimental.enabled",
-          "group": "inline@1"
-        },
-        {
-          "command": "git.viewCommit",
-          "when": "scmProvider == git && scmHistoryItemFileCount != 0 && config.multiDiffEditor.experimental.enabled",
-          "group": "1_view@1"
+          "command": "git.copyCommitMessage",
+          "when": "scmProvider == git && !listMultiSelection",
+          "group": "9_copy@2"
         }
       ],
       "editor/title": [
@@ -3401,7 +3384,7 @@
     "@vscode/iconv-lite-umd": "0.7.0",
     "byline": "^5.0.0",
     "file-type": "16.5.4",
-    "jschardet": "3.1.2",
+    "jschardet": "3.1.4",
     "picomatch": "2.3.1",
     "vscode-uri": "^2.0.0",
     "which": "4.0.0"
diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json
index c2f7c3d6cfb..bad361bcea7 100644
--- a/extensions/git/package.nls.json
+++ b/extensions/git/package.nls.json
@@ -62,15 +62,17 @@
 	"command.undoCommit": "Undo Last Commit",
 	"command.checkout": "Checkout to...",
 	"command.checkoutDetached": "Checkout to (Detached)...",
+	"command.checkoutRefDetached": "Checkout (Detached)",
 	"command.branch": "Create Branch...",
 	"command.branchFrom": "Create Branch From...",
 	"command.deleteBranch": "Delete Branch...",
 	"command.renameBranch": "Rename Branch...",
 	"command.cherryPick": "Cherry Pick...",
+	"command.cherryPickRef": "Cherry Pick",
 	"command.merge": "Merge...",
 	"command.mergeAbort": "Abort Merge",
 	"command.rebase": "Rebase Branch...",
-	"command.createTag": "Create Tag",
+	"command.createTag": "Create Tag...",
 	"command.deleteTag": "Delete Tag...",
 	"command.deleteRemoteTag": "Delete Remote Tag...",
 	"command.fetch": "Fetch",
diff --git a/extensions/git/src/actionButton.ts b/extensions/git/src/actionButton.ts
index 494972276ac..2fbdaf4f97e 100644
--- a/extensions/git/src/actionButton.ts
+++ b/extensions/git/src/actionButton.ts
@@ -211,12 +211,12 @@ export class ActionButton {
 			command: {
 				command: 'git.sync',
 				title: l10n.t('{0} Sync Changes{1}{2}', icon, behind, ahead),
+				shortTitle: `${icon}${behind}${ahead}`,
 				tooltip: this.state.isSyncInProgress ?
 					l10n.t('Synchronizing Changes...')
 					: this.repository.syncTooltip,
 				arguments: [this.repository.sourceControl],
 			},
-			description: `${icon}${behind}${ahead}`,
 			enabled: !this.state.isCheckoutInProgress && !this.state.isSyncInProgress
 		};
 	}
diff --git a/extensions/git/src/api/api1.ts b/extensions/git/src/api/api1.ts
index f049939c137..63139af2447 100644
--- a/extensions/git/src/api/api1.ts
+++ b/extensions/git/src/api/api1.ts
@@ -44,6 +44,7 @@ export class ApiRepositoryState implements RepositoryState {
 	get mergeChanges(): Change[] { return this._repository.mergeGroup.resourceStates.map(r => new ApiChange(r)); }
 	get indexChanges(): Change[] { return this._repository.indexGroup.resourceStates.map(r => new ApiChange(r)); }
 	get workingTreeChanges(): Change[] { return this._repository.workingTreeGroup.resourceStates.map(r => new ApiChange(r)); }
+	get untrackedChanges(): Change[] { return this._repository.untrackedGroup.resourceStates.map(r => new ApiChange(r)); }
 
 	readonly onDidChange: Event<void> = this._repository.onDidRunGitStatus;
 
@@ -200,8 +201,8 @@ export class ApiRepository implements Repository {
 		return this.repository.getMergeBase(ref1, ref2);
 	}
 
-	tag(name: string, upstream: string): Promise<void> {
-		return this.repository.tag(name, upstream);
+	tag(name: string, message: string, ref?: string | undefined): Promise<void> {
+		return this.repository.tag({ name, message, ref });
 	}
 
 	deleteTag(name: string): Promise<void> {
@@ -321,6 +322,10 @@ export class ApiImpl implements API {
 	}
 
 	async openRepository(root: Uri): Promise<Repository | null> {
+		if (root.scheme !== 'file') {
+			return null;
+		}
+
 		await this._model.openRepository(root.fsPath);
 		return this.getRepository(root) || null;
 	}
diff --git a/extensions/git/src/api/git.d.ts b/extensions/git/src/api/git.d.ts
index 685b5413947..2a54c52f20c 100644
--- a/extensions/git/src/api/git.d.ts
+++ b/extensions/git/src/api/git.d.ts
@@ -122,6 +122,7 @@ export interface RepositoryState {
 	readonly mergeChanges: Change[];
 	readonly indexChanges: Change[];
 	readonly workingTreeChanges: Change[];
+	readonly untrackedChanges: Change[];
 
 	readonly onDidChange: Event<void>;
 }
@@ -144,6 +145,9 @@ export interface LogOptions {
 	readonly sortByAuthorDate?: boolean;
 	readonly shortStats?: boolean;
 	readonly author?: string;
+	readonly refNames?: string[];
+	readonly maxParents?: number;
+	readonly skip?: number;
 }
 
 export interface CommitOptions {
@@ -180,7 +184,7 @@ export interface InitOptions {
 export interface RefQuery {
 	readonly contains?: string;
 	readonly count?: number;
-	readonly pattern?: string;
+	readonly pattern?: string | string[];
 	readonly sort?: 'alphabetically' | 'committerdate';
 }
 
@@ -405,5 +409,6 @@ export const enum GitErrorCodes {
 	EmptyCommitMessage = 'EmptyCommitMessage',
 	BranchFastForwardRejected = 'BranchFastForwardRejected',
 	BranchNotYetBorn = 'BranchNotYetBorn',
-	TagConflict = 'TagConflict'
+	TagConflict = 'TagConflict',
+	CherryPickEmpty = 'CherryPickEmpty'
 }
diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
index 00045c14ea3..3b1a848adcf 100644
--- a/extensions/git/src/commands.ts
+++ b/extensions/git/src/commands.ts
@@ -5,7 +5,7 @@
 
 import * as os from 'os';
 import * as path from 'path';
-import { Command, commands, Disposable, LineChange, MessageOptions, Position, ProgressLocation, QuickPickItem, Range, SourceControlResourceState, TextDocumentShowOptions, TextEditor, Uri, ViewColumn, window, workspace, WorkspaceEdit, WorkspaceFolder, TimelineItem, env, Selection, TextDocumentContentProvider, InputBoxValidationSeverity, TabInputText, TabInputTextMerge, QuickPickItemKind, TextDocument, LogOutputChannel, l10n, Memento, UIKind, QuickInputButton, ThemeIcon, SourceControlHistoryItem, SourceControl, InputBoxValidationMessage, Tab, TabInputNotebook } from 'vscode';
+import { Command, commands, Disposable, LineChange, MessageOptions, Position, ProgressLocation, QuickPickItem, Range, SourceControlResourceState, TextDocumentShowOptions, TextEditor, Uri, ViewColumn, window, workspace, WorkspaceEdit, WorkspaceFolder, TimelineItem, env, Selection, TextDocumentContentProvider, InputBoxValidationSeverity, TabInputText, TabInputTextMerge, QuickPickItemKind, TextDocument, LogOutputChannel, l10n, Memento, UIKind, QuickInputButton, ThemeIcon, SourceControlHistoryItem, SourceControl, InputBoxValidationMessage, Tab, TabInputNotebook, QuickInputButtonLocation, SourceControlHistoryItemRef } from 'vscode';
 import TelemetryReporter from '@vscode/extension-telemetry';
 import { uniqueNamesGenerator, adjectives, animals, colors, NumberDictionary } from '@joaomoreno/unique-names-generator';
 import { ForcePushMode, GitErrorCodes, Ref, RefType, Status, CommitOptions, RemoteSourcePublisher, Remote } from './api/git';
@@ -525,9 +525,15 @@ class CheckoutItemsProcessor extends RefItemsProcessor {
 				// Button(s)
 				if (item.refRemote) {
 					const matchingRemote = this.repository.remotes.find((remote) => remote.name === item.refRemote);
-					const remoteUrl = matchingRemote?.pushUrl ?? matchingRemote?.fetchUrl;
-					if (remoteUrl) {
-						item.buttons = this.buttons.get(item.refRemote);
+					const buttons = [];
+					if (matchingRemote?.pushUrl) {
+						buttons.push(...this.buttons.get(matchingRemote.pushUrl) ?? []);
+					}
+					if (matchingRemote?.fetchUrl && matchingRemote.fetchUrl !== matchingRemote.pushUrl) {
+						buttons.push(...this.buttons.get(matchingRemote.fetchUrl) ?? []);
+					}
+					if (buttons.length) {
+						item.buttons = buttons;
 					}
 				} else {
 					item.buttons = this.defaultButtons;
@@ -1339,14 +1345,14 @@ export class CommandCenter {
 
 	@command('git.stage')
 	async stage(...resourceStates: SourceControlResourceState[]): Promise<void> {
-		this.logger.debug(`git.stage ${resourceStates.length} `);
+		this.logger.debug(`[CommandCenter][stage] git.stage ${resourceStates.length} `);
 
 		resourceStates = resourceStates.filter(s => !!s);
 
 		if (resourceStates.length === 0 || (resourceStates[0] && !(resourceStates[0].resourceUri instanceof Uri))) {
 			const resource = this.getSCMResource();
 
-			this.logger.debug(`git.stage.getSCMResource ${resource ? resource.resourceUri.toString() : null} `);
+			this.logger.debug(`[CommandCenter][stage] git.stage.getSCMResource ${resource ? resource.resourceUri.toString() : null} `);
 
 			if (!resource) {
 				return;
@@ -1389,7 +1395,7 @@ export class CommandCenter {
 		const untracked = selection.filter(s => s.resourceGroupType === ResourceGroupType.Untracked);
 		const scmResources = [...workingTree, ...untracked, ...resolved, ...unresolved];
 
-		this.logger.debug(`git.stage.scmResources ${scmResources.length} `);
+		this.logger.debug(`[CommandCenter][stage] git.stage.scmResources ${scmResources.length} `);
 		if (!scmResources.length) {
 			return;
 		}
@@ -2063,7 +2069,7 @@ export class CommandCenter {
 			promptToSaveFilesBeforeCommit = 'never';
 		}
 
-		const enableSmartCommit = config.get<boolean>('enableSmartCommit') === true;
+		let enableSmartCommit = config.get<boolean>('enableSmartCommit') === true;
 		const enableCommitSigning = config.get<boolean>('enableCommitSigning') === true;
 		let noStagedChanges = repository.indexGroup.resourceStates.length === 0;
 		let noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0;
@@ -2103,38 +2109,39 @@ export class CommandCenter {
 				}
 			}
 
-			if (!opts.amend) {
-				// no changes, and the user has not configured to commit all in this case
-				if (!noUnstagedChanges && noStagedChanges && !enableSmartCommit && !opts.all) {
-					const suggestSmartCommit = config.get<boolean>('suggestSmartCommit') === true;
+			// no changes, and the user has not configured to commit all in this case
+			if (!noUnstagedChanges && noStagedChanges && !enableSmartCommit && !opts.all && !opts.amend) {
+				const suggestSmartCommit = config.get<boolean>('suggestSmartCommit') === true;
 
-					if (!suggestSmartCommit) {
-						return;
-					}
-
-					// prompt the user if we want to commit all or not
-					const message = l10n.t('There are no staged changes to commit.\n\nWould you like to stage all your changes and commit them directly?');
-					const yes = l10n.t('Yes');
-					const always = l10n.t('Always');
-					const never = l10n.t('Never');
-					const pick = await window.showWarningMessage(message, { modal: true }, yes, always, never);
-
-					if (pick === always) {
-						config.update('enableSmartCommit', true, true);
-					} else if (pick === never) {
-						config.update('suggestSmartCommit', false, true);
-						return;
-					} else if (pick !== yes) {
-						return; // do not commit on cancel
-					}
+				if (!suggestSmartCommit) {
+					return;
 				}
 
-				if (opts.all === undefined) {
-					opts = { ...opts, all: noStagedChanges };
-				} else if (!opts.all && noStagedChanges) {
-					opts = { ...opts, all: true };
+				// prompt the user if we want to commit all or not
+				const message = l10n.t('There are no staged changes to commit.\n\nWould you like to stage all your changes and commit them directly?');
+				const yes = l10n.t('Yes');
+				const always = l10n.t('Always');
+				const never = l10n.t('Never');
+				const pick = await window.showWarningMessage(message, { modal: true }, yes, always, never);
+
+				if (pick === always) {
+					enableSmartCommit = true;
+					config.update('enableSmartCommit', true, true);
+				} else if (pick === never) {
+					config.update('suggestSmartCommit', false, true);
+					return;
+				} else if (pick === yes) {
+					enableSmartCommit = true;
+				} else {
+					// Cancel
+					return;
 				}
 			}
+
+			// smart commit
+			if (enableSmartCommit && !opts.all) {
+				opts = { ...opts, all: noStagedChanges };
+			}
 		}
 
 		// enable signing of commits if configured
@@ -2494,6 +2501,14 @@ export class CommandCenter {
 		return this._checkout(repository, { detached: true, treeish });
 	}
 
+	@command('git.checkoutRefDetached', { repository: true })
+	async checkoutRefDetached(repository: Repository, historyItem?: SourceControlHistoryItemRef): Promise<boolean> {
+		if (!historyItem) {
+			return false;
+		}
+		return this._checkout(repository, { detached: true, treeish: historyItem.id });
+	}
+
 	private async _checkout(repository: Repository, opts?: { detached?: boolean; treeish?: string }): Promise<boolean> {
 		if (typeof opts?.treeish === 'string') {
 			await repository.checkout(opts?.treeish, opts);
@@ -2519,9 +2534,26 @@ export class CommandCenter {
 			: l10n.t('Select a branch or tag to checkout');
 
 		quickPick.show();
-
 		picks.push(... await createCheckoutItems(repository, opts?.detached));
-		quickPick.items = [...commands, ...picks];
+
+		const setQuickPickItems = () => {
+			switch (true) {
+				case quickPick.value === '':
+					quickPick.items = [...commands, ...picks];
+					break;
+				case commands.length === 0:
+					quickPick.items = picks;
+					break;
+				case picks.length === 0:
+					quickPick.items = commands;
+					break;
+				default:
+					quickPick.items = [...picks, { label: '', kind: QuickPickItemKind.Separator }, ...commands];
+					break;
+			}
+		};
+
+		setQuickPickItems();
 		quickPick.busy = false;
 
 		const choice = await new Promise<QuickPickItem | undefined>(c => {
@@ -2536,22 +2568,7 @@ export class CommandCenter {
 
 				c(undefined);
 			})));
-			disposables.push(quickPick.onDidChangeValue(value => {
-				switch (true) {
-					case value === '':
-						quickPick.items = [...commands, ...picks];
-						break;
-					case commands.length === 0:
-						quickPick.items = picks;
-						break;
-					case picks.length === 0:
-						quickPick.items = commands;
-						break;
-					default:
-						quickPick.items = [...picks, { label: '', kind: QuickPickItemKind.Separator }, ...commands];
-						break;
-				}
-			}));
+			disposables.push(quickPick.onDidChangeValue(() => setQuickPickItems()));
 		});
 
 		dispose(disposables);
@@ -2601,8 +2618,8 @@ export class CommandCenter {
 	}
 
 	@command('git.branch', { repository: true })
-	async branch(repository: Repository): Promise<void> {
-		await this._branch(repository);
+	async branch(repository: Repository, historyItem?: SourceControlHistoryItem): Promise<void> {
+		await this._branch(repository, undefined, false, historyItem?.id);
 	}
 
 	@command('git.branchFrom', { repository: true })
@@ -2700,6 +2717,7 @@ export class CommandCenter {
 			{
 				iconPath: new ThemeIcon('refresh'),
 				tooltip: l10n.t('Regenerate Branch Name'),
+				location: QuickInputButtonLocation.Inline
 			}
 		] : [];
 
@@ -2728,8 +2746,8 @@ export class CommandCenter {
 		return sanitizeBranchName(branchName || '', branchWhitespaceChar);
 	}
 
-	private async _branch(repository: Repository, defaultName?: string, from = false): Promise<void> {
-		let target = 'HEAD';
+	private async _branch(repository: Repository, defaultName?: string, from = false, target?: string): Promise<void> {
+		target = target ?? 'HEAD';
 
 		if (from) {
 			const getRefPicks = async () => {
@@ -2897,7 +2915,7 @@ export class CommandCenter {
 	}
 
 	@command('git.createTag', { repository: true })
-	async createTag(repository: Repository): Promise<void> {
+	async createTag(repository: Repository, historyItem?: SourceControlHistoryItem): Promise<void> {
 		const inputTagName = await window.showInputBox({
 			placeHolder: l10n.t('Tag name'),
 			prompt: l10n.t('Please provide a tag name'),
@@ -2915,7 +2933,7 @@ export class CommandCenter {
 		});
 
 		const name = inputTagName.replace(/^\.|\/\.|\.\.|~|\^|:|\/$|\.lock$|\.lock\/|\\|\*|\s|^\s*$|\.$/g, '-');
-		await repository.tag(name, inputMessage);
+		await repository.tag({ name, message: inputMessage, ref: historyItem?.id });
 	}
 
 	@command('git.deleteTag', { repository: true })
@@ -3048,7 +3066,8 @@ export class CommandCenter {
 	}
 
 	@command('git.fetchRef', { repository: true })
-	async fetchRef(repository: Repository, ref: string): Promise<void> {
+	async fetchRef(repository: Repository, ref?: string): Promise<void> {
+		ref = ref ?? repository?.historyProvider.currentHistoryItemRemoteRef?.id;
 		if (!repository || !ref) {
 			return;
 		}
@@ -3120,7 +3139,8 @@ export class CommandCenter {
 	}
 
 	@command('git.pullRef', { repository: true })
-	async pullRef(repository: Repository, ref: string): Promise<void> {
+	async pullRef(repository: Repository, ref?: string): Promise<void> {
+		ref = ref ?? repository?.historyProvider.currentHistoryItemRemoteRef?.id;
 		if (!repository || !ref) {
 			return;
 		}
@@ -3267,8 +3287,8 @@ export class CommandCenter {
 	}
 
 	@command('git.pushRef', { repository: true })
-	async pushRef(repository: Repository, ref: string): Promise<void> {
-		if (!repository || !ref) {
+	async pushRef(repository: Repository): Promise<void> {
+		if (!repository) {
 			return;
 		}
 
@@ -3290,6 +3310,14 @@ export class CommandCenter {
 		await repository.cherryPick(hash);
 	}
 
+	@command('git.cherryPickRef', { repository: true })
+	async cherryPickRef(repository: Repository, historyItem?: SourceControlHistoryItem): Promise<void> {
+		if (!historyItem) {
+			return;
+		}
+		await repository.cherryPick(historyItem.id);
+	}
+
 	@command('git.pushTo', { repository: true })
 	async pushTo(repository: Repository, remote?: string, refspec?: string, setUpstream?: boolean): Promise<void> {
 		await this._push(repository, { pushType: PushType.PushTo, pushTo: { remote: remote, refspec: refspec, setUpstream: setUpstream } });
@@ -4186,17 +4214,36 @@ export class CommandCenter {
 	}
 
 	@command('git.viewCommit', { repository: true })
-	async viewCommit(repository: Repository, historyItem: SourceControlHistoryItem): Promise<void> {
-		if (!repository || !historyItem) {
+	async viewCommit(repository: Repository, historyItem1: SourceControlHistoryItem, historyItem2?: SourceControlHistoryItem): Promise<void> {
+		if (!repository || !historyItem1) {
 			return;
 		}
 
-		const commit = await repository.getCommit(historyItem.id);
-		const title = `${historyItem.id.substring(0, 8)} - ${commit.message}`;
+		if (historyItem2) {
+			const mergeBase = await repository.getMergeBase(historyItem1.id, historyItem2.id);
+			if (!mergeBase || (mergeBase !== historyItem1.id && mergeBase !== historyItem2.id)) {
+				return;
+			}
+		}
 
-		const multiDiffSourceUri = toGitUri(Uri.file(repository.root), historyItem.id, { scheme: 'git-commit' });
+		let title: string | undefined;
+		let historyItemParentId: string | undefined;
 
-		await this._viewChanges(repository, historyItem, multiDiffSourceUri, title);
+		// If historyItem2 is not provided, we are viewing a single commit. If historyItem2 is
+		// provided, we are viewing a range and we have to include both start and end commits.
+		// TODO@lszomoru - handle the case when historyItem2 is the first commit in the repository
+		if (!historyItem2) {
+			const commit = await repository.getCommit(historyItem1.id);
+			title = `${historyItem1.id.substring(0, 8)} - ${commit.message}`;
+			historyItemParentId = historyItem1.parentIds.length > 0 ? historyItem1.parentIds[0] : `${historyItem1.id}^`;
+		} else {
+			title = l10n.t('All Changes ({0} ↔ {1})', historyItem2.id.substring(0, 8), historyItem1.id.substring(0, 8));
+			historyItemParentId = historyItem2.parentIds.length > 0 ? historyItem2.parentIds[0] : `${historyItem2.id}^`;
+		}
+
+		const multiDiffSourceUri = toGitUri(Uri.file(repository.root), `${historyItemParentId}..${historyItem1.id}`, { scheme: 'git-commit', });
+
+		await this._viewChanges(repository, historyItem1.id, historyItemParentId, multiDiffSourceUri, title);
 	}
 
 	@command('git.viewAllChanges', { repository: true })
@@ -4211,20 +4258,32 @@ export class CommandCenter {
 
 		const multiDiffSourceUri = toGitUri(Uri.file(repository.root), historyItem.id, { scheme: 'git-changes' });
 
-		await this._viewChanges(repository, historyItem, multiDiffSourceUri, title);
+		await this._viewChanges(repository, modifiedShortRef, originalShortRef, multiDiffSourceUri, title);
 	}
 
-	async _viewChanges(repository: Repository, historyItem: SourceControlHistoryItem, multiDiffSourceUri: Uri, title: string): Promise<void> {
-		const historyItemParentId = historyItem.parentIds.length > 0 ? historyItem.parentIds[0] : `${historyItem.id}^`;
-		const changes = await repository.diffBetween(historyItemParentId, historyItem.id);
+	async _viewChanges(repository: Repository, historyItemId: string, historyItemParentId: string, multiDiffSourceUri: Uri, title: string): Promise<void> {
+		const changes = await repository.diffBetween(historyItemParentId, historyItemId);
+		const resources = changes.map(c => toMultiFileDiffEditorUris(c, historyItemParentId, historyItemId));
 
-		if (changes.length === 0) {
+		await commands.executeCommand('_workbench.openMultiDiffEditor', { multiDiffSourceUri, title, resources });
+	}
+
+	@command('git.copyCommitId', { repository: true })
+	async copyCommitId(repository: Repository, historyItem: SourceControlHistoryItem): Promise<void> {
+		if (!repository || !historyItem) {
 			return;
 		}
 
-		const resources = changes.map(c => toMultiFileDiffEditorUris(c, historyItemParentId, historyItem.id));
+		env.clipboard.writeText(historyItem.id);
+	}
 
-		await commands.executeCommand('_workbench.openMultiDiffEditor', { multiDiffSourceUri, title, resources });
+	@command('git.copyCommitMessage', { repository: true })
+	async copyCommitMessage(repository: Repository, historyItem: SourceControlHistoryItem): Promise<void> {
+		if (!repository || !historyItem) {
+			return;
+		}
+
+		env.clipboard.writeText(historyItem.message);
 	}
 
 	private createCommand(id: string, key: string, method: Function, options: ScmCommandOptions): (...args: any[]) => any {
@@ -4344,6 +4403,12 @@ export class CommandCenter {
 						type = 'information';
 						options.modal = false;
 						break;
+					case GitErrorCodes.CherryPickEmpty:
+						message = l10n.t('The changes are already present in the current branch.');
+						choices.clear();
+						type = 'information';
+						options.modal = false;
+						break;
 					default: {
 						const hint = (err.stderr || err.message || String(err))
 							.replace(/^error: /mi, '')
@@ -4404,10 +4469,10 @@ export class CommandCenter {
 	private getSCMResource(uri?: Uri): Resource | undefined {
 		uri = uri ? uri : (window.activeTextEditor && window.activeTextEditor.document.uri);
 
-		this.logger.debug(`git.getSCMResource.uri ${uri && uri.toString()}`);
+		this.logger.debug(`[CommandCenter][getSCMResource] git.getSCMResource.uri: ${uri && uri.toString()}`);
 
 		for (const r of this.model.repositories.map(r => r.root)) {
-			this.logger.debug(`repo root ${r}`);
+			this.logger.debug(`[CommandCenter][getSCMResource] repo root: ${r}`);
 		}
 
 		if (!uri) {
diff --git a/extensions/git/src/decorationProvider.ts b/extensions/git/src/decorationProvider.ts
index 3f8553260e9..548f3aa2a1c 100644
--- a/extensions/git/src/decorationProvider.ts
+++ b/extensions/git/src/decorationProvider.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { window, workspace, Uri, Disposable, Event, EventEmitter, FileDecoration, FileDecorationProvider, ThemeColor, l10n } from 'vscode';
+import { window, workspace, Uri, Disposable, Event, EventEmitter, FileDecoration, FileDecorationProvider, ThemeColor, l10n, SourceControlHistoryItemRef } from 'vscode';
 import * as path from 'path';
 import { Repository, GitResourceGroup } from './repository';
 import { Model } from './model';
@@ -11,6 +11,16 @@ import { debounce } from './decorators';
 import { filterEvent, dispose, anyEvent, fireEvent, PromiseSource, combinedDisposable, runAndSubscribeEvent } from './util';
 import { Change, GitErrorCodes, Status } from './api/git';
 
+function equalSourceControlHistoryItemRefs(ref1?: SourceControlHistoryItemRef, ref2?: SourceControlHistoryItemRef): boolean {
+	if (ref1 === ref2) {
+		return true;
+	}
+
+	return ref1?.id === ref2?.id &&
+		ref1?.name === ref2?.name &&
+		ref1?.revision === ref2?.revision;
+}
+
 class GitIgnoreDecorationProvider implements FileDecorationProvider {
 
 	private static Decoration: FileDecoration = { color: new ThemeColor('gitDecoration.ignoredResourceForeground') };
@@ -158,22 +168,37 @@ class GitIncomingChangesFileDecorationProvider implements FileDecorationProvider
 	private readonly _onDidChangeDecorations = new EventEmitter<Uri[]>();
 	readonly onDidChangeFileDecorations: Event<Uri[]> = this._onDidChangeDecorations.event;
 
-	private decorations = new Map<string, FileDecoration>();
+	private _currentHistoryItemRef: SourceControlHistoryItemRef | undefined;
+	private _currentHistoryItemRemoteRef: SourceControlHistoryItemRef | undefined;
+
+	private _decorations = new Map<string, FileDecoration>();
 	private readonly disposables: Disposable[] = [];
 
 	constructor(private readonly repository: Repository) {
 		this.disposables.push(
 			window.registerFileDecorationProvider(this),
-			runAndSubscribeEvent(repository.historyProvider.onDidChangeCurrentHistoryItemGroup, () => this.onDidChangeCurrentHistoryItemGroup())
+			runAndSubscribeEvent(repository.historyProvider.onDidChangeCurrentHistoryItemRefs, () => this.onDidChangeCurrentHistoryItemRefs())
 		);
 	}
 
-	private async onDidChangeCurrentHistoryItemGroup(): Promise<void> {
-		const newDecorations = new Map<string, FileDecoration>();
-		await this.collectIncomingChangesFileDecorations(newDecorations);
-		const uris = new Set([...this.decorations.keys()].concat([...newDecorations.keys()]));
+	private async onDidChangeCurrentHistoryItemRefs(): Promise<void> {
+		const historyProvider = this.repository.historyProvider;
+		const currentHistoryItemRef = historyProvider.currentHistoryItemRef;
+		const currentHistoryItemRemoteRef = historyProvider.currentHistoryItemRemoteRef;
+
+		if (equalSourceControlHistoryItemRefs(this._currentHistoryItemRef, currentHistoryItemRef) &&
+			equalSourceControlHistoryItemRefs(this._currentHistoryItemRemoteRef, currentHistoryItemRemoteRef)) {
+			return;
+		}
+
+		const decorations = new Map<string, FileDecoration>();
+		await this.collectIncomingChangesFileDecorations(decorations);
+		const uris = new Set([...this._decorations.keys()].concat([...decorations.keys()]));
+
+		this._decorations = decorations;
+		this._currentHistoryItemRef = currentHistoryItemRef;
+		this._currentHistoryItemRemoteRef = currentHistoryItemRemoteRef;
 
-		this.decorations = newDecorations;
 		this._onDidChangeDecorations.fire([...uris.values()].map(value => Uri.parse(value, true)));
 	}
 
@@ -218,18 +243,19 @@ class GitIncomingChangesFileDecorationProvider implements FileDecorationProvider
 	private async getIncomingChanges(): Promise<Change[]> {
 		try {
 			const historyProvider = this.repository.historyProvider;
-			const currentHistoryItemGroup = historyProvider.currentHistoryItemGroup;
+			const currentHistoryItemRef = historyProvider.currentHistoryItemRef;
+			const currentHistoryItemRemoteRef = historyProvider.currentHistoryItemRemoteRef;
 
-			if (!currentHistoryItemGroup?.base) {
+			if (!currentHistoryItemRef || !currentHistoryItemRemoteRef) {
 				return [];
 			}
 
-			const ancestor = await historyProvider.resolveHistoryItemGroupCommonAncestor(currentHistoryItemGroup.id, currentHistoryItemGroup.base.id);
+			const ancestor = await historyProvider.resolveHistoryItemRefsCommonAncestor([currentHistoryItemRef.id, currentHistoryItemRemoteRef.id]);
 			if (!ancestor) {
 				return [];
 			}
 
-			const changes = await this.repository.diffBetween(ancestor.id, currentHistoryItemGroup.base.id);
+			const changes = await this.repository.diffBetween(ancestor, currentHistoryItemRemoteRef.id);
 			return changes;
 		} catch (err) {
 			return [];
@@ -237,7 +263,7 @@ class GitIncomingChangesFileDecorationProvider implements FileDecorationProvider
 	}
 
 	provideFileDecoration(uri: Uri): FileDecoration | undefined {
-		return this.decorations.get(uri.toString());
+		return this._decorations.get(uri.toString());
 	}
 
 	dispose(): void {
diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
index 46fcd6069a6..2a729ae08fb 100644
--- a/extensions/git/src/git.ts
+++ b/extensions/git/src/git.ts
@@ -484,6 +484,17 @@ export class Git {
 		// Keep trailing spaces which are part of the directory name
 		const repositoryRootPath = path.normalize(result.stdout.trimStart().replace(/[\r\n]+$/, ''));
 
+		// Handle symbolic links and UNC paths
+		// Git 2.31 added the `--path-format` flag to rev-parse which
+		// allows us to get the relative path of the repository root
+		if (!pathEquals(pathInsidePossibleRepository, repositoryRootPath) &&
+			!isDescendant(repositoryRootPath, pathInsidePossibleRepository) &&
+			!isDescendant(pathInsidePossibleRepository, repositoryRootPath) &&
+			this.compareGitVersionTo('2.31.0') !== -1) {
+			const relativePathResult = await this.exec(pathInsidePossibleRepository, ['rev-parse', '--path-format=relative', '--show-toplevel',]);
+			return path.resolve(pathInsidePossibleRepository, relativePathResult.stdout.trimStart().replace(/[\r\n]+$/, ''));
+		}
+
 		if (isWindows) {
 			// On Git 2.25+ if you call `rev-parse --show-toplevel` on a mapped drive, instead of getting the mapped
 			// drive path back, you get the UNC path for the mapped drive. So we will try to normalize it back to the
@@ -491,7 +502,6 @@ export class Git {
 			const repoUri = Uri.file(repositoryRootPath);
 			const pathUri = Uri.file(pathInsidePossibleRepository);
 			if (repoUri.authority.length !== 0 && pathUri.authority.length === 0) {
-				// eslint-disable-next-line local/code-no-look-behind-regex
 				const match = /(?<=^\/?)([a-zA-Z])(?=:\/)/.exec(pathUri.path);
 				if (match !== null) {
 					const [, letter] = match;
@@ -521,17 +531,6 @@ export class Git {
 			}
 		}
 
-		// Handle symbolic links
-		// Git 2.31 added the `--path-format` flag to rev-parse which
-		// allows us to get the relative path of the repository root
-		if (!pathEquals(pathInsidePossibleRepository, repositoryRootPath) &&
-			!isDescendant(repositoryRootPath, pathInsidePossibleRepository) &&
-			!isDescendant(pathInsidePossibleRepository, repositoryRootPath) &&
-			this.compareGitVersionTo('2.31.0') !== -1) {
-			const relativePathResult = await this.exec(pathInsidePossibleRepository, ['rev-parse', '--path-format=relative', '--show-toplevel',]);
-			return path.resolve(pathInsidePossibleRepository, relativePathResult.stdout.trimStart().replace(/[\r\n]+$/, ''));
-		}
-
 		return repositoryRootPath;
 	}
 
@@ -1062,6 +1061,7 @@ export interface PullOptions {
 }
 
 export class Repository {
+	private _isUsingRefTable = false;
 
 	constructor(
 		private _git: Git,
@@ -1113,7 +1113,7 @@ export class Repository {
 			return result.stdout.trim();
 		}
 		catch (err) {
-			this.logger.warn(`git config failed: ${err.message}`);
+			this.logger.warn(`[Git][config] git config failed: ${err.message}`);
 			return '';
 		}
 	}
@@ -1137,6 +1137,7 @@ export class Repository {
 	}
 
 	async log(options?: LogOptions): Promise<Commit[]> {
+		const spawnOptions: SpawnOptions = {};
 		const args = ['log', `--format=${COMMIT_FORMAT}`, '-z'];
 
 		if (options?.shortStats) {
@@ -1165,11 +1166,30 @@ export class Repository {
 			args.push(`--author="${options.author}"`);
 		}
 
+		if (typeof options?.maxParents === 'number') {
+			args.push(`--max-parents=${options.maxParents}`);
+		}
+
+		if (typeof options?.skip === 'number') {
+			args.push(`--skip=${options.skip}`);
+		}
+
+		if (options?.refNames) {
+			args.push('--topo-order');
+			args.push('--decorate=full');
+
+			// In order to avoid hitting the command line limit due to large number of reference
+			// names (can happen when the `all` filter is used in the Source Control Graph view),
+			// we are passing the reference names via stdin.
+			spawnOptions.input = options.refNames.join('\n');
+			args.push('--stdin');
+		}
+
 		if (options?.path) {
 			args.push('--', options.path);
 		}
 
-		const result = await this.exec(args);
+		const result = await this.exec(args, spawnOptions);
 		if (result.exitCode) {
 			// An empty repo
 			return [];
@@ -1496,9 +1516,31 @@ export class Repository {
 		return parseGitChanges(this.repositoryRoot, gitResult.stdout);
 	}
 
-	async getMergeBase(ref1: string, ref2: string): Promise<string | undefined> {
+	async diffTrees(treeish1: string, treeish2?: string): Promise<Change[]> {
+		const args = ['diff-tree', '-r', '--name-status', '-z', '--diff-filter=ADMR', treeish1];
+
+		if (treeish2) {
+			args.push(treeish2);
+		}
+
+		const gitResult = await this.exec(args);
+		if (gitResult.exitCode) {
+			return [];
+		}
+
+		return parseGitChanges(this.repositoryRoot, gitResult.stdout);
+	}
+
+	async getMergeBase(ref1: string, ref2: string, ...refs: string[]): Promise<string | undefined> {
 		try {
-			const args = ['merge-base', ref1, ref2];
+			const args = ['merge-base'];
+			if (refs.length !== 0) {
+				args.push('--octopus');
+				args.push(...refs);
+			}
+
+			args.push(ref1, ref2);
+
 			const result = await this.exec(args);
 
 			return result.stdout.trim();
@@ -1768,13 +1810,17 @@ export class Repository {
 		await this.exec(['merge', '--abort']);
 	}
 
-	async tag(name: string, message?: string): Promise<void> {
+	async tag(options: { name: string; message?: string; ref?: string }): Promise<void> {
 		let args = ['tag'];
 
-		if (message) {
-			args = [...args, '-a', name, '-m', message];
+		if (options.message) {
+			args = [...args, '-a', options.name, '-m', options.message];
 		} else {
-			args = [...args, name];
+			args = [...args, options.name];
+		}
+
+		if (options.ref) {
+			args.push(options.ref);
 		}
 
 		await this.exec(args);
@@ -2056,8 +2102,18 @@ export class Repository {
 	}
 
 	async cherryPick(commitHash: string): Promise<void> {
-		const args = ['cherry-pick', commitHash];
-		await this.exec(args);
+		try {
+			await this.exec(['cherry-pick', commitHash]);
+		} catch (err) {
+			if (/The previous cherry-pick is now empty, possibly due to conflict resolution./.test(err.stderr ?? '')) {
+				// Abort the cherry-pick operation
+				await this.exec(['cherry-pick', '--abort']);
+
+				err.gitErrorCode = GitErrorCodes.CherryPickEmpty;
+			}
+
+			throw err;
+		}
 	}
 
 	async blame(path: string): Promise<string> {
@@ -2298,13 +2354,25 @@ export class Repository {
 	}
 
 	async getHEAD(): Promise<Ref> {
-		try {
-			// Attempt to parse the HEAD file
-			const result = await this.getHEADFS();
-			return result;
-		}
-		catch (err) {
-			this.logger.warn(err.message);
+		if (!this._isUsingRefTable) {
+			try {
+				// Attempt to parse the HEAD file
+				const result = await this.getHEADFS();
+
+				// Git 2.45 adds support for a new reference storage backend called "reftable", promising
+				// faster lookups, reads, and writes for repositories with any number of references. For
+				// backwards compatibility the `.git/HEAD` file contains `ref: refs/heads/.invalid`. More
+				// details are available at https://git-scm.com/docs/reftable
+				if (result.name === '.invalid') {
+					this._isUsingRefTable = true;
+					this.logger.warn(`[Git][getHEAD] Failed to parse HEAD file: Repository is using reftable format.`);
+				} else {
+					return result;
+				}
+			}
+			catch (err) {
+				this.logger.warn(`[Git][getHEAD] Failed to parse HEAD file: ${err.message}`);
+			}
 		}
 
 		try {
@@ -2352,7 +2420,7 @@ export class Repository {
 		return result.stdout.trim().split('\n')
 			.map(line => line.trim().split('\0'))
 			.filter(([_, upstream]) => upstream === upstreamBranch)
-			.map(([ref]) => ({ name: ref, type: RefType.Head } as Branch));
+			.map(([ref]): Branch => ({ name: ref, type: RefType.Head }));
 	}
 
 	async getRefs(query: RefQuery, cancellationToken?: CancellationToken): Promise<Ref[]> {
@@ -2373,7 +2441,10 @@ export class Repository {
 		args.push('--format', '%(refname) %(objectname) %(*objectname)');
 
 		if (query.pattern) {
-			args.push(query.pattern.startsWith('refs/') ? query.pattern : `refs/${query.pattern}`);
+			const patterns = Array.isArray(query.pattern) ? query.pattern : [query.pattern];
+			for (const pattern of patterns) {
+				args.push(pattern.startsWith('refs/') ? pattern : `refs/${pattern}`);
+			}
 		}
 
 		if (query.contains) {
@@ -2452,11 +2523,11 @@ export class Repository {
 			remotes.push(...await this.getRemotesFS());
 
 			if (remotes.length === 0) {
-				this.logger.info('No remotes found in the git config file.');
+				this.logger.info('[Git][getRemotes] No remotes found in the git config file');
 			}
 		}
 		catch (err) {
-			this.logger.warn(`getRemotes() - ${err.message}`);
+			this.logger.warn(`[Git][getRemotes] Error: ${err.message}`);
 
 			// Fallback to using git to get the remotes
 			remotes.push(...await this.getRemotesGit());
@@ -2592,13 +2663,13 @@ export class Repository {
 			return branch;
 		}
 
-		this.logger.warn(`No such branch: ${name}.`);
+		this.logger.warn(`[Git][getBranch] No such branch: ${name}`);
 		return Promise.reject<Branch>(new Error(`No such branch: ${name}.`));
 	}
 
 	async getDefaultBranch(): Promise<Branch> {
 		const result = await this.exec(['symbolic-ref', '--short', 'refs/remotes/origin/HEAD']);
-		if (!result.stdout) {
+		if (!result.stdout || result.stderr) {
 			throw new Error('No default branch');
 		}
 
@@ -2657,7 +2728,7 @@ export class Repository {
 	}
 
 	async getCommit(ref: string): Promise<Commit> {
-		const result = await this.exec(['show', '-s', `--format=${COMMIT_FORMAT}`, '-z', ref]);
+		const result = await this.exec(['show', '-s', '--decorate=full', '--shortstat', `--format=${COMMIT_FORMAT}`, '-z', ref]);
 		const commits = parseGitCommits(result.stdout);
 		if (commits.length === 0) {
 			return Promise.reject<Commit>('bad commit format');
@@ -2665,30 +2736,12 @@ export class Repository {
 		return commits[0];
 	}
 
-	async getCommitFiles(ref: string): Promise<string[]> {
-		const result = await this.exec(['diff-tree', '--no-commit-id', '--name-only', '-r', ref]);
-		return result.stdout.split('\n').filter(l => !!l);
-	}
-
-	async getCommitCount(range: string): Promise<{ ahead: number; behind: number }> {
-		const args = ['rev-list', '--count', '--left-right', range];
-
-		if (isWindows) {
-			args.splice(0, 0, '-c', 'core.longpaths=true');
-		}
-
-		const result = await this.exec(args);
-		const [ahead, behind] = result.stdout.trim().split('\t');
-
-		return { ahead: Number(ahead) || 0, behind: Number(behind) || 0 };
-	}
-
 	async revParse(ref: string): Promise<string | undefined> {
 		try {
 			const result = await fs.readFile(path.join(this.dotGit.path, ref), 'utf8');
 			return result.trim();
 		} catch (err) {
-			this.logger.warn(err.message);
+			this.logger.warn(`[Git][revParse] Unable to read file: ${err.message}`);
 		}
 
 		try {
diff --git a/extensions/git/src/historyProvider.ts b/extensions/git/src/historyProvider.ts
index f238010e14c..896c46851c4 100644
--- a/extensions/git/src/historyProvider.ts
+++ b/extensions/git/src/historyProvider.ts
@@ -4,133 +4,279 @@
  *--------------------------------------------------------------------------------------------*/
 
 
-import { Disposable, Event, EventEmitter, FileDecoration, FileDecorationProvider, SourceControlHistoryItem, SourceControlHistoryItemChange, SourceControlHistoryItemGroup, SourceControlHistoryOptions, SourceControlHistoryProvider, ThemeIcon, Uri, window, LogOutputChannel } from 'vscode';
+import { Disposable, Event, EventEmitter, FileDecoration, FileDecorationProvider, SourceControlHistoryItem, SourceControlHistoryItemChange, SourceControlHistoryOptions, SourceControlHistoryProvider, ThemeIcon, Uri, window, LogOutputChannel, SourceControlHistoryItemRef, l10n, SourceControlHistoryItemRefsChangeEvent } from 'vscode';
 import { Repository, Resource } from './repository';
-import { IDisposable, dispose, filterEvent } from './util';
+import { IDisposable, deltaHistoryItemRefs, dispose, filterEvent } from './util';
 import { toGitUri } from './uri';
-import { Branch, RefType, UpstreamRef } from './api/git';
+import { Branch, LogOptions, Ref, RefType } from './api/git';
 import { emojify, ensureEmojis } from './emoji';
-import { Operation } from './operation';
+import { Commit } from './git';
+import { OperationKind, OperationResult } from './operation';
+
+function toSourceControlHistoryItemRef(ref: Ref): SourceControlHistoryItemRef {
+	switch (ref.type) {
+		case RefType.RemoteHead:
+			return {
+				id: `refs/remotes/${ref.name}`,
+				name: ref.name ?? '',
+				description: ref.commit ? l10n.t('Remote branch at {0}', ref.commit.substring(0, 8)) : undefined,
+				revision: ref.commit,
+				icon: new ThemeIcon('cloud'),
+				category: l10n.t('remote branches')
+			};
+		case RefType.Tag:
+			return {
+				id: `refs/tags/${ref.name}`,
+				name: ref.name ?? '',
+				description: ref.commit ? l10n.t('Tag at {0}', ref.commit.substring(0, 8)) : undefined,
+				revision: ref.commit,
+				icon: new ThemeIcon('tag'),
+				category: l10n.t('tags')
+			};
+		default:
+			return {
+				id: `refs/heads/${ref.name}`,
+				name: ref.name ?? '',
+				description: ref.commit ? ref.commit.substring(0, 8) : undefined,
+				revision: ref.commit,
+				icon: new ThemeIcon('git-branch'),
+				category: l10n.t('branches')
+			};
+	}
+}
+
+function compareSourceControlHistoryItemRef(ref1: SourceControlHistoryItemRef, ref2: SourceControlHistoryItemRef): number {
+	const getOrder = (ref: SourceControlHistoryItemRef): number => {
+		if (ref.id.startsWith('refs/heads/')) {
+			return 1;
+		} else if (ref.id.startsWith('refs/remotes/')) {
+			return 2;
+		} else if (ref.id.startsWith('refs/tags/')) {
+			return 3;
+		}
+
+		return 99;
+	};
+
+	const ref1Order = getOrder(ref1);
+	const ref2Order = getOrder(ref2);
+
+	if (ref1Order !== ref2Order) {
+		return ref1Order - ref2Order;
+	}
+
+	return ref1.name.localeCompare(ref2.name);
+}
 
 export class GitHistoryProvider implements SourceControlHistoryProvider, FileDecorationProvider, IDisposable {
-
-	private readonly _onDidChangeCurrentHistoryItemGroup = new EventEmitter<void>();
-	readonly onDidChangeCurrentHistoryItemGroup: Event<void> = this._onDidChangeCurrentHistoryItemGroup.event;
-
 	private readonly _onDidChangeDecorations = new EventEmitter<Uri[]>();
 	readonly onDidChangeFileDecorations: Event<Uri[]> = this._onDidChangeDecorations.event;
 
+	private _currentHistoryItemRef: SourceControlHistoryItemRef | undefined;
+	get currentHistoryItemRef(): SourceControlHistoryItemRef | undefined { return this._currentHistoryItemRef; }
+
+	private _currentHistoryItemRemoteRef: SourceControlHistoryItemRef | undefined;
+	get currentHistoryItemRemoteRef(): SourceControlHistoryItemRef | undefined { return this._currentHistoryItemRemoteRef; }
+
+	private _currentHistoryItemBaseRef: SourceControlHistoryItemRef | undefined;
+	get currentHistoryItemBaseRef(): SourceControlHistoryItemRef | undefined { return this._currentHistoryItemBaseRef; }
+
+	private readonly _onDidChangeCurrentHistoryItemRefs = new EventEmitter<void>();
+	readonly onDidChangeCurrentHistoryItemRefs: Event<void> = this._onDidChangeCurrentHistoryItemRefs.event;
+
+	private readonly _onDidChangeHistoryItemRefs = new EventEmitter<SourceControlHistoryItemRefsChangeEvent>();
+	readonly onDidChangeHistoryItemRefs: Event<SourceControlHistoryItemRefsChangeEvent> = this._onDidChangeHistoryItemRefs.event;
+
 	private _HEAD: Branch | undefined;
-	private _currentHistoryItemGroup: SourceControlHistoryItemGroup | undefined;
-	get currentHistoryItemGroup(): SourceControlHistoryItemGroup | undefined { return this._currentHistoryItemGroup; }
-	set currentHistoryItemGroup(value: SourceControlHistoryItemGroup | undefined) {
-		this._currentHistoryItemGroup = value;
-		this._onDidChangeCurrentHistoryItemGroup.fire();
-	}
+	private historyItemRefs: SourceControlHistoryItemRef[] = [];
 
 	private historyItemDecorations = new Map<string, FileDecoration>();
 
 	private disposables: Disposable[] = [];
 
 	constructor(protected readonly repository: Repository, private readonly logger: LogOutputChannel) {
-		this.disposables.push(repository.onDidRunGitStatus(() => this.onDidRunGitStatus(), this));
-		this.disposables.push(filterEvent(repository.onDidRunOperation, e => e.operation === Operation.Refresh)(() => this.onDidRunGitStatus(true), this));
+		const onDidRunWriteOperation = filterEvent(repository.onDidRunOperation, e => !e.operation.readOnly);
+		this.disposables.push(onDidRunWriteOperation(this.onDidRunWriteOperation, this));
 
 		this.disposables.push(window.registerFileDecorationProvider(this));
 	}
 
-	private async onDidRunGitStatus(force = false): Promise<void> {
-		this.logger.trace('GitHistoryProvider:onDidRunGitStatus - HEAD:', JSON.stringify(this._HEAD));
-		this.logger.trace('GitHistoryProvider:onDidRunGitStatus - repository.HEAD:', JSON.stringify(this.repository.HEAD));
+	private async onDidRunWriteOperation(result: OperationResult): Promise<void> {
+		if (!this.repository.HEAD) {
+			this.logger.trace('[GitHistoryProvider][onDidRunWriteOperation] repository.HEAD is undefined');
+			this._currentHistoryItemRef = this._currentHistoryItemRemoteRef = this._currentHistoryItemBaseRef = undefined;
+			this._onDidChangeCurrentHistoryItemRefs.fire();
 
-		// Check if HEAD has changed
-		if (!force &&
-			this._HEAD?.name === this.repository.HEAD?.name &&
-			this._HEAD?.commit === this.repository.HEAD?.commit &&
-			this._HEAD?.upstream?.name === this.repository.HEAD?.upstream?.name &&
-			this._HEAD?.upstream?.remote === this.repository.HEAD?.upstream?.remote &&
-			this._HEAD?.upstream?.commit === this.repository.HEAD?.upstream?.commit) {
-			this.logger.trace('GitHistoryProvider:onDidRunGitStatus - HEAD has not changed');
 			return;
 		}
 
+		let historyItemRefId = '';
+		let historyItemRefName = '';
+
+		switch (this.repository.HEAD.type) {
+			case RefType.Head: {
+				if (this.repository.HEAD.name !== undefined) {
+					// Branch
+					historyItemRefId = `refs/heads/${this.repository.HEAD.name}`;
+					historyItemRefName = this.repository.HEAD.name;
+
+					// Remote
+					this._currentHistoryItemRemoteRef = this.repository.HEAD.upstream ? {
+						id: `refs/remotes/${this.repository.HEAD.upstream.remote}/${this.repository.HEAD.upstream.name}`,
+						name: `${this.repository.HEAD.upstream.remote}/${this.repository.HEAD.upstream.name}`,
+						revision: this.repository.HEAD.upstream.commit,
+						icon: new ThemeIcon('cloud')
+					} : undefined;
+
+					// Base - compute only if the branch has changed
+					if (this._HEAD?.name !== this.repository.HEAD.name) {
+						const mergeBase = await this.resolveHEADMergeBase();
+
+						this._currentHistoryItemBaseRef = mergeBase &&
+							(mergeBase.remote !== this.repository.HEAD.upstream?.remote ||
+								mergeBase.name !== this.repository.HEAD.upstream?.name) ? {
+							id: `refs/remotes/${mergeBase.remote}/${mergeBase.name}`,
+							name: `${mergeBase.remote}/${mergeBase.name}`,
+							revision: mergeBase.commit,
+							icon: new ThemeIcon('cloud')
+						} : undefined;
+					}
+				} else {
+					// Detached commit
+					historyItemRefId = this.repository.HEAD.commit ?? '';
+					historyItemRefName = this.repository.HEAD.commit ?? '';
+
+					this._currentHistoryItemRemoteRef = undefined;
+					this._currentHistoryItemBaseRef = undefined;
+				}
+				break;
+			}
+			case RefType.Tag: {
+				// Tag
+				historyItemRefId = `refs/tags/${this.repository.HEAD.name}`;
+				historyItemRefName = this.repository.HEAD.name ?? this.repository.HEAD.commit ?? '';
+
+				this._currentHistoryItemRemoteRef = undefined;
+				this._currentHistoryItemBaseRef = undefined;
+				break;
+			}
+		}
+
 		this._HEAD = this.repository.HEAD;
 
-		// Check if HEAD does not support incoming/outgoing (detached commit, tag)
-		if (!this.repository.HEAD?.name || !this.repository.HEAD?.commit || this.repository.HEAD.type === RefType.Tag) {
-			this.logger.trace('GitHistoryProvider:onDidRunGitStatus - HEAD does not support incoming/outgoing');
-
-			this.currentHistoryItemGroup = undefined;
-			return;
-		}
-
-		this.currentHistoryItemGroup = {
-			id: `refs/heads/${this.repository.HEAD.name ?? ''}`,
-			name: this.repository.HEAD.name ?? '',
-			base: this.repository.HEAD.upstream ?
-				{
-					id: `refs/remotes/${this.repository.HEAD.upstream.remote}/${this.repository.HEAD.upstream.name}`,
-					name: `${this.repository.HEAD.upstream.remote}/${this.repository.HEAD.upstream.name}`,
-				} : undefined
+		this._currentHistoryItemRef = {
+			id: historyItemRefId,
+			name: historyItemRefName,
+			revision: this.repository.HEAD.commit,
+			icon: new ThemeIcon('target'),
 		};
 
-		this.logger.trace(`GitHistoryProvider:onDidRunGitStatus - currentHistoryItemGroup (${force}): ${JSON.stringify(this.currentHistoryItemGroup)}`);
+		this._onDidChangeCurrentHistoryItemRefs.fire();
+		this.logger.trace(`[GitHistoryProvider][onDidRunWriteOperation] currentHistoryItemRef: ${JSON.stringify(this._currentHistoryItemRef)}`);
+		this.logger.trace(`[GitHistoryProvider][onDidRunWriteOperation] currentHistoryItemRemoteRef: ${JSON.stringify(this._currentHistoryItemRemoteRef)}`);
+		this.logger.trace(`[GitHistoryProvider][onDidRunWriteOperation] currentHistoryItemBaseRef: ${JSON.stringify(this._currentHistoryItemBaseRef)}`);
+
+		// Refs (alphabetically)
+		const historyItemRefs = this.repository.refs
+			.map(ref => toSourceControlHistoryItemRef(ref))
+			.sort((a, b) => a.id.localeCompare(b.id));
+
+		// Auto-fetch
+		const silent = result.operation.kind === OperationKind.Fetch && result.operation.showProgress === false;
+		const delta = deltaHistoryItemRefs(this.historyItemRefs, historyItemRefs);
+		this._onDidChangeHistoryItemRefs.fire({ ...delta, silent });
+
+		this.historyItemRefs = historyItemRefs;
+
+		const deltaLog = {
+			added: delta.added.map(ref => ref.id),
+			modified: delta.modified.map(ref => ref.id),
+			removed: delta.removed.map(ref => ref.id),
+			silent
+		};
+		this.logger.trace(`[GitHistoryProvider][onDidRunWriteOperation] historyItemRefs: ${JSON.stringify(deltaLog)}`);
 	}
 
-	async provideHistoryItems(historyItemGroupId: string, options: SourceControlHistoryOptions): Promise<SourceControlHistoryItem[]> {
-		//TODO@lszomoru - support limit and cursor
-		if (typeof options.limit === 'number') {
-			throw new Error('Unsupported options.');
-		}
-		if (typeof options.limit?.id !== 'string') {
-			throw new Error('Unsupported options.');
+	async provideHistoryItemRefs(historyItemRefs: string[] | undefined): Promise<SourceControlHistoryItemRef[]> {
+		const refs = await this.repository.getRefs({ pattern: historyItemRefs });
+
+		const branches: SourceControlHistoryItemRef[] = [];
+		const remoteBranches: SourceControlHistoryItemRef[] = [];
+		const tags: SourceControlHistoryItemRef[] = [];
+
+		for (const ref of refs) {
+			switch (ref.type) {
+				case RefType.RemoteHead:
+					remoteBranches.push(toSourceControlHistoryItemRef(ref));
+					break;
+				case RefType.Tag:
+					tags.push(toSourceControlHistoryItemRef(ref));
+					break;
+				default:
+					branches.push(toSourceControlHistoryItemRef(ref));
+					break;
+			}
 		}
 
-		const refParentId = options.limit.id;
-		const refId = await this.repository.revParse(historyItemGroupId) ?? '';
-
-		const historyItems: SourceControlHistoryItem[] = [];
-		const commits = await this.repository.log({ range: `${refParentId}..${refId}`, shortStats: true, sortByAuthorDate: true });
-
-		await ensureEmojis();
-
-		historyItems.push(...commits.map(commit => {
-			const newLineIndex = commit.message.indexOf('\n');
-			const subject = newLineIndex !== -1 ? commit.message.substring(0, newLineIndex) : commit.message;
-
-			return {
-				id: commit.hash,
-				parentIds: commit.parents,
-				message: emojify(subject),
-				author: commit.authorName,
-				icon: new ThemeIcon('git-commit'),
-				timestamp: commit.authorDate?.getTime(),
-				statistics: commit.shortStat ?? { files: 0, insertions: 0, deletions: 0 },
-			};
-		}));
-
-		return historyItems;
+		return [...branches, ...remoteBranches, ...tags];
 	}
 
-	async provideHistoryItemSummary(historyItemId: string, historyItemParentId: string | undefined): Promise<SourceControlHistoryItem> {
-		if (!historyItemParentId) {
-			const commit = await this.repository.getCommit(historyItemId);
-			historyItemParentId = commit.parents.length > 0 ? commit.parents[0] : `${historyItemId}^`;
+	async provideHistoryItems(options: SourceControlHistoryOptions): Promise<SourceControlHistoryItem[]> {
+		if (!this.currentHistoryItemRef || !options.historyItemRefs) {
+			return [];
 		}
 
-		const allChanges = await this.repository.diffBetweenShortStat(historyItemParentId, historyItemId);
-		return { id: historyItemId, parentIds: [historyItemParentId], message: '', statistics: allChanges };
+		// Deduplicate refNames
+		const refNames = Array.from(new Set<string>(options.historyItemRefs));
+
+		let logOptions: LogOptions = { refNames, shortStats: true };
+
+		try {
+			if (options.limit === undefined || typeof options.limit === 'number') {
+				logOptions = { ...logOptions, maxEntries: options.limit ?? 50 };
+			} else if (typeof options.limit.id === 'string') {
+				// Get the common ancestor commit, and commits
+				const commit = await this.repository.getCommit(options.limit.id);
+				const commitParentId = commit.parents.length > 0 ? commit.parents[0] : await this.repository.getEmptyTree();
+
+				logOptions = { ...logOptions, range: `${commitParentId}..` };
+			}
+
+			if (typeof options.skip === 'number') {
+				logOptions = { ...logOptions, skip: options.skip };
+			}
+
+			const commits = await this.repository.log({ ...logOptions, silent: true });
+
+			await ensureEmojis();
+
+			return commits.map(commit => {
+				const references = this._resolveHistoryItemRefs(commit);
+
+				return {
+					id: commit.hash,
+					parentIds: commit.parents,
+					message: emojify(commit.message),
+					author: commit.authorName,
+					icon: new ThemeIcon('git-commit'),
+					displayId: commit.hash.substring(0, 8),
+					timestamp: commit.authorDate?.getTime(),
+					statistics: commit.shortStat ?? { files: 0, insertions: 0, deletions: 0 },
+					references: references.length !== 0 ? references : undefined
+				};
+			});
+		} catch (err) {
+			this.logger.error(`[GitHistoryProvider][provideHistoryItems] Failed to get history items with options '${JSON.stringify(options)}': ${err}`);
+			return [];
+		}
 	}
 
 	async provideHistoryItemChanges(historyItemId: string, historyItemParentId: string | undefined): Promise<SourceControlHistoryItemChange[]> {
-		if (!historyItemParentId) {
-			const commit = await this.repository.getCommit(historyItemId);
-			historyItemParentId = commit.parents.length > 0 ? commit.parents[0] : `${historyItemId}^`;
-		}
+		historyItemParentId = historyItemParentId ?? await this.repository.getEmptyTree();
 
 		const historyItemChangesUri: Uri[] = [];
 		const historyItemChanges: SourceControlHistoryItemChange[] = [];
-		const changes = await this.repository.diffBetween(historyItemParentId, historyItemId);
+		const changes = await this.repository.diffTrees(historyItemParentId, historyItemId);
 
 		for (const change of changes) {
 			const historyItemUri = change.uri.with({
@@ -159,29 +305,36 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec
 		return historyItemChanges;
 	}
 
-	async resolveHistoryItemGroupCommonAncestor(historyItemId1: string, historyItemId2: string | undefined): Promise<{ id: string; ahead: number; behind: number } | undefined> {
-		if (!historyItemId2) {
-			const upstreamRef = await this.resolveHistoryItemGroupBase(historyItemId1);
-			if (!upstreamRef) {
-				this.logger.info(`GitHistoryProvider:resolveHistoryItemGroupCommonAncestor - Failed to resolve history item group base for '${historyItemId1}'`);
-				return undefined;
-			}
-
-			historyItemId2 = `refs/remotes/${upstreamRef.remote}/${upstreamRef.name}`;
-		}
-
-		const ancestor = await this.repository.getMergeBase(historyItemId1, historyItemId2);
-		if (!ancestor) {
-			this.logger.info(`GitHistoryProvider:resolveHistoryItemGroupCommonAncestor - Failed to resolve common ancestor for '${historyItemId1}' and '${historyItemId2}'`);
-			return undefined;
-		}
-
+	async resolveHistoryItemRefsCommonAncestor(historyItemRefs: string[]): Promise<string | undefined> {
 		try {
-			const commitCount = await this.repository.getCommitCount(`${historyItemId1}...${historyItemId2}`);
-			this.logger.trace(`GitHistoryProvider:resolveHistoryItemGroupCommonAncestor - Resolved common ancestor for '${historyItemId1}' and '${historyItemId2}': ${JSON.stringify({ id: ancestor, ahead: commitCount.ahead, behind: commitCount.behind })}`);
-			return { id: ancestor, ahead: commitCount.ahead, behind: commitCount.behind };
-		} catch (err) {
-			this.logger.error(`GitHistoryProvider:resolveHistoryItemGroupCommonAncestor - Failed to get ahead/behind for '${historyItemId1}...${historyItemId2}': ${err.message}`);
+			if (historyItemRefs.length === 0) {
+				// TODO@lszomoru - log
+				return undefined;
+			} else if (historyItemRefs.length === 1 && historyItemRefs[0] === this.currentHistoryItemRef?.id) {
+				// Remote
+				if (this.currentHistoryItemRemoteRef) {
+					const ancestor = await this.repository.getMergeBase(historyItemRefs[0], this.currentHistoryItemRemoteRef.id);
+					return ancestor;
+				}
+
+				// Base
+				if (this.currentHistoryItemBaseRef) {
+					const ancestor = await this.repository.getMergeBase(historyItemRefs[0], this.currentHistoryItemBaseRef.id);
+					return ancestor;
+				}
+
+				// First commit
+				const commits = await this.repository.log({ maxParents: 0, refNames: ['HEAD'] });
+				if (commits.length > 0) {
+					return commits[0].hash;
+				}
+			} else if (historyItemRefs.length > 1) {
+				const ancestor = await this.repository.getMergeBase(historyItemRefs[0], historyItemRefs[1], ...historyItemRefs.slice(2));
+				return ancestor;
+			}
+		}
+		catch (err) {
+			this.logger.error(`[GitHistoryProvider][resolveHistoryItemRefsCommonAncestor] Failed to resolve common ancestor for ${historyItemRefs.join(',')}: ${err}`);
 		}
 
 		return undefined;
@@ -191,32 +344,61 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec
 		return this.historyItemDecorations.get(uri.toString());
 	}
 
-	private async resolveHistoryItemGroupBase(historyItemId: string): Promise<UpstreamRef | undefined> {
-		try {
-			// Upstream
-			const branch = await this.repository.getBranch(historyItemId);
-			if (branch.upstream) {
-				return branch.upstream;
-			}
+	private _resolveHistoryItemRefs(commit: Commit): SourceControlHistoryItemRef[] {
+		const references: SourceControlHistoryItemRef[] = [];
 
-			// Base (config -> reflog -> default)
-			const remoteBranch = await this.repository.getBranchBase(historyItemId);
-			if (!remoteBranch?.remote || !remoteBranch?.name || !remoteBranch?.commit || remoteBranch?.type !== RefType.RemoteHead) {
-				this.logger.info(`GitHistoryProvider:resolveHistoryItemGroupBase - Failed to resolve history item group base for '${historyItemId}'`);
+		for (const ref of commit.refNames) {
+			switch (true) {
+				case ref.startsWith('HEAD -> refs/heads/'):
+					references.push({
+						id: ref.substring('HEAD -> '.length),
+						name: ref.substring('HEAD -> refs/heads/'.length),
+						revision: commit.hash,
+						icon: new ThemeIcon('target')
+					});
+					break;
+				case ref.startsWith('refs/heads/'):
+					references.push({
+						id: ref,
+						name: ref.substring('refs/heads/'.length),
+						revision: commit.hash,
+						icon: new ThemeIcon('git-branch')
+					});
+					break;
+				case ref.startsWith('refs/remotes/'):
+					references.push({
+						id: ref,
+						name: ref.substring('refs/remotes/'.length),
+						revision: commit.hash,
+						icon: new ThemeIcon('cloud')
+					});
+					break;
+				case ref.startsWith('tag: refs/tags/'):
+					references.push({
+						id: ref.substring('tag: '.length),
+						name: ref.substring('tag: refs/tags/'.length),
+						revision: commit.hash,
+						icon: new ThemeIcon('tag')
+					});
+					break;
+			}
+		}
+
+		return references.sort(compareSourceControlHistoryItemRef);
+	}
+
+	private async resolveHEADMergeBase(): Promise<Branch | undefined> {
+		try {
+			if (this.repository.HEAD?.type !== RefType.Head || !this.repository.HEAD?.name) {
 				return undefined;
 			}
 
-			return {
-				name: remoteBranch.name,
-				remote: remoteBranch.remote,
-				commit: remoteBranch.commit
-			};
+			const mergeBase = await this.repository.getBranchBase(this.repository.HEAD.name);
+			return mergeBase;
+		} catch (err) {
+			this.logger.error(`[GitHistoryProvider][resolveHEADMergeBase] Failed to resolve merge base for ${this.repository.HEAD?.name}: ${err}`);
+			return undefined;
 		}
-		catch (err) {
-			this.logger.error(`GitHistoryProvider:resolveHistoryItemGroupBase - Failed to get branch base for '${historyItemId}': ${err.message}`);
-		}
-
-		return undefined;
 	}
 
 	dispose(): void {
diff --git a/extensions/git/src/main.ts b/extensions/git/src/main.ts
index c2d9b974be7..aa4d98adc8b 100644
--- a/extensions/git/src/main.ts
+++ b/extensions/git/src/main.ts
@@ -20,7 +20,7 @@ import * as fs from 'fs';
 import * as os from 'os';
 import { GitTimelineProvider } from './timelineProvider';
 import { registerAPICommands } from './api/api1';
-import { TerminalEnvironmentManager } from './terminal';
+import { TerminalEnvironmentManager, TerminalShellExecutionManager } from './terminal';
 import { createIPCServer, IPCServer } from './ipc/ipcServer';
 import { GitEditor } from './gitEditor';
 import { GitPostCommitCommandsProvider } from './postCommitCommands';
@@ -48,7 +48,7 @@ async function createModel(context: ExtensionContext, logger: LogOutputChannel,
 	}
 
 	const info = await findGit(pathHints, gitPath => {
-		logger.info(l10n.t('Validating found git in: "{0}"', gitPath));
+		logger.info(l10n.t('[main] Validating found git in: "{0}"', gitPath));
 		if (excludes.length === 0) {
 			return true;
 		}
@@ -56,7 +56,7 @@ async function createModel(context: ExtensionContext, logger: LogOutputChannel,
 		const normalized = path.normalize(gitPath).replace(/[\r\n]+$/, '');
 		const skip = excludes.some(e => normalized.startsWith(e));
 		if (skip) {
-			logger.info(l10n.t('Skipped found git in: "{0}"', gitPath));
+			logger.info(l10n.t('[main] Skipped found git in: "{0}"', gitPath));
 		}
 		return !skip;
 	}, logger);
@@ -66,7 +66,7 @@ async function createModel(context: ExtensionContext, logger: LogOutputChannel,
 	try {
 		ipcServer = await createIPCServer(context.storagePath);
 	} catch (err) {
-		logger.error(`Failed to create git IPC: ${err}`);
+		logger.error(`[main] Failed to create git IPC: ${err}`);
 	}
 
 	const askpass = new Askpass(ipcServer);
@@ -79,7 +79,7 @@ async function createModel(context: ExtensionContext, logger: LogOutputChannel,
 	const terminalEnvironmentManager = new TerminalEnvironmentManager(context, [askpass, gitEditor, ipcServer]);
 	disposables.push(terminalEnvironmentManager);
 
-	logger.info(l10n.t('Using git "{0}" from "{1}"', info.version, info.path));
+	logger.info(l10n.t('[main] Using git "{0}" from "{1}"', info.version, info.path));
 
 	const git = new Git({
 		gitPath: info.path,
@@ -113,7 +113,8 @@ async function createModel(context: ExtensionContext, logger: LogOutputChannel,
 		new GitFileSystemProvider(model),
 		new GitDecorations(model),
 		new GitTimelineProvider(model, cc),
-		new GitEditSessionIdentityProvider(model)
+		new GitEditSessionIdentityProvider(model),
+		new TerminalShellExecutionManager(model, logger)
 	);
 
 	const postCommitCommandsProvider = new GitPostCommitCommandsProvider();
@@ -187,7 +188,7 @@ export async function _activate(context: ExtensionContext): Promise<GitExtension
 	disposables.push(logger);
 
 	const onDidChangeLogLevel = (logLevel: LogLevel) => {
-		logger.appendLine(l10n.t('Log level: {0}', LogLevel[logLevel]));
+		logger.appendLine(l10n.t('[main] Log level: {0}', LogLevel[logLevel]));
 	};
 	disposables.push(logger.onDidChangeLogLevel(onDidChangeLogLevel));
 	onDidChangeLogLevel(logger.logLevel);
@@ -212,13 +213,13 @@ export async function _activate(context: ExtensionContext): Promise<GitExtension
 		const model = await createModel(context, logger, telemetryReporter, disposables);
 		return new GitExtensionImpl(model);
 	} catch (err) {
+		console.warn(err.message);
+		logger.warn(`[main] Failed to create model: ${err}`);
+
 		if (!/Git installation not found/.test(err.message || '')) {
 			throw err;
 		}
 
-		console.warn(err.message);
-		logger.warn(err.message);
-
 		/* __GDPR__
 			"git.missing" : {
 				"owner": "lszomoru"
diff --git a/extensions/git/src/model.ts b/extensions/git/src/model.ts
index cca0c84af1c..48e66d5e9ff 100644
--- a/extensions/git/src/model.ts
+++ b/extensions/git/src/model.ts
@@ -287,10 +287,14 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi
 	}
 
 	private async doInitialScan(): Promise<void> {
+		this.logger.info('[Model][doInitialScan] Initial repository scan started');
+
 		const config = workspace.getConfiguration('git');
 		const autoRepositoryDetection = config.get<boolean | 'subFolders' | 'openEditors'>('autoRepositoryDetection');
 		const parentRepositoryConfig = config.get<'always' | 'never' | 'prompt'>('openRepositoryInParentFolders', 'prompt');
 
+		this.logger.trace(`[Model][doInitialScan] Settings: autoRepositoryDetection=${autoRepositoryDetection}, openRepositoryInParentFolders=${parentRepositoryConfig}`);
+
 		// Initial repository scan function
 		const initialScanFn = () => Promise.all([
 			this.onDidChangeWorkspaceFolders({ added: workspace.workspaceFolders || [], removed: [] }),
@@ -321,6 +325,7 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi
 			}
 		*/
 		this.telemetryReporter.sendTelemetryEvent('git.repositoryInitialScan', { autoRepositoryDetection: String(autoRepositoryDetection) }, { repositoryCount: this.openRepositories.length });
+		this.logger.info(`[Model][doInitialScan] Initial repository scan completed - repositories (${this.repositories.length}), closed repositories (${this.closedRepositories.length}), parent repositories (${this.parentRepositories.length}), unsafe repositories (${this.unsafeRepositories.length})`);
 	}
 
 	/**
@@ -329,47 +334,51 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi
 	 * the git.repositoryScanMaxDepth setting.
 	 */
 	private async scanWorkspaceFolders(): Promise<void> {
-		const config = workspace.getConfiguration('git');
-		const autoRepositoryDetection = config.get<boolean | 'subFolders' | 'openEditors'>('autoRepositoryDetection');
-		this.logger.trace(`[swsf] Scan workspace sub folders. autoRepositoryDetection=${autoRepositoryDetection}`);
+		try {
+			const config = workspace.getConfiguration('git');
+			const autoRepositoryDetection = config.get<boolean | 'subFolders' | 'openEditors'>('autoRepositoryDetection');
 
-		if (autoRepositoryDetection !== true && autoRepositoryDetection !== 'subFolders') {
-			return;
-		}
-
-		await Promise.all((workspace.workspaceFolders || []).map(async folder => {
-			const root = folder.uri.fsPath;
-			this.logger.trace(`[swsf] Workspace folder: ${root}`);
-
-			// Workspace folder children
-			const repositoryScanMaxDepth = (workspace.isTrusted ? workspace.getConfiguration('git', folder.uri) : config).get<number>('repositoryScanMaxDepth', 1);
-			const repositoryScanIgnoredFolders = (workspace.isTrusted ? workspace.getConfiguration('git', folder.uri) : config).get<string[]>('repositoryScanIgnoredFolders', []);
-
-			const subfolders = new Set(await this.traverseWorkspaceFolder(root, repositoryScanMaxDepth, repositoryScanIgnoredFolders));
-
-			// Repository scan folders
-			const scanPaths = (workspace.isTrusted ? workspace.getConfiguration('git', folder.uri) : config).get<string[]>('scanRepositories') || [];
-			this.logger.trace(`[swsf] Workspace scan settings: repositoryScanMaxDepth=${repositoryScanMaxDepth}; repositoryScanIgnoredFolders=[${repositoryScanIgnoredFolders.join(', ')}]; scanRepositories=[${scanPaths.join(', ')}]`);
-
-			for (const scanPath of scanPaths) {
-				if (scanPath === '.git') {
-					this.logger.trace('[swsf] \'.git\' not supported in \'git.scanRepositories\' setting.');
-					continue;
-				}
-
-				if (path.isAbsolute(scanPath)) {
-					const notSupportedMessage = l10n.t('Absolute paths not supported in "git.scanRepositories" setting.');
-					this.logger.warn(notSupportedMessage);
-					console.warn(notSupportedMessage);
-					continue;
-				}
-
-				subfolders.add(path.join(root, scanPath));
+			if (autoRepositoryDetection !== true && autoRepositoryDetection !== 'subFolders') {
+				return;
 			}
 
-			this.logger.trace(`[swsf] Workspace scan sub folders: [${[...subfolders].join(', ')}]`);
-			await Promise.all([...subfolders].map(f => this.openRepository(f)));
-		}));
+			await Promise.all((workspace.workspaceFolders || []).map(async folder => {
+				const root = folder.uri.fsPath;
+				this.logger.trace(`[Model][scanWorkspaceFolders] Workspace folder: ${root}`);
+
+				// Workspace folder children
+				const repositoryScanMaxDepth = (workspace.isTrusted ? workspace.getConfiguration('git', folder.uri) : config).get<number>('repositoryScanMaxDepth', 1);
+				const repositoryScanIgnoredFolders = (workspace.isTrusted ? workspace.getConfiguration('git', folder.uri) : config).get<string[]>('repositoryScanIgnoredFolders', []);
+
+				const subfolders = new Set(await this.traverseWorkspaceFolder(root, repositoryScanMaxDepth, repositoryScanIgnoredFolders));
+
+				// Repository scan folders
+				const scanPaths = (workspace.isTrusted ? workspace.getConfiguration('git', folder.uri) : config).get<string[]>('scanRepositories') || [];
+				this.logger.trace(`[Model][scanWorkspaceFolders] Workspace scan settings: repositoryScanMaxDepth=${repositoryScanMaxDepth}; repositoryScanIgnoredFolders=[${repositoryScanIgnoredFolders.join(', ')}]; scanRepositories=[${scanPaths.join(', ')}]`);
+
+				for (const scanPath of scanPaths) {
+					if (scanPath === '.git') {
+						this.logger.trace('[Model][scanWorkspaceFolders] \'.git\' not supported in \'git.scanRepositories\' setting.');
+						continue;
+					}
+
+					if (path.isAbsolute(scanPath)) {
+						const notSupportedMessage = l10n.t('Absolute paths not supported in "git.scanRepositories" setting.');
+						this.logger.warn(`[Model][scanWorkspaceFolders] ${notSupportedMessage}`);
+						console.warn(notSupportedMessage);
+						continue;
+					}
+
+					subfolders.add(path.join(root, scanPath));
+				}
+
+				this.logger.trace(`[Model][scanWorkspaceFolders] Workspace scan sub folders: [${[...subfolders].join(', ')}]`);
+				await Promise.all([...subfolders].map(f => this.openRepository(f)));
+			}));
+		}
+		catch (err) {
+			this.logger.warn(`[Model][scanWorkspaceFolders] Error: ${err}`);
+		}
 	}
 
 	private async traverseWorkspaceFolder(workspaceFolder: string, maxDepth: number, repositoryScanIgnoredFolders: string[]): Promise<string[]> {
@@ -388,7 +397,7 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi
 				}
 			}
 			catch (err) {
-				this.logger.warn(`[swsf] Unable to read folder '${currentFolder.path}': ${err}`);
+				this.logger.warn(`[Model][traverseWorkspaceFolder] Unable to read workspace folder '${currentFolder.path}': ${err}`);
 				continue;
 			}
 
@@ -434,23 +443,28 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi
 	}
 
 	private async onDidChangeWorkspaceFolders({ added, removed }: WorkspaceFoldersChangeEvent): Promise<void> {
-		const possibleRepositoryFolders = added
-			.filter(folder => !this.getOpenRepository(folder.uri));
+		try {
+			const possibleRepositoryFolders = added
+				.filter(folder => !this.getOpenRepository(folder.uri));
 
-		const activeRepositoriesList = window.visibleTextEditors
-			.map(editor => this.getRepository(editor.document.uri))
-			.filter(repository => !!repository) as Repository[];
+			const activeRepositoriesList = window.visibleTextEditors
+				.map(editor => this.getRepository(editor.document.uri))
+				.filter(repository => !!repository) as Repository[];
 
-		const activeRepositories = new Set<Repository>(activeRepositoriesList);
-		const openRepositoriesToDispose = removed
-			.map(folder => this.getOpenRepository(folder.uri))
-			.filter(r => !!r)
-			.filter(r => !activeRepositories.has(r!.repository))
-			.filter(r => !(workspace.workspaceFolders || []).some(f => isDescendant(f.uri.fsPath, r!.repository.root))) as OpenRepository[];
+			const activeRepositories = new Set<Repository>(activeRepositoriesList);
+			const openRepositoriesToDispose = removed
+				.map(folder => this.getOpenRepository(folder.uri))
+				.filter(r => !!r)
+				.filter(r => !activeRepositories.has(r!.repository))
+				.filter(r => !(workspace.workspaceFolders || []).some(f => isDescendant(f.uri.fsPath, r!.repository.root))) as OpenRepository[];
 
-		openRepositoriesToDispose.forEach(r => r.dispose());
-		this.logger.trace(`[swf] Scan workspace folders: [${possibleRepositoryFolders.map(p => p.uri.fsPath).join(', ')}]`);
-		await Promise.all(possibleRepositoryFolders.map(p => this.openRepository(p.uri.fsPath)));
+			openRepositoriesToDispose.forEach(r => r.dispose());
+			this.logger.trace(`[Model][onDidChangeWorkspaceFolders] Workspace folders: [${possibleRepositoryFolders.map(p => p.uri.fsPath).join(', ')}]`);
+			await Promise.all(possibleRepositoryFolders.map(p => this.openRepository(p.uri.fsPath)));
+		}
+		catch (err) {
+			this.logger.warn(`[Model][onDidChangeWorkspaceFolders] Error: ${err}`);
+		}
 	}
 
 	private onDidChangeConfiguration(): void {
@@ -463,50 +477,54 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi
 			.filter(({ root }) => workspace.getConfiguration('git', root).get<boolean>('enabled') !== true)
 			.map(({ repository }) => repository);
 
-		this.logger.trace(`[swf] Scan workspace folders: [${possibleRepositoryFolders.map(p => p.uri.fsPath).join(', ')}]`);
+		this.logger.trace(`[Model][onDidChangeConfiguration] Workspace folders: [${possibleRepositoryFolders.map(p => p.uri.fsPath).join(', ')}]`);
 		possibleRepositoryFolders.forEach(p => this.openRepository(p.uri.fsPath));
 		openRepositoriesToDispose.forEach(r => r.dispose());
 	}
 
 	private async onDidChangeVisibleTextEditors(editors: readonly TextEditor[]): Promise<void> {
-		if (!workspace.isTrusted) {
-			this.logger.trace('[svte] Workspace is not trusted.');
-			return;
-		}
-
-		const config = workspace.getConfiguration('git');
-		const autoRepositoryDetection = config.get<boolean | 'subFolders' | 'openEditors'>('autoRepositoryDetection');
-		this.logger.trace(`[svte] Scan visible text editors. autoRepositoryDetection=${autoRepositoryDetection}`);
-
-		if (autoRepositoryDetection !== true && autoRepositoryDetection !== 'openEditors') {
-			return;
-		}
-
-		await Promise.all(editors.map(async editor => {
-			const uri = editor.document.uri;
-
-			if (uri.scheme !== 'file') {
+		try {
+			if (!workspace.isTrusted) {
+				this.logger.trace('[Model][onDidChangeVisibleTextEditors] Workspace is not trusted.');
 				return;
 			}
 
-			const repository = this.getRepository(uri);
+			const config = workspace.getConfiguration('git');
+			const autoRepositoryDetection = config.get<boolean | 'subFolders' | 'openEditors'>('autoRepositoryDetection');
 
-			if (repository) {
-				this.logger.trace(`[svte] Repository for editor resource ${uri.fsPath} already exists: ${repository.root}`);
+			if (autoRepositoryDetection !== true && autoRepositoryDetection !== 'openEditors') {
 				return;
 			}
 
-			this.logger.trace(`[svte] Open repository for editor resource ${uri.fsPath}`);
-			await this.openRepository(path.dirname(uri.fsPath));
-		}));
+			await Promise.all(editors.map(async editor => {
+				const uri = editor.document.uri;
+
+				if (uri.scheme !== 'file') {
+					return;
+				}
+
+				const repository = this.getRepository(uri);
+
+				if (repository) {
+					this.logger.trace(`[Model][onDidChangeVisibleTextEditors] Repository for editor resource ${uri.fsPath} already exists: ${repository.root}`);
+					return;
+				}
+
+				this.logger.trace(`[Model][onDidChangeVisibleTextEditors] Open repository for editor resource ${uri.fsPath}`);
+				await this.openRepository(path.dirname(uri.fsPath));
+			}));
+		}
+		catch (err) {
+			this.logger.warn(`[Model][onDidChangeVisibleTextEditors] Error: ${err}`);
+		}
 	}
 
 	@sequentialize
 	async openRepository(repoPath: string, openIfClosed = false): Promise<void> {
-		this.logger.trace(`Opening repository: ${repoPath}`);
+		this.logger.trace(`[Model][openRepository] Repository: ${repoPath}`);
 		const existingRepository = await this.getRepositoryExact(repoPath);
 		if (existingRepository) {
-			this.logger.trace(`Repository for path ${repoPath} already exists: ${existingRepository.root}`);
+			this.logger.trace(`[Model][openRepository] Repository for path ${repoPath} already exists: ${existingRepository.root}`);
 			return;
 		}
 
@@ -514,7 +532,7 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi
 		const enabled = config.get<boolean>('enabled') === true;
 
 		if (!enabled) {
-			this.logger.trace('Git is not enabled');
+			this.logger.trace('[Model][openRepository] Git is not enabled');
 			return;
 		}
 
@@ -524,7 +542,7 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi
 				fs.accessSync(path.join(repoPath, 'HEAD'), fs.constants.F_OK);
 				const result = await this.git.exec(repoPath, ['-C', repoPath, 'rev-parse', '--show-cdup']);
 				if (result.stderr.trim() === '' && result.stdout.trim() === '') {
-					this.logger.trace(`Bare repository: ${repoPath}`);
+					this.logger.trace(`[Model][openRepository] Bare repository: ${repoPath}`);
 					return;
 				}
 			} catch {
@@ -534,16 +552,16 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi
 
 		try {
 			const { repositoryRoot, unsafeRepositoryMatch } = await this.getRepositoryRoot(repoPath);
-			this.logger.trace(`Repository root for path ${repoPath} is: ${repositoryRoot}`);
+			this.logger.trace(`[Model][openRepository] Repository root for path ${repoPath} is: ${repositoryRoot}`);
 
 			const existingRepository = await this.getRepositoryExact(repositoryRoot);
 			if (existingRepository) {
-				this.logger.trace(`Repository for path ${repositoryRoot} already exists: ${existingRepository.root}`);
+				this.logger.trace(`[Model][openRepository] Repository for path ${repositoryRoot} already exists: ${existingRepository.root}`);
 				return;
 			}
 
 			if (this.shouldRepositoryBeIgnored(repositoryRoot)) {
-				this.logger.trace(`Repository for path ${repositoryRoot} is ignored`);
+				this.logger.trace(`[Model][openRepository] Repository for path ${repositoryRoot} is ignored`);
 				return;
 			}
 
@@ -552,7 +570,7 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi
 			if (parentRepositoryConfig !== 'always' && this.globalState.get<boolean>(`parentRepository:${repositoryRoot}`) !== true) {
 				const isRepositoryOutsideWorkspace = await this.isRepositoryOutsideWorkspace(repositoryRoot);
 				if (isRepositoryOutsideWorkspace) {
-					this.logger.trace(`Repository in parent folder: ${repositoryRoot}`);
+					this.logger.trace(`[Model][openRepository] Repository in parent folder: ${repositoryRoot}`);
 
 					if (!this._parentRepositoriesManager.hasRepository(repositoryRoot)) {
 						// Show a notification if the parent repository is opened after the initial scan
@@ -569,7 +587,7 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi
 
 			// Handle unsafe repositories
 			if (unsafeRepositoryMatch && unsafeRepositoryMatch.length === 3) {
-				this.logger.trace(`Unsafe repository: ${repositoryRoot}`);
+				this.logger.trace(`[Model][openRepository] Unsafe repository: ${repositoryRoot}`);
 
 				// Show a notification if the unsafe repository is opened after the initial scan
 				if (this._state === 'initialized' && !this._unsafeRepositoriesManager.hasRepository(repositoryRoot)) {
@@ -583,7 +601,7 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi
 
 			// Handle repositories that were closed by the user
 			if (!openIfClosed && this._closedRepositoriesManager.isRepositoryClosed(repositoryRoot)) {
-				this.logger.trace(`Repository for path ${repositoryRoot} is closed`);
+				this.logger.trace(`[Model][openRepository] Repository for path ${repositoryRoot} is closed`);
 				return;
 			}
 
@@ -594,12 +612,14 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi
 			this.open(repository);
 			this._closedRepositoriesManager.deleteRepository(repository.root);
 
+			this.logger.info(`[Model][openRepository] Opened repository: ${repository.root}`);
+
 			// Do not await this, we want SCM
 			// to know about the repo asap
 			repository.status();
 		} catch (err) {
 			// noop
-			this.logger.trace(`Opening repository for path='${repoPath}' failed; ex=${err}`);
+			this.logger.trace(`[Model][openRepository] Opening repository for path='${repoPath}' failed. Error:${err}`);
 		}
 	}
 
@@ -631,7 +651,7 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi
 			const repositoryRootRealPath = await fs.promises.realpath(repositoryRoot);
 			return !pathEquals(repositoryRoot, repositoryRootRealPath) ? repositoryRootRealPath : undefined;
 		} catch (err) {
-			this.logger.warn(`Failed to get repository realpath for: "${repositoryRoot}". ${err}`);
+			this.logger.warn(`[Model][getRepositoryRootRealPath] Failed to get repository realpath for "${repositoryRoot}": ${err}`);
 			return undefined;
 		}
 	}
@@ -658,7 +678,7 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi
 	}
 
 	private open(repository: Repository): void {
-		this.logger.info(`Open repository: ${repository.root}`);
+		this.logger.trace(`[Model][open] Repository: ${repository.root}`);
 
 		const onDidDisappearRepository = filterEvent(repository.onDidChangeState, state => state === RepositoryState.Disposed);
 		const disappearListener = onDidDisappearRepository(() => dispose());
@@ -675,7 +695,7 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi
 
 		const checkForSubmodules = () => {
 			if (!shouldDetectSubmodules) {
-				this.logger.trace('Automatic detection of git submodules is not enabled.');
+				this.logger.trace('[Model][open] Automatic detection of git submodules is not enabled.');
 				return;
 			}
 
@@ -688,7 +708,7 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi
 				.slice(0, submodulesLimit)
 				.map(r => path.join(repository.root, r.path))
 				.forEach(p => {
-					this.logger.trace(`Opening submodule: '${p}'`);
+					this.logger.trace(`[Model][open] Opening submodule: '${p}'`);
 					this.eventuallyScanPossibleGitRepository(p);
 				});
 		};
@@ -750,7 +770,7 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi
 			return;
 		}
 
-		this.logger.info(`Close repository: ${repository.root}`);
+		this.logger.info(`[Model][close] Repository: ${repository.root}`);
 		this._closedRepositoriesManager.addRepository(openRepository.repository.root);
 
 		openRepository.dispose();
@@ -803,7 +823,7 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi
 
 			return openRepositoryRealPath?.repository;
 		} catch (err) {
-			this.logger.warn(`Failed to get repository realpath for: "${repoPath}". ${err}`);
+			this.logger.warn(`[Model][getRepositoryExact] Failed to get repository realpath for: "${repoPath}". Error:${err}`);
 			return undefined;
 		}
 	}
@@ -989,7 +1009,7 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi
 				this._workspaceFolders.set(workspaceFolder.uri.fsPath, result);
 			} catch (err) {
 				// noop - Workspace folder does not exist
-				this.logger.trace(`Failed to resolve workspace folder: "${workspaceFolder.uri.fsPath}". ${err}`);
+				this.logger.trace(`[Model][getWorkspaceFolderRealPath] Failed to resolve workspace folder "${workspaceFolder.uri.fsPath}". Error:${err}`);
 			}
 		}
 
diff --git a/extensions/git/src/operation.ts b/extensions/git/src/operation.ts
index 223f1945b02..294c72f3206 100644
--- a/extensions/git/src/operation.ts
+++ b/extensions/git/src/operation.ts
@@ -2,6 +2,7 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+/* eslint-disable local/code-no-dangerous-type-assertions */
 
 import { LogOutputChannel } from 'vscode';
 
@@ -131,7 +132,7 @@ export type SyncOperation = BaseOperation & { kind: OperationKind.Sync };
 export type TagOperation = BaseOperation & { kind: OperationKind.Tag };
 
 export const Operation = {
-	Add: (showProgress: boolean) => ({ kind: OperationKind.Add, blocking: false, readOnly: false, remote: false, retry: false, showProgress } as AddOperation),
+	Add: (showProgress: boolean): AddOperation => ({ kind: OperationKind.Add, blocking: false, readOnly: false, remote: false, retry: false, showProgress }),
 	Apply: { kind: OperationKind.Apply, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as ApplyOperation,
 	Blame: { kind: OperationKind.Blame, blocking: false, readOnly: true, remote: false, retry: false, showProgress: true } as BlameOperation,
 	Branch: { kind: OperationKind.Branch, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as BranchOperation,
@@ -141,7 +142,7 @@ export const Operation = {
 	CheckoutTracking: (refLabel: string) => ({ kind: OperationKind.CheckoutTracking, blocking: true, readOnly: false, remote: false, retry: false, showProgress: true, refLabel } as CheckoutTrackingOperation),
 	Clean: (showProgress: boolean) => ({ kind: OperationKind.Clean, blocking: false, readOnly: false, remote: false, retry: false, showProgress } as CleanOperation),
 	Commit: { kind: OperationKind.Commit, blocking: true, readOnly: false, remote: false, retry: false, showProgress: true } as CommitOperation,
-	Config: (readOnly: boolean) => ({ kind: OperationKind.Config, blocking: false, readOnly, remote: false, retry: false, showProgress: true } as ConfigOperation),
+	Config: (readOnly: boolean) => ({ kind: OperationKind.Config, blocking: false, readOnly, remote: false, retry: false, showProgress: false } as ConfigOperation),
 	DeleteBranch: { kind: OperationKind.DeleteBranch, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as DeleteBranchOperation,
 	DeleteRef: { kind: OperationKind.DeleteRef, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as DeleteRefOperation,
 	DeleteRemoteTag: { kind: OperationKind.DeleteRemoteTag, blocking: false, readOnly: false, remote: true, retry: false, showProgress: true } as DeleteRemoteTagOperation,
@@ -149,7 +150,7 @@ export const Operation = {
 	Diff: { kind: OperationKind.Diff, blocking: false, readOnly: true, remote: false, retry: false, showProgress: false } as DiffOperation,
 	Fetch: (showProgress: boolean) => ({ kind: OperationKind.Fetch, blocking: false, readOnly: false, remote: true, retry: true, showProgress } as FetchOperation),
 	FindTrackingBranches: { kind: OperationKind.FindTrackingBranches, blocking: false, readOnly: true, remote: false, retry: false, showProgress: true } as FindTrackingBranchesOperation,
-	GetBranch: { kind: OperationKind.GetBranch, blocking: false, readOnly: true, remote: false, retry: false, showProgress: true } as GetBranchOperation,
+	GetBranch: { kind: OperationKind.GetBranch, blocking: false, readOnly: true, remote: false, retry: false, showProgress: false } as GetBranchOperation,
 	GetBranches: { kind: OperationKind.GetBranches, blocking: false, readOnly: true, remote: false, retry: false, showProgress: true } as GetBranchesOperation,
 	GetCommitTemplate: { kind: OperationKind.GetCommitTemplate, blocking: false, readOnly: true, remote: false, retry: false, showProgress: true } as GetCommitTemplateOperation,
 	GetObjectDetails: { kind: OperationKind.GetObjectDetails, blocking: false, readOnly: true, remote: false, retry: false, showProgress: false } as GetObjectDetailsOperation,
@@ -158,7 +159,7 @@ export const Operation = {
 	GetRemoteRefs: { kind: OperationKind.GetRemoteRefs, blocking: false, readOnly: true, remote: true, retry: false, showProgress: false } as GetRemoteRefsOperation,
 	HashObject: { kind: OperationKind.HashObject, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as HashObjectOperation,
 	Ignore: { kind: OperationKind.Ignore, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as IgnoreOperation,
-	Log: { kind: OperationKind.Log, blocking: false, readOnly: true, remote: false, retry: false, showProgress: true } as LogOperation,
+	Log: (showProgress: boolean) => ({ kind: OperationKind.Log, blocking: false, readOnly: true, remote: false, retry: false, showProgress }) as LogOperation,
 	LogFile: { kind: OperationKind.LogFile, blocking: false, readOnly: true, remote: false, retry: false, showProgress: false } as LogFileOperation,
 	Merge: { kind: OperationKind.Merge, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as MergeOperation,
 	MergeAbort: { kind: OperationKind.MergeAbort, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as MergeAbortOperation,
@@ -214,7 +215,7 @@ export class OperationManager implements IOperationManager {
 			this.operations.set(operation.kind, new Set([operation]));
 		}
 
-		this.logger.trace(`Operation start: ${operation.kind} (blocking: ${operation.blocking}, readOnly: ${operation.readOnly}; retry: ${operation.retry}; showProgress: ${operation.showProgress})`);
+		this.logger.trace(`[OperationManager][start] ${operation.kind} (blocking: ${operation.blocking}, readOnly: ${operation.readOnly}; retry: ${operation.retry}; showProgress: ${operation.showProgress})`);
 	}
 
 	end(operation: Operation): void {
@@ -226,7 +227,7 @@ export class OperationManager implements IOperationManager {
 			}
 		}
 
-		this.logger.trace(`Operation end: ${operation.kind} (blocking: ${operation.blocking}, readOnly: ${operation.readOnly}; retry: ${operation.retry}; showProgress: ${operation.showProgress})`);
+		this.logger.trace(`[OperationManager][end] ${operation.kind} (blocking: ${operation.blocking}, readOnly: ${operation.readOnly}; retry: ${operation.retry}; showProgress: ${operation.showProgress})`);
 	}
 
 	getOperations(operationKind: OperationKind): Operation[] {
diff --git a/extensions/git/src/protocolHandler.ts b/extensions/git/src/protocolHandler.ts
index dc73fe39965..90491fecd50 100644
--- a/extensions/git/src/protocolHandler.ts
+++ b/extensions/git/src/protocolHandler.ts
@@ -22,7 +22,7 @@ export class GitProtocolHandler implements UriHandler {
 	}
 
 	handleUri(uri: Uri): void {
-		this.logger.info(`GitProtocolHandler.handleUri(${uri.toString()})`);
+		this.logger.info(`[GitProtocolHandler][handleUri] URI:(${uri.toString()})`);
 
 		switch (uri.path) {
 			case '/clone': this.clone(uri);
@@ -34,17 +34,17 @@ export class GitProtocolHandler implements UriHandler {
 		const ref = data.ref;
 
 		if (!data.url) {
-			this.logger.warn('Failed to open URI:' + uri.toString());
+			this.logger.warn('[GitProtocolHandler][clone] Failed to open URI:' + uri.toString());
 			return;
 		}
 
 		if (Array.isArray(data.url) && data.url.length === 0) {
-			this.logger.warn('Failed to open URI:' + uri.toString());
+			this.logger.warn('[GitProtocolHandler][clone] Failed to open URI:' + uri.toString());
 			return;
 		}
 
 		if (ref !== undefined && typeof ref !== 'string') {
-			this.logger.warn('Failed to open URI due to multiple references:' + uri.toString());
+			this.logger.warn('[GitProtocolHandler][clone] Failed to open URI due to multiple references:' + uri.toString());
 			return;
 		}
 
@@ -69,12 +69,12 @@ export class GitProtocolHandler implements UriHandler {
 			}
 		}
 		catch (ex) {
-			this.logger.warn('Invalid URI:' + uri.toString());
+			this.logger.warn('[GitProtocolHandler][clone] Invalid URI:' + uri.toString());
 			return;
 		}
 
 		if (!(await commands.getCommands(true)).includes('git.clone')) {
-			this.logger.error('Could not complete git clone operation as git installation was not found.');
+			this.logger.error('[GitProtocolHandler][clone] Could not complete git clone operation as git installation was not found.');
 
 			const errorMessage = l10n.t('Could not clone your repository as Git is not installed.');
 			const downloadGit = l10n.t('Download Git');
@@ -86,7 +86,7 @@ export class GitProtocolHandler implements UriHandler {
 			return;
 		} else {
 			const cloneTarget = cloneUri.toString(true);
-			this.logger.info(`Executing git.clone for ${cloneTarget}`);
+			this.logger.info(`[GitProtocolHandler][clone] Executing git.clone for ${cloneTarget}`);
 			commands.executeCommand('git.clone', cloneTarget, undefined, { ref: ref });
 		}
 	}
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index 3863e748726..5788d7ee2a7 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -426,8 +426,8 @@ class FileEventLogger {
 		}
 
 		this.eventDisposable = combinedDisposable([
-			this.onWorkspaceWorkingTreeFileChange(uri => this.logger.debug(`[wt] Change: ${uri.fsPath}`)),
-			this.onDotGitFileChange(uri => this.logger.debug(`[.git] Change: ${uri.fsPath}`))
+			this.onWorkspaceWorkingTreeFileChange(uri => this.logger.debug(`[FileEventLogger][onWorkspaceWorkingTreeFileChange] ${uri.fsPath}`)),
+			this.onDotGitFileChange(uri => this.logger.debug(`[FileEventLogger][onDotGitFileChange] ${uri.fsPath}`))
 		]);
 	}
 
@@ -478,7 +478,7 @@ class DotGitWatcher implements IFileWatcher {
 			this.transientDisposables.push(upstreamWatcher);
 			upstreamWatcher.event(this.emitter.fire, this.emitter, this.transientDisposables);
 		} catch (err) {
-			this.logger.warn(`Failed to watch ref '${upstreamPath}', is most likely packed.`);
+			this.logger.warn(`[DotGitWatcher][updateTransientWatchers] Failed to watch ref '${upstreamPath}', is most likely packed.`);
 		}
 	}
 
@@ -718,11 +718,18 @@ export class Repository implements Disposable {
 	private _untrackedGroup: SourceControlResourceGroup;
 	get untrackedGroup(): GitResourceGroup { return this._untrackedGroup as GitResourceGroup; }
 
+	private _EMPTY_TREE: string | undefined;
+
 	private _HEAD: Branch | undefined;
 	get HEAD(): Branch | undefined {
 		return this._HEAD;
 	}
 
+	private _refs: Ref[] = [];
+	get refs(): Ref[] {
+		return this._refs;
+	}
+
 	get headShortName(): string | undefined {
 		if (!this.HEAD) {
 			return;
@@ -1046,8 +1053,9 @@ export class Repository implements Disposable {
 		return this.run(Operation.Config(false), () => this.repository.config('local', key, value));
 	}
 
-	log(options?: LogOptions): Promise<Commit[]> {
-		return this.run(Operation.Log, () => this.repository.log(options));
+	log(options?: LogOptions & { silent?: boolean }): Promise<Commit[]> {
+		const showProgress = !options || options.silent !== true;
+		return this.run(Operation.Log(showProgress), () => this.repository.log(options));
 	}
 
 	logFile(uri: Uri, options?: LogFileOptions): Promise<Commit[]> {
@@ -1112,8 +1120,12 @@ export class Repository implements Disposable {
 		return this.run(Operation.Diff, () => this.repository.diffBetweenShortStat(ref1, ref2));
 	}
 
-	getMergeBase(ref1: string, ref2: string): Promise<string | undefined> {
-		return this.run(Operation.MergeBase, () => this.repository.getMergeBase(ref1, ref2));
+	diffTrees(treeish1: string, treeish2?: string): Promise<Change[]> {
+		return this.run(Operation.Diff, () => this.repository.diffTrees(treeish1, treeish2));
+	}
+
+	getMergeBase(ref1: string, ref2: string, ...refs: string[]): Promise<string | undefined> {
+		return this.run(Operation.MergeBase, () => this.repository.getMergeBase(ref1, ref2, ...refs));
 	}
 
 	async hashObject(data: string): Promise<string> {
@@ -1453,7 +1465,15 @@ export class Repository implements Disposable {
 
 		// Reflog
 		const branchFromReflog = await this.getBranchBaseFromReflog(ref);
-		const branchFromReflogUpstream = branchFromReflog ? await this.getUpstreamBranch(branchFromReflog) : undefined;
+
+		let branchFromReflogUpstream: Branch | undefined = undefined;
+
+		if (branchFromReflog?.type === RefType.RemoteHead) {
+			branchFromReflogUpstream = branchFromReflog;
+		} else if (branchFromReflog?.type === RefType.Head) {
+			branchFromReflogUpstream = await this.getUpstreamBranch(branchFromReflog);
+		}
+
 		if (branchFromReflogUpstream) {
 			await this.setConfig(mergeBaseConfigKey, `${branchFromReflogUpstream.remote}/${branchFromReflogUpstream.name}`);
 			return branchFromReflogUpstream;
@@ -1501,16 +1521,13 @@ export class Repository implements Disposable {
 
 	private async getDefaultBranch(): Promise<Branch | undefined> {
 		try {
-			const defaultBranchResult = await this.repository.exec(['symbolic-ref', '--short', 'refs/remotes/origin/HEAD']);
-			if (defaultBranchResult.stdout.trim() === '' || defaultBranchResult.stderr) {
-				return undefined;
-			}
-
-			return this.getBranch(defaultBranchResult.stdout.trim());
+			const defaultBranch = await this.repository.getDefaultBranch();
+			return defaultBranch;
+		}
+		catch (err) {
+			this.logger.warn(`[Repository][getDefaultBranch] Failed to get default branch details: ${err.message}.`);
+			return undefined;
 		}
-		catch (err) { }
-
-		return undefined;
 	}
 
 	private async getUpstreamBranch(branch: Branch): Promise<Branch | undefined> {
@@ -1523,7 +1540,7 @@ export class Repository implements Disposable {
 			return upstreamBranch;
 		}
 		catch (err) {
-			this.logger.warn(`Failed to get branch details for 'refs/remotes/${branch.upstream.remote}/${branch.upstream.name}': ${err.message}.`);
+			this.logger.warn(`[Repository][getUpstreamBranch] Failed to get branch details for 'refs/remotes/${branch.upstream.remote}/${branch.upstream.name}': ${err.message}.`);
 			return undefined;
 		}
 	}
@@ -1559,8 +1576,8 @@ export class Repository implements Disposable {
 		await this.run(Operation.Rebase, () => this.repository.rebase(branch));
 	}
 
-	async tag(name: string, message?: string): Promise<void> {
-		await this.run(Operation.Tag, () => this.repository.tag(name, message));
+	async tag(options: { name: string; message?: string; ref?: string }): Promise<void> {
+		await this.run(Operation.Tag, () => this.repository.tag(options));
 	}
 
 	async deleteTag(name: string): Promise<void> {
@@ -1602,12 +1619,13 @@ export class Repository implements Disposable {
 		return await this.repository.getCommit(ref);
 	}
 
-	async getCommitCount(range: string): Promise<{ ahead: number; behind: number }> {
-		return await this.run(Operation.RevList, () => this.repository.getCommitCount(range));
-	}
+	async getEmptyTree(): Promise<string> {
+		if (!this._EMPTY_TREE) {
+			const result = await this.repository.exec(['hash-object', '-t', 'tree', '/dev/null']);
+			this._EMPTY_TREE = result.stdout.trim();
+		}
 
-	async revParse(ref: string): Promise<string | undefined> {
-		return await this.run(Operation.RevParse, () => this.repository.revParse(ref));
+		return this._EMPTY_TREE;
 	}
 
 	async reset(treeish: string, hard?: boolean): Promise<void> {
@@ -1819,7 +1837,7 @@ export class Repository implements Disposable {
 			return true;
 		}
 
-		const maybeRebased = await this.run(Operation.Log, async () => {
+		const maybeRebased = await this.run(Operation.Log(true), async () => {
 			try {
 				const result = await this.repository.exec(['log', '--oneline', '--cherry', `${currentBranch ?? ''}...${currentBranch ?? ''}@{upstream}`, '--']);
 				if (result.exitCode) {
@@ -1943,7 +1961,8 @@ export class Repository implements Disposable {
 		return await this.run(Operation.Ignore, async () => {
 			const ignoreFile = `${this.repository.root}${path.sep}.gitignore`;
 			const textToAppend = files
-				.map(uri => relativePath(this.repository.root, uri.fsPath).replace(/\\/g, '/'))
+				.map(uri => relativePath(this.repository.root, uri.fsPath)
+					.replace(/\\|\[/g, match => match === '\\' ? '/' : `\\${match}`))
 				.join('\n');
 
 			const document = await new Promise(c => fs.exists(ignoreFile, c))
@@ -2170,7 +2189,12 @@ export class Repository implements Disposable {
 			this._sourceControl.commitTemplate = commitTemplate;
 
 			// Execute cancellable long-running operation
-			const resourceGroups = await this.getStatus(cancellationToken);
+			const [resourceGroups, refs] =
+				await Promise.all([
+					this.getStatus(cancellationToken),
+					this.getRefs({}, cancellationToken)]);
+
+			this._refs = refs;
 			this._updateResourceGroupsState(resourceGroups);
 
 			this._onDidChangeStatus.fire();
@@ -2409,17 +2433,17 @@ export class Repository implements Disposable {
 		const autorefresh = config.get<boolean>('autorefresh');
 
 		if (!autorefresh) {
-			this.logger.trace('Skip running git status because autorefresh setting is disabled.');
+			this.logger.trace('[Repository][onFileChange] Skip running git status because autorefresh setting is disabled.');
 			return;
 		}
 
 		if (this.isRepositoryHuge) {
-			this.logger.trace('Skip running git status because repository is huge.');
+			this.logger.trace('[Repository][onFileChange] Skip running git status because repository is huge.');
 			return;
 		}
 
 		if (!this.operations.isIdle()) {
-			this.logger.trace('Skip running git status because an operation is running.');
+			this.logger.trace('[Repository][onFileChange] Skip running git status because an operation is running.');
 			return;
 		}
 
diff --git a/extensions/git/src/terminal.ts b/extensions/git/src/terminal.ts
index 4f6d95488bb..edf02693ccd 100644
--- a/extensions/git/src/terminal.ts
+++ b/extensions/git/src/terminal.ts
@@ -3,8 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ExtensionContext, l10n, workspace } from 'vscode';
-import { filterEvent, IDisposable } from './util';
+import { ExtensionContext, l10n, LogOutputChannel, TerminalShellExecutionEndEvent, window, workspace } from 'vscode';
+import { dispose, filterEvent, IDisposable } from './util';
+import { Model } from './model';
 
 export interface ITerminalEnvironmentProvider {
 	featureDescription?: string;
@@ -50,3 +51,42 @@ export class TerminalEnvironmentManager {
 		this.disposable.dispose();
 	}
 }
+
+export class TerminalShellExecutionManager {
+	private readonly subcommands = new Set<string>([
+		'add', 'branch', 'checkout', 'cherry-pick', 'clean', 'commit', 'fetch', 'merge',
+		'mv', 'rebase', 'reset', 'restore', 'revert', 'rm', 'pull', 'push', 'stash', 'switch']);
+
+	private readonly disposables: IDisposable[] = [];
+
+	constructor(
+		private readonly model: Model,
+		private readonly logger: LogOutputChannel
+	) {
+		window.onDidEndTerminalShellExecution(this.onDidEndTerminalShellExecution, this, this.disposables);
+	}
+
+	private onDidEndTerminalShellExecution(e: TerminalShellExecutionEndEvent): void {
+		const { execution, exitCode, shellIntegration } = e;
+		const [executable, subcommand] = execution.commandLine.value.split(/\s+/);
+		const cwd = execution.cwd ?? shellIntegration.cwd;
+
+		if (executable.toLowerCase() !== 'git' || !this.subcommands.has(subcommand?.toLowerCase()) || !cwd || exitCode !== 0) {
+			return;
+		}
+
+		this.logger.trace(`[TerminalShellExecutionManager][onDidEndTerminalShellExecution] Matched git subcommand: ${subcommand}`);
+
+		const repository = this.model.getRepository(cwd);
+		if (!repository) {
+			this.logger.trace(`[TerminalShellExecutionManager][onDidEndTerminalShellExecution] Unable to find repository for current working directory: ${cwd.toString()}`);
+			return;
+		}
+
+		repository.status();
+	}
+
+	dispose(): void {
+		dispose(this.disposables);
+	}
+}
diff --git a/extensions/git/src/test/smoke.test.ts b/extensions/git/src/test/smoke.test.ts
index 789086e90a4..173364c7f09 100644
--- a/extensions/git/src/test/smoke.test.ts
+++ b/extensions/git/src/test/smoke.test.ts
@@ -5,7 +5,7 @@
 
 import 'mocha';
 import * as assert from 'assert';
-import { workspace, commands, window, Uri, WorkspaceEdit, Range, TextDocument, extensions } from 'vscode';
+import { workspace, commands, window, Uri, WorkspaceEdit, Range, TextDocument, extensions, TabInputTextDiff } from 'vscode';
 import * as cp from 'child_process';
 import * as fs from 'fs';
 import * as path from 'path';
@@ -73,17 +73,22 @@ suite('git smoke test', function () {
 		await type(appjs, ' world');
 		await appjs.save();
 		await repository.status();
+
 		assert.strictEqual(repository.state.workingTreeChanges.length, 1);
-		repository.state.workingTreeChanges.some(r => r.uri.path === appjs.uri.path && r.status === Status.MODIFIED);
+		assert.strictEqual(repository.state.workingTreeChanges[0].uri.path, appjs.uri.path);
+		assert.strictEqual(repository.state.workingTreeChanges[0].status, Status.MODIFIED);
 
 		fs.writeFileSync(file('newfile.txt'), '');
 		const newfile = await open('newfile.txt');
 		await type(newfile, 'hey there');
 		await newfile.save();
 		await repository.status();
+
 		assert.strictEqual(repository.state.workingTreeChanges.length, 2);
-		repository.state.workingTreeChanges.some(r => r.uri.path === appjs.uri.path && r.status === Status.MODIFIED);
-		repository.state.workingTreeChanges.some(r => r.uri.path === newfile.uri.path && r.status === Status.UNTRACKED);
+		assert.strictEqual(repository.state.workingTreeChanges[0].uri.path, appjs.uri.path);
+		assert.strictEqual(repository.state.workingTreeChanges[0].status, Status.MODIFIED);
+		assert.strictEqual(repository.state.workingTreeChanges[1].uri.path, newfile.uri.path);
+		assert.strictEqual(repository.state.workingTreeChanges[1].status, Status.UNTRACKED);
 	});
 
 	test('opens diff editor', async function () {
@@ -93,65 +98,80 @@ suite('git smoke test', function () {
 		assert(window.activeTextEditor);
 		assert.strictEqual(window.activeTextEditor!.document.uri.path, appjs.path);
 
-		// TODO: how do we really know this is a diff editor?
+		assert(window.tabGroups.activeTabGroup.activeTab);
+		assert(window.tabGroups.activeTabGroup.activeTab!.input instanceof TabInputTextDiff);
 	});
 
 	test('stages correctly', async function () {
 		const appjs = uri('app.js');
 		const newfile = uri('newfile.txt');
 
-		await commands.executeCommand('git.stage', appjs);
-		assert.strictEqual(repository.state.workingTreeChanges.length, 1);
-		repository.state.workingTreeChanges.some(r => r.uri.path === newfile.path && r.status === Status.UNTRACKED);
-		assert.strictEqual(repository.state.indexChanges.length, 1);
-		repository.state.indexChanges.some(r => r.uri.path === appjs.path && r.status === Status.INDEX_MODIFIED);
+		await repository.add([appjs.fsPath]);
+
+		assert.strictEqual(repository.state.indexChanges.length, 1);
+		assert.strictEqual(repository.state.indexChanges[0].uri.path, appjs.path);
+		assert.strictEqual(repository.state.indexChanges[0].status, Status.INDEX_MODIFIED);
+
+		assert.strictEqual(repository.state.workingTreeChanges.length, 1);
+		assert.strictEqual(repository.state.workingTreeChanges[0].uri.path, newfile.path);
+		assert.strictEqual(repository.state.workingTreeChanges[0].status, Status.UNTRACKED);
+
+		await repository.revert([appjs.fsPath]);
+
+		assert.strictEqual(repository.state.indexChanges.length, 0);
 
-		await commands.executeCommand('git.unstage', appjs);
 		assert.strictEqual(repository.state.workingTreeChanges.length, 2);
-		repository.state.workingTreeChanges.some(r => r.uri.path === appjs.path && r.status === Status.MODIFIED);
-		repository.state.workingTreeChanges.some(r => r.uri.path === newfile.path && r.status === Status.UNTRACKED);
+		assert.strictEqual(repository.state.workingTreeChanges[0].uri.path, appjs.path);
+		assert.strictEqual(repository.state.workingTreeChanges[0].status, Status.MODIFIED);
+		assert.strictEqual(repository.state.workingTreeChanges[1].uri.path, newfile.path);
+		assert.strictEqual(repository.state.workingTreeChanges[1].status, Status.UNTRACKED);
 	});
 
 	test('stages, commits changes and verifies outgoing change', async function () {
 		const appjs = uri('app.js');
 		const newfile = uri('newfile.txt');
 
-		await commands.executeCommand('git.stage', appjs);
+		await repository.add([appjs.fsPath]);
 		await repository.commit('second commit');
+
 		assert.strictEqual(repository.state.workingTreeChanges.length, 1);
-		repository.state.workingTreeChanges.some(r => r.uri.path === newfile.path && r.status === Status.UNTRACKED);
+		assert.strictEqual(repository.state.workingTreeChanges[0].uri.path, newfile.path);
+		assert.strictEqual(repository.state.workingTreeChanges[0].status, Status.UNTRACKED);
+
 		assert.strictEqual(repository.state.indexChanges.length, 0);
 
-		await commands.executeCommand('git.stageAll', appjs);
-		await repository.commit('third commit');
+		await repository.commit('third commit', { all: true });
+
 		assert.strictEqual(repository.state.workingTreeChanges.length, 0);
 		assert.strictEqual(repository.state.indexChanges.length, 0);
 	});
 
 	test('rename/delete conflict', async function () {
-		cp.execSync('git branch test', { cwd });
-		cp.execSync('git checkout test', { cwd });
+		await commands.executeCommand('workbench.view.scm');
 
-		fs.unlinkSync(file('app.js'));
-		cp.execSync('git add .', { cwd });
+		const appjs = file('app.js');
+		const renamejs = file('rename.js');
 
-		await repository.commit('commit on test');
-		cp.execSync('git checkout main', { cwd });
+		await repository.createBranch('test', true);
 
-		fs.renameSync(file('app.js'), file('rename.js'));
-		cp.execSync('git add .', { cwd });
-		await repository.commit('commit on main');
+		// Delete file (test branch)
+		fs.unlinkSync(appjs);
+		await repository.commit('commit on test', { all: true });
+
+		await repository.checkout('main');
+
+		// Rename file (main branch)
+		fs.renameSync(appjs, renamejs);
+		await repository.commit('commit on main', { all: true });
 
 		try {
-			cp.execSync('git merge test', { cwd });
+			await repository.merge('test');
 		} catch (e) { }
 
-		setTimeout(() => {
-			commands.executeCommand('workbench.scm.focus');
-		}, 2e3);
+		assert.strictEqual(repository.state.mergeChanges.length, 1);
+		assert.strictEqual(repository.state.mergeChanges[0].status, Status.DELETED_BY_THEM);
 
-		await new Promise(resolve => {
-			setTimeout(resolve, 5e3);
-		});
+		assert.strictEqual(repository.state.workingTreeChanges.length, 0);
+		assert.strictEqual(repository.state.indexChanges.length, 0);
 	});
 });
diff --git a/extensions/git/src/util.ts b/extensions/git/src/util.ts
index eac6f0384b9..bf33411c3b3 100644
--- a/extensions/git/src/util.ts
+++ b/extensions/git/src/util.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event, Disposable, EventEmitter } from 'vscode';
+import { Event, Disposable, EventEmitter, SourceControlHistoryItemRef } from 'vscode';
 import { dirname, sep, relative } from 'path';
 import { Readable } from 'stream';
 import { promises as fs, createReadStream } from 'fs';
@@ -513,3 +513,58 @@ export namespace Versions {
 		return from(major, minor, patch, pre);
 	}
 }
+
+export function deltaHistoryItemRefs(before: SourceControlHistoryItemRef[], after: SourceControlHistoryItemRef[]): {
+	added: SourceControlHistoryItemRef[];
+	modified: SourceControlHistoryItemRef[];
+	removed: SourceControlHistoryItemRef[];
+} {
+	if (before.length === 0) {
+		return { added: after, modified: [], removed: [] };
+	}
+
+	const added: SourceControlHistoryItemRef[] = [];
+	const modified: SourceControlHistoryItemRef[] = [];
+	const removed: SourceControlHistoryItemRef[] = [];
+
+	let beforeIdx = 0;
+	let afterIdx = 0;
+
+	while (true) {
+		if (beforeIdx === before.length) {
+			added.push(...after.slice(afterIdx));
+			break;
+		}
+		if (afterIdx === after.length) {
+			removed.push(...before.slice(beforeIdx));
+			break;
+		}
+
+		const beforeElement = before[beforeIdx];
+		const afterElement = after[afterIdx];
+
+		const result = beforeElement.id.localeCompare(afterElement.id);
+
+		if (result === 0) {
+			if (beforeElement.revision !== afterElement.revision) {
+				// modified
+				modified.push(afterElement);
+			}
+
+			beforeIdx += 1;
+			afterIdx += 1;
+		} else if (result < 0) {
+			// beforeElement is smaller -> before element removed
+			removed.push(beforeElement);
+
+			beforeIdx += 1;
+		} else if (result > 0) {
+			// beforeElement is greater -> after element added
+			added.push(afterElement);
+
+			afterIdx += 1;
+		}
+	}
+
+	return { added, modified, removed };
+}
diff --git a/extensions/git/tsconfig.json b/extensions/git/tsconfig.json
index 6ca99fecf1b..75fb8217df7 100644
--- a/extensions/git/tsconfig.json
+++ b/extensions/git/tsconfig.json
@@ -21,6 +21,7 @@
 		"../../src/vscode-dts/vscode.proposed.tabInputMultiDiff.d.ts",
 		"../../src/vscode-dts/vscode.proposed.tabInputTextMerge.d.ts",
 		"../../src/vscode-dts/vscode.proposed.timeline.d.ts",
+		"../../src/vscode-dts/vscode.proposed.quickInputButtonLocation.d.ts",
 		"../types/lib.textEncoder.d.ts"
 	]
 }
diff --git a/extensions/git/yarn.lock b/extensions/git/yarn.lock
deleted file mode 100644
index 06023a61227..00000000000
--- a/extensions/git/yarn.lock
+++ /dev/null
@@ -1,264 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@joaomoreno/unique-names-generator@^5.1.0":
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/@joaomoreno/unique-names-generator/-/unique-names-generator-5.1.0.tgz#d577d425aed794c44c0e8863cddd5dea349f74f3"
-  integrity sha512-KEVThTpUIKPb7dBKJ9mJ3WYnD1mJZZsEinCSp9CVEPlWbDagurFv1RKRjvvujrLfJzsGc0HkBHS9W8Bughao4A==
-
-"@microsoft/1ds-core-js@4.0.3", "@microsoft/1ds-core-js@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@microsoft/1ds-core-js/-/1ds-core-js-4.0.3.tgz#c8a92c623745a9595e06558a866658480c33bdf9"
-  integrity sha512-FrxNLVAPsAvD7+l63TlNS/Kodvpct2WulpDSn1dI4Xuy0kF4E2H867kHdwL/iY1Bj3zA3FSy/jvE4+OcDws7ug==
-  dependencies:
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/1ds-post-js@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@microsoft/1ds-post-js/-/1ds-post-js-4.0.3.tgz#cfcb20bb23fb6215d3f0732f60f5b7df3e624f86"
-  integrity sha512-uewvmUtXKd7ttypiKQGdYI6i7UUpPkOznLayzIFrJ4r2xnG6jhPjpKRncHFXPQcM4XSWO3yf5PQ3xAbPq9t7ZQ==
-  dependencies:
-    "@microsoft/1ds-core-js" "4.0.3"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-channel-js@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.0.4.tgz#247b6fe2158fad9826cbcdf7304f885766b36624"
-  integrity sha512-6TlfExmErQ8Y+/ChbkyWl+jyt4wg3T6p7lwXDsUCB0LgZmlEWMaCUS0YlT73JCWmE8j7vxW8yUm0lgsgmHns3A==
-  dependencies:
-    "@microsoft/applicationinsights-common" "3.0.4"
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-common@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-common/-/applicationinsights-common-3.0.4.tgz#c4aa53ba343f5b3c7fbf54cddd3c86a5bdcd95dc"
-  integrity sha512-r5gWaw/K9+tKfuo2GtDiDiKASgOkPOCrKW+wZzFvuR06uuwvWjbVQ6yW/YbnfuhRF5M65ksUiMi0eCMwEOGq7Q==
-  dependencies:
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-core-js@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.0.4.tgz#008308b786930d94a1de8a1fbb4af0351b74653e"
-  integrity sha512-anxy5kEkqBmVoEqJiJzaaXXA0wzqZi9U4zGd05xFJ04lWckP8dG3zyT3+GGdg7rDelqLTNGxndeYoFmDv63u1g==
-  dependencies:
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-shims@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz#3865b73ace8405b9c4618cc5c571f2fe3876f06f"
-  integrity sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==
-  dependencies:
-    "@nevware21/ts-utils" ">= 0.9.4 < 2.x"
-
-"@microsoft/applicationinsights-web-basic@^3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.0.4.tgz#9a23323276b4a5a0dc6a352e2de5d75e3c16b534"
-  integrity sha512-KfoxPlLlf0JT12ADb23C5iGye/yFouoMgHEKULxkSQcYY9SsW/8rVrqqvoYKAL+u215CZU2A8Kc8sR3ehEaPCQ==
-  dependencies:
-    "@microsoft/applicationinsights-channel-js" "3.0.4"
-    "@microsoft/applicationinsights-common" "3.0.4"
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/dynamicproto-js@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.2.tgz#e57fbec2e7067d48b7e8e1e1c1d354028ef718a6"
-  integrity sha512-MB8trWaFREpmb037k/d0bB7T2BP7Ai24w1e1tbz3ASLB0/lwphsq3Nq8S9I5AsI5vs4zAQT+SB5nC5/dLYTiOg==
-  dependencies:
-    "@nevware21/ts-utils" ">= 0.9.4 < 2.x"
-
-"@nevware21/ts-async@>= 0.3.0 < 2.x":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@nevware21/ts-async/-/ts-async-0.3.0.tgz#a8b97ba01065fc930de9a3f4dd4a05e862becc6c"
-  integrity sha512-ZUcgUH12LN/F6nzN0cYd0F/rJaMLmXr0EHVTyYfaYmK55bdwE4338uue4UiVoRqHVqNW4KDUrJc49iGogHKeWA==
-  dependencies:
-    "@nevware21/ts-utils" ">= 0.10.0 < 2.x"
-
-"@nevware21/ts-utils@>= 0.10.0 < 2.x", "@nevware21/ts-utils@>= 0.10.1 < 2.x", "@nevware21/ts-utils@>= 0.9.4 < 2.x":
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@nevware21/ts-utils/-/ts-utils-0.10.1.tgz#aa65abc71eba06749a396598f22263d26f796ac7"
-  integrity sha512-pMny25NnF2/MJwdqC3Iyjm2pGIXNxni4AROpcqDeWa+td9JMUY4bUS9uU9XW+BoBRqTLUL+WURF9SOd/6OQzRg==
-
-"@tokenizer/token@^0.3.0":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@tokenizer/token/-/token-0.3.0.tgz#fe98a93fe789247e998c75e74e9c7c63217aa276"
-  integrity sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==
-
-"@types/byline@4.2.31":
-  version "4.2.31"
-  resolved "https://registry.yarnpkg.com/@types/byline/-/byline-4.2.31.tgz#0e61fcb9c03e047d21c4496554c7116297ab60cd"
-  integrity sha1-DmH8ucA+BH0hxEllVMcRYperYM0=
-  dependencies:
-    "@types/node" "*"
-
-"@types/mocha@^9.1.1":
-  version "9.1.1"
-  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-9.1.1.tgz#e7c4f1001eefa4b8afbd1eee27a237fee3bf29c4"
-  integrity sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==
-
-"@types/node@*":
-  version "8.0.51"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.51.tgz#b31d716fb8d58eeb95c068a039b9b6292817d5fb"
-  integrity sha512-El3+WJk2D/ppWNd2X05aiP5l2k4EwF7KwheknQZls+I26eSICoWRhRIJ56jGgw2dqNGQ5LtNajmBU2ajS28EvQ==
-
-"@types/node@20.x":
-  version "20.11.24"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792"
-  integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==
-  dependencies:
-    undici-types "~5.26.4"
-
-"@types/picomatch@2.3.0":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@types/picomatch/-/picomatch-2.3.0.tgz#75db5e75a713c5a83d5b76780c3da84a82806003"
-  integrity sha512-O397rnSS9iQI4OirieAtsDqvCj4+3eY1J+EPdNTKuHuRWIfUoGyzX294o8C4KJYaLqgSrd2o60c5EqCU8Zv02g==
-
-"@types/which@3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/which/-/which-3.0.0.tgz#849afdd9fdcb0b67339b9cfc80fa6ea4e0253fc5"
-  integrity sha512-ASCxdbsrwNfSMXALlC3Decif9rwDMu+80KGp5zI2RLRotfMsTv7fHL8W8VDp24wymzDyIFudhUeSCugrgRFfHQ==
-
-"@vscode/extension-telemetry@^0.9.0":
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.9.0.tgz#8c6c61e253ff304f46045f04edd60059b144417a"
-  integrity sha512-37RxGHXrs3GoXPgCUKQhghEu0gxs8j27RLjQwwtSf4WhPdJKz8UrqMYzpsXlliQ05zURYmtdGZst9C6+hfWXaQ==
-  dependencies:
-    "@microsoft/1ds-core-js" "^4.0.3"
-    "@microsoft/1ds-post-js" "^4.0.3"
-    "@microsoft/applicationinsights-web-basic" "^3.0.4"
-
-"@vscode/iconv-lite-umd@0.7.0":
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz#d2f1e0664ee6036408f9743fee264ea0699b0e48"
-  integrity sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg==
-
-byline@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
-  integrity sha1-dBxSFkaOrcRXsDQQEYrXfejB3bE=
-
-file-type@16.5.4:
-  version "16.5.4"
-  resolved "https://registry.yarnpkg.com/file-type/-/file-type-16.5.4.tgz#474fb4f704bee427681f98dd390058a172a6c2fd"
-  integrity sha512-/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw==
-  dependencies:
-    readable-web-to-node-stream "^3.0.0"
-    strtok3 "^6.2.4"
-    token-types "^4.1.1"
-
-ieee754@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
-  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
-
-inherits@^2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-isexe@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-3.1.1.tgz#4a407e2bd78ddfb14bea0c27c6f7072dde775f0d"
-  integrity sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==
-
-jschardet@3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-3.1.2.tgz#9bf4364deba0677fe9e3bd9e29eda57febf2e9db"
-  integrity sha512-mw3CBZGzW8nUBPYhFU2ztZ/kJ6NClQUQVpyzvFMfznZsoC///ZQ30J2RCUanNsr5yF22LqhgYr/lj807/ZleWA==
-
-peek-readable@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/peek-readable/-/peek-readable-4.1.0.tgz#4ece1111bf5c2ad8867c314c81356847e8a62e72"
-  integrity sha512-ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg==
-
-picomatch@2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
-  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
-
-readable-stream@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
-  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
-readable-web-to-node-stream@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz#5d52bb5df7b54861fd48d015e93a2cb87b3ee0bb"
-  integrity sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw==
-  dependencies:
-    readable-stream "^3.6.0"
-
-safe-buffer@~5.2.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
-string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
-  dependencies:
-    safe-buffer "~5.2.0"
-
-strtok3@^6.2.4:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/strtok3/-/strtok3-6.3.0.tgz#358b80ffe6d5d5620e19a073aa78ce947a90f9a0"
-  integrity sha512-fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw==
-  dependencies:
-    "@tokenizer/token" "^0.3.0"
-    peek-readable "^4.1.0"
-
-token-types@^4.1.1:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/token-types/-/token-types-4.2.0.tgz#b66bc3d67420c6873222a424eee64a744f4c2f13"
-  integrity sha512-P0rrp4wUpefLncNamWIef62J0v0kQR/GfDVji9WKY7GDCWy5YbVSrKUTam07iWPZQGy0zWNOfstYTykMmPNR7w==
-  dependencies:
-    "@tokenizer/token" "^0.3.0"
-    ieee754 "^1.2.1"
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
-
-util-deprecate@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
-
-vscode-uri@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-2.0.0.tgz#2df704222f72b8a71ff266ba0830ed6c51ac1542"
-  integrity sha512-lWXWofDSYD8r/TIyu64MdwB4FaSirQ608PP/TzUyslyOeHGwQ0eTHUZeJrK1ILOmwUHaJtV693m2JoUYroUDpw==
-
-which@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/which/-/which-4.0.0.tgz#cd60b5e74503a3fbcfbf6cd6b4138a8bae644c1a"
-  integrity sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==
-  dependencies:
-    isexe "^3.1.1"
diff --git a/extensions/github-authentication/.npmrc b/extensions/github-authentication/.npmrc
new file mode 100644
index 00000000000..a9c57709666
--- /dev/null
+++ b/extensions/github-authentication/.npmrc
@@ -0,0 +1,2 @@
+legacy-peer-deps="true"
+timeout=180000
diff --git a/extensions/github-authentication/.vscodeignore b/extensions/github-authentication/.vscodeignore
index f65bc15d839..0d0ea746e79 100644
--- a/extensions/github-authentication/.vscodeignore
+++ b/extensions/github-authentication/.vscodeignore
@@ -6,4 +6,4 @@ build/**
 extension.webpack.config.js
 extension-browser.webpack.config.js
 tsconfig.json
-yarn.lock
+package-lock.json
diff --git a/extensions/github-authentication/package-lock.json b/extensions/github-authentication/package-lock.json
new file mode 100644
index 00000000000..c150fa7acc3
--- /dev/null
+++ b/extensions/github-authentication/package-lock.json
@@ -0,0 +1,300 @@
+{
+  "name": "github-authentication",
+  "version": "0.0.2",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "github-authentication",
+      "version": "0.0.2",
+      "license": "MIT",
+      "dependencies": {
+        "@vscode/extension-telemetry": "^0.9.0",
+        "node-fetch": "2.6.7",
+        "vscode-tas-client": "^0.1.84"
+      },
+      "devDependencies": {
+        "@types/mocha": "^9.1.1",
+        "@types/node": "20.x",
+        "@types/node-fetch": "^2.5.7"
+      },
+      "engines": {
+        "vscode": "^1.41.0"
+      }
+    },
+    "node_modules/@microsoft/1ds-core-js": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.0.3.tgz",
+      "integrity": "sha512-FrxNLVAPsAvD7+l63TlNS/Kodvpct2WulpDSn1dI4Xuy0kF4E2H867kHdwL/iY1Bj3zA3FSy/jvE4+OcDws7ug==",
+      "dependencies": {
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/1ds-post-js": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.0.3.tgz",
+      "integrity": "sha512-uewvmUtXKd7ttypiKQGdYI6i7UUpPkOznLayzIFrJ4r2xnG6jhPjpKRncHFXPQcM4XSWO3yf5PQ3xAbPq9t7ZQ==",
+      "dependencies": {
+        "@microsoft/1ds-core-js": "4.0.3",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-channel-js": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.0.4.tgz",
+      "integrity": "sha512-6TlfExmErQ8Y+/ChbkyWl+jyt4wg3T6p7lwXDsUCB0LgZmlEWMaCUS0YlT73JCWmE8j7vxW8yUm0lgsgmHns3A==",
+      "dependencies": {
+        "@microsoft/applicationinsights-common": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-common": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.0.4.tgz",
+      "integrity": "sha512-r5gWaw/K9+tKfuo2GtDiDiKASgOkPOCrKW+wZzFvuR06uuwvWjbVQ6yW/YbnfuhRF5M65ksUiMi0eCMwEOGq7Q==",
+      "dependencies": {
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-core-js": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.0.4.tgz",
+      "integrity": "sha512-anxy5kEkqBmVoEqJiJzaaXXA0wzqZi9U4zGd05xFJ04lWckP8dG3zyT3+GGdg7rDelqLTNGxndeYoFmDv63u1g==",
+      "dependencies": {
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-shims": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
+      "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-web-basic": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.0.4.tgz",
+      "integrity": "sha512-KfoxPlLlf0JT12ADb23C5iGye/yFouoMgHEKULxkSQcYY9SsW/8rVrqqvoYKAL+u215CZU2A8Kc8sR3ehEaPCQ==",
+      "dependencies": {
+        "@microsoft/applicationinsights-channel-js": "3.0.4",
+        "@microsoft/applicationinsights-common": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/dynamicproto-js": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.2.tgz",
+      "integrity": "sha512-MB8trWaFREpmb037k/d0bB7T2BP7Ai24w1e1tbz3ASLB0/lwphsq3Nq8S9I5AsI5vs4zAQT+SB5nC5/dLYTiOg==",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+      }
+    },
+    "node_modules/@nevware21/ts-async": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.3.0.tgz",
+      "integrity": "sha512-ZUcgUH12LN/F6nzN0cYd0F/rJaMLmXr0EHVTyYfaYmK55bdwE4338uue4UiVoRqHVqNW4KDUrJc49iGogHKeWA==",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.10.0 < 2.x"
+      }
+    },
+    "node_modules/@nevware21/ts-utils": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.10.1.tgz",
+      "integrity": "sha512-pMny25NnF2/MJwdqC3Iyjm2pGIXNxni4AROpcqDeWa+td9JMUY4bUS9uU9XW+BoBRqTLUL+WURF9SOd/6OQzRg=="
+    },
+    "node_modules/@types/mocha": {
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.1.tgz",
+      "integrity": "sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==",
+      "dev": true
+    },
+    "node_modules/@types/node": {
+      "version": "20.11.24",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
+      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/@types/node-fetch": {
+      "version": "2.5.7",
+      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.7.tgz",
+      "integrity": "sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "form-data": "^3.0.0"
+      }
+    },
+    "node_modules/@vscode/extension-telemetry": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.0.tgz",
+      "integrity": "sha512-37RxGHXrs3GoXPgCUKQhghEu0gxs8j27RLjQwwtSf4WhPdJKz8UrqMYzpsXlliQ05zURYmtdGZst9C6+hfWXaQ==",
+      "dependencies": {
+        "@microsoft/1ds-core-js": "^4.0.3",
+        "@microsoft/1ds-post-js": "^4.0.3",
+        "@microsoft/applicationinsights-web-basic": "^3.0.4"
+      },
+      "engines": {
+        "vscode": "^1.75.0"
+      }
+    },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k= sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "dev": true
+    },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk= sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/form-data": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz",
+      "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==",
+      "dev": true,
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/mime-db": {
+      "version": "1.44.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
+      "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.27",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
+      "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
+      "dev": true,
+      "dependencies": {
+        "mime-db": "1.44.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/node-fetch": {
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/tas-client": {
+      "version": "0.2.33",
+      "resolved": "https://registry.npmjs.org/tas-client/-/tas-client-0.2.33.tgz",
+      "integrity": "sha512-V+uqV66BOQnWxvI6HjDnE4VkInmYZUQ4dgB7gzaDyFyFSK1i1nF/j7DpS9UbQAgV9NaF1XpcyuavnM1qOeiEIg=="
+    },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    },
+    "node_modules/vscode-tas-client": {
+      "version": "0.1.84",
+      "resolved": "https://registry.npmjs.org/vscode-tas-client/-/vscode-tas-client-0.1.84.tgz",
+      "integrity": "sha512-rUTrUopV+70hvx1hW5ebdw1nd6djxubkLvVxjGdyD/r5v/wcVF41LIfiAtbm5qLZDtQdsMH1IaCuDoluoIa88w==",
+      "dependencies": {
+        "tas-client": "0.2.33"
+      },
+      "engines": {
+        "vscode": "^1.85.0"
+      }
+    },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+    },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0= sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    }
+  }
+}
diff --git a/extensions/github-authentication/package.json b/extensions/github-authentication/package.json
index 2d2bea56277..7fcbc7f151c 100644
--- a/extensions/github-authentication/package.json
+++ b/extensions/github-authentication/package.json
@@ -38,7 +38,7 @@
         "id": "github-enterprise"
       }
     ],
-    "configuration": {
+    "configuration": [{
       "title": "GitHub Enterprise Server Authentication Provider",
       "properties": {
         "github-enterprise.uri": {
@@ -46,7 +46,17 @@
           "description": "GitHub Enterprise Server URI"
         }
       }
+    },
+    {
+      "title": "GitHub Authentication",
+      "properties": {
+        "github.experimental.multipleAccounts": {
+          "type": "boolean",
+          "description": "Experimental support for multiple GitHub accounts"
+        }
+      }
     }
+  ]
   },
   "aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255",
   "main": "./out/extension.js",
diff --git a/extensions/github-authentication/src/flows.ts b/extensions/github-authentication/src/flows.ts
index 7498a2b2202..a2497b2b0b2 100644
--- a/extensions/github-authentication/src/flows.ts
+++ b/extensions/github-authentication/src/flows.ts
@@ -173,6 +173,8 @@ const allFlows: IFlow[] = [
 				]);
 				if (existingLogin) {
 					searchParams.append('login', existingLogin);
+				} else {
+					searchParams.append('prompt', 'select_account');
 				}
 
 				// The extra toString, parse is apparently needed for env.openExternal
@@ -240,6 +242,8 @@ const allFlows: IFlow[] = [
 				]);
 				if (existingLogin) {
 					searchParams.append('login', existingLogin);
+				} else {
+					searchParams.append('prompt', 'select_account');
 				}
 
 				const loginUrl = baseUri.with({
diff --git a/extensions/github-authentication/src/github.ts b/extensions/github-authentication/src/github.ts
index 15fe2ef04f8..d4ae337427c 100644
--- a/extensions/github-authentication/src/github.ts
+++ b/extensions/github-authentication/src/github.ts
@@ -18,7 +18,9 @@ interface SessionData {
 	account?: {
 		label?: string;
 		displayName?: string;
-		id: string;
+		// Unfortunately, for some time the id was a number, so we need to support both.
+		// This can be removed once we are confident that all users have migrated to the new id.
+		id: string | number;
 	};
 	scopes: string[];
 	accessToken: string;
@@ -97,6 +99,7 @@ export class GitHubAuthenticationProvider implements vscode.AuthenticationProvid
 	private readonly _keychain: Keychain;
 	private readonly _accountsSeen = new Set<string>();
 	private readonly _disposable: vscode.Disposable | undefined;
+	private _supportsMultipleAccounts = false;
 
 	private _sessionsPromise: Promise<vscode.AuthenticationSession[]>;
 
@@ -133,10 +136,24 @@ export class GitHubAuthenticationProvider implements vscode.AuthenticationProvid
 			return sessions;
 		});
 
+		this._supportsMultipleAccounts = this._shouldSupportMultipleAccounts();
+
 		this._disposable = vscode.Disposable.from(
 			this._telemetryReporter,
-			vscode.authentication.registerAuthenticationProvider(type, this._githubServer.friendlyName, this, { supportsMultipleAccounts: false }),
-			this.context.secrets.onDidChange(() => this.checkForUpdates())
+			vscode.authentication.registerAuthenticationProvider(type, this._githubServer.friendlyName, this, { supportsMultipleAccounts: this._supportsMultipleAccounts }),
+			this.context.secrets.onDidChange(() => this.checkForUpdates()),
+			vscode.workspace.onDidChangeConfiguration(async e => {
+				if (e.affectsConfiguration('github.experimental.multipleAccounts')) {
+					const newValue = this._shouldSupportMultipleAccounts();
+					if (newValue === this._supportsMultipleAccounts) {
+						return;
+					}
+					const result = await vscode.window.showInformationMessage(vscode.l10n.t('Please reload the window to apply the new setting.'), { modal: true }, vscode.l10n.t('Reload Window'));
+					if (result) {
+						vscode.commands.executeCommand('workbench.action.reloadWindow');
+					}
+				}
+			})
 		);
 	}
 
@@ -148,14 +165,17 @@ export class GitHubAuthenticationProvider implements vscode.AuthenticationProvid
 		return this._sessionChangeEmitter.event;
 	}
 
-	async getSessions(scopes?: string[]): Promise<vscode.AuthenticationSession[]> {
+	async getSessions(scopes: string[] | undefined, options?: vscode.AuthenticationProviderSessionOptions): Promise<vscode.AuthenticationSession[]> {
 		// For GitHub scope list, order doesn't matter so we immediately sort the scopes
 		const sortedScopes = scopes?.sort() || [];
 		this._logger.info(`Getting sessions for ${sortedScopes.length ? sortedScopes.join(',') : 'all scopes'}...`);
 		const sessions = await this._sessionsPromise;
-		const finalSessions = sortedScopes.length
-			? sessions.filter(session => arrayEquals([...session.scopes].sort(), sortedScopes))
+		const accountFilteredSessions = options?.account
+			? sessions.filter(session => session.account.label === options.account?.label)
 			: sessions;
+		const finalSessions = sortedScopes.length
+			? accountFilteredSessions.filter(session => arrayEquals([...session.scopes].sort(), sortedScopes))
+			: accountFilteredSessions;
 
 		this._logger.info(`Got ${finalSessions.length} sessions for ${sortedScopes?.join(',') ?? 'all scopes'}...`);
 		return finalSessions;
@@ -221,12 +241,17 @@ export class GitHubAuthenticationProvider implements vscode.AuthenticationProvid
 			return [];
 		}
 
+		// Unfortunately, we were using a number secretly for the account id for some time... this is due to a bad `any`.
+		// AuthenticationSession's account id is a string, so we need to detect when there is a number accountId and re-store
+		// the sessions to migrate away from the bad number usage.
+		// TODO@TylerLeonhardt: Remove this after we are confident that all users have migrated to the new id.
+		let seenNumberAccountId: boolean = false;
 		// TODO: eventually remove this Set because we should only have one session per set of scopes.
 		const scopesSeen = new Set<string>();
-		const sessionPromises = sessionData.map(async (session: SessionData) => {
+		const sessionPromises = sessionData.map(async (session: SessionData): Promise<vscode.AuthenticationSession | undefined> => {
 			// For GitHub scope list, order doesn't matter so we immediately sort the scopes
 			const scopesStr = [...session.scopes].sort().join(' ');
-			if (scopesSeen.has(scopesStr)) {
+			if (!this._supportsMultipleAccounts && scopesSeen.has(scopesStr)) {
 				return undefined;
 			}
 			let userInfo: { id: string; accountName: string } | undefined;
@@ -244,13 +269,23 @@ export class GitHubAuthenticationProvider implements vscode.AuthenticationProvid
 
 			this._logger.trace(`Read the following session from the keychain with the following scopes: ${scopesStr}`);
 			scopesSeen.add(scopesStr);
+
+			let accountId: string;
+			if (session.account?.id) {
+				if (typeof session.account.id === 'number') {
+					seenNumberAccountId = true;
+				}
+				accountId = `${session.account.id}`;
+			} else {
+				accountId = userInfo?.id ?? '<unknown>';
+			}
 			return {
 				id: session.id,
 				account: {
 					label: session.account
 						? session.account.label ?? session.account.displayName ?? '<unknown>'
 						: userInfo?.accountName ?? '<unknown>',
-					id: session.account?.id ?? userInfo?.id ?? '<unknown>'
+					id: accountId
 				},
 				// we set this to session.scopes to maintain the original order of the scopes requested
 				// by the extension that called getSession()
@@ -265,7 +300,7 @@ export class GitHubAuthenticationProvider implements vscode.AuthenticationProvid
 			.filter(<T>(p?: T): p is T => Boolean(p));
 
 		this._logger.info(`Got ${verifiedSessions.length} verified sessions.`);
-		if (verifiedSessions.length !== sessionData.length) {
+		if (seenNumberAccountId || verifiedSessions.length !== sessionData.length) {
 			await this.storeSessions(verifiedSessions);
 		}
 
@@ -279,7 +314,7 @@ export class GitHubAuthenticationProvider implements vscode.AuthenticationProvid
 		this._logger.info(`Stored ${sessions.length} sessions!`);
 	}
 
-	public async createSession(scopes: string[]): Promise<vscode.AuthenticationSession> {
+	public async createSession(scopes: string[], options?: vscode.AuthenticationProviderSessionOptions): Promise<vscode.AuthenticationSession> {
 		try {
 			// For GitHub scope list, order doesn't matter so we use a sorted scope to determine
 			// if we've got a session already.
@@ -298,14 +333,20 @@ export class GitHubAuthenticationProvider implements vscode.AuthenticationProvid
 
 			const sessions = await this._sessionsPromise;
 
-			const accounts = new Set(sessions.map(session => session.account.label));
-			const existingLogin = accounts.size <= 1 ? sessions[0]?.account.label : await vscode.window.showQuickPick([...accounts], { placeHolder: 'Choose an account that you would like to log in to' });
+			// First we use the account specified in the options, otherwise we use the first account we have to seed auth.
+			const loginWith = options?.account?.label ?? sessions[0]?.account.label;
+			this._logger.info(`Logging in with '${loginWith ? loginWith : 'any'}' account...`);
+
 			const scopeString = sortedScopes.join(' ');
-			const token = await this._githubServer.login(scopeString, existingLogin);
+			const token = await this._githubServer.login(scopeString, loginWith);
 			const session = await this.tokenToSession(token, scopes);
 			this.afterSessionLoad(session);
 
-			const sessionIndex = sessions.findIndex(s => s.id === session.id || arrayEquals([...s.scopes].sort(), sortedScopes));
+			const sessionIndex = sessions.findIndex(
+				this._supportsMultipleAccounts
+					? s => s.account.id === session.account.id && arrayEquals([...s.scopes].sort(), sortedScopes)
+					: s => s.id === session.id || arrayEquals([...s.scopes].sort(), sortedScopes)
+			);
 			const removed = new Array<vscode.AuthenticationSession>();
 			if (sessionIndex > -1) {
 				removed.push(...sessions.splice(sessionIndex, 1, session));
@@ -383,4 +424,26 @@ export class GitHubAuthenticationProvider implements vscode.AuthenticationProvid
 			throw e;
 		}
 	}
+
+	private _shouldSupportMultipleAccounts(): boolean {
+		// First check if there is a setting value to allow user to override the default
+		const inspect = vscode.workspace.getConfiguration('github.experimental').inspect<boolean>('multipleAccounts');
+		if (inspect?.workspaceFolderValue !== undefined) {
+			this._logger.trace(`Acquired multi-account enablement value from 'workspaceFolderValue'. Value: ${inspect.workspaceFolderValue}`);
+			return inspect.workspaceFolderValue;
+		}
+		if (inspect?.workspaceValue !== undefined) {
+			this._logger.trace(`Acquired multi-account enablement value from 'workspaceValue'. Value: ${inspect.workspaceValue}`);
+			return inspect.workspaceValue;
+		}
+		if (inspect?.globalValue !== undefined) {
+			this._logger.trace(`Acquired multi-account enablement value from 'globalValue'. Value: ${inspect.globalValue}`);
+			return inspect.globalValue;
+		}
+
+		const value = vscode.env.uriScheme !== 'vscode';
+		this._logger.trace(`Acquired multi-account enablement value from default. Value: ${value} because of uriScheme: ${vscode.env.uriScheme}`);
+		// If no setting or experiment value is found, default to false on stable and true on insiders
+		return value;
+	}
 }
diff --git a/extensions/github-authentication/src/githubServer.ts b/extensions/github-authentication/src/githubServer.ts
index af2cf22724f..a9f94ccf65d 100644
--- a/extensions/github-authentication/src/githubServer.ts
+++ b/extensions/github-authentication/src/githubServer.ts
@@ -197,7 +197,7 @@ export class GitHubServer implements IGitHubServer {
 				throw new Error(`${result.status} ${result.statusText}`);
 			}
 		} catch (e) {
-			this._logger.warn('Failed to delete token from server.' + e.message ?? e);
+			this._logger.warn('Failed to delete token from server.' + (e.message ?? e));
 		}
 	}
 
@@ -228,9 +228,9 @@ export class GitHubServer implements IGitHubServer {
 
 		if (result.ok) {
 			try {
-				const json = await result.json();
+				const json = await result.json() as { id: number; login: string };
 				this._logger.info('Got account info!');
-				return { id: json.id, accountName: json.login };
+				return { id: `${json.id}`, accountName: json.login };
 			} catch (e) {
 				this._logger.error(`Unexpected error parsing response from GitHub: ${e.message ?? e}`);
 				throw e;
diff --git a/extensions/github-authentication/yarn.lock b/extensions/github-authentication/yarn.lock
deleted file mode 100644
index 8ef2192404a..00000000000
--- a/extensions/github-authentication/yarn.lock
+++ /dev/null
@@ -1,210 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@microsoft/1ds-core-js@4.0.3", "@microsoft/1ds-core-js@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@microsoft/1ds-core-js/-/1ds-core-js-4.0.3.tgz#c8a92c623745a9595e06558a866658480c33bdf9"
-  integrity sha512-FrxNLVAPsAvD7+l63TlNS/Kodvpct2WulpDSn1dI4Xuy0kF4E2H867kHdwL/iY1Bj3zA3FSy/jvE4+OcDws7ug==
-  dependencies:
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/1ds-post-js@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@microsoft/1ds-post-js/-/1ds-post-js-4.0.3.tgz#cfcb20bb23fb6215d3f0732f60f5b7df3e624f86"
-  integrity sha512-uewvmUtXKd7ttypiKQGdYI6i7UUpPkOznLayzIFrJ4r2xnG6jhPjpKRncHFXPQcM4XSWO3yf5PQ3xAbPq9t7ZQ==
-  dependencies:
-    "@microsoft/1ds-core-js" "4.0.3"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-channel-js@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.0.4.tgz#247b6fe2158fad9826cbcdf7304f885766b36624"
-  integrity sha512-6TlfExmErQ8Y+/ChbkyWl+jyt4wg3T6p7lwXDsUCB0LgZmlEWMaCUS0YlT73JCWmE8j7vxW8yUm0lgsgmHns3A==
-  dependencies:
-    "@microsoft/applicationinsights-common" "3.0.4"
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-common@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-common/-/applicationinsights-common-3.0.4.tgz#c4aa53ba343f5b3c7fbf54cddd3c86a5bdcd95dc"
-  integrity sha512-r5gWaw/K9+tKfuo2GtDiDiKASgOkPOCrKW+wZzFvuR06uuwvWjbVQ6yW/YbnfuhRF5M65ksUiMi0eCMwEOGq7Q==
-  dependencies:
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-core-js@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.0.4.tgz#008308b786930d94a1de8a1fbb4af0351b74653e"
-  integrity sha512-anxy5kEkqBmVoEqJiJzaaXXA0wzqZi9U4zGd05xFJ04lWckP8dG3zyT3+GGdg7rDelqLTNGxndeYoFmDv63u1g==
-  dependencies:
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-shims@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz#3865b73ace8405b9c4618cc5c571f2fe3876f06f"
-  integrity sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==
-  dependencies:
-    "@nevware21/ts-utils" ">= 0.9.4 < 2.x"
-
-"@microsoft/applicationinsights-web-basic@^3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.0.4.tgz#9a23323276b4a5a0dc6a352e2de5d75e3c16b534"
-  integrity sha512-KfoxPlLlf0JT12ADb23C5iGye/yFouoMgHEKULxkSQcYY9SsW/8rVrqqvoYKAL+u215CZU2A8Kc8sR3ehEaPCQ==
-  dependencies:
-    "@microsoft/applicationinsights-channel-js" "3.0.4"
-    "@microsoft/applicationinsights-common" "3.0.4"
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/dynamicproto-js@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.2.tgz#e57fbec2e7067d48b7e8e1e1c1d354028ef718a6"
-  integrity sha512-MB8trWaFREpmb037k/d0bB7T2BP7Ai24w1e1tbz3ASLB0/lwphsq3Nq8S9I5AsI5vs4zAQT+SB5nC5/dLYTiOg==
-  dependencies:
-    "@nevware21/ts-utils" ">= 0.9.4 < 2.x"
-
-"@nevware21/ts-async@>= 0.3.0 < 2.x":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@nevware21/ts-async/-/ts-async-0.3.0.tgz#a8b97ba01065fc930de9a3f4dd4a05e862becc6c"
-  integrity sha512-ZUcgUH12LN/F6nzN0cYd0F/rJaMLmXr0EHVTyYfaYmK55bdwE4338uue4UiVoRqHVqNW4KDUrJc49iGogHKeWA==
-  dependencies:
-    "@nevware21/ts-utils" ">= 0.10.0 < 2.x"
-
-"@nevware21/ts-utils@>= 0.10.0 < 2.x", "@nevware21/ts-utils@>= 0.10.1 < 2.x", "@nevware21/ts-utils@>= 0.9.4 < 2.x":
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@nevware21/ts-utils/-/ts-utils-0.10.1.tgz#aa65abc71eba06749a396598f22263d26f796ac7"
-  integrity sha512-pMny25NnF2/MJwdqC3Iyjm2pGIXNxni4AROpcqDeWa+td9JMUY4bUS9uU9XW+BoBRqTLUL+WURF9SOd/6OQzRg==
-
-"@types/mocha@^9.1.1":
-  version "9.1.1"
-  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-9.1.1.tgz#e7c4f1001eefa4b8afbd1eee27a237fee3bf29c4"
-  integrity sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==
-
-"@types/node-fetch@^2.5.7":
-  version "2.5.7"
-  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.7.tgz#20a2afffa882ab04d44ca786449a276f9f6bbf3c"
-  integrity sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==
-  dependencies:
-    "@types/node" "*"
-    form-data "^3.0.0"
-
-"@types/node@*":
-  version "14.0.5"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.5.tgz#3d03acd3b3414cf67faf999aed11682ed121f22b"
-  integrity sha512-90hiq6/VqtQgX8Sp0EzeIsv3r+ellbGj4URKj5j30tLlZvRUpnAe9YbYnjl3pJM93GyXU0tghHhvXHq+5rnCKA==
-
-"@types/node@20.x":
-  version "20.11.24"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792"
-  integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==
-  dependencies:
-    undici-types "~5.26.4"
-
-"@vscode/extension-telemetry@^0.9.0":
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.9.0.tgz#8c6c61e253ff304f46045f04edd60059b144417a"
-  integrity sha512-37RxGHXrs3GoXPgCUKQhghEu0gxs8j27RLjQwwtSf4WhPdJKz8UrqMYzpsXlliQ05zURYmtdGZst9C6+hfWXaQ==
-  dependencies:
-    "@microsoft/1ds-core-js" "^4.0.3"
-    "@microsoft/1ds-post-js" "^4.0.3"
-    "@microsoft/applicationinsights-web-basic" "^3.0.4"
-
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
-
-combined-stream@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
-  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
-  dependencies:
-    delayed-stream "~1.0.0"
-
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
-
-form-data@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.0.tgz#31b7e39c85f1355b7139ee0c647cf0de7f83c682"
-  integrity sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.8"
-    mime-types "^2.1.12"
-
-mime-db@1.44.0:
-  version "1.44.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
-  integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
-
-mime-types@^2.1.12:
-  version "2.1.27"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
-  integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
-  dependencies:
-    mime-db "1.44.0"
-
-node-fetch@2.6.7:
-  version "2.6.7"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
-  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
-  dependencies:
-    whatwg-url "^5.0.0"
-
-tas-client@0.2.33:
-  version "0.2.33"
-  resolved "https://registry.yarnpkg.com/tas-client/-/tas-client-0.2.33.tgz#451bf114a8a64748030ce4068ab7d079958402e6"
-  integrity sha512-V+uqV66BOQnWxvI6HjDnE4VkInmYZUQ4dgB7gzaDyFyFSK1i1nF/j7DpS9UbQAgV9NaF1XpcyuavnM1qOeiEIg==
-
-tr46@~0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-  integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
-
-vscode-tas-client@^0.1.84:
-  version "0.1.84"
-  resolved "https://registry.yarnpkg.com/vscode-tas-client/-/vscode-tas-client-0.1.84.tgz#906bdcfd8c9e1dc04321d6bc0335184f9119968e"
-  integrity sha512-rUTrUopV+70hvx1hW5ebdw1nd6djxubkLvVxjGdyD/r5v/wcVF41LIfiAtbm5qLZDtQdsMH1IaCuDoluoIa88w==
-  dependencies:
-    tas-client "0.2.33"
-
-webidl-conversions@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-  integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
-
-whatwg-url@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
-  integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0=
-  dependencies:
-    tr46 "~0.0.3"
-    webidl-conversions "^3.0.0"
diff --git a/extensions/github/.npmrc b/extensions/github/.npmrc
new file mode 100644
index 00000000000..a9c57709666
--- /dev/null
+++ b/extensions/github/.npmrc
@@ -0,0 +1,2 @@
+legacy-peer-deps="true"
+timeout=180000
diff --git a/extensions/github/.vscodeignore b/extensions/github/.vscodeignore
index ed8fa3a7e38..24b1bd4e73a 100644
--- a/extensions/github/.vscodeignore
+++ b/extensions/github/.vscodeignore
@@ -4,4 +4,4 @@ out/**
 build/**
 extension.webpack.config.js
 tsconfig.json
-yarn.lock
+package-lock.json
diff --git a/extensions/github/package-lock.json b/extensions/github/package-lock.json
new file mode 100644
index 00000000000..41de66d1a9b
--- /dev/null
+++ b/extensions/github/package-lock.json
@@ -0,0 +1,524 @@
+{
+  "name": "github",
+  "version": "0.0.1",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "github",
+      "version": "0.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/graphql": "5.0.5",
+        "@octokit/graphql-schema": "14.4.0",
+        "@octokit/rest": "19.0.4",
+        "@vscode/extension-telemetry": "^0.9.0",
+        "tunnel": "^0.0.6"
+      },
+      "devDependencies": {
+        "@types/node": "20.x"
+      },
+      "engines": {
+        "vscode": "^1.41.0"
+      }
+    },
+    "node_modules/@microsoft/1ds-core-js": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.0.3.tgz",
+      "integrity": "sha512-FrxNLVAPsAvD7+l63TlNS/Kodvpct2WulpDSn1dI4Xuy0kF4E2H867kHdwL/iY1Bj3zA3FSy/jvE4+OcDws7ug==",
+      "dependencies": {
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/1ds-post-js": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.0.3.tgz",
+      "integrity": "sha512-uewvmUtXKd7ttypiKQGdYI6i7UUpPkOznLayzIFrJ4r2xnG6jhPjpKRncHFXPQcM4XSWO3yf5PQ3xAbPq9t7ZQ==",
+      "dependencies": {
+        "@microsoft/1ds-core-js": "4.0.3",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-channel-js": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.0.4.tgz",
+      "integrity": "sha512-6TlfExmErQ8Y+/ChbkyWl+jyt4wg3T6p7lwXDsUCB0LgZmlEWMaCUS0YlT73JCWmE8j7vxW8yUm0lgsgmHns3A==",
+      "dependencies": {
+        "@microsoft/applicationinsights-common": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-common": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.0.4.tgz",
+      "integrity": "sha512-r5gWaw/K9+tKfuo2GtDiDiKASgOkPOCrKW+wZzFvuR06uuwvWjbVQ6yW/YbnfuhRF5M65ksUiMi0eCMwEOGq7Q==",
+      "dependencies": {
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-core-js": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.0.4.tgz",
+      "integrity": "sha512-anxy5kEkqBmVoEqJiJzaaXXA0wzqZi9U4zGd05xFJ04lWckP8dG3zyT3+GGdg7rDelqLTNGxndeYoFmDv63u1g==",
+      "dependencies": {
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-shims": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
+      "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-web-basic": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.0.4.tgz",
+      "integrity": "sha512-KfoxPlLlf0JT12ADb23C5iGye/yFouoMgHEKULxkSQcYY9SsW/8rVrqqvoYKAL+u215CZU2A8Kc8sR3ehEaPCQ==",
+      "dependencies": {
+        "@microsoft/applicationinsights-channel-js": "3.0.4",
+        "@microsoft/applicationinsights-common": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/dynamicproto-js": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.2.tgz",
+      "integrity": "sha512-MB8trWaFREpmb037k/d0bB7T2BP7Ai24w1e1tbz3ASLB0/lwphsq3Nq8S9I5AsI5vs4zAQT+SB5nC5/dLYTiOg==",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+      }
+    },
+    "node_modules/@nevware21/ts-async": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.3.0.tgz",
+      "integrity": "sha512-ZUcgUH12LN/F6nzN0cYd0F/rJaMLmXr0EHVTyYfaYmK55bdwE4338uue4UiVoRqHVqNW4KDUrJc49iGogHKeWA==",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.10.0 < 2.x"
+      }
+    },
+    "node_modules/@nevware21/ts-utils": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.10.1.tgz",
+      "integrity": "sha512-pMny25NnF2/MJwdqC3Iyjm2pGIXNxni4AROpcqDeWa+td9JMUY4bUS9uU9XW+BoBRqTLUL+WURF9SOd/6OQzRg=="
+    },
+    "node_modules/@octokit/auth-token": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-3.0.1.tgz",
+      "integrity": "sha512-/USkK4cioY209wXRpund6HZzHo9GmjakpV9ycOkpMcMxMk7QVcVFVyCMtzvXYiHsB2crgDgrtNYSELYFBXhhaA==",
+      "dependencies": {
+        "@octokit/types": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@octokit/auth-token/node_modules/@octokit/openapi-types": {
+      "version": "13.6.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-13.6.0.tgz",
+      "integrity": "sha512-bxftLwoZ2J6zsU1rzRvk0O32j7lVB0NWWn+P5CDHn9zPzytasR3hdAeXlTngRDkqv1LyEeuy5psVnDkmOSwrcQ=="
+    },
+    "node_modules/@octokit/auth-token/node_modules/@octokit/types": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-7.2.0.tgz",
+      "integrity": "sha512-pYQ/a1U6mHptwhGyp6SvsiM4bWP2s3V95olUeTxas85D/2kN78yN5C8cGN+P4LwJSWUqIEyvq0Qn2WUn6NQRjw==",
+      "dependencies": {
+        "@octokit/openapi-types": "^13.6.0"
+      }
+    },
+    "node_modules/@octokit/core": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-4.0.5.tgz",
+      "integrity": "sha512-4R3HeHTYVHCfzSAi0C6pbGXV8UDI5Rk+k3G7kLVNckswN9mvpOzW9oENfjfH3nEmzg8y3AmKmzs8Sg6pLCeOCA==",
+      "dependencies": {
+        "@octokit/auth-token": "^3.0.0",
+        "@octokit/graphql": "^5.0.0",
+        "@octokit/request": "^6.0.0",
+        "@octokit/request-error": "^3.0.0",
+        "@octokit/types": "^7.0.0",
+        "before-after-hook": "^2.2.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@octokit/core/node_modules/@octokit/openapi-types": {
+      "version": "13.6.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-13.6.0.tgz",
+      "integrity": "sha512-bxftLwoZ2J6zsU1rzRvk0O32j7lVB0NWWn+P5CDHn9zPzytasR3hdAeXlTngRDkqv1LyEeuy5psVnDkmOSwrcQ=="
+    },
+    "node_modules/@octokit/core/node_modules/@octokit/types": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-7.2.0.tgz",
+      "integrity": "sha512-pYQ/a1U6mHptwhGyp6SvsiM4bWP2s3V95olUeTxas85D/2kN78yN5C8cGN+P4LwJSWUqIEyvq0Qn2WUn6NQRjw==",
+      "dependencies": {
+        "@octokit/openapi-types": "^13.6.0"
+      }
+    },
+    "node_modules/@octokit/endpoint": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-7.0.1.tgz",
+      "integrity": "sha512-/wTXAJwt0HzJ2IeE4kQXO+mBScfzyCkI0hMtkIaqyXd9zg76OpOfNQfHL9FlaxAV2RsNiOXZibVWloy8EexENg==",
+      "dependencies": {
+        "@octokit/types": "^7.0.0",
+        "is-plain-object": "^5.0.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@octokit/endpoint/node_modules/@octokit/openapi-types": {
+      "version": "13.6.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-13.6.0.tgz",
+      "integrity": "sha512-bxftLwoZ2J6zsU1rzRvk0O32j7lVB0NWWn+P5CDHn9zPzytasR3hdAeXlTngRDkqv1LyEeuy5psVnDkmOSwrcQ=="
+    },
+    "node_modules/@octokit/endpoint/node_modules/@octokit/types": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-7.2.0.tgz",
+      "integrity": "sha512-pYQ/a1U6mHptwhGyp6SvsiM4bWP2s3V95olUeTxas85D/2kN78yN5C8cGN+P4LwJSWUqIEyvq0Qn2WUn6NQRjw==",
+      "dependencies": {
+        "@octokit/openapi-types": "^13.6.0"
+      }
+    },
+    "node_modules/@octokit/graphql": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-5.0.5.tgz",
+      "integrity": "sha512-Qwfvh3xdqKtIznjX9lz2D458r7dJPP8l6r4GQkIdWQouZwHQK0mVT88uwiU2bdTU2OtT1uOlKpRciUWldpG0yQ==",
+      "dependencies": {
+        "@octokit/request": "^6.0.0",
+        "@octokit/types": "^9.0.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@octokit/graphql-schema": {
+      "version": "14.4.0",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql-schema/-/graphql-schema-14.4.0.tgz",
+      "integrity": "sha512-+O6/dsLlR6V9gv+t1lqsN+x73TLwyQWZpd3M8/eYnuny7VaznV9TAyUxf18tX8WBBS5IqtlLDk1nG+aSTPRZzQ==",
+      "dependencies": {
+        "graphql": "^16.0.0",
+        "graphql-tag": "^2.10.3"
+      }
+    },
+    "node_modules/@octokit/openapi-types": {
+      "version": "17.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-17.1.0.tgz",
+      "integrity": "sha512-rnI26BAITDZTo5vqFOmA7oX4xRd18rO+gcK4MiTpJmsRMxAw0JmevNjPsjpry1bb9SVNo56P/0kbiyXXa4QluA=="
+    },
+    "node_modules/@octokit/plugin-paginate-rest": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-4.2.0.tgz",
+      "integrity": "sha512-8otLCIK9esfmOCY14CBnG/xPqv0paf14rc+s9tHpbOpeFwrv5CnECKW1qdqMAT60ngAa9eB1bKQ+l2YCpi0HPQ==",
+      "dependencies": {
+        "@octokit/types": "^7.2.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      },
+      "peerDependencies": {
+        "@octokit/core": ">=4"
+      }
+    },
+    "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/openapi-types": {
+      "version": "13.6.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-13.6.0.tgz",
+      "integrity": "sha512-bxftLwoZ2J6zsU1rzRvk0O32j7lVB0NWWn+P5CDHn9zPzytasR3hdAeXlTngRDkqv1LyEeuy5psVnDkmOSwrcQ=="
+    },
+    "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/types": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-7.2.0.tgz",
+      "integrity": "sha512-pYQ/a1U6mHptwhGyp6SvsiM4bWP2s3V95olUeTxas85D/2kN78yN5C8cGN+P4LwJSWUqIEyvq0Qn2WUn6NQRjw==",
+      "dependencies": {
+        "@octokit/openapi-types": "^13.6.0"
+      }
+    },
+    "node_modules/@octokit/plugin-request-log": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz",
+      "integrity": "sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==",
+      "peerDependencies": {
+        "@octokit/core": ">=3"
+      }
+    },
+    "node_modules/@octokit/plugin-rest-endpoint-methods": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-6.4.0.tgz",
+      "integrity": "sha512-YP4eUqZ6vORy/eZOTdil1ZSrMt0kv7i/CVw+HhC2C0yJN+IqTc/rot957JQ7JfyeJD6HZOjLg6Jp1o9cPhI9KA==",
+      "dependencies": {
+        "@octokit/types": "^7.2.0",
+        "deprecation": "^2.3.1"
+      },
+      "engines": {
+        "node": ">= 14"
+      },
+      "peerDependencies": {
+        "@octokit/core": ">=3"
+      }
+    },
+    "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/openapi-types": {
+      "version": "13.6.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-13.6.0.tgz",
+      "integrity": "sha512-bxftLwoZ2J6zsU1rzRvk0O32j7lVB0NWWn+P5CDHn9zPzytasR3hdAeXlTngRDkqv1LyEeuy5psVnDkmOSwrcQ=="
+    },
+    "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-7.2.0.tgz",
+      "integrity": "sha512-pYQ/a1U6mHptwhGyp6SvsiM4bWP2s3V95olUeTxas85D/2kN78yN5C8cGN+P4LwJSWUqIEyvq0Qn2WUn6NQRjw==",
+      "dependencies": {
+        "@octokit/openapi-types": "^13.6.0"
+      }
+    },
+    "node_modules/@octokit/request": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-6.2.1.tgz",
+      "integrity": "sha512-gYKRCia3cpajRzDSU+3pt1q2OcuC6PK8PmFIyxZDWCzRXRSIBH8jXjFJ8ZceoygBIm0KsEUg4x1+XcYBz7dHPQ==",
+      "dependencies": {
+        "@octokit/endpoint": "^7.0.0",
+        "@octokit/request-error": "^3.0.0",
+        "@octokit/types": "^7.0.0",
+        "is-plain-object": "^5.0.0",
+        "node-fetch": "^2.6.7",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@octokit/request-error": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-3.0.1.tgz",
+      "integrity": "sha512-ym4Bp0HTP7F3VFssV88WD1ZyCIRoE8H35pXSKwLeMizcdZAYc/t6N9X9Yr9n6t3aG9IH75XDnZ6UeZph0vHMWQ==",
+      "dependencies": {
+        "@octokit/types": "^7.0.0",
+        "deprecation": "^2.0.0",
+        "once": "^1.4.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@octokit/request-error/node_modules/@octokit/openapi-types": {
+      "version": "13.6.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-13.6.0.tgz",
+      "integrity": "sha512-bxftLwoZ2J6zsU1rzRvk0O32j7lVB0NWWn+P5CDHn9zPzytasR3hdAeXlTngRDkqv1LyEeuy5psVnDkmOSwrcQ=="
+    },
+    "node_modules/@octokit/request-error/node_modules/@octokit/types": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-7.2.0.tgz",
+      "integrity": "sha512-pYQ/a1U6mHptwhGyp6SvsiM4bWP2s3V95olUeTxas85D/2kN78yN5C8cGN+P4LwJSWUqIEyvq0Qn2WUn6NQRjw==",
+      "dependencies": {
+        "@octokit/openapi-types": "^13.6.0"
+      }
+    },
+    "node_modules/@octokit/request/node_modules/@octokit/openapi-types": {
+      "version": "13.6.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-13.6.0.tgz",
+      "integrity": "sha512-bxftLwoZ2J6zsU1rzRvk0O32j7lVB0NWWn+P5CDHn9zPzytasR3hdAeXlTngRDkqv1LyEeuy5psVnDkmOSwrcQ=="
+    },
+    "node_modules/@octokit/request/node_modules/@octokit/types": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-7.2.0.tgz",
+      "integrity": "sha512-pYQ/a1U6mHptwhGyp6SvsiM4bWP2s3V95olUeTxas85D/2kN78yN5C8cGN+P4LwJSWUqIEyvq0Qn2WUn6NQRjw==",
+      "dependencies": {
+        "@octokit/openapi-types": "^13.6.0"
+      }
+    },
+    "node_modules/@octokit/rest": {
+      "version": "19.0.4",
+      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-19.0.4.tgz",
+      "integrity": "sha512-LwG668+6lE8zlSYOfwPj4FxWdv/qFXYBpv79TWIQEpBLKA9D/IMcWsF/U9RGpA3YqMVDiTxpgVpEW3zTFfPFTA==",
+      "dependencies": {
+        "@octokit/core": "^4.0.0",
+        "@octokit/plugin-paginate-rest": "^4.0.0",
+        "@octokit/plugin-request-log": "^1.0.4",
+        "@octokit/plugin-rest-endpoint-methods": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@octokit/types": {
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.2.0.tgz",
+      "integrity": "sha512-xySzJG4noWrIBFyMu4lg4tu9vAgNg9S0aoLRONhAEz6ueyi1evBzb40HitIosaYS4XOexphG305IVcLrIX/30g==",
+      "dependencies": {
+        "@octokit/openapi-types": "^17.1.0"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "20.11.24",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
+      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/@vscode/extension-telemetry": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.0.tgz",
+      "integrity": "sha512-37RxGHXrs3GoXPgCUKQhghEu0gxs8j27RLjQwwtSf4WhPdJKz8UrqMYzpsXlliQ05zURYmtdGZst9C6+hfWXaQ==",
+      "dependencies": {
+        "@microsoft/1ds-core-js": "^4.0.3",
+        "@microsoft/1ds-post-js": "^4.0.3",
+        "@microsoft/applicationinsights-web-basic": "^3.0.4"
+      },
+      "engines": {
+        "vscode": "^1.75.0"
+      }
+    },
+    "node_modules/before-after-hook": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.2.tgz",
+      "integrity": "sha512-3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ=="
+    },
+    "node_modules/deprecation": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
+      "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ=="
+    },
+    "node_modules/graphql": {
+      "version": "16.8.1",
+      "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.8.1.tgz",
+      "integrity": "sha512-59LZHPdGZVh695Ud9lRzPBVTtlX9ZCV150Er2W43ro37wVof0ctenSaskPPjN7lVTIN8mSZt8PHUNKZuNQUuxw==",
+      "engines": {
+        "node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0"
+      }
+    },
+    "node_modules/graphql-tag": {
+      "version": "2.12.6",
+      "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.12.6.tgz",
+      "integrity": "sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "graphql": "^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
+      }
+    },
+    "node_modules/is-plain-object": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/node-fetch": {
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E= sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+    },
+    "node_modules/tslib": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
+      "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ=="
+    },
+    "node_modules/tunnel": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
+      "engines": {
+        "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    },
+    "node_modules/universal-user-agent": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
+      "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w=="
+    },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+    },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0= sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+    }
+  }
+}
diff --git a/extensions/github/package.nls.json b/extensions/github/package.nls.json
index ad3cf82e010..5ead7903af2 100644
--- a/extensions/github/package.nls.json
+++ b/extensions/github/package.nls.json
@@ -5,7 +5,7 @@
 	"config.gitAuthentication": "Controls whether to enable automatic GitHub authentication for git commands within VS Code.",
 	"config.gitProtocol": "Controls which protocol is used to clone a GitHub repository",
 	"welcome.publishFolder": {
-		"message": "You can directly publish this folder to a GitHub repository. Once published, you'll have access to source control features powered by git and GitHub.\n[$(github) Publish to GitHub](command:github.publish)",
+		"message": "You can directly publish this folder to a GitHub repository. Once published, you'll have access to source control features powered by Git and GitHub.\n[$(github) Publish to GitHub](command:github.publish)",
 		"comment": [
 			"{Locked='$(github)'}",
 			"Do not translate '$(github)'. It will be rendered as an icon",
@@ -15,7 +15,7 @@
 		]
 	},
 	"welcome.publishWorkspaceFolder": {
-		"message": "You can directly publish a workspace folder to a GitHub repository. Once published, you'll have access to source control features powered by git and GitHub.\n[$(github) Publish to GitHub](command:github.publish)",
+		"message": "You can directly publish a workspace folder to a GitHub repository. Once published, you'll have access to source control features powered by Git and GitHub.\n[$(github) Publish to GitHub](command:github.publish)",
 		"comment": [
 			"{Locked='$(github)'}",
 			"Do not translate '$(github)'. It will be rendered as an icon",
diff --git a/extensions/github/yarn.lock b/extensions/github/yarn.lock
deleted file mode 100644
index 912a28439be..00000000000
--- a/extensions/github/yarn.lock
+++ /dev/null
@@ -1,326 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@microsoft/1ds-core-js@4.0.3", "@microsoft/1ds-core-js@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@microsoft/1ds-core-js/-/1ds-core-js-4.0.3.tgz#c8a92c623745a9595e06558a866658480c33bdf9"
-  integrity sha512-FrxNLVAPsAvD7+l63TlNS/Kodvpct2WulpDSn1dI4Xuy0kF4E2H867kHdwL/iY1Bj3zA3FSy/jvE4+OcDws7ug==
-  dependencies:
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/1ds-post-js@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@microsoft/1ds-post-js/-/1ds-post-js-4.0.3.tgz#cfcb20bb23fb6215d3f0732f60f5b7df3e624f86"
-  integrity sha512-uewvmUtXKd7ttypiKQGdYI6i7UUpPkOznLayzIFrJ4r2xnG6jhPjpKRncHFXPQcM4XSWO3yf5PQ3xAbPq9t7ZQ==
-  dependencies:
-    "@microsoft/1ds-core-js" "4.0.3"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-channel-js@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.0.4.tgz#247b6fe2158fad9826cbcdf7304f885766b36624"
-  integrity sha512-6TlfExmErQ8Y+/ChbkyWl+jyt4wg3T6p7lwXDsUCB0LgZmlEWMaCUS0YlT73JCWmE8j7vxW8yUm0lgsgmHns3A==
-  dependencies:
-    "@microsoft/applicationinsights-common" "3.0.4"
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-common@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-common/-/applicationinsights-common-3.0.4.tgz#c4aa53ba343f5b3c7fbf54cddd3c86a5bdcd95dc"
-  integrity sha512-r5gWaw/K9+tKfuo2GtDiDiKASgOkPOCrKW+wZzFvuR06uuwvWjbVQ6yW/YbnfuhRF5M65ksUiMi0eCMwEOGq7Q==
-  dependencies:
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-core-js@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.0.4.tgz#008308b786930d94a1de8a1fbb4af0351b74653e"
-  integrity sha512-anxy5kEkqBmVoEqJiJzaaXXA0wzqZi9U4zGd05xFJ04lWckP8dG3zyT3+GGdg7rDelqLTNGxndeYoFmDv63u1g==
-  dependencies:
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-shims@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz#3865b73ace8405b9c4618cc5c571f2fe3876f06f"
-  integrity sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==
-  dependencies:
-    "@nevware21/ts-utils" ">= 0.9.4 < 2.x"
-
-"@microsoft/applicationinsights-web-basic@^3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.0.4.tgz#9a23323276b4a5a0dc6a352e2de5d75e3c16b534"
-  integrity sha512-KfoxPlLlf0JT12ADb23C5iGye/yFouoMgHEKULxkSQcYY9SsW/8rVrqqvoYKAL+u215CZU2A8Kc8sR3ehEaPCQ==
-  dependencies:
-    "@microsoft/applicationinsights-channel-js" "3.0.4"
-    "@microsoft/applicationinsights-common" "3.0.4"
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/dynamicproto-js@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.2.tgz#e57fbec2e7067d48b7e8e1e1c1d354028ef718a6"
-  integrity sha512-MB8trWaFREpmb037k/d0bB7T2BP7Ai24w1e1tbz3ASLB0/lwphsq3Nq8S9I5AsI5vs4zAQT+SB5nC5/dLYTiOg==
-  dependencies:
-    "@nevware21/ts-utils" ">= 0.9.4 < 2.x"
-
-"@nevware21/ts-async@>= 0.3.0 < 2.x":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@nevware21/ts-async/-/ts-async-0.3.0.tgz#a8b97ba01065fc930de9a3f4dd4a05e862becc6c"
-  integrity sha512-ZUcgUH12LN/F6nzN0cYd0F/rJaMLmXr0EHVTyYfaYmK55bdwE4338uue4UiVoRqHVqNW4KDUrJc49iGogHKeWA==
-  dependencies:
-    "@nevware21/ts-utils" ">= 0.10.0 < 2.x"
-
-"@nevware21/ts-utils@>= 0.10.0 < 2.x", "@nevware21/ts-utils@>= 0.10.1 < 2.x", "@nevware21/ts-utils@>= 0.9.4 < 2.x":
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@nevware21/ts-utils/-/ts-utils-0.10.1.tgz#aa65abc71eba06749a396598f22263d26f796ac7"
-  integrity sha512-pMny25NnF2/MJwdqC3Iyjm2pGIXNxni4AROpcqDeWa+td9JMUY4bUS9uU9XW+BoBRqTLUL+WURF9SOd/6OQzRg==
-
-"@octokit/auth-token@^3.0.0":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-3.0.1.tgz#88bc2baf5d706cb258474e722a720a8365dff2ec"
-  integrity sha512-/USkK4cioY209wXRpund6HZzHo9GmjakpV9ycOkpMcMxMk7QVcVFVyCMtzvXYiHsB2crgDgrtNYSELYFBXhhaA==
-  dependencies:
-    "@octokit/types" "^7.0.0"
-
-"@octokit/core@^4.0.0":
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/@octokit/core/-/core-4.0.5.tgz#589e68c0a35d2afdcd41dafceab072c2fbc6ab5f"
-  integrity sha512-4R3HeHTYVHCfzSAi0C6pbGXV8UDI5Rk+k3G7kLVNckswN9mvpOzW9oENfjfH3nEmzg8y3AmKmzs8Sg6pLCeOCA==
-  dependencies:
-    "@octokit/auth-token" "^3.0.0"
-    "@octokit/graphql" "^5.0.0"
-    "@octokit/request" "^6.0.0"
-    "@octokit/request-error" "^3.0.0"
-    "@octokit/types" "^7.0.0"
-    before-after-hook "^2.2.0"
-    universal-user-agent "^6.0.0"
-
-"@octokit/endpoint@^7.0.0":
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-7.0.1.tgz#cb0d03e62e8762f3c80e52b025179de81899a823"
-  integrity sha512-/wTXAJwt0HzJ2IeE4kQXO+mBScfzyCkI0hMtkIaqyXd9zg76OpOfNQfHL9FlaxAV2RsNiOXZibVWloy8EexENg==
-  dependencies:
-    "@octokit/types" "^7.0.0"
-    is-plain-object "^5.0.0"
-    universal-user-agent "^6.0.0"
-
-"@octokit/graphql-schema@14.4.0":
-  version "14.4.0"
-  resolved "https://registry.yarnpkg.com/@octokit/graphql-schema/-/graphql-schema-14.4.0.tgz#9336f64c3103a2e82ee3ce060c3ccf99d177d7f0"
-  integrity sha512-+O6/dsLlR6V9gv+t1lqsN+x73TLwyQWZpd3M8/eYnuny7VaznV9TAyUxf18tX8WBBS5IqtlLDk1nG+aSTPRZzQ==
-  dependencies:
-    graphql "^16.0.0"
-    graphql-tag "^2.10.3"
-
-"@octokit/graphql@5.0.5":
-  version "5.0.5"
-  resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-5.0.5.tgz#a4cb3ea73f83b861893a6370ee82abb36e81afd2"
-  integrity sha512-Qwfvh3xdqKtIznjX9lz2D458r7dJPP8l6r4GQkIdWQouZwHQK0mVT88uwiU2bdTU2OtT1uOlKpRciUWldpG0yQ==
-  dependencies:
-    "@octokit/request" "^6.0.0"
-    "@octokit/types" "^9.0.0"
-    universal-user-agent "^6.0.0"
-
-"@octokit/graphql@^5.0.0":
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-5.0.1.tgz#a06982514ad131fb6fbb9da968653b2233fade9b"
-  integrity sha512-sxmnewSwAixkP1TrLdE6yRG53eEhHhDTYUykUwdV9x8f91WcbhunIHk9x1PZLALdBZKRPUO2HRcm4kezZ79HoA==
-  dependencies:
-    "@octokit/request" "^6.0.0"
-    "@octokit/types" "^7.0.0"
-    universal-user-agent "^6.0.0"
-
-"@octokit/openapi-types@^13.6.0":
-  version "13.6.0"
-  resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-13.6.0.tgz#381884008e23fd82fd444553f6b4dcd24a5c4a4d"
-  integrity sha512-bxftLwoZ2J6zsU1rzRvk0O32j7lVB0NWWn+P5CDHn9zPzytasR3hdAeXlTngRDkqv1LyEeuy5psVnDkmOSwrcQ==
-
-"@octokit/openapi-types@^17.1.0":
-  version "17.1.0"
-  resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-17.1.0.tgz#9a712b5bb9d644940d8a1f24115c798c317a64a5"
-  integrity sha512-rnI26BAITDZTo5vqFOmA7oX4xRd18rO+gcK4MiTpJmsRMxAw0JmevNjPsjpry1bb9SVNo56P/0kbiyXXa4QluA==
-
-"@octokit/plugin-paginate-rest@^4.0.0":
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-4.2.0.tgz#41fc6ca312446a85a4275aca698b4d9c4c5e06ab"
-  integrity sha512-8otLCIK9esfmOCY14CBnG/xPqv0paf14rc+s9tHpbOpeFwrv5CnECKW1qdqMAT60ngAa9eB1bKQ+l2YCpi0HPQ==
-  dependencies:
-    "@octokit/types" "^7.2.0"
-
-"@octokit/plugin-request-log@^1.0.4":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz#5e50ed7083a613816b1e4a28aeec5fb7f1462e85"
-  integrity sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==
-
-"@octokit/plugin-rest-endpoint-methods@^6.0.0":
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-6.4.0.tgz#09584dd4e85fc4fe04ade45620b105af582c20ba"
-  integrity sha512-YP4eUqZ6vORy/eZOTdil1ZSrMt0kv7i/CVw+HhC2C0yJN+IqTc/rot957JQ7JfyeJD6HZOjLg6Jp1o9cPhI9KA==
-  dependencies:
-    "@octokit/types" "^7.2.0"
-    deprecation "^2.3.1"
-
-"@octokit/request-error@^3.0.0":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-3.0.1.tgz#3fd747913c06ab2195e52004a521889dadb4b295"
-  integrity sha512-ym4Bp0HTP7F3VFssV88WD1ZyCIRoE8H35pXSKwLeMizcdZAYc/t6N9X9Yr9n6t3aG9IH75XDnZ6UeZph0vHMWQ==
-  dependencies:
-    "@octokit/types" "^7.0.0"
-    deprecation "^2.0.0"
-    once "^1.4.0"
-
-"@octokit/request@^6.0.0":
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-6.2.1.tgz#3ceeb22dab09a29595d96594b6720fc14495cf4e"
-  integrity sha512-gYKRCia3cpajRzDSU+3pt1q2OcuC6PK8PmFIyxZDWCzRXRSIBH8jXjFJ8ZceoygBIm0KsEUg4x1+XcYBz7dHPQ==
-  dependencies:
-    "@octokit/endpoint" "^7.0.0"
-    "@octokit/request-error" "^3.0.0"
-    "@octokit/types" "^7.0.0"
-    is-plain-object "^5.0.0"
-    node-fetch "^2.6.7"
-    universal-user-agent "^6.0.0"
-
-"@octokit/rest@19.0.4":
-  version "19.0.4"
-  resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-19.0.4.tgz#fd8bed1cefffa486e9ae46a9dc608ce81bcfcbdd"
-  integrity sha512-LwG668+6lE8zlSYOfwPj4FxWdv/qFXYBpv79TWIQEpBLKA9D/IMcWsF/U9RGpA3YqMVDiTxpgVpEW3zTFfPFTA==
-  dependencies:
-    "@octokit/core" "^4.0.0"
-    "@octokit/plugin-paginate-rest" "^4.0.0"
-    "@octokit/plugin-request-log" "^1.0.4"
-    "@octokit/plugin-rest-endpoint-methods" "^6.0.0"
-
-"@octokit/types@^7.0.0", "@octokit/types@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-7.2.0.tgz#7ee0fc27f9f463d7ccf12ca5956988d498b3c6c4"
-  integrity sha512-pYQ/a1U6mHptwhGyp6SvsiM4bWP2s3V95olUeTxas85D/2kN78yN5C8cGN+P4LwJSWUqIEyvq0Qn2WUn6NQRjw==
-  dependencies:
-    "@octokit/openapi-types" "^13.6.0"
-
-"@octokit/types@^9.0.0":
-  version "9.2.0"
-  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-9.2.0.tgz#0358e3de070b1d43c5a8af63b9951c88a09fc9ed"
-  integrity sha512-xySzJG4noWrIBFyMu4lg4tu9vAgNg9S0aoLRONhAEz6ueyi1evBzb40HitIosaYS4XOexphG305IVcLrIX/30g==
-  dependencies:
-    "@octokit/openapi-types" "^17.1.0"
-
-"@types/node@20.x":
-  version "20.11.24"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792"
-  integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==
-  dependencies:
-    undici-types "~5.26.4"
-
-"@vscode/extension-telemetry@^0.9.0":
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.9.0.tgz#8c6c61e253ff304f46045f04edd60059b144417a"
-  integrity sha512-37RxGHXrs3GoXPgCUKQhghEu0gxs8j27RLjQwwtSf4WhPdJKz8UrqMYzpsXlliQ05zURYmtdGZst9C6+hfWXaQ==
-  dependencies:
-    "@microsoft/1ds-core-js" "^4.0.3"
-    "@microsoft/1ds-post-js" "^4.0.3"
-    "@microsoft/applicationinsights-web-basic" "^3.0.4"
-
-before-after-hook@^2.2.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.2.tgz#a6e8ca41028d90ee2c24222f201c90956091613e"
-  integrity sha512-3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ==
-
-deprecation@^2.0.0, deprecation@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
-  integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
-
-graphql-tag@^2.10.3:
-  version "2.12.6"
-  resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.6.tgz#d441a569c1d2537ef10ca3d1633b48725329b5f1"
-  integrity sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==
-  dependencies:
-    tslib "^2.1.0"
-
-graphql@^16.0.0:
-  version "16.8.1"
-  resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.8.1.tgz#1930a965bef1170603702acdb68aedd3f3cf6f07"
-  integrity sha512-59LZHPdGZVh695Ud9lRzPBVTtlX9ZCV150Er2W43ro37wVof0ctenSaskPPjN7lVTIN8mSZt8PHUNKZuNQUuxw==
-
-is-plain-object@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
-  integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
-
-node-fetch@^2.6.7:
-  version "2.6.7"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
-  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
-  dependencies:
-    whatwg-url "^5.0.0"
-
-once@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
-  dependencies:
-    wrappy "1"
-
-tr46@~0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-  integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
-
-tslib@^2.1.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf"
-  integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==
-
-tunnel@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
-  integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
-
-universal-user-agent@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-6.0.0.tgz#3381f8503b251c0d9cd21bc1de939ec9df5480ee"
-  integrity sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==
-
-webidl-conversions@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-  integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
-
-whatwg-url@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
-  integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0=
-  dependencies:
-    tr46 "~0.0.3"
-    webidl-conversions "^3.0.0"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
diff --git a/extensions/go/cgmanifest.json b/extensions/go/cgmanifest.json
index d27352e1339..ae7228fa1ae 100644
--- a/extensions/go/cgmanifest.json
+++ b/extensions/go/cgmanifest.json
@@ -6,12 +6,12 @@
 				"git": {
 					"name": "go-syntax",
 					"repositoryUrl": "https://github.com/worlpaker/go-syntax",
-					"commitHash": "092c45ec9a51fe40188408d1371f123eaa4796fa"
+					"commitHash": "ce0d1d19653dc264d8e53f97cb45cc8d1689f221"
 				}
 			},
 			"license": "MIT",
 			"description": "The file syntaxes/go.tmLanguage.json is from https://github.com/worlpaker/go-syntax, which in turn was derived from https://github.com/jeff-hykin/better-go-syntax.",
-			"version": "0.6.8"
+			"version": "0.7.7"
 		}
 	],
 	"version": 1
diff --git a/extensions/go/syntaxes/go.tmLanguage.json b/extensions/go/syntaxes/go.tmLanguage.json
index 21b370514d0..8ae31fdbe31 100644
--- a/extensions/go/syntaxes/go.tmLanguage.json
+++ b/extensions/go/syntaxes/go.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/worlpaker/go-syntax/commit/092c45ec9a51fe40188408d1371f123eaa4796fa",
+	"version": "https://github.com/worlpaker/go-syntax/commit/ce0d1d19653dc264d8e53f97cb45cc8d1689f221",
 	"name": "Go",
 	"scopeName": "source.go",
 	"patterns": [
@@ -321,7 +321,7 @@
 					"name": "punctuation.definition.begin.bracket.square.go"
 				}
 			},
-			"end": "(?:(\\])((?:(?:(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?!(?:[\\[\\]\\*]+)?\\b(?:func|struct|map)\\b)(?:[\\*\\[\\]]+)?(?:[\\w\\.]+))?)",
+			"end": "(?:(\\])((?:(?:(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?!(?:[\\[\\]\\*]+)?\\b(?:func|struct|map)\\b)(?:[\\*\\[\\]]+)?(?:[\\w\\.]+)(?:\\[(?:(?:[\\w\\.\\*\\[\\]\\{\\}]+)(?:(?:\\,\\s*(?:[\\w\\.\\*\\[\\]\\{\\}]+))*))?\\])?)?)",
 			"endCaptures": {
 				"1": {
 					"name": "punctuation.definition.end.bracket.square.go"
@@ -1845,7 +1845,7 @@
 				},
 				{
 					"comment": "one type only",
-					"match": "(?:((?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?<!\\,\\s*)(?:[\\w\\.\\*]+)\\s*(?:(?:(?:\".*\")|(?:\\`.*\\`))\\s*)?(?:/(?:/|\\*).*)?)$)",
+					"match": "(?:((?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:[\\w\\.\\*]+)\\s*)(?:(?=\\`|\\/|\")|$))",
 					"captures": {
 						"1": {
 							"patterns": [
@@ -1862,7 +1862,7 @@
 				},
 				{
 					"comment": "property variables and types",
-					"match": "(?:((?:(?:\\w+\\,\\s*)+)?(?:\\w+\\s+))([\\s\\S]+))",
+					"match": "(?:((?:(?:\\w+\\,\\s*)+)?(?:\\w+\\s+))([^\\`\"\\/]+))",
 					"captures": {
 						"1": {
 							"patterns": [
@@ -2192,7 +2192,7 @@
 							]
 						}
 					},
-					"end": "(?:(?<=\\])((?:\\s+)(?:(?:(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:(?!(?:[\\[\\]\\*]+)?(?:\\bstruct\\b|\\binterface\\b|\\bfunc\\b))[\\w\\.\\-\\*\\[\\]]+))?)",
+					"end": "(?:(?<=\\])((?:\\s+)(?:\\=\\s*)?(?:(?:(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:(?!(?:[\\[\\]\\*]+)?(?:\\bstruct\\b|\\binterface\\b|\\bfunc\\b))[\\w\\.\\-\\*\\[\\]]+(?:\\,\\s*[\\w\\.\\[\\]\\*]+)*))?)",
 					"endCaptures": {
 						"1": {
 							"patterns": [
@@ -2271,6 +2271,9 @@
 				{
 					"include": "#struct_variables_types"
 				},
+				{
+					"include": "#interface_variables_types"
+				},
 				{
 					"include": "#type-declarations-without-brackets"
 				},
@@ -2439,7 +2442,7 @@
 		},
 		"switch_types": {
 			"comment": "switch type assertions, only highlights types after case keyword",
-			"begin": "(?<=\\bswitch\\b)(?:\\s*)(?:(\\w+\\s*\\:\\=)?\\s*([\\w\\.\\*\\(\\)\\[\\]]+))(\\.\\(\\btype\\b\\)\\s*)(\\{)",
+			"begin": "(?<=\\bswitch\\b)(?:\\s*)(?:(\\w+\\s*\\:\\=)?\\s*([\\w\\.\\*\\(\\)\\[\\]\\+/\\-\\%\\<\\>\\|\\&]+))(\\.\\(\\btype\\b\\)\\s*)(\\{)",
 			"beginCaptures": {
 				"1": {
 					"patterns": [
@@ -2770,7 +2773,7 @@
 		},
 		"slice_index_variables": {
 			"comment": "slice index and capacity variables, to not scope them as property variables",
-			"match": "(?<=\\w\\[)((?:(?:\\b[\\w\\.\\*\\+/\\-\\*\\%\\<\\>\\|\\&]+\\:)|(?:\\:\\b[\\w\\.\\*\\+/\\-\\*\\%\\<\\>\\|\\&]+))(?:\\b[\\w\\.\\*\\+/\\-\\*\\%\\<\\>\\|\\&]+)?(?:\\:\\b[\\w\\.\\*\\+/\\-\\*\\%\\<\\>\\|\\&]+)?)(?=\\])",
+			"match": "(?<=\\w\\[)((?:(?:\\b[\\w\\.\\*\\+/\\-\\%\\<\\>\\|\\&]+\\:)|(?:\\:\\b[\\w\\.\\*\\+/\\-\\%\\<\\>\\|\\&]+))(?:\\b[\\w\\.\\*\\+/\\-\\%\\<\\>\\|\\&]+)?(?:\\:\\b[\\w\\.\\*\\+/\\-\\%\\<\\>\\|\\&]+)?)(?=\\])",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -2786,8 +2789,8 @@
 			}
 		},
 		"property_variables": {
-			"comment": "Property variables in struct | parameter field in struct initialization",
-			"match": "(?:(?:((?:\\b[\\w\\.]+)(?:\\:(?!\\=))))(?:(?:\\s*([\\w\\.\\*\\&\\[\\]]+)(\\.\\w+)(?![\\w\\.\\*\\&\\[\\]]*(?:\\{|\\()))((?:\\s*(?:\\<|\\>|\\<\\=|\\>\\=|\\=\\=|\\!\\=|\\|\\||\\&\\&|\\+|/|\\-|\\*|\\%|\\||\\&)\\s*(?:[\\w\\.\\*\\&\\[\\]]+)(?:\\.\\w+)(?![\\w\\.\\*\\&\\[\\]]*(?:\\{|\\()))*))?)",
+			"comment": "Property variables in struct",
+			"match": "((?:\\b[\\w\\.]+)(?:\\:(?!\\=)))",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -2799,68 +2802,6 @@
 							"name": "variable.other.property.go"
 						}
 					]
-				},
-				"2": {
-					"patterns": [
-						{
-							"include": "#type-declarations"
-						},
-						{
-							"match": "\\w+",
-							"name": "variable.other.go"
-						},
-						{
-							"include": "$self"
-						}
-					]
-				},
-				"3": {
-					"patterns": [
-						{
-							"include": "#type-declarations"
-						},
-						{
-							"match": "\\w+",
-							"name": "variable.other.property.field.go"
-						},
-						{
-							"include": "$self"
-						}
-					]
-				},
-				"4": {
-					"patterns": [
-						{
-							"match": "([\\w\\.\\*\\&\\[\\]]+)(\\.\\w+)",
-							"captures": {
-								"1": {
-									"patterns": [
-										{
-											"include": "#type-declarations"
-										},
-										{
-											"match": "\\w+",
-											"name": "variable.other.go"
-										}
-									]
-								},
-								"2": {
-									"patterns": [
-										{
-											"include": "#type-declarations"
-										},
-										{
-											"match": "\\w+",
-											"name": "variable.other.property.field.go"
-										}
-									]
-								}
-							}
-						},
-						{
-							"include": "$self"
-						}
-					]
 				}
 			}
 		},
@@ -2931,13 +2872,16 @@
 				},
 				"2": {
 					"patterns": [
-						{
-							"include": "#type-declarations"
-						},
 						{
 							"match": "\\binvalid\\b\\s+\\btype\\b",
 							"name": "invalid.field.go"
 						},
+						{
+							"include": "#type-declarations-without-brackets"
+						},
+						{
+							"include": "#parameter-variable-types"
+						},
 						{
 							"match": "\\w+",
 							"name": "entity.name.type.go"
diff --git a/extensions/go/yarn.lock b/extensions/go/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/go/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/groovy/yarn.lock b/extensions/groovy/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/groovy/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/grunt/.npmrc b/extensions/grunt/.npmrc
new file mode 100644
index 00000000000..a9c57709666
--- /dev/null
+++ b/extensions/grunt/.npmrc
@@ -0,0 +1,2 @@
+legacy-peer-deps="true"
+timeout=180000
diff --git a/extensions/grunt/.vscodeignore b/extensions/grunt/.vscodeignore
index 9d384dd9061..698898bf9df 100644
--- a/extensions/grunt/.vscodeignore
+++ b/extensions/grunt/.vscodeignore
@@ -3,4 +3,4 @@ src/**
 tsconfig.json
 out/**
 extension.webpack.config.js
-yarn.lock
\ No newline at end of file
+package-lock.json
diff --git a/extensions/grunt/package-lock.json b/extensions/grunt/package-lock.json
new file mode 100644
index 00000000000..f0431ef8c85
--- /dev/null
+++ b/extensions/grunt/package-lock.json
@@ -0,0 +1,34 @@
+{
+  "name": "grunt",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "grunt",
+      "version": "1.0.0",
+      "license": "MIT",
+      "devDependencies": {
+        "@types/node": "20.x"
+      },
+      "engines": {
+        "vscode": "*"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "20.11.24",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
+      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    }
+  }
+}
diff --git a/extensions/grunt/src/main.ts b/extensions/grunt/src/main.ts
index 886e7e27e71..fd99ba335c4 100644
--- a/extensions/grunt/src/main.ts
+++ b/extensions/grunt/src/main.ts
@@ -316,7 +316,7 @@ class TaskDetector {
 		if (this.detectors.size === 0) {
 			return Promise.resolve([]);
 		} else if (this.detectors.size === 1) {
-			return this.detectors.values().next().value.getTasks();
+			return this.detectors.values().next().value!.getTasks();
 		} else {
 			const promises: Promise<vscode.Task[]>[] = [];
 			for (const detector of this.detectors.values()) {
@@ -338,7 +338,7 @@ class TaskDetector {
 		if (this.detectors.size === 0) {
 			return undefined;
 		} else if (this.detectors.size === 1) {
-			return this.detectors.values().next().value.getTask(task);
+			return this.detectors.values().next().value!.getTask(task);
 		} else {
 			if ((task.scope === vscode.TaskScope.Workspace) || (task.scope === vscode.TaskScope.Global)) {
 				return undefined;
diff --git a/extensions/grunt/yarn.lock b/extensions/grunt/yarn.lock
deleted file mode 100644
index 1f4b6c2e8b4..00000000000
--- a/extensions/grunt/yarn.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@types/node@20.x":
-  version "20.11.24"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792"
-  integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==
-  dependencies:
-    undici-types "~5.26.4"
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
diff --git a/extensions/gulp/.npmrc b/extensions/gulp/.npmrc
new file mode 100644
index 00000000000..a9c57709666
--- /dev/null
+++ b/extensions/gulp/.npmrc
@@ -0,0 +1,2 @@
+legacy-peer-deps="true"
+timeout=180000
diff --git a/extensions/gulp/.vscodeignore b/extensions/gulp/.vscodeignore
index 36e8b0714fa..360fcfd1c99 100644
--- a/extensions/gulp/.vscodeignore
+++ b/extensions/gulp/.vscodeignore
@@ -2,4 +2,4 @@ src/**
 tsconfig.json
 out/**
 extension.webpack.config.js
-yarn.lock
\ No newline at end of file
+package-lock.json
diff --git a/extensions/gulp/package-lock.json b/extensions/gulp/package-lock.json
new file mode 100644
index 00000000000..9311609f962
--- /dev/null
+++ b/extensions/gulp/package-lock.json
@@ -0,0 +1,34 @@
+{
+  "name": "gulp",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "gulp",
+      "version": "1.0.0",
+      "license": "MIT",
+      "devDependencies": {
+        "@types/node": "20.x"
+      },
+      "engines": {
+        "vscode": "*"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "20.11.24",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
+      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    }
+  }
+}
diff --git a/extensions/gulp/src/main.ts b/extensions/gulp/src/main.ts
index 284175741a5..b0b85ca29b9 100644
--- a/extensions/gulp/src/main.ts
+++ b/extensions/gulp/src/main.ts
@@ -357,7 +357,7 @@ class TaskDetector {
 		if (this.detectors.size === 0) {
 			return Promise.resolve([]);
 		} else if (this.detectors.size === 1) {
-			return this.detectors.values().next().value.getTasks();
+			return this.detectors.values().next().value!.getTasks();
 		} else {
 			const promises: Promise<vscode.Task[]>[] = [];
 			for (const detector of this.detectors.values()) {
@@ -379,7 +379,7 @@ class TaskDetector {
 		if (this.detectors.size === 0) {
 			return undefined;
 		} else if (this.detectors.size === 1) {
-			return this.detectors.values().next().value.getTask(task);
+			return this.detectors.values().next().value!.getTask(task);
 		} else {
 			if ((task.scope === vscode.TaskScope.Workspace) || (task.scope === vscode.TaskScope.Global)) {
 				// Not supported, we don't have enough info to create the task.
diff --git a/extensions/gulp/yarn.lock b/extensions/gulp/yarn.lock
deleted file mode 100644
index 1f4b6c2e8b4..00000000000
--- a/extensions/gulp/yarn.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@types/node@20.x":
-  version "20.11.24"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792"
-  integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==
-  dependencies:
-    undici-types "~5.26.4"
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
diff --git a/extensions/handlebars/yarn.lock b/extensions/handlebars/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/handlebars/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/hlsl/yarn.lock b/extensions/hlsl/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/hlsl/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/html-language-features/.npmrc b/extensions/html-language-features/.npmrc
new file mode 100644
index 00000000000..a9c57709666
--- /dev/null
+++ b/extensions/html-language-features/.npmrc
@@ -0,0 +1,2 @@
+legacy-peer-deps="true"
+timeout=180000
diff --git a/extensions/html-language-features/.vscode/tasks.json b/extensions/html-language-features/.vscode/tasks.json
index 7abfc71df26..0e343f94d4c 100644
--- a/extensions/html-language-features/.vscode/tasks.json
+++ b/extensions/html-language-features/.vscode/tasks.json
@@ -2,8 +2,8 @@
 	"version": "2.0.0",
 	"tasks": [
 		{
-			"label": "yarn",
-			"command": "yarn",
+			"label": "npm install",
+			"command": "npm i",
 			"args": ["compile"],
 			"type": "shell",
 			"presentation": {
diff --git a/extensions/html-language-features/.vscodeignore b/extensions/html-language-features/.vscodeignore
index dda5275fdb5..b1586b6bc84 100644
--- a/extensions/html-language-features/.vscodeignore
+++ b/extensions/html-language-features/.vscodeignore
@@ -13,9 +13,9 @@ server/test/**
 server/bin/**
 server/build/**
 server/lib/cgmanifest.json
-server/yarn.lock
+server/package-lock.json
 server/.npmignore
-yarn.lock
+package-lock.json
 server/extension.webpack.config.js
 extension.webpack.config.js
 server/extension-browser.webpack.config.js
diff --git a/extensions/html-language-features/CONTRIBUTING.md b/extensions/html-language-features/CONTRIBUTING.md
index 441baa4d318..8f1cb271dc3 100644
--- a/extensions/html-language-features/CONTRIBUTING.md
+++ b/extensions/html-language-features/CONTRIBUTING.md
@@ -1,12 +1,12 @@
 ## Setup
 
 - Clone [microsoft/vscode](https://github.com/microsoft/vscode)
-- Run `yarn` at `/`, this will install
+- Run `npm i` at `/`, this will install
 	- Dependencies for `/extension/html-language-features/`
 	- Dependencies for `/extension/html-language-features/server/`
 	- devDependencies such as `gulp`
 - Open `/extensions/html-language-features/` as the workspace in VS Code
-- In `/extensions/html-language-features/` run `yarn compile`(or `yarn watch`) to build the client and server
+- In `/extensions/html-language-features/` run `npm run compile`(or `npm run watch`) to build the client and server
 - Run the [`Launch Extension`](https://github.com/microsoft/vscode/blob/master/extensions/html-language-features/.vscode/launch.json) debug target in the Debug View. This will:
 	- Launch a new VS Code instance with the `html-language-features` extension loaded
 - Open a `.html` file to activate the extension. The extension will start the HTML language server process.
@@ -28,13 +28,13 @@ However, within this extension, you can run a development version of `vscode-htm
 #### Linking `vscode-html-languageservice` in `html-language-features/server/`
 
 - Clone [microsoft/vscode-html-languageservice](https://github.com/microsoft/vscode-html-languageservice)
-- Run `yarn` in `vscode-html-languageservice`
-- Run `yarn link` in `vscode-html-languageservice`. This will compile and link `vscode-html-languageservice`
-- In `html-language-features/server/`, run `yarn link vscode-html-languageservice`
+- Run `npm i` in `vscode-html-languageservice`
+- Run `npm link` in `vscode-html-languageservice`. This will compile and link `vscode-html-languageservice`
+- In `html-language-features/server/`, run `npm link vscode-html-languageservice`
 
 #### Testing the development version of `vscode-html-languageservice`
 
 - Open both `vscode-html-languageservice` and this extension in two windows or with a single window with the[multi-root workspace](https://code.visualstudio.com/docs/editor/multi-root-workspaces) feature
-- Run `yarn watch` at `html-languagefeatures/server/` to recompile this extension with the linked version of `vscode-html-languageservice`
+- Run `npm run watch` at `html-languagefeatures/server/` to recompile this extension with the linked version of `vscode-html-languageservice`
 - Make some changes in `vscode-html-languageservice`
 - Now when you run `Launch Extension` debug target, the launched instance will use your development version of `vscode-html-languageservice`. You can interactively test the language features.
diff --git a/extensions/html-language-features/client/src/autoInsertion.ts b/extensions/html-language-features/client/src/autoInsertion.ts
index e95e6a64a09..3c70839befe 100644
--- a/extensions/html-language-features/client/src/autoInsertion.ts
+++ b/extensions/html-language-features/client/src/autoInsertion.ts
@@ -56,14 +56,20 @@ export function activateAutoInsertion(provider: (kind: 'autoQuote' | 'autoClose'
 		}
 
 		const lastChange = contentChanges[contentChanges.length - 1];
-		const lastCharacter = lastChange.text[lastChange.text.length - 1];
-		if (isEnabled['autoQuote'] && lastChange.rangeLength === 0 && lastCharacter === '=') {
-			doAutoInsert('autoQuote', document, lastChange);
-		} else if (isEnabled['autoClose'] && lastChange.rangeLength === 0 && (lastCharacter === '>' || lastCharacter === '/')) {
-			doAutoInsert('autoClose', document, lastChange);
+		if (lastChange.rangeLength === 0 && isSingleLine(lastChange.text)) {
+			const lastCharacter = lastChange.text[lastChange.text.length - 1];
+			if (isEnabled['autoQuote'] && lastCharacter === '=') {
+				doAutoInsert('autoQuote', document, lastChange);
+			} else if (isEnabled['autoClose'] && (lastCharacter === '>' || lastCharacter === '/')) {
+				doAutoInsert('autoClose', document, lastChange);
+			}
 		}
 	}
 
+	function isSingleLine(text: string): boolean {
+		return !/\n/.test(text);
+	}
+
 	function doAutoInsert(kind: 'autoQuote' | 'autoClose', document: TextDocument, lastChange: TextDocumentContentChangeEvent) {
 		const rangeStart = lastChange.range.start;
 		const version = document.version;
diff --git a/extensions/html-language-features/client/src/browser/htmlClientMain.ts b/extensions/html-language-features/client/src/browser/htmlClientMain.ts
index 3f10e6d131f..06997d39fb0 100644
--- a/extensions/html-language-features/client/src/browser/htmlClientMain.ts
+++ b/extensions/html-language-features/client/src/browser/htmlClientMain.ts
@@ -8,13 +8,6 @@ import { LanguageClientOptions } from 'vscode-languageclient';
 import { startClient, LanguageClientConstructor, AsyncDisposable } from '../htmlClient';
 import { LanguageClient } from 'vscode-languageclient/browser';
 
-declare const Worker: {
-	new(stringUrl: string): any;
-};
-declare const TextDecoder: {
-	new(encoding?: string): { decode(buffer: ArrayBuffer): string };
-};
-
 let client: AsyncDisposable | undefined;
 
 // this method is called when vs code is activated
@@ -25,7 +18,7 @@ export async function activate(context: ExtensionContext) {
 		worker.postMessage({ i10lLocation: l10n.uri?.toString(false) ?? '' });
 
 		const newLanguageClient: LanguageClientConstructor = (id: string, name: string, clientOptions: LanguageClientOptions) => {
-			return new LanguageClient(id, name, clientOptions, worker);
+			return new LanguageClient(id, name, worker, clientOptions);
 		};
 
 		const timer = {
diff --git a/extensions/html-language-features/client/tsconfig.json b/extensions/html-language-features/client/tsconfig.json
index 8f5cef74fd3..349af163eea 100644
--- a/extensions/html-language-features/client/tsconfig.json
+++ b/extensions/html-language-features/client/tsconfig.json
@@ -1,7 +1,10 @@
 {
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
-		"outDir": "./out"
+		"outDir": "./out",
+		"lib": [
+			"webworker"
+		]
 	},
 	"include": [
 		"src/**/*",
diff --git a/extensions/html-language-features/package-lock.json b/extensions/html-language-features/package-lock.json
new file mode 100644
index 00000000000..a7c6d22b395
--- /dev/null
+++ b/extensions/html-language-features/package-lock.json
@@ -0,0 +1,263 @@
+{
+  "name": "html-language-features",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "html-language-features",
+      "version": "1.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "@vscode/extension-telemetry": "^0.9.0",
+        "vscode-languageclient": "10.0.0-next.8",
+        "vscode-uri": "^3.0.8"
+      },
+      "devDependencies": {
+        "@types/node": "20.x"
+      },
+      "engines": {
+        "vscode": "^1.77.0"
+      }
+    },
+    "node_modules/@microsoft/1ds-core-js": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.0.3.tgz",
+      "integrity": "sha512-FrxNLVAPsAvD7+l63TlNS/Kodvpct2WulpDSn1dI4Xuy0kF4E2H867kHdwL/iY1Bj3zA3FSy/jvE4+OcDws7ug==",
+      "dependencies": {
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/1ds-post-js": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.0.3.tgz",
+      "integrity": "sha512-uewvmUtXKd7ttypiKQGdYI6i7UUpPkOznLayzIFrJ4r2xnG6jhPjpKRncHFXPQcM4XSWO3yf5PQ3xAbPq9t7ZQ==",
+      "dependencies": {
+        "@microsoft/1ds-core-js": "4.0.3",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-channel-js": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.0.4.tgz",
+      "integrity": "sha512-6TlfExmErQ8Y+/ChbkyWl+jyt4wg3T6p7lwXDsUCB0LgZmlEWMaCUS0YlT73JCWmE8j7vxW8yUm0lgsgmHns3A==",
+      "dependencies": {
+        "@microsoft/applicationinsights-common": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-common": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.0.4.tgz",
+      "integrity": "sha512-r5gWaw/K9+tKfuo2GtDiDiKASgOkPOCrKW+wZzFvuR06uuwvWjbVQ6yW/YbnfuhRF5M65ksUiMi0eCMwEOGq7Q==",
+      "dependencies": {
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-core-js": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.0.4.tgz",
+      "integrity": "sha512-anxy5kEkqBmVoEqJiJzaaXXA0wzqZi9U4zGd05xFJ04lWckP8dG3zyT3+GGdg7rDelqLTNGxndeYoFmDv63u1g==",
+      "dependencies": {
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-shims": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
+      "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-web-basic": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.0.4.tgz",
+      "integrity": "sha512-KfoxPlLlf0JT12ADb23C5iGye/yFouoMgHEKULxkSQcYY9SsW/8rVrqqvoYKAL+u215CZU2A8Kc8sR3ehEaPCQ==",
+      "dependencies": {
+        "@microsoft/applicationinsights-channel-js": "3.0.4",
+        "@microsoft/applicationinsights-common": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/dynamicproto-js": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.2.tgz",
+      "integrity": "sha512-MB8trWaFREpmb037k/d0bB7T2BP7Ai24w1e1tbz3ASLB0/lwphsq3Nq8S9I5AsI5vs4zAQT+SB5nC5/dLYTiOg==",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+      }
+    },
+    "node_modules/@nevware21/ts-async": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.3.0.tgz",
+      "integrity": "sha512-ZUcgUH12LN/F6nzN0cYd0F/rJaMLmXr0EHVTyYfaYmK55bdwE4338uue4UiVoRqHVqNW4KDUrJc49iGogHKeWA==",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.10.0 < 2.x"
+      }
+    },
+    "node_modules/@nevware21/ts-utils": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.10.1.tgz",
+      "integrity": "sha512-pMny25NnF2/MJwdqC3Iyjm2pGIXNxni4AROpcqDeWa+td9JMUY4bUS9uU9XW+BoBRqTLUL+WURF9SOd/6OQzRg=="
+    },
+    "node_modules/@types/node": {
+      "version": "20.11.24",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
+      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/@vscode/extension-telemetry": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.0.tgz",
+      "integrity": "sha512-37RxGHXrs3GoXPgCUKQhghEu0gxs8j27RLjQwwtSf4WhPdJKz8UrqMYzpsXlliQ05zURYmtdGZst9C6+hfWXaQ==",
+      "dependencies": {
+        "@microsoft/1ds-core-js": "^4.0.3",
+        "@microsoft/1ds-post-js": "^4.0.3",
+        "@microsoft/applicationinsights-web-basic": "^3.0.4"
+      },
+      "engines": {
+        "vscode": "^1.75.0"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c= sha512-9Y0g0Q8rmSt+H33DfKv7FOc3v+iRI+o1lbzt8jGcIosYW37IIW/2XVYq5NPdmaD5NQ59Nk26Kl/vZbwW9Fr8vg=="
+    },
+    "node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/semver": {
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
+      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    },
+    "node_modules/vscode-jsonrpc": {
+      "version": "9.0.0-next.4",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.4.tgz",
+      "integrity": "sha512-zSVIr58lJSMYKIsZ5P7GtBbv1eEx25eNyOf0NmEzxmn1GhUNJAVAb5hkA1poKUwj1FRMwN6CeyWxZypmr8SsQQ==",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/vscode-languageclient": {
+      "version": "10.0.0-next.8",
+      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-10.0.0-next.8.tgz",
+      "integrity": "sha512-D9inIHgqKayO9Tv0MeLb3XIL76yTuWmKdHqcGZKzjtQrMGJgASJDYWTapu+yAjEpDp0gmVOaCYyIlLB86ncDoQ==",
+      "dependencies": {
+        "minimatch": "^9.0.3",
+        "semver": "^7.6.0",
+        "vscode-languageserver-protocol": "3.17.6-next.6"
+      },
+      "engines": {
+        "vscode": "^1.89.0"
+      }
+    },
+    "node_modules/vscode-languageserver-protocol": {
+      "version": "3.17.6-next.6",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.6.tgz",
+      "integrity": "sha512-naxM9kc/phpl0kAFNVPejMUWUtzFXdPYY/BtQTYtfbBbHf8sceHOrKkmf6yynZRu1A4oFtRZNqV3wyFRTWqUHw==",
+      "dependencies": {
+        "vscode-jsonrpc": "9.0.0-next.4",
+        "vscode-languageserver-types": "3.17.6-next.4"
+      }
+    },
+    "node_modules/vscode-languageserver-types": {
+      "version": "3.17.6-next.4",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.6-next.4.tgz",
+      "integrity": "sha512-SeJTpH/S14EbxOAVaOUoGVqPToqpRTld5QO5Ghig3AlbFJTFF9Wu7srHMfa85L0SX1RYAuuCSFKJVVCxDIk1/Q=="
+    },
+    "node_modules/vscode-uri": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz",
+      "integrity": "sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw=="
+    },
+    "node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    }
+  }
+}
diff --git a/extensions/html-language-features/package.json b/extensions/html-language-features/package.json
index 49489ff20df..5246391caf0 100644
--- a/extensions/html-language-features/package.json
+++ b/extensions/html-language-features/package.json
@@ -28,7 +28,7 @@
   "scripts": {
     "compile": "npx gulp compile-extension:html-language-features-client compile-extension:html-language-features-server",
     "watch": "npx gulp watch-extension:html-language-features-client watch-extension:html-language-features-server",
-    "install-client-next": "yarn add vscode-languageclient@next"
+    "install-client-next": "npm install vscode-languageclient@next"
   },
   "categories": [
     "Programming Languages"
@@ -259,7 +259,7 @@
   },
   "dependencies": {
     "@vscode/extension-telemetry": "^0.9.0",
-    "vscode-languageclient": "^10.0.0-next.3",
+    "vscode-languageclient": "10.0.0-next.8",
     "vscode-uri": "^3.0.8"
   },
   "devDependencies": {
diff --git a/extensions/html-language-features/schemas/package.schema.json b/extensions/html-language-features/schemas/package.schema.json
index ef717dbd1d1..205143c33ca 100644
--- a/extensions/html-language-features/schemas/package.schema.json
+++ b/extensions/html-language-features/schemas/package.schema.json
@@ -1,6 +1,5 @@
 {
 	"$schema": "http://json-schema.org/draft-07/schema#",
-	"title": "HTML contributions to package.json",
 	"type": "object",
 	"properties": {
 		"contributes": {
diff --git a/extensions/html-language-features/server/.npmrc b/extensions/html-language-features/server/.npmrc
new file mode 100644
index 00000000000..a9c57709666
--- /dev/null
+++ b/extensions/html-language-features/server/.npmrc
@@ -0,0 +1,2 @@
+legacy-peer-deps="true"
+timeout=180000
diff --git a/extensions/html-language-features/server/.vscode/tasks.json b/extensions/html-language-features/server/.vscode/tasks.json
index c26073e1d4f..22ac021def7 100644
--- a/extensions/html-language-features/server/.vscode/tasks.json
+++ b/extensions/html-language-features/server/.vscode/tasks.json
@@ -2,8 +2,8 @@
 	"version": "2.0.0",
 	"tasks": [
 		{
-			"label": "yarn watch",
-			"command": "yarn",
+			"label": "npm run watch",
+			"command": "npm i",
 			"args": ["watch"],
 			"type": "shell",
 			"presentation": {
diff --git a/extensions/html-language-features/server/package-lock.json b/extensions/html-language-features/server/package-lock.json
new file mode 100644
index 00000000000..a6e67b1ef6b
--- /dev/null
+++ b/extensions/html-language-features/server/package-lock.json
@@ -0,0 +1,124 @@
+{
+  "name": "vscode-html-languageserver",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "vscode-html-languageserver",
+      "version": "1.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "@vscode/l10n": "^0.0.18",
+        "vscode-css-languageservice": "^6.3.1",
+        "vscode-html-languageservice": "^5.3.1",
+        "vscode-languageserver": "10.0.0-next.6",
+        "vscode-languageserver-textdocument": "^1.0.12",
+        "vscode-uri": "^3.0.8"
+      },
+      "devDependencies": {
+        "@types/mocha": "^9.1.1",
+        "@types/node": "20.x"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/@types/mocha": {
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.1.tgz",
+      "integrity": "sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==",
+      "dev": true
+    },
+    "node_modules/@types/node": {
+      "version": "20.12.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.5.tgz",
+      "integrity": "sha512-BD+BjQ9LS/D8ST9p5uqBxghlN+S42iuNxjsUGjeZobe/ciXzk2qb1B6IXc6AnRLS+yFJRpN2IPEHMzwspfDJNw==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/@vscode/l10n": {
+      "version": "0.0.18",
+      "resolved": "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.18.tgz",
+      "integrity": "sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ=="
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    },
+    "node_modules/vscode-css-languageservice": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.1.tgz",
+      "integrity": "sha512-1BzTBuJfwMc3A0uX4JBdJgoxp74cjj4q2mDJdp49yD/GuAq4X0k5WtK6fNcMYr+FfJ9nqgR6lpfCSZDkARJ5qQ==",
+      "dependencies": {
+        "@vscode/l10n": "^0.0.18",
+        "vscode-languageserver-textdocument": "^1.0.12",
+        "vscode-languageserver-types": "3.17.5",
+        "vscode-uri": "^3.0.8"
+      }
+    },
+    "node_modules/vscode-html-languageservice": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.3.1.tgz",
+      "integrity": "sha512-ysUh4hFeW/WOWz/TO9gm08xigiSsV/FOAZ+DolgJfeLftna54YdmZ4A+lIn46RbdO3/Qv5QHTn1ZGqmrXQhZyA==",
+      "dependencies": {
+        "@vscode/l10n": "^0.0.18",
+        "vscode-languageserver-textdocument": "^1.0.12",
+        "vscode-languageserver-types": "^3.17.5",
+        "vscode-uri": "^3.0.8"
+      }
+    },
+    "node_modules/vscode-jsonrpc": {
+      "version": "9.0.0-next.4",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.4.tgz",
+      "integrity": "sha512-zSVIr58lJSMYKIsZ5P7GtBbv1eEx25eNyOf0NmEzxmn1GhUNJAVAb5hkA1poKUwj1FRMwN6CeyWxZypmr8SsQQ==",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/vscode-languageserver": {
+      "version": "10.0.0-next.6",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-10.0.0-next.6.tgz",
+      "integrity": "sha512-0Lh1nhQfSxo5Ob+ayYO1QTIsDix2/Lc72Urm1KZrCFxK5zIFYaEh3QFeM9oZih4Rzs0ZkQPXXnoHtpvs5GT+Zw==",
+      "dependencies": {
+        "vscode-languageserver-protocol": "3.17.6-next.6"
+      },
+      "bin": {
+        "installServerIntoExtension": "bin/installServerIntoExtension"
+      }
+    },
+    "node_modules/vscode-languageserver-protocol": {
+      "version": "3.17.6-next.6",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.6.tgz",
+      "integrity": "sha512-naxM9kc/phpl0kAFNVPejMUWUtzFXdPYY/BtQTYtfbBbHf8sceHOrKkmf6yynZRu1A4oFtRZNqV3wyFRTWqUHw==",
+      "dependencies": {
+        "vscode-jsonrpc": "9.0.0-next.4",
+        "vscode-languageserver-types": "3.17.6-next.4"
+      }
+    },
+    "node_modules/vscode-languageserver-protocol/node_modules/vscode-languageserver-types": {
+      "version": "3.17.6-next.4",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.6-next.4.tgz",
+      "integrity": "sha512-SeJTpH/S14EbxOAVaOUoGVqPToqpRTld5QO5Ghig3AlbFJTFF9Wu7srHMfa85L0SX1RYAuuCSFKJVVCxDIk1/Q=="
+    },
+    "node_modules/vscode-languageserver-textdocument": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz",
+      "integrity": "sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA=="
+    },
+    "node_modules/vscode-languageserver-types": {
+      "version": "3.17.5",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz",
+      "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg=="
+    },
+    "node_modules/vscode-uri": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz",
+      "integrity": "sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw=="
+    }
+  }
+}
diff --git a/extensions/html-language-features/server/package.json b/extensions/html-language-features/server/package.json
index 75bfa00de11..652340f49d7 100644
--- a/extensions/html-language-features/server/package.json
+++ b/extensions/html-language-features/server/package.json
@@ -10,10 +10,10 @@
   "main": "./out/node/htmlServerMain",
   "dependencies": {
     "@vscode/l10n": "^0.0.18",
-    "vscode-css-languageservice": "^6.2.13",
-    "vscode-html-languageservice": "^5.2.0",
-    "vscode-languageserver": "^10.0.0-next.2",
-    "vscode-languageserver-textdocument": "^1.0.11",
+    "vscode-css-languageservice": "^6.3.1",
+    "vscode-html-languageservice": "^5.3.1",
+    "vscode-languageserver": "10.0.0-next.6",
+    "vscode-languageserver-textdocument": "^1.0.12",
     "vscode-uri": "^3.0.8"
   },
   "devDependencies": {
@@ -23,10 +23,10 @@
   "scripts": {
     "compile": "npx gulp compile-extension:html-language-features-server",
     "watch": "npx gulp watch-extension:html-language-features-server",
-    "install-service-next": "yarn add vscode-css-languageservice@next && yarn add vscode-html-languageservice@next",
-    "install-service-local": "yarn link vscode-css-languageservice && yarn link vscode-html-languageservice",
-    "install-server-next": "yarn add vscode-languageserver@next",
-    "install-server-local": "yarn link vscode-languageserver",
-    "test": "yarn compile && node ./test/index.js"
+    "install-service-next": "npm install vscode-css-languageservice@next && npm install vscode-html-languageservice@next",
+    "install-service-local": "npm install vscode-css-languageservice && npm install vscode-html-languageservice",
+    "install-server-next": "npm install vscode-languageserver@next",
+    "install-server-local": "npm install vscode-languageserver",
+    "test": "npm run compile && node ./test/index.js"
   }
 }
diff --git a/extensions/html-language-features/server/src/modes/languageModes.ts b/extensions/html-language-features/server/src/modes/languageModes.ts
index 4ab4a4a876e..803fa6c1c87 100644
--- a/extensions/html-language-features/server/src/modes/languageModes.ts
+++ b/extensions/html-language-features/server/src/modes/languageModes.ts
@@ -138,8 +138,8 @@ export function getLanguageModes(supportedLanguages: { [languageId: string]: boo
 			return undefined;
 		},
 		getModesInRange(document: TextDocument, range: Range): LanguageModeRange[] {
-			return documentRegions.get(document).getLanguageRanges(range).map(r => {
-				return <LanguageModeRange>{
+			return documentRegions.get(document).getLanguageRanges(range).map((r): LanguageModeRange => {
+				return {
 					start: r.start,
 					end: r.end,
 					mode: r.languageId && modes[r.languageId],
diff --git a/extensions/html-language-features/server/yarn.lock b/extensions/html-language-features/server/yarn.lock
deleted file mode 100644
index f327f1f352f..00000000000
--- a/extensions/html-language-features/server/yarn.lock
+++ /dev/null
@@ -1,85 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@types/mocha@^9.1.1":
-  version "9.1.1"
-  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-9.1.1.tgz#e7c4f1001eefa4b8afbd1eee27a237fee3bf29c4"
-  integrity sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==
-
-"@types/node@20.x":
-  version "20.12.5"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.5.tgz#74c4f31ab17955d0b5808cdc8fd2839526ad00b3"
-  integrity sha512-BD+BjQ9LS/D8ST9p5uqBxghlN+S42iuNxjsUGjeZobe/ciXzk2qb1B6IXc6AnRLS+yFJRpN2IPEHMzwspfDJNw==
-  dependencies:
-    undici-types "~5.26.4"
-
-"@vscode/l10n@^0.0.18":
-  version "0.0.18"
-  resolved "https://registry.yarnpkg.com/@vscode/l10n/-/l10n-0.0.18.tgz#916d3a5e960dbab47c1c56f58a7cb5087b135c95"
-  integrity sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ==
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
-
-vscode-css-languageservice@^6.2.13:
-  version "6.2.13"
-  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-6.2.13.tgz#c7c2dc7a081a203048d60157c65536767d6d96f8"
-  integrity sha512-2rKWXfH++Kxd9Z4QuEgd1IF7WmblWWU7DScuyf1YumoGLkY9DW6wF/OTlhOyO2rN63sWHX2dehIpKBbho4ZwvA==
-  dependencies:
-    "@vscode/l10n" "^0.0.18"
-    vscode-languageserver-textdocument "^1.0.11"
-    vscode-languageserver-types "3.17.5"
-    vscode-uri "^3.0.8"
-
-vscode-html-languageservice@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-5.2.0.tgz#5b36f9131acc073cebaa2074dc8ff53e84c80f31"
-  integrity sha512-cdNMhyw57/SQzgUUGSIMQ66jikqEN6nBNyhx5YuOyj9310+eY9zw8Q0cXpiKzDX8aHYFewQEXRnigl06j/TVwQ==
-  dependencies:
-    "@vscode/l10n" "^0.0.18"
-    vscode-languageserver-textdocument "^1.0.11"
-    vscode-languageserver-types "^3.17.5"
-    vscode-uri "^3.0.8"
-
-vscode-jsonrpc@9.0.0-next.2:
-  version "9.0.0-next.2"
-  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.2.tgz#29e9741c742c80329bba1c60ce38fd014651ba80"
-  integrity sha512-meIaXAgChCHzWy45QGU8YpCNyqnZQ/sYeCj32OLDDbUYsCF7AvgpdXx3nnZn9yzr8ed0Od9bW+NGphEmXsqvIQ==
-
-vscode-languageserver-protocol@3.17.6-next.3:
-  version "3.17.6-next.3"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.3.tgz#09d3e28e9ad12270233d07fa0b69cf1d51d7dfe4"
-  integrity sha512-H8ATH5SAvc3JzttS+AL6g681PiBOZM/l34WP2JZk4akY3y7NqTP+f9cJ+MhrVBbD3aDS8bdAKewZgbFLW6M8Pg==
-  dependencies:
-    vscode-jsonrpc "9.0.0-next.2"
-    vscode-languageserver-types "3.17.6-next.3"
-
-vscode-languageserver-textdocument@^1.0.11:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.11.tgz#0822a000e7d4dc083312580d7575fe9e3ba2e2bf"
-  integrity sha512-X+8T3GoiwTVlJbicx/sIAF+yuJAqz8VvwJyoMVhwEMoEKE/fkDmrqUgDMyBECcM2A2frVZIUj5HI/ErRXCfOeA==
-
-vscode-languageserver-types@3.17.5, vscode-languageserver-types@^3.17.5:
-  version "3.17.5"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz#3273676f0cf2eab40b3f44d085acbb7f08a39d8a"
-  integrity sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==
-
-vscode-languageserver-types@3.17.6-next.3:
-  version "3.17.6-next.3"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.6-next.3.tgz#f71d6c57f18d921346cfe0c227aabd72eb8cd2f0"
-  integrity sha512-l5kNFXFRQGuzriXpuBqFpRmkf6f6A4VoU3h95OsVkqIOoi1k7KbwSo600cIdsKSJWrPg/+vX+QMPcMw1oI7ItA==
-
-vscode-languageserver@^10.0.0-next.2:
-  version "10.0.0-next.2"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-10.0.0-next.2.tgz#9a8ac58f72979961497c4fd7f6097561d4134d5f"
-  integrity sha512-WZdK/XO6EkNU6foYck49NpS35sahWhYFs4hwCGalH/6lhPmdUKABTnWioK/RLZKWqH8E5HdlAHQMfSBIxKBV9Q==
-  dependencies:
-    vscode-languageserver-protocol "3.17.6-next.3"
-
-vscode-uri@^3.0.8:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.8.tgz#1770938d3e72588659a172d0fd4642780083ff9f"
-  integrity sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==
diff --git a/extensions/html-language-features/yarn.lock b/extensions/html-language-features/yarn.lock
deleted file mode 100644
index d1d73407809..00000000000
--- a/extensions/html-language-features/yarn.lock
+++ /dev/null
@@ -1,187 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@microsoft/1ds-core-js@4.0.3", "@microsoft/1ds-core-js@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@microsoft/1ds-core-js/-/1ds-core-js-4.0.3.tgz#c8a92c623745a9595e06558a866658480c33bdf9"
-  integrity sha512-FrxNLVAPsAvD7+l63TlNS/Kodvpct2WulpDSn1dI4Xuy0kF4E2H867kHdwL/iY1Bj3zA3FSy/jvE4+OcDws7ug==
-  dependencies:
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/1ds-post-js@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@microsoft/1ds-post-js/-/1ds-post-js-4.0.3.tgz#cfcb20bb23fb6215d3f0732f60f5b7df3e624f86"
-  integrity sha512-uewvmUtXKd7ttypiKQGdYI6i7UUpPkOznLayzIFrJ4r2xnG6jhPjpKRncHFXPQcM4XSWO3yf5PQ3xAbPq9t7ZQ==
-  dependencies:
-    "@microsoft/1ds-core-js" "4.0.3"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-channel-js@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.0.4.tgz#247b6fe2158fad9826cbcdf7304f885766b36624"
-  integrity sha512-6TlfExmErQ8Y+/ChbkyWl+jyt4wg3T6p7lwXDsUCB0LgZmlEWMaCUS0YlT73JCWmE8j7vxW8yUm0lgsgmHns3A==
-  dependencies:
-    "@microsoft/applicationinsights-common" "3.0.4"
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-common@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-common/-/applicationinsights-common-3.0.4.tgz#c4aa53ba343f5b3c7fbf54cddd3c86a5bdcd95dc"
-  integrity sha512-r5gWaw/K9+tKfuo2GtDiDiKASgOkPOCrKW+wZzFvuR06uuwvWjbVQ6yW/YbnfuhRF5M65ksUiMi0eCMwEOGq7Q==
-  dependencies:
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-core-js@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.0.4.tgz#008308b786930d94a1de8a1fbb4af0351b74653e"
-  integrity sha512-anxy5kEkqBmVoEqJiJzaaXXA0wzqZi9U4zGd05xFJ04lWckP8dG3zyT3+GGdg7rDelqLTNGxndeYoFmDv63u1g==
-  dependencies:
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-shims@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz#3865b73ace8405b9c4618cc5c571f2fe3876f06f"
-  integrity sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==
-  dependencies:
-    "@nevware21/ts-utils" ">= 0.9.4 < 2.x"
-
-"@microsoft/applicationinsights-web-basic@^3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.0.4.tgz#9a23323276b4a5a0dc6a352e2de5d75e3c16b534"
-  integrity sha512-KfoxPlLlf0JT12ADb23C5iGye/yFouoMgHEKULxkSQcYY9SsW/8rVrqqvoYKAL+u215CZU2A8Kc8sR3ehEaPCQ==
-  dependencies:
-    "@microsoft/applicationinsights-channel-js" "3.0.4"
-    "@microsoft/applicationinsights-common" "3.0.4"
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/dynamicproto-js@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.2.tgz#e57fbec2e7067d48b7e8e1e1c1d354028ef718a6"
-  integrity sha512-MB8trWaFREpmb037k/d0bB7T2BP7Ai24w1e1tbz3ASLB0/lwphsq3Nq8S9I5AsI5vs4zAQT+SB5nC5/dLYTiOg==
-  dependencies:
-    "@nevware21/ts-utils" ">= 0.9.4 < 2.x"
-
-"@nevware21/ts-async@>= 0.3.0 < 2.x":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@nevware21/ts-async/-/ts-async-0.3.0.tgz#a8b97ba01065fc930de9a3f4dd4a05e862becc6c"
-  integrity sha512-ZUcgUH12LN/F6nzN0cYd0F/rJaMLmXr0EHVTyYfaYmK55bdwE4338uue4UiVoRqHVqNW4KDUrJc49iGogHKeWA==
-  dependencies:
-    "@nevware21/ts-utils" ">= 0.10.0 < 2.x"
-
-"@nevware21/ts-utils@>= 0.10.0 < 2.x", "@nevware21/ts-utils@>= 0.10.1 < 2.x", "@nevware21/ts-utils@>= 0.9.4 < 2.x":
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@nevware21/ts-utils/-/ts-utils-0.10.1.tgz#aa65abc71eba06749a396598f22263d26f796ac7"
-  integrity sha512-pMny25NnF2/MJwdqC3Iyjm2pGIXNxni4AROpcqDeWa+td9JMUY4bUS9uU9XW+BoBRqTLUL+WURF9SOd/6OQzRg==
-
-"@types/node@20.x":
-  version "20.11.24"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792"
-  integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==
-  dependencies:
-    undici-types "~5.26.4"
-
-"@vscode/extension-telemetry@^0.9.0":
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.9.0.tgz#8c6c61e253ff304f46045f04edd60059b144417a"
-  integrity sha512-37RxGHXrs3GoXPgCUKQhghEu0gxs8j27RLjQwwtSf4WhPdJKz8UrqMYzpsXlliQ05zURYmtdGZst9C6+hfWXaQ==
-  dependencies:
-    "@microsoft/1ds-core-js" "^4.0.3"
-    "@microsoft/1ds-post-js" "^4.0.3"
-    "@microsoft/applicationinsights-web-basic" "^3.0.4"
-
-balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
-
-brace-expansion@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
-  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
-  dependencies:
-    balanced-match "^1.0.0"
-
-lru-cache@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
-  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
-  dependencies:
-    yallist "^4.0.0"
-
-minimatch@^9.0.3:
-  version "9.0.3"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
-  integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
-  dependencies:
-    brace-expansion "^2.0.1"
-
-semver@^7.6.0:
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
-  integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
-  dependencies:
-    lru-cache "^6.0.0"
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
-
-vscode-jsonrpc@9.0.0-next.2:
-  version "9.0.0-next.2"
-  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.2.tgz#29e9741c742c80329bba1c60ce38fd014651ba80"
-  integrity sha512-meIaXAgChCHzWy45QGU8YpCNyqnZQ/sYeCj32OLDDbUYsCF7AvgpdXx3nnZn9yzr8ed0Od9bW+NGphEmXsqvIQ==
-
-vscode-languageclient@^10.0.0-next.3:
-  version "10.0.0-next.3"
-  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-10.0.0-next.3.tgz#d7336bafafb37569ac1d8e931d20ba2a6385cc64"
-  integrity sha512-jJhPdZaiELpPRnCUt8kQcF2HJuvzLgeW4HOGc6dp8Je+p08ndueVT4fpSsbly6KiEHr/Ri73tNz0CSfsOye6MA==
-  dependencies:
-    minimatch "^9.0.3"
-    semver "^7.6.0"
-    vscode-languageserver-protocol "3.17.6-next.4"
-
-vscode-languageserver-protocol@3.17.6-next.4:
-  version "3.17.6-next.4"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.4.tgz#3c56f6eb588bb42fccc0ac54a0d5daf2d02f0a1b"
-  integrity sha512-/2bleKBxZLyRObS4mkpaWlVI9xGiUqMVmh/ztZ2vL4uP2XyIpraT45JBpn9AtXr0alqKJPKLuKr+/qcYULvm/w==
-  dependencies:
-    vscode-jsonrpc "9.0.0-next.2"
-    vscode-languageserver-types "3.17.6-next.3"
-
-vscode-languageserver-types@3.17.6-next.3:
-  version "3.17.6-next.3"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.6-next.3.tgz#f71d6c57f18d921346cfe0c227aabd72eb8cd2f0"
-  integrity sha512-l5kNFXFRQGuzriXpuBqFpRmkf6f6A4VoU3h95OsVkqIOoi1k7KbwSo600cIdsKSJWrPg/+vX+QMPcMw1oI7ItA==
-
-vscode-uri@^3.0.8:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.8.tgz#1770938d3e72588659a172d0fd4642780083ff9f"
-  integrity sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==
-
-yallist@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
-  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
diff --git a/extensions/html/yarn.lock b/extensions/html/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/html/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/ini/yarn.lock b/extensions/ini/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/ini/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/ipynb/.npmrc b/extensions/ipynb/.npmrc
new file mode 100644
index 00000000000..a9c57709666
--- /dev/null
+++ b/extensions/ipynb/.npmrc
@@ -0,0 +1,2 @@
+legacy-peer-deps="true"
+timeout=180000
diff --git a/extensions/ipynb/.vscodeignore b/extensions/ipynb/.vscodeignore
index 69a1b29e0ce..2d13f5a0c22 100644
--- a/extensions/ipynb/.vscodeignore
+++ b/extensions/ipynb/.vscodeignore
@@ -5,6 +5,6 @@ out/**
 tsconfig.json
 extension.webpack.config.js
 extension-browser.webpack.config.js
-yarn.lock
+package-lock.json
 .gitignore
 esbuild.js
diff --git a/extensions/ipynb/extension-browser.webpack.config.js b/extensions/ipynb/extension-browser.webpack.config.js
index e9bc478c03e..32fc7de8ee4 100644
--- a/extensions/ipynb/extension-browser.webpack.config.js
+++ b/extensions/ipynb/extension-browser.webpack.config.js
@@ -8,15 +8,31 @@
 'use strict';
 
 const withBrowserDefaults = require('../shared.webpack.config').browser;
+const path = require('path');
 
-const config = withBrowserDefaults({
+const mainConfig = withBrowserDefaults({
 	context: __dirname,
 	entry: {
-		extension: './src/ipynbMain.ts'
+		extension: './src/ipynbMain.browser.ts'
 	},
 	output: {
-		filename: 'ipynbMain.js'
+		filename: 'ipynbMain.browser.js',
+		path: path.join(__dirname, 'dist', 'browser')
 	}
 });
 
-module.exports = config;
+
+const workerConfig = withBrowserDefaults({
+	context: __dirname,
+	entry: {
+		notebookSerializerWorker: './src/notebookSerializerWorker.web.ts',
+	},
+	output: {
+		filename: 'notebookSerializerWorker.js',
+		path: path.join(__dirname, 'dist', 'browser'),
+		libraryTarget: 'var',
+		library: 'serverExportVar'
+	},
+});
+
+module.exports = [mainConfig, workerConfig];
diff --git a/extensions/ipynb/extension.webpack.config.js b/extensions/ipynb/extension.webpack.config.js
index 784411bb066..aad5f55845a 100644
--- a/extensions/ipynb/extension.webpack.config.js
+++ b/extensions/ipynb/extension.webpack.config.js
@@ -8,13 +8,19 @@
 'use strict';
 
 const withDefaults = require('../shared.webpack.config');
+const path = require('path');
 
 module.exports = withDefaults({
 	context: __dirname,
 	entry: {
-		extension: './src/ipynbMain.ts',
+		['ipynbMain.node']: './src/ipynbMain.node.ts',
+		notebookSerializerWorker: './src/notebookSerializerWorker.ts',
 	},
 	output: {
-		filename: 'ipynbMain.js'
-	}
+		path: path.resolve(__dirname, 'dist'),
+		filename: '[name].js'
+	},
+	plugins: [
+		...withDefaults.nodePlugins(__dirname), // add plugins, don't replace inherited
+	]
 });
diff --git a/extensions/ipynb/package-lock.json b/extensions/ipynb/package-lock.json
new file mode 100644
index 00000000000..7042d6a22b2
--- /dev/null
+++ b/extensions/ipynb/package-lock.json
@@ -0,0 +1,77 @@
+{
+  "name": "ipynb",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "ipynb",
+      "version": "1.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "@enonic/fnv-plus": "^1.3.0",
+        "detect-indent": "^6.0.0"
+      },
+      "devDependencies": {
+        "@jupyterlab/nbformat": "^3.2.9",
+        "@types/markdown-it": "12.2.3"
+      },
+      "engines": {
+        "vscode": "^1.57.0"
+      }
+    },
+    "node_modules/@enonic/fnv-plus": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@enonic/fnv-plus/-/fnv-plus-1.3.0.tgz",
+      "integrity": "sha512-BCN9uNWH8AmiP7BXBJqEinUY9KXalmRzo+L0cB/mQsmFfzODxwQrbvxCHXUNH2iP+qKkWYtB4vyy8N62PViMFw=="
+    },
+    "node_modules/@jupyterlab/nbformat": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/@jupyterlab/nbformat/-/nbformat-3.4.3.tgz",
+      "integrity": "sha512-i/yADrwhhAJJCUOTa+fEBMyJO7fvX9Y73I0B7V6dQhGcrmrEKLC3wk4yOo63+jRntd5+dupbiOtz3w1ncIXwIA==",
+      "dev": true,
+      "dependencies": {
+        "@lumino/coreutils": "^1.11.0"
+      }
+    },
+    "node_modules/@lumino/coreutils": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/@lumino/coreutils/-/coreutils-1.12.0.tgz",
+      "integrity": "sha512-DSglh4ylmLi820CNx9soJmDJCpUgymckdWeGWuN0Ash5g60oQvrQDfosVxEhzmNvtvXv45WZEqSBzDP6E5SEmQ==",
+      "dev": true,
+      "peerDependencies": {
+        "crypto": "1.0.1"
+      }
+    },
+    "node_modules/@types/linkify-it": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.2.tgz",
+      "integrity": "sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==",
+      "dev": true
+    },
+    "node_modules/@types/markdown-it": {
+      "version": "12.2.3",
+      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.2.3.tgz",
+      "integrity": "sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/linkify-it": "*",
+        "@types/mdurl": "*"
+      }
+    },
+    "node_modules/@types/mdurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.2.tgz",
+      "integrity": "sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==",
+      "dev": true
+    },
+    "node_modules/detect-indent": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz",
+      "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==",
+      "engines": {
+        "node": ">=8"
+      }
+    }
+  }
+}
diff --git a/extensions/ipynb/package.json b/extensions/ipynb/package.json
index d923904ef9d..c2fe8c2a012 100644
--- a/extensions/ipynb/package.json
+++ b/extensions/ipynb/package.json
@@ -15,14 +15,15 @@
   ],
   "activationEvents": [
     "onNotebook:jupyter-notebook",
-    "onNotebookSerializer:interactive"
+    "onNotebookSerializer:interactive",
+    "onNotebookSerializer:repl"
   ],
   "extensionKind": [
     "workspace",
     "ui"
   ],
-  "main": "./out/ipynbMain.js",
-  "browser": "./dist/browser/ipynbMain.js",
+  "main": "./out/ipynbMain.node.js",
+  "browser": "./dist/browser/ipynbMain.browser.js",
   "capabilities": {
     "virtualWorkspaces": true,
     "untrustedWorkspaces": {
@@ -38,6 +39,12 @@
             "scope": "resource",
             "markdownDescription": "%ipynb.pasteImagesAsAttachments.enabled%",
             "default": true
+          },
+          "ipynb.experimental.serialization": {
+            "type": "boolean",
+            "scope": "resource",
+            "markdownDescription": "%ipynb.experimental.serialization%",
+            "default": false
           }
         }
       }
@@ -61,6 +68,11 @@
         "command": "notebook.cellOutput.copy",
         "title": "%copyCellOutput.title%",
         "category": "Notebook"
+      },
+      {
+        "command": "notebook.cellOutput.openInTextEditor",
+        "title": "%openCellOutput.title%",
+        "category": "Notebook"
       }
     ],
     "notebooks": [
@@ -107,12 +119,24 @@
         {
           "command": "notebook.cellOutput.copy",
           "when": "notebookCellHasOutputs"
+        },
+        {
+          "command": "notebook.cellOutput.openInTextEditor",
+          "when": "false"
         }
       ],
       "webview/context": [
         {
           "command": "notebook.cellOutput.copy",
           "when": "webviewId == 'notebook.output' && webviewSection == 'image'"
+        },
+        {
+          "command": "notebook.cellOutput.copy",
+          "when": "webviewId == 'notebook.output' && webviewSection == 'text'"
+        },
+        {
+          "command": "notebook.cellOutput.openInTextEditor",
+          "when": "webviewId == 'notebook.output' && webviewSection == 'text'"
         }
       ]
     }
diff --git a/extensions/ipynb/package.nls.json b/extensions/ipynb/package.nls.json
index af7d8f4ab47..9fc163137f8 100644
--- a/extensions/ipynb/package.nls.json
+++ b/extensions/ipynb/package.nls.json
@@ -2,11 +2,13 @@
 	"displayName": ".ipynb Support",
 	"description": "Provides basic support for opening and reading Jupyter's .ipynb notebook files",
 	"ipynb.pasteImagesAsAttachments.enabled": "Enable/disable pasting of images into Markdown cells in ipynb notebook files. Pasted images are inserted as attachments to the cell.",
+	"ipynb.experimental.serialization": "Experimental feature to serialize the Jupyter notebook in a worker thread. Not supported when the Extension host is running as a web worker.",
 	"newUntitledIpynb.title": "New Jupyter Notebook",
 	"newUntitledIpynb.shortTitle": "Jupyter Notebook",
 	"openIpynbInNotebookEditor.title": "Open IPYNB File In Notebook Editor",
 	"cleanInvalidImageAttachment.title": "Clean Invalid Image Attachment Reference",
 	"copyCellOutput.title": "Copy Cell Output",
+	"openCellOutput.title": "Open Cell Output in Text Editor",
 	"markdownAttachmentRenderer.displayName": {
 		"message": "Markdown-It ipynb Cell Attachment renderer",
 		"comment": [
diff --git a/extensions/ipynb/src/common.ts b/extensions/ipynb/src/common.ts
index d81951d2d7c..3fda0bc74f4 100644
--- a/extensions/ipynb/src/common.ts
+++ b/extensions/ipynb/src/common.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type * as nbformat from '@jupyterlab/nbformat';
-import { workspace } from 'vscode';
 
 /**
  * Metadata we store in VS Code cell output items.
@@ -66,6 +65,3 @@ export interface CellMetadata {
 	execution_count?: number;
 }
 
-export function useCustomPropertyInMetadata() {
-	return !workspace.getConfiguration('jupyter', undefined).get<boolean>('experimental.dropCustomMetadata', true);
-}
diff --git a/extensions/ipynb/src/constants.ts b/extensions/ipynb/src/constants.ts
index 43e13b3b510..9a82ccfae39 100644
--- a/extensions/ipynb/src/constants.ts
+++ b/extensions/ipynb/src/constants.ts
@@ -3,9 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as vscode from 'vscode';
+import type { DocumentSelector } from 'vscode';
 
 export const defaultNotebookFormat = { major: 4, minor: 2 };
 export const ATTACHMENT_CLEANUP_COMMANDID = 'ipynb.cleanInvalidImageAttachment';
 
-export const JUPYTER_NOTEBOOK_MARKDOWN_SELECTOR: vscode.DocumentSelector = { notebookType: 'jupyter-notebook', language: 'markdown' };
+export const JUPYTER_NOTEBOOK_MARKDOWN_SELECTOR: DocumentSelector = { notebookType: 'jupyter-notebook', language: 'markdown' };
+
+// Copied from NotebookCellKind.Markup as we cannot import it from vscode directly in worker threads.
+export const NotebookCellKindMarkup = 1;
+// Copied from NotebookCellKind.Code as we cannot import it from vscode directly in worker threads.
+export const NotebookCellKindCode = 2;
+
+export enum CellOutputMimeTypes {
+	error = 'application/vnd.code.notebook.error',
+	stderr = 'application/vnd.code.notebook.stderr',
+	stdout = 'application/vnd.code.notebook.stdout'
+}
+
+export const textMimeTypes = ['text/plain', 'text/markdown', 'text/latex', CellOutputMimeTypes.stderr, CellOutputMimeTypes.stdout];
+
diff --git a/extensions/ipynb/src/deserializers.ts b/extensions/ipynb/src/deserializers.ts
index 920689c748c..de467f66077 100644
--- a/extensions/ipynb/src/deserializers.ts
+++ b/extensions/ipynb/src/deserializers.ts
@@ -5,7 +5,8 @@
 
 import type * as nbformat from '@jupyterlab/nbformat';
 import { extensions, NotebookCellData, NotebookCellExecutionSummary, NotebookCellKind, NotebookCellOutput, NotebookCellOutputItem, NotebookData } from 'vscode';
-import { CellMetadata, CellOutputMetadata, useCustomPropertyInMetadata } from './common';
+import { CellMetadata, CellOutputMetadata } from './common';
+import { textMimeTypes } from './constants';
 
 const jupyterLanguageToMonacoLanguageMapping = new Map([
 	['c#', 'csharp'],
@@ -89,15 +90,6 @@ function sortOutputItemsBasedOnDisplayOrder(outputItems: NotebookCellOutputItem[
 		.sort((outputItemA, outputItemB) => outputItemA.index - outputItemB.index).map(item => item.item);
 }
 
-
-enum CellOutputMimeTypes {
-	error = 'application/vnd.code.notebook.error',
-	stderr = 'application/vnd.code.notebook.stderr',
-	stdout = 'application/vnd.code.notebook.stdout'
-}
-
-export const textMimeTypes = ['text/plain', 'text/markdown', 'text/latex', CellOutputMimeTypes.stderr, CellOutputMimeTypes.stdout];
-
 function concatMultilineString(str: string | string[], trim?: boolean): string {
 	const nonLineFeedWhiteSpaceTrim = /(^[\t\f\v\r ]+|[\t\f\v\r ]+$)/g;
 	if (Array.isArray(str)) {
@@ -154,51 +146,25 @@ function convertJupyterOutputToBuffer(mime: string, value: unknown): NotebookCel
 function getNotebookCellMetadata(cell: nbformat.IBaseCell): {
 	[key: string]: any;
 } {
-	if (useCustomPropertyInMetadata()) {
-		const cellMetadata: { [key: string]: any } = {};
-		// We put this only for VSC to display in diff view.
-		// Else we don't use this.
-		const custom: CellMetadata = {};
-
-		if (cell.cell_type === 'code' && typeof cell['execution_count'] === 'number') {
-			custom.execution_count = cell['execution_count'];
-		}
-
-		if (cell['metadata']) {
-			custom['metadata'] = JSON.parse(JSON.stringify(cell['metadata']));
-		}
-
-		if ('id' in cell && typeof cell.id === 'string') {
-			custom.id = cell.id;
-		}
-
-		cellMetadata.custom = custom;
-
-		if (cell['attachments']) {
-			cellMetadata.attachments = JSON.parse(JSON.stringify(cell['attachments']));
-		}
-		return cellMetadata;
-	} else {
-		// We put this only for VSC to display in diff view.
-		// Else we don't use this.
-		const cellMetadata: CellMetadata = {};
-		if (cell.cell_type === 'code' && typeof cell['execution_count'] === 'number') {
-			cellMetadata.execution_count = cell['execution_count'];
-		}
-
-		if (cell['metadata']) {
-			cellMetadata['metadata'] = JSON.parse(JSON.stringify(cell['metadata']));
-		}
-
-		if ('id' in cell && typeof cell.id === 'string') {
-			cellMetadata.id = cell.id;
-		}
-
-		if (cell['attachments']) {
-			cellMetadata.attachments = JSON.parse(JSON.stringify(cell['attachments']));
-		}
-		return cellMetadata;
+	// We put this only for VSC to display in diff view.
+	// Else we don't use this.
+	const cellMetadata: CellMetadata = {};
+	if (cell.cell_type === 'code' && typeof cell['execution_count'] === 'number') {
+		cellMetadata.execution_count = cell['execution_count'];
 	}
+
+	if (cell['metadata']) {
+		cellMetadata['metadata'] = JSON.parse(JSON.stringify(cell['metadata']));
+	}
+
+	if ('id' in cell && typeof cell.id === 'string') {
+		cellMetadata.id = cell.id;
+	}
+
+	if (cell['attachments']) {
+		cellMetadata.attachments = JSON.parse(JSON.stringify(cell['attachments']));
+	}
+	return cellMetadata;
 }
 
 function getOutputMetadata(output: nbformat.IOutput): CellOutputMetadata {
@@ -382,7 +348,7 @@ export function jupyterNotebookModelToNotebookData(
 	preferredLanguage: string
 ): NotebookData {
 	const notebookContentWithoutCells = { ...notebookContent, cells: [] };
-	if (!notebookContent.cells || notebookContent.cells.length === 0) {
+	if (!Array.isArray(notebookContent.cells)) {
 		throw new Error('Notebook content is missing cells');
 	}
 
@@ -391,6 +357,6 @@ export function jupyterNotebookModelToNotebookData(
 		.filter((item): item is NotebookCellData => !!item);
 
 	const notebookData = new NotebookData(cells);
-	notebookData.metadata = useCustomPropertyInMetadata() ? { custom: notebookContentWithoutCells } : notebookContentWithoutCells;
+	notebookData.metadata = notebookContentWithoutCells;
 	return notebookData;
 }
diff --git a/extensions/ipynb/src/helper.ts b/extensions/ipynb/src/helper.ts
index fd81250885d..beab091f5c6 100644
--- a/extensions/ipynb/src/helper.ts
+++ b/extensions/ipynb/src/helper.ts
@@ -3,6 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { CancellationError } from 'vscode';
+
 export function deepClone<T>(obj: T): T {
 	if (!obj || typeof obj !== 'object') {
 		return obj;
@@ -140,3 +142,119 @@ export class Delayer<T> {
 export interface ITask<T> {
 	(): T;
 }
+
+
+/**
+ * Copied from src/vs/base/common/uuid.ts
+ */
+export function generateUuid() {
+	// use `randomValues` if possible
+	function getRandomValues(bucket: Uint8Array): Uint8Array {
+		for (let i = 0; i < bucket.length; i++) {
+			bucket[i] = Math.floor(Math.random() * 256);
+		}
+		return bucket;
+	}
+
+	// prep-work
+	const _data = new Uint8Array(16);
+	const _hex: string[] = [];
+	for (let i = 0; i < 256; i++) {
+		_hex.push(i.toString(16).padStart(2, '0'));
+	}
+
+	// get data
+	getRandomValues(_data);
+
+	// set version bits
+	_data[6] = (_data[6] & 0x0f) | 0x40;
+	_data[8] = (_data[8] & 0x3f) | 0x80;
+
+	// print as string
+	let i = 0;
+	let result = '';
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += '-';
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += '-';
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += '-';
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += '-';
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	return result;
+}
+
+export type ValueCallback<T = unknown> = (value: T | Promise<T>) => void;
+
+const enum DeferredOutcome {
+	Resolved,
+	Rejected
+}
+
+
+/**
+ * Creates a promise whose resolution or rejection can be controlled imperatively.
+ */
+export class DeferredPromise<T> {
+
+	private completeCallback!: ValueCallback<T>;
+	private errorCallback!: (err: unknown) => void;
+	private outcome?: { outcome: DeferredOutcome.Rejected; value: any } | { outcome: DeferredOutcome.Resolved; value: T };
+
+	public get isRejected() {
+		return this.outcome?.outcome === DeferredOutcome.Rejected;
+	}
+
+	public get isResolved() {
+		return this.outcome?.outcome === DeferredOutcome.Resolved;
+	}
+
+	public get isSettled() {
+		return !!this.outcome;
+	}
+
+	public get value() {
+		return this.outcome?.outcome === DeferredOutcome.Resolved ? this.outcome?.value : undefined;
+	}
+
+	public readonly p: Promise<T>;
+
+	constructor() {
+		this.p = new Promise<T>((c, e) => {
+			this.completeCallback = c;
+			this.errorCallback = e;
+		});
+	}
+
+	public complete(value: T) {
+		return new Promise<void>(resolve => {
+			this.completeCallback(value);
+			this.outcome = { outcome: DeferredOutcome.Resolved, value };
+			resolve();
+		});
+	}
+
+	public error(err: unknown) {
+		return new Promise<void>(resolve => {
+			this.errorCallback(err);
+			this.outcome = { outcome: DeferredOutcome.Rejected, value: err };
+			resolve();
+		});
+	}
+
+	public cancel() {
+		return this.error(new CancellationError());
+	}
+}
diff --git a/build/azure-pipelines/common/installPlaywright.ts b/extensions/ipynb/src/ipynbMain.browser.ts
similarity index 52%
rename from build/azure-pipelines/common/installPlaywright.ts
rename to extensions/ipynb/src/ipynbMain.browser.ts
index 742b6e0e399..030a6b541d4 100644
--- a/build/azure-pipelines/common/installPlaywright.ts
+++ b/extensions/ipynb/src/ipynbMain.browser.ts
@@ -3,12 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-process.env.DEBUG='pw:install'; // enable logging for this (https://github.com/microsoft/playwright/issues/17394)
+import * as vscode from 'vscode';
+import * as main from './ipynbMain';
+import { NotebookSerializer } from './notebookSerializer.web';
 
-const { installDefaultBrowsersForNpmInstall } = require('playwright-core/lib/server');
-
-async function install() {
-	await installDefaultBrowsersForNpmInstall();
+export function activate(context: vscode.ExtensionContext) {
+	return main.activate(context, new NotebookSerializer(context));
 }
 
-install();
+export function deactivate() {
+	return main.deactivate();
+}
diff --git a/extensions/ipynb/src/ipynbMain.node.ts b/extensions/ipynb/src/ipynbMain.node.ts
new file mode 100644
index 00000000000..3ec39fee641
--- /dev/null
+++ b/extensions/ipynb/src/ipynbMain.node.ts
@@ -0,0 +1,16 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import * as main from './ipynbMain';
+import { NotebookSerializer } from './notebookSerializer.node';
+
+export function activate(context: vscode.ExtensionContext) {
+	return main.activate(context, new NotebookSerializer(context));
+}
+
+export function deactivate() {
+	return main.deactivate();
+}
diff --git a/extensions/ipynb/src/ipynbMain.ts b/extensions/ipynb/src/ipynbMain.ts
index 889f4c07445..e4fe302d188 100644
--- a/extensions/ipynb/src/ipynbMain.ts
+++ b/extensions/ipynb/src/ipynbMain.ts
@@ -4,11 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { NotebookSerializer } from './notebookSerializer';
 import { activate as keepNotebookModelStoreInSync } from './notebookModelStoreSync';
 import { notebookImagePasteSetup } from './notebookImagePaste';
 import { AttachmentCleaner } from './notebookAttachmentCleaner';
-import { useCustomPropertyInMetadata } from './common';
+import { serializeNotebookToString } from './serializers';
 
 // From {nbformat.INotebookMetadata} in @jupyterlab/coreutils
 type NotebookMetadata = {
@@ -29,33 +28,18 @@ type NotebookMetadata = {
 	[propName: string]: unknown;
 };
 
-export function activate(context: vscode.ExtensionContext) {
-	const serializer = new NotebookSerializer(context);
-	keepNotebookModelStoreInSync(context);
-	context.subscriptions.push(vscode.workspace.registerNotebookSerializer('jupyter-notebook', serializer, {
-		transientOutputs: false,
-		transientCellMetadata: useCustomPropertyInMetadata() ? {
-			breakpointMargin: true,
-			custom: false,
-			attachments: false
-		} : {
-			breakpointMargin: true,
-			id: false,
-			metadata: false,
-			attachments: false
-		},
-		cellContentMetadata: {
-			attachments: true
-		}
-	} as vscode.NotebookDocumentContentOptions));
+type OptionsWithCellContentMetadata = vscode.NotebookDocumentContentOptions & { cellContentMetadata: { attachments: boolean } };
 
-	context.subscriptions.push(vscode.workspace.registerNotebookSerializer('interactive', serializer, {
+
+export function activate(context: vscode.ExtensionContext, serializer: vscode.NotebookSerializer) {
+	keepNotebookModelStoreInSync(context);
+	const notebookSerializerOptions: OptionsWithCellContentMetadata = {
 		transientOutputs: false,
-		transientCellMetadata: useCustomPropertyInMetadata() ? {
-			breakpointMargin: true,
-			custom: false,
-			attachments: false
-		} : {
+		transientDocumentMetadata: {
+			cells: true,
+			indentAmount: true
+		},
+		transientCellMetadata: {
 			breakpointMargin: true,
 			id: false,
 			metadata: false,
@@ -64,7 +48,22 @@ export function activate(context: vscode.ExtensionContext) {
 		cellContentMetadata: {
 			attachments: true
 		}
-	} as vscode.NotebookDocumentContentOptions));
+	};
+	context.subscriptions.push(vscode.workspace.registerNotebookSerializer('jupyter-notebook', serializer, notebookSerializerOptions));
+
+	const interactiveSerializeOptions: OptionsWithCellContentMetadata = {
+		transientOutputs: false,
+		transientCellMetadata: {
+			breakpointMargin: true,
+			id: false,
+			metadata: false,
+			attachments: false
+		},
+		cellContentMetadata: {
+			attachments: true
+		}
+	};
+	context.subscriptions.push(vscode.workspace.registerNotebookSerializer('interactive', serializer, interactiveSerializeOptions));
 
 	vscode.languages.registerCodeLensProvider({ pattern: '**/*.ipynb' }, {
 		provideCodeLenses: (document) => {
@@ -84,14 +83,7 @@ export function activate(context: vscode.ExtensionContext) {
 		const language = 'python';
 		const cell = new vscode.NotebookCellData(vscode.NotebookCellKind.Code, '', language);
 		const data = new vscode.NotebookData([cell]);
-		data.metadata = useCustomPropertyInMetadata() ? {
-			custom: {
-				cells: [],
-				metadata: {},
-				nbformat: 4,
-				nbformat_minor: 2
-			}
-		} : {
+		data.metadata = {
 			cells: [],
 			metadata: {},
 			nbformat: 4,
@@ -117,19 +109,12 @@ export function activate(context: vscode.ExtensionContext) {
 		context.subscriptions.push(cleaner);
 	}
 
-	// Update new file contribution
-	vscode.extensions.onDidChange(() => {
-		vscode.commands.executeCommand('setContext', 'jupyterEnabled', vscode.extensions.getExtension('ms-toolsai.jupyter'));
-	});
-	vscode.commands.executeCommand('setContext', 'jupyterEnabled', vscode.extensions.getExtension('ms-toolsai.jupyter'));
-
-
 	return {
 		get dropCustomMetadata() {
-			return !useCustomPropertyInMetadata();
+			return true;
 		},
-		exportNotebook: (notebook: vscode.NotebookData): string => {
-			return exportNotebook(notebook, serializer);
+		exportNotebook: (notebook: vscode.NotebookData): Promise<string> => {
+			return Promise.resolve(serializeNotebookToString(notebook));
 		},
 		setNotebookMetadata: async (resource: vscode.Uri, metadata: Partial<NotebookMetadata>): Promise<boolean> => {
 			const document = vscode.workspace.notebookDocuments.find(doc => doc.uri.toString() === resource.toString());
@@ -138,33 +123,16 @@ export function activate(context: vscode.ExtensionContext) {
 			}
 
 			const edit = new vscode.WorkspaceEdit();
-			if (useCustomPropertyInMetadata()) {
-				edit.set(resource, [vscode.NotebookEdit.updateNotebookMetadata({
-					...document.metadata,
-					custom: {
-						...(document.metadata.custom ?? {}),
-						metadata: <NotebookMetadata>{
-							...(document.metadata.custom?.metadata ?? {}),
-							...metadata
-						},
-					}
-				})]);
-			} else {
-				edit.set(resource, [vscode.NotebookEdit.updateNotebookMetadata({
-					...document.metadata,
-					metadata: <NotebookMetadata>{
-						...(document.metadata.metadata ?? {}),
-						...metadata
-					},
-				})]);
-			}
+			edit.set(resource, [vscode.NotebookEdit.updateNotebookMetadata({
+				...document.metadata,
+				metadata: {
+					...(document.metadata.metadata ?? {}),
+					...metadata
+				} satisfies NotebookMetadata,
+			})]);
 			return vscode.workspace.applyEdit(edit);
 		},
 	};
 }
 
-function exportNotebook(notebook: vscode.NotebookData, serializer: NotebookSerializer): string {
-	return serializer.serializeNotebookToString(notebook);
-}
-
 export function deactivate() { }
diff --git a/extensions/ipynb/src/notebookModelStoreSync.ts b/extensions/ipynb/src/notebookModelStoreSync.ts
index a3266216498..451085718c6 100644
--- a/extensions/ipynb/src/notebookModelStoreSync.ts
+++ b/extensions/ipynb/src/notebookModelStoreSync.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Disposable, ExtensionContext, NotebookCellKind, NotebookDocument, NotebookDocumentChangeEvent, NotebookEdit, workspace, WorkspaceEdit, type NotebookCell, type NotebookDocumentWillSaveEvent } from 'vscode';
-import { getCellMetadata, getVSCodeCellLanguageId, removeVSCodeCellLanguageId, setVSCodeCellLanguageId, sortObjectPropertiesRecursively } from './serializers';
-import { CellMetadata, useCustomPropertyInMetadata } from './common';
-import { getNotebookMetadata } from './notebookSerializer';
+import { getCellMetadata, getVSCodeCellLanguageId, removeVSCodeCellLanguageId, setVSCodeCellLanguageId, sortObjectPropertiesRecursively, getNotebookMetadata } from './serializers';
+import { CellMetadata } from './common';
 import type * as nbformat from '@jupyterlab/nbformat';
+import { generateUuid } from './helper';
 
 const noop = () => {
 	//
@@ -108,17 +108,12 @@ function trackAndUpdateCellMetadata(notebook: NotebookDocument, updates: { cell:
 	pendingNotebookCellModelUpdates.set(notebook, pendingUpdates);
 	const edit = new WorkspaceEdit();
 	updates.forEach(({ cell, metadata }) => {
-		let newMetadata: any = {};
-		if (useCustomPropertyInMetadata()) {
-			newMetadata = { ...(cell.metadata), custom: metadata };
-		} else {
-			newMetadata = { ...cell.metadata, ...metadata };
-			if (!metadata.execution_count && newMetadata.execution_count) {
-				delete newMetadata.execution_count;
-			}
-			if (!metadata.attachments && newMetadata.attachments) {
-				delete newMetadata.attachments;
-			}
+		const newMetadata = { ...cell.metadata, ...metadata };
+		if (!metadata.execution_count && newMetadata.execution_count) {
+			delete newMetadata.execution_count;
+		}
+		if (!metadata.attachments && newMetadata.attachments) {
+			delete newMetadata.attachments;
 		}
 		edit.set(cell.notebook.uri, [NotebookEdit.updateCellMetadata(cell.index, sortObjectPropertiesRecursively(newMetadata))]);
 	});
@@ -247,55 +242,3 @@ function generateCellId(notebook: NotebookDocument) {
 	}
 }
 
-
-/**
- * Copied from src/vs/base/common/uuid.ts
- */
-function generateUuid() {
-	// use `randomValues` if possible
-	function getRandomValues(bucket: Uint8Array): Uint8Array {
-		for (let i = 0; i < bucket.length; i++) {
-			bucket[i] = Math.floor(Math.random() * 256);
-		}
-		return bucket;
-	}
-
-	// prep-work
-	const _data = new Uint8Array(16);
-	const _hex: string[] = [];
-	for (let i = 0; i < 256; i++) {
-		_hex.push(i.toString(16).padStart(2, '0'));
-	}
-
-	// get data
-	getRandomValues(_data);
-
-	// set version bits
-	_data[6] = (_data[6] & 0x0f) | 0x40;
-	_data[8] = (_data[8] & 0x3f) | 0x80;
-
-	// print as string
-	let i = 0;
-	let result = '';
-	result += _hex[_data[i++]];
-	result += _hex[_data[i++]];
-	result += _hex[_data[i++]];
-	result += _hex[_data[i++]];
-	result += '-';
-	result += _hex[_data[i++]];
-	result += _hex[_data[i++]];
-	result += '-';
-	result += _hex[_data[i++]];
-	result += _hex[_data[i++]];
-	result += '-';
-	result += _hex[_data[i++]];
-	result += _hex[_data[i++]];
-	result += '-';
-	result += _hex[_data[i++]];
-	result += _hex[_data[i++]];
-	result += _hex[_data[i++]];
-	result += _hex[_data[i++]];
-	result += _hex[_data[i++]];
-	result += _hex[_data[i++]];
-	return result;
-}
diff --git a/extensions/ipynb/src/notebookSerializer.node.ts b/extensions/ipynb/src/notebookSerializer.node.ts
new file mode 100644
index 00000000000..5a6a21018ef
--- /dev/null
+++ b/extensions/ipynb/src/notebookSerializer.node.ts
@@ -0,0 +1,91 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import { DeferredPromise, generateUuid } from './helper';
+import { NotebookSerializerBase } from './notebookSerializer';
+
+export class NotebookSerializer extends NotebookSerializerBase {
+	private experimentalSave = vscode.workspace.getConfiguration('ipynb').get('experimental.serialization', false);
+	private worker?: import('node:worker_threads').Worker;
+	private tasks = new Map<string, DeferredPromise<Uint8Array>>();
+
+	constructor(context: vscode.ExtensionContext) {
+		super(context);
+		context.subscriptions.push(vscode.workspace.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration('ipynb.experimental.serialization')) {
+				this.experimentalSave = vscode.workspace.getConfiguration('ipynb').get('experimental.serialization', false);
+			}
+		}));
+	}
+
+	override dispose() {
+		try {
+			void this.worker?.terminate();
+		} catch {
+			//
+		}
+		super.dispose();
+	}
+
+	public override async serializeNotebook(data: vscode.NotebookData, token: vscode.CancellationToken): Promise<Uint8Array> {
+		if (this.disposed) {
+			return new Uint8Array(0);
+		}
+
+		if (this.experimentalSave) {
+			return this.serializeViaWorker(data);
+		}
+
+		return super.serializeNotebook(data, token);
+	}
+
+	private async startWorker() {
+		if (this.disposed) {
+			throw new Error('Serializer disposed');
+		}
+		if (this.worker) {
+			return this.worker;
+		}
+		const { Worker } = await import('node:worker_threads');
+		const outputDir = getOutputDir(this.context);
+		this.worker = new Worker(vscode.Uri.joinPath(this.context.extensionUri, outputDir, 'notebookSerializerWorker.js').fsPath, {});
+		this.worker.on('exit', (exitCode) => {
+			if (!this.disposed) {
+				console.error(`IPynb Notebook Serializer Worker exited unexpectedly`, exitCode);
+			}
+			this.worker = undefined;
+		});
+		this.worker.on('message', (result: { data: Uint8Array; id: string }) => {
+			const task = this.tasks.get(result.id);
+			if (task) {
+				task.complete(result.data);
+				this.tasks.delete(result.id);
+			}
+		});
+		this.worker.on('error', (err) => {
+			if (!this.disposed) {
+				console.error(`IPynb Notebook Serializer Worker errored unexpectedly`, err);
+			}
+		});
+		return this.worker;
+	}
+	private async serializeViaWorker(data: vscode.NotebookData): Promise<Uint8Array> {
+		const worker = await this.startWorker();
+		const id = generateUuid();
+
+		const deferred = new DeferredPromise<Uint8Array>();
+		this.tasks.set(id, deferred);
+		worker.postMessage({ data, id });
+
+		return deferred.p;
+	}
+}
+
+
+function getOutputDir(context: vscode.ExtensionContext): string {
+	const main = context.extension.packageJSON.main as string;
+	return main.indexOf('/dist/') !== -1 ? 'dist' : 'out';
+}
diff --git a/extensions/ipynb/src/notebookSerializer.ts b/extensions/ipynb/src/notebookSerializer.ts
index 1d44a458812..898b4ff9362 100644
--- a/extensions/ipynb/src/notebookSerializer.ts
+++ b/extensions/ipynb/src/notebookSerializer.ts
@@ -6,14 +6,19 @@
 import type * as nbformat from '@jupyterlab/nbformat';
 import * as detectIndent from 'detect-indent';
 import * as vscode from 'vscode';
-import { defaultNotebookFormat } from './constants';
 import { getPreferredLanguage, jupyterNotebookModelToNotebookData } from './deserializers';
-import { createJupyterCellFromNotebookCell, pruneCell, sortObjectPropertiesRecursively } from './serializers';
 import * as fnv from '@enonic/fnv-plus';
-import { useCustomPropertyInMetadata } from './common';
+import { serializeNotebookToString } from './serializers';
 
-export class NotebookSerializer implements vscode.NotebookSerializer {
-	constructor(readonly context: vscode.ExtensionContext) {
+export abstract class NotebookSerializerBase extends vscode.Disposable implements vscode.NotebookSerializer {
+	protected disposed: boolean = false;
+	constructor(protected readonly context: vscode.ExtensionContext) {
+		super(() => { });
+	}
+
+	override dispose() {
+		this.disposed = true;
+		super.dispose();
 	}
 
 	public async deserializeNotebook(content: Uint8Array, _token: vscode.CancellationToken): Promise<vscode.NotebookData> {
@@ -52,13 +57,6 @@ export class NotebookSerializer implements vscode.NotebookSerializer {
 		// Ensure we always have a blank cell.
 		if ((json.cells || []).length === 0) {
 			json.cells = [
-				{
-					cell_type: 'code',
-					execution_count: null,
-					metadata: {},
-					outputs: [],
-					source: ''
-				}
 			];
 		}
 
@@ -78,33 +76,13 @@ export class NotebookSerializer implements vscode.NotebookSerializer {
 		return data;
 	}
 
-	public serializeNotebook(data: vscode.NotebookData, _token: vscode.CancellationToken): Uint8Array {
-		return new TextEncoder().encode(this.serializeNotebookToString(data));
+	public async serializeNotebook(data: vscode.NotebookData, _token: vscode.CancellationToken): Promise<Uint8Array> {
+		if (this.disposed) {
+			return new Uint8Array(0);
+		}
+
+		const serialized = serializeNotebookToString(data);
+		return new TextEncoder().encode(serialized);
 	}
 
-	public serializeNotebookToString(data: vscode.NotebookData): string {
-		const notebookContent = getNotebookMetadata(data);
-		// use the preferred language from document metadata or the first cell language as the notebook preferred cell language
-		const preferredCellLanguage = notebookContent.metadata?.language_info?.name ?? data.cells.find(cell => cell.kind === vscode.NotebookCellKind.Code)?.languageId;
-
-		notebookContent.cells = data.cells
-			.map(cell => createJupyterCellFromNotebookCell(cell, preferredCellLanguage))
-			.map(pruneCell);
-
-		const indentAmount = data.metadata && 'indentAmount' in data.metadata && typeof data.metadata.indentAmount === 'string' ?
-			data.metadata.indentAmount :
-			' ';
-		// ipynb always ends with a trailing new line (we add this so that SCMs do not show unnecessary changes, resulting from a missing trailing new line).
-		return JSON.stringify(sortObjectPropertiesRecursively(notebookContent), undefined, indentAmount) + '\n';
-	}
-}
-
-export function getNotebookMetadata(document: vscode.NotebookDocument | vscode.NotebookData) {
-	const existingContent: Partial<nbformat.INotebookContent> = (useCustomPropertyInMetadata() ? document.metadata?.custom : document.metadata) || {};
-	const notebookContent: Partial<nbformat.INotebookContent> = {};
-	notebookContent.cells = existingContent.cells || [];
-	notebookContent.nbformat = existingContent.nbformat || defaultNotebookFormat.major;
-	notebookContent.nbformat_minor = existingContent.nbformat_minor ?? defaultNotebookFormat.minor;
-	notebookContent.metadata = existingContent.metadata || {};
-	return notebookContent;
 }
diff --git a/extensions/ipynb/src/notebookSerializer.web.ts b/extensions/ipynb/src/notebookSerializer.web.ts
new file mode 100644
index 00000000000..54496108a8b
--- /dev/null
+++ b/extensions/ipynb/src/notebookSerializer.web.ts
@@ -0,0 +1,85 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import { DeferredPromise, generateUuid } from './helper';
+import { NotebookSerializerBase } from './notebookSerializer';
+
+export class NotebookSerializer extends NotebookSerializerBase {
+	private experimentalSave = vscode.workspace.getConfiguration('ipynb').get('experimental.serialization', false);
+	private worker?: Worker;
+	private tasks = new Map<string, DeferredPromise<Uint8Array>>();
+
+	constructor(context: vscode.ExtensionContext) {
+		super(context);
+		context.subscriptions.push(vscode.workspace.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration('ipynb.experimental.serialization')) {
+				this.experimentalSave = vscode.workspace.getConfiguration('ipynb').get('experimental.serialization', false);
+			}
+		}));
+	}
+
+	override dispose() {
+		try {
+			void this.worker?.terminate();
+		} catch {
+			//
+		}
+		super.dispose();
+	}
+
+	public override async serializeNotebook(data: vscode.NotebookData, token: vscode.CancellationToken): Promise<Uint8Array> {
+		if (this.disposed) {
+			return new Uint8Array(0);
+		}
+
+		if (this.experimentalSave) {
+			return this.serializeViaWorker(data);
+		}
+
+		return super.serializeNotebook(data, token);
+	}
+
+	private async startWorker() {
+		if (this.disposed) {
+			throw new Error('Serializer disposed');
+		}
+		if (this.worker) {
+			return this.worker;
+		}
+		const entry = vscode.Uri.joinPath(this.context.extensionUri, 'dist', 'browser', 'notebookSerializerWorker.js');
+		this.worker = new Worker(entry.toString());
+		this.worker.addEventListener('exit', (exitCode) => {
+			if (!this.disposed) {
+				console.error(`IPynb Notebook Serializer Worker exited unexpectedly`, exitCode);
+			}
+			this.worker = undefined;
+		});
+		this.worker.onmessage = (e) => {
+			const result = e.data as { id: string; data: Uint8Array };
+			const task = this.tasks.get(result.id);
+			if (task) {
+				task.complete(result.data);
+				this.tasks.delete(result.id);
+			}
+		};
+		this.worker.onerror = (err) => {
+			if (!this.disposed) {
+				console.error(`IPynb Notebook Serializer Worker errored unexpectedly`, err);
+			}
+		};
+		return this.worker;
+	}
+	private async serializeViaWorker(data: vscode.NotebookData): Promise<Uint8Array> {
+		const worker = await this.startWorker();
+		const id = generateUuid();
+
+		const deferred = new DeferredPromise<Uint8Array>();
+		this.tasks.set(id, deferred);
+		worker.postMessage({ data, id });
+
+		return deferred.p;
+	}
+}
diff --git a/extensions/ipynb/src/notebookSerializerWorker.ts b/extensions/ipynb/src/notebookSerializerWorker.ts
new file mode 100644
index 00000000000..594af6da791
--- /dev/null
+++ b/extensions/ipynb/src/notebookSerializerWorker.ts
@@ -0,0 +1,19 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { parentPort } from 'worker_threads';
+import { serializeNotebookToString } from './serializers';
+import type { NotebookData } from 'vscode';
+
+
+if (parentPort) {
+	parentPort.on('message', ({ id, data }: { id: string; data: NotebookData }) => {
+		if (parentPort) {
+			const json = serializeNotebookToString(data);
+			const bytes = new TextEncoder().encode(json);
+			parentPort.postMessage({ id, data: bytes });
+		}
+	});
+}
diff --git a/extensions/ipynb/src/notebookSerializerWorker.web.ts b/extensions/ipynb/src/notebookSerializerWorker.web.ts
new file mode 100644
index 00000000000..4ff8e12b8fa
--- /dev/null
+++ b/extensions/ipynb/src/notebookSerializerWorker.web.ts
@@ -0,0 +1,14 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { serializeNotebookToString } from './serializers';
+import type { NotebookData } from 'vscode';
+
+onmessage = (e) => {
+	const data = e.data as { id: string; data: NotebookData };
+	const json = serializeNotebookToString(data.data);
+	const bytes = new TextEncoder().encode(json);
+	postMessage({ id: data.id, data: bytes });
+};
diff --git a/extensions/ipynb/src/serializers.ts b/extensions/ipynb/src/serializers.ts
index 3eb6e90eabd..33de79f41a6 100644
--- a/extensions/ipynb/src/serializers.ts
+++ b/extensions/ipynb/src/serializers.ts
@@ -4,24 +4,18 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type * as nbformat from '@jupyterlab/nbformat';
-import { NotebookCell, NotebookCellData, NotebookCellKind, NotebookCellOutput } from 'vscode';
-import { CellOutputMetadata, useCustomPropertyInMetadata, type CellMetadata } from './common';
-import { textMimeTypes } from './deserializers';
+import type { NotebookCell, NotebookCellData, NotebookCellOutput, NotebookData, NotebookDocument } from 'vscode';
+import { CellOutputMetadata, type CellMetadata } from './common';
+import { textMimeTypes, NotebookCellKindMarkup, CellOutputMimeTypes, defaultNotebookFormat } from './constants';
 
 const textDecoder = new TextDecoder();
 
-enum CellOutputMimeTypes {
-	error = 'application/vnd.code.notebook.error',
-	stderr = 'application/vnd.code.notebook.stderr',
-	stdout = 'application/vnd.code.notebook.stdout'
-}
-
 export function createJupyterCellFromNotebookCell(
 	vscCell: NotebookCellData,
-	preferredLanguage: string | undefined
+	preferredLanguage: string | undefined,
 ): nbformat.IRawCell | nbformat.IMarkdownCell | nbformat.ICodeCell {
 	let cell: nbformat.IRawCell | nbformat.IMarkdownCell | nbformat.ICodeCell;
-	if (vscCell.kind === NotebookCellKind.Markup) {
+	if (vscCell.kind === NotebookCellKindMarkup) {
 		cell = createMarkdownCellFromNotebookCell(vscCell);
 	} else if (vscCell.languageId === 'raw') {
 		cell = createRawCellFromNotebookCell(vscCell);
@@ -57,18 +51,6 @@ export function sortObjectPropertiesRecursively(obj: any): any {
 export function getCellMetadata(options: { cell: NotebookCell | NotebookCellData } | { metadata?: { [key: string]: any } }): CellMetadata {
 	if ('cell' in options) {
 		const cell = options.cell;
-		if (useCustomPropertyInMetadata()) {
-			const metadata: CellMetadata = {
-				// it contains the cell id, and the cell metadata, along with other nb cell metadata
-				...(cell.metadata?.custom ?? {})
-			};
-			// promote the cell attachments to the top level
-			const attachments = cell.metadata?.custom?.attachments ?? cell.metadata?.attachments;
-			if (attachments) {
-				metadata.attachments = attachments;
-			}
-			return metadata;
-		}
 		const metadata = {
 			// it contains the cell id, and the cell metadata, along with other nb cell metadata
 			...(cell.metadata ?? {})
@@ -77,18 +59,6 @@ export function getCellMetadata(options: { cell: NotebookCell | NotebookCellData
 		return metadata;
 	} else {
 		const cell = options;
-		if (useCustomPropertyInMetadata()) {
-			const metadata: CellMetadata = {
-				// it contains the cell id, and the cell metadata, along with other nb cell metadata
-				...(cell.metadata?.custom ?? {})
-			};
-			// promote the cell attachments to the top level
-			const attachments = cell.metadata?.custom?.attachments ?? cell.metadata?.attachments;
-			if (attachments) {
-				metadata.attachments = attachments;
-			}
-			return metadata;
-		}
 		const metadata = {
 			// it contains the cell id, and the cell metadata, along with other nb cell metadata
 			...(cell.metadata ?? {})
@@ -121,9 +91,15 @@ function createCodeCellFromNotebookCell(cell: NotebookCellData, preferredLanguag
 		removeVSCodeCellLanguageId(cellMetadata);
 	}
 
-	const codeCell: any = {
+	const codeCell: nbformat.ICodeCell = {
 		cell_type: 'code',
-		execution_count: cell.executionSummary?.executionOrder ?? null,
+		// Metadata should always contain the execution_count.
+		// When ever execution summary data changes we will update the metadata to contain the execution count.
+		// Failing to do so means we have a problem.
+		// Also do not read the value of executionSummary here, as its possible user reverted changes to metadata
+		// & in that case execution summary could contain the data, but metadata will not.
+		// In such cases we do not want to re-set the metadata with the value from execution summary (remember, user reverted that).
+		execution_count: cellMetadata.execution_count ?? null,
 		source: splitMultilineString(cell.value.replace(/\r\n/g, '\n')),
 		outputs: (cell.outputs || []).map(translateCellDisplayOutput),
 		metadata: cellMetadata.metadata
@@ -403,10 +379,10 @@ export function createMarkdownCellFromNotebookCell(cell: NotebookCellData): nbfo
 
 export function pruneCell(cell: nbformat.ICell): nbformat.ICell {
 	// Source is usually a single string on input. Convert back to an array
-	const result = {
+	const result: nbformat.ICell = {
 		...cell,
 		source: splitMultilineString(cell.source)
-	} as nbformat.ICell;
+	};
 
 	// Remove outputs and execution_count from non code cells
 	if (result.cell_type !== 'code') {
@@ -469,3 +445,36 @@ function fixupOutput(output: nbformat.IOutput): nbformat.IOutput {
 	}
 	return result;
 }
+
+
+export function serializeNotebookToString(data: NotebookData): string {
+	const notebookContent = getNotebookMetadata(data);
+	// use the preferred language from document metadata or the first cell language as the notebook preferred cell language
+	const preferredCellLanguage = notebookContent.metadata?.language_info?.name ?? data.cells.find(cell => cell.kind === 2)?.languageId;
+
+	notebookContent.cells = data.cells
+		.map(cell => createJupyterCellFromNotebookCell(cell, preferredCellLanguage))
+		.map(pruneCell);
+
+	const indentAmount = data.metadata && 'indentAmount' in data.metadata && typeof data.metadata.indentAmount === 'string' ?
+		data.metadata.indentAmount :
+		' ';
+
+	return serializeNotebookToJSON(notebookContent, indentAmount);
+}
+function serializeNotebookToJSON(notebookContent: Partial<nbformat.INotebookContent>, indentAmount: string): string {
+	// ipynb always ends with a trailing new line (we add this so that SCMs do not show unnecessary changes, resulting from a missing trailing new line).
+	const sorted = sortObjectPropertiesRecursively(notebookContent);
+
+	return JSON.stringify(sorted, undefined, indentAmount) + '\n';
+}
+
+export function getNotebookMetadata(document: NotebookDocument | NotebookData) {
+	const existingContent: Partial<nbformat.INotebookContent> = document.metadata || {};
+	const notebookContent: Partial<nbformat.INotebookContent> = {};
+	notebookContent.cells = existingContent.cells || [];
+	notebookContent.nbformat = existingContent.nbformat || defaultNotebookFormat.major;
+	notebookContent.nbformat_minor = existingContent.nbformat_minor ?? defaultNotebookFormat.minor;
+	notebookContent.metadata = existingContent.metadata || {};
+	return notebookContent;
+}
diff --git a/extensions/ipynb/src/test/notebookModelStoreSync.test.ts b/extensions/ipynb/src/test/notebookModelStoreSync.test.ts
index 1afca8c1239..acb6ec546bb 100644
--- a/extensions/ipynb/src/test/notebookModelStoreSync.test.ts
+++ b/extensions/ipynb/src/test/notebookModelStoreSync.test.ts
@@ -8,673 +8,525 @@ import * as sinon from 'sinon';
 import { CancellationTokenSource, Disposable, EventEmitter, ExtensionContext, NotebookCellKind, NotebookDocumentChangeEvent, NotebookDocumentWillSaveEvent, NotebookEdit, NotebookRange, TextDocumentSaveReason, workspace, type CancellationToken, type NotebookCell, type NotebookDocument, type WorkspaceEdit, type WorkspaceEditMetadata } from 'vscode';
 import { activate } from '../notebookModelStoreSync';
 
-[true, false].forEach(useCustomPropertyInMetadata => {
-	suite(`Notebook Model Store Sync (${useCustomPropertyInMetadata ? 'with custom metadata (standard behaviour)' : 'without custom metadata'})`, () => {
-		let disposables: Disposable[] = [];
-		let onDidChangeNotebookDocument: EventEmitter<NotebookDocumentChangeEvent>;
-		let onWillSaveNotebookDocument: AsyncEmitter<NotebookDocumentWillSaveEvent>;
-		let notebook: NotebookDocument;
-		let token: CancellationTokenSource;
-		let editsApplied: WorkspaceEdit[] = [];
-		let pendingPromises: Promise<void>[] = [];
-		let cellMetadataUpdates: NotebookEdit[] = [];
-		let applyEditStub: sinon.SinonStub<[edit: WorkspaceEdit, metadata?: WorkspaceEditMetadata | undefined], Thenable<boolean>>;
-		setup(() => {
-			disposables = [];
-			notebook = {
-				notebookType: '',
-				metadata: {}
-			} as NotebookDocument;
-			sinon.stub(workspace, 'getConfiguration').callsFake((section, scope) => {
-				if (section === 'jupyter') {
-					return {
-						get: () => {
-							return !useCustomPropertyInMetadata;
-						}
-					};
-				} else {
-					return (workspace.getConfiguration as any).wrappedMethod.call(workspace, section, scope);
-				}
-			});
-			token = new CancellationTokenSource();
-			disposables.push(token);
-			sinon.stub(notebook, 'notebookType').get(() => 'jupyter-notebook');
-			applyEditStub = sinon.stub(workspace, 'applyEdit').callsFake((edit: WorkspaceEdit) => {
-				editsApplied.push(edit);
-				return Promise.resolve(true);
-			});
-			const context = { subscriptions: [] as Disposable[] } as ExtensionContext;
-			onDidChangeNotebookDocument = new EventEmitter<NotebookDocumentChangeEvent>();
-			disposables.push(onDidChangeNotebookDocument);
-			onWillSaveNotebookDocument = new AsyncEmitter<NotebookDocumentWillSaveEvent>();
-
-			sinon.stub(NotebookEdit, 'updateCellMetadata').callsFake((index, metadata) => {
-				const edit = (NotebookEdit.updateCellMetadata as any).wrappedMethod.call(NotebookEdit, index, metadata);
-				cellMetadataUpdates.push(edit);
-				return edit;
-			}
-			);
-			sinon.stub(workspace, 'onDidChangeNotebookDocument').callsFake(cb =>
-				onDidChangeNotebookDocument.event(cb)
-			);
-			sinon.stub(workspace, 'onWillSaveNotebookDocument').callsFake(cb =>
-				onWillSaveNotebookDocument.event(cb)
-			);
-			activate(context);
-		});
-		teardown(async () => {
-			await Promise.allSettled(pendingPromises);
-			editsApplied = [];
-			pendingPromises = [];
-			cellMetadataUpdates = [];
-			disposables.forEach(d => d.dispose());
-			disposables = [];
-			sinon.restore();
+suite(`Notebook Model Store Sync`, () => {
+	let disposables: Disposable[] = [];
+	let onDidChangeNotebookDocument: EventEmitter<NotebookDocumentChangeEvent>;
+	let onWillSaveNotebookDocument: AsyncEmitter<NotebookDocumentWillSaveEvent>;
+	let notebook: NotebookDocument;
+	let token: CancellationTokenSource;
+	let editsApplied: WorkspaceEdit[] = [];
+	let pendingPromises: Promise<void>[] = [];
+	let cellMetadataUpdates: NotebookEdit[] = [];
+	let applyEditStub: sinon.SinonStub<[edit: WorkspaceEdit, metadata?: WorkspaceEditMetadata | undefined], Thenable<boolean>>;
+	setup(() => {
+		disposables = [];
+		notebook = {
+			notebookType: '',
+			metadata: {}
+		} as NotebookDocument;
+		token = new CancellationTokenSource();
+		disposables.push(token);
+		sinon.stub(notebook, 'notebookType').get(() => 'jupyter-notebook');
+		applyEditStub = sinon.stub(workspace, 'applyEdit').callsFake((edit: WorkspaceEdit) => {
+			editsApplied.push(edit);
+			return Promise.resolve(true);
 		});
+		const context = { subscriptions: [] as Disposable[] } as ExtensionContext;
+		onDidChangeNotebookDocument = new EventEmitter<NotebookDocumentChangeEvent>();
+		disposables.push(onDidChangeNotebookDocument);
+		onWillSaveNotebookDocument = new AsyncEmitter<NotebookDocumentWillSaveEvent>();
 
-		test('Empty cell will not result in any updates', async () => {
-			const e: NotebookDocumentChangeEvent = {
-				notebook,
-				metadata: undefined,
-				contentChanges: [],
-				cellChanges: []
-			};
-
-			onDidChangeNotebookDocument.fire(e);
-
-			assert.strictEqual(editsApplied.length, 0);
-		});
-		test('Adding cell for non Jupyter Notebook will not result in any updates', async () => {
-			sinon.stub(notebook, 'notebookType').get(() => 'some-other-type');
-			const cell: NotebookCell = {
-				document: {} as any,
-				executionSummary: {},
-				index: 0,
-				kind: NotebookCellKind.Code,
-				metadata: {},
-				notebook,
-				outputs: []
-			};
-			const e: NotebookDocumentChangeEvent = {
-				notebook,
-				metadata: undefined,
-				contentChanges: [
-					{
-						range: new NotebookRange(0, 0),
-						removedCells: [],
-						addedCells: [cell]
-					}
-				],
-				cellChanges: []
-			};
-
-			onDidChangeNotebookDocument.fire(e);
-
-			assert.strictEqual(editsApplied.length, 0);
-			assert.strictEqual(cellMetadataUpdates.length, 0);
-		});
-		test('Adding cell will result in an update to the metadata', async () => {
-			const cell: NotebookCell = {
-				document: {} as any,
-				executionSummary: {},
-				index: 0,
-				kind: NotebookCellKind.Code,
-				metadata: {},
-				notebook,
-				outputs: []
-			};
-			const e: NotebookDocumentChangeEvent = {
-				notebook,
-				metadata: undefined,
-				contentChanges: [
-					{
-						range: new NotebookRange(0, 0),
-						removedCells: [],
-						addedCells: [cell]
-					}
-				],
-				cellChanges: []
-			};
-
-			onDidChangeNotebookDocument.fire(e);
-
-			assert.strictEqual(editsApplied.length, 1);
-			assert.strictEqual(cellMetadataUpdates.length, 1);
-			const newMetadata = cellMetadataUpdates[0].newCellMetadata;
-			if (useCustomPropertyInMetadata) {
-				assert.deepStrictEqual(newMetadata, { custom: { metadata: {} } });
-			} else {
-				assert.deepStrictEqual(newMetadata, { metadata: {} });
-			}
-		});
-		test('Add cell id if nbformat is 4.5', async () => {
-			if (useCustomPropertyInMetadata) {
-				sinon.stub(notebook, 'metadata').get(() => ({ custom: { nbformat: 4, nbformat_minor: 5 } }));
-			} else {
-				sinon.stub(notebook, 'metadata').get(() => ({ nbformat: 4, nbformat_minor: 5 }));
-			}
-			const cell: NotebookCell = {
-				document: {} as any,
-				executionSummary: {},
-				index: 0,
-				kind: NotebookCellKind.Code,
-				metadata: {},
-				notebook,
-				outputs: []
-			};
-			const e: NotebookDocumentChangeEvent = {
-				notebook,
-				metadata: undefined,
-				contentChanges: [
-					{
-						range: new NotebookRange(0, 0),
-						removedCells: [],
-						addedCells: [cell]
-					}
-				],
-				cellChanges: []
-			};
-
-			onDidChangeNotebookDocument.fire(e);
-
-			assert.strictEqual(editsApplied.length, 1);
-			assert.strictEqual(cellMetadataUpdates.length, 1);
-			const newMetadata = cellMetadataUpdates[0].newCellMetadata || {};
-			if (useCustomPropertyInMetadata) {
-				assert.strictEqual(Object.keys(newMetadata).length, 1);
-				assert.strictEqual(Object.keys(newMetadata.custom).length, 2);
-				assert.deepStrictEqual(newMetadata.custom.metadata, {});
-				assert.ok(newMetadata.custom.id);
-			} else {
-				assert.strictEqual(Object.keys(newMetadata).length, 2);
-				assert.deepStrictEqual(newMetadata.metadata, {});
-				assert.ok(newMetadata.id);
-			}
-		});
-		test('Do not add cell id if one already exists', async () => {
-			if (useCustomPropertyInMetadata) {
-				sinon.stub(notebook, 'metadata').get(() => ({ custom: { nbformat: 4, nbformat_minor: 5 } }));
-			} else {
-				sinon.stub(notebook, 'metadata').get(() => ({ nbformat: 4, nbformat_minor: 5 }));
-			}
-			const cell: NotebookCell = {
-				document: {} as any,
-				executionSummary: {},
-				index: 0,
-				kind: NotebookCellKind.Code,
-				metadata: useCustomPropertyInMetadata ? {
-					custom: {
-						id: '1234'
-					}
-				} : {
-					id: '1234'
-				},
-				notebook,
-				outputs: []
-			};
-			const e: NotebookDocumentChangeEvent = {
-				notebook,
-				metadata: undefined,
-				contentChanges: [
-					{
-						range: new NotebookRange(0, 0),
-						removedCells: [],
-						addedCells: [cell]
-					}
-				],
-				cellChanges: []
-			};
-
-			onDidChangeNotebookDocument.fire(e);
-
-			assert.strictEqual(editsApplied.length, 1);
-			assert.strictEqual(cellMetadataUpdates.length, 1);
-			const newMetadata = cellMetadataUpdates[0].newCellMetadata || {};
-			if (useCustomPropertyInMetadata) {
-				assert.strictEqual(Object.keys(newMetadata).length, 1);
-				assert.strictEqual(Object.keys(newMetadata.custom).length, 2);
-				assert.deepStrictEqual(newMetadata.custom.metadata, {});
-				assert.strictEqual(newMetadata.custom.id, '1234');
-			} else {
-				assert.strictEqual(Object.keys(newMetadata).length, 2);
-				assert.deepStrictEqual(newMetadata.metadata, {});
-				assert.strictEqual(newMetadata.id, '1234');
-			}
-		});
-		test('Do not perform any updates if cell id and metadata exists', async () => {
-			if (useCustomPropertyInMetadata) {
-				sinon.stub(notebook, 'metadata').get(() => ({ custom: { nbformat: 4, nbformat_minor: 5 } }));
-			} else {
-				sinon.stub(notebook, 'metadata').get(() => ({ nbformat: 4, nbformat_minor: 5 }));
-			}
-			const cell: NotebookCell = {
-				document: {} as any,
-				executionSummary: {},
-				index: 0,
-				kind: NotebookCellKind.Code,
-				metadata: useCustomPropertyInMetadata ? {
-					custom: {
-						id: '1234',
-						metadata: {}
-					}
-				} : {
-					id: '1234',
-					metadata: {}
-				},
-				notebook,
-				outputs: []
-			};
-			const e: NotebookDocumentChangeEvent = {
-				notebook,
-				metadata: undefined,
-				contentChanges: [
-					{
-						range: new NotebookRange(0, 0),
-						removedCells: [],
-						addedCells: [cell]
-					}
-				],
-				cellChanges: []
-			};
-
-			onDidChangeNotebookDocument.fire(e);
-
-			assert.strictEqual(editsApplied.length, 0);
-			assert.strictEqual(cellMetadataUpdates.length, 0);
-		});
-		test('Store language id in custom metadata, whilst preserving existing metadata', async () => {
-			if (useCustomPropertyInMetadata) {
-				sinon.stub(notebook, 'metadata').get(() => ({
-					custom: {
-						nbformat: 4, nbformat_minor: 5,
-						metadata: {
-							language_info: { name: 'python' }
-						}
-					}
-				}));
-			} else {
-				sinon.stub(notebook, 'metadata').get(() => ({
-					nbformat: 4, nbformat_minor: 5,
-					metadata: {
-						language_info: { name: 'python' }
-					}
-				}));
-			}
-			const cell: NotebookCell = {
-				document: {
-					languageId: 'javascript'
-				} as any,
-				executionSummary: {},
-				index: 0,
-				kind: NotebookCellKind.Code,
-				metadata: useCustomPropertyInMetadata ? {
-					custom: {
-						id: '1234',
-						metadata: {
-							collapsed: true, scrolled: true
-						}
-					}
-				} : {
-					id: '1234',
-					metadata: {
-						collapsed: true, scrolled: true
-					}
-				},
-				notebook,
-				outputs: []
-			};
-			const e: NotebookDocumentChangeEvent = {
-				notebook,
-				metadata: undefined,
-				contentChanges: [],
-				cellChanges: [
-					{
-						cell,
-						document: {
-							languageId: 'javascript'
-						} as any,
-						metadata: undefined,
-						outputs: undefined,
-						executionSummary: undefined
-					}
-				]
-			};
-
-			onDidChangeNotebookDocument.fire(e);
-
-			assert.strictEqual(editsApplied.length, 1);
-			assert.strictEqual(cellMetadataUpdates.length, 1);
-			const newMetadata = cellMetadataUpdates[0].newCellMetadata || {};
-			if (useCustomPropertyInMetadata) {
-				assert.strictEqual(Object.keys(newMetadata).length, 1);
-				assert.strictEqual(Object.keys(newMetadata.custom).length, 2);
-				assert.deepStrictEqual(newMetadata.custom.metadata, { collapsed: true, scrolled: true, vscode: { languageId: 'javascript' } });
-				assert.strictEqual(newMetadata.custom.id, '1234');
-			} else {
-				assert.strictEqual(Object.keys(newMetadata).length, 2);
-				assert.deepStrictEqual(newMetadata.metadata, { collapsed: true, scrolled: true, vscode: { languageId: 'javascript' } });
-				assert.strictEqual(newMetadata.id, '1234');
-			}
-		});
-		test('No changes when language is javascript', async () => {
-			if (useCustomPropertyInMetadata) {
-				sinon.stub(notebook, 'metadata').get(() => ({
-					custom: {
-						nbformat: 4, nbformat_minor: 5,
-						metadata: {
-							language_info: { name: 'javascript' }
-						}
-					}
-				}));
-			} else {
-				sinon.stub(notebook, 'metadata').get(() => ({
-					nbformat: 4, nbformat_minor: 5,
-					metadata: {
-						language_info: { name: 'javascript' }
-					}
-				}));
-			}
-			const cell: NotebookCell = {
-				document: {
-					languageId: 'javascript'
-				} as any,
-				executionSummary: {},
-				index: 0,
-				kind: NotebookCellKind.Code,
-				metadata: useCustomPropertyInMetadata ? {
-					custom: {
-						id: '1234',
-						metadata: {
-							collapsed: true, scrolled: true
-						}
-					}
-				} : {
-					id: '1234',
-					metadata: {
-						collapsed: true, scrolled: true
-					}
-				},
-				notebook,
-				outputs: []
-			};
-			const e: NotebookDocumentChangeEvent = {
-				notebook,
-				metadata: undefined,
-				contentChanges: [],
-				cellChanges: [
-					{
-						cell,
-						document: undefined,
-						metadata: undefined,
-						outputs: undefined,
-						executionSummary: undefined
-					}
-				]
-			};
-
-			onDidChangeNotebookDocument.fire(e);
-
-			assert.strictEqual(editsApplied.length, 0);
-			assert.strictEqual(cellMetadataUpdates.length, 0);
-		});
-		test('Remove language from metadata when cell language matches kernel language', async () => {
-			if (useCustomPropertyInMetadata) {
-				sinon.stub(notebook, 'metadata').get(() => ({
-					custom: {
-						nbformat: 4, nbformat_minor: 5,
-						metadata: {
-							language_info: { name: 'javascript' }
-						}
-					}
-				}));
-			} else {
-				sinon.stub(notebook, 'metadata').get(() => ({
-					nbformat: 4, nbformat_minor: 5,
-					metadata: {
-						language_info: { name: 'javascript' }
-					}
-				}));
-			}
-			const cell: NotebookCell = {
-				document: {
-					languageId: 'javascript'
-				} as any,
-				executionSummary: {},
-				index: 0,
-				kind: NotebookCellKind.Code,
-				metadata: useCustomPropertyInMetadata ? {
-					custom: {
-						id: '1234',
-						metadata: {
-							vscode: { languageId: 'python' },
-							collapsed: true, scrolled: true
-						}
-					}
-				} : {
-					id: '1234',
-					metadata: {
-						vscode: { languageId: 'python' },
-						collapsed: true, scrolled: true
-					}
-				},
-				notebook,
-				outputs: []
-			};
-			const e: NotebookDocumentChangeEvent = {
-				notebook,
-				metadata: undefined,
-				contentChanges: [],
-				cellChanges: [
-					{
-						cell,
-						document: {
-							languageId: 'javascript'
-						} as any,
-						metadata: undefined,
-						outputs: undefined,
-						executionSummary: undefined
-					}
-				]
-			};
-
-			onDidChangeNotebookDocument.fire(e);
-
-			assert.strictEqual(editsApplied.length, 1);
-			assert.strictEqual(cellMetadataUpdates.length, 1);
-			const newMetadata = cellMetadataUpdates[0].newCellMetadata || {};
-			if (useCustomPropertyInMetadata) {
-				assert.strictEqual(Object.keys(newMetadata).length, 1);
-				assert.strictEqual(Object.keys(newMetadata.custom).length, 2);
-				assert.deepStrictEqual(newMetadata.custom.metadata, { collapsed: true, scrolled: true });
-				assert.strictEqual(newMetadata.custom.id, '1234');
-			} else {
-				assert.strictEqual(Object.keys(newMetadata).length, 2);
-				assert.deepStrictEqual(newMetadata.metadata, { collapsed: true, scrolled: true });
-				assert.strictEqual(newMetadata.id, '1234');
-			}
-		});
-		test('Update language in metadata', async () => {
-			if (useCustomPropertyInMetadata) {
-				sinon.stub(notebook, 'metadata').get(() => ({
-					custom: {
-						nbformat: 4, nbformat_minor: 5,
-						metadata: {
-							language_info: { name: 'javascript' }
-						}
-					}
-				}));
-			} else {
-
-				sinon.stub(notebook, 'metadata').get(() => ({
-					nbformat: 4, nbformat_minor: 5,
-					metadata: {
-						language_info: { name: 'javascript' }
-					}
-				}));
-			}
-			const cell: NotebookCell = {
-				document: {
-					languageId: 'powershell'
-				} as any,
-				executionSummary: {},
-				index: 0,
-				kind: NotebookCellKind.Code,
-				metadata: useCustomPropertyInMetadata ? {
-					custom: {
-						id: '1234',
-						metadata: {
-							vscode: { languageId: 'python' },
-							collapsed: true, scrolled: true
-						}
-					}
-				} : {
-					id: '1234',
-					metadata: {
-						vscode: { languageId: 'python' },
-						collapsed: true, scrolled: true
-					}
-				},
-				notebook,
-				outputs: []
-			};
-			const e: NotebookDocumentChangeEvent = {
-				notebook,
-				metadata: undefined,
-				contentChanges: [],
-				cellChanges: [
-					{
-						cell,
-						document: {
-							languageId: 'powershell'
-						} as any,
-						metadata: undefined,
-						outputs: undefined,
-						executionSummary: undefined
-					}
-				]
-			};
-
-			onDidChangeNotebookDocument.fire(e);
-
-			assert.strictEqual(editsApplied.length, 1);
-			assert.strictEqual(cellMetadataUpdates.length, 1);
-			const newMetadata = cellMetadataUpdates[0].newCellMetadata || {};
-			if (useCustomPropertyInMetadata) {
-				assert.strictEqual(Object.keys(newMetadata).length, 1);
-				assert.strictEqual(Object.keys(newMetadata.custom).length, 2);
-				assert.deepStrictEqual(newMetadata.custom.metadata, { collapsed: true, scrolled: true, vscode: { languageId: 'powershell' } });
-				assert.strictEqual(newMetadata.custom.id, '1234');
-			} else {
-				assert.strictEqual(Object.keys(newMetadata).length, 2);
-				assert.deepStrictEqual(newMetadata.metadata, { collapsed: true, scrolled: true, vscode: { languageId: 'powershell' } });
-				assert.strictEqual(newMetadata.id, '1234');
-			}
-		});
-
-		test('Will save event without any changes', async () => {
-			await onWillSaveNotebookDocument.fireAsync({ notebook, reason: TextDocumentSaveReason.Manual }, token.token);
-		});
-		test('Wait for pending updates to complete when saving', async () => {
-			let resolveApplyEditPromise: (value: boolean) => void;
-			const promise = new Promise<boolean>((resolve) => resolveApplyEditPromise = resolve);
-			applyEditStub.restore();
-			sinon.stub(workspace, 'applyEdit').callsFake((edit: WorkspaceEdit) => {
-				editsApplied.push(edit);
-				return promise;
-			});
-
-			const cell: NotebookCell = {
-				document: {} as any,
-				executionSummary: {},
-				index: 0,
-				kind: NotebookCellKind.Code,
-				metadata: {},
-				notebook,
-				outputs: []
-			};
-			const e: NotebookDocumentChangeEvent = {
-				notebook,
-				metadata: undefined,
-				contentChanges: [
-					{
-						range: new NotebookRange(0, 0),
-						removedCells: [],
-						addedCells: [cell]
-					}
-				],
-				cellChanges: []
-			};
-
-			onDidChangeNotebookDocument.fire(e);
-
-			assert.strictEqual(editsApplied.length, 1);
-			assert.strictEqual(cellMetadataUpdates.length, 1);
-
-			// Try to save.
-			let saveCompleted = false;
-			const saved = onWillSaveNotebookDocument.fireAsync({
-				notebook,
-				reason: TextDocumentSaveReason.Manual
-			}, token.token);
-			saved.finally(() => saveCompleted = true);
-			await new Promise((resolve) => setTimeout(resolve, 10));
-
-			// Verify we have not yet completed saving.
-			assert.strictEqual(saveCompleted, false);
-
-			resolveApplyEditPromise!(true);
-			await new Promise((resolve) => setTimeout(resolve, 1));
-
-			// Should have completed saving.
-			saved.finally(() => saveCompleted = true);
-		});
-
-		interface IWaitUntil {
-			token: CancellationToken;
-			waitUntil(thenable: Promise<unknown>): void;
-		}
-
-		interface IWaitUntil {
-			token: CancellationToken;
-			waitUntil(thenable: Promise<unknown>): void;
-		}
-		type IWaitUntilData<T> = Omit<Omit<T, 'waitUntil'>, 'token'>;
-
-		class AsyncEmitter<T extends IWaitUntil> {
-			private listeners: ((d: T) => void)[] = [];
-			get event(): (listener: (e: T) => any, thisArgs?: any, disposables?: Disposable[]) => Disposable {
-
-				return (listener, thisArgs, _disposables) => {
-					this.listeners.push(listener.bind(thisArgs));
-					return {
-						dispose: () => {
-							//
-						}
-					};
-				};
-			}
-			dispose() {
-				this.listeners = [];
-			}
-			async fireAsync(data: IWaitUntilData<T>, token: CancellationToken): Promise<void> {
-				if (!this.listeners.length) {
-					return;
-				}
-
-				const promises: Promise<unknown>[] = [];
-				this.listeners.forEach(cb => {
-					const event = {
-						...data,
-						token,
-						waitUntil: (thenable: Promise<WorkspaceEdit>) => {
-							promises.push(thenable);
-						}
-					} as T;
-					cb(event);
-				});
-
-				await Promise.all(promises);
-			}
+		sinon.stub(NotebookEdit, 'updateCellMetadata').callsFake((index, metadata) => {
+			const edit = (NotebookEdit.updateCellMetadata as any).wrappedMethod.call(NotebookEdit, index, metadata);
+			cellMetadataUpdates.push(edit);
+			return edit;
 		}
+		);
+		sinon.stub(workspace, 'onDidChangeNotebookDocument').callsFake(cb =>
+			onDidChangeNotebookDocument.event(cb)
+		);
+		sinon.stub(workspace, 'onWillSaveNotebookDocument').callsFake(cb =>
+			onWillSaveNotebookDocument.event(cb)
+		);
+		activate(context);
 	});
+	teardown(async () => {
+		await Promise.allSettled(pendingPromises);
+		editsApplied = [];
+		pendingPromises = [];
+		cellMetadataUpdates = [];
+		disposables.forEach(d => d.dispose());
+		disposables = [];
+		sinon.restore();
+	});
+
+	test('Empty cell will not result in any updates', async () => {
+		const e: NotebookDocumentChangeEvent = {
+			notebook,
+			metadata: undefined,
+			contentChanges: [],
+			cellChanges: []
+		};
+
+		onDidChangeNotebookDocument.fire(e);
+
+		assert.strictEqual(editsApplied.length, 0);
+	});
+	test('Adding cell for non Jupyter Notebook will not result in any updates', async () => {
+		sinon.stub(notebook, 'notebookType').get(() => 'some-other-type');
+		const cell: NotebookCell = {
+			document: {} as any,
+			executionSummary: {},
+			index: 0,
+			kind: NotebookCellKind.Code,
+			metadata: {},
+			notebook,
+			outputs: []
+		};
+		const e: NotebookDocumentChangeEvent = {
+			notebook,
+			metadata: undefined,
+			contentChanges: [
+				{
+					range: new NotebookRange(0, 0),
+					removedCells: [],
+					addedCells: [cell]
+				}
+			],
+			cellChanges: []
+		};
+
+		onDidChangeNotebookDocument.fire(e);
+
+		assert.strictEqual(editsApplied.length, 0);
+		assert.strictEqual(cellMetadataUpdates.length, 0);
+	});
+	test('Adding cell will result in an update to the metadata', async () => {
+		const cell: NotebookCell = {
+			document: {} as any,
+			executionSummary: {},
+			index: 0,
+			kind: NotebookCellKind.Code,
+			metadata: {},
+			notebook,
+			outputs: []
+		};
+		const e: NotebookDocumentChangeEvent = {
+			notebook,
+			metadata: undefined,
+			contentChanges: [
+				{
+					range: new NotebookRange(0, 0),
+					removedCells: [],
+					addedCells: [cell]
+				}
+			],
+			cellChanges: []
+		};
+
+		onDidChangeNotebookDocument.fire(e);
+
+		assert.strictEqual(editsApplied.length, 1);
+		assert.strictEqual(cellMetadataUpdates.length, 1);
+		const newMetadata = cellMetadataUpdates[0].newCellMetadata;
+		assert.deepStrictEqual(newMetadata, { metadata: {} });
+	});
+	test('Add cell id if nbformat is 4.5', async () => {
+		sinon.stub(notebook, 'metadata').get(() => ({ nbformat: 4, nbformat_minor: 5 }));
+		const cell: NotebookCell = {
+			document: {} as any,
+			executionSummary: {},
+			index: 0,
+			kind: NotebookCellKind.Code,
+			metadata: {},
+			notebook,
+			outputs: []
+		};
+		const e: NotebookDocumentChangeEvent = {
+			notebook,
+			metadata: undefined,
+			contentChanges: [
+				{
+					range: new NotebookRange(0, 0),
+					removedCells: [],
+					addedCells: [cell]
+				}
+			],
+			cellChanges: []
+		};
+
+		onDidChangeNotebookDocument.fire(e);
+
+		assert.strictEqual(editsApplied.length, 1);
+		assert.strictEqual(cellMetadataUpdates.length, 1);
+		const newMetadata = cellMetadataUpdates[0].newCellMetadata || {};
+		assert.strictEqual(Object.keys(newMetadata).length, 2);
+		assert.deepStrictEqual(newMetadata.metadata, {});
+		assert.ok(newMetadata.id);
+	});
+	test('Do not add cell id if one already exists', async () => {
+		sinon.stub(notebook, 'metadata').get(() => ({ nbformat: 4, nbformat_minor: 5 }));
+		const cell: NotebookCell = {
+			document: {} as any,
+			executionSummary: {},
+			index: 0,
+			kind: NotebookCellKind.Code,
+			metadata: {
+				id: '1234'
+			},
+			notebook,
+			outputs: []
+		};
+		const e: NotebookDocumentChangeEvent = {
+			notebook,
+			metadata: undefined,
+			contentChanges: [
+				{
+					range: new NotebookRange(0, 0),
+					removedCells: [],
+					addedCells: [cell]
+				}
+			],
+			cellChanges: []
+		};
+
+		onDidChangeNotebookDocument.fire(e);
+
+		assert.strictEqual(editsApplied.length, 1);
+		assert.strictEqual(cellMetadataUpdates.length, 1);
+		const newMetadata = cellMetadataUpdates[0].newCellMetadata || {};
+		assert.strictEqual(Object.keys(newMetadata).length, 2);
+		assert.deepStrictEqual(newMetadata.metadata, {});
+		assert.strictEqual(newMetadata.id, '1234');
+	});
+	test('Do not perform any updates if cell id and metadata exists', async () => {
+		sinon.stub(notebook, 'metadata').get(() => ({ nbformat: 4, nbformat_minor: 5 }));
+		const cell: NotebookCell = {
+			document: {} as any,
+			executionSummary: {},
+			index: 0,
+			kind: NotebookCellKind.Code,
+			metadata: {
+				id: '1234',
+				metadata: {}
+			},
+			notebook,
+			outputs: []
+		};
+		const e: NotebookDocumentChangeEvent = {
+			notebook,
+			metadata: undefined,
+			contentChanges: [
+				{
+					range: new NotebookRange(0, 0),
+					removedCells: [],
+					addedCells: [cell]
+				}
+			],
+			cellChanges: []
+		};
+
+		onDidChangeNotebookDocument.fire(e);
+
+		assert.strictEqual(editsApplied.length, 0);
+		assert.strictEqual(cellMetadataUpdates.length, 0);
+	});
+	test('Store language id in custom metadata, whilst preserving existing metadata', async () => {
+		sinon.stub(notebook, 'metadata').get(() => ({
+			nbformat: 4, nbformat_minor: 5,
+			metadata: {
+				language_info: { name: 'python' }
+			}
+		}));
+		const cell: NotebookCell = {
+			document: {
+				languageId: 'javascript'
+			} as any,
+			executionSummary: {},
+			index: 0,
+			kind: NotebookCellKind.Code,
+			metadata: {
+				id: '1234',
+				metadata: {
+					collapsed: true, scrolled: true
+				}
+			},
+			notebook,
+			outputs: []
+		};
+		const e: NotebookDocumentChangeEvent = {
+			notebook,
+			metadata: undefined,
+			contentChanges: [],
+			cellChanges: [
+				{
+					cell,
+					document: {
+						languageId: 'javascript'
+					} as any,
+					metadata: undefined,
+					outputs: undefined,
+					executionSummary: undefined
+				}
+			]
+		};
+
+		onDidChangeNotebookDocument.fire(e);
+
+		assert.strictEqual(editsApplied.length, 1);
+		assert.strictEqual(cellMetadataUpdates.length, 1);
+		const newMetadata = cellMetadataUpdates[0].newCellMetadata || {};
+		assert.strictEqual(Object.keys(newMetadata).length, 2);
+		assert.deepStrictEqual(newMetadata.metadata, { collapsed: true, scrolled: true, vscode: { languageId: 'javascript' } });
+		assert.strictEqual(newMetadata.id, '1234');
+	});
+	test('No changes when language is javascript', async () => {
+		sinon.stub(notebook, 'metadata').get(() => ({
+			nbformat: 4, nbformat_minor: 5,
+			metadata: {
+				language_info: { name: 'javascript' }
+			}
+		}));
+		const cell: NotebookCell = {
+			document: {
+				languageId: 'javascript'
+			} as any,
+			executionSummary: {},
+			index: 0,
+			kind: NotebookCellKind.Code,
+			metadata: {
+				id: '1234',
+				metadata: {
+					collapsed: true, scrolled: true
+				}
+			},
+			notebook,
+			outputs: []
+		};
+		const e: NotebookDocumentChangeEvent = {
+			notebook,
+			metadata: undefined,
+			contentChanges: [],
+			cellChanges: [
+				{
+					cell,
+					document: undefined,
+					metadata: undefined,
+					outputs: undefined,
+					executionSummary: undefined
+				}
+			]
+		};
+
+		onDidChangeNotebookDocument.fire(e);
+
+		assert.strictEqual(editsApplied.length, 0);
+		assert.strictEqual(cellMetadataUpdates.length, 0);
+	});
+	test('Remove language from metadata when cell language matches kernel language', async () => {
+		sinon.stub(notebook, 'metadata').get(() => ({
+			nbformat: 4, nbformat_minor: 5,
+			metadata: {
+				language_info: { name: 'javascript' }
+			}
+		}));
+		const cell: NotebookCell = {
+			document: {
+				languageId: 'javascript'
+			} as any,
+			executionSummary: {},
+			index: 0,
+			kind: NotebookCellKind.Code,
+			metadata: {
+				id: '1234',
+				metadata: {
+					vscode: { languageId: 'python' },
+					collapsed: true, scrolled: true
+				}
+			},
+			notebook,
+			outputs: []
+		};
+		const e: NotebookDocumentChangeEvent = {
+			notebook,
+			metadata: undefined,
+			contentChanges: [],
+			cellChanges: [
+				{
+					cell,
+					document: {
+						languageId: 'javascript'
+					} as any,
+					metadata: undefined,
+					outputs: undefined,
+					executionSummary: undefined
+				}
+			]
+		};
+
+		onDidChangeNotebookDocument.fire(e);
+
+		assert.strictEqual(editsApplied.length, 1);
+		assert.strictEqual(cellMetadataUpdates.length, 1);
+		const newMetadata = cellMetadataUpdates[0].newCellMetadata || {};
+		assert.strictEqual(Object.keys(newMetadata).length, 2);
+		assert.deepStrictEqual(newMetadata.metadata, { collapsed: true, scrolled: true });
+		assert.strictEqual(newMetadata.id, '1234');
+	});
+	test('Update language in metadata', async () => {
+		sinon.stub(notebook, 'metadata').get(() => ({
+			nbformat: 4, nbformat_minor: 5,
+			metadata: {
+				language_info: { name: 'javascript' }
+			}
+		}));
+		const cell: NotebookCell = {
+			document: {
+				languageId: 'powershell'
+			} as any,
+			executionSummary: {},
+			index: 0,
+			kind: NotebookCellKind.Code,
+			metadata: {
+				id: '1234',
+				metadata: {
+					vscode: { languageId: 'python' },
+					collapsed: true, scrolled: true
+				}
+			},
+			notebook,
+			outputs: []
+		};
+		const e: NotebookDocumentChangeEvent = {
+			notebook,
+			metadata: undefined,
+			contentChanges: [],
+			cellChanges: [
+				{
+					cell,
+					document: {
+						languageId: 'powershell'
+					} as any,
+					metadata: undefined,
+					outputs: undefined,
+					executionSummary: undefined
+				}
+			]
+		};
+
+		onDidChangeNotebookDocument.fire(e);
+
+		assert.strictEqual(editsApplied.length, 1);
+		assert.strictEqual(cellMetadataUpdates.length, 1);
+		const newMetadata = cellMetadataUpdates[0].newCellMetadata || {};
+		assert.strictEqual(Object.keys(newMetadata).length, 2);
+		assert.deepStrictEqual(newMetadata.metadata, { collapsed: true, scrolled: true, vscode: { languageId: 'powershell' } });
+		assert.strictEqual(newMetadata.id, '1234');
+	});
+
+	test('Will save event without any changes', async () => {
+		await onWillSaveNotebookDocument.fireAsync({ notebook, reason: TextDocumentSaveReason.Manual }, token.token);
+	});
+	test('Wait for pending updates to complete when saving', async () => {
+		let resolveApplyEditPromise: (value: boolean) => void;
+		const promise = new Promise<boolean>((resolve) => resolveApplyEditPromise = resolve);
+		applyEditStub.restore();
+		sinon.stub(workspace, 'applyEdit').callsFake((edit: WorkspaceEdit) => {
+			editsApplied.push(edit);
+			return promise;
+		});
+
+		const cell: NotebookCell = {
+			document: {} as any,
+			executionSummary: {},
+			index: 0,
+			kind: NotebookCellKind.Code,
+			metadata: {},
+			notebook,
+			outputs: []
+		};
+		const e: NotebookDocumentChangeEvent = {
+			notebook,
+			metadata: undefined,
+			contentChanges: [
+				{
+					range: new NotebookRange(0, 0),
+					removedCells: [],
+					addedCells: [cell]
+				}
+			],
+			cellChanges: []
+		};
+
+		onDidChangeNotebookDocument.fire(e);
+
+		assert.strictEqual(editsApplied.length, 1);
+		assert.strictEqual(cellMetadataUpdates.length, 1);
+
+		// Try to save.
+		let saveCompleted = false;
+		const saved = onWillSaveNotebookDocument.fireAsync({
+			notebook,
+			reason: TextDocumentSaveReason.Manual
+		}, token.token);
+		saved.finally(() => saveCompleted = true);
+		await new Promise((resolve) => setTimeout(resolve, 10));
+
+		// Verify we have not yet completed saving.
+		assert.strictEqual(saveCompleted, false);
+
+		resolveApplyEditPromise!(true);
+		await new Promise((resolve) => setTimeout(resolve, 1));
+
+		// Should have completed saving.
+		saved.finally(() => saveCompleted = true);
+	});
+
+	interface IWaitUntil {
+		token: CancellationToken;
+		waitUntil(thenable: Promise<unknown>): void;
+	}
+
+	interface IWaitUntil {
+		token: CancellationToken;
+		waitUntil(thenable: Promise<unknown>): void;
+	}
+	type IWaitUntilData<T> = Omit<Omit<T, 'waitUntil'>, 'token'>;
+
+	class AsyncEmitter<T extends IWaitUntil> {
+		private listeners: ((d: T) => void)[] = [];
+		get event(): (listener: (e: T) => any, thisArgs?: any, disposables?: Disposable[]) => Disposable {
+
+			return (listener, thisArgs, _disposables) => {
+				this.listeners.push(listener.bind(thisArgs));
+				return {
+					dispose: () => {
+						//
+					}
+				};
+			};
+		}
+		dispose() {
+			this.listeners = [];
+		}
+		async fireAsync(data: IWaitUntilData<T>, token: CancellationToken): Promise<void> {
+			if (!this.listeners.length) {
+				return;
+			}
+
+			const promises: Promise<unknown>[] = [];
+			this.listeners.forEach(cb => {
+				const event = {
+					...data,
+					token,
+					waitUntil: (thenable: Promise<WorkspaceEdit>) => {
+						promises.push(thenable);
+					}
+				} as T;
+				cb(event);
+			});
+
+			await Promise.all(promises);
+		}
+	}
 });
diff --git a/extensions/ipynb/src/test/serializers.test.ts b/extensions/ipynb/src/test/serializers.test.ts
index cc7f53fe442..cb461539c5d 100644
--- a/extensions/ipynb/src/test/serializers.test.ts
+++ b/extensions/ipynb/src/test/serializers.test.ts
@@ -19,267 +19,215 @@ function deepStripProperties(obj: any, props: string[]) {
 		}
 	}
 }
-[true, false].forEach(useCustomPropertyInMetadata => {
-	suite(`ipynb serializer (${useCustomPropertyInMetadata ? 'with custom metadata (standard behaviour)' : 'without custom metadata'})`, () => {
-		let disposables: vscode.Disposable[] = [];
-		setup(() => {
-			disposables = [];
-			sinon.stub(vscode.workspace, 'getConfiguration').callsFake((section, scope) => {
-				if (section === 'jupyter') {
-					return {
-						get: () => {
-							return !useCustomPropertyInMetadata;
-						}
-					};
-				} else {
-					return (vscode.workspace.getConfiguration as any).wrappedMethod.call(vscode.workspace, section, scope);
+suite(`ipynb serializer`, () => {
+	let disposables: vscode.Disposable[] = [];
+	setup(() => {
+		disposables = [];
+	});
+	teardown(async () => {
+		disposables.forEach(d => d.dispose());
+		disposables = [];
+		sinon.restore();
+	});
+
+	const base64EncodedImage =
+		'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mOUlZL6DwAB/wFSU1jVmgAAAABJRU5ErkJggg==';
+	test('Deserialize', async () => {
+		const cells: nbformat.ICell[] = [
+			{
+				cell_type: 'code',
+				execution_count: 10,
+				outputs: [],
+				source: 'print(1)',
+				metadata: {}
+			},
+			{
+				cell_type: 'markdown',
+				source: '# HEAD',
+				metadata: {}
+			}
+		];
+		const notebook = jupyterNotebookModelToNotebookData({ cells }, 'python');
+		assert.ok(notebook);
+
+		const expectedCodeCell = new vscode.NotebookCellData(vscode.NotebookCellKind.Code, 'print(1)', 'python');
+		expectedCodeCell.outputs = [];
+		expectedCodeCell.metadata = { execution_count: 10, metadata: {} };
+		expectedCodeCell.executionSummary = { executionOrder: 10 };
+
+		const expectedMarkdownCell = new vscode.NotebookCellData(vscode.NotebookCellKind.Markup, '# HEAD', 'markdown');
+		expectedMarkdownCell.outputs = [];
+		expectedMarkdownCell.metadata = {
+			metadata: {}
+		};
+
+		assert.deepStrictEqual(notebook.cells, [expectedCodeCell, expectedMarkdownCell]);
+	});
+
+
+	test('Serialize', async () => {
+		const markdownCell = new vscode.NotebookCellData(vscode.NotebookCellKind.Markup, '# header1', 'markdown');
+		markdownCell.metadata = {
+			attachments: {
+				'image.png': {
+					'image/png': 'abc'
 				}
-			});
-		});
-		teardown(async () => {
-			disposables.forEach(d => d.dispose());
-			disposables = [];
-			sinon.restore();
+			},
+			id: '123',
+			metadata: {
+				foo: 'bar'
+			}
+		};
+
+		const cellMetadata = getCellMetadata({ cell: markdownCell });
+		assert.deepStrictEqual(cellMetadata, {
+			id: '123',
+			metadata: {
+				foo: 'bar',
+			},
+			attachments: {
+				'image.png': {
+					'image/png': 'abc'
+				}
+			}
 		});
 
-		const base64EncodedImage =
-			'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mOUlZL6DwAB/wFSU1jVmgAAAABJRU5ErkJggg==';
-		test('Deserialize', async () => {
+		const markdownCell2 = new vscode.NotebookCellData(vscode.NotebookCellKind.Markup, '# header1', 'markdown');
+		markdownCell2.metadata = {
+			id: '123',
+			metadata: {
+				foo: 'bar'
+			},
+			attachments: {
+				'image.png': {
+					'image/png': 'abc'
+				}
+			}
+		};
+
+		const nbMarkdownCell = createMarkdownCellFromNotebookCell(markdownCell);
+		const nbMarkdownCell2 = createMarkdownCellFromNotebookCell(markdownCell2);
+		assert.deepStrictEqual(nbMarkdownCell, nbMarkdownCell2);
+
+		assert.deepStrictEqual(nbMarkdownCell, {
+			cell_type: 'markdown',
+			source: ['# header1'],
+			metadata: {
+				foo: 'bar',
+			},
+			attachments: {
+				'image.png': {
+					'image/png': 'abc'
+				}
+			},
+			id: '123'
+		});
+	});
+
+	suite('Outputs', () => {
+		function validateCellOutputTranslation(
+			outputs: nbformat.IOutput[],
+			expectedOutputs: vscode.NotebookCellOutput[],
+			propertiesToExcludeFromComparison: string[] = []
+		) {
 			const cells: nbformat.ICell[] = [
 				{
 					cell_type: 'code',
 					execution_count: 10,
-					outputs: [],
+					outputs,
 					source: 'print(1)',
 					metadata: {}
-				},
-				{
-					cell_type: 'markdown',
-					source: '# HEAD',
-					metadata: {}
 				}
 			];
 			const notebook = jupyterNotebookModelToNotebookData({ cells }, 'python');
-			assert.ok(notebook);
 
-			const expectedCodeCell = new vscode.NotebookCellData(vscode.NotebookCellKind.Code, 'print(1)', 'python');
-			expectedCodeCell.outputs = [];
-			expectedCodeCell.metadata = useCustomPropertyInMetadata ? { custom: { execution_count: 10, metadata: {} } } : { execution_count: 10, metadata: {} };
-			expectedCodeCell.executionSummary = { executionOrder: 10 };
+			// OutputItems contain an `id` property generated by VSC.
+			// Exclude that property when comparing.
+			const propertiesToExclude = propertiesToExcludeFromComparison.concat(['id']);
+			const actualOuts = notebook.cells[0].outputs;
+			deepStripProperties(actualOuts, propertiesToExclude);
+			deepStripProperties(expectedOutputs, propertiesToExclude);
+			assert.deepStrictEqual(actualOuts, expectedOutputs);
+		}
 
-			const expectedMarkdownCell = new vscode.NotebookCellData(vscode.NotebookCellKind.Markup, '# HEAD', 'markdown');
-			expectedMarkdownCell.outputs = [];
-			expectedMarkdownCell.metadata = useCustomPropertyInMetadata ? {
-				custom: { metadata: {} }
-			} : {
-				metadata: {}
-			};
-
-			assert.deepStrictEqual(notebook.cells, [expectedCodeCell, expectedMarkdownCell]);
+		test('Empty output', () => {
+			validateCellOutputTranslation([], []);
 		});
 
-
-		test('Serialize', async () => {
-			const markdownCell = new vscode.NotebookCellData(vscode.NotebookCellKind.Markup, '# header1', 'markdown');
-			markdownCell.metadata = useCustomPropertyInMetadata ? {
-				attachments: {
-					'image.png': {
-						'image/png': 'abc'
-					}
-				},
-				custom: {
-					id: '123',
-					metadata: {
-						foo: 'bar'
-					}
-				}
-			} : {
-				attachments: {
-					'image.png': {
-						'image/png': 'abc'
-					}
-				},
-				id: '123',
-				metadata: {
-					foo: 'bar'
-				}
-			};
-
-			const cellMetadata = getCellMetadata({ cell: markdownCell });
-			assert.deepStrictEqual(cellMetadata, {
-				id: '123',
-				metadata: {
-					foo: 'bar',
-				},
-				attachments: {
-					'image.png': {
-						'image/png': 'abc'
-					}
-				}
-			});
-
-			const markdownCell2 = new vscode.NotebookCellData(vscode.NotebookCellKind.Markup, '# header1', 'markdown');
-			markdownCell2.metadata = useCustomPropertyInMetadata ? {
-				custom: {
-					id: '123',
-					metadata: {
-						foo: 'bar'
-					},
-					attachments: {
-						'image.png': {
-							'image/png': 'abc'
-						}
-					}
-				}
-			} : {
-				id: '123',
-				metadata: {
-					foo: 'bar'
-				},
-				attachments: {
-					'image.png': {
-						'image/png': 'abc'
-					}
-				}
-			};
-
-			const nbMarkdownCell = createMarkdownCellFromNotebookCell(markdownCell);
-			const nbMarkdownCell2 = createMarkdownCellFromNotebookCell(markdownCell2);
-			assert.deepStrictEqual(nbMarkdownCell, nbMarkdownCell2);
-
-			assert.deepStrictEqual(nbMarkdownCell, {
-				cell_type: 'markdown',
-				source: ['# header1'],
-				metadata: {
-					foo: 'bar',
-				},
-				attachments: {
-					'image.png': {
-						'image/png': 'abc'
-					}
-				},
-				id: '123'
-			});
-		});
-
-		suite('Outputs', () => {
-			function validateCellOutputTranslation(
-				outputs: nbformat.IOutput[],
-				expectedOutputs: vscode.NotebookCellOutput[],
-				propertiesToExcludeFromComparison: string[] = []
-			) {
-				const cells: nbformat.ICell[] = [
+		test('Stream output', () => {
+			validateCellOutputTranslation(
+				[
 					{
-						cell_type: 'code',
-						execution_count: 10,
-						outputs,
-						source: 'print(1)',
-						metadata: {}
+						output_type: 'stream',
+						name: 'stderr',
+						text: 'Error'
+					},
+					{
+						output_type: 'stream',
+						name: 'stdout',
+						text: 'NoError'
 					}
-				];
-				const notebook = jupyterNotebookModelToNotebookData({ cells }, 'python');
-
-				// OutputItems contain an `id` property generated by VSC.
-				// Exclude that property when comparing.
-				const propertiesToExclude = propertiesToExcludeFromComparison.concat(['id']);
-				const actualOuts = notebook.cells[0].outputs;
-				deepStripProperties(actualOuts, propertiesToExclude);
-				deepStripProperties(expectedOutputs, propertiesToExclude);
-				assert.deepStrictEqual(actualOuts, expectedOutputs);
-			}
-
-			test('Empty output', () => {
-				validateCellOutputTranslation([], []);
-			});
-
-			test('Stream output', () => {
-				validateCellOutputTranslation(
-					[
-						{
-							output_type: 'stream',
-							name: 'stderr',
-							text: 'Error'
-						},
-						{
-							output_type: 'stream',
-							name: 'stdout',
-							text: 'NoError'
-						}
-					],
-					[
-						new vscode.NotebookCellOutput([vscode.NotebookCellOutputItem.stderr('Error')], {
-							outputType: 'stream'
-						}),
-						new vscode.NotebookCellOutput([vscode.NotebookCellOutputItem.stdout('NoError')], {
-							outputType: 'stream'
-						})
-					]
-				);
-			});
-			test('Stream output and line endings', () => {
-				validateCellOutputTranslation(
-					[
-						{
-							output_type: 'stream',
-							name: 'stdout',
-							text: [
-								'Line1\n',
-								'\n',
-								'Line3\n',
-								'Line4'
-							]
-						}
-					],
-					[
-						new vscode.NotebookCellOutput([vscode.NotebookCellOutputItem.stdout('Line1\n\nLine3\nLine4')], {
-							outputType: 'stream'
-						})
-					]
-				);
-				validateCellOutputTranslation(
-					[
-						{
-							output_type: 'stream',
-							name: 'stdout',
-							text: [
-								'Hello\n',
-								'Hello\n',
-								'Hello\n',
-								'Hello\n',
-								'Hello\n',
-								'Hello\n'
-							]
-						}
-					],
-					[
-						new vscode.NotebookCellOutput([vscode.NotebookCellOutputItem.stdout('Hello\nHello\nHello\nHello\nHello\nHello\n')], {
-							outputType: 'stream'
-						})
-					]
-				);
-			});
-			test('Multi-line Stream output', () => {
-				validateCellOutputTranslation(
-					[
-						{
-							name: 'stdout',
-							output_type: 'stream',
-							text: [
-								'Epoch 1/5\n',
-								'...\n',
-								'Epoch 2/5\n',
-								'...\n',
-								'Epoch 3/5\n',
-								'...\n',
-								'Epoch 4/5\n',
-								'...\n',
-								'Epoch 5/5\n',
-								'...\n'
-							]
-						}
-					],
-					[
-						new vscode.NotebookCellOutput([vscode.NotebookCellOutputItem.stdout(['Epoch 1/5\n',
+				],
+				[
+					new vscode.NotebookCellOutput([vscode.NotebookCellOutputItem.stderr('Error')], {
+						outputType: 'stream'
+					}),
+					new vscode.NotebookCellOutput([vscode.NotebookCellOutputItem.stdout('NoError')], {
+						outputType: 'stream'
+					})
+				]
+			);
+		});
+		test('Stream output and line endings', () => {
+			validateCellOutputTranslation(
+				[
+					{
+						output_type: 'stream',
+						name: 'stdout',
+						text: [
+							'Line1\n',
+							'\n',
+							'Line3\n',
+							'Line4'
+						]
+					}
+				],
+				[
+					new vscode.NotebookCellOutput([vscode.NotebookCellOutputItem.stdout('Line1\n\nLine3\nLine4')], {
+						outputType: 'stream'
+					})
+				]
+			);
+			validateCellOutputTranslation(
+				[
+					{
+						output_type: 'stream',
+						name: 'stdout',
+						text: [
+							'Hello\n',
+							'Hello\n',
+							'Hello\n',
+							'Hello\n',
+							'Hello\n',
+							'Hello\n'
+						]
+					}
+				],
+				[
+					new vscode.NotebookCellOutput([vscode.NotebookCellOutputItem.stdout('Hello\nHello\nHello\nHello\nHello\nHello\n')], {
+						outputType: 'stream'
+					})
+				]
+			);
+		});
+		test('Multi-line Stream output', () => {
+			validateCellOutputTranslation(
+				[
+					{
+						name: 'stdout',
+						output_type: 'stream',
+						text: [
+							'Epoch 1/5\n',
 							'...\n',
 							'Epoch 2/5\n',
 							'...\n',
@@ -288,35 +236,35 @@ function deepStripProperties(obj: any, props: string[]) {
 							'Epoch 4/5\n',
 							'...\n',
 							'Epoch 5/5\n',
-							'...\n'].join(''))], {
-							outputType: 'stream'
-						})
-					]
-				);
-			});
+							'...\n'
+						]
+					}
+				],
+				[
+					new vscode.NotebookCellOutput([vscode.NotebookCellOutputItem.stdout(['Epoch 1/5\n',
+						'...\n',
+						'Epoch 2/5\n',
+						'...\n',
+						'Epoch 3/5\n',
+						'...\n',
+						'Epoch 4/5\n',
+						'...\n',
+						'Epoch 5/5\n',
+						'...\n'].join(''))], {
+						outputType: 'stream'
+					})
+				]
+			);
+		});
 
-			test('Multi-line Stream output (last empty line should not be saved in ipynb)', () => {
-				validateCellOutputTranslation(
-					[
-						{
-							name: 'stderr',
-							output_type: 'stream',
-							text: [
-								'Epoch 1/5\n',
-								'...\n',
-								'Epoch 2/5\n',
-								'...\n',
-								'Epoch 3/5\n',
-								'...\n',
-								'Epoch 4/5\n',
-								'...\n',
-								'Epoch 5/5\n',
-								'...\n'
-							]
-						}
-					],
-					[
-						new vscode.NotebookCellOutput([vscode.NotebookCellOutputItem.stderr(['Epoch 1/5\n',
+		test('Multi-line Stream output (last empty line should not be saved in ipynb)', () => {
+			validateCellOutputTranslation(
+				[
+					{
+						name: 'stderr',
+						output_type: 'stream',
+						text: [
+							'Epoch 1/5\n',
 							'...\n',
 							'Epoch 2/5\n',
 							'...\n',
@@ -325,424 +273,437 @@ function deepStripProperties(obj: any, props: string[]) {
 							'Epoch 4/5\n',
 							'...\n',
 							'Epoch 5/5\n',
-							'...\n',
-							// This last empty line should not be saved in ipynb.
-							'\n'].join(''))], {
+							'...\n'
+						]
+					}
+				],
+				[
+					new vscode.NotebookCellOutput([vscode.NotebookCellOutputItem.stderr(['Epoch 1/5\n',
+						'...\n',
+						'Epoch 2/5\n',
+						'...\n',
+						'Epoch 3/5\n',
+						'...\n',
+						'Epoch 4/5\n',
+						'...\n',
+						'Epoch 5/5\n',
+						'...\n',
+						// This last empty line should not be saved in ipynb.
+						'\n'].join(''))], {
+						outputType: 'stream'
+					})
+				]
+			);
+		});
+
+		test('Streamed text with Ansi characters', async () => {
+			validateCellOutputTranslation(
+				[
+					{
+						name: 'stderr',
+						text: '\u001b[K\u001b[33m✅ \u001b[0m Loading\n',
+						output_type: 'stream'
+					}
+				],
+				[
+					new vscode.NotebookCellOutput(
+						[vscode.NotebookCellOutputItem.stderr('\u001b[K\u001b[33m✅ \u001b[0m Loading\n')],
+						{
 							outputType: 'stream'
-						})
-					]
-				);
-			});
-
-			test('Streamed text with Ansi characters', async () => {
-				validateCellOutputTranslation(
-					[
-						{
-							name: 'stderr',
-							text: '\u001b[K\u001b[33m✅ \u001b[0m Loading\n',
-							output_type: 'stream'
 						}
-					],
-					[
-						new vscode.NotebookCellOutput(
-							[vscode.NotebookCellOutputItem.stderr('\u001b[K\u001b[33m✅ \u001b[0m Loading\n')],
-							{
-								outputType: 'stream'
-							}
-						)
-					]
-				);
-			});
+					)
+				]
+			);
+		});
 
-			test('Streamed text with angle bracket characters', async () => {
-				validateCellOutputTranslation(
-					[
+		test('Streamed text with angle bracket characters', async () => {
+			validateCellOutputTranslation(
+				[
+					{
+						name: 'stderr',
+						text: '1 is < 2',
+						output_type: 'stream'
+					}
+				],
+				[
+					new vscode.NotebookCellOutput([vscode.NotebookCellOutputItem.stderr('1 is < 2')], {
+						outputType: 'stream'
+					})
+				]
+			);
+		});
+
+		test('Streamed text with angle bracket characters and ansi chars', async () => {
+			validateCellOutputTranslation(
+				[
+					{
+						name: 'stderr',
+						text: '1 is < 2\u001b[K\u001b[33m✅ \u001b[0m Loading\n',
+						output_type: 'stream'
+					}
+				],
+				[
+					new vscode.NotebookCellOutput(
+						[vscode.NotebookCellOutputItem.stderr('1 is < 2\u001b[K\u001b[33m✅ \u001b[0m Loading\n')],
 						{
-							name: 'stderr',
-							text: '1 is < 2',
-							output_type: 'stream'
-						}
-					],
-					[
-						new vscode.NotebookCellOutput([vscode.NotebookCellOutputItem.stderr('1 is < 2')], {
 							outputType: 'stream'
-						})
-					]
-				);
-			});
+						}
+					)
+				]
+			);
+		});
 
-			test('Streamed text with angle bracket characters and ansi chars', async () => {
-				validateCellOutputTranslation(
-					[
+		test('Error', async () => {
+			validateCellOutputTranslation(
+				[
+					{
+						ename: 'Error Name',
+						evalue: 'Error Value',
+						traceback: ['stack1', 'stack2', 'stack3'],
+						output_type: 'error'
+					}
+				],
+				[
+					new vscode.NotebookCellOutput(
+						[
+							vscode.NotebookCellOutputItem.error({
+								name: 'Error Name',
+								message: 'Error Value',
+								stack: ['stack1', 'stack2', 'stack3'].join('\n')
+							})
+						],
 						{
-							name: 'stderr',
-							text: '1 is < 2\u001b[K\u001b[33m✅ \u001b[0m Loading\n',
-							output_type: 'stream'
-						}
-					],
-					[
-						new vscode.NotebookCellOutput(
-							[vscode.NotebookCellOutputItem.stderr('1 is < 2\u001b[K\u001b[33m✅ \u001b[0m Loading\n')],
-							{
-								outputType: 'stream'
+							outputType: 'error',
+							originalError: {
+								ename: 'Error Name',
+								evalue: 'Error Value',
+								traceback: ['stack1', 'stack2', 'stack3'],
+								output_type: 'error'
 							}
-						)
-					]
-				);
-			});
-
-			test('Error', async () => {
-				validateCellOutputTranslation(
-					[
-						{
-							ename: 'Error Name',
-							evalue: 'Error Value',
-							traceback: ['stack1', 'stack2', 'stack3'],
-							output_type: 'error'
 						}
-					],
-					[
-						new vscode.NotebookCellOutput(
-							[
-								vscode.NotebookCellOutputItem.error({
-									name: 'Error Name',
-									message: 'Error Value',
-									stack: ['stack1', 'stack2', 'stack3'].join('\n')
-								})
-							],
+					)
+				]
+			);
+		});
+
+		['display_data', 'execute_result'].forEach(output_type => {
+			suite(`Rich output for output_type = ${output_type}`, () => {
+				// Properties to exclude when comparing.
+				let propertiesToExcludeFromComparison: string[] = [];
+				setup(() => {
+					if (output_type === 'display_data') {
+						// With display_data the execution_count property will never exist in the output.
+						// We can ignore that (as it will never exist).
+						// But we leave it in the case of `output_type === 'execute_result'`
+						propertiesToExcludeFromComparison = ['execution_count', 'executionCount'];
+					}
+				});
+
+				test('Text mimeType output', async () => {
+					validateCellOutputTranslation(
+						[
 							{
-								outputType: 'error',
-								originalError: {
-									ename: 'Error Name',
-									evalue: 'Error Value',
-									traceback: ['stack1', 'stack2', 'stack3'],
-									output_type: 'error'
-								}
+								data: {
+									'text/plain': 'Hello World!'
+								},
+								output_type,
+								metadata: {},
+								execution_count: 1
 							}
-						)
-					]
-				);
-			});
-
-			['display_data', 'execute_result'].forEach(output_type => {
-				suite(`Rich output for output_type = ${output_type}`, () => {
-					// Properties to exclude when comparing.
-					let propertiesToExcludeFromComparison: string[] = [];
-					setup(() => {
-						if (output_type === 'display_data') {
-							// With display_data the execution_count property will never exist in the output.
-							// We can ignore that (as it will never exist).
-							// But we leave it in the case of `output_type === 'execute_result'`
-							propertiesToExcludeFromComparison = ['execution_count', 'executionCount'];
-						}
-					});
-
-					test('Text mimeType output', async () => {
-						validateCellOutputTranslation(
-							[
+						],
+						[
+							new vscode.NotebookCellOutput(
+								[new vscode.NotebookCellOutputItem(Buffer.from('Hello World!', 'utf8'), 'text/plain')],
 								{
-									data: {
-										'text/plain': 'Hello World!'
-									},
-									output_type,
-									metadata: {},
-									execution_count: 1
+									outputType: output_type,
+									metadata: {}, // display_data & execute_result always have metadata.
+									executionCount: 1
 								}
-							],
-							[
-								new vscode.NotebookCellOutput(
-									[new vscode.NotebookCellOutputItem(Buffer.from('Hello World!', 'utf8'), 'text/plain')],
-									{
-										outputType: output_type,
-										metadata: {}, // display_data & execute_result always have metadata.
-										executionCount: 1
-									}
-								)
-							],
-							propertiesToExcludeFromComparison
-						);
-					});
+							)
+						],
+						propertiesToExcludeFromComparison
+					);
+				});
 
-					test('png,jpeg images', async () => {
-						validateCellOutputTranslation(
-							[
+				test('png,jpeg images', async () => {
+					validateCellOutputTranslation(
+						[
+							{
+								execution_count: 1,
+								data: {
+									'image/png': base64EncodedImage,
+									'image/jpeg': base64EncodedImage
+								},
+								metadata: {},
+								output_type
+							}
+						],
+						[
+							new vscode.NotebookCellOutput(
+								[
+									new vscode.NotebookCellOutputItem(Buffer.from(base64EncodedImage, 'base64'), 'image/png'),
+									new vscode.NotebookCellOutputItem(Buffer.from(base64EncodedImage, 'base64'), 'image/jpeg')
+								],
 								{
-									execution_count: 1,
-									data: {
-										'image/png': base64EncodedImage,
-										'image/jpeg': base64EncodedImage
-									},
-									metadata: {},
-									output_type
+									executionCount: 1,
+									outputType: output_type,
+									metadata: {} // display_data & execute_result always have metadata.
 								}
-							],
-							[
-								new vscode.NotebookCellOutput(
-									[
-										new vscode.NotebookCellOutputItem(Buffer.from(base64EncodedImage, 'base64'), 'image/png'),
-										new vscode.NotebookCellOutputItem(Buffer.from(base64EncodedImage, 'base64'), 'image/jpeg')
-									],
-									{
-										executionCount: 1,
-										outputType: output_type,
-										metadata: {} // display_data & execute_result always have metadata.
-									}
-								)
-							],
-							propertiesToExcludeFromComparison
-						);
-					});
+							)
+						],
+						propertiesToExcludeFromComparison
+					);
+				});
 
-					test('png image with a light background', async () => {
-						validateCellOutputTranslation(
-							[
+				test('png image with a light background', async () => {
+					validateCellOutputTranslation(
+						[
+							{
+								execution_count: 1,
+								data: {
+									'image/png': base64EncodedImage
+								},
+								metadata: {
+									needs_background: 'light'
+								},
+								output_type
+							}
+						],
+						[
+							new vscode.NotebookCellOutput(
+								[new vscode.NotebookCellOutputItem(Buffer.from(base64EncodedImage, 'base64'), 'image/png')],
 								{
-									execution_count: 1,
-									data: {
-										'image/png': base64EncodedImage
-									},
+									executionCount: 1,
 									metadata: {
 										needs_background: 'light'
 									},
-									output_type
+									outputType: output_type
 								}
-							],
-							[
-								new vscode.NotebookCellOutput(
-									[new vscode.NotebookCellOutputItem(Buffer.from(base64EncodedImage, 'base64'), 'image/png')],
-									{
-										executionCount: 1,
-										metadata: {
-											needs_background: 'light'
-										},
-										outputType: output_type
-									}
-								)
-							],
-							propertiesToExcludeFromComparison
-						);
-					});
+							)
+						],
+						propertiesToExcludeFromComparison
+					);
+				});
 
-					test('png image with a dark background', async () => {
-						validateCellOutputTranslation(
-							[
+				test('png image with a dark background', async () => {
+					validateCellOutputTranslation(
+						[
+							{
+								execution_count: 1,
+								data: {
+									'image/png': base64EncodedImage
+								},
+								metadata: {
+									needs_background: 'dark'
+								},
+								output_type
+							}
+						],
+						[
+							new vscode.NotebookCellOutput(
+								[new vscode.NotebookCellOutputItem(Buffer.from(base64EncodedImage, 'base64'), 'image/png')],
 								{
-									execution_count: 1,
-									data: {
-										'image/png': base64EncodedImage
-									},
+									executionCount: 1,
 									metadata: {
 										needs_background: 'dark'
 									},
-									output_type
+									outputType: output_type
 								}
-							],
-							[
-								new vscode.NotebookCellOutput(
-									[new vscode.NotebookCellOutputItem(Buffer.from(base64EncodedImage, 'base64'), 'image/png')],
-									{
-										executionCount: 1,
-										metadata: {
-											needs_background: 'dark'
-										},
-										outputType: output_type
-									}
-								)
-							],
-							propertiesToExcludeFromComparison
-						);
-					});
+							)
+						],
+						propertiesToExcludeFromComparison
+					);
+				});
 
-					test('png image with custom dimensions', async () => {
-						validateCellOutputTranslation(
-							[
+				test('png image with custom dimensions', async () => {
+					validateCellOutputTranslation(
+						[
+							{
+								execution_count: 1,
+								data: {
+									'image/png': base64EncodedImage
+								},
+								metadata: {
+									'image/png': { height: '111px', width: '999px' }
+								},
+								output_type
+							}
+						],
+						[
+							new vscode.NotebookCellOutput(
+								[new vscode.NotebookCellOutputItem(Buffer.from(base64EncodedImage, 'base64'), 'image/png')],
 								{
-									execution_count: 1,
-									data: {
-										'image/png': base64EncodedImage
-									},
+									executionCount: 1,
 									metadata: {
 										'image/png': { height: '111px', width: '999px' }
 									},
-									output_type
+									outputType: output_type
 								}
-							],
-							[
-								new vscode.NotebookCellOutput(
-									[new vscode.NotebookCellOutputItem(Buffer.from(base64EncodedImage, 'base64'), 'image/png')],
-									{
-										executionCount: 1,
-										metadata: {
-											'image/png': { height: '111px', width: '999px' }
-										},
-										outputType: output_type
-									}
-								)
-							],
-							propertiesToExcludeFromComparison
-						);
-					});
+							)
+						],
+						propertiesToExcludeFromComparison
+					);
+				});
 
-					test('png allowed to scroll', async () => {
-						validateCellOutputTranslation(
-							[
+				test('png allowed to scroll', async () => {
+					validateCellOutputTranslation(
+						[
+							{
+								execution_count: 1,
+								data: {
+									'image/png': base64EncodedImage
+								},
+								metadata: {
+									unconfined: true,
+									'image/png': { width: '999px' }
+								},
+								output_type
+							}
+						],
+						[
+							new vscode.NotebookCellOutput(
+								[new vscode.NotebookCellOutputItem(Buffer.from(base64EncodedImage, 'base64'), 'image/png')],
 								{
-									execution_count: 1,
-									data: {
-										'image/png': base64EncodedImage
-									},
+									executionCount: 1,
 									metadata: {
 										unconfined: true,
 										'image/png': { width: '999px' }
 									},
-									output_type
+									outputType: output_type
 								}
-							],
-							[
-								new vscode.NotebookCellOutput(
-									[new vscode.NotebookCellOutputItem(Buffer.from(base64EncodedImage, 'base64'), 'image/png')],
-									{
-										executionCount: 1,
-										metadata: {
-											unconfined: true,
-											'image/png': { width: '999px' }
-										},
-										outputType: output_type
-									}
-								)
-							],
-							propertiesToExcludeFromComparison
-						);
-					});
-				});
-			});
-		});
-
-		suite('Output Order', () => {
-			test('Verify order of outputs', async () => {
-				const dataAndExpectedOrder: { output: nbformat.IDisplayData; expectedMimeTypesOrder: string[] }[] = [
-					{
-						output: {
-							data: {
-								'application/vnd.vegalite.v4+json': 'some json',
-								'text/html': '<a>Hello</a>'
-							},
-							metadata: {},
-							output_type: 'display_data'
-						},
-						expectedMimeTypesOrder: ['application/vnd.vegalite.v4+json', 'text/html']
-					},
-					{
-						output: {
-							data: {
-								'application/vnd.vegalite.v4+json': 'some json',
-								'application/javascript': 'some js',
-								'text/plain': 'some text',
-								'text/html': '<a>Hello</a>'
-							},
-							metadata: {},
-							output_type: 'display_data'
-						},
-						expectedMimeTypesOrder: [
-							'application/vnd.vegalite.v4+json',
-							'text/html',
-							'application/javascript',
-							'text/plain'
-						]
-					},
-					{
-						output: {
-							data: {
-								'application/vnd.vegalite.v4+json': '', // Empty, should give preference to other mimetypes.
-								'application/javascript': 'some js',
-								'text/plain': 'some text',
-								'text/html': '<a>Hello</a>'
-							},
-							metadata: {},
-							output_type: 'display_data'
-						},
-						expectedMimeTypesOrder: [
-							'text/html',
-							'application/javascript',
-							'text/plain',
-							'application/vnd.vegalite.v4+json'
-						]
-					},
-					{
-						output: {
-							data: {
-								'text/plain': 'some text',
-								'text/html': '<a>Hello</a>'
-							},
-							metadata: {},
-							output_type: 'display_data'
-						},
-						expectedMimeTypesOrder: ['text/html', 'text/plain']
-					},
-					{
-						output: {
-							data: {
-								'application/javascript': 'some js',
-								'text/plain': 'some text'
-							},
-							metadata: {},
-							output_type: 'display_data'
-						},
-						expectedMimeTypesOrder: ['application/javascript', 'text/plain']
-					},
-					{
-						output: {
-							data: {
-								'image/svg+xml': 'some svg',
-								'text/plain': 'some text'
-							},
-							metadata: {},
-							output_type: 'display_data'
-						},
-						expectedMimeTypesOrder: ['image/svg+xml', 'text/plain']
-					},
-					{
-						output: {
-							data: {
-								'text/latex': 'some latex',
-								'text/plain': 'some text'
-							},
-							metadata: {},
-							output_type: 'display_data'
-						},
-						expectedMimeTypesOrder: ['text/latex', 'text/plain']
-					},
-					{
-						output: {
-							data: {
-								'application/vnd.jupyter.widget-view+json': 'some widget',
-								'text/plain': 'some text'
-							},
-							metadata: {},
-							output_type: 'display_data'
-						},
-						expectedMimeTypesOrder: ['application/vnd.jupyter.widget-view+json', 'text/plain']
-					},
-					{
-						output: {
-							data: {
-								'text/plain': 'some text',
-								'image/svg+xml': 'some svg',
-								'image/png': 'some png'
-							},
-							metadata: {},
-							output_type: 'display_data'
-						},
-						expectedMimeTypesOrder: ['image/png', 'image/svg+xml', 'text/plain']
-					}
-				];
-
-				dataAndExpectedOrder.forEach(({ output, expectedMimeTypesOrder }) => {
-					const sortedOutputs = jupyterCellOutputToCellOutput(output);
-					const mimeTypes = sortedOutputs.items.map((item) => item.mime).join(',');
-					assert.equal(mimeTypes, expectedMimeTypesOrder.join(','));
+							)
+						],
+						propertiesToExcludeFromComparison
+					);
 				});
 			});
 		});
 	});
+
+	suite('Output Order', () => {
+		test('Verify order of outputs', async () => {
+			const dataAndExpectedOrder: { output: nbformat.IDisplayData; expectedMimeTypesOrder: string[] }[] = [
+				{
+					output: {
+						data: {
+							'application/vnd.vegalite.v4+json': 'some json',
+							'text/html': '<a>Hello</a>'
+						},
+						metadata: {},
+						output_type: 'display_data'
+					},
+					expectedMimeTypesOrder: ['application/vnd.vegalite.v4+json', 'text/html']
+				},
+				{
+					output: {
+						data: {
+							'application/vnd.vegalite.v4+json': 'some json',
+							'application/javascript': 'some js',
+							'text/plain': 'some text',
+							'text/html': '<a>Hello</a>'
+						},
+						metadata: {},
+						output_type: 'display_data'
+					},
+					expectedMimeTypesOrder: [
+						'application/vnd.vegalite.v4+json',
+						'text/html',
+						'application/javascript',
+						'text/plain'
+					]
+				},
+				{
+					output: {
+						data: {
+							'application/vnd.vegalite.v4+json': '', // Empty, should give preference to other mimetypes.
+							'application/javascript': 'some js',
+							'text/plain': 'some text',
+							'text/html': '<a>Hello</a>'
+						},
+						metadata: {},
+						output_type: 'display_data'
+					},
+					expectedMimeTypesOrder: [
+						'text/html',
+						'application/javascript',
+						'text/plain',
+						'application/vnd.vegalite.v4+json'
+					]
+				},
+				{
+					output: {
+						data: {
+							'text/plain': 'some text',
+							'text/html': '<a>Hello</a>'
+						},
+						metadata: {},
+						output_type: 'display_data'
+					},
+					expectedMimeTypesOrder: ['text/html', 'text/plain']
+				},
+				{
+					output: {
+						data: {
+							'application/javascript': 'some js',
+							'text/plain': 'some text'
+						},
+						metadata: {},
+						output_type: 'display_data'
+					},
+					expectedMimeTypesOrder: ['application/javascript', 'text/plain']
+				},
+				{
+					output: {
+						data: {
+							'image/svg+xml': 'some svg',
+							'text/plain': 'some text'
+						},
+						metadata: {},
+						output_type: 'display_data'
+					},
+					expectedMimeTypesOrder: ['image/svg+xml', 'text/plain']
+				},
+				{
+					output: {
+						data: {
+							'text/latex': 'some latex',
+							'text/plain': 'some text'
+						},
+						metadata: {},
+						output_type: 'display_data'
+					},
+					expectedMimeTypesOrder: ['text/latex', 'text/plain']
+				},
+				{
+					output: {
+						data: {
+							'application/vnd.jupyter.widget-view+json': 'some widget',
+							'text/plain': 'some text'
+						},
+						metadata: {},
+						output_type: 'display_data'
+					},
+					expectedMimeTypesOrder: ['application/vnd.jupyter.widget-view+json', 'text/plain']
+				},
+				{
+					output: {
+						data: {
+							'text/plain': 'some text',
+							'image/svg+xml': 'some svg',
+							'image/png': 'some png'
+						},
+						metadata: {},
+						output_type: 'display_data'
+					},
+					expectedMimeTypesOrder: ['image/png', 'image/svg+xml', 'text/plain']
+				}
+			];
+
+			dataAndExpectedOrder.forEach(({ output, expectedMimeTypesOrder }) => {
+				const sortedOutputs = jupyterCellOutputToCellOutput(output);
+				const mimeTypes = sortedOutputs.items.map((item) => item.mime).join(',');
+				assert.equal(mimeTypes, expectedMimeTypesOrder.join(','));
+			});
+		});
+	});
 });
diff --git a/extensions/ipynb/yarn.lock b/extensions/ipynb/yarn.lock
deleted file mode 100644
index fa950f66b64..00000000000
--- a/extensions/ipynb/yarn.lock
+++ /dev/null
@@ -1,43 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@enonic/fnv-plus@^1.3.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@enonic/fnv-plus/-/fnv-plus-1.3.0.tgz#be65a7b128a3b544f60aea3ef978d938e85869f3"
-  integrity sha512-BCN9uNWH8AmiP7BXBJqEinUY9KXalmRzo+L0cB/mQsmFfzODxwQrbvxCHXUNH2iP+qKkWYtB4vyy8N62PViMFw==
-
-"@jupyterlab/nbformat@^3.2.9":
-  version "3.4.3"
-  resolved "https://registry.yarnpkg.com/@jupyterlab/nbformat/-/nbformat-3.4.3.tgz#cbab1bf507677b7f0f309d8353fc83fe5a973c82"
-  integrity sha512-i/yADrwhhAJJCUOTa+fEBMyJO7fvX9Y73I0B7V6dQhGcrmrEKLC3wk4yOo63+jRntd5+dupbiOtz3w1ncIXwIA==
-  dependencies:
-    "@lumino/coreutils" "^1.11.0"
-
-"@lumino/coreutils@^1.11.0":
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/@lumino/coreutils/-/coreutils-1.12.0.tgz#fbdef760f736eaf2bd396a5c6fc3a68a4b449b15"
-  integrity sha512-DSglh4ylmLi820CNx9soJmDJCpUgymckdWeGWuN0Ash5g60oQvrQDfosVxEhzmNvtvXv45WZEqSBzDP6E5SEmQ==
-
-"@types/linkify-it@*":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.2.tgz#fd2cd2edbaa7eaac7e7f3c1748b52a19143846c9"
-  integrity sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==
-
-"@types/markdown-it@12.2.3":
-  version "12.2.3"
-  resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-12.2.3.tgz#0d6f6e5e413f8daaa26522904597be3d6cd93b51"
-  integrity sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==
-  dependencies:
-    "@types/linkify-it" "*"
-    "@types/mdurl" "*"
-
-"@types/mdurl@*":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-1.0.2.tgz#e2ce9d83a613bacf284c7be7d491945e39e1f8e9"
-  integrity sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==
-
-detect-indent@^6.0.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.1.0.tgz#592485ebbbf6b3b1ab2be175c8393d04ca0d57e6"
-  integrity sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==
diff --git a/extensions/jake/.npmrc b/extensions/jake/.npmrc
new file mode 100644
index 00000000000..a9c57709666
--- /dev/null
+++ b/extensions/jake/.npmrc
@@ -0,0 +1,2 @@
+legacy-peer-deps="true"
+timeout=180000
diff --git a/extensions/jake/.vscodeignore b/extensions/jake/.vscodeignore
index 36e8b0714fa..360fcfd1c99 100644
--- a/extensions/jake/.vscodeignore
+++ b/extensions/jake/.vscodeignore
@@ -2,4 +2,4 @@ src/**
 tsconfig.json
 out/**
 extension.webpack.config.js
-yarn.lock
\ No newline at end of file
+package-lock.json
diff --git a/extensions/jake/package-lock.json b/extensions/jake/package-lock.json
new file mode 100644
index 00000000000..ff50538c25e
--- /dev/null
+++ b/extensions/jake/package-lock.json
@@ -0,0 +1,34 @@
+{
+  "name": "jake",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "jake",
+      "version": "1.0.0",
+      "license": "MIT",
+      "devDependencies": {
+        "@types/node": "20.x"
+      },
+      "engines": {
+        "vscode": "*"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "20.11.24",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
+      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    }
+  }
+}
diff --git a/extensions/jake/src/main.ts b/extensions/jake/src/main.ts
index 33d39e288a4..a2511dc62df 100644
--- a/extensions/jake/src/main.ts
+++ b/extensions/jake/src/main.ts
@@ -290,7 +290,7 @@ class TaskDetector {
 		if (this.detectors.size === 0) {
 			return Promise.resolve([]);
 		} else if (this.detectors.size === 1) {
-			return this.detectors.values().next().value.getTasks();
+			return this.detectors.values().next().value!.getTasks();
 		} else {
 			const promises: Promise<vscode.Task[]>[] = [];
 			for (const detector of this.detectors.values()) {
@@ -312,7 +312,7 @@ class TaskDetector {
 		if (this.detectors.size === 0) {
 			return undefined;
 		} else if (this.detectors.size === 1) {
-			return this.detectors.values().next().value.getTask(task);
+			return this.detectors.values().next().value!.getTask(task);
 		} else {
 			if ((task.scope === vscode.TaskScope.Workspace) || (task.scope === vscode.TaskScope.Global)) {
 				// Not supported, we don't have enough info to create the task.
diff --git a/extensions/jake/yarn.lock b/extensions/jake/yarn.lock
deleted file mode 100644
index 1f4b6c2e8b4..00000000000
--- a/extensions/jake/yarn.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@types/node@20.x":
-  version "20.11.24"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792"
-  integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==
-  dependencies:
-    undici-types "~5.26.4"
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
diff --git a/extensions/java/yarn.lock b/extensions/java/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/java/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/javascript/snippets/javascript.code-snippets b/extensions/javascript/snippets/javascript.code-snippets
index 9448fd140d9..5bf6aa5edee 100644
--- a/extensions/javascript/snippets/javascript.code-snippets
+++ b/extensions/javascript/snippets/javascript.code-snippets
@@ -1,16 +1,79 @@
 {
-	"define module": {
-		"prefix": "define",
+	"Constructor": {
+		"prefix": "ctor",
 		"body": [
-			"define([",
-			"\t'require',",
-			"\t'${1:dependency}'",
-			"], function(require, ${2:factory}) {",
-			"\t'use strict';",
+			"/**",
+			" *",
+			" */",
+			"constructor() {",
+			"\tsuper();",
 			"\t$0",
-			"});"
+			"}"
 		],
-		"description": "define module"
+		"description": "Constructor"
+	},
+	"Class Definition": {
+		"prefix": "class",
+		"isFileTemplate": true,
+		"body": [
+			"class ${1:name} {",
+			"\tconstructor(${2:parameters}) {",
+			"\t\t$0",
+			"\t}",
+			"}"
+		],
+		"description": "Class Definition"
+	},
+	"Method Definition": {
+		"prefix": "method",
+		"body": [
+			"/**",
+			" * ",
+			" */",
+			"${1:name}() {",
+			"\t$0",
+			"}"
+		],
+		"description": "Method Definition"
+	},
+	"Import Statement": {
+		"prefix": "import",
+		"body": [
+			"import { $0 } from \"${1:module}\";"
+		],
+		"description": "Import external module"
+	},
+	"Log to the console": {
+		"prefix": "log",
+		"body": [
+			"console.log($1);",
+			"$0"
+		],
+		"description": "Log to the console"
+	},
+	"Log warning to console": {
+		"prefix": "warn",
+		"body": [
+			"console.warn($1);",
+			"$0"
+		],
+		"description": "Log warning to the console"
+	},
+	"Log error to console": {
+		"prefix": "error",
+		"body": [
+			"console.error($1);",
+			"$0"
+		],
+		"description": "Log error to the console"
+	},
+	"Throw Exception": {
+		"prefix": "throw",
+		"body": [
+			"throw new Error(\"$1\");",
+			"$0"
+		],
+		"description": "Throw Exception"
 	},
 	"For Loop": {
 		"prefix": "for",
@@ -22,20 +85,20 @@
 		],
 		"description": "For Loop"
 	},
-	"For-Each Loop": {
-		"prefix": "foreach",
+	"For-Each Loop using =>": {
+		"prefix": "foreach =>",
 		"body": [
 			"${1:array}.forEach(${2:element} => {",
 			"\t$TM_SELECTED_TEXT$0",
 			"});"
 		],
-		"description": "For-Each Loop"
+		"description": "For-Each Loop using =>"
 	},
 	"For-In Loop": {
 		"prefix": "forin",
 		"body": [
 			"for (const ${1:key} in ${2:object}) {",
-			"\tif (Object.hasOwnProperty.call(${2:object}, ${1:key})) {",
+			"\tif (Object.prototype.hasOwnProperty.call(${2:object}, ${1:key})) {",
 			"\t\tconst ${3:element} = ${2:object}[${1:key}];",
 			"\t\t$TM_SELECTED_TEXT$0",
 			"\t}",
@@ -46,12 +109,21 @@
 	"For-Of Loop": {
 		"prefix": "forof",
 		"body": [
-			"for (const ${1:iterator} of ${2:object}) {",
+			"for (const ${1:element} of ${2:object}) {",
 			"\t$TM_SELECTED_TEXT$0",
 			"}"
 		],
 		"description": "For-Of Loop"
 	},
+	"For-Await-Of Loop": {
+		"prefix": "forawaitof",
+		"body": [
+			"for await (const ${1:element} of ${2:object}) {",
+			"\t$TM_SELECTED_TEXT$0",
+			"}"
+		],
+		"description": "For-Await-Of Loop"
+	},
 	"Function Statement": {
 		"prefix": "function",
 		"body": [
@@ -149,13 +221,6 @@
 		],
 		"description": "Set Interval Function"
 	},
-	"Import Statement": {
-		"prefix": "import",
-		"body": [
-			"import { $0 } from \"${1:module}\";"
-		],
-		"description": "Import external module"
-	},
 	"Region Start": {
 		"prefix": "#region",
 		"body": [
@@ -170,27 +235,6 @@
 		],
 		"description": "Folding Region End"
 	},
-	"Log to the console": {
-		"prefix": "log",
-		"body": [
-			"console.log($1);"
-		],
-		"description": "Log to the console"
-	},
-	"Log warning to console": {
-		"prefix": "warn",
-		"body": [
-			"console.warn($1);"
-		],
-		"description": "Log warning to the console"
-	},
-	"Log error to console": {
-		"prefix": "error",
-		"body": [
-			"console.error($1);"
-		],
-		"description": "Log error to the console"
-	},
 	"new Promise": {
 		"prefix": "newpromise",
 		"body": [
@@ -199,5 +243,23 @@
 			"})"
 		],
 		"description": "Create a new Promise"
+	},
+	"Async Function Statement": {
+		"prefix": "async function",
+		"body": [
+			"async function ${1:name}(${2:params}) {",
+			"\t$TM_SELECTED_TEXT$0",
+			"}"
+		],
+		"description": "Async Function Statement"
+	},
+	"Async Function Expression": {
+		"prefix": "async arrow function",
+		"body": [
+			"async (${1:params}) => {",
+			"\t$TM_SELECTED_TEXT$0",
+			"}"
+		],
+		"description": "Async Function Expression"
 	}
 }
diff --git a/extensions/javascript/yarn.lock b/extensions/javascript/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/javascript/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/json-language-features/.npmrc b/extensions/json-language-features/.npmrc
new file mode 100644
index 00000000000..a9c57709666
--- /dev/null
+++ b/extensions/json-language-features/.npmrc
@@ -0,0 +1,2 @@
+legacy-peer-deps="true"
+timeout=180000
diff --git a/extensions/json-language-features/.vscodeignore b/extensions/json-language-features/.vscodeignore
index 1ebee75dfd3..807b3e4cbae 100644
--- a/extensions/json-language-features/.vscodeignore
+++ b/extensions/json-language-features/.vscodeignore
@@ -10,10 +10,10 @@ server/tsconfig.json
 server/test/**
 server/bin/**
 server/build/**
-server/yarn.lock
+server/package-lock.json
 server/.npmignore
 server/README.md
-yarn.lock
+package-lock.json
 CONTRIBUTING.md
 server/extension.webpack.config.js
 extension.webpack.config.js
diff --git a/extensions/json-language-features/CONTRIBUTING.md b/extensions/json-language-features/CONTRIBUTING.md
index f0b0aa0ec09..2e0b6c084d2 100644
--- a/extensions/json-language-features/CONTRIBUTING.md
+++ b/extensions/json-language-features/CONTRIBUTING.md
@@ -1,12 +1,12 @@
 ## Setup
 
 - Clone [microsoft/vscode](https://github.com/microsoft/vscode)
-- Run `yarn` at `/`, this will install
+- Run `npm i` at `/`, this will install
 	- Dependencies for `/extension/json-language-features/`
 	- Dependencies for `/extension/json-language-features/server/`
 	- devDependencies such as `gulp`
 - Open `/extensions/json-language-features/` as the workspace in VS Code
-- In `/extensions/json-language-features/` run `yarn compile`(or `yarn watch`) to build the client and server
+- In `/extensions/json-language-features/` run `npm run compile`(or `npm run watch`) to build the client and server
 - Run the [`Launch Extension`](https://github.com/microsoft/vscode/blob/master/extensions/json-language-features/.vscode/launch.json) debug target in the Debug View. This will:
 	- Launch a new VS Code instance with the `json-language-features` extension loaded
 - Open a `.json` file to activate the extension. The extension will start the JSON language server process.
@@ -29,13 +29,13 @@ However, within this extension, you can run a development version of `vscode-jso
 #### Linking `vscode-json-languageservice` in `json-language-features/server/`
 
 - Clone [microsoft/vscode-json-languageservice](https://github.com/microsoft/vscode-json-languageservice)
-- Run `npm install` in `vscode-json-languageservice`
+- Run `npm i` in `vscode-json-languageservice`
 - Run `npm link` in `vscode-json-languageservice`. This will compile and link `vscode-json-languageservice`
-- In `json-language-features/server/`, run `yarn link vscode-json-languageservice`
+- In `json-language-features/server/`, run `npm link vscode-json-languageservice`
 
 #### Testing the development version of `vscode-json-languageservice`
 
 - Open both `vscode-json-languageservice` and this extension in two windows or with a single window with the[multi-root workspace](https://code.visualstudio.com/docs/editor/multi-root-workspaces) feature.
-- Run `yarn watch` at `json-languagefeatures/server/` to recompile this extension with the linked version of `vscode-json-languageservice`
+- Run `npm run watch` at `json-languagefeatures/server/` to recompile this extension with the linked version of `vscode-json-languageservice`
 - Make some changes in `vscode-json-languageservice`
 - Now when you run `Launch Extension` debug target, the launched instance will use your development version of `vscode-json-languageservice`. You can interactively test the language features.
diff --git a/extensions/json-language-features/client/src/browser/jsonClientMain.ts b/extensions/json-language-features/client/src/browser/jsonClientMain.ts
index f78f494d727..91ed937fe6f 100644
--- a/extensions/json-language-features/client/src/browser/jsonClientMain.ts
+++ b/extensions/json-language-features/client/src/browser/jsonClientMain.ts
@@ -8,12 +8,6 @@ import { LanguageClientOptions } from 'vscode-languageclient';
 import { startClient, LanguageClientConstructor, SchemaRequestService, AsyncDisposable, languageServerDescription } from '../jsonClient';
 import { LanguageClient } from 'vscode-languageclient/browser';
 
-declare const Worker: {
-	new(stringUrl: string): any;
-};
-
-declare function fetch(uri: string, options: any): any;
-
 let client: AsyncDisposable | undefined;
 
 // this method is called when vs code is activated
@@ -24,7 +18,7 @@ export async function activate(context: ExtensionContext) {
 		worker.postMessage({ i10lLocation: l10n.uri?.toString(false) ?? '' });
 
 		const newLanguageClient: LanguageClientConstructor = (id: string, name: string, clientOptions: LanguageClientOptions) => {
-			return new LanguageClient(id, name, clientOptions, worker);
+			return new LanguageClient(id, name, worker, clientOptions);
 		};
 
 		const schemaRequests: SchemaRequestService = {
diff --git a/extensions/json-language-features/client/src/jsonClient.ts b/extensions/json-language-features/client/src/jsonClient.ts
index f892664d917..90aafc89b84 100644
--- a/extensions/json-language-features/client/src/jsonClient.ts
+++ b/extensions/json-language-features/client/src/jsonClient.ts
@@ -8,7 +8,8 @@ export type JSONLanguageStatus = { schemas: string[] };
 import {
 	workspace, window, languages, commands, LogOutputChannel, ExtensionContext, extensions, Uri, ColorInformation,
 	Diagnostic, StatusBarAlignment, TextEditor, TextDocument, FormattingOptions, CancellationToken, FoldingRange,
-	ProviderResult, TextEdit, Range, Position, Disposable, CompletionItem, CompletionList, CompletionContext, Hover, MarkdownString, FoldingContext, DocumentSymbol, SymbolInformation, l10n
+	ProviderResult, TextEdit, Range, Position, Disposable, CompletionItem, CompletionList, CompletionContext, Hover, MarkdownString, FoldingContext, DocumentSymbol, SymbolInformation, l10n,
+	RelativePattern
 } from 'vscode';
 import {
 	LanguageClientOptions, RequestType, NotificationType, FormattingOptions as LSPFormattingOptions, DocumentDiagnosticReportKind,
@@ -360,18 +361,29 @@ async function startClientWithParticipants(context: ExtensionContext, languagePa
 	const schemaDocuments: { [uri: string]: boolean } = {};
 
 	// handle content request
-	client.onRequest(VSCodeContentRequest.type, (uriPath: string) => {
+	client.onRequest(VSCodeContentRequest.type, async (uriPath: string) => {
 		const uri = Uri.parse(uriPath);
+		const uriString = uri.toString();
 		if (uri.scheme === 'untitled') {
-			return Promise.reject(new ResponseError(3, l10n.t('Unable to load {0}', uri.toString())));
+			throw new ResponseError(3, l10n.t('Unable to load {0}', uriString));
 		}
-		if (uri.scheme !== 'http' && uri.scheme !== 'https') {
-			return workspace.openTextDocument(uri).then(doc => {
-				schemaDocuments[uri.toString()] = true;
-				return doc.getText();
-			}, error => {
-				return Promise.reject(new ResponseError(2, error.toString()));
-			});
+		if (uri.scheme === 'vscode') {
+			try {
+				runtime.logOutputChannel.info('read schema from vscode: ' + uriString);
+				ensureFilesystemWatcherInstalled(uri);
+				const content = await workspace.fs.readFile(uri);
+				return new TextDecoder().decode(content);
+			} catch (e) {
+				throw new ResponseError(5, e.toString(), e);
+			}
+		} else if (uri.scheme !== 'http' && uri.scheme !== 'https') {
+			try {
+				const document = await workspace.openTextDocument(uri);
+				schemaDocuments[uriString] = true;
+				return document.getText();
+			} catch (e) {
+				throw new ResponseError(2, e.toString(), e);
+			}
 		} else if (schemaDownloadEnabled) {
 			if (runtime.telemetry && uri.authority === 'schema.management.azure.com') {
 				/* __GDPR__
@@ -381,13 +393,15 @@ async function startClientWithParticipants(context: ExtensionContext, languagePa
 						"schemaURL" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "comment": "The azure schema URL that was requested." }
 					}
 				*/
-				runtime.telemetry.sendTelemetryEvent('json.schema', { schemaURL: uriPath });
+				runtime.telemetry.sendTelemetryEvent('json.schema', { schemaURL: uriString });
+			}
+			try {
+				return await runtime.schemaRequests.getContent(uriString);
+			} catch (e) {
+				throw new ResponseError(4, e.toString());
 			}
-			return runtime.schemaRequests.getContent(uriPath).catch(e => {
-				return Promise.reject(new ResponseError(4, e.toString()));
-			});
 		} else {
-			return Promise.reject(new ResponseError(1, l10n.t('Downloading schemas is disabled through setting \'{0}\'', SettingIds.enableSchemaDownload)));
+			throw new ResponseError(1, l10n.t('Downloading schemas is disabled through setting \'{0}\'', SettingIds.enableSchemaDownload));
 		}
 	});
 
@@ -415,15 +429,50 @@ async function startClientWithParticipants(context: ExtensionContext, languagePa
 			schemaResolutionErrorStatusBarItem.hide();
 		}
 	};
-
-	toDispose.push(workspace.onDidChangeTextDocument(e => handleContentChange(e.document.uri.toString())));
-	toDispose.push(workspace.onDidCloseTextDocument(d => {
-		const uriString = d.uri.toString();
+	const handleContentClosed = (uriString: string) => {
 		if (handleContentChange(uriString)) {
 			delete schemaDocuments[uriString];
 		}
 		fileSchemaErrors.delete(uriString);
+	};
+
+	const watchers: Map<string, Disposable> = new Map();
+	toDispose.push(new Disposable(() => {
+		for (const d of watchers.values()) {
+			d.dispose();
+		}
 	}));
+
+
+	const ensureFilesystemWatcherInstalled = (uri: Uri) => {
+
+		const uriString = uri.toString();
+		if (!watchers.has(uriString)) {
+			try {
+				const watcher = workspace.createFileSystemWatcher(new RelativePattern(uri, '*'));
+				const handleChange = (uri: Uri) => {
+					runtime.logOutputChannel.info('schema change detected ' + uri.toString());
+					client.sendNotification(SchemaContentChangeNotification.type, uriString);
+				};
+				const createListener = watcher.onDidCreate(handleChange);
+				const changeListener = watcher.onDidChange(handleChange);
+				const deleteListener = watcher.onDidDelete(() => {
+					const watcher = watchers.get(uriString);
+					if (watcher) {
+						watcher.dispose();
+						watchers.delete(uriString);
+					}
+				});
+				watchers.set(uriString, Disposable.from(watcher, createListener, changeListener, deleteListener));
+			} catch {
+				runtime.logOutputChannel.info('Problem installing a file system watcher for ' + uriString);
+			}
+		}
+	};
+
+	toDispose.push(workspace.onDidChangeTextDocument(e => handleContentChange(e.document.uri.toString())));
+	toDispose.push(workspace.onDidCloseTextDocument(d => handleContentClosed(d.uri.toString())));
+
 	toDispose.push(window.onDidChangeActiveTextEditor(handleActiveEditorChange));
 
 	const handleRetryResolveSchemaCommand = () => {
diff --git a/extensions/json-language-features/client/src/languageStatus.ts b/extensions/json-language-features/client/src/languageStatus.ts
index 4aead6f99f2..e295d72b117 100644
--- a/extensions/json-language-features/client/src/languageStatus.ts
+++ b/extensions/json-language-features/client/src/languageStatus.ts
@@ -198,7 +198,7 @@ export function createLanguageStatusItem(documentSelector: DocumentSelector, sta
 				statusItem.command = {
 					command: '_json.showAssociatedSchemaList',
 					title: l10n.t('Show Schemas'),
-					arguments: [{ schemas, uri: document.uri.toString() } as ShowSchemasInput]
+					arguments: [{ schemas, uri: document.uri.toString() } satisfies ShowSchemasInput]
 				};
 			} catch (e) {
 				statusItem.text = l10n.t('Unable to compute used schemas: {0}', e.message);
diff --git a/extensions/json-language-features/client/tsconfig.json b/extensions/json-language-features/client/tsconfig.json
index aa51e4d0157..89e6a6c12b7 100644
--- a/extensions/json-language-features/client/tsconfig.json
+++ b/extensions/json-language-features/client/tsconfig.json
@@ -1,7 +1,10 @@
 {
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
-		"outDir": "./out"
+		"outDir": "./out",
+		"lib": [
+			"webworker"
+		]
 	},
 	"include": [
 		"src/**/*",
diff --git a/extensions/json-language-features/package-lock.json b/extensions/json-language-features/package-lock.json
new file mode 100644
index 00000000000..f3b999cc223
--- /dev/null
+++ b/extensions/json-language-features/package-lock.json
@@ -0,0 +1,263 @@
+{
+  "name": "json-language-features",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "json-language-features",
+      "version": "1.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "@vscode/extension-telemetry": "^0.9.0",
+        "request-light": "^0.8.0",
+        "vscode-languageclient": "10.0.0-next.8"
+      },
+      "devDependencies": {
+        "@types/node": "20.x"
+      },
+      "engines": {
+        "vscode": "^1.77.0"
+      }
+    },
+    "node_modules/@microsoft/1ds-core-js": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.0.3.tgz",
+      "integrity": "sha512-FrxNLVAPsAvD7+l63TlNS/Kodvpct2WulpDSn1dI4Xuy0kF4E2H867kHdwL/iY1Bj3zA3FSy/jvE4+OcDws7ug==",
+      "dependencies": {
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/1ds-post-js": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.0.3.tgz",
+      "integrity": "sha512-uewvmUtXKd7ttypiKQGdYI6i7UUpPkOznLayzIFrJ4r2xnG6jhPjpKRncHFXPQcM4XSWO3yf5PQ3xAbPq9t7ZQ==",
+      "dependencies": {
+        "@microsoft/1ds-core-js": "4.0.3",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-channel-js": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.0.4.tgz",
+      "integrity": "sha512-6TlfExmErQ8Y+/ChbkyWl+jyt4wg3T6p7lwXDsUCB0LgZmlEWMaCUS0YlT73JCWmE8j7vxW8yUm0lgsgmHns3A==",
+      "dependencies": {
+        "@microsoft/applicationinsights-common": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-common": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.0.4.tgz",
+      "integrity": "sha512-r5gWaw/K9+tKfuo2GtDiDiKASgOkPOCrKW+wZzFvuR06uuwvWjbVQ6yW/YbnfuhRF5M65ksUiMi0eCMwEOGq7Q==",
+      "dependencies": {
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-core-js": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.0.4.tgz",
+      "integrity": "sha512-anxy5kEkqBmVoEqJiJzaaXXA0wzqZi9U4zGd05xFJ04lWckP8dG3zyT3+GGdg7rDelqLTNGxndeYoFmDv63u1g==",
+      "dependencies": {
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-shims": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
+      "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-web-basic": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.0.4.tgz",
+      "integrity": "sha512-KfoxPlLlf0JT12ADb23C5iGye/yFouoMgHEKULxkSQcYY9SsW/8rVrqqvoYKAL+u215CZU2A8Kc8sR3ehEaPCQ==",
+      "dependencies": {
+        "@microsoft/applicationinsights-channel-js": "3.0.4",
+        "@microsoft/applicationinsights-common": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/dynamicproto-js": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.2.tgz",
+      "integrity": "sha512-MB8trWaFREpmb037k/d0bB7T2BP7Ai24w1e1tbz3ASLB0/lwphsq3Nq8S9I5AsI5vs4zAQT+SB5nC5/dLYTiOg==",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+      }
+    },
+    "node_modules/@nevware21/ts-async": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.3.0.tgz",
+      "integrity": "sha512-ZUcgUH12LN/F6nzN0cYd0F/rJaMLmXr0EHVTyYfaYmK55bdwE4338uue4UiVoRqHVqNW4KDUrJc49iGogHKeWA==",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.10.0 < 2.x"
+      }
+    },
+    "node_modules/@nevware21/ts-utils": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.10.1.tgz",
+      "integrity": "sha512-pMny25NnF2/MJwdqC3Iyjm2pGIXNxni4AROpcqDeWa+td9JMUY4bUS9uU9XW+BoBRqTLUL+WURF9SOd/6OQzRg=="
+    },
+    "node_modules/@types/node": {
+      "version": "20.11.24",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
+      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/@vscode/extension-telemetry": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.0.tgz",
+      "integrity": "sha512-37RxGHXrs3GoXPgCUKQhghEu0gxs8j27RLjQwwtSf4WhPdJKz8UrqMYzpsXlliQ05zURYmtdGZst9C6+hfWXaQ==",
+      "dependencies": {
+        "@microsoft/1ds-core-js": "^4.0.3",
+        "@microsoft/1ds-post-js": "^4.0.3",
+        "@microsoft/applicationinsights-web-basic": "^3.0.4"
+      },
+      "engines": {
+        "vscode": "^1.75.0"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c= sha512-9Y0g0Q8rmSt+H33DfKv7FOc3v+iRI+o1lbzt8jGcIosYW37IIW/2XVYq5NPdmaD5NQ59Nk26Kl/vZbwW9Fr8vg=="
+    },
+    "node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/request-light": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.8.0.tgz",
+      "integrity": "sha512-bH6E4PMmsEXYrLX6Kr1vu+xI3HproB1vECAwaPSJeroLE1kpWE3HR27uB4icx+6YORu1ajqBJXxuedv8ZQg5Lw=="
+    },
+    "node_modules/semver": {
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
+      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    },
+    "node_modules/vscode-jsonrpc": {
+      "version": "9.0.0-next.4",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.4.tgz",
+      "integrity": "sha512-zSVIr58lJSMYKIsZ5P7GtBbv1eEx25eNyOf0NmEzxmn1GhUNJAVAb5hkA1poKUwj1FRMwN6CeyWxZypmr8SsQQ==",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/vscode-languageclient": {
+      "version": "10.0.0-next.8",
+      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-10.0.0-next.8.tgz",
+      "integrity": "sha512-D9inIHgqKayO9Tv0MeLb3XIL76yTuWmKdHqcGZKzjtQrMGJgASJDYWTapu+yAjEpDp0gmVOaCYyIlLB86ncDoQ==",
+      "dependencies": {
+        "minimatch": "^9.0.3",
+        "semver": "^7.6.0",
+        "vscode-languageserver-protocol": "3.17.6-next.6"
+      },
+      "engines": {
+        "vscode": "^1.89.0"
+      }
+    },
+    "node_modules/vscode-languageserver-protocol": {
+      "version": "3.17.6-next.6",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.6.tgz",
+      "integrity": "sha512-naxM9kc/phpl0kAFNVPejMUWUtzFXdPYY/BtQTYtfbBbHf8sceHOrKkmf6yynZRu1A4oFtRZNqV3wyFRTWqUHw==",
+      "dependencies": {
+        "vscode-jsonrpc": "9.0.0-next.4",
+        "vscode-languageserver-types": "3.17.6-next.4"
+      }
+    },
+    "node_modules/vscode-languageserver-types": {
+      "version": "3.17.6-next.4",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.6-next.4.tgz",
+      "integrity": "sha512-SeJTpH/S14EbxOAVaOUoGVqPToqpRTld5QO5Ghig3AlbFJTFF9Wu7srHMfa85L0SX1RYAuuCSFKJVVCxDIk1/Q=="
+    },
+    "node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    }
+  }
+}
diff --git a/extensions/json-language-features/package.json b/extensions/json-language-features/package.json
index f86470429a4..e19541b7631 100644
--- a/extensions/json-language-features/package.json
+++ b/extensions/json-language-features/package.json
@@ -29,7 +29,7 @@
   "scripts": {
     "compile": "npx gulp compile-extension:json-language-features-client compile-extension:json-language-features-server",
     "watch": "npx gulp watch-extension:json-language-features-client watch-extension:json-language-features-server",
-    "install-client-next": "yarn add vscode-languageclient@next"
+    "install-client-next": "npm install vscode-languageclient@next"
   },
   "categories": [
     "Programming Languages"
@@ -162,8 +162,8 @@
   },
   "dependencies": {
     "@vscode/extension-telemetry": "^0.9.0",
-    "request-light": "^0.7.0",
-    "vscode-languageclient": "^10.0.0-next.5"
+    "request-light": "^0.8.0",
+    "vscode-languageclient": "10.0.0-next.8"
   },
   "devDependencies": {
     "@types/node": "20.x"
diff --git a/extensions/json-language-features/server/.npmignore b/extensions/json-language-features/server/.npmignore
index 3032fe8b26f..960a01cc7b5 100644
--- a/extensions/json-language-features/server/.npmignore
+++ b/extensions/json-language-features/server/.npmignore
@@ -5,6 +5,6 @@ src/
 test/
 tsconfig.json
 .gitignore
-yarn.lock
+package-lock.json
 extension.webpack.config.js
-vscode-json-languageserver-*.tgz
\ No newline at end of file
+vscode-json-languageserver-*.tgz
diff --git a/extensions/json-language-features/server/.npmrc b/extensions/json-language-features/server/.npmrc
new file mode 100644
index 00000000000..a9c57709666
--- /dev/null
+++ b/extensions/json-language-features/server/.npmrc
@@ -0,0 +1,2 @@
+legacy-peer-deps="true"
+timeout=180000
diff --git a/extensions/json-language-features/server/package-lock.json b/extensions/json-language-features/server/package-lock.json
new file mode 100644
index 00000000000..1a5e567c9b8
--- /dev/null
+++ b/extensions/json-language-features/server/package-lock.json
@@ -0,0 +1,127 @@
+{
+  "name": "vscode-json-languageserver",
+  "version": "1.3.4",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "vscode-json-languageserver",
+      "version": "1.3.4",
+      "license": "MIT",
+      "dependencies": {
+        "@vscode/l10n": "^0.0.18",
+        "jsonc-parser": "^3.3.1",
+        "request-light": "^0.8.0",
+        "vscode-json-languageservice": "^5.4.1",
+        "vscode-languageserver": "10.0.0-next.6",
+        "vscode-uri": "^3.0.8"
+      },
+      "bin": {
+        "vscode-json-languageserver": "bin/vscode-json-languageserver"
+      },
+      "devDependencies": {
+        "@types/mocha": "^9.1.1",
+        "@types/node": "20.x"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/@types/mocha": {
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.1.tgz",
+      "integrity": "sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==",
+      "dev": true
+    },
+    "node_modules/@types/node": {
+      "version": "20.12.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.5.tgz",
+      "integrity": "sha512-BD+BjQ9LS/D8ST9p5uqBxghlN+S42iuNxjsUGjeZobe/ciXzk2qb1B6IXc6AnRLS+yFJRpN2IPEHMzwspfDJNw==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/@vscode/l10n": {
+      "version": "0.0.18",
+      "resolved": "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.18.tgz",
+      "integrity": "sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ=="
+    },
+    "node_modules/jsonc-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
+      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ=="
+    },
+    "node_modules/request-light": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.8.0.tgz",
+      "integrity": "sha512-bH6E4PMmsEXYrLX6Kr1vu+xI3HproB1vECAwaPSJeroLE1kpWE3HR27uB4icx+6YORu1ajqBJXxuedv8ZQg5Lw=="
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    },
+    "node_modules/vscode-json-languageservice": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.4.1.tgz",
+      "integrity": "sha512-5czFGNyVPxz3ZJYl8R3a3SuIj5gjhmGF4Wv05MRPvD4DEnHK6b8km4VbNMJNHBlTCh7A0aHzUbPVzo+0C18mCA==",
+      "dependencies": {
+        "@vscode/l10n": "^0.0.18",
+        "jsonc-parser": "^3.3.1",
+        "vscode-languageserver-textdocument": "^1.0.12",
+        "vscode-languageserver-types": "^3.17.5",
+        "vscode-uri": "^3.0.8"
+      }
+    },
+    "node_modules/vscode-jsonrpc": {
+      "version": "9.0.0-next.4",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.4.tgz",
+      "integrity": "sha512-zSVIr58lJSMYKIsZ5P7GtBbv1eEx25eNyOf0NmEzxmn1GhUNJAVAb5hkA1poKUwj1FRMwN6CeyWxZypmr8SsQQ==",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/vscode-languageserver": {
+      "version": "10.0.0-next.6",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-10.0.0-next.6.tgz",
+      "integrity": "sha512-0Lh1nhQfSxo5Ob+ayYO1QTIsDix2/Lc72Urm1KZrCFxK5zIFYaEh3QFeM9oZih4Rzs0ZkQPXXnoHtpvs5GT+Zw==",
+      "dependencies": {
+        "vscode-languageserver-protocol": "3.17.6-next.6"
+      },
+      "bin": {
+        "installServerIntoExtension": "bin/installServerIntoExtension"
+      }
+    },
+    "node_modules/vscode-languageserver-protocol": {
+      "version": "3.17.6-next.6",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.6.tgz",
+      "integrity": "sha512-naxM9kc/phpl0kAFNVPejMUWUtzFXdPYY/BtQTYtfbBbHf8sceHOrKkmf6yynZRu1A4oFtRZNqV3wyFRTWqUHw==",
+      "dependencies": {
+        "vscode-jsonrpc": "9.0.0-next.4",
+        "vscode-languageserver-types": "3.17.6-next.4"
+      }
+    },
+    "node_modules/vscode-languageserver-protocol/node_modules/vscode-languageserver-types": {
+      "version": "3.17.6-next.4",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.6-next.4.tgz",
+      "integrity": "sha512-SeJTpH/S14EbxOAVaOUoGVqPToqpRTld5QO5Ghig3AlbFJTFF9Wu7srHMfa85L0SX1RYAuuCSFKJVVCxDIk1/Q=="
+    },
+    "node_modules/vscode-languageserver-textdocument": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz",
+      "integrity": "sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA=="
+    },
+    "node_modules/vscode-languageserver-types": {
+      "version": "3.17.5",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz",
+      "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg=="
+    },
+    "node_modules/vscode-uri": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz",
+      "integrity": "sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw=="
+    }
+  }
+}
diff --git a/extensions/json-language-features/server/package.json b/extensions/json-language-features/server/package.json
index 6134fb4224d..48a6547f1d4 100644
--- a/extensions/json-language-features/server/package.json
+++ b/extensions/json-language-features/server/package.json
@@ -13,10 +13,10 @@
   "main": "./out/node/jsonServerMain",
   "dependencies": {
     "@vscode/l10n": "^0.0.18",
-    "jsonc-parser": "^3.2.1",
-    "request-light": "^0.7.0",
-    "vscode-json-languageservice": "^5.3.11",
-    "vscode-languageserver": "^10.0.0-next.3",
+    "jsonc-parser": "^3.3.1",
+    "request-light": "^0.8.0",
+    "vscode-json-languageservice": "^5.4.1",
+    "vscode-languageserver": "10.0.0-next.6",
     "vscode-uri": "^3.0.8"
   },
   "devDependencies": {
@@ -28,10 +28,10 @@
     "compile": "npx gulp compile-extension:json-language-features-server",
     "watch": "npx gulp watch-extension:json-language-features-server",
     "clean": "../../../node_modules/.bin/rimraf out",
-    "install-service-next": "yarn add vscode-json-languageservice@next",
-    "install-service-local": "yarn link vscode-json-languageservice",
-    "install-server-next": "yarn add vscode-languageserver@next",
-    "install-server-local": "yarn link vscode-languageserver-server",
+    "install-service-next": "npm install vscode-json-languageservice@next",
+    "install-service-local": "npm link vscode-json-languageservice",
+    "install-server-next": "npm install vscode-languageserver@next",
+    "install-server-local": "npm link vscode-languageserver-server",
     "version": "git commit -m \"JSON Language Server $npm_package_version\" package.json"
   }
 }
diff --git a/extensions/json-language-features/server/yarn.lock b/extensions/json-language-features/server/yarn.lock
deleted file mode 100644
index 669e823497d..00000000000
--- a/extensions/json-language-features/server/yarn.lock
+++ /dev/null
@@ -1,86 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@types/mocha@^9.1.1":
-  version "9.1.1"
-  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-9.1.1.tgz#e7c4f1001eefa4b8afbd1eee27a237fee3bf29c4"
-  integrity sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==
-
-"@types/node@20.x":
-  version "20.12.5"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.5.tgz#74c4f31ab17955d0b5808cdc8fd2839526ad00b3"
-  integrity sha512-BD+BjQ9LS/D8ST9p5uqBxghlN+S42iuNxjsUGjeZobe/ciXzk2qb1B6IXc6AnRLS+yFJRpN2IPEHMzwspfDJNw==
-  dependencies:
-    undici-types "~5.26.4"
-
-"@vscode/l10n@^0.0.18":
-  version "0.0.18"
-  resolved "https://registry.yarnpkg.com/@vscode/l10n/-/l10n-0.0.18.tgz#916d3a5e960dbab47c1c56f58a7cb5087b135c95"
-  integrity sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ==
-
-jsonc-parser@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.1.tgz#031904571ccf929d7670ee8c547545081cb37f1a"
-  integrity sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==
-
-request-light@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/request-light/-/request-light-0.7.0.tgz#885628bb2f8040c26401ebf258ec51c4ae98ac2a"
-  integrity sha512-lMbBMrDoxgsyO+yB3sDcrDuX85yYt7sS8BfQd11jtbW/z5ZWgLZRcEGLsLoYw7I0WSUGQBs8CC8ScIxkTX1+6Q==
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
-
-vscode-json-languageservice@^5.3.11:
-  version "5.3.11"
-  resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-5.3.11.tgz#71dbc56e9b1d07a57aa6a3d5569c8b7f2c05ca05"
-  integrity sha512-WYS72Ymria3dn8ZbjtBbt5K71m05wY1Q6hpXV5JxUT0q75Ts0ljLmnZJAVpx8DjPgYbFD+Z8KHpWh2laKLUCtQ==
-  dependencies:
-    "@vscode/l10n" "^0.0.18"
-    jsonc-parser "^3.2.1"
-    vscode-languageserver-textdocument "^1.0.11"
-    vscode-languageserver-types "^3.17.5"
-    vscode-uri "^3.0.8"
-
-vscode-jsonrpc@9.0.0-next.2:
-  version "9.0.0-next.2"
-  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.2.tgz#29e9741c742c80329bba1c60ce38fd014651ba80"
-  integrity sha512-meIaXAgChCHzWy45QGU8YpCNyqnZQ/sYeCj32OLDDbUYsCF7AvgpdXx3nnZn9yzr8ed0Od9bW+NGphEmXsqvIQ==
-
-vscode-languageserver-protocol@3.17.6-next.4:
-  version "3.17.6-next.4"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.4.tgz#3c56f6eb588bb42fccc0ac54a0d5daf2d02f0a1b"
-  integrity sha512-/2bleKBxZLyRObS4mkpaWlVI9xGiUqMVmh/ztZ2vL4uP2XyIpraT45JBpn9AtXr0alqKJPKLuKr+/qcYULvm/w==
-  dependencies:
-    vscode-jsonrpc "9.0.0-next.2"
-    vscode-languageserver-types "3.17.6-next.3"
-
-vscode-languageserver-textdocument@^1.0.11:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.11.tgz#0822a000e7d4dc083312580d7575fe9e3ba2e2bf"
-  integrity sha512-X+8T3GoiwTVlJbicx/sIAF+yuJAqz8VvwJyoMVhwEMoEKE/fkDmrqUgDMyBECcM2A2frVZIUj5HI/ErRXCfOeA==
-
-vscode-languageserver-types@3.17.6-next.3:
-  version "3.17.6-next.3"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.6-next.3.tgz#f71d6c57f18d921346cfe0c227aabd72eb8cd2f0"
-  integrity sha512-l5kNFXFRQGuzriXpuBqFpRmkf6f6A4VoU3h95OsVkqIOoi1k7KbwSo600cIdsKSJWrPg/+vX+QMPcMw1oI7ItA==
-
-vscode-languageserver-types@^3.17.5:
-  version "3.17.5"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz#3273676f0cf2eab40b3f44d085acbb7f08a39d8a"
-  integrity sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==
-
-vscode-languageserver@^10.0.0-next.3:
-  version "10.0.0-next.3"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-10.0.0-next.3.tgz#a63c5ea9fab1be93d7732ab0fdc18c9b37956e07"
-  integrity sha512-4x1qHImf6ePji4+8PX43lnBCBfBNdi2jneGX2k5FswJhx/cxaYYmusShmmtO/clyL1iurxJacrQoXfw9+ikhvg==
-  dependencies:
-    vscode-languageserver-protocol "3.17.6-next.4"
-
-vscode-uri@^3.0.8:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.8.tgz#1770938d3e72588659a172d0fd4642780083ff9f"
-  integrity sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==
diff --git a/extensions/json-language-features/yarn.lock b/extensions/json-language-features/yarn.lock
deleted file mode 100644
index b7ca937103a..00000000000
--- a/extensions/json-language-features/yarn.lock
+++ /dev/null
@@ -1,187 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@microsoft/1ds-core-js@4.0.3", "@microsoft/1ds-core-js@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@microsoft/1ds-core-js/-/1ds-core-js-4.0.3.tgz#c8a92c623745a9595e06558a866658480c33bdf9"
-  integrity sha512-FrxNLVAPsAvD7+l63TlNS/Kodvpct2WulpDSn1dI4Xuy0kF4E2H867kHdwL/iY1Bj3zA3FSy/jvE4+OcDws7ug==
-  dependencies:
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/1ds-post-js@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@microsoft/1ds-post-js/-/1ds-post-js-4.0.3.tgz#cfcb20bb23fb6215d3f0732f60f5b7df3e624f86"
-  integrity sha512-uewvmUtXKd7ttypiKQGdYI6i7UUpPkOznLayzIFrJ4r2xnG6jhPjpKRncHFXPQcM4XSWO3yf5PQ3xAbPq9t7ZQ==
-  dependencies:
-    "@microsoft/1ds-core-js" "4.0.3"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-channel-js@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.0.4.tgz#247b6fe2158fad9826cbcdf7304f885766b36624"
-  integrity sha512-6TlfExmErQ8Y+/ChbkyWl+jyt4wg3T6p7lwXDsUCB0LgZmlEWMaCUS0YlT73JCWmE8j7vxW8yUm0lgsgmHns3A==
-  dependencies:
-    "@microsoft/applicationinsights-common" "3.0.4"
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-common@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-common/-/applicationinsights-common-3.0.4.tgz#c4aa53ba343f5b3c7fbf54cddd3c86a5bdcd95dc"
-  integrity sha512-r5gWaw/K9+tKfuo2GtDiDiKASgOkPOCrKW+wZzFvuR06uuwvWjbVQ6yW/YbnfuhRF5M65ksUiMi0eCMwEOGq7Q==
-  dependencies:
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-core-js@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.0.4.tgz#008308b786930d94a1de8a1fbb4af0351b74653e"
-  integrity sha512-anxy5kEkqBmVoEqJiJzaaXXA0wzqZi9U4zGd05xFJ04lWckP8dG3zyT3+GGdg7rDelqLTNGxndeYoFmDv63u1g==
-  dependencies:
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-shims@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz#3865b73ace8405b9c4618cc5c571f2fe3876f06f"
-  integrity sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==
-  dependencies:
-    "@nevware21/ts-utils" ">= 0.9.4 < 2.x"
-
-"@microsoft/applicationinsights-web-basic@^3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.0.4.tgz#9a23323276b4a5a0dc6a352e2de5d75e3c16b534"
-  integrity sha512-KfoxPlLlf0JT12ADb23C5iGye/yFouoMgHEKULxkSQcYY9SsW/8rVrqqvoYKAL+u215CZU2A8Kc8sR3ehEaPCQ==
-  dependencies:
-    "@microsoft/applicationinsights-channel-js" "3.0.4"
-    "@microsoft/applicationinsights-common" "3.0.4"
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/dynamicproto-js@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.2.tgz#e57fbec2e7067d48b7e8e1e1c1d354028ef718a6"
-  integrity sha512-MB8trWaFREpmb037k/d0bB7T2BP7Ai24w1e1tbz3ASLB0/lwphsq3Nq8S9I5AsI5vs4zAQT+SB5nC5/dLYTiOg==
-  dependencies:
-    "@nevware21/ts-utils" ">= 0.9.4 < 2.x"
-
-"@nevware21/ts-async@>= 0.3.0 < 2.x":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@nevware21/ts-async/-/ts-async-0.3.0.tgz#a8b97ba01065fc930de9a3f4dd4a05e862becc6c"
-  integrity sha512-ZUcgUH12LN/F6nzN0cYd0F/rJaMLmXr0EHVTyYfaYmK55bdwE4338uue4UiVoRqHVqNW4KDUrJc49iGogHKeWA==
-  dependencies:
-    "@nevware21/ts-utils" ">= 0.10.0 < 2.x"
-
-"@nevware21/ts-utils@>= 0.10.0 < 2.x", "@nevware21/ts-utils@>= 0.10.1 < 2.x", "@nevware21/ts-utils@>= 0.9.4 < 2.x":
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@nevware21/ts-utils/-/ts-utils-0.10.1.tgz#aa65abc71eba06749a396598f22263d26f796ac7"
-  integrity sha512-pMny25NnF2/MJwdqC3Iyjm2pGIXNxni4AROpcqDeWa+td9JMUY4bUS9uU9XW+BoBRqTLUL+WURF9SOd/6OQzRg==
-
-"@types/node@20.x":
-  version "20.11.24"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792"
-  integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==
-  dependencies:
-    undici-types "~5.26.4"
-
-"@vscode/extension-telemetry@^0.9.0":
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.9.0.tgz#8c6c61e253ff304f46045f04edd60059b144417a"
-  integrity sha512-37RxGHXrs3GoXPgCUKQhghEu0gxs8j27RLjQwwtSf4WhPdJKz8UrqMYzpsXlliQ05zURYmtdGZst9C6+hfWXaQ==
-  dependencies:
-    "@microsoft/1ds-core-js" "^4.0.3"
-    "@microsoft/1ds-post-js" "^4.0.3"
-    "@microsoft/applicationinsights-web-basic" "^3.0.4"
-
-balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
-
-brace-expansion@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
-  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
-  dependencies:
-    balanced-match "^1.0.0"
-
-lru-cache@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
-  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
-  dependencies:
-    yallist "^4.0.0"
-
-minimatch@^9.0.3:
-  version "9.0.3"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
-  integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
-  dependencies:
-    brace-expansion "^2.0.1"
-
-request-light@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/request-light/-/request-light-0.7.0.tgz#885628bb2f8040c26401ebf258ec51c4ae98ac2a"
-  integrity sha512-lMbBMrDoxgsyO+yB3sDcrDuX85yYt7sS8BfQd11jtbW/z5ZWgLZRcEGLsLoYw7I0WSUGQBs8CC8ScIxkTX1+6Q==
-
-semver@^7.6.0:
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
-  integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
-  dependencies:
-    lru-cache "^6.0.0"
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
-
-vscode-jsonrpc@9.0.0-next.2:
-  version "9.0.0-next.2"
-  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.2.tgz#29e9741c742c80329bba1c60ce38fd014651ba80"
-  integrity sha512-meIaXAgChCHzWy45QGU8YpCNyqnZQ/sYeCj32OLDDbUYsCF7AvgpdXx3nnZn9yzr8ed0Od9bW+NGphEmXsqvIQ==
-
-vscode-languageclient@^10.0.0-next.5:
-  version "10.0.0-next.5"
-  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-10.0.0-next.5.tgz#7431d88255a5fd99e9423659ac484b1f968200f3"
-  integrity sha512-JIf1WE7fvV0RElFM062bAummI433vcxuFwqoYAp+1zTVhta/jznxkTz1zs3Hbj2tiDfclf0TZ0qCxflAP1mY2Q==
-  dependencies:
-    minimatch "^9.0.3"
-    semver "^7.6.0"
-    vscode-languageserver-protocol "3.17.6-next.4"
-
-vscode-languageserver-protocol@3.17.6-next.4:
-  version "3.17.6-next.4"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.4.tgz#3c56f6eb588bb42fccc0ac54a0d5daf2d02f0a1b"
-  integrity sha512-/2bleKBxZLyRObS4mkpaWlVI9xGiUqMVmh/ztZ2vL4uP2XyIpraT45JBpn9AtXr0alqKJPKLuKr+/qcYULvm/w==
-  dependencies:
-    vscode-jsonrpc "9.0.0-next.2"
-    vscode-languageserver-types "3.17.6-next.3"
-
-vscode-languageserver-types@3.17.6-next.3:
-  version "3.17.6-next.3"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.6-next.3.tgz#f71d6c57f18d921346cfe0c227aabd72eb8cd2f0"
-  integrity sha512-l5kNFXFRQGuzriXpuBqFpRmkf6f6A4VoU3h95OsVkqIOoi1k7KbwSo600cIdsKSJWrPg/+vX+QMPcMw1oI7ItA==
-
-yallist@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
-  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
diff --git a/extensions/json/yarn.lock b/extensions/json/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/json/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/julia/cgmanifest.json b/extensions/julia/cgmanifest.json
index 9daaee1fdd8..b5d8a03be09 100644
--- a/extensions/julia/cgmanifest.json
+++ b/extensions/julia/cgmanifest.json
@@ -6,11 +6,11 @@
 				"git": {
 					"name": "JuliaEditorSupport/atom-language-julia",
 					"repositoryUrl": "https://github.com/JuliaEditorSupport/atom-language-julia",
-					"commitHash": "663bf8d943fd8440f4ae7565f73327dd616bf191"
+					"commitHash": "c686684f18153687886e7d19c1bfc3a33076b1ab"
 				}
 			},
 			"license": "MIT",
-			"version": "0.22.1"
+			"version": "0.23.0"
 		}
 	],
 	"version": 1
diff --git a/extensions/julia/syntaxes/julia.tmLanguage.json b/extensions/julia/syntaxes/julia.tmLanguage.json
index 35a4ea7d927..f66fda97f70 100644
--- a/extensions/julia/syntaxes/julia.tmLanguage.json
+++ b/extensions/julia/syntaxes/julia.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/JuliaEditorSupport/atom-language-julia/commit/663bf8d943fd8440f4ae7565f73327dd616bf191",
+	"version": "https://github.com/JuliaEditorSupport/atom-language-julia/commit/c686684f18153687886e7d19c1bfc3a33076b1ab",
 	"name": "Julia",
 	"scopeName": "source.julia",
 	"comment": "This grammar is used by Atom (Oniguruma), GitHub (PCRE), and VSCode (Oniguruma),\nso all regexps must be compatible with both engines.\n\nSpecs:\n- https://github.com/kkos/oniguruma/blob/master/doc/RE\n- https://www.pcre.org/current/doc/html/",
@@ -333,7 +333,7 @@
 					"name": "keyword.control.using.julia"
 				},
 				{
-					"match": "(?<=\\w\\s)\\b(as)\\b(?=\\s\\w)",
+					"match": "(?<=\\S\\s+)\\b(as)\\b(?=\\s+\\S)",
 					"name": "keyword.control.as.julia"
 				},
 				{
diff --git a/extensions/latex/cgmanifest.json b/extensions/latex/cgmanifest.json
index b537c48ee8c..609d875ac2f 100644
--- a/extensions/latex/cgmanifest.json
+++ b/extensions/latex/cgmanifest.json
@@ -6,11 +6,11 @@
 				"git": {
 					"name": "jlelong/vscode-latex-basics",
 					"repositoryUrl": "https://github.com/jlelong/vscode-latex-basics",
-					"commitHash": "5d7c2a4e451a932b776f6d9342087be6a1e8c0a1"
+					"commitHash": "56e2dc967e6bafafc1acfeeb80af42b8328b021a"
 				}
 			},
 			"license": "MIT",
-			"version": "1.9.0",
+			"version": "1.7.0",
 			"description": "The files in syntaxes/ were originally part of https://github.com/James-Yu/LaTeX-Workshop. They have been extracted in the hope that they can useful outside of the LaTeX-Workshop extension.",
 			"licenseDetail": [
 				"Copyright (c) vscode-latex-basics authors",
diff --git a/extensions/latex/syntaxes/LaTeX.tmLanguage.json b/extensions/latex/syntaxes/LaTeX.tmLanguage.json
index aad6c5c4bd9..e06d8553846 100644
--- a/extensions/latex/syntaxes/LaTeX.tmLanguage.json
+++ b/extensions/latex/syntaxes/LaTeX.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/jlelong/vscode-latex-basics/commit/3d141a124a16558958e95c54267f7ca37986de6f",
+	"version": "https://github.com/jlelong/vscode-latex-basics/commit/59971565a7065dbb617576c04add9d891b056319",
 	"name": "LaTeX",
 	"scopeName": "text.tex.latex",
 	"patterns": [
@@ -94,7 +94,7 @@
 				"4": {
 					"patterns": [
 						{
-							"include": "#optional-arg"
+							"include": "#optional-arg-bracket"
 						}
 					]
 				},
@@ -1900,7 +1900,7 @@
 				"3": {
 					"patterns": [
 						{
-							"include": "#optional-arg"
+							"include": "#optional-arg-bracket"
 						}
 					]
 				},
@@ -1910,7 +1910,7 @@
 				"5": {
 					"patterns": [
 						{
-							"include": "#optional-arg"
+							"include": "#optional-arg-bracket"
 						}
 					]
 				},
@@ -2002,7 +2002,7 @@
 					]
 				}
 			},
-			"contentName": "punctuation.definition.comment.latex",
+			"contentName": "comment.line.percentage.latex",
 			"end": "(\\\\end\\{\\2\\})",
 			"name": "meta.function.verbatim.latex"
 		},
@@ -2368,7 +2368,7 @@
 				"3": {
 					"patterns": [
 						{
-							"include": "#optional-arg"
+							"include": "#optional-arg-bracket"
 						}
 					]
 				},
@@ -2404,7 +2404,7 @@
 				"3": {
 					"patterns": [
 						{
-							"include": "#optional-arg"
+							"include": "#optional-arg-bracket"
 						}
 					]
 				},
@@ -2562,7 +2562,7 @@
 			"name": "meta.scope.item.latex"
 		},
 		{
-			"begin": "((\\\\)(?:[aA]uto|foot|full|no|ref|short|[tT]ext|[pP]aren|[sS]mart)?[cC]ite(?:al)?(?:p|s|t|author|year(?:par)?|title)?[ANP]*\\*?)((?:(?:\\([^\\)]*\\)){0,2}(?:\\[[^\\]]*\\]){0,2}\\{[\\p{Alphabetic}:.]*\\})*)(?:([<\\[])[^\\]<>]*([>\\]]))?(?:(\\[)[^\\]]*(\\]))?(\\{)",
+			"begin": "((\\\\)(?:[aA]uto|foot|full|no|ref|short|[tT]ext|[pP]aren|[sS]mart)?[cC]ite(?:al)?(?:p|s|t|author|year(?:par)?|title)?[ANP]*\\*?)((?:(?:\\([^\\)]*\\)){0,2}(?:\\[[^\\]]*\\]){0,2}\\{[\\p{Alphabetic}\\p{Number}_:.-]*\\})*)(<[^\\]<>]*>)?((?:\\[[^\\]]*\\])*)(\\{)",
 			"captures": {
 				"1": {
 					"name": "keyword.control.cite.latex"
@@ -2578,18 +2578,20 @@
 					]
 				},
 				"4": {
-					"name": "punctuation.definition.arguments.optional.begin.latex"
+					"patterns": [
+						{
+							"include": "#optional-arg-angle-no-highlight"
+						}
+					]
 				},
 				"5": {
-					"name": "punctuation.definition.arguments.optional.end.latex"
+					"patterns": [
+						{
+							"include": "#optional-arg-bracket-no-highlight"
+						}
+					]
 				},
 				"6": {
-					"name": "punctuation.definition.arguments.optional.begin.latex"
-				},
-				"7": {
-					"name": "punctuation.definition.arguments.optional.end.latex"
-				},
-				"8": {
 					"name": "punctuation.definition.arguments.begin.latex"
 				}
 			},
@@ -2602,6 +2604,7 @@
 			"name": "meta.citation.latex",
 			"patterns": [
 				{
+					"match": "((%).*)$",
 					"captures": {
 						"1": {
 							"name": "comment.line.percentage.tex"
@@ -2609,8 +2612,7 @@
 						"2": {
 							"name": "punctuation.definition.comment.tex"
 						}
-					},
-					"match": "((%).*)$"
+					}
 				},
 				{
 					"match": "[\\p{Alphabetic}\\p{Number}:.-]+",
@@ -2646,7 +2648,7 @@
 			]
 		},
 		{
-			"begin": "((\\\\)(?:\\w*[rR]ef\\*?))(\\{)",
+			"begin": "((\\\\)(?:\\w*[rR]ef\\*?))(?:\\[[^\\]]*\\])?(\\{)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.ref.latex"
@@ -2740,7 +2742,7 @@
 				"3": {
 					"patterns": [
 						{
-							"include": "#optional-arg"
+							"include": "#optional-arg-bracket"
 						}
 					]
 				},
@@ -2783,7 +2785,7 @@
 				"3": {
 					"patterns": [
 						{
-							"include": "#optional-arg"
+							"include": "#optional-arg-bracket"
 						}
 					]
 				},
@@ -2820,7 +2822,7 @@
 				"3": {
 					"patterns": [
 						{
-							"include": "#optional-arg"
+							"include": "#optional-arg-bracket"
 						}
 					]
 				},
@@ -2867,7 +2869,7 @@
 				"3": {
 					"patterns": [
 						{
-							"include": "#optional-arg"
+							"include": "#optional-arg-bracket"
 						}
 					]
 				},
@@ -3048,7 +3050,7 @@
 					"name": "punctuation.definition.variable.latex"
 				}
 			},
-			"match": "(\\\\)[cgl](?:[_\\p{Alphabetic}@]+)+_(?:bitset|clist|dim|fp|int|muskip|str|tl|bool|box|coffin|flag|fparray|intarray|ior|iow|prop|regex|seq)",
+			"match": "(\\\\)(?:[cgl]_+[_\\p{Alphabetic}@]+_[a-z]+|[qs]_[_\\p{Alphabetic}@]+[\\p{Alphabetic}@])",
 			"name": "variable.other.latex3.latex"
 		},
 		{
@@ -3073,27 +3075,29 @@
 				{
 					"captures": {
 						"1": {
-							"name": "punctuation.definition.arguments.optional.begin.latex"
+							"patterns": [
+								{
+									"include": "#optional-arg-parenthesis-no-highlight"
+								}
+							]
 						},
 						"2": {
-							"name": "punctuation.definition.arguments.optional.end.latex"
+							"patterns": [
+								{
+									"include": "#optional-arg-bracket-no-highlight"
+								}
+							]
 						},
 						"3": {
-							"name": "punctuation.definition.arguments.optional.begin.latex"
-						},
-						"4": {
-							"name": "punctuation.definition.arguments.optional.end.latex"
-						},
-						"5": {
 							"name": "punctuation.definition.arguments.begin.latex"
 						},
-						"6": {
+						"4": {
 							"name": "constant.other.reference.citation.latex"
 						},
-						"7": {
+						"5": {
 							"name": "punctuation.definition.arguments.end.latex"
 						},
-						"8": {
+						"6": {
 							"patterns": [
 								{
 									"include": "#autocites-arg"
@@ -3101,7 +3105,7 @@
 							]
 						}
 					},
-					"match": "(?:(\\()[^\\)]*(\\))){0,2}(?:(\\[)[^\\]]*(\\])){0,2}(\\{)([\\p{Alphabetic}\\p{Number}:.]+)(\\})(.*)"
+					"match": "((?:\\([^\\)]*\\)){0,2})((?:\\[[^\\]]*\\]){0,2})(\\{)([\\p{Alphabetic}\\p{Number}_:.-]+)(\\})(.*)"
 				}
 			]
 		},
@@ -3148,7 +3152,7 @@
 			"match": "\\s*((\\\\)(?:begin|end))(\\{)([a-zA-Z]*\\*?)(\\})(?:(\\[)([^\\]]*)(\\])){,2}(?:(\\{)([^{}]*)(\\}))?"
 		},
 		"definition-label": {
-			"begin": "((\\\\)label)((?:\\[[^\\[]*?\\])*)(\\{)",
+			"begin": "((\\\\)z?label)((?:\\[[^\\[]*?\\])*)(\\{)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.label.latex"
@@ -3159,7 +3163,7 @@
 				"3": {
 					"patterns": [
 						{
-							"include": "#optional-arg"
+							"include": "#optional-arg-bracket"
 						}
 					]
 				},
@@ -3222,7 +3226,7 @@
 				}
 			]
 		},
-		"optional-arg": {
+		"optional-arg-bracket": {
 			"patterns": [
 				{
 					"captures": {
@@ -3240,6 +3244,73 @@
 					"name": "meta.parameter.optional.latex"
 				}
 			]
+		},
+		"optional-arg-parenthesis": {
+			"patterns": [
+				{
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.arguments.optional.begin.latex"
+						},
+						"2": {
+							"name": "variable.parameter.function.latex"
+						},
+						"3": {
+							"name": "punctuation.definition.arguments.optional.end.latex"
+						}
+					},
+					"match": "(\\()([^\\(]*?)(\\))",
+					"name": "meta.parameter.optional.latex"
+				}
+			]
+		},
+		"optional-arg-bracket-no-highlight": {
+			"patterns": [
+				{
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.arguments.optional.begin.latex"
+						},
+						"2": {
+							"name": "punctuation.definition.arguments.optional.end.latex"
+						}
+					},
+					"match": "(\\[)[^\\[]*?(\\])",
+					"name": "meta.parameter.optional.latex"
+				}
+			]
+		},
+		"optional-arg-angle-no-highlight": {
+			"patterns": [
+				{
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.arguments.optional.begin.latex"
+						},
+						"2": {
+							"name": "punctuation.definition.arguments.optional.end.latex"
+						}
+					},
+					"match": "(<)[^<]*?(>)",
+					"name": "meta.parameter.optional.latex"
+				}
+			]
+		},
+		"optional-arg-parenthesis-no-highlight": {
+			"patterns": [
+				{
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.arguments.optional.begin.latex"
+						},
+						"2": {
+							"name": "punctuation.definition.arguments.optional.end.latex"
+						}
+					},
+					"match": "(\\()[^\\(]*?(\\))",
+					"name": "meta.parameter.optional.latex"
+				}
+			]
 		}
 	}
 }
\ No newline at end of file
diff --git a/extensions/latex/syntaxes/TeX.tmLanguage.json b/extensions/latex/syntaxes/TeX.tmLanguage.json
index 0cb03e61466..b3a32817482 100644
--- a/extensions/latex/syntaxes/TeX.tmLanguage.json
+++ b/extensions/latex/syntaxes/TeX.tmLanguage.json
@@ -4,12 +4,12 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/jlelong/vscode-latex-basics/commit/5d7c2a4e451a932b776f6d9342087be6a1e8c0a1",
+	"version": "https://github.com/jlelong/vscode-latex-basics/commit/df6ef817c932d24da5cc72927344a547e463cc65",
 	"name": "TeX",
 	"scopeName": "text.tex",
 	"patterns": [
 		{
-			"begin": "(?<=^\\s*)((\\\\)iffalse)",
+			"begin": "(?<=^\\s*)((\\\\)iffalse)(?!\\s*[{}]\\s*\\\\fi)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.tex"
@@ -19,7 +19,7 @@
 				}
 			},
 			"contentName": "comment.line.percentage.tex",
-			"end": "(?<=^\\s*)((\\\\)(?:else|fi))",
+			"end": "((\\\\)(?:else|fi))",
 			"endCaptures": {
 				"1": {
 					"name": "keyword.control.tex"
@@ -32,6 +32,9 @@
 				{
 					"include": "#comment"
 				},
+				{
+					"include": "#braces"
+				},
 				{
 					"include": "#conditionals"
 				}
diff --git a/extensions/less/cgmanifest.json b/extensions/less/cgmanifest.json
index caf908bbcc0..a3598df8739 100644
--- a/extensions/less/cgmanifest.json
+++ b/extensions/less/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "language-less",
 					"repositoryUrl": "https://github.com/radium-v/Better-Less",
-					"commitHash": "24047277622c245dbe9309f0004d0ccb8f02636f"
+					"commitHash": "63c0cba9792e49e255cce0f6dd03250fb30591e6"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/less/syntaxes/less.tmLanguage.json b/extensions/less/syntaxes/less.tmLanguage.json
index 2acac688385..b7e51e831a8 100644
--- a/extensions/less/syntaxes/less.tmLanguage.json
+++ b/extensions/less/syntaxes/less.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/radium-v/Better-Less/commit/24047277622c245dbe9309f0004d0ccb8f02636f",
+	"version": "https://github.com/radium-v/Better-Less/commit/63c0cba9792e49e255cce0f6dd03250fb30591e6",
 	"name": "Less",
 	"scopeName": "source.css.less",
 	"patterns": [
@@ -40,9 +40,17 @@
 			"match": "(?i:[-+]?(?:(?:\\d*\\.\\d+(?:[eE](?:[-+]?\\d+))*)|(?:[-+]?\\d+))(deg|grad|rad|turn))\\b",
 			"name": "constant.numeric.less"
 		},
+		"arbitrary-repetition": {
+			"captures": {
+				"1": {
+					"name": "punctuation.definition.arbitrary-repetition.less"
+				}
+			},
+			"match": "\\s*(?:(,))"
+		},
 		"at-charset": {
 			"begin": "\\s*((@)charset\\b)\\s*",
-			"captures": {
+			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.at-rule.charset.less"
 				},
@@ -58,9 +66,132 @@
 				}
 			]
 		},
+		"at-container": {
+			"begin": "(?=\\s*@container)",
+			"end": "\\s*(\\})",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.definition.block.end.less"
+				}
+			},
+			"patterns": [
+				{
+					"begin": "((@)container)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.at-rule.container.less"
+						},
+						"2": {
+							"name": "punctuation.definition.keyword.less"
+						},
+						"3": {
+							"name": "support.constant.container.less"
+						}
+					},
+					"end": "(?=\\{)",
+					"name": "meta.at-rule.container.less",
+					"patterns": [
+						{
+							"begin": "\\s*(?=[^{;])",
+							"end": "\\s*(?=[{;])",
+							"patterns": [
+								{
+									"match": "\\b(not|and|or)\\b",
+									"name": "keyword.operator.comparison.less"
+								},
+								{
+									"begin": "\\(",
+									"beginCaptures": {
+										"0": {
+											"name": "punctuation.definition.group.begin.less"
+										}
+									},
+									"end": "\\)",
+									"endCaptures": {
+										"0": {
+											"name": "punctuation.definition.group.end.less"
+										}
+									},
+									"name": "meta.at-rule.container-query.less",
+									"patterns": [
+										{
+											"captures": {
+												"1": {
+													"name": "support.type.property-name.less"
+												}
+											},
+											"match": "\\b(aspect-ratio|block-size|height|inline-size|orientation|width)\\b",
+											"name": "support.constant.size-feature.less"
+										},
+										{
+											"match": "((<|>)=?)|=|\\/",
+											"name": "keyword.operator.comparison.less"
+										},
+										{
+											"match": ":",
+											"name": "punctuation.separator.key-value.less"
+										},
+										{
+											"match": "portrait|landscape",
+											"name": "support.constant.property-value.less"
+										},
+										{
+											"include": "#numeric-values"
+										},
+										{
+											"match": "\\/",
+											"name": "keyword.operator.arithmetic.less"
+										},
+										{
+											"include": "#var-function"
+										},
+										{
+											"include": "#less-variables"
+										},
+										{
+											"include": "#less-variable-interpolation"
+										}
+									]
+								},
+								{
+									"include": "#style-function"
+								},
+								{
+									"match": "--|(?:-?(?:(?:[a-zA-Z_]|[\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}\\x{200D}\\x{203F}\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}])|(?:\\\\(?:\\N|[[:^xdigit:]]|[[:xdigit:]]{1,6}[\\s\\R]))))(?:(?:[-\\da-zA-Z_]|[\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}\\x{200D}\\x{203F}\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}])|(?:\\\\(?:\\N|[[:^xdigit:]]|[[:xdigit:]]{1,6}[\\s\\R])))*",
+									"name": "variable.parameter.container-name.css"
+								},
+								{
+									"include": "#arbitrary-repetition"
+								},
+								{
+									"include": "#less-variables"
+								}
+							]
+						}
+					]
+				},
+				{
+					"begin": "\\s*(\\{)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.block.begin.less"
+						}
+					},
+					"end": "(?=\\})",
+					"patterns": [
+						{
+							"include": "#rule-list-body"
+						},
+						{
+							"include": "$self"
+						}
+					]
+				}
+			]
+		},
 		"at-counter-style": {
 			"begin": "\\s*((@)counter-style\\b)\\s+(?:(?i:\\b(decimal|none)\\b)|(-?(?:[[_a-zA-Z][^\\x{00}-\\x{7F}]]|(?:\\\\\\h{1,6}[\\s\\t\\n\\f]?|\\\\[^\\n\\f\\h]))(?:[[-\\w][^\\x{00}-\\x{7F}]]|(?:\\\\\\h{1,6}[\\s\\t\\n\\f]?|\\\\[^\\n\\f\\h]))*))\\s*(?=\\{|$)",
-			"captures": {
+			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.at-rule.counter-style.less"
 				},
@@ -124,7 +255,7 @@
 		},
 		"at-font-face": {
 			"begin": "\\s*((@)font-face)\\s*(?=\\{|$)",
-			"captures": {
+			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.at-rule.font-face.less"
 				},
@@ -211,7 +342,7 @@
 			]
 		},
 		"at-keyframes": {
-			"begin": "\\s*((@)(-webkit-|-moz-|-o-)?keyframes)(?=.*?\\{)",
+			"begin": "\\s*((@)keyframes)(?=.*?\\{)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.at-rule.keyframe.less"
@@ -219,9 +350,6 @@
 				"2": {
 					"name": "punctuation.definition.keyword.less"
 				},
-				"3": {
-					"name": "support.type.property-vendor.less"
-				},
 				"4": {
 					"name": "support.constant.keyframe.less"
 				}
@@ -268,6 +396,9 @@
 					"patterns": [
 						{
 							"include": "#keyframe-name"
+						},
+						{
+							"include": "#arbitrary-repetition"
 						}
 					]
 				}
@@ -383,6 +514,9 @@
 				{
 					"include": "#at-charset"
 				},
+				{
+					"include": "#at-container"
+				},
 				{
 					"include": "#at-counter-style"
 				},
@@ -497,44 +631,6 @@
 				}
 			]
 		},
-		"at-viewport": {
-			"begin": "((@(-ms-)?)viewport)",
-			"beginCaptures": {
-				"1": {
-					"name": "keyword.control.at-rule.viewport.less"
-				},
-				"2": {
-					"name": "punctuation.definition.keyword.less"
-				},
-				"3": {
-					"name": "support.type.vendor-prefix.less"
-				}
-			},
-			"end": "\\}",
-			"endCaptures": {
-				"0": {
-					"name": "punctuation.definition.block.end.less"
-				}
-			},
-			"name": "meta.at-rule.viewport.less",
-			"patterns": [
-				{
-					"begin": "\\{",
-					"captures": {
-						"0": {
-							"name": "punctuation.definition.block.begin.less"
-						}
-					},
-					"end": "(?=\\})",
-					"name": "meta.block.less",
-					"patterns": [
-						{
-							"include": "#rule-list-body"
-						}
-					]
-				}
-			]
-		},
 		"attr-function": {
 			"begin": "\\b(attr)(?=\\()",
 			"beginCaptures": {
@@ -615,6 +711,9 @@
 				{
 					"include": "#filter-function"
 				},
+				{
+					"include": "#fit-content-function"
+				},
 				{
 					"include": "#format-function"
 				},
@@ -697,6 +796,9 @@
 						},
 						{
 							"include": "#less-math"
+						},
+						{
+							"include": "#relative-color"
 						}
 					]
 				}
@@ -715,6 +817,7 @@
 							"name": "support.function.color.less"
 						}
 					},
+					"comment": "rgb(), rgba()",
 					"end": "\\)",
 					"endCaptures": {
 						"0": {
@@ -738,9 +841,15 @@
 								{
 									"include": "#less-variables"
 								},
+								{
+									"include": "#var-function"
+								},
 								{
 									"include": "#comma-delimiter"
 								},
+								{
+									"include": "#value-separator"
+								},
 								{
 									"include": "#percentage-type"
 								},
@@ -752,12 +861,13 @@
 					]
 				},
 				{
-					"begin": "\\b(hs(l|v)a?|hwb)(?=\\()",
+					"begin": "\\b(hsla|hsl|hwb|oklab|oklch|lab|lch)(?=\\()",
 					"beginCaptures": {
 						"1": {
 							"name": "support.function.color.less"
 						}
 					},
+					"comment": "hsla, hsl, hwb, oklab, oklch, lab, lch",
 					"end": "\\)",
 					"endCaptures": {
 						"0": {
@@ -775,12 +885,18 @@
 							},
 							"end": "(?=\\))",
 							"patterns": [
+								{
+									"include": "#color-values"
+								},
 								{
 									"include": "#less-strings"
 								},
 								{
 									"include": "#less-variables"
 								},
+								{
+									"include": "#var-function"
+								},
 								{
 									"include": "#comma-delimiter"
 								},
@@ -792,6 +908,47 @@
 								},
 								{
 									"include": "#number-type"
+								},
+								{
+									"include": "#calc-function"
+								},
+								{
+									"include": "#value-separator"
+								}
+							]
+						}
+					]
+				},
+				{
+					"begin": "\\b(light-dark)(?=\\()",
+					"beginCaptures": {
+						"1": {
+							"name": "support.function.color.less"
+						}
+					},
+					"comment": "light-dark()",
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.group.end.less"
+						}
+					},
+					"name": "meta.function-call.less",
+					"patterns": [
+						{
+							"begin": "\\(",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.definition.group.begin.less"
+								}
+							},
+							"end": "(?=\\))",
+							"patterns": [
+								{
+									"include": "#color-values"
+								},
+								{
+									"include": "#comma-delimiter"
 								}
 							]
 						}
@@ -813,6 +970,9 @@
 				{
 					"include": "#less-variables"
 				},
+				{
+					"include": "#var-function"
+				},
 				{
 					"match": "\\b(aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow)\\b",
 					"name": "support.constant.color.w3c-standard-color-name.less"
@@ -833,6 +993,9 @@
 					},
 					"match": "(#)(\\h{3}|\\h{4}|\\h{6}|\\h{8})\\b",
 					"name": "constant.other.color.rgb-value.less"
+				},
+				{
+					"include": "#relative-color"
 				}
 			]
 		},
@@ -848,12 +1011,17 @@
 			"patterns": [
 				{
 					"begin": "/\\*",
-					"captures": {
+					"beginCaptures": {
 						"0": {
 							"name": "punctuation.definition.comment.less"
 						}
 					},
 					"end": "\\*/",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.comment.less"
+						}
+					},
 					"name": "comment.block.less"
 				},
 				{
@@ -902,6 +1070,9 @@
 								{
 									"include": "#less-variables"
 								},
+								{
+									"include": "#var-function"
+								},
 								{
 									"match": "(?:--(?:[[-\\w][^\\x{00}-\\x{7F}]]|(?:\\\\\\h{1,6}[\\s\\t\\n\\f]?|\\\\[^\\n\\f\\h]))+|-?(?:[[_a-zA-Z][^\\x{00}-\\x{7F}]]|(?:\\\\\\h{1,6}[\\s\\t\\n\\f]?|\\\\[^\\n\\f\\h]))(?:[[-\\w][^\\x{00}-\\x{7F}]]|(?:\\\\\\h{1,6}[\\s\\t\\n\\f]?|\\\\[^\\n\\f\\h]))*)",
 									"name": "entity.other.counter-name.less"
@@ -961,6 +1132,9 @@
 										{
 											"include": "#less-variables"
 										},
+										{
+											"include": "#var-function"
+										},
 										{
 											"include": "#literal-string"
 										},
@@ -1030,12 +1204,16 @@
 			]
 		},
 		"cubic-bezier-function": {
-			"begin": "\\b(cubic-bezier)(?=\\()",
+			"begin": "\\b(cubic-bezier)(\\()",
 			"beginCaptures": {
-				"0": {
+				"1": {
 					"name": "support.function.timing.less"
+				},
+				"2": {
+					"name": "punctuation.definition.group.begin.less"
 				}
 			},
+			"contentName": "meta.group.less",
 			"end": "\\)",
 			"endCaptures": {
 				"0": {
@@ -1045,21 +1223,22 @@
 			"name": "meta.function-call.less",
 			"patterns": [
 				{
-					"begin": "\\(",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.group.begin.less"
-						}
-					},
-					"end": "(?=\\))",
-					"patterns": [
-						{
-							"include": "#comma-delimiter"
-						},
-						{
-							"include": "#number-type"
-						}
-					]
+					"include": "#less-functions"
+				},
+				{
+					"include": "#calc-function"
+				},
+				{
+					"include": "#less-variables"
+				},
+				{
+					"include": "#var-function"
+				},
+				{
+					"include": "#comma-delimiter"
+				},
+				{
+					"include": "#number-type"
 				}
 			]
 		},
@@ -1083,14 +1262,14 @@
 				{
 					"include": "#frequency-type"
 				},
-				{
-					"include": "#length-type"
-				},
-				{
-					"include": "#resolution-type"
-				},
 				{
 					"include": "#time-type"
+				},
+				{
+					"include": "#percentage-type"
+				},
+				{
+					"include": "#length-type"
 				}
 			]
 		},
@@ -1275,6 +1454,49 @@
 				}
 			]
 		},
+		"fit-content-function": {
+			"begin": "\\b(fit-content)(?=\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "support.function.grid.less"
+				}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.group.end.less"
+				}
+			},
+			"name": "meta.function-call.less",
+			"patterns": [
+				{
+					"begin": "\\(",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.group.begin.less"
+						}
+					},
+					"end": "(?=\\))",
+					"patterns": [
+						{
+							"include": "#less-variables"
+						},
+						{
+							"include": "#var-function"
+						},
+						{
+							"include": "#calc-function"
+						},
+						{
+							"include": "#percentage-type"
+						},
+						{
+							"include": "#length-type"
+						}
+					]
+				}
+			]
+		},
 		"format-function": {
 			"patterns": [
 				{
@@ -1319,6 +1541,10 @@
 			"match": "(?i:[-+]?(?:(?:\\d*\\.\\d+(?:[eE](?:[-+]?\\d+))*)|(?:[-+]?\\d+))(Hz|kHz))\\b",
 			"name": "constant.numeric.less"
 		},
+		"global-property-values": {
+			"match": "\\b(?:initial|inherit|unset|revert-layer|revert)\\b",
+			"name": "support.constant.property-value.less"
+		},
 		"gradient-functions": {
 			"patterns": [
 				{
@@ -1348,6 +1574,9 @@
 								{
 									"include": "#less-variables"
 								},
+								{
+									"include": "#var-function"
+								},
 								{
 									"include": "#angle-type"
 								},
@@ -1402,6 +1631,9 @@
 								{
 									"include": "#less-variables"
 								},
+								{
+									"include": "#var-function"
+								},
 								{
 									"include": "#color-values"
 								},
@@ -1541,6 +1773,15 @@
 				}
 			]
 		},
+		"important": {
+			"captures": {
+				"1": {
+					"name": "punctuation.separator.less"
+				}
+			},
+			"match": "(\\!)\\s*important",
+			"name": "keyword.other.important.less"
+		},
 		"integer-type": {
 			"match": "(?:[-+]?\\d+)",
 			"name": "constant.numeric.less"
@@ -1560,13 +1801,21 @@
 			}
 		},
 		"length-type": {
-			"captures": {
-				"1": {
-					"name": "keyword.other.unit.less"
+			"patterns": [
+				{
+					"captures": {
+						"1": {
+							"name": "keyword.other.unit.less"
+						}
+					},
+					"match": "(?:[-+]?)(?:\\d+\\.\\d+|\\.?\\d+)(?:[eE][-+]?\\d+)?(em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|m|q|in|pt|pc|px|fr|dpi|dpcm|dppx|x)",
+					"name": "constant.numeric.less"
+				},
+				{
+					"match": "\\b(?:[-+]?)0\\b",
+					"name": "constant.numeric.less"
 				}
-			},
-			"match": "0|(?i:[-+]?(?:(?:\\d*\\.\\d+(?:[eE](?:[-+]?\\d+))*)|(?:[-+]?\\d+))(em|ex|ch|rem|vw|vh|vmin|vmax|(c|m)?m|q|in|pt|pc|px|fr))\\b",
-			"name": "constant.numeric.less"
+			]
 		},
 		"less-boolean-function": {
 			"begin": "\\b(boolean)(?=\\()",
@@ -1628,6 +1877,9 @@
 								{
 									"include": "#less-variables"
 								},
+								{
+									"include": "#var-function"
+								},
 								{
 									"include": "#comma-delimiter"
 								},
@@ -1684,6 +1936,7 @@
 							"name": "support.function.color-definition.less"
 						}
 					},
+					"comment": "argb()",
 					"end": "\\)",
 					"endCaptures": {
 						"0": {
@@ -1704,12 +1957,68 @@
 								{
 									"include": "#less-variables"
 								},
+								{
+									"include": "#var-function"
+								},
 								{
 									"include": "#color-values"
 								}
 							]
 						}
 					]
+				},
+				{
+					"begin": "\\b(hsva?)(?=\\()",
+					"beginCaptures": {
+						"1": {
+							"name": "support.function.color.less"
+						}
+					},
+					"comment": "hsva(), hsv()",
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.group.end.less"
+						}
+					},
+					"name": "meta.function-call.less",
+					"patterns": [
+						{
+							"begin": "\\(",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.definition.group.begin.less"
+								}
+							},
+							"end": "(?=\\))",
+							"patterns": [
+								{
+									"include": "#integer-type"
+								},
+								{
+									"include": "#percentage-type"
+								},
+								{
+									"include": "#number-type"
+								},
+								{
+									"include": "#less-strings"
+								},
+								{
+									"include": "#less-variables"
+								},
+								{
+									"include": "#var-function"
+								},
+								{
+									"include": "#calc-function"
+								},
+								{
+									"include": "#comma-delimiter"
+								}
+							]
+						}
+					]
 				}
 			]
 		},
@@ -2438,9 +2747,6 @@
 								{
 									"include": "#less-variables"
 								},
-								{
-									"include": "#dimensions"
-								},
 								{
 									"include": "#numeric-values"
 								},
@@ -2732,14 +3038,6 @@
 						{
 							"include": "#comma-delimiter"
 						},
-						{
-							"captures": {
-								"1": {
-									"name": "punctuation.terminator.rule.less"
-								}
-							},
-							"match": "\\s*(;)|(?=[})])"
-						},
 						{
 							"include": "#property-values"
 						},
@@ -2747,17 +3045,14 @@
 							"include": "#rule-list-body"
 						}
 					]
-				}
-			]
-		},
-		"less-number-units": {
-			"patterns": [
-				{
-					"match": "\\b((c|m)?m|in|p(t|c)|m?s|g?rad|deg|turn)\\b",
-					"name": "keyword.other.unit.less"
 				},
 				{
-					"match": "\\b(r?em|ex|ch|vw|vh|vmin|vmax|cm|mm|q|in|pt|pc|px|fr|s|ms|Hz|kHz|dpi|dpcm|dppx|deg|grad|rad|turn)\\b"
+					"captures": {
+						"1": {
+							"name": "punctuation.terminator.rule.less"
+						}
+					},
+					"match": "(;)|(?=[})])"
 				}
 			]
 		},
@@ -3143,16 +3438,23 @@
 			"name": "variable.other.readwrite.less"
 		},
 		"less-variables": {
-			"captures": {
-				"1": {
-					"name": "punctuation.definition.variable.less"
+			"patterns": [
+				{
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.variable.less"
+						},
+						"2": {
+							"name": "support.other.variable.less"
+						}
+					},
+					"match": "\\s*(@@?)([-\\w]+)",
+					"name": "variable.other.readwrite.less"
 				},
-				"2": {
-					"name": "support.other.variable.less"
+				{
+					"include": "#less-variable-interpolation"
 				}
-			},
-			"match": "\\s*(@@?)([-\\w]+)",
-			"name": "variable.other.readwrite.less"
+			]
 		},
 		"literal-string": {
 			"patterns": [
@@ -3280,16 +3582,10 @@
 					"name": "meta.group.less",
 					"patterns": [
 						{
-							"begin": "((-webkit-|-o-)?((min|max)-)?(-moz-)?(((device-)?(height|width|aspect-ratio|pixel-ratio))|(color(-index)?)|monochrome|resolution))|grid|scan|orientation\\s*(?=[:)])",
+							"begin": "(--|(?:-?(?:(?:[a-zA-Z_]|[\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}\\x{200D}\\x{203F}\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}])|(?:\\\\(?:\\N|[[:^xdigit:]]|[[:xdigit:]]{1,6}[\\s\\R]))))(?:(?:[-\\da-zA-Z_]|[\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}\\x{200D}\\x{203F}\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}])|(?:\\\\(?:\\N|[[:^xdigit:]]|[[:xdigit:]]{1,6}[\\s\\R])))*)\\s*(?=[:)])",
 							"beginCaptures": {
 								"0": {
 									"name": "support.type.property-name.media.less"
-								},
-								"2": {
-									"name": "support.type.vendor-prefix.less"
-								},
-								"5": {
-									"name": "support.type.vendor-prefix.less"
 								}
 							},
 							"end": "(((\\+_?)?):)|(?=\\))",
@@ -3360,6 +3656,9 @@
 						{
 							"include": "#less-variables"
 						},
+						{
+							"include": "#var-function"
+						},
 						{
 							"include": "#length-type"
 						},
@@ -3375,7 +3674,7 @@
 			]
 		},
 		"number-type": {
-			"match": "[-+]?(?:(?:\\d*\\.\\d+(?:[eE](?:[-+]?\\d+))*)|(?:[-+]?\\d+))",
+			"match": "(?:[-+]?)(?:\\d+\\.\\d+|\\.?\\d+)(?:[eE][-+]?\\d+)?",
 			"name": "constant.numeric.less"
 		},
 		"numeric-values": {
@@ -3397,7 +3696,7 @@
 					"name": "keyword.other.unit.less"
 				}
 			},
-			"match": "[-+]?(?:(?:\\d*\\.\\d+(?:[eE](?:[-+]?\\d+))*)|(?:[-+]?\\d+))(%)",
+			"match": "(?:[-+]?)(?:\\d+\\.\\d+|\\.?\\d+)(?:[eE][-+]?\\d+)?(%)",
 			"name": "constant.numeric.less"
 		},
 		"property-list": {
@@ -3421,11 +3720,65 @@
 		"property-value-constants": {
 			"patterns": [
 				{
-					"match": "(?x)\\b(\n    absolute|active|add\n  |all(-(petite|small)-caps|-scroll)?\n  |alpha(betic)?\n  |alternate(-reverse)?\n  |always|annotation|antialiased|at\n  |auto(hiding-scrollbar)?\n  |avoid(-column|-page|-region)?\n  |background(-color|-image|-position|-size)?\n  |backwards|balance|baseline|below|bevel|bicubic|bidi-override|blink\n  |block(-line-height)?\n  |blur\n  |bold(er)?\n  |border(-bottom|-left|-right|-top)?-(color|radius|width|style)\n  |border-(bottom|top)-(left|right)-radius\n  |border-image(-outset|-repeat|-slice|-source|-width)?\n  |border(-bottom|-left|-right|-top|-collapse|-spacing|-box)?\n  |both|bottom\n  |box(-shadow)?\n  |break-(all|word)\n  |brightness\n  |butt(on)?\n  |capitalize\n  |cent(er|ral)\n  |char(acter-variant)?\n  |cjk-ideographic|clip|clone|close-quote\n  |closest-(corner|side)\n  |col-resize|collapse\n  |color(-stop|-burn|-dodge)?\n  |column((-count|-gap|-reverse|-rule(-color|-width)?|-width)|s)?\n  |common-ligatures|condensed|consider-shifts|contain\n  |content(-box|s)?\n  |contextual|contrast|cover\n  |crisp(-e|E)dges\n  |crop\n  |cross(hair)?\n  |da(rken|shed)\n  |default|dense|diagonal-fractions|difference|disabled\n  |discretionary-ligatures|disregard-shifts\n  |distribute(-all-lines|-letter|-space)?\n  |dotted|double|drop-shadow\n  |(nwse|nesw|ns|ew|sw|se|nw|ne|w|s|e|n)-resize\n  |ease(-in-out|-in|-out)?\n  |element|ellipsis|embed|end|EndColorStr|evenodd\n  |exclu(de(-ruby)?|sion)\n  |expanded\n  |(extra|semi|ultra)-(condensed|expanded)\n  |farthest-(corner|side)?\n  |fill(-box|-opacity)?\n  |filter|fixed|flat\n  |flex((-basis|-end|-grow|-shrink|-start)|box)?\n  |flip|flood-color\n  |font(-size(-adjust)?|-stretch|-weight)?\n  |forwards\n  |from(-image)?\n  |full-width|geometricPrecision|glyphs|gradient|grayscale\n  |grid(-height)?\n  |groove|hand|hanging|hard-light|height|help|hidden|hide\n  |historical-(forms|ligatures)\n  |horizontal(-tb)?\n  |hue\n  |ideograph(-alpha|-numeric|-parenthesis|-space|ic)\n  |inactive|include-ruby|infinite|inherit|initial\n  |inline(-block|-box|-flex(box)?|-line-height|-table)?\n  |inset|inside\n  |inter(-ideograph|-word|sect)\n  |invert|isolat(e|ion)|italic\n  |jis(04|78|83|90)\n  |justify(-all)?\n  |keep-all\n  |large[r]?\n  |last|layout|left|letter-spacing\n  |light(e[nr]|ing-color)\n  |line(-edge|-height|-through)?\n  |linear(-gradient|RGB)?\n  |lining-nums|list-item|local|loose|lowercase|lr-tb|ltr\n  |lumin(osity|ance)|manual\n  |manipulation\n  |margin(-bottom|-box|-left|-right|-top)?\n  |marker(-offset|s)?\n  |mathematical\n  |max-(content|height|lines|size|width)\n  |medium|middle\n  |min-(content|height|width)\n  |miter|mixed|move|multiply|newspaper\n  |no-(change|clip|(close|open)-quote|(common|discretionary|historical)-ligatures|contextual|drop|repeat)\n  |none|nonzero|normal|not-allowed|nowrap|oblique\n  |offset(-after|-before|-end|-start)?\n  |oldstyle-nums|opacity|open-quote\n  |optimize(Legibility|Precision|Quality|Speed)\n  |order|ordinal|ornaments\n  |outline(-color|-offset|-width)?\n  |outset|outside|over(line|-edge|lay)\n  |padding(-bottom|-box|-left|-right|-top|-box)?\n  |page|painted|paused\n  |pan-(x|left|right|y|up|down)\n  |perspective-origin\n  |petite-caps|pixelated|pointer\n  |pinch-zoom\n  |pre(-line|-wrap)?\n  |preserve-3d\n  |progid:DXImageTransform.Microsoft.(Alpha|Blur|dropshadow|gradient|Shadow)\n  |progress\n  |proportional-(nums|width)\n  |radial-gradient|recto|region|relative\n  |repeat(-[xy])?\n  |repeating-(linear|radial)-gradient\n  |replaced|reset-size|reverse|ridge|right\n  |round\n  |row(-resize|-reverse)?\n  |rtl|ruby|running|saturat(e|ion)|screen\n  |scroll(-position|bar)?\n  |separate|sepia\n  |scale-down\n  |shape-(image-threshold|margin|outside)\n  |show\n  |sideways(-lr|-rl)?\n  |simplified\n  |size\n  |slashed-zero|slice\n  |small(-caps|er)?\n  |smooth|snap|solid|soft-light\n  |space(-around|-between)?\n  |span|sRGB\n  |stack(ed-fractions)?\n  |start(ColorStr)?\n  |static\n  |step-(end|start)\n  |sticky\n  |stop-(color|opacity)\n  |stretch|strict\n  |stroke(-box|-dash(array|offset)|-miterlimit|-opacity|-width)?\n  |style(set)?\n  |stylistic\n  |sub(grid|pixel-antialiased|tract)?\n  |super|swash\n  |table(-caption|-cell|(-column|-footer|-header|-row)-group|-column|-row)?\n  |tabular-nums|tb-rl\n  |text((-bottom|-(decoration|emphasis)-color|-indent|-(over|under)-edge|-shadow|-size(-adjust)?|-top)|field)?\n  |thi(ck|n)\n  |titling-ca(ps|se)\n  |to[p]?\n  |touch|traditional\n  |transform(-origin)?\n  |under(-edge|line)?\n  |unicase|unset|uppercase|upright\n  |use-(glyph-orientation|script)\n  |verso\n  |vertical(-align|-ideographic|-lr|-rl|-text)?\n  |view-box\n  |viewport-fill(-opacity)?\n  |visibility\n  |visible(Fill|Painted|Stroke)?\n  |wait|wavy|weight|whitespace|(device-)?width|word-spacing\n  |wrap(-reverse)?\n  |x{1,2}-(large|small)\n  |z-index|zero\n  |zoom(-in|-out)?\n  |((?xi:arabic-indic|armenian|bengali|cambodian|circle|cjk-decimal|cjk-earthly-branch|cjk-heavenly-stem|decimal-leading-zero|decimal|devanagari|disclosure-closed|disclosure-open|disc|ethiopic-numeric|georgian|gujarati|gurmukhi|hebrew|hiragana-iroha|hiragana|japanese-formal|japanese-informal|kannada|katakana-iroha|katakana|khmer|korean-hangul-formal|korean-hanja-formal|korean-hanja-informal|lao|lower-alpha|lower-armenian|lower-greek|lower-latin|lower-roman|malayalam|mongolian|myanmar|oriya|persian|simp-chinese-formal|simp-chinese-informal|square|tamil|telugu|thai|tibetan|trad-chinese-formal|trad-chinese-informal|upper-alpha|upper-armenian|upper-latin|upper-roman)))\\b",
+					"comment": "align-content, align-items, align-self, justify-content, justify-items, justify-self",
+					"match": "(?x)\\b( flex-start | flex-end | start | end | space-between | space-around | space-evenly | stretch | baseline | safe | unsafe | legacy | anchor-center | first | last | self-start | self-end )\\b",
 					"name": "support.constant.property-value.less"
 				},
 				{
-					"match": "\\b(?i:sans-serif|serif|monospace|fantasy|cursive)\\b(?=\\s*[;,\\n}])",
+					"comment": "alignment-baseline",
+					"match": "(?x)\\b( text-before-edge | before-edge | middle | central | text-after-edge | after-edge | ideographic | alphabetic | hanging | mathematical | top | center | bottom )\\b",
+					"name": "support.constant.property-value.less"
+				},
+				{
+					"include": "#global-property-values"
+				},
+				{
+					"include": "#cubic-bezier-function"
+				},
+				{
+					"include": "#steps-function"
+				},
+				{
+					"comment": "animation-composition",
+					"match": "\\b(?:replace|add|accumulate)\\b",
+					"name": "support.constant.property-value.less"
+				},
+				{
+					"comment": "animation-direction",
+					"match": "\\b(?:normal|alternate-reverse|alternate|reverse)\\b",
+					"name": "support.constant.property-value.less"
+				},
+				{
+					"comment": "animation-fill-mode",
+					"match": "\\b(?:forwards|backwards|both)\\b",
+					"name": "support.constant.property-value.less"
+				},
+				{
+					"comment": "animation-iteration-count",
+					"match": "\\b(?:infinite)\\b",
+					"name": "support.constant.property-value.less"
+				},
+				{
+					"comment": "animation-play-state",
+					"match": "\\b(?:running|paused)\\b",
+					"name": "support.constant.property-value.less"
+				},
+				{
+					"comment": "animation-range, animation-range-start, animation-range-end",
+					"match": "\\b(?:entry-crossing|exit-crossing|entry|exit)\\b",
+					"name": "support.constant.property-value.less"
+				},
+				{
+					"comment": "animation-timing-function",
+					"match": "(?x)\\b(linear | ease-in-out | ease-in | ease-out | ease | step-start | step-end)\\b",
+					"name": "support.constant.property-value.less"
+				},
+				{
+					"match": "(?x)\\b( absolute | active | add | all-petite-caps | all-small-caps | all-scroll | all | alphabetic | alpha | alternate-reverse | alternate | always | annotation | antialiased | at | autohiding-scrollbar | auto | avoid-column | avoid-page | avoid-region | avoid | background-color | background-image | background-position | background-size | background-repeat | background | backwards | balance | baseline | below | bevel | bicubic | bidi-override | blink | block-line-height | block-start | block-end | block | blur | bolder | bold | border-top-left-radius | border-top-right-radius | border-bottom-left-radius | border-bottom-right-radius | border-end-end-radius | border-end-start-radius | border-start-end-radius | border-start-start-radius | border-block-start-color | border-block-start-style | border-block-start-width | border-block-start | border-block-end-color | border-block-end-style | border-block-end-width | border-block-end | border-block-color | border-block-style | border-block-width | border-block | border-inline-start-color | border-inline-start-style | border-inline-start-width | border-inline-start | border-inline-end-color | border-inline-end-style | border-inline-end-width | border-inline-end | border-inline-color | border-inline-style | border-inline-width | border-inline | border-top-color | border-top-style | border-top-width | border-top | border-right-color | border-right-style | border-right-width | border-right | border-bottom-color | border-bottom-style | border-bottom-width | border-bottom | border-left-color | border-left-style | border-left-width | border-left | border-image-outset | border-image-repeat | border-image-slice | border-image-source | border-image-width | border-image | border-color | border-style | border-width | border-radius | border-collapse | border-spacing | border | both | bottom | box-shadow | box | break-all | break-word | break-spaces | brightness | butt(on)? | capitalize | central | center | char(acter-variant)? | cjk-ideographic | clip | clone | close-quote | closest-corner | closest-side | col-resize | collapse | color-stop | color-burn | color-dodge | color | column-count | column-gap | column-reverse | column-rule-color | column-rule-width | column-rule | column-width | columns | column | common-ligatures | condensed | consider-shifts | contain | content-box | contents? | contextual | contrast | cover | crisp-edges | crispEdges | crop | crosshair | cross | darken | dashed | default | dense | device-width | diagonal-fractions | difference | disabled | discard | discretionary-ligatures | disregard-shifts | distribute-all-lines | distribute-letter | distribute-space | distribute | dotted | double | drop-shadow | [nsew]{1,4}-resize | ease-in-out | ease-in | ease-out | ease | element | ellipsis | embed | end | EndColorStr | evenodd | exclude-ruby | exclusion | expanded | extra-condensed | extra-expanded | farthest-corner | farthest-side | farthest | fill-box | fill-opacity | fill | filter | fit-content | fixed | flat | flex-basis | flex-end | flex-grow | flex-shrink | flex-start | flexbox | flex | flip | flood-color | font-size-adjust | font-size | font-stretch | font-weight | font | forwards | from-image | from | full-width | gap | geometricPrecision | glyphs | gradient | grayscale | grid-column-gap | grid-column | grid-row-gap | grid-row | grid-gap | grid-height | grid | groove | hand | hanging | hard-light | height | help | hidden | hide | historical-forms | historical-ligatures | horizontal-tb | horizontal | hue | ideographic | ideograph-alpha | ideograph-numeric | ideograph-parenthesis | ideograph-space | inactive | include-ruby | infinite | inherit | initial | inline-end | inline-size | inline-start | inline-table | inline-line-height | inline-flexbox | inline-flex | inline-box | inline-block | inline | inset | inside | inter-ideograph | inter-word | intersect | invert | isolate | isolation | italic | jis(04|78|83|90) | justify-all | justify | keep-all | larger | large | last | layout | left | letter-spacing | lighten | lighter | lighting-color | linear-gradient | linearRGB | linear | line-edge | line-height | line-through | line | lining-nums | list-item | local | loose | lowercase | lr-tb | ltr | luminosity | luminance | manual | manipulation | margin-bottom | margin-box | margin-left | margin-right | margin-top | margin | marker(-offset|s)? | match-parent | mathematical | max-(content|height|lines|size|width) | medium | middle | min-(content|height|width) | miter | mixed | move | multiply | newspaper | no-change | no-clip | no-close-quote | no-open-quote | no-common-ligatures | no-discretionary-ligatures | no-historical-ligatures | no-contextual | no-drop | no-repeat | none | nonzero | normal | not-allowed | nowrap | oblique | offset-after | offset-before | offset-end | offset-start | offset | oldstyle-nums | opacity | open-quote | optimize(Legibility|Precision|Quality|Speed) | order | ordinal | ornaments | outline-color | outline-offset | outline-width | outline | outset | outside | overline | over-edge | overlay | padding(-bottom|-box|-left|-right|-top|-box)? | page | paint(ed)? | paused | pan-(x|left|right|y|up|down) | perspective-origin | petite-caps | pixelated | pointer | pinch-zoom | pretty | pre(-line|-wrap)? | preserve-3d | preserve-breaks | preserve-spaces | preserve | progid:DXImageTransform\\.Microsoft\\.(Alpha|Blur|dropshadow|gradient|Shadow) | progress | proportional-nums | proportional-width | radial-gradient | recto | region | relative | repeating-linear-gradient | repeating-radial-gradient | repeat-x | repeat-y | repeat | replaced | reset-size | reverse | revert-layer | revert | ridge | right | round | row-gap | row-resize | row-reverse | row | rtl | ruby | running | saturate | saturation | screen | scrollbar | scroll-position | scroll | separate | sepia | scale-down | semi-condensed | semi-expanded | shape-image-threshold | shape-margin | shape-outside | show | sideways-lr | sideways-rl | sideways | simplified | size | slashed-zero | slice | small-caps | smaller | small | smooth | snap | solid | soft-light | space-around | space-between | space | span | sRGB | stable | stacked-fractions | stack | startColorStr | start | static | step-end | step-start | sticky | stop-color | stop-opacity | stretch | strict | stroke-box | stroke-dasharray | stroke-dashoffset | stroke-miterlimit | stroke-opacity | stroke-width | stroke | styleset | style | stylistic | subgrid | subpixel-antialiased | subtract | super | swash | table-caption | table-cell | table-column-group | table-footer-group | table-header-group | table-row-group | table-column | table-row | table | tabular-nums | tb-rl | text((-bottom|-(decoration|emphasis)-color|-indent|-(over|under)-edge|-shadow|-size(-adjust)?|-top)|field)? | thick |thin | titling-caps | titling-case | top | touch | to | traditional | transform-origin | transform-style | transform | ultra-condensed | ultra-expanded | under-edge | underline | unicase | unset | uppercase | upright | use-glyph-orientation | use-script | verso | vertical(-align|-ideographic|-lr|-rl|-text)? | view-box | viewport-fill-opacity | viewport-fill | visibility | visibleFill | visiblePainted | visibleStroke | visible | wait | wavy | weight | whitespace | width | word-spacing | wrap-reverse | wrap-reverse | wrap | xx?-(large|small) | z-index | zero | zoom-in | zoom-out | zoom | arabic-indic | armenian | bengali | cambodian | circle | cjk-decimal | cjk-earthly-branch | cjk-heavenly-stem | decimal-leading-zero | decimal | devanagari | disclosure-closed | disclosure-open | disc | ethiopic-numeric | georgian | gujarati | gurmukhi | hebrew | hiragana-iroha | hiragana | japanese-formal | japanese-informal | kannada | katakana-iroha | katakana | khmer | korean-hangul-formal | korean-hanja-formal | korean-hanja-informal | lao | lower-alpha | lower-armenian | lower-greek | lower-latin | lower-roman | malayalam | mongolian | myanmar | oriya | persian | simp-chinese-formal | simp-chinese-informal | square | tamil | telugu | thai | tibetan | trad-chinese-formal | trad-chinese-informal | upper-alpha | upper-armenian | upper-latin | upper-roman)\\b",
+					"name": "support.constant.property-value.less"
+				},
+				{
+					"match": "\\b(sans-serif|serif|monospace|fantasy|cursive)\\b(?=\\s*[;,\\n}])",
 					"name": "support.constant.font-name.less"
 				}
 			]
@@ -3435,18 +3788,12 @@
 				{
 					"include": "#comment-block"
 				},
-				{
-					"include": "#vendor-prefix"
-				},
 				{
 					"include": "#builtin-functions"
 				},
 				{
 					"include": "#color-functions"
 				},
-				{
-					"include": "#less-math"
-				},
 				{
 					"include": "#less-functions"
 				},
@@ -3465,25 +3812,25 @@
 				{
 					"include": "#property-value-constants"
 				},
+				{
+					"include": "#less-math"
+				},
 				{
 					"include": "#literal-string"
 				},
 				{
-					"captures": {
-						"1": {
-							"name": "punctuation.separator.less"
-						}
-					},
-					"match": "(\\!)\\s*important",
-					"name": "keyword.other.important.less"
+					"include": "#comma-delimiter"
+				},
+				{
+					"include": "#important"
 				}
 			]
 		},
-		"pseudo-classes": {
+		"pseudo-selectors": {
 			"patterns": [
 				{
-					"begin": "(:)(dir|lang)(?=\\()",
-					"captures": {
+					"begin": "(:)(dir)(?=\\()",
+					"beginCaptures": {
 						"1": {
 							"name": "punctuation.definition.entity.less"
 						}
@@ -3505,6 +3852,47 @@
 							},
 							"end": "(?=\\))",
 							"patterns": [
+								{
+									"match": "ltr|rtl",
+									"name": "variable.parameter.dir.less"
+								},
+								{
+									"include": "#less-variables"
+								}
+							]
+						}
+					]
+				},
+				{
+					"begin": "(:)(lang)(?=\\()",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.entity.less"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.group.end.less"
+						}
+					},
+					"name": "entity.other.attribute-name.pseudo-class.less",
+					"patterns": [
+						{
+							"begin": "\\(",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.definition.group.begin.less"
+								}
+							},
+							"end": "(?=\\))",
+							"patterns": [
+								{
+									"include": "#less-variables"
+								},
+								{
+									"include": "#literal-string"
+								},
 								{
 									"include": "#unquoted-string"
 								}
@@ -3514,7 +3902,7 @@
 				},
 				{
 					"begin": "(:)(not)(?=\\()",
-					"captures": {
+					"beginCaptures": {
 						"1": {
 							"name": "punctuation.definition.entity.less"
 						}
@@ -3545,7 +3933,7 @@
 				},
 				{
 					"begin": "(:)(nth(-last)?-(child|of-type))(?=\\()",
-					"captures": {
+					"beginCaptures": {
 						"1": {
 							"name": "punctuation.definition.entity.less"
 						},
@@ -3553,13 +3941,14 @@
 							"name": "entity.other.attribute-name.pseudo-class.less"
 						}
 					},
+					"contentName": "meta.function-call.less",
 					"end": "\\)",
 					"endCaptures": {
 						"0": {
 							"name": "punctuation.definition.group.end.less"
 						}
 					},
-					"name": "meta.function-call.less",
+					"name": "entity.other.attribute-name.pseudo-class.less",
 					"patterns": [
 						{
 							"begin": "\\(",
@@ -3578,10 +3967,16 @@
 								{
 									"captures": {
 										"1": {
+											"name": "keyword.operator.arithmetic.less"
+										},
+										"2": {
 											"name": "keyword.other.unit.less"
+										},
+										"4": {
+											"name": "keyword.operator.arithmetic.less"
 										}
 									},
-									"match": "(?:[-+]?(?:\\d+)?(n)(\\s*[-+]\\s*\\d+)?|[-+]?\\s*\\d+)",
+									"match": "(?:([-+])?(?:\\d+)?(n)(\\s*([-+])\\s*\\d+)?|[-+]?\\s*\\d+)",
 									"name": "constant.numeric.less"
 								},
 								{
@@ -3598,8 +3993,8 @@
 					]
 				},
 				{
-					"begin": "(:)(host-context)(?=\\()",
-					"captures": {
+					"begin": "(:)(host-context|host|has|is|not|where)(?=\\()",
+					"beginCaptures": {
 						"1": {
 							"name": "punctuation.definition.entity.less"
 						}
@@ -3637,27 +4032,24 @@
 							"name": "entity.other.attribute-name.pseudo-class.less"
 						}
 					},
-					"match": "(:)(active|any|checked|default|disabled|empty|enabled|first(-(child|of-type))?|fullscreen|focus|host|hover|indeterminate|in-range|invalid|last-(child|of-type)|left|link|only-(child|of-type)|optional|out-of-range|read-(only|write)|required|right|root|scope|target|valid|visited)",
+					"match": "(?x)(:)( active | any-link | autofill | blank | buffering | checked | current | default | defined | disabled | empty | enabled | first-child | first-of-type | first | focus-visible | focus-within | focus | fullscreen | future | host | hover | in-range | indeterminate | invalid | last-child | last-of-type | left | local-link | link | modal | muted | only-child | only-of-type | optional | out-of-range | past | paused | picture-in-picture | placeholder-shown | playing | popover-open | read-only | read-write | required | right | root | scope | seeking | stalled | target-within | target | user-invalid | user-valid | valid | visited | volume-locked )\\b",
 					"name": "meta.function-call.less"
-				}
-			]
-		},
-		"pseudo-elements": {
-			"patterns": [
+				},
 				{
-					"begin": "(::)(slotted)(?=\\()",
-					"captures": {
+					"begin": "(::?)(highlight|part|state)(?=\\s*(\\())",
+					"beginCaptures": {
 						"1": {
 							"name": "punctuation.definition.entity.less"
 						}
 					},
+					"comment": "::highlight()",
 					"end": "\\)",
 					"endCaptures": {
 						"0": {
 							"name": "punctuation.definition.group.end.less"
 						}
 					},
-					"name": "entity.other.attribute-name.pseudo-class.less",
+					"name": "entity.other.attribute-name.pseudo-element.less",
 					"patterns": [
 						{
 							"begin": "\\(",
@@ -3667,6 +4059,44 @@
 								}
 							},
 							"end": "(?=\\))",
+							"patterns": [
+								{
+									"match": "--|(?:-?(?:(?:[a-zA-Z_]|[\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}\\x{200D}\\x{203F}\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}])|(?:\\\\(?:\\N|[[:^xdigit:]]|[[:xdigit:]]{1,6}[\\s\\R]))))(?:(?:[-\\da-zA-Z_]|[\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}\\x{200D}\\x{203F}\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}])|(?:\\\\(?:\\N|[[:^xdigit:]]|[[:xdigit:]]{1,6}[\\s\\R])))*",
+									"name": "variable.parameter.less"
+								},
+								{
+									"include": "#less-variables"
+								}
+							]
+						}
+					]
+				},
+				{
+					"begin": "(::?)slotted(?=\\s*(\\())",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.entity.less"
+						}
+					},
+					"comment": "::slotted()",
+					"contentName": "meta.function-call.less",
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.group.end.less"
+						}
+					},
+					"name": "entity.other.attribute-name.pseudo-element.less",
+					"patterns": [
+						{
+							"begin": "\\(",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.definition.group.begin.less"
+								}
+							},
+							"end": "(?=\\))",
+							"name": "meta.group.less",
 							"patterns": [
 								{
 									"include": "#selectors"
@@ -3679,15 +4109,23 @@
 					"captures": {
 						"1": {
 							"name": "punctuation.definition.entity.less"
-						},
-						"2": {
-							"name": "punctuation.definition.entity.less"
-						},
-						"3": {
-							"name": "support.type.vendor-prefix.less"
 						}
 					},
-					"match": "(?:(:{1,2})(?:before|after|first-line|first-letter)|(::)(-(?:moz|ms|webkit)-)?(?:(-?(?:[[-\\w][^\\x{00}-\\x{7F}]]|(?:\\\\\\h{1,6}[\\s\\t\\n\\f]?|\\\\[^\\n\\f\\h]))(?:[[-\\w][^\\x{00}-\\x{7F}]]|(?:\\\\\\h{1,6}[\\s\\t\\n\\f]?|\\\\[^\\n\\f\\h]))*)))\\b",
+					"comment": "defined pseudo-elements",
+					"match": "(?x)(::?)(after | backdrop | before | cue | file-selector-button | first-letter | first-line | grammar-error | marker | placeholder | selection | spelling-error | target-text | view-transition-group | view-transition-image-pair | view-transition-new | view-transition-old | view-transition)\\b",
+					"name": "entity.other.attribute-name.pseudo-element.less"
+				},
+				{
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.entity.less"
+						},
+						"2": {
+							"name": "meta.namespace.vendor-prefix.less"
+						}
+					},
+					"comment": "other possible pseudo-elements",
+					"match": "(?x)(::?)(-\\w+-)(--|(?:-?(?:(?:[a-zA-Z_]|[\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}\\x{200D}\\x{203F}\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}])|(?:\\\\(?:\\N|[[:^xdigit:]]|[[:xdigit:]]{1,6}[\\s\\R]))))(?:(?:[-\\da-zA-Z_]|[\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}\\x{200D}\\x{203F}\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}])|(?:\\\\(?:\\N|[[:^xdigit:]]|[[:xdigit:]]{1,6}[\\s\\R])))*)\\b",
 					"name": "entity.other.attribute-name.pseudo-element.less"
 				}
 			]
@@ -3733,14 +4171,17 @@
 				}
 			]
 		},
-		"resolution-type": {
-			"captures": {
-				"1": {
-					"name": "keyword.other.unit.less"
+		"relative-color": {
+			"patterns": [
+				{
+					"match": "from",
+					"name": "keyword.other.less"
+				},
+				{
+					"match": "\\b[hslawbch]\\b",
+					"name": "keyword.other.less"
 				}
-			},
-			"match": "(?i:[-+]?(?:(?:\\d*\\.\\d+(?:[eE](?:[-+]?\\d+))*)|(?:[-+]?\\d+))(dpi|dpcm|dppx))\\b",
-			"name": "constant.numeric.less"
+			]
 		},
 		"rule-list": {
 			"patterns": [
@@ -3787,21 +4228,120 @@
 					"include": "#less-variable-assignment"
 				},
 				{
-					"include": "#less-variable-interpolation"
+					"begin": "(?=[-\\w]*?@\\{.*\\}[-\\w]*?\\s*:[^;{(]*(?=[;})]))",
+					"end": "(?=\\s*(;)|(?=[})]))",
+					"patterns": [
+						{
+							"begin": "(?=[^\\s:])",
+							"end": "(?=(((\\+_?)?):)[\\s\\t]*)",
+							"name": "support.type.property-name.less",
+							"patterns": [
+								{
+									"include": "#less-variable-interpolation"
+								}
+							]
+						},
+						{
+							"begin": "(((\\+_?)?):)(?=[\\s\\t]*)",
+							"beginCaptures": {
+								"1": {
+									"name": "punctuation.separator.key-value.less"
+								}
+							},
+							"contentName": "support.type.property-name.less",
+							"end": "(?=\\s*(;)|(?=[})]))",
+							"patterns": [
+								{
+									"include": "#property-values"
+								}
+							]
+						}
+					]
 				},
 				{
 					"begin": "(?=[-a-z])",
 					"end": "$|(?![-a-z])",
 					"patterns": [
-						{
-							"include": "#vendor-prefix"
-						},
 						{
 							"include": "#custom-property-name"
 						},
+						{
+							"begin": "(-[\\w-]+?-)((?:(?:[a-zA-Z_]|[\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}\\x{200D}\\x{203F}\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}])|(?:\\\\(?:\\N|[[:^xdigit:]]|[[:xdigit:]]{1,6}[\\s\\R])))(?:(?:[-\\da-zA-Z_]|[\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}\\x{200D}\\x{203F}\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}])|(?:\\\\(?:\\N|[[:^xdigit:]]|[[:xdigit:]]{1,6}[\\s\\R])))*)\\b",
+							"beginCaptures": {
+								"0": {
+									"name": "support.type.property-name.less"
+								},
+								"1": {
+									"name": "meta.namespace.vendor-prefix.less"
+								}
+							},
+							"comment": "vendor-prefixed properties",
+							"end": "\\s*(;)|(?=[})])",
+							"endCaptures": {
+								"1": {
+									"name": "punctuation.terminator.rule.less"
+								}
+							},
+							"patterns": [
+								{
+									"begin": "(((\\+_?)?):)(?=[\\s\\t]*)",
+									"beginCaptures": {
+										"1": {
+											"name": "punctuation.separator.key-value.less"
+										}
+									},
+									"contentName": "meta.property-value.less",
+									"end": "(?=\\s*(;)|(?=[})]))",
+									"patterns": [
+										{
+											"include": "#property-values"
+										},
+										{
+											"match": "[\\w-]+",
+											"name": "support.constant.property-value.less"
+										}
+									]
+								}
+							]
+						},
 						{
 							"include": "#filter-function"
 						},
+						{
+							"begin": "\\b(border((-(bottom|top)-(left|right))|((-(start|end)){2}))?-radius|(border-image(?!-)))\\b",
+							"beginCaptures": {
+								"0": {
+									"name": "support.type.property-name.less"
+								}
+							},
+							"comment": "border-radius and border-image properties utilize a slash as a separator",
+							"end": "\\s*(;)|(?=[})])",
+							"endCaptures": {
+								"1": {
+									"name": "punctuation.terminator.rule.less"
+								}
+							},
+							"patterns": [
+								{
+									"begin": "(((\\+_?)?):)(?=[\\s\\t]*)",
+									"beginCaptures": {
+										"1": {
+											"name": "punctuation.separator.key-value.less"
+										}
+									},
+									"contentName": "meta.property-value.less",
+									"end": "(?=\\s*(;)|(?=[})]))",
+									"patterns": [
+										{
+											"include": "#value-separator"
+										},
+										{
+											"include": "#property-values"
+										}
+									]
+								}
+							]
+						},
 						{
 							"captures": {
 								"1": {
@@ -3854,7 +4394,7 @@
 							]
 						},
 						{
-							"begin": "\\banimation(-(delay|direction|duration|fill-mode|iteration-count|name|play-state|timing-function))?\\b",
+							"begin": "\\banimation-timeline\\b",
 							"beginCaptures": {
 								"0": {
 									"name": "support.type.property-name.less"
@@ -3874,42 +4414,91 @@
 											"name": "punctuation.separator.key-value.less"
 										}
 									},
-									"captures": {
+									"contentName": "meta.property-value.less",
+									"end": "(?=\\s*(;)|(?=[})]))",
+									"patterns": [
+										{
+											"include": "#comment-block"
+										},
+										{
+											"include": "#custom-property-name"
+										},
+										{
+											"include": "#scroll-function"
+										},
+										{
+											"include": "#view-function"
+										},
+										{
+											"include": "#property-values"
+										},
+										{
+											"include": "#less-variables"
+										},
+										{
+											"include": "#arbitrary-repetition"
+										},
+										{
+											"include": "#important"
+										}
+									]
+								}
+							]
+						},
+						{
+							"begin": "\\banimation(?:-name)?(?=(?:\\+_?)?:)\\b",
+							"beginCaptures": {
+								"0": {
+									"name": "support.type.property-name.less"
+								}
+							},
+							"end": "\\s*(;)|(?=[})])",
+							"endCaptures": {
+								"1": {
+									"name": "punctuation.terminator.rule.less"
+								}
+							},
+							"patterns": [
+								{
+									"begin": "(((\\+_?)?):)(?=[\\s\\t]*)",
+									"beginCaptures": {
 										"1": {
-											"name": "punctuation.definition.arbitrary-repetition.less"
+											"name": "punctuation.separator.key-value.less"
 										}
 									},
 									"contentName": "meta.property-value.less",
 									"end": "(?=\\s*(;)|(?=[})]))",
 									"patterns": [
 										{
-											"match": "\\b(linear|ease(-in)?(-out)?|step-(start|end)|none|forwards|backwards|both|normal|alternate(-reverse)?|reverse|running|paused)\\b",
-											"name": "support.constant.property-value.less"
+											"include": "#comment-block"
 										},
 										{
-											"include": "#cubic-bezier-function"
+											"include": "#builtin-functions"
 										},
 										{
-											"include": "#steps-function"
+											"include": "#less-functions"
 										},
 										{
-											"include": "#time-type"
+											"include": "#less-variables"
 										},
 										{
-											"include": "#number-type"
+											"include": "#numeric-values"
+										},
+										{
+											"include": "#property-value-constants"
 										},
 										{
 											"match": "-?(?:[_a-zA-Z]|[^\\x{00}-\\x{7F}]|(?:(:?\\\\[0-9a-f]{1,6}(\\r\\n|[\\s\\t\\r\\n\\f])?)|\\\\[^\\r\\n\\f0-9a-f]))(?:[-_a-zA-Z0-9]|[^\\x{00}-\\x{7F}]|(?:(:?\\\\[0-9a-f]{1,6}(\\r\\n|[\\t\\r\\n\\f])?)|\\\\[^\\r\\n\\f0-9a-f]))*",
-											"name": "variable.other.constant.animation-name.less"
+											"name": "variable.other.constant.animation-name.less string.unquoted.less"
 										},
 										{
-											"include": "#literal-string"
+											"include": "#less-math"
 										},
 										{
-											"include": "#property-values"
+											"include": "#arbitrary-repetition"
 										},
 										{
-											"match": "\\s*(?:(,))"
+											"include": "#important"
 										}
 									]
 								}
@@ -3918,9 +4507,6 @@
 						{
 							"begin": "\\b(transition(-(property|duration|delay|timing-function))?)\\b",
 							"beginCaptures": {
-								"0": {
-									"name": "meta.property-name.less"
-								},
 								"1": {
 									"name": "support.type.property-name.less"
 								}
@@ -3933,35 +4519,31 @@
 							},
 							"patterns": [
 								{
-									"captures": {
+									"begin": "(((\\+_?)?):)(?=[\\s\\t]*)",
+									"beginCaptures": {
 										"1": {
 											"name": "punctuation.separator.key-value.less"
+										}
+									},
+									"contentName": "meta.property-value.less",
+									"end": "(?=\\s*(;)|(?=[})]))",
+									"patterns": [
+										{
+											"include": "#time-type"
 										},
-										"4": {
-											"name": "meta.property-value.less"
+										{
+											"include": "#property-values"
+										},
+										{
+											"include": "#cubic-bezier-function"
+										},
+										{
+											"include": "#steps-function"
+										},
+										{
+											"include": "#arbitrary-repetition"
 										}
-									},
-									"match": "(((\\+_?)?):)([\\s\\t]*)"
-								},
-								{
-									"include": "#time-type"
-								},
-								{
-									"include": "#property-values"
-								},
-								{
-									"include": "#cubic-bezier-function"
-								},
-								{
-									"include": "#steps-function"
-								},
-								{
-									"captures": {
-										"1": {
-											"name": "punctuation.definition.arbitrary-repetition.less"
-										}
-									},
-									"match": "\\s*(?:(,))"
+									]
 								}
 							]
 						},
@@ -4035,12 +4617,7 @@
 									"name": "support.constant.property-value.less"
 								},
 								{
-									"captures": {
-										"1": {
-											"name": "punctuation.definition.arbitrary-repetition.less"
-										}
-									},
-									"match": "\\s*(?:(,))"
+									"include": "#arbitrary-repetition"
 								}
 							]
 						},
@@ -4084,7 +4661,53 @@
 							]
 						},
 						{
-							"match": "(?x)\\b( accent-height | align-content | align-items | align-self | alignment-baseline | all | animation-timing-function | animation-play-state | animation-name | animation-iteration-count | animation-fill-mode | animation-duration | animation-direction | animation-delay | animation | appearance | ascent | azimuth | backface-visibility | background-size | background-repeat-y | background-repeat-x | background-repeat | background-position-y | background-position-x | background-position | background-origin | background-image | background-color | background-clip | background-blend-mode | background-attachment | background | baseline-shift | begin | bias | blend-mode | border-((top|right|bottom|left)-)?(width|style|color) | border-(top|bottom)-(right|left)-radius | border-image-(width|source|slice|repeat|outset) | border-(top|right|bottom|left|collapse|image|radius|spacing) | border | bottom | box-(align|decoration-break|direction|flex|ordinal-group|orient|pack|shadow|sizing) | break-(after|before|inside) | caption-side | clear | clip-path | clip-rule | clip | color(-(interpolation(-filters)?|profile|rendering))? | columns | column-(break-before|count|fill|gap|(rule(-(color|style|width))?)|span|width) | contain | content | counter-(increment|reset) | cursor | (c|d|f)(x|y) | direction | display | divisor | dominant-baseline | dur | elevation | empty-cells | enable-background | end | fallback | fill(-(opacity|rule))? | filter | flex(-(align|basis|direction|flow|grow|item-align|line-pack|negative|order|pack|positive|preferred-size|shrink|wrap))? | float | flood-(color|opacity) | font-display | font-family | font-feature-settings | font-kerning | font-language-override | font-size(-adjust)? | font-smoothing | font-stretch | font-style | font-synthesis | font-variant(-(alternates|caps|east-asian|ligatures|numeric|position))? | font-weight | font | fr | glyph-orientation-(horizontal|vertical) | grid-(area|gap) | grid-auto-(columns|flow|rows) | grid-(column|row)(-(end|gap|start))? | grid-template(-(areas|columns|rows))? | height | hyphens | image-(orientation|rendering|resolution) | isolation | justify-content | kerning | left | letter-spacing | lighting-color | line-(box-contain|break|clamp|height) | list-style(-(image|position|type))? | margin(-(bottom|left|right|top))? | marker(-(end|mid|start))? | mask(-(clip||composite|image|origin|position|repeat|size|type))? | (max|min)-(height|width) | mix-blend-mode | nbsp-mode | negative | object-(fit|position) | opacity | operator | order | orphans | outline(-(color|offset|style|width))? | overflow(-(scrolling|wrap|x|y))? | pad(ding(-(bottom|left|right|top))?)? | page(-break-(after|before|inside))? | paint-order | pause(-(after|before))? | perspective(-origin(-(x|y))?)? | pitch(-range)? | pointer-events | position | prefix | quotes | range | resize | right | rotate | scale | scroll-behavior | shape-(image-threshold|margin|outside|rendering) | size | speak(-as)? | src | stop-(color|opacity) | stroke(-(dash(array|offset)|line(cap|join)|miterlimit|opacity|width))? | suffix | symbols | system | tab-size | table-layout | tap-highlight-color | text-align(-last)? | text-decoration(-(color|line|style))? | text-emphasis(-(color|position|style))? | text-(anchor|fill-color|height|indent|justify|orientation|overflow|rendering|shadow|transform|underline-position) | top | touch-action | transform(-origin(-(x|y))?) | transform(-style)? | transition(-(delay|duration|property|timing-function))? | translate | unicode-(bidi|range) | user-(drag|select) | vertical-align | visibility | white-space | widows | width | will-change | word-(break|spacing|wrap) | writing-mode | z-index | zoom )\\b",
+							"begin": "\\bcontainer(?:-name)?(?=\\s*?:)",
+							"end": "\\s*(;)|(?=[})])",
+							"endCaptures": {
+								"1": {
+									"name": "punctuation.terminator.rule.less"
+								}
+							},
+							"name": "support.type.property-name.less",
+							"patterns": [
+								{
+									"begin": "(((\\+_?)?):)(?=[\\s\\t]*)",
+									"beginCaptures": {
+										"1": {
+											"name": "punctuation.separator.key-value.less"
+										}
+									},
+									"contentName": "meta.property-value.less",
+									"end": "(?=\\s*(;)|(?=[})]))",
+									"patterns": [
+										{
+											"match": "\\bdefault\\b",
+											"name": "invalid.illegal.property-value.less"
+										},
+										{
+											"include": "#global-property-values"
+										},
+										{
+											"include": "#custom-property-name"
+										},
+										{
+											"contentName": "variable.other.constant.container-name.less",
+											"match": "--|(?:-?(?:(?:[a-zA-Z_]|[\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}\\x{200D}\\x{203F}\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}])|(?:\\\\(?:\\N|[[:^xdigit:]]|[[:xdigit:]]{1,6}[\\s\\R]))))(?:(?:[-\\da-zA-Z_]|[\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}\\x{200D}\\x{203F}\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}])|(?:\\\\(?:\\N|[[:^xdigit:]]|[[:xdigit:]]{1,6}[\\s\\R])))*",
+											"name": "support.constant.property-value.less"
+										},
+										{
+											"include": "#property-values"
+										}
+									]
+								}
+							]
+						},
+						{
+							"match": "(?x)\\b( accent-height | align-content | align-items | align-self | alignment-baseline | all | animation-timing-function | animation-range-start | animation-range-end | animation-range | animation-play-state | animation-name | animation-iteration-count | animation-fill-mode | animation-duration | animation-direction | animation-delay | animation-composition | animation | appearance | ascent | aspect-ratio | azimuth | backface-visibility | background-size | background-repeat-y | background-repeat-x | background-repeat | background-position-y | background-position-x | background-position | background-origin | background-image | background-color | background-clip | background-blend-mode | background-attachment | background | baseline-shift | begin | bias | blend-mode | border-top-left-radius | border-top-right-radius | border-bottom-left-radius | border-bottom-right-radius | border-end-end-radius | border-end-start-radius | border-start-end-radius | border-start-start-radius | border-block-start-color | border-block-start-style | border-block-start-width | border-block-start | border-block-end-color | border-block-end-style | border-block-end-width | border-block-end | border-block-color | border-block-style | border-block-width | border-block | border-inline-start-color | border-inline-start-style | border-inline-start-width | border-inline-start | border-inline-end-color | border-inline-end-style | border-inline-end-width | border-inline-end | border-inline-color | border-inline-style | border-inline-width | border-inline | border-top-color | border-top-style | border-top-width | border-top | border-right-color | border-right-style | border-right-width | border-right | border-bottom-color | border-bottom-style | border-bottom-width | border-bottom | border-left-color | border-left-style | border-left-width | border-left | border-image-outset | border-image-repeat | border-image-slice | border-image-source | border-image-width | border-image | border-color | border-style | border-width | border-radius | border-collapse | border-spacing | border | bottom | box-(align|decoration-break|direction|flex|ordinal-group|orient|pack|shadow|sizing) | break-(after|before|inside) | caption-side | clear | clip-path | clip-rule | clip | color(-(interpolation(-filters)?|profile|rendering))? | columns | column-(break-before|count|fill|gap|(rule(-(color|style|width))?)|span|width) | container-name | container-type | container | contain-intrinsic-block-size | contain-intrinsic-inline-size | contain-intrinsic-height | contain-intrinsic-size | contain-intrinsic-width | contain | content | counter-(increment|reset) | cursor | [cdf][xy] | direction | display | divisor | dominant-baseline | dur | elevation | empty-cells | enable-background | end | fallback | fill(-(opacity|rule))? | filter | flex(-(align|basis|direction|flow|grow|item-align|line-pack|negative|order|pack|positive|preferred-size|shrink|wrap))? | float | flood-(color|opacity) | font-display | font-family | font-feature-settings | font-kerning | font-language-override | font-size(-adjust)? | font-smoothing | font-stretch | font-style | font-synthesis | font-variant(-(alternates|caps|east-asian|ligatures|numeric|position))? | font-weight | font | fr | ((column|row)-)?gap | glyph-orientation-(horizontal|vertical) | grid-(area|gap) | grid-auto-(columns|flow|rows) | grid-(column|row)(-(end|gap|start))? | grid-template(-(areas|columns|rows))? | grid | height | hyphens | image-(orientation|rendering|resolution) | inset(-(block|inline))?(-(start|end))? | isolation | justify-content | justify-items | justify-self | kerning | left | letter-spacing | lighting-color | line-(box-contain|break|clamp|height) | list-style(-(image|position|type))? | (margin|padding)(-(bottom|left|right|top)|(-(block|inline)?(-(end|start))?))? | marker(-(end|mid|start))? | mask(-(clip||composite|image|origin|position|repeat|size|type))? | (max|min)-(height|width) | mix-blend-mode | nbsp-mode | negative | object-(fit|position) | opacity | operator | order | orphans | outline(-(color|offset|style|width))? | overflow(-((inline|block)|scrolling|wrap|x|y))? | overscroll-behavior(-block|-(inline|x|y))? | pad(ding(-(bottom|left|right|top))?)? | page(-break-(after|before|inside))? | paint-order | pause(-(after|before))? | perspective(-origin(-(x|y))?)? | pitch(-range)? | place-content | place-self | pointer-events | position | prefix | quotes | range | resize | right | rotate | scale | scroll-behavior | shape-(image-threshold|margin|outside|rendering) | size | speak(-as)? | src | stop-(color|opacity) | stroke(-(dash(array|offset)|line(cap|join)|miterlimit|opacity|width))? | suffix | symbols | system | tab-size | table-layout | tap-highlight-color | text-align(-last)? | text-decoration(-(color|line|style))? | text-emphasis(-(color|position|style))? | text-(anchor|fill-color|height|indent|justify|orientation|overflow|rendering|size-adjust|shadow|transform|underline-position|wrap) | top | touch-action | transform(-origin(-(x|y))?) | transform(-style)? | transition(-(delay|duration|property|timing-function))? | translate | unicode-(bidi|range) | user-(drag|select) | vertical-align | visibility | white-space(-collapse)? | widows | width | will-change | word-(break|spacing|wrap) | writing-mode | z-index | zoom )\\b",
+							"name": "support.type.property-name.less"
+						},
+						{
+							"match": "(?x)\\b(((contain-intrinsic|max|min)-)?(block|inline)?-size)\\b",
 							"name": "support.type.property-name.less"
 						},
 						{
@@ -4093,7 +4716,15 @@
 					]
 				},
 				{
-					"begin": "\\b(((\\+_?)?):)([\\s\\t]*)",
+					"begin": "\\b((?:(?:\\+_?)?):)([\\s\\t]*)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.separator.key-value.less"
+						},
+						"2": {
+							"name": "meta.property-value.less"
+						}
+					},
 					"captures": {
 						"1": {
 							"name": "punctuation.separator.key-value.less"
@@ -4120,6 +4751,40 @@
 				}
 			]
 		},
+		"scroll-function": {
+			"begin": "\\b(scroll)(\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "support.function.scroll.less"
+				},
+				"2": {
+					"name": "punctuation.definition.group.begin.less"
+				}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.group.end.less"
+				}
+			},
+			"name": "meta.function-call.less",
+			"patterns": [
+				{
+					"match": "root|nearest|self",
+					"name": "support.constant.scroller.less"
+				},
+				{
+					"match": "block|inline|x|y",
+					"name": "support.constant.axis.less"
+				},
+				{
+					"include": "#less-variables"
+				},
+				{
+					"include": "#var-function"
+				}
+			]
+		},
 		"selector": {
 			"patterns": [
 				{
@@ -4140,13 +4805,7 @@
 							"include": "#less-variable-interpolation"
 						},
 						{
-							"captures": {
-								"1": {
-									"name": "punctuation.separator.less"
-								}
-							},
-							"match": "(\\!)\\s*important",
-							"name": "keyword.other.important.less"
+							"include": "#important"
 						}
 					]
 				}
@@ -4212,10 +4871,7 @@
 					]
 				},
 				{
-					"include": "#pseudo-elements"
-				},
-				{
-					"include": "#pseudo-classes"
+					"include": "#pseudo-selectors"
 				},
 				{
 					"include": "#less-extend"
@@ -4234,12 +4890,17 @@
 				},
 				{
 					"begin": "\\[",
-					"captures": {
+					"beginCaptures": {
 						"0": {
-							"name": "punctuation.definition.entity.less"
+							"name": "punctuation.section.braces.begin.less"
 						}
 					},
 					"end": "\\]",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.braces.end.less"
+						}
+					},
 					"name": "meta.attribute-selector.less",
 					"patterns": [
 						{
@@ -4254,7 +4915,7 @@
 						},
 						{
 							"begin": "\\s*([~*|^$]?=)\\s*",
-							"captures": {
+							"beginCaptures": {
 								"1": {
 									"name": "keyword.operator.attribute-selector.less"
 								}
@@ -4288,12 +4949,7 @@
 					]
 				},
 				{
-					"captures": {
-						"1": {
-							"name": "punctuation.definition.arbitrary-repetition.less"
-						}
-					},
-					"match": "\\s*(?:(,))"
+					"include": "#arbitrary-repetition"
 				},
 				{
 					"match": "\\*",
@@ -4462,10 +5118,65 @@
 			]
 		},
 		"steps-function": {
-			"begin": "\\b(steps)(?=\\()",
+			"begin": "\\b(steps)(\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "support.function.timing.less"
+				},
+				"2": {
+					"name": "punctuation.definition.group.begin.less"
+				}
+			},
+			"contentName": "meta.group.less",
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.group.end.less"
+				}
+			},
+			"name": "meta.function-call.less",
+			"patterns": [
+				{
+					"match": "jump-start|jump-end|jump-none|jump-both|start|end",
+					"name": "support.constant.step-position.less"
+				},
+				{
+					"include": "#comma-delimiter"
+				},
+				{
+					"include": "#integer-type"
+				},
+				{
+					"include": "#less-variables"
+				},
+				{
+					"include": "#var-function"
+				},
+				{
+					"include": "#calc-function"
+				}
+			]
+		},
+		"string-content": {
+			"patterns": [
+				{
+					"include": "#less-variable-interpolation"
+				},
+				{
+					"match": "\\\\\\s*\\n",
+					"name": "constant.character.escape.newline.less"
+				},
+				{
+					"match": "\\\\(\\h{1,6}|.)",
+					"name": "constant.character.escape.less"
+				}
+			]
+		},
+		"style-function": {
+			"begin": "\\b(style)(?=\\()",
 			"beginCaptures": {
 				"0": {
-					"name": "support.function.timing.less"
+					"name": "support.function.style.less"
 				}
 			},
 			"end": "\\)",
@@ -4486,34 +5197,12 @@
 					"end": "(?=\\))",
 					"patterns": [
 						{
-							"include": "#comma-delimiter"
-						},
-						{
-							"include": "#integer-type"
-						},
-						{
-							"match": "(end|middle|start)",
-							"name": "support.keyword.timing-direction.less"
+							"include": "#rule-list-body"
 						}
 					]
 				}
 			]
 		},
-		"string-content": {
-			"patterns": [
-				{
-					"include": "#less-variable-interpolation"
-				},
-				{
-					"match": "\\\\\\s*\\n",
-					"name": "constant.character.escape.newline.less"
-				},
-				{
-					"match": "\\\\(\\h{1,6}|.)",
-					"name": "constant.character.escape.less"
-				}
-			]
-		},
 		"symbols-function": {
 			"begin": "\\b(symbols)(?=\\()",
 			"beginCaptures": {
@@ -4968,50 +5657,103 @@
 				}
 			]
 		},
+		"value-separator": {
+			"captures": {
+				"1": {
+					"name": "punctuation.separator.less"
+				}
+			},
+			"match": "\\s*(/)\\s*"
+		},
 		"var-function": {
+			"begin": "\\b(var)(?=\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "support.function.var.less"
+				}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.group.end.less"
+				}
+			},
+			"name": "meta.function-call.less",
 			"patterns": [
 				{
-					"begin": "\\b(var)(?=\\()",
+					"begin": "\\(",
 					"beginCaptures": {
-						"1": {
-							"name": "support.function.var.less"
-						}
-					},
-					"end": "\\)",
-					"endCaptures": {
 						"0": {
-							"name": "punctuation.definition.group.end.less"
+							"name": "punctuation.definition.group.begin.less"
 						}
 					},
-					"name": "meta.function-call.less",
+					"end": "(?=\\))",
 					"patterns": [
 						{
-							"begin": "\\(",
-							"beginCaptures": {
-								"0": {
-									"name": "punctuation.definition.group.begin.less"
-								}
-							},
-							"end": "(?=\\))",
-							"patterns": [
-								{
-									"include": "#comma-delimiter"
-								},
-								{
-									"include": "#custom-property-name"
-								},
-								{
-									"include": "#less-variables"
-								}
-							]
+							"include": "#comma-delimiter"
+						},
+						{
+							"include": "#custom-property-name"
+						},
+						{
+							"include": "#less-variables"
+						},
+						{
+							"include": "#property-values"
 						}
 					]
 				}
 			]
 		},
-		"vendor-prefix": {
-			"match": "-(?:webkit|moz(-osx)?|ms|o)-",
-			"name": "support.type.vendor-prefix.less"
+		"view-function": {
+			"begin": "\\b(view)(?=\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "support.function.view.less"
+				}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.group.end.less"
+				}
+			},
+			"name": "meta.function-call.less",
+			"patterns": [
+				{
+					"begin": "\\(",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.group.begin.less"
+						}
+					},
+					"end": "(?=\\))",
+					"patterns": [
+						{
+							"match": "block|inline|x|y|auto",
+							"name": "support.constant.property-value.less"
+						},
+						{
+							"include": "#percentage-type"
+						},
+						{
+							"include": "#length-type"
+						},
+						{
+							"include": "#less-variables"
+						},
+						{
+							"include": "#var-function"
+						},
+						{
+							"include": "#calc-function"
+						},
+						{
+							"include": "#arbitrary-repetition"
+						}
+					]
+				}
+			]
 		}
 	}
 }
\ No newline at end of file
diff --git a/extensions/less/yarn.lock b/extensions/less/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/less/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/log/yarn.lock b/extensions/log/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/log/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/lua/yarn.lock b/extensions/lua/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/lua/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/make/yarn.lock b/extensions/make/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/make/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/markdown-basics/cgmanifest.json b/extensions/markdown-basics/cgmanifest.json
index 60c6b192bed..380b0c74ac6 100644
--- a/extensions/markdown-basics/cgmanifest.json
+++ b/extensions/markdown-basics/cgmanifest.json
@@ -33,7 +33,7 @@
 				"git": {
 					"name": "microsoft/vscode-markdown-tm-grammar",
 					"repositoryUrl": "https://github.com/microsoft/vscode-markdown-tm-grammar",
-					"commitHash": "f75d5f55730e72ee7ff386841949048b2395e440"
+					"commitHash": "7418dd20d76c72e82fadee2909e03239e9973b35"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/markdown-basics/language-configuration.json b/extensions/markdown-basics/language-configuration.json
index f1e7859ccca..6e1766db02c 100644
--- a/extensions/markdown-basics/language-configuration.json
+++ b/extensions/markdown-basics/language-configuration.json
@@ -79,6 +79,10 @@
 		[
 			"<",
 			">"
+		],
+		[
+			"~",
+			"~"
 		]
 	],
 	"folding": {
diff --git a/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json b/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json
index c84c468b80c..9761ca716ab 100644
--- a/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json
+++ b/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/microsoft/vscode-markdown-tm-grammar/commit/f75d5f55730e72ee7ff386841949048b2395e440",
+	"version": "https://github.com/microsoft/vscode-markdown-tm-grammar/commit/7418dd20d76c72e82fadee2909e03239e9973b35",
 	"name": "Markdown",
 	"scopeName": "text.html.markdown",
 	"patterns": [
@@ -2480,14 +2480,34 @@
 			"name": "meta.separator.markdown"
 		},
 		"frontMatter": {
-			"begin": "\\A-{3}\\s*$",
-			"contentName": "meta.embedded.block.frontmatter",
+			"begin": "\\A(?=(-{3,}))",
+			"end": "^ {,3}\\1-*[ \\t]*$|^[ \\t]*\\.{3}$",
+			"applyEndPatternLast": 1,
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.end.frontmatter"
+				}
+			},
 			"patterns": [
 				{
-					"include": "source.yaml"
+					"begin": "\\A(-{3,})(.*)$",
+					"while": "^(?! {,3}\\1-*[ \\t]*$|[ \\t]*\\.{3}$)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.begin.frontmatter"
+						},
+						"2": {
+							"name": "comment.frontmatter"
+						}
+					},
+					"contentName": "meta.embedded.block.frontmatter",
+					"patterns": [
+						{
+							"include": "source.yaml"
+						}
+					]
 				}
-			],
-			"end": "(^|\\G)-{3}|\\.{3}\\s*$"
+			]
 		},
 		"table": {
 			"name": "markup.table.markdown",
diff --git a/extensions/markdown-basics/yarn.lock b/extensions/markdown-basics/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/markdown-basics/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/markdown-language-features/.npmrc b/extensions/markdown-language-features/.npmrc
new file mode 100644
index 00000000000..a9c57709666
--- /dev/null
+++ b/extensions/markdown-language-features/.npmrc
@@ -0,0 +1,2 @@
+legacy-peer-deps="true"
+timeout=180000
diff --git a/extensions/markdown-language-features/.vscodeignore b/extensions/markdown-language-features/.vscodeignore
index 588916d37c3..0d35b62002d 100644
--- a/extensions/markdown-language-features/.vscodeignore
+++ b/extensions/markdown-language-features/.vscodeignore
@@ -9,17 +9,10 @@ out/**
 extension.webpack.config.js
 extension-browser.webpack.config.js
 cgmanifest.json
-yarn.lock
+package-lock.json
 preview-src/**
 webpack.config.js
 esbuild-notebook.js
 esbuild-preview.js
 .gitignore
-server/src/**
-server/extension.webpack.config.js
-server/extension-browser.webpack.config.js
-server/tsconfig.json
-server/.vscode/**
-server/node_modules/**
-server/yarn.lock
-server/.npmignore
+**/*.d.ts
diff --git a/extensions/markdown-language-features/extension-browser.webpack.config.js b/extensions/markdown-language-features/extension-browser.webpack.config.js
index bad27aab02e..47f50aa5e8f 100644
--- a/extensions/markdown-language-features/extension-browser.webpack.config.js
+++ b/extensions/markdown-language-features/extension-browser.webpack.config.js
@@ -7,13 +7,25 @@
 
 'use strict';
 
-const withBrowserDefaults = require('../shared.webpack.config').browser;
+const CopyPlugin = require('copy-webpack-plugin');
+const { browserPlugins, browser } = require('../shared.webpack.config');
 
-module.exports = withBrowserDefaults({
+module.exports = browser({
 	context: __dirname,
 	entry: {
 		extension: './src/extension.browser.ts'
-	}
+	},
+	plugins: [
+		...browserPlugins(__dirname), // add plugins, don't replace inherited
+		new CopyPlugin({
+			patterns: [
+				{
+					from: './node_modules/vscode-markdown-languageserver/dist/browser/workerMain.js',
+					to: 'serverWorkerMain.js',
+				}
+			],
+		}),
+	],
 }, {
 	configFile: 'tsconfig.browser.json'
 });
diff --git a/extensions/markdown-language-features/extension.webpack.config.js b/extensions/markdown-language-features/extension.webpack.config.js
index de88398eca0..588d0632fd2 100644
--- a/extensions/markdown-language-features/extension.webpack.config.js
+++ b/extensions/markdown-language-features/extension.webpack.config.js
@@ -7,6 +7,7 @@
 
 'use strict';
 
+const CopyPlugin = require('copy-webpack-plugin');
 const withDefaults = require('../shared.webpack.config');
 
 module.exports = withDefaults({
@@ -16,5 +17,16 @@ module.exports = withDefaults({
 	},
 	entry: {
 		extension: './src/extension.ts',
-	}
+	},
+	plugins: [
+		...withDefaults.nodePlugins(__dirname), // add plugins, don't replace inherited
+		new CopyPlugin({
+			patterns: [
+				{
+					from: './node_modules/vscode-markdown-languageserver/dist/node/workerMain.js',
+					to: 'serverWorkerMain.js',
+				}
+			],
+		}),
+	],
 });
diff --git a/extensions/markdown-language-features/media/markdown.css b/extensions/markdown-language-features/media/markdown.css
index 168f6a8a862..800be985a43 100644
--- a/extensions/markdown-language-features/media/markdown.css
+++ b/extensions/markdown-language-features/media/markdown.css
@@ -205,7 +205,7 @@ table > tbody > tr + tr > td {
 
 blockquote {
 	margin: 0;
-	padding: 2px 16px 0 10px;
+	padding: 0px 16px 0 10px;
 	border-left-width: 5px;
 	border-left-style: solid;
 	border-radius: 2px;
diff --git a/extensions/markdown-language-features/package-lock.json b/extensions/markdown-language-features/package-lock.json
new file mode 100644
index 00000000000..4e0de48a0f9
--- /dev/null
+++ b/extensions/markdown-language-features/package-lock.json
@@ -0,0 +1,695 @@
+{
+  "name": "markdown-language-features",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "markdown-language-features",
+      "version": "1.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "@vscode/extension-telemetry": "^0.9.0",
+        "dompurify": "^3.1.3",
+        "highlight.js": "^11.8.0",
+        "markdown-it": "^12.3.2",
+        "markdown-it-front-matter": "^0.2.4",
+        "morphdom": "^2.6.1",
+        "picomatch": "^2.3.1",
+        "punycode": "^2.3.1",
+        "vscode-languageclient": "^8.0.2",
+        "vscode-languageserver-textdocument": "^1.0.11",
+        "vscode-markdown-languageserver": "^0.5.0-alpha.8",
+        "vscode-uri": "^3.0.3"
+      },
+      "devDependencies": {
+        "@types/dompurify": "^3.0.2",
+        "@types/lodash.throttle": "^4.1.3",
+        "@types/markdown-it": "12.2.3",
+        "@types/picomatch": "^2.3.0",
+        "@types/vscode-notebook-renderer": "^1.60.0",
+        "@types/vscode-webview": "^1.57.0",
+        "@vscode/markdown-it-katex": "^1.0.2",
+        "lodash.throttle": "^4.1.1",
+        "vscode-languageserver-types": "^3.17.2",
+        "vscode-markdown-languageservice": "^0.3.0-alpha.3"
+      },
+      "engines": {
+        "vscode": "^1.70.0"
+      }
+    },
+    "node_modules/@microsoft/1ds-core-js": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.0.3.tgz",
+      "integrity": "sha512-FrxNLVAPsAvD7+l63TlNS/Kodvpct2WulpDSn1dI4Xuy0kF4E2H867kHdwL/iY1Bj3zA3FSy/jvE4+OcDws7ug==",
+      "dependencies": {
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/1ds-post-js": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.0.3.tgz",
+      "integrity": "sha512-uewvmUtXKd7ttypiKQGdYI6i7UUpPkOznLayzIFrJ4r2xnG6jhPjpKRncHFXPQcM4XSWO3yf5PQ3xAbPq9t7ZQ==",
+      "dependencies": {
+        "@microsoft/1ds-core-js": "4.0.3",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-channel-js": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.0.4.tgz",
+      "integrity": "sha512-6TlfExmErQ8Y+/ChbkyWl+jyt4wg3T6p7lwXDsUCB0LgZmlEWMaCUS0YlT73JCWmE8j7vxW8yUm0lgsgmHns3A==",
+      "dependencies": {
+        "@microsoft/applicationinsights-common": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-common": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.0.4.tgz",
+      "integrity": "sha512-r5gWaw/K9+tKfuo2GtDiDiKASgOkPOCrKW+wZzFvuR06uuwvWjbVQ6yW/YbnfuhRF5M65ksUiMi0eCMwEOGq7Q==",
+      "dependencies": {
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-core-js": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.0.4.tgz",
+      "integrity": "sha512-anxy5kEkqBmVoEqJiJzaaXXA0wzqZi9U4zGd05xFJ04lWckP8dG3zyT3+GGdg7rDelqLTNGxndeYoFmDv63u1g==",
+      "dependencies": {
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-shims": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
+      "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-web-basic": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.0.4.tgz",
+      "integrity": "sha512-KfoxPlLlf0JT12ADb23C5iGye/yFouoMgHEKULxkSQcYY9SsW/8rVrqqvoYKAL+u215CZU2A8Kc8sR3ehEaPCQ==",
+      "dependencies": {
+        "@microsoft/applicationinsights-channel-js": "3.0.4",
+        "@microsoft/applicationinsights-common": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/dynamicproto-js": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.2.tgz",
+      "integrity": "sha512-MB8trWaFREpmb037k/d0bB7T2BP7Ai24w1e1tbz3ASLB0/lwphsq3Nq8S9I5AsI5vs4zAQT+SB5nC5/dLYTiOg==",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+      }
+    },
+    "node_modules/@nevware21/ts-async": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.3.0.tgz",
+      "integrity": "sha512-ZUcgUH12LN/F6nzN0cYd0F/rJaMLmXr0EHVTyYfaYmK55bdwE4338uue4UiVoRqHVqNW4KDUrJc49iGogHKeWA==",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.10.0 < 2.x"
+      }
+    },
+    "node_modules/@nevware21/ts-utils": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.10.1.tgz",
+      "integrity": "sha512-pMny25NnF2/MJwdqC3Iyjm2pGIXNxni4AROpcqDeWa+td9JMUY4bUS9uU9XW+BoBRqTLUL+WURF9SOd/6OQzRg=="
+    },
+    "node_modules/@types/dompurify": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/dompurify/-/dompurify-3.0.2.tgz",
+      "integrity": "sha512-YBL4ziFebbbfQfH5mlC+QTJsvh0oJUrWbmxKMyEdL7emlHJqGR2Qb34TEFKj+VCayBvjKy3xczMFNhugThUsfQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/trusted-types": "*"
+      }
+    },
+    "node_modules/@types/linkify-it": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz",
+      "integrity": "sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==",
+      "dev": true
+    },
+    "node_modules/@types/lodash": {
+      "version": "4.14.104",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.104.tgz",
+      "integrity": "sha512-ufQcVg4daO8xQ5kopxRHanqFdL4AI7ondQkV+2f+7mz3gvp0LkBx2zBRC6hfs3T87mzQFmf5Fck7Fi145Ul6NQ==",
+      "dev": true
+    },
+    "node_modules/@types/lodash.throttle": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/@types/lodash.throttle/-/lodash.throttle-4.1.3.tgz",
+      "integrity": "sha512-FUm7uMuYRX7dzqmgX02bxdBwC75owUxGA4dDKtFePDLJ6N1ofXxkRX3NhJV8wOrNs/wCjaY6sDVJrD1lbyERoQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/lodash": "*"
+      }
+    },
+    "node_modules/@types/markdown-it": {
+      "version": "12.2.3",
+      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.2.3.tgz",
+      "integrity": "sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/linkify-it": "*",
+        "@types/mdurl": "*"
+      }
+    },
+    "node_modules/@types/mdurl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-2.0.0.tgz",
+      "integrity": "sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==",
+      "dev": true
+    },
+    "node_modules/@types/picomatch": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@types/picomatch/-/picomatch-2.3.0.tgz",
+      "integrity": "sha512-O397rnSS9iQI4OirieAtsDqvCj4+3eY1J+EPdNTKuHuRWIfUoGyzX294o8C4KJYaLqgSrd2o60c5EqCU8Zv02g==",
+      "dev": true
+    },
+    "node_modules/@types/trusted-types": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.2.tgz",
+      "integrity": "sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg==",
+      "dev": true
+    },
+    "node_modules/@types/vscode-notebook-renderer": {
+      "version": "1.60.0",
+      "resolved": "https://registry.npmjs.org/@types/vscode-notebook-renderer/-/vscode-notebook-renderer-1.60.0.tgz",
+      "integrity": "sha512-u7TD2uuEZTVuitx0iijOJdKI0JLiQP6PsSBSRy2XmHXUOXcp5p1S56NrjOEDoF+PIHd3NL3eO6KTRSf5nukDqQ==",
+      "dev": true
+    },
+    "node_modules/@types/vscode-webview": {
+      "version": "1.57.0",
+      "resolved": "https://registry.npmjs.org/@types/vscode-webview/-/vscode-webview-1.57.0.tgz",
+      "integrity": "sha512-x3Cb/SMa1IwRHfSvKaZDZOTh4cNoG505c3NjTqGlMC082m++x/ETUmtYniDsw6SSmYzZXO8KBNhYxR0+VqymqA==",
+      "dev": true
+    },
+    "node_modules/@vscode/extension-telemetry": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.0.tgz",
+      "integrity": "sha512-37RxGHXrs3GoXPgCUKQhghEu0gxs8j27RLjQwwtSf4WhPdJKz8UrqMYzpsXlliQ05zURYmtdGZst9C6+hfWXaQ==",
+      "dependencies": {
+        "@microsoft/1ds-core-js": "^4.0.3",
+        "@microsoft/1ds-post-js": "^4.0.3",
+        "@microsoft/applicationinsights-web-basic": "^3.0.4"
+      },
+      "engines": {
+        "vscode": "^1.75.0"
+      }
+    },
+    "node_modules/@vscode/l10n": {
+      "version": "0.0.11",
+      "resolved": "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.11.tgz",
+      "integrity": "sha512-ukOMWnCg1tCvT7WnDfsUKQOFDQGsyR5tNgRpwmqi+5/vzU3ghdDXzvIM4IOPdSb3OeSsBNvmSL8nxIVOqi2WXA=="
+    },
+    "node_modules/@vscode/markdown-it-katex": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@vscode/markdown-it-katex/-/markdown-it-katex-1.0.2.tgz",
+      "integrity": "sha512-QY/OnOHPTqc8tQoCoAjVblILX4yE6xGZHKODtiTKqA328OXra+lSpeJO5Ouo9AAvrs9AwcCLz6xvW3zwcsPBQg==",
+      "dev": true,
+      "dependencies": {
+        "katex": "^0.16.4"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+    },
+    "node_modules/boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/commander": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
+      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+      "dev": true,
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+    },
+    "node_modules/css-select": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
+      "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
+      "dependencies": {
+        "boolbase": "^1.0.0",
+        "css-what": "^6.1.0",
+        "domhandler": "^5.0.2",
+        "domutils": "^3.0.1",
+        "nth-check": "^2.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/css-what": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
+      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
+      "engines": {
+        "node": ">= 6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/dom-serializer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
+      "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
+      "dependencies": {
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.2",
+        "entities": "^4.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+      }
+    },
+    "node_modules/domelementtype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ]
+    },
+    "node_modules/domhandler": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
+      "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
+      "dependencies": {
+        "domelementtype": "^2.3.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
+      }
+    },
+    "node_modules/dompurify": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.3.tgz",
+      "integrity": "sha512-5sOWYSNPaxz6o2MUPvtyxTTqR4D3L77pr5rUQoWgD5ROQtVIZQgJkXbo1DLlK3vj11YGw5+LnF4SYti4gZmwng=="
+    },
+    "node_modules/domutils": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
+      "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
+      "dependencies": {
+        "dom-serializer": "^2.0.0",
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
+      }
+    },
+    "node_modules/entities": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "bin": {
+        "he": "bin/he"
+      }
+    },
+    "node_modules/highlight.js": {
+      "version": "11.8.0",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.8.0.tgz",
+      "integrity": "sha512-MedQhoqVdr0U6SSnWPzfiadUcDHfN/Wzq25AkXiQv9oiOO/sG0S7XkvpFIqWBl9Yq1UYyYOOVORs5UW2XlPyzg==",
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/katex": {
+      "version": "0.16.10",
+      "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.10.tgz",
+      "integrity": "sha512-ZiqaC04tp2O5utMsl2TEZTXxa6WSC4yo0fv5ML++D3QZv/vx2Mct0mTlRx3O+uUkjfuAgOkzsCmq5MiUEsDDdA==",
+      "dev": true,
+      "funding": [
+        "https://opencollective.com/katex",
+        "https://github.com/sponsors/katex"
+      ],
+      "dependencies": {
+        "commander": "^8.3.0"
+      },
+      "bin": {
+        "katex": "cli.js"
+      }
+    },
+    "node_modules/linkify-it": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
+      "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
+      "dependencies": {
+        "uc.micro": "^1.0.1"
+      }
+    },
+    "node_modules/lodash.throttle": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
+      "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ= sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==",
+      "dev": true
+    },
+    "node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/markdown-it": {
+      "version": "12.3.2",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
+      "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
+      "dependencies": {
+        "argparse": "^2.0.1",
+        "entities": "~2.1.0",
+        "linkify-it": "^3.0.1",
+        "mdurl": "^1.0.1",
+        "uc.micro": "^1.0.5"
+      },
+      "bin": {
+        "markdown-it": "bin/markdown-it.js"
+      }
+    },
+    "node_modules/markdown-it-front-matter": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/markdown-it-front-matter/-/markdown-it-front-matter-0.2.4.tgz",
+      "integrity": "sha512-25GUs0yjS2hLl8zAemVndeEzThB1p42yxuDEKbd4JlL3jiz+jsm6e56Ya8B0VREOkNxLYB4TTwaoPJ3ElMmW+w=="
+    },
+    "node_modules/markdown-it/node_modules/entities": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
+      "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/mdurl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
+      "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g=="
+    },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/morphdom": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/morphdom/-/morphdom-2.6.1.tgz",
+      "integrity": "sha512-Y8YRbAEP3eKykroIBWrjcfMw7mmwJfjhqdpSvoqinu8Y702nAwikpXcNFDiIkyvfCLxLM9Wu95RZqo4a9jFBaA=="
+    },
+    "node_modules/node-html-parser": {
+      "version": "6.1.13",
+      "resolved": "https://registry.npmjs.org/node-html-parser/-/node-html-parser-6.1.13.tgz",
+      "integrity": "sha512-qIsTMOY4C/dAa5Q5vsobRpOOvPfC4pB61UVW2uSwZNUp0QU/jCekTal1vMmbO0DgdHeLUJpv/ARmDqErVxA3Sg==",
+      "dependencies": {
+        "css-select": "^5.1.0",
+        "he": "1.2.0"
+      }
+    },
+    "node_modules/nth-check": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
+      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
+      "dependencies": {
+        "boolbase": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/nth-check?sponsor=1"
+      }
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/punycode": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/semver": {
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/uc.micro": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
+      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
+    },
+    "node_modules/vscode-jsonrpc": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.2.tgz",
+      "integrity": "sha512-RY7HwI/ydoC1Wwg4gJ3y6LpU9FJRZAUnTYMXthqhFXXu77ErDd/xkREpGuk4MyYkk4a+XDWAMqe0S3KkelYQEQ==",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/vscode-languageclient": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-8.0.2.tgz",
+      "integrity": "sha512-lHlthJtphG9gibGb/y72CKqQUxwPsMXijJVpHEC2bvbFqxmkj9LwQ3aGU9dwjBLqsX1S4KjShYppLvg1UJDF/Q==",
+      "dependencies": {
+        "minimatch": "^3.0.4",
+        "semver": "^7.3.5",
+        "vscode-languageserver-protocol": "3.17.2"
+      },
+      "engines": {
+        "vscode": "^1.67.0"
+      }
+    },
+    "node_modules/vscode-languageserver": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.1.0.tgz",
+      "integrity": "sha512-eUt8f1z2N2IEUDBsKaNapkz7jl5QpskN2Y0G01T/ItMxBxw1fJwvtySGB9QMecatne8jFIWJGWI61dWjyTLQsw==",
+      "dependencies": {
+        "vscode-languageserver-protocol": "3.17.3"
+      },
+      "bin": {
+        "installServerIntoExtension": "bin/installServerIntoExtension"
+      }
+    },
+    "node_modules/vscode-languageserver-protocol": {
+      "version": "3.17.2",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.2.tgz",
+      "integrity": "sha512-8kYisQ3z/SQ2kyjlNeQxbkkTNmVFoQCqkmGrzLH6A9ecPlgTbp3wDTnUNqaUxYr4vlAcloxx8zwy7G5WdguYNg==",
+      "dependencies": {
+        "vscode-jsonrpc": "8.0.2",
+        "vscode-languageserver-types": "3.17.2"
+      }
+    },
+    "node_modules/vscode-languageserver-textdocument": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.11.tgz",
+      "integrity": "sha512-X+8T3GoiwTVlJbicx/sIAF+yuJAqz8VvwJyoMVhwEMoEKE/fkDmrqUgDMyBECcM2A2frVZIUj5HI/ErRXCfOeA=="
+    },
+    "node_modules/vscode-languageserver-types": {
+      "version": "3.17.2",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz",
+      "integrity": "sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA=="
+    },
+    "node_modules/vscode-languageserver/node_modules/vscode-jsonrpc": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0.tgz",
+      "integrity": "sha512-6TDy/abTQk+zDGYazgbIPc+4JoXdwC8NHU9Pbn4UJP1fehUyZmM4RHp5IthX7A6L5KS30PRui+j+tbbMMMafdw==",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/vscode-languageserver/node_modules/vscode-languageserver-protocol": {
+      "version": "3.17.3",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3.tgz",
+      "integrity": "sha512-924/h0AqsMtA5yK22GgMtCYiMdCOtWTSGgUOkgEDX+wk2b0x4sAfLiO4NxBxqbiVtz7K7/1/RgVrVI0NClZwqA==",
+      "dependencies": {
+        "vscode-jsonrpc": "8.1.0",
+        "vscode-languageserver-types": "3.17.3"
+      }
+    },
+    "node_modules/vscode-languageserver/node_modules/vscode-languageserver-types": {
+      "version": "3.17.3",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.3.tgz",
+      "integrity": "sha512-SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA=="
+    },
+    "node_modules/vscode-markdown-languageserver": {
+      "version": "0.5.0-alpha.8",
+      "resolved": "https://registry.npmjs.org/vscode-markdown-languageserver/-/vscode-markdown-languageserver-0.5.0-alpha.8.tgz",
+      "integrity": "sha512-Bp6YXHy4EMQ8JpsmXpQHa78byLvv83wVnLmhVfTaJsZTBwF8IOJ56NBUasepg9L6QVffUA9T2H/PfBqEOGpeOQ==",
+      "dependencies": {
+        "@vscode/l10n": "^0.0.11",
+        "vscode-languageserver": "^8.1.0",
+        "vscode-languageserver-textdocument": "^1.0.8",
+        "vscode-languageserver-types": "^3.17.3",
+        "vscode-markdown-languageservice": "^0.5.0-alpha.7",
+        "vscode-uri": "^3.0.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/vscode-markdown-languageserver/node_modules/vscode-languageserver-types": {
+      "version": "3.17.5",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz",
+      "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg=="
+    },
+    "node_modules/vscode-markdown-languageserver/node_modules/vscode-markdown-languageservice": {
+      "version": "0.5.0-alpha.7",
+      "resolved": "https://registry.npmjs.org/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.5.0-alpha.7.tgz",
+      "integrity": "sha512-Iq9S5YGHm3D/UG9Usm8a/O5tYCo9FwaMF7nJsDQCxKgVZu5OzwOj3ixDkhoM+c8GKXiwt23DxhhWRuvI4odkTg==",
+      "dependencies": {
+        "@vscode/l10n": "^0.0.10",
+        "node-html-parser": "^6.1.5",
+        "picomatch": "^2.3.1",
+        "vscode-languageserver-protocol": "^3.17.1",
+        "vscode-languageserver-textdocument": "^1.0.11",
+        "vscode-uri": "^3.0.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/vscode-markdown-languageserver/node_modules/vscode-markdown-languageservice/node_modules/@vscode/l10n": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.10.tgz",
+      "integrity": "sha512-E1OCmDcDWa0Ya7vtSjp/XfHFGqYJfh+YPC1RkATU71fTac+j1JjCcB3qwSzmlKAighx2WxhLlfhS0RwAN++PFQ=="
+    },
+    "node_modules/vscode-markdown-languageservice": {
+      "version": "0.3.0-alpha.3",
+      "resolved": "https://registry.npmjs.org/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.3.0-alpha.3.tgz",
+      "integrity": "sha512-KPjIuCkSqabkzci7TnlLKep5FYIC45tS7UC5H8zoOii7aoKJru5mZBDXJt86bM3XTgnfpW7rUYqhNnvXbbCBbw==",
+      "dev": true,
+      "dependencies": {
+        "@vscode/l10n": "^0.0.10",
+        "picomatch": "^2.3.1",
+        "vscode-languageserver-textdocument": "^1.0.5",
+        "vscode-languageserver-types": "^3.17.1",
+        "vscode-uri": "^3.0.3"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/vscode-markdown-languageservice/node_modules/@vscode/l10n": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.10.tgz",
+      "integrity": "sha512-E1OCmDcDWa0Ya7vtSjp/XfHFGqYJfh+YPC1RkATU71fTac+j1JjCcB3qwSzmlKAighx2WxhLlfhS0RwAN++PFQ==",
+      "dev": true
+    },
+    "node_modules/vscode-uri": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz",
+      "integrity": "sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw=="
+    },
+    "node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    }
+  }
+}
diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index e238a24b0fe..a4555a9e588 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -708,14 +708,11 @@
             "%configuration.markdown.preferredMdPathExtensionStyle.removeExtension%"
           ]
         },
-        "markdown.experimental.updateLinksOnPaste": {
+        "markdown.editor.updateLinksOnPaste.enabled": {
           "type": "boolean",
-          "default": false,
-          "markdownDescription": "%configuration.markdown.experimental.updateLinksOnPaste%",
+          "markdownDescription": "%configuration.markdown.editor.updateLinksOnPaste.enabled%",
           "scope": "resource",
-          "tags": [
-            "experimental"
-          ]
+          "default": true
         }
       }
     },
@@ -756,8 +753,8 @@
     ]
   },
   "scripts": {
-    "compile": "gulp compile-extension:markdown-language-features-languageService && gulp compile-extension:markdown-language-features-server && gulp compile-extension:markdown-language-features && npm run build-preview && npm run build-notebook",
-    "watch": "npm run build-preview && gulp watch-extension:markdown-language-features watch-extension:markdown-language-features-languageService watch-extension:markdown-language-features-server",
+    "compile": "gulp compile-extension:markdown-language-features-languageService && gulp compile-extension:markdown-language-features && npm run build-preview && npm run build-notebook",
+    "watch": "npm run build-preview && gulp watch-extension:markdown-language-features watch-extension:markdown-language-features-languageService",
     "vscode:prepublish": "npm run build-ext && npm run build-preview",
     "build-ext": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:markdown-language-features ./tsconfig.json",
     "build-notebook": "node ./esbuild-notebook",
@@ -767,14 +764,16 @@
   },
   "dependencies": {
     "@vscode/extension-telemetry": "^0.9.0",
-    "dompurify": "^3.0.5",
+    "dompurify": "^3.1.3",
     "highlight.js": "^11.8.0",
     "markdown-it": "^12.3.2",
     "markdown-it-front-matter": "^0.2.4",
     "morphdom": "^2.6.1",
     "picomatch": "^2.3.1",
+    "punycode": "^2.3.1",
     "vscode-languageclient": "^8.0.2",
     "vscode-languageserver-textdocument": "^1.0.11",
+    "vscode-markdown-languageserver": "^0.5.0-alpha.8",
     "vscode-uri": "^3.0.3"
   },
   "devDependencies": {
diff --git a/extensions/markdown-language-features/package.nls.json b/extensions/markdown-language-features/package.nls.json
index 3549ec58c51..da567b46665 100644
--- a/extensions/markdown-language-features/package.nls.json
+++ b/extensions/markdown-language-features/package.nls.json
@@ -91,6 +91,6 @@
 	"configuration.markdown.preferredMdPathExtensionStyle.removeExtension": "Prefer removing the file extension. For example, path completions to a file named `file.md` will insert `file` without the `.md`.",
 	"configuration.markdown.editor.filePaste.videoSnippet": "Snippet used when adding videos to Markdown. This snippet can use the following variables:\n- `${src}` — The resolved path of the video file.\n- `${title}` — The title used for the video. A snippet placeholder will automatically be created for this variable.",
 	"configuration.markdown.editor.filePaste.audioSnippet": "Snippet used when adding audio to Markdown. This snippet can use the following variables:\n- `${src}` — The resolved path of the audio  file.\n- `${title}` — The title used for the audio. A snippet placeholder will automatically be created for this variable.",
-	"configuration.markdown.experimental.updateLinksOnPaste": "Enable/disable automatic updating of links in text that is copied and pasted from one Markdown editor to another.",
+	"configuration.markdown.editor.updateLinksOnPaste.enabled": "Enable/disable a paste option that updates links and reference in text that is copied and pasted between Markdown editors.\n\nTo use this feature, after pasting text that contains updatable links, just click on the Paste Widget and select `Paste and update pasted links`.",
 	"workspaceTrust": "Required for loading styles configured in the workspace."
 }
diff --git a/extensions/markdown-language-features/preview-src/activeLineMarker.ts b/extensions/markdown-language-features/preview-src/activeLineMarker.ts
index 2fbffb7371d..75c1ed7cbc9 100644
--- a/extensions/markdown-language-features/preview-src/activeLineMarker.ts
+++ b/extensions/markdown-language-features/preview-src/activeLineMarker.ts
@@ -12,20 +12,20 @@ export class ActiveLineMarker {
 		this._update(previous && (previous.codeElement || previous.element));
 	}
 
-	_update(before: HTMLElement | undefined) {
+	private _update(before: HTMLElement | undefined) {
 		this._unmarkActiveElement(this._current);
 		this._markActiveElement(before);
 		this._current = before;
 	}
 
-	_unmarkActiveElement(element: HTMLElement | undefined) {
+	private _unmarkActiveElement(element: HTMLElement | undefined) {
 		if (!element) {
 			return;
 		}
 		element.classList.toggle('code-active-line', false);
 	}
 
-	_markActiveElement(element: HTMLElement | undefined) {
+	private _markActiveElement(element: HTMLElement | undefined) {
 		if (!element) {
 			return;
 		}
diff --git a/extensions/markdown-language-features/preview-src/csp.ts b/extensions/markdown-language-features/preview-src/csp.ts
index 49d8cb1efe6..ea960dd4ad3 100644
--- a/extensions/markdown-language-features/preview-src/csp.ts
+++ b/extensions/markdown-language-features/preview-src/csp.ts
@@ -11,45 +11,45 @@ import { getStrings } from './strings';
  * Shows an alert when there is a content security policy violation.
  */
 export class CspAlerter {
-	private didShow = false;
-	private didHaveCspWarning = false;
+	private _didShow = false;
+	private _didHaveCspWarning = false;
 
-	private messaging?: MessagePoster;
+	private _messaging?: MessagePoster;
 
 	constructor(
-		private readonly settingsManager: SettingsManager,
+		private readonly _settingsManager: SettingsManager,
 	) {
 		document.addEventListener('securitypolicyviolation', () => {
-			this.onCspWarning();
+			this._onCspWarning();
 		});
 
 		window.addEventListener('message', (event) => {
 			if (event && event.data && event.data.name === 'vscode-did-block-svg') {
-				this.onCspWarning();
+				this._onCspWarning();
 			}
 		});
 	}
 
 	public setPoster(poster: MessagePoster) {
-		this.messaging = poster;
-		if (this.didHaveCspWarning) {
-			this.showCspWarning();
+		this._messaging = poster;
+		if (this._didHaveCspWarning) {
+			this._showCspWarning();
 		}
 	}
 
-	private onCspWarning() {
-		this.didHaveCspWarning = true;
-		this.showCspWarning();
+	private _onCspWarning() {
+		this._didHaveCspWarning = true;
+		this._showCspWarning();
 	}
 
-	private showCspWarning() {
+	private _showCspWarning() {
 		const strings = getStrings();
-		const settings = this.settingsManager.settings;
+		const settings = this._settingsManager.settings;
 
-		if (this.didShow || settings.disableSecurityWarnings || !this.messaging) {
+		if (this._didShow || settings.disableSecurityWarnings || !this._messaging) {
 			return;
 		}
-		this.didShow = true;
+		this._didShow = true;
 
 		const notification = document.createElement('a');
 		notification.innerText = strings.cspAlertMessageText;
@@ -59,7 +59,7 @@ export class CspAlerter {
 		notification.setAttribute('role', 'button');
 		notification.setAttribute('aria-label', strings.cspAlertMessageLabel);
 		notification.onclick = () => {
-			this.messaging!.postMessage('showPreviewSecuritySelector', { source: settings.source });
+			this._messaging!.postMessage('showPreviewSecuritySelector', { source: settings.source });
 		};
 		document.body.appendChild(notification);
 	}
diff --git a/extensions/markdown-language-features/preview-src/index.ts b/extensions/markdown-language-features/preview-src/index.ts
index b54b09ef7c9..33c84e0a384 100644
--- a/extensions/markdown-language-features/preview-src/index.ts
+++ b/extensions/markdown-language-features/preview-src/index.ts
@@ -332,11 +332,11 @@ document.addEventListener('click', event => {
 
 			let hrefText = node.getAttribute('data-href');
 			if (!hrefText) {
+				hrefText = node.getAttribute('href');
 				// Pass through known schemes
-				if (passThroughLinkSchemes.some(scheme => node.href.startsWith(scheme))) {
+				if (passThroughLinkSchemes.some(scheme => hrefText.startsWith(scheme))) {
 					return;
 				}
-				hrefText = node.getAttribute('href');
 			}
 
 			// If original link doesn't look like a url, delegate back to VS Code to resolve
diff --git a/extensions/markdown-language-features/preview-src/loading.ts b/extensions/markdown-language-features/preview-src/loading.ts
index c6439188766..bebd440374d 100644
--- a/extensions/markdown-language-features/preview-src/loading.ts
+++ b/extensions/markdown-language-features/preview-src/loading.ts
@@ -5,15 +5,15 @@
 import { MessagePoster } from './messaging';
 
 export class StyleLoadingMonitor {
-	private unloadedStyles: string[] = [];
-	private finishedLoading: boolean = false;
+	private _unloadedStyles: string[] = [];
+	private _finishedLoading: boolean = false;
 
-	private poster?: MessagePoster;
+	private _poster?: MessagePoster;
 
 	constructor() {
 		const onStyleLoadError = (event: any) => {
 			const source = event.target.dataset.source;
-			this.unloadedStyles.push(source);
+			this._unloadedStyles.push(source);
 		};
 
 		window.addEventListener('DOMContentLoaded', () => {
@@ -25,18 +25,18 @@ export class StyleLoadingMonitor {
 		});
 
 		window.addEventListener('load', () => {
-			if (!this.unloadedStyles.length) {
+			if (!this._unloadedStyles.length) {
 				return;
 			}
-			this.finishedLoading = true;
-			this.poster?.postMessage('previewStyleLoadError', { unloadedStyles: this.unloadedStyles });
+			this._finishedLoading = true;
+			this._poster?.postMessage('previewStyleLoadError', { unloadedStyles: this._unloadedStyles });
 		});
 	}
 
 	public setPoster(poster: MessagePoster): void {
-		this.poster = poster;
-		if (this.finishedLoading) {
-			poster.postMessage('previewStyleLoadError', { unloadedStyles: this.unloadedStyles });
+		this._poster = poster;
+		if (this._finishedLoading) {
+			poster.postMessage('previewStyleLoadError', { unloadedStyles: this._unloadedStyles });
 		}
 	}
 }
diff --git a/extensions/markdown-language-features/schemas/package.schema.json b/extensions/markdown-language-features/schemas/package.schema.json
index 5591d0b0032..8dea48f757f 100644
--- a/extensions/markdown-language-features/schemas/package.schema.json
+++ b/extensions/markdown-language-features/schemas/package.schema.json
@@ -1,6 +1,5 @@
 {
 	"$schema": "http://json-schema.org/draft-07/schema#",
-	"title": "Markdown contributions to package.json",
 	"type": "object",
 	"properties": {
 		"contributes": {
diff --git a/extensions/markdown-language-features/server/.npmignore b/extensions/markdown-language-features/server/.npmignore
deleted file mode 100644
index bfd4215998c..00000000000
--- a/extensions/markdown-language-features/server/.npmignore
+++ /dev/null
@@ -1,12 +0,0 @@
-.vscode/
-.github/
-out/test/
-src/
-.eslintrc.js
-.gitignore
-tsconfig*.json
-*.tsbuildinfo
-*.map
-example.cjs
-CODE_OF_CONDUCT.md
-SECURITY.md
\ No newline at end of file
diff --git a/extensions/markdown-language-features/server/.vscode/launch.json b/extensions/markdown-language-features/server/.vscode/launch.json
deleted file mode 100644
index fd9033bffaa..00000000000
--- a/extensions/markdown-language-features/server/.vscode/launch.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"version": "0.1.0",
-	// List of configurations. Add new configurations or edit existing ones.
-	"configurations": [
-		{
-			"name": "Attach",
-			"type": "node",
-			"request": "attach",
-			"port": 7997,
-			"sourceMaps": true,
-			"outFiles": [
-				"${workspaceFolder}/out/**/*.js"
-			]
-		}
-	]
-}
\ No newline at end of file
diff --git a/extensions/markdown-language-features/server/.vscode/settings.json b/extensions/markdown-language-features/server/.vscode/settings.json
deleted file mode 100644
index 7a73a41bfdf..00000000000
--- a/extensions/markdown-language-features/server/.vscode/settings.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{
-}
\ No newline at end of file
diff --git a/extensions/markdown-language-features/server/.vscode/tasks.json b/extensions/markdown-language-features/server/.vscode/tasks.json
deleted file mode 100644
index ecc951a7baf..00000000000
--- a/extensions/markdown-language-features/server/.vscode/tasks.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"version": "2.0.0",
-	"command": "npm",
-	"args": [
-		"run",
-		"watch"
-	],
-	"isBackground": true,
-	"problemMatcher": "$tsc-watch",
-	"tasks": [
-		{
-			"label": "npm",
-			"type": "shell",
-			"command": "npm",
-			"args": [
-				"run",
-				"watch"
-			],
-			"isBackground": true,
-			"problemMatcher": "$tsc-watch",
-			"group": {
-				"_id": "build",
-				"isDefault": false
-			}
-		}
-	]
-}
\ No newline at end of file
diff --git a/extensions/markdown-language-features/server/CHANGELOG.md b/extensions/markdown-language-features/server/CHANGELOG.md
deleted file mode 100644
index a5cc9d15cf1..00000000000
--- a/extensions/markdown-language-features/server/CHANGELOG.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Changelog
-
-# 0.4.0-alpha.3 — June 2, 2023
-- Pick up [Markdown Language Service](https://github.com/microsoft/vscode-markdown-languageservice) 0.4.0-alpha.3. See [CHANGELOG](https://github.com/microsoft/vscode-markdown-languageservice/blob/main/CHANGELOG.md#040-alpha3--may-30-2023) for details.
-
-## 0.3.0 - March 28, 2023
-- Pick up [Markdown Language Service](https://github.com/microsoft/vscode-markdown-languageservice) 0.3.0. See [CHANGELOG](https://github.com/microsoft/vscode-markdown-languageservice/blob/main/CHANGELOG.md#030--march-16-2023) for details.
diff --git a/extensions/markdown-language-features/server/README.md b/extensions/markdown-language-features/server/README.md
deleted file mode 100644
index 4114d2698bf..00000000000
--- a/extensions/markdown-language-features/server/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-# Markdown Language Server
-
-> **❗ Import** This is still in development. While the language server is being used by VS Code, it has not yet been tested with other clients.
-
-The Markdown language server powers VS Code's built-in markdown support, providing tools for writing and browsing Markdown files. It runs as a separate executable and implements the [language server protocol](https://microsoft.github.io/language-server-protocol/overview).
-
-This server uses the [Markdown Language Service](https://github.com/microsoft/vscode-markdown-languageservice) to implement almost all of the language features. You can use that library if you need a library for working with Markdown instead of a full language server.
-
-## Server capabilities
-
-- [Completions](https://microsoft.github.io/language-server-protocol/specification#textDocument_completion) for Markdown links.
-
-- [Folding](https://microsoft.github.io/language-server-protocol/specification#textDocument_foldingRange) of Markdown regions, block elements, and header sections.
-
-- [Smart selection](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_selectionRange) for inline elements, block elements, and header sections.
-
-- [Document Symbols](https://microsoft.github.io/language-server-protocol/specification#textDocument_documentSymbol) for quick navigation to headers in a document.
-
-- [Workspace Symbols](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#workspace_symbol) for quick navigation to headers in the workspace
-
-- [Document links](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_documentLink) for making Markdown links in a document clickable.
-
-- [Find all references](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_references) to headers and links across all Markdown files in the workspace.
-
-- [Go to definition](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_definition) from links to headers or link definitions.
-
-- [Rename](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_rename) of headers and links across all Markdown files in the workspace.
-
-- Find all references to a file. Uses a custom `markdown/getReferencesToFileInWorkspace` message.
-
-- [Code Actions](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_codeAction)
-
-  - Organize link definitions source action.
-  - Extract link to definition refactoring.
-
-- Updating links when a file is moved / renamed. Uses a custom `markdown/getEditForFileRenames` message.
-
-- [Pull diagnostics (validation)](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_pullDiagnostics) for links.
-
-## Client requirements
-
-### Initialization options
-
-The client can send the following initialization options to the server:
-
-- `markdownFileExtensions` Array file extensions that should be considered as Markdown. These should not include the leading `.`. For example: `['md', 'mdown', 'markdown']`.
-
-### Settings
-
-Clients may send a `workspace/didChangeConfiguration` notification to notify the server of settings changes.
-The server supports the following settings:
-
-- `markdown`
-  - `suggest`
-    - `paths`
-      - `enabled` — Enable/disable path suggestions.
-
-  - `occurrencesHighlight`
-    - `enabled` — Enable/disable highlighting of link occurrences.
-
-  - `validate`
-    - `enabled` — Enable/disable all validation.
-    - `referenceLinks`
-      - `enabled` — Enable/disable validation of reference links: `[text][ref]`
-    - `fragmentLinks`
-      - `enabled` — Enable/disable validation of links to fragments in the current files: `[text](#head)`
-    - `fileLinks`
-      - `enabled` — Enable/disable validation of links to file in the workspace.
-      - `markdownFragmentLinks` — Enable/disable validation of links to headers in other Markdown files. Use `inherit` to inherit the `fragmentLinks` setting.
-    - `ignoredLinks` — Array of glob patterns for files that should not be validated.
-    - `unusedLinkDefinitions`
-      - `enabled` — Enable/disable validation of unused link definitions.
-    - `duplicateLinkDefinitions`
-      - `enabled` — Enable/disable validation of duplicated link definitions.
-
-### Custom requests
-
-To support all of the features of the language server, the client needs to implement a few custom request types. The definitions of these request types can be found in [`protocol.ts`](./src/protocol.ts)
-
-#### `markdown/parse`
-
-Get the tokens for a Markdown file. Clients are expected to use [Markdown-it](https://github.com/markdown-it/markdown-it) for this.
-
-We require that clients bring their own version of Markdown-it so that they can customize/extend Markdown-it.
-
-#### `markdown/fs/readFile`
-
-Read the contents of a file in the workspace.
-
-#### `markdown/fs/readDirectory`
-
-Read the contents of a directory in the workspace.
-
-#### `markdown/fs/stat`
-
-Check if a given file/directory exists in the workspace.
-
-#### `markdown/fs/watcher/create`
-
-Create a file watcher. This is needed for diagnostics support.
-
-#### `markdown/fs/watcher/delete`
-
-Delete a previously created file watcher.
-
-#### `markdown/findMarkdownFilesInWorkspace`
-
-Get a list of all markdown files in the workspace.
-
-## Contribute
-
-The source code of the Markdown language server can be found in the [VSCode repository](https://github.com/microsoft/vscode) at [extensions/markdown-language-features/server](https://github.com/microsoft/vscode/tree/master/extensions/markdown-language-features/server).
-
-File issues and pull requests in the [VSCode GitHub Issues](https://github.com/microsoft/vscode/issues). See the document [How to Contribute](https://github.com/microsoft/vscode/wiki/How-to-Contribute) on how to build and run from source.
-
-Most of the functionality of the server is located in libraries:
-
-- [vscode-markdown-languageservice](https://github.com/microsoft/vscode-markdown-languageservice) contains the implementation of all features as a reusable library.
-- [vscode-languageserver-node](https://github.com/microsoft/vscode-languageserver-node) contains the implementation of language server for NodeJS.
-
-Help on any of these projects is very welcome.
-
-## Code of Conduct
-
-This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
-
-## License
-
-Copyright (c) Microsoft Corporation. All rights reserved.
-
-Licensed under the [MIT](https://github.com/microsoft/vscode/blob/master/LICENSE.txt) License.
diff --git a/extensions/markdown-language-features/server/build/pipeline.yml b/extensions/markdown-language-features/server/build/pipeline.yml
deleted file mode 100644
index 0c9e3bdbd11..00000000000
--- a/extensions/markdown-language-features/server/build/pipeline.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: $(Date:yyyyMMdd)$(Rev:.r)
-
-trigger: none
-pr: none
-
-resources:
-  repositories:
-    - repository: templates
-      type: github
-      name: microsoft/vscode-engineering
-      ref: main
-      endpoint: Monaco
-
-parameters:
-  - name: publishPackage
-    displayName: Publish vscode-markdown-languageserver
-    type: boolean
-    default: false
-
-extends:
-  template: azure-pipelines/npm-package/pipeline.yml@templates
-  parameters:
-    npmPackages:
-      - name: vscode-markdown-languageserver
-        workingDirectory: extensions/markdown-language-features/server
-
-        buildSteps:
-          - script: yarn install
-            displayName: Install dependencies
-
-          - script: gulp compile-extension:markdown-language-features-server
-            displayName: Compile
-
-        publishPackage: ${{ parameters.publishPackage }}
-        packagePlatform: 'Windows'
diff --git a/extensions/markdown-language-features/server/extension-browser.webpack.config.js b/extensions/markdown-language-features/server/extension-browser.webpack.config.js
deleted file mode 100644
index 2a9de70bc01..00000000000
--- a/extensions/markdown-language-features/server/extension-browser.webpack.config.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-//@ts-check
-
-'use strict';
-
-const withBrowserDefaults = require('../../shared.webpack.config').browser;
-const path = require('path');
-
-module.exports = withBrowserDefaults({
-	context: __dirname,
-	entry: {
-		extension: './src/browser/workerMain.ts',
-	},
-	output: {
-		filename: 'workerMain.js',
-		path: path.join(__dirname, 'dist', 'browser'),
-		libraryTarget: 'var',
-		library: 'serverExportVar'
-	}
-});
diff --git a/extensions/markdown-language-features/server/extension.webpack.config.js b/extensions/markdown-language-features/server/extension.webpack.config.js
deleted file mode 100644
index aafc9c1fd96..00000000000
--- a/extensions/markdown-language-features/server/extension.webpack.config.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-//@ts-check
-
-'use strict';
-
-const withDefaults = require('../../shared.webpack.config');
-const path = require('path');
-
-module.exports = withDefaults({
-	context: path.join(__dirname),
-	entry: {
-		extension: './src/node/workerMain.ts',
-	},
-	output: {
-		filename: 'workerMain.js',
-		path: path.join(__dirname, 'dist', 'node'),
-	}
-});
diff --git a/extensions/markdown-language-features/server/package.json b/extensions/markdown-language-features/server/package.json
deleted file mode 100644
index 532c2dec843..00000000000
--- a/extensions/markdown-language-features/server/package.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "name": "vscode-markdown-languageserver",
-  "description": "Markdown language server",
-  "version": "0.5.0-alpha.6",
-  "author": "Microsoft Corporation",
-  "license": "MIT",
-  "engines": {
-    "node": "*"
-  },
-  "main": "./out/node/main",
-  "browser": "./dist/browser/main",
-  "files": [
-    "dist/**/*.js",
-    "out/**/*.js"
-  ],
-  "dependencies": {
-    "@vscode/l10n": "^0.0.11",
-    "vscode-languageserver": "^8.1.0",
-    "vscode-languageserver-textdocument": "^1.0.8",
-    "vscode-languageserver-types": "^3.17.3",
-    "vscode-markdown-languageservice": "^0.5.0-alpha.6",
-    "vscode-uri": "^3.0.7"
-  },
-  "devDependencies": {
-    "@types/node": "20.x"
-  },
-  "scripts": {
-    "compile": "gulp compile-extension:markdown-language-features-server",
-    "prepublishOnly": "npm run compile",
-    "watch": "gulp watch-extension:markdown-language-features-server",
-    "compile-web": "npx webpack-cli --config extension-browser.webpack.config --mode none",
-    "watch-web": "npx webpack-cli --config extension-browser.webpack.config --mode none --watch --info-verbosity verbose"
-  }
-}
diff --git a/extensions/markdown-language-features/server/src/browser/main.ts b/extensions/markdown-language-features/server/src/browser/main.ts
deleted file mode 100644
index 126121080a8..00000000000
--- a/extensions/markdown-language-features/server/src/browser/main.ts
+++ /dev/null
@@ -1,14 +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 { BrowserMessageReader, BrowserMessageWriter, createConnection } from 'vscode-languageserver/browser';
-import { startVsCodeServer } from '../server';
-
-const messageReader = new BrowserMessageReader(self);
-const messageWriter = new BrowserMessageWriter(self);
-
-const connection = createConnection(messageReader, messageWriter);
-
-startVsCodeServer(connection);
diff --git a/extensions/markdown-language-features/server/src/browser/workerMain.ts b/extensions/markdown-language-features/server/src/browser/workerMain.ts
deleted file mode 100644
index e653751af40..00000000000
--- a/extensions/markdown-language-features/server/src/browser/workerMain.ts
+++ /dev/null
@@ -1,38 +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 l10n from '@vscode/l10n';
-
-let initialized = false;
-const pendingMessages: any[] = [];
-
-const messageHandler = async (e: any) => {
-	if (!initialized) {
-		const l10nLog: string[] = [];
-		initialized = true;
-		const i10lLocation = e.data.i10lLocation;
-		if (i10lLocation) {
-			try {
-				await l10n.config({ uri: i10lLocation });
-				l10nLog.push(`l10n: Configured to ${i10lLocation.toString()}.`);
-			} catch (e) {
-				l10nLog.push(`l10n: Problems loading ${i10lLocation.toString()} : ${e}.`);
-			}
-		} else {
-			l10nLog.push(`l10n: No bundle configured.`);
-		}
-
-		await import('./main');
-
-		if (self.onmessage !== messageHandler) {
-			pendingMessages.forEach(msg => self.onmessage?.(msg));
-			pendingMessages.length = 0;
-		}
-
-		l10nLog.forEach(console.log);
-	} else {
-		pendingMessages.push(e);
-	}
-};
-self.onmessage = messageHandler;
diff --git a/extensions/markdown-language-features/server/src/config.ts b/extensions/markdown-language-features/server/src/config.ts
deleted file mode 100644
index 5992258b0b6..00000000000
--- a/extensions/markdown-language-features/server/src/config.ts
+++ /dev/null
@@ -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 { LsConfiguration } from 'vscode-markdown-languageservice';
-
-export { LsConfiguration };
-
-const defaultConfig: LsConfiguration = {
-	markdownFileExtensions: ['md'],
-	knownLinkedToFileExtensions: [
-		'jpg',
-		'jpeg',
-		'png',
-		'gif',
-		'webp',
-		'bmp',
-		'tiff',
-	],
-	excludePaths: [
-		'**/.*',
-		'**/node_modules/**',
-	]
-};
-
-export function getLsConfiguration(overrides: Partial<LsConfiguration>): LsConfiguration {
-	return {
-		...defaultConfig,
-		...overrides,
-	};
-}
diff --git a/extensions/markdown-language-features/server/src/configuration.ts b/extensions/markdown-language-features/server/src/configuration.ts
deleted file mode 100644
index 949573cfaf5..00000000000
--- a/extensions/markdown-language-features/server/src/configuration.ts
+++ /dev/null
@@ -1,74 +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 { Connection, Emitter } from 'vscode-languageserver';
-import { Disposable } from './util/dispose';
-
-export type ValidateEnabled = 'ignore' | 'warning' | 'error' | 'hint';
-
-export interface Settings {
-	readonly markdown: {
-		readonly server: {
-			readonly log: 'off' | 'debug' | 'trace';
-		};
-
-		readonly preferredMdPathExtensionStyle: 'auto' | 'includeExtension' | 'removeExtension';
-
-		readonly occurrencesHighlight: {
-			readonly enabled: boolean;
-		};
-
-		readonly suggest: {
-			readonly paths: {
-				readonly enabled: boolean;
-				readonly includeWorkspaceHeaderCompletions: 'never' | 'onSingleOrDoubleHash' | 'onDoubleHash';
-			};
-		};
-
-		readonly validate: {
-			readonly enabled: true;
-			readonly referenceLinks: {
-				readonly enabled: ValidateEnabled;
-			};
-			readonly fragmentLinks: {
-				readonly enabled: ValidateEnabled;
-			};
-			readonly fileLinks: {
-				readonly enabled: ValidateEnabled;
-				readonly markdownFragmentLinks: ValidateEnabled | 'inherit';
-			};
-			readonly ignoredLinks: readonly string[];
-			readonly unusedLinkDefinitions: {
-				readonly enabled: ValidateEnabled;
-			};
-			readonly duplicateLinkDefinitions: {
-				readonly enabled: ValidateEnabled;
-			};
-		};
-	};
-}
-
-
-export class ConfigurationManager extends Disposable {
-
-	private readonly _onDidChangeConfiguration = this._register(new Emitter<Settings>());
-	public readonly onDidChangeConfiguration = this._onDidChangeConfiguration.event;
-
-	private _settings?: Settings;
-
-	constructor(connection: Connection) {
-		super();
-
-		// The settings have changed. Is send on server activation as well.
-		this._register(connection.onDidChangeConfiguration((change) => {
-			this._settings = change.settings;
-			this._onDidChangeConfiguration.fire(this._settings!);
-		}));
-	}
-
-	public getSettings(): Settings | undefined {
-		return this._settings;
-	}
-}
diff --git a/extensions/markdown-language-features/server/src/languageFeatures/diagnostics.ts b/extensions/markdown-language-features/server/src/languageFeatures/diagnostics.ts
deleted file mode 100644
index d21a6fdbfb6..00000000000
--- a/extensions/markdown-language-features/server/src/languageFeatures/diagnostics.ts
+++ /dev/null
@@ -1,114 +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 { Connection, FullDocumentDiagnosticReport, TextDocuments, UnchangedDocumentDiagnosticReport } from 'vscode-languageserver';
-import * as md from 'vscode-markdown-languageservice';
-import { Disposable } from 'vscode-notebook-renderer/events';
-import { URI } from 'vscode-uri';
-import { ConfigurationManager, ValidateEnabled } from '../configuration';
-import { disposeAll } from '../util/dispose';
-
-const defaultDiagnosticOptions: md.DiagnosticOptions = {
-	validateFileLinks: md.DiagnosticLevel.ignore,
-	validateReferences: md.DiagnosticLevel.ignore,
-	validateFragmentLinks: md.DiagnosticLevel.ignore,
-	validateMarkdownFileLinkFragments: md.DiagnosticLevel.ignore,
-	validateUnusedLinkDefinitions: md.DiagnosticLevel.ignore,
-	validateDuplicateLinkDefinitions: md.DiagnosticLevel.ignore,
-	ignoreLinks: [],
-};
-
-function convertDiagnosticLevel(enabled: ValidateEnabled): md.DiagnosticLevel | undefined {
-	switch (enabled) {
-		case 'error': return md.DiagnosticLevel.error;
-		case 'warning': return md.DiagnosticLevel.warning;
-		case 'ignore': return md.DiagnosticLevel.ignore;
-		case 'hint': return md.DiagnosticLevel.hint;
-		default: return md.DiagnosticLevel.ignore;
-	}
-}
-
-function getDiagnosticsOptions(config: ConfigurationManager): md.DiagnosticOptions {
-	const settings = config.getSettings();
-	if (!settings) {
-		return defaultDiagnosticOptions;
-	}
-
-	const validateFragmentLinks = convertDiagnosticLevel(settings.markdown.validate.fragmentLinks.enabled);
-	return {
-		validateFileLinks: convertDiagnosticLevel(settings.markdown.validate.fileLinks.enabled),
-		validateReferences: convertDiagnosticLevel(settings.markdown.validate.referenceLinks.enabled),
-		validateFragmentLinks: convertDiagnosticLevel(settings.markdown.validate.fragmentLinks.enabled),
-		validateMarkdownFileLinkFragments: settings.markdown.validate.fileLinks.markdownFragmentLinks === 'inherit' ? validateFragmentLinks : convertDiagnosticLevel(settings.markdown.validate.fileLinks.markdownFragmentLinks),
-		validateUnusedLinkDefinitions: convertDiagnosticLevel(settings.markdown.validate.unusedLinkDefinitions.enabled),
-		validateDuplicateLinkDefinitions: convertDiagnosticLevel(settings.markdown.validate.duplicateLinkDefinitions.enabled),
-		ignoreLinks: settings.markdown.validate.ignoredLinks,
-	};
-}
-
-export function registerValidateSupport(
-	connection: Connection,
-	workspace: md.IWorkspace,
-	documents: TextDocuments<md.ITextDocument>,
-	ls: md.IMdLanguageService,
-	config: ConfigurationManager,
-	logger: md.ILogger,
-): Disposable {
-	let diagnosticOptions: md.DiagnosticOptions = defaultDiagnosticOptions;
-	function updateDiagnosticsSetting(): void {
-		diagnosticOptions = getDiagnosticsOptions(config);
-	}
-
-	const subs: Disposable[] = [];
-	const manager = ls.createPullDiagnosticsManager();
-	subs.push(manager);
-
-	subs.push(manager.onLinkedToFileChanged(() => {
-		// TODO: We only need to refresh certain files
-		connection.languages.diagnostics.refresh();
-	}));
-
-	const emptyDiagnosticsResponse = Object.freeze({ kind: 'full', items: [] });
-
-	connection.languages.diagnostics.on(async (params, token): Promise<FullDocumentDiagnosticReport | UnchangedDocumentDiagnosticReport> => {
-		logger.log(md.LogLevel.Debug, 'connection.languages.diagnostics.on', { document: params.textDocument.uri });
-
-		if (!config.getSettings()?.markdown.validate.enabled) {
-			return emptyDiagnosticsResponse;
-		}
-
-		const uri = URI.parse(params.textDocument.uri);
-		if (!workspace.hasMarkdownDocument(uri)) {
-			return emptyDiagnosticsResponse;
-		}
-
-		const document = await workspace.openMarkdownDocument(uri);
-		if (!document) {
-			return emptyDiagnosticsResponse;
-		}
-
-		const diagnostics = await manager.computeDiagnostics(document, diagnosticOptions, token);
-		return {
-			kind: 'full',
-			items: diagnostics,
-		};
-	});
-
-	updateDiagnosticsSetting();
-	subs.push(config.onDidChangeConfiguration(() => {
-		updateDiagnosticsSetting();
-		connection.languages.diagnostics.refresh();
-	}));
-
-	subs.push(documents.onDidClose(e => {
-		manager.disposeDocumentResources(URI.parse(e.document.uri));
-	}));
-
-	return {
-		dispose: () => {
-			disposeAll(subs);
-		}
-	};
-}
diff --git a/extensions/markdown-language-features/server/src/logging.ts b/extensions/markdown-language-features/server/src/logging.ts
deleted file mode 100644
index 0df6b8e0cc5..00000000000
--- a/extensions/markdown-language-features/server/src/logging.ts
+++ /dev/null
@@ -1,81 +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 md from 'vscode-markdown-languageservice';
-import { ConfigurationManager } from './configuration';
-import { Disposable } from './util/dispose';
-
-export class LogFunctionLogger extends Disposable implements md.ILogger {
-
-	private static now(): string {
-		const now = new Date();
-		return String(now.getUTCHours()).padStart(2, '0')
-			+ ':' + String(now.getMinutes()).padStart(2, '0')
-			+ ':' + String(now.getUTCSeconds()).padStart(2, '0') + '.' + String(now.getMilliseconds()).padStart(3, '0');
-	}
-
-	private static data2String(data: any): string {
-		if (data instanceof Error) {
-			if (typeof data.stack === 'string') {
-				return data.stack;
-			}
-			return data.message;
-		}
-		if (typeof data === 'string') {
-			return data;
-		}
-		return JSON.stringify(data, undefined, 2);
-	}
-
-	private _logLevel: md.LogLevel;
-
-	constructor(
-		private readonly _logFn: typeof console.log,
-		private readonly _config: ConfigurationManager,
-	) {
-		super();
-
-		this._register(this._config.onDidChangeConfiguration(() => {
-			this._logLevel = LogFunctionLogger.readLogLevel(this._config);
-		}));
-
-		this._logLevel = LogFunctionLogger.readLogLevel(this._config);
-	}
-
-	private static readLogLevel(config: ConfigurationManager): md.LogLevel {
-		switch (config.getSettings()?.markdown.server.log) {
-			case 'trace': return md.LogLevel.Trace;
-			case 'debug': return md.LogLevel.Debug;
-			case 'off':
-			default:
-				return md.LogLevel.Off;
-		}
-	}
-
-	get level(): md.LogLevel { return this._logLevel; }
-
-	public log(level: md.LogLevel, message: string, data?: any): void {
-		if (this.level < level) {
-			return;
-		}
-
-		this.appendLine(`[${this.toLevelLabel(level)} ${LogFunctionLogger.now()}] ${message}`);
-		if (data) {
-			this.appendLine(LogFunctionLogger.data2String(data));
-		}
-	}
-
-	private toLevelLabel(level: md.LogLevel): string {
-		switch (level) {
-			case md.LogLevel.Off: return 'Off';
-			case md.LogLevel.Debug: return 'Debug';
-			case md.LogLevel.Trace: return 'Trace';
-		}
-	}
-
-	private appendLine(value: string): void {
-		this._logFn(value);
-	}
-}
diff --git a/extensions/markdown-language-features/server/src/node/main.ts b/extensions/markdown-language-features/server/src/node/main.ts
deleted file mode 100644
index 7945d44acf6..00000000000
--- a/extensions/markdown-language-features/server/src/node/main.ts
+++ /dev/null
@@ -1,19 +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 { Connection, createConnection } from 'vscode-languageserver/node';
-import { startVsCodeServer } from '../server';
-
-// Create a connection for the server.
-const connection: Connection = createConnection();
-
-console.log = connection.console.log.bind(connection.console);
-console.error = connection.console.error.bind(connection.console);
-
-process.on('unhandledRejection', (e: any) => {
-	connection.console.error(`Unhandled exception ${e}`);
-});
-
-startVsCodeServer(connection);
diff --git a/extensions/markdown-language-features/server/src/node/workerMain.ts b/extensions/markdown-language-features/server/src/node/workerMain.ts
deleted file mode 100644
index f3369768012..00000000000
--- a/extensions/markdown-language-features/server/src/node/workerMain.ts
+++ /dev/null
@@ -1,23 +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 l10n from '@vscode/l10n';
-
-async function setupMain() {
-	const l10nLog: string[] = [];
-
-	const i10lLocation = process.env['VSCODE_L10N_BUNDLE_LOCATION'];
-	if (i10lLocation) {
-		try {
-			await l10n.config({ uri: i10lLocation });
-			l10nLog.push(`l10n: Configured to ${i10lLocation.toString()}`);
-		} catch (e) {
-			l10nLog.push(`l10n: Problems loading ${i10lLocation.toString()} : ${e}`);
-		}
-	}
-	await import('./main');
-
-	l10nLog.forEach(console.log);
-}
-setupMain();
diff --git a/extensions/markdown-language-features/server/src/protocol.ts b/extensions/markdown-language-features/server/src/protocol.ts
deleted file mode 100644
index d06edbd4303..00000000000
--- a/extensions/markdown-language-features/server/src/protocol.ts
+++ /dev/null
@@ -1,33 +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 { FileRename, RequestType } from 'vscode-languageserver';
-import type * as lsp from 'vscode-languageserver-types';
-import type * as md from 'vscode-markdown-languageservice';
-
-//#region From server
-export const parse = new RequestType<{ uri: string; text?: string }, md.Token[], any>('markdown/parse');
-
-export const fs_readFile = new RequestType<{ uri: string }, number[], any>('markdown/fs/readFile');
-export const fs_readDirectory = new RequestType<{ uri: string }, [string, { isDirectory: boolean }][], any>('markdown/fs/readDirectory');
-export const fs_stat = new RequestType<{ uri: string }, { isDirectory: boolean } | undefined, any>('markdown/fs/stat');
-
-export const fs_watcher_create = new RequestType<{ id: number; uri: string; options: md.FileWatcherOptions; watchParentDirs: boolean }, void, any>('markdown/fs/watcher/create');
-export const fs_watcher_delete = new RequestType<{ id: number }, void, any>('markdown/fs/watcher/delete');
-
-export const findMarkdownFilesInWorkspace = new RequestType<{}, string[], any>('markdown/findMarkdownFilesInWorkspace');
-//#endregion
-
-//#region To server
-export const getReferencesToFileInWorkspace = new RequestType<{ uri: string }, lsp.Location[], any>('markdown/getReferencesToFileInWorkspace');
-export const getEditForFileRenames = new RequestType<FileRename[], { participatingRenames: readonly FileRename[]; edit: lsp.WorkspaceEdit }, any>('markdown/getEditForFileRenames');
-
-export const prepareUpdatePastedLinks = new RequestType<{ uri: string; ranges: lsp.Range[] }, string, any>('markdown/prepareUpdatePastedLinks');
-export const getUpdatePastedLinksEdit = new RequestType<{ pasteIntoDoc: string; metadata: string; edits: lsp.TextEdit[] }, lsp.TextEdit[] | undefined, any>('markdown/getUpdatePastedLinksEdit');
-
-export const fs_watcher_onChange = new RequestType<{ id: number; uri: string; kind: 'create' | 'change' | 'delete' }, void, any>('markdown/fs/watcher/onChange');
-
-export const resolveLinkTarget = new RequestType<{ linkText: string; uri: string }, md.ResolvedDocumentLinkTarget, any>('markdown/resolveLinkTarget');
-//#endregion
diff --git a/extensions/markdown-language-features/server/src/server.ts b/extensions/markdown-language-features/server/src/server.ts
deleted file mode 100644
index f1df5494f3b..00000000000
--- a/extensions/markdown-language-features/server/src/server.ts
+++ /dev/null
@@ -1,399 +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 l10n from '@vscode/l10n';
-import { CancellationToken, CompletionRegistrationOptions, CompletionRequest, Connection, Disposable, DocumentHighlightRegistrationOptions, DocumentHighlightRequest, InitializeParams, InitializeResult, NotebookDocuments, ResponseError, TextDocuments } from 'vscode-languageserver';
-import { TextDocument } from 'vscode-languageserver-textdocument';
-import * as lsp from 'vscode-languageserver-types';
-import * as md from 'vscode-markdown-languageservice';
-import { URI } from 'vscode-uri';
-import { LsConfiguration, getLsConfiguration } from './config';
-import { ConfigurationManager, Settings } from './configuration';
-import { registerValidateSupport } from './languageFeatures/diagnostics';
-import { LogFunctionLogger } from './logging';
-import * as protocol from './protocol';
-import { IDisposable } from './util/dispose';
-import { VsCodeClientWorkspace } from './workspace';
-
-interface MdServerInitializationOptions extends LsConfiguration { }
-
-const organizeLinkDefKind = 'source.organizeLinkDefinitions';
-
-export async function startVsCodeServer(connection: Connection) {
-	const configurationManager = new ConfigurationManager(connection);
-	const logger = new LogFunctionLogger(connection.console.log.bind(connection.console), configurationManager);
-
-	const parser = new class implements md.IMdParser {
-		slugifier = md.githubSlugifier;
-
-		tokenize(document: md.ITextDocument): Promise<md.Token[]> {
-			return connection.sendRequest(protocol.parse, {
-				uri: document.uri,
-
-				// Clients won't be able to read temp documents.
-				// Send along the full text for parsing.
-				text: document.version < 0 ? document.getText() : undefined
-			});
-		}
-	};
-
-	const documents = new TextDocuments(TextDocument);
-	const notebooks = new NotebookDocuments(documents);
-
-	const workspaceFactory: WorkspaceFactory = ({ connection, config, workspaceFolders }) => {
-		const workspace = new VsCodeClientWorkspace(connection, config, documents, notebooks, logger);
-		workspace.workspaceFolders = (workspaceFolders ?? []).map(x => URI.parse(x.uri));
-		return workspace;
-	};
-
-	return startServer(connection, { documents, notebooks, configurationManager, logger, parser, workspaceFactory });
-}
-
-type WorkspaceFactory = (config: {
-	connection: Connection;
-	config: LsConfiguration;
-	workspaceFolders?: lsp.WorkspaceFolder[] | null;
-}) => md.IWorkspace;
-
-export async function startServer(connection: Connection, serverConfig: {
-	documents: TextDocuments<md.ITextDocument>;
-	notebooks?: NotebookDocuments<md.ITextDocument>;
-	configurationManager: ConfigurationManager;
-	logger: md.ILogger;
-	parser: md.IMdParser;
-	workspaceFactory: WorkspaceFactory;
-}) {
-	const { documents, notebooks } = serverConfig;
-
-	let mdLs: md.IMdLanguageService | undefined;
-
-	connection.onInitialize((params: InitializeParams): InitializeResult => {
-		const initOptions = params.initializationOptions as MdServerInitializationOptions | undefined;
-
-		const mdConfig = getLsConfiguration(initOptions ?? {});
-
-		const workspace = serverConfig.workspaceFactory({ connection, config: mdConfig, workspaceFolders: params.workspaceFolders });
-		mdLs = md.createLanguageService({
-			workspace,
-			parser: serverConfig.parser,
-			logger: serverConfig.logger,
-			...mdConfig,
-			get preferredMdPathExtensionStyle() {
-				switch (serverConfig.configurationManager.getSettings()?.markdown.preferredMdPathExtensionStyle) {
-					case 'includeExtension': return md.PreferredMdPathExtensionStyle.includeExtension;
-					case 'removeExtension': return md.PreferredMdPathExtensionStyle.removeExtension;
-					case 'auto':
-					default:
-						return md.PreferredMdPathExtensionStyle.auto;
-				}
-			}
-		});
-
-		registerCompletionsSupport(connection, documents, mdLs, serverConfig.configurationManager);
-		registerDocumentHighlightSupport(connection, documents, mdLs, serverConfig.configurationManager);
-		registerValidateSupport(connection, workspace, documents, mdLs, serverConfig.configurationManager, serverConfig.logger);
-
-		return {
-			capabilities: {
-				diagnosticProvider: {
-					documentSelector: null,
-					identifier: 'markdown',
-					interFileDependencies: true,
-					workspaceDiagnostics: false,
-				},
-				codeActionProvider: {
-					resolveProvider: true,
-					codeActionKinds: [
-						organizeLinkDefKind,
-						'quickfix',
-						'refactor',
-					]
-				},
-				definitionProvider: true,
-				documentLinkProvider: { resolveProvider: true },
-				documentSymbolProvider: true,
-				foldingRangeProvider: true,
-				hoverProvider: true,
-				referencesProvider: true,
-				renameProvider: { prepareProvider: true, },
-				selectionRangeProvider: true,
-				workspaceSymbolProvider: true,
-				workspace: {
-					workspaceFolders: {
-						supported: true,
-						changeNotifications: true,
-					},
-				}
-			}
-		};
-	});
-
-	connection.onDocumentLinks(async (params, token): Promise<lsp.DocumentLink[]> => {
-		const document = documents.get(params.textDocument.uri);
-		if (!document) {
-			return [];
-		}
-		return mdLs!.getDocumentLinks(document, token);
-	});
-
-	connection.onDocumentLinkResolve(async (link, token): Promise<lsp.DocumentLink | undefined> => {
-		return mdLs!.resolveDocumentLink(link, token);
-	});
-
-	connection.onDocumentSymbol(async (params, token): Promise<lsp.DocumentSymbol[]> => {
-		const document = documents.get(params.textDocument.uri);
-		if (!document) {
-			return [];
-		}
-		return mdLs!.getDocumentSymbols(document, { includeLinkDefinitions: true }, token);
-	});
-
-	connection.onFoldingRanges(async (params, token): Promise<lsp.FoldingRange[]> => {
-		const document = documents.get(params.textDocument.uri);
-		if (!document) {
-			return [];
-		}
-		return mdLs!.getFoldingRanges(document, token);
-	});
-
-	connection.onSelectionRanges(async (params, token): Promise<lsp.SelectionRange[] | undefined> => {
-		const document = documents.get(params.textDocument.uri);
-		if (!document) {
-			return [];
-		}
-		return mdLs!.getSelectionRanges(document, params.positions, token);
-	});
-
-	connection.onWorkspaceSymbol(async (params, token): Promise<lsp.WorkspaceSymbol[]> => {
-		return mdLs!.getWorkspaceSymbols(params.query, token);
-	});
-
-	connection.onReferences(async (params, token): Promise<lsp.Location[]> => {
-		const document = documents.get(params.textDocument.uri);
-		if (!document) {
-			return [];
-		}
-		return mdLs!.getReferences(document, params.position, params.context, token);
-	});
-
-	connection.onDefinition(async (params, token): Promise<lsp.Definition | undefined> => {
-		const document = documents.get(params.textDocument.uri);
-		if (!document) {
-			return undefined;
-		}
-		return mdLs!.getDefinition(document, params.position, token);
-	});
-
-	connection.onPrepareRename(async (params, token) => {
-		const document = documents.get(params.textDocument.uri);
-		if (!document) {
-			return undefined;
-		}
-
-		try {
-			return await mdLs!.prepareRename(document, params.position, token);
-		} catch (e) {
-			if (e instanceof md.RenameNotSupportedAtLocationError) {
-				throw new ResponseError(0, e.message);
-			} else {
-				throw e;
-			}
-		}
-	});
-
-	connection.onRenameRequest(async (params, token) => {
-		const document = documents.get(params.textDocument.uri);
-		if (!document) {
-			return undefined;
-		}
-		return mdLs!.getRenameEdit(document, params.position, params.newName, token);
-	});
-
-	interface OrganizeLinkActionData {
-		readonly uri: string;
-	}
-
-	connection.onCodeAction(async (params, token) => {
-		const document = documents.get(params.textDocument.uri);
-		if (!document) {
-			return undefined;
-		}
-
-		if (params.context.only?.some(kind => kind === 'source' || kind.startsWith('source.'))) {
-			const action: lsp.CodeAction = {
-				title: l10n.t("Organize link definitions"),
-				kind: organizeLinkDefKind,
-				data: { uri: document.uri } satisfies OrganizeLinkActionData,
-			};
-			return [action];
-		}
-
-		return mdLs!.getCodeActions(document, params.range, params.context, token);
-	});
-
-	connection.onCodeActionResolve(async (codeAction, token) => {
-		if (codeAction.kind === organizeLinkDefKind) {
-			const data = codeAction.data as OrganizeLinkActionData;
-			const document = documents.get(data.uri);
-			if (!document) {
-				return codeAction;
-			}
-
-			const edits = (await mdLs?.organizeLinkDefinitions(document, { removeUnused: true }, token)) || [];
-			codeAction.edit = {
-				changes: {
-					[data.uri]: edits
-				}
-			};
-			return codeAction;
-		}
-
-		return codeAction;
-	});
-
-	connection.onHover(async (params, token) => {
-		const document = documents.get(params.textDocument.uri);
-		if (!document) {
-			return null;
-		}
-
-		return mdLs!.getHover(document, params.position, token);
-	});
-
-	connection.onRequest(protocol.getReferencesToFileInWorkspace, (async (params: { uri: string }, token: CancellationToken) => {
-		return mdLs!.getFileReferences(URI.parse(params.uri), token);
-	}));
-
-	connection.onRequest(protocol.getEditForFileRenames, (async (params, token: CancellationToken) => {
-		const result = await mdLs!.getRenameFilesInWorkspaceEdit(params.map(x => ({ oldUri: URI.parse(x.oldUri), newUri: URI.parse(x.newUri) })), token);
-		if (!result) {
-			return result;
-		}
-
-		return {
-			edit: result.edit,
-			participatingRenames: result.participatingRenames.map(rename => ({ oldUri: rename.oldUri.toString(), newUri: rename.newUri.toString() }))
-		};
-	}));
-
-	connection.onRequest(protocol.prepareUpdatePastedLinks, (async (params, token: CancellationToken) => {
-		const document = documents.get(params.uri);
-		if (!document) {
-			return undefined;
-		}
-
-		return mdLs!.prepareUpdatePastedLinks(document, params.ranges, token);
-	}));
-
-	connection.onRequest(protocol.getUpdatePastedLinksEdit, (async (params, token: CancellationToken) => {
-		const document = documents.get(params.pasteIntoDoc);
-		if (!document) {
-			return undefined;
-		}
-
-		// TODO: Figure out why range types are lying
-		const edits = params.edits.map((edit: any) => lsp.TextEdit.replace(lsp.Range.create(edit.range[0].line, edit.range[0].character, edit.range[1].line, edit.range[1].character), edit.newText));
-		return mdLs!.getUpdatePastedLinksEdit(document, edits, params.metadata, token);
-	}));
-
-	connection.onRequest(protocol.resolveLinkTarget, (async (params, token: CancellationToken) => {
-		return mdLs!.resolveLinkTarget(params.linkText, URI.parse(params.uri), token);
-	}));
-
-	documents.listen(connection);
-	notebooks?.listen(connection);
-	connection.listen();
-}
-
-function registerDynamicClientFeature(
-	config: ConfigurationManager,
-	isEnabled: (settings: Settings | undefined) => boolean,
-	register: () => Promise<Disposable>,
-) {
-	let registration: Promise<IDisposable> | undefined;
-	function update() {
-		const settings = config.getSettings();
-		if (isEnabled(settings)) {
-			if (!registration) {
-				registration = register();
-			}
-		} else {
-			registration?.then(x => x.dispose());
-			registration = undefined;
-		}
-	}
-
-	update();
-	return config.onDidChangeConfiguration(() => update());
-}
-
-function registerCompletionsSupport(
-	connection: Connection,
-	documents: TextDocuments<md.ITextDocument>,
-	ls: md.IMdLanguageService,
-	config: ConfigurationManager,
-): IDisposable {
-	function getIncludeWorkspaceHeaderCompletions(): md.IncludeWorkspaceHeaderCompletions {
-		switch (config.getSettings()?.markdown.suggest.paths.includeWorkspaceHeaderCompletions) {
-			case 'onSingleOrDoubleHash': return md.IncludeWorkspaceHeaderCompletions.onSingleOrDoubleHash;
-			case 'onDoubleHash': return md.IncludeWorkspaceHeaderCompletions.onDoubleHash;
-			case 'never':
-			default: return md.IncludeWorkspaceHeaderCompletions.never;
-		}
-	}
-
-	connection.onCompletion(async (params, token): Promise<lsp.CompletionItem[]> => {
-		const settings = config.getSettings();
-		if (!settings?.markdown.suggest.paths.enabled) {
-			return [];
-		}
-
-		const document = documents.get(params.textDocument.uri);
-		if (document) {
-			// TODO: remove any type after picking up new release with correct types
-			return ls.getCompletionItems(document, params.position, {
-				...(params.context || {}),
-				includeWorkspaceHeaderCompletions: getIncludeWorkspaceHeaderCompletions(),
-			} as any, token);
-		}
-		return [];
-	});
-
-	return registerDynamicClientFeature(config, (settings) => !!settings?.markdown.suggest.paths.enabled, () => {
-		const registrationOptions: CompletionRegistrationOptions = {
-			documentSelector: null,
-			triggerCharacters: ['.', '/', '#'],
-		};
-		return connection.client.register(CompletionRequest.type, registrationOptions);
-	});
-}
-
-function registerDocumentHighlightSupport(
-	connection: Connection,
-	documents: TextDocuments<md.ITextDocument>,
-	mdLs: md.IMdLanguageService,
-	configurationManager: ConfigurationManager
-) {
-	connection.onDocumentHighlight(async (params, token) => {
-		const settings = configurationManager.getSettings();
-		if (!settings?.markdown.occurrencesHighlight.enabled) {
-			return undefined;
-		}
-
-		const document = documents.get(params.textDocument.uri);
-		if (!document) {
-			return undefined;
-		}
-
-		return mdLs!.getDocumentHighlights(document, params.position, token);
-	});
-
-	return registerDynamicClientFeature(configurationManager, (settings) => !!settings?.markdown.occurrencesHighlight.enabled, () => {
-		const registrationOptions: DocumentHighlightRegistrationOptions = {
-			documentSelector: null,
-		};
-		return connection.client.register(DocumentHighlightRequest.type, registrationOptions);
-	});
-}
diff --git a/extensions/markdown-language-features/server/src/util/dispose.ts b/extensions/markdown-language-features/server/src/util/dispose.ts
deleted file mode 100644
index 2e9d8dc6a14..00000000000
--- a/extensions/markdown-language-features/server/src/util/dispose.ts
+++ /dev/null
@@ -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.
- *--------------------------------------------------------------------------------------------*/
-
-export function disposeAll(disposables: Iterable<IDisposable>) {
-	const errors: any[] = [];
-
-	for (const disposable of disposables) {
-		try {
-			disposable.dispose();
-		} catch (e) {
-			errors.push(e);
-		}
-	}
-
-	if (errors.length === 1) {
-		throw errors[0];
-	} else if (errors.length > 1) {
-		throw new AggregateError(errors, 'Encountered errors while disposing of store');
-	}
-}
-
-export interface IDisposable {
-	dispose(): void;
-}
-
-export abstract class Disposable {
-	private _isDisposed = false;
-
-	protected _disposables: IDisposable[] = [];
-
-	public dispose(): any {
-		if (this._isDisposed) {
-			return;
-		}
-		this._isDisposed = true;
-		disposeAll(this._disposables);
-	}
-
-	protected _register<T extends IDisposable>(value: T): T {
-		if (this._isDisposed) {
-			value.dispose();
-		} else {
-			this._disposables.push(value);
-		}
-		return value;
-	}
-
-	protected get isDisposed() {
-		return this._isDisposed;
-	}
-}
-
diff --git a/extensions/markdown-language-features/server/src/util/file.ts b/extensions/markdown-language-features/server/src/util/file.ts
deleted file mode 100644
index 10e95bf5dcf..00000000000
--- a/extensions/markdown-language-features/server/src/util/file.ts
+++ /dev/null
@@ -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.
- *--------------------------------------------------------------------------------------------*/
-
-import { TextDocument } from 'vscode-languageserver-textdocument';
-import { URI, Utils } from 'vscode-uri';
-import { LsConfiguration } from '../config';
-
-export function looksLikeMarkdownPath(config: LsConfiguration, resolvedHrefPath: URI) {
-	return config.markdownFileExtensions.includes(Utils.extname(resolvedHrefPath).toLowerCase().replace('.', ''));
-}
-
-export function isMarkdownFile(document: TextDocument) {
-	return document.languageId === 'markdown';
-}
diff --git a/extensions/markdown-language-features/server/src/util/limiter.ts b/extensions/markdown-language-features/server/src/util/limiter.ts
deleted file mode 100644
index bd4153cd08b..00000000000
--- a/extensions/markdown-language-features/server/src/util/limiter.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-interface ILimitedTaskFactory<T> {
-	factory: ITask<Promise<T>>;
-	c: (value: T | Promise<T>) => void;
-	e: (error?: unknown) => void;
-}
-
-interface ITask<T> {
-	(): T;
-}
-
-/**
- * A helper to queue N promises and run them all with a max degree of parallelism. The helper
- * ensures that at any time no more than M promises are running at the same time.
- *
- * Taken from 'src/vs/base/common/async.ts'
- */
-export class Limiter<T> {
-
-	private _size = 0;
-	private runningPromises: number;
-	private readonly maxDegreeOfParalellism: number;
-	private readonly outstandingPromises: ILimitedTaskFactory<T>[];
-
-	constructor(maxDegreeOfParalellism: number) {
-		this.maxDegreeOfParalellism = maxDegreeOfParalellism;
-		this.outstandingPromises = [];
-		this.runningPromises = 0;
-	}
-
-	get size(): number {
-		return this._size;
-	}
-
-	queue(factory: ITask<Promise<T>>): Promise<T> {
-		this._size++;
-
-		return new Promise<T>((c, e) => {
-			this.outstandingPromises.push({ factory, c, e });
-			this.consume();
-		});
-	}
-
-	private consume(): void {
-		while (this.outstandingPromises.length && this.runningPromises < this.maxDegreeOfParalellism) {
-			const iLimitedTask = this.outstandingPromises.shift()!;
-			this.runningPromises++;
-
-			const promise = iLimitedTask.factory();
-			promise.then(iLimitedTask.c, iLimitedTask.e);
-			promise.then(() => this.consumed(), () => this.consumed());
-		}
-	}
-
-	private consumed(): void {
-		this._size--;
-		this.runningPromises--;
-
-		if (this.outstandingPromises.length > 0) {
-			this.consume();
-		}
-	}
-}
diff --git a/extensions/markdown-language-features/server/src/util/resourceMap.ts b/extensions/markdown-language-features/server/src/util/resourceMap.ts
deleted file mode 100644
index 7cec9d661d3..00000000000
--- a/extensions/markdown-language-features/server/src/util/resourceMap.ts
+++ /dev/null
@@ -1,69 +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 { URI } from 'vscode-uri';
-
-
-type ResourceToKey = (uri: URI) => string;
-
-const defaultResourceToKey = (resource: URI): string => resource.toString();
-
-export class ResourceMap<T> {
-
-	private readonly map = new Map<string, { readonly uri: URI; readonly value: T }>();
-
-	private readonly toKey: ResourceToKey;
-
-	constructor(toKey: ResourceToKey = defaultResourceToKey) {
-		this.toKey = toKey;
-	}
-
-	public set(uri: URI, value: T): this {
-		this.map.set(this.toKey(uri), { uri, value });
-		return this;
-	}
-
-	public get(resource: URI): T | undefined {
-		return this.map.get(this.toKey(resource))?.value;
-	}
-
-	public has(resource: URI): boolean {
-		return this.map.has(this.toKey(resource));
-	}
-
-	public get size(): number {
-		return this.map.size;
-	}
-
-	public clear(): void {
-		this.map.clear();
-	}
-
-	public delete(resource: URI): boolean {
-		return this.map.delete(this.toKey(resource));
-	}
-
-	public *values(): IterableIterator<T> {
-		for (const entry of this.map.values()) {
-			yield entry.value;
-		}
-	}
-
-	public *keys(): IterableIterator<URI> {
-		for (const entry of this.map.values()) {
-			yield entry.uri;
-		}
-	}
-
-	public *entries(): IterableIterator<[URI, T]> {
-		for (const entry of this.map.values()) {
-			yield [entry.uri, entry.value];
-		}
-	}
-
-	public [Symbol.iterator](): IterableIterator<[URI, T]> {
-		return this.entries();
-	}
-}
diff --git a/extensions/markdown-language-features/server/src/workspace.ts b/extensions/markdown-language-features/server/src/workspace.ts
deleted file mode 100644
index 13e5c6b4472..00000000000
--- a/extensions/markdown-language-features/server/src/workspace.ts
+++ /dev/null
@@ -1,433 +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 { Connection, Emitter, FileChangeType, NotebookDocuments, Position, Range, TextDocuments } from 'vscode-languageserver';
-import { TextDocument } from 'vscode-languageserver-textdocument';
-import * as md from 'vscode-markdown-languageservice';
-import { URI } from 'vscode-uri';
-import { LsConfiguration } from './config';
-import * as protocol from './protocol';
-import { isMarkdownFile, looksLikeMarkdownPath } from './util/file';
-import { Limiter } from './util/limiter';
-import { ResourceMap } from './util/resourceMap';
-import { Schemes } from './util/schemes';
-
-declare const TextDecoder: any;
-
-class VsCodeDocument implements md.ITextDocument {
-
-	private inMemoryDoc?: TextDocument;
-	private onDiskDoc?: TextDocument;
-
-	readonly uri: string;
-
-	constructor(uri: string, init: { inMemoryDoc: TextDocument });
-	constructor(uri: string, init: { onDiskDoc: TextDocument });
-	constructor(uri: string, init: { inMemoryDoc?: TextDocument; onDiskDoc?: TextDocument }) {
-		this.uri = uri;
-		this.inMemoryDoc = init?.inMemoryDoc;
-		this.onDiskDoc = init?.onDiskDoc;
-	}
-
-	get version(): number {
-		return this.inMemoryDoc?.version ?? this.onDiskDoc?.version ?? 0;
-	}
-
-	get lineCount(): number {
-		return this.inMemoryDoc?.lineCount ?? this.onDiskDoc?.lineCount ?? 0;
-	}
-
-	getText(range?: Range): string {
-		if (this.inMemoryDoc) {
-			return this.inMemoryDoc.getText(range);
-		}
-
-		if (this.onDiskDoc) {
-			return this.onDiskDoc.getText(range);
-		}
-
-		throw new Error('Document has been closed');
-	}
-
-	positionAt(offset: number): Position {
-		if (this.inMemoryDoc) {
-			return this.inMemoryDoc.positionAt(offset);
-		}
-
-		if (this.onDiskDoc) {
-			return this.onDiskDoc.positionAt(offset);
-		}
-
-		throw new Error('Document has been closed');
-	}
-
-	offsetAt(position: Position): number {
-		if (this.inMemoryDoc) {
-			return this.inMemoryDoc.offsetAt(position);
-		}
-
-		if (this.onDiskDoc) {
-			return this.onDiskDoc.offsetAt(position);
-		}
-
-		throw new Error('Document has been closed');
-	}
-
-	hasInMemoryDoc(): boolean {
-		return !!this.inMemoryDoc;
-	}
-
-	isDetached(): boolean {
-		return !this.onDiskDoc && !this.inMemoryDoc;
-	}
-
-	setInMemoryDoc(doc: TextDocument | undefined) {
-		this.inMemoryDoc = doc;
-	}
-
-	setOnDiskDoc(doc: TextDocument | undefined) {
-		this.onDiskDoc = doc;
-	}
-}
-
-export class VsCodeClientWorkspace implements md.IWorkspaceWithWatching {
-
-	private readonly _onDidCreateMarkdownDocument = new Emitter<md.ITextDocument>();
-	public readonly onDidCreateMarkdownDocument = this._onDidCreateMarkdownDocument.event;
-
-	private readonly _onDidChangeMarkdownDocument = new Emitter<md.ITextDocument>();
-	public readonly onDidChangeMarkdownDocument = this._onDidChangeMarkdownDocument.event;
-
-	private readonly _onDidDeleteMarkdownDocument = new Emitter<URI>();
-	public readonly onDidDeleteMarkdownDocument = this._onDidDeleteMarkdownDocument.event;
-
-	private readonly _documentCache = new ResourceMap<VsCodeDocument>();
-
-	private readonly _utf8Decoder = new TextDecoder('utf-8');
-
-	private _watcherPool = 0;
-	private readonly _watchers = new Map<number, {
-		readonly resource: URI;
-		readonly options: md.FileWatcherOptions;
-		readonly onDidChange: Emitter<URI>;
-		readonly onDidCreate: Emitter<URI>;
-		readonly onDidDelete: Emitter<URI>;
-	}>();
-
-	constructor(
-		private readonly connection: Connection,
-		private readonly config: LsConfiguration,
-		private readonly documents: TextDocuments<TextDocument>,
-		private readonly notebooks: NotebookDocuments<TextDocument>,
-		private readonly logger: md.ILogger,
-	) {
-		documents.onDidOpen(e => {
-			if (!this.isRelevantMarkdownDocument(e.document)) {
-				return;
-			}
-
-			this.logger.log(md.LogLevel.Trace, 'VsCodeClientWorkspace.TextDocument.onDidOpen', { document: e.document.uri });
-
-			const uri = URI.parse(e.document.uri);
-			const doc = this._documentCache.get(uri);
-
-			if (doc) {
-				// File already existed on disk
-				doc.setInMemoryDoc(e.document);
-
-				// The content visible to the language service may have changed since the in-memory doc
-				// may differ from the one on-disk. To be safe we always fire a change event.
-				this._onDidChangeMarkdownDocument.fire(doc);
-			} else {
-				// We're creating the file for the first time
-				const doc = new VsCodeDocument(e.document.uri, { inMemoryDoc: e.document });
-				this._documentCache.set(uri, doc);
-				this._onDidCreateMarkdownDocument.fire(doc);
-			}
-		});
-
-		documents.onDidChangeContent(e => {
-			if (!this.isRelevantMarkdownDocument(e.document)) {
-				return;
-			}
-
-			this.logger.log(md.LogLevel.Trace, 'VsCodeClientWorkspace.TextDocument.onDidChanceContent', { document: e.document.uri });
-
-			const uri = URI.parse(e.document.uri);
-			const entry = this._documentCache.get(uri);
-			if (entry) {
-				entry.setInMemoryDoc(e.document);
-				this._onDidChangeMarkdownDocument.fire(entry);
-			}
-		});
-
-		documents.onDidClose(async e => {
-			if (!this.isRelevantMarkdownDocument(e.document)) {
-				return;
-			}
-
-			this.logger.log(md.LogLevel.Trace, 'VsCodeClientWorkspace.TextDocument.onDidClose', { document: e.document.uri });
-
-			const uri = URI.parse(e.document.uri);
-			const doc = this._documentCache.get(uri);
-			if (!doc) {
-				// Document was never opened
-				return;
-			}
-
-			doc.setInMemoryDoc(undefined);
-			if (doc.isDetached()) {
-				// The document has been fully closed
-				this.doDeleteDocument(uri);
-				return;
-			}
-
-			// Check that if file has been deleted on disk.
-			// This can happen when directories are renamed / moved. VS Code's file system watcher does not
-			// notify us when this happens.
-			if (!(await this.statBypassingCache(uri))) {
-				if (this._documentCache.get(uri) === doc && !doc.hasInMemoryDoc()) {
-					this.doDeleteDocument(uri);
-					return;
-				}
-			}
-
-			// The document still exists on disk
-			// To be safe, tell the service that the document has changed because the
-			// in-memory doc contents may be different than the disk doc contents.
-			this._onDidChangeMarkdownDocument.fire(doc);
-		});
-
-		connection.onDidChangeWatchedFiles(async ({ changes }) => {
-			for (const change of changes) {
-				const resource = URI.parse(change.uri);
-				this.logger.log(md.LogLevel.Trace, 'VsCodeClientWorkspace.onDidChangeWatchedFiles', { type: change.type, resource: resource.toString() });
-				switch (change.type) {
-					case FileChangeType.Changed: {
-						const entry = this._documentCache.get(resource);
-						if (entry) {
-							// Refresh the on-disk state
-							const document = await this.openMarkdownDocumentFromFs(resource);
-							if (document) {
-								this._onDidChangeMarkdownDocument.fire(document);
-							}
-						}
-						break;
-					}
-					case FileChangeType.Created: {
-						const entry = this._documentCache.get(resource);
-						if (entry) {
-							// Create or update the on-disk state
-							const document = await this.openMarkdownDocumentFromFs(resource);
-							if (document) {
-								this._onDidCreateMarkdownDocument.fire(document);
-							}
-						}
-						break;
-					}
-					case FileChangeType.Deleted: {
-						const entry = this._documentCache.get(resource);
-						if (entry) {
-							entry.setOnDiskDoc(undefined);
-							if (entry.isDetached()) {
-								this.doDeleteDocument(resource);
-							}
-						}
-						break;
-					}
-				}
-			}
-		});
-
-		connection.onRequest(protocol.fs_watcher_onChange, params => {
-			this.logger.log(md.LogLevel.Trace, 'VsCodeClientWorkspace.fs_watcher_onChange', { kind: params.kind, uri: params.uri });
-
-			const watcher = this._watchers.get(params.id);
-			if (!watcher) {
-				return;
-			}
-
-			switch (params.kind) {
-				case 'create': watcher.onDidCreate.fire(URI.parse(params.uri)); return;
-				case 'change': watcher.onDidChange.fire(URI.parse(params.uri)); return;
-				case 'delete': watcher.onDidDelete.fire(URI.parse(params.uri)); return;
-			}
-		});
-	}
-
-	public listen() {
-		this.connection.workspace.onDidChangeWorkspaceFolders(async () => {
-			this.workspaceFolders = (await this.connection.workspace.getWorkspaceFolders() ?? []).map(x => URI.parse(x.uri));
-		});
-	}
-
-	private _workspaceFolders: readonly URI[] = [];
-
-	get workspaceFolders(): readonly URI[] {
-		return this._workspaceFolders;
-	}
-
-	set workspaceFolders(value: readonly URI[]) {
-		this._workspaceFolders = value;
-	}
-
-	async getAllMarkdownDocuments(): Promise<Iterable<md.ITextDocument>> {
-		// Add opened files (such as untitled files)
-		const openTextDocumentResults = this.documents.all()
-			.filter(doc => this.isRelevantMarkdownDocument(doc));
-
-		const allDocs = new ResourceMap<md.ITextDocument>();
-		for (const doc of openTextDocumentResults) {
-			allDocs.set(URI.parse(doc.uri), doc);
-		}
-
-		// And then add files on disk
-		const maxConcurrent = 20;
-		const limiter = new Limiter<md.ITextDocument | undefined>(maxConcurrent);
-		const resources = await this.connection.sendRequest(protocol.findMarkdownFilesInWorkspace, {});
-		await Promise.all(resources.map(strResource => {
-			return limiter.queue(async () => {
-				const resource = URI.parse(strResource);
-				if (allDocs.has(resource)) {
-					return;
-				}
-
-				const doc = await this.openMarkdownDocument(resource);
-				if (doc) {
-					allDocs.set(resource, doc);
-				}
-				return doc;
-			});
-		}));
-
-		return allDocs.values();
-	}
-
-	hasMarkdownDocument(resource: URI): boolean {
-		return !!this.documents.get(resource.toString());
-	}
-
-	async openMarkdownDocument(resource: URI): Promise<md.ITextDocument | undefined> {
-		const existing = this._documentCache.get(resource);
-		if (existing) {
-			return existing;
-		}
-
-		const matchingDocument = this.documents.get(resource.toString());
-		if (matchingDocument) {
-			let entry = this._documentCache.get(resource);
-			if (entry) {
-				entry.setInMemoryDoc(matchingDocument);
-			} else {
-				entry = new VsCodeDocument(resource.toString(), { inMemoryDoc: matchingDocument });
-				this._documentCache.set(resource, entry);
-			}
-
-			return entry;
-		}
-
-		return this.openMarkdownDocumentFromFs(resource);
-	}
-
-	private async openMarkdownDocumentFromFs(resource: URI): Promise<md.ITextDocument | undefined> {
-		if (!looksLikeMarkdownPath(this.config, resource)) {
-			return undefined;
-		}
-
-		try {
-			const response = await this.connection.sendRequest(protocol.fs_readFile, { uri: resource.toString() });
-			// TODO: LSP doesn't seem to handle Array buffers well
-			const bytes = new Uint8Array(response);
-
-			// We assume that markdown is in UTF-8
-			const text = this._utf8Decoder.decode(bytes);
-			const doc = new VsCodeDocument(resource.toString(), {
-				onDiskDoc: TextDocument.create(resource.toString(), 'markdown', 0, text)
-			});
-			this._documentCache.set(resource, doc);
-			return doc;
-		} catch (e) {
-			return undefined;
-		}
-	}
-
-	async stat(resource: URI): Promise<md.FileStat | undefined> {
-		this.logger.log(md.LogLevel.Trace, 'VsCodeClientWorkspace.stat', { resource: resource.toString() });
-		if (this._documentCache.has(resource)) {
-			return { isDirectory: false };
-		}
-		return this.statBypassingCache(resource);
-	}
-
-	private async statBypassingCache(resource: URI): Promise<md.FileStat | undefined> {
-		const uri = resource.toString();
-		if (this.documents.get(uri)) {
-			return { isDirectory: false };
-		}
-		const fsResult = await this.connection.sendRequest(protocol.fs_stat, { uri });
-		return fsResult ?? undefined; // Force convert null to undefined
-	}
-
-	async readDirectory(resource: URI): Promise<[string, md.FileStat][]> {
-		this.logger.log(md.LogLevel.Trace, 'VsCodeClientWorkspace.readDir', { resource: resource.toString() });
-		return this.connection.sendRequest(protocol.fs_readDirectory, { uri: resource.toString() });
-	}
-
-	getContainingDocument(resource: URI): md.ContainingDocumentContext | undefined {
-		if (resource.scheme === Schemes.notebookCell) {
-			const nb = this.notebooks.findNotebookDocumentForCell(resource.toString());
-			if (nb) {
-				return {
-					uri: URI.parse(nb.uri),
-					children: nb.cells.map(cell => ({ uri: URI.parse(cell.document) })),
-				};
-			}
-		}
-		return undefined;
-	}
-
-	watchFile(resource: URI, options: md.FileWatcherOptions): md.IFileSystemWatcher {
-		const id = this._watcherPool++;
-		this.logger.log(md.LogLevel.Trace, 'VsCodeClientWorkspace.watchFile', { id, resource: resource.toString() });
-
-		const entry = {
-			resource,
-			options,
-			onDidCreate: new Emitter<URI>(),
-			onDidChange: new Emitter<URI>(),
-			onDidDelete: new Emitter<URI>(),
-		};
-		this._watchers.set(id, entry);
-
-		this.connection.sendRequest(protocol.fs_watcher_create, {
-			id,
-			uri: resource.toString(),
-			options,
-			watchParentDirs: true,
-		});
-
-		return {
-			onDidCreate: entry.onDidCreate.event,
-			onDidChange: entry.onDidChange.event,
-			onDidDelete: entry.onDidDelete.event,
-			dispose: () => {
-				this.logger.log(md.LogLevel.Trace, 'VsCodeClientWorkspace.disposeWatcher', { id, resource: resource.toString() });
-				this.connection.sendRequest(protocol.fs_watcher_delete, { id });
-				this._watchers.delete(id);
-			}
-		};
-	}
-
-	private isRelevantMarkdownDocument(doc: TextDocument) {
-		return isMarkdownFile(doc) && URI.parse(doc.uri).scheme !== 'vscode-bulkeditpreview';
-	}
-
-	private doDeleteDocument(uri: URI) {
-		this.logger.log(md.LogLevel.Trace, 'VsCodeClientWorkspace.deleteDocument', { document: uri.toString() });
-
-		this._documentCache.delete(uri);
-		this._onDidDeleteMarkdownDocument.fire(uri);
-	}
-}
diff --git a/extensions/markdown-language-features/server/tsconfig.json b/extensions/markdown-language-features/server/tsconfig.json
deleted file mode 100644
index 0a73af08ed8..00000000000
--- a/extensions/markdown-language-features/server/tsconfig.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"extends": "../../tsconfig.base.json",
-	"compilerOptions": {
-		"outDir": "./out",
-		"lib": [
-			"ES2020",
-			"ES2021.Promise",
-			"WebWorker"
-		]
-	},
-	"include": [
-		"src/**/*"
-	]
-}
diff --git a/extensions/markdown-language-features/server/yarn.lock b/extensions/markdown-language-features/server/yarn.lock
deleted file mode 100644
index 148783435bd..00000000000
--- a/extensions/markdown-language-features/server/yarn.lock
+++ /dev/null
@@ -1,176 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@types/node@20.x":
-  version "20.11.24"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792"
-  integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==
-  dependencies:
-    undici-types "~5.26.4"
-
-"@vscode/l10n@^0.0.10":
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/@vscode/l10n/-/l10n-0.0.10.tgz#9c513107c690c0dd16e3ec61e453743de15ebdb0"
-  integrity sha512-E1OCmDcDWa0Ya7vtSjp/XfHFGqYJfh+YPC1RkATU71fTac+j1JjCcB3qwSzmlKAighx2WxhLlfhS0RwAN++PFQ==
-
-"@vscode/l10n@^0.0.11":
-  version "0.0.11"
-  resolved "https://registry.yarnpkg.com/@vscode/l10n/-/l10n-0.0.11.tgz#325d7beb2cfb87162bc624d16c4d546de6a73b72"
-  integrity sha512-ukOMWnCg1tCvT7WnDfsUKQOFDQGsyR5tNgRpwmqi+5/vzU3ghdDXzvIM4IOPdSb3OeSsBNvmSL8nxIVOqi2WXA==
-
-boolbase@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
-  integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
-
-css-select@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-5.1.0.tgz#b8ebd6554c3637ccc76688804ad3f6a6fdaea8a6"
-  integrity sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==
-  dependencies:
-    boolbase "^1.0.0"
-    css-what "^6.1.0"
-    domhandler "^5.0.2"
-    domutils "^3.0.1"
-    nth-check "^2.0.1"
-
-css-what@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4"
-  integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==
-
-dom-serializer@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53"
-  integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==
-  dependencies:
-    domelementtype "^2.3.0"
-    domhandler "^5.0.2"
-    entities "^4.2.0"
-
-domelementtype@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
-  integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
-
-domhandler@^5.0.2, domhandler@^5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31"
-  integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==
-  dependencies:
-    domelementtype "^2.3.0"
-
-domutils@^3.0.1:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.1.0.tgz#c47f551278d3dc4b0b1ab8cbb42d751a6f0d824e"
-  integrity sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==
-  dependencies:
-    dom-serializer "^2.0.0"
-    domelementtype "^2.3.0"
-    domhandler "^5.0.3"
-
-entities@^4.2.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
-  integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
-
-he@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
-  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
-
-node-html-parser@^6.1.5:
-  version "6.1.5"
-  resolved "https://registry.yarnpkg.com/node-html-parser/-/node-html-parser-6.1.5.tgz#c819dceb13a10a7642ff92f94f870b4f77968097"
-  integrity sha512-fAaM511feX++/Chnhe475a0NHD8M7AxDInsqQpz6x63GRF7xYNdS8Vo5dKsIVPgsOvG7eioRRTZQnWBrhDHBSg==
-  dependencies:
-    css-select "^5.1.0"
-    he "1.2.0"
-
-nth-check@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d"
-  integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==
-  dependencies:
-    boolbase "^1.0.0"
-
-picomatch@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
-  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
-
-vscode-jsonrpc@8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0.tgz#cb9989c65e219e18533cc38e767611272d274c94"
-  integrity sha512-6TDy/abTQk+zDGYazgbIPc+4JoXdwC8NHU9Pbn4UJP1fehUyZmM4RHp5IthX7A6L5KS30PRui+j+tbbMMMafdw==
-
-vscode-jsonrpc@8.2.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz#f43dfa35fb51e763d17cd94dcca0c9458f35abf9"
-  integrity sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==
-
-vscode-languageserver-protocol@3.17.3:
-  version "3.17.3"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3.tgz#6d0d54da093f0c0ee3060b81612cce0f11060d57"
-  integrity sha512-924/h0AqsMtA5yK22GgMtCYiMdCOtWTSGgUOkgEDX+wk2b0x4sAfLiO4NxBxqbiVtz7K7/1/RgVrVI0NClZwqA==
-  dependencies:
-    vscode-jsonrpc "8.1.0"
-    vscode-languageserver-types "3.17.3"
-
-vscode-languageserver-protocol@^3.17.1:
-  version "3.17.5"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz#864a8b8f390835572f4e13bd9f8313d0e3ac4bea"
-  integrity sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==
-  dependencies:
-    vscode-jsonrpc "8.2.0"
-    vscode-languageserver-types "3.17.5"
-
-vscode-languageserver-textdocument@^1.0.11:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.11.tgz#0822a000e7d4dc083312580d7575fe9e3ba2e2bf"
-  integrity sha512-X+8T3GoiwTVlJbicx/sIAF+yuJAqz8VvwJyoMVhwEMoEKE/fkDmrqUgDMyBECcM2A2frVZIUj5HI/ErRXCfOeA==
-
-vscode-languageserver-textdocument@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.8.tgz#9eae94509cbd945ea44bca8dcfe4bb0c15bb3ac0"
-  integrity sha512-1bonkGqQs5/fxGT5UchTgjGVnfysL0O8v1AYMBjqTbWQTFn721zaPGDYFkOKtfDgFiSgXM3KwaG3FMGfW4Ed9Q==
-
-vscode-languageserver-types@3.17.3, vscode-languageserver-types@^3.17.3:
-  version "3.17.3"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.3.tgz#72d05e47b73be93acb84d6e311b5786390f13f64"
-  integrity sha512-SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA==
-
-vscode-languageserver-types@3.17.5:
-  version "3.17.5"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz#3273676f0cf2eab40b3f44d085acbb7f08a39d8a"
-  integrity sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==
-
-vscode-languageserver@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-8.1.0.tgz#5024253718915d84576ce6662dd46a791498d827"
-  integrity sha512-eUt8f1z2N2IEUDBsKaNapkz7jl5QpskN2Y0G01T/ItMxBxw1fJwvtySGB9QMecatne8jFIWJGWI61dWjyTLQsw==
-  dependencies:
-    vscode-languageserver-protocol "3.17.3"
-
-vscode-markdown-languageservice@^0.5.0-alpha.6:
-  version "0.5.0-alpha.6"
-  resolved "https://registry.yarnpkg.com/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.5.0-alpha.6.tgz#3aa5fc94fea3d5d7f0cd970e64348e2791643dc0"
-  integrity sha512-mA1JCA7aHHSek5gr8Yv7C3esEPo2hRrgxmoZUDRro+pnwbdsJuRaWOKWtCWxejRUVVVhc/5yTK2X64Jx9OCmFQ==
-  dependencies:
-    "@vscode/l10n" "^0.0.10"
-    node-html-parser "^6.1.5"
-    picomatch "^2.3.1"
-    vscode-languageserver-protocol "^3.17.1"
-    vscode-languageserver-textdocument "^1.0.11"
-    vscode-uri "^3.0.7"
-
-vscode-uri@^3.0.7:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.7.tgz#6d19fef387ee6b46c479e5fb00870e15e58c1eb8"
-  integrity sha512-eOpPHogvorZRobNqJGhapa0JdwaxpjVvyBp0QIUMRMSf8ZAlqOdEquKuRmw9Qwu0qXtJIWqFtMkmvJjUZmMjVA==
diff --git a/extensions/markdown-language-features/src/extension.browser.ts b/extensions/markdown-language-features/src/extension.browser.ts
index 30639672490..2bfc63fc857 100644
--- a/extensions/markdown-language-features/src/extension.browser.ts
+++ b/extensions/markdown-language-features/src/extension.browser.ts
@@ -27,7 +27,7 @@ export async function activate(context: vscode.ExtensionContext) {
 }
 
 function startServer(context: vscode.ExtensionContext, parser: IMdParser): Promise<MdLanguageClient> {
-	const serverMain = vscode.Uri.joinPath(context.extensionUri, 'server/dist/browser/workerMain.js');
+	const serverMain = vscode.Uri.joinPath(context.extensionUri, 'dist', 'browser', 'serverWorkerMain.js');
 
 	const worker = new Worker(serverMain.toString());
 	worker.postMessage({ i10lLocation: vscode.l10n.uri?.toString() ?? '' });
diff --git a/extensions/markdown-language-features/src/extension.ts b/extensions/markdown-language-features/src/extension.ts
index b14ab6d0e7e..98ea87df069 100644
--- a/extensions/markdown-language-features/src/extension.ts
+++ b/extensions/markdown-language-features/src/extension.ts
@@ -27,10 +27,15 @@ export async function activate(context: vscode.ExtensionContext) {
 }
 
 function startServer(context: vscode.ExtensionContext, parser: IMdParser): Promise<MdLanguageClient> {
-	const clientMain = vscode.extensions.getExtension('vscode.markdown-language-features')?.packageJSON?.main || '';
+	const isDebugBuild = context.extension.packageJSON.main.includes('/out/');
 
-	const serverMain = `./server/${clientMain.indexOf('/dist/') !== -1 ? 'dist' : 'out'}/node/workerMain`;
-	const serverModule = context.asAbsolutePath(serverMain);
+	const serverModule = context.asAbsolutePath(
+		isDebugBuild
+			// For local non bundled version of vscode-markdown-languageserver
+			// ? './node_modules/vscode-markdown-languageserver/out/node/workerMain'
+			? './node_modules/vscode-markdown-languageserver/dist/node/workerMain'
+			: './dist/serverWorkerMain'
+	);
 
 	// The debug options for the server
 	const debugOptions = { execArgv: ['--nolazy', '--inspect=' + (7000 + Math.round(Math.random() * 999))] };
diff --git a/extensions/markdown-language-features/src/languageFeatures/updateLinksOnPaste.ts b/extensions/markdown-language-features/src/languageFeatures/updateLinksOnPaste.ts
index 36b6eacfcfd..c8ad4c722fd 100644
--- a/extensions/markdown-language-features/src/languageFeatures/updateLinksOnPaste.ts
+++ b/extensions/markdown-language-features/src/languageFeatures/updateLinksOnPaste.ts
@@ -9,7 +9,7 @@ import { Mime } from '../util/mimes';
 
 class UpdatePastedLinksEditProvider implements vscode.DocumentPasteEditProvider {
 
-	public static readonly kind = vscode.DocumentDropOrPasteEditKind.Empty.append('text', 'markdown', 'updateLinks');
+	public static readonly kind = vscode.DocumentDropOrPasteEditKind.Empty.append('markdown', 'updateLinks');
 
 	public static readonly metadataMime = 'vnd.vscode.markdown.updateLinksMetadata';
 
@@ -26,6 +26,7 @@ class UpdatePastedLinksEditProvider implements vscode.DocumentPasteEditProvider
 		if (token.isCancellationRequested) {
 			return;
 		}
+
 		dataTransfer.set(UpdatePastedLinksEditProvider.metadataMime, new vscode.DataTransferItem(metadata));
 	}
 
@@ -33,7 +34,7 @@ class UpdatePastedLinksEditProvider implements vscode.DocumentPasteEditProvider
 		document: vscode.TextDocument,
 		ranges: readonly vscode.Range[],
 		dataTransfer: vscode.DataTransfer,
-		_context: vscode.DocumentPasteEditContext,
+		context: vscode.DocumentPasteEditContext,
 		token: vscode.CancellationToken,
 	): Promise<vscode.DocumentPasteEdit[] | undefined> {
 		if (!this._isEnabled(document)) {
@@ -56,7 +57,7 @@ class UpdatePastedLinksEditProvider implements vscode.DocumentPasteEditProvider
 		// - Copy with multiple cursors and paste into multiple locations
 		// - ...
 		const edits = await this._client.getUpdatePastedLinksEdit(document.uri, ranges.map(x => new vscode.TextEdit(x, text)), metadata, token);
-		if (!edits || !edits.length || token.isCancellationRequested) {
+		if (!edits?.length || token.isCancellationRequested) {
 			return;
 		}
 
@@ -64,11 +65,16 @@ class UpdatePastedLinksEditProvider implements vscode.DocumentPasteEditProvider
 		const workspaceEdit = new vscode.WorkspaceEdit();
 		workspaceEdit.set(document.uri, edits.map(x => new vscode.TextEdit(new vscode.Range(x.range.start.line, x.range.start.character, x.range.end.line, x.range.end.character,), x.newText)));
 		pasteEdit.additionalEdit = workspaceEdit;
+
+		if (!context.only || !UpdatePastedLinksEditProvider.kind.contains(context.only)) {
+			pasteEdit.yieldTo = [vscode.DocumentDropOrPasteEditKind.Empty.append('text')];
+		}
+
 		return [pasteEdit];
 	}
 
 	private _isEnabled(document: vscode.TextDocument): boolean {
-		return vscode.workspace.getConfiguration('markdown', document.uri).get<boolean>('experimental.updateLinksOnPaste', false);
+		return vscode.workspace.getConfiguration('markdown', document.uri).get<boolean>('editor.updateLinksOnPaste.enabled', true);
 	}
 }
 
diff --git a/extensions/markdown-language-features/src/markdownEngine.ts b/extensions/markdown-language-features/src/markdownEngine.ts
index 103cbc191e4..5f6e746a82d 100644
--- a/extensions/markdown-language-features/src/markdownEngine.ts
+++ b/extensions/markdown-language-features/src/markdownEngine.ts
@@ -313,7 +313,7 @@ export class MarkdownItEngine implements IMdParser {
 	private _addNamedHeaders(md: MarkdownIt): void {
 		const original = md.renderer.rules.heading_open;
 		md.renderer.rules.heading_open = (tokens: Token[], idx: number, options, env, self) => {
-			const title = tokens[idx + 1].children!.reduce<string>((acc, t) => acc + t.content, '');
+			const title = this._tokenToPlainText(tokens[idx + 1]);
 			let slug = this.slugifier.fromHeading(title);
 
 			if (this._slugCount.has(slug.value)) {
@@ -334,6 +334,21 @@ export class MarkdownItEngine implements IMdParser {
 		};
 	}
 
+	private _tokenToPlainText(token: Token): string {
+		if (token.children) {
+			return token.children.map(x => this._tokenToPlainText(x)).join('');
+		}
+
+		switch (token.type) {
+			case 'text':
+			case 'emoji':
+			case 'code_inline':
+				return token.content;
+			default:
+				return '';
+		}
+	}
+
 	private _addLinkRenderer(md: MarkdownIt): void {
 		const original = md.renderer.rules.link_open;
 
diff --git a/extensions/markdown-language-features/src/util/openDocumentLink.ts b/extensions/markdown-language-features/src/util/openDocumentLink.ts
index 4fc423d3675..285dd91029b 100644
--- a/extensions/markdown-language-features/src/util/openDocumentLink.ts
+++ b/extensions/markdown-language-features/src/util/openDocumentLink.ts
@@ -49,10 +49,10 @@ export class MdLinkOpener {
 					}
 				}
 
-				return vscode.commands.executeCommand('vscode.open', uri, <vscode.TextDocumentShowOptions>{
+				return vscode.commands.executeCommand('vscode.open', uri, {
 					selection: resolved.position ? new vscode.Range(resolved.position.line, resolved.position.character, resolved.position.line, resolved.position.character) : undefined,
 					viewColumn: viewColumn ?? getViewColumn(fromResource),
-				});
+				} satisfies vscode.TextDocumentShowOptions);
 			}
 		}
 	}
diff --git a/extensions/markdown-language-features/yarn.lock b/extensions/markdown-language-features/yarn.lock
deleted file mode 100644
index 2b688e40592..00000000000
--- a/extensions/markdown-language-features/yarn.lock
+++ /dev/null
@@ -1,351 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@microsoft/1ds-core-js@4.0.3", "@microsoft/1ds-core-js@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@microsoft/1ds-core-js/-/1ds-core-js-4.0.3.tgz#c8a92c623745a9595e06558a866658480c33bdf9"
-  integrity sha512-FrxNLVAPsAvD7+l63TlNS/Kodvpct2WulpDSn1dI4Xuy0kF4E2H867kHdwL/iY1Bj3zA3FSy/jvE4+OcDws7ug==
-  dependencies:
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/1ds-post-js@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@microsoft/1ds-post-js/-/1ds-post-js-4.0.3.tgz#cfcb20bb23fb6215d3f0732f60f5b7df3e624f86"
-  integrity sha512-uewvmUtXKd7ttypiKQGdYI6i7UUpPkOznLayzIFrJ4r2xnG6jhPjpKRncHFXPQcM4XSWO3yf5PQ3xAbPq9t7ZQ==
-  dependencies:
-    "@microsoft/1ds-core-js" "4.0.3"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-channel-js@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.0.4.tgz#247b6fe2158fad9826cbcdf7304f885766b36624"
-  integrity sha512-6TlfExmErQ8Y+/ChbkyWl+jyt4wg3T6p7lwXDsUCB0LgZmlEWMaCUS0YlT73JCWmE8j7vxW8yUm0lgsgmHns3A==
-  dependencies:
-    "@microsoft/applicationinsights-common" "3.0.4"
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-common@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-common/-/applicationinsights-common-3.0.4.tgz#c4aa53ba343f5b3c7fbf54cddd3c86a5bdcd95dc"
-  integrity sha512-r5gWaw/K9+tKfuo2GtDiDiKASgOkPOCrKW+wZzFvuR06uuwvWjbVQ6yW/YbnfuhRF5M65ksUiMi0eCMwEOGq7Q==
-  dependencies:
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-core-js@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.0.4.tgz#008308b786930d94a1de8a1fbb4af0351b74653e"
-  integrity sha512-anxy5kEkqBmVoEqJiJzaaXXA0wzqZi9U4zGd05xFJ04lWckP8dG3zyT3+GGdg7rDelqLTNGxndeYoFmDv63u1g==
-  dependencies:
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-shims@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz#3865b73ace8405b9c4618cc5c571f2fe3876f06f"
-  integrity sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==
-  dependencies:
-    "@nevware21/ts-utils" ">= 0.9.4 < 2.x"
-
-"@microsoft/applicationinsights-web-basic@^3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.0.4.tgz#9a23323276b4a5a0dc6a352e2de5d75e3c16b534"
-  integrity sha512-KfoxPlLlf0JT12ADb23C5iGye/yFouoMgHEKULxkSQcYY9SsW/8rVrqqvoYKAL+u215CZU2A8Kc8sR3ehEaPCQ==
-  dependencies:
-    "@microsoft/applicationinsights-channel-js" "3.0.4"
-    "@microsoft/applicationinsights-common" "3.0.4"
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/dynamicproto-js@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.2.tgz#e57fbec2e7067d48b7e8e1e1c1d354028ef718a6"
-  integrity sha512-MB8trWaFREpmb037k/d0bB7T2BP7Ai24w1e1tbz3ASLB0/lwphsq3Nq8S9I5AsI5vs4zAQT+SB5nC5/dLYTiOg==
-  dependencies:
-    "@nevware21/ts-utils" ">= 0.9.4 < 2.x"
-
-"@nevware21/ts-async@>= 0.3.0 < 2.x":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@nevware21/ts-async/-/ts-async-0.3.0.tgz#a8b97ba01065fc930de9a3f4dd4a05e862becc6c"
-  integrity sha512-ZUcgUH12LN/F6nzN0cYd0F/rJaMLmXr0EHVTyYfaYmK55bdwE4338uue4UiVoRqHVqNW4KDUrJc49iGogHKeWA==
-  dependencies:
-    "@nevware21/ts-utils" ">= 0.10.0 < 2.x"
-
-"@nevware21/ts-utils@>= 0.10.0 < 2.x", "@nevware21/ts-utils@>= 0.10.1 < 2.x", "@nevware21/ts-utils@>= 0.9.4 < 2.x":
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@nevware21/ts-utils/-/ts-utils-0.10.1.tgz#aa65abc71eba06749a396598f22263d26f796ac7"
-  integrity sha512-pMny25NnF2/MJwdqC3Iyjm2pGIXNxni4AROpcqDeWa+td9JMUY4bUS9uU9XW+BoBRqTLUL+WURF9SOd/6OQzRg==
-
-"@types/dompurify@^3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@types/dompurify/-/dompurify-3.0.2.tgz#c1cd33a475bc49c43c2a7900e41028e2136a4553"
-  integrity sha512-YBL4ziFebbbfQfH5mlC+QTJsvh0oJUrWbmxKMyEdL7emlHJqGR2Qb34TEFKj+VCayBvjKy3xczMFNhugThUsfQ==
-  dependencies:
-    "@types/trusted-types" "*"
-
-"@types/linkify-it@*":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.2.tgz#fd2cd2edbaa7eaac7e7f3c1748b52a19143846c9"
-  integrity sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==
-
-"@types/lodash.throttle@^4.1.3":
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/@types/lodash.throttle/-/lodash.throttle-4.1.3.tgz#8bfa4fec519d09ebce56c815bcbff3e55c604db9"
-  integrity sha512-FUm7uMuYRX7dzqmgX02bxdBwC75owUxGA4dDKtFePDLJ6N1ofXxkRX3NhJV8wOrNs/wCjaY6sDVJrD1lbyERoQ==
-  dependencies:
-    "@types/lodash" "*"
-
-"@types/lodash@*":
-  version "4.14.104"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.104.tgz#53ee2357fa2e6e68379341d92eb2ecea4b11bb80"
-  integrity sha512-ufQcVg4daO8xQ5kopxRHanqFdL4AI7ondQkV+2f+7mz3gvp0LkBx2zBRC6hfs3T87mzQFmf5Fck7Fi145Ul6NQ==
-
-"@types/markdown-it@12.2.3":
-  version "12.2.3"
-  resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-12.2.3.tgz#0d6f6e5e413f8daaa26522904597be3d6cd93b51"
-  integrity sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==
-  dependencies:
-    "@types/linkify-it" "*"
-    "@types/mdurl" "*"
-
-"@types/mdurl@*":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-1.0.2.tgz#e2ce9d83a613bacf284c7be7d491945e39e1f8e9"
-  integrity sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==
-
-"@types/picomatch@^2.3.0":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@types/picomatch/-/picomatch-2.3.0.tgz#75db5e75a713c5a83d5b76780c3da84a82806003"
-  integrity sha512-O397rnSS9iQI4OirieAtsDqvCj4+3eY1J+EPdNTKuHuRWIfUoGyzX294o8C4KJYaLqgSrd2o60c5EqCU8Zv02g==
-
-"@types/trusted-types@*":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.2.tgz#fc25ad9943bcac11cceb8168db4f275e0e72e756"
-  integrity sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg==
-
-"@types/vscode-notebook-renderer@^1.60.0":
-  version "1.60.0"
-  resolved "https://registry.yarnpkg.com/@types/vscode-notebook-renderer/-/vscode-notebook-renderer-1.60.0.tgz#8a67d561f48ddf46a95dfa9f712a79c72c7b8f7a"
-  integrity sha512-u7TD2uuEZTVuitx0iijOJdKI0JLiQP6PsSBSRy2XmHXUOXcp5p1S56NrjOEDoF+PIHd3NL3eO6KTRSf5nukDqQ==
-
-"@types/vscode-webview@^1.57.0":
-  version "1.57.0"
-  resolved "https://registry.yarnpkg.com/@types/vscode-webview/-/vscode-webview-1.57.0.tgz#bad5194d45ae8d03afc1c0f67f71ff5e7a243bbf"
-  integrity sha512-x3Cb/SMa1IwRHfSvKaZDZOTh4cNoG505c3NjTqGlMC082m++x/ETUmtYniDsw6SSmYzZXO8KBNhYxR0+VqymqA==
-
-"@vscode/extension-telemetry@^0.9.0":
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.9.0.tgz#8c6c61e253ff304f46045f04edd60059b144417a"
-  integrity sha512-37RxGHXrs3GoXPgCUKQhghEu0gxs8j27RLjQwwtSf4WhPdJKz8UrqMYzpsXlliQ05zURYmtdGZst9C6+hfWXaQ==
-  dependencies:
-    "@microsoft/1ds-core-js" "^4.0.3"
-    "@microsoft/1ds-post-js" "^4.0.3"
-    "@microsoft/applicationinsights-web-basic" "^3.0.4"
-
-"@vscode/l10n@^0.0.10":
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/@vscode/l10n/-/l10n-0.0.10.tgz#9c513107c690c0dd16e3ec61e453743de15ebdb0"
-  integrity sha512-E1OCmDcDWa0Ya7vtSjp/XfHFGqYJfh+YPC1RkATU71fTac+j1JjCcB3qwSzmlKAighx2WxhLlfhS0RwAN++PFQ==
-
-"@vscode/markdown-it-katex@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@vscode/markdown-it-katex/-/markdown-it-katex-1.0.2.tgz#27ba579fa3896b2944b71209dd30d0f983983f11"
-  integrity sha512-QY/OnOHPTqc8tQoCoAjVblILX4yE6xGZHKODtiTKqA328OXra+lSpeJO5Ouo9AAvrs9AwcCLz6xvW3zwcsPBQg==
-  dependencies:
-    katex "^0.16.4"
-
-argparse@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
-  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
-
-balanced-match@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
-  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
-
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-commander@^8.3.0:
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
-  integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
-
-dompurify@^3.0.5:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.0.5.tgz#eb3d9cfa10037b6e73f32c586682c4b2ab01fbed"
-  integrity sha512-F9e6wPGtY+8KNMRAVfxeCOHU0/NPWMSENNq4pQctuXRqqdEPW7q3CrLbR5Nse044WwacyjHGOMlvNsBe1y6z9A==
-
-entities@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
-  integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==
-
-highlight.js@^11.8.0:
-  version "11.8.0"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-11.8.0.tgz#966518ea83257bae2e7c9a48596231856555bb65"
-  integrity sha512-MedQhoqVdr0U6SSnWPzfiadUcDHfN/Wzq25AkXiQv9oiOO/sG0S7XkvpFIqWBl9Yq1UYyYOOVORs5UW2XlPyzg==
-
-katex@^0.16.4:
-  version "0.16.10"
-  resolved "https://registry.yarnpkg.com/katex/-/katex-0.16.10.tgz#6f81b71ac37ff4ec7556861160f53bc5f058b185"
-  integrity sha512-ZiqaC04tp2O5utMsl2TEZTXxa6WSC4yo0fv5ML++D3QZv/vx2Mct0mTlRx3O+uUkjfuAgOkzsCmq5MiUEsDDdA==
-  dependencies:
-    commander "^8.3.0"
-
-linkify-it@^3.0.1:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.3.tgz#a98baf44ce45a550efb4d49c769d07524cc2fa2e"
-  integrity sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==
-  dependencies:
-    uc.micro "^1.0.1"
-
-lodash.throttle@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
-  integrity sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=
-
-lru-cache@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
-  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
-  dependencies:
-    yallist "^4.0.0"
-
-markdown-it-front-matter@^0.2.4:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/markdown-it-front-matter/-/markdown-it-front-matter-0.2.4.tgz#cf29bc8222149b53575699357b1ece697bf39507"
-  integrity sha512-25GUs0yjS2hLl8zAemVndeEzThB1p42yxuDEKbd4JlL3jiz+jsm6e56Ya8B0VREOkNxLYB4TTwaoPJ3ElMmW+w==
-
-markdown-it@^12.3.2:
-  version "12.3.2"
-  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.3.2.tgz#bf92ac92283fe983fe4de8ff8abfb5ad72cd0c90"
-  integrity sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==
-  dependencies:
-    argparse "^2.0.1"
-    entities "~2.1.0"
-    linkify-it "^3.0.1"
-    mdurl "^1.0.1"
-    uc.micro "^1.0.5"
-
-mdurl@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
-  integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
-
-minimatch@^3.0.4:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-morphdom@^2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/morphdom/-/morphdom-2.6.1.tgz#e868e24f989fa3183004b159aed643e628b4306e"
-  integrity sha512-Y8YRbAEP3eKykroIBWrjcfMw7mmwJfjhqdpSvoqinu8Y702nAwikpXcNFDiIkyvfCLxLM9Wu95RZqo4a9jFBaA==
-
-picomatch@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
-  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
-
-semver@^7.3.5:
-  version "7.5.4"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
-  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
-  dependencies:
-    lru-cache "^6.0.0"
-
-uc.micro@^1.0.1, uc.micro@^1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
-  integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
-
-vscode-jsonrpc@8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.0.2.tgz#f239ed2cd6004021b6550af9fd9d3e47eee3cac9"
-  integrity sha512-RY7HwI/ydoC1Wwg4gJ3y6LpU9FJRZAUnTYMXthqhFXXu77ErDd/xkREpGuk4MyYkk4a+XDWAMqe0S3KkelYQEQ==
-
-vscode-languageclient@^8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-8.0.2.tgz#f1f23ce8c8484aa11e4b7dfb24437d3e59bb61c6"
-  integrity sha512-lHlthJtphG9gibGb/y72CKqQUxwPsMXijJVpHEC2bvbFqxmkj9LwQ3aGU9dwjBLqsX1S4KjShYppLvg1UJDF/Q==
-  dependencies:
-    minimatch "^3.0.4"
-    semver "^7.3.5"
-    vscode-languageserver-protocol "3.17.2"
-
-vscode-languageserver-protocol@3.17.2:
-  version "3.17.2"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.2.tgz#beaa46aea06ed061576586c5e11368a9afc1d378"
-  integrity sha512-8kYisQ3z/SQ2kyjlNeQxbkkTNmVFoQCqkmGrzLH6A9ecPlgTbp3wDTnUNqaUxYr4vlAcloxx8zwy7G5WdguYNg==
-  dependencies:
-    vscode-jsonrpc "8.0.2"
-    vscode-languageserver-types "3.17.2"
-
-vscode-languageserver-textdocument@^1.0.11:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.11.tgz#0822a000e7d4dc083312580d7575fe9e3ba2e2bf"
-  integrity sha512-X+8T3GoiwTVlJbicx/sIAF+yuJAqz8VvwJyoMVhwEMoEKE/fkDmrqUgDMyBECcM2A2frVZIUj5HI/ErRXCfOeA==
-
-vscode-languageserver-textdocument@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.5.tgz#838769940ece626176ec5d5a2aa2d0aa69f5095c"
-  integrity sha512-1ah7zyQjKBudnMiHbZmxz5bYNM9KKZYz+5VQLj+yr8l+9w3g+WAhCkUkWbhMEdC5u0ub4Ndiye/fDyS8ghIKQg==
-
-vscode-languageserver-types@3.17.2, vscode-languageserver-types@^3.17.1, vscode-languageserver-types@^3.17.2:
-  version "3.17.2"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz#b2c2e7de405ad3d73a883e91989b850170ffc4f2"
-  integrity sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA==
-
-vscode-markdown-languageservice@^0.3.0-alpha.3:
-  version "0.3.0-alpha.3"
-  resolved "https://registry.yarnpkg.com/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.3.0-alpha.3.tgz#219a4880cfc0ea037b5a1833bc0b0039bfd1e2db"
-  integrity sha512-KPjIuCkSqabkzci7TnlLKep5FYIC45tS7UC5H8zoOii7aoKJru5mZBDXJt86bM3XTgnfpW7rUYqhNnvXbbCBbw==
-  dependencies:
-    "@vscode/l10n" "^0.0.10"
-    picomatch "^2.3.1"
-    vscode-languageserver-textdocument "^1.0.5"
-    vscode-languageserver-types "^3.17.1"
-    vscode-uri "^3.0.3"
-
-vscode-uri@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.3.tgz#a95c1ce2e6f41b7549f86279d19f47951e4f4d84"
-  integrity sha512-EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA==
-
-yallist@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
-  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
diff --git a/extensions/markdown-math/.npmrc b/extensions/markdown-math/.npmrc
new file mode 100644
index 00000000000..a9c57709666
--- /dev/null
+++ b/extensions/markdown-math/.npmrc
@@ -0,0 +1,2 @@
+legacy-peer-deps="true"
+timeout=180000
diff --git a/extensions/markdown-math/.vscodeignore b/extensions/markdown-math/.vscodeignore
index 5ac0ae077c3..85f550b7d7b 100644
--- a/extensions/markdown-math/.vscodeignore
+++ b/extensions/markdown-math/.vscodeignore
@@ -4,7 +4,7 @@ extension-browser.webpack.config.js
 extension.webpack.config.js
 esbuild.js
 cgmanifest.json
-yarn.lock
+package-lock.json
 webpack.config.js
 tsconfig.json
 .gitignore
diff --git a/extensions/markdown-math/notebook/katex.ts b/extensions/markdown-math/notebook/katex.ts
index 94aad4f3c3b..ccc43046b32 100644
--- a/extensions/markdown-math/notebook/katex.ts
+++ b/extensions/markdown-math/notebook/katex.ts
@@ -51,7 +51,8 @@ export async function activate(ctx: RendererContext<void>) {
 		return md.use(katex, {
 			globalGroup: true,
 			enableBareBlocks: true,
-			macros
+			enableFencedBlocks: true,
+			macros,
 		});
 	});
 }
diff --git a/extensions/markdown-math/package-lock.json b/extensions/markdown-math/package-lock.json
new file mode 100644
index 00000000000..53a0866e61f
--- /dev/null
+++ b/extensions/markdown-math/package-lock.json
@@ -0,0 +1,66 @@
+{
+  "name": "markdown-math",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "markdown-math",
+      "version": "1.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "@vscode/markdown-it-katex": "^1.1.0"
+      },
+      "devDependencies": {
+        "@types/markdown-it": "^0.0.0",
+        "@types/vscode-notebook-renderer": "^1.60.0"
+      },
+      "engines": {
+        "vscode": "^1.54.0"
+      }
+    },
+    "node_modules/@types/markdown-it": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-0.0.0.tgz",
+      "integrity": "sha512-rLEOTm6Wi9M8GFnIK7VczXSEThIN/eVoevpTYVk+FD/DPX3N15Sj9b3vkjjDY63U0Zw1yawf13CI92CCHpC5kw==",
+      "dev": true
+    },
+    "node_modules/@types/vscode-notebook-renderer": {
+      "version": "1.72.0",
+      "resolved": "https://registry.npmjs.org/@types/vscode-notebook-renderer/-/vscode-notebook-renderer-1.72.0.tgz",
+      "integrity": "sha512-5iTjb39DpLn03ULUwrDR3L2Dy59RV4blSUHy0oLdQuIY11PhgWO4mXIcoFS0VxY1GZQ4IcjSf3ooT2Jrrcahnw==",
+      "dev": true
+    },
+    "node_modules/@vscode/markdown-it-katex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@vscode/markdown-it-katex/-/markdown-it-katex-1.1.0.tgz",
+      "integrity": "sha512-9cF2eJpsJOEs2V1cCAoJW/boKz9GQQLvZhNvI030K90z6ZE9lRGc9hDVvKut8zdFO2ObjwylPXXXVYvTdP2O2Q==",
+      "dependencies": {
+        "katex": "^0.16.4"
+      }
+    },
+    "node_modules/commander": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
+      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/katex": {
+      "version": "0.16.10",
+      "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.10.tgz",
+      "integrity": "sha512-ZiqaC04tp2O5utMsl2TEZTXxa6WSC4yo0fv5ML++D3QZv/vx2Mct0mTlRx3O+uUkjfuAgOkzsCmq5MiUEsDDdA==",
+      "funding": [
+        "https://opencollective.com/katex",
+        "https://github.com/sponsors/katex"
+      ],
+      "dependencies": {
+        "commander": "^8.3.0"
+      },
+      "bin": {
+        "katex": "cli.js"
+      }
+    }
+  }
+}
diff --git a/extensions/markdown-math/package.json b/extensions/markdown-math/package.json
index 44b442b3df4..9669efc2435 100644
--- a/extensions/markdown-math/package.json
+++ b/extensions/markdown-math/package.json
@@ -56,6 +56,16 @@
           "meta.embedded.math.markdown": "latex",
           "punctuation.definition.math.end.markdown": "latex"
         }
+      },
+      {
+        "scopeName": "markdown.math.codeblock",
+        "path": "./syntaxes/md-math-fence.tmLanguage.json",
+        "injectTo": [
+          "text.html.markdown"
+        ],
+        "embeddedLanguages": {
+          "meta.embedded.math.markdown": "latex"
+        }
       }
     ],
     "notebookRenderer": [
@@ -99,7 +109,7 @@
     "build-notebook": "node ./esbuild"
   },
   "dependencies": {
-    "@vscode/markdown-it-katex": "^1.0.3"
+    "@vscode/markdown-it-katex": "^1.1.0"
   },
   "devDependencies": {
     "@types/markdown-it": "^0.0.0",
diff --git a/extensions/markdown-math/src/extension.ts b/extensions/markdown-math/src/extension.ts
index 1c27036b2fc..6491b0c1459 100644
--- a/extensions/markdown-math/src/extension.ts
+++ b/extensions/markdown-math/src/extension.ts
@@ -30,7 +30,11 @@ export function activate(context: vscode.ExtensionContext) {
 			if (isEnabled()) {
 				const katex = require('@vscode/markdown-it-katex').default;
 				const settingsMacros = getMacros();
-				const options = { globalGroup: true, macros: { ...settingsMacros } };
+				const options = {
+					enableFencedBlocks: true,
+					globalGroup: true,
+					macros: { ...settingsMacros }
+				};
 				md.core.ruler.push('reset-katex-macros', () => {
 					options.macros = { ...settingsMacros };
 				});
@@ -39,4 +43,4 @@ export function activate(context: vscode.ExtensionContext) {
 			return md;
 		}
 	};
-}
+}
\ No newline at end of file
diff --git a/extensions/markdown-math/syntaxes/md-math-block.tmLanguage.json b/extensions/markdown-math/syntaxes/md-math-block.tmLanguage.json
index 43fd1bda5db..543568bf83e 100644
--- a/extensions/markdown-math/syntaxes/md-math-block.tmLanguage.json
+++ b/extensions/markdown-math/syntaxes/md-math-block.tmLanguage.json
@@ -82,4 +82,4 @@
 		}
 	},
 	"scopeName": "markdown.math.block"
-}
+}
\ No newline at end of file
diff --git a/extensions/markdown-math/syntaxes/md-math-fence.tmLanguage.json b/extensions/markdown-math/syntaxes/md-math-fence.tmLanguage.json
new file mode 100644
index 00000000000..556c579d3e7
--- /dev/null
+++ b/extensions/markdown-math/syntaxes/md-math-fence.tmLanguage.json
@@ -0,0 +1,28 @@
+{
+    "fileTypes": [],
+    "injectionSelector": "L:markup.fenced_code.block.markdown",
+    "patterns": [
+        {
+            "include": "#math-code-block"
+        }
+    ],
+    "repository": {
+        "math-code-block": {
+            "begin": "(?<=[`~])math(\\s+[^`~]*)?$",
+            "end": "(^|\\G)(?=\\s*[`~]{3,}\\s*$)",
+            "patterns": [
+                {
+                    "begin": "(^|\\G)(\\s*)(.*)",
+                    "while": "(^|\\G)(?!\\s*([`~]{3,})\\s*$)",
+                    "contentName": "meta.embedded.math.markdown",
+                    "patterns": [
+                        {
+                            "include": "text.html.markdown.math#math"
+                        }
+                    ]
+                }
+            ]
+        }
+    },
+    "scopeName": "markdown.math.codeblock"
+}
diff --git a/extensions/markdown-math/yarn.lock b/extensions/markdown-math/yarn.lock
deleted file mode 100644
index f6b6729fce6..00000000000
--- a/extensions/markdown-math/yarn.lock
+++ /dev/null
@@ -1,32 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@types/markdown-it@^0.0.0":
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-0.0.0.tgz#8f6acaa5e3245e275f684e95deb3e518d1c6ab16"
-  integrity sha512-rLEOTm6Wi9M8GFnIK7VczXSEThIN/eVoevpTYVk+FD/DPX3N15Sj9b3vkjjDY63U0Zw1yawf13CI92CCHpC5kw==
-
-"@types/vscode-notebook-renderer@^1.60.0":
-  version "1.72.0"
-  resolved "https://registry.yarnpkg.com/@types/vscode-notebook-renderer/-/vscode-notebook-renderer-1.72.0.tgz#8943dc3cef0ced2dfb1e04c0a933bd289e7d5199"
-  integrity sha512-5iTjb39DpLn03ULUwrDR3L2Dy59RV4blSUHy0oLdQuIY11PhgWO4mXIcoFS0VxY1GZQ4IcjSf3ooT2Jrrcahnw==
-
-"@vscode/markdown-it-katex@^1.0.3":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@vscode/markdown-it-katex/-/markdown-it-katex-1.0.3.tgz#5364e4dbcb0f7e7fd2fdab3847ba5d6b0c3ce9d9"
-  integrity sha512-a8ppdac0CG2lAQC6E6lT8dxmXkUk9gRtYNtILx31FyrPEwj875AAHc6tpRGeJBpWMpiMtcvz7ymWYBwYgxuFmw==
-  dependencies:
-    katex "^0.16.4"
-
-commander@^8.3.0:
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
-  integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
-
-katex@^0.16.4:
-  version "0.16.10"
-  resolved "https://registry.yarnpkg.com/katex/-/katex-0.16.10.tgz#6f81b71ac37ff4ec7556861160f53bc5f058b185"
-  integrity sha512-ZiqaC04tp2O5utMsl2TEZTXxa6WSC4yo0fv5ML++D3QZv/vx2Mct0mTlRx3O+uUkjfuAgOkzsCmq5MiUEsDDdA==
-  dependencies:
-    commander "^8.3.0"
diff --git a/extensions/media-preview/.npmrc b/extensions/media-preview/.npmrc
new file mode 100644
index 00000000000..a9c57709666
--- /dev/null
+++ b/extensions/media-preview/.npmrc
@@ -0,0 +1,2 @@
+legacy-peer-deps="true"
+timeout=180000
diff --git a/extensions/media-preview/.vscodeignore b/extensions/media-preview/.vscodeignore
index bcb886a094d..532c87f6f2e 100644
--- a/extensions/media-preview/.vscodeignore
+++ b/extensions/media-preview/.vscodeignore
@@ -6,6 +6,6 @@ out/**
 extension.webpack.config.js
 extension-browser.webpack.config.js
 cgmanifest.json
-yarn.lock
+package-lock.json
 preview-src/**
 webpack.config.js
diff --git a/extensions/media-preview/package-lock.json b/extensions/media-preview/package-lock.json
new file mode 100644
index 00000000000..68391b8c4be
--- /dev/null
+++ b/extensions/media-preview/package-lock.json
@@ -0,0 +1,152 @@
+{
+  "name": "media-preview",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "media-preview",
+      "version": "1.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "@vscode/extension-telemetry": "^0.9.0",
+        "vscode-uri": "^3.0.6"
+      },
+      "engines": {
+        "vscode": "^1.70.0"
+      }
+    },
+    "node_modules/@microsoft/1ds-core-js": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.0.3.tgz",
+      "integrity": "sha512-FrxNLVAPsAvD7+l63TlNS/Kodvpct2WulpDSn1dI4Xuy0kF4E2H867kHdwL/iY1Bj3zA3FSy/jvE4+OcDws7ug==",
+      "dependencies": {
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/1ds-post-js": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.0.3.tgz",
+      "integrity": "sha512-uewvmUtXKd7ttypiKQGdYI6i7UUpPkOznLayzIFrJ4r2xnG6jhPjpKRncHFXPQcM4XSWO3yf5PQ3xAbPq9t7ZQ==",
+      "dependencies": {
+        "@microsoft/1ds-core-js": "4.0.3",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-channel-js": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.0.4.tgz",
+      "integrity": "sha512-6TlfExmErQ8Y+/ChbkyWl+jyt4wg3T6p7lwXDsUCB0LgZmlEWMaCUS0YlT73JCWmE8j7vxW8yUm0lgsgmHns3A==",
+      "dependencies": {
+        "@microsoft/applicationinsights-common": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-common": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.0.4.tgz",
+      "integrity": "sha512-r5gWaw/K9+tKfuo2GtDiDiKASgOkPOCrKW+wZzFvuR06uuwvWjbVQ6yW/YbnfuhRF5M65ksUiMi0eCMwEOGq7Q==",
+      "dependencies": {
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-core-js": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.0.4.tgz",
+      "integrity": "sha512-anxy5kEkqBmVoEqJiJzaaXXA0wzqZi9U4zGd05xFJ04lWckP8dG3zyT3+GGdg7rDelqLTNGxndeYoFmDv63u1g==",
+      "dependencies": {
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-shims": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
+      "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-web-basic": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.0.4.tgz",
+      "integrity": "sha512-KfoxPlLlf0JT12ADb23C5iGye/yFouoMgHEKULxkSQcYY9SsW/8rVrqqvoYKAL+u215CZU2A8Kc8sR3ehEaPCQ==",
+      "dependencies": {
+        "@microsoft/applicationinsights-channel-js": "3.0.4",
+        "@microsoft/applicationinsights-common": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/dynamicproto-js": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.2.tgz",
+      "integrity": "sha512-MB8trWaFREpmb037k/d0bB7T2BP7Ai24w1e1tbz3ASLB0/lwphsq3Nq8S9I5AsI5vs4zAQT+SB5nC5/dLYTiOg==",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+      }
+    },
+    "node_modules/@nevware21/ts-async": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.3.0.tgz",
+      "integrity": "sha512-ZUcgUH12LN/F6nzN0cYd0F/rJaMLmXr0EHVTyYfaYmK55bdwE4338uue4UiVoRqHVqNW4KDUrJc49iGogHKeWA==",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.10.0 < 2.x"
+      }
+    },
+    "node_modules/@nevware21/ts-utils": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.10.1.tgz",
+      "integrity": "sha512-pMny25NnF2/MJwdqC3Iyjm2pGIXNxni4AROpcqDeWa+td9JMUY4bUS9uU9XW+BoBRqTLUL+WURF9SOd/6OQzRg=="
+    },
+    "node_modules/@vscode/extension-telemetry": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.0.tgz",
+      "integrity": "sha512-37RxGHXrs3GoXPgCUKQhghEu0gxs8j27RLjQwwtSf4WhPdJKz8UrqMYzpsXlliQ05zURYmtdGZst9C6+hfWXaQ==",
+      "dependencies": {
+        "@microsoft/1ds-core-js": "^4.0.3",
+        "@microsoft/1ds-post-js": "^4.0.3",
+        "@microsoft/applicationinsights-web-basic": "^3.0.4"
+      },
+      "engines": {
+        "vscode": "^1.75.0"
+      }
+    },
+    "node_modules/vscode-uri": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.6.tgz",
+      "integrity": "sha512-fmL7V1eiDBFRRnu+gfRWTzyPpNIHJTc4mWnFkwBUmO9U3KPgJAmTx7oxi2bl/Rh6HLdU7+4C9wlj0k2E4AdKFQ=="
+    }
+  }
+}
diff --git a/extensions/media-preview/src/imagePreview/index.ts b/extensions/media-preview/src/imagePreview/index.ts
index 007e466d99f..e0c605c2a6e 100644
--- a/extensions/media-preview/src/imagePreview/index.ts
+++ b/extensions/media-preview/src/imagePreview/index.ts
@@ -113,8 +113,6 @@ class ImagePreview extends MediaPreview {
 		this.updateBinarySize();
 		this.render();
 		this.updateState();
-
-		this.webviewEditor.webview.postMessage({ type: 'setActive', value: this.webviewEditor.active });
 	}
 
 	public override dispose(): void {
@@ -157,6 +155,10 @@ class ImagePreview extends MediaPreview {
 			this.zoomStatusBarEntry.hide(this);
 		}
 	}
+	protected override async render(): Promise<void> {
+		await super.render();
+		this.webviewEditor.webview.postMessage({ type: 'setActive', value: this.webviewEditor.active });
+	}
 
 	protected override async getWebviewContents(): Promise<string> {
 		const version = Date.now().toString();
diff --git a/extensions/media-preview/yarn.lock b/extensions/media-preview/yarn.lock
deleted file mode 100644
index a19b8cbb124..00000000000
--- a/extensions/media-preview/yarn.lock
+++ /dev/null
@@ -1,110 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@microsoft/1ds-core-js@4.0.3", "@microsoft/1ds-core-js@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@microsoft/1ds-core-js/-/1ds-core-js-4.0.3.tgz#c8a92c623745a9595e06558a866658480c33bdf9"
-  integrity sha512-FrxNLVAPsAvD7+l63TlNS/Kodvpct2WulpDSn1dI4Xuy0kF4E2H867kHdwL/iY1Bj3zA3FSy/jvE4+OcDws7ug==
-  dependencies:
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/1ds-post-js@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@microsoft/1ds-post-js/-/1ds-post-js-4.0.3.tgz#cfcb20bb23fb6215d3f0732f60f5b7df3e624f86"
-  integrity sha512-uewvmUtXKd7ttypiKQGdYI6i7UUpPkOznLayzIFrJ4r2xnG6jhPjpKRncHFXPQcM4XSWO3yf5PQ3xAbPq9t7ZQ==
-  dependencies:
-    "@microsoft/1ds-core-js" "4.0.3"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-channel-js@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.0.4.tgz#247b6fe2158fad9826cbcdf7304f885766b36624"
-  integrity sha512-6TlfExmErQ8Y+/ChbkyWl+jyt4wg3T6p7lwXDsUCB0LgZmlEWMaCUS0YlT73JCWmE8j7vxW8yUm0lgsgmHns3A==
-  dependencies:
-    "@microsoft/applicationinsights-common" "3.0.4"
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-common@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-common/-/applicationinsights-common-3.0.4.tgz#c4aa53ba343f5b3c7fbf54cddd3c86a5bdcd95dc"
-  integrity sha512-r5gWaw/K9+tKfuo2GtDiDiKASgOkPOCrKW+wZzFvuR06uuwvWjbVQ6yW/YbnfuhRF5M65ksUiMi0eCMwEOGq7Q==
-  dependencies:
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-core-js@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.0.4.tgz#008308b786930d94a1de8a1fbb4af0351b74653e"
-  integrity sha512-anxy5kEkqBmVoEqJiJzaaXXA0wzqZi9U4zGd05xFJ04lWckP8dG3zyT3+GGdg7rDelqLTNGxndeYoFmDv63u1g==
-  dependencies:
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-shims@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz#3865b73ace8405b9c4618cc5c571f2fe3876f06f"
-  integrity sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==
-  dependencies:
-    "@nevware21/ts-utils" ">= 0.9.4 < 2.x"
-
-"@microsoft/applicationinsights-web-basic@^3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.0.4.tgz#9a23323276b4a5a0dc6a352e2de5d75e3c16b534"
-  integrity sha512-KfoxPlLlf0JT12ADb23C5iGye/yFouoMgHEKULxkSQcYY9SsW/8rVrqqvoYKAL+u215CZU2A8Kc8sR3ehEaPCQ==
-  dependencies:
-    "@microsoft/applicationinsights-channel-js" "3.0.4"
-    "@microsoft/applicationinsights-common" "3.0.4"
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/dynamicproto-js@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.2.tgz#e57fbec2e7067d48b7e8e1e1c1d354028ef718a6"
-  integrity sha512-MB8trWaFREpmb037k/d0bB7T2BP7Ai24w1e1tbz3ASLB0/lwphsq3Nq8S9I5AsI5vs4zAQT+SB5nC5/dLYTiOg==
-  dependencies:
-    "@nevware21/ts-utils" ">= 0.9.4 < 2.x"
-
-"@nevware21/ts-async@>= 0.3.0 < 2.x":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@nevware21/ts-async/-/ts-async-0.3.0.tgz#a8b97ba01065fc930de9a3f4dd4a05e862becc6c"
-  integrity sha512-ZUcgUH12LN/F6nzN0cYd0F/rJaMLmXr0EHVTyYfaYmK55bdwE4338uue4UiVoRqHVqNW4KDUrJc49iGogHKeWA==
-  dependencies:
-    "@nevware21/ts-utils" ">= 0.10.0 < 2.x"
-
-"@nevware21/ts-utils@>= 0.10.0 < 2.x", "@nevware21/ts-utils@>= 0.10.1 < 2.x", "@nevware21/ts-utils@>= 0.9.4 < 2.x":
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@nevware21/ts-utils/-/ts-utils-0.10.1.tgz#aa65abc71eba06749a396598f22263d26f796ac7"
-  integrity sha512-pMny25NnF2/MJwdqC3Iyjm2pGIXNxni4AROpcqDeWa+td9JMUY4bUS9uU9XW+BoBRqTLUL+WURF9SOd/6OQzRg==
-
-"@vscode/extension-telemetry@^0.9.0":
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.9.0.tgz#8c6c61e253ff304f46045f04edd60059b144417a"
-  integrity sha512-37RxGHXrs3GoXPgCUKQhghEu0gxs8j27RLjQwwtSf4WhPdJKz8UrqMYzpsXlliQ05zURYmtdGZst9C6+hfWXaQ==
-  dependencies:
-    "@microsoft/1ds-core-js" "^4.0.3"
-    "@microsoft/1ds-post-js" "^4.0.3"
-    "@microsoft/applicationinsights-web-basic" "^3.0.4"
-
-vscode-uri@^3.0.6:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.6.tgz#5e6e2e1a4170543af30151b561a41f71db1d6f91"
-  integrity sha512-fmL7V1eiDBFRRnu+gfRWTzyPpNIHJTc4mWnFkwBUmO9U3KPgJAmTx7oxi2bl/Rh6HLdU7+4C9wlj0k2E4AdKFQ==
diff --git a/extensions/merge-conflict/.npmrc b/extensions/merge-conflict/.npmrc
new file mode 100644
index 00000000000..a9c57709666
--- /dev/null
+++ b/extensions/merge-conflict/.npmrc
@@ -0,0 +1,2 @@
+legacy-peer-deps="true"
+timeout=180000
diff --git a/extensions/merge-conflict/.vscodeignore b/extensions/merge-conflict/.vscodeignore
index f071cfb7c71..3a8a2a96a6c 100644
--- a/extensions/merge-conflict/.vscodeignore
+++ b/extensions/merge-conflict/.vscodeignore
@@ -3,4 +3,4 @@ tsconfig.json
 out/**
 extension.webpack.config.js
 extension-browser.webpack.config.js
-yarn.lock
+package-lock.json
diff --git a/extensions/merge-conflict/package-lock.json b/extensions/merge-conflict/package-lock.json
new file mode 100644
index 00000000000..a57272606cd
--- /dev/null
+++ b/extensions/merge-conflict/package-lock.json
@@ -0,0 +1,164 @@
+{
+  "name": "merge-conflict",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "merge-conflict",
+      "version": "1.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "@vscode/extension-telemetry": "^0.9.0"
+      },
+      "devDependencies": {
+        "@types/node": "20.x"
+      },
+      "engines": {
+        "vscode": "^1.5.0"
+      }
+    },
+    "node_modules/@microsoft/1ds-core-js": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.0.3.tgz",
+      "integrity": "sha512-FrxNLVAPsAvD7+l63TlNS/Kodvpct2WulpDSn1dI4Xuy0kF4E2H867kHdwL/iY1Bj3zA3FSy/jvE4+OcDws7ug==",
+      "dependencies": {
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/1ds-post-js": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.0.3.tgz",
+      "integrity": "sha512-uewvmUtXKd7ttypiKQGdYI6i7UUpPkOznLayzIFrJ4r2xnG6jhPjpKRncHFXPQcM4XSWO3yf5PQ3xAbPq9t7ZQ==",
+      "dependencies": {
+        "@microsoft/1ds-core-js": "4.0.3",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-channel-js": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.0.4.tgz",
+      "integrity": "sha512-6TlfExmErQ8Y+/ChbkyWl+jyt4wg3T6p7lwXDsUCB0LgZmlEWMaCUS0YlT73JCWmE8j7vxW8yUm0lgsgmHns3A==",
+      "dependencies": {
+        "@microsoft/applicationinsights-common": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-common": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.0.4.tgz",
+      "integrity": "sha512-r5gWaw/K9+tKfuo2GtDiDiKASgOkPOCrKW+wZzFvuR06uuwvWjbVQ6yW/YbnfuhRF5M65ksUiMi0eCMwEOGq7Q==",
+      "dependencies": {
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-core-js": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.0.4.tgz",
+      "integrity": "sha512-anxy5kEkqBmVoEqJiJzaaXXA0wzqZi9U4zGd05xFJ04lWckP8dG3zyT3+GGdg7rDelqLTNGxndeYoFmDv63u1g==",
+      "dependencies": {
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-shims": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
+      "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-web-basic": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.0.4.tgz",
+      "integrity": "sha512-KfoxPlLlf0JT12ADb23C5iGye/yFouoMgHEKULxkSQcYY9SsW/8rVrqqvoYKAL+u215CZU2A8Kc8sR3ehEaPCQ==",
+      "dependencies": {
+        "@microsoft/applicationinsights-channel-js": "3.0.4",
+        "@microsoft/applicationinsights-common": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/dynamicproto-js": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.2.tgz",
+      "integrity": "sha512-MB8trWaFREpmb037k/d0bB7T2BP7Ai24w1e1tbz3ASLB0/lwphsq3Nq8S9I5AsI5vs4zAQT+SB5nC5/dLYTiOg==",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+      }
+    },
+    "node_modules/@nevware21/ts-async": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.3.0.tgz",
+      "integrity": "sha512-ZUcgUH12LN/F6nzN0cYd0F/rJaMLmXr0EHVTyYfaYmK55bdwE4338uue4UiVoRqHVqNW4KDUrJc49iGogHKeWA==",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.10.0 < 2.x"
+      }
+    },
+    "node_modules/@nevware21/ts-utils": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.10.1.tgz",
+      "integrity": "sha512-pMny25NnF2/MJwdqC3Iyjm2pGIXNxni4AROpcqDeWa+td9JMUY4bUS9uU9XW+BoBRqTLUL+WURF9SOd/6OQzRg=="
+    },
+    "node_modules/@types/node": {
+      "version": "20.11.24",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
+      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/@vscode/extension-telemetry": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.0.tgz",
+      "integrity": "sha512-37RxGHXrs3GoXPgCUKQhghEu0gxs8j27RLjQwwtSf4WhPdJKz8UrqMYzpsXlliQ05zURYmtdGZst9C6+hfWXaQ==",
+      "dependencies": {
+        "@microsoft/1ds-core-js": "^4.0.3",
+        "@microsoft/1ds-post-js": "^4.0.3",
+        "@microsoft/applicationinsights-web-basic": "^3.0.4"
+      },
+      "engines": {
+        "vscode": "^1.75.0"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    }
+  }
+}
diff --git a/extensions/merge-conflict/yarn.lock b/extensions/merge-conflict/yarn.lock
deleted file mode 100644
index 31f7cee0830..00000000000
--- a/extensions/merge-conflict/yarn.lock
+++ /dev/null
@@ -1,117 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@microsoft/1ds-core-js@4.0.3", "@microsoft/1ds-core-js@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@microsoft/1ds-core-js/-/1ds-core-js-4.0.3.tgz#c8a92c623745a9595e06558a866658480c33bdf9"
-  integrity sha512-FrxNLVAPsAvD7+l63TlNS/Kodvpct2WulpDSn1dI4Xuy0kF4E2H867kHdwL/iY1Bj3zA3FSy/jvE4+OcDws7ug==
-  dependencies:
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/1ds-post-js@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@microsoft/1ds-post-js/-/1ds-post-js-4.0.3.tgz#cfcb20bb23fb6215d3f0732f60f5b7df3e624f86"
-  integrity sha512-uewvmUtXKd7ttypiKQGdYI6i7UUpPkOznLayzIFrJ4r2xnG6jhPjpKRncHFXPQcM4XSWO3yf5PQ3xAbPq9t7ZQ==
-  dependencies:
-    "@microsoft/1ds-core-js" "4.0.3"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-channel-js@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.0.4.tgz#247b6fe2158fad9826cbcdf7304f885766b36624"
-  integrity sha512-6TlfExmErQ8Y+/ChbkyWl+jyt4wg3T6p7lwXDsUCB0LgZmlEWMaCUS0YlT73JCWmE8j7vxW8yUm0lgsgmHns3A==
-  dependencies:
-    "@microsoft/applicationinsights-common" "3.0.4"
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-common@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-common/-/applicationinsights-common-3.0.4.tgz#c4aa53ba343f5b3c7fbf54cddd3c86a5bdcd95dc"
-  integrity sha512-r5gWaw/K9+tKfuo2GtDiDiKASgOkPOCrKW+wZzFvuR06uuwvWjbVQ6yW/YbnfuhRF5M65ksUiMi0eCMwEOGq7Q==
-  dependencies:
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-core-js@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.0.4.tgz#008308b786930d94a1de8a1fbb4af0351b74653e"
-  integrity sha512-anxy5kEkqBmVoEqJiJzaaXXA0wzqZi9U4zGd05xFJ04lWckP8dG3zyT3+GGdg7rDelqLTNGxndeYoFmDv63u1g==
-  dependencies:
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-shims@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz#3865b73ace8405b9c4618cc5c571f2fe3876f06f"
-  integrity sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==
-  dependencies:
-    "@nevware21/ts-utils" ">= 0.9.4 < 2.x"
-
-"@microsoft/applicationinsights-web-basic@^3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.0.4.tgz#9a23323276b4a5a0dc6a352e2de5d75e3c16b534"
-  integrity sha512-KfoxPlLlf0JT12ADb23C5iGye/yFouoMgHEKULxkSQcYY9SsW/8rVrqqvoYKAL+u215CZU2A8Kc8sR3ehEaPCQ==
-  dependencies:
-    "@microsoft/applicationinsights-channel-js" "3.0.4"
-    "@microsoft/applicationinsights-common" "3.0.4"
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/dynamicproto-js@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.2.tgz#e57fbec2e7067d48b7e8e1e1c1d354028ef718a6"
-  integrity sha512-MB8trWaFREpmb037k/d0bB7T2BP7Ai24w1e1tbz3ASLB0/lwphsq3Nq8S9I5AsI5vs4zAQT+SB5nC5/dLYTiOg==
-  dependencies:
-    "@nevware21/ts-utils" ">= 0.9.4 < 2.x"
-
-"@nevware21/ts-async@>= 0.3.0 < 2.x":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@nevware21/ts-async/-/ts-async-0.3.0.tgz#a8b97ba01065fc930de9a3f4dd4a05e862becc6c"
-  integrity sha512-ZUcgUH12LN/F6nzN0cYd0F/rJaMLmXr0EHVTyYfaYmK55bdwE4338uue4UiVoRqHVqNW4KDUrJc49iGogHKeWA==
-  dependencies:
-    "@nevware21/ts-utils" ">= 0.10.0 < 2.x"
-
-"@nevware21/ts-utils@>= 0.10.0 < 2.x", "@nevware21/ts-utils@>= 0.10.1 < 2.x", "@nevware21/ts-utils@>= 0.9.4 < 2.x":
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@nevware21/ts-utils/-/ts-utils-0.10.1.tgz#aa65abc71eba06749a396598f22263d26f796ac7"
-  integrity sha512-pMny25NnF2/MJwdqC3Iyjm2pGIXNxni4AROpcqDeWa+td9JMUY4bUS9uU9XW+BoBRqTLUL+WURF9SOd/6OQzRg==
-
-"@types/node@20.x":
-  version "20.11.24"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792"
-  integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==
-  dependencies:
-    undici-types "~5.26.4"
-
-"@vscode/extension-telemetry@^0.9.0":
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.9.0.tgz#8c6c61e253ff304f46045f04edd60059b144417a"
-  integrity sha512-37RxGHXrs3GoXPgCUKQhghEu0gxs8j27RLjQwwtSf4WhPdJKz8UrqMYzpsXlliQ05zURYmtdGZst9C6+hfWXaQ==
-  dependencies:
-    "@microsoft/1ds-core-js" "^4.0.3"
-    "@microsoft/1ds-post-js" "^4.0.3"
-    "@microsoft/applicationinsights-web-basic" "^3.0.4"
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
diff --git a/extensions/microsoft-authentication/.npmrc b/extensions/microsoft-authentication/.npmrc
new file mode 100644
index 00000000000..a9c57709666
--- /dev/null
+++ b/extensions/microsoft-authentication/.npmrc
@@ -0,0 +1,2 @@
+legacy-peer-deps="true"
+timeout=180000
diff --git a/extensions/microsoft-authentication/.vscodeignore b/extensions/microsoft-authentication/.vscodeignore
index 46f23a20dba..98b90d34d82 100644
--- a/extensions/microsoft-authentication/.vscodeignore
+++ b/extensions/microsoft-authentication/.vscodeignore
@@ -4,7 +4,7 @@ out/test/**
 out/**
 extension.webpack.config.js
 extension-browser.webpack.config.js
-yarn.lock
+package-lock.json
 src/**
 .gitignore
 vsc-extension-quickstart.md
diff --git a/extensions/microsoft-authentication/extension-browser.webpack.config.js b/extensions/microsoft-authentication/extension-browser.webpack.config.js
index 2513c7d0f9c..1590cef5e5f 100644
--- a/extensions/microsoft-authentication/extension-browser.webpack.config.js
+++ b/extensions/microsoft-authentication/extension-browser.webpack.config.js
@@ -22,10 +22,10 @@ module.exports = withBrowserDefaults({
 	},
 	resolve: {
 		alias: {
-			'./node/crypto': path.resolve(__dirname, 'src/browser/crypto'),
 			'./node/authServer': path.resolve(__dirname, 'src/browser/authServer'),
 			'./node/buffer': path.resolve(__dirname, 'src/browser/buffer'),
 			'./node/fetch': path.resolve(__dirname, 'src/browser/fetch'),
+			'./node/authProvider': path.resolve(__dirname, 'src/browser/authProvider'),
 		}
 	}
 });
diff --git a/extensions/microsoft-authentication/package-lock.json b/extensions/microsoft-authentication/package-lock.json
new file mode 100644
index 00000000000..8f05b14f02a
--- /dev/null
+++ b/extensions/microsoft-authentication/package-lock.json
@@ -0,0 +1,440 @@
+{
+  "name": "microsoft-authentication",
+  "version": "0.0.1",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "microsoft-authentication",
+      "version": "0.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "@azure/ms-rest-azure-env": "^2.0.0",
+        "@azure/msal-node": "^2.13.1",
+        "@vscode/extension-telemetry": "^0.9.0",
+        "vscode-tas-client": "^0.1.84"
+      },
+      "devDependencies": {
+        "@types/node": "20.x",
+        "@types/node-fetch": "^2.5.7",
+        "@types/randombytes": "^2.0.0",
+        "@types/sha.js": "^2.4.0",
+        "@types/uuid": "8.0.0"
+      },
+      "engines": {
+        "vscode": "^1.42.0"
+      }
+    },
+    "node_modules/@azure/ms-rest-azure-env": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@azure/ms-rest-azure-env/-/ms-rest-azure-env-2.0.0.tgz",
+      "integrity": "sha512-dG76W7ElfLi+fbTjnZVGj+M9e0BIEJmRxU6fHaUQ12bZBe8EJKYb2GV50YWNaP2uJiVQ5+7nXEVj1VN1UQtaEw=="
+    },
+    "node_modules/@azure/msal-common": {
+      "version": "14.14.2",
+      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.14.2.tgz",
+      "integrity": "sha512-XV0P5kSNwDwCA/SjIxTe9mEAsKB0NqGNSuaVrkCCE2lAyBr/D6YtD80Vkdp4tjWnPFwjzkwldjr1xU/facOJog==",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/@azure/msal-node": {
+      "version": "2.13.1",
+      "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.13.1.tgz",
+      "integrity": "sha512-sijfzPNorKt6+9g1/miHwhj6Iapff4mPQx1azmmZExgzUROqWTM1o3ACyxDja0g47VpowFy/sxTM/WsuCyXTiw==",
+      "dependencies": {
+        "@azure/msal-common": "14.14.2",
+        "jsonwebtoken": "^9.0.0",
+        "uuid": "^8.3.0"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@microsoft/1ds-core-js": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.0.3.tgz",
+      "integrity": "sha512-FrxNLVAPsAvD7+l63TlNS/Kodvpct2WulpDSn1dI4Xuy0kF4E2H867kHdwL/iY1Bj3zA3FSy/jvE4+OcDws7ug==",
+      "dependencies": {
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/1ds-post-js": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.0.3.tgz",
+      "integrity": "sha512-uewvmUtXKd7ttypiKQGdYI6i7UUpPkOznLayzIFrJ4r2xnG6jhPjpKRncHFXPQcM4XSWO3yf5PQ3xAbPq9t7ZQ==",
+      "dependencies": {
+        "@microsoft/1ds-core-js": "4.0.3",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-channel-js": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.0.4.tgz",
+      "integrity": "sha512-6TlfExmErQ8Y+/ChbkyWl+jyt4wg3T6p7lwXDsUCB0LgZmlEWMaCUS0YlT73JCWmE8j7vxW8yUm0lgsgmHns3A==",
+      "dependencies": {
+        "@microsoft/applicationinsights-common": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-common": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.0.4.tgz",
+      "integrity": "sha512-r5gWaw/K9+tKfuo2GtDiDiKASgOkPOCrKW+wZzFvuR06uuwvWjbVQ6yW/YbnfuhRF5M65ksUiMi0eCMwEOGq7Q==",
+      "dependencies": {
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-core-js": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.0.4.tgz",
+      "integrity": "sha512-anxy5kEkqBmVoEqJiJzaaXXA0wzqZi9U4zGd05xFJ04lWckP8dG3zyT3+GGdg7rDelqLTNGxndeYoFmDv63u1g==",
+      "dependencies": {
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-shims": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
+      "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-web-basic": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.0.4.tgz",
+      "integrity": "sha512-KfoxPlLlf0JT12ADb23C5iGye/yFouoMgHEKULxkSQcYY9SsW/8rVrqqvoYKAL+u215CZU2A8Kc8sR3ehEaPCQ==",
+      "dependencies": {
+        "@microsoft/applicationinsights-channel-js": "3.0.4",
+        "@microsoft/applicationinsights-common": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/dynamicproto-js": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.2.tgz",
+      "integrity": "sha512-MB8trWaFREpmb037k/d0bB7T2BP7Ai24w1e1tbz3ASLB0/lwphsq3Nq8S9I5AsI5vs4zAQT+SB5nC5/dLYTiOg==",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+      }
+    },
+    "node_modules/@nevware21/ts-async": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.3.0.tgz",
+      "integrity": "sha512-ZUcgUH12LN/F6nzN0cYd0F/rJaMLmXr0EHVTyYfaYmK55bdwE4338uue4UiVoRqHVqNW4KDUrJc49iGogHKeWA==",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.10.0 < 2.x"
+      }
+    },
+    "node_modules/@nevware21/ts-utils": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.10.1.tgz",
+      "integrity": "sha512-pMny25NnF2/MJwdqC3Iyjm2pGIXNxni4AROpcqDeWa+td9JMUY4bUS9uU9XW+BoBRqTLUL+WURF9SOd/6OQzRg=="
+    },
+    "node_modules/@types/node": {
+      "version": "20.11.24",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
+      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/@types/node-fetch": {
+      "version": "2.5.7",
+      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.7.tgz",
+      "integrity": "sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "form-data": "^3.0.0"
+      }
+    },
+    "node_modules/@types/randombytes": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/randombytes/-/randombytes-2.0.0.tgz",
+      "integrity": "sha512-bz8PhAVlwN72vqefzxa14DKNT8jK/mV66CSjwdVQM/k3Th3EPKfUtdMniwZgMedQTFuywAsfjnZsg+pEnltaMA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/sha.js": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/@types/sha.js/-/sha.js-2.4.0.tgz",
+      "integrity": "sha512-amxKgPy6WJTKuw8mpUwjX2BSxuBtBmZfRwIUDIuPJKNwGN8CWDli8JTg5ONTWOtcTkHIstvT7oAhhYXqEjStHQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/uuid": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.0.0.tgz",
+      "integrity": "sha512-xSQfNcvOiE5f9dyd4Kzxbof1aTrLobL278pGLKOZI6esGfZ7ts9Ka16CzIN6Y8hFHE1C7jIBZokULhK1bOgjRw==",
+      "dev": true
+    },
+    "node_modules/@vscode/extension-telemetry": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.0.tgz",
+      "integrity": "sha512-37RxGHXrs3GoXPgCUKQhghEu0gxs8j27RLjQwwtSf4WhPdJKz8UrqMYzpsXlliQ05zURYmtdGZst9C6+hfWXaQ==",
+      "dependencies": {
+        "@microsoft/1ds-core-js": "^4.0.3",
+        "@microsoft/1ds-post-js": "^4.0.3",
+        "@microsoft/applicationinsights-web-basic": "^3.0.4"
+      },
+      "engines": {
+        "vscode": "^1.75.0"
+      }
+    },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k= sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "dev": true
+    },
+    "node_modules/buffer-equal-constant-time": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+      "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA=="
+    },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk= sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/ecdsa-sig-formatter": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
+      "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
+      "dependencies": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/form-data": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz",
+      "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==",
+      "dev": true,
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/jsonwebtoken": {
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz",
+      "integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==",
+      "dependencies": {
+        "jws": "^3.2.2",
+        "lodash.includes": "^4.3.0",
+        "lodash.isboolean": "^3.0.3",
+        "lodash.isinteger": "^4.0.4",
+        "lodash.isnumber": "^3.0.3",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.isstring": "^4.0.1",
+        "lodash.once": "^4.0.0",
+        "ms": "^2.1.1",
+        "semver": "^7.5.4"
+      },
+      "engines": {
+        "node": ">=12",
+        "npm": ">=6"
+      }
+    },
+    "node_modules/jwa": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz",
+      "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==",
+      "dependencies": {
+        "buffer-equal-constant-time": "1.0.1",
+        "ecdsa-sig-formatter": "1.0.11",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/jws": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
+      "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==",
+      "dependencies": {
+        "jwa": "^1.4.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/lodash.includes": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
+      "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w=="
+    },
+    "node_modules/lodash.isboolean": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
+      "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg=="
+    },
+    "node_modules/lodash.isinteger": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
+      "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA=="
+    },
+    "node_modules/lodash.isnumber": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
+      "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw=="
+    },
+    "node_modules/lodash.isplainobject": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
+      "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA=="
+    },
+    "node_modules/lodash.isstring": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
+      "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw=="
+    },
+    "node_modules/lodash.once": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
+      "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="
+    },
+    "node_modules/mime-db": {
+      "version": "1.44.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
+      "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.27",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
+      "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
+      "dev": true,
+      "dependencies": {
+        "mime-db": "1.44.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/semver": {
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
+      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/tas-client": {
+      "version": "0.2.33",
+      "resolved": "https://registry.npmjs.org/tas-client/-/tas-client-0.2.33.tgz",
+      "integrity": "sha512-V+uqV66BOQnWxvI6HjDnE4VkInmYZUQ4dgB7gzaDyFyFSK1i1nF/j7DpS9UbQAgV9NaF1XpcyuavnM1qOeiEIg=="
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    },
+    "node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/vscode-tas-client": {
+      "version": "0.1.84",
+      "resolved": "https://registry.npmjs.org/vscode-tas-client/-/vscode-tas-client-0.1.84.tgz",
+      "integrity": "sha512-rUTrUopV+70hvx1hW5ebdw1nd6djxubkLvVxjGdyD/r5v/wcVF41LIfiAtbm5qLZDtQdsMH1IaCuDoluoIa88w==",
+      "dependencies": {
+        "tas-client": "0.2.33"
+      },
+      "engines": {
+        "vscode": "^1.85.0"
+      }
+    }
+  }
+}
diff --git a/extensions/microsoft-authentication/package.json b/extensions/microsoft-authentication/package.json
index 3d73a7621fd..15acb5db286 100644
--- a/extensions/microsoft-authentication/package.json
+++ b/extensions/microsoft-authentication/package.json
@@ -95,6 +95,15 @@
             ]
           }
         }
+      },
+      {
+        "title": "Microsoft",
+        "properties": {
+          "microsoft.useMsal": {
+            "type": "boolean",
+            "description": "%useMsal.description%"
+          }
+        }
       }
     ]
   },
@@ -116,9 +125,10 @@
     "@types/uuid": "8.0.0"
   },
   "dependencies": {
-    "node-fetch": "2.6.7",
     "@azure/ms-rest-azure-env": "^2.0.0",
-    "@vscode/extension-telemetry": "^0.9.0"
+    "@azure/msal-node": "^2.13.1",
+    "@vscode/extension-telemetry": "^0.9.0",
+    "vscode-tas-client": "^0.1.84"
   },
   "repository": {
     "type": "git",
diff --git a/extensions/microsoft-authentication/package.nls.json b/extensions/microsoft-authentication/package.nls.json
index 14c625dc762..80cbb32d4ab 100644
--- a/extensions/microsoft-authentication/package.nls.json
+++ b/extensions/microsoft-authentication/package.nls.json
@@ -3,6 +3,7 @@
 	"description": "Microsoft authentication provider",
 	"signIn": "Sign In",
 	"signOut": "Sign Out",
+	"useMsal.description": "Use the Microsoft Authentication Library (MSAL) to sign in with a Microsoft account.",
 	"microsoft-sovereign-cloud.environment.description": {
 		"message": "The Sovereign Cloud to use for authentication. If you select `custom`, you must also set the `#microsoft-sovereign-cloud.customEnvironment#` setting.",
 		"comment": [
diff --git a/extensions/microsoft-authentication/src/AADHelper.ts b/extensions/microsoft-authentication/src/AADHelper.ts
index df36686dc9a..9722145dd03 100644
--- a/extensions/microsoft-authentication/src/AADHelper.ts
+++ b/extensions/microsoft-authentication/src/AADHelper.ts
@@ -11,7 +11,7 @@ import { generateCodeChallenge, generateCodeVerifier, randomUUID } from './crypt
 import { BetterTokenStorage, IDidChangeInOtherWindowEvent } from './betterSecretStorage';
 import { LoopbackAuthServer } from './node/authServer';
 import { base64Decode } from './node/buffer';
-import { fetching } from './node/fetch';
+import fetch from './node/fetch';
 import { UriEventHandler } from './UriEventHandler';
 import TelemetryReporter from '@vscode/extension-telemetry';
 import { Environment } from '@azure/ms-rest-azure-env';
@@ -203,11 +203,13 @@ export class AzureActiveDirectoryService {
 		return this._sessionChangeEmitter.event;
 	}
 
-	public getSessions(scopes?: string[]): Promise<vscode.AuthenticationSession[]> {
+	public getSessions(scopes?: string[], account?: vscode.AuthenticationSessionAccountInformation): Promise<vscode.AuthenticationSession[]> {
 		if (!scopes) {
 			this._logger.info('Getting sessions for all scopes...');
-			const sessions = this._tokens.map(token => this.convertToSessionSync(token));
-			this._logger.info(`Got ${sessions.length} sessions for all scopes...`);
+			const sessions = this._tokens
+				.filter(token => !account?.label || token.account.label === account.label)
+				.map(token => this.convertToSessionSync(token));
+			this._logger.info(`Got ${sessions.length} sessions for all scopes${account ? ` for account '${account.label}'` : ''}...`);
 			return Promise.resolve(sessions);
 		}
 
@@ -238,23 +240,43 @@ export class AzureActiveDirectoryService {
 			tenant: this.getTenantId(scopes),
 		};
 
-		this._logger.trace(`[${scopeData.scopeStr}] Queued getting sessions`);
-		return this._sequencer.queue(modifiedScopesStr, () => this.doGetSessions(scopeData));
+		this._logger.trace(`[${scopeData.scopeStr}] Queued getting sessions` + account ? ` for ${account?.label}` : '');
+		return this._sequencer.queue(modifiedScopesStr, () => this.doGetSessions(scopeData, account));
 	}
 
-	private async doGetSessions(scopeData: IScopeData): Promise<vscode.AuthenticationSession[]> {
-		this._logger.info(`[${scopeData.scopeStr}] Getting sessions`);
+	private async doGetSessions(scopeData: IScopeData, account?: vscode.AuthenticationSessionAccountInformation): Promise<vscode.AuthenticationSession[]> {
+		this._logger.info(`[${scopeData.scopeStr}] Getting sessions` + account ? ` for ${account?.label}` : '');
 
-		const matchingTokens = this._tokens.filter(token => token.scope === scopeData.scopeStr);
+		const matchingTokens = this._tokens
+			.filter(token => token.scope === scopeData.scopeStr)
+			.filter(token => !account?.label || token.account.label === account.label);
 		// If we still don't have a matching token try to get a new token from an existing token by using
 		// the refreshToken. This is documented here:
 		// https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-oauth2-auth-code-flow#refresh-the-access-token
 		// "Refresh tokens are valid for all permissions that your client has already received consent for."
 		if (!matchingTokens.length) {
-			// Get a token with the correct client id.
-			const token = scopeData.clientId === DEFAULT_CLIENT_ID
-				? this._tokens.find(t => t.refreshToken && !t.scope.includes('VSCODE_CLIENT_ID'))
-				: this._tokens.find(t => t.refreshToken && t.scope.includes(`VSCODE_CLIENT_ID:${scopeData.clientId}`));
+			// Get a token with the correct client id and account.
+			let token: IToken | undefined;
+			for (const t of this._tokens) {
+				// No refresh token, so we can't make a new token from this session
+				if (!t.refreshToken) {
+					continue;
+				}
+				// Need to make sure the account matches if we were provided one
+				if (account?.label && t.account.label !== account.label) {
+					continue;
+				}
+				// If the client id is the default client id, then check for the absence of the VSCODE_CLIENT_ID scope
+				if (scopeData.clientId === DEFAULT_CLIENT_ID && !t.scope.includes('VSCODE_CLIENT_ID')) {
+					token = t;
+					break;
+				}
+				// If the client id is not the default client id, then check for the matching VSCODE_CLIENT_ID scope
+				if (scopeData.clientId !== DEFAULT_CLIENT_ID && t.scope.includes(`VSCODE_CLIENT_ID:${scopeData.clientId}`)) {
+					token = t;
+					break;
+				}
+			}
 
 			if (token) {
 				this._logger.trace(`[${scopeData.scopeStr}] '${token.sessionId}' Found a matching token with a different scopes '${token.scope}'. Attempting to get a new session using the existing session.`);
@@ -275,7 +297,7 @@ export class AzureActiveDirectoryService {
 			.map(result => (result as PromiseFulfilledResult<vscode.AuthenticationSession>).value);
 	}
 
-	public createSession(scopes: string[]): Promise<vscode.AuthenticationSession> {
+	public createSession(scopes: string[], account?: vscode.AuthenticationSessionAccountInformation): Promise<vscode.AuthenticationSession> {
 		let modifiedScopes = [...scopes];
 		if (!modifiedScopes.includes('openid')) {
 			modifiedScopes.push('openid');
@@ -301,11 +323,11 @@ export class AzureActiveDirectoryService {
 		};
 
 		this._logger.trace(`[${scopeData.scopeStr}] Queued creating session`);
-		return this._sequencer.queue(scopeData.scopeStr, () => this.doCreateSession(scopeData));
+		return this._sequencer.queue(scopeData.scopeStr, () => this.doCreateSession(scopeData, account));
 	}
 
-	private async doCreateSession(scopeData: IScopeData): Promise<vscode.AuthenticationSession> {
-		this._logger.info(`[${scopeData.scopeStr}] Creating session`);
+	private async doCreateSession(scopeData: IScopeData, account?: vscode.AuthenticationSessionAccountInformation): Promise<vscode.AuthenticationSession> {
+		this._logger.info(`[${scopeData.scopeStr}] Creating session` + account ? ` for ${account?.label}` : '');
 
 		const runsRemote = vscode.env.remoteName !== undefined;
 		const runsServerless = vscode.env.remoteName === undefined && vscode.env.uiKind === vscode.UIKind.Web;
@@ -316,17 +338,17 @@ export class AzureActiveDirectoryService {
 
 		return await vscode.window.withProgress({ location: vscode.ProgressLocation.Notification, title: vscode.l10n.t('Signing in to your account...'), cancellable: true }, async (_progress, token) => {
 			if (runsRemote || runsServerless) {
-				return await this.createSessionWithoutLocalServer(scopeData, token);
+				return await this.createSessionWithoutLocalServer(scopeData, account?.label, token);
 			}
 
 			try {
-				return await this.createSessionWithLocalServer(scopeData, token);
+				return await this.createSessionWithLocalServer(scopeData, account?.label, token);
 			} catch (e) {
 				this._logger.error(`[${scopeData.scopeStr}] Error creating session: ${e}`);
 
 				// If the error was about starting the server, try directly hitting the login endpoint instead
 				if (e.message === 'Error listening to server' || e.message === 'Closed' || e.message === 'Timeout waiting for port') {
-					return this.createSessionWithoutLocalServer(scopeData, token);
+					return this.createSessionWithoutLocalServer(scopeData, account?.label, token);
 				}
 
 				throw e;
@@ -334,7 +356,7 @@ export class AzureActiveDirectoryService {
 		});
 	}
 
-	private async createSessionWithLocalServer(scopeData: IScopeData, token: vscode.CancellationToken): Promise<vscode.AuthenticationSession> {
+	private async createSessionWithLocalServer(scopeData: IScopeData, loginHint: string | undefined, token: vscode.CancellationToken): Promise<vscode.AuthenticationSession> {
 		this._logger.trace(`[${scopeData.scopeStr}] Starting login flow with local server`);
 		const codeVerifier = generateCodeVerifier();
 		const codeChallenge = await generateCodeChallenge(codeVerifier);
@@ -344,11 +366,15 @@ export class AzureActiveDirectoryService {
 			client_id: scopeData.clientId,
 			redirect_uri: redirectUrl,
 			scope: scopeData.scopesToSend,
-			prompt: 'select_account',
 			code_challenge_method: 'S256',
 			code_challenge: codeChallenge,
-		}).toString();
-		const loginUrl = new URL(`${scopeData.tenant}/oauth2/v2.0/authorize?${qs}`, this._env.activeDirectoryEndpointUrl).toString();
+		});
+		if (loginHint) {
+			qs.set('login_hint', loginHint);
+		} else {
+			qs.set('prompt', 'select_account');
+		}
+		const loginUrl = new URL(`${scopeData.tenant}/oauth2/v2.0/authorize?${qs.toString()}`, this._env.activeDirectoryEndpointUrl).toString();
 		const server = new LoopbackAuthServer(path.join(__dirname, '../media'), loginUrl);
 		await server.start();
 
@@ -370,7 +396,7 @@ export class AzureActiveDirectoryService {
 		return session;
 	}
 
-	private async createSessionWithoutLocalServer(scopeData: IScopeData, token: vscode.CancellationToken): Promise<vscode.AuthenticationSession> {
+	private async createSessionWithoutLocalServer(scopeData: IScopeData, loginHint: string | undefined, token: vscode.CancellationToken): Promise<vscode.AuthenticationSession> {
 		this._logger.trace(`[${scopeData.scopeStr}] Starting login flow without local server`);
 		let callbackUri = await vscode.env.asExternalUri(vscode.Uri.parse(`${vscode.env.uriScheme}://vscode.microsoft-authentication`));
 		const nonce = generateCodeVerifier();
@@ -383,17 +409,22 @@ export class AzureActiveDirectoryService {
 		const codeVerifier = generateCodeVerifier();
 		const codeChallenge = await generateCodeChallenge(codeVerifier);
 		const signInUrl = new URL(`${scopeData.tenant}/oauth2/v2.0/authorize`, this._env.activeDirectoryEndpointUrl);
-		signInUrl.search = new URLSearchParams({
+		const qs = new URLSearchParams({
 			response_type: 'code',
 			client_id: encodeURIComponent(scopeData.clientId),
 			response_mode: 'query',
 			redirect_uri: redirectUrl,
 			state,
 			scope: scopeData.scopesToSend,
-			prompt: 'select_account',
 			code_challenge_method: 'S256',
 			code_challenge: codeChallenge,
-		}).toString();
+		});
+		if (loginHint) {
+			qs.append('login_hint', loginHint);
+		} else {
+			qs.append('prompt', 'select_account');
+		}
+		signInUrl.search = qs.toString();
 		const uri = vscode.Uri.parse(signInUrl.toString());
 		vscode.env.openExternal(uri);
 
@@ -775,11 +806,10 @@ export class AzureActiveDirectoryService {
 			let result;
 			let errorMessage: string | undefined;
 			try {
-				result = await fetching(endpoint, {
+				result = await fetch(endpoint.toString(), {
 					method: 'POST',
 					headers: {
-						'Content-Type': 'application/x-www-form-urlencoded',
-						'Content-Length': postData.length.toString()
+						'Content-Type': 'application/x-www-form-urlencoded'
 					},
 					body: postData
 				});
diff --git a/extensions/microsoft-authentication/src/UriEventHandler.ts b/extensions/microsoft-authentication/src/UriEventHandler.ts
index 3dc753af835..f525912fa51 100644
--- a/extensions/microsoft-authentication/src/UriEventHandler.ts
+++ b/extensions/microsoft-authentication/src/UriEventHandler.ts
@@ -6,7 +6,14 @@
 import * as vscode from 'vscode';
 
 export class UriEventHandler extends vscode.EventEmitter<vscode.Uri> implements vscode.UriHandler {
-	public handleUri(uri: vscode.Uri) {
+	private _disposable = vscode.window.registerUriHandler(this);
+
+	handleUri(uri: vscode.Uri) {
 		this.fire(uri);
 	}
+
+	override dispose(): void {
+		super.dispose();
+		this._disposable.dispose();
+	}
 }
diff --git a/extensions/microsoft-authentication/src/browser/authProvider.ts b/extensions/microsoft-authentication/src/browser/authProvider.ts
new file mode 100644
index 00000000000..3b4da5b18fa
--- /dev/null
+++ b/extensions/microsoft-authentication/src/browser/authProvider.ts
@@ -0,0 +1,29 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { AuthenticationProvider, AuthenticationProviderAuthenticationSessionsChangeEvent, AuthenticationSession, EventEmitter } from 'vscode';
+
+export class MsalAuthProvider implements AuthenticationProvider {
+	private _onDidChangeSessions = new EventEmitter<AuthenticationProviderAuthenticationSessionsChangeEvent>();
+	onDidChangeSessions = this._onDidChangeSessions.event;
+
+	initialize(): Thenable<void> {
+		throw new Error('Method not implemented.');
+	}
+
+	getSessions(): Thenable<AuthenticationSession[]> {
+		throw new Error('Method not implemented.');
+	}
+	createSession(): Thenable<AuthenticationSession> {
+		throw new Error('Method not implemented.');
+	}
+	removeSession(): Thenable<void> {
+		throw new Error('Method not implemented.');
+	}
+
+	dispose() {
+		this._onDidChangeSessions.dispose();
+	}
+}
diff --git a/extensions/microsoft-authentication/src/browser/fetch.ts b/extensions/microsoft-authentication/src/browser/fetch.ts
index f7f69f1a1a1..c61281ca8f8 100644
--- a/extensions/microsoft-authentication/src/browser/fetch.ts
+++ b/extensions/microsoft-authentication/src/browser/fetch.ts
@@ -3,4 +3,4 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-export const fetching = fetch;
+export default fetch;
diff --git a/extensions/microsoft-authentication/src/common/async.ts b/extensions/microsoft-authentication/src/common/async.ts
index 641faaff0dd..094861518fc 100644
--- a/extensions/microsoft-authentication/src/common/async.ts
+++ b/extensions/microsoft-authentication/src/common/async.ts
@@ -3,7 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationError, CancellationToken, Disposable } from 'vscode';
+import { CancellationError, CancellationToken, Disposable, Event, EventEmitter } from 'vscode';
+
+/**
+ * Can be passed into the Delayed to defer using a microtask
+ */
+export const MicrotaskDelay = Symbol('MicrotaskDelay');
 
 export class SequencerByKey<TKey> {
 
@@ -80,3 +85,473 @@ export function raceTimeoutError<T>(promise: Promise<T>, timeout: number): Promi
 export function raceCancellationAndTimeoutError<T>(promise: Promise<T>, token: CancellationToken, timeout: number): Promise<T> {
 	return raceCancellationError(raceTimeoutError(promise, timeout), token);
 }
+
+interface ILimitedTaskFactory<T> {
+	factory: () => Promise<T>;
+	c: (value: T | Promise<T>) => void;
+	e: (error?: unknown) => void;
+}
+
+export interface ILimiter<T> {
+
+	readonly size: number;
+
+	queue(factory: () => Promise<T>): Promise<T>;
+
+	clear(): void;
+}
+
+/**
+ * A helper to queue N promises and run them all with a max degree of parallelism. The helper
+ * ensures that at any time no more than M promises are running at the same time.
+ */
+export class Limiter<T> implements ILimiter<T> {
+
+	private _size = 0;
+	private _isDisposed = false;
+	private runningPromises: number;
+	private readonly maxDegreeOfParalellism: number;
+	private readonly outstandingPromises: ILimitedTaskFactory<T>[];
+	private readonly _onDrained: EventEmitter<void>;
+
+	constructor(maxDegreeOfParalellism: number) {
+		this.maxDegreeOfParalellism = maxDegreeOfParalellism;
+		this.outstandingPromises = [];
+		this.runningPromises = 0;
+		this._onDrained = new EventEmitter<void>();
+	}
+
+	/**
+	 *
+	 * @returns A promise that resolved when all work is done (onDrained) or when
+	 * there is nothing to do
+	 */
+	whenIdle(): Promise<void> {
+		return this.size > 0
+			? toPromise(this.onDrained)
+			: Promise.resolve();
+	}
+
+	get onDrained(): Event<void> {
+		return this._onDrained.event;
+	}
+
+	get size(): number {
+		return this._size;
+	}
+
+	queue(factory: () => Promise<T>): Promise<T> {
+		if (this._isDisposed) {
+			throw new Error('Object has been disposed');
+		}
+		this._size++;
+
+		return new Promise<T>((c, e) => {
+			this.outstandingPromises.push({ factory, c, e });
+			this.consume();
+		});
+	}
+
+	private consume(): void {
+		while (this.outstandingPromises.length && this.runningPromises < this.maxDegreeOfParalellism) {
+			const iLimitedTask = this.outstandingPromises.shift()!;
+			this.runningPromises++;
+
+			const promise = iLimitedTask.factory();
+			promise.then(iLimitedTask.c, iLimitedTask.e);
+			promise.then(() => this.consumed(), () => this.consumed());
+		}
+	}
+
+	private consumed(): void {
+		if (this._isDisposed) {
+			return;
+		}
+		this.runningPromises--;
+		if (--this._size === 0) {
+			this._onDrained.fire();
+		}
+
+		if (this.outstandingPromises.length > 0) {
+			this.consume();
+		}
+	}
+
+	clear(): void {
+		if (this._isDisposed) {
+			throw new Error('Object has been disposed');
+		}
+		this.outstandingPromises.length = 0;
+		this._size = this.runningPromises;
+	}
+
+	dispose(): void {
+		this._isDisposed = true;
+		this.outstandingPromises.length = 0; // stop further processing
+		this._size = 0;
+		this._onDrained.dispose();
+	}
+}
+
+
+interface IScheduledLater extends Disposable {
+	isTriggered(): boolean;
+}
+
+const timeoutDeferred = (timeout: number, fn: () => void): IScheduledLater => {
+	let scheduled = true;
+	const handle = setTimeout(() => {
+		scheduled = false;
+		fn();
+	}, timeout);
+	return {
+		isTriggered: () => scheduled,
+		dispose: () => {
+			clearTimeout(handle);
+			scheduled = false;
+		},
+	};
+};
+
+const microtaskDeferred = (fn: () => void): IScheduledLater => {
+	let scheduled = true;
+	queueMicrotask(() => {
+		if (scheduled) {
+			scheduled = false;
+			fn();
+		}
+	});
+
+	return {
+		isTriggered: () => scheduled,
+		dispose: () => { scheduled = false; },
+	};
+};
+
+/**
+ * A helper to delay (debounce) execution of a task that is being requested often.
+ *
+ * Following the throttler, now imagine the mail man wants to optimize the number of
+ * trips proactively. The trip itself can be long, so he decides not to make the trip
+ * as soon as a letter is submitted. Instead he waits a while, in case more
+ * letters are submitted. After said waiting period, if no letters were submitted, he
+ * decides to make the trip. Imagine that N more letters were submitted after the first
+ * one, all within a short period of time between each other. Even though N+1
+ * submissions occurred, only 1 delivery was made.
+ *
+ * The delayer offers this behavior via the trigger() method, into which both the task
+ * to be executed and the waiting period (delay) must be passed in as arguments. Following
+ * the example:
+ *
+ * 		const delayer = new Delayer(WAITING_PERIOD);
+ * 		const letters = [];
+ *
+ * 		function letterReceived(l) {
+ * 			letters.push(l);
+ * 			delayer.trigger(() => { return makeTheTrip(); });
+ * 		}
+ */
+export class Delayer<T> implements Disposable {
+
+	private deferred: IScheduledLater | null;
+	private completionPromise: Promise<any> | null;
+	private doResolve: ((value?: any | Promise<any>) => void) | null;
+	private doReject: ((err: any) => void) | null;
+	private task: (() => T | Promise<T>) | null;
+
+	constructor(public defaultDelay: number | typeof MicrotaskDelay) {
+		this.deferred = null;
+		this.completionPromise = null;
+		this.doResolve = null;
+		this.doReject = null;
+		this.task = null;
+	}
+
+	trigger(task: () => T | Promise<T>, delay = this.defaultDelay): Promise<T> {
+		this.task = task;
+		this.cancelTimeout();
+
+		if (!this.completionPromise) {
+			this.completionPromise = new Promise((resolve, reject) => {
+				this.doResolve = resolve;
+				this.doReject = reject;
+			}).then(() => {
+				this.completionPromise = null;
+				this.doResolve = null;
+				if (this.task) {
+					const task = this.task;
+					this.task = null;
+					return task();
+				}
+				return undefined;
+			});
+		}
+
+		const fn = () => {
+			this.deferred = null;
+			this.doResolve?.(null);
+		};
+
+		this.deferred = delay === MicrotaskDelay ? microtaskDeferred(fn) : timeoutDeferred(delay, fn);
+
+		return this.completionPromise;
+	}
+
+	isTriggered(): boolean {
+		return !!this.deferred?.isTriggered();
+	}
+
+	cancel(): void {
+		this.cancelTimeout();
+
+		if (this.completionPromise) {
+			this.doReject?.(new CancellationError());
+			this.completionPromise = null;
+		}
+	}
+
+	private cancelTimeout(): void {
+		this.deferred?.dispose();
+		this.deferred = null;
+	}
+
+	dispose(): void {
+		this.cancel();
+	}
+}
+
+/**
+ * A helper to prevent accumulation of sequential async tasks.
+ *
+ * Imagine a mail man with the sole task of delivering letters. As soon as
+ * a letter submitted for delivery, he drives to the destination, delivers it
+ * and returns to his base. Imagine that during the trip, N more letters were submitted.
+ * When the mail man returns, he picks those N letters and delivers them all in a
+ * single trip. Even though N+1 submissions occurred, only 2 deliveries were made.
+ *
+ * The throttler implements this via the queue() method, by providing it a task
+ * factory. Following the example:
+ *
+ * 		const throttler = new Throttler();
+ * 		const letters = [];
+ *
+ * 		function deliver() {
+ * 			const lettersToDeliver = letters;
+ * 			letters = [];
+ * 			return makeTheTrip(lettersToDeliver);
+ * 		}
+ *
+ * 		function onLetterReceived(l) {
+ * 			letters.push(l);
+ * 			throttler.queue(deliver);
+ * 		}
+ */
+export class Throttler implements Disposable {
+
+	private activePromise: Promise<any> | null;
+	private queuedPromise: Promise<any> | null;
+	private queuedPromiseFactory: (() => Promise<any>) | null;
+
+	private isDisposed = false;
+
+	constructor() {
+		this.activePromise = null;
+		this.queuedPromise = null;
+		this.queuedPromiseFactory = null;
+	}
+
+	queue<T>(promiseFactory: () => Promise<T>): Promise<T> {
+		if (this.isDisposed) {
+			return Promise.reject(new Error('Throttler is disposed'));
+		}
+
+		if (this.activePromise) {
+			this.queuedPromiseFactory = promiseFactory;
+
+			if (!this.queuedPromise) {
+				const onComplete = () => {
+					this.queuedPromise = null;
+
+					if (this.isDisposed) {
+						return;
+					}
+
+					const result = this.queue(this.queuedPromiseFactory!);
+					this.queuedPromiseFactory = null;
+
+					return result;
+				};
+
+				this.queuedPromise = new Promise(resolve => {
+					this.activePromise!.then(onComplete, onComplete).then(resolve);
+				});
+			}
+
+			return new Promise((resolve, reject) => {
+				this.queuedPromise!.then(resolve, reject);
+			});
+		}
+
+		this.activePromise = promiseFactory();
+
+		return new Promise((resolve, reject) => {
+			this.activePromise!.then((result: T) => {
+				this.activePromise = null;
+				resolve(result);
+			}, (err: unknown) => {
+				this.activePromise = null;
+				reject(err);
+			});
+		});
+	}
+
+	dispose(): void {
+		this.isDisposed = true;
+	}
+}
+
+/**
+ * A helper to delay execution of a task that is being requested often, while
+ * preventing accumulation of consecutive executions, while the task runs.
+ *
+ * The mail man is clever and waits for a certain amount of time, before going
+ * out to deliver letters. While the mail man is going out, more letters arrive
+ * and can only be delivered once he is back. Once he is back the mail man will
+ * do one more trip to deliver the letters that have accumulated while he was out.
+ */
+export class ThrottledDelayer<T> {
+
+	private delayer: Delayer<Promise<T>>;
+	private throttler: Throttler;
+
+	constructor(defaultDelay: number) {
+		this.delayer = new Delayer(defaultDelay);
+		this.throttler = new Throttler();
+	}
+
+	trigger(promiseFactory: () => Promise<T>, delay?: number): Promise<T> {
+		return this.delayer.trigger(() => this.throttler.queue(promiseFactory), delay) as unknown as Promise<T>;
+	}
+
+	isTriggered(): boolean {
+		return this.delayer.isTriggered();
+	}
+
+	cancel(): void {
+		this.delayer.cancel();
+	}
+
+	dispose(): void {
+		this.delayer.dispose();
+		this.throttler.dispose();
+	}
+}
+
+/**
+ * A queue is handles one promise at a time and guarantees that at any time only one promise is executing.
+ */
+export class Queue<T> extends Limiter<T> {
+
+	constructor() {
+		super(1);
+	}
+}
+
+/**
+ * Given an event, returns another event which only fires once.
+ *
+ * @param event The event source for the new event.
+ */
+export function once<T>(event: Event<T>): Event<T> {
+	return (listener, thisArgs = null, disposables?) => {
+		// we need this, in case the event fires during the listener call
+		let didFire = false;
+		let result: Disposable | undefined = undefined;
+		result = event(e => {
+			if (didFire) {
+				return;
+			} else if (result) {
+				result.dispose();
+			} else {
+				didFire = true;
+			}
+
+			return listener.call(thisArgs, e);
+		}, null, disposables);
+
+		if (didFire) {
+			result.dispose();
+		}
+
+		return result;
+	};
+}
+
+/**
+ * Creates a promise out of an event, using the {@link Event.once} helper.
+ */
+export function toPromise<T>(event: Event<T>): Promise<T> {
+	return new Promise(resolve => once(event)(resolve));
+}
+
+export type ValueCallback<T = unknown> = (value: T | Promise<T>) => void;
+
+const enum DeferredOutcome {
+	Resolved,
+	Rejected
+}
+
+/**
+ * Creates a promise whose resolution or rejection can be controlled imperatively.
+ */
+export class DeferredPromise<T> {
+
+	private completeCallback!: ValueCallback<T>;
+	private errorCallback!: (err: unknown) => void;
+	private outcome?: { outcome: DeferredOutcome.Rejected; value: any } | { outcome: DeferredOutcome.Resolved; value: T };
+
+	public get isRejected() {
+		return this.outcome?.outcome === DeferredOutcome.Rejected;
+	}
+
+	public get isResolved() {
+		return this.outcome?.outcome === DeferredOutcome.Resolved;
+	}
+
+	public get isSettled() {
+		return !!this.outcome;
+	}
+
+	public get value() {
+		return this.outcome?.outcome === DeferredOutcome.Resolved ? this.outcome?.value : undefined;
+	}
+
+	public readonly p: Promise<T>;
+
+	constructor() {
+		this.p = new Promise<T>((c, e) => {
+			this.completeCallback = c;
+			this.errorCallback = e;
+		});
+	}
+
+	public complete(value: T) {
+		return new Promise<void>(resolve => {
+			this.completeCallback(value);
+			this.outcome = { outcome: DeferredOutcome.Resolved, value };
+			resolve();
+		});
+	}
+
+	public error(err: unknown) {
+		return new Promise<void>(resolve => {
+			this.errorCallback(err);
+			this.outcome = { outcome: DeferredOutcome.Rejected, value: err };
+			resolve();
+		});
+	}
+
+	public cancel() {
+		return this.error(new CancellationError());
+	}
+}
diff --git a/extensions/microsoft-authentication/src/common/cachePlugin.ts b/extensions/microsoft-authentication/src/common/cachePlugin.ts
new file mode 100644
index 00000000000..91b4f0ee6a8
--- /dev/null
+++ b/extensions/microsoft-authentication/src/common/cachePlugin.ts
@@ -0,0 +1,55 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ICachePlugin, TokenCacheContext } from '@azure/msal-node';
+import { Disposable, EventEmitter, SecretStorage } from 'vscode';
+
+export class SecretStorageCachePlugin implements ICachePlugin {
+	private readonly _onDidChange: EventEmitter<void> = new EventEmitter<void>();
+	readonly onDidChange = this._onDidChange.event;
+
+	private _disposable: Disposable;
+
+	private _value: string | undefined;
+
+	constructor(
+		private readonly _secretStorage: SecretStorage,
+		private readonly _key: string
+	) {
+		this._disposable = Disposable.from(
+			this._onDidChange,
+			this._registerChangeHandler()
+		);
+	}
+
+	private _registerChangeHandler() {
+		return this._secretStorage.onDidChange(e => {
+			if (e.key === this._key) {
+				this._onDidChange.fire();
+			}
+		});
+	}
+
+	async beforeCacheAccess(tokenCacheContext: TokenCacheContext): Promise<void> {
+		const data = await this._secretStorage.get(this._key);
+		this._value = data;
+		if (data) {
+			tokenCacheContext.tokenCache.deserialize(data);
+		}
+	}
+
+	async afterCacheAccess(tokenCacheContext: TokenCacheContext): Promise<void> {
+		if (tokenCacheContext.cacheHasChanged) {
+			const value = tokenCacheContext.tokenCache.serialize();
+			if (value !== this._value) {
+				await this._secretStorage.store(this._key, value);
+			}
+		}
+	}
+
+	dispose() {
+		this._disposable.dispose();
+	}
+}
diff --git a/extensions/microsoft-authentication/src/common/event.ts b/extensions/microsoft-authentication/src/common/event.ts
new file mode 100644
index 00000000000..1df992cf8bb
--- /dev/null
+++ b/extensions/microsoft-authentication/src/common/event.ts
@@ -0,0 +1,107 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import { Event } from 'vscode';
+
+/**
+ * The EventBufferer is useful in situations in which you want
+ * to delay firing your events during some code.
+ * You can wrap that code and be sure that the event will not
+ * be fired during that wrap.
+ *
+ * ```
+ * const emitter: Emitter;
+ * const delayer = new EventDelayer();
+ * const delayedEvent = delayer.wrapEvent(emitter.event);
+ *
+ * delayedEvent(console.log);
+ *
+ * delayer.bufferEvents(() => {
+ *   emitter.fire(); // event will not be fired yet
+ * });
+ *
+ * // event will only be fired at this point
+ * ```
+ */
+export class EventBufferer {
+
+	private data: { buffers: Function[] }[] = [];
+
+	wrapEvent<T>(event: Event<T>): Event<T>;
+	wrapEvent<T>(event: Event<T>, reduce: (last: T | undefined, event: T) => T): Event<T>;
+	wrapEvent<T, O>(event: Event<T>, reduce: (last: O | undefined, event: T) => O, initial: O): Event<O>;
+	wrapEvent<T, O>(event: Event<T>, reduce?: (last: T | O | undefined, event: T) => T | O, initial?: O): Event<O | T> {
+		return (listener, thisArgs?, disposables?) => {
+			return event(i => {
+				const data = this.data[this.data.length - 1];
+
+				// Non-reduce scenario
+				if (!reduce) {
+					// Buffering case
+					if (data) {
+						data.buffers.push(() => listener.call(thisArgs, i));
+					} else {
+						// Not buffering case
+						listener.call(thisArgs, i);
+					}
+					return;
+				}
+
+				// Reduce scenario
+				const reduceData = data as typeof data & {
+					/**
+					 * The accumulated items that will be reduced.
+					 */
+					items?: T[];
+					/**
+					 * The reduced result cached to be shared with other listeners.
+					 */
+					reducedResult?: T | O;
+				};
+
+				// Not buffering case
+				if (!reduceData) {
+					// TODO: Is there a way to cache this reduce call for all listeners?
+					listener.call(thisArgs, reduce(initial, i));
+					return;
+				}
+
+				// Buffering case
+				reduceData.items ??= [];
+				reduceData.items.push(i);
+				if (reduceData.buffers.length === 0) {
+					// Include a single buffered function that will reduce all events when we're done buffering events
+					data.buffers.push(() => {
+						// cache the reduced result so that the value can be shared across all listeners
+						reduceData.reducedResult ??= initial
+							? reduceData.items!.reduce(reduce as (last: O | undefined, event: T) => O, initial)
+							: reduceData.items!.reduce(reduce as (last: T | undefined, event: T) => T);
+						listener.call(thisArgs, reduceData.reducedResult);
+					});
+				}
+			}, undefined, disposables);
+		};
+	}
+
+	bufferEvents<R = void>(fn: () => R): R {
+		const data = { buffers: new Array<Function>() };
+		this.data.push(data);
+		const r = fn();
+		this.data.pop();
+		data.buffers.forEach(flush => flush());
+		return r;
+	}
+
+	async bufferEventsAsync<R = void>(fn: () => Promise<R>): Promise<R> {
+		const data = { buffers: new Array<Function>() };
+		this.data.push(data);
+		try {
+			const r = await fn();
+			return r;
+		} finally {
+			this.data.pop();
+			data.buffers.forEach(flush => flush());
+		}
+	}
+}
diff --git a/extensions/microsoft-authentication/src/common/experimentation.ts b/extensions/microsoft-authentication/src/common/experimentation.ts
new file mode 100644
index 00000000000..dd383c4f040
--- /dev/null
+++ b/extensions/microsoft-authentication/src/common/experimentation.ts
@@ -0,0 +1,26 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import * as vscode from 'vscode';
+import { getExperimentationService, IExperimentationService, IExperimentationTelemetry, TargetPopulation } from 'vscode-tas-client';
+
+export async function createExperimentationService(
+	context: vscode.ExtensionContext,
+	experimentationTelemetry: IExperimentationTelemetry,
+	isPreRelease: boolean,
+): Promise<IExperimentationService> {
+	const id = context.extension.id;
+	const version = context.extension.packageJSON['version'];
+
+	const service = getExperimentationService(
+		id,
+		version,
+		isPreRelease ? TargetPopulation.Insiders : TargetPopulation.Public,
+		experimentationTelemetry,
+		context.globalState,
+	) as unknown as IExperimentationService;
+	await service.initializePromise;
+	await service.initialFetch;
+	return service;
+}
diff --git a/extensions/microsoft-authentication/src/common/loggerOptions.ts b/extensions/microsoft-authentication/src/common/loggerOptions.ts
new file mode 100644
index 00000000000..86443c0281f
--- /dev/null
+++ b/extensions/microsoft-authentication/src/common/loggerOptions.ts
@@ -0,0 +1,61 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { LogLevel as MsalLogLevel } from '@azure/msal-node';
+import { env, LogLevel, LogOutputChannel } from 'vscode';
+
+export class MsalLoggerOptions {
+	piiLoggingEnabled = false;
+
+	constructor(private readonly _output: LogOutputChannel) { }
+
+	get logLevel(): MsalLogLevel {
+		return this._toMsalLogLevel(env.logLevel);
+	}
+
+	loggerCallback(level: MsalLogLevel, message: string, containsPii: boolean): void {
+		if (containsPii) {
+			return;
+		}
+
+		switch (level) {
+			case MsalLogLevel.Error:
+				this._output.error(message);
+				return;
+			case MsalLogLevel.Warning:
+				this._output.warn(message);
+				return;
+			case MsalLogLevel.Info:
+				this._output.info(message);
+				return;
+			case MsalLogLevel.Verbose:
+				this._output.debug(message);
+				return;
+			case MsalLogLevel.Trace:
+				this._output.trace(message);
+				return;
+			default:
+				this._output.info(message);
+				return;
+		}
+	}
+
+	private _toMsalLogLevel(logLevel: LogLevel): MsalLogLevel {
+		switch (logLevel) {
+			case LogLevel.Trace:
+				return MsalLogLevel.Trace;
+			case LogLevel.Debug:
+				return MsalLogLevel.Verbose;
+			case LogLevel.Info:
+				return MsalLogLevel.Info;
+			case LogLevel.Warning:
+				return MsalLogLevel.Warning;
+			case LogLevel.Error:
+				return MsalLogLevel.Error;
+			default:
+				return MsalLogLevel.Info;
+		}
+	}
+}
diff --git a/extensions/microsoft-authentication/src/common/loopbackClientAndOpener.ts b/extensions/microsoft-authentication/src/common/loopbackClientAndOpener.ts
new file mode 100644
index 00000000000..3fbb0340037
--- /dev/null
+++ b/extensions/microsoft-authentication/src/common/loopbackClientAndOpener.ts
@@ -0,0 +1,52 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import type { ILoopbackClient, ServerAuthorizationCodeResponse } from '@azure/msal-node';
+import type { UriEventHandler } from '../UriEventHandler';
+import { env, LogOutputChannel, Uri } from 'vscode';
+import { toPromise } from './async';
+
+export interface ILoopbackClientAndOpener extends ILoopbackClient {
+	openBrowser(url: string): Promise<void>;
+}
+
+export class UriHandlerLoopbackClient implements ILoopbackClientAndOpener {
+	constructor(
+		private readonly _uriHandler: UriEventHandler,
+		private readonly _redirectUri: string,
+		private readonly _logger: LogOutputChannel
+	) { }
+
+	async listenForAuthCode(): Promise<ServerAuthorizationCodeResponse> {
+		const url = await toPromise(this._uriHandler.event);
+		this._logger.debug(`Received URL event. Authority: ${url.authority}`);
+		const result = new URL(url.toString(true));
+
+		return {
+			code: result.searchParams.get('code') ?? undefined,
+			state: result.searchParams.get('state') ?? undefined,
+			error: result.searchParams.get('error') ?? undefined,
+			error_description: result.searchParams.get('error_description') ?? undefined,
+			error_uri: result.searchParams.get('error_uri') ?? undefined,
+		};
+	}
+
+	getRedirectUri(): string {
+		// We always return the constant redirect URL because
+		// it will handle redirecting back to the extension
+		return this._redirectUri;
+	}
+
+	closeServer(): void {
+		// No-op
+	}
+
+	async openBrowser(url: string): Promise<void> {
+		const callbackUri = await env.asExternalUri(Uri.parse(`${env.uriScheme}://vscode.microsoft-authentication`));
+
+		const uri = Uri.parse(url + `&state=${encodeURI(callbackUri.toString(true))}`);
+		await env.openExternal(uri);
+	}
+}
diff --git a/extensions/microsoft-authentication/src/common/publicClientCache.ts b/extensions/microsoft-authentication/src/common/publicClientCache.ts
new file mode 100644
index 00000000000..925a4d1a88c
--- /dev/null
+++ b/extensions/microsoft-authentication/src/common/publicClientCache.ts
@@ -0,0 +1,24 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import type { AccountInfo, AuthenticationResult, InteractiveRequest, SilentFlowRequest } from '@azure/msal-node';
+import type { Disposable, Event } from 'vscode';
+
+export interface ICachedPublicClientApplication extends Disposable {
+	initialize(): Promise<void>;
+	onDidAccountsChange: Event<{ added: AccountInfo[]; changed: AccountInfo[]; deleted: AccountInfo[] }>;
+	onDidRemoveLastAccount: Event<void>;
+	acquireTokenSilent(request: SilentFlowRequest): Promise<AuthenticationResult>;
+	acquireTokenInteractive(request: InteractiveRequest): Promise<AuthenticationResult>;
+	removeAccount(account: AccountInfo): Promise<void>;
+	accounts: AccountInfo[];
+	clientId: string;
+	authority: string;
+}
+
+export interface ICachedPublicClientApplicationManager {
+	onDidAccountsChange: Event<{ added: AccountInfo[]; changed: AccountInfo[]; deleted: AccountInfo[] }>;
+	getOrCreate(clientId: string, authority: string): Promise<ICachedPublicClientApplication>;
+	getAll(): ICachedPublicClientApplication[];
+}
diff --git a/extensions/microsoft-authentication/src/common/scopeData.ts b/extensions/microsoft-authentication/src/common/scopeData.ts
new file mode 100644
index 00000000000..4432abfed43
--- /dev/null
+++ b/extensions/microsoft-authentication/src/common/scopeData.ts
@@ -0,0 +1,85 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+const DEFAULT_CLIENT_ID = 'aebc6443-996d-45c2-90f0-388ff96faa56';
+const DEFAULT_TENANT = 'organizations';
+
+const OIDC_SCOPES = ['openid', 'email', 'profile', 'offline_access'];
+const GRAPH_TACK_ON_SCOPE = 'User.Read';
+
+export class ScopeData {
+
+	/**
+	 * The full list of scopes including:
+	 * * the original scopes passed to the constructor
+	 * * internal VS Code scopes (e.g. `VSCODE_CLIENT_ID:...`)
+	 * * the default scopes (`openid`, `email`, `profile`, `offline_access`)
+	 */
+	readonly allScopes: string[];
+
+	/**
+	 * The full list of scopes as a space-separated string. For logging.
+	 */
+	readonly scopeStr: string;
+
+	/**
+	 * The list of scopes to send to the token endpoint. This is the same as `scopes` but without the internal VS Code scopes.
+	 */
+	readonly scopesToSend: string[];
+
+	/**
+	 * The client ID to use for the token request. This is the value of the `VSCODE_CLIENT_ID:...` scope if present, otherwise the default client ID.
+	 */
+	readonly clientId: string;
+
+	/**
+	 * The tenant ID to use for the token request. This is the value of the `VSCODE_TENANT:...` scope if present, otherwise the default tenant ID.
+	 */
+	readonly tenant: string;
+
+	constructor(readonly originalScopes: readonly string[] = []) {
+		const modifiedScopes = [...originalScopes];
+		modifiedScopes.sort();
+		this.allScopes = modifiedScopes;
+		this.scopeStr = modifiedScopes.join(' ');
+		this.scopesToSend = this.getScopesToSend(modifiedScopes);
+		this.clientId = this.getClientId(this.allScopes);
+		this.tenant = this.getTenantId(this.allScopes);
+	}
+
+	private getClientId(scopes: string[]) {
+		return scopes.reduce<string | undefined>((prev, current) => {
+			if (current.startsWith('VSCODE_CLIENT_ID:')) {
+				return current.split('VSCODE_CLIENT_ID:')[1];
+			}
+			return prev;
+		}, undefined) ?? DEFAULT_CLIENT_ID;
+	}
+
+	private getTenantId(scopes: string[]) {
+		return scopes.reduce<string | undefined>((prev, current) => {
+			if (current.startsWith('VSCODE_TENANT:')) {
+				return current.split('VSCODE_TENANT:')[1];
+			}
+			return prev;
+		}, undefined) ?? DEFAULT_TENANT;
+	}
+
+	private getScopesToSend(scopes: string[]) {
+		const scopesToSend = scopes.filter(s => !s.startsWith('VSCODE_'));
+
+		const set = new Set(scopesToSend);
+		for (const scope of OIDC_SCOPES) {
+			set.delete(scope);
+		}
+
+		// If we only had OIDC scopes, we need to add a tack-on scope to make the request valid
+		// by forcing Identity into treating this as a Graph token request.
+		if (!set.size) {
+			scopesToSend.push(GRAPH_TACK_ON_SCOPE);
+		}
+		return scopesToSend;
+	}
+}
diff --git a/extensions/microsoft-authentication/src/common/telemetryReporter.ts b/extensions/microsoft-authentication/src/common/telemetryReporter.ts
new file mode 100644
index 00000000000..25ac2623282
--- /dev/null
+++ b/extensions/microsoft-authentication/src/common/telemetryReporter.ts
@@ -0,0 +1,128 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import TelemetryReporter, { TelemetryEventProperties } from '@vscode/extension-telemetry';
+import { IExperimentationTelemetry } from 'vscode-tas-client';
+
+export const enum MicrosoftAccountType {
+	AAD = 'aad',
+	MSA = 'msa',
+	Unknown = 'unknown'
+}
+
+export class MicrosoftAuthenticationTelemetryReporter implements IExperimentationTelemetry {
+	private sharedProperties: Record<string, string> = {};
+	protected _telemetryReporter: TelemetryReporter;
+	constructor(aiKey: string) {
+		this._telemetryReporter = new TelemetryReporter(aiKey);
+	}
+
+	get telemetryReporter(): TelemetryReporter {
+		return this._telemetryReporter;
+	}
+
+	setSharedProperty(name: string, value: string): void {
+		this.sharedProperties[name] = value;
+	}
+
+	postEvent(eventName: string, props: Map<string, string>): void {
+		const eventProperties: TelemetryEventProperties = { ...this.sharedProperties, ...Object.fromEntries(props) };
+		this._telemetryReporter.sendTelemetryEvent(
+			eventName,
+			eventProperties
+		);
+	}
+
+	sendLoginEvent(scopes: readonly string[]): void {
+		/* __GDPR__
+			"login" : {
+				"owner": "TylerLeonhardt",
+				"comment": "Used to determine the usage of the Microsoft Auth Provider.",
+				"scopes": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight", "comment": "Used to determine what scope combinations are being requested." }
+			}
+		*/
+		this._telemetryReporter.sendTelemetryEvent('login', {
+			// Get rid of guids from telemetry.
+			scopes: JSON.stringify(this._scrubGuids(scopes)),
+		});
+	}
+	sendLoginFailedEvent(): void {
+		/* __GDPR__
+			"loginFailed" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often users run into issues with the login flow." }
+		*/
+		this._telemetryReporter.sendTelemetryEvent('loginFailed');
+	}
+	sendLogoutEvent(): void {
+		/* __GDPR__
+			"logout" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often users log out." }
+		*/
+		this._telemetryReporter.sendTelemetryEvent('logout');
+	}
+	sendLogoutFailedEvent(): void {
+		/* __GDPR__
+			"logoutFailed" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often fail to log out." }
+		*/
+		this._telemetryReporter.sendTelemetryEvent('logoutFailed');
+	}
+	/**
+	 * Sends an event for an account type available at startup.
+	 * @param scopes The scopes for the session
+	 * @param accountType The account type for the session
+	 * @todo Remove the scopes since we really don't care about them.
+	 */
+	sendAccountEvent(scopes: string[], accountType: MicrosoftAccountType): void {
+		/* __GDPR__
+			"login" : {
+				"owner": "TylerLeonhardt",
+				"comment": "Used to determine the usage of the Microsoft Auth Provider.",
+				"scopes": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight", "comment": "Used to determine what scope combinations are being requested." },
+				"accountType": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight", "comment": "Used to determine what account types are being used." }
+			}
+		*/
+		this._telemetryReporter.sendTelemetryEvent('account', {
+			// Get rid of guids from telemetry.
+			scopes: JSON.stringify(this._scrubGuids(scopes)),
+			accountType
+		});
+	}
+
+	protected _scrubGuids(scopes: readonly string[]): string[] {
+		return scopes.map(s => s.replace(/[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}/i, '{guid}'));
+	}
+}
+
+export class MicrosoftSovereignCloudAuthenticationTelemetryReporter extends MicrosoftAuthenticationTelemetryReporter {
+	override sendLoginEvent(scopes: string[]): void {
+		/* __GDPR__
+			"loginMicrosoftSovereignCloud" : {
+				"owner": "TylerLeonhardt",
+				"comment": "Used to determine the usage of the Microsoft Auth Provider.",
+				"scopes": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight", "comment": "Used to determine what scope combinations are being requested." }
+			}
+		*/
+		this._telemetryReporter.sendTelemetryEvent('loginMicrosoftSovereignCloud', {
+			// Get rid of guids from telemetry.
+			scopes: JSON.stringify(this._scrubGuids(scopes)),
+		});
+	}
+	override sendLoginFailedEvent(): void {
+		/* __GDPR__
+			"loginMicrosoftSovereignCloudFailed" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often users run into issues with the login flow." }
+		*/
+		this._telemetryReporter.sendTelemetryEvent('loginMicrosoftSovereignCloudFailed');
+	}
+	override sendLogoutEvent(): void {
+		/* __GDPR__
+			"logoutMicrosoftSovereignCloud" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often users log out." }
+		*/
+		this._telemetryReporter.sendTelemetryEvent('logoutMicrosoftSovereignCloud');
+	}
+	override sendLogoutFailedEvent(): void {
+		/* __GDPR__
+			"logoutMicrosoftSovereignCloudFailed" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often fail to log out." }
+		*/
+		this._telemetryReporter.sendTelemetryEvent('logoutMicrosoftSovereignCloudFailed');
+	}
+}
diff --git a/extensions/microsoft-authentication/src/common/test/loopbackClientAndOpener.test.ts b/extensions/microsoft-authentication/src/common/test/loopbackClientAndOpener.test.ts
new file mode 100644
index 00000000000..69d7afaa38a
--- /dev/null
+++ b/extensions/microsoft-authentication/src/common/test/loopbackClientAndOpener.test.ts
@@ -0,0 +1,83 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { env, Uri, window } from 'vscode';
+import * as sinon from 'sinon';
+import { UriHandlerLoopbackClient } from '../loopbackClientAndOpener';
+import { UriEventHandler } from '../../UriEventHandler';
+
+suite('UriHandlerLoopbackClient', () => {
+	const redirectUri = 'http://localhost';
+	let uriHandler: UriEventHandler;
+	let client: UriHandlerLoopbackClient;
+	let envStub: sinon.SinonStubbedInstance<typeof env>;
+	let callbackUri: Uri;
+
+	setup(async () => {
+		callbackUri = await env.asExternalUri(Uri.parse(`${env.uriScheme}://vscode.microsoft-authentication`));
+		envStub = sinon.stub(env);
+		envStub.openExternal.resolves(true);
+		envStub.asExternalUri.callThrough();
+		uriHandler = new UriEventHandler();
+		client = new UriHandlerLoopbackClient(uriHandler, redirectUri, window.createOutputChannel('test', { log: true }));
+	});
+
+	teardown(() => {
+		sinon.restore();
+		uriHandler.dispose();
+	});
+
+	suite('openBrowser', () => {
+		test('should open browser with correct URL', async () => {
+			const testUrl = 'http://example.com?foo=5';
+
+			await client.openBrowser(testUrl);
+
+			assert.ok(envStub.asExternalUri.calledOnce);
+			assert.ok(envStub.openExternal.calledOnce);
+
+			const expectedUri = Uri.parse(testUrl + `&state=${encodeURI(callbackUri.toString(true))}`);
+			const value = envStub.openExternal.getCalls()[0].args[0];
+			assert.strictEqual(value.toString(true), expectedUri.toString(true));
+		});
+	});
+
+	suite('getRedirectUri', () => {
+		test('should return the redirect URI', () => {
+			const result = client.getRedirectUri();
+			assert.strictEqual(result, redirectUri);
+		});
+	});
+
+	suite('listenForAuthCode', () => {
+		test('should return auth code from URL', async () => {
+			const code = '1234';
+			const state = '5678';
+			const testUrl = Uri.parse(`http://example.com?code=${code}&state=${state}`);
+			const promise = client.listenForAuthCode();
+			uriHandler.handleUri(testUrl);
+			const result = await promise;
+
+			assert.strictEqual(result.code, code);
+			assert.strictEqual(result.state, state);
+		});
+
+		test('should return auth error from URL', async () => {
+			const error = 'access_denied';
+			const errorDescription = 'reason';
+			const errorUri = 'uri';
+			const testUrl = Uri.parse(`http://example.com?error=${error}&error_description=${errorDescription}&error_uri=${errorUri}`);
+
+			const promise = client.listenForAuthCode();
+			uriHandler.handleUri(testUrl);
+			const result = await promise;
+
+			assert.strictEqual(result.error, 'access_denied');
+			assert.strictEqual(result.error_description, 'reason');
+			assert.strictEqual(result.error_uri, 'uri');
+		});
+	});
+});
diff --git a/extensions/microsoft-authentication/src/common/test/scopeData.test.ts b/extensions/microsoft-authentication/src/common/test/scopeData.test.ts
new file mode 100644
index 00000000000..9250d7cecbd
--- /dev/null
+++ b/extensions/microsoft-authentication/src/common/test/scopeData.test.ts
@@ -0,0 +1,59 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { ScopeData } from '../scopeData';
+
+suite('ScopeData', () => {
+	test('should include default scopes if not present', () => {
+		const scopeData = new ScopeData(['custom_scope']);
+		assert.deepStrictEqual(scopeData.allScopes, ['custom_scope']);
+	});
+
+	test('should not duplicate default scopes if already present', () => {
+		const scopeData = new ScopeData(['custom_scope', 'openid', 'email', 'profile', 'offline_access']);
+		assert.deepStrictEqual(scopeData.allScopes, ['custom_scope', 'email', 'offline_access', 'openid', 'profile']);
+	});
+
+	test('should sort the scopes alphabetically', () => {
+		const scopeData = new ScopeData(['custom_scope', 'profile', 'email', 'openid', 'offline_access']);
+		assert.deepStrictEqual(scopeData.allScopes, ['custom_scope', 'email', 'offline_access', 'openid', 'profile']);
+	});
+
+	test('should create a space-separated string of all scopes', () => {
+		const scopeData = new ScopeData(['custom_scope', 'openid', 'email', 'offline_access', 'profile']);
+		assert.strictEqual(scopeData.scopeStr, 'custom_scope email offline_access openid profile');
+	});
+
+	test('should add TACK ON scope if all scopes are OIDC scopes', () => {
+		const scopeData = new ScopeData(['openid', 'email', 'offline_access', 'profile']);
+		assert.deepStrictEqual(scopeData.scopesToSend, ['email', 'offline_access', 'openid', 'profile', 'User.Read']);
+	});
+
+	test('should filter out internal VS Code scopes for scopesToSend', () => {
+		const scopeData = new ScopeData(['custom_scope', 'VSCODE_CLIENT_ID:some_id']);
+		assert.deepStrictEqual(scopeData.scopesToSend, ['custom_scope']);
+	});
+
+	test('should use the default client ID if no VSCODE_CLIENT_ID scope is present', () => {
+		const scopeData = new ScopeData(['custom_scope']);
+		assert.strictEqual(scopeData.clientId, 'aebc6443-996d-45c2-90f0-388ff96faa56');
+	});
+
+	test('should use the VSCODE_CLIENT_ID scope if present', () => {
+		const scopeData = new ScopeData(['custom_scope', 'VSCODE_CLIENT_ID:some_id']);
+		assert.strictEqual(scopeData.clientId, 'some_id');
+	});
+
+	test('should use the default tenant ID if no VSCODE_TENANT scope is present', () => {
+		const scopeData = new ScopeData(['custom_scope']);
+		assert.strictEqual(scopeData.tenant, 'organizations');
+	});
+
+	test('should use the VSCODE_TENANT scope if present', () => {
+		const scopeData = new ScopeData(['custom_scope', 'VSCODE_TENANT:some_tenant']);
+		assert.strictEqual(scopeData.tenant, 'some_tenant');
+	});
+});
diff --git a/extensions/microsoft-authentication/src/cryptoUtils.ts b/extensions/microsoft-authentication/src/cryptoUtils.ts
index 582dae74c3c..e608a81fc99 100644
--- a/extensions/microsoft-authentication/src/cryptoUtils.ts
+++ b/extensions/microsoft-authentication/src/cryptoUtils.ts
@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import { base64Encode } from './node/buffer';
-import { crypto } from './node/crypto';
 
 export function randomUUID() {
 	return crypto.randomUUID();
diff --git a/extensions/microsoft-authentication/src/extension.ts b/extensions/microsoft-authentication/src/extension.ts
index 02cfb4643f4..3f9b5d3a4d1 100644
--- a/extensions/microsoft-authentication/src/extension.ts
+++ b/extensions/microsoft-authentication/src/extension.ts
@@ -3,179 +3,83 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as vscode from 'vscode';
-import { Environment, EnvironmentParameters } from '@azure/ms-rest-azure-env';
-import { AzureActiveDirectoryService, IStoredSession } from './AADHelper';
-import { BetterTokenStorage } from './betterSecretStorage';
-import { UriEventHandler } from './UriEventHandler';
-import TelemetryReporter from '@vscode/extension-telemetry';
+import { commands, env, ExtensionContext, l10n, window, workspace } from 'vscode';
+import * as extensionV1 from './extensionV1';
+import * as extensionV2 from './extensionV2';
+import { createExperimentationService } from './common/experimentation';
+import { MicrosoftAuthenticationTelemetryReporter } from './common/telemetryReporter';
+import { IExperimentationService } from 'vscode-tas-client';
+import Logger from './logger';
 
-async function initMicrosoftSovereignCloudAuthProvider(context: vscode.ExtensionContext, telemetryReporter: TelemetryReporter, uriHandler: UriEventHandler, tokenStorage: BetterTokenStorage<IStoredSession>): Promise<vscode.Disposable | undefined> {
-	const environment = vscode.workspace.getConfiguration('microsoft-sovereign-cloud').get<string | undefined>('environment');
-	let authProviderName: string | undefined;
-	if (!environment) {
-		return undefined;
+function shouldUseMsal(expService: IExperimentationService): boolean {
+	// First check if there is a setting value to allow user to override the default
+	const inspect = workspace.getConfiguration('microsoft').inspect<boolean>('useMsal');
+	if (inspect?.workspaceFolderValue !== undefined) {
+		Logger.debug(`Acquired MSAL enablement value from 'workspaceFolderValue'. Value: ${inspect.workspaceFolderValue}`);
+		return inspect.workspaceFolderValue;
+	}
+	if (inspect?.workspaceValue !== undefined) {
+		Logger.debug(`Acquired MSAL enablement value from 'workspaceValue'. Value: ${inspect.workspaceValue}`);
+		return inspect.workspaceValue;
+	}
+	if (inspect?.globalValue !== undefined) {
+		Logger.debug(`Acquired MSAL enablement value from 'globalValue'. Value: ${inspect.globalValue}`);
+		return inspect.globalValue;
 	}
 
-	if (environment === 'custom') {
-		const customEnv = vscode.workspace.getConfiguration('microsoft-sovereign-cloud').get<EnvironmentParameters>('customEnvironment');
-		if (!customEnv) {
-			const res = await vscode.window.showErrorMessage(vscode.l10n.t('You must also specify a custom environment in order to use the custom environment auth provider.'), vscode.l10n.t('Open settings'));
-			if (res) {
-				await vscode.commands.executeCommand('workbench.action.openSettingsJson', 'microsoft-sovereign-cloud.customEnvironment');
-			}
-			return undefined;
-		}
-		try {
-			Environment.add(customEnv);
-		} catch (e) {
-			const res = await vscode.window.showErrorMessage(vscode.l10n.t('Error validating custom environment setting: {0}', e.message), vscode.l10n.t('Open settings'));
-			if (res) {
-				await vscode.commands.executeCommand('workbench.action.openSettings', 'microsoft-sovereign-cloud.customEnvironment');
-			}
-			return undefined;
-		}
-		authProviderName = customEnv.name;
-	} else {
-		authProviderName = environment;
+	// Then check if the experiment value
+	const expValue = expService.getTreatmentVariable<boolean>('vscode', 'microsoft.useMsal');
+	if (expValue !== undefined) {
+		Logger.debug(`Acquired MSAL enablement value from 'exp'. Value: ${expValue}`);
+		return expValue;
 	}
 
-	const env = Environment.get(authProviderName);
-	if (!env) {
-		const res = await vscode.window.showErrorMessage(vscode.l10n.t('The environment `{0}` is not a valid environment.', authProviderName), vscode.l10n.t('Open settings'));
-		return undefined;
-	}
-
-	const aadService = new AzureActiveDirectoryService(
-		vscode.window.createOutputChannel(vscode.l10n.t('Microsoft Sovereign Cloud Authentication'), { log: true }),
-		context,
-		uriHandler,
-		tokenStorage,
-		telemetryReporter,
-		env);
-	await aadService.initialize();
-
-	const disposable = vscode.authentication.registerAuthenticationProvider('microsoft-sovereign-cloud', authProviderName, {
-		onDidChangeSessions: aadService.onDidChangeSessions,
-		getSessions: (scopes: string[]) => aadService.getSessions(scopes),
-		createSession: async (scopes: string[]) => {
-			try {
-				/* __GDPR__
-					"login" : {
-						"owner": "TylerLeonhardt",
-						"comment": "Used to determine the usage of the Microsoft Sovereign Cloud Auth Provider.",
-						"scopes": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight", "comment": "Used to determine what scope combinations are being requested." }
-					}
-				*/
-				telemetryReporter.sendTelemetryEvent('loginMicrosoftSovereignCloud', {
-					// Get rid of guids from telemetry.
-					scopes: JSON.stringify(scopes.map(s => s.replace(/[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}/i, '{guid}'))),
-				});
-
-				return await aadService.createSession(scopes);
-			} catch (e) {
-				/* __GDPR__
-					"loginFailed" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often users run into issues with the login flow." }
-				*/
-				telemetryReporter.sendTelemetryEvent('loginMicrosoftSovereignCloudFailed');
-
-				throw e;
-			}
-		},
-		removeSession: async (id: string) => {
-			try {
-				/* __GDPR__
-					"logout" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often users log out." }
-				*/
-				telemetryReporter.sendTelemetryEvent('logoutMicrosoftSovereignCloud');
-
-				await aadService.removeSessionById(id);
-			} catch (e) {
-				/* __GDPR__
-					"logoutFailed" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often fail to log out." }
-				*/
-				telemetryReporter.sendTelemetryEvent('logoutMicrosoftSovereignCloudFailed');
-			}
-		}
-	}, { supportsMultipleAccounts: true });
-
-	context.subscriptions.push(disposable);
-	return disposable;
+	Logger.debug('Acquired MSAL enablement value from default. Value: false');
+	// If no setting or experiment value is found, default to false
+	return false;
 }
+let useMsal: boolean | undefined;
 
-export async function activate(context: vscode.ExtensionContext) {
-	const aiKey: string = context.extension.packageJSON.aiKey;
-	const telemetryReporter = new TelemetryReporter(aiKey);
-
-	const uriHandler = new UriEventHandler();
-	context.subscriptions.push(uriHandler);
-	context.subscriptions.push(vscode.window.registerUriHandler(uriHandler));
-	const betterSecretStorage = new BetterTokenStorage<IStoredSession>('microsoft.login.keylist', context);
-
-	const loginService = new AzureActiveDirectoryService(
-		vscode.window.createOutputChannel(vscode.l10n.t('Microsoft Authentication'), { log: true }),
+export async function activate(context: ExtensionContext) {
+	const mainTelemetryReporter = new MicrosoftAuthenticationTelemetryReporter(context.extension.packageJSON.aiKey);
+	const expService = await createExperimentationService(
 		context,
-		uriHandler,
-		betterSecretStorage,
-		telemetryReporter,
-		Environment.AzureCloud);
-	await loginService.initialize();
+		mainTelemetryReporter,
+		env.uriScheme !== 'vscode', // isPreRelease
+	);
+	useMsal = shouldUseMsal(expService);
 
-	context.subscriptions.push(vscode.authentication.registerAuthenticationProvider('microsoft', 'Microsoft', {
-		onDidChangeSessions: loginService.onDidChangeSessions,
-		getSessions: (scopes: string[]) => loginService.getSessions(scopes),
-		createSession: async (scopes: string[]) => {
-			try {
-				/* __GDPR__
-					"login" : {
-						"owner": "TylerLeonhardt",
-						"comment": "Used to determine the usage of the Microsoft Auth Provider.",
-						"scopes": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight", "comment": "Used to determine what scope combinations are being requested." }
-					}
-				*/
-				telemetryReporter.sendTelemetryEvent('login', {
-					// Get rid of guids from telemetry.
-					scopes: JSON.stringify(scopes.map(s => s.replace(/[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}/i, '{guid}'))),
-				});
-
-				return await loginService.createSession(scopes);
-			} catch (e) {
-				/* __GDPR__
-					"loginFailed" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often users run into issues with the login flow." }
-				*/
-				telemetryReporter.sendTelemetryEvent('loginFailed');
-
-				throw e;
-			}
-		},
-		removeSession: async (id: string) => {
-			try {
-				/* __GDPR__
-					"logout" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often users log out." }
-				*/
-				telemetryReporter.sendTelemetryEvent('logout');
-
-				await loginService.removeSessionById(id);
-			} catch (e) {
-				/* __GDPR__
-					"logoutFailed" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often fail to log out." }
-				*/
-				telemetryReporter.sendTelemetryEvent('logoutFailed');
-			}
+	context.subscriptions.push(workspace.onDidChangeConfiguration(async e => {
+		if (!e.affectsConfiguration('microsoft.useMsal') || useMsal === shouldUseMsal(expService)) {
+			return;
 		}
-	}, { supportsMultipleAccounts: true }));
 
-	let microsoftSovereignCloudAuthProviderDisposable = await initMicrosoftSovereignCloudAuthProvider(context, telemetryReporter, uriHandler, betterSecretStorage);
+		const reload = l10n.t('Reload');
+		const result = await window.showInformationMessage(
+			'Reload required',
+			{
+				modal: true,
+				detail: l10n.t('Microsoft Account configuration has been changed.'),
+			},
+			reload
+		);
 
-	context.subscriptions.push(vscode.workspace.onDidChangeConfiguration(async e => {
-		if (e.affectsConfiguration('microsoft-sovereign-cloud')) {
-			microsoftSovereignCloudAuthProviderDisposable?.dispose();
-			microsoftSovereignCloudAuthProviderDisposable = await initMicrosoftSovereignCloudAuthProvider(context, telemetryReporter, uriHandler, betterSecretStorage);
+		if (result === reload) {
+			commands.executeCommand('workbench.action.reloadWindow');
 		}
 	}));
-
-	return;
+	// Only activate the new extension if we are not running in a browser environment
+	if (useMsal && typeof navigator === 'undefined') {
+		await extensionV2.activate(context, mainTelemetryReporter);
+	} else {
+		await extensionV1.activate(context, mainTelemetryReporter.telemetryReporter);
+	}
 }
 
-// this method is called when your extension is deactivated
-export function deactivate() { }
+export function deactivate() {
+	if (useMsal) {
+		extensionV2.deactivate();
+	} else {
+		extensionV1.deactivate();
+	}
+}
diff --git a/extensions/microsoft-authentication/src/extensionV1.ts b/extensions/microsoft-authentication/src/extensionV1.ts
new file mode 100644
index 00000000000..f785adad85c
--- /dev/null
+++ b/extensions/microsoft-authentication/src/extensionV1.ts
@@ -0,0 +1,178 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import { Environment, EnvironmentParameters } from '@azure/ms-rest-azure-env';
+import { AzureActiveDirectoryService, IStoredSession } from './AADHelper';
+import { BetterTokenStorage } from './betterSecretStorage';
+import { UriEventHandler } from './UriEventHandler';
+import TelemetryReporter from '@vscode/extension-telemetry';
+import Logger from './logger';
+
+async function initMicrosoftSovereignCloudAuthProvider(context: vscode.ExtensionContext, telemetryReporter: TelemetryReporter, uriHandler: UriEventHandler, tokenStorage: BetterTokenStorage<IStoredSession>): Promise<vscode.Disposable | undefined> {
+	const environment = vscode.workspace.getConfiguration('microsoft-sovereign-cloud').get<string | undefined>('environment');
+	let authProviderName: string | undefined;
+	if (!environment) {
+		return undefined;
+	}
+
+	if (environment === 'custom') {
+		const customEnv = vscode.workspace.getConfiguration('microsoft-sovereign-cloud').get<EnvironmentParameters>('customEnvironment');
+		if (!customEnv) {
+			const res = await vscode.window.showErrorMessage(vscode.l10n.t('You must also specify a custom environment in order to use the custom environment auth provider.'), vscode.l10n.t('Open settings'));
+			if (res) {
+				await vscode.commands.executeCommand('workbench.action.openSettingsJson', 'microsoft-sovereign-cloud.customEnvironment');
+			}
+			return undefined;
+		}
+		try {
+			Environment.add(customEnv);
+		} catch (e) {
+			const res = await vscode.window.showErrorMessage(vscode.l10n.t('Error validating custom environment setting: {0}', e.message), vscode.l10n.t('Open settings'));
+			if (res) {
+				await vscode.commands.executeCommand('workbench.action.openSettings', 'microsoft-sovereign-cloud.customEnvironment');
+			}
+			return undefined;
+		}
+		authProviderName = customEnv.name;
+	} else {
+		authProviderName = environment;
+	}
+
+	const env = Environment.get(authProviderName);
+	if (!env) {
+		const res = await vscode.window.showErrorMessage(vscode.l10n.t('The environment `{0}` is not a valid environment.', authProviderName), vscode.l10n.t('Open settings'));
+		return undefined;
+	}
+
+	const aadService = new AzureActiveDirectoryService(
+		vscode.window.createOutputChannel(vscode.l10n.t('Microsoft Sovereign Cloud Authentication'), { log: true }),
+		context,
+		uriHandler,
+		tokenStorage,
+		telemetryReporter,
+		env);
+	await aadService.initialize();
+
+	const disposable = vscode.authentication.registerAuthenticationProvider('microsoft-sovereign-cloud', authProviderName, {
+		onDidChangeSessions: aadService.onDidChangeSessions,
+		getSessions: (scopes: string[]) => aadService.getSessions(scopes),
+		createSession: async (scopes: string[]) => {
+			try {
+				/* __GDPR__
+					"login" : {
+						"owner": "TylerLeonhardt",
+						"comment": "Used to determine the usage of the Microsoft Sovereign Cloud Auth Provider.",
+						"scopes": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight", "comment": "Used to determine what scope combinations are being requested." }
+					}
+				*/
+				telemetryReporter.sendTelemetryEvent('loginMicrosoftSovereignCloud', {
+					// Get rid of guids from telemetry.
+					scopes: JSON.stringify(scopes.map(s => s.replace(/[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}/i, '{guid}'))),
+				});
+
+				return await aadService.createSession(scopes);
+			} catch (e) {
+				/* __GDPR__
+					"loginFailed" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often users run into issues with the login flow." }
+				*/
+				telemetryReporter.sendTelemetryEvent('loginMicrosoftSovereignCloudFailed');
+
+				throw e;
+			}
+		},
+		removeSession: async (id: string) => {
+			try {
+				/* __GDPR__
+					"logout" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often users log out." }
+				*/
+				telemetryReporter.sendTelemetryEvent('logoutMicrosoftSovereignCloud');
+
+				await aadService.removeSessionById(id);
+			} catch (e) {
+				/* __GDPR__
+					"logoutFailed" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often fail to log out." }
+				*/
+				telemetryReporter.sendTelemetryEvent('logoutMicrosoftSovereignCloudFailed');
+			}
+		}
+	}, { supportsMultipleAccounts: true });
+
+	context.subscriptions.push(disposable);
+	return disposable;
+}
+
+export async function activate(context: vscode.ExtensionContext, telemetryReporter: TelemetryReporter) {
+	const uriHandler = new UriEventHandler();
+	context.subscriptions.push(uriHandler);
+	const betterSecretStorage = new BetterTokenStorage<IStoredSession>('microsoft.login.keylist', context);
+
+	const loginService = new AzureActiveDirectoryService(
+		Logger,
+		context,
+		uriHandler,
+		betterSecretStorage,
+		telemetryReporter,
+		Environment.AzureCloud);
+	await loginService.initialize();
+
+	context.subscriptions.push(vscode.authentication.registerAuthenticationProvider('microsoft', 'Microsoft', {
+		onDidChangeSessions: loginService.onDidChangeSessions,
+		getSessions: (scopes: string[], options?: vscode.AuthenticationProviderSessionOptions) => loginService.getSessions(scopes, options?.account),
+		createSession: async (scopes: string[], options?: vscode.AuthenticationProviderSessionOptions) => {
+			try {
+				/* __GDPR__
+					"login" : {
+						"owner": "TylerLeonhardt",
+						"comment": "Used to determine the usage of the Microsoft Auth Provider.",
+						"scopes": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight", "comment": "Used to determine what scope combinations are being requested." }
+					}
+				*/
+				telemetryReporter.sendTelemetryEvent('login', {
+					// Get rid of guids from telemetry.
+					scopes: JSON.stringify(scopes.map(s => s.replace(/[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}/i, '{guid}'))),
+				});
+
+				return await loginService.createSession(scopes, options?.account);
+			} catch (e) {
+				/* __GDPR__
+					"loginFailed" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often users run into issues with the login flow." }
+				*/
+				telemetryReporter.sendTelemetryEvent('loginFailed');
+
+				throw e;
+			}
+		},
+		removeSession: async (id: string) => {
+			try {
+				/* __GDPR__
+					"logout" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often users log out." }
+				*/
+				telemetryReporter.sendTelemetryEvent('logout');
+
+				await loginService.removeSessionById(id);
+			} catch (e) {
+				/* __GDPR__
+					"logoutFailed" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often fail to log out." }
+				*/
+				telemetryReporter.sendTelemetryEvent('logoutFailed');
+			}
+		}
+	}, { supportsMultipleAccounts: true }));
+
+	let microsoftSovereignCloudAuthProviderDisposable = await initMicrosoftSovereignCloudAuthProvider(context, telemetryReporter, uriHandler, betterSecretStorage);
+
+	context.subscriptions.push(vscode.workspace.onDidChangeConfiguration(async e => {
+		if (e.affectsConfiguration('microsoft-sovereign-cloud')) {
+			microsoftSovereignCloudAuthProviderDisposable?.dispose();
+			microsoftSovereignCloudAuthProviderDisposable = await initMicrosoftSovereignCloudAuthProvider(context, telemetryReporter, uriHandler, betterSecretStorage);
+		}
+	}));
+
+	return;
+}
+
+// this method is called when your extension is deactivated
+export function deactivate() { }
diff --git a/extensions/microsoft-authentication/src/extensionV2.ts b/extensions/microsoft-authentication/src/extensionV2.ts
new file mode 100644
index 00000000000..9610af37977
--- /dev/null
+++ b/extensions/microsoft-authentication/src/extensionV2.ts
@@ -0,0 +1,97 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Environment, EnvironmentParameters } from '@azure/ms-rest-azure-env';
+import Logger from './logger';
+import { MsalAuthProvider } from './node/authProvider';
+import { UriEventHandler } from './UriEventHandler';
+import { authentication, commands, ExtensionContext, l10n, window, workspace, Disposable } from 'vscode';
+import { MicrosoftAuthenticationTelemetryReporter, MicrosoftSovereignCloudAuthenticationTelemetryReporter } from './common/telemetryReporter';
+
+async function initMicrosoftSovereignCloudAuthProvider(
+	context: ExtensionContext,
+	uriHandler: UriEventHandler
+): Promise<Disposable | undefined> {
+	const environment = workspace.getConfiguration('microsoft-sovereign-cloud').get<string | undefined>('environment');
+	let authProviderName: string | undefined;
+	if (!environment) {
+		return undefined;
+	}
+
+	if (environment === 'custom') {
+		const customEnv = workspace.getConfiguration('microsoft-sovereign-cloud').get<EnvironmentParameters>('customEnvironment');
+		if (!customEnv) {
+			const res = await window.showErrorMessage(l10n.t('You must also specify a custom environment in order to use the custom environment auth provider.'), l10n.t('Open settings'));
+			if (res) {
+				await commands.executeCommand('workbench.action.openSettingsJson', 'microsoft-sovereign-cloud.customEnvironment');
+			}
+			return undefined;
+		}
+		try {
+			Environment.add(customEnv);
+		} catch (e) {
+			const res = await window.showErrorMessage(l10n.t('Error validating custom environment setting: {0}', e.message), l10n.t('Open settings'));
+			if (res) {
+				await commands.executeCommand('workbench.action.openSettings', 'microsoft-sovereign-cloud.customEnvironment');
+			}
+			return undefined;
+		}
+		authProviderName = customEnv.name;
+	} else {
+		authProviderName = environment;
+	}
+
+	const env = Environment.get(authProviderName);
+	if (!env) {
+		await window.showErrorMessage(l10n.t('The environment `{0}` is not a valid environment.', authProviderName), l10n.t('Open settings'));
+		return undefined;
+	}
+
+	const authProvider = new MsalAuthProvider(
+		context,
+		new MicrosoftSovereignCloudAuthenticationTelemetryReporter(context.extension.packageJSON.aiKey),
+		window.createOutputChannel(l10n.t('Microsoft Sovereign Cloud Authentication'), { log: true }),
+		uriHandler,
+		env
+	);
+	await authProvider.initialize();
+	const disposable = authentication.registerAuthenticationProvider(
+		'microsoft-sovereign-cloud',
+		authProviderName,
+		authProvider,
+		{ supportsMultipleAccounts: true }
+	);
+	context.subscriptions.push(disposable);
+	return disposable;
+}
+
+export async function activate(context: ExtensionContext, mainTelemetryReporter: MicrosoftAuthenticationTelemetryReporter) {
+	const uriHandler = new UriEventHandler();
+	context.subscriptions.push(uriHandler);
+	const authProvider = new MsalAuthProvider(
+		context,
+		mainTelemetryReporter,
+		Logger,
+		uriHandler
+	);
+	await authProvider.initialize();
+	context.subscriptions.push(authentication.registerAuthenticationProvider(
+		'microsoft',
+		'Microsoft',
+		authProvider,
+		{ supportsMultipleAccounts: true }
+	));
+
+	let microsoftSovereignCloudAuthProviderDisposable = await initMicrosoftSovereignCloudAuthProvider(context, uriHandler);
+
+	context.subscriptions.push(workspace.onDidChangeConfiguration(async e => {
+		if (e.affectsConfiguration('microsoft-sovereign-cloud')) {
+			microsoftSovereignCloudAuthProviderDisposable?.dispose();
+			microsoftSovereignCloudAuthProviderDisposable = await initMicrosoftSovereignCloudAuthProvider(context, uriHandler);
+		}
+	}));
+}
+
+export function deactivate() { }
diff --git a/extensions/microsoft-authentication/src/node/authProvider.ts b/extensions/microsoft-authentication/src/node/authProvider.ts
new file mode 100644
index 00000000000..9043aeda552
--- /dev/null
+++ b/extensions/microsoft-authentication/src/node/authProvider.ts
@@ -0,0 +1,322 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import { AccountInfo, AuthenticationResult, ServerError } from '@azure/msal-node';
+import { AuthenticationGetSessionOptions, AuthenticationProvider, AuthenticationProviderAuthenticationSessionsChangeEvent, AuthenticationProviderSessionOptions, AuthenticationSession, AuthenticationSessionAccountInformation, CancellationError, env, EventEmitter, ExtensionContext, l10n, LogOutputChannel, Memento, SecretStorage, Uri, window } from 'vscode';
+import { Environment } from '@azure/ms-rest-azure-env';
+import { CachedPublicClientApplicationManager } from './publicClientCache';
+import { UriHandlerLoopbackClient } from '../common/loopbackClientAndOpener';
+import { UriEventHandler } from '../UriEventHandler';
+import { ICachedPublicClientApplication } from '../common/publicClientCache';
+import { MicrosoftAccountType, MicrosoftAuthenticationTelemetryReporter } from '../common/telemetryReporter';
+import { loopbackTemplate } from './loopbackTemplate';
+import { ScopeData } from '../common/scopeData';
+import { EventBufferer } from '../common/event';
+
+const redirectUri = 'https://vscode.dev/redirect';
+const MSA_TID = '9188040d-6c67-4c5b-b112-36a304b66dad';
+const MSA_PASSTHRU_TID = 'f8cdef31-a31e-4b4a-93e4-5f571e91255a';
+
+export class MsalAuthProvider implements AuthenticationProvider {
+
+	private readonly _disposables: { dispose(): void }[];
+	private readonly _publicClientManager: CachedPublicClientApplicationManager;
+	private readonly _eventBufferer = new EventBufferer();
+
+	/**
+	 * Event to signal a change in authentication sessions for this provider.
+	 */
+	private readonly _onDidChangeSessionsEmitter = new EventEmitter<AuthenticationProviderAuthenticationSessionsChangeEvent>();
+
+	/**
+	 * Event to signal a change in authentication sessions for this provider.
+	 *
+	 * NOTE: This event is handled differently in the Microsoft auth provider than "typical" auth providers. Normally,
+	 * this event would fire when the provider's sessions change... which are tied to a specific list of scopes. However,
+	 * since Microsoft identity doesn't care too much about scopes (you can mint a new token from an existing token),
+	 * we just fire this event whenever the account list changes... so essentially there is one session per account.
+	 *
+	 * This is not quite how the API should be used... but this event really is just for signaling that the account list
+	 * has changed.
+	 */
+	onDidChangeSessions = this._onDidChangeSessionsEmitter.event;
+
+	constructor(
+		context: ExtensionContext,
+		private readonly _telemetryReporter: MicrosoftAuthenticationTelemetryReporter,
+		private readonly _logger: LogOutputChannel,
+		private readonly _uriHandler: UriEventHandler,
+		private readonly _env: Environment = Environment.AzureCloud
+	) {
+		this._disposables = context.subscriptions;
+		this._publicClientManager = new CachedPublicClientApplicationManager(
+			context.globalState,
+			context.secrets,
+			this._logger,
+			this._env.name
+		);
+		const accountChangeEvent = this._eventBufferer.wrapEvent(
+			this._publicClientManager.onDidAccountsChange,
+			(last, newEvent) => {
+				if (!last) {
+					return newEvent;
+				}
+				const mergedEvent = {
+					added: [...(last.added ?? []), ...(newEvent.added ?? [])],
+					deleted: [...(last.deleted ?? []), ...(newEvent.deleted ?? [])],
+					changed: [...(last.changed ?? []), ...(newEvent.changed ?? [])]
+				};
+
+				const dedupedEvent = {
+					added: Array.from(new Map(mergedEvent.added.map(item => [item.username, item])).values()),
+					deleted: Array.from(new Map(mergedEvent.deleted.map(item => [item.username, item])).values()),
+					changed: Array.from(new Map(mergedEvent.changed.map(item => [item.username, item])).values())
+				};
+
+				return dedupedEvent;
+			},
+			{ added: new Array<AccountInfo>(), deleted: new Array<AccountInfo>(), changed: new Array<AccountInfo>() }
+		)(e => this._handleAccountChange(e));
+		this._disposables.push(
+			this._onDidChangeSessionsEmitter,
+			this._publicClientManager,
+			accountChangeEvent
+		);
+	}
+
+	async initialize(): Promise<void> {
+		await this._eventBufferer.bufferEventsAsync(() => this._publicClientManager.initialize());
+
+		// Send telemetry for existing accounts
+		for (const cachedPca of this._publicClientManager.getAll()) {
+			for (const account of cachedPca.accounts) {
+				if (!account.idTokenClaims?.tid) {
+					continue;
+				}
+				const tid = account.idTokenClaims.tid;
+				const type = tid === MSA_TID || tid === MSA_PASSTHRU_TID ? MicrosoftAccountType.MSA : MicrosoftAccountType.AAD;
+				this._telemetryReporter.sendAccountEvent([], type);
+			}
+		}
+	}
+
+	/**
+	 * See {@link onDidChangeSessions} for more information on how this is used.
+	 * @param param0 Event that contains the added and removed accounts
+	 */
+	private _handleAccountChange({ added, changed, deleted }: { added: AccountInfo[]; changed: AccountInfo[]; deleted: AccountInfo[] }) {
+		this._logger.debug(`[_handleAccountChange] added: ${added.length}, changed: ${changed.length}, deleted: ${deleted.length}`);
+		this._onDidChangeSessionsEmitter.fire({
+			added: added.map(this.sessionFromAccountInfo),
+			changed: changed.map(this.sessionFromAccountInfo),
+			removed: deleted.map(this.sessionFromAccountInfo)
+		});
+	}
+
+	//#region AuthenticationProvider methods
+
+	async getSessions(scopes: string[] | undefined, options?: AuthenticationGetSessionOptions): Promise<AuthenticationSession[]> {
+		const askingForAll = scopes === undefined;
+		const scopeData = new ScopeData(scopes);
+		// Do NOT use `scopes` beyond this place in the code. Use `scopeData` instead.
+		this._logger.info('[getSessions]', askingForAll ? '[all]' : `[${scopeData.scopeStr}]`, 'starting');
+
+		// This branch only gets called by Core for sign out purposes and initial population of the account menu. Since we are
+		// living in a world where a "session" from Core's perspective is an account, we return 1 session per account.
+		// See the large comment on `onDidChangeSessions` for more information.
+		if (askingForAll) {
+			const allSessionsForAccounts = new Map<string, AuthenticationSession>();
+			for (const cachedPca of this._publicClientManager.getAll()) {
+				for (const account of cachedPca.accounts) {
+					if (allSessionsForAccounts.has(account.homeAccountId)) {
+						continue;
+					}
+					allSessionsForAccounts.set(account.homeAccountId, this.sessionFromAccountInfo(account));
+				}
+			}
+			const allSessions = Array.from(allSessionsForAccounts.values());
+			this._logger.info('[getSessions] [all]', `returned ${allSessions.length} session(s)`);
+			return allSessions;
+		}
+
+		const cachedPca = await this.getOrCreatePublicClientApplication(scopeData.clientId, scopeData.tenant);
+		const sessions = await this.getAllSessionsForPca(cachedPca, scopeData.originalScopes, scopeData.scopesToSend, options?.account);
+		this._logger.info(`[getSessions] [${scopeData.scopeStr}] returned ${sessions.length} session(s)`);
+		return sessions;
+
+	}
+
+	async createSession(scopes: readonly string[], options: AuthenticationProviderSessionOptions): Promise<AuthenticationSession> {
+		const scopeData = new ScopeData(scopes);
+		// Do NOT use `scopes` beyond this place in the code. Use `scopeData` instead.
+
+		this._logger.info('[createSession]', `[${scopeData.scopeStr}]`, 'starting');
+		const cachedPca = await this.getOrCreatePublicClientApplication(scopeData.clientId, scopeData.tenant);
+		let result: AuthenticationResult | undefined;
+
+		// Currently, the http://localhost redirect URI is only in the AzureCloud environment... even though I did make the change in the SovereignCloud environments...
+		// TODO: Remove this check when the change is in all environments.
+		let useLoopBack = this._env !== Environment.AzureCloud && scopeData.clientId === 'aebc6443-996d-45c2-90f0-388ff96faa56';
+		if (!useLoopBack) {
+			try {
+				result = await cachedPca.acquireTokenInteractive({
+					openBrowser: async (url: string) => { await env.openExternal(Uri.parse(url)); },
+					scopes: scopeData.scopesToSend,
+					// The logic for rendering one or the other of these templates is in the
+					// template itself, so we pass the same one for both.
+					successTemplate: loopbackTemplate,
+					errorTemplate: loopbackTemplate,
+					// Pass the label of the account to the login hint so that we prefer signing in to that account
+					loginHint: options.account?.label,
+					// If we aren't logging in to a specific account, then we can use the prompt to make sure they get
+					// the option to choose a different account.
+					prompt: options.account?.label ? undefined : 'select_account'
+				});
+			} catch (e) {
+				if (e instanceof CancellationError) {
+					const yes = l10n.t('Yes');
+					const result = await window.showErrorMessage(
+						l10n.t('Having trouble logging in?'),
+						{
+							modal: true,
+							detail: l10n.t('Would you like to try a different way to sign in to your Microsoft account? ({0})', 'protocol handler')
+						},
+						yes
+					);
+					if (!result) {
+						this._telemetryReporter.sendLoginFailedEvent();
+						throw e;
+					}
+				}
+				// This error comes from the backend and is likely not due to the user's machine
+				// failing to open a port or something local that would require us to try the
+				// URL handler loopback client.
+				if (e instanceof ServerError) {
+					this._telemetryReporter.sendLoginFailedEvent();
+					throw e;
+				}
+
+				// The user wants to try the loopback client or we got an error likely due to spinning up the server
+				useLoopBack = true;
+			}
+		}
+
+		if (useLoopBack) {
+			const loopbackClient = new UriHandlerLoopbackClient(this._uriHandler, redirectUri, this._logger);
+			try {
+				result = await cachedPca.acquireTokenInteractive({
+					openBrowser: (url: string) => loopbackClient.openBrowser(url),
+					scopes: scopeData.scopesToSend,
+					loopbackClient,
+					loginHint: options.account?.label,
+					prompt: options.account?.label ? undefined : 'select_account'
+				});
+			} catch (e) {
+				this._telemetryReporter.sendLoginFailedEvent();
+				throw e;
+			}
+		}
+
+		if (!result) {
+			this._telemetryReporter.sendLoginFailedEvent();
+			throw new Error('No result returned from MSAL');
+		}
+
+		const session = this.sessionFromAuthenticationResult(result, scopeData.originalScopes);
+		this._telemetryReporter.sendLoginEvent(session.scopes);
+		this._logger.info('[createSession]', `[${scopeData.scopeStr}]`, 'returned session');
+		// This is the only scenario in which we need to fire the _onDidChangeSessionsEmitter out of band...
+		// the badge flow (when the client passes no options in to getSession) will only remove a badge if a session
+		// was created that _matches the scopes_ that that badge requests. See `onDidChangeSessions` for more info.
+		// TODO: This should really be fixed in Core.
+		this._onDidChangeSessionsEmitter.fire({ added: [session], changed: [], removed: [] });
+		return session;
+	}
+
+	async removeSession(sessionId: string): Promise<void> {
+		this._logger.info('[removeSession]', sessionId, 'starting');
+		const promises = new Array<Promise<void>>();
+		for (const cachedPca of this._publicClientManager.getAll()) {
+			const accounts = cachedPca.accounts;
+			for (const account of accounts) {
+				if (account.homeAccountId === sessionId) {
+					this._telemetryReporter.sendLogoutEvent();
+					promises.push(cachedPca.removeAccount(account));
+					this._logger.info(`[removeSession] [${sessionId}] [${cachedPca.clientId}] [${cachedPca.authority}] removing session...`);
+				}
+			}
+		}
+		if (!promises.length) {
+			this._logger.info('[removeSession]', sessionId, 'session not found');
+			return;
+		}
+		const results = await Promise.allSettled(promises);
+		for (const result of results) {
+			if (result.status === 'rejected') {
+				this._telemetryReporter.sendLogoutFailedEvent();
+				this._logger.error('[removeSession]', sessionId, 'error removing session', result.reason);
+			}
+		}
+
+		this._logger.info('[removeSession]', sessionId, `attempted to remove ${promises.length} sessions`);
+	}
+
+	//#endregion
+
+	private async getOrCreatePublicClientApplication(clientId: string, tenant: string): Promise<ICachedPublicClientApplication> {
+		const authority = new URL(tenant, this._env.activeDirectoryEndpointUrl).toString();
+		return await this._publicClientManager.getOrCreate(clientId, authority);
+	}
+
+	private async getAllSessionsForPca(
+		cachedPca: ICachedPublicClientApplication,
+		originalScopes: readonly string[],
+		scopesToSend: string[],
+		accountFilter?: AuthenticationSessionAccountInformation
+	): Promise<AuthenticationSession[]> {
+		const accounts = accountFilter
+			? cachedPca.accounts.filter(a => a.homeAccountId === accountFilter.id)
+			: cachedPca.accounts;
+		const sessions: AuthenticationSession[] = [];
+		return this._eventBufferer.bufferEventsAsync(async () => {
+			for (const account of accounts) {
+				try {
+					const result = await cachedPca.acquireTokenSilent({ account, scopes: scopesToSend, redirectUri });
+					sessions.push(this.sessionFromAuthenticationResult(result, originalScopes));
+				} catch (e) {
+					// If we can't get a token silently, the account is probably in a bad state so we should skip it
+					// MSAL will log this already, so we don't need to log it again
+					continue;
+				}
+			}
+			return sessions;
+		});
+	}
+
+	private sessionFromAuthenticationResult(result: AuthenticationResult, scopes: readonly string[]): AuthenticationSession & { idToken: string } {
+		return {
+			accessToken: result.accessToken,
+			idToken: result.idToken,
+			id: result.account?.homeAccountId ?? result.uniqueId,
+			account: {
+				id: result.account?.homeAccountId ?? result.uniqueId,
+				label: result.account?.username ?? 'Unknown',
+			},
+			scopes
+		};
+	}
+
+	private sessionFromAccountInfo(account: AccountInfo): AuthenticationSession {
+		return {
+			accessToken: '1234',
+			id: account.homeAccountId,
+			scopes: [],
+			account: {
+				id: account.homeAccountId,
+				label: account.username
+			},
+			idToken: account.idToken,
+		};
+	}
+}
diff --git a/extensions/microsoft-authentication/src/node/authServer.ts b/extensions/microsoft-authentication/src/node/authServer.ts
index de08c6fca0f..2d6a8d03861 100644
--- a/extensions/microsoft-authentication/src/node/authServer.ts
+++ b/extensions/microsoft-authentication/src/node/authServer.ts
@@ -110,20 +110,29 @@ export class LoopbackAuthServer implements ILoopbackServer {
 					const code = reqUrl.searchParams.get('code') ?? undefined;
 					const state = reqUrl.searchParams.get('state') ?? undefined;
 					const nonce = (reqUrl.searchParams.get('nonce') ?? '').replace(/ /g, '+');
+					const error = reqUrl.searchParams.get('error') ?? undefined;
+					if (error) {
+						res.writeHead(302, { location: `/?error=${reqUrl.searchParams.get('error_description')}` });
+						res.end();
+						deferred.reject(new Error(error));
+						break;
+					}
 					if (!code || !state || !nonce) {
 						res.writeHead(400);
 						res.end();
-						return;
+						break;
 					}
 					if (this.state !== state) {
 						res.writeHead(302, { location: `/?error=${encodeURIComponent('State does not match.')}` });
 						res.end();
-						throw new Error('State does not match.');
+						deferred.reject(new Error('State does not match.'));
+						break;
 					}
 					if (this.nonce !== nonce) {
 						res.writeHead(302, { location: `/?error=${encodeURIComponent('Nonce does not match.')}` });
 						res.end();
-						throw new Error('Nonce does not match.');
+						deferred.reject(new Error('Nonce does not match.'));
+						break;
 					}
 					deferred.resolve({ code, state });
 					res.writeHead(302, { location: '/' });
diff --git a/extensions/microsoft-authentication/src/node/cachedPublicClientApplication.ts b/extensions/microsoft-authentication/src/node/cachedPublicClientApplication.ts
new file mode 100644
index 00000000000..c679610466a
--- /dev/null
+++ b/extensions/microsoft-authentication/src/node/cachedPublicClientApplication.ts
@@ -0,0 +1,198 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { PublicClientApplication, AccountInfo, Configuration, SilentFlowRequest, AuthenticationResult, InteractiveRequest, LogLevel } from '@azure/msal-node';
+import { Disposable, Memento, SecretStorage, LogOutputChannel, window, ProgressLocation, l10n, EventEmitter } from 'vscode';
+import { Delayer, raceCancellationAndTimeoutError } from '../common/async';
+import { SecretStorageCachePlugin } from '../common/cachePlugin';
+import { MsalLoggerOptions } from '../common/loggerOptions';
+import { ICachedPublicClientApplication } from '../common/publicClientCache';
+
+export class CachedPublicClientApplication implements ICachedPublicClientApplication {
+	private _pca: PublicClientApplication;
+	private _sequencer = new Sequencer();
+	private readonly _refreshDelayer = new DelayerByKey<AuthenticationResult>();
+
+	private _accounts: AccountInfo[] = [];
+	private readonly _disposable: Disposable;
+
+	private readonly _loggerOptions = new MsalLoggerOptions(this._logger);
+	private readonly _secretStorageCachePlugin = new SecretStorageCachePlugin(
+		this._secretStorage,
+		// Include the prefix as a differentiator to other secrets
+		`pca:${JSON.stringify({ clientId: this._clientId, authority: this._authority })}`
+	);
+	private readonly _config: Configuration = {
+		auth: { clientId: this._clientId, authority: this._authority },
+		system: {
+			loggerOptions: {
+				correlationId: `${this._clientId}] [${this._authority}`,
+				loggerCallback: (level, message, containsPii) => this._loggerOptions.loggerCallback(level, message, containsPii),
+				logLevel: LogLevel.Trace
+			}
+		},
+		cache: {
+			cachePlugin: this._secretStorageCachePlugin
+		}
+	};
+
+	/**
+	 * We keep track of the last time an account was removed so we can recreate the PCA if we detect that an account was removed.
+	 * This is due to MSAL-node not providing a way to detect when an account is removed from the cache. An internal issue has been
+	 * filed to track this. If MSAL-node ever provides a way to detect this or handle this better in the Persistant Cache Plugin,
+	 * we can remove this logic.
+	 */
+	private _lastCreated: Date;
+
+	//#region Events
+
+	private readonly _onDidAccountsChangeEmitter = new EventEmitter<{ added: AccountInfo[]; changed: AccountInfo[]; deleted: AccountInfo[] }>;
+	readonly onDidAccountsChange = this._onDidAccountsChangeEmitter.event;
+
+	private readonly _onDidRemoveLastAccountEmitter = new EventEmitter<void>();
+	readonly onDidRemoveLastAccount = this._onDidRemoveLastAccountEmitter.event;
+
+	//#endregion
+
+	constructor(
+		private readonly _clientId: string,
+		private readonly _authority: string,
+		private readonly _globalMemento: Memento,
+		private readonly _secretStorage: SecretStorage,
+		private readonly _logger: LogOutputChannel
+	) {
+		this._pca = new PublicClientApplication(this._config);
+		this._lastCreated = new Date();
+		this._disposable = Disposable.from(
+			this._registerOnSecretStorageChanged(),
+			this._onDidAccountsChangeEmitter,
+			this._onDidRemoveLastAccountEmitter
+		);
+	}
+
+	get accounts(): AccountInfo[] { return this._accounts; }
+	get clientId(): string { return this._clientId; }
+	get authority(): string { return this._authority; }
+
+	initialize(): Promise<void> {
+		return this._update();
+	}
+
+	dispose(): void {
+		this._disposable.dispose();
+	}
+
+	async acquireTokenSilent(request: SilentFlowRequest): Promise<AuthenticationResult> {
+		this._logger.debug(`[acquireTokenSilent] [${this._clientId}] [${this._authority}] [${request.scopes.join(' ')}] [${request.account.username}] starting...`);
+		const result = await this._sequencer.queue(() => this._pca.acquireTokenSilent(request));
+		this._logger.debug(`[acquireTokenSilent] [${this._clientId}] [${this._authority}] [${request.scopes.join(' ')}] [${request.account.username}] got result`);
+		if (result.account && !result.fromCache) {
+			this._logger.debug(`[acquireTokenSilent] [${this._clientId}] [${this._authority}] [${request.scopes.join(' ')}] [${request.account.username}] firing event due to change`);
+			this._setupRefresh(result);
+			this._onDidAccountsChangeEmitter.fire({ added: [], changed: [result.account], deleted: [] });
+		}
+		return result;
+	}
+
+	async acquireTokenInteractive(request: InteractiveRequest): Promise<AuthenticationResult> {
+		this._logger.debug(`[acquireTokenInteractive] [${this._clientId}] [${this._authority}] [${request.scopes?.join(' ')}] loopbackClientOverride: ${request.loopbackClient ? 'true' : 'false'}`);
+		const result = await window.withProgress(
+			{
+				location: ProgressLocation.Notification,
+				cancellable: true,
+				title: l10n.t('Signing in to Microsoft...')
+			},
+			(_process, token) => raceCancellationAndTimeoutError(
+				this._pca.acquireTokenInteractive(request),
+				token,
+				1000 * 60 * 5
+			)
+		);
+		this._setupRefresh(result);
+		return result;
+	}
+
+	removeAccount(account: AccountInfo): Promise<void> {
+		this._globalMemento.update(`lastRemoval:${this._clientId}:${this._authority}`, new Date());
+		return this._pca.getTokenCache().removeAccount(account);
+	}
+
+	private _registerOnSecretStorageChanged() {
+		return this._secretStorageCachePlugin.onDidChange(() => this._update());
+	}
+
+	private async _update() {
+		const before = this._accounts;
+		this._logger.debug(`[update] [${this._clientId}] [${this._authority}] CachedPublicClientApplication update before: ${before.length}`);
+		// Dates are stored as strings in the memento
+		const lastRemovalDate = this._globalMemento.get<string>(`lastRemoval:${this._clientId}:${this._authority}`);
+		if (lastRemovalDate && this._lastCreated && Date.parse(lastRemovalDate) > this._lastCreated.getTime()) {
+			this._logger.debug(`[update] [${this._clientId}] [${this._authority}] CachedPublicClientApplication removal detected... recreating PCA...`);
+			this._pca = new PublicClientApplication(this._config);
+			this._lastCreated = new Date();
+		}
+
+		const after = await this._pca.getAllAccounts();
+		this._accounts = after;
+		this._logger.debug(`[update] [${this._clientId}] [${this._authority}] CachedPublicClientApplication update after: ${after.length}`);
+
+		const beforeSet = new Set(before.map(b => b.homeAccountId));
+		const afterSet = new Set(after.map(a => a.homeAccountId));
+
+		const added = after.filter(a => !beforeSet.has(a.homeAccountId));
+		const deleted = before.filter(b => !afterSet.has(b.homeAccountId));
+		if (added.length > 0 || deleted.length > 0) {
+			this._onDidAccountsChangeEmitter.fire({ added, changed: [], deleted });
+			this._logger.debug(`[update] [${this._clientId}] [${this._authority}] CachedPublicClientApplication accounts changed. added: ${added.length}, deleted: ${deleted.length}`);
+			if (!after.length) {
+				this._logger.debug(`[update] [${this._clientId}] [${this._authority}] CachedPublicClientApplication final account deleted. Firing event.`);
+				this._onDidRemoveLastAccountEmitter.fire();
+			}
+		}
+		this._logger.debug(`[update] [${this._clientId}] [${this._authority}] CachedPublicClientApplication update complete`);
+	}
+
+	private _setupRefresh(result: AuthenticationResult) {
+		const on = result.refreshOn || result.expiresOn;
+		if (!result.account || !on) {
+			return;
+		}
+
+		const account = result.account;
+		const scopes = result.scopes;
+		const timeToRefresh = on.getTime() - Date.now() - 5 * 60 * 1000; // 5 minutes before expiry
+		const key = JSON.stringify({ accountId: account.homeAccountId, scopes });
+		this._logger.debug(`[_setupRefresh] [${this._clientId}] [${this._authority}] [${scopes.join(' ')}] [${account.username}] timeToRefresh: ${timeToRefresh}`);
+		this._refreshDelayer.trigger(
+			key,
+			// This may need the redirectUri when we switch to the broker
+			() => this.acquireTokenSilent({ account, scopes, redirectUri: undefined, forceRefresh: true }),
+			timeToRefresh > 0 ? timeToRefresh : 0
+		);
+	}
+}
+
+export class Sequencer {
+
+	private current: Promise<unknown> = Promise.resolve(null);
+
+	queue<T>(promiseTask: () => Promise<T>): Promise<T> {
+		return this.current = this.current.then(() => promiseTask(), () => promiseTask());
+	}
+}
+
+class DelayerByKey<T> {
+	private _delayers = new Map<string, Delayer<T>>();
+
+	trigger(key: string, fn: () => Promise<T>, delay: number): Promise<T> {
+		let delayer = this._delayers.get(key);
+		if (!delayer) {
+			delayer = new Delayer<T>(delay);
+			this._delayers.set(key, delayer);
+		}
+
+		return delayer.trigger(fn, delay);
+	}
+}
diff --git a/extensions/microsoft-authentication/src/node/fetch.ts b/extensions/microsoft-authentication/src/node/fetch.ts
index 58718078e69..8b12a87b087 100644
--- a/extensions/microsoft-authentication/src/node/fetch.ts
+++ b/extensions/microsoft-authentication/src/node/fetch.ts
@@ -2,6 +2,11 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import fetch from 'node-fetch';
 
-export const fetching = fetch;
+let _fetch: typeof fetch;
+try {
+	_fetch = require('electron').net.fetch;
+} catch {
+	_fetch = fetch;
+}
+export default _fetch;
diff --git a/extensions/microsoft-authentication/src/node/loopbackTemplate.ts b/extensions/microsoft-authentication/src/node/loopbackTemplate.ts
new file mode 100644
index 00000000000..60d3cd4d9cc
--- /dev/null
+++ b/extensions/microsoft-authentication/src/node/loopbackTemplate.ts
@@ -0,0 +1,140 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+export const loopbackTemplate = `
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+	<meta charset="utf-8" />
+	<title>Microsoft Account - Sign In</title>
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<style>
+		html {
+			height: 100%;
+		}
+
+		body {
+			box-sizing: border-box;
+			min-height: 100%;
+			margin: 0;
+			padding: 15px 30px;
+			display: flex;
+			flex-direction: column;
+			color: white;
+			font-family: "Segoe UI","Helvetica Neue","Helvetica",Arial,sans-serif;
+			background-color: #2C2C32;
+		}
+
+		.branding {
+			background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJYAAACWCAYAAAA8AXHiAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAhGVYSWZNTQAqAAAACAAFARIAAwAAAAEAAQAAARoABQAAAAEAAABKARsABQAAAAEAAABSASgAAwAAAAEAAgAAh2kABAAAAAEAAABaAAAAAAAAAEgAAAABAAAASAAAAAEAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAlqADAAQAAAABAAAAlgAAAADkcSUjAAAACXBIWXMAAAsTAAALEwEAmpwYAAABWWlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNS40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczp0aWZmPSJodHRwOi8vbnMuYWRvYmUuY29tL3RpZmYvMS4wLyI+CiAgICAgICAgIDx0aWZmOk9yaWVudGF0aW9uPjE8L3RpZmY6T3JpZW50YXRpb24+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgpMwidZAAAxaElEQVR4Ae19CbgdRbXu6j2cecoECTIkICCGzAg+7qeQ9544QFQgiXpVEJTEe59ALsbMwE5AMZCQELgKeSoqDlyiQogCSUAC6FNCQhIwQMALCbNMGc68p37/v7prnz47++yzzzl76OCu851d3dXV1VXVf69atWqtVZaUg397IPJwSCKT46zgx16wh+19XSYnO6PjE7H4MDuZ7BSxXhQJ/On5KTWbTSMm3bYlvHXmJNxj2SatFLFVioeWn5lDDwAgMvOU2NG/3DMo2h691rLtr4bqBtVX1NVJRUOVBIIiyYSI3RkXO9q5NZmU5S98tu7XpmQF2AwAzCoNwMrAMm/CT3HkrgqJTI/KwodOD4ZDa5MVdUPtfe+KxONKiSob6+SIE46XqsYGK5FIBoLVtQEJiSRaWp+xktaNuzpqfirTLcBOZNJtdnjrDCk6wMrA8hOgWJcZoFSrT4nJogfPESu4Dv8AVLTTEqsC9MkSDHB2NIYfkZGnjJOqpiZQrkTCAmWyKqtDgXBAEs0tLyZtWRl7953/u/uiUR0sVgH2xuKERCJJnhc6lIFV6B7OuXyAJrIpqDzVlQ99TUKVt0scAEomQaXskBAONlEFrgpvLdkZk6r6Wjn6IxMx2qVeY0IsSVrhqnCgMiiJA62v4a5Vkmz/4a7PDWtmVXSIfGMSAGYVFGCpGvGh5VCiHohEAiJXi77sKx+eLZU1N0hHCyuTAJCCDqCAKIUCYxv4AcY6YnL0qeOkZuhQSeoo6b5OG+AC4ZJQRThQFQbAWt7Bvf8ZSNg3P3deA8ZUF2AzADCrMAArA4u9XMoQsQMp6nHlH5dKdcMcad+fJGVCCKRAxfMU1XKB1dYpI8acKI0jj5FkDNSti3LpzSgjCQQmrFA4HKiuIMAO2EnrtkBb+8pdXxr2OjOd+bAd2vQ2cro8mXPjwH/LwBp4H/a/hLvuCsr06cpky6KHfiK1jRdJ235M80ClABMtmMMfKJQDNB4j1VCstg4ZcTKANWpkZmCxAJZiABYIhgO1VRwi21HGj63OxI27pje9xGz5BlgZWOzVUgSPjEqufOheqWmcIq37YwBCWKsDDGlQULnAUh6L4CLFAh/fCmCNOSE7sNxi3IilxiUQCAdrayR+oCWBcn4q0eSy56c2PMc80+6yg2t4MEAKVgYWO7HYwcz8Ig9XSTz5kNQ0nC7tB6KoBmZ+bnAZdaVUhIMHVDxWQtQCYI3thWKZ8rrHLICiCwCslmIKFGn/GoPm9S+cW7ddswJgZw4Ta9NkC/n6HsrA6nufDewOV/Ap8x8cggHvMUztTpLO5igkCV2g4hMIJI3dY56mqBdwgXOlWP0DlhbNkhVgtoQDELza7Z1iJ2J3J2P2DX8/r+Evmsm2A2dukkBfAYbZSDkUrQco+IQ0XeY9eKwEraekovYkzP4OBhUrlGLEXYB1q6QnzXPYLUtuJ5SLcei1k62tMYDKDtTWnRusrf5/J9zbcv9xa5snc9aooLJti3xYbsVy1lEOxekBI01f8NBECVnbJVx1hHS2YSrnGf4y1SQTwAyYTJzpvr6lAWA2AWYlW1vidrQjGait/VS4pvaPx9/bvOn43+4/GwCzDcAoC0P+rKNd1ot9q1s5d489YIa/BQ9+Ap/yAxKsgJSJ8gGXUc94I1BD4Og/j91zDodYGFTmvf88VsYnpiWSt7ICNXWcoQoo2uNJ217298/X/8bky7ZcVKZYppcKE0OaDg0FDn9XPfwFCYc3YEYGUEUpTQeFUNTgyZniDBUyfJdecu9hVJjAYS+YbGuJ8z9QXXNaqL5uzQlrm3d88O79X+Ujt860MIu17ExDZJliFealkMJYMn1NQNZATnXlQ9+ScPXNEm3H02zKrZQK9PpoxQ5+PBJ3pVwqbkBJpFhjPiSNx47sWY7V60Nyy4BaQDQhdqCyJgRWX5LNLbuA8xUfaKz7sTtEkkhhMuBoU5QpVm792rdclKbzkyWoFj64WCrrAKo2SNMxhukSjb4CvoZe/pGBebyfP88ZTNx14KQX6BdV4McQSna2JZItLXGrsurEUEPdra8daPnv43934CIy+Qoqth2hDKx8v4hpkKbrAi++3AUbf4AlmqukvTmuiytgWfr3OBdg/bs533cpwMDgJ6BFEQtUVB4dGlz/kxPuab5TH8S2A1z9bGi+6/o+KY/8FKkUw6KH/ktqm/4Ngk8y6UHltvVCH39IrQx1SsXmoI9l5Tc72xS2Y50AWGtnaEjdF46/p3mtPuJqqmOUQ356YMZtYai8xITrfzsGb4Dg8392W6IZ8FOygImXslwe8KOzF0Dti2D8vZbO0KC6z37wdwfm/d2yvu8dvbPfXr7acw8YcULkrw0Sa34EoBovHZCmq3Jez7dlvwKkGMCoqIHn+E8tQtse5n1UwZn37HXVq0nOeO14sj0Ws44tD4U59FjWLEaaPue+IyXWskMqa11QUfCZQgaK6OtxhqeaIkpInjLUyiRBjJKMhRrrqkOh5IXlodB0S3/ilDR9/cngyx+RcOVg6WjtXZqe67OUUqVnJroQsgu+nTzF/oXUlsIUTIk/WaZY/e18A6r5D34MXbkV0vTBEoVKZ1Zpen8flv2+FCHLnq0YV4N2Zwcwb48pU6z+dDfVXiKnRKGh8HksJt+tIp44penZlmj68yBzD6DjRQ8pmQbwWR4u2aSau0oQg2JRT9EaUqZYfep9vEaKFGhFs2DDN6Si8m594Yk4RQyF+0gVMRlgwyTzb9qRIZu51C02+Uzc7WLaSS55eIvJh1WHwnVGWt0O+VM1eFgMg4dIXBY8OF+qar8HlRd0JciHRRutEoXUy/Q836R5kjIemnwmzpjJTcwlD7O6+crAytaZ5ppK013B5/wNy6W6/goIPkmlMBD1V5puCu8h5gs66GV6E7zHPZRRsmSrgOS7ZI3K84O9Bg/zN/wcuulfVYMHZ+3Mw+Hk+bmmuHT8pPgrZki/aG4qfVymWNneAfmp6Y5TDpm34T6s+306v9L0bA/ntSzAMZdK45qht4qXKVaPPeTM/GISWVcjnZV/xPB3mho8WL1ofPZY4AAuGHmWAZMpKv3cpPsgLlOsTC/BLNHMXn+YRAOPglE/ERoK3a1oMt1XrDQdDsne4YEEl/kv1vOzPcetUxlY6Z3kLNFEZdGG42Gk/hh00w9Xg4fedNPTy8n7OdBjgKRl+5RcudUqy7G8ADDS9DkPnApQbYNjjsOlsz1/SzTeZ/V2bKiQiZk/HUvp572VWcTrfaNYVLddvTUkgyYl5Rk2c1NARtRbUkIHX3nrKyNNn/fgp6BCcL8E0DUxuHShNL3ULzBFqVCR1KwwlZi3LshnQbkDizMkS61i2dkmqDa2zMQpr7tuDc3FQyOmNH0TtD4hTZ97/1ckFLxDEniBCbpvUZMofzQjHdzp5/6oZaoWuQHLMLOrXmgQO34hvugzUMJgfMnvIH5I9rXfgRfTJpqv9P4vU63r7cAYPESmx2X+A7NgQLoCtn68q7BLNL3VK3U9DT1pp6lsPjzoBVj8mqFWSzOfW549B7ZwP4W67RB1fgm7ACh24T84DZTsKlm2/WKZOX499Z1l512OdYoPG5yqkho8qBAoIXMf+K5UNiyAch4axbdXwiWaVAU9BwZQqdHPJCAPD82/55aSHbp17BlY/JrXQLVmOoa/VTtnSqjqVuFI2LI3itkJmX6nCLrICVceIRVVD8iNTy2RK6yrtVGGypWshVke7Bg8kCqJzF2/Gk45LoGMynEf5HGPl6WEIl/yAIlPTjstcmWyP86tW+ZZoWvCo65sbvrblVLVcCuGCFtiUb6MCjQshH/oOquAtQJMbgKzp6TUD7lKVjy9Ua57bJAaaUZ2dnd0kb1KxblKXtAYPMxd/zss0VwibTB4sEGlaF7sl8AXZP61TjhxX1qqirYO2alTPx0c3JHetbGbdq6SmqZLpXUfAEUnAo7NWA8NYLNjkFBXQJj4NpxkTpMrJj6ixgXPTLNTXut6uLkoyTR4WD0zpg5kB7+3EbrpZ6g0veQyqh5abyTuRBSP1dsM8iYwnMBTn91ph4afdKw0jDrWtqForq+oh6KKmWyDoegOLO/MbuXOO6V20BekdS9ngRwyu+ftsaZ2DPIfmI8je7Rtvlwx9vuatdRDo/FJNe/3gzDZg8FD3RjH4KE/SzTsinTy0WOH9OFCWrl8hD4GPwZYSSj/wmzBqm2y7Ff23H7cZ856Lzxk6LfjLc30nFw69R1PKwmsrqGQL57iAg6DK3c+CCadoOIyhnoh8dzXy6EVhvvohMQ7bQyN18mNf1sHUURdSYdGCj6pnDd349H4RmDwUD0AULH5hQBVT+WaZwF0YEYkGA5KKGRZrfsWyS++fHGgtvofYEpArArjpLaXl93jZYd5N9SE4oTkM5vAd0yQln1k0vvLI/HLsZXa1TbCX7n1nNyw43z5zujHBZ7iVLhaYHfQqRYbafrcB8ZhDHkEk5BG6YD7oP63LVV04Q8AKhIxGuZjsAOVBZtx4C1JJKYmb/78Y/r8aKLKrsYR1A0NBAtfryxPcIkuPPbajjeUVTuOhBcUfM11E6Aa4iy4sqb9/4fPJVCvNrhADFd+QCqr/irLd8zSCYFjht3zjDRLvft0SakwdniYd/+ZuG+LhMKNKk03fj77VFiJMiuDjnGwuoG860a4ED1RAKojbttSwxrB7zYGHuc1MS55AF4IGUjLIUO46RksuNp/lYpqmC/Bw1x+mVln1mhB07Ju6AoMjf8iL738FTy3UzhrjIzm8/IfyKjTfdCc+6bC1eYa/Z7jMcfggS33BsPamDjTtfQ0c55eFtO95XiPzT0m5jUGU0Z6XhvyQ3g6ViXVtr2LZeWUiOZH2044YVL0dT3x5w8oFhys2rIeqiEwX2rPN6hMqx0n+G37YuDdpsqoY56V67eNV1DphCHSxeuZO/obU/7GMjn7m/PANyFNX6MC3XiCzvgpJjk4mDQTe3P0lMb0TNd4rzfde+wt1+TzXk8d66gWxUYC8P4f2yvtLWfJjQAV9e7JA7NtPg8haTzsPzD7GyUt72GbMqksYH35PWJoxDBbUTUK85ptsvypb8q3x96mz/TOSPtbCTV4wGvlJGTu+kWwSr7GFwYPfWoP51RoA4e+1n2PSqdMlZs/97aKSCKngOJGUvDrXiyTDQnsfqX4Z7bOCqc6DsHwNRcnYGjsgJQbHVE3+FZZ/vQdcC7u7CGDnar6XQUtI+L4aJpz/01gdK8BTwL5Gx9Egwd2vJ//teUY+kIBsCRBgGqpLPvMGXLzZxxQcVbrNCCti5wFBCfRL+2juMGW0QoseAzRd8D30O2fzUlP6+nc5DWxN583jUMSCm2Dw/y6QV+R007aKUu3nqRrkpxMcDjrS6BQ10jT59z/K6luvAyg4syPQ6wLqr4UWIq8Nih5NYe+Vuk48FmAap72Az8YB1Q9VwrdfNA3w9wm3RybOD2d5yakX2N6+nWTZtLNPeYc17lXC10yp93NcxM8uU1Sj7HJa2JvRm+aHjueelsh1qiqOREzx7/Jsh0X6mSC7gY5NOYSyKRz2xC24zv3rccQ8iXsRYOv2/ECnEsRpc2jQ19ch77Ols0ST5woy6as06GPn5f5YLJV0tu1Jp83zRybuKc83uvm2Bt7jzOVwTTmwT9dGu6ERS+TvDSV58UKFViH5EaNAfB6PwXftVofTD6J4oJsQaXpYGRnr6+V79y/GUs0ZykPR9/lbgN9G7NdNjeoDGLoqw2h3jfJDWefJiumvJbaszBX0VTf6Hu2Hs3bNQwT1m+kgiIRiB1KFSxYZFNLghoGdYMvkRuf3iHXbzlOxQUEV6ahcZorTZ/1wAjoiO3AyzkFwx+c8XORHKjiv5+DLRz6sA8h9nZuOzBdbvjMLK1uLkOfn9vl1g3A2r8CM8I9mEFV4qU4MiXvOzHH3th7zIK85+nH5rynfCYdW2ugnJBK/Ctrx0qw6hm5fvsXFFwcGimxN4HS9DUQfH573YfwPTwFg4fjpJM7PKjmhcnlV3Bx1ucOfe07xI6dJDees0Y4pNPFRy5DX1cLfXsUkCtOxxZjyU/Br9M+fEFUiekClwFFeszmpKeZc+8102xeM9dNbPJ5z538FbrkEghWQOZ1pyx7apUmczcqUi/VTQeoZq37H3g9T8J90FDpgMGDoVR8kLdMf1EuZ8ivqgthdWO1LPv0eFn22ZecoY+yKX+syjivYWC/kLxjFjYba3k37RwHbYQ/gU85qgDS977WMgyhZhL1SGJovFSWPf1ReIs7T2aOe1ULunTt2Vgp+L0EQcSiEF1YWDqiSoluDwKGg++HE0vDexhwmfO+1iYv+S0ubVHUksTQ9zVZfvYdWqzK71SU0L+nOFIv517vB9W/0gZ+l9vHkOSCtyIluHz0yxK1x0GV5GmdoeCVDfwpAyqBogJ82Zg1Vtd/RIKBF8B7nSUX/OJf4drz90qVYjHOBimecKgUY90ShOfuMaJU8B6nEgt+gFePpZlqLCBH25/DBzNaQUVAkXfMhwEK21Wath3ceW5d+PIkxSTPH7tXmk+eiOn6I1Dwo2ZDqcHF2nHxNY79jaskWLleRh33S2irQqVQfVIFHSDh3XHWrpQJLdPGeWMee/9ZbFECJkSY7VbVYcWh+eey7AmAaspz+iETUO4uDgOuSUkpcebad8mKuGCrZFlnh2fKsr/9FtP/86TNVfSDWkbmIoqQylljPEaib0lTExaGwra8/lpQosB9GE1QIOEqPxPW0tSUMa9pwEnqnIkmk3s5/1EUCo8V0E0TiBJmyvJzVusj2Mfs6/d5cCiWaSS/IkqxGWaffD70qWBoMIgyIcq4Uq9Irxfzx3myA5t43JKamoCMHClSXw+aSlkoMpihzwyFhKFJ1/vdPE5ZXdfy3Q5oTqFI6E5BRTvW8SK2lx+voNKPNgLWA338TxC6A4sNphRbjSkw/s8+eaa07fsurFhI2dhhfF2lDWTQoaggQVTpA0eJHHY4XiPOwetrDVNgwrnqiBtApRDl5DOtYP78BQ5vAlCFsSxzl7zcClHClB2iyoYAVARrmf8koWso9DZYFfHwdX0Y9oHTRy/CrOxt8AkrIZJALjpcpm51Xl+I9+m9H3MU05UQxEOHiVRXibwO7SRSrwoOjahbgJkQWE0e8oVztmji9Fkj0wcWMPRVVKiKTtuBy+XGsx0xiVKqyYXlVdlG/vshuN2YGVisoH5dnLWoOOImyJPeAc/wC3QcGGa4xnUMLErfFFaltk5k5CiRN94QaW4GuCBrVPGDCyRvLfkC2Hj+6zEO9Nh9MzzOOWhm3hhXteGOlldBTc/HssxmxzrpGbsYQ182omua21OT3FZrFzBPT+e85u0ak8+km3OVxOGkZ2DxDn7iEXQaxREzx/4SDD1M6m3sEAqO2ewQakrU/O6Pvije7p5785hrvGSu89jk8V7PlMdcN/eS0pih8UgMje++LfI2qoklOLXUZkt1wOcDkFfv1x8cI874Vkw+VgCB2RlMHXmsRejegwGIZ8JYjlon1rtfkhUXtOrQNx1C3CIFVstbtfTHZrtm8qbnST9nvkxp6enMw/+DeSzmTA86Y4Qa8eyT16NHT8UMrRVGCWTqM89uTA3MU7zlmWtMM9fT09Lzm3zmHhOn0vGWafJPkAw9TOQoAIygUb8eyJxi6HE9xXchnflT/ywUQctkunPaleY552HStZgJhi3M+uZBNgVVF4CKSzOR4oGKVTG457FfQm7AYm2pm04d9dknPwFqMB4znjexvkjtg6J9mVk7jUBiIPWqw2zxmFGC2SNqh+oRPBnB5QJIQcRjPXDKMYBzzry/zARVH7Q9EXsL1uEfx1rfUkdZ8dBQG/Y2plDHuQOLNTDgumL03/Gmxkln6y61fPYLuFhHMzSGgfkjj3aYezL1pGgMBjA8V+rlUjoDKr3uZE3l7zoFakHLqDbc0bIRVk0nyopzHtO1Pi4eF8ukras+vj3qG7DYDIKLPNd3xr0lweYJ4C0ehx2iX6T0TkcTXAZIFEccBYBxFqgyL2QheMyQmKJkSNc0FpGJenHoCwWx3hfAWl8EVOosWXnuPh36etPwZJH/ZKEX5r2H3lCeC7PFKyzunv1Ruf6pP0BK/xnIvEAaqFvFt1jqgCpw0OLQWN8gMhLKjG+8JtIK/1ecNbKGJGLpNeU9BCbTnWOagsZgMQOFRGiAWPHpECVsVIuZnR+Gh8PpmflM3F6UwDawnvz3S0Bd+k6xTOW5eG10pOaMPRuLxXCuTyl90hkuTL6Sx0AIlxXDIKpHjRQZMsShXPTa56VcqSHQTdcXBbJnQ2BWSWPR1kelDUPfcoBKVXci9vtFd6oQr6j/wGJtqCNFjUeGOWMuxBLQcixekwriO/KRLwHv0Hj4CPBeRzqgov0qAaT8Fqps+C4m2kkYY0BmEa4KghIvlZXnnCG3nveWZ+hT6LHp5XBwD/RvKPSWo0wrZkMMc6zZGBbfgT+t66DRyY6nkagDPM1Qwh+Ci4FDYwMWsisprcfQ2IGhkYw+KRazONloLIq1vvZWiFa+BJP2dchgybQ1MBYt8dCnjfD/z8AolmkfZ0NXA0JcvpgDt0Wdzd/Al45XFODSD4dG/wQCjOCiAcnRI0WaBrtMPb8D12KmAgvIHa2bpS3+IQUVhz6G94nasLalwD8Dp1imgo5ukSulH/NjuQGUywrdA78JQch7yGLmB8TmeQONCS6CbPgRWDSGu5Z/vAF+CkNfTS1mfXtXya1TL9dHqCXQIaLmwm/DBFJe7znT09PMuYl7upfXGdLLc1K7/7p58/+yOWNUccTYtVhS+QgsaPaBcPE5BJd/gndoHDTYlpHHBeB36oC89drZCirObA8VixkltmldmwkE6Wnm3MSmiEzn6Wkmb3rMfPjPP7D4oK3u0/78Z5FX9jhMsVq551o79/5iRDo0gomvAs818liR8ad1PXVa12H5qA89AKqVf2BxrYwCw5lrPieHD31C2jub5OUXk2CCAw7L5UNwcUxMQKHLCjTAKvsPct2Om5Bkq24aqW859LkH8ggsDB1k3uli59/v/jqMYO9Rvj2AmWFHR0BefglMMhza0LKGMzD/hQDUgRyj2fpBl8l12zdL5K9HpuwBVHTvv0r7tUb5AZb6bVoMYEFL8lv3zINu0o/AsBM9CTCMWAbBHCEOATXB1Y7pvU4WcZk5/PXfZTRLy6Cq6ufke09+VsHFehq1bb++TR/Va+CzQjK4EXe/5MvWLoerSeyXDPdBAVCwpOvFlxQqRHBhJrZnt7M4TOU8MzPzUYe4VaG4gS6FatGetfK97ddjaJyLa47RrB+NIQh8PwTOClGXgVEsgsrIdi5f+zOs+l8Bwahj7UuzJz5E//mDgDVcPX9lt8iB/Y7euj+HRdbWMZqNtiakfvAc8F2PSmTHYV1Do7aE+UobONf2C6jYE6gL33b/gUV+KgWqdX+AT6oLoOnARWhnhwcDKM669JhPRSCPxf/XXhHZS01PHPuqZ7SW5of9E3CNZj8mVbJLrtl+loIr4oojTM4Sxn7CFbuB9enfUKhakpNj8h93VUuyGvsl130UVilw323R94MTCCg9YYygp7hI1RQaOpB6vQEDCA6H1PrkOp03v97kgx/HnpL6V1CbqWgCv7hevrttsSy0Ilq7EgtQ2Wump33QW6kq9B1YpiMvvW8YhJ+PqdO0Ds9+yYoj/Ojam56kHqYHmgRwMaZFzVtvOuAaNtzBlR/B5bSAGqPYGAFbi9QPuVq+t+NfJJqcJpEJ+4QuLrlDWjmkeqBvQ6HZ4eGydcdLAO6DKqpPhI4SVZOp6OeARYHhAsekKZjwo8OiJ+Z16kbRAOLNV3nm5NElO5RhyvJLTHea3MiJ/iRq6v+3VFjPy7VPflxBxRmj2mNqK/7pf3IHltnh4fJ7P4IZ3zZoUg6Hdxp+pQ6oTFfqEOieKKBwzDh17AKLwyH/mR/meLJ/L7QN9jhDIvdB9CtTr0qMNneIiKEPhmH7lEfku9vnOoa+WIw3C9amP4oR+/AbzA1Y7Cxanlz++08CCI9DRbcWPgnIqGeWSnvBpR0L8JiYh/qPH+bTf6RREa8FNoFcAqKtoJ/B5bQFewZhO7141IaD3u9DJLFOZu+o1VUHP26np3Uu3k8vwDLSdCzRzFr7ZciiHgAQsPwBuyobfEW2LyVFokxjCCIee8BkQMV02v8RXNSPenk3zOYxwhpBKm/LFkw9TB6eDySY+03MsjIeu3I6qmTXYM+gwfYuWbLlNLULoHZtUYdGVtD8pzc+vfLefOnXvPem5zN5M6V3v9YzsChNp2Ibpemz7p0l4dpfqOeUJFSPnQ0wvTXo4ViR5FxLgYqnBlxpMTuGSnc02SK4OqBST3AZIwfTnvTYeUL3fk3P05dzlsf8DOa+no45a6QzXe4ZFKr6APjOv8o12y4v6p5BWlHvj6m0idMrb/Jma6S5Zu5Nvyc9vft5ZmDpEk3E0em+7N5rIX1eIdFWzGyVq6bgKfdAqmSCF1wpapUJXHgEh8NXXoILoBa/C1JN6+CyqBOUPI7t9AatxKzxLrn0vkp1bPdPODQeDCxdook4QqVZa2/D7GchZDjcL5mwQH7zFfQh5p0KKjc2YPOCy0vF+Koo5+KzXtkNfwz7HHBpAp/r2wALJdSNGyPUNE6DEuGzsuTJcY49JgTKzpYsvq18PivWHVjdpOlrfwvd9RmuM/787Jes4HIB6QUaW6Tgw4+Czb1IqTyZ+NdeFtn3btKR0pMZ85GhxsFvg5V39wyqHgWB6na5ZutMZSnoaIV9XKrQn2+yP/egfV2NNNJ0xjXDN0ql2S8Z0vR8BgLHK0pgxV0cOY/xnDAflU8tGIu+9aYzWRgCt0UJOF9znMH1bVjOZzt6L8vZM4h9zD2Drt3+LxIf97WUz9d8LWSbBYtcAZBrPm/7+noP8jsUS5XzoEc16+4mqR6+RSrqzkjtl8xCc/lnRUw+7zHTTEgde8Bz0LCIzLys/5oPFjPwkxCQDnn+2bPgYO1fwSTjOrh6G4Ya5pn+jDE0grpS5lXb9FUJP7VTIls+5Kw1gnL5wrDXvJz8xpj1oYFUzrt83dGSCMAZf81Y8FQHO+Pv7bkp0CCj95j3mZdujhl7yZSCCyDSYZCXcBzACwnAKLYGxqLxts2QPxwvd39zo8w/+ddQGDxHqR73Rwa3rMX59kc3RjBD44cw690JvusCHRqppVrKobGAfeaIEy5feyImfNg2pOooSNO7lmgK+GAt2lArnihxYkyAYeijAUYl9pjpaF4lt00/TX70lVfVWJSqwgvH/AE5T8eQ2AEzMw7n7jpdOqJxJWPIlC/XtPQCM92XMQ/ccbt7BtU1/QwiidWai+Kc96H6c0C+xh1W7fWQvzTBNVHxQGX6vhu4lGphjxnsLCrJKDZvmp4yw1KLGVBW9RsBd0oLxv4FIJyAOr+NZRXkx7ZsGviie/tnxvQ8uablcl9PecBv2VDj0D2DBl0i127bLpEnjtU26VIQBNLvkxCQ+v1XQJfqGHxNUEjHGthBHZ7eSQU4d7qTbChcLtLbMPaYSdgnyQ/Py7zHjHGntGDscxhaMHS3/re6asy0XYvBi/eFsQnpwdsscy0930DymHsdvha7fWEhu7J2HDZAfxYAm+bsSYih0fjDMHXoT2yeZervPc+WxmeZ6+bYe6+pS7Y0Nw+1PKfiq+dp1wzRFFC8OA5+Co72MfS1H1gtt5w7Xn54/otZ95gx7pTmjH5T4vvGw2nHFvVbZcDFupsO8B6bjjPXTOxtqzfNHDP2BpPONHOcLY+5tysvvdeg3dgzqKr+Llmy/SbNYvYMMvlzibvK7A4M3ptep2xpJq8pL/3ZmdLT09xzzgpH61INfSyYTMWMsYCDWV4Iin5JqDVfAFDN1PbopAJrlNmCDos2BI+TW2Th2FMByg3ujhrZ78tWZlGvweWTs2cQttNrugx81+MQS3xAh0blu3IbGv04ftIqJTOqC93BxtF+pTrafw6mYqNl1bl36CyJ03AytbkE406JM6xF4z8Jge6vAK6wTgDcvWNzKaaEefhxO0NjVd2pON4li7dOUXDx3ZC37CUwmwnmdZrYpDP2ppljE5t86efp96XnY34TzDFjSh//Bv/kvAYd4aIFGFzgj3vMdGCPmSHbR8stU59z/E4BUI4fiNwr43WntHDcl8G/rJJqgIu+rfwtpfe2EbNG1zKouv5eiWxbqv1Au4JeZo0GDObFegvNdC1bPnNvT/eZdJOPsTfNlM09oddgys7ruVEI5hxIsDj0VYKfAwFvb54Jby4XYg3NWeoYiMtFvgCqqZDaLRp/OcB1JZakKOci3YLDD1Ta7/9JWgbBRq6TlkGD5sjiJx+V2X/2n2VQDu8/IC17V2L42A1xA/z64KUXKujQR5eL2F4tFn0RBHI8+KnVOvSpNkWOQ1+2+tGdEgP5s0Xjr8WOW/8GgS9oozqOKCZFzlbL7NccXjfoWAY1fEzqq3fJVds+4YhZImARXF9k3lL89MGwXqhPQH56UQcsts6CuOE93ahR5UF5rimXXshhco+Z9pY1MrTzJLn5vB3gHypSi7PejhrIsUqzAVLKha4afytEF1NVpyug6hLFocoDqT/vdWR7mDU2O5ZBVdUb5KqtEYey4+Pxqj87n9JAn5i/+wkdBGdJZ9WUFyCQxA6rHS/hCyfDxSWd/AwdOuurgHYEFNw7sMfMLZ+frmrOpCrc17lQgcMqeZNF434LmdhkDDHc8zAEgB8iM0b2P3eOhWVQtD0J58FXy5VPbpBZ25oo83r++TfyqxyQ5/fgLOlwEfrm818Vq3U8KNc2LEI74BrYwwBNDH0sK9b5GmZ9p4FKrdJZTr6Gvt7qZ6T0V47ZBHP5SRCr7JMwpfQ+B5f71euXzaGRE522/di0oP4TUpvcJXM3f/z1mUdAhxvB5jDvv+BUiovQpCA3f+WADN1xCuRJD6oEnIx2/4KjdVCFPWY6WtZJdcuJcvO5m3XoUyZbFQn7V3Jf7zJS+oVjnsIEcTx2Z31FKqAtQUGqUmXi32f/rJjWCY1lHeFgCb/caTYGqnsY+OFHAnO3LGJXBMIWWBkeaU498MOPUyVTE4LLyI++dc+vAa4vYvji0EGpfPe85p70mGAM0CoCIR6dJ/953lI99patCUX+4bBICjbvsUFwB/kIpPRj8KL44fhzSCGgGBh3Axn41aQdsGqHWPZbr99+zLgT3gsNGvrtROuBBF5QrzIvLbPQP6jzwWDxOvr41t2rAK5LIWvijIp5s5FdKi9j6KvlUsVbYECnQpTwmA59o6fZUHArPZtJptfwXv8IboT68Bk6xPgRXClg4cALLvZiEjIVKDraiXBo2PB6qR9xmG1z59kMr7PQGMpYPup7MFCcocqRB91y7mUA1VVYLOVyDypuPCBrS1EmYwam47OiFL2zZSPoG4Y+BVWFOg7xA6hYTYKKlJOU66oJZ0rr/rtTS0CHgpReuxs/jmVQCPywI0JxztlC34SDKZapGgWN02H+RaB963ffxHreDzGzwteC3bNtBSTvZZOgkIehjzxkLBqRH5y7WIswWqmmPD/FNIfnFsUMS7bDYKRxBgSqFEVwKOm5T5i/WKELROxl/W7R06RW+g+KJXZnTIYdNVzqh9ONBprjVUEqVj0zPQd1660TIZB7GIaXkAv9+2+mADy3Y2gcgoVTp6E0dCCgOg5g1pe8WH4wbQNkLQHhHjMEpJ8DBY0RvjK8osg27HvduACCYjNcH0zJi90W1Ayd7DyVkbGtzAiswwAsfBeHELCchhnqM+OuRqkIXoD2noEL8LxvvY3GPCTh2B2yYnq7sx3ITH75bo84t/v210uVl2ybBf5wBfhDNAvrpqXeUUN70O1Gwt0w8OnAOhIUa8ShCiwio7dZXW/X/YsuUOVNDlVevA1uBCp+4Qz5HPd1NlyamucCrA53KDykgcXu5Rc+c3VI9g5KymhspE3m//UR2FptBumw+3mV5j0M+KlGHBHZ+ikM7/dj32sMP7EYKBcFqsUP2YCFncu681igWLQcTx8KWUZPzE62awNtLcru6bEDLfrQvJ+m8CpQ3X4q3tzD0PqogXYt5XjFB1cmYPXIvPtvKCw9k+onCBopfWT8ZkjksLzV+aYadqSk9KgsX3gx/k2/pD/LpPs8LgMr/QUZXfprJ2Bh3sK+123P6/JWIVWK0utgzg2ozPkhNL6UgWVemjemAJU8VwT7XjcMHQ8h8eNqqFEIlaKeyB9ngb0FD/ByyN1baXm9fgh9A3ltd26FRWysnVqcHWJW/OR9kNJ/GoLU4vBcBilGzGBil8/iAhkFpEMpIPXhrLBMsbJBzBhqKLAmcjN17HsNXXpHjdu8+mwl9P9apk9eKRR+0p9szvU6HlnK2G1xGVi9vXqvoUZk4oUA140w8KW2B2hGARfWDThYP++x1tckmNjNo9dK/ONWKdN3UeKa+fTxRtecC+pXbZkPcH0PqsPU5GdX5v8DZakMZgg0cZrkXYfC4Yf7bkkn/x3idMf775eAigBEXGFYcgo3U79EQtXQ7cSCKXX6CxIMunoo3KUOPVwtaXIZWH3qfi5Yu4YakQk/go3A51XafUi4U+pTQweWGSpIZWD1pwtVrwtS+iUT1ko8/nFVJaKtZKENNQyFMnF/6l7Ye2wrCIc62GukDKz+drSR0l8z6TG4s5yIPXbew9BIXXqKI7oYbgOCvsbeepl7vWneY/JfDMqH4bhEMRj2hAXjZxCsp8vAcl5J/34NuK4av1OsTpjPte+GQa5jqNG/ErvuUjDhVbmY6bqQ6cgFU6ZLRUyzEdRnbFIeKANroB1vloAiH31VAlEsAbVsd6T0/bZw8tQoJ1Qhvy8m99ysPZxs2d8mVujnZWB5XmO/D7kEREONyEcPyMkTTsEuFX+ERir2boRdZSGDUrVCPqAPZYMFCNbX84Yluy+qe7MMrD70XdasxlCDAtVrJv4vWP+sgadkDIsElzI9uN0gIdfYPNGlXOnFmMsljdFeLNAHmxorE/v33bv7oqalaK4/rWhL2k8DeThFEcaf1ZKJ0+HY4wegXOS5YAuI31zx5OJI8cib9L5UImpojgdS2QHfS0DFrFA4GKxrrEjs3/9fuy8e9DktdbFaQgz4AeUCvD2g5nOuO6VrJv0fDItL4E4JogjVsOUScm7BYMfEB93FC+b/oIuFTEiAcMYx+wsGahvDyVjnq4nmfReDUn1RH6pGKlayPBQW4hUYO0qamV0z8WpYMV0KhUH0tY4Q+ZfSG/AZnBUmTuDTiFsVNcFgbWPIjna8YLfun1H38uvHgVLdnvJN5rbdF9OJQrxbn5RJf1Yw1IDqzZVPfhEbiP5aN1BLUkG9F0MNBQt+UiBxj71rhdCaHno07QoLt1YIgGA7M9BbGC1zM5Bk+4GnwUIt3XNxw69cKixnPmyHNk121Yvcji9TrMIiEEtA6HAqDV4z8U5I6T+hzmyD3GW9Hx5vCDIGAzZzrIn5/eFwhxITVlVdKFBVF7Q7W59IdLSev/viprF7vt74S4JqEtsFlKWDijUpU6z8vo+eS0sZamyBlN7aBEONejXUsGCoYQDjvVvT8GNAZGaEXoqVUvTLH8VS/snCnmvVDQFa/tjR1sdsO3AdwHS/Wz0LgAptnTmJZkGZaq7ZysDyvsxCHxtwLdoxCiPMn2AgewQc2mb2eJMJWAQV0xHzlXZpkA4YWCiNQ5kdCtQ0WuCf4NmscwOmsd/f8/VBD2u3gDKduUmCmahTpm4rAytTrxQyLWW/uGUoKNejMNQ4CTr13cFF8GggenDgpVY89wLr6BHgsQ7DOjidTff5dbI0DnlhAEqSHdjNNh5fiw3Llu75+pC/IB0q2aqoAHcE3XkovZblp881yVJW+VKuPWDcKV36QqU0qJT+dPiN6AIXX7cGHPA4G7COGiF1AFaffDfQsw55KMsCoBok2bqfT7sTz7l+zzcGbdNHc+uVZzZh8jGZwOtzKAOrz12Wpxu8LgkWbr0XUvopEKimGWp4gEUJmAGZl2L1DVgsAYAKhAO19ZJs3o9j+Zkkg8v3XFL/rLaM9frwmbZulj6AppaBNYDOG/CtpApcAmJYuPUnMNS4SNr2gmO2HP/0TDdgMjEBRmDxkjLvOVEs3pWA92hQqDpJtuxrR7k/hl/AFS9f3PQirolAZCBvI9XURxP7/1MGVv/7Lj93upJqLWzh1qWQ0s/pcqdECT6umKGQxwAV05R5j9L8C8A6vMehUAFlBcNhq7oGgNp/wLKTt8bDVatevbDmNT6TIoOtg15MpvyFMTEPoQysPHTigIugTzG5Gowy9OoXPPEdMPTXwykwAUVqxi2KFUwKMgUWKRYYpWhchn/wGGCxAU5BkLWLeQegrATW8cJWVTUB9Q6YqlsqrI4f/P3iEW+zvpNus8Nb3wAVM6sEA25E9wLKwOreHyU8gycf405pwdavwZ3S7ZIAP5+EOyUbUvoUuFxQxeLY76FSjjj+WC+giK6kFa4IWxVVYMr3vQ5ErgzG965+ceZxyqErhXpjUsEAZTqwDCzTE36JzYxx/tZzYFS2DkpzdMHZiRcF7866L5DjFhJE7IhRx8CNfi135COg7EBFdQig4izvJSwdLU80t/7k1SuOamfTCk2h0ruvDKz0HvHDuRGkLtx2OpistXZlw1C7+T2w3xBWwV9yuKpKhh0xApuIYJ+gZDJgVdUGaMQAQD0HfN2w59Wmnxu5kwOoxaBQEfJbRQtlYBWtq/v4IJdyjbx9b1Pzu3uvxXB4QbCmqT4MnqmiBgYL4Mq4aZ7diQleLPokhKM37P5G453mKTrkzcCyi6OuY5KLFpeBVbSu7seDPLKuCffZw5rfjU6OJ2LjIQyFm2S7E2B7MRBI/OmlbwzdbEpXQPWyjmfyFjL+/4JPu45FLkyEAAAAAElFTkSuQmCC');
+			background-size: 24px;
+			background-repeat: no-repeat;
+			background-position: left center;
+			padding-left: 36px;
+			font-size: 20px;
+			letter-spacing: -0.04rem;
+			font-weight: 400;
+			color: white;
+			text-decoration: none;
+		}
+
+		.message-container {
+			flex-grow: 1;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			margin: 0 30px;
+		}
+
+		.message {
+			font-weight: 300;
+			font-size: 1.4rem;
+		}
+
+		body.error .message {
+			display: none;
+		}
+
+		body.error .error-message {
+			display: block;
+		}
+
+		.error-message {
+			display: none;
+			max-width: 800px;
+			font-weight: 300;
+			font-size: 1.3rem;
+		}
+
+		.error-text {
+			color: salmon;
+			font-size: 1rem;
+		}
+
+		@font-face {
+			font-family: 'Segoe UI';
+			src: url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/light/latest.eot"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/light/latest.eot?#iefix") format("embedded-opentype");
+			src: local("Segoe UI Light"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/light/latest.woff2") format("woff2"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/light/latest.woff") format("woff"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/light/latest.ttf") format("truetype"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/light/latest.svg#web") format("svg");
+			font-weight: 200
+		}
+
+		@font-face {
+			font-family: 'Segoe UI';
+			src: url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/semilight/latest.eot"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/semilight/latest.eot?#iefix") format("embedded-opentype");
+			src: local("Segoe UI Semilight"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/semilight/latest.woff2") format("woff2"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/semilight/latest.woff") format("woff"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/semilight/latest.ttf") format("truetype"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/semilight/latest.svg#web") format("svg");
+			font-weight: 300
+		}
+
+		@font-face {
+			font-family: 'Segoe UI';
+			src: url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/normal/latest.eot"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/normal/latest.eot?#iefix") format("embedded-opentype");
+			src: local("Segoe UI"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/normal/latest.woff2") format("woff"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/normal/latest.woff") format("woff"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/normal/latest.ttf") format("truetype"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/normal/latest.svg#web") format("svg");
+			font-weight: 400
+		}
+
+		@font-face {
+			font-family: 'Segoe UI';
+			src: url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/semibold/latest.eot"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/semibold/latest.eot?#iefix") format("embedded-opentype");
+			src: local("Segoe UI Semibold"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/semibold/latest.woff2") format("woff"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/semibold/latest.woff") format("woff"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/semibold/latest.ttf") format("truetype"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/semibold/latest.svg#web") format("svg");
+			font-weight: 600
+		}
+
+		@font-face {
+			font-family: 'Segoe UI';
+			src: url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/bold/latest.eot"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/bold/latest.eot?#iefix") format("embedded-opentype");
+			src: local("Segoe UI Bold"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/bold/latest.woff2") format("woff"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/bold/latest.woff") format("woff"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/bold/latest.ttf") format("truetype"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/bold/latest.svg#web") format("svg");
+			font-weight: 700
+		}
+	</style>
+</head>
+
+<body>
+	<a class="branding" href="https://code.visualstudio.com/">
+		Visual Studio Code
+	</a>
+	<div class="message-container">
+		<div class="message">
+			You are signed in now and can close this page.
+		</div>
+		<div class="error-message">
+			An error occurred while signing in:
+			<div class="error-text"></div>
+		</div>
+	</div>
+	<script>
+		var search = new URLSearchParams(window.location.search);
+		var error = search.get('error');
+		if (error) {
+			const description = search.get('error_description');
+			document.querySelector('.error-text')
+				.textContent = error + ' - ' + description;
+			document.querySelector('body')
+				.classList.add('error');
+		}
+	</script>
+</body>
+
+</html>
+`;
diff --git a/extensions/microsoft-authentication/src/node/publicClientCache.ts b/extensions/microsoft-authentication/src/node/publicClientCache.ts
new file mode 100644
index 00000000000..fc6ce38e975
--- /dev/null
+++ b/extensions/microsoft-authentication/src/node/publicClientCache.ts
@@ -0,0 +1,231 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { AccountInfo } from '@azure/msal-node';
+import { SecretStorage, LogOutputChannel, Disposable, EventEmitter, Memento, Event } from 'vscode';
+import { ICachedPublicClientApplication, ICachedPublicClientApplicationManager } from '../common/publicClientCache';
+import { CachedPublicClientApplication } from './cachedPublicClientApplication';
+
+export interface IPublicClientApplicationInfo {
+	clientId: string;
+	authority: string;
+}
+
+export class CachedPublicClientApplicationManager implements ICachedPublicClientApplicationManager {
+	// The key is the clientId and authority JSON stringified
+	private readonly _pcas = new Map<string, CachedPublicClientApplication>();
+	private readonly _pcaDisposables = new Map<string, Disposable>();
+
+	private _disposable: Disposable;
+	private _pcasSecretStorage: PublicClientApplicationsSecretStorage;
+
+	private readonly _onDidAccountsChangeEmitter = new EventEmitter<{ added: AccountInfo[]; changed: AccountInfo[]; deleted: AccountInfo[] }>();
+	readonly onDidAccountsChange = this._onDidAccountsChangeEmitter.event;
+
+	constructor(
+		private readonly _globalMemento: Memento,
+		private readonly _secretStorage: SecretStorage,
+		private readonly _logger: LogOutputChannel,
+		cloudName: string
+	) {
+		this._pcasSecretStorage = new PublicClientApplicationsSecretStorage(_secretStorage, cloudName);
+		this._disposable = Disposable.from(
+			this._pcasSecretStorage,
+			this._registerSecretStorageHandler(),
+			this._onDidAccountsChangeEmitter
+		);
+	}
+
+	private _registerSecretStorageHandler() {
+		return this._pcasSecretStorage.onDidChange(() => this._handleSecretStorageChange());
+	}
+
+	async initialize() {
+		this._logger.debug('[initialize] Initializing PublicClientApplicationManager');
+		let keys: string[] | undefined;
+		try {
+			keys = await this._pcasSecretStorage.get();
+		} catch (e) {
+			// data is corrupted
+			this._logger.error('[initialize] Error initializing PublicClientApplicationManager:', e);
+			await this._pcasSecretStorage.delete();
+		}
+		if (!keys) {
+			return;
+		}
+
+		const promises = new Array<Promise<ICachedPublicClientApplication>>();
+		for (const key of keys) {
+			try {
+				const { clientId, authority } = JSON.parse(key) as IPublicClientApplicationInfo;
+				// Load the PCA in memory
+				promises.push(this._doCreatePublicClientApplication(clientId, authority, key));
+			} catch (e) {
+				this._logger.error('[initialize] Error intitializing PCA:', key);
+			}
+		}
+
+		const results = await Promise.allSettled(promises);
+		let pcasChanged = false;
+		for (const result of results) {
+			if (result.status === 'rejected') {
+				this._logger.error('[initialize] Error getting PCA:', result.reason);
+			} else {
+				if (!result.value.accounts.length) {
+					pcasChanged = true;
+					const pcaKey = JSON.stringify({ clientId: result.value.clientId, authority: result.value.authority });
+					this._pcaDisposables.get(pcaKey)?.dispose();
+					this._pcaDisposables.delete(pcaKey);
+					this._pcas.delete(pcaKey);
+					this._logger.debug(`[initialize] [${result.value.clientId}] [${result.value.authority}] PCA disposed because it's empty.`);
+				}
+			}
+		}
+		if (pcasChanged) {
+			await this._storePublicClientApplications();
+		}
+		this._logger.debug('[initialize] PublicClientApplicationManager initialized');
+	}
+
+	dispose() {
+		this._disposable.dispose();
+		Disposable.from(...this._pcaDisposables.values()).dispose();
+	}
+
+	async getOrCreate(clientId: string, authority: string): Promise<ICachedPublicClientApplication> {
+		// Use the clientId and authority as the key
+		const pcasKey = JSON.stringify({ clientId, authority });
+		let pca = this._pcas.get(pcasKey);
+		if (pca) {
+			this._logger.debug(`[getOrCreate] [${clientId}] [${authority}] PublicClientApplicationManager cache hit`);
+			return pca;
+		}
+
+		this._logger.debug(`[getOrCreate] [${clientId}] [${authority}] PublicClientApplicationManager cache miss, creating new PCA...`);
+		pca = await this._doCreatePublicClientApplication(clientId, authority, pcasKey);
+		await this._storePublicClientApplications();
+		this._logger.debug(`[getOrCreate] [${clientId}] [${authority}] PCA created.`);
+		return pca;
+	}
+
+	private async _doCreatePublicClientApplication(clientId: string, authority: string, pcasKey: string) {
+		const pca = new CachedPublicClientApplication(clientId, authority, this._globalMemento, this._secretStorage, this._logger);
+		this._pcas.set(pcasKey, pca);
+		const disposable = Disposable.from(
+			pca,
+			pca.onDidAccountsChange(e => this._onDidAccountsChangeEmitter.fire(e)),
+			pca.onDidRemoveLastAccount(() => {
+				// The PCA has no more accounts, so we can dispose it so we're not keeping it
+				// around forever.
+				disposable.dispose();
+				this._pcaDisposables.delete(pcasKey);
+				this._pcas.delete(pcasKey);
+				this._logger.debug(`[_doCreatePublicClientApplication] [${clientId}] [${authority}] PCA disposed. Firing off storing of PCAs...`);
+				void this._storePublicClientApplications();
+			})
+		);
+		this._pcaDisposables.set(pcasKey, disposable);
+		// Intialize the PCA after the `onDidAccountsChange` is set so we get initial state.
+		await pca.initialize();
+		return pca;
+	}
+
+	getAll(): ICachedPublicClientApplication[] {
+		return Array.from(this._pcas.values());
+	}
+
+	private async _handleSecretStorageChange() {
+		this._logger.debug(`[_handleSecretStorageChange] Handling PCAs secret storage change...`);
+		let result: string[] | undefined;
+		try {
+			result = await this._pcasSecretStorage.get();
+		} catch (_e) {
+			// The data in secret storage has been corrupted somehow so
+			// we store what we have in this window
+			await this._storePublicClientApplications();
+			return;
+		}
+		if (!result) {
+			this._logger.debug(`[_handleSecretStorageChange] PCAs deleted in secret storage. Disposing all...`);
+			Disposable.from(...this._pcaDisposables.values()).dispose();
+			this._pcas.clear();
+			this._pcaDisposables.clear();
+			this._logger.debug(`[_handleSecretStorageChange] Finished PCAs secret storage change.`);
+			return;
+		}
+
+		const pcaKeysFromStorage = new Set(result);
+		// Handle the deleted ones
+		for (const pcaKey of this._pcas.keys()) {
+			if (!pcaKeysFromStorage.delete(pcaKey)) {
+				// This PCA has been removed in another window
+				this._pcaDisposables.get(pcaKey)?.dispose();
+				this._pcaDisposables.delete(pcaKey);
+				this._pcas.delete(pcaKey);
+				this._logger.debug(`[_handleSecretStorageChange] Disposed PCA that was deleted in another window: ${pcaKey}`);
+			}
+		}
+
+		// Handle the new ones
+		for (const newPca of pcaKeysFromStorage) {
+			try {
+				const { clientId, authority } = JSON.parse(newPca);
+				this._logger.debug(`[_handleSecretStorageChange] [${clientId}] [${authority}] Creating new PCA that was created in another window...`);
+				await this._doCreatePublicClientApplication(clientId, authority, newPca);
+				this._logger.debug(`[_handleSecretStorageChange] [${clientId}] [${authority}] PCA created.`);
+			} catch (_e) {
+				// This really shouldn't happen, but should we do something about this?
+				this._logger.error(`Failed to parse new PublicClientApplication: ${newPca}`);
+				continue;
+			}
+		}
+
+		this._logger.debug('[_handleSecretStorageChange] Finished handling PCAs secret storage change.');
+	}
+
+	private _storePublicClientApplications() {
+		return this._pcasSecretStorage.store(Array.from(this._pcas.keys()));
+	}
+}
+
+class PublicClientApplicationsSecretStorage {
+	private _disposable: Disposable;
+
+	private readonly _onDidChangeEmitter = new EventEmitter<void>;
+	readonly onDidChange: Event<void> = this._onDidChangeEmitter.event;
+
+	private readonly _key = `publicClientApplications-${this._cloudName}`;
+
+	constructor(private readonly _secretStorage: SecretStorage, private readonly _cloudName: string) {
+		this._disposable = Disposable.from(
+			this._onDidChangeEmitter,
+			this._secretStorage.onDidChange(e => {
+				if (e.key === this._key) {
+					this._onDidChangeEmitter.fire();
+				}
+			})
+		);
+	}
+
+	async get(): Promise<string[] | undefined> {
+		const value = await this._secretStorage.get(this._key);
+		if (!value) {
+			return undefined;
+		}
+		return JSON.parse(value);
+	}
+
+	store(value: string[]): Thenable<void> {
+		return this._secretStorage.store(this._key, JSON.stringify(value));
+	}
+
+	delete(): Thenable<void> {
+		return this._secretStorage.delete(this._key);
+	}
+
+	dispose() {
+		this._disposable.dispose();
+	}
+}
diff --git a/extensions/microsoft-authentication/yarn.lock b/extensions/microsoft-authentication/yarn.lock
deleted file mode 100644
index 6f277110a56..00000000000
--- a/extensions/microsoft-authentication/yarn.lock
+++ /dev/null
@@ -1,217 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@azure/ms-rest-azure-env@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@azure/ms-rest-azure-env/-/ms-rest-azure-env-2.0.0.tgz#45809f89763a480924e21d3c620cd40866771625"
-  integrity sha512-dG76W7ElfLi+fbTjnZVGj+M9e0BIEJmRxU6fHaUQ12bZBe8EJKYb2GV50YWNaP2uJiVQ5+7nXEVj1VN1UQtaEw==
-
-"@microsoft/1ds-core-js@4.0.3", "@microsoft/1ds-core-js@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@microsoft/1ds-core-js/-/1ds-core-js-4.0.3.tgz#c8a92c623745a9595e06558a866658480c33bdf9"
-  integrity sha512-FrxNLVAPsAvD7+l63TlNS/Kodvpct2WulpDSn1dI4Xuy0kF4E2H867kHdwL/iY1Bj3zA3FSy/jvE4+OcDws7ug==
-  dependencies:
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/1ds-post-js@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@microsoft/1ds-post-js/-/1ds-post-js-4.0.3.tgz#cfcb20bb23fb6215d3f0732f60f5b7df3e624f86"
-  integrity sha512-uewvmUtXKd7ttypiKQGdYI6i7UUpPkOznLayzIFrJ4r2xnG6jhPjpKRncHFXPQcM4XSWO3yf5PQ3xAbPq9t7ZQ==
-  dependencies:
-    "@microsoft/1ds-core-js" "4.0.3"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-channel-js@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.0.4.tgz#247b6fe2158fad9826cbcdf7304f885766b36624"
-  integrity sha512-6TlfExmErQ8Y+/ChbkyWl+jyt4wg3T6p7lwXDsUCB0LgZmlEWMaCUS0YlT73JCWmE8j7vxW8yUm0lgsgmHns3A==
-  dependencies:
-    "@microsoft/applicationinsights-common" "3.0.4"
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-common@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-common/-/applicationinsights-common-3.0.4.tgz#c4aa53ba343f5b3c7fbf54cddd3c86a5bdcd95dc"
-  integrity sha512-r5gWaw/K9+tKfuo2GtDiDiKASgOkPOCrKW+wZzFvuR06uuwvWjbVQ6yW/YbnfuhRF5M65ksUiMi0eCMwEOGq7Q==
-  dependencies:
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-core-js@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.0.4.tgz#008308b786930d94a1de8a1fbb4af0351b74653e"
-  integrity sha512-anxy5kEkqBmVoEqJiJzaaXXA0wzqZi9U4zGd05xFJ04lWckP8dG3zyT3+GGdg7rDelqLTNGxndeYoFmDv63u1g==
-  dependencies:
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-shims@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz#3865b73ace8405b9c4618cc5c571f2fe3876f06f"
-  integrity sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==
-  dependencies:
-    "@nevware21/ts-utils" ">= 0.9.4 < 2.x"
-
-"@microsoft/applicationinsights-web-basic@^3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.0.4.tgz#9a23323276b4a5a0dc6a352e2de5d75e3c16b534"
-  integrity sha512-KfoxPlLlf0JT12ADb23C5iGye/yFouoMgHEKULxkSQcYY9SsW/8rVrqqvoYKAL+u215CZU2A8Kc8sR3ehEaPCQ==
-  dependencies:
-    "@microsoft/applicationinsights-channel-js" "3.0.4"
-    "@microsoft/applicationinsights-common" "3.0.4"
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/dynamicproto-js@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.2.tgz#e57fbec2e7067d48b7e8e1e1c1d354028ef718a6"
-  integrity sha512-MB8trWaFREpmb037k/d0bB7T2BP7Ai24w1e1tbz3ASLB0/lwphsq3Nq8S9I5AsI5vs4zAQT+SB5nC5/dLYTiOg==
-  dependencies:
-    "@nevware21/ts-utils" ">= 0.9.4 < 2.x"
-
-"@nevware21/ts-async@>= 0.3.0 < 2.x":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@nevware21/ts-async/-/ts-async-0.3.0.tgz#a8b97ba01065fc930de9a3f4dd4a05e862becc6c"
-  integrity sha512-ZUcgUH12LN/F6nzN0cYd0F/rJaMLmXr0EHVTyYfaYmK55bdwE4338uue4UiVoRqHVqNW4KDUrJc49iGogHKeWA==
-  dependencies:
-    "@nevware21/ts-utils" ">= 0.10.0 < 2.x"
-
-"@nevware21/ts-utils@>= 0.10.0 < 2.x", "@nevware21/ts-utils@>= 0.10.1 < 2.x", "@nevware21/ts-utils@>= 0.9.4 < 2.x":
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@nevware21/ts-utils/-/ts-utils-0.10.1.tgz#aa65abc71eba06749a396598f22263d26f796ac7"
-  integrity sha512-pMny25NnF2/MJwdqC3Iyjm2pGIXNxni4AROpcqDeWa+td9JMUY4bUS9uU9XW+BoBRqTLUL+WURF9SOd/6OQzRg==
-
-"@types/node-fetch@^2.5.7":
-  version "2.5.7"
-  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.7.tgz#20a2afffa882ab04d44ca786449a276f9f6bbf3c"
-  integrity sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==
-  dependencies:
-    "@types/node" "*"
-    form-data "^3.0.0"
-
-"@types/node@*":
-  version "14.0.23"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.23.tgz#676fa0883450ed9da0bb24156213636290892806"
-  integrity sha512-Z4U8yDAl5TFkmYsZdFPdjeMa57NOvnaf1tljHzhouaPEp7LCj2JKkejpI1ODviIAQuW4CcQmxkQ77rnLsOOoKw==
-
-"@types/node@20.x":
-  version "20.11.24"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792"
-  integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==
-  dependencies:
-    undici-types "~5.26.4"
-
-"@types/randombytes@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@types/randombytes/-/randombytes-2.0.0.tgz#0087ff5e60ae68023b9bc4398b406fea7ad18304"
-  integrity sha512-bz8PhAVlwN72vqefzxa14DKNT8jK/mV66CSjwdVQM/k3Th3EPKfUtdMniwZgMedQTFuywAsfjnZsg+pEnltaMA==
-  dependencies:
-    "@types/node" "*"
-
-"@types/sha.js@^2.4.0":
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/@types/sha.js/-/sha.js-2.4.0.tgz#bce682ef860b40f419d024fa08600c3b8d24bb01"
-  integrity sha512-amxKgPy6WJTKuw8mpUwjX2BSxuBtBmZfRwIUDIuPJKNwGN8CWDli8JTg5ONTWOtcTkHIstvT7oAhhYXqEjStHQ==
-  dependencies:
-    "@types/node" "*"
-
-"@types/uuid@8.0.0":
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.0.0.tgz#165aae4819ad2174a17476dbe66feebd549556c0"
-  integrity sha512-xSQfNcvOiE5f9dyd4Kzxbof1aTrLobL278pGLKOZI6esGfZ7ts9Ka16CzIN6Y8hFHE1C7jIBZokULhK1bOgjRw==
-
-"@vscode/extension-telemetry@^0.9.0":
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.9.0.tgz#8c6c61e253ff304f46045f04edd60059b144417a"
-  integrity sha512-37RxGHXrs3GoXPgCUKQhghEu0gxs8j27RLjQwwtSf4WhPdJKz8UrqMYzpsXlliQ05zURYmtdGZst9C6+hfWXaQ==
-  dependencies:
-    "@microsoft/1ds-core-js" "^4.0.3"
-    "@microsoft/1ds-post-js" "^4.0.3"
-    "@microsoft/applicationinsights-web-basic" "^3.0.4"
-
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
-
-combined-stream@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
-  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
-  dependencies:
-    delayed-stream "~1.0.0"
-
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
-
-form-data@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.0.tgz#31b7e39c85f1355b7139ee0c647cf0de7f83c682"
-  integrity sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.8"
-    mime-types "^2.1.12"
-
-mime-db@1.44.0:
-  version "1.44.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
-  integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
-
-mime-types@^2.1.12:
-  version "2.1.27"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
-  integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
-  dependencies:
-    mime-db "1.44.0"
-
-node-fetch@2.6.7:
-  version "2.6.7"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
-  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
-  dependencies:
-    whatwg-url "^5.0.0"
-
-tr46@~0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-  integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
-
-webidl-conversions@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-  integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
-
-whatwg-url@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
-  integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0=
-  dependencies:
-    tr46 "~0.0.3"
-    webidl-conversions "^3.0.0"
diff --git a/extensions/notebook-renderers/.npmrc b/extensions/notebook-renderers/.npmrc
new file mode 100644
index 00000000000..a9c57709666
--- /dev/null
+++ b/extensions/notebook-renderers/.npmrc
@@ -0,0 +1,2 @@
+legacy-peer-deps="true"
+timeout=180000
diff --git a/extensions/notebook-renderers/package-lock.json b/extensions/notebook-renderers/package-lock.json
new file mode 100644
index 00000000000..8dbc5f5ad4c
--- /dev/null
+++ b/extensions/notebook-renderers/package-lock.json
@@ -0,0 +1,700 @@
+{
+	"name": "builtin-notebook-renderers",
+	"version": "1.0.0",
+	"lockfileVersion": 3,
+	"requires": true,
+	"packages": {
+		"": {
+			"name": "builtin-notebook-renderers",
+			"version": "1.0.0",
+			"license": "MIT",
+			"devDependencies": {
+				"@types/jsdom": "^21.1.0",
+				"@types/vscode-notebook-renderer": "^1.60.0",
+				"jsdom": "^21.1.1"
+			},
+			"engines": {
+				"vscode": "^1.57.0"
+			}
+		},
+		"node_modules/@tootallnate/once": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
+			"integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
+			"dev": true,
+			"engines": {
+				"node": ">= 10"
+			}
+		},
+		"node_modules/@types/jsdom": {
+			"version": "21.1.0",
+			"resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-21.1.0.tgz",
+			"integrity": "sha512-leWreJOdnuIxq9Y70tBVm/bvTuh31DSlF/r4l7Cfi4uhVQqLHD0Q4v301GMisEMwwbMgF7ZKxuZ+Jbd4NcdmRw==",
+			"dev": true,
+			"dependencies": {
+				"@types/node": "*",
+				"@types/tough-cookie": "*",
+				"parse5": "^7.0.0"
+			}
+		},
+		"node_modules/@types/node": {
+			"version": "18.15.3",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.3.tgz",
+			"integrity": "sha512-p6ua9zBxz5otCmbpb5D3U4B5Nanw6Pk3PPyX05xnxbB/fRv71N7CPmORg7uAD5P70T0xmx1pzAx/FUfa5X+3cw==",
+			"dev": true
+		},
+		"node_modules/@types/tough-cookie": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.2.tgz",
+			"integrity": "sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==",
+			"dev": true
+		},
+		"node_modules/@types/vscode-notebook-renderer": {
+			"version": "1.60.0",
+			"resolved": "https://registry.npmjs.org/@types/vscode-notebook-renderer/-/vscode-notebook-renderer-1.60.0.tgz",
+			"integrity": "sha512-u7TD2uuEZTVuitx0iijOJdKI0JLiQP6PsSBSRy2XmHXUOXcp5p1S56NrjOEDoF+PIHd3NL3eO6KTRSf5nukDqQ==",
+			"dev": true
+		},
+		"node_modules/abab": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
+			"integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
+			"deprecated": "Use your platform's native atob() and btoa() methods instead",
+			"dev": true
+		},
+		"node_modules/acorn": {
+			"version": "8.8.2",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
+			"integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
+			"dev": true,
+			"bin": {
+				"acorn": "bin/acorn"
+			},
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/acorn-globals": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-7.0.1.tgz",
+			"integrity": "sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==",
+			"dev": true,
+			"dependencies": {
+				"acorn": "^8.1.0",
+				"acorn-walk": "^8.0.2"
+			}
+		},
+		"node_modules/acorn-walk": {
+			"version": "8.2.0",
+			"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
+			"integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/agent-base": {
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+			"integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+			"dev": true,
+			"dependencies": {
+				"debug": "4"
+			},
+			"engines": {
+				"node": ">= 6.0.0"
+			}
+		},
+		"node_modules/asynckit": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+			"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+			"dev": true
+		},
+		"node_modules/combined-stream": {
+			"version": "1.0.8",
+			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+			"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+			"dev": true,
+			"dependencies": {
+				"delayed-stream": "~1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
+		"node_modules/cssstyle": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-3.0.0.tgz",
+			"integrity": "sha512-N4u2ABATi3Qplzf0hWbVCdjenim8F3ojEXpBDF5hBpjzW182MjNGLqfmQ0SkSPeQ+V86ZXgeH8aXj6kayd4jgg==",
+			"dev": true,
+			"dependencies": {
+				"rrweb-cssom": "^0.6.0"
+			},
+			"engines": {
+				"node": ">=14"
+			}
+		},
+		"node_modules/data-urls": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/data-urls/-/data-urls-4.0.0.tgz",
+			"integrity": "sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g==",
+			"dev": true,
+			"dependencies": {
+				"abab": "^2.0.6",
+				"whatwg-mimetype": "^3.0.0",
+				"whatwg-url": "^12.0.0"
+			},
+			"engines": {
+				"node": ">=14"
+			}
+		},
+		"node_modules/debug": {
+			"version": "4.3.4",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+			"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+			"dev": true,
+			"dependencies": {
+				"ms": "2.1.2"
+			},
+			"engines": {
+				"node": ">=6.0"
+			},
+			"peerDependenciesMeta": {
+				"supports-color": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/decimal.js": {
+			"version": "10.4.3",
+			"resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
+			"integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==",
+			"dev": true
+		},
+		"node_modules/deep-is": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+			"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+			"dev": true
+		},
+		"node_modules/delayed-stream": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+			"integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/domexception": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
+			"integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
+			"deprecated": "Use your platform's native DOMException instead",
+			"dev": true,
+			"dependencies": {
+				"webidl-conversions": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/entities": {
+			"version": "4.4.0",
+			"resolved": "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz",
+			"integrity": "sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.12"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/entities?sponsor=1"
+			}
+		},
+		"node_modules/escodegen": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
+			"integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
+			"dev": true,
+			"dependencies": {
+				"esprima": "^4.0.1",
+				"estraverse": "^5.2.0",
+				"esutils": "^2.0.2",
+				"optionator": "^0.8.1"
+			},
+			"bin": {
+				"escodegen": "bin/escodegen.js",
+				"esgenerate": "bin/esgenerate.js"
+			},
+			"engines": {
+				"node": ">=6.0"
+			},
+			"optionalDependencies": {
+				"source-map": "~0.6.1"
+			}
+		},
+		"node_modules/esprima": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+			"dev": true,
+			"bin": {
+				"esparse": "bin/esparse.js",
+				"esvalidate": "bin/esvalidate.js"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/estraverse": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+			"dev": true,
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/esutils": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/fast-levenshtein": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+			"integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+			"dev": true
+		},
+		"node_modules/form-data": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+			"integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+			"dev": true,
+			"dependencies": {
+				"asynckit": "^0.4.0",
+				"combined-stream": "^1.0.8",
+				"mime-types": "^2.1.12"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/html-encoding-sniffer": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
+			"integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
+			"dev": true,
+			"dependencies": {
+				"whatwg-encoding": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/http-proxy-agent": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
+			"integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
+			"dev": true,
+			"dependencies": {
+				"@tootallnate/once": "2",
+				"agent-base": "6",
+				"debug": "4"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/https-proxy-agent": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+			"integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+			"dev": true,
+			"dependencies": {
+				"agent-base": "6",
+				"debug": "4"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/iconv-lite": {
+			"version": "0.6.3",
+			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+			"integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+			"dev": true,
+			"dependencies": {
+				"safer-buffer": ">= 2.1.2 < 3.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/is-potential-custom-element-name": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+			"integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
+			"dev": true
+		},
+		"node_modules/jsdom": {
+			"version": "21.1.1",
+			"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-21.1.1.tgz",
+			"integrity": "sha512-Jjgdmw48RKcdAIQyUD1UdBh2ecH7VqwaXPN3ehoZN6MqgVbMn+lRm1aAT1AsdJRAJpwfa4IpwgzySn61h2qu3w==",
+			"dev": true,
+			"dependencies": {
+				"abab": "^2.0.6",
+				"acorn": "^8.8.2",
+				"acorn-globals": "^7.0.0",
+				"cssstyle": "^3.0.0",
+				"data-urls": "^4.0.0",
+				"decimal.js": "^10.4.3",
+				"domexception": "^4.0.0",
+				"escodegen": "^2.0.0",
+				"form-data": "^4.0.0",
+				"html-encoding-sniffer": "^3.0.0",
+				"http-proxy-agent": "^5.0.0",
+				"https-proxy-agent": "^5.0.1",
+				"is-potential-custom-element-name": "^1.0.1",
+				"nwsapi": "^2.2.2",
+				"parse5": "^7.1.2",
+				"rrweb-cssom": "^0.6.0",
+				"saxes": "^6.0.0",
+				"symbol-tree": "^3.2.4",
+				"tough-cookie": "^4.1.2",
+				"w3c-xmlserializer": "^4.0.0",
+				"webidl-conversions": "^7.0.0",
+				"whatwg-encoding": "^2.0.0",
+				"whatwg-mimetype": "^3.0.0",
+				"whatwg-url": "^12.0.1",
+				"ws": "^8.13.0",
+				"xml-name-validator": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=14"
+			},
+			"peerDependencies": {
+				"canvas": "^2.5.0"
+			},
+			"peerDependenciesMeta": {
+				"canvas": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/levn": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+			"integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
+			"dev": true,
+			"dependencies": {
+				"prelude-ls": "~1.1.2",
+				"type-check": "~0.3.2"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/mime-db": {
+			"version": "1.52.0",
+			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+			"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/mime-types": {
+			"version": "2.1.35",
+			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+			"integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+			"dev": true,
+			"dependencies": {
+				"mime-db": "1.52.0"
+			},
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/ms": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+			"dev": true
+		},
+		"node_modules/nwsapi": {
+			"version": "2.2.2",
+			"resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.2.tgz",
+			"integrity": "sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==",
+			"dev": true
+		},
+		"node_modules/optionator": {
+			"version": "0.8.3",
+			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+			"integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+			"dev": true,
+			"dependencies": {
+				"deep-is": "~0.1.3",
+				"fast-levenshtein": "~2.0.6",
+				"levn": "~0.3.0",
+				"prelude-ls": "~1.1.2",
+				"type-check": "~0.3.2",
+				"word-wrap": "~1.2.3"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/parse5": {
+			"version": "7.1.2",
+			"resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
+			"integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
+			"dev": true,
+			"dependencies": {
+				"entities": "^4.4.0"
+			},
+			"funding": {
+				"url": "https://github.com/inikulin/parse5?sponsor=1"
+			}
+		},
+		"node_modules/prelude-ls": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+			"integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/psl": {
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
+			"integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
+			"dev": true
+		},
+		"node_modules/punycode": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
+			"integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/querystringify": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+			"integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+			"dev": true
+		},
+		"node_modules/requires-port": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+			"integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+			"dev": true
+		},
+		"node_modules/rrweb-cssom": {
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz",
+			"integrity": "sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==",
+			"dev": true
+		},
+		"node_modules/safer-buffer": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+			"dev": true
+		},
+		"node_modules/saxes": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
+			"integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==",
+			"dev": true,
+			"dependencies": {
+				"xmlchars": "^2.2.0"
+			},
+			"engines": {
+				"node": ">=v12.22.7"
+			}
+		},
+		"node_modules/source-map": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/symbol-tree": {
+			"version": "3.2.4",
+			"resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+			"integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
+			"dev": true
+		},
+		"node_modules/tough-cookie": {
+			"version": "4.1.3",
+			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
+			"integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
+			"dev": true,
+			"dependencies": {
+				"psl": "^1.1.33",
+				"punycode": "^2.1.1",
+				"universalify": "^0.2.0",
+				"url-parse": "^1.5.3"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/tr46": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz",
+			"integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==",
+			"dev": true,
+			"dependencies": {
+				"punycode": "^2.3.0"
+			},
+			"engines": {
+				"node": ">=14"
+			}
+		},
+		"node_modules/type-check": {
+			"version": "0.3.2",
+			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+			"integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
+			"dev": true,
+			"dependencies": {
+				"prelude-ls": "~1.1.2"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/universalify": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+			"integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+			"dev": true,
+			"engines": {
+				"node": ">= 4.0.0"
+			}
+		},
+		"node_modules/url-parse": {
+			"version": "1.5.10",
+			"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+			"integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+			"dev": true,
+			"dependencies": {
+				"querystringify": "^2.1.1",
+				"requires-port": "^1.0.0"
+			}
+		},
+		"node_modules/w3c-xmlserializer": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz",
+			"integrity": "sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==",
+			"dev": true,
+			"dependencies": {
+				"xml-name-validator": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=14"
+			}
+		},
+		"node_modules/webidl-conversions": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+			"integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+			"dev": true,
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/whatwg-encoding": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
+			"integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
+			"dev": true,
+			"dependencies": {
+				"iconv-lite": "0.6.3"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/whatwg-mimetype": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
+			"integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/whatwg-url": {
+			"version": "12.0.1",
+			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-12.0.1.tgz",
+			"integrity": "sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ==",
+			"dev": true,
+			"dependencies": {
+				"tr46": "^4.1.1",
+				"webidl-conversions": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=14"
+			}
+		},
+		"node_modules/word-wrap": {
+			"version": "1.2.4",
+			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
+			"integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/ws": {
+			"version": "8.17.1",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
+			"integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=10.0.0"
+			},
+			"peerDependencies": {
+				"bufferutil": "^4.0.1",
+				"utf-8-validate": ">=5.0.2"
+			},
+			"peerDependenciesMeta": {
+				"bufferutil": {
+					"optional": true
+				},
+				"utf-8-validate": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/xml-name-validator": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
+			"integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
+			"dev": true,
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/xmlchars": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+			"integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
+			"dev": true
+		}
+	}
+}
diff --git a/extensions/notebook-renderers/src/index.ts b/extensions/notebook-renderers/src/index.ts
index 551192a84df..8f5fa908cb9 100644
--- a/extensions/notebook-renderers/src/index.ts
+++ b/extensions/notebook-renderers/src/index.ts
@@ -462,7 +462,7 @@ export const activate: ActivationFunction<void> = (ctx) => {
 		border-color: var(--theme-input-focus-border-color);
 	}
 	#container div.output .scrollable {
-		overflow-y: scroll;
+		overflow-y: auto;
 		max-height: var(--notebook-cell-output-max-height);
 	}
 	#container div.output .scrollable.scrollbar-visible {
diff --git a/extensions/notebook-renderers/src/textHelper.ts b/extensions/notebook-renderers/src/textHelper.ts
index b49dbb6ad8d..9c080c7f9e4 100644
--- a/extensions/notebook-renderers/src/textHelper.ts
+++ b/extensions/notebook-renderers/src/textHelper.ts
@@ -71,6 +71,11 @@ function generateNestedViewAllElement(outputId: string) {
 
 function truncatedArrayOfString(id: string, buffer: string[], linesLimit: number, linkOptions: LinkOptions) {
 	const container = document.createElement('div');
+	container.setAttribute('data-vscode-context', JSON.stringify({
+		webviewSection: 'text',
+		outputId: id,
+		'preventDefaultContextMenuItems': true
+	}));
 	const lineCount = buffer.length;
 
 	if (lineCount <= linesLimit) {
@@ -95,6 +100,11 @@ function truncatedArrayOfString(id: string, buffer: string[], linesLimit: number
 
 function scrollableArrayOfString(id: string, buffer: string[], linkOptions: LinkOptions) {
 	const element = document.createElement('div');
+	element.setAttribute('data-vscode-context', JSON.stringify({
+		webviewSection: 'text',
+		outputId: id,
+		'preventDefaultContextMenuItems': true
+	}));
 	if (buffer.length > softScrollableLineLimit) {
 		element.appendChild(generateNestedViewAllElement(id));
 	}
diff --git a/extensions/notebook-renderers/yarn.lock b/extensions/notebook-renderers/yarn.lock
deleted file mode 100644
index 3cbe531e0fd..00000000000
--- a/extensions/notebook-renderers/yarn.lock
+++ /dev/null
@@ -1,423 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@tootallnate/once@2":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
-  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
-
-"@types/jsdom@^21.1.0":
-  version "21.1.0"
-  resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-21.1.0.tgz#219f15e3370da3f85d18fe02ae86bda7ff66104a"
-  integrity sha512-leWreJOdnuIxq9Y70tBVm/bvTuh31DSlF/r4l7Cfi4uhVQqLHD0Q4v301GMisEMwwbMgF7ZKxuZ+Jbd4NcdmRw==
-  dependencies:
-    "@types/node" "*"
-    "@types/tough-cookie" "*"
-    parse5 "^7.0.0"
-
-"@types/node@*":
-  version "18.15.3"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.3.tgz#f0b991c32cfc6a4e7f3399d6cb4b8cf9a0315014"
-  integrity sha512-p6ua9zBxz5otCmbpb5D3U4B5Nanw6Pk3PPyX05xnxbB/fRv71N7CPmORg7uAD5P70T0xmx1pzAx/FUfa5X+3cw==
-
-"@types/tough-cookie@*":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397"
-  integrity sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==
-
-"@types/vscode-notebook-renderer@^1.60.0":
-  version "1.60.0"
-  resolved "https://registry.yarnpkg.com/@types/vscode-notebook-renderer/-/vscode-notebook-renderer-1.60.0.tgz#8a67d561f48ddf46a95dfa9f712a79c72c7b8f7a"
-  integrity sha512-u7TD2uuEZTVuitx0iijOJdKI0JLiQP6PsSBSRy2XmHXUOXcp5p1S56NrjOEDoF+PIHd3NL3eO6KTRSf5nukDqQ==
-
-abab@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
-  integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
-
-acorn-globals@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-7.0.1.tgz#0dbf05c44fa7c94332914c02066d5beff62c40c3"
-  integrity sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==
-  dependencies:
-    acorn "^8.1.0"
-    acorn-walk "^8.0.2"
-
-acorn-walk@^8.0.2:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
-  integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
-
-acorn@^8.1.0, acorn@^8.8.2:
-  version "8.8.2"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
-  integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
-
-agent-base@6:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
-  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
-  dependencies:
-    debug "4"
-
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
-
-combined-stream@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
-  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
-  dependencies:
-    delayed-stream "~1.0.0"
-
-cssstyle@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-3.0.0.tgz#17ca9c87d26eac764bb8cfd00583cff21ce0277a"
-  integrity sha512-N4u2ABATi3Qplzf0hWbVCdjenim8F3ojEXpBDF5hBpjzW182MjNGLqfmQ0SkSPeQ+V86ZXgeH8aXj6kayd4jgg==
-  dependencies:
-    rrweb-cssom "^0.6.0"
-
-data-urls@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-4.0.0.tgz#333a454eca6f9a5b7b0f1013ff89074c3f522dd4"
-  integrity sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g==
-  dependencies:
-    abab "^2.0.6"
-    whatwg-mimetype "^3.0.0"
-    whatwg-url "^12.0.0"
-
-debug@4:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
-  dependencies:
-    ms "2.1.2"
-
-decimal.js@^10.4.3:
-  version "10.4.3"
-  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23"
-  integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==
-
-deep-is@~0.1.3:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
-  integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
-
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
-
-domexception@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/domexception/-/domexception-4.0.0.tgz#4ad1be56ccadc86fc76d033353999a8037d03673"
-  integrity sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==
-  dependencies:
-    webidl-conversions "^7.0.0"
-
-entities@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174"
-  integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==
-
-escodegen@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd"
-  integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==
-  dependencies:
-    esprima "^4.0.1"
-    estraverse "^5.2.0"
-    esutils "^2.0.2"
-    optionator "^0.8.1"
-  optionalDependencies:
-    source-map "~0.6.1"
-
-esprima@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
-estraverse@^5.2.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
-  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
-
-esutils@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
-  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
-
-fast-levenshtein@~2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
-  integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
-
-form-data@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
-  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.8"
-    mime-types "^2.1.12"
-
-html-encoding-sniffer@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz#2cb1a8cf0db52414776e5b2a7a04d5dd98158de9"
-  integrity sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==
-  dependencies:
-    whatwg-encoding "^2.0.0"
-
-http-proxy-agent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
-  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
-  dependencies:
-    "@tootallnate/once" "2"
-    agent-base "6"
-    debug "4"
-
-https-proxy-agent@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
-  integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
-  dependencies:
-    agent-base "6"
-    debug "4"
-
-iconv-lite@0.6.3:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
-  integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3.0.0"
-
-is-potential-custom-element-name@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
-  integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
-
-jsdom@^21.1.1:
-  version "21.1.1"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-21.1.1.tgz#ab796361e3f6c01bcfaeda1fea3c06197ac9d8ae"
-  integrity sha512-Jjgdmw48RKcdAIQyUD1UdBh2ecH7VqwaXPN3ehoZN6MqgVbMn+lRm1aAT1AsdJRAJpwfa4IpwgzySn61h2qu3w==
-  dependencies:
-    abab "^2.0.6"
-    acorn "^8.8.2"
-    acorn-globals "^7.0.0"
-    cssstyle "^3.0.0"
-    data-urls "^4.0.0"
-    decimal.js "^10.4.3"
-    domexception "^4.0.0"
-    escodegen "^2.0.0"
-    form-data "^4.0.0"
-    html-encoding-sniffer "^3.0.0"
-    http-proxy-agent "^5.0.0"
-    https-proxy-agent "^5.0.1"
-    is-potential-custom-element-name "^1.0.1"
-    nwsapi "^2.2.2"
-    parse5 "^7.1.2"
-    rrweb-cssom "^0.6.0"
-    saxes "^6.0.0"
-    symbol-tree "^3.2.4"
-    tough-cookie "^4.1.2"
-    w3c-xmlserializer "^4.0.0"
-    webidl-conversions "^7.0.0"
-    whatwg-encoding "^2.0.0"
-    whatwg-mimetype "^3.0.0"
-    whatwg-url "^12.0.1"
-    ws "^8.13.0"
-    xml-name-validator "^4.0.0"
-
-levn@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==
-  dependencies:
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-
-mime-db@1.52.0:
-  version "1.52.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
-  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
-
-mime-types@^2.1.12:
-  version "2.1.35"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
-  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
-  dependencies:
-    mime-db "1.52.0"
-
-ms@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-nwsapi@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.2.tgz#e5418863e7905df67d51ec95938d67bf801f0bb0"
-  integrity sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==
-
-optionator@^0.8.1:
-  version "0.8.3"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
-  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
-  dependencies:
-    deep-is "~0.1.3"
-    fast-levenshtein "~2.0.6"
-    levn "~0.3.0"
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-    word-wrap "~1.2.3"
-
-parse5@^7.0.0, parse5@^7.1.2:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32"
-  integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==
-  dependencies:
-    entities "^4.4.0"
-
-prelude-ls@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
-  integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==
-
-psl@^1.1.33:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
-  integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
-
-punycode@^2.1.1, punycode@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
-  integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
-
-querystringify@^2.1.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
-  integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
-
-requires-port@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-  integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
-
-rrweb-cssom@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz#ed298055b97cbddcdeb278f904857629dec5e0e1"
-  integrity sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==
-
-"safer-buffer@>= 2.1.2 < 3.0.0":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-
-saxes@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz#fe5b4a4768df4f14a201b1ba6a65c1f3d9988cc5"
-  integrity sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==
-  dependencies:
-    xmlchars "^2.2.0"
-
-source-map@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-
-symbol-tree@^3.2.4:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
-  integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
-
-tough-cookie@^4.1.2:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf"
-  integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==
-  dependencies:
-    psl "^1.1.33"
-    punycode "^2.1.1"
-    universalify "^0.2.0"
-    url-parse "^1.5.3"
-
-tr46@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-4.1.1.tgz#281a758dcc82aeb4fe38c7dfe4d11a395aac8469"
-  integrity sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==
-  dependencies:
-    punycode "^2.3.0"
-
-type-check@~0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
-  integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==
-  dependencies:
-    prelude-ls "~1.1.2"
-
-universalify@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"
-  integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==
-
-url-parse@^1.5.3:
-  version "1.5.10"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
-  integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
-  dependencies:
-    querystringify "^2.1.1"
-    requires-port "^1.0.0"
-
-w3c-xmlserializer@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz#aebdc84920d806222936e3cdce408e32488a3073"
-  integrity sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==
-  dependencies:
-    xml-name-validator "^4.0.0"
-
-webidl-conversions@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a"
-  integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==
-
-whatwg-encoding@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz#e7635f597fd87020858626805a2729fa7698ac53"
-  integrity sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==
-  dependencies:
-    iconv-lite "0.6.3"
-
-whatwg-mimetype@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7"
-  integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==
-
-whatwg-url@^12.0.0, whatwg-url@^12.0.1:
-  version "12.0.1"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-12.0.1.tgz#fd7bcc71192e7c3a2a97b9a8d6b094853ed8773c"
-  integrity sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ==
-  dependencies:
-    tr46 "^4.1.1"
-    webidl-conversions "^7.0.0"
-
-word-wrap@~1.2.3:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f"
-  integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==
-
-ws@^8.13.0:
-  version "8.13.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0"
-  integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==
-
-xml-name-validator@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835"
-  integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==
-
-xmlchars@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
-  integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
diff --git a/extensions/npm/.npmrc b/extensions/npm/.npmrc
new file mode 100644
index 00000000000..a9c57709666
--- /dev/null
+++ b/extensions/npm/.npmrc
@@ -0,0 +1,2 @@
+legacy-peer-deps="true"
+timeout=180000
diff --git a/extensions/npm/.vscodeignore b/extensions/npm/.vscodeignore
index 7700b94ebb0..f05a79416be 100644
--- a/extensions/npm/.vscodeignore
+++ b/extensions/npm/.vscodeignore
@@ -4,4 +4,4 @@ tsconfig.json
 .vscode/**
 extension.webpack.config.js
 extension-browser.webpack.config.js
-yarn.lock
+package-lock.json
diff --git a/extensions/npm/package-lock.json b/extensions/npm/package-lock.json
new file mode 100644
index 00000000000..4ee7ee7a0e3
--- /dev/null
+++ b/extensions/npm/package-lock.json
@@ -0,0 +1,353 @@
+{
+  "name": "npm",
+  "version": "1.0.1",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "npm",
+      "version": "1.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "find-up": "^5.0.0",
+        "find-yarn-workspace-root": "^2.0.0",
+        "jsonc-parser": "^3.2.0",
+        "minimatch": "^5.1.6",
+        "request-light": "^0.7.0",
+        "vscode-uri": "^3.0.8",
+        "which": "^4.0.0",
+        "which-pm": "^2.1.1"
+      },
+      "devDependencies": {
+        "@types/minimatch": "^5.1.2",
+        "@types/node": "20.x",
+        "@types/which": "^3.0.0"
+      },
+      "engines": {
+        "vscode": "0.10.x"
+      }
+    },
+    "node_modules/@types/minimatch": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
+      "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==",
+      "dev": true
+    },
+    "node_modules/@types/node": {
+      "version": "20.11.24",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
+      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/@types/which": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/which/-/which-3.0.0.tgz",
+      "integrity": "sha512-ASCxdbsrwNfSMXALlC3Decif9rwDMu+80KGp5zI2RLRotfMsTv7fHL8W8VDp24wymzDyIFudhUeSCugrgRFfHQ==",
+      "dev": true
+    },
+    "node_modules/argparse": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
+      "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY= sha512-iK7YPKV+GsvihPUTKcM3hh2gq47zSFCpVDv/Ay2O9mzuD7dfvLV4vhms4XcjZvv4VRgXuGLMEts51IlTjS11/A==",
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c= sha512-9Y0g0Q8rmSt+H33DfKv7FOc3v+iRI+o1lbzt8jGcIosYW37IIW/2XVYq5NPdmaD5NQ59Nk26Kl/vZbwW9Fr8vg=="
+    },
+    "node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "dependencies": {
+        "fill-range": "^7.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dependencies": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/find-yarn-workspace-root": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz",
+      "integrity": "sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==",
+      "dependencies": {
+        "micromatch": "^4.0.2"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/isexe": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
+      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/js-yaml": {
+      "version": "3.14.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
+      "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/jsonc-parser": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
+      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w=="
+    },
+    "node_modules/load-yaml-file": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/load-yaml-file/-/load-yaml-file-0.2.0.tgz",
+      "integrity": "sha512-OfCBkGEw4nN6JLtgRidPX6QxjBQGQf72q3si2uvqyFEMbycSFFHwAZeXx6cJgFM9wmLrf9zBwCP3Ivqa+LLZPw==",
+      "dependencies": {
+        "graceful-fs": "^4.1.5",
+        "js-yaml": "^3.13.0",
+        "pify": "^4.0.1",
+        "strip-bom": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "license": "MIT",
+      "dependencies": {
+        "braces": "^3.0.3",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/request-light": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.7.0.tgz",
+      "integrity": "sha512-lMbBMrDoxgsyO+yB3sDcrDuX85yYt7sS8BfQd11jtbW/z5ZWgLZRcEGLsLoYw7I0WSUGQBs8CC8ScIxkTX1+6Q=="
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
+    },
+    "node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    },
+    "node_modules/vscode-uri": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz",
+      "integrity": "sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw=="
+    },
+    "node_modules/which": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
+      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
+      "dependencies": {
+        "isexe": "^3.1.1"
+      },
+      "bin": {
+        "node-which": "bin/which.js"
+      },
+      "engines": {
+        "node": "^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/which-pm": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/which-pm/-/which-pm-2.1.1.tgz",
+      "integrity": "sha512-xzzxNw2wMaoCWXiGE8IJ9wuPMU+EYhFksjHxrRT8kMT5SnocBPRg69YAMtyV4D12fP582RA+k3P8H9J5EMdIxQ==",
+      "dependencies": {
+        "load-yaml-file": "^0.2.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8.15"
+      }
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    }
+  }
+}
diff --git a/extensions/npm/src/features/packageJSONContribution.ts b/extensions/npm/src/features/packageJSONContribution.ts
index a2f4fabcfe3..999f39664f1 100644
--- a/extensions/npm/src/features/packageJSONContribution.ts
+++ b/extensions/npm/src/features/packageJSONContribution.ts
@@ -293,7 +293,13 @@ export class PackageJSONContribution implements IJSONContribution {
 			// COREPACK_ENABLE_PROJECT_SPEC makes the npm view command succeed
 			//   even if packageManager specified a package manager other than npm.
 			const env = { ...process.env, COREPACK_ENABLE_AUTO_PIN: '0', COREPACK_ENABLE_PROJECT_SPEC: '0' };
-			cp.execFile(npmCommandPath, args, { cwd, env }, (error, stdout) => {
+			let options: cp.ExecFileOptions = { cwd, env };
+			let commandPath: string = npmCommandPath;
+			if (process.platform === 'win32') {
+				options = { cwd, env, shell: true };
+				commandPath = `"${npmCommandPath}"`;
+			}
+			cp.execFile(commandPath, args, options, (error, stdout) => {
 				if (!error) {
 					try {
 						const content = JSON.parse(stdout);
diff --git a/extensions/npm/src/npmView.ts b/extensions/npm/src/npmView.ts
index 38768b47710..e041b43f091 100644
--- a/extensions/npm/src/npmView.ts
+++ b/extensions/npm/src/npmView.ts
@@ -91,9 +91,11 @@ class NpmScript extends TreeItem {
 				command: 'vscode.open',
 				arguments: [
 					this.taskLocation?.uri,
-					this.taskLocation ? <TextDocumentShowOptions>{
-						selection: new Range(this.taskLocation.range.start, this.taskLocation.range.start)
-					} : undefined
+					this.taskLocation ?
+						{
+							selection: new Range(this.taskLocation.range.start, this.taskLocation.range.start)
+						} satisfies TextDocumentShowOptions
+						: undefined
 				]
 			},
 			'run': {
diff --git a/extensions/npm/yarn.lock b/extensions/npm/yarn.lock
deleted file mode 100644
index a7afc9f801f..00000000000
--- a/extensions/npm/yarn.lock
+++ /dev/null
@@ -1,214 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@types/minimatch@^5.1.2":
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
-  integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
-
-"@types/node@20.x":
-  version "20.11.24"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792"
-  integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==
-  dependencies:
-    undici-types "~5.26.4"
-
-"@types/which@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/which/-/which-3.0.0.tgz#849afdd9fdcb0b67339b9cfc80fa6ea4e0253fc5"
-  integrity sha512-ASCxdbsrwNfSMXALlC3Decif9rwDMu+80KGp5zI2RLRotfMsTv7fHL8W8VDp24wymzDyIFudhUeSCugrgRFfHQ==
-
-argparse@^1.0.7:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
-  integrity sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=
-  dependencies:
-    sprintf-js "~1.0.2"
-
-balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
-
-brace-expansion@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
-  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
-  dependencies:
-    balanced-match "^1.0.0"
-
-braces@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
-  dependencies:
-    fill-range "^7.0.1"
-
-esprima@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
-  dependencies:
-    to-regex-range "^5.0.1"
-
-find-up@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
-  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
-  dependencies:
-    locate-path "^6.0.0"
-    path-exists "^4.0.0"
-
-find-yarn-workspace-root@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz#f47fb8d239c900eb78179aa81b66673eac88f7bd"
-  integrity sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==
-  dependencies:
-    micromatch "^4.0.2"
-
-graceful-fs@^4.1.5:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
-  integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
-
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-
-isexe@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-3.1.1.tgz#4a407e2bd78ddfb14bea0c27c6f7072dde775f0d"
-  integrity sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==
-
-js-yaml@^3.13.0:
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482"
-  integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-jsonc-parser@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76"
-  integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==
-
-load-yaml-file@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/load-yaml-file/-/load-yaml-file-0.2.0.tgz#af854edaf2bea89346c07549122753c07372f64d"
-  integrity sha512-OfCBkGEw4nN6JLtgRidPX6QxjBQGQf72q3si2uvqyFEMbycSFFHwAZeXx6cJgFM9wmLrf9zBwCP3Ivqa+LLZPw==
-  dependencies:
-    graceful-fs "^4.1.5"
-    js-yaml "^3.13.0"
-    pify "^4.0.1"
-    strip-bom "^3.0.0"
-
-locate-path@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
-  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
-  dependencies:
-    p-locate "^5.0.0"
-
-micromatch@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
-  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
-  dependencies:
-    braces "^3.0.1"
-    picomatch "^2.0.5"
-
-minimatch@^5.1.6:
-  version "5.1.6"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
-  integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
-  dependencies:
-    brace-expansion "^2.0.1"
-
-p-limit@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
-  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
-  dependencies:
-    yocto-queue "^0.1.0"
-
-p-locate@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
-  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
-  dependencies:
-    p-limit "^3.0.2"
-
-path-exists@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
-  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
-
-picomatch@^2.0.5:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
-  integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
-
-pify@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
-  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
-
-request-light@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/request-light/-/request-light-0.7.0.tgz#885628bb2f8040c26401ebf258ec51c4ae98ac2a"
-  integrity sha512-lMbBMrDoxgsyO+yB3sDcrDuX85yYt7sS8BfQd11jtbW/z5ZWgLZRcEGLsLoYw7I0WSUGQBs8CC8ScIxkTX1+6Q==
-
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
-
-strip-bom@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
-
-to-regex-range@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-  dependencies:
-    is-number "^7.0.0"
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
-
-vscode-uri@^3.0.8:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.8.tgz#1770938d3e72588659a172d0fd4642780083ff9f"
-  integrity sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==
-
-which-pm@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/which-pm/-/which-pm-2.1.1.tgz#0be2b70c67e94a32e87b9768a94a7f0954f2dcfa"
-  integrity sha512-xzzxNw2wMaoCWXiGE8IJ9wuPMU+EYhFksjHxrRT8kMT5SnocBPRg69YAMtyV4D12fP582RA+k3P8H9J5EMdIxQ==
-  dependencies:
-    load-yaml-file "^0.2.0"
-    path-exists "^4.0.0"
-
-which@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/which/-/which-4.0.0.tgz#cd60b5e74503a3fbcfbf6cd6b4138a8bae644c1a"
-  integrity sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==
-  dependencies:
-    isexe "^3.1.1"
-
-yocto-queue@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
-  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
diff --git a/extensions/objective-c/yarn.lock b/extensions/objective-c/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/objective-c/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/package-lock.json b/extensions/package-lock.json
new file mode 100644
index 00000000000..32a0865af3d
--- /dev/null
+++ b/extensions/package-lock.json
@@ -0,0 +1,630 @@
+{
+  "name": "vscode-extensions",
+  "version": "0.0.1",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "vscode-extensions",
+      "version": "0.0.1",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "dependencies": {
+        "typescript": "5.6.2"
+      },
+      "devDependencies": {
+        "@parcel/watcher": "2.1.0",
+        "esbuild": "0.23.0",
+        "vscode-grammar-updater": "^1.1.0"
+      }
+    },
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.23.0.tgz",
+      "integrity": "sha512-3sG8Zwa5fMcA9bgqB8AfWPQ+HFke6uD3h1s3RIwUNK8EG7a4buxvuFTs3j1IMs2NXAk9F30C/FF4vxRgQCcmoQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.23.0.tgz",
+      "integrity": "sha512-+KuOHTKKyIKgEEqKbGTK8W7mPp+hKinbMBeEnNzjJGyFcWsfrXjSTNluJHCY1RqhxFurdD8uNXQDei7qDlR6+g==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.23.0.tgz",
+      "integrity": "sha512-EuHFUYkAVfU4qBdyivULuu03FhJO4IJN9PGuABGrFy4vUuzk91P2d+npxHcFdpUnfYKy0PuV+n6bKIpHOB3prQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.23.0.tgz",
+      "integrity": "sha512-WRrmKidLoKDl56LsbBMhzTTBxrsVwTKdNbKDalbEZr0tcsBgCLbEtoNthOW6PX942YiYq8HzEnb4yWQMLQuipQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.23.0.tgz",
+      "integrity": "sha512-YLntie/IdS31H54Ogdn+v50NuoWF5BDkEUFpiOChVa9UnKpftgwzZRrI4J132ETIi+D8n6xh9IviFV3eXdxfow==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.23.0.tgz",
+      "integrity": "sha512-IMQ6eme4AfznElesHUPDZ+teuGwoRmVuuixu7sv92ZkdQcPbsNHzutd+rAfaBKo8YK3IrBEi9SLLKWJdEvJniQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.23.0.tgz",
+      "integrity": "sha512-0muYWCng5vqaxobq6LB3YNtevDFSAZGlgtLoAc81PjUfiFz36n4KMpwhtAd4he8ToSI3TGyuhyx5xmiWNYZFyw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.23.0.tgz",
+      "integrity": "sha512-XKDVu8IsD0/q3foBzsXGt/KjD/yTKBCIwOHE1XwiXmrRwrX6Hbnd5Eqn/WvDekddK21tfszBSrE/WMaZh+1buQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.23.0.tgz",
+      "integrity": "sha512-SEELSTEtOFu5LPykzA395Mc+54RMg1EUgXP+iw2SJ72+ooMwVsgfuwXo5Fn0wXNgWZsTVHwY2cg4Vi/bOD88qw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.23.0.tgz",
+      "integrity": "sha512-j1t5iG8jE7BhonbsEg5d9qOYcVZv/Rv6tghaXM/Ug9xahM0nX/H2gfu6X6z11QRTMT6+aywOMA8TDkhPo8aCGw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.23.0.tgz",
+      "integrity": "sha512-P7O5Tkh2NbgIm2R6x1zGJJsnacDzTFcRWZyTTMgFdVit6E98LTxO+v8LCCLWRvPrjdzXHx9FEOA8oAZPyApWUA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.23.0.tgz",
+      "integrity": "sha512-InQwepswq6urikQiIC/kkx412fqUZudBO4SYKu0N+tGhXRWUqAx+Q+341tFV6QdBifpjYgUndV1hhMq3WeJi7A==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.23.0.tgz",
+      "integrity": "sha512-J9rflLtqdYrxHv2FqXE2i1ELgNjT+JFURt/uDMoPQLcjWQA5wDKgQA4t/dTqGa88ZVECKaD0TctwsUfHbVoi4w==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.23.0.tgz",
+      "integrity": "sha512-cShCXtEOVc5GxU0fM+dsFD10qZ5UpcQ8AM22bYj0u/yaAykWnqXJDpd77ublcX6vdDsWLuweeuSNZk4yUxZwtw==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.23.0.tgz",
+      "integrity": "sha512-HEtaN7Y5UB4tZPeQmgz/UhzoEyYftbMXrBCUjINGjh3uil+rB/QzzpMshz3cNUxqXN7Vr93zzVtpIDL99t9aRw==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.23.0.tgz",
+      "integrity": "sha512-WDi3+NVAuyjg/Wxi+o5KPqRbZY0QhI9TjrEEm+8dmpY9Xir8+HE/HNx2JoLckhKbFopW0RdO2D72w8trZOV+Wg==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.23.0.tgz",
+      "integrity": "sha512-a3pMQhUEJkITgAw6e0bWA+F+vFtCciMjW/LPtoj99MhVt+Mfb6bbL9hu2wmTZgNd994qTAEw+U/r6k3qHWWaOQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.23.0.tgz",
+      "integrity": "sha512-cRK+YDem7lFTs2Q5nEv/HHc4LnrfBCbH5+JHu6wm2eP+d8OZNoSMYgPZJq78vqQ9g+9+nMuIsAO7skzphRXHyw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.23.0.tgz",
+      "integrity": "sha512-suXjq53gERueVWu0OKxzWqk7NxiUWSUlrxoZK7usiF50C6ipColGR5qie2496iKGYNLhDZkPxBI3erbnYkU0rQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.23.0.tgz",
+      "integrity": "sha512-6p3nHpby0DM/v15IFKMjAaayFhqnXV52aEmv1whZHX56pdkK+MEaLoQWj+H42ssFarP1PcomVhbsR4pkz09qBg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.23.0.tgz",
+      "integrity": "sha512-BFelBGfrBwk6LVrmFzCq1u1dZbG4zy/Kp93w2+y83Q5UGYF1d8sCzeLI9NXjKyujjBBniQa8R8PzLFAUrSM9OA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.23.0.tgz",
+      "integrity": "sha512-lY6AC8p4Cnb7xYHuIxQ6iYPe6MfO2CC43XXKo9nBXDb35krYt7KGhQnOkRGar5psxYkircpCqfbNDB4uJbS2jQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.23.0.tgz",
+      "integrity": "sha512-7L1bHlOTcO4ByvI7OXVI5pNN6HSu6pUQq9yodga8izeuB1KcT2UkHaH6118QJwopExPn0rMHIseCTx1CRo/uNA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.23.0.tgz",
+      "integrity": "sha512-Arm+WgUFLUATuoxCJcahGuk6Yj9Pzxd6l11Zb/2aAuv5kWWvvfhLFo2fni4uSK5vzlUdCGZ/BdV5tH8klj8p8g==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@parcel/watcher": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.1.0.tgz",
+      "integrity": "sha512-8s8yYjd19pDSsBpbkOHnT6Z2+UJSuLQx61pCFM0s5wSRvKCEMDjd/cHY3/GI1szHIWbpXpsJdg3V6ISGGx9xDw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "is-glob": "^4.0.3",
+        "micromatch": "^4.0.5",
+        "node-addon-api": "^3.2.1",
+        "node-gyp-build": "^4.3.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "dev": true,
+      "dependencies": {
+        "fill-range": "^7.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/coffeescript": {
+      "version": "1.12.7",
+      "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-1.12.7.tgz",
+      "integrity": "sha512-pLXHFxQMPklVoEekowk8b3erNynC+DVJzChxS/LCBBgR6/8AJkHivkm//zbowcfc7BTCAjryuhx6gPqPRfsFoA==",
+      "dev": true,
+      "bin": {
+        "cake": "bin/cake",
+        "coffee": "bin/coffee"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/cson-parser": {
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/cson-parser/-/cson-parser-4.0.9.tgz",
+      "integrity": "sha512-I79SAcCYquWnEfXYj8hBqOOWKj6eH6zX1hhX3yqmS4K3bYp7jME3UFpHPzu3rUew0oyfc0s8T6IlWGXRAheHag==",
+      "dev": true,
+      "dependencies": {
+        "coffeescript": "1.12.7"
+      },
+      "engines": {
+        "node": ">=10.13"
+      }
+    },
+    "node_modules/esbuild": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.23.0.tgz",
+      "integrity": "sha512-1lvV17H2bMYda/WaFb2jLPeHU3zml2k4/yagNMG8Q/YtfMjCwEUZa2eXXMgZTVSL5q1n4H7sQ0X6CdJDqqeCFA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.23.0",
+        "@esbuild/android-arm": "0.23.0",
+        "@esbuild/android-arm64": "0.23.0",
+        "@esbuild/android-x64": "0.23.0",
+        "@esbuild/darwin-arm64": "0.23.0",
+        "@esbuild/darwin-x64": "0.23.0",
+        "@esbuild/freebsd-arm64": "0.23.0",
+        "@esbuild/freebsd-x64": "0.23.0",
+        "@esbuild/linux-arm": "0.23.0",
+        "@esbuild/linux-arm64": "0.23.0",
+        "@esbuild/linux-ia32": "0.23.0",
+        "@esbuild/linux-loong64": "0.23.0",
+        "@esbuild/linux-mips64el": "0.23.0",
+        "@esbuild/linux-ppc64": "0.23.0",
+        "@esbuild/linux-riscv64": "0.23.0",
+        "@esbuild/linux-s390x": "0.23.0",
+        "@esbuild/linux-x64": "0.23.0",
+        "@esbuild/netbsd-x64": "0.23.0",
+        "@esbuild/openbsd-arm64": "0.23.0",
+        "@esbuild/openbsd-x64": "0.23.0",
+        "@esbuild/sunos-x64": "0.23.0",
+        "@esbuild/win32-arm64": "0.23.0",
+        "@esbuild/win32-ia32": "0.23.0",
+        "@esbuild/win32-x64": "0.23.0"
+      }
+    },
+    "node_modules/fast-plist": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/fast-plist/-/fast-plist-0.1.2.tgz",
+      "integrity": "sha1-pFr/NFGWAG1AbKbNzQX2kFHvNbg= sha512-2HxzrqJhmMoxVzARjYFvkzkL2dCBB8sogU5sD8gqcZWv5UCivK9/cXM9KIPDRwU+eD3mbRDN/GhW8bO/4dtMfg==",
+      "dev": true
+    },
+    "node_modules/fill-range": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "dev": true,
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "braces": "^3.0.3",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/node-addon-api": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
+      "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
+      "dev": true
+    },
+    "node_modules/node-gyp-build": {
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.1.tgz",
+      "integrity": "sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw==",
+      "dev": true,
+      "bin": {
+        "node-gyp-build": "bin.js",
+        "node-gyp-build-optional": "optional.js",
+        "node-gyp-build-test": "build-test.js"
+      }
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "5.6.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz",
+      "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
+    "node_modules/vscode-grammar-updater": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/vscode-grammar-updater/-/vscode-grammar-updater-1.1.0.tgz",
+      "integrity": "sha512-rWcJXyEFK27Mh9bxfBTLaul0KiGQk0GMXj2qTDH9cy3UZVx5MrF035B03os1w4oIXwl/QDhdLnsBK0j2SNiL1A==",
+      "dev": true,
+      "dependencies": {
+        "cson-parser": "^4.0.9",
+        "fast-plist": "0.1.2"
+      },
+      "bin": {
+        "vscode-grammar-updater": "bin.js"
+      }
+    }
+  }
+}
diff --git a/extensions/package.json b/extensions/package.json
index 5475af18d40..5cd6099229c 100644
--- a/extensions/package.json
+++ b/extensions/package.json
@@ -4,14 +4,14 @@
   "license": "MIT",
   "description": "Dependencies shared by all extensions",
   "dependencies": {
-    "typescript": "^5.5.0-dev.20240603"
+    "typescript": "5.6.2"
   },
   "scripts": {
     "postinstall": "node ./postinstall.mjs"
   },
   "devDependencies": {
     "@parcel/watcher": "2.1.0",
-    "esbuild": "0.20.0",
+    "esbuild": "0.23.0",
     "vscode-grammar-updater": "^1.1.0"
   },
   "resolutions": {
diff --git a/extensions/perl/cgmanifest.json b/extensions/perl/cgmanifest.json
index cd175abe37d..b7c850dd1aa 100644
--- a/extensions/perl/cgmanifest.json
+++ b/extensions/perl/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "textmate/perl.tmbundle",
 					"repositoryUrl": "https://github.com/textmate/perl.tmbundle",
-					"commitHash": "a85927a902d6e5d7805f56a653f324d34dfad53a"
+					"commitHash": "d9841a0878239fa43f88c640f8d458590f97e8f5"
 				}
 			},
 			"licenseDetail": [
diff --git a/extensions/perl/yarn.lock b/extensions/perl/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/perl/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/php-language-features/.npmrc b/extensions/php-language-features/.npmrc
new file mode 100644
index 00000000000..a9c57709666
--- /dev/null
+++ b/extensions/php-language-features/.npmrc
@@ -0,0 +1,2 @@
+legacy-peer-deps="true"
+timeout=180000
diff --git a/extensions/php-language-features/.vscodeignore b/extensions/php-language-features/.vscodeignore
index e45d470b4dd..e326d20ef52 100644
--- a/extensions/php-language-features/.vscodeignore
+++ b/extensions/php-language-features/.vscodeignore
@@ -3,4 +3,4 @@ src/**
 out/**
 tsconfig.json
 extension.webpack.config.js
-yarn.lock
+package-lock.json
diff --git a/extensions/php-language-features/package-lock.json b/extensions/php-language-features/package-lock.json
new file mode 100644
index 00000000000..21fdb6b8e9f
--- /dev/null
+++ b/extensions/php-language-features/package-lock.json
@@ -0,0 +1,63 @@
+{
+  "name": "php-language-features",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "php-language-features",
+      "version": "1.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "which": "^2.0.2"
+      },
+      "devDependencies": {
+        "@types/node": "20.x",
+        "@types/which": "^2.0.0"
+      },
+      "engines": {
+        "vscode": "0.10.x"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "20.11.24",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
+      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/@types/which": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/which/-/which-2.0.0.tgz",
+      "integrity": "sha512-JHTNOEpZnACQdsTojWggn+SQ8IucfqEhtz7g8Z0G67WdSj4x3F0X5I2c/CVcl8z/QukGrIHeQ/N49v1au74XFQ==",
+      "dev": true
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    }
+  }
+}
diff --git a/extensions/php-language-features/yarn.lock b/extensions/php-language-features/yarn.lock
deleted file mode 100644
index ea9947b69e3..00000000000
--- a/extensions/php-language-features/yarn.lock
+++ /dev/null
@@ -1,32 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@types/node@20.x":
-  version "20.11.24"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792"
-  integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==
-  dependencies:
-    undici-types "~5.26.4"
-
-"@types/which@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@types/which/-/which-2.0.0.tgz#446d35586611dee657120de8e0457382a658fc25"
-  integrity sha512-JHTNOEpZnACQdsTojWggn+SQ8IucfqEhtz7g8Z0G67WdSj4x3F0X5I2c/CVcl8z/QukGrIHeQ/N49v1au74XFQ==
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
-
-which@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
-  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
-  dependencies:
-    isexe "^2.0.0"
diff --git a/extensions/php/yarn.lock b/extensions/php/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/php/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/postinstall.mjs b/extensions/postinstall.mjs
index 04e54dd6e2c..f073aa720c9 100644
--- a/extensions/postinstall.mjs
+++ b/extensions/postinstall.mjs
@@ -26,7 +26,10 @@ function processRoot() {
 function processLib() {
 	const toDelete = new Set([
 		'tsc.js',
+		'_tsc.js',
+
 		'typescriptServices.js',
+		'_typescriptServices.js',
 	]);
 
 	const libRoot = path.join(root, 'lib');
diff --git a/extensions/powershell/yarn.lock b/extensions/powershell/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/powershell/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/pug/yarn.lock b/extensions/pug/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/pug/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/python/cgmanifest.json b/extensions/python/cgmanifest.json
index 37a21b2de54..ace7056c995 100644
--- a/extensions/python/cgmanifest.json
+++ b/extensions/python/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "MagicStack/MagicPython",
 					"repositoryUrl": "https://github.com/MagicStack/MagicPython",
-					"commitHash": "c9b3409deb69acec31bbf7913830e93a046b30cc"
+					"commitHash": "7d0f2b22a5ad8fccbd7341bc7b7a715169283044"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/python/yarn.lock b/extensions/python/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/python/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/r/cgmanifest.json b/extensions/r/cgmanifest.json
index b1ccd271d81..7f012c6076e 100644
--- a/extensions/r/cgmanifest.json
+++ b/extensions/r/cgmanifest.json
@@ -6,11 +6,11 @@
 				"git": {
 					"name": "REditorSupport/vscode-R",
 					"repositoryUrl": "https://github.com/REditorSupport/vscode-R",
-					"commitHash": "ad966f3b2de8a83594f90aa5b51f5b569cf02c08"
+					"commitHash": "c937cdd39982995d8ee1f1125919f7c2d150b35d"
 				}
 			},
 			"license": "MIT",
-			"version": "2.8.1"
+			"version": "2.8.4"
 		}
 	],
 	"version": 1
diff --git a/extensions/r/syntaxes/r.tmLanguage.json b/extensions/r/syntaxes/r.tmLanguage.json
index d50ab5b6d78..dcdc9622bf7 100644
--- a/extensions/r/syntaxes/r.tmLanguage.json
+++ b/extensions/r/syntaxes/r.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/REditorSupport/vscode-R/commit/ad966f3b2de8a83594f90aa5b51f5b569cf02c08",
+	"version": "https://github.com/REditorSupport/vscode-R/commit/c937cdd39982995d8ee1f1125919f7c2d150b35d",
 	"name": "R",
 	"scopeName": "source.r",
 	"patterns": [
@@ -158,14 +158,6 @@
 				{
 					"match": "\\b([[:alnum:]_]+)(?=::)",
 					"name": "entity.namespace.r"
-				},
-				{
-					"match": "\\b([[:alnum:]._]+)\\b",
-					"name": "variable.other.r"
-				},
-				{
-					"match": "(`[^`]+`)",
-					"name": "variable.other.r"
 				}
 			]
 		},
diff --git a/extensions/r/yarn.lock b/extensions/r/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/r/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/razor/yarn.lock b/extensions/razor/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/razor/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/references-view/.npmrc b/extensions/references-view/.npmrc
new file mode 100644
index 00000000000..a9c57709666
--- /dev/null
+++ b/extensions/references-view/.npmrc
@@ -0,0 +1,2 @@
+legacy-peer-deps="true"
+timeout=180000
diff --git a/extensions/references-view/.vscodeignore b/extensions/references-view/.vscodeignore
index f6a15ed8447..4d2ffa699e4 100644
--- a/extensions/references-view/.vscodeignore
+++ b/extensions/references-view/.vscodeignore
@@ -3,4 +3,4 @@ src/**
 out/**
 tsconfig.json
 *.webpack.config.js
-yarn.lock
+package-lock.json
diff --git a/extensions/references-view/package-lock.json b/extensions/references-view/package-lock.json
new file mode 100644
index 00000000000..bb5c5e10e1f
--- /dev/null
+++ b/extensions/references-view/package-lock.json
@@ -0,0 +1,34 @@
+{
+  "name": "references-view",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "references-view",
+      "version": "1.0.0",
+      "license": "MIT",
+      "devDependencies": {
+        "@types/node": "20.x"
+      },
+      "engines": {
+        "vscode": "^1.67.0"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "20.11.24",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
+      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    }
+  }
+}
diff --git a/extensions/references-view/src/references/model.ts b/extensions/references-view/src/references/model.ts
index 33b5c497f1e..e6c4e23ab93 100644
--- a/extensions/references-view/src/references/model.ts
+++ b/extensions/references-view/src/references/model.ts
@@ -20,7 +20,7 @@ export class ReferencesTreeInput implements SymbolTreeInput<FileItem | Reference
 		this.contextValue = _command;
 	}
 
-	async resolve() {
+	async resolve(): Promise<SymbolTreeModel<FileItem | ReferenceItem> | undefined> {
 
 		let model: ReferencesModel;
 		if (this._result) {
@@ -35,8 +35,7 @@ export class ReferencesTreeInput implements SymbolTreeInput<FileItem | Reference
 		}
 
 		const provider = new ReferencesTreeDataProvider(model);
-
-		return <SymbolTreeModel<FileItem | ReferenceItem>>{
+		return {
 			provider,
 			get message() { return model.message; },
 			navigation: model,
@@ -302,7 +301,7 @@ class ReferencesTreeDataProvider implements vscode.TreeDataProvider<FileItem | R
 				title: vscode.l10n.t('Open Reference'),
 				arguments: [
 					element.location.uri,
-					<vscode.TextDocumentShowOptions>{ selection: range.with({ end: range.start }) }
+					{ selection: range.with({ end: range.start }) } satisfies vscode.TextDocumentShowOptions
 				]
 			};
 			return result;
diff --git a/extensions/references-view/src/tree.ts b/extensions/references-view/src/tree.ts
index 9432fd2a80f..4a6bf189675 100644
--- a/extensions/references-view/src/tree.ts
+++ b/extensions/references-view/src/tree.ts
@@ -276,11 +276,11 @@ class TreeInputHistory implements vscode.TreeDataProvider<HistoryItem> {
 					item: HistoryItem;
 				}
 				const entries = await this.getChildren();
-				const picks = entries.map(item => <HistoryPick>{
+				const picks = entries.map((item): HistoryPick => ({
 					label: item.word,
 					description: item.description,
 					item
-				});
+				}));
 				const pick = await vscode.window.showQuickPick(picks, { placeHolder: vscode.l10n.t('Select previous reference search') });
 				if (pick) {
 					this._reRunHistoryItem(pick.item);
diff --git a/extensions/references-view/src/types/model.ts b/extensions/references-view/src/types/model.ts
index 89dd001df55..623c41c8d5f 100644
--- a/extensions/references-view/src/types/model.ts
+++ b/extensions/references-view/src/types/model.ts
@@ -177,7 +177,7 @@ class TypeItemDataProvider implements vscode.TreeDataProvider<TypeItem> {
 			title: vscode.l10n.t('Open Type'),
 			arguments: [
 				element.item.uri,
-				<vscode.TextDocumentShowOptions>{ selection: element.item.selectionRange.with({ end: element.item.selectionRange.start }) }
+				{ selection: element.item.selectionRange.with({ end: element.item.selectionRange.start }) } satisfies vscode.TextDocumentShowOptions
 			]
 		};
 		item.collapsibleState = vscode.TreeItemCollapsibleState.Collapsed;
diff --git a/extensions/references-view/yarn.lock b/extensions/references-view/yarn.lock
deleted file mode 100644
index 1f4b6c2e8b4..00000000000
--- a/extensions/references-view/yarn.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@types/node@20.x":
-  version "20.11.24"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792"
-  integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==
-  dependencies:
-    undici-types "~5.26.4"
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
diff --git a/extensions/restructuredtext/yarn.lock b/extensions/restructuredtext/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/restructuredtext/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/ruby/yarn.lock b/extensions/ruby/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/ruby/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/rust/cgmanifest.json b/extensions/rust/cgmanifest.json
index 4149933544e..a0eb585e052 100644
--- a/extensions/rust/cgmanifest.json
+++ b/extensions/rust/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "rust-syntax",
 					"repositoryUrl": "https://github.com/dustypomerleau/rust-syntax",
-					"commitHash": "cf3c686a50295380ce9994218138691f8767870c"
+					"commitHash": "e90d3dbdb61b96e4afdce6f7a3572426b1a86d9d"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/rust/syntaxes/rust.tmLanguage.json b/extensions/rust/syntaxes/rust.tmLanguage.json
index dcf4c44f8fd..16307e72a6a 100644
--- a/extensions/rust/syntaxes/rust.tmLanguage.json
+++ b/extensions/rust/syntaxes/rust.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/dustypomerleau/rust-syntax/commit/cf3c686a50295380ce9994218138691f8767870c",
+	"version": "https://github.com/dustypomerleau/rust-syntax/commit/e90d3dbdb61b96e4afdce6f7a3572426b1a86d9d",
 	"name": "Rust",
 	"scopeName": "source.rust",
 	"patterns": [
@@ -482,10 +482,13 @@
 							"name": "punctuation.brackets.angle.rust"
 						}
 					},
-					"end": "\\{|;",
+					"end": "(\\{)|(;)",
 					"endCaptures": {
-						"0": {
+						"1": {
 							"name": "punctuation.brackets.curly.rust"
+						},
+						"2": {
+							"name": "punctuation.semi.rust"
 						}
 					},
 					"patterns": [
@@ -820,7 +823,7 @@
 				{
 					"comment": "dashrocket, skinny arrow",
 					"name": "keyword.operator.arrow.skinny.rust",
-					"match": "->"
+					"match": "->|<-"
 				},
 				{
 					"comment": "hashrocket, fat arrow",
diff --git a/extensions/rust/yarn.lock b/extensions/rust/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/rust/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/scss/yarn.lock b/extensions/scss/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/scss/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/search-result/.vscodeignore b/extensions/search-result/.vscodeignore
index aa993f50a1d..35b808e16f7 100644
--- a/extensions/search-result/.vscodeignore
+++ b/extensions/search-result/.vscodeignore
@@ -3,5 +3,5 @@ out/**
 tsconfig.json
 extension.webpack.config.js
 extension-browser.webpack.config.js
-yarn.lock
+package-lock.json
 syntaxes/generateTMLanguage.js
diff --git a/extensions/search-result/package-lock.json b/extensions/search-result/package-lock.json
new file mode 100644
index 00000000000..4fbe8b97ef8
--- /dev/null
+++ b/extensions/search-result/package-lock.json
@@ -0,0 +1,16 @@
+{
+  "name": "search-result",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "search-result",
+      "version": "1.0.0",
+      "license": "MIT",
+      "engines": {
+        "vscode": "^1.39.0"
+      }
+    }
+  }
+}
diff --git a/extensions/search-result/yarn.lock b/extensions/search-result/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/search-result/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/shaderlab/yarn.lock b/extensions/shaderlab/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/shaderlab/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/shared.webpack.config.js b/extensions/shared.webpack.config.js
index 81eb0ffd1ce..6e5b9fd95ac 100644
--- a/extensions/shared.webpack.config.js
+++ b/extensions/shared.webpack.config.js
@@ -12,7 +12,6 @@ const path = require('path');
 const fs = require('fs');
 const merge = require('merge-options');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
-const { NLSBundlePlugin } = require('vscode-nls-dev/lib/webpack-bundler');
 const { DefinePlugin, optimize } = require('webpack');
 
 const tsLoaderOptions = {
@@ -40,13 +39,6 @@ function withNodeDefaults(/**@type WebpackConfig & { context: string }*/extConfi
 				test: /\.ts$/,
 				exclude: /node_modules/,
 				use: [{
-					// vscode-nls-dev loader:
-					// * rewrite nls-calls
-					loader: 'vscode-nls-dev/lib/webpack-loader',
-					options: {
-						base: path.join(extConfig.context, 'src')
-					}
-				}, {
 					// configure TypeScript loader:
 					// * enable sources maps for end-to-end source maps
 					loader: 'ts-loader',
@@ -97,8 +89,7 @@ function nodePlugins(context) {
 			patterns: [
 				{ from: 'src', to: '.', globOptions: { ignore: ['**/test/**', '**/*.ts'] }, noErrorOnMissing: true }
 			]
-		}),
-		new NLSBundlePlugin(id)
+		})
 	];
 }
 /**
@@ -117,6 +108,7 @@ function withBrowserDefaults(/**@type WebpackConfig & { context: string }*/extCo
 			extensions: ['.ts', '.js'], // support ts-files and js-files
 			fallback: {
 				'path': require.resolve('path-browserify'),
+				'os': require.resolve('os-browserify'),
 				'util': require.resolve('util')
 			}
 		},
@@ -195,9 +187,7 @@ function browserPlugins(context) {
 			'process.platform': JSON.stringify('web'),
 			'process.env': JSON.stringify({}),
 			'process.env.BROWSER_ENV': JSON.stringify('true')
-		}),
-		// TODO: bring this back once vscode-nls-dev supports browser
-		// new NLSBundlePlugin(id)
+		})
 	];
 }
 
diff --git a/extensions/shellscript/cgmanifest.json b/extensions/shellscript/cgmanifest.json
index 48f939ecc45..73c65b96f2c 100644
--- a/extensions/shellscript/cgmanifest.json
+++ b/extensions/shellscript/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "jeff-hykin/better-shell-syntax",
 					"repositoryUrl": "https://github.com/jeff-hykin/better-shell-syntax",
-					"commitHash": "6d0bc37a6b8023a5fddf75bd2b4eb1e1f962e4c2"
+					"commitHash": "35020b0bd79a90d3b262b4c13a8bb0b33adc1f45"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/shellscript/package.json b/extensions/shellscript/package.json
index 6f9e7072ab8..93333abd313 100644
--- a/extensions/shellscript/package.json
+++ b/extensions/shellscript/package.json
@@ -34,6 +34,7 @@
           ".bash_profile",
           ".bash_login",
           ".ebuild",
+          ".eclass",
           ".profile",
           ".bash_logout",
           ".xprofile",
diff --git a/extensions/shellscript/syntaxes/shell-unix-bash.tmLanguage.json b/extensions/shellscript/syntaxes/shell-unix-bash.tmLanguage.json
index 7aae970d227..255638d7db7 100644
--- a/extensions/shellscript/syntaxes/shell-unix-bash.tmLanguage.json
+++ b/extensions/shellscript/syntaxes/shell-unix-bash.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/jeff-hykin/better-shell-syntax/commit/6d0bc37a6b8023a5fddf75bd2b4eb1e1f962e4c2",
+	"version": "https://github.com/jeff-hykin/better-shell-syntax/commit/35020b0bd79a90d3b262b4c13a8bb0b33adc1f45",
 	"name": "Shell Script",
 	"scopeName": "source.shell",
 	"patterns": [
@@ -1547,7 +1547,7 @@
 					"include": "#subshell_dollar"
 				},
 				{
-					"begin": "(?<![^ \\t])({)",
+					"begin": "(?<![^ \\t])({)(?!\\w|\\$)",
 					"end": "}",
 					"beginCaptures": {
 						"1": {
diff --git a/extensions/shellscript/yarn.lock b/extensions/shellscript/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/shellscript/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/simple-browser/.npmrc b/extensions/simple-browser/.npmrc
new file mode 100644
index 00000000000..a9c57709666
--- /dev/null
+++ b/extensions/simple-browser/.npmrc
@@ -0,0 +1,2 @@
+legacy-peer-deps="true"
+timeout=180000
diff --git a/extensions/simple-browser/.vscodeignore b/extensions/simple-browser/.vscodeignore
index d1006b25b79..c69acedcc24 100644
--- a/extensions/simple-browser/.vscodeignore
+++ b/extensions/simple-browser/.vscodeignore
@@ -8,7 +8,7 @@ extension.webpack.config.js
 extension-browser.webpack.config.js
 cgmanifest.json
 .gitignore
-yarn.lock
+package-lock.json
 preview-src/**
 webpack.config.js
 esbuild-preview.js
diff --git a/extensions/simple-browser/package-lock.json b/extensions/simple-browser/package-lock.json
new file mode 100644
index 00000000000..b5d97e00873
--- /dev/null
+++ b/extensions/simple-browser/package-lock.json
@@ -0,0 +1,163 @@
+{
+  "name": "simple-browser",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "simple-browser",
+      "version": "1.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "@vscode/extension-telemetry": "^0.9.0"
+      },
+      "devDependencies": {
+        "@types/vscode-webview": "^1.57.0",
+        "vscode-codicons": "^0.0.14"
+      },
+      "engines": {
+        "vscode": "^1.70.0"
+      }
+    },
+    "node_modules/@microsoft/1ds-core-js": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.0.3.tgz",
+      "integrity": "sha512-FrxNLVAPsAvD7+l63TlNS/Kodvpct2WulpDSn1dI4Xuy0kF4E2H867kHdwL/iY1Bj3zA3FSy/jvE4+OcDws7ug==",
+      "dependencies": {
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/1ds-post-js": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.0.3.tgz",
+      "integrity": "sha512-uewvmUtXKd7ttypiKQGdYI6i7UUpPkOznLayzIFrJ4r2xnG6jhPjpKRncHFXPQcM4XSWO3yf5PQ3xAbPq9t7ZQ==",
+      "dependencies": {
+        "@microsoft/1ds-core-js": "4.0.3",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-channel-js": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.0.4.tgz",
+      "integrity": "sha512-6TlfExmErQ8Y+/ChbkyWl+jyt4wg3T6p7lwXDsUCB0LgZmlEWMaCUS0YlT73JCWmE8j7vxW8yUm0lgsgmHns3A==",
+      "dependencies": {
+        "@microsoft/applicationinsights-common": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-common": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.0.4.tgz",
+      "integrity": "sha512-r5gWaw/K9+tKfuo2GtDiDiKASgOkPOCrKW+wZzFvuR06uuwvWjbVQ6yW/YbnfuhRF5M65ksUiMi0eCMwEOGq7Q==",
+      "dependencies": {
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-core-js": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.0.4.tgz",
+      "integrity": "sha512-anxy5kEkqBmVoEqJiJzaaXXA0wzqZi9U4zGd05xFJ04lWckP8dG3zyT3+GGdg7rDelqLTNGxndeYoFmDv63u1g==",
+      "dependencies": {
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-shims": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
+      "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-web-basic": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.0.4.tgz",
+      "integrity": "sha512-KfoxPlLlf0JT12ADb23C5iGye/yFouoMgHEKULxkSQcYY9SsW/8rVrqqvoYKAL+u215CZU2A8Kc8sR3ehEaPCQ==",
+      "dependencies": {
+        "@microsoft/applicationinsights-channel-js": "3.0.4",
+        "@microsoft/applicationinsights-common": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/dynamicproto-js": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.2.tgz",
+      "integrity": "sha512-MB8trWaFREpmb037k/d0bB7T2BP7Ai24w1e1tbz3ASLB0/lwphsq3Nq8S9I5AsI5vs4zAQT+SB5nC5/dLYTiOg==",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+      }
+    },
+    "node_modules/@nevware21/ts-async": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.3.0.tgz",
+      "integrity": "sha512-ZUcgUH12LN/F6nzN0cYd0F/rJaMLmXr0EHVTyYfaYmK55bdwE4338uue4UiVoRqHVqNW4KDUrJc49iGogHKeWA==",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.10.0 < 2.x"
+      }
+    },
+    "node_modules/@nevware21/ts-utils": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.10.1.tgz",
+      "integrity": "sha512-pMny25NnF2/MJwdqC3Iyjm2pGIXNxni4AROpcqDeWa+td9JMUY4bUS9uU9XW+BoBRqTLUL+WURF9SOd/6OQzRg=="
+    },
+    "node_modules/@types/vscode-webview": {
+      "version": "1.57.0",
+      "resolved": "https://registry.npmjs.org/@types/vscode-webview/-/vscode-webview-1.57.0.tgz",
+      "integrity": "sha512-x3Cb/SMa1IwRHfSvKaZDZOTh4cNoG505c3NjTqGlMC082m++x/ETUmtYniDsw6SSmYzZXO8KBNhYxR0+VqymqA==",
+      "dev": true
+    },
+    "node_modules/@vscode/extension-telemetry": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.0.tgz",
+      "integrity": "sha512-37RxGHXrs3GoXPgCUKQhghEu0gxs8j27RLjQwwtSf4WhPdJKz8UrqMYzpsXlliQ05zURYmtdGZst9C6+hfWXaQ==",
+      "dependencies": {
+        "@microsoft/1ds-core-js": "^4.0.3",
+        "@microsoft/1ds-post-js": "^4.0.3",
+        "@microsoft/applicationinsights-web-basic": "^3.0.4"
+      },
+      "engines": {
+        "vscode": "^1.75.0"
+      }
+    },
+    "node_modules/vscode-codicons": {
+      "version": "0.0.14",
+      "resolved": "https://registry.npmjs.org/vscode-codicons/-/vscode-codicons-0.0.14.tgz",
+      "integrity": "sha512-6CEH5KT9ct5WMw7n5dlX7rB8ya4CUI2FSq1Wk36XaW+c5RglFtAanUV0T+gvZVVFhl/WxfjTvFHq06Hz9c1SLA==",
+      "deprecated": "This package is deprecated, please use @vscode/codicons https://www.npmjs.com/package/@vscode/codicons",
+      "dev": true
+    }
+  }
+}
diff --git a/extensions/simple-browser/yarn.lock b/extensions/simple-browser/yarn.lock
deleted file mode 100644
index 54a1dc8fdab..00000000000
--- a/extensions/simple-browser/yarn.lock
+++ /dev/null
@@ -1,115 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@microsoft/1ds-core-js@4.0.3", "@microsoft/1ds-core-js@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@microsoft/1ds-core-js/-/1ds-core-js-4.0.3.tgz#c8a92c623745a9595e06558a866658480c33bdf9"
-  integrity sha512-FrxNLVAPsAvD7+l63TlNS/Kodvpct2WulpDSn1dI4Xuy0kF4E2H867kHdwL/iY1Bj3zA3FSy/jvE4+OcDws7ug==
-  dependencies:
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/1ds-post-js@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@microsoft/1ds-post-js/-/1ds-post-js-4.0.3.tgz#cfcb20bb23fb6215d3f0732f60f5b7df3e624f86"
-  integrity sha512-uewvmUtXKd7ttypiKQGdYI6i7UUpPkOznLayzIFrJ4r2xnG6jhPjpKRncHFXPQcM4XSWO3yf5PQ3xAbPq9t7ZQ==
-  dependencies:
-    "@microsoft/1ds-core-js" "4.0.3"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-channel-js@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.0.4.tgz#247b6fe2158fad9826cbcdf7304f885766b36624"
-  integrity sha512-6TlfExmErQ8Y+/ChbkyWl+jyt4wg3T6p7lwXDsUCB0LgZmlEWMaCUS0YlT73JCWmE8j7vxW8yUm0lgsgmHns3A==
-  dependencies:
-    "@microsoft/applicationinsights-common" "3.0.4"
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-common@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-common/-/applicationinsights-common-3.0.4.tgz#c4aa53ba343f5b3c7fbf54cddd3c86a5bdcd95dc"
-  integrity sha512-r5gWaw/K9+tKfuo2GtDiDiKASgOkPOCrKW+wZzFvuR06uuwvWjbVQ6yW/YbnfuhRF5M65ksUiMi0eCMwEOGq7Q==
-  dependencies:
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-core-js@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.0.4.tgz#008308b786930d94a1de8a1fbb4af0351b74653e"
-  integrity sha512-anxy5kEkqBmVoEqJiJzaaXXA0wzqZi9U4zGd05xFJ04lWckP8dG3zyT3+GGdg7rDelqLTNGxndeYoFmDv63u1g==
-  dependencies:
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-shims@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz#3865b73ace8405b9c4618cc5c571f2fe3876f06f"
-  integrity sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==
-  dependencies:
-    "@nevware21/ts-utils" ">= 0.9.4 < 2.x"
-
-"@microsoft/applicationinsights-web-basic@^3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.0.4.tgz#9a23323276b4a5a0dc6a352e2de5d75e3c16b534"
-  integrity sha512-KfoxPlLlf0JT12ADb23C5iGye/yFouoMgHEKULxkSQcYY9SsW/8rVrqqvoYKAL+u215CZU2A8Kc8sR3ehEaPCQ==
-  dependencies:
-    "@microsoft/applicationinsights-channel-js" "3.0.4"
-    "@microsoft/applicationinsights-common" "3.0.4"
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/dynamicproto-js@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.2.tgz#e57fbec2e7067d48b7e8e1e1c1d354028ef718a6"
-  integrity sha512-MB8trWaFREpmb037k/d0bB7T2BP7Ai24w1e1tbz3ASLB0/lwphsq3Nq8S9I5AsI5vs4zAQT+SB5nC5/dLYTiOg==
-  dependencies:
-    "@nevware21/ts-utils" ">= 0.9.4 < 2.x"
-
-"@nevware21/ts-async@>= 0.3.0 < 2.x":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@nevware21/ts-async/-/ts-async-0.3.0.tgz#a8b97ba01065fc930de9a3f4dd4a05e862becc6c"
-  integrity sha512-ZUcgUH12LN/F6nzN0cYd0F/rJaMLmXr0EHVTyYfaYmK55bdwE4338uue4UiVoRqHVqNW4KDUrJc49iGogHKeWA==
-  dependencies:
-    "@nevware21/ts-utils" ">= 0.10.0 < 2.x"
-
-"@nevware21/ts-utils@>= 0.10.0 < 2.x", "@nevware21/ts-utils@>= 0.10.1 < 2.x", "@nevware21/ts-utils@>= 0.9.4 < 2.x":
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@nevware21/ts-utils/-/ts-utils-0.10.1.tgz#aa65abc71eba06749a396598f22263d26f796ac7"
-  integrity sha512-pMny25NnF2/MJwdqC3Iyjm2pGIXNxni4AROpcqDeWa+td9JMUY4bUS9uU9XW+BoBRqTLUL+WURF9SOd/6OQzRg==
-
-"@types/vscode-webview@^1.57.0":
-  version "1.57.0"
-  resolved "https://registry.yarnpkg.com/@types/vscode-webview/-/vscode-webview-1.57.0.tgz#bad5194d45ae8d03afc1c0f67f71ff5e7a243bbf"
-  integrity sha512-x3Cb/SMa1IwRHfSvKaZDZOTh4cNoG505c3NjTqGlMC082m++x/ETUmtYniDsw6SSmYzZXO8KBNhYxR0+VqymqA==
-
-"@vscode/extension-telemetry@^0.9.0":
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.9.0.tgz#8c6c61e253ff304f46045f04edd60059b144417a"
-  integrity sha512-37RxGHXrs3GoXPgCUKQhghEu0gxs8j27RLjQwwtSf4WhPdJKz8UrqMYzpsXlliQ05zURYmtdGZst9C6+hfWXaQ==
-  dependencies:
-    "@microsoft/1ds-core-js" "^4.0.3"
-    "@microsoft/1ds-post-js" "^4.0.3"
-    "@microsoft/applicationinsights-web-basic" "^3.0.4"
-
-vscode-codicons@^0.0.14:
-  version "0.0.14"
-  resolved "https://registry.yarnpkg.com/vscode-codicons/-/vscode-codicons-0.0.14.tgz#e0d05418e2e195564ff6f6a2199d70415911c18f"
-  integrity sha512-6CEH5KT9ct5WMw7n5dlX7rB8ya4CUI2FSq1Wk36XaW+c5RglFtAanUV0T+gvZVVFhl/WxfjTvFHq06Hz9c1SLA==
diff --git a/extensions/sql/package.json b/extensions/sql/package.json
index c048da78d1c..5c467297f81 100644
--- a/extensions/sql/package.json
+++ b/extensions/sql/package.json
@@ -21,7 +21,8 @@
           ".dsql"
         ],
         "aliases": [
-          "SQL"
+          "MS SQL",
+          "T-SQL"
         ],
         "configuration": "./language-configuration.json"
       }
diff --git a/extensions/sql/yarn.lock b/extensions/sql/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/sql/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/swift/cgmanifest.json b/extensions/swift/cgmanifest.json
index 816621e4170..cb1ca02310f 100644
--- a/extensions/swift/cgmanifest.json
+++ b/extensions/swift/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "jtbandes/swift-tmlanguage",
 					"repositoryUrl": "https://github.com/jtbandes/swift-tmlanguage",
-					"commitHash": "ab893c684dd7eeb7c249139e29e931334316fda7"
+					"commitHash": "860eface4241cf9f2174d5fa690bd34389ac8d26"
 				}
 			},
 			"license": "MIT"
diff --git a/extensions/swift/syntaxes/swift.tmLanguage.json b/extensions/swift/syntaxes/swift.tmLanguage.json
index 6259b151369..b18b340f2c6 100644
--- a/extensions/swift/syntaxes/swift.tmLanguage.json
+++ b/extensions/swift/syntaxes/swift.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/jtbandes/swift-tmlanguage/commit/ab893c684dd7eeb7c249139e29e931334316fda7",
+	"version": "https://github.com/jtbandes/swift-tmlanguage/commit/860eface4241cf9f2174d5fa690bd34389ac8d26",
 	"name": "Swift",
 	"scopeName": "source.swift",
 	"comment": "See swift.tmbundle/grammar-test.swift for test cases.",
@@ -52,7 +52,7 @@
 					},
 					"patterns": [
 						{
-							"match": "\\b(swift|(?:iOS|macOS|OSX|watchOS|tvOS|UIKitForMac)(?:ApplicationExtension)?)\\b(?:\\s+([0-9]+(?:\\.[0-9]+)*\\b))?",
+							"match": "\\b(swift|(?:iOS|macOS|OSX|watchOS|tvOS|visionOS|UIKitForMac)(?:ApplicationExtension)?)\\b(?:\\s+([0-9]+(?:\\.[0-9]+)*\\b))?",
 							"captures": {
 								"1": {
 									"name": "keyword.other.platform.os.swift"
@@ -580,7 +580,7 @@
 							}
 						},
 						{
-							"match": "\\b(os)\\s*(\\()\\s*(?:(macOS|OSX|iOS|tvOS|watchOS|Android|Linux|FreeBSD|Windows|PS4)|\\w+)\\s*(\\))",
+							"match": "\\b(os)\\s*(\\()\\s*(?:(macOS|OSX|iOS|tvOS|watchOS|visionOS|Android|Linux|FreeBSD|Windows|PS4)|\\w+)\\s*(\\))",
 							"captures": {
 								"1": {
 									"name": "keyword.other.condition.swift"
@@ -2586,7 +2586,7 @@
 			},
 			"patterns": [
 				{
-					"match": "\\s*\\b((?:iOS|macOS|OSX|watchOS|tvOS|UIKitForMac)(?:ApplicationExtension)?)\\b(?:\\s+([0-9]+(?:\\.[0-9]+)*\\b))",
+					"match": "\\s*\\b((?:iOS|macOS|OSX|watchOS|tvOS|visionOS|UIKitForMac)(?:ApplicationExtension)?)\\b(?:\\s+([0-9]+(?:\\.[0-9]+)*\\b))",
 					"captures": {
 						"1": {
 							"name": "keyword.other.platform.os.swift"
diff --git a/extensions/swift/yarn.lock b/extensions/swift/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/swift/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/theme-abyss/yarn.lock b/extensions/theme-abyss/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/theme-abyss/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/theme-defaults/themes/dark_vs.json b/extensions/theme-defaults/themes/dark_vs.json
index 331a87bb778..b66165d69e1 100644
--- a/extensions/theme-defaults/themes/dark_vs.json
+++ b/extensions/theme-defaults/themes/dark_vs.json
@@ -17,6 +17,7 @@
 		"menu.foreground": "#CCCCCC",
 		"menu.separatorBackground": "#454545",
 		"menu.border": "#454545",
+		"menu.selectionBackground": "#0078d4",
 		"statusBarItem.remoteForeground": "#FFF",
 		"statusBarItem.remoteBackground": "#16825D",
 		"ports.iconRunningProcessForeground": "#369432",
diff --git a/extensions/theme-defaults/yarn.lock b/extensions/theme-defaults/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/theme-defaults/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/theme-kimbie-dark/yarn.lock b/extensions/theme-kimbie-dark/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/theme-kimbie-dark/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/theme-monokai-dimmed/yarn.lock b/extensions/theme-monokai-dimmed/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/theme-monokai-dimmed/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/theme-monokai/yarn.lock b/extensions/theme-monokai/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/theme-monokai/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/theme-quietlight/yarn.lock b/extensions/theme-quietlight/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/theme-quietlight/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/theme-red/yarn.lock b/extensions/theme-red/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/theme-red/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/theme-seti/cgmanifest.json b/extensions/theme-seti/cgmanifest.json
index 7e0ad68e317..26ada7ea17a 100644
--- a/extensions/theme-seti/cgmanifest.json
+++ b/extensions/theme-seti/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "seti-ui",
 					"repositoryUrl": "https://github.com/jesseweed/seti-ui",
-					"commitHash": "8eec7f2e37cd8fd91a98c61d129468bb49735a94"
+					"commitHash": "88bcd4a8fca14aa33dd9d50781ad8af3b03c6b90"
 				}
 			},
 			"version": "0.1.0"
diff --git a/extensions/theme-seti/icons/seti.woff b/extensions/theme-seti/icons/seti.woff
index 5069a94ff94..d7a0f3639c7 100644
Binary files a/extensions/theme-seti/icons/seti.woff and b/extensions/theme-seti/icons/seti.woff differ
diff --git a/extensions/theme-seti/icons/vs-seti-icon-theme.json b/extensions/theme-seti/icons/vs-seti-icon-theme.json
index b40d561539e..0a51f2aef8c 100644
--- a/extensions/theme-seti/icons/vs-seti-icon-theme.json
+++ b/extensions/theme-seti/icons/vs-seti-icon-theme.json
@@ -1623,8 +1623,14 @@
 		"class": "_java_1",
 		"classpath": "_java",
 		"js.map": "_javascript",
+		"cjs.map": "_javascript",
+		"mjs.map": "_javascript",
 		"spec.js": "_javascript_1",
+		"spec.cjs": "_javascript_1",
+		"spec.mjs": "_javascript_1",
 		"test.js": "_javascript_1",
+		"test.cjs": "_javascript_1",
+		"test.mjs": "_javascript_1",
 		"es": "_javascript",
 		"es5": "_javascript",
 		"es7": "_javascript",
@@ -1717,6 +1723,7 @@
 		"ttf": "_font",
 		"woff": "_font",
 		"woff2": "_font",
+		"otf": "_font",
 		"avif": "_image",
 		"gif": "_image",
 		"jpg": "_image",
@@ -1784,6 +1791,8 @@
 	"fileNames": {
 		"mix": "_hex",
 		"karma.conf.js": "_karma",
+		"karma.conf.cjs": "_karma",
+		"karma.conf.mjs": "_karma",
 		"karma.conf.coffee": "_karma",
 		"readme.md": "_info",
 		"readme.txt": "_info",
@@ -1814,6 +1823,7 @@
 		"workspace.bazel": "_bazel",
 		"bower.json": "_bower",
 		"docker-healthcheck": "_docker_2",
+		"eslint.config.js": "_eslint",
 		"firebase.json": "_firebase",
 		"geckodriver": "_firefox",
 		"gruntfile.js": "_grunt",
@@ -1828,22 +1838,28 @@
 		"sass-lint.yml": "_sass",
 		"stylelint.config.js": "_stylelint",
 		"stylelint.config.cjs": "_stylelint",
+		"stylelint.config.mjs": "_stylelint",
 		"yarn.clean": "_yarn",
 		"yarn.lock": "_yarn",
 		"webpack.config.js": "_webpack",
 		"webpack.config.cjs": "_webpack",
+		"webpack.config.mjs": "_webpack",
 		"webpack.config.ts": "_webpack",
 		"webpack.config.build.js": "_webpack",
 		"webpack.config.build.cjs": "_webpack",
+		"webpack.config.build.mjs": "_webpack",
 		"webpack.config.build.ts": "_webpack",
 		"webpack.common.js": "_webpack",
 		"webpack.common.cjs": "_webpack",
+		"webpack.common.mjs": "_webpack",
 		"webpack.common.ts": "_webpack",
 		"webpack.dev.js": "_webpack",
 		"webpack.dev.cjs": "_webpack",
+		"webpack.dev.mjs": "_webpack",
 		"webpack.dev.ts": "_webpack",
 		"webpack.prod.js": "_webpack",
 		"webpack.prod.cjs": "_webpack",
+		"webpack.prod.mjs": "_webpack",
 		"webpack.prod.ts": "_webpack",
 		"license": "_license",
 		"licence": "_license",
@@ -2027,8 +2043,14 @@
 			"class": "_java_1_light",
 			"classpath": "_java_light",
 			"js.map": "_javascript_light",
+			"cjs.map": "_javascript_light",
+			"mjs.map": "_javascript_light",
 			"spec.js": "_javascript_1_light",
+			"spec.cjs": "_javascript_1_light",
+			"spec.mjs": "_javascript_1_light",
 			"test.js": "_javascript_1_light",
+			"test.cjs": "_javascript_1_light",
+			"test.mjs": "_javascript_1_light",
 			"es": "_javascript_light",
 			"es5": "_javascript_light",
 			"es7": "_javascript_light",
@@ -2121,6 +2143,7 @@
 			"ttf": "_font_light",
 			"woff": "_font_light",
 			"woff2": "_font_light",
+			"otf": "_font_light",
 			"avif": "_image_light",
 			"gif": "_image_light",
 			"jpg": "_image_light",
@@ -2267,6 +2290,8 @@
 		"fileNames": {
 			"mix": "_hex_light",
 			"karma.conf.js": "_karma_light",
+			"karma.conf.cjs": "_karma_light",
+			"karma.conf.mjs": "_karma_light",
 			"karma.conf.coffee": "_karma_light",
 			"readme.md": "_info_light",
 			"readme.txt": "_info_light",
@@ -2297,6 +2322,7 @@
 			"workspace.bazel": "_bazel_light",
 			"bower.json": "_bower_light",
 			"docker-healthcheck": "_docker_2_light",
+			"eslint.config.js": "_eslint_light",
 			"firebase.json": "_firebase_light",
 			"geckodriver": "_firefox_light",
 			"gruntfile.js": "_grunt_light",
@@ -2311,22 +2337,28 @@
 			"sass-lint.yml": "_sass_light",
 			"stylelint.config.js": "_stylelint_light",
 			"stylelint.config.cjs": "_stylelint_light",
+			"stylelint.config.mjs": "_stylelint_light",
 			"yarn.clean": "_yarn_light",
 			"yarn.lock": "_yarn_light",
 			"webpack.config.js": "_webpack_light",
 			"webpack.config.cjs": "_webpack_light",
+			"webpack.config.mjs": "_webpack_light",
 			"webpack.config.ts": "_webpack_light",
 			"webpack.config.build.js": "_webpack_light",
 			"webpack.config.build.cjs": "_webpack_light",
+			"webpack.config.build.mjs": "_webpack_light",
 			"webpack.config.build.ts": "_webpack_light",
 			"webpack.common.js": "_webpack_light",
 			"webpack.common.cjs": "_webpack_light",
+			"webpack.common.mjs": "_webpack_light",
 			"webpack.common.ts": "_webpack_light",
 			"webpack.dev.js": "_webpack_light",
 			"webpack.dev.cjs": "_webpack_light",
+			"webpack.dev.mjs": "_webpack_light",
 			"webpack.dev.ts": "_webpack_light",
 			"webpack.prod.js": "_webpack_light",
 			"webpack.prod.cjs": "_webpack_light",
+			"webpack.prod.mjs": "_webpack_light",
 			"webpack.prod.ts": "_webpack_light",
 			"license": "_license_light",
 			"licence": "_license_light",
@@ -2350,5 +2382,5 @@
 			"npm-debug.log": "_npm_ignored_light"
 		}
 	},
-	"version": "https://github.com/jesseweed/seti-ui/commit/8eec7f2e37cd8fd91a98c61d129468bb49735a94"
+	"version": "https://github.com/jesseweed/seti-ui/commit/88bcd4a8fca14aa33dd9d50781ad8af3b03c6b90"
 }
\ No newline at end of file
diff --git a/extensions/theme-seti/yarn.lock b/extensions/theme-seti/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/theme-seti/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/theme-solarized-dark/yarn.lock b/extensions/theme-solarized-dark/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/theme-solarized-dark/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/theme-solarized-light/yarn.lock b/extensions/theme-solarized-light/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/theme-solarized-light/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/theme-tomorrow-night-blue/yarn.lock b/extensions/theme-tomorrow-night-blue/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/theme-tomorrow-night-blue/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/tunnel-forwarding/.npmrc b/extensions/tunnel-forwarding/.npmrc
new file mode 100644
index 00000000000..a9c57709666
--- /dev/null
+++ b/extensions/tunnel-forwarding/.npmrc
@@ -0,0 +1,2 @@
+legacy-peer-deps="true"
+timeout=180000
diff --git a/extensions/tunnel-forwarding/.vscodeignore b/extensions/tunnel-forwarding/.vscodeignore
index 36e8b0714fa..360fcfd1c99 100644
--- a/extensions/tunnel-forwarding/.vscodeignore
+++ b/extensions/tunnel-forwarding/.vscodeignore
@@ -2,4 +2,4 @@ src/**
 tsconfig.json
 out/**
 extension.webpack.config.js
-yarn.lock
\ No newline at end of file
+package-lock.json
diff --git a/extensions/tunnel-forwarding/package-lock.json b/extensions/tunnel-forwarding/package-lock.json
new file mode 100644
index 00000000000..57accdc3b8d
--- /dev/null
+++ b/extensions/tunnel-forwarding/package-lock.json
@@ -0,0 +1,34 @@
+{
+  "name": "tunnel-forwarding",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "tunnel-forwarding",
+      "version": "1.0.0",
+      "license": "MIT",
+      "devDependencies": {
+        "@types/node": "20.x"
+      },
+      "engines": {
+        "vscode": "^1.82.0"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "20.11.24",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
+      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    }
+  }
+}
diff --git a/extensions/tunnel-forwarding/yarn.lock b/extensions/tunnel-forwarding/yarn.lock
deleted file mode 100644
index 1f4b6c2e8b4..00000000000
--- a/extensions/tunnel-forwarding/yarn.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@types/node@20.x":
-  version "20.11.24"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792"
-  integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==
-  dependencies:
-    undici-types "~5.26.4"
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
diff --git a/extensions/typescript-basics/snippets/typescript.code-snippets b/extensions/typescript-basics/snippets/typescript.code-snippets
index 35b2aa1711c..9ed695795eb 100644
--- a/extensions/typescript-basics/snippets/typescript.code-snippets
+++ b/extensions/typescript-basics/snippets/typescript.code-snippets
@@ -163,7 +163,7 @@
 	"For-Of Loop": {
 		"prefix": "forof",
 		"body": [
-			"for (const ${1:iterator} of ${2:object}) {",
+			"for (const ${1:element} of ${2:object}) {",
 			"\t$TM_SELECTED_TEXT$0",
 			"}"
 		],
@@ -172,7 +172,7 @@
 	"For-Await-Of Loop": {
 		"prefix": "forawaitof",
 		"body": [
-			"for await (const ${1:iterator} of ${2:object}) {",
+			"for await (const ${1:element} of ${2:object}) {",
 			"\t$TM_SELECTED_TEXT$0",
 			"}"
 		],
@@ -266,6 +266,15 @@
 		],
 		"description": "Set Timeout Function"
 	},
+	"Set Interval Function": {
+		"prefix": "setinterval",
+		"body": [
+			"setInterval(() => {",
+			"\t$TM_SELECTED_TEXT$0",
+			"}, ${1:interval});"
+		],
+		"description": "Set Interval Function"
+	},
 	"Region Start": {
 		"prefix": "#region",
 		"body": [
diff --git a/extensions/typescript-basics/yarn.lock b/extensions/typescript-basics/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/typescript-basics/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/typescript-language-features/.npmrc b/extensions/typescript-language-features/.npmrc
new file mode 100644
index 00000000000..a9c57709666
--- /dev/null
+++ b/extensions/typescript-language-features/.npmrc
@@ -0,0 +1,2 @@
+legacy-peer-deps="true"
+timeout=180000
diff --git a/extensions/typescript-language-features/.vscodeignore b/extensions/typescript-language-features/.vscodeignore
index 76d64ae8237..5c4f06d4cd3 100644
--- a/extensions/typescript-language-features/.vscodeignore
+++ b/extensions/typescript-language-features/.vscodeignore
@@ -8,4 +8,4 @@ tsconfig.json
 extension.webpack.config.js
 extension-browser.webpack.config.js
 cgmanifest.json
-yarn.lock
+package-lock.json
diff --git a/extensions/typescript-language-features/package-lock.json b/extensions/typescript-language-features/package-lock.json
new file mode 100644
index 00000000000..6a19dce700f
--- /dev/null
+++ b/extensions/typescript-language-features/package-lock.json
@@ -0,0 +1,276 @@
+{
+  "name": "typescript-language-features",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "typescript-language-features",
+      "version": "1.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "@vscode/extension-telemetry": "^0.9.0",
+        "@vscode/sync-api-client": "^0.7.2",
+        "@vscode/sync-api-common": "^0.7.2",
+        "@vscode/sync-api-service": "^0.7.3",
+        "@vscode/ts-package-manager": "^0.0.2",
+        "jsonc-parser": "^3.2.0",
+        "semver": "7.5.2",
+        "vscode-tas-client": "^0.1.84",
+        "vscode-uri": "^3.0.3"
+      },
+      "devDependencies": {
+        "@types/node": "20.x",
+        "@types/semver": "^5.5.0"
+      },
+      "engines": {
+        "vscode": "^1.30.0"
+      }
+    },
+    "node_modules/@microsoft/1ds-core-js": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.0.3.tgz",
+      "integrity": "sha512-FrxNLVAPsAvD7+l63TlNS/Kodvpct2WulpDSn1dI4Xuy0kF4E2H867kHdwL/iY1Bj3zA3FSy/jvE4+OcDws7ug==",
+      "dependencies": {
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/1ds-post-js": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.0.3.tgz",
+      "integrity": "sha512-uewvmUtXKd7ttypiKQGdYI6i7UUpPkOznLayzIFrJ4r2xnG6jhPjpKRncHFXPQcM4XSWO3yf5PQ3xAbPq9t7ZQ==",
+      "dependencies": {
+        "@microsoft/1ds-core-js": "4.0.3",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-channel-js": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.0.4.tgz",
+      "integrity": "sha512-6TlfExmErQ8Y+/ChbkyWl+jyt4wg3T6p7lwXDsUCB0LgZmlEWMaCUS0YlT73JCWmE8j7vxW8yUm0lgsgmHns3A==",
+      "dependencies": {
+        "@microsoft/applicationinsights-common": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-common": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.0.4.tgz",
+      "integrity": "sha512-r5gWaw/K9+tKfuo2GtDiDiKASgOkPOCrKW+wZzFvuR06uuwvWjbVQ6yW/YbnfuhRF5M65ksUiMi0eCMwEOGq7Q==",
+      "dependencies": {
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-core-js": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.0.4.tgz",
+      "integrity": "sha512-anxy5kEkqBmVoEqJiJzaaXXA0wzqZi9U4zGd05xFJ04lWckP8dG3zyT3+GGdg7rDelqLTNGxndeYoFmDv63u1g==",
+      "dependencies": {
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-shims": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
+      "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-web-basic": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.0.4.tgz",
+      "integrity": "sha512-KfoxPlLlf0JT12ADb23C5iGye/yFouoMgHEKULxkSQcYY9SsW/8rVrqqvoYKAL+u215CZU2A8Kc8sR3ehEaPCQ==",
+      "dependencies": {
+        "@microsoft/applicationinsights-channel-js": "3.0.4",
+        "@microsoft/applicationinsights-common": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.2",
+        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
+        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/dynamicproto-js": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.2.tgz",
+      "integrity": "sha512-MB8trWaFREpmb037k/d0bB7T2BP7Ai24w1e1tbz3ASLB0/lwphsq3Nq8S9I5AsI5vs4zAQT+SB5nC5/dLYTiOg==",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+      }
+    },
+    "node_modules/@nevware21/ts-async": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.3.0.tgz",
+      "integrity": "sha512-ZUcgUH12LN/F6nzN0cYd0F/rJaMLmXr0EHVTyYfaYmK55bdwE4338uue4UiVoRqHVqNW4KDUrJc49iGogHKeWA==",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.10.0 < 2.x"
+      }
+    },
+    "node_modules/@nevware21/ts-utils": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.10.1.tgz",
+      "integrity": "sha512-pMny25NnF2/MJwdqC3Iyjm2pGIXNxni4AROpcqDeWa+td9JMUY4bUS9uU9XW+BoBRqTLUL+WURF9SOd/6OQzRg=="
+    },
+    "node_modules/@types/node": {
+      "version": "20.11.24",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
+      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/@types/semver": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-5.5.0.tgz",
+      "integrity": "sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ==",
+      "dev": true
+    },
+    "node_modules/@vscode/extension-telemetry": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.0.tgz",
+      "integrity": "sha512-37RxGHXrs3GoXPgCUKQhghEu0gxs8j27RLjQwwtSf4WhPdJKz8UrqMYzpsXlliQ05zURYmtdGZst9C6+hfWXaQ==",
+      "dependencies": {
+        "@microsoft/1ds-core-js": "^4.0.3",
+        "@microsoft/1ds-post-js": "^4.0.3",
+        "@microsoft/applicationinsights-web-basic": "^3.0.4"
+      },
+      "engines": {
+        "vscode": "^1.75.0"
+      }
+    },
+    "node_modules/@vscode/sync-api-client": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/@vscode/sync-api-client/-/sync-api-client-0.7.2.tgz",
+      "integrity": "sha512-HQHz57RVKmR8sTEen1Y/T3r6mzDX7IaUJz/O2RJkn0Qu9ThvCsakLP0N+1iiwPnPfUfmNSwQXbSw8bEQFPcpYQ==",
+      "dependencies": {
+        "@vscode/sync-api-common": "0.7.2",
+        "vscode-uri": "3.0.3"
+      },
+      "engines": {
+        "node": ">=16.15.1"
+      }
+    },
+    "node_modules/@vscode/sync-api-common": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/@vscode/sync-api-common/-/sync-api-common-0.7.2.tgz",
+      "integrity": "sha512-ne1XEeDIYA3mp4oo1QoF1fqFedd0Vf4ybMmLb9HixbTyXy/qwMNL2p6OjXjOsmx6w2q9eqzGA5W/OPRSJxTTIQ==",
+      "engines": {
+        "node": ">=16.15.1"
+      }
+    },
+    "node_modules/@vscode/sync-api-service": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/@vscode/sync-api-service/-/sync-api-service-0.7.3.tgz",
+      "integrity": "sha512-m2AmmfG4uzfjLMgWRHQ3xnBkdwCiUTO68vdw1XuzMsOb39Jwm9xr5bVVxwOFR9lPC0FfO1H6FUxBhZQvg7itPA==",
+      "dependencies": {
+        "@vscode/sync-api-common": "0.7.2",
+        "vscode-uri": "3.0.3"
+      },
+      "engines": {
+        "node": ">=16.15.1",
+        "vscode": "^1.67.0"
+      }
+    },
+    "node_modules/@vscode/ts-package-manager": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/@vscode/ts-package-manager/-/ts-package-manager-0.0.2.tgz",
+      "integrity": "sha512-cXPxGbPVTkEQI8mUiWYUwB6j3ga6M9i7yubUOCrjgZ01GeZPMSnaWRprfJ09uuy81wJjY2gfHgLsOgwrGvUBTw==",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/jsonc-parser": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
+      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w=="
+    },
+    "node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/semver": {
+      "version": "7.5.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
+      "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/tas-client": {
+      "version": "0.2.33",
+      "resolved": "https://registry.npmjs.org/tas-client/-/tas-client-0.2.33.tgz",
+      "integrity": "sha512-V+uqV66BOQnWxvI6HjDnE4VkInmYZUQ4dgB7gzaDyFyFSK1i1nF/j7DpS9UbQAgV9NaF1XpcyuavnM1qOeiEIg=="
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    },
+    "node_modules/vscode-tas-client": {
+      "version": "0.1.84",
+      "resolved": "https://registry.npmjs.org/vscode-tas-client/-/vscode-tas-client-0.1.84.tgz",
+      "integrity": "sha512-rUTrUopV+70hvx1hW5ebdw1nd6djxubkLvVxjGdyD/r5v/wcVF41LIfiAtbm5qLZDtQdsMH1IaCuDoluoIa88w==",
+      "dependencies": {
+        "tas-client": "0.2.33"
+      },
+      "engines": {
+        "vscode": "^1.85.0"
+      }
+    },
+    "node_modules/vscode-uri": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.3.tgz",
+      "integrity": "sha512-EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA=="
+    },
+    "node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    }
+  }
+}
diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
index 4c8a54d8f39..4815098a0f0 100644
--- a/extensions/typescript-language-features/package.json
+++ b/extensions/typescript-language-features/package.json
@@ -9,12 +9,12 @@
   "aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255",
   "enabledApiProposals": [
     "workspaceTrust",
-    "createFileSystemWatcher",
     "multiDocumentHighlightProvider",
     "mappedEditsProvider",
     "codeActionAI",
     "codeActionRanges",
-    "documentPaste"
+    "documentPaste",
+    "editorHoverVerbosityLevel"
   ],
   "capabilities": {
     "virtualWorkspaces": {
@@ -678,7 +678,7 @@
         },
         "js/ts.implicitProjectConfig.target": {
           "type": "string",
-          "default": "ES2020",
+          "default": "ES2022",
           "markdownDescription": "%configuration.implicitProjectConfig.target%",
           "enum": [
             "ES3",
@@ -692,6 +692,8 @@
             "ES2020",
             "ES2021",
             "ES2022",
+            "ES2023",
+            "ES2024",
             "ESNext"
           ],
           "scope": "window"
@@ -824,16 +826,16 @@
           ],
           "enumDescriptions": [
             "%typescript.locale.auto%",
-						"Deutsch",
-						"español",
+            "Deutsch",
+            "español",
             "English",
-						"français",
-						"italiano",
-						"日本語",
-						"한국어",
-						"русский",
-						"中文(简体)",
-						"中文(繁體)"
+            "français",
+            "italiano",
+            "日本語",
+            "한국어",
+            "русский",
+            "中文(简体)",
+            "中文(繁體)"
           ],
           "markdownDescription": "%typescript.locale%",
           "scope": "window"
@@ -1030,6 +1032,22 @@
           "markdownDescription": "%typescript.preferences.autoImportFileExcludePatterns%",
           "scope": "resource"
         },
+        "typescript.preferences.autoImportSpecifierExcludeRegexes": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "markdownDescription": "%typescript.preferences.autoImportSpecifierExcludeRegexes%",
+          "scope": "resource"
+        },
+        "javascript.preferences.autoImportSpecifierExcludeRegexes": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "markdownDescription": "%typescript.preferences.autoImportSpecifierExcludeRegexes%",
+          "scope": "resource"
+        },
         "typescript.preferences.preferTypeOnlyAutoImports": {
           "type": "boolean",
           "default": false,
@@ -1074,6 +1092,146 @@
           "description": "%typescript.preferences.renameMatchingJsxTags%",
           "scope": "language-overridable"
         },
+        "typescript.preferences.organizeImports": {
+          "type": "object",
+          "markdownDescription": "%typescript.preferences.organizeImports%",
+          "properties": {
+            "caseSensitivity": {
+              "type": "string",
+              "enum": [
+                "auto",
+                "caseInsensitive",
+                "caseSensitive"
+              ],
+              "markdownEnumDescriptions": [
+                "%typescript.preferences.organizeImports.caseSensitivity.auto%",
+                "%typescript.preferences.organizeImports.caseSensitivity.insensitive",
+                "%typescript.preferences.organizeImports.caseSensitivity.sensitive%"
+              ],
+              "default": "auto"
+            },
+            "typeOrder": {
+              "type": "string",
+              "enum": [
+                "auto",
+                "last",
+                "inline",
+                "first"
+              ],
+              "default": "auto",
+              "markdownEnumDescriptions": [
+                "%typescript.preferences.organizeImports.typeOrder.auto%",
+                "%typescript.preferences.organizeImports.typeOrder.last%",
+                "%typescript.preferences.organizeImports.typeOrder.inline%",
+                "%typescript.preferences.organizeImports.typeOrder.first%"
+              ]
+            },
+            "unicodeCollation": {
+              "type": "string",
+              "enum": [
+                "ordinal",
+                "unicode"
+              ],
+              "markdownEnumDescriptions": [
+                "%typescript.preferences.organizeImports.unicodeCollation.ordinal%",
+                "%typescript.preferences.organizeImports.unicodeCollation.unicode%"
+              ],
+              "default": "ordinal"
+            },
+            "locale": {
+              "type": "string",
+              "markdownDescription": "%typescript.preferences.organizeImports.locale%"
+            },
+            "numericCollation": {
+              "type": "boolean",
+              "markdownDescription": "%typescript.preferences.organizeImports.numericCollation%"
+            },
+            "accentCollation": {
+              "type": "boolean",
+              "markdownDescription": "%typescript.preferences.organizeImports.accentCollation%"
+            },
+            "caseFirst": {
+              "type": "string",
+              "markdownDescription": "%typescript.preferences.organizeImports.caseFirst%",
+              "enum": [
+                "default",
+                "upper",
+                "lower"
+              ],
+              "default": "default"
+            }
+          }
+        },
+        "javascript.preferences.organizeImports": {
+          "type": "object",
+          "markdownDescription": "%typescript.preferences.organizeImports%",
+          "properties": {
+            "caseSensitivity": {
+              "type": "string",
+              "enum": [
+                "auto",
+                "caseInsensitive",
+                "caseSensitive"
+              ],
+              "markdownEnumDescriptions": [
+                "%typescript.preferences.organizeImports.caseSensitivity.auto%",
+                "%typescript.preferences.organizeImports.caseSensitivity.insensitive",
+                "%typescript.preferences.organizeImports.caseSensitivity.sensitive%"
+              ],
+              "default": "auto"
+            },
+            "typeOrder": {
+              "type": "string",
+              "enum": [
+                "auto",
+                "last",
+                "inline",
+                "first"
+              ],
+              "default": "auto",
+              "markdownEnumDescriptions": [
+                "%typescript.preferences.organizeImports.typeOrder.auto%",
+                "%typescript.preferences.organizeImports.typeOrder.last%",
+                "%typescript.preferences.organizeImports.typeOrder.inline%",
+                "%typescript.preferences.organizeImports.typeOrder.first%"
+              ]
+            },
+            "unicodeCollation": {
+              "type": "string",
+              "enum": [
+                "ordinal",
+                "unicode"
+              ],
+              "markdownEnumDescriptions": [
+                "%typescript.preferences.organizeImports.unicodeCollation.ordinal%",
+                "%typescript.preferences.organizeImports.unicodeCollation.unicode%"
+              ],
+              "default": "ordinal"
+            },
+            "locale": {
+              "type": "string",
+              "markdownDescription": "%typescript.preferences.organizeImports.locale%"
+            },
+            "numericCollation": {
+              "type": "boolean",
+              "markdownDescription": "%typescript.preferences.organizeImports.numericCollation%"
+            },
+            "accentCollation": {
+              "type": "boolean",
+              "markdownDescription": "%typescript.preferences.organizeImports.accentCollation%"
+            },
+            "caseFirst": {
+              "type": "string",
+              "markdownDescription": "%typescript.preferences.organizeImports.caseFirst%",
+              "enum": [
+                "default",
+                "upper",
+                "lower"
+              ],
+              "default": "default"
+            }
+          }
+        },
         "typescript.updateImportsOnFileMove.enabled": {
           "type": "string",
           "enum": [
@@ -1177,70 +1335,81 @@
         "typescript.tsserver.experimental.useVsCodeWatcher": {
           "type": "boolean",
           "description": "%configuration.tsserver.useVsCodeWatcher%",
+          "deprecationMessage": "%configuration.tsserver.useVsCodeWatcher.deprecation%",
           "default": true
         },
         "typescript.tsserver.watchOptions": {
-          "type": "object",
           "description": "%configuration.tsserver.watchOptions%",
           "scope": "window",
-          "properties": {
-            "watchFile": {
+          "default": "vscode",
+          "oneOf": [
+            {
               "type": "string",
-              "description": "%configuration.tsserver.watchOptions.watchFile%",
-              "enum": [
-                "fixedChunkSizePolling",
-                "fixedPollingInterval",
-                "priorityPollingInterval",
-                "dynamicPriorityPolling",
-                "useFsEvents",
-                "useFsEventsOnParentDirectory"
-              ],
-              "enumDescriptions": [
-                "%configuration.tsserver.watchOptions.watchFile.fixedChunkSizePolling%",
-                "%configuration.tsserver.watchOptions.watchFile.fixedPollingInterval%",
-                "%configuration.tsserver.watchOptions.watchFile.priorityPollingInterval%",
-                "%configuration.tsserver.watchOptions.watchFile.dynamicPriorityPolling%",
-                "%configuration.tsserver.watchOptions.watchFile.useFsEvents%",
-                "%configuration.tsserver.watchOptions.watchFile.useFsEventsOnParentDirectory%"
-              ],
-              "default": "useFsEvents"
+              "const": "vscode",
+              "description": "%configuration.tsserver.watchOptions.vscode%"
             },
-            "watchDirectory": {
-              "type": "string",
-              "description": "%configuration.tsserver.watchOptions.watchDirectory%",
-              "enum": [
-                "fixedChunkSizePolling",
-                "fixedPollingInterval",
-                "dynamicPriorityPolling",
-                "useFsEvents"
-              ],
-              "enumDescriptions": [
-                "%configuration.tsserver.watchOptions.watchDirectory.fixedChunkSizePolling%",
-                "%configuration.tsserver.watchOptions.watchDirectory.fixedPollingInterval%",
-                "%configuration.tsserver.watchOptions.watchDirectory.dynamicPriorityPolling%",
-                "%configuration.tsserver.watchOptions.watchDirectory.useFsEvents%"
-              ],
-              "default": "useFsEvents"
-            },
-            "fallbackPolling": {
-              "type": "string",
-              "description": "%configuration.tsserver.watchOptions.fallbackPolling%",
-              "enum": [
-                "fixedPollingInterval",
-                "priorityPollingInterval",
-                "dynamicPriorityPolling"
-              ],
-              "enumDescriptions": [
-                "configuration.tsserver.watchOptions.fallbackPolling.fixedPollingInterval",
-                "configuration.tsserver.watchOptions.fallbackPolling.priorityPollingInterval",
-                "configuration.tsserver.watchOptions.fallbackPolling.dynamicPriorityPolling"
-              ]
-            },
-            "synchronousWatchDirectory": {
-              "type": "boolean",
-              "description": "%configuration.tsserver.watchOptions.synchronousWatchDirectory%"
+            {
+              "type": "object",
+              "properties": {
+                "watchFile": {
+                  "type": "string",
+                  "description": "%configuration.tsserver.watchOptions.watchFile%",
+                  "enum": [
+                    "fixedChunkSizePolling",
+                    "fixedPollingInterval",
+                    "priorityPollingInterval",
+                    "dynamicPriorityPolling",
+                    "useFsEvents",
+                    "useFsEventsOnParentDirectory"
+                  ],
+                  "enumDescriptions": [
+                    "%configuration.tsserver.watchOptions.watchFile.fixedChunkSizePolling%",
+                    "%configuration.tsserver.watchOptions.watchFile.fixedPollingInterval%",
+                    "%configuration.tsserver.watchOptions.watchFile.priorityPollingInterval%",
+                    "%configuration.tsserver.watchOptions.watchFile.dynamicPriorityPolling%",
+                    "%configuration.tsserver.watchOptions.watchFile.useFsEvents%",
+                    "%configuration.tsserver.watchOptions.watchFile.useFsEventsOnParentDirectory%"
+                  ],
+                  "default": "useFsEvents"
+                },
+                "watchDirectory": {
+                  "type": "string",
+                  "description": "%configuration.tsserver.watchOptions.watchDirectory%",
+                  "enum": [
+                    "fixedChunkSizePolling",
+                    "fixedPollingInterval",
+                    "dynamicPriorityPolling",
+                    "useFsEvents"
+                  ],
+                  "enumDescriptions": [
+                    "%configuration.tsserver.watchOptions.watchDirectory.fixedChunkSizePolling%",
+                    "%configuration.tsserver.watchOptions.watchDirectory.fixedPollingInterval%",
+                    "%configuration.tsserver.watchOptions.watchDirectory.dynamicPriorityPolling%",
+                    "%configuration.tsserver.watchOptions.watchDirectory.useFsEvents%"
+                  ],
+                  "default": "useFsEvents"
+                },
+                "fallbackPolling": {
+                  "type": "string",
+                  "description": "%configuration.tsserver.watchOptions.fallbackPolling%",
+                  "enum": [
+                    "fixedPollingInterval",
+                    "priorityPollingInterval",
+                    "dynamicPriorityPolling"
+                  ],
+                  "enumDescriptions": [
+                    "configuration.tsserver.watchOptions.fallbackPolling.fixedPollingInterval",
+                    "configuration.tsserver.watchOptions.fallbackPolling.priorityPollingInterval",
+                    "configuration.tsserver.watchOptions.fallbackPolling.dynamicPriorityPolling"
+                  ]
+                },
+                "synchronousWatchDirectory": {
+                  "type": "boolean",
+                  "description": "%configuration.tsserver.watchOptions.synchronousWatchDirectory%"
+                }
+              }
             }
-          }
+          ]
         },
         "typescript.workspaceSymbols.scope": {
           "type": "string",
@@ -1282,13 +1451,13 @@
         },
         "typescript.tsserver.web.projectWideIntellisense.suppressSemanticErrors": {
           "type": "boolean",
-          "default": true,
+          "default": false,
           "description": "%configuration.tsserver.web.projectWideIntellisense.suppressSemanticErrors%",
           "scope": "window"
         },
         "typescript.tsserver.web.typeAcquisition.enabled": {
           "type": "boolean",
-          "default": false,
+          "default": true,
           "description": "%configuration.tsserver.web.typeAcquisition.enabled%",
           "scope": "window"
         },
@@ -1315,19 +1484,38 @@
           "markdownDescription": "%typescript.workspaceSymbols.excludeLibrarySymbols%",
           "scope": "window"
         },
+        "typescript.tsserver.enableRegionDiagnostics": {
+          "type": "boolean",
+          "default": true,
+          "description": "%typescript.tsserver.enableRegionDiagnostics%",
+          "scope": "window"
+        },
         "javascript.experimental.updateImportsOnPaste": {
-          "scope": "resource",
+          "scope": "window",
           "type": "boolean",
           "default": false,
           "description": "%configuration.updateImportsOnPaste%",
-          "tags": ["experimental"]
+          "tags": [
+            "experimental"
+          ]
         },
         "typescript.experimental.updateImportsOnPaste": {
-          "scope": "resource",
+          "scope": "window",
           "type": "boolean",
           "default": false,
           "description": "%configuration.updateImportsOnPaste%",
-          "tags": ["experimental"]
+          "tags": [
+            "experimental"
+          ]
+        },
+        "typescript.experimental.expandableHover": {
+          "type": "boolean",
+          "default": false,
+          "description": "%configuration.expandableHover%",
+          "scope": "window",
+          "tags": [
+            "experimental"
+          ]
         }
       }
     },
@@ -1472,23 +1660,8 @@
       "editor/context": [
         {
           "command": "typescript.goToSourceDefinition",
-          "when": "tsSupportsSourceDefinition && resourceLangId == typescript",
-          "group": "navigation@9"
-        },
-        {
-          "command": "typescript.goToSourceDefinition",
-          "when": "tsSupportsSourceDefinition && resourceLangId == typescriptreact",
-          "group": "navigation@9"
-        },
-        {
-          "command": "typescript.goToSourceDefinition",
-          "when": "tsSupportsSourceDefinition && resourceLangId == javascript",
-          "group": "navigation@9"
-        },
-        {
-          "command": "typescript.goToSourceDefinition",
-          "when": "tsSupportsSourceDefinition && resourceLangId == javascriptreact",
-          "group": "navigation@9"
+          "when": "tsSupportsSourceDefinition && (resourceLangId == typescript || resourceLangId == typescriptreact || resourceLangId == javascript || resourceLangId == javascriptreact)",
+          "group": "navigation@1.41"
         }
       ],
       "explorer/context": [
diff --git a/extensions/typescript-language-features/package.nls.json b/extensions/typescript-language-features/package.nls.json
index 4f276905d96..4a62db6a548 100644
--- a/extensions/typescript-language-features/package.nls.json
+++ b/extensions/typescript-language-features/package.nls.json
@@ -16,6 +16,7 @@
 	"typescript.tsserver.pluginPaths": "Additional paths to discover TypeScript Language Service plugins.",
 	"typescript.tsserver.pluginPaths.item": "Either an absolute or relative path. Relative path will be resolved against workspace folder(s).",
 	"typescript.tsserver.trace": "Enables tracing of messages sent to the TS server. This trace can be used to diagnose TS Server issues. The trace may contain file paths, source code, and other potentially sensitive information from your project.",
+	"typescript.tsserver.enableRegionDiagnostics": "Enables region-based diagnostics in TypeScript. Requires using TypeScript 5.6+ in the workspace.",
 	"typescript.validate.enable": "Enable/disable TypeScript validation.",
 	"typescript.format.enable": "Enable/disable default TypeScript formatter.",
 	"javascript.format.enable": "Enable/disable default JavaScript formatter.",
@@ -154,6 +155,7 @@
 	"typescript.preferences.includePackageJsonAutoImports.on": "Always search dependencies.",
 	"typescript.preferences.includePackageJsonAutoImports.off": "Never search dependencies.",
 	"typescript.preferences.autoImportFileExcludePatterns": "Specify glob patterns of files to exclude from auto imports. Relative paths are resolved relative to the workspace root. Patterns are evaluated using tsconfig.json [`exclude`](https://www.typescriptlang.org/tsconfig#exclude) semantics.",
+	"typescript.preferences.autoImportSpecifierExcludeRegexes": "Specify regular expressions to exclude auto imports with matching import specifiers. Examples:\n\n- `^node:`\n- `lib/internal` (slashes don't need to be escaped...)\n- `/lib\\/internal/i` (...unless including surrounding slashes for `i` or `u` flags)\n- `^lodash$` (only allow subpath imports from lodash)",
 	"typescript.preferences.preferTypeOnlyAutoImports": "Include the `type` keyword in auto-imports whenever possible. Requires using TypeScript 5.3+ in the workspace.",
 	"typescript.workspaceSymbols.excludeLibrarySymbols": "Exclude symbols that come from library files in Go to Symbol in Workspace results. Requires using TypeScript 5.3+ in the workspace.",
 	"typescript.updateImportsOnFileMove.enabled": "Enable/disable automatic updating of import paths when you rename or move a file in VS Code.",
@@ -165,7 +167,9 @@
 	"configuration.surveys.enabled": "Enabled/disable occasional surveys that help us improve VS Code's JavaScript and TypeScript support.",
 	"configuration.suggest.completeJSDocs": "Enable/disable suggestion to complete JSDoc comments.",
 	"configuration.tsserver.useVsCodeWatcher": "Use VS Code's file watchers instead of TypeScript's. Requires using TypeScript 5.4+ in the workspace.",
+	"configuration.tsserver.useVsCodeWatcher.deprecation": "Please use the `#typescript.tsserver.watchOptions#` setting instead.",
 	"configuration.tsserver.watchOptions": "Configure which watching strategies should be used to keep track of files and directories.",
+	"configuration.tsserver.watchOptions.vscode": "Use VS Code's file watchers instead of TypeScript's. Requires using TypeScript 5.4+ in the workspace.",
 	"configuration.tsserver.watchOptions.watchFile": "Strategy for how individual files are watched.",
 	"configuration.tsserver.watchOptions.watchFile.fixedChunkSizePolling": "Polls files in chunks at regular interval.",
 	"configuration.tsserver.watchOptions.watchFile.fixedPollingInterval": "Check every file for changes several times a second at a fixed interval.",
@@ -186,6 +190,21 @@
 	"typescript.preferences.renameShorthandProperties.deprecationMessage": "The setting 'typescript.preferences.renameShorthandProperties' has been deprecated in favor of 'typescript.preferences.useAliasesForRenames'",
 	"typescript.preferences.useAliasesForRenames": "Enable/disable introducing aliases for object shorthand properties during renames.",
 	"typescript.preferences.renameMatchingJsxTags": "When on a JSX tag, try to rename the matching tag instead of renaming the symbol. Requires using TypeScript 5.1+ in the workspace.",
+	"typescript.preferences.organizeImports": "Advanced preferences that control how imports are ordered.",
+	"javascript.preferences.organizeImports": "Advanced preferences that control how imports are ordered.",
+	"typescript.preferences.organizeImports.caseSensitivity.auto": "Detect case-sensitivity for import sorting.",
+	"typescript.preferences.organizeImports.caseSensitivity.insensitive": "Sort imports case-insensitively.",
+	"typescript.preferences.organizeImports.caseSensitivity.sensitive": "Sort imports case-sensitively.",
+	"typescript.preferences.organizeImports.typeOrder.auto": "Detect where type-only named imports should be sorted.",
+	"typescript.preferences.organizeImports.typeOrder.last": "Type only named imports are sorted to the end of the import list.",
+	"typescript.preferences.organizeImports.typeOrder.inline": "Named imports are sorted by name only.",
+	"typescript.preferences.organizeImports.typeOrder.first": "Type only named imports are sorted to the end of the import list.",
+	"typescript.preferences.organizeImports.unicodeCollation.ordinal": "Sort imports using the numeric value of each code point.",
+	"typescript.preferences.organizeImports.unicodeCollation.unicode": "Sort imports using the Unicode code collation.",
+	"typescript.preferences.organizeImports.locale": "Overrides the locale used for collation. Specify `auto` to use the UI locale. Only applies to `organizeImportsCollation: 'unicode'`.",
+	"typescript.preferences.organizeImports.caseFirst": "Indicates whether upper-case comes before lower-case. Only applies to `organizeImportsCollation: 'unicode'`.",
+	"typescript.preferences.organizeImports.numericCollation": "Sort numeric strings by integer value.",
+	"typescript.preferences.organizeImports.accentCollation": "Compare characters with diacritical marks as unequal to base character.",
 	"typescript.workspaceSymbols.scope": "Controls which files are searched by [Go to Symbol in Workspace](https://code.visualstudio.com/docs/editor/editingevolved#_open-symbol-by-name).",
 	"typescript.workspaceSymbols.scope.allOpenProjects": "Search all open JavaScript or TypeScript projects for symbols.",
 	"typescript.workspaceSymbols.scope.currentProject": "Only search for symbols in the current JavaScript or TypeScript project.",
@@ -219,7 +238,8 @@
 	"configuration.tsserver.web.projectWideIntellisense.suppressSemanticErrors": "Suppresses semantic errors on web even when project wide IntelliSense is enabled. This is always on when project wide IntelliSense is not enabled or available. See `#typescript.tsserver.web.projectWideIntellisense.enabled#`",
 	"configuration.tsserver.web.typeAcquisition.enabled": "Enable/disable package acquisition on the web. This enables IntelliSense for imported packages. Requires `#typescript.tsserver.web.projectWideIntellisense.enabled#`. Currently not supported for Safari.",
 	"configuration.tsserver.nodePath": "Run TS Server on a custom Node installation. This can be a path to a Node executable, or 'node' if you want VS Code to detect a Node installation.",
-	"configuration.updateImportsOnPaste": "Automatically update imports when pasting code. Requires TypeScript 5.5+.",
+	"configuration.updateImportsOnPaste": "Automatically update imports when pasting code. Requires TypeScript 5.7+.",
+	"configuration.expandableHover": "(Experimental) Enable/disable expanding on hover.",
 	"walkthroughs.nodejsWelcome.title": "Get started with JavaScript and Node.js",
 	"walkthroughs.nodejsWelcome.description": "Make the most of Visual Studio Code's first-class JavaScript experience.",
 	"walkthroughs.nodejsWelcome.downloadNode.forMacOrWindows.title": "Install Node.js",
diff --git a/extensions/typescript-language-features/schemas/package.schema.json b/extensions/typescript-language-features/schemas/package.schema.json
index c135ea39ec1..1cd2b1ed8ea 100644
--- a/extensions/typescript-language-features/schemas/package.schema.json
+++ b/extensions/typescript-language-features/schemas/package.schema.json
@@ -1,6 +1,5 @@
 {
 	"$schema": "http://json-schema.org/draft-07/schema#",
-	"title": "TypeScript contributions to package.json",
 	"type": "object",
 	"properties": {
 		"contributes": {
diff --git a/extensions/typescript-language-features/src/configuration/configuration.ts b/extensions/typescript-language-features/src/configuration/configuration.ts
index a08ca921e0c..693e7ad17e4 100644
--- a/extensions/typescript-language-features/src/configuration/configuration.ts
+++ b/extensions/typescript-language-features/src/configuration/configuration.ts
@@ -117,13 +117,14 @@ export interface TypeScriptServiceConfiguration {
 	readonly enableProjectDiagnostics: boolean;
 	readonly maxTsServerMemory: number;
 	readonly enablePromptUseWorkspaceTsdk: boolean;
-	readonly useVsCodeWatcher: boolean; // TODO@bpasero remove this setting eventually
+	readonly useVsCodeWatcher: boolean;
 	readonly watchOptions: Proto.WatchOptions | undefined;
 	readonly includePackageJsonAutoImports: 'auto' | 'on' | 'off' | undefined;
 	readonly enableTsServerTracing: boolean;
 	readonly localNodePath: string | null;
 	readonly globalNodePath: string | null;
 	readonly workspaceSymbolsExcludeLibrarySymbols: boolean;
+	readonly enableRegionDiagnostics: boolean;
 }
 
 export function areServiceConfigurationsEqual(a: TypeScriptServiceConfiguration, b: TypeScriptServiceConfiguration): boolean {
@@ -134,6 +135,10 @@ export interface ServiceConfigurationProvider {
 	loadFromWorkspace(): TypeScriptServiceConfiguration;
 }
 
+const vscodeWatcherName = 'vscode';
+type vscodeWatcherName = typeof vscodeWatcherName;
+
+
 export abstract class BaseServiceConfigurationProvider implements ServiceConfigurationProvider {
 
 	public loadFromWorkspace(): TypeScriptServiceConfiguration {
@@ -162,6 +167,7 @@ export abstract class BaseServiceConfigurationProvider implements ServiceConfigu
 			localNodePath: this.readLocalNodePath(configuration),
 			globalNodePath: this.readGlobalNodePath(configuration),
 			workspaceSymbolsExcludeLibrarySymbols: this.readWorkspaceSymbolsExcludeLibrarySymbols(configuration),
+			enableRegionDiagnostics: this.readEnableRegionDiagnostics(configuration),
 		};
 	}
 
@@ -221,11 +227,36 @@ export abstract class BaseServiceConfigurationProvider implements ServiceConfigu
 	}
 
 	private readUseVsCodeWatcher(configuration: vscode.WorkspaceConfiguration): boolean {
-		return configuration.get<boolean>('typescript.tsserver.experimental.useVsCodeWatcher', false);
+		const watcherExcludes = configuration.get<Record<string, boolean>>('files.watcherExclude') ?? {};
+		if (
+			watcherExcludes['**/node_modules/*/**'] === true || // VS Code default prior to 1.94.x
+			watcherExcludes['**/node_modules/**'] === true ||
+			watcherExcludes['**/node_modules'] === true ||
+			watcherExcludes['**'] === true	 					// VS Code Watching is entirely disabled
+		) {
+			return false;
+		}
+
+		const experimentalConfig = configuration.inspect('typescript.tsserver.experimental.useVsCodeWatcher');
+		if (typeof experimentalConfig?.globalValue === 'boolean') {
+			return experimentalConfig.globalValue;
+		}
+		if (typeof experimentalConfig?.workspaceValue === 'boolean') {
+			return experimentalConfig.workspaceValue;
+		}
+		if (typeof experimentalConfig?.workspaceFolderValue === 'boolean') {
+			return experimentalConfig.workspaceFolderValue;
+		}
+
+		return configuration.get<Proto.WatchOptions | vscodeWatcherName>('typescript.tsserver.watchOptions', vscodeWatcherName) === vscodeWatcherName;
 	}
 
 	private readWatchOptions(configuration: vscode.WorkspaceConfiguration): Proto.WatchOptions | undefined {
-		const watchOptions = configuration.get<Proto.WatchOptions>('typescript.tsserver.watchOptions');
+		const watchOptions = configuration.get<Proto.WatchOptions | vscodeWatcherName>('typescript.tsserver.watchOptions');
+		if (watchOptions === vscodeWatcherName) {
+			return undefined;
+		}
+
 		// Returned value may be a proxy. Clone it into a normal object
 		return { ...(watchOptions ?? {}) };
 	}
@@ -261,10 +292,14 @@ export abstract class BaseServiceConfigurationProvider implements ServiceConfigu
 	}
 
 	private readWebProjectWideIntellisenseSuppressSemanticErrors(configuration: vscode.WorkspaceConfiguration): boolean {
-		return configuration.get<boolean>('typescript.tsserver.web.projectWideIntellisense.suppressSemanticErrors', true);
+		return this.readWebTypeAcquisition(configuration) && configuration.get<boolean>('typescript.tsserver.web.projectWideIntellisense.suppressSemanticErrors', false);
 	}
 
 	private readWebTypeAcquisition(configuration: vscode.WorkspaceConfiguration): boolean {
-		return configuration.get<boolean>('typescript.tsserver.web.typeAcquisition.enabled', false);
+		return configuration.get<boolean>('typescript.tsserver.web.typeAcquisition.enabled', true);
+	}
+
+	private readEnableRegionDiagnostics(configuration: vscode.WorkspaceConfiguration): boolean {
+		return configuration.get<boolean>('typescript.tsserver.enableRegionDiagnostics', true);
 	}
 }
diff --git a/extensions/typescript-language-features/src/configuration/fileSchemes.ts b/extensions/typescript-language-features/src/configuration/fileSchemes.ts
index ca268e29e0b..9d54f0b67a7 100644
--- a/extensions/typescript-language-features/src/configuration/fileSchemes.ts
+++ b/extensions/typescript-language-features/src/configuration/fileSchemes.ts
@@ -21,21 +21,24 @@ export const officeScript = 'office-script';
 /** Used for code blocks in chat by vs code core */
 export const chatCodeBlock = 'vscode-chat-code-block';
 
-/** Used for code blocks in chat by copilot. */
-export const chatBackingCodeBlock = 'vscode-copilot-chat-code-block';
-
 export function getSemanticSupportedSchemes() {
-	if (isWeb() && vscode.workspace.workspaceFolders) {
-		return vscode.workspace.workspaceFolders.map(folder => folder.uri.scheme);
-	}
-
-	return [
-		file,
+	const alwaysSupportedSchemes = [
 		untitled,
 		walkThroughSnippet,
 		vscodeNotebookCell,
 		chatCodeBlock,
-		chatBackingCodeBlock,
+	];
+
+	if (isWeb()) {
+		return [
+			...(vscode.workspace.workspaceFolders ?? []).map(folder => folder.uri.scheme),
+			...alwaysSupportedSchemes,
+		];
+	}
+
+	return [
+		file,
+		...alwaysSupportedSchemes,
 	];
 }
 
diff --git a/extensions/typescript-language-features/src/extension.browser.ts b/extensions/typescript-language-features/src/extension.browser.ts
index 2f6bd2127e1..b87a41901bb 100644
--- a/extensions/typescript-language-features/src/extension.browser.ts
+++ b/extensions/typescript-language-features/src/extension.browser.ts
@@ -11,8 +11,7 @@ import { registerBaseCommands } from './commands/index';
 import { TypeScriptServiceConfiguration } from './configuration/configuration';
 import { BrowserServiceConfigurationProvider } from './configuration/configuration.browser';
 import { ExperimentationTelemetryReporter, IExperimentationTelemetryReporter } from './experimentTelemetryReporter';
-import { AutoInstallerFs } from './filesystems/autoInstallerFs';
-import { MemFs } from './filesystems/memFs';
+import { registerAtaSupport } from './filesystems/ata';
 import { createLazyClientHost, lazilyActivateClient } from './lazyClientHost';
 import { Logger } from './logging/logger';
 import RemoteRepositories from './remoteRepositories.browser';
@@ -25,7 +24,7 @@ import { ITypeScriptVersionProvider, TypeScriptVersion, TypeScriptVersionSource
 import { ActiveJsTsEditorTracker } from './ui/activeJsTsEditorTracker';
 import { Disposable } from './utils/dispose';
 import { getPackageInfo } from './utils/packageInfo';
-import { isWebAndHasSharedArrayBuffers, supportsReadableByteStreams } from './utils/platform';
+import { isWebAndHasSharedArrayBuffers } from './utils/platform';
 
 class StaticVersionProvider implements ITypeScriptVersionProvider {
 
@@ -62,7 +61,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<Api> {
 		new TypeScriptVersion(
 			TypeScriptVersionSource.Bundled,
 			vscode.Uri.joinPath(context.extensionUri, 'dist/browser/typescript/tsserver.web.js').toString(),
-			API.fromSimpleString('5.4.5')));
+			API.fromSimpleString('5.6.2')));
 
 	let experimentTelemetryReporter: IExperimentationTelemetryReporter | undefined;
 	const packageInfo = getPackageInfo(context);
@@ -102,16 +101,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<Api> {
 		await startPreloadWorkspaceContentsIfNeeded(context, logger);
 	}));
 
-	if (supportsReadableByteStreams()) {
-		context.subscriptions.push(vscode.workspace.registerFileSystemProvider('vscode-global-typings', new MemFs(), {
-			isCaseSensitive: true,
-			isReadonly: false
-		}));
-		context.subscriptions.push(vscode.workspace.registerFileSystemProvider('vscode-node-modules', new AutoInstallerFs(), {
-			isCaseSensitive: true,
-			isReadonly: false
-		}));
-	}
+	context.subscriptions.push(registerAtaSupport(logger));
 
 	return getExtensionApi(onCompletionAccepted.event, pluginManager);
 }
diff --git a/extensions/typescript-language-features/src/filesystems/ata.ts b/extensions/typescript-language-features/src/filesystems/ata.ts
new file mode 100644
index 00000000000..b5e43244e1b
--- /dev/null
+++ b/extensions/typescript-language-features/src/filesystems/ata.ts
@@ -0,0 +1,34 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import { conditionalRegistration, requireGlobalConfiguration } from '../languageFeatures/util/dependentRegistration';
+import { supportsReadableByteStreams } from '../utils/platform';
+import { AutoInstallerFs } from './autoInstallerFs';
+import { MemFs } from './memFs';
+import { Logger } from '../logging/logger';
+
+export function registerAtaSupport(logger: Logger): vscode.Disposable {
+	if (!supportsReadableByteStreams()) {
+		return vscode.Disposable.from();
+	}
+
+	return conditionalRegistration([
+		requireGlobalConfiguration('typescript', 'tsserver.web.typeAcquisition.enabled'),
+	], () => {
+		return vscode.Disposable.from(
+			// Ata
+			vscode.workspace.registerFileSystemProvider('vscode-global-typings', new MemFs('global-typings', logger), {
+				isCaseSensitive: true,
+				isReadonly: false,
+			}),
+
+			// Read accesses to node_modules
+			vscode.workspace.registerFileSystemProvider('vscode-node-modules', new AutoInstallerFs(logger), {
+				isCaseSensitive: true,
+				isReadonly: false
+			}));
+	});
+}
diff --git a/extensions/typescript-language-features/src/filesystems/autoInstallerFs.ts b/extensions/typescript-language-features/src/filesystems/autoInstallerFs.ts
index 4e69fce8cda..d639b7fe999 100644
--- a/extensions/typescript-language-features/src/filesystems/autoInstallerFs.ts
+++ b/extensions/typescript-language-features/src/filesystems/autoInstallerFs.ts
@@ -3,50 +3,33 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { PackageManager } from '@vscode/ts-package-manager';
+import { basename, join } from 'path';
 import * as vscode from 'vscode';
-import { MemFs } from './memFs';
 import { URI } from 'vscode-uri';
-import { PackageManager, FileSystem, packagePath } from '@vscode/ts-package-manager';
-import { join, basename, dirname } from 'path';
+import { Disposable } from '../utils/dispose';
+import { MemFs } from './memFs';
+import { Logger } from '../logging/logger';
 
 const TEXT_DECODER = new TextDecoder('utf-8');
 const TEXT_ENCODER = new TextEncoder();
 
-export class AutoInstallerFs implements vscode.FileSystemProvider {
+export class AutoInstallerFs extends Disposable implements vscode.FileSystemProvider {
 
-	private readonly memfs = new MemFs();
-	private readonly fs: FileSystem;
-	private readonly projectCache = new Map<string, Set<string>>();
-	private readonly watcher: vscode.FileSystemWatcher;
-	private readonly _emitter = new vscode.EventEmitter<vscode.FileChangeEvent[]>();
+	private readonly memfs: MemFs;
+	private readonly packageManager: PackageManager;
+	private readonly _projectCache = new Map</* root */ string, Promise<void> | undefined>();
 
-	readonly onDidChangeFile: vscode.Event<vscode.FileChangeEvent[]> = this._emitter.event;
+	private readonly _emitter = this._register(new vscode.EventEmitter<vscode.FileChangeEvent[]>());
+	readonly onDidChangeFile = this._emitter.event;
 
-	constructor() {
-		this.watcher = vscode.workspace.createFileSystemWatcher('**/{package.json,package-lock.json,package-lock.kdl}');
-		const handler = (uri: URI) => {
-			const root = dirname(uri.path);
-			if (this.projectCache.delete(root)) {
-				(async () => {
-					const pm = new PackageManager(this.fs);
-					const opts = await this.getInstallOpts(uri, root);
-					const proj = await pm.resolveProject(root, opts);
-					proj.pruneExtraneous();
-					// TODO: should this fire on vscode-node-modules instead?
-					// NB(kmarchan): This should tell TSServer that there's
-					// been changes inside node_modules and it needs to
-					// re-evaluate things.
-					this._emitter.fire([{
-						type: vscode.FileChangeType.Changed,
-						uri: uri.with({ path: join(root, 'node_modules') })
-					}]);
-				})();
-			}
-		};
-		this.watcher.onDidChange(handler);
-		this.watcher.onDidCreate(handler);
-		this.watcher.onDidDelete(handler);
-		const memfs = this.memfs;
+	constructor(
+		private readonly logger: Logger
+	) {
+		super();
+
+		const memfs = new MemFs('auto-installer', logger);
+		this.memfs = memfs;
 		memfs.onDidChangeFile((e) => {
 			this._emitter.fire(e.map(ev => ({
 				type: ev.type,
@@ -54,7 +37,8 @@ export class AutoInstallerFs implements vscode.FileSystemProvider {
 				uri: ev.uri.with({ scheme: 'memfs' })
 			})));
 		});
-		this.fs = {
+
+		this.packageManager = new PackageManager({
 			readDirectory(path: string, _extensions?: readonly string[], _exclude?: readonly string[], _include?: readonly string[], _depth?: number): string[] {
 				return memfs.readDirectory(URI.file(path)).map(([name, _]) => name);
 			},
@@ -87,17 +71,17 @@ export class AutoInstallerFs implements vscode.FileSystemProvider {
 					return undefined;
 				}
 			}
-		};
+		});
 	}
 
 	watch(resource: vscode.Uri): vscode.Disposable {
-		const mapped = URI.file(new MappedUri(resource).path);
-		console.log('watching', mapped);
-		return this.memfs.watch(mapped);
+		this.logger.trace(`AutoInstallerFs.watch. Resource: ${resource.toString()}}`);
+		return this.memfs.watch(resource);
 	}
 
 	async stat(uri: vscode.Uri): Promise<vscode.FileStat> {
-		// console.log('stat', uri.toString());
+		this.logger.trace(`AutoInstallerFs.stat: ${uri}`);
+
 		const mapped = new MappedUri(uri);
 
 		// TODO: case sensitivity configuration
@@ -119,7 +103,8 @@ export class AutoInstallerFs implements vscode.FileSystemProvider {
 	}
 
 	async readDirectory(uri: vscode.Uri): Promise<[string, vscode.FileType][]> {
-		// console.log('readDirectory', uri.toString());
+		this.logger.trace(`AutoInstallerFs.readDirectory: ${uri}`);
+
 		const mapped = new MappedUri(uri);
 		await this.ensurePackageContents(mapped);
 
@@ -127,7 +112,8 @@ export class AutoInstallerFs implements vscode.FileSystemProvider {
 	}
 
 	async readFile(uri: vscode.Uri): Promise<Uint8Array> {
-		// console.log('readFile', uri.toString());
+		this.logger.trace(`AutoInstallerFs.readFile: ${uri}`);
+
 		const mapped = new MappedUri(uri);
 		await this.ensurePackageContents(mapped);
 
@@ -151,8 +137,6 @@ export class AutoInstallerFs implements vscode.FileSystemProvider {
 	}
 
 	private async ensurePackageContents(incomingUri: MappedUri): Promise<void> {
-		// console.log('ensurePackageContents', incomingUri.path);
-
 		// If we're not looking for something inside node_modules, bail early.
 		if (!incomingUri.path.includes('node_modules')) {
 			throw vscode.FileSystemError.FileNotFound();
@@ -163,34 +147,37 @@ export class AutoInstallerFs implements vscode.FileSystemProvider {
 			throw vscode.FileSystemError.FileNotFound();
 		}
 
-		const root = this.getProjectRoot(incomingUri.path);
-
-		const pkgPath = packagePath(incomingUri.path);
-		if (!root || this.projectCache.get(root)?.has(pkgPath)) {
+		const root = await this.getProjectRoot(incomingUri.original);
+		if (!root) {
 			return;
 		}
 
-		const proj = await (new PackageManager(this.fs)).resolveProject(root, await this.getInstallOpts(incomingUri.original, root));
+		this.logger.trace(`AutoInstallerFs.ensurePackageContents. Path: ${incomingUri.path}, Root: ${root}`);
 
-		const restore = proj.restorePackageAt(incomingUri.path);
-		try {
-			await restore;
-		} catch (e) {
-			console.error(`failed to restore package at ${incomingUri.path}: `, e);
-			throw e;
+		const existingInstall = this._projectCache.get(root);
+		if (existingInstall) {
+			this.logger.trace(`AutoInstallerFs.ensurePackageContents. Found ongoing install for: ${root}/node_modules`);
+			return existingInstall;
 		}
-		if (!this.projectCache.has(root)) {
-			this.projectCache.set(root, new Set());
-		}
-		this.projectCache.get(root)!.add(pkgPath);
+
+		const installing = (async () => {
+			const proj = await this.packageManager.resolveProject(root, await this.getInstallOpts(incomingUri.original, root));
+			try {
+				await proj.restore();
+			} catch (e) {
+				console.error(`failed to restore package at ${incomingUri.path}: `, e);
+				throw e;
+			}
+		})();
+		this._projectCache.set(root, installing);
+		await installing;
 	}
 
 	private async getInstallOpts(originalUri: URI, root: string) {
 		const vsfs = vscode.workspace.fs;
-		let pkgJson;
-		try {
-			pkgJson = TEXT_DECODER.decode(await vsfs.readFile(originalUri.with({ path: join(root, 'package.json') })));
-		} catch (e) { }
+
+		// We definitely need a package.json to be there.
+		const pkgJson = TEXT_DECODER.decode(await vsfs.readFile(originalUri.with({ path: join(root, 'package.json') })));
 
 		let kdlLock;
 		try {
@@ -209,13 +196,20 @@ export class AutoInstallerFs implements vscode.FileSystemProvider {
 		};
 	}
 
-	private getProjectRoot(path: string): string | undefined {
-		const pkgPath = path.match(/(^.*)\/node_modules/);
-		return pkgPath?.[1];
+	private async getProjectRoot(incomingUri: URI): Promise<string | undefined> {
+		const vsfs = vscode.workspace.fs;
+		const pkgPath = incomingUri.path.match(/^(.*?)\/node_modules/);
+		const ret = pkgPath?.[1];
+		if (!ret) {
+			return;
+		}
+		try {
+			await vsfs.stat(incomingUri.with({ path: join(ret, 'package.json') }));
+			return ret;
+		} catch (e) {
+			return;
+		}
 	}
-
-	// --- manage file events
-
 }
 
 class MappedUri {
@@ -227,7 +221,7 @@ class MappedUri {
 
 		const parts = uri.path.match(/^\/([^\/]+)\/([^\/]*)(?:\/(.+))?$/);
 		if (!parts) {
-			throw new Error(`Invalid path: ${uri.path}`);
+			throw new Error(`Invalid uri: ${uri.toString()}, ${uri.path}`);
 		}
 
 		const scheme = parts[1];
diff --git a/extensions/typescript-language-features/src/filesystems/memFs.ts b/extensions/typescript-language-features/src/filesystems/memFs.ts
index eeeb60e957d..05c4e7c3db7 100644
--- a/extensions/typescript-language-features/src/filesystems/memFs.ts
+++ b/extensions/typescript-language-features/src/filesystems/memFs.ts
@@ -3,8 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as vscode from 'vscode';
 import { basename, dirname } from 'path';
+import * as vscode from 'vscode';
+import { Logger } from '../logging/logger';
 
 export class MemFs implements vscode.FileSystemProvider {
 
@@ -14,8 +15,13 @@ export class MemFs implements vscode.FileSystemProvider {
 		0,
 	);
 
+	constructor(
+		private readonly id: string,
+		private readonly logger: Logger,
+	) { }
+
 	stat(uri: vscode.Uri): vscode.FileStat {
-		// console.log('stat', uri.toString());
+		this.logger.trace(`MemFs.stat ${this.id}. uri: ${uri}`);
 		const entry = this.getEntry(uri);
 		if (!entry) {
 			throw vscode.FileSystemError.FileNotFound();
@@ -25,7 +31,7 @@ export class MemFs implements vscode.FileSystemProvider {
 	}
 
 	readDirectory(uri: vscode.Uri): [string, vscode.FileType][] {
-		// console.log('readDirectory', uri.toString());
+		this.logger.trace(`MemFs.readDirectory ${this.id}. uri: ${uri}`);
 
 		const entry = this.getEntry(uri);
 		if (!entry) {
@@ -39,7 +45,7 @@ export class MemFs implements vscode.FileSystemProvider {
 	}
 
 	readFile(uri: vscode.Uri): Uint8Array {
-		// console.log('readFile', uri.toString());
+		this.logger.trace(`MemFs.readFile ${this.id}. uri: ${uri}`);
 
 		const entry = this.getEntry(uri);
 		if (!entry) {
@@ -54,7 +60,7 @@ export class MemFs implements vscode.FileSystemProvider {
 	}
 
 	writeFile(uri: vscode.Uri, content: Uint8Array, { create, overwrite }: { create: boolean; overwrite: boolean }): void {
-		// console.log('writeFile', uri.toString());
+		this.logger.trace(`MemFs.writeFile ${this.id}. uri: ${uri}`);
 
 		const dir = this.getParent(uri);
 
@@ -98,7 +104,8 @@ export class MemFs implements vscode.FileSystemProvider {
 	}
 
 	createDirectory(uri: vscode.Uri): void {
-		// console.log('createDirectory', uri.toString());
+		this.logger.trace(`MemFs.createDirectory ${this.id}. uri: ${uri}`);
+
 		const dir = this.getParent(uri);
 		const now = Date.now() / 1000;
 		dir.contents.set(basename(uri.path), new FsDirectoryEntry(new Map(), now, now));
diff --git a/extensions/typescript-language-features/src/languageFeatures/completions.ts b/extensions/typescript-language-features/src/languageFeatures/completions.ts
index 708d7e028dd..749e74b4048 100644
--- a/extensions/typescript-language-features/src/languageFeatures/completions.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/completions.ts
@@ -58,6 +58,7 @@ class MyCompletionItem extends vscode.CompletionItem {
 		private readonly completionContext: CompletionContext,
 		public readonly metadata: any | undefined,
 		client: ITypeScriptServiceClient,
+		defaultCommitCharacters: readonly string[] | undefined,
 	) {
 		const label = tsEntry.name || (tsEntry.insertText ?? '');
 		super(label, MyCompletionItem.convertKind(tsEntry.kind));
@@ -93,7 +94,7 @@ class MyCompletionItem extends vscode.CompletionItem {
 		this.useCodeSnippet = completionContext.completeFunctionCalls && (this.kind === vscode.CompletionItemKind.Function || this.kind === vscode.CompletionItemKind.Method);
 
 		this.range = this.getRangeFromReplacementSpan(tsEntry, completionContext);
-		this.commitCharacters = MyCompletionItem.getCommitCharacters(completionContext, tsEntry);
+		this.commitCharacters = MyCompletionItem.getCommitCharacters(completionContext, tsEntry, defaultCommitCharacters);
 		this.insertText = isSnippet && tsEntry.insertText ? new vscode.SnippetString(tsEntry.insertText) : tsEntry.insertText;
 		this.filterText = tsEntry.filterText || this.getFilterText(completionContext.line, tsEntry.insertText);
 
@@ -500,7 +501,22 @@ class MyCompletionItem extends vscode.CompletionItem {
 		}
 	}
 
-	private static getCommitCharacters(context: CompletionContext, entry: Proto.CompletionEntry): string[] | undefined {
+	private static getCommitCharacters(
+		context: CompletionContext,
+		entry: Proto.CompletionEntry,
+		defaultCommitCharacters: readonly string[] | undefined,
+	): string[] | undefined {
+		let commitCharacters = entry.commitCharacters ?? (defaultCommitCharacters ? Array.from(defaultCommitCharacters) : undefined);
+		if (commitCharacters) {
+			if (context.enableCallCompletions
+				&& !context.isNewIdentifierLocation
+				&& entry.kind !== PConst.Kind.warning
+				&& entry.kind !== PConst.Kind.string) {
+				commitCharacters.push('(');
+			}
+			return commitCharacters;
+		}
+
 		if (entry.kind === PConst.Kind.warning || entry.kind === PConst.Kind.string) { // Ambient JS word based suggestion, strings
 			return undefined;
 		}
@@ -509,7 +525,7 @@ class MyCompletionItem extends vscode.CompletionItem {
 			return undefined;
 		}
 
-		const commitCharacters: string[] = ['.', ',', ';'];
+		commitCharacters = ['.', ',', ';'];
 		if (context.enableCallCompletions) {
 			commitCharacters.push('(');
 		}
@@ -735,52 +751,39 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider<
 			triggerKind: typeConverters.CompletionTriggerKind.toProtocolCompletionTriggerKind(context.triggerKind),
 		};
 
-		let isNewIdentifierLocation = true;
-		let isIncomplete = false;
-		let isMemberCompletion = false;
 		let dotAccessorContext: DotAccessorContext | undefined;
-		let entries: ReadonlyArray<Proto.CompletionEntry>;
-		let metadata: any | undefined;
 		let response: ServerResponse.Response<Proto.CompletionInfoResponse> | undefined;
 		let duration: number | undefined;
 		let optionalReplacementRange: vscode.Range | undefined;
-		if (this.client.apiVersion.gte(API.v300)) {
-			const startTime = Date.now();
-			try {
-				response = await this.client.interruptGetErr(() => this.client.execute('completionInfo', args, token));
-			} finally {
-				duration = Date.now() - startTime;
-			}
 
-			if (response.type !== 'response' || !response.body) {
-				this.logCompletionsTelemetry(duration, response);
-				return undefined;
-			}
-			isNewIdentifierLocation = response.body.isNewIdentifierLocation;
-			isMemberCompletion = response.body.isMemberCompletion;
-			if (isMemberCompletion) {
-				const dotMatch = line.text.slice(0, position.character).match(/\??\.\s*$/) || undefined;
-				if (dotMatch) {
-					const range = new vscode.Range(position.translate({ characterDelta: -dotMatch[0].length }), position);
-					const text = document.getText(range);
-					dotAccessorContext = { range, text };
-				}
-			}
-			isIncomplete = !!response.body.isIncomplete || (response.metadata as any)?.isIncomplete;
-			entries = response.body.entries;
-			metadata = response.metadata;
+		const startTime = Date.now();
+		try {
+			response = await this.client.interruptGetErr(() => this.client.execute('completionInfo', args, token));
+		} finally {
+			duration = Date.now() - startTime;
+		}
 
-			if (response.body.optionalReplacementSpan) {
-				optionalReplacementRange = typeConverters.Range.fromTextSpan(response.body.optionalReplacementSpan);
-			}
-		} else {
-			const response = await this.client.interruptGetErr(() => this.client.execute('completions', args, token));
-			if (response.type !== 'response' || !response.body) {
-				return undefined;
+		if (response.type !== 'response' || !response.body) {
+			this.logCompletionsTelemetry(duration, response);
+			return undefined;
+		}
+		const isNewIdentifierLocation = response.body.isNewIdentifierLocation;
+		const isMemberCompletion = response.body.isMemberCompletion;
+		if (isMemberCompletion) {
+			const dotMatch = line.text.slice(0, position.character).match(/\??\.\s*$/) || undefined;
+			if (dotMatch) {
+				const range = new vscode.Range(position.translate({ characterDelta: -dotMatch[0].length }), position);
+				const text = document.getText(range);
+				dotAccessorContext = { range, text };
 			}
+		}
+		const isIncomplete = !!response.body.isIncomplete || (response.metadata as any)?.isIncomplete;
+		const entries = response.body.entries;
+		const metadata = response.metadata;
+		const defaultCommitCharacters = Object.freeze(response.body.defaultCommitCharacters);
 
-			entries = response.body;
-			metadata = response.metadata;
+		if (response.body.optionalReplacementSpan) {
+			optionalReplacementRange = typeConverters.Range.fromTextSpan(response.body.optionalReplacementSpan);
 		}
 
 		const completionContext: CompletionContext = {
@@ -799,7 +802,14 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider<
 		const items: MyCompletionItem[] = [];
 		for (const entry of entries) {
 			if (!shouldExcludeCompletionEntry(entry, completionConfiguration)) {
-				const item = new MyCompletionItem(position, document, entry, completionContext, metadata, this.client);
+				const item = new MyCompletionItem(
+					position,
+					document,
+					entry,
+					completionContext,
+					metadata,
+					this.client,
+					defaultCommitCharacters);
 				item.command = {
 					command: ApplyCompletionCommand.ID,
 					title: '',
@@ -856,11 +866,11 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider<
 
 	private getTsTriggerCharacter(context: vscode.CompletionContext): Proto.CompletionsTriggerCharacter | undefined {
 		switch (context.triggerCharacter) {
-			case '@': { // Workaround for https://github.com/microsoft/TypeScript/issues/27321
-				return this.client.apiVersion.gte(API.v310) && this.client.apiVersion.lt(API.v320) ? undefined : '@';
+			case '@': {
+				return '@';
 			}
-			case '#': { // Workaround for https://github.com/microsoft/TypeScript/issues/36367
-				return this.client.apiVersion.lt(API.v381) ? undefined : '#';
+			case '#': {
+				return '#';
 			}
 			case ' ': {
 				return this.client.apiVersion.gte(API.v430) ? ' ' : undefined;
diff --git a/extensions/typescript-language-features/src/languageFeatures/copyPaste.ts b/extensions/typescript-language-features/src/languageFeatures/copyPaste.ts
index 643c77ac357..ca3f7708397 100644
--- a/extensions/typescript-language-features/src/languageFeatures/copyPaste.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/copyPaste.ts
@@ -7,7 +7,7 @@ import * as vscode from 'vscode';
 import { DocumentSelector } from '../configuration/documentSelector';
 import * as typeConverters from '../typeConverters';
 import { ClientCapability, ITypeScriptServiceClient } from '../typescriptService';
-import { conditionalRegistration, requireMinVersion, requireSomeCapability } from './util/dependentRegistration';
+import { conditionalRegistration, requireGlobalConfiguration, requireMinVersion, requireSomeCapability } from './util/dependentRegistration';
 import protocol from '../tsServer/protocol/protocol';
 import { API } from '../tsServer/api';
 import { LanguageDescription } from '../configuration/languageDescription';
@@ -38,6 +38,8 @@ class CopyMetadata {
 	}
 }
 
+const settingId = 'experimental.updateImportsOnPaste';
+
 class DocumentPasteProvider implements vscode.DocumentPasteEditProvider {
 
 	static readonly kind = vscode.DocumentDropOrPasteEditKind.Empty.append('text', 'jsts', 'pasteWithImports');
@@ -48,7 +50,24 @@ class DocumentPasteProvider implements vscode.DocumentPasteEditProvider {
 		private readonly _client: ITypeScriptServiceClient,
 	) { }
 
-	prepareDocumentPaste(document: vscode.TextDocument, ranges: readonly vscode.Range[], dataTransfer: vscode.DataTransfer, _token: vscode.CancellationToken) {
+	async prepareDocumentPaste(document: vscode.TextDocument, ranges: readonly vscode.Range[], dataTransfer: vscode.DataTransfer, token: vscode.CancellationToken) {
+		if (!this.isEnabled(document)) {
+			return;
+		}
+
+		const file = this._client.toOpenTsFilePath(document);
+		if (!file) {
+			return;
+		}
+
+		const response = await this._client.execute('preparePasteEdits', {
+			file,
+			copiedTextSpan: ranges.map(typeConverters.Range.toTextSpan),
+		}, token);
+		if (token.isCancellationRequested || response.type !== 'response' || !response.body) {
+			return;
+		}
+
 		dataTransfer.set(DocumentPasteProvider.metadataMimeType,
 			new vscode.DataTransferItem(new CopyMetadata(document.uri, ranges).toJSON()));
 	}
@@ -60,8 +79,7 @@ class DocumentPasteProvider implements vscode.DocumentPasteEditProvider {
 		_context: vscode.DocumentPasteEditContext,
 		token: vscode.CancellationToken,
 	): Promise<vscode.DocumentPasteEdit[] | undefined> {
-		const config = vscode.workspace.getConfiguration(this._modeId, document.uri);
-		if (!config.get('experimental.updateImportsOnPaste')) {
+		if (!this.isEnabled(document)) {
 			return;
 		}
 
@@ -93,14 +111,18 @@ class DocumentPasteProvider implements vscode.DocumentPasteEditProvider {
 			}
 		}
 
-		const response = await this._client.execute('getPasteEdits', {
+		if (copiedFrom?.file === file) {
+			return;
+		}
+
+		const response = await this._client.interruptGetErr(() => this._client.execute('getPasteEdits', {
 			file,
 			// TODO: only supports a single paste for now
 			pastedText: [text],
 			pasteLocations: ranges.map(typeConverters.Range.toTextSpan),
 			copiedFrom
-		}, token);
-		if (response.type !== 'response' || !response.body || token.isCancellationRequested) {
+		}, token));
+		if (response.type !== 'response' || !response.body?.edits.length || token.isCancellationRequested) {
 			return;
 		}
 
@@ -121,17 +143,23 @@ class DocumentPasteProvider implements vscode.DocumentPasteEditProvider {
 
 		return metadata ? CopyMetadata.fromJSON(metadata) : undefined;
 	}
+
+	private isEnabled(document: vscode.TextDocument) {
+		const config = vscode.workspace.getConfiguration(this._modeId, document.uri);
+		return config.get(settingId, false);
+	}
 }
 
 export function register(selector: DocumentSelector, language: LanguageDescription, client: ITypeScriptServiceClient) {
 	return conditionalRegistration([
 		requireSomeCapability(client, ClientCapability.Semantic),
-		requireMinVersion(client, API.v550),
+		requireMinVersion(client, API.v570),
+		requireGlobalConfiguration(language.id, settingId),
 	], () => {
 		return vscode.languages.registerDocumentPasteEditProvider(selector.semantic, new DocumentPasteProvider(language.id, client), {
 			providedPasteEditKinds: [DocumentPasteProvider.kind],
 			copyMimeTypes: [DocumentPasteProvider.metadataMimeType],
-			pasteMimeTypes: ['text/plain'],
+			pasteMimeTypes: [DocumentPasteProvider.metadataMimeType],
 		});
 	});
 }
diff --git a/extensions/typescript-language-features/src/languageFeatures/diagnostics.ts b/extensions/typescript-language-features/src/languageFeatures/diagnostics.ts
index 190e6a99bf7..d86f64637c6 100644
--- a/extensions/typescript-language-features/src/languageFeatures/diagnostics.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/diagnostics.ts
@@ -4,13 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
+import { TypeScriptServiceConfiguration } from '../configuration/configuration';
 import { DiagnosticLanguage } from '../configuration/languageDescription';
+import { TelemetryReporter } from '../logging/telemetry';
+import { DiagnosticPerformanceData as TsDiagnosticPerformanceData } from '../tsServer/protocol/protocol';
 import * as arrays from '../utils/arrays';
 import { Disposable } from '../utils/dispose';
-import { ResourceMap } from '../utils/resourceMap';
-import { TelemetryReporter } from '../logging/telemetry';
-import { TypeScriptServiceConfiguration } from '../configuration/configuration';
 import { equals } from '../utils/objects';
+import { ResourceMap } from '../utils/resourceMap';
 
 function diagnosticsEquals(a: vscode.Diagnostic, b: vscode.Diagnostic): boolean {
 	if (a === b) {
@@ -34,6 +35,7 @@ export const enum DiagnosticKind {
 	Syntax,
 	Semantic,
 	Suggestion,
+	RegionSemantic,
 }
 
 class FileDiagnostics {
@@ -48,7 +50,8 @@ class FileDiagnostics {
 	public updateDiagnostics(
 		language: DiagnosticLanguage,
 		kind: DiagnosticKind,
-		diagnostics: ReadonlyArray<vscode.Diagnostic>
+		diagnostics: ReadonlyArray<vscode.Diagnostic>,
+		ranges: ReadonlyArray<vscode.Range> | undefined
 	): boolean {
 		if (language !== this.language) {
 			this._diagnostics.clear();
@@ -61,6 +64,9 @@ class FileDiagnostics {
 			return false;
 		}
 
+		if (kind === DiagnosticKind.RegionSemantic) {
+			return this.updateRegionDiagnostics(diagnostics, ranges!);
+		}
 		this._diagnostics.set(kind, diagnostics);
 		return true;
 	}
@@ -83,6 +89,23 @@ class FileDiagnostics {
 		}
 	}
 
+	/**
+	 * @param ranges The ranges whose diagnostics were updated.
+	 */
+	private updateRegionDiagnostics(
+		diagnostics: ReadonlyArray<vscode.Diagnostic>,
+		ranges: ReadonlyArray<vscode.Range>): boolean {
+		if (!this._diagnostics.get(DiagnosticKind.Semantic)) {
+			this._diagnostics.set(DiagnosticKind.Semantic, diagnostics);
+			return true;
+		}
+		const oldDiagnostics = this._diagnostics.get(DiagnosticKind.Semantic)!;
+		const newDiagnostics = oldDiagnostics.filter(diag => !ranges.some(range => diag.range.intersection(range)));
+		newDiagnostics.push(...diagnostics);
+		this._diagnostics.set(DiagnosticKind.Semantic, newDiagnostics);
+		return true;
+	}
+
 	private getSuggestionDiagnostics(settings: DiagnosticSettings) {
 		const enableSuggestions = settings.getEnableSuggestions(this.language);
 		return this.get(DiagnosticKind.Suggestion).filter(x => {
@@ -151,6 +174,10 @@ class DiagnosticSettings {
 	}
 }
 
+interface DiagnosticPerformanceData extends TsDiagnosticPerformanceData {
+	fileLineCount?: number;
+}
+
 class DiagnosticsTelemetryManager extends Disposable {
 
 	private readonly _diagnosticCodesMap = new Map<number, number>();
@@ -172,6 +199,33 @@ class DiagnosticsTelemetryManager extends Disposable {
 		this._registerTelemetryEventEmitter();
 	}
 
+	public logDiagnosticsPerformanceTelemetry(performanceData: DiagnosticPerformanceData[]): void {
+		for (const data of performanceData) {
+			/* __GDPR__
+				"diagnostics.performance" : {
+					"owner": "mjbvz",
+					"syntaxDiagDuration" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+					"semanticDiagDuration" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+					"suggestionDiagDuration" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+					"regionSemanticDiagDuration" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+					"fileLineCount" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+					"${include}": [
+						"${TypeScriptCommonProperties}"
+					]
+				}
+			*/
+			this._telemetryReporter.logTelemetry('diagnostics.performance',
+				{
+					syntaxDiagDuration: data.syntaxDiag,
+					semanticDiagDuration: data.semanticDiag,
+					suggestionDiagDuration: data.suggestionDiag,
+					regionSemanticDiagDuration: data.regionSemanticDiag,
+					fileLineCount: data.fileLineCount,
+				},
+			);
+		}
+	}
+
 	private _updateAllDiagnosticCodesAfterTimeout() {
 		clearTimeout(this._timeout);
 		this._timeout = setTimeout(() => this._updateDiagnosticCodes(), 5000);
@@ -235,6 +289,8 @@ export class DiagnosticsManager extends Disposable {
 
 	private readonly _updateDelay = 50;
 
+	private readonly _diagnosticsTelemetryManager: DiagnosticsTelemetryManager | undefined;
+
 	constructor(
 		owner: string,
 		configuration: TypeScriptServiceConfiguration,
@@ -248,7 +304,7 @@ export class DiagnosticsManager extends Disposable {
 		this._currentDiagnostics = this._register(vscode.languages.createDiagnosticCollection(owner));
 		// Here we are selecting only 1 user out of 1000 to send telemetry diagnostics
 		if (Math.random() * 1000 <= 1 || configuration.enableDiagnosticsTelemetry) {
-			this._register(new DiagnosticsTelemetryManager(telemetryReporter, this._currentDiagnostics));
+			this._diagnosticsTelemetryManager = this._register(new DiagnosticsTelemetryManager(telemetryReporter, this._currentDiagnostics));
 		}
 	}
 
@@ -284,15 +340,16 @@ export class DiagnosticsManager extends Disposable {
 		file: vscode.Uri,
 		language: DiagnosticLanguage,
 		kind: DiagnosticKind,
-		diagnostics: ReadonlyArray<vscode.Diagnostic>
+		diagnostics: ReadonlyArray<vscode.Diagnostic>,
+		ranges: ReadonlyArray<vscode.Range> | undefined,
 	): void {
 		let didUpdate = false;
 		const entry = this._diagnostics.get(file);
 		if (entry) {
-			didUpdate = entry.updateDiagnostics(language, kind, diagnostics);
+			didUpdate = entry.updateDiagnostics(language, kind, diagnostics, ranges);
 		} else if (diagnostics.length) {
 			const fileDiagnostics = new FileDiagnostics(file, language);
-			fileDiagnostics.updateDiagnostics(language, kind, diagnostics);
+			fileDiagnostics.updateDiagnostics(language, kind, diagnostics, ranges);
 			this._diagnostics.set(file, fileDiagnostics);
 			didUpdate = true;
 		}
@@ -326,6 +383,10 @@ export class DiagnosticsManager extends Disposable {
 		return this._currentDiagnostics.get(file) || [];
 	}
 
+	public logDiagnosticsPerformanceTelemetry(performanceData: DiagnosticPerformanceData[]): void {
+		this._diagnosticsTelemetryManager?.logDiagnosticsPerformanceTelemetry(performanceData);
+	}
+
 	private scheduleDiagnosticsUpdate(file: vscode.Uri) {
 		if (!this._pendingUpdates.has(file)) {
 			this._pendingUpdates.set(file, setTimeout(() => this.updateCurrentDiagnostics(file), this._updateDelay));
diff --git a/extensions/typescript-language-features/src/languageFeatures/fileConfigurationManager.ts b/extensions/typescript-language-features/src/languageFeatures/fileConfigurationManager.ts
index bddd062b3e8..5d92a3a6163 100644
--- a/extensions/typescript-language-features/src/languageFeatures/fileConfigurationManager.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/fileConfigurationManager.ts
@@ -5,12 +5,12 @@
 
 import * as path from 'path';
 import * as vscode from 'vscode';
-import type * as Proto from '../tsServer/protocol/protocol';
-import { API } from '../tsServer/api';
-import { ITypeScriptServiceClient } from '../typescriptService';
-import { Disposable } from '../utils/dispose';
 import * as fileSchemes from '../configuration/fileSchemes';
 import { isTypeScriptDocument } from '../configuration/languageIds';
+import { API } from '../tsServer/api';
+import type * as Proto from '../tsServer/protocol/protocol';
+import { ITypeScriptServiceClient } from '../typescriptService';
+import { Disposable } from '../utils/dispose';
 import { equals } from '../utils/objects';
 import { ResourceMap } from '../utils/resourceMap';
 
@@ -19,6 +19,13 @@ interface FileConfiguration {
 	readonly preferences: Proto.UserPreferences;
 }
 
+interface FormattingOptions {
+
+	readonly tabSize: number | undefined;
+
+	readonly insertSpaces: boolean | undefined;
+}
+
 function areFileConfigurationsEqual(a: FileConfiguration, b: FileConfiguration): boolean {
 	return equals(a, b);
 }
@@ -51,21 +58,21 @@ export default class FileConfigurationManager extends Disposable {
 		}
 	}
 
-	private getFormattingOptions(
-		document: vscode.TextDocument
-	): vscode.FormattingOptions | undefined {
-		const editor = vscode.window.visibleTextEditors.find(editor => editor.document.fileName === document.fileName);
-		return editor
-			? {
-				tabSize: editor.options.tabSize,
-				insertSpaces: editor.options.insertSpaces
-			} as vscode.FormattingOptions
-			: undefined;
+	private getFormattingOptions(document: vscode.TextDocument): FormattingOptions | undefined {
+		const editor = vscode.window.visibleTextEditors.find(editor => editor.document.uri.toString() === document.uri.toString());
+		if (!editor) {
+			return undefined;
+		}
+
+		return {
+			tabSize: typeof editor.options.tabSize === 'number' ? editor.options.tabSize : undefined,
+			insertSpaces: typeof editor.options.insertSpaces === 'boolean' ? editor.options.insertSpaces : undefined,
+		};
 	}
 
 	public async ensureConfigurationOptions(
 		document: vscode.TextDocument,
-		options: vscode.FormattingOptions,
+		options: FormattingOptions,
 		token: vscode.CancellationToken
 	): Promise<void> {
 		const file = this.client.toOpenTsFilePath(document);
@@ -122,7 +129,7 @@ export default class FileConfigurationManager extends Disposable {
 
 	private getFileOptions(
 		document: vscode.TextDocument,
-		options: vscode.FormattingOptions
+		options: FormattingOptions
 	): FileConfiguration {
 		return {
 			formatOptions: this.getFormatOptions(document, options),
@@ -132,7 +139,7 @@ export default class FileConfigurationManager extends Disposable {
 
 	private getFormatOptions(
 		document: vscode.TextDocument,
-		options: vscode.FormattingOptions
+		options: FormattingOptions
 	): Proto.FormatCodeSettings {
 		const config = vscode.workspace.getConfiguration(
 			isTypeScriptDocument(document) ? 'typescript.format' : 'javascript.format',
@@ -191,6 +198,7 @@ export default class FileConfigurationManager extends Disposable {
 			includeCompletionsWithClassMemberSnippets: config.get<boolean>('suggest.classMemberSnippets.enabled', true),
 			includeCompletionsWithObjectLiteralMethodSnippets: config.get<boolean>('suggest.objectLiteralMethodSnippets.enabled', true),
 			autoImportFileExcludePatterns: this.getAutoImportFileExcludePatternsPreference(preferencesConfig, vscode.workspace.getWorkspaceFolder(document.uri)?.uri),
+			autoImportSpecifierExcludeRegexes: preferencesConfig.get<string[]>('autoImportSpecifierExcludeRegexes'),
 			preferTypeOnlyAutoImports: preferencesConfig.get<boolean>('preferTypeOnlyAutoImports', false),
 			useLabelDetailsInCompletionEntries: true,
 			allowIncompleteCompletions: true,
@@ -199,6 +207,7 @@ export default class FileConfigurationManager extends Disposable {
 			interactiveInlayHints: true,
 			includeCompletionsForModuleExports: config.get<boolean>('suggest.autoImports'),
 			...getInlayHintsPreferences(config),
+			...this.getOrganizeImportsPreferences(preferencesConfig),
 		};
 
 		return preferences;
@@ -208,7 +217,7 @@ export default class FileConfigurationManager extends Disposable {
 		switch (config.get<string>('quoteStyle')) {
 			case 'single': return 'single';
 			case 'double': return 'double';
-			default: return this.client.apiVersion.gte(API.v333) ? 'auto' : undefined;
+			default: return 'auto';
 		}
 	}
 
@@ -227,6 +236,23 @@ export default class FileConfigurationManager extends Disposable {
 						wildcardPrefix + '**' + path.sep + p;
 		});
 	}
+
+	private getOrganizeImportsPreferences(config: vscode.WorkspaceConfiguration): Proto.UserPreferences {
+		return {
+			// More specific settings
+			organizeImportsAccentCollation: config.get<boolean>('organizeImports.accentCollation'),
+			organizeImportsCaseFirst: withDefaultAsUndefined(config.get<'default' | 'upper' | 'lower'>('organizeImports.caseFirst', 'default'), 'default'),
+			organizeImportsCollation: config.get<'ordinal' | 'unicode'>('organizeImports.collation'),
+			organizeImportsIgnoreCase: withDefaultAsUndefined(config.get<'auto' | 'caseInsensitive' | 'caseSensitive'>('organizeImports.caseSensitivity'), 'auto'),
+			organizeImportsLocale: config.get<string>('organizeImports.locale'),
+			organizeImportsNumericCollation: config.get<boolean>('organizeImports.numericCollation'),
+			organizeImportsTypeOrder: withDefaultAsUndefined(config.get<'auto' | 'last' | 'inline' | 'first'>('organizeImports.typeOrder', 'auto'), 'auto'),
+		};
+	}
+}
+
+function withDefaultAsUndefined<T, O extends T>(value: T, def: O): Exclude<T, O> | undefined {
+	return value === def ? undefined : value as Exclude<T, O>;
 }
 
 export class InlayHintSettingNames {
diff --git a/extensions/typescript-language-features/src/languageFeatures/fixAll.ts b/extensions/typescript-language-features/src/languageFeatures/fixAll.ts
index 690439218a8..09ab205d918 100644
--- a/extensions/typescript-language-features/src/languageFeatures/fixAll.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/fixAll.ts
@@ -5,7 +5,6 @@
 
 import * as vscode from 'vscode';
 import { DocumentSelector } from '../configuration/documentSelector';
-import { API } from '../tsServer/api';
 import * as errorCodes from '../tsServer/protocol/errorCodes';
 import * as fixNames from '../tsServer/protocol/fixNames';
 import type * as Proto from '../tsServer/protocol/protocol';
@@ -13,7 +12,7 @@ import * as typeConverters from '../typeConverters';
 import { ClientCapability, ITypeScriptServiceClient } from '../typescriptService';
 import { DiagnosticsManager } from './diagnostics';
 import FileConfigurationManager from './fileConfigurationManager';
-import { conditionalRegistration, requireMinVersion, requireSomeCapability } from './util/dependentRegistration';
+import { conditionalRegistration, requireSomeCapability } from './util/dependentRegistration';
 
 
 interface AutoFix {
@@ -250,7 +249,6 @@ export function register(
 	diagnosticsManager: DiagnosticsManager,
 ) {
 	return conditionalRegistration([
-		requireMinVersion(client, API.v300),
 		requireSomeCapability(client, ClientCapability.Semantic),
 	], () => {
 		const provider = new TypeScriptAutoFixProvider(client, fileConfigurationManager, diagnosticsManager);
diff --git a/extensions/typescript-language-features/src/languageFeatures/hover.ts b/extensions/typescript-language-features/src/languageFeatures/hover.ts
index 3012658036f..edb08d029fa 100644
--- a/extensions/typescript-language-features/src/languageFeatures/hover.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/hover.ts
@@ -11,10 +11,11 @@ import { DocumentSelector } from '../configuration/documentSelector';
 import { documentationToMarkdown } from './util/textRendering';
 import * as typeConverters from '../typeConverters';
 import FileConfigurationManager from './fileConfigurationManager';
-
+import { API } from '../tsServer/api';
 
 
 class TypeScriptHoverProvider implements vscode.HoverProvider {
+	private lastHoverAndLevel: [vscode.Hover, number] | undefined;
 
 	public constructor(
 		private readonly client: ITypeScriptServiceClient,
@@ -24,17 +25,24 @@ class TypeScriptHoverProvider implements vscode.HoverProvider {
 	public async provideHover(
 		document: vscode.TextDocument,
 		position: vscode.Position,
-		token: vscode.CancellationToken
-	): Promise<vscode.Hover | undefined> {
+		token: vscode.CancellationToken,
+		context?: vscode.HoverContext,
+	): Promise<vscode.VerboseHover | undefined> {
 		const filepath = this.client.toOpenTsFilePath(document);
 		if (!filepath) {
 			return undefined;
 		}
 
+		const enableExpandableHover = vscode.workspace.getConfiguration('typescript').get('experimental.expandableHover');
+		let verbosityLevel: number | undefined;
+		if (enableExpandableHover && this.client.apiVersion.gte(API.v570)) {
+			verbosityLevel = Math.max(0, this.getPreviousLevel(context?.previousHover) + (context?.verbosityDelta ?? 0));
+		}
+		const args = { ...typeConverters.Position.toFileLocationRequestArgs(filepath, position), verbosityLevel };
+
 		const response = await this.client.interruptGetErr(async () => {
 			await this.fileConfigurationManager.ensureConfigurationForDocument(document, token);
 
-			const args = typeConverters.Position.toFileLocationRequestArgs(filepath, position);
 			return this.client.execute('quickinfo', args, token);
 		});
 
@@ -42,9 +50,24 @@ class TypeScriptHoverProvider implements vscode.HoverProvider {
 			return undefined;
 		}
 
-		return new vscode.Hover(
-			this.getContents(document.uri, response.body, response._serverType),
-			typeConverters.Range.fromTextSpan(response.body));
+		const contents = this.getContents(document.uri, response.body, response._serverType);
+		const range = typeConverters.Range.fromTextSpan(response.body);
+		const hover = verbosityLevel !== undefined ?
+			new vscode.VerboseHover(
+				contents,
+				range,
+				// @ts-expect-error
+				/*canIncreaseVerbosity*/ response.body.canIncreaseVerbosityLevel,
+				/*canDecreaseVerbosity*/ verbosityLevel !== 0
+			) : new vscode.Hover(
+				contents,
+				range
+			);
+
+		if (verbosityLevel !== undefined) {
+			this.lastHoverAndLevel = [hover, verbosityLevel];
+		}
+		return hover;
 	}
 
 	private getContents(
@@ -72,6 +95,13 @@ class TypeScriptHoverProvider implements vscode.HoverProvider {
 		parts.push(md);
 		return parts;
 	}
+
+	private getPreviousLevel(previousHover: vscode.Hover | undefined): number {
+		if (previousHover && this.lastHoverAndLevel && this.lastHoverAndLevel[0] === previousHover) {
+			return this.lastHoverAndLevel[1];
+		}
+		return 0;
+	}
 }
 
 export function register(
diff --git a/extensions/typescript-language-features/src/languageFeatures/refactor.ts b/extensions/typescript-language-features/src/languageFeatures/refactor.ts
index 8dc06235753..0364b7fad3e 100644
--- a/extensions/typescript-language-features/src/languageFeatures/refactor.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/refactor.ts
@@ -541,11 +541,12 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider<TsCodeActi
 			return undefined;
 		}
 
-		const response = await this.client.interruptGetErr(() => {
+		const response = await this.interruptGetErrIfNeeded(context, () => {
 			const file = this.client.toOpenTsFilePath(document);
 			if (!file) {
 				return undefined;
 			}
+
 			this.formattingOptionsManager.ensureConfigurationForDocument(document, token);
 
 			const args: Proto.GetApplicableRefactorsRequestArgs = {
@@ -595,6 +596,17 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider<TsCodeActi
 		return this.pruneInvalidActions(this.appendInvalidActions(actions), context.only, /* numberOfInvalid = */ 5);
 	}
 
+	private interruptGetErrIfNeeded<R>(context: vscode.CodeActionContext, f: () => R): R {
+		// Only interrupt diagnostics computation when code actions are explicitly
+		// (such as using the refactor command or a keybinding). This is a clear
+		// user action so we want to return results as quickly as possible.
+		if (context.triggerKind === vscode.CodeActionTriggerKind.Invoke) {
+			return this.client.interruptGetErr(f);
+		} else {
+			return f();
+		}
+	}
+
 	public async resolveCodeAction(
 		codeAction: TsCodeAction,
 		token: vscode.CancellationToken,
diff --git a/extensions/typescript-language-features/src/languageFeatures/rename.ts b/extensions/typescript-language-features/src/languageFeatures/rename.ts
index 19dc5b93c99..5c86190a53e 100644
--- a/extensions/typescript-language-features/src/languageFeatures/rename.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/rename.ts
@@ -36,10 +36,6 @@ class TypeScriptRenameProvider implements vscode.RenameProvider {
 		position: vscode.Position,
 		token: vscode.CancellationToken
 	): Promise<vscode.Range | undefined> {
-		if (this.client.apiVersion.lt(API.v310)) {
-			return undefined;
-		}
-
 		const response = await this.execRename(document, position, token);
 		if (!response) {
 			return undefined;
diff --git a/extensions/typescript-language-features/src/languageFeatures/semanticTokens.ts b/extensions/typescript-language-features/src/languageFeatures/semanticTokens.ts
index 48c9af7a5a5..7f8d60d3875 100644
--- a/extensions/typescript-language-features/src/languageFeatures/semanticTokens.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/semanticTokens.ts
@@ -4,11 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import * as Proto from '../tsServer/protocol/protocol';
-import { API } from '../tsServer/api';
-import { ClientCapability, ITypeScriptServiceClient } from '../typescriptService';
-import { conditionalRegistration, requireMinVersion, requireSomeCapability } from './util/dependentRegistration';
 import { DocumentSelector } from '../configuration/documentSelector';
+import * as Proto from '../tsServer/protocol/protocol';
+import { ClientCapability, ITypeScriptServiceClient } from '../typescriptService';
+import { conditionalRegistration, requireSomeCapability } from './util/dependentRegistration';
 
 // as we don't do deltas, for performance reasons, don't compute semantic tokens for documents above that limit
 const CONTENT_LENGTH_LIMIT = 100000;
@@ -18,7 +17,6 @@ export function register(
 	client: ITypeScriptServiceClient,
 ) {
 	return conditionalRegistration([
-		requireMinVersion(client, API.v370),
 		requireSomeCapability(client, ClientCapability.Semantic),
 	], () => {
 		const provider = new DocumentSemanticTokensProvider(client);
diff --git a/extensions/typescript-language-features/src/languageFeatures/smartSelect.ts b/extensions/typescript-language-features/src/languageFeatures/smartSelect.ts
index 80887d65180..fa6a6096d37 100644
--- a/extensions/typescript-language-features/src/languageFeatures/smartSelect.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/smartSelect.ts
@@ -5,14 +5,11 @@
 
 import * as vscode from 'vscode';
 import { DocumentSelector } from '../configuration/documentSelector';
-import { API } from '../tsServer/api';
 import type * as Proto from '../tsServer/protocol/protocol';
 import * as typeConverters from '../typeConverters';
 import { ITypeScriptServiceClient } from '../typescriptService';
-import { conditionalRegistration, requireMinVersion } from './util/dependentRegistration';
 
 class SmartSelection implements vscode.SelectionRangeProvider {
-	public static readonly minVersion = API.v350;
 
 	public constructor(
 		private readonly client: ITypeScriptServiceClient
@@ -53,9 +50,5 @@ export function register(
 	selector: DocumentSelector,
 	client: ITypeScriptServiceClient,
 ) {
-	return conditionalRegistration([
-		requireMinVersion(client, SmartSelection.minVersion),
-	], () => {
-		return vscode.languages.registerSelectionRangeProvider(selector.syntax, new SmartSelection(client));
-	});
+	return vscode.languages.registerSelectionRangeProvider(selector.syntax, new SmartSelection(client));
 }
diff --git a/extensions/typescript-language-features/src/languageFeatures/tagClosing.ts b/extensions/typescript-language-features/src/languageFeatures/tagClosing.ts
index 45ac08e14a4..6b47feb3d00 100644
--- a/extensions/typescript-language-features/src/languageFeatures/tagClosing.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/tagClosing.ts
@@ -4,17 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import type * as Proto from '../tsServer/protocol/protocol';
-import { API } from '../tsServer/api';
-import { ITypeScriptServiceClient } from '../typescriptService';
-import { Condition, conditionalRegistration, requireMinVersion } from './util/dependentRegistration';
-import { Disposable } from '../utils/dispose';
 import { DocumentSelector } from '../configuration/documentSelector';
 import { LanguageDescription } from '../configuration/languageDescription';
+import type * as Proto from '../tsServer/protocol/protocol';
 import * as typeConverters from '../typeConverters';
+import { ITypeScriptServiceClient } from '../typescriptService';
+import { Disposable } from '../utils/dispose';
+import { Condition, conditionalRegistration } from './util/dependentRegistration';
 
 class TagClosing extends Disposable {
-	public static readonly minVersion = API.v300;
 
 	private _disposed = false;
 	private _timeout: NodeJS.Timeout | undefined = undefined;
@@ -167,7 +165,6 @@ export function register(
 	client: ITypeScriptServiceClient,
 ) {
 	return conditionalRegistration([
-		requireMinVersion(client, TagClosing.minVersion),
 		requireActiveDocumentSetting(selector.syntax, language)
 	], () => new TagClosing(client));
 }
diff --git a/extensions/typescript-language-features/src/languageFeatures/updatePathsOnRename.ts b/extensions/typescript-language-features/src/languageFeatures/updatePathsOnRename.ts
index 91ca9612e70..bdaa1fc69ff 100644
--- a/extensions/typescript-language-features/src/languageFeatures/updatePathsOnRename.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/updatePathsOnRename.ts
@@ -7,7 +7,6 @@ import * as path from 'path';
 import * as vscode from 'vscode';
 import * as fileSchemes from '../configuration/fileSchemes';
 import { doesResourceLookLikeATypeScriptFile } from '../configuration/languageDescription';
-import { API } from '../tsServer/api';
 import type * as Proto from '../tsServer/protocol/protocol';
 import * as typeConverters from '../typeConverters';
 import { ClientCapability, ITypeScriptServiceClient } from '../typescriptService';
@@ -15,7 +14,7 @@ import { Delayer } from '../utils/async';
 import { nulToken } from '../utils/cancellation';
 import { Disposable } from '../utils/dispose';
 import FileConfigurationManager from './fileConfigurationManager';
-import { conditionalRegistration, requireMinVersion, requireSomeCapability } from './util/dependentRegistration';
+import { conditionalRegistration, requireSomeCapability } from './util/dependentRegistration';
 
 
 const updateImportsOnFileMoveName = 'updateImportsOnFileMove.enabled';
@@ -43,7 +42,6 @@ interface RenameAction {
 }
 
 class UpdateImportsOnFileRenameHandler extends Disposable {
-	public static readonly minVersion = API.v300;
 
 	private readonly _delayer = new Delayer(50);
 	private readonly _pendingRenames = new Set<RenameAction>();
@@ -289,7 +287,6 @@ export function register(
 	handles: (uri: vscode.Uri) => Promise<boolean>,
 ) {
 	return conditionalRegistration([
-		requireMinVersion(client, UpdateImportsOnFileRenameHandler.minVersion),
 		requireSomeCapability(client, ClientCapability.Semantic),
 	], () => {
 		return new UpdateImportsOnFileRenameHandler(client, fileConfigurationManager, handles);
diff --git a/extensions/typescript-language-features/src/languageFeatures/util/textRendering.ts b/extensions/typescript-language-features/src/languageFeatures/util/textRendering.ts
index fe26dd64029..af1a7e601b4 100644
--- a/extensions/typescript-language-features/src/languageFeatures/util/textRendering.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/util/textRendering.ts
@@ -15,24 +15,6 @@ export interface IFilePathToResourceConverter {
 	toResource(filepath: string): vscode.Uri;
 }
 
-function replaceLinks(text: string): string {
-	return text
-		// Http(s) links
-		.replace(/\{@(link|linkplain|linkcode) (https?:\/\/[^ |}]+?)(?:[| ]([^{}\n]+?))?\}/gi, (_, tag: string, link: string, text?: string) => {
-			switch (tag) {
-				case 'linkcode':
-					return `[\`${text ? text.trim() : link}\`](${link})`;
-
-				default:
-					return `[${text ? text.trim() : link}](${link})`;
-			}
-		});
-}
-
-function processInlineTags(text: string): string {
-	return replaceLinks(text);
-}
-
 function getTagBodyText(
 	tag: Proto.JSDocTagInfo,
 	filePathConverter: IFilePathToResourceConverter,
@@ -67,18 +49,19 @@ function getTagBodyText(
 		case 'author': {
 			// fix obsucated email address, #80898
 			const emailMatch = text.match(/(.+)\s<([-.\w]+@[-.\w]+)>/);
-
 			if (emailMatch === null) {
 				return text;
 			} else {
 				return `${emailMatch[1]} ${emailMatch[2]}`;
 			}
 		}
-		case 'default':
+		case 'default': {
 			return makeCodeblock(text);
+		}
+		default: {
+			return text;
+		}
 	}
-
-	return processInlineTags(text);
 }
 
 function getTagDocumentation(
@@ -98,11 +81,10 @@ function getTagDocumentation(
 				if (!doc) {
 					return label;
 				}
-				return label + (doc.match(/\r\n|\n/g) ? '  \n' + processInlineTags(doc) : ` \u2014 ${processInlineTags(doc)}`);
+				return label + (doc.match(/\r\n|\n/g) ? '  \n' + doc : ` \u2014 ${doc}`);
 			}
 			break;
 		}
-
 		case 'return':
 		case 'returns': {
 			// For return(s), we require a non-empty body
@@ -147,7 +129,7 @@ export function asPlainTextWithLinks(
 	parts: readonly Proto.SymbolDisplayPart[] | string,
 	filePathConverter: IFilePathToResourceConverter,
 ): string {
-	return processInlineTags(convertLinkTags(parts, filePathConverter));
+	return convertLinkTags(parts, filePathConverter);
 }
 
 /**
@@ -187,10 +169,10 @@ function convertLinkTags(
 						if (text) {
 							if (/^https?:/.test(text)) {
 								const parts = text.split(' ');
-								if (parts.length === 1) {
+								if (parts.length === 1 && !currentLink.linkcode) {
 									out.push(`<${parts[0]}>`);
-								} else if (parts.length > 1) {
-									const linkText = parts.slice(1).join(' ');
+								} else {
+									const linkText = parts.length > 1 ? parts.slice(1).join(' ') : parts[0];
 									out.push(`[${currentLink.linkcode ? '`' + escapeMarkdownSyntaxTokensForCode(linkText) + '`' : linkText}](${parts[0]})`);
 								}
 							} else {
@@ -224,7 +206,7 @@ function convertLinkTags(
 				break;
 		}
 	}
-	return processInlineTags(out.join(''));
+	return out.join('');
 }
 
 function escapeMarkdownSyntaxTokensForCode(text: string): string {
diff --git a/extensions/typescript-language-features/src/languageFeatures/workspaceSymbols.ts b/extensions/typescript-language-features/src/languageFeatures/workspaceSymbols.ts
index 3240c524781..24fb7068b74 100644
--- a/extensions/typescript-language-features/src/languageFeatures/workspaceSymbols.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/workspaceSymbols.ts
@@ -94,7 +94,7 @@ class TypeScriptWorkspaceSymbolProvider implements vscode.WorkspaceSymbolProvide
 		}
 
 		const uri = this.client.toResource(item.file);
-		if (fileSchemes.isOfScheme(uri, fileSchemes.chatCodeBlock, fileSchemes.chatBackingCodeBlock)) {
+		if (fileSchemes.isOfScheme(uri, fileSchemes.chatCodeBlock)) {
 			return;
 		}
 
diff --git a/extensions/typescript-language-features/src/languageProvider.ts b/extensions/typescript-language-features/src/languageProvider.ts
index a1927409869..7b95591604b 100644
--- a/extensions/typescript-language-features/src/languageProvider.ts
+++ b/extensions/typescript-language-features/src/languageProvider.ts
@@ -138,7 +138,11 @@ export default class LanguageProvider extends Disposable {
 		this.client.bufferSyncSupport.requestAllDiagnostics();
 	}
 
-	public diagnosticsReceived(diagnosticsKind: DiagnosticKind, file: vscode.Uri, diagnostics: (vscode.Diagnostic & { reportUnnecessary: any; reportDeprecated: any })[]): void {
+	public diagnosticsReceived(
+		diagnosticsKind: DiagnosticKind,
+		file: vscode.Uri,
+		diagnostics: (vscode.Diagnostic & { reportUnnecessary: any; reportDeprecated: any })[],
+		ranges: vscode.Range[] | undefined): void {
 		if (diagnosticsKind !== DiagnosticKind.Syntax && !this.client.hasCapabilityForResource(file, ClientCapability.Semantic)) {
 			return;
 		}
@@ -175,7 +179,7 @@ export default class LanguageProvider extends Disposable {
 				}
 			}
 			return true;
-		}));
+		}), ranges);
 	}
 
 	public configFileDiagnosticsReceived(file: vscode.Uri, diagnostics: vscode.Diagnostic[]): void {
diff --git a/extensions/typescript-language-features/src/test/unit/textRendering.test.ts b/extensions/typescript-language-features/src/test/unit/textRendering.test.ts
index b13f682f715..c2a8bafb8c0 100644
--- a/extensions/typescript-language-features/src/test/unit/textRendering.test.ts
+++ b/extensions/typescript-language-features/src/test/unit/textRendering.test.ts
@@ -28,17 +28,19 @@ suite('typescript.previewer', () => {
 	test('Should parse url jsdoc @link', () => {
 		assert.strictEqual(
 			documentationToMarkdown(
-				'x {@link http://www.example.com/foo} y {@link https://api.jquery.com/bind/#bind-eventType-eventData-handler} z',
+				// 'x {@link http://www.example.com/foo} y {@link https://api.jquery.com/bind/#bind-eventType-eventData-handler} z',
+				[{ "text": "x ", "kind": "text" }, { "text": "{@link ", "kind": "link" }, { "text": "http://www.example.com/foo", "kind": "linkText" }, { "text": "}", "kind": "link" }, { "text": " y ", "kind": "text" }, { "text": "{@link ", "kind": "link" }, { "text": "https://api.jquery.com/bind/#bind-eventType-eventData-handler", "kind": "linkText" }, { "text": "}", "kind": "link" }, { "text": " z", "kind": "text" }],
 				[],
 				noopToResource, undefined
 			).value,
-			'x [http://www.example.com/foo](http://www.example.com/foo) y [https://api.jquery.com/bind/#bind-eventType-eventData-handler](https://api.jquery.com/bind/#bind-eventType-eventData-handler) z');
+			'x <http://www.example.com/foo> y <https://api.jquery.com/bind/#bind-eventType-eventData-handler> z');
 	});
 
 	test('Should parse url jsdoc @link with text', () => {
 		assert.strictEqual(
 			documentationToMarkdown(
-				'x {@link http://www.example.com/foo abc xyz} y {@link http://www.example.com/bar|b a z} z',
+				// 'x {@link http://www.example.com/foo abc xyz} y {@link http://www.example.com/bar|b a z} z',
+				[{ "text": "x ", "kind": "text" }, { "text": "{@link ", "kind": "link" }, { "text": "http://www.example.com/foo abc xyz", "kind": "linkText" }, { "text": "}", "kind": "link" }, { "text": " y ", "kind": "text" }, { "text": "{@link ", "kind": "link" }, { "text": "http://www.example.com/bar b a z", "kind": "linkText" }, { "text": "}", "kind": "link" }, { "text": " z", "kind": "text" }],
 				[],
 				noopToResource, undefined
 			).value,
@@ -48,11 +50,12 @@ suite('typescript.previewer', () => {
 	test('Should treat @linkcode jsdocs links as monospace', () => {
 		assert.strictEqual(
 			documentationToMarkdown(
-				'x {@linkcode http://www.example.com/foo} y {@linkplain http://www.example.com/bar} z',
+				// 'x {@linkcode http://www.example.com/foo} y {@linkplain http://www.example.com/bar} z',
+				[{ "text": "x ", "kind": "text" }, { "text": "{@linkcode ", "kind": "link" }, { "text": "http://www.example.com/foo", "kind": "linkText" }, { "text": "}", "kind": "link" }, { "text": " y ", "kind": "text" }, { "text": "{@linkplain ", "kind": "link" }, { "text": "http://www.example.com/bar", "kind": "linkText" }, { "text": "}", "kind": "link" }, { "text": " z", "kind": "text" }],
 				[],
 				noopToResource, undefined
 			).value,
-			'x [`http://www.example.com/foo`](http://www.example.com/foo) y [http://www.example.com/bar](http://www.example.com/bar) z');
+			'x [`http://www.example.com/foo`](http://www.example.com/foo) y <http://www.example.com/bar> z');
 	});
 
 	test('Should parse url jsdoc @link in param tag', () => {
@@ -60,22 +63,13 @@ suite('typescript.previewer', () => {
 			tagsToMarkdown([
 				{
 					name: 'param',
-					text: 'a x {@link http://www.example.com/foo abc xyz} y {@link http://www.example.com/bar|b a z} z'
+					// a x {@link http://www.example.com/foo abc xyz} y {@link http://www.example.com/bar|b a z} z
+					text: [{ "text": "a", "kind": "parameterName" }, { "text": " ", "kind": "space" }, { "text": "x ", "kind": "text" }, { "text": "{@link ", "kind": "link" }, { "text": "http://www.example.com/foo abc xyz", "kind": "linkText" }, { "text": "}", "kind": "link" }, { "text": " y ", "kind": "text" }, { "text": "{@link ", "kind": "link" }, { "text": "http://www.example.com/bar b a z", "kind": "linkText" }, { "text": "}", "kind": "link" }, { "text": " z", "kind": "text" }],
 				}
 			], noopToResource),
 			'*@param* `a` — x [abc xyz](http://www.example.com/foo) y [b a z](http://www.example.com/bar) z');
 	});
 
-	test('Should ignore unclosed jsdocs @link', () => {
-		assert.strictEqual(
-			documentationToMarkdown(
-				'x {@link http://www.example.com/foo y {@link http://www.example.com/bar bar} z',
-				[],
-				noopToResource, undefined
-			).value,
-			'x {@link http://www.example.com/foo y [bar](http://www.example.com/bar) z');
-	});
-
 	test('Should support non-ascii characters in parameter name (#90108)', () => {
 		assert.strictEqual(
 			tagsToMarkdown([
diff --git a/extensions/typescript-language-features/src/tsServer/api.ts b/extensions/typescript-language-features/src/tsServer/api.ts
index 4f26db47513..4ddc29944f0 100644
--- a/extensions/typescript-language-features/src/tsServer/api.ts
+++ b/extensions/typescript-language-features/src/tsServer/api.ts
@@ -13,16 +13,7 @@ export class API {
 	}
 
 	public static readonly defaultVersion = API.fromSimpleString('1.0.0');
-	public static readonly v300 = API.fromSimpleString('3.0.0');
-	public static readonly v310 = API.fromSimpleString('3.1.0');
-	public static readonly v314 = API.fromSimpleString('3.1.4');
-	public static readonly v320 = API.fromSimpleString('3.2.0');
-	public static readonly v333 = API.fromSimpleString('3.3.3');
-	public static readonly v340 = API.fromSimpleString('3.4.0');
-	public static readonly v350 = API.fromSimpleString('3.5.0');
-	public static readonly v370 = API.fromSimpleString('3.7.0');
 	public static readonly v380 = API.fromSimpleString('3.8.0');
-	public static readonly v381 = API.fromSimpleString('3.8.1');
 	public static readonly v390 = API.fromSimpleString('3.9.0');
 	public static readonly v400 = API.fromSimpleString('4.0.0');
 	public static readonly v401 = API.fromSimpleString('4.0.1');
@@ -37,7 +28,8 @@ export class API {
 	public static readonly v520 = API.fromSimpleString('5.2.0');
 	public static readonly v544 = API.fromSimpleString('5.4.4');
 	public static readonly v540 = API.fromSimpleString('5.4.0');
-	public static readonly v550 = API.fromSimpleString('5.5.0');
+	public static readonly v560 = API.fromSimpleString('5.6.0');
+	public static readonly v570 = API.fromSimpleString('5.7.0');
 
 	public static fromVersionString(versionString: string): API {
 		let version = semver.valid(versionString);
diff --git a/extensions/typescript-language-features/src/tsServer/bufferSyncSupport.ts b/extensions/typescript-language-features/src/tsServer/bufferSyncSupport.ts
index 87c715982c2..56d2896fa33 100644
--- a/extensions/typescript-language-features/src/tsServer/bufferSyncSupport.ts
+++ b/extensions/typescript-language-features/src/tsServer/bufferSyncSupport.ts
@@ -78,24 +78,14 @@ class BufferSynchronizer {
 	}
 
 	public open(resource: vscode.Uri, args: Proto.OpenRequestArgs) {
-		if (this.supportsBatching) {
-			this.updatePending(resource, new OpenOperation(args, args.scriptKindName));
-		} else {
-			this.client.executeWithoutWaitingForResponse('open', args);
-		}
+		this.updatePending(resource, new OpenOperation(args, args.scriptKindName));
 	}
 
 	/**
 	 * @return Was the buffer open?
 	 */
 	public close(resource: vscode.Uri, filepath: string, scriptKind: ScriptKind | undefined): boolean {
-		if (this.supportsBatching) {
-			return this.updatePending(resource, new CloseOperation(filepath, scriptKind));
-		} else {
-			const args: Proto.FileRequestArgs = { file: filepath };
-			this.client.executeWithoutWaitingForResponse('close', args);
-			return true;
-		}
+		return this.updatePending(resource, new CloseOperation(filepath, scriptKind));
 	}
 
 	public change(resource: vscode.Uri, filepath: string, events: readonly vscode.TextDocumentContentChangeEvent[]) {
@@ -103,24 +93,14 @@ class BufferSynchronizer {
 			return;
 		}
 
-		if (this.supportsBatching) {
-			this.updatePending(resource, new ChangeOperation({
-				fileName: filepath,
-				textChanges: events.map((change): Proto.CodeEdit => ({
-					newText: change.text,
-					start: typeConverters.Position.toLocation(change.range.start),
-					end: typeConverters.Position.toLocation(change.range.end),
-				})).reverse(), // Send the edits end-of-document to start-of-document order
-			}));
-		} else {
-			for (const { range, text } of events) {
-				const args: Proto.ChangeRequestArgs = {
-					insertString: text,
-					...typeConverters.Range.toFormattingRequestArgs(filepath, range)
-				};
-				this.client.executeWithoutWaitingForResponse('change', args);
-			}
-		}
+		this.updatePending(resource, new ChangeOperation({
+			fileName: filepath,
+			textChanges: events.map((change): Proto.CodeEdit => ({
+				newText: change.text,
+				start: typeConverters.Position.toLocation(change.range.start),
+				end: typeConverters.Position.toLocation(change.range.end),
+			})).reverse(), // Send the edits end-of-document to start-of-document order
+		}));
 	}
 
 	public reset(): void {
@@ -136,12 +116,6 @@ class BufferSynchronizer {
 	}
 
 	private flush() {
-		if (!this.supportsBatching) {
-			// We've already eagerly synchronized
-			this._pending.clear();
-			return;
-		}
-
 		if (this._pending.size > 0) {
 			const closedFiles: string[] = [];
 			const openFiles: Proto.OpenRequestArgs[] = [];
@@ -158,10 +132,6 @@ class BufferSynchronizer {
 		}
 	}
 
-	private get supportsBatching(): boolean {
-		return this.client.apiVersion.gte(API.v340);
-	}
-
 	private updatePending(resource: vscode.Uri, op: BufferOperation): boolean {
 		switch (op.type) {
 			case BufferOperationType.Close: {
@@ -227,7 +197,7 @@ class SyncedBuffer {
 			return tsRoot?.startsWith(inMemoryResourcePrefix) ? undefined : tsRoot;
 		}
 
-		return fileSchemes.isOfScheme(resource, fileSchemes.officeScript, fileSchemes.chatCodeBlock, fileSchemes.chatBackingCodeBlock) ? '/' : undefined;
+		return fileSchemes.isOfScheme(resource, fileSchemes.officeScript, fileSchemes.chatCodeBlock) ? '/' : undefined;
 	}
 
 	public get resource(): vscode.Uri {
@@ -275,12 +245,12 @@ class SyncedBufferMap extends ResourceMap<SyncedBuffer> {
 }
 
 class PendingDiagnostics extends ResourceMap<number> {
-	public getOrderedFileSet(): ResourceMap<void> {
+	public getOrderedFileSet(): ResourceMap<void | vscode.Range[]> {
 		const orderedResources = Array.from(this.entries())
 			.sort((a, b) => a.value - b.value)
 			.map(entry => entry.resource);
 
-		const map = new ResourceMap<void>(this._normalizePath, this.config);
+		const map = new ResourceMap<void | vscode.Range[]>(this._normalizePath, this.config);
 		for (const resource of orderedResources) {
 			map.set(resource, undefined);
 		}
@@ -292,7 +262,7 @@ class GetErrRequest {
 
 	public static executeGetErrRequest(
 		client: ITypeScriptServiceClient,
-		files: ResourceMap<void>,
+		files: ResourceMap<void | vscode.Range[]>,
 		onDone: () => void
 	) {
 		return new GetErrRequest(client, files, onDone);
@@ -303,7 +273,7 @@ class GetErrRequest {
 
 	private constructor(
 		private readonly client: ITypeScriptServiceClient,
-		public readonly files: ResourceMap<void>,
+		public readonly files: ResourceMap<void | vscode.Range[]>,
 		onDone: () => void
 	) {
 		if (!this.isErrorReportingEnabled()) {
@@ -313,19 +283,39 @@ class GetErrRequest {
 		}
 
 		const supportsSyntaxGetErr = this.client.apiVersion.gte(API.v440);
-		const allFiles = coalesce(Array.from(files.entries())
-			.filter(entry => supportsSyntaxGetErr || client.hasCapabilityForResource(entry.resource, ClientCapability.Semantic))
+		const fileEntries = Array.from(files.entries()).filter(entry => supportsSyntaxGetErr || client.hasCapabilityForResource(entry.resource, ClientCapability.Semantic));
+		const allFiles = coalesce(fileEntries
 			.map(entry => client.toTsFilePath(entry.resource)));
 
 		if (!allFiles.length) {
 			this._done = true;
 			setImmediate(onDone);
 		} else {
-			const request = this.areProjectDiagnosticsEnabled()
+			let request;
+			if (this.areProjectDiagnosticsEnabled()) {
 				// Note that geterrForProject is almost certainly not the api we want here as it ends up computing far
 				// too many diagnostics
-				? client.executeAsync('geterrForProject', { delay: 0, file: allFiles[0] }, this._token.token)
-				: client.executeAsync('geterr', { delay: 0, files: allFiles }, this._token.token);
+				request = client.executeAsync('geterrForProject', { delay: 0, file: allFiles[0] }, this._token.token);
+			}
+			else {
+				let requestFiles;
+				if (this.areRegionDiagnosticsEnabled()) {
+					requestFiles = coalesce(fileEntries
+						.map(entry => {
+							const file = client.toTsFilePath(entry.resource);
+							const ranges = entry.value;
+							if (file && ranges) {
+								return typeConverters.Range.toFileRangesRequestArgs(file, ranges);
+							}
+
+							return file;
+						}));
+				}
+				else {
+					requestFiles = allFiles;
+				}
+				request = client.executeAsync('geterr', { delay: 0, files: requestFiles }, this._token.token);
+			}
 
 			request.finally(() => {
 				if (this._done) {
@@ -350,6 +340,10 @@ class GetErrRequest {
 		return this.client.configuration.enableProjectDiagnostics && this.client.capabilities.has(ClientCapability.Semantic);
 	}
 
+	private areRegionDiagnosticsEnabled() {
+		return this.client.configuration.enableRegionDiagnostics && this.client.apiVersion.gte(API.v560);
+	}
+
 	public cancel(): any {
 		if (!this._done) {
 			this._token.cancel();
@@ -638,6 +632,10 @@ export default class BufferSyncSupport extends Disposable {
 		this.synchronizer.beforeCommand(command);
 	}
 
+	public lineCount(resource: vscode.Uri): number | undefined {
+		return this.syncedBuffers.get(resource)?.lineCount;
+	}
+
 	private onDidCloseTextDocument(document: vscode.TextDocument): void {
 		this.closeResource(document.uri);
 	}
@@ -722,7 +720,9 @@ export default class BufferSyncSupport extends Disposable {
 
 		// Add all open TS buffers to the geterr request. They might be visible
 		for (const buffer of this.syncedBuffers.values()) {
-			orderedFileSet.set(buffer.resource, undefined);
+			const editors = vscode.window.visibleTextEditors.filter(editor => editor.document.uri.toString() === buffer.resource.toString());
+			const visibleRanges = editors.flatMap(editor => editor.visibleRanges);
+			orderedFileSet.set(buffer.resource, visibleRanges.length ? visibleRanges : undefined);
 		}
 
 		for (const { resource } of orderedFileSet.entries()) {
@@ -752,7 +752,7 @@ export default class BufferSyncSupport extends Disposable {
 	}
 
 	private shouldValidate(buffer: SyncedBuffer): boolean {
-		if (fileSchemes.isOfScheme(buffer.resource, fileSchemes.chatCodeBlock, fileSchemes.chatBackingCodeBlock)) {
+		if (fileSchemes.isOfScheme(buffer.resource, fileSchemes.chatCodeBlock)) {
 			return false;
 		}
 
diff --git a/extensions/typescript-language-features/src/tsServer/protocol/protocol.const.ts b/extensions/typescript-language-features/src/tsServer/protocol/protocol.const.ts
index 4f02ed29427..ed4806e6fdd 100644
--- a/extensions/typescript-language-features/src/tsServer/protocol/protocol.const.ts
+++ b/extensions/typescript-language-features/src/tsServer/protocol/protocol.const.ts
@@ -78,6 +78,7 @@ export enum EventName {
 	syntaxDiag = 'syntaxDiag',
 	semanticDiag = 'semanticDiag',
 	suggestionDiag = 'suggestionDiag',
+	regionSemanticDiag = 'regionSemanticDiag',
 	configFileDiag = 'configFileDiag',
 	telemetry = 'telemetry',
 	projectLanguageServiceState = 'projectLanguageServiceState',
@@ -91,6 +92,7 @@ export enum EventName {
 	createFileWatcher = 'createFileWatcher',
 	createDirectoryWatcher = 'createDirectoryWatcher',
 	closeFileWatcher = 'closeFileWatcher',
+	requestCompleted = 'requestCompleted',
 }
 
 export enum OrganizeImportsMode {
diff --git a/extensions/typescript-language-features/src/tsServer/protocol/protocol.d.ts b/extensions/typescript-language-features/src/tsServer/protocol/protocol.d.ts
index 747e7c22e37..cd70b6b7d41 100644
--- a/extensions/typescript-language-features/src/tsServer/protocol/protocol.d.ts
+++ b/extensions/typescript-language-features/src/tsServer/protocol/protocol.d.ts
@@ -19,5 +19,18 @@ declare module '../../../../node_modules/typescript/lib/typescript' {
 		interface Response {
 			readonly _serverType?: ServerType;
 		}
+
+		//#region PreparePasteEdits
+		interface PreparePasteEditsRequest extends FileRequest {
+			command: 'preparePasteEdits';
+			arguments: PreparePasteEditsRequestArgs;
+		}
+		interface PreparePasteEditsRequestArgs extends FileRequestArgs {
+			copiedTextSpan: TextSpan[];
+		}
+		interface PreparePasteEditsResponse extends Response {
+			body: boolean;
+		}
+		//#endregion
 	}
 }
diff --git a/extensions/typescript-language-features/src/tsServer/server.ts b/extensions/typescript-language-features/src/tsServer/server.ts
index 883aa6830bd..4e41f7aa79a 100644
--- a/extensions/typescript-language-features/src/tsServer/server.ts
+++ b/extensions/typescript-language-features/src/tsServer/server.ts
@@ -166,6 +166,9 @@ export class SingleTsServer extends Disposable implements ITypeScriptServer {
 							this._tracer.traceRequestCompleted(this._serverId, 'requestCompleted', seq, callback);
 							callback.onSuccess(undefined);
 						}
+						if ((event as Proto.RequestCompletedEvent).body.performanceData) {
+							this._onEvent.fire(event);
+						}
 					} else {
 						this._tracer.traceEvent(this._serverId, event);
 						this._onEvent.fire(event);
diff --git a/extensions/typescript-language-features/src/tsServer/serverProcess.browser.ts b/extensions/typescript-language-features/src/tsServer/serverProcess.browser.ts
index 71daf1fb0b6..5adf1866112 100644
--- a/extensions/typescript-language-features/src/tsServer/serverProcess.browser.ts
+++ b/extensions/typescript-language-features/src/tsServer/serverProcess.browser.ts
@@ -40,7 +40,7 @@ export class WorkerServerProcessFactory implements TsServerProcessFactory {
 		version: TypeScriptVersion,
 		args: readonly string[],
 		kind: TsServerProcessKind,
-		_configuration: TypeScriptServiceConfiguration,
+		configuration: TypeScriptServiceConfiguration,
 		_versionManager: TypeScriptVersionManager,
 		_nodeVersionManager: NodeVersionManager,
 		tsServerLog: TsServerLog | undefined,
@@ -50,10 +50,10 @@ export class WorkerServerProcessFactory implements TsServerProcessFactory {
 			...args,
 			// Explicitly give TS Server its path so it can load local resources
 			'--executingFilePath', tsServerPath,
+			// Enable/disable web type acquisition
+			(configuration.webTypeAcquisitionEnabled && supportsReadableByteStreams() ? '--experimentalTypeAcquisition' : '--disableAutomaticTypingAcquisition'),
 		];
-		if (_configuration.webTypeAcquisitionEnabled && supportsReadableByteStreams()) {
-			launchArgs.push('--experimentalTypeAcquisition');
-		}
+
 		return new WorkerServerProcess(kind, tsServerPath, this._extensionUri, launchArgs, tsServerLog, this._logger);
 	}
 }
diff --git a/extensions/typescript-language-features/src/tsServer/spawner.ts b/extensions/typescript-language-features/src/tsServer/spawner.ts
index 364c0f07dae..aac3186631e 100644
--- a/extensions/typescript-language-features/src/tsServer/spawner.ts
+++ b/extensions/typescript-language-features/src/tsServer/spawner.ts
@@ -116,12 +116,9 @@ export class TypeScriptServerSpawner {
 				return CompositeServerType.Single;
 
 			case SyntaxServerConfiguration.Auto:
-				if (version.apiVersion?.gte(API.v340)) {
-					return version.apiVersion?.gte(API.v400)
-						? CompositeServerType.DynamicSeparateSyntax
-						: CompositeServerType.SeparateSyntax;
-				}
-				return CompositeServerType.Single;
+				return version.apiVersion?.gte(API.v400)
+					? CompositeServerType.DynamicSeparateSyntax
+					: CompositeServerType.SeparateSyntax;
 		}
 	}
 
@@ -271,12 +268,20 @@ export class TypeScriptServerSpawner {
 
 		args.push('--noGetErrOnBackgroundUpdate');
 
+		const configUseVsCodeWatcher = configuration.useVsCodeWatcher;
+		const isYarnPnp = apiVersion.isYarnPnp();
 		if (
 			apiVersion.gte(API.v544)
-			&& configuration.useVsCodeWatcher
-			&& !apiVersion.isYarnPnp() // Disable for yarn pnp as it currently breaks with the VS Code watcher
+			&& configUseVsCodeWatcher
+			&& !isYarnPnp // Disable for yarn pnp as it currently breaks with the VS Code watcher
 		) {
 			args.push('--canUseWatchEvents');
+		} else {
+			if (!configUseVsCodeWatcher) {
+				this._logger.info(`<${kind}> Falling back to legacy node.js based file watching because of user settings.`);
+			} else if (isYarnPnp) {
+				this._logger.info(`<${kind}> Falling back to legacy node.js based file watching because of Yarn PnP.`);
+			}
 		}
 
 		args.push('--validateDefaultNpmLocation');
diff --git a/extensions/typescript-language-features/src/tsconfig.ts b/extensions/typescript-language-features/src/tsconfig.ts
index 04f08a128bc..e85c715e875 100644
--- a/extensions/typescript-language-features/src/tsconfig.ts
+++ b/extensions/typescript-language-features/src/tsconfig.ts
@@ -76,6 +76,10 @@ function inferredProjectConfigSnippet(
 	config: TypeScriptServiceConfiguration
 ) {
 	const baseConfig = inferredProjectCompilerOptions(version, projectType, config);
+	if (projectType === ProjectType.TypeScript) {
+		delete baseConfig.allowImportingTsExtensions;
+	}
+
 	const compilerOptions = Object.keys(baseConfig).map(key => `"${key}": ${JSON.stringify(baseConfig[key])}`);
 	return new vscode.SnippetString(`{
 	"compilerOptions": {
diff --git a/extensions/typescript-language-features/src/typeConverters.ts b/extensions/typescript-language-features/src/typeConverters.ts
index 58babe2bda3..a860251bb59 100644
--- a/extensions/typescript-language-features/src/typeConverters.ts
+++ b/extensions/typescript-language-features/src/typeConverters.ts
@@ -26,14 +26,23 @@ export namespace Range {
 			Math.max(0, start.line - 1), Math.max(start.offset - 1, 0),
 			Math.max(0, end.line - 1), Math.max(0, end.offset - 1));
 
-	export const toFileRangeRequestArgs = (file: string, range: vscode.Range): Proto.FileRangeRequestArgs => ({
-		file,
+	export const toFileRange = (range: vscode.Range): Proto.FileRange => ({
 		startLine: range.start.line + 1,
 		startOffset: range.start.character + 1,
 		endLine: range.end.line + 1,
 		endOffset: range.end.character + 1
 	});
 
+	export const toFileRangeRequestArgs = (file: string, range: vscode.Range): Proto.FileRangeRequestArgs => ({
+		file,
+		...toFileRange(range)
+	});
+
+	export const toFileRangesRequestArgs = (file: string, ranges: vscode.Range[]): Proto.FileRangesRequestArgs => ({
+		file,
+		ranges: ranges.map(toFileRange)
+	});
+
 	export const toFormattingRequestArgs = (file: string, range: vscode.Range): Proto.FormatRequestArgs => ({
 		file,
 		line: range.start.line + 1,
diff --git a/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts b/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts
index da651e71044..c44bfc3ac3f 100644
--- a/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts
+++ b/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts
@@ -90,8 +90,8 @@ export default class TypeScriptServiceClientHost extends Disposable {
 			services,
 			allModeIds));
 
-		this.client.onDiagnosticsReceived(({ kind, resource, diagnostics }) => {
-			this.diagnosticsReceived(kind, resource, diagnostics);
+		this.client.onDiagnosticsReceived(({ kind, resource, diagnostics, spans }) => {
+			this.diagnosticsReceived(kind, resource, diagnostics, spans);
 		}, null, this._disposables);
 
 		this.client.onConfigDiagnosticsReceived(diag => this.configFileDiagnosticsReceived(diag), null, this._disposables);
@@ -236,14 +236,16 @@ export default class TypeScriptServiceClientHost extends Disposable {
 	private async diagnosticsReceived(
 		kind: DiagnosticKind,
 		resource: vscode.Uri,
-		diagnostics: Proto.Diagnostic[]
+		diagnostics: Proto.Diagnostic[],
+		spans: Proto.TextSpan[] | undefined,
 	): Promise<void> {
 		const language = await this.findLanguage(resource);
 		if (language) {
 			language.diagnosticsReceived(
 				kind,
 				resource,
-				this.createMarkerDatas(diagnostics, language.diagnosticSource));
+				this.createMarkerDatas(diagnostics, language.diagnosticSource),
+				spans?.map(span => typeConverters.Range.fromTextSpan(span)));
 		}
 	}
 
diff --git a/extensions/typescript-language-features/src/typescriptService.ts b/extensions/typescript-language-features/src/typescriptService.ts
index 931b287df03..90528ee47dc 100644
--- a/extensions/typescript-language-features/src/typescriptService.ts
+++ b/extensions/typescript-language-features/src/typescriptService.ts
@@ -78,6 +78,7 @@ interface StandardTsServerRequests {
 	'linkedEditingRange': [Proto.FileLocationRequestArgs, Proto.LinkedEditingRangeResponse];
 	'mapCode': [Proto.MapCodeRequestArgs, Proto.MapCodeResponse];
 	'getPasteEdits': [Proto.GetPasteEditsRequestArgs, Proto.GetPasteEditsResponse];
+	'preparePasteEdits': [Proto.PreparePasteEditsRequestArgs, Proto.PreparePasteEditsResponse];
 }
 
 interface NoResponseTsServerRequests {
diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts
index 24742f99219..a1f06a3dd65 100644
--- a/extensions/typescript-language-features/src/typescriptServiceClient.ts
+++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts
@@ -5,6 +5,7 @@
 
 import * as path from 'path';
 import * as vscode from 'vscode';
+import { homedir } from 'os';
 import { ServiceConfigurationProvider, SyntaxServerConfiguration, TsServerLogLevel, TypeScriptServiceConfiguration, areServiceConfigurationsEqual } from './configuration/configuration';
 import * as fileSchemes from './configuration/fileSchemes';
 import { Schemes } from './configuration/schemes';
@@ -30,6 +31,7 @@ import { TypeScriptVersionManager } from './tsServer/versionManager';
 import { ITypeScriptVersionProvider, TypeScriptVersion } from './tsServer/versionProvider';
 import { ClientCapabilities, ClientCapability, ExecConfig, ITypeScriptServiceClient, ServerResponse, TypeScriptRequests } from './typescriptService';
 import { Disposable, DisposableStore, disposeAll } from './utils/dispose';
+import { hash } from './utils/hash';
 import { isWeb, isWebAndHasSharedArrayBuffers } from './utils/platform';
 
 
@@ -37,6 +39,7 @@ export interface TsDiagnostics {
 	readonly kind: DiagnosticKind;
 	readonly resource: vscode.Uri;
 	readonly diagnostics: Proto.Diagnostic[];
+	readonly spans?: Proto.TextSpan[];
 }
 
 interface ToCancelOnResourceChanged {
@@ -140,7 +143,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 
 	constructor(
 		private readonly context: vscode.ExtensionContext,
-		onCaseInsenitiveFileSystem: boolean,
+		onCaseInsensitiveFileSystem: boolean,
 		services: {
 			pluginManager: PluginManager;
 			logDirectoryProvider: ILogDirectoryProvider;
@@ -190,7 +193,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 			this.restartTsServer();
 		}));
 
-		this.bufferSyncSupport = new BufferSyncSupport(this, allModeIds, onCaseInsenitiveFileSystem);
+		this.bufferSyncSupport = new BufferSyncSupport(this, allModeIds, onCaseInsensitiveFileSystem);
 		this.onReady(() => { this.bufferSyncSupport.listen(); });
 
 		this.bufferSyncSupport.onDelete(resource => {
@@ -231,7 +234,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 			return this.apiVersion.fullVersionString;
 		});
 
-		this.diagnosticsManager = new DiagnosticsManager('typescript', this._configuration, this.telemetryReporter, onCaseInsenitiveFileSystem);
+		this.diagnosticsManager = new DiagnosticsManager('typescript', this._configuration, this.telemetryReporter, onCaseInsensitiveFileSystem);
 		this.typescriptServerSpawner = new TypeScriptServerSpawner(this.versionProvider, this._versionManager, this._nodeVersionManager, this.logDirectoryProvider, this.pluginPathsProvider, this.logger, this.telemetryReporter, this.tracer, this.processFactory);
 
 		this._register(this.pluginManager.onDidUpdateConfig(update => {
@@ -423,17 +426,31 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 		this.serverState = new ServerState.Running(handle, apiVersion, undefined, true);
 		this.lastStart = Date.now();
 
+
+		/* __GDPR__FRAGMENT__
+			"TypeScriptServerEnvCommonProperties" : {
+				"hasGlobalPlugins": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"globalPluginNameHashes": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			}
+		*/
+		const typeScriptServerEnvCommonProperties = {
+			hasGlobalPlugins: this.pluginManager.plugins.length > 0,
+			globalPluginNameHashes: JSON.stringify(this.pluginManager.plugins.map(plugin => hash(plugin.name))),
+		};
+
 		/* __GDPR__
 			"tsserver.spawned" : {
 				"owner": "mjbvz",
 				"${include}": [
-					"${TypeScriptCommonProperties}"
+					"${TypeScriptCommonProperties}",
+					"${TypeScriptServerEnvCommonProperties}"
 				],
 				"localTypeScriptVersion": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 				"typeScriptVersionSource": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 			}
 		*/
 		this.logTelemetry('tsserver.spawned', {
+			...typeScriptServerEnvCommonProperties,
 			localTypeScriptVersion: this.versionProvider.localVersion ? this.versionProvider.localVersion.displayName : '',
 			typeScriptVersionSource: version.source,
 		});
@@ -458,11 +475,14 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 				"tsserver.error" : {
 					"owner": "mjbvz",
 					"${include}": [
-						"${TypeScriptCommonProperties}"
+						"${TypeScriptCommonProperties}",
+						"${TypeScriptServerEnvCommonProperties}"
 					]
 				}
 			*/
-			this.logTelemetry('tsserver.error');
+			this.logTelemetry('tsserver.error', {
+				...typeScriptServerEnvCommonProperties
+			});
 			this.serviceExited(false, apiVersion);
 		});
 
@@ -475,14 +495,19 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 			/* __GDPR__
 				"tsserver.exitWithCode" : {
 					"owner": "mjbvz",
-					"code" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-					"signal" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
 					"${include}": [
-						"${TypeScriptCommonProperties}"
-					]
+						"${TypeScriptCommonProperties}",
+						"${TypeScriptServerEnvCommonProperties}"
+					],
+					"code" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+					"signal" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
 				}
 			*/
-			this.logTelemetry('tsserver.exitWithCode', { code: code ?? undefined, signal: signal ?? undefined });
+			this.logTelemetry('tsserver.exitWithCode', {
+				...typeScriptServerEnvCommonProperties,
+				code: code ?? undefined,
+				signal: signal ?? undefined,
+			});
 
 			if (this.token !== mytoken) {
 				// this is coming from an old process
@@ -672,7 +697,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 				if (!this._isPromptingAfterCrash) {
 					if (this.pluginManager.plugins.length) {
 						prompt = vscode.window.showWarningMessage<vscode.MessageItem>(
-							vscode.l10n.t("The JS/TS language service crashed.\nThis may be caused by a plugin contributed by one of these extensions: {0}.\nPlease try disabling these extensions before filing an issue against VS Code.", pluginExtensionList), reportIssueItem);
+							vscode.l10n.t("The JS/TS language service crashed.\nThis may be caused by a plugin contributed by one of these extensions: {0}.\nPlease try disabling these extensions before filing an issue against VS Code.", pluginExtensionList));
 					} else {
 						prompt = vscode.window.showWarningMessage(
 							vscode.l10n.t("The JS/TS language service crashed."),
@@ -878,9 +903,14 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 
 		if (command === 'updateOpen') {
 			// If update open has completed, consider that the project has loaded
-			Promise.all(executions).then(() => {
+			const updateOpenTask = Promise.all(executions).then(() => {
 				this.loadingIndicator.reset();
 			});
+
+			const updateOpenArgs = (args as Proto.UpdateOpenRequestArgs);
+			if (updateOpenArgs.openFiles?.length === 1) {
+				this.loadingIndicator.startedLoadingFile(updateOpenArgs.openFiles[0].file, updateOpenTask);
+			}
 		}
 
 		return executions[0]!;
@@ -947,7 +977,8 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 		switch (event.event) {
 			case EventName.syntaxDiag:
 			case EventName.semanticDiag:
-			case EventName.suggestionDiag: {
+			case EventName.suggestionDiag:
+			case EventName.regionSemanticDiag: {
 				// This event also roughly signals that projects have been loaded successfully (since the TS server is synchronous)
 				this.loadingIndicator.reset();
 
@@ -956,19 +987,20 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 					this._onDiagnosticsReceived.fire({
 						kind: getDiagnosticsKind(event),
 						resource: this.toResource(diagnosticEvent.body.file),
-						diagnostics: diagnosticEvent.body.diagnostics
+						diagnostics: diagnosticEvent.body.diagnostics,
+						spans: diagnosticEvent.body.spans,
 					});
 				}
-				break;
+				return;
 			}
 			case EventName.configFileDiag:
 				this._onConfigDiagnosticsReceived.fire(event as Proto.ConfigFileDiagnosticEvent);
-				break;
+				return;
 
 			case EventName.telemetry: {
 				const body = (event as Proto.TelemetryEvent).body;
 				this.dispatchTelemetryEvent(body);
-				break;
+				return;
 			}
 			case EventName.projectLanguageServiceState: {
 				const body = (event as Proto.ProjectLanguageServiceStateEvent).body!;
@@ -976,7 +1008,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 					this.serverState.updateLanguageServiceEnabled(body.languageServiceEnabled);
 				}
 				this._onProjectLanguageServiceStateChanged.fire(body);
-				break;
+				return;
 			}
 			case EventName.projectsUpdatedInBackground: {
 				this.loadingIndicator.reset();
@@ -984,56 +1016,87 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 				const body = (event as Proto.ProjectsUpdatedInBackgroundEvent).body;
 				const resources = body.openFiles.map(file => this.toResource(file));
 				this.bufferSyncSupport.getErr(resources);
-				break;
+				return;
 			}
 			case EventName.beginInstallTypes:
 				this._onDidBeginInstallTypings.fire((event as Proto.BeginInstallTypesEvent).body);
-				break;
+				return;
 
 			case EventName.endInstallTypes:
 				this._onDidEndInstallTypings.fire((event as Proto.EndInstallTypesEvent).body);
-				break;
+				return;
 
 			case EventName.typesInstallerInitializationFailed:
 				this._onTypesInstallerInitializationFailed.fire((event as Proto.TypesInstallerInitializationFailedEvent).body);
-				break;
+				return;
 
 			case EventName.surveyReady:
 				this._onSurveyReady.fire((event as Proto.SurveyReadyEvent).body);
-				break;
+				return;
 
 			case EventName.projectLoadingStart:
 				this.loadingIndicator.startedLoadingProject((event as Proto.ProjectLoadingStartEvent).body.projectName);
-				break;
+				return;
 
 			case EventName.projectLoadingFinish:
 				this.loadingIndicator.finishedLoadingProject((event as Proto.ProjectLoadingFinishEvent).body.projectName);
-				break;
+				return;
+
+			case EventName.createDirectoryWatcher: {
+				const fpath = (event.body as Proto.CreateDirectoryWatcherEventBody).path;
+				if (fpath.startsWith(inMemoryResourcePrefix)) {
+					return;
+				}
+				if (process.platform === 'darwin' && fpath === path.join(homedir(), 'Library')) {
+					// ignore directory watch requests on ~/Library
+					// until microsoft/TypeScript#59831 is resolved
+					return;
+				}
 
-			case EventName.createDirectoryWatcher:
 				this.createFileSystemWatcher(
 					(event.body as Proto.CreateDirectoryWatcherEventBody).id,
 					new vscode.RelativePattern(
-						vscode.Uri.file((event.body as Proto.CreateDirectoryWatcherEventBody).path),
+						vscode.Uri.file(fpath),
 						(event.body as Proto.CreateDirectoryWatcherEventBody).recursive ? '**' : '*'
 					),
 					(event.body as Proto.CreateDirectoryWatcherEventBody).ignoreUpdate
 				);
-				break;
+				return;
+			}
+			case EventName.createFileWatcher: {
+				const path = (event.body as Proto.CreateFileWatcherEventBody).path;
+				if (path.startsWith(inMemoryResourcePrefix)) {
+					return;
+				}
 
-			case EventName.createFileWatcher:
 				this.createFileSystemWatcher(
 					(event.body as Proto.CreateFileWatcherEventBody).id,
 					new vscode.RelativePattern(
-						vscode.Uri.file((event.body as Proto.CreateFileWatcherEventBody).path),
+						vscode.Uri.file(path),
 						'*'
 					)
 				);
-				break;
-
+				return;
+			}
 			case EventName.closeFileWatcher:
 				this.closeFileSystemWatcher(event.body.id);
-				break;
+				return;
+
+			case EventName.requestCompleted: {
+				const diagnosticsDuration = (event.body as Proto.RequestCompletedEventBody).performanceData?.diagnosticsDuration;
+				if (diagnosticsDuration) {
+					this.diagnosticsManager.logDiagnosticsPerformanceTelemetry(
+						diagnosticsDuration.map(fileData => {
+							const resource = this.toResource(fileData.file);
+							return {
+								...fileData,
+								fileLineCount: this.bufferSyncSupport.lineCount(resource),
+							};
+						})
+					);
+				}
+				return;
+			}
 		}
 	}
 
@@ -1094,7 +1157,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 		ignoreChangeEvents?: boolean,
 	) {
 		const disposable = new DisposableStore();
-		const watcher = disposable.add(vscode.workspace.createFileSystemWatcher(pattern, { excludes: [] /* TODO:: need to fill in excludes list */, ignoreChangeEvents }));
+		const watcher = disposable.add(vscode.workspace.createFileSystemWatcher(pattern, undefined, ignoreChangeEvents));
 		disposable.add(watcher.onDidChange(changeFile =>
 			this.addWatchEvent(id, 'updated', changeFile.fsPath)
 		));
@@ -1117,13 +1180,9 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 		this.watches.set(id, disposable);
 	}
 
-	private closeFileSystemWatcher(
-		id: number,
-	) {
+	private closeFileSystemWatcher(id: number) {
 		const existing = this.watches.get(id);
-		if (existing) {
-			existing.dispose();
-		}
+		existing?.dispose();
 	}
 
 	private dispatchTelemetryEvent(telemetryData: Proto.TelemetryEventBody): void {
@@ -1157,6 +1216,8 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 				break;
 			}
 		}
+
+		// Add plugin data here
 		if (telemetryData.telemetryEventName === 'projectInfo') {
 			if (this.serverState.type === ServerState.Type.Running) {
 				this.serverState.updateTsserverVersion(properties['version']);
@@ -1179,9 +1240,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 	}
 
 	private configurePlugin(pluginName: string, configuration: {}): any {
-		if (this.apiVersion.gte(API.v314)) {
-			this.executeWithoutWaitingForResponse('configurePlugin', { pluginName, configuration });
-		}
+		this.executeWithoutWaitingForResponse('configurePlugin', { pluginName, configuration });
 	}
 }
 
@@ -1261,13 +1320,14 @@ function getDiagnosticsKind(event: Proto.Event) {
 		case 'syntaxDiag': return DiagnosticKind.Syntax;
 		case 'semanticDiag': return DiagnosticKind.Semantic;
 		case 'suggestionDiag': return DiagnosticKind.Suggestion;
+		case 'regionSemanticDiag': return DiagnosticKind.RegionSemantic;
 	}
 	throw new Error('Unknown dignostics kind');
 }
 
 class ServerInitializingIndicator extends Disposable {
 
-	private _task?: { project: string | undefined; resolve: () => void };
+	private _task?: { project: string; resolve: () => void };
 
 	public reset(): void {
 		if (this._task) {
@@ -1279,20 +1339,30 @@ class ServerInitializingIndicator extends Disposable {
 	/**
 	 * Signal that a project has started loading.
 	 */
-	public startedLoadingProject(projectName: string | undefined): void {
+	public startedLoadingProject(projectName: string): void {
 		// TS projects are loaded sequentially. Cancel existing task because it should always be resolved before
 		// the incoming project loading task is.
 		this.reset();
 
+		const projectDisplayName = vscode.workspace.asRelativePath(projectName);
 		vscode.window.withProgress({
 			location: vscode.ProgressLocation.Window,
-			title: vscode.l10n.t("Initializing JS/TS language features"),
+			title: vscode.l10n.t("Initializing project '{0}'", projectDisplayName),
 		}, () => new Promise<void>(resolve => {
 			this._task = { project: projectName, resolve };
 		}));
 	}
 
-	public finishedLoadingProject(projectName: string | undefined): void {
+	public startedLoadingFile(fileName: string, task: Promise<unknown>): void {
+		if (!this._task) {
+			vscode.window.withProgress({
+				location: vscode.ProgressLocation.Window,
+				title: vscode.l10n.t("Analyzing '{0}' and its dependencies", path.basename(fileName)),
+			}, () => task);
+		}
+	}
+
+	public finishedLoadingProject(projectName: string): void {
 		if (this._task && this._task.project === projectName) {
 			this._task.resolve();
 			this._task = undefined;
diff --git a/extensions/typescript-language-features/src/ui/activeJsTsEditorTracker.ts b/extensions/typescript-language-features/src/ui/activeJsTsEditorTracker.ts
index 3da1f5a8570..c3cae6321ff 100644
--- a/extensions/typescript-language-features/src/ui/activeJsTsEditorTracker.ts
+++ b/extensions/typescript-language-features/src/ui/activeJsTsEditorTracker.ts
@@ -28,6 +28,7 @@ export class ActiveJsTsEditorTracker extends Disposable {
 
 		this._register(vscode.window.onDidChangeActiveTextEditor(_ => this.update()));
 		this._register(vscode.window.onDidChangeVisibleTextEditors(_ => this.update()));
+		this._register(vscode.window.tabGroups.onDidChangeTabGroups(_ => this.update()));
 
 		this.update();
 	}
diff --git a/extensions/typescript-language-features/src/ui/intellisenseStatus.ts b/extensions/typescript-language-features/src/ui/intellisenseStatus.ts
index 1a6ea63f427..e26e2b3719f 100644
--- a/extensions/typescript-language-features/src/ui/intellisenseStatus.ts
+++ b/extensions/typescript-language-features/src/ui/intellisenseStatus.ts
@@ -43,6 +43,8 @@ namespace IntellisenseState {
 	export type State = typeof None | Pending | Resolved | typeof SyntaxOnly;
 }
 
+type CreateOrOpenConfigCommandArgs = [root: vscode.Uri, projectType: ProjectType];
+
 export class IntellisenseStatus extends Disposable {
 
 	public readonly openOpenConfigCommandId = '_typescript.openConfig';
@@ -62,7 +64,7 @@ export class IntellisenseStatus extends Disposable {
 
 		commandManager.register({
 			id: this.openOpenConfigCommandId,
-			execute: async (root: vscode.Uri, projectType: ProjectType) => {
+			execute: async (...[root, projectType]: CreateOrOpenConfigCommandArgs) => {
 				if (this._state.type === IntellisenseState.Type.Resolved) {
 					await openProjectConfigOrPromptToCreate(projectType, this._client, root, this._state.configFile);
 				} else if (this._state.type === IntellisenseState.Type.Pending) {
@@ -72,7 +74,7 @@ export class IntellisenseStatus extends Disposable {
 		});
 		commandManager.register({
 			id: this.createOrOpenConfigCommandId,
-			execute: async (root: vscode.Uri, projectType: ProjectType) => {
+			execute: async (...[root, projectType]: CreateOrOpenConfigCommandArgs) => {
 				await openOrCreateConfig(this._client.apiVersion, projectType, root, this._client.configuration);
 			},
 		});
@@ -182,7 +184,7 @@ export class IntellisenseStatus extends Disposable {
 						title: this._state.projectType === ProjectType.TypeScript
 							? vscode.l10n.t("Configure tsconfig")
 							: vscode.l10n.t("Configure jsconfig"),
-						arguments: [rootPath],
+						arguments: [rootPath, this._state.projectType] satisfies CreateOrOpenConfigCommandArgs,
 					};
 				} else {
 					statusItem.text = vscode.workspace.asRelativePath(this._state.configFile);
@@ -190,7 +192,7 @@ export class IntellisenseStatus extends Disposable {
 					statusItem.command = {
 						command: this.openOpenConfigCommandId,
 						title: vscode.l10n.t("Open config file"),
-						arguments: [rootPath],
+						arguments: [rootPath, this._state.projectType] satisfies CreateOrOpenConfigCommandArgs,
 					};
 				}
 				break;
diff --git a/extensions/typescript-language-features/src/ui/managedFileContext.ts b/extensions/typescript-language-features/src/ui/managedFileContext.ts
index 0b929f85277..1da4588a334 100644
--- a/extensions/typescript-language-features/src/ui/managedFileContext.ts
+++ b/extensions/typescript-language-features/src/ui/managedFileContext.ts
@@ -10,7 +10,7 @@ import { isSupportedLanguageMode } from '../configuration/languageIds';
 import { Disposable } from '../utils/dispose';
 import { ActiveJsTsEditorTracker } from './activeJsTsEditorTracker';
 
-/**E
+/**
  * When clause context set when the current file is managed by vscode's built-in typescript extension.
  */
 export default class ManagedFileContextManager extends Disposable {
diff --git a/extensions/typescript-language-features/src/utils/async.ts b/extensions/typescript-language-features/src/utils/async.ts
index db92754fd2e..9523d7fe67a 100644
--- a/extensions/typescript-language-features/src/utils/async.ts
+++ b/extensions/typescript-language-features/src/utils/async.ts
@@ -70,3 +70,94 @@ export function setImmediate(callback: (...args: any[]) => void, ...args: any[])
 		return { dispose: () => clearTimeout(handle) };
 	}
 }
+
+
+/**
+ * A helper to prevent accumulation of sequential async tasks.
+ *
+ * Imagine a mail man with the sole task of delivering letters. As soon as
+ * a letter submitted for delivery, he drives to the destination, delivers it
+ * and returns to his base. Imagine that during the trip, N more letters were submitted.
+ * When the mail man returns, he picks those N letters and delivers them all in a
+ * single trip. Even though N+1 submissions occurred, only 2 deliveries were made.
+ *
+ * The throttler implements this via the queue() method, by providing it a task
+ * factory. Following the example:
+ *
+ * 		const throttler = new Throttler();
+ * 		const letters = [];
+ *
+ * 		function deliver() {
+ * 			const lettersToDeliver = letters;
+ * 			letters = [];
+ * 			return makeTheTrip(lettersToDeliver);
+ * 		}
+ *
+ * 		function onLetterReceived(l) {
+ * 			letters.push(l);
+ * 			throttler.queue(deliver);
+ * 		}
+ */
+export class Throttler {
+
+	private activePromise: Promise<any> | null;
+	private queuedPromise: Promise<any> | null;
+	private queuedPromiseFactory: ITask<Promise<any>> | null;
+
+	private isDisposed = false;
+
+	constructor() {
+		this.activePromise = null;
+		this.queuedPromise = null;
+		this.queuedPromiseFactory = null;
+	}
+
+	queue<T>(promiseFactory: ITask<Promise<T>>): Promise<T> {
+		if (this.isDisposed) {
+			return Promise.reject(new Error('Throttler is disposed'));
+		}
+
+		if (this.activePromise) {
+			this.queuedPromiseFactory = promiseFactory;
+
+			if (!this.queuedPromise) {
+				const onComplete = () => {
+					this.queuedPromise = null;
+
+					if (this.isDisposed) {
+						return;
+					}
+
+					const result = this.queue(this.queuedPromiseFactory!);
+					this.queuedPromiseFactory = null;
+
+					return result;
+				};
+
+				this.queuedPromise = new Promise(resolve => {
+					this.activePromise!.then(onComplete, onComplete).then(resolve);
+				});
+			}
+
+			return new Promise((resolve, reject) => {
+				this.queuedPromise!.then(resolve, reject);
+			});
+		}
+
+		this.activePromise = promiseFactory();
+
+		return new Promise((resolve, reject) => {
+			this.activePromise!.then((result: T) => {
+				this.activePromise = null;
+				resolve(result);
+			}, (err: unknown) => {
+				this.activePromise = null;
+				reject(err);
+			});
+		});
+	}
+
+	dispose(): void {
+		this.isDisposed = true;
+	}
+}
diff --git a/extensions/typescript-language-features/src/utils/hash.ts b/extensions/typescript-language-features/src/utils/hash.ts
new file mode 100644
index 00000000000..b009808968d
--- /dev/null
+++ b/extensions/typescript-language-features/src/utils/hash.ts
@@ -0,0 +1,58 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/**
+ * Return a hash value for an object.
+ */
+export function hash(obj: any, hashVal = 0): number {
+	switch (typeof obj) {
+		case 'object':
+			if (obj === null) {
+				return numberHash(349, hashVal);
+			} else if (Array.isArray(obj)) {
+				return arrayHash(obj, hashVal);
+			}
+			return objectHash(obj, hashVal);
+		case 'string':
+			return stringHash(obj, hashVal);
+		case 'boolean':
+			return booleanHash(obj, hashVal);
+		case 'number':
+			return numberHash(obj, hashVal);
+		case 'undefined':
+			return 937 * 31;
+		default:
+			return numberHash(obj, 617);
+	}
+}
+
+function numberHash(val: number, initialHashVal: number): number {
+	return (((initialHashVal << 5) - initialHashVal) + val) | 0;  // hashVal * 31 + ch, keep as int32
+}
+
+function booleanHash(b: boolean, initialHashVal: number): number {
+	return numberHash(b ? 433 : 863, initialHashVal);
+}
+
+function stringHash(s: string, hashVal: number) {
+	hashVal = numberHash(149417, hashVal);
+	for (let i = 0, length = s.length; i < length; i++) {
+		hashVal = numberHash(s.charCodeAt(i), hashVal);
+	}
+	return hashVal;
+}
+
+function arrayHash(arr: any[], initialHashVal: number): number {
+	initialHashVal = numberHash(104579, initialHashVal);
+	return arr.reduce((hashVal, item) => hash(item, hashVal), initialHashVal);
+}
+
+function objectHash(obj: any, initialHashVal: number): number {
+	initialHashVal = numberHash(181387, initialHashVal);
+	return Object.keys(obj).sort().reduce((hashVal, key) => {
+		hashVal = stringHash(key, hashVal);
+		return hash(obj[key], hashVal);
+	}, initialHashVal);
+}
diff --git a/extensions/typescript-language-features/tsconfig.json b/extensions/typescript-language-features/tsconfig.json
index 65557839ba6..0b599aecc60 100644
--- a/extensions/typescript-language-features/tsconfig.json
+++ b/extensions/typescript-language-features/tsconfig.json
@@ -11,12 +11,12 @@
 	"include": [
 		"src/**/*",
 		"../../src/vscode-dts/vscode.d.ts",
-		"../../src/vscode-dts/vscode.proposed.createFileSystemWatcher.d.ts",
 		"../../src/vscode-dts/vscode.proposed.codeActionAI.d.ts",
 		"../../src/vscode-dts/vscode.proposed.codeActionRanges.d.ts",
 		"../../src/vscode-dts/vscode.proposed.mappedEditsProvider.d.ts",
 		"../../src/vscode-dts/vscode.proposed.multiDocumentHighlightProvider.d.ts",
 		"../../src/vscode-dts/vscode.proposed.workspaceTrust.d.ts",
 		"../../src/vscode-dts/vscode.proposed.documentPaste.d.ts",
+		"../../src/vscode-dts/vscode.proposed.editorHoverVerbosityLevel.d.ts",
 	]
 }
diff --git a/extensions/typescript-language-features/web/README.md b/extensions/typescript-language-features/web/README.md
index eda9e9cb00b..8d4689b34f0 100644
--- a/extensions/typescript-language-features/web/README.md
+++ b/extensions/typescript-language-features/web/README.md
@@ -6,8 +6,8 @@ Language server host for typescript using vscode's sync-api in the browser.
 
 To test this out, you'll need three shells:
 
-1. `yarn watch` for vscode itself
-2. `yarn watch-web` for the web side
+1. `npm i` for vscode itself
+2. `npm run watch-web` for the web side
 3. `node <root>/scripts/code-web.js --coi`
 
 The last command will open a browser window. You'll want to add `?vscode-coi=`
diff --git a/extensions/typescript-language-features/web/src/fileWatcherManager.ts b/extensions/typescript-language-features/web/src/fileWatcherManager.ts
index 5bbce244688..6ae4472e503 100644
--- a/extensions/typescript-language-features/web/src/fileWatcherManager.ts
+++ b/extensions/typescript-language-features/web/src/fileWatcherManager.ts
@@ -53,9 +53,9 @@ export class FileWatcherManager {
 		this.watchFiles.set(path, { callback, pollingInterval, options });
 		const watchIds = [++this.watchId];
 		this.watchPort.postMessage({ type: 'watchFile', uri: uri, id: watchIds[0] });
-		if (this.enabledExperimentalTypeAcquisition && looksLikeNodeModules(path)) {
+		if (this.enabledExperimentalTypeAcquisition && looksLikeNodeModules(path) && uri.scheme !== 'vscode-global-typings') {
 			watchIds.push(++this.watchId);
-			this.watchPort.postMessage({ type: 'watchFile', uri: mapUri(uri, 'vscode-node-modules'), id: watchIds[1] });
+			this.watchPort.postMessage({ type: 'watchFile', uri: mapUri(uri, 'vscode-global-typings'), id: watchIds[1] });
 		}
 		return {
 			close: () => {
diff --git a/extensions/typescript-language-features/web/src/serverHost.ts b/extensions/typescript-language-features/web/src/serverHost.ts
index f2f9ca95996..dedec85991f 100644
--- a/extensions/typescript-language-features/web/src/serverHost.ts
+++ b/extensions/typescript-language-features/web/src/serverHost.ts
@@ -11,6 +11,7 @@ import { FileWatcherManager } from './fileWatcherManager';
 import { Logger } from './logging';
 import { PathMapper, looksLikeNodeModules, mapUri } from './pathMapper';
 import { findArgument, hasArgument } from './util/args';
+import { URI } from 'vscode-uri';
 
 type ServerHostWithImport = ts.server.ServerHost & { importPlugin(root: string, moduleName: string): Promise<ts.server.ModuleImportResult> };
 
@@ -338,13 +339,24 @@ function createServerHost(
 	// For module resolution only. `node_modules` is also automatically mapped
 	// as if all node_modules-like paths are symlinked.
 	function realpath(path: string): string {
+		if (path.startsWith('/^/')) {
+			// In memory file. No mapping needed
+			return path;
+		}
+
 		const isNm = looksLikeNodeModules(path) && !path.startsWith('/vscode-global-typings/');
 		// skip paths without .. or ./ or /. And things that look like node_modules
 		if (!isNm && !path.match(/\.\.|\/\.|\.\//)) {
 			return path;
 		}
 
-		let uri = pathMapper.toResource(path);
+		let uri: URI;
+		try {
+			uri = pathMapper.toResource(path);
+		} catch {
+			return path;
+		}
+
 		if (isNm) {
 			uri = mapUri(uri, 'vscode-node-modules');
 		}
diff --git a/extensions/typescript-language-features/web/src/typingsInstaller/typingsInstaller.ts b/extensions/typescript-language-features/web/src/typingsInstaller/typingsInstaller.ts
index 7c40993d6df..1f7790dc783 100644
--- a/extensions/typescript-language-features/web/src/typingsInstaller/typingsInstaller.ts
+++ b/extensions/typescript-language-features/web/src/typingsInstaller/typingsInstaller.ts
@@ -70,10 +70,12 @@ export class WebTypingsInstallerClient implements ts.server.ITypingsInstaller {
 				break;
 			case 'event::beginInstallTypes':
 			case 'event::endInstallTypes':
+			// TODO(@zkat): maybe do something with this?
+			case 'action::watchTypingLocations':
 				// Don't care.
 				break;
 			default:
-				throw new Error(`unexpected response: ${response}`);
+				throw new Error(`unexpected response: ${JSON.stringify(response)}`);
 		}
 	}
 
diff --git a/extensions/typescript-language-features/yarn.lock b/extensions/typescript-language-features/yarn.lock
deleted file mode 100644
index e43e95500ce..00000000000
--- a/extensions/typescript-language-features/yarn.lock
+++ /dev/null
@@ -1,194 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@microsoft/1ds-core-js@4.0.3", "@microsoft/1ds-core-js@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@microsoft/1ds-core-js/-/1ds-core-js-4.0.3.tgz#c8a92c623745a9595e06558a866658480c33bdf9"
-  integrity sha512-FrxNLVAPsAvD7+l63TlNS/Kodvpct2WulpDSn1dI4Xuy0kF4E2H867kHdwL/iY1Bj3zA3FSy/jvE4+OcDws7ug==
-  dependencies:
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/1ds-post-js@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@microsoft/1ds-post-js/-/1ds-post-js-4.0.3.tgz#cfcb20bb23fb6215d3f0732f60f5b7df3e624f86"
-  integrity sha512-uewvmUtXKd7ttypiKQGdYI6i7UUpPkOznLayzIFrJ4r2xnG6jhPjpKRncHFXPQcM4XSWO3yf5PQ3xAbPq9t7ZQ==
-  dependencies:
-    "@microsoft/1ds-core-js" "4.0.3"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-channel-js@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.0.4.tgz#247b6fe2158fad9826cbcdf7304f885766b36624"
-  integrity sha512-6TlfExmErQ8Y+/ChbkyWl+jyt4wg3T6p7lwXDsUCB0LgZmlEWMaCUS0YlT73JCWmE8j7vxW8yUm0lgsgmHns3A==
-  dependencies:
-    "@microsoft/applicationinsights-common" "3.0.4"
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-common@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-common/-/applicationinsights-common-3.0.4.tgz#c4aa53ba343f5b3c7fbf54cddd3c86a5bdcd95dc"
-  integrity sha512-r5gWaw/K9+tKfuo2GtDiDiKASgOkPOCrKW+wZzFvuR06uuwvWjbVQ6yW/YbnfuhRF5M65ksUiMi0eCMwEOGq7Q==
-  dependencies:
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-core-js@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.0.4.tgz#008308b786930d94a1de8a1fbb4af0351b74653e"
-  integrity sha512-anxy5kEkqBmVoEqJiJzaaXXA0wzqZi9U4zGd05xFJ04lWckP8dG3zyT3+GGdg7rDelqLTNGxndeYoFmDv63u1g==
-  dependencies:
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/applicationinsights-shims@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz#3865b73ace8405b9c4618cc5c571f2fe3876f06f"
-  integrity sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==
-  dependencies:
-    "@nevware21/ts-utils" ">= 0.9.4 < 2.x"
-
-"@microsoft/applicationinsights-web-basic@^3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.0.4.tgz#9a23323276b4a5a0dc6a352e2de5d75e3c16b534"
-  integrity sha512-KfoxPlLlf0JT12ADb23C5iGye/yFouoMgHEKULxkSQcYY9SsW/8rVrqqvoYKAL+u215CZU2A8Kc8sR3ehEaPCQ==
-  dependencies:
-    "@microsoft/applicationinsights-channel-js" "3.0.4"
-    "@microsoft/applicationinsights-common" "3.0.4"
-    "@microsoft/applicationinsights-core-js" "3.0.4"
-    "@microsoft/applicationinsights-shims" "3.0.1"
-    "@microsoft/dynamicproto-js" "^2.0.2"
-    "@nevware21/ts-async" ">= 0.3.0 < 2.x"
-    "@nevware21/ts-utils" ">= 0.10.1 < 2.x"
-
-"@microsoft/dynamicproto-js@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.2.tgz#e57fbec2e7067d48b7e8e1e1c1d354028ef718a6"
-  integrity sha512-MB8trWaFREpmb037k/d0bB7T2BP7Ai24w1e1tbz3ASLB0/lwphsq3Nq8S9I5AsI5vs4zAQT+SB5nC5/dLYTiOg==
-  dependencies:
-    "@nevware21/ts-utils" ">= 0.9.4 < 2.x"
-
-"@nevware21/ts-async@>= 0.3.0 < 2.x":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@nevware21/ts-async/-/ts-async-0.3.0.tgz#a8b97ba01065fc930de9a3f4dd4a05e862becc6c"
-  integrity sha512-ZUcgUH12LN/F6nzN0cYd0F/rJaMLmXr0EHVTyYfaYmK55bdwE4338uue4UiVoRqHVqNW4KDUrJc49iGogHKeWA==
-  dependencies:
-    "@nevware21/ts-utils" ">= 0.10.0 < 2.x"
-
-"@nevware21/ts-utils@>= 0.10.0 < 2.x", "@nevware21/ts-utils@>= 0.10.1 < 2.x", "@nevware21/ts-utils@>= 0.9.4 < 2.x":
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@nevware21/ts-utils/-/ts-utils-0.10.1.tgz#aa65abc71eba06749a396598f22263d26f796ac7"
-  integrity sha512-pMny25NnF2/MJwdqC3Iyjm2pGIXNxni4AROpcqDeWa+td9JMUY4bUS9uU9XW+BoBRqTLUL+WURF9SOd/6OQzRg==
-
-"@types/node@20.x":
-  version "20.11.24"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792"
-  integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==
-  dependencies:
-    undici-types "~5.26.4"
-
-"@types/semver@^5.5.0":
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45"
-  integrity sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ==
-
-"@vscode/extension-telemetry@^0.9.0":
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.9.0.tgz#8c6c61e253ff304f46045f04edd60059b144417a"
-  integrity sha512-37RxGHXrs3GoXPgCUKQhghEu0gxs8j27RLjQwwtSf4WhPdJKz8UrqMYzpsXlliQ05zURYmtdGZst9C6+hfWXaQ==
-  dependencies:
-    "@microsoft/1ds-core-js" "^4.0.3"
-    "@microsoft/1ds-post-js" "^4.0.3"
-    "@microsoft/applicationinsights-web-basic" "^3.0.4"
-
-"@vscode/sync-api-client@^0.7.2":
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/@vscode/sync-api-client/-/sync-api-client-0.7.2.tgz#0644bff66a5eff636bcd8eb483d34796b9f90d2d"
-  integrity sha512-HQHz57RVKmR8sTEen1Y/T3r6mzDX7IaUJz/O2RJkn0Qu9ThvCsakLP0N+1iiwPnPfUfmNSwQXbSw8bEQFPcpYQ==
-  dependencies:
-    "@vscode/sync-api-common" "0.7.2"
-    vscode-uri "3.0.3"
-
-"@vscode/sync-api-common@0.7.2", "@vscode/sync-api-common@^0.7.2":
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/@vscode/sync-api-common/-/sync-api-common-0.7.2.tgz#705060ee6a0108c24e145e687613becdb4292b33"
-  integrity sha512-ne1XEeDIYA3mp4oo1QoF1fqFedd0Vf4ybMmLb9HixbTyXy/qwMNL2p6OjXjOsmx6w2q9eqzGA5W/OPRSJxTTIQ==
-
-"@vscode/sync-api-service@^0.7.3":
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/@vscode/sync-api-service/-/sync-api-service-0.7.3.tgz#6cb7bd23c4a7378e4b92ca3638501a9be1937152"
-  integrity sha512-m2AmmfG4uzfjLMgWRHQ3xnBkdwCiUTO68vdw1XuzMsOb39Jwm9xr5bVVxwOFR9lPC0FfO1H6FUxBhZQvg7itPA==
-  dependencies:
-    "@vscode/sync-api-common" "0.7.2"
-    vscode-uri "3.0.3"
-
-"@vscode/ts-package-manager@^0.0.2":
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/@vscode/ts-package-manager/-/ts-package-manager-0.0.2.tgz#d1cade5ff0d01da8c5b5b00bf79d80e7156771cf"
-  integrity sha512-cXPxGbPVTkEQI8mUiWYUwB6j3ga6M9i7yubUOCrjgZ01GeZPMSnaWRprfJ09uuy81wJjY2gfHgLsOgwrGvUBTw==
-
-jsonc-parser@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76"
-  integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==
-
-lru-cache@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
-  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
-  dependencies:
-    yallist "^4.0.0"
-
-semver@7.5.2:
-  version "7.5.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.2.tgz#5b851e66d1be07c1cdaf37dfc856f543325a2beb"
-  integrity sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==
-  dependencies:
-    lru-cache "^6.0.0"
-
-tas-client@0.2.33:
-  version "0.2.33"
-  resolved "https://registry.yarnpkg.com/tas-client/-/tas-client-0.2.33.tgz#451bf114a8a64748030ce4068ab7d079958402e6"
-  integrity sha512-V+uqV66BOQnWxvI6HjDnE4VkInmYZUQ4dgB7gzaDyFyFSK1i1nF/j7DpS9UbQAgV9NaF1XpcyuavnM1qOeiEIg==
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
-
-vscode-tas-client@^0.1.84:
-  version "0.1.84"
-  resolved "https://registry.yarnpkg.com/vscode-tas-client/-/vscode-tas-client-0.1.84.tgz#906bdcfd8c9e1dc04321d6bc0335184f9119968e"
-  integrity sha512-rUTrUopV+70hvx1hW5ebdw1nd6djxubkLvVxjGdyD/r5v/wcVF41LIfiAtbm5qLZDtQdsMH1IaCuDoluoIa88w==
-  dependencies:
-    tas-client "0.2.33"
-
-vscode-uri@3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.3.tgz#a95c1ce2e6f41b7549f86279d19f47951e4f4d84"
-  integrity sha512-EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA==
-
-vscode-uri@^3.0.3:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.7.tgz#6d19fef387ee6b46c479e5fb00870e15e58c1eb8"
-  integrity sha512-eOpPHogvorZRobNqJGhapa0JdwaxpjVvyBp0QIUMRMSf8ZAlqOdEquKuRmw9Qwu0qXtJIWqFtMkmvJjUZmMjVA==
-
-yallist@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
-  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
diff --git a/extensions/vb/yarn.lock b/extensions/vb/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/vb/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/vscode-api-tests/.npmrc b/extensions/vscode-api-tests/.npmrc
new file mode 100644
index 00000000000..a9c57709666
--- /dev/null
+++ b/extensions/vscode-api-tests/.npmrc
@@ -0,0 +1,2 @@
+legacy-peer-deps="true"
+timeout=180000
diff --git a/extensions/vscode-api-tests/package-lock.json b/extensions/vscode-api-tests/package-lock.json
new file mode 100644
index 00000000000..cd90b33ca49
--- /dev/null
+++ b/extensions/vscode-api-tests/package-lock.json
@@ -0,0 +1,278 @@
+{
+  "name": "vscode-api-tests",
+  "version": "0.0.1",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "vscode-api-tests",
+      "version": "0.0.1",
+      "license": "MIT",
+      "devDependencies": {
+        "@types/mocha": "^9.1.1",
+        "@types/node": "20.x",
+        "@types/node-forge": "^1.3.11",
+        "node-forge": "^1.3.1",
+        "straightforward": "^4.2.2"
+      },
+      "engines": {
+        "vscode": "^1.55.0"
+      }
+    },
+    "node_modules/@types/mocha": {
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.1.tgz",
+      "integrity": "sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==",
+      "dev": true
+    },
+    "node_modules/@types/node": {
+      "version": "20.11.24",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
+      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/@types/node-forge": {
+      "version": "1.3.11",
+      "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.11.tgz",
+      "integrity": "sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/debug": {
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
+      "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/escalade": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
+      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true,
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/node-forge": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
+      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6.13.0"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/straightforward": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/straightforward/-/straightforward-4.2.2.tgz",
+      "integrity": "sha512-MxfuNnyTP4RPjadI3DkYIcNIp0DMXeDmAXY4/6QivU8lLIPGUqaS5VsEkaQ2QC+FICzc7QTb/lJPRIhGRKVuMA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.3.4",
+        "yargs": "^17.6.2"
+      },
+      "bin": {
+        "straightforward": "cli.js"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    },
+    "node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yargs": {
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    }
+  }
+}
diff --git a/extensions/vscode-api-tests/package.json b/extensions/vscode-api-tests/package.json
index 868f7cfd4e7..8a1032fef2c 100644
--- a/extensions/vscode-api-tests/package.json
+++ b/extensions/vscode-api-tests/package.json
@@ -7,13 +7,14 @@
   "enabledApiProposals": [
     "activeComment",
     "authSession",
-    "defaultChatParticipant",
     "chatParticipantPrivate",
+    "chatProvider",
     "chatVariableResolver",
-    "contribViewsRemote",
     "contribStatusBarItems",
+    "contribViewsRemote",
     "createFileSystemWatcher",
     "customEditorMove",
+    "defaultChatParticipant",
     "diffCommand",
     "documentFiltersExclusive",
     "documentPaste",
@@ -27,6 +28,8 @@
     "findTextInFiles",
     "fsChunks",
     "interactive",
+    "languageStatusText",
+    "lmTools",
     "mappedEditsProvider",
     "notebookCellExecutionState",
     "notebookDeprecated",
@@ -35,25 +38,23 @@
     "notebookMime",
     "portsAttributes",
     "quickPickSortByLabel",
-    "languageStatusText",
     "resolvers",
     "scmActionButton",
     "scmSelectedProvider",
     "scmTextDocument",
     "scmValidation",
     "taskPresentationGroup",
+    "telemetry",
     "terminalDataWriteEvent",
     "terminalDimensions",
-    "terminalShellIntegration",
-    "tunnels",
     "testObserver",
     "textSearchProvider",
     "timeline",
     "tokenInformation",
     "treeViewActiveItem",
     "treeViewReveal",
-    "workspaceTrust",
-    "telemetry"
+    "tunnels",
+    "workspaceTrust"
   ],
   "private": true,
   "activationEvents": [],
@@ -63,6 +64,11 @@
   },
   "icon": "media/icon.png",
   "contributes": {
+    "languageModels": [
+      {
+        "vendor": "test-lm-vendor"
+      }
+    ],
     "chatParticipants": [
       {
         "id": "api-test.participant",
@@ -105,6 +111,13 @@
         "farboo.get": {
           "type": "string",
           "default": "get-prop"
+        },
+        "integration-test.http.proxy": {
+          "type": "string"
+        },
+        "integration-test.http.proxyAuth": {
+          "type": "string",
+          "default": "get-prop"
         }
       }
     },
@@ -242,7 +255,10 @@
   },
   "devDependencies": {
     "@types/mocha": "^9.1.1",
-    "@types/node": "20.x"
+    "@types/node": "20.x",
+    "@types/node-forge": "^1.3.11",
+    "node-forge": "^1.3.1",
+    "straightforward": "^4.2.2"
   },
   "repository": {
     "type": "git",
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/chat.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/chat.test.ts
index ca72f39feb8..2b1110c23bf 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/chat.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/chat.test.ts
@@ -6,7 +6,7 @@
 import * as assert from 'assert';
 import 'mocha';
 import { ChatContext, ChatRequest, ChatResult, ChatVariableLevel, Disposable, Event, EventEmitter, chat, commands } from 'vscode';
-import { DeferredPromise, asPromise, assertNoRpc, closeAllEditors, disposeAll } from '../utils';
+import { DeferredPromise, asPromise, assertNoRpc, closeAllEditors, delay, disposeAll } from '../utils';
 
 suite('chat', () => {
 
@@ -36,7 +36,6 @@ suite('chat', () => {
 		const participant = chat.createChatParticipant(id, (request, context, _progress, _token) => {
 			emitter.fire({ request, context });
 		});
-		participant.isDefault = true;
 		disposables.push(participant);
 		return emitter.event;
 	}
@@ -89,7 +88,6 @@ suite('chat', () => {
 		const participant = chat.createChatParticipant('api-test.participant', (_request, _context, _progress, _token) => {
 			return { metadata: { key: 'value' } };
 		});
-		participant.isDefault = true;
 		participant.followupProvider = {
 			provideFollowups(result, _context, _token) {
 				deferred.complete(result);
@@ -123,4 +121,33 @@ suite('chat', () => {
 		const request3 = await asPromise(onRequest2);
 		assert.strictEqual(request3.context.history.length, 2); // request + response = 2
 	});
+
+	test('title provider is called for first request', async () => {
+		let calls = 0;
+		const deferred = new DeferredPromise<void>();
+		const participant = chat.createChatParticipant('api-test.participant', (_request, _context, _progress, _token) => {
+			return { metadata: { key: 'value' } };
+		});
+		participant.titleProvider = {
+			provideChatTitle(_context, _token) {
+				calls++;
+				deferred.complete();
+				return 'title';
+			}
+		};
+		disposables.push(participant);
+
+		await commands.executeCommand('workbench.action.chat.newChat');
+		commands.executeCommand('workbench.action.chat.open', { query: '@participant /hello friend' });
+
+		// Wait for title provider to be called once
+		await deferred.p;
+		assert.strictEqual(calls, 1);
+
+		commands.executeCommand('workbench.action.chat.open', { query: '@participant /hello friend' });
+		await delay(500);
+
+		// Title provider was not called again
+		assert.strictEqual(calls, 1);
+	});
 });
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/lm.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/lm.test.ts
new file mode 100644
index 00000000000..178119a1197
--- /dev/null
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/lm.test.ts
@@ -0,0 +1,153 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import 'mocha';
+import * as assert from 'assert';
+import * as vscode from 'vscode';
+import { assertNoRpc, closeAllEditors, DeferredPromise, disposeAll } from '../utils';
+
+
+suite('lm', function () {
+
+	let disposables: vscode.Disposable[] = [];
+
+	setup(function () {
+		disposables = [];
+	});
+
+	teardown(async function () {
+		assertNoRpc();
+		await closeAllEditors();
+		disposeAll(disposables);
+	});
+
+
+	test('lm request and stream', async function () {
+
+		let p: vscode.Progress<vscode.ChatResponseFragment> | undefined;
+		const defer = new DeferredPromise<void>();
+
+		disposables.push(vscode.lm.registerChatModelProvider('test-lm', {
+			async provideLanguageModelResponse(_messages, _options, _extensionId, progress, _token) {
+				p = progress;
+				return defer.p;
+			},
+			async provideTokenCount(_text, _token) {
+				return 1;
+			},
+		}, {
+			name: 'test-lm',
+			version: '1.0.0',
+			family: 'test',
+			vendor: 'test-lm-vendor',
+			maxInputTokens: 100,
+			maxOutputTokens: 100,
+		}));
+
+		const models = await vscode.lm.selectChatModels({ id: 'test-lm' });
+		assert.strictEqual(models.length, 1);
+
+		const request = await models[0].sendRequest([vscode.LanguageModelChatMessage.User('Hello')]);
+
+		// assert we have a request immediately
+		assert.ok(request);
+		assert.ok(p);
+		assert.strictEqual(defer.isSettled, false);
+
+		let streamDone = false;
+		let responseText = '';
+
+		const pp = (async () => {
+			for await (const chunk of request.text) {
+				responseText += chunk;
+			}
+			streamDone = true;
+		})();
+
+		assert.strictEqual(responseText, '');
+		assert.strictEqual(streamDone, false);
+
+		p.report({ index: 0, part: 'Hello' });
+		defer.complete();
+
+		await pp;
+		await new Promise(r => setTimeout(r, 1000));
+
+		assert.strictEqual(streamDone, true);
+		assert.strictEqual(responseText, 'Hello');
+	});
+
+	test('lm request fail', async function () {
+
+		disposables.push(vscode.lm.registerChatModelProvider('test-lm', {
+			async provideLanguageModelResponse(_messages, _options, _extensionId, _progress, _token) {
+				throw new Error('BAD');
+			},
+			async provideTokenCount(_text, _token) {
+				return 1;
+			},
+		}, {
+			name: 'test-lm',
+			version: '1.0.0',
+			family: 'test',
+			vendor: 'test-lm-vendor',
+			maxInputTokens: 100,
+			maxOutputTokens: 100,
+		}));
+
+		const models = await vscode.lm.selectChatModels({ id: 'test-lm' });
+		assert.strictEqual(models.length, 1);
+
+		try {
+			await models[0].sendRequest([vscode.LanguageModelChatMessage.User('Hello')]);
+			assert.ok(false, 'EXPECTED error');
+		} catch (error) {
+			assert.ok(error instanceof Error);
+		}
+	});
+
+	test('lm stream fail', async function () {
+
+		const defer = new DeferredPromise<void>();
+
+		disposables.push(vscode.lm.registerChatModelProvider('test-lm', {
+			async provideLanguageModelResponse(_messages, _options, _extensionId, _progress, _token) {
+				return defer.p;
+			},
+			async provideTokenCount(_text, _token) {
+				return 1;
+			},
+		}, {
+			name: 'test-lm',
+			version: '1.0.0',
+			family: 'test',
+			vendor: 'test-lm-vendor',
+			maxInputTokens: 100,
+			maxOutputTokens: 100,
+		}));
+
+		const models = await vscode.lm.selectChatModels({ id: 'test-lm' });
+		assert.strictEqual(models.length, 1);
+
+		const res = await models[0].sendRequest([vscode.LanguageModelChatMessage.User('Hello')]);
+		assert.ok(res);
+
+		const result = (async () => {
+			for await (const _chunk of res.text) {
+
+			}
+		})();
+
+		defer.error(new Error('STREAM FAIL'));
+
+		try {
+			await result;
+			assert.ok(false, 'EXPECTED error');
+		} catch (error) {
+			assert.ok(error);
+			// assert.ok(error instanceof Error); // todo@jrieken requires one more insiders
+		}
+	});
+});
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/notebook.api.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/notebook.api.test.ts
index f9d8d6a82db..e4489090017 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/notebook.api.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/notebook.api.test.ts
@@ -18,6 +18,10 @@ async function openRandomNotebookDocument() {
 	return vscode.workspace.openNotebookDocument(uri);
 }
 
+async function openUntitledNotebookDocument(data?: vscode.NotebookData) {
+	return vscode.workspace.openNotebookDocument('notebookCoreTest', data);
+}
+
 export async function saveAllFilesAndCloseAll() {
 	await saveAllEditors();
 	await closeAllEditors();
@@ -147,6 +151,7 @@ const apiTestSerializer: vscode.NotebookSerializer = {
 	teardown(async function () {
 		disposeAll(testDisposables);
 		testDisposables.length = 0;
+		await revertAllDirty();
 		await saveAllFilesAndCloseAll();
 	});
 
@@ -188,6 +193,27 @@ const apiTestSerializer: vscode.NotebookSerializer = {
 		assert.strictEqual(vscode.window.activeNotebookEditor!.notebook.uri.toString(), document.uri.toString());
 	});
 
+	test('Opening an utitled notebook without content will only open the editor when shown.', async function () {
+		const document = await openUntitledNotebookDocument();
+
+		assert.strictEqual(vscode.window.activeNotebookEditor, undefined);
+
+		// opening a cell-uri opens a notebook editor
+		await vscode.window.showNotebookDocument(document);
+
+		assert.strictEqual(!!vscode.window.activeNotebookEditor, true);
+		assert.strictEqual(vscode.window.activeNotebookEditor!.notebook.uri.toString(), document.uri.toString());
+	});
+
+	test('Opening an untitled notebook with content will open a dirty document.', async function () {
+		const language = 'python';
+		const cell = new vscode.NotebookCellData(vscode.NotebookCellKind.Code, '', language);
+		const data = new vscode.NotebookData([cell]);
+		const doc = await vscode.workspace.openNotebookDocument('jupyter-notebook', data);
+
+		assert.strictEqual(doc.isDirty, true);
+	});
+
 	test('Cannot open notebook from cell-uri with vscode.open-command', async function () {
 
 		const document = await openRandomNotebookDocument();
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/proxy.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/proxy.test.ts
new file mode 100644
index 00000000000..ccda85b442a
--- /dev/null
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/proxy.test.ts
@@ -0,0 +1,151 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as https from 'https';
+import 'mocha';
+import { assertNoRpc, delay } from '../utils';
+import { pki } from 'node-forge';
+import { AddressInfo } from 'net';
+import { resetCaches } from '@vscode/proxy-agent';
+import * as vscode from 'vscode';
+import { middleware, Straightforward } from 'straightforward';
+
+(vscode.env.uiKind === vscode.UIKind.Web ? suite.skip : suite)('vscode API - network proxy support', () => {
+
+	teardown(async function () {
+		assertNoRpc();
+	});
+
+	test('custom root certificate', async () => {
+		const keys = pki.rsa.generateKeyPair(2048);
+		const cert = pki.createCertificate();
+		cert.publicKey = keys.publicKey;
+		cert.serialNumber = '01';
+		cert.validity.notBefore = new Date();
+		cert.validity.notAfter = new Date();
+		cert.validity.notAfter.setFullYear(cert.validity.notBefore.getFullYear() + 1);
+		const attrs = [{
+			name: 'commonName',
+			value: 'localhost-proxy-test'
+		}];
+		cert.setSubject(attrs);
+		cert.setIssuer(attrs);
+		cert.sign(keys.privateKey);
+		const certPEM = pki.certificateToPem(cert);
+		const privateKeyPEM = pki.privateKeyToPem(keys.privateKey);
+
+		let resolvePort: (port: number) => void;
+		let rejectPort: (err: any) => void;
+		const port = new Promise<number>((resolve, reject) => {
+			resolvePort = resolve;
+			rejectPort = reject;
+		});
+		const server = https.createServer({
+			key: privateKeyPEM,
+			cert: certPEM,
+		}, (_req, res) => {
+			res.end();
+		}).listen(0, '127.0.0.1', () => {
+			const address = server.address();
+			resolvePort((address as AddressInfo).port);
+		}).on('error', err => {
+			rejectPort(err);
+		});
+
+		// Using https.globalAgent because it is shared with proxyResolver.ts and mutable.
+		(https.globalAgent as any).testCertificates = [certPEM];
+		resetCaches();
+
+		try {
+			const portNumber = await port;
+			await new Promise<void>((resolve, reject) => {
+				https.get(`https://127.0.0.1:${portNumber}`, { servername: 'localhost-proxy-test' }, res => {
+					if (res.statusCode === 200) {
+						resolve();
+					} else {
+						reject(new Error(`Unexpected status code: ${res.statusCode}`));
+					}
+				})
+					.on('error', reject);
+			});
+		} finally {
+			delete (https.globalAgent as any).testCertificates;
+			resetCaches();
+			server.close();
+		}
+	});
+
+	test('basic auth', async () => {
+		const url = 'https://example.com'; // Need to use non-local URL because local URLs are excepted from proxying.
+		const user = 'testuser';
+		const pass = 'testpassword';
+
+		const sf = new Straightforward();
+		let authEnabled = false;
+		const auth = middleware.auth({ user, pass });
+		sf.onConnect.use(async (context, next) => {
+			if (authEnabled) {
+				return auth(context, next);
+			}
+			next();
+		});
+		sf.onConnect.use(({ clientSocket }) => {
+			// Shortcircuit the request.
+			if (authEnabled) {
+				clientSocket.end('HTTP/1.1 204\r\n\r\n');
+			} else {
+				clientSocket.end('HTTP/1.1 418\r\n\r\n');
+			}
+		});
+		const proxyListen = sf.listen(0);
+
+		try {
+			await proxyListen;
+			const proxyPort = (sf.server.address() as AddressInfo).port;
+
+			await vscode.workspace.getConfiguration().update('integration-test.http.proxy', `PROXY 127.0.0.1:${proxyPort}`, vscode.ConfigurationTarget.Global);
+			await delay(1000); // Wait for the configuration change to propagate.
+			await new Promise<void>((resolve, reject) => {
+				https.get(url, res => {
+					if (res.statusCode === 418) {
+						resolve();
+					} else {
+						reject(new Error(`Unexpected status code (expected 418): ${res.statusCode}`));
+					}
+				})
+					.on('error', reject);
+			});
+
+			authEnabled = true;
+			await new Promise<void>((resolve, reject) => {
+				https.get(url, res => {
+					if (res.statusCode === 407) {
+						resolve();
+					} else {
+						reject(new Error(`Unexpected status code (expected 407): ${res.statusCode}`));
+					}
+				})
+					.on('error', reject);
+			});
+
+			await vscode.workspace.getConfiguration().update('integration-test.http.proxyAuth', `${user}:${pass}`, vscode.ConfigurationTarget.Global);
+			await delay(1000); // Wait for the configuration change to propagate.
+			await new Promise<void>((resolve, reject) => {
+				https.get(url, res => {
+					if (res.statusCode === 204) {
+						resolve();
+					} else {
+						reject(new Error(`Unexpected status code (expected 204): ${res.statusCode}`));
+					}
+				})
+					.on('error', reject);
+			});
+		} finally {
+			sf.close();
+			await vscode.workspace.getConfiguration().update('integration-test.http.proxy', undefined, vscode.ConfigurationTarget.Global);
+			await vscode.workspace.getConfiguration().update('integration-test.http.proxyAuth', undefined, vscode.ConfigurationTarget.Global);
+		}
+	});
+});
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts
index a5a83c8be45..ac6287c2f35 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts
@@ -10,7 +10,8 @@ import { assertNoRpc } from '../utils';
 
 // Terminal integration tests are disabled on web https://github.com/microsoft/vscode/issues/92826
 // Windows images will often not have functional shell integration
-(env.uiKind === UIKind.Web || platform() === 'win32' ? suite.skip : suite)('vscode API - Terminal.shellIntegration', () => {
+// TODO: Linux https://github.com/microsoft/vscode/issues/221399
+(env.uiKind === UIKind.Web || platform() === 'win32' || platform() === 'linux' ? suite.skip : suite)('vscode API - Terminal.shellIntegration', () => {
 	const disposables: Disposable[] = [];
 
 	suiteSetup(async () => {
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts
index 2eb115761d1..e5d9af5791e 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts
@@ -619,6 +619,7 @@ suite('vscode API - workspace', () => {
 
 	test('findFiles2, exclude', () => {
 		return vscode.workspace.findFiles2('**/image.png', { exclude: '**/sub/**' }).then((res) => {
+			res.forEach(r => console.log(r.toString()));
 			assert.strictEqual(res.length, 1);
 		});
 	});
diff --git a/extensions/vscode-api-tests/yarn.lock b/extensions/vscode-api-tests/yarn.lock
deleted file mode 100644
index 484fa0c5ac5..00000000000
--- a/extensions/vscode-api-tests/yarn.lock
+++ /dev/null
@@ -1,20 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@types/mocha@^9.1.1":
-  version "9.1.1"
-  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-9.1.1.tgz#e7c4f1001eefa4b8afbd1eee27a237fee3bf29c4"
-  integrity sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==
-
-"@types/node@20.x":
-  version "20.11.24"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792"
-  integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==
-  dependencies:
-    undici-types "~5.26.4"
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
diff --git a/extensions/vscode-colorize-tests/.npmrc b/extensions/vscode-colorize-tests/.npmrc
new file mode 100644
index 00000000000..a9c57709666
--- /dev/null
+++ b/extensions/vscode-colorize-tests/.npmrc
@@ -0,0 +1,2 @@
+legacy-peer-deps="true"
+timeout=180000
diff --git a/extensions/vscode-colorize-tests/package-lock.json b/extensions/vscode-colorize-tests/package-lock.json
new file mode 100644
index 00000000000..4011d73bcac
--- /dev/null
+++ b/extensions/vscode-colorize-tests/package-lock.json
@@ -0,0 +1,42 @@
+{
+  "name": "vscode-colorize-tests",
+  "version": "0.0.1",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "vscode-colorize-tests",
+      "version": "0.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "jsonc-parser": "^3.2.0"
+      },
+      "devDependencies": {
+        "@types/node": "20.x"
+      },
+      "engines": {
+        "vscode": "*"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "20.11.24",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
+      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/jsonc-parser": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
+      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w=="
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    }
+  }
+}
diff --git a/extensions/vscode-colorize-tests/package.json b/extensions/vscode-colorize-tests/package.json
index 159bd29573b..b416aeee103 100644
--- a/extensions/vscode-colorize-tests/package.json
+++ b/extensions/vscode-colorize-tests/package.json
@@ -14,7 +14,9 @@
   },
   "icon": "media/icon.png",
   "scripts": {
-    "vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:vscode-colorize-tests ./tsconfig.json"
+    "vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:vscode-colorize-tests ./tsconfig.json",
+    "watch": "gulp watch-extension:vscode-colorize-tests",
+    "compile": "gulp compile-extension:vscode-colorize-tests"
   },
   "dependencies": {
     "jsonc-parser": "^3.2.0"
diff --git a/extensions/vscode-colorize-tests/src/colorizer.test.ts b/extensions/vscode-colorize-tests/src/colorizer.test.ts
index 0ba416b5f87..0722490093d 100644
--- a/extensions/vscode-colorize-tests/src/colorizer.test.ts
+++ b/extensions/vscode-colorize-tests/src/colorizer.test.ts
@@ -7,17 +7,20 @@ import * as assert from 'assert';
 import * as fs from 'fs';
 import 'mocha';
 import { join, normalize } from 'path';
-import { commands, Uri } from 'vscode';
+import { commands, Uri, workspace, ConfigurationTarget } from 'vscode';
 
-function assertUnchangedTokens(fixturesPath: string, resultsPath: string, fixture: string, done: any) {
+async function assertUnchangedTokens(fixturesPath: string, resultsPath: string, treeSitterResultsPath: string, fixture: string, done: any) {
 	const testFixurePath = join(fixturesPath, fixture);
+	const tokenizers = [{ command: '_workbench.captureSyntaxTokens', resultsPath }, { command: '_workbench.captureTreeSitterSyntaxTokens', resultsPath: treeSitterResultsPath }];
 
-	return commands.executeCommand('_workbench.captureSyntaxTokens', Uri.file(testFixurePath)).then(data => {
-		try {
-			if (!fs.existsSync(resultsPath)) {
-				fs.mkdirSync(resultsPath);
+	try {
+		await Promise.all(tokenizers.map(async (tokenizer) => {
+			const data = await commands.executeCommand(tokenizer.command, Uri.file(testFixurePath));
+
+			if (!fs.existsSync(tokenizer.resultsPath)) {
+				fs.mkdirSync(tokenizer.resultsPath);
 			}
-			const resultPath = join(resultsPath, fixture.replace('.', '_') + '.json');
+			const resultPath = join(tokenizer.resultsPath, fixture.replace('.', '_') + '.json');
 			if (fs.existsSync(resultPath)) {
 				const previousData = JSON.parse(fs.readFileSync(resultPath).toString());
 				try {
@@ -40,11 +43,11 @@ function assertUnchangedTokens(fixturesPath: string, resultsPath: string, fixtur
 			} else {
 				fs.writeFileSync(resultPath, JSON.stringify(data, null, '\t'));
 			}
-			done();
-		} catch (e) {
-			done(e);
-		}
-	}, done);
+		}));
+		done();
+	} catch (e) {
+		done(e);
+	}
 }
 
 function hasThemeChange(d: any, p: any): boolean {
@@ -61,11 +64,21 @@ suite('colorization', () => {
 	const testPath = normalize(join(__dirname, '../test'));
 	const fixturesPath = join(testPath, 'colorize-fixtures');
 	const resultsPath = join(testPath, 'colorize-results');
+	const treeSitterResultsPath = join(testPath, 'colorize-tree-sitter-results');
+	let originalSettingValue: any;
+
+	suiteSetup(async function () {
+		originalSettingValue = workspace.getConfiguration('editor').get('experimental.preferTreeSitter');
+		await workspace.getConfiguration('editor').update('experimental.preferTreeSitter', ["typescript"], ConfigurationTarget.Global);
+	});
+	suiteTeardown(async function () {
+		await workspace.getConfiguration('editor').update('experimental.preferTreeSitter', originalSettingValue, ConfigurationTarget.Global);
+	});
 
 	for (const fixture of fs.readdirSync(fixturesPath)) {
 		test(`colorize: ${fixture}`, function (done) {
 			commands.executeCommand('workbench.action.closeAllEditors').then(() => {
-				assertUnchangedTokens(fixturesPath, resultsPath, fixture, done);
+				assertUnchangedTokens(fixturesPath, resultsPath, treeSitterResultsPath, fixture, done);
 			});
 		});
 	}
diff --git a/extensions/vscode-colorize-tests/test/colorize-fixtures/issue-224862.yaml b/extensions/vscode-colorize-tests/test/colorize-fixtures/issue-224862.yaml
new file mode 100644
index 00000000000..b807db09531
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-fixtures/issue-224862.yaml
@@ -0,0 +1,9 @@
+---
+foo: 1
+---
+
+This is highlighted as a YAML string
+
+# This is highlighted as a YAML comment
+
+This is highlighted as a YAML error
diff --git a/extensions/vscode-colorize-tests/test/colorize-fixtures/test.bat b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.bat
index 3e215fc5efc..91d454aa178 100644
--- a/extensions/vscode-colorize-tests/test/colorize-fixtures/test.bat
+++ b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.bat
@@ -6,7 +6,7 @@ title VSCode Dev
 pushd %~dp0\..
 
 :: Node modules
-if not exist node_modules call .\scripts\npm.bat install
+if not exist node_modules call npm i
 
 :: Get electron
 node .\node_modules\gulp\bin\gulp.js electron
@@ -21,4 +21,4 @@ call echo %%LINE:rem +=%%
 
 popd
 
-endlocal
\ No newline at end of file
+endlocal
diff --git a/extensions/vscode-colorize-tests/test/colorize-fixtures/test.sh b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.sh
index 50751c1e4a7..d08aa71909e 100644
--- a/extensions/vscode-colorize-tests/test/colorize-fixtures/test.sh
+++ b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.sh
@@ -19,7 +19,7 @@ function code() {
 	cd $ROOT
 
 	# Node modules
-	test -d node_modules || ./scripts/npm.sh install
+	test -d node_modules || npm i
 
 	# Configuration
 	export NODE_ENV=development
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/issue-1550_yaml.json b/extensions/vscode-colorize-tests/test/colorize-results/issue-1550_yaml.json
index dac84162b3c..cc1450808af 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/issue-1550_yaml.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/issue-1550_yaml.json
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "test1",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -15,7 +15,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -29,7 +29,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -43,7 +43,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -57,7 +57,7 @@
 	},
 	{
 		"c": "dsd",
-		"t": "source.yaml string.unquoted.plain.out.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
@@ -71,7 +71,7 @@
 	},
 	{
 		"c": "test2",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -85,7 +85,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -99,7 +99,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -113,7 +113,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -127,7 +127,7 @@
 	},
 	{
 		"c": "abc-def",
-		"t": "source.yaml string.unquoted.plain.out.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
@@ -141,7 +141,7 @@
 	},
 	{
 		"c": "test-3",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -169,7 +169,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -183,7 +183,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -197,7 +197,7 @@
 	},
 	{
 		"c": "abcdef",
-		"t": "source.yaml string.unquoted.plain.out.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
@@ -211,7 +211,7 @@
 	},
 	{
 		"c": "test-4",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -225,7 +225,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -239,7 +239,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -253,7 +253,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -267,7 +267,7 @@
 	},
 	{
 		"c": "abc-def",
-		"t": "source.yaml string.unquoted.plain.out.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/issue-224862_yaml.json b/extensions/vscode-colorize-tests/test/colorize-results/issue-224862_yaml.json
new file mode 100644
index 00000000000..f79882e54e4
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-results/issue-224862_yaml.json
@@ -0,0 +1,310 @@
+[
+	{
+		"c": "---",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml entity.other.document.begin.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "foo",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
+		"r": {
+			"dark_plus": "entity.name.tag: #569CD6",
+			"light_plus": "entity.name.tag: #800000",
+			"dark_vs": "entity.name.tag: #569CD6",
+			"light_vs": "entity.name.tag: #800000",
+			"hc_black": "entity.name.tag: #569CD6",
+			"dark_modern": "entity.name.tag: #569CD6",
+			"hc_light": "entity.name.tag: #0F4A85",
+			"light_modern": "entity.name.tag: #800000"
+		}
+	},
+	{
+		"c": ":",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "1",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml constant.numeric.integer.decimal.yaml",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": "---",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml entity.other.document.begin.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "This is highlighted as a YAML string",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml string.unquoted.plain.out.yaml",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string.unquoted.plain.out.yaml: #0000FF",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85",
+			"light_modern": "string.unquoted.plain.out.yaml: #0000FF"
+		}
+	},
+	{
+		"c": "#",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml comment.line.number-sign.yaml punctuation.definition.comment.yaml",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
+		}
+	},
+	{
+		"c": " This is highlighted as a YAML comment",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml comment.line.number-sign.yaml",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
+		}
+	},
+	{
+		"c": "This",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml invalid.illegal.unrecognized.yaml",
+		"r": {
+			"dark_plus": "invalid: #F44747",
+			"light_plus": "invalid: #CD3131",
+			"dark_vs": "invalid: #F44747",
+			"light_vs": "invalid: #CD3131",
+			"hc_black": "invalid: #F44747",
+			"dark_modern": "invalid: #F44747",
+			"hc_light": "invalid: #B5200D",
+			"light_modern": "invalid: #CD3131"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml punctuation.whitespace.separator.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "is",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml invalid.illegal.unrecognized.yaml",
+		"r": {
+			"dark_plus": "invalid: #F44747",
+			"light_plus": "invalid: #CD3131",
+			"dark_vs": "invalid: #F44747",
+			"light_vs": "invalid: #CD3131",
+			"hc_black": "invalid: #F44747",
+			"dark_modern": "invalid: #F44747",
+			"hc_light": "invalid: #B5200D",
+			"light_modern": "invalid: #CD3131"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml punctuation.whitespace.separator.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "highlighted",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml invalid.illegal.unrecognized.yaml",
+		"r": {
+			"dark_plus": "invalid: #F44747",
+			"light_plus": "invalid: #CD3131",
+			"dark_vs": "invalid: #F44747",
+			"light_vs": "invalid: #CD3131",
+			"hc_black": "invalid: #F44747",
+			"dark_modern": "invalid: #F44747",
+			"hc_light": "invalid: #B5200D",
+			"light_modern": "invalid: #CD3131"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml punctuation.whitespace.separator.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "as",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml invalid.illegal.unrecognized.yaml",
+		"r": {
+			"dark_plus": "invalid: #F44747",
+			"light_plus": "invalid: #CD3131",
+			"dark_vs": "invalid: #F44747",
+			"light_vs": "invalid: #CD3131",
+			"hc_black": "invalid: #F44747",
+			"dark_modern": "invalid: #F44747",
+			"hc_light": "invalid: #B5200D",
+			"light_modern": "invalid: #CD3131"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml punctuation.whitespace.separator.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "a",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml invalid.illegal.unrecognized.yaml",
+		"r": {
+			"dark_plus": "invalid: #F44747",
+			"light_plus": "invalid: #CD3131",
+			"dark_vs": "invalid: #F44747",
+			"light_vs": "invalid: #CD3131",
+			"hc_black": "invalid: #F44747",
+			"dark_modern": "invalid: #F44747",
+			"hc_light": "invalid: #B5200D",
+			"light_modern": "invalid: #CD3131"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml punctuation.whitespace.separator.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "YAML",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml invalid.illegal.unrecognized.yaml",
+		"r": {
+			"dark_plus": "invalid: #F44747",
+			"light_plus": "invalid: #CD3131",
+			"dark_vs": "invalid: #F44747",
+			"light_vs": "invalid: #CD3131",
+			"hc_black": "invalid: #F44747",
+			"dark_modern": "invalid: #F44747",
+			"hc_light": "invalid: #B5200D",
+			"light_modern": "invalid: #CD3131"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml punctuation.whitespace.separator.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "error",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml invalid.illegal.unrecognized.yaml",
+		"r": {
+			"dark_plus": "invalid: #F44747",
+			"light_plus": "invalid: #CD3131",
+			"dark_vs": "invalid: #F44747",
+			"light_vs": "invalid: #CD3131",
+			"hc_black": "invalid: #F44747",
+			"dark_modern": "invalid: #F44747",
+			"hc_light": "invalid: #B5200D",
+			"light_modern": "invalid: #CD3131"
+		}
+	}
+]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/issue-4008_yaml.json b/extensions/vscode-colorize-tests/test/colorize-results/issue-4008_yaml.json
index e1aa82e9ca3..c8c2d57d903 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/issue-4008_yaml.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/issue-4008_yaml.json
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "-",
-		"t": "source.yaml punctuation.definition.block.sequence.item.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml punctuation.definition.block.sequence.item.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -15,7 +15,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -29,7 +29,7 @@
 	},
 	{
 		"c": "blue",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -43,7 +43,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -57,7 +57,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -71,7 +71,7 @@
 	},
 	{
 		"c": "a=\"brown,not_brown\"",
-		"t": "source.yaml string.unquoted.plain.out.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
@@ -85,7 +85,7 @@
 	},
 	{
 		"c": "-",
-		"t": "source.yaml punctuation.definition.block.sequence.item.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml punctuation.definition.block.sequence.item.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -99,7 +99,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -113,7 +113,7 @@
 	},
 	{
 		"c": "not_blue",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -127,7 +127,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -141,7 +141,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": "foo",
-		"t": "source.yaml string.unquoted.plain.out.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
@@ -169,7 +169,7 @@
 	},
 	{
 		"c": "-",
-		"t": "source.yaml punctuation.definition.block.sequence.item.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml punctuation.definition.block.sequence.item.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -183,7 +183,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -197,7 +197,7 @@
 	},
 	{
 		"c": "blue",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -211,7 +211,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -225,7 +225,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -239,7 +239,7 @@
 	},
 	{
 		"c": "foo=\"}\"",
-		"t": "source.yaml string.unquoted.plain.out.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
@@ -253,7 +253,7 @@
 	},
 	{
 		"c": "-",
-		"t": "source.yaml punctuation.definition.block.sequence.item.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml punctuation.definition.block.sequence.item.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -267,7 +267,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -281,7 +281,7 @@
 	},
 	{
 		"c": "not_blue",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -295,7 +295,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -309,7 +309,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -323,7 +323,7 @@
 	},
 	{
 		"c": "1",
-		"t": "source.yaml constant.numeric.integer.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml constant.numeric.integer.decimal.yaml",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/issue-6303_yaml.json b/extensions/vscode-colorize-tests/test/colorize-results/issue-6303_yaml.json
index 2066b677e2c..e5267d62494 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/issue-6303_yaml.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/issue-6303_yaml.json
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "swagger",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -15,7 +15,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -29,7 +29,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -43,7 +43,7 @@
 	},
 	{
 		"c": "'",
-		"t": "source.yaml string.quoted.single.yaml punctuation.definition.string.begin.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml string.quoted.single.yaml punctuation.definition.string.begin.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.yaml: #0000FF",
@@ -57,7 +57,7 @@
 	},
 	{
 		"c": "2.0",
-		"t": "source.yaml string.quoted.single.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml string.quoted.single.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.yaml: #0000FF",
@@ -71,7 +71,7 @@
 	},
 	{
 		"c": "'",
-		"t": "source.yaml string.quoted.single.yaml punctuation.definition.string.end.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml string.quoted.single.yaml punctuation.definition.string.end.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.yaml: #0000FF",
@@ -85,7 +85,7 @@
 	},
 	{
 		"c": "info",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -99,7 +99,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -113,7 +113,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -127,7 +127,7 @@
 	},
 	{
 		"c": "description",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -141,7 +141,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -169,7 +169,7 @@
 	},
 	{
 		"c": "'",
-		"t": "source.yaml string.quoted.single.yaml punctuation.definition.string.begin.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml string.quoted.single.yaml punctuation.definition.string.begin.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.yaml: #0000FF",
@@ -183,7 +183,7 @@
 	},
 	{
 		"c": "The API Management Service API defines an updated and refined version",
-		"t": "source.yaml string.quoted.single.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml string.quoted.single.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.yaml: #0000FF",
@@ -196,8 +196,22 @@
 		}
 	},
 	{
-		"c": "    of the concepts currently known as Developer, APP, and API Product in Edge. Of",
-		"t": "source.yaml string.quoted.single.yaml",
+		"c": "  ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "  ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml string.quoted.single.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.yaml: #0000FF",
@@ -210,8 +224,8 @@
 		}
 	},
 	{
-		"c": "    note is the introduction of the API concept, missing previously from Edge",
-		"t": "source.yaml string.quoted.single.yaml",
+		"c": "of the concepts currently known as Developer, APP, and API Product in Edge. Of",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml string.quoted.single.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.yaml: #0000FF",
@@ -224,8 +238,64 @@
 		}
 	},
 	{
-		"c": "    ",
-		"t": "source.yaml string.quoted.single.yaml",
+		"c": "  ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "  ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml string.quoted.single.yaml punctuation.whitespace.separator.yaml",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string.quoted.single.yaml: #0000FF",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string.quoted.single.yaml: #0000FF",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string.quoted.single.yaml: #0F4A85",
+			"light_modern": "string.quoted.single.yaml: #0000FF"
+		}
+	},
+	{
+		"c": "note is the introduction of the API concept, missing previously from Edge",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml string.quoted.single.yaml",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string.quoted.single.yaml: #0000FF",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string.quoted.single.yaml: #0000FF",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string.quoted.single.yaml: #0F4A85",
+			"light_modern": "string.quoted.single.yaml: #0000FF"
+		}
+	},
+	{
+		"c": "  ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "  ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml string.quoted.single.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.yaml: #0000FF",
@@ -239,7 +309,7 @@
 	},
 	{
 		"c": "'",
-		"t": "source.yaml string.quoted.single.yaml punctuation.definition.string.end.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml string.quoted.single.yaml punctuation.definition.string.end.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.yaml: #0000FF",
@@ -253,7 +323,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -267,7 +337,7 @@
 	},
 	{
 		"c": "title",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -281,7 +351,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -295,7 +365,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -309,7 +379,7 @@
 	},
 	{
 		"c": "API Management Service API",
-		"t": "source.yaml string.unquoted.plain.out.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
@@ -323,7 +393,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -337,7 +407,7 @@
 	},
 	{
 		"c": "version",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -351,7 +421,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -365,7 +435,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -379,7 +449,7 @@
 	},
 	{
 		"c": "initial",
-		"t": "source.yaml string.unquoted.plain.out.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-cssvariables_less.json b/extensions/vscode-colorize-tests/test/colorize-results/test-cssvariables_less.json
index 856f013541b..3381f6448d0 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-cssvariables_less.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-cssvariables_less.json
@@ -686,7 +686,7 @@
 		}
 	},
 	{
-		"c": " 5px",
+		"c": " ",
 		"t": "source.css.less meta.property-list.less meta.property-value.less meta.function-call.less meta.function-call.less",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -699,6 +699,34 @@
 			"light_modern": "default: #3B3B3B"
 		}
 	},
+	{
+		"c": "5",
+		"t": "source.css.less meta.property-list.less meta.property-value.less meta.function-call.less meta.function-call.less constant.numeric.less",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": "px",
+		"t": "source.css.less meta.property-list.less meta.property-value.less meta.function-call.less meta.function-call.less constant.numeric.less keyword.other.unit.less",
+		"r": {
+			"dark_plus": "keyword.other.unit: #B5CEA8",
+			"light_plus": "keyword.other.unit: #098658",
+			"dark_vs": "keyword.other.unit: #B5CEA8",
+			"light_vs": "keyword.other.unit: #098658",
+			"hc_black": "keyword.other.unit: #B5CEA8",
+			"dark_modern": "keyword.other.unit: #B5CEA8",
+			"hc_light": "keyword.other.unit: #096D48",
+			"light_modern": "keyword.other.unit: #098658"
+		}
+	},
 	{
 		"c": ")",
 		"t": "source.css.less meta.property-list.less meta.property-value.less meta.function-call.less meta.function-call.less punctuation.definition.group.end.less",
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_bat.json b/extensions/vscode-colorize-tests/test/colorize-results/test_bat.json
index db82378582b..853018d8458 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_bat.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_bat.json
@@ -294,7 +294,7 @@
 		}
 	},
 	{
-		"c": " .\\scripts\\npm.bat install",
+		"c": " npm i",
 		"t": "source.batchfile",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -685,4 +685,4 @@
 			"light_modern": "keyword: #0000FF"
 		}
 	}
-]
\ No newline at end of file
+]
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_less.json b/extensions/vscode-colorize-tests/test/colorize-results/test_less.json
index 08d8b9f4fb5..a66224dd9e6 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_less.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_less.json
@@ -897,16 +897,16 @@
 	},
 	{
 		"c": " ",
-		"t": "source.css.less meta.property-list.less meta.property-value.less",
+		"t": "source.css.less meta.property-list.less meta.property-value.less variable.other.readwrite.less",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "source.css variable: #9CDCFE",
+			"light_plus": "source.css variable: #E50000",
+			"dark_vs": "source.css variable: #9CDCFE",
+			"light_vs": "source.css variable: #E50000",
+			"hc_black": "source.css variable: #D4D4D4",
+			"dark_modern": "source.css variable: #9CDCFE",
+			"hc_light": "source.css variable: #264F78",
+			"light_modern": "source.css variable: #E50000"
 		}
 	},
 	{
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_r.json b/extensions/vscode-colorize-tests/test/colorize-results/test_r.json
index 128918635b5..44936307a05 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_r.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_r.json
@@ -476,21 +476,7 @@
 		}
 	},
 	{
-		"c": "x",
-		"t": "source.r variable.other.r",
-		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "variable: #9CDCFE",
-			"dark_modern": "variable: #9CDCFE",
-			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
-		}
-	},
-	{
-		"c": ", ",
+		"c": "x, y",
 		"t": "source.r",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -503,20 +489,6 @@
 			"light_modern": "default: #3B3B3B"
 		}
 	},
-	{
-		"c": "y",
-		"t": "source.r variable.other.r",
-		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "variable: #9CDCFE",
-			"dark_modern": "variable: #9CDCFE",
-			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
-		}
-	},
 	{
 		"c": ")",
 		"t": "source.r punctuation.section.parens.end.r",
@@ -560,35 +532,7 @@
 		}
 	},
 	{
-		"c": "  ",
-		"t": "source.r",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
-		}
-	},
-	{
-		"c": "x",
-		"t": "source.r variable.other.r",
-		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "variable: #9CDCFE",
-			"dark_modern": "variable: #9CDCFE",
-			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
-		}
-	},
-	{
-		"c": " ",
+		"c": "  x ",
 		"t": "source.r",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -616,7 +560,7 @@
 		}
 	},
 	{
-		"c": " ",
+		"c": " y",
 		"t": "source.r",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -629,20 +573,6 @@
 			"light_modern": "default: #3B3B3B"
 		}
 	},
-	{
-		"c": "y",
-		"t": "source.r variable.other.r",
-		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "variable: #9CDCFE",
-			"dark_modern": "variable: #9CDCFE",
-			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
-		}
-	},
 	{
 		"c": "}",
 		"t": "source.r punctuation.section.braces.end.r",
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_sh.json b/extensions/vscode-colorize-tests/test/colorize-results/test_sh.json
index 8f1cb4c388b..0dde2e0748e 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_sh.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_sh.json
@@ -2380,7 +2380,7 @@
 		}
 	},
 	{
-		"c": "./scripts/npm.sh",
+		"c": "npm",
 		"t": "source.shell meta.function.shell meta.function.body.shell meta.statement.shell meta.statement.command.shell meta.statement.command.name.shell entity.name.function.call.shell entity.name.command.shell",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
@@ -2408,7 +2408,7 @@
 		}
 	},
 	{
-		"c": "install",
+		"c": "i",
 		"t": "source.shell meta.function.shell meta.function.body.shell meta.statement.shell meta.statement.command.shell meta.argument.shell string.unquoted.argument.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
@@ -3345,4 +3345,4 @@
 			"light_modern": "string: #A31515"
 		}
 	}
-]
\ No newline at end of file
+]
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_yaml.json b/extensions/vscode-colorize-tests/test/colorize-results/test_yaml.json
index 407cc7c7a1a..0908e19e3ea 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_yaml.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_yaml.json
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "#",
-		"t": "source.yaml comment.line.number-sign.yaml punctuation.definition.comment.yaml",
+		"t": "source.yaml meta.stream.yaml comment.line.number-sign.yaml punctuation.definition.comment.yaml",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -15,7 +15,7 @@
 	},
 	{
 		"c": " sequencer protocols for Laser eye surgery",
-		"t": "source.yaml comment.line.number-sign.yaml",
+		"t": "source.yaml meta.stream.yaml comment.line.number-sign.yaml",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -29,7 +29,7 @@
 	},
 	{
 		"c": "---",
-		"t": "source.yaml entity.other.document.begin.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml entity.other.document.begin.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -43,7 +43,7 @@
 	},
 	{
 		"c": "-",
-		"t": "source.yaml punctuation.definition.block.sequence.item.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml punctuation.definition.block.sequence.item.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -57,7 +57,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -71,7 +71,7 @@
 	},
 	{
 		"c": "step",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -85,7 +85,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -99,7 +99,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -113,7 +113,7 @@
 	},
 	{
 		"c": "&",
-		"t": "source.yaml meta.property.yaml keyword.control.property.anchor.yaml punctuation.definition.anchor.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml keyword.control.flow.anchor.yaml punctuation.definition.anchor.yaml",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -127,21 +127,21 @@
 	},
 	{
 		"c": "id001",
-		"t": "source.yaml meta.property.yaml entity.name.type.anchor.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml keyword.control.flow.anchor.yaml variable.other.anchor.yaml",
 		"r": {
-			"dark_plus": "entity.name.type: #4EC9B0",
-			"light_plus": "entity.name.type: #267F99",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "entity.name.type: #4EC9B0",
-			"dark_modern": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
 		}
 	},
 	{
 		"c": "                  ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": "#",
-		"t": "source.yaml comment.line.number-sign.yaml punctuation.definition.comment.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml comment.line.number-sign.yaml punctuation.definition.comment.yaml",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -169,7 +169,7 @@
 	},
 	{
 		"c": " defines anchor label &id001",
-		"t": "source.yaml comment.line.number-sign.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml comment.line.number-sign.yaml",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -182,8 +182,22 @@
 		}
 	},
 	{
-		"c": "    ",
-		"t": "source.yaml",
+		"c": "  ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "  ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -197,7 +211,7 @@
 	},
 	{
 		"c": "instrument",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -211,7 +225,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -225,7 +239,7 @@
 	},
 	{
 		"c": "      ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -239,7 +253,7 @@
 	},
 	{
 		"c": "Lasik 2000",
-		"t": "source.yaml string.unquoted.plain.out.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
@@ -252,8 +266,22 @@
 		}
 	},
 	{
-		"c": "    ",
-		"t": "source.yaml",
+		"c": "  ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "  ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -267,7 +295,7 @@
 	},
 	{
 		"c": "pulseEnergy",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -281,7 +309,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -295,7 +323,7 @@
 	},
 	{
 		"c": "     ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -309,7 +337,7 @@
 	},
 	{
 		"c": "5.4",
-		"t": "source.yaml constant.numeric.float.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml constant.numeric.float.yaml",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -322,8 +350,22 @@
 		}
 	},
 	{
-		"c": "    ",
-		"t": "source.yaml",
+		"c": "  ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "  ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -337,7 +379,7 @@
 	},
 	{
 		"c": "spotSize",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -351,7 +393,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -365,7 +407,7 @@
 	},
 	{
 		"c": "        ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -379,7 +421,7 @@
 	},
 	{
 		"c": "1mm",
-		"t": "source.yaml string.unquoted.plain.out.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
@@ -393,7 +435,7 @@
 	},
 	{
 		"c": "-",
-		"t": "source.yaml punctuation.definition.block.sequence.item.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml punctuation.definition.block.sequence.item.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -407,7 +449,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -421,7 +463,7 @@
 	},
 	{
 		"c": "step",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -435,7 +477,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -449,7 +491,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -463,7 +505,7 @@
 	},
 	{
 		"c": "*",
-		"t": "source.yaml keyword.control.flow.alias.yaml punctuation.definition.alias.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml keyword.control.flow.alias.yaml punctuation.definition.alias.yaml",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -477,12 +519,12 @@
 	},
 	{
 		"c": "id001",
-		"t": "source.yaml variable.other.alias.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml keyword.control.flow.alias.yaml variable.other.alias.yaml",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
@@ -491,7 +533,7 @@
 	},
 	{
 		"c": "                   ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -505,7 +547,7 @@
 	},
 	{
 		"c": "#",
-		"t": "source.yaml comment.line.number-sign.yaml punctuation.definition.comment.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml comment.line.number-sign.yaml punctuation.definition.comment.yaml",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -519,7 +561,7 @@
 	},
 	{
 		"c": " refers to the first step (with anchor &id001)",
-		"t": "source.yaml comment.line.number-sign.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml comment.line.number-sign.yaml",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -533,7 +575,7 @@
 	},
 	{
 		"c": "-",
-		"t": "source.yaml punctuation.definition.block.sequence.item.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml punctuation.definition.block.sequence.item.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -547,7 +589,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -561,7 +603,7 @@
 	},
 	{
 		"c": "step",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -575,7 +617,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -589,7 +631,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -603,7 +645,7 @@
 	},
 	{
 		"c": "*",
-		"t": "source.yaml keyword.control.flow.alias.yaml punctuation.definition.alias.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml keyword.control.flow.alias.yaml punctuation.definition.alias.yaml",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -617,12 +659,12 @@
 	},
 	{
 		"c": "id001",
-		"t": "source.yaml variable.other.alias.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml keyword.control.flow.alias.yaml variable.other.alias.yaml",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
@@ -630,8 +672,8 @@
 		}
 	},
 	{
-		"c": "    ",
-		"t": "source.yaml",
+		"c": "  ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -644,22 +686,8 @@
 		}
 	},
 	{
-		"c": "spotSize",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
-		"r": {
-			"dark_plus": "entity.name.tag: #569CD6",
-			"light_plus": "entity.name.tag: #800000",
-			"dark_vs": "entity.name.tag: #569CD6",
-			"light_vs": "entity.name.tag: #800000",
-			"hc_black": "entity.name.tag: #569CD6",
-			"dark_modern": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
-		}
-	},
-	{
-		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"c": "  ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -671,9 +699,23 @@
 			"light_modern": "default: #3B3B3B"
 		}
 	},
+	{
+		"c": "spotSize:",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml invalid.illegal.unrecognized.yaml",
+		"r": {
+			"dark_plus": "invalid: #F44747",
+			"light_plus": "invalid: #CD3131",
+			"dark_vs": "invalid: #F44747",
+			"light_vs": "invalid: #CD3131",
+			"hc_black": "invalid: #F44747",
+			"dark_modern": "invalid: #F44747",
+			"hc_light": "invalid: #B5200D",
+			"light_modern": "invalid: #CD3131"
+		}
+	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -687,7 +729,7 @@
 	},
 	{
 		"c": "2mm",
-		"t": "source.yaml string.unquoted.plain.out.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
@@ -701,21 +743,21 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml punctuation.whitespace.separator.yaml",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string.unquoted.plain.out.yaml: #0000FF",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85",
+			"light_modern": "string.unquoted.plain.out.yaml: #0000FF"
 		}
 	},
 	{
 		"c": "-",
-		"t": "source.yaml punctuation.definition.block.sequence.item.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml punctuation.definition.block.sequence.item.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -729,7 +771,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -743,7 +785,7 @@
 	},
 	{
 		"c": "step",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -757,7 +799,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -771,7 +813,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -785,7 +827,7 @@
 	},
 	{
 		"c": "*",
-		"t": "source.yaml keyword.control.flow.alias.yaml punctuation.definition.alias.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml keyword.control.flow.alias.yaml punctuation.definition.alias.yaml",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -799,12 +841,12 @@
 	},
 	{
 		"c": "id002",
-		"t": "source.yaml variable.other.alias.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml keyword.control.flow.alias.yaml variable.other.alias.yaml",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
@@ -813,7 +855,7 @@
 	},
 	{
 		"c": "-",
-		"t": "source.yaml punctuation.definition.block.sequence.item.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml punctuation.definition.block.sequence.item.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -827,7 +869,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -841,7 +883,7 @@
 	},
 	{
 		"c": "{",
-		"t": "source.yaml meta.flow-mapping.yaml punctuation.definition.mapping.begin.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.flow.mapping.yaml punctuation.definition.mapping.begin.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -855,7 +897,7 @@
 	},
 	{
 		"c": "name",
-		"t": "source.yaml meta.flow-mapping.yaml meta.flow-pair.key.yaml string.unquoted.plain.in.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.flow.mapping.yaml meta.flow.map.implicit.yaml meta.flow.map.key.yaml string.unquoted.plain.in.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -869,7 +911,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml meta.flow-mapping.yaml meta.flow-pair.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.flow.mapping.yaml meta.flow.map.implicit.yaml meta.flow.pair.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -883,7 +925,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml meta.flow-mapping.yaml meta.flow-pair.yaml meta.flow-pair.value.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.flow.mapping.yaml meta.flow.map.implicit.yaml meta.flow.pair.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -897,7 +939,7 @@
 	},
 	{
 		"c": "John Smith",
-		"t": "source.yaml meta.flow-mapping.yaml meta.flow-pair.yaml meta.flow-pair.value.yaml string.unquoted.plain.in.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.flow.mapping.yaml meta.flow.map.implicit.yaml meta.flow.pair.value.yaml string.unquoted.plain.in.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.plain.in.yaml: #0000FF",
@@ -911,7 +953,7 @@
 	},
 	{
 		"c": ",",
-		"t": "source.yaml meta.flow-mapping.yaml punctuation.separator.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.flow.mapping.yaml punctuation.separator.mapping.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -925,7 +967,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml meta.flow-mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.flow.mapping.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -939,7 +981,7 @@
 	},
 	{
 		"c": "age",
-		"t": "source.yaml meta.flow-mapping.yaml meta.flow-pair.key.yaml string.unquoted.plain.in.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.flow.mapping.yaml meta.flow.map.implicit.yaml meta.flow.map.key.yaml string.unquoted.plain.in.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -953,7 +995,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml meta.flow-mapping.yaml meta.flow-pair.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.flow.mapping.yaml meta.flow.map.implicit.yaml meta.flow.pair.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -967,7 +1009,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml meta.flow-mapping.yaml meta.flow-pair.yaml meta.flow-pair.value.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.flow.mapping.yaml meta.flow.map.implicit.yaml meta.flow.pair.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -981,7 +1023,7 @@
 	},
 	{
 		"c": "33",
-		"t": "source.yaml meta.flow-mapping.yaml meta.flow-pair.yaml meta.flow-pair.value.yaml constant.numeric.integer.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.flow.mapping.yaml meta.flow.map.implicit.yaml meta.flow.pair.value.yaml string.unquoted.plain.in.yaml constant.numeric.integer.decimal.yaml",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -995,7 +1037,7 @@
 	},
 	{
 		"c": "}",
-		"t": "source.yaml meta.flow-mapping.yaml punctuation.definition.mapping.end.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.flow.mapping.yaml punctuation.definition.mapping.end.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1009,7 +1051,7 @@
 	},
 	{
 		"c": "-",
-		"t": "source.yaml punctuation.definition.block.sequence.item.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml punctuation.definition.block.sequence.item.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1023,7 +1065,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1037,7 +1079,7 @@
 	},
 	{
 		"c": "name",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1051,7 +1093,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1065,7 +1107,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1079,7 +1121,7 @@
 	},
 	{
 		"c": "Mary Smith",
-		"t": "source.yaml string.unquoted.plain.out.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
@@ -1093,7 +1135,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1107,7 +1149,7 @@
 	},
 	{
 		"c": "age",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1121,7 +1163,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1135,7 +1177,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1149,7 +1191,7 @@
 	},
 	{
 		"c": "27",
-		"t": "source.yaml constant.numeric.integer.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml constant.numeric.integer.decimal.yaml",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -1163,7 +1205,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1176,8 +1218,22 @@
 		}
 	},
 	{
-		"c": "men",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"c": "m",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml invalid.illegal.expected-indentation.yaml",
+		"r": {
+			"dark_plus": "invalid: #F44747",
+			"light_plus": "invalid: #CD3131",
+			"dark_vs": "invalid: #F44747",
+			"light_vs": "invalid: #CD3131",
+			"hc_black": "invalid: #F44747",
+			"dark_modern": "invalid: #F44747",
+			"hc_light": "invalid: #B5200D",
+			"light_modern": "invalid: #CD3131"
+		}
+	},
+	{
+		"c": "en",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1191,7 +1247,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1205,7 +1261,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1219,7 +1275,7 @@
 	},
 	{
 		"c": "[",
-		"t": "source.yaml meta.flow-sequence.yaml punctuation.definition.sequence.begin.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.flow.sequence.yaml punctuation.definition.sequence.begin.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1233,7 +1289,7 @@
 	},
 	{
 		"c": "John Smith",
-		"t": "source.yaml meta.flow-sequence.yaml string.unquoted.plain.in.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.flow.sequence.yaml string.unquoted.plain.in.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.plain.in.yaml: #0000FF",
@@ -1247,7 +1303,7 @@
 	},
 	{
 		"c": ",",
-		"t": "source.yaml meta.flow-sequence.yaml punctuation.separator.sequence.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.flow.sequence.yaml punctuation.separator.sequence.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1261,7 +1317,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml meta.flow-sequence.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.flow.sequence.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1275,7 +1331,7 @@
 	},
 	{
 		"c": "Bill Jones",
-		"t": "source.yaml meta.flow-sequence.yaml string.unquoted.plain.in.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.flow.sequence.yaml string.unquoted.plain.in.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.plain.in.yaml: #0000FF",
@@ -1289,7 +1345,7 @@
 	},
 	{
 		"c": "]",
-		"t": "source.yaml meta.flow-sequence.yaml punctuation.definition.sequence.end.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.flow.sequence.yaml punctuation.definition.sequence.end.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1302,8 +1358,36 @@
 		}
 	},
 	{
-		"c": "women",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"c": "w",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml invalid.illegal.expected-indentation.yaml",
+		"r": {
+			"dark_plus": "invalid: #F44747",
+			"light_plus": "invalid: #CD3131",
+			"dark_vs": "invalid: #F44747",
+			"light_vs": "invalid: #CD3131",
+			"hc_black": "invalid: #F44747",
+			"dark_modern": "invalid: #F44747",
+			"hc_light": "invalid: #B5200D",
+			"light_modern": "invalid: #CD3131"
+		}
+	},
+	{
+		"c": "o",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml invalid.illegal.expected-indentation.yaml",
+		"r": {
+			"dark_plus": "invalid: #F44747",
+			"light_plus": "invalid: #CD3131",
+			"dark_vs": "invalid: #F44747",
+			"light_vs": "invalid: #CD3131",
+			"hc_black": "invalid: #F44747",
+			"dark_modern": "invalid: #F44747",
+			"hc_light": "invalid: #B5200D",
+			"light_modern": "invalid: #CD3131"
+		}
+	},
+	{
+		"c": "men",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1317,7 +1401,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1331,7 +1415,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1345,7 +1429,7 @@
 	},
 	{
 		"c": "-",
-		"t": "source.yaml punctuation.definition.block.sequence.item.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.block.sequence.yaml punctuation.definition.block.sequence.item.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1359,7 +1443,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.block.sequence.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1373,7 +1457,7 @@
 	},
 	{
 		"c": "Mary Smith",
-		"t": "source.yaml string.unquoted.plain.out.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.block.sequence.yaml string.unquoted.plain.out.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
@@ -1387,7 +1471,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1401,7 +1485,7 @@
 	},
 	{
 		"c": "-",
-		"t": "source.yaml punctuation.definition.block.sequence.item.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.block.sequence.yaml punctuation.definition.block.sequence.item.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1415,7 +1499,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.block.sequence.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1429,7 +1513,7 @@
 	},
 	{
 		"c": "Susan Williams",
-		"t": "source.yaml string.unquoted.plain.out.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.block.sequence.yaml string.unquoted.plain.out.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/12750_html.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/12750_html.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/12750_html.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/13448_html.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/13448_html.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/13448_html.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/14119_less.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/14119_less.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/14119_less.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/25920_html.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/25920_html.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/25920_html.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/COMMIT_EDITMSG.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/COMMIT_EDITMSG.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/COMMIT_EDITMSG.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/Dockerfile.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/Dockerfile.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/Dockerfile.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/basic_java.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/basic_java.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/basic_java.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/git-rebase-todo.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/git-rebase-todo.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/git-rebase-todo.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/issue-1550_yaml.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/issue-1550_yaml.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/issue-1550_yaml.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/issue-224862_yaml.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/issue-224862_yaml.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/issue-224862_yaml.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/issue-28354_php.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/issue-28354_php.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/issue-28354_php.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/issue-4008_yaml.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/issue-4008_yaml.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/issue-4008_yaml.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/issue-6303_yaml.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/issue-6303_yaml.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/issue-6303_yaml.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/issue-76997_php.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/issue-76997_php.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/issue-76997_php.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/makefile.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/makefile.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/makefile.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/md-math_md.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/md-math_md.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/md-math_md.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-13777_go.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-13777_go.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-13777_go.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-166781_rs.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-166781_rs.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-166781_rs.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-173216_sh.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-173216_sh.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-173216_sh.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-173224_sh.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-173224_sh.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-173224_sh.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-173336_sh.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-173336_sh.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-173336_sh.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-23630_cpp.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-23630_cpp.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-23630_cpp.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-23850_cpp.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-23850_cpp.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-23850_cpp.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-33886_md.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-33886_md.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-33886_md.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-4287_pug.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-4287_pug.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-4287_pug.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-6611_rs.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-6611_rs.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-6611_rs.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-7115_xml.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-7115_xml.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-7115_xml.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-78769_cpp.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-78769_cpp.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-78769_cpp.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-80644_cpp.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-80644_cpp.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-80644_cpp.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-brackets_tsx.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-brackets_tsx.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-brackets_tsx.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-cssvariables_less.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-cssvariables_less.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-cssvariables_less.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-cssvariables_scss.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-cssvariables_scss.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-cssvariables_scss.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-embedding_html.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-embedding_html.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-embedding_html.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-freeze-56377_py.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-freeze-56377_py.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-freeze-56377_py.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-freeze-56476_ps1.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-freeze-56476_ps1.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-freeze-56476_ps1.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-function-inv_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-function-inv_ts.json
new file mode 100644
index 00000000000..359efe02a4e
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-function-inv_ts.json
@@ -0,0 +1,254 @@
+[
+	{
+		"c": "rowData",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "push",
+		"t": "variable entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "callback",
+		"t": "variable entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "new",
+		"t": "keyword.operator.new",
+		"r": {
+			"dark_plus": "keyword.operator.new: #569CD6",
+			"light_plus": "keyword.operator.new: #0000FF",
+			"dark_vs": "keyword.operator.new: #569CD6",
+			"light_vs": "keyword.operator.new: #0000FF",
+			"hc_black": "keyword.operator.new: #569CD6",
+			"dark_modern": "keyword.operator.new: #569CD6",
+			"hc_light": "keyword.operator.new: #0F4A85",
+			"light_modern": "keyword.operator.new: #0000FF"
+		}
+	},
+	{
+		"c": "Cell",
+		"t": "variable entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "row",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "col",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "false",
+		"t": "constant.language",
+		"r": {
+			"dark_plus": "constant.language: #569CD6",
+			"light_plus": "constant.language: #0000FF",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
+			"hc_black": "constant.language: #569CD6",
+			"dark_modern": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_modern": "constant.language: #0000FF"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	}
+]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue11_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue11_ts.json
new file mode 100644
index 00000000000..6fb2651c7c5
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue11_ts.json
@@ -0,0 +1,3166 @@
+[
+	{
+		"c": "let",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "keyCode",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "0",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "if",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "!",
+		"t": "keyword.operator.logical",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "keyCode",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "===",
+		"t": "keyword.operator.logical",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "8",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": "||",
+		"t": "keyword.operator.logical",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "keyCode",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ">=",
+		"t": "keyword.operator.relational",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "48",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": "&&",
+		"t": "keyword.operator.logical",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "keyCode",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "<=",
+		"t": "keyword.operator.relational",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "57",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "for",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "let",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "i",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "0",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "i",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "<",
+		"t": "keyword.operator.relational",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "5",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "i",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "++",
+		"t": "keyword.operator.increment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "for",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "var",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "i",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "0",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "i",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "<",
+		"t": "keyword.operator.relational",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "5",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "i",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "++",
+		"t": "keyword.operator.increment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "for",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "let",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "i",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "0",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "i",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "<",
+		"t": "keyword.operator.relational",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "5",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "i",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "++",
+		"t": "keyword.operator.increment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "for",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "i",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "<",
+		"t": "keyword.operator.relational",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "5",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "for",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "let",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "i",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "0",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "1",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": "+",
+		"t": "keyword.operator.arithmetic",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "i",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "<<",
+		"t": "keyword.operator",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "5",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "<",
+		"t": "keyword.operator.relational",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "5",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "i",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "++",
+		"t": "keyword.operator.increment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "var",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "p",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "1",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": "?",
+		"t": "punctuation.delimiter keyword.operator.optional keyword.operator.ternary",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "2",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional keyword.operator.ternary",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "3",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": "<",
+		"t": "keyword.operator.relational",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "4",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": "?",
+		"t": "punctuation.delimiter keyword.operator.optional keyword.operator.ternary",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "5",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional keyword.operator.ternary",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "6",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "class",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "A",
+		"t": "entity.name.type",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "<",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "X",
+		"t": "entity.name.type",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "Y",
+		"t": "entity.name.type",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": ">",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "class",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "A1",
+		"t": "entity.name.type",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "<",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "T",
+		"t": "entity.name.type",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "extends",
+		"t": "storage.modifier",
+		"r": {
+			"dark_plus": "storage.modifier: #569CD6",
+			"light_plus": "storage.modifier: #0000FF",
+			"dark_vs": "storage.modifier: #569CD6",
+			"light_vs": "storage.modifier: #0000FF",
+			"hc_black": "storage.modifier: #569CD6",
+			"dark_modern": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_modern": "storage.modifier: #0000FF"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "a",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "=>",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "string",
+		"t": "support.type support.type.primitive",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ">",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "class",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "B",
+		"t": "entity.name.type",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "class",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "C",
+		"t": "entity.name.type",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "function",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "foo",
+		"t": "variable entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "<",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "T",
+		"t": "entity.name.type",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": ">",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "return",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "1",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "let",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "x1",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "A",
+		"t": "entity.name.type",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "<",
+		"t": "punctuation.bracket",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "param",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "?",
+		"t": "punctuation.delimiter keyword.operator.optional",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "number",
+		"t": "support.type support.type.primitive",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "=>",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "void",
+		"t": "support.type support.type.primitive",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "B",
+		"t": "entity.name.type",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": ">",
+		"t": "punctuation.bracket",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "let",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "x2",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "A",
+		"t": "entity.name.type",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "<",
+		"t": "punctuation.bracket",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "C",
+		"t": "entity.name.type",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "|",
+		"t": "keyword.operator",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "B",
+		"t": "entity.name.type",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "C",
+		"t": "entity.name.type",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "&",
+		"t": "keyword.operator",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "B",
+		"t": "entity.name.type",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": ">",
+		"t": "punctuation.bracket",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "const",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "t",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "1",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": "<",
+		"t": "keyword.operator.relational",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "5",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ">",
+		"t": "keyword.operator.relational",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "10",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": "?",
+		"t": "punctuation.delimiter keyword.operator.optional keyword.operator.ternary",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "1",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional keyword.operator.ternary",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "2",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "var",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "f6",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "1",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": "<",
+		"t": "keyword.operator.relational",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "foo",
+		"t": "variable entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "<",
+		"t": "punctuation.bracket",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "string",
+		"t": "support.type support.type.primitive",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ">",
+		"t": "punctuation.bracket",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	}
+]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5431_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5431_ts.json
new file mode 100644
index 00000000000..2f99899f2a1
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5431_ts.json
@@ -0,0 +1,464 @@
+[
+	{
+		"c": "function",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "foo",
+		"t": "variable entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "isAll",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "startTime",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "endTime",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "const",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "timeRange",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "isAll",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "?",
+		"t": "punctuation.delimiter keyword.operator.optional keyword.operator.ternary",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "'",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "所有时间",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "'",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional keyword.operator.ternary",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "`",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "${",
+		"t": "string punctuation.definition.template-expression.begin",
+		"r": {
+			"dark_plus": "punctuation.definition.template-expression.begin: #569CD6",
+			"light_plus": "punctuation.definition.template-expression.begin: #0000FF",
+			"dark_vs": "punctuation.definition.template-expression.begin: #569CD6",
+			"light_vs": "punctuation.definition.template-expression.begin: #0000FF",
+			"hc_black": "punctuation.definition.template-expression.begin: #569CD6",
+			"dark_modern": "punctuation.definition.template-expression.begin: #569CD6",
+			"hc_light": "punctuation.definition.template-expression.begin: #0F4A85",
+			"light_modern": "punctuation.definition.template-expression.begin: #0000FF"
+		}
+	},
+	{
+		"c": "startTime",
+		"t": "string variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "}",
+		"t": "string punctuation.definition.template-expression.end",
+		"r": {
+			"dark_plus": "punctuation.definition.template-expression.end: #569CD6",
+			"light_plus": "punctuation.definition.template-expression.end: #0000FF",
+			"dark_vs": "punctuation.definition.template-expression.end: #569CD6",
+			"light_vs": "punctuation.definition.template-expression.end: #0000FF",
+			"hc_black": "punctuation.definition.template-expression.end: #569CD6",
+			"dark_modern": "punctuation.definition.template-expression.end: #569CD6",
+			"hc_light": "punctuation.definition.template-expression.end: #0F4A85",
+			"light_modern": "punctuation.definition.template-expression.end: #0000FF"
+		}
+	},
+	{
+		"c": " - ",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "${",
+		"t": "string punctuation.definition.template-expression.begin",
+		"r": {
+			"dark_plus": "punctuation.definition.template-expression.begin: #569CD6",
+			"light_plus": "punctuation.definition.template-expression.begin: #0000FF",
+			"dark_vs": "punctuation.definition.template-expression.begin: #569CD6",
+			"light_vs": "punctuation.definition.template-expression.begin: #0000FF",
+			"hc_black": "punctuation.definition.template-expression.begin: #569CD6",
+			"dark_modern": "punctuation.definition.template-expression.begin: #569CD6",
+			"hc_light": "punctuation.definition.template-expression.begin: #0F4A85",
+			"light_modern": "punctuation.definition.template-expression.begin: #0000FF"
+		}
+	},
+	{
+		"c": "endTime",
+		"t": "string variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "}",
+		"t": "string punctuation.definition.template-expression.end",
+		"r": {
+			"dark_plus": "punctuation.definition.template-expression.end: #569CD6",
+			"light_plus": "punctuation.definition.template-expression.end: #0000FF",
+			"dark_vs": "punctuation.definition.template-expression.end: #569CD6",
+			"light_vs": "punctuation.definition.template-expression.end: #0000FF",
+			"hc_black": "punctuation.definition.template-expression.end: #569CD6",
+			"dark_modern": "punctuation.definition.template-expression.end: #569CD6",
+			"hc_light": "punctuation.definition.template-expression.end: #0F4A85",
+			"light_modern": "punctuation.definition.template-expression.end: #0000FF"
+		}
+	},
+	{
+		"c": "`",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "return",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "true",
+		"t": "constant.language",
+		"r": {
+			"dark_plus": "constant.language: #569CD6",
+			"light_plus": "constant.language: #0000FF",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
+			"hc_black": "constant.language: #569CD6",
+			"dark_modern": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_modern": "constant.language: #0000FF"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	}
+]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5465_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5465_ts.json
new file mode 100644
index 00000000000..e898885e7f4
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5465_ts.json
@@ -0,0 +1,282 @@
+[
+	{
+		"c": "function",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "*",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "foo2",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "yield",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "'",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "bar",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "'",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "yield",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "*",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "[",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "'",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "bar",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "'",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "]",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	}
+]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5566_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5566_ts.json
new file mode 100644
index 00000000000..e055f0ae7ca
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5566_ts.json
@@ -0,0 +1,352 @@
+[
+	{
+		"c": "function",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "foo3",
+		"t": "variable entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "const",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "foo",
+		"t": "variable entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "any",
+		"t": "support.type support.type.primitive",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": "=>",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "'",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "bar",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "'",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "'",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "baz",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "'",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	}
+]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-jsdoc-multiline-type_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-jsdoc-multiline-type_ts.json
new file mode 100644
index 00000000000..c10c6d0f46e
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-jsdoc-multiline-type_ts.json
@@ -0,0 +1,254 @@
+[
+	{
+		"c": "/**\n * @typedef {{\n *   id: number,\n *   fn: !Function,\n *   context: (!Object|undefined)\n * }}\n * @private\n */",
+		"t": "comment",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
+		}
+	},
+	{
+		"c": "goog",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "dom",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "animationFrame",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "Task_",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "/**\n * @typedef {{\n *   measureTask: goog.dom.animationFrame.Task_,\n *   mutateTask: goog.dom.animationFrame.Task_,\n *   state: (!Object|undefined),\n *   args: (!Array|undefined),\n *   isScheduled: boolean\n * }}\n * @private\n */",
+		"t": "comment",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
+		}
+	},
+	{
+		"c": "goog",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "dom",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "animationFrame",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "TaskSet_",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	}
+]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-keywords_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-keywords_ts.json
new file mode 100644
index 00000000000..f7b50872f0a
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-keywords_ts.json
@@ -0,0 +1,198 @@
+[
+	{
+		"c": "export",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "var",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "foo",
+		"t": "variable entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "=>",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "new",
+		"t": "keyword.operator.new",
+		"r": {
+			"dark_plus": "keyword.operator.new: #569CD6",
+			"light_plus": "keyword.operator.new: #0000FF",
+			"dark_vs": "keyword.operator.new: #569CD6",
+			"light_vs": "keyword.operator.new: #0000FF",
+			"hc_black": "keyword.operator.new: #569CD6",
+			"dark_modern": "keyword.operator.new: #569CD6",
+			"hc_light": "keyword.operator.new: #0F4A85",
+			"light_modern": "keyword.operator.new: #0000FF"
+		}
+	},
+	{
+		"c": "RegExp",
+		"t": "variable entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "'",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "'",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	}
+]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-members_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-members_ts.json
new file mode 100644
index 00000000000..39273946bca
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-members_ts.json
@@ -0,0 +1,310 @@
+[
+	{
+		"c": "class",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "A2",
+		"t": "entity.name.type",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "extends",
+		"t": "storage.modifier",
+		"r": {
+			"dark_plus": "storage.modifier: #569CD6",
+			"light_plus": "storage.modifier: #0000FF",
+			"dark_vs": "storage.modifier: #569CD6",
+			"light_vs": "storage.modifier: #0000FF",
+			"hc_black": "storage.modifier: #569CD6",
+			"dark_modern": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_modern": "storage.modifier: #0000FF"
+		}
+	},
+	{
+		"c": "B1",
+		"t": "variable entity.other.inherited-class",
+		"r": {
+			"dark_plus": "entity.other.inherited-class: #4EC9B0",
+			"light_plus": "entity.other.inherited-class: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.other.inherited-class: #4EC9B0",
+			"dark_modern": "entity.other.inherited-class: #4EC9B0",
+			"hc_light": "entity.other.inherited-class: #185E73",
+			"light_modern": "entity.other.inherited-class: #267F99"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "public",
+		"t": "storage.modifier",
+		"r": {
+			"dark_plus": "storage.modifier: #569CD6",
+			"light_plus": "storage.modifier: #0000FF",
+			"dark_vs": "storage.modifier: #569CD6",
+			"light_vs": "storage.modifier: #0000FF",
+			"hc_black": "storage.modifier: #569CD6",
+			"dark_modern": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_modern": "storage.modifier: #0000FF"
+		}
+	},
+	{
+		"c": "count",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "number",
+		"t": "support.type support.type.primitive",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "9",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "public",
+		"t": "storage.modifier",
+		"r": {
+			"dark_plus": "storage.modifier: #569CD6",
+			"light_plus": "storage.modifier: #0000FF",
+			"dark_vs": "storage.modifier: #569CD6",
+			"light_vs": "storage.modifier: #0000FF",
+			"hc_black": "storage.modifier: #569CD6",
+			"dark_modern": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_modern": "storage.modifier: #0000FF"
+		}
+	},
+	{
+		"c": "resolveNextGeneration",
+		"t": "variable meta.definition.method entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "cell",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "A2",
+		"t": "entity.name.type",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	}
+]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-object-literals_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-object-literals_ts.json
new file mode 100644
index 00000000000..3d8db671b73
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-object-literals_ts.json
@@ -0,0 +1,240 @@
+[
+	{
+		"c": "let",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "s1",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "k",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "k1",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "s",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "k2",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "1",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	}
+]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-regex_coffee.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-regex_coffee.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-regex_coffee.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-strings_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-strings_ts.json
new file mode 100644
index 00000000000..b53fa29aa6e
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-strings_ts.json
@@ -0,0 +1,534 @@
+[
+	{
+		"c": "var",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "x",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "`",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "Hello ",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "${",
+		"t": "string punctuation.definition.template-expression.begin",
+		"r": {
+			"dark_plus": "punctuation.definition.template-expression.begin: #569CD6",
+			"light_plus": "punctuation.definition.template-expression.begin: #0000FF",
+			"dark_vs": "punctuation.definition.template-expression.begin: #569CD6",
+			"light_vs": "punctuation.definition.template-expression.begin: #0000FF",
+			"hc_black": "punctuation.definition.template-expression.begin: #569CD6",
+			"dark_modern": "punctuation.definition.template-expression.begin: #569CD6",
+			"hc_light": "punctuation.definition.template-expression.begin: #0F4A85",
+			"light_modern": "punctuation.definition.template-expression.begin: #0000FF"
+		}
+	},
+	{
+		"c": "foo",
+		"t": "string variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "}",
+		"t": "string punctuation.definition.template-expression.end",
+		"r": {
+			"dark_plus": "punctuation.definition.template-expression.end: #569CD6",
+			"light_plus": "punctuation.definition.template-expression.end: #0000FF",
+			"dark_vs": "punctuation.definition.template-expression.end: #569CD6",
+			"light_vs": "punctuation.definition.template-expression.end: #0000FF",
+			"hc_black": "punctuation.definition.template-expression.end: #569CD6",
+			"dark_modern": "punctuation.definition.template-expression.end: #569CD6",
+			"hc_light": "punctuation.definition.template-expression.end: #0F4A85",
+			"light_modern": "punctuation.definition.template-expression.end: #0000FF"
+		}
+	},
+	{
+		"c": "!",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "`",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "console",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "log",
+		"t": "variable entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "`",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "string text line 1\nstring text line 2",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "`",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "x",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "tag",
+		"t": "variable entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "`",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "Hello ",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "${",
+		"t": "string punctuation.definition.template-expression.begin",
+		"r": {
+			"dark_plus": "punctuation.definition.template-expression.begin: #569CD6",
+			"light_plus": "punctuation.definition.template-expression.begin: #0000FF",
+			"dark_vs": "punctuation.definition.template-expression.begin: #569CD6",
+			"light_vs": "punctuation.definition.template-expression.begin: #0000FF",
+			"hc_black": "punctuation.definition.template-expression.begin: #569CD6",
+			"dark_modern": "punctuation.definition.template-expression.begin: #569CD6",
+			"hc_light": "punctuation.definition.template-expression.begin: #0F4A85",
+			"light_modern": "punctuation.definition.template-expression.begin: #0000FF"
+		}
+	},
+	{
+		"c": "a",
+		"t": "string variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "+",
+		"t": "string keyword.operator.arithmetic",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "b",
+		"t": "string variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "}",
+		"t": "string punctuation.definition.template-expression.end",
+		"r": {
+			"dark_plus": "punctuation.definition.template-expression.end: #569CD6",
+			"light_plus": "punctuation.definition.template-expression.end: #0000FF",
+			"dark_vs": "punctuation.definition.template-expression.end: #569CD6",
+			"light_vs": "punctuation.definition.template-expression.end: #0000FF",
+			"hc_black": "punctuation.definition.template-expression.end: #569CD6",
+			"dark_modern": "punctuation.definition.template-expression.end: #569CD6",
+			"hc_light": "punctuation.definition.template-expression.end: #0F4A85",
+			"light_modern": "punctuation.definition.template-expression.end: #0000FF"
+		}
+	},
+	{
+		"c": " world ",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "${",
+		"t": "string punctuation.definition.template-expression.begin",
+		"r": {
+			"dark_plus": "punctuation.definition.template-expression.begin: #569CD6",
+			"light_plus": "punctuation.definition.template-expression.begin: #0000FF",
+			"dark_vs": "punctuation.definition.template-expression.begin: #569CD6",
+			"light_vs": "punctuation.definition.template-expression.begin: #0000FF",
+			"hc_black": "punctuation.definition.template-expression.begin: #569CD6",
+			"dark_modern": "punctuation.definition.template-expression.begin: #569CD6",
+			"hc_light": "punctuation.definition.template-expression.begin: #0F4A85",
+			"light_modern": "punctuation.definition.template-expression.begin: #0000FF"
+		}
+	},
+	{
+		"c": "a",
+		"t": "string variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "*",
+		"t": "string keyword.operator.arithmetic",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "b",
+		"t": "string variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "}",
+		"t": "string punctuation.definition.template-expression.end",
+		"r": {
+			"dark_plus": "punctuation.definition.template-expression.end: #569CD6",
+			"light_plus": "punctuation.definition.template-expression.end: #0000FF",
+			"dark_vs": "punctuation.definition.template-expression.end: #569CD6",
+			"light_vs": "punctuation.definition.template-expression.end: #0000FF",
+			"hc_black": "punctuation.definition.template-expression.end: #569CD6",
+			"dark_modern": "punctuation.definition.template-expression.end: #569CD6",
+			"hc_light": "punctuation.definition.template-expression.end: #0F4A85",
+			"light_modern": "punctuation.definition.template-expression.end: #0000FF"
+		}
+	},
+	{
+		"c": "`",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	}
+]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-this_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-this_ts.json
new file mode 100644
index 00000000000..2b3e3068a10
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-this_ts.json
@@ -0,0 +1,114 @@
+[
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "foo",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "9",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	}
+]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-variables_css.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-variables_css.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-variables_css.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test2_pl.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test2_pl.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test2_pl.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test6916_js.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test6916_js.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test6916_js.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_bat.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_bat.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_bat.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_bib.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_bib.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_bib.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_c.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_c.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_c.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_cc.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_cc.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_cc.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_clj.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_clj.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_clj.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_code-snippets.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_code-snippets.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_code-snippets.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_coffee.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_coffee.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_coffee.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_cpp.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_cpp.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_cpp.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_cs.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_cs.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_cs.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_cshtml.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_cshtml.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_cshtml.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_css.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_css.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_css.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_cu.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_cu.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_cu.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_dart.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_dart.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_dart.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_diff.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_diff.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_diff.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_fs.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_fs.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_fs.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_go.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_go.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_go.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_groovy.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_groovy.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_groovy.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_handlebars.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_handlebars.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_handlebars.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_hbs.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_hbs.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_hbs.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_hlsl.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_hlsl.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_hlsl.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_html.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_html.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_html.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_ini.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_ini.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_ini.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_jl.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_jl.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_jl.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_js.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_js.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_js.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_json.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_json.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_json.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_jsx.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_jsx.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_jsx.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_less.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_less.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_less.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_log.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_log.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_log.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_lua.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_lua.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_lua.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_m.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_m.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_m.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_md.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_md.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_md.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_mm.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_mm.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_mm.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_p6.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_p6.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_p6.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_php.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_php.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_php.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_pl.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_pl.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_pl.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_ps1.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_ps1.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_ps1.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_pug.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_pug.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_pug.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_py.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_py.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_py.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_r.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_r.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_r.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_rb.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_rb.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_rb.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_rs.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_rs.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_rs.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_rst.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_rst.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_rst.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_scss.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_scss.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_scss.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_sh.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_sh.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_sh.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_shader.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_shader.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_shader.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_sql.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_sql.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_sql.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_sty.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_sty.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_sty.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_swift.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_swift.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_swift.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_tex.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_tex.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_tex.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_ts.json
new file mode 100644
index 00000000000..ca9e2cdd3a4
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_ts.json
@@ -0,0 +1,9998 @@
+[
+	{
+		"c": "/* Game of Life\n * Implemented in TypeScript\n * To learn more about TypeScript, please visit http://www.typescriptlang.org/\n */",
+		"t": "comment",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
+		}
+	},
+	{
+		"c": "module",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "Conway",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "export",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "class",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "Cell",
+		"t": "entity.name.type",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "public",
+		"t": "storage.modifier",
+		"r": {
+			"dark_plus": "storage.modifier: #569CD6",
+			"light_plus": "storage.modifier: #0000FF",
+			"dark_vs": "storage.modifier: #569CD6",
+			"light_vs": "storage.modifier: #0000FF",
+			"hc_black": "storage.modifier: #569CD6",
+			"dark_modern": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_modern": "storage.modifier: #0000FF"
+		}
+	},
+	{
+		"c": "row",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "number",
+		"t": "support.type support.type.primitive",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "public",
+		"t": "storage.modifier",
+		"r": {
+			"dark_plus": "storage.modifier: #569CD6",
+			"light_plus": "storage.modifier: #0000FF",
+			"dark_vs": "storage.modifier: #569CD6",
+			"light_vs": "storage.modifier: #0000FF",
+			"hc_black": "storage.modifier: #569CD6",
+			"dark_modern": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_modern": "storage.modifier: #0000FF"
+		}
+	},
+	{
+		"c": "col",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "number",
+		"t": "support.type support.type.primitive",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "public",
+		"t": "storage.modifier",
+		"r": {
+			"dark_plus": "storage.modifier: #569CD6",
+			"light_plus": "storage.modifier: #0000FF",
+			"dark_vs": "storage.modifier: #569CD6",
+			"light_vs": "storage.modifier: #0000FF",
+			"hc_black": "storage.modifier: #569CD6",
+			"dark_modern": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_modern": "storage.modifier: #0000FF"
+		}
+	},
+	{
+		"c": "live",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "boolean",
+		"t": "support.type support.type.primitive",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "constructor",
+		"t": "variable meta.definition.method storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "row",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "number",
+		"t": "support.type support.type.primitive",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "col",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "number",
+		"t": "support.type support.type.primitive",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "live",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "boolean",
+		"t": "support.type support.type.primitive",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "row",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "row",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "col",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "col",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "live",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "live",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "export",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "class",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "GameOfLife",
+		"t": "entity.name.type",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "private",
+		"t": "storage.modifier",
+		"r": {
+			"dark_plus": "storage.modifier: #569CD6",
+			"light_plus": "storage.modifier: #0000FF",
+			"dark_vs": "storage.modifier: #569CD6",
+			"light_vs": "storage.modifier: #0000FF",
+			"hc_black": "storage.modifier: #569CD6",
+			"dark_modern": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_modern": "storage.modifier: #0000FF"
+		}
+	},
+	{
+		"c": "gridSize",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "number",
+		"t": "support.type support.type.primitive",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "private",
+		"t": "storage.modifier",
+		"r": {
+			"dark_plus": "storage.modifier: #569CD6",
+			"light_plus": "storage.modifier: #0000FF",
+			"dark_vs": "storage.modifier: #569CD6",
+			"light_vs": "storage.modifier: #0000FF",
+			"hc_black": "storage.modifier: #569CD6",
+			"dark_modern": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_modern": "storage.modifier: #0000FF"
+		}
+	},
+	{
+		"c": "canvasSize",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "number",
+		"t": "support.type support.type.primitive",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "private",
+		"t": "storage.modifier",
+		"r": {
+			"dark_plus": "storage.modifier: #569CD6",
+			"light_plus": "storage.modifier: #0000FF",
+			"dark_vs": "storage.modifier: #569CD6",
+			"light_vs": "storage.modifier: #0000FF",
+			"hc_black": "storage.modifier: #569CD6",
+			"dark_modern": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_modern": "storage.modifier: #0000FF"
+		}
+	},
+	{
+		"c": "lineColor",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "string",
+		"t": "support.type support.type.primitive",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "private",
+		"t": "storage.modifier",
+		"r": {
+			"dark_plus": "storage.modifier: #569CD6",
+			"light_plus": "storage.modifier: #0000FF",
+			"dark_vs": "storage.modifier: #569CD6",
+			"light_vs": "storage.modifier: #0000FF",
+			"hc_black": "storage.modifier: #569CD6",
+			"dark_modern": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_modern": "storage.modifier: #0000FF"
+		}
+	},
+	{
+		"c": "liveColor",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "string",
+		"t": "support.type support.type.primitive",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "private",
+		"t": "storage.modifier",
+		"r": {
+			"dark_plus": "storage.modifier: #569CD6",
+			"light_plus": "storage.modifier: #0000FF",
+			"dark_vs": "storage.modifier: #569CD6",
+			"light_vs": "storage.modifier: #0000FF",
+			"hc_black": "storage.modifier: #569CD6",
+			"dark_modern": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_modern": "storage.modifier: #0000FF"
+		}
+	},
+	{
+		"c": "deadColor",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "string",
+		"t": "support.type support.type.primitive",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "private",
+		"t": "storage.modifier",
+		"r": {
+			"dark_plus": "storage.modifier: #569CD6",
+			"light_plus": "storage.modifier: #0000FF",
+			"dark_vs": "storage.modifier: #569CD6",
+			"light_vs": "storage.modifier: #0000FF",
+			"hc_black": "storage.modifier: #569CD6",
+			"dark_modern": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_modern": "storage.modifier: #0000FF"
+		}
+	},
+	{
+		"c": "initialLifeProbability",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "number",
+		"t": "support.type support.type.primitive",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "private",
+		"t": "storage.modifier",
+		"r": {
+			"dark_plus": "storage.modifier: #569CD6",
+			"light_plus": "storage.modifier: #0000FF",
+			"dark_vs": "storage.modifier: #569CD6",
+			"light_vs": "storage.modifier: #0000FF",
+			"hc_black": "storage.modifier: #569CD6",
+			"dark_modern": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_modern": "storage.modifier: #0000FF"
+		}
+	},
+	{
+		"c": "animationRate",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "number",
+		"t": "support.type support.type.primitive",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "private",
+		"t": "storage.modifier",
+		"r": {
+			"dark_plus": "storage.modifier: #569CD6",
+			"light_plus": "storage.modifier: #0000FF",
+			"dark_vs": "storage.modifier: #569CD6",
+			"light_vs": "storage.modifier: #0000FF",
+			"hc_black": "storage.modifier: #569CD6",
+			"dark_modern": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_modern": "storage.modifier: #0000FF"
+		}
+	},
+	{
+		"c": "cellSize",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "number",
+		"t": "support.type support.type.primitive",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "private",
+		"t": "storage.modifier",
+		"r": {
+			"dark_plus": "storage.modifier: #569CD6",
+			"light_plus": "storage.modifier: #0000FF",
+			"dark_vs": "storage.modifier: #569CD6",
+			"light_vs": "storage.modifier: #0000FF",
+			"hc_black": "storage.modifier: #569CD6",
+			"dark_modern": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_modern": "storage.modifier: #0000FF"
+		}
+	},
+	{
+		"c": "world",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "constructor",
+		"t": "variable meta.definition.method storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "gridSize",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "50",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "canvasSize",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "600",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "lineColor",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "'",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "#cdcdcd",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "'",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "liveColor",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "'",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "#666",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "'",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "deadColor",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "'",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "#eee",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "'",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "initialLifeProbability",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "0.5",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "animationRate",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "60",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "cellSize",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "0",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "world",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "createWorld",
+		"t": "variable variable entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "circleOfLife",
+		"t": "variable variable entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "public",
+		"t": "storage.modifier",
+		"r": {
+			"dark_plus": "storage.modifier: #569CD6",
+			"light_plus": "storage.modifier: #0000FF",
+			"dark_vs": "storage.modifier: #569CD6",
+			"light_vs": "storage.modifier: #0000FF",
+			"hc_black": "storage.modifier: #569CD6",
+			"dark_modern": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_modern": "storage.modifier: #0000FF"
+		}
+	},
+	{
+		"c": "createWorld",
+		"t": "variable meta.definition.method entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "return",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "travelWorld",
+		"t": "variable variable entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "cell",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "Cell",
+		"t": "entity.name.type",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "=>",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "cell",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "live",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "Math",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "random",
+		"t": "variable entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "<",
+		"t": "keyword.operator.relational",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "initialLifeProbability",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "return",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "cell",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "public",
+		"t": "storage.modifier",
+		"r": {
+			"dark_plus": "storage.modifier: #569CD6",
+			"light_plus": "storage.modifier: #0000FF",
+			"dark_vs": "storage.modifier: #569CD6",
+			"light_vs": "storage.modifier: #0000FF",
+			"hc_black": "storage.modifier: #569CD6",
+			"dark_modern": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_modern": "storage.modifier: #0000FF"
+		}
+	},
+	{
+		"c": "circleOfLife",
+		"t": "variable meta.definition.method entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "void",
+		"t": "support.type support.type.primitive",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "world",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "travelWorld",
+		"t": "variable variable entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "cell",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "Cell",
+		"t": "entity.name.type",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "=>",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "cell",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "world",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "[",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "cell",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "row",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "]",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "[",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "cell",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "col",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "]",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "draw",
+		"t": "variable variable entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "cell",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "return",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "resolveNextGeneration",
+		"t": "variable variable entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "cell",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "setTimeout",
+		"t": "variable entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "=>",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "circleOfLife",
+		"t": "variable variable entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "animationRate",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "public",
+		"t": "storage.modifier",
+		"r": {
+			"dark_plus": "storage.modifier: #569CD6",
+			"light_plus": "storage.modifier: #0000FF",
+			"dark_vs": "storage.modifier: #569CD6",
+			"light_vs": "storage.modifier: #0000FF",
+			"hc_black": "storage.modifier: #569CD6",
+			"dark_modern": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_modern": "storage.modifier: #0000FF"
+		}
+	},
+	{
+		"c": "resolveNextGeneration",
+		"t": "variable meta.definition.method entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "cell",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "Cell",
+		"t": "entity.name.type",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "var",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "count",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "countNeighbors",
+		"t": "variable variable entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "cell",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "var",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "newCell",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "new",
+		"t": "keyword.operator.new",
+		"r": {
+			"dark_plus": "keyword.operator.new: #569CD6",
+			"light_plus": "keyword.operator.new: #0000FF",
+			"dark_vs": "keyword.operator.new: #569CD6",
+			"light_vs": "keyword.operator.new: #0000FF",
+			"hc_black": "keyword.operator.new: #569CD6",
+			"dark_modern": "keyword.operator.new: #569CD6",
+			"hc_light": "keyword.operator.new: #0F4A85",
+			"light_modern": "keyword.operator.new: #0000FF"
+		}
+	},
+	{
+		"c": "Cell",
+		"t": "variable entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "cell",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "row",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "cell",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "col",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "cell",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "live",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "if",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "count",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "<",
+		"t": "keyword.operator.relational",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "2",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": "||",
+		"t": "keyword.operator.logical",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "count",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ">",
+		"t": "keyword.operator.relational",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "3",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "newCell",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "live",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "false",
+		"t": "constant.language",
+		"r": {
+			"dark_plus": "constant.language: #569CD6",
+			"light_plus": "constant.language: #0000FF",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
+			"hc_black": "constant.language: #569CD6",
+			"dark_modern": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_modern": "constant.language: #0000FF"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "else",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "if",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "count",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "==",
+		"t": "keyword.operator",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "3",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "newCell",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "live",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "true",
+		"t": "constant.language",
+		"r": {
+			"dark_plus": "constant.language: #569CD6",
+			"light_plus": "constant.language: #0000FF",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
+			"hc_black": "constant.language: #569CD6",
+			"dark_modern": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_modern": "constant.language: #0000FF"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "return",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "newCell",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "public",
+		"t": "storage.modifier",
+		"r": {
+			"dark_plus": "storage.modifier: #569CD6",
+			"light_plus": "storage.modifier: #0000FF",
+			"dark_vs": "storage.modifier: #569CD6",
+			"light_vs": "storage.modifier: #0000FF",
+			"hc_black": "storage.modifier: #569CD6",
+			"dark_modern": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_modern": "storage.modifier: #0000FF"
+		}
+	},
+	{
+		"c": "countNeighbors",
+		"t": "variable meta.definition.method entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "cell",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "Cell",
+		"t": "entity.name.type",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "var",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "neighbors",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "0",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "for",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "var",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "row",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "-",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "1",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "row",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "<=",
+		"t": "keyword.operator.relational",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "1",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "row",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "++",
+		"t": "keyword.operator.increment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "for",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "var",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "col",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "-",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "1",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "col",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "<=",
+		"t": "keyword.operator.relational",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "1",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "col",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "++",
+		"t": "keyword.operator.increment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "if",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "row",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "==",
+		"t": "keyword.operator",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "0",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": "&&",
+		"t": "keyword.operator.logical",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "col",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "==",
+		"t": "keyword.operator",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "0",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "continue",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "if",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "isAlive",
+		"t": "variable variable entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "cell",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "row",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "+",
+		"t": "keyword.operator.arithmetic",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "row",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "cell",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "col",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "+",
+		"t": "keyword.operator.arithmetic",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "col",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "neighbors",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "++",
+		"t": "keyword.operator.increment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "return",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "neighbors",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "public",
+		"t": "storage.modifier",
+		"r": {
+			"dark_plus": "storage.modifier: #569CD6",
+			"light_plus": "storage.modifier: #0000FF",
+			"dark_vs": "storage.modifier: #569CD6",
+			"light_vs": "storage.modifier: #0000FF",
+			"hc_black": "storage.modifier: #569CD6",
+			"dark_modern": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_modern": "storage.modifier: #0000FF"
+		}
+	},
+	{
+		"c": "isAlive",
+		"t": "variable meta.definition.method entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "row",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "number",
+		"t": "support.type support.type.primitive",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "col",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "number",
+		"t": "support.type support.type.primitive",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "if",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "row",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "<",
+		"t": "keyword.operator.relational",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "0",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": "||",
+		"t": "keyword.operator.logical",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "col",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "<",
+		"t": "keyword.operator.relational",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "0",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": "||",
+		"t": "keyword.operator.logical",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "row",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ">=",
+		"t": "keyword.operator.relational",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "gridSize",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "||",
+		"t": "keyword.operator.logical",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "col",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ">=",
+		"t": "keyword.operator.relational",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "gridSize",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "return",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "false",
+		"t": "constant.language",
+		"r": {
+			"dark_plus": "constant.language: #569CD6",
+			"light_plus": "constant.language: #0000FF",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
+			"hc_black": "constant.language: #569CD6",
+			"dark_modern": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_modern": "constant.language: #0000FF"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "return",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "world",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "[",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "row",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "]",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "[",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "col",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "]",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "live",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "public",
+		"t": "storage.modifier",
+		"r": {
+			"dark_plus": "storage.modifier: #569CD6",
+			"light_plus": "storage.modifier: #0000FF",
+			"dark_vs": "storage.modifier: #569CD6",
+			"light_vs": "storage.modifier: #0000FF",
+			"hc_black": "storage.modifier: #569CD6",
+			"dark_modern": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_modern": "storage.modifier: #0000FF"
+		}
+	},
+	{
+		"c": "travelWorld",
+		"t": "variable meta.definition.method entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "callback",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "var",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "result",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "[",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "]",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "for",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "var",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "row",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "0",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "row",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "<",
+		"t": "keyword.operator.relational",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "gridSize",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "row",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "++",
+		"t": "keyword.operator.increment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "var",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "rowData",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "[",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "]",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "for",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "var",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "col",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "0",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "col",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "<",
+		"t": "keyword.operator.relational",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "gridSize",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "col",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "++",
+		"t": "keyword.operator.increment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "rowData",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "push",
+		"t": "variable entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "callback",
+		"t": "variable entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "new",
+		"t": "keyword.operator.new",
+		"r": {
+			"dark_plus": "keyword.operator.new: #569CD6",
+			"light_plus": "keyword.operator.new: #0000FF",
+			"dark_vs": "keyword.operator.new: #569CD6",
+			"light_vs": "keyword.operator.new: #0000FF",
+			"hc_black": "keyword.operator.new: #569CD6",
+			"dark_modern": "keyword.operator.new: #569CD6",
+			"hc_light": "keyword.operator.new: #0F4A85",
+			"light_modern": "keyword.operator.new: #0000FF"
+		}
+	},
+	{
+		"c": "Cell",
+		"t": "variable entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "row",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "col",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "false",
+		"t": "constant.language",
+		"r": {
+			"dark_plus": "constant.language: #569CD6",
+			"light_plus": "constant.language: #0000FF",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
+			"hc_black": "constant.language: #569CD6",
+			"dark_modern": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_modern": "constant.language: #0000FF"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "result",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "push",
+		"t": "variable entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "rowData",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "return",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "result",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "public",
+		"t": "storage.modifier",
+		"r": {
+			"dark_plus": "storage.modifier: #569CD6",
+			"light_plus": "storage.modifier: #0000FF",
+			"dark_vs": "storage.modifier: #569CD6",
+			"light_vs": "storage.modifier: #0000FF",
+			"hc_black": "storage.modifier: #569CD6",
+			"dark_modern": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_modern": "storage.modifier: #0000FF"
+		}
+	},
+	{
+		"c": "draw",
+		"t": "variable meta.definition.method entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "cell",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "Cell",
+		"t": "entity.name.type",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "if",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "cellSize",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "==",
+		"t": "keyword.operator",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "0",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "cellSize",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "canvasSize",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "/",
+		"t": "keyword.operator.arithmetic",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "gridSize",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "context",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "strokeStyle",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "lineColor",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "context",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "strokeRect",
+		"t": "variable entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "cell",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "row",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "*",
+		"t": "keyword.operator.arithmetic",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "cellSize",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "cell",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "col",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "*",
+		"t": "keyword.operator.arithmetic",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "cellSize",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "cellSize",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "cellSize",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "context",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "fillStyle",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "cell",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "live",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "?",
+		"t": "punctuation.delimiter keyword.operator.optional keyword.operator.ternary",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "liveColor",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter keyword.operator.optional keyword.operator.ternary",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "deadColor",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "context",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "fillRect",
+		"t": "variable entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "cell",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "row",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "*",
+		"t": "keyword.operator.arithmetic",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "cellSize",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "cell",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "col",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "*",
+		"t": "keyword.operator.arithmetic",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "cellSize",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "cellSize",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "this",
+		"t": "variable.language.this",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable.language.this: #569CD6",
+			"dark_modern": "variable.language: #569CD6",
+			"hc_light": "variable.language: #0F4A85",
+			"light_modern": "variable.language: #0000FF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "cellSize",
+		"t": "variable variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "var",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "game",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "new",
+		"t": "keyword.operator.new",
+		"r": {
+			"dark_plus": "keyword.operator.new: #569CD6",
+			"light_plus": "keyword.operator.new: #0000FF",
+			"dark_vs": "keyword.operator.new: #569CD6",
+			"light_vs": "keyword.operator.new: #0000FF",
+			"hc_black": "keyword.operator.new: #569CD6",
+			"dark_modern": "keyword.operator.new: #569CD6",
+			"hc_light": "keyword.operator.new: #0F4A85",
+			"light_modern": "keyword.operator.new: #0000FF"
+		}
+	},
+	{
+		"c": "Conway",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "GameOfLife",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "(",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ")",
+		"t": "",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	}
+]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_vb.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_vb.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_vb.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_xml.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_xml.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_xml.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_yaml.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_yaml.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_yaml.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/tsconfig_off_json.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/tsconfig_off_json.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/tsconfig_off_json.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/yarn.lock b/extensions/vscode-colorize-tests/yarn.lock
deleted file mode 100644
index 88c52293616..00000000000
--- a/extensions/vscode-colorize-tests/yarn.lock
+++ /dev/null
@@ -1,20 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@types/node@20.x":
-  version "20.11.24"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792"
-  integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==
-  dependencies:
-    undici-types "~5.26.4"
-
-jsonc-parser@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76"
-  integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
diff --git a/extensions/vscode-test-resolver/.npmrc b/extensions/vscode-test-resolver/.npmrc
new file mode 100644
index 00000000000..a9c57709666
--- /dev/null
+++ b/extensions/vscode-test-resolver/.npmrc
@@ -0,0 +1,2 @@
+legacy-peer-deps="true"
+timeout=180000
diff --git a/extensions/vscode-test-resolver/package-lock.json b/extensions/vscode-test-resolver/package-lock.json
new file mode 100644
index 00000000000..367c4dca2e0
--- /dev/null
+++ b/extensions/vscode-test-resolver/package-lock.json
@@ -0,0 +1,34 @@
+{
+  "name": "vscode-test-resolver",
+  "version": "0.0.1",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "vscode-test-resolver",
+      "version": "0.0.1",
+      "license": "MIT",
+      "devDependencies": {
+        "@types/node": "20.x"
+      },
+      "engines": {
+        "vscode": "^1.25.0"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "20.11.24",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
+      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    }
+  }
+}
diff --git a/extensions/vscode-test-resolver/src/extension.ts b/extensions/vscode-test-resolver/src/extension.ts
index 8e12e622e05..2fab3ec306a 100644
--- a/extensions/vscode-test-resolver/src/extension.ts
+++ b/extensions/vscode-test-resolver/src/extension.ts
@@ -164,8 +164,8 @@ export function activate(context: vscode.ExtensionContext) {
 				const serverCommandPath = path.join(vscodePath, 'scripts', serverCommand);
 
 				outputChannel.appendLine(`Launching server: "${serverCommandPath}" ${commandArgs.join(' ')}`);
-
-				extHostProcess = cp.spawn(serverCommandPath, commandArgs, { env, cwd: vscodePath });
+				const shell = (process.platform === 'win32');
+				extHostProcess = cp.spawn(serverCommandPath, commandArgs, { env, cwd: vscodePath, shell });
 			} else {
 				const extensionToInstall = process.env['TESTRESOLVER_INSTALL_BUILTIN_EXTENSION'];
 				if (extensionToInstall) {
@@ -182,8 +182,8 @@ export function activate(context: vscode.ExtensionContext) {
 
 				outputChannel.appendLine(`Using server build at ${serverLocation}`);
 				outputChannel.appendLine(`Server arguments ${commandArgs.join(' ')}`);
-
-				extHostProcess = cp.spawn(path.join(serverLocation, 'bin', serverCommand), commandArgs, { env, cwd: serverLocation });
+				const shell = (process.platform === 'win32');
+				extHostProcess = cp.spawn(path.join(serverLocation, 'bin', serverCommand), commandArgs, { env, cwd: serverLocation, shell });
 			}
 			extHostProcess.stdout!.on('data', (data: Buffer) => processOutput(data.toString()));
 			extHostProcess.stderr!.on('data', (data: Buffer) => processOutput(data.toString()));
diff --git a/extensions/vscode-test-resolver/yarn.lock b/extensions/vscode-test-resolver/yarn.lock
deleted file mode 100644
index 1f4b6c2e8b4..00000000000
--- a/extensions/vscode-test-resolver/yarn.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@types/node@20.x":
-  version "20.11.24"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792"
-  integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==
-  dependencies:
-    undici-types "~5.26.4"
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
diff --git a/extensions/xml/yarn.lock b/extensions/xml/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/xml/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/yaml/build/update-grammar.js b/extensions/yaml/build/update-grammar.js
new file mode 100644
index 00000000000..8684bc3e5d0
--- /dev/null
+++ b/extensions/yaml/build/update-grammar.js
@@ -0,0 +1,17 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+var updateGrammar = require('vscode-grammar-updater');
+
+async function updateGrammars() {
+	await updateGrammar.update('RedCMD/YAML-Syntax-Highlighter', 'syntaxes/yaml-1.0.tmLanguage.json', './syntaxes/yaml-1.0.tmLanguage.json',  undefined, 'main');
+	await updateGrammar.update('RedCMD/YAML-Syntax-Highlighter', 'syntaxes/yaml-1.1.tmLanguage.json', './syntaxes/yaml-1.1.tmLanguage.json',  undefined, 'main');
+	await updateGrammar.update('RedCMD/YAML-Syntax-Highlighter', 'syntaxes/yaml-1.2.tmLanguage.json', './syntaxes/yaml-1.2.tmLanguage.json',  undefined, 'main');
+	await updateGrammar.update('RedCMD/YAML-Syntax-Highlighter', 'syntaxes/yaml-1.3.tmLanguage.json', './syntaxes/yaml-1.3.tmLanguage.json',  undefined, 'main');
+	await updateGrammar.update('RedCMD/YAML-Syntax-Highlighter', 'syntaxes/yaml.tmLanguage.json', './syntaxes/yaml.tmLanguage.json',  undefined, 'main');
+}
+
+updateGrammars();
diff --git a/extensions/yaml/cgmanifest.json b/extensions/yaml/cgmanifest.json
index e6c3ca158b5..83fe1e16107 100644
--- a/extensions/yaml/cgmanifest.json
+++ b/extensions/yaml/cgmanifest.json
@@ -4,33 +4,24 @@
 			"component": {
 				"type": "git",
 				"git": {
-					"name": "textmate/yaml.tmbundle",
-					"repositoryUrl": "https://github.com/textmate/yaml.tmbundle",
-					"commitHash": "e54ceae3b719506dba7e481a77cea4a8b576ae46"
+					"name": "RedCMD/YAML-Syntax-Highlighter",
+					"repositoryUrl": "https://github.com/RedCMD/YAML-Syntax-Highlighter",
+					"commitHash": "71a88711ec184b7dde5240c8f150ad3c2dbbd5f1"
 				}
 			},
 			"licenseDetail": [
-				"Copyright (c) 2015 FichteFoll <fichtefoll2@googlemail.com>",
+				"MIT License",
 				"",
-				"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:",
+				"Copyright 2024 RedCMD",
 				"",
-				"The above copyright notice and this permission notice shall be included in all",
-				"copies or substantial portions of the Software.",
+				"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 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 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."
 			],
-			"license": "TextMate Bundle License",
-			"version": "0.0.0"
+			"license": "MIT",
+			"version": "1.1.2"
 		}
 	],
 	"version": 1
diff --git a/extensions/yaml/package.json b/extensions/yaml/package.json
index 5223f71c52b..2b0ee013964 100644
--- a/extensions/yaml/package.json
+++ b/extensions/yaml/package.json
@@ -9,7 +9,7 @@
     "vscode": "*"
   },
   "scripts": {
-    "update-grammar": "node ../node_modules/vscode-grammar-updater/bin textmate/yaml.tmbundle Syntaxes/YAML.tmLanguage ./syntaxes/yaml.tmLanguage.json"
+    "update-grammar": "node ./build/update-grammar.js"
   },
   "categories": ["Programming Languages"],
   "contributes": {
@@ -56,10 +56,32 @@
         "scopeName": "source.yaml",
         "path": "./syntaxes/yaml.tmLanguage.json"
       },
+      {
+        "scopeName": "source.yaml.1.3",
+        "path": "./syntaxes/yaml-1.3.tmLanguage.json"
+      },
+      {
+        "scopeName": "source.yaml.1.2",
+        "path": "./syntaxes/yaml-1.2.tmLanguage.json"
+      },
+      {
+        "scopeName": "source.yaml.1.1",
+        "path": "./syntaxes/yaml-1.1.tmLanguage.json"
+      },
+      {
+        "scopeName": "source.yaml.1.0",
+        "path": "./syntaxes/yaml-1.0.tmLanguage.json"
+      },
       {
         "language": "yaml",
         "scopeName": "source.yaml",
-        "path": "./syntaxes/yaml.tmLanguage.json"
+        "path": "./syntaxes/yaml.tmLanguage.json",
+        "unbalancedBracketScopes": [
+          "invalid.illegal",
+          "meta.scalar.yaml",
+          "storage.type.tag.shorthand.yaml",
+          "keyword.control.flow"
+        ]
       }
     ],
     "configurationDefaults": {
diff --git a/extensions/yaml/syntaxes/yaml-1.0.tmLanguage.json b/extensions/yaml/syntaxes/yaml-1.0.tmLanguage.json
new file mode 100644
index 00000000000..96afa88b231
--- /dev/null
+++ b/extensions/yaml/syntaxes/yaml-1.0.tmLanguage.json
@@ -0,0 +1,1144 @@
+{
+	"information_for_contributors": [
+		"This file has been converted from https://github.com/RedCMD/YAML-Syntax-Highlighter/blob/master/syntaxes/yaml-1.0.tmLanguage.json",
+		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
+		"Once accepted there, we are happy to receive an update request."
+	],
+	"version": "https://github.com/RedCMD/YAML-Syntax-Highlighter/commit/71a88711ec184b7dde5240c8f150ad3c2dbbd5f1",
+	"name": "YAML 1.0",
+	"scopeName": "source.yaml.1.0",
+	"comment": "https://yaml.org/spec/1.0/",
+	"patterns": [
+		{
+			"include": "#stream"
+		}
+	],
+	"repository": {
+		"stream": {
+			"patterns": [
+				{
+					"comment": "allows me to just use `\\G` instead of the performance heavy `(^|\\G)`",
+					"begin": "^(?!\\G)",
+					"while": "^",
+					"name": "meta.stream.yaml",
+					"patterns": [
+						{
+							"include": "source.yaml.1.1#byte-order-mark"
+						},
+						{
+							"include": "#directives"
+						},
+						{
+							"include": "#document"
+						},
+						{
+							"include": "source.yaml.1.1#presentation-detail"
+						}
+					]
+				},
+				{
+					"begin": "\\G",
+					"while": "\\G",
+					"name": "meta.stream.yaml",
+					"patterns": [
+						{
+							"include": "source.yaml.1.1#byte-order-mark"
+						},
+						{
+							"include": "#directives"
+						},
+						{
+							"include": "#document"
+						},
+						{
+							"include": "source.yaml.1.1#presentation-detail"
+						}
+					]
+				}
+			]
+		},
+		"directive-YAML": {
+			"comment": "https://yaml.org/spec/1.2.2/#681-yaml-directives",
+			"begin": "(?=%YAML:1\\.0(?=[\\x{85 2028 2029}\r\n\t ]))",
+			"end": "\\G(?=%(?!YAML:1\\.0))",
+			"name": "meta.1.0.yaml",
+			"patterns": [
+				{
+					"comment": "https://yaml.org/spec/1.2.2/#681-yaml-directives",
+					"begin": "\\G(%)(YAML)(:)(1\\.0)",
+					"while": "\\G(?!---[\\x{85 2028 2029}\r\n\t ])",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.directive.begin.yaml"
+						},
+						"2": {
+							"name": "keyword.other.directive.yaml.yaml"
+						},
+						"3": {
+							"name": "punctuation.whitespace.separator.yaml"
+						},
+						"4": {
+							"name": "constant.numeric.yaml-version.yaml"
+						}
+					},
+					"name": "meta.directives.yaml",
+					"patterns": [
+						{
+							"include": "source.yaml.1.1#directive-invalid"
+						},
+						{
+							"include": "#directives"
+						},
+						{
+							"include": "source.yaml.1.1#presentation-detail"
+						}
+					]
+				},
+				{
+					"begin": "\\G(?=---[\\x{85 2028 2029}\r\n\t ])",
+					"while": "\\G(?!%)",
+					"patterns": [
+						{
+							"include": "#document"
+						},
+						{
+							"include": "source.yaml.1.1#presentation-detail"
+						}
+					]
+				},
+				{
+					"include": "source.yaml.1.1#presentation-detail"
+				}
+			]
+		},
+		"directives": {
+			"comment": "https://yaml.org/spec/1.2.2/#68-directives",
+			"patterns": [
+				{
+					"include": "source.yaml.1.3#directive-YAML"
+				},
+				{
+					"include": "source.yaml.1.2#directive-YAML"
+				},
+				{
+					"include": "source.yaml.1.1#directive-YAML"
+				},
+				{
+					"include": "source.yaml.1.0#directive-YAML"
+				},
+				{
+					"begin": "(?=%)",
+					"while": "\\G(?!%|---[\\x{85 2028 2029}\r\n\t ])",
+					"name": "meta.directives.yaml",
+					"patterns": [
+						{
+							"comment": "https://yaml.org/spec/1.2.2/#rule-ns-reserved-directive",
+							"begin": "(%)([^: \\p{Cntrl}\\p{Surrogate}\\x{2028 2029 FFFE FFFF}]++)",
+							"end": "$",
+							"beginCaptures": {
+								"1": {
+									"name": "punctuation.definition.directive.begin.yaml"
+								},
+								"2": {
+									"name": "keyword.other.directive.other.yaml"
+								}
+							},
+							"patterns": [
+								{
+									"match": "\\G(:)([^ \\p{Cntrl}\\p{Surrogate}\\x{2028 2029 FFFE FFFF}]++)",
+									"captures": {
+										"1": {
+											"name": "punctuation.whitespace.separator.yaml"
+										},
+										"2": {
+											"name": "string.unquoted.directive-name.yaml"
+										}
+									}
+								},
+								{
+									"include": "source.yaml.1.1#presentation-detail"
+								}
+							]
+						},
+						{
+							"match": "\\G\\.{3}(?=[\\x{85 2028 2029}\r\n\t ])",
+							"name": "invalid.illegal.entity.other.document.end.yaml"
+						},
+						{
+							"include": "source.yaml.1.1#presentation-detail"
+						}
+					]
+				}
+			]
+		},
+		"document": {
+			"comment": "https://yaml.org/spec/1.2.2/#91-documents",
+			"patterns": [
+				{
+					"begin": "---(?=[\\x{85 2028 2029}\r\n\t ])",
+					"while": "\\G(?!(?>\\.{3}|---)[\\x{85 2028 2029}\r\n\t ])",
+					"beginCaptures": {
+						"0": {
+							"name": "entity.other.document.begin.yaml"
+						}
+					},
+					"name": "meta.document.yaml",
+					"patterns": [
+						{
+							"include": "#block-node"
+						}
+					]
+				},
+				{
+					"begin": "(?=\\.{3}[\\x{85 2028 2029}\r\n\t ])",
+					"while": "\\G(?=[\t \\x{FEFF}]*+(?>#|$))",
+					"patterns": [
+						{
+							"begin": "\\G\\.{3}",
+							"end": "$",
+							"beginCaptures": {
+								"0": {
+									"name": "entity.other.document.end.yaml"
+								}
+							},
+							"patterns": [
+								{
+									"include": "source.yaml.1.1#presentation-detail"
+								}
+							]
+						},
+						{
+							"include": "source.yaml.1.1#byte-order-mark"
+						},
+						{
+							"include": "source.yaml.1.1#presentation-detail"
+						}
+					]
+				},
+				{
+					"begin": "\\G(?!%|[\t \\x{FEFF}]*+(?>#|$))",
+					"while": "\\G(?!(?>\\.{3}|---)[\\x{85 2028 2029}\r\n\t ])",
+					"name": "meta.document.yaml",
+					"patterns": [
+						{
+							"include": "#block-node"
+						}
+					]
+				}
+			]
+		},
+		"block-node": {
+			"patterns": [
+				{
+					"include": "#block-sequence"
+				},
+				{
+					"include": "#block-mapping"
+				},
+				{
+					"include": "#block-scalar"
+				},
+				{
+					"include": "source.yaml.1.1#anchor-property"
+				},
+				{
+					"include": "#tag-property"
+				},
+				{
+					"include": "source.yaml.1.1#alias"
+				},
+				{
+					"begin": "(?=\"|')",
+					"while": "\\G",
+					"patterns": [
+						{
+							"begin": "(?!\\G)",
+							"while": "\\G",
+							"patterns": [
+								{
+									"include": "source.yaml.1.1#presentation-detail"
+								}
+							]
+						},
+						{
+							"include": "#double"
+						},
+						{
+							"include": "source.yaml.1.1#single"
+						}
+					]
+				},
+				{
+					"begin": "(?={)",
+					"end": "$",
+					"patterns": [
+						{
+							"include": "#flow-mapping"
+						},
+						{
+							"include": "source.yaml.1.1#presentation-detail"
+						}
+					]
+				},
+				{
+					"begin": "(?=\\[)",
+					"end": "$",
+					"patterns": [
+						{
+							"include": "#flow-sequence"
+						},
+						{
+							"include": "source.yaml.1.1#presentation-detail"
+						}
+					]
+				},
+				{
+					"include": "source.yaml.1.1#block-plain-out"
+				},
+				{
+					"include": "source.yaml.1.1#presentation-detail"
+				}
+			]
+		},
+		"block-mapping": {
+			"//": "The check for plain keys is expensive",
+			"begin": "(?=((?<=[-?:]) )?+)(?<![^\t ][\t ]*+:|---)\\G( *+)([\t ]*+)((?>[!&*][^\\x{85 2028 2029}\r\n\t ]*+[\t ]++)*+)(?=(?>(?#Double Quote)\"(?>[^\\\\\"]++|\\\\.)*+\"|(?#Single Quote)'(?>[^']++|'')*+'|(?#Flow-Map){(?>[^\\x{85 2028 2029}}]++|}[ \t]*+(?!:[\\x{85 2028 2029}\r\n\t ]))++}|(?#Flow-Seq)\\[(?>[^\\x{85 2028 2029}\\]]++|][ \t]*+(?!:[\\x{85 2028 2029}\r\n\t ]))++]|(?#Plain)(?>[^-?:,\\[\\]{}#&*!|>'\"%@` \\p{Cntrl}\\p{Surrogate}\\x{FFFE FFFF}]|[?:-](?![\\x{85 2028 2029}\r\n\t ]))(?>[^:#]++|:(?![\\x{85 2028 2029}\r\n\t ])|(?<! |\t)#++)*+)?+(?#Map Value)[\t ]*+:[\\x{85 2028 2029}\r\n\t ]|(?#Explicit)\\?[\\x{85 2028 2029}\r\n\t ])",
+			"while": "\\G(?>(\\1\\2)((?>[!&*][^\\x{85 2028 2029}\r\n\t ]*+[\t ]++)*+)((?>\t[\t ]*+)?+[^\\x{85 2028 2029}\r\n\t ?:\\-#!&*\"'\\[\\]{}0-9A-Za-z$()+./;<=\\\\^_~\\x{A0}-\\x{D7FF}\\x{E000}-\\x{FFFD}\\x{010000}-\\x{10FFFF}])?+|( *+)([\t ]*+[^\\x{85 2028 2029}\r\n#])?+)",
+			"beginCaptures": {
+				"2": {
+					"name": "punctuation.whitespace.indentation.yaml"
+				},
+				"3": {
+					"name": "punctuation.whitespace.separator.yaml"
+				},
+				"4": {
+					"comment": "May cause lag on long lines starting with a tag, anchor or alias",
+					"patterns": [
+						{
+							"include": "#tag-property"
+						},
+						{
+							"include": "source.yaml.1.1#anchor-property"
+						},
+						{
+							"include": "source.yaml.1.1#alias"
+						},
+						{
+							"include": "source.yaml.1.1#presentation-detail"
+						}
+					]
+				}
+			},
+			"whileCaptures": {
+				"1": {
+					"name": "punctuation.whitespace.indentation.yaml"
+				},
+				"2": {
+					"comment": "May cause lag on long lines starting with a tag, anchor or alias",
+					"patterns": [
+						{
+							"include": "#tag-property"
+						},
+						{
+							"include": "source.yaml.1.1#anchor-property"
+						},
+						{
+							"include": "source.yaml.1.1#alias"
+						},
+						{
+							"include": "source.yaml.1.1#presentation-detail"
+						}
+					]
+				},
+				"3": {
+					"name": "invalid.illegal.expected-indentation.yaml"
+				},
+				"4": {
+					"name": "punctuation.whitespace.indentation.yaml"
+				},
+				"5": {
+					"name": "invalid.illegal.expected-indentation.yaml"
+				}
+			},
+			"name": "meta.mapping.yaml",
+			"patterns": [
+				{
+					"include": "#block-map-key-double"
+				},
+				{
+					"include": "source.yaml#block-map-key-single"
+				},
+				{
+					"include": "source.yaml.1.1#block-map-key-plain"
+				},
+				{
+					"include": "#block-map-key-explicit"
+				},
+				{
+					"include": "#block-map-value"
+				},
+				{
+					"include": "#flow-mapping"
+				},
+				{
+					"include": "#flow-sequence"
+				},
+				{
+					"include": "source.yaml.1.1#presentation-detail"
+				}
+			]
+		},
+		"block-sequence": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-l+block-sequence",
+			"begin": "(?=((?<=[-?:]) )?+)(?<![^\t ][\t ]*+:|---)\\G( *+)(-)(?=[\\x{85 2028 2029}\r\n\t ])",
+			"while": "\\G(?>(\\1\\2)(?!-[\\x{85 2028 2029}\r\n\t ])((?>\t[\t ]*+)?+[^\\x{85 2028 2029}\r\n\t #\\]}])?+|(?!\\1\\2)( *+)([\t ]*+[^\\x{85 2028 2029}\r\n#])?+)",
+			"beginCaptures": {
+				"2": {
+					"name": "punctuation.whitespace.indentation.yaml"
+				},
+				"3": {
+					"name": "punctuation.definition.block.sequence.item.yaml"
+				}
+			},
+			"whileCaptures": {
+				"1": {
+					"name": "punctuation.whitespace.indentation.yaml"
+				},
+				"2": {
+					"name": "invalid.illegal.expected-indentation.yaml"
+				},
+				"3": {
+					"name": "punctuation.whitespace.indentation.yaml"
+				},
+				"4": {
+					"name": "invalid.illegal.expected-indentation.yaml"
+				}
+			},
+			"name": "meta.block.sequence.yaml",
+			"patterns": [
+				{
+					"include": "#block-node"
+				}
+			]
+		},
+		"block-map-key-explicit": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-c-l-block-map-explicit-key",
+			"begin": "(?=((?<=[-?:]) )?+)\\G( *+)(\\?)(?=[\\x{85 2028 2029}\r\n\t ])",
+			"while": "\\G(?>(\\1\\2)(?![?:0-9A-Za-z$()+./;<=\\\\^_~\\x{A0}-\\x{D7FF}\\x{E000}-\\x{FFFD}\\x{010000}-\\x{10FFFF}&&[^\\x{2028 2029}]])((?>\t[\t ]*+)?+[^\\x{85 2028 2029}\r\n\t #\\-\\[\\]{}])?+|(?!\\1\\2)( *+)([\t ]*+[^\\x{85 2028 2029}\r\n#])?+)",
+			"beginCaptures": {
+				"2": {
+					"name": "punctuation.whitespace.indentation.yaml"
+				},
+				"3": {
+					"name": "punctuation.definition.map.key.yaml"
+				},
+				"4": {
+					"name": "punctuation.whitespace.separator.yaml"
+				}
+			},
+			"whileCaptures": {
+				"1": {
+					"name": "punctuation.whitespace.indentation.yaml"
+				},
+				"2": {
+					"name": "invalid.illegal.expected-indentation.yaml"
+				},
+				"3": {
+					"name": "punctuation.whitespace.indentation.yaml"
+				},
+				"4": {
+					"name": "invalid.illegal.expected-indentation.yaml"
+				}
+			},
+			"name": "meta.map.explicit.yaml",
+			"patterns": [
+				{
+					"include": "#key-double"
+				},
+				{
+					"include": "source.yaml#key-single"
+				},
+				{
+					"include": "source.yaml.1.1#flow-key-plain-out"
+				},
+				{
+					"include": "#block-map-value"
+				},
+				{
+					"include": "#block-node"
+				}
+			]
+		},
+		"block-map-key-double": {
+			"comment": "https://yaml.org/spec/1.2.2/#double-quoted-style (BLOCK-KEY)",
+			"begin": "\\G\"",
+			"end": "\"",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.yaml"
+				}
+			},
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.yaml"
+				}
+			},
+			"name": "meta.map.key.yaml string.quoted.double.yaml entity.name.tag.yaml",
+			"patterns": [
+				{
+					"match": ".[\t ]*+$",
+					"name": "invalid.illegal.multiline-key.yaml"
+				},
+				{
+					"match": "[^\t -\\x{10FFFF}]++",
+					"name": "invalid.illegal.character.yaml"
+				},
+				{
+					"include": "#double-escape"
+				}
+			]
+		},
+		"block-map-value": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-c-l-block-map-implicit-value",
+			"//": "Assumming 3rd party preprocessing variables `{{...}}` turn into valid map-keys when inside a block-mapping",
+			"begin": ":(?=[\\x{85 2028 2029}\r\n\t ])|(?<=}})(?=[\t ]++#|[\t ]*+$)",
+			"while": "\\G(?![?:!\"'0-9A-Za-z$()+./;<=\\\\^_~\\[{\\x{A0}-\\x{D7FF}\\x{E000}-\\x{FFFD}\\x{010000}-\\x{10FFFF}&&[^\\x{2028 2029}]]|-[^\\x{85 2028 2029}\r\n\t ])",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.separator.map.value.yaml"
+				}
+			},
+			"name": "meta.map.value.yaml",
+			"patterns": [
+				{
+					"include": "#block-node"
+				}
+			]
+		},
+		"block-scalar": {
+			"comment": "https://yaml.org/spec/1.2.2/#81-block-scalar-styles",
+			"patterns": [
+				{
+					"comment": "https://yaml.org/spec/1.2.2/#8111-block-indentation-indicator",
+					"begin": "(?>(\\|)|(>))(?<chomp>[+-])?+((0)|(1)|(2)|(3)|(4)|(5)|(6)|(7)|(8)|(9))(?(<chomp>)|([+-]))?+",
+					"while": "\\G(?>(?>(?!\\5)|(?!\\6) |(?!\\7) {2}|(?!\\8) {3}|(?!\\9) {4}|(?!\\10) {5}|(?!\\11) {6}|(?!\\12) {7}|(?!\\13) {8}|(?!\\14) {9})| *+($|[^#]))",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.flow.block-scalar.literal.yaml"
+						},
+						"2": {
+							"name": "keyword.control.flow.block-scalar.folded.yaml"
+						},
+						"3": {
+							"name": "storage.modifier.chomping-indicator.yaml"
+						},
+						"4": {
+							"name": "constant.numeric.indentation-indicator.yaml"
+						},
+						"15": {
+							"name": "storage.modifier.chomping-indicator.yaml"
+						}
+					},
+					"whileCaptures": {
+						"0": {
+							"name": "punctuation.whitespace.indentation.yaml"
+						},
+						"1": {
+							"name": "invalid.illegal.expected-indentation.yaml"
+						}
+					},
+					"name": "meta.scalar.yaml",
+					"patterns": [
+						{
+							"begin": "$",
+							"while": "\\G",
+							"contentName": "string.unquoted.block.yaml",
+							"patterns": [
+								{
+									"include": "source.yaml#non-printable"
+								}
+							]
+						},
+						{
+							"begin": "\\G",
+							"end": "$",
+							"patterns": [
+								{
+									"include": "source.yaml.1.1#presentation-detail"
+								}
+							]
+						}
+					]
+				},
+				{
+					"comment": "https://yaml.org/spec/1.2.2/#rule-c-b-block-header",
+					"//": "Soooooooo many edge cases",
+					"begin": "(?>(\\|)|(>))([+-]?+)",
+					"while": "\\G",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.flow.block-scalar.literal.yaml"
+						},
+						"2": {
+							"name": "keyword.control.flow.block-scalar.folded.yaml"
+						},
+						"3": {
+							"name": "storage.modifier.chomping-indicator.yaml"
+						}
+					},
+					"name": "meta.scalar.yaml",
+					"patterns": [
+						{
+							"comment": "https://yaml.org/spec/1.2.2/#rule-l-literal-content",
+							"begin": "$",
+							"while": "\\G",
+							"patterns": [
+								{
+									"comment": "https://yaml.org/spec/1.2.2/#rule-l-nb-literal-text",
+									"//": "Find the highest indented line",
+									"begin": "\\G( ++)$",
+									"while": "\\G(?>(\\1)$|(?!\\1)( *+)($|.))",
+									"captures": {
+										"1": {
+											"name": "punctuation.whitespace.indentation.yaml"
+										},
+										"2": {
+											"name": "punctuation.whitespace.indentation.yaml"
+										},
+										"3": {
+											"name": "invalid.illegal.expected-indentation.yaml"
+										}
+									},
+									"contentName": "string.unquoted.block.yaml",
+									"patterns": [
+										{
+											"include": "source.yaml#non-printable"
+										}
+									]
+								},
+								{
+									"comment": "https://yaml.org/spec/1.2.2/#rule-b-nb-literal-next",
+									"//": [
+										"Funky wrapper function",
+										"The `end` pattern clears the parent `\\G` anchor",
+										"Affectively forcing this rule to only match at most once",
+										"https://github.com/microsoft/vscode-textmate/issues/114"
+									],
+									"begin": "\\G(?!$)(?=( *+))",
+									"end": "\\G(?!\\1)(?=[\t ]*+#)",
+									"patterns": [
+										{
+											"comment": "https://yaml.org/spec/1.2.2/#rule-l-nb-literal-text",
+											"begin": "\\G( *+)",
+											"while": "\\G(?>(\\1)|( *+)($|[^\t#]|[\t ]++[^#]))",
+											"captures": {
+												"1": {
+													"name": "punctuation.whitespace.indentation.yaml"
+												},
+												"2": {
+													"name": "punctuation.whitespace.indentation.yaml"
+												},
+												"3": {
+													"name": "invalid.illegal.expected-indentation.yaml"
+												}
+											},
+											"contentName": "string.unquoted.block.yaml",
+											"patterns": [
+												{
+													"include": "source.yaml#non-printable"
+												}
+											]
+										}
+									]
+								},
+								{
+									"comment": "https://yaml.org/spec/1.2.2/#rule-l-chomped-empty",
+									"begin": "(?!\\G)(?=[\t ]*+#)",
+									"while": "\\G",
+									"patterns": [
+										{
+											"include": "source.yaml.1.1#presentation-detail"
+										}
+									]
+								}
+							]
+						},
+						{
+							"comment": "Header Comment",
+							"begin": "\\G",
+							"end": "$",
+							"patterns": [
+								{
+									"include": "source.yaml.1.1#presentation-detail"
+								}
+							]
+						}
+					]
+				}
+			]
+		},
+		"flow-node": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-ns-flow-seq-entry (FLOW-IN)",
+			"patterns": [
+				{
+					"begin": "(?=\\[|{)",
+					"end": "(?=[:,\\]}])",
+					"patterns": [
+						{
+							"begin": "(?!\\G)",
+							"end": "(?=[:,\\]}])",
+							"patterns": [
+								{
+									"include": "source.yaml.1.1#presentation-detail"
+								}
+							]
+						},
+						{
+							"include": "#flow-mapping"
+						},
+						{
+							"include": "#flow-sequence"
+						}
+					]
+				},
+				{
+					"include": "source.yaml.1.1#anchor-property"
+				},
+				{
+					"include": "#tag-property"
+				},
+				{
+					"include": "source.yaml.1.1#alias"
+				},
+				{
+					"begin": "(?=\"|')",
+					"end": "(?=[:,\\]}])",
+					"patterns": [
+						{
+							"begin": "(?!\\G)",
+							"end": "(?=[:,\\]}])",
+							"patterns": [
+								{
+									"include": "source.yaml.1.1#presentation-detail"
+								}
+							]
+						},
+						{
+							"include": "#double"
+						},
+						{
+							"include": "source.yaml.1.1#single"
+						}
+					]
+				},
+				{
+					"include": "source.yaml.1.1#flow-plain-in"
+				},
+				{
+					"include": "source.yaml.1.1#presentation-detail"
+				}
+			]
+		},
+		"flow-mapping": {
+			"comment": "https://yaml.org/spec/1.2.2/#742-flow-mappings",
+			"begin": "{",
+			"end": "}",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.mapping.begin.yaml"
+				}
+			},
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.mapping.end.yaml"
+				}
+			},
+			"name": "meta.flow.mapping.yaml",
+			"patterns": [
+				{
+					"comment": "https://yaml.org/spec/1.2.2/#rule-ns-s-flow-map-entries",
+					"begin": "(?<={)\\G(?=[\\x{85 2028 2029}\r\n\t ,#])|,",
+					"end": "(?=[^\\x{85 2028 2029}\r\n\t ,#])",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.separator.mapping.yaml"
+						}
+					},
+					"patterns": [
+						{
+							"match": ",++",
+							"name": "invalid.illegal.separator.sequence.yaml"
+						},
+						{
+							"include": "source.yaml.1.1#presentation-detail"
+						}
+					]
+				},
+				{
+					"include": "#flow-mapping-map-key"
+				},
+				{
+					"include": "#flow-map-value-yaml"
+				},
+				{
+					"include": "#flow-map-value-json"
+				},
+				{
+					"include": "#flow-node"
+				}
+			]
+		},
+		"flow-sequence": {
+			"comment": "https://yaml.org/spec/1.2.2/#741-flow-sequences",
+			"begin": "\\[",
+			"end": "]",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.sequence.begin.yaml"
+				}
+			},
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.sequence.end.yaml"
+				}
+			},
+			"name": "meta.flow.sequence.yaml",
+			"patterns": [
+				{
+					"comment": "https://yaml.org/spec/1.2.2/#rule-ns-s-flow-seq-entries",
+					"begin": "(?<=\\[)\\G(?=[\\x{85 2028 2029}\r\n\t ,#])|,",
+					"end": "(?=[^\\x{85 2028 2029}\r\n\t ,#])",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.separator.sequence.yaml"
+						}
+					},
+					"patterns": [
+						{
+							"match": ",++",
+							"name": "invalid.illegal.separator.sequence.yaml"
+						},
+						{
+							"include": "source.yaml.1.1#presentation-detail"
+						}
+					]
+				},
+				{
+					"include": "#flow-sequence-map-key"
+				},
+				{
+					"include": "#flow-map-value-yaml"
+				},
+				{
+					"include": "#flow-map-value-json"
+				},
+				{
+					"include": "#flow-node"
+				}
+			]
+		},
+		"flow-mapping-map-key": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-ns-flow-map-entry (FLOW-IN)",
+			"patterns": [
+				{
+					"begin": "\\?(?=[\\x{85 2028 2029}\r\n\t ,\\[\\]{}])",
+					"end": "(?=[,\\[\\]{}])",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.map.key.yaml"
+						}
+					},
+					"name": "meta.flow.map.explicit.yaml",
+					"patterns": [
+						{
+							"include": "#flow-mapping-map-key"
+						},
+						{
+							"include": "#flow-map-value-yaml"
+						},
+						{
+							"include": "#flow-map-value-json"
+						},
+						{
+							"include": "#flow-node"
+						}
+					]
+				},
+				{
+					"comment": "https://yaml.org/spec/1.2.2/#rule-ns-flow-map-implicit-entry (FLOW-IN)",
+					"begin": "(?=(?>[^-?:,\\[\\]{}#&*!|>'\"%@` \\p{Cntrl}\\p{Surrogate}\\x{FFFE FFFF}]|[?:-](?![\\x{85 2028 2029}\r\n\t ,\\[\\]{}])))",
+					"end": "(?=[,\\[\\]{}])",
+					"name": "meta.flow.map.implicit.yaml",
+					"patterns": [
+						{
+							"include": "source.yaml.1.1#flow-key-plain-in"
+						},
+						{
+							"match": ":(?=\\[|{)",
+							"name": "invalid.illegal.separator.map.yaml"
+						},
+						{
+							"include": "#flow-map-value-yaml"
+						},
+						{
+							"include": "source.yaml.1.1#presentation-detail"
+						}
+					]
+				},
+				{
+					"comment": "https://yaml.org/spec/1.2.2/#rule-ns-flow-map-implicit-entry (FLOW-IN)",
+					"begin": "(?=\"|')",
+					"end": "(?=[,\\[\\]{}])",
+					"name": "meta.flow.map.implicit.yaml",
+					"patterns": [
+						{
+							"include": "#key-double"
+						},
+						{
+							"include": "source.yaml#key-single"
+						},
+						{
+							"include": "#flow-map-value-json"
+						},
+						{
+							"include": "source.yaml.1.1#presentation-detail"
+						}
+					]
+				}
+			]
+		},
+		"flow-sequence-map-key": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-ns-flow-map-entry (FLOW-IN)",
+			"patterns": [
+				{
+					"begin": "\\?(?=[\\x{85 2028 2029}\r\n\t ,\\[\\]{}])",
+					"end": "(?=[,\\[\\]{}])",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.map.key.yaml"
+						}
+					},
+					"name": "meta.flow.map.explicit.yaml",
+					"patterns": [
+						{
+							"include": "#flow-mapping-map-key"
+						},
+						{
+							"include": "#flow-map-value-yaml"
+						},
+						{
+							"include": "#flow-map-value-json"
+						},
+						{
+							"include": "#flow-node"
+						}
+					]
+				},
+				{
+					"comment": "https://yaml.org/spec/1.2.2/#rule-ns-flow-map-implicit-entry (FLOW-IN)",
+					"begin": "(?<=[\t ,\\[{]|^)(?=(?>[^-?:,\\[\\]{}#&*!|>'\"%@` \\p{Cntrl}\\p{Surrogate}\\x{FFFE FFFF}]|[?:-](?![\\x{85 2028 2029}\r\n\t ,\\[\\]{}]))(?>[^:#,\\[\\]{}]++|:(?![\\x{85 2028 2029}\r\n\t ,\\[\\]{}])|(?<! |\t)#++)*+:[\\x{85 2028 2029}\r\n\t ,\\[\\]{}])",
+					"end": "(?=[,\\[\\]{}])",
+					"name": "meta.flow.map.implicit.yaml",
+					"patterns": [
+						{
+							"include": "source.yaml.1.1#flow-key-plain-in"
+						},
+						{
+							"match": ":(?=\\[|{)",
+							"name": "invalid.illegal.separator.map.yaml"
+						},
+						{
+							"include": "#flow-map-value-yaml"
+						},
+						{
+							"include": "source.yaml.1.1#presentation-detail"
+						}
+					]
+				},
+				{
+					"comment": "https://yaml.org/spec/1.2.2/#rule-ns-flow-map-implicit-entry (FLOW-IN)",
+					"begin": "(?=(?>\"(?>[^\\\\\"]++|\\\\.)*+\"|'(?>[^']++|'')*+')[\t ]*+:)",
+					"end": "(?=[,\\[\\]{}])",
+					"name": "meta.flow.map.implicit.yaml",
+					"patterns": [
+						{
+							"include": "#key-double"
+						},
+						{
+							"include": "source.yaml#key-single"
+						},
+						{
+							"include": "#flow-map-value-json"
+						},
+						{
+							"include": "source.yaml.1.1#presentation-detail"
+						}
+					]
+				}
+			]
+		},
+		"flow-map-value-yaml": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-c-ns-flow-map-separate-value (FLOW-IN)",
+			"begin": ":(?=[\\x{85 2028 2029}\r\n\t ,\\[\\]{}])",
+			"end": "(?=[,\\]}])",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.separator.map.value.yaml"
+				}
+			},
+			"name": "meta.flow.pair.value.yaml",
+			"patterns": [
+				{
+					"include": "#flow-node"
+				}
+			]
+		},
+		"flow-map-value-json": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-c-ns-flow-map-separate-value (FLOW-IN)",
+			"begin": "(?<=(?>[\"'\\]}]|^)[\t ]*+):",
+			"end": "(?=[,\\]}])",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.separator.map.value.yaml"
+				}
+			},
+			"name": "meta.flow.pair.value.yaml",
+			"patterns": [
+				{
+					"include": "#flow-node"
+				}
+			]
+		},
+		"key-double": {
+			"comment": "https://yaml.org/spec/1.2.2/#double-quoted-style (FLOW-OUT)",
+			"begin": "\"",
+			"end": "\"",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.yaml"
+				}
+			},
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.yaml"
+				}
+			},
+			"name": "meta.map.key.yaml string.quoted.double.yaml entity.name.tag.yaml",
+			"patterns": [
+				{
+					"match": "[^\t -\\x{10FFFF}]++",
+					"name": "invalid.illegal.character.yaml"
+				},
+				{
+					"include": "#double-escape"
+				}
+			]
+		},
+		"double": {
+			"comment": "https://yaml.org/spec/1.2.2/#double-quoted-style",
+			"begin": "\"",
+			"end": "\"",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.yaml"
+				}
+			},
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.yaml"
+				}
+			},
+			"name": "string.quoted.double.yaml",
+			"patterns": [
+				{
+					"match": "(?<!\")\\G[\t ]++",
+					"name": "punctuation.whitespace.separator.yaml"
+				},
+				{
+					"match": "[\t ]++$",
+					"name": "punctuation.whitespace.separator.yaml"
+				},
+				{
+					"match": "[^\\x{85 2028 2029}\r\n\t -\\x{10FFFF}]++",
+					"name": "invalid.illegal.character.yaml"
+				},
+				{
+					"include": "#double-escape"
+				}
+			]
+		},
+		"double-escape": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-c-ns-esc-char",
+			"patterns": [
+				{
+					"match": "\\\\[\\x{85 2028 2029}\r\n0abtnvfre \"\\\\N_LP^]",
+					"name": "constant.character.escape.yaml"
+				},
+				{
+					"match": "\\\\x[0-9a-fA-F]{2}",
+					"name": "constant.character.escape.unicode.8-bit.yaml"
+				},
+				{
+					"match": "\\\\u[0-9a-fA-F]{4}",
+					"name": "constant.character.escape.unicode.16-bit.yaml"
+				},
+				{
+					"match": "\\\\U[0-9a-fA-F]{8}",
+					"name": "constant.character.escape.unicode.32-bit.yaml"
+				},
+				{
+					"match": "\\\\(?>x[^\"]{2,0}|u[^\"]{4,0}|U[^\"]{8,0}|.)",
+					"name": "invalid.illegal.constant.character.escape.yaml"
+				}
+			]
+		},
+		"tag-property": {
+			"comment": "https://yaml.org/spec/1.0/#c-ns-tag-property",
+			"//": [
+				"!^",
+				"!!private_ns-tag-char+",
+				"!global_core_ns-tag-char+_no-:/!",
+				"!global_vocabulary_az09-_/ns-tag-char",
+				"!global_domain_ns-tag-char+.ns-tag-char+,1234(-12(-12)?)?/ns-tag-char*"
+			],
+			"begin": "(?=!)",
+			"end": "(?=[\\x{2028 2029}\r\n\t ])",
+			"name": "storage.type.tag.yaml",
+			"patterns": [
+				{
+					"match": "\\G!(?=[\\x{85 2028 2029}\r\n\t ])",
+					"name": "punctuation.definition.tag.non-specific.yaml"
+				},
+				{
+					"comment": "https://yaml.org/spec/1.0/#c-ns-private-tag",
+					"match": "\\G!!",
+					"name": "punctuation.definition.tag.private.yaml"
+				},
+				{
+					"comment": "https://yaml.org/spec/1.0/#ns-ns-global-tag",
+					"match": "\\G!",
+					"name": "punctuation.definition.tag.global.yaml"
+				},
+				{
+					"comment": "https://yaml.org/spec/1.0/#c-prefix",
+					"match": "\\^",
+					"name": "punctuation.definition.tag.prefix.yaml"
+				},
+				{
+					"match": "%[0-9a-fA-F]{2}",
+					"name": "constant.character.escape.unicode.8-bit.yaml"
+				},
+				{
+					"match": "%[^\\x{85 2028 2029}\r\n\t ]{2,0}",
+					"name": "invalid.illegal.constant.character.escape.unicode.8-bit.yaml"
+				},
+				{
+					"include": "#double-escape"
+				},
+				{
+					"include": "source.yaml#non-printable"
+				}
+			]
+		}
+	}
+}
\ No newline at end of file
diff --git a/extensions/yaml/syntaxes/yaml-1.1.tmLanguage.json b/extensions/yaml/syntaxes/yaml-1.1.tmLanguage.json
new file mode 100644
index 00000000000..57a96ac1e4f
--- /dev/null
+++ b/extensions/yaml/syntaxes/yaml-1.1.tmLanguage.json
@@ -0,0 +1,1555 @@
+{
+	"information_for_contributors": [
+		"This file has been converted from https://github.com/RedCMD/YAML-Syntax-Highlighter/blob/master/syntaxes/yaml-1.1.tmLanguage.json",
+		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
+		"Once accepted there, we are happy to receive an update request."
+	],
+	"version": "https://github.com/RedCMD/YAML-Syntax-Highlighter/commit/dfd7e5f4f71f9695c5d8697ca57f81240165aa04",
+	"name": "YAML 1.1",
+	"scopeName": "source.yaml.1.1",
+	"comment": "https://yaml.org/spec/1.1/",
+	"patterns": [
+		{
+			"include": "#stream"
+		}
+	],
+	"repository": {
+		"stream": {
+			"patterns": [
+				{
+					"comment": "allows me to just use `\\G` instead of the performance heavy `(^|\\G)`",
+					"begin": "^(?!\\G)",
+					"while": "^",
+					"name": "meta.stream.yaml",
+					"patterns": [
+						{
+							"include": "#byte-order-mark"
+						},
+						{
+							"include": "#directives"
+						},
+						{
+							"include": "#document"
+						},
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				},
+				{
+					"begin": "\\G",
+					"while": "\\G",
+					"name": "meta.stream.yaml",
+					"patterns": [
+						{
+							"include": "#byte-order-mark"
+						},
+						{
+							"include": "#directives"
+						},
+						{
+							"include": "#document"
+						},
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				}
+			]
+		},
+		"directive-YAML": {
+			"comment": "https://yaml.org/spec/1.2.2/#681-yaml-directives",
+			"begin": "(?=%YAML[ \t]+1\\.1(?=[\\x{85 2028 2029}\r\n\t ]))",
+			"end": "\\G(?=%(?!YAML[ \t]+1\\.1))",
+			"name": "meta.1.1.yaml",
+			"patterns": [
+				{
+					"comment": "https://yaml.org/spec/1.2.2/#681-yaml-directives",
+					"begin": "\\G(%)(YAML)([ \t]+)(1\\.1)",
+					"while": "\\G(?!---[\\x{85 2028 2029}\r\n\t ])",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.directive.begin.yaml"
+						},
+						"2": {
+							"name": "keyword.other.directive.yaml.yaml"
+						},
+						"3": {
+							"name": "punctuation.whitespace.separator.yaml"
+						},
+						"4": {
+							"name": "constant.numeric.yaml-version.yaml"
+						}
+					},
+					"name": "meta.directives.yaml",
+					"patterns": [
+						{
+							"include": "#directive-invalid"
+						},
+						{
+							"include": "#directives"
+						},
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				},
+				{
+					"begin": "\\G(?=---[\\x{85 2028 2029}\r\n\t ])",
+					"while": "\\G(?!%)",
+					"patterns": [
+						{
+							"include": "#document"
+						},
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				},
+				{
+					"include": "#presentation-detail"
+				}
+			]
+		},
+		"directives": {
+			"comment": "https://yaml.org/spec/1.2.2/#68-directives",
+			"patterns": [
+				{
+					"include": "source.yaml.1.3#directive-YAML"
+				},
+				{
+					"include": "source.yaml.1.2#directive-YAML"
+				},
+				{
+					"include": "source.yaml.1.1#directive-YAML"
+				},
+				{
+					"include": "source.yaml.1.0#directive-YAML"
+				},
+				{
+					"begin": "(?=%)",
+					"while": "\\G(?!%|---[\\x{85 2028 2029}\r\n\t ])",
+					"name": "meta.directives.yaml",
+					"patterns": [
+						{
+							"comment": "https://yaml.org/spec/1.2.2/#682-tag-directives",
+							"begin": "\\G(%)(TAG)(?>([\t ]++)((!)(?>[0-9A-Za-z-]*+(!))?+))?+",
+							"end": "$",
+							"applyEndPatternLast": true,
+							"beginCaptures": {
+								"1": {
+									"name": "punctuation.definition.directive.begin.yaml"
+								},
+								"2": {
+									"name": "keyword.other.directive.tag.yaml"
+								},
+								"3": {
+									"name": "punctuation.whitespace.separator.yaml"
+								},
+								"4": {
+									"name": "storage.type.tag-handle.yaml"
+								},
+								"5": {
+									"name": "punctuation.definition.tag.begin.yaml"
+								},
+								"6": {
+									"name": "punctuation.definition.tag.end.yaml"
+								},
+								"comment": "https://yaml.org/spec/1.2.2/#rule-c-tag-handle"
+							},
+							"patterns": [
+								{
+									"comment": "technically the beginning should only validate against a valid uri scheme [A-Za-z][A-Za-z0-9.+-]*",
+									"begin": "\\G[\t ]++(?!#)",
+									"end": "(?=[\\x{85 2028 2029}\r\n\t ])",
+									"beginCaptures": {
+										"0": {
+											"name": "punctuation.whitespace.separator.yaml"
+										}
+									},
+									"contentName": "support.type.tag-prefix.yaml",
+									"patterns": [
+										{
+											"match": "%[0-9a-fA-F]{2}",
+											"name": "constant.character.escape.unicode.8-bit.yaml"
+										},
+										{
+											"match": "%[^\\x{85 2028 2029}\r\n\t ]{2,0}",
+											"name": "invalid.illegal.constant.character.escape.unicode.8-bit.yaml"
+										},
+										{
+											"match": "\\G[,\\[\\]{}]",
+											"name": "invalid.illegal.character.uri.yaml"
+										},
+										{
+											"include": "source.yaml#non-printable"
+										},
+										{
+											"match": "[^\\x{85 2028 2029}\r\n\t a-zA-Z0-9-#;/?:@&=+$,_.!~*'()\\[\\]]++",
+											"name": "invalid.illegal.unrecognized.yaml"
+										}
+									]
+								},
+								{
+									"include": "#presentation-detail"
+								}
+							]
+						},
+						{
+							"comment": "https://yaml.org/spec/1.2.2/#rule-ns-reserved-directive",
+							"begin": "(%)([^ \\p{Cntrl}\\p{Surrogate}\\x{2028 2029 FFFE FFFF}]++)",
+							"end": "$",
+							"beginCaptures": {
+								"1": {
+									"name": "punctuation.definition.directive.begin.yaml"
+								},
+								"2": {
+									"name": "keyword.other.directive.other.yaml"
+								}
+							},
+							"patterns": [
+								{
+									"match": "\\G([\t ]++)([^ \\p{Cntrl}\\p{Surrogate}\\x{2028 2029 FFFE FFFF}]++)",
+									"captures": {
+										"1": {
+											"name": "punctuation.whitespace.separator.yaml"
+										},
+										"2": {
+											"name": "string.unquoted.directive-name.yaml"
+										}
+									}
+								},
+								{
+									"match": "([\t ]++)([^ \\p{Cntrl}\\p{Surrogate}\\x{2028 2029 FFFE FFFF}]++)",
+									"captures": {
+										"1": {
+											"name": "punctuation.whitespace.separator.yaml"
+										},
+										"2": {
+											"name": "string.unquoted.directive-parameter.yaml"
+										}
+									}
+								},
+								{
+									"include": "#presentation-detail"
+								}
+							]
+						},
+						{
+							"match": "\\G\\.{3}(?=[\\x{85 2028 2029}\r\n\t ])",
+							"name": "invalid.illegal.entity.other.document.end.yaml"
+						},
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				}
+			]
+		},
+		"directive-invalid": {
+			"patterns": [
+				{
+					"match": "\\G\\.{3}(?=[\\x{85 2028 2029}\r\n\t ])",
+					"name": "invalid.illegal.entity.other.document.end.yaml"
+				},
+				{
+					"begin": "\\G(%)(YAML)",
+					"end": "$",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.directive.begin.yaml"
+						},
+						"2": {
+							"name": "invalid.illegal.keyword.other.directive.yaml.yaml"
+						}
+					},
+					"name": "meta.directive.yaml",
+					"patterns": [
+						{
+							"match": "\\G([\t ]++|:)([0-9]++\\.[0-9]++)?+",
+							"captures": {
+								"1": {
+									"name": "punctuation.whitespace.separator.yaml"
+								},
+								"2": {
+									"name": "constant.numeric.yaml-version.yaml"
+								}
+							}
+						},
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				}
+			]
+		},
+		"document": {
+			"comment": "https://yaml.org/spec/1.2.2/#91-documents",
+			"patterns": [
+				{
+					"begin": "---(?=[\\x{85 2028 2029}\r\n\t ])",
+					"while": "\\G(?!(?>\\.{3}|---)[\\x{85 2028 2029}\r\n\t ])",
+					"beginCaptures": {
+						"0": {
+							"name": "entity.other.document.begin.yaml"
+						}
+					},
+					"name": "meta.document.yaml",
+					"patterns": [
+						{
+							"include": "#block-node"
+						}
+					]
+				},
+				{
+					"begin": "(?=\\.{3}[\\x{85 2028 2029}\r\n\t ])",
+					"while": "\\G(?=[\t \\x{FEFF}]*+(?>#|$))",
+					"patterns": [
+						{
+							"begin": "\\G\\.{3}",
+							"end": "$",
+							"beginCaptures": {
+								"0": {
+									"name": "entity.other.document.end.yaml"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#presentation-detail"
+								}
+							]
+						},
+						{
+							"include": "#byte-order-mark"
+						},
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				},
+				{
+					"begin": "\\G(?!%|[\t \\x{FEFF}]*+(?>#|$))",
+					"while": "\\G(?!(?>\\.{3}|---)[\\x{85 2028 2029}\r\n\t ])",
+					"name": "meta.document.yaml",
+					"patterns": [
+						{
+							"include": "#block-node"
+						}
+					]
+				}
+			]
+		},
+		"block-node": {
+			"patterns": [
+				{
+					"include": "#block-sequence"
+				},
+				{
+					"include": "#block-mapping"
+				},
+				{
+					"include": "source.yaml.1.2#block-scalar"
+				},
+				{
+					"include": "#anchor-property"
+				},
+				{
+					"include": "#tag-property"
+				},
+				{
+					"include": "#alias"
+				},
+				{
+					"begin": "(?=\"|')",
+					"while": "\\G",
+					"patterns": [
+						{
+							"begin": "(?!\\G)",
+							"while": "\\G",
+							"patterns": [
+								{
+									"include": "#presentation-detail"
+								}
+							]
+						},
+						{
+							"include": "#double"
+						},
+						{
+							"include": "#single"
+						}
+					]
+				},
+				{
+					"begin": "(?={)",
+					"end": "$",
+					"patterns": [
+						{
+							"include": "#flow-mapping"
+						},
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				},
+				{
+					"begin": "(?=\\[)",
+					"end": "$",
+					"patterns": [
+						{
+							"include": "#flow-sequence"
+						},
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				},
+				{
+					"include": "#block-plain-out"
+				},
+				{
+					"include": "#presentation-detail"
+				}
+			]
+		},
+		"block-mapping": {
+			"//": "The check for plain keys is expensive",
+			"begin": "(?=((?<=[-?:]) )?+)(?<![^\t ][\t ]*+:|---)\\G( *+)([\t ]*+)((?>[!&*][^\\x{85 2028 2029}\r\n\t ]*+[\t ]++)*+)(?=(?>(?#Double Quote)\"(?>[^\\\\\"]++|\\\\.)*+\"|(?#Single Quote)'(?>[^']++|'')*+'|(?#Flow-Map){(?>[^\\x{85 2028 2029}}]++|}[ \t]*+(?!:[\\x{85 2028 2029}\r\n\t ]))++}|(?#Flow-Seq)\\[(?>[^\\x{85 2028 2029}\\]]++|][ \t]*+(?!:[\\x{85 2028 2029}\r\n\t ]))++]|(?#Plain)(?>[^-?:,\\[\\]{}#&*!|>'\"%@` \\p{Cntrl}\\p{Surrogate}\\x{FFFE FFFF}]|[?:-](?![\\x{85 2028 2029}\r\n\t ]))(?>[^:#]++|:(?![\\x{85 2028 2029}\r\n\t ])|(?<! |\t)#++)*+)?+(?#Map Value)[\t ]*+:[\\x{85 2028 2029}\r\n\t ]|(?#Explicit)\\?[\\x{85 2028 2029}\r\n\t ])",
+			"while": "\\G(?>(\\1\\2)((?>[!&*][^\\x{85 2028 2029}\r\n\t ]*+[\t ]++)*+)((?>\t[\t ]*+)?+[^\\x{85 2028 2029}\r\n\t ?:\\-#!&*\"'\\[\\]{}0-9A-Za-z$()+./;<=\\\\^_~\\x{A0}-\\x{D7FF}\\x{E000}-\\x{FFFD}\\x{010000}-\\x{10FFFF}])?+|( *+)([\t ]*+[^\\x{85 2028 2029}\r\n#])?+)",
+			"beginCaptures": {
+				"2": {
+					"name": "punctuation.whitespace.indentation.yaml"
+				},
+				"3": {
+					"name": "punctuation.whitespace.separator.yaml"
+				},
+				"4": {
+					"comment": "May cause lag on long lines starting with a tag, anchor or alias",
+					"patterns": [
+						{
+							"include": "#tag-property"
+						},
+						{
+							"include": "#anchor-property"
+						},
+						{
+							"include": "#alias"
+						},
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				}
+			},
+			"whileCaptures": {
+				"1": {
+					"name": "punctuation.whitespace.indentation.yaml"
+				},
+				"2": {
+					"comment": "May cause lag on long lines starting with a tag, anchor or alias",
+					"patterns": [
+						{
+							"include": "#tag-property"
+						},
+						{
+							"include": "#anchor-property"
+						},
+						{
+							"include": "#alias"
+						},
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				},
+				"3": {
+					"name": "invalid.illegal.expected-indentation.yaml"
+				},
+				"4": {
+					"name": "punctuation.whitespace.indentation.yaml"
+				},
+				"5": {
+					"name": "invalid.illegal.expected-indentation.yaml"
+				}
+			},
+			"name": "meta.mapping.yaml",
+			"patterns": [
+				{
+					"include": "#block-map-key-double"
+				},
+				{
+					"include": "source.yaml#block-map-key-single"
+				},
+				{
+					"include": "#block-map-key-plain"
+				},
+				{
+					"include": "#block-map-key-explicit"
+				},
+				{
+					"include": "#block-map-value"
+				},
+				{
+					"include": "#flow-mapping"
+				},
+				{
+					"include": "#flow-sequence"
+				},
+				{
+					"include": "#presentation-detail"
+				}
+			]
+		},
+		"block-sequence": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-l+block-sequence",
+			"begin": "(?=((?<=[-?:]) )?+)(?<![^\t ][\t ]*+:|---)\\G( *+)(-)(?=[\\x{85 2028 2029}\r\n\t ])",
+			"while": "\\G(?>(\\1\\2)(?!-[\\x{85 2028 2029}\r\n\t ])((?>\t[\t ]*+)?+[^\\x{85 2028 2029}\r\n\t #\\]}])?+|(?!\\1\\2)( *+)([\t ]*+[^\\x{85 2028 2029}\r\n#])?+)",
+			"beginCaptures": {
+				"2": {
+					"name": "punctuation.whitespace.indentation.yaml"
+				},
+				"3": {
+					"name": "punctuation.definition.block.sequence.item.yaml"
+				}
+			},
+			"whileCaptures": {
+				"1": {
+					"name": "punctuation.whitespace.indentation.yaml"
+				},
+				"2": {
+					"name": "invalid.illegal.expected-indentation.yaml"
+				},
+				"3": {
+					"name": "punctuation.whitespace.indentation.yaml"
+				},
+				"4": {
+					"name": "invalid.illegal.expected-indentation.yaml"
+				}
+			},
+			"name": "meta.block.sequence.yaml",
+			"patterns": [
+				{
+					"include": "#block-node"
+				}
+			]
+		},
+		"block-map-key-explicit": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-c-l-block-map-explicit-key",
+			"begin": "(?=((?<=[-?:]) )?+)\\G( *+)(\\?)(?=[\\x{85 2028 2029}\r\n\t ])",
+			"while": "\\G(?>(\\1\\2)(?![?:0-9A-Za-z$()+./;<=\\\\^_~\\x{A0}-\\x{D7FF}\\x{E000}-\\x{FFFD}\\x{010000}-\\x{10FFFF}&&[^\\x{2028 2029}]])((?>\t[\t ]*+)?+[^\\x{85 2028 2029}\r\n\t #\\-\\[\\]{}])?+|(?!\\1\\2)( *+)([\t ]*+[^\\x{85 2028 2029}\r\n#])?+)",
+			"beginCaptures": {
+				"2": {
+					"name": "punctuation.whitespace.indentation.yaml"
+				},
+				"3": {
+					"name": "punctuation.definition.map.key.yaml"
+				},
+				"4": {
+					"name": "punctuation.whitespace.separator.yaml"
+				}
+			},
+			"whileCaptures": {
+				"1": {
+					"name": "punctuation.whitespace.indentation.yaml"
+				},
+				"2": {
+					"name": "invalid.illegal.expected-indentation.yaml"
+				},
+				"3": {
+					"name": "punctuation.whitespace.indentation.yaml"
+				},
+				"4": {
+					"name": "invalid.illegal.expected-indentation.yaml"
+				}
+			},
+			"name": "meta.map.explicit.yaml",
+			"patterns": [
+				{
+					"include": "#key-double"
+				},
+				{
+					"include": "source.yaml#key-single"
+				},
+				{
+					"include": "#flow-key-plain-out"
+				},
+				{
+					"include": "#block-map-value"
+				},
+				{
+					"include": "#block-node"
+				}
+			]
+		},
+		"block-map-key-double": {
+			"comment": "https://yaml.org/spec/1.2.2/#double-quoted-style (BLOCK-KEY)",
+			"begin": "\\G\"",
+			"end": "\"",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.yaml"
+				}
+			},
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.yaml"
+				}
+			},
+			"name": "meta.map.key.yaml string.quoted.double.yaml entity.name.tag.yaml",
+			"patterns": [
+				{
+					"match": ".[\t ]*+$",
+					"name": "invalid.illegal.multiline-key.yaml"
+				},
+				{
+					"match": "[^\t -\\x{10FFFF}]++",
+					"name": "invalid.illegal.character.yaml"
+				},
+				{
+					"include": "#double-escape"
+				}
+			]
+		},
+		"block-map-key-plain": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-ns-plain-one-line (BLOCK-KEY)",
+			"begin": "\\G(?=[^-?:,\\[\\]{}#&*!|>'\"%@` \\p{Cntrl}\\p{Surrogate}\\x{FFFE FFFF}]|[?:-](?![\\x{85 2028 2029}\r\n\t ]))",
+			"end": "(?=[\t ]*+:[\\x{85 2028 2029}\r\n\t ]|(?>[\t ]++|\\G)#)",
+			"name": "meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
+			"patterns": [
+				{
+					"include": "#tag-implicit-plain-out"
+				},
+				{
+					"match": "\\G([\t ]++)(.)",
+					"captures": {
+						"1": {
+							"name": "punctuation.whitespace.separator.yaml"
+						},
+						"2": {
+							"name": "invalid.illegal.multiline-key.yaml"
+						}
+					}
+				},
+				{
+					"match": "[\t ]++$",
+					"name": "punctuation.whitespace.separator.yaml"
+				},
+				{
+					"include": "source.yaml#non-printable"
+				}
+			]
+		},
+		"block-map-value": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-c-l-block-map-implicit-value",
+			"//": "Assumming 3rd party preprocessing variables `{{...}}` turn into valid map-keys when inside a block-mapping",
+			"begin": ":(?=[\\x{85 2028 2029}\r\n\t ])|(?<=}})(?=[\t ]++#|[\t ]*+$)",
+			"while": "\\G(?![?:!\"'0-9A-Za-z$()+./;<=\\\\^_~\\[{\\x{A0}-\\x{D7FF}\\x{E000}-\\x{FFFD}\\x{010000}-\\x{10FFFF}&&[^\\x{2028 2029}]]|-[^\\x{85 2028 2029}\r\n\t ])",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.separator.map.value.yaml"
+				}
+			},
+			"name": "meta.map.value.yaml",
+			"patterns": [
+				{
+					"include": "#block-node"
+				}
+			]
+		},
+		"block-plain-out": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-ns-plain-multi-line (FLOW-OUT)",
+			"begin": "(?=[^-?:,\\[\\]{}#&*!|>'\"%@` \\p{Cntrl}\\p{Surrogate}\\x{FFFE FFFF}]|[?:-](?![\\x{85 2028 2029}\r\n\t ]))",
+			"while": "\\G",
+			"patterns": [
+				{
+					"begin": "\\G",
+					"end": "(?=(?>[\t ]++|\\G)#)",
+					"name": "string.unquoted.plain.out.yaml",
+					"patterns": [
+						{
+							"include": "#tag-implicit-plain-out"
+						},
+						{
+							"match": ":(?=[\\x{85 2028 2029}\r\n\t ])",
+							"name": "invalid.illegal.multiline-key.yaml"
+						},
+						{
+							"match": "\\G[\t ]++",
+							"name": "punctuation.whitespace.separator.yaml"
+						},
+						{
+							"match": "[\t ]++$",
+							"name": "punctuation.whitespace.separator.yaml"
+						},
+						{
+							"include": "source.yaml#non-printable"
+						}
+					]
+				},
+				{
+					"begin": "(?!\\G)",
+					"while": "\\G",
+					"patterns": [
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				}
+			]
+		},
+		"flow-node": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-ns-flow-seq-entry (FLOW-IN)",
+			"patterns": [
+				{
+					"begin": "(?=\\[|{)",
+					"end": "(?=[:,\\]}])",
+					"patterns": [
+						{
+							"begin": "(?!\\G)",
+							"end": "(?=[:,\\]}])",
+							"patterns": [
+								{
+									"include": "#presentation-detail"
+								}
+							]
+						},
+						{
+							"include": "#flow-mapping"
+						},
+						{
+							"include": "#flow-sequence"
+						}
+					]
+				},
+				{
+					"include": "#anchor-property"
+				},
+				{
+					"include": "#tag-property"
+				},
+				{
+					"include": "#alias"
+				},
+				{
+					"begin": "(?=\"|')",
+					"end": "(?=[:,\\]}])",
+					"patterns": [
+						{
+							"begin": "(?!\\G)",
+							"end": "(?=[:,\\]}])",
+							"patterns": [
+								{
+									"include": "#presentation-detail"
+								}
+							]
+						},
+						{
+							"include": "#double"
+						},
+						{
+							"include": "#single"
+						}
+					]
+				},
+				{
+					"include": "#flow-plain-in"
+				},
+				{
+					"include": "#presentation-detail"
+				}
+			]
+		},
+		"flow-mapping": {
+			"comment": "https://yaml.org/spec/1.2.2/#742-flow-mappings",
+			"begin": "{",
+			"end": "}",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.mapping.begin.yaml"
+				}
+			},
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.mapping.end.yaml"
+				}
+			},
+			"name": "meta.flow.mapping.yaml",
+			"patterns": [
+				{
+					"comment": "https://yaml.org/spec/1.2.2/#rule-ns-s-flow-map-entries",
+					"begin": "(?<={)\\G(?=[\\x{85 2028 2029}\r\n\t ,#])|,",
+					"end": "(?=[^\\x{85 2028 2029}\r\n\t ,#])",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.separator.mapping.yaml"
+						}
+					},
+					"patterns": [
+						{
+							"match": ",++",
+							"name": "invalid.illegal.separator.sequence.yaml"
+						},
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				},
+				{
+					"include": "#flow-mapping-map-key"
+				},
+				{
+					"include": "#flow-map-value-yaml"
+				},
+				{
+					"include": "#flow-map-value-json"
+				},
+				{
+					"include": "#flow-node"
+				}
+			]
+		},
+		"flow-sequence": {
+			"comment": "https://yaml.org/spec/1.2.2/#741-flow-sequences",
+			"begin": "\\[",
+			"end": "]",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.sequence.begin.yaml"
+				}
+			},
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.sequence.end.yaml"
+				}
+			},
+			"name": "meta.flow.sequence.yaml",
+			"patterns": [
+				{
+					"comment": "https://yaml.org/spec/1.2.2/#rule-ns-s-flow-seq-entries",
+					"begin": "(?<=\\[)\\G(?=[\\x{85 2028 2029}\r\n\t ,#])|,",
+					"end": "(?=[^\\x{85 2028 2029}\r\n\t ,#])",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.separator.sequence.yaml"
+						}
+					},
+					"patterns": [
+						{
+							"match": ",++",
+							"name": "invalid.illegal.separator.sequence.yaml"
+						},
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				},
+				{
+					"include": "#flow-sequence-map-key"
+				},
+				{
+					"include": "#flow-map-value-yaml"
+				},
+				{
+					"include": "#flow-map-value-json"
+				},
+				{
+					"include": "#flow-node"
+				}
+			]
+		},
+		"flow-mapping-map-key": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-ns-flow-map-entry (FLOW-IN)",
+			"patterns": [
+				{
+					"begin": "\\?(?=[\\x{85 2028 2029}\r\n\t ,\\[\\]{}])",
+					"end": "(?=[,\\[\\]{}])",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.map.key.yaml"
+						}
+					},
+					"name": "meta.flow.map.explicit.yaml",
+					"patterns": [
+						{
+							"include": "#flow-mapping-map-key"
+						},
+						{
+							"include": "#flow-map-value-yaml"
+						},
+						{
+							"include": "#flow-map-value-json"
+						},
+						{
+							"include": "#flow-node"
+						}
+					]
+				},
+				{
+					"comment": "https://yaml.org/spec/1.2.2/#rule-ns-flow-map-implicit-entry (FLOW-IN)",
+					"begin": "(?=(?>[^-?:,\\[\\]{}#&*!|>'\"%@` \\p{Cntrl}\\p{Surrogate}\\x{FFFE FFFF}]|[?:-](?![\\x{85 2028 2029}\r\n\t ,\\[\\]{}])))",
+					"end": "(?=[,\\[\\]{}])",
+					"name": "meta.flow.map.implicit.yaml",
+					"patterns": [
+						{
+							"include": "#flow-key-plain-in"
+						},
+						{
+							"match": ":(?=\\[|{)",
+							"name": "invalid.illegal.separator.map.yaml"
+						},
+						{
+							"include": "#flow-map-value-yaml"
+						},
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				},
+				{
+					"comment": "https://yaml.org/spec/1.2.2/#rule-ns-flow-map-implicit-entry (FLOW-IN)",
+					"begin": "(?=\"|')",
+					"end": "(?=[,\\[\\]{}])",
+					"name": "meta.flow.map.implicit.yaml",
+					"patterns": [
+						{
+							"include": "#key-double"
+						},
+						{
+							"include": "source.yaml#key-single"
+						},
+						{
+							"include": "#flow-map-value-json"
+						},
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				}
+			]
+		},
+		"flow-sequence-map-key": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-ns-flow-map-entry (FLOW-IN)",
+			"patterns": [
+				{
+					"begin": "\\?(?=[\\x{85 2028 2029}\r\n\t ,\\[\\]{}])",
+					"end": "(?=[,\\[\\]{}])",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.map.key.yaml"
+						}
+					},
+					"name": "meta.flow.map.explicit.yaml",
+					"patterns": [
+						{
+							"include": "#flow-mapping-map-key"
+						},
+						{
+							"include": "#flow-map-value-yaml"
+						},
+						{
+							"include": "#flow-map-value-json"
+						},
+						{
+							"include": "#flow-node"
+						}
+					]
+				},
+				{
+					"comment": "https://yaml.org/spec/1.2.2/#rule-ns-flow-map-implicit-entry (FLOW-IN)",
+					"begin": "(?<=[\t ,\\[{]|^)(?=(?>[^-?:,\\[\\]{}#&*!|>'\"%@` \\p{Cntrl}\\p{Surrogate}\\x{FFFE FFFF}]|[?:-](?![\\x{85 2028 2029}\r\n\t ,\\[\\]{}]))(?>[^:#,\\[\\]{}]++|:(?![\\x{85 2028 2029}\r\n\t ,\\[\\]{}])|(?<! |\t)#++)*+:[\\x{85 2028 2029}\r\n\t ,\\[\\]{}])",
+					"end": "(?=[,\\[\\]{}])",
+					"name": "meta.flow.map.implicit.yaml",
+					"patterns": [
+						{
+							"include": "#flow-key-plain-in"
+						},
+						{
+							"match": ":(?=\\[|{)",
+							"name": "invalid.illegal.separator.map.yaml"
+						},
+						{
+							"include": "#flow-map-value-yaml"
+						},
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				},
+				{
+					"comment": "https://yaml.org/spec/1.2.2/#rule-ns-flow-map-implicit-entry (FLOW-IN)",
+					"begin": "(?=(?>\"(?>[^\\\\\"]++|\\\\.)*+\"|'(?>[^']++|'')*+')[\t ]*+:)",
+					"end": "(?=[,\\[\\]{}])",
+					"name": "meta.flow.map.implicit.yaml",
+					"patterns": [
+						{
+							"include": "#key-double"
+						},
+						{
+							"include": "source.yaml#key-single"
+						},
+						{
+							"include": "#flow-map-value-json"
+						},
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				}
+			]
+		},
+		"flow-map-value-yaml": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-c-ns-flow-map-separate-value (FLOW-IN)",
+			"begin": ":(?=[\\x{85 2028 2029}\r\n\t ,\\[\\]{}])",
+			"end": "(?=[,\\]}])",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.separator.map.value.yaml"
+				}
+			},
+			"name": "meta.flow.pair.value.yaml",
+			"patterns": [
+				{
+					"include": "#flow-node"
+				}
+			]
+		},
+		"flow-map-value-json": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-c-ns-flow-map-separate-value (FLOW-IN)",
+			"begin": "(?<=(?>[\"'\\]}]|^)[\t ]*+):",
+			"end": "(?=[,\\]}])",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.separator.map.value.yaml"
+				}
+			},
+			"name": "meta.flow.pair.value.yaml",
+			"patterns": [
+				{
+					"include": "#flow-node"
+				}
+			]
+		},
+		"flow-plain-in": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-ns-plain-multi-line (FLOW-IN)",
+			"begin": "(?=[^-?:,\\[\\]{}#&*!|>'\"%@` \\p{Cntrl}\\p{Surrogate}\\x{FFFE FFFF}]|[?:-](?![\\x{85 2028 2029}\r\n\t ,\\[\\]{}]))",
+			"end": "(?=(?>[\t ]++|\\G)#|[\t ]*+[,\\[\\]{}])",
+			"name": "string.unquoted.plain.in.yaml",
+			"patterns": [
+				{
+					"include": "#tag-implicit-plain-in"
+				},
+				{
+					"match": "\\G[\t ]++",
+					"name": "punctuation.whitespace.separator.yaml"
+				},
+				{
+					"match": "[\t ]++$",
+					"name": "punctuation.whitespace.separator.yaml"
+				},
+				{
+					"match": ":(?=[\\x{85 2028 2029}\r\n\t ,\\[\\]{}])",
+					"name": "invalid.illegal.multiline-key.yaml"
+				},
+				{
+					"include": "source.yaml#non-printable"
+				}
+			]
+		},
+		"flow-key-plain-out": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-ns-plain-one-line (FLOW-OUT)",
+			"begin": "(?=[^-?:,\\[\\]{}#&*!|>'\"%@` \\p{Cntrl}\\p{Surrogate}\\x{FFFE FFFF}]|[?:-](?![\\x{85 2028 2029}\r\n\t ]))",
+			"end": "(?=[\t ]*+:[\\x{85 2028 2029}\r\n\t ]|[\t ]++#)",
+			"name": "meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
+			"patterns": [
+				{
+					"include": "#tag-implicit-plain-out"
+				},
+				{
+					"match": "\\G[\t ]++",
+					"name": "punctuation.whitespace.separator.yaml"
+				},
+				{
+					"match": "[\t ]++$",
+					"name": "punctuation.whitespace.separator.yaml"
+				},
+				{
+					"include": "source.yaml#non-printable"
+				}
+			]
+		},
+		"flow-key-plain-in": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-ns-s-implicit-yaml-key (FLOW-KEY)",
+			"begin": "\\G(?![\\x{85 2028 2029}\r\n\t #])",
+			"end": "(?=[\t ]*+(?>:[\\x{85 2028 2029}\r\n\t ,\\[\\]{}]|[,\\[\\]{}])|[\t ]++#)",
+			"name": "meta.flow.map.key.yaml string.unquoted.plain.in.yaml entity.name.tag.yaml",
+			"patterns": [
+				{
+					"include": "#tag-implicit-plain-in"
+				},
+				{
+					"include": "source.yaml#non-printable"
+				}
+			]
+		},
+		"key-double": {
+			"comment": "https://yaml.org/spec/1.2.2/#double-quoted-style (FLOW-OUT)",
+			"begin": "\"",
+			"end": "\"",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.yaml"
+				}
+			},
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.yaml"
+				}
+			},
+			"name": "meta.map.key.yaml string.quoted.double.yaml entity.name.tag.yaml",
+			"patterns": [
+				{
+					"match": "[^\t -\\x{10FFFF}]++",
+					"name": "invalid.illegal.character.yaml"
+				},
+				{
+					"include": "#double-escape"
+				}
+			]
+		},
+		"double": {
+			"comment": "https://yaml.org/spec/1.2.2/#double-quoted-style",
+			"begin": "\"",
+			"end": "\"",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.yaml"
+				}
+			},
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.yaml"
+				}
+			},
+			"name": "string.quoted.double.yaml",
+			"patterns": [
+				{
+					"match": "(?<!\")\\G[\t ]++",
+					"name": "punctuation.whitespace.separator.yaml"
+				},
+				{
+					"match": "[\t ]++$",
+					"name": "punctuation.whitespace.separator.yaml"
+				},
+				{
+					"match": "[^\\x{85 2028 2029}\r\n\t -\\x{10FFFF}]++",
+					"name": "invalid.illegal.character.yaml"
+				},
+				{
+					"include": "#double-escape"
+				}
+			]
+		},
+		"single": {
+			"comment": "https://yaml.org/spec/1.2.2/#single-quoted-style",
+			"begin": "'",
+			"end": "'(?!')",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.yaml"
+				}
+			},
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.yaml"
+				}
+			},
+			"name": "string.quoted.single.yaml",
+			"patterns": [
+				{
+					"match": "(?<!')\\G[\t ]++",
+					"name": "punctuation.whitespace.separator.yaml"
+				},
+				{
+					"match": "[\t ]++$",
+					"name": "punctuation.whitespace.separator.yaml"
+				},
+				{
+					"match": "[^\\x{85 2028 2029}\r\n\t -\\x{10FFFF}]++",
+					"name": "invalid.illegal.character.yaml"
+				},
+				{
+					"match": "''",
+					"name": "constant.character.escape.single-quote.yaml"
+				}
+			]
+		},
+		"double-escape": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-c-ns-esc-char",
+			"patterns": [
+				{
+					"match": "\\\\[\\x{85 2028 2029}\r\n\t0abtnvfre \"\\\\N_LP]",
+					"name": "constant.character.escape.yaml"
+				},
+				{
+					"match": "\\\\x[0-9a-fA-F]{2}",
+					"name": "constant.character.escape.unicode.8-bit.yaml"
+				},
+				{
+					"match": "\\\\u[0-9a-fA-F]{4}",
+					"name": "constant.character.escape.unicode.16-bit.yaml"
+				},
+				{
+					"match": "\\\\U[0-9a-fA-F]{8}",
+					"name": "constant.character.escape.unicode.32-bit.yaml"
+				},
+				{
+					"match": "\\\\(?>x[^\"]{2,0}|u[^\"]{4,0}|U[^\"]{8,0}|.)",
+					"name": "invalid.illegal.constant.character.escape.yaml"
+				}
+			]
+		},
+		"tag-implicit-plain-in": {
+			"comment": "https://yaml.org/type/index.html",
+			"patterns": [
+				{
+					"match": "\\G(?>null|Null|NULL|~)(?=[\t ]++#|[\t ]*+(?>[\\x{85 2028 2029}\r\n,\\]}]|:[\\x{85 2028 2029}\r\n\t ,\\[\\]{}]))",
+					"name": "constant.language.null.yaml"
+				},
+				{
+					"match": "\\G(?>true|True|TRUE|false|False|FALSE|y|Y|yes|Yes|YES|n|N|no|No|NO|on|On|ON|off|Off|OFF)(?=[\t ]++#|[\t ]*+(?>[\\x{85 2028 2029}\r\n,\\]}]|:[\\x{85 2028 2029}\r\n\t ,\\[\\]{}]))",
+					"name": "constant.language.boolean.yaml"
+				},
+				{
+					"match": "\\G[-+]?+(0|[1-9][0-9_]*+)(?=[\t ]++#|[\t ]*+(?>[\\x{85 2028 2029}\r\n,\\]}]|:[\\x{85 2028 2029}\r\n\t ,\\[\\]{}]))",
+					"name": "constant.numeric.integer.decimal.yaml"
+				},
+				{
+					"match": "\\G[-+]?+0b[0-1_]++(?=[\t ]++#|[\t ]*+(?>[\\x{85 2028 2029}\r\n,\\]}]|:[\\x{85 2028 2029}\r\n\t ,\\[\\]{}]))",
+					"name": "constant.numeric.integer.binary.yaml"
+				},
+				{
+					"match": "\\G[-+]?0[0-7_]++(?=[\t ]++#|[\t ]*+(?>[\\x{85 2028 2029}\r\n,\\]}]|:[\\x{85 2028 2029}\r\n\t ,\\[\\]{}]))",
+					"name": "constant.numeric.integer.octal.yaml"
+				},
+				{
+					"match": "\\G[-+]?+0x[0-9a-fA-F_]++(?=[\t ]++#|[\t ]*+(?>[\\x{85 2028 2029}\r\n,\\]}]|:[\\x{85 2028 2029}\r\n\t ,\\[\\]{}]))",
+					"name": "constant.numeric.integer.hexadecimal.yaml"
+				},
+				{
+					"match": "\\G[-+]?+[1-9][0-9_]*+(?>:[0-5]?[0-9])++(?=[\t ]++#|[\t ]*+(?>[\\x{85 2028 2029}\r\n,\\]}]|:[\\x{85 2028 2029}\r\n\t ,\\[\\]{}]))",
+					"name": "constant.numeric.integer.Sexagesimal.yaml"
+				},
+				{
+					"match": "\\G[-+]?+(?>[0-9][0-9_]*+)?+\\.[0-9.]*+(?>[eE][-+][0-9]+)?+(?=[\t ]++#|[\t ]*+(?>[\\x{85 2028 2029}\r\n,\\]}]|:[\\x{85 2028 2029}\r\n\t ,\\[\\]{}]))",
+					"name": "constant.numeric.float.decimal.yaml"
+				},
+				{
+					"match": "\\G[-+]?+[0-9][0-9_]*+(?>:[0-5]?[0-9])++\\.[0-9_]*+(?=[\t ]++#|[\t ]*+(?>[\\x{85 2028 2029}\r\n,\\]}]|:[\\x{85 2028 2029}\r\n\t ,\\[\\]{}]))",
+					"name": "constant.numeric.float.Sexagesimal.yaml"
+				},
+				{
+					"match": "\\G[-+]?+\\.(?>inf|Inf|INF)(?=[\t ]++#|[\t ]*+(?>[\\x{85 2028 2029}\r\n,\\]}]|:[\\x{85 2028 2029}\r\n\t ,\\[\\]{}]))",
+					"name": "constant.numeric.float.inf.yaml"
+				},
+				{
+					"match": "\\G\\.(?>nan|NaN|NAN)(?=[\t ]++#|[\t ]*+(?>[\\x{85 2028 2029}\r\n,\\]}]|:[\\x{85 2028 2029}\r\n\t ,\\[\\]{}]))",
+					"name": "constant.numeric.float.nan.yaml"
+				},
+				{
+					"comment": "https://www.w3.org/TR/NOTE-datetime does not allow spaces, however https://yaml.org/type/timestamp.html does, but the provided regex doesn't match the TZD space in many of the YAML examples",
+					"match": "\\G(?>[0-9]{4}-[0-9]{2,1}-[0-9]{2,1}(?>T|t|[\t ]++)[0-9]{2,1}:[0-9]{2}:[0-9]{2}(?>\\.[0-9]*+)?+[\t ]*+(?>Z|[-+][0-9]{2,1}(?>:[0-9]{2})?+)?+|[0-9]{4}-[0-9]{2}-[0-9]{2})(?=[\t ]++#|[\t ]*+(?>[\\x{85 2028 2029}\r\n,\\]}]|:[\\x{85 2028 2029}\r\n\t ,\\[\\]{}]))",
+					"name": "constant.numeric.timestamp.yaml"
+				},
+				{
+					"match": "\\G<<(?=[\t ]++#|[\t ]*+(?>[\\x{85 2028 2029}\r\n,\\]}]|:[\\x{85 2028 2029}\r\n\t ,\\[\\]{}]))",
+					"name": "constant.language.merge.yaml"
+				},
+				{
+					"match": "\\G=(?=[\t ]++#|[\t ]*+(?>[\\x{85 2028 2029}\r\n,\\]}]|:[\\x{85 2028 2029}\r\n\t ,\\[\\]{}]))",
+					"name": "constant.language.value.yaml"
+				},
+				{
+					"match": "\\G(?>!|&|\\*)(?=[\t ]++#|[\t ]*+(?>[\\x{85 2028 2029}\r\n,\\]}]|:[\\x{85 2028 2029}\r\n\t ,\\[\\]{}]))",
+					"name": "constant.language.yaml.yaml"
+				}
+			]
+		},
+		"tag-implicit-plain-out": {
+			"comment": "https://yaml.org/type/index.html",
+			"patterns": [
+				{
+					"match": "\\G(?>null|Null|NULL|~)(?=[\t ]++#|[\t ]*+(?>$|:[\\x{85 2028 2029}\r\n\t ]))",
+					"name": "constant.language.null.yaml"
+				},
+				{
+					"match": "\\G(?>true|True|TRUE|false|False|FALSE|yes|Yes|YES|y|Y|no|No|NO|n|N|on|On|ON|off|Off|OFF)(?=[\t ]++#|[\t ]*+(?>$|:[\\x{85 2028 2029}\r\n\t ]))",
+					"name": "constant.language.boolean.yaml"
+				},
+				{
+					"match": "\\G[-+]?+(0|[1-9][0-9_]*+)(?=[\t ]++#|[\t ]*+(?>$|:[\\x{85 2028 2029}\r\n\t ]))",
+					"name": "constant.numeric.integer.decimal.yaml"
+				},
+				{
+					"match": "\\G[-+]?+0b[0-1_]++(?=[\t ]++#|[\t ]*+(?>$|:[\\x{85 2028 2029}\r\n\t ]))",
+					"name": "constant.numeric.integer.binary.yaml"
+				},
+				{
+					"match": "\\G[-+]?0[0-7_]++(?=[\t ]++#|[\t ]*+(?>$|:[\\x{85 2028 2029}\r\n\t ]))",
+					"name": "constant.numeric.integer.octal.yaml"
+				},
+				{
+					"match": "\\G[-+]?+0x[0-9a-fA-F_]++(?=[\t ]++#|[\t ]*+(?>$|:[\\x{85 2028 2029}\r\n\t ]))",
+					"name": "constant.numeric.integer.hexadecimal.yaml"
+				},
+				{
+					"match": "\\G[-+]?+[1-9][0-9_]*+(?>:[0-5]?[0-9])++(?=[\t ]++#|[\t ]*+(?>$|:[\\x{85 2028 2029}\r\n\t ]))",
+					"name": "constant.numeric.integer.Sexagesimal.yaml"
+				},
+				{
+					"match": "\\G[-+]?+(?>[0-9][0-9_]*+)?+\\.[0-9.]*+(?>[eE][-+][0-9]+)?+(?=[\t ]++#|[\t ]*+(?>$|:[\\x{85 2028 2029}\r\n\t ]))",
+					"name": "constant.numeric.float.decimal.yaml"
+				},
+				{
+					"match": "\\G[-+]?+[0-9][0-9_]*+(?>:[0-5]?[0-9])++\\.[0-9_]*+(?=[\t ]++#|[\t ]*+(?>$|:[\\x{85 2028 2029}\r\n\t ]))",
+					"name": "constant.numeric.float.Sexagesimal.yaml"
+				},
+				{
+					"match": "\\G[-+]?+\\.(?>inf|Inf|INF)(?=[\t ]++#|[\t ]*+(?>$|:[\\x{85 2028 2029}\r\n\t ]))",
+					"name": "constant.numeric.float.inf.yaml"
+				},
+				{
+					"match": "\\G\\.(?>nan|NaN|NAN)(?=[\t ]++#|[\t ]*+(?>$|:[\\x{85 2028 2029}\r\n\t ]))",
+					"name": "constant.numeric.float.nan.yaml"
+				},
+				{
+					"comment": "https://www.w3.org/TR/NOTE-datetime does not allow spaces, however https://yaml.org/type/timestamp.html does, but the provided regex doesn't match the TZD space in many of the YAML examples",
+					"match": "\\G(?>[0-9]{4}-[0-9]{2,1}-[0-9]{2,1}(?>T|t|[\t ]++)[0-9]{2,1}:[0-9]{2}:[0-9]{2}(?>\\.[0-9]*+)?+[\t ]*+(?>Z|[-+][0-9]{2,1}(?>:[0-9]{2})?+)?+|[0-9]{4}-[0-9]{2}-[0-9]{2})(?=[\t ]++#|[\t ]*+(?>$|:[\\x{85 2028 2029}\r\n\t ]))",
+					"name": "constant.numeric.timestamp.yaml"
+				},
+				{
+					"match": "\\G<<(?=[\t ]++#|[\t ]*+(?>$|:[\\x{85 2028 2029}\r\n\t ]))",
+					"name": "constant.language.merge.yaml"
+				},
+				{
+					"match": "\\G=(?=[\t ]++#|[\t ]*+(?>$|:[\\x{85 2028 2029}\r\n\t ]))",
+					"name": "constant.language.value.yaml"
+				},
+				{
+					"match": "\\G(?>!|&|\\*)(?=[\t ]++#|[\t ]*+(?>$|:[\\x{85 2028 2029}\r\n\t ]))",
+					"name": "constant.language.yaml.yaml"
+				}
+			]
+		},
+		"tag-property": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-c-ns-tag-property",
+			"//": [
+				"!",
+				"!!",
+				"!<>",
+				"!...",
+				"!!...",
+				"!<...>",
+				"!...!..."
+			],
+			"patterns": [
+				{
+					"match": "!(?=[\\x{85 2028 2029}\r\n\t ])",
+					"name": "storage.type.tag.non-specific.yaml punctuation.definition.tag.non-specific.yaml"
+				},
+				{
+					"comment": "https://yaml.org/spec/1.2.2/#rule-c-verbatim-tag",
+					"begin": "!<",
+					"end": ">",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.begin.yaml"
+						}
+					},
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.yaml"
+						}
+					},
+					"name": "storage.type.tag.verbatim.yaml",
+					"patterns": [
+						{
+							"match": "%[0-9a-fA-F]{2}",
+							"name": "constant.character.escape.unicode.8-bit.yaml"
+						},
+						{
+							"match": "%[^\\x{85 2028 2029}\r\n\t ]{2,0}",
+							"name": "invalid.illegal.constant.character.escape.unicode.8-bit.yaml"
+						},
+						{
+							"include": "source.yaml#non-printable"
+						},
+						{
+							"match": "[^\\x{85 2028 2029}\r\n\t a-zA-Z0-9-#;/?:@&=+$,_.!~*'()\\[\\]%>]++",
+							"name": "invalid.illegal.unrecognized.yaml"
+						}
+					]
+				},
+				{
+					"comment": "https://yaml.org/spec/1.2.2/#rule-c-ns-shorthand-tag",
+					"begin": "(?=!)",
+					"end": "(?=[\\x{85 2028 2029}\r\n\t ,\\[\\]{}])",
+					"name": "storage.type.tag.shorthand.yaml",
+					"patterns": [
+						{
+							"comment": "https://yaml.org/spec/1.2.2/#rule-c-secondary-tag-handle",
+							"match": "\\G!!",
+							"name": "punctuation.definition.tag.secondary.yaml"
+						},
+						{
+							"comment": "https://yaml.org/spec/1.2.2/#rule-c-secondary-tag-handle",
+							"match": "\\G(!)[0-9A-Za-z-]++(!)",
+							"captures": {
+								"1": {
+									"name": "punctuation.definition.tag.named.yaml"
+								},
+								"2": {
+									"name": "punctuation.definition.tag.named.yaml"
+								}
+							}
+						},
+						{
+							"comment": "https://yaml.org/spec/1.2.2/#rule-c-primary-tag-handle",
+							"match": "\\G!",
+							"name": "punctuation.definition.tag.primary.yaml"
+						},
+						{
+							"match": "%[0-9a-fA-F]{2}",
+							"name": "constant.character.escape.unicode.8-bit.yaml"
+						},
+						{
+							"match": "%[^\\x{85 2028 2029}\r\n\t ]{2,0}",
+							"name": "invalid.illegal.constant.character.escape.unicode.8-bit.yaml"
+						},
+						{
+							"include": "source.yaml#non-printable"
+						},
+						{
+							"match": "[^\\x{85 2028 2029}\r\n\t a-zA-Z0-9-#;/?:@&=+$,_.~*'()\\[\\]%]++",
+							"name": "invalid.illegal.unrecognized.yaml"
+						}
+					]
+				}
+			]
+		},
+		"anchor-property": {
+			"match": "(&)([^ \\p{Cntrl}\\p{Surrogate}\\x{2028 2029 FFFE FFFF}]++)|(&)",
+			"captures": {
+				"0": {
+					"name": "keyword.control.flow.anchor.yaml"
+				},
+				"1": {
+					"name": "punctuation.definition.anchor.yaml"
+				},
+				"2": {
+					"name": "variable.other.anchor.yaml"
+				},
+				"3": {
+					"name": "invalid.illegal.flow.anchor.yaml"
+				}
+			}
+		},
+		"alias": {
+			"begin": "(\\*)([^ \\p{Cntrl}\\p{Surrogate}\\x{2028 2029 FFFE FFFF}]++)|(\\*)",
+			"end": "(?=:[\\x{85 2028 2029}\r\n\t ,\\[\\]{}]|[,\\[\\]{}])",
+			"captures": {
+				"0": {
+					"name": "keyword.control.flow.alias.yaml"
+				},
+				"1": {
+					"name": "punctuation.definition.alias.yaml"
+				},
+				"2": {
+					"name": "variable.other.alias.yaml"
+				},
+				"3": {
+					"name": "invalid.illegal.flow.alias.yaml"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#presentation-detail"
+				}
+			]
+		},
+		"byte-order-mark": {
+			"comment": "",
+			"begin": "\\G",
+			"while": "\\G(?=[\\x{FEFF 85 2028 2029}\r\n\t ])",
+			"patterns": [
+				{
+					"begin": "(?=#)",
+					"while": "\\G",
+					"patterns": [
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				},
+				{
+					"begin": "\\G\\x{FEFF}",
+					"while": "\\G",
+					"beginCaptures": {
+						"0": {
+							"name": "byte-order-mark.yaml"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				},
+				{
+					"include": "#presentation-detail"
+				}
+			]
+		},
+		"presentation-detail": {
+			"patterns": [
+				{
+					"match": "[\t ]++",
+					"name": "punctuation.whitespace.separator.yaml"
+				},
+				{
+					"comment": "https://yaml.org/spec/1.1/#id871136",
+					"match": "[\\x{85 2028 2029}\r\n]++",
+					"name": "punctuation.separator.line-break.yaml"
+				},
+				{
+					"include": "source.yaml#non-printable"
+				},
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#unknown"
+				}
+			]
+		},
+		"comment": {
+			"comment": "Comments must be separated from other tokens by white space characters. `space`, `newline` or `carriage-return`. `#(.*)` causes performance issues",
+			"begin": "(?<=^|[\\x{FEFF 85 2028 2029} ])#",
+			"end": "[\\x{85 2028 2029}\r\n]",
+			"captures": {
+				"0": {
+					"name": "punctuation.definition.comment.yaml"
+				}
+			},
+			"name": "comment.line.number-sign.yaml",
+			"patterns": [
+				{
+					"include": "source.yaml#non-printable"
+				}
+			]
+		},
+		"unknown": {
+			"match": ".[[^\\x{85 2028 2029}#\"':,\\[\\]{}]&&!-~\\x{A0}-\\x{D7FF}\\x{E000}-\\x{FFFD}\\x{010000}-\\x{10FFFF}]*+",
+			"name": "invalid.illegal.unrecognized.yaml"
+		}
+	}
+}
\ No newline at end of file
diff --git a/extensions/yaml/syntaxes/yaml-1.2.tmLanguage.json b/extensions/yaml/syntaxes/yaml-1.2.tmLanguage.json
new file mode 100644
index 00000000000..5571102d9e0
--- /dev/null
+++ b/extensions/yaml/syntaxes/yaml-1.2.tmLanguage.json
@@ -0,0 +1,1635 @@
+{
+	"information_for_contributors": [
+		"This file has been converted from https://github.com/RedCMD/YAML-Syntax-Highlighter/blob/master/syntaxes/yaml-1.2.tmLanguage.json",
+		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
+		"Once accepted there, we are happy to receive an update request."
+	],
+	"version": "https://github.com/RedCMD/YAML-Syntax-Highlighter/commit/71a88711ec184b7dde5240c8f150ad3c2dbbd5f1",
+	"name": "YAML 1.2",
+	"scopeName": "source.yaml.1.2",
+	"comment": "https://yaml.org/spec/1.2.2",
+	"patterns": [
+		{
+			"include": "#stream"
+		}
+	],
+	"repository": {
+		"stream": {
+			"patterns": [
+				{
+					"comment": "allows me to just use `\\G` instead of the performance heavy `(^|\\G)`",
+					"begin": "^(?!\\G)",
+					"while": "^",
+					"name": "meta.stream.yaml",
+					"patterns": [
+						{
+							"include": "#byte-order-mark"
+						},
+						{
+							"include": "#directives"
+						},
+						{
+							"include": "#document"
+						},
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				},
+				{
+					"comment": "For when YAML is embedded inside a Markdown code-block",
+					"begin": "\\G",
+					"while": "\\G",
+					"name": "meta.stream.yaml",
+					"patterns": [
+						{
+							"include": "#byte-order-mark"
+						},
+						{
+							"include": "#directives"
+						},
+						{
+							"include": "#document"
+						},
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				}
+			]
+		},
+		"directive-YAML": {
+			"comment": "https://yaml.org/spec/1.2.2/#681-yaml-directives",
+			"begin": "(?=%YAML[\t ]+1\\.2(?=[\r\n\t ]))",
+			"end": "\\G(?=(?>\\.{3}|---)[\r\n\t ])",
+			"name": "meta.1.2.yaml",
+			"patterns": [
+				{
+					"comment": "https://yaml.org/spec/1.2.2/#681-yaml-directives",
+					"begin": "\\G(%)(YAML)([\t ]+)(1\\.2)",
+					"end": "\\G(?=---[\r\n\t ])",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.directive.begin.yaml"
+						},
+						"2": {
+							"name": "keyword.other.directive.yaml.yaml"
+						},
+						"3": {
+							"name": "punctuation.whitespace.separator.yaml"
+						},
+						"4": {
+							"name": "constant.numeric.yaml-version.yaml"
+						}
+					},
+					"name": "meta.directives.yaml",
+					"patterns": [
+						{
+							"include": "#directive-invalid"
+						},
+						{
+							"include": "#directives"
+						},
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				},
+				{
+					"include": "#document"
+				}
+			]
+		},
+		"directives": {
+			"comment": "https://yaml.org/spec/1.2.2/#68-directives",
+			"patterns": [
+				{
+					"include": "source.yaml.1.3#directive-YAML"
+				},
+				{
+					"include": "source.yaml.1.2#directive-YAML"
+				},
+				{
+					"include": "source.yaml.1.1#directive-YAML"
+				},
+				{
+					"include": "source.yaml.1.0#directive-YAML"
+				},
+				{
+					"begin": "(?=%)",
+					"while": "\\G(?!%|---[\r\n\t ])",
+					"name": "meta.directives.yaml",
+					"patterns": [
+						{
+							"comment": "https://yaml.org/spec/1.2.2/#682-tag-directives",
+							"begin": "\\G(%)(TAG)(?>([\t ]++)((!)(?>[0-9A-Za-z-]*+(!))?+))?+",
+							"end": "$",
+							"applyEndPatternLast": true,
+							"beginCaptures": {
+								"1": {
+									"name": "punctuation.definition.directive.begin.yaml"
+								},
+								"2": {
+									"name": "keyword.other.directive.tag.yaml"
+								},
+								"3": {
+									"name": "punctuation.whitespace.separator.yaml"
+								},
+								"4": {
+									"name": "storage.type.tag-handle.yaml"
+								},
+								"5": {
+									"name": "punctuation.definition.tag.begin.yaml"
+								},
+								"6": {
+									"name": "punctuation.definition.tag.end.yaml"
+								},
+								"comment": "https://yaml.org/spec/1.2.2/#rule-c-tag-handle"
+							},
+							"patterns": [
+								{
+									"comment": "technically the beginning should only validate against a valid uri scheme [A-Za-z][A-Za-z0-9.+-]*",
+									"begin": "\\G[\t ]++(?!#)",
+									"end": "(?=[\r\n\t ])",
+									"beginCaptures": {
+										"0": {
+											"name": "punctuation.whitespace.separator.yaml"
+										}
+									},
+									"contentName": "support.type.tag-prefix.yaml",
+									"patterns": [
+										{
+											"match": "%[0-9a-fA-F]{2}",
+											"name": "constant.character.escape.unicode.8-bit.yaml"
+										},
+										{
+											"match": "%[^\r\n\t ]{2,0}",
+											"name": "invalid.illegal.constant.character.escape.unicode.8-bit.yaml"
+										},
+										{
+											"match": "\\G[,\\[\\]{}]",
+											"name": "invalid.illegal.character.uri.yaml"
+										},
+										{
+											"include": "source.yaml#non-printable"
+										},
+										{
+											"match": "[^\r\n\t a-zA-Z0-9-#;/?:@&=+$,_.!~*'()\\[\\]]++",
+											"name": "invalid.illegal.unrecognized.yaml"
+										}
+									]
+								},
+								{
+									"include": "#presentation-detail"
+								}
+							]
+						},
+						{
+							"comment": "https://yaml.org/spec/1.2.2/#rule-ns-reserved-directive",
+							"begin": "(%)([\\x{85}[^ \\p{Cntrl}\\p{Surrogate}\\x{FEFF FFFE FFFF}]]++)",
+							"end": "$",
+							"beginCaptures": {
+								"1": {
+									"name": "punctuation.definition.directive.begin.yaml"
+								},
+								"2": {
+									"name": "keyword.other.directive.other.yaml"
+								}
+							},
+							"patterns": [
+								{
+									"match": "\\G([\t ]++)([\\x{85}[^ \\p{Cntrl}\\p{Surrogate}\\x{FEFF FFFE FFFF}]]++)",
+									"captures": {
+										"1": {
+											"name": "punctuation.whitespace.separator.yaml"
+										},
+										"2": {
+											"name": "string.unquoted.directive-name.yaml"
+										}
+									}
+								},
+								{
+									"match": "([\t ]++)([\\x{85}[^ \\p{Cntrl}\\p{Surrogate}\\x{FEFF FFFE FFFF}]]++)",
+									"captures": {
+										"1": {
+											"name": "punctuation.whitespace.separator.yaml"
+										},
+										"2": {
+											"name": "string.unquoted.directive-parameter.yaml"
+										}
+									}
+								},
+								{
+									"include": "#presentation-detail"
+								}
+							]
+						},
+						{
+							"match": "\\G\\.{3}(?=[\r\n\t ])",
+							"name": "invalid.illegal.entity.other.document.end.yaml"
+						},
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				}
+			]
+		},
+		"directive-invalid": {
+			"patterns": [
+				{
+					"match": "\\G\\.{3}(?=[\r\n\t ])",
+					"name": "invalid.illegal.entity.other.document.end.yaml"
+				},
+				{
+					"begin": "\\G(%)(YAML)",
+					"end": "$",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.directive.begin.yaml"
+						},
+						"2": {
+							"name": "invalid.illegal.keyword.other.directive.yaml.yaml"
+						}
+					},
+					"name": "meta.directive.yaml",
+					"patterns": [
+						{
+							"match": "\\G([\t ]++|:)([0-9]++\\.[0-9]++)?+",
+							"captures": {
+								"1": {
+									"name": "punctuation.whitespace.separator.yaml"
+								},
+								"2": {
+									"name": "constant.numeric.yaml-version.yaml"
+								}
+							}
+						},
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				}
+			]
+		},
+		"document": {
+			"comment": "https://yaml.org/spec/1.2.2/#91-documents",
+			"patterns": [
+				{
+					"begin": "---(?=[\r\n\t ])",
+					"while": "\\G(?!(?>\\.{3}|---)[\r\n\t ])",
+					"beginCaptures": {
+						"0": {
+							"name": "entity.other.document.begin.yaml"
+						}
+					},
+					"name": "meta.document.yaml",
+					"patterns": [
+						{
+							"include": "#block-node"
+						}
+					]
+				},
+				{
+					"begin": "(?=\\.{3}[\r\n\t ])",
+					"while": "\\G(?=[\t \\x{FEFF}]*+(?>#|$))",
+					"patterns": [
+						{
+							"begin": "\\G\\.{3}",
+							"end": "$",
+							"beginCaptures": {
+								"0": {
+									"name": "entity.other.document.end.yaml"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#presentation-detail"
+								}
+							]
+						},
+						{
+							"include": "#byte-order-mark"
+						},
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				},
+				{
+					"begin": "\\G(?!%|[\t \\x{FEFF}]*+(?>#|$))",
+					"while": "\\G(?!(?>\\.{3}|---)[\r\n\t ])",
+					"name": "meta.document.yaml",
+					"patterns": [
+						{
+							"include": "#block-node"
+						}
+					]
+				}
+			]
+		},
+		"block-node": {
+			"patterns": [
+				{
+					"include": "#block-sequence"
+				},
+				{
+					"include": "#block-mapping"
+				},
+				{
+					"include": "#block-scalar"
+				},
+				{
+					"include": "#anchor-property"
+				},
+				{
+					"include": "#tag-property"
+				},
+				{
+					"include": "#alias"
+				},
+				{
+					"begin": "(?=\"|')",
+					"while": "\\G",
+					"patterns": [
+						{
+							"begin": "(?!\\G)",
+							"while": "\\G",
+							"patterns": [
+								{
+									"include": "#presentation-detail"
+								}
+							]
+						},
+						{
+							"include": "#double"
+						},
+						{
+							"include": "#single"
+						}
+					]
+				},
+				{
+					"begin": "(?={)",
+					"end": "$",
+					"patterns": [
+						{
+							"include": "#flow-mapping"
+						},
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				},
+				{
+					"begin": "(?=\\[)",
+					"end": "$",
+					"patterns": [
+						{
+							"include": "#flow-sequence"
+						},
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				},
+				{
+					"include": "#block-plain-out"
+				},
+				{
+					"include": "#presentation-detail"
+				}
+			]
+		},
+		"block-mapping": {
+			"//": "The check for plain keys is expensive",
+			"begin": "(?=((?<=[-?:]) )?+)(?<![^\t ][\t ]*+:|---)\\G( *+)([\t ]*+)(?>((?>[!&*][^\r\n\t ]*+[\t ]++)*+)(?=(?>(?#Double Quote)\"(?>[^\\\\\"]++|\\\\.)*+\"|(?#Single Quote)'(?>[^']++|'')*+'|(?#Flow-Map){(?>[^}]++|}[ \t]*+(?!:[\r\n\t ]))++}|(?#Flow-Seq)\\[(?>[^]]++|][ \t]*+(?!:[\r\n\t ]))++]|(?#Plain)(?>[\\x{85}[^-?:,\\[\\]{}#&*!|>'\"%@` \\p{Cntrl}\\p{Surrogate}\\x{FEFF FFFE FFFF}]]|[?:-](?![\r\n\t ]))(?>[^:#]++|:(?![\r\n\t ])|(?<! |\t)#++)*+)?+(?#Map Value)[\t ]*+:[\r\n\t ])|(?#Explicit)(?=\\?[\r\n\t ]))",
+			"while": "\\G(?>(\\1\\2)((?>[!&*][^\r\n\t ]*+[\t ]++)*+)((?>\t[\t ]*+)?+[^\r\n\t ?:\\-#!&*\"'\\[\\]{}0-9A-Za-z$()+./;<=\\\\^_~\\x{85}\\x{A0}-\\x{D7FF}\\x{E000}-\\x{FFFD}\\x{010000}-\\x{10FFFF}])?+|( *+)([\t ]*+[^\r\n#])?+)",
+			"beginCaptures": {
+				"2": {
+					"name": "punctuation.whitespace.indentation.yaml"
+				},
+				"3": {
+					"name": "punctuation.whitespace.separator.yaml"
+				},
+				"4": {
+					"comment": "May cause lag on long lines starting with a tag, anchor or alias",
+					"patterns": [
+						{
+							"include": "#tag-property"
+						},
+						{
+							"include": "#anchor-property"
+						},
+						{
+							"include": "#alias"
+						},
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				}
+			},
+			"whileCaptures": {
+				"1": {
+					"name": "punctuation.whitespace.indentation.yaml"
+				},
+				"2": {
+					"comment": "May cause lag on long lines starting with a tag, anchor or alias",
+					"patterns": [
+						{
+							"include": "#tag-property"
+						},
+						{
+							"include": "#anchor-property"
+						},
+						{
+							"include": "#alias"
+						},
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				},
+				"3": {
+					"name": "invalid.illegal.expected-indentation.yaml"
+				},
+				"4": {
+					"name": "punctuation.whitespace.indentation.yaml"
+				},
+				"5": {
+					"name": "invalid.illegal.expected-indentation.yaml"
+				}
+			},
+			"name": "meta.mapping.yaml",
+			"patterns": [
+				{
+					"include": "#block-map-key-double"
+				},
+				{
+					"include": "source.yaml#block-map-key-single"
+				},
+				{
+					"include": "#block-map-key-plain"
+				},
+				{
+					"include": "#block-map-key-explicit"
+				},
+				{
+					"include": "#block-map-value"
+				},
+				{
+					"include": "#flow-mapping"
+				},
+				{
+					"include": "#flow-sequence"
+				},
+				{
+					"include": "#presentation-detail"
+				}
+			]
+		},
+		"block-sequence": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-l+block-sequence",
+			"begin": "(?=((?<=[-?:]) )?+)(?<![^\t ][\t ]*+:|---)\\G( *+)(-)(?=[\r\n\t ])",
+			"while": "\\G(?>(\\1\\2)(?!-[\r\n\t ])((?>\t[\t ]*+)?+[^\r\n\t #\\]}])?+|(?!\\1\\2)( *+)([\t ]*+[^\r\n#])?+)",
+			"beginCaptures": {
+				"2": {
+					"name": "punctuation.whitespace.indentation.yaml"
+				},
+				"3": {
+					"name": "punctuation.definition.block.sequence.item.yaml"
+				}
+			},
+			"whileCaptures": {
+				"1": {
+					"name": "punctuation.whitespace.indentation.yaml"
+				},
+				"2": {
+					"name": "invalid.illegal.expected-indentation.yaml"
+				},
+				"3": {
+					"name": "punctuation.whitespace.indentation.yaml"
+				},
+				"4": {
+					"name": "invalid.illegal.expected-indentation.yaml"
+				}
+			},
+			"name": "meta.block.sequence.yaml",
+			"patterns": [
+				{
+					"include": "#block-node"
+				}
+			]
+		},
+		"block-map-key-explicit": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-c-l-block-map-explicit-key",
+			"begin": "(?=((?<=[-?:]) )?+)\\G( *+)(\\?)(?=[\r\n\t ])",
+			"while": "\\G(?>(\\1\\2)(?![?:0-9A-Za-z$()+./;<=\\\\^_~\\x{85}\\x{A0}-\\x{D7FF}\\x{E000}-\\x{FFFD}\\x{010000}-\\x{10FFFF}&&[^\\x{FEFF}]])((?>\t[\t ]*+)?+[^\r\n\t #\\-\\[\\]{}])?+|(?!\\1\\2)( *+)([\t ]*+[^\r\n#])?+)",
+			"beginCaptures": {
+				"2": {
+					"name": "punctuation.whitespace.indentation.yaml"
+				},
+				"3": {
+					"name": "punctuation.definition.map.key.yaml"
+				},
+				"4": {
+					"name": "punctuation.whitespace.separator.yaml"
+				}
+			},
+			"whileCaptures": {
+				"1": {
+					"name": "punctuation.whitespace.indentation.yaml"
+				},
+				"2": {
+					"name": "invalid.illegal.expected-indentation.yaml"
+				},
+				"3": {
+					"name": "punctuation.whitespace.indentation.yaml"
+				},
+				"4": {
+					"name": "invalid.illegal.expected-indentation.yaml"
+				}
+			},
+			"name": "meta.map.explicit.yaml",
+			"patterns": [
+				{
+					"include": "#key-double"
+				},
+				{
+					"include": "source.yaml#key-single"
+				},
+				{
+					"include": "#flow-key-plain-out"
+				},
+				{
+					"include": "#block-map-value"
+				},
+				{
+					"include": "#block-node"
+				}
+			]
+		},
+		"block-map-key-double": {
+			"comment": "https://yaml.org/spec/1.2.2/#double-quoted-style (BLOCK-KEY)",
+			"begin": "\\G\"",
+			"end": "\"",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.yaml"
+				}
+			},
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.yaml"
+				}
+			},
+			"name": "meta.map.key.yaml string.quoted.double.yaml entity.name.tag.yaml",
+			"patterns": [
+				{
+					"match": ".[\t ]*+$",
+					"name": "invalid.illegal.multiline-key.yaml"
+				},
+				{
+					"match": "[^\t -\\x{10FFFF}]++",
+					"name": "invalid.illegal.character.yaml"
+				},
+				{
+					"include": "#double-escape"
+				}
+			]
+		},
+		"block-map-key-plain": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-ns-plain-one-line (BLOCK-KEY)",
+			"begin": "\\G(?=[\\x{85}[^-?:,\\[\\]{}#&*!|>'\"%@` \\p{Cntrl}\\p{Surrogate}\\x{FEFF FFFE FFFF}]]|[?:-](?![\r\n\t ]))",
+			"end": "(?=[\t ]*+:[\r\n\t ]|(?>[\t ]++|\\G)#)",
+			"name": "meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
+			"patterns": [
+				{
+					"include": "#tag-implicit-plain-out"
+				},
+				{
+					"match": "\\G([\t ]++)(.)",
+					"captures": {
+						"1": {
+							"name": "punctuation.whitespace.separator.yaml"
+						},
+						"2": {
+							"name": "invalid.illegal.multiline-key.yaml"
+						}
+					}
+				},
+				{
+					"match": "[\t ]++$",
+					"name": "punctuation.whitespace.separator.yaml"
+				},
+				{
+					"match": "\\x{FEFF}",
+					"name": "invalid.illegal.bom.yaml"
+				},
+				{
+					"include": "source.yaml#non-printable"
+				}
+			]
+		},
+		"block-map-value": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-c-l-block-map-implicit-value",
+			"//": "Assumming 3rd party preprocessing variables `{{...}}` turn into valid map-keys when inside a block-mapping",
+			"begin": ":(?=[\r\n\t ])|(?<=}})(?=[\t ]++#|[\t ]*+$)",
+			"while": "\\G(?![?:!\"'0-9A-Za-z$()+./;<=\\\\^_~\\[{\\x{85}\\x{A0}-\\x{D7FF}\\x{E000}-\\x{FFFD}\\x{010000}-\\x{10FFFF}&&[^\\x{FEFF}]]|-[^\r\n\t ])",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.separator.map.value.yaml"
+				}
+			},
+			"name": "meta.map.value.yaml",
+			"patterns": [
+				{
+					"include": "#block-node"
+				}
+			]
+		},
+		"block-scalar": {
+			"comment": "https://yaml.org/spec/1.2.2/#81-block-scalar-styles",
+			"patterns": [
+				{
+					"comment": "https://yaml.org/spec/1.2.2/#8111-block-indentation-indicator",
+					"begin": "(?>(\\|)|(>))(?<chomp>[+-])?+((1)|(2)|(3)|(4)|(5)|(6)|(7)|(8)|(9))(?(<chomp>)|([+-]))?+",
+					"while": "\\G(?>(?>(?!\\5) |(?!\\6) {2}|(?!\\7) {3}|(?!\\8) {4}|(?!\\9) {5}|(?!\\10) {6}|(?!\\11) {7}|(?!\\12) {8}|(?!\\13) {9})| *+($|[^#]))",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.flow.block-scalar.literal.yaml"
+						},
+						"2": {
+							"name": "keyword.control.flow.block-scalar.folded.yaml"
+						},
+						"3": {
+							"name": "storage.modifier.chomping-indicator.yaml"
+						},
+						"4": {
+							"name": "constant.numeric.indentation-indicator.yaml"
+						},
+						"14": {
+							"name": "storage.modifier.chomping-indicator.yaml"
+						}
+					},
+					"whileCaptures": {
+						"0": {
+							"name": "punctuation.whitespace.indentation.yaml"
+						},
+						"1": {
+							"name": "invalid.illegal.expected-indentation.yaml"
+						}
+					},
+					"name": "meta.scalar.yaml",
+					"patterns": [
+						{
+							"begin": "$",
+							"while": "\\G",
+							"contentName": "string.unquoted.block.yaml",
+							"patterns": [
+								{
+									"include": "source.yaml#non-printable"
+								}
+							]
+						},
+						{
+							"begin": "\\G",
+							"end": "$",
+							"patterns": [
+								{
+									"include": "#presentation-detail"
+								}
+							]
+						}
+					]
+				},
+				{
+					"comment": "https://yaml.org/spec/1.2.2/#rule-c-b-block-header",
+					"//": "Soooooooo many edge cases",
+					"begin": "(?>(\\|)|(>))([+-]?+)",
+					"while": "\\G",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.flow.block-scalar.literal.yaml"
+						},
+						"2": {
+							"name": "keyword.control.flow.block-scalar.folded.yaml"
+						},
+						"3": {
+							"name": "storage.modifier.chomping-indicator.yaml"
+						}
+					},
+					"name": "meta.scalar.yaml",
+					"patterns": [
+						{
+							"comment": "https://yaml.org/spec/1.2.2/#rule-l-literal-content",
+							"begin": "$",
+							"while": "\\G",
+							"patterns": [
+								{
+									"comment": "https://yaml.org/spec/1.2.2/#rule-l-nb-literal-text",
+									"//": "Find the highest indented line",
+									"begin": "\\G( ++)$",
+									"while": "\\G(?>(\\1)$|(?!\\1)( *+)($|.))",
+									"captures": {
+										"1": {
+											"name": "punctuation.whitespace.indentation.yaml"
+										},
+										"2": {
+											"name": "punctuation.whitespace.indentation.yaml"
+										},
+										"3": {
+											"name": "invalid.illegal.expected-indentation.yaml"
+										}
+									},
+									"contentName": "string.unquoted.block.yaml",
+									"patterns": [
+										{
+											"include": "source.yaml#non-printable"
+										}
+									]
+								},
+								{
+									"comment": "https://yaml.org/spec/1.2.2/#rule-b-nb-literal-next",
+									"//": [
+										"Funky wrapper function",
+										"The `end` pattern clears the parent `\\G` anchor",
+										"Affectively forcing this rule to only match at most once",
+										"https://github.com/microsoft/vscode-textmate/issues/114"
+									],
+									"begin": "\\G(?!$)(?=( *+))",
+									"end": "\\G(?!\\1)(?=[\t ]*+#)",
+									"patterns": [
+										{
+											"comment": "https://yaml.org/spec/1.2.2/#rule-l-nb-literal-text",
+											"begin": "\\G( *+)",
+											"while": "\\G(?>(\\1)|( *+)($|[^\t#]|[\t ]++[^#]))",
+											"captures": {
+												"1": {
+													"name": "punctuation.whitespace.indentation.yaml"
+												},
+												"2": {
+													"name": "punctuation.whitespace.indentation.yaml"
+												},
+												"3": {
+													"name": "invalid.illegal.expected-indentation.yaml"
+												}
+											},
+											"contentName": "string.unquoted.block.yaml",
+											"patterns": [
+												{
+													"include": "source.yaml#non-printable"
+												}
+											]
+										}
+									]
+								},
+								{
+									"comment": "https://yaml.org/spec/1.2.2/#rule-l-chomped-empty",
+									"begin": "(?!\\G)(?=[\t ]*+#)",
+									"while": "\\G",
+									"patterns": [
+										{
+											"include": "#presentation-detail"
+										}
+									]
+								}
+							]
+						},
+						{
+							"comment": "Header Comment",
+							"begin": "\\G",
+							"end": "$",
+							"patterns": [
+								{
+									"include": "#presentation-detail"
+								}
+							]
+						}
+					]
+				}
+			]
+		},
+		"block-plain-out": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-ns-plain-multi-line (FLOW-OUT)",
+			"begin": "(?=[\\x{85}[^-?:,\\[\\]{}#&*!|>'\"%@` \\p{Cntrl}\\p{Surrogate}\\x{FEFF FFFE FFFF}]]|[?:-](?![\r\n\t ]))",
+			"while": "\\G",
+			"patterns": [
+				{
+					"begin": "\\G",
+					"end": "(?=(?>[\t ]++|\\G)#)",
+					"name": "string.unquoted.plain.out.yaml",
+					"patterns": [
+						{
+							"include": "#tag-implicit-plain-out"
+						},
+						{
+							"match": ":(?=[\r\n\t ])",
+							"name": "invalid.illegal.multiline-key.yaml"
+						},
+						{
+							"match": "\\G[\t ]++",
+							"name": "punctuation.whitespace.separator.yaml"
+						},
+						{
+							"match": "[\t ]++$",
+							"name": "punctuation.whitespace.separator.yaml"
+						},
+						{
+							"match": "\\x{FEFF}",
+							"name": "invalid.illegal.bom.yaml"
+						},
+						{
+							"include": "source.yaml#non-printable"
+						}
+					]
+				},
+				{
+					"begin": "(?!\\G)",
+					"while": "\\G",
+					"patterns": [
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				}
+			]
+		},
+		"flow-node": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-ns-flow-seq-entry (FLOW-IN)",
+			"patterns": [
+				{
+					"begin": "(?=\\[|{)",
+					"end": "(?=[:,\\]}])",
+					"patterns": [
+						{
+							"begin": "(?!\\G)",
+							"end": "(?=[:,\\]}])",
+							"patterns": [
+								{
+									"include": "#presentation-detail"
+								}
+							]
+						},
+						{
+							"include": "#flow-mapping"
+						},
+						{
+							"include": "#flow-sequence"
+						}
+					]
+				},
+				{
+					"include": "#anchor-property"
+				},
+				{
+					"include": "#tag-property"
+				},
+				{
+					"include": "#alias"
+				},
+				{
+					"begin": "(?=\"|')",
+					"end": "(?=[:,\\]}])",
+					"patterns": [
+						{
+							"begin": "(?!\\G)",
+							"end": "(?=[:,\\]}])",
+							"patterns": [
+								{
+									"include": "#presentation-detail"
+								}
+							]
+						},
+						{
+							"include": "#double"
+						},
+						{
+							"include": "#single"
+						}
+					]
+				},
+				{
+					"include": "#flow-plain-in"
+				},
+				{
+					"include": "#presentation-detail"
+				}
+			]
+		},
+		"flow-mapping": {
+			"comment": "https://yaml.org/spec/1.2.2/#742-flow-mappings",
+			"begin": "{",
+			"end": "}",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.mapping.begin.yaml"
+				}
+			},
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.mapping.end.yaml"
+				}
+			},
+			"name": "meta.flow.mapping.yaml",
+			"patterns": [
+				{
+					"comment": "https://yaml.org/spec/1.2.2/#rule-ns-s-flow-map-entries",
+					"begin": "(?<={)\\G(?=[\r\n\t ,#])|,",
+					"end": "(?=[^\r\n\t ,#])",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.separator.mapping.yaml"
+						}
+					},
+					"patterns": [
+						{
+							"match": ",++",
+							"name": "invalid.illegal.separator.sequence.yaml"
+						},
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				},
+				{
+					"include": "#flow-mapping-map-key"
+				},
+				{
+					"include": "#flow-map-value-yaml"
+				},
+				{
+					"include": "#flow-map-value-json"
+				},
+				{
+					"include": "#flow-node"
+				}
+			]
+		},
+		"flow-sequence": {
+			"comment": "https://yaml.org/spec/1.2.2/#741-flow-sequences",
+			"begin": "\\[",
+			"end": "]",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.sequence.begin.yaml"
+				}
+			},
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.sequence.end.yaml"
+				}
+			},
+			"name": "meta.flow.sequence.yaml",
+			"patterns": [
+				{
+					"comment": "https://yaml.org/spec/1.2.2/#rule-ns-s-flow-seq-entries",
+					"begin": "(?<=\\[)\\G(?=[\r\n\t ,#])|,",
+					"end": "(?=[^\r\n\t ,#])",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.separator.sequence.yaml"
+						}
+					},
+					"patterns": [
+						{
+							"match": ",++",
+							"name": "invalid.illegal.separator.sequence.yaml"
+						},
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				},
+				{
+					"include": "#flow-sequence-map-key"
+				},
+				{
+					"include": "#flow-map-value-yaml"
+				},
+				{
+					"include": "#flow-map-value-json"
+				},
+				{
+					"include": "#flow-node"
+				}
+			]
+		},
+		"flow-mapping-map-key": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-ns-flow-map-entry (FLOW-IN)",
+			"patterns": [
+				{
+					"begin": "\\?(?=[\r\n\t ,\\[\\]{}])",
+					"end": "(?=[,\\[\\]{}])",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.map.key.yaml"
+						}
+					},
+					"name": "meta.flow.map.explicit.yaml",
+					"patterns": [
+						{
+							"include": "#flow-mapping-map-key"
+						},
+						{
+							"include": "#flow-map-value-yaml"
+						},
+						{
+							"include": "#flow-map-value-json"
+						},
+						{
+							"include": "#flow-node"
+						}
+					]
+				},
+				{
+					"comment": "https://yaml.org/spec/1.2.2/#rule-ns-flow-map-implicit-entry (FLOW-IN)",
+					"begin": "(?=(?>[\\x{85}[^-?:,\\[\\]{}#&*!|>'\"%@` \\p{Cntrl}\\p{Surrogate}\\x{FEFF FFFE FFFF}]]|[?:-](?![\r\n\t ,\\[\\]{}])))",
+					"end": "(?=[,\\[\\]{}])",
+					"name": "meta.flow.map.implicit.yaml",
+					"patterns": [
+						{
+							"include": "#flow-key-plain-in"
+						},
+						{
+							"match": ":(?=\\[|{)",
+							"name": "invalid.illegal.separator.map.yaml"
+						},
+						{
+							"include": "#flow-map-value-yaml"
+						},
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				},
+				{
+					"comment": "https://yaml.org/spec/1.2.2/#rule-ns-flow-map-implicit-entry (FLOW-IN)",
+					"begin": "(?=\"|')",
+					"end": "(?=[,\\[\\]{}])",
+					"name": "meta.flow.map.implicit.yaml",
+					"patterns": [
+						{
+							"include": "#key-double"
+						},
+						{
+							"include": "source.yaml#key-single"
+						},
+						{
+							"include": "#flow-map-value-json"
+						},
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				}
+			]
+		},
+		"flow-sequence-map-key": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-ns-flow-map-entry (FLOW-IN)",
+			"patterns": [
+				{
+					"begin": "\\?(?=[\r\n\t ,\\[\\]{}])",
+					"end": "(?=[,\\[\\]{}])",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.map.key.yaml"
+						}
+					},
+					"name": "meta.flow.map.explicit.yaml",
+					"patterns": [
+						{
+							"include": "#flow-mapping-map-key"
+						},
+						{
+							"include": "#flow-map-value-yaml"
+						},
+						{
+							"include": "#flow-map-value-json"
+						},
+						{
+							"include": "#flow-node"
+						}
+					]
+				},
+				{
+					"comment": "https://yaml.org/spec/1.2.2/#rule-ns-flow-map-implicit-entry (FLOW-IN)",
+					"begin": "(?<=[\t ,\\[{]|^)(?=(?>[\\x{85}[^-?:,\\[\\]{}#&*!|>'\"%@` \\p{Cntrl}\\p{Surrogate}\\x{FEFF FFFE FFFF}]]|[?:-](?![\r\n\t ,\\[\\]{}]))(?>[^:#,\\[\\]{}]++|:(?![\r\n\t ,\\[\\]{}])|(?<! |\t)#++)*+:[\r\n\t ,\\[\\]{}])",
+					"end": "(?=[,\\[\\]{}])",
+					"name": "meta.flow.map.implicit.yaml",
+					"patterns": [
+						{
+							"include": "#flow-key-plain-in"
+						},
+						{
+							"match": ":(?=\\[|{)",
+							"name": "invalid.illegal.separator.map.yaml"
+						},
+						{
+							"include": "#flow-map-value-yaml"
+						},
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				},
+				{
+					"comment": "https://yaml.org/spec/1.2.2/#rule-ns-flow-map-implicit-entry (FLOW-IN)",
+					"begin": "(?=(?>\"(?>[^\\\\\"]++|\\\\.)*+\"|'(?>[^']++|'')*+')[\t ]*+:)",
+					"end": "(?=[,\\[\\]{}])",
+					"name": "meta.flow.map.implicit.yaml",
+					"patterns": [
+						{
+							"include": "#key-double"
+						},
+						{
+							"include": "source.yaml#key-single"
+						},
+						{
+							"include": "#flow-map-value-json"
+						},
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				}
+			]
+		},
+		"flow-map-value-yaml": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-c-ns-flow-map-separate-value (FLOW-IN)",
+			"begin": ":(?=[\r\n\t ,\\[\\]{}])",
+			"end": "(?=[,\\]}])",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.separator.map.value.yaml"
+				}
+			},
+			"name": "meta.flow.pair.value.yaml",
+			"patterns": [
+				{
+					"include": "#flow-node"
+				}
+			]
+		},
+		"flow-map-value-json": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-c-ns-flow-map-separate-value (FLOW-IN)",
+			"begin": "(?<=(?>[\"'\\]}]|^)[\t ]*+):",
+			"end": "(?=[,\\]}])",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.separator.map.value.yaml"
+				}
+			},
+			"name": "meta.flow.pair.value.yaml",
+			"patterns": [
+				{
+					"include": "#flow-node"
+				}
+			]
+		},
+		"flow-plain-in": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-ns-plain-multi-line (FLOW-IN)",
+			"begin": "(?=[\\x{85}[^-?:,\\[\\]{}#&*!|>'\"%@` \\p{Cntrl}\\p{Surrogate}\\x{FEFF FFFE FFFF}]]|[?:-](?![\r\n\t ,\\[\\]{}]))",
+			"end": "(?=(?>[\t ]++|\\G)#|[\t ]*+[,\\[\\]{}])",
+			"name": "string.unquoted.plain.in.yaml",
+			"patterns": [
+				{
+					"include": "#tag-implicit-plain-in"
+				},
+				{
+					"match": "\\G[\t ]++",
+					"name": "punctuation.whitespace.separator.yaml"
+				},
+				{
+					"match": "[\t ]++$",
+					"name": "punctuation.whitespace.separator.yaml"
+				},
+				{
+					"match": ":(?=[\r\n\t ,\\[\\]{}])",
+					"name": "invalid.illegal.multiline-key.yaml"
+				},
+				{
+					"match": "\\x{FEFF}",
+					"name": "invalid.illegal.bom.yaml"
+				},
+				{
+					"include": "source.yaml#non-printable"
+				}
+			]
+		},
+		"flow-key-plain-out": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-ns-plain-one-line (FLOW-OUT)",
+			"begin": "(?=[\\x{85}[^-?:,\\[\\]{}#&*!|>'\"%@` \\p{Cntrl}\\p{Surrogate}\\x{FEFF FFFE FFFF}]]|[?:-](?![\r\n\t ]))",
+			"end": "(?=[\t ]*+:[\r\n\t ]|[\t ]++#)",
+			"name": "meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
+			"patterns": [
+				{
+					"include": "#tag-implicit-plain-out"
+				},
+				{
+					"match": "\\G[\t ]++",
+					"name": "punctuation.whitespace.separator.yaml"
+				},
+				{
+					"match": "[\t ]++$",
+					"name": "punctuation.whitespace.separator.yaml"
+				},
+				{
+					"match": "\\x{FEFF}",
+					"name": "invalid.illegal.bom.yaml"
+				},
+				{
+					"include": "source.yaml#non-printable"
+				}
+			]
+		},
+		"flow-key-plain-in": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-ns-s-implicit-yaml-key (FLOW-KEY)",
+			"begin": "\\G(?![\r\n\t #])",
+			"end": "(?=[\t ]*+(?>:[\r\n\t ,\\[\\]{}]|[,\\[\\]{}])|[\t ]++#)",
+			"name": "meta.flow.map.key.yaml string.unquoted.plain.in.yaml entity.name.tag.yaml",
+			"patterns": [
+				{
+					"include": "#tag-implicit-plain-in"
+				},
+				{
+					"match": "\\x{FEFF}",
+					"name": "invalid.illegal.bom.yaml"
+				},
+				{
+					"include": "source.yaml#non-printable"
+				}
+			]
+		},
+		"key-double": {
+			"comment": "https://yaml.org/spec/1.2.2/#double-quoted-style (FLOW-OUT)",
+			"begin": "\"",
+			"end": "\"",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.yaml"
+				}
+			},
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.yaml"
+				}
+			},
+			"name": "meta.map.key.yaml string.quoted.double.yaml entity.name.tag.yaml",
+			"patterns": [
+				{
+					"match": "[^\t -\\x{10FFFF}]++",
+					"name": "invalid.illegal.character.yaml"
+				},
+				{
+					"include": "#double-escape"
+				}
+			]
+		},
+		"double": {
+			"comment": "https://yaml.org/spec/1.2.2/#double-quoted-style",
+			"begin": "\"",
+			"end": "\"",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.yaml"
+				}
+			},
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.yaml"
+				}
+			},
+			"name": "string.quoted.double.yaml",
+			"patterns": [
+				{
+					"match": "(?<!\")\\G[\t ]++",
+					"name": "punctuation.whitespace.separator.yaml"
+				},
+				{
+					"match": "[\t ]++$",
+					"name": "punctuation.whitespace.separator.yaml"
+				},
+				{
+					"match": "[^\r\n\t -\\x{10FFFF}]++",
+					"name": "invalid.illegal.character.yaml"
+				},
+				{
+					"include": "#double-escape"
+				}
+			]
+		},
+		"single": {
+			"comment": "https://yaml.org/spec/1.2.2/#single-quoted-style",
+			"begin": "'",
+			"end": "'(?!')",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.yaml"
+				}
+			},
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.yaml"
+				}
+			},
+			"name": "string.quoted.single.yaml",
+			"patterns": [
+				{
+					"match": "(?<!')\\G[\t ]++",
+					"name": "punctuation.whitespace.separator.yaml"
+				},
+				{
+					"match": "[\t ]++$",
+					"name": "punctuation.whitespace.separator.yaml"
+				},
+				{
+					"match": "[^\r\n\t -\\x{10FFFF}]++",
+					"name": "invalid.illegal.character.yaml"
+				},
+				{
+					"match": "''",
+					"name": "constant.character.escape.single-quote.yaml"
+				}
+			]
+		},
+		"double-escape": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-c-ns-esc-char",
+			"patterns": [
+				{
+					"match": "\\\\[\r\n\t0abtnvfre \"/\\\\N_LP]",
+					"name": "constant.character.escape.yaml"
+				},
+				{
+					"match": "\\\\x[0-9a-fA-F]{2}",
+					"name": "constant.character.escape.unicode.8-bit.yaml"
+				},
+				{
+					"match": "\\\\u[0-9a-fA-F]{4}",
+					"name": "constant.character.escape.unicode.16-bit.yaml"
+				},
+				{
+					"match": "\\\\U[0-9a-fA-F]{8}",
+					"name": "constant.character.escape.unicode.32-bit.yaml"
+				},
+				{
+					"match": "\\\\(?>x[^\"]{2,0}|u[^\"]{4,0}|U[^\"]{8,0}|.)",
+					"name": "invalid.illegal.constant.character.escape.yaml"
+				}
+			]
+		},
+		"tag-implicit-plain-in": {
+			"comment": "https://yaml.org/spec/1.2.2/#103-core-schema",
+			"patterns": [
+				{
+					"match": "\\G(?>null|Null|NULL|~)(?=[\t ]++#|[\t ]*+(?>[\r\n,\\]}]|:[\r\n\t ,\\[\\]{}]))",
+					"name": "constant.language.null.yaml"
+				},
+				{
+					"match": "\\G(?>true|True|TRUE|false|False|FALSE)(?=[\t ]++#|[\t ]*+(?>[\r\n,\\]}]|:[\r\n\t ,\\[\\]{}]))",
+					"name": "constant.language.boolean.yaml"
+				},
+				{
+					"match": "\\G[+-]?+[0-9]++(?=[\t ]++#|[\t ]*+(?>[\r\n,\\]}]|:[\r\n\t ,\\[\\]{}]))",
+					"name": "constant.numeric.integer.decimal.yaml"
+				},
+				{
+					"match": "\\G0o[0-7]++(?=[\t ]++#|[\t ]*+(?>[\r\n,\\]}]|:[\r\n\t ,\\[\\]{}]))",
+					"name": "constant.numeric.integer.octal.yaml"
+				},
+				{
+					"match": "\\G0x[0-9a-fA-F]++(?=[\t ]++#|[\t ]*+(?>[\r\n,\\]}]|:[\r\n\t ,\\[\\]{}]))",
+					"name": "constant.numeric.integer.hexadecimal.yaml"
+				},
+				{
+					"match": "\\G[+-]?+(?>\\.[0-9]++|[0-9]++(?>\\.[0-9]*+)?+)(?>[eE][+-]?+[0-9]++)?+(?=[\t ]++#|[\t ]*+(?>[\r\n,\\]}]|:[\r\n\t ,\\[\\]{}]))",
+					"name": "constant.numeric.float.yaml"
+				},
+				{
+					"match": "\\G[+-]?+\\.(?>inf|Inf|INF)(?=[\t ]++#|[\t ]*+(?>[\r\n,\\]}]|:[\r\n\t ,\\[\\]{}]))",
+					"name": "constant.numeric.float.inf.yaml"
+				},
+				{
+					"match": "\\G\\.(?>nan|NaN|NAN)(?=[\t ]++#|[\t ]*+(?>[\r\n,\\]}]|:[\r\n\t ,\\[\\]{}]))",
+					"name": "constant.numeric.float.nan.yaml"
+				}
+			]
+		},
+		"tag-implicit-plain-out": {
+			"comment": "https://yaml.org/spec/1.2.2/#103-core-schema",
+			"patterns": [
+				{
+					"match": "\\G(?>null|Null|NULL|~)(?=[\t ]++#|[\t ]*+(?>$|:[\r\n\t ]))",
+					"name": "constant.language.null.yaml"
+				},
+				{
+					"match": "\\G(?>true|True|TRUE|false|False|FALSE)(?=[\t ]++#|[\t ]*+(?>$|:[\r\n\t ]))",
+					"name": "constant.language.boolean.yaml"
+				},
+				{
+					"match": "\\G[+-]?+[0-9]++(?=[\t ]++#|[\t ]*+(?>$|:[\r\n\t ]))",
+					"name": "constant.numeric.integer.decimal.yaml"
+				},
+				{
+					"match": "\\G0o[0-7]++(?=[\t ]++#|[\t ]*+(?>$|:[\r\n\t ]))",
+					"name": "constant.numeric.integer.octal.yaml"
+				},
+				{
+					"match": "\\G0x[0-9a-fA-F]++(?=[\t ]++#|[\t ]*+(?>$|:[\r\n\t ]))",
+					"name": "constant.numeric.integer.hexadecimal.yaml"
+				},
+				{
+					"match": "\\G[+-]?+(?>\\.[0-9]++|[0-9]++(?>\\.[0-9]*+)?+)(?>[eE][+-]?+[0-9]++)?+(?=[\t ]++#|[\t ]*+(?>$|:[\r\n\t ]))",
+					"name": "constant.numeric.float.yaml"
+				},
+				{
+					"match": "\\G[+-]?+\\.(?>inf|Inf|INF)(?=[\t ]++#|[\t ]*+(?>$|:[\r\n\t ]))",
+					"name": "constant.numeric.float.inf.yaml"
+				},
+				{
+					"match": "\\G\\.(?>nan|NaN|NAN)(?=[\t ]++#|[\t ]*+(?>$|:[\r\n\t ]))",
+					"name": "constant.numeric.float.nan.yaml"
+				}
+			]
+		},
+		"tag-property": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-c-ns-tag-property",
+			"//": [
+				"!",
+				"!!",
+				"!<>",
+				"!...",
+				"!!...",
+				"!<...>",
+				"!...!..."
+			],
+			"patterns": [
+				{
+					"match": "!(?=[\r\n\t ])",
+					"name": "storage.type.tag.non-specific.yaml punctuation.definition.tag.non-specific.yaml"
+				},
+				{
+					"comment": "https://yaml.org/spec/1.2.2/#rule-c-verbatim-tag",
+					"begin": "!<",
+					"end": ">",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.begin.yaml"
+						}
+					},
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.yaml"
+						}
+					},
+					"name": "storage.type.tag.verbatim.yaml",
+					"patterns": [
+						{
+							"match": "%[0-9a-fA-F]{2}",
+							"name": "constant.character.escape.unicode.8-bit.yaml"
+						},
+						{
+							"match": "%[^\r\n\t ]{2,0}",
+							"name": "invalid.illegal.constant.character.escape.unicode.8-bit.yaml"
+						},
+						{
+							"include": "source.yaml#non-printable"
+						},
+						{
+							"match": "[^\r\n\t a-zA-Z0-9-#;/?:@&=+$,_.!~*'()\\[\\]%>]++",
+							"name": "invalid.illegal.unrecognized.yaml"
+						}
+					]
+				},
+				{
+					"comment": "https://yaml.org/spec/1.2.2/#rule-c-ns-shorthand-tag",
+					"begin": "(?=!)",
+					"end": "(?=[\r\n\t ,\\[\\]{}])",
+					"name": "storage.type.tag.shorthand.yaml",
+					"patterns": [
+						{
+							"comment": "https://yaml.org/spec/1.2.2/#rule-c-secondary-tag-handle",
+							"match": "\\G!!",
+							"name": "punctuation.definition.tag.secondary.yaml"
+						},
+						{
+							"comment": "https://yaml.org/spec/1.2.2/#rule-c-secondary-tag-handle",
+							"match": "\\G(!)[0-9A-Za-z-]++(!)",
+							"captures": {
+								"1": {
+									"name": "punctuation.definition.tag.named.yaml"
+								},
+								"2": {
+									"name": "punctuation.definition.tag.named.yaml"
+								}
+							}
+						},
+						{
+							"comment": "https://yaml.org/spec/1.2.2/#rule-c-primary-tag-handle",
+							"match": "\\G!",
+							"name": "punctuation.definition.tag.primary.yaml"
+						},
+						{
+							"match": "%[0-9a-fA-F]{2}",
+							"name": "constant.character.escape.unicode.8-bit.yaml"
+						},
+						{
+							"match": "%[^\r\n\t ]{2,0}",
+							"name": "invalid.illegal.constant.character.escape.unicode.8-bit.yaml"
+						},
+						{
+							"include": "source.yaml#non-printable"
+						},
+						{
+							"match": "[^\r\n\t a-zA-Z0-9-#;/?:@&=+$_.~*'()%]++",
+							"name": "invalid.illegal.unrecognized.yaml"
+						}
+					]
+				}
+			]
+		},
+		"anchor-property": {
+			"match": "(&)([\\x{85}[^ ,\\[\\]{}\\p{Cntrl}\\p{Surrogate}\\x{FEFF FFFE FFFF}]]++)|(&)",
+			"captures": {
+				"0": {
+					"name": "keyword.control.flow.anchor.yaml"
+				},
+				"1": {
+					"name": "punctuation.definition.anchor.yaml"
+				},
+				"2": {
+					"name": "variable.other.anchor.yaml"
+				},
+				"3": {
+					"name": "invalid.illegal.flow.anchor.yaml"
+				}
+			}
+		},
+		"alias": {
+			"begin": "(\\*)([\\x{85}[^ ,\\[\\]{}\\p{Cntrl}\\p{Surrogate}\\x{FEFF FFFE FFFF}]]++)|(\\*)",
+			"end": "(?=:[\r\n\t ,\\[\\]{}]|[,\\[\\]{}])",
+			"captures": {
+				"0": {
+					"name": "keyword.control.flow.alias.yaml"
+				},
+				"1": {
+					"name": "punctuation.definition.alias.yaml"
+				},
+				"2": {
+					"name": "variable.other.alias.yaml"
+				},
+				"3": {
+					"name": "invalid.illegal.flow.alias.yaml"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#presentation-detail"
+				}
+			]
+		},
+		"byte-order-mark": {
+			"comment": "",
+			"match": "\\G\\x{FEFF}++",
+			"name": "byte-order-mark.yaml"
+		},
+		"presentation-detail": {
+			"patterns": [
+				{
+					"match": "[\t ]++",
+					"name": "punctuation.whitespace.separator.yaml"
+				},
+				{
+					"include": "source.yaml#non-printable"
+				},
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#unknown"
+				}
+			]
+		},
+		"comment": {
+			"comment": "Comments must be separated from other tokens by white space characters. `space`, `tab`, `newline` or `carriage-return`. `#(.*)` causes performance issues",
+			"begin": "(?<=[\\x{FEFF}\t ]|^)#",
+			"end": "\r|\n",
+			"captures": {
+				"0": {
+					"name": "punctuation.definition.comment.yaml"
+				}
+			},
+			"name": "comment.line.number-sign.yaml",
+			"patterns": [
+				{
+					"include": "source.yaml#non-printable"
+				}
+			]
+		},
+		"unknown": {
+			"match": ".[[^\"':,\\[\\]{}]&&!-~\\x{85}\\x{A0}-\\x{D7FF}\\x{E000}-\\x{FFFD}\\x{010000}-\\x{10FFFF}]*+",
+			"name": "invalid.illegal.unrecognized.yaml"
+		}
+	}
+}
\ No newline at end of file
diff --git a/extensions/yaml/syntaxes/yaml-1.3.tmLanguage.json b/extensions/yaml/syntaxes/yaml-1.3.tmLanguage.json
new file mode 100644
index 00000000000..8df69f61c8c
--- /dev/null
+++ b/extensions/yaml/syntaxes/yaml-1.3.tmLanguage.json
@@ -0,0 +1,60 @@
+{
+	"information_for_contributors": [
+		"This file has been converted from https://github.com/RedCMD/YAML-Syntax-Highlighter/blob/master/syntaxes/yaml-1.3.tmLanguage.json",
+		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
+		"Once accepted there, we are happy to receive an update request."
+	],
+	"version": "https://github.com/RedCMD/YAML-Syntax-Highlighter/commit/274009903e20ac6dc37ba5763fb853744e28c9b2",
+	"name": "YAML 1.3",
+	"scopeName": "source.yaml.1.3",
+	"comment": "https://spec.yaml.io/main/spec/1.3.0/",
+	"patterns": [
+		{
+			"include": "source.yaml"
+		}
+	],
+	"repository": {
+		"directive-YAML": {
+			"comment": "https://yaml.org/spec/1.2.2/#681-yaml-directives",
+			"begin": "(?=%YAML[\t ]+1\\.3(?=[\r\n\t ]))",
+			"end": "\\G(?=(?>\\.{3}|---)[\r\n\t ])",
+			"name": "meta.1.3.yaml",
+			"patterns": [
+				{
+					"comment": "https://yaml.org/spec/1.2.2/#681-yaml-directives",
+					"begin": "\\G(%)(YAML)([\t ]+)(1\\.3)",
+					"end": "\\G(?=---[\r\n\t ])",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.directive.begin.yaml"
+						},
+						"2": {
+							"name": "keyword.other.directive.yaml.yaml"
+						},
+						"3": {
+							"name": "punctuation.whitespace.separator.yaml"
+						},
+						"4": {
+							"name": "constant.numeric.yaml-version.yaml"
+						}
+					},
+					"name": "meta.directives.yaml",
+					"patterns": [
+						{
+							"include": "source.yaml.1.2#directive-invalid"
+						},
+						{
+							"include": "source.yaml.1.2#directives"
+						},
+						{
+							"include": "source.yaml.1.2#presentation-detail"
+						}
+					]
+				},
+				{
+					"include": "source.yaml.1.2#document"
+				}
+			]
+		}
+	}
+}
\ No newline at end of file
diff --git a/extensions/yaml/syntaxes/yaml.tmLanguage.json b/extensions/yaml/syntaxes/yaml.tmLanguage.json
index 447df713901..3a64fbd850e 100644
--- a/extensions/yaml/syntaxes/yaml.tmLanguage.json
+++ b/extensions/yaml/syntaxes/yaml.tmLanguage.json
@@ -1,621 +1,106 @@
 {
 	"information_for_contributors": [
-		"This file has been converted from https://github.com/textmate/yaml.tmbundle/blob/master/Syntaxes/YAML.tmLanguage",
+		"This file has been converted from https://github.com/RedCMD/YAML-Syntax-Highlighter/blob/master/syntaxes/yaml.tmLanguage.json",
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/textmate/yaml.tmbundle/commit/e54ceae3b719506dba7e481a77cea4a8b576ae46",
-	"name": "YAML",
+	"version": "https://github.com/RedCMD/YAML-Syntax-Highlighter/commit/d4dca9f38a654ebbb13c1b72b7881e3c5864a778",
+	"name": "YAML Ain't Markup Language",
 	"scopeName": "source.yaml",
 	"patterns": [
 		{
-			"include": "#comment"
+			"comment": "Support legacy FrontMatter integration",
+			"//": "https://github.com/microsoft/vscode-markdown-tm-grammar/pull/162",
+			"begin": "(?<=^-{3,}\\s*+)\\G$",
+			"while": "^(?! {3,0}-{3,}[ \t]*+$|[ \t]*+\\.{3}$)",
+			"patterns": [
+				{
+					"include": "source.yaml.1.2"
+				}
+			]
 		},
 		{
-			"include": "#property"
-		},
-		{
-			"include": "#directive"
-		},
-		{
-			"match": "^---",
-			"name": "entity.other.document.begin.yaml"
-		},
-		{
-			"match": "^\\.{3}",
-			"name": "entity.other.document.end.yaml"
-		},
-		{
-			"include": "#node"
+			"comment": "Default to YAML version 1.2",
+			"include": "source.yaml.1.2"
 		}
 	],
 	"repository": {
-		"block-collection": {
-			"patterns": [
-				{
-					"include": "#block-sequence"
-				},
-				{
-					"include": "#block-mapping"
-				}
-			]
+		"parity": {
+			"comment": "Yes... That is right. Due to the changes with \\x2028, \\x2029, \\x85 and 'tags'. This is all the code I was able to reuse between all YAML versions 1.3, 1.2, 1.1 and 1.0"
 		},
-		"block-mapping": {
-			"patterns": [
-				{
-					"include": "#block-pair"
-				}
-			]
-		},
-		"block-node": {
-			"patterns": [
-				{
-					"include": "#prototype"
-				},
-				{
-					"include": "#block-scalar"
-				},
-				{
-					"include": "#block-collection"
-				},
-				{
-					"include": "#flow-scalar-plain-out"
-				},
-				{
-					"include": "#flow-node"
-				}
-			]
-		},
-		"block-pair": {
-			"patterns": [
-				{
-					"begin": "\\?",
-					"beginCaptures": {
-						"1": {
-							"name": "punctuation.definition.key-value.begin.yaml"
-						}
-					},
-					"end": "(?=\\?)|^ *(:)|(:)",
-					"endCaptures": {
-						"1": {
-							"name": "punctuation.separator.key-value.mapping.yaml"
-						},
-						"2": {
-							"name": "invalid.illegal.expected-newline.yaml"
-						}
-					},
-					"name": "meta.block-mapping.yaml",
-					"patterns": [
-						{
-							"include": "#block-node"
-						}
-					]
-				},
-				{
-					"begin": "(?x)\n                        (?=\n                            (?x:\n                                  [^\\s[-?:,\\[\\]{}#&*!|>'\"%@`]]\n                                | [?:-] \\S\n                            )\n                            (\n                                  [^\\s:]\n                                | : \\S\n                                | \\s+ (?![#\\s])\n                            )*\n                            \\s*\n                            :\n\t\t\t\t\t\t\t(\\s|$)\n                        )\n                    ",
-					"end": "(?x)\n                        (?=\n                              \\s* $\n                            | \\s+ \\#\n                            | \\s* : (\\s|$)\n                        )\n                    ",
-					"patterns": [
-						{
-							"include": "#flow-scalar-plain-out-implicit-type"
-						},
-						{
-							"begin": "(?x)\n                                  [^\\s[-?:,\\[\\]{}#&*!|>'\"%@`]]\n                                | [?:-] \\S\n                            ",
-							"beginCaptures": {
-								"0": {
-									"name": "entity.name.tag.yaml"
-								}
-							},
-							"contentName": "entity.name.tag.yaml",
-							"end": "(?x)\n                                (?=\n                                      \\s* $\n                                    | \\s+ \\#\n                                    | \\s* : (\\s|$)\n                                )\n                            ",
-							"name": "string.unquoted.plain.out.yaml"
-						}
-					]
-				},
-				{
-					"match": ":(?=\\s|$)",
-					"name": "punctuation.separator.key-value.mapping.yaml"
-				}
-			]
-		},
-		"block-scalar": {
-			"begin": "(?:(\\|)|(>))([1-9])?([-+])?(.*\\n?)",
-			"beginCaptures": {
-				"1": {
-					"name": "keyword.control.flow.block-scalar.literal.yaml"
-				},
-				"2": {
-					"name": "keyword.control.flow.block-scalar.folded.yaml"
-				},
-				"3": {
-					"name": "constant.numeric.indentation-indicator.yaml"
-				},
-				"4": {
-					"name": "storage.modifier.chomping-indicator.yaml"
-				},
-				"5": {
-					"patterns": [
-						{
-							"include": "#comment"
-						},
-						{
-							"match": ".+",
-							"name": "invalid.illegal.expected-comment-or-newline.yaml"
-						}
-					]
-				}
-			},
-			"end": "^(?=\\S)|(?!\\G)",
-			"patterns": [
-				{
-					"begin": "^([ ]+)(?! )",
-					"end": "^(?!\\1|\\s*$)",
-					"name": "string.unquoted.block.yaml"
-				}
-			]
-		},
-		"block-sequence": {
-			"match": "(-)(?!\\S)",
-			"name": "punctuation.definition.block.sequence.item.yaml"
-		},
-		"comment": {
-			"begin": "(?:(^[ \\t]*)|[ \\t]+)(?=#\\p{Print}*$)",
-			"beginCaptures": {
-				"1": {
-					"name": "punctuation.whitespace.comment.leading.yaml"
-				}
-			},
-			"end": "(?!\\G)",
-			"patterns": [
-				{
-					"begin": "#",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.comment.yaml"
-						}
-					},
-					"end": "\\n",
-					"name": "comment.line.number-sign.yaml"
-				}
-			]
-		},
-		"directive": {
-			"begin": "^%",
-			"beginCaptures": {
-				"0": {
-					"name": "punctuation.definition.directive.begin.yaml"
-				}
-			},
-			"end": "(?=$|[ \\t]+($|#))",
-			"name": "meta.directive.yaml",
-			"patterns": [
-				{
-					"captures": {
-						"1": {
-							"name": "keyword.other.directive.yaml.yaml"
-						},
-						"2": {
-							"name": "constant.numeric.yaml-version.yaml"
-						}
-					},
-					"match": "\\G(YAML)[ \\t]+(\\d+\\.\\d+)"
-				},
-				{
-					"captures": {
-						"1": {
-							"name": "keyword.other.directive.tag.yaml"
-						},
-						"2": {
-							"name": "storage.type.tag-handle.yaml"
-						},
-						"3": {
-							"name": "support.type.tag-prefix.yaml"
-						}
-					},
-					"match": "(?x)\n                        \\G\n                        (TAG)\n                        (?:[ \\t]+\n                            ((?:!(?:[0-9A-Za-z\\-]*!)?))\n                            (?:[ \\t]+ (\n                                  !              (?x: %[0-9A-Fa-f]{2} | [0-9A-Za-z\\-#;/?:@&=+$,_.!~*'()\\[\\]] )*\n                                | (?![,!\\[\\]{}]) (?x: %[0-9A-Fa-f]{2} | [0-9A-Za-z\\-#;/?:@&=+$,_.!~*'()\\[\\]] )+\n                                )\n                            )?\n                        )?\n                    "
-				},
-				{
-					"captures": {
-						"1": {
-							"name": "support.other.directive.reserved.yaml"
-						},
-						"2": {
-							"name": "string.unquoted.directive-name.yaml"
-						},
-						"3": {
-							"name": "string.unquoted.directive-parameter.yaml"
-						}
-					},
-					"match": "(?x) \\G (\\w+) (?:[ \\t]+ (\\w+) (?:[ \\t]+ (\\w+))? )?"
-				},
-				{
-					"match": "\\S+",
-					"name": "invalid.illegal.unrecognized.yaml"
-				}
-			]
-		},
-		"flow-alias": {
-			"captures": {
-				"1": {
-					"name": "keyword.control.flow.alias.yaml"
-				},
-				"2": {
-					"name": "punctuation.definition.alias.yaml"
-				},
-				"3": {
-					"name": "variable.other.alias.yaml"
-				},
-				"4": {
-					"name": "invalid.illegal.character.anchor.yaml"
-				}
-			},
-			"match": "((\\*))([^\\s\\[\\]/{/},]+)([^\\s\\]},]\\S*)?"
-		},
-		"flow-collection": {
-			"patterns": [
-				{
-					"include": "#flow-sequence"
-				},
-				{
-					"include": "#flow-mapping"
-				}
-			]
-		},
-		"flow-mapping": {
-			"begin": "\\{",
-			"beginCaptures": {
-				"0": {
-					"name": "punctuation.definition.mapping.begin.yaml"
-				}
-			},
-			"end": "\\}",
-			"endCaptures": {
-				"0": {
-					"name": "punctuation.definition.mapping.end.yaml"
-				}
-			},
-			"name": "meta.flow-mapping.yaml",
-			"patterns": [
-				{
-					"include": "#prototype"
-				},
-				{
-					"match": ",",
-					"name": "punctuation.separator.mapping.yaml"
-				},
-				{
-					"include": "#flow-pair"
-				}
-			]
-		},
-		"flow-node": {
-			"patterns": [
-				{
-					"include": "#prototype"
-				},
-				{
-					"include": "#flow-alias"
-				},
-				{
-					"include": "#flow-collection"
-				},
-				{
-					"include": "#flow-scalar"
-				}
-			]
-		},
-		"flow-pair": {
-			"patterns": [
-				{
-					"begin": "\\?",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.key-value.begin.yaml"
-						}
-					},
-					"end": "(?=[},\\]])",
-					"name": "meta.flow-pair.explicit.yaml",
-					"patterns": [
-						{
-							"include": "#prototype"
-						},
-						{
-							"include": "#flow-pair"
-						},
-						{
-							"include": "#flow-node"
-						},
-						{
-							"begin": ":(?=\\s|$|[\\[\\]{},])",
-							"beginCaptures": {
-								"0": {
-									"name": "punctuation.separator.key-value.mapping.yaml"
-								}
-							},
-							"end": "(?=[},\\]])",
-							"patterns": [
-								{
-									"include": "#flow-value"
-								}
-							]
-						}
-					]
-				},
-				{
-					"begin": "(?x)\n                        (?=\n                            (?:\n                                [^\\s[-?:,\\[\\]{}#&*!|>'\"%@`]]\n                              | [?:-] [^\\s[\\[\\]{},]]\n                            )\n                            (\n                                  [^\\s:[\\[\\]{},]]\n                                | : [^\\s[\\[\\]{},]]\n                                | \\s+ (?![#\\s])\n                            )*\n                            \\s*\n                            :\n\t\t\t\t\t\t\t(\\s|$)\n                        )\n                    ",
-					"end": "(?x)\n                        (?=\n                              \\s* $\n                            | \\s+ \\#\n                            | \\s* : (\\s|$)\n                            | \\s* : [\\[\\]{},]\n                            | \\s* [\\[\\]{},]\n                        )\n                    ",
-					"name": "meta.flow-pair.key.yaml",
-					"patterns": [
-						{
-							"include": "#flow-scalar-plain-in-implicit-type"
-						},
-						{
-							"begin": "(?x)\n                                  [^\\s[-?:,\\[\\]{}#&*!|>'\"%@`]]\n                                | [?:-] [^\\s[\\[\\]{},]]\n                            ",
-							"beginCaptures": {
-								"0": {
-									"name": "entity.name.tag.yaml"
-								}
-							},
-							"contentName": "entity.name.tag.yaml",
-							"end": "(?x)\n                                (?=\n                                      \\s* $\n                                    | \\s+ \\#\n                                    | \\s* : (\\s|$)\n                                    | \\s* : [\\[\\]{},]\n                                    | \\s* [\\[\\]{},]\n                                )\n                            ",
-							"name": "string.unquoted.plain.in.yaml"
-						}
-					]
-				},
-				{
-					"include": "#flow-node"
-				},
-				{
-					"begin": ":(?=\\s|$|[\\[\\]{},])",
-					"captures": {
-						"0": {
-							"name": "punctuation.separator.key-value.mapping.yaml"
-						}
-					},
-					"end": "(?=[},\\]])",
-					"name": "meta.flow-pair.yaml",
-					"patterns": [
-						{
-							"include": "#flow-value"
-						}
-					]
-				}
-			]
-		},
-		"flow-scalar": {
-			"patterns": [
-				{
-					"include": "#flow-scalar-double-quoted"
-				},
-				{
-					"include": "#flow-scalar-single-quoted"
-				},
-				{
-					"include": "#flow-scalar-plain-in"
-				}
-			]
-		},
-		"flow-scalar-double-quoted": {
-			"begin": "\"",
-			"beginCaptures": {
-				"0": {
-					"name": "punctuation.definition.string.begin.yaml"
-				}
-			},
-			"end": "\"",
-			"endCaptures": {
-				"0": {
-					"name": "punctuation.definition.string.end.yaml"
-				}
-			},
-			"name": "string.quoted.double.yaml",
-			"patterns": [
-				{
-					"match": "\\\\([0abtnvfre \"/\\\\N_Lp]|x\\d\\d|u\\d{4}|U\\d{8})",
-					"name": "constant.character.escape.yaml"
-				},
-				{
-					"match": "\\\\\\n",
-					"name": "constant.character.escape.double-quoted.newline.yaml"
-				}
-			]
-		},
-		"flow-scalar-plain-in": {
-			"patterns": [
-				{
-					"include": "#flow-scalar-plain-in-implicit-type"
-				},
-				{
-					"begin": "(?x)\n                          [^\\s[-?:,\\[\\]{}#&*!|>'\"%@`]]\n                        | [?:-] [^\\s[\\[\\]{},]]\n                    ",
-					"end": "(?x)\n                        (?=\n                              \\s* $\n                            | \\s+ \\#\n                            | \\s* : (\\s|$)\n                            | \\s* : [\\[\\]{},]\n                            | \\s* [\\[\\]{},]\n                        )\n                    ",
-					"name": "string.unquoted.plain.in.yaml"
-				}
-			]
-		},
-		"flow-scalar-plain-in-implicit-type": {
-			"patterns": [
-				{
-					"captures": {
-						"1": {
-							"name": "constant.language.null.yaml"
-						},
-						"2": {
-							"name": "constant.language.boolean.yaml"
-						},
-						"3": {
-							"name": "constant.numeric.integer.yaml"
-						},
-						"4": {
-							"name": "constant.numeric.float.yaml"
-						},
-						"5": {
-							"name": "constant.other.timestamp.yaml"
-						},
-						"6": {
-							"name": "constant.language.value.yaml"
-						},
-						"7": {
-							"name": "constant.language.merge.yaml"
-						}
-					},
-					"match": "(?x)\n                        (?x:\n                              (null|Null|NULL|~)\n                            | (y|Y|yes|Yes|YES|n|N|no|No|NO|true|True|TRUE|false|False|FALSE|on|On|ON|off|Off|OFF)\n                            | (\n                                (?:\n                                      [-+]? 0b [0-1_]+ # (base 2)\n                                    | [-+]? 0  [0-7_]+ # (base 8)\n                                    | [-+]? (?: 0|[1-9][0-9_]*) # (base 10)\n                                    | [-+]? 0x [0-9a-fA-F_]+ # (base 16)\n                                    | [-+]? [1-9] [0-9_]* (?: :[0-5]?[0-9])+ # (base 60)\n                                )\n                              )\n                            | (\n                                (?x:\n                                      [-+]? (?: [0-9] [0-9_]*)? \\. [0-9.]* (?: [eE] [-+] [0-9]+)? # (base 10)\n                                    | [-+]? [0-9] [0-9_]* (?: :[0-5]?[0-9])+ \\. [0-9_]* # (base 60)\n                                    | [-+]? \\. (?: inf|Inf|INF) # (infinity)\n                                    |       \\. (?: nan|NaN|NAN) # (not a number)\n                                )\n                              )\n                            | (\n                                (?x:\n                                    \\d{4} - \\d{2} - \\d{2}           # (y-m-d)\n                                  | \\d{4}                           # (year)\n                                    - \\d{1,2}                       # (month)\n                                    - \\d{1,2}                       # (day)\n                                    (?: [Tt] | [ \\t]+) \\d{1,2}      # (hour)\n                                    : \\d{2}                         # (minute)\n                                    : \\d{2}                         # (second)\n                                    (?: \\.\\d*)?                     # (fraction)\n                                    (?:\n                                          (?:[ \\t]*) Z\n                                        | [-+] \\d{1,2} (?: :\\d{1,2})?\n                                    )?                              # (time zone)\n                                )\n                              )\n                            | (=)\n                            | (<<)\n                        )\n                        (?:\n                            (?=\n                                  \\s* $\n                                | \\s+ \\#\n                                | \\s* : (\\s|$)\n                                | \\s* : [\\[\\]{},]\n                                | \\s* [\\[\\]{},]\n                            )\n                        )\n                    "
-				}
-			]
-		},
-		"flow-scalar-plain-out": {
-			"patterns": [
-				{
-					"include": "#flow-scalar-plain-out-implicit-type"
-				},
-				{
-					"begin": "(?x)\n                          [^\\s[-?:,\\[\\]{}#&*!|>'\"%@`]]\n                        | [?:-] \\S\n                    ",
-					"end": "(?x)\n                        (?=\n                              \\s* $\n                            | \\s+ \\#\n                            | \\s* : (\\s|$)\n                        )\n                    ",
-					"name": "string.unquoted.plain.out.yaml"
-				}
-			]
-		},
-		"flow-scalar-plain-out-implicit-type": {
-			"patterns": [
-				{
-					"captures": {
-						"1": {
-							"name": "constant.language.null.yaml"
-						},
-						"2": {
-							"name": "constant.language.boolean.yaml"
-						},
-						"3": {
-							"name": "constant.numeric.integer.yaml"
-						},
-						"4": {
-							"name": "constant.numeric.float.yaml"
-						},
-						"5": {
-							"name": "constant.other.timestamp.yaml"
-						},
-						"6": {
-							"name": "constant.language.value.yaml"
-						},
-						"7": {
-							"name": "constant.language.merge.yaml"
-						}
-					},
-					"match": "(?x)\n                        (?x:\n                              (null|Null|NULL|~)\n                            | (y|Y|yes|Yes|YES|n|N|no|No|NO|true|True|TRUE|false|False|FALSE|on|On|ON|off|Off|OFF)\n                            | (\n                                (?:\n                                      [-+]? 0b [0-1_]+ # (base 2)\n                                    | [-+]? 0  [0-7_]+ # (base 8)\n                                    | [-+]? (?: 0|[1-9][0-9_]*) # (base 10)\n                                    | [-+]? 0x [0-9a-fA-F_]+ # (base 16)\n                                    | [-+]? [1-9] [0-9_]* (?: :[0-5]?[0-9])+ # (base 60)\n                                )\n                              )\n                            | (\n                                (?x:\n                                      [-+]? (?: [0-9] [0-9_]*)? \\. [0-9.]* (?: [eE] [-+] [0-9]+)? # (base 10)\n                                    | [-+]? [0-9] [0-9_]* (?: :[0-5]?[0-9])+ \\. [0-9_]* # (base 60)\n                                    | [-+]? \\. (?: inf|Inf|INF) # (infinity)\n                                    |       \\. (?: nan|NaN|NAN) # (not a number)\n                                )\n                              )\n                            | (\n                                (?x:\n                                    \\d{4} - \\d{2} - \\d{2}           # (y-m-d)\n                                  | \\d{4}                           # (year)\n                                    - \\d{1,2}                       # (month)\n                                    - \\d{1,2}                       # (day)\n                                    (?: [Tt] | [ \\t]+) \\d{1,2}      # (hour)\n                                    : \\d{2}                         # (minute)\n                                    : \\d{2}                         # (second)\n                                    (?: \\.\\d*)?                     # (fraction)\n                                    (?:\n                                          (?:[ \\t]*) Z\n                                        | [-+] \\d{1,2} (?: :\\d{1,2})?\n                                    )?                              # (time zone)\n                                )\n                              )\n                            | (=)\n                            | (<<)\n                        )\n                        (?x:\n                            (?=\n                                  \\s* $\n                                | \\s+ \\#\n                                | \\s* : (\\s|$)\n                            )\n                        )\n                    "
-				}
-			]
-		},
-		"flow-scalar-single-quoted": {
-			"begin": "'",
-			"beginCaptures": {
-				"0": {
-					"name": "punctuation.definition.string.begin.yaml"
-				}
-			},
+		"block-map-key-single": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-c-single-quoted (BLOCK-KEY)",
+			"begin": "\\G'",
 			"end": "'(?!')",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.yaml"
+				}
+			},
 			"endCaptures": {
 				"0": {
 					"name": "punctuation.definition.string.end.yaml"
 				}
 			},
-			"name": "string.quoted.single.yaml",
+			"name": "meta.map.key.yaml string.quoted.single.yaml entity.name.tag.yaml",
 			"patterns": [
+				{
+					"match": ".[\t ]*+$",
+					"name": "invalid.illegal.multiline-key.yaml"
+				},
+				{
+					"match": "[^\t -\\x{10FFFF}]++",
+					"name": "invalid.illegal.character.yaml"
+				},
 				{
 					"match": "''",
-					"name": "constant.character.escape.single-quoted.yaml"
+					"name": "constant.character.escape.single-quote.yaml"
 				}
 			]
 		},
-		"flow-sequence": {
-			"begin": "\\[",
+		"key-single": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-c-single-quoted (FLOW-OUT)",
+			"begin": "'",
+			"end": "'(?!')",
 			"beginCaptures": {
 				"0": {
-					"name": "punctuation.definition.sequence.begin.yaml"
+					"name": "punctuation.definition.string.begin.yaml"
 				}
 			},
-			"end": "\\]",
 			"endCaptures": {
 				"0": {
-					"name": "punctuation.definition.sequence.end.yaml"
+					"name": "punctuation.definition.string.end.yaml"
 				}
 			},
-			"name": "meta.flow-sequence.yaml",
+			"name": "meta.map.key.yaml string.quoted.single.yaml entity.name.tag.yaml",
 			"patterns": [
 				{
-					"include": "#prototype"
+					"match": "[^\t -\\x{10FFFF}]++",
+					"name": "invalid.illegal.character.yaml"
 				},
 				{
-					"match": ",",
-					"name": "punctuation.separator.sequence.yaml"
-				},
-				{
-					"include": "#flow-pair"
-				},
-				{
-					"include": "#flow-node"
+					"match": "''",
+					"name": "constant.character.escape.single-quote.yaml"
 				}
 			]
 		},
-		"flow-value": {
-			"patterns": [
-				{
-					"begin": "\\G(?![},\\]])",
-					"end": "(?=[},\\]])",
-					"name": "meta.flow-pair.value.yaml",
-					"patterns": [
-						{
-							"include": "#flow-node"
-						}
-					]
-				}
-			]
-		},
-		"node": {
-			"patterns": [
-				{
-					"include": "#block-node"
-				}
-			]
-		},
-		"property": {
-			"begin": "(?=!|&)",
-			"end": "(?!\\G)",
-			"name": "meta.property.yaml",
-			"patterns": [
-				{
-					"captures": {
-						"1": {
-							"name": "keyword.control.property.anchor.yaml"
-						},
-						"2": {
-							"name": "punctuation.definition.anchor.yaml"
-						},
-						"3": {
-							"name": "entity.name.type.anchor.yaml"
-						},
-						"4": {
-							"name": "invalid.illegal.character.anchor.yaml"
-						}
-					},
-					"match": "\\G((&))([^\\s\\[\\]/{/},]+)(\\S+)?"
-				},
-				{
-					"match": "(?x)\n                        \\G\n                        (?:\n                            ! < (?: %[0-9A-Fa-f]{2} | [0-9A-Za-z\\-#;/?:@&=+$,_.!~*'()\\[\\]] )+ >\n                          | (?:!(?:[0-9A-Za-z\\-]*!)?) (?: %[0-9A-Fa-f]{2} | [0-9A-Za-z\\-#;/?:@&=+$_.~*'()] )+\n                          | !\n                        )\n                        (?=\\ |\\t|$)\n                    ",
-					"name": "storage.type.tag-handle.yaml"
-				},
-				{
-					"match": "\\S+",
-					"name": "invalid.illegal.tag-handle.yaml"
-				}
-			]
-		},
-		"prototype": {
-			"patterns": [
-				{
-					"include": "#comment"
-				},
-				{
-					"include": "#property"
-				}
-			]
+		"non-printable": {
+			"//": {
+				"85": "…",
+				"2028": "",
+				"2029": "",
+				"10000": "𐀀",
+				"A0": " ",
+				"D7FF": "퟿",
+				"E000": "",
+				"FFFD": "�",
+				"FEFF": "",
+				"FFFF": "￿",
+				"10FFFF": "􏿿"
+			},
+			"//match": "[\\p{Cntrl}\\p{Surrogate}\\x{FFFE FFFF}&&[^\t\n\r\\x{85}]]++",
+			"match": "[^\t\n\r -~\\x{85}\\x{A0}-\\x{D7FF}\\x{E000}-\\x{FFFD}\\x{010000}-\\x{10FFFF}]++",
+			"name": "invalid.illegal.non-printable.yaml"
 		}
 	}
 }
\ No newline at end of file
diff --git a/extensions/yaml/yarn.lock b/extensions/yaml/yarn.lock
deleted file mode 100644
index fb57ccd13af..00000000000
--- a/extensions/yaml/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/extensions/yarn.lock b/extensions/yarn.lock
deleted file mode 100644
index cb3213ad8e7..00000000000
--- a/extensions/yarn.lock
+++ /dev/null
@@ -1,248 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@esbuild/aix-ppc64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.20.0.tgz#509621cca4e67caf0d18561a0c56f8b70237472f"
-  integrity sha512-fGFDEctNh0CcSwsiRPxiaqX0P5rq+AqE0SRhYGZ4PX46Lg1FNR6oCxJghf8YgY0WQEgQuh3lErUFE4KxLeRmmw==
-
-"@esbuild/android-arm64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.20.0.tgz#109a6fdc4a2783fc26193d2687827045d8fef5ab"
-  integrity sha512-aVpnM4lURNkp0D3qPoAzSG92VXStYmoVPOgXveAUoQBWRSuQzt51yvSju29J6AHPmwY1BjH49uR29oyfH1ra8Q==
-
-"@esbuild/android-arm@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.20.0.tgz#1397a2c54c476c4799f9b9073550ede496c94ba5"
-  integrity sha512-3bMAfInvByLHfJwYPJRlpTeaQA75n8C/QKpEaiS4HrFWFiJlNI0vzq/zCjBrhAYcPyVPG7Eo9dMrcQXuqmNk5g==
-
-"@esbuild/android-x64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.20.0.tgz#2b615abefb50dc0a70ac313971102f4ce2fdb3ca"
-  integrity sha512-uK7wAnlRvjkCPzh8jJ+QejFyrP8ObKuR5cBIsQZ+qbMunwR8sbd8krmMbxTLSrDhiPZaJYKQAU5Y3iMDcZPhyQ==
-
-"@esbuild/darwin-arm64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.20.0.tgz#5c122ed799eb0c35b9d571097f77254964c276a2"
-  integrity sha512-AjEcivGAlPs3UAcJedMa9qYg9eSfU6FnGHJjT8s346HSKkrcWlYezGE8VaO2xKfvvlZkgAhyvl06OJOxiMgOYQ==
-
-"@esbuild/darwin-x64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.20.0.tgz#9561d277002ba8caf1524f209de2b22e93d170c1"
-  integrity sha512-bsgTPoyYDnPv8ER0HqnJggXK6RyFy4PH4rtsId0V7Efa90u2+EifxytE9pZnsDgExgkARy24WUQGv9irVbTvIw==
-
-"@esbuild/freebsd-arm64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.0.tgz#84178986a3138e8500d17cc380044868176dd821"
-  integrity sha512-kQ7jYdlKS335mpGbMW5tEe3IrQFIok9r84EM3PXB8qBFJPSc6dpWfrtsC/y1pyrz82xfUIn5ZrnSHQQsd6jebQ==
-
-"@esbuild/freebsd-x64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.20.0.tgz#3f9ce53344af2f08d178551cd475629147324a83"
-  integrity sha512-uG8B0WSepMRsBNVXAQcHf9+Ko/Tr+XqmK7Ptel9HVmnykupXdS4J7ovSQUIi0tQGIndhbqWLaIL/qO/cWhXKyQ==
-
-"@esbuild/linux-arm64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.20.0.tgz#24efa685515689df4ecbc13031fa0a9dda910a11"
-  integrity sha512-uTtyYAP5veqi2z9b6Gr0NUoNv9F/rOzI8tOD5jKcCvRUn7T60Bb+42NDBCWNhMjkQzI0qqwXkQGo1SY41G52nw==
-
-"@esbuild/linux-arm@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.20.0.tgz#6b586a488e02e9b073a75a957f2952b3b6e87b4c"
-  integrity sha512-2ezuhdiZw8vuHf1HKSf4TIk80naTbP9At7sOqZmdVwvvMyuoDiZB49YZKLsLOfKIr77+I40dWpHVeY5JHpIEIg==
-
-"@esbuild/linux-ia32@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.20.0.tgz#84ce7864f762708dcebc1b123898a397dea13624"
-  integrity sha512-c88wwtfs8tTffPaoJ+SQn3y+lKtgTzyjkD8NgsyCtCmtoIC8RDL7PrJU05an/e9VuAke6eJqGkoMhJK1RY6z4w==
-
-"@esbuild/linux-loong64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.20.0.tgz#1922f571f4cae1958e3ad29439c563f7d4fd9037"
-  integrity sha512-lR2rr/128/6svngnVta6JN4gxSXle/yZEZL3o4XZ6esOqhyR4wsKyfu6qXAL04S4S5CgGfG+GYZnjFd4YiG3Aw==
-
-"@esbuild/linux-mips64el@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.20.0.tgz#7ca1bd9df3f874d18dbf46af009aebdb881188fe"
-  integrity sha512-9Sycc+1uUsDnJCelDf6ZNqgZQoK1mJvFtqf2MUz4ujTxGhvCWw+4chYfDLPepMEvVL9PDwn6HrXad5yOrNzIsQ==
-
-"@esbuild/linux-ppc64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.20.0.tgz#8f95baf05f9486343bceeb683703875d698708a4"
-  integrity sha512-CoWSaaAXOZd+CjbUTdXIJE/t7Oz+4g90A3VBCHLbfuc5yUQU/nFDLOzQsN0cdxgXd97lYW/psIIBdjzQIwTBGw==
-
-"@esbuild/linux-riscv64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.20.0.tgz#ca63b921d5fe315e28610deb0c195e79b1a262ca"
-  integrity sha512-mlb1hg/eYRJUpv8h/x+4ShgoNLL8wgZ64SUr26KwglTYnwAWjkhR2GpoKftDbPOCnodA9t4Y/b68H4J9XmmPzA==
-
-"@esbuild/linux-s390x@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.20.0.tgz#cb3d069f47dc202f785c997175f2307531371ef8"
-  integrity sha512-fgf9ubb53xSnOBqyvWEY6ukBNRl1mVX1srPNu06B6mNsNK20JfH6xV6jECzrQ69/VMiTLvHMicQR/PgTOgqJUQ==
-
-"@esbuild/linux-x64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.20.0.tgz#ac617e0dc14e9758d3d7efd70288c14122557dc7"
-  integrity sha512-H9Eu6MGse++204XZcYsse1yFHmRXEWgadk2N58O/xd50P9EvFMLJTQLg+lB4E1cF2xhLZU5luSWtGTb0l9UeSg==
-
-"@esbuild/netbsd-x64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.20.0.tgz#6cc778567f1513da6e08060e0aeb41f82eb0f53c"
-  integrity sha512-lCT675rTN1v8Fo+RGrE5KjSnfY0x9Og4RN7t7lVrN3vMSjy34/+3na0q7RIfWDAj0e0rCh0OL+P88lu3Rt21MQ==
-
-"@esbuild/openbsd-x64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.20.0.tgz#76848bcf76b4372574fb4d06cd0ed1fb29ec0fbe"
-  integrity sha512-HKoUGXz/TOVXKQ+67NhxyHv+aDSZf44QpWLa3I1lLvAwGq8x1k0T+e2HHSRvxWhfJrFxaaqre1+YyzQ99KixoA==
-
-"@esbuild/sunos-x64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.20.0.tgz#ea4cd0639bf294ad51bc08ffbb2dac297e9b4706"
-  integrity sha512-GDwAqgHQm1mVoPppGsoq4WJwT3vhnz/2N62CzhvApFD1eJyTroob30FPpOZabN+FgCjhG+AgcZyOPIkR8dfD7g==
-
-"@esbuild/win32-arm64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.20.0.tgz#a5c171e4a7f7e4e8be0e9947a65812c1535a7cf0"
-  integrity sha512-0vYsP8aC4TvMlOQYozoksiaxjlvUcQrac+muDqj1Fxy6jh9l9CZJzj7zmh8JGfiV49cYLTorFLxg7593pGldwQ==
-
-"@esbuild/win32-ia32@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.20.0.tgz#f8ac5650c412d33ea62d7551e0caf82da52b7f85"
-  integrity sha512-p98u4rIgfh4gdpV00IqknBD5pC84LCub+4a3MO+zjqvU5MVXOc3hqR2UgT2jI2nh3h8s9EQxmOsVI3tyzv1iFg==
-
-"@esbuild/win32-x64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.20.0.tgz#2efddf82828aac85e64cef62482af61c29561bee"
-  integrity sha512-NgJnesu1RtWihtTtXGFMU5YSE6JyyHPMxCwBZK7a6/8d31GuSo9l0Ss7w1Jw5QnKUawG6UEehs883kcXf5fYwg==
-
-"@parcel/watcher@2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.1.0.tgz#5f32969362db4893922c526a842d8af7a8538545"
-  integrity sha512-8s8yYjd19pDSsBpbkOHnT6Z2+UJSuLQx61pCFM0s5wSRvKCEMDjd/cHY3/GI1szHIWbpXpsJdg3V6ISGGx9xDw==
-  dependencies:
-    is-glob "^4.0.3"
-    micromatch "^4.0.5"
-    node-addon-api "^3.2.1"
-    node-gyp-build "^4.3.0"
-
-braces@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
-  dependencies:
-    fill-range "^7.0.1"
-
-coffeescript@1.12.7:
-  version "1.12.7"
-  resolved "https://registry.yarnpkg.com/coffeescript/-/coffeescript-1.12.7.tgz#e57ee4c4867cf7f606bfc4a0f2d550c0981ddd27"
-  integrity sha512-pLXHFxQMPklVoEekowk8b3erNynC+DVJzChxS/LCBBgR6/8AJkHivkm//zbowcfc7BTCAjryuhx6gPqPRfsFoA==
-
-cson-parser@^4.0.9:
-  version "4.0.9"
-  resolved "https://registry.yarnpkg.com/cson-parser/-/cson-parser-4.0.9.tgz#eef0cf77edd057f97861ef800300c8239224eedb"
-  integrity sha512-I79SAcCYquWnEfXYj8hBqOOWKj6eH6zX1hhX3yqmS4K3bYp7jME3UFpHPzu3rUew0oyfc0s8T6IlWGXRAheHag==
-  dependencies:
-    coffeescript "1.12.7"
-
-esbuild@0.20.0:
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.20.0.tgz#a7170b63447286cd2ff1f01579f09970e6965da4"
-  integrity sha512-6iwE3Y2RVYCME1jLpBqq7LQWK3MW6vjV2bZy6gt/WrqkY+WE74Spyc0ThAOYpMtITvnjX09CrC6ym7A/m9mebA==
-  optionalDependencies:
-    "@esbuild/aix-ppc64" "0.20.0"
-    "@esbuild/android-arm" "0.20.0"
-    "@esbuild/android-arm64" "0.20.0"
-    "@esbuild/android-x64" "0.20.0"
-    "@esbuild/darwin-arm64" "0.20.0"
-    "@esbuild/darwin-x64" "0.20.0"
-    "@esbuild/freebsd-arm64" "0.20.0"
-    "@esbuild/freebsd-x64" "0.20.0"
-    "@esbuild/linux-arm" "0.20.0"
-    "@esbuild/linux-arm64" "0.20.0"
-    "@esbuild/linux-ia32" "0.20.0"
-    "@esbuild/linux-loong64" "0.20.0"
-    "@esbuild/linux-mips64el" "0.20.0"
-    "@esbuild/linux-ppc64" "0.20.0"
-    "@esbuild/linux-riscv64" "0.20.0"
-    "@esbuild/linux-s390x" "0.20.0"
-    "@esbuild/linux-x64" "0.20.0"
-    "@esbuild/netbsd-x64" "0.20.0"
-    "@esbuild/openbsd-x64" "0.20.0"
-    "@esbuild/sunos-x64" "0.20.0"
-    "@esbuild/win32-arm64" "0.20.0"
-    "@esbuild/win32-ia32" "0.20.0"
-    "@esbuild/win32-x64" "0.20.0"
-
-fast-plist@0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/fast-plist/-/fast-plist-0.1.2.tgz#a45aff345196006d406ca6cdcd05f69051ef35b8"
-  integrity sha1-pFr/NFGWAG1AbKbNzQX2kFHvNbg=
-
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
-  dependencies:
-    to-regex-range "^5.0.1"
-
-is-extglob@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
-
-is-glob@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
-  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
-  dependencies:
-    is-extglob "^2.1.1"
-
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-
-micromatch@^4.0.5:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
-  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
-  dependencies:
-    braces "^3.0.2"
-    picomatch "^2.3.1"
-
-node-addon-api@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
-  integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
-
-node-gyp-build@4.8.1, node-gyp-build@^4.3.0:
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.8.1.tgz#976d3ad905e71b76086f4f0b0d3637fe79b6cda5"
-  integrity sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw==
-
-picomatch@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
-  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
-
-to-regex-range@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-  dependencies:
-    is-number "^7.0.0"
-
-typescript@^5.5.0-dev.20240603:
-  version "5.5.0-dev.20240603"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.0-dev.20240603.tgz#a1b7311df5039a8abbaaa2213c21cac6ec547490"
-  integrity sha512-gdm3Sh1A+Pjj9ZlfBEJY3o2rs3tvpcSbu3vYqcCijMe09BePQBtZlsuShuPn+zCnP+qBLxdKjFiw5v1tkna3tA==
-
-vscode-grammar-updater@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/vscode-grammar-updater/-/vscode-grammar-updater-1.1.0.tgz#030eacd8b8ba8f3f2fe43c9032601f839ba811c4"
-  integrity sha512-rWcJXyEFK27Mh9bxfBTLaul0KiGQk0GMXj2qTDH9cy3UZVx5MrF035B03os1w4oIXwl/QDhdLnsBK0j2SNiL1A==
-  dependencies:
-    cson-parser "^4.0.9"
-    fast-plist "0.1.2"
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 00000000000..a02da2958b1
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,18810 @@
+{
+  "name": "code-oss-dev",
+  "version": "1.95.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "code-oss-dev",
+      "version": "1.95.0",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "dependencies": {
+        "@microsoft/1ds-core-js": "^3.2.13",
+        "@microsoft/1ds-post-js": "^3.2.13",
+        "@parcel/watcher": "2.1.0",
+        "@vscode/deviceid": "^0.1.1",
+        "@vscode/iconv-lite-umd": "0.7.0",
+        "@vscode/policy-watcher": "^1.1.4",
+        "@vscode/proxy-agent": "^0.22.0",
+        "@vscode/ripgrep": "^1.15.9",
+        "@vscode/spdlog": "^0.15.0",
+        "@vscode/sqlite3": "5.1.6-vscode",
+        "@vscode/sudo-prompt": "9.3.1",
+        "@vscode/tree-sitter-wasm": "^0.0.4",
+        "@vscode/vscode-languagedetection": "1.0.21",
+        "@vscode/windows-mutex": "^0.5.0",
+        "@vscode/windows-process-tree": "^0.6.0",
+        "@vscode/windows-registry": "^1.1.0",
+        "@xterm/addon-clipboard": "^0.2.0-beta.48",
+        "@xterm/addon-image": "^0.9.0-beta.65",
+        "@xterm/addon-search": "^0.16.0-beta.65",
+        "@xterm/addon-serialize": "^0.14.0-beta.65",
+        "@xterm/addon-unicode11": "^0.9.0-beta.65",
+        "@xterm/addon-webgl": "^0.19.0-beta.65",
+        "@xterm/headless": "^5.6.0-beta.65",
+        "@xterm/xterm": "^5.6.0-beta.65",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.2",
+        "jschardet": "3.1.4",
+        "kerberos": "2.1.1",
+        "minimist": "^1.2.6",
+        "native-is-elevated": "0.7.0",
+        "native-keymap": "^3.3.5",
+        "native-watchdog": "^1.4.1",
+        "node-pty": "^1.1.0-beta22",
+        "open": "^8.4.2",
+        "tas-client-umd": "0.2.0",
+        "v8-inspect-profiler": "^0.1.1",
+        "vscode-oniguruma": "1.7.0",
+        "vscode-regexpp": "^3.1.0",
+        "vscode-textmate": "9.1.0",
+        "yauzl": "^3.0.0",
+        "yazl": "^2.4.3"
+      },
+      "devDependencies": {
+        "@playwright/test": "^1.46.1",
+        "@swc/core": "1.3.62",
+        "@types/cookie": "^0.3.3",
+        "@types/debug": "^4.1.5",
+        "@types/eslint": "^8.56.10",
+        "@types/gulp-svgmin": "^1.2.1",
+        "@types/http-proxy-agent": "^2.0.1",
+        "@types/kerberos": "^1.1.2",
+        "@types/minimist": "^1.2.1",
+        "@types/mocha": "^9.1.1",
+        "@types/node": "20.x",
+        "@types/sinon": "^10.0.2",
+        "@types/sinon-test": "^2.4.2",
+        "@types/trusted-types": "^1.0.6",
+        "@types/vscode-notebook-renderer": "^1.72.0",
+        "@types/webpack": "^5.28.5",
+        "@types/wicg-file-system-access": "^2020.9.6",
+        "@types/windows-foreground-love": "^0.3.0",
+        "@types/winreg": "^1.2.30",
+        "@types/yauzl": "^2.10.0",
+        "@types/yazl": "^2.4.2",
+        "@typescript-eslint/eslint-plugin": "^6.21.0",
+        "@typescript-eslint/experimental-utils": "^5.57.0",
+        "@typescript-eslint/parser": "^6.21.0",
+        "@vscode/gulp-electron": "^1.36.0",
+        "@vscode/l10n-dev": "0.0.35",
+        "@vscode/telemetry-extractor": "^1.10.2",
+        "@vscode/test-cli": "^0.0.6",
+        "@vscode/test-electron": "^2.4.0",
+        "@vscode/test-web": "^0.0.60",
+        "@vscode/v8-heap-parser": "^0.1.0",
+        "@vscode/vscode-perf": "^0.0.14",
+        "@webgpu/types": "^0.1.44",
+        "ansi-colors": "^3.2.3",
+        "asar": "^3.0.3",
+        "chromium-pickle-js": "^0.2.0",
+        "cookie": "^0.4.0",
+        "copy-webpack-plugin": "^11.0.0",
+        "css-loader": "^6.9.1",
+        "cssnano": "^6.0.3",
+        "debounce": "^1.0.0",
+        "deemon": "^1.8.0",
+        "electron": "30.5.1",
+        "eslint": "8.36.0",
+        "eslint-plugin-header": "3.1.1",
+        "eslint-plugin-jsdoc": "^46.5.0",
+        "eslint-plugin-local": "^1.0.0",
+        "event-stream": "3.3.4",
+        "fancy-log": "^1.3.3",
+        "file-loader": "^6.2.0",
+        "glob": "^5.0.13",
+        "gulp": "^4.0.0",
+        "gulp-azure-storage": "^0.12.1",
+        "gulp-bom": "^3.0.0",
+        "gulp-buffer": "0.0.2",
+        "gulp-concat": "^2.6.1",
+        "gulp-filter": "^5.1.0",
+        "gulp-flatmap": "^1.0.2",
+        "gulp-gunzip": "^1.0.0",
+        "gulp-gzip": "^1.4.2",
+        "gulp-json-editor": "^2.5.0",
+        "gulp-plumber": "^1.2.0",
+        "gulp-rename": "^1.2.0",
+        "gulp-replace": "^0.5.4",
+        "gulp-sourcemaps": "^3.0.0",
+        "gulp-svgmin": "^4.1.0",
+        "gulp-untar": "^0.0.7",
+        "husky": "^0.13.1",
+        "innosetup": "6.0.5",
+        "istanbul-lib-coverage": "^3.2.0",
+        "istanbul-lib-instrument": "^6.0.1",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^4.0.1",
+        "istanbul-reports": "^3.1.5",
+        "lazy.js": "^0.4.2",
+        "merge-options": "^1.0.1",
+        "mime": "^1.4.1",
+        "minimatch": "^3.0.4",
+        "minimist": "^1.2.6",
+        "mocha": "^10.2.0",
+        "mocha-junit-reporter": "^2.2.1",
+        "mocha-multi-reporters": "^1.5.1",
+        "npm-run-all": "^4.1.5",
+        "opn": "^6.0.0",
+        "os-browserify": "^0.3.0",
+        "p-all": "^1.0.0",
+        "path-browserify": "^1.0.1",
+        "postcss": "^8.4.33",
+        "postcss-nesting": "^12.0.2",
+        "pump": "^1.0.1",
+        "rcedit": "^1.1.0",
+        "rimraf": "^2.2.8",
+        "sinon": "^12.0.1",
+        "sinon-test": "^3.1.3",
+        "source-map": "0.6.1",
+        "source-map-support": "^0.3.2",
+        "style-loader": "^3.3.2",
+        "ts-loader": "^9.4.2",
+        "ts-node": "^10.9.1",
+        "tsec": "0.2.7",
+        "tslib": "^2.6.3",
+        "typescript": "^5.7.0-dev.20240927",
+        "util": "^0.12.4",
+        "webpack": "^5.94.0",
+        "webpack-cli": "^5.1.4",
+        "webpack-stream": "^7.0.0",
+        "xml2js": "^0.5.0",
+        "yaserver": "^0.4.0"
+      },
+      "optionalDependencies": {
+        "windows-foreground-love": "0.5.0"
+      }
+    },
+    "node_modules/@ampproject/remapping": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
+      "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.1.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@azure-rest/ai-translation-text": {
+      "version": "1.0.0-beta.1",
+      "resolved": "https://registry.npmjs.org/@azure-rest/ai-translation-text/-/ai-translation-text-1.0.0-beta.1.tgz",
+      "integrity": "sha512-h1xDrmVRbk6eAAqTHxy9Npv543cWteqgop15sVXBQhadOwzHoREn+UqMCzNfvL6/AjiInUlwNSaNQK1ANgobLA==",
+      "dev": true,
+      "dependencies": {
+        "@azure-rest/core-client": "^1.1.0",
+        "@azure/core-auth": "^1.3.0",
+        "@azure/core-rest-pipeline": "^1.8.0",
+        "@azure/logger": "^1.0.0",
+        "tslib": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@azure-rest/core-client": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@azure-rest/core-client/-/core-client-1.4.0.tgz",
+      "integrity": "sha512-ozTDPBVUDR5eOnMIwhggbnVmOrka4fXCs8n8mvUo4WLLc38kki6bAOByDoVZZPz/pZy2jMt2kwfpvy/UjALj6w==",
+      "dev": true,
+      "dependencies": {
+        "@azure/abort-controller": "^2.0.0",
+        "@azure/core-auth": "^1.3.0",
+        "@azure/core-rest-pipeline": "^1.5.0",
+        "@azure/core-tracing": "^1.0.1",
+        "@azure/core-util": "^1.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@azure/abort-controller": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-2.1.2.tgz",
+      "integrity": "sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@azure/core-asynciterator-polyfill": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@azure/core-asynciterator-polyfill/-/core-asynciterator-polyfill-1.0.0.tgz",
+      "integrity": "sha512-kmv8CGrPfN9SwMwrkiBK9VTQYxdFQEGe0BmQk+M8io56P9KNzpAxcWE/1fxJj7uouwN4kXF0BHW8DNlgx+wtCg==",
+      "dev": true
+    },
+    "node_modules/@azure/core-auth": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.7.2.tgz",
+      "integrity": "sha512-Igm/S3fDYmnMq1uKS38Ae1/m37B3zigdlZw+kocwEhh5GjyKjPrXKO2J6rzpC1wAxrNil/jX9BJRqBshyjnF3g==",
+      "dev": true,
+      "dependencies": {
+        "@azure/abort-controller": "^2.0.0",
+        "@azure/core-util": "^1.1.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@azure/core-http": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/@azure/core-http/-/core-http-2.2.2.tgz",
+      "integrity": "sha512-V1DdoO9V/sFimKpdWoNBgsE+QUjQgpXYnxrTdUp5RyhsTJjvEVn/HKmTQXIHuLUUo6IyIWj+B+Dg4VaXse9dIA==",
+      "dev": true,
+      "dependencies": {
+        "@azure/abort-controller": "^1.0.0",
+        "@azure/core-asynciterator-polyfill": "^1.0.0",
+        "@azure/core-auth": "^1.3.0",
+        "@azure/core-tracing": "1.0.0-preview.13",
+        "@azure/logger": "^1.0.0",
+        "@types/node-fetch": "^2.5.0",
+        "@types/tunnel": "^0.0.3",
+        "form-data": "^4.0.0",
+        "node-fetch": "^2.6.0",
+        "process": "^0.11.10",
+        "tough-cookie": "^4.0.0",
+        "tslib": "^2.2.0",
+        "tunnel": "^0.0.6",
+        "uuid": "^8.3.0",
+        "xml2js": "^0.4.19"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@azure/core-http/node_modules/@azure/abort-controller": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-1.0.4.tgz",
+      "integrity": "sha512-lNUmDRVGpanCsiUN3NWxFTdwmdFI53xwhkTFfHDGTYk46ca7Ind3nanJc+U6Zj9Tv+9nTCWRBscWEW1DyKOpTw==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@azure/core-http/node_modules/@azure/core-tracing": {
+      "version": "1.0.0-preview.13",
+      "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.0.0-preview.13.tgz",
+      "integrity": "sha512-KxDlhXyMlh2Jhj2ykX6vNEU0Vou4nHr025KoSEiz7cS3BNiHNaZcdECk/DmLkEB0as5T7b/TpRcehJ5yV6NeXQ==",
+      "dev": true,
+      "dependencies": {
+        "@opentelemetry/api": "^1.0.1",
+        "tslib": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@azure/core-http/node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "dev": true,
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/@azure/core-http/node_modules/xml2js": {
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
+      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+      "dev": true,
+      "dependencies": {
+        "sax": ">=0.6.0",
+        "xmlbuilder": "~11.0.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/@azure/core-http/node_modules/xmlbuilder": {
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/@azure/core-lro": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.2.1.tgz",
+      "integrity": "sha512-HE6PBl+mlKa0eBsLwusHqAqjLc5n9ByxeDo3Hz4kF3B1hqHvRkBr4oMgoT6tX7Hc3q97KfDctDUon7EhvoeHPA==",
+      "dev": true,
+      "dependencies": {
+        "@azure/abort-controller": "^1.0.0",
+        "@azure/core-tracing": "1.0.0-preview.13",
+        "@azure/logger": "^1.0.0",
+        "tslib": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@azure/core-lro/node_modules/@azure/abort-controller": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-1.0.4.tgz",
+      "integrity": "sha512-lNUmDRVGpanCsiUN3NWxFTdwmdFI53xwhkTFfHDGTYk46ca7Ind3nanJc+U6Zj9Tv+9nTCWRBscWEW1DyKOpTw==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@azure/core-lro/node_modules/@azure/core-tracing": {
+      "version": "1.0.0-preview.13",
+      "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.0.0-preview.13.tgz",
+      "integrity": "sha512-KxDlhXyMlh2Jhj2ykX6vNEU0Vou4nHr025KoSEiz7cS3BNiHNaZcdECk/DmLkEB0as5T7b/TpRcehJ5yV6NeXQ==",
+      "dev": true,
+      "dependencies": {
+        "@opentelemetry/api": "^1.0.1",
+        "tslib": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@azure/core-paging": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@azure/core-paging/-/core-paging-1.2.0.tgz",
+      "integrity": "sha512-ZX1bCjm/MjKPCN6kQD/9GJErYSoKA8YWp6YWoo5EIzcTWlSBLXu3gNaBTUl8usGl+UShiKo7b4Gdy1NSTIlpZg==",
+      "dev": true,
+      "dependencies": {
+        "@azure/core-asynciterator-polyfill": "^1.0.0",
+        "tslib": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@azure/core-rest-pipeline": {
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.16.0.tgz",
+      "integrity": "sha512-CeuTvsXxCUmEuxH5g/aceuSl6w2EugvNHKAtKKVdiX915EjJJxAwfzNNWZreNnbxHZ2fi0zaM6wwS23x2JVqSQ==",
+      "dev": true,
+      "dependencies": {
+        "@azure/abort-controller": "^2.0.0",
+        "@azure/core-auth": "^1.4.0",
+        "@azure/core-tracing": "^1.0.1",
+        "@azure/core-util": "^1.9.0",
+        "@azure/logger": "^1.0.0",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@azure/core-tracing": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.1.2.tgz",
+      "integrity": "sha512-dawW9ifvWAWmUm9/h+/UQ2jrdvjCJ7VJEuCJ6XVNudzcOwm53BFZH4Q845vjfgoUAM8ZxokvVNxNxAITc502YA==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@azure/core-util": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@azure/core-util/-/core-util-1.9.0.tgz",
+      "integrity": "sha512-AfalUQ1ZppaKuxPPMsFEUdX6GZPB3d9paR9d/TTL7Ow2De8cJaC7ibi7kWVlFAVPCYo31OcnGymc0R89DX8Oaw==",
+      "dev": true,
+      "dependencies": {
+        "@azure/abort-controller": "^2.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@azure/logger": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@azure/logger/-/logger-1.0.3.tgz",
+      "integrity": "sha512-aK4s3Xxjrx3daZr3VylxejK3vG5ExXck5WOHDJ8in/k9AqlfIyFMMT1uG7u8mNjX+QRILTIn0/Xgschfh/dQ9g==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@azure/storage-blob": {
+      "version": "12.8.0",
+      "resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.8.0.tgz",
+      "integrity": "sha512-c8+Wz19xauW0bGkTCoqZH4dYfbtBniPiGiRQOn1ca6G5jsjr4azwaTk9gwjVY8r3vY2Taf95eivLzipfIfiS4A==",
+      "dev": true,
+      "dependencies": {
+        "@azure/abort-controller": "^1.0.0",
+        "@azure/core-http": "^2.0.0",
+        "@azure/core-lro": "^2.2.0",
+        "@azure/core-paging": "^1.1.1",
+        "@azure/core-tracing": "1.0.0-preview.13",
+        "@azure/logger": "^1.0.0",
+        "events": "^3.0.0",
+        "tslib": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@azure/storage-blob/node_modules/@azure/abort-controller": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-1.0.4.tgz",
+      "integrity": "sha512-lNUmDRVGpanCsiUN3NWxFTdwmdFI53xwhkTFfHDGTYk46ca7Ind3nanJc+U6Zj9Tv+9nTCWRBscWEW1DyKOpTw==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@azure/storage-blob/node_modules/@azure/core-tracing": {
+      "version": "1.0.0-preview.13",
+      "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.0.0-preview.13.tgz",
+      "integrity": "sha512-KxDlhXyMlh2Jhj2ykX6vNEU0Vou4nHr025KoSEiz7cS3BNiHNaZcdECk/DmLkEB0as5T7b/TpRcehJ5yV6NeXQ==",
+      "dev": true,
+      "dependencies": {
+        "@opentelemetry/api": "^1.0.1",
+        "tslib": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.22.13",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
+      "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/highlight": "^7.22.13",
+        "chalk": "^2.4.2"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/code-frame/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/code-frame/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/code-frame/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/@babel/code-frame/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true
+    },
+    "node_modules/@babel/code-frame/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/@babel/code-frame/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/compat-data": {
+      "version": "7.18.8",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.8.tgz",
+      "integrity": "sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/core": {
+      "version": "7.18.10",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.10.tgz",
+      "integrity": "sha512-JQM6k6ENcBFKVtWvLavlvi/mPcpYZ3+R+2EySDEMSMbp7Mn4FexlbbJVrx2R7Ijhr01T8gyqrOaABWIOgxeUyw==",
+      "dev": true,
+      "dependencies": {
+        "@ampproject/remapping": "^2.1.0",
+        "@babel/code-frame": "^7.18.6",
+        "@babel/generator": "^7.18.10",
+        "@babel/helper-compilation-targets": "^7.18.9",
+        "@babel/helper-module-transforms": "^7.18.9",
+        "@babel/helpers": "^7.18.9",
+        "@babel/parser": "^7.18.10",
+        "@babel/template": "^7.18.10",
+        "@babel/traverse": "^7.18.10",
+        "@babel/types": "^7.18.10",
+        "convert-source-map": "^1.7.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.1",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
+      }
+    },
+    "node_modules/@babel/core/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/generator": {
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
+      "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.23.0",
+        "@jridgewell/gen-mapping": "^0.3.2",
+        "@jridgewell/trace-mapping": "^0.3.17",
+        "jsesc": "^2.5.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+      "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/helper-compilation-targets": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz",
+      "integrity": "sha512-tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.18.8",
+        "@babel/helper-validator-option": "^7.18.6",
+        "browserslist": "^4.20.2",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/helper-environment-visitor": {
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-function-name": {
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/template": "^7.22.15",
+        "@babel/types": "^7.23.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-hoist-variables": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-imports": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
+      "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-transforms": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz",
+      "integrity": "sha512-KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-module-imports": "^7.18.6",
+        "@babel/helper-simple-access": "^7.18.6",
+        "@babel/helper-split-export-declaration": "^7.18.6",
+        "@babel/helper-validator-identifier": "^7.18.6",
+        "@babel/template": "^7.18.6",
+        "@babel/traverse": "^7.18.9",
+        "@babel/types": "^7.18.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-simple-access": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz",
+      "integrity": "sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-split-export-declaration": {
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
+      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-option": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
+      "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helpers": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.9.tgz",
+      "integrity": "sha512-Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/template": "^7.18.6",
+        "@babel/traverse": "^7.18.9",
+        "@babel/types": "^7.18.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight": {
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
+      "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.22.20",
+        "chalk": "^2.4.2",
+        "js-tokens": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true
+    },
+    "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
+      "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==",
+      "dev": true,
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/template": {
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.22.13",
+        "@babel/parser": "^7.22.15",
+        "@babel/types": "^7.22.15"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/traverse": {
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
+      "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.22.13",
+        "@babel/generator": "^7.23.0",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-function-name": "^7.23.0",
+        "@babel/helper-hoist-variables": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/parser": "^7.23.0",
+        "@babel/types": "^7.23.0",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/traverse/node_modules/globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/types": {
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
+      "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-string-parser": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.20",
+        "to-fast-properties": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@bcoe/v8-coverage": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
+      "dev": true
+    },
+    "node_modules/@cspotcode/source-map-support": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
+      "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/trace-mapping": "0.3.9"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
+      "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.0.3",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
+      }
+    },
+    "node_modules/@csstools/selector-specificity": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-3.0.1.tgz",
+      "integrity": "sha512-NPljRHkq4a14YzZ3YD406uaxh7s0g6eAq3L9aLOWywoqe8PkYamAvtsh7KNX6c++ihDrJ0RiU+/z7rGnhlZ5ww==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "engines": {
+        "node": "^14 || ^16 || >=18"
+      },
+      "peerDependencies": {
+        "postcss-selector-parser": "^6.0.13"
+      }
+    },
+    "node_modules/@discoveryjs/json-ext": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz",
+      "integrity": "sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/@electron/get": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.2.tgz",
+      "integrity": "sha512-eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.1",
+        "env-paths": "^2.2.0",
+        "fs-extra": "^8.1.0",
+        "got": "^11.8.5",
+        "progress": "^2.0.3",
+        "semver": "^6.2.0",
+        "sumchecker": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "global-agent": "^3.0.0"
+      }
+    },
+    "node_modules/@electron/get/node_modules/fs-extra": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=6 <7 || >=8"
+      }
+    },
+    "node_modules/@electron/get/node_modules/jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
+      "dev": true,
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/@electron/get/node_modules/progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/@electron/get/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@electron/get/node_modules/universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/@es-joy/jsdoccomment": {
+      "version": "0.40.1",
+      "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.40.1.tgz",
+      "integrity": "sha512-YORCdZSusAlBrFpZ77pJjc5r1bQs5caPWtAu+WWmiSo+8XaUzseapVrfAtiRFbQWnrBxxLLEwF6f6ZG/UgCQCg==",
+      "dev": true,
+      "dependencies": {
+        "comment-parser": "1.4.0",
+        "esquery": "^1.5.0",
+        "jsdoc-type-pratt-parser": "~4.0.0"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@eslint-community/eslint-utils": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+      }
+    },
+    "node_modules/@eslint-community/regexpp": {
+      "version": "4.11.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.1.tgz",
+      "integrity": "sha512-m4DVN9ZqskZoLU5GlWZadwDnYo3vAEydiUayB9widCl9ffWx2IvPnp6n3on5rJmziJSw9Bv+Z3ChDVdMwXCY8Q==",
+      "dev": true,
+      "engines": {
+        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@eslint/eslintrc": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
+      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.6.0",
+        "globals": "^13.19.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@eslint/js": {
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.36.0.tgz",
+      "integrity": "sha512-lxJ9R5ygVm8ZWgYdUweoq5ownDlJ4upvoWmO4eLxBYHdMo+vZ/Rx0EN6MbKWDJOSUGrqJy2Gt+Dyv/VKml0fjg==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@gulp-sourcemaps/identity-map": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-2.0.1.tgz",
+      "integrity": "sha512-Tb+nSISZku+eQ4X1lAkevcQa+jknn/OVUgZ3XCxEKIsLsqYuPoJwJOPQeaOk75X3WPftb29GWY1eqE7GLsXb1Q==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^6.4.1",
+        "normalize-path": "^3.0.0",
+        "postcss": "^7.0.16",
+        "source-map": "^0.6.0",
+        "through2": "^3.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/@gulp-sourcemaps/identity-map/node_modules/acorn": {
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
+      "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/@gulp-sourcemaps/identity-map/node_modules/picocolors": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+      "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+      "dev": true
+    },
+    "node_modules/@gulp-sourcemaps/identity-map/node_modules/postcss": {
+      "version": "7.0.39",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+      "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+      "dev": true,
+      "dependencies": {
+        "picocolors": "^0.2.1",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      }
+    },
+    "node_modules/@gulp-sourcemaps/map-sources": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz",
+      "integrity": "sha1-iQrnxdjId/bThIYCFazp1+yUW9o= sha512-o/EatdaGt8+x2qpb0vFLC/2Gug/xYPRXb6a+ET1wGYKozKN3krDWC/zZFZAtrzxJHuDL12mwdfEFKcKMNvc55A==",
+      "dev": true,
+      "dependencies": {
+        "normalize-path": "^2.0.1",
+        "through2": "^2.0.3"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/@gulp-sourcemaps/map-sources/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk= sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+      "dev": true,
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@gulp-sourcemaps/map-sources/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/@gulp-sourcemaps/map-sources/node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/@humanwhocodes/config-array": {
+      "version": "0.11.14",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
+      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
+      "deprecated": "Use @eslint/config-array instead",
+      "dev": true,
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^2.0.2",
+        "debug": "^4.3.1",
+        "minimatch": "^3.0.5"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.22"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
+    },
+    "node_modules/@humanwhocodes/object-schema": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
+      "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
+      "deprecated": "Use @eslint/object-schema instead",
+      "dev": true
+    },
+    "node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true
+    },
+    "node_modules/@isaacs/cliui/node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "dev": true,
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@istanbuljs/schema": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
+      "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/set-array": "^1.0.0",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
+      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/source-map": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
+      "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25"
+      }
+    },
+    "node_modules/@jridgewell/source-map/node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/set-array": "^1.2.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.14",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
+      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
+      "dev": true
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
+    "node_modules/@koa/cors": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@koa/cors/-/cors-5.0.0.tgz",
+      "integrity": "sha512-x/iUDjcS90W69PryLDIMgFyV21YLTnG9zOpPXS7Bkt2b8AsY3zZsIpOLBkYr9fBcF3HbkKaER5hOBZLfpLgYNw==",
+      "dev": true,
+      "dependencies": {
+        "vary": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/@koa/router": {
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/@koa/router/-/router-13.0.0.tgz",
+      "integrity": "sha512-P278xb5IoLtDn2inRsCzJVKGxt5RkjOivwxGbniMO1sI8bft1/Dr93UsRP5aByT8C74x8zqxDYyPXrQwRKIhjg==",
+      "dev": true,
+      "dependencies": {
+        "http-errors": "^2.0.0",
+        "koa-compose": "^4.1.0",
+        "path-to-regexp": "^6.2.2"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@microsoft/1ds-core-js": {
+      "version": "3.2.13",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-3.2.13.tgz",
+      "integrity": "sha512-CluYTRWcEk0ObG5EWFNWhs87e2qchJUn0p2D21ZUa3PWojPZfPSBs4//WIE0MYV8Qg1Hdif2ZTwlM7TbYUjfAg==",
+      "dependencies": {
+        "@microsoft/applicationinsights-core-js": "2.8.15",
+        "@microsoft/applicationinsights-shims": "^2.0.2",
+        "@microsoft/dynamicproto-js": "^1.1.7"
+      }
+    },
+    "node_modules/@microsoft/1ds-post-js": {
+      "version": "3.2.13",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-3.2.13.tgz",
+      "integrity": "sha512-HgS574fdD19Bo2vPguyznL4eDw7Pcm1cVNpvbvBLWiW3x4e1FCQ3VMXChWnAxCae8Hb0XqlA2sz332ZobBavTA==",
+      "dependencies": {
+        "@microsoft/1ds-core-js": "3.2.13",
+        "@microsoft/applicationinsights-shims": "^2.0.2",
+        "@microsoft/dynamicproto-js": "^1.1.7"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-core-js": {
+      "version": "2.8.15",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.15.tgz",
+      "integrity": "sha512-yYAs9MyjGr2YijQdUSN9mVgT1ijI1FPMgcffpaPmYbHAVbQmF7bXudrBWHxmLzJlwl5rfep+Zgjli2e67lwUqQ==",
+      "dependencies": {
+        "@microsoft/applicationinsights-shims": "2.0.2",
+        "@microsoft/dynamicproto-js": "^1.1.9"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-shims": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-2.0.2.tgz",
+      "integrity": "sha512-PoHEgsnmcqruLNHZ/amACqdJ6YYQpED0KSRe6J7gIJTtpZC1FfFU9b1fmDKDKtFoUSrPzEh1qzO3kmRZP0betg=="
+    },
+    "node_modules/@microsoft/dynamicproto-js": {
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.9.tgz",
+      "integrity": "sha512-n1VPsljTSkthsAFYdiWfC+DKzK2WwcRp83Y1YAqdX552BstvsDjft9YXppjUzp11BPsapDoO1LDgrDB0XVsfNQ=="
+    },
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@octokit/auth-token": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.5.0.tgz",
+      "integrity": "sha512-r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g==",
+      "dev": true,
+      "dependencies": {
+        "@octokit/types": "^6.0.3"
+      }
+    },
+    "node_modules/@octokit/core": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.6.0.tgz",
+      "integrity": "sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q==",
+      "dev": true,
+      "dependencies": {
+        "@octokit/auth-token": "^2.4.4",
+        "@octokit/graphql": "^4.5.8",
+        "@octokit/request": "^5.6.3",
+        "@octokit/request-error": "^2.0.5",
+        "@octokit/types": "^6.0.3",
+        "before-after-hook": "^2.2.0",
+        "universal-user-agent": "^6.0.0"
+      }
+    },
+    "node_modules/@octokit/endpoint": {
+      "version": "6.0.12",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz",
+      "integrity": "sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==",
+      "dev": true,
+      "dependencies": {
+        "@octokit/types": "^6.0.3",
+        "is-plain-object": "^5.0.0",
+        "universal-user-agent": "^6.0.0"
+      }
+    },
+    "node_modules/@octokit/graphql": {
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.8.0.tgz",
+      "integrity": "sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg==",
+      "dev": true,
+      "dependencies": {
+        "@octokit/request": "^5.6.0",
+        "@octokit/types": "^6.0.3",
+        "universal-user-agent": "^6.0.0"
+      }
+    },
+    "node_modules/@octokit/openapi-types": {
+      "version": "11.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-11.2.0.tgz",
+      "integrity": "sha512-PBsVO+15KSlGmiI8QAzaqvsNlZlrDlyAJYcrXBCvVUxCp7VnXjkwPoFHgjEJXx3WF9BAwkA6nfCUA7i9sODzKA==",
+      "dev": true
+    },
+    "node_modules/@octokit/plugin-paginate-rest": {
+      "version": "2.17.0",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.17.0.tgz",
+      "integrity": "sha512-tzMbrbnam2Mt4AhuyCHvpRkS0oZ5MvwwcQPYGtMv4tUa5kkzG58SVB0fcsLulOZQeRnOgdkZWkRUiyBlh0Bkyw==",
+      "dev": true,
+      "dependencies": {
+        "@octokit/types": "^6.34.0"
+      },
+      "peerDependencies": {
+        "@octokit/core": ">=2"
+      }
+    },
+    "node_modules/@octokit/plugin-request-log": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz",
+      "integrity": "sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==",
+      "dev": true,
+      "peerDependencies": {
+        "@octokit/core": ">=3"
+      }
+    },
+    "node_modules/@octokit/plugin-rest-endpoint-methods": {
+      "version": "5.13.0",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.13.0.tgz",
+      "integrity": "sha512-uJjMTkN1KaOIgNtUPMtIXDOjx6dGYysdIFhgA52x4xSadQCz3b/zJexvITDVpANnfKPW/+E0xkOvLntqMYpviA==",
+      "dev": true,
+      "dependencies": {
+        "@octokit/types": "^6.34.0",
+        "deprecation": "^2.3.1"
+      },
+      "peerDependencies": {
+        "@octokit/core": ">=3"
+      }
+    },
+    "node_modules/@octokit/request": {
+      "version": "5.6.3",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz",
+      "integrity": "sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==",
+      "dev": true,
+      "dependencies": {
+        "@octokit/endpoint": "^6.0.1",
+        "@octokit/request-error": "^2.1.0",
+        "@octokit/types": "^6.16.1",
+        "is-plain-object": "^5.0.0",
+        "node-fetch": "^2.6.7",
+        "universal-user-agent": "^6.0.0"
+      }
+    },
+    "node_modules/@octokit/request-error": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz",
+      "integrity": "sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==",
+      "dev": true,
+      "dependencies": {
+        "@octokit/types": "^6.0.3",
+        "deprecation": "^2.0.0",
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/@octokit/rest": {
+      "version": "18.12.0",
+      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-18.12.0.tgz",
+      "integrity": "sha512-gDPiOHlyGavxr72y0guQEhLsemgVjwRePayJ+FcKc2SJqKUbxbkvf5kAZEWA/MKvsfYlQAMVzNJE3ezQcxMJ2Q==",
+      "dev": true,
+      "dependencies": {
+        "@octokit/core": "^3.5.1",
+        "@octokit/plugin-paginate-rest": "^2.16.8",
+        "@octokit/plugin-request-log": "^1.0.4",
+        "@octokit/plugin-rest-endpoint-methods": "^5.12.0"
+      }
+    },
+    "node_modules/@octokit/types": {
+      "version": "6.34.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.34.0.tgz",
+      "integrity": "sha512-s1zLBjWhdEI2zwaoSgyOFoKSl109CUcVBCc7biPJ3aAf6LGLU6szDvi31JPU7bxfla2lqfhjbbg/5DdFNxOwHw==",
+      "dev": true,
+      "dependencies": {
+        "@octokit/openapi-types": "^11.2.0"
+      }
+    },
+    "node_modules/@opentelemetry/api": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.0.3.tgz",
+      "integrity": "sha512-puWxACExDe9nxbBB3lOymQFrLYml2dVOrd7USiVRnSbgXE+KwBu+HxFvxrzfqsiSda9IWsXJG1ef7C1O2/GmKQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@parcel/watcher": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.1.0.tgz",
+      "integrity": "sha512-8s8yYjd19pDSsBpbkOHnT6Z2+UJSuLQx61pCFM0s5wSRvKCEMDjd/cHY3/GI1szHIWbpXpsJdg3V6ISGGx9xDw==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "is-glob": "^4.0.3",
+        "micromatch": "^4.0.5",
+        "node-addon-api": "^3.2.1",
+        "node-gyp-build": "^4.3.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@playwright/browser-chromium": {
+      "version": "1.47.0",
+      "resolved": "https://registry.npmjs.org/@playwright/browser-chromium/-/browser-chromium-1.47.0.tgz",
+      "integrity": "sha512-uMsRSflfEX1zDYdghRhUaLMnyoKqcVquOjo4cbIlqCpgNulDbRF7k9lUAWgobgIbefFz96a4v9/Fae+ngOuBHQ==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "playwright-core": "1.47.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@playwright/test": {
+      "version": "1.46.1",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.46.1.tgz",
+      "integrity": "sha512-Fq6SwLujA/DOIvNC2EL/SojJnkKf/rAwJ//APpJJHRyMi1PdKrY3Az+4XNQ51N4RTbItbIByQ0jgd1tayq1aeA==",
+      "dev": true,
+      "dependencies": {
+        "playwright": "1.46.1"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@sindresorhus/is": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
+      "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/is?sponsor=1"
+      }
+    },
+    "node_modules/@sinonjs/commons": {
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
+      "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
+      "dev": true,
+      "dependencies": {
+        "type-detect": "4.0.8"
+      }
+    },
+    "node_modules/@sinonjs/fake-timers": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz",
+      "integrity": "sha512-iQADsW4LBMISqZ6Ci1dupJL9pprqwcVFTcOsEmQOEhW+KLCVn/Y4Jrvg2k19fIHCp+iFprriYPTdRcQR8NbUPg==",
+      "dev": true,
+      "dependencies": {
+        "@sinonjs/commons": "^1.7.0"
+      }
+    },
+    "node_modules/@sinonjs/samsam": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-6.0.2.tgz",
+      "integrity": "sha512-jxPRPp9n93ci7b8hMfJOFDPRLFYadN6FSpeROFTR4UNF4i5b+EK6m4QXPO46BDhFgRy1JuS87zAnFOzCUwMJcQ==",
+      "dev": true,
+      "dependencies": {
+        "@sinonjs/commons": "^1.6.0",
+        "lodash.get": "^4.4.2",
+        "type-detect": "^4.0.8"
+      }
+    },
+    "node_modules/@sinonjs/text-encoding": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz",
+      "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==",
+      "dev": true
+    },
+    "node_modules/@swc/core": {
+      "version": "1.3.62",
+      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.3.62.tgz",
+      "integrity": "sha512-J58hWY+/G8vOr4J6ZH9hLg0lMSijZtqIIf4HofZezGog/pVX6sJyBJ40dZ1ploFkDIlWTWvJyqtpesBKS73gkQ==",
+      "dev": true,
+      "hasInstallScript": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/swc"
+      },
+      "optionalDependencies": {
+        "@swc/core-darwin-arm64": "1.3.62",
+        "@swc/core-darwin-x64": "1.3.62",
+        "@swc/core-linux-arm-gnueabihf": "1.3.62",
+        "@swc/core-linux-arm64-gnu": "1.3.62",
+        "@swc/core-linux-arm64-musl": "1.3.62",
+        "@swc/core-linux-x64-gnu": "1.3.62",
+        "@swc/core-linux-x64-musl": "1.3.62",
+        "@swc/core-win32-arm64-msvc": "1.3.62",
+        "@swc/core-win32-ia32-msvc": "1.3.62",
+        "@swc/core-win32-x64-msvc": "1.3.62"
+      },
+      "peerDependencies": {
+        "@swc/helpers": "^0.5.0"
+      },
+      "peerDependenciesMeta": {
+        "@swc/helpers": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@swc/core-darwin-arm64": {
+      "version": "1.3.62",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.62.tgz",
+      "integrity": "sha512-MmGilibITz68LEje6vJlKzc2gUUSgzvB3wGLSjEORikTNeM7P8jXVxE4A8fgZqDeudJUm9HVWrxCV+pHDSwXhA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-darwin-x64": {
+      "version": "1.3.62",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.62.tgz",
+      "integrity": "sha512-Xl93MMB3sCWVlYWuQIB+v6EQgzoiuQYK5tNt9lsHoIEVu2zLdkQjae+5FUHZb1VYqCXIiWcULFfVz0R4Sjb7JQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-arm-gnueabihf": {
+      "version": "1.3.62",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.62.tgz",
+      "integrity": "sha512-nJsp6O7kCtAjTTMcIjVB0g5y1JNiYAa5q630eiwrnaHUusEFoANDdORI3Z9vXeikMkng+6yIv9/V8Rb093xLjQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-arm64-gnu": {
+      "version": "1.3.62",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.62.tgz",
+      "integrity": "sha512-XGsV93vpUAopDt5y6vPwbK1Nc/MlL55L77bAZUPIiosWD1cWWPHNtNSpriE6+I+JiMHe0pqtfS/SSTk6ZkFQVw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-arm64-musl": {
+      "version": "1.3.62",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.62.tgz",
+      "integrity": "sha512-ESUmJjSlTTkoBy9dMG49opcNn8BmviqStMhwyeD1G8XRnmRVCZZgoBOKdvCXmJhw8bQXDhZumeaTUB+OFUKVXg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-x64-gnu": {
+      "version": "1.3.62",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.62.tgz",
+      "integrity": "sha512-wnHJkt3ZBrax3SFnUHDcncG6mrSg9ZZjMhQV9Mc3JL1x1s1Gy9rGZCoBNnV/BUZWTemxIBcQbANRSDut/WO+9A==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-x64-musl": {
+      "version": "1.3.62",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.62.tgz",
+      "integrity": "sha512-9oRbuTC/VshB66Rgwi3pTq3sPxSTIb8k9L1vJjES+dDMKa29DAjPtWCXG/pyZ00ufpFZgkGEuAHH5uqUcr1JQg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-win32-arm64-msvc": {
+      "version": "1.3.62",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.62.tgz",
+      "integrity": "sha512-zv14vlF2VRrxS061XkfzGjCYnOrEo5glKJjLK5PwUKysIoVrx/L8nAbFxjkX5cObdlyoqo+ekelyBPAO+4bS0w==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-win32-ia32-msvc": {
+      "version": "1.3.62",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.62.tgz",
+      "integrity": "sha512-8MC/PZQSsOP2iA/81tAfNRqMWyEqTS/8zKUI67vPuLvpx6NAjRn3E9qBv7iFqH79iqZNzqSMo3awnLrKZyFbcw==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-win32-x64-msvc": {
+      "version": "1.3.62",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.62.tgz",
+      "integrity": "sha512-GJSmUJ95HKHZXAxiuPUmrcm/S3ivQvEzXhOZaIqYBIwUsm02vFZkClsV7eIKzWjso1t0+I/8MjrnUNaSWqh1rQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@szmarczak/http-timer": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
+      "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
+      "dev": true,
+      "dependencies": {
+        "defer-to-connect": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@tootallnate/once": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-3.0.0.tgz",
+      "integrity": "sha512-OAdBVB7rlwvLD+DiecSAyVKzKVmSfXbouCyM5I6wHGi4MGXIyFqErg1IvyJ7PI1e+GYZuZh7cCHV/c4LA8SKMw==",
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@trysound/sax": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
+      "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/@ts-morph/common": {
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@ts-morph/common/-/common-0.20.0.tgz",
+      "integrity": "sha512-7uKjByfbPpwuzkstL3L5MQyuXPSKdoNG93Fmi2JoDcTf3pEP731JdRFAduRVkOs8oqxPsXKA+ScrWkdQ8t/I+Q==",
+      "dev": true,
+      "dependencies": {
+        "fast-glob": "^3.2.12",
+        "minimatch": "^7.4.3",
+        "mkdirp": "^2.1.6",
+        "path-browserify": "^1.0.1"
+      }
+    },
+    "node_modules/@ts-morph/common/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@ts-morph/common/node_modules/minimatch": {
+      "version": "7.4.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-7.4.6.tgz",
+      "integrity": "sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@ts-morph/common/node_modules/mkdirp": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.6.tgz",
+      "integrity": "sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A==",
+      "dev": true,
+      "bin": {
+        "mkdirp": "dist/cjs/src/bin.js"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@tsconfig/node10": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz",
+      "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==",
+      "dev": true
+    },
+    "node_modules/@tsconfig/node12": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
+      "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
+      "dev": true
+    },
+    "node_modules/@tsconfig/node14": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
+      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
+      "dev": true
+    },
+    "node_modules/@tsconfig/node16": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz",
+      "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==",
+      "dev": true
+    },
+    "node_modules/@types/cacheable-request": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz",
+      "integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==",
+      "dev": true,
+      "dependencies": {
+        "@types/http-cache-semantics": "*",
+        "@types/keyv": "^3.1.4",
+        "@types/node": "*",
+        "@types/responselike": "^1.0.0"
+      }
+    },
+    "node_modules/@types/color-name": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
+      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
+      "dev": true
+    },
+    "node_modules/@types/cookie": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.3.3.tgz",
+      "integrity": "sha512-LKVP3cgXBT9RYj+t+9FDKwS5tdI+rPBXaNSkma7hvqy35lc7mAokC2zsqWJH0LaqIt3B962nuYI77hsJoT1gow==",
+      "dev": true
+    },
+    "node_modules/@types/debug": {
+      "version": "4.1.9",
+      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.9.tgz",
+      "integrity": "sha512-8Hz50m2eoS56ldRlepxSBa6PWEVCtzUo/92HgLc2qTMnotJNIm7xP+UZhyWoYsyOdd5dxZ+NZLb24rsKyFs2ow==",
+      "dev": true,
+      "dependencies": {
+        "@types/ms": "*"
+      }
+    },
+    "node_modules/@types/eslint": {
+      "version": "8.56.12",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.12.tgz",
+      "integrity": "sha512-03ruubjWyOHlmljCVoxSuNDdmfZDzsrrz0P2LeJsOXr+ZwFQ+0yQIwNCwt/GYhV7Z31fgtXJTAEs+FYlEL851g==",
+      "dev": true,
+      "dependencies": {
+        "@types/estree": "*",
+        "@types/json-schema": "*"
+      }
+    },
+    "node_modules/@types/estree": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
+      "dev": true
+    },
+    "node_modules/@types/expect": {
+      "version": "1.20.4",
+      "resolved": "https://registry.npmjs.org/@types/expect/-/expect-1.20.4.tgz",
+      "integrity": "sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg==",
+      "dev": true
+    },
+    "node_modules/@types/glob": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
+      "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@types/minimatch": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/gulp-svgmin": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@types/gulp-svgmin/-/gulp-svgmin-1.2.1.tgz",
+      "integrity": "sha512-qT/Y+C2uWJZoGw4oAjuJGZk+ImmTrx+QZbMGSzf8a1absW3wztrmMPvCF64pdogATDVUSPQDLzPWAFeIxylJTA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "@types/svgo": "^1",
+        "@types/vinyl": "*"
+      }
+    },
+    "node_modules/@types/http-cache-semantics": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
+      "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==",
+      "dev": true
+    },
+    "node_modules/@types/http-proxy-agent": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@types/http-proxy-agent/-/http-proxy-agent-2.0.1.tgz",
+      "integrity": "sha512-dgsgbsgI3t+ZkdzF9H19uBaLsurIZJJjJsVpj4mCLp8B6YghQ7jVwyqhaL0PcVtuC3nOi0ZBhAi2Dd9jCUwdFA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/istanbul-lib-coverage": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
+      "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==",
+      "dev": true
+    },
+    "node_modules/@types/json-schema": {
+      "version": "7.0.15",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+      "dev": true
+    },
+    "node_modules/@types/kerberos": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@types/kerberos/-/kerberos-1.1.2.tgz",
+      "integrity": "sha512-cLixfcXjdj7qohLasmC1G4fh+en4e4g7mFZiG38D+K9rS9BRKFlq1JH5dGkQzICckbu4wM+RcwSa4VRHlBg7Rg==",
+      "dev": true
+    },
+    "node_modules/@types/keyv": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz",
+      "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/minimatch": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
+      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@types/minimist": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz",
+      "integrity": "sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==",
+      "dev": true
+    },
+    "node_modules/@types/mocha": {
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.1.tgz",
+      "integrity": "sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==",
+      "dev": true
+    },
+    "node_modules/@types/ms": {
+      "version": "0.7.32",
+      "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.32.tgz",
+      "integrity": "sha512-xPSg0jm4mqgEkNhowKgZFBNtwoEwF6gJ4Dhww+GFpm3IgtNseHQZ5IqdNwnquZEoANxyDAKDRAdVo4Z72VvD/g==",
+      "dev": true
+    },
+    "node_modules/@types/node": {
+      "version": "20.14.13",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.13.tgz",
+      "integrity": "sha512-+bHoGiZb8UiQ0+WEtmph2IWQCjIqg8MDZMAV+ppRRhUZnquF5mQkP/9vpSwJClEiSM/C7fZZExPzfU0vJTyp8w==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/@types/node-fetch": {
+      "version": "2.5.12",
+      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.12.tgz",
+      "integrity": "sha512-MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "form-data": "^3.0.0"
+      }
+    },
+    "node_modules/@types/node-fetch/node_modules/form-data": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
+      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+      "dev": true,
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/@types/responselike": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
+      "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/semver": {
+      "version": "7.5.8",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz",
+      "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==",
+      "dev": true
+    },
+    "node_modules/@types/sinon": {
+      "version": "10.0.2",
+      "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-10.0.2.tgz",
+      "integrity": "sha512-BHn8Bpkapj8Wdfxvh2jWIUoaYB/9/XhsL0oOvBfRagJtKlSl9NWPcFOz2lRukI9szwGxFtYZCTejJSqsGDbdmw==",
+      "dev": true,
+      "dependencies": {
+        "@sinonjs/fake-timers": "^7.1.0"
+      }
+    },
+    "node_modules/@types/sinon-test": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/@types/sinon-test/-/sinon-test-2.4.2.tgz",
+      "integrity": "sha512-3BX9mk5+o//Xzs5N4bFYxPT+QlPLrqbyNfDWkIGtk9pVIp2Nl8ctsIGXsY3F01DsCd1Zlin3FqAk6V5XqkCyJA==",
+      "dev": true,
+      "dependencies": {
+        "@types/sinon": "*"
+      }
+    },
+    "node_modules/@types/svgo": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/@types/svgo/-/svgo-1.3.6.tgz",
+      "integrity": "sha512-AZU7vQcy/4WFEuwnwsNsJnFwupIpbllH1++LXScN6uxT1Z4zPzdrWG97w4/I7eFKFTvfy/bHFStWjdBAg2Vjug==",
+      "dev": true
+    },
+    "node_modules/@types/trusted-types": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-1.0.6.tgz",
+      "integrity": "sha512-230RC8sFeHoT6sSUlRO6a8cAnclO06eeiq1QDfiv2FGCLWFvvERWgwIQD4FWqD9A69BN7Lzee4OXwoMVnnsWDw==",
+      "dev": true
+    },
+    "node_modules/@types/tunnel": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/@types/tunnel/-/tunnel-0.0.3.tgz",
+      "integrity": "sha512-sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/vinyl": {
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.12.tgz",
+      "integrity": "sha512-Sr2fYMBUVGYq8kj3UthXFAu5UN6ZW+rYr4NACjZQJvHvj+c8lYv0CahmZ2P/r7iUkN44gGUBwqxZkrKXYPb7cw==",
+      "dev": true,
+      "dependencies": {
+        "@types/expect": "^1.20.4",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/vscode-notebook-renderer": {
+      "version": "1.72.0",
+      "resolved": "https://registry.npmjs.org/@types/vscode-notebook-renderer/-/vscode-notebook-renderer-1.72.0.tgz",
+      "integrity": "sha512-5iTjb39DpLn03ULUwrDR3L2Dy59RV4blSUHy0oLdQuIY11PhgWO4mXIcoFS0VxY1GZQ4IcjSf3ooT2Jrrcahnw==",
+      "dev": true
+    },
+    "node_modules/@types/webpack": {
+      "version": "5.28.5",
+      "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-5.28.5.tgz",
+      "integrity": "sha512-wR87cgvxj3p6D0Crt1r5avwqffqPXUkNlnQ1mjU93G7gCuFjufZR4I6j8cz5g1F1tTYpfOOFvly+cmIQwL9wvw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "tapable": "^2.2.0",
+        "webpack": "^5"
+      }
+    },
+    "node_modules/@types/wicg-file-system-access": {
+      "version": "2020.9.6",
+      "resolved": "https://registry.npmjs.org/@types/wicg-file-system-access/-/wicg-file-system-access-2020.9.6.tgz",
+      "integrity": "sha512-6hogE75Hl2Ov/jgp8ZhDaGmIF/q3J07GtXf8nCJCwKTHq7971po5+DId7grft09zG7plBwpF6ZU0yx9Du4/e1A==",
+      "dev": true
+    },
+    "node_modules/@types/windows-foreground-love": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@types/windows-foreground-love/-/windows-foreground-love-0.3.0.tgz",
+      "integrity": "sha512-tFUVA/fiofNqOh6lZlymvQiQYPY+cZXZPR9mn9wN6/KS8uwx0zgH4Ij/jmFyRYr+x+DGZWEIeknS2BMi7FZJAQ==",
+      "dev": true
+    },
+    "node_modules/@types/winreg": {
+      "version": "1.2.30",
+      "resolved": "https://registry.npmjs.org/@types/winreg/-/winreg-1.2.30.tgz",
+      "integrity": "sha1-kdZxDlNtNFucmwF8V0z2qNpkxRg= sha512-c4m/hnOI1j34i8hXlkZzelE6SXfOqaTWhBp0UgBuwmpiafh22OpsE261Rlg//agZtQHIY5cMgbkX8bnthUFrmA==",
+      "dev": true
+    },
+    "node_modules/@types/yauzl": {
+      "version": "2.10.3",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
+      "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/yazl": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/@types/yazl/-/yazl-2.4.2.tgz",
+      "integrity": "sha512-T+9JH8O2guEjXNxqmybzQ92mJUh2oCwDDMSSimZSe1P+pceZiFROZLYmcbqkzV5EUwz6VwcKXCO2S2yUpra6XQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin": {
+      "version": "6.21.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz",
+      "integrity": "sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/regexpp": "^4.5.1",
+        "@typescript-eslint/scope-manager": "6.21.0",
+        "@typescript-eslint/type-utils": "6.21.0",
+        "@typescript-eslint/utils": "6.21.0",
+        "@typescript-eslint/visitor-keys": "6.21.0",
+        "debug": "^4.3.4",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.2.4",
+        "natural-compare": "^1.4.0",
+        "semver": "^7.5.4",
+        "ts-api-utils": "^1.0.1"
+      },
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/parser": "^6.0.0 || ^6.0.0-alpha",
+        "eslint": "^7.0.0 || ^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/experimental-utils": {
+      "version": "5.57.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.57.0.tgz",
+      "integrity": "sha512-0RnrwGQ7MmgtOSnzB/rSGYr2iXENi6L+CtPzX3g5ovo0HlruLukSEKcc4s+q0IEc+DLTDc7Edan0Y4WSQ/bFhw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/utils": "5.57.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/experimental-utils/node_modules/@typescript-eslint/scope-manager": {
+      "version": "5.57.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.57.0.tgz",
+      "integrity": "sha512-NANBNOQvllPlizl9LatX8+MHi7bx7WGIWYjPHDmQe5Si/0YEYfxSljJpoTyTWFTgRy3X8gLYSE4xQ2U+aCozSw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.57.0",
+        "@typescript-eslint/visitor-keys": "5.57.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/experimental-utils/node_modules/@typescript-eslint/types": {
+      "version": "5.57.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.57.0.tgz",
+      "integrity": "sha512-mxsod+aZRSyLT+jiqHw1KK6xrANm19/+VFALVFP5qa/aiJnlP38qpyaTd0fEKhWvQk6YeNZ5LGwI1pDpBRBhtQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/experimental-utils/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "5.57.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.57.0.tgz",
+      "integrity": "sha512-LTzQ23TV82KpO8HPnWuxM2V7ieXW8O142I7hQTxWIHDcCEIjtkat6H96PFkYBQqGFLW/G/eVVOB9Z8rcvdY/Vw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.57.0",
+        "@typescript-eslint/visitor-keys": "5.57.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/experimental-utils/node_modules/@typescript-eslint/utils": {
+      "version": "5.57.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.57.0.tgz",
+      "integrity": "sha512-ps/4WohXV7C+LTSgAL5CApxvxbMkl9B9AUZRtnEFonpIxZDIT7wC1xfvuJONMidrkB9scs4zhtRyIwHh4+18kw==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@types/json-schema": "^7.0.9",
+        "@types/semver": "^7.3.12",
+        "@typescript-eslint/scope-manager": "5.57.0",
+        "@typescript-eslint/types": "5.57.0",
+        "@typescript-eslint/typescript-estree": "5.57.0",
+        "eslint-scope": "^5.1.1",
+        "semver": "^7.3.7"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/experimental-utils/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "5.57.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.57.0.tgz",
+      "integrity": "sha512-ery2g3k0hv5BLiKpPuwYt9KBkAp2ugT6VvyShXdLOkax895EC55sP0Tx5L0fZaQueiK3fBLvHVvEl3jFS5ia+g==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.57.0",
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/experimental-utils/node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/@typescript-eslint/parser": {
+      "version": "6.21.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.21.0.tgz",
+      "integrity": "sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/scope-manager": "6.21.0",
+        "@typescript-eslint/types": "6.21.0",
+        "@typescript-eslint/typescript-estree": "6.21.0",
+        "@typescript-eslint/visitor-keys": "6.21.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^7.0.0 || ^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "6.21.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz",
+      "integrity": "sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "6.21.0",
+        "@typescript-eslint/visitor-keys": "6.21.0"
+      },
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils": {
+      "version": "6.21.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.21.0.tgz",
+      "integrity": "sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/typescript-estree": "6.21.0",
+        "@typescript-eslint/utils": "6.21.0",
+        "debug": "^4.3.4",
+        "ts-api-utils": "^1.0.1"
+      },
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^7.0.0 || ^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/types": {
+      "version": "6.21.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.21.0.tgz",
+      "integrity": "sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==",
+      "dev": true,
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree": {
+      "version": "6.21.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz",
+      "integrity": "sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "6.21.0",
+        "@typescript-eslint/visitor-keys": "6.21.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "minimatch": "9.0.3",
+        "semver": "^7.5.4",
+        "ts-api-utils": "^1.0.1"
+      },
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@typescript-eslint/utils": {
+      "version": "6.21.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.21.0.tgz",
+      "integrity": "sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "@types/json-schema": "^7.0.12",
+        "@types/semver": "^7.5.0",
+        "@typescript-eslint/scope-manager": "6.21.0",
+        "@typescript-eslint/types": "6.21.0",
+        "@typescript-eslint/typescript-estree": "6.21.0",
+        "semver": "^7.5.4"
+      },
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/visitor-keys": {
+      "version": "6.21.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz",
+      "integrity": "sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "6.21.0",
+        "eslint-visitor-keys": "^3.4.1"
+      },
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@vscode/deviceid": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@vscode/deviceid/-/deviceid-0.1.1.tgz",
+      "integrity": "sha512-ErpoMeKKNYAkR1IT3zxB5RtiTqEECdh8fxggupWvzuxpTAX77hwOI2NdJ7um+vupnXRBZVx4ugo0+dVHJWUkag==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "fs-extra": "^11.2.0",
+        "uuid": "^9.0.1"
+      }
+    },
+    "node_modules/@vscode/gulp-electron": {
+      "version": "1.36.0",
+      "resolved": "https://registry.npmjs.org/@vscode/gulp-electron/-/gulp-electron-1.36.0.tgz",
+      "integrity": "sha512-zGNnxN2mccAa0fgyjUn0+HUX4sv4syUfoLQru3/QAQYki1oeqnkPpCXZxhismFmWpXwTwsf5sXeh1AOs8uyU0g==",
+      "dev": true,
+      "dependencies": {
+        "@electron/get": "^2.0.2",
+        "@octokit/rest": "^18.0.14",
+        "event-stream": "3.3.4",
+        "gulp-filter": "^5.1.0",
+        "gulp-rename": "1.2.2",
+        "gulp-symdest": "^1.2.0",
+        "gulp-vinyl-zip": "^2.1.2",
+        "mkdirp": "^0.5.1",
+        "plist": "^3.0.1",
+        "progress": "^1.1.8",
+        "rcedit": "^0.3.0",
+        "rimraf": "^2.4.2",
+        "semver": "^4.3.4",
+        "sumchecker": "^3.0.1",
+        "temp": "^0.8.3",
+        "vinyl": "^3.0.0",
+        "vinyl-fs": "^3.0.3"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@vscode/gulp-electron/node_modules/mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/@vscode/gulp-electron/node_modules/rcedit": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/rcedit/-/rcedit-0.3.0.tgz",
+      "integrity": "sha1-y17uGF5Ub57aWXwkjJkGGG+pa84= sha512-6cFo8dgNFf92BPdBNEKtwCl321wSVW6HYn3+QRQMGf0sclBMerCyMAreQDdIchfR8ECG0pAYD33NIODaJEnv4w==",
+      "dev": true
+    },
+    "node_modules/@vscode/gulp-electron/node_modules/semver": {
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
+      "integrity": "sha512-IrpJ+yoG4EOH8DFWuVg+8H1kW1Oaof0Wxe7cPcXW3x9BjkN/eVo54F15LyqemnDIUYskQWr9qvl/RihmSy6+xQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/@vscode/iconv-lite-umd": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz",
+      "integrity": "sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg=="
+    },
+    "node_modules/@vscode/l10n-dev": {
+      "version": "0.0.35",
+      "resolved": "https://registry.npmjs.org/@vscode/l10n-dev/-/l10n-dev-0.0.35.tgz",
+      "integrity": "sha512-s6uzBXsVDSL69Z85HSqpc5dfKswQkeucY8L00t1TWzGalw7wkLQUKMRwuzqTq+AMwQKrRd7Po14cMoTcd11iDw==",
+      "dev": true,
+      "dependencies": {
+        "@azure-rest/ai-translation-text": "^1.0.0-beta.1",
+        "debug": "^4.3.4",
+        "deepmerge-json": "^1.5.0",
+        "glob": "^10.0.0",
+        "markdown-it": "^14.0.0",
+        "node-html-markdown": "^1.3.0",
+        "pseudo-localization": "^2.4.0",
+        "web-tree-sitter": "^0.20.8",
+        "xml2js": "^0.5.0",
+        "yargs": "^17.7.1"
+      },
+      "bin": {
+        "vscode-l10n-dev": "dist/cli.js"
+      }
+    },
+    "node_modules/@vscode/l10n-dev/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@vscode/l10n-dev/node_modules/glob": {
+      "version": "10.3.10",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
+      "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
+      "dev": true,
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^2.3.5",
+        "minimatch": "^9.0.1",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
+        "path-scurry": "^1.10.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@vscode/l10n-dev/node_modules/minimatch": {
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@vscode/policy-watcher": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/@vscode/policy-watcher/-/policy-watcher-1.1.6.tgz",
+      "integrity": "sha512-EoJizB6aq/mgsL42mcNLGZ5vOwdZs/EHcLQkdY6Rg4uzcRkCapQdNy20wnCsrBpv3QntgBibsS6m+JXm8efY/Q==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "bindings": "^1.5.0",
+        "node-addon-api": "^6.0.0"
+      }
+    },
+    "node_modules/@vscode/policy-watcher/node_modules/node-addon-api": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.0.0.tgz",
+      "integrity": "sha512-GyHvgPvUXBvAkXa0YvYnhilSB1A+FRYMpIVggKzPZqdaZfevZOuzfWzyvgzOwRLHBeo/MMswmJFsrNF4Nw1pmA=="
+    },
+    "node_modules/@vscode/proxy-agent": {
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.22.0.tgz",
+      "integrity": "sha512-TQrv456pbrjmD6G+iOoXE1Mflm+8Ic/Kny4QU7ioiYe2+0HisvqzJM/CUa3Am5SWrNjMbntTHISjgmSaSlorrA==",
+      "dependencies": {
+        "@tootallnate/once": "^3.0.0",
+        "agent-base": "^7.0.1",
+        "debug": "^4.3.4",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.2",
+        "socks-proxy-agent": "^8.0.1"
+      },
+      "optionalDependencies": {
+        "@vscode/windows-ca-certs": "^0.3.1"
+      }
+    },
+    "node_modules/@vscode/ripgrep": {
+      "version": "1.15.9",
+      "resolved": "https://registry.npmjs.org/@vscode/ripgrep/-/ripgrep-1.15.9.tgz",
+      "integrity": "sha512-4q2PXRvUvr3bF+LsfrifmUZgSPmCNcUZo6SbEAZgArIChchkezaxLoIeQMJe/z3CCKStvaVKpBXLxN3Z8lQjFQ==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "https-proxy-agent": "^7.0.2",
+        "proxy-from-env": "^1.1.0",
+        "yauzl": "^2.9.2"
+      }
+    },
+    "node_modules/@vscode/ripgrep/node_modules/yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
+      "dependencies": {
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.1.0"
+      }
+    },
+    "node_modules/@vscode/spdlog": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/@vscode/spdlog/-/spdlog-0.15.0.tgz",
+      "integrity": "sha512-5UFcQXM/G6bTRF49zJJJH3A3+47nxaXuKzT26vhTXVIiMFoV1oI9559mWOzapLEmvrntAdYtjE7Jh74lSAuMcA==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "bindings": "^1.5.0",
+        "mkdirp": "^1.0.4",
+        "node-addon-api": "7.1.0"
+      }
+    },
+    "node_modules/@vscode/spdlog/node_modules/node-addon-api": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.0.tgz",
+      "integrity": "sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==",
+      "engines": {
+        "node": "^16 || ^18 || >= 20"
+      }
+    },
+    "node_modules/@vscode/sqlite3": {
+      "version": "5.1.6-vscode",
+      "resolved": "https://registry.npmjs.org/@vscode/sqlite3/-/sqlite3-5.1.6-vscode.tgz",
+      "integrity": "sha512-SzNUiijrRyJr1ly6eHIs5UcCqH/V8aaoz9mHNm5SdnJCJOX5T9RcHqO1AJ9VreHcPcRPKuG2paUpMkTeyynmYQ==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "node-addon-api": "^4.2.0",
+        "tar": "^6.1.11"
+      }
+    },
+    "node_modules/@vscode/sqlite3/node_modules/node-addon-api": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.2.0.tgz",
+      "integrity": "sha512-eazsqzwG2lskuzBqCGPi7Ac2UgOoMz8JVOXVhTvvPDYhthvNpefx8jWD8Np7Gv+2Sz0FlPWZk0nJV0z598Wn8Q=="
+    },
+    "node_modules/@vscode/sudo-prompt": {
+      "version": "9.3.1",
+      "resolved": "https://registry.npmjs.org/@vscode/sudo-prompt/-/sudo-prompt-9.3.1.tgz",
+      "integrity": "sha512-9ORTwwS74VaTn38tNbQhsA5U44zkJfcb0BdTSyyG6frP4e8KMtHuTXYmwefe5dpL8XB1aGSIVTaLjD3BbWb5iA=="
+    },
+    "node_modules/@vscode/telemetry-extractor": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/@vscode/telemetry-extractor/-/telemetry-extractor-1.10.2.tgz",
+      "integrity": "sha512-hn+KDSwIRj7LzDSFd9HALkc80UY1g16nQgWztHml+nxAZU3Hw/EoWEEDxOncvDYq9YcV+tX/cVHrVjbNL2Dg0g==",
+      "dev": true,
+      "dependencies": {
+        "@vscode/ripgrep": "^1.15.9",
+        "command-line-args": "^5.2.1",
+        "ts-morph": "^19.0.0"
+      },
+      "bin": {
+        "vscode-telemetry-extractor": "out/extractor.js"
+      }
+    },
+    "node_modules/@vscode/test-cli": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/@vscode/test-cli/-/test-cli-0.0.6.tgz",
+      "integrity": "sha512-4i61OUv5PQr3GxhHOuUgHdgBDfIO/kXTPCsEyFiMaY4SOqQTgkTmyZLagHehjOgCfsXdcrJa3zgQ7zoc+Dh6hQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/mocha": "^10.0.2",
+        "c8": "^9.1.0",
+        "chokidar": "^3.5.3",
+        "enhanced-resolve": "^5.15.0",
+        "glob": "^10.3.10",
+        "minimatch": "^9.0.3",
+        "mocha": "^10.2.0",
+        "supports-color": "^9.4.0",
+        "yargs": "^17.7.2"
+      },
+      "bin": {
+        "vscode-test": "out/bin.mjs"
+      }
+    },
+    "node_modules/@vscode/test-cli/node_modules/@types/mocha": {
+      "version": "10.0.2",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.2.tgz",
+      "integrity": "sha512-NaHL0+0lLNhX6d9rs+NSt97WH/gIlRHmszXbQ/8/MV/eVcFNdeJ/GYhrFuUc8K7WuPhRhTSdMkCp8VMzhUq85w==",
+      "dev": true
+    },
+    "node_modules/@vscode/test-cli/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@vscode/test-cli/node_modules/glob": {
+      "version": "10.3.10",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
+      "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
+      "dev": true,
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^2.3.5",
+        "minimatch": "^9.0.1",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
+        "path-scurry": "^1.10.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@vscode/test-cli/node_modules/minimatch": {
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@vscode/test-electron": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.4.0.tgz",
+      "integrity": "sha512-yojuDFEjohx6Jb+x949JRNtSn6Wk2FAh4MldLE3ck9cfvCqzwxF32QsNy1T9Oe4oT+ZfFcg0uPUCajJzOmPlTA==",
+      "dev": true,
+      "dependencies": {
+        "http-proxy-agent": "^7.0.2",
+        "https-proxy-agent": "^7.0.4",
+        "jszip": "^3.10.1",
+        "ora": "^7.0.1",
+        "semver": "^7.6.2"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@vscode/test-web": {
+      "version": "0.0.60",
+      "resolved": "https://registry.npmjs.org/@vscode/test-web/-/test-web-0.0.60.tgz",
+      "integrity": "sha512-U3Eif3GZEfmtFJFTRl5IZUxlqDocslvpHCoW4uz407F9YINc2ujJPB0QG+9ZtjjowZDzFJlg60J44RqmnlA0cg==",
+      "dev": true,
+      "dependencies": {
+        "@koa/cors": "^5.0.0",
+        "@koa/router": "^13.0.0",
+        "@playwright/browser-chromium": "^1.47.0",
+        "glob": "^11.0.0",
+        "gunzip-maybe": "^1.4.2",
+        "http-proxy-agent": "^7.0.2",
+        "https-proxy-agent": "^7.0.5",
+        "koa": "^2.15.3",
+        "koa-morgan": "^1.0.1",
+        "koa-mount": "^4.0.0",
+        "koa-static": "^5.0.0",
+        "minimist": "^1.2.8",
+        "playwright": "^1.47.0",
+        "tar-fs": "^3.0.6",
+        "vscode-uri": "^3.0.8"
+      },
+      "bin": {
+        "vscode-test-web": "out/server/index.js"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@vscode/test-web/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@vscode/test-web/node_modules/glob": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.0.tgz",
+      "integrity": "sha512-9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g==",
+      "dev": true,
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^4.0.1",
+        "minimatch": "^10.0.0",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^2.0.0"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@vscode/test-web/node_modules/jackspeak": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.0.1.tgz",
+      "integrity": "sha512-cub8rahkh0Q/bw1+GxP7aeSe29hHHn2V4m29nnDlvCdlgU+3UGxkZp7Z53jLUdpX3jdTO0nJZUDl3xvbWc2Xog==",
+      "dev": true,
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
+    "node_modules/@vscode/test-web/node_modules/lru-cache": {
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.1.tgz",
+      "integrity": "sha512-CgeuL5uom6j/ZVrg7G/+1IXqRY8JXX4Hghfy5YE0EhoYQWvndP1kufu58cmZLNIDKnRhZrXfdS9urVWx98AipQ==",
+      "dev": true,
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "node_modules/@vscode/test-web/node_modules/minimatch": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz",
+      "integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@vscode/test-web/node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "dev": true,
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/@vscode/test-web/node_modules/path-scurry": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.0.tgz",
+      "integrity": "sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^11.0.0",
+        "minipass": "^7.1.2"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@vscode/test-web/node_modules/playwright": {
+      "version": "1.47.0",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.47.0.tgz",
+      "integrity": "sha512-jOWiRq2pdNAX/mwLiwFYnPHpEZ4rM+fRSQpRHwEwZlP2PUANvL3+aJOF/bvISMhFD30rqMxUB4RJx9aQbfh4Ww==",
+      "dev": true,
+      "dependencies": {
+        "playwright-core": "1.47.0"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "fsevents": "2.3.2"
+      }
+    },
+    "node_modules/@vscode/tree-sitter-wasm": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/@vscode/tree-sitter-wasm/-/tree-sitter-wasm-0.0.4.tgz",
+      "integrity": "sha512-vOONG3Zxsh1I4JOA48WdQ5KiXjJAdfMvYTuHbW7b27tGtRqsPLY5WZyTwLXc5uujKHyhG3LJXE9poxRZSxTIiA=="
+    },
+    "node_modules/@vscode/v8-heap-parser": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/@vscode/v8-heap-parser/-/v8-heap-parser-0.1.0.tgz",
+      "integrity": "sha512-3EvQak7EIOLyIGz+IP9qSwRmP08ZRWgTeoRgAXPVkkDXZ8riqJ7LDtkgx++uHBiJ3MUaSdlUYPZcLFFw7E6zGg==",
+      "dev": true
+    },
+    "node_modules/@vscode/vscode-languagedetection": {
+      "version": "1.0.21",
+      "resolved": "https://registry.npmjs.org/@vscode/vscode-languagedetection/-/vscode-languagedetection-1.0.21.tgz",
+      "integrity": "sha512-zSUH9HYCw5qsCtd7b31yqkpaCU6jhtkKLkvOOA8yTrIRfBSOFb8PPhgmMicD7B/m+t4PwOJXzU1XDtrM9Fd3/g==",
+      "bin": {
+        "vscode-languagedetection": "cli/index.js"
+      }
+    },
+    "node_modules/@vscode/vscode-perf": {
+      "version": "0.0.14",
+      "resolved": "https://registry.npmjs.org/@vscode/vscode-perf/-/vscode-perf-0.0.14.tgz",
+      "integrity": "sha512-mDJOIAVU3Ufj1FUX2/LZtLHobjl7zRA+oDKH3GSJYQ+RlfEvpFRoU1CRSwbE3u9fsKMX//uBDI4Q4B8+3s86uA==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.x",
+        "commander": "^9.4.0",
+        "cookie": "^0.5.0",
+        "js-base64": "^3.7.4",
+        "node-fetch": "2.6.8",
+        "playwright": "^1.29.2"
+      },
+      "bin": {
+        "vscode-perf": "bin/vscode-perf"
+      },
+      "engines": {
+        "node": ">= 16"
+      }
+    },
+    "node_modules/@vscode/vscode-perf/node_modules/cookie": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/@vscode/windows-ca-certs": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@vscode/windows-ca-certs/-/windows-ca-certs-0.3.1.tgz",
+      "integrity": "sha512-1B6hZAsqg125wuMsXiKIFkBgKx/J7YR4RT/ccYGkWAToPU9MVa40PRe+evLFUmLPH6NmPohEPlCzZLbqgvHCcQ==",
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "dependencies": {
+        "node-addon-api": "^3.0.2"
+      }
+    },
+    "node_modules/@vscode/windows-mutex": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@vscode/windows-mutex/-/windows-mutex-0.5.0.tgz",
+      "integrity": "sha512-iD29L9AUscpn07aAvhP2QuhrXzuKc1iQpPF6u7ybtvRbR+o+RotfbuKqqF1RDlDDrJZkL+3AZTy4D01U4nEe5A==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "bindings": "^1.5.0",
+        "node-addon-api": "7.1.0"
+      }
+    },
+    "node_modules/@vscode/windows-mutex/node_modules/node-addon-api": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.0.tgz",
+      "integrity": "sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==",
+      "engines": {
+        "node": "^16 || ^18 || >= 20"
+      }
+    },
+    "node_modules/@vscode/windows-process-tree": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/@vscode/windows-process-tree/-/windows-process-tree-0.6.0.tgz",
+      "integrity": "sha512-7/DjBKKUtlmKNiAet2GRbdvfjgMKmfBeWVClIgONv8aqxGnaKca5N85eIDxh6rLMy2hKvFqIIsqgxs1Q26TWwg==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "node-addon-api": "7.1.0"
+      }
+    },
+    "node_modules/@vscode/windows-process-tree/node_modules/node-addon-api": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.0.tgz",
+      "integrity": "sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==",
+      "engines": {
+        "node": "^16 || ^18 || >= 20"
+      }
+    },
+    "node_modules/@vscode/windows-registry": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@vscode/windows-registry/-/windows-registry-1.1.0.tgz",
+      "integrity": "sha512-5AZzuWJpGscyiMOed0IuyEwt6iKmV5Us7zuwCDCFYMIq7tsvooO9BUiciywsvuthGz6UG4LSpeDeCxvgMVhnIw==",
+      "hasInstallScript": true
+    },
+    "node_modules/@webassemblyjs/ast": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz",
+      "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/helper-numbers": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
+      }
+    },
+    "node_modules/@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
+      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-api-error": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
+      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-buffer": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz",
+      "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-numbers": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
+      "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
+        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
+      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-wasm-section": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz",
+      "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-buffer": "1.12.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.12.1"
+      }
+    },
+    "node_modules/@webassemblyjs/ieee754": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
+      "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
+      "dev": true,
+      "dependencies": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "node_modules/@webassemblyjs/leb128": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
+      "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
+      "dev": true,
+      "dependencies": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/utf8": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
+      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/wasm-edit": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz",
+      "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-buffer": "1.12.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/helper-wasm-section": "1.12.1",
+        "@webassemblyjs/wasm-gen": "1.12.1",
+        "@webassemblyjs/wasm-opt": "1.12.1",
+        "@webassemblyjs/wasm-parser": "1.12.1",
+        "@webassemblyjs/wast-printer": "1.12.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-gen": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz",
+      "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-opt": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz",
+      "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-buffer": "1.12.1",
+        "@webassemblyjs/wasm-gen": "1.12.1",
+        "@webassemblyjs/wasm-parser": "1.12.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-parser": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz",
+      "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
+      }
+    },
+    "node_modules/@webassemblyjs/wast-printer": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz",
+      "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.12.1",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webgpu/types": {
+      "version": "0.1.44",
+      "resolved": "https://registry.npmjs.org/@webgpu/types/-/types-0.1.44.tgz",
+      "integrity": "sha512-JDpYJN5E/asw84LTYhKyvPpxGnD+bAKPtpW9Ilurf7cZpxaTbxkQcGwOd7jgB9BPBrTYQ+32ufo4HiuomTjHNQ==",
+      "dev": true
+    },
+    "node_modules/@webpack-cli/configtest": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.1.1.tgz",
+      "integrity": "sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.15.0"
+      },
+      "peerDependencies": {
+        "webpack": "5.x.x",
+        "webpack-cli": "5.x.x"
+      }
+    },
+    "node_modules/@webpack-cli/info": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.2.tgz",
+      "integrity": "sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.15.0"
+      },
+      "peerDependencies": {
+        "webpack": "5.x.x",
+        "webpack-cli": "5.x.x"
+      }
+    },
+    "node_modules/@webpack-cli/serve": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.5.tgz",
+      "integrity": "sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.15.0"
+      },
+      "peerDependencies": {
+        "webpack": "5.x.x",
+        "webpack-cli": "5.x.x"
+      },
+      "peerDependenciesMeta": {
+        "webpack-dev-server": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@xterm/addon-clipboard": {
+      "version": "0.2.0-beta.48",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.48.tgz",
+      "integrity": "sha512-oTrGoGMOQaW7PINAShhNR3duV8l2No/DbJ9rtfSBjfoQ9clWe0K+4fUHdJIuzW65AZsiLo9oh5IbHLWxlFP3Jg==",
+      "dependencies": {
+        "js-base64": "^3.7.5"
+      },
+      "peerDependencies": {
+        "@xterm/xterm": "^5.6.0-beta.65"
+      }
+    },
+    "node_modules/@xterm/addon-image": {
+      "version": "0.9.0-beta.65",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.9.0-beta.65.tgz",
+      "integrity": "sha512-Ud5FI5cGtpbz8yYCHC4QINlbC1K04Mex1JD5oAWPFwjlOz/Si/DhqbY1QBDl6QrUmSUUTZc5DKT3v3nN5WbZxQ==",
+      "peerDependencies": {
+        "@xterm/xterm": "^5.6.0-beta.65"
+      }
+    },
+    "node_modules/@xterm/addon-search": {
+      "version": "0.16.0-beta.65",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.16.0-beta.65.tgz",
+      "integrity": "sha512-eHfbbgFCS3AcD8YSvGFIkW9NW4pfGHrtRDWIojM/zqmyi3JaCmHUgZmlxbaANwBlgLiNpJLDq7cmoz//86NgGw==",
+      "peerDependencies": {
+        "@xterm/xterm": "^5.6.0-beta.65"
+      }
+    },
+    "node_modules/@xterm/addon-serialize": {
+      "version": "0.14.0-beta.65",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.65.tgz",
+      "integrity": "sha512-NlvXVtFAHpLKEDzd+6/68yPFQ4Oe02jvQH6+a8p+gcxbSEyYj1l0sqqeABQ3gC5QDCmQepk6BQVB8Rpz/e4HgQ==",
+      "peerDependencies": {
+        "@xterm/xterm": "^5.6.0-beta.65"
+      }
+    },
+    "node_modules/@xterm/addon-unicode11": {
+      "version": "0.9.0-beta.65",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.65.tgz",
+      "integrity": "sha512-sH9mu2GEIVuc6cs6HxsmCXn6KKzCa5D+Zyl1Pt9d2S4FKqSB17Fc4mVukCOMW7wUR9UChKTbxmByGJK+4xwdCA==",
+      "peerDependencies": {
+        "@xterm/xterm": "^5.6.0-beta.65"
+      }
+    },
+    "node_modules/@xterm/addon-webgl": {
+      "version": "0.19.0-beta.65",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.65.tgz",
+      "integrity": "sha512-gPwP8ozqrLFWOlo9eh2I+acxq0Z6obG7GpL8HpJ+B+q6+vjfxoXHQ6vV04W90aoAvbLpScHcT/JtXA58GcH2vw==",
+      "peerDependencies": {
+        "@xterm/xterm": "^5.6.0-beta.65"
+      }
+    },
+    "node_modules/@xterm/headless": {
+      "version": "5.6.0-beta.65",
+      "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-5.6.0-beta.65.tgz",
+      "integrity": "sha512-gQICZsBkFHQEb/K+dc+KN4u5aBwrDPgai0S7W8/KT7fqTPWz8Cgjq119WQLshnzfLeMMFPYGttNHFGUbpp/wmw=="
+    },
+    "node_modules/@xterm/xterm": {
+      "version": "5.6.0-beta.65",
+      "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.6.0-beta.65.tgz",
+      "integrity": "sha512-o6IIg4hqs994gtSQMbzQM6OUeLIXPG6RUxjoref0KJX4PIa/BqQjwQLPuSxnjOFeRQIvhZ2mSAPfGWJQ6jEGAg=="
+    },
+    "node_modules/@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "dev": true
+    },
+    "node_modules/@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "dev": true
+    },
+    "node_modules/abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "dev": true
+    },
+    "node_modules/accepts": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
+      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+      "dev": true,
+      "dependencies": {
+        "mime-types": "~2.1.24",
+        "negotiator": "0.6.2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/acorn": {
+      "version": "8.12.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
+      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-import-attributes": {
+      "version": "1.9.5",
+      "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
+      "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
+      "dev": true,
+      "peerDependencies": {
+        "acorn": "^8"
+      }
+    },
+    "node_modules/acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true,
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/acorn-walk": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
+      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/agent-base": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
+      "dependencies": {
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ajv-formats": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ajv-formats/node_modules/ajv": {
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ajv-formats/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
+    "node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/amdefine": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU= sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.2"
+      }
+    },
+    "node_modules/ansi-colors": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
+      "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ansi-cyan": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz",
+      "integrity": "sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM= sha512-eCjan3AVo/SxZ0/MyIYRtkpxIu/H3xZN7URr1vXVrISxeyz8fUFz0FJziamK4sS8I+t35y4rHg1b2PklyBe/7A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-wrap": "0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ansi-gray": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
+      "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE= sha512-HrgGIZUl8h2EHuZaU9hTR/cU5nhKxpVE1V6kdGsQ8e4zirElJ5fvtfc8N7Q1oq1aatO275i8pUFUCpNWCAnVWw==",
+      "dev": true,
+      "dependencies": {
+        "ansi-wrap": "0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ansi-red": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz",
+      "integrity": "sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw= sha512-ewaIr5y+9CUTGFwZfpECUbFlGcC0GCw1oqR9RI6h1gQCd9Aj2GxSckCnPsVJnmfMZbwFYE+leZGASgkWl06Jow==",
+      "dev": true,
+      "dependencies": {
+        "ansi-wrap": "0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+      "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+      "dev": true,
+      "dependencies": {
+        "@types/color-name": "^1.1.1",
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/ansi-wrap": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
+      "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768= sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/any-promise": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8= sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==",
+      "dev": true
+    },
+    "node_modules/anymatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+      "dev": true,
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/append-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz",
+      "integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE= sha512-WLbYiXzD3y/ATLZFufV/rZvWdZOs+Z/+5v1rBZ463Jn398pa6kcde27cvozYnBoxXblGZTFfoPpsaEw0orU5BA==",
+      "dev": true,
+      "dependencies": {
+        "buffer-equal": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/archy": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
+      "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA= sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==",
+      "dev": true
+    },
+    "node_modules/are-docs-informative": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/are-docs-informative/-/are-docs-informative-0.0.2.tgz",
+      "integrity": "sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/arg": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
+      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
+      "dev": true
+    },
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA= sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arr-filter": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz",
+      "integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4= sha512-A2BETWCqhsecSvCkWAeVBFLH6sXEUGASuzkpjL3GR1SlL/PWL6M3J8EAAld2Uubmh39tvkJTqC9LeLHCUKmFXA==",
+      "dev": true,
+      "dependencies": {
+        "make-iterator": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arr-map": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz",
+      "integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ= sha512-tVqVTHt+Q5Xb09qRkbu+DidW1yYzz5izWS2Xm2yFm7qJnmUfz4HPzNxbHkdRJbz2lrqI7S+z17xNYdFcBBO8Hw==",
+      "dev": true,
+      "dependencies": {
+        "make-iterator": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-back": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz",
+      "integrity": "sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/array-differ": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
+      "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE= sha512-LeZY+DZDRnvP7eMuQ6LHfCzUGxAAIViUBliK24P3hWXL6y4SortgR6Nim6xrkfSLlmH0+k+9NYNwVC2s53ZrYQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-each": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
+      "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8= sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-initial": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz",
+      "integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U= sha512-BC4Yl89vneCYfpLrs5JU2aAu9/a+xWbeKhvISg9PT7eWFB9UlRvI+rKEtk6mgxWr3dSkk9gQ8hCrdqt06NXPdw==",
+      "dev": true,
+      "dependencies": {
+        "array-slice": "^1.0.0",
+        "is-number": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-initial/node_modules/is-number": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+      "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-last": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz",
+      "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-last/node_modules/is-number": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+      "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-slice": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
+      "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-sort": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz",
+      "integrity": "sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==",
+      "dev": true,
+      "dependencies": {
+        "default-compare": "^1.0.0",
+        "get-value": "^2.0.6",
+        "kind-of": "^5.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY= sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0= sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/asar": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/asar/-/asar-3.0.3.tgz",
+      "integrity": "sha512-k7zd+KoR+n8pl71PvgElcoKHrVNiSXtw7odKbyNpmgKe7EGRF9Pnu3uLOukD37EvavKwVFxOUpqXTIZC5B5Pmw==",
+      "deprecated": "Please use @electron/asar moving forward.  There is no API change, just a package name change",
+      "dev": true,
+      "dependencies": {
+        "chromium-pickle-js": "^0.2.0",
+        "commander": "^5.0.0",
+        "glob": "^7.1.6",
+        "minimatch": "^3.0.4"
+      },
+      "bin": {
+        "asar": "bin/asar.js"
+      },
+      "engines": {
+        "node": ">=10.12.0"
+      },
+      "optionalDependencies": {
+        "@types/glob": "^7.1.1"
+      }
+    },
+    "node_modules/asar/node_modules/commander": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
+      "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/asar/node_modules/glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/async-done": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz",
+      "integrity": "sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==",
+      "dev": true,
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.2",
+        "process-nextick-args": "^2.0.0",
+        "stream-exhaust": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/async-each": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
+      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
+      "dev": true
+    },
+    "node_modules/async-settle": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz",
+      "integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs= sha512-VPXfB4Vk49z1LHHodrEQ6Xf7W4gg1w0dAPROHngx7qgDjqmIQ+fXmwgGXTW/ITLai0YLSvWepJOP9EVpMnEAcw==",
+      "dev": true,
+      "dependencies": {
+        "async-done": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k= sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "dev": true
+    },
+    "node_modules/atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+      "dev": true,
+      "bin": {
+        "atob": "bin/atob.js"
+      },
+      "engines": {
+        "node": ">= 4.5.0"
+      }
+    },
+    "node_modules/available-typed-arrays": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
+      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/b4a": {
+      "version": "1.6.4",
+      "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.4.tgz",
+      "integrity": "sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw==",
+      "dev": true
+    },
+    "node_modules/bach": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz",
+      "integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA= sha512-bZOOfCb3gXBXbTFXq3OZtGR88LwGeJvzu6szttaIzymOTS4ZttBNOWSv7aLZja2EMycKtRYV0Oa8SNKH/zkxvg==",
+      "dev": true,
+      "dependencies": {
+        "arr-filter": "^1.1.1",
+        "arr-flatten": "^1.0.1",
+        "arr-map": "^2.0.0",
+        "array-each": "^1.0.0",
+        "array-initial": "^1.0.0",
+        "array-last": "^1.1.1",
+        "async-done": "^1.2.2",
+        "async-settle": "^1.0.0",
+        "now-and-later": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "node_modules/bare-events": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.4.2.tgz",
+      "integrity": "sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/bare-fs": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.3.1.tgz",
+      "integrity": "sha512-W/Hfxc/6VehXlsgFtbB5B4xFcsCl+pAh30cYhoFyXErf6oGrwjh8SwiPAdHgpmWonKuYpZgGywN0SXt7dgsADA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "bare-events": "^2.0.0",
+        "bare-path": "^2.0.0",
+        "bare-stream": "^2.0.0"
+      }
+    },
+    "node_modules/bare-os": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.4.0.tgz",
+      "integrity": "sha512-v8DTT08AS/G0F9xrhyLtepoo9EJBJ85FRSMbu1pQUlAf6A8T0tEEQGMVObWeqpjhSPXsE0VGlluFBJu2fdoTNg==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/bare-path": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-2.1.3.tgz",
+      "integrity": "sha512-lh/eITfU8hrj9Ru5quUp0Io1kJWIk1bTjzo7JH1P5dWmQ2EL4hFUlfI8FonAhSlgIfhn63p84CDY/x+PisgcXA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "bare-os": "^2.1.0"
+      }
+    },
+    "node_modules/bare-stream": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.1.3.tgz",
+      "integrity": "sha512-tiDAH9H/kP+tvNO5sczyn9ZAA7utrSMobyDchsnyyXBuUe2FSQWbxhtuHB8jwpHYYevVo2UJpcmvvjrbHboUUQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "streamx": "^2.18.0"
+      }
+    },
+    "node_modules/base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "dev": true,
+      "dependencies": {
+        "cache-base": "^1.0.1",
+        "class-utils": "^0.3.5",
+        "component-emitter": "^1.2.1",
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.1",
+        "mixin-deep": "^1.2.0",
+        "pascalcase": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/base/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY= sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/basic-auth": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz",
+      "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "5.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/before-after-hook": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.2.tgz",
+      "integrity": "sha512-3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ==",
+      "dev": true
+    },
+    "node_modules/big.js": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/binary-extensions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/binaryextensions": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/binaryextensions/-/binaryextensions-1.0.1.tgz",
+      "integrity": "sha1-HmN0iLNbWL2l9HdL+WpSEqjJB1U= sha512-xnG0l4K3ghM62rFzDi2jcNEuICl6uQ4NgvGpqQsY7HgW8gPDeAWGOxHI/k+qZfXfMANytzrArGNPXidaCwtbmA==",
+      "dev": true
+    },
+    "node_modules/bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "dependencies": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
+    "node_modules/bl": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "dependencies": {
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
+      }
+    },
+    "node_modules/block-stream": {
+      "version": "0.0.9",
+      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
+      "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo= sha512-OorbnJVPII4DuUKbjARAe8u8EfqOmkEEaSFIyoQ7OjTHn6kafxWl0wLgoZ2rXaYd7MyLcDaU4TmhfxtwgcccMQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "~2.0.0"
+      },
+      "engines": {
+        "node": "0.4 || >=0.5.8"
+      }
+    },
+    "node_modules/boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24= sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
+      "dev": true
+    },
+    "node_modules/boolean": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.2.tgz",
+      "integrity": "sha512-RwywHlpCRc3/Wh81MiCKun4ydaIFyW5Ea6JbL6sRCVx5q5irDw7pMXBUFYF/jArQ6YrG36q0kpovc9P/Kd3I4g==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "dependencies": {
+        "fill-range": "^7.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/browser-stdout": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
+      "dev": true
+    },
+    "node_modules/browserify-zlib": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
+      "integrity": "sha512-19OEpq7vWgsH6WkvkBJQDFvJS1uPcbFOQ4v9CU839dO+ZZXUZO6XpE6hNCqvlIIj+4fZvRiJ6DsAQ382GwiyTQ==",
+      "dev": true,
+      "dependencies": {
+        "pako": "~0.2.0"
+      }
+    },
+    "node_modules/browserslist": {
+      "version": "4.22.3",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.3.tgz",
+      "integrity": "sha512-UAp55yfwNv0klWNapjs/ktHoguxuQNGnOzxYmfnXIS+8AsRDZkSDxg7R1AX3GKzn078SBI5dzwzj/Yx0Or0e3A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "dependencies": {
+        "caniuse-lite": "^1.0.30001580",
+        "electron-to-chromium": "^1.4.648",
+        "node-releases": "^2.0.14",
+        "update-browserslist-db": "^1.0.13"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      }
+    },
+    "node_modules/buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
+    "node_modules/buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/buffer-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
+      "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74= sha512-tcBWO2Dl4e7Asr9hTGcpVrCe+F7DubpmqWCTbj4FHLmjqO2hIaC383acQubWtRJhdceqs5uBHs6Es+Sk//RKiQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true
+    },
+    "node_modules/builtin-modules": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
+      "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/bytes": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/c8": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/c8/-/c8-9.1.0.tgz",
+      "integrity": "sha512-mBWcT5iqNir1zIkzSPyI3NCR9EZCVI3WUD+AVO17MVWTSFNyUueXE82qTeampNtTr+ilN/5Ua3j24LgbCKjDVg==",
+      "dev": true,
+      "dependencies": {
+        "@bcoe/v8-coverage": "^0.2.3",
+        "@istanbuljs/schema": "^0.1.3",
+        "find-up": "^5.0.0",
+        "foreground-child": "^3.1.1",
+        "istanbul-lib-coverage": "^3.2.0",
+        "istanbul-lib-report": "^3.0.1",
+        "istanbul-reports": "^3.1.6",
+        "test-exclude": "^6.0.0",
+        "v8-to-istanbul": "^9.0.0",
+        "yargs": "^17.7.2",
+        "yargs-parser": "^21.1.1"
+      },
+      "bin": {
+        "c8": "bin/c8.js"
+      },
+      "engines": {
+        "node": ">=14.14.0"
+      }
+    },
+    "node_modules/cache-base": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "dev": true,
+      "dependencies": {
+        "collection-visit": "^1.0.0",
+        "component-emitter": "^1.2.1",
+        "get-value": "^2.0.6",
+        "has-value": "^1.0.0",
+        "isobject": "^3.0.1",
+        "set-value": "^2.0.0",
+        "to-object-path": "^0.3.0",
+        "union-value": "^1.0.0",
+        "unset-value": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/cache-content-type": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cache-content-type/-/cache-content-type-1.0.1.tgz",
+      "integrity": "sha512-IKufZ1o4Ut42YUrZSo8+qnMTrFuKkvyoLXUywKz9GJ5BrhOFGhLdkx9sG4KAnVvbY6kEcSFjLQul+DVmBm2bgA==",
+      "dev": true,
+      "dependencies": {
+        "mime-types": "^2.1.18",
+        "ylru": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/cacheable-lookup": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
+      "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.6.0"
+      }
+    },
+    "node_modules/cacheable-request": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz",
+      "integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==",
+      "dev": true,
+      "dependencies": {
+        "clone-response": "^1.0.2",
+        "get-stream": "^5.1.0",
+        "http-cache-semantics": "^4.0.0",
+        "keyv": "^4.0.0",
+        "lowercase-keys": "^2.0.0",
+        "normalize-url": "^6.0.1",
+        "responselike": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/call-bind": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+      "dev": true,
+      "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/camelcase": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/caniuse-api": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
+      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.0.0",
+        "caniuse-lite": "^1.0.0",
+        "lodash.memoize": "^4.1.2",
+        "lodash.uniq": "^4.5.0"
+      }
+    },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001581",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001581.tgz",
+      "integrity": "sha512-whlTkwhqV2tUmP3oYhtNfaWGYHDdS3JYFQBKXxcUR9qqPWsRhFHhoISO2Xnl/g0xyKzht9mI1LZpiNWfMzHixQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ]
+    },
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/chalk/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/chalk/node_modules/supports-color": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+      "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/charenc": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
+      "integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/chokidar": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ],
+      "dependencies": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/chownr": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/chrome-remote-interface": {
+      "version": "0.33.0",
+      "resolved": "https://registry.npmjs.org/chrome-remote-interface/-/chrome-remote-interface-0.33.0.tgz",
+      "integrity": "sha512-tv/SgeBfShXk43fwFpQ9wnS7mOCPzETnzDXTNxCb6TqKOiOeIfbrJz+2NAp8GmzwizpKa058wnU1Te7apONaYg==",
+      "dependencies": {
+        "commander": "2.11.x",
+        "ws": "^7.2.0"
+      },
+      "bin": {
+        "chrome-remote-interface": "bin/client.js"
+      }
+    },
+    "node_modules/chrome-remote-interface/node_modules/commander": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
+      "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ=="
+    },
+    "node_modules/chrome-remote-interface/node_modules/ws": {
+      "version": "7.5.10",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/chrome-trace-event": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
+      "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
+    "node_modules/chrome-trace-event/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
+    "node_modules/chromium-pickle-js": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz",
+      "integrity": "sha1-BKEGZywYsIWrd02YPfo+oTjyIgU= sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw==",
+      "dev": true
+    },
+    "node_modules/ci-info": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
+      "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==",
+      "dev": true
+    },
+    "node_modules/class-utils": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+      "dev": true,
+      "dependencies": {
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY= sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY= sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
+      "deprecated": "Please upgrade to v0.1.7",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/is-accessor-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y= sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
+      "deprecated": "Please upgrade to v0.1.5",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/is-data-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/cli-cursor": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz",
+      "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==",
+      "dev": true,
+      "dependencies": {
+        "restore-cursor": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cli-spinners": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz",
+      "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/cliui/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/cliui/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/clone": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+      "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18= sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/clone-buffer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
+      "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg= sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/clone-deep": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4",
+        "kind-of": "^6.0.2",
+        "shallow-clone": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/clone-deep/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/clone-deep/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/clone-response": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
+      "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= sha512-yjLXh88P599UOyPTFX0POsd7WxnbsVsGohcwzHOLspIhhpalPw1BcqED8NblyZLKcGrL8dTgMlcaZxV2jAD41Q==",
+      "dev": true,
+      "dependencies": {
+        "mimic-response": "^1.0.0"
+      }
+    },
+    "node_modules/clone-stats": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
+      "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA= sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag==",
+      "dev": true
+    },
+    "node_modules/cloneable-readable": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
+      "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "process-nextick-args": "^2.0.0",
+        "readable-stream": "^2.3.5"
+      }
+    },
+    "node_modules/cloneable-readable/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ= sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
+      "dev": true,
+      "engines": {
+        "iojs": ">= 1.0.0",
+        "node": ">= 0.12.0"
+      }
+    },
+    "node_modules/code-block-writer": {
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/code-block-writer/-/code-block-writer-12.0.0.tgz",
+      "integrity": "sha512-q4dMFMlXtKR3XNBHyMHt/3pwYNA69EDk00lloMOaaUMKPUXBw6lpXtbu3MMVG6/uOihGnRDOlkyqsONEUj60+w==",
+      "dev": true
+    },
+    "node_modules/code-point-at": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/collection-map": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz",
+      "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw= sha512-5D2XXSpkOnleOI21TG7p3T0bGAsZ/XknZpKBmGYyluO8pw4zA3K8ZlrBIbC4FXg3m6z/RNFiUFfT2sQK01+UHA==",
+      "dev": true,
+      "dependencies": {
+        "arr-map": "^2.0.2",
+        "for-own": "^1.0.0",
+        "make-iterator": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/collection-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA= sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==",
+      "dev": true,
+      "dependencies": {
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/color-support": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
+      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+      "dev": true,
+      "bin": {
+        "color-support": "bin.js"
+      }
+    },
+    "node_modules/colord": {
+      "version": "2.9.3",
+      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
+      "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
+      "dev": true
+    },
+    "node_modules/colorette": {
+      "version": "2.0.19",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz",
+      "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==",
+      "dev": true
+    },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/combined-stream/node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk= sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/command-line-args": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-5.2.1.tgz",
+      "integrity": "sha512-H4UfQhZyakIjC74I9d34fGYDwk3XpSr17QhEd0Q3I9Xq1CETHo4Hcuo87WyWHpAF1aSLjLRf5lD9ZGX2qStUvg==",
+      "dev": true,
+      "dependencies": {
+        "array-back": "^3.1.0",
+        "find-replace": "^3.0.0",
+        "lodash.camelcase": "^4.3.0",
+        "typical": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/commander": {
+      "version": "9.5.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz",
+      "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || >=14"
+      }
+    },
+    "node_modules/comment-parser": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.4.0.tgz",
+      "integrity": "sha512-QLyTNiZ2KDOibvFPlZ6ZngVsZ/0gYnE6uTXi5aoDg8ed3AkJAz4sEje3Y8a29hQ1s6A99MZXe47fLAXQ1rTqaw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 12.0.0"
+      }
+    },
+    "node_modules/component-emitter": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
+      "dev": true
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true
+    },
+    "node_modules/concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "dev": true,
+      "engines": [
+        "node >= 0.8"
+      ],
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      }
+    },
+    "node_modules/concat-stream/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/concat-with-sourcemaps": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz",
+      "integrity": "sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==",
+      "dev": true,
+      "dependencies": {
+        "source-map": "^0.6.1"
+      }
+    },
+    "node_modules/config-chain": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz",
+      "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==",
+      "dev": true,
+      "dependencies": {
+        "ini": "^1.3.4",
+        "proto-list": "~1.2.1"
+      }
+    },
+    "node_modules/content-disposition": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "5.2.1"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/content-disposition/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/content-type": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/convert-source-map": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
+      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.1"
+      }
+    },
+    "node_modules/cookie": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz",
+      "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/cookies": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/cookies/-/cookies-0.9.1.tgz",
+      "integrity": "sha512-TG2hpqe4ELx54QER/S3HQ9SRVnQnGBtKUz5bLQWtYAQ+o6GpgMs6sYUvaiJjVxb+UXwhRhAEP3m7LbsIZ77Hmw==",
+      "dev": true,
+      "dependencies": {
+        "depd": "~2.0.0",
+        "keygrip": "~1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/copy-descriptor": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/copy-props": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.5.tgz",
+      "integrity": "sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw==",
+      "dev": true,
+      "dependencies": {
+        "each-props": "^1.3.2",
+        "is-plain-object": "^5.0.0"
+      }
+    },
+    "node_modules/copy-webpack-plugin": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz",
+      "integrity": "sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==",
+      "dev": true,
+      "dependencies": {
+        "fast-glob": "^3.2.11",
+        "glob-parent": "^6.0.1",
+        "globby": "^13.1.1",
+        "normalize-path": "^3.0.0",
+        "schema-utils": "^4.0.0",
+        "serialize-javascript": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.1.0"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/globby": {
+      "version": "13.1.3",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-13.1.3.tgz",
+      "integrity": "sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw==",
+      "dev": true,
+      "dependencies": {
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.11",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/slash": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
+      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
+      "dev": true
+    },
+    "node_modules/create-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
+      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
+      "dev": true
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/crypt": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
+      "integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/css": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/css/-/css-3.0.0.tgz",
+      "integrity": "sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.4",
+        "source-map": "^0.6.1",
+        "source-map-resolve": "^0.6.0"
+      }
+    },
+    "node_modules/css-declaration-sorter": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-7.1.1.tgz",
+      "integrity": "sha512-dZ3bVTEEc1vxr3Bek9vGwfB5Z6ESPULhcRvO472mfjVnj8jRcTnKO8/JTczlvxM10Myb+wBM++1MtdO76eWcaQ==",
+      "dev": true,
+      "engines": {
+        "node": "^14 || ^16 || >=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.0.9"
+      }
+    },
+    "node_modules/css-loader": {
+      "version": "6.9.1",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.9.1.tgz",
+      "integrity": "sha512-OzABOh0+26JKFdMzlK6PY1u5Zx8+Ck7CVRlcGNZoY9qwJjdfu2VWFuprTIpPW+Av5TZTVViYWcFQaEEQURLknQ==",
+      "dev": true,
+      "dependencies": {
+        "icss-utils": "^5.1.0",
+        "postcss": "^8.4.33",
+        "postcss-modules-extract-imports": "^3.0.0",
+        "postcss-modules-local-by-default": "^4.0.4",
+        "postcss-modules-scope": "^3.1.1",
+        "postcss-modules-values": "^4.0.0",
+        "postcss-value-parser": "^4.2.0",
+        "semver": "^7.5.4"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/css-select": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
+      "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "^1.0.0",
+        "css-what": "^6.1.0",
+        "domhandler": "^5.0.2",
+        "domutils": "^3.0.1",
+        "nth-check": "^2.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/css-tree": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
+      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
+      "dev": true,
+      "dependencies": {
+        "mdn-data": "2.0.14",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/css-what": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
+      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/cssesc": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+      "dev": true,
+      "bin": {
+        "cssesc": "bin/cssesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/cssnano": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-6.0.3.tgz",
+      "integrity": "sha512-MRq4CIj8pnyZpcI2qs6wswoYoDD1t0aL28n+41c1Ukcpm56m1h6mCexIHBGjfZfnTqtGSSCP4/fB1ovxgjBOiw==",
+      "dev": true,
+      "dependencies": {
+        "cssnano-preset-default": "^6.0.3",
+        "lilconfig": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/cssnano"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/cssnano-preset-default": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-6.0.3.tgz",
+      "integrity": "sha512-4y3H370aZCkT9Ev8P4SO4bZbt+AExeKhh8wTbms/X7OLDo5E7AYUUy6YPxa/uF5Grf+AJwNcCnxKhZynJ6luBA==",
+      "dev": true,
+      "dependencies": {
+        "css-declaration-sorter": "^7.1.1",
+        "cssnano-utils": "^4.0.1",
+        "postcss-calc": "^9.0.1",
+        "postcss-colormin": "^6.0.2",
+        "postcss-convert-values": "^6.0.2",
+        "postcss-discard-comments": "^6.0.1",
+        "postcss-discard-duplicates": "^6.0.1",
+        "postcss-discard-empty": "^6.0.1",
+        "postcss-discard-overridden": "^6.0.1",
+        "postcss-merge-longhand": "^6.0.2",
+        "postcss-merge-rules": "^6.0.3",
+        "postcss-minify-font-values": "^6.0.1",
+        "postcss-minify-gradients": "^6.0.1",
+        "postcss-minify-params": "^6.0.2",
+        "postcss-minify-selectors": "^6.0.2",
+        "postcss-normalize-charset": "^6.0.1",
+        "postcss-normalize-display-values": "^6.0.1",
+        "postcss-normalize-positions": "^6.0.1",
+        "postcss-normalize-repeat-style": "^6.0.1",
+        "postcss-normalize-string": "^6.0.1",
+        "postcss-normalize-timing-functions": "^6.0.1",
+        "postcss-normalize-unicode": "^6.0.2",
+        "postcss-normalize-url": "^6.0.1",
+        "postcss-normalize-whitespace": "^6.0.1",
+        "postcss-ordered-values": "^6.0.1",
+        "postcss-reduce-initial": "^6.0.2",
+        "postcss-reduce-transforms": "^6.0.1",
+        "postcss-svgo": "^6.0.2",
+        "postcss-unique-selectors": "^6.0.2"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/cssnano-utils": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-4.0.1.tgz",
+      "integrity": "sha512-6qQuYDqsGoiXssZ3zct6dcMxiqfT6epy7x4R0TQJadd4LWO3sPR6JH6ZByOvVLoZ6EdwPGgd7+DR1EmX3tiXQQ==",
+      "dev": true,
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/csso": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
+      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
+      "dev": true,
+      "dependencies": {
+        "css-tree": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/d": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
+      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
+      "dev": true,
+      "dependencies": {
+        "es5-ext": "^0.10.50",
+        "type": "^1.0.1"
+      }
+    },
+    "node_modules/debounce": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/debounce/-/debounce-1.1.0.tgz",
+      "integrity": "sha512-ZQVKfRVlwRfD150ndzEK8M90ABT+Y/JQKs4Y7U4MXdpuoUkkrr4DwKbVux3YjylA5bUMUj0Nc3pMxPJX6N2QQQ==",
+      "dev": true
+    },
+    "node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/debug-fabulous": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-1.1.0.tgz",
+      "integrity": "sha512-GZqvGIgKNlUnHUPQhepnUZFIMoi3dgZKQBzKDeL2g7oJF9SNAji/AAu36dusFUas0O+pae74lNeoIPHqXWDkLg==",
+      "dev": true,
+      "dependencies": {
+        "debug": "3.X",
+        "memoizee": "0.4.X",
+        "object-assign": "4.X"
+      }
+    },
+    "node_modules/debug-fabulous/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/decamelize": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
+      "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/decode-uri-component": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/decompress-response": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
+      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
+      "dependencies": {
+        "mimic-response": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/decompress-response/node_modules/mimic-response": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
+      "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/deemon": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/deemon/-/deemon-1.8.0.tgz",
+      "integrity": "sha512-qcuSMls/W5DdoEKKAF0PiNQrc8+tItFjvszfjNm1YqNv1p5wwEt+6qILA9sws6eM81nmNwD38ducqlgIXzQlsQ==",
+      "dev": true,
+      "dependencies": {
+        "bl": "^4.0.2",
+        "tree-kill": "^1.2.2"
+      },
+      "bin": {
+        "deemon": "src/deemon.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/deep-equal": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
+      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU= sha512-bHtC0iYvWhyaTzvV3CZgPeZQqCOBGyGsVV7v4eevpdkLHfiSrXUdBG+qAuSz4RI70sszvjQ1QSZ98An1yNwpSw==",
+      "dev": true
+    },
+    "node_modules/deep-extend": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
+    },
+    "node_modules/deepmerge": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-3.1.0.tgz",
+      "integrity": "sha512-/TnecbwXEdycfbsM2++O3eGiatEFHjjNciHEwJclM+T5Kd94qD1AP+2elP/Mq0L5b9VZJao5znR01Mz6eX8Seg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/deepmerge-json": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/deepmerge-json/-/deepmerge-json-1.5.0.tgz",
+      "integrity": "sha512-jZRrDmBKjmGcqMFEUJ14FjMJwm05Qaked+1vxaALRtF0UAl7lPU8OLWXFxvoeg3jbQM249VPFVn8g2znaQkEtA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/default-compare": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz",
+      "integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^5.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/default-resolution": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz",
+      "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ= sha512-2xaP6GiwVwOEbXCGoJ4ufgC76m8cj805jrghScewJC2ZDsb9U0b4BIrba+xt/Uytyd0HvQ6+WymSRTfnYj59GQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/defer-to-connect": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
+      "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/define-data-property": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "dev": true,
+      "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/define-lazy-prop": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
+      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "dev": true,
+      "dependencies": {
+        "object-keys": "^1.0.12"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/define-property": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/delayed-stream": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.6.tgz",
+      "integrity": "sha1-omRst+w9XXd0YUZwp6Zd4MFz7bw= sha512-Si7mB08fdumvLNFddq3HQOoYf8BUxfITyZi+0RBn1sbojFm8c4gD1+3se7qVEji1uiVVLYE0Np0laaS9E+j6ag==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
+      "dev": true
+    },
+    "node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/deprecation": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
+      "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==",
+      "dev": true
+    },
+    "node_modules/destroy": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
+    },
+    "node_modules/detect-file": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
+      "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc= sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/detect-indent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz",
+      "integrity": "sha1-OHHMCmoALow+Wzz38zYmRnXwa50= sha512-rlpvsxUtM0PQvy9iZe640/IWwWYyBsTApREbA1pHOpmOUIl9MkP/U4z7vTtg4Oaojvqhxt7sdufnT0EzGaR31g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/detect-libc": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
+      "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/detect-newline": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz",
+      "integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I= sha512-CwffZFvlJffUg9zZA0uqrjQayUTC8ob94pnr5sFwaVv3IOmkfUHcWH+jXaQK3askE51Cqe8/9Ql/0uXNwqZ8Zg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/detect-node": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
+      "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/diff": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
+      "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "dev": true,
+      "dependencies": {
+        "path-type": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/dom-serializer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
+      "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.2",
+        "entities": "^4.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+      }
+    },
+    "node_modules/domelementtype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ]
+    },
+    "node_modules/domhandler": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
+      "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.3.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
+      }
+    },
+    "node_modules/domutils": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
+      "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
+      "dev": true,
+      "dependencies": {
+        "dom-serializer": "^2.0.0",
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
+      }
+    },
+    "node_modules/duplexer": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
+      "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E= sha512-sxNZ+ljy+RA1maXoUReeqBBpBC6RLKmg5ewzV+x+mSETmWNoKdZN6vcQjpFROemza23hGFskJtFNoUWUaQ+R4Q==",
+      "dev": true
+    },
+    "node_modules/duplexify": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+      "dev": true,
+      "dependencies": {
+        "end-of-stream": "^1.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "node_modules/duplexify/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/each-props": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz",
+      "integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.1",
+        "object.defaults": "^1.1.0"
+      }
+    },
+    "node_modules/each-props/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "dev": true
+    },
+    "node_modules/editorconfig": {
+      "version": "0.15.2",
+      "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.2.tgz",
+      "integrity": "sha512-GWjSI19PVJAM9IZRGOS+YKI8LN+/sjkSjNyvxL5ucqP9/IqtYNXBaQ/6c/hkPNYQHyOHra2KoXZI/JVpuqwmcQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "^10.11.7",
+        "@types/semver": "^5.5.0",
+        "commander": "^2.19.0",
+        "lru-cache": "^4.1.3",
+        "semver": "^5.6.0",
+        "sigmund": "^1.0.1"
+      },
+      "bin": {
+        "editorconfig": "bin/editorconfig"
+      }
+    },
+    "node_modules/editorconfig/node_modules/@types/node": {
+      "version": "10.12.21",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.21.tgz",
+      "integrity": "sha512-CBgLNk4o3XMnqMc0rhb6lc77IwShMEglz05deDcn2lQxyXEZivfwgYJu7SMha9V5XcrP6qZuevTHV/QrN2vjKQ==",
+      "dev": true
+    },
+    "node_modules/editorconfig/node_modules/@types/semver": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-5.5.0.tgz",
+      "integrity": "sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ==",
+      "dev": true
+    },
+    "node_modules/editorconfig/node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
+    },
+    "node_modules/editorconfig/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
+      "dev": true
+    },
+    "node_modules/electron": {
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-30.5.1.tgz",
+      "integrity": "sha512-AhL7+mZ8Lg14iaNfoYTkXQ2qee8mmsQyllKdqxlpv/zrKgfxz6jNVtcRRbQtLxtF8yzcImWdfTQROpYiPumdbw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "dependencies": {
+        "@electron/get": "^2.0.0",
+        "@types/node": "^20.9.0",
+        "extract-zip": "^2.0.1"
+      },
+      "bin": {
+        "electron": "cli.js"
+      },
+      "engines": {
+        "node": ">= 12.20.55"
+      }
+    },
+    "node_modules/electron-to-chromium": {
+      "version": "1.4.648",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.648.tgz",
+      "integrity": "sha512-EmFMarXeqJp9cUKu/QEciEApn0S/xRcpZWuAm32U7NgoZCimjsilKXHRO9saeEW55eHZagIDg6XTUOv32w9pjg==",
+      "dev": true
+    },
+    "node_modules/emoji-regex": {
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.3.0.tgz",
+      "integrity": "sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==",
+      "dev": true
+    },
+    "node_modules/emojis-list": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dependencies": {
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/enhanced-resolve": {
+      "version": "5.17.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
+      "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/entities": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/env-paths": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.0.tgz",
+      "integrity": "sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/envinfo": {
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz",
+      "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==",
+      "dev": true,
+      "bin": {
+        "envinfo": "dist/cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/errno": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
+      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
+      "dev": true,
+      "dependencies": {
+        "prr": "~1.0.1"
+      },
+      "bin": {
+        "errno": "cli.js"
+      }
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/es-abstract": {
+      "version": "1.18.0-next.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+      "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
+      "dev": true,
+      "dependencies": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.2",
+        "is-negative-zero": "^2.0.0",
+        "is-regex": "^1.1.1",
+        "object-inspect": "^1.8.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.1",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es-define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-module-lexer": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.0.tgz",
+      "integrity": "sha512-pqrTKmwEIgafsYZAGw9kszYzmagcE/n4dbgwGWLEXg7J4QFJVQRBld8j3Q3GNez79jzxZshq0bcT962QHOghjw==",
+      "dev": true
+    },
+    "node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es5-ext": {
+      "version": "0.10.63",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.63.tgz",
+      "integrity": "sha512-hUCZd2Byj/mNKjfP9jXrdVZ62B8KuA/VoK7X8nUh5qT+AxDmcbvZz041oDVZdbIN1qW6XY9VDNwzkvKnZvK2TQ==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "es6-iterator": "^2.0.3",
+        "es6-symbol": "^3.1.3",
+        "esniff": "^2.0.1",
+        "next-tick": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/es6-error": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
+      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/es6-iterator": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c= sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==",
+      "dev": true,
+      "dependencies": {
+        "d": "1",
+        "es5-ext": "^0.10.35",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "node_modules/es6-symbol": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
+      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
+      "dev": true,
+      "dependencies": {
+        "d": "^1.0.1",
+        "ext": "^1.1.2"
+      }
+    },
+    "node_modules/es6-weak-map": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
+      "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
+      "dev": true,
+      "dependencies": {
+        "d": "1",
+        "es5-ext": "^0.10.46",
+        "es6-iterator": "^2.0.3",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
+      "dev": true
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint": {
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.36.0.tgz",
+      "integrity": "sha512-Y956lmS7vDqomxlaaQAHVmeb4tNMp2FWIvU/RnU5BD3IKMD/MJPr76xdyr68P8tV1iNMvN2mRK0yy3c+UjL+bw==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.4.0",
+        "@eslint/eslintrc": "^2.0.1",
+        "@eslint/js": "8.36.0",
+        "@humanwhocodes/config-array": "^0.11.8",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.1.1",
+        "eslint-visitor-keys": "^3.3.0",
+        "espree": "^9.5.0",
+        "esquery": "^1.4.2",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.19.0",
+        "grapheme-splitter": "^1.0.4",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
+        "js-sdsl": "^4.1.4",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "strip-ansi": "^6.0.1",
+        "strip-json-comments": "^3.1.0",
+        "text-table": "^0.2.0"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-plugin-header": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-header/-/eslint-plugin-header-3.1.1.tgz",
+      "integrity": "sha512-9vlKxuJ4qf793CmeeSrZUvVClw6amtpghq3CuWcB5cUNnWHQhgcqy5eF8oVKFk1G3Y/CbchGfEaw3wiIJaNmVg==",
+      "dev": true,
+      "peerDependencies": {
+        "eslint": ">=7.7.0"
+      }
+    },
+    "node_modules/eslint-plugin-jsdoc": {
+      "version": "46.5.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-46.5.0.tgz",
+      "integrity": "sha512-aulXdA4I1dyWpzyS1Nh/GNoS6PavzeucxEapnMR4JUERowWvaEk2Y4A5irpHAcdXtBBHLVe8WIhdXNjoAlGQgA==",
+      "dev": true,
+      "dependencies": {
+        "@es-joy/jsdoccomment": "~0.40.1",
+        "are-docs-informative": "^0.0.2",
+        "comment-parser": "1.4.0",
+        "debug": "^4.3.4",
+        "escape-string-regexp": "^4.0.0",
+        "esquery": "^1.5.0",
+        "is-builtin-module": "^3.2.1",
+        "semver": "^7.5.4",
+        "spdx-expression-parse": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=16"
+      },
+      "peerDependencies": {
+        "eslint": "^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-local": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-local/-/eslint-plugin-local-1.0.0.tgz",
+      "integrity": "sha512-bcwcQnKL/Iw5Vi/F2lG1he5oKD2OGjhsLmrcctkWrWq5TujgiaYb0cj3pZgr3XI54inNVnneOFdAx1daLoYLJQ==",
+      "dev": true
+    },
+    "node_modules/eslint-scope": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint/node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/esniff": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/esniff/-/esniff-2.0.1.tgz",
+      "integrity": "sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==",
+      "dev": true,
+      "dependencies": {
+        "d": "^1.0.1",
+        "es5-ext": "^0.10.62",
+        "event-emitter": "^0.3.5",
+        "type": "^2.7.2"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/esniff/node_modules/type": {
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz",
+      "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==",
+      "dev": true
+    },
+    "node_modules/espree": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.9.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.4.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/esquery": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/event-emitter": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+      "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk= sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==",
+      "dev": true,
+      "dependencies": {
+        "d": "1",
+        "es5-ext": "~0.10.14"
+      }
+    },
+    "node_modules/event-stream": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
+      "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE= sha512-QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g==",
+      "dev": true,
+      "dependencies": {
+        "duplexer": "~0.1.1",
+        "from": "~0",
+        "map-stream": "~0.1.0",
+        "pause-stream": "0.0.11",
+        "split": "0.3",
+        "stream-combiner": "~0.0.4",
+        "through": "~2.3.1"
+      }
+    },
+    "node_modules/events": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.2.0.tgz",
+      "integrity": "sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.x"
+      }
+    },
+    "node_modules/expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI= sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY= sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY= sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
+      "deprecated": "Please upgrade to v0.1.7",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/is-accessor-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y= sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
+      "deprecated": "Please upgrade to v0.1.5",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/is-data-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/expand-template": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
+      "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/expand-tilde": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
+      "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI= sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==",
+      "dev": true,
+      "dependencies": {
+        "homedir-polyfill": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ext": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz",
+      "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==",
+      "dev": true,
+      "dependencies": {
+        "type": "^2.0.0"
+      }
+    },
+    "node_modules/ext/node_modules/type": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/type/-/type-2.1.0.tgz",
+      "integrity": "sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA==",
+      "dev": true
+    },
+    "node_modules/extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+      "dev": true
+    },
+    "node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg= sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "dependencies": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY= sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extract-zip": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
+      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.1",
+        "get-stream": "^5.1.0",
+        "yauzl": "^2.10.0"
+      },
+      "bin": {
+        "extract-zip": "cli.js"
+      },
+      "engines": {
+        "node": ">= 10.17.0"
+      },
+      "optionalDependencies": {
+        "@types/yauzl": "^2.9.1"
+      }
+    },
+    "node_modules/extract-zip/node_modules/yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
+      "dev": true,
+      "dependencies": {
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.1.0"
+      }
+    },
+    "node_modules/fancy-log": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
+      "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
+      "dev": true,
+      "dependencies": {
+        "ansi-gray": "^0.1.1",
+        "color-support": "^1.1.3",
+        "parse-node-version": "^1.0.0",
+        "time-stamp": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "node_modules/fast-fifo": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
+      "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==",
+      "dev": true
+    },
+    "node_modules/fast-glob": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
+      "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "dev": true
+    },
+    "node_modules/fastest-levenshtein": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
+      "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==",
+      "dev": true
+    },
+    "node_modules/fastq": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.9.0.tgz",
+      "integrity": "sha512-i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w==",
+      "dev": true,
+      "dependencies": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "node_modules/fd-slicer": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4= sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
+      "dependencies": {
+        "pend": "~1.2.0"
+      }
+    },
+    "node_modules/file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
+      "dependencies": {
+        "flat-cache": "^3.0.4"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/file-loader": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
+      "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
+      "dev": true,
+      "dependencies": {
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/file-loader/node_modules/schema-utils": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
+      "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.6",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="
+    },
+    "node_modules/fill-range": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-parent-dir": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/find-parent-dir/-/find-parent-dir-0.3.1.tgz",
+      "integrity": "sha512-o4UcykWV/XN9wm+jMEtWLPlV8RXCZnMhQI6F6OdHeSez7iiJWePw8ijOlskJZMsaQoGR/b7dH6lO02HhaTN7+A==",
+      "dev": true
+    },
+    "node_modules/find-replace": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-replace/-/find-replace-3.0.0.tgz",
+      "integrity": "sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==",
+      "dev": true,
+      "dependencies": {
+        "array-back": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/findup-sync": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
+      "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
+      "dev": true,
+      "dependencies": {
+        "detect-file": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "micromatch": "^3.0.4",
+        "resolve-dir": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/findup-sync/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc= sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU= sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg= sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fined": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
+      "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
+      "dev": true,
+      "dependencies": {
+        "expand-tilde": "^2.0.2",
+        "is-plain-object": "^2.0.3",
+        "object.defaults": "^1.1.0",
+        "object.pick": "^1.2.0",
+        "parse-filepath": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/fined/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/flagged-respawn": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
+      "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/flat": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+      "dev": true,
+      "bin": {
+        "flat": "cli.js"
+      }
+    },
+    "node_modules/flat-cache": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
+      "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
+      "dev": true,
+      "dependencies": {
+        "flatted": "^3.2.9",
+        "keyv": "^4.5.3",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/flat-cache/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/flat-cache/node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/flatted": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
+      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
+      "dev": true
+    },
+    "node_modules/flush-write-stream": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.3.6"
+      }
+    },
+    "node_modules/flush-write-stream/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/for-each": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.3"
+      }
+    },
+    "node_modules/for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/for-own": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
+      "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs= sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==",
+      "dev": true,
+      "dependencies": {
+        "for-in": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/foreground-child": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
+      "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.0",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/form-data": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "dev": true,
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/fragment-cache": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk= sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==",
+      "dev": true,
+      "dependencies": {
+        "map-cache": "^0.2.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/from": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
+      "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4= sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==",
+      "dev": true
+    },
+    "node_modules/fs-constants": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
+    },
+    "node_modules/fs-extra": {
+      "version": "11.2.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=14.14"
+      }
+    },
+    "node_modules/fs-minipass": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/fs-minipass/node_modules/minipass": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
+      "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/fs-minipass/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
+    "node_modules/fs-mkdirp-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
+      "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes= sha512-+vSd9frUnapVC2RZYfL3FCB2p3g4TBhaUmrsWlSudsGdnxIuUvBB2QM1VZeBtc49QFwrp+wQLrDs3+xxDgI5gQ==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.11",
+        "through2": "^2.0.3"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/fs-mkdirp-stream/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/fs-mkdirp-stream/node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8= sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/fstream": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
+      "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
+      "deprecated": "This package is no longer supported.",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "inherits": "~2.0.0",
+        "mkdirp": ">=0.5 0",
+        "rimraf": "2"
+      },
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/fstream/node_modules/mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true,
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+      "dev": true,
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-stdin": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-7.0.0.tgz",
+      "integrity": "sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/get-stream": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+      "dev": true,
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/get-stream/node_modules/pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dev": true,
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "node_modules/get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/github-from-package": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
+      "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw=="
+    },
+    "node_modules/glob": {
+      "version": "5.0.15",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+      "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E= sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "dependencies": {
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "2 || 3",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/glob-stream": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz",
+      "integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ= sha512-uMbLGAP3S2aDOHUDfdoYcdIePUCfysbAd0IAoWVZbeGU/oNQ8asHVSshLDJUPWxfzj8zsCG7/XeHPHTtow0nsw==",
+      "dev": true,
+      "dependencies": {
+        "extend": "^3.0.0",
+        "glob": "^7.1.1",
+        "glob-parent": "^3.1.0",
+        "is-negated-glob": "^1.0.0",
+        "ordered-read-streams": "^1.0.0",
+        "pumpify": "^1.3.5",
+        "readable-stream": "^2.1.5",
+        "remove-trailing-separator": "^1.0.1",
+        "to-absolute-glob": "^2.0.0",
+        "unique-stream": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/glob-stream/node_modules/glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-stream/node_modules/glob-parent": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4= sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      }
+    },
+    "node_modules/glob-stream/node_modules/is-glob": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo= sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-stream/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/glob-to-regexp": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+      "dev": true
+    },
+    "node_modules/glob-watcher": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.5.tgz",
+      "integrity": "sha512-zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw==",
+      "dev": true,
+      "dependencies": {
+        "anymatch": "^2.0.0",
+        "async-done": "^1.2.0",
+        "chokidar": "^2.0.0",
+        "is-negated-glob": "^1.0.0",
+        "just-debounce": "^1.0.0",
+        "normalize-path": "^3.0.0",
+        "object.defaults": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/anymatch": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+      "dev": true,
+      "dependencies": {
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/anymatch/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk= sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+      "dev": true,
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/binary-extensions": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/chokidar": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+      "deprecated": "Chokidar 2 does not receive security updates since 2019. Upgrade to chokidar 3 with 15x fewer dependencies",
+      "dev": true,
+      "dependencies": {
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.1",
+        "braces": "^2.3.2",
+        "glob-parent": "^3.1.0",
+        "inherits": "^2.0.3",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "normalize-path": "^3.0.0",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.2.1",
+        "upath": "^1.1.1"
+      },
+      "optionalDependencies": {
+        "fsevents": "^1.2.7"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc= sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/fsevents": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+      "deprecated": "The v1 package contains DANGEROUS / INSECURE binaries. Upgrade to safe fsevents v2",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "dependencies": {
+        "bindings": "^1.5.0",
+        "nan": "^2.12.1"
+      },
+      "engines": {
+        "node": ">= 4.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/glob-parent": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4= sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/glob-parent/node_modules/is-glob": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo= sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/is-binary-path": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg= sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==",
+      "dev": true,
+      "dependencies": {
+        "binary-extensions": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU= sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/micromatch/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/readdirp": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.11",
+        "micromatch": "^3.1.10",
+        "readable-stream": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg= sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/global-agent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz",
+      "integrity": "sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "boolean": "^3.0.1",
+        "es6-error": "^4.1.1",
+        "matcher": "^3.0.0",
+        "roarr": "^2.15.3",
+        "semver": "^7.3.2",
+        "serialize-error": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=10.0"
+      }
+    },
+    "node_modules/global-modules": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
+      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+      "dev": true,
+      "dependencies": {
+        "global-prefix": "^1.0.1",
+        "is-windows": "^1.0.1",
+        "resolve-dir": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/global-prefix": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
+      "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4= sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==",
+      "dev": true,
+      "dependencies": {
+        "expand-tilde": "^2.0.2",
+        "homedir-polyfill": "^1.0.1",
+        "ini": "^1.3.4",
+        "is-windows": "^1.0.1",
+        "which": "^1.2.14"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/global-prefix/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/globals": {
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/globalthis": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.1.tgz",
+      "integrity": "sha512-mJPRTc/P39NH/iNG4mXa9aIhNymaQikTrnspeCa2ZuJ+mH2QN/rXwtX3XwKrHqWgUQFbNZKtHM105aHzJalElw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "define-properties": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+      "dev": true,
+      "dependencies": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/glogg": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
+      "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
+      "dev": true,
+      "dependencies": {
+        "sparkles": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/got": {
+      "version": "11.8.5",
+      "resolved": "https://registry.npmjs.org/got/-/got-11.8.5.tgz",
+      "integrity": "sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==",
+      "dev": true,
+      "dependencies": {
+        "@sindresorhus/is": "^4.0.0",
+        "@szmarczak/http-timer": "^4.0.5",
+        "@types/cacheable-request": "^6.0.1",
+        "@types/responselike": "^1.0.0",
+        "cacheable-lookup": "^5.0.3",
+        "cacheable-request": "^7.0.2",
+        "decompress-response": "^6.0.0",
+        "http2-wrapper": "^1.0.0-beta.5.2",
+        "lowercase-keys": "^2.0.0",
+        "p-cancelable": "^2.0.0",
+        "responselike": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.19.0"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/got?sponsor=1"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
+    },
+    "node_modules/grapheme-splitter": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
+      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
+      "dev": true
+    },
+    "node_modules/graphemer": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
+      "dev": true
+    },
+    "node_modules/gulp": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz",
+      "integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==",
+      "dev": true,
+      "dependencies": {
+        "glob-watcher": "^5.0.3",
+        "gulp-cli": "^2.2.0",
+        "undertaker": "^1.2.1",
+        "vinyl-fs": "^3.0.0"
+      },
+      "bin": {
+        "gulp": "bin/gulp.js"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/gulp-azure-storage": {
+      "version": "0.12.1",
+      "resolved": "https://registry.npmjs.org/gulp-azure-storage/-/gulp-azure-storage-0.12.1.tgz",
+      "integrity": "sha512-n/hx8bbGsqrcizruqDTX6zy2FUdkTDGAz04IdopNxNTZivZmizf8u9WLYJreUE6/qCnSJnyjS1HP82+mLk7rjg==",
+      "dev": true,
+      "dependencies": {
+        "@azure/storage-blob": "^12.8.0",
+        "delayed-stream": "0.0.6",
+        "event-stream": "3.3.4",
+        "mime": "^1.3.4",
+        "progress": "^1.1.8",
+        "queue": "^3.0.10",
+        "streamifier": "^0.1.1",
+        "vinyl": "^2.2.0",
+        "vinyl-fs": "^3.0.3",
+        "yargs": "^15.3.0"
+      },
+      "bin": {
+        "upload-to-azure": "bin/upload.js"
+      }
+    },
+    "node_modules/gulp-azure-storage/node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/gulp-azure-storage/node_modules/cliui": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
+      }
+    },
+    "node_modules/gulp-azure-storage/node_modules/decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-azure-storage/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/gulp-azure-storage/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/gulp-azure-storage/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/gulp-azure-storage/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/gulp-azure-storage/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/gulp-azure-storage/node_modules/replace-ext": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
+      "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/gulp-azure-storage/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/gulp-azure-storage/node_modules/vinyl": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
+      "integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==",
+      "dev": true,
+      "dependencies": {
+        "clone": "^2.1.1",
+        "clone-buffer": "^1.0.0",
+        "clone-stats": "^1.0.0",
+        "cloneable-readable": "^1.0.0",
+        "remove-trailing-separator": "^1.0.1",
+        "replace-ext": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/gulp-azure-storage/node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/gulp-azure-storage/node_modules/y18n": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz",
+      "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==",
+      "dev": true
+    },
+    "node_modules/gulp-azure-storage/node_modules/yargs": {
+      "version": "15.4.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^18.1.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/gulp-azure-storage/node_modules/yargs-parser": {
+      "version": "18.1.3",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/gulp-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-bom/-/gulp-bom-3.0.0.tgz",
+      "integrity": "sha512-iw/J94F+MVlxG64Q17BSkHsyjpY17qHl3N3A/jDdrL77zQBkhKtTiKLqM4di9CUX/qFToyyeDsOWwH+rESBgmA==",
+      "dev": true,
+      "dependencies": {
+        "plugin-error": "^1.0.1",
+        "through2": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "peerDependencies": {
+        "gulp": ">=4"
+      },
+      "peerDependenciesMeta": {
+        "gulp": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/gulp-buffer": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/gulp-buffer/-/gulp-buffer-0.0.2.tgz",
+      "integrity": "sha1-r4G0NGEBc2tJlC7GyfqGf/5zcDY= sha512-EBkbjjTH2gRr2B8KBAcomdTemfZHqiKs8CxSYdaW0Hq3zxltQFrCg9BBmKVHC9cfxX/3l2BZK5oiGHYNJ/gcVw==",
+      "dev": true,
+      "dependencies": {
+        "through2": "~0.4.0"
+      }
+    },
+    "node_modules/gulp-buffer/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "dev": true
+    },
+    "node_modules/gulp-buffer/node_modules/object-keys": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
+      "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY= sha512-ncrLw+X55z7bkl5PnUvHwFK9FcGuFYo9gtjws2XtSzL+aZ8tm830P60WJ0dSmFVaSalWieW5MD7kEdnXda9yJw==",
+      "dev": true
+    },
+    "node_modules/gulp-buffer/node_modules/readable-stream": {
+      "version": "1.0.34",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+      "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw= sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/gulp-buffer/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+      "dev": true
+    },
+    "node_modules/gulp-buffer/node_modules/through2": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
+      "integrity": "sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s= sha512-45Llu+EwHKtAZYTPPVn3XZHBgakWMN3rokhEv5hu596XP+cNgplMg+Gj+1nmAvj+L0K7+N49zBKx5rah5u0QIQ==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~1.0.17",
+        "xtend": "~2.1.1"
+      }
+    },
+    "node_modules/gulp-buffer/node_modules/xtend": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
+      "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os= sha512-vMNKzr2rHP9Dp/e1NQFnLQlwlhp9L/LfvnsVdHxN1f+uggyVI3i08uD14GPvCToPkdsRfyPqIyYGmIk58V98ZQ==",
+      "dev": true,
+      "dependencies": {
+        "object-keys": "~0.4.0"
+      },
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
+    "node_modules/gulp-cli": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz",
+      "integrity": "sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "^1.0.1",
+        "archy": "^1.0.0",
+        "array-sort": "^1.0.0",
+        "color-support": "^1.1.3",
+        "concat-stream": "^1.6.0",
+        "copy-props": "^2.0.1",
+        "fancy-log": "^1.3.2",
+        "gulplog": "^1.0.0",
+        "interpret": "^1.4.0",
+        "isobject": "^3.0.1",
+        "liftoff": "^3.1.0",
+        "matchdep": "^2.0.0",
+        "mute-stdout": "^1.0.0",
+        "pretty-hrtime": "^1.0.0",
+        "replace-homedir": "^1.0.0",
+        "semver-greatest-satisfied-range": "^1.1.0",
+        "v8flags": "^3.2.0",
+        "yargs": "^7.1.0"
+      },
+      "bin": {
+        "gulp": "bin/gulp.js"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/ansi-colors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-wrap": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/camelcase": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+      "integrity": "sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/cliui": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0= sha512-0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wrap-ansi": "^2.0.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/get-caller-file": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
+      "dev": true
+    },
+    "node_modules/gulp-cli/node_modules/is-fullwidth-code-point": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs= sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
+      "dev": true,
+      "dependencies": {
+        "number-is-nan": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/require-main-filename": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE= sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug==",
+      "dev": true
+    },
+    "node_modules/gulp-cli/node_modules/string-width": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
+      "dev": true,
+      "dependencies": {
+        "code-point-at": "^1.0.0",
+        "is-fullwidth-code-point": "^1.0.0",
+        "strip-ansi": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/which-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
+      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8= sha512-F6+WgncZi/mJDrammbTuHe1q0R5hOXv/mBaiNA2TCNT/LTHusX0V+CJnj9XT8ki5ln2UZyyddDgHfCzyrOH7MQ==",
+      "dev": true
+    },
+    "node_modules/gulp-cli/node_modules/wrap-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU= sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/y18n": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
+      "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==",
+      "dev": true
+    },
+    "node_modules/gulp-cli/node_modules/yargs": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.2.tgz",
+      "integrity": "sha512-ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^3.0.0",
+        "cliui": "^3.2.0",
+        "decamelize": "^1.1.1",
+        "get-caller-file": "^1.0.1",
+        "os-locale": "^1.4.0",
+        "read-pkg-up": "^1.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^1.0.1",
+        "set-blocking": "^2.0.0",
+        "string-width": "^1.0.2",
+        "which-module": "^1.0.0",
+        "y18n": "^3.2.1",
+        "yargs-parser": "^5.0.1"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/yargs-parser": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.1.tgz",
+      "integrity": "sha512-wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^3.0.0",
+        "object.assign": "^4.1.0"
+      }
+    },
+    "node_modules/gulp-concat": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz",
+      "integrity": "sha1-Yz0WyV2IUEYorQJmVmPO5aR5M1M= sha512-a2scActrQrDBpBbR3WUZGyGS1JEPLg5PZJdIa7/Bi3GuKAmPYDK6SFhy/NZq5R8KsKKFvtfR0fakbUCcKGCCjg==",
+      "dev": true,
+      "dependencies": {
+        "concat-with-sourcemaps": "^1.0.0",
+        "through2": "^2.0.0",
+        "vinyl": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/gulp-concat/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/gulp-concat/node_modules/replace-ext": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
+      "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/gulp-concat/node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/gulp-concat/node_modules/vinyl": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.1.0.tgz",
+      "integrity": "sha1-Ah+cLPlR1rk5lDyJ617lrdT9kkw= sha512-M5D/ZRG7KC3ETrV7iA/GNF/lznml4dZ7ggwtYbqM/B+0INyNTjCdFhw4TqMq//PtNbPpceE7wOqKqK5YfUThPA==",
+      "dev": true,
+      "dependencies": {
+        "clone": "^2.1.1",
+        "clone-buffer": "^1.0.0",
+        "clone-stats": "^1.0.0",
+        "cloneable-readable": "^1.0.0",
+        "remove-trailing-separator": "^1.0.1",
+        "replace-ext": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/gulp-filter": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/gulp-filter/-/gulp-filter-5.1.0.tgz",
+      "integrity": "sha1-oF4Rr/sHz33PQafeHLe2OsN4PnM= sha512-ZERu1ipbPmjrNQ2dQD6lL4BjrJQG66P/c5XiyMMBqV+tUAJ+fLOyYIL/qnXd2pHmw/G/r7CLQb9ttANvQWbpfQ==",
+      "dev": true,
+      "dependencies": {
+        "multimatch": "^2.0.0",
+        "plugin-error": "^0.1.2",
+        "streamfilter": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/gulp-filter/node_modules/arr-diff": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
+      "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo= sha512-OQwDZUqYaQwyyhDJHThmzId8daf4/RFNLaeh3AevmSeZ5Y7ug4Ga/yKc6l6kTZOBW781rCj103ZuTh8GAsB3+Q==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.0.1",
+        "array-slice": "^0.2.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-filter/node_modules/arr-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
+      "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0= sha512-t5db90jq+qdgk8aFnxEkjqta0B/GHrM1pxzuuZz2zWsOXc5nKu3t+76s/PQBA8FTcM/ipspIH9jWG4OxCBc2eA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-filter/node_modules/array-slice": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
+      "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU= sha512-rlVfZW/1Ph2SNySXwR9QYkChp8EkOEiTMO5Vwx60usw04i4nWemkm9RXmQqgkQFaLHsqLuADvjp6IfgL9l2M8Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-filter/node_modules/extend-shallow": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
+      "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE= sha512-L7AGmkO6jhDkEBBGWlLtftA80Xq8DipnrRPr0pyi7GQLXkaq9JYA4xF4z6qnadIC6euiTDKco0cGSU9muw+WTw==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-filter/node_modules/kind-of": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+      "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ= sha512-aUH6ElPnMGon2/YkxRIigV32MOpTVcoXQ1Oo8aYn40s+sJ3j+0gFZsT8HKDcxNy7Fi9zuquWtGaGAahOdv5p/g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-filter/node_modules/plugin-error": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
+      "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4= sha512-WzZHcm4+GO34sjFMxQMqZbsz3xiNEgonCskQ9v+IroMmYgk/tas8dG+Hr2D6IbRPybZ12oWpzE/w3cGJ6FJzOw==",
+      "dev": true,
+      "dependencies": {
+        "ansi-cyan": "^0.1.1",
+        "ansi-red": "^0.1.1",
+        "arr-diff": "^1.0.1",
+        "arr-union": "^2.0.1",
+        "extend-shallow": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-flatmap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/gulp-flatmap/-/gulp-flatmap-1.0.2.tgz",
+      "integrity": "sha512-xm+Ax2vPL/xiMBqLFI++wUyPtncm3b55ztGHewmRcoG/sYb0OUTatjSacOud3fee77rnk+jOgnDEHhwBtMHgFA==",
+      "dev": true,
+      "dependencies": {
+        "plugin-error": "0.1.2",
+        "through2": "2.0.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-flatmap/node_modules/arr-diff": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
+      "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo= sha512-OQwDZUqYaQwyyhDJHThmzId8daf4/RFNLaeh3AevmSeZ5Y7ug4Ga/yKc6l6kTZOBW781rCj103ZuTh8GAsB3+Q==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.0.1",
+        "array-slice": "^0.2.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-flatmap/node_modules/arr-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
+      "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0= sha512-t5db90jq+qdgk8aFnxEkjqta0B/GHrM1pxzuuZz2zWsOXc5nKu3t+76s/PQBA8FTcM/ipspIH9jWG4OxCBc2eA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-flatmap/node_modules/array-slice": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
+      "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU= sha512-rlVfZW/1Ph2SNySXwR9QYkChp8EkOEiTMO5Vwx60usw04i4nWemkm9RXmQqgkQFaLHsqLuADvjp6IfgL9l2M8Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-flatmap/node_modules/extend-shallow": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
+      "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE= sha512-L7AGmkO6jhDkEBBGWlLtftA80Xq8DipnrRPr0pyi7GQLXkaq9JYA4xF4z6qnadIC6euiTDKco0cGSU9muw+WTw==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-flatmap/node_modules/kind-of": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+      "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ= sha512-aUH6ElPnMGon2/YkxRIigV32MOpTVcoXQ1Oo8aYn40s+sJ3j+0gFZsT8HKDcxNy7Fi9zuquWtGaGAahOdv5p/g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-flatmap/node_modules/plugin-error": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
+      "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4= sha512-WzZHcm4+GO34sjFMxQMqZbsz3xiNEgonCskQ9v+IroMmYgk/tas8dG+Hr2D6IbRPybZ12oWpzE/w3cGJ6FJzOw==",
+      "dev": true,
+      "dependencies": {
+        "ansi-cyan": "^0.1.1",
+        "ansi-red": "^0.1.1",
+        "arr-diff": "^1.0.1",
+        "arr-union": "^2.0.1",
+        "extend-shallow": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-flatmap/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/gulp-flatmap/node_modules/through2": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
+      "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4= sha512-tmNYYHFqXmaKSSlOU4ZbQ82cxmFQa5LRWKFtWCNkGIiZ3/VHmOffCeWfBRZZRyXAhNP9itVMR+cuvomBOPlm8g==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "^2.1.5",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/gulp-gunzip": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/gulp-gunzip/-/gulp-gunzip-1.1.0.tgz",
+      "integrity": "sha512-3INeprGyz5fUtAs75k6wVslGuRZIjKAoQp39xA7Bz350ReqkrfYaLYqjZ67XyIfLytRXdzeX04f+DnBduYhQWw==",
+      "dev": true,
+      "dependencies": {
+        "through2": "~2.0.3",
+        "vinyl": "~2.0.1"
+      }
+    },
+    "node_modules/gulp-gunzip/node_modules/clone": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4= sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/gulp-gunzip/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/gulp-gunzip/node_modules/replace-ext": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
+      "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/gulp-gunzip/node_modules/through2": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
+      "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4= sha512-tmNYYHFqXmaKSSlOU4ZbQ82cxmFQa5LRWKFtWCNkGIiZ3/VHmOffCeWfBRZZRyXAhNP9itVMR+cuvomBOPlm8g==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "^2.1.5",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/gulp-gunzip/node_modules/vinyl": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.0.2.tgz",
+      "integrity": "sha1-CjcT2NTpIhxY8QyhbAEWyeJe2nw= sha512-ViPXqulxjb1yXxaf/kQZfLHkd2ppnVBWPq4XmvW377vcBTxHFtHR5NRfYsdXsiKpWndKRoCdn11DfEnoCz1Inw==",
+      "dev": true,
+      "dependencies": {
+        "clone": "^1.0.0",
+        "clone-buffer": "^1.0.0",
+        "clone-stats": "^1.0.0",
+        "cloneable-readable": "^1.0.0",
+        "is-stream": "^1.1.0",
+        "remove-trailing-separator": "^1.0.1",
+        "replace-ext": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/gulp-gzip": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/gulp-gzip/-/gulp-gzip-1.4.2.tgz",
+      "integrity": "sha512-ZIxfkUwk2XmZPTT9pPHrHUQlZMyp9nPhg2sfoeN27mBGpi7OaHnOD+WCN41NXjfJQ69lV1nQ9LLm1hYxx4h3UQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "^1.0.1",
+        "bytes": "^3.0.0",
+        "fancy-log": "^1.3.2",
+        "plugin-error": "^1.0.0",
+        "stream-to-array": "^2.3.0",
+        "through2": "^2.0.3"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/gulp-gzip/node_modules/ansi-colors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-wrap": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-gzip/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/gulp-gzip/node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/gulp-json-editor": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/gulp-json-editor/-/gulp-json-editor-2.5.0.tgz",
+      "integrity": "sha512-HyrBSaE+Di6oQbKsfNM6X7dPFowOuTTuVYjxratU8QAiW7LR7Rydm+/fSS3OehdnuP++A/07q/nksihuD5FZSA==",
+      "dev": true,
+      "dependencies": {
+        "deepmerge": "^3.0.0",
+        "detect-indent": "^5.0.0",
+        "js-beautify": "^1.8.9",
+        "plugin-error": "^1.0.1",
+        "through2": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/gulp-plumber": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gulp-plumber/-/gulp-plumber-1.2.0.tgz",
+      "integrity": "sha512-L/LJftsbKoHbVj6dN5pvMsyJn9jYI0wT0nMg3G6VZhDac4NesezecYTi8/48rHi+yEic3sUpw6jlSc7qNWh32A==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^1.1.3",
+        "fancy-log": "^1.3.2",
+        "plugin-error": "^0.1.2",
+        "through2": "^2.0.3"
+      },
+      "engines": {
+        "node": ">=0.10",
+        "npm": ">=1.2.10"
+      }
+    },
+    "node_modules/gulp-plumber/node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-plumber/node_modules/ansi-styles": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-plumber/node_modules/arr-diff": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
+      "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo= sha512-OQwDZUqYaQwyyhDJHThmzId8daf4/RFNLaeh3AevmSeZ5Y7ug4Ga/yKc6l6kTZOBW781rCj103ZuTh8GAsB3+Q==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.0.1",
+        "array-slice": "^0.2.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-plumber/node_modules/arr-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
+      "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0= sha512-t5db90jq+qdgk8aFnxEkjqta0B/GHrM1pxzuuZz2zWsOXc5nKu3t+76s/PQBA8FTcM/ipspIH9jWG4OxCBc2eA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-plumber/node_modules/array-slice": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
+      "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU= sha512-rlVfZW/1Ph2SNySXwR9QYkChp8EkOEiTMO5Vwx60usw04i4nWemkm9RXmQqgkQFaLHsqLuADvjp6IfgL9l2M8Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-plumber/node_modules/chalk": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^2.2.1",
+        "escape-string-regexp": "^1.0.2",
+        "has-ansi": "^2.0.0",
+        "strip-ansi": "^3.0.0",
+        "supports-color": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-plumber/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/gulp-plumber/node_modules/extend-shallow": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
+      "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE= sha512-L7AGmkO6jhDkEBBGWlLtftA80Xq8DipnrRPr0pyi7GQLXkaq9JYA4xF4z6qnadIC6euiTDKco0cGSU9muw+WTw==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-plumber/node_modules/kind-of": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+      "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ= sha512-aUH6ElPnMGon2/YkxRIigV32MOpTVcoXQ1Oo8aYn40s+sJ3j+0gFZsT8HKDcxNy7Fi9zuquWtGaGAahOdv5p/g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-plumber/node_modules/plugin-error": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
+      "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4= sha512-WzZHcm4+GO34sjFMxQMqZbsz3xiNEgonCskQ9v+IroMmYgk/tas8dG+Hr2D6IbRPybZ12oWpzE/w3cGJ6FJzOw==",
+      "dev": true,
+      "dependencies": {
+        "ansi-cyan": "^0.1.1",
+        "ansi-red": "^0.1.1",
+        "arr-diff": "^1.0.1",
+        "arr-union": "^2.0.1",
+        "extend-shallow": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-plumber/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/gulp-plumber/node_modules/strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-plumber/node_modules/supports-color": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/gulp-plumber/node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/gulp-rename": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.2.2.tgz",
+      "integrity": "sha1-OtRCh2PwXidk3sHGfYaNsnVoeBc= sha512-qhfUlYwq5zIP4cpRjx+np2vZVnr0xCRQrF3RsGel8uqL47Gu3yjmllSfnvJyl/39zYuxS68e1nnxImbm7388vw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0",
+        "npm": ">=1.2.10"
+      }
+    },
+    "node_modules/gulp-replace": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/gulp-replace/-/gulp-replace-0.5.4.tgz",
+      "integrity": "sha1-aaZ5FLvRPFYr/xT1BKQDeWqg2qk= sha512-lHL+zKJN8uV95UkONnfRkoj2yJxPPupt2SahxA4vo5c+Ee3+WaIiMdWbOyUhg8BhAROQrWKnnxKOWPdVrnBwGw==",
+      "dev": true,
+      "dependencies": {
+        "istextorbinary": "1.0.2",
+        "readable-stream": "^2.0.1",
+        "replacestream": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/gulp-replace/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/gulp-sourcemaps": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-3.0.0.tgz",
+      "integrity": "sha512-RqvUckJkuYqy4VaIH60RMal4ZtG0IbQ6PXMNkNsshEGJ9cldUPRb/YCgboYae+CLAs1HQNb4ADTKCx65HInquQ==",
+      "dev": true,
+      "dependencies": {
+        "@gulp-sourcemaps/identity-map": "^2.0.1",
+        "@gulp-sourcemaps/map-sources": "^1.0.0",
+        "acorn": "^6.4.1",
+        "convert-source-map": "^1.0.0",
+        "css": "^3.0.0",
+        "debug-fabulous": "^1.0.0",
+        "detect-newline": "^2.0.0",
+        "graceful-fs": "^4.0.0",
+        "source-map": "^0.6.0",
+        "strip-bom-string": "^1.0.0",
+        "through2": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/gulp-sourcemaps/node_modules/acorn": {
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
+      "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/gulp-sourcemaps/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/gulp-sourcemaps/node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/gulp-svgmin": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/gulp-svgmin/-/gulp-svgmin-4.1.0.tgz",
+      "integrity": "sha512-WKpif+yu3+oIlp1e11CQi5F64YddP699l2mFmxpz8swv8/P8dhxVcMKdCPFWouArlVyn7Ma1eWCJHw5gx4NMtw==",
+      "dev": true,
+      "dependencies": {
+        "lodash.clonedeep": "^4.5.0",
+        "plugin-error": "^1.0.1",
+        "svgo": "^2.7.0"
+      }
+    },
+    "node_modules/gulp-symdest": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/gulp-symdest/-/gulp-symdest-1.3.0.tgz",
+      "integrity": "sha512-n1VaNYMpyOq4GfyQyIwRZhXOOsQVdEy56BCFxL4hu+stKwYeSQcZxLX5FOZL6jZUlBYXCWlXL+E5JU13ZMldIw==",
+      "dev": true,
+      "dependencies": {
+        "event-stream": "3.3.4",
+        "mkdirp": "^0.5.1",
+        "queue": "^3.1.0",
+        "vinyl-fs": "^3.0.3"
+      }
+    },
+    "node_modules/gulp-symdest/node_modules/mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/gulp-untar": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/gulp-untar/-/gulp-untar-0.0.7.tgz",
+      "integrity": "sha512-0QfbCH2a1k2qkTLWPqTX+QO4qNsHn3kC546YhAP3/n0h+nvtyGITDuDrYBMDZeW4WnFijmkOvBWa5HshTic1tw==",
+      "dev": true,
+      "dependencies": {
+        "event-stream": "~3.3.4",
+        "streamifier": "~0.1.1",
+        "tar": "^2.2.1",
+        "through2": "~2.0.3",
+        "vinyl": "^1.2.0"
+      }
+    },
+    "node_modules/gulp-untar/node_modules/clone": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4= sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/gulp-untar/node_modules/clone-stats": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
+      "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE= sha512-dhUqc57gSMCo6TX85FLfe51eC/s+Im2MLkAgJwfaRRexR2tA4dd3eLEW4L6efzHc2iNorrRRXITifnDLlRrhaA==",
+      "dev": true
+    },
+    "node_modules/gulp-untar/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/gulp-untar/node_modules/replace-ext": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
+      "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ= sha512-AFBWBy9EVRTa/LhEcG8QDP3FvpwZqmvN2QFDuJswFeaVhWnZMp8q3E6Zd90SR04PlIwfGdyVjNyLPyen/ek5CQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/gulp-untar/node_modules/tar": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
+      "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
+      "deprecated": "This version of tar is no longer supported, and will not receive security updates. Please upgrade asap.",
+      "dev": true,
+      "dependencies": {
+        "block-stream": "*",
+        "fstream": "^1.0.12",
+        "inherits": "2"
+      }
+    },
+    "node_modules/gulp-untar/node_modules/through2": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
+      "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4= sha512-tmNYYHFqXmaKSSlOU4ZbQ82cxmFQa5LRWKFtWCNkGIiZ3/VHmOffCeWfBRZZRyXAhNP9itVMR+cuvomBOPlm8g==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "^2.1.5",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/gulp-untar/node_modules/vinyl": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
+      "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ= sha512-Ci3wnR2uuSAWFMSglZuB8Z2apBdtOyz8CV7dC6/U1XbltXBC+IuutUkXQISz01P+US2ouBuesSbV6zILZ6BuzQ==",
+      "dev": true,
+      "dependencies": {
+        "clone": "^1.0.0",
+        "clone-stats": "^0.0.1",
+        "replace-ext": "0.0.1"
+      },
+      "engines": {
+        "node": ">= 0.9"
+      }
+    },
+    "node_modules/gulp-vinyl-zip": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/gulp-vinyl-zip/-/gulp-vinyl-zip-2.1.2.tgz",
+      "integrity": "sha512-wJn09jsb8PyvUeyFF7y7ImEJqJwYy40BqL9GKfJs6UGpaGW9A+N68Q+ajsIpb9AeR6lAdjMbIdDPclIGo1/b7Q==",
+      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
+      "dev": true,
+      "dependencies": {
+        "event-stream": "3.3.4",
+        "queue": "^4.2.1",
+        "through2": "^2.0.3",
+        "vinyl": "^2.0.2",
+        "vinyl-fs": "^3.0.3",
+        "yauzl": "^2.2.1",
+        "yazl": "^2.2.1"
+      }
+    },
+    "node_modules/gulp-vinyl-zip/node_modules/fd-slicer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
+      "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU= sha512-MX1ZLPIuKED51hrI4++K+1B0VX87Cs4EkybD2q12Ysuf5p4vkmHqMvQJRlDwROqFr4D2Pzyit5wGQxf30grIcw==",
+      "dev": true,
+      "dependencies": {
+        "pend": "~1.2.0"
+      }
+    },
+    "node_modules/gulp-vinyl-zip/node_modules/queue": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/queue/-/queue-4.5.0.tgz",
+      "integrity": "sha512-DwxpAnqJuoQa+wyDgQuwkSshkhlqIlWEvwvdAY27fDPunZ2cVJzXU4JyjY+5l7zs7oGLaYAQm4MbLOVFAHFBzA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "~2.0.0"
+      }
+    },
+    "node_modules/gulp-vinyl-zip/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/gulp-vinyl-zip/node_modules/replace-ext": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
+      "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/gulp-vinyl-zip/node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/gulp-vinyl-zip/node_modules/vinyl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz",
+      "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==",
+      "dev": true,
+      "dependencies": {
+        "clone": "^2.1.1",
+        "clone-buffer": "^1.0.0",
+        "clone-stats": "^1.0.0",
+        "cloneable-readable": "^1.0.0",
+        "remove-trailing-separator": "^1.0.1",
+        "replace-ext": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/gulp-vinyl-zip/node_modules/yauzl": {
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.9.1.tgz",
+      "integrity": "sha1-qBmB6nCleUYTOIPwKcWCGok1mn8= sha512-tOFjaiYI4cNrDuqujDv5G1KdCmGtuIULZqLv263CCADNQlNInl8sJPD+Gf3neEVecFQ0sw6D4oJTI/dqlunkSw==",
+      "dev": true,
+      "dependencies": {
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.0.1"
+      }
+    },
+    "node_modules/gulplog": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
+      "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U= sha512-hm6N8nrm3Y08jXie48jsC55eCZz9mnb4OirAStEk2deqeyhXU3C1otDVh+ccttMuc1sBi6RX6ZJ720hs9RCvgw==",
+      "dev": true,
+      "dependencies": {
+        "glogg": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/gunzip-maybe": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.2.tgz",
+      "integrity": "sha512-4haO1M4mLO91PW57BMsDFf75UmwoRX0GkdD+Faw+Lr+r/OZrOCS0pIBwOL1xCKQqnQzbNFGgK2V2CpBUPeFNTw==",
+      "dev": true,
+      "dependencies": {
+        "browserify-zlib": "^0.1.4",
+        "is-deflate": "^1.0.0",
+        "is-gzip": "^1.0.0",
+        "peek-stream": "^1.1.0",
+        "pumpify": "^1.3.3",
+        "through2": "^2.0.3"
+      },
+      "bin": {
+        "gunzip-maybe": "bin.js"
+      }
+    },
+    "node_modules/gunzip-maybe/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/gunzip-maybe/node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-ansi/node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0= sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "dev": true,
+      "dependencies": {
+        "es-define-property": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
+      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc= sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==",
+      "dev": true,
+      "dependencies": {
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8= sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU= sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values/node_modules/kind-of": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+      "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc= sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "dev": true,
+      "bin": {
+        "he": "bin/he"
+      }
+    },
+    "node_modules/homedir-polyfill": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
+      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
+      "dev": true,
+      "dependencies": {
+        "parse-passwd": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hosted-git-info": {
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+      "dev": true
+    },
+    "node_modules/html-escaper": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.0.tgz",
+      "integrity": "sha512-a4u9BeERWGu/S8JiWEAQcdrg9v4QArtP9keViQjGMdff20fBdd8waotXaNmODqBe6uZ3Nafi7K/ho4gCQHV3Ig==",
+      "dev": true
+    },
+    "node_modules/http-assert": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/http-assert/-/http-assert-1.5.0.tgz",
+      "integrity": "sha512-uPpH7OKX4H25hBmU6G1jWNaqJGpTXxey+YOUizJUAgu0AjLUeC8D73hTrhvDS5D+GJN1DN1+hhc/eF/wpxtp0w==",
+      "dev": true,
+      "dependencies": {
+        "deep-equal": "~1.0.1",
+        "http-errors": "~1.8.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/http-assert/node_modules/depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/http-assert/node_modules/http-errors": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
+      "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
+      "dev": true,
+      "dependencies": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": ">= 1.5.0 < 2",
+        "toidentifier": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/http-assert/node_modules/statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/http-cache-semantics": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
+      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
+      "dev": true
+    },
+    "node_modules/http-errors": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+      "dev": true,
+      "dependencies": {
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/http-proxy-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
+      "dependencies": {
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/http2-wrapper": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
+      "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",
+      "dev": true,
+      "dependencies": {
+        "quick-lru": "^5.1.1",
+        "resolve-alpn": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=10.19.0"
+      }
+    },
+    "node_modules/https-proxy-agent": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+      "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
+      "dependencies": {
+        "agent-base": "^7.0.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/husky": {
+      "version": "0.13.4",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-0.13.4.tgz",
+      "integrity": "sha512-kafsK/82ndSVKJe1IoR/z7NKkiI2LYM6H+VNI/YlKOeoOXEJTpD65TNu05Zx7pzSZzLuAdMt4fHgpUsnd6HJ7A==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "chalk": "^1.1.3",
+        "find-parent-dir": "^0.3.0",
+        "is-ci": "^1.0.9",
+        "normalize-path": "^1.0.0"
+      }
+    },
+    "node_modules/husky/node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/husky/node_modules/ansi-styles": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/husky/node_modules/chalk": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^2.2.1",
+        "escape-string-regexp": "^1.0.2",
+        "has-ansi": "^2.0.0",
+        "strip-ansi": "^3.0.0",
+        "supports-color": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/husky/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/husky/node_modules/normalize-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-1.0.0.tgz",
+      "integrity": "sha512-7WyT0w8jhpDStXRq5836AMmihQwq2nrUVQrgjvUo/p/NZf9uy/MeJ246lBJVmWuYXMlJuG9BNZHF0hWjfTbQUA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/husky/node_modules/strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/husky/node_modules/supports-color": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/icss-utils": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
+      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
+      "dev": true,
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/ignore": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
+      "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/immediate": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
+      "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==",
+      "dev": true
+    },
+    "node_modules/import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dev": true,
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/import-local": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
+      "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
+      "dev": true,
+      "dependencies": {
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
+      },
+      "bin": {
+        "import-local-fixture": "fixtures/cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o= sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "node_modules/ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
+    },
+    "node_modules/innosetup": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/innosetup/-/innosetup-6.0.5.tgz",
+      "integrity": "sha512-XRvidEN0dcxe7NrGXBjl/clfNRfmyakSDtgKaJgvZ3ciKE5ArQOVGqUJcLyPhllqHhMzYGpbUF3ZTZvtKVDP2g==",
+      "dev": true,
+      "bin": {
+        "innosetup-compiler": "lib/iscc"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/interpret": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
+      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/invert-kv": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY= sha512-xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ip-address": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
+      "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
+      "dependencies": {
+        "jsbn": "1.1.0",
+        "sprintf-js": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/is-absolute": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
+      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
+      "dev": true,
+      "dependencies": {
+        "is-relative": "^1.0.0",
+        "is-windows": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-accessor-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+      "deprecated": "Please upgrade to v1.0.1",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-accessor-descriptor/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-arguments": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
+      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "dev": true
+    },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/is-builtin-module": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz",
+      "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==",
+      "dev": true,
+      "dependencies": {
+        "builtin-modules": "^3.3.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-callable": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz",
+      "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-ci": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz",
+      "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
+      "dev": true,
+      "dependencies": {
+        "ci-info": "^1.5.0"
+      },
+      "bin": {
+        "is-ci": "bin.js"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
+      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
+      "dev": true,
+      "dependencies": {
+        "has": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-data-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+      "deprecated": "Please upgrade to v1.0.1",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-data-descriptor/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-date-object": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
+      "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-deflate": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-deflate/-/is-deflate-1.0.0.tgz",
+      "integrity": "sha512-YDoFpuZWu1VRXlsnlYMzKyVRITXj7Ej/V9gXQ2/pAe7X1J7M/RNOqaIYi6qUn+B7nGyB9pDXrv02dsB58d2ZAQ==",
+      "dev": true
+    },
+    "node_modules/is-descriptor": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.0",
+        "is-data-descriptor": "^1.0.0",
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-descriptor/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-docker": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-extendable/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-generator-function": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.9.tgz",
+      "integrity": "sha512-ZJ34p1uvIfptHCN7sFTjGibB9/oBg17sHqzDLfuwhvmN/qLVvIQXRQ8licZQ35WJ8KuEQt/etnnzQFI9C9Ue/A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-gzip": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz",
+      "integrity": "sha512-rcfALRIb1YewtnksfRIHGcIY93QnK8BIQ/2c9yDYcG/Y6+vRoJuTWBmmSEbyLLYtXm7q35pHOHbZFQBaLrhlWQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-interactive": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-2.0.0.tgz",
+      "integrity": "sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-negated-glob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
+      "integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI= sha512-czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
+      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-plain-object": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-promise": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
+      "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
+      "dev": true
+    },
+    "node_modules/is-regex": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
+      "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-relative": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
+      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
+      "dev": true,
+      "dependencies": {
+        "is-unc-path": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ= sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-symbol": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
+      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-typed-array": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
+      "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
+      "dev": true,
+      "dependencies": {
+        "which-typed-array": "^1.1.11"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-unc-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
+      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
+      "dev": true,
+      "dependencies": {
+        "unc-path-regex": "^0.1.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-unicode-supported": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-utf8": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI= sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==",
+      "dev": true
+    },
+    "node_modules/is-valid-glob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
+      "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao= sha512-AhiROmoEFDSsjx8hW+5sGwgKVIORcXnrlAx/R0ZSeaPw70Vw0CqkGBBhHGL58Uox2eXnU1AnvXJl1XlyedO5bA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "dependencies": {
+        "is-docker": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+      "dev": true
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8= sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/istanbul-lib-coverage": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
+      "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-instrument": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.1.tgz",
+      "integrity": "sha512-EAMEJBsYuyyztxMxW3g7ugGPkrZsV57v0Hmv3mm1uQsmB+QnZuepg731CRaIgeUVSdmsTngOkSnauNF8p7FIhA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^7.5.4"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-lib-report": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
+      "dev": true,
+      "dependencies": {
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^4.0.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-lib-report/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-report/node_modules/supports-color": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+      "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-reports": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz",
+      "integrity": "sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==",
+      "dev": true,
+      "dependencies": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istextorbinary": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/istextorbinary/-/istextorbinary-1.0.2.tgz",
+      "integrity": "sha1-rOGTVNGpoBc+/rEITOD4ewrX3s8= sha512-qZ5ptUDuni2pdCngFTraYa5kalQ0mX47Mhn08tT0DZZv/7yhX1eMb9lFtXVbWhFtgRtpLG/UdqVAjh9teO5x+w==",
+      "dev": true,
+      "dependencies": {
+        "binaryextensions": "~1.0.0",
+        "textextensions": "~1.0.0"
+      },
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
+    "node_modules/jackspeak": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz",
+      "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==",
+      "dev": true,
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
+    "node_modules/jest-worker": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
+      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/jest-worker/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/js-base64": {
+      "version": "3.7.7",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-3.7.7.tgz",
+      "integrity": "sha512-7rCnleh0z2CkXhH67J8K1Ytz0b2Y+yxTPL+/KOJoa20hfnVQ/3/T6W/KflYI4bRHRagNeXeU2bkNGI3v1oS/lw=="
+    },
+    "node_modules/js-beautify": {
+      "version": "1.8.9",
+      "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.8.9.tgz",
+      "integrity": "sha512-MwPmLywK9RSX0SPsUJjN7i+RQY9w/yC17Lbrq9ViEefpLRgqAR2BgrMN2AbifkUuhDV8tRauLhLda/9+bE0YQA==",
+      "dev": true,
+      "dependencies": {
+        "config-chain": "^1.1.12",
+        "editorconfig": "^0.15.2",
+        "glob": "^7.1.3",
+        "mkdirp": "~0.5.0",
+        "nopt": "~4.0.1"
+      },
+      "bin": {
+        "css-beautify": "js/bin/css-beautify.js",
+        "html-beautify": "js/bin/html-beautify.js",
+        "js-beautify": "js/bin/js-beautify.js"
+      }
+    },
+    "node_modules/js-beautify/node_modules/glob": {
+      "version": "7.1.7",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/js-beautify/node_modules/mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/js-sdsl": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.4.2.tgz",
+      "integrity": "sha512-dwXFwByc/ajSV6m5bcKAPwe4yDDF6D614pxmIi5odytzxRlwqF6nwoiCek80Ixc7Cvma5awClxrzFtxCQvcM8w==",
+      "dev": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/js-sdsl"
+      }
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/jsbn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
+      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="
+    },
+    "node_modules/jschardet": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-3.1.4.tgz",
+      "integrity": "sha512-/kmVISmrwVwtyYU40iQUOp3SUPk2dhNCMsZBQX0R1/jZ8maaXJ/oZIzUOiyOqcgtLnETFKYChbJ5iDC/eWmFHg==",
+      "license": "LGPL-2.1+",
+      "engines": {
+        "node": ">=0.1.90"
+      }
+    },
+    "node_modules/jsdoc-type-pratt-parser": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz",
+      "integrity": "sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true,
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/json-buffer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+      "dev": true
+    },
+    "node_modules/json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+      "dev": true
+    },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true
+    },
+    "node_modules/json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true,
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/jszip": {
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz",
+      "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==",
+      "dev": true,
+      "dependencies": {
+        "lie": "~3.3.0",
+        "pako": "~1.0.2",
+        "readable-stream": "~2.3.6",
+        "setimmediate": "^1.0.5"
+      }
+    },
+    "node_modules/jszip/node_modules/pako": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
+      "dev": true
+    },
+    "node_modules/jszip/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/just-debounce": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz",
+      "integrity": "sha1-h/zPrv/AtozRnVX2cilD+SnqNeo= sha512-/QLqfspz7WJ+TPmzDp5WJOlm2r3j+/12rGo7dG5uwD9vGM5sWg8p251b7Us0p19JqjddJzcYOK2v6FN92nREmg==",
+      "dev": true
+    },
+    "node_modules/just-extend": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.2.1.tgz",
+      "integrity": "sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==",
+      "dev": true
+    },
+    "node_modules/kerberos": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/kerberos/-/kerberos-2.1.1.tgz",
+      "integrity": "sha512-414s1G/qgK2T60cXnZsHbtRj8Ynjg0DBlQWeY99tkyqQ2e8vGgFHvxRdvjTlLHg/SxBA0zLQcGE6Pk6Dfq/BCA==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "bindings": "^1.5.0",
+        "node-addon-api": "^6.1.0",
+        "prebuild-install": "^7.1.2"
+      },
+      "engines": {
+        "node": ">=12.9.0"
+      }
+    },
+    "node_modules/kerberos/node_modules/node-addon-api": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz",
+      "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA=="
+    },
+    "node_modules/keygrip": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/keygrip/-/keygrip-1.1.0.tgz",
+      "integrity": "sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==",
+      "dev": true,
+      "dependencies": {
+        "tsscmp": "1.0.6"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/keyv": {
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+      "dev": true,
+      "dependencies": {
+        "json-buffer": "3.0.1"
+      }
+    },
+    "node_modules/kind-of": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/koa": {
+      "version": "2.15.3",
+      "resolved": "https://registry.npmjs.org/koa/-/koa-2.15.3.tgz",
+      "integrity": "sha512-j/8tY9j5t+GVMLeioLaxweJiKUayFhlGqNTzf2ZGwL0ZCQijd2RLHK0SLW5Tsko8YyyqCZC2cojIb0/s62qTAg==",
+      "dev": true,
+      "dependencies": {
+        "accepts": "^1.3.5",
+        "cache-content-type": "^1.0.0",
+        "content-disposition": "~0.5.2",
+        "content-type": "^1.0.4",
+        "cookies": "~0.9.0",
+        "debug": "^4.3.2",
+        "delegates": "^1.0.0",
+        "depd": "^2.0.0",
+        "destroy": "^1.0.4",
+        "encodeurl": "^1.0.2",
+        "escape-html": "^1.0.3",
+        "fresh": "~0.5.2",
+        "http-assert": "^1.3.0",
+        "http-errors": "^1.6.3",
+        "is-generator-function": "^1.0.7",
+        "koa-compose": "^4.1.0",
+        "koa-convert": "^2.0.0",
+        "on-finished": "^2.3.0",
+        "only": "~0.0.2",
+        "parseurl": "^1.3.2",
+        "statuses": "^1.5.0",
+        "type-is": "^1.6.16",
+        "vary": "^1.1.2"
+      },
+      "engines": {
+        "node": "^4.8.4 || ^6.10.1 || ^7.10.1 || >= 8.1.4"
+      }
+    },
+    "node_modules/koa-compose": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/koa-compose/-/koa-compose-4.1.0.tgz",
+      "integrity": "sha512-8ODW8TrDuMYvXRwra/Kh7/rJo9BtOfPc6qO8eAfC80CnCvSjSl0bkRM24X6/XBBEyj0v1nRUQ1LyOy3dbqOWXw==",
+      "dev": true
+    },
+    "node_modules/koa-convert": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/koa-convert/-/koa-convert-2.0.0.tgz",
+      "integrity": "sha512-asOvN6bFlSnxewce2e/DK3p4tltyfC4VM7ZwuTuepI7dEQVcvpyFuBcEARu1+Hxg8DIwytce2n7jrZtRlPrARA==",
+      "dev": true,
+      "dependencies": {
+        "co": "^4.6.0",
+        "koa-compose": "^4.1.0"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/koa-morgan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/koa-morgan/-/koa-morgan-1.0.1.tgz",
+      "integrity": "sha1-CAUuDODYOdPEMXi5CluzQkvvH5k= sha512-JOUdCNlc21G50afBXfErUrr1RKymbgzlrO5KURY+wmDG1Uvd2jmxUJcHgylb/mYXy2SjiNZyYim/ptUBGsIi3A==",
+      "dev": true,
+      "dependencies": {
+        "morgan": "^1.6.1"
+      }
+    },
+    "node_modules/koa-mount": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/koa-mount/-/koa-mount-4.0.0.tgz",
+      "integrity": "sha512-rm71jaA/P+6HeCpoRhmCv8KVBIi0tfGuO/dMKicbQnQW/YJntJ6MnnspkodoA4QstMVEZArsCphmd0bJEtoMjQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.0.1",
+        "koa-compose": "^4.1.0"
+      },
+      "engines": {
+        "node": ">= 7.6.0"
+      }
+    },
+    "node_modules/koa-send": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/koa-send/-/koa-send-5.0.1.tgz",
+      "integrity": "sha512-tmcyQ/wXXuxpDxyNXv5yNNkdAMdFRqwtegBXUaowiQzUKqJehttS0x2j0eOZDQAyloAth5w6wwBImnFzkUz3pQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.1",
+        "http-errors": "^1.7.3",
+        "resolve-path": "^1.4.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/koa-send/node_modules/depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/koa-send/node_modules/http-errors": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
+      "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
+      "dev": true,
+      "dependencies": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": ">= 1.5.0 < 2",
+        "toidentifier": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/koa-send/node_modules/statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/koa-static": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/koa-static/-/koa-static-5.0.0.tgz",
+      "integrity": "sha512-UqyYyH5YEXaJrf9S8E23GoJFQZXkBVJ9zYYMPGz919MSX1KuvAcycIuS0ci150HCoPf4XQVhQ84Qf8xRPWxFaQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.1.0",
+        "koa-send": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 7.6.0"
+      }
+    },
+    "node_modules/koa-static/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/koa/node_modules/http-errors": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
+      "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
+      "dev": true,
+      "dependencies": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": ">= 1.5.0 < 2",
+        "toidentifier": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/koa/node_modules/http-errors/node_modules/depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/koa/node_modules/statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/last-run": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
+      "integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls= sha512-U/VxvpX4N/rFvPzr3qG5EtLKEnNI0emvIQB3/ecEwv+8GHaUKbIB8vxv1Oai5FAF0d0r7LXHhLLe5K/yChm5GQ==",
+      "dev": true,
+      "dependencies": {
+        "default-resolution": "^2.0.0",
+        "es6-weak-map": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/lazy.js": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/lazy.js/-/lazy.js-0.4.3.tgz",
+      "integrity": "sha1-h/Z6B602VVEh5P/xUg3zG+Znhtg= sha512-kHcnVaCZzhv6P+YgC4iRZFw62+biYIcBYU8qqKzJysC7cdKwPgb3WRtcBPyINTSLZwsjyFdBtd97sHbkseTZKw==",
+      "dev": true
+    },
+    "node_modules/lazystream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
+      "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ= sha512-/330KFbmC/zKdtZoVDRwvkJ8snrJyBPfoZ39zsJl2O24HOE1CTNiEbeZmHXmjBVxTSSv7JlJEXPYhU83DhA2yg==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "^2.0.5"
+      },
+      "engines": {
+        "node": ">= 0.6.3"
+      }
+    },
+    "node_modules/lazystream/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/lcid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU= sha512-YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw==",
+      "dev": true,
+      "dependencies": {
+        "invert-kv": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/lead": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz",
+      "integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI= sha512-IpSVCk9AYvLHo5ctcIXxOBpMWUe+4TKN3VPWAKUbJikkmsGp0VrSM8IttVc32D6J4WUsiPE6aEFRNmIoF/gdow==",
+      "dev": true,
+      "dependencies": {
+        "flush-write-stream": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/lie": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
+      "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
+      "dev": true,
+      "dependencies": {
+        "immediate": "~3.0.5"
+      }
+    },
+    "node_modules/liftoff": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz",
+      "integrity": "sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==",
+      "dev": true,
+      "dependencies": {
+        "extend": "^3.0.0",
+        "findup-sync": "^3.0.0",
+        "fined": "^1.0.1",
+        "flagged-respawn": "^1.0.0",
+        "is-plain-object": "^2.0.4",
+        "object.map": "^1.0.0",
+        "rechoir": "^0.6.2",
+        "resolve": "^1.1.7"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/liftoff/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/lilconfig": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.0.0.tgz",
+      "integrity": "sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/linkify-it": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz",
+      "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==",
+      "dev": true,
+      "dependencies": {
+        "uc.micro": "^2.0.0"
+      }
+    },
+    "node_modules/load-json-file": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+      "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs= sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^4.0.0",
+        "pify": "^3.0.0",
+        "strip-bom": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/loader-runner": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz",
+      "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.11.5"
+      }
+    },
+    "node_modules/loader-utils": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
+    "node_modules/lodash.camelcase": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
+      "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY= sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==",
+      "dev": true
+    },
+    "node_modules/lodash.clone": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz",
+      "integrity": "sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y= sha512-GhrVeweiTD6uTmmn5hV/lzgCQhccwReIVRLHp7LT4SopOjqEZ5BbX8b5WWEtAKasjmy8hR7ZPwsYlxRCku5odg==",
+      "dev": true
+    },
+    "node_modules/lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==",
+      "dev": true
+    },
+    "node_modules/lodash.get": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk= sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==",
+      "dev": true
+    },
+    "node_modules/lodash.memoize": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
+      "dev": true
+    },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
+    "node_modules/lodash.some": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz",
+      "integrity": "sha1-G7nzFO9ri63tE7VJFpsqlF62jk0= sha512-j7MJE+TuT51q9ggt4fSgVqro163BEFjAt3u97IqU+JA2DkWl80nFTrowzLpZ/BnpN7rrl0JA/593NAdd8p/scQ==",
+      "dev": true
+    },
+    "node_modules/lodash.uniq": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==",
+      "dev": true
+    },
+    "node_modules/log-symbols": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lowercase-keys": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
+      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+      "dev": true,
+      "dependencies": {
+        "pseudomap": "^1.0.2",
+        "yallist": "^2.1.2"
+      }
+    },
+    "node_modules/lru-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
+      "integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM= sha512-BpdYkt9EvGl8OfWHDQPISVpcl5xZthb+XPsbELj5AQXxIC8IriDZIQYjBJPEm5rS420sjZ0TLEzRcq5KdBhYrQ==",
+      "dev": true,
+      "dependencies": {
+        "es5-ext": "~0.10.2"
+      }
+    },
+    "node_modules/make-dir": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+      "dev": true,
+      "dependencies": {
+        "semver": "^7.5.3"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/make-error": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+      "dev": true
+    },
+    "node_modules/make-iterator": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
+      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/make-iterator/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8= sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/map-stream": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
+      "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ= sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==",
+      "dev": true
+    },
+    "node_modules/map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48= sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==",
+      "dev": true,
+      "dependencies": {
+        "object-visit": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/markdown-it": {
+      "version": "14.1.0",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz",
+      "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1",
+        "entities": "^4.4.0",
+        "linkify-it": "^5.0.0",
+        "mdurl": "^2.0.0",
+        "punycode.js": "^2.3.1",
+        "uc.micro": "^2.1.0"
+      },
+      "bin": {
+        "markdown-it": "bin/markdown-it.mjs"
+      }
+    },
+    "node_modules/matchdep": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
+      "integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4= sha512-LFgVbaHIHMqCRuCZyfCtUOq9/Lnzhi7Z0KFUE2fhD54+JN2jLh3hC02RLkqauJ3U4soU6H1J3tfj/Byk7GoEjA==",
+      "dev": true,
+      "dependencies": {
+        "findup-sync": "^2.0.0",
+        "micromatch": "^3.0.4",
+        "resolve": "^1.4.0",
+        "stack-trace": "0.0.10"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc= sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/findup-sync": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
+      "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw= sha512-vs+3unmJT45eczmcAZ6zMJtxN3l/QXeccaXQx5cu/MeJMhewVfoWZqibRkOxPnmoR59+Zy5hjabfQc6JLSah4g==",
+      "dev": true,
+      "dependencies": {
+        "detect-file": "^1.0.0",
+        "is-glob": "^3.1.0",
+        "micromatch": "^3.0.4",
+        "resolve-dir": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/matchdep/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/is-glob": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo= sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU= sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg= sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matcher": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz",
+      "integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "escape-string-regexp": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/md5": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz",
+      "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==",
+      "dev": true,
+      "dependencies": {
+        "charenc": "0.0.2",
+        "crypt": "0.0.2",
+        "is-buffer": "~1.1.6"
+      }
+    },
+    "node_modules/mdn-data": {
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
+      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
+      "dev": true
+    },
+    "node_modules/mdurl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz",
+      "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==",
+      "dev": true
+    },
+    "node_modules/media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/memoizee": {
+      "version": "0.4.15",
+      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz",
+      "integrity": "sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==",
+      "dev": true,
+      "dependencies": {
+        "d": "^1.0.1",
+        "es5-ext": "^0.10.53",
+        "es6-weak-map": "^2.0.3",
+        "event-emitter": "^0.3.5",
+        "is-promise": "^2.2.2",
+        "lru-queue": "^0.1.0",
+        "next-tick": "^1.1.0",
+        "timers-ext": "^0.1.7"
+      }
+    },
+    "node_modules/memory-fs": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
+      "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
+      "dev": true,
+      "dependencies": {
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=4.3.0 <5.0.0 || >=5.10"
+      }
+    },
+    "node_modules/memory-fs/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/memorystream": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz",
+      "integrity": "sha1-htcJCzDORV1j+64S3aUaR93K+bI= sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/merge-options": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-options/-/merge-options-1.0.1.tgz",
+      "integrity": "sha512-iuPV41VWKWBIOpBsjoxjDZw8/GbSfZ2mk7N1453bwMrfzdrIk7EzBd+8UVR6rkw67th7xnk9Dytl3J+lHPdxvg==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-obj": "^1.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true
+    },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "license": "MIT",
+      "dependencies": {
+        "braces": "^3.0.3",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "dev": true,
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/mime-db": {
+      "version": "1.45.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz",
+      "integrity": "sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.28",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz",
+      "integrity": "sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==",
+      "dev": true,
+      "dependencies": {
+        "mime-db": "1.45.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mimic-response": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/minipass": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
+      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minizlib": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+      "dependencies": {
+        "minipass": "^3.0.0",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/minizlib/node_modules/minipass": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
+      "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minizlib/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
+    "node_modules/mixin-deep": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+      "dev": true,
+      "dependencies": {
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/mkdirp-classic": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
+    },
+    "node_modules/mocha": {
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.2.0.tgz",
+      "integrity": "sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "4.1.1",
+        "browser-stdout": "1.3.1",
+        "chokidar": "3.5.3",
+        "debug": "4.3.4",
+        "diff": "5.0.0",
+        "escape-string-regexp": "4.0.0",
+        "find-up": "5.0.0",
+        "glob": "7.2.0",
+        "he": "1.2.0",
+        "js-yaml": "4.1.0",
+        "log-symbols": "4.1.0",
+        "minimatch": "5.0.1",
+        "ms": "2.1.3",
+        "nanoid": "3.3.3",
+        "serialize-javascript": "6.0.0",
+        "strip-json-comments": "3.1.1",
+        "supports-color": "8.1.1",
+        "workerpool": "6.2.1",
+        "yargs": "16.2.0",
+        "yargs-parser": "20.2.4",
+        "yargs-unparser": "2.0.0"
+      },
+      "bin": {
+        "_mocha": "bin/_mocha",
+        "mocha": "bin/mocha.js"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/mochajs"
+      }
+    },
+    "node_modules/mocha-junit-reporter": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/mocha-junit-reporter/-/mocha-junit-reporter-2.2.1.tgz",
+      "integrity": "sha512-iDn2tlKHn8Vh8o4nCzcUVW4q7iXp7cC4EB78N0cDHIobLymyHNwe0XG8HEHHjc3hJlXm0Vy6zcrxaIhnI2fWmw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.3.4",
+        "md5": "^2.3.0",
+        "mkdirp": "^3.0.0",
+        "strip-ansi": "^6.0.1",
+        "xml": "^1.0.1"
+      },
+      "peerDependencies": {
+        "mocha": ">=2.2.5"
+      }
+    },
+    "node_modules/mocha-junit-reporter/node_modules/mkdirp": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
+      "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
+      "dev": true,
+      "bin": {
+        "mkdirp": "dist/cjs/src/bin.js"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/mocha-multi-reporters": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/mocha-multi-reporters/-/mocha-multi-reporters-1.5.1.tgz",
+      "integrity": "sha512-Yb4QJOaGLIcmB0VY7Wif5AjvLMUFAdV57D2TWEva1Y0kU/3LjKpeRVmlMIfuO1SVbauve459kgtIizADqxMWPg==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.1",
+        "lodash": "^4.17.15"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      },
+      "peerDependencies": {
+        "mocha": ">=3.1.2"
+      }
+    },
+    "node_modules/mocha/node_modules/ansi-colors": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mocha/node_modules/cliui": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
+    "node_modules/mocha/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/mocha/node_modules/glob": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/mocha/node_modules/glob/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/mocha/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/mocha/node_modules/minimatch": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
+      "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/mocha/node_modules/minimatch/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/mocha/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true
+    },
+    "node_modules/mocha/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/mocha/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/mocha/node_modules/yargs": {
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/mocha/node_modules/yargs-parser": {
+      "version": "20.2.4",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
+      "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/morgan": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz",
+      "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==",
+      "dev": true,
+      "dependencies": {
+        "basic-auth": "~2.0.1",
+        "debug": "2.6.9",
+        "depd": "~2.0.0",
+        "on-finished": "~2.3.0",
+        "on-headers": "~1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/morgan/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/morgan/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/morgan/node_modules/on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
+      "dev": true,
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "node_modules/multimatch": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz",
+      "integrity": "sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis= sha512-0mzK8ymiWdehTBiJh0vClAzGyQbdtyWqzSVx//EK4N/D+599RFlGfTAsKw2zMSABtDG9C6Ul2+t8f2Lbdjf5mA==",
+      "dev": true,
+      "dependencies": {
+        "array-differ": "^1.0.0",
+        "array-union": "^1.0.1",
+        "arrify": "^1.0.0",
+        "minimatch": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/multimatch/node_modules/array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk= sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==",
+      "dev": true,
+      "dependencies": {
+        "array-uniq": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mute-stdout": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz",
+      "integrity": "sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/nan": {
+      "version": "2.14.2",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
+      "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz",
+      "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==",
+      "dev": true,
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/nanomatch": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/nanomatch/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/napi-build-utils": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
+      "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="
+    },
+    "node_modules/native-is-elevated": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/native-is-elevated/-/native-is-elevated-0.7.0.tgz",
+      "integrity": "sha512-tp8hUqK7vexBiyIWKMvmRxdG6kqUtO+3eay9iB0i16NYgvCqE5wMe1Y0guHilpkmRgvVXEWNW4et1+qqcwpLBA==",
+      "hasInstallScript": true
+    },
+    "node_modules/native-keymap": {
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/native-keymap/-/native-keymap-3.3.5.tgz",
+      "integrity": "sha512-7XDOLPNX1FnUFC/cX3cioBz2M+dO212ai9DuwpfKFzkPu3xTmEzOm5xewOMLXE4V9YoRhNPxvq1H2YpPWDgSsg==",
+      "hasInstallScript": true
+    },
+    "node_modules/native-watchdog": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/native-watchdog/-/native-watchdog-1.4.2.tgz",
+      "integrity": "sha512-iT3Uj6FFdrW5vHbQ/ybiznLus9oiUoMJ8A8nyugXv9rV3EBhIodmGs+mztrwQyyBc+PB5/CrskAH/WxaUVRRSQ==",
+      "hasInstallScript": true
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true
+    },
+    "node_modules/negotiator": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
+      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/neo-async": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "dev": true
+    },
+    "node_modules/next-tick": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
+      "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==",
+      "dev": true
+    },
+    "node_modules/nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "dev": true
+    },
+    "node_modules/nise": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.0.tgz",
+      "integrity": "sha512-W5WlHu+wvo3PaKLsJJkgPup2LrsXCcm7AWwyNZkUnn5rwPkuPBi3Iwk5SQtN0mv+K65k7nKKjwNQ30wg3wLAQQ==",
+      "dev": true,
+      "dependencies": {
+        "@sinonjs/commons": "^1.7.0",
+        "@sinonjs/fake-timers": "^7.0.4",
+        "@sinonjs/text-encoding": "^0.7.1",
+        "just-extend": "^4.0.2",
+        "path-to-regexp": "^1.7.0"
+      }
+    },
+    "node_modules/nise/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "dev": true
+    },
+    "node_modules/nise/node_modules/path-to-regexp": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.9.0.tgz",
+      "integrity": "sha512-xIp7/apCFJuUHdDLWe8O1HIkb0kQrOMb/0u6FXQjemHn/ii5LrIzU6bdECnsiTF/GjZkMEKg1xdiZwNqDYlZ6g==",
+      "dev": true,
+      "dependencies": {
+        "isarray": "0.0.1"
+      }
+    },
+    "node_modules/node-abi": {
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.8.0.tgz",
+      "integrity": "sha512-tzua9qWWi7iW4I42vUPKM+SfaF0vQSLAm4yO5J83mSwB7GeoWrDKC/K+8YCnYNwqP5duwazbw2X9l4m8SC2cUw==",
+      "dependencies": {
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/node-addon-api": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
+      "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="
+    },
+    "node_modules/node-fetch": {
+      "version": "2.6.8",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.8.tgz",
+      "integrity": "sha512-RZ6dBYuj8dRSfxpUSu+NsdF1dpPpluJxwOp+6IoDp/sH2QNDSvurYsAa+F1WxY2RjA1iP93xhcsUoYbF2XBqVg==",
+      "dev": true,
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/node-gyp-build": {
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.1.tgz",
+      "integrity": "sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw==",
+      "bin": {
+        "node-gyp-build": "bin.js",
+        "node-gyp-build-optional": "optional.js",
+        "node-gyp-build-test": "build-test.js"
+      }
+    },
+    "node_modules/node-html-markdown": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/node-html-markdown/-/node-html-markdown-1.3.0.tgz",
+      "integrity": "sha512-OeFi3QwC/cPjvVKZ114tzzu+YoR+v9UXW5RwSXGUqGb0qCl0DvP406tzdL7SFn8pZrMyzXoisfG2zcuF9+zw4g==",
+      "dev": true,
+      "dependencies": {
+        "node-html-parser": "^6.1.1"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/node-html-parser": {
+      "version": "6.1.13",
+      "resolved": "https://registry.npmjs.org/node-html-parser/-/node-html-parser-6.1.13.tgz",
+      "integrity": "sha512-qIsTMOY4C/dAa5Q5vsobRpOOvPfC4pB61UVW2uSwZNUp0QU/jCekTal1vMmbO0DgdHeLUJpv/ARmDqErVxA3Sg==",
+      "dev": true,
+      "dependencies": {
+        "css-select": "^5.1.0",
+        "he": "1.2.0"
+      }
+    },
+    "node_modules/node-pty": {
+      "version": "1.1.0-beta22",
+      "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.1.0-beta22.tgz",
+      "integrity": "sha512-CpT334H2oAIULlENvd9U+VBW4ZL+G3clOnpXYzUIurlPCLnl/9xen/KDHBLRcwhZuWcHxIrsCxR1TDCdVDtr0w==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "node-addon-api": "^7.1.0"
+      }
+    },
+    "node_modules/node-pty/node_modules/node-addon-api": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.0.tgz",
+      "integrity": "sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==",
+      "engines": {
+        "node": "^16 || ^18 || >= 20"
+      }
+    },
+    "node_modules/node-releases": {
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
+      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==",
+      "dev": true
+    },
+    "node_modules/nopt": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+      "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00= sha512-+5XZFpQZEY0cg5JaxLwGxDlKNKYxuXwGt8/Oi3UXm5/4ymrJve9d2CURituxv3rSrVCGZj4m1U1JlHTdcKt2Ng==",
+      "dev": true,
+      "dependencies": {
+        "abbrev": "1",
+        "osenv": "^0.1.4"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      }
+    },
+    "node_modules/normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
+    "node_modules/normalize-package-data/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/normalize-url": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
+      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/now-and-later": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz",
+      "integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.3.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/npm-run-all": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.5.tgz",
+      "integrity": "sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "chalk": "^2.4.1",
+        "cross-spawn": "^6.0.5",
+        "memorystream": "^0.3.1",
+        "minimatch": "^3.0.4",
+        "pidtree": "^0.3.0",
+        "read-pkg": "^3.0.0",
+        "shell-quote": "^1.6.1",
+        "string.prototype.padend": "^3.0.0"
+      },
+      "bin": {
+        "npm-run-all": "bin/npm-run-all/index.js",
+        "run-p": "bin/run-p/index.js",
+        "run-s": "bin/run-s/index.js"
+      },
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/npm-run-all/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/npm-run-all/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/npm-run-all/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/npm-run-all/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true
+    },
+    "node_modules/npm-run-all/node_modules/cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "dev": true,
+      "dependencies": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "engines": {
+        "node": ">=4.8"
+      }
+    },
+    "node_modules/npm-run-all/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/npm-run-all/node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/npm-run-all/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/npm-run-all/node_modules/shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/npm-run-all/node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/npm-run-all/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/npm-run-all/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/nth-check": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz",
+      "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/nth-check?sponsor=1"
+      }
+    },
+    "node_modules/number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw= sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==",
+      "dev": true,
+      "dependencies": {
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY= sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY= sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
+      "deprecated": "Please upgrade to v0.1.7",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y= sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
+      "deprecated": "Please upgrade to v0.1.5",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/is-descriptor/node_modules/kind-of": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
+      "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs= sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.assign": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "has-symbols": "^1.0.1",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.defaults": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
+      "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8= sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==",
+      "dev": true,
+      "dependencies": {
+        "array-each": "^1.0.1",
+        "array-slice": "^1.0.0",
+        "for-own": "^1.0.0",
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.map": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
+      "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc= sha512-3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w==",
+      "dev": true,
+      "dependencies": {
+        "for-own": "^1.0.0",
+        "make-iterator": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c= sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.reduce": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz",
+      "integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60= sha512-naLhxxpUESbNkRqc35oQ2scZSJueHGQNUfMW/0U37IgN6tE2dgDWg3whf+NEliy3F/QysrO48XKUz/nGPe+AQw==",
+      "dev": true,
+      "dependencies": {
+        "for-own": "^1.0.0",
+        "make-iterator": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/on-finished": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+      "dev": true,
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/on-headers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E= sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dev": true,
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/only": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/only/-/only-0.0.2.tgz",
+      "integrity": "sha1-Kv3oTQPlC5qO3EROMGEKcCle37Q= sha512-Fvw+Jemq5fjjyWz6CpKx6w9s7xxqo3+JCyM0WXWeCSOboZ8ABkyvP8ID4CZuChA/wxSx+XSJmdOm8rGVyJ1hdQ==",
+      "dev": true
+    },
+    "node_modules/open": {
+      "version": "8.4.2",
+      "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
+      "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
+      "dependencies": {
+        "define-lazy-prop": "^2.0.0",
+        "is-docker": "^2.1.1",
+        "is-wsl": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/opn": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/opn/-/opn-6.0.0.tgz",
+      "integrity": "sha512-I9PKfIZC+e4RXZ/qr1RhgyCnGgYX0UEIlXgWnCOVACIvFgaC9rz6Won7xbdhoHrd8IIhV7YEpHjreNUNkqCGkQ==",
+      "deprecated": "The package has been renamed to `open`",
+      "dev": true,
+      "dependencies": {
+        "is-wsl": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/opn/node_modules/is-wsl": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0= sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/optionator": {
+      "version": "0.9.4",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+      "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
+      "dev": true,
+      "dependencies": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.5"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/ora": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-7.0.1.tgz",
+      "integrity": "sha512-0TUxTiFJWv+JnjWm4o9yvuskpEJLXTcng8MJuKd+SzAzp2o+OP3HWqNhB4OdJRt1Vsd9/mR0oyaEYlOnL7XIRw==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^5.3.0",
+        "cli-cursor": "^4.0.0",
+        "cli-spinners": "^2.9.0",
+        "is-interactive": "^2.0.0",
+        "is-unicode-supported": "^1.3.0",
+        "log-symbols": "^5.1.0",
+        "stdin-discarder": "^0.1.0",
+        "string-width": "^6.1.0",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ora/node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/ora/node_modules/chalk": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
+      "dev": true,
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/ora/node_modules/is-unicode-supported": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.3.0.tgz",
+      "integrity": "sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ora/node_modules/log-symbols": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-5.1.0.tgz",
+      "integrity": "sha512-l0x2DvrW294C9uDCoQe1VSU4gf529FkSZ6leBl4TiqZH/e+0R7hSfHQBNut2mNygDgHwvYHfFLn6Oxb3VWj2rA==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^5.0.0",
+        "is-unicode-supported": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ora/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/ordered-read-streams": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz",
+      "integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4= sha512-Z87aSjx3r5c0ZB7bcJqIgIRX5bxR7A4aSzvIbaxd0oTkWBCOoKfuGHiKj60CHVUgg1Phm5yMZzBdt8XqRs73Mw==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "^2.0.1"
+      }
+    },
+    "node_modules/ordered-read-streams/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/os-browserify": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+      "integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==",
+      "dev": true
+    },
+    "node_modules/os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M= sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/os-locale": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk= sha512-PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g==",
+      "dev": true,
+      "dependencies": {
+        "lcid": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/osenv": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+      "deprecated": "This package is no longer supported.",
+      "dev": true,
+      "dependencies": {
+        "os-homedir": "^1.0.0",
+        "os-tmpdir": "^1.0.0"
+      }
+    },
+    "node_modules/p-all": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-all/-/p-all-1.0.0.tgz",
+      "integrity": "sha1-k731OlWiOCH9+pi0F0qZv38x340= sha512-OtbznqfGjQT+i89LK9C9YPh1G8d6n8xgsJ8yRVXrx6PRXrlOthNJhP+dHxrPopty8fugYb1DodpwrzP7z0Mtvw==",
+      "dev": true,
+      "dependencies": {
+        "p-map": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-cancelable": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
+      "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-map": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
+      "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/package-json-from-dist": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz",
+      "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==",
+      "dev": true
+    },
+    "node_modules/pako": {
+      "version": "0.2.9",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
+      "integrity": "sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==",
+      "dev": true
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse-filepath": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
+      "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE= sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==",
+      "dev": true,
+      "dependencies": {
+        "is-absolute": "^1.0.0",
+        "map-cache": "^0.2.0",
+        "path-root": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA= sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
+      "dev": true,
+      "dependencies": {
+        "error-ex": "^1.3.1",
+        "json-parse-better-errors": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/parse-node-version": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
+      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/parse-passwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
+      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY= sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ= sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-browserify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
+      "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
+      "dev": true
+    },
+    "node_modules/path-dirname": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA= sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==",
+      "dev": true
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18= sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
+    "node_modules/path-root": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
+      "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc= sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==",
+      "dev": true,
+      "dependencies": {
+        "path-root-regex": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-root-regex": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
+      "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0= sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-scurry": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^10.2.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/path-scurry/node_modules/lru-cache": {
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.3.0.tgz",
+      "integrity": "sha512-CQl19J/g+Hbjbv4Y3mFNNXFEL/5t/KCg8POCuUqd4rMKjGG+j1ybER83hxV58zL+dFI1PTkt3GNFSHRt+d8qEQ==",
+      "dev": true,
+      "engines": {
+        "node": "14 || >=16.14"
+      }
+    },
+    "node_modules/path-to-regexp": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz",
+      "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==",
+      "dev": true
+    },
+    "node_modules/path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pause-stream": {
+      "version": "0.0.11",
+      "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
+      "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU= sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A==",
+      "dev": true,
+      "dependencies": {
+        "through": "~2.3"
+      }
+    },
+    "node_modules/peek-stream": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/peek-stream/-/peek-stream-1.1.3.tgz",
+      "integrity": "sha512-FhJ+YbOSBb9/rIl2ZeE/QHEsWn7PqNYt8ARAY3kIgNGOk13g9FGyIY6JIl/xB/3TFRVoTv5as0l11weORrTekA==",
+      "dev": true,
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "duplexify": "^3.5.0",
+        "through2": "^2.0.3"
+      }
+    },
+    "node_modules/peek-stream/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/peek-stream/node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA= sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="
+    },
+    "node_modules/picocolors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+      "dev": true
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pidtree": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.3.1.tgz",
+      "integrity": "sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==",
+      "dev": true,
+      "bin": {
+        "pidtree": "bin/pidtree.js"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/pify": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA= sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o= sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
+      "dev": true,
+      "dependencies": {
+        "pinkie": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/playwright": {
+      "version": "1.46.1",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.46.1.tgz",
+      "integrity": "sha512-oPcr1yqoXLCkgKtD5eNUPLiN40rYEM39odNpIb6VE6S7/15gJmA1NzVv6zJYusV0e7tzvkU/utBFNa/Kpxmwng==",
+      "dev": true,
+      "dependencies": {
+        "playwright-core": "1.46.1"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "fsevents": "2.3.2"
+      }
+    },
+    "node_modules/playwright-core": {
+      "version": "1.47.0",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.47.0.tgz",
+      "integrity": "sha512-1DyHT8OqkcfCkYUD9zzUTfg7EfTd+6a8MkD/NWOvjo0u/SCNd5YmY/lJwFvUZOxJbWNds+ei7ic2+R/cRz/PDg==",
+      "dev": true,
+      "bin": {
+        "playwright-core": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/playwright/node_modules/playwright-core": {
+      "version": "1.46.1",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.46.1.tgz",
+      "integrity": "sha512-h9LqIQaAv+CYvWzsZ+h3RsrqCStkBHlgo6/TJlFst3cOTlLghBQlJwPOZKQJTKNaD3QIB7aAVQ+gfWbN3NXB7A==",
+      "dev": true,
+      "bin": {
+        "playwright-core": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/plist": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.5.tgz",
+      "integrity": "sha512-83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA==",
+      "dev": true,
+      "dependencies": {
+        "base64-js": "^1.5.1",
+        "xmlbuilder": "^9.0.7"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/plist/node_modules/xmlbuilder": {
+      "version": "9.0.7",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
+      "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= sha512-7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/plugin-error": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+      "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "^1.0.1",
+        "arr-diff": "^4.0.0",
+        "arr-union": "^3.1.0",
+        "extend-shallow": "^3.0.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/plugin-error/node_modules/ansi-colors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-wrap": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/posix-character-classes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss": {
+      "version": "8.4.38",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
+      "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "dependencies": {
+        "nanoid": "^3.3.7",
+        "picocolors": "^1.0.0",
+        "source-map-js": "^1.2.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/postcss-calc": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-9.0.1.tgz",
+      "integrity": "sha512-TipgjGyzP5QzEhsOZUaIkeO5mKeMFpebWzRogWG/ysonUlnHcq5aJe0jOjpfzUU8PeSaBQnrE8ehR0QA5vs8PQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.11",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.2"
+      }
+    },
+    "node_modules/postcss-colormin": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-6.0.2.tgz",
+      "integrity": "sha512-TXKOxs9LWcdYo5cgmcSHPkyrLAh86hX1ijmyy6J8SbOhyv6ua053M3ZAM/0j44UsnQNIWdl8gb5L7xX2htKeLw==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.22.2",
+        "caniuse-api": "^3.0.0",
+        "colord": "^2.9.1",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-convert-values": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-6.0.2.tgz",
+      "integrity": "sha512-aeBmaTnGQ+NUSVQT8aY0sKyAD/BaLJenEKZ03YK0JnDE1w1Rr8XShoxdal2V2H26xTJKr3v5haByOhJuyT4UYw==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.22.2",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-discard-comments": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-6.0.1.tgz",
+      "integrity": "sha512-f1KYNPtqYLUeZGCHQPKzzFtsHaRuECe6jLakf/RjSRqvF5XHLZnM2+fXLhb8Qh/HBFHs3M4cSLb1k3B899RYIg==",
+      "dev": true,
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-discard-duplicates": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-6.0.1.tgz",
+      "integrity": "sha512-1hvUs76HLYR8zkScbwyJ8oJEugfPV+WchpnA+26fpJ7Smzs51CzGBHC32RS03psuX/2l0l0UKh2StzNxOrKCYg==",
+      "dev": true,
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-discard-empty": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-6.0.1.tgz",
+      "integrity": "sha512-yitcmKwmVWtNsrrRqGJ7/C0YRy53i0mjexBDQ9zYxDwTWVBgbU4+C9jIZLmQlTDT9zhml+u0OMFJh8+31krmOg==",
+      "dev": true,
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-discard-overridden": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-6.0.1.tgz",
+      "integrity": "sha512-qs0ehZMMZpSESbRkw1+inkf51kak6OOzNRaoLd/U7Fatp0aN2HQ1rxGOrJvYcRAN9VpX8kUF13R2ofn8OlvFVA==",
+      "dev": true,
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-merge-longhand": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-6.0.2.tgz",
+      "integrity": "sha512-+yfVB7gEM8SrCo9w2lCApKIEzrTKl5yS1F4yGhV3kSim6JzbfLGJyhR1B6X+6vOT0U33Mgx7iv4X9MVWuaSAfw==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0",
+        "stylehacks": "^6.0.2"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-merge-rules": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-6.0.3.tgz",
+      "integrity": "sha512-yfkDqSHGohy8sGYIJwBmIGDv4K4/WrJPX355XrxQb/CSsT4Kc/RxDi6akqn5s9bap85AWgv21ArcUWwWdGNSHA==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.22.2",
+        "caniuse-api": "^3.0.0",
+        "cssnano-utils": "^4.0.1",
+        "postcss-selector-parser": "^6.0.15"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-minify-font-values": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-6.0.1.tgz",
+      "integrity": "sha512-tIwmF1zUPoN6xOtA/2FgVk1ZKrLcCvE0dpZLtzyyte0j9zUeB8RTbCqrHZGjJlxOvNWKMYtunLrrl7HPOiR46w==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-minify-gradients": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-6.0.1.tgz",
+      "integrity": "sha512-M1RJWVjd6IOLPl1hYiOd5HQHgpp6cvJVLrieQYS9y07Yo8itAr6jaekzJphaJFR0tcg4kRewCk3kna9uHBxn/w==",
+      "dev": true,
+      "dependencies": {
+        "colord": "^2.9.1",
+        "cssnano-utils": "^4.0.1",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-minify-params": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-6.0.2.tgz",
+      "integrity": "sha512-zwQtbrPEBDj+ApELZ6QylLf2/c5zmASoOuA4DzolyVGdV38iR2I5QRMsZcHkcdkZzxpN8RS4cN7LPskOkTwTZw==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.22.2",
+        "cssnano-utils": "^4.0.1",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-minify-selectors": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-6.0.2.tgz",
+      "integrity": "sha512-0b+m+w7OAvZejPQdN2GjsXLv5o0jqYHX3aoV0e7RBKPCsB7TYG5KKWBFhGnB/iP3213Ts8c5H4wLPLMm7z28Sg==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.15"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-modules-extract-imports": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
+      "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
+      "dev": true,
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.4.tgz",
+      "integrity": "sha512-L4QzMnOdVwRm1Qb8m4x8jsZzKAaPAgrUF1r/hjDR2Xj7R+8Zsf97jAlSQzWtKx5YNiNGN8QxmPFIc/sh+RQl+Q==",
+      "dev": true,
+      "dependencies": {
+        "icss-utils": "^5.0.0",
+        "postcss-selector-parser": "^6.0.2",
+        "postcss-value-parser": "^4.1.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-scope": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.1.1.tgz",
+      "integrity": "sha512-uZgqzdTleelWjzJY+Fhti6F3C9iF1JR/dODLs/JDefozYcKTBCdD8BIl6nNPbTbcLnGrk56hzwZC2DaGNvYjzA==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.4"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-values": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
+      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
+      "dev": true,
+      "dependencies": {
+        "icss-utils": "^5.0.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-nesting": {
+      "version": "12.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-12.0.2.tgz",
+      "integrity": "sha512-63PpJHSeNs93S3ZUIyi+7kKx4JqOIEJ6QYtG3x+0qA4J03+4n0iwsyA1GAHyWxsHYljQS4/4ZK1o2sMi70b5wQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "dependencies": {
+        "@csstools/selector-specificity": "^3.0.1",
+        "postcss-selector-parser": "^6.0.13"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-normalize-charset": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-6.0.1.tgz",
+      "integrity": "sha512-aW5LbMNRZ+oDV57PF9K+WI1Z8MPnF+A8qbajg/T8PP126YrGX1f9IQx21GI2OlGz7XFJi/fNi0GTbY948XJtXg==",
+      "dev": true,
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-normalize-display-values": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-6.0.1.tgz",
+      "integrity": "sha512-mc3vxp2bEuCb4LgCcmG1y6lKJu1Co8T+rKHrcbShJwUmKJiEl761qb/QQCfFwlrvSeET3jksolCR/RZuMURudw==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-normalize-positions": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-6.0.1.tgz",
+      "integrity": "sha512-HRsq8u/0unKNvm0cvwxcOUEcakFXqZ41fv3FOdPn916XFUrympjr+03oaLkuZENz3HE9RrQE9yU0Xv43ThWjQg==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-normalize-repeat-style": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-6.0.1.tgz",
+      "integrity": "sha512-Gbb2nmCy6tTiA7Sh2MBs3fj9W8swonk6lw+dFFeQT68B0Pzwp1kvisJQkdV6rbbMSd9brMlS8I8ts52tAGWmGQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-normalize-string": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-6.0.1.tgz",
+      "integrity": "sha512-5Fhx/+xzALJD9EI26Aq23hXwmv97Zfy2VFrt5PLT8lAhnBIZvmaT5pQk+NuJ/GWj/QWaKSKbnoKDGLbV6qnhXg==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-normalize-timing-functions": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-6.0.1.tgz",
+      "integrity": "sha512-4zcczzHqmCU7L5dqTB9rzeqPWRMc0K2HoR+Bfl+FSMbqGBUcP5LRfgcH4BdRtLuzVQK1/FHdFoGT3F7rkEnY+g==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-normalize-unicode": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-6.0.2.tgz",
+      "integrity": "sha512-Ff2VdAYCTGyMUwpevTZPZ4w0+mPjbZzLLyoLh/RMpqUqeQKZ+xMm31hkxBavDcGKcxm6ACzGk0nBfZ8LZkStKA==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.22.2",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-normalize-url": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-6.0.1.tgz",
+      "integrity": "sha512-jEXL15tXSvbjm0yzUV7FBiEXwhIa9H88JOXDGQzmcWoB4mSjZIsmtto066s2iW9FYuIrIF4k04HA2BKAOpbsaQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-normalize-whitespace": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-6.0.1.tgz",
+      "integrity": "sha512-76i3NpWf6bB8UHlVuLRxG4zW2YykF9CTEcq/9LGAiz2qBuX5cBStadkk0jSkg9a9TCIXbMQz7yzrygKoCW9JuA==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-ordered-values": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-6.0.1.tgz",
+      "integrity": "sha512-XXbb1O/MW9HdEhnBxitZpPFbIvDgbo9NK4c/5bOfiKpnIGZDoL2xd7/e6jW5DYLsWxBbs+1nZEnVgnjnlFViaA==",
+      "dev": true,
+      "dependencies": {
+        "cssnano-utils": "^4.0.1",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-reduce-initial": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-6.0.2.tgz",
+      "integrity": "sha512-YGKalhNlCLcjcLvjU5nF8FyeCTkCO5UtvJEt0hrPZVCTtRLSOH4z00T1UntQPj4dUmIYZgMj8qK77JbSX95hSw==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.22.2",
+        "caniuse-api": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-reduce-transforms": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-6.0.1.tgz",
+      "integrity": "sha512-fUbV81OkUe75JM+VYO1gr/IoA2b/dRiH6HvMwhrIBSUrxq3jNZQZitSnugcTLDi1KkQh1eR/zi+iyxviUNBkcQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-selector-parser": {
+      "version": "6.0.15",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.15.tgz",
+      "integrity": "sha512-rEYkQOMUCEMhsKbK66tbEU9QVIxbhN18YiniAwA7XQYTVBqrBy+P2p5JcdqsHgKM2zWylp8d7J6eszocfds5Sw==",
+      "dev": true,
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-svgo": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-6.0.2.tgz",
+      "integrity": "sha512-IH5R9SjkTkh0kfFOQDImyy1+mTCb+E830+9SV1O+AaDcoHTvfsvt6WwJeo7KwcHbFnevZVCsXhDmjFiGVuwqFQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0",
+        "svgo": "^3.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >= 18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-svgo/node_modules/commander": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/postcss-svgo/node_modules/css-tree": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz",
+      "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==",
+      "dev": true,
+      "dependencies": {
+        "mdn-data": "2.0.30",
+        "source-map-js": "^1.0.1"
+      },
+      "engines": {
+        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
+      }
+    },
+    "node_modules/postcss-svgo/node_modules/csso": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-5.0.5.tgz",
+      "integrity": "sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==",
+      "dev": true,
+      "dependencies": {
+        "css-tree": "~2.2.0"
+      },
+      "engines": {
+        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0",
+        "npm": ">=7.0.0"
+      }
+    },
+    "node_modules/postcss-svgo/node_modules/csso/node_modules/css-tree": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.2.1.tgz",
+      "integrity": "sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==",
+      "dev": true,
+      "dependencies": {
+        "mdn-data": "2.0.28",
+        "source-map-js": "^1.0.1"
+      },
+      "engines": {
+        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0",
+        "npm": ">=7.0.0"
+      }
+    },
+    "node_modules/postcss-svgo/node_modules/csso/node_modules/mdn-data": {
+      "version": "2.0.28",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.28.tgz",
+      "integrity": "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==",
+      "dev": true
+    },
+    "node_modules/postcss-svgo/node_modules/mdn-data": {
+      "version": "2.0.30",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz",
+      "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==",
+      "dev": true
+    },
+    "node_modules/postcss-svgo/node_modules/svgo": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-3.2.0.tgz",
+      "integrity": "sha512-4PP6CMW/V7l/GmKRKzsLR8xxjdHTV4IMvhTnpuHwwBazSIlw5W/5SmPjN8Dwyt7lKbSJrRDgp4t9ph0HgChFBQ==",
+      "dev": true,
+      "dependencies": {
+        "@trysound/sax": "0.2.0",
+        "commander": "^7.2.0",
+        "css-select": "^5.1.0",
+        "css-tree": "^2.3.1",
+        "css-what": "^6.1.0",
+        "csso": "^5.0.5",
+        "picocolors": "^1.0.0"
+      },
+      "bin": {
+        "svgo": "bin/svgo"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/svgo"
+      }
+    },
+    "node_modules/postcss-unique-selectors": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-6.0.2.tgz",
+      "integrity": "sha512-8IZGQ94nechdG7Y9Sh9FlIY2b4uS8/k8kdKRX040XHsS3B6d1HrJAkXrBSsSu4SuARruSsUjW3nlSw8BHkaAYQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.15"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-value-parser": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+      "dev": true
+    },
+    "node_modules/postcss/node_modules/nanoid": {
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/prebuild-install": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.2.tgz",
+      "integrity": "sha512-UnNke3IQb6sgarcZIDU3gbMeTp/9SSU1DAIkil7PrqG1vZlBtY5msYccSKSHDqa3hNg436IXK+SNImReuA1wEQ==",
+      "dependencies": {
+        "detect-libc": "^2.0.0",
+        "expand-template": "^2.0.3",
+        "github-from-package": "0.0.0",
+        "minimist": "^1.2.3",
+        "mkdirp-classic": "^0.5.3",
+        "napi-build-utils": "^1.0.1",
+        "node-abi": "^3.3.0",
+        "pump": "^3.0.0",
+        "rc": "^1.2.7",
+        "simple-get": "^4.0.0",
+        "tar-fs": "^2.0.0",
+        "tunnel-agent": "^0.6.0"
+      },
+      "bin": {
+        "prebuild-install": "bin.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/prebuild-install/node_modules/chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
+    },
+    "node_modules/prebuild-install/node_modules/pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "node_modules/prebuild-install/node_modules/tar-fs": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
+      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+      "dependencies": {
+        "chownr": "^1.1.1",
+        "mkdirp-classic": "^0.5.2",
+        "pump": "^3.0.0",
+        "tar-stream": "^2.1.4"
+      }
+    },
+    "node_modules/prebuild-install/node_modules/tar-stream": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "dependencies": {
+        "bl": "^4.0.3",
+        "end-of-stream": "^1.4.1",
+        "fs-constants": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/pretty-hrtime": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
+      "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE= sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI= sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true
+    },
+    "node_modules/progress": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
+      "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74= sha512-UdA8mJ4weIkUBO224tIarHzuHs4HuYiJvsuGT7j/SPQiUJVjYvNDBIPa0hAorduOfjGohB/qHWRa/lrrWX/mXw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/proto-list": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
+      "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk= sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==",
+      "dev": true
+    },
+    "node_modules/proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
+    },
+    "node_modules/prr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY= sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==",
+      "dev": true
+    },
+    "node_modules/pseudo-localization": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/pseudo-localization/-/pseudo-localization-2.4.0.tgz",
+      "integrity": "sha512-ISYMOKY8+f+PmiXMFw2y6KLY74LBrv/8ml/VjjoVEV2k+MS+OJZz7ydciK5ntJwxPrKQPTU1+oXq9Mx2b0zEzg==",
+      "dev": true,
+      "dependencies": {
+        "flat": "^5.0.2",
+        "get-stdin": "^7.0.0",
+        "typescript": "^4.7.4",
+        "yargs": "^17.2.1"
+      },
+      "bin": {
+        "pseudo-localization": "bin/pseudo-localize"
+      }
+    },
+    "node_modules/pseudo-localization/node_modules/typescript": {
+      "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
+      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
+      "dev": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=4.2.0"
+      }
+    },
+    "node_modules/pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM= sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==",
+      "dev": true
+    },
+    "node_modules/psl": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
+      "dev": true
+    },
+    "node_modules/pump": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz",
+      "integrity": "sha1-Oz7mUS+U8OV1U4wXmV+fFpkKXVE= sha512-0l9Rf87wCGXiNCxHxjixpBTPa0iLYFp6an+fwXp7Yz6Fxyhdo7YiBsV76yqzwajT/2+XjKdiCaCDVIcvyEHqCA==",
+      "dev": true,
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "node_modules/pumpify": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
+      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+      "dev": true,
+      "dependencies": {
+        "duplexify": "^3.6.0",
+        "inherits": "^2.0.3",
+        "pump": "^2.0.0"
+      }
+    },
+    "node_modules/pumpify/node_modules/pump": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+      "dev": true,
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "node_modules/punycode.js": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz",
+      "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/querystringify": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+      "dev": true
+    },
+    "node_modules/queue": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/queue/-/queue-3.1.0.tgz",
+      "integrity": "sha1-bEnQHwCeIlZ4h4nyv/rGuLmZBYU= sha512-z3XqdkYJ/YVQuAAoAKLcePEk2BZDMZR2jv2hTrpQb0K5M0dUbiwADr48N1F63M4ChD/GwPc/LeaA9VC5dJFfTA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "~2.0.0"
+      }
+    },
+    "node_modules/queue-tick": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
+      "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==",
+      "dev": true
+    },
+    "node_modules/quick-lru": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
+      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/rc": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+      "dependencies": {
+        "deep-extend": "^0.6.0",
+        "ini": "~1.3.0",
+        "minimist": "^1.2.0",
+        "strip-json-comments": "~2.0.1"
+      },
+      "bin": {
+        "rc": "cli.js"
+      }
+    },
+    "node_modules/rc/node_modules/strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo= sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/rcedit": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/rcedit/-/rcedit-1.1.0.tgz",
+      "integrity": "sha512-JkXJ0IrUcdupLoIx6gE4YcFaMVSGtu7kQf4NJoDJUnfBZGuATmJ2Yal2v55KTltp+WV8dGr7A0RtOzx6jmtM6Q==",
+      "dev": true
+    },
+    "node_modules/read-pkg": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+      "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k= sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==",
+      "dev": true,
+      "dependencies": {
+        "load-json-file": "^4.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/read-pkg-up": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI= sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^1.0.0",
+        "read-pkg": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/find-up": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8= sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==",
+      "dev": true,
+      "dependencies": {
+        "path-exists": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/load-json-file": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA= sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0",
+        "strip-bom": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck= sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==",
+      "dev": true,
+      "dependencies": {
+        "error-ex": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/path-exists": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s= sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==",
+      "dev": true,
+      "dependencies": {
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/path-type": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE= sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/read-pkg": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg= sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==",
+      "dev": true,
+      "dependencies": {
+        "load-json-file": "^1.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/strip-bom": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4= sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==",
+      "dev": true,
+      "dependencies": {
+        "is-utf8": "^0.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/read-pkg/node_modules/path-type": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+      "dev": true,
+      "dependencies": {
+        "pify": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/rechoir": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
+      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q= sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==",
+      "dev": true,
+      "dependencies": {
+        "resolve": "^1.1.6"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/regex-not": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^3.0.2",
+        "safe-regex": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/remove-bom-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz",
+      "integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5",
+        "is-utf8": "^0.2.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/remove-bom-stream": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz",
+      "integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM= sha512-wigO8/O08XHb8YPzpDDT+QmRANfW6vLqxfaXm1YXhnFf3AkSLyjfG3GEFg4McZkmgL7KvCj5u2KczkvSP6NfHA==",
+      "dev": true,
+      "dependencies": {
+        "remove-bom-buffer": "^3.0.0",
+        "safe-buffer": "^5.1.0",
+        "through2": "^2.0.3"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/remove-bom-stream/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/remove-bom-stream/node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/remove-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8= sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==",
+      "dev": true
+    },
+    "node_modules/repeat-element": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
+      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc= sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/replace-ext": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz",
+      "integrity": "sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/replace-homedir": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz",
+      "integrity": "sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw= sha512-CHPV/GAglbIB1tnQgaiysb8H2yCy8WQ7lcEwQ/eT+kLj0QHV8LnJW0zpqpE7RSkrMSRoa+EBoag86clf7WAgSg==",
+      "dev": true,
+      "dependencies": {
+        "homedir-polyfill": "^1.0.1",
+        "is-absolute": "^1.0.0",
+        "remove-trailing-separator": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/replacestream": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/replacestream/-/replacestream-4.0.3.tgz",
+      "integrity": "sha512-AC0FiLS352pBBiZhd4VXB1Ab/lh0lEgpP+GGvZqbQh8a5cmXVoTe5EX/YeTFArnp4SRGTHh1qCHu9lGs1qG8sA==",
+      "dev": true,
+      "dependencies": {
+        "escape-string-regexp": "^1.0.3",
+        "object-assign": "^4.0.1",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "node_modules/replacestream/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/replacestream/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I= sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+      "dev": true
+    },
+    "node_modules/requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+      "dev": true
+    },
+    "node_modules/resolve": {
+      "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
+      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+      "dev": true,
+      "dependencies": {
+        "is-core-module": "^2.9.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-alpn": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
+      "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==",
+      "dev": true
+    },
+    "node_modules/resolve-cwd": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+      "dev": true,
+      "dependencies": {
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-cwd/node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-dir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
+      "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M= sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==",
+      "dev": true,
+      "dependencies": {
+        "expand-tilde": "^2.0.0",
+        "global-modules": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/resolve-options": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz",
+      "integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE= sha512-NYDgziiroVeDC29xq7bp/CacZERYsA9bXYd1ZmcJlF3BcrZv5pTb4NG7SjdyKDnXZ84aC4vo2u6sNKIA1LCu/A==",
+      "dev": true,
+      "dependencies": {
+        "value-or-function": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/resolve-path": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/resolve-path/-/resolve-path-1.4.0.tgz",
+      "integrity": "sha1-xL2p9e+y/OZSR4c6s2u02DT+Fvc= sha512-i1xevIst/Qa+nA9olDxLWnLk8YZbi8R/7JPbCMcgyWaFR6bKWaexgJgEB5oc2PKMjYdrHynyz0NY+if+H98t1w==",
+      "dev": true,
+      "dependencies": {
+        "http-errors": "~1.6.2",
+        "path-is-absolute": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/resolve-path/node_modules/depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/resolve-path/node_modules/http-errors": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+      "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0= sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
+      "dev": true,
+      "dependencies": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.0",
+        "statuses": ">= 1.4.0 < 2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/resolve-path/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+      "dev": true
+    },
+    "node_modules/resolve-path/node_modules/setprototypeof": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+      "dev": true
+    },
+    "node_modules/resolve-path/node_modules/statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==",
+      "deprecated": "https://github.com/lydell/resolve-url#deprecated",
+      "dev": true
+    },
+    "node_modules/responselike": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
+      "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==",
+      "dev": true,
+      "dependencies": {
+        "lowercase-keys": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/restore-cursor": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz",
+      "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==",
+      "dev": true,
+      "dependencies": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/restore-cursor/node_modules/signal-exit": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
+      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
+      "dev": true
+    },
+    "node_modules/ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
+    "node_modules/reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true,
+      "engines": {
+        "iojs": ">=1.0.0",
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/rimraf": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/rimraf/node_modules/glob": {
+      "version": "7.1.7",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/roarr": {
+      "version": "2.15.4",
+      "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz",
+      "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "boolean": "^3.0.1",
+        "detect-node": "^2.0.4",
+        "globalthis": "^1.0.1",
+        "json-stringify-safe": "^5.0.1",
+        "semver-compare": "^1.0.0",
+        "sprintf-js": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/run-parallel": {
+      "version": "1.1.10",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.10.tgz",
+      "integrity": "sha512-zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "node_modules/safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4= sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==",
+      "dev": true,
+      "dependencies": {
+        "ret": "~0.1.10"
+      }
+    },
+    "node_modules/sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "dev": true
+    },
+    "node_modules/schema-utils": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
+      "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.9",
+        "ajv": "^8.8.0",
+        "ajv-formats": "^2.1.1",
+        "ajv-keywords": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/schema-utils/node_modules/ajv": {
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/schema-utils/node_modules/ajv-keywords": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3"
+      },
+      "peerDependencies": {
+        "ajv": "^8.8.2"
+      }
+    },
+    "node_modules/schema-utils/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
+    "node_modules/semver": {
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
+      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/semver-compare": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
+      "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w= sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/semver-greatest-satisfied-range": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz",
+      "integrity": "sha1-E+jCZYq5aRywzXEJMkAoDTb3els= sha512-Ny/iyOzSSa8M5ML46IAx3iXc6tfOsYU2R4AXi2UpHk60Zrgyq6eqPj/xiOfS0rRl/iiQ/rdJkVjw/5cdUyCntQ==",
+      "dev": true,
+      "dependencies": {
+        "sver-compat": "^1.5.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/serialize-error": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz",
+      "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "type-fest": "^0.13.1"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/serialize-error/node_modules/type-fest": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
+      "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/serialize-javascript": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
+      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+      "dev": true,
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc= sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+      "dev": true
+    },
+    "node_modules/set-function-length": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "dev": true,
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/set-value": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/set-value/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/set-value/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/set-value/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
+      "dev": true
+    },
+    "node_modules/setprototypeof": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+      "dev": true
+    },
+    "node_modules/shallow-clone": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shallow-clone/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shell-quote": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz",
+      "integrity": "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==",
+      "dev": true
+    },
+    "node_modules/sigmund": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
+      "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA= sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g==",
+      "dev": true
+    },
+    "node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/simple-concat": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
+      "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/simple-get": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz",
+      "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "decompress-response": "^6.0.0",
+        "once": "^1.3.1",
+        "simple-concat": "^1.0.0"
+      }
+    },
+    "node_modules/sinon": {
+      "version": "12.0.1",
+      "resolved": "https://registry.npmjs.org/sinon/-/sinon-12.0.1.tgz",
+      "integrity": "sha512-iGu29Xhym33ydkAT+aNQFBINakjq69kKO6ByPvTsm3yyIACfyQttRTP03aBP/I8GfhFmLzrnKwNNkr0ORb1udg==",
+      "deprecated": "16.1.1",
+      "dev": true,
+      "dependencies": {
+        "@sinonjs/commons": "^1.8.3",
+        "@sinonjs/fake-timers": "^8.1.0",
+        "@sinonjs/samsam": "^6.0.2",
+        "diff": "^5.0.0",
+        "nise": "^5.1.0",
+        "supports-color": "^7.2.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/sinon"
+      }
+    },
+    "node_modules/sinon-test": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/sinon-test/-/sinon-test-3.1.3.tgz",
+      "integrity": "sha512-jBDvPVW2z8uAoiud3Nqc6+e8+WX6UTB1gPQuYXK00mSnp9m/JYyeLdBjLlqbnk1DVmsgRCAHSoXYPNLHp0t56Q==",
+      "dev": true,
+      "peerDependencies": {
+        "sinon": "2.x - 13.x"
+      }
+    },
+    "node_modules/sinon/node_modules/@sinonjs/fake-timers": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
+      "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
+      "dev": true,
+      "dependencies": {
+        "@sinonjs/commons": "^1.7.0"
+      }
+    },
+    "node_modules/sinon/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/sinon/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
+      "engines": {
+        "node": ">= 6.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/snapdragon": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "dev": true,
+      "dependencies": {
+        "base": "^0.11.1",
+        "debug": "^2.2.0",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "map-cache": "^0.2.2",
+        "source-map": "^0.5.6",
+        "source-map-resolve": "^0.5.0",
+        "use": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "dev": true,
+      "dependencies": {
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.0",
+        "snapdragon-util": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY= sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-util": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-util/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY= sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY= sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
+      "deprecated": "Please upgrade to v0.1.7",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/is-accessor-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y= sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
+      "deprecated": "Please upgrade to v0.1.5",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/is-data-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/snapdragon/node_modules/source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/source-map-resolve": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+      "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
+      "dev": true,
+      "dependencies": {
+        "atob": "^2.1.2",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
+      }
+    },
+    "node_modules/socks": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
+      "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==",
+      "dependencies": {
+        "ip-address": "^9.0.5",
+        "smart-buffer": "^4.2.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks-proxy-agent": {
+      "version": "8.0.4",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz",
+      "integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==",
+      "dependencies": {
+        "agent-base": "^7.1.1",
+        "debug": "^4.3.4",
+        "socks": "^2.8.3"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-js": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
+      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-resolve": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz",
+      "integrity": "sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==",
+      "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
+      "dev": true,
+      "dependencies": {
+        "atob": "^2.1.2",
+        "decode-uri-component": "^0.2.0"
+      }
+    },
+    "node_modules/source-map-support": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.3.3.tgz",
+      "integrity": "sha1-NJAJd9W6PwfHdX7nLnO7GptTdU8= sha512-9O4+y9n64RewmFoKUZ/5Tx9IHIcXM6Q+RTSw6ehnqybUz4a7iwR3Eaw80uLtqqQ5D0C+5H03D4KKGo9PdP33Gg==",
+      "dev": true,
+      "dependencies": {
+        "source-map": "0.1.32"
+      }
+    },
+    "node_modules/source-map-support/node_modules/source-map": {
+      "version": "0.1.32",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz",
+      "integrity": "sha1-yLbBZ3l7pHQKjqMyUhYv8IWRsmY= sha512-htQyLrrRLkQ87Zfrir4/yN+vAUd6DNjVayEjTSHXu29AYQJw57I4/xEL/M6p6E/woPNJwvZt6rVlzc7gFEJccQ==",
+      "dev": true,
+      "dependencies": {
+        "amdefine": ">=0.0.4"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/source-map-url": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
+      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM= sha512-liJwHPI9x9d9w5WSIjM58MqGmmb7XzNqwdUA3kSBQ4lmDngexlKwawGzK3J1mKXi6+sysoMDlpVyZh9sv5vRfw==",
+      "deprecated": "See https://github.com/lydell/source-map-url#deprecated",
+      "dev": true
+    },
+    "node_modules/sparkles": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
+      "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/spdx-correct": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
+      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+      "dev": true,
+      "dependencies": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-exceptions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
+      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==",
+      "dev": true
+    },
+    "node_modules/spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dev": true,
+      "dependencies": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-license-ids": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
+      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
+      "dev": true
+    },
+    "node_modules/split": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
+      "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8= sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA==",
+      "dev": true,
+      "dependencies": {
+        "through": "2"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="
+    },
+    "node_modules/stable": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
+      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
+      "deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility",
+      "dev": true
+    },
+    "node_modules/stack-trace": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
+      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA= sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY= sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==",
+      "dev": true,
+      "dependencies": {
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY= sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY= sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
+      "deprecated": "Please upgrade to v0.1.7",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/is-accessor-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y= sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
+      "deprecated": "Please upgrade to v0.1.5",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/is-data-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/stdin-discarder": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/stdin-discarder/-/stdin-discarder-0.1.0.tgz",
+      "integrity": "sha512-xhV7w8S+bUwlPTb4bAOUQhv8/cSS5offJuX8GQGq32ONF0ZtDWKfkdomM3HMRA+LhX6um/FZ0COqlwsjD53LeQ==",
+      "dev": true,
+      "dependencies": {
+        "bl": "^5.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/stdin-discarder/node_modules/bl": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-5.1.0.tgz",
+      "integrity": "sha512-tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ==",
+      "dev": true,
+      "dependencies": {
+        "buffer": "^6.0.3",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
+      }
+    },
+    "node_modules/stdin-discarder/node_modules/buffer": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
+      }
+    },
+    "node_modules/stream-combiner": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
+      "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ= sha512-rT00SPnTVyRsaSz5zgSPma/aHSOic5U1prhYdRy5HS2kTZviFpmDgzilbtsJsxiroqACmayynDN/9VzIbX5DOw==",
+      "dev": true,
+      "dependencies": {
+        "duplexer": "~0.1.1"
+      }
+    },
+    "node_modules/stream-exhaust": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
+      "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==",
+      "dev": true
+    },
+    "node_modules/stream-shift": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
+      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
+      "dev": true
+    },
+    "node_modules/stream-to-array": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/stream-to-array/-/stream-to-array-2.3.0.tgz",
+      "integrity": "sha1-u/azn19D7DC8cbq8s3VXrOzzQ1M= sha512-UsZtOYEn4tWU2RGLOXr/o/xjRBftZRlG3dEWoaHr8j4GuypJ3isitGbVyjQKAuMu+xbiop8q224TjiZWc4XTZA==",
+      "dev": true,
+      "dependencies": {
+        "any-promise": "^1.1.0"
+      }
+    },
+    "node_modules/streamfilter": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/streamfilter/-/streamfilter-1.0.5.tgz",
+      "integrity": "sha1-h1BxEb644phFFxe1Ec/tjwAqv1M= sha512-IHuyNEAPs3pi2ABhJ7Dbjza9Gc6Nq7NDvx14tsKw4h4cMUz4YoLOON6nghUvIZVO4NW4qvYUoED1kd6/bipTVQ==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "node_modules/streamfilter/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/streamifier": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/streamifier/-/streamifier-0.1.1.tgz",
+      "integrity": "sha1-l+mNj6TRBdYqJpHR3AfoINuN/E8= sha512-zDgl+muIlWzXNsXeyUfOk9dChMjlpkq0DRsxujtYPgyJ676yQ8jEm6zzaaWHFDg5BNcLuif0eD2MTyJdZqXpdg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/streamx": {
+      "version": "2.18.0",
+      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.18.0.tgz",
+      "integrity": "sha512-LLUC1TWdjVdn1weXGcSxyTR3T4+acB6tVGXT95y0nGbca4t4o/ng1wKAGTljm9VicuCVLvRlqFYXYy5GwgM7sQ==",
+      "dev": true,
+      "dependencies": {
+        "fast-fifo": "^1.3.2",
+        "queue-tick": "^1.0.1",
+        "text-decoder": "^1.1.0"
+      },
+      "optionalDependencies": {
+        "bare-events": "^2.2.0"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-6.1.0.tgz",
+      "integrity": "sha512-k01swCJAgQmuADB0YIc+7TuatfNvTBVOoaUWJjTB9R4VJzR5vNWzf5t42ESVZFPS8xTySF7CAdV4t/aaIm3UnQ==",
+      "dev": true,
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^10.2.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/string-width-cjs": {
+      "name": "string-width",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/string-width/node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/string-width/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/string.prototype.padend": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.1.tgz",
+      "integrity": "sha512-eCzTASPnoCr5Ht+Vn1YXgm8SB015hHKgEIMu9Nr9bQmLhRBxKRfmzSj/IQsxDFc8JInJDDFA0qXwK+xxI7wDkg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.18.0-next.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimend": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz",
+      "integrity": "sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz",
+      "integrity": "sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi-cjs": {
+      "name": "strip-ansi",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/strip-bom-string": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz",
+      "integrity": "sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI= sha512-uCC2VHvQRYu+lMh4My/sFNmF2klFymLX1wHJeXnbEJERpV/ZsVuonzerjfrGpIGF7LBVa1O7i9kjiWvJiFck8g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/style-loader": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.2.tgz",
+      "integrity": "sha512-RHs/vcrKdQK8wZliteNK4NKzxvLBzpuHMqYmUVWeKa6MkaIQ97ZTOS0b+zapZhy6GcrgWnvWYCMHRirC3FsUmw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/stylehacks": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-6.0.2.tgz",
+      "integrity": "sha512-00zvJGnCu64EpMjX8b5iCZ3us2Ptyw8+toEkb92VdmkEaRaSGBNKAoK6aWZckhXxmQP8zWiTaFaiMGIU8Ve8sg==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.22.2",
+        "postcss-selector-parser": "^6.0.15"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/sumchecker": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz",
+      "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.0"
+      },
+      "engines": {
+        "node": ">= 8.0"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "9.4.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.4.0.tgz",
+      "integrity": "sha512-VL+lNrEoIXww1coLPOmiEmK/0sGigko5COxI09KzHc2VJXJsQ37UaQ+8quuxjDeA7+KnLGTWRyOXSLLR2Wb4jw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/sver-compat": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz",
+      "integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg= sha512-aFTHfmjwizMNlNE6dsGmoAM4lHjL0CyiobWaFiXWSlD7cIxshW422Nb8KbXCmR6z+0ZEPY+daXJrDyh/vuwTyg==",
+      "dev": true,
+      "dependencies": {
+        "es6-iterator": "^2.0.1",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "node_modules/svgo": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
+      "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
+      "dev": true,
+      "dependencies": {
+        "@trysound/sax": "0.2.0",
+        "commander": "^7.2.0",
+        "css-select": "^4.1.3",
+        "css-tree": "^1.1.3",
+        "csso": "^4.2.0",
+        "picocolors": "^1.0.0",
+        "stable": "^0.1.8"
+      },
+      "bin": {
+        "svgo": "bin/svgo"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/svgo/node_modules/commander": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/svgo/node_modules/css-select": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.2.1.tgz",
+      "integrity": "sha512-/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "^1.0.0",
+        "css-what": "^5.1.0",
+        "domhandler": "^4.3.0",
+        "domutils": "^2.8.0",
+        "nth-check": "^2.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/svgo/node_modules/css-what": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz",
+      "integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/svgo/node_modules/dom-serializer": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz",
+      "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.2.0",
+        "entities": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+      }
+    },
+    "node_modules/svgo/node_modules/domhandler": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.0.tgz",
+      "integrity": "sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.2.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
+      }
+    },
+    "node_modules/svgo/node_modules/domutils": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+      "dev": true,
+      "dependencies": {
+        "dom-serializer": "^1.0.1",
+        "domelementtype": "^2.2.0",
+        "domhandler": "^4.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
+      }
+    },
+    "node_modules/svgo/node_modules/entities": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
+      "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/tapable": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz",
+      "integrity": "sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tar": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
+      "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
+      "dependencies": {
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "minipass": "^5.0.0",
+        "minizlib": "^2.1.1",
+        "mkdirp": "^1.0.3",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/tar-fs": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz",
+      "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==",
+      "dev": true,
+      "dependencies": {
+        "pump": "^3.0.0",
+        "tar-stream": "^3.1.5"
+      },
+      "optionalDependencies": {
+        "bare-fs": "^2.1.1",
+        "bare-path": "^2.1.0"
+      }
+    },
+    "node_modules/tar-fs/node_modules/pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dev": true,
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "node_modules/tar-stream": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.6.tgz",
+      "integrity": "sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg==",
+      "dev": true,
+      "dependencies": {
+        "b4a": "^1.6.4",
+        "fast-fifo": "^1.2.0",
+        "streamx": "^2.15.0"
+      }
+    },
+    "node_modules/tar/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
+    "node_modules/tas-client-umd": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/tas-client-umd/-/tas-client-umd-0.2.0.tgz",
+      "integrity": "sha512-oezN7mJVm5qZDVEby7OzxCLKUpUN5of0rY4dvOWaDF2JZBlGpd3BXceFN8B53qlTaIkVSzP65aAMT0Vc+/N25Q=="
+    },
+    "node_modules/teex": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/teex/-/teex-1.0.1.tgz",
+      "integrity": "sha512-eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg==",
+      "dev": true,
+      "dependencies": {
+        "streamx": "^2.12.5"
+      }
+    },
+    "node_modules/temp": {
+      "version": "0.8.4",
+      "resolved": "https://registry.npmjs.org/temp/-/temp-0.8.4.tgz",
+      "integrity": "sha512-s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg==",
+      "dev": true,
+      "dependencies": {
+        "rimraf": "~2.6.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/terser": {
+      "version": "5.30.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.30.0.tgz",
+      "integrity": "sha512-Y/SblUl5kEyEFzhMAQdsxVHh+utAxd4IuRNJzKywY/4uzSogh3G219jqbDDxYu4MXO9CzY3tSEqmZvW6AoEDJw==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/source-map": "^0.3.3",
+        "acorn": "^8.8.2",
+        "commander": "^2.20.0",
+        "source-map-support": "~0.5.20"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/terser-webpack-plugin": {
+      "version": "5.3.10",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz",
+      "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.20",
+        "jest-worker": "^27.4.5",
+        "schema-utils": "^3.1.1",
+        "serialize-javascript": "^6.0.1",
+        "terser": "^5.26.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.1.0"
+      },
+      "peerDependenciesMeta": {
+        "@swc/core": {
+          "optional": true
+        },
+        "esbuild": {
+          "optional": true
+        },
+        "uglify-js": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/serialize-javascript": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
+      "dev": true,
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/terser/node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
+    },
+    "node_modules/terser/node_modules/source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dev": true,
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/test-exclude": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "dev": true,
+      "dependencies": {
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^7.1.4",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/test-exclude/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/text-decoder": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.1.0.tgz",
+      "integrity": "sha512-TmLJNj6UgX8xcUZo4UDStGQtDiTzF7BzWlzn9g7UWrjkpHr5uJTK1ld16wZ3LXb2vb6jH8qU89dW5whuMdXYdw==",
+      "dev": true,
+      "dependencies": {
+        "b4a": "^1.6.4"
+      }
+    },
+    "node_modules/text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+      "dev": true
+    },
+    "node_modules/textextensions": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/textextensions/-/textextensions-1.0.2.tgz",
+      "integrity": "sha1-ZUhjk+4fK7A5pgy7oFsLaL2VAdI= sha512-jm9KjEWiDmtGLBrTqXEduGzlYTTlPaoDKdq5YRQhD0rYjo61ZNTYKZ/x5J4ajPSBH9wIYY5qm9GNG5otIKjtOA==",
+      "dev": true
+    },
+    "node_modules/through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
+      "dev": true
+    },
+    "node_modules/through2": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
+      "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.4",
+        "readable-stream": "2 || 3"
+      }
+    },
+    "node_modules/through2-filter": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
+      "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
+      "dev": true,
+      "dependencies": {
+        "through2": "~2.0.0",
+        "xtend": "~4.0.0"
+      }
+    },
+    "node_modules/through2-filter/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/through2-filter/node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/time-stamp": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
+      "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM= sha512-gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/timers-ext": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
+      "integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==",
+      "dev": true,
+      "dependencies": {
+        "es5-ext": "~0.10.46",
+        "next-tick": "1"
+      }
+    },
+    "node_modules/to-absolute-glob": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
+      "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs= sha512-rtwLUQEwT8ZeKQbyFJyomBRYXyE16U5VKuy0ftxLMK/PZb2fkOsg5r9kHdauuVDbsNdIBoC/HCthpidamQFXYA==",
+      "dev": true,
+      "dependencies": {
+        "is-absolute": "^1.0.0",
+        "is-negated-glob": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68= sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-object-path/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "dev": true,
+      "dependencies": {
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/to-through": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz",
+      "integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY= sha512-+QIz37Ly7acM4EMdw2PRN389OneM5+d844tirkGp4dPKzI5OE72V9OsbFp+CIYJDahZ41ZV05hNtcPAQUAm9/Q==",
+      "dev": true,
+      "dependencies": {
+        "through2": "^2.0.3"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/to-through/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/to-through/node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/toidentifier": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/tough-cookie": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
+      "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
+      "dev": true,
+      "dependencies": {
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tough-cookie/node_modules/punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tough-cookie/node_modules/universalify": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+      "dev": true
+    },
+    "node_modules/tree-kill": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
+      "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
+      "dev": true,
+      "bin": {
+        "tree-kill": "cli.js"
+      }
+    },
+    "node_modules/ts-api-utils": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz",
+      "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=16"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.2.0"
+      }
+    },
+    "node_modules/ts-loader": {
+      "version": "9.4.2",
+      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.4.2.tgz",
+      "integrity": "sha512-OmlC4WVmFv5I0PpaxYb+qGeGOdm5giHU7HwDDUjw59emP2UYMHy9fFSDcYgSNoH8sXcj4hGCSEhlDZ9ULeDraA==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "enhanced-resolve": "^5.0.0",
+        "micromatch": "^4.0.0",
+        "semver": "^7.3.4"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "typescript": "*",
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/ts-morph": {
+      "version": "19.0.0",
+      "resolved": "https://registry.npmjs.org/ts-morph/-/ts-morph-19.0.0.tgz",
+      "integrity": "sha512-D6qcpiJdn46tUqV45vr5UGM2dnIEuTGNxVhg0sk5NX11orcouwj6i1bMqZIz2mZTZB1Hcgy7C3oEVhAT+f6mbQ==",
+      "dev": true,
+      "dependencies": {
+        "@ts-morph/common": "~0.20.0",
+        "code-block-writer": "^12.0.0"
+      }
+    },
+    "node_modules/ts-node": {
+      "version": "10.9.1",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz",
+      "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==",
+      "dev": true,
+      "dependencies": {
+        "@cspotcode/source-map-support": "^0.8.0",
+        "@tsconfig/node10": "^1.0.7",
+        "@tsconfig/node12": "^1.0.7",
+        "@tsconfig/node14": "^1.0.0",
+        "@tsconfig/node16": "^1.0.2",
+        "acorn": "^8.4.1",
+        "acorn-walk": "^8.1.1",
+        "arg": "^4.1.0",
+        "create-require": "^1.1.0",
+        "diff": "^4.0.1",
+        "make-error": "^1.1.1",
+        "v8-compile-cache-lib": "^3.0.1",
+        "yn": "3.1.1"
+      },
+      "bin": {
+        "ts-node": "dist/bin.js",
+        "ts-node-cwd": "dist/bin-cwd.js",
+        "ts-node-esm": "dist/bin-esm.js",
+        "ts-node-script": "dist/bin-script.js",
+        "ts-node-transpile-only": "dist/bin-transpile.js",
+        "ts-script": "dist/bin-script-deprecated.js"
+      },
+      "peerDependencies": {
+        "@swc/core": ">=1.2.50",
+        "@swc/wasm": ">=1.2.50",
+        "@types/node": "*",
+        "typescript": ">=2.7"
+      },
+      "peerDependenciesMeta": {
+        "@swc/core": {
+          "optional": true
+        },
+        "@swc/wasm": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ts-node/node_modules/diff": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/tsec": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/tsec/-/tsec-0.2.7.tgz",
+      "integrity": "sha512-Pj9DuBBWLEo8p7QsbrEdXzW/u6QJBcib0ZGOTXkeSDx+PLXFY7hwyZE9Tfhp3TA3LQNpYouyT0WmzXRyUW4otQ==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.1",
+        "minimatch": "^3.0.3"
+      },
+      "bin": {
+        "tsec": "bin/tsec"
+      },
+      "peerDependencies": {
+        "@bazel/bazelisk": ">=1.7.5",
+        "@bazel/concatjs": ">=5.3.0",
+        "typescript": ">=3.9.2"
+      }
+    },
+    "node_modules/tsec/node_modules/glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/tslib": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
+      "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==",
+      "dev": true
+    },
+    "node_modules/tsscmp": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz",
+      "integrity": "sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.6.x"
+      }
+    },
+    "node_modules/tsutils": {
+      "version": "3.21.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.8.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      },
+      "peerDependencies": {
+        "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
+      }
+    },
+    "node_modules/tsutils/node_modules/tslib": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
+      "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==",
+      "dev": true
+    },
+    "node_modules/tunnel": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
+      }
+    },
+    "node_modules/tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
+      "dependencies": {
+        "safe-buffer": "^5.0.1"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/type": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
+      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
+      "dev": true
+    },
+    "node_modules/type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/type-is": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "dev": true,
+      "dependencies": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
+      "dev": true
+    },
+    "node_modules/typescript": {
+      "version": "5.7.0-dev.20240927",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.0-dev.20240927.tgz",
+      "integrity": "sha512-IWKZHTHAlS8BglLp8iM4rUHhy0h79B9r9vj6b6zpa8U38ofctFS1fLiKY7okZ3JYeG15kUHuOwsLwOmvc5+e1Q==",
+      "dev": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
+    "node_modules/typical": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/typical/-/typical-4.0.0.tgz",
+      "integrity": "sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/uc.micro": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz",
+      "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==",
+      "dev": true
+    },
+    "node_modules/unc-path-regex": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
+      "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo= sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/undertaker": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.3.0.tgz",
+      "integrity": "sha512-/RXwi5m/Mu3H6IHQGww3GNt1PNXlbeCuclF2QYR14L/2CHPz3DFZkvB5hZ0N/QUkiXWCACML2jXViIQEQc2MLg==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.0.1",
+        "arr-map": "^2.0.0",
+        "bach": "^1.0.0",
+        "collection-map": "^1.0.0",
+        "es6-weak-map": "^2.0.1",
+        "fast-levenshtein": "^1.0.0",
+        "last-run": "^1.1.0",
+        "object.defaults": "^1.0.0",
+        "object.reduce": "^1.0.0",
+        "undertaker-registry": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/undertaker-registry": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz",
+      "integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA= sha512-UR1khWeAjugW3548EfQmL9Z7pGMlBgXteQpr1IZeZBtnkCJQJIJ1Scj0mb9wQaPvUZ9Q17XqW6TIaPchJkyfqw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/undertaker/node_modules/fast-levenshtein": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz",
+      "integrity": "sha1-5qdUzI8V5YmHqpy9J69m/W9OWvk= sha512-Ia0sQNrMPXXkqVFt6w6M1n1oKo3NfKs+mvaV811Jwir7vAk9a6PVV9VPYf6X3BU97QiLEmuW3uXH9u87zDFfdw==",
+      "dev": true
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    },
+    "node_modules/union-value": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+      "dev": true,
+      "dependencies": {
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/union-value/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unique-stream": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
+      "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
+      "dev": true,
+      "dependencies": {
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "through2-filter": "^3.0.0"
+      }
+    },
+    "node_modules/universal-user-agent": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
+      "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==",
+      "dev": true
+    },
+    "node_modules/universalify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/unset-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk= sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==",
+      "dev": true,
+      "dependencies": {
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/has-value": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+      "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8= sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
+      "dev": true,
+      "dependencies": {
+        "get-value": "^2.0.3",
+        "has-values": "^0.1.4",
+        "isobject": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk= sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
+      "dev": true,
+      "dependencies": {
+        "isarray": "1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/has-values": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+      "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E= sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/upath": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
+      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
+      "dev": true,
+      "engines": {
+        "node": ">=4",
+        "yarn": "*"
+      }
+    },
+    "node_modules/update-browserslist-db": {
+      "version": "1.0.13",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
+      "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "dependencies": {
+        "escalade": "^3.1.1",
+        "picocolors": "^1.0.0"
+      },
+      "bin": {
+        "update-browserslist-db": "cli.js"
+      },
+      "peerDependencies": {
+        "browserslist": ">= 4.21.0"
+      }
+    },
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/uri-js/node_modules/punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==",
+      "deprecated": "Please see https://github.com/lydell/urix#deprecated",
+      "dev": true
+    },
+    "node_modules/url-parse": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+      "dev": true,
+      "dependencies": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "node_modules/use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/util": {
+      "version": "0.12.5",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
+      "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "is-arguments": "^1.0.4",
+        "is-generator-function": "^1.0.7",
+        "is-typed-array": "^1.1.3",
+        "which-typed-array": "^1.1.2"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+    },
+    "node_modules/uuid": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/v8-compile-cache-lib": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
+      "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
+      "dev": true
+    },
+    "node_modules/v8-inspect-profiler": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/v8-inspect-profiler/-/v8-inspect-profiler-0.1.1.tgz",
+      "integrity": "sha512-GB3X9w7w+y9v4gq85olmf/bM3F2hj2DjjwvVpDXIziW5JBy8cDcIQ/K7m8xJVDWiFemxRX2Dxoo1k6JDvLMTig==",
+      "dependencies": {
+        "chrome-remote-interface": "^0.33.0"
+      }
+    },
+    "node_modules/v8-to-istanbul": {
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.2.0.tgz",
+      "integrity": "sha512-/EH/sDgxU2eGxajKdwLCDmQ4FWq+kpi3uCmBGpw1xJtnAxEjlD8j8PEiGWpCIMIs3ciNAgH0d3TTJiUkYzyZjA==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.12",
+        "@types/istanbul-lib-coverage": "^2.0.1",
+        "convert-source-map": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.12.0"
+      }
+    },
+    "node_modules/v8-to-istanbul/node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true
+    },
+    "node_modules/v8flags": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
+      "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==",
+      "dev": true,
+      "dependencies": {
+        "homedir-polyfill": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
+      "dependencies": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "node_modules/value-or-function": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz",
+      "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM= sha512-jdBB2FrWvQC/pnPtIqcLsMaQgjhdb6B7tk1MMyTKapox+tQZbdRP4uLxu/JY0t7fbfDCUMnuelzEYv5GsxHhdg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/vinyl": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.0.tgz",
+      "integrity": "sha512-rC2VRfAVVCGEgjnxHUnpIVh3AGuk62rP3tqVrn+yab0YH7UULisC085+NYH+mnqf3Wx4SpSi1RQMwudL89N03g==",
+      "dev": true,
+      "dependencies": {
+        "clone": "^2.1.2",
+        "clone-stats": "^1.0.0",
+        "remove-trailing-separator": "^1.1.0",
+        "replace-ext": "^2.0.0",
+        "teex": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/vinyl-fs": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz",
+      "integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==",
+      "dev": true,
+      "dependencies": {
+        "fs-mkdirp-stream": "^1.0.0",
+        "glob-stream": "^6.1.0",
+        "graceful-fs": "^4.0.0",
+        "is-valid-glob": "^1.0.0",
+        "lazystream": "^1.0.0",
+        "lead": "^1.0.0",
+        "object.assign": "^4.0.4",
+        "pumpify": "^1.3.5",
+        "readable-stream": "^2.3.3",
+        "remove-bom-buffer": "^3.0.0",
+        "remove-bom-stream": "^1.2.0",
+        "resolve-options": "^1.1.0",
+        "through2": "^2.0.0",
+        "to-through": "^2.0.0",
+        "value-or-function": "^3.0.0",
+        "vinyl": "^2.0.0",
+        "vinyl-sourcemap": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/vinyl-fs/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/vinyl-fs/node_modules/replace-ext": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
+      "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/vinyl-fs/node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/vinyl-fs/node_modules/vinyl": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.1.0.tgz",
+      "integrity": "sha1-Ah+cLPlR1rk5lDyJ617lrdT9kkw= sha512-M5D/ZRG7KC3ETrV7iA/GNF/lznml4dZ7ggwtYbqM/B+0INyNTjCdFhw4TqMq//PtNbPpceE7wOqKqK5YfUThPA==",
+      "dev": true,
+      "dependencies": {
+        "clone": "^2.1.1",
+        "clone-buffer": "^1.0.0",
+        "clone-stats": "^1.0.0",
+        "cloneable-readable": "^1.0.0",
+        "remove-trailing-separator": "^1.0.1",
+        "replace-ext": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/vinyl-sourcemap": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz",
+      "integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY= sha512-NiibMgt6VJGJmyw7vtzhctDcfKch4e4n9TBeoWlirb7FMg9/1Ov9k+A5ZRAtywBpRPiyECvQRQllYM8dECegVA==",
+      "dev": true,
+      "dependencies": {
+        "append-buffer": "^1.0.2",
+        "convert-source-map": "^1.5.0",
+        "graceful-fs": "^4.1.6",
+        "normalize-path": "^2.1.1",
+        "now-and-later": "^2.0.0",
+        "remove-bom-buffer": "^3.0.0",
+        "vinyl": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/vinyl-sourcemap/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk= sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+      "dev": true,
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/vinyl-sourcemap/node_modules/replace-ext": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
+      "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/vinyl-sourcemap/node_modules/vinyl": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.1.0.tgz",
+      "integrity": "sha1-Ah+cLPlR1rk5lDyJ617lrdT9kkw= sha512-M5D/ZRG7KC3ETrV7iA/GNF/lznml4dZ7ggwtYbqM/B+0INyNTjCdFhw4TqMq//PtNbPpceE7wOqKqK5YfUThPA==",
+      "dev": true,
+      "dependencies": {
+        "clone": "^2.1.1",
+        "clone-buffer": "^1.0.0",
+        "clone-stats": "^1.0.0",
+        "cloneable-readable": "^1.0.0",
+        "remove-trailing-separator": "^1.0.1",
+        "replace-ext": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/vscode-oniguruma": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-1.7.0.tgz",
+      "integrity": "sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA=="
+    },
+    "node_modules/vscode-regexpp": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/vscode-regexpp/-/vscode-regexpp-3.1.0.tgz",
+      "integrity": "sha512-pqtN65VC1jRLawfluX4Y80MMG0DHJydWhe5ZwMHewZD6sys4LbU6lHwFAHxeuaVE6Y6+xZOtAw+9hvq7/0ejkg==",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      }
+    },
+    "node_modules/vscode-textmate": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-9.1.0.tgz",
+      "integrity": "sha512-lxKSVp2DkFOx9RDAvpiYUrB9/KT1fAfi1aE8CBGstP8N7rLF+Seifj8kDA198X0mYj1CjQUC+81+nQf8CO0nVA=="
+    },
+    "node_modules/vscode-uri": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz",
+      "integrity": "sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==",
+      "dev": true
+    },
+    "node_modules/watchpack": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.1.tgz",
+      "integrity": "sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==",
+      "dev": true,
+      "dependencies": {
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.1.2"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/web-tree-sitter": {
+      "version": "0.20.8",
+      "resolved": "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.20.8.tgz",
+      "integrity": "sha512-weOVgZ3aAARgdnb220GqYuh7+rZU0Ka9k9yfKtGAzEYMa6GgiCzW9JjQRJyCJakvibQW+dfjJdihjInKuuCAUQ==",
+      "dev": true
+    },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+      "dev": true
+    },
+    "node_modules/webpack": {
+      "version": "5.94.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz",
+      "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==",
+      "dev": true,
+      "dependencies": {
+        "@types/estree": "^1.0.5",
+        "@webassemblyjs/ast": "^1.12.1",
+        "@webassemblyjs/wasm-edit": "^1.12.1",
+        "@webassemblyjs/wasm-parser": "^1.12.1",
+        "acorn": "^8.7.1",
+        "acorn-import-attributes": "^1.9.5",
+        "browserslist": "^4.21.10",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^5.17.1",
+        "es-module-lexer": "^1.2.1",
+        "eslint-scope": "5.1.1",
+        "events": "^3.2.0",
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.2.11",
+        "json-parse-even-better-errors": "^2.3.1",
+        "loader-runner": "^4.2.0",
+        "mime-types": "^2.1.27",
+        "neo-async": "^2.6.2",
+        "schema-utils": "^3.2.0",
+        "tapable": "^2.1.1",
+        "terser-webpack-plugin": "^5.3.10",
+        "watchpack": "^2.4.1",
+        "webpack-sources": "^3.2.3"
+      },
+      "bin": {
+        "webpack": "bin/webpack.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependenciesMeta": {
+        "webpack-cli": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-cli": {
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.4.tgz",
+      "integrity": "sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==",
+      "dev": true,
+      "dependencies": {
+        "@discoveryjs/json-ext": "^0.5.0",
+        "@webpack-cli/configtest": "^2.1.1",
+        "@webpack-cli/info": "^2.0.2",
+        "@webpack-cli/serve": "^2.0.5",
+        "colorette": "^2.0.14",
+        "commander": "^10.0.1",
+        "cross-spawn": "^7.0.3",
+        "envinfo": "^7.7.3",
+        "fastest-levenshtein": "^1.0.12",
+        "import-local": "^3.0.2",
+        "interpret": "^3.1.1",
+        "rechoir": "^0.8.0",
+        "webpack-merge": "^5.7.3"
+      },
+      "bin": {
+        "webpack-cli": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "5.x.x"
+      },
+      "peerDependenciesMeta": {
+        "@webpack-cli/generators": {
+          "optional": true
+        },
+        "webpack-bundle-analyzer": {
+          "optional": true
+        },
+        "webpack-dev-server": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-cli/node_modules/commander": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
+      "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/webpack-cli/node_modules/interpret": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz",
+      "integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/webpack-cli/node_modules/rechoir": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz",
+      "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==",
+      "dev": true,
+      "dependencies": {
+        "resolve": "^1.20.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/webpack-merge": {
+      "version": "5.8.0",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz",
+      "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==",
+      "dev": true,
+      "dependencies": {
+        "clone-deep": "^4.0.1",
+        "wildcard": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/webpack-sources": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/webpack-stream": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/webpack-stream/-/webpack-stream-7.0.0.tgz",
+      "integrity": "sha512-XoAQTHyCaYMo6TS7Atv1HYhtmBgKiVLONJbzLBl2V3eibXQ2IT/MCRM841RW/r3vToKD5ivrTJFWgd/ghoxoRg==",
+      "dev": true,
+      "dependencies": {
+        "fancy-log": "^1.3.3",
+        "lodash.clone": "^4.3.2",
+        "lodash.some": "^4.2.2",
+        "memory-fs": "^0.5.0",
+        "plugin-error": "^1.0.1",
+        "supports-color": "^8.1.1",
+        "through": "^2.3.8",
+        "vinyl": "^2.2.1"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "peerDependencies": {
+        "webpack": "^5.21.2"
+      }
+    },
+    "node_modules/webpack-stream/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/webpack-stream/node_modules/replace-ext": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
+      "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/webpack-stream/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/webpack-stream/node_modules/vinyl": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
+      "integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==",
+      "dev": true,
+      "dependencies": {
+        "clone": "^2.1.1",
+        "clone-buffer": "^1.0.0",
+        "clone-stats": "^1.0.0",
+        "cloneable-readable": "^1.0.0",
+        "remove-trailing-separator": "^1.0.1",
+        "replace-ext": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/webpack/node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/webpack/node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/webpack/node_modules/schema-utils": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0= sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "dev": true,
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/which-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==",
+      "dev": true
+    },
+    "node_modules/which-typed-array": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
+      "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==",
+      "dev": true,
+      "dependencies": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/wildcard": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
+      "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
+      "dev": true
+    },
+    "node_modules/windows-foreground-love": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/windows-foreground-love/-/windows-foreground-love-0.5.0.tgz",
+      "integrity": "sha512-yjBwmKEmQBDk3Z7yg/U9hizGWat8C6Pe4MQWl5bN6mvPU81Bt6HV2k/6mGlK3ETJLW1hCLhYx2wcGh+ykUUCyA==",
+      "hasInstallScript": true,
+      "optional": true
+    },
+    "node_modules/word-wrap": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/workerpool": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz",
+      "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==",
+      "dev": true
+    },
+    "node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs": {
+      "name": "wrap-ansi",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/wrap-ansi/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+    },
+    "node_modules/xml": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz",
+      "integrity": "sha512-huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw==",
+      "dev": true
+    },
+    "node_modules/xml2js": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz",
+      "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==",
+      "dev": true,
+      "dependencies": {
+        "sax": ">=0.6.0",
+        "xmlbuilder": "~11.0.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/xml2js/node_modules/xmlbuilder": {
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
+    "node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yallist": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
+      "dev": true
+    },
+    "node_modules/yargs": {
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yargs-unparser": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
+      "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^6.0.0",
+        "decamelize": "^4.0.0",
+        "flat": "^5.0.2",
+        "is-plain-obj": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yargs-unparser/node_modules/is-plain-obj": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/yargs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/yargs/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/yaserver": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/yaserver/-/yaserver-0.4.0.tgz",
+      "integrity": "sha512-98Vj4sgqB1fLcpf2wK7h3dFCaabISHU9CXZHaAx3QLkvTTCD31MzMcNbw5V5jZFBK7ffkFqfWig6B20KQt4wtA==",
+      "dev": true,
+      "bin": {
+        "yaserver": "bin/yaserver"
+      }
+    },
+    "node_modules/yauzl": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.1.1.tgz",
+      "integrity": "sha512-MPxA7oN5cvGV0wzfkeHKF2/+Q4TkMpHSWGRy/96I4Cozljmx0ph91+Muxh6HegEtDC4GftJ8qYDE51vghFiEYA==",
+      "dependencies": {
+        "buffer-crc32": "~0.2.3",
+        "pend": "~1.2.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yazl": {
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.4.3.tgz",
+      "integrity": "sha1-7CblzIfVYBud+EMtvdPNLlFzoHE= sha512-cIUrm3/81iF/BzuyORI7ppz1vGHAhA62JYzAFFC+rwJ2jQF1LcYxY9UXx4XyUXojkCnol0SvPuc+Toc7FO4W8g==",
+      "dependencies": {
+        "buffer-crc32": "~0.2.3"
+      }
+    },
+    "node_modules/ylru": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ylru/-/ylru-1.2.1.tgz",
+      "integrity": "sha512-faQrqNMzcPCHGVC2aaOINk13K+aaBDUPjGWl0teOXywElLjyVAB6Oe2jj62jHYtwsU49jXhScYbvPENK+6zAvQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/yn": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
+      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    }
+  }
+}
diff --git a/package.json b/package.json
index c2a69f1ed6a..2bc50f10061 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
-  "version": "1.91.0",
-  "distro": "269c4ac603b4b3c0532b39a04bb0beb9eeb3d49b",
+  "version": "1.95.0",
+  "distro": "1f05cd9b265f2477905f0b7688a66cfb2c6061f5",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -12,31 +12,31 @@
     "test": "echo Please run any of the test scripts from the scripts folder.",
     "test-browser": "npx playwright install && node test/unit/browser/index.js",
     "test-browser-no-install": "node test/unit/browser/index.js",
-    "test-node": "mocha test/unit/node/index.js --delay --ui=tdd --timeout=5000 --exit",
+    "test-node": "mocha test/unit/node/index.mjs --delay --ui=tdd --timeout=5000 --exit",
     "test-extension": "vscode-test",
     "preinstall": "node build/npm/preinstall.js",
     "postinstall": "node build/npm/postinstall.js",
-    "compile": "node --max-old-space-size=4095 ./node_modules/gulp/bin/gulp.js compile",
+    "compile": "node ./node_modules/gulp/bin/gulp.js compile",
     "watch": "npm-run-all -lp watch-client watch-extensions",
-    "watchd": "deemon yarn watch",
-    "watch-webd": "deemon yarn watch-web",
-    "kill-watchd": "deemon --kill yarn watch",
-    "kill-watch-webd": "deemon --kill yarn watch-web",
-    "restart-watchd": "deemon --restart yarn watch",
-    "restart-watch-webd": "deemon --restart yarn watch-web",
-    "watch-client": "node --max-old-space-size=4095 ./node_modules/gulp/bin/gulp.js watch-client",
-    "watch-clientd": "deemon yarn watch-client",
-    "kill-watch-clientd": "deemon --kill yarn watch-client",
-    "watch-extensions": "node --max-old-space-size=4095 ./node_modules/gulp/bin/gulp.js watch-extensions watch-extension-media",
-    "watch-extensionsd": "deemon yarn watch-extensions",
-    "kill-watch-extensionsd": "deemon --kill yarn watch-extensions",
+    "watchd": "deemon npm run watch",
+    "watch-webd": "deemon npm run watch-web",
+    "kill-watchd": "deemon --kill npm run watch",
+    "kill-watch-webd": "deemon --kill npm run watch-web",
+    "restart-watchd": "deemon --restart npm run watch",
+    "restart-watch-webd": "deemon --restart npm run watch-web",
+    "watch-client": "node --max-old-space-size=8192 ./node_modules/gulp/bin/gulp.js watch-client",
+    "watch-clientd": "deemon npm run watch-client",
+    "kill-watch-clientd": "deemon --kill npm run watch-client",
+    "watch-extensions": "node --max-old-space-size=8192 ./node_modules/gulp/bin/gulp.js watch-extensions watch-extension-media",
+    "watch-extensionsd": "deemon npm run watch-extensions",
+    "kill-watch-extensionsd": "deemon --kill npm run watch-extensions",
     "precommit": "node build/hygiene.js",
     "gulp": "node --max-old-space-size=8192 ./node_modules/gulp/bin/gulp.js",
     "electron": "node build/lib/electron",
     "7z": "7z",
     "update-grammars": "node build/npm/update-all-grammars.mjs",
     "update-localization-extension": "node build/npm/update-localization-extension.js",
-    "smoketest": "node build/lib/preLaunch.js && cd test/smoke && yarn compile && node test/index.js",
+    "smoketest": "node build/lib/preLaunch.js && cd test/smoke && npm run compile && node test/index.js",
     "smoketest-no-compile": "cd test/smoke && node test/index.js",
     "download-builtin-extensions": "node build/lib/builtInExtensions.js",
     "download-builtin-extensions-cg": "node build/lib/builtInExtensionsCG.js",
@@ -45,26 +45,26 @@
     "vscode-dts-compile-check": "tsc -p src/tsconfig.vscode-dts.json && tsc -p src/tsconfig.vscode-proposed-dts.json",
     "valid-layers-check": "node build/lib/layersChecker.js",
     "update-distro": "node build/npm/update-distro.mjs",
-    "web": "echo 'yarn web' is replaced by './scripts/code-server' or './scripts/code-web'",
+    "web": "echo 'npm run web' is replaced by './scripts/code-server' or './scripts/code-web'",
     "compile-cli": "gulp compile-cli",
-    "compile-web": "node --max-old-space-size=4095 ./node_modules/gulp/bin/gulp.js compile-web",
-    "watch-web": "node --max-old-space-size=4095 ./node_modules/gulp/bin/gulp.js watch-web",
-    "watch-cli": "node --max-old-space-size=4095 ./node_modules/gulp/bin/gulp.js watch-cli",
+    "compile-web": "node ./node_modules/gulp/bin/gulp.js compile-web",
+    "watch-web": "node ./node_modules/gulp/bin/gulp.js watch-web",
+    "watch-cli": "node ./node_modules/gulp/bin/gulp.js watch-cli",
     "eslint": "node build/eslint",
     "stylelint": "node build/stylelint",
-    "playwright-install": "node build/azure-pipelines/common/installPlaywright.js",
-    "compile-build": "node --max-old-space-size=4095 ./node_modules/gulp/bin/gulp.js compile-build",
-    "compile-extensions-build": "node --max-old-space-size=4095 ./node_modules/gulp/bin/gulp.js compile-extensions-build",
-    "minify-vscode": "node --max-old-space-size=4095 ./node_modules/gulp/bin/gulp.js minify-vscode",
-    "minify-vscode-reh": "node --max-old-space-size=4095 ./node_modules/gulp/bin/gulp.js minify-vscode-reh",
-    "minify-vscode-reh-web": "node --max-old-space-size=4095 ./node_modules/gulp/bin/gulp.js minify-vscode-reh-web",
-    "hygiene": "node --max-old-space-size=4095 ./node_modules/gulp/bin/gulp.js hygiene",
-    "core-ci": "node --max-old-space-size=8095 ./node_modules/gulp/bin/gulp.js core-ci",
-    "core-ci-pr": "node --max-old-space-size=4095 ./node_modules/gulp/bin/gulp.js core-ci-pr",
-    "extensions-ci": "node --max-old-space-size=8095 ./node_modules/gulp/bin/gulp.js extensions-ci",
-    "extensions-ci-pr": "node --max-old-space-size=4095 ./node_modules/gulp/bin/gulp.js extensions-ci-pr",
+    "playwright-install": "npm exec playwright install",
+    "compile-build": "node ./node_modules/gulp/bin/gulp.js compile-build",
+    "compile-extensions-build": "node ./node_modules/gulp/bin/gulp.js compile-extensions-build",
+    "minify-vscode": "node ./node_modules/gulp/bin/gulp.js minify-vscode",
+    "minify-vscode-reh": "node ./node_modules/gulp/bin/gulp.js minify-vscode-reh",
+    "minify-vscode-reh-web": "node ./node_modules/gulp/bin/gulp.js minify-vscode-reh-web",
+    "hygiene": "node ./node_modules/gulp/bin/gulp.js hygiene",
+    "core-ci": "node ./node_modules/gulp/bin/gulp.js core-ci",
+    "core-ci-pr": "node ./node_modules/gulp/bin/gulp.js core-ci-pr",
+    "extensions-ci": "node ./node_modules/gulp/bin/gulp.js extensions-ci",
+    "extensions-ci-pr": "node ./node_modules/gulp/bin/gulp.js extensions-ci-pr",
     "perf": "node scripts/code-perf.js",
-    "update-build-ts-version": "yarn add typescript@next && tsc -p ./build/tsconfig.build.json"
+    "update-build-ts-version": "npm install typescript@next && tsc -p ./build/tsconfig.build.json"
   },
   "dependencies": {
     "@microsoft/1ds-core-js": "^3.2.13",
@@ -73,45 +73,48 @@
     "@vscode/deviceid": "^0.1.1",
     "@vscode/iconv-lite-umd": "0.7.0",
     "@vscode/policy-watcher": "^1.1.4",
-    "@vscode/proxy-agent": "^0.19.0",
+    "@vscode/proxy-agent": "^0.22.0",
     "@vscode/ripgrep": "^1.15.9",
     "@vscode/spdlog": "^0.15.0",
     "@vscode/sqlite3": "5.1.6-vscode",
     "@vscode/sudo-prompt": "9.3.1",
+    "@vscode/tree-sitter-wasm": "^0.0.4",
     "@vscode/vscode-languagedetection": "1.0.21",
     "@vscode/windows-mutex": "^0.5.0",
     "@vscode/windows-process-tree": "^0.6.0",
     "@vscode/windows-registry": "^1.1.0",
-    "@xterm/addon-clipboard": "0.2.0-beta.4",
-    "@xterm/addon-image": "0.9.0-beta.21",
-    "@xterm/addon-search": "0.16.0-beta.21",
-    "@xterm/addon-serialize": "0.14.0-beta.21",
-    "@xterm/addon-unicode11": "0.9.0-beta.21",
-    "@xterm/addon-webgl": "0.19.0-beta.21",
-    "@xterm/headless": "5.6.0-beta.21",
-    "@xterm/xterm": "5.6.0-beta.21",
+    "@xterm/addon-clipboard": "^0.2.0-beta.48",
+    "@xterm/addon-image": "^0.9.0-beta.65",
+    "@xterm/addon-search": "^0.16.0-beta.65",
+    "@xterm/addon-serialize": "^0.14.0-beta.65",
+    "@xterm/addon-unicode11": "^0.9.0-beta.65",
+    "@xterm/addon-webgl": "^0.19.0-beta.65",
+    "@xterm/headless": "^5.6.0-beta.65",
+    "@xterm/xterm": "^5.6.0-beta.65",
     "http-proxy-agent": "^7.0.0",
     "https-proxy-agent": "^7.0.2",
-    "jschardet": "3.1.2",
-    "kerberos": "^2.0.1",
+    "jschardet": "3.1.4",
+    "kerberos": "2.1.1",
     "minimist": "^1.2.6",
     "native-is-elevated": "0.7.0",
     "native-keymap": "^3.3.5",
     "native-watchdog": "^1.4.1",
-    "node-pty": "1.1.0-beta11",
+    "node-pty": "^1.1.0-beta22",
+    "open": "^8.4.2",
     "tas-client-umd": "0.2.0",
     "v8-inspect-profiler": "^0.1.1",
     "vscode-oniguruma": "1.7.0",
     "vscode-regexpp": "^3.1.0",
-    "vscode-textmate": "9.0.0",
+    "vscode-textmate": "9.1.0",
     "yauzl": "^3.0.0",
     "yazl": "^2.4.3"
   },
   "devDependencies": {
-    "@playwright/test": "^1.40.1",
+    "@playwright/test": "^1.46.1",
     "@swc/core": "1.3.62",
     "@types/cookie": "^0.3.3",
     "@types/debug": "^4.1.5",
+    "@types/eslint": "^8.56.10",
     "@types/gulp-svgmin": "^1.2.1",
     "@types/http-proxy-agent": "^2.0.1",
     "@types/kerberos": "^1.1.2",
@@ -135,10 +138,11 @@
     "@vscode/l10n-dev": "0.0.35",
     "@vscode/telemetry-extractor": "^1.10.2",
     "@vscode/test-cli": "^0.0.6",
-    "@vscode/test-electron": "^2.3.8",
-    "@vscode/test-web": "^0.0.50",
+    "@vscode/test-electron": "^2.4.0",
+    "@vscode/test-web": "^0.0.60",
     "@vscode/v8-heap-parser": "^0.1.0",
     "@vscode/vscode-perf": "^0.0.14",
+    "@webgpu/types": "^0.1.44",
     "ansi-colors": "^3.2.3",
     "asar": "^3.0.3",
     "chromium-pickle-js": "^0.2.0",
@@ -148,7 +152,7 @@
     "cssnano": "^6.0.3",
     "debounce": "^1.0.0",
     "deemon": "^1.8.0",
-    "electron": "29.4.0",
+    "electron": "30.5.1",
     "eslint": "8.36.0",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-jsdoc": "^46.5.0",
@@ -162,7 +166,6 @@
     "gulp-bom": "^3.0.0",
     "gulp-buffer": "0.0.2",
     "gulp-concat": "^2.6.1",
-    "gulp-eslint": "^5.0.0",
     "gulp-filter": "^5.1.0",
     "gulp-flatmap": "^1.0.2",
     "gulp-gunzip": "^1.0.0",
@@ -186,12 +189,12 @@
     "mime": "^1.4.1",
     "minimatch": "^3.0.4",
     "minimist": "^1.2.6",
-    "mkdirp": "^1.0.4",
     "mocha": "^10.2.0",
     "mocha-junit-reporter": "^2.2.1",
     "mocha-multi-reporters": "^1.5.1",
     "npm-run-all": "^4.1.5",
     "opn": "^6.0.0",
+    "os-browserify": "^0.3.0",
     "p-all": "^1.0.0",
     "path-browserify": "^1.0.1",
     "postcss": "^8.4.33",
@@ -207,16 +210,16 @@
     "ts-loader": "^9.4.2",
     "ts-node": "^10.9.1",
     "tsec": "0.2.7",
-    "typescript": "^5.5.0-dev.20240603",
+    "tslib": "^2.6.3",
+    "typescript": "^5.7.0-dev.20240927",
     "util": "^0.12.4",
-    "vscode-nls-dev": "^3.3.1",
-    "webpack": "^5.91.0",
+    "webpack": "^5.94.0",
     "webpack-cli": "^5.1.4",
     "webpack-stream": "^7.0.0",
     "xml2js": "^0.5.0",
     "yaserver": "^0.4.0"
   },
-  "resolutions": {
+  "overrides": {
     "node-gyp-build": "4.8.1"
   },
   "repository": {
@@ -229,4 +232,4 @@
   "optionalDependencies": {
     "windows-foreground-love": "0.5.0"
   }
-}
\ No newline at end of file
+}
diff --git a/product.json b/product.json
index d2d3bf7a361..5f64faba48b 100644
--- a/product.json
+++ b/product.json
@@ -34,8 +34,8 @@
 	"builtInExtensions": [
 		{
 			"name": "ms-vscode.js-debug-companion",
-			"version": "1.1.2",
-			"sha256": "e034b8b41beb4e97e02c70f7175bd88abe66048374c2bd629f54bb33354bc2aa",
+			"version": "1.1.3",
+			"sha256": "7380a890787452f14b2db7835dfa94de538caf358ebc263f9d46dd68ac52de93",
 			"repo": "https://github.com/microsoft/vscode-js-debug-companion",
 			"metadata": {
 				"id": "99cb0b7f-7354-4278-b8da-6cc79972169d",
@@ -50,8 +50,8 @@
 		},
 		{
 			"name": "ms-vscode.js-debug",
-			"version": "1.90.0",
-			"sha256": "1317dd7d1ac50641c1534a3e957ecbc94349f4fbd897acb916da11eea3208a66",
+			"version": "1.94.0",
+			"sha256": "439ee7d384999fb1726296801bfcad9dcc9bad6622ae54317fc51ef99e0b2552",
 			"repo": "https://github.com/microsoft/vscode-js-debug",
 			"metadata": {
 				"id": "25629058-ddac-4e17-abba-74678e126c5d",
@@ -66,8 +66,8 @@
 		},
 		{
 			"name": "ms-vscode.vscode-js-profile-table",
-			"version": "1.0.9",
-			"sha256": "3b62ee4276a2bbea3fe230f94b1d5edd915b05966090ea56f882e1e0ab53e1a6",
+			"version": "1.0.10",
+			"sha256": "7361748ddf9fd09d8a2ed1f2a2d7376a2cf9aae708692820b799708385c38e08",
 			"repo": "https://github.com/microsoft/vscode-js-profile-visualizer",
 			"metadata": {
 				"id": "7e52b41b-71ad-457b-ab7e-0620f1fc4feb",
diff --git a/remote/.npmrc b/remote/.npmrc
new file mode 100644
index 00000000000..d6905a0c0f9
--- /dev/null
+++ b/remote/.npmrc
@@ -0,0 +1,7 @@
+disturl="https://nodejs.org/dist"
+target="20.16.0"
+ms_build_id="289487"
+runtime="node"
+build_from_source="true"
+legacy-peer-deps="true"
+timeout=180000
diff --git a/remote/.yarnrc b/remote/.yarnrc
deleted file mode 100644
index 4c99388e889..00000000000
--- a/remote/.yarnrc
+++ /dev/null
@@ -1,5 +0,0 @@
-disturl "https://nodejs.org/dist"
-target "20.11.1"
-ms_build_id "275039"
-runtime "node"
-build_from_source "true"
diff --git a/remote/package-lock.json b/remote/package-lock.json
new file mode 100644
index 00000000000..34367ce686b
--- /dev/null
+++ b/remote/package-lock.json
@@ -0,0 +1,1120 @@
+{
+  "name": "vscode-reh",
+  "version": "0.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "vscode-reh",
+      "version": "0.0.0",
+      "dependencies": {
+        "@microsoft/1ds-core-js": "^3.2.13",
+        "@microsoft/1ds-post-js": "^3.2.13",
+        "@parcel/watcher": "2.1.0",
+        "@vscode/deviceid": "^0.1.1",
+        "@vscode/iconv-lite-umd": "0.7.0",
+        "@vscode/proxy-agent": "^0.22.0",
+        "@vscode/ripgrep": "^1.15.9",
+        "@vscode/spdlog": "^0.15.0",
+        "@vscode/tree-sitter-wasm": "^0.0.4",
+        "@vscode/vscode-languagedetection": "1.0.21",
+        "@vscode/windows-process-tree": "^0.6.0",
+        "@vscode/windows-registry": "^1.1.0",
+        "@xterm/addon-clipboard": "^0.2.0-beta.48",
+        "@xterm/addon-image": "^0.9.0-beta.65",
+        "@xterm/addon-search": "^0.16.0-beta.65",
+        "@xterm/addon-serialize": "^0.14.0-beta.65",
+        "@xterm/addon-unicode11": "^0.9.0-beta.65",
+        "@xterm/addon-webgl": "^0.19.0-beta.65",
+        "@xterm/headless": "^5.6.0-beta.65",
+        "@xterm/xterm": "^5.6.0-beta.65",
+        "cookie": "^0.4.0",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.2",
+        "jschardet": "3.1.4",
+        "kerberos": "2.1.1",
+        "minimist": "^1.2.6",
+        "native-watchdog": "^1.4.1",
+        "node-pty": "^1.1.0-beta22",
+        "tas-client-umd": "0.2.0",
+        "vscode-oniguruma": "1.7.0",
+        "vscode-regexpp": "^3.1.0",
+        "vscode-textmate": "9.1.0",
+        "yauzl": "^3.0.0",
+        "yazl": "^2.4.3"
+      }
+    },
+    "node_modules/@microsoft/1ds-core-js": {
+      "version": "3.2.13",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-3.2.13.tgz",
+      "integrity": "sha512-CluYTRWcEk0ObG5EWFNWhs87e2qchJUn0p2D21ZUa3PWojPZfPSBs4//WIE0MYV8Qg1Hdif2ZTwlM7TbYUjfAg==",
+      "dependencies": {
+        "@microsoft/applicationinsights-core-js": "2.8.15",
+        "@microsoft/applicationinsights-shims": "^2.0.2",
+        "@microsoft/dynamicproto-js": "^1.1.7"
+      }
+    },
+    "node_modules/@microsoft/1ds-post-js": {
+      "version": "3.2.13",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-3.2.13.tgz",
+      "integrity": "sha512-HgS574fdD19Bo2vPguyznL4eDw7Pcm1cVNpvbvBLWiW3x4e1FCQ3VMXChWnAxCae8Hb0XqlA2sz332ZobBavTA==",
+      "dependencies": {
+        "@microsoft/1ds-core-js": "3.2.13",
+        "@microsoft/applicationinsights-shims": "^2.0.2",
+        "@microsoft/dynamicproto-js": "^1.1.7"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-core-js": {
+      "version": "2.8.15",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.15.tgz",
+      "integrity": "sha512-yYAs9MyjGr2YijQdUSN9mVgT1ijI1FPMgcffpaPmYbHAVbQmF7bXudrBWHxmLzJlwl5rfep+Zgjli2e67lwUqQ==",
+      "dependencies": {
+        "@microsoft/applicationinsights-shims": "2.0.2",
+        "@microsoft/dynamicproto-js": "^1.1.9"
+      },
+      "peerDependencies": {
+        "tslib": "*"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-shims": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-2.0.2.tgz",
+      "integrity": "sha512-PoHEgsnmcqruLNHZ/amACqdJ6YYQpED0KSRe6J7gIJTtpZC1FfFU9b1fmDKDKtFoUSrPzEh1qzO3kmRZP0betg=="
+    },
+    "node_modules/@microsoft/dynamicproto-js": {
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.9.tgz",
+      "integrity": "sha512-n1VPsljTSkthsAFYdiWfC+DKzK2WwcRp83Y1YAqdX552BstvsDjft9YXppjUzp11BPsapDoO1LDgrDB0XVsfNQ=="
+    },
+    "node_modules/@parcel/watcher": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.1.0.tgz",
+      "integrity": "sha512-8s8yYjd19pDSsBpbkOHnT6Z2+UJSuLQx61pCFM0s5wSRvKCEMDjd/cHY3/GI1szHIWbpXpsJdg3V6ISGGx9xDw==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "is-glob": "^4.0.3",
+        "micromatch": "^4.0.5",
+        "node-addon-api": "^3.2.1",
+        "node-gyp-build": "^4.3.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@tootallnate/once": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-3.0.0.tgz",
+      "integrity": "sha512-OAdBVB7rlwvLD+DiecSAyVKzKVmSfXbouCyM5I6wHGi4MGXIyFqErg1IvyJ7PI1e+GYZuZh7cCHV/c4LA8SKMw==",
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@vscode/deviceid": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@vscode/deviceid/-/deviceid-0.1.1.tgz",
+      "integrity": "sha512-ErpoMeKKNYAkR1IT3zxB5RtiTqEECdh8fxggupWvzuxpTAX77hwOI2NdJ7um+vupnXRBZVx4ugo0+dVHJWUkag==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "fs-extra": "^11.2.0",
+        "uuid": "^9.0.1"
+      }
+    },
+    "node_modules/@vscode/iconv-lite-umd": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz",
+      "integrity": "sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg=="
+    },
+    "node_modules/@vscode/proxy-agent": {
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.22.0.tgz",
+      "integrity": "sha512-TQrv456pbrjmD6G+iOoXE1Mflm+8Ic/Kny4QU7ioiYe2+0HisvqzJM/CUa3Am5SWrNjMbntTHISjgmSaSlorrA==",
+      "dependencies": {
+        "@tootallnate/once": "^3.0.0",
+        "agent-base": "^7.0.1",
+        "debug": "^4.3.4",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.2",
+        "socks-proxy-agent": "^8.0.1"
+      },
+      "optionalDependencies": {
+        "@vscode/windows-ca-certs": "^0.3.1"
+      }
+    },
+    "node_modules/@vscode/ripgrep": {
+      "version": "1.15.9",
+      "resolved": "https://registry.npmjs.org/@vscode/ripgrep/-/ripgrep-1.15.9.tgz",
+      "integrity": "sha512-4q2PXRvUvr3bF+LsfrifmUZgSPmCNcUZo6SbEAZgArIChchkezaxLoIeQMJe/z3CCKStvaVKpBXLxN3Z8lQjFQ==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "https-proxy-agent": "^7.0.2",
+        "proxy-from-env": "^1.1.0",
+        "yauzl": "^2.9.2"
+      }
+    },
+    "node_modules/@vscode/ripgrep/node_modules/yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
+      "dependencies": {
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.1.0"
+      }
+    },
+    "node_modules/@vscode/spdlog": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/@vscode/spdlog/-/spdlog-0.15.0.tgz",
+      "integrity": "sha512-5UFcQXM/G6bTRF49zJJJH3A3+47nxaXuKzT26vhTXVIiMFoV1oI9559mWOzapLEmvrntAdYtjE7Jh74lSAuMcA==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "bindings": "^1.5.0",
+        "mkdirp": "^1.0.4",
+        "node-addon-api": "7.1.0"
+      }
+    },
+    "node_modules/@vscode/spdlog/node_modules/node-addon-api": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.0.tgz",
+      "integrity": "sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==",
+      "engines": {
+        "node": "^16 || ^18 || >= 20"
+      }
+    },
+    "node_modules/@vscode/tree-sitter-wasm": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/@vscode/tree-sitter-wasm/-/tree-sitter-wasm-0.0.4.tgz",
+      "integrity": "sha512-vOONG3Zxsh1I4JOA48WdQ5KiXjJAdfMvYTuHbW7b27tGtRqsPLY5WZyTwLXc5uujKHyhG3LJXE9poxRZSxTIiA=="
+    },
+    "node_modules/@vscode/vscode-languagedetection": {
+      "version": "1.0.21",
+      "resolved": "https://registry.npmjs.org/@vscode/vscode-languagedetection/-/vscode-languagedetection-1.0.21.tgz",
+      "integrity": "sha512-zSUH9HYCw5qsCtd7b31yqkpaCU6jhtkKLkvOOA8yTrIRfBSOFb8PPhgmMicD7B/m+t4PwOJXzU1XDtrM9Fd3/g==",
+      "bin": {
+        "vscode-languagedetection": "cli/index.js"
+      }
+    },
+    "node_modules/@vscode/windows-ca-certs": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@vscode/windows-ca-certs/-/windows-ca-certs-0.3.1.tgz",
+      "integrity": "sha512-1B6hZAsqg125wuMsXiKIFkBgKx/J7YR4RT/ccYGkWAToPU9MVa40PRe+evLFUmLPH6NmPohEPlCzZLbqgvHCcQ==",
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "dependencies": {
+        "node-addon-api": "^3.0.2"
+      }
+    },
+    "node_modules/@vscode/windows-process-tree": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/@vscode/windows-process-tree/-/windows-process-tree-0.6.0.tgz",
+      "integrity": "sha512-7/DjBKKUtlmKNiAet2GRbdvfjgMKmfBeWVClIgONv8aqxGnaKca5N85eIDxh6rLMy2hKvFqIIsqgxs1Q26TWwg==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "node-addon-api": "7.1.0"
+      }
+    },
+    "node_modules/@vscode/windows-process-tree/node_modules/node-addon-api": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.0.tgz",
+      "integrity": "sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==",
+      "engines": {
+        "node": "^16 || ^18 || >= 20"
+      }
+    },
+    "node_modules/@vscode/windows-registry": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@vscode/windows-registry/-/windows-registry-1.1.0.tgz",
+      "integrity": "sha512-5AZzuWJpGscyiMOed0IuyEwt6iKmV5Us7zuwCDCFYMIq7tsvooO9BUiciywsvuthGz6UG4LSpeDeCxvgMVhnIw==",
+      "hasInstallScript": true
+    },
+    "node_modules/@xterm/addon-clipboard": {
+      "version": "0.2.0-beta.48",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.48.tgz",
+      "integrity": "sha512-oTrGoGMOQaW7PINAShhNR3duV8l2No/DbJ9rtfSBjfoQ9clWe0K+4fUHdJIuzW65AZsiLo9oh5IbHLWxlFP3Jg==",
+      "dependencies": {
+        "js-base64": "^3.7.5"
+      },
+      "peerDependencies": {
+        "@xterm/xterm": "^5.6.0-beta.65"
+      }
+    },
+    "node_modules/@xterm/addon-image": {
+      "version": "0.9.0-beta.65",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.9.0-beta.65.tgz",
+      "integrity": "sha512-Ud5FI5cGtpbz8yYCHC4QINlbC1K04Mex1JD5oAWPFwjlOz/Si/DhqbY1QBDl6QrUmSUUTZc5DKT3v3nN5WbZxQ==",
+      "peerDependencies": {
+        "@xterm/xterm": "^5.6.0-beta.65"
+      }
+    },
+    "node_modules/@xterm/addon-search": {
+      "version": "0.16.0-beta.65",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.16.0-beta.65.tgz",
+      "integrity": "sha512-eHfbbgFCS3AcD8YSvGFIkW9NW4pfGHrtRDWIojM/zqmyi3JaCmHUgZmlxbaANwBlgLiNpJLDq7cmoz//86NgGw==",
+      "peerDependencies": {
+        "@xterm/xterm": "^5.6.0-beta.65"
+      }
+    },
+    "node_modules/@xterm/addon-serialize": {
+      "version": "0.14.0-beta.65",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.65.tgz",
+      "integrity": "sha512-NlvXVtFAHpLKEDzd+6/68yPFQ4Oe02jvQH6+a8p+gcxbSEyYj1l0sqqeABQ3gC5QDCmQepk6BQVB8Rpz/e4HgQ==",
+      "peerDependencies": {
+        "@xterm/xterm": "^5.6.0-beta.65"
+      }
+    },
+    "node_modules/@xterm/addon-unicode11": {
+      "version": "0.9.0-beta.65",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.65.tgz",
+      "integrity": "sha512-sH9mu2GEIVuc6cs6HxsmCXn6KKzCa5D+Zyl1Pt9d2S4FKqSB17Fc4mVukCOMW7wUR9UChKTbxmByGJK+4xwdCA==",
+      "peerDependencies": {
+        "@xterm/xterm": "^5.6.0-beta.65"
+      }
+    },
+    "node_modules/@xterm/addon-webgl": {
+      "version": "0.19.0-beta.65",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.65.tgz",
+      "integrity": "sha512-gPwP8ozqrLFWOlo9eh2I+acxq0Z6obG7GpL8HpJ+B+q6+vjfxoXHQ6vV04W90aoAvbLpScHcT/JtXA58GcH2vw==",
+      "peerDependencies": {
+        "@xterm/xterm": "^5.6.0-beta.65"
+      }
+    },
+    "node_modules/@xterm/headless": {
+      "version": "5.6.0-beta.65",
+      "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-5.6.0-beta.65.tgz",
+      "integrity": "sha512-gQICZsBkFHQEb/K+dc+KN4u5aBwrDPgai0S7W8/KT7fqTPWz8Cgjq119WQLshnzfLeMMFPYGttNHFGUbpp/wmw=="
+    },
+    "node_modules/@xterm/xterm": {
+      "version": "5.6.0-beta.65",
+      "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.6.0-beta.65.tgz",
+      "integrity": "sha512-o6IIg4hqs994gtSQMbzQM6OUeLIXPG6RUxjoref0KJX4PIa/BqQjwQLPuSxnjOFeRQIvhZ2mSAPfGWJQ6jEGAg=="
+    },
+    "node_modules/agent-base": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
+      "dependencies": {
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "dependencies": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
+    "node_modules/bl": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "dependencies": {
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "dependencies": {
+        "fill-range": "^7.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
+    "node_modules/buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
+    },
+    "node_modules/cookie": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
+      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/decompress-response": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
+      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
+      "dependencies": {
+        "mimic-response": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/deep-extend": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/detect-libc": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
+      "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dependencies": {
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/expand-template": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
+      "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/fd-slicer": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4= sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
+      "dependencies": {
+        "pend": "~1.2.0"
+      }
+    },
+    "node_modules/file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="
+    },
+    "node_modules/fill-range": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/fs-constants": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
+    },
+    "node_modules/fs-extra": {
+      "version": "11.2.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=14.14"
+      }
+    },
+    "node_modules/github-from-package": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
+      "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw=="
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
+    },
+    "node_modules/http-proxy-agent": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz",
+      "integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==",
+      "dependencies": {
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/https-proxy-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==",
+      "dependencies": {
+        "agent-base": "^7.0.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "node_modules/ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
+    },
+    "node_modules/ip-address": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
+      "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
+      "dependencies": {
+        "jsbn": "1.1.0",
+        "sprintf-js": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/js-base64": {
+      "version": "3.7.7",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-3.7.7.tgz",
+      "integrity": "sha512-7rCnleh0z2CkXhH67J8K1Ytz0b2Y+yxTPL+/KOJoa20hfnVQ/3/T6W/KflYI4bRHRagNeXeU2bkNGI3v1oS/lw=="
+    },
+    "node_modules/jsbn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
+      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="
+    },
+    "node_modules/jschardet": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-3.1.4.tgz",
+      "integrity": "sha512-/kmVISmrwVwtyYU40iQUOp3SUPk2dhNCMsZBQX0R1/jZ8maaXJ/oZIzUOiyOqcgtLnETFKYChbJ5iDC/eWmFHg==",
+      "license": "LGPL-2.1+",
+      "engines": {
+        "node": ">=0.1.90"
+      }
+    },
+    "node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/kerberos": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/kerberos/-/kerberos-2.1.1.tgz",
+      "integrity": "sha512-414s1G/qgK2T60cXnZsHbtRj8Ynjg0DBlQWeY99tkyqQ2e8vGgFHvxRdvjTlLHg/SxBA0zLQcGE6Pk6Dfq/BCA==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "bindings": "^1.5.0",
+        "node-addon-api": "^6.1.0",
+        "prebuild-install": "^7.1.2"
+      },
+      "engines": {
+        "node": ">=12.9.0"
+      }
+    },
+    "node_modules/kerberos/node_modules/node-addon-api": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz",
+      "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA=="
+    },
+    "node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "dependencies": {
+        "braces": "^3.0.3",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/mimic-response": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
+      "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
+    },
+    "node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/mkdirp-classic": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
+    },
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "node_modules/napi-build-utils": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
+      "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="
+    },
+    "node_modules/native-watchdog": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/native-watchdog/-/native-watchdog-1.4.2.tgz",
+      "integrity": "sha512-iT3Uj6FFdrW5vHbQ/ybiznLus9oiUoMJ8A8nyugXv9rV3EBhIodmGs+mztrwQyyBc+PB5/CrskAH/WxaUVRRSQ==",
+      "hasInstallScript": true
+    },
+    "node_modules/node-abi": {
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.8.0.tgz",
+      "integrity": "sha512-tzua9qWWi7iW4I42vUPKM+SfaF0vQSLAm4yO5J83mSwB7GeoWrDKC/K+8YCnYNwqP5duwazbw2X9l4m8SC2cUw==",
+      "dependencies": {
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/node-addon-api": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
+      "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="
+    },
+    "node_modules/node-gyp-build": {
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.1.tgz",
+      "integrity": "sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw==",
+      "bin": {
+        "node-gyp-build": "bin.js",
+        "node-gyp-build-optional": "optional.js",
+        "node-gyp-build-test": "build-test.js"
+      }
+    },
+    "node_modules/node-pty": {
+      "version": "1.1.0-beta22",
+      "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.1.0-beta22.tgz",
+      "integrity": "sha512-CpT334H2oAIULlENvd9U+VBW4ZL+G3clOnpXYzUIurlPCLnl/9xen/KDHBLRcwhZuWcHxIrsCxR1TDCdVDtr0w==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "node-addon-api": "^7.1.0"
+      }
+    },
+    "node_modules/node-pty/node_modules/node-addon-api": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.0.tgz",
+      "integrity": "sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==",
+      "engines": {
+        "node": "^16 || ^18 || >= 20"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E= sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA= sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/prebuild-install": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.2.tgz",
+      "integrity": "sha512-UnNke3IQb6sgarcZIDU3gbMeTp/9SSU1DAIkil7PrqG1vZlBtY5msYccSKSHDqa3hNg436IXK+SNImReuA1wEQ==",
+      "dependencies": {
+        "detect-libc": "^2.0.0",
+        "expand-template": "^2.0.3",
+        "github-from-package": "0.0.0",
+        "minimist": "^1.2.3",
+        "mkdirp-classic": "^0.5.3",
+        "napi-build-utils": "^1.0.1",
+        "node-abi": "^3.3.0",
+        "pump": "^3.0.0",
+        "rc": "^1.2.7",
+        "simple-get": "^4.0.0",
+        "tar-fs": "^2.0.0",
+        "tunnel-agent": "^0.6.0"
+      },
+      "bin": {
+        "prebuild-install": "bin.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
+    },
+    "node_modules/pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "node_modules/rc": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+      "dependencies": {
+        "deep-extend": "^0.6.0",
+        "ini": "~1.3.0",
+        "minimist": "^1.2.0",
+        "strip-json-comments": "~2.0.1"
+      },
+      "bin": {
+        "rc": "cli.js"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/semver": {
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/simple-concat": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
+      "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/simple-get": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz",
+      "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "decompress-response": "^6.0.0",
+        "once": "^1.3.1",
+        "simple-concat": "^1.0.0"
+      }
+    },
+    "node_modules/smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
+      "engines": {
+        "node": ">= 6.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
+      "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==",
+      "dependencies": {
+        "ip-address": "^9.0.5",
+        "smart-buffer": "^4.2.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks-proxy-agent": {
+      "version": "8.0.4",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz",
+      "integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==",
+      "dependencies": {
+        "agent-base": "^7.1.1",
+        "debug": "^4.3.4",
+        "socks": "^2.8.3"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="
+    },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo= sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/tar-fs": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
+      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+      "dependencies": {
+        "chownr": "^1.1.1",
+        "mkdirp-classic": "^0.5.2",
+        "pump": "^3.0.0",
+        "tar-stream": "^2.1.4"
+      }
+    },
+    "node_modules/tar-stream": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "dependencies": {
+        "bl": "^4.0.3",
+        "end-of-stream": "^1.4.1",
+        "fs-constants": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tas-client-umd": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/tas-client-umd/-/tas-client-umd-0.2.0.tgz",
+      "integrity": "sha512-oezN7mJVm5qZDVEby7OzxCLKUpUN5of0rY4dvOWaDF2JZBlGpd3BXceFN8B53qlTaIkVSzP65aAMT0Vc+/N25Q=="
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
+      "dependencies": {
+        "safe-buffer": "^5.0.1"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/universalify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+    },
+    "node_modules/uuid": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/vscode-oniguruma": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-1.7.0.tgz",
+      "integrity": "sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA=="
+    },
+    "node_modules/vscode-regexpp": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/vscode-regexpp/-/vscode-regexpp-3.1.0.tgz",
+      "integrity": "sha512-pqtN65VC1jRLawfluX4Y80MMG0DHJydWhe5ZwMHewZD6sys4LbU6lHwFAHxeuaVE6Y6+xZOtAw+9hvq7/0ejkg==",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      }
+    },
+    "node_modules/vscode-textmate": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-9.1.0.tgz",
+      "integrity": "sha512-lxKSVp2DkFOx9RDAvpiYUrB9/KT1fAfi1aE8CBGstP8N7rLF+Seifj8kDA198X0mYj1CjQUC+81+nQf8CO0nVA=="
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+    },
+    "node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
+    "node_modules/yauzl": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.1.1.tgz",
+      "integrity": "sha512-MPxA7oN5cvGV0wzfkeHKF2/+Q4TkMpHSWGRy/96I4Cozljmx0ph91+Muxh6HegEtDC4GftJ8qYDE51vghFiEYA==",
+      "dependencies": {
+        "buffer-crc32": "~0.2.3",
+        "pend": "~1.2.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yazl": {
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.4.3.tgz",
+      "integrity": "sha1-7CblzIfVYBud+EMtvdPNLlFzoHE= sha512-cIUrm3/81iF/BzuyORI7ppz1vGHAhA62JYzAFFC+rwJ2jQF1LcYxY9UXx4XyUXojkCnol0SvPuc+Toc7FO4W8g==",
+      "dependencies": {
+        "buffer-crc32": "~0.2.3"
+      }
+    }
+  }
+}
diff --git a/remote/package.json b/remote/package.json
index d3baa324376..1c0d780abd8 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -8,36 +8,37 @@
     "@parcel/watcher": "2.1.0",
     "@vscode/deviceid": "^0.1.1",
     "@vscode/iconv-lite-umd": "0.7.0",
-    "@vscode/proxy-agent": "^0.19.0",
+    "@vscode/proxy-agent": "^0.22.0",
     "@vscode/ripgrep": "^1.15.9",
     "@vscode/spdlog": "^0.15.0",
+    "@vscode/tree-sitter-wasm": "^0.0.4",
     "@vscode/vscode-languagedetection": "1.0.21",
     "@vscode/windows-process-tree": "^0.6.0",
     "@vscode/windows-registry": "^1.1.0",
-    "@xterm/addon-clipboard": "0.2.0-beta.4",
-    "@xterm/addon-image": "0.9.0-beta.21",
-    "@xterm/addon-search": "0.16.0-beta.21",
-    "@xterm/addon-serialize": "0.14.0-beta.21",
-    "@xterm/addon-unicode11": "0.9.0-beta.21",
-    "@xterm/addon-webgl": "0.19.0-beta.21",
-    "@xterm/headless": "5.6.0-beta.21",
-    "@xterm/xterm": "5.6.0-beta.21",
+    "@xterm/addon-clipboard": "^0.2.0-beta.48",
+    "@xterm/addon-image": "^0.9.0-beta.65",
+    "@xterm/addon-search": "^0.16.0-beta.65",
+    "@xterm/addon-serialize": "^0.14.0-beta.65",
+    "@xterm/addon-unicode11": "^0.9.0-beta.65",
+    "@xterm/addon-webgl": "^0.19.0-beta.65",
+    "@xterm/headless": "^5.6.0-beta.65",
+    "@xterm/xterm": "^5.6.0-beta.65",
     "cookie": "^0.4.0",
     "http-proxy-agent": "^7.0.0",
     "https-proxy-agent": "^7.0.2",
-    "jschardet": "3.1.2",
-    "kerberos": "^2.0.1",
+    "jschardet": "3.1.4",
+    "kerberos": "2.1.1",
     "minimist": "^1.2.6",
     "native-watchdog": "^1.4.1",
-    "node-pty": "1.1.0-beta11",
+    "node-pty": "^1.1.0-beta22",
     "tas-client-umd": "0.2.0",
     "vscode-oniguruma": "1.7.0",
     "vscode-regexpp": "^3.1.0",
-    "vscode-textmate": "9.0.0",
+    "vscode-textmate": "9.1.0",
     "yauzl": "^3.0.0",
     "yazl": "^2.4.3"
   },
-  "resolutions": {
+  "overrides": {
     "node-gyp-build": "4.8.1"
   }
 }
diff --git a/remote/web/.npmrc b/remote/web/.npmrc
new file mode 100644
index 00000000000..a9c57709666
--- /dev/null
+++ b/remote/web/.npmrc
@@ -0,0 +1,2 @@
+legacy-peer-deps="true"
+timeout=180000
diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
new file mode 100644
index 00000000000..41bf9446996
--- /dev/null
+++ b/remote/web/package-lock.json
@@ -0,0 +1,175 @@
+{
+	"name": "vscode-web",
+	"version": "0.0.0",
+	"lockfileVersion": 3,
+	"requires": true,
+	"packages": {
+		"": {
+			"name": "vscode-web",
+			"version": "0.0.0",
+			"dependencies": {
+				"@microsoft/1ds-core-js": "^3.2.13",
+				"@microsoft/1ds-post-js": "^3.2.13",
+				"@vscode/iconv-lite-umd": "0.7.0",
+				"@vscode/tree-sitter-wasm": "^0.0.4",
+				"@vscode/vscode-languagedetection": "1.0.21",
+				"@xterm/addon-clipboard": "^0.2.0-beta.48",
+				"@xterm/addon-image": "^0.9.0-beta.65",
+				"@xterm/addon-search": "^0.16.0-beta.65",
+				"@xterm/addon-serialize": "^0.14.0-beta.65",
+				"@xterm/addon-unicode11": "^0.9.0-beta.65",
+				"@xterm/addon-webgl": "^0.19.0-beta.65",
+				"@xterm/xterm": "^5.6.0-beta.65",
+				"jschardet": "3.1.4",
+				"tas-client-umd": "0.2.0",
+				"vscode-oniguruma": "1.7.0",
+				"vscode-textmate": "9.1.0"
+			}
+		},
+		"node_modules/@microsoft/1ds-core-js": {
+			"version": "3.2.13",
+			"resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-3.2.13.tgz",
+			"integrity": "sha512-CluYTRWcEk0ObG5EWFNWhs87e2qchJUn0p2D21ZUa3PWojPZfPSBs4//WIE0MYV8Qg1Hdif2ZTwlM7TbYUjfAg==",
+			"dependencies": {
+				"@microsoft/applicationinsights-core-js": "2.8.15",
+				"@microsoft/applicationinsights-shims": "^2.0.2",
+				"@microsoft/dynamicproto-js": "^1.1.7"
+			}
+		},
+		"node_modules/@microsoft/1ds-post-js": {
+			"version": "3.2.13",
+			"resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-3.2.13.tgz",
+			"integrity": "sha512-HgS574fdD19Bo2vPguyznL4eDw7Pcm1cVNpvbvBLWiW3x4e1FCQ3VMXChWnAxCae8Hb0XqlA2sz332ZobBavTA==",
+			"dependencies": {
+				"@microsoft/1ds-core-js": "3.2.13",
+				"@microsoft/applicationinsights-shims": "^2.0.2",
+				"@microsoft/dynamicproto-js": "^1.1.7"
+			}
+		},
+		"node_modules/@microsoft/applicationinsights-core-js": {
+			"version": "2.8.15",
+			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.15.tgz",
+			"integrity": "sha512-yYAs9MyjGr2YijQdUSN9mVgT1ijI1FPMgcffpaPmYbHAVbQmF7bXudrBWHxmLzJlwl5rfep+Zgjli2e67lwUqQ==",
+			"dependencies": {
+				"@microsoft/applicationinsights-shims": "2.0.2",
+				"@microsoft/dynamicproto-js": "^1.1.9"
+			},
+			"peerDependencies": {
+				"tslib": "*"
+			}
+		},
+		"node_modules/@microsoft/applicationinsights-shims": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-2.0.2.tgz",
+			"integrity": "sha512-PoHEgsnmcqruLNHZ/amACqdJ6YYQpED0KSRe6J7gIJTtpZC1FfFU9b1fmDKDKtFoUSrPzEh1qzO3kmRZP0betg=="
+		},
+		"node_modules/@microsoft/dynamicproto-js": {
+			"version": "1.1.9",
+			"resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.9.tgz",
+			"integrity": "sha512-n1VPsljTSkthsAFYdiWfC+DKzK2WwcRp83Y1YAqdX552BstvsDjft9YXppjUzp11BPsapDoO1LDgrDB0XVsfNQ=="
+		},
+		"node_modules/@vscode/iconv-lite-umd": {
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz",
+			"integrity": "sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg=="
+		},
+		"node_modules/@vscode/tree-sitter-wasm": {
+			"version": "0.0.4",
+			"resolved": "https://registry.npmjs.org/@vscode/tree-sitter-wasm/-/tree-sitter-wasm-0.0.4.tgz",
+			"integrity": "sha512-vOONG3Zxsh1I4JOA48WdQ5KiXjJAdfMvYTuHbW7b27tGtRqsPLY5WZyTwLXc5uujKHyhG3LJXE9poxRZSxTIiA=="
+		},
+		"node_modules/@vscode/vscode-languagedetection": {
+			"version": "1.0.21",
+			"resolved": "https://registry.npmjs.org/@vscode/vscode-languagedetection/-/vscode-languagedetection-1.0.21.tgz",
+			"integrity": "sha512-zSUH9HYCw5qsCtd7b31yqkpaCU6jhtkKLkvOOA8yTrIRfBSOFb8PPhgmMicD7B/m+t4PwOJXzU1XDtrM9Fd3/g==",
+			"bin": {
+				"vscode-languagedetection": "cli/index.js"
+			}
+		},
+		"node_modules/@xterm/addon-clipboard": {
+			"version": "0.2.0-beta.48",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.48.tgz",
+			"integrity": "sha512-oTrGoGMOQaW7PINAShhNR3duV8l2No/DbJ9rtfSBjfoQ9clWe0K+4fUHdJIuzW65AZsiLo9oh5IbHLWxlFP3Jg==",
+			"dependencies": {
+				"js-base64": "^3.7.5"
+			},
+			"peerDependencies": {
+				"@xterm/xterm": "^5.6.0-beta.65"
+			}
+		},
+		"node_modules/@xterm/addon-image": {
+			"version": "0.9.0-beta.65",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.9.0-beta.65.tgz",
+			"integrity": "sha512-Ud5FI5cGtpbz8yYCHC4QINlbC1K04Mex1JD5oAWPFwjlOz/Si/DhqbY1QBDl6QrUmSUUTZc5DKT3v3nN5WbZxQ==",
+			"peerDependencies": {
+				"@xterm/xterm": "^5.6.0-beta.65"
+			}
+		},
+		"node_modules/@xterm/addon-search": {
+			"version": "0.16.0-beta.65",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.16.0-beta.65.tgz",
+			"integrity": "sha512-eHfbbgFCS3AcD8YSvGFIkW9NW4pfGHrtRDWIojM/zqmyi3JaCmHUgZmlxbaANwBlgLiNpJLDq7cmoz//86NgGw==",
+			"peerDependencies": {
+				"@xterm/xterm": "^5.6.0-beta.65"
+			}
+		},
+		"node_modules/@xterm/addon-serialize": {
+			"version": "0.14.0-beta.65",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.65.tgz",
+			"integrity": "sha512-NlvXVtFAHpLKEDzd+6/68yPFQ4Oe02jvQH6+a8p+gcxbSEyYj1l0sqqeABQ3gC5QDCmQepk6BQVB8Rpz/e4HgQ==",
+			"peerDependencies": {
+				"@xterm/xterm": "^5.6.0-beta.65"
+			}
+		},
+		"node_modules/@xterm/addon-unicode11": {
+			"version": "0.9.0-beta.65",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.65.tgz",
+			"integrity": "sha512-sH9mu2GEIVuc6cs6HxsmCXn6KKzCa5D+Zyl1Pt9d2S4FKqSB17Fc4mVukCOMW7wUR9UChKTbxmByGJK+4xwdCA==",
+			"peerDependencies": {
+				"@xterm/xterm": "^5.6.0-beta.65"
+			}
+		},
+		"node_modules/@xterm/addon-webgl": {
+			"version": "0.19.0-beta.65",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.65.tgz",
+			"integrity": "sha512-gPwP8ozqrLFWOlo9eh2I+acxq0Z6obG7GpL8HpJ+B+q6+vjfxoXHQ6vV04W90aoAvbLpScHcT/JtXA58GcH2vw==",
+			"peerDependencies": {
+				"@xterm/xterm": "^5.6.0-beta.65"
+			}
+		},
+		"node_modules/@xterm/xterm": {
+			"version": "5.6.0-beta.65",
+			"resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.6.0-beta.65.tgz",
+			"integrity": "sha512-o6IIg4hqs994gtSQMbzQM6OUeLIXPG6RUxjoref0KJX4PIa/BqQjwQLPuSxnjOFeRQIvhZ2mSAPfGWJQ6jEGAg=="
+		},
+		"node_modules/js-base64": {
+			"version": "3.7.7",
+			"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-3.7.7.tgz",
+			"integrity": "sha512-7rCnleh0z2CkXhH67J8K1Ytz0b2Y+yxTPL+/KOJoa20hfnVQ/3/T6W/KflYI4bRHRagNeXeU2bkNGI3v1oS/lw=="
+		},
+		"node_modules/jschardet": {
+			"version": "3.1.4",
+			"resolved": "https://registry.npmjs.org/jschardet/-/jschardet-3.1.4.tgz",
+			"integrity": "sha512-/kmVISmrwVwtyYU40iQUOp3SUPk2dhNCMsZBQX0R1/jZ8maaXJ/oZIzUOiyOqcgtLnETFKYChbJ5iDC/eWmFHg==",
+			"license": "LGPL-2.1+",
+			"engines": {
+				"node": ">=0.1.90"
+			}
+		},
+		"node_modules/tas-client-umd": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/tas-client-umd/-/tas-client-umd-0.2.0.tgz",
+			"integrity": "sha512-oezN7mJVm5qZDVEby7OzxCLKUpUN5of0rY4dvOWaDF2JZBlGpd3BXceFN8B53qlTaIkVSzP65aAMT0Vc+/N25Q=="
+		},
+		"node_modules/vscode-oniguruma": {
+			"version": "1.7.0",
+			"resolved": "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-1.7.0.tgz",
+			"integrity": "sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA=="
+		},
+		"node_modules/vscode-textmate": {
+			"version": "9.1.0",
+			"resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-9.1.0.tgz",
+			"integrity": "sha512-lxKSVp2DkFOx9RDAvpiYUrB9/KT1fAfi1aE8CBGstP8N7rLF+Seifj8kDA198X0mYj1CjQUC+81+nQf8CO0nVA=="
+		}
+	}
+}
diff --git a/remote/web/package.json b/remote/web/package.json
index a6c63532460..5529301e4c4 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -6,17 +6,18 @@
 		"@microsoft/1ds-core-js": "^3.2.13",
 		"@microsoft/1ds-post-js": "^3.2.13",
 		"@vscode/iconv-lite-umd": "0.7.0",
+		"@vscode/tree-sitter-wasm": "^0.0.4",
 		"@vscode/vscode-languagedetection": "1.0.21",
-		"@xterm/addon-clipboard": "0.2.0-beta.4",
-		"@xterm/addon-image": "0.9.0-beta.21",
-		"@xterm/addon-search": "0.16.0-beta.21",
-		"@xterm/addon-serialize": "0.14.0-beta.21",
-		"@xterm/addon-unicode11": "0.9.0-beta.21",
-		"@xterm/addon-webgl": "0.19.0-beta.21",
-		"@xterm/xterm": "5.6.0-beta.21",
-		"jschardet": "3.1.2",
+		"@xterm/addon-clipboard": "^0.2.0-beta.48",
+		"@xterm/addon-image": "^0.9.0-beta.65",
+		"@xterm/addon-search": "^0.16.0-beta.65",
+		"@xterm/addon-serialize": "^0.14.0-beta.65",
+		"@xterm/addon-unicode11": "^0.9.0-beta.65",
+		"@xterm/addon-webgl": "^0.19.0-beta.65",
+		"@xterm/xterm": "^5.6.0-beta.65",
+		"jschardet": "3.1.4",
 		"tas-client-umd": "0.2.0",
 		"vscode-oniguruma": "1.7.0",
-		"vscode-textmate": "9.0.0"
+		"vscode-textmate": "9.1.0"
 	}
 }
diff --git a/remote/web/yarn.lock b/remote/web/yarn.lock
deleted file mode 100644
index 3a330eae061..00000000000
--- a/remote/web/yarn.lock
+++ /dev/null
@@ -1,111 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@microsoft/1ds-core-js@3.2.13", "@microsoft/1ds-core-js@^3.2.13":
-  version "3.2.13"
-  resolved "https://registry.yarnpkg.com/@microsoft/1ds-core-js/-/1ds-core-js-3.2.13.tgz#0c105ed75091bae3f1555c0334704fa9911c58fb"
-  integrity sha512-CluYTRWcEk0ObG5EWFNWhs87e2qchJUn0p2D21ZUa3PWojPZfPSBs4//WIE0MYV8Qg1Hdif2ZTwlM7TbYUjfAg==
-  dependencies:
-    "@microsoft/applicationinsights-core-js" "2.8.15"
-    "@microsoft/applicationinsights-shims" "^2.0.2"
-    "@microsoft/dynamicproto-js" "^1.1.7"
-
-"@microsoft/1ds-post-js@^3.2.13":
-  version "3.2.13"
-  resolved "https://registry.yarnpkg.com/@microsoft/1ds-post-js/-/1ds-post-js-3.2.13.tgz#560aacac8a92fdbb79e8c2ebcb293d56e19f51aa"
-  integrity sha512-HgS574fdD19Bo2vPguyznL4eDw7Pcm1cVNpvbvBLWiW3x4e1FCQ3VMXChWnAxCae8Hb0XqlA2sz332ZobBavTA==
-  dependencies:
-    "@microsoft/1ds-core-js" "3.2.13"
-    "@microsoft/applicationinsights-shims" "^2.0.2"
-    "@microsoft/dynamicproto-js" "^1.1.7"
-
-"@microsoft/applicationinsights-core-js@2.8.15":
-  version "2.8.15"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.15.tgz#8fa466474260e01967fe649f14dd9e5ff91dcdc8"
-  integrity sha512-yYAs9MyjGr2YijQdUSN9mVgT1ijI1FPMgcffpaPmYbHAVbQmF7bXudrBWHxmLzJlwl5rfep+Zgjli2e67lwUqQ==
-  dependencies:
-    "@microsoft/applicationinsights-shims" "2.0.2"
-    "@microsoft/dynamicproto-js" "^1.1.9"
-
-"@microsoft/applicationinsights-shims@2.0.2", "@microsoft/applicationinsights-shims@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-shims/-/applicationinsights-shims-2.0.2.tgz#92b36a09375e2d9cb2b4203383b05772be837085"
-  integrity sha512-PoHEgsnmcqruLNHZ/amACqdJ6YYQpED0KSRe6J7gIJTtpZC1FfFU9b1fmDKDKtFoUSrPzEh1qzO3kmRZP0betg==
-
-"@microsoft/dynamicproto-js@^1.1.7", "@microsoft/dynamicproto-js@^1.1.9":
-  version "1.1.9"
-  resolved "https://registry.yarnpkg.com/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.9.tgz#7437db7aa061162ee94e4131b69a62b8dad5dea6"
-  integrity sha512-n1VPsljTSkthsAFYdiWfC+DKzK2WwcRp83Y1YAqdX552BstvsDjft9YXppjUzp11BPsapDoO1LDgrDB0XVsfNQ==
-
-"@vscode/iconv-lite-umd@0.7.0":
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz#d2f1e0664ee6036408f9743fee264ea0699b0e48"
-  integrity sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg==
-
-"@vscode/vscode-languagedetection@1.0.21":
-  version "1.0.21"
-  resolved "https://registry.yarnpkg.com/@vscode/vscode-languagedetection/-/vscode-languagedetection-1.0.21.tgz#89b48f293f6aa3341bb888c1118d16ff13b032d3"
-  integrity sha512-zSUH9HYCw5qsCtd7b31yqkpaCU6jhtkKLkvOOA8yTrIRfBSOFb8PPhgmMicD7B/m+t4PwOJXzU1XDtrM9Fd3/g==
-
-"@xterm/addon-clipboard@0.2.0-beta.4":
-  version "0.2.0-beta.4"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.4.tgz#9911baaebfbc07a698ae62366a596bfdeac8fa7e"
-  integrity sha512-p2KGTFUDK4YFthCgfsv2wT66JDTZPcIuoWeDT+TmSFbS1smDPTMCyM/rDDkGY+duHRcQsIMVzGC+2NRb/exX6A==
-  dependencies:
-    js-base64 "^3.7.5"
-
-"@xterm/addon-image@0.9.0-beta.21":
-  version "0.9.0-beta.21"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.9.0-beta.21.tgz#64fe50ee623f3e518574e1cbbe649cc0c0d60265"
-  integrity sha512-kTArrrS7K5+WYTTO8Ktt1aYxKTO4/jUm3KmyvPVjf9iw7OhLtG9mU+X9dXo56DTAqmbIUfJgY3OQbWffcyNk7w==
-
-"@xterm/addon-search@0.16.0-beta.21":
-  version "0.16.0-beta.21"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.16.0-beta.21.tgz#b8a20e83c1ff24afa675c3723244b2068255688d"
-  integrity sha512-RVn8yRx+w6R7abWiIttyAR0+Myh+XCYOLAkwco3iIYgzlztmox3Qp6YNzWJj0G8iwSvzxaSu7Fbjbb2PXTOSIg==
-
-"@xterm/addon-serialize@0.14.0-beta.21":
-  version "0.14.0-beta.21"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.21.tgz#a074c5fdd2105c07574e6848babefef2905d84cb"
-  integrity sha512-Eg1QT2WG0pAIV+RrPv921+dVQvQqMhoFv2DQfMYDcqNbD2mTvIbX/ecEMb1bmn3WI0jNNomQ8UHZRFNRbDA+BA==
-
-"@xterm/addon-unicode11@0.9.0-beta.21":
-  version "0.9.0-beta.21"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.21.tgz#dc843df701e518bc459e77dcd4fd65fe49adbb4b"
-  integrity sha512-IiHYZ+88m5MCoAyOHWQ4xXzecOh6FsDDr8lZpJktbFHyzYjBlIDQ6z9cJg+3ApApfo5Xosnmzjs27kf7wG2L0w==
-
-"@xterm/addon-webgl@0.19.0-beta.21":
-  version "0.19.0-beta.21"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.21.tgz#68b92a47bf6768babd57bfbaf3ac97a7c670d8df"
-  integrity sha512-YV8Aaxp4QokXXehSCJ7NvudZKPDyBiXv4HqENqDpQllCj4hOWC5xJYSoFoPtu5+UhlzfqqvYRX/Il7QegPFPDg==
-
-"@xterm/xterm@5.6.0-beta.21":
-  version "5.6.0-beta.21"
-  resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.6.0-beta.21.tgz#87a4e45752e5708cffc5c583d7f15e107313eb4e"
-  integrity sha512-1tLJaGudNSg1hEC+ZwUU7PiUvzURzKB5v1IRaJdmZK81ZCxvEF6Qfo281pTZsZFnv2iOWqFEC0C5uRmBXLm0lQ==
-
-js-base64@^3.7.5:
-  version "3.7.7"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-3.7.7.tgz#e51b84bf78fbf5702b9541e2cb7bfcb893b43e79"
-  integrity sha512-7rCnleh0z2CkXhH67J8K1Ytz0b2Y+yxTPL+/KOJoa20hfnVQ/3/T6W/KflYI4bRHRagNeXeU2bkNGI3v1oS/lw==
-
-jschardet@3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-3.1.2.tgz#9bf4364deba0677fe9e3bd9e29eda57febf2e9db"
-  integrity sha512-mw3CBZGzW8nUBPYhFU2ztZ/kJ6NClQUQVpyzvFMfznZsoC///ZQ30J2RCUanNsr5yF22LqhgYr/lj807/ZleWA==
-
-tas-client-umd@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/tas-client-umd/-/tas-client-umd-0.2.0.tgz#b71cc28f4c9b14f7b62f1ca4669886aa197e390c"
-  integrity sha512-oezN7mJVm5qZDVEby7OzxCLKUpUN5of0rY4dvOWaDF2JZBlGpd3BXceFN8B53qlTaIkVSzP65aAMT0Vc+/N25Q==
-
-vscode-oniguruma@1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/vscode-oniguruma/-/vscode-oniguruma-1.7.0.tgz#439bfad8fe71abd7798338d1cd3dc53a8beea94b"
-  integrity sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA==
-
-vscode-textmate@9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-9.0.0.tgz#313c6c8792b0507aef35aeb81b6b370b37c44d6c"
-  integrity sha512-Cl65diFGxz7gpwbav10HqiY/eVYTO1sjQpmRmV991Bj7wAoOAjGQ97PpQcXorDE2Uc4hnGWLY17xme+5t6MlSg==
diff --git a/remote/yarn.lock b/remote/yarn.lock
deleted file mode 100644
index 7e3b539a3d9..00000000000
--- a/remote/yarn.lock
+++ /dev/null
@@ -1,702 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@microsoft/1ds-core-js@3.2.13", "@microsoft/1ds-core-js@^3.2.13":
-  version "3.2.13"
-  resolved "https://registry.yarnpkg.com/@microsoft/1ds-core-js/-/1ds-core-js-3.2.13.tgz#0c105ed75091bae3f1555c0334704fa9911c58fb"
-  integrity sha512-CluYTRWcEk0ObG5EWFNWhs87e2qchJUn0p2D21ZUa3PWojPZfPSBs4//WIE0MYV8Qg1Hdif2ZTwlM7TbYUjfAg==
-  dependencies:
-    "@microsoft/applicationinsights-core-js" "2.8.15"
-    "@microsoft/applicationinsights-shims" "^2.0.2"
-    "@microsoft/dynamicproto-js" "^1.1.7"
-
-"@microsoft/1ds-post-js@^3.2.13":
-  version "3.2.13"
-  resolved "https://registry.yarnpkg.com/@microsoft/1ds-post-js/-/1ds-post-js-3.2.13.tgz#560aacac8a92fdbb79e8c2ebcb293d56e19f51aa"
-  integrity sha512-HgS574fdD19Bo2vPguyznL4eDw7Pcm1cVNpvbvBLWiW3x4e1FCQ3VMXChWnAxCae8Hb0XqlA2sz332ZobBavTA==
-  dependencies:
-    "@microsoft/1ds-core-js" "3.2.13"
-    "@microsoft/applicationinsights-shims" "^2.0.2"
-    "@microsoft/dynamicproto-js" "^1.1.7"
-
-"@microsoft/applicationinsights-core-js@2.8.15":
-  version "2.8.15"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.15.tgz#8fa466474260e01967fe649f14dd9e5ff91dcdc8"
-  integrity sha512-yYAs9MyjGr2YijQdUSN9mVgT1ijI1FPMgcffpaPmYbHAVbQmF7bXudrBWHxmLzJlwl5rfep+Zgjli2e67lwUqQ==
-  dependencies:
-    "@microsoft/applicationinsights-shims" "2.0.2"
-    "@microsoft/dynamicproto-js" "^1.1.9"
-
-"@microsoft/applicationinsights-shims@2.0.2", "@microsoft/applicationinsights-shims@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-shims/-/applicationinsights-shims-2.0.2.tgz#92b36a09375e2d9cb2b4203383b05772be837085"
-  integrity sha512-PoHEgsnmcqruLNHZ/amACqdJ6YYQpED0KSRe6J7gIJTtpZC1FfFU9b1fmDKDKtFoUSrPzEh1qzO3kmRZP0betg==
-
-"@microsoft/dynamicproto-js@^1.1.7", "@microsoft/dynamicproto-js@^1.1.9":
-  version "1.1.9"
-  resolved "https://registry.yarnpkg.com/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.9.tgz#7437db7aa061162ee94e4131b69a62b8dad5dea6"
-  integrity sha512-n1VPsljTSkthsAFYdiWfC+DKzK2WwcRp83Y1YAqdX552BstvsDjft9YXppjUzp11BPsapDoO1LDgrDB0XVsfNQ==
-
-"@parcel/watcher@2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.1.0.tgz#5f32969362db4893922c526a842d8af7a8538545"
-  integrity sha512-8s8yYjd19pDSsBpbkOHnT6Z2+UJSuLQx61pCFM0s5wSRvKCEMDjd/cHY3/GI1szHIWbpXpsJdg3V6ISGGx9xDw==
-  dependencies:
-    is-glob "^4.0.3"
-    micromatch "^4.0.5"
-    node-addon-api "^3.2.1"
-    node-gyp-build "^4.3.0"
-
-"@tootallnate/once@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-3.0.0.tgz#d52238c9052d746c9689523e650160e70786bc9a"
-  integrity sha512-OAdBVB7rlwvLD+DiecSAyVKzKVmSfXbouCyM5I6wHGi4MGXIyFqErg1IvyJ7PI1e+GYZuZh7cCHV/c4LA8SKMw==
-
-"@vscode/deviceid@^0.1.1":
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/@vscode/deviceid/-/deviceid-0.1.1.tgz#750e2930a3a8fbf3fd610096a8b915dfdb493c89"
-  integrity sha512-ErpoMeKKNYAkR1IT3zxB5RtiTqEECdh8fxggupWvzuxpTAX77hwOI2NdJ7um+vupnXRBZVx4ugo0+dVHJWUkag==
-  dependencies:
-    fs-extra "^11.2.0"
-    uuid "^9.0.1"
-
-"@vscode/iconv-lite-umd@0.7.0":
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz#d2f1e0664ee6036408f9743fee264ea0699b0e48"
-  integrity sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg==
-
-"@vscode/proxy-agent@^0.19.0":
-  version "0.19.1"
-  resolved "https://registry.yarnpkg.com/@vscode/proxy-agent/-/proxy-agent-0.19.1.tgz#d9640d85df1c48885580b68bb4b2b54e17f5332c"
-  integrity sha512-cs1VOx6d5n69HhgzK0cWeyfudJt+9LdJi/vtgRRxxwisWKg4h83B3+EUJ4udF5SEkJgMBp3oU0jheZVt43ImnQ==
-  dependencies:
-    "@tootallnate/once" "^3.0.0"
-    agent-base "^7.0.1"
-    debug "^4.3.4"
-    http-proxy-agent "^7.0.0"
-    https-proxy-agent "^7.0.2"
-    socks-proxy-agent "^8.0.1"
-  optionalDependencies:
-    "@vscode/windows-ca-certs" "^0.3.1"
-
-"@vscode/ripgrep@^1.15.9":
-  version "1.15.9"
-  resolved "https://registry.yarnpkg.com/@vscode/ripgrep/-/ripgrep-1.15.9.tgz#92279f7f28e1e49ad9a89603e10b17a4c7f9f5f1"
-  integrity sha512-4q2PXRvUvr3bF+LsfrifmUZgSPmCNcUZo6SbEAZgArIChchkezaxLoIeQMJe/z3CCKStvaVKpBXLxN3Z8lQjFQ==
-  dependencies:
-    https-proxy-agent "^7.0.2"
-    proxy-from-env "^1.1.0"
-    yauzl "^2.9.2"
-
-"@vscode/spdlog@^0.15.0":
-  version "0.15.0"
-  resolved "https://registry.yarnpkg.com/@vscode/spdlog/-/spdlog-0.15.0.tgz#37896541410ff036dc01c54e16bf131c522a057e"
-  integrity sha512-5UFcQXM/G6bTRF49zJJJH3A3+47nxaXuKzT26vhTXVIiMFoV1oI9559mWOzapLEmvrntAdYtjE7Jh74lSAuMcA==
-  dependencies:
-    bindings "^1.5.0"
-    mkdirp "^1.0.4"
-    node-addon-api "7.1.0"
-
-"@vscode/vscode-languagedetection@1.0.21":
-  version "1.0.21"
-  resolved "https://registry.yarnpkg.com/@vscode/vscode-languagedetection/-/vscode-languagedetection-1.0.21.tgz#89b48f293f6aa3341bb888c1118d16ff13b032d3"
-  integrity sha512-zSUH9HYCw5qsCtd7b31yqkpaCU6jhtkKLkvOOA8yTrIRfBSOFb8PPhgmMicD7B/m+t4PwOJXzU1XDtrM9Fd3/g==
-
-"@vscode/windows-ca-certs@^0.3.1":
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/@vscode/windows-ca-certs/-/windows-ca-certs-0.3.1.tgz#35c88b2d2a52f7759bfb6878906c3d40421ec6a3"
-  integrity sha512-1B6hZAsqg125wuMsXiKIFkBgKx/J7YR4RT/ccYGkWAToPU9MVa40PRe+evLFUmLPH6NmPohEPlCzZLbqgvHCcQ==
-  dependencies:
-    node-addon-api "^3.0.2"
-
-"@vscode/windows-process-tree@^0.6.0":
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/@vscode/windows-process-tree/-/windows-process-tree-0.6.0.tgz#a62400c689b27688fd689e8cac71d63c6d1956da"
-  integrity sha512-7/DjBKKUtlmKNiAet2GRbdvfjgMKmfBeWVClIgONv8aqxGnaKca5N85eIDxh6rLMy2hKvFqIIsqgxs1Q26TWwg==
-  dependencies:
-    node-addon-api "7.1.0"
-
-"@vscode/windows-registry@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@vscode/windows-registry/-/windows-registry-1.1.0.tgz#03dace7c29c46f658588b9885b9580e453ad21f9"
-  integrity sha512-5AZzuWJpGscyiMOed0IuyEwt6iKmV5Us7zuwCDCFYMIq7tsvooO9BUiciywsvuthGz6UG4LSpeDeCxvgMVhnIw==
-
-"@xterm/addon-clipboard@0.2.0-beta.4":
-  version "0.2.0-beta.4"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.4.tgz#9911baaebfbc07a698ae62366a596bfdeac8fa7e"
-  integrity sha512-p2KGTFUDK4YFthCgfsv2wT66JDTZPcIuoWeDT+TmSFbS1smDPTMCyM/rDDkGY+duHRcQsIMVzGC+2NRb/exX6A==
-  dependencies:
-    js-base64 "^3.7.5"
-
-"@xterm/addon-image@0.9.0-beta.21":
-  version "0.9.0-beta.21"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.9.0-beta.21.tgz#64fe50ee623f3e518574e1cbbe649cc0c0d60265"
-  integrity sha512-kTArrrS7K5+WYTTO8Ktt1aYxKTO4/jUm3KmyvPVjf9iw7OhLtG9mU+X9dXo56DTAqmbIUfJgY3OQbWffcyNk7w==
-
-"@xterm/addon-search@0.16.0-beta.21":
-  version "0.16.0-beta.21"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.16.0-beta.21.tgz#b8a20e83c1ff24afa675c3723244b2068255688d"
-  integrity sha512-RVn8yRx+w6R7abWiIttyAR0+Myh+XCYOLAkwco3iIYgzlztmox3Qp6YNzWJj0G8iwSvzxaSu7Fbjbb2PXTOSIg==
-
-"@xterm/addon-serialize@0.14.0-beta.21":
-  version "0.14.0-beta.21"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.21.tgz#a074c5fdd2105c07574e6848babefef2905d84cb"
-  integrity sha512-Eg1QT2WG0pAIV+RrPv921+dVQvQqMhoFv2DQfMYDcqNbD2mTvIbX/ecEMb1bmn3WI0jNNomQ8UHZRFNRbDA+BA==
-
-"@xterm/addon-unicode11@0.9.0-beta.21":
-  version "0.9.0-beta.21"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.21.tgz#dc843df701e518bc459e77dcd4fd65fe49adbb4b"
-  integrity sha512-IiHYZ+88m5MCoAyOHWQ4xXzecOh6FsDDr8lZpJktbFHyzYjBlIDQ6z9cJg+3ApApfo5Xosnmzjs27kf7wG2L0w==
-
-"@xterm/addon-webgl@0.19.0-beta.21":
-  version "0.19.0-beta.21"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.21.tgz#68b92a47bf6768babd57bfbaf3ac97a7c670d8df"
-  integrity sha512-YV8Aaxp4QokXXehSCJ7NvudZKPDyBiXv4HqENqDpQllCj4hOWC5xJYSoFoPtu5+UhlzfqqvYRX/Il7QegPFPDg==
-
-"@xterm/headless@5.6.0-beta.21":
-  version "5.6.0-beta.21"
-  resolved "https://registry.yarnpkg.com/@xterm/headless/-/headless-5.6.0-beta.21.tgz#110fa33b59f4bf2d1de188e318bb944c8d774e97"
-  integrity sha512-RtKsv7KZb/ee8hwkvMNYuUofDoBR/KWUjoB5mo10C+dHyDJcMYiG2k48cAvcaJRjPH721iOELORKQk3NAlowkg==
-
-"@xterm/xterm@5.6.0-beta.21":
-  version "5.6.0-beta.21"
-  resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.6.0-beta.21.tgz#87a4e45752e5708cffc5c583d7f15e107313eb4e"
-  integrity sha512-1tLJaGudNSg1hEC+ZwUU7PiUvzURzKB5v1IRaJdmZK81ZCxvEF6Qfo281pTZsZFnv2iOWqFEC0C5uRmBXLm0lQ==
-
-agent-base@^7.0.1, agent-base@^7.0.2, agent-base@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.0.tgz#536802b76bc0b34aa50195eb2442276d613e3434"
-  integrity sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==
-  dependencies:
-    debug "^4.3.4"
-
-base64-js@^1.3.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
-  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
-
-bindings@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
-  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
-  dependencies:
-    file-uri-to-path "1.0.0"
-
-bl@^4.0.3:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
-  integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
-  dependencies:
-    buffer "^5.5.0"
-    inherits "^2.0.4"
-    readable-stream "^3.4.0"
-
-braces@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
-  dependencies:
-    fill-range "^7.0.1"
-
-buffer-crc32@~0.2.3:
-  version "0.2.13"
-  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
-  integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
-
-buffer@^5.5.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
-  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
-  dependencies:
-    base64-js "^1.3.1"
-    ieee754 "^1.1.13"
-
-chownr@^1.1.1:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
-  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
-
-cookie@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
-  integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
-
-debug@4, debug@^4.3.4:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
-  dependencies:
-    ms "2.1.2"
-
-decompress-response@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc"
-  integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==
-  dependencies:
-    mimic-response "^3.1.0"
-
-deep-extend@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
-  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
-
-detect-libc@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd"
-  integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==
-
-end-of-stream@^1.1.0, end-of-stream@^1.4.1:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
-  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
-  dependencies:
-    once "^1.4.0"
-
-expand-template@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c"
-  integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==
-
-fd-slicer@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
-  integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=
-  dependencies:
-    pend "~1.2.0"
-
-file-uri-to-path@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
-  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
-
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
-  dependencies:
-    to-regex-range "^5.0.1"
-
-fs-constants@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
-  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
-
-fs-extra@^11.2.0:
-  version "11.2.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b"
-  integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==
-  dependencies:
-    graceful-fs "^4.2.0"
-    jsonfile "^6.0.1"
-    universalify "^2.0.0"
-
-github-from-package@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
-  integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=
-
-graceful-fs@^4.1.6, graceful-fs@^4.2.0:
-  version "4.2.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
-  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
-
-http-proxy-agent@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz#e9096c5afd071a3fce56e6252bb321583c124673"
-  integrity sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==
-  dependencies:
-    agent-base "^7.1.0"
-    debug "^4.3.4"
-
-https-proxy-agent@^7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz#e2645b846b90e96c6e6f347fb5b2e41f1590b09b"
-  integrity sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==
-  dependencies:
-    agent-base "^7.0.2"
-    debug "4"
-
-ieee754@^1.1.13:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
-  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
-
-inherits@^2.0.3, inherits@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-ini@~1.3.0:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
-  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
-
-ip@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.1.tgz#e8f3595d33a3ea66490204234b77636965307105"
-  integrity sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==
-
-is-extglob@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
-
-is-glob@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
-  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
-  dependencies:
-    is-extglob "^2.1.1"
-
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-
-js-base64@^3.7.5:
-  version "3.7.7"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-3.7.7.tgz#e51b84bf78fbf5702b9541e2cb7bfcb893b43e79"
-  integrity sha512-7rCnleh0z2CkXhH67J8K1Ytz0b2Y+yxTPL+/KOJoa20hfnVQ/3/T6W/KflYI4bRHRagNeXeU2bkNGI3v1oS/lw==
-
-jschardet@3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-3.1.2.tgz#9bf4364deba0677fe9e3bd9e29eda57febf2e9db"
-  integrity sha512-mw3CBZGzW8nUBPYhFU2ztZ/kJ6NClQUQVpyzvFMfznZsoC///ZQ30J2RCUanNsr5yF22LqhgYr/lj807/ZleWA==
-
-jsonfile@^6.0.1:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
-  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
-  dependencies:
-    universalify "^2.0.0"
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
-kerberos@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/kerberos/-/kerberos-2.0.1.tgz#663b0b46883b4da84495f60f2e9e399a43a33ef5"
-  integrity sha512-O/jIgbdGK566eUhFwIcgalbqirYU/r76MW7/UFw06Fd9x5bSwgyZWL/Vm26aAmezQww/G9KYkmmJBkEkPk5HLw==
-  dependencies:
-    bindings "^1.5.0"
-    node-addon-api "^4.3.0"
-    prebuild-install "7.1.1"
-
-lru-cache@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
-  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
-  dependencies:
-    yallist "^4.0.0"
-
-micromatch@^4.0.5:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
-  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
-  dependencies:
-    braces "^3.0.2"
-    picomatch "^2.3.1"
-
-mimic-response@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
-  integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==
-
-minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.6:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
-  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
-
-mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
-  integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
-
-mkdirp@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-
-ms@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-napi-build-utils@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806"
-  integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==
-
-native-watchdog@^1.4.1:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/native-watchdog/-/native-watchdog-1.4.2.tgz#cf9f913157ee992723aa372b6137293c663be9b7"
-  integrity sha512-iT3Uj6FFdrW5vHbQ/ybiznLus9oiUoMJ8A8nyugXv9rV3EBhIodmGs+mztrwQyyBc+PB5/CrskAH/WxaUVRRSQ==
-
-node-abi@^3.3.0:
-  version "3.8.0"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.8.0.tgz#679957dc8e7aa47b0a02589dbfde4f77b29ccb32"
-  integrity sha512-tzua9qWWi7iW4I42vUPKM+SfaF0vQSLAm4yO5J83mSwB7GeoWrDKC/K+8YCnYNwqP5duwazbw2X9l4m8SC2cUw==
-  dependencies:
-    semver "^7.3.5"
-
-node-addon-api@7.1.0, node-addon-api@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.1.0.tgz#71f609369379c08e251c558527a107107b5e0fdb"
-  integrity sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==
-
-node-addon-api@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.1.0.tgz#98b21931557466c6729e51cb77cd39c965f42239"
-  integrity sha512-flmrDNB06LIl5lywUz7YlNGZH/5p0M7W28k8hzd9Lshtdh1wshD2Y+U4h9LD6KObOy1f+fEVdgprPrEymjM5uw==
-
-node-addon-api@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
-  integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
-
-node-addon-api@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f"
-  integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==
-
-node-gyp-build@4.8.1, node-gyp-build@^4.3.0:
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.8.1.tgz#976d3ad905e71b76086f4f0b0d3637fe79b6cda5"
-  integrity sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw==
-
-node-pty@1.1.0-beta11:
-  version "1.1.0-beta11"
-  resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-1.1.0-beta11.tgz#909d5dd8f9aa2a7857e7b632fd4d2d4768bdf69f"
-  integrity sha512-vTjF+VrvSCfPDILUkIT+YrG1Fdn06/eBRS2fc9a3JzYAvknMB1Ip8aoJhxl8hNpjWAbprmCEiV91mlfNpCD+GQ==
-  dependencies:
-    node-addon-api "^7.1.0"
-
-once@^1.3.1, once@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
-  dependencies:
-    wrappy "1"
-
-pend@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
-  integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=
-
-picomatch@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
-  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
-
-prebuild-install@7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.1.tgz#de97d5b34a70a0c81334fd24641f2a1702352e45"
-  integrity sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==
-  dependencies:
-    detect-libc "^2.0.0"
-    expand-template "^2.0.3"
-    github-from-package "0.0.0"
-    minimist "^1.2.3"
-    mkdirp-classic "^0.5.3"
-    napi-build-utils "^1.0.1"
-    node-abi "^3.3.0"
-    pump "^3.0.0"
-    rc "^1.2.7"
-    simple-get "^4.0.0"
-    tar-fs "^2.0.0"
-    tunnel-agent "^0.6.0"
-
-proxy-from-env@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
-  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
-
-pump@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
-  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
-rc@^1.2.7:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
-  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
-  dependencies:
-    deep-extend "^0.6.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
-
-readable-stream@^3.1.1, readable-stream@^3.4.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
-  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
-safe-buffer@^5.0.1, safe-buffer@~5.2.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
-semver@^7.3.5:
-  version "7.5.4"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
-  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
-  dependencies:
-    lru-cache "^6.0.0"
-
-simple-concat@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f"
-  integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==
-
-simple-get@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.1.tgz#4a39db549287c979d352112fa03fd99fd6bc3543"
-  integrity sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==
-  dependencies:
-    decompress-response "^6.0.0"
-    once "^1.3.1"
-    simple-concat "^1.0.0"
-
-smart-buffer@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
-  integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
-
-socks-proxy-agent@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-8.0.1.tgz#ffc5859a66dac89b0c4dab90253b96705f3e7120"
-  integrity sha512-59EjPbbgg8U3x62hhKOFVAmySQUcfRQ4C7Q/D5sEHnZTQRrQlNKINks44DMR1gwXp0p4LaVIeccX2KHTTcHVqQ==
-  dependencies:
-    agent-base "^7.0.1"
-    debug "^4.3.4"
-    socks "^2.7.1"
-
-socks@^2.7.1:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55"
-  integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==
-  dependencies:
-    ip "^2.0.0"
-    smart-buffer "^4.2.0"
-
-string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
-  dependencies:
-    safe-buffer "~5.2.0"
-
-strip-json-comments@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
-
-tar-fs@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"
-  integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==
-  dependencies:
-    chownr "^1.1.1"
-    mkdirp-classic "^0.5.2"
-    pump "^3.0.0"
-    tar-stream "^2.1.4"
-
-tar-stream@^2.1.4:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
-  integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
-  dependencies:
-    bl "^4.0.3"
-    end-of-stream "^1.4.1"
-    fs-constants "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^3.1.1"
-
-tas-client-umd@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/tas-client-umd/-/tas-client-umd-0.2.0.tgz#b71cc28f4c9b14f7b62f1ca4669886aa197e390c"
-  integrity sha512-oezN7mJVm5qZDVEby7OzxCLKUpUN5of0rY4dvOWaDF2JZBlGpd3BXceFN8B53qlTaIkVSzP65aAMT0Vc+/N25Q==
-
-to-regex-range@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-  dependencies:
-    is-number "^7.0.0"
-
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
-  dependencies:
-    safe-buffer "^5.0.1"
-
-universalify@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d"
-  integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==
-
-util-deprecate@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
-
-uuid@^9.0.1:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30"
-  integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==
-
-vscode-oniguruma@1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/vscode-oniguruma/-/vscode-oniguruma-1.7.0.tgz#439bfad8fe71abd7798338d1cd3dc53a8beea94b"
-  integrity sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA==
-
-vscode-regexpp@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/vscode-regexpp/-/vscode-regexpp-3.1.0.tgz#42d059b6fffe99bd42939c0d013f632f0cad823f"
-  integrity sha512-pqtN65VC1jRLawfluX4Y80MMG0DHJydWhe5ZwMHewZD6sys4LbU6lHwFAHxeuaVE6Y6+xZOtAw+9hvq7/0ejkg==
-
-vscode-textmate@9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-9.0.0.tgz#313c6c8792b0507aef35aeb81b6b370b37c44d6c"
-  integrity sha512-Cl65diFGxz7gpwbav10HqiY/eVYTO1sjQpmRmV991Bj7wAoOAjGQ97PpQcXorDE2Uc4hnGWLY17xme+5t6MlSg==
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
-
-yallist@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
-  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
-
-yauzl@^2.9.2:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
-  integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=
-  dependencies:
-    buffer-crc32 "~0.2.3"
-    fd-slicer "~1.1.0"
-
-yauzl@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-3.1.1.tgz#d85503cc34933c0bcb3646ee2b97afedbebe32e7"
-  integrity sha512-MPxA7oN5cvGV0wzfkeHKF2/+Q4TkMpHSWGRy/96I4Cozljmx0ph91+Muxh6HegEtDC4GftJ8qYDE51vghFiEYA==
-  dependencies:
-    buffer-crc32 "~0.2.3"
-    pend "~1.2.0"
-
-yazl@^2.4.3:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/yazl/-/yazl-2.4.3.tgz#ec26e5cc87d5601b9df8432dbdd3cd2e5173a071"
-  integrity sha1-7CblzIfVYBud+EMtvdPNLlFzoHE=
-  dependencies:
-    buffer-crc32 "~0.2.3"
diff --git a/resources/linux/debian/postinst.template b/resources/linux/debian/postinst.template
index 16acb1481bf..b292cff8b29 100755
--- a/resources/linux/debian/postinst.template
+++ b/resources/linux/debian/postinst.template
@@ -31,24 +31,54 @@ if [ "@@NAME@@" != "code-oss" ]; then
 	# Register apt repository
 	eval $(apt-config shell APT_SOURCE_PARTS Dir::Etc::sourceparts/d)
 	CODE_SOURCE_PART=${APT_SOURCE_PARTS}vscode.list
+	CODE_SOURCE_PART_DEB822=${APT_SOURCE_PARTS}vscode.sources
 
 	eval $(apt-config shell APT_TRUSTED_PARTS Dir::Etc::trustedparts/d)
 	CODE_TRUSTED_PART=${APT_TRUSTED_PARTS}microsoft.gpg
 
-	# Install repository source list
+	RET=true
+	if [ -e '/usr/share/debconf/confmodule' ]; then
+		. /usr/share/debconf/confmodule
+		db_get @@NAME@@/add-microsoft-repo || true
+	fi
+
+	# Determine whether to install the repository source list
 	WRITE_SOURCE=0
-	if [ ! -f $CODE_SOURCE_PART ] && [ ! -f /etc/rpi-issue ]; then
-		# Write source list if it does not exist and we're not running on Raspberry Pi OS
-		WRITE_SOURCE=1
-	elif grep -Eq "http:\/\/packages\.microsoft\.com\/repos\/vscode" $CODE_SOURCE_PART; then
+	if [ "$RET" = false ]; then
+		# The user does not want to add the Microsoft repository
+		WRITE_SOURCE=0
+	elif [ -f "$CODE_SOURCE_PART_DEB822" ]; then
+		# The user has migrated themselves to the DEB822 format
+		WRITE_SOURCE=0
+	elif [ -f "$CODE_SOURCE_PART" ] && (grep -q "http://packages.microsoft.com/repos/vscode" $CODE_SOURCE_PART); then
 		# Migrate from old repository
+		WRITE_SOURCE=2
+	elif [ -f "$CODE_SOURCE_PART" ] && (grep -q "http://packages.microsoft.com/repos/code" $CODE_SOURCE_PART); then
+		# Migrate from old repository
+		WRITE_SOURCE=2
+	elif apt-cache policy | grep -q "https://packages.microsoft.com/repos/code"; then
+		# The user is already on the new repository
+		WRITE_SOURCE=0
+	elif [ ! -f $CODE_SOURCE_PART ] && [ ! -f /etc/rpi-issue ]; then
+		# Write source list if it does not exist and we're not running on Raspberry Pi OS
 		WRITE_SOURCE=1
 	elif grep -q "# disabled on upgrade to" $CODE_SOURCE_PART; then
 		# Write source list if it was disabled by OS upgrade
 		WRITE_SOURCE=1
 	fi
 
-	if [ "$WRITE_SOURCE" -eq "1" ]; then
+	if [ "$WRITE_SOURCE" -eq "1" ] && [ -e '/usr/share/debconf/confmodule' ]; then
+		# Ask the user whether to actually write the source list
+		db_input high @@NAME@@/add-microsoft-repo || true
+		db_go || true
+
+		db_get @@NAME@@/add-microsoft-repo
+		if [ "$RET" = false ]; then
+			WRITE_SOURCE=0
+		fi
+	fi
+
+	if [ "$WRITE_SOURCE" -ne "0" ]; then
 		echo "### THIS FILE IS AUTOMATICALLY CONFIGURED ###
 # You may comment out this entry, but any other modifications may be lost.
 deb [arch=amd64,arm64,armhf] https://packages.microsoft.com/repos/code stable main" > $CODE_SOURCE_PART
diff --git a/resources/linux/debian/postrm.template b/resources/linux/debian/postrm.template
index fb36d522f38..dcbfda95ea0 100755
--- a/resources/linux/debian/postrm.template
+++ b/resources/linux/debian/postrm.template
@@ -14,3 +14,22 @@ fi
 if hash update-mime-database 2>/dev/null; then
 	update-mime-database /usr/share/mime
 fi
+
+RET=true
+if [ -e '/usr/share/debconf/confmodule' ]; then
+	. /usr/share/debconf/confmodule
+	db_get @@NAME@@/add-microsoft-repo || true
+fi
+if [ "$RET" = "true" ]; then
+	eval $(apt-config shell APT_SOURCE_PARTS Dir::Etc::sourceparts/d)
+	CODE_SOURCE_PART=${APT_SOURCE_PARTS}vscode.list
+	rm -f $CODE_SOURCE_PART
+
+	eval $(apt-config shell APT_TRUSTED_PARTS Dir::Etc::trustedparts/d)
+	CODE_TRUSTED_PART=${APT_TRUSTED_PARTS}microsoft.gpg
+	rm -f $CODE_TRUSTED_PART
+fi
+
+if [ "$1" = "purge" ] && [ -e '/usr/share/debconf/confmodule' ]; then
+	db_purge
+fi
diff --git a/resources/linux/debian/templates.template b/resources/linux/debian/templates.template
new file mode 100644
index 00000000000..7be5e039b26
--- /dev/null
+++ b/resources/linux/debian/templates.template
@@ -0,0 +1,6 @@
+Template: @@NAME@@/add-microsoft-repo
+Type: boolean
+Default: true
+Description: Add Microsoft apt repository for Visual Studio Code?
+ The installer would like to add the Microsoft repository and signing
+ key to update VS Code through apt.
diff --git a/resources/linux/rpm/code.spec.template b/resources/linux/rpm/code.spec.template
index c9e57db9562..a73bc02c3e7 100644
--- a/resources/linux/rpm/code.spec.template
+++ b/resources/linux/rpm/code.spec.template
@@ -19,6 +19,7 @@ Visual Studio Code is a new choice of tool that combines the simplicity of a cod
 # Don't generate build_id links to prevent conflicts when installing multiple
 # versions of VS Code alongside each other (e.g. `code` and `code-insiders`)
 %define _build_id_links none
+%define __strip @@STRIP@@
 
 %install
 # Destination directories
diff --git a/resources/linux/snap/electron-launch b/resources/linux/snap/electron-launch
index ea82e60bd6c..873b079161a 100755
--- a/resources/linux/snap/electron-launch
+++ b/resources/linux/snap/electron-launch
@@ -261,4 +261,4 @@ fi
 
 wait_for_async_execs
 
-exec "$@" "--no-sandbox" "--use-gl=angle" "--use-angle=swiftshader"
+exec "$@"
diff --git a/resources/linux/snap/snapcraft.yaml b/resources/linux/snap/snapcraft.yaml
index 5d4df3f52f3..1d7412bdc71 100644
--- a/resources/linux/snap/snapcraft.yaml
+++ b/resources/linux/snap/snapcraft.yaml
@@ -30,15 +30,18 @@ parts:
       - libcurl3-gnutls
       - libcurl3-nss
       - libcurl4
+      - libegl1
       - libdrm2
       - libgbm1
       - libgl1
+      - libgles2
       - libglib2.0-0
       - libgtk-3-0
       - libibus-1.0-5
       - libnss3
       - libpango-1.0-0
       - libsecret-1-0
+      - libwayland-egl1
       - libxcomposite1
       - libxdamage1
       - libxfixes3
@@ -74,8 +77,8 @@ parts:
 
 apps:
   @@NAME@@:
-    command: electron-launch $SNAP/usr/share/@@NAME@@/bin/@@NAME@@
+    command: electron-launch $SNAP/usr/share/@@NAME@@/bin/@@NAME@@ --no-sandbox
     common-id: @@NAME@@.desktop
 
   url-handler:
-    command: electron-launch $SNAP/usr/share/@@NAME@@/bin/@@NAME@@ --open-url
+    command: electron-launch $SNAP/usr/share/@@NAME@@/bin/@@NAME@@ --open-url --no-sandbox
diff --git a/resources/server/bin/helpers/check-requirements-linux.sh b/resources/server/bin/helpers/check-requirements-linux.sh
index 079557869e3..8ef07a2fb1f 100644
--- a/resources/server/bin/helpers/check-requirements-linux.sh
+++ b/resources/server/bin/helpers/check-requirements-linux.sh
@@ -27,6 +27,7 @@ fi
 ARCH=$(uname -m)
 found_required_glibc=0
 found_required_glibcxx=0
+MIN_GLIBCXX_VERSION="3.4.25"
 
 # Extract the ID value from /etc/os-release
 if [ -f /etc/os-release ]; then
@@ -40,7 +41,10 @@ fi
 # Based on https://github.com/bminor/glibc/blob/520b1df08de68a3de328b65a25b86300a7ddf512/elf/cache.c#L162-L245
 case $ARCH in
 	x86_64) LDCONFIG_ARCH="x86-64";;
-	armv7l | armv8l) LDCONFIG_ARCH="hard-float";;
+	armv7l | armv8l)
+        MIN_GLIBCXX_VERSION="3.4.26"
+        LDCONFIG_ARCH="hard-float"
+        ;;
 	arm64 | aarch64)
         BITNESS=$(getconf LONG_BIT)
 		if [ "$BITNESS" = "32" ]; then
@@ -81,7 +85,7 @@ if [ "$OS_ID" != "alpine" ]; then
         libstdcpp_real_path=$(readlink -f "$libstdcpp_path_line")
         libstdcpp_version=$(grep -ao 'GLIBCXX_[0-9]*\.[0-9]*\.[0-9]*' "$libstdcpp_real_path" | sort -V | tail -1)
         libstdcpp_version_number=$(echo "$libstdcpp_version" | sed 's/GLIBCXX_//')
-        if [ "$(printf '%s\n' "3.4.24" "$libstdcpp_version_number" | sort -V | head -n1)" = "3.4.24" ]; then
+        if [ "$(printf '%s\n' "$MIN_GLIBCXX_VERSION" "$libstdcpp_version_number" | sort -V | head -n1)" = "$MIN_GLIBCXX_VERSION" ]; then
             found_required_glibcxx=1
             break
         fi
@@ -92,7 +96,7 @@ else
     found_required_glibcxx=1
 fi
 if [ "$found_required_glibcxx" = "0" ]; then
-    echo "Warning: Missing GLIBCXX >= 3.4.25! from $libstdcpp_real_path"
+    echo "Warning: Missing GLIBCXX >= $MIN_GLIBCXX_VERSION! from $libstdcpp_real_path"
 fi
 
 if [ "$OS_ID" = "alpine" ]; then
@@ -121,6 +125,9 @@ elif [ -z "$(ldd --version 2>&1 | grep 'musl libc')" ]; then
     elif [ -f /usr/lib/libc.so.6 ]; then
         # Typical path
         libc_path='/usr/lib/libc.so.6'
+    elif [ -f /lib64/libc.so.6 ]; then
+        # Typical path (OpenSUSE)
+        libc_path='/lib64/libc.so.6'
     elif [ -f /usr/lib64/libc.so.6 ]; then
         # Typical path
         libc_path='/usr/lib64/libc.so.6'
diff --git a/scripts/code-server.bat b/scripts/code-server.bat
index 23006f829ee..940926c88ec 100644
--- a/scripts/code-server.bat
+++ b/scripts/code-server.bat
@@ -19,7 +19,7 @@ FOR /F "tokens=*" %%g IN ('node build/lib/node.js') do (SET NODE=%%g)
 
 if not exist "%NODE%" (
 	:: Download nodejs executable for remote
-	call yarn gulp node
+	call npm run gulp node
 )
 
 popd
diff --git a/scripts/code-server.js b/scripts/code-server.js
index c043bf2671b..56945e76ca7 100644
--- a/scripts/code-server.js
+++ b/scripts/code-server.js
@@ -69,4 +69,3 @@ function startServer(programArgs) {
 }
 
 main();
-
diff --git a/scripts/code-server.sh b/scripts/code-server.sh
index bc910a9bb98..6070edf8cd1 100755
--- a/scripts/code-server.sh
+++ b/scripts/code-server.sh
@@ -18,7 +18,7 @@ function code() {
 	NODE=$(node build/lib/node.js)
 	if [ ! -e $NODE ];then
 		# Load remote node
-		yarn gulp node
+		npm run gulp node
 	fi
 
 	popd
diff --git a/scripts/code-web.bat b/scripts/code-web.bat
index 312024c3d42..5454a9b1ad4 100644
--- a/scripts/code-web.bat
+++ b/scripts/code-web.bat
@@ -6,14 +6,14 @@ title VSCode Web Serverless
 pushd %~dp0\..
 
 :: Sync built-in extensions
-call yarn download-builtin-extensions
+call npm run download-builtin-extensions
 
 :: Node executable
 FOR /F "tokens=*" %%g IN ('node build/lib/node.js') do (SET NODE=%%g)
 
 if not exist "%NODE%" (
 	:: Download nodejs executable for remote
-	call yarn gulp node
+	call npm run gulp node
 )
 
 :: Launch Server
diff --git a/scripts/code-web.js b/scripts/code-web.js
index 467f147d027..f05c934cadf 100644
--- a/scripts/code-web.js
+++ b/scripts/code-web.js
@@ -74,6 +74,7 @@ async function main() {
 		openSystemBrowser = true;
 	}
 
+	serverArgs.push('--esm'); // TODO@esm this should be the default
 	serverArgs.push('--sourcesPath', APP_ROOT);
 
 	serverArgs.push(...process.argv.slice(2).filter(v => !v.startsWith('--playground') && v !== '--no-playground'));
diff --git a/scripts/code-web.sh b/scripts/code-web.sh
index 19313a61e01..c5d5fcfae4f 100755
--- a/scripts/code-web.sh
+++ b/scripts/code-web.sh
@@ -11,12 +11,12 @@ function code() {
 	cd $ROOT
 
 	# Sync built-in extensions
-	yarn download-builtin-extensions
+	npm run download-builtin-extensions
 
 	NODE=$(node build/lib/node.js)
 	if [ ! -e $NODE ];then
 		# Load remote node
-		yarn gulp node
+		npm run gulp node
 	fi
 
 	NODE=$(node build/lib/node.js)
diff --git a/scripts/node-electron.sh b/scripts/node-electron.sh
index 0a822b6c383..102fe073e4f 100755
--- a/scripts/node-electron.sh
+++ b/scripts/node-electron.sh
@@ -18,7 +18,7 @@ else
 fi
 
 # Get electron
-yarn electron
+npm run electron
 
 popd
 
diff --git a/scripts/npm.bat b/scripts/npm.bat
deleted file mode 100644
index bcd71804d8a..00000000000
--- a/scripts/npm.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-yarn %*
diff --git a/scripts/npm.sh b/scripts/npm.sh
deleted file mode 100755
index 30f11cfdcdf..00000000000
--- a/scripts/npm.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-yarn $*
diff --git a/scripts/playground-server.ts b/scripts/playground-server.ts
index 1c2074ee191..474f83def86 100644
--- a/scripts/playground-server.ts
+++ b/scripts/playground-server.ts
@@ -223,10 +223,10 @@ class DirWatcher {
 function handleGetFileChangesRequest(watcher: DirWatcher, fileServer: FileServer, moduleIdMapper: SimpleModuleIdPathMapper): ChainableRequestHandler {
 	return async (req, res) => {
 		res.writeHead(200, { 'Content-Type': 'text/plain' });
-		const d = watcher.onDidChange(fsPath => {
+		const d = watcher.onDidChange((fsPath, newContent) => {
 			const path = fileServer.filePathToUrlPath(fsPath);
 			if (path) {
-				res.write(JSON.stringify({ changedPath: path, moduleId: moduleIdMapper.getModuleId(fsPath) }) + '\n');
+				res.write(JSON.stringify({ changedPath: path, moduleId: moduleIdMapper.getModuleId(fsPath), newContent }) + '\n');
 			}
 		});
 		res.on('close', () => d.dispose());
@@ -235,13 +235,15 @@ function handleGetFileChangesRequest(watcher: DirWatcher, fileServer: FileServer
 function makeLoaderJsHotReloadable(loaderJsCode: string, fileChangesUrl: URL): string {
 	loaderJsCode = loaderJsCode.replace(
 		/constructor\(env, scriptLoader, defineFunc, requireFunc, loaderAvailableTimestamp = 0\) {/,
-		'$&globalThis.___globalModuleManager = this;'
+		'$&globalThis.___globalModuleManager = this; globalThis.vscode = { process: { env: { VSCODE_DEV: true } } }'
 	);
 
 	const ___globalModuleManager: any = undefined;
 
 	// This code will be appended to loader.js
 	function $watchChanges(fileChangesUrl: string) {
+		interface HotReloadConfig { }
+
 		let reloadFn;
 		if (globalThis.$sendMessageToParent) {
 			reloadFn = () => globalThis.$sendMessageToParent({ kind: 'reload' });
@@ -262,49 +264,18 @@ function makeLoaderJsHotReloadable(loaderJsCode: string, fileChangesUrl: URL): s
 					buffer += new TextDecoder().decode(value);
 					const lines = buffer.split('\n');
 					buffer = lines.pop()!;
+
+					const changes: { relativePath: string; config: HotReloadConfig | undefined; path: string; newContent: string }[] = [];
+
 					for (const line of lines) {
 						const data = JSON.parse(line);
-						let handled = false;
-						if (data.changedPath.endsWith('.css')) {
-							if (typeof document !== 'undefined') {
-								console.log('css changed', data.changedPath);
-								const styleSheet = [...document.querySelectorAll(`link[rel='stylesheet']`)].find((l: any) => new URL(l.href, document.location.href).pathname.endsWith(data.changedPath)) as any;
-								if (styleSheet) {
-									styleSheet.href = styleSheet.href.replace(/\?.*/, '') + '?' + Date.now();
-								}
-							}
-							handled = true;
-						} else if (data.changedPath.endsWith('.js') && data.moduleId) {
-							console.log('js changed', data.changedPath);
-							const moduleId = ___globalModuleManager._moduleIdProvider.getModuleId(data.moduleId);
-							if (___globalModuleManager._modules2[moduleId]) {
-								const srcUrl = ___globalModuleManager._config.moduleIdToPaths(data.moduleId);
-								const newSrc = await (await fetch(srcUrl)).text();
-								(new Function('define', newSrc))(function (deps, callback) { // CodeQL [SM01632] This code is only executed during development (as part of the dev-only playground-server). It is required for the hot-reload functionality.
-									const oldModule = ___globalModuleManager._modules2[moduleId];
-									delete ___globalModuleManager._modules2[moduleId];
+						const relativePath = data.changedPath.replace(/\\/g, '/').split('/out/')[1];
+						changes.push({ config: {}, path: data.changedPath, relativePath, newContent: data.newContent });
+					}
 
-									___globalModuleManager.defineModule(data.moduleId, deps, callback);
-									const newModule = ___globalModuleManager._modules2[moduleId];
-									const oldExports = { ...oldModule.exports };
-
-									Object.assign(oldModule.exports, newModule.exports);
-									newModule.exports = oldModule.exports;
-
-									handled = true;
-
-									for (const cb of [...globalThis.$hotReload_deprecateExports]) {
-										cb(oldExports, newModule.exports);
-									}
-
-									if (handled) {
-										console.log('hot reloaded', data.moduleId);
-									}
-								});
-							}
-						}
-
-						if (!handled) { reloadFn(); }
+					const result = handleChanges(changes, 'playground-server');
+					if (result.reloadFailedJsFiles.length > 0) {
+						reloadFn();
 					}
 				}
 			}).catch(err => {
@@ -312,6 +283,163 @@ function makeLoaderJsHotReloadable(loaderJsCode: string, fileChangesUrl: URL): s
 				setTimeout(() => $watchChanges(fileChangesUrl), 1000);
 			});
 
+
+		function handleChanges(changes: {
+			relativePath: string;
+			config: HotReloadConfig | undefined;
+			path: string;
+			newContent: string;
+		}[], debugSessionName: string) {
+			// This function is stringified and injected into the debuggee.
+
+			const hotReloadData: { count: number; originalWindowTitle: any; timeout: any; shouldReload: boolean } = globalThis.$hotReloadData || (globalThis.$hotReloadData = { count: 0, messageHideTimeout: undefined, shouldReload: false });
+
+			const reloadFailedJsFiles: { relativePath: string; path: string }[] = [];
+
+			for (const change of changes) {
+				handleChange(change.relativePath, change.path, change.newContent, change.config);
+			}
+
+			return { reloadFailedJsFiles };
+
+			function handleChange(relativePath: string, path: string, newSrc: string, config: any) {
+				if (relativePath.endsWith('.css')) {
+					handleCssChange(relativePath);
+				} else if (relativePath.endsWith('.js')) {
+					handleJsChange(relativePath, path, newSrc, config);
+				}
+			}
+
+			function handleCssChange(relativePath: string) {
+				if (typeof document === 'undefined') {
+					return;
+				}
+
+				const styleSheet = (([...document.querySelectorAll(`link[rel='stylesheet']`)] as HTMLLinkElement[]))
+					.find(l => new URL(l.href, document.location.href).pathname.endsWith(relativePath));
+				if (styleSheet) {
+					setMessage(`reload ${formatPath(relativePath)} - ${new Date().toLocaleTimeString()}`);
+					console.log(debugSessionName, 'css reloaded', relativePath);
+					styleSheet.href = styleSheet.href.replace(/\?.*/, '') + '?' + Date.now();
+				} else {
+					setMessage(`could not reload ${formatPath(relativePath)} - ${new Date().toLocaleTimeString()}`);
+					console.log(debugSessionName, 'ignoring css change, as stylesheet is not loaded', relativePath);
+				}
+			}
+
+
+			function handleJsChange(relativePath: string, path: string, newSrc: string, config: any) {
+				const moduleIdStr = trimEnd(relativePath, '.js');
+
+				const requireFn: any = globalThis.require;
+				const moduleManager = (requireFn as any).moduleManager;
+				if (!moduleManager) {
+					console.log(debugSessionName, 'ignoring js change, as moduleManager is not available', relativePath);
+					return;
+				}
+
+				const moduleId = moduleManager._moduleIdProvider.getModuleId(moduleIdStr);
+				const oldModule = moduleManager._modules2[moduleId];
+
+				if (!oldModule) {
+					console.log(debugSessionName, 'ignoring js change, as module is not loaded', relativePath);
+					return;
+				}
+
+				// Check if we can reload
+				const g = globalThis as any;
+
+				// A frozen copy of the previous exports
+				const oldExports = Object.freeze({ ...oldModule.exports });
+				const reloadFn = g.$hotReload_applyNewExports?.({ oldExports, newSrc, config });
+
+				if (!reloadFn) {
+					console.log(debugSessionName, 'ignoring js change, as module does not support hot-reload', relativePath);
+					hotReloadData.shouldReload = true;
+
+					reloadFailedJsFiles.push({ relativePath, path });
+
+					setMessage(`hot reload not supported for ${formatPath(relativePath)} - ${new Date().toLocaleTimeString()}`);
+					return;
+				}
+
+				// Eval maintains source maps
+				function newScript(/* this parameter is used by newSrc */ define) {
+					// eslint-disable-next-line no-eval
+					eval(newSrc); // CodeQL [SM01632] This code is only executed during development. It is required for the hot-reload functionality.
+				}
+
+				newScript(/* define */ function (deps, callback) {
+					// Evaluating the new code was successful.
+
+					// Redefine the module
+					delete moduleManager._modules2[moduleId];
+					moduleManager.defineModule(moduleIdStr, deps, callback);
+					const newModule = moduleManager._modules2[moduleId];
+
+
+					// Patch the exports of the old module, so that modules using the old module get the new exports
+					Object.assign(oldModule.exports, newModule.exports);
+					// We override the exports so that future reloads still patch the initial exports.
+					newModule.exports = oldModule.exports;
+
+					const successful = reloadFn(newModule.exports);
+					if (!successful) {
+						hotReloadData.shouldReload = true;
+						setMessage(`hot reload failed ${formatPath(relativePath)} - ${new Date().toLocaleTimeString()}`);
+						console.log(debugSessionName, 'hot reload was not successful', relativePath);
+						return;
+					}
+
+					console.log(debugSessionName, 'hot reloaded', moduleIdStr);
+					setMessage(`successfully reloaded ${formatPath(relativePath)} - ${new Date().toLocaleTimeString()}`);
+				});
+			}
+
+			function setMessage(message: string) {
+				const domElem = (document.querySelector('.titlebar-center .window-title')) as HTMLDivElement | undefined;
+				if (!domElem) { return; }
+				if (!hotReloadData.timeout) {
+					hotReloadData.originalWindowTitle = domElem.innerText;
+				} else {
+					clearTimeout(hotReloadData.timeout);
+				}
+				if (hotReloadData.shouldReload) {
+					message += ' (manual reload required)';
+				}
+
+				domElem.innerText = message;
+				hotReloadData.timeout = setTimeout(() => {
+					hotReloadData.timeout = undefined;
+					// If wanted, we can restore the previous title message
+					// domElem.replaceChildren(hotReloadData.originalWindowTitle);
+				}, 5000);
+			}
+
+			function formatPath(path: string): string {
+				const parts = path.split('/');
+				parts.reverse();
+				let result = parts[0];
+				parts.shift();
+				for (const p of parts) {
+					if (result.length + p.length > 40) {
+						break;
+					}
+					result = p + '/' + result;
+					if (result.length > 20) {
+						break;
+					}
+				}
+				return result;
+			}
+
+			function trimEnd(str, suffix) {
+				if (str.endsWith(suffix)) {
+					return str.substring(0, str.length - suffix.length);
+				}
+				return str;
+			}
+		}
 	}
 
 	const additionalJsCode = `
diff --git a/scripts/test-integration.bat b/scripts/test-integration.bat
index facf82828f1..1d2920935fe 100644
--- a/scripts/test-integration.bat
+++ b/scripts/test-integration.bat
@@ -49,7 +49,7 @@ if %errorlevel% neq 0 exit /b %errorlevel%
 
 echo.
 echo ### Colorize tests
-call yarn test-extension -l vscode-colorize-tests
+call npm run test-extension -l vscode-colorize-tests
 if %errorlevel% neq 0 exit /b %errorlevel%
 
 echo.
@@ -59,7 +59,7 @@ if %errorlevel% neq 0 exit /b %errorlevel%
 
 echo.
 echo ### Markdown tests
-call yarn test-extension -l markdown-language-features
+call npm run test-extension -l markdown-language-features
 if %errorlevel% neq 0 exit /b %errorlevel%
 
 echo.
@@ -77,24 +77,24 @@ if %errorlevel% neq 0 exit /b %errorlevel%
 
 echo.
 echo ### Ipynb tests
-call yarn test-extension -l ipynb
+call npm run test-extension -l ipynb
 if %errorlevel% neq 0 exit /b %errorlevel%
 
 echo.
 echo ### Notebook Output tests
-call yarn test-extension -l notebook-renderers
+call npm run test-extension -l notebook-renderers
 if %errorlevel% neq 0 exit /b %errorlevel%
 
 echo.
 echo ### Configuration editing tests
 set CFWORKSPACE=%TEMPDIR%\cf-%RANDOM%
 mkdir %CFWORKSPACE%
-call yarn test-extension -l configuration-editing
+call npm run test-extension -l configuration-editing
 if %errorlevel% neq 0 exit /b %errorlevel%
 
 echo.
 echo ### GitHub Authentication tests
-call yarn test-extension -l github-authentication
+call npm run test-extension -l github-authentication
 if %errorlevel% neq 0 exit /b %errorlevel%
 
 :: Tests standalone (CommonJS)
diff --git a/scripts/test-integration.sh b/scripts/test-integration.sh
index 483fb5507c5..f2aaf1a2fe6 100755
--- a/scripts/test-integration.sh
+++ b/scripts/test-integration.sh
@@ -67,7 +67,7 @@ kill_app
 echo
 echo "### Colorize tests"
 echo
-yarn test-extension -l vscode-colorize-tests
+npm run test-extension -l vscode-colorize-tests
 kill_app
 
 echo
@@ -79,7 +79,7 @@ kill_app
 echo
 echo "### Markdown tests"
 echo
-yarn test-extension -l markdown-language-features
+npm run test-extension -l markdown-language-features
 kill_app
 
 echo
@@ -97,25 +97,25 @@ kill_app
 echo
 echo "### Ipynb tests"
 echo
-yarn test-extension -l ipynb
+npm run test-extension -l ipynb
 kill_app
 
 echo
 echo "### Notebook Output tests"
 echo
-yarn test-extension -l notebook-renderers
+npm run test-extension -l notebook-renderers
 kill_app
 
 echo
 echo "### Configuration editing tests"
 echo
-yarn test-extension -l configuration-editing
+npm run test-extension -l configuration-editing
 kill_app
 
 echo
 echo "### GitHub Authentication tests"
 echo
-yarn test-extension -l github-authentication
+npm run test-extension -l github-authentication
 kill_app
 
 # Tests standalone (CommonJS)
diff --git a/scripts/test-remote-integration.bat b/scripts/test-remote-integration.bat
index c583f906503..e79466424db 100644
--- a/scripts/test-remote-integration.bat
+++ b/scripts/test-remote-integration.bat
@@ -9,7 +9,7 @@ IF "%~1" == "" (
 	set EXT_PATH=%CD:\=/%/extensions
 
 	:: Download nodejs executable for remote
-	call yarn gulp node
+	call npm run gulp node
 ) else (
 	set AUTHORITY=%1
 	set EXT_PATH=%2
diff --git a/scripts/test-remote-integration.sh b/scripts/test-remote-integration.sh
index d3e9f2a5265..4695dfa12e3 100755
--- a/scripts/test-remote-integration.sh
+++ b/scripts/test-remote-integration.sh
@@ -22,7 +22,7 @@ if [[ "$1" == "" ]]; then
 	AUTHORITY=vscode-remote://test+test
 	EXT_PATH=$ROOT/extensions
 	# Load remote node
-	yarn gulp node
+	npm run gulp node
 else
 	AUTHORITY=$1
 	EXT_PATH=$2
diff --git a/scripts/test-web-integration.bat b/scripts/test-web-integration.bat
index 700dd0a045e..bc33dfc2a35 100644
--- a/scripts/test-web-integration.bat
+++ b/scripts/test-web-integration.bat
@@ -9,7 +9,7 @@ IF "%~1" == "" (
 	set EXT_PATH=%CD:\=/%/extensions
 
 	:: Download nodejs executable for remote
-	call yarn gulp node
+	call npm run gulp node
 ) else (
 	set AUTHORITY=%1
 	set EXT_PATH=%2
@@ -26,8 +26,10 @@ if "%VSCODE_REMOTE_SERVER_PATH%"=="" (
 )
 
 if not exist ".\test\integration\browser\out\index.js" (
-	call yarn --cwd test/integration/browser compile
-	call yarn playwright-install
+	pushd test\integration\browser
+	call npm run compile
+	popd
+	call npm run playwright-install
 )
 
 
diff --git a/scripts/test-web-integration.sh b/scripts/test-web-integration.sh
index 0648a7f8cd8..a295d0bd9b5 100755
--- a/scripts/test-web-integration.sh
+++ b/scripts/test-web-integration.sh
@@ -18,8 +18,8 @@ else
 fi
 
 if [ ! -e 'test/integration/browser/out/index.js' ];then
-	yarn --cwd test/integration/browser compile
-	yarn playwright-install
+	(cd test/integration/browser && npm run compile)
+	npm run playwright-install
 fi
 
 
diff --git a/scripts/test.sh b/scripts/test.sh
index 66fde1df2c4..ae0d88cc734 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -24,10 +24,10 @@ fi
 VSCODECRASHDIR=$ROOT/.build/crashes
 
 # Node modules
-test -d node_modules || yarn
+test -d node_modules || npm i
 
 # Get electron
-yarn electron
+npm run electron
 
 # Unit Tests
 if [[ "$OSTYPE" == "darwin"* ]]; then
diff --git a/scripts/xterm-update.js b/scripts/xterm-update.js
index 8ede619160b..15759069604 100644
--- a/scripts/xterm-update.js
+++ b/scripts/xterm-update.js
@@ -75,7 +75,7 @@ async function update() {
 	if (modulesWithVersion.length > 0) {
 		for (const cwd of [vscodeDir, path.join(vscodeDir, 'remote'), path.join(vscodeDir, 'remote/web')]) {
 			console.log(`${path.join(cwd, 'package.json')}: Updating\n  ${modulesWithVersion.join('\n  ')}`);
-			cp.execSync(`yarn add ${modulesWithVersion.join(' ')}`, { cwd });
+			cp.execSync(`npm install ${modulesWithVersion.join(' ')}`, { cwd });
 		}
 	}
 
@@ -91,7 +91,7 @@ async function update() {
 	if (backendOnlyModulesWithVersion.length > 0) {
 		for (const cwd of [vscodeDir, path.join(vscodeDir, 'remote')]) {
 			console.log(`${path.join(cwd, 'package.json')}: Updating\n  ${backendOnlyModulesWithVersion.join('\n  ')}`);
-			cp.execSync(`yarn add ${backendOnlyModulesWithVersion.join(' ')}`, { cwd });
+			cp.execSync(`npm install ${backendOnlyModulesWithVersion.join(' ')}`, { cwd });
 		}
 	}
 }
diff --git a/scripts/xterm-update.ps1 b/scripts/xterm-update.ps1
index 11c282de888..2eae7fffe77 100644
--- a/scripts/xterm-update.ps1
+++ b/scripts/xterm-update.ps1
@@ -1 +1,2 @@
-node $PSScriptRoot\xterm-update.js (Get-Location)
+$scriptPath = Join-Path $PSScriptRoot "xterm-update.js"
+node $scriptPath (Get-Location)
diff --git a/src/bootstrap-amd.js b/src/bootstrap-amd.js
deleted file mode 100644
index cc47b050fb5..00000000000
--- a/src/bootstrap-amd.js
+++ /dev/null
@@ -1,87 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-//@ts-check
-'use strict';
-
-// Store the node.js require function in a variable
-// before loading our AMD loader to avoid issues
-// when this file is bundled with other files.
-const nodeRequire = require;
-
-// VSCODE_GLOBALS: node_modules
-globalThis._VSCODE_NODE_MODULES = new Proxy(Object.create(null), { get: (_target, mod) => nodeRequire(String(mod)) });
-
-// VSCODE_GLOBALS: package/product.json
-/** @type Record<string, any> */
-globalThis._VSCODE_PRODUCT_JSON = require('../product.json');
-if (process.env['VSCODE_DEV']) {
-	// Patch product overrides when running out of sources
-	try {
-		// @ts-ignore
-		const overrides = require('../product.overrides.json');
-		globalThis._VSCODE_PRODUCT_JSON = Object.assign(globalThis._VSCODE_PRODUCT_JSON, overrides);
-	} catch (error) { /* ignore */ }
-}
-globalThis._VSCODE_PACKAGE_JSON = require('../package.json');
-
-// @ts-ignore
-const loader = require('./vs/loader');
-const bootstrap = require('./bootstrap');
-const performance = require('./vs/base/common/performance');
-
-// Bootstrap: NLS
-const nlsConfig = bootstrap.setupNLS();
-
-// Bootstrap: Loader
-loader.config({
-	baseUrl: bootstrap.fileUriFromPath(__dirname, { isWindows: process.platform === 'win32' }),
-	catchError: true,
-	nodeRequire,
-	'vs/nls': nlsConfig,
-	amdModulesPattern: /^vs\//,
-	recordStats: true
-});
-
-// Running in Electron
-if (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron']) {
-	loader.define('fs', ['original-fs'], function (/** @type {import('fs')} */originalFS) {
-		return originalFS;  // replace the patched electron fs with the original node fs for all AMD code
-	});
-}
-
-// Pseudo NLS support
-if (nlsConfig && nlsConfig.pseudo) {
-	loader(['vs/nls'], function (/** @type {import('vs/nls')} */nlsPlugin) {
-		nlsPlugin.setPseudoTranslation(!!nlsConfig.pseudo);
-	});
-}
-
-/**
- * @param {string=} entrypoint
- * @param {(value: any) => void=} onLoad
- * @param {(err: Error) => void=} onError
- */
-exports.load = function (entrypoint, onLoad, onError) {
-	if (!entrypoint) {
-		return;
-	}
-
-	// code cache config
-	if (process.env['VSCODE_CODE_CACHE_PATH']) {
-		loader.config({
-			nodeCachedData: {
-				path: process.env['VSCODE_CODE_CACHE_PATH'],
-				seed: entrypoint
-			}
-		});
-	}
-
-	onLoad = onLoad || function () { };
-	onError = onError || function (err) { console.error(err); };
-
-	performance.mark('code/fork/willLoadCode');
-	loader([entrypoint], onLoad, onError);
-};
diff --git a/src/bootstrap-cli.ts b/src/bootstrap-cli.ts
new file mode 100644
index 00000000000..f454b830ea6
--- /dev/null
+++ b/src/bootstrap-cli.ts
@@ -0,0 +1,11 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// Delete `VSCODE_CWD` very early. We have seen
+// reports where `code .` would use the wrong
+// current working directory due to our variable
+// somehow escaping to the parent shell
+// (https://github.com/microsoft/vscode/issues/126399)
+delete process.env['VSCODE_CWD'];
diff --git a/src/bootstrap-esm.ts b/src/bootstrap-esm.ts
new file mode 100644
index 00000000000..f2cf101bb90
--- /dev/null
+++ b/src/bootstrap-esm.ts
@@ -0,0 +1,123 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as path from 'path';
+import * as fs from 'fs';
+import { fileURLToPath } from 'url';
+import { createRequire, register } from 'node:module';
+import { product, pkg } from './bootstrap-meta.js';
+import './bootstrap-node.js';
+import * as performance from './vs/base/common/performance.js';
+import { INLSConfiguration } from './vs/nls.js';
+
+const require = createRequire(import.meta.url);
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+// Install a hook to module resolution to map 'fs' to 'original-fs'
+if (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron']) {
+	const jsCode = `
+	export async function resolve(specifier, context, nextResolve) {
+		if (specifier === 'fs') {
+			return {
+				format: 'builtin',
+				shortCircuit: true,
+				url: 'node:original-fs'
+			};
+		}
+
+		// Defer to the next hook in the chain, which would be the
+		// Node.js default resolve if this is the last user-specified loader.
+		return nextResolve(specifier, context);
+	}`;
+	register(`data:text/javascript;base64,${Buffer.from(jsCode).toString('base64')}`, import.meta.url);
+}
+
+// Prepare globals that are needed for running
+globalThis._VSCODE_PRODUCT_JSON = { ...product };
+if (process.env['VSCODE_DEV']) {
+	try {
+		const overrides = require('../product.overrides.json');
+		globalThis._VSCODE_PRODUCT_JSON = Object.assign(globalThis._VSCODE_PRODUCT_JSON, overrides);
+	} catch (error) { /* ignore */ }
+}
+globalThis._VSCODE_PACKAGE_JSON = { ...pkg };
+globalThis._VSCODE_FILE_ROOT = __dirname;
+
+//#region NLS helpers
+
+let setupNLSResult: Promise<INLSConfiguration | undefined> | undefined = undefined;
+
+function setupNLS(): Promise<INLSConfiguration | undefined> {
+	if (!setupNLSResult) {
+		setupNLSResult = doSetupNLS();
+	}
+
+	return setupNLSResult;
+}
+
+async function doSetupNLS(): Promise<INLSConfiguration | undefined> {
+	performance.mark('code/willLoadNls');
+
+	let nlsConfig: INLSConfiguration | undefined = undefined;
+
+	let messagesFile: string | undefined;
+	if (process.env['VSCODE_NLS_CONFIG']) {
+		try {
+			nlsConfig = JSON.parse(process.env['VSCODE_NLS_CONFIG']);
+			if (nlsConfig?.languagePack?.messagesFile) {
+				messagesFile = nlsConfig.languagePack.messagesFile;
+			} else if (nlsConfig?.defaultMessagesFile) {
+				messagesFile = nlsConfig.defaultMessagesFile;
+			}
+
+			globalThis._VSCODE_NLS_LANGUAGE = nlsConfig?.resolvedLanguage;
+		} catch (e) {
+			console.error(`Error reading VSCODE_NLS_CONFIG from environment: ${e}`);
+		}
+	}
+
+	if (
+		process.env['VSCODE_DEV'] ||	// no NLS support in dev mode
+		!messagesFile					// no NLS messages file
+	) {
+		return undefined;
+	}
+
+	try {
+		globalThis._VSCODE_NLS_MESSAGES = JSON.parse((await fs.promises.readFile(messagesFile)).toString());
+	} catch (error) {
+		console.error(`Error reading NLS messages file ${messagesFile}: ${error}`);
+
+		// Mark as corrupt: this will re-create the language pack cache next startup
+		if (nlsConfig?.languagePack?.corruptMarkerFile) {
+			try {
+				await fs.promises.writeFile(nlsConfig.languagePack.corruptMarkerFile, 'corrupted');
+			} catch (error) {
+				console.error(`Error writing corrupted NLS marker file: ${error}`);
+			}
+		}
+
+		// Fallback to the default message file to ensure english translation at least
+		if (nlsConfig?.defaultMessagesFile && nlsConfig.defaultMessagesFile !== messagesFile) {
+			try {
+				globalThis._VSCODE_NLS_MESSAGES = JSON.parse((await fs.promises.readFile(nlsConfig.defaultMessagesFile)).toString());
+			} catch (error) {
+				console.error(`Error reading default NLS messages file ${nlsConfig.defaultMessagesFile}: ${error}`);
+			}
+		}
+	}
+
+	performance.mark('code/didLoadNls');
+
+	return nlsConfig;
+}
+
+//#endregion
+
+export async function bootstrapESM(): Promise<void> {
+
+	// NLS
+	await setupNLS();
+}
diff --git a/src/bootstrap-fork.js b/src/bootstrap-fork.ts
similarity index 75%
rename from src/bootstrap-fork.js
rename to src/bootstrap-fork.ts
index 9de1e6f0d15..85c831f9f61 100644
--- a/src/bootstrap-fork.js
+++ b/src/bootstrap-fork.ts
@@ -3,64 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-//@ts-check
-'use strict';
+import * as performance from './vs/base/common/performance.js';
+import { removeGlobalNodeJsModuleLookupPaths, devInjectNodeModuleLookupPath } from './bootstrap-node.js';
+import { bootstrapESM } from './bootstrap-esm.js';
 
-const performance = require('./vs/base/common/performance');
 performance.mark('code/fork/start');
 
-const bootstrap = require('./bootstrap');
-const bootstrapNode = require('./bootstrap-node');
-
-// Crash reporter
-configureCrashReporter();
-
-// Remove global paths from the node module lookup
-bootstrapNode.removeGlobalNodeModuleLookupPaths();
-
-// Enable ASAR in our forked processes
-bootstrap.enableASARSupport();
-
-if (process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH']) {
-	bootstrapNode.injectNodeModuleLookupPath(process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH']);
-}
-
-// Configure: pipe logging to parent process
-if (!!process.send && process.env['VSCODE_PIPE_LOGGING'] === 'true') {
-	pipeLoggingToParent();
-}
-
-// Handle Exceptions
-if (!process.env['VSCODE_HANDLES_UNCAUGHT_ERRORS']) {
-	handleExceptions();
-}
-
-// Terminate when parent terminates
-if (process.env['VSCODE_PARENT_PID']) {
-	terminateWhenParentTerminates();
-}
-
-// Load AMD entry point
-require('./bootstrap-amd').load(process.env['VSCODE_AMD_ENTRYPOINT']);
-
-
 //#region Helpers
 
-function pipeLoggingToParent() {
+function pipeLoggingToParent(): void {
 	const MAX_STREAM_BUFFER_LENGTH = 1024 * 1024;
 	const MAX_LENGTH = 100000;
 
 	/**
 	 * Prevent circular stringify and convert arguments to real array
-	 *
-	 * @param {ArrayLike<unknown>} args
 	 */
-	function safeToArray(args) {
-		/**
-		 * @type {string[]}
-		 */
-		const seen = [];
-		const argsArray = [];
+	function safeToString(args: ArrayLike<unknown>): string {
+		const seen: string[] = [];
+		const argsArray: unknown[] = [];
 
 		// Massage some arguments with special treatment
 		if (args.length) {
@@ -114,10 +74,7 @@ function pipeLoggingToParent() {
 		}
 	}
 
-	/**
-	 * @param {{ type: string; severity: string; arguments: string; }} arg
-	 */
-	function safeSend(arg) {
+	function safeSend(arg: { type: string; severity: string; arguments: string }): void {
 		try {
 			if (process.send) {
 				process.send(arg);
@@ -127,10 +84,7 @@ function pipeLoggingToParent() {
 		}
 	}
 
-	/**
-	 * @param {unknown} obj
-	 */
-	function isObject(obj) {
+	function isObject(obj: unknown): boolean {
 		return typeof obj === 'object'
 			&& obj !== null
 			&& !Array.isArray(obj)
@@ -138,12 +92,7 @@ function pipeLoggingToParent() {
 			&& !(obj instanceof Date);
 	}
 
-	/**
-	 *
-	 * @param {'log' | 'warn' | 'error'} severity
-	 * @param {string} args
-	 */
-	function safeSendConsoleMessage(severity, args) {
+	function safeSendConsoleMessage(severity: 'log' | 'warn' | 'error', args: string): void {
 		safeSend({ type: '__$console', severity, arguments: args });
 	}
 
@@ -152,14 +101,11 @@ function pipeLoggingToParent() {
 	 *
 	 * The wrapped property is not defined with `writable: false` to avoid
 	 * throwing errors, but rather a no-op setting. See https://github.com/microsoft/vscode-extension-telemetry/issues/88
-	 *
-	 * @param {'log' | 'info' | 'warn' | 'error'} method
-	 * @param {'log' | 'warn' | 'error'} severity
 	 */
-	function wrapConsoleMethod(method, severity) {
+	function wrapConsoleMethod(method: 'log' | 'info' | 'warn' | 'error', severity: 'log' | 'warn' | 'error'): void {
 		Object.defineProperty(console, method, {
 			set: () => { },
-			get: () => function () { safeSendConsoleMessage(severity, safeToArray(arguments)); },
+			get: () => function () { safeSendConsoleMessage(severity, safeToString(arguments)); },
 		});
 	}
 
@@ -168,20 +114,16 @@ function pipeLoggingToParent() {
 	 * renderer or CLI. It both calls through to the original method as well
 	 * as to console.log with complete lines so that they're made available
 	 * to the debugger/CLI.
-	 *
-	 * @param {'stdout' | 'stderr'} streamName
-	 * @param {'log' | 'warn' | 'error'} severity
 	 */
-	function wrapStream(streamName, severity) {
+	function wrapStream(streamName: 'stdout' | 'stderr', severity: 'log' | 'warn' | 'error'): void {
 		const stream = process[streamName];
 		const original = stream.write;
 
-		/** @type string */
 		let buf = '';
 
 		Object.defineProperty(stream, 'write', {
 			set: () => { },
-			get: () => (/** @type {string | Buffer | Uint8Array} */ chunk, /** @type {BufferEncoding | undefined} */ encoding, /** @type {((err?: Error | undefined) => void) | undefined} */ callback) => {
+			get: () => (chunk: string | Buffer | Uint8Array, encoding: BufferEncoding | undefined, callback: ((err?: Error | undefined) => void) | undefined) => {
 				buf += chunk.toString(encoding);
 				const eol = buf.length > MAX_STREAM_BUFFER_LENGTH ? buf.length : buf.lastIndexOf('\n');
 				if (eol !== -1) {
@@ -211,7 +153,7 @@ function pipeLoggingToParent() {
 	wrapStream('stdout', 'log');
 }
 
-function handleExceptions() {
+function handleExceptions(): void {
 
 	// Handle uncaught exceptions
 	process.on('uncaughtException', function (err) {
@@ -224,7 +166,7 @@ function handleExceptions() {
 	});
 }
 
-function terminateWhenParentTerminates() {
+function terminateWhenParentTerminates(): void {
 	const parentPid = Number(process.env['VSCODE_PARENT_PID']);
 
 	if (typeof parentPid === 'number' && !isNaN(parentPid)) {
@@ -238,13 +180,13 @@ function terminateWhenParentTerminates() {
 	}
 }
 
-function configureCrashReporter() {
+function configureCrashReporter(): void {
 	const crashReporterProcessType = process.env['VSCODE_CRASH_REPORTER_PROCESS_TYPE'];
 	if (crashReporterProcessType) {
 		try {
-			// @ts-ignore
+			//@ts-ignore
 			if (process['crashReporter'] && typeof process['crashReporter'].addExtraParameter === 'function' /* Electron only */) {
-				// @ts-ignore
+				//@ts-ignore
 				process['crashReporter'].addExtraParameter('processType', crashReporterProcessType);
 			}
 		} catch (error) {
@@ -254,3 +196,34 @@ function configureCrashReporter() {
 }
 
 //#endregion
+
+// Crash reporter
+configureCrashReporter();
+
+// Remove global paths from the node module lookup (node.js only)
+removeGlobalNodeJsModuleLookupPaths();
+
+if (process.env['VSCODE_DEV_INJECT_NODE_MODULE_LOOKUP_PATH']) {
+	devInjectNodeModuleLookupPath(process.env['VSCODE_DEV_INJECT_NODE_MODULE_LOOKUP_PATH']);
+}
+
+// Configure: pipe logging to parent process
+if (!!process.send && process.env['VSCODE_PIPE_LOGGING'] === 'true') {
+	pipeLoggingToParent();
+}
+
+// Handle Exceptions
+if (!process.env['VSCODE_HANDLES_UNCAUGHT_ERRORS']) {
+	handleExceptions();
+}
+
+// Terminate when parent terminates
+if (process.env['VSCODE_PARENT_PID']) {
+	terminateWhenParentTerminates();
+}
+
+// Bootstrap ESM
+await bootstrapESM();
+
+// Load ESM entry point
+await import([`./${process.env['VSCODE_ESM_ENTRYPOINT']}.js`].join('/') /* workaround: esbuild prints some strange warnings when trying to inline? */);
diff --git a/src/bootstrap-import.ts b/src/bootstrap-import.ts
new file mode 100644
index 00000000000..8869058159d
--- /dev/null
+++ b/src/bootstrap-import.ts
@@ -0,0 +1,64 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// *********************************************************************
+// *                                                                   *
+// *  We need this to redirect to node_modules from the remote-folder. *
+// *  This ONLY applies  when running out of source.                   *
+// *                                                                   *
+// *********************************************************************
+
+import { fileURLToPath, pathToFileURL } from 'node:url';
+import { promises } from 'node:fs';
+import { join } from 'node:path';
+
+// SEE https://nodejs.org/docs/latest/api/module.html#initialize
+
+const _specifierToUrl: Record<string, string> = {};
+
+export async function initialize(injectPath: string): Promise<void> {
+	// populate mappings
+
+	const injectPackageJSONPath = fileURLToPath(new URL('../package.json', pathToFileURL(injectPath)));
+	const packageJSON = JSON.parse(String(await promises.readFile(injectPackageJSONPath)));
+
+	for (const [name] of Object.entries(packageJSON.dependencies)) {
+		try {
+			const path = join(injectPackageJSONPath, `../node_modules/${name}/package.json`);
+			let { main } = JSON.parse(String(await promises.readFile(path)));
+
+			if (!main) {
+				main = 'index.js';
+			}
+			if (!main.endsWith('.js')) {
+				main += '.js';
+			}
+			const mainPath = join(injectPackageJSONPath, `../node_modules/${name}/${main}`);
+			_specifierToUrl[name] = pathToFileURL(mainPath).href;
+
+		} catch (err) {
+			console.error(name);
+			console.error(err);
+		}
+	}
+
+	console.log(`[bootstrap-import] Initialized node_modules redirector for: ${injectPath}`);
+}
+
+export async function resolve(specifier: string | number, context: any, nextResolve: (arg0: any, arg1: any) => any) {
+
+	const newSpecifier = _specifierToUrl[specifier];
+	if (newSpecifier !== undefined) {
+		return {
+			format: 'commonjs',
+			shortCircuit: true,
+			url: newSpecifier
+		};
+	}
+
+	// Defer to the next hook in the chain, which would be the
+	// Node.js default resolve if this is the last user-specified loader.
+	return nextResolve(specifier, context);
+}
diff --git a/src/bootstrap-meta.ts b/src/bootstrap-meta.ts
new file mode 100644
index 00000000000..2e704fd5704
--- /dev/null
+++ b/src/bootstrap-meta.ts
@@ -0,0 +1,22 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { createRequire } from 'node:module';
+import type { IProductConfiguration } from './vs/base/common/product.js';
+
+const require = createRequire(import.meta.url);
+
+let productObj: Partial<IProductConfiguration> & { BUILD_INSERT_PRODUCT_CONFIGURATION?: string } = { BUILD_INSERT_PRODUCT_CONFIGURATION: 'BUILD_INSERT_PRODUCT_CONFIGURATION' }; // DO NOT MODIFY, PATCHED DURING BUILD
+if (productObj['BUILD_INSERT_PRODUCT_CONFIGURATION']) {
+	productObj = require('../product.json'); // Running out of sources
+}
+
+let pkgObj = { BUILD_INSERT_PACKAGE_CONFIGURATION: 'BUILD_INSERT_PACKAGE_CONFIGURATION' }; // DO NOT MODIFY, PATCHED DURING BUILD
+if (pkgObj['BUILD_INSERT_PACKAGE_CONFIGURATION']) {
+	pkgObj = require('../package.json'); // Running out of sources
+}
+
+export const product = productObj;
+export const pkg = pkgObj;
diff --git a/src/bootstrap-node.js b/src/bootstrap-node.ts
similarity index 57%
rename from src/bootstrap-node.js
rename to src/bootstrap-node.ts
index 914b8290380..c0d5cd3693c 100644
--- a/src/bootstrap-node.js
+++ b/src/bootstrap-node.ts
@@ -3,15 +3,37 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-//@ts-check
-'use strict';
+import * as path from 'path';
+import * as fs from 'fs';
+import { fileURLToPath } from 'url';
+import { createRequire } from 'node:module';
+import type { IProductConfiguration } from './vs/base/common/product';
+
+const require = createRequire(import.meta.url);
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+// increase number of stack frames(from 10, https://github.com/v8/v8/wiki/Stack-Trace-API)
+Error.stackTraceLimit = 100;
+
+if (!process.env['VSCODE_HANDLES_SIGPIPE']) {
+	// Workaround for Electron not installing a handler to ignore SIGPIPE
+	// (https://github.com/electron/electron/issues/13254)
+	let didLogAboutSIGPIPE = false;
+	process.on('SIGPIPE', () => {
+		// See https://github.com/microsoft/vscode-remote-release/issues/6543
+		// In certain situations, the console itself can be in a broken pipe state
+		// so logging SIGPIPE to the console will cause an infinite async loop
+		if (!didLogAboutSIGPIPE) {
+			didLogAboutSIGPIPE = true;
+			console.error(new Error(`Unexpected SIGPIPE`));
+		}
+	});
+}
 
 // Setup current working directory in all our node & electron processes
 // - Windows: call `process.chdir()` to always set application folder as cwd
 // -  all OS: store the `process.cwd()` inside `VSCODE_CWD` for consistent lookups
-function setupCurrentWorkingDirectory() {
-	const path = require('path');
-
+function setupCurrentWorkingDirectory(): void {
 	try {
 
 		// Store the `process.cwd()` inside `VSCODE_CWD`
@@ -36,75 +58,54 @@ setupCurrentWorkingDirectory();
 /**
  * Add support for redirecting the loading of node modules
  *
- * @param {string} injectPath
+ * Note: only applies when running out of sources.
  */
-exports.injectNodeModuleLookupPath = function (injectPath) {
+export function devInjectNodeModuleLookupPath(injectPath: string): void {
+	if (!process.env['VSCODE_DEV']) {
+		return; // only applies running out of sources
+	}
+
 	if (!injectPath) {
 		throw new Error('Missing injectPath');
 	}
 
+	// register a loader hook
+	const Module = require('node:module');
+	Module.register('./bootstrap-import.js', { parentURL: import.meta.url, data: injectPath });
+}
+
+export function removeGlobalNodeJsModuleLookupPaths(): void {
+	if (typeof process?.versions?.electron === 'string') {
+		return; // Electron disables global search paths in https://github.com/electron/electron/blob/3186c2f0efa92d275dc3d57b5a14a60ed3846b0e/shell/common/node_bindings.cc#L653
+	}
+
 	const Module = require('module');
-	const path = require('path');
-
-	const nodeModulesPath = path.join(__dirname, '../node_modules');
-
-	// @ts-ignore
-	const originalResolveLookupPaths = Module._resolveLookupPaths;
-
-	// @ts-ignore
-	Module._resolveLookupPaths = function (moduleName, parent) {
-		const paths = originalResolveLookupPaths(moduleName, parent);
-		if (Array.isArray(paths)) {
-			for (let i = 0, len = paths.length; i < len; i++) {
-				if (paths[i] === nodeModulesPath) {
-					paths.splice(i, 0, injectPath);
-					break;
-				}
-			}
-		}
-
-		return paths;
-	};
-};
-
-exports.removeGlobalNodeModuleLookupPaths = function () {
-	const Module = require('module');
-	// @ts-ignore
 	const globalPaths = Module.globalPaths;
 
-	// @ts-ignore
 	const originalResolveLookupPaths = Module._resolveLookupPaths;
 
-	// @ts-ignore
-	Module._resolveLookupPaths = function (moduleName, parent) {
+	Module._resolveLookupPaths = function (moduleName: string, parent: any): string[] {
 		const paths = originalResolveLookupPaths(moduleName, parent);
 		if (Array.isArray(paths)) {
 			let commonSuffixLength = 0;
 			while (commonSuffixLength < paths.length && paths[paths.length - 1 - commonSuffixLength] === globalPaths[globalPaths.length - 1 - commonSuffixLength]) {
 				commonSuffixLength++;
 			}
+
 			return paths.slice(0, paths.length - commonSuffixLength);
 		}
+
 		return paths;
 	};
-};
+}
 
 /**
  * Helper to enable portable mode.
- *
- * @param {Partial<import('./vs/base/common/product').IProductConfiguration>} product
- * @returns {{ portableDataPath: string; isPortable: boolean; }}
  */
-exports.configurePortable = function (product) {
-	const fs = require('fs');
-	const path = require('path');
-
+export function configurePortable(product: Partial<IProductConfiguration>): { portableDataPath: string; isPortable: boolean } {
 	const appRoot = path.dirname(__dirname);
 
-	/**
-	 * @param {import('path')} path
-	 */
-	function getApplicationPath(path) {
+	function getApplicationPath(): string {
 		if (process.env['VSCODE_DEV']) {
 			return appRoot;
 		}
@@ -116,24 +117,20 @@ exports.configurePortable = function (product) {
 		return path.dirname(path.dirname(appRoot));
 	}
 
-	/**
-	 * @param {import('path')} path
-	 */
-	function getPortableDataPath(path) {
+	function getPortableDataPath(): string {
 		if (process.env['VSCODE_PORTABLE']) {
 			return process.env['VSCODE_PORTABLE'];
 		}
 
 		if (process.platform === 'win32' || process.platform === 'linux') {
-			return path.join(getApplicationPath(path), 'data');
+			return path.join(getApplicationPath(), 'data');
 		}
 
-		// @ts-ignore
 		const portableDataName = product.portable || `${product.applicationName}-portable-data`;
-		return path.join(path.dirname(getApplicationPath(path)), portableDataName);
+		return path.join(path.dirname(getApplicationPath()), portableDataName);
 	}
 
-	const portableDataPath = getPortableDataPath(path);
+	const portableDataPath = getPortableDataPath();
 	const isPortable = !('target' in product) && fs.existsSync(portableDataPath);
 	const portableTempPath = path.join(portableDataPath, 'tmp');
 	const isTempPortable = isPortable && fs.existsSync(portableTempPath);
@@ -157,4 +154,4 @@ exports.configurePortable = function (product) {
 		portableDataPath,
 		isPortable
 	};
-};
+}
diff --git a/src/vs/workbench/workbench.desktop.main.nls.js b/src/bootstrap-server.ts
similarity index 79%
rename from src/vs/workbench/workbench.desktop.main.nls.js
rename to src/bootstrap-server.ts
index d6a8b487eaf..d440e4195bd 100644
--- a/src/vs/workbench/workbench.desktop.main.nls.js
+++ b/src/bootstrap-server.ts
@@ -3,6 +3,5 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-// NOTE: THIS FILE WILL BE OVERWRITTEN DURING BUILD TIME, DO NOT EDIT
-
-define([], {});
\ No newline at end of file
+// Keep bootstrap-esm.js from redefining 'fs'.
+delete process.env['ELECTRON_RUN_AS_NODE'];
diff --git a/src/bootstrap-window.js b/src/bootstrap-window.js
deleted file mode 100644
index 40d15e7c59e..00000000000
--- a/src/bootstrap-window.js
+++ /dev/null
@@ -1,261 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-/// <reference path="typings/require.d.ts" />
-
-//@ts-check
-'use strict';
-
-/* eslint-disable no-restricted-globals */
-
-// Simple module style to support node.js and browser environments
-(function (globalThis, factory) {
-
-	// Node.js
-	if (typeof exports === 'object') {
-		module.exports = factory();
-	}
-
-	// Browser
-	else {
-		// @ts-ignore
-		globalThis.MonacoBootstrapWindow = factory();
-	}
-}(this, function () {
-	const bootstrapLib = bootstrap();
-	const preloadGlobals = sandboxGlobals();
-	const safeProcess = preloadGlobals.process;
-
-	/**
-	 * @typedef {import('./vs/base/parts/sandbox/common/sandboxTypes').ISandboxConfiguration} ISandboxConfiguration
-	 *
-	 * @param {string[]} modulePaths
-	 * @param {(result: unknown, configuration: ISandboxConfiguration) => Promise<unknown> | undefined} resultCallback
-	 * @param {{
-	 *  configureDeveloperSettings?: (config: ISandboxConfiguration) => {
-	 * 		forceDisableShowDevtoolsOnError?: boolean,
-	 * 		forceEnableDeveloperKeybindings?: boolean,
-	 * 		disallowReloadKeybinding?: boolean,
-	 * 		removeDeveloperKeybindingsAfterLoad?: boolean
-	 * 	},
-	 * 	canModifyDOM?: (config: ISandboxConfiguration) => void,
-	 * 	beforeLoaderConfig?: (loaderConfig: object) => void,
-	 *  beforeRequire?: (config: ISandboxConfiguration) => void
-	 * }} [options]
-	 */
-	async function load(modulePaths, resultCallback, options) {
-
-		// Await window configuration from preload
-		const timeout = setTimeout(() => { console.error(`[resolve window config] Could not resolve window configuration within 10 seconds, but will continue to wait...`); }, 10000);
-		performance.mark('code/willWaitForWindowConfig');
-		/** @type {ISandboxConfiguration} */
-		const configuration = await preloadGlobals.context.resolveConfiguration();
-		performance.mark('code/didWaitForWindowConfig');
-		clearTimeout(timeout);
-
-		// Signal DOM modifications are now OK
-		if (typeof options?.canModifyDOM === 'function') {
-			options.canModifyDOM(configuration);
-		}
-
-		// Developer settings
-		const {
-			forceEnableDeveloperKeybindings,
-			disallowReloadKeybinding,
-			removeDeveloperKeybindingsAfterLoad
-		} = typeof options?.configureDeveloperSettings === 'function' ? options.configureDeveloperSettings(configuration) : {
-			forceEnableDeveloperKeybindings: false,
-			disallowReloadKeybinding: false,
-			removeDeveloperKeybindingsAfterLoad: false
-		};
-		const isDev = !!safeProcess.env['VSCODE_DEV'];
-		const enableDeveloperKeybindings = isDev || forceEnableDeveloperKeybindings;
-		/**
-		 * @type {() => void | undefined}
-		 */
-		let developerDeveloperKeybindingsDisposable;
-		if (enableDeveloperKeybindings) {
-			developerDeveloperKeybindingsDisposable = registerDeveloperKeybindings(disallowReloadKeybinding);
-		}
-
-		// Get the nls configuration into the process.env as early as possible
-		// @ts-ignore
-		const nlsConfig = globalThis.MonacoBootstrap.setupNLS();
-
-		let locale = nlsConfig.availableLanguages['*'] || 'en';
-		if (locale === 'zh-tw') {
-			locale = 'zh-Hant';
-		} else if (locale === 'zh-cn') {
-			locale = 'zh-Hans';
-		}
-
-		window.document.documentElement.setAttribute('lang', locale);
-
-		window['MonacoEnvironment'] = {};
-
-		/**
-		 * @typedef {any} LoaderConfig
-		 */
-		/** @type {LoaderConfig} */
-		const loaderConfig = {
-			baseUrl: `${bootstrapLib.fileUriFromPath(configuration.appRoot, { isWindows: safeProcess.platform === 'win32', scheme: 'vscode-file', fallbackAuthority: 'vscode-app' })}/out`,
-			'vs/nls': nlsConfig,
-			preferScriptTags: true
-		};
-
-		// use a trusted types policy when loading via script tags
-		loaderConfig.trustedTypesPolicy = window.trustedTypes?.createPolicy('amdLoader', {
-			createScriptURL(value) {
-				if (value.startsWith(window.location.origin)) {
-					return value;
-				}
-				throw new Error(`Invalid script url: ${value}`);
-			}
-		});
-
-		// Teach the loader the location of the node modules we use in renderers
-		// This will enable to load these modules via <script> tags instead of
-		// using a fallback such as node.js require which does not exist in sandbox
-		const baseNodeModulesPath = isDev ? '../node_modules' : '../node_modules.asar';
-		loaderConfig.paths = {
-			'vscode-textmate': `${baseNodeModulesPath}/vscode-textmate/release/main.js`,
-			'vscode-oniguruma': `${baseNodeModulesPath}/vscode-oniguruma/release/main.js`,
-			'vsda': `${baseNodeModulesPath}/vsda/index.js`,
-			'@xterm/xterm': `${baseNodeModulesPath}/@xterm/xterm/lib/xterm.js`,
-			'@xterm/addon-clipboard': `${baseNodeModulesPath}/@xterm/addon-clipboard/lib/addon-clipboard.js`,
-			'@xterm/addon-image': `${baseNodeModulesPath}/@xterm/addon-image/lib/addon-image.js`,
-			'@xterm/addon-search': `${baseNodeModulesPath}/@xterm/addon-search/lib/addon-search.js`,
-			'@xterm/addon-serialize': `${baseNodeModulesPath}/@xterm/addon-serialize/lib/addon-serialize.js`,
-			'@xterm/addon-unicode11': `${baseNodeModulesPath}/@xterm/addon-unicode11/lib/addon-unicode11.js`,
-			'@xterm/addon-webgl': `${baseNodeModulesPath}/@xterm/addon-webgl/lib/addon-webgl.js`,
-			'@vscode/iconv-lite-umd': `${baseNodeModulesPath}/@vscode/iconv-lite-umd/lib/iconv-lite-umd.js`,
-			'jschardet': `${baseNodeModulesPath}/jschardet/dist/jschardet.min.js`,
-			'@vscode/vscode-languagedetection': `${baseNodeModulesPath}/@vscode/vscode-languagedetection/dist/lib/index.js`,
-			'vscode-regexp-languagedetection': `${baseNodeModulesPath}/vscode-regexp-languagedetection/dist/index.js`,
-			'tas-client-umd': `${baseNodeModulesPath}/tas-client-umd/lib/tas-client-umd.js`
-		};
-
-		// Signal before require.config()
-		if (typeof options?.beforeLoaderConfig === 'function') {
-			options.beforeLoaderConfig(loaderConfig);
-		}
-
-		// Configure loader
-		require.config(loaderConfig);
-
-		// Handle pseudo NLS
-		if (nlsConfig.pseudo) {
-			require(['vs/nls'], function (nlsPlugin) {
-				nlsPlugin.setPseudoTranslation(nlsConfig.pseudo);
-			});
-		}
-
-		// Signal before require()
-		if (typeof options?.beforeRequire === 'function') {
-			options.beforeRequire(configuration);
-		}
-
-		// Actually require the main module as specified
-		require(modulePaths, async firstModule => {
-			try {
-
-				// Callback only after process environment is resolved
-				const callbackResult = resultCallback(firstModule, configuration);
-				if (callbackResult instanceof Promise) {
-					await callbackResult;
-
-					if (developerDeveloperKeybindingsDisposable && removeDeveloperKeybindingsAfterLoad) {
-						developerDeveloperKeybindingsDisposable();
-					}
-				}
-			} catch (error) {
-				onUnexpectedError(error, enableDeveloperKeybindings);
-			}
-		}, onUnexpectedError);
-	}
-
-	/**
-	 * @param {boolean | undefined} disallowReloadKeybinding
-	 * @returns {() => void}
-	 */
-	function registerDeveloperKeybindings(disallowReloadKeybinding) {
-		const ipcRenderer = preloadGlobals.ipcRenderer;
-
-		const extractKey =
-			/**
-			 * @param {KeyboardEvent} e
-			 */
-			function (e) {
-				return [
-					e.ctrlKey ? 'ctrl-' : '',
-					e.metaKey ? 'meta-' : '',
-					e.altKey ? 'alt-' : '',
-					e.shiftKey ? 'shift-' : '',
-					e.keyCode
-				].join('');
-			};
-
-		// Devtools & reload support
-		const TOGGLE_DEV_TOOLS_KB = (safeProcess.platform === 'darwin' ? 'meta-alt-73' : 'ctrl-shift-73'); // mac: Cmd-Alt-I, rest: Ctrl-Shift-I
-		const TOGGLE_DEV_TOOLS_KB_ALT = '123'; // F12
-		const RELOAD_KB = (safeProcess.platform === 'darwin' ? 'meta-82' : 'ctrl-82'); // mac: Cmd-R, rest: Ctrl-R
-
-		/** @type {((e: KeyboardEvent) => void) | undefined} */
-		let listener = function (e) {
-			const key = extractKey(e);
-			if (key === TOGGLE_DEV_TOOLS_KB || key === TOGGLE_DEV_TOOLS_KB_ALT) {
-				ipcRenderer.send('vscode:toggleDevTools');
-			} else if (key === RELOAD_KB && !disallowReloadKeybinding) {
-				ipcRenderer.send('vscode:reloadWindow');
-			}
-		};
-
-		window.addEventListener('keydown', listener);
-
-		return function () {
-			if (listener) {
-				window.removeEventListener('keydown', listener);
-				listener = undefined;
-			}
-		};
-	}
-
-	/**
-	 * @param {string | Error} error
-	 * @param {boolean} [showDevtoolsOnError]
-	 */
-	function onUnexpectedError(error, showDevtoolsOnError) {
-		if (showDevtoolsOnError) {
-			const ipcRenderer = preloadGlobals.ipcRenderer;
-			ipcRenderer.send('vscode:openDevTools');
-		}
-
-		console.error(`[uncaught exception]: ${error}`);
-
-		if (error && typeof error !== 'string' && error.stack) {
-			console.error(error.stack);
-		}
-	}
-
-	/**
-	 * @return {{ fileUriFromPath: (path: string, config: { isWindows?: boolean, scheme?: string, fallbackAuthority?: string }) => string; }}
-	 */
-	function bootstrap() {
-		// @ts-ignore (defined in bootstrap.js)
-		return window.MonacoBootstrap;
-	}
-
-	/**
-	 * @return {typeof import('./vs/base/parts/sandbox/electron-sandbox/globals')}
-	 */
-	function sandboxGlobals() {
-		// @ts-ignore (defined in globals.js)
-		return window.vscode;
-	}
-
-	return {
-		load
-	};
-}));
diff --git a/src/bootstrap-window.ts b/src/bootstrap-window.ts
new file mode 100644
index 00000000000..1b2cedf68b4
--- /dev/null
+++ b/src/bootstrap-window.ts
@@ -0,0 +1,229 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/* eslint-disable no-restricted-globals */
+
+(function () {
+
+	type ISandboxConfiguration = import('vs/base/parts/sandbox/common/sandboxTypes.js').ISandboxConfiguration;
+	type ILoadResult<M, T extends ISandboxConfiguration> = import('vs/platform/window/electron-sandbox/window.js').ILoadResult<M, T>;
+	type ILoadOptions<T extends ISandboxConfiguration> = import('vs/platform/window/electron-sandbox/window.js').ILoadOptions<T>;
+	type IMainWindowSandboxGlobals = import('./vs/base/parts/sandbox/electron-sandbox/globals.js').IMainWindowSandboxGlobals;
+
+	const preloadGlobals: IMainWindowSandboxGlobals = (window as any).vscode; // defined by preload.ts
+	const safeProcess = preloadGlobals.process;
+
+	async function load<M, T extends ISandboxConfiguration>(esModule: string, options: ILoadOptions<T>): Promise<ILoadResult<M, T>> {
+
+		// Window Configuration from Preload Script
+		const configuration = await resolveWindowConfiguration<T>();
+
+		// Signal before import()
+		options?.beforeImport?.(configuration);
+
+		// Developer settings
+		const { enableDeveloperKeybindings, removeDeveloperKeybindingsAfterLoad, developerDeveloperKeybindingsDisposable, forceDisableShowDevtoolsOnError } = setupDeveloperKeybindings(configuration, options);
+
+		// NLS
+		setupNLS<T>(configuration);
+
+		// Compute base URL and set as global
+		const baseUrl = new URL(`${fileUriFromPath(configuration.appRoot, { isWindows: safeProcess.platform === 'win32', scheme: 'vscode-file', fallbackAuthority: 'vscode-app' })}/out/`);
+		globalThis._VSCODE_FILE_ROOT = baseUrl.toString();
+
+		// Dev only: CSS import map tricks
+		setupCSSImportMaps<T>(configuration, baseUrl);
+
+		// ESM Import
+		try {
+			const result = await import(new URL(`${esModule}.js`, baseUrl).href);
+
+			if (developerDeveloperKeybindingsDisposable && removeDeveloperKeybindingsAfterLoad) {
+				developerDeveloperKeybindingsDisposable();
+			}
+
+			return { result, configuration };
+		} catch (error) {
+			onUnexpectedError(error, enableDeveloperKeybindings && !forceDisableShowDevtoolsOnError);
+
+			throw error;
+		}
+	}
+
+	async function resolveWindowConfiguration<T extends ISandboxConfiguration>() {
+		const timeout = setTimeout(() => { console.error(`[resolve window config] Could not resolve window configuration within 10 seconds, but will continue to wait...`); }, 10000);
+		performance.mark('code/willWaitForWindowConfig');
+
+		const configuration = await preloadGlobals.context.resolveConfiguration() as T;
+		performance.mark('code/didWaitForWindowConfig');
+
+		clearTimeout(timeout);
+
+		return configuration;
+	}
+
+	function setupDeveloperKeybindings<T extends ISandboxConfiguration>(configuration: T, options: ILoadOptions<T>) {
+		const {
+			forceEnableDeveloperKeybindings,
+			disallowReloadKeybinding,
+			removeDeveloperKeybindingsAfterLoad,
+			forceDisableShowDevtoolsOnError
+		} = typeof options?.configureDeveloperSettings === 'function' ? options.configureDeveloperSettings(configuration) : {
+			forceEnableDeveloperKeybindings: false,
+			disallowReloadKeybinding: false,
+			removeDeveloperKeybindingsAfterLoad: false,
+			forceDisableShowDevtoolsOnError: false
+		};
+
+		const isDev = !!safeProcess.env['VSCODE_DEV'];
+		const enableDeveloperKeybindings = Boolean(isDev || forceEnableDeveloperKeybindings);
+		let developerDeveloperKeybindingsDisposable: Function | undefined = undefined;
+		if (enableDeveloperKeybindings) {
+			developerDeveloperKeybindingsDisposable = registerDeveloperKeybindings(disallowReloadKeybinding);
+		}
+
+		return {
+			enableDeveloperKeybindings,
+			removeDeveloperKeybindingsAfterLoad,
+			developerDeveloperKeybindingsDisposable,
+			forceDisableShowDevtoolsOnError
+		};
+	}
+
+	function registerDeveloperKeybindings(disallowReloadKeybinding: boolean | undefined): Function {
+		const ipcRenderer = preloadGlobals.ipcRenderer;
+
+		const extractKey =
+			function (e: KeyboardEvent) {
+				return [
+					e.ctrlKey ? 'ctrl-' : '',
+					e.metaKey ? 'meta-' : '',
+					e.altKey ? 'alt-' : '',
+					e.shiftKey ? 'shift-' : '',
+					e.keyCode
+				].join('');
+			};
+
+		// Devtools & reload support
+		const TOGGLE_DEV_TOOLS_KB = (safeProcess.platform === 'darwin' ? 'meta-alt-73' : 'ctrl-shift-73'); // mac: Cmd-Alt-I, rest: Ctrl-Shift-I
+		const TOGGLE_DEV_TOOLS_KB_ALT = '123'; // F12
+		const RELOAD_KB = (safeProcess.platform === 'darwin' ? 'meta-82' : 'ctrl-82'); // mac: Cmd-R, rest: Ctrl-R
+
+		let listener: ((e: KeyboardEvent) => void) | undefined = function (e) {
+			const key = extractKey(e);
+			if (key === TOGGLE_DEV_TOOLS_KB || key === TOGGLE_DEV_TOOLS_KB_ALT) {
+				ipcRenderer.send('vscode:toggleDevTools');
+			} else if (key === RELOAD_KB && !disallowReloadKeybinding) {
+				ipcRenderer.send('vscode:reloadWindow');
+			}
+		};
+
+		window.addEventListener('keydown', listener);
+
+		return function () {
+			if (listener) {
+				window.removeEventListener('keydown', listener);
+				listener = undefined;
+			}
+		};
+	}
+
+	function setupNLS<T extends ISandboxConfiguration>(configuration: T): void {
+		globalThis._VSCODE_NLS_MESSAGES = configuration.nls.messages;
+		globalThis._VSCODE_NLS_LANGUAGE = configuration.nls.language;
+
+		let language = configuration.nls.language || 'en';
+		if (language === 'zh-tw') {
+			language = 'zh-Hant';
+		} else if (language === 'zh-cn') {
+			language = 'zh-Hans';
+		}
+
+		window.document.documentElement.setAttribute('lang', language);
+	}
+
+	function onUnexpectedError(error: string | Error, showDevtoolsOnError: boolean): void {
+		if (showDevtoolsOnError) {
+			const ipcRenderer = preloadGlobals.ipcRenderer;
+			ipcRenderer.send('vscode:openDevTools');
+		}
+
+		console.error(`[uncaught exception]: ${error}`);
+
+		if (error && typeof error !== 'string' && error.stack) {
+			console.error(error.stack);
+		}
+	}
+
+	function fileUriFromPath(path: string, config: { isWindows?: boolean; scheme?: string; fallbackAuthority?: string }): string {
+
+		// Since we are building a URI, we normalize any backslash
+		// to slashes and we ensure that the path begins with a '/'.
+		let pathName = path.replace(/\\/g, '/');
+		if (pathName.length > 0 && pathName.charAt(0) !== '/') {
+			pathName = `/${pathName}`;
+		}
+
+		let uri: string;
+
+		// Windows: in order to support UNC paths (which start with '//')
+		// that have their own authority, we do not use the provided authority
+		// but rather preserve it.
+		if (config.isWindows && pathName.startsWith('//')) {
+			uri = encodeURI(`${config.scheme || 'file'}:${pathName}`);
+		}
+
+		// Otherwise we optionally add the provided authority if specified
+		else {
+			uri = encodeURI(`${config.scheme || 'file'}://${config.fallbackAuthority || ''}${pathName}`);
+		}
+
+		return uri.replace(/#/g, '%23');
+	}
+
+	function setupCSSImportMaps<T extends ISandboxConfiguration>(configuration: T, baseUrl: URL) {
+
+		// DEV ---------------------------------------------------------------------------------------
+		// DEV: This is for development and enables loading CSS via import-statements via import-maps.
+		// DEV: For each CSS modules that we have we defined an entry in the import map that maps to
+		// DEV: a blob URL that loads the CSS via a dynamic @import-rule.
+		// DEV ---------------------------------------------------------------------------------------
+
+		if (Array.isArray(configuration.cssModules) && configuration.cssModules.length > 0) {
+			performance.mark('code/willAddCssLoader');
+
+			const style = document.createElement('style');
+			style.type = 'text/css';
+			style.media = 'screen';
+			style.id = 'vscode-css-loading';
+			document.head.appendChild(style);
+
+			globalThis._VSCODE_CSS_LOAD = function (url) {
+				style.textContent += `@import url(${url});\n`;
+			};
+
+			const importMap: { imports: Record<string, string> } = { imports: {} };
+			for (const cssModule of configuration.cssModules) {
+				const cssUrl = new URL(cssModule, baseUrl).href;
+				const jsSrc = `globalThis._VSCODE_CSS_LOAD('${cssUrl}');\n`;
+				const blob = new Blob([jsSrc], { type: 'application/javascript' });
+				importMap.imports[cssUrl] = URL.createObjectURL(blob);
+			}
+
+			const ttp = window.trustedTypes?.createPolicy('vscode-bootstrapImportMap', { createScript(value) { return value; }, });
+			const importMapSrc = JSON.stringify(importMap, undefined, 2);
+			const importMapScript = document.createElement('script');
+			importMapScript.type = 'importmap';
+			importMapScript.setAttribute('nonce', '0c6a828f1297');
+			// @ts-ignore
+			importMapScript.textContent = ttp?.createScript(importMapSrc) ?? importMapSrc;
+			document.head.appendChild(importMapScript);
+
+			performance.mark('code/didAddCssLoader');
+		}
+	}
+
+	(globalThis as any).MonacoBootstrapWindow = { load };
+}());
diff --git a/src/bootstrap.js b/src/bootstrap.js
deleted file mode 100644
index bd0e92e672c..00000000000
--- a/src/bootstrap.js
+++ /dev/null
@@ -1,258 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-//@ts-check
-'use strict';
-
-// Simple module style to support node.js and browser environments
-(function (globalThis, factory) {
-
-	// Node.js
-	if (typeof exports === 'object') {
-		module.exports = factory();
-	}
-
-	// Browser
-	else {
-		// @ts-ignore
-		globalThis.MonacoBootstrap = factory();
-	}
-}(this, function () {
-	const Module = typeof require === 'function' ? require('module') : undefined;
-	const path = typeof require === 'function' ? require('path') : undefined;
-	const fs = typeof require === 'function' ? require('fs') : undefined;
-	const util = typeof require === 'function' ? require('util') : undefined;
-
-	//#region global bootstrapping
-
-	// increase number of stack frames(from 10, https://github.com/v8/v8/wiki/Stack-Trace-API)
-	Error.stackTraceLimit = 100;
-
-	if (typeof process !== 'undefined' && !process.env['VSCODE_HANDLES_SIGPIPE']) {
-		// Workaround for Electron not installing a handler to ignore SIGPIPE
-		// (https://github.com/electron/electron/issues/13254)
-		let didLogAboutSIGPIPE = false;
-		process.on('SIGPIPE', () => {
-			// See https://github.com/microsoft/vscode-remote-release/issues/6543
-			// We would normally install a SIGPIPE listener in bootstrap.js
-			// But in certain situations, the console itself can be in a broken pipe state
-			// so logging SIGPIPE to the console will cause an infinite async loop
-			if (!didLogAboutSIGPIPE) {
-				didLogAboutSIGPIPE = true;
-				console.error(new Error(`Unexpected SIGPIPE`));
-			}
-		});
-	}
-
-	//#endregion
-
-
-	//#region Add support for using node_modules.asar
-
-	function enableASARSupport() {
-		if (!path || !Module || typeof process === 'undefined') {
-			console.warn('enableASARSupport() is only available in node.js environments');
-			return;
-		}
-
-		const NODE_MODULES_PATH = path.join(__dirname, '../node_modules');
-		const NODE_MODULES_ASAR_PATH = `${NODE_MODULES_PATH}.asar`;
-
-		// @ts-ignore
-		const originalResolveLookupPaths = Module._resolveLookupPaths;
-
-		// @ts-ignore
-		Module._resolveLookupPaths = function (request, parent) {
-			const paths = originalResolveLookupPaths(request, parent);
-			if (Array.isArray(paths)) {
-				for (let i = 0, len = paths.length; i < len; i++) {
-					if (paths[i] === NODE_MODULES_PATH) {
-						paths.splice(i, 0, NODE_MODULES_ASAR_PATH);
-						break;
-					}
-				}
-			}
-
-			return paths;
-		};
-	}
-
-	//#endregion
-
-
-	//#region URI helpers
-
-	/**
-	 * @param {string} path
-	 * @param {{ isWindows?: boolean, scheme?: string, fallbackAuthority?: string }} config
-	 * @returns {string}
-	 */
-	function fileUriFromPath(path, config) {
-
-		// Since we are building a URI, we normalize any backslash
-		// to slashes and we ensure that the path begins with a '/'.
-		let pathName = path.replace(/\\/g, '/');
-		if (pathName.length > 0 && pathName.charAt(0) !== '/') {
-			pathName = `/${pathName}`;
-		}
-
-		/** @type {string} */
-		let uri;
-
-		// Windows: in order to support UNC paths (which start with '//')
-		// that have their own authority, we do not use the provided authority
-		// but rather preserve it.
-		if (config.isWindows && pathName.startsWith('//')) {
-			uri = encodeURI(`${config.scheme || 'file'}:${pathName}`);
-		}
-
-		// Otherwise we optionally add the provided authority if specified
-		else {
-			uri = encodeURI(`${config.scheme || 'file'}://${config.fallbackAuthority || ''}${pathName}`);
-		}
-
-		return uri.replace(/#/g, '%23');
-	}
-
-	//#endregion
-
-
-	//#region NLS helpers
-
-	/**
-	 * @returns {{locale?: string, availableLanguages: {[lang: string]: string;}, pseudo?: boolean } | undefined}
-	 */
-	function setupNLS() {
-
-		// Get the nls configuration as early as possible.
-		const process = safeProcess();
-		/** @type {{ availableLanguages: {}; loadBundle?: (bundle: string, language: string, cb: (err: Error | undefined, result: string | undefined) => void) => void; _resolvedLanguagePackCoreLocation?: string; _corruptedFile?: string }} */
-		let nlsConfig = { availableLanguages: {} };
-		if (process && process.env['VSCODE_NLS_CONFIG']) {
-			try {
-				nlsConfig = JSON.parse(process.env['VSCODE_NLS_CONFIG']);
-			} catch (e) {
-				// Ignore
-			}
-		}
-
-		if (nlsConfig._resolvedLanguagePackCoreLocation) {
-			const bundles = Object.create(null);
-
-			/**
-			 * @param {string} bundle
-			 * @param {string} language
-			 * @param {(err: Error | undefined, result: string | undefined) => void} cb
-			 */
-			nlsConfig.loadBundle = function (bundle, language, cb) {
-				const result = bundles[bundle];
-				if (result) {
-					cb(undefined, result);
-
-					return;
-				}
-
-				// @ts-ignore
-				safeReadNlsFile(nlsConfig._resolvedLanguagePackCoreLocation, `${bundle.replace(/\//g, '!')}.nls.json`).then(function (content) {
-					const json = JSON.parse(content);
-					bundles[bundle] = json;
-
-					cb(undefined, json);
-				}).catch((error) => {
-					try {
-						if (nlsConfig._corruptedFile) {
-							safeWriteNlsFile(nlsConfig._corruptedFile, 'corrupted').catch(function (error) { console.error(error); });
-						}
-					} finally {
-						cb(error, undefined);
-					}
-				});
-			};
-		}
-
-		return nlsConfig;
-	}
-
-	/**
-	 * @returns {typeof import('./vs/base/parts/sandbox/electron-sandbox/globals') | undefined}
-	 */
-	function safeSandboxGlobals() {
-		const globals = (typeof self === 'object' ? self : typeof global === 'object' ? global : {});
-
-		// @ts-ignore
-		return globals.vscode;
-	}
-
-	/**
-	 * @returns {import('./vs/base/parts/sandbox/electron-sandbox/globals').ISandboxNodeProcess | NodeJS.Process | undefined}
-	 */
-	function safeProcess() {
-		const sandboxGlobals = safeSandboxGlobals();
-		if (sandboxGlobals) {
-			return sandboxGlobals.process; // Native environment (sandboxed)
-		}
-
-		if (typeof process !== 'undefined') {
-			return process; // Native environment (non-sandboxed)
-		}
-
-		return undefined;
-	}
-
-	/**
-	 * @returns {import('./vs/base/parts/sandbox/electron-sandbox/electronTypes').IpcRenderer | undefined}
-	 */
-	function safeIpcRenderer() {
-		const sandboxGlobals = safeSandboxGlobals();
-		if (sandboxGlobals) {
-			return sandboxGlobals.ipcRenderer;
-		}
-
-		return undefined;
-	}
-
-	/**
-	 * @param {string[]} pathSegments
-	 * @returns {Promise<string>}
-	 */
-	async function safeReadNlsFile(...pathSegments) {
-		const ipcRenderer = safeIpcRenderer();
-		if (ipcRenderer) {
-			return ipcRenderer.invoke('vscode:readNlsFile', ...pathSegments);
-		}
-
-		if (fs && path && util) {
-			return (await util.promisify(fs.readFile)(path.join(...pathSegments))).toString();
-		}
-
-		throw new Error('Unsupported operation (read NLS files)');
-	}
-
-	/**
-	 * @param {string} path
-	 * @param {string} content
-	 * @returns {Promise<void>}
-	 */
-	function safeWriteNlsFile(path, content) {
-		const ipcRenderer = safeIpcRenderer();
-		if (ipcRenderer) {
-			return ipcRenderer.invoke('vscode:writeNlsFile', path, content);
-		}
-
-		if (fs && util) {
-			return util.promisify(fs.writeFile)(path, content);
-		}
-
-		throw new Error('Unsupported operation (write NLS files)');
-	}
-
-	//#endregion
-
-	return {
-		enableASARSupport,
-		setupNLS,
-		fileUriFromPath
-	};
-}));
diff --git a/src/buildfile.js b/src/buildfile.js
deleted file mode 100644
index 9898cd44d1f..00000000000
--- a/src/buildfile.js
+++ /dev/null
@@ -1,84 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-/**
- * @param {string} name
- * @param {string[]=} exclude
- */
-function createModuleDescription(name, exclude) {
-
-	let excludes = ['vs/css', 'vs/nls'];
-	if (Array.isArray(exclude) && exclude.length > 0) {
-		excludes = excludes.concat(exclude);
-	}
-
-	return {
-		name: name,
-		include: [],
-		exclude: excludes
-	};
-}
-
-/**
- * @param {string} name
- */
-function createEditorWorkerModuleDescription(name) {
-	return createModuleDescription(name, ['vs/base/common/worker/simpleWorker', 'vs/editor/common/services/editorSimpleWorker']);
-}
-
-exports.base = [
-	{
-		name: 'vs/editor/common/services/editorSimpleWorker',
-		include: ['vs/base/common/worker/simpleWorker'],
-		exclude: ['vs/nls'],
-		prepend: [
-			{ path: 'vs/loader.js' },
-			{ path: 'vs/base/worker/workerMain.js' }
-		],
-		dest: 'vs/base/worker/workerMain.js'
-	},
-	{
-		name: 'vs/base/common/worker/simpleWorker',
-		exclude: ['vs/nls'],
-	}
-];
-
-exports.workerExtensionHost = [createEditorWorkerModuleDescription('vs/workbench/api/worker/extensionHostWorker')];
-exports.workerNotebook = [createEditorWorkerModuleDescription('vs/workbench/contrib/notebook/common/services/notebookSimpleWorker')];
-exports.workerLanguageDetection = [createEditorWorkerModuleDescription('vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker')];
-exports.workerLocalFileSearch = [createEditorWorkerModuleDescription('vs/workbench/services/search/worker/localFileSearch')];
-exports.workerProfileAnalysis = [createEditorWorkerModuleDescription('vs/platform/profiling/electron-sandbox/profileAnalysisWorker')];
-
-exports.workbenchDesktop = [
-	createEditorWorkerModuleDescription('vs/workbench/contrib/output/common/outputLinkComputer'),
-	createEditorWorkerModuleDescription('vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker'),
-	createModuleDescription('vs/workbench/contrib/debug/node/telemetryApp'),
-	createModuleDescription('vs/platform/files/node/watcher/watcherMain'),
-	createModuleDescription('vs/platform/terminal/node/ptyHostMain'),
-	createModuleDescription('vs/workbench/api/node/extensionHostProcess'),
-	createModuleDescription('vs/workbench/contrib/issue/electron-sandbox/issueReporterMain'),
-];
-
-exports.workbenchWeb = [
-	createEditorWorkerModuleDescription('vs/workbench/contrib/output/common/outputLinkComputer'),
-	createEditorWorkerModuleDescription('vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker'),
-	createModuleDescription('vs/code/browser/workbench/workbench', ['vs/workbench/workbench.web.main'])
-];
-
-exports.keyboardMaps = [
-	createModuleDescription('vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.linux'),
-	createModuleDescription('vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.darwin'),
-	createModuleDescription('vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.win')
-];
-
-exports.code = [
-	createModuleDescription('vs/code/electron-main/main'),
-	createModuleDescription('vs/code/node/cli'),
-	createModuleDescription('vs/code/node/cliProcessMain', ['vs/code/node/cli']),
-	createModuleDescription('vs/code/node/sharedProcess/sharedProcessMain'),
-	createModuleDescription('vs/code/electron-sandbox/processExplorer/processExplorerMain')
-];
-
-exports.entrypoint = createModuleDescription;
diff --git a/src/cli.js b/src/cli.js
deleted file mode 100644
index a8aaa1f0d54..00000000000
--- a/src/cli.js
+++ /dev/null
@@ -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.
- *--------------------------------------------------------------------------------------------*/
-
-//@ts-check
-'use strict';
-
-// Delete `VSCODE_CWD` very early even before
-// importing bootstrap files. We have seen
-// reports where `code .` would use the wrong
-// current working directory due to our variable
-// somehow escaping to the parent shell
-// (https://github.com/microsoft/vscode/issues/126399)
-delete process.env['VSCODE_CWD'];
-
-const bootstrap = require('./bootstrap');
-const bootstrapNode = require('./bootstrap-node');
-const product = require('../product.json');
-
-// Enable portable support
-// @ts-ignore
-bootstrapNode.configurePortable(product);
-
-// Enable ASAR support
-bootstrap.enableASARSupport();
-
-// Signal processes that we got launched as CLI
-process.env['VSCODE_CLI'] = '1';
-
-// Load CLI through AMD loader
-require('./bootstrap-amd').load('vs/code/node/cli');
diff --git a/src/cli.ts b/src/cli.ts
new file mode 100644
index 00000000000..ac17eae7012
--- /dev/null
+++ b/src/cli.ts
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import './bootstrap-cli.js'; // this MUST come before other imports as it changes global state
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+import { configurePortable } from './bootstrap-node.js';
+import { bootstrapESM } from './bootstrap-esm.js';
+import { resolveNLSConfiguration } from './vs/base/node/nls.js';
+import { product } from './bootstrap-meta.js';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+// NLS
+const nlsConfiguration = await resolveNLSConfiguration({ userLocale: 'en', osLocale: 'en', commit: product.commit, userDataPath: '', nlsMetadataPath: __dirname });
+process.env['VSCODE_NLS_CONFIG'] = JSON.stringify(nlsConfiguration); // required for `bootstrap-esm` to pick up NLS messages
+
+// Enable portable support
+configurePortable(product);
+
+// Signal processes that we got launched as CLI
+process.env['VSCODE_CLI'] = '1';
+
+// Bootstrap ESM
+await bootstrapESM();
+
+// Load Server
+await import('./vs/code/node/cli.js');
diff --git a/src/main.js b/src/main.ts
similarity index 74%
rename from src/main.js
rename to src/main.ts
index d4bc388fb7f..25d2b5ce452 100644
--- a/src/main.js
+++ b/src/main.ts
@@ -3,36 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-//@ts-check
-'use strict';
+import * as path from 'path';
+import * as fs from 'original-fs';
+import * as os from 'os';
+import { configurePortable } from './bootstrap-node.js';
+import { bootstrapESM } from './bootstrap-esm.js';
+import { fileURLToPath } from 'url';
+import { app, protocol, crashReporter, Menu, contentTracing } from 'electron';
+import minimist from 'minimist';
+import { product } from './bootstrap-meta.js';
+import { parse } from './vs/base/common/jsonc.js';
+import { getUserDataPath } from './vs/platform/environment/node/userDataPath.js';
+import * as perf from './vs/base/common/performance.js';
+import { resolveNLSConfiguration } from './vs/base/node/nls.js';
+import { getUNCHost, addUNCHostToAllowlist } from './vs/base/node/unc.js';
+import { INLSConfiguration } from './vs/nls.js';
+import { NativeParsedArgs } from './vs/platform/environment/common/argv.js';
 
-/**
- * @typedef {import('./vs/base/common/product').IProductConfiguration} IProductConfiguration
- * @typedef {import('./vs/base/node/languagePacks').NLSConfiguration} NLSConfiguration
- * @typedef {import('./vs/platform/environment/common/argv').NativeParsedArgs} NativeParsedArgs
- */
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
-const perf = require('./vs/base/common/performance');
 perf.mark('code/didStartMain');
 
-const path = require('path');
-const fs = require('fs');
-const os = require('os');
-const bootstrap = require('./bootstrap');
-const bootstrapNode = require('./bootstrap-node');
-const { getUserDataPath } = require('./vs/platform/environment/node/userDataPath');
-const { stripComments } = require('./vs/base/common/stripComments');
-const { getUNCHost, addUNCHostToAllowlist } = require('./vs/base/node/unc');
-/** @type {Partial<IProductConfiguration>} */
-// @ts-ignore
-const product = require('../product.json');
-const { app, protocol, crashReporter, Menu } = require('electron');
-
 // Enable portable support
-const portable = bootstrapNode.configurePortable(product);
-
-// Enable ASAR support
-bootstrap.enableASARSupport();
+const portable = configurePortable(product);
 
 const args = parseCLIArgs();
 // Configure static command line arguments
@@ -109,27 +102,26 @@ protocol.registerSchemesAsPrivileged([
 registerListeners();
 
 /**
- * Support user defined locale: load it early before app('ready')
- * to have more things running in parallel.
- *
- * @type {Promise<NLSConfiguration> | undefined}
+ * We can resolve the NLS configuration early if it is defined
+ * in argv.json before `app.ready` event. Otherwise we can only
+ * resolve NLS after `app.ready` event to resolve the OS locale.
  */
-let nlsConfigurationPromise = undefined;
+let nlsConfigurationPromise: Promise<INLSConfiguration> | undefined = undefined;
 
-/**
- * @type {String}
- **/
 // Use the most preferred OS language for language recommendation.
 // The API might return an empty array on Linux, such as when
 // the 'C' locale is the user's only configured locale.
 // No matter the OS, if the array is empty, default back to 'en'.
-const resolved = app.getPreferredSystemLanguages()?.[0] ?? 'en';
-const osLocale = processZhLocale(resolved.toLowerCase());
-const metaDataFile = path.join(__dirname, 'nls.metadata.json');
-const locale = getUserDefinedLocale(argvConfig);
-if (locale) {
-	const { getNLSConfiguration } = require('./vs/base/node/languagePacks');
-	nlsConfigurationPromise = getNLSConfiguration(product.commit, userDataPath, metaDataFile, locale, osLocale);
+const osLocale = processZhLocale((app.getPreferredSystemLanguages()?.[0] ?? 'en').toLowerCase());
+const userLocale = getUserDefinedLocale(argvConfig);
+if (userLocale) {
+	nlsConfigurationPromise = resolveNLSConfiguration({
+		userLocale,
+		osLocale,
+		commit: product.commit,
+		userDataPath,
+		nlsMetadataPath: __dirname
+	});
 }
 
 // Pass in the locale to Electron so that the
@@ -141,15 +133,13 @@ if (locale) {
 // In that case, use `en` as the Electron locale.
 
 if (process.platform === 'win32' || process.platform === 'linux') {
-	const electronLocale = (!locale || locale === 'qps-ploc') ? 'en' : locale;
+	const electronLocale = (!userLocale || userLocale === 'qps-ploc') ? 'en' : userLocale;
 	app.commandLine.appendSwitch('lang', electronLocale);
 }
 
 // Load our code once ready
 app.once('ready', function () {
 	if (args['trace']) {
-		const contentTracing = require('electron').contentTracing;
-
 		const traceOptions = {
 			categoryFilter: args['trace-category-filter'] || '*',
 			traceOptions: args['trace-options'] || 'record-until-full,enable-sampling'
@@ -161,41 +151,38 @@ app.once('ready', function () {
 	}
 });
 
-/**
- * Main startup routine
- *
- * @param {string | undefined} codeCachePath
- * @param {NLSConfiguration} nlsConfig
- */
-function startup(codeCachePath, nlsConfig) {
-	nlsConfig._languagePackSupport = true;
-
-	process.env['VSCODE_NLS_CONFIG'] = JSON.stringify(nlsConfig);
-	process.env['VSCODE_CODE_CACHE_PATH'] = codeCachePath || '';
-
-	// Load main in AMD
-	perf.mark('code/willLoadMainBundle');
-	require('./bootstrap-amd').load('vs/code/electron-main/main', () => {
-		perf.mark('code/didLoadMainBundle');
-	});
-}
-
 async function onReady() {
 	perf.mark('code/mainAppReady');
 
 	try {
-		const [, nlsConfig] = await Promise.all([mkdirpIgnoreError(codeCachePath), resolveNlsConfiguration()]);
+		const [, nlsConfig] = await Promise.all([
+			mkdirpIgnoreError(codeCachePath),
+			resolveNlsConfiguration()
+		]);
 
-		startup(codeCachePath, nlsConfig);
+		await startup(codeCachePath, nlsConfig);
 	} catch (error) {
 		console.error(error);
 	}
 }
 
 /**
- * @param {NativeParsedArgs} cliArgs
+ * Main startup routine
  */
-function configureCommandlineSwitchesSync(cliArgs) {
+async function startup(codeCachePath: string | undefined, nlsConfig: INLSConfiguration): Promise<void> {
+	process.env['VSCODE_NLS_CONFIG'] = JSON.stringify(nlsConfig);
+	process.env['VSCODE_CODE_CACHE_PATH'] = codeCachePath || '';
+
+	// Bootstrap ESM
+	await bootstrapESM();
+
+	// Load Main
+	perf.mark('code/willLoadMainBundle');
+	await import('./vs/code/electron-main/main.js');
+	perf.mark('code/didLoadMainBundle');
+}
+
+function configureCommandlineSwitchesSync(cliArgs: NativeParsedArgs) {
 	const SUPPORTED_ELECTRON_SWITCHES = [
 
 		// alias from us for --disable-gpu
@@ -205,10 +192,14 @@ function configureCommandlineSwitchesSync(cliArgs) {
 		'force-color-profile',
 
 		// disable LCD font rendering, a Chromium flag
-		'disable-lcd-text'
+		'disable-lcd-text',
+
+		// bypass any specified proxy for the given semi-colon-separated list of hosts
+		'proxy-bypass-list'
 	];
 
 	if (process.platform === 'linux') {
+
 		// Force enable screen readers on Linux via this flag
 		SUPPORTED_ELECTRON_SWITCHES.push('force-renderer-accessibility');
 
@@ -242,11 +233,8 @@ function configureCommandlineSwitchesSync(cliArgs) {
 				} else {
 					app.commandLine.appendSwitch(argvKey);
 				}
-			} else if (argvValue) {
-				if (argvKey === 'force-color-profile') {
-					// Color profile
-					app.commandLine.appendSwitch(argvKey, argvValue);
-				} else if (argvKey === 'password-store') {
+			} else if (typeof argvValue === 'string' && argvValue) {
+				if (argvKey === 'password-store') {
 					// Password store
 					// TODO@TylerLeonhardt: Remove this migration in 3 months
 					let migratedArgvValue = argvValue;
@@ -254,6 +242,8 @@ function configureCommandlineSwitchesSync(cliArgs) {
 						migratedArgvValue = 'gnome-libsecret';
 					}
 					app.commandLine.appendSwitch(argvKey, migratedArgvValue);
+				} else {
+					app.commandLine.appendSwitch(argvKey, argvValue);
 				}
 			}
 		}
@@ -295,8 +285,7 @@ function configureCommandlineSwitchesSync(cliArgs) {
 	app.commandLine.appendSwitch('disable-features', featuresToDisable);
 
 	// Blink features to configure.
-	// `FontMatchingCTMigration` - Siwtch font matching on macOS to CoreText (Refs https://github.com/microsoft/vscode/issues/214390).
-	//  TODO(deepak1556): Enable this feature again after updating to Electron 30.
+	// `FontMatchingCTMigration` - Siwtch font matching on macOS to Appkit (Refs https://github.com/microsoft/vscode/issues/224496#issuecomment-2270418470).
 	const blinkFeaturesToDisable =
 		`FontMatchingCTMigration,${app.commandLine.getSwitchValue('disable-blink-features')}`;
 	app.commandLine.appendSwitch('disable-blink-features', blinkFeaturesToDisable);
@@ -310,13 +299,28 @@ function configureCommandlineSwitchesSync(cliArgs) {
 	return argvConfig;
 }
 
-function readArgvConfigSync() {
+interface IArgvConfig {
+	[key: string]: string | string[] | boolean | undefined;
+	readonly locale?: string;
+	readonly 'disable-lcd-text'?: boolean;
+	readonly 'proxy-bypass-list'?: string;
+	readonly 'disable-hardware-acceleration'?: boolean;
+	readonly 'force-color-profile'?: string;
+	readonly 'enable-crash-reporter'?: boolean;
+	readonly 'crash-reporter-id'?: string;
+	readonly 'enable-proposed-api'?: string[];
+	readonly 'log-level'?: string | string[];
+	readonly 'disable-chromium-sandbox'?: boolean;
+	readonly 'use-inmemory-secretstorage'?: boolean;
+}
+
+function readArgvConfigSync(): IArgvConfig {
 
 	// Read or create the argv.json config file sync before app('ready')
 	const argvConfigPath = getArgvConfigPath();
-	let argvConfig;
+	let argvConfig: IArgvConfig | undefined = undefined;
 	try {
-		argvConfig = JSON.parse(stripComments(fs.readFileSync(argvConfigPath).toString()));
+		argvConfig = parse(fs.readFileSync(argvConfigPath).toString());
 	} catch (error) {
 		if (error && error.code === 'ENOENT') {
 			createDefaultArgvConfigSync(argvConfigPath);
@@ -333,10 +337,7 @@ function readArgvConfigSync() {
 	return argvConfig;
 }
 
-/**
- * @param {string} argvConfigPath
- */
-function createDefaultArgvConfigSync(argvConfigPath) {
+function createDefaultArgvConfigSync(argvConfigPath: string): void {
 	try {
 
 		// Ensure argv config parent exists
@@ -368,7 +369,7 @@ function createDefaultArgvConfigSync(argvConfigPath) {
 	}
 }
 
-function getArgvConfigPath() {
+function getArgvConfigPath(): string {
 	const vscodePortable = process.env['VSCODE_PORTABLE'];
 	if (vscodePortable) {
 		return path.join(vscodePortable, 'argv.json');
@@ -379,12 +380,10 @@ function getArgvConfigPath() {
 		dataFolderName = `${dataFolderName}-dev`;
 	}
 
-	// @ts-ignore
-	return path.join(os.homedir(), dataFolderName, 'argv.json');
+	return path.join(os.homedir(), dataFolderName!, 'argv.json');
 }
 
-function configureCrashReporter() {
-
+function configureCrashReporter(): void {
 	let crashReporterDirectory = args['crash-reporter-directory'];
 	let submitURL = '';
 	if (crashReporterDirectory) {
@@ -419,7 +418,7 @@ function configureCrashReporter() {
 			const isDarwin = (process.platform === 'darwin');
 			const crashReporterId = argvConfig['crash-reporter-id'];
 			const uuidPattern = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
-			if (uuidPattern.test(crashReporterId)) {
+			if (crashReporterId && uuidPattern.test(crashReporterId)) {
 				if (isWindows) {
 					switch (process.arch) {
 						case 'x64':
@@ -475,12 +474,8 @@ function configureCrashReporter() {
 	});
 }
 
-/**
- * @param {NativeParsedArgs} cliArgs
- * @returns {string | null}
- */
-function getJSFlags(cliArgs) {
-	const jsFlags = [];
+function getJSFlags(cliArgs: NativeParsedArgs): string | null {
+	const jsFlags: string[] = [];
 
 	// Add any existing JS flags we already got from the command line
 	if (cliArgs['js-flags']) {
@@ -490,12 +485,7 @@ function getJSFlags(cliArgs) {
 	return jsFlags.length > 0 ? jsFlags.join(' ') : null;
 }
 
-/**
- * @returns {NativeParsedArgs}
- */
-function parseCLIArgs() {
-	const minimist = require('minimist');
-
+function parseCLIArgs(): NativeParsedArgs {
 	return minimist(process.argv, {
 		string: [
 			'user-data-dir',
@@ -515,33 +505,24 @@ function parseCLIArgs() {
 	});
 }
 
-function registerListeners() {
+function registerListeners(): void {
 
 	/**
 	 * macOS: when someone drops a file to the not-yet running VSCode, the open-file event fires even before
 	 * the app-ready event. We listen very early for open-file and remember this upon startup as path to open.
-	 *
-	 * @type {string[]}
 	 */
-	const macOpenFiles = [];
-	// @ts-ignore
-	global['macOpenFiles'] = macOpenFiles;
+	const macOpenFiles: string[] = [];
+	(globalThis as any)['macOpenFiles'] = macOpenFiles;
 	app.on('open-file', function (event, path) {
 		macOpenFiles.push(path);
 	});
 
 	/**
 	 * macOS: react to open-url requests.
-	 *
-	 * @type {string[]}
 	 */
-	const openUrls = [];
+	const openUrls: string[] = [];
 	const onOpenUrl =
-		/**
-		 * @param {{ preventDefault: () => void; }} event
-		 * @param {string} url
-		 */
-		function (event, url) {
+		function (event: { preventDefault: () => void }, url: string) {
 			event.preventDefault();
 
 			openUrls.push(url);
@@ -551,19 +532,14 @@ function registerListeners() {
 		app.on('open-url', onOpenUrl);
 	});
 
-	// @ts-ignore
-	global['getOpenUrls'] = function () {
+	(globalThis as any)['getOpenUrls'] = function () {
 		app.removeListener('open-url', onOpenUrl);
 
 		return openUrls;
 	};
 }
 
-/**
- * @returns {string | undefined} the location to use for the code cache
- * or `undefined` if disabled.
- */
-function getCodeCachePath() {
+function getCodeCachePath(): string | undefined {
 
 	// explicitly disabled via CLI args
 	if (process.argv.indexOf('--no-cached-data') > 0) {
@@ -584,24 +560,10 @@ function getCodeCachePath() {
 	return path.join(userDataPath, 'CachedData', commit);
 }
 
-/**
- * @param {string} dir
- * @returns {Promise<string>}
- */
-function mkdirp(dir) {
-	return new Promise((resolve, reject) => {
-		fs.mkdir(dir, { recursive: true }, err => (err && err.code !== 'EEXIST') ? reject(err) : resolve(dir));
-	});
-}
-
-/**
- * @param {string | undefined} dir
- * @returns {Promise<string | undefined>}
- */
-async function mkdirpIgnoreError(dir) {
+async function mkdirpIgnoreError(dir: string | undefined): Promise<string | undefined> {
 	if (typeof dir === 'string') {
 		try {
-			await mkdirp(dir);
+			await fs.promises.mkdir(dir, { recursive: true });
 
 			return dir;
 		} catch (error) {
@@ -614,13 +576,10 @@ async function mkdirpIgnoreError(dir) {
 
 //#region NLS Support
 
-/**
- * @param {string} appLocale
- * @returns string
- */
-function processZhLocale(appLocale) {
+function processZhLocale(appLocale: string): string {
 	if (appLocale.startsWith('zh')) {
 		const region = appLocale.split('-')[1];
+
 		// On Windows and macOS, Chinese languages returned by
 		// app.getPreferredSystemLanguages() start with zh-hans
 		// for Simplified Chinese or zh-hant for Traditional Chinese,
@@ -633,43 +592,54 @@ function processZhLocale(appLocale) {
 		if (['hans', 'cn', 'sg', 'my'].includes(region)) {
 			return 'zh-cn';
 		}
+
 		return 'zh-tw';
 	}
+
 	return appLocale;
 }
 
 /**
  * Resolve the NLS configuration
- *
- * @return {Promise<NLSConfiguration>}
  */
-async function resolveNlsConfiguration() {
+async function resolveNlsConfiguration(): Promise<INLSConfiguration> {
 
-	// First, we need to test a user defined locale. If it fails we try the app locale.
+	// First, we need to test a user defined locale.
+	// If it fails we try the app locale.
 	// If that fails we fall back to English.
-	let nlsConfiguration = nlsConfigurationPromise ? await nlsConfigurationPromise : undefined;
+
+	const nlsConfiguration = nlsConfigurationPromise ? await nlsConfigurationPromise : undefined;
 	if (nlsConfiguration) {
 		return nlsConfiguration;
 	}
 
-	// Try to use the app locale. Please note that the app locale is only
-	// valid after we have received the app ready event. This is why the
-	// code is here.
+	// Try to use the app locale which is only valid
+	// after the app ready event has been fired.
 
-	/**
-	 * @type string
-	 */
-	let appLocale = app.getLocale();
-	if (!appLocale) {
-		return { locale: 'en', osLocale, availableLanguages: {} };
+	let userLocale = app.getLocale();
+	if (!userLocale) {
+		return {
+			userLocale: 'en',
+			osLocale,
+			resolvedLanguage: 'en',
+			defaultMessagesFile: path.join(__dirname, 'nls.messages.json'),
+
+			// NLS: below 2 are a relic from old times only used by vscode-nls and deprecated
+			locale: 'en',
+			availableLanguages: {}
+		};
 	}
 
 	// See above the comment about the loader and case sensitiveness
-	appLocale = processZhLocale(appLocale.toLowerCase());
+	userLocale = processZhLocale(userLocale.toLowerCase());
 
-	const { getNLSConfiguration } = require('./vs/base/node/languagePacks');
-	nlsConfiguration = await getNLSConfiguration(product.commit, userDataPath, metaDataFile, appLocale, osLocale);
-	return nlsConfiguration ?? { locale: 'en', osLocale, availableLanguages: {} };
+	return resolveNLSConfiguration({
+		userLocale,
+		osLocale,
+		commit: product.commit,
+		userDataPath,
+		nlsMetadataPath: __dirname
+	});
 }
 
 /**
@@ -677,17 +647,14 @@ async function resolveNlsConfiguration() {
  * To make this work on case preserving & insensitive FS we do the following:
  * the language bundles have lower case language tags and we always lower case
  * the locale we receive from the user or OS.
- *
- * @param {{ locale: string | undefined; }} argvConfig
- * @returns {string | undefined}
  */
-function getUserDefinedLocale(argvConfig) {
+function getUserDefinedLocale(argvConfig: IArgvConfig): string | undefined {
 	const locale = args['locale'];
 	if (locale) {
 		return locale.toLowerCase(); // a directly provided --locale always wins
 	}
 
-	return argvConfig.locale && typeof argvConfig.locale === 'string' ? argvConfig.locale.toLowerCase() : undefined;
+	return typeof argvConfig?.locale === 'string' ? argvConfig.locale.toLowerCase() : undefined;
 }
 
 //#endregion
diff --git a/src/package.json b/src/package.json
new file mode 100644
index 00000000000..bedb411a912
--- /dev/null
+++ b/src/package.json
@@ -0,0 +1,3 @@
+{
+	"type": "module"
+}
diff --git a/src/server-cli.js b/src/server-cli.js
deleted file mode 100644
index fdfdac48b99..00000000000
--- a/src/server-cli.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-// @ts-check
-
-const path = require('path');
-
-// Keep bootstrap-amd.js from redefining 'fs'.
-delete process.env['ELECTRON_RUN_AS_NODE'];
-
-if (process.env['VSCODE_DEV']) {
-	// When running out of sources, we need to load node modules from remote/node_modules,
-	// which are compiled against nodejs, not electron
-	process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH'] = process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH'] || path.join(__dirname, '..', 'remote', 'node_modules');
-	require('./bootstrap-node').injectNodeModuleLookupPath(process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH']);
-} else {
-	delete process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH'];
-}
-require('./bootstrap-amd').load('vs/server/node/server.cli');
diff --git a/src/server-cli.ts b/src/server-cli.ts
new file mode 100644
index 00000000000..3ed0c87a466
--- /dev/null
+++ b/src/server-cli.ts
@@ -0,0 +1,33 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import './bootstrap-server.js'; // this MUST come before other imports as it changes global state
+import { dirname, join } from 'path';
+import { fileURLToPath } from 'url';
+import { devInjectNodeModuleLookupPath } from './bootstrap-node.js';
+import { bootstrapESM } from './bootstrap-esm.js';
+import { resolveNLSConfiguration } from './vs/base/node/nls.js';
+import { product } from './bootstrap-meta.js';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+// NLS
+const nlsConfiguration = await resolveNLSConfiguration({ userLocale: 'en', osLocale: 'en', commit: product.commit, userDataPath: '', nlsMetadataPath: __dirname });
+process.env['VSCODE_NLS_CONFIG'] = JSON.stringify(nlsConfiguration); // required for `bootstrap-esm` to pick up NLS messages
+
+if (process.env['VSCODE_DEV']) {
+	// When running out of sources, we need to load node modules from remote/node_modules,
+	// which are compiled against nodejs, not electron
+	process.env['VSCODE_DEV_INJECT_NODE_MODULE_LOOKUP_PATH'] = process.env['VSCODE_DEV_INJECT_NODE_MODULE_LOOKUP_PATH'] || join(__dirname, '..', 'remote', 'node_modules');
+	devInjectNodeModuleLookupPath(process.env['VSCODE_DEV_INJECT_NODE_MODULE_LOOKUP_PATH']);
+} else {
+	delete process.env['VSCODE_DEV_INJECT_NODE_MODULE_LOOKUP_PATH'];
+}
+
+// Bootstrap ESM
+await bootstrapESM();
+
+// Load Server
+await import('./vs/server/node/server.cli');
diff --git a/src/server-main.js b/src/server-main.ts
similarity index 59%
rename from src/server-main.js
rename to src/server-main.ts
index 81e88e118f7..6a9cf47d0fb 100644
--- a/src/server-main.js
+++ b/src/server-main.ts
@@ -3,59 +3,60 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-// @ts-check
+import './bootstrap-server.js'; // this MUST come before other imports as it changes global state
+import * as path from 'path';
+import * as http from 'http';
+import { AddressInfo } from 'net';
+import * as os from 'os';
+import * as readline from 'readline';
+import { performance } from 'perf_hooks';
+import { fileURLToPath } from 'url';
+import minimist from 'minimist';
+import { devInjectNodeModuleLookupPath } from './bootstrap-node.js';
+import { bootstrapESM } from './bootstrap-esm.js';
+import { resolveNLSConfiguration } from './vs/base/node/nls.js';
+import { product } from './bootstrap-meta.js';
+import * as perf from './vs/base/common/performance.js';
+import { INLSConfiguration } from './vs/nls.js';
+import { IServerAPI } from './vs/server/node/remoteExtensionHostAgentServer.js';
 
-const perf = require('./vs/base/common/performance');
-const performance = require('perf_hooks').performance;
-const product = require('../product.json');
-const readline = require('readline');
-const http = require('http');
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 perf.mark('code/server/start');
-// @ts-ignore
-global.vscodeServerStartTime = performance.now();
+(globalThis as any).vscodeServerStartTime = performance.now();
 
-async function start() {
-	const minimist = require('minimist');
-
-	// Do a quick parse to determine if a server or the cli needs to be started
-	const parsedArgs = minimist(process.argv.slice(2), {
-		boolean: ['start-server', 'list-extensions', 'print-ip-address', 'help', 'version', 'accept-server-license-terms', 'update-extensions'],
-		string: ['install-extension', 'install-builtin-extension', 'uninstall-extension', 'locate-extension', 'socket-path', 'host', 'port', 'compatibility'],
-		alias: { help: 'h', version: 'v' }
-	});
-	['host', 'port', 'accept-server-license-terms'].forEach(e => {
-		if (!parsedArgs[e]) {
-			const envValue = process.env[`VSCODE_SERVER_${e.toUpperCase().replace('-', '_')}`];
-			if (envValue) {
-				parsedArgs[e] = envValue;
-			}
+// Do a quick parse to determine if a server or the cli needs to be started
+const parsedArgs = minimist(process.argv.slice(2), {
+	boolean: ['start-server', 'list-extensions', 'print-ip-address', 'help', 'version', 'accept-server-license-terms', 'update-extensions'],
+	string: ['install-extension', 'install-builtin-extension', 'uninstall-extension', 'locate-extension', 'socket-path', 'host', 'port', 'compatibility'],
+	alias: { help: 'h', version: 'v' }
+});
+['host', 'port', 'accept-server-license-terms'].forEach(e => {
+	if (!parsedArgs[e]) {
+		const envValue = process.env[`VSCODE_SERVER_${e.toUpperCase().replace('-', '_')}`];
+		if (envValue) {
+			parsedArgs[e] = envValue;
 		}
-	});
-
-	const extensionLookupArgs = ['list-extensions', 'locate-extension'];
-	const extensionInstallArgs = ['install-extension', 'install-builtin-extension', 'uninstall-extension', 'update-extensions'];
-
-	const shouldSpawnCli = parsedArgs.help || parsedArgs.version || extensionLookupArgs.some(a => !!parsedArgs[a]) || (extensionInstallArgs.some(a => !!parsedArgs[a]) && !parsedArgs['start-server']);
-
-	if (shouldSpawnCli) {
-		loadCode().then((mod) => {
-			mod.spawnCli();
-		});
-		return;
 	}
+});
 
-	/**
-	 * @typedef { import('./vs/server/node/remoteExtensionHostAgentServer').IServerAPI } IServerAPI
-	 */
-	/** @type {IServerAPI | null} */
-	let _remoteExtensionHostAgentServer = null;
-	/** @type {Promise<IServerAPI> | null} */
-	let _remoteExtensionHostAgentServerPromise = null;
-	/** @returns {Promise<IServerAPI>} */
+const extensionLookupArgs = ['list-extensions', 'locate-extension'];
+const extensionInstallArgs = ['install-extension', 'install-builtin-extension', 'uninstall-extension', 'update-extensions'];
+
+const shouldSpawnCli = parsedArgs.help || parsedArgs.version || extensionLookupArgs.some(a => !!parsedArgs[a]) || (extensionInstallArgs.some(a => !!parsedArgs[a]) && !parsedArgs['start-server']);
+
+const nlsConfiguration = await resolveNLSConfiguration({ userLocale: 'en', osLocale: 'en', commit: product.commit, userDataPath: '', nlsMetadataPath: __dirname });
+
+if (shouldSpawnCli) {
+	loadCode(nlsConfiguration).then((mod) => {
+		mod.spawnCli();
+	});
+} else {
+	let _remoteExtensionHostAgentServer: IServerAPI | null = null;
+	let _remoteExtensionHostAgentServerPromise: Promise<IServerAPI> | null = null;
 	const getRemoteExtensionHostAgentServer = () => {
 		if (!_remoteExtensionHostAgentServerPromise) {
-			_remoteExtensionHostAgentServerPromise = loadCode().then(async (mod) => {
+			_remoteExtensionHostAgentServerPromise = loadCode(nlsConfiguration).then(async (mod) => {
 				const server = await mod.createServer(address);
 				_remoteExtensionHostAgentServer = server;
 				return server;
@@ -64,9 +65,6 @@ async function start() {
 		return _remoteExtensionHostAgentServerPromise;
 	};
 
-	const http = require('http');
-	const os = require('os');
-
 	if (Array.isArray(product.serverLicense) && product.serverLicense.length) {
 		console.log(product.serverLicense.join('\n'));
 		if (product.serverLicensePrompt && parsedArgs['accept-server-license-terms'] !== true) {
@@ -89,8 +87,7 @@ async function start() {
 	let firstRequest = true;
 	let firstWebSocket = true;
 
-	/** @type {string | import('net').AddressInfo | null} */
-	let address = null;
+	let address: string | AddressInfo | null = null;
 	const server = http.createServer(async (req, res) => {
 		if (firstRequest) {
 			firstRequest = false;
@@ -144,8 +141,7 @@ async function start() {
 		console.log(output);
 
 		perf.mark('code/server/started');
-		// @ts-ignore
-		global.vscodeServerListenTime = performance.now();
+		(globalThis as any).vscodeServerListenTime = performance.now();
 
 		await getRemoteExtensionHostAgentServer();
 	});
@@ -157,11 +153,8 @@ async function start() {
 		}
 	});
 }
-/**
- * @param {any} val
- * @returns {string | undefined}
- */
-function sanitizeStringArg(val) {
+
+function sanitizeStringArg(val: any): string | undefined {
 	if (Array.isArray(val)) { // if an argument is passed multiple times, minimist creates an array
 		val = val.pop(); // take the last item
 	}
@@ -176,14 +169,10 @@ function sanitizeStringArg(val) {
  * free port available in range.
  *
  * In absence of specified ports, connect to port 8000.
- * @param {string | undefined} host
- * @param {string | undefined} strPort
- * @returns {Promise<number>}
- * @throws
  */
-async function parsePort(host, strPort) {
+async function parsePort(host: string | undefined, strPort: string | undefined): Promise<number> {
 	if (strPort) {
-		let range;
+		let range: { start: number; end: number } | undefined;
 		if (strPort.match(/^\d+$/)) {
 			return parseInt(strPort, 10);
 		} else if (range = parseRange(strPort)) {
@@ -203,11 +192,7 @@ async function parsePort(host, strPort) {
 	return 8000;
 }
 
-/**
- * @param {string} strRange
- * @returns {{ start: number; end: number } | undefined}
- */
-function parseRange(strRange) {
+function parseRange(strRange: string): { start: number; end: number } | undefined {
 	const match = strRange.match(/^(\d+)-(\d+)$/);
 	if (match) {
 		const start = parseInt(match[1], 10), end = parseInt(match[2], 10);
@@ -221,15 +206,9 @@ function parseRange(strRange) {
 /**
  * Starting at the `start` port, look for a free port incrementing
  * by 1 until `end` inclusive. If no free port is found, undefined is returned.
- *
- * @param {string | undefined} host
- * @param {number} start
- * @param {number} end
- * @returns {Promise<number | undefined>}
- * @throws
  */
-async function findFreePort(host, start, end) {
-	const testPort = (/** @type {number} */ port) => {
+async function findFreePort(host: string | undefined, start: number, end: number): Promise<number | undefined> {
+	const testPort = (port: number) => {
 		return new Promise((resolve) => {
 			const server = http.createServer();
 			server.listen(port, host, () => {
@@ -248,32 +227,34 @@ async function findFreePort(host, start, end) {
 	return undefined;
 }
 
-/** @returns { Promise<typeof import('./vs/server/node/server.main')> } */
-function loadCode() {
-	return new Promise((resolve, reject) => {
-		const path = require('path');
+async function loadCode(nlsConfiguration: INLSConfiguration) {
 
-		delete process.env['ELECTRON_RUN_AS_NODE']; // Keep bootstrap-amd.js from redefining 'fs'.
+	// required for `bootstrap-esm` to pick up NLS messages
+	process.env['VSCODE_NLS_CONFIG'] = JSON.stringify(nlsConfiguration);
 
-		// See https://github.com/microsoft/vscode-remote-release/issues/6543
-		// We would normally install a SIGPIPE listener in bootstrap.js
-		// But in certain situations, the console itself can be in a broken pipe state
-		// so logging SIGPIPE to the console will cause an infinite async loop
-		process.env['VSCODE_HANDLES_SIGPIPE'] = 'true';
+	// See https://github.com/microsoft/vscode-remote-release/issues/6543
+	// We would normally install a SIGPIPE listener in bootstrap-node.js
+	// But in certain situations, the console itself can be in a broken pipe state
+	// so logging SIGPIPE to the console will cause an infinite async loop
+	process.env['VSCODE_HANDLES_SIGPIPE'] = 'true';
 
-		if (process.env['VSCODE_DEV']) {
-			// When running out of sources, we need to load node modules from remote/node_modules,
-			// which are compiled against nodejs, not electron
-			process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH'] = process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH'] || path.join(__dirname, '..', 'remote', 'node_modules');
-			require('./bootstrap-node').injectNodeModuleLookupPath(process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH']);
-		} else {
-			delete process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH'];
-		}
-		require('./bootstrap-amd').load('vs/server/node/server.main', resolve, reject);
-	});
+	if (process.env['VSCODE_DEV']) {
+		// When running out of sources, we need to load node modules from remote/node_modules,
+		// which are compiled against nodejs, not electron
+		process.env['VSCODE_DEV_INJECT_NODE_MODULE_LOOKUP_PATH'] = process.env['VSCODE_DEV_INJECT_NODE_MODULE_LOOKUP_PATH'] || path.join(__dirname, '..', 'remote', 'node_modules');
+		devInjectNodeModuleLookupPath(process.env['VSCODE_DEV_INJECT_NODE_MODULE_LOOKUP_PATH']);
+	} else {
+		delete process.env['VSCODE_DEV_INJECT_NODE_MODULE_LOOKUP_PATH'];
+	}
+
+	// Bootstrap ESM
+	await bootstrapESM();
+
+	// Load Server
+	return import('./vs/server/node/server.main.js');
 }
 
-function hasStdinWithoutTty() {
+function hasStdinWithoutTty(): boolean {
 	try {
 		return !process.stdin.isTTY; // Via https://twitter.com/MylesBorins/status/782009479382626304
 	} catch (error) {
@@ -282,11 +263,7 @@ function hasStdinWithoutTty() {
 	return false;
 }
 
-/**
- * @param {string} question
- * @returns { Promise<boolean> }
- */
-function prompt(question) {
+function prompt(question: string): Promise<boolean> {
 	const rl = readline.createInterface({
 		input: process.stdin,
 		output: process.stdout
@@ -306,6 +283,3 @@ function prompt(question) {
 		});
 	});
 }
-
-
-start();
diff --git a/src/tsconfig.base.json b/src/tsconfig.base.json
index c0a2e174591..9c7aacd4f11 100644
--- a/src/tsconfig.base.json
+++ b/src/tsconfig.base.json
@@ -1,6 +1,6 @@
 {
 	"compilerOptions": {
-		"module": "amd",
+		"module": "es2022",
 		"moduleResolution": "node",
 		"experimentalDecorators": true,
 		"noImplicitReturns": true,
@@ -24,6 +24,7 @@
 			"DOM",
 			"DOM.Iterable",
 			"WebWorker.ImportScripts"
-		]
+		],
+		"allowSyntheticDefaultImports": true
 	}
-}
+}
\ No newline at end of file
diff --git a/src/tsconfig.json b/src/tsconfig.json
index 35421bb1aaa..88d3daa0f29 100644
--- a/src/tsconfig.json
+++ b/src/tsconfig.json
@@ -7,14 +7,15 @@
 		"sourceMap": false,
 		"allowJs": true,
 		"resolveJsonModule": true,
-		"isolatedModules": true,
+		"isolatedModules": false,
 		"outDir": "../out/vs",
 		"types": [
+			"@webgpu/types",
 			"mocha",
 			"semver",
 			"sinon",
-			"winreg",
 			"trusted-types",
+			"winreg",
 			"wicg-file-system-access"
 		],
 		"plugins": [
@@ -25,18 +26,10 @@
 		]
 	},
 	"include": [
-		"./bootstrap.js",
-		"./bootstrap-amd.js",
-		"./bootstrap-fork.js",
-		"./bootstrap-node.js",
-		"./bootstrap-window.js",
-		"./cli.js",
-		"./main.js",
-		"./server-main.js",
-		"./server-cli.js",
+		"./*.ts",
 		"./typings",
 		"./vs/**/*.ts",
-		"vscode-dts/vscode.proposed.*.d.ts",
-		"vscode-dts/vscode.d.ts"
+		"./vscode-dts/vscode.proposed.*.d.ts",
+		"./vscode-dts/vscode.d.ts"
 	]
 }
diff --git a/src/tsconfig.monaco.json b/src/tsconfig.monaco.json
index 988f0485713..1e138cf9085 100644
--- a/src/tsconfig.monaco.json
+++ b/src/tsconfig.monaco.json
@@ -3,15 +3,16 @@
 	"compilerOptions": {
 		"noEmit": true,
 		"types": [
+			"@webgpu/types",
 			"trusted-types",
 			"wicg-file-system-access"
 		],
 		"paths": {},
 		"module": "amd",
-		"moduleResolution": "classic",
+		"moduleResolution": "node",
 		"removeComments": false,
 		"preserveConstEnums": true,
-		"target": "es2018",
+		"target": "ES2022",
 		"sourceMap": false,
 		"declaration": true
 	},
@@ -19,6 +20,8 @@
 		"typings/require.d.ts",
 		"typings/thenable.d.ts",
 		"typings/vscode-globals-product.d.ts",
+		"typings/vscode-globals-nls.d.ts",
+		"typings/editContext.d.ts",
 		"vs/loader.d.ts",
 		"vs/monaco.d.ts",
 		"vs/editor/*",
diff --git a/src/tsconfig.tsec.json b/src/tsconfig.tsec.json
index d2524df22d4..d822b0a4e89 100644
--- a/src/tsconfig.tsec.json
+++ b/src/tsconfig.tsec.json
@@ -10,6 +10,7 @@
 		]
 	},
 	"exclude": [
+		"./vs/workbench/contrib/webview/browser/pre/service-worker.js",
 		"*/test/*",
 		"**/*.test.ts"
 	]
diff --git a/src/tsec.exemptions.json b/src/tsec.exemptions.json
index 5fef171569e..d5e979d578a 100644
--- a/src/tsec.exemptions.json
+++ b/src/tsec.exemptions.json
@@ -14,7 +14,7 @@
 		"vs/workbench/services/keybinding/test/node/keyboardMapperTestUtils.ts"
 	],
 	"ban-trustedtypes-createpolicy": [
-		"bootstrap-window.js",
+		"bootstrap-window.ts",
 		"vs/amdX.ts",
 		"vs/base/browser/trustedTypes.ts",
 		"vs/base/worker/workerMain.ts",
@@ -39,5 +39,8 @@
 	],
 	"ban-element-insertadjacenthtml": [
 		"**/*.ts"
+	],
+	"ban-script-content-assignments": [
+		"bootstrap-window.ts"
 	]
 }
diff --git a/src/typings/editContext.d.ts b/src/typings/editContext.d.ts
new file mode 100644
index 00000000000..3e1107a6d2f
--- /dev/null
+++ b/src/typings/editContext.d.ts
@@ -0,0 +1,124 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+type DOMString = string;
+
+declare class EditContext extends EventTarget {
+	constructor(options?: EditContextInit);
+
+	updateText(rangeStart: number, rangeEnd: number, text: DOMString): void;
+	updateSelection(start: number, end: number): void;
+	updateControlBounds(controlBounds: DOMRect): void;
+	updateSelectionBounds(selectionBounds: DOMRect): void;
+	updateCharacterBounds(rangeStart: number, characterBounds: DOMRect[]): void;
+
+	attachedElements(): HTMLElement[];
+
+	get text(): DOMString;
+	get selectionStart(): number;
+	get selectionEnd(): number;
+	get characterBoundsRangeStart(): number;
+	characterBounds(): DOMRect[];
+
+	get ontextupdate(): EventHandler<TextUpdateEvent> | null;
+	set ontextupdate(value: EventHandler | null);
+
+	get ontextformatupdate(): EventHandler | null;
+	set ontextformatupdate(value: EventHandler | null);
+
+	get oncharacterboundsupdate(): EventHandler | null;
+	set oncharacterboundsupdate(value: EventHandler | null);
+
+	get oncompositionstart(): EventHandler | null;
+	set oncompositionstart(value: EventHandler | null);
+
+	get oncompositionend(): EventHandler | null;
+	set oncompositionend(value: EventHandler | null);
+
+	addEventListener<K extends keyof EditContextEventHandlersEventMap>(type: K, listener: (this: GlobalEventHandlers, ev: EditContextEventHandlersEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
+	addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
+	removeEventListener<K extends keyof EditContextEventHandlersEventMap>(type: K, listener: (this: GlobalEventHandlers, ev: EditContextEventHandlersEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
+	removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void;
+}
+
+interface EditContextInit {
+	text: DOMString;
+	selectionStart: number;
+	selectionEnd: number;
+}
+
+interface EditContextEventHandlersEventMap {
+	textupdate: TextUpdateEvent;
+	textformatupdate: TextFormatUpdateEvent;
+	characterboundsupdate: CharacterBoundsUpdateEvent;
+	compositionstart: Event;
+	compositionend: Event;
+}
+
+type EventHandler<TEvent extends Event = Event> = (event: TEvent) => void;
+
+declare class TextUpdateEvent extends Event {
+	new(type: DOMString, options?: TextUpdateEventInit): TextUpdateEvent;
+
+	readonly updateRangeStart: number;
+	readonly updateRangeEnd: number;
+	readonly text: DOMString;
+	readonly selectionStart: number;
+	readonly selectionEnd: number;
+}
+
+interface TextUpdateEventInit extends EventInit {
+	updateRangeStart: number;
+	updateRangeEnd: number;
+	text: DOMString;
+	selectionStart: number;
+	selectionEnd: number;
+	compositionStart: number;
+	compositionEnd: number;
+}
+
+declare class TextFormat {
+	new(options?: TextFormatInit): TextFormat;
+
+	readonly rangeStart: number;
+	readonly rangeEnd: number;
+	readonly underlineStyle: UnderlineStyle;
+	readonly underlineThickness: UnderlineThickness;
+}
+
+interface TextFormatInit {
+	rangeStart: number;
+	rangeEnd: number;
+	underlineStyle: UnderlineStyle;
+	underlineThickness: UnderlineThickness;
+}
+
+type UnderlineStyle = "none" | "solid" | "dotted" | "dashed" | "wavy";
+type UnderlineThickness = "none" | "thin" | "thick";
+
+declare class TextFormatUpdateEvent extends Event {
+	new(type: DOMString, options?: TextFormatUpdateEventInit): TextFormatUpdateEvent;
+	getTextFormats(): TextFormat[];
+}
+
+interface TextFormatUpdateEventInit extends EventInit {
+	textFormats: TextFormat[];
+}
+
+declare class CharacterBoundsUpdateEvent extends Event {
+	new(type: DOMString, options?: CharacterBoundsUpdateEventInit): CharacterBoundsUpdateEvent;
+
+	readonly rangeStart: number;
+	readonly rangeEnd: number;
+}
+
+interface CharacterBoundsUpdateEventInit extends EventInit {
+	rangeStart: number;
+	rangeEnd: number;
+}
+
+interface HTMLElement {
+	editContext?: EditContext;
+}
diff --git a/src/typings/require.d.ts b/src/typings/require.d.ts
index 7934279012f..08f0268deea 100644
--- a/src/typings/require.d.ts
+++ b/src/typings/require.d.ts
@@ -3,12 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-declare class LoaderEvent {
-	readonly type: number;
-	readonly timestamp: number;
-	readonly detail: string;
-}
+// TODO@esm this file should be removed
 
+/** @deprecated */
 declare const define: {
 	(moduleName: string, dependencies: string[], callback: (...args: any[]) => any): any;
 	(moduleName: string, dependencies: string[], definition: any): any;
@@ -19,24 +16,9 @@ declare const define: {
 };
 
 interface NodeRequire {
-	/**
-	 * @deprecated use `FileAccess.asFileUri()` for node.js contexts or `FileAccess.asBrowserUri` for browser contexts.
-	 */
-	toUrl(path: string): string;
-
-	/**
-	 * @deprecated MUST not be used anymore
-	 *
-	 * With the move from AMD to ESM we cannot use this anymore. There will be NO MORE node require like this.
-	 */
-	__$__nodeRequire<T>(moduleName: string): T;
-
 	(dependencies: string[], callback: (...args: any[]) => any, errorback?: (err: any) => void): any;
 	config(data: any): any;
-	onError: Function;
-	getStats?(): ReadonlyArray<LoaderEvent>;
-	hasDependencyCycle?(): boolean;
-	define(amdModuleId: string, dependencies: string[], callback: (...args: any[]) => any): any;
 }
 
+/** @deprecated */
 declare var require: NodeRequire;
diff --git a/src/typings/vscode-globals-modules.d.ts b/src/typings/vscode-globals-modules.d.ts
deleted file mode 100644
index c538b99b63f..00000000000
--- a/src/typings/vscode-globals-modules.d.ts
+++ /dev/null
@@ -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.
- *--------------------------------------------------------------------------------------------*/
-
-// AMD2ESM mirgation relevant
-
-declare global {
-
-	/**
-	 * @deprecated node modules that are in used in a context that
-	 * shouldn't have access to node_modules (node-free renderer or
-	 * shared process)
-	 */
-	var _VSCODE_NODE_MODULES: {
-		crypto: typeof import('crypto');
-		zlib: typeof import('zlib');
-		net: typeof import('net');
-		os: typeof import('os');
-		module: typeof import('module');
-		fs: typeof import('fs'),
-		vm: typeof import('vm'),
-		['native-watchdog']: typeof import('native-watchdog')
-		perf_hooks: typeof import('perf_hooks');
-
-		['vsda']: any
-		['vscode-encrypt']: any
-	}
-}
-
-// fake export to make global work
-export { }
diff --git a/src/typings/vscode-globals-nls.d.ts b/src/typings/vscode-globals-nls.d.ts
new file mode 100644
index 00000000000..2b5d48e110c
--- /dev/null
+++ b/src/typings/vscode-globals-nls.d.ts
@@ -0,0 +1,40 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// AMD2ESM migration relevant
+
+/**
+ * NLS Globals: these need to be defined in all contexts that make
+ * use of our `nls.localize` and `nls.localize2` functions. This includes:
+ * - Electron main process
+ * - Electron window (renderer) process
+ * - Utility Process
+ * - Node.js
+ * - Browser
+ * - Web worker
+ *
+ * That is because during build time we strip out all english strings from
+ * the resulting JS code and replace it with a <number> that is then looked
+ * up from the `_VSCODE_NLS_MESSAGES` array.
+ */
+declare global {
+	/**
+	 * All NLS messages produced by `localize` and `localize2` calls
+	 * under `src/vs` translated to the language as indicated by
+	 * `_VSCODE_NLS_LANGUAGE`.
+	 *
+	 * Instead of accessing this global variable directly, use function getNLSMessages.
+	 */
+	var _VSCODE_NLS_MESSAGES: string[];
+	/**
+	 * The actual language of the NLS messages (e.g. 'en', de' or 'pt-br').
+	 *
+	 * Instead of accessing this global variable directly, use function getNLSLanguage.
+	 */
+	var _VSCODE_NLS_LANGUAGE: string | undefined;
+}
+
+// fake export to make global work
+export { }
diff --git a/src/typings/vscode-globals-product.d.ts b/src/typings/vscode-globals-product.d.ts
index 780a6477de8..2cd632e77a0 100644
--- a/src/typings/vscode-globals-product.d.ts
+++ b/src/typings/vscode-globals-product.d.ts
@@ -3,10 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-// AMD2ESM mirgation relevant
+// AMD2ESM migration relevant
 
 declare global {
 
+	/**
+	 * Holds the file root for resources.
+	 */
+	var _VSCODE_FILE_ROOT: string;
+
+	/**
+	 * CSS loader that's available during development time.
+	 * DO NOT call directly, instead just import css modules, like `import 'some.css'`
+	 */
+	var _VSCODE_CSS_LOAD: (module: string) => void;
+
 	/**
 	 * @deprecated You MUST use `IProductService` whenever possible.
 	 */
diff --git a/src/vs/base/common/performance.d.ts b/src/typings/vscode-globals-ttp.d.ts
similarity index 60%
rename from src/vs/base/common/performance.d.ts
rename to src/typings/vscode-globals-ttp.d.ts
index fc233e6f834..b91080ec741 100644
--- a/src/vs/base/common/performance.d.ts
+++ b/src/typings/vscode-globals-ttp.d.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-export interface PerformanceMark {
-	readonly name: string;
-	readonly startTime: number;
+// AMD2ESM migration relevant
+
+declare global {
+
+	var _VSCODE_WEB_PACKAGE_TTP: Pick<TrustedTypePolicy<{
+		createScriptURL(value: string): string;
+	}>, 'name' | 'createScriptURL'> | undefined;
 }
 
-export function mark(name: string): void;
-
-/**
- * Returns all marks, sorted by `startTime`.
- */
-export function getMarks(): PerformanceMark[];
+// fake export to make global work
+export { }
diff --git a/src/vs/amdX.ts b/src/vs/amdX.ts
index ba164787d2e..8646f0b7b95 100644
--- a/src/vs/amdX.ts
+++ b/src/vs/amdX.ts
@@ -3,12 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isESM } from 'vs/base/common/amd';
-import { AppResourcePath, FileAccess, nodeModulesAsarPath, nodeModulesPath } from 'vs/base/common/network';
-import * as platform from 'vs/base/common/platform';
-import { IProductConfiguration } from 'vs/base/common/product';
-import { URI } from 'vs/base/common/uri';
+import { AppResourcePath, FileAccess, nodeModulesAsarPath, nodeModulesPath, Schemas, VSCODE_AUTHORITY } from './base/common/network.js';
+import * as platform from './base/common/platform.js';
+import { IProductConfiguration } from './base/common/product.js';
+import { URI } from './base/common/uri.js';
+import { generateUuid } from './base/common/uuid.js';
 
+export const canASAR = false; // TODO@esm: ASAR disabled in ESM
 
 class DefineCall {
 	constructor(
@@ -18,6 +19,12 @@ class DefineCall {
 	) { }
 }
 
+enum AMDModuleImporterState {
+	Uninitialized = 1,
+	InitializedInternal,
+	InitializedExternal
+}
+
 class AMDModuleImporter {
 	public static INSTANCE = new AMDModuleImporter();
 
@@ -25,7 +32,7 @@ class AMDModuleImporter {
 	private readonly _isRenderer = typeof document === 'object';
 
 	private readonly _defineCalls: DefineCall[] = [];
-	private _initialized = false;
+	private _state = AMDModuleImporterState.Uninitialized;
 	private _amdPolicy: Pick<TrustedTypePolicy<{
 		createScriptURL(value: string): string;
 	}>, 'name' | 'createScriptURL'> | undefined;
@@ -33,12 +40,18 @@ class AMDModuleImporter {
 	constructor() { }
 
 	private _initialize(): void {
-		if (this._initialized) {
+		if (this._state === AMDModuleImporterState.Uninitialized) {
+			if ((globalThis as any).define) {
+				this._state = AMDModuleImporterState.InitializedExternal;
+				return;
+			}
+		} else {
 			return;
 		}
-		this._initialized = true;
 
-		(<any>globalThis).define = (id: any, dependencies: any, callback: any) => {
+		this._state = AMDModuleImporterState.InitializedInternal;
+
+		(globalThis as any).define = (id: any, dependencies: any, callback: any) => {
 			if (typeof id !== 'string') {
 				callback = dependencies;
 				dependencies = id;
@@ -54,24 +67,24 @@ class AMDModuleImporter {
 			this._defineCalls.push(new DefineCall(id, dependencies, callback));
 		};
 
-		(<any>globalThis).define.amd = true;
+		(globalThis as any).define.amd = true;
 
 		if (this._isRenderer) {
 			// eslint-disable-next-line no-restricted-globals
-			this._amdPolicy = window.trustedTypes?.createPolicy('amdLoader', {
+			this._amdPolicy = (globalThis as any)._VSCODE_WEB_PACKAGE_TTP ?? window.trustedTypes?.createPolicy('amdLoader', {
 				createScriptURL(value) {
 					// eslint-disable-next-line no-restricted-globals
 					if (value.startsWith(window.location.origin)) {
 						return value;
 					}
-					if (value.startsWith('vscode-file://vscode-app')) {
+					if (value.startsWith(`${Schemas.vscodeFileResource}://${VSCODE_AUTHORITY}`)) {
 						return value;
 					}
 					throw new Error(`[trusted_script_src] Invalid script url: ${value}`);
 				}
 			});
 		} else if (this._isWebWorker) {
-			this._amdPolicy = (<any>globalThis).trustedTypes?.createPolicy('amdLoader', {
+			this._amdPolicy = (globalThis as any)._VSCODE_WEB_PACKAGE_TTP ?? (globalThis as any).trustedTypes?.createPolicy('amdLoader', {
 				createScriptURL(value: string) {
 					return value;
 				}
@@ -81,16 +94,42 @@ class AMDModuleImporter {
 
 	public async load<T>(scriptSrc: string): Promise<T> {
 		this._initialize();
+
+		if (this._state === AMDModuleImporterState.InitializedExternal) {
+			return new Promise<T>(resolve => {
+				const tmpModuleId = generateUuid();
+				(globalThis as any).define(tmpModuleId, [scriptSrc], function (moduleResult: T) {
+					resolve(moduleResult);
+				});
+			});
+		}
+
 		const defineCall = await (this._isWebWorker ? this._workerLoadScript(scriptSrc) : this._isRenderer ? this._rendererLoadScript(scriptSrc) : this._nodeJSLoadScript(scriptSrc));
 		if (!defineCall) {
-			throw new Error(`Did not receive a define call from script ${scriptSrc}`);
+			console.warn(`Did not receive a define call from script ${scriptSrc}`);
+			return <T>undefined;
 		}
-		// TODO require, exports, module
-		if (Array.isArray(defineCall.dependencies) && defineCall.dependencies.length > 0) {
-			throw new Error(`Cannot resolve dependencies for script ${scriptSrc}. The dependencies are: ${defineCall.dependencies.join(', ')}`);
+		// TODO@esm require, module
+		const exports = {};
+		const dependencyObjs: any[] = [];
+		const dependencyModules: string[] = [];
+
+		if (Array.isArray(defineCall.dependencies)) {
+
+			for (const mod of defineCall.dependencies) {
+				if (mod === 'exports') {
+					dependencyObjs.push(exports);
+				} else {
+					dependencyModules.push(mod);
+				}
+			}
+		}
+
+		if (dependencyModules.length > 0) {
+			throw new Error(`Cannot resolve dependencies for script ${scriptSrc}. The dependencies are: ${dependencyModules.join(', ')}`);
 		}
 		if (typeof defineCall.callback === 'function') {
-			return defineCall.callback([]);
+			return defineCall.callback(...dependencyObjs) ?? exports;
 		} else {
 			return defineCall.callback;
 		}
@@ -128,25 +167,19 @@ class AMDModuleImporter {
 		});
 	}
 
-	private _workerLoadScript(scriptSrc: string): Promise<DefineCall | undefined> {
-		return new Promise<DefineCall | undefined>((resolve, reject) => {
-			try {
-				if (this._amdPolicy) {
-					scriptSrc = this._amdPolicy.createScriptURL(scriptSrc) as any as string;
-				}
-				importScripts(scriptSrc);
-				resolve(this._defineCalls.pop());
-			} catch (err) {
-				reject(err);
-			}
-		});
+	private async _workerLoadScript(scriptSrc: string): Promise<DefineCall | undefined> {
+		if (this._amdPolicy) {
+			scriptSrc = this._amdPolicy.createScriptURL(scriptSrc) as any as string;
+		}
+		await import(scriptSrc);
+		return this._defineCalls.pop();
 	}
 
 	private async _nodeJSLoadScript(scriptSrc: string): Promise<DefineCall | undefined> {
 		try {
-			const fs = <typeof import('fs')>globalThis._VSCODE_NODE_MODULES['fs'];
-			const vm = <typeof import('vm')>globalThis._VSCODE_NODE_MODULES['vm'];
-			const module = <typeof import('module')>globalThis._VSCODE_NODE_MODULES['module'];
+			const fs = (await import(`${'fs'}`)).default;
+			const vm = (await import(`${'vm'}`)).default;
+			const module = (await import(`${'module'}`)).default;
 
 			const filePath = URI.parse(scriptSrc).fsPath;
 			const content = fs.readFileSync(filePath).toString();
@@ -155,7 +188,6 @@ class AMDModuleImporter {
 			const compileWrapper = script.runInThisContext();
 			compileWrapper.apply();
 			return this._defineCalls.pop();
-
 		} catch (error) {
 			throw error;
 		}
@@ -164,11 +196,6 @@ class AMDModuleImporter {
 
 const cache = new Map<string, Promise<any>>();
 
-let _paths: Record<string, string> = {};
-if (typeof globalThis.require === 'object') {
-	_paths = (<Record<string, any>>globalThis.require).paths ?? {};
-}
-
 /**
  * Utility for importing an AMD node module. This util supports AMD and ESM contexts and should be used while the ESM adoption
  * is on its way.
@@ -176,36 +203,38 @@ if (typeof globalThis.require === 'object') {
  * e.g. pass in `vscode-textmate/release/main.js`
  */
 export async function importAMDNodeModule<T>(nodeModuleName: string, pathInsideNodeModule: string, isBuilt?: boolean): Promise<T> {
-	if (isESM) {
-
-		if (isBuilt === undefined) {
-			const product = globalThis._VSCODE_PRODUCT_JSON as unknown as IProductConfiguration;
-			isBuilt = Boolean((product ?? (<any>globalThis).vscode?.context?.configuration()?.product)?.commit);
-		}
-
-		if (_paths[nodeModuleName]) {
-			nodeModuleName = _paths[nodeModuleName];
-		}
-
-		const nodeModulePath = `${nodeModuleName}/${pathInsideNodeModule}`;
-		if (cache.has(nodeModulePath)) {
-			return cache.get(nodeModulePath)!;
-		}
-		let scriptSrc: string;
-		if (/^\w[\w\d+.-]*:\/\//.test(nodeModulePath)) {
-			// looks like a URL
-			// bit of a special case for: src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker.ts
-			scriptSrc = nodeModulePath;
-		} else {
-			const useASAR = (isBuilt && !platform.isWeb);
-			const actualNodeModulesPath = (useASAR ? nodeModulesAsarPath : nodeModulesPath);
-			const resourcePath: AppResourcePath = `${actualNodeModulesPath}/${nodeModulePath}`;
-			scriptSrc = FileAccess.asBrowserUri(resourcePath).toString(true);
-		}
-		const result = AMDModuleImporter.INSTANCE.load<T>(scriptSrc);
-		cache.set(nodeModulePath, result);
-		return result;
-	} else {
-		return await import(nodeModuleName);
+	if (isBuilt === undefined) {
+		const product = globalThis._VSCODE_PRODUCT_JSON as unknown as IProductConfiguration;
+		isBuilt = Boolean((product ?? (globalThis as any).vscode?.context?.configuration()?.product)?.commit);
 	}
+
+	const nodeModulePath = pathInsideNodeModule ? `${nodeModuleName}/${pathInsideNodeModule}` : nodeModuleName;
+	if (cache.has(nodeModulePath)) {
+		return cache.get(nodeModulePath)!;
+	}
+	let scriptSrc: string;
+	if (/^\w[\w\d+.-]*:\/\//.test(nodeModulePath)) {
+		// looks like a URL
+		// bit of a special case for: src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker.ts
+		scriptSrc = nodeModulePath;
+	} else {
+		const useASAR = (canASAR && isBuilt && !platform.isWeb);
+		const actualNodeModulesPath = (useASAR ? nodeModulesAsarPath : nodeModulesPath);
+		const resourcePath: AppResourcePath = `${actualNodeModulesPath}/${nodeModulePath}`;
+		scriptSrc = FileAccess.asBrowserUri(resourcePath).toString(true);
+	}
+	const result = AMDModuleImporter.INSTANCE.load<T>(scriptSrc);
+	cache.set(nodeModulePath, result);
+	return result;
+}
+
+export function resolveAmdNodeModulePath(nodeModuleName: string, pathInsideNodeModule: string): string {
+	const product = globalThis._VSCODE_PRODUCT_JSON as unknown as IProductConfiguration;
+	const isBuilt = Boolean((product ?? (globalThis as any).vscode?.context?.configuration()?.product)?.commit);
+	const useASAR = (canASAR && isBuilt && !platform.isWeb);
+
+	const nodeModulePath = `${nodeModuleName}/${pathInsideNodeModule}`;
+	const actualNodeModulesPath = (useASAR ? nodeModulesAsarPath : nodeModulesPath);
+	const resourcePath: AppResourcePath = `${actualNodeModulesPath}/${nodeModulePath}`;
+	return FileAccess.asBrowserUri(resourcePath).toString(true);
 }
diff --git a/src/vs/base/browser/broadcast.ts b/src/vs/base/browser/broadcast.ts
index 53c921fdb2e..a90bf4bcd7b 100644
--- a/src/vs/base/browser/broadcast.ts
+++ b/src/vs/base/browser/broadcast.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { mainWindow } from 'vs/base/browser/window';
-import { getErrorMessage } from 'vs/base/common/errors';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
+import { mainWindow } from './window.js';
+import { getErrorMessage } from '../common/errors.js';
+import { Emitter } from '../common/event.js';
+import { Disposable, toDisposable } from '../common/lifecycle.js';
 
 export class BroadcastDataChannel<T> extends Disposable {
 
diff --git a/src/vs/base/browser/browser.ts b/src/vs/base/browser/browser.ts
index 77f55b943a5..cc3651edc55 100644
--- a/src/vs/base/browser/browser.ts
+++ b/src/vs/base/browser/browser.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CodeWindow, mainWindow } from 'vs/base/browser/window';
-import { Emitter } from 'vs/base/common/event';
+import { CodeWindow, mainWindow } from './window.js';
+import { Emitter } from '../common/event.js';
 
 class WindowManager {
 
@@ -66,7 +66,7 @@ class WindowManager {
 	}
 }
 
-export function addMatchMediaChangeListener(targetWindow: Window, query: string | MediaQueryList, callback: (this: MediaQueryList, ev: MediaQueryListEvent) => any): void {
+export function addMatchMediaChangeListener(targetWindow: Window, query: string | MediaQueryList, callback: (this: MediaQueryList, ev: MediaQueryListEvent) => unknown): void {
 	if (typeof query === 'string') {
 		query = targetWindow.matchMedia(query);
 	}
@@ -133,3 +133,9 @@ export function isStandalone(): boolean {
 export function isWCOEnabled(): boolean {
 	return (navigator as any)?.windowControlsOverlay?.visible;
 }
+
+// Returns the bounding rect of the titlebar area if it is supported and defined
+// See docs at https://developer.mozilla.org/en-US/docs/Web/API/WindowControlsOverlay/getTitlebarAreaRect
+export function getWCOTitlebarAreaRect(targetWindow: Window): DOMRect | undefined {
+	return (targetWindow.navigator as any)?.windowControlsOverlay?.getTitlebarAreaRect();
+}
diff --git a/src/vs/base/browser/canIUse.ts b/src/vs/base/browser/canIUse.ts
index 60261a974d0..895d3eb28a7 100644
--- a/src/vs/base/browser/canIUse.ts
+++ b/src/vs/base/browser/canIUse.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as browser from 'vs/base/browser/browser';
-import { mainWindow } from 'vs/base/browser/window';
-import * as platform from 'vs/base/common/platform';
+import * as browser from './browser.js';
+import { mainWindow } from './window.js';
+import * as platform from '../common/platform.js';
 
 export const enum KeyboardSupport {
 	Always,
diff --git a/src/vs/base/browser/contextmenu.ts b/src/vs/base/browser/contextmenu.ts
index 3ab23f5bc9f..568808c078c 100644
--- a/src/vs/base/browser/contextmenu.ts
+++ b/src/vs/base/browser/contextmenu.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { IActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { IActionViewItem } from 'vs/base/browser/ui/actionbar/actionbar';
-import { AnchorAlignment, AnchorAxisAlignment, IAnchor } from 'vs/base/browser/ui/contextview/contextview';
-import { IAction, IActionRunner } from 'vs/base/common/actions';
-import { ResolvedKeybinding } from 'vs/base/common/keybindings';
-import { OmitOptional } from 'vs/base/common/types';
+import { StandardMouseEvent } from './mouseEvent.js';
+import { IActionViewItemOptions } from './ui/actionbar/actionViewItems.js';
+import { IActionViewItem } from './ui/actionbar/actionbar.js';
+import { AnchorAlignment, AnchorAxisAlignment, IAnchor } from './ui/contextview/contextview.js';
+import { IAction, IActionRunner } from '../common/actions.js';
+import { ResolvedKeybinding } from '../common/keybindings.js';
+import { OmitOptional } from '../common/types.js';
 
 export interface IContextMenuEvent {
 	readonly shiftKey?: boolean;
diff --git a/src/vs/base/browser/defaultWorkerFactory.ts b/src/vs/base/browser/defaultWorkerFactory.ts
index 71391b063f3..f6054bf6402 100644
--- a/src/vs/base/browser/defaultWorkerFactory.ts
+++ b/src/vs/base/browser/defaultWorkerFactory.ts
@@ -3,22 +3,33 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createTrustedTypesPolicy } from 'vs/base/browser/trustedTypes';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { COI } from 'vs/base/common/network';
-import { IWorker, IWorkerCallback, IWorkerFactory, logOnceWebWorkerWarning } from 'vs/base/common/worker/simpleWorker';
-import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
+import { createTrustedTypesPolicy } from './trustedTypes.js';
+import { onUnexpectedError } from '../common/errors.js';
+import { AppResourcePath, COI, FileAccess } from '../common/network.js';
+import { URI } from '../common/uri.js';
+import { IWorker, IWorkerCallback, IWorkerClient, IWorkerDescriptor, IWorkerFactory, logOnceWebWorkerWarning, SimpleWorkerClient } from '../common/worker/simpleWorker.js';
+import { Disposable, toDisposable } from '../common/lifecycle.js';
+import { coalesce } from '../common/arrays.js';
+import { getNLSLanguage, getNLSMessages } from '../../nls.js';
 
-const ttPolicy = createTrustedTypesPolicy('defaultWorkerFactory', { createScriptURL: value => value });
+// Reuse the trusted types policy defined from worker bootstrap
+// when available.
+// Refs https://github.com/microsoft/vscode/issues/222193
+let ttPolicy: ReturnType<typeof createTrustedTypesPolicy>;
+if (typeof self === 'object' && self.constructor && self.constructor.name === 'DedicatedWorkerGlobalScope' && (globalThis as any).workerttPolicy !== undefined) {
+	ttPolicy = (globalThis as any).workerttPolicy;
+} else {
+	ttPolicy = createTrustedTypesPolicy('defaultWorkerFactory', { createScriptURL: value => value });
+}
 
 export function createBlobWorker(blobUrl: string, options?: WorkerOptions): Worker {
 	if (!blobUrl.startsWith('blob:')) {
 		throw new URIError('Not a blob-url: ' + blobUrl);
 	}
-	return new Worker(ttPolicy ? ttPolicy.createScriptURL(blobUrl) as unknown as string : blobUrl, options);
+	return new Worker(ttPolicy ? ttPolicy.createScriptURL(blobUrl) as unknown as string : blobUrl, { ...options, type: 'module' });
 }
 
-function getWorker(label: string): Worker | Promise<Worker> {
+function getWorker(esmWorkerLocation: URI | undefined, label: string): Worker | Promise<Worker> {
 	// Option for hosts to overwrite the worker script (used in the standalone editor)
 	interface IMonacoEnvironment {
 		getWorker?(moduleId: string, label: string): Worker | Promise<Worker>;
@@ -31,48 +42,65 @@ function getWorker(label: string): Worker | Promise<Worker> {
 		}
 		if (typeof monacoEnvironment.getWorkerUrl === 'function') {
 			const workerUrl = monacoEnvironment.getWorkerUrl('workerMain.js', label);
-			return new Worker(ttPolicy ? ttPolicy.createScriptURL(workerUrl) as unknown as string : workerUrl, { name: label });
+			return new Worker(ttPolicy ? ttPolicy.createScriptURL(workerUrl) as unknown as string : workerUrl, { name: label, type: 'module' });
 		}
 	}
-	// ESM-comment-begin
-	if (typeof require === 'function') {
-		// check if the JS lives on a different origin
-		const workerMain = require.toUrl('vs/base/worker/workerMain.js'); // explicitly using require.toUrl(), see https://github.com/microsoft/vscode/issues/107440#issuecomment-698982321
-		const workerUrl = getWorkerBootstrapUrl(workerMain, label);
-		return new Worker(ttPolicy ? ttPolicy.createScriptURL(workerUrl) as unknown as string : workerUrl, { name: label });
+	if (esmWorkerLocation) {
+		const workerUrl = getWorkerBootstrapUrl(label, esmWorkerLocation.toString(true));
+		const worker = new Worker(ttPolicy ? ttPolicy.createScriptURL(workerUrl) as unknown as string : workerUrl, { name: label, type: 'module' });
+		return whenESMWorkerReady(worker);
 	}
-	// ESM-comment-end
 	throw new Error(`You must define a function MonacoEnvironment.getWorkerUrl or MonacoEnvironment.getWorker`);
 }
 
-// ESM-comment-begin
-export function getWorkerBootstrapUrl(scriptPath: string, label: string): string {
-	if (/^((http:)|(https:)|(file:))/.test(scriptPath) && scriptPath.substring(0, globalThis.origin.length) !== globalThis.origin) {
+function getWorkerBootstrapUrl(label: string, workerScriptUrl: string): string {
+	if (/^((http:)|(https:)|(file:))/.test(workerScriptUrl) && workerScriptUrl.substring(0, globalThis.origin.length) !== globalThis.origin) {
 		// this is the cross-origin case
 		// i.e. the webpage is running at a different origin than where the scripts are loaded from
-		const myPath = 'vs/base/worker/defaultWorkerFactory.js';
-		const workerBaseUrl = require.toUrl(myPath).slice(0, -myPath.length); // explicitly using require.toUrl(), see https://github.com/microsoft/vscode/issues/107440#issuecomment-698982321
-		const js = `/*${label}*/globalThis.MonacoEnvironment={baseUrl: '${workerBaseUrl}'};const ttPolicy = globalThis.trustedTypes?.createPolicy('defaultWorkerFactory', { createScriptURL: value => value });importScripts(ttPolicy?.createScriptURL('${scriptPath}') ?? '${scriptPath}');/*${label}*/`;
-		const blob = new Blob([js], { type: 'application/javascript' });
-		return URL.createObjectURL(blob);
-	}
-
-	const start = scriptPath.lastIndexOf('?');
-	const end = scriptPath.lastIndexOf('#', start);
-	const params = start > 0
-		? new URLSearchParams(scriptPath.substring(start + 1, ~end ? end : undefined))
-		: new URLSearchParams();
-
-	COI.addSearchParam(params, true, true);
-	const search = params.toString();
-
-	if (!search) {
-		return `${scriptPath}#${label}`;
 	} else {
-		return `${scriptPath}?${params.toString()}#${label}`;
+		const start = workerScriptUrl.lastIndexOf('?');
+		const end = workerScriptUrl.lastIndexOf('#', start);
+		const params = start > 0
+			? new URLSearchParams(workerScriptUrl.substring(start + 1, ~end ? end : undefined))
+			: new URLSearchParams();
+
+		COI.addSearchParam(params, true, true);
+		const search = params.toString();
+		if (!search) {
+			workerScriptUrl = `${workerScriptUrl}#${label}`;
+		} else {
+			workerScriptUrl = `${workerScriptUrl}?${params.toString()}#${label}`;
+		}
 	}
+
+	// In below blob code, we are using JSON.stringify to ensure the passed
+	// in values are not breaking our script. The values may contain string
+	// terminating characters (such as ' or ").
+	const blob = new Blob([coalesce([
+		`/*${label}*/`,
+		`globalThis._VSCODE_NLS_MESSAGES = ${JSON.stringify(getNLSMessages())};`,
+		`globalThis._VSCODE_NLS_LANGUAGE = ${JSON.stringify(getNLSLanguage())};`,
+		`globalThis._VSCODE_FILE_ROOT = ${JSON.stringify(globalThis._VSCODE_FILE_ROOT)};`,
+		`const ttPolicy = globalThis.trustedTypes?.createPolicy('defaultWorkerFactory', { createScriptURL: value => value });`,
+		`globalThis.workerttPolicy = ttPolicy;`,
+		`await import(ttPolicy?.createScriptURL(${JSON.stringify(workerScriptUrl)}) ?? ${JSON.stringify(workerScriptUrl)});`,
+		`globalThis.postMessage({ type: 'vscode-worker-ready' });`,
+		`/*${label}*/`
+	]).join('')], { type: 'application/javascript' });
+	return URL.createObjectURL(blob);
+}
+
+function whenESMWorkerReady(worker: Worker): Promise<Worker> {
+	return new Promise<Worker>((resolve, reject) => {
+		worker.onmessage = function (e) {
+			if (e.data.type === 'vscode-worker-ready') {
+				worker.onmessage = null;
+				resolve(worker);
+			}
+		};
+		worker.onerror = reject;
+	});
 }
-// ESM-comment-end
 
 function isPromiseLike<T>(obj: any): obj is PromiseLike<T> {
 	if (typeof obj.then === 'function') {
@@ -91,11 +119,11 @@ class WebWorker extends Disposable implements IWorker {
 	private readonly label: string;
 	private worker: Promise<Worker> | null;
 
-	constructor(moduleId: string, id: number, label: string, onMessageCallback: IWorkerCallback, onErrorCallback: (err: any) => void) {
+	constructor(esmWorkerLocation: URI | undefined, moduleId: string, id: number, label: string, onMessageCallback: IWorkerCallback, onErrorCallback: (err: any) => void) {
 		super();
 		this.id = id;
 		this.label = label;
-		const workerOrPromise = getWorker(label);
+		const workerOrPromise = getWorker(esmWorkerLocation, label);
 		if (isPromiseLike(workerOrPromise)) {
 			this.worker = workerOrPromise;
 		} else {
@@ -136,33 +164,47 @@ class WebWorker extends Disposable implements IWorker {
 			}
 		});
 	}
-
-
 }
 
-export class DefaultWorkerFactory implements IWorkerFactory {
+export class WorkerDescriptor implements IWorkerDescriptor {
+
+	public readonly esmModuleLocation: URI | undefined;
+
+	constructor(
+		public readonly moduleId: string,
+		readonly label: string | undefined,
+	) {
+		this.esmModuleLocation = FileAccess.asBrowserUri(`${moduleId}Main.js` as AppResourcePath);
+	}
+}
+
+class DefaultWorkerFactory implements IWorkerFactory {
 
 	private static LAST_WORKER_ID = 0;
-
-	private _label: string | undefined;
 	private _webWorkerFailedBeforeError: any;
 
-	constructor(label: string | undefined) {
-		this._label = label;
+	constructor() {
 		this._webWorkerFailedBeforeError = false;
 	}
 
-	public create(moduleId: string, onMessageCallback: IWorkerCallback, onErrorCallback: (err: any) => void): IWorker {
+	public create(desc: IWorkerDescriptor, onMessageCallback: IWorkerCallback, onErrorCallback: (err: any) => void): IWorker {
 		const workerId = (++DefaultWorkerFactory.LAST_WORKER_ID);
 
 		if (this._webWorkerFailedBeforeError) {
 			throw this._webWorkerFailedBeforeError;
 		}
 
-		return new WebWorker(moduleId, workerId, this._label || 'anonymous' + workerId, onMessageCallback, (err) => {
+		return new WebWorker(desc.esmModuleLocation, desc.moduleId, workerId, desc.label || 'anonymous' + workerId, onMessageCallback, (err) => {
 			logOnceWebWorkerWarning(err);
 			this._webWorkerFailedBeforeError = err;
 			onErrorCallback(err);
 		});
 	}
 }
+
+export function createWebWorker<T extends object>(moduleId: string, label: string | undefined): IWorkerClient<T>;
+export function createWebWorker<T extends object>(workerDescriptor: IWorkerDescriptor): IWorkerClient<T>;
+export function createWebWorker<T extends object>(arg0: string | IWorkerDescriptor, arg1?: string | undefined): IWorkerClient<T> {
+	const workerDescriptor = (typeof arg0 === 'string' ? new WorkerDescriptor(arg0, arg1) : arg0);
+	return new SimpleWorkerClient<T>(new DefaultWorkerFactory(), workerDescriptor);
+}
diff --git a/src/vs/base/browser/dnd.ts b/src/vs/base/browser/dnd.ts
index 96259a4e63d..879426cfb0c 100644
--- a/src/vs/base/browser/dnd.ts
+++ b/src/vs/base/browser/dnd.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { addDisposableListener, getWindow } from 'vs/base/browser/dom';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Mimes } from 'vs/base/common/mime';
+import { addDisposableListener, getWindow } from './dom.js';
+import { Disposable } from '../common/lifecycle.js';
+import { Mimes } from '../common/mime.js';
 
 /**
  * A helper that will execute a provided function when the provided HTMLElement receives
diff --git a/src/vs/base/browser/dom.ts b/src/vs/base/browser/dom.ts
index c258342ad6f..49378a9462d 100644
--- a/src/vs/base/browser/dom.ts
+++ b/src/vs/base/browser/dom.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as browser from 'vs/base/browser/browser';
-import { BrowserFeatures } from 'vs/base/browser/canIUse';
-import { IKeyboardEvent, StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { IMouseEvent, StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { AbstractIdleValue, IntervalTimer, TimeoutTimer, _runWhenIdle, IdleDeadline } from 'vs/base/common/async';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import * as event from 'vs/base/common/event';
-import * as dompurify from 'vs/base/browser/dompurify/dompurify';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { FileAccess, RemoteAuthorities, Schemas } from 'vs/base/common/network';
-import * as platform from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { hash } from 'vs/base/common/hash';
-import { CodeWindow, ensureCodeWindow, mainWindow } from 'vs/base/browser/window';
-import { isPointWithinTriangle } from 'vs/base/common/numbers';
+import * as browser from './browser.js';
+import { BrowserFeatures } from './canIUse.js';
+import { IKeyboardEvent, StandardKeyboardEvent } from './keyboardEvent.js';
+import { IMouseEvent, StandardMouseEvent } from './mouseEvent.js';
+import { AbstractIdleValue, IntervalTimer, TimeoutTimer, _runWhenIdle, IdleDeadline } from '../common/async.js';
+import { onUnexpectedError } from '../common/errors.js';
+import * as event from '../common/event.js';
+import * as dompurify from './dompurify/dompurify.js';
+import { KeyCode } from '../common/keyCodes.js';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from '../common/lifecycle.js';
+import { FileAccess, RemoteAuthorities, Schemas } from '../common/network.js';
+import * as platform from '../common/platform.js';
+import { URI } from '../common/uri.js';
+import { hash } from '../common/hash.js';
+import { CodeWindow, ensureCodeWindow, mainWindow } from './window.js';
+import { isPointWithinTriangle } from '../common/numbers.js';
 
 export interface IRegisteredCodeWindow {
 	readonly window: CodeWindow;
@@ -1184,6 +1184,11 @@ export function isHTMLDivElement(e: unknown): e is HTMLDivElement {
 	return e instanceof HTMLDivElement || e instanceof getWindow(e as Node).HTMLDivElement;
 }
 
+export function isSVGElement(e: unknown): e is SVGElement {
+	// eslint-disable-next-line no-restricted-syntax
+	return e instanceof SVGElement || e instanceof getWindow(e as Node).SVGElement;
+}
+
 export function isMouseEvent(e: unknown): e is MouseEvent {
 	// eslint-disable-next-line no-restricted-syntax
 	return e instanceof MouseEvent || e instanceof getWindow(e as UIEvent).MouseEvent;
@@ -1551,7 +1556,7 @@ export function removeTabIndexAndUpdateFocus(node: HTMLElement): void {
 	node.removeAttribute('tabindex');
 }
 
-export function finalHandler<T extends Event>(fn: (event: T) => any): (event: T) => any {
+export function finalHandler<T extends Event>(fn: (event: T) => unknown): (event: T) => unknown {
 	return e => {
 		e.preventDefault();
 		e.stopPropagation();
@@ -1946,10 +1951,10 @@ const defaultDomPurifyConfig = Object.freeze<dompurify.Config & { RETURN_TRUSTED
 /**
  * Sanitizes the given `value` and reset the given `node` with it.
  */
-export function safeInnerHtml(node: HTMLElement, value: string): void {
+export function safeInnerHtml(node: HTMLElement, value: string, extraDomPurifyConfig?: dompurify.Config): void {
 	const hook = hookDomPurifyHrefAndSrcSanitizer(defaultSafeProtocols);
 	try {
-		const html = dompurify.sanitize(value, defaultDomPurifyConfig);
+		const html = dompurify.sanitize(value, { ...defaultDomPurifyConfig, ...extraDomPurifyConfig });
 		node.innerHTML = html as unknown as string;
 	} finally {
 		hook.dispose();
@@ -2373,6 +2378,107 @@ export function h(tag: string, ...args: [] | [attributes: { $: string } & Partia
 	return result;
 }
 
+export function svgElem<TTag extends string>
+	(tag: TTag):
+	TagToRecord<TTag> extends infer Y ? { [TKey in keyof Y]: Y[TKey] } : never;
+
+export function svgElem<TTag extends string, T extends Child[]>
+	(tag: TTag, children: [...T]):
+	(ArrayToObj<T> & TagToRecord<TTag>) extends infer Y ? { [TKey in keyof Y]: Y[TKey] } : never;
+
+export function svgElem<TTag extends string>
+	(tag: TTag, attributes: Partial<ElementAttributes<TagToElement<TTag>>>):
+	TagToRecord<TTag> extends infer Y ? { [TKey in keyof Y]: Y[TKey] } : never;
+
+export function svgElem<TTag extends string, T extends Child[]>
+	(tag: TTag, attributes: Partial<ElementAttributes<TagToElement<TTag>>>, children: [...T]):
+	(ArrayToObj<T> & TagToRecord<TTag>) extends infer Y ? { [TKey in keyof Y]: Y[TKey] } : never;
+
+export function svgElem(tag: string, ...args: [] | [attributes: { $: string } & Partial<ElementAttributes<HTMLElement>> | Record<string, any>, children?: any[]] | [children: any[]]): Record<string, HTMLElement> {
+	let attributes: { $?: string } & Partial<ElementAttributes<HTMLElement>>;
+	let children: (Record<string, HTMLElement> | HTMLElement)[] | undefined;
+
+	if (Array.isArray(args[0])) {
+		attributes = {};
+		children = args[0];
+	} else {
+		attributes = args[0] as any || {};
+		children = args[1];
+	}
+
+	const match = H_REGEX.exec(tag);
+
+	if (!match || !match.groups) {
+		throw new Error('Bad use of h');
+	}
+
+	const tagName = match.groups['tag'] || 'div';
+	const el = document.createElementNS('http://www.w3.org/2000/svg', tagName) as any as HTMLElement;
+
+	if (match.groups['id']) {
+		el.id = match.groups['id'];
+	}
+
+	const classNames = [];
+	if (match.groups['class']) {
+		for (const className of match.groups['class'].split('.')) {
+			if (className !== '') {
+				classNames.push(className);
+			}
+		}
+	}
+	if (attributes.className !== undefined) {
+		for (const className of attributes.className.split('.')) {
+			if (className !== '') {
+				classNames.push(className);
+			}
+		}
+	}
+	if (classNames.length > 0) {
+		el.className = classNames.join(' ');
+	}
+
+	const result: Record<string, HTMLElement> = {};
+
+	if (match.groups['name']) {
+		result[match.groups['name']] = el;
+	}
+
+	if (children) {
+		for (const c of children) {
+			if (isHTMLElement(c)) {
+				el.appendChild(c);
+			} else if (typeof c === 'string') {
+				el.append(c);
+			} else if ('root' in c) {
+				Object.assign(result, c);
+				el.appendChild(c.root);
+			}
+		}
+	}
+
+	for (const [key, value] of Object.entries(attributes)) {
+		if (key === 'className') {
+			continue;
+		} else if (key === 'style') {
+			for (const [cssKey, cssValue] of Object.entries(value)) {
+				el.style.setProperty(
+					camelCaseToHyphenCase(cssKey),
+					typeof cssValue === 'number' ? cssValue + 'px' : '' + cssValue
+				);
+			}
+		} else if (key === 'tabIndex') {
+			el.tabIndex = value;
+		} else {
+			el.setAttribute(camelCaseToHyphenCase(key), value.toString());
+		}
+	}
+
+	result['root'] = el;
+
+	return result;
+}
+
 function camelCaseToHyphenCase(str: string) {
 	return str.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
 }
@@ -2410,13 +2516,17 @@ export function trackAttributes(from: Element, to: Element, filter?: string[]):
 	return disposables;
 }
 
+export function isEditableElement(element: Element): boolean {
+	return element.tagName.toLowerCase() === 'input' || element.tagName.toLowerCase() === 'textarea' || isHTMLElement(element) && !!element.editContext;
+}
+
 /**
  * Helper for calculating the "safe triangle" occluded by hovers to avoid early dismissal.
  * @see https://www.smashingmagazine.com/2023/08/better-context-menus-safe-triangles/ for example
  */
 export class SafeTriangle {
-	// 4 triangles, 2 points (x, y) stored for each
-	private triangles: number[] = [];
+	// 4 points (x, y), 8 length
+	private points = new Int16Array(8);
 
 	constructor(
 		private readonly originX: number,
@@ -2424,34 +2534,28 @@ export class SafeTriangle {
 		target: HTMLElement
 	) {
 		const { top, left, right, bottom } = target.getBoundingClientRect();
-		const t = this.triangles;
+		const t = this.points;
 		let i = 0;
 
 		t[i++] = left;
 		t[i++] = top;
+
 		t[i++] = right;
 		t[i++] = top;
 
-		t[i++] = left;
-		t[i++] = top;
 		t[i++] = left;
 		t[i++] = bottom;
 
-		t[i++] = right;
-		t[i++] = top;
-		t[i++] = right;
-		t[i++] = bottom;
-
-		t[i++] = left;
-		t[i++] = bottom;
 		t[i++] = right;
 		t[i++] = bottom;
 	}
 
 	public contains(x: number, y: number) {
-		const { triangles, originX, originY } = this;
+		const { points, originX, originY } = this;
 		for (let i = 0; i < 4; i++) {
-			if (isPointWithinTriangle(x, y, originX, originY, triangles[2 * i], triangles[2 * i + 1], triangles[2 * i + 2], triangles[2 * i + 3])) {
+			const p1 = 2 * i;
+			const p2 = 2 * ((i + 1) % 4);
+			if (isPointWithinTriangle(x, y, originX, originY, points[p1], points[p1 + 1], points[p2], points[p2 + 1])) {
 				return true;
 			}
 		}
diff --git a/src/vs/base/browser/domObservable.ts b/src/vs/base/browser/domObservable.ts
index dd20637727b..94279737983 100644
--- a/src/vs/base/browser/domObservable.ts
+++ b/src/vs/base/browser/domObservable.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createStyleSheet2 } from 'vs/base/browser/dom';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { autorun, IObservable } from 'vs/base/common/observable';
+import { createStyleSheet2 } from './dom.js';
+import { DisposableStore, IDisposable } from '../common/lifecycle.js';
+import { autorun, IObservable } from '../common/observable.js';
 
 export function createStyleSheetFromObservable(css: IObservable<string>): IDisposable {
 	const store = new DisposableStore();
diff --git a/src/vs/base/browser/dompurify/dompurify.js b/src/vs/base/browser/dompurify/dompurify.js
index d43b10a85d1..de0cf3e8e8c 100644
--- a/src/vs/base/browser/dompurify/dompurify.js
+++ b/src/vs/base/browser/dompurify/dompurify.js
@@ -1621,20 +1621,14 @@ function createDOMPurify() {
 
 var purify = createDOMPurify();
 
-// ESM-comment-begin
-define(function () { return purify; });
-// ESM-comment-end
-
-// ESM-uncomment-begin
-// export default purify;
-// export const version = purify.version;
-// export const isSupported = purify.isSupported;
-// export const sanitize = purify.sanitize;
-// export const setConfig = purify.setConfig;
-// export const clearConfig = purify.clearConfig;
-// export const isValidAttribute = purify.isValidAttribute;
-// export const addHook = purify.addHook;
-// export const removeHook = purify.removeHook;
-// export const removeHooks = purify.removeHooks;
-// export const removeAllHooks = purify.removeAllHooks;
-// ESM-uncomment-end
+export default purify;
+export const version = purify.version;
+export const isSupported = purify.isSupported;
+export const sanitize = purify.sanitize;
+export const setConfig = purify.setConfig;
+export const clearConfig = purify.clearConfig;
+export const isValidAttribute = purify.isValidAttribute;
+export const addHook = purify.addHook;
+export const removeHook = purify.removeHook;
+export const removeHooks = purify.removeHooks;
+export const removeAllHooks = purify.removeAllHooks;
diff --git a/src/vs/base/browser/event.ts b/src/vs/base/browser/event.ts
index 760f8646b0e..3a187065f3b 100644
--- a/src/vs/base/browser/event.ts
+++ b/src/vs/base/browser/event.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { GestureEvent } from 'vs/base/browser/touch';
-import { Emitter, Event as BaseEvent } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
+import { GestureEvent } from './touch.js';
+import { Emitter, Event as BaseEvent } from '../common/event.js';
+import { IDisposable } from '../common/lifecycle.js';
 
 export type EventHandler = HTMLElement | HTMLDocument | Window;
 
diff --git a/src/vs/base/browser/fonts.ts b/src/vs/base/browser/fonts.ts
index 2ebc6eea68e..1926a9b5084 100644
--- a/src/vs/base/browser/fonts.ts
+++ b/src/vs/base/browser/fonts.ts
@@ -5,7 +5,7 @@
 
 import { mainWindow } from 'vs/base/browser/window';
 import type { IJSONSchemaSnippet } from 'vs/base/common/jsonSchema.js';
-import { isElectron, isMacintosh, isWindows } from 'vs/base/common/platform';
+import { isElectron, isMacintosh, isWindows } from '../common/platform.js';
 
 /**
  * The best font-family to be used in CSS based on the platform:
diff --git a/src/vs/base/browser/formattedTextRenderer.ts b/src/vs/base/browser/formattedTextRenderer.ts
index 12371671c7f..66d0d575b96 100644
--- a/src/vs/base/browser/formattedTextRenderer.ts
+++ b/src/vs/base/browser/formattedTextRenderer.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { IMouseEvent } from 'vs/base/browser/mouseEvent';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import * as DOM from './dom.js';
+import { IKeyboardEvent } from './keyboardEvent.js';
+import { IMouseEvent } from './mouseEvent.js';
+import { DisposableStore } from '../common/lifecycle.js';
 
 export interface IContentActionHandler {
 	callback: (content: string, event: IMouseEvent | IKeyboardEvent) => void;
diff --git a/src/vs/base/browser/globalPointerMoveMonitor.ts b/src/vs/base/browser/globalPointerMoveMonitor.ts
index 9841596cddf..fe6abbebfe4 100644
--- a/src/vs/base/browser/globalPointerMoveMonitor.ts
+++ b/src/vs/base/browser/globalPointerMoveMonitor.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import * as dom from './dom.js';
+import { DisposableStore, IDisposable, toDisposable } from '../common/lifecycle.js';
 
 export interface IPointerMoveCallback {
 	(event: PointerEvent): void;
diff --git a/src/vs/base/browser/hash.ts b/src/vs/base/browser/hash.ts
deleted file mode 100644
index a9a5b66900e..00000000000
--- a/src/vs/base/browser/hash.ts
+++ /dev/null
@@ -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 { VSBuffer } from 'vs/base/common/buffer';
-import { StringSHA1, toHexString } from 'vs/base/common/hash';
-
-export async function sha1Hex(str: string): Promise<string> {
-
-	// Prefer to use browser's crypto module
-	if (globalThis?.crypto?.subtle) {
-
-		// Careful to use `dontUseNodeBuffer` when passing the
-		// buffer to the browser `crypto` API. Users reported
-		// native crashes in certain cases that we could trace
-		// back to passing node.js `Buffer` around
-		// (https://github.com/microsoft/vscode/issues/114227)
-		const buffer = VSBuffer.fromString(str, { dontUseNodeBuffer: true }).buffer;
-		const hash = await globalThis.crypto.subtle.digest({ name: 'sha-1' }, buffer);
-
-		return toHexString(hash);
-	}
-
-	// Otherwise fallback to `StringSHA1`
-	else {
-		const computer = new StringSHA1();
-		computer.update(str);
-
-		return computer.digest();
-	}
-}
diff --git a/src/vs/base/browser/history.ts b/src/vs/base/browser/history.ts
index e31b68ed562..c5e9d036604 100644
--- a/src/vs/base/browser/history.ts
+++ b/src/vs/base/browser/history.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
+import { Event } from '../common/event.js';
 
 export interface IHistoryNavigationWidget {
 
diff --git a/src/vs/base/browser/indexedDB.ts b/src/vs/base/browser/indexedDB.ts
index 6d56022c98c..c723dffdb20 100644
--- a/src/vs/base/browser/indexedDB.ts
+++ b/src/vs/base/browser/indexedDB.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { ErrorNoTelemetry, getErrorMessage } from 'vs/base/common/errors';
-import { mark } from 'vs/base/common/performance';
+import { toErrorMessage } from '../common/errorMessage.js';
+import { ErrorNoTelemetry, getErrorMessage } from '../common/errors.js';
+import { mark } from '../common/performance.js';
 
 class MissingStoresError extends Error {
 	constructor(readonly db: IDBDatabase) {
diff --git a/src/vs/base/browser/keyboardEvent.ts b/src/vs/base/browser/keyboardEvent.ts
index 6aa5bf530f3..4e98a3b12d8 100644
--- a/src/vs/base/browser/keyboardEvent.ts
+++ b/src/vs/base/browser/keyboardEvent.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as browser from 'vs/base/browser/browser';
-import { EVENT_KEY_CODE_MAP, KeyCode, KeyCodeUtils, KeyMod } from 'vs/base/common/keyCodes';
-import { KeyCodeChord } from 'vs/base/common/keybindings';
-import * as platform from 'vs/base/common/platform';
+import * as browser from './browser.js';
+import { EVENT_KEY_CODE_MAP, KeyCode, KeyCodeUtils, KeyMod } from '../common/keyCodes.js';
+import { KeyCodeChord } from '../common/keybindings.js';
+import * as platform from '../common/platform.js';
 
 
 
diff --git a/src/vs/base/browser/markdownRenderer.ts b/src/vs/base/browser/markdownRenderer.ts
index a957171c3a4..38a54691094 100644
--- a/src/vs/base/browser/markdownRenderer.ts
+++ b/src/vs/base/browser/markdownRenderer.ts
@@ -3,28 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import * as dompurify from 'vs/base/browser/dompurify/dompurify';
-import { DomEmitter } from 'vs/base/browser/event';
-import { createElement, FormattedTextRenderOptions } from 'vs/base/browser/formattedTextRenderer';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Event } from 'vs/base/common/event';
-import { escapeDoubleQuotes, IMarkdownString, MarkdownStringTrustedOptions, parseHrefAndDimensions, removeMarkdownEscapes } from 'vs/base/common/htmlContent';
-import { markdownEscapeEscapedIcons } from 'vs/base/common/iconLabels';
-import { defaultGenerator } from 'vs/base/common/idGenerator';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { Lazy } from 'vs/base/common/lazy';
-import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { marked } from 'vs/base/common/marked/marked';
-import { parse } from 'vs/base/common/marshalling';
-import { FileAccess, Schemas } from 'vs/base/common/network';
-import { cloneAndChange } from 'vs/base/common/objects';
-import { dirname, resolvePath } from 'vs/base/common/resources';
-import { escape } from 'vs/base/common/strings';
-import { URI } from 'vs/base/common/uri';
+import * as DOM from './dom.js';
+import * as dompurify from './dompurify/dompurify.js';
+import { DomEmitter } from './event.js';
+import { createElement, FormattedTextRenderOptions } from './formattedTextRenderer.js';
+import { StandardKeyboardEvent } from './keyboardEvent.js';
+import { StandardMouseEvent } from './mouseEvent.js';
+import { renderLabelWithIcons } from './ui/iconLabel/iconLabels.js';
+import { onUnexpectedError } from '../common/errors.js';
+import { Event } from '../common/event.js';
+import { escapeDoubleQuotes, IMarkdownString, MarkdownStringTrustedOptions, parseHrefAndDimensions, removeMarkdownEscapes } from '../common/htmlContent.js';
+import { markdownEscapeEscapedIcons } from '../common/iconLabels.js';
+import { defaultGenerator } from '../common/idGenerator.js';
+import { KeyCode } from '../common/keyCodes.js';
+import { Lazy } from '../common/lazy.js';
+import { DisposableStore, IDisposable, toDisposable } from '../common/lifecycle.js';
+import * as marked from '../common/marked/marked.js';
+import { parse } from '../common/marshalling.js';
+import { FileAccess, Schemas } from '../common/network.js';
+import { cloneAndChange } from '../common/objects.js';
+import { dirname, resolvePath } from '../common/resources.js';
+import { escape } from '../common/strings.js';
+import { URI } from '../common/uri.js';
 
 export interface MarkedOptions extends marked.MarkedOptions {
 	baseUrl?: never;
@@ -45,7 +45,7 @@ export interface ISanitizerOptions {
 }
 
 const defaultMarkedRenderers = Object.freeze({
-	image: (href: string | null, title: string | null, text: string): string => {
+	image: ({ href, title, text }: marked.Tokens.Image): string => {
 		let dimensions: string[] = [];
 		let attributes: string[] = [];
 		if (href) {
@@ -64,11 +64,12 @@ const defaultMarkedRenderers = Object.freeze({
 		return '<img ' + attributes.join(' ') + '>';
 	},
 
-	paragraph: (text: string): string => {
-		return `<p>${text}</p>`;
+	paragraph(this: marked.Renderer, { tokens }: marked.Tokens.Paragraph): string {
+		return `<p>${this.parser.parseInline(tokens)}</p>`;
 	},
 
-	link: (href: string | null, title: string | null, text: string): string => {
+	link(this: marked.Renderer, { href, title, tokens }: marked.Tokens.Link): string {
+		let text = this.parser.parseInline(tokens);
 		if (typeof href !== 'string') {
 			return '';
 		}
@@ -162,30 +163,28 @@ export function renderMarkdown(markdown: IMarkdownString, options: MarkdownRende
 	const syncCodeBlocks: [string, HTMLElement][] = [];
 
 	if (options.codeBlockRendererSync) {
-		renderer.code = (code, lang) => {
+		renderer.code = ({ text, lang }: marked.Tokens.Code) => {
 			const id = defaultGenerator.nextId();
-			const value = options.codeBlockRendererSync!(postProcessCodeBlockLanguageId(lang), code);
+			const value = options.codeBlockRendererSync!(postProcessCodeBlockLanguageId(lang), text);
 			syncCodeBlocks.push([id, value]);
-			return `<div class="code" data-code="${id}">${escape(code)}</div>`;
+			return `<div class="code" data-code="${id}">${escape(text)}</div>`;
 		};
 	} else if (options.codeBlockRenderer) {
-		renderer.code = (code, lang) => {
+		renderer.code = ({ text, lang }: marked.Tokens.Code) => {
 			const id = defaultGenerator.nextId();
-			const value = options.codeBlockRenderer!(postProcessCodeBlockLanguageId(lang), code);
+			const value = options.codeBlockRenderer!(postProcessCodeBlockLanguageId(lang), text);
 			codeBlocks.push(value.then(element => [id, element]));
-			return `<div class="code" data-code="${id}">${escape(code)}</div>`;
+			return `<div class="code" data-code="${id}">${escape(text)}</div>`;
 		};
 	}
 
 	if (options.actionHandler) {
 		const _activateLink = function (event: StandardMouseEvent | StandardKeyboardEvent): void {
-			let target: HTMLElement | null = event.target;
-			if (target.tagName !== 'A') {
-				target = target.parentElement;
-				if (!target || target.tagName !== 'A') {
-					return;
-				}
+			const target = event.target.closest('a[data-href]');
+			if (!DOM.isHTMLElement(target)) {
+				return;
 			}
+
 			try {
 				let href = target.dataset['href'];
 				if (href) {
@@ -219,23 +218,16 @@ export function renderMarkdown(markdown: IMarkdownString, options: MarkdownRende
 	}
 
 	if (!markdown.supportHtml) {
-		// TODO: Can we deprecated this in favor of 'supportHtml'?
-
-		// Use our own sanitizer so that we can let through only spans.
-		// Otherwise, we'd be letting all html be rendered.
-		// If we want to allow markdown permitted tags, then we can delete sanitizer and sanitize.
-		// We always pass the output through dompurify after this so that we don't rely on
-		// marked for sanitization.
-		markedOptions.sanitizer = (html: string): string => {
+		// Note: we always pass the output through dompurify after this so that we don't rely on
+		// marked for real sanitization.
+		renderer.html = ({ text }) => {
 			if (options.sanitizerOptions?.replaceWithPlaintext) {
-				return escape(html);
+				return escape(text);
 			}
 
-			const match = markdown.isTrusted ? html.match(/^(<span[^>]+>)|(<\/\s*span>)$/) : undefined;
-			return match ? html : '';
+			const match = markdown.isTrusted ? text.match(/^(<span[^>]+>)|(<\/\s*span>)$/) : undefined;
+			return match ? text : '';
 		};
-		markedOptions.sanitize = true;
-		markedOptions.silent = true;
 	}
 
 	markedOptions.renderer = renderer;
@@ -261,7 +253,7 @@ export function renderMarkdown(markdown: IMarkdownString, options: MarkdownRende
 		const newTokens = fillInIncompleteTokens(tokens);
 		renderedMarkdown = marked.parser(newTokens, opts);
 	} else {
-		renderedMarkdown = marked.parse(value, markedOptions);
+		renderedMarkdown = marked.parse(value, { ...markedOptions, async: false });
 	}
 
 	// Rewrite theme icons
@@ -404,7 +396,7 @@ function sanitizeRenderedMarkdown(
 		if (e.attrName === 'style' || e.attrName === 'class') {
 			if (element.tagName === 'SPAN') {
 				if (e.attrName === 'style') {
-					e.keepAttr = /^(color\:(#[0-9a-fA-F]+|var\(--vscode(-[a-zA-Z]+)+\));)?(background-color\:(#[0-9a-fA-F]+|var\(--vscode(-[a-zA-Z]+)+\));)?$/.test(e.attrValue);
+					e.keepAttr = /^(color\:(#[0-9a-fA-F]+|var\(--vscode(-[a-zA-Z0-9]+)+\));)?(background-color\:(#[0-9a-fA-F]+|var\(--vscode(-[a-zA-Z0-9]+)+\));)?(border-radius:[0-9]+px;)?$/.test(e.attrValue);
 					return;
 				} else if (e.attrName === 'class') {
 					e.keepAttr = /^codicon codicon-[a-z\-]+( codicon-modifier-[a-z\-]+)?$/.test(e.attrValue);
@@ -482,6 +474,7 @@ export const allowedMarkdownAttr = [
 	'alt',
 	'checked',
 	'class',
+	'colspan',
 	'controls',
 	'data-code',
 	'data-href',
@@ -493,6 +486,7 @@ export const allowedMarkdownAttr = [
 	'muted',
 	'playsinline',
 	'poster',
+	'rowspan',
 	'src',
 	'style',
 	'target',
@@ -551,9 +545,8 @@ export function renderMarkdownAsPlaintext(markdown: IMarkdownString, withCodeBlo
 		value = `${value.substr(0, 100_000)}…`;
 	}
 
-	const html = marked.parse(value, { renderer: withCodeBlocks ? plainTextWithCodeBlocksRenderer.value : plainTextRenderer.value }).replace(/&(#\d+|[a-zA-Z]+);/g, m => unescapeInfo.get(m) ?? m);
-
-	return sanitizeRenderedMarkdown({ isTrusted: false }, html).toString();
+	const html = marked.parse(value, { async: false, renderer: withCodeBlocks ? plainTextWithCodeBlocksRenderer.value : plainTextRenderer.value });
+	return sanitizeRenderedMarkdown({ isTrusted: false }, html).toString().replace(/&(#\d+|[a-zA-Z]+);/g, m => unescapeInfo.get(m) ?? m);
 }
 
 const unescapeInfo = new Map<string, string>([
@@ -568,64 +561,61 @@ const unescapeInfo = new Map<string, string>([
 function createRenderer(): marked.Renderer {
 	const renderer = new marked.Renderer();
 
-	renderer.code = (code: string): string => {
-		return code;
+	renderer.code = ({ text }: marked.Tokens.Code): string => {
+		return text;
 	};
-	renderer.blockquote = (quote: string): string => {
-		return quote;
+	renderer.blockquote = ({ text }: marked.Tokens.Blockquote): string => {
+		return text + '\n';
 	};
-	renderer.html = (_html: string): string => {
+	renderer.html = (_: marked.Tokens.HTML): string => {
 		return '';
 	};
-	renderer.heading = (text: string, _level: 1 | 2 | 3 | 4 | 5 | 6, _raw: string): string => {
-		return text + '\n';
+	renderer.heading = function ({ tokens }: marked.Tokens.Heading): string {
+		return this.parser.parseInline(tokens) + '\n';
 	};
 	renderer.hr = (): string => {
 		return '';
 	};
-	renderer.list = (body: string, _ordered: boolean): string => {
-		return body;
+	renderer.list = function ({ items }: marked.Tokens.List): string {
+		return items.map(x => this.listitem(x)).join('\n') + '\n';
 	};
-	renderer.listitem = (text: string): string => {
+	renderer.listitem = ({ text }: marked.Tokens.ListItem): string => {
 		return text + '\n';
 	};
-	renderer.paragraph = (text: string): string => {
-		return text + '\n';
+	renderer.paragraph = function ({ tokens }: marked.Tokens.Paragraph): string {
+		return this.parser.parseInline(tokens) + '\n';
 	};
-	renderer.table = (header: string, body: string): string => {
-		return header + body + '\n';
+	renderer.table = function ({ header, rows }: marked.Tokens.Table): string {
+		return header.map(cell => this.tablecell(cell)).join(' ') + '\n' + rows.map(cells => cells.map(cell => this.tablecell(cell)).join(' ')).join('\n') + '\n';
 	};
-	renderer.tablerow = (content: string): string => {
-		return content;
-	};
-	renderer.tablecell = (content: string, _flags: {
-		header: boolean;
-		align: 'center' | 'left' | 'right' | null;
-	}): string => {
-		return content + ' ';
-	};
-	renderer.strong = (text: string): string => {
+	renderer.tablerow = ({ text }: marked.Tokens.TableRow): string => {
 		return text;
 	};
-	renderer.em = (text: string): string => {
+	renderer.tablecell = function ({ tokens }: marked.Tokens.TableCell): string {
+		return this.parser.parseInline(tokens);
+	};
+	renderer.strong = ({ text }: marked.Tokens.Strong): string => {
 		return text;
 	};
-	renderer.codespan = (code: string): string => {
-		return code;
+	renderer.em = ({ text }: marked.Tokens.Em): string => {
+		return text;
 	};
-	renderer.br = (): string => {
+	renderer.codespan = ({ text }: marked.Tokens.Codespan): string => {
+		return text;
+	};
+	renderer.br = (_: marked.Tokens.Br): string => {
 		return '\n';
 	};
-	renderer.del = (text: string): string => {
+	renderer.del = ({ text }: marked.Tokens.Del): string => {
 		return text;
 	};
-	renderer.image = (_href: string, _title: string, _text: string): string => {
+	renderer.image = (_: marked.Tokens.Image): string => {
 		return '';
 	};
-	renderer.text = (text: string): string => {
+	renderer.text = ({ text }: marked.Tokens.Text): string => {
 		return text;
 	};
-	renderer.link = (_href: string, _title: string, text: string): string => {
+	renderer.link = ({ text }: marked.Tokens.Link): string => {
 		return text;
 	};
 	return renderer;
@@ -633,8 +623,8 @@ function createRenderer(): marked.Renderer {
 const plainTextRenderer = new Lazy<marked.Renderer>((withCodeBlocks?: boolean) => createRenderer());
 const plainTextWithCodeBlocksRenderer = new Lazy<marked.Renderer>(() => {
 	const renderer = createRenderer();
-	renderer.code = (code: string): string => {
-		return '\n' + '```' + '\n' + code + '```' + '\n';
+	renderer.code = ({ text }: marked.Tokens.Code): string => {
+		return `\n\`\`\`\n${text}\n\`\`\`\n`;
 	};
 	return renderer;
 });
@@ -766,8 +756,8 @@ function completeListItemPattern(list: marked.Tokens.List): marked.Tokens.List |
 
 	const previousListItemsText = mergeRawTokenText(list.items.slice(0, -1));
 
-	// Grabbing the `- ` or `1. ` off the list item because I can't find a better way to do this
-	const lastListItemLead = lastListItem.raw.match(/^(\s*(-|\d+\.) +)/)?.[0];
+	// Grabbing the `- ` or `1. ` or `* ` off the list item because I can't find a better way to do this
+	const lastListItemLead = lastListItem.raw.match(/^(\s*(-|\d+\.|\*) +)/)?.[0];
 	if (!lastListItemLead) {
 		// Is badly formatted
 		return;
@@ -805,13 +795,6 @@ function fillInIncompleteTokensOnce(tokens: marked.TokensList): marked.TokensLis
 	let newTokens: marked.Token[] | undefined;
 	for (i = 0; i < tokens.length; i++) {
 		const token = tokens[i];
-		let codeblockStart: RegExpMatchArray | null;
-		if (token.type === 'paragraph' && (codeblockStart = token.raw.match(/(\n|^)(````*)/))) {
-			const codeblockLead = codeblockStart[2];
-			// If the code block was complete, it would be in a type='code'
-			newTokens = completeCodeBlock(tokens.slice(i), codeblockLead);
-			break;
-		}
 
 		if (token.type === 'paragraph' && token.raw.match(/(\n|^)\|/)) {
 			newTokens = completeTable(tokens.slice(i));
@@ -819,7 +802,7 @@ function fillInIncompleteTokensOnce(tokens: marked.TokensList): marked.TokensLis
 		}
 
 		if (i === tokens.length - 1 && token.type === 'list') {
-			const newListToken = completeListItemPattern(token);
+			const newListToken = completeListItemPattern(token as marked.Tokens.List);
 			if (newListToken) {
 				newTokens = [newListToken];
 				break;
@@ -828,7 +811,7 @@ function fillInIncompleteTokensOnce(tokens: marked.TokensList): marked.TokensLis
 
 		if (i === tokens.length - 1 && token.type === 'paragraph') {
 			// Only operates on a single token, because any newline that follows this should break these patterns
-			const newToken = completeSingleLinePattern(token);
+			const newToken = completeSingleLinePattern(token as marked.Tokens.Paragraph);
 			if (newToken) {
 				newTokens = [newToken];
 				break;
@@ -848,10 +831,6 @@ function fillInIncompleteTokensOnce(tokens: marked.TokensList): marked.TokensLis
 	return null;
 }
 
-function completeCodeBlock(tokens: marked.Token[], leader: string): marked.Token[] {
-	const mergedRawText = mergeRawTokenText(tokens);
-	return marked.lexer(mergedRawText + `\n${leader}`);
-}
 
 function completeCodespan(token: marked.Token): marked.Token {
 	return completeWithString(token, '`');
diff --git a/src/vs/base/browser/mouseEvent.ts b/src/vs/base/browser/mouseEvent.ts
index 51de0152e26..1e6f8b3032a 100644
--- a/src/vs/base/browser/mouseEvent.ts
+++ b/src/vs/base/browser/mouseEvent.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as browser from 'vs/base/browser/browser';
-import { IframeUtils } from 'vs/base/browser/iframe';
-import * as platform from 'vs/base/common/platform';
+import * as browser from './browser.js';
+import { IframeUtils } from './iframe.js';
+import * as platform from '../common/platform.js';
 
 export interface IMouseEvent {
 	readonly browserEvent: MouseEvent;
diff --git a/src/vs/base/browser/pixelRatio.ts b/src/vs/base/browser/pixelRatio.ts
index 197a802ff7e..7ff456e5aa3 100644
--- a/src/vs/base/browser/pixelRatio.ts
+++ b/src/vs/base/browser/pixelRatio.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getWindowId, onDidUnregisterWindow } from 'vs/base/browser/dom';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, markAsSingleton } from 'vs/base/common/lifecycle';
+import { getWindowId, onDidUnregisterWindow } from './dom.js';
+import { Emitter, Event } from '../common/event.js';
+import { Disposable, markAsSingleton } from '../common/lifecycle.js';
 
 /**
  * See https://developer.mozilla.org/en-US/docs/Web/API/Window/devicePixelRatio#monitoring_screen_resolution_or_zoom_level_changes
diff --git a/src/vs/base/browser/touch.ts b/src/vs/base/browser/touch.ts
index c85416054f0..05e815ddd47 100644
--- a/src/vs/base/browser/touch.ts
+++ b/src/vs/base/browser/touch.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DomUtils from 'vs/base/browser/dom';
-import { mainWindow } from 'vs/base/browser/window';
-import * as arrays from 'vs/base/common/arrays';
-import { memoize } from 'vs/base/common/decorators';
-import { Event as EventUtils } from 'vs/base/common/event';
-import { Disposable, IDisposable, markAsSingleton, toDisposable } from 'vs/base/common/lifecycle';
-import { LinkedList } from 'vs/base/common/linkedList';
+import * as DomUtils from './dom.js';
+import { mainWindow } from './window.js';
+import * as arrays from '../common/arrays.js';
+import { memoize } from '../common/decorators.js';
+import { Event as EventUtils } from '../common/event.js';
+import { Disposable, IDisposable, markAsSingleton, toDisposable } from '../common/lifecycle.js';
+import { LinkedList } from '../common/linkedList.js';
 
 export namespace EventType {
 	export const Tap = '-monaco-gesturetap';
diff --git a/src/vs/base/browser/trustedTypes.ts b/src/vs/base/browser/trustedTypes.ts
index 48c02ca8c97..60e915362cb 100644
--- a/src/vs/base/browser/trustedTypes.ts
+++ b/src/vs/base/browser/trustedTypes.ts
@@ -3,8 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { mainWindow } from 'vs/base/browser/window';
-import { onUnexpectedError } from 'vs/base/common/errors';
+import { onUnexpectedError } from '../common/errors.js';
 
 export function createTrustedTypesPolicy<Options extends TrustedTypePolicyOptions>(
 	policyName: string,
@@ -28,7 +27,7 @@ export function createTrustedTypesPolicy<Options extends TrustedTypePolicyOption
 		}
 	}
 	try {
-		return mainWindow.trustedTypes?.createPolicy(policyName, policyOptions);
+		return (globalThis as any).trustedTypes?.createPolicy(policyName, policyOptions);
 	} catch (err) {
 		onUnexpectedError(err);
 		return undefined;
diff --git a/src/vs/base/browser/ui/actionbar/actionViewItems.ts b/src/vs/base/browser/ui/actionbar/actionViewItems.ts
index 412cf47cfc7..dc565e10304 100644
--- a/src/vs/base/browser/ui/actionbar/actionViewItems.ts
+++ b/src/vs/base/browser/ui/actionbar/actionViewItems.ts
@@ -3,28 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isFirefox } from 'vs/base/browser/browser';
-import { DataTransfers } from 'vs/base/browser/dnd';
-import { addDisposableListener, EventHelper, EventLike, EventType } from 'vs/base/browser/dom';
-import { EventType as TouchEventType, Gesture } from 'vs/base/browser/touch';
-import { IActionViewItem } from 'vs/base/browser/ui/actionbar/actionbar';
-import { IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { IHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate';
-import { ISelectBoxOptions, ISelectBoxStyles, ISelectOptionItem, SelectBox } from 'vs/base/browser/ui/selectBox/selectBox';
-import { IToggleStyles } from 'vs/base/browser/ui/toggle/toggle';
-import { Action, ActionRunner, IAction, IActionChangeEvent, IActionRunner, Separator } from 'vs/base/common/actions';
-import { Disposable } from 'vs/base/common/lifecycle';
-import * as platform from 'vs/base/common/platform';
-import * as types from 'vs/base/common/types';
-import 'vs/css!./actionbar';
-import * as nls from 'vs/nls';
-import type { IManagedHover } from 'vs/base/browser/ui/hover/hover';
-import { getBaseLayerHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate2';
+import { isFirefox } from '../../browser.js';
+import { DataTransfers } from '../../dnd.js';
+import { addDisposableListener, EventHelper, EventLike, EventType } from '../../dom.js';
+import { EventType as TouchEventType, Gesture } from '../../touch.js';
+import { IActionViewItem } from './actionbar.js';
+import { IContextViewProvider } from '../contextview/contextview.js';
+import { getDefaultHoverDelegate } from '../hover/hoverDelegateFactory.js';
+import { IHoverDelegate } from '../hover/hoverDelegate.js';
+import { ISelectBoxOptions, ISelectBoxStyles, ISelectOptionItem, SelectBox } from '../selectBox/selectBox.js';
+import { IToggleStyles } from '../toggle/toggle.js';
+import { Action, ActionRunner, IAction, IActionChangeEvent, IActionRunner, Separator } from '../../../common/actions.js';
+import { Disposable } from '../../../common/lifecycle.js';
+import * as platform from '../../../common/platform.js';
+import * as types from '../../../common/types.js';
+import './actionbar.css';
+import * as nls from '../../../../nls.js';
+import type { IManagedHover } from '../hover/hover.js';
+import { getBaseLayerHoverDelegate } from '../hover/hoverDelegate2.js';
 
 export interface IBaseActionViewItemOptions {
 	draggable?: boolean;
 	isMenu?: boolean;
+	isTabList?: boolean;
 	useEventAsContext?: boolean;
 	hoverDelegate?: IHoverDelegate;
 }
@@ -313,12 +314,14 @@ export class ActionViewItem extends BaseActionViewItem {
 		this.updateChecked();
 	}
 
-	private getDefaultAriaRole(): 'presentation' | 'menuitem' | 'button' {
+	private getDefaultAriaRole(): 'presentation' | 'menuitem' | 'tab' | 'button' {
 		if (this._action.id === Separator.ID) {
 			return 'presentation'; // A separator is a presentation item
 		} else {
 			if (this.options.isMenu) {
 				return 'menuitem';
+			} else if (this.options.isTabList) {
+				return 'tab';
 			} else {
 				return 'button';
 			}
@@ -421,11 +424,15 @@ export class ActionViewItem extends BaseActionViewItem {
 		if (this.label) {
 			if (this.action.checked !== undefined) {
 				this.label.classList.toggle('checked', this.action.checked);
-				this.label.setAttribute('aria-checked', this.action.checked ? 'true' : 'false');
-				this.label.setAttribute('role', 'checkbox');
+				if (this.options.isTabList) {
+					this.label.setAttribute('aria-selected', this.action.checked ? 'true' : 'false');
+				} else {
+					this.label.setAttribute('aria-checked', this.action.checked ? 'true' : 'false');
+					this.label.setAttribute('role', 'checkbox');
+				}
 			} else {
 				this.label.classList.remove('checked');
-				this.label.removeAttribute('aria-checked');
+				this.label.removeAttribute(this.options.isTabList ? 'aria-selected' : 'aria-checked');
 				this.label.setAttribute('role', this.getDefaultAriaRole());
 			}
 		}
diff --git a/src/vs/base/browser/ui/actionbar/actionbar.ts b/src/vs/base/browser/ui/actionbar/actionbar.ts
index 06995b2e827..6fd18bebd31 100644
--- a/src/vs/base/browser/ui/actionbar/actionbar.ts
+++ b/src/vs/base/browser/ui/actionbar/actionbar.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { ActionViewItem, BaseActionViewItem, IActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { createInstantHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { IHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate';
-import { ActionRunner, IAction, IActionRunner, IRunEvent, Separator } from 'vs/base/common/actions';
-import { Emitter } from 'vs/base/common/event';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Disposable, DisposableMap, DisposableStore, dispose, IDisposable } from 'vs/base/common/lifecycle';
-import * as types from 'vs/base/common/types';
-import 'vs/css!./actionbar';
+import * as DOM from '../../dom.js';
+import { StandardKeyboardEvent } from '../../keyboardEvent.js';
+import { ActionViewItem, BaseActionViewItem, IActionViewItemOptions } from './actionViewItems.js';
+import { createInstantHoverDelegate } from '../hover/hoverDelegateFactory.js';
+import { IHoverDelegate } from '../hover/hoverDelegate.js';
+import { ActionRunner, IAction, IActionRunner, IRunEvent, Separator } from '../../../common/actions.js';
+import { Emitter } from '../../../common/event.js';
+import { KeyCode, KeyMod } from '../../../common/keyCodes.js';
+import { Disposable, DisposableMap, DisposableStore, dispose, IDisposable } from '../../../common/lifecycle.js';
+import * as types from '../../../common/types.js';
+import './actionbar.css';
 
 export interface IActionViewItem extends IDisposable {
 	action: IAction;
@@ -167,7 +167,8 @@ export class ActionBar extends Disposable implements IActionRunner {
 			} else if (event.equals(KeyCode.End)) {
 				eventHandled = this.focusLast();
 			} else if (event.equals(KeyCode.Tab) && focusedItem instanceof BaseActionViewItem && focusedItem.trapsArrowNavigation) {
-				eventHandled = this.focusNext();
+				// Tab, so forcibly focus next #219199
+				eventHandled = this.focusNext(undefined, true);
 			} else if (this.isTriggerKeyEvent(event)) {
 				// Staying out of the else branch even if not triggered
 				if (this._triggerKeys.keyDown) {
@@ -357,7 +358,7 @@ export class ActionBar extends Disposable implements IActionRunner {
 
 			let item: IActionViewItem | undefined;
 
-			const viewItemOptions = { hoverDelegate: this._hoverDelegate, ...options };
+			const viewItemOptions: IActionViewItemOptions = { hoverDelegate: this._hoverDelegate, ...options, isTabList: this.options.ariaRole === 'tablist' };
 			if (this.options.actionViewItemProvider) {
 				item = this.options.actionViewItemProvider(action, viewItemOptions);
 			}
@@ -485,7 +486,7 @@ export class ActionBar extends Disposable implements IActionRunner {
 		return this.focusPrevious(true);
 	}
 
-	protected focusNext(forceLoop?: boolean): boolean {
+	protected focusNext(forceLoop?: boolean, forceFocus?: boolean): boolean {
 		if (typeof this.focusedItem === 'undefined') {
 			this.focusedItem = this.viewItems.length - 1;
 		} else if (this.viewItems.length <= 1) {
@@ -505,7 +506,7 @@ export class ActionBar extends Disposable implements IActionRunner {
 			item = this.viewItems[this.focusedItem];
 		} while (this.focusedItem !== startIndex && ((this.options.focusOnlyEnabledItems && !item.isEnabled()) || item.action.id === Separator.ID));
 
-		this.updateFocus();
+		this.updateFocus(undefined, undefined, forceFocus);
 		return true;
 	}
 
diff --git a/src/vs/base/browser/ui/aria/aria.ts b/src/vs/base/browser/ui/aria/aria.ts
index d0b5b3aab21..f4f9ef9688a 100644
--- a/src/vs/base/browser/ui/aria/aria.ts
+++ b/src/vs/base/browser/ui/aria/aria.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import 'vs/css!./aria';
+import * as dom from '../../dom.js';
+import './aria.css';
 
 // Use a max length since we are inserting the whole msg in the DOM and that can cause browsers to freeze for long messages #94233
 const MAX_MESSAGE_LENGTH = 20000;
diff --git a/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.ts b/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.ts
index b84a3d8a8b3..a1abd1bbc4d 100644
--- a/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.ts
+++ b/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { IMouseEvent } from 'vs/base/browser/mouseEvent';
-import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
-import { commonPrefixLength } from 'vs/base/common/arrays';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore, dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { ScrollbarVisibility } from 'vs/base/common/scrollable';
-import 'vs/css!./breadcrumbsWidget';
+import * as dom from '../../dom.js';
+import { IMouseEvent } from '../../mouseEvent.js';
+import { DomScrollableElement } from '../scrollbar/scrollableElement.js';
+import { commonPrefixLength } from '../../../common/arrays.js';
+import { ThemeIcon } from '../../../common/themables.js';
+import { Emitter, Event } from '../../../common/event.js';
+import { DisposableStore, dispose, IDisposable } from '../../../common/lifecycle.js';
+import { ScrollbarVisibility } from '../../../common/scrollable.js';
+import './breadcrumbsWidget.css';
 
 export abstract class BreadcrumbsItem {
 	abstract dispose(): void;
@@ -191,13 +191,13 @@ export class BreadcrumbsWidget {
 		this._focus(this._items.indexOf(item!), payload);
 	}
 
-	focusPrev(payload?: any): any {
+	focusPrev(payload?: any): void {
 		if (this._focusedItemIdx > 0) {
 			this._focus(this._focusedItemIdx - 1, payload);
 		}
 	}
 
-	focusNext(payload?: any): any {
+	focusNext(payload?: any): void {
 		if (this._focusedItemIdx + 1 < this._nodes.length) {
 			this._focus(this._focusedItemIdx + 1, payload);
 		}
diff --git a/src/vs/base/browser/ui/button/button.ts b/src/vs/base/browser/ui/button/button.ts
index 30f588f4d49..49ab6b71dcd 100644
--- a/src/vs/base/browser/ui/button/button.ts
+++ b/src/vs/base/browser/ui/button/button.ts
@@ -3,28 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IContextMenuProvider } from 'vs/base/browser/contextmenu';
-import { addDisposableListener, EventHelper, EventType, IFocusTracker, isActiveElement, reset, trackFocus } from 'vs/base/browser/dom';
-import { sanitize } from 'vs/base/browser/dompurify/dompurify';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { renderMarkdown, renderStringAsPlaintext } from 'vs/base/browser/markdownRenderer';
-import { Gesture, EventType as TouchEventType } from 'vs/base/browser/touch';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { IHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate';
-import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
-import { Action, IAction, IActionRunner } from 'vs/base/common/actions';
-import { Codicon } from 'vs/base/common/codicons';
-import { Color } from 'vs/base/common/color';
-import { Event as BaseEvent, Emitter } from 'vs/base/common/event';
-import { IMarkdownString, isMarkdownString, markdownStringEqual } from 'vs/base/common/htmlContent';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { ThemeIcon } from 'vs/base/common/themables';
-import 'vs/css!./button';
-import { localize } from 'vs/nls';
-import type { IManagedHover } from 'vs/base/browser/ui/hover/hover';
-import { getBaseLayerHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate2';
-import { IActionProvider } from 'vs/base/browser/ui/dropdown/dropdown';
+import { IContextMenuProvider } from '../../contextmenu.js';
+import { addDisposableListener, EventHelper, EventType, IFocusTracker, isActiveElement, reset, trackFocus } from '../../dom.js';
+import { sanitize } from '../../dompurify/dompurify.js';
+import { StandardKeyboardEvent } from '../../keyboardEvent.js';
+import { renderMarkdown, renderStringAsPlaintext } from '../../markdownRenderer.js';
+import { Gesture, EventType as TouchEventType } from '../../touch.js';
+import { createInstantHoverDelegate, getDefaultHoverDelegate } from '../hover/hoverDelegateFactory.js';
+import { IHoverDelegate } from '../hover/hoverDelegate.js';
+import { renderLabelWithIcons } from '../iconLabel/iconLabels.js';
+import { Action, IAction, IActionRunner } from '../../../common/actions.js';
+import { Codicon } from '../../../common/codicons.js';
+import { Color } from '../../../common/color.js';
+import { Event as BaseEvent, Emitter } from '../../../common/event.js';
+import { IMarkdownString, isMarkdownString, markdownStringEqual } from '../../../common/htmlContent.js';
+import { KeyCode } from '../../../common/keyCodes.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../common/lifecycle.js';
+import { ThemeIcon } from '../../../common/themables.js';
+import './button.css';
+import { localize } from '../../../../nls.js';
+import type { IManagedHover } from '../hover/hover.js';
+import { getBaseLayerHoverDelegate } from '../hover/hoverDelegate2.js';
+import { IActionProvider } from '../dropdown/dropdown.js';
 
 export interface IButtonOptions extends Partial<IButtonStyles> {
 	readonly title?: boolean | string;
@@ -64,6 +64,7 @@ export interface IButton extends IDisposable {
 	set label(value: string | IMarkdownString);
 	set icon(value: ThemeIcon);
 	set enabled(value: boolean);
+	set checked(value: boolean);
 
 	focus(): void;
 	hasFocus(): boolean;
@@ -304,9 +305,23 @@ export class Button extends Disposable implements IButton {
 		return !this._element.classList.contains('disabled');
 	}
 
+	set checked(value: boolean) {
+		if (value) {
+			this._element.classList.add('checked');
+			this._element.setAttribute('aria-checked', 'true');
+		} else {
+			this._element.classList.remove('checked');
+			this._element.setAttribute('aria-checked', 'false');
+		}
+	}
+
+	get checked() {
+		return this._element.classList.contains('checked');
+	}
+
 	setTitle(title: string) {
 		if (!this._hover && title !== '') {
-			this._hover = this._register(getBaseLayerHoverDelegate().setupManagedHover(this.options.hoverDelegate ?? getDefaultHoverDelegate('mouse'), this._element, title));
+			this._hover = this._register(getBaseLayerHoverDelegate().setupManagedHover(this.options.hoverDelegate ?? getDefaultHoverDelegate('element'), this._element, title));
 		} else if (this._hover) {
 			this._hover.update(title);
 		}
@@ -347,6 +362,10 @@ export class ButtonWithDropdown extends Disposable implements IButton {
 		this.element.classList.add('monaco-button-dropdown');
 		container.appendChild(this.element);
 
+		if (!options.hoverDelegate) {
+			options = { ...options, hoverDelegate: this._register(createInstantHoverDelegate()) };
+		}
+
 		this.button = this._register(new Button(this.element, options));
 		this._register(this.button.onDidClick(e => this._onDidClick.fire(e)));
 		this.action = this._register(new Action('primaryAction', renderStringAsPlaintext(this.button.label), undefined, true, async () => this._onDidClick.fire(undefined)));
@@ -369,8 +388,7 @@ export class ButtonWithDropdown extends Disposable implements IButton {
 		this.separatorContainer.style.backgroundColor = buttonBackground ?? '';
 		this.separator.style.backgroundColor = options.buttonSeparator ?? '';
 
-		this.dropdownButton = this._register(new Button(this.element, { ...options, title: false, supportIcons: true }));
-		this._register(getBaseLayerHoverDelegate().setupManagedHover(getDefaultHoverDelegate('mouse'), this.dropdownButton.element, localize("button dropdown more actions", 'More Actions...')));
+		this.dropdownButton = this._register(new Button(this.element, { ...options, title: localize("button dropdown more actions", 'More Actions...'), supportIcons: true }));
 		this.dropdownButton.element.setAttribute('aria-haspopup', 'true');
 		this.dropdownButton.element.setAttribute('aria-expanded', 'false');
 		this.dropdownButton.element.classList.add('monaco-dropdown-button');
@@ -412,6 +430,14 @@ export class ButtonWithDropdown extends Disposable implements IButton {
 		return this.button.enabled;
 	}
 
+	set checked(value: boolean) {
+		this.button.checked = value;
+	}
+
+	get checked() {
+		return this.button.checked;
+	}
+
 	focus(): void {
 		this.button.focus();
 	}
@@ -462,6 +488,14 @@ export class ButtonWithDescription implements IButtonWithDescription {
 		this._button.enabled = enabled;
 	}
 
+	set checked(value: boolean) {
+		this._button.checked = value;
+	}
+
+	get checked(): boolean {
+		return this._button.checked;
+	}
+
 	focus(): void {
 		this._button.focus();
 	}
diff --git a/src/vs/base/browser/ui/centered/centeredViewLayout.ts b/src/vs/base/browser/ui/centered/centeredViewLayout.ts
index b6bc80b1d99..6b052011140 100644
--- a/src/vs/base/browser/ui/centered/centeredViewLayout.ts
+++ b/src/vs/base/browser/ui/centered/centeredViewLayout.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { $, IDomNodePagePosition } from 'vs/base/browser/dom';
-import { IView, IViewSize } from 'vs/base/browser/ui/grid/grid';
-import { IBoundarySashes } from 'vs/base/browser/ui/sash/sash';
-import { DistributeSizing, ISplitViewStyles, IView as ISplitViewView, Orientation, SplitView } from 'vs/base/browser/ui/splitview/splitview';
-import { Color } from 'vs/base/common/color';
-import { Event } from 'vs/base/common/event';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
+import { $, IDomNodePagePosition } from '../../dom.js';
+import { IView, IViewSize } from '../grid/grid.js';
+import { IBoundarySashes } from '../sash/sash.js';
+import { DistributeSizing, ISplitViewStyles, IView as ISplitViewView, Orientation, SplitView } from '../splitview/splitview.js';
+import { Color } from '../../../common/color.js';
+import { Event } from '../../../common/event.js';
+import { DisposableStore, IDisposable } from '../../../common/lifecycle.js';
 
 export interface CenteredViewState {
 	// width of the fixed centered layout
diff --git a/src/vs/base/browser/ui/codicons/codicon/codicon.ttf b/src/vs/base/browser/ui/codicons/codicon/codicon.ttf
index 27ee4c68cae..1594b49dd13 100644
Binary files a/src/vs/base/browser/ui/codicons/codicon/codicon.ttf and b/src/vs/base/browser/ui/codicons/codicon/codicon.ttf differ
diff --git a/src/vs/base/browser/ui/codicons/codiconStyles.ts b/src/vs/base/browser/ui/codicons/codiconStyles.ts
index f5656acba37..c6dc23c0bfd 100644
--- a/src/vs/base/browser/ui/codicons/codiconStyles.ts
+++ b/src/vs/base/browser/ui/codicons/codiconStyles.ts
@@ -3,5 +3,5 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./codicon/codicon';
-import 'vs/css!./codicon/codicon-modifiers';
+import './codicon/codicon.css';
+import './codicon/codicon-modifiers.css';
diff --git a/src/vs/base/browser/ui/contextview/contextview.ts b/src/vs/base/browser/ui/contextview/contextview.ts
index 1edda5b714c..3621da7137c 100644
--- a/src/vs/base/browser/ui/contextview/contextview.ts
+++ b/src/vs/base/browser/ui/contextview/contextview.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BrowserFeatures } from 'vs/base/browser/canIUse';
-import * as DOM from 'vs/base/browser/dom';
-import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import * as platform from 'vs/base/common/platform';
-import { Range } from 'vs/base/common/range';
-import { OmitOptional } from 'vs/base/common/types';
-import 'vs/css!./contextview';
+import { BrowserFeatures } from '../../canIUse.js';
+import * as DOM from '../../dom.js';
+import { StandardMouseEvent } from '../../mouseEvent.js';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../common/lifecycle.js';
+import * as platform from '../../../common/platform.js';
+import { Range } from '../../../common/range.js';
+import { OmitOptional } from '../../../common/types.js';
+import './contextview.css';
 
 export const enum ContextViewDOMPosition {
 	ABSOLUTE = 1,
diff --git a/src/vs/base/browser/ui/countBadge/countBadge.ts b/src/vs/base/browser/ui/countBadge/countBadge.ts
index 0ee88d005d0..0413067adce 100644
--- a/src/vs/base/browser/ui/countBadge/countBadge.ts
+++ b/src/vs/base/browser/ui/countBadge/countBadge.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { $, append } from 'vs/base/browser/dom';
-import { format } from 'vs/base/common/strings';
-import 'vs/css!./countBadge';
+import { $, append } from '../../dom.js';
+import { format } from '../../../common/strings.js';
+import './countBadge.css';
 
 export interface ICountBadgeOptions {
 	readonly count?: number;
diff --git a/src/vs/base/browser/ui/dialog/dialog.css b/src/vs/base/browser/ui/dialog/dialog.css
index 9b7681e1fa8..60dba786a8a 100644
--- a/src/vs/base/browser/ui/dialog/dialog.css
+++ b/src/vs/base/browser/ui/dialog/dialog.css
@@ -30,6 +30,7 @@
 	min-height: 75px;
 	padding: 10px;
 	transform: translate3d(0px, 0px, 0px);
+	border-radius: 3px;
 }
 
 /** Dialog: Title Actions Row */
diff --git a/src/vs/base/browser/ui/dialog/dialog.ts b/src/vs/base/browser/ui/dialog/dialog.ts
index 3842592da15..7c11fef5b1e 100644
--- a/src/vs/base/browser/ui/dialog/dialog.ts
+++ b/src/vs/base/browser/ui/dialog/dialog.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { $, addDisposableListener, clearNode, EventHelper, EventType, getWindow, hide, isActiveElement, isAncestor, show } from 'vs/base/browser/dom';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { ButtonBar, ButtonWithDescription, IButtonStyles } from 'vs/base/browser/ui/button/button';
-import { ICheckboxStyles, Checkbox } from 'vs/base/browser/ui/toggle/toggle';
-import { IInputBoxStyles, InputBox } from 'vs/base/browser/ui/inputbox/inputBox';
-import { Action } from 'vs/base/common/actions';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { mnemonicButtonLabel } from 'vs/base/common/labels';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
-import 'vs/css!./dialog';
-import * as nls from 'vs/nls';
+import { $, addDisposableListener, clearNode, EventHelper, EventType, getWindow, hide, isActiveElement, isAncestor, show } from '../../dom.js';
+import { StandardKeyboardEvent } from '../../keyboardEvent.js';
+import { ActionBar } from '../actionbar/actionbar.js';
+import { ButtonBar, ButtonWithDescription, IButtonStyles } from '../button/button.js';
+import { ICheckboxStyles, Checkbox } from '../toggle/toggle.js';
+import { IInputBoxStyles, InputBox } from '../inputbox/inputBox.js';
+import { Action } from '../../../common/actions.js';
+import { Codicon } from '../../../common/codicons.js';
+import { ThemeIcon } from '../../../common/themables.js';
+import { KeyCode, KeyMod } from '../../../common/keyCodes.js';
+import { mnemonicButtonLabel } from '../../../common/labels.js';
+import { Disposable } from '../../../common/lifecycle.js';
+import { isLinux, isMacintosh, isWindows } from '../../../common/platform.js';
+import './dialog.css';
+import * as nls from '../../../../nls.js';
 
 export interface IDialogInputOptions {
 	readonly placeholder?: string;
@@ -209,7 +209,7 @@ export class Dialog extends Disposable {
 			// Handle button clicks
 			buttonMap.forEach((entry, index) => {
 				const primary = buttonMap[index].index === 0;
-				const button = this.options.buttonDetails ? this._register(buttonBar.addButtonWithDescription({ title: true, secondary: !primary, ...this.buttonStyles })) : this._register(buttonBar.addButton({ title: true, secondary: !primary, ...this.buttonStyles }));
+				const button = this.options.buttonDetails ? this._register(buttonBar.addButtonWithDescription({ secondary: !primary, ...this.buttonStyles })) : this._register(buttonBar.addButton({ secondary: !primary, ...this.buttonStyles }));
 				button.label = mnemonicButtonLabel(buttonMap[index].label, true);
 				if (button instanceof ButtonWithDescription) {
 					button.description = this.options.buttonDetails![buttonMap[index].index];
diff --git a/src/vs/base/browser/ui/dropdown/dropdown.ts b/src/vs/base/browser/ui/dropdown/dropdown.ts
index ba003576019..1fc6a028049 100644
--- a/src/vs/base/browser/ui/dropdown/dropdown.ts
+++ b/src/vs/base/browser/ui/dropdown/dropdown.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IContextMenuProvider } from 'vs/base/browser/contextmenu';
-import { $, addDisposableListener, append, EventHelper, EventType, isMouseEvent } from 'vs/base/browser/dom';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { EventType as GestureEventType, Gesture } from 'vs/base/browser/touch';
-import { AnchorAlignment } from 'vs/base/browser/ui/contextview/contextview';
-import type { IManagedHover } from 'vs/base/browser/ui/hover/hover';
-import { getBaseLayerHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate2';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { IMenuOptions } from 'vs/base/browser/ui/menu/menu';
-import { ActionRunner, IAction } from 'vs/base/common/actions';
-import { Emitter } from 'vs/base/common/event';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import 'vs/css!./dropdown';
+import { IContextMenuProvider } from '../../contextmenu.js';
+import { $, addDisposableListener, append, EventHelper, EventType, isMouseEvent } from '../../dom.js';
+import { StandardKeyboardEvent } from '../../keyboardEvent.js';
+import { EventType as GestureEventType, Gesture } from '../../touch.js';
+import { AnchorAlignment } from '../contextview/contextview.js';
+import type { IManagedHover } from '../hover/hover.js';
+import { getBaseLayerHoverDelegate } from '../hover/hoverDelegate2.js';
+import { getDefaultHoverDelegate } from '../hover/hoverDelegateFactory.js';
+import { IMenuOptions } from '../menu/menu.js';
+import { ActionRunner, IAction } from '../../../common/actions.js';
+import { Emitter } from '../../../common/event.js';
+import { KeyCode } from '../../../common/keyCodes.js';
+import { IDisposable } from '../../../common/lifecycle.js';
+import './dropdown.css';
 
 export interface ILabelRenderer {
 	(container: HTMLElement): IDisposable | null;
diff --git a/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.ts b/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.ts
index 007e1de2a66..3d5e9c61721 100644
--- a/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.ts
+++ b/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { IContextMenuProvider } from 'vs/base/browser/contextmenu';
-import { $, addDisposableListener, append, EventType, h } from 'vs/base/browser/dom';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { IActionViewItemProvider } from 'vs/base/browser/ui/actionbar/actionbar';
-import { ActionViewItem, BaseActionViewItem, IActionViewItemOptions, IBaseActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { AnchorAlignment } from 'vs/base/browser/ui/contextview/contextview';
-import { DropdownMenu, IActionProvider, IDropdownMenuOptions, ILabelRenderer } from 'vs/base/browser/ui/dropdown/dropdown';
-import { Action, IAction, IActionRunner } from 'vs/base/common/actions';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { Emitter } from 'vs/base/common/event';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { ResolvedKeybinding } from 'vs/base/common/keybindings';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import 'vs/css!./dropdown';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { getBaseLayerHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate2';
+import * as nls from '../../../../nls.js';
+import { IContextMenuProvider } from '../../contextmenu.js';
+import { $, addDisposableListener, append, EventType, h } from '../../dom.js';
+import { StandardKeyboardEvent } from '../../keyboardEvent.js';
+import { IActionViewItemProvider } from '../actionbar/actionbar.js';
+import { ActionViewItem, BaseActionViewItem, IActionViewItemOptions, IBaseActionViewItemOptions } from '../actionbar/actionViewItems.js';
+import { AnchorAlignment } from '../contextview/contextview.js';
+import { DropdownMenu, IActionProvider, IDropdownMenuOptions, ILabelRenderer } from './dropdown.js';
+import { Action, IAction, IActionRunner } from '../../../common/actions.js';
+import { Codicon } from '../../../common/codicons.js';
+import { ThemeIcon } from '../../../common/themables.js';
+import { Emitter } from '../../../common/event.js';
+import { KeyCode } from '../../../common/keyCodes.js';
+import { ResolvedKeybinding } from '../../../common/keybindings.js';
+import { IDisposable } from '../../../common/lifecycle.js';
+import './dropdown.css';
+import { getDefaultHoverDelegate } from '../hover/hoverDelegateFactory.js';
+import { getBaseLayerHoverDelegate } from '../hover/hoverDelegate2.js';
 
 export interface IKeybindingProvider {
 	(action: IAction): ResolvedKeybinding | undefined;
diff --git a/src/vs/base/browser/ui/findinput/findInput.ts b/src/vs/base/browser/ui/findinput/findInput.ts
index ff042180b6e..481c62b4c28 100644
--- a/src/vs/base/browser/ui/findinput/findInput.ts
+++ b/src/vs/base/browser/ui/findinput/findInput.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { IMouseEvent } from 'vs/base/browser/mouseEvent';
-import { IToggleStyles, Toggle } from 'vs/base/browser/ui/toggle/toggle';
-import { IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview';
-import { CaseSensitiveToggle, RegexToggle, WholeWordsToggle } from 'vs/base/browser/ui/findinput/findInputToggles';
-import { HistoryInputBox, IInputBoxStyles, IInputValidator, IMessage as InputBoxMessage } from 'vs/base/browser/ui/inputbox/inputBox';
-import { Widget } from 'vs/base/browser/ui/widget';
-import { Emitter, Event } from 'vs/base/common/event';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import 'vs/css!./findInput';
-import * as nls from 'vs/nls';
-import { DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
-import { createInstantHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
+import * as dom from '../../dom.js';
+import { IKeyboardEvent } from '../../keyboardEvent.js';
+import { IMouseEvent } from '../../mouseEvent.js';
+import { IToggleStyles, Toggle } from '../toggle/toggle.js';
+import { IContextViewProvider } from '../contextview/contextview.js';
+import { CaseSensitiveToggle, RegexToggle, WholeWordsToggle } from './findInputToggles.js';
+import { HistoryInputBox, IInputBoxStyles, IInputValidator, IMessage as InputBoxMessage } from '../inputbox/inputBox.js';
+import { Widget } from '../widget.js';
+import { Emitter, Event } from '../../../common/event.js';
+import { KeyCode } from '../../../common/keyCodes.js';
+import './findInput.css';
+import * as nls from '../../../../nls.js';
+import { DisposableStore, MutableDisposable } from '../../../common/lifecycle.js';
+import { createInstantHoverDelegate } from '../hover/hoverDelegateFactory.js';
 
 
 export interface IFindInputOptions {
diff --git a/src/vs/base/browser/ui/findinput/findInputToggles.ts b/src/vs/base/browser/ui/findinput/findInputToggles.ts
index adce009430b..c13fcafe5f8 100644
--- a/src/vs/base/browser/ui/findinput/findInputToggles.ts
+++ b/src/vs/base/browser/ui/findinput/findInputToggles.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { IHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate';
-import { Toggle } from 'vs/base/browser/ui/toggle/toggle';
-import { Codicon } from 'vs/base/common/codicons';
-import * as nls from 'vs/nls';
+import { getDefaultHoverDelegate } from '../hover/hoverDelegateFactory.js';
+import { IHoverDelegate } from '../hover/hoverDelegate.js';
+import { Toggle } from '../toggle/toggle.js';
+import { Codicon } from '../../../common/codicons.js';
+import * as nls from '../../../../nls.js';
 
 export interface IFindInputToggleOpts {
 	readonly appendTitle: string;
diff --git a/src/vs/base/browser/ui/findinput/replaceInput.ts b/src/vs/base/browser/ui/findinput/replaceInput.ts
index 4dfdf549a3b..e608b5f2923 100644
--- a/src/vs/base/browser/ui/findinput/replaceInput.ts
+++ b/src/vs/base/browser/ui/findinput/replaceInput.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { IMouseEvent } from 'vs/base/browser/mouseEvent';
-import { IToggleStyles, Toggle } from 'vs/base/browser/ui/toggle/toggle';
-import { IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview';
-import { IFindInputToggleOpts } from 'vs/base/browser/ui/findinput/findInputToggles';
-import { HistoryInputBox, IInputBoxStyles, IInputValidator, IMessage as InputBoxMessage } from 'vs/base/browser/ui/inputbox/inputBox';
-import { Widget } from 'vs/base/browser/ui/widget';
-import { Codicon } from 'vs/base/common/codicons';
-import { Emitter, Event } from 'vs/base/common/event';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import 'vs/css!./findInput';
-import * as nls from 'vs/nls';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
+import * as dom from '../../dom.js';
+import { IKeyboardEvent } from '../../keyboardEvent.js';
+import { IMouseEvent } from '../../mouseEvent.js';
+import { IToggleStyles, Toggle } from '../toggle/toggle.js';
+import { IContextViewProvider } from '../contextview/contextview.js';
+import { IFindInputToggleOpts } from './findInputToggles.js';
+import { HistoryInputBox, IInputBoxStyles, IInputValidator, IMessage as InputBoxMessage } from '../inputbox/inputBox.js';
+import { Widget } from '../widget.js';
+import { Codicon } from '../../../common/codicons.js';
+import { Emitter, Event } from '../../../common/event.js';
+import { KeyCode } from '../../../common/keyCodes.js';
+import './findInput.css';
+import * as nls from '../../../../nls.js';
+import { getDefaultHoverDelegate } from '../hover/hoverDelegateFactory.js';
 
 
 export interface IReplaceInputOptions {
diff --git a/src/vs/base/browser/ui/grid/grid.ts b/src/vs/base/browser/ui/grid/grid.ts
index ae313543f92..60d79ed6155 100644
--- a/src/vs/base/browser/ui/grid/grid.ts
+++ b/src/vs/base/browser/ui/grid/grid.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IBoundarySashes, Orientation } from 'vs/base/browser/ui/sash/sash';
-import { equals, tail2 as tail } from 'vs/base/common/arrays';
-import { Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import 'vs/css!./gridview';
-import { Box, GridView, IGridViewOptions, IGridViewStyles, IView as IGridViewView, IViewSize, orthogonal, Sizing as GridViewSizing, GridLocation } from './gridview';
-import type { SplitView, AutoSizing as SplitViewAutoSizing } from 'vs/base/browser/ui/splitview/splitview';
+import { IBoundarySashes, Orientation } from '../sash/sash.js';
+import { equals, tail2 as tail } from '../../../common/arrays.js';
+import { Event } from '../../../common/event.js';
+import { Disposable } from '../../../common/lifecycle.js';
+import './gridview.css';
+import { Box, GridView, IGridViewOptions, IGridViewStyles, IView as IGridViewView, IViewSize, orthogonal, Sizing as GridViewSizing, GridLocation } from './gridview.js';
+import type { SplitView, AutoSizing as SplitViewAutoSizing } from '../splitview/splitview.js';
 
 export type { IViewSize };
-export { LayoutPriority, Orientation, orthogonal } from './gridview';
+export { LayoutPriority, Orientation, orthogonal } from './gridview.js';
 
 export const enum Direction {
 	Up,
diff --git a/src/vs/base/browser/ui/grid/gridview.ts b/src/vs/base/browser/ui/grid/gridview.ts
index 17b24550622..3dc5d8f6a56 100644
--- a/src/vs/base/browser/ui/grid/gridview.ts
+++ b/src/vs/base/browser/ui/grid/gridview.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { $ } from 'vs/base/browser/dom';
-import { IBoundarySashes, Orientation, Sash } from 'vs/base/browser/ui/sash/sash';
-import { DistributeSizing, ISplitViewStyles, IView as ISplitView, LayoutPriority, Sizing, AutoSizing, SplitView } from 'vs/base/browser/ui/splitview/splitview';
-import { equals as arrayEquals, tail2 as tail } from 'vs/base/common/arrays';
-import { Color } from 'vs/base/common/color';
-import { Emitter, Event, Relay } from 'vs/base/common/event';
-import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { rot } from 'vs/base/common/numbers';
-import { isUndefined } from 'vs/base/common/types';
-import 'vs/css!./gridview';
+import { $ } from '../../dom.js';
+import { IBoundarySashes, Orientation, Sash } from '../sash/sash.js';
+import { DistributeSizing, ISplitViewStyles, IView as ISplitView, LayoutPriority, Sizing, AutoSizing, SplitView } from '../splitview/splitview.js';
+import { equals as arrayEquals, tail2 as tail } from '../../../common/arrays.js';
+import { Color } from '../../../common/color.js';
+import { Emitter, Event, Relay } from '../../../common/event.js';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../common/lifecycle.js';
+import { rot } from '../../../common/numbers.js';
+import { isUndefined } from '../../../common/types.js';
+import './gridview.css';
 
-export { Orientation } from 'vs/base/browser/ui/sash/sash';
-export { LayoutPriority, Sizing } from 'vs/base/browser/ui/splitview/splitview';
+export { Orientation } from '../sash/sash.js';
+export { LayoutPriority, Sizing } from '../splitview/splitview.js';
 
 export interface IGridViewStyles extends ISplitViewStyles { }
 
diff --git a/src/vs/base/browser/ui/highlightedlabel/highlightedLabel.ts b/src/vs/base/browser/ui/highlightedlabel/highlightedLabel.ts
index 83b0c26bcae..203caa79c61 100644
--- a/src/vs/base/browser/ui/highlightedlabel/highlightedLabel.ts
+++ b/src/vs/base/browser/ui/highlightedlabel/highlightedLabel.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import type { IManagedHover } from 'vs/base/browser/ui/hover/hover';
-import { IHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate';
-import { getBaseLayerHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate2';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
-import { Disposable } from 'vs/base/common/lifecycle';
-import * as objects from 'vs/base/common/objects';
+import * as dom from '../../dom.js';
+import type { IManagedHover } from '../hover/hover.js';
+import { IHoverDelegate } from '../hover/hoverDelegate.js';
+import { getBaseLayerHoverDelegate } from '../hover/hoverDelegate2.js';
+import { getDefaultHoverDelegate } from '../hover/hoverDelegateFactory.js';
+import { renderLabelWithIcons } from '../iconLabel/iconLabels.js';
+import { Disposable } from '../../../common/lifecycle.js';
+import * as objects from '../../../common/objects.js';
 
 /**
  * A range to be highlighted.
diff --git a/src/vs/base/browser/ui/hover/hover.ts b/src/vs/base/browser/ui/hover/hover.ts
index f66ba1ea673..c2500e19f56 100644
--- a/src/vs/base/browser/ui/hover/hover.ts
+++ b/src/vs/base/browser/ui/hover/hover.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import type { IHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate';
-import type { HoverPosition } from 'vs/base/browser/ui/hover/hoverWidget';
-import type { CancellationToken } from 'vs/base/common/cancellation';
-import type { IMarkdownString } from 'vs/base/common/htmlContent';
-import type { IDisposable } from 'vs/base/common/lifecycle';
+import type { IHoverDelegate } from './hoverDelegate.js';
+import type { HoverPosition } from './hoverWidget.js';
+import type { CancellationToken } from '../../../common/cancellation.js';
+import type { IMarkdownString } from '../../../common/htmlContent.js';
+import type { IDisposable } from '../../../common/lifecycle.js';
 
 /**
  * Enables the convenient display of rich markdown-based hovers in the workbench.
@@ -274,6 +274,7 @@ export type IManagedHoverContent = string | IManagedHoverTooltipMarkdownString |
 export type IManagedHoverContentOrFactory = IManagedHoverContent | (() => IManagedHoverContent);
 
 export interface IManagedHoverOptions extends Pick<IHoverOptions, 'actions' | 'linkHandler' | 'trapFocus'> {
+	appearance?: Pick<IHoverAppearanceOptions, 'showHoverHint'>;
 }
 
 export interface IManagedHover extends IDisposable {
diff --git a/src/vs/base/browser/ui/hover/hoverDelegate.ts b/src/vs/base/browser/ui/hover/hoverDelegate.ts
index 47ea1b77531..31ec93f727a 100644
--- a/src/vs/base/browser/ui/hover/hoverDelegate.ts
+++ b/src/vs/base/browser/ui/hover/hoverDelegate.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import type { IHoverWidget, IManagedHoverOptions } from 'vs/base/browser/ui/hover/hover';
-import { HoverPosition } from 'vs/base/browser/ui/hover/hoverWidget';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { IDisposable } from 'vs/base/common/lifecycle';
+import type { IHoverWidget, IManagedHoverOptions } from './hover.js';
+import { HoverPosition } from './hoverWidget.js';
+import { IMarkdownString } from '../../../common/htmlContent.js';
+import { IDisposable } from '../../../common/lifecycle.js';
 
 export interface IHoverDelegateTarget extends IDisposable {
 	readonly targetElements: readonly HTMLElement[];
@@ -49,6 +49,13 @@ export interface IHoverDelegateOptions extends IManagedHoverOptions {
 		 * Whether to show the hover pointer
 		 */
 		showPointer?: boolean;
+		/**
+		 * When {@link hideOnHover} is explicitly true or undefined and its auto value is detected to
+		 * hide, show a hint at the bottom of the hover explaining how to mouse over the widget. This
+		 * should be used in the cases where despite the hover having no interactive content, it's
+		 * likely the user may want to interact with it somehow.
+		 */
+		showHoverHint?: boolean;
 		/**
 		 * Whether to skip the fade in animation, this should be used when hovering from one hover to
 		 * another in the same group so it looks like the hover is moving from one element to the other.
diff --git a/src/vs/base/browser/ui/hover/hoverDelegate2.ts b/src/vs/base/browser/ui/hover/hoverDelegate2.ts
index 1d6a312f70d..1d87b1721e4 100644
--- a/src/vs/base/browser/ui/hover/hoverDelegate2.ts
+++ b/src/vs/base/browser/ui/hover/hoverDelegate2.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import type { IHoverDelegate2 } from 'vs/base/browser/ui/hover/hover';
+import type { IHoverDelegate2 } from './hover.js';
 
 let baseHoverDelegate: IHoverDelegate2 = {
 	showHover: () => undefined,
diff --git a/src/vs/base/browser/ui/hover/hoverDelegateFactory.ts b/src/vs/base/browser/ui/hover/hoverDelegateFactory.ts
index b14f1159419..4334c85ab06 100644
--- a/src/vs/base/browser/ui/hover/hoverDelegateFactory.ts
+++ b/src/vs/base/browser/ui/hover/hoverDelegateFactory.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IHoverDelegate, IScopedHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate';
-import { Lazy } from 'vs/base/common/lazy';
+import { IHoverDelegate, IScopedHoverDelegate } from './hoverDelegate.js';
+import { Lazy } from '../../../common/lazy.js';
 
 const nullHoverDelegateFactory = () => ({
 	get delay(): number { return -1; },
diff --git a/src/vs/base/browser/ui/hover/hoverWidget.css b/src/vs/base/browser/ui/hover/hoverWidget.css
index a1d72c2e581..d69122654e5 100644
--- a/src/vs/base/browser/ui/hover/hoverWidget.css
+++ b/src/vs/base/browser/ui/hover/hoverWidget.css
@@ -134,6 +134,11 @@
 	padding-right: 4px;
 }
 
+.monaco-hover .hover-row.status-bar .actions .action-container a {
+	color: var(--vscode-textLink-foreground);
+	text-decoration: var(--text-link-decoration);
+}
+
 .monaco-hover .markdown-hover .hover-contents .codicon {
 	color: inherit;
 	font-size: inherit;
@@ -171,6 +176,10 @@
 	display: inline-block;
 }
 
+.monaco-hover .markdown-hover .hover-contents:not(.code-hover-contents):not(.html-hover-contents) span.codicon {
+	margin-bottom: 2px;
+}
+
 .monaco-hover-content .action-container a {
 	-webkit-user-select: none;
 	user-select: none;
diff --git a/src/vs/base/browser/ui/hover/hoverWidget.ts b/src/vs/base/browser/ui/hover/hoverWidget.ts
index 2e9ecbdd1fe..638af90bd8e 100644
--- a/src/vs/base/browser/ui/hover/hoverWidget.ts
+++ b/src/vs/base/browser/ui/hover/hoverWidget.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { Disposable } from 'vs/base/common/lifecycle';
-import 'vs/css!./hoverWidget';
-import { localize } from 'vs/nls';
+import * as dom from '../../dom.js';
+import { StandardKeyboardEvent } from '../../keyboardEvent.js';
+import { DomScrollableElement } from '../scrollbar/scrollableElement.js';
+import { KeyCode } from '../../../common/keyCodes.js';
+import { Disposable } from '../../../common/lifecycle.js';
+import './hoverWidget.css';
+import { localize } from '../../../../nls.js';
 
 const $ = dom.$;
 
@@ -50,12 +50,18 @@ export class HoverAction extends Disposable {
 		return new HoverAction(parent, actionOptions, keybindingLabel);
 	}
 
+	public readonly actionLabel: string;
+	public readonly actionKeybindingLabel: string | null;
+
 	private readonly actionContainer: HTMLElement;
 	private readonly action: HTMLElement;
 
 	private constructor(parent: HTMLElement, actionOptions: { label: string; iconClass?: string; run: (target: HTMLElement) => void; commandId: string }, keybindingLabel: string | null) {
 		super();
 
+		this.actionLabel = actionOptions.label;
+		this.actionKeybindingLabel = keybindingLabel;
+
 		this.actionContainer = dom.append(parent, $('div.action-container'));
 		this.actionContainer.setAttribute('tabindex', '0');
 
diff --git a/src/vs/base/browser/ui/iconLabel/iconLabel.ts b/src/vs/base/browser/ui/iconLabel/iconLabel.ts
index e761b71228e..8d97f4392c1 100644
--- a/src/vs/base/browser/ui/iconLabel/iconLabel.ts
+++ b/src/vs/base/browser/ui/iconLabel/iconLabel.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./iconlabel';
-import * as dom from 'vs/base/browser/dom';
-import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
-import { IHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate';
-import { IMatch } from 'vs/base/common/filters';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { equals } from 'vs/base/common/objects';
-import { Range } from 'vs/base/common/range';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import type { IManagedHoverTooltipMarkdownString } from 'vs/base/browser/ui/hover/hover';
-import { getBaseLayerHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate2';
-import { isString } from 'vs/base/common/types';
-import { stripIcons } from 'vs/base/common/iconLabels';
-import { URI } from 'vs/base/common/uri';
+import './iconlabel.css';
+import * as dom from '../../dom.js';
+import { HighlightedLabel } from '../highlightedlabel/highlightedLabel.js';
+import { IHoverDelegate } from '../hover/hoverDelegate.js';
+import { IMatch } from '../../../common/filters.js';
+import { Disposable, IDisposable } from '../../../common/lifecycle.js';
+import { equals } from '../../../common/objects.js';
+import { Range } from '../../../common/range.js';
+import { getDefaultHoverDelegate } from '../hover/hoverDelegateFactory.js';
+import type { IManagedHoverTooltipMarkdownString } from '../hover/hover.js';
+import { getBaseLayerHoverDelegate } from '../hover/hoverDelegate2.js';
+import { isString } from '../../../common/types.js';
+import { stripIcons } from '../../../common/iconLabels.js';
+import { URI } from '../../../common/uri.js';
 
 export interface IIconLabelCreationOptions {
 	readonly supportHighlights?: boolean;
@@ -45,7 +45,7 @@ export interface IIconLabelValueOptions {
 class FastLabelNode {
 	private disposed: boolean | undefined;
 	private _textContent: string | undefined;
-	private _className: string | undefined;
+	private _classNames: string[] | undefined;
 	private _empty: boolean | undefined;
 
 	constructor(private _element: HTMLElement) {
@@ -64,13 +64,14 @@ class FastLabelNode {
 		this._element.textContent = content;
 	}
 
-	set className(className: string) {
-		if (this.disposed || className === this._className) {
+	set classNames(classNames: string[]) {
+		if (this.disposed || equals(classNames, this._classNames)) {
 			return;
 		}
 
-		this._className = className;
-		this._element.className = className;
+		this._classNames = classNames;
+		this._element.classList.value = '';
+		this._element.classList.add(...classNames);
 	}
 
 	set empty(empty: boolean) {
@@ -169,9 +170,10 @@ export class IconLabel extends Disposable {
 			existingIconNode.remove();
 		}
 
-		this.domNode.className = labelClasses.join(' ');
+		this.domNode.classNames = labelClasses;
 		this.domNode.element.setAttribute('aria-label', ariaLabel);
-		this.labelContainer.className = containerClasses.join(' ');
+		this.labelContainer.classList.value = '';
+		this.labelContainer.classList.add(...containerClasses);
 		this.setupHover(options?.descriptionTitle ? this.labelContainer : this.element, options?.title);
 
 		this.nameNode.setLabel(label, options);
diff --git a/src/vs/base/browser/ui/iconLabel/iconLabels.ts b/src/vs/base/browser/ui/iconLabel/iconLabels.ts
index b89a45cb08f..eaaa470427f 100644
--- a/src/vs/base/browser/ui/iconLabel/iconLabels.ts
+++ b/src/vs/base/browser/ui/iconLabel/iconLabels.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { ThemeIcon } from 'vs/base/common/themables';
+import * as dom from '../../dom.js';
+import { ThemeIcon } from '../../../common/themables.js';
 
 const labelWithIconsRegex = new RegExp(`(\\\\)?\\$\\((${ThemeIcon.iconNameExpression}(?:${ThemeIcon.iconModifierExpression})?)\\)`, 'g');
 export function renderLabelWithIcons(text: string): Array<HTMLSpanElement | string> {
diff --git a/src/vs/base/browser/ui/iconLabel/simpleIconLabel.ts b/src/vs/base/browser/ui/iconLabel/simpleIconLabel.ts
index ea8179ad642..36d2af9f495 100644
--- a/src/vs/base/browser/ui/iconLabel/simpleIconLabel.ts
+++ b/src/vs/base/browser/ui/iconLabel/simpleIconLabel.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { reset } from 'vs/base/browser/dom';
-import type { IManagedHover } from 'vs/base/browser/ui/hover/hover';
-import { getBaseLayerHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate2';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
-import { IDisposable } from 'vs/base/common/lifecycle';
+import { reset } from '../../dom.js';
+import type { IManagedHover } from '../hover/hover.js';
+import { getBaseLayerHoverDelegate } from '../hover/hoverDelegate2.js';
+import { getDefaultHoverDelegate } from '../hover/hoverDelegateFactory.js';
+import { renderLabelWithIcons } from './iconLabels.js';
+import { IDisposable } from '../../../common/lifecycle.js';
 
 export class SimpleIconLabel implements IDisposable {
 
diff --git a/src/vs/base/browser/ui/icons/iconSelectBox.ts b/src/vs/base/browser/ui/icons/iconSelectBox.ts
index b59529ffd81..667cfd8cdc7 100644
--- a/src/vs/base/browser/ui/icons/iconSelectBox.ts
+++ b/src/vs/base/browser/ui/icons/iconSelectBox.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./iconSelectBox';
-import * as dom from 'vs/base/browser/dom';
-import { alert } from 'vs/base/browser/ui/aria/aria';
-import { IInputBoxStyles, InputBox } from 'vs/base/browser/ui/inputbox/inputBox';
-import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
-import { Emitter } from 'vs/base/common/event';
-import { IDisposable, DisposableStore, Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { localize } from 'vs/nls';
-import { IMatch } from 'vs/base/common/filters';
-import { ScrollbarVisibility } from 'vs/base/common/scrollable';
-import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
+import './iconSelectBox.css';
+import * as dom from '../../dom.js';
+import { alert } from '../aria/aria.js';
+import { IInputBoxStyles, InputBox } from '../inputbox/inputBox.js';
+import { DomScrollableElement } from '../scrollbar/scrollableElement.js';
+import { Emitter } from '../../../common/event.js';
+import { IDisposable, DisposableStore, Disposable, MutableDisposable } from '../../../common/lifecycle.js';
+import { ThemeIcon } from '../../../common/themables.js';
+import { localize } from '../../../../nls.js';
+import { IMatch } from '../../../common/filters.js';
+import { ScrollbarVisibility } from '../../../common/scrollable.js';
+import { HighlightedLabel } from '../highlightedlabel/highlightedLabel.js';
 
 export interface IIconSelectBoxOptions {
 	readonly icons: ThemeIcon[];
diff --git a/src/vs/base/browser/ui/inputbox/inputBox.css b/src/vs/base/browser/ui/inputbox/inputBox.css
index 9d52e6e66da..f6005a48f78 100644
--- a/src/vs/base/browser/ui/inputbox/inputBox.css
+++ b/src/vs/base/browser/ui/inputbox/inputBox.css
@@ -24,7 +24,6 @@
 .monaco-inputbox > .ibwrapper {
 	position: relative;
 	width: 100%;
-	height: 100%;
 }
 
 .monaco-inputbox > .ibwrapper > .input {
diff --git a/src/vs/base/browser/ui/inputbox/inputBox.ts b/src/vs/base/browser/ui/inputbox/inputBox.ts
index 870afb65c0a..990ee8083f8 100644
--- a/src/vs/base/browser/ui/inputbox/inputBox.ts
+++ b/src/vs/base/browser/ui/inputbox/inputBox.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { DomEmitter } from 'vs/base/browser/event';
-import { renderFormattedText, renderText } from 'vs/base/browser/formattedTextRenderer';
-import { IHistoryNavigationWidget } from 'vs/base/browser/history';
-import { MarkdownRenderOptions } from 'vs/base/browser/markdownRenderer';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import * as aria from 'vs/base/browser/ui/aria/aria';
-import { AnchorAlignment, IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview';
-import type { IManagedHover } from 'vs/base/browser/ui/hover/hover';
-import { getBaseLayerHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate2';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { ScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
-import { Widget } from 'vs/base/browser/ui/widget';
-import { IAction } from 'vs/base/common/actions';
-import { Emitter, Event } from 'vs/base/common/event';
-import { HistoryNavigator } from 'vs/base/common/history';
-import { equals } from 'vs/base/common/objects';
-import { ScrollbarVisibility } from 'vs/base/common/scrollable';
-import 'vs/css!./inputBox';
-import * as nls from 'vs/nls';
+import * as dom from '../../dom.js';
+import { DomEmitter } from '../../event.js';
+import { renderFormattedText, renderText } from '../../formattedTextRenderer.js';
+import { IHistoryNavigationWidget } from '../../history.js';
+import { MarkdownRenderOptions } from '../../markdownRenderer.js';
+import { ActionBar } from '../actionbar/actionbar.js';
+import * as aria from '../aria/aria.js';
+import { AnchorAlignment, IContextViewProvider } from '../contextview/contextview.js';
+import type { IManagedHover } from '../hover/hover.js';
+import { getBaseLayerHoverDelegate } from '../hover/hoverDelegate2.js';
+import { getDefaultHoverDelegate } from '../hover/hoverDelegateFactory.js';
+import { ScrollableElement } from '../scrollbar/scrollableElement.js';
+import { Widget } from '../widget.js';
+import { IAction } from '../../../common/actions.js';
+import { Emitter, Event } from '../../../common/event.js';
+import { HistoryNavigator } from '../../../common/history.js';
+import { equals } from '../../../common/objects.js';
+import { ScrollbarVisibility } from '../../../common/scrollable.js';
+import './inputBox.css';
+import * as nls from '../../../../nls.js';
 
 
 const $ = dom.$;
diff --git a/src/vs/base/browser/ui/keybindingLabel/keybindingLabel.ts b/src/vs/base/browser/ui/keybindingLabel/keybindingLabel.ts
index 189317b48e8..ee0856e8e48 100644
--- a/src/vs/base/browser/ui/keybindingLabel/keybindingLabel.ts
+++ b/src/vs/base/browser/ui/keybindingLabel/keybindingLabel.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import type { IManagedHover } from 'vs/base/browser/ui/hover/hover';
-import { getBaseLayerHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate2';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { UILabelProvider } from 'vs/base/common/keybindingLabels';
-import { ResolvedKeybinding, ResolvedChord } from 'vs/base/common/keybindings';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { equals } from 'vs/base/common/objects';
-import { OperatingSystem } from 'vs/base/common/platform';
-import 'vs/css!./keybindingLabel';
-import { localize } from 'vs/nls';
+import * as dom from '../../dom.js';
+import type { IManagedHover } from '../hover/hover.js';
+import { getBaseLayerHoverDelegate } from '../hover/hoverDelegate2.js';
+import { getDefaultHoverDelegate } from '../hover/hoverDelegateFactory.js';
+import { UILabelProvider } from '../../../common/keybindingLabels.js';
+import { ResolvedKeybinding, ResolvedChord } from '../../../common/keybindings.js';
+import { Disposable } from '../../../common/lifecycle.js';
+import { equals } from '../../../common/objects.js';
+import { OperatingSystem } from '../../../common/platform.js';
+import './keybindingLabel.css';
+import { localize } from '../../../../nls.js';
 
 const $ = dom.$;
 
diff --git a/src/vs/base/browser/ui/list/list.ts b/src/vs/base/browser/ui/list/list.ts
index 707d4b6199c..352a2f84de2 100644
--- a/src/vs/base/browser/ui/list/list.ts
+++ b/src/vs/base/browser/ui/list/list.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDragAndDropData } from 'vs/base/browser/dnd';
-import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { IMouseEvent } from 'vs/base/browser/mouseEvent';
-import { GestureEvent } from 'vs/base/browser/touch';
-import { ListViewTargetSector } from 'vs/base/browser/ui/list/listView';
-import { IDisposable } from 'vs/base/common/lifecycle';
+import { IDragAndDropData } from '../../dnd.js';
+import { IKeyboardEvent } from '../../keyboardEvent.js';
+import { IMouseEvent } from '../../mouseEvent.js';
+import { GestureEvent } from '../../touch.js';
+import { ListViewTargetSector } from './listView.js';
+import { IDisposable } from '../../../common/lifecycle.js';
 
 export interface IListVirtualDelegate<T> {
 	getHeight(element: T): number;
diff --git a/src/vs/base/browser/ui/list/listPaging.ts b/src/vs/base/browser/ui/list/listPaging.ts
index 2ff770688d0..e2608993f70 100644
--- a/src/vs/base/browser/ui/list/listPaging.ts
+++ b/src/vs/base/browser/ui/list/listPaging.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { range } from 'vs/base/common/arrays';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Event } from 'vs/base/common/event';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { IPagedModel } from 'vs/base/common/paging';
-import { ScrollbarVisibility } from 'vs/base/common/scrollable';
-import 'vs/css!./list';
-import { IListContextMenuEvent, IListEvent, IListMouseEvent, IListRenderer, IListVirtualDelegate } from './list';
-import { IListAccessibilityProvider, IListOptions, IListOptionsUpdate, IListStyles, List, TypeNavigationMode } from './listWidget';
-import { isActiveElement } from 'vs/base/browser/dom';
+import { range } from '../../../common/arrays.js';
+import { CancellationTokenSource } from '../../../common/cancellation.js';
+import { Event } from '../../../common/event.js';
+import { Disposable, IDisposable } from '../../../common/lifecycle.js';
+import { IPagedModel } from '../../../common/paging.js';
+import { ScrollbarVisibility } from '../../../common/scrollable.js';
+import './list.css';
+import { IListContextMenuEvent, IListEvent, IListMouseEvent, IListRenderer, IListVirtualDelegate } from './list.js';
+import { IListAccessibilityProvider, IListOptions, IListOptionsUpdate, IListStyles, List, TypeNavigationMode } from './listWidget.js';
+import { isActiveElement } from '../../dom.js';
 
 export interface IPagedRenderer<TElement, TTemplateData> extends IListRenderer<TElement, TTemplateData> {
 	renderPlaceholder(index: number, templateData: TTemplateData): void;
diff --git a/src/vs/base/browser/ui/list/listView.ts b/src/vs/base/browser/ui/list/listView.ts
index 276cba0d2c6..e149029df4f 100644
--- a/src/vs/base/browser/ui/list/listView.ts
+++ b/src/vs/base/browser/ui/list/listView.ts
@@ -3,27 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DataTransfers, IDragAndDropData } from 'vs/base/browser/dnd';
-import { $, addDisposableListener, animate, Dimension, getContentHeight, getContentWidth, getTopLeftOffset, getWindow, isAncestor, isHTMLElement, scheduleAtNextAnimationFrame } from 'vs/base/browser/dom';
-import { DomEmitter } from 'vs/base/browser/event';
-import { IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
-import { EventType as TouchEventType, Gesture, GestureEvent } from 'vs/base/browser/touch';
-import { SmoothScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
-import { distinct, equals } from 'vs/base/common/arrays';
-import { Delayer, disposableTimeout } from 'vs/base/common/async';
-import { memoize } from 'vs/base/common/decorators';
-import { Emitter, Event, IValueWithChangeEvent } from 'vs/base/common/event';
-import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IRange, Range } from 'vs/base/common/range';
-import { INewScrollDimensions, Scrollable, ScrollbarVisibility, ScrollEvent } from 'vs/base/common/scrollable';
-import { ISpliceable } from 'vs/base/common/sequence';
-import { IListDragAndDrop, IListDragEvent, IListGestureEvent, IListMouseEvent, IListRenderer, IListTouchEvent, IListVirtualDelegate, ListDragOverEffectPosition, ListDragOverEffectType } from 'vs/base/browser/ui/list/list';
-import { IRangeMap, RangeMap, shift } from 'vs/base/browser/ui/list/rangeMap';
-import { IRow, RowCache } from 'vs/base/browser/ui/list/rowCache';
-import { BugIndicatingError } from 'vs/base/common/errors';
-import { AriaRole } from 'vs/base/browser/ui/aria/aria';
-import { ScrollableElementChangeOptions } from 'vs/base/browser/ui/scrollbar/scrollableElementOptions';
-import { clamp } from 'vs/base/common/numbers';
+import { DataTransfers, IDragAndDropData } from '../../dnd.js';
+import { $, addDisposableListener, animate, Dimension, getContentHeight, getContentWidth, getTopLeftOffset, getWindow, isAncestor, isHTMLElement, isSVGElement, scheduleAtNextAnimationFrame } from '../../dom.js';
+import { DomEmitter } from '../../event.js';
+import { IMouseWheelEvent } from '../../mouseEvent.js';
+import { EventType as TouchEventType, Gesture, GestureEvent } from '../../touch.js';
+import { SmoothScrollableElement } from '../scrollbar/scrollableElement.js';
+import { distinct, equals } from '../../../common/arrays.js';
+import { Delayer, disposableTimeout } from '../../../common/async.js';
+import { memoize } from '../../../common/decorators.js';
+import { Emitter, Event, IValueWithChangeEvent } from '../../../common/event.js';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../common/lifecycle.js';
+import { IRange, Range } from '../../../common/range.js';
+import { INewScrollDimensions, Scrollable, ScrollbarVisibility, ScrollEvent } from '../../../common/scrollable.js';
+import { ISpliceable } from '../../../common/sequence.js';
+import { IListDragAndDrop, IListDragEvent, IListGestureEvent, IListMouseEvent, IListRenderer, IListTouchEvent, IListVirtualDelegate, ListDragOverEffectPosition, ListDragOverEffectType } from './list.js';
+import { IRangeMap, RangeMap, shift } from './rangeMap.js';
+import { IRow, RowCache } from './rowCache.js';
+import { BugIndicatingError } from '../../../common/errors.js';
+import { AriaRole } from '../aria/aria.js';
+import { ScrollableElementChangeOptions } from '../scrollbar/scrollableElementOptions.js';
+import { clamp } from '../../../common/numbers.js';
 
 interface IItem<T> {
 	readonly id: string;
@@ -173,7 +173,7 @@ export class NativeDragAndDropData implements IDragAndDropData {
 		}
 	}
 
-	getData(): any {
+	getData() {
 		return {
 			types: this.types,
 			files: this.files
@@ -519,7 +519,7 @@ export class ListView<T> implements IListView<T> {
 
 		if (typeof size === 'undefined') {
 			if (!this.supportDynamicHeights) {
-				console.warn('Dynamic heights not supported');
+				console.warn('Dynamic heights not supported', new Error().stack);
 				return;
 			}
 
@@ -1382,9 +1382,9 @@ export class ListView<T> implements IListView<T> {
 
 	private getItemIndexFromEventTarget(target: EventTarget | null): number | undefined {
 		const scrollableElement = this.scrollableElement.getDomNode();
-		let element: HTMLElement | null = target as (HTMLElement | null);
+		let element: HTMLElement | SVGElement | null = target as (HTMLElement | SVGElement | null);
 
-		while (isHTMLElement(element) && element !== this.rowsContainer && scrollableElement.contains(element)) {
+		while ((isHTMLElement(element) || isSVGElement(element)) && element !== this.rowsContainer && scrollableElement.contains(element)) {
 			const rawIndex = element.getAttribute('data-index');
 
 			if (rawIndex) {
@@ -1519,7 +1519,7 @@ export class ListView<T> implements IListView<T> {
 			item.row.domNode.style.height = '';
 			item.size = item.row.domNode.offsetHeight;
 			if (item.size === 0 && !isAncestor(item.row.domNode, getWindow(item.row.domNode).document.body)) {
-				console.warn('Measuring item node that is not in DOM! Add ListView to the DOM before measuring row height!');
+				console.warn('Measuring item node that is not in DOM! Add ListView to the DOM before measuring row height!', new Error().stack);
 			}
 			item.lastDynamicHeightWidth = this.renderWidth;
 			return item.size - size;
diff --git a/src/vs/base/browser/ui/list/listWidget.ts b/src/vs/base/browser/ui/list/listWidget.ts
index 535b245d71d..67b8e18a3a6 100644
--- a/src/vs/base/browser/ui/list/listWidget.ts
+++ b/src/vs/base/browser/ui/list/listWidget.ts
@@ -3,32 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDragAndDropData } from 'vs/base/browser/dnd';
-import { asCssValueWithDefault, createStyleSheet, Dimension, EventHelper, getActiveElement, getWindow, isActiveElement, isHTMLElement, isMouseEvent } from 'vs/base/browser/dom';
-import { DomEmitter } from 'vs/base/browser/event';
-import { IKeyboardEvent, StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { Gesture } from 'vs/base/browser/touch';
-import { alert, AriaRole } from 'vs/base/browser/ui/aria/aria';
-import { CombinedSpliceable } from 'vs/base/browser/ui/list/splice';
-import { ScrollableElementChangeOptions } from 'vs/base/browser/ui/scrollbar/scrollableElementOptions';
-import { binarySearch, firstOrDefault, range } from 'vs/base/common/arrays';
-import { timeout } from 'vs/base/common/async';
-import { Color } from 'vs/base/common/color';
-import { memoize } from 'vs/base/common/decorators';
-import { Emitter, Event, EventBufferer } from 'vs/base/common/event';
-import { matchesFuzzy2, matchesPrefix } from 'vs/base/common/filters';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { DisposableStore, dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { clamp } from 'vs/base/common/numbers';
-import * as platform from 'vs/base/common/platform';
-import { ScrollbarVisibility, ScrollEvent } from 'vs/base/common/scrollable';
-import { ISpliceable } from 'vs/base/common/sequence';
-import { isNumber } from 'vs/base/common/types';
-import 'vs/css!./list';
-import { IIdentityProvider, IKeyboardNavigationDelegate, IKeyboardNavigationLabelProvider, IListContextMenuEvent, IListDragAndDrop, IListDragOverReaction, IListEvent, IListGestureEvent, IListMouseEvent, IListRenderer, IListTouchEvent, IListVirtualDelegate, ListError } from './list';
-import { IListView, IListViewAccessibilityProvider, IListViewDragAndDrop, IListViewOptions, IListViewOptionsUpdate, ListViewTargetSector, ListView } from './listView';
-import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { autorun, constObservable, IObservable } from 'vs/base/common/observable';
+import { IDragAndDropData } from '../../dnd.js';
+import { asCssValueWithDefault, createStyleSheet, Dimension, EventHelper, getActiveElement, getWindow, isActiveElement, isEditableElement, isHTMLElement, isMouseEvent } from '../../dom.js';
+import { DomEmitter } from '../../event.js';
+import { IKeyboardEvent, StandardKeyboardEvent } from '../../keyboardEvent.js';
+import { Gesture } from '../../touch.js';
+import { alert, AriaRole } from '../aria/aria.js';
+import { CombinedSpliceable } from './splice.js';
+import { ScrollableElementChangeOptions } from '../scrollbar/scrollableElementOptions.js';
+import { binarySearch, range } from '../../../common/arrays.js';
+import { timeout } from '../../../common/async.js';
+import { Color } from '../../../common/color.js';
+import { memoize } from '../../../common/decorators.js';
+import { Emitter, Event, EventBufferer } from '../../../common/event.js';
+import { matchesFuzzy2, matchesPrefix } from '../../../common/filters.js';
+import { KeyCode } from '../../../common/keyCodes.js';
+import { DisposableStore, dispose, IDisposable } from '../../../common/lifecycle.js';
+import { clamp } from '../../../common/numbers.js';
+import * as platform from '../../../common/platform.js';
+import { ScrollbarVisibility, ScrollEvent } from '../../../common/scrollable.js';
+import { ISpliceable } from '../../../common/sequence.js';
+import { isNumber } from '../../../common/types.js';
+import './list.css';
+import { IIdentityProvider, IKeyboardNavigationDelegate, IKeyboardNavigationLabelProvider, IListContextMenuEvent, IListDragAndDrop, IListDragOverReaction, IListEvent, IListGestureEvent, IListMouseEvent, IListRenderer, IListTouchEvent, IListVirtualDelegate, ListError } from './list.js';
+import { IListView, IListViewAccessibilityProvider, IListViewDragAndDrop, IListViewOptions, IListViewOptionsUpdate, ListViewTargetSector, ListView } from './listView.js';
+import { StandardMouseEvent } from '../../mouseEvent.js';
+import { autorun, constObservable, IObservable } from '../../../common/observable.js';
 
 interface ITraitChangeEvent {
 	indexes: number[];
@@ -246,10 +246,6 @@ class TraitSpliceable<T> implements ISpliceable<T> {
 	}
 }
 
-export function isInputElement(e: HTMLElement): boolean {
-	return e.tagName === 'INPUT' || e.tagName === 'TEXTAREA';
-}
-
 function isListElementDescendantOfClass(e: HTMLElement, className: string): boolean {
 	if (e.classList.contains(className)) {
 		return true;
@@ -317,7 +313,7 @@ class KeyboardController<T> implements IDisposable {
 	private get onKeyDown(): Event<StandardKeyboardEvent> {
 		return Event.chain(
 			this.disposables.add(new DomEmitter(this.view.domNode, 'keydown')).event, $ =>
-			$.filter(e => !isInputElement(e.target as HTMLElement))
+			$.filter(e => !isEditableElement(e.target as HTMLElement))
 				.map(e => new StandardKeyboardEvent(e))
 		);
 	}
@@ -493,7 +489,7 @@ class TypeNavigationController<T> implements IDisposable {
 		let typing = false;
 
 		const onChar = Event.chain(this.enabledDisposables.add(new DomEmitter(this.view.domNode, 'keydown')).event, $ =>
-			$.filter(e => !isInputElement(e.target as HTMLElement))
+			$.filter(e => !isEditableElement(e.target as HTMLElement))
 				.filter(() => this.mode === TypeNavigationMode.Automatic || this.triggered)
 				.map(event => new StandardKeyboardEvent(event))
 				.filter(e => typing || this.keyboardNavigationEventFilter(e))
@@ -607,7 +603,7 @@ class DOMFocusController<T> implements IDisposable {
 		private view: IListView<T>
 	) {
 		const onKeyDown = Event.chain(this.disposables.add(new DomEmitter(view.domNode, 'keydown')).event, $ => $
-			.filter(e => !isInputElement(e.target as HTMLElement))
+			.filter(e => !isEditableElement(e.target as HTMLElement))
 			.map(e => new StandardKeyboardEvent(e))
 		);
 
@@ -739,7 +735,7 @@ export class MouseController<T> implements IDisposable {
 	}
 
 	protected onContextMenu(e: IListContextMenuEvent<T>): void {
-		if (isInputElement(e.browserEvent.target as HTMLElement) || isMonacoEditor(e.browserEvent.target as HTMLElement)) {
+		if (isEditableElement(e.browserEvent.target as HTMLElement) || isMonacoEditor(e.browserEvent.target as HTMLElement)) {
 			return;
 		}
 
@@ -752,7 +748,7 @@ export class MouseController<T> implements IDisposable {
 			return;
 		}
 
-		if (isInputElement(e.browserEvent.target as HTMLElement) || isMonacoEditor(e.browserEvent.target as HTMLElement)) {
+		if (isEditableElement(e.browserEvent.target as HTMLElement) || isMonacoEditor(e.browserEvent.target as HTMLElement)) {
 			return;
 		}
 
@@ -785,7 +781,7 @@ export class MouseController<T> implements IDisposable {
 	}
 
 	protected onDoubleClick(e: IListMouseEvent<T>): void {
-		if (isInputElement(e.browserEvent.target as HTMLElement) || isMonacoEditor(e.browserEvent.target as HTMLElement)) {
+		if (isEditableElement(e.browserEvent.target as HTMLElement) || isMonacoEditor(e.browserEvent.target as HTMLElement)) {
 			return;
 		}
 
@@ -1589,7 +1585,7 @@ export class List<T> implements ISpliceable<T>, IDisposable {
 		this.view.updateWidth(index);
 	}
 
-	updateElementHeight(index: number, size: number): void {
+	updateElementHeight(index: number, size: number | undefined): void {
 		this.view.updateElementHeight(index, size, null);
 	}
 
@@ -1718,7 +1714,7 @@ export class List<T> implements ISpliceable<T>, IDisposable {
 	}
 
 	getAnchor(): number | undefined {
-		return firstOrDefault(this.anchor.get(), undefined);
+		return this.anchor.get().at(0);
 	}
 
 	getAnchorElement(): T | undefined {
diff --git a/src/vs/base/browser/ui/list/rangeMap.ts b/src/vs/base/browser/ui/list/rangeMap.ts
index 79ea7de024d..2fe2b6457cc 100644
--- a/src/vs/base/browser/ui/list/rangeMap.ts
+++ b/src/vs/base/browser/ui/list/rangeMap.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IRange, Range } from 'vs/base/common/range';
+import { IRange, Range } from '../../../common/range.js';
 
 export interface IItem {
 	size: number;
diff --git a/src/vs/base/browser/ui/list/rowCache.ts b/src/vs/base/browser/ui/list/rowCache.ts
index ff605b097ce..4ec97d40923 100644
--- a/src/vs/base/browser/ui/list/rowCache.ts
+++ b/src/vs/base/browser/ui/list/rowCache.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { $ } from 'vs/base/browser/dom';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { IListRenderer } from './list';
+import { $ } from '../../dom.js';
+import { IDisposable } from '../../../common/lifecycle.js';
+import { IListRenderer } from './list.js';
 
 export interface IRow {
 	domNode: HTMLElement;
diff --git a/src/vs/base/browser/ui/list/splice.ts b/src/vs/base/browser/ui/list/splice.ts
index 151fce06dbd..f149176493c 100644
--- a/src/vs/base/browser/ui/list/splice.ts
+++ b/src/vs/base/browser/ui/list/splice.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ISpliceable } from 'vs/base/common/sequence';
+import { ISpliceable } from '../../../common/sequence.js';
 
 export interface ISpreadSpliceable<T> {
 	splice(start: number, deleteCount: number, ...elements: T[]): void;
diff --git a/src/vs/base/browser/ui/menu/menu.ts b/src/vs/base/browser/ui/menu/menu.ts
index d11ed37bfb4..d05498fb93a 100644
--- a/src/vs/base/browser/ui/menu/menu.ts
+++ b/src/vs/base/browser/ui/menu/menu.ts
@@ -3,28 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isFirefox } from 'vs/base/browser/browser';
-import { EventType as TouchEventType, Gesture } from 'vs/base/browser/touch';
-import { $, addDisposableListener, append, clearNode, createStyleSheet, Dimension, EventHelper, EventLike, EventType, getActiveElement, getWindow, IDomNodePagePosition, isAncestor, isInShadowDOM } from 'vs/base/browser/dom';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { ActionBar, ActionsOrientation, IActionViewItemProvider } from 'vs/base/browser/ui/actionbar/actionbar';
-import { ActionViewItem, BaseActionViewItem, IActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { AnchorAlignment, layout, LayoutAnchorPosition } from 'vs/base/browser/ui/contextview/contextview';
-import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
-import { EmptySubmenuAction, IAction, IActionRunner, Separator, SubmenuAction } from 'vs/base/common/actions';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { Codicon } from 'vs/base/common/codicons';
-import { getCodiconFontCharacters } from 'vs/base/common/codiconsUtil';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { Event } from 'vs/base/common/event';
-import { stripIcons } from 'vs/base/common/iconLabels';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { ResolvedKeybinding } from 'vs/base/common/keybindings';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { isLinux, isMacintosh } from 'vs/base/common/platform';
-import { ScrollbarVisibility, ScrollEvent } from 'vs/base/common/scrollable';
-import * as strings from 'vs/base/common/strings';
+import { isFirefox } from '../../browser.js';
+import { EventType as TouchEventType, Gesture } from '../../touch.js';
+import { $, addDisposableListener, append, clearNode, createStyleSheet, Dimension, EventHelper, EventLike, EventType, getActiveElement, getWindow, IDomNodePagePosition, isAncestor, isInShadowDOM } from '../../dom.js';
+import { StandardKeyboardEvent } from '../../keyboardEvent.js';
+import { StandardMouseEvent } from '../../mouseEvent.js';
+import { ActionBar, ActionsOrientation, IActionViewItemProvider } from '../actionbar/actionbar.js';
+import { ActionViewItem, BaseActionViewItem, IActionViewItemOptions } from '../actionbar/actionViewItems.js';
+import { AnchorAlignment, layout, LayoutAnchorPosition } from '../contextview/contextview.js';
+import { DomScrollableElement } from '../scrollbar/scrollableElement.js';
+import { EmptySubmenuAction, IAction, IActionRunner, Separator, SubmenuAction } from '../../../common/actions.js';
+import { RunOnceScheduler } from '../../../common/async.js';
+import { Codicon } from '../../../common/codicons.js';
+import { getCodiconFontCharacters } from '../../../common/codiconsUtil.js';
+import { ThemeIcon } from '../../../common/themables.js';
+import { Event } from '../../../common/event.js';
+import { stripIcons } from '../../../common/iconLabels.js';
+import { KeyCode } from '../../../common/keyCodes.js';
+import { ResolvedKeybinding } from '../../../common/keybindings.js';
+import { DisposableStore } from '../../../common/lifecycle.js';
+import { isLinux, isMacintosh } from '../../../common/platform.js';
+import { ScrollbarVisibility, ScrollEvent } from '../../../common/scrollable.js';
+import * as strings from '../../../common/strings.js';
 
 export const MENU_MNEMONIC_REGEX = /\(&([^\s&])\)|(^|[^&])&([^\s&])/;
 export const MENU_ESCAPED_MNEMONIC_REGEX = /(&amp;)?(&amp;)([^\s&])/g;
diff --git a/src/vs/base/browser/ui/menu/menubar.ts b/src/vs/base/browser/ui/menu/menubar.ts
index 7af34aaafde..3acf246b40c 100644
--- a/src/vs/base/browser/ui/menu/menubar.ts
+++ b/src/vs/base/browser/ui/menu/menubar.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as browser from 'vs/base/browser/browser';
-import * as DOM from 'vs/base/browser/dom';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { EventType, Gesture, GestureEvent } from 'vs/base/browser/touch';
-import { cleanMnemonic, HorizontalDirection, IMenuDirection, IMenuOptions, IMenuStyles, Menu, MENU_ESCAPED_MNEMONIC_REGEX, MENU_MNEMONIC_REGEX, VerticalDirection } from 'vs/base/browser/ui/menu/menu';
-import { ActionRunner, IAction, IActionRunner, Separator, SubmenuAction } from 'vs/base/common/actions';
-import { asArray } from 'vs/base/common/arrays';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { Emitter, Event } from 'vs/base/common/event';
-import { KeyCode, KeyMod, ScanCode, ScanCodeUtils } from 'vs/base/common/keyCodes';
-import { ResolvedKeybinding } from 'vs/base/common/keybindings';
-import { Disposable, DisposableStore, dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { isMacintosh } from 'vs/base/common/platform';
-import * as strings from 'vs/base/common/strings';
-import 'vs/css!./menubar';
-import * as nls from 'vs/nls';
-import { mainWindow } from 'vs/base/browser/window';
+import * as browser from '../../browser.js';
+import * as DOM from '../../dom.js';
+import { StandardKeyboardEvent } from '../../keyboardEvent.js';
+import { StandardMouseEvent } from '../../mouseEvent.js';
+import { EventType, Gesture, GestureEvent } from '../../touch.js';
+import { cleanMnemonic, HorizontalDirection, IMenuDirection, IMenuOptions, IMenuStyles, Menu, MENU_ESCAPED_MNEMONIC_REGEX, MENU_MNEMONIC_REGEX, VerticalDirection } from './menu.js';
+import { ActionRunner, IAction, IActionRunner, Separator, SubmenuAction } from '../../../common/actions.js';
+import { asArray } from '../../../common/arrays.js';
+import { RunOnceScheduler } from '../../../common/async.js';
+import { Codicon } from '../../../common/codicons.js';
+import { ThemeIcon } from '../../../common/themables.js';
+import { Emitter, Event } from '../../../common/event.js';
+import { KeyCode, KeyMod, ScanCode, ScanCodeUtils } from '../../../common/keyCodes.js';
+import { ResolvedKeybinding } from '../../../common/keybindings.js';
+import { Disposable, DisposableStore, dispose, IDisposable } from '../../../common/lifecycle.js';
+import { isMacintosh } from '../../../common/platform.js';
+import * as strings from '../../../common/strings.js';
+import './menubar.css';
+import * as nls from '../../../../nls.js';
+import { mainWindow } from '../../window.js';
 
 const $ = DOM.$;
 
diff --git a/src/vs/base/browser/ui/mouseCursor/mouseCursor.ts b/src/vs/base/browser/ui/mouseCursor/mouseCursor.ts
index 8e5fd174cd8..c4fdd030697 100644
--- a/src/vs/base/browser/ui/mouseCursor/mouseCursor.ts
+++ b/src/vs/base/browser/ui/mouseCursor/mouseCursor.ts
@@ -3,6 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./mouseCursor';
+import './mouseCursor.css';
 
 export const MOUSE_CURSOR_TEXT_CSS_CLASS_NAME = `monaco-mouse-cursor-text`;
diff --git a/src/vs/base/browser/ui/progressbar/progressAccessibilitySignal.ts b/src/vs/base/browser/ui/progressbar/progressAccessibilitySignal.ts
index 19a5deba94e..db5d0b0cee3 100644
--- a/src/vs/base/browser/ui/progressbar/progressAccessibilitySignal.ts
+++ b/src/vs/base/browser/ui/progressbar/progressAccessibilitySignal.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable } from '../../../common/lifecycle.js';
 
 export interface IScopedAccessibilityProgressSignalDelegate extends IDisposable { }
 
diff --git a/src/vs/base/browser/ui/progressbar/progressbar.ts b/src/vs/base/browser/ui/progressbar/progressbar.ts
index d790f6d07f4..9b5b2c7c2ba 100644
--- a/src/vs/base/browser/ui/progressbar/progressbar.ts
+++ b/src/vs/base/browser/ui/progressbar/progressbar.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { hide, show } from 'vs/base/browser/dom';
-import { getProgressAcccessibilitySignalScheduler } from 'vs/base/browser/ui/progressbar/progressAccessibilitySignal';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { Disposable, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { isNumber } from 'vs/base/common/types';
-import 'vs/css!./progressbar';
+import { hide, show } from '../../dom.js';
+import { getProgressAcccessibilitySignalScheduler } from './progressAccessibilitySignal.js';
+import { RunOnceScheduler } from '../../../common/async.js';
+import { Disposable, IDisposable, MutableDisposable } from '../../../common/lifecycle.js';
+import { isNumber } from '../../../common/types.js';
+import './progressbar.css';
 
 const CSS_DONE = 'done';
 const CSS_ACTIVE = 'active';
diff --git a/src/vs/base/browser/ui/radio/radio.css b/src/vs/base/browser/ui/radio/radio.css
new file mode 100644
index 00000000000..259c157011f
--- /dev/null
+++ b/src/vs/base/browser/ui/radio/radio.css
@@ -0,0 +1,69 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.monaco-custom-radio {
+	display: flex;
+}
+
+.monaco-custom-radio > .monaco-button {
+	border-radius: 0;
+	font-size: 0.9em;
+	line-height: 1em;
+	padding-left: 0.5em;
+	padding-right: 0.5em;
+}
+
+.monaco-custom-radio > .monaco-button:first-child {
+	border-top-left-radius: 3px;
+	border-bottom-left-radius: 3px;
+}
+
+.monaco-custom-radio > .monaco-button:last-child {
+	border-top-right-radius: 3px;
+	border-bottom-right-radius: 3px;
+}
+
+.monaco-custom-radio > .monaco-button:not(.active):not(:last-child) {
+	border-right: none;
+}
+
+.monaco-custom-radio > .monaco-button.previous-active {
+	border-left: none;
+}
+
+/* default color styles - based on CSS variables */
+
+.monaco-custom-radio > .monaco-button {
+	color: var(--vscode-radio-inactiveForeground);
+	background-color: var(--vscode-radio-inactiveBackground);
+	border-color: var(--vscode-radio-inactiveBorder, transparent);
+}
+
+.monaco-custom-radio > .monaco-button.active:hover,
+.monaco-custom-radio > .monaco-button.active {
+	color: var(--vscode-radio-activeForeground);
+	background-color: var(--vscode-radio-activeBackground);
+	border-color: var(--vscode-radio-activeBorder, transparent);
+}
+
+.hc-black .monaco-custom-radio > .monaco-button.active,
+.hc-light .monaco-custom-radio > .monaco-button.active {
+	border-color: var(--vscode-radio-activeBorder, transparent);
+}
+
+.hc-black .monaco-custom-radio > .monaco-button:not(.active),
+.hc-light .monaco-custom-radio > .monaco-button:not(.active) {
+	border-color: var(--vscode-radio-inactiveBorder, transparent);
+}
+
+.hc-black .monaco-custom-radio > .monaco-button:not(.active):hover,
+.hc-light .monaco-custom-radio > .monaco-button:not(.active):hover {
+	outline: 1px dashed var(--vscode-toolbar-hoverOutline);
+	outline-offset: -1px
+}
+
+.monaco-custom-radio > .monaco-button:hover:not(.active) {
+	background-color: var(--vscode-radio-inactiveHoverBackground);
+}
diff --git a/src/vs/base/browser/ui/radio/radio.ts b/src/vs/base/browser/ui/radio/radio.ts
new file mode 100644
index 00000000000..163a5869ca4
--- /dev/null
+++ b/src/vs/base/browser/ui/radio/radio.ts
@@ -0,0 +1,114 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Widget } from '../widget.js';
+import { ThemeIcon } from '../../../common/themables.js';
+import { Emitter } from '../../../common/event.js';
+import './radio.css';
+import { $ } from '../../dom.js';
+import { IHoverDelegate } from '../hover/hoverDelegate.js';
+import { Button } from '../button/button.js';
+import { DisposableMap, DisposableStore } from '../../../common/lifecycle.js';
+import { createInstantHoverDelegate } from '../hover/hoverDelegateFactory.js';
+
+export interface IRadioStyles {
+	readonly activeForeground?: string;
+	readonly activeBackground?: string;
+	readonly activeBorder?: string;
+	readonly inactiveForeground?: string;
+	readonly inactiveBackground?: string;
+	readonly inactiveHoverBackground?: string;
+	readonly inactiveBorder?: string;
+}
+
+export interface IRadioOptionItem {
+	readonly text: string;
+	readonly tooltip?: string;
+	readonly isActive?: boolean;
+	readonly disabled?: boolean;
+}
+
+export interface IRadioOptions {
+	readonly items: ReadonlyArray<IRadioOptionItem>;
+	readonly activeIcon?: ThemeIcon;
+	readonly hoverDelegate?: IHoverDelegate;
+}
+
+export class Radio extends Widget {
+
+	private readonly _onDidSelect = this._register(new Emitter<number>());
+	readonly onDidSelect = this._onDidSelect.event;
+
+	readonly domNode: HTMLElement;
+
+	private readonly hoverDelegate: IHoverDelegate;
+
+	private items: ReadonlyArray<IRadioOptionItem> = [];
+	private activeItem: IRadioOptionItem | undefined;
+
+	private readonly buttons = this._register(new DisposableMap<Button, { item: IRadioOptionItem; dispose(): void }>());
+
+	constructor(opts: IRadioOptions) {
+		super();
+
+		this.hoverDelegate = opts.hoverDelegate ?? this._register(createInstantHoverDelegate());
+
+		this.domNode = $('.monaco-custom-radio');
+		this.domNode.setAttribute('role', 'radio');
+
+		this.setItems(opts.items);
+	}
+
+	setItems(items: ReadonlyArray<IRadioOptionItem>): void {
+		this.buttons.clearAndDisposeAll();
+		this.items = items;
+		this.activeItem = this.items.find(item => item.isActive) ?? this.items[0];
+		for (let index = 0; index < this.items.length; index++) {
+			const item = this.items[index];
+			const disposables = new DisposableStore();
+			const button = disposables.add(new Button(this.domNode, {
+				hoverDelegate: this.hoverDelegate,
+				title: item.tooltip,
+				supportIcons: true,
+			}));
+			button.enabled = !item.disabled;
+			disposables.add(button.onDidClick(() => {
+				if (this.activeItem !== item) {
+					this.activeItem = item;
+					this.updateButtons();
+					this._onDidSelect.fire(index);
+				}
+			}));
+			this.buttons.set(button, { item, dispose: () => disposables.dispose() });
+		}
+		this.updateButtons();
+	}
+
+	setActiveItem(index: number): void {
+		if (index < 0 || index >= this.items.length) {
+			throw new Error('Invalid Index');
+		}
+		this.activeItem = this.items[index];
+		this.updateButtons();
+	}
+
+	setEnabled(enabled: boolean): void {
+		for (const [button] of this.buttons) {
+			button.enabled = enabled;
+		}
+	}
+
+	private updateButtons(): void {
+		let isActive = false;
+		for (const [button, { item }] of this.buttons) {
+			const isPreviousActive = isActive;
+			isActive = item === this.activeItem;
+			button.element.classList.toggle('active', isActive);
+			button.element.classList.toggle('previous-active', isPreviousActive);
+			button.label = item.text;
+		}
+	}
+
+}
diff --git a/src/vs/base/browser/ui/resizable/resizable.ts b/src/vs/base/browser/ui/resizable/resizable.ts
index 95dfb06b8d0..15c3d4425d1 100644
--- a/src/vs/base/browser/ui/resizable/resizable.ts
+++ b/src/vs/base/browser/ui/resizable/resizable.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Dimension } from 'vs/base/browser/dom';
-import { Orientation, OrthogonalEdge, Sash, SashState } from 'vs/base/browser/ui/sash/sash';
-import { Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import { Dimension } from '../../dom.js';
+import { Orientation, OrthogonalEdge, Sash, SashState } from '../sash/sash.js';
+import { Emitter, Event } from '../../../common/event.js';
+import { DisposableStore } from '../../../common/lifecycle.js';
 
 
 export interface IResizeEvent {
diff --git a/src/vs/base/browser/ui/sash/sash.ts b/src/vs/base/browser/ui/sash/sash.ts
index 210b98af009..8596d0cd8d9 100644
--- a/src/vs/base/browser/ui/sash/sash.ts
+++ b/src/vs/base/browser/ui/sash/sash.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { $, append, createStyleSheet, EventHelper, EventLike, getWindow, isHTMLElement } from 'vs/base/browser/dom';
-import { DomEmitter } from 'vs/base/browser/event';
-import { EventType, Gesture } from 'vs/base/browser/touch';
-import { Delayer } from 'vs/base/common/async';
-import { memoize } from 'vs/base/common/decorators';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { isMacintosh } from 'vs/base/common/platform';
-import 'vs/css!./sash';
+import { $, append, createStyleSheet, EventHelper, EventLike, getWindow, isHTMLElement } from '../../dom.js';
+import { DomEmitter } from '../../event.js';
+import { EventType, Gesture } from '../../touch.js';
+import { Delayer } from '../../../common/async.js';
+import { memoize } from '../../../common/decorators.js';
+import { Emitter, Event } from '../../../common/event.js';
+import { Disposable, DisposableStore, toDisposable } from '../../../common/lifecycle.js';
+import { isMacintosh } from '../../../common/platform.js';
+import './sash.css';
 
 /**
  * Allow the sashes to be visible at runtime.
diff --git a/src/vs/base/browser/ui/scrollbar/abstractScrollbar.ts b/src/vs/base/browser/ui/scrollbar/abstractScrollbar.ts
index 5ab75393d9e..0f667f6270d 100644
--- a/src/vs/base/browser/ui/scrollbar/abstractScrollbar.ts
+++ b/src/vs/base/browser/ui/scrollbar/abstractScrollbar.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { createFastDomNode, FastDomNode } from 'vs/base/browser/fastDomNode';
-import { GlobalPointerMoveMonitor } from 'vs/base/browser/globalPointerMoveMonitor';
-import { StandardWheelEvent } from 'vs/base/browser/mouseEvent';
-import { ScrollbarArrow, ScrollbarArrowOptions } from 'vs/base/browser/ui/scrollbar/scrollbarArrow';
-import { ScrollbarState } from 'vs/base/browser/ui/scrollbar/scrollbarState';
-import { ScrollbarVisibilityController } from 'vs/base/browser/ui/scrollbar/scrollbarVisibilityController';
-import { Widget } from 'vs/base/browser/ui/widget';
-import * as platform from 'vs/base/common/platform';
-import { INewScrollPosition, Scrollable, ScrollbarVisibility } from 'vs/base/common/scrollable';
+import * as dom from '../../dom.js';
+import { createFastDomNode, FastDomNode } from '../../fastDomNode.js';
+import { GlobalPointerMoveMonitor } from '../../globalPointerMoveMonitor.js';
+import { StandardWheelEvent } from '../../mouseEvent.js';
+import { ScrollbarArrow, ScrollbarArrowOptions } from './scrollbarArrow.js';
+import { ScrollbarState } from './scrollbarState.js';
+import { ScrollbarVisibilityController } from './scrollbarVisibilityController.js';
+import { Widget } from '../widget.js';
+import * as platform from '../../../common/platform.js';
+import { INewScrollPosition, Scrollable, ScrollbarVisibility } from '../../../common/scrollable.js';
 
 /**
  * The orthogonal distance to the slider at which dragging "resets". This implements "snapping"
diff --git a/src/vs/base/browser/ui/scrollbar/horizontalScrollbar.ts b/src/vs/base/browser/ui/scrollbar/horizontalScrollbar.ts
index 9672118552d..4593bb72b7f 100644
--- a/src/vs/base/browser/ui/scrollbar/horizontalScrollbar.ts
+++ b/src/vs/base/browser/ui/scrollbar/horizontalScrollbar.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { StandardWheelEvent } from 'vs/base/browser/mouseEvent';
-import { AbstractScrollbar, ISimplifiedPointerEvent, ScrollbarHost } from 'vs/base/browser/ui/scrollbar/abstractScrollbar';
-import { ScrollableElementResolvedOptions } from 'vs/base/browser/ui/scrollbar/scrollableElementOptions';
-import { ARROW_IMG_SIZE } from 'vs/base/browser/ui/scrollbar/scrollbarArrow';
-import { ScrollbarState } from 'vs/base/browser/ui/scrollbar/scrollbarState';
-import { Codicon } from 'vs/base/common/codicons';
-import { INewScrollPosition, Scrollable, ScrollbarVisibility, ScrollEvent } from 'vs/base/common/scrollable';
+import { StandardWheelEvent } from '../../mouseEvent.js';
+import { AbstractScrollbar, ISimplifiedPointerEvent, ScrollbarHost } from './abstractScrollbar.js';
+import { ScrollableElementResolvedOptions } from './scrollableElementOptions.js';
+import { ARROW_IMG_SIZE } from './scrollbarArrow.js';
+import { ScrollbarState } from './scrollbarState.js';
+import { Codicon } from '../../../common/codicons.js';
+import { INewScrollPosition, Scrollable, ScrollbarVisibility, ScrollEvent } from '../../../common/scrollable.js';
 
 
 
diff --git a/src/vs/base/browser/ui/scrollbar/scrollableElement.ts b/src/vs/base/browser/ui/scrollbar/scrollableElement.ts
index be9064254c1..3e32a3c313f 100644
--- a/src/vs/base/browser/ui/scrollbar/scrollableElement.ts
+++ b/src/vs/base/browser/ui/scrollbar/scrollableElement.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getZoomFactor, isChrome } from 'vs/base/browser/browser';
-import * as dom from 'vs/base/browser/dom';
-import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
-import { IMouseEvent, IMouseWheelEvent, StandardWheelEvent } from 'vs/base/browser/mouseEvent';
-import { ScrollbarHost } from 'vs/base/browser/ui/scrollbar/abstractScrollbar';
-import { HorizontalScrollbar } from 'vs/base/browser/ui/scrollbar/horizontalScrollbar';
-import { ScrollableElementChangeOptions, ScrollableElementCreationOptions, ScrollableElementResolvedOptions } from 'vs/base/browser/ui/scrollbar/scrollableElementOptions';
-import { VerticalScrollbar } from 'vs/base/browser/ui/scrollbar/verticalScrollbar';
-import { Widget } from 'vs/base/browser/ui/widget';
-import { TimeoutTimer } from 'vs/base/common/async';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import * as platform from 'vs/base/common/platform';
-import { INewScrollDimensions, INewScrollPosition, IScrollDimensions, IScrollPosition, ScrollEvent, Scrollable, ScrollbarVisibility } from 'vs/base/common/scrollable';
-import 'vs/css!./media/scrollbars';
+import { getZoomFactor, isChrome } from '../../browser.js';
+import * as dom from '../../dom.js';
+import { FastDomNode, createFastDomNode } from '../../fastDomNode.js';
+import { IMouseEvent, IMouseWheelEvent, StandardWheelEvent } from '../../mouseEvent.js';
+import { ScrollbarHost } from './abstractScrollbar.js';
+import { HorizontalScrollbar } from './horizontalScrollbar.js';
+import { ScrollableElementChangeOptions, ScrollableElementCreationOptions, ScrollableElementResolvedOptions } from './scrollableElementOptions.js';
+import { VerticalScrollbar } from './verticalScrollbar.js';
+import { Widget } from '../widget.js';
+import { TimeoutTimer } from '../../../common/async.js';
+import { Emitter, Event } from '../../../common/event.js';
+import { IDisposable, dispose } from '../../../common/lifecycle.js';
+import * as platform from '../../../common/platform.js';
+import { INewScrollDimensions, INewScrollPosition, IScrollDimensions, IScrollPosition, ScrollEvent, Scrollable, ScrollbarVisibility } from '../../../common/scrollable.js';
+import './media/scrollbars.css';
 
 const HIDE_TIMEOUT = 500;
 const SCROLL_WHEEL_SENSITIVITY = 50;
diff --git a/src/vs/base/browser/ui/scrollbar/scrollableElementOptions.ts b/src/vs/base/browser/ui/scrollbar/scrollableElementOptions.ts
index 8e75751fff3..a39e6053110 100644
--- a/src/vs/base/browser/ui/scrollbar/scrollableElementOptions.ts
+++ b/src/vs/base/browser/ui/scrollbar/scrollableElementOptions.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ScrollbarVisibility } from 'vs/base/common/scrollable';
+import { ScrollbarVisibility } from '../../../common/scrollable.js';
 
 export interface ScrollableElementCreationOptions {
 	/**
diff --git a/src/vs/base/browser/ui/scrollbar/scrollbarArrow.ts b/src/vs/base/browser/ui/scrollbar/scrollbarArrow.ts
index c786a576ce6..f5b7f333ba5 100644
--- a/src/vs/base/browser/ui/scrollbar/scrollbarArrow.ts
+++ b/src/vs/base/browser/ui/scrollbar/scrollbarArrow.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { GlobalPointerMoveMonitor } from 'vs/base/browser/globalPointerMoveMonitor';
-import { Widget } from 'vs/base/browser/ui/widget';
-import { TimeoutTimer } from 'vs/base/common/async';
-import { ThemeIcon } from 'vs/base/common/themables';
-import * as dom from 'vs/base/browser/dom';
+import { GlobalPointerMoveMonitor } from '../../globalPointerMoveMonitor.js';
+import { Widget } from '../widget.js';
+import { TimeoutTimer } from '../../../common/async.js';
+import { ThemeIcon } from '../../../common/themables.js';
+import * as dom from '../../dom.js';
 
 /**
  * The arrow image size.
diff --git a/src/vs/base/browser/ui/scrollbar/scrollbarVisibilityController.ts b/src/vs/base/browser/ui/scrollbar/scrollbarVisibilityController.ts
index 791c7332ffb..90a8c0bb8d2 100644
--- a/src/vs/base/browser/ui/scrollbar/scrollbarVisibilityController.ts
+++ b/src/vs/base/browser/ui/scrollbar/scrollbarVisibilityController.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { FastDomNode } from 'vs/base/browser/fastDomNode';
-import { TimeoutTimer } from 'vs/base/common/async';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ScrollbarVisibility } from 'vs/base/common/scrollable';
+import { FastDomNode } from '../../fastDomNode.js';
+import { TimeoutTimer } from '../../../common/async.js';
+import { Disposable } from '../../../common/lifecycle.js';
+import { ScrollbarVisibility } from '../../../common/scrollable.js';
 
 export class ScrollbarVisibilityController extends Disposable {
 	private _visibility: ScrollbarVisibility;
diff --git a/src/vs/base/browser/ui/scrollbar/verticalScrollbar.ts b/src/vs/base/browser/ui/scrollbar/verticalScrollbar.ts
index 672bde8e017..5617e169236 100644
--- a/src/vs/base/browser/ui/scrollbar/verticalScrollbar.ts
+++ b/src/vs/base/browser/ui/scrollbar/verticalScrollbar.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { StandardWheelEvent } from 'vs/base/browser/mouseEvent';
-import { AbstractScrollbar, ISimplifiedPointerEvent, ScrollbarHost } from 'vs/base/browser/ui/scrollbar/abstractScrollbar';
-import { ScrollableElementResolvedOptions } from 'vs/base/browser/ui/scrollbar/scrollableElementOptions';
-import { ARROW_IMG_SIZE } from 'vs/base/browser/ui/scrollbar/scrollbarArrow';
-import { ScrollbarState } from 'vs/base/browser/ui/scrollbar/scrollbarState';
-import { Codicon } from 'vs/base/common/codicons';
-import { INewScrollPosition, Scrollable, ScrollbarVisibility, ScrollEvent } from 'vs/base/common/scrollable';
+import { StandardWheelEvent } from '../../mouseEvent.js';
+import { AbstractScrollbar, ISimplifiedPointerEvent, ScrollbarHost } from './abstractScrollbar.js';
+import { ScrollableElementResolvedOptions } from './scrollableElementOptions.js';
+import { ARROW_IMG_SIZE } from './scrollbarArrow.js';
+import { ScrollbarState } from './scrollbarState.js';
+import { Codicon } from '../../../common/codicons.js';
+import { INewScrollPosition, Scrollable, ScrollbarVisibility, ScrollEvent } from '../../../common/scrollable.js';
 
 
 
diff --git a/src/vs/base/browser/ui/selectBox/selectBox.ts b/src/vs/base/browser/ui/selectBox/selectBox.ts
index d5329939ca2..435eca5b4f6 100644
--- a/src/vs/base/browser/ui/selectBox/selectBox.ts
+++ b/src/vs/base/browser/ui/selectBox/selectBox.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IContentActionHandler } from 'vs/base/browser/formattedTextRenderer';
-import { IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview';
-import { IListStyles, unthemedListStyles } from 'vs/base/browser/ui/list/listWidget';
-import { SelectBoxList } from 'vs/base/browser/ui/selectBox/selectBoxCustom';
-import { SelectBoxNative } from 'vs/base/browser/ui/selectBox/selectBoxNative';
-import { Widget } from 'vs/base/browser/ui/widget';
-import { Event } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { isMacintosh } from 'vs/base/common/platform';
-import 'vs/css!./selectBox';
+import { IContentActionHandler } from '../../formattedTextRenderer.js';
+import { IContextViewProvider } from '../contextview/contextview.js';
+import { IListStyles, unthemedListStyles } from '../list/listWidget.js';
+import { SelectBoxList } from './selectBoxCustom.js';
+import { SelectBoxNative } from './selectBoxNative.js';
+import { Widget } from '../widget.js';
+import { Event } from '../../../common/event.js';
+import { IDisposable } from '../../../common/lifecycle.js';
+import { isMacintosh } from '../../../common/platform.js';
+import './selectBox.css';
 
 
 
diff --git a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
index 64bdfa22cb4..6b14b869906 100644
--- a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
+++ b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { DomEmitter } from 'vs/base/browser/event';
-import { IContentActionHandler } from 'vs/base/browser/formattedTextRenderer';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { renderMarkdown } from 'vs/base/browser/markdownRenderer';
-import { AnchorPosition, IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview';
-import type { IManagedHover } from 'vs/base/browser/ui/hover/hover';
-import { getBaseLayerHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate2';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { IListEvent, IListRenderer, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { List } from 'vs/base/browser/ui/list/listWidget';
-import { ISelectBoxDelegate, ISelectBoxOptions, ISelectBoxStyles, ISelectData, ISelectOptionItem } from 'vs/base/browser/ui/selectBox/selectBox';
-import * as arrays from 'vs/base/common/arrays';
-import { Emitter, Event } from 'vs/base/common/event';
-import { KeyCode, KeyCodeUtils } from 'vs/base/common/keyCodes';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { isMacintosh } from 'vs/base/common/platform';
-import { ScrollbarVisibility } from 'vs/base/common/scrollable';
-import 'vs/css!./selectBoxCustom';
-import { localize } from 'vs/nls';
+import * as dom from '../../dom.js';
+import { DomEmitter } from '../../event.js';
+import { IContentActionHandler } from '../../formattedTextRenderer.js';
+import { StandardKeyboardEvent } from '../../keyboardEvent.js';
+import { renderMarkdown } from '../../markdownRenderer.js';
+import { AnchorPosition, IContextViewProvider } from '../contextview/contextview.js';
+import type { IManagedHover } from '../hover/hover.js';
+import { getBaseLayerHoverDelegate } from '../hover/hoverDelegate2.js';
+import { getDefaultHoverDelegate } from '../hover/hoverDelegateFactory.js';
+import { IListEvent, IListRenderer, IListVirtualDelegate } from '../list/list.js';
+import { List } from '../list/listWidget.js';
+import { ISelectBoxDelegate, ISelectBoxOptions, ISelectBoxStyles, ISelectData, ISelectOptionItem } from './selectBox.js';
+import * as arrays from '../../../common/arrays.js';
+import { Emitter, Event } from '../../../common/event.js';
+import { KeyCode, KeyCodeUtils } from '../../../common/keyCodes.js';
+import { Disposable, IDisposable } from '../../../common/lifecycle.js';
+import { isMacintosh } from '../../../common/platform.js';
+import { ScrollbarVisibility } from '../../../common/scrollable.js';
+import './selectBoxCustom.css';
+import { localize } from '../../../../nls.js';
 
 
 const $ = dom.$;
@@ -730,7 +730,7 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi
 
 		this.listRenderer = new SelectListRenderer();
 
-		this.selectList = new List('SelectBoxCustom', this.selectDropDownListContainer, this, [this.listRenderer], {
+		this.selectList = this._register(new List('SelectBoxCustom', this.selectDropDownListContainer, this, [this.listRenderer], {
 			useShadows: false,
 			verticalScrollMode: ScrollbarVisibility.Visible,
 			keyboardSupport: false,
@@ -756,7 +756,7 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi
 				getRole: () => isMacintosh ? '' : 'option',
 				getWidgetRole: () => 'listbox'
 			}
-		});
+		}));
 		if (this.selectBoxOptions.ariaLabel) {
 			this.selectList.ariaLabel = this.selectBoxOptions.ariaLabel;
 		}
diff --git a/src/vs/base/browser/ui/selectBox/selectBoxNative.ts b/src/vs/base/browser/ui/selectBox/selectBoxNative.ts
index 896ac0e4bd0..9eebae7dbb1 100644
--- a/src/vs/base/browser/ui/selectBox/selectBoxNative.ts
+++ b/src/vs/base/browser/ui/selectBox/selectBoxNative.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { EventType, Gesture } from 'vs/base/browser/touch';
-import { ISelectBoxDelegate, ISelectBoxOptions, ISelectBoxStyles, ISelectData, ISelectOptionItem } from 'vs/base/browser/ui/selectBox/selectBox';
-import * as arrays from 'vs/base/common/arrays';
-import { Emitter, Event } from 'vs/base/common/event';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { isMacintosh } from 'vs/base/common/platform';
+import * as dom from '../../dom.js';
+import { EventType, Gesture } from '../../touch.js';
+import { ISelectBoxDelegate, ISelectBoxOptions, ISelectBoxStyles, ISelectData, ISelectOptionItem } from './selectBox.js';
+import * as arrays from '../../../common/arrays.js';
+import { Emitter, Event } from '../../../common/event.js';
+import { KeyCode } from '../../../common/keyCodes.js';
+import { Disposable } from '../../../common/lifecycle.js';
+import { isMacintosh } from '../../../common/platform.js';
 
 export class SelectBoxNative extends Disposable implements ISelectBoxDelegate {
 
diff --git a/src/vs/base/browser/ui/splitview/paneview.ts b/src/vs/base/browser/ui/splitview/paneview.ts
index 6a78dee3860..e99a133abea 100644
--- a/src/vs/base/browser/ui/splitview/paneview.ts
+++ b/src/vs/base/browser/ui/splitview/paneview.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isFirefox } from 'vs/base/browser/browser';
-import { DataTransfers } from 'vs/base/browser/dnd';
-import { $, addDisposableListener, append, clearNode, EventHelper, EventType, getWindow, isHTMLElement, trackFocus } from 'vs/base/browser/dom';
-import { DomEmitter } from 'vs/base/browser/event';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { Gesture, EventType as TouchEventType } from 'vs/base/browser/touch';
-import { IBoundarySashes, Orientation } from 'vs/base/browser/ui/sash/sash';
-import { Color, RGBA } from 'vs/base/common/color';
-import { Emitter, Event } from 'vs/base/common/event';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { ScrollEvent } from 'vs/base/common/scrollable';
-import 'vs/css!./paneview';
-import { localize } from 'vs/nls';
-import { IView, Sizing, SplitView } from './splitview';
+import { isFirefox } from '../../browser.js';
+import { DataTransfers } from '../../dnd.js';
+import { $, addDisposableListener, append, clearNode, EventHelper, EventType, getWindow, isHTMLElement, trackFocus } from '../../dom.js';
+import { DomEmitter } from '../../event.js';
+import { StandardKeyboardEvent } from '../../keyboardEvent.js';
+import { Gesture, EventType as TouchEventType } from '../../touch.js';
+import { IBoundarySashes, Orientation } from '../sash/sash.js';
+import { Color, RGBA } from '../../../common/color.js';
+import { Emitter, Event } from '../../../common/event.js';
+import { KeyCode } from '../../../common/keyCodes.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../common/lifecycle.js';
+import { ScrollEvent } from '../../../common/scrollable.js';
+import './paneview.css';
+import { localize } from '../../../../nls.js';
+import { IView, Sizing, SplitView } from './splitview.js';
 
 export interface IPaneOptions {
 	minimumBodySize?: number;
diff --git a/src/vs/base/browser/ui/splitview/splitview.ts b/src/vs/base/browser/ui/splitview/splitview.ts
index ac966adf435..35f2724c1a8 100644
--- a/src/vs/base/browser/ui/splitview/splitview.ts
+++ b/src/vs/base/browser/ui/splitview/splitview.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { $, addDisposableListener, append, getWindow, scheduleAtNextAnimationFrame } from 'vs/base/browser/dom';
-import { DomEmitter } from 'vs/base/browser/event';
-import { ISashEvent as IBaseSashEvent, Orientation, Sash, SashState } from 'vs/base/browser/ui/sash/sash';
-import { SmoothScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
-import { pushToEnd, pushToStart, range } from 'vs/base/common/arrays';
-import { Color } from 'vs/base/common/color';
-import { Emitter, Event } from 'vs/base/common/event';
-import { combinedDisposable, Disposable, dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { clamp } from 'vs/base/common/numbers';
-import { Scrollable, ScrollbarVisibility, ScrollEvent } from 'vs/base/common/scrollable';
-import * as types from 'vs/base/common/types';
-import 'vs/css!./splitview';
-export { Orientation } from 'vs/base/browser/ui/sash/sash';
+import { $, addDisposableListener, append, getWindow, scheduleAtNextAnimationFrame } from '../../dom.js';
+import { DomEmitter } from '../../event.js';
+import { ISashEvent as IBaseSashEvent, Orientation, Sash, SashState } from '../sash/sash.js';
+import { SmoothScrollableElement } from '../scrollbar/scrollableElement.js';
+import { pushToEnd, pushToStart, range } from '../../../common/arrays.js';
+import { Color } from '../../../common/color.js';
+import { Emitter, Event } from '../../../common/event.js';
+import { combinedDisposable, Disposable, dispose, IDisposable, toDisposable } from '../../../common/lifecycle.js';
+import { clamp } from '../../../common/numbers.js';
+import { Scrollable, ScrollbarVisibility, ScrollEvent } from '../../../common/scrollable.js';
+import * as types from '../../../common/types.js';
+import './splitview.css';
+export { Orientation } from '../sash/sash.js';
 
 export interface ISplitViewStyles {
 	readonly separatorBorder: Color;
diff --git a/src/vs/base/browser/ui/table/table.ts b/src/vs/base/browser/ui/table/table.ts
index 2a9786bf42e..6152fd37eeb 100644
--- a/src/vs/base/browser/ui/table/table.ts
+++ b/src/vs/base/browser/ui/table/table.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IListContextMenuEvent, IListEvent, IListGestureEvent, IListMouseEvent, IListRenderer, IListTouchEvent } from 'vs/base/browser/ui/list/list';
-import { Event } from 'vs/base/common/event';
+import { IListContextMenuEvent, IListEvent, IListGestureEvent, IListMouseEvent, IListRenderer, IListTouchEvent } from '../list/list.js';
+import { Event } from '../../../common/event.js';
 
 export interface ITableColumn<TRow, TCell> {
 	readonly label: string;
diff --git a/src/vs/base/browser/ui/table/tableWidget.ts b/src/vs/base/browser/ui/table/tableWidget.ts
index b2c8959c3c5..3e2142482f0 100644
--- a/src/vs/base/browser/ui/table/tableWidget.ts
+++ b/src/vs/base/browser/ui/table/tableWidget.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { $, append, clearNode, createStyleSheet, getContentHeight, getContentWidth } from 'vs/base/browser/dom';
-import { getBaseLayerHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate2';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { IListRenderer, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { IListOptions, IListOptionsUpdate, IListStyles, List, unthemedListStyles } from 'vs/base/browser/ui/list/listWidget';
-import { ISplitViewDescriptor, IView, Orientation, SplitView } from 'vs/base/browser/ui/splitview/splitview';
-import { ITableColumn, ITableContextMenuEvent, ITableEvent, ITableGestureEvent, ITableMouseEvent, ITableRenderer, ITableTouchEvent, ITableVirtualDelegate } from 'vs/base/browser/ui/table/table';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { ScrollbarVisibility, ScrollEvent } from 'vs/base/common/scrollable';
-import { ISpliceable } from 'vs/base/common/sequence';
-import 'vs/css!./table';
+import { $, append, clearNode, createStyleSheet, getContentHeight, getContentWidth } from '../../dom.js';
+import { getBaseLayerHoverDelegate } from '../hover/hoverDelegate2.js';
+import { getDefaultHoverDelegate } from '../hover/hoverDelegateFactory.js';
+import { IListRenderer, IListVirtualDelegate } from '../list/list.js';
+import { IListOptions, IListOptionsUpdate, IListStyles, List, unthemedListStyles } from '../list/listWidget.js';
+import { ISplitViewDescriptor, IView, Orientation, SplitView } from '../splitview/splitview.js';
+import { ITableColumn, ITableContextMenuEvent, ITableEvent, ITableGestureEvent, ITableMouseEvent, ITableRenderer, ITableTouchEvent, ITableVirtualDelegate } from './table.js';
+import { Emitter, Event } from '../../../common/event.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../common/lifecycle.js';
+import { ScrollbarVisibility, ScrollEvent } from '../../../common/scrollable.js';
+import { ISpliceable } from '../../../common/sequence.js';
+import './table.css';
 
 // TODO@joao
 type TCell = any;
@@ -193,7 +193,7 @@ export class Table<TRow> implements ISpliceable<TRow>, IDisposable {
 		user: string,
 		container: HTMLElement,
 		private virtualDelegate: ITableVirtualDelegate<TRow>,
-		columns: ITableColumn<TRow, TCell>[],
+		private columns: ITableColumn<TRow, TCell>[],
 		renderers: ITableRenderer<TCell, unknown>[],
 		_options?: ITableOptions<TRow>
 	) {
@@ -231,6 +231,15 @@ export class Table<TRow> implements ISpliceable<TRow>, IDisposable {
 		this.style(unthemedListStyles);
 	}
 
+	getColumnLabels(): string[] {
+		return this.columns.map(c => c.label);
+	}
+
+	resizeColumn(index: number, percentage: number): void {
+		const size = Math.round((percentage / 100.00) * this.cachedWidth);
+		this.splitview.resizeView(index, size);
+	}
+
 	updateOptions(options: ITableOptionsUpdate): void {
 		this.list.updateOptions(options);
 	}
diff --git a/src/vs/base/browser/ui/toggle/toggle.css b/src/vs/base/browser/ui/toggle/toggle.css
index 1b13a3b19e8..6244ed4a434 100644
--- a/src/vs/base/browser/ui/toggle/toggle.css
+++ b/src/vs/base/browser/ui/toggle/toggle.css
@@ -52,6 +52,12 @@
 .monaco-action-bar .checkbox-action-item {
 	display: flex;
 	align-items: center;
+	border-radius: 2px;
+	padding-right: 2px;
+}
+
+.monaco-action-bar .checkbox-action-item:hover {
+	background-color: var(--vscode-toolbar-hoverBackground);
 }
 
 .monaco-action-bar .checkbox-action-item > .monaco-custom-toggle.monaco-checkbox {
diff --git a/src/vs/base/browser/ui/toggle/toggle.ts b/src/vs/base/browser/ui/toggle/toggle.ts
index c141f381fb3..a232e531e02 100644
--- a/src/vs/base/browser/ui/toggle/toggle.ts
+++ b/src/vs/base/browser/ui/toggle/toggle.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { BaseActionViewItem, IActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { Widget } from 'vs/base/browser/ui/widget';
-import { IAction } from 'vs/base/common/actions';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { Emitter, Event } from 'vs/base/common/event';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import 'vs/css!./toggle';
-import { isActiveElement, $, addDisposableListener, EventType } from 'vs/base/browser/dom';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { IHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate';
-import type { IManagedHover } from 'vs/base/browser/ui/hover/hover';
-import { getBaseLayerHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate2';
+import { IKeyboardEvent } from '../../keyboardEvent.js';
+import { BaseActionViewItem, IActionViewItemOptions } from '../actionbar/actionViewItems.js';
+import { Widget } from '../widget.js';
+import { IAction } from '../../../common/actions.js';
+import { Codicon } from '../../../common/codicons.js';
+import { ThemeIcon } from '../../../common/themables.js';
+import { Emitter, Event } from '../../../common/event.js';
+import { KeyCode } from '../../../common/keyCodes.js';
+import './toggle.css';
+import { isActiveElement, $, addDisposableListener, EventType } from '../../dom.js';
+import { getDefaultHoverDelegate } from '../hover/hoverDelegateFactory.js';
+import { IHoverDelegate } from '../hover/hoverDelegate.js';
+import type { IManagedHover } from '../hover/hover.js';
+import { getBaseLayerHoverDelegate } from '../hover/hoverDelegate2.js';
 
 export interface IToggleOpts extends IToggleStyles {
 	readonly actionClassName?: string;
diff --git a/src/vs/base/browser/ui/toolbar/toolbar.ts b/src/vs/base/browser/ui/toolbar/toolbar.ts
index 57aac5edb41..75ab73a5354 100644
--- a/src/vs/base/browser/ui/toolbar/toolbar.ts
+++ b/src/vs/base/browser/ui/toolbar/toolbar.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IContextMenuProvider } from 'vs/base/browser/contextmenu';
-import { ActionBar, ActionsOrientation, IActionViewItemProvider } from 'vs/base/browser/ui/actionbar/actionbar';
-import { AnchorAlignment } from 'vs/base/browser/ui/contextview/contextview';
-import { DropdownMenuActionViewItem } from 'vs/base/browser/ui/dropdown/dropdownActionViewItem';
-import { Action, IAction, IActionRunner, SubmenuAction } from 'vs/base/common/actions';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { EventMultiplexer } from 'vs/base/common/event';
-import { ResolvedKeybinding } from 'vs/base/common/keybindings';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import 'vs/css!./toolbar';
-import * as nls from 'vs/nls';
-import { IHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate';
-import { createInstantHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
+import { IContextMenuProvider } from '../../contextmenu.js';
+import { ActionBar, ActionsOrientation, IActionViewItemProvider } from '../actionbar/actionbar.js';
+import { AnchorAlignment } from '../contextview/contextview.js';
+import { DropdownMenuActionViewItem } from '../dropdown/dropdownActionViewItem.js';
+import { Action, IAction, IActionRunner, SubmenuAction } from '../../../common/actions.js';
+import { Codicon } from '../../../common/codicons.js';
+import { ThemeIcon } from '../../../common/themables.js';
+import { EventMultiplexer } from '../../../common/event.js';
+import { ResolvedKeybinding } from '../../../common/keybindings.js';
+import { Disposable, DisposableStore } from '../../../common/lifecycle.js';
+import './toolbar.css';
+import * as nls from '../../../../nls.js';
+import { IHoverDelegate } from '../hover/hoverDelegate.js';
+import { createInstantHoverDelegate } from '../hover/hoverDelegateFactory.js';
 
 
 
@@ -38,6 +38,16 @@ export interface IToolBarOptions {
 	 * If true, toggled primary items are highlighted with a background color.
 	 */
 	highlightToggledItems?: boolean;
+
+	/**
+	 * Render action with icons (default: `true`)
+	 */
+	icon?: boolean;
+
+	/**
+	 * Render action with label (default: `false`)
+	 */
+	label?: boolean;
 }
 
 /**
@@ -50,7 +60,6 @@ export class ToolBar extends Disposable {
 	private toggleMenuActionViewItem: DropdownMenuActionViewItem | undefined;
 	private submenuActionViewItems: DropdownMenuActionViewItem[] = [];
 	private hasSecondaryActions: boolean = false;
-	private readonly lookupKeybindings: boolean;
 	private readonly element: HTMLElement;
 
 	private _onDidChangeDropdownVisibility = this._register(new EventMultiplexer<boolean>());
@@ -62,7 +71,6 @@ export class ToolBar extends Disposable {
 
 		options.hoverDelegate = options.hoverDelegate ?? this._register(createInstantHoverDelegate());
 		this.options = options;
-		this.lookupKeybindings = typeof this.options.getKeyBinding === 'function';
 
 		this.toggleMenuAction = this._register(new ToggleMenuAction(() => this.toggleMenuActionViewItem?.show(), options.toggleMenuTitle));
 
@@ -198,7 +206,7 @@ export class ToolBar extends Disposable {
 		}
 
 		primaryActionsToSet.forEach(action => {
-			this.actionBar.push(action, { icon: true, label: false, keybinding: this.getKeybindingLabel(action) });
+			this.actionBar.push(action, { icon: this.options.icon ?? true, label: this.options.label ?? false, keybinding: this.getKeybindingLabel(action) });
 		});
 	}
 
@@ -207,7 +215,7 @@ export class ToolBar extends Disposable {
 	}
 
 	private getKeybindingLabel(action: IAction): string | undefined {
-		const key = this.lookupKeybindings ? this.options.getKeyBinding?.(action) : undefined;
+		const key = this.options.getKeyBinding?.(action);
 
 		return key?.getLabel() ?? undefined;
 	}
diff --git a/src/vs/base/browser/ui/tree/abstractTree.ts b/src/vs/base/browser/ui/tree/abstractTree.ts
index 250efbc4296..7ddb0bcca73 100644
--- a/src/vs/base/browser/ui/tree/abstractTree.ts
+++ b/src/vs/base/browser/ui/tree/abstractTree.ts
@@ -3,39 +3,39 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDragAndDropData } from 'vs/base/browser/dnd';
-import { $, append, clearNode, createStyleSheet, getWindow, h, hasParentWithClass, isActiveElement, asCssValueWithDefault, isKeyboardEvent } from 'vs/base/browser/dom';
-import { DomEmitter } from 'vs/base/browser/event';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview';
-import { FindInput } from 'vs/base/browser/ui/findinput/findInput';
-import { IInputBoxStyles, IMessage, MessageType, unthemedInboxStyles } from 'vs/base/browser/ui/inputbox/inputBox';
-import { IIdentityProvider, IKeyboardNavigationLabelProvider, IListContextMenuEvent, IListDragAndDrop, IListDragOverReaction, IListMouseEvent, IListRenderer, IListTouchEvent, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { ElementsDragAndDropData, ListViewTargetSector } from 'vs/base/browser/ui/list/listView';
-import { IListAccessibilityProvider, IListOptions, IListStyles, isActionItem, isButton, isInputElement, isMonacoCustomToggle, isMonacoEditor, isStickyScrollContainer, isStickyScrollElement, List, MouseController, TypeNavigationMode } from 'vs/base/browser/ui/list/listWidget';
-import { IToggleStyles, Toggle, unthemedToggleStyles } from 'vs/base/browser/ui/toggle/toggle';
-import { getVisibleState, isFilterResult } from 'vs/base/browser/ui/tree/indexTreeModel';
-import { ICollapseStateChangeEvent, ITreeContextMenuEvent, ITreeDragAndDrop, ITreeEvent, ITreeFilter, ITreeModel, ITreeModelSpliceEvent, ITreeMouseEvent, ITreeNavigator, ITreeNode, ITreeRenderer, TreeDragOverBubble, TreeError, TreeFilterResult, TreeMouseEventTarget, TreeVisibility } from 'vs/base/browser/ui/tree/tree';
-import { Action } from 'vs/base/common/actions';
-import { distinct, equals, firstOrDefault, range } from 'vs/base/common/arrays';
-import { Delayer, disposableTimeout, timeout } from 'vs/base/common/async';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { SetMap } from 'vs/base/common/map';
-import { Emitter, Event, EventBufferer, Relay } from 'vs/base/common/event';
-import { fuzzyScore, FuzzyScore } from 'vs/base/common/filters';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { Disposable, DisposableStore, dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { clamp } from 'vs/base/common/numbers';
-import { ScrollEvent } from 'vs/base/common/scrollable';
-import { ISpliceable } from 'vs/base/common/sequence';
-import { isNumber } from 'vs/base/common/types';
-import 'vs/css!./media/tree';
-import { localize } from 'vs/nls';
-import { IHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate';
-import { createInstantHoverDelegate, getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { autorun, constObservable } from 'vs/base/common/observable';
+import { IDragAndDropData } from '../../dnd.js';
+import { $, append, clearNode, createStyleSheet, getWindow, h, hasParentWithClass, isActiveElement, asCssValueWithDefault, isKeyboardEvent, addDisposableListener, isEditableElement } from '../../dom.js';
+import { DomEmitter } from '../../event.js';
+import { StandardKeyboardEvent } from '../../keyboardEvent.js';
+import { ActionBar } from '../actionbar/actionbar.js';
+import { IContextViewProvider } from '../contextview/contextview.js';
+import { FindInput } from '../findinput/findInput.js';
+import { IInputBoxStyles, IMessage, MessageType, unthemedInboxStyles } from '../inputbox/inputBox.js';
+import { IIdentityProvider, IKeyboardNavigationLabelProvider, IListContextMenuEvent, IListDragAndDrop, IListDragOverReaction, IListMouseEvent, IListRenderer, IListTouchEvent, IListVirtualDelegate } from '../list/list.js';
+import { ElementsDragAndDropData, ListViewTargetSector } from '../list/listView.js';
+import { IListAccessibilityProvider, IListOptions, IListStyles, isActionItem, isButton, isMonacoCustomToggle, isMonacoEditor, isStickyScrollContainer, isStickyScrollElement, List, MouseController, TypeNavigationMode } from '../list/listWidget.js';
+import { IToggleStyles, Toggle, unthemedToggleStyles } from '../toggle/toggle.js';
+import { getVisibleState, isFilterResult } from './indexTreeModel.js';
+import { ICollapseStateChangeEvent, ITreeContextMenuEvent, ITreeDragAndDrop, ITreeEvent, ITreeFilter, ITreeModel, ITreeModelSpliceEvent, ITreeMouseEvent, ITreeNavigator, ITreeNode, ITreeRenderer, TreeDragOverBubble, TreeError, TreeFilterResult, TreeMouseEventTarget, TreeVisibility } from './tree.js';
+import { Action } from '../../../common/actions.js';
+import { distinct, equals, range } from '../../../common/arrays.js';
+import { Delayer, disposableTimeout, timeout } from '../../../common/async.js';
+import { Codicon } from '../../../common/codicons.js';
+import { ThemeIcon } from '../../../common/themables.js';
+import { SetMap } from '../../../common/map.js';
+import { Emitter, Event, EventBufferer, Relay } from '../../../common/event.js';
+import { fuzzyScore, FuzzyScore } from '../../../common/filters.js';
+import { KeyCode } from '../../../common/keyCodes.js';
+import { Disposable, DisposableStore, dispose, IDisposable, toDisposable } from '../../../common/lifecycle.js';
+import { clamp } from '../../../common/numbers.js';
+import { ScrollEvent } from '../../../common/scrollable.js';
+import { isNumber } from '../../../common/types.js';
+import './media/tree.css';
+import { localize } from '../../../../nls.js';
+import { IHoverDelegate } from '../hover/hoverDelegate.js';
+import { createInstantHoverDelegate } from '../hover/hoverDelegateFactory.js';
+import { autorun, constObservable } from '../../../common/observable.js';
+import { alert } from '../aria/aria.js';
 
 class TreeElementsDragAndDropData<T, TFilterData, TContext> extends ElementsDragAndDropData<T, TContext> {
 
@@ -348,7 +348,7 @@ export class TreeRenderer<T, TFilterData, TRef, TTemplateData> implements IListR
 
 	constructor(
 		private renderer: ITreeRenderer<T, TFilterData, TTemplateData>,
-		private modelProvider: () => ITreeModel<T, TFilterData, TRef>,
+		private model: ITreeModel<T, TFilterData, TRef>,
 		onDidChangeCollapseState: Event<ICollapseStateChangeEvent<T, TFilterData>>,
 		private activeNodes: Collection<ITreeNode<T, TFilterData>>,
 		private renderedIndentGuides: SetMap<ITreeNode<T, TFilterData>, HTMLDivElement>,
@@ -496,17 +496,16 @@ export class TreeRenderer<T, TFilterData, TRef, TTemplateData> implements IListR
 		}
 
 		const disposableStore = new DisposableStore();
-		const model = this.modelProvider();
 
 		while (true) {
-			const ref = model.getNodeLocation(node);
-			const parentRef = model.getParentNodeLocation(ref);
+			const ref = this.model.getNodeLocation(node);
+			const parentRef = this.model.getParentNodeLocation(ref);
 
 			if (!parentRef) {
 				break;
 			}
 
-			const parent = model.getNode(parentRef);
+			const parent = this.model.getNode(parentRef);
 			const guide = $<HTMLDivElement>('.indent-guide', { style: `width: ${this.indent}px` });
 
 			if (this.activeIndentNodes.has(parent)) {
@@ -534,17 +533,16 @@ export class TreeRenderer<T, TFilterData, TRef, TTemplateData> implements IListR
 		}
 
 		const set = new Set<ITreeNode<T, TFilterData>>();
-		const model = this.modelProvider();
 
 		nodes.forEach(node => {
-			const ref = model.getNodeLocation(node);
+			const ref = this.model.getNodeLocation(node);
 			try {
-				const parentRef = model.getParentNodeLocation(ref);
+				const parentRef = this.model.getParentNodeLocation(ref);
 
 				if (node.collapsible && node.children.length > 0 && !node.collapsed) {
 					set.add(node);
 				} else if (parentRef) {
-					set.add(model.getNode(parentRef));
+					set.add(this.model.getNode(parentRef));
 				}
 			} catch {
 				// noop
@@ -566,6 +564,10 @@ export class TreeRenderer<T, TFilterData, TRef, TTemplateData> implements IListR
 		this.activeIndentNodes = set;
 	}
 
+	setModel(model: ITreeModel<T, TFilterData, TRef>): void {
+		this.model = model;
+	}
+
 	dispose(): void {
 		this.renderedNodes.clear();
 		this.renderedElements.clear();
@@ -576,7 +578,12 @@ export class TreeRenderer<T, TFilterData, TRef, TTemplateData> implements IListR
 
 export type LabelFuzzyScore = { label: string; score: FuzzyScore };
 
-class FindFilter<T> implements ITreeFilter<T, FuzzyScore | LabelFuzzyScore>, IDisposable {
+export interface IFindFilter<T> extends ITreeFilter<T, FuzzyScore | LabelFuzzyScore> {
+	filter(element: T, parentVisibility: TreeVisibility): TreeFilterResult<FuzzyScore | LabelFuzzyScore>;
+	pattern: string;
+}
+
+class FindFilter<T> implements IFindFilter<T>, IDisposable {
 	private _totalCount = 0;
 	get totalCount(): number { return this._totalCount; }
 	private _matchCount = 0;
@@ -677,40 +684,67 @@ class FindFilter<T> implements ITreeFilter<T, FuzzyScore | LabelFuzzyScore>, IDi
 	}
 }
 
-export interface ITreeFindToggleOpts {
+export interface ITreeFindToggleContribution {
+	id: string;
+	title: string;
+	icon: ThemeIcon;
+	isChecked: boolean;
+}
+
+class TreeFindToggle extends Toggle {
+
+	readonly id: string;
+
+	constructor(contribution: ITreeFindToggleContribution, opts: IToggleStyles, hoverDelegate?: IHoverDelegate) {
+		super({
+			icon: contribution.icon,
+			title: contribution.title,
+			isChecked: contribution.isChecked,
+			inputActiveOptionBorder: opts.inputActiveOptionBorder,
+			inputActiveOptionForeground: opts.inputActiveOptionForeground,
+			inputActiveOptionBackground: opts.inputActiveOptionBackground,
+			hoverDelegate,
+		});
+
+		this.id = contribution.id;
+	}
+}
+
+export class FindToggles {
+	private stateMap: Map<string, ITreeFindToggleContribution>;
+
+	constructor(startStates: ITreeFindToggleContribution[]) {
+		this.stateMap = new Map(startStates.map(state => [state.id, { ...state }]));
+	}
+
+	states(): ITreeFindToggleContribution[] {
+		return Array.from(this.stateMap.values());
+	}
+
+	get(id: string): boolean {
+		const state = this.stateMap.get(id);
+		if (state === undefined) {
+			throw new Error(`No state found for toggle id ${id}`);
+		}
+		return state.isChecked;
+	}
+
+	set(id: string, value: boolean): boolean {
+		const state = this.stateMap.get(id);
+		if (state === undefined) {
+			throw new Error(`No state found for toggle id ${id}`);
+		}
+		if (state.isChecked === value) {
+			return false;
+		}
+		state.isChecked = value;
+		return true;
+	}
+}
+
+export interface ITreeFindToggleChangeEvent {
+	readonly id: string;
 	readonly isChecked: boolean;
-	readonly inputActiveOptionBorder: string | undefined;
-	readonly inputActiveOptionForeground: string | undefined;
-	readonly inputActiveOptionBackground: string | undefined;
-	readonly hoverDelegate?: IHoverDelegate;
-}
-
-export class ModeToggle extends Toggle {
-	constructor(opts: ITreeFindToggleOpts) {
-		super({
-			icon: Codicon.listFilter,
-			title: localize('filter', "Filter"),
-			isChecked: opts.isChecked ?? false,
-			hoverDelegate: opts.hoverDelegate ?? getDefaultHoverDelegate('element'),
-			inputActiveOptionBorder: opts.inputActiveOptionBorder,
-			inputActiveOptionForeground: opts.inputActiveOptionForeground,
-			inputActiveOptionBackground: opts.inputActiveOptionBackground
-		});
-	}
-}
-
-export class FuzzyToggle extends Toggle {
-	constructor(opts: ITreeFindToggleOpts) {
-		super({
-			icon: Codicon.searchFuzzy,
-			title: localize('fuzzySearch', "Fuzzy Match"),
-			isChecked: opts.isChecked ?? false,
-			hoverDelegate: opts.hoverDelegate ?? getDefaultHoverDelegate('element'),
-			inputActiveOptionBorder: opts.inputActiveOptionBorder,
-			inputActiveOptionForeground: opts.inputActiveOptionForeground,
-			inputActiveOptionBackground: opts.inputActiveOptionBackground
-		});
-	}
 }
 
 export interface IFindWidgetStyles {
@@ -754,15 +788,6 @@ class FindWidget<T, TFilterData> extends Disposable {
 		h('.monaco-tree-type-filter-actionbar@actionbar'),
 	]);
 
-	set mode(mode: TreeFindMode) {
-		this.modeToggle.checked = mode === TreeFindMode.Filter;
-		this.findInput.inputBox.setPlaceHolder(mode === TreeFindMode.Filter ? localize('type to filter', "Type to filter") : localize('type to search', "Type to search"));
-	}
-
-	set matchType(matchType: TreeFindMatchType) {
-		this.matchTypeToggle.checked = matchType === TreeFindMatchType.Fuzzy;
-	}
-
 	get value(): string {
 		return this.findInput.inputBox.value;
 	}
@@ -771,10 +796,9 @@ class FindWidget<T, TFilterData> extends Disposable {
 		this.findInput.inputBox.value = value;
 	}
 
-	private readonly modeToggle: ModeToggle;
-	private readonly matchTypeToggle: FuzzyToggle;
 	private readonly findInput: FindInput;
 	private readonly actionbar: ActionBar;
+	private readonly toggles: TreeFindToggle[] = [];
 	private width = 0;
 	private right = 0;
 	private top = 0;
@@ -782,15 +806,14 @@ class FindWidget<T, TFilterData> extends Disposable {
 	readonly _onDidDisable = new Emitter<void>();
 	readonly onDidDisable = this._onDidDisable.event;
 	readonly onDidChangeValue: Event<string>;
-	readonly onDidChangeMode: Event<TreeFindMode>;
-	readonly onDidChangeMatchType: Event<TreeFindMatchType>;
+	readonly onDidToggleChange: Event<ITreeFindToggleChangeEvent>;
 
 	constructor(
 		container: HTMLElement,
 		private tree: AbstractTree<T, TFilterData, any>,
 		contextViewProvider: IContextViewProvider,
-		mode: TreeFindMode,
-		matchType: TreeFindMatchType,
+		placeholder: string,
+		toggleContributions: ITreeFindToggleContribution[] = [],
 		options?: IFindWidgetOptions
 	) {
 		super();
@@ -809,14 +832,13 @@ class FindWidget<T, TFilterData> extends Disposable {
 		}
 
 		const toggleHoverDelegate = this._register(createInstantHoverDelegate());
-		this.modeToggle = this._register(new ModeToggle({ ...styles.toggleStyles, isChecked: mode === TreeFindMode.Filter, hoverDelegate: toggleHoverDelegate }));
-		this.matchTypeToggle = this._register(new FuzzyToggle({ ...styles.toggleStyles, isChecked: matchType === TreeFindMatchType.Fuzzy, hoverDelegate: toggleHoverDelegate }));
-		this.onDidChangeMode = Event.map(this.modeToggle.onChange, () => this.modeToggle.checked ? TreeFindMode.Filter : TreeFindMode.Highlight, this._store);
-		this.onDidChangeMatchType = Event.map(this.matchTypeToggle.onChange, () => this.matchTypeToggle.checked ? TreeFindMatchType.Fuzzy : TreeFindMatchType.Contiguous, this._store);
+		this.toggles = toggleContributions.map(contribution => this._register(new TreeFindToggle(contribution, styles.toggleStyles, toggleHoverDelegate)));
+		this.onDidToggleChange = Event.any(...this.toggles.map(toggle => Event.map(toggle.onChange, () => ({ id: toggle.id, isChecked: toggle.checked }))));
 
 		this.findInput = this._register(new FindInput(this.elements.findInput, contextViewProvider, {
 			label: localize('type to search', "Type to search"),
-			additionalToggles: [this.modeToggle, this.matchTypeToggle],
+			placeholder,
+			additionalToggles: this.toggles,
 			showCommonFindToggles: false,
 			inputBoxStyles: styles.inputBoxStyles,
 			toggleStyles: styles.toggleStyles,
@@ -824,12 +846,11 @@ class FindWidget<T, TFilterData> extends Disposable {
 		}));
 
 		this.actionbar = this._register(new ActionBar(this.elements.actionbar));
-		this.mode = mode;
 
 		const emitter = this._register(new DomEmitter(this.findInput.inputBox.inputElement, 'keydown'));
 		const onKeyDown = Event.chain(emitter.event, $ => $.map(e => new StandardKeyboardEvent(e)));
 
-		this._register(onKeyDown((e): any => {
+		this._register(onKeyDown((e) => {
 			// Using equals() so we reserve modified keys for future use
 			if (e.equals(KeyCode.Enter)) {
 				// This is the only keyboard way to return to the tree from a history item that isn't the last one
@@ -899,7 +920,7 @@ class FindWidget<T, TFilterData> extends Disposable {
 
 		const onGrabKeyDown = Event.chain(this._register(new DomEmitter(this.elements.grab, 'keydown')).event, $ => $.map(e => new StandardKeyboardEvent(e)));
 
-		this._register(onGrabKeyDown((e): any => {
+		this._register(onGrabKeyDown((e) => {
 			let right: number | undefined;
 			let top: number | undefined;
 
@@ -940,6 +961,17 @@ class FindWidget<T, TFilterData> extends Disposable {
 		this.onDidChangeValue = this.findInput.onDidChange;
 	}
 
+	setToggleState(id: string, checked: boolean): void {
+		const toggle = this.toggles.find(toggle => toggle.id === id);
+		if (toggle) {
+			toggle.checked = checked;
+		}
+	}
+
+	setPlaceHolder(placeHolder: string): void {
+		this.findInput.inputBox.setPlaceHolder(placeHolder);
+	}
+
 	getHistory(): string[] {
 		return this.findInput.inputBox.getHistory();
 	}
@@ -979,9 +1011,23 @@ class FindWidget<T, TFilterData> extends Disposable {
 	}
 }
 
-interface IFindControllerOptions extends IFindWidgetOptions { }
+enum DefaultTreeToggles {
+	Mode = 'mode',
+	MatchType = 'matchType',
+}
 
-class FindController<T, TFilterData> implements IDisposable {
+interface IAbstractFindControllerOptions extends IFindWidgetOptions {
+	placeholder?: string;
+	toggles?: ITreeFindToggleContribution[];
+	showNotFoundMessage?: boolean;
+}
+
+interface IFindControllerOptions extends IAbstractFindControllerOptions {
+	defaultFindMode?: TreeFindMode;
+	defaultFindMatchType?: TreeFindMatchType;
+}
+
+export abstract class AbstractFindController<T, TFilterData> implements IDisposable {
 
 	private _history: string[] | undefined;
 
@@ -989,51 +1035,18 @@ class FindController<T, TFilterData> implements IDisposable {
 	get pattern(): string { return this._pattern; }
 	private previousPattern = '';
 
-	private _mode: TreeFindMode;
-	get mode(): TreeFindMode { return this._mode; }
-	set mode(mode: TreeFindMode) {
-		if (mode === this._mode) {
-			return;
-		}
+	protected readonly toggles: FindToggles;
 
-		this._mode = mode;
-
-		if (this.widget) {
-			this.widget.mode = this._mode;
-		}
-
-		this.tree.refilter();
-		this.render();
-		this._onDidChangeMode.fire(mode);
-	}
-
-	private _matchType: TreeFindMatchType;
-	get matchType(): TreeFindMatchType { return this._matchType; }
-	set matchType(matchType: TreeFindMatchType) {
-		if (matchType === this._matchType) {
-			return;
-		}
-
-		this._matchType = matchType;
-
-		if (this.widget) {
-			this.widget.matchType = this._matchType;
-		}
-
-		this.tree.refilter();
-		this.render();
-		this._onDidChangeMatchType.fire(matchType);
+	private _placeholder: string;
+	protected get placeholder(): string { return this._placeholder; }
+	protected set placeholder(value: string) {
+		this._placeholder = value;
+		this.widget?.setPlaceHolder(value);
 	}
 
 	private widget: FindWidget<T, TFilterData> | undefined;
 	private width = 0;
 
-	private readonly _onDidChangeMode = new Emitter<TreeFindMode>();
-	readonly onDidChangeMode = this._onDidChangeMode.event;
-
-	private readonly _onDidChangeMatchType = new Emitter<TreeFindMatchType>();
-	readonly onDidChangeMatchType = this._onDidChangeMatchType.event;
-
 	private readonly _onDidChangePattern = new Emitter<string>();
 	readonly onDidChangePattern = this._onDidChangePattern.event;
 
@@ -1041,29 +1054,20 @@ class FindController<T, TFilterData> implements IDisposable {
 	readonly onDidChangeOpenState = this._onDidChangeOpenState.event;
 
 	private readonly enabledDisposables = new DisposableStore();
-	private readonly disposables = new DisposableStore();
+	protected readonly disposables = new DisposableStore();
 
 	constructor(
-		private tree: AbstractTree<T, TFilterData, any>,
-		model: ITreeModel<T, TFilterData, any>,
-		private view: List<ITreeNode<T, TFilterData>>,
-		private filter: FindFilter<T>,
-		private readonly contextViewProvider: IContextViewProvider,
-		private readonly options: IFindControllerOptions = {}
+		protected tree: AbstractTree<T, TFilterData, any>,
+		protected filter: IFindFilter<T>,
+		protected readonly contextViewProvider: IContextViewProvider,
+		protected readonly options: IAbstractFindControllerOptions = {}
 	) {
-		this._mode = tree.options.defaultFindMode ?? TreeFindMode.Highlight;
-		this._matchType = tree.options.defaultFindMatchType ?? TreeFindMatchType.Fuzzy;
-		model.onDidSplice(this.onDidSpliceModel, this, this.disposables);
+		this.toggles = new FindToggles(options.toggles ?? []);
+		this._placeholder = options.placeholder ?? localize('type to search', "Type to search");
 	}
 
-	updateOptions(optionsUpdate: IAbstractTreeOptionsUpdate = {}): void {
-		if (optionsUpdate.defaultFindMode !== undefined) {
-			this.mode = optionsUpdate.defaultFindMode;
-		}
-
-		if (optionsUpdate.defaultFindMatchType !== undefined) {
-			this.matchType = optionsUpdate.defaultFindMatchType;
-		}
+	isOpened(): boolean {
+		return !!this.widget;
 	}
 
 	open(): void {
@@ -1073,13 +1077,12 @@ class FindController<T, TFilterData> implements IDisposable {
 			return;
 		}
 
-		this.widget = new FindWidget(this.view.getHTMLElement(), this.tree, this.contextViewProvider, this.mode, this.matchType, { ...this.options, history: this._history });
+		this.widget = new FindWidget(this.tree.getHTMLElement(), this.tree, this.contextViewProvider, this.placeholder, this.toggles.states(), { ...this.options, history: this._history });
 		this.enabledDisposables.add(this.widget);
 
 		this.widget.onDidChangeValue(this.onDidChangeValue, this, this.enabledDisposables);
-		this.widget.onDidChangeMode(mode => this.mode = mode, undefined, this.enabledDisposables);
-		this.widget.onDidChangeMatchType(matchType => this.matchType = matchType, undefined, this.enabledDisposables);
 		this.widget.onDidDisable(this.close, this, this.enabledDisposables);
+		this.widget.onDidToggleChange(this.onDidToggleChange, this, this.enabledDisposables);
 
 		this.widget.layout(this.width);
 		this.widget.focus();
@@ -1107,11 +1110,141 @@ class FindController<T, TFilterData> implements IDisposable {
 		this._onDidChangeOpenState.fire(false);
 	}
 
-	private onDidChangeValue(pattern: string): void {
+	protected onDidChangeValue(pattern: string): void {
 		this._pattern = pattern;
 		this._onDidChangePattern.fire(pattern);
 
 		this.filter.pattern = pattern;
+		this.applyPattern(pattern);
+	}
+
+	protected abstract applyPattern(pattern: string): void;
+
+	protected onDidToggleChange(e: ITreeFindToggleChangeEvent): void {
+		this.toggles.set(e.id, e.isChecked);
+	}
+
+	protected updateToggleState(id: string, checked: boolean): void {
+		this.toggles.set(id, checked);
+		this.widget?.setToggleState(id, checked);
+	}
+
+	protected renderMessage(showNotFound: boolean): void {
+		if (showNotFound) {
+			if (this.tree.options.showNotFoundMessage ?? true) {
+				this.widget?.showMessage({ type: MessageType.WARNING, content: localize('not found', "No results found.") });
+			} else {
+				this.widget?.showMessage({ type: MessageType.WARNING });
+			}
+		} else {
+			this.widget?.clearMessage();
+		}
+	}
+
+	protected alertResults(results: number): void {
+		if (!results) {
+			alert(localize('replFindNoResults', "No results"));
+		} else {
+			alert(localize('foundResults', "{0} results", results));
+		}
+	}
+
+	layout(width: number): void {
+		this.width = width;
+		this.widget?.layout(width);
+	}
+
+	dispose() {
+		this._history = undefined;
+		this._onDidChangePattern.dispose();
+		this.enabledDisposables.dispose();
+		this.disposables.dispose();
+	}
+}
+
+class FindController<T, TFilterData> extends AbstractFindController<T, TFilterData> {
+
+	get mode(): TreeFindMode { return this.toggles.get(DefaultTreeToggles.Mode) ? TreeFindMode.Filter : TreeFindMode.Highlight; }
+	set mode(mode: TreeFindMode) {
+		if (mode === this.mode) {
+			return;
+		}
+
+		const isFilterMode = mode === TreeFindMode.Filter;
+		this.updateToggleState(DefaultTreeToggles.Mode, isFilterMode);
+		this.placeholder = isFilterMode ? localize('type to filter', "Type to filter") : localize('type to search', "Type to search");
+
+		this.tree.refilter();
+		this.render();
+		this._onDidChangeMode.fire(mode);
+	}
+
+	get matchType(): TreeFindMatchType { return this.toggles.get(DefaultTreeToggles.MatchType) ? TreeFindMatchType.Fuzzy : TreeFindMatchType.Contiguous; }
+	set matchType(matchType: TreeFindMatchType) {
+		if (matchType === this.matchType) {
+			return;
+		}
+
+		this.updateToggleState(DefaultTreeToggles.MatchType, matchType === TreeFindMatchType.Fuzzy);
+
+		this.tree.refilter();
+		this.render();
+		this._onDidChangeMatchType.fire(matchType);
+	}
+
+	private readonly _onDidChangeMode = new Emitter<TreeFindMode>();
+	readonly onDidChangeMode = this._onDidChangeMode.event;
+
+	private readonly _onDidChangeMatchType = new Emitter<TreeFindMatchType>();
+	readonly onDidChangeMatchType = this._onDidChangeMatchType.event;
+
+	constructor(
+		tree: AbstractTree<T, TFilterData, any>,
+		protected override filter: FindFilter<T>,
+		contextViewProvider: IContextViewProvider,
+		options: IFindControllerOptions = {}
+	) {
+		const defaultFindMode = options.defaultFindMode ?? TreeFindMode.Highlight;
+		const defaultFindMatchType = options.defaultFindMatchType ?? TreeFindMatchType.Fuzzy;
+
+		const toggleContributions: ITreeFindToggleContribution[] = [{
+			id: DefaultTreeToggles.Mode,
+			icon: Codicon.listFilter,
+			title: localize('filter', "Filter"),
+			isChecked: defaultFindMode === TreeFindMode.Filter,
+		}, {
+			id: DefaultTreeToggles.MatchType,
+			icon: Codicon.searchFuzzy,
+			title: localize('fuzzySearch', "Fuzzy Match"),
+			isChecked: defaultFindMatchType === TreeFindMatchType.Fuzzy,
+		}];
+
+		super(tree, filter, contextViewProvider, { ...options, toggles: toggleContributions });
+
+		this.disposables.add(this.tree.onDidChangeModel(() => {
+			if (!this.isOpened()) {
+				return;
+			}
+
+			if (this.pattern.length !== 0) {
+				this.tree.refilter();
+			}
+
+			this.render();
+		}));
+	}
+
+	updateOptions(optionsUpdate: IAbstractTreeOptionsUpdate = {}): void {
+		if (optionsUpdate.defaultFindMode !== undefined) {
+			this.mode = optionsUpdate.defaultFindMode;
+		}
+
+		if (optionsUpdate.defaultFindMatchType !== undefined) {
+			this.matchType = optionsUpdate.defaultFindMatchType;
+		}
+	}
+
+	protected applyPattern(pattern: string): void {
 		this.tree.refilter();
 
 		if (pattern) {
@@ -1131,31 +1264,8 @@ class FindController<T, TFilterData> implements IDisposable {
 		this.render();
 	}
 
-	private onDidSpliceModel(): void {
-		if (!this.widget || this.pattern.length === 0) {
-			return;
-		}
-
-		this.tree.refilter();
-		this.render();
-	}
-
-	private render(): void {
-		const noMatches = this.filter.totalCount > 0 && this.filter.matchCount === 0;
-
-		if (this.pattern && noMatches) {
-			if (this.tree.options.showNotFoundMessage ?? true) {
-				this.widget?.showMessage({ type: MessageType.WARNING, content: localize('not found', "No elements found.") });
-			} else {
-				this.widget?.showMessage({ type: MessageType.WARNING });
-			}
-		} else {
-			this.widget?.clearMessage();
-		}
-	}
-
 	shouldAllowFocus(node: ITreeNode<T, TFilterData>): boolean {
-		if (!this.widget || !this.pattern) {
+		if (!this.isOpened() || !this.pattern) {
 			return true;
 		}
 
@@ -1166,16 +1276,23 @@ class FindController<T, TFilterData> implements IDisposable {
 		return !FuzzyScore.isDefault(node.filterData as any as FuzzyScore);
 	}
 
-	layout(width: number): void {
-		this.width = width;
-		this.widget?.layout(width);
+	protected override onDidToggleChange(e: ITreeFindToggleChangeEvent): void {
+		if (e.id === DefaultTreeToggles.Mode) {
+			this.mode = e.isChecked ? TreeFindMode.Filter : TreeFindMode.Highlight;
+		} else if (e.id === DefaultTreeToggles.MatchType) {
+			this.matchType = e.isChecked ? TreeFindMatchType.Fuzzy : TreeFindMatchType.Contiguous;
+		}
 	}
 
-	dispose() {
-		this._history = undefined;
-		this._onDidChangePattern.dispose();
-		this.enabledDisposables.dispose();
-		this.disposables.dispose();
+	private render(): void {
+		const noMatches = this.filter.matchCount === 0 && this.filter.totalCount > 0;
+		const showNotFound = noMatches && this.pattern.length > 0;
+
+		this.renderMessage(showNotFound);
+
+		if (this.pattern.length) {
+			this.alertResults(this.filter.matchCount);
+		}
 	}
 }
 
@@ -1210,6 +1327,10 @@ class StickyScrollState<T, TFilterData, TRef> {
 		return equals(this.stickyNodes, state.stickyNodes, stickyScrollNodeStateEquals);
 	}
 
+	contains(element: ITreeNode<T, TFilterData>): boolean {
+		return this.stickyNodes.some(node => node.node.element === element.element);
+	}
+
 	lastNodePartiallyVisible(): boolean {
 		if (this.count === 0) {
 			return false;
@@ -1274,7 +1395,7 @@ class StickyScrollController<T, TFilterData, TRef> extends Disposable {
 
 	constructor(
 		private readonly tree: AbstractTree<T, TFilterData, TRef>,
-		private readonly model: ITreeModel<T, TFilterData, TRef>,
+		private model: ITreeModel<T, TFilterData, TRef>,
 		private readonly view: List<ITreeNode<T, TFilterData>>,
 		renderers: TreeRenderer<T, TFilterData, TRef, any>[],
 		private readonly treeDelegate: IListVirtualDelegate<ITreeNode<T, TFilterData>>,
@@ -1294,6 +1415,17 @@ class StickyScrollController<T, TFilterData, TRef> extends Disposable {
 		this._register(view.onDidScroll(() => this.update()));
 		this._register(view.onDidChangeContentHeight(() => this.update()));
 		this._register(tree.onDidChangeCollapseState(() => this.update()));
+		this._register(model.onDidSpliceRenderedNodes((e) => {
+			const state = this._widget.state;
+			if (!state) {
+				return;
+			}
+
+			const renderedNodes = e.elements.filter(node => state.contains(node));
+			if (renderedNodes) {
+				this._widget.rerender();
+			}
+		}));
 
 		this.update();
 	}
@@ -1554,6 +1686,10 @@ class StickyScrollController<T, TFilterData, TRef> extends Disposable {
 		}
 		return { stickyScrollMaxItemCount };
 	}
+
+	setModel(model: ITreeModel<T, TFilterData, TRef>): void {
+		this.model = model;
+	}
 }
 
 class StickyScrollWidget<T, TFilterData, TRef> implements IDisposable {
@@ -1562,6 +1698,7 @@ class StickyScrollWidget<T, TFilterData, TRef> implements IDisposable {
 	private _previousState: StickyScrollState<T, TFilterData, TRef> | undefined;
 	private _previousElements: HTMLElement[] = [];
 	private readonly _previousStateDisposables: DisposableStore = new DisposableStore();
+	get state(): StickyScrollState<T, TFilterData, TRef> | undefined { return this._previousState; }
 
 	private stickyScrollFocus: StickyScrollFocus<T, TFilterData, TRef>;
 	readonly onDidChangeHasFocus: Event<boolean>;
@@ -1633,22 +1770,7 @@ class StickyScrollWidget<T, TFilterData, TRef> implements IDisposable {
 		}
 		// create new dom elements
 		else {
-			this._previousStateDisposables.clear();
-
-			const elements = Array(state.count);
-			for (let stickyIndex = state.count - 1; stickyIndex >= 0; stickyIndex--) {
-				const stickyNode = state.stickyNodes[stickyIndex];
-
-				const { element, disposable } = this.createElement(stickyNode, stickyIndex, state.count);
-				elements[stickyIndex] = element;
-
-				this._rootDomNode.appendChild(element);
-				this._previousStateDisposables.add(disposable);
-			}
-
-			this.stickyScrollFocus.updateElements(elements, state);
-
-			this._previousElements = elements;
+			this.renderState(state);
 		}
 
 		this._previousState = state;
@@ -1657,6 +1779,31 @@ class StickyScrollWidget<T, TFilterData, TRef> implements IDisposable {
 		this._rootDomNode.style.height = `${lastStickyNode.position + lastStickyNode.height}px`;
 	}
 
+	private renderState(state: StickyScrollState<T, TFilterData, TRef>): void {
+		this._previousStateDisposables.clear();
+
+		const elements = Array(state.count);
+		for (let stickyIndex = state.count - 1; stickyIndex >= 0; stickyIndex--) {
+			const stickyNode = state.stickyNodes[stickyIndex];
+
+			const { element, disposable } = this.createElement(stickyNode, stickyIndex, state.count);
+			elements[stickyIndex] = element;
+
+			this._rootDomNode.appendChild(element);
+			this._previousStateDisposables.add(disposable);
+		}
+
+		this.stickyScrollFocus.updateElements(elements, state);
+
+		this._previousElements = elements;
+	}
+
+	rerender(): void {
+		if (this._previousState) {
+			this.renderState(this._previousState);
+		}
+	}
+
 	private createElement(stickyNode: StickyScrollNode<T, TFilterData>, stickyIndex: number, stickyNodesTotal: number): { element: HTMLElement; disposable: IDisposable } {
 
 		const nodeIndex = stickyNode.startIndex;
@@ -1807,9 +1954,8 @@ class StickyScrollFocus<T, TFilterData, TRef> extends Disposable {
 	) {
 		super();
 
-		this.container.addEventListener('focus', () => this.onFocus());
-		this.container.addEventListener('blur', () => this.onBlur());
-
+		this._register(addDisposableListener(this.container, 'focus', () => this.onFocus()));
+		this._register(addDisposableListener(this.container, 'blur', () => this.onBlur()));
 		this._register(this.view.onDidFocus(() => this.toggleStickyScrollFocused(false)));
 		this._register(this.view.onKeyDown((e) => this.onKeyDown(e)));
 		this._register(this.view.onMouseDown((e) => this.onMouseDown(e)));
@@ -2242,7 +2388,7 @@ class TreeNodeListMouseController<T, TFilterData, TRef> extends MouseController<
 
 	protected override onViewPointer(e: IListMouseEvent<ITreeNode<T, TFilterData>>): void {
 		if (isButton(e.browserEvent.target as HTMLElement) ||
-			isInputElement(e.browserEvent.target as HTMLElement) ||
+			isEditableElement(e.browserEvent.target as HTMLElement) ||
 			isMonacoEditor(e.browserEvent.target as HTMLElement)) {
 			return;
 		}
@@ -2469,6 +2615,7 @@ export abstract class AbstractTree<T, TFilterData, TRef> implements IDisposable
 	private anchor: Trait<T>;
 	private eventBufferer = new EventBufferer();
 	private findController?: FindController<T, TFilterData>;
+	private findFilter?: FindFilter<T>;
 	readonly onDidChangeFindOpenState: Event<boolean> = Event.None;
 	onDidChangeStickyScrollFocused: Event<boolean> = Event.None;
 	private focusNavigationFilter: ((node: ITreeNode<T, TFilterData>) => boolean) | undefined;
@@ -2496,9 +2643,16 @@ export abstract class AbstractTree<T, TFilterData, TRef> implements IDisposable
 	get onDidFocus(): Event<void> { return this.view.onDidFocus; }
 	get onDidBlur(): Event<void> { return this.view.onDidBlur; }
 
-	get onDidChangeModel(): Event<void> { return Event.signal(this.model.onDidSplice); }
-	get onDidChangeCollapseState(): Event<ICollapseStateChangeEvent<T, TFilterData>> { return this.model.onDidChangeCollapseState; }
-	get onDidChangeRenderNodeCount(): Event<ITreeNode<T, TFilterData>> { return this.model.onDidChangeRenderNodeCount; }
+	private readonly onDidSwapModel = this.disposables.add(new Emitter<void>());
+	private readonly onDidChangeModelRelay = this.disposables.add(new Relay<void>());
+	private readonly onDidSpliceModelRelay = this.disposables.add(new Relay<ITreeModelSpliceEvent<T, TFilterData>>());
+	private readonly onDidChangeCollapseStateRelay = this.disposables.add(new Relay<ICollapseStateChangeEvent<T, TFilterData>>());
+	private readonly onDidChangeRenderNodeCountRelay = this.disposables.add(new Relay<ITreeNode<T, TFilterData>>());
+	private readonly onDidChangeActiveNodesRelay = this.disposables.add(new Relay<ITreeNode<T, TFilterData>[]>());
+
+	get onDidChangeModel(): Event<void> { return Event.any(this.onDidChangeModelRelay.event, this.onDidSwapModel.event); }
+	get onDidChangeCollapseState(): Event<ICollapseStateChangeEvent<T, TFilterData>> { return this.onDidChangeCollapseStateRelay.event; }
+	get onDidChangeRenderNodeCount(): Event<ITreeNode<T, TFilterData>> { return this.onDidChangeRenderNodeCountRelay.event; }
 
 	private readonly _onWillRefilter = new Emitter<void>();
 	readonly onWillRefilter: Event<void> = this._onWillRefilter.event;
@@ -2528,23 +2682,20 @@ export abstract class AbstractTree<T, TFilterData, TRef> implements IDisposable
 		renderers: ITreeRenderer<T, TFilterData, any>[],
 		private _options: IAbstractTreeOptions<T, TFilterData> = {}
 	) {
-		this.treeDelegate = new ComposedTreeDelegate<T, ITreeNode<T, TFilterData>>(delegate);
-
-		const onDidChangeCollapseStateRelay = new Relay<ICollapseStateChangeEvent<T, TFilterData>>();
-		const onDidChangeActiveNodes = new Relay<ITreeNode<T, TFilterData>[]>();
-		const activeNodes = this.disposables.add(new EventCollection(onDidChangeActiveNodes.event));
-		const renderedIndentGuides = new SetMap<ITreeNode<T, TFilterData>, HTMLDivElement>();
-		this.renderers = renderers.map(r => new TreeRenderer<T, TFilterData, TRef, any>(r, () => this.model, onDidChangeCollapseStateRelay.event, activeNodes, renderedIndentGuides, _options));
-		for (const r of this.renderers) {
-			this.disposables.add(r);
+		if (_options.keyboardNavigationLabelProvider) {
+			this.findFilter = new FindFilter(this, _options.keyboardNavigationLabelProvider, _options.filter as any as ITreeFilter<T, FuzzyScore>);
+			_options = { ..._options, filter: this.findFilter as ITreeFilter<T, TFilterData> }; // TODO need typescript help here
+			this.disposables.add(this.findFilter);
 		}
 
-		let filter: FindFilter<T> | undefined;
+		this.model = this.createModel(_user, _options);
+		this.treeDelegate = new ComposedTreeDelegate<T, ITreeNode<T, TFilterData>>(delegate);
 
-		if (_options.keyboardNavigationLabelProvider) {
-			filter = new FindFilter(this, _options.keyboardNavigationLabelProvider, _options.filter as any as ITreeFilter<T, FuzzyScore>);
-			_options = { ..._options, filter: filter as ITreeFilter<T, TFilterData> }; // TODO need typescript help here
-			this.disposables.add(filter);
+		const activeNodes = this.disposables.add(new EventCollection(this.onDidChangeActiveNodesRelay.event));
+		const renderedIndentGuides = new SetMap<ITreeNode<T, TFilterData>, HTMLDivElement>();
+		this.renderers = renderers.map(r => new TreeRenderer<T, TFilterData, TRef, any>(r, this.model, this.onDidChangeCollapseStateRelay.event, activeNodes, renderedIndentGuides, _options));
+		for (const r of this.renderers) {
+			this.disposables.add(r);
 		}
 
 		this.focus = new Trait(() => this.view.getFocusedElements()[0], _options.identityProvider);
@@ -2552,45 +2703,11 @@ export abstract class AbstractTree<T, TFilterData, TRef> implements IDisposable
 		this.anchor = new Trait(() => this.view.getAnchorElement(), _options.identityProvider);
 		this.view = new TreeNodeList(_user, container, this.treeDelegate, this.renderers, this.focus, this.selection, this.anchor, { ...asListOptions(() => this.model, _options), tree: this, stickyScrollProvider: () => this.stickyScrollController });
 
-		this.model = this.createModel(_user, this.view, _options);
-		onDidChangeCollapseStateRelay.input = this.model.onDidChangeCollapseState;
-
-		const onDidModelSplice = Event.forEach(this.model.onDidSplice, e => {
-			this.eventBufferer.bufferEvents(() => {
-				this.focus.onDidModelSplice(e);
-				this.selection.onDidModelSplice(e);
-			});
-		}, this.disposables);
-
-		// Make sure the `forEach` always runs
-		onDidModelSplice(() => null, null, this.disposables);
-
-		// Active nodes can change when the model changes or when focus or selection change.
-		// We debounce it with 0 delay since these events may fire in the same stack and we only
-		// want to run this once. It also doesn't matter if it runs on the next tick since it's only
-		// a nice to have UI feature.
-		const activeNodesEmitter = this.disposables.add(new Emitter<ITreeNode<T, TFilterData>[]>());
-		const activeNodesDebounce = this.disposables.add(new Delayer(0));
-		this.disposables.add(Event.any<any>(onDidModelSplice, this.focus.onDidChange, this.selection.onDidChange)(() => {
-			activeNodesDebounce.trigger(() => {
-				const set = new Set<ITreeNode<T, TFilterData>>();
-
-				for (const node of this.focus.getNodes()) {
-					set.add(node);
-				}
-
-				for (const node of this.selection.getNodes()) {
-					set.add(node);
-				}
-
-				activeNodesEmitter.fire([...set.values()]);
-			});
-		}));
-		onDidChangeActiveNodes.input = activeNodesEmitter.event;
+		this.setupModel(this.model); // model needs to be setup after the traits have been created
 
 		if (_options.keyboardSupport !== false) {
 			const onKeyDown = Event.chain(this.view.onKeyDown, $ =>
-				$.filter(e => !isInputElement(e.target as HTMLElement))
+				$.filter(e => !isEditableElement(e.target as HTMLElement))
 					.map(e => new StandardKeyboardEvent(e))
 			);
 
@@ -2600,11 +2717,15 @@ export abstract class AbstractTree<T, TFilterData, TRef> implements IDisposable
 		}
 
 		if ((_options.findWidgetEnabled ?? true) && _options.keyboardNavigationLabelProvider && _options.contextViewProvider) {
-			const opts = this.options.findWidgetStyles ? { styles: this.options.findWidgetStyles } : undefined;
-			this.findController = new FindController(this, this.model, this.view, filter!, _options.contextViewProvider, opts);
+			const findOptions: IFindControllerOptions = {
+				styles: _options.findWidgetStyles,
+				defaultFindMode: _options.defaultFindMode,
+				defaultFindMatchType: _options.defaultFindMatchType,
+				showNotFoundMessage: _options.showNotFoundMessage,
+			};
+			this.findController = this.disposables.add(new FindController(this, this.findFilter!, _options.contextViewProvider, findOptions));
 			this.focusNavigationFilter = node => this.findController!.shouldAllowFocus(node);
 			this.onDidChangeFindOpenState = this.findController.onDidChangeOpenState;
-			this.disposables.add(this.findController);
 			this.onDidChangeFindMode = this.findController.onDidChangeMode;
 			this.onDidChangeFindMatchType = this.findController.onDidChangeMatchType;
 		} else {
@@ -2909,7 +3030,7 @@ export abstract class AbstractTree<T, TFilterData, TRef> implements IDisposable
 	}
 
 	getAnchor(): T | undefined {
-		return firstOrDefault(this.anchor.get(), undefined);
+		return this.anchor.get().at(0);
 	}
 
 	setSelection(elements: TRef[], browserEvent?: UIEvent): void {
@@ -3109,7 +3230,79 @@ export abstract class AbstractTree<T, TFilterData, TRef> implements IDisposable
 		this.model.setCollapsed(location, undefined, recursive);
 	}
 
-	protected abstract createModel(user: string, view: ISpliceable<ITreeNode<T, TFilterData>>, options: IAbstractTreeOptions<T, TFilterData>): ITreeModel<T, TFilterData, TRef>;
+	protected abstract createModel(user: string, options: IAbstractTreeOptions<T, TFilterData>): ITreeModel<T, TFilterData, TRef>;
+
+	createNewModel(options: IAbstractTreeOptions<T, TFilterData> = {}): ITreeModel<T, TFilterData, TRef> {
+		return this.createModel(this._user, { ...this._options, filter: this.findFilter as ITreeFilter<T, TFilterData> | undefined, ...options });
+	}
+
+	private readonly modelDisposables = new DisposableStore();
+	private setupModel(model: ITreeModel<T, TFilterData, TRef>) {
+		this.modelDisposables.clear();
+
+		this.modelDisposables.add(model.onDidSpliceRenderedNodes(({ start, deleteCount, elements }) => this.view.splice(start, deleteCount, elements)));
+
+		const onDidModelSplice = Event.forEach(model.onDidSpliceModel, e => {
+			this.eventBufferer.bufferEvents(() => {
+				this.focus.onDidModelSplice(e);
+				this.selection.onDidModelSplice(e);
+			});
+		}, this.modelDisposables);
+
+		// Make sure the `forEach` always runs
+		onDidModelSplice(() => null, null, this.modelDisposables);
+
+		// Active nodes can change when the model changes or when focus or selection change.
+		// We debounce it with 0 delay since these events may fire in the same stack and we only
+		// want to run this once. It also doesn't matter if it runs on the next tick since it's only
+		// a nice to have UI feature.
+		const activeNodesEmitter = this.modelDisposables.add(new Emitter<ITreeNode<T, TFilterData>[]>());
+		const activeNodesDebounce = this.modelDisposables.add(new Delayer(0));
+		this.modelDisposables.add(Event.any<any>(onDidModelSplice, this.focus.onDidChange, this.selection.onDidChange)(() => {
+			activeNodesDebounce.trigger(() => {
+				const set = new Set<ITreeNode<T, TFilterData>>();
+
+				for (const node of this.focus.getNodes()) {
+					set.add(node);
+				}
+
+				for (const node of this.selection.getNodes()) {
+					set.add(node);
+				}
+
+				activeNodesEmitter.fire([...set.values()]);
+			});
+		}));
+
+		this.onDidChangeActiveNodesRelay.input = activeNodesEmitter.event;
+		this.onDidChangeModelRelay.input = Event.signal(model.onDidSpliceModel);
+		this.onDidChangeCollapseStateRelay.input = model.onDidChangeCollapseState;
+		this.onDidChangeRenderNodeCountRelay.input = model.onDidChangeRenderNodeCount;
+		this.onDidSpliceModelRelay.input = model.onDidSpliceModel;
+	}
+
+	setModel(newModel: ITreeModel<T, TFilterData, TRef>) {
+		const oldModel = this.model;
+
+		this.model = newModel;
+		this.setupModel(newModel);
+
+		this.renderers.forEach(r => r.setModel(newModel));
+		this.stickyScrollController?.setModel(newModel);
+
+		this.focus.set([]);
+		this.selection.set([]);
+		this.anchor.set([]);
+
+		this.view.splice(0, oldModel.getListRenderCount(oldModel.rootRef));
+		newModel.refilter();
+
+		this.onDidSwapModel.fire();
+	}
+
+	getModel(): ITreeModel<T, TFilterData, TRef> {
+		return this.model;
+	}
 
 	navigate(start?: TRef): ITreeNavigator<T> {
 		return new TreeNavigator(this.view, this.model, start);
@@ -3119,6 +3312,7 @@ export abstract class AbstractTree<T, TFilterData, TRef> implements IDisposable
 		dispose(this.disposables);
 		this.stickyScrollController?.dispose();
 		this.view.dispose();
+		this.modelDisposables.dispose();
 	}
 }
 
diff --git a/src/vs/base/browser/ui/tree/asyncDataTree.ts b/src/vs/base/browser/ui/tree/asyncDataTree.ts
index bfd5af68914..a6bbcda3f88 100644
--- a/src/vs/base/browser/ui/tree/asyncDataTree.ts
+++ b/src/vs/base/browser/ui/tree/asyncDataTree.ts
@@ -3,24 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDragAndDropData } from 'vs/base/browser/dnd';
-import { IIdentityProvider, IListDragAndDrop, IListDragOverReaction, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { ElementsDragAndDropData, ListViewTargetSector } from 'vs/base/browser/ui/list/listView';
-import { IListStyles } from 'vs/base/browser/ui/list/listWidget';
-import { ComposedTreeDelegate, TreeFindMode as TreeFindMode, IAbstractTreeOptions, IAbstractTreeOptionsUpdate, TreeFindMatchType, AbstractTreePart } from 'vs/base/browser/ui/tree/abstractTree';
-import { ICompressedTreeElement, ICompressedTreeNode } from 'vs/base/browser/ui/tree/compressedObjectTreeModel';
-import { getVisibleState, isFilterResult } from 'vs/base/browser/ui/tree/indexTreeModel';
-import { CompressibleObjectTree, ICompressibleKeyboardNavigationLabelProvider, ICompressibleObjectTreeOptions, ICompressibleTreeRenderer, IObjectTreeOptions, IObjectTreeSetChildrenOptions, ObjectTree } from 'vs/base/browser/ui/tree/objectTree';
-import { IAsyncDataSource, ICollapseStateChangeEvent, IObjectTreeElement, ITreeContextMenuEvent, ITreeDragAndDrop, ITreeEvent, ITreeFilter, ITreeMouseEvent, ITreeNode, ITreeRenderer, ITreeSorter, ObjectTreeElementCollapseState, TreeError, TreeFilterResult, TreeVisibility, WeakMapper } from 'vs/base/browser/ui/tree/tree';
-import { CancelablePromise, createCancelablePromise, Promises, timeout } from 'vs/base/common/async';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { isCancellationError, onUnexpectedError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Iterable } from 'vs/base/common/iterator';
-import { DisposableStore, dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { ScrollEvent } from 'vs/base/common/scrollable';
-import { isIterable } from 'vs/base/common/types';
+import { IDragAndDropData } from '../../dnd.js';
+import { IIdentityProvider, IKeyboardNavigationLabelProvider, IListDragAndDrop, IListDragOverReaction, IListVirtualDelegate } from '../list/list.js';
+import { ElementsDragAndDropData, ListViewTargetSector } from '../list/listView.js';
+import { IListStyles } from '../list/listWidget.js';
+import { ComposedTreeDelegate, TreeFindMode as TreeFindMode, IAbstractTreeOptions, IAbstractTreeOptionsUpdate, TreeFindMatchType, AbstractTreePart, LabelFuzzyScore, IFindFilter, AbstractFindController, ITreeFindToggleContribution, ITreeFindToggleChangeEvent } from './abstractTree.js';
+import { ICompressedTreeElement, ICompressedTreeNode } from './compressedObjectTreeModel.js';
+import { getVisibleState, isFilterResult } from './indexTreeModel.js';
+import { CompressibleObjectTree, ICompressibleKeyboardNavigationLabelProvider, ICompressibleObjectTreeOptions, ICompressibleTreeRenderer, IObjectTreeOptions, IObjectTreeSetChildrenOptions, ObjectTree } from './objectTree.js';
+import { IAsyncDataSource, ICollapseStateChangeEvent, IObjectTreeElement, ITreeContextMenuEvent, ITreeDragAndDrop, ITreeEvent, ITreeFilter, ITreeModel, ITreeMouseEvent, ITreeNavigator, ITreeNode, ITreeRenderer, ITreeSorter, ObjectTreeElementCollapseState, TreeError, TreeFilterResult, TreeVisibility, WeakMapper } from './tree.js';
+import { CancelablePromise, createCancelablePromise, Promises, timeout, TimeoutTimer } from '../../../common/async.js';
+import { Codicon } from '../../../common/codicons.js';
+import { ThemeIcon } from '../../../common/themables.js';
+import { isCancellationError, onUnexpectedError } from '../../../common/errors.js';
+import { Emitter, Event } from '../../../common/event.js';
+import { Iterable } from '../../../common/iterator.js';
+import { DisposableStore, dispose, IDisposable } from '../../../common/lifecycle.js';
+import { ScrollEvent } from '../../../common/scrollable.js';
+import { isIterable, isNumber } from '../../../common/types.js';
+import { CancellationToken, CancellationTokenSource } from '../../../common/cancellation.js';
+import { IObjectTreeModel } from './objectTreeModel.js';
+import { IContextViewProvider } from '../contextview/contextview.js';
+import { fuzzyScore, FuzzyScore } from '../../../common/filters.js';
 
 interface IAsyncDataTreeNode<TInput, T> {
 	element: TInput | T;
@@ -217,6 +221,377 @@ class AsyncDataTreeNodeListDragAndDrop<TInput, T> implements IListDragAndDrop<IA
 	}
 }
 
+export interface IAsyncFindProvider<T> {
+	toggles?: ITreeFindToggleContribution[];
+	placeholder?: string;
+	getFindResults(pattern: string, sessionId: number, token: CancellationToken, toggleStates: { id: string; isChecked: boolean }[]): AsyncIterable<T>;
+	revealResultInTree?(findElement: T): void;
+}
+
+class AsyncFindTreeNode<T> {
+
+	private _children: AsyncFindTreeNode<T>[] = [];
+	get children(): Iterable<AsyncFindTreeNode<T>> {
+		return this._children.values();
+	}
+
+	constructor(
+		public element: T | undefined,
+		public id: string,
+		private readonly sorter: ITreeSorter<T> | undefined,
+	) { }
+
+	addChild(child: AsyncFindTreeNode<T>): void {
+		if (!this.sorter) {
+			this._children.push(child);
+			return;
+		}
+
+		const index = this._children.findIndex(existingChild => this.sorter!.compare(child.element!, existingChild.element!) < 0);
+		if (index !== -1) {
+			this._children.splice(index, 0, child);
+		} else {
+			this._children.push(child);
+		}
+	}
+}
+
+class AsyncFindTree<TInput, T> {
+
+	private cachedNodes = new Map<string, AsyncFindTreeNode<T>>();
+	private readonly root = new AsyncFindTreeNode<T>(undefined, '_AsyncFindTreeRoot_', this.sorter);
+	get rootNodes(): AsyncFindTreeNode<T>[] {
+		return [...this.root.children];
+	}
+
+	private _totalLeafs: number = 0;
+	get totalLeafs(): number {
+		return this._totalLeafs;
+	}
+
+	get totalNodes(): number {
+		return this.cachedNodes.size;
+	}
+
+	constructor(
+		private readonly dataSource: IAsyncDataSource<TInput, T>,
+		private readonly identityProvider: IIdentityProvider<T>,
+		private readonly sorter?: ITreeSorter<T>,
+	) {
+		if (!dataSource.getParent) {
+			throw new Error('Data source must implement `getParent`');
+		}
+	}
+
+	add(element: T): void {
+		const elementId = this.identityProvider.getId(element).toString();
+		if (this.cachedNodes.has(elementId)) {
+			return;
+		}
+
+		this._totalLeafs++;
+
+		const node = new AsyncFindTreeNode(element, elementId, this.sorter);
+		this.cachedNodes.set(elementId, node);
+
+		// Set up parents up till root
+		let currentNode = node;
+		while (true) {
+			let currentParentElement = this.dataSource.getParent!(currentNode.element!);
+
+			// is root
+			if (currentParentElement === currentNode.element) {
+				this.root.addChild(currentNode);
+				break;
+			}
+			currentParentElement = currentParentElement as T;
+
+			// is already in the tree
+			const parentId = this.identityProvider.getId(currentParentElement).toString();
+			const parentNode = this.cachedNodes.get(parentId);
+			if (parentNode) {
+				parentNode.addChild(currentNode);
+				break;
+			}
+
+			// create parent node
+			const newParent = new AsyncFindTreeNode(currentParentElement, parentId, this.sorter);
+			this.cachedNodes.set(parentId, newParent);
+			newParent.addChild(currentNode);
+
+			currentNode = newParent;
+		}
+	}
+}
+
+class AsyncFindFilter<TInput, T> implements IFindFilter<IAsyncDataTreeNode<TInput, T>>, IDisposable {
+	private _pattern: string = '';
+	private _lowercasePattern: string = '';
+	private readonly disposables = new DisposableStore();
+
+	get pattern(): string {
+		return this._pattern;
+	}
+	set pattern(pattern: string) {
+		this._pattern = pattern;
+		this._lowercasePattern = pattern.toLowerCase();
+	}
+
+	constructor(
+		private keyboardNavigationLabelProvider: IKeyboardNavigationLabelProvider<T>,
+		private _filter?: ITreeFilter<IAsyncDataTreeNode<TInput, T>, FuzzyScore>,
+	) { }
+
+	filter(element: IAsyncDataTreeNode<TInput, T>, parentVisibility: TreeVisibility): TreeFilterResult<FuzzyScore | LabelFuzzyScore> {
+		let visibility = TreeVisibility.Visible;
+
+		if (this._filter) {
+			const result = this._filter.filter(element, parentVisibility);
+
+			if (typeof result === 'boolean') {
+				visibility = result ? TreeVisibility.Visible : TreeVisibility.Hidden;
+			} else if (isFilterResult(result)) {
+				visibility = getVisibleState(result.visibility);
+			} else {
+				visibility = result;
+			}
+
+			if (visibility === TreeVisibility.Hidden) {
+				return false;
+			}
+		}
+
+		if (!this._pattern) {
+			return { data: FuzzyScore.Default, visibility };
+		}
+
+		const label = this.keyboardNavigationLabelProvider.getKeyboardNavigationLabel(element.element as T);
+		const labels = Array.isArray(label) ? label : [label];
+
+		for (const l of labels) {
+			const labelStr: string = l && l.toString();
+			if (typeof labelStr === 'undefined') {
+				return { data: FuzzyScore.Default, visibility };
+			}
+
+			const score = fuzzyScore(this._pattern, this._lowercasePattern, 0, labelStr, labelStr.toLowerCase(), 0, { firstMatchCanBeWeak: true, boostFullMatch: true });
+			if (score) {
+				return labels.length === 1 ?
+					{ data: score, visibility } :
+					{ data: { label: labelStr, score: score }, visibility };
+			}
+		}
+
+		return { data: FuzzyScore.Default, visibility };
+	}
+
+	dispose(): void {
+		dispose(this.disposables);
+	}
+}
+
+class AsyncFindController<TInput, T, TFilterData> extends AbstractFindController<IAsyncDataTreeNode<TInput, T> | null, TFilterData> {
+
+	declare protected readonly filter: AsyncFindFilter<TInput, T>;
+	private readonly model: ITreeModel<IAsyncDataTreeNode<TInput, T> | null, TFilterData, IAsyncDataTreeNode<TInput, T> | null>;
+	private readonly nodes = new Map<null | T, IAsyncDataTreeNode<TInput, T>>();
+
+	private previousScrollTop: number | undefined;
+	private previousFocus: (IAsyncDataTreeNode<TInput, T> | null)[] = [];
+	private previousSelection: (IAsyncDataTreeNode<TInput, T> | null)[] = [];
+
+	private sessionId: number = 0;
+	private active: boolean = false;
+
+	private activeTokenSource: CancellationTokenSource | undefined;
+	private scheduler: TimeoutTimer;
+
+	private readonly store = new DisposableStore();
+
+	constructor(
+		private readonly user: string,
+		protected override readonly tree: ObjectTree<IAsyncDataTreeNode<TInput, T>, TFilterData>,
+		private readonly findProvider: IAsyncFindProvider<T>,
+		filter: AsyncFindFilter<TInput, T>,
+		private readonly sorter: ITreeSorter<T> | undefined,
+		private readonly dataSource: IAsyncDataSource<TInput, T>,
+		private readonly identityProvider: IIdentityProvider<T>,
+		contextViewProvider: IContextViewProvider,
+		options: IAbstractTreeOptions<IAsyncDataTreeNode<TInput, T>, TFilterData>,
+		private readonly asTreeElement: (node: IAsyncDataTreeNode<TInput, T>) => IObjectTreeElement<IAsyncDataTreeNode<TInput, T>>,
+	) {
+		super(tree as any, filter, contextViewProvider, { ...options, placeholder: findProvider.placeholder, toggles: findProvider.toggles });
+
+		this.model = tree.getModel();
+		this.scheduler = this.store.add(new TimeoutTimer());
+	}
+
+	private setFindModeActive(active: boolean): void {
+		if (this.active === active) {
+			return;
+		}
+
+		if (active) {
+			this.activateFindMode();
+		} else {
+			this.deactivateFindMode();
+		}
+
+		this.active = active;
+	}
+
+	private activateFindMode(): void {
+		this.sessionId++;
+
+		// store tree view state
+		this.previousScrollTop = this.tree.scrollTop;
+		this.previousFocus = this.tree.getFocus();
+		this.previousSelection = this.tree.getSelection();
+
+		this.tree.scrollTop = 0;
+		const findModel = this.tree.createNewModel({ filter: this.filter as ITreeFilter<IAsyncDataTreeNode<TInput, T> | null, TFilterData> });
+		this.tree.setModel(findModel);
+	}
+
+	private deactivateFindMode(): void {
+		const focus = this.tree.getFocus()[0];
+		this.tree.setModel(this.model);
+
+		if (focus && focus.element && this.findProvider.revealResultInTree) {
+			this.findProvider.revealResultInTree(focus.element as T);
+		} else {
+			this.tree.scrollTop = this.previousScrollTop ?? 0;
+			this.tree.setFocus(this.previousFocus);
+			this.tree.setSelection(this.previousSelection);
+		}
+
+		this.activeTokenSource = undefined;
+		this.nodes.clear();
+	}
+
+	protected applyPattern(pattern: string): void {
+		this.renderMessage(false);
+		this.scheduler.cancel();
+		this.activeTokenSource?.cancel();
+
+		if (!pattern) {
+			this.setFindModeActive(false);
+			return;
+		}
+
+		this.activeTokenSource = new CancellationTokenSource();
+
+		const results = this.findProvider.getFindResults(pattern, this.sessionId, this.activeTokenSource.token, this.toggles.states());
+		this.pocessFindResults(results, this.activeTokenSource.token);
+	}
+
+	private async pocessFindResults(results: AsyncIterable<T>, token: CancellationToken): Promise<void> {
+		if (!this.dataSource.getParent || !this.identityProvider) {
+			return;
+		}
+
+		// Remove all nodes
+		this.clearFindResults();
+
+		const findTree = new AsyncFindTree<TInput, T>(this.dataSource, this.identityProvider, this.sorter);
+		for await (const result of results) {
+			if (token.isCancellationRequested) {
+				return;
+			}
+
+			findTree.add(result);
+		}
+
+		if (token.isCancellationRequested) {
+			return;
+		}
+
+		// Redraw at the end
+		this.setFindResults(findTree);
+
+		this.activeTokenSource?.dispose();
+		this.activeTokenSource = undefined;
+	}
+
+	private clearFindResults(): void {
+		this.schedule(() => {
+			if (!this.active) {
+				this.setFindModeActive(true);
+				return;
+			} else {
+				this.tree.setChildren(null, []);
+			}
+		}, 600);
+	}
+
+	private setFindResults(findTree: AsyncFindTree<TInput, T>): void {
+		const rootChildren: IObjectTreeElement<IAsyncDataTreeNode<TInput, T>>[] = [];
+		for (const rootNodes of findTree.rootNodes) {
+			rootChildren.push(this.asTreeElement(this.findNodeToAsyncNode(rootNodes, null)));
+		}
+
+		this.schedule(() => {
+			this.setFindModeActive(true);
+			this.tree.setChildren(null, rootChildren);
+			this.renderMessage(rootChildren.length === 0);
+			this.alertResults(findTree.totalLeafs);
+		}, 0);
+	}
+
+	protected findNodeToAsyncNode(node: AsyncFindTreeNode<T>, parent: IAsyncDataTreeNode<TInput, T> | null): IAsyncDataTreeNode<TInput, T> {
+		const children: IAsyncDataTreeNode<TInput, T>[] = [];
+
+		if (node.element === undefined) {
+			throw new TreeError(this.user, 'Found node without an element');
+		}
+
+		const asyncNode: IAsyncDataTreeNode<TInput, T> = {
+			element: node.element,
+			parent,
+			children,
+			hasChildren: false,
+			defaultCollapseState: ObjectTreeElementCollapseState.PreserveOrExpanded,
+			stale: false,
+			refreshPromise: undefined,
+			slow: false,
+			forceExpanded: false
+		};
+
+		for (const child of node.children) {
+			children.push(this.findNodeToAsyncNode(child, asyncNode));
+		}
+
+		asyncNode.hasChildren = !!children.length;
+
+		this.nodes.set(node.element, asyncNode);
+
+		return asyncNode;
+	}
+
+	private schedule(fn: () => void, delay: number) {
+		if (delay === 0) {
+			this.scheduler.cancel();
+			fn();
+			return;
+		}
+		this.scheduler.cancelAndSet(fn, delay);
+	}
+
+	protected override onDidToggleChange(e: ITreeFindToggleChangeEvent): void {
+		super.onDidToggleChange(e);
+		this.applyPattern(this.pattern);
+	}
+
+	getDataNode(element: TInput | T): IAsyncDataTreeNode<TInput, T> | undefined {
+		return this.nodes.get(element as T);
+	}
+
+	override dispose(): void {
+		super.dispose();
+		this.store.dispose();
+	}
+}
+
 function asObjectTreeOptions<TInput, T, TFilterData>(options?: IAsyncDataTreeOptions<T, TFilterData>): IObjectTreeOptions<IAsyncDataTreeNode<TInput, T>, TFilterData> | undefined {
 	return options && {
 		...options,
@@ -298,6 +673,7 @@ export interface IAsyncDataTreeOptions<T, TFilterData = void> extends IAsyncData
 	readonly identityProvider?: IIdentityProvider<T>;
 	readonly sorter?: ITreeSorter<T>;
 	readonly autoExpandSingleChildren?: boolean;
+	readonly findResultsProvider?: IAsyncFindProvider<T>;
 }
 
 export interface IAsyncDataTreeViewState {
@@ -321,9 +697,11 @@ function dfs<TInput, T>(node: IAsyncDataTreeNode<TInput, T>, fn: (node: IAsyncDa
 export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable {
 
 	protected readonly tree: ObjectTree<IAsyncDataTreeNode<TInput, T>, TFilterData>;
+	private readonly model: IObjectTreeModel<IAsyncDataTreeNode<TInput, T> | null, TFilterData>;
 	protected readonly root: IAsyncDataTreeNode<TInput, T>;
 	private readonly nodes = new Map<null | T, IAsyncDataTreeNode<TInput, T>>();
 	private readonly sorter?: ITreeSorter<T>;
+	private readonly findController?: AsyncFindController<TInput, T, TFilterData>;
 	private readonly getDefaultCollapseState: { (e: T): undefined | ObjectTreeElementCollapseState.PreserveOrCollapsed | ObjectTreeElementCollapseState.PreserveOrExpanded };
 
 	private readonly subTreeRefreshPromises = new Map<IAsyncDataTreeNode<TInput, T>, Promise<void>>();
@@ -362,7 +740,7 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
 
 	get onDidUpdateOptions(): Event<IAsyncDataTreeOptionsUpdate> { return this.tree.onDidUpdateOptions; }
 
-	get onDidChangeFindOpenState(): Event<boolean> { return this.tree.onDidChangeFindOpenState; }
+	readonly onDidChangeFindOpenState: Event<boolean>;
 	get onDidChangeStickyScrollFocused(): Event<boolean> { return this.tree.onDidChangeStickyScrollFocused; }
 
 	get findMode(): TreeFindMode { return this.tree.findMode; }
@@ -397,9 +775,16 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
 		this.sorter = options.sorter;
 		this.getDefaultCollapseState = e => options.collapseByDefault ? (options.collapseByDefault(e) ? ObjectTreeElementCollapseState.PreserveOrCollapsed : ObjectTreeElementCollapseState.PreserveOrExpanded) : undefined;
 
-		this.tree = this.createTree(user, container, delegate, renderers, options);
-		this.onDidChangeFindMode = this.tree.onDidChangeFindMode;
-		this.onDidChangeFindMatchType = this.tree.onDidChangeFindMatchType;
+		let asyncFindEnabled = false;
+		if (options.findResultsProvider && (options.findWidgetEnabled ?? true) && options.keyboardNavigationLabelProvider && options.contextViewProvider) {
+			if (!this.dataSource.getParent || !this.identityProvider) {
+				throw new TreeError(this.user, 'Find Provider requires `getParent` and `identityProvider`');
+			}
+			asyncFindEnabled = true;
+		}
+
+		this.tree = this.createTree(user, container, delegate, renderers, { ...options, findWidgetEnabled: !asyncFindEnabled });
+		this.model = this.tree.getModel() as IObjectTreeModel<IAsyncDataTreeNode<TInput, T> | null, TFilterData>;
 
 		this.root = createAsyncDataTreeNode({
 			element: undefined!,
@@ -418,6 +803,20 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
 		this.nodes.set(null, this.root);
 
 		this.tree.onDidChangeCollapseState(this._onDidChangeCollapseState, this, this.disposables);
+
+		if (asyncFindEnabled) {
+			const findFilter = this.disposables.add(new AsyncFindFilter<TInput, T>(options.keyboardNavigationLabelProvider as any, this.tree.options.filter as ITreeFilter<IAsyncDataTreeNode<TInput, T>, FuzzyScore>));
+			const findOptions = { styles: options.findWidgetStyles, showNotFoundMessage: options.showNotFoundMessage };
+			this.findController = this.disposables.add(new AsyncFindController(user, this.tree, options.findResultsProvider!, findFilter!, this.sorter, this.dataSource, this.identityProvider!, options.contextViewProvider!, findOptions, node => this.asTreeElement(node)));
+
+			this.onDidChangeFindOpenState = this.findController!.onDidChangeOpenState;
+			this.onDidChangeFindMode = Event.None;
+			this.onDidChangeFindMatchType = Event.None;
+		} else {
+			this.onDidChangeFindOpenState = this.tree.onDidChangeFindOpenState;
+			this.onDidChangeFindMode = this.tree.onDidChangeFindMode;
+			this.onDidChangeFindMatchType = this.tree.onDidChangeFindMatchType;
+		}
 	}
 
 	protected createTree(
@@ -504,8 +903,24 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
 		this.tree.domFocus();
 	}
 
+	isDOMFocused(): boolean {
+		return this.tree.isDOMFocused();
+	}
+
+	navigate(start?: T) {
+		let startNode;
+		if (start) {
+			startNode = this.getDataNode(start);
+		}
+		return new AsyncDataTreeNavigator(this.tree.navigate(startNode));
+	}
+
 	layout(height?: number, width?: number): void {
 		this.tree.layout(height, width);
+
+		if (isNumber(width)) {
+			this.findController?.layout(width);
+		}
 	}
 
 	style(styles: IListStyles): void {
@@ -566,11 +981,7 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
 	}
 
 	resort(element: TInput | T = this.root.element, recursive = true): void {
-		this.tree.resort(this.getDataNode(element), recursive);
-	}
-
-	hasElement(element: TInput | T): boolean {
-		return this.tree.hasElement(this.getDataNode(element));
+		this.model.resort(this.getDataNode(element), recursive);
 	}
 
 	hasNode(element: TInput | T): boolean {
@@ -694,11 +1105,19 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
 	}
 
 	openFind(): void {
-		this.tree.openFind();
+		if (this.findController) {
+			this.findController.open();
+		} else {
+			this.tree.openFind();
+		}
 	}
 
 	closeFind(): void {
-		this.tree.closeFind();
+		if (this.findController) {
+			this.findController.close();
+		} else {
+			this.tree.closeFind();
+		}
 	}
 
 	refilter(): void {
@@ -790,7 +1209,13 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
 
 	// Implementation
 
-	private getDataNode(element: TInput | T): IAsyncDataTreeNode<TInput, T> {
+	protected getDataNode(element: TInput | T): IAsyncDataTreeNode<TInput, T> {
+		const asyncFindNode: IAsyncDataTreeNode<TInput, T> | undefined = this.findController?.getDataNode(element);
+
+		if (asyncFindNode) {
+			return asyncFindNode;
+		}
+
 		const node: IAsyncDataTreeNode<TInput, T> | undefined = this.nodes.get((element === this.root.element ? null : element) as T);
 
 		if (!node) {
@@ -882,8 +1307,8 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
 			const children = await childrenPromise;
 			return this.setChildren(node, children, recursive, viewStateContext);
 		} catch (err) {
-			if (node !== this.root && this.tree.hasElement(node)) {
-				this.tree.collapse(node);
+			if (node !== this.root && this.model.has(node)) {
+				this.model.setCollapsed(node);
 			}
 
 			if (isCancellationError(err)) {
@@ -945,7 +1370,7 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
 			nodesToForget.set(child.element as T, child);
 
 			if (this.identityProvider) {
-				childrenTreeNodesById.set(child.id!, { node: child, collapsed: this.tree.hasElement(child) && this.tree.isCollapsed(child) });
+				childrenTreeNodesById.set(child.id!, { node: child, collapsed: this.model.has(child) && this.model.isCollapsed(child) });
 			}
 		}
 
@@ -1041,10 +1466,10 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
 			}
 		};
 
-		this.tree.setChildren(node === this.root ? null : node, children, objectTreeOptions);
+		this.model.setChildren(node === this.root ? null : node, children, objectTreeOptions);
 
 		if (node !== this.root) {
-			this.tree.setCollapsible(node, node.hasChildren);
+			this.model.setCollapsible(node, node.hasChildren);
 		}
 
 		this._onDidRender.fire();
@@ -1245,6 +1670,11 @@ export class CompressibleAsyncDataTree<TInput, T, TFilterData = void> extends As
 		this.filter = options.filter;
 	}
 
+	getCompressedTreeNode(e: T | TInput) {
+		const node = this.getDataNode(e);
+		return this.tree.getCompressedTreeNode(node).element;
+	}
+
 	protected override createTree(
 		user: string,
 		container: HTMLElement,
@@ -1390,6 +1820,19 @@ export class CompressibleAsyncDataTree<TInput, T, TFilterData = void> extends As
 
 		return super.processChildren(children);
 	}
+
+	override navigate(start?: T): AsyncDataTreeNavigator<TInput, T> {
+		// Assumptions are made about how tree navigation works in compressed trees
+		// These assumptions may be wrong and we should revisit this when needed
+
+		// Example:	[a, b/ba, ba.txt]
+		// - previous(ba) => a
+		// - previous(b) => a
+		// - next(a) => ba
+		// - next(b) => ba
+		// - next(ba) => ba.txt
+		return super.navigate(start);
+	}
 }
 
 function getVisibility<TFilterData>(filterResult: TreeFilterResult<TFilterData>): TreeVisibility {
@@ -1401,3 +1844,37 @@ function getVisibility<TFilterData>(filterResult: TreeFilterResult<TFilterData>)
 		return getVisibleState(filterResult);
 	}
 }
+
+class AsyncDataTreeNavigator<TInput, T> implements ITreeNavigator<T> {
+
+	constructor(private navigator: ITreeNavigator<IAsyncDataTreeNode<TInput, T> | null>) { }
+
+	current(): T | null {
+		const current = this.navigator.current();
+		if (current === null) {
+			return null;
+		}
+
+		return current.element as T;
+	}
+
+	previous(): T | null {
+		this.navigator.previous();
+		return this.current();
+	}
+
+	first(): T | null {
+		this.navigator.first();
+		return this.current();
+	}
+
+	last(): T | null {
+		this.navigator.last();
+		return this.current();
+	}
+
+	next(): T | null {
+		this.navigator.next();
+		return this.current();
+	}
+}
diff --git a/src/vs/base/browser/ui/tree/compressedObjectTreeModel.ts b/src/vs/base/browser/ui/tree/compressedObjectTreeModel.ts
index c7a6f5e0634..f8057a418c0 100644
--- a/src/vs/base/browser/ui/tree/compressedObjectTreeModel.ts
+++ b/src/vs/base/browser/ui/tree/compressedObjectTreeModel.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IIdentityProvider } from 'vs/base/browser/ui/list/list';
-import { IIndexTreeModelSpliceOptions, IList } from 'vs/base/browser/ui/tree/indexTreeModel';
-import { IObjectTreeModel, IObjectTreeModelOptions, IObjectTreeModelSetChildrenOptions, ObjectTreeModel } from 'vs/base/browser/ui/tree/objectTreeModel';
-import { ICollapseStateChangeEvent, IObjectTreeElement, ITreeModel, ITreeModelSpliceEvent, ITreeNode, TreeError, TreeFilterResult, TreeVisibility, WeakMapper } from 'vs/base/browser/ui/tree/tree';
-import { equals } from 'vs/base/common/arrays';
-import { Event } from 'vs/base/common/event';
-import { Iterable } from 'vs/base/common/iterator';
+import { IIdentityProvider } from '../list/list.js';
+import { getVisibleState, IIndexTreeModelSpliceOptions, isFilterResult } from './indexTreeModel.js';
+import { IObjectTreeModel, IObjectTreeModelOptions, IObjectTreeModelSetChildrenOptions, ObjectTreeModel } from './objectTreeModel.js';
+import { ICollapseStateChangeEvent, IObjectTreeElement, ITreeListSpliceData, ITreeModel, ITreeModelSpliceEvent, ITreeNode, TreeError, TreeFilterResult, TreeVisibility, WeakMapper } from './tree.js';
+import { equals } from '../../../common/arrays.js';
+import { Event } from '../../../common/event.js';
+import { Iterable } from '../../../common/iterator.js';
 
 // Exported only for test reasons, do not use directly
 export interface ICompressedTreeElement<T> extends IObjectTreeElement<T> {
@@ -121,7 +121,8 @@ export class CompressedObjectTreeModel<T extends NonNullable<any>, TFilterData e
 
 	readonly rootRef = null;
 
-	get onDidSplice(): Event<ITreeModelSpliceEvent<ICompressedTreeNode<T> | null, TFilterData>> { return this.model.onDidSplice; }
+	get onDidSpliceRenderedNodes(): Event<ITreeListSpliceData<ICompressedTreeNode<T> | null, TFilterData>> { return this.model.onDidSpliceRenderedNodes; }
+	get onDidSpliceModel(): Event<ITreeModelSpliceEvent<ICompressedTreeNode<T> | null, TFilterData>> { return this.model.onDidSpliceModel; }
 	get onDidChangeCollapseState(): Event<ICollapseStateChangeEvent<ICompressedTreeNode<T>, TFilterData>> { return this.model.onDidChangeCollapseState; }
 	get onDidChangeRenderNodeCount(): Event<ITreeNode<ICompressedTreeNode<T>, TFilterData>> { return this.model.onDidChangeRenderNodeCount; }
 
@@ -134,10 +135,9 @@ export class CompressedObjectTreeModel<T extends NonNullable<any>, TFilterData e
 
 	constructor(
 		private user: string,
-		list: IList<ITreeNode<ICompressedTreeNode<T>, TFilterData>>,
 		options: ICompressedObjectTreeModelOptions<T, TFilterData> = {}
 	) {
-		this.model = new ObjectTreeModel(user, list, options);
+		this.model = new ObjectTreeModel(user, options);
 		this.enabled = typeof options.compressionEnabled === 'undefined' ? true : options.compressionEnabled;
 		this.identityProvider = options.identityProvider;
 	}
@@ -324,16 +324,6 @@ export class CompressedObjectTreeModel<T extends NonNullable<any>, TFilterData e
 		this.model.rerender(compressedNode);
 	}
 
-	updateElementHeight(element: T, height: number): void {
-		const compressedNode = this.getCompressedNode(element);
-
-		if (!compressedNode) {
-			return;
-		}
-
-		this.model.updateElementHeight(compressedNode, height);
-	}
-
 	refilter(): void {
 		this.model.refilter();
 	}
@@ -384,17 +374,6 @@ class CompressedTreeNodeWrapper<T, TFilterData> implements ITreeNode<T | null, T
 	) { }
 }
 
-function mapList<T, TFilterData>(nodeMapper: CompressedNodeWeakMapper<T, TFilterData>, list: IList<ITreeNode<T, TFilterData>>): IList<ITreeNode<ICompressedTreeNode<T>, TFilterData>> {
-	return {
-		splice(start: number, deleteCount: number, toInsert: ITreeNode<ICompressedTreeNode<T>, TFilterData>[]): void {
-			list.splice(start, deleteCount, toInsert.map(node => nodeMapper.map(node)) as ITreeNode<T, TFilterData>[]);
-		},
-		updateElementHeight(index: number, height: number): void {
-			list.updateElementHeight(index, height);
-		}
-	};
-}
-
 function mapOptions<T, TFilterData>(compressedNodeUnwrapper: CompressedNodeUnwrapper<T>, options: ICompressibleObjectTreeModelOptions<T, TFilterData>): ICompressedObjectTreeModelOptions<T, TFilterData> {
 	return {
 		...options,
@@ -410,7 +389,12 @@ function mapOptions<T, TFilterData>(compressedNodeUnwrapper: CompressedNodeUnwra
 		},
 		filter: options.filter && {
 			filter(node: ICompressedTreeNode<T>, parentVisibility: TreeVisibility): TreeFilterResult<TFilterData> {
-				return options.filter!.filter(compressedNodeUnwrapper(node), parentVisibility);
+				const elements = node.elements;
+				for (let i = 0; i < elements.length - 1; i++) {
+					const result = options.filter!.filter(elements[i], parentVisibility);
+					parentVisibility = getVisibleState(isFilterResult(result) ? result.visibility : result);
+				}
+				return options.filter!.filter(elements[elements.length - 1], parentVisibility);
 			}
 		}
 	};
@@ -425,13 +409,21 @@ export class CompressibleObjectTreeModel<T extends NonNullable<any>, TFilterData
 
 	readonly rootRef = null;
 
-	get onDidSplice(): Event<ITreeModelSpliceEvent<T | null, TFilterData>> {
-		return Event.map(this.model.onDidSplice, ({ insertedNodes, deletedNodes }) => ({
+	get onDidSpliceModel(): Event<ITreeModelSpliceEvent<T | null, TFilterData>> {
+		return Event.map(this.model.onDidSpliceModel, ({ insertedNodes, deletedNodes }) => ({
 			insertedNodes: insertedNodes.map(node => this.nodeMapper.map(node)),
 			deletedNodes: deletedNodes.map(node => this.nodeMapper.map(node)),
 		}));
 	}
 
+	get onDidSpliceRenderedNodes(): Event<ITreeListSpliceData<T | null, TFilterData>> {
+		return Event.map(this.model.onDidSpliceRenderedNodes, ({ start, deleteCount, elements }) => ({
+			start,
+			deleteCount,
+			elements: elements.map(node => this.nodeMapper.map(node))
+		}));
+	}
+
 	get onDidChangeCollapseState(): Event<ICollapseStateChangeEvent<T | null, TFilterData>> {
 		return Event.map(this.model.onDidChangeCollapseState, ({ node, deep }) => ({
 			node: this.nodeMapper.map(node),
@@ -449,14 +441,13 @@ export class CompressibleObjectTreeModel<T extends NonNullable<any>, TFilterData
 
 	constructor(
 		user: string,
-		list: IList<ITreeNode<T, TFilterData>>,
 		options: ICompressibleObjectTreeModelOptions<T, TFilterData> = {}
 	) {
 		this.elementMapper = options.elementMapper || DefaultElementMapper;
 		const compressedNodeUnwrapper: CompressedNodeUnwrapper<T> = node => this.elementMapper(node.elements);
 		this.nodeMapper = new WeakMapper(node => new CompressedTreeNodeWrapper(compressedNodeUnwrapper, node));
 
-		this.model = new CompressedObjectTreeModel(user, mapList(this.nodeMapper, list), mapOptions(compressedNodeUnwrapper, options));
+		this.model = new CompressedObjectTreeModel(user, mapOptions(compressedNodeUnwrapper, options));
 	}
 
 	setChildren(
@@ -543,10 +534,6 @@ export class CompressibleObjectTreeModel<T extends NonNullable<any>, TFilterData
 		return this.model.rerender(location);
 	}
 
-	updateElementHeight(element: T, height: number): void {
-		this.model.updateElementHeight(element, height);
-	}
-
 	refilter(): void {
 		return this.model.refilter();
 	}
diff --git a/src/vs/base/browser/ui/tree/dataTree.ts b/src/vs/base/browser/ui/tree/dataTree.ts
index 06b8e2339ec..09eec7634ba 100644
--- a/src/vs/base/browser/ui/tree/dataTree.ts
+++ b/src/vs/base/browser/ui/tree/dataTree.ts
@@ -3,12 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IIdentityProvider, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { AbstractTree, AbstractTreeViewState, IAbstractTreeOptions } from 'vs/base/browser/ui/tree/abstractTree';
-import { IList } from 'vs/base/browser/ui/tree/indexTreeModel';
-import { ObjectTreeModel } from 'vs/base/browser/ui/tree/objectTreeModel';
-import { IDataSource, ITreeElement, ITreeModel, ITreeNode, ITreeRenderer, ITreeSorter, TreeError } from 'vs/base/browser/ui/tree/tree';
-import { Iterable } from 'vs/base/common/iterator';
+import { IIdentityProvider, IListVirtualDelegate } from '../list/list.js';
+import { AbstractTree, AbstractTreeViewState, IAbstractTreeOptions } from './abstractTree.js';
+import { ObjectTreeModel } from './objectTreeModel.js';
+import { IDataSource, ITreeElement, ITreeModel, ITreeNode, ITreeRenderer, ITreeSorter, TreeError } from './tree.js';
+import { Iterable } from '../../../common/iterator.js';
 
 export interface IDataTreeOptions<T, TFilterData = void> extends IAbstractTreeOptions<T, TFilterData> {
 	readonly sorter?: ITreeSorter<T>;
@@ -168,7 +167,7 @@ export class DataTree<TInput, T, TFilterData = void> extends AbstractTree<T | nu
 		return { elements, size: children.length };
 	}
 
-	protected createModel(user: string, view: IList<ITreeNode<T, TFilterData>>, options: IDataTreeOptions<T, TFilterData>): ITreeModel<T | null, TFilterData, T | null> {
-		return new ObjectTreeModel(user, view, options);
+	protected createModel(user: string, options: IDataTreeOptions<T, TFilterData>): ITreeModel<T | null, TFilterData, T | null> {
+		return new ObjectTreeModel(user, options);
 	}
 }
diff --git a/src/vs/base/browser/ui/tree/indexTree.ts b/src/vs/base/browser/ui/tree/indexTree.ts
index cf86858ca51..cc43faca89e 100644
--- a/src/vs/base/browser/ui/tree/indexTree.ts
+++ b/src/vs/base/browser/ui/tree/indexTree.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { AbstractTree, IAbstractTreeOptions } from 'vs/base/browser/ui/tree/abstractTree';
-import { IList, IndexTreeModel } from 'vs/base/browser/ui/tree/indexTreeModel';
-import { ITreeElement, ITreeModel, ITreeNode, ITreeRenderer } from 'vs/base/browser/ui/tree/tree';
-import { Iterable } from 'vs/base/common/iterator';
-import 'vs/css!./media/tree';
+import { IListVirtualDelegate } from '../list/list.js';
+import { AbstractTree, IAbstractTreeOptions } from './abstractTree.js';
+import { IndexTreeModel } from './indexTreeModel.js';
+import { ITreeElement, ITreeModel, ITreeRenderer, TreeError } from './tree.js';
+import { Iterable } from '../../../common/iterator.js';
+import './media/tree.css';
 
 export interface IIndexTreeOptions<T, TFilterData = void> extends IAbstractTreeOptions<T, TFilterData> { }
 
@@ -17,7 +17,7 @@ export class IndexTree<T, TFilterData = void> extends AbstractTree<T, TFilterDat
 	protected declare model: IndexTreeModel<T, TFilterData>;
 
 	constructor(
-		user: string,
+		private readonly user: string,
 		container: HTMLElement,
 		delegate: IListVirtualDelegate<T>,
 		renderers: ITreeRenderer<T, TFilterData, any>[],
@@ -41,10 +41,19 @@ export class IndexTree<T, TFilterData = void> extends AbstractTree<T, TFilterDat
 	}
 
 	updateElementHeight(location: number[], height: number): void {
-		this.model.updateElementHeight(location, height);
+		if (location.length === 0) {
+			throw new TreeError(this.user, `Update element height failed: invalid location`);
+		}
+
+		const elementIndex = this.model.getListIndex(location);
+		if (elementIndex === -1) {
+			return;
+		}
+
+		this.view.updateElementHeight(elementIndex, height);
 	}
 
-	protected createModel(user: string, view: IList<ITreeNode<T, TFilterData>>, options: IIndexTreeOptions<T, TFilterData>): ITreeModel<T, TFilterData, number[]> {
-		return new IndexTreeModel(user, view, this.rootElement, options);
+	protected createModel(user: string, options: IIndexTreeOptions<T, TFilterData>): ITreeModel<T, TFilterData, number[]> {
+		return new IndexTreeModel(user, this.rootElement, options);
 	}
 }
diff --git a/src/vs/base/browser/ui/tree/indexTreeModel.ts b/src/vs/base/browser/ui/tree/indexTreeModel.ts
index 219b7c143f1..776ed6cc054 100644
--- a/src/vs/base/browser/ui/tree/indexTreeModel.ts
+++ b/src/vs/base/browser/ui/tree/indexTreeModel.ts
@@ -3,15 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IIdentityProvider } from 'vs/base/browser/ui/list/list';
-import { ICollapseStateChangeEvent, ITreeElement, ITreeFilter, ITreeFilterDataResult, ITreeModel, ITreeModelSpliceEvent, ITreeNode, TreeError, TreeVisibility } from 'vs/base/browser/ui/tree/tree';
-import { splice, tail2 } from 'vs/base/common/arrays';
-import { Delayer } from 'vs/base/common/async';
-import { MicrotaskDelay } from 'vs/base/common/symbols';
-import { LcsDiff } from 'vs/base/common/diff/diff';
-import { Emitter, Event, EventBufferer } from 'vs/base/common/event';
-import { Iterable } from 'vs/base/common/iterator';
-import { ISpliceable } from 'vs/base/common/sequence';
+import { IIdentityProvider } from '../list/list.js';
+import { ICollapseStateChangeEvent, ITreeElement, ITreeFilter, ITreeFilterDataResult, ITreeListSpliceData, ITreeModel, ITreeModelSpliceEvent, ITreeNode, TreeError, TreeVisibility } from './tree.js';
+import { splice, tail2 } from '../../../common/arrays.js';
+import { Delayer } from '../../../common/async.js';
+import { MicrotaskDelay } from '../../../common/symbols.js';
+import { LcsDiff } from '../../../common/diff/diff.js';
+import { Emitter, Event, EventBufferer } from '../../../common/event.js';
+import { Iterable } from '../../../common/iterator.js';
 
 // Exported for tests
 export interface IIndexTreeNode<T, TFilterData = void> extends ITreeNode<T, TFilterData> {
@@ -90,10 +89,6 @@ function isCollapsibleStateUpdate(update: CollapseStateUpdate): update is Collap
 	return typeof (update as any).collapsible === 'boolean';
 }
 
-export interface IList<T> extends ISpliceable<T> {
-	updateElementHeight(index: number, height: number | undefined): void;
-}
-
 export class IndexTreeModel<T extends Exclude<any, undefined>, TFilterData = void> implements ITreeModel<T, TFilterData, number[]> {
 
 	readonly rootRef = [];
@@ -101,6 +96,12 @@ export class IndexTreeModel<T extends Exclude<any, undefined>, TFilterData = voi
 	private root: IIndexTreeNode<T, TFilterData>;
 	private eventBufferer = new EventBufferer();
 
+	private readonly _onDidSpliceModel = new Emitter<ITreeModelSpliceEvent<T, TFilterData>>();
+	readonly onDidSpliceModel = this._onDidSpliceModel.event;
+
+	private readonly _onDidSpliceRenderedNodes = new Emitter<ITreeListSpliceData<T, TFilterData>>();
+	readonly onDidSpliceRenderedNodes = this._onDidSpliceRenderedNodes.event;
+
 	private readonly _onDidChangeCollapseState = new Emitter<ICollapseStateChangeEvent<T, TFilterData>>();
 	readonly onDidChangeCollapseState: Event<ICollapseStateChangeEvent<T, TFilterData>> = this.eventBufferer.wrapEvent(this._onDidChangeCollapseState.event);
 
@@ -112,14 +113,10 @@ export class IndexTreeModel<T extends Exclude<any, undefined>, TFilterData = voi
 	private filter?: ITreeFilter<T, TFilterData>;
 	private autoExpandSingleChildren: boolean;
 
-	private readonly _onDidSplice = new Emitter<ITreeModelSpliceEvent<T, TFilterData>>();
-	readonly onDidSplice = this._onDidSplice.event;
-
 	private readonly refilterDelayer = new Delayer(MicrotaskDelay);
 
 	constructor(
 		private user: string,
-		private list: IList<ITreeNode<T, TFilterData>>,
 		rootElement: T,
 		options: IIndexTreeModelOptions<T, TFilterData> = {}
 	) {
@@ -305,7 +302,7 @@ export class IndexTreeModel<T extends Exclude<any, undefined>, TFilterData = voi
 			const visibleDeleteCount = deletedNodes.reduce((r, node) => r + (node.visible ? node.renderNodeCount : 0), 0);
 
 			this._updateAncestorsRenderNodeCount(parentNode, renderNodeCount - visibleDeleteCount);
-			this.list.splice(listIndex, visibleDeleteCount, treeListElementsToInsert);
+			this._onDidSpliceRenderedNodes.fire({ start: listIndex, deleteCount: visibleDeleteCount, elements: treeListElementsToInsert });
 		}
 
 		if (deletedNodes.length > 0 && onDidDeleteNode) {
@@ -317,7 +314,7 @@ export class IndexTreeModel<T extends Exclude<any, undefined>, TFilterData = voi
 			deletedNodes.forEach(visit);
 		}
 
-		this._onDidSplice.fire({ insertedNodes: nodesToInsert, deletedNodes });
+		this._onDidSpliceModel.fire({ insertedNodes: nodesToInsert, deletedNodes });
 
 		let node: IIndexTreeNode<T, TFilterData> | undefined = parentNode;
 
@@ -340,19 +337,10 @@ export class IndexTreeModel<T extends Exclude<any, undefined>, TFilterData = voi
 		const { node, listIndex, revealed } = this.getTreeNodeWithListIndex(location);
 
 		if (node.visible && revealed) {
-			this.list.splice(listIndex, 1, [node]);
+			this._onDidSpliceRenderedNodes.fire({ start: listIndex, deleteCount: 1, elements: [node] });
 		}
 	}
 
-	updateElementHeight(location: number[], height: number | undefined): void {
-		if (location.length === 0) {
-			throw new TreeError(this.user, 'Invalid tree location');
-		}
-
-		const { listIndex } = this.getTreeNodeWithListIndex(location);
-		this.list.updateElementHeight(listIndex, height);
-	}
-
 	has(location: number[]): boolean {
 		return this.hasTreeNode(location);
 	}
@@ -435,7 +423,7 @@ export class IndexTreeModel<T extends Exclude<any, undefined>, TFilterData = voi
 		const previousRenderNodeCount = node.renderNodeCount;
 		const toInsert = this.updateNodeAfterCollapseChange(node);
 		const deleteCount = previousRenderNodeCount - (listIndex === -1 ? 0 : 1);
-		this.list.splice(listIndex + 1, deleteCount, toInsert.slice(1));
+		this._onDidSpliceRenderedNodes.fire({ start: listIndex + 1, deleteCount: deleteCount, elements: toInsert.slice(1) });
 
 		return result;
 	}
@@ -488,7 +476,7 @@ export class IndexTreeModel<T extends Exclude<any, undefined>, TFilterData = voi
 	refilter(): void {
 		const previousRenderNodeCount = this.root.renderNodeCount;
 		const toInsert = this.updateNodeAfterFilterChange(this.root);
-		this.list.splice(0, previousRenderNodeCount, toInsert);
+		this._onDidSpliceRenderedNodes.fire({ start: 0, deleteCount: previousRenderNodeCount, elements: toInsert });
 		this.refilterDelayer.cancel();
 	}
 
diff --git a/src/vs/base/browser/ui/tree/objectTree.ts b/src/vs/base/browser/ui/tree/objectTree.ts
index 77164a042ac..8a2aa5df535 100644
--- a/src/vs/base/browser/ui/tree/objectTree.ts
+++ b/src/vs/base/browser/ui/tree/objectTree.ts
@@ -3,15 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IIdentityProvider, IKeyboardNavigationLabelProvider, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { AbstractTree, IAbstractTreeOptions, IAbstractTreeOptionsUpdate, IStickyScrollDelegate, StickyScrollNode } from 'vs/base/browser/ui/tree/abstractTree';
-import { CompressibleObjectTreeModel, ElementMapper, ICompressedTreeElement, ICompressedTreeNode } from 'vs/base/browser/ui/tree/compressedObjectTreeModel';
-import { IList } from 'vs/base/browser/ui/tree/indexTreeModel';
-import { IObjectTreeModel, ObjectTreeModel } from 'vs/base/browser/ui/tree/objectTreeModel';
-import { ICollapseStateChangeEvent, IObjectTreeElement, ITreeModel, ITreeNode, ITreeRenderer, ITreeSorter } from 'vs/base/browser/ui/tree/tree';
-import { memoize } from 'vs/base/common/decorators';
-import { Event } from 'vs/base/common/event';
-import { Iterable } from 'vs/base/common/iterator';
+import { IIdentityProvider, IKeyboardNavigationLabelProvider, IListVirtualDelegate } from '../list/list.js';
+import { AbstractTree, IAbstractTreeOptions, IAbstractTreeOptionsUpdate, IStickyScrollDelegate, StickyScrollNode } from './abstractTree.js';
+import { CompressibleObjectTreeModel, ElementMapper, ICompressedTreeElement, ICompressedTreeNode } from './compressedObjectTreeModel.js';
+import { IObjectTreeModel, ObjectTreeModel } from './objectTreeModel.js';
+import { ICollapseStateChangeEvent, IObjectTreeElement, ITreeModel, ITreeNode, ITreeRenderer, ITreeSorter } from './tree.js';
+import { memoize } from '../../../common/decorators.js';
+import { Event } from '../../../common/event.js';
+import { Iterable } from '../../../common/iterator.js';
 
 export interface IObjectTreeOptions<T, TFilterData = void> extends IAbstractTreeOptions<T, TFilterData> {
 	readonly sorter?: ITreeSorter<T>;
@@ -66,7 +65,12 @@ export class ObjectTree<T extends NonNullable<any>, TFilterData = void> extends
 	}
 
 	updateElementHeight(element: T, height: number | undefined): void {
-		this.model.updateElementHeight(element, height);
+		const elementIndex = this.model.getListIndex(element);
+		if (elementIndex === -1) {
+			return;
+		}
+
+		this.view.updateElementHeight(elementIndex, height);
 	}
 
 	resort(element: T | null, recursive = true): void {
@@ -77,8 +81,8 @@ export class ObjectTree<T extends NonNullable<any>, TFilterData = void> extends
 		return this.model.has(element);
 	}
 
-	protected createModel(user: string, view: IList<ITreeNode<T, TFilterData>>, options: IObjectTreeOptions<T, TFilterData>): ITreeModel<T | null, TFilterData, T | null> {
-		return new ObjectTreeModel(user, view, options);
+	protected createModel(user: string, options: IObjectTreeOptions<T, TFilterData>): ITreeModel<T | null, TFilterData, T | null> {
+		return new ObjectTreeModel(user, options);
 	}
 }
 
@@ -296,8 +300,8 @@ export class CompressibleObjectTree<T extends NonNullable<any>, TFilterData = vo
 		this.model.setChildren(element, children, options);
 	}
 
-	protected override createModel(user: string, view: IList<ITreeNode<T, TFilterData>>, options: ICompressibleObjectTreeOptions<T, TFilterData>): ITreeModel<T | null, TFilterData, T | null> {
-		return new CompressibleObjectTreeModel(user, view, options);
+	protected override createModel(user: string, options: ICompressibleObjectTreeOptions<T, TFilterData>): ITreeModel<T | null, TFilterData, T | null> {
+		return new CompressibleObjectTreeModel(user, options);
 	}
 
 	override updateOptions(optionsUpdate: ICompressibleObjectTreeOptionsUpdate = {}): void {
diff --git a/src/vs/base/browser/ui/tree/objectTreeModel.ts b/src/vs/base/browser/ui/tree/objectTreeModel.ts
index 919f14b2b3a..57bec495e51 100644
--- a/src/vs/base/browser/ui/tree/objectTreeModel.ts
+++ b/src/vs/base/browser/ui/tree/objectTreeModel.ts
@@ -3,18 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IIdentityProvider } from 'vs/base/browser/ui/list/list';
-import { IIndexTreeModelOptions, IIndexTreeModelSpliceOptions, IList, IndexTreeModel } from 'vs/base/browser/ui/tree/indexTreeModel';
-import { ICollapseStateChangeEvent, IObjectTreeElement, ITreeElement, ITreeModel, ITreeModelSpliceEvent, ITreeNode, ITreeSorter, ObjectTreeElementCollapseState, TreeError } from 'vs/base/browser/ui/tree/tree';
-import { Event } from 'vs/base/common/event';
-import { Iterable } from 'vs/base/common/iterator';
+import { IIdentityProvider } from '../list/list.js';
+import { IIndexTreeModelOptions, IIndexTreeModelSpliceOptions, IndexTreeModel } from './indexTreeModel.js';
+import { ICollapseStateChangeEvent, IObjectTreeElement, ITreeElement, ITreeListSpliceData, ITreeModel, ITreeModelSpliceEvent, ITreeNode, ITreeSorter, ObjectTreeElementCollapseState, TreeError } from './tree.js';
+import { Event } from '../../../common/event.js';
+import { Iterable } from '../../../common/iterator.js';
 
 export type ITreeNodeCallback<T, TFilterData> = (node: ITreeNode<T, TFilterData>) => void;
 
 export interface IObjectTreeModel<T extends NonNullable<any>, TFilterData extends NonNullable<any> = void> extends ITreeModel<T | null, TFilterData, T | null> {
 	setChildren(element: T | null, children: Iterable<IObjectTreeElement<T>> | undefined, options?: IObjectTreeModelSetChildrenOptions<T, TFilterData>): void;
 	resort(element?: T | null, recursive?: boolean): void;
-	updateElementHeight(element: T, height: number | undefined): void;
 }
 
 export interface IObjectTreeModelSetChildrenOptions<T, TFilterData> extends IIndexTreeModelSpliceOptions<T, TFilterData> {
@@ -35,7 +34,8 @@ export class ObjectTreeModel<T extends NonNullable<any>, TFilterData extends Non
 	private readonly identityProvider?: IIdentityProvider<T>;
 	private sorter?: ITreeSorter<{ element: T }>;
 
-	readonly onDidSplice: Event<ITreeModelSpliceEvent<T | null, TFilterData>>;
+	readonly onDidSpliceModel: Event<ITreeModelSpliceEvent<T | null, TFilterData>>;
+	readonly onDidSpliceRenderedNodes: Event<ITreeListSpliceData<T | null, TFilterData>>;
 	readonly onDidChangeCollapseState: Event<ICollapseStateChangeEvent<T, TFilterData>>;
 	readonly onDidChangeRenderNodeCount: Event<ITreeNode<T, TFilterData>>;
 
@@ -43,11 +43,11 @@ export class ObjectTreeModel<T extends NonNullable<any>, TFilterData extends Non
 
 	constructor(
 		private user: string,
-		list: IList<ITreeNode<T, TFilterData>>,
 		options: IObjectTreeModelOptions<T, TFilterData> = {}
 	) {
-		this.model = new IndexTreeModel(user, list, null, options);
-		this.onDidSplice = this.model.onDidSplice;
+		this.model = new IndexTreeModel(user, null, options);
+		this.onDidSpliceModel = this.model.onDidSpliceModel;
+		this.onDidSpliceRenderedNodes = this.model.onDidSpliceRenderedNodes;
 		this.onDidChangeCollapseState = this.model.onDidChangeCollapseState as Event<ICollapseStateChangeEvent<T, TFilterData>>;
 		this.onDidChangeRenderNodeCount = this.model.onDidChangeRenderNodeCount as Event<ITreeNode<T, TFilterData>>;
 
@@ -187,11 +187,6 @@ export class ObjectTreeModel<T extends NonNullable<any>, TFilterData extends Non
 		this.model.rerender(location);
 	}
 
-	updateElementHeight(element: T, height: number | undefined): void {
-		const location = this.getElementLocation(element);
-		this.model.updateElementHeight(location, height);
-	}
-
 	resort(element: T | null = null, recursive = true): void {
 		if (!this.sorter) {
 			return;
diff --git a/src/vs/base/browser/ui/tree/tree.ts b/src/vs/base/browser/ui/tree/tree.ts
index 34e95ff022f..81f96136cfa 100644
--- a/src/vs/base/browser/ui/tree/tree.ts
+++ b/src/vs/base/browser/ui/tree/tree.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDragAndDropData } from 'vs/base/browser/dnd';
-import { IMouseEvent } from 'vs/base/browser/mouseEvent';
-import { IListDragAndDrop, IListDragOverReaction, IListRenderer, ListDragOverEffectPosition, ListDragOverEffectType } from 'vs/base/browser/ui/list/list';
-import { ListViewTargetSector } from 'vs/base/browser/ui/list/listView';
-import { Event } from 'vs/base/common/event';
+import { IDragAndDropData } from '../../dnd.js';
+import { IMouseEvent } from '../../mouseEvent.js';
+import { IListDragAndDrop, IListDragOverReaction, IListRenderer, ListDragOverEffectPosition, ListDragOverEffectType } from '../list/list.js';
+import { ListViewTargetSector } from '../list/listView.js';
+import { Event } from '../../../common/event.js';
 
 export const enum TreeVisibility {
 
@@ -119,6 +119,12 @@ export interface ICollapseStateChangeEvent<T, TFilterData> {
 	deep: boolean;
 }
 
+export interface ITreeListSpliceData<T, TFilterData> {
+	start: number;
+	deleteCount: number;
+	elements: ITreeNode<T, TFilterData>[];
+}
+
 export interface ITreeModelSpliceEvent<T, TFilterData> {
 	insertedNodes: ITreeNode<T, TFilterData>[];
 	deletedNodes: ITreeNode<T, TFilterData>[];
@@ -127,7 +133,8 @@ export interface ITreeModelSpliceEvent<T, TFilterData> {
 export interface ITreeModel<T, TFilterData, TRef> {
 	readonly rootRef: TRef;
 
-	readonly onDidSplice: Event<ITreeModelSpliceEvent<T, TFilterData>>;
+	readonly onDidSpliceModel: Event<ITreeModelSpliceEvent<T, TFilterData>>;
+	readonly onDidSpliceRenderedNodes: Event<ITreeListSpliceData<T, TFilterData>>;
 	readonly onDidChangeCollapseState: Event<ICollapseStateChangeEvent<T, TFilterData>>;
 	readonly onDidChangeRenderNodeCount: Event<ITreeNode<T, TFilterData>>;
 
diff --git a/src/vs/base/browser/ui/tree/treeDefaults.ts b/src/vs/base/browser/ui/tree/treeDefaults.ts
index dde8e1e0a3b..0d9950bb43a 100644
--- a/src/vs/base/browser/ui/tree/treeDefaults.ts
+++ b/src/vs/base/browser/ui/tree/treeDefaults.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { AsyncDataTree } from 'vs/base/browser/ui/tree/asyncDataTree';
-import { Action } from 'vs/base/common/actions';
-import * as nls from 'vs/nls';
+import { AsyncDataTree } from './asyncDataTree.js';
+import { Action } from '../../../common/actions.js';
+import * as nls from '../../../../nls.js';
 
 export class CollapseAllAction<TInput, T, TFilterData = void> extends Action {
 
@@ -13,7 +13,7 @@ export class CollapseAllAction<TInput, T, TFilterData = void> extends Action {
 		super('vs.tree.collapse', nls.localize('collapse all', "Collapse All"), 'collapse-all', enabled);
 	}
 
-	override async run(): Promise<any> {
+	override async run(): Promise<void> {
 		this.viewer.collapseAll();
 		this.viewer.setSelection([]);
 		this.viewer.setFocus([]);
diff --git a/src/vs/base/browser/ui/widget.ts b/src/vs/base/browser/ui/widget.ts
index 440a9ace259..b27b3ca9794 100644
--- a/src/vs/base/browser/ui/widget.ts
+++ b/src/vs/base/browser/ui/widget.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { IKeyboardEvent, StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { IMouseEvent, StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { Gesture } from 'vs/base/browser/touch';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
+import * as dom from '../dom.js';
+import { IKeyboardEvent, StandardKeyboardEvent } from '../keyboardEvent.js';
+import { IMouseEvent, StandardMouseEvent } from '../mouseEvent.js';
+import { Gesture } from '../touch.js';
+import { Disposable, IDisposable } from '../../common/lifecycle.js';
 
 export abstract class Widget extends Disposable {
 
diff --git a/src/vs/base/common/actions.ts b/src/vs/base/common/actions.ts
index a1fd3249a18..5a271b2bdc8 100644
--- a/src/vs/base/common/actions.ts
+++ b/src/vs/base/common/actions.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import * as nls from 'vs/nls';
+import { Emitter, Event } from './event.js';
+import { Disposable, IDisposable } from './lifecycle.js';
+import * as nls from '../../nls.js';
 
 export interface ITelemetryData {
 	readonly from?: string;
diff --git a/src/vs/base/common/amd.ts b/src/vs/base/common/amd.ts
deleted file mode 100644
index 6d228840331..00000000000
--- a/src/vs/base/common/amd.ts
+++ /dev/null
@@ -1,163 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-// ESM-comment-begin
-export const isESM = false;
-// ESM-comment-end
-// ESM-uncomment-begin
-// export const isESM = true;
-// ESM-uncomment-end
-
-export const enum LoaderEventType {
-	LoaderAvailable = 1,
-
-	BeginLoadingScript = 10,
-	EndLoadingScriptOK = 11,
-	EndLoadingScriptError = 12,
-
-	BeginInvokeFactory = 21,
-	EndInvokeFactory = 22,
-
-	NodeBeginEvaluatingScript = 31,
-	NodeEndEvaluatingScript = 32,
-
-	NodeBeginNativeRequire = 33,
-	NodeEndNativeRequire = 34,
-
-	CachedDataFound = 60,
-	CachedDataMissed = 61,
-	CachedDataRejected = 62,
-	CachedDataCreated = 63,
-}
-
-export abstract class LoaderStats {
-	abstract get amdLoad(): [string, number][];
-	abstract get amdInvoke(): [string, number][];
-	abstract get nodeRequire(): [string, number][];
-	abstract get nodeEval(): [string, number][];
-	abstract get nodeRequireTotal(): number;
-
-	static get(): LoaderStats {
-		const amdLoadScript = new Map<string, number>();
-		const amdInvokeFactory = new Map<string, number>();
-		const nodeRequire = new Map<string, number>();
-		const nodeEval = new Map<string, number>();
-
-		function mark(map: Map<string, number>, stat: LoaderEvent) {
-			if (map.has(stat.detail)) {
-				// console.warn('BAD events, DOUBLE start', stat);
-				// map.delete(stat.detail);
-				return;
-			}
-			map.set(stat.detail, -stat.timestamp);
-		}
-
-		function diff(map: Map<string, number>, stat: LoaderEvent) {
-			const duration = map.get(stat.detail);
-			if (!duration) {
-				// console.warn('BAD events, end WITHOUT start', stat);
-				// map.delete(stat.detail);
-				return;
-			}
-			if (duration >= 0) {
-				// console.warn('BAD events, DOUBLE end', stat);
-				// map.delete(stat.detail);
-				return;
-			}
-			map.set(stat.detail, duration + stat.timestamp);
-		}
-
-		let stats: readonly LoaderEvent[] = [];
-		if (typeof require === 'function' && typeof require.getStats === 'function') {
-			stats = require.getStats().slice(0).sort((a, b) => a.timestamp - b.timestamp);
-		}
-
-		for (const stat of stats) {
-			switch (stat.type) {
-				case LoaderEventType.BeginLoadingScript:
-					mark(amdLoadScript, stat);
-					break;
-				case LoaderEventType.EndLoadingScriptOK:
-				case LoaderEventType.EndLoadingScriptError:
-					diff(amdLoadScript, stat);
-					break;
-
-				case LoaderEventType.BeginInvokeFactory:
-					mark(amdInvokeFactory, stat);
-					break;
-				case LoaderEventType.EndInvokeFactory:
-					diff(amdInvokeFactory, stat);
-					break;
-
-				case LoaderEventType.NodeBeginNativeRequire:
-					mark(nodeRequire, stat);
-					break;
-				case LoaderEventType.NodeEndNativeRequire:
-					diff(nodeRequire, stat);
-					break;
-
-				case LoaderEventType.NodeBeginEvaluatingScript:
-					mark(nodeEval, stat);
-					break;
-				case LoaderEventType.NodeEndEvaluatingScript:
-					diff(nodeEval, stat);
-					break;
-			}
-		}
-
-		let nodeRequireTotal = 0;
-		nodeRequire.forEach(value => nodeRequireTotal += value);
-
-		function to2dArray(map: Map<string, number>): [string, number][] {
-			const res: [string, number][] = [];
-			map.forEach((value, index) => res.push([index, value]));
-			return res;
-		}
-
-		return {
-			amdLoad: to2dArray(amdLoadScript),
-			amdInvoke: to2dArray(amdInvokeFactory),
-			nodeRequire: to2dArray(nodeRequire),
-			nodeEval: to2dArray(nodeEval),
-			nodeRequireTotal
-		};
-	}
-
-	static toMarkdownTable(header: string[], rows: Array<Array<{ toString(): string } | undefined>>): string {
-		let result = '';
-
-		const lengths: number[] = [];
-		header.forEach((cell, ci) => {
-			lengths[ci] = cell.length;
-		});
-		rows.forEach(row => {
-			row.forEach((cell, ci) => {
-				if (typeof cell === 'undefined') {
-					cell = row[ci] = '-';
-				}
-				const len = cell.toString().length;
-				lengths[ci] = Math.max(len, lengths[ci]);
-			});
-		});
-
-		// header
-		header.forEach((cell, ci) => { result += `| ${cell + ' '.repeat(lengths[ci] - cell.toString().length)} `; });
-		result += '|\n';
-		header.forEach((_cell, ci) => { result += `| ${'-'.repeat(lengths[ci])} `; });
-		result += '|\n';
-
-		// cells
-		rows.forEach(row => {
-			row.forEach((cell, ci) => {
-				if (typeof cell !== 'undefined') {
-					result += `| ${cell + ' '.repeat(lengths[ci] - cell.toString().length)} `;
-				}
-			});
-			result += '|\n';
-		});
-
-		return result;
-	}
-}
diff --git a/src/vs/base/common/arrays.ts b/src/vs/base/common/arrays.ts
index 52e542c0eb8..9035ffd9f18 100644
--- a/src/vs/base/common/arrays.ts
+++ b/src/vs/base/common/arrays.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { CancellationError } from 'vs/base/common/errors';
-import { ISplice } from 'vs/base/common/sequence';
-import { findFirstIdxMonotonousOrArrLen } from './arraysFind';
+import { findFirstIdxMonotonousOrArrLen } from './arraysFind.js';
+import { CancellationToken } from './cancellation.js';
+import { CancellationError } from './errors.js';
+import { ISplice } from './sequence.js';
 
 /**
  * Returns the last element of an array.
@@ -361,7 +361,7 @@ export function coalesceInPlace<T>(array: Array<T | undefined | null>): asserts
 /**
  * @deprecated Use `Array.copyWithin` instead
  */
-export function move(array: any[], from: number, to: number): void {
+export function move(array: unknown[], from: number, to: number): void {
 	array.splice(to, 0, array.splice(from, 1)[0]);
 }
 
@@ -385,7 +385,7 @@ export function isNonEmptyArray<T>(obj: T[] | readonly T[] | undefined | null):
  * Removes duplicates from the given array. The optional keyFn allows to specify
  * how elements are checked for equality by returning an alternate value for each.
  */
-export function distinct<T>(array: ReadonlyArray<T>, keyFn: (value: T) => any = value => value): T[] {
+export function distinct<T>(array: ReadonlyArray<T>, keyFn: (value: T) => unknown = value => value): T[] {
 	const seen = new Set<any>();
 
 	return array.filter(element => {
@@ -413,18 +413,6 @@ export function uniqueFilter<T, R>(keyFn: (t: T) => R): (t: T) => boolean {
 	};
 }
 
-export function firstOrDefault<T, NotFound = T>(array: ReadonlyArray<T>, notFoundValue: NotFound): T | NotFound;
-export function firstOrDefault<T>(array: ReadonlyArray<T>): T | undefined;
-export function firstOrDefault<T, NotFound = T>(array: ReadonlyArray<T>, notFoundValue?: NotFound): T | NotFound | undefined {
-	return array.length > 0 ? array[0] : notFoundValue;
-}
-
-export function lastOrDefault<T, NotFound = T>(array: ReadonlyArray<T>, notFoundValue: NotFound): T | NotFound;
-export function lastOrDefault<T>(array: ReadonlyArray<T>): T | undefined;
-export function lastOrDefault<T, NotFound = T>(array: ReadonlyArray<T>, notFoundValue?: NotFound): T | NotFound | undefined {
-	return array.length > 0 ? array[array.length - 1] : notFoundValue;
-}
-
 export function commonPrefixLength<T>(one: ReadonlyArray<T>, other: ReadonlyArray<T>, equals: (a: T, b: T) => boolean = (a, b) => a === b): number {
 	let result = 0;
 
@@ -885,3 +873,18 @@ export class Permutation {
 		return new Permutation(inverseIndexMap);
 	}
 }
+
+/**
+ * Asynchronous variant of `Array.find()`, returning the first element in
+ * the array for which the predicate returns true.
+ *
+ * This implementation does not bail early and waits for all promises to
+ * resolve before returning.
+ */
+export async function findAsync<T>(array: readonly T[], predicate: (element: T, index: number) => Promise<boolean>): Promise<T | undefined> {
+	const results = await Promise.all(array.map(
+		async (element, index) => ({ element, ok: await predicate(element, index) })
+	));
+
+	return results.find(r => r.ok)?.element;
+}
diff --git a/src/vs/base/common/arraysFind.ts b/src/vs/base/common/arraysFind.ts
index 1dd102e9e72..176d5e69b1b 100644
--- a/src/vs/base/common/arraysFind.ts
+++ b/src/vs/base/common/arraysFind.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Comparator } from './arrays';
+import { Comparator } from './arrays.js';
 
 export function findLast<T>(array: readonly T[], predicate: (item: T) => boolean): T | undefined {
 	const idx = findLastIdx(array, predicate);
diff --git a/src/vs/base/common/assert.ts b/src/vs/base/common/assert.ts
index bbd344d55c7..b185897f614 100644
--- a/src/vs/base/common/assert.ts
+++ b/src/vs/base/common/assert.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BugIndicatingError, onUnexpectedError } from 'vs/base/common/errors';
+import { BugIndicatingError, onUnexpectedError } from './errors.js';
 
 /**
  * Throws an error with the provided message if the provided value does not evaluate to a true Javascript value.
diff --git a/src/vs/base/common/async.ts b/src/vs/base/common/async.ts
index bf6342078da..b96e6a9592d 100644
--- a/src/vs/base/common/async.ts
+++ b/src/vs/base/common/async.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { BugIndicatingError, CancellationError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableMap, DisposableStore, IDisposable, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { extUri as defaultExtUri, IExtUri } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { setTimeout0 } from 'vs/base/common/platform';
-import { MicrotaskDelay } from './symbols';
-import { Lazy } from 'vs/base/common/lazy';
+import { CancellationToken, CancellationTokenSource } from './cancellation.js';
+import { BugIndicatingError, CancellationError } from './errors.js';
+import { Emitter, Event } from './event.js';
+import { Disposable, DisposableMap, DisposableStore, IDisposable, MutableDisposable, toDisposable } from './lifecycle.js';
+import { extUri as defaultExtUri, IExtUri } from './resources.js';
+import { URI } from './uri.js';
+import { setTimeout0 } from './platform.js';
+import { MicrotaskDelay } from './symbols.js';
+import { Lazy } from './lazy.js';
 
 export function isThenable<T>(obj: unknown): obj is Promise<T> {
 	return !!obj && typeof (obj as unknown as Promise<T>).then === 'function';
diff --git a/src/vs/base/common/buffer.ts b/src/vs/base/common/buffer.ts
index 08736ab8c0b..7f8e1b34a81 100644
--- a/src/vs/base/common/buffer.ts
+++ b/src/vs/base/common/buffer.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Lazy } from 'vs/base/common/lazy';
-import * as streams from 'vs/base/common/stream';
+import { Lazy } from './lazy.js';
+import * as streams from './stream.js';
 
 declare const Buffer: any;
 
diff --git a/src/vs/base/common/cache.ts b/src/vs/base/common/cache.ts
index 03abbaf8ebe..9bdb47acd26 100644
--- a/src/vs/base/common/cache.ts
+++ b/src/vs/base/common/cache.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { IDisposable } from 'vs/base/common/lifecycle';
+import { CancellationToken, CancellationTokenSource } from './cancellation.js';
+import { IDisposable } from './lifecycle.js';
 
 export interface CacheResult<T> extends IDisposable {
 	promise: Promise<T>;
diff --git a/src/vs/base/common/cancellation.ts b/src/vs/base/common/cancellation.ts
index 4b45fd2803b..c5b8133ae6c 100644
--- a/src/vs/base/common/cancellation.ts
+++ b/src/vs/base/common/cancellation.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
+import { Emitter, Event } from './event.js';
+import { DisposableStore, IDisposable } from './lifecycle.js';
 
 export interface CancellationToken {
 
diff --git a/src/vs/base/common/codicons.ts b/src/vs/base/common/codicons.ts
index 6919e4934a2..b84311aa211 100644
--- a/src/vs/base/common/codicons.ts
+++ b/src/vs/base/common/codicons.ts
@@ -2,9 +2,9 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { ThemeIcon } from 'vs/base/common/themables';
-import { register } from 'vs/base/common/codiconsUtil';
-import { codiconsLibrary } from 'vs/base/common/codiconsLibrary';
+import { ThemeIcon } from './themables.js';
+import { register } from './codiconsUtil.js';
+import { codiconsLibrary } from './codiconsLibrary.js';
 
 
 /**
diff --git a/src/vs/base/common/codiconsLibrary.ts b/src/vs/base/common/codiconsLibrary.ts
index 599873fbacf..6c973bbd9cc 100644
--- a/src/vs/base/common/codiconsLibrary.ts
+++ b/src/vs/base/common/codiconsLibrary.ts
@@ -2,7 +2,7 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { register } from 'vs/base/common/codiconsUtil';
+import { register } from './codiconsUtil.js';
 
 
 // This file is automatically generated by (microsoft/vscode-codicons)/scripts/export-to-ts.js
diff --git a/src/vs/base/common/codiconsUtil.ts b/src/vs/base/common/codiconsUtil.ts
index ce7f9b2dafb..74177b0e760 100644
--- a/src/vs/base/common/codiconsUtil.ts
+++ b/src/vs/base/common/codiconsUtil.ts
@@ -2,8 +2,8 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { ThemeIcon } from 'vs/base/common/themables';
-import { isString } from 'vs/base/common/types';
+import { ThemeIcon } from './themables.js';
+import { isString } from './types.js';
 
 
 const _codiconFontCharacters: { [id: string]: number } = Object.create(null);
diff --git a/src/vs/base/common/collections.ts b/src/vs/base/common/collections.ts
index 0b306144e5e..f9bdf9a3b7d 100644
--- a/src/vs/base/common/collections.ts
+++ b/src/vs/base/common/collections.ts
@@ -32,7 +32,7 @@ export function groupBy<K extends string | number | symbol, V>(data: V[], groupF
 	return result;
 }
 
-export function diffSets<T>(before: Set<T>, after: Set<T>): { removed: T[]; added: T[] } {
+export function diffSets<T>(before: ReadonlySet<T>, after: ReadonlySet<T>): { removed: T[]; added: T[] } {
 	const removed: T[] = [];
 	const added: T[] = [];
 	for (const element of before) {
@@ -80,3 +80,61 @@ export function intersection<T>(setA: Set<T>, setB: Iterable<T>): Set<T> {
 	}
 	return result;
 }
+
+export class SetWithKey<T> implements Set<T> {
+	private _map = new Map<any, T>();
+
+	constructor(values: T[], private toKey: (t: T) => unknown) {
+		for (const value of values) {
+			this.add(value);
+		}
+	}
+
+	get size(): number {
+		return this._map.size;
+	}
+
+	add(value: T): this {
+		const key = this.toKey(value);
+		this._map.set(key, value);
+		return this;
+	}
+
+	delete(value: T): boolean {
+		return this._map.delete(this.toKey(value));
+	}
+
+	has(value: T): boolean {
+		return this._map.has(this.toKey(value));
+	}
+
+	*entries(): IterableIterator<[T, T]> {
+		for (const entry of this._map.values()) {
+			yield [entry, entry];
+		}
+	}
+
+	keys(): IterableIterator<T> {
+		return this.values();
+	}
+
+	*values(): IterableIterator<T> {
+		for (const entry of this._map.values()) {
+			yield entry;
+		}
+	}
+
+	clear(): void {
+		this._map.clear();
+	}
+
+	forEach(callbackfn: (value: T, value2: T, set: Set<T>) => void, thisArg?: any): void {
+		this._map.forEach(entry => callbackfn.call(thisArg, entry, entry, this));
+	}
+
+	[Symbol.iterator](): IterableIterator<T> {
+		return this.values();
+	}
+
+	[Symbol.toStringTag]: string = 'SetWithKey';
+}
diff --git a/src/vs/base/common/color.ts b/src/vs/base/common/color.ts
index 750cfe7dc71..caa1d4419f0 100644
--- a/src/vs/base/common/color.ts
+++ b/src/vs/base/common/color.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
+import { CharCode } from './charCode.js';
 
 function roundFloat(number: number, decimalPoints: number): number {
 	const decimal = Math.pow(10, decimalPoints);
@@ -320,6 +320,50 @@ export class Color {
 		return roundFloat(luminance, 4);
 	}
 
+	/**
+	 * Reduces the "foreground" color on this "background" color unti it is
+	 * below the relative luminace ratio.
+	 * @returns the new foreground color
+	 * @see https://github.com/xtermjs/xterm.js/blob/44f9fa39ae03e2ca6d28354d88a399608686770e/src/common/Color.ts#L315
+	 */
+	reduceRelativeLuminace(foreground: Color, ratio: number): Color {
+		// This is a naive but fast approach to reducing luminance as converting to
+		// HSL and back is expensive
+		let { r: fgR, g: fgG, b: fgB } = foreground.rgba;
+
+		let cr = this.getContrastRatio(foreground);
+		while (cr < ratio && (fgR > 0 || fgG > 0 || fgB > 0)) {
+			// Reduce by 10% until the ratio is hit
+			fgR -= Math.max(0, Math.ceil(fgR * 0.1));
+			fgG -= Math.max(0, Math.ceil(fgG * 0.1));
+			fgB -= Math.max(0, Math.ceil(fgB * 0.1));
+			cr = this.getContrastRatio(new Color(new RGBA(fgR, fgG, fgB)));
+		}
+
+		return new Color(new RGBA(fgR, fgG, fgB));
+	}
+
+	/**
+	 * Increases the "foreground" color on this "background" color unti it is
+	 * below the relative luminace ratio.
+	 * @returns the new foreground color
+	 * @see https://github.com/xtermjs/xterm.js/blob/44f9fa39ae03e2ca6d28354d88a399608686770e/src/common/Color.ts#L335
+	 */
+	increaseRelativeLuminace(foreground: Color, ratio: number): Color {
+		// This is a naive but fast approach to reducing luminance as converting to
+		// HSL and back is expensive
+		let { r: fgR, g: fgG, b: fgB } = foreground.rgba;
+		let cr = this.getContrastRatio(foreground);
+		while (cr < ratio && (fgR < 0xFF || fgG < 0xFF || fgB < 0xFF)) {
+			fgR = Math.min(0xFF, fgR + Math.ceil((255 - fgR) * 0.1));
+			fgG = Math.min(0xFF, fgG + Math.ceil((255 - fgG) * 0.1));
+			fgB = Math.min(0xFF, fgB + Math.ceil((255 - fgB) * 0.1));
+			cr = this.getContrastRatio(new Color(new RGBA(fgR, fgG, fgB)));
+		}
+
+		return new Color(new RGBA(fgR, fgG, fgB));
+	}
+
 	private static _relativeLuminanceForComponent(color: number): number {
 		const c = color / 255;
 		return (c <= 0.03928) ? c / 12.92 : Math.pow(((c + 0.055) / 1.055), 2.4);
@@ -365,6 +409,47 @@ export class Color {
 		return lum1 < lum2;
 	}
 
+	/**
+	 * Based on xterm.js: https://github.com/xtermjs/xterm.js/blob/44f9fa39ae03e2ca6d28354d88a399608686770e/src/common/Color.ts#L288
+	 *
+	 * Given a foreground color and a background color, either increase or reduce the luminance of the
+	 * foreground color until the specified contrast ratio is met. If pure white or black is hit
+	 * without the contrast ratio being met, go the other direction using the background color as the
+	 * foreground color and take either the first or second result depending on which has the higher
+	 * contrast ratio.
+	 *
+	 * @param foreground The foreground color.
+	 * @param ratio The contrast ratio to achieve.
+	 * @returns The adjusted foreground color.
+	 */
+	ensureConstrast(foreground: Color, ratio: number): Color {
+		const bgL = this.getRelativeLuminance();
+		const fgL = foreground.getRelativeLuminance();
+		const cr = this.getContrastRatio(foreground);
+		if (cr < ratio) {
+			if (fgL < bgL) {
+				const resultA = this.reduceRelativeLuminace(foreground, ratio);
+				const resultARatio = this.getContrastRatio(resultA);
+				if (resultARatio < ratio) {
+					const resultB = this.increaseRelativeLuminace(foreground, ratio);
+					const resultBRatio = this.getContrastRatio(resultB);
+					return resultARatio > resultBRatio ? resultA : resultB;
+				}
+				return resultA;
+			}
+			const resultA = this.increaseRelativeLuminace(foreground, ratio);
+			const resultARatio = this.getContrastRatio(resultA);
+			if (resultARatio < ratio) {
+				const resultB = this.reduceRelativeLuminace(foreground, ratio);
+				const resultBRatio = this.getContrastRatio(resultB);
+				return resultARatio > resultBRatio ? resultA : resultB;
+			}
+			return resultA;
+		}
+
+		return foreground;
+	}
+
 	lighten(factor: number): Color {
 		return new Color(new HSLA(this.hsla.h, this.hsla.s, this.hsla.l + this.hsla.l * factor, this.hsla.a));
 	}
diff --git a/src/vs/base/common/comparers.ts b/src/vs/base/common/comparers.ts
index e515abd6122..50469bc594a 100644
--- a/src/vs/base/common/comparers.ts
+++ b/src/vs/base/common/comparers.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Lazy } from 'vs/base/common/lazy';
-import { sep } from 'vs/base/common/path';
+import { Lazy } from './lazy.js';
+import { sep } from './path.js';
 
 // When comparing large numbers of strings it's better for performance to create an
 // Intl.Collator object and use the function provided by its compare property
diff --git a/src/vs/base/common/console.ts b/src/vs/base/common/console.ts
index 6527f72f5e1..fded1d1c17e 100644
--- a/src/vs/base/common/console.ts
+++ b/src/vs/base/common/console.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
+import { URI } from './uri.js';
 
 export interface IRemoteConsoleLog {
 	type: string;
diff --git a/src/vs/base/common/controlFlow.ts b/src/vs/base/common/controlFlow.ts
index 2c4d020dd99..eead0f45a93 100644
--- a/src/vs/base/common/controlFlow.ts
+++ b/src/vs/base/common/controlFlow.ts
@@ -2,7 +2,7 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { BugIndicatingError } from 'vs/base/common/errors';
+import { BugIndicatingError } from './errors.js';
 
 /*
  * This file contains helper classes to manage control flow.
diff --git a/src/vs/base/common/dataTransfer.ts b/src/vs/base/common/dataTransfer.ts
index 9c9ac45640b..dd3f31f6e79 100644
--- a/src/vs/base/common/dataTransfer.ts
+++ b/src/vs/base/common/dataTransfer.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { distinct } from 'vs/base/common/arrays';
-import { Iterable } from 'vs/base/common/iterator';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
+import { distinct } from './arrays.js';
+import { Iterable } from './iterator.js';
+import { URI } from './uri.js';
+import { generateUuid } from './uuid.js';
 
 export interface IDataTransferFile {
 	readonly id: string;
diff --git a/src/vs/base/common/date.ts b/src/vs/base/common/date.ts
index 2ae03a711af..8484c42903f 100644
--- a/src/vs/base/common/date.ts
+++ b/src/vs/base/common/date.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
+import { localize } from '../../nls.js';
 
 const minute = 60;
 const hour = minute * 60;
@@ -199,6 +199,27 @@ export function fromNow(date: number | Date, appendAgoLabel?: boolean, useFullTi
 	}
 }
 
+export function fromNowByDay(date: number | Date, appendAgoLabel?: boolean, useFullTimeWords?: boolean): string {
+	if (typeof date !== 'number') {
+		date = date.getTime();
+	}
+
+	const todayMidnightTime = new Date();
+	todayMidnightTime.setHours(0, 0, 0, 0);
+	const yesterdayMidnightTime = new Date(todayMidnightTime.getTime());
+	yesterdayMidnightTime.setDate(yesterdayMidnightTime.getDate() - 1);
+
+	if (date > todayMidnightTime.getTime()) {
+		return localize('today', 'Today');
+	}
+
+	if (date > yesterdayMidnightTime.getTime()) {
+		return localize('yesterday', 'Yesterday');
+	}
+
+	return fromNow(date, appendAgoLabel, useFullTimeWords);
+}
+
 /**
  * Gets a readable duration with intelligent/lossy precision. For example "40ms" or "3.040s")
  * @param ms The duration to get in milliseconds.
diff --git a/src/vs/base/common/desktopEnvironmentInfo.ts b/src/vs/base/common/desktopEnvironmentInfo.ts
index b6e4c107db1..45b7da17820 100644
--- a/src/vs/base/common/desktopEnvironmentInfo.ts
+++ b/src/vs/base/common/desktopEnvironmentInfo.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { env } from 'vs/base/common/process';
+import { env } from './process.js';
 
 // Define the enumeration for Desktop Environments
 enum DesktopEnvironment {
diff --git a/src/vs/base/common/diff/diff.ts b/src/vs/base/common/diff/diff.ts
index 0a938b65864..45eba8e4386 100644
--- a/src/vs/base/common/diff/diff.ts
+++ b/src/vs/base/common/diff/diff.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DiffChange } from 'vs/base/common/diff/diffChange';
-import { stringHash } from 'vs/base/common/hash';
-import { Constants } from 'vs/base/common/uint';
+import { DiffChange } from './diffChange.js';
+import { stringHash } from '../hash.js';
+import { Constants } from '../uint.js';
 
 export class StringDiffSequence implements ISequence {
 
diff --git a/src/vs/base/common/equals.ts b/src/vs/base/common/equals.ts
index 6e2ae8503ab..df2db9256f1 100644
--- a/src/vs/base/common/equals.ts
+++ b/src/vs/base/common/equals.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as arrays from 'vs/base/common/arrays';
+import * as arrays from './arrays.js';
 
 export type EqualityComparer<T> = (a: T, b: T) => boolean;
 
diff --git a/src/vs/base/common/errorMessage.ts b/src/vs/base/common/errorMessage.ts
index f16616da430..ae7f89adfa8 100644
--- a/src/vs/base/common/errorMessage.ts
+++ b/src/vs/base/common/errorMessage.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as arrays from 'vs/base/common/arrays';
-import * as types from 'vs/base/common/types';
-import * as nls from 'vs/nls';
-import { IAction } from 'vs/base/common/actions';
+import * as arrays from './arrays.js';
+import * as types from './types.js';
+import * as nls from '../../nls.js';
+import { IAction } from './actions.js';
 
 function exceptionToErrorMessage(exception: any, verbose: boolean): string {
 	if (verbose && (exception.stack || exception.stacktrace)) {
diff --git a/src/vs/base/common/errors.ts b/src/vs/base/common/errors.ts
index f0d9296057b..07e7b2acd91 100644
--- a/src/vs/base/common/errors.ts
+++ b/src/vs/base/common/errors.ts
@@ -94,6 +94,16 @@ export function isSigPipeError(e: unknown): e is Error {
 	return cast.code === 'EPIPE' && cast.syscall?.toUpperCase() === 'WRITE';
 }
 
+/**
+ * This function should only be called with errors that indicate a bug in the product.
+ * E.g. buggy extensions/invalid user-input/network issues should not be able to trigger this code path.
+ * If they are, this indicates there is also a bug in the product.
+*/
+export function onBugIndicatingError(e: any): undefined {
+	errorHandler.onUnexpectedError(e);
+	return undefined;
+}
+
 export function onUnexpectedError(e: any): undefined {
 	// ignore errors from cancelled promises
 	if (!isCancellationError(e)) {
@@ -137,6 +147,19 @@ export function transformErrorForSerialization(error: any): any {
 	return error;
 }
 
+export function transformErrorFromSerialization(data: SerializedError): Error {
+	let error: Error;
+	if (data.noTelemetry) {
+		error = new ErrorNoTelemetry();
+	} else {
+		error = new Error();
+		error.name = data.name;
+	}
+	error.message = data.message;
+	error.stack = data.stack;
+	return error;
+}
+
 // see https://github.com/v8/v8/wiki/Stack%20Trace%20API#basic-stack-traces
 export interface V8CallSite {
 	getThis(): unknown;
diff --git a/src/vs/base/common/event.ts b/src/vs/base/common/event.ts
index fab6be41690..33c834929c0 100644
--- a/src/vs/base/common/event.ts
+++ b/src/vs/base/common/event.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { createSingleCallFunction } from 'vs/base/common/functional';
-import { combinedDisposable, Disposable, DisposableMap, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { LinkedList } from 'vs/base/common/linkedList';
-import { IObservable, IObserver } from 'vs/base/common/observable';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { MicrotaskDelay } from 'vs/base/common/symbols';
-
+import { CancellationToken } from './cancellation.js';
+import { diffSets } from './collections.js';
+import { onUnexpectedError } from './errors.js';
+import { createSingleCallFunction } from './functional.js';
+import { combinedDisposable, Disposable, DisposableMap, DisposableStore, IDisposable, toDisposable } from './lifecycle.js';
+import { LinkedList } from './linkedList.js';
+import { IObservable, IObserver } from './observable.js';
+import { StopWatch } from './stopwatch.js';
+import { MicrotaskDelay } from './symbols.js';
 
 // -----------------------------------------------------------------------------------------------------------------------
 // Uncomment the next line to print warnings whenever a listener is GC'ed without having been disposed. This is a LEAK.
@@ -40,7 +40,7 @@ const _enableSnapshotPotentialLeakWarning = false
  * An event with zero or one parameters that can be subscribed to. The event is a function itself.
  */
 export interface Event<T> {
-	(listener: (e: T) => any, thisArgs?: any, disposables?: IDisposable[] | DisposableStore): IDisposable;
+	(listener: (e: T) => unknown, thisArgs?: any, disposables?: IDisposable[] | DisposableStore): IDisposable;
 }
 
 export namespace Event {
@@ -111,6 +111,15 @@ export namespace Event {
 		};
 	}
 
+	/**
+	 * Given an event, returns another event which only fires once, and only when the condition is met.
+	 *
+	 * @param event The event source for the new event.
+	 */
+	export function onceIf<T>(event: Event<T>, condition: (e: T) => boolean): Event<T> {
+		return Event.once(Event.filter(event, condition));
+	}
+
 	/**
 	 * Maps an event of one type into an event of another type using a mapping function, similar to how
 	 * `Array.prototype.map` works.
@@ -492,7 +501,7 @@ export namespace Event {
 	const HaltChainable = Symbol('HaltChainable');
 
 	class ChainableSynthesis implements IChainableSythensis<any> {
-		private readonly steps: ((input: any) => any)[] = [];
+		private readonly steps: ((input: any) => unknown)[] = [];
 
 		map<O>(fn: (i: any) => O): this {
 			this.steps.push(fn);
@@ -615,6 +624,25 @@ export namespace Event {
 		return result.event;
 	}
 
+	/**
+	 * A convenience function for forwarding an event to another emitter which
+	 * improves readability.
+	 *
+	 * This is similar to {@link Relay} but allows instantiating and forwarding
+	 * on a single line and also allows for multiple source events.
+	 * @param from The event to forward.
+	 * @param to The emitter to forward the event to.
+	 * @example
+	 * Event.forward(event, emitter);
+	 * // equivalent to
+	 * event(e => emitter.fire(e));
+	 * // equivalent to
+	 * event(emitter.fire, emitter);
+	 */
+	export function forward<T>(from: Event<T>, to: Emitter<T>): IDisposable {
+		return from(e => to.fire(e));
+	}
+
 	/**
 	 * Adds a listener to an event and calls the listener immediately with undefined as the event object.
 	 *
@@ -624,9 +652,9 @@ export namespace Event {
 	 * runAndSubscribe(dataChangeEvent, () => this._updateUI());
 	 * ```
 	 */
-	export function runAndSubscribe<T>(event: Event<T>, handler: (e: T) => any, initial: T): IDisposable;
-	export function runAndSubscribe<T>(event: Event<T>, handler: (e: T | undefined) => any): IDisposable;
-	export function runAndSubscribe<T>(event: Event<T>, handler: (e: T | undefined) => any, initial?: T): IDisposable {
+	export function runAndSubscribe<T>(event: Event<T>, handler: (e: T) => unknown, initial: T): IDisposable;
+	export function runAndSubscribe<T>(event: Event<T>, handler: (e: T | undefined) => unknown): IDisposable;
+	export function runAndSubscribe<T>(event: Event<T>, handler: (e: T | undefined) => unknown, initial?: T): IDisposable {
 		handler(initial);
 		return event(e => handler(e));
 	}
@@ -642,6 +670,9 @@ export namespace Event {
 			const options: EmitterOptions = {
 				onWillAddFirstListener: () => {
 					_observable.addObserver(this);
+
+					// Communicate to the observable that we received its current value and would like to be notified about future changes.
+					this._observable.reportChanges();
 				},
 				onDidRemoveLastListener: () => {
 					_observable.removeObserver(this);
@@ -831,13 +862,15 @@ export function setGlobalLeakWarningThreshold(n: number): IDisposable {
 
 class LeakageMonitor {
 
+	private static _idPool = 1;
+
 	private _stacks: Map<string, number> | undefined;
 	private _warnCountdown: number = 0;
 
 	constructor(
 		private readonly _errorHandler: (err: Error) => void,
 		readonly threshold: number,
-		readonly name: string = Math.random().toString(18).slice(2, 5),
+		readonly name: string = (LeakageMonitor._idPool++).toString(16).padStart(3, '0')
 	) { }
 
 	dispose(): void {
@@ -1076,7 +1109,7 @@ export class Emitter<T> {
 	 * to events from this Emitter
 	 */
 	get event(): Event<T> {
-		this._event ??= (callback: (e: T) => any, thisArgs?: any, disposables?: IDisposable[] | DisposableStore) => {
+		this._event ??= (callback: (e: T) => unknown, thisArgs?: any, disposables?: IDisposable[] | DisposableStore) => {
 			if (this._leakageMon && this._size > this._leakageMon.threshold ** 2) {
 				const message = `[${this._leakageMon.name}] REFUSES to accept new listeners because it exceeded its threshold by far (${this._size} vs ${this._leakageMon.threshold})`;
 				console.warn(message);
@@ -1321,6 +1354,7 @@ export class AsyncEmitter<T extends IWaitUntil> extends Emitter<T> {
 			const [listener, data] = this._asyncDeliveryQueue.shift()!;
 			const thenables: Promise<unknown>[] = [];
 
+			// eslint-disable-next-line local/code-no-dangerous-type-assertions
 			const event = <T>{
 				...data,
 				token,
@@ -1758,3 +1792,30 @@ class ConstValueWithChangeEvent<T> implements IValueWithChangeEvent<T> {
 
 	constructor(readonly value: T) { }
 }
+
+/**
+ * @param handleItem Is called for each item in the set (but only the first time the item is seen in the set).
+ * 	The returned disposable is disposed if the item is no longer in the set.
+ */
+export function trackSetChanges<T>(getData: () => ReadonlySet<T>, onDidChangeData: Event<unknown>, handleItem: (d: T) => IDisposable): IDisposable {
+	const map = new DisposableMap<T, IDisposable>();
+	let oldData = new Set(getData());
+	for (const d of oldData) {
+		map.set(d, handleItem(d));
+	}
+
+	const store = new DisposableStore();
+	store.add(onDidChangeData(() => {
+		const newData = getData();
+		const diff = diffSets(oldData, newData);
+		for (const r of diff.removed) {
+			map.deleteAndDispose(r);
+		}
+		for (const a of diff.added) {
+			map.set(a, handleItem(a));
+		}
+		oldData = new Set(newData);
+	}));
+	store.add(map);
+	return store;
+}
diff --git a/src/vs/base/common/extpath.ts b/src/vs/base/common/extpath.ts
index e0ee6968dce..bf8b0905ae6 100644
--- a/src/vs/base/common/extpath.ts
+++ b/src/vs/base/common/extpath.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
-import { isAbsolute, join, normalize, posix, sep } from 'vs/base/common/path';
-import { isWindows } from 'vs/base/common/platform';
-import { equalsIgnoreCase, rtrim, startsWithIgnoreCase } from 'vs/base/common/strings';
-import { isNumber } from 'vs/base/common/types';
+import { CharCode } from './charCode.js';
+import { isAbsolute, join, normalize, posix, sep } from './path.js';
+import { isWindows } from './platform.js';
+import { equalsIgnoreCase, rtrim, startsWithIgnoreCase } from './strings.js';
+import { isNumber } from './types.js';
 
 export function isPathSeparator(code: number) {
 	return code === CharCode.Slash || code === CharCode.Backslash;
diff --git a/src/vs/base/common/filters.ts b/src/vs/base/common/filters.ts
index 8c02823852c..2ab6c40126d 100644
--- a/src/vs/base/common/filters.ts
+++ b/src/vs/base/common/filters.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
-import { LRUCache } from 'vs/base/common/map';
-import { getKoreanAltChars } from 'vs/base/common/naturalLanguage/korean';
-import * as strings from 'vs/base/common/strings';
+import { CharCode } from './charCode.js';
+import { LRUCache } from './map.js';
+import { getKoreanAltChars } from './naturalLanguage/korean.js';
+import * as strings from './strings.js';
 
 export interface IFilter {
 	// Returns null if word doesn't match.
diff --git a/src/vs/base/common/fuzzyScorer.ts b/src/vs/base/common/fuzzyScorer.ts
index b23fdd60232..ea0cfea8284 100644
--- a/src/vs/base/common/fuzzyScorer.ts
+++ b/src/vs/base/common/fuzzyScorer.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
-import { compareAnything } from 'vs/base/common/comparers';
-import { createMatches as createFuzzyMatches, fuzzyScore, IMatch, isUpper, matchesPrefix } from 'vs/base/common/filters';
-import { hash } from 'vs/base/common/hash';
-import { sep } from 'vs/base/common/path';
-import { isLinux, isWindows } from 'vs/base/common/platform';
-import { equalsIgnoreCase, stripWildcards } from 'vs/base/common/strings';
+import { CharCode } from './charCode.js';
+import { compareAnything } from './comparers.js';
+import { createMatches as createFuzzyMatches, fuzzyScore, IMatch, isUpper, matchesPrefix } from './filters.js';
+import { hash } from './hash.js';
+import { sep } from './path.js';
+import { isLinux, isWindows } from './platform.js';
+import { equalsIgnoreCase, stripWildcards } from './strings.js';
 
 //#region Fuzzy scorer
 
diff --git a/src/vs/base/common/glob.ts b/src/vs/base/common/glob.ts
index 0bc40172ead..79fc4fe96dd 100644
--- a/src/vs/base/common/glob.ts
+++ b/src/vs/base/common/glob.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { equals } from 'vs/base/common/arrays';
-import { isThenable } from 'vs/base/common/async';
-import { CharCode } from 'vs/base/common/charCode';
-import { isEqualOrParent } from 'vs/base/common/extpath';
-import { LRUCache } from 'vs/base/common/map';
-import { basename, extname, posix, sep } from 'vs/base/common/path';
-import { isLinux } from 'vs/base/common/platform';
-import { escapeRegExpCharacters, ltrim } from 'vs/base/common/strings';
+import { equals } from './arrays.js';
+import { isThenable } from './async.js';
+import { CharCode } from './charCode.js';
+import { isEqualOrParent } from './extpath.js';
+import { LRUCache } from './map.js';
+import { basename, extname, posix, sep } from './path.js';
+import { isLinux } from './platform.js';
+import { escapeRegExpCharacters, ltrim } from './strings.js';
 
 export interface IRelativePattern {
 
diff --git a/src/vs/base/common/hash.ts b/src/vs/base/common/hash.ts
index 76217c4730b..5ab5846682b 100644
--- a/src/vs/base/common/hash.ts
+++ b/src/vs/base/common/hash.ts
@@ -3,12 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as strings from 'vs/base/common/strings';
+import { VSBuffer } from './buffer.js';
+import * as strings from './strings.js';
+
+type NotSyncHashable = ArrayBufferLike | ArrayBufferView;
 
 /**
  * Return a hash value for an object.
+ *
+ * Note that this should not be used for binary data types. Instead,
+ * prefer {@link hashAsync}.
  */
-export function hash(obj: any): number {
+export function hash<T>(obj: T extends NotSyncHashable ? never : T): number {
 	return doHash(obj, 0);
 }
 
@@ -63,19 +69,30 @@ function objectHash(obj: any, initialHashVal: number): number {
 	}, initialHashVal);
 }
 
-export class Hasher {
+/** Hashes the input as SHA-1, returning a hex-encoded string. */
+export const hashAsync = (input: string | ArrayBufferView | VSBuffer) => {
+	// Note: I would very much like to expose a streaming interface for hashing
+	// generally, but this is not available in web crypto yet, see
+	// https://github.com/w3c/webcrypto/issues/73
 
-	private _value = 0;
-
-	get value(): number {
-		return this._value;
+	// StringSHA1 is faster for small string input, use it since we have it:
+	if (typeof input === 'string' && input.length < 250) {
+		const sha = new StringSHA1();
+		sha.update(input);
+		return Promise.resolve(sha.digest());
 	}
 
-	hash(obj: any): number {
-		this._value = doHash(obj, this._value);
-		return this._value;
+	let buff: ArrayBufferView;
+	if (typeof input === 'string') {
+		buff = new TextEncoder().encode(input);
+	} else if (input instanceof VSBuffer) {
+		buff = input.buffer;
+	} else {
+		buff = input;
 	}
-}
+
+	return crypto.subtle.digest('sha-1', buff).then(toHexString);
+};
 
 const enum SHA1Constant {
 	BLOCK_SIZE = 64, // 512 / 8
@@ -93,31 +110,20 @@ function leftRotate(value: number, bits: number, totalBits: number = 32): number
 	return ((value << bits) | ((mask & value) >>> delta)) >>> 0;
 }
 
-function fill(dest: Uint8Array, index: number = 0, count: number = dest.byteLength, value: number = 0): void {
-	for (let i = 0; i < count; i++) {
-		dest[index + i] = value;
-	}
-}
-
-function leftPad(value: string, length: number, char: string = '0'): string {
-	while (value.length < length) {
-		value = char + value;
-	}
-	return value;
-}
-
-export function toHexString(buffer: ArrayBuffer): string;
-export function toHexString(value: number, bitsize?: number): string;
-export function toHexString(bufferOrValue: ArrayBuffer | number, bitsize: number = 32): string {
+function toHexString(buffer: ArrayBuffer): string;
+function toHexString(value: number, bitsize?: number): string;
+function toHexString(bufferOrValue: ArrayBuffer | number, bitsize: number = 32): string {
 	if (bufferOrValue instanceof ArrayBuffer) {
 		return Array.from(new Uint8Array(bufferOrValue)).map(b => b.toString(16).padStart(2, '0')).join('');
 	}
 
-	return leftPad((bufferOrValue >>> 0).toString(16), bitsize / 4);
+	return (bufferOrValue >>> 0).toString(16).padStart(bitsize / 4, '0');
 }
 
 /**
  * A SHA1 implementation that works with strings and does not allocate.
+ *
+ * Prefer to use {@link hashAsync} in async contexts
  */
 export class StringSHA1 {
 	private static _bigBlock32 = new DataView(new ArrayBuffer(320)); // 80 * 4 = 320
@@ -247,11 +253,11 @@ export class StringSHA1 {
 
 	private _wrapUp(): void {
 		this._buff[this._buffLen++] = 0x80;
-		fill(this._buff, this._buffLen);
+		this._buff.subarray(this._buffLen).fill(0);
 
 		if (this._buffLen > 56) {
 			this._step();
-			fill(this._buff);
+			this._buff.fill(0);
 		}
 
 		// this will fit because the mantissa can cover up to 52 bits
diff --git a/src/vs/base/common/history.ts b/src/vs/base/common/history.ts
index de578810355..39413a67d56 100644
--- a/src/vs/base/common/history.ts
+++ b/src/vs/base/common/history.ts
@@ -3,7 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ArrayNavigator, INavigator } from 'vs/base/common/navigator';
+import { SetWithKey } from './collections.js';
+import { ArrayNavigator, INavigator } from './navigator.js';
 
 export class HistoryNavigator<T> implements INavigator<T> {
 
@@ -114,6 +115,10 @@ interface HistoryNode<T> {
 	next: HistoryNode<T> | undefined;
 }
 
+/**
+ * The right way to use HistoryNavigator2 is for the last item in the list to be the user's uncommitted current text. eg empty string, or whatever has been typed. Then
+ * the user can navigate away from the last item through the list, and back to it. When updating the last item, call replaceLast.
+ */
 export class HistoryNavigator2<T> {
 
 	private valueSet: Set<T>;
@@ -123,7 +128,7 @@ export class HistoryNavigator2<T> {
 	private _size: number;
 	get size(): number { return this._size; }
 
-	constructor(history: readonly T[], private capacity: number = 10) {
+	constructor(history: readonly T[], private capacity: number = 10, private identityFn: (t: T) => unknown = t => t) {
 		if (history.length < 1) {
 			throw new Error('not supported');
 		}
@@ -135,7 +140,7 @@ export class HistoryNavigator2<T> {
 			next: undefined
 		};
 
-		this.valueSet = new Set<T>([history[0]]);
+		this.valueSet = new SetWithKey<T>([history[0]], identityFn);
 		for (let i = 1; i < history.length; i++) {
 			this.add(history[i]);
 		}
@@ -172,7 +177,7 @@ export class HistoryNavigator2<T> {
 	 * @returns old last value
 	 */
 	replaceLast(value: T): T {
-		if (this.tail.value === value) {
+		if (this.identityFn(this.tail.value) === this.identityFn(value)) {
 			return value;
 		}
 
@@ -252,8 +257,9 @@ export class HistoryNavigator2<T> {
 	private _deleteFromList(value: T): void {
 		let temp = this.head;
 
+		const valueKey = this.identityFn(value);
 		while (temp !== this.tail) {
-			if (temp.value === value) {
+			if (this.identityFn(temp.value) === valueKey) {
 				if (temp === this.head) {
 					this.head = this.head.next!;
 					this.head.previous = undefined;
diff --git a/src/vs/base/common/hotReload.ts b/src/vs/base/common/hotReload.ts
index 94dec8e9b2f..80901b470f0 100644
--- a/src/vs/base/common/hotReload.ts
+++ b/src/vs/base/common/hotReload.ts
@@ -3,11 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { env } from 'vs/base/common/process';
+import { IDisposable } from './lifecycle.js';
+import { env } from './process.js';
+
+function hotReloadDisabled() {
+	return true; // TODO@hediet fix hot reload.
+}
 
 export function isHotReloadEnabled(): boolean {
-	return env && !!env['VSCODE_DEV'];
+	return !hotReloadDisabled() && env && !!env['VSCODE_DEV'];
 }
 export function registerHotReloadHandler(handler: HotReloadHandler): IDisposable {
 	if (!isHotReloadEnabled()) {
@@ -41,9 +45,23 @@ function registerGlobalHotReloadHandler() {
 		g.$hotReload_applyNewExports = args => {
 			const args2 = { config: { mode: undefined }, ...args };
 
+			const results: AcceptNewExportsHandler[] = [];
 			for (const h of hotReloadHandlers!) {
 				const result = h(args2);
-				if (result) { return result; }
+				if (result) {
+					results.push(result);
+				}
+			}
+			if (results.length > 0) {
+				return newExports => {
+					let result = false;
+					for (const r of results) {
+						if (r(newExports)) {
+							result = true;
+						}
+					}
+					return result;
+				};
 			}
 			return undefined;
 		};
diff --git a/src/vs/base/common/hotReloadHelpers.ts b/src/vs/base/common/hotReloadHelpers.ts
new file mode 100644
index 00000000000..f4f7cf11eae
--- /dev/null
+++ b/src/vs/base/common/hotReloadHelpers.ts
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { isHotReloadEnabled, registerHotReloadHandler } from './hotReload.js';
+import { constObservable, IObservable, IReader, ISettableObservable, observableSignalFromEvent, observableValue } from './observable.js';
+
+export function readHotReloadableExport<T>(value: T, reader: IReader | undefined): T {
+	observeHotReloadableExports([value], reader);
+	return value;
+}
+
+export function observeHotReloadableExports(values: any[], reader: IReader | undefined): void {
+	if (isHotReloadEnabled()) {
+		const o = observableSignalFromEvent(
+			'reload',
+			event => registerHotReloadHandler(({ oldExports }) => {
+				if (![...Object.values(oldExports)].some(v => values.includes(v))) {
+					return undefined;
+				}
+				return (_newExports) => {
+					event(undefined);
+					return true;
+				};
+			})
+		);
+		o.read(reader);
+	}
+}
+
+const classes = new Map<string, ISettableObservable<unknown>>();
+
+export function createHotClass<T>(clazz: T): IObservable<T> {
+	if (!isHotReloadEnabled()) {
+		return constObservable(clazz);
+	}
+
+	const id = (clazz as any).name;
+
+	let existing = classes.get(id);
+	if (!existing) {
+		existing = observableValue(id, clazz);
+		classes.set(id, existing);
+	} else {
+		setTimeout(() => {
+			existing!.set(clazz, undefined);
+		}, 0);
+	}
+	return existing as IObservable<T>;
+}
diff --git a/src/vs/base/common/htmlContent.ts b/src/vs/base/common/htmlContent.ts
index 0b57e625295..8b6213d1844 100644
--- a/src/vs/base/common/htmlContent.ts
+++ b/src/vs/base/common/htmlContent.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { illegalArgument } from 'vs/base/common/errors';
-import { escapeIcons } from 'vs/base/common/iconLabels';
-import { isEqual } from 'vs/base/common/resources';
-import { escapeRegExpCharacters } from 'vs/base/common/strings';
-import { URI, UriComponents } from 'vs/base/common/uri';
+import { illegalArgument } from './errors.js';
+import { escapeIcons } from './iconLabels.js';
+import { isEqual } from './resources.js';
+import { escapeRegExpCharacters } from './strings.js';
+import { URI, UriComponents } from './uri.js';
 
 export interface MarkdownStringTrustedOptions {
 	readonly enabledCommands: readonly string[];
diff --git a/src/vs/base/common/iconLabels.ts b/src/vs/base/common/iconLabels.ts
index 089afb9455c..19c651f90e1 100644
--- a/src/vs/base/common/iconLabels.ts
+++ b/src/vs/base/common/iconLabels.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IMatch, matchesFuzzy } from 'vs/base/common/filters';
-import { ltrim } from 'vs/base/common/strings';
-import { ThemeIcon } from 'vs/base/common/themables';
+import { IMatch, matchesFuzzy } from './filters.js';
+import { ltrim } from './strings.js';
+import { ThemeIcon } from './themables.js';
 
 const iconStartMarker = '$(';
 
diff --git a/src/vs/base/common/ime.ts b/src/vs/base/common/ime.ts
index ce80099b288..cbb4a44f9a6 100644
--- a/src/vs/base/common/ime.ts
+++ b/src/vs/base/common/ime.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
+import { Emitter } from './event.js';
 
 export class IMEImpl {
 
diff --git a/src/vs/base/common/json.ts b/src/vs/base/common/json.ts
index dadcbaf74f1..e4adc59003e 100644
--- a/src/vs/base/common/json.ts
+++ b/src/vs/base/common/json.ts
@@ -1308,40 +1308,6 @@ export function visit(text: string, visitor: JSONVisitor, options: ParseOptions
 	return true;
 }
 
-/**
- * Takes JSON with JavaScript-style comments and remove
- * them. Optionally replaces every none-newline character
- * of comments with a replaceCharacter
- */
-export function stripComments(text: string, replaceCh?: string): string {
-
-	const _scanner = createScanner(text);
-	const parts: string[] = [];
-	let kind: SyntaxKind;
-	let offset = 0;
-	let pos: number;
-
-	do {
-		pos = _scanner.getPosition();
-		kind = _scanner.scan();
-		switch (kind) {
-			case SyntaxKind.LineCommentTrivia:
-			case SyntaxKind.BlockCommentTrivia:
-			case SyntaxKind.EOF:
-				if (offset !== pos) {
-					parts.push(text.substring(offset, pos));
-				}
-				if (replaceCh !== undefined) {
-					parts.push(_scanner.getTokenValue().replace(/[^\r\n]/g, replaceCh));
-				}
-				offset = _scanner.getPosition();
-				break;
-		}
-	} while (kind !== SyntaxKind.EOF);
-
-	return parts.join('');
-}
-
 export function getNodeType(value: any): NodeType {
 	switch (typeof value) {
 		case 'boolean': return 'boolean';
diff --git a/src/vs/base/common/jsonEdit.ts b/src/vs/base/common/jsonEdit.ts
index 9d62ed9e66e..c699dbcb569 100644
--- a/src/vs/base/common/jsonEdit.ts
+++ b/src/vs/base/common/jsonEdit.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { findNodeAtLocation, JSONPath, Node, ParseError, parseTree, Segment } from './json';
-import { Edit, format, FormattingOptions, isEOL } from './jsonFormatter';
+import { findNodeAtLocation, JSONPath, Node, ParseError, parseTree, Segment } from './json.js';
+import { Edit, format, FormattingOptions, isEOL } from './jsonFormatter.js';
 
 
 export function removeProperty(text: string, path: JSONPath, formattingOptions: FormattingOptions): Edit[] {
diff --git a/src/vs/base/common/jsonErrorMessages.ts b/src/vs/base/common/jsonErrorMessages.ts
index 49b5b988cf0..1a876fea5ba 100644
--- a/src/vs/base/common/jsonErrorMessages.ts
+++ b/src/vs/base/common/jsonErrorMessages.ts
@@ -6,8 +6,8 @@
 /**
  * Extracted from json.ts to keep json nls free.
  */
-import { localize } from 'vs/nls';
-import { ParseErrorCode } from './json';
+import { localize } from '../../nls.js';
+import { ParseErrorCode } from './json.js';
 
 export function getParseErrorMessage(errorCode: ParseErrorCode): string {
 	switch (errorCode) {
diff --git a/src/vs/base/common/jsonFormatter.ts b/src/vs/base/common/jsonFormatter.ts
index 18fc0d5338b..888daacea83 100644
--- a/src/vs/base/common/jsonFormatter.ts
+++ b/src/vs/base/common/jsonFormatter.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createScanner, ScanError, SyntaxKind } from './json';
+import { createScanner, ScanError, SyntaxKind } from './json.js';
 
 export interface FormattingOptions {
 	/**
diff --git a/src/vs/base/common/jsonSchema.ts b/src/vs/base/common/jsonSchema.ts
index 4216b0e5c0d..fbf6d9813fa 100644
--- a/src/vs/base/common/jsonSchema.ts
+++ b/src/vs/base/common/jsonSchema.ts
@@ -118,3 +118,150 @@ export type SchemaToType<T> = T extends { type: 'string' }
 	: T extends { type: 'array'; items: infer I }
 	? Array<SchemaToType<I>>
 	: never;
+
+interface Equals { schemas: IJSONSchema[]; id?: string }
+
+export function getCompressedContent(schema: IJSONSchema): string {
+	let hasDups = false;
+
+
+	// visit all schema nodes and collect the ones that are equal
+	const equalsByString = new Map<string, Equals>();
+	const nodeToEquals = new Map<IJSONSchema, Equals>();
+	const visitSchemas = (next: IJSONSchema) => {
+		if (schema === next) {
+			return true;
+		}
+		const val = JSON.stringify(next);
+		if (val.length < 30) {
+			// the $ref takes around 25 chars, so we don't save anything
+			return true;
+		}
+		const eq = equalsByString.get(val);
+		if (!eq) {
+			const newEq = { schemas: [next] };
+			equalsByString.set(val, newEq);
+			nodeToEquals.set(next, newEq);
+			return true;
+		}
+		eq.schemas.push(next);
+		nodeToEquals.set(next, eq);
+		hasDups = true;
+		return false;
+	};
+	traverseNodes(schema, visitSchemas);
+	equalsByString.clear();
+
+	if (!hasDups) {
+		return JSON.stringify(schema);
+	}
+
+	let defNodeName = '$defs';
+	while (schema.hasOwnProperty(defNodeName)) {
+		defNodeName += '_';
+	}
+
+	// used to collect all schemas that are later put in `$defs`. The index in the array is the id of the schema.
+	const definitions: IJSONSchema[] = [];
+
+	function stringify(root: IJSONSchema): string {
+		return JSON.stringify(root, (_key: string, value: any) => {
+			if (value !== root) {
+				const eq = nodeToEquals.get(value);
+				if (eq && eq.schemas.length > 1) {
+					if (!eq.id) {
+						eq.id = `_${definitions.length}`;
+						definitions.push(eq.schemas[0]);
+					}
+					return { $ref: `#/${defNodeName}/${eq.id}` };
+				}
+			}
+			return value;
+		});
+	}
+
+	// stringify the schema and replace duplicate subtrees with $ref
+	// this will add new items to the definitions array
+	const str = stringify(schema);
+
+	// now stringify the definitions. Each invication of stringify cann add new items to the definitions array, so the length can grow while we iterate
+	const defStrings: string[] = [];
+	for (let i = 0; i < definitions.length; i++) {
+		defStrings.push(`"_${i}":${stringify(definitions[i])}`);
+	}
+	if (defStrings.length) {
+		return `${str.substring(0, str.length - 1)},"${defNodeName}":{${defStrings.join(',')}}}`;
+	}
+	return str;
+}
+
+type IJSONSchemaRef = IJSONSchema | boolean;
+
+function isObject(thing: any): thing is object {
+	return typeof thing === 'object' && thing !== null;
+}
+
+/*
+ * Traverse a JSON schema and visit each schema node
+*/
+function traverseNodes(root: IJSONSchema, visit: (schema: IJSONSchema) => boolean) {
+	if (!root || typeof root !== 'object') {
+		return;
+	}
+	const collectEntries = (...entries: (IJSONSchemaRef | undefined)[]) => {
+		for (const entry of entries) {
+			if (isObject(entry)) {
+				toWalk.push(entry);
+			}
+		}
+	};
+	const collectMapEntries = (...maps: (IJSONSchemaMap | undefined)[]) => {
+		for (const map of maps) {
+			if (isObject(map)) {
+				for (const key in map) {
+					const entry = map[key];
+					if (isObject(entry)) {
+						toWalk.push(entry);
+					}
+				}
+			}
+		}
+	};
+	const collectArrayEntries = (...arrays: (IJSONSchemaRef[] | undefined)[]) => {
+		for (const array of arrays) {
+			if (Array.isArray(array)) {
+				for (const entry of array) {
+					if (isObject(entry)) {
+						toWalk.push(entry);
+					}
+				}
+			}
+		}
+	};
+	const collectEntryOrArrayEntries = (items: (IJSONSchemaRef[] | IJSONSchemaRef | undefined)) => {
+		if (Array.isArray(items)) {
+			for (const entry of items) {
+				if (isObject(entry)) {
+					toWalk.push(entry);
+				}
+			}
+		} else if (isObject(items)) {
+			toWalk.push(items);
+		}
+	};
+
+	const toWalk: IJSONSchema[] = [root];
+
+	let next = toWalk.pop();
+	while (next) {
+		const visitChildern = visit(next);
+		if (visitChildern) {
+			collectEntries(next.additionalItems, next.additionalProperties, next.not, next.contains, next.propertyNames, next.if, next.then, next.else, next.unevaluatedItems, next.unevaluatedProperties);
+			collectMapEntries(next.definitions, next.$defs, next.properties, next.patternProperties, <IJSONSchemaMap>next.dependencies, next.dependentSchemas);
+			collectArrayEntries(next.anyOf, next.allOf, next.oneOf, next.prefixItems);
+			collectEntryOrArrayEntries(next.items);
+		}
+		next = toWalk.pop();
+	}
+}
+
diff --git a/src/vs/base/common/jsonc.ts b/src/vs/base/common/jsonc.ts
new file mode 100644
index 00000000000..1862a28e725
--- /dev/null
+++ b/src/vs/base/common/jsonc.ts
@@ -0,0 +1,64 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// First group matches a double quoted string
+// Second group matches a single quoted string
+// Third group matches a multi line comment
+// Forth group matches a single line comment
+// Fifth group matches a trailing comma
+const regexp = /("[^"\\]*(?:\\.[^"\\]*)*")|('[^'\\]*(?:\\.[^'\\]*)*')|(\/\*[^\/\*]*(?:(?:\*|\/)[^\/\*]*)*?\*\/)|(\/{2,}.*?(?:(?:\r?\n)|$))|(,\s*[}\]])/g;
+
+/**
+ * Strips single and multi line JavaScript comments from JSON
+ * content. Ignores characters in strings BUT doesn't support
+ * string continuation across multiple lines since it is not
+ * supported in JSON.
+ *
+ * @param content the content to strip comments from
+ * @returns the content without comments
+*/
+export function stripComments(content: string): string {
+	return content.replace(regexp, function (match, _m1, _m2, m3, m4, m5) {
+		// Only one of m1, m2, m3, m4, m5 matches
+		if (m3) {
+			// A block comment. Replace with nothing
+			return '';
+		} else if (m4) {
+			// Since m4 is a single line comment is is at least of length 2 (e.g. //)
+			// If it ends in \r?\n then keep it.
+			const length = m4.length;
+			if (m4[length - 1] === '\n') {
+				return m4[length - 2] === '\r' ? '\r\n' : '\n';
+			}
+			else {
+				return '';
+			}
+		} else if (m5) {
+			// Remove the trailing comma
+			return match.substring(1);
+		} else {
+			// We match a string
+			return match;
+		}
+	});
+}
+
+/**
+ * A drop-in replacement for JSON.parse that can parse
+ * JSON with comments and trailing commas.
+ *
+ * @param content the content to strip comments from
+ * @returns the parsed content as JSON
+*/
+export function parse<T>(content: string): T {
+	const commentsStripped = stripComments(content);
+
+	try {
+		return JSON.parse(commentsStripped);
+	} catch (error) {
+		const trailingCommasStriped = commentsStripped.replace(/,\s*([}\]])/g, '$1');
+		return JSON.parse(trailingCommasStriped);
+	}
+}
diff --git a/src/vs/base/common/keybindingLabels.ts b/src/vs/base/common/keybindingLabels.ts
index 9eb9327359b..8f62b221709 100644
--- a/src/vs/base/common/keybindingLabels.ts
+++ b/src/vs/base/common/keybindingLabels.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Modifiers } from 'vs/base/common/keybindings';
-import { OperatingSystem } from 'vs/base/common/platform';
-import * as nls from 'vs/nls';
+import { Modifiers } from './keybindings.js';
+import { OperatingSystem } from './platform.js';
+import * as nls from '../../nls.js';
 
 export interface ModifierLabels {
 	readonly ctrlKey: string;
diff --git a/src/vs/base/common/keybindingParser.ts b/src/vs/base/common/keybindingParser.ts
index 3c36b8103f9..8b2e736177d 100644
--- a/src/vs/base/common/keybindingParser.ts
+++ b/src/vs/base/common/keybindingParser.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyCodeUtils, ScanCodeUtils } from 'vs/base/common/keyCodes';
-import { KeyCodeChord, ScanCodeChord, Keybinding, Chord } from 'vs/base/common/keybindings';
+import { KeyCodeUtils, ScanCodeUtils } from './keyCodes.js';
+import { KeyCodeChord, ScanCodeChord, Keybinding, Chord } from './keybindings.js';
 
 export class KeybindingParser {
 
diff --git a/src/vs/base/common/keybindings.ts b/src/vs/base/common/keybindings.ts
index 375256237a6..2a5ed9ac59d 100644
--- a/src/vs/base/common/keybindings.ts
+++ b/src/vs/base/common/keybindings.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { illegalArgument } from 'vs/base/common/errors';
-import { KeyCode, ScanCode } from 'vs/base/common/keyCodes';
-import { OperatingSystem } from 'vs/base/common/platform';
+import { illegalArgument } from './errors.js';
+import { KeyCode, ScanCode } from './keyCodes.js';
+import { OperatingSystem } from './platform.js';
 
 /**
  * Binary encoding strategy:
diff --git a/src/vs/base/common/labels.ts b/src/vs/base/common/labels.ts
index 992bdfdc995..fb09d81fa5e 100644
--- a/src/vs/base/common/labels.ts
+++ b/src/vs/base/common/labels.ts
@@ -3,13 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { firstOrDefault } from 'vs/base/common/arrays';
-import { hasDriveLetter, toSlashes } from 'vs/base/common/extpath';
-import { posix, sep, win32 } from 'vs/base/common/path';
-import { isMacintosh, isWindows, OperatingSystem, OS } from 'vs/base/common/platform';
-import { extUri, extUriIgnorePathCase } from 'vs/base/common/resources';
-import { rtrim, startsWithIgnoreCase } from 'vs/base/common/strings';
-import { URI } from 'vs/base/common/uri';
+import { hasDriveLetter, toSlashes } from './extpath.js';
+import { posix, sep, win32 } from './path.js';
+import { isMacintosh, isWindows, OperatingSystem, OS } from './platform.js';
+import { extUri, extUriIgnorePathCase } from './resources.js';
+import { rtrim, startsWithIgnoreCase } from './strings.js';
+import { URI } from './uri.js';
 
 export interface IPathLabelFormatting {
 
@@ -99,7 +98,7 @@ function getRelativePathLabel(resource: URI, relativePathProvider: IRelativePath
 	const extUriLib = os === OperatingSystem.Linux ? extUri : extUriIgnorePathCase;
 
 	const workspace = relativePathProvider.getWorkspace();
-	const firstFolder = firstOrDefault(workspace.folders);
+	const firstFolder = workspace.folders.at(0);
 	if (!firstFolder) {
 		return undefined;
 	}
diff --git a/src/vs/base/common/lifecycle.ts b/src/vs/base/common/lifecycle.ts
index 568a0124c12..4cc2d172bf4 100644
--- a/src/vs/base/common/lifecycle.ts
+++ b/src/vs/base/common/lifecycle.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { compareBy, numberComparator } from 'vs/base/common/arrays';
-import { groupBy } from 'vs/base/common/collections';
-import { SetMap } from './map';
-import { createSingleCallFunction } from 'vs/base/common/functional';
-import { Iterable } from 'vs/base/common/iterator';
+import { compareBy, numberComparator } from './arrays.js';
+import { groupBy } from './collections.js';
+import { SetMap } from './map.js';
+import { createSingleCallFunction } from './functional.js';
+import { Iterable } from './iterator.js';
 
 // #region Disposable Tracking
 
diff --git a/src/vs/base/common/linkedText.ts b/src/vs/base/common/linkedText.ts
index 89f6da527dc..53062e66106 100644
--- a/src/vs/base/common/linkedText.ts
+++ b/src/vs/base/common/linkedText.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { memoize } from 'vs/base/common/decorators';
+import { memoize } from './decorators.js';
 
 export interface ILink {
 	readonly label: string;
diff --git a/src/vs/base/common/map.ts b/src/vs/base/common/map.ts
index 21441069af0..bc06aafaec2 100644
--- a/src/vs/base/common/map.ts
+++ b/src/vs/base/common/map.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
+import { URI } from './uri.js';
 
 export function getOrSet<K, V>(map: Map<K, V>, key: K, value: V): V {
 	let result = map.get(key);
@@ -875,3 +875,93 @@ export function mapsStrictEqualIgnoreOrder(a: Map<unknown, unknown>, b: Map<unkn
 
 	return true;
 }
+
+/**
+ * A map that is addressable with 2 separate keys. This is useful in high performance scenarios
+ * where creating a composite key whenever the data is accessed is too expensive.
+ */
+export class TwoKeyMap<TFirst extends string | number, TSecond extends string | number, TValue> {
+	private _data: { [key: string | number]: { [key: string | number]: TValue | undefined } | undefined } = {};
+
+	public set(first: TFirst, second: TSecond, value: TValue): void {
+		if (!this._data[first]) {
+			this._data[first] = {};
+		}
+		this._data[first as string | number]![second] = value;
+	}
+
+	public get(first: TFirst, second: TSecond): TValue | undefined {
+		return this._data[first as string | number]?.[second];
+	}
+
+	public clear(): void {
+		this._data = {};
+	}
+
+	public *values(): IterableIterator<TValue> {
+		for (const first in this._data) {
+			for (const second in this._data[first]) {
+				const value = this._data[first]![second];
+				if (value) {
+					yield value;
+				}
+			}
+		}
+	}
+}
+
+/**
+ * A map that is addressable with 3 separate keys. This is useful in high performance scenarios
+ * where creating a composite key whenever the data is accessed is too expensive.
+ */
+export class ThreeKeyMap<TFirst extends string | number, TSecond extends string | number, TThird extends string | number, TValue> {
+	private _data: { [key: string | number]: TwoKeyMap<TSecond, TThird, TValue> | undefined } = {};
+
+	public set(first: TFirst, second: TSecond, third: TThird, value: TValue): void {
+		if (!this._data[first]) {
+			this._data[first] = new TwoKeyMap();
+		}
+		this._data[first as string | number]!.set(second, third, value);
+	}
+
+	public get(first: TFirst, second: TSecond, third: TThird): TValue | undefined {
+		return this._data[first as string | number]?.get(second, third);
+	}
+
+	public clear(): void {
+		this._data = {};
+	}
+
+	public *values(): IterableIterator<TValue> {
+		for (const first in this._data) {
+			for (const value of this._data[first]!.values()) {
+				if (value) {
+					yield value;
+				}
+			}
+		}
+	}
+}
+
+/**
+ * A map that is addressable with 4 separate keys. This is useful in high performance scenarios
+ * where creating a composite key whenever the data is accessed is too expensive.
+ */
+export class FourKeyMap<TFirst extends string | number, TSecond extends string | number, TThird extends string | number, TFourth extends string | number, TValue> {
+	private _data: TwoKeyMap<TFirst, TSecond, TwoKeyMap<TThird, TFourth, TValue>> = new TwoKeyMap();
+
+	public set(first: TFirst, second: TSecond, third: TThird, fourth: TFourth, value: TValue): void {
+		if (!this._data.get(first, second)) {
+			this._data.set(first, second, new TwoKeyMap());
+		}
+		this._data.get(first, second)!.set(third, fourth, value);
+	}
+
+	public get(first: TFirst, second: TSecond, third: TThird, fourth: TFourth): TValue | undefined {
+		return this._data.get(first, second)?.get(third, fourth);
+	}
+
+	public clear(): void {
+		this._data.clear();
+	}
+}
diff --git a/src/vs/base/common/marked/cgmanifest.json b/src/vs/base/common/marked/cgmanifest.json
index 4dffc3ff231..2c76256e890 100644
--- a/src/vs/base/common/marked/cgmanifest.json
+++ b/src/vs/base/common/marked/cgmanifest.json
@@ -6,11 +6,11 @@
 				"git": {
 					"name": "marked",
 					"repositoryUrl": "https://github.com/markedjs/marked",
-					"commitHash": "7e2ef307846427650114591f9257b5545868e928"
+					"commitHash": "7972d7f9b578a31b32f469c14fc97c39ceb2b6c6"
 				}
 			},
 			"license": "MIT",
-			"version": "4.1.0"
+			"version": "14.0.0"
 		}
 	],
 	"version": 1
diff --git a/src/vs/base/common/marked/marked.d.ts b/src/vs/base/common/marked/marked.d.ts
index 7aeab2e864d..bbd49c48bef 100644
--- a/src/vs/base/common/marked/marked.d.ts
+++ b/src/vs/base/common/marked/marked.d.ts
@@ -1,600 +1,704 @@
-// Type definitions for Marked 4.0
-// Project: https://github.com/markedjs/marked, https://marked.js.org
-// Definitions by: William Orr <https://github.com/worr>
-//                 BendingBender <https://github.com/BendingBender>
-//                 CrossR <https://github.com/CrossR>
-//                 Mike Wickett <https://github.com/mwickett>
-//                 Hitomi Hatsukaze <https://github.com/htkzhtm>
-//                 Ezra Celli <https://github.com/ezracelli>
-//                 Romain LE BARO <https://github.com/scandinave>
-//                 Sarun Intaralawan <https://github.com/sarunint>
-//                 Tony Brix <https://github.com/UziTech>
-//                 Anatolii Titov <https://github.com/Toliak>
-//                 Jean-Francois Cere <https://github.com/jfcere>
-//                 Mykhaylo Stolyarchuk <https://github.com/MykSto>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// Generated by dts-bundle-generator v9.5.1
 
+export type MarkedToken = (Tokens.Space | Tokens.Code | Tokens.Heading | Tokens.Table | Tokens.Hr | Tokens.Blockquote | Tokens.List | Tokens.ListItem | Tokens.Paragraph | Tokens.HTML | Tokens.Text | Tokens.Def | Tokens.Escape | Tokens.Tag | Tokens.Image | Tokens.Link | Tokens.Strong | Tokens.Em | Tokens.Codespan | Tokens.Br | Tokens.Del);
+export type Token = (MarkedToken | Tokens.Generic);
+export declare namespace Tokens {
+	interface Space {
+		type: "space";
+		raw: string;
+	}
+	interface Code {
+		type: "code";
+		raw: string;
+		codeBlockStyle?: "indented" | undefined;
+		lang?: string | undefined;
+		text: string;
+		escaped?: boolean;
+	}
+	interface Heading {
+		type: "heading";
+		raw: string;
+		depth: number;
+		text: string;
+		tokens: Token[];
+	}
+	interface Table {
+		type: "table";
+		raw: string;
+		align: Array<"center" | "left" | "right" | null>;
+		header: TableCell[];
+		rows: TableCell[][];
+	}
+	interface TableRow {
+		text: string;
+	}
+	interface TableCell {
+		text: string;
+		tokens: Token[];
+		header: boolean;
+		align: "center" | "left" | "right" | null;
+	}
+	interface Hr {
+		type: "hr";
+		raw: string;
+	}
+	interface Blockquote {
+		type: "blockquote";
+		raw: string;
+		text: string;
+		tokens: Token[];
+	}
+	interface List {
+		type: "list";
+		raw: string;
+		ordered: boolean;
+		start: number | "";
+		loose: boolean;
+		items: ListItem[];
+	}
+	interface ListItem {
+		type: "list_item";
+		raw: string;
+		task: boolean;
+		checked?: boolean | undefined;
+		loose: boolean;
+		text: string;
+		tokens: Token[];
+	}
+	interface Checkbox {
+		checked: boolean;
+	}
+	interface Paragraph {
+		type: "paragraph";
+		raw: string;
+		pre?: boolean | undefined;
+		text: string;
+		tokens: Token[];
+	}
+	interface HTML {
+		type: "html";
+		raw: string;
+		pre: boolean;
+		text: string;
+		block: boolean;
+	}
+	interface Text {
+		type: "text";
+		raw: string;
+		text: string;
+		tokens?: Token[];
+	}
+	interface Def {
+		type: "def";
+		raw: string;
+		tag: string;
+		href: string;
+		title: string;
+	}
+	interface Escape {
+		type: "escape";
+		raw: string;
+		text: string;
+	}
+	interface Tag {
+		type: "text" | "html";
+		raw: string;
+		inLink: boolean;
+		inRawBlock: boolean;
+		text: string;
+		block: boolean;
+	}
+	interface Link {
+		type: "link";
+		raw: string;
+		href: string;
+		title?: string | null;
+		text: string;
+		tokens: Token[];
+	}
+	interface Image {
+		type: "image";
+		raw: string;
+		href: string;
+		title: string | null;
+		text: string;
+	}
+	interface Strong {
+		type: "strong";
+		raw: string;
+		text: string;
+		tokens: Token[];
+	}
+	interface Em {
+		type: "em";
+		raw: string;
+		text: string;
+		tokens: Token[];
+	}
+	interface Codespan {
+		type: "codespan";
+		raw: string;
+		text: string;
+	}
+	interface Br {
+		type: "br";
+		raw: string;
+	}
+	interface Del {
+		type: "del";
+		raw: string;
+		text: string;
+		tokens: Token[];
+	}
+	interface Generic {
+		[index: string]: any;
+		type: string;
+		raw: string;
+		tokens?: Token[] | undefined;
+	}
+}
+export type Links = Record<string, Pick<Tokens.Link | Tokens.Image, "href" | "title">>;
+export type TokensList = Token[] & {
+	links: Links;
+};
 /**
- * Compiles markdown to HTML synchronously.
+ * Renderer
+ */
+declare class _Renderer {
+	options: MarkedOptions;
+	parser: _Parser;
+	constructor(options?: MarkedOptions);
+	space(token: Tokens.Space): string;
+	code({ text, lang, escaped }: Tokens.Code): string;
+	blockquote({ tokens }: Tokens.Blockquote): string;
+	html({ text }: Tokens.HTML | Tokens.Tag): string;
+	heading({ tokens, depth }: Tokens.Heading): string;
+	hr(token: Tokens.Hr): string;
+	list(token: Tokens.List): string;
+	listitem(item: Tokens.ListItem): string;
+	checkbox({ checked }: Tokens.Checkbox): string;
+	paragraph({ tokens }: Tokens.Paragraph): string;
+	table(token: Tokens.Table): string;
+	tablerow({ text }: Tokens.TableRow): string;
+	tablecell(token: Tokens.TableCell): string;
+	/**
+	 * span level renderer
+	 */
+	strong({ tokens }: Tokens.Strong): string;
+	em({ tokens }: Tokens.Em): string;
+	codespan({ text }: Tokens.Codespan): string;
+	br(token: Tokens.Br): string;
+	del({ tokens }: Tokens.Del): string;
+	link({ href, title, tokens }: Tokens.Link): string;
+	image({ href, title, text }: Tokens.Image): string;
+	text(token: Tokens.Text | Tokens.Escape | Tokens.Tag): string;
+}
+/**
+ * TextRenderer
+ * returns only the textual part of the token
+ */
+declare class _TextRenderer {
+	strong({ text }: Tokens.Strong): string;
+	em({ text }: Tokens.Em): string;
+	codespan({ text }: Tokens.Codespan): string;
+	del({ text }: Tokens.Del): string;
+	html({ text }: Tokens.HTML | Tokens.Tag): string;
+	text({ text }: Tokens.Text | Tokens.Escape | Tokens.Tag): string;
+	link({ text }: Tokens.Link): string;
+	image({ text }: Tokens.Image): string;
+	br(): string;
+}
+/**
+ * Parsing & Compiling
+ */
+declare class _Parser {
+	options: MarkedOptions;
+	renderer: _Renderer;
+	textRenderer: _TextRenderer;
+	constructor(options?: MarkedOptions);
+	/**
+	 * Static Parse Method
+	 */
+	static parse(tokens: Token[], options?: MarkedOptions): string;
+	/**
+	 * Static Parse Inline Method
+	 */
+	static parseInline(tokens: Token[], options?: MarkedOptions): string;
+	/**
+	 * Parse Loop
+	 */
+	parse(tokens: Token[], top?: boolean): string;
+	/**
+	 * Parse Inline Tokens
+	 */
+	parseInline(tokens: Token[], renderer?: _Renderer | _TextRenderer): string;
+}
+declare const blockNormal: {
+	blockquote: RegExp;
+	code: RegExp;
+	def: RegExp;
+	fences: RegExp;
+	heading: RegExp;
+	hr: RegExp;
+	html: RegExp;
+	lheading: RegExp;
+	list: RegExp;
+	newline: RegExp;
+	paragraph: RegExp;
+	table: RegExp;
+	text: RegExp;
+};
+export type BlockKeys = keyof typeof blockNormal;
+declare const inlineNormal: {
+	_backpedal: RegExp;
+	anyPunctuation: RegExp;
+	autolink: RegExp;
+	blockSkip: RegExp;
+	br: RegExp;
+	code: RegExp;
+	del: RegExp;
+	emStrongLDelim: RegExp;
+	emStrongRDelimAst: RegExp;
+	emStrongRDelimUnd: RegExp;
+	escape: RegExp;
+	link: RegExp;
+	nolink: RegExp;
+	punctuation: RegExp;
+	reflink: RegExp;
+	reflinkSearch: RegExp;
+	tag: RegExp;
+	text: RegExp;
+	url: RegExp;
+};
+export type InlineKeys = keyof typeof inlineNormal;
+/**
+ * exports
+ */
+export declare const block: {
+	normal: {
+		blockquote: RegExp;
+		code: RegExp;
+		def: RegExp;
+		fences: RegExp;
+		heading: RegExp;
+		hr: RegExp;
+		html: RegExp;
+		lheading: RegExp;
+		list: RegExp;
+		newline: RegExp;
+		paragraph: RegExp;
+		table: RegExp;
+		text: RegExp;
+	};
+	gfm: Record<"code" | "blockquote" | "hr" | "html" | "table" | "text" | "heading" | "list" | "paragraph" | "def" | "fences" | "lheading" | "newline", RegExp>;
+	pedantic: Record<"code" | "blockquote" | "hr" | "html" | "table" | "text" | "heading" | "list" | "paragraph" | "def" | "fences" | "lheading" | "newline", RegExp>;
+};
+export declare const inline: {
+	normal: {
+		_backpedal: RegExp;
+		anyPunctuation: RegExp;
+		autolink: RegExp;
+		blockSkip: RegExp;
+		br: RegExp;
+		code: RegExp;
+		del: RegExp;
+		emStrongLDelim: RegExp;
+		emStrongRDelimAst: RegExp;
+		emStrongRDelimUnd: RegExp;
+		escape: RegExp;
+		link: RegExp;
+		nolink: RegExp;
+		punctuation: RegExp;
+		reflink: RegExp;
+		reflinkSearch: RegExp;
+		tag: RegExp;
+		text: RegExp;
+		url: RegExp;
+	};
+	gfm: Record<"link" | "code" | "url" | "br" | "del" | "text" | "escape" | "tag" | "reflink" | "autolink" | "nolink" | "_backpedal" | "anyPunctuation" | "blockSkip" | "emStrongLDelim" | "emStrongRDelimAst" | "emStrongRDelimUnd" | "punctuation" | "reflinkSearch", RegExp>;
+	breaks: Record<"link" | "code" | "url" | "br" | "del" | "text" | "escape" | "tag" | "reflink" | "autolink" | "nolink" | "_backpedal" | "anyPunctuation" | "blockSkip" | "emStrongLDelim" | "emStrongRDelimAst" | "emStrongRDelimUnd" | "punctuation" | "reflinkSearch", RegExp>;
+	pedantic: Record<"link" | "code" | "url" | "br" | "del" | "text" | "escape" | "tag" | "reflink" | "autolink" | "nolink" | "_backpedal" | "anyPunctuation" | "blockSkip" | "emStrongLDelim" | "emStrongRDelimAst" | "emStrongRDelimUnd" | "punctuation" | "reflinkSearch", RegExp>;
+};
+export interface Rules {
+	block: Record<BlockKeys, RegExp>;
+	inline: Record<InlineKeys, RegExp>;
+}
+/**
+ * Tokenizer
+ */
+declare class _Tokenizer {
+	options: MarkedOptions;
+	rules: Rules;
+	lexer: _Lexer;
+	constructor(options?: MarkedOptions);
+	space(src: string): Tokens.Space | undefined;
+	code(src: string): Tokens.Code | undefined;
+	fences(src: string): Tokens.Code | undefined;
+	heading(src: string): Tokens.Heading | undefined;
+	hr(src: string): Tokens.Hr | undefined;
+	blockquote(src: string): Tokens.Blockquote | undefined;
+	list(src: string): Tokens.List | undefined;
+	html(src: string): Tokens.HTML | undefined;
+	def(src: string): Tokens.Def | undefined;
+	table(src: string): Tokens.Table | undefined;
+	lheading(src: string): Tokens.Heading | undefined;
+	paragraph(src: string): Tokens.Paragraph | undefined;
+	text(src: string): Tokens.Text | undefined;
+	escape(src: string): Tokens.Escape | undefined;
+	tag(src: string): Tokens.Tag | undefined;
+	link(src: string): Tokens.Link | Tokens.Image | undefined;
+	reflink(src: string, links: Links): Tokens.Link | Tokens.Image | Tokens.Text | undefined;
+	emStrong(src: string, maskedSrc: string, prevChar?: string): Tokens.Em | Tokens.Strong | undefined;
+	codespan(src: string): Tokens.Codespan | undefined;
+	br(src: string): Tokens.Br | undefined;
+	del(src: string): Tokens.Del | undefined;
+	autolink(src: string): Tokens.Link | undefined;
+	url(src: string): Tokens.Link | undefined;
+	inlineText(src: string): Tokens.Text | undefined;
+}
+declare class _Hooks {
+	options: MarkedOptions;
+	constructor(options?: MarkedOptions);
+	static passThroughHooks: Set<string>;
+	/**
+	 * Process markdown before marked
+	 */
+	preprocess(markdown: string): string;
+	/**
+	 * Process HTML after marked is finished
+	 */
+	postprocess(html: string): string;
+	/**
+	 * Process all tokens before walk tokens
+	 */
+	processAllTokens(tokens: Token[] | TokensList): Token[] | TokensList;
+}
+export interface TokenizerThis {
+	lexer: _Lexer;
+}
+export type TokenizerExtensionFunction = (this: TokenizerThis, src: string, tokens: Token[] | TokensList) => Tokens.Generic | undefined;
+export type TokenizerStartFunction = (this: TokenizerThis, src: string) => number | void;
+export interface TokenizerExtension {
+	name: string;
+	level: "block" | "inline";
+	start?: TokenizerStartFunction | undefined;
+	tokenizer: TokenizerExtensionFunction;
+	childTokens?: string[] | undefined;
+}
+export interface RendererThis {
+	parser: _Parser;
+}
+export type RendererExtensionFunction = (this: RendererThis, token: Tokens.Generic) => string | false | undefined;
+export interface RendererExtension {
+	name: string;
+	renderer: RendererExtensionFunction;
+}
+export type TokenizerAndRendererExtension = TokenizerExtension | RendererExtension | (TokenizerExtension & RendererExtension);
+export type HooksApi = Omit<_Hooks, "constructor" | "options">;
+export type HooksObject = {
+	[K in keyof HooksApi]?: (this: _Hooks, ...args: Parameters<HooksApi[K]>) => ReturnType<HooksApi[K]> | Promise<ReturnType<HooksApi[K]>>;
+};
+export type RendererApi = Omit<_Renderer, "constructor" | "options" | "parser">;
+export type RendererObject = {
+	[K in keyof RendererApi]?: (this: _Renderer, ...args: Parameters<RendererApi[K]>) => ReturnType<RendererApi[K]> | false;
+};
+export type TokenizerApi = Omit<_Tokenizer, "constructor" | "options" | "rules" | "lexer">;
+export type TokenizerObject = {
+	[K in keyof TokenizerApi]?: (this: _Tokenizer, ...args: Parameters<TokenizerApi[K]>) => ReturnType<TokenizerApi[K]> | false;
+};
+export interface MarkedExtension {
+	/**
+	 * True will tell marked to await any walkTokens functions before parsing the tokens and returning an HTML string.
+	 */
+	async?: boolean;
+	/**
+	 * Enable GFM line breaks. This option requires the gfm option to be true.
+	 */
+	breaks?: boolean | undefined;
+	/**
+	 * Add tokenizers and renderers to marked
+	 */
+	extensions?: TokenizerAndRendererExtension[] | undefined | null;
+	/**
+	 * Enable GitHub flavored markdown.
+	 */
+	gfm?: boolean | undefined;
+	/**
+	 * Hooks are methods that hook into some part of marked.
+	 * preprocess is called to process markdown before sending it to marked.
+	 * processAllTokens is called with the TokensList before walkTokens.
+	 * postprocess is called to process html after marked has finished parsing.
+	 */
+	hooks?: HooksObject | undefined | null;
+	/**
+	 * Conform to obscure parts of markdown.pl as much as possible. Don't fix any of the original markdown bugs or poor behavior.
+	 */
+	pedantic?: boolean | undefined;
+	/**
+	 * Type: object Default: new Renderer()
+	 *
+	 * An object containing functions to render tokens to HTML.
+	 */
+	renderer?: RendererObject | undefined | null;
+	/**
+	 * Shows an HTML error message when rendering fails.
+	 */
+	silent?: boolean | undefined;
+	/**
+	 * The tokenizer defines how to turn markdown text into tokens.
+	 */
+	tokenizer?: TokenizerObject | undefined | null;
+	/**
+	 * The walkTokens function gets called with every token.
+	 * Child tokens are called before moving on to sibling tokens.
+	 * Each token is passed by reference so updates are persisted when passed to the parser.
+	 * The return value of the function is ignored.
+	 */
+	walkTokens?: ((token: Token) => void | Promise<void>) | undefined | null;
+}
+export interface MarkedOptions extends Omit<MarkedExtension, "hooks" | "renderer" | "tokenizer" | "extensions" | "walkTokens"> {
+	/**
+	 * Hooks are methods that hook into some part of marked.
+	 */
+	hooks?: _Hooks | undefined | null;
+	/**
+	 * Type: object Default: new Renderer()
+	 *
+	 * An object containing functions to render tokens to HTML.
+	 */
+	renderer?: _Renderer | undefined | null;
+	/**
+	 * The tokenizer defines how to turn markdown text into tokens.
+	 */
+	tokenizer?: _Tokenizer | undefined | null;
+	/**
+	 * Custom extensions
+	 */
+	extensions?: null | {
+		renderers: {
+			[name: string]: RendererExtensionFunction;
+		};
+		childTokens: {
+			[name: string]: string[];
+		};
+		inline?: TokenizerExtensionFunction[];
+		block?: TokenizerExtensionFunction[];
+		startInline?: TokenizerStartFunction[];
+		startBlock?: TokenizerStartFunction[];
+	};
+	/**
+	 * walkTokens function returns array of values for Promise.all
+	 */
+	walkTokens?: null | ((token: Token) => void | Promise<void> | (void | Promise<void>)[]);
+}
+/**
+ * Block Lexer
+ */
+declare class _Lexer {
+	tokens: TokensList;
+	options: MarkedOptions;
+	state: {
+		inLink: boolean;
+		inRawBlock: boolean;
+		top: boolean;
+	};
+	private tokenizer;
+	private inlineQueue;
+	constructor(options?: MarkedOptions);
+	/**
+	 * Expose Rules
+	 */
+	static get rules(): {
+		block: {
+			normal: {
+				blockquote: RegExp;
+				code: RegExp;
+				def: RegExp;
+				fences: RegExp;
+				heading: RegExp;
+				hr: RegExp;
+				html: RegExp;
+				lheading: RegExp;
+				list: RegExp;
+				newline: RegExp;
+				paragraph: RegExp;
+				table: RegExp;
+				text: RegExp;
+			};
+			gfm: Record<"code" | "blockquote" | "hr" | "html" | "table" | "text" | "heading" | "list" | "paragraph" | "def" | "fences" | "lheading" | "newline", RegExp>;
+			pedantic: Record<"code" | "blockquote" | "hr" | "html" | "table" | "text" | "heading" | "list" | "paragraph" | "def" | "fences" | "lheading" | "newline", RegExp>;
+		};
+		inline: {
+			normal: {
+				_backpedal: RegExp;
+				anyPunctuation: RegExp;
+				autolink: RegExp;
+				blockSkip: RegExp;
+				br: RegExp;
+				code: RegExp;
+				del: RegExp;
+				emStrongLDelim: RegExp;
+				emStrongRDelimAst: RegExp;
+				emStrongRDelimUnd: RegExp;
+				escape: RegExp;
+				link: RegExp;
+				nolink: RegExp;
+				punctuation: RegExp;
+				reflink: RegExp;
+				reflinkSearch: RegExp;
+				tag: RegExp;
+				text: RegExp;
+				url: RegExp;
+			};
+			gfm: Record<"link" | "code" | "url" | "br" | "del" | "text" | "escape" | "tag" | "reflink" | "autolink" | "nolink" | "_backpedal" | "anyPunctuation" | "blockSkip" | "emStrongLDelim" | "emStrongRDelimAst" | "emStrongRDelimUnd" | "punctuation" | "reflinkSearch", RegExp>;
+			breaks: Record<"link" | "code" | "url" | "br" | "del" | "text" | "escape" | "tag" | "reflink" | "autolink" | "nolink" | "_backpedal" | "anyPunctuation" | "blockSkip" | "emStrongLDelim" | "emStrongRDelimAst" | "emStrongRDelimUnd" | "punctuation" | "reflinkSearch", RegExp>;
+			pedantic: Record<"link" | "code" | "url" | "br" | "del" | "text" | "escape" | "tag" | "reflink" | "autolink" | "nolink" | "_backpedal" | "anyPunctuation" | "blockSkip" | "emStrongLDelim" | "emStrongRDelimAst" | "emStrongRDelimUnd" | "punctuation" | "reflinkSearch", RegExp>;
+		};
+	};
+	/**
+	 * Static Lex Method
+	 */
+	static lex(src: string, options?: MarkedOptions): TokensList;
+	/**
+	 * Static Lex Inline Method
+	 */
+	static lexInline(src: string, options?: MarkedOptions): Token[];
+	/**
+	 * Preprocessing
+	 */
+	lex(src: string): TokensList;
+	/**
+	 * Lexing
+	 */
+	blockTokens(src: string, tokens?: Token[], lastParagraphClipped?: boolean): Token[];
+	blockTokens(src: string, tokens?: TokensList, lastParagraphClipped?: boolean): TokensList;
+	inline(src: string, tokens?: Token[]): Token[];
+	/**
+	 * Lexing/Compiling
+	 */
+	inlineTokens(src: string, tokens?: Token[]): Token[];
+}
+/**
+ * Gets the original marked default options.
+ */
+declare function _getDefaults(): MarkedOptions;
+declare let _defaults: MarkedOptions;
+export type MaybePromise = void | Promise<void>;
+export declare class Marked {
+	defaults: MarkedOptions;
+	options: (opt: MarkedOptions) => this;
+	parse: {
+		(src: string, options: MarkedOptions & {
+			async: true;
+		}): Promise<string>;
+		(src: string, options: MarkedOptions & {
+			async: false;
+		}): string;
+		(src: string, options?: MarkedOptions | undefined | null): string | Promise<string>;
+	};
+	parseInline: {
+		(src: string, options: MarkedOptions & {
+			async: true;
+		}): Promise<string>;
+		(src: string, options: MarkedOptions & {
+			async: false;
+		}): string;
+		(src: string, options?: MarkedOptions | undefined | null): string | Promise<string>;
+	};
+	Parser: typeof _Parser;
+	Renderer: typeof _Renderer;
+	TextRenderer: typeof _TextRenderer;
+	Lexer: typeof _Lexer;
+	Tokenizer: typeof _Tokenizer;
+	Hooks: typeof _Hooks;
+	constructor(...args: MarkedExtension[]);
+	/**
+	 * Run callback for every token
+	 */
+	walkTokens(tokens: Token[] | TokensList, callback: (token: Token) => MaybePromise | MaybePromise[]): MaybePromise[];
+	use(...args: MarkedExtension[]): this;
+	setOptions(opt: MarkedOptions): this;
+	lexer(src: string, options?: MarkedOptions): TokensList;
+	parser(tokens: Token[], options?: MarkedOptions): string;
+	private parseMarkdown;
+	private onError;
+}
+/**
+ * Compiles markdown to HTML asynchronously.
+ *
+ * @param src String of markdown source to be compiled
+ * @param options Hash of options, having async: true
+ * @return Promise of string of compiled HTML
+ */
+export declare function marked(src: string, options: MarkedOptions & {
+	async: true;
+}): Promise<string>;
+/**
+ * Compiles markdown to HTML.
  *
  * @param src String of markdown source to be compiled
  * @param options Optional hash of options
- * @return String of compiled HTML
+ * @return String of compiled HTML. Will be a Promise of string if async is set to true by any extensions.
  */
-export function marked(src: string, options?: marked.MarkedOptions): string;
-
-/**
- * Compiles markdown to HTML asynchronously.
- *
- * @param src String of markdown source to be compiled
- * @param callback Function called when the markdownString has been fully parsed when using async highlighting
- */
-export function marked(src: string, callback: (error: any, parseResult: string) => void): void;
-
-/**
- * Compiles markdown to HTML asynchronously.
- *
- * @param src String of markdown source to be compiled
- * @param options Hash of options
- * @param callback Function called when the markdownString has been fully parsed when using async highlighting
- */
-export function marked(
-	src: string,
-	options: marked.MarkedOptions,
-	callback: (error: any, parseResult: string) => void,
-): void;
-
-export class Lexer extends marked.Lexer { }
-export class Parser extends marked.Parser { }
-export class Tokenizer<T = never> extends marked.Tokenizer<T> { }
-export class Renderer<T = never> extends marked.Renderer<T> { }
-export class TextRenderer extends marked.TextRenderer { }
-export class Slugger extends marked.Slugger { }
-
-export namespace marked {
-	const defaults: MarkedOptions;
-
-	/**
-	 * @param src String of markdown source to be compiled
-	 * @param options Hash of options
-	 */
-	function lexer(src: string, options?: MarkedOptions): TokensList;
-
-	/**
-	 * Compiles markdown to HTML.
-	 *
-	 * @param src String of markdown source to be compiled
-	 * @param callback Function called when the markdownString has been fully parsed when using async highlighting
-	 * @return String of compiled HTML
-	 */
-	function parse(src: string, callback: (error: any, parseResult: string) => void): string;
-
-	/**
-	 * Compiles markdown to HTML.
-	 *
-	 * @param src String of markdown source to be compiled
-	 * @param options Hash of options
-	 * @param callback Function called when the markdownString has been fully parsed when using async highlighting
-	 * @return String of compiled HTML
-	 */
-	function parse(src: string, options?: MarkedOptions, callback?: (error: any, parseResult: string) => void): string;
-
-	/**
-	 * @param src Tokenized source as array of tokens
-	 * @param options Hash of options
-	 */
-	function parser(src: Token[] | TokensList, options?: MarkedOptions): string;
-
-	/**
-	 * Compiles markdown to HTML without enclosing `p` tag.
-	 *
-	 * @param src String of markdown source to be compiled
-	 * @param options Hash of options
-	 * @return String of compiled HTML
-	 */
-	function parseInline(src: string, options?: MarkedOptions): string;
-
-	/**
-	 * Sets the default options.
-	 *
-	 * @param options Hash of options
-	 */
-	function options(options: MarkedOptions): typeof marked;
-
-	/**
-	 * Sets the default options.
-	 *
-	 * @param options Hash of options
-	 */
-	function setOptions(options: MarkedOptions): typeof marked;
-
-	/**
-	 * Gets the original marked default options.
-	 */
-	function getDefaults(): MarkedOptions;
-
-	function walkTokens(tokens: Token[] | TokensList, callback: (token: Token) => void): typeof marked;
-
-	/**
-	 * Use Extension
-	 * @param MarkedExtension
-	 */
-	function use(...extensions: MarkedExtension[]): void;
-
-	class Tokenizer<T = never> {
-		constructor(options?: MarkedOptions);
-		options: MarkedOptions;
-		space(this: Tokenizer & TokenizerThis, src: string): Tokens.Space | T;
-		code(this: Tokenizer & TokenizerThis, src: string): Tokens.Code | T;
-		fences(this: Tokenizer & TokenizerThis, src: string): Tokens.Code | T;
-		heading(this: Tokenizer & TokenizerThis, src: string): Tokens.Heading | T;
-		hr(this: Tokenizer & TokenizerThis, src: string): Tokens.Hr | T;
-		blockquote(this: Tokenizer & TokenizerThis, src: string): Tokens.Blockquote | T;
-		list(this: Tokenizer & TokenizerThis, src: string): Tokens.List | T;
-		html(this: Tokenizer & TokenizerThis, src: string): Tokens.HTML | T;
-		def(this: Tokenizer & TokenizerThis, src: string): Tokens.Def | T;
-		table(this: Tokenizer & TokenizerThis, src: string): Tokens.Table | T;
-		lheading(this: Tokenizer & TokenizerThis, src: string): Tokens.Heading | T;
-		paragraph(this: Tokenizer & TokenizerThis, src: string): Tokens.Paragraph | T;
-		text(this: Tokenizer & TokenizerThis, src: string): Tokens.Text | T;
-		escape(this: Tokenizer & TokenizerThis, src: string): Tokens.Escape | T;
-		tag(this: Tokenizer & TokenizerThis, src: string): Tokens.Tag | T;
-		link(this: Tokenizer & TokenizerThis, src: string): Tokens.Image | Tokens.Link | T;
-		reflink(
-			this: Tokenizer & TokenizerThis,
-			src: string,
-			links: Tokens.Link[] | Tokens.Image[],
-		): Tokens.Link | Tokens.Image | Tokens.Text | T;
-		emStrong(
-			this: Tokenizer & TokenizerThis,
-			src: string,
-			maskedSrc: string,
-			prevChar: string,
-		): Tokens.Em | Tokens.Strong | T;
-		codespan(this: Tokenizer & TokenizerThis, src: string): Tokens.Codespan | T;
-		br(this: Tokenizer & TokenizerThis, src: string): Tokens.Br | T;
-		del(this: Tokenizer & TokenizerThis, src: string): Tokens.Del | T;
-		autolink(this: Tokenizer & TokenizerThis, src: string, mangle: (cap: string) => string): Tokens.Link | T;
-		url(this: Tokenizer & TokenizerThis, src: string, mangle: (cap: string) => string): Tokens.Link | T;
-		inlineText(this: Tokenizer & TokenizerThis, src: string, smartypants: (cap: string) => string): Tokens.Text | T;
-	}
-
-	type TokenizerObject = Partial<Omit<Tokenizer<false>, 'constructor' | 'options'>>;
-
-	class Renderer<T = never> {
-		constructor(options?: MarkedOptions);
-		options: MarkedOptions;
-		code(this: Renderer | RendererThis, code: string, language: string | undefined, isEscaped: boolean): string | T;
-		blockquote(this: Renderer | RendererThis, quote: string): string | T;
-		html(this: Renderer | RendererThis, html: string): string | T;
-		heading(
-			this: Renderer | RendererThis,
-			text: string,
-			level: 1 | 2 | 3 | 4 | 5 | 6,
-			raw: string,
-			slugger: Slugger,
-		): string | T;
-		hr(this: Renderer | RendererThis): string | T;
-		list(this: Renderer | RendererThis, body: string, ordered: boolean, start: number): string | T;
-		listitem(this: Renderer | RendererThis, text: string, task: boolean, checked: boolean): string | T;
-		checkbox(this: Renderer | RendererThis, checked: boolean): string | T;
-		paragraph(this: Renderer | RendererThis, text: string): string | T;
-		table(this: Renderer | RendererThis, header: string, body: string): string | T;
-		tablerow(this: Renderer | RendererThis, content: string): string | T;
-		tablecell(
-			this: Renderer | RendererThis,
-			content: string,
-			flags: {
-				header: boolean;
-				align: 'center' | 'left' | 'right' | null;
-			},
-		): string | T;
-		strong(this: Renderer | RendererThis, text: string): string | T;
-		em(this: Renderer | RendererThis, text: string): string | T;
-		codespan(this: Renderer | RendererThis, code: string): string | T;
-		br(this: Renderer | RendererThis): string | T;
-		del(this: Renderer | RendererThis, text: string): string | T;
-		link(this: Renderer | RendererThis, href: string | null, title: string | null, text: string): string | T;
-		image(this: Renderer | RendererThis, href: string | null, title: string | null, text: string): string | T;
-		text(this: Renderer | RendererThis, text: string): string | T;
-	}
-
-	type RendererObject = Partial<Omit<Renderer<false>, 'constructor' | 'options'>>;
-
-	class TextRenderer {
-		strong(text: string): string;
-		em(text: string): string;
-		codespan(text: string): string;
-		del(text: string): string;
-		text(text: string): string;
-		link(href: string | null, title: string | null, text: string): string;
-		image(href: string | null, title: string | null, text: string): string;
-		br(): string;
-		html(text: string): string;
-	}
-
-	class Parser {
-		constructor(options?: MarkedOptions);
-		tokens: Token[] | TokensList;
-		token: Token | null;
-		options: MarkedOptions;
-		renderer: Renderer;
-		textRenderer: TextRenderer;
-		slugger: Slugger;
-		static parse(src: Token[] | TokensList, options?: MarkedOptions): string;
-		static parseInline(src: Token[], options?: MarkedOptions): string;
-		parse(src: Token[] | TokensList): string;
-		parseInline(src: Token[], renderer?: Renderer): string;
-		next(): Token;
-	}
-
-	class Lexer {
-		constructor(options?: MarkedOptions);
-		tokens: TokensList;
-		options: MarkedOptions;
-		rules: Rules;
-		static rules: Rules;
-		static lex(src: string, options?: MarkedOptions): TokensList;
-		static lexInline(src: string, options?: MarkedOptions): Token[];
-		lex(src: string): TokensList;
-		blockTokens(src: string, tokens: Token[]): Token[];
-		blockTokens(src: string, tokens: TokensList): TokensList;
-		inline(src: string, tokens?: Token[]): Token[];
-		inlineTokens(src: string, tokens?: Token[]): Token[];
-		state: {
-			inLink: boolean;
-			inRawBlock: boolean;
-			top: boolean;
-		};
-	}
-
-	class Slugger {
-		seen: { [slugValue: string]: number };
-		slug(value: string, options?: SluggerOptions): string;
-	}
-
-	interface SluggerOptions {
-		dryrun: boolean;
-	}
-
-	interface Rules {
-		[ruleName: string]: RegExp | Rules;
-	}
-
-	type TokensList = Token[] & {
-		links: {
-			[key: string]: { href: string | null; title: string | null };
-		};
+export declare function marked(src: string, options: MarkedOptions & {
+	async: false;
+}): string;
+export declare function marked(src: string, options: MarkedOptions & {
+	async: true;
+}): Promise<string>;
+export declare function marked(src: string, options?: MarkedOptions | undefined | null): string | Promise<string>;
+export declare namespace marked {
+	var options: (options: MarkedOptions) => typeof marked;
+	var setOptions: (options: MarkedOptions) => typeof marked;
+	var getDefaults: typeof _getDefaults;
+	var defaults: MarkedOptions;
+	var use: (...args: MarkedExtension[]) => typeof marked;
+	var walkTokens: (tokens: Token[] | TokensList, callback: (token: Token) => MaybePromise | MaybePromise[]) => MaybePromise[];
+	var parseInline: {
+		(src: string, options: MarkedOptions & {
+			async: true;
+		}): Promise<string>;
+		(src: string, options: MarkedOptions & {
+			async: false;
+		}): string;
+		(src: string, options?: MarkedOptions | undefined | null): string | Promise<string>;
 	};
-
-	type Token =
-		| Tokens.Space
-		| Tokens.Code
-		| Tokens.Heading
-		| Tokens.Table
-		| Tokens.Hr
-		| Tokens.Blockquote
-		| Tokens.List
-		| Tokens.ListItem
-		| Tokens.Paragraph
-		| Tokens.HTML
-		| Tokens.Text
-		| Tokens.Def
-		| Tokens.Escape
-		| Tokens.Tag
-		| Tokens.Image
-		| Tokens.Link
-		| Tokens.Strong
-		| Tokens.Em
-		| Tokens.Codespan
-		| Tokens.Br
-		| Tokens.Del;
-
-	namespace Tokens {
-		interface Space {
-			type: 'space';
-			raw: string;
-		}
-
-		interface Code {
-			type: 'code';
-			raw: string;
-			codeBlockStyle?: 'indented' | undefined;
-			lang?: string | undefined;
-			text: string;
-		}
-
-		interface Heading {
-			type: 'heading';
-			raw: string;
-			depth: number;
-			text: string;
-			tokens: Token[];
-		}
-
-		interface Table {
-			type: 'table';
-			raw: string;
-			align: Array<'center' | 'left' | 'right' | null>;
-			header: TableCell[];
-			rows: TableCell[][];
-		}
-
-		interface TableCell {
-			text: string;
-			tokens: Token[];
-		}
-
-		interface Hr {
-			type: 'hr';
-			raw: string;
-		}
-
-		interface Blockquote {
-			type: 'blockquote';
-			raw: string;
-			text: string;
-			tokens: Token[];
-		}
-
-		interface List {
-			type: 'list';
-			raw: string;
-			ordered: boolean;
-			start: number | '';
-			loose: boolean;
-			items: ListItem[];
-		}
-
-		interface ListItem {
-			type: 'list_item';
-			raw: string;
-			task: boolean;
-			checked?: boolean | undefined;
-			loose: boolean;
-			text: string;
-			tokens: Token[];
-		}
-
-		interface Paragraph {
-			type: 'paragraph';
-			raw: string;
-			pre?: boolean | undefined;
-			text: string;
-			tokens: Token[];
-		}
-
-		interface HTML {
-			type: 'html';
-			raw: string;
-			pre: boolean;
-			text: string;
-		}
-
-		interface Text {
-			type: 'text';
-			raw: string;
-			text: string;
-			tokens?: Token[] | undefined;
-		}
-
-		interface Def {
-			type: 'def';
-			raw: string;
-			tag: string;
-			href: string;
-			title: string;
-		}
-
-		interface Escape {
-			type: 'escape';
-			raw: string;
-			text: string;
-		}
-
-		interface Tag {
-			type: 'text' | 'html';
-			raw: string;
-			inLink: boolean;
-			inRawBlock: boolean;
-			text: string;
-		}
-
-		interface Link {
-			type: 'link';
-			raw: string;
-			href: string;
-			title: string;
-			text: string;
-			tokens: Token[];
-		}
-
-		interface Image {
-			type: 'image';
-			raw: string;
-			href: string;
-			title: string;
-			text: string;
-		}
-
-		interface Strong {
-			type: 'strong';
-			raw: string;
-			text: string;
-			tokens: Token[];
-		}
-
-		interface Em {
-			type: 'em';
-			raw: string;
-			text: string;
-			tokens: Token[];
-		}
-
-		interface Codespan {
-			type: 'codespan';
-			raw: string;
-			text: string;
-		}
-
-		interface Br {
-			type: 'br';
-			raw: string;
-		}
-
-		interface Del {
-			type: 'del';
-			raw: string;
-			text: string;
-			tokens: Token[];
-		}
-
-		interface Generic {
-			[index: string]: any;
-			type: string;
-			raw: string;
-			tokens?: Token[] | undefined;
-		}
-	}
-
-	interface TokenizerThis {
-		lexer: Lexer;
-	}
-
-	interface TokenizerExtension {
-		name: string;
-		level: 'block' | 'inline';
-		start?: ((this: TokenizerThis, src: string) => number | void) | undefined;
-		tokenizer: (this: TokenizerThis, src: string, tokens: Token[] | TokensList) => Tokens.Generic | void;
-		childTokens?: string[] | undefined;
-	}
-
-	interface RendererThis {
-		parser: Parser;
-	}
-
-	interface RendererExtension {
-		name: string;
-		renderer: (this: RendererThis, token: Tokens.Generic) => string | false;
-	}
-
-	interface MarkedExtension {
-		/**
-		 * A prefix URL for any relative link.
-		 */
-		baseUrl?: string | undefined;
-
-		/**
-		 * Enable GFM line breaks. This option requires the gfm option to be true.
-		 */
-		breaks?: boolean | undefined;
-
-		/**
-		 * Add tokenizers and renderers to marked
-		 */
-		extensions?:
-		| Array<TokenizerExtension | RendererExtension | (TokenizerExtension & RendererExtension)>
-		| undefined;
-
-		/**
-		 * Enable GitHub flavored markdown.
-		 */
-		gfm?: boolean | undefined;
-
-		/**
-		 * Include an id attribute when emitting headings.
-		 */
-		headerIds?: boolean | undefined;
-
-		/**
-		 * Set the prefix for header tag ids.
-		 */
-		headerPrefix?: string | undefined;
-
-		/**
-		 * A function to highlight code blocks. The function can either be
-		 * synchronous (returning a string) or asynchronous (callback invoked
-		 * with an error if any occurred during highlighting and a string
-		 * if highlighting was successful)
-		 */
-		highlight?(code: string, lang: string, callback?: (error: any, code?: string) => void): string | void;
-
-		/**
-		 * Set the prefix for code block classes.
-		 */
-		langPrefix?: string | undefined;
-
-		/**
-		 * Mangle autolinks (<email@domain.com>).
-		 */
-		mangle?: boolean | undefined;
-
-		/**
-		 * Conform to obscure parts of markdown.pl as much as possible. Don't fix any of the original markdown bugs or poor behavior.
-		 */
-		pedantic?: boolean | undefined;
-
-		/**
-		 * Type: object Default: new Renderer()
-		 *
-		 * An object containing functions to render tokens to HTML.
-		 */
-		renderer?: Renderer | RendererObject | undefined;
-
-		/**
-		 * Sanitize the output. Ignore any HTML that has been input.
-		 */
-		sanitize?: boolean | undefined;
-
-		/**
-		 * Optionally sanitize found HTML with a sanitizer function.
-		 */
-		sanitizer?(html: string): string;
-
-		/**
-		 * Shows an HTML error message when rendering fails.
-		 */
-		silent?: boolean | undefined;
-
-		/**
-		 * Use smarter list behavior than the original markdown. May eventually be default with the old behavior moved into pedantic.
-		 */
-		smartLists?: boolean | undefined;
-
-		/**
-		 * Use "smart" typograhic punctuation for things like quotes and dashes.
-		 */
-		smartypants?: boolean | undefined;
-
-		/**
-		 * The tokenizer defines how to turn markdown text into tokens.
-		 */
-		tokenizer?: Tokenizer | TokenizerObject | undefined;
-
-		/**
-		 * The walkTokens function gets called with every token.
-		 * Child tokens are called before moving on to sibling tokens.
-		 * Each token is passed by reference so updates are persisted when passed to the parser.
-		 * The return value of the function is ignored.
-		 */
-		walkTokens?: ((token: Token) => void) | undefined;
-		/**
-		 * Generate closing slash for self-closing tags (<br/> instead of <br>)
-		 */
-		xhtml?: boolean | undefined;
-	}
-
-	interface MarkedOptions extends Omit<MarkedExtension, 'extensions'> {
-		/**
-		 * Type: object Default: new Renderer()
-		 *
-		 * An object containing functions to render tokens to HTML.
-		 */
-		renderer?: Renderer | undefined;
-
-		/**
-		 * The tokenizer defines how to turn markdown text into tokens.
-		 */
-		tokenizer?: Tokenizer | undefined;
-	}
+	var Parser: typeof _Parser;
+	var parser: typeof _Parser.parse;
+	var Renderer: typeof _Renderer;
+	var TextRenderer: typeof _TextRenderer;
+	var Lexer: typeof _Lexer;
+	var lexer: typeof _Lexer.lex;
+	var Tokenizer: typeof _Tokenizer;
+	var Hooks: typeof _Hooks;
+	var parse: typeof marked;
 }
+export declare const options: (options: MarkedOptions) => typeof marked;
+export declare const setOptions: (options: MarkedOptions) => typeof marked;
+export declare const use: (...args: MarkedExtension[]) => typeof marked;
+export declare const walkTokens: (tokens: Token[] | TokensList, callback: (token: Token) => MaybePromise | MaybePromise[]) => MaybePromise[];
+export declare const parseInline: {
+	(src: string, options: MarkedOptions & {
+		async: true;
+	}): Promise<string>;
+	(src: string, options: MarkedOptions & {
+		async: false;
+	}): string;
+	(src: string, options?: MarkedOptions | undefined | null): string | Promise<string>;
+};
+export declare const parse: typeof marked;
+export declare const parser: typeof _Parser.parse;
+export declare const lexer: typeof _Lexer.lex;
+
+export {
+	_Hooks as Hooks,
+	_Lexer as Lexer,
+	_Parser as Parser,
+	_Renderer as Renderer,
+	_TextRenderer as TextRenderer,
+	_Tokenizer as Tokenizer,
+	_defaults as defaults,
+	_getDefaults as getDefaults,
+};
+
+export { };
diff --git a/src/vs/base/common/marked/marked.js b/src/vs/base/common/marked/marked.js
index eb8cde82ab4..9988c904407 100644
--- a/src/vs/base/common/marked/marked.js
+++ b/src/vs/base/common/marked/marked.js
@@ -1,6 +1,6 @@
 /**
- * marked - a markdown parser
- * Copyright (c) 2011-2022, Christopher Jeffrey. (MIT Licensed)
+ * marked v14.0.0 - a markdown parser
+ * Copyright (c) 2011-2024, Christopher Jeffrey. (MIT Licensed)
  * https://github.com/markedjs/marked
  */
 
@@ -9,3092 +9,2526 @@
  * The code in this file is generated from files in ./src/
  */
 
-// ESM-uncomment-begin
-// let __marked_exports = {};
-// (function() {
-//   function define(deps, factory) {
-//     factory(__marked_exports);
-//   }
-//   define.amd = true;
-// ESM-uncomment-end
-
- (function (global, factory) {
-  typeof define === 'function' && define.amd ? define(['exports'], factory) :
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.marked = {}));
-})(this, (function (exports) { 'use strict';
-
-  function _defineProperties(target, props) {
-    for (var i = 0; i < props.length; i++) {
-      var descriptor = props[i];
-      descriptor.enumerable = descriptor.enumerable || false;
-      descriptor.configurable = true;
-      if ("value" in descriptor) descriptor.writable = true;
-      Object.defineProperty(target, descriptor.key, descriptor);
-    }
-  }
-
-  function _createClass(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
-    if (staticProps) _defineProperties(Constructor, staticProps);
-    Object.defineProperty(Constructor, "prototype", {
-      writable: false
-    });
-    return Constructor;
-  }
-
-  function _unsupportedIterableToArray(o, minLen) {
-    if (!o) return;
-    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
-    var n = Object.prototype.toString.call(o).slice(8, -1);
-    if (n === "Object" && o.constructor) n = o.constructor.name;
-    if (n === "Map" || n === "Set") return Array.from(o);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
-  }
-
-  function _arrayLikeToArray(arr, len) {
-    if (len == null || len > arr.length) len = arr.length;
-
-    for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
-
-    return arr2;
-  }
-
-  function _createForOfIteratorHelperLoose(o, allowArrayLike) {
-    var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"];
-    if (it) return (it = it.call(o)).next.bind(it);
-
-    if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") {
-      if (it) o = it;
-      var i = 0;
-      return function () {
-        if (i >= o.length) return {
-          done: true
-        };
-        return {
-          done: false,
-          value: o[i++]
-        };
-      };
-    }
-
-    throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-  }
-
-  function getDefaults() {
-    return {
-      async: false,
-      baseUrl: null,
-      breaks: false,
-      extensions: null,
-      gfm: true,
-      headerIds: true,
-      headerPrefix: '',
-      highlight: null,
-      langPrefix: 'language-',
-      mangle: true,
-      pedantic: false,
-      renderer: null,
-      sanitize: false,
-      sanitizer: null,
-      silent: false,
-      smartLists: false,
-      smartypants: false,
-      tokenizer: null,
-      walkTokens: null,
-      xhtml: false
-    };
-  }
-  exports.defaults = getDefaults();
-  function changeDefaults(newDefaults) {
-    exports.defaults = newDefaults;
-  }
-
-  /**
-   * Helpers
-   */
-  var escapeTest = /[&<>"']/;
-  var escapeReplace = /[&<>"']/g;
-  var escapeTestNoEncode = /[<>"']|&(?!#?\w+;)/;
-  var escapeReplaceNoEncode = /[<>"']|&(?!#?\w+;)/g;
-  var escapeReplacements = {
-    '&': '&amp;',
-    '<': '&lt;',
-    '>': '&gt;',
-    '"': '&quot;',
-    "'": '&#39;'
-  };
-
-  var getEscapeReplacement = function getEscapeReplacement(ch) {
-    return escapeReplacements[ch];
-  };
-
-  function escape(html, encode) {
-    if (encode) {
-      if (escapeTest.test(html)) {
-        return html.replace(escapeReplace, getEscapeReplacement);
-      }
-    } else {
-      if (escapeTestNoEncode.test(html)) {
-        return html.replace(escapeReplaceNoEncode, getEscapeReplacement);
-      }
-    }
-
-    return html;
-  }
-  var unescapeTest = /&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/ig;
-  /**
-   * @param {string} html
-   */
-
-  function unescape(html) {
-    // explicitly match decimal, hex, and named HTML entities
-    return html.replace(unescapeTest, function (_, n) {
-      n = n.toLowerCase();
-      if (n === 'colon') return ':';
-
-      if (n.charAt(0) === '#') {
-        return n.charAt(1) === 'x' ? String.fromCharCode(parseInt(n.substring(2), 16)) : String.fromCharCode(+n.substring(1));
-      }
-
-      return '';
-    });
-  }
-  var caret = /(^|[^\[])\^/g;
-  /**
-   * @param {string | RegExp} regex
-   * @param {string} opt
-   */
-
-  function edit(regex, opt) {
-    regex = typeof regex === 'string' ? regex : regex.source;
-    opt = opt || '';
-    var obj = {
-      replace: function replace(name, val) {
-        val = val.source || val;
-        val = val.replace(caret, '$1');
-        regex = regex.replace(name, val);
-        return obj;
-      },
-      getRegex: function getRegex() {
-        return new RegExp(regex, opt);
-      }
-    };
-    return obj;
-  }
-  var nonWordAndColonTest = /[^\w:]/g;
-  var originIndependentUrl = /^$|^[a-z][a-z0-9+.-]*:|^[?#]/i;
-  /**
-   * @param {boolean} sanitize
-   * @param {string} base
-   * @param {string} href
-   */
-
-  function cleanUrl(sanitize, base, href) {
-    if (sanitize) {
-      var prot;
-
-      try {
-        prot = decodeURIComponent(unescape(href)).replace(nonWordAndColonTest, '').toLowerCase();
-      } catch (e) {
-        return null;
-      }
-
-      if (prot.indexOf('javascript:') === 0 || prot.indexOf('vbscript:') === 0 || prot.indexOf('data:') === 0) {
-        return null;
-      }
-    }
-
-    if (base && !originIndependentUrl.test(href)) {
-      href = resolveUrl(base, href);
-    }
-
-    try {
-      href = encodeURI(href).replace(/%25/g, '%');
-    } catch (e) {
-      return null;
-    }
-
-    return href;
-  }
-  var baseUrls = {};
-  var justDomain = /^[^:]+:\/*[^/]*$/;
-  var protocol = /^([^:]+:)[\s\S]*$/;
-  var domain = /^([^:]+:\/*[^/]*)[\s\S]*$/;
-  /**
-   * @param {string} base
-   * @param {string} href
-   */
-
-  function resolveUrl(base, href) {
-    if (!baseUrls[' ' + base]) {
-      // we can ignore everything in base after the last slash of its path component,
-      // but we might need to add _that_
-      // https://tools.ietf.org/html/rfc3986#section-3
-      if (justDomain.test(base)) {
-        baseUrls[' ' + base] = base + '/';
-      } else {
-        baseUrls[' ' + base] = rtrim(base, '/', true);
-      }
-    }
-
-    base = baseUrls[' ' + base];
-    var relativeBase = base.indexOf(':') === -1;
-
-    if (href.substring(0, 2) === '//') {
-      if (relativeBase) {
-        return href;
-      }
-
-      return base.replace(protocol, '$1') + href;
-    } else if (href.charAt(0) === '/') {
-      if (relativeBase) {
-        return href;
-      }
-
-      return base.replace(domain, '$1') + href;
-    } else {
-      return base + href;
-    }
-  }
-  var noopTest = {
-    exec: function noopTest() {}
-  };
-  function merge(obj) {
-    var i = 1,
-        target,
-        key;
-
-    for (; i < arguments.length; i++) {
-      target = arguments[i];
-
-      for (key in target) {
-        if (Object.prototype.hasOwnProperty.call(target, key)) {
-          obj[key] = target[key];
-        }
-      }
-    }
-
-    return obj;
-  }
-  function splitCells(tableRow, count) {
-    // ensure that every cell-delimiting pipe has a space
-    // before it to distinguish it from an escaped pipe
-    var row = tableRow.replace(/\|/g, function (match, offset, str) {
-      var escaped = false,
-          curr = offset;
-
-      while (--curr >= 0 && str[curr] === '\\') {
-        escaped = !escaped;
-      }
-
-      if (escaped) {
-        // odd number of slashes means | is escaped
-        // so we leave it alone
-        return '|';
-      } else {
-        // add space before unescaped |
-        return ' |';
-      }
-    }),
-        cells = row.split(/ \|/);
-    var i = 0; // First/last cell in a row cannot be empty if it has no leading/trailing pipe
-
-    if (!cells[0].trim()) {
-      cells.shift();
-    }
-
-    if (cells.length > 0 && !cells[cells.length - 1].trim()) {
-      cells.pop();
-    }
-
-    if (cells.length > count) {
-      cells.splice(count);
-    } else {
-      while (cells.length < count) {
-        cells.push('');
-      }
-    }
-
-    for (; i < cells.length; i++) {
-      // leading or trailing whitespace is ignored per the gfm spec
-      cells[i] = cells[i].trim().replace(/\\\|/g, '|');
-    }
-
-    return cells;
-  }
-  /**
-   * Remove trailing 'c's. Equivalent to str.replace(/c*$/, '').
-   * /c*$/ is vulnerable to REDOS.
-   *
-   * @param {string} str
-   * @param {string} c
-   * @param {boolean} invert Remove suffix of non-c chars instead. Default falsey.
-   */
-
-  function rtrim(str, c, invert) {
-    var l = str.length;
-
-    if (l === 0) {
-      return '';
-    } // Length of suffix matching the invert condition.
-
-
-    var suffLen = 0; // Step left until we fail to match the invert condition.
-
-    while (suffLen < l) {
-      var currChar = str.charAt(l - suffLen - 1);
-
-      if (currChar === c && !invert) {
-        suffLen++;
-      } else if (currChar !== c && invert) {
-        suffLen++;
-      } else {
-        break;
-      }
-    }
-
-    return str.slice(0, l - suffLen);
-  }
-  function findClosingBracket(str, b) {
-    if (str.indexOf(b[1]) === -1) {
-      return -1;
-    }
-
-    var l = str.length;
-    var level = 0,
-        i = 0;
-
-    for (; i < l; i++) {
-      if (str[i] === '\\') {
-        i++;
-      } else if (str[i] === b[0]) {
-        level++;
-      } else if (str[i] === b[1]) {
-        level--;
-
-        if (level < 0) {
-          return i;
-        }
-      }
-    }
-
-    return -1;
-  }
-  function checkSanitizeDeprecation(opt) {
-    if (opt && opt.sanitize && !opt.silent) {
-      console.warn('marked(): sanitize and sanitizer parameters are deprecated since version 0.7.0, should not be used and will be removed in the future. Read more here: https://marked.js.org/#/USING_ADVANCED.md#options');
-    }
-  } // copied from https://stackoverflow.com/a/5450113/806777
-
-  /**
-   * @param {string} pattern
-   * @param {number} count
-   */
-
-  function repeatString(pattern, count) {
-    if (count < 1) {
-      return '';
-    }
-
-    var result = '';
-
-    while (count > 1) {
-      if (count & 1) {
-        result += pattern;
-      }
-
-      count >>= 1;
-      pattern += pattern;
-    }
-
-    return result + pattern;
-  }
-
-  function outputLink(cap, link, raw, lexer) {
-    var href = link.href;
-    var title = link.title ? escape(link.title) : null;
-    var text = cap[1].replace(/\\([\[\]])/g, '$1');
-
-    if (cap[0].charAt(0) !== '!') {
-      lexer.state.inLink = true;
-      var token = {
-        type: 'link',
-        raw: raw,
-        href: href,
-        title: title,
-        text: text,
-        tokens: lexer.inlineTokens(text)
-      };
-      lexer.state.inLink = false;
-      return token;
-    }
-
-    return {
-      type: 'image',
-      raw: raw,
-      href: href,
-      title: title,
-      text: escape(text)
-    };
-  }
-
-  function indentCodeCompensation(raw, text) {
-    var matchIndentToCode = raw.match(/^(\s+)(?:```)/);
-
-    if (matchIndentToCode === null) {
-      return text;
-    }
-
-    var indentToCode = matchIndentToCode[1];
-    return text.split('\n').map(function (node) {
-      var matchIndentInNode = node.match(/^\s+/);
-
-      if (matchIndentInNode === null) {
-        return node;
-      }
-
-      var indentInNode = matchIndentInNode[0];
-
-      if (indentInNode.length >= indentToCode.length) {
-        return node.slice(indentToCode.length);
-      }
-
-      return node;
-    }).join('\n');
-  }
-  /**
-   * Tokenizer
-   */
-
-
-  var Tokenizer = /*#__PURE__*/function () {
-    function Tokenizer(options) {
-      this.options = options || exports.defaults;
-    }
-
-    var _proto = Tokenizer.prototype;
-
-    _proto.space = function space(src) {
-      var cap = this.rules.block.newline.exec(src);
-
-      if (cap && cap[0].length > 0) {
-        return {
-          type: 'space',
-          raw: cap[0]
-        };
-      }
-    };
-
-    _proto.code = function code(src) {
-      var cap = this.rules.block.code.exec(src);
-
-      if (cap) {
-        var text = cap[0].replace(/^ {1,4}/gm, '');
-        return {
-          type: 'code',
-          raw: cap[0],
-          codeBlockStyle: 'indented',
-          text: !this.options.pedantic ? rtrim(text, '\n') : text
-        };
-      }
-    };
-
-    _proto.fences = function fences(src) {
-      var cap = this.rules.block.fences.exec(src);
-
-      if (cap) {
-        var raw = cap[0];
-        var text = indentCodeCompensation(raw, cap[3] || '');
-        return {
-          type: 'code',
-          raw: raw,
-          lang: cap[2] ? cap[2].trim() : cap[2],
-          text: text
-        };
-      }
-    };
-
-    _proto.heading = function heading(src) {
-      var cap = this.rules.block.heading.exec(src);
-
-      if (cap) {
-        var text = cap[2].trim(); // remove trailing #s
-
-        if (/#$/.test(text)) {
-          var trimmed = rtrim(text, '#');
-
-          if (this.options.pedantic) {
-            text = trimmed.trim();
-          } else if (!trimmed || / $/.test(trimmed)) {
-            // CommonMark requires space before trailing #s
-            text = trimmed.trim();
-          }
-        }
-
-        return {
-          type: 'heading',
-          raw: cap[0],
-          depth: cap[1].length,
-          text: text,
-          tokens: this.lexer.inline(text)
-        };
-      }
-    };
-
-    _proto.hr = function hr(src) {
-      var cap = this.rules.block.hr.exec(src);
-
-      if (cap) {
-        return {
-          type: 'hr',
-          raw: cap[0]
-        };
-      }
-    };
-
-    _proto.blockquote = function blockquote(src) {
-      var cap = this.rules.block.blockquote.exec(src);
-
-      if (cap) {
-        var text = cap[0].replace(/^ *>[ \t]?/gm, '');
-        return {
-          type: 'blockquote',
-          raw: cap[0],
-          tokens: this.lexer.blockTokens(text, []),
-          text: text
-        };
-      }
-    };
-
-    _proto.list = function list(src) {
-      var cap = this.rules.block.list.exec(src);
-
-      if (cap) {
-        var raw, istask, ischecked, indent, i, blankLine, endsWithBlankLine, line, nextLine, rawLine, itemContents, endEarly;
-        var bull = cap[1].trim();
-        var isordered = bull.length > 1;
-        var list = {
-          type: 'list',
-          raw: '',
-          ordered: isordered,
-          start: isordered ? +bull.slice(0, -1) : '',
-          loose: false,
-          items: []
-        };
-        bull = isordered ? "\\d{1,9}\\" + bull.slice(-1) : "\\" + bull;
-
-        if (this.options.pedantic) {
-          bull = isordered ? bull : '[*+-]';
-        } // Get next list item
-
-
-        var itemRegex = new RegExp("^( {0,3}" + bull + ")((?:[\t ][^\\n]*)?(?:\\n|$))"); // Check if current bullet point can start a new List Item
-
-        while (src) {
-          endEarly = false;
-
-          if (!(cap = itemRegex.exec(src))) {
-            break;
-          }
-
-          if (this.rules.block.hr.test(src)) {
-            // End list if bullet was actually HR (possibly move into itemRegex?)
-            break;
-          }
-
-          raw = cap[0];
-          src = src.substring(raw.length);
-          line = cap[2].split('\n', 1)[0];
-          nextLine = src.split('\n', 1)[0];
-
-          if (this.options.pedantic) {
-            indent = 2;
-            itemContents = line.trimLeft();
-          } else {
-            indent = cap[2].search(/[^ ]/); // Find first non-space char
-
-            indent = indent > 4 ? 1 : indent; // Treat indented code blocks (> 4 spaces) as having only 1 indent
-
-            itemContents = line.slice(indent);
-            indent += cap[1].length;
-          }
-
-          blankLine = false;
-
-          if (!line && /^ *$/.test(nextLine)) {
-            // Items begin with at most one blank line
-            raw += nextLine + '\n';
-            src = src.substring(nextLine.length + 1);
-            endEarly = true;
-          }
-
-          if (!endEarly) {
-            var nextBulletRegex = new RegExp("^ {0," + Math.min(3, indent - 1) + "}(?:[*+-]|\\d{1,9}[.)])((?: [^\\n]*)?(?:\\n|$))");
-            var hrRegex = new RegExp("^ {0," + Math.min(3, indent - 1) + "}((?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$)");
-            var fencesBeginRegex = new RegExp("^ {0," + Math.min(3, indent - 1) + "}(?:```|~~~)");
-            var headingBeginRegex = new RegExp("^ {0," + Math.min(3, indent - 1) + "}#"); // Check if following lines should be included in List Item
-
-            while (src) {
-              rawLine = src.split('\n', 1)[0];
-              line = rawLine; // Re-align to follow commonmark nesting rules
-
-              if (this.options.pedantic) {
-                line = line.replace(/^ {1,4}(?=( {4})*[^ ])/g, '  ');
-              } // End list item if found code fences
-
-
-              if (fencesBeginRegex.test(line)) {
-                break;
-              } // End list item if found start of new heading
-
-
-              if (headingBeginRegex.test(line)) {
-                break;
-              } // End list item if found start of new bullet
-
-
-              if (nextBulletRegex.test(line)) {
-                break;
-              } // Horizontal rule found
-
-
-              if (hrRegex.test(src)) {
-                break;
-              }
-
-              if (line.search(/[^ ]/) >= indent || !line.trim()) {
-                // Dedent if possible
-                itemContents += '\n' + line.slice(indent);
-              } else if (!blankLine) {
-                // Until blank line, item doesn't need indentation
-                itemContents += '\n' + line;
-              } else {
-                // Otherwise, improper indentation ends this item
-                break;
-              }
-
-              if (!blankLine && !line.trim()) {
-                // Check if current line is blank
-                blankLine = true;
-              }
-
-              raw += rawLine + '\n';
-              src = src.substring(rawLine.length + 1);
-            }
-          }
-
-          if (!list.loose) {
-            // If the previous item ended with a blank line, the list is loose
-            if (endsWithBlankLine) {
-              list.loose = true;
-            } else if (/\n *\n *$/.test(raw)) {
-              endsWithBlankLine = true;
-            }
-          } // Check for task list items
-
-
-          if (this.options.gfm) {
-            istask = /^\[[ xX]\] /.exec(itemContents);
-
-            if (istask) {
-              ischecked = istask[0] !== '[ ] ';
-              itemContents = itemContents.replace(/^\[[ xX]\] +/, '');
-            }
-          }
-
-          list.items.push({
-            type: 'list_item',
-            raw: raw,
-            task: !!istask,
-            checked: ischecked,
-            loose: false,
-            text: itemContents
-          });
-          list.raw += raw;
-        } // Do not consume newlines at end of final item. Alternatively, make itemRegex *start* with any newlines to simplify/speed up endsWithBlankLine logic
-
-
-        list.items[list.items.length - 1].raw = raw.trimRight();
-        list.items[list.items.length - 1].text = itemContents.trimRight();
-        list.raw = list.raw.trimRight();
-        var l = list.items.length; // Item child tokens handled here at end because we needed to have the final item to trim it first
-
-        for (i = 0; i < l; i++) {
-          this.lexer.state.top = false;
-          list.items[i].tokens = this.lexer.blockTokens(list.items[i].text, []);
-          var spacers = list.items[i].tokens.filter(function (t) {
-            return t.type === 'space';
-          });
-          var hasMultipleLineBreaks = spacers.every(function (t) {
-            var chars = t.raw.split('');
-            var lineBreaks = 0;
-
-            for (var _iterator = _createForOfIteratorHelperLoose(chars), _step; !(_step = _iterator()).done;) {
-              var _char = _step.value;
-
-              if (_char === '\n') {
-                lineBreaks += 1;
-              }
-
-              if (lineBreaks > 1) {
-                return true;
-              }
-            }
-
-            return false;
-          });
-
-          if (!list.loose && spacers.length && hasMultipleLineBreaks) {
-            // Having a single line break doesn't mean a list is loose. A single line break is terminating the last list item
-            list.loose = true;
-            list.items[i].loose = true;
-          }
-        }
-
-        return list;
-      }
-    };
-
-    _proto.html = function html(src) {
-      var cap = this.rules.block.html.exec(src);
-
-      if (cap) {
-        var token = {
-          type: 'html',
-          raw: cap[0],
-          pre: !this.options.sanitizer && (cap[1] === 'pre' || cap[1] === 'script' || cap[1] === 'style'),
-          text: cap[0]
-        };
-
-        if (this.options.sanitize) {
-          var text = this.options.sanitizer ? this.options.sanitizer(cap[0]) : escape(cap[0]);
-          token.type = 'paragraph';
-          token.text = text;
-          token.tokens = this.lexer.inline(text);
-        }
-
-        return token;
-      }
-    };
-
-    _proto.def = function def(src) {
-      var cap = this.rules.block.def.exec(src);
-
-      if (cap) {
-        if (cap[3]) cap[3] = cap[3].substring(1, cap[3].length - 1);
-        var tag = cap[1].toLowerCase().replace(/\s+/g, ' ');
-        return {
-          type: 'def',
-          tag: tag,
-          raw: cap[0],
-          href: cap[2],
-          title: cap[3]
-        };
-      }
-    };
-
-    _proto.table = function table(src) {
-      var cap = this.rules.block.table.exec(src);
-
-      if (cap) {
-        var item = {
-          type: 'table',
-          header: splitCells(cap[1]).map(function (c) {
-            return {
-              text: c
-            };
-          }),
-          align: cap[2].replace(/^ *|\| *$/g, '').split(/ *\| */),
-          rows: cap[3] && cap[3].trim() ? cap[3].replace(/\n[ \t]*$/, '').split('\n') : []
-        };
-
-        if (item.header.length === item.align.length) {
-          item.raw = cap[0];
-          var l = item.align.length;
-          var i, j, k, row;
-
-          for (i = 0; i < l; i++) {
-            if (/^ *-+: *$/.test(item.align[i])) {
-              item.align[i] = 'right';
-            } else if (/^ *:-+: *$/.test(item.align[i])) {
-              item.align[i] = 'center';
-            } else if (/^ *:-+ *$/.test(item.align[i])) {
-              item.align[i] = 'left';
-            } else {
-              item.align[i] = null;
-            }
-          }
-
-          l = item.rows.length;
-
-          for (i = 0; i < l; i++) {
-            item.rows[i] = splitCells(item.rows[i], item.header.length).map(function (c) {
-              return {
-                text: c
-              };
-            });
-          } // parse child tokens inside headers and cells
-          // header child tokens
-
-
-          l = item.header.length;
-
-          for (j = 0; j < l; j++) {
-            item.header[j].tokens = this.lexer.inline(item.header[j].text);
-          } // cell child tokens
-
-
-          l = item.rows.length;
-
-          for (j = 0; j < l; j++) {
-            row = item.rows[j];
-
-            for (k = 0; k < row.length; k++) {
-              row[k].tokens = this.lexer.inline(row[k].text);
-            }
-          }
-
-          return item;
-        }
-      }
-    };
-
-    _proto.lheading = function lheading(src) {
-      var cap = this.rules.block.lheading.exec(src);
-
-      if (cap) {
-        return {
-          type: 'heading',
-          raw: cap[0],
-          depth: cap[2].charAt(0) === '=' ? 1 : 2,
-          text: cap[1],
-          tokens: this.lexer.inline(cap[1])
-        };
-      }
-    };
-
-    _proto.paragraph = function paragraph(src) {
-      var cap = this.rules.block.paragraph.exec(src);
-
-      if (cap) {
-        var text = cap[1].charAt(cap[1].length - 1) === '\n' ? cap[1].slice(0, -1) : cap[1];
-        return {
-          type: 'paragraph',
-          raw: cap[0],
-          text: text,
-          tokens: this.lexer.inline(text)
-        };
-      }
-    };
-
-    _proto.text = function text(src) {
-      var cap = this.rules.block.text.exec(src);
-
-      if (cap) {
-        return {
-          type: 'text',
-          raw: cap[0],
-          text: cap[0],
-          tokens: this.lexer.inline(cap[0])
-        };
-      }
-    };
-
-    _proto.escape = function escape$1(src) {
-      var cap = this.rules.inline.escape.exec(src);
-
-      if (cap) {
-        return {
-          type: 'escape',
-          raw: cap[0],
-          text: escape(cap[1])
-        };
-      }
-    };
-
-    _proto.tag = function tag(src) {
-      var cap = this.rules.inline.tag.exec(src);
-
-      if (cap) {
-        if (!this.lexer.state.inLink && /^<a /i.test(cap[0])) {
-          this.lexer.state.inLink = true;
-        } else if (this.lexer.state.inLink && /^<\/a>/i.test(cap[0])) {
-          this.lexer.state.inLink = false;
-        }
-
-        if (!this.lexer.state.inRawBlock && /^<(pre|code|kbd|script)(\s|>)/i.test(cap[0])) {
-          this.lexer.state.inRawBlock = true;
-        } else if (this.lexer.state.inRawBlock && /^<\/(pre|code|kbd|script)(\s|>)/i.test(cap[0])) {
-          this.lexer.state.inRawBlock = false;
-        }
-
-        return {
-          type: this.options.sanitize ? 'text' : 'html',
-          raw: cap[0],
-          inLink: this.lexer.state.inLink,
-          inRawBlock: this.lexer.state.inRawBlock,
-          text: this.options.sanitize ? this.options.sanitizer ? this.options.sanitizer(cap[0]) : escape(cap[0]) : cap[0]
-        };
-      }
-    };
-
-    _proto.link = function link(src) {
-      var cap = this.rules.inline.link.exec(src);
-
-      if (cap) {
-        var trimmedUrl = cap[2].trim();
-
-        if (!this.options.pedantic && /^</.test(trimmedUrl)) {
-          // commonmark requires matching angle brackets
-          if (!/>$/.test(trimmedUrl)) {
-            return;
-          } // ending angle bracket cannot be escaped
-
-
-          var rtrimSlash = rtrim(trimmedUrl.slice(0, -1), '\\');
-
-          if ((trimmedUrl.length - rtrimSlash.length) % 2 === 0) {
-            return;
-          }
-        } else {
-          // find closing parenthesis
-          var lastParenIndex = findClosingBracket(cap[2], '()');
-
-          if (lastParenIndex > -1) {
-            var start = cap[0].indexOf('!') === 0 ? 5 : 4;
-            var linkLen = start + cap[1].length + lastParenIndex;
-            cap[2] = cap[2].substring(0, lastParenIndex);
-            cap[0] = cap[0].substring(0, linkLen).trim();
-            cap[3] = '';
-          }
-        }
-
-        var href = cap[2];
-        var title = '';
-
-        if (this.options.pedantic) {
-          // split pedantic href and title
-          var link = /^([^'"]*[^\s])\s+(['"])(.*)\2/.exec(href);
-
-          if (link) {
-            href = link[1];
-            title = link[3];
-          }
-        } else {
-          title = cap[3] ? cap[3].slice(1, -1) : '';
-        }
-
-        href = href.trim();
-
-        if (/^</.test(href)) {
-          if (this.options.pedantic && !/>$/.test(trimmedUrl)) {
-            // pedantic allows starting angle bracket without ending angle bracket
-            href = href.slice(1);
-          } else {
-            href = href.slice(1, -1);
-          }
-        }
-
-        return outputLink(cap, {
-          href: href ? href.replace(this.rules.inline._escapes, '$1') : href,
-          title: title ? title.replace(this.rules.inline._escapes, '$1') : title
-        }, cap[0], this.lexer);
-      }
-    };
-
-    _proto.reflink = function reflink(src, links) {
-      var cap;
-
-      if ((cap = this.rules.inline.reflink.exec(src)) || (cap = this.rules.inline.nolink.exec(src))) {
-        var link = (cap[2] || cap[1]).replace(/\s+/g, ' ');
-        link = links[link.toLowerCase()];
-
-        if (!link || !link.href) {
-          var text = cap[0].charAt(0);
-          return {
-            type: 'text',
-            raw: text,
-            text: text
-          };
-        }
-
-        return outputLink(cap, link, cap[0], this.lexer);
-      }
-    };
-
-    _proto.emStrong = function emStrong(src, maskedSrc, prevChar) {
-      if (prevChar === void 0) {
-        prevChar = '';
-      }
-
-      var match = this.rules.inline.emStrong.lDelim.exec(src);
-      if (!match) return; // _ can't be between two alphanumerics. \p{L}\p{N} includes non-english alphabet/numbers as well
-
-      if (match[3] && prevChar.match(/(?:[0-9A-Za-z\xAA\xB2\xB3\xB5\xB9\xBA\xBC-\xBE\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0560-\u0588\u05D0-\u05EA\u05EF-\u05F2\u0620-\u064A\u0660-\u0669\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07C0-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u0860-\u086A\u0870-\u0887\u0889-\u088E\u08A0-\u08C9\u0904-\u0939\u093D\u0950\u0958-\u0961\u0966-\u096F\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09E6-\u09F1\u09F4-\u09F9\u09FC\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A66-\u0A6F\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0AE6-\u0AEF\u0AF9\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B66-\u0B6F\u0B71-\u0B77\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0BE6-\u0BF2\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58-\u0C5A\u0C5D\u0C60\u0C61\u0C66-\u0C6F\u0C78-\u0C7E\u0C80\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDD\u0CDE\u0CE0\u0CE1\u0CE6-\u0CEF\u0CF1\u0CF2\u0D04-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D54-\u0D56\u0D58-\u0D61\u0D66-\u0D78\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DE6-\u0DEF\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E50-\u0E59\u0E81\u0E82\u0E84\u0E86-\u0E8A\u0E8C-\u0EA3\u0EA5\u0EA7-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0ED0-\u0ED9\u0EDC-\u0EDF\u0F00\u0F20-\u0F33\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F-\u1049\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u1090-\u1099\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1369-\u137C\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u1711\u171F-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u17E0-\u17E9\u17F0-\u17F9\u1810-\u1819\u1820-\u1878\u1880-\u1884\u1887-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19DA\u1A00-\u1A16\u1A20-\u1A54\u1A80-\u1A89\u1A90-\u1A99\u1AA7\u1B05-\u1B33\u1B45-\u1B4C\u1B50-\u1B59\u1B83-\u1BA0\u1BAE-\u1BE5\u1C00-\u1C23\u1C40-\u1C49\u1C4D-\u1C7D\u1C80-\u1C88\u1C90-\u1CBA\u1CBD-\u1CBF\u1CE9-\u1CEC\u1CEE-\u1CF3\u1CF5\u1CF6\u1CFA\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2070\u2071\u2074-\u2079\u207F-\u2089\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2150-\u2189\u2460-\u249B\u24EA-\u24FF\u2776-\u2793\u2C00-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2CFD\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312F\u3131-\u318E\u3192-\u3195\u31A0-\u31BF\u31F0-\u31FF\u3220-\u3229\u3248-\u324F\u3251-\u325F\u3280-\u3289\u32B1-\u32BF\u3400-\u4DBF\u4E00-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA7CA\uA7D0\uA7D1\uA7D3\uA7D5-\uA7D9\uA7F2-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA830-\uA835\uA840-\uA873\uA882-\uA8B3\uA8D0-\uA8D9\uA8F2-\uA8F7\uA8FB\uA8FD\uA8FE\uA900-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF-\uA9D9\uA9E0-\uA9E4\uA9E6-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA50-\uAA59\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB69\uAB70-\uABE2\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD07-\uDD33\uDD40-\uDD78\uDD8A\uDD8B\uDE80-\uDE9C\uDEA0-\uDED0\uDEE1-\uDEFB\uDF00-\uDF23\uDF2D-\uDF4A\uDF50-\uDF75\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDCA0-\uDCA9\uDCB0-\uDCD3\uDCD8-\uDCFB\uDD00-\uDD27\uDD30-\uDD63\uDD70-\uDD7A\uDD7C-\uDD8A\uDD8C-\uDD92\uDD94\uDD95\uDD97-\uDDA1\uDDA3-\uDDB1\uDDB3-\uDDB9\uDDBB\uDDBC\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67\uDF80-\uDF85\uDF87-\uDFB0\uDFB2-\uDFBA]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC58-\uDC76\uDC79-\uDC9E\uDCA7-\uDCAF\uDCE0-\uDCF2\uDCF4\uDCF5\uDCFB-\uDD1B\uDD20-\uDD39\uDD80-\uDDB7\uDDBC-\uDDCF\uDDD2-\uDE00\uDE10-\uDE13\uDE15-\uDE17\uDE19-\uDE35\uDE40-\uDE48\uDE60-\uDE7E\uDE80-\uDE9F\uDEC0-\uDEC7\uDEC9-\uDEE4\uDEEB-\uDEEF\uDF00-\uDF35\uDF40-\uDF55\uDF58-\uDF72\uDF78-\uDF91\uDFA9-\uDFAF]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2\uDCFA-\uDD23\uDD30-\uDD39\uDE60-\uDE7E\uDE80-\uDEA9\uDEB0\uDEB1\uDF00-\uDF27\uDF30-\uDF45\uDF51-\uDF54\uDF70-\uDF81\uDFB0-\uDFCB\uDFE0-\uDFF6]|\uD804[\uDC03-\uDC37\uDC52-\uDC6F\uDC71\uDC72\uDC75\uDC83-\uDCAF\uDCD0-\uDCE8\uDCF0-\uDCF9\uDD03-\uDD26\uDD36-\uDD3F\uDD44\uDD47\uDD50-\uDD72\uDD76\uDD83-\uDDB2\uDDC1-\uDDC4\uDDD0-\uDDDA\uDDDC\uDDE1-\uDDF4\uDE00-\uDE11\uDE13-\uDE2B\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEDE\uDEF0-\uDEF9\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3D\uDF50\uDF5D-\uDF61]|\uD805[\uDC00-\uDC34\uDC47-\uDC4A\uDC50-\uDC59\uDC5F-\uDC61\uDC80-\uDCAF\uDCC4\uDCC5\uDCC7\uDCD0-\uDCD9\uDD80-\uDDAE\uDDD8-\uDDDB\uDE00-\uDE2F\uDE44\uDE50-\uDE59\uDE80-\uDEAA\uDEB8\uDEC0-\uDEC9\uDF00-\uDF1A\uDF30-\uDF3B\uDF40-\uDF46]|\uD806[\uDC00-\uDC2B\uDCA0-\uDCF2\uDCFF-\uDD06\uDD09\uDD0C-\uDD13\uDD15\uDD16\uDD18-\uDD2F\uDD3F\uDD41\uDD50-\uDD59\uDDA0-\uDDA7\uDDAA-\uDDD0\uDDE1\uDDE3\uDE00\uDE0B-\uDE32\uDE3A\uDE50\uDE5C-\uDE89\uDE9D\uDEB0-\uDEF8]|\uD807[\uDC00-\uDC08\uDC0A-\uDC2E\uDC40\uDC50-\uDC6C\uDC72-\uDC8F\uDD00-\uDD06\uDD08\uDD09\uDD0B-\uDD30\uDD46\uDD50-\uDD59\uDD60-\uDD65\uDD67\uDD68\uDD6A-\uDD89\uDD98\uDDA0-\uDDA9\uDEE0-\uDEF2\uDFB0\uDFC0-\uDFD4]|\uD808[\uDC00-\uDF99]|\uD809[\uDC00-\uDC6E\uDC80-\uDD43]|\uD80B[\uDF90-\uDFF0]|[\uD80C\uD81C-\uD820\uD822\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872\uD874-\uD879\uD880-\uD883][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDE60-\uDE69\uDE70-\uDEBE\uDEC0-\uDEC9\uDED0-\uDEED\uDF00-\uDF2F\uDF40-\uDF43\uDF50-\uDF59\uDF5B-\uDF61\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDE40-\uDE96\uDF00-\uDF4A\uDF50\uDF93-\uDF9F\uDFE0\uDFE1\uDFE3]|\uD821[\uDC00-\uDFF7]|\uD823[\uDC00-\uDCD5\uDD00-\uDD08]|\uD82B[\uDFF0-\uDFF3\uDFF5-\uDFFB\uDFFD\uDFFE]|\uD82C[\uDC00-\uDD22\uDD50-\uDD52\uDD64-\uDD67\uDD70-\uDEFB]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99]|\uD834[\uDEE0-\uDEF3\uDF60-\uDF78]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB\uDFCE-\uDFFF]|\uD837[\uDF00-\uDF1E]|\uD838[\uDD00-\uDD2C\uDD37-\uDD3D\uDD40-\uDD49\uDD4E\uDE90-\uDEAD\uDEC0-\uDEEB\uDEF0-\uDEF9]|\uD839[\uDFE0-\uDFE6\uDFE8-\uDFEB\uDFED\uDFEE\uDFF0-\uDFFE]|\uD83A[\uDC00-\uDCC4\uDCC7-\uDCCF\uDD00-\uDD43\uDD4B\uDD50-\uDD59]|\uD83B[\uDC71-\uDCAB\uDCAD-\uDCAF\uDCB1-\uDCB4\uDD01-\uDD2D\uDD2F-\uDD3D\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD83C[\uDD00-\uDD0C]|\uD83E[\uDFF0-\uDFF9]|\uD869[\uDC00-\uDEDF\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF38\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1\uDEB0-\uDFFF]|\uD87A[\uDC00-\uDFE0]|\uD87E[\uDC00-\uDE1D]|\uD884[\uDC00-\uDF4A])/)) return;
-      var nextChar = match[1] || match[2] || '';
-
-      if (!nextChar || nextChar && (prevChar === '' || this.rules.inline.punctuation.exec(prevChar))) {
-        var lLength = match[0].length - 1;
-        var rDelim,
-            rLength,
-            delimTotal = lLength,
-            midDelimTotal = 0;
-        var endReg = match[0][0] === '*' ? this.rules.inline.emStrong.rDelimAst : this.rules.inline.emStrong.rDelimUnd;
-        endReg.lastIndex = 0; // Clip maskedSrc to same section of string as src (move to lexer?)
-
-        maskedSrc = maskedSrc.slice(-1 * src.length + lLength);
-
-        while ((match = endReg.exec(maskedSrc)) != null) {
-          rDelim = match[1] || match[2] || match[3] || match[4] || match[5] || match[6];
-          if (!rDelim) continue; // skip single * in __abc*abc__
-
-          rLength = rDelim.length;
-
-          if (match[3] || match[4]) {
-            // found another Left Delim
-            delimTotal += rLength;
-            continue;
-          } else if (match[5] || match[6]) {
-            // either Left or Right Delim
-            if (lLength % 3 && !((lLength + rLength) % 3)) {
-              midDelimTotal += rLength;
-              continue; // CommonMark Emphasis Rules 9-10
-            }
-          }
-
-          delimTotal -= rLength;
-          if (delimTotal > 0) continue; // Haven't found enough closing delimiters
-          // Remove extra characters. *a*** -> *a*
-
-          rLength = Math.min(rLength, rLength + delimTotal + midDelimTotal); // Create `em` if smallest delimiter has odd char count. *a***
-
-          if (Math.min(lLength, rLength) % 2) {
-            var _text = src.slice(1, lLength + match.index + rLength);
-
-            return {
-              type: 'em',
-              raw: src.slice(0, lLength + match.index + rLength + 1),
-              text: _text,
-              tokens: this.lexer.inlineTokens(_text)
-            };
-          } // Create 'strong' if smallest delimiter has even char count. **a***
-
-
-          var text = src.slice(2, lLength + match.index + rLength - 1);
-          return {
-            type: 'strong',
-            raw: src.slice(0, lLength + match.index + rLength + 1),
-            text: text,
-            tokens: this.lexer.inlineTokens(text)
-          };
-        }
-      }
-    };
-
-    _proto.codespan = function codespan(src) {
-      var cap = this.rules.inline.code.exec(src);
-
-      if (cap) {
-        var text = cap[2].replace(/\n/g, ' ');
-        var hasNonSpaceChars = /[^ ]/.test(text);
-        var hasSpaceCharsOnBothEnds = /^ /.test(text) && / $/.test(text);
-
-        if (hasNonSpaceChars && hasSpaceCharsOnBothEnds) {
-          text = text.substring(1, text.length - 1);
-        }
-
-        text = escape(text, true);
-        return {
-          type: 'codespan',
-          raw: cap[0],
-          text: text
-        };
-      }
-    };
-
-    _proto.br = function br(src) {
-      var cap = this.rules.inline.br.exec(src);
-
-      if (cap) {
-        return {
-          type: 'br',
-          raw: cap[0]
-        };
-      }
-    };
-
-    _proto.del = function del(src) {
-      var cap = this.rules.inline.del.exec(src);
-
-      if (cap) {
-        return {
-          type: 'del',
-          raw: cap[0],
-          text: cap[2],
-          tokens: this.lexer.inlineTokens(cap[2])
-        };
-      }
-    };
-
-    _proto.autolink = function autolink(src, mangle) {
-      var cap = this.rules.inline.autolink.exec(src);
-
-      if (cap) {
-        var text, href;
-
-        if (cap[2] === '@') {
-          text = escape(this.options.mangle ? mangle(cap[1]) : cap[1]);
-          href = 'mailto:' + text;
-        } else {
-          text = escape(cap[1]);
-          href = text;
-        }
-
-        return {
-          type: 'link',
-          raw: cap[0],
-          text: text,
-          href: href,
-          tokens: [{
-            type: 'text',
-            raw: text,
-            text: text
-          }]
-        };
-      }
-    };
-
-    _proto.url = function url(src, mangle) {
-      var cap;
-
-      if (cap = this.rules.inline.url.exec(src)) {
-        var text, href;
-
-        if (cap[2] === '@') {
-          text = escape(this.options.mangle ? mangle(cap[0]) : cap[0]);
-          href = 'mailto:' + text;
-        } else {
-          // do extended autolink path validation
-          var prevCapZero;
-
-          do {
-            prevCapZero = cap[0];
-            cap[0] = this.rules.inline._backpedal.exec(cap[0])[0];
-          } while (prevCapZero !== cap[0]);
-
-          text = escape(cap[0]);
-
-          if (cap[1] === 'www.') {
-            href = 'http://' + text;
-          } else {
-            href = text;
-          }
-        }
-
-        return {
-          type: 'link',
-          raw: cap[0],
-          text: text,
-          href: href,
-          tokens: [{
-            type: 'text',
-            raw: text,
-            text: text
-          }]
-        };
-      }
-    };
-
-    _proto.inlineText = function inlineText(src, smartypants) {
-      var cap = this.rules.inline.text.exec(src);
-
-      if (cap) {
-        var text;
-
-        if (this.lexer.state.inRawBlock) {
-          text = this.options.sanitize ? this.options.sanitizer ? this.options.sanitizer(cap[0]) : escape(cap[0]) : cap[0];
-        } else {
-          text = escape(this.options.smartypants ? smartypants(cap[0]) : cap[0]);
-        }
-
-        return {
-          type: 'text',
-          raw: cap[0],
-          text: text
-        };
-      }
-    };
-
-    return Tokenizer;
-  }();
-
-  /**
-   * Block-Level Grammar
-   */
-
-  var block = {
-    newline: /^(?: *(?:\n|$))+/,
-    code: /^( {4}[^\n]+(?:\n(?: *(?:\n|$))*)?)+/,
-    fences: /^ {0,3}(`{3,}(?=[^`\n]*\n)|~{3,})([^\n]*)\n(?:|([\s\S]*?)\n)(?: {0,3}\1[~`]* *(?=\n|$)|$)/,
-    hr: /^ {0,3}((?:-[\t ]*){3,}|(?:_[ \t]*){3,}|(?:\*[ \t]*){3,})(?:\n+|$)/,
-    heading: /^ {0,3}(#{1,6})(?=\s|$)(.*)(?:\n+|$)/,
-    blockquote: /^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/,
-    list: /^( {0,3}bull)([ \t][^\n]+?)?(?:\n|$)/,
-    html: '^ {0,3}(?:' // optional indentation
-    + '<(script|pre|style|textarea)[\\s>][\\s\\S]*?(?:</\\1>[^\\n]*\\n+|$)' // (1)
-    + '|comment[^\\n]*(\\n+|$)' // (2)
-    + '|<\\?[\\s\\S]*?(?:\\?>\\n*|$)' // (3)
-    + '|<![A-Z][\\s\\S]*?(?:>\\n*|$)' // (4)
-    + '|<!\\[CDATA\\[[\\s\\S]*?(?:\\]\\]>\\n*|$)' // (5)
-    + '|</?(tag)(?: +|\\n|/?>)[\\s\\S]*?(?:(?:\\n *)+\\n|$)' // (6)
-    + '|<(?!script|pre|style|textarea)([a-z][\\w-]*)(?:attribute)*? */?>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n *)+\\n|$)' // (7) open tag
-    + '|</(?!script|pre|style|textarea)[a-z][\\w-]*\\s*>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n *)+\\n|$)' // (7) closing tag
-    + ')',
-    def: /^ {0,3}\[(label)\]: *(?:\n *)?<?([^\s>]+)>?(?:(?: +(?:\n *)?| *\n *)(title))? *(?:\n+|$)/,
-    table: noopTest,
-    lheading: /^([^\n]+)\n {0,3}(=+|-+) *(?:\n+|$)/,
-    // regex template, placeholders will be replaced according to different paragraph
-    // interruption rules of commonmark and the original markdown spec:
-    _paragraph: /^([^\n]+(?:\n(?!hr|heading|lheading|blockquote|fences|list|html|table| +\n)[^\n]+)*)/,
-    text: /^[^\n]+/
-  };
-  block._label = /(?!\s*\])(?:\\.|[^\[\]\\])+/;
-  block._title = /(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/;
-  block.def = edit(block.def).replace('label', block._label).replace('title', block._title).getRegex();
-  block.bullet = /(?:[*+-]|\d{1,9}[.)])/;
-  block.listItemStart = edit(/^( *)(bull) */).replace('bull', block.bullet).getRegex();
-  block.list = edit(block.list).replace(/bull/g, block.bullet).replace('hr', '\\n+(?=\\1?(?:(?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$))').replace('def', '\\n+(?=' + block.def.source + ')').getRegex();
-  block._tag = 'address|article|aside|base|basefont|blockquote|body|caption' + '|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption' + '|figure|footer|form|frame|frameset|h[1-6]|head|header|hr|html|iframe' + '|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option' + '|p|param|section|source|summary|table|tbody|td|tfoot|th|thead|title|tr' + '|track|ul';
-  block._comment = /<!--(?!-?>)[\s\S]*?(?:-->|$)/;
-  block.html = edit(block.html, 'i').replace('comment', block._comment).replace('tag', block._tag).replace('attribute', / +[a-zA-Z:_][\w.:-]*(?: *= *"[^"\n]*"| *= *'[^'\n]*'| *= *[^\s"'=<>`]+)?/).getRegex();
-  block.paragraph = edit(block._paragraph).replace('hr', block.hr).replace('heading', ' {0,3}#{1,6} ').replace('|lheading', '') // setex headings don't interrupt commonmark paragraphs
-  .replace('|table', '').replace('blockquote', ' {0,3}>').replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n').replace('list', ' {0,3}(?:[*+-]|1[.)]) ') // only lists starting from 1 can interrupt
-  .replace('html', '</?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|textarea|!--)').replace('tag', block._tag) // pars can be interrupted by type (6) html blocks
-  .getRegex();
-  block.blockquote = edit(block.blockquote).replace('paragraph', block.paragraph).getRegex();
-  /**
-   * Normal Block Grammar
-   */
-
-  block.normal = merge({}, block);
-  /**
-   * GFM Block Grammar
-   */
-
-  block.gfm = merge({}, block.normal, {
-    table: '^ *([^\\n ].*\\|.*)\\n' // Header
-    + ' {0,3}(?:\\| *)?(:?-+:? *(?:\\| *:?-+:? *)*)(?:\\| *)?' // Align
-    + '(?:\\n((?:(?! *\\n|hr|heading|blockquote|code|fences|list|html).*(?:\\n|$))*)\\n*|$)' // Cells
-
-  });
-  block.gfm.table = edit(block.gfm.table).replace('hr', block.hr).replace('heading', ' {0,3}#{1,6} ').replace('blockquote', ' {0,3}>').replace('code', ' {4}[^\\n]').replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n').replace('list', ' {0,3}(?:[*+-]|1[.)]) ') // only lists starting from 1 can interrupt
-  .replace('html', '</?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|textarea|!--)').replace('tag', block._tag) // tables can be interrupted by type (6) html blocks
-  .getRegex();
-  block.gfm.paragraph = edit(block._paragraph).replace('hr', block.hr).replace('heading', ' {0,3}#{1,6} ').replace('|lheading', '') // setex headings don't interrupt commonmark paragraphs
-  .replace('table', block.gfm.table) // interrupt paragraphs with table
-  .replace('blockquote', ' {0,3}>').replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n').replace('list', ' {0,3}(?:[*+-]|1[.)]) ') // only lists starting from 1 can interrupt
-  .replace('html', '</?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|textarea|!--)').replace('tag', block._tag) // pars can be interrupted by type (6) html blocks
-  .getRegex();
-  /**
-   * Pedantic grammar (original John Gruber's loose markdown specification)
-   */
-
-  block.pedantic = merge({}, block.normal, {
-    html: edit('^ *(?:comment *(?:\\n|\\s*$)' + '|<(tag)[\\s\\S]+?</\\1> *(?:\\n{2,}|\\s*$)' // closed tag
-    + '|<tag(?:"[^"]*"|\'[^\']*\'|\\s[^\'"/>\\s]*)*?/?> *(?:\\n{2,}|\\s*$))').replace('comment', block._comment).replace(/tag/g, '(?!(?:' + 'a|em|strong|small|s|cite|q|dfn|abbr|data|time|code|var|samp|kbd|sub' + '|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo|span|br|wbr|ins|del|img)' + '\\b)\\w+(?!:|[^\\w\\s@]*@)\\b').getRegex(),
-    def: /^ *\[([^\]]+)\]: *<?([^\s>]+)>?(?: +(["(][^\n]+[")]))? *(?:\n+|$)/,
-    heading: /^(#{1,6})(.*)(?:\n+|$)/,
-    fences: noopTest,
-    // fences not supported
-    paragraph: edit(block.normal._paragraph).replace('hr', block.hr).replace('heading', ' *#{1,6} *[^\n]').replace('lheading', block.lheading).replace('blockquote', ' {0,3}>').replace('|fences', '').replace('|list', '').replace('|html', '').getRegex()
-  });
-  /**
-   * Inline-Level Grammar
-   */
-
-  var inline = {
-    escape: /^\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/,
-    autolink: /^<(scheme:[^\s\x00-\x1f<>]*|email)>/,
-    url: noopTest,
-    tag: '^comment' + '|^</[a-zA-Z][\\w:-]*\\s*>' // self-closing tag
-    + '|^<[a-zA-Z][\\w-]*(?:attribute)*?\\s*/?>' // open tag
-    + '|^<\\?[\\s\\S]*?\\?>' // processing instruction, e.g. <?php ?>
-    + '|^<![a-zA-Z]+\\s[\\s\\S]*?>' // declaration, e.g. <!DOCTYPE html>
-    + '|^<!\\[CDATA\\[[\\s\\S]*?\\]\\]>',
-    // CDATA section
-    link: /^!?\[(label)\]\(\s*(href)(?:\s+(title))?\s*\)/,
-    reflink: /^!?\[(label)\]\[(ref)\]/,
-    nolink: /^!?\[(ref)\](?:\[\])?/,
-    reflinkSearch: 'reflink|nolink(?!\\()',
-    emStrong: {
-      lDelim: /^(?:\*+(?:([punct_])|[^\s*]))|^_+(?:([punct*])|([^\s_]))/,
-      //        (1) and (2) can only be a Right Delimiter. (3) and (4) can only be Left.  (5) and (6) can be either Left or Right.
-      //          () Skip orphan inside strong  () Consume to delim (1) #***                (2) a***#, a***                   (3) #***a, ***a                 (4) ***#              (5) #***#                 (6) a***a
-      rDelimAst: /^[^_*]*?\_\_[^_*]*?\*[^_*]*?(?=\_\_)|[^*]+(?=[^*])|[punct_](\*+)(?=[\s]|$)|[^punct*_\s](\*+)(?=[punct_\s]|$)|[punct_\s](\*+)(?=[^punct*_\s])|[\s](\*+)(?=[punct_])|[punct_](\*+)(?=[punct_])|[^punct*_\s](\*+)(?=[^punct*_\s])/,
-      rDelimUnd: /^[^_*]*?\*\*[^_*]*?\_[^_*]*?(?=\*\*)|[^_]+(?=[^_])|[punct*](\_+)(?=[\s]|$)|[^punct*_\s](\_+)(?=[punct*\s]|$)|[punct*\s](\_+)(?=[^punct*_\s])|[\s](\_+)(?=[punct*])|[punct*](\_+)(?=[punct*])/ // ^- Not allowed for _
-
-    },
-    code: /^(`+)([^`]|[^`][\s\S]*?[^`])\1(?!`)/,
-    br: /^( {2,}|\\)\n(?!\s*$)/,
-    del: noopTest,
-    text: /^(`+|[^`])(?:(?= {2,}\n)|[\s\S]*?(?:(?=[\\<!\[`*_]|\b_|$)|[^ ](?= {2,}\n)))/,
-    punctuation: /^([\spunctuation])/
-  }; // list of punctuation marks from CommonMark spec
-  // without * and _ to handle the different emphasis markers * and _
-
-  inline._punctuation = '!"#$%&\'()+\\-.,/:;<=>?@\\[\\]`^{|}~';
-  inline.punctuation = edit(inline.punctuation).replace(/punctuation/g, inline._punctuation).getRegex(); // sequences em should skip over [title](link), `code`, <html>
-
-  inline.blockSkip = /\[[^\]]*?\]\([^\)]*?\)|`[^`]*?`|<[^>]*?>/g;
-  inline.escapedEmSt = /\\\*|\\_/g;
-  inline._comment = edit(block._comment).replace('(?:-->|$)', '-->').getRegex();
-  inline.emStrong.lDelim = edit(inline.emStrong.lDelim).replace(/punct/g, inline._punctuation).getRegex();
-  inline.emStrong.rDelimAst = edit(inline.emStrong.rDelimAst, 'g').replace(/punct/g, inline._punctuation).getRegex();
-  inline.emStrong.rDelimUnd = edit(inline.emStrong.rDelimUnd, 'g').replace(/punct/g, inline._punctuation).getRegex();
-  inline._escapes = /\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/g;
-  inline._scheme = /[a-zA-Z][a-zA-Z0-9+.-]{1,31}/;
-  inline._email = /[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+(@)[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+(?![-_])/;
-  inline.autolink = edit(inline.autolink).replace('scheme', inline._scheme).replace('email', inline._email).getRegex();
-  inline._attribute = /\s+[a-zA-Z:_][\w.:-]*(?:\s*=\s*"[^"]*"|\s*=\s*'[^']*'|\s*=\s*[^\s"'=<>`]+)?/;
-  inline.tag = edit(inline.tag).replace('comment', inline._comment).replace('attribute', inline._attribute).getRegex();
-  inline._label = /(?:\[(?:\\.|[^\[\]\\])*\]|\\.|`[^`]*`|[^\[\]\\`])*?/;
-  inline._href = /<(?:\\.|[^\n<>\\])+>|[^\s\x00-\x1f]*/;
-  inline._title = /"(?:\\"?|[^"\\])*"|'(?:\\'?|[^'\\])*'|\((?:\\\)?|[^)\\])*\)/;
-  inline.link = edit(inline.link).replace('label', inline._label).replace('href', inline._href).replace('title', inline._title).getRegex();
-  inline.reflink = edit(inline.reflink).replace('label', inline._label).replace('ref', block._label).getRegex();
-  inline.nolink = edit(inline.nolink).replace('ref', block._label).getRegex();
-  inline.reflinkSearch = edit(inline.reflinkSearch, 'g').replace('reflink', inline.reflink).replace('nolink', inline.nolink).getRegex();
-  /**
-   * Normal Inline Grammar
-   */
-
-  inline.normal = merge({}, inline);
-  /**
-   * Pedantic Inline Grammar
-   */
-
-  inline.pedantic = merge({}, inline.normal, {
-    strong: {
-      start: /^__|\*\*/,
-      middle: /^__(?=\S)([\s\S]*?\S)__(?!_)|^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)/,
-      endAst: /\*\*(?!\*)/g,
-      endUnd: /__(?!_)/g
-    },
-    em: {
-      start: /^_|\*/,
-      middle: /^()\*(?=\S)([\s\S]*?\S)\*(?!\*)|^_(?=\S)([\s\S]*?\S)_(?!_)/,
-      endAst: /\*(?!\*)/g,
-      endUnd: /_(?!_)/g
-    },
-    link: edit(/^!?\[(label)\]\((.*?)\)/).replace('label', inline._label).getRegex(),
-    reflink: edit(/^!?\[(label)\]\s*\[([^\]]*)\]/).replace('label', inline._label).getRegex()
-  });
-  /**
-   * GFM Inline Grammar
-   */
-
-  inline.gfm = merge({}, inline.normal, {
-    escape: edit(inline.escape).replace('])', '~|])').getRegex(),
-    _extended_email: /[A-Za-z0-9._+-]+(@)[a-zA-Z0-9-_]+(?:\.[a-zA-Z0-9-_]*[a-zA-Z0-9])+(?![-_])/,
-    url: /^((?:ftp|https?):\/\/|www\.)(?:[a-zA-Z0-9\-]+\.?)+[^\s<]*|^email/,
-    _backpedal: /(?:[^?!.,:;*_~()&]+|\([^)]*\)|&(?![a-zA-Z0-9]+;$)|[?!.,:;*_~)]+(?!$))+/,
-    del: /^(~~?)(?=[^\s~])([\s\S]*?[^\s~])\1(?=[^~]|$)/,
-    text: /^([`~]+|[^`~])(?:(?= {2,}\n)|(?=[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@)|[\s\S]*?(?:(?=[\\<!\[`*~_]|\b_|https?:\/\/|ftp:\/\/|www\.|$)|[^ ](?= {2,}\n)|[^a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-](?=[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@)))/
-  });
-  inline.gfm.url = edit(inline.gfm.url, 'i').replace('email', inline.gfm._extended_email).getRegex();
-  /**
-   * GFM + Line Breaks Inline Grammar
-   */
-
-  inline.breaks = merge({}, inline.gfm, {
-    br: edit(inline.br).replace('{2,}', '*').getRegex(),
-    text: edit(inline.gfm.text).replace('\\b_', '\\b_| {2,}\\n').replace(/\{2,\}/g, '*').getRegex()
-  });
-
-  /**
-   * smartypants text replacement
-   * @param {string} text
-   */
-
-  function smartypants(text) {
-    return text // em-dashes
-    .replace(/---/g, "\u2014") // en-dashes
-    .replace(/--/g, "\u2013") // opening singles
-    .replace(/(^|[-\u2014/(\[{"\s])'/g, "$1\u2018") // closing singles & apostrophes
-    .replace(/'/g, "\u2019") // opening doubles
-    .replace(/(^|[-\u2014/(\[{\u2018\s])"/g, "$1\u201C") // closing doubles
-    .replace(/"/g, "\u201D") // ellipses
-    .replace(/\.{3}/g, "\u2026");
-  }
-  /**
-   * mangle email addresses
-   * @param {string} text
-   */
-
-
-  function mangle(text) {
-    var out = '',
-        i,
-        ch;
-    var l = text.length;
-
-    for (i = 0; i < l; i++) {
-      ch = text.charCodeAt(i);
-
-      if (Math.random() > 0.5) {
-        ch = 'x' + ch.toString(16);
-      }
-
-      out += '&#' + ch + ';';
-    }
-
-    return out;
-  }
-  /**
-   * Block Lexer
-   */
-
-
-  var Lexer = /*#__PURE__*/function () {
-    function Lexer(options) {
-      this.tokens = [];
-      this.tokens.links = Object.create(null);
-      this.options = options || exports.defaults;
-      this.options.tokenizer = this.options.tokenizer || new Tokenizer();
-      this.tokenizer = this.options.tokenizer;
-      this.tokenizer.options = this.options;
-      this.tokenizer.lexer = this;
-      this.inlineQueue = [];
-      this.state = {
-        inLink: false,
-        inRawBlock: false,
-        top: true
-      };
-      var rules = {
-        block: block.normal,
-        inline: inline.normal
-      };
-
-      if (this.options.pedantic) {
-        rules.block = block.pedantic;
-        rules.inline = inline.pedantic;
-      } else if (this.options.gfm) {
-        rules.block = block.gfm;
-
-        if (this.options.breaks) {
-          rules.inline = inline.breaks;
-        } else {
-          rules.inline = inline.gfm;
-        }
-      }
-
-      this.tokenizer.rules = rules;
-    }
-    /**
-     * Expose Rules
-     */
-
-
-    /**
-     * Static Lex Method
-     */
-    Lexer.lex = function lex(src, options) {
-      var lexer = new Lexer(options);
-      return lexer.lex(src);
-    }
-    /**
-     * Static Lex Inline Method
-     */
-    ;
-
-    Lexer.lexInline = function lexInline(src, options) {
-      var lexer = new Lexer(options);
-      return lexer.inlineTokens(src);
-    }
-    /**
-     * Preprocessing
-     */
-    ;
-
-    var _proto = Lexer.prototype;
-
-    _proto.lex = function lex(src) {
-      src = src.replace(/\r\n|\r/g, '\n');
-      this.blockTokens(src, this.tokens);
-      var next;
-
-      while (next = this.inlineQueue.shift()) {
-        this.inlineTokens(next.src, next.tokens);
-      }
-
-      return this.tokens;
-    }
-    /**
-     * Lexing
-     */
-    ;
-
-    _proto.blockTokens = function blockTokens(src, tokens) {
-      var _this = this;
-
-      if (tokens === void 0) {
-        tokens = [];
-      }
-
-      if (this.options.pedantic) {
-        src = src.replace(/\t/g, '    ').replace(/^ +$/gm, '');
-      } else {
-        src = src.replace(/^( *)(\t+)/gm, function (_, leading, tabs) {
-          return leading + '    '.repeat(tabs.length);
-        });
-      }
-
-      var token, lastToken, cutSrc, lastParagraphClipped;
-
-      while (src) {
-        if (this.options.extensions && this.options.extensions.block && this.options.extensions.block.some(function (extTokenizer) {
-          if (token = extTokenizer.call({
-            lexer: _this
-          }, src, tokens)) {
-            src = src.substring(token.raw.length);
-            tokens.push(token);
-            return true;
-          }
-
-          return false;
-        })) {
-          continue;
-        } // newline
-
-
-        if (token = this.tokenizer.space(src)) {
-          src = src.substring(token.raw.length);
-
-          if (token.raw.length === 1 && tokens.length > 0) {
-            // if there's a single \n as a spacer, it's terminating the last line,
-            // so move it there so that we don't get unecessary paragraph tags
-            tokens[tokens.length - 1].raw += '\n';
-          } else {
-            tokens.push(token);
-          }
-
-          continue;
-        } // code
-
-
-        if (token = this.tokenizer.code(src)) {
-          src = src.substring(token.raw.length);
-          lastToken = tokens[tokens.length - 1]; // An indented code block cannot interrupt a paragraph.
-
-          if (lastToken && (lastToken.type === 'paragraph' || lastToken.type === 'text')) {
-            lastToken.raw += '\n' + token.raw;
-            lastToken.text += '\n' + token.text;
-            this.inlineQueue[this.inlineQueue.length - 1].src = lastToken.text;
-          } else {
-            tokens.push(token);
-          }
-
-          continue;
-        } // fences
-
-
-        if (token = this.tokenizer.fences(src)) {
-          src = src.substring(token.raw.length);
-          tokens.push(token);
-          continue;
-        } // heading
-
-
-        if (token = this.tokenizer.heading(src)) {
-          src = src.substring(token.raw.length);
-          tokens.push(token);
-          continue;
-        } // hr
-
-
-        if (token = this.tokenizer.hr(src)) {
-          src = src.substring(token.raw.length);
-          tokens.push(token);
-          continue;
-        } // blockquote
-
-
-        if (token = this.tokenizer.blockquote(src)) {
-          src = src.substring(token.raw.length);
-          tokens.push(token);
-          continue;
-        } // list
-
-
-        if (token = this.tokenizer.list(src)) {
-          src = src.substring(token.raw.length);
-          tokens.push(token);
-          continue;
-        } // html
-
-
-        if (token = this.tokenizer.html(src)) {
-          src = src.substring(token.raw.length);
-          tokens.push(token);
-          continue;
-        } // def
-
-
-        if (token = this.tokenizer.def(src)) {
-          src = src.substring(token.raw.length);
-          lastToken = tokens[tokens.length - 1];
-
-          if (lastToken && (lastToken.type === 'paragraph' || lastToken.type === 'text')) {
-            lastToken.raw += '\n' + token.raw;
-            lastToken.text += '\n' + token.raw;
-            this.inlineQueue[this.inlineQueue.length - 1].src = lastToken.text;
-          } else if (!this.tokens.links[token.tag]) {
-            this.tokens.links[token.tag] = {
-              href: token.href,
-              title: token.title
-            };
-          }
-
-          continue;
-        } // table (gfm)
-
-
-        if (token = this.tokenizer.table(src)) {
-          src = src.substring(token.raw.length);
-          tokens.push(token);
-          continue;
-        } // lheading
-
-
-        if (token = this.tokenizer.lheading(src)) {
-          src = src.substring(token.raw.length);
-          tokens.push(token);
-          continue;
-        } // top-level paragraph
-        // prevent paragraph consuming extensions by clipping 'src' to extension start
-
-
-        cutSrc = src;
-
-        if (this.options.extensions && this.options.extensions.startBlock) {
-          (function () {
-            var startIndex = Infinity;
-            var tempSrc = src.slice(1);
-            var tempStart = void 0;
-
-            _this.options.extensions.startBlock.forEach(function (getStartIndex) {
-              tempStart = getStartIndex.call({
-                lexer: this
-              }, tempSrc);
-
-              if (typeof tempStart === 'number' && tempStart >= 0) {
-                startIndex = Math.min(startIndex, tempStart);
-              }
-            });
-
-            if (startIndex < Infinity && startIndex >= 0) {
-              cutSrc = src.substring(0, startIndex + 1);
-            }
-          })();
-        }
-
-        if (this.state.top && (token = this.tokenizer.paragraph(cutSrc))) {
-          lastToken = tokens[tokens.length - 1];
-
-          if (lastParagraphClipped && lastToken.type === 'paragraph') {
-            lastToken.raw += '\n' + token.raw;
-            lastToken.text += '\n' + token.text;
-            this.inlineQueue.pop();
-            this.inlineQueue[this.inlineQueue.length - 1].src = lastToken.text;
-          } else {
-            tokens.push(token);
-          }
-
-          lastParagraphClipped = cutSrc.length !== src.length;
-          src = src.substring(token.raw.length);
-          continue;
-        } // text
-
-
-        if (token = this.tokenizer.text(src)) {
-          src = src.substring(token.raw.length);
-          lastToken = tokens[tokens.length - 1];
-
-          if (lastToken && lastToken.type === 'text') {
-            lastToken.raw += '\n' + token.raw;
-            lastToken.text += '\n' + token.text;
-            this.inlineQueue.pop();
-            this.inlineQueue[this.inlineQueue.length - 1].src = lastToken.text;
-          } else {
-            tokens.push(token);
-          }
-
-          continue;
-        }
-
-        if (src) {
-          var errMsg = 'Infinite loop on byte: ' + src.charCodeAt(0);
-
-          if (this.options.silent) {
-            console.error(errMsg);
-            break;
-          } else {
-            throw new Error(errMsg);
-          }
-        }
-      }
-
-      this.state.top = true;
-      return tokens;
-    };
-
-    _proto.inline = function inline(src, tokens) {
-      if (tokens === void 0) {
-        tokens = [];
-      }
-
-      this.inlineQueue.push({
-        src: src,
-        tokens: tokens
-      });
-      return tokens;
-    }
-    /**
-     * Lexing/Compiling
-     */
-    ;
-
-    _proto.inlineTokens = function inlineTokens(src, tokens) {
-      var _this2 = this;
-
-      if (tokens === void 0) {
-        tokens = [];
-      }
-
-      var token, lastToken, cutSrc; // String with links masked to avoid interference with em and strong
-
-      var maskedSrc = src;
-      var match;
-      var keepPrevChar, prevChar; // Mask out reflinks
-
-      if (this.tokens.links) {
-        var links = Object.keys(this.tokens.links);
-
-        if (links.length > 0) {
-          while ((match = this.tokenizer.rules.inline.reflinkSearch.exec(maskedSrc)) != null) {
-            if (links.includes(match[0].slice(match[0].lastIndexOf('[') + 1, -1))) {
-              maskedSrc = maskedSrc.slice(0, match.index) + '[' + repeatString('a', match[0].length - 2) + ']' + maskedSrc.slice(this.tokenizer.rules.inline.reflinkSearch.lastIndex);
-            }
-          }
-        }
-      } // Mask out other blocks
-
-
-      while ((match = this.tokenizer.rules.inline.blockSkip.exec(maskedSrc)) != null) {
-        maskedSrc = maskedSrc.slice(0, match.index) + '[' + repeatString('a', match[0].length - 2) + ']' + maskedSrc.slice(this.tokenizer.rules.inline.blockSkip.lastIndex);
-      } // Mask out escaped em & strong delimiters
-
-
-      while ((match = this.tokenizer.rules.inline.escapedEmSt.exec(maskedSrc)) != null) {
-        maskedSrc = maskedSrc.slice(0, match.index) + '++' + maskedSrc.slice(this.tokenizer.rules.inline.escapedEmSt.lastIndex);
-      }
-
-      while (src) {
-        if (!keepPrevChar) {
-          prevChar = '';
-        }
-
-        keepPrevChar = false; // extensions
-
-        if (this.options.extensions && this.options.extensions.inline && this.options.extensions.inline.some(function (extTokenizer) {
-          if (token = extTokenizer.call({
-            lexer: _this2
-          }, src, tokens)) {
-            src = src.substring(token.raw.length);
-            tokens.push(token);
-            return true;
-          }
-
-          return false;
-        })) {
-          continue;
-        } // escape
-
-
-        if (token = this.tokenizer.escape(src)) {
-          src = src.substring(token.raw.length);
-          tokens.push(token);
-          continue;
-        } // tag
-
-
-        if (token = this.tokenizer.tag(src)) {
-          src = src.substring(token.raw.length);
-          lastToken = tokens[tokens.length - 1];
-
-          if (lastToken && token.type === 'text' && lastToken.type === 'text') {
-            lastToken.raw += token.raw;
-            lastToken.text += token.text;
-          } else {
-            tokens.push(token);
-          }
-
-          continue;
-        } // link
-
-
-        if (token = this.tokenizer.link(src)) {
-          src = src.substring(token.raw.length);
-          tokens.push(token);
-          continue;
-        } // reflink, nolink
-
-
-        if (token = this.tokenizer.reflink(src, this.tokens.links)) {
-          src = src.substring(token.raw.length);
-          lastToken = tokens[tokens.length - 1];
-
-          if (lastToken && token.type === 'text' && lastToken.type === 'text') {
-            lastToken.raw += token.raw;
-            lastToken.text += token.text;
-          } else {
-            tokens.push(token);
-          }
-
-          continue;
-        } // em & strong
-
-
-        if (token = this.tokenizer.emStrong(src, maskedSrc, prevChar)) {
-          src = src.substring(token.raw.length);
-          tokens.push(token);
-          continue;
-        } // code
-
-
-        if (token = this.tokenizer.codespan(src)) {
-          src = src.substring(token.raw.length);
-          tokens.push(token);
-          continue;
-        } // br
-
-
-        if (token = this.tokenizer.br(src)) {
-          src = src.substring(token.raw.length);
-          tokens.push(token);
-          continue;
-        } // del (gfm)
-
-
-        if (token = this.tokenizer.del(src)) {
-          src = src.substring(token.raw.length);
-          tokens.push(token);
-          continue;
-        } // autolink
-
-
-        if (token = this.tokenizer.autolink(src, mangle)) {
-          src = src.substring(token.raw.length);
-          tokens.push(token);
-          continue;
-        } // url (gfm)
-
-
-        if (!this.state.inLink && (token = this.tokenizer.url(src, mangle))) {
-          src = src.substring(token.raw.length);
-          tokens.push(token);
-          continue;
-        } // text
-        // prevent inlineText consuming extensions by clipping 'src' to extension start
-
-
-        cutSrc = src;
-
-        if (this.options.extensions && this.options.extensions.startInline) {
-          (function () {
-            var startIndex = Infinity;
-            var tempSrc = src.slice(1);
-            var tempStart = void 0;
-
-            _this2.options.extensions.startInline.forEach(function (getStartIndex) {
-              tempStart = getStartIndex.call({
-                lexer: this
-              }, tempSrc);
-
-              if (typeof tempStart === 'number' && tempStart >= 0) {
-                startIndex = Math.min(startIndex, tempStart);
-              }
-            });
-
-            if (startIndex < Infinity && startIndex >= 0) {
-              cutSrc = src.substring(0, startIndex + 1);
-            }
-          })();
-        }
-
-        if (token = this.tokenizer.inlineText(cutSrc, smartypants)) {
-          src = src.substring(token.raw.length);
-
-          if (token.raw.slice(-1) !== '_') {
-            // Track prevChar before string of ____ started
-            prevChar = token.raw.slice(-1);
-          }
-
-          keepPrevChar = true;
-          lastToken = tokens[tokens.length - 1];
-
-          if (lastToken && lastToken.type === 'text') {
-            lastToken.raw += token.raw;
-            lastToken.text += token.text;
-          } else {
-            tokens.push(token);
-          }
-
-          continue;
-        }
-
-        if (src) {
-          var errMsg = 'Infinite loop on byte: ' + src.charCodeAt(0);
-
-          if (this.options.silent) {
-            console.error(errMsg);
-            break;
-          } else {
-            throw new Error(errMsg);
-          }
-        }
-      }
-
-      return tokens;
-    };
-
-    _createClass(Lexer, null, [{
-      key: "rules",
-      get: function get() {
-        return {
-          block: block,
-          inline: inline
-        };
-      }
-    }]);
-
-    return Lexer;
-  }();
-
-  /**
-   * Renderer
-   */
-
-  var Renderer = /*#__PURE__*/function () {
-    function Renderer(options) {
-      this.options = options || exports.defaults;
-    }
-
-    var _proto = Renderer.prototype;
-
-    _proto.code = function code(_code, infostring, escaped) {
-      var lang = (infostring || '').match(/\S*/)[0];
-
-      if (this.options.highlight) {
-        var out = this.options.highlight(_code, lang);
-
-        if (out != null && out !== _code) {
-          escaped = true;
-          _code = out;
-        }
-      }
-
-      _code = _code.replace(/\n$/, '') + '\n';
-
-      if (!lang) {
-        return '<pre><code>' + (escaped ? _code : escape(_code, true)) + '</code></pre>\n';
-      }
-
-      return '<pre><code class="' + this.options.langPrefix + escape(lang, true) + '">' + (escaped ? _code : escape(_code, true)) + '</code></pre>\n';
-    }
-    /**
-     * @param {string} quote
-     */
-    ;
-
-    _proto.blockquote = function blockquote(quote) {
-      return "<blockquote>\n" + quote + "</blockquote>\n";
-    };
-
-    _proto.html = function html(_html) {
-      return _html;
-    }
-    /**
-     * @param {string} text
-     * @param {string} level
-     * @param {string} raw
-     * @param {any} slugger
-     */
-    ;
-
-    _proto.heading = function heading(text, level, raw, slugger) {
-      if (this.options.headerIds) {
-        var id = this.options.headerPrefix + slugger.slug(raw);
-        return "<h" + level + " id=\"" + id + "\">" + text + "</h" + level + ">\n";
-      } // ignore IDs
-
-
-      return "<h" + level + ">" + text + "</h" + level + ">\n";
-    };
-
-    _proto.hr = function hr() {
-      return this.options.xhtml ? '<hr/>\n' : '<hr>\n';
-    };
-
-    _proto.list = function list(body, ordered, start) {
-      var type = ordered ? 'ol' : 'ul',
-          startatt = ordered && start !== 1 ? ' start="' + start + '"' : '';
-      return '<' + type + startatt + '>\n' + body + '</' + type + '>\n';
-    }
-    /**
-     * @param {string} text
-     */
-    ;
-
-    _proto.listitem = function listitem(text) {
-      return "<li>" + text + "</li>\n";
-    };
-
-    _proto.checkbox = function checkbox(checked) {
-      return '<input ' + (checked ? 'checked="" ' : '') + 'disabled="" type="checkbox"' + (this.options.xhtml ? ' /' : '') + '> ';
-    }
-    /**
-     * @param {string} text
-     */
-    ;
-
-    _proto.paragraph = function paragraph(text) {
-      return "<p>" + text + "</p>\n";
-    }
-    /**
-     * @param {string} header
-     * @param {string} body
-     */
-    ;
-
-    _proto.table = function table(header, body) {
-      if (body) body = "<tbody>" + body + "</tbody>";
-      return '<table>\n' + '<thead>\n' + header + '</thead>\n' + body + '</table>\n';
-    }
-    /**
-     * @param {string} content
-     */
-    ;
-
-    _proto.tablerow = function tablerow(content) {
-      return "<tr>\n" + content + "</tr>\n";
-    };
-
-    _proto.tablecell = function tablecell(content, flags) {
-      var type = flags.header ? 'th' : 'td';
-      var tag = flags.align ? "<" + type + " align=\"" + flags.align + "\">" : "<" + type + ">";
-      return tag + content + ("</" + type + ">\n");
-    }
-    /**
-     * span level renderer
-     * @param {string} text
-     */
-    ;
-
-    _proto.strong = function strong(text) {
-      return "<strong>" + text + "</strong>";
-    }
-    /**
-     * @param {string} text
-     */
-    ;
-
-    _proto.em = function em(text) {
-      return "<em>" + text + "</em>";
-    }
-    /**
-     * @param {string} text
-     */
-    ;
-
-    _proto.codespan = function codespan(text) {
-      return "<code>" + text + "</code>";
-    };
-
-    _proto.br = function br() {
-      return this.options.xhtml ? '<br/>' : '<br>';
-    }
-    /**
-     * @param {string} text
-     */
-    ;
-
-    _proto.del = function del(text) {
-      return "<del>" + text + "</del>";
-    }
-    /**
-     * @param {string} href
-     * @param {string} title
-     * @param {string} text
-     */
-    ;
-
-    _proto.link = function link(href, title, text) {
-      href = cleanUrl(this.options.sanitize, this.options.baseUrl, href);
-
-      if (href === null) {
-        return text;
-      }
-
-      var out = '<a href="' + escape(href) + '"';
-
-      if (title) {
-        out += ' title="' + title + '"';
-      }
-
-      out += '>' + text + '</a>';
-      return out;
-    }
-    /**
-     * @param {string} href
-     * @param {string} title
-     * @param {string} text
-     */
-    ;
-
-    _proto.image = function image(href, title, text) {
-      href = cleanUrl(this.options.sanitize, this.options.baseUrl, href);
-
-      if (href === null) {
-        return text;
-      }
-
-      var out = "<img src=\"" + href + "\" alt=\"" + text + "\"";
-
-      if (title) {
-        out += " title=\"" + title + "\"";
-      }
-
-      out += this.options.xhtml ? '/>' : '>';
-      return out;
-    };
-
-    _proto.text = function text(_text) {
-      return _text;
-    };
-
-    return Renderer;
-  }();
-
-  /**
-   * TextRenderer
-   * returns only the textual part of the token
-   */
-  var TextRenderer = /*#__PURE__*/function () {
-    function TextRenderer() {}
-
-    var _proto = TextRenderer.prototype;
-
-    // no need for block level renderers
-    _proto.strong = function strong(text) {
-      return text;
-    };
-
-    _proto.em = function em(text) {
-      return text;
-    };
-
-    _proto.codespan = function codespan(text) {
-      return text;
-    };
-
-    _proto.del = function del(text) {
-      return text;
-    };
-
-    _proto.html = function html(text) {
-      return text;
-    };
-
-    _proto.text = function text(_text) {
-      return _text;
-    };
-
-    _proto.link = function link(href, title, text) {
-      return '' + text;
-    };
-
-    _proto.image = function image(href, title, text) {
-      return '' + text;
-    };
-
-    _proto.br = function br() {
-      return '';
-    };
-
-    return TextRenderer;
-  }();
-
-  /**
-   * Slugger generates header id
-   */
-  var Slugger = /*#__PURE__*/function () {
-    function Slugger() {
-      this.seen = {};
-    }
-    /**
-     * @param {string} value
-     */
-
-
-    var _proto = Slugger.prototype;
-
-    _proto.serialize = function serialize(value) {
-      return value.toLowerCase().trim() // remove html tags
-      .replace(/<[!\/a-z].*?>/ig, '') // remove unwanted chars
-      .replace(/[\u2000-\u206F\u2E00-\u2E7F\\'!"#$%&()*+,./:;<=>?@[\]^`{|}~]/g, '').replace(/\s/g, '-');
-    }
-    /**
-     * Finds the next safe (unique) slug to use
-     * @param {string} originalSlug
-     * @param {boolean} isDryRun
-     */
-    ;
-
-    _proto.getNextSafeSlug = function getNextSafeSlug(originalSlug, isDryRun) {
-      var slug = originalSlug;
-      var occurenceAccumulator = 0;
-
-      if (this.seen.hasOwnProperty(slug)) {
-        occurenceAccumulator = this.seen[originalSlug];
-
-        do {
-          occurenceAccumulator++;
-          slug = originalSlug + '-' + occurenceAccumulator;
-        } while (this.seen.hasOwnProperty(slug));
-      }
-
-      if (!isDryRun) {
-        this.seen[originalSlug] = occurenceAccumulator;
-        this.seen[slug] = 0;
-      }
-
-      return slug;
-    }
-    /**
-     * Convert string to unique id
-     * @param {object} [options]
-     * @param {boolean} [options.dryrun] Generates the next unique slug without
-     * updating the internal accumulator.
-     */
-    ;
-
-    _proto.slug = function slug(value, options) {
-      if (options === void 0) {
-        options = {};
-      }
-
-      var slug = this.serialize(value);
-      return this.getNextSafeSlug(slug, options.dryrun);
-    };
-
-    return Slugger;
-  }();
-
-  /**
-   * Parsing & Compiling
-   */
-
-  var Parser = /*#__PURE__*/function () {
-    function Parser(options) {
-      this.options = options || exports.defaults;
-      this.options.renderer = this.options.renderer || new Renderer();
-      this.renderer = this.options.renderer;
-      this.renderer.options = this.options;
-      this.textRenderer = new TextRenderer();
-      this.slugger = new Slugger();
-    }
-    /**
-     * Static Parse Method
-     */
-
-
-    Parser.parse = function parse(tokens, options) {
-      var parser = new Parser(options);
-      return parser.parse(tokens);
-    }
-    /**
-     * Static Parse Inline Method
-     */
-    ;
-
-    Parser.parseInline = function parseInline(tokens, options) {
-      var parser = new Parser(options);
-      return parser.parseInline(tokens);
-    }
-    /**
-     * Parse Loop
-     */
-    ;
-
-    var _proto = Parser.prototype;
-
-    _proto.parse = function parse(tokens, top) {
-      if (top === void 0) {
-        top = true;
-      }
-
-      var out = '',
-          i,
-          j,
-          k,
-          l2,
-          l3,
-          row,
-          cell,
-          header,
-          body,
-          token,
-          ordered,
-          start,
-          loose,
-          itemBody,
-          item,
-          checked,
-          task,
-          checkbox,
-          ret;
-      var l = tokens.length;
-
-      for (i = 0; i < l; i++) {
-        token = tokens[i]; // Run any renderer extensions
-
-        if (this.options.extensions && this.options.extensions.renderers && this.options.extensions.renderers[token.type]) {
-          ret = this.options.extensions.renderers[token.type].call({
-            parser: this
-          }, token);
-
-          if (ret !== false || !['space', 'hr', 'heading', 'code', 'table', 'blockquote', 'list', 'html', 'paragraph', 'text'].includes(token.type)) {
-            out += ret || '';
-            continue;
-          }
-        }
-
-        switch (token.type) {
-          case 'space':
-            {
-              continue;
-            }
-
-          case 'hr':
-            {
-              out += this.renderer.hr();
-              continue;
-            }
-
-          case 'heading':
-            {
-              out += this.renderer.heading(this.parseInline(token.tokens), token.depth, unescape(this.parseInline(token.tokens, this.textRenderer)), this.slugger);
-              continue;
-            }
-
-          case 'code':
-            {
-              out += this.renderer.code(token.text, token.lang, token.escaped);
-              continue;
-            }
-
-          case 'table':
-            {
-              header = ''; // header
-
-              cell = '';
-              l2 = token.header.length;
-
-              for (j = 0; j < l2; j++) {
-                cell += this.renderer.tablecell(this.parseInline(token.header[j].tokens), {
-                  header: true,
-                  align: token.align[j]
-                });
-              }
-
-              header += this.renderer.tablerow(cell);
-              body = '';
-              l2 = token.rows.length;
-
-              for (j = 0; j < l2; j++) {
-                row = token.rows[j];
-                cell = '';
-                l3 = row.length;
-
-                for (k = 0; k < l3; k++) {
-                  cell += this.renderer.tablecell(this.parseInline(row[k].tokens), {
-                    header: false,
-                    align: token.align[k]
-                  });
-                }
-
-                body += this.renderer.tablerow(cell);
-              }
-
-              out += this.renderer.table(header, body);
-              continue;
-            }
-
-          case 'blockquote':
-            {
-              body = this.parse(token.tokens);
-              out += this.renderer.blockquote(body);
-              continue;
-            }
-
-          case 'list':
-            {
-              ordered = token.ordered;
-              start = token.start;
-              loose = token.loose;
-              l2 = token.items.length;
-              body = '';
-
-              for (j = 0; j < l2; j++) {
-                item = token.items[j];
-                checked = item.checked;
-                task = item.task;
-                itemBody = '';
-
-                if (item.task) {
-                  checkbox = this.renderer.checkbox(checked);
-
-                  if (loose) {
-                    if (item.tokens.length > 0 && item.tokens[0].type === 'paragraph') {
-                      item.tokens[0].text = checkbox + ' ' + item.tokens[0].text;
-
-                      if (item.tokens[0].tokens && item.tokens[0].tokens.length > 0 && item.tokens[0].tokens[0].type === 'text') {
-                        item.tokens[0].tokens[0].text = checkbox + ' ' + item.tokens[0].tokens[0].text;
-                      }
-                    } else {
-                      item.tokens.unshift({
-                        type: 'text',
-                        text: checkbox
-                      });
-                    }
-                  } else {
-                    itemBody += checkbox;
-                  }
-                }
-
-                itemBody += this.parse(item.tokens, loose);
-                body += this.renderer.listitem(itemBody, task, checked);
-              }
-
-              out += this.renderer.list(body, ordered, start);
-              continue;
-            }
-
-          case 'html':
-            {
-              // TODO parse inline content if parameter markdown=1
-              out += this.renderer.html(token.text);
-              continue;
-            }
-
-          case 'paragraph':
-            {
-              out += this.renderer.paragraph(this.parseInline(token.tokens));
-              continue;
-            }
-
-          case 'text':
-            {
-              body = token.tokens ? this.parseInline(token.tokens) : token.text;
-
-              while (i + 1 < l && tokens[i + 1].type === 'text') {
-                token = tokens[++i];
-                body += '\n' + (token.tokens ? this.parseInline(token.tokens) : token.text);
-              }
-
-              out += top ? this.renderer.paragraph(body) : body;
-              continue;
-            }
-
-          default:
-            {
-              var errMsg = 'Token with "' + token.type + '" type was not found.';
-
-              if (this.options.silent) {
-                console.error(errMsg);
-                return;
-              } else {
-                throw new Error(errMsg);
-              }
-            }
-        }
-      }
-
-      return out;
-    }
-    /**
-     * Parse Inline Tokens
-     */
-    ;
-
-    _proto.parseInline = function parseInline(tokens, renderer) {
-      renderer = renderer || this.renderer;
-      var out = '',
-          i,
-          token,
-          ret;
-      var l = tokens.length;
-
-      for (i = 0; i < l; i++) {
-        token = tokens[i]; // Run any renderer extensions
-
-        if (this.options.extensions && this.options.extensions.renderers && this.options.extensions.renderers[token.type]) {
-          ret = this.options.extensions.renderers[token.type].call({
-            parser: this
-          }, token);
-
-          if (ret !== false || !['escape', 'html', 'link', 'image', 'strong', 'em', 'codespan', 'br', 'del', 'text'].includes(token.type)) {
-            out += ret || '';
-            continue;
-          }
-        }
-
-        switch (token.type) {
-          case 'escape':
-            {
-              out += renderer.text(token.text);
-              break;
-            }
-
-          case 'html':
-            {
-              out += renderer.html(token.text);
-              break;
-            }
-
-          case 'link':
-            {
-              out += renderer.link(token.href, token.title, this.parseInline(token.tokens, renderer));
-              break;
-            }
-
-          case 'image':
-            {
-              out += renderer.image(token.href, token.title, token.text);
-              break;
-            }
-
-          case 'strong':
-            {
-              out += renderer.strong(this.parseInline(token.tokens, renderer));
-              break;
-            }
-
-          case 'em':
-            {
-              out += renderer.em(this.parseInline(token.tokens, renderer));
-              break;
-            }
-
-          case 'codespan':
-            {
-              out += renderer.codespan(token.text);
-              break;
-            }
-
-          case 'br':
-            {
-              out += renderer.br();
-              break;
-            }
-
-          case 'del':
-            {
-              out += renderer.del(this.parseInline(token.tokens, renderer));
-              break;
-            }
-
-          case 'text':
-            {
-              out += renderer.text(token.text);
-              break;
-            }
-
-          default:
-            {
-              var errMsg = 'Token with "' + token.type + '" type was not found.';
-
-              if (this.options.silent) {
-                console.error(errMsg);
-                return;
-              } else {
-                throw new Error(errMsg);
-              }
-            }
-        }
-      }
-
-      return out;
-    };
-
-    return Parser;
-  }();
-
-  /**
-   * Marked
-   */
-
-  function marked(src, opt, callback) {
-    // throw error in case of non string input
-    if (typeof src === 'undefined' || src === null) {
-      throw new Error('marked(): input parameter is undefined or null');
-    }
-
-    if (typeof src !== 'string') {
-      throw new Error('marked(): input parameter is of type ' + Object.prototype.toString.call(src) + ', string expected');
-    }
-
-    if (typeof opt === 'function') {
-      callback = opt;
-      opt = null;
-    }
-
-    opt = merge({}, marked.defaults, opt || {});
-    checkSanitizeDeprecation(opt);
-
-    if (callback) {
-      var highlight = opt.highlight;
-      var tokens;
-
-      try {
-        tokens = Lexer.lex(src, opt);
-      } catch (e) {
-        return callback(e);
-      }
-
-      var done = function done(err) {
-        var out;
-
-        if (!err) {
-          try {
-            if (opt.walkTokens) {
-              marked.walkTokens(tokens, opt.walkTokens);
-            }
-
-            out = Parser.parse(tokens, opt);
-          } catch (e) {
-            err = e;
-          }
-        }
-
-        opt.highlight = highlight;
-        return err ? callback(err) : callback(null, out);
-      };
-
-      if (!highlight || highlight.length < 3) {
-        return done();
-      }
-
-      delete opt.highlight;
-      if (!tokens.length) return done();
-      var pending = 0;
-      marked.walkTokens(tokens, function (token) {
-        if (token.type === 'code') {
-          pending++;
-          setTimeout(function () {
-            highlight(token.text, token.lang, function (err, code) {
-              if (err) {
-                return done(err);
-              }
-
-              if (code != null && code !== token.text) {
-                token.text = code;
-                token.escaped = true;
-              }
-
-              pending--;
-
-              if (pending === 0) {
-                done();
-              }
-            });
-          }, 0);
-        }
-      });
-
-      if (pending === 0) {
-        done();
-      }
-
-      return;
-    }
-
-    function onError(e) {
-      e.message += '\nPlease report this to https://github.com/markedjs/marked.';
-
-      if (opt.silent) {
-        return '<p>An error occurred:</p><pre>' + escape(e.message + '', true) + '</pre>';
-      }
-
-      throw e;
-    }
-
-    try {
-      var _tokens = Lexer.lex(src, opt);
-
-      if (opt.walkTokens) {
-        if (opt.async) {
-          return Promise.all(marked.walkTokens(_tokens, opt.walkTokens)).then(function () {
-            return Parser.parse(_tokens, opt);
-          })["catch"](onError);
-        }
-
-        marked.walkTokens(_tokens, opt.walkTokens);
-      }
-
-      return Parser.parse(_tokens, opt);
-    } catch (e) {
-      onError(e);
-    }
-  }
-  /**
-   * Options
-   */
-
-  marked.options = marked.setOptions = function (opt) {
-    merge(marked.defaults, opt);
-    changeDefaults(marked.defaults);
-    return marked;
-  };
-
-  marked.getDefaults = getDefaults;
-  marked.defaults = exports.defaults;
-  /**
-   * Use Extension
-   */
-
-  marked.use = function () {
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-
-    var opts = merge.apply(void 0, [{}].concat(args));
-    var extensions = marked.defaults.extensions || {
-      renderers: {},
-      childTokens: {}
-    };
-    var hasExtensions;
-    args.forEach(function (pack) {
-      // ==-- Parse "addon" extensions --== //
-      if (pack.extensions) {
-        hasExtensions = true;
-        pack.extensions.forEach(function (ext) {
-          if (!ext.name) {
-            throw new Error('extension name required');
-          }
-
-          if (ext.renderer) {
-            // Renderer extensions
-            var prevRenderer = extensions.renderers ? extensions.renderers[ext.name] : null;
-
-            if (prevRenderer) {
-              // Replace extension with func to run new extension but fall back if false
-              extensions.renderers[ext.name] = function () {
-                for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-                  args[_key2] = arguments[_key2];
-                }
-
-                var ret = ext.renderer.apply(this, args);
-
-                if (ret === false) {
-                  ret = prevRenderer.apply(this, args);
-                }
-
-                return ret;
-              };
-            } else {
-              extensions.renderers[ext.name] = ext.renderer;
-            }
-          }
-
-          if (ext.tokenizer) {
-            // Tokenizer Extensions
-            if (!ext.level || ext.level !== 'block' && ext.level !== 'inline') {
-              throw new Error("extension level must be 'block' or 'inline'");
-            }
-
-            if (extensions[ext.level]) {
-              extensions[ext.level].unshift(ext.tokenizer);
-            } else {
-              extensions[ext.level] = [ext.tokenizer];
-            }
-
-            if (ext.start) {
-              // Function to check for start of token
-              if (ext.level === 'block') {
-                if (extensions.startBlock) {
-                  extensions.startBlock.push(ext.start);
-                } else {
-                  extensions.startBlock = [ext.start];
-                }
-              } else if (ext.level === 'inline') {
-                if (extensions.startInline) {
-                  extensions.startInline.push(ext.start);
-                } else {
-                  extensions.startInline = [ext.start];
-                }
-              }
-            }
-          }
-
-          if (ext.childTokens) {
-            // Child tokens to be visited by walkTokens
-            extensions.childTokens[ext.name] = ext.childTokens;
-          }
-        });
-      } // ==-- Parse "overwrite" extensions --== //
-
-
-      if (pack.renderer) {
-        (function () {
-          var renderer = marked.defaults.renderer || new Renderer();
-
-          var _loop = function _loop(prop) {
-            var prevRenderer = renderer[prop]; // Replace renderer with func to run extension, but fall back if false
-
-            renderer[prop] = function () {
-              for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
-                args[_key3] = arguments[_key3];
-              }
-
-              var ret = pack.renderer[prop].apply(renderer, args);
-
-              if (ret === false) {
-                ret = prevRenderer.apply(renderer, args);
-              }
-
-              return ret;
-            };
-          };
-
-          for (var prop in pack.renderer) {
-            _loop(prop);
-          }
-
-          opts.renderer = renderer;
-        })();
-      }
-
-      if (pack.tokenizer) {
-        (function () {
-          var tokenizer = marked.defaults.tokenizer || new Tokenizer();
-
-          var _loop2 = function _loop2(prop) {
-            var prevTokenizer = tokenizer[prop]; // Replace tokenizer with func to run extension, but fall back if false
-
-            tokenizer[prop] = function () {
-              for (var _len4 = arguments.length, args = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
-                args[_key4] = arguments[_key4];
-              }
-
-              var ret = pack.tokenizer[prop].apply(tokenizer, args);
-
-              if (ret === false) {
-                ret = prevTokenizer.apply(tokenizer, args);
-              }
-
-              return ret;
-            };
-          };
-
-          for (var prop in pack.tokenizer) {
-            _loop2(prop);
-          }
-
-          opts.tokenizer = tokenizer;
-        })();
-      } // ==-- Parse WalkTokens extensions --== //
-
-
-      if (pack.walkTokens) {
-        var _walkTokens = marked.defaults.walkTokens;
-
-        opts.walkTokens = function (token) {
-          var values = [];
-          values.push(pack.walkTokens.call(this, token));
-
-          if (_walkTokens) {
-            values = values.concat(_walkTokens.call(this, token));
-          }
-
-          return values;
-        };
-      }
-
-      if (hasExtensions) {
-        opts.extensions = extensions;
-      }
-
-      marked.setOptions(opts);
-    });
-  };
-  /**
-   * Run callback for every token
-   */
-
-
-  marked.walkTokens = function (tokens, callback) {
-    var values = [];
-
-    var _loop3 = function _loop3() {
-      var token = _step.value;
-      values = values.concat(callback.call(marked, token));
-
-      switch (token.type) {
-        case 'table':
-          {
-            for (var _iterator2 = _createForOfIteratorHelperLoose(token.header), _step2; !(_step2 = _iterator2()).done;) {
-              var cell = _step2.value;
-              values = values.concat(marked.walkTokens(cell.tokens, callback));
-            }
-
-            for (var _iterator3 = _createForOfIteratorHelperLoose(token.rows), _step3; !(_step3 = _iterator3()).done;) {
-              var row = _step3.value;
-
-              for (var _iterator4 = _createForOfIteratorHelperLoose(row), _step4; !(_step4 = _iterator4()).done;) {
-                var _cell = _step4.value;
-                values = values.concat(marked.walkTokens(_cell.tokens, callback));
-              }
-            }
-
-            break;
-          }
-
-        case 'list':
-          {
-            values = values.concat(marked.walkTokens(token.items, callback));
-            break;
-          }
-
-        default:
-          {
-            if (marked.defaults.extensions && marked.defaults.extensions.childTokens && marked.defaults.extensions.childTokens[token.type]) {
-              // Walk any extensions
-              marked.defaults.extensions.childTokens[token.type].forEach(function (childTokens) {
-                values = values.concat(marked.walkTokens(token[childTokens], callback));
-              });
-            } else if (token.tokens) {
-              values = values.concat(marked.walkTokens(token.tokens, callback));
-            }
-          }
-      }
-    };
-
-    for (var _iterator = _createForOfIteratorHelperLoose(tokens), _step; !(_step = _iterator()).done;) {
-      _loop3();
-    }
-
-    return values;
-  };
-  /**
-   * Parse Inline
-   * @param {string} src
-   */
-
-
-  marked.parseInline = function (src, opt) {
-    // throw error in case of non string input
-    if (typeof src === 'undefined' || src === null) {
-      throw new Error('marked.parseInline(): input parameter is undefined or null');
-    }
-
-    if (typeof src !== 'string') {
-      throw new Error('marked.parseInline(): input parameter is of type ' + Object.prototype.toString.call(src) + ', string expected');
-    }
-
-    opt = merge({}, marked.defaults, opt || {});
-    checkSanitizeDeprecation(opt);
-
-    try {
-      var tokens = Lexer.lexInline(src, opt);
-
-      if (opt.walkTokens) {
-        marked.walkTokens(tokens, opt.walkTokens);
-      }
-
-      return Parser.parseInline(tokens, opt);
-    } catch (e) {
-      e.message += '\nPlease report this to https://github.com/markedjs/marked.';
-
-      if (opt.silent) {
-        return '<p>An error occurred:</p><pre>' + escape(e.message + '', true) + '</pre>';
-      }
-
-      throw e;
-    }
-  };
-  /**
-   * Expose
-   */
-
-
-  marked.Parser = Parser;
-  marked.parser = Parser.parse;
-  marked.Renderer = Renderer;
-  marked.TextRenderer = TextRenderer;
-  marked.Lexer = Lexer;
-  marked.lexer = Lexer.lex;
-  marked.Tokenizer = Tokenizer;
-  marked.Slugger = Slugger;
-  marked.parse = marked;
-  var options = marked.options;
-  var setOptions = marked.setOptions;
-  var use = marked.use;
-  var walkTokens = marked.walkTokens;
-  var parseInline = marked.parseInline;
-  var parse = marked;
-  var parser = Parser.parse;
-  var lexer = Lexer.lex;
-
-  exports.Lexer = Lexer;
-  exports.Parser = Parser;
-  exports.Renderer = Renderer;
-  exports.Slugger = Slugger;
-  exports.TextRenderer = TextRenderer;
-  exports.Tokenizer = Tokenizer;
-  exports.getDefaults = getDefaults;
-  exports.lexer = lexer;
-  exports.marked = marked;
-  exports.options = options;
-  exports.parse = parse;
-  exports.parseInline = parseInline;
-  exports.parser = parser;
-  exports.setOptions = setOptions;
-  exports.use = use;
-  exports.walkTokens = walkTokens;
-
-  Object.defineProperty(exports, '__esModule', { value: true });
-
-}));
-
-// ESM-uncomment-begin
-// })();
-// export var Lexer = (__marked_exports.Lexer || exports.Lexer);
-// export var Parser = (__marked_exports.Parser || exports.Parser);
-// export var Renderer = (__marked_exports.Renderer || exports.Renderer);
-// export var Slugger = (__marked_exports.Slugger || exports.Slugger);
-// export var TextRenderer = (__marked_exports.TextRenderer || exports.TextRenderer);
-// export var Tokenizer = (__marked_exports.Tokenizer || exports.Tokenizer);
-// export var getDefaults = (__marked_exports.getDefaults || exports.getDefaults);
-// export var lexer = (__marked_exports.lexer || exports.lexer);
-// export var marked = (__marked_exports.marked || exports.marked);
-// export var options = (__marked_exports.options || exports.options);
-// export var parse = (__marked_exports.parse || exports.parse);
-// export var parseInline = (__marked_exports.parseInline || exports.parseInline);
-// export var parser = (__marked_exports.parser || exports.parser);
-// export var setOptions = (__marked_exports.setOptions || exports.setOptions);
-// export var use = (__marked_exports.use || exports.use);
-// export var walkTokens = (__marked_exports.walkTokens || exports.walkTokens);
-// ESM-uncomment-end
+let __marked_exports = {};
+(function () {
+	function define(deps, factory) {
+		factory(__marked_exports);
+	}
+	define.amd = true;
+
+	(function (global, factory) {
+		typeof define === 'function' && define.amd ? define(['exports'], factory) :
+			typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
+				(global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.marked = {}));
+	})(this, (function (exports) {
+		'use strict';
+
+		/**
+		 * Gets the original marked default options.
+		 */
+		function _getDefaults() {
+			return {
+				async: false,
+				breaks: false,
+				extensions: null,
+				gfm: true,
+				hooks: null,
+				pedantic: false,
+				renderer: null,
+				silent: false,
+				tokenizer: null,
+				walkTokens: null,
+			};
+		}
+		exports.defaults = _getDefaults();
+		function changeDefaults(newDefaults) {
+			exports.defaults = newDefaults;
+		}
+
+		/**
+		 * Helpers
+		 */
+		const escapeTest = /[&<>"']/;
+		const escapeReplace = new RegExp(escapeTest.source, 'g');
+		const escapeTestNoEncode = /[<>"']|&(?!(#\d{1,7}|#[Xx][a-fA-F0-9]{1,6}|\w+);)/;
+		const escapeReplaceNoEncode = new RegExp(escapeTestNoEncode.source, 'g');
+		const escapeReplacements = {
+			'&': '&amp;',
+			'<': '&lt;',
+			'>': '&gt;',
+			'"': '&quot;',
+			"'": '&#39;',
+		};
+		const getEscapeReplacement = (ch) => escapeReplacements[ch];
+		function escape$1(html, encode) {
+			if (encode) {
+				if (escapeTest.test(html)) {
+					return html.replace(escapeReplace, getEscapeReplacement);
+				}
+			}
+			else {
+				if (escapeTestNoEncode.test(html)) {
+					return html.replace(escapeReplaceNoEncode, getEscapeReplacement);
+				}
+			}
+			return html;
+		}
+		const caret = /(^|[^\[])\^/g;
+		function edit(regex, opt) {
+			let source = typeof regex === 'string' ? regex : regex.source;
+			opt = opt || '';
+			const obj = {
+				replace: (name, val) => {
+					let valSource = typeof val === 'string' ? val : val.source;
+					valSource = valSource.replace(caret, '$1');
+					source = source.replace(name, valSource);
+					return obj;
+				},
+				getRegex: () => {
+					return new RegExp(source, opt);
+				},
+			};
+			return obj;
+		}
+		function cleanUrl(href) {
+			try {
+				href = encodeURI(href).replace(/%25/g, '%');
+			}
+			catch {
+				return null;
+			}
+			return href;
+		}
+		const noopTest = { exec: () => null };
+		function splitCells(tableRow, count) {
+			// ensure that every cell-delimiting pipe has a space
+			// before it to distinguish it from an escaped pipe
+			const row = tableRow.replace(/\|/g, (match, offset, str) => {
+				let escaped = false;
+				let curr = offset;
+				while (--curr >= 0 && str[curr] === '\\')
+					escaped = !escaped;
+				if (escaped) {
+					// odd number of slashes means | is escaped
+					// so we leave it alone
+					return '|';
+				}
+				else {
+					// add space before unescaped |
+					return ' |';
+				}
+			}), cells = row.split(/ \|/);
+			let i = 0;
+			// First/last cell in a row cannot be empty if it has no leading/trailing pipe
+			if (!cells[0].trim()) {
+				cells.shift();
+			}
+			if (cells.length > 0 && !cells[cells.length - 1].trim()) {
+				cells.pop();
+			}
+			if (count) {
+				if (cells.length > count) {
+					cells.splice(count);
+				}
+				else {
+					while (cells.length < count)
+						cells.push('');
+				}
+			}
+			for (; i < cells.length; i++) {
+				// leading or trailing whitespace is ignored per the gfm spec
+				cells[i] = cells[i].trim().replace(/\\\|/g, '|');
+			}
+			return cells;
+		}
+		/**
+		 * Remove trailing 'c's. Equivalent to str.replace(/c*$/, '').
+		 * /c*$/ is vulnerable to REDOS.
+		 *
+		 * @param str
+		 * @param c
+		 * @param invert Remove suffix of non-c chars instead. Default falsey.
+		 */
+		function rtrim(str, c, invert) {
+			const l = str.length;
+			if (l === 0) {
+				return '';
+			}
+			// Length of suffix matching the invert condition.
+			let suffLen = 0;
+			// Step left until we fail to match the invert condition.
+			while (suffLen < l) {
+				const currChar = str.charAt(l - suffLen - 1);
+				if (currChar === c && !invert) {
+					suffLen++;
+				}
+				else if (currChar !== c && invert) {
+					suffLen++;
+				}
+				else {
+					break;
+				}
+			}
+			return str.slice(0, l - suffLen);
+		}
+		function findClosingBracket(str, b) {
+			if (str.indexOf(b[1]) === -1) {
+				return -1;
+			}
+			let level = 0;
+			for (let i = 0; i < str.length; i++) {
+				if (str[i] === '\\') {
+					i++;
+				}
+				else if (str[i] === b[0]) {
+					level++;
+				}
+				else if (str[i] === b[1]) {
+					level--;
+					if (level < 0) {
+						return i;
+					}
+				}
+			}
+			return -1;
+		}
+
+		function outputLink(cap, link, raw, lexer) {
+			const href = link.href;
+			const title = link.title ? escape$1(link.title) : null;
+			const text = cap[1].replace(/\\([\[\]])/g, '$1');
+			if (cap[0].charAt(0) !== '!') {
+				lexer.state.inLink = true;
+				const token = {
+					type: 'link',
+					raw,
+					href,
+					title,
+					text,
+					tokens: lexer.inlineTokens(text),
+				};
+				lexer.state.inLink = false;
+				return token;
+			}
+			return {
+				type: 'image',
+				raw,
+				href,
+				title,
+				text: escape$1(text),
+			};
+		}
+		function indentCodeCompensation(raw, text) {
+			const matchIndentToCode = raw.match(/^(\s+)(?:```)/);
+			if (matchIndentToCode === null) {
+				return text;
+			}
+			const indentToCode = matchIndentToCode[1];
+			return text
+				.split('\n')
+				.map(node => {
+					const matchIndentInNode = node.match(/^\s+/);
+					if (matchIndentInNode === null) {
+						return node;
+					}
+					const [indentInNode] = matchIndentInNode;
+					if (indentInNode.length >= indentToCode.length) {
+						return node.slice(indentToCode.length);
+					}
+					return node;
+				})
+				.join('\n');
+		}
+		/**
+		 * Tokenizer
+		 */
+		class _Tokenizer {
+			options;
+			rules; // set by the lexer
+			lexer; // set by the lexer
+			constructor(options) {
+				this.options = options || exports.defaults;
+			}
+			space(src) {
+				const cap = this.rules.block.newline.exec(src);
+				if (cap && cap[0].length > 0) {
+					return {
+						type: 'space',
+						raw: cap[0],
+					};
+				}
+			}
+			code(src) {
+				const cap = this.rules.block.code.exec(src);
+				if (cap) {
+					const text = cap[0].replace(/^ {1,4}/gm, '');
+					return {
+						type: 'code',
+						raw: cap[0],
+						codeBlockStyle: 'indented',
+						text: !this.options.pedantic
+							? rtrim(text, '\n')
+							: text,
+					};
+				}
+			}
+			fences(src) {
+				const cap = this.rules.block.fences.exec(src);
+				if (cap) {
+					const raw = cap[0];
+					const text = indentCodeCompensation(raw, cap[3] || '');
+					return {
+						type: 'code',
+						raw,
+						lang: cap[2] ? cap[2].trim().replace(this.rules.inline.anyPunctuation, '$1') : cap[2],
+						text,
+					};
+				}
+			}
+			heading(src) {
+				const cap = this.rules.block.heading.exec(src);
+				if (cap) {
+					let text = cap[2].trim();
+					// remove trailing #s
+					if (/#$/.test(text)) {
+						const trimmed = rtrim(text, '#');
+						if (this.options.pedantic) {
+							text = trimmed.trim();
+						}
+						else if (!trimmed || / $/.test(trimmed)) {
+							// CommonMark requires space before trailing #s
+							text = trimmed.trim();
+						}
+					}
+					return {
+						type: 'heading',
+						raw: cap[0],
+						depth: cap[1].length,
+						text,
+						tokens: this.lexer.inline(text),
+					};
+				}
+			}
+			hr(src) {
+				const cap = this.rules.block.hr.exec(src);
+				if (cap) {
+					return {
+						type: 'hr',
+						raw: rtrim(cap[0], '\n'),
+					};
+				}
+			}
+			blockquote(src) {
+				const cap = this.rules.block.blockquote.exec(src);
+				if (cap) {
+					let lines = rtrim(cap[0], '\n').split('\n');
+					let raw = '';
+					let text = '';
+					const tokens = [];
+					while (lines.length > 0) {
+						let inBlockquote = false;
+						const currentLines = [];
+						let i;
+						for (i = 0; i < lines.length; i++) {
+							// get lines up to a continuation
+							if (/^ {0,3}>/.test(lines[i])) {
+								currentLines.push(lines[i]);
+								inBlockquote = true;
+							}
+							else if (!inBlockquote) {
+								currentLines.push(lines[i]);
+							}
+							else {
+								break;
+							}
+						}
+						lines = lines.slice(i);
+						const currentRaw = currentLines.join('\n');
+						const currentText = currentRaw
+							// precede setext continuation with 4 spaces so it isn't a setext
+							.replace(/\n {0,3}((?:=+|-+) *)(?=\n|$)/g, '\n    $1')
+							.replace(/^ {0,3}>[ \t]?/gm, '');
+						raw = raw ? `${raw}\n${currentRaw}` : currentRaw;
+						text = text ? `${text}\n${currentText}` : currentText;
+						// parse blockquote lines as top level tokens
+						// merge paragraphs if this is a continuation
+						const top = this.lexer.state.top;
+						this.lexer.state.top = true;
+						this.lexer.blockTokens(currentText, tokens, true);
+						this.lexer.state.top = top;
+						// if there is no continuation then we are done
+						if (lines.length === 0) {
+							break;
+						}
+						const lastToken = tokens[tokens.length - 1];
+						if (lastToken?.type === 'code') {
+							// blockquote continuation cannot be preceded by a code block
+							break;
+						}
+						else if (lastToken?.type === 'blockquote') {
+							// include continuation in nested blockquote
+							const oldToken = lastToken;
+							const newText = oldToken.raw + '\n' + lines.join('\n');
+							const newToken = this.blockquote(newText);
+							tokens[tokens.length - 1] = newToken;
+							raw = raw.substring(0, raw.length - oldToken.raw.length) + newToken.raw;
+							text = text.substring(0, text.length - oldToken.text.length) + newToken.text;
+							break;
+						}
+						else if (lastToken?.type === 'list') {
+							// include continuation in nested list
+							const oldToken = lastToken;
+							const newText = oldToken.raw + '\n' + lines.join('\n');
+							const newToken = this.list(newText);
+							tokens[tokens.length - 1] = newToken;
+							raw = raw.substring(0, raw.length - lastToken.raw.length) + newToken.raw;
+							text = text.substring(0, text.length - oldToken.raw.length) + newToken.raw;
+							lines = newText.substring(tokens[tokens.length - 1].raw.length).split('\n');
+							continue;
+						}
+					}
+					return {
+						type: 'blockquote',
+						raw,
+						tokens,
+						text,
+					};
+				}
+			}
+			list(src) {
+				let cap = this.rules.block.list.exec(src);
+				if (cap) {
+					let bull = cap[1].trim();
+					const isordered = bull.length > 1;
+					const list = {
+						type: 'list',
+						raw: '',
+						ordered: isordered,
+						start: isordered ? +bull.slice(0, -1) : '',
+						loose: false,
+						items: [],
+					};
+					bull = isordered ? `\\d{1,9}\\${bull.slice(-1)}` : `\\${bull}`;
+					if (this.options.pedantic) {
+						bull = isordered ? bull : '[*+-]';
+					}
+					// Get next list item
+					const itemRegex = new RegExp(`^( {0,3}${bull})((?:[\t ][^\\n]*)?(?:\\n|$))`);
+					let endsWithBlankLine = false;
+					// Check if current bullet point can start a new List Item
+					while (src) {
+						let endEarly = false;
+						let raw = '';
+						let itemContents = '';
+						if (!(cap = itemRegex.exec(src))) {
+							break;
+						}
+						if (this.rules.block.hr.test(src)) { // End list if bullet was actually HR (possibly move into itemRegex?)
+							break;
+						}
+						raw = cap[0];
+						src = src.substring(raw.length);
+						let line = cap[2].split('\n', 1)[0].replace(/^\t+/, (t) => ' '.repeat(3 * t.length));
+						let nextLine = src.split('\n', 1)[0];
+						let blankLine = !line.trim();
+						let indent = 0;
+						if (this.options.pedantic) {
+							indent = 2;
+							itemContents = line.trimStart();
+						}
+						else if (blankLine) {
+							indent = cap[1].length + 1;
+						}
+						else {
+							indent = cap[2].search(/[^ ]/); // Find first non-space char
+							indent = indent > 4 ? 1 : indent; // Treat indented code blocks (> 4 spaces) as having only 1 indent
+							itemContents = line.slice(indent);
+							indent += cap[1].length;
+						}
+						if (blankLine && /^ *$/.test(nextLine)) { // Items begin with at most one blank line
+							raw += nextLine + '\n';
+							src = src.substring(nextLine.length + 1);
+							endEarly = true;
+						}
+						if (!endEarly) {
+							const nextBulletRegex = new RegExp(`^ {0,${Math.min(3, indent - 1)}}(?:[*+-]|\\d{1,9}[.)])((?:[ \t][^\\n]*)?(?:\\n|$))`);
+							const hrRegex = new RegExp(`^ {0,${Math.min(3, indent - 1)}}((?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$)`);
+							const fencesBeginRegex = new RegExp(`^ {0,${Math.min(3, indent - 1)}}(?:\`\`\`|~~~)`);
+							const headingBeginRegex = new RegExp(`^ {0,${Math.min(3, indent - 1)}}#`);
+							// Check if following lines should be included in List Item
+							while (src) {
+								const rawLine = src.split('\n', 1)[0];
+								nextLine = rawLine;
+								// Re-align to follow commonmark nesting rules
+								if (this.options.pedantic) {
+									nextLine = nextLine.replace(/^ {1,4}(?=( {4})*[^ ])/g, '  ');
+								}
+								// End list item if found code fences
+								if (fencesBeginRegex.test(nextLine)) {
+									break;
+								}
+								// End list item if found start of new heading
+								if (headingBeginRegex.test(nextLine)) {
+									break;
+								}
+								// End list item if found start of new bullet
+								if (nextBulletRegex.test(nextLine)) {
+									break;
+								}
+								// Horizontal rule found
+								if (hrRegex.test(src)) {
+									break;
+								}
+								if (nextLine.search(/[^ ]/) >= indent || !nextLine.trim()) { // Dedent if possible
+									itemContents += '\n' + nextLine.slice(indent);
+								}
+								else {
+									// not enough indentation
+									if (blankLine) {
+										break;
+									}
+									// paragraph continuation unless last line was a different block level element
+									if (line.search(/[^ ]/) >= 4) { // indented code block
+										break;
+									}
+									if (fencesBeginRegex.test(line)) {
+										break;
+									}
+									if (headingBeginRegex.test(line)) {
+										break;
+									}
+									if (hrRegex.test(line)) {
+										break;
+									}
+									itemContents += '\n' + nextLine;
+								}
+								if (!blankLine && !nextLine.trim()) { // Check if current line is blank
+									blankLine = true;
+								}
+								raw += rawLine + '\n';
+								src = src.substring(rawLine.length + 1);
+								line = nextLine.slice(indent);
+							}
+						}
+						if (!list.loose) {
+							// If the previous item ended with a blank line, the list is loose
+							if (endsWithBlankLine) {
+								list.loose = true;
+							}
+							else if (/\n *\n *$/.test(raw)) {
+								endsWithBlankLine = true;
+							}
+						}
+						let istask = null;
+						let ischecked;
+						// Check for task list items
+						if (this.options.gfm) {
+							istask = /^\[[ xX]\] /.exec(itemContents);
+							if (istask) {
+								ischecked = istask[0] !== '[ ] ';
+								itemContents = itemContents.replace(/^\[[ xX]\] +/, '');
+							}
+						}
+						list.items.push({
+							type: 'list_item',
+							raw,
+							task: !!istask,
+							checked: ischecked,
+							loose: false,
+							text: itemContents,
+							tokens: [],
+						});
+						list.raw += raw;
+					}
+					// Do not consume newlines at end of final item. Alternatively, make itemRegex *start* with any newlines to simplify/speed up endsWithBlankLine logic
+					list.items[list.items.length - 1].raw = list.items[list.items.length - 1].raw.trimEnd();
+					list.items[list.items.length - 1].text = list.items[list.items.length - 1].text.trimEnd();
+					list.raw = list.raw.trimEnd();
+					// Item child tokens handled here at end because we needed to have the final item to trim it first
+					for (let i = 0; i < list.items.length; i++) {
+						this.lexer.state.top = false;
+						list.items[i].tokens = this.lexer.blockTokens(list.items[i].text, []);
+						if (!list.loose) {
+							// Check if list should be loose
+							const spacers = list.items[i].tokens.filter(t => t.type === 'space');
+							const hasMultipleLineBreaks = spacers.length > 0 && spacers.some(t => /\n.*\n/.test(t.raw));
+							list.loose = hasMultipleLineBreaks;
+						}
+					}
+					// Set all items to loose if list is loose
+					if (list.loose) {
+						for (let i = 0; i < list.items.length; i++) {
+							list.items[i].loose = true;
+						}
+					}
+					return list;
+				}
+			}
+			html(src) {
+				const cap = this.rules.block.html.exec(src);
+				if (cap) {
+					const token = {
+						type: 'html',
+						block: true,
+						raw: cap[0],
+						pre: cap[1] === 'pre' || cap[1] === 'script' || cap[1] === 'style',
+						text: cap[0],
+					};
+					return token;
+				}
+			}
+			def(src) {
+				const cap = this.rules.block.def.exec(src);
+				if (cap) {
+					const tag = cap[1].toLowerCase().replace(/\s+/g, ' ');
+					const href = cap[2] ? cap[2].replace(/^<(.*)>$/, '$1').replace(this.rules.inline.anyPunctuation, '$1') : '';
+					const title = cap[3] ? cap[3].substring(1, cap[3].length - 1).replace(this.rules.inline.anyPunctuation, '$1') : cap[3];
+					return {
+						type: 'def',
+						tag,
+						raw: cap[0],
+						href,
+						title,
+					};
+				}
+			}
+			table(src) {
+				const cap = this.rules.block.table.exec(src);
+				if (!cap) {
+					return;
+				}
+				if (!/[:|]/.test(cap[2])) {
+					// delimiter row must have a pipe (|) or colon (:) otherwise it is a setext heading
+					return;
+				}
+				const headers = splitCells(cap[1]);
+				const aligns = cap[2].replace(/^\||\| *$/g, '').split('|');
+				const rows = cap[3] && cap[3].trim() ? cap[3].replace(/\n[ \t]*$/, '').split('\n') : [];
+				const item = {
+					type: 'table',
+					raw: cap[0],
+					header: [],
+					align: [],
+					rows: [],
+				};
+				if (headers.length !== aligns.length) {
+					// header and align columns must be equal, rows can be different.
+					return;
+				}
+				for (const align of aligns) {
+					if (/^ *-+: *$/.test(align)) {
+						item.align.push('right');
+					}
+					else if (/^ *:-+: *$/.test(align)) {
+						item.align.push('center');
+					}
+					else if (/^ *:-+ *$/.test(align)) {
+						item.align.push('left');
+					}
+					else {
+						item.align.push(null);
+					}
+				}
+				for (let i = 0; i < headers.length; i++) {
+					item.header.push({
+						text: headers[i],
+						tokens: this.lexer.inline(headers[i]),
+						header: true,
+						align: item.align[i],
+					});
+				}
+				for (const row of rows) {
+					item.rows.push(splitCells(row, item.header.length).map((cell, i) => {
+						return {
+							text: cell,
+							tokens: this.lexer.inline(cell),
+							header: false,
+							align: item.align[i],
+						};
+					}));
+				}
+				return item;
+			}
+			lheading(src) {
+				const cap = this.rules.block.lheading.exec(src);
+				if (cap) {
+					return {
+						type: 'heading',
+						raw: cap[0],
+						depth: cap[2].charAt(0) === '=' ? 1 : 2,
+						text: cap[1],
+						tokens: this.lexer.inline(cap[1]),
+					};
+				}
+			}
+			paragraph(src) {
+				const cap = this.rules.block.paragraph.exec(src);
+				if (cap) {
+					const text = cap[1].charAt(cap[1].length - 1) === '\n'
+						? cap[1].slice(0, -1)
+						: cap[1];
+					return {
+						type: 'paragraph',
+						raw: cap[0],
+						text,
+						tokens: this.lexer.inline(text),
+					};
+				}
+			}
+			text(src) {
+				const cap = this.rules.block.text.exec(src);
+				if (cap) {
+					return {
+						type: 'text',
+						raw: cap[0],
+						text: cap[0],
+						tokens: this.lexer.inline(cap[0]),
+					};
+				}
+			}
+			escape(src) {
+				const cap = this.rules.inline.escape.exec(src);
+				if (cap) {
+					return {
+						type: 'escape',
+						raw: cap[0],
+						text: escape$1(cap[1]),
+					};
+				}
+			}
+			tag(src) {
+				const cap = this.rules.inline.tag.exec(src);
+				if (cap) {
+					if (!this.lexer.state.inLink && /^<a /i.test(cap[0])) {
+						this.lexer.state.inLink = true;
+					}
+					else if (this.lexer.state.inLink && /^<\/a>/i.test(cap[0])) {
+						this.lexer.state.inLink = false;
+					}
+					if (!this.lexer.state.inRawBlock && /^<(pre|code|kbd|script)(\s|>)/i.test(cap[0])) {
+						this.lexer.state.inRawBlock = true;
+					}
+					else if (this.lexer.state.inRawBlock && /^<\/(pre|code|kbd|script)(\s|>)/i.test(cap[0])) {
+						this.lexer.state.inRawBlock = false;
+					}
+					return {
+						type: 'html',
+						raw: cap[0],
+						inLink: this.lexer.state.inLink,
+						inRawBlock: this.lexer.state.inRawBlock,
+						block: false,
+						text: cap[0],
+					};
+				}
+			}
+			link(src) {
+				const cap = this.rules.inline.link.exec(src);
+				if (cap) {
+					const trimmedUrl = cap[2].trim();
+					if (!this.options.pedantic && /^</.test(trimmedUrl)) {
+						// commonmark requires matching angle brackets
+						if (!(/>$/.test(trimmedUrl))) {
+							return;
+						}
+						// ending angle bracket cannot be escaped
+						const rtrimSlash = rtrim(trimmedUrl.slice(0, -1), '\\');
+						if ((trimmedUrl.length - rtrimSlash.length) % 2 === 0) {
+							return;
+						}
+					}
+					else {
+						// find closing parenthesis
+						const lastParenIndex = findClosingBracket(cap[2], '()');
+						if (lastParenIndex > -1) {
+							const start = cap[0].indexOf('!') === 0 ? 5 : 4;
+							const linkLen = start + cap[1].length + lastParenIndex;
+							cap[2] = cap[2].substring(0, lastParenIndex);
+							cap[0] = cap[0].substring(0, linkLen).trim();
+							cap[3] = '';
+						}
+					}
+					let href = cap[2];
+					let title = '';
+					if (this.options.pedantic) {
+						// split pedantic href and title
+						const link = /^([^'"]*[^\s])\s+(['"])(.*)\2/.exec(href);
+						if (link) {
+							href = link[1];
+							title = link[3];
+						}
+					}
+					else {
+						title = cap[3] ? cap[3].slice(1, -1) : '';
+					}
+					href = href.trim();
+					if (/^</.test(href)) {
+						if (this.options.pedantic && !(/>$/.test(trimmedUrl))) {
+							// pedantic allows starting angle bracket without ending angle bracket
+							href = href.slice(1);
+						}
+						else {
+							href = href.slice(1, -1);
+						}
+					}
+					return outputLink(cap, {
+						href: href ? href.replace(this.rules.inline.anyPunctuation, '$1') : href,
+						title: title ? title.replace(this.rules.inline.anyPunctuation, '$1') : title,
+					}, cap[0], this.lexer);
+				}
+			}
+			reflink(src, links) {
+				let cap;
+				if ((cap = this.rules.inline.reflink.exec(src))
+					|| (cap = this.rules.inline.nolink.exec(src))) {
+					const linkString = (cap[2] || cap[1]).replace(/\s+/g, ' ');
+					const link = links[linkString.toLowerCase()];
+					if (!link) {
+						const text = cap[0].charAt(0);
+						return {
+							type: 'text',
+							raw: text,
+							text,
+						};
+					}
+					return outputLink(cap, link, cap[0], this.lexer);
+				}
+			}
+			emStrong(src, maskedSrc, prevChar = '') {
+				let match = this.rules.inline.emStrongLDelim.exec(src);
+				if (!match)
+					return;
+				// _ can't be between two alphanumerics. \p{L}\p{N} includes non-english alphabet/numbers as well
+				if (match[3] && prevChar.match(/[\p{L}\p{N}]/u))
+					return;
+				const nextChar = match[1] || match[2] || '';
+				if (!nextChar || !prevChar || this.rules.inline.punctuation.exec(prevChar)) {
+					// unicode Regex counts emoji as 1 char; spread into array for proper count (used multiple times below)
+					const lLength = [...match[0]].length - 1;
+					let rDelim, rLength, delimTotal = lLength, midDelimTotal = 0;
+					const endReg = match[0][0] === '*' ? this.rules.inline.emStrongRDelimAst : this.rules.inline.emStrongRDelimUnd;
+					endReg.lastIndex = 0;
+					// Clip maskedSrc to same section of string as src (move to lexer?)
+					maskedSrc = maskedSrc.slice(-1 * src.length + lLength);
+					while ((match = endReg.exec(maskedSrc)) != null) {
+						rDelim = match[1] || match[2] || match[3] || match[4] || match[5] || match[6];
+						if (!rDelim)
+							continue; // skip single * in __abc*abc__
+						rLength = [...rDelim].length;
+						if (match[3] || match[4]) { // found another Left Delim
+							delimTotal += rLength;
+							continue;
+						}
+						else if (match[5] || match[6]) { // either Left or Right Delim
+							if (lLength % 3 && !((lLength + rLength) % 3)) {
+								midDelimTotal += rLength;
+								continue; // CommonMark Emphasis Rules 9-10
+							}
+						}
+						delimTotal -= rLength;
+						if (delimTotal > 0)
+							continue; // Haven't found enough closing delimiters
+						// Remove extra characters. *a*** -> *a*
+						rLength = Math.min(rLength, rLength + delimTotal + midDelimTotal);
+						// char length can be >1 for unicode characters;
+						const lastCharLength = [...match[0]][0].length;
+						const raw = src.slice(0, lLength + match.index + lastCharLength + rLength);
+						// Create `em` if smallest delimiter has odd char count. *a***
+						if (Math.min(lLength, rLength) % 2) {
+							const text = raw.slice(1, -1);
+							return {
+								type: 'em',
+								raw,
+								text,
+								tokens: this.lexer.inlineTokens(text),
+							};
+						}
+						// Create 'strong' if smallest delimiter has even char count. **a***
+						const text = raw.slice(2, -2);
+						return {
+							type: 'strong',
+							raw,
+							text,
+							tokens: this.lexer.inlineTokens(text),
+						};
+					}
+				}
+			}
+			codespan(src) {
+				const cap = this.rules.inline.code.exec(src);
+				if (cap) {
+					let text = cap[2].replace(/\n/g, ' ');
+					const hasNonSpaceChars = /[^ ]/.test(text);
+					const hasSpaceCharsOnBothEnds = /^ /.test(text) && / $/.test(text);
+					if (hasNonSpaceChars && hasSpaceCharsOnBothEnds) {
+						text = text.substring(1, text.length - 1);
+					}
+					text = escape$1(text, true);
+					return {
+						type: 'codespan',
+						raw: cap[0],
+						text,
+					};
+				}
+			}
+			br(src) {
+				const cap = this.rules.inline.br.exec(src);
+				if (cap) {
+					return {
+						type: 'br',
+						raw: cap[0],
+					};
+				}
+			}
+			del(src) {
+				const cap = this.rules.inline.del.exec(src);
+				if (cap) {
+					return {
+						type: 'del',
+						raw: cap[0],
+						text: cap[2],
+						tokens: this.lexer.inlineTokens(cap[2]),
+					};
+				}
+			}
+			autolink(src) {
+				const cap = this.rules.inline.autolink.exec(src);
+				if (cap) {
+					let text, href;
+					if (cap[2] === '@') {
+						text = escape$1(cap[1]);
+						href = 'mailto:' + text;
+					}
+					else {
+						text = escape$1(cap[1]);
+						href = text;
+					}
+					return {
+						type: 'link',
+						raw: cap[0],
+						text,
+						href,
+						tokens: [
+							{
+								type: 'text',
+								raw: text,
+								text,
+							},
+						],
+					};
+				}
+			}
+			url(src) {
+				let cap;
+				if (cap = this.rules.inline.url.exec(src)) {
+					let text, href;
+					if (cap[2] === '@') {
+						text = escape$1(cap[0]);
+						href = 'mailto:' + text;
+					}
+					else {
+						// do extended autolink path validation
+						let prevCapZero;
+						do {
+							prevCapZero = cap[0];
+							cap[0] = this.rules.inline._backpedal.exec(cap[0])?.[0] ?? '';
+						} while (prevCapZero !== cap[0]);
+						text = escape$1(cap[0]);
+						if (cap[1] === 'www.') {
+							href = 'http://' + cap[0];
+						}
+						else {
+							href = cap[0];
+						}
+					}
+					return {
+						type: 'link',
+						raw: cap[0],
+						text,
+						href,
+						tokens: [
+							{
+								type: 'text',
+								raw: text,
+								text,
+							},
+						],
+					};
+				}
+			}
+			inlineText(src) {
+				const cap = this.rules.inline.text.exec(src);
+				if (cap) {
+					let text;
+					if (this.lexer.state.inRawBlock) {
+						text = cap[0];
+					}
+					else {
+						text = escape$1(cap[0]);
+					}
+					return {
+						type: 'text',
+						raw: cap[0],
+						text,
+					};
+				}
+			}
+		}
+
+		/**
+		 * Block-Level Grammar
+		 */
+		const newline = /^(?: *(?:\n|$))+/;
+		const blockCode = /^( {4}[^\n]+(?:\n(?: *(?:\n|$))*)?)+/;
+		const fences = /^ {0,3}(`{3,}(?=[^`\n]*(?:\n|$))|~{3,})([^\n]*)(?:\n|$)(?:|([\s\S]*?)(?:\n|$))(?: {0,3}\1[~`]* *(?=\n|$)|$)/;
+		const hr = /^ {0,3}((?:-[\t ]*){3,}|(?:_[ \t]*){3,}|(?:\*[ \t]*){3,})(?:\n+|$)/;
+		const heading = /^ {0,3}(#{1,6})(?=\s|$)(.*)(?:\n+|$)/;
+		const bullet = /(?:[*+-]|\d{1,9}[.)])/;
+		const lheading = edit(/^(?!bull |blockCode|fences|blockquote|heading|html)((?:.|\n(?!\s*?\n|bull |blockCode|fences|blockquote|heading|html))+?)\n {0,3}(=+|-+) *(?:\n+|$)/)
+			.replace(/bull/g, bullet) // lists can interrupt
+			.replace(/blockCode/g, / {4}/) // indented code blocks can interrupt
+			.replace(/fences/g, / {0,3}(?:`{3,}|~{3,})/) // fenced code blocks can interrupt
+			.replace(/blockquote/g, / {0,3}>/) // blockquote can interrupt
+			.replace(/heading/g, / {0,3}#{1,6}/) // ATX heading can interrupt
+			.replace(/html/g, / {0,3}<[^\n>]+>\n/) // block html can interrupt
+			.getRegex();
+		const _paragraph = /^([^\n]+(?:\n(?!hr|heading|lheading|blockquote|fences|list|html|table| +\n)[^\n]+)*)/;
+		const blockText = /^[^\n]+/;
+		const _blockLabel = /(?!\s*\])(?:\\.|[^\[\]\\])+/;
+		const def = edit(/^ {0,3}\[(label)\]: *(?:\n *)?([^<\s][^\s]*|<.*?>)(?:(?: +(?:\n *)?| *\n *)(title))? *(?:\n+|$)/)
+			.replace('label', _blockLabel)
+			.replace('title', /(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/)
+			.getRegex();
+		const list = edit(/^( {0,3}bull)([ \t][^\n]+?)?(?:\n|$)/)
+			.replace(/bull/g, bullet)
+			.getRegex();
+		const _tag = 'address|article|aside|base|basefont|blockquote|body|caption'
+			+ '|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption'
+			+ '|figure|footer|form|frame|frameset|h[1-6]|head|header|hr|html|iframe'
+			+ '|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option'
+			+ '|p|param|search|section|summary|table|tbody|td|tfoot|th|thead|title'
+			+ '|tr|track|ul';
+		const _comment = /<!--(?:-?>|[\s\S]*?(?:-->|$))/;
+		const html = edit('^ {0,3}(?:' // optional indentation
+			+ '<(script|pre|style|textarea)[\\s>][\\s\\S]*?(?:</\\1>[^\\n]*\\n+|$)' // (1)
+			+ '|comment[^\\n]*(\\n+|$)' // (2)
+			+ '|<\\?[\\s\\S]*?(?:\\?>\\n*|$)' // (3)
+			+ '|<![A-Z][\\s\\S]*?(?:>\\n*|$)' // (4)
+			+ '|<!\\[CDATA\\[[\\s\\S]*?(?:\\]\\]>\\n*|$)' // (5)
+			+ '|</?(tag)(?: +|\\n|/?>)[\\s\\S]*?(?:(?:\\n *)+\\n|$)' // (6)
+			+ '|<(?!script|pre|style|textarea)([a-z][\\w-]*)(?:attribute)*? */?>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n *)+\\n|$)' // (7) open tag
+			+ '|</(?!script|pre|style|textarea)[a-z][\\w-]*\\s*>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n *)+\\n|$)' // (7) closing tag
+			+ ')', 'i')
+			.replace('comment', _comment)
+			.replace('tag', _tag)
+			.replace('attribute', / +[a-zA-Z:_][\w.:-]*(?: *= *"[^"\n]*"| *= *'[^'\n]*'| *= *[^\s"'=<>`]+)?/)
+			.getRegex();
+		const paragraph = edit(_paragraph)
+			.replace('hr', hr)
+			.replace('heading', ' {0,3}#{1,6}(?:\\s|$)')
+			.replace('|lheading', '') // setext headings don't interrupt commonmark paragraphs
+			.replace('|table', '')
+			.replace('blockquote', ' {0,3}>')
+			.replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n')
+			.replace('list', ' {0,3}(?:[*+-]|1[.)]) ') // only lists starting from 1 can interrupt
+			.replace('html', '</?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|textarea|!--)')
+			.replace('tag', _tag) // pars can be interrupted by type (6) html blocks
+			.getRegex();
+		const blockquote = edit(/^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/)
+			.replace('paragraph', paragraph)
+			.getRegex();
+		/**
+		 * Normal Block Grammar
+		 */
+		const blockNormal = {
+			blockquote,
+			code: blockCode,
+			def,
+			fences,
+			heading,
+			hr,
+			html,
+			lheading,
+			list,
+			newline,
+			paragraph,
+			table: noopTest,
+			text: blockText,
+		};
+		/**
+		 * GFM Block Grammar
+		 */
+		const gfmTable = edit('^ *([^\\n ].*)\\n' // Header
+			+ ' {0,3}((?:\\| *)?:?-+:? *(?:\\| *:?-+:? *)*(?:\\| *)?)' // Align
+			+ '(?:\\n((?:(?! *\\n|hr|heading|blockquote|code|fences|list|html).*(?:\\n|$))*)\\n*|$)') // Cells
+			.replace('hr', hr)
+			.replace('heading', ' {0,3}#{1,6}(?:\\s|$)')
+			.replace('blockquote', ' {0,3}>')
+			.replace('code', ' {4}[^\\n]')
+			.replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n')
+			.replace('list', ' {0,3}(?:[*+-]|1[.)]) ') // only lists starting from 1 can interrupt
+			.replace('html', '</?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|textarea|!--)')
+			.replace('tag', _tag) // tables can be interrupted by type (6) html blocks
+			.getRegex();
+		const blockGfm = {
+			...blockNormal,
+			table: gfmTable,
+			paragraph: edit(_paragraph)
+				.replace('hr', hr)
+				.replace('heading', ' {0,3}#{1,6}(?:\\s|$)')
+				.replace('|lheading', '') // setext headings don't interrupt commonmark paragraphs
+				.replace('table', gfmTable) // interrupt paragraphs with table
+				.replace('blockquote', ' {0,3}>')
+				.replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n')
+				.replace('list', ' {0,3}(?:[*+-]|1[.)]) ') // only lists starting from 1 can interrupt
+				.replace('html', '</?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|textarea|!--)')
+				.replace('tag', _tag) // pars can be interrupted by type (6) html blocks
+				.getRegex(),
+		};
+		/**
+		 * Pedantic grammar (original John Gruber's loose markdown specification)
+		 */
+		const blockPedantic = {
+			...blockNormal,
+			html: edit('^ *(?:comment *(?:\\n|\\s*$)'
+				+ '|<(tag)[\\s\\S]+?</\\1> *(?:\\n{2,}|\\s*$)' // closed tag
+				+ '|<tag(?:"[^"]*"|\'[^\']*\'|\\s[^\'"/>\\s]*)*?/?> *(?:\\n{2,}|\\s*$))')
+				.replace('comment', _comment)
+				.replace(/tag/g, '(?!(?:'
+					+ 'a|em|strong|small|s|cite|q|dfn|abbr|data|time|code|var|samp|kbd|sub'
+					+ '|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo|span|br|wbr|ins|del|img)'
+					+ '\\b)\\w+(?!:|[^\\w\\s@]*@)\\b')
+				.getRegex(),
+			def: /^ *\[([^\]]+)\]: *<?([^\s>]+)>?(?: +(["(][^\n]+[")]))? *(?:\n+|$)/,
+			heading: /^(#{1,6})(.*)(?:\n+|$)/,
+			fences: noopTest, // fences not supported
+			lheading: /^(.+?)\n {0,3}(=+|-+) *(?:\n+|$)/,
+			paragraph: edit(_paragraph)
+				.replace('hr', hr)
+				.replace('heading', ' *#{1,6} *[^\n]')
+				.replace('lheading', lheading)
+				.replace('|table', '')
+				.replace('blockquote', ' {0,3}>')
+				.replace('|fences', '')
+				.replace('|list', '')
+				.replace('|html', '')
+				.replace('|tag', '')
+				.getRegex(),
+		};
+		/**
+		 * Inline-Level Grammar
+		 */
+		const escape = /^\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/;
+		const inlineCode = /^(`+)([^`]|[^`][\s\S]*?[^`])\1(?!`)/;
+		const br = /^( {2,}|\\)\n(?!\s*$)/;
+		const inlineText = /^(`+|[^`])(?:(?= {2,}\n)|[\s\S]*?(?:(?=[\\<!\[`*_]|\b_|$)|[^ ](?= {2,}\n)))/;
+		// list of unicode punctuation marks, plus any missing characters from CommonMark spec
+		const _punctuation = '\\p{P}\\p{S}';
+		const punctuation = edit(/^((?![*_])[\spunctuation])/, 'u')
+			.replace(/punctuation/g, _punctuation).getRegex();
+		// sequences em should skip over [title](link), `code`, <html>
+		const blockSkip = /\[[^[\]]*?\]\([^\(\)]*?\)|`[^`]*?`|<[^<>]*?>/g;
+		const emStrongLDelim = edit(/^(?:\*+(?:((?!\*)[punct])|[^\s*]))|^_+(?:((?!_)[punct])|([^\s_]))/, 'u')
+			.replace(/punct/g, _punctuation)
+			.getRegex();
+		const emStrongRDelimAst = edit('^[^_*]*?__[^_*]*?\\*[^_*]*?(?=__)' // Skip orphan inside strong
+			+ '|[^*]+(?=[^*])' // Consume to delim
+			+ '|(?!\\*)[punct](\\*+)(?=[\\s]|$)' // (1) #*** can only be a Right Delimiter
+			+ '|[^punct\\s](\\*+)(?!\\*)(?=[punct\\s]|$)' // (2) a***#, a*** can only be a Right Delimiter
+			+ '|(?!\\*)[punct\\s](\\*+)(?=[^punct\\s])' // (3) #***a, ***a can only be Left Delimiter
+			+ '|[\\s](\\*+)(?!\\*)(?=[punct])' // (4) ***# can only be Left Delimiter
+			+ '|(?!\\*)[punct](\\*+)(?!\\*)(?=[punct])' // (5) #***# can be either Left or Right Delimiter
+			+ '|[^punct\\s](\\*+)(?=[^punct\\s])', 'gu') // (6) a***a can be either Left or Right Delimiter
+			.replace(/punct/g, _punctuation)
+			.getRegex();
+		// (6) Not allowed for _
+		const emStrongRDelimUnd = edit('^[^_*]*?\\*\\*[^_*]*?_[^_*]*?(?=\\*\\*)' // Skip orphan inside strong
+			+ '|[^_]+(?=[^_])' // Consume to delim
+			+ '|(?!_)[punct](_+)(?=[\\s]|$)' // (1) #___ can only be a Right Delimiter
+			+ '|[^punct\\s](_+)(?!_)(?=[punct\\s]|$)' // (2) a___#, a___ can only be a Right Delimiter
+			+ '|(?!_)[punct\\s](_+)(?=[^punct\\s])' // (3) #___a, ___a can only be Left Delimiter
+			+ '|[\\s](_+)(?!_)(?=[punct])' // (4) ___# can only be Left Delimiter
+			+ '|(?!_)[punct](_+)(?!_)(?=[punct])', 'gu') // (5) #___# can be either Left or Right Delimiter
+			.replace(/punct/g, _punctuation)
+			.getRegex();
+		const anyPunctuation = edit(/\\([punct])/, 'gu')
+			.replace(/punct/g, _punctuation)
+			.getRegex();
+		const autolink = edit(/^<(scheme:[^\s\x00-\x1f<>]*|email)>/)
+			.replace('scheme', /[a-zA-Z][a-zA-Z0-9+.-]{1,31}/)
+			.replace('email', /[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+(@)[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+(?![-_])/)
+			.getRegex();
+		const _inlineComment = edit(_comment).replace('(?:-->|$)', '-->').getRegex();
+		const tag = edit('^comment'
+			+ '|^</[a-zA-Z][\\w:-]*\\s*>' // self-closing tag
+			+ '|^<[a-zA-Z][\\w-]*(?:attribute)*?\\s*/?>' // open tag
+			+ '|^<\\?[\\s\\S]*?\\?>' // processing instruction, e.g. <?php ?>
+			+ '|^<![a-zA-Z]+\\s[\\s\\S]*?>' // declaration, e.g. <!DOCTYPE html>
+			+ '|^<!\\[CDATA\\[[\\s\\S]*?\\]\\]>') // CDATA section
+			.replace('comment', _inlineComment)
+			.replace('attribute', /\s+[a-zA-Z:_][\w.:-]*(?:\s*=\s*"[^"]*"|\s*=\s*'[^']*'|\s*=\s*[^\s"'=<>`]+)?/)
+			.getRegex();
+		const _inlineLabel = /(?:\[(?:\\.|[^\[\]\\])*\]|\\.|`[^`]*`|[^\[\]\\`])*?/;
+		const link = edit(/^!?\[(label)\]\(\s*(href)(?:\s+(title))?\s*\)/)
+			.replace('label', _inlineLabel)
+			.replace('href', /<(?:\\.|[^\n<>\\])+>|[^\s\x00-\x1f]*/)
+			.replace('title', /"(?:\\"?|[^"\\])*"|'(?:\\'?|[^'\\])*'|\((?:\\\)?|[^)\\])*\)/)
+			.getRegex();
+		const reflink = edit(/^!?\[(label)\]\[(ref)\]/)
+			.replace('label', _inlineLabel)
+			.replace('ref', _blockLabel)
+			.getRegex();
+		const nolink = edit(/^!?\[(ref)\](?:\[\])?/)
+			.replace('ref', _blockLabel)
+			.getRegex();
+		const reflinkSearch = edit('reflink|nolink(?!\\()', 'g')
+			.replace('reflink', reflink)
+			.replace('nolink', nolink)
+			.getRegex();
+		/**
+		 * Normal Inline Grammar
+		 */
+		const inlineNormal = {
+			_backpedal: noopTest, // only used for GFM url
+			anyPunctuation,
+			autolink,
+			blockSkip,
+			br,
+			code: inlineCode,
+			del: noopTest,
+			emStrongLDelim,
+			emStrongRDelimAst,
+			emStrongRDelimUnd,
+			escape,
+			link,
+			nolink,
+			punctuation,
+			reflink,
+			reflinkSearch,
+			tag,
+			text: inlineText,
+			url: noopTest,
+		};
+		/**
+		 * Pedantic Inline Grammar
+		 */
+		const inlinePedantic = {
+			...inlineNormal,
+			link: edit(/^!?\[(label)\]\((.*?)\)/)
+				.replace('label', _inlineLabel)
+				.getRegex(),
+			reflink: edit(/^!?\[(label)\]\s*\[([^\]]*)\]/)
+				.replace('label', _inlineLabel)
+				.getRegex(),
+		};
+		/**
+		 * GFM Inline Grammar
+		 */
+		const inlineGfm = {
+			...inlineNormal,
+			escape: edit(escape).replace('])', '~|])').getRegex(),
+			url: edit(/^((?:ftp|https?):\/\/|www\.)(?:[a-zA-Z0-9\-]+\.?)+[^\s<]*|^email/, 'i')
+				.replace('email', /[A-Za-z0-9._+-]+(@)[a-zA-Z0-9-_]+(?:\.[a-zA-Z0-9-_]*[a-zA-Z0-9])+(?![-_])/)
+				.getRegex(),
+			_backpedal: /(?:[^?!.,:;*_'"~()&]+|\([^)]*\)|&(?![a-zA-Z0-9]+;$)|[?!.,:;*_'"~)]+(?!$))+/,
+			del: /^(~~?)(?=[^\s~])([\s\S]*?[^\s~])\1(?=[^~]|$)/,
+			text: /^([`~]+|[^`~])(?:(?= {2,}\n)|(?=[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@)|[\s\S]*?(?:(?=[\\<!\[`*~_]|\b_|https?:\/\/|ftp:\/\/|www\.|$)|[^ ](?= {2,}\n)|[^a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-](?=[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@)))/,
+		};
+		/**
+		 * GFM + Line Breaks Inline Grammar
+		 */
+		const inlineBreaks = {
+			...inlineGfm,
+			br: edit(br).replace('{2,}', '*').getRegex(),
+			text: edit(inlineGfm.text)
+				.replace('\\b_', '\\b_| {2,}\\n')
+				.replace(/\{2,\}/g, '*')
+				.getRegex(),
+		};
+		/**
+		 * exports
+		 */
+		const block = {
+			normal: blockNormal,
+			gfm: blockGfm,
+			pedantic: blockPedantic,
+		};
+		const inline = {
+			normal: inlineNormal,
+			gfm: inlineGfm,
+			breaks: inlineBreaks,
+			pedantic: inlinePedantic,
+		};
+
+		/**
+		 * Block Lexer
+		 */
+		class _Lexer {
+			tokens;
+			options;
+			state;
+			tokenizer;
+			inlineQueue;
+			constructor(options) {
+				// TokenList cannot be created in one go
+				this.tokens = [];
+				this.tokens.links = Object.create(null);
+				this.options = options || exports.defaults;
+				this.options.tokenizer = this.options.tokenizer || new _Tokenizer();
+				this.tokenizer = this.options.tokenizer;
+				this.tokenizer.options = this.options;
+				this.tokenizer.lexer = this;
+				this.inlineQueue = [];
+				this.state = {
+					inLink: false,
+					inRawBlock: false,
+					top: true,
+				};
+				const rules = {
+					block: block.normal,
+					inline: inline.normal,
+				};
+				if (this.options.pedantic) {
+					rules.block = block.pedantic;
+					rules.inline = inline.pedantic;
+				}
+				else if (this.options.gfm) {
+					rules.block = block.gfm;
+					if (this.options.breaks) {
+						rules.inline = inline.breaks;
+					}
+					else {
+						rules.inline = inline.gfm;
+					}
+				}
+				this.tokenizer.rules = rules;
+			}
+			/**
+			 * Expose Rules
+			 */
+			static get rules() {
+				return {
+					block,
+					inline,
+				};
+			}
+			/**
+			 * Static Lex Method
+			 */
+			static lex(src, options) {
+				const lexer = new _Lexer(options);
+				return lexer.lex(src);
+			}
+			/**
+			 * Static Lex Inline Method
+			 */
+			static lexInline(src, options) {
+				const lexer = new _Lexer(options);
+				return lexer.inlineTokens(src);
+			}
+			/**
+			 * Preprocessing
+			 */
+			lex(src) {
+				src = src
+					.replace(/\r\n|\r/g, '\n');
+				this.blockTokens(src, this.tokens);
+				for (let i = 0; i < this.inlineQueue.length; i++) {
+					const next = this.inlineQueue[i];
+					this.inlineTokens(next.src, next.tokens);
+				}
+				this.inlineQueue = [];
+				return this.tokens;
+			}
+			blockTokens(src, tokens = [], lastParagraphClipped = false) {
+				if (this.options.pedantic) {
+					src = src.replace(/\t/g, '    ').replace(/^ +$/gm, '');
+				}
+				else {
+					src = src.replace(/^( *)(\t+)/gm, (_, leading, tabs) => {
+						return leading + '    '.repeat(tabs.length);
+					});
+				}
+				let token;
+				let lastToken;
+				let cutSrc;
+				while (src) {
+					if (this.options.extensions
+						&& this.options.extensions.block
+						&& this.options.extensions.block.some((extTokenizer) => {
+							if (token = extTokenizer.call({ lexer: this }, src, tokens)) {
+								src = src.substring(token.raw.length);
+								tokens.push(token);
+								return true;
+							}
+							return false;
+						})) {
+						continue;
+					}
+					// newline
+					if (token = this.tokenizer.space(src)) {
+						src = src.substring(token.raw.length);
+						if (token.raw.length === 1 && tokens.length > 0) {
+							// if there's a single \n as a spacer, it's terminating the last line,
+							// so move it there so that we don't get unnecessary paragraph tags
+							tokens[tokens.length - 1].raw += '\n';
+						}
+						else {
+							tokens.push(token);
+						}
+						continue;
+					}
+					// code
+					if (token = this.tokenizer.code(src)) {
+						src = src.substring(token.raw.length);
+						lastToken = tokens[tokens.length - 1];
+						// An indented code block cannot interrupt a paragraph.
+						if (lastToken && (lastToken.type === 'paragraph' || lastToken.type === 'text')) {
+							lastToken.raw += '\n' + token.raw;
+							lastToken.text += '\n' + token.text;
+							this.inlineQueue[this.inlineQueue.length - 1].src = lastToken.text;
+						}
+						else {
+							tokens.push(token);
+						}
+						continue;
+					}
+					// fences
+					if (token = this.tokenizer.fences(src)) {
+						src = src.substring(token.raw.length);
+						tokens.push(token);
+						continue;
+					}
+					// heading
+					if (token = this.tokenizer.heading(src)) {
+						src = src.substring(token.raw.length);
+						tokens.push(token);
+						continue;
+					}
+					// hr
+					if (token = this.tokenizer.hr(src)) {
+						src = src.substring(token.raw.length);
+						tokens.push(token);
+						continue;
+					}
+					// blockquote
+					if (token = this.tokenizer.blockquote(src)) {
+						src = src.substring(token.raw.length);
+						tokens.push(token);
+						continue;
+					}
+					// list
+					if (token = this.tokenizer.list(src)) {
+						src = src.substring(token.raw.length);
+						tokens.push(token);
+						continue;
+					}
+					// html
+					if (token = this.tokenizer.html(src)) {
+						src = src.substring(token.raw.length);
+						tokens.push(token);
+						continue;
+					}
+					// def
+					if (token = this.tokenizer.def(src)) {
+						src = src.substring(token.raw.length);
+						lastToken = tokens[tokens.length - 1];
+						if (lastToken && (lastToken.type === 'paragraph' || lastToken.type === 'text')) {
+							lastToken.raw += '\n' + token.raw;
+							lastToken.text += '\n' + token.raw;
+							this.inlineQueue[this.inlineQueue.length - 1].src = lastToken.text;
+						}
+						else if (!this.tokens.links[token.tag]) {
+							this.tokens.links[token.tag] = {
+								href: token.href,
+								title: token.title,
+							};
+						}
+						continue;
+					}
+					// table (gfm)
+					if (token = this.tokenizer.table(src)) {
+						src = src.substring(token.raw.length);
+						tokens.push(token);
+						continue;
+					}
+					// lheading
+					if (token = this.tokenizer.lheading(src)) {
+						src = src.substring(token.raw.length);
+						tokens.push(token);
+						continue;
+					}
+					// top-level paragraph
+					// prevent paragraph consuming extensions by clipping 'src' to extension start
+					cutSrc = src;
+					if (this.options.extensions && this.options.extensions.startBlock) {
+						let startIndex = Infinity;
+						const tempSrc = src.slice(1);
+						let tempStart;
+						this.options.extensions.startBlock.forEach((getStartIndex) => {
+							tempStart = getStartIndex.call({ lexer: this }, tempSrc);
+							if (typeof tempStart === 'number' && tempStart >= 0) {
+								startIndex = Math.min(startIndex, tempStart);
+							}
+						});
+						if (startIndex < Infinity && startIndex >= 0) {
+							cutSrc = src.substring(0, startIndex + 1);
+						}
+					}
+					if (this.state.top && (token = this.tokenizer.paragraph(cutSrc))) {
+						lastToken = tokens[tokens.length - 1];
+						if (lastParagraphClipped && lastToken?.type === 'paragraph') {
+							lastToken.raw += '\n' + token.raw;
+							lastToken.text += '\n' + token.text;
+							this.inlineQueue.pop();
+							this.inlineQueue[this.inlineQueue.length - 1].src = lastToken.text;
+						}
+						else {
+							tokens.push(token);
+						}
+						lastParagraphClipped = (cutSrc.length !== src.length);
+						src = src.substring(token.raw.length);
+						continue;
+					}
+					// text
+					if (token = this.tokenizer.text(src)) {
+						src = src.substring(token.raw.length);
+						lastToken = tokens[tokens.length - 1];
+						if (lastToken && lastToken.type === 'text') {
+							lastToken.raw += '\n' + token.raw;
+							lastToken.text += '\n' + token.text;
+							this.inlineQueue.pop();
+							this.inlineQueue[this.inlineQueue.length - 1].src = lastToken.text;
+						}
+						else {
+							tokens.push(token);
+						}
+						continue;
+					}
+					if (src) {
+						const errMsg = 'Infinite loop on byte: ' + src.charCodeAt(0);
+						if (this.options.silent) {
+							console.error(errMsg);
+							break;
+						}
+						else {
+							throw new Error(errMsg);
+						}
+					}
+				}
+				this.state.top = true;
+				return tokens;
+			}
+			inline(src, tokens = []) {
+				this.inlineQueue.push({ src, tokens });
+				return tokens;
+			}
+			/**
+			 * Lexing/Compiling
+			 */
+			inlineTokens(src, tokens = []) {
+				let token, lastToken, cutSrc;
+				// String with links masked to avoid interference with em and strong
+				let maskedSrc = src;
+				let match;
+				let keepPrevChar, prevChar;
+				// Mask out reflinks
+				if (this.tokens.links) {
+					const links = Object.keys(this.tokens.links);
+					if (links.length > 0) {
+						while ((match = this.tokenizer.rules.inline.reflinkSearch.exec(maskedSrc)) != null) {
+							if (links.includes(match[0].slice(match[0].lastIndexOf('[') + 1, -1))) {
+								maskedSrc = maskedSrc.slice(0, match.index) + '[' + 'a'.repeat(match[0].length - 2) + ']' + maskedSrc.slice(this.tokenizer.rules.inline.reflinkSearch.lastIndex);
+							}
+						}
+					}
+				}
+				// Mask out other blocks
+				while ((match = this.tokenizer.rules.inline.blockSkip.exec(maskedSrc)) != null) {
+					maskedSrc = maskedSrc.slice(0, match.index) + '[' + 'a'.repeat(match[0].length - 2) + ']' + maskedSrc.slice(this.tokenizer.rules.inline.blockSkip.lastIndex);
+				}
+				// Mask out escaped characters
+				while ((match = this.tokenizer.rules.inline.anyPunctuation.exec(maskedSrc)) != null) {
+					maskedSrc = maskedSrc.slice(0, match.index) + '++' + maskedSrc.slice(this.tokenizer.rules.inline.anyPunctuation.lastIndex);
+				}
+				while (src) {
+					if (!keepPrevChar) {
+						prevChar = '';
+					}
+					keepPrevChar = false;
+					// extensions
+					if (this.options.extensions
+						&& this.options.extensions.inline
+						&& this.options.extensions.inline.some((extTokenizer) => {
+							if (token = extTokenizer.call({ lexer: this }, src, tokens)) {
+								src = src.substring(token.raw.length);
+								tokens.push(token);
+								return true;
+							}
+							return false;
+						})) {
+						continue;
+					}
+					// escape
+					if (token = this.tokenizer.escape(src)) {
+						src = src.substring(token.raw.length);
+						tokens.push(token);
+						continue;
+					}
+					// tag
+					if (token = this.tokenizer.tag(src)) {
+						src = src.substring(token.raw.length);
+						lastToken = tokens[tokens.length - 1];
+						if (lastToken && token.type === 'text' && lastToken.type === 'text') {
+							lastToken.raw += token.raw;
+							lastToken.text += token.text;
+						}
+						else {
+							tokens.push(token);
+						}
+						continue;
+					}
+					// link
+					if (token = this.tokenizer.link(src)) {
+						src = src.substring(token.raw.length);
+						tokens.push(token);
+						continue;
+					}
+					// reflink, nolink
+					if (token = this.tokenizer.reflink(src, this.tokens.links)) {
+						src = src.substring(token.raw.length);
+						lastToken = tokens[tokens.length - 1];
+						if (lastToken && token.type === 'text' && lastToken.type === 'text') {
+							lastToken.raw += token.raw;
+							lastToken.text += token.text;
+						}
+						else {
+							tokens.push(token);
+						}
+						continue;
+					}
+					// em & strong
+					if (token = this.tokenizer.emStrong(src, maskedSrc, prevChar)) {
+						src = src.substring(token.raw.length);
+						tokens.push(token);
+						continue;
+					}
+					// code
+					if (token = this.tokenizer.codespan(src)) {
+						src = src.substring(token.raw.length);
+						tokens.push(token);
+						continue;
+					}
+					// br
+					if (token = this.tokenizer.br(src)) {
+						src = src.substring(token.raw.length);
+						tokens.push(token);
+						continue;
+					}
+					// del (gfm)
+					if (token = this.tokenizer.del(src)) {
+						src = src.substring(token.raw.length);
+						tokens.push(token);
+						continue;
+					}
+					// autolink
+					if (token = this.tokenizer.autolink(src)) {
+						src = src.substring(token.raw.length);
+						tokens.push(token);
+						continue;
+					}
+					// url (gfm)
+					if (!this.state.inLink && (token = this.tokenizer.url(src))) {
+						src = src.substring(token.raw.length);
+						tokens.push(token);
+						continue;
+					}
+					// text
+					// prevent inlineText consuming extensions by clipping 'src' to extension start
+					cutSrc = src;
+					if (this.options.extensions && this.options.extensions.startInline) {
+						let startIndex = Infinity;
+						const tempSrc = src.slice(1);
+						let tempStart;
+						this.options.extensions.startInline.forEach((getStartIndex) => {
+							tempStart = getStartIndex.call({ lexer: this }, tempSrc);
+							if (typeof tempStart === 'number' && tempStart >= 0) {
+								startIndex = Math.min(startIndex, tempStart);
+							}
+						});
+						if (startIndex < Infinity && startIndex >= 0) {
+							cutSrc = src.substring(0, startIndex + 1);
+						}
+					}
+					if (token = this.tokenizer.inlineText(cutSrc)) {
+						src = src.substring(token.raw.length);
+						if (token.raw.slice(-1) !== '_') { // Track prevChar before string of ____ started
+							prevChar = token.raw.slice(-1);
+						}
+						keepPrevChar = true;
+						lastToken = tokens[tokens.length - 1];
+						if (lastToken && lastToken.type === 'text') {
+							lastToken.raw += token.raw;
+							lastToken.text += token.text;
+						}
+						else {
+							tokens.push(token);
+						}
+						continue;
+					}
+					if (src) {
+						const errMsg = 'Infinite loop on byte: ' + src.charCodeAt(0);
+						if (this.options.silent) {
+							console.error(errMsg);
+							break;
+						}
+						else {
+							throw new Error(errMsg);
+						}
+					}
+				}
+				return tokens;
+			}
+		}
+
+		/**
+		 * Renderer
+		 */
+		class _Renderer {
+			options;
+			parser; // set by the parser
+			constructor(options) {
+				this.options = options || exports.defaults;
+			}
+			space(token) {
+				return '';
+			}
+			code({ text, lang, escaped }) {
+				const langString = (lang || '').match(/^\S*/)?.[0];
+				const code = text.replace(/\n$/, '') + '\n';
+				if (!langString) {
+					return '<pre><code>'
+						+ (escaped ? code : escape$1(code, true))
+						+ '</code></pre>\n';
+				}
+				return '<pre><code class="language-'
+					+ escape$1(langString)
+					+ '">'
+					+ (escaped ? code : escape$1(code, true))
+					+ '</code></pre>\n';
+			}
+			blockquote({ tokens }) {
+				const body = this.parser.parse(tokens);
+				return `<blockquote>\n${body}</blockquote>\n`;
+			}
+			html({ text }) {
+				return text;
+			}
+			heading({ tokens, depth }) {
+				return `<h${depth}>${this.parser.parseInline(tokens)}</h${depth}>\n`;
+			}
+			hr(token) {
+				return '<hr>\n';
+			}
+			list(token) {
+				const ordered = token.ordered;
+				const start = token.start;
+				let body = '';
+				for (let j = 0; j < token.items.length; j++) {
+					const item = token.items[j];
+					body += this.listitem(item);
+				}
+				const type = ordered ? 'ol' : 'ul';
+				const startAttr = (ordered && start !== 1) ? (' start="' + start + '"') : '';
+				return '<' + type + startAttr + '>\n' + body + '</' + type + '>\n';
+			}
+			listitem(item) {
+				let itemBody = '';
+				if (item.task) {
+					const checkbox = this.checkbox({ checked: !!item.checked });
+					if (item.loose) {
+						if (item.tokens.length > 0 && item.tokens[0].type === 'paragraph') {
+							item.tokens[0].text = checkbox + ' ' + item.tokens[0].text;
+							if (item.tokens[0].tokens && item.tokens[0].tokens.length > 0 && item.tokens[0].tokens[0].type === 'text') {
+								item.tokens[0].tokens[0].text = checkbox + ' ' + item.tokens[0].tokens[0].text;
+							}
+						}
+						else {
+							item.tokens.unshift({
+								type: 'text',
+								raw: checkbox + ' ',
+								text: checkbox + ' ',
+							});
+						}
+					}
+					else {
+						itemBody += checkbox + ' ';
+					}
+				}
+				itemBody += this.parser.parse(item.tokens, !!item.loose);
+				return `<li>${itemBody}</li>\n`;
+			}
+			checkbox({ checked }) {
+				return '<input '
+					+ (checked ? 'checked="" ' : '')
+					+ 'disabled="" type="checkbox">';
+			}
+			paragraph({ tokens }) {
+				return `<p>${this.parser.parseInline(tokens)}</p>\n`;
+			}
+			table(token) {
+				let header = '';
+				// header
+				let cell = '';
+				for (let j = 0; j < token.header.length; j++) {
+					cell += this.tablecell(token.header[j]);
+				}
+				header += this.tablerow({ text: cell });
+				let body = '';
+				for (let j = 0; j < token.rows.length; j++) {
+					const row = token.rows[j];
+					cell = '';
+					for (let k = 0; k < row.length; k++) {
+						cell += this.tablecell(row[k]);
+					}
+					body += this.tablerow({ text: cell });
+				}
+				if (body)
+					body = `<tbody>${body}</tbody>`;
+				return '<table>\n'
+					+ '<thead>\n'
+					+ header
+					+ '</thead>\n'
+					+ body
+					+ '</table>\n';
+			}
+			tablerow({ text }) {
+				return `<tr>\n${text}</tr>\n`;
+			}
+			tablecell(token) {
+				const content = this.parser.parseInline(token.tokens);
+				const type = token.header ? 'th' : 'td';
+				const tag = token.align
+					? `<${type} align="${token.align}">`
+					: `<${type}>`;
+				return tag + content + `</${type}>\n`;
+			}
+			/**
+			 * span level renderer
+			 */
+			strong({ tokens }) {
+				return `<strong>${this.parser.parseInline(tokens)}</strong>`;
+			}
+			em({ tokens }) {
+				return `<em>${this.parser.parseInline(tokens)}</em>`;
+			}
+			codespan({ text }) {
+				return `<code>${text}</code>`;
+			}
+			br(token) {
+				return '<br>';
+			}
+			del({ tokens }) {
+				return `<del>${this.parser.parseInline(tokens)}</del>`;
+			}
+			link({ href, title, tokens }) {
+				const text = this.parser.parseInline(tokens);
+				const cleanHref = cleanUrl(href);
+				if (cleanHref === null) {
+					return text;
+				}
+				href = cleanHref;
+				let out = '<a href="' + href + '"';
+				if (title) {
+					out += ' title="' + title + '"';
+				}
+				out += '>' + text + '</a>';
+				return out;
+			}
+			image({ href, title, text }) {
+				const cleanHref = cleanUrl(href);
+				if (cleanHref === null) {
+					return text;
+				}
+				href = cleanHref;
+				let out = `<img src="${href}" alt="${text}"`;
+				if (title) {
+					out += ` title="${title}"`;
+				}
+				out += '>';
+				return out;
+			}
+			text(token) {
+				return 'tokens' in token && token.tokens ? this.parser.parseInline(token.tokens) : token.text;
+			}
+		}
+
+		/**
+		 * TextRenderer
+		 * returns only the textual part of the token
+		 */
+		class _TextRenderer {
+			// no need for block level renderers
+			strong({ text }) {
+				return text;
+			}
+			em({ text }) {
+				return text;
+			}
+			codespan({ text }) {
+				return text;
+			}
+			del({ text }) {
+				return text;
+			}
+			html({ text }) {
+				return text;
+			}
+			text({ text }) {
+				return text;
+			}
+			link({ text }) {
+				return '' + text;
+			}
+			image({ text }) {
+				return '' + text;
+			}
+			br() {
+				return '';
+			}
+		}
+
+		/**
+		 * Parsing & Compiling
+		 */
+		class _Parser {
+			options;
+			renderer;
+			textRenderer;
+			constructor(options) {
+				this.options = options || exports.defaults;
+				this.options.renderer = this.options.renderer || new _Renderer();
+				this.renderer = this.options.renderer;
+				this.renderer.options = this.options;
+				this.renderer.parser = this;
+				this.textRenderer = new _TextRenderer();
+			}
+			/**
+			 * Static Parse Method
+			 */
+			static parse(tokens, options) {
+				const parser = new _Parser(options);
+				return parser.parse(tokens);
+			}
+			/**
+			 * Static Parse Inline Method
+			 */
+			static parseInline(tokens, options) {
+				const parser = new _Parser(options);
+				return parser.parseInline(tokens);
+			}
+			/**
+			 * Parse Loop
+			 */
+			parse(tokens, top = true) {
+				let out = '';
+				for (let i = 0; i < tokens.length; i++) {
+					const anyToken = tokens[i];
+					// Run any renderer extensions
+					if (this.options.extensions && this.options.extensions.renderers && this.options.extensions.renderers[anyToken.type]) {
+						const genericToken = anyToken;
+						const ret = this.options.extensions.renderers[genericToken.type].call({ parser: this }, genericToken);
+						if (ret !== false || !['space', 'hr', 'heading', 'code', 'table', 'blockquote', 'list', 'html', 'paragraph', 'text'].includes(genericToken.type)) {
+							out += ret || '';
+							continue;
+						}
+					}
+					const token = anyToken;
+					switch (token.type) {
+						case 'space': {
+							out += this.renderer.space(token);
+							continue;
+						}
+						case 'hr': {
+							out += this.renderer.hr(token);
+							continue;
+						}
+						case 'heading': {
+							out += this.renderer.heading(token);
+							continue;
+						}
+						case 'code': {
+							out += this.renderer.code(token);
+							continue;
+						}
+						case 'table': {
+							out += this.renderer.table(token);
+							continue;
+						}
+						case 'blockquote': {
+							out += this.renderer.blockquote(token);
+							continue;
+						}
+						case 'list': {
+							out += this.renderer.list(token);
+							continue;
+						}
+						case 'html': {
+							out += this.renderer.html(token);
+							continue;
+						}
+						case 'paragraph': {
+							out += this.renderer.paragraph(token);
+							continue;
+						}
+						case 'text': {
+							let textToken = token;
+							let body = this.renderer.text(textToken);
+							while (i + 1 < tokens.length && tokens[i + 1].type === 'text') {
+								textToken = tokens[++i];
+								body += '\n' + this.renderer.text(textToken);
+							}
+							if (top) {
+								out += this.renderer.paragraph({
+									type: 'paragraph',
+									raw: body,
+									text: body,
+									tokens: [{ type: 'text', raw: body, text: body }],
+								});
+							}
+							else {
+								out += body;
+							}
+							continue;
+						}
+						default: {
+							const errMsg = 'Token with "' + token.type + '" type was not found.';
+							if (this.options.silent) {
+								console.error(errMsg);
+								return '';
+							}
+							else {
+								throw new Error(errMsg);
+							}
+						}
+					}
+				}
+				return out;
+			}
+			/**
+			 * Parse Inline Tokens
+			 */
+			parseInline(tokens, renderer) {
+				renderer = renderer || this.renderer;
+				let out = '';
+				for (let i = 0; i < tokens.length; i++) {
+					const anyToken = tokens[i];
+					// Run any renderer extensions
+					if (this.options.extensions && this.options.extensions.renderers && this.options.extensions.renderers[anyToken.type]) {
+						const ret = this.options.extensions.renderers[anyToken.type].call({ parser: this }, anyToken);
+						if (ret !== false || !['escape', 'html', 'link', 'image', 'strong', 'em', 'codespan', 'br', 'del', 'text'].includes(anyToken.type)) {
+							out += ret || '';
+							continue;
+						}
+					}
+					const token = anyToken;
+					switch (token.type) {
+						case 'escape': {
+							out += renderer.text(token);
+							break;
+						}
+						case 'html': {
+							out += renderer.html(token);
+							break;
+						}
+						case 'link': {
+							out += renderer.link(token);
+							break;
+						}
+						case 'image': {
+							out += renderer.image(token);
+							break;
+						}
+						case 'strong': {
+							out += renderer.strong(token);
+							break;
+						}
+						case 'em': {
+							out += renderer.em(token);
+							break;
+						}
+						case 'codespan': {
+							out += renderer.codespan(token);
+							break;
+						}
+						case 'br': {
+							out += renderer.br(token);
+							break;
+						}
+						case 'del': {
+							out += renderer.del(token);
+							break;
+						}
+						case 'text': {
+							out += renderer.text(token);
+							break;
+						}
+						default: {
+							const errMsg = 'Token with "' + token.type + '" type was not found.';
+							if (this.options.silent) {
+								console.error(errMsg);
+								return '';
+							}
+							else {
+								throw new Error(errMsg);
+							}
+						}
+					}
+				}
+				return out;
+			}
+		}
+
+		class _Hooks {
+			options;
+			constructor(options) {
+				this.options = options || exports.defaults;
+			}
+			static passThroughHooks = new Set([
+				'preprocess',
+				'postprocess',
+				'processAllTokens',
+			]);
+			/**
+			 * Process markdown before marked
+			 */
+			preprocess(markdown) {
+				return markdown;
+			}
+			/**
+			 * Process HTML after marked is finished
+			 */
+			postprocess(html) {
+				return html;
+			}
+			/**
+			 * Process all tokens before walk tokens
+			 */
+			processAllTokens(tokens) {
+				return tokens;
+			}
+		}
+
+		class Marked {
+			defaults = _getDefaults();
+			options = this.setOptions;
+			parse = this.parseMarkdown(_Lexer.lex, _Parser.parse);
+			parseInline = this.parseMarkdown(_Lexer.lexInline, _Parser.parseInline);
+			Parser = _Parser;
+			Renderer = _Renderer;
+			TextRenderer = _TextRenderer;
+			Lexer = _Lexer;
+			Tokenizer = _Tokenizer;
+			Hooks = _Hooks;
+			constructor(...args) {
+				this.use(...args);
+			}
+			/**
+			 * Run callback for every token
+			 */
+			walkTokens(tokens, callback) {
+				let values = [];
+				for (const token of tokens) {
+					values = values.concat(callback.call(this, token));
+					switch (token.type) {
+						case 'table': {
+							const tableToken = token;
+							for (const cell of tableToken.header) {
+								values = values.concat(this.walkTokens(cell.tokens, callback));
+							}
+							for (const row of tableToken.rows) {
+								for (const cell of row) {
+									values = values.concat(this.walkTokens(cell.tokens, callback));
+								}
+							}
+							break;
+						}
+						case 'list': {
+							const listToken = token;
+							values = values.concat(this.walkTokens(listToken.items, callback));
+							break;
+						}
+						default: {
+							const genericToken = token;
+							if (this.defaults.extensions?.childTokens?.[genericToken.type]) {
+								this.defaults.extensions.childTokens[genericToken.type].forEach((childTokens) => {
+									const tokens = genericToken[childTokens].flat(Infinity);
+									values = values.concat(this.walkTokens(tokens, callback));
+								});
+							}
+							else if (genericToken.tokens) {
+								values = values.concat(this.walkTokens(genericToken.tokens, callback));
+							}
+						}
+					}
+				}
+				return values;
+			}
+			use(...args) {
+				const extensions = this.defaults.extensions || { renderers: {}, childTokens: {} };
+				args.forEach((pack) => {
+					// copy options to new object
+					const opts = { ...pack };
+					// set async to true if it was set to true before
+					opts.async = this.defaults.async || opts.async || false;
+					// ==-- Parse "addon" extensions --== //
+					if (pack.extensions) {
+						pack.extensions.forEach((ext) => {
+							if (!ext.name) {
+								throw new Error('extension name required');
+							}
+							if ('renderer' in ext) { // Renderer extensions
+								const prevRenderer = extensions.renderers[ext.name];
+								if (prevRenderer) {
+									// Replace extension with func to run new extension but fall back if false
+									extensions.renderers[ext.name] = function (...args) {
+										let ret = ext.renderer.apply(this, args);
+										if (ret === false) {
+											ret = prevRenderer.apply(this, args);
+										}
+										return ret;
+									};
+								}
+								else {
+									extensions.renderers[ext.name] = ext.renderer;
+								}
+							}
+							if ('tokenizer' in ext) { // Tokenizer Extensions
+								if (!ext.level || (ext.level !== 'block' && ext.level !== 'inline')) {
+									throw new Error("extension level must be 'block' or 'inline'");
+								}
+								const extLevel = extensions[ext.level];
+								if (extLevel) {
+									extLevel.unshift(ext.tokenizer);
+								}
+								else {
+									extensions[ext.level] = [ext.tokenizer];
+								}
+								if (ext.start) { // Function to check for start of token
+									if (ext.level === 'block') {
+										if (extensions.startBlock) {
+											extensions.startBlock.push(ext.start);
+										}
+										else {
+											extensions.startBlock = [ext.start];
+										}
+									}
+									else if (ext.level === 'inline') {
+										if (extensions.startInline) {
+											extensions.startInline.push(ext.start);
+										}
+										else {
+											extensions.startInline = [ext.start];
+										}
+									}
+								}
+							}
+							if ('childTokens' in ext && ext.childTokens) { // Child tokens to be visited by walkTokens
+								extensions.childTokens[ext.name] = ext.childTokens;
+							}
+						});
+						opts.extensions = extensions;
+					}
+					// ==-- Parse "overwrite" extensions --== //
+					if (pack.renderer) {
+						const renderer = this.defaults.renderer || new _Renderer(this.defaults);
+						for (const prop in pack.renderer) {
+							if (!(prop in renderer)) {
+								throw new Error(`renderer '${prop}' does not exist`);
+							}
+							if (['options', 'parser'].includes(prop)) {
+								// ignore options property
+								continue;
+							}
+							const rendererProp = prop;
+							const rendererFunc = pack.renderer[rendererProp];
+							const prevRenderer = renderer[rendererProp];
+							// Replace renderer with func to run extension, but fall back if false
+							renderer[rendererProp] = (...args) => {
+								let ret = rendererFunc.apply(renderer, args);
+								if (ret === false) {
+									ret = prevRenderer.apply(renderer, args);
+								}
+								return ret || '';
+							};
+						}
+						opts.renderer = renderer;
+					}
+					if (pack.tokenizer) {
+						const tokenizer = this.defaults.tokenizer || new _Tokenizer(this.defaults);
+						for (const prop in pack.tokenizer) {
+							if (!(prop in tokenizer)) {
+								throw new Error(`tokenizer '${prop}' does not exist`);
+							}
+							if (['options', 'rules', 'lexer'].includes(prop)) {
+								// ignore options, rules, and lexer properties
+								continue;
+							}
+							const tokenizerProp = prop;
+							const tokenizerFunc = pack.tokenizer[tokenizerProp];
+							const prevTokenizer = tokenizer[tokenizerProp];
+							// Replace tokenizer with func to run extension, but fall back if false
+							// @ts-expect-error cannot type tokenizer function dynamically
+							tokenizer[tokenizerProp] = (...args) => {
+								let ret = tokenizerFunc.apply(tokenizer, args);
+								if (ret === false) {
+									ret = prevTokenizer.apply(tokenizer, args);
+								}
+								return ret;
+							};
+						}
+						opts.tokenizer = tokenizer;
+					}
+					// ==-- Parse Hooks extensions --== //
+					if (pack.hooks) {
+						const hooks = this.defaults.hooks || new _Hooks();
+						for (const prop in pack.hooks) {
+							if (!(prop in hooks)) {
+								throw new Error(`hook '${prop}' does not exist`);
+							}
+							if (prop === 'options') {
+								// ignore options property
+								continue;
+							}
+							const hooksProp = prop;
+							const hooksFunc = pack.hooks[hooksProp];
+							const prevHook = hooks[hooksProp];
+							if (_Hooks.passThroughHooks.has(prop)) {
+								// @ts-expect-error cannot type hook function dynamically
+								hooks[hooksProp] = (arg) => {
+									if (this.defaults.async) {
+										return Promise.resolve(hooksFunc.call(hooks, arg)).then(ret => {
+											return prevHook.call(hooks, ret);
+										});
+									}
+									const ret = hooksFunc.call(hooks, arg);
+									return prevHook.call(hooks, ret);
+								};
+							}
+							else {
+								// @ts-expect-error cannot type hook function dynamically
+								hooks[hooksProp] = (...args) => {
+									let ret = hooksFunc.apply(hooks, args);
+									if (ret === false) {
+										ret = prevHook.apply(hooks, args);
+									}
+									return ret;
+								};
+							}
+						}
+						opts.hooks = hooks;
+					}
+					// ==-- Parse WalkTokens extensions --== //
+					if (pack.walkTokens) {
+						const walkTokens = this.defaults.walkTokens;
+						const packWalktokens = pack.walkTokens;
+						opts.walkTokens = function (token) {
+							let values = [];
+							values.push(packWalktokens.call(this, token));
+							if (walkTokens) {
+								values = values.concat(walkTokens.call(this, token));
+							}
+							return values;
+						};
+					}
+					this.defaults = { ...this.defaults, ...opts };
+				});
+				return this;
+			}
+			setOptions(opt) {
+				this.defaults = { ...this.defaults, ...opt };
+				return this;
+			}
+			lexer(src, options) {
+				return _Lexer.lex(src, options ?? this.defaults);
+			}
+			parser(tokens, options) {
+				return _Parser.parse(tokens, options ?? this.defaults);
+			}
+			parseMarkdown(lexer, parser) {
+				// eslint-disable-next-line @typescript-eslint/no-explicit-any
+				const parse = (src, options) => {
+					const origOpt = { ...options };
+					const opt = { ...this.defaults, ...origOpt };
+					const throwError = this.onError(!!opt.silent, !!opt.async);
+					// throw error if an extension set async to true but parse was called with async: false
+					if (this.defaults.async === true && origOpt.async === false) {
+						return throwError(new Error('marked(): The async option was set to true by an extension. Remove async: false from the parse options object to return a Promise.'));
+					}
+					// throw error in case of non string input
+					if (typeof src === 'undefined' || src === null) {
+						return throwError(new Error('marked(): input parameter is undefined or null'));
+					}
+					if (typeof src !== 'string') {
+						return throwError(new Error('marked(): input parameter is of type '
+							+ Object.prototype.toString.call(src) + ', string expected'));
+					}
+					if (opt.hooks) {
+						opt.hooks.options = opt;
+					}
+					if (opt.async) {
+						return Promise.resolve(opt.hooks ? opt.hooks.preprocess(src) : src)
+							.then(src => lexer(src, opt))
+							.then(tokens => opt.hooks ? opt.hooks.processAllTokens(tokens) : tokens)
+							.then(tokens => opt.walkTokens ? Promise.all(this.walkTokens(tokens, opt.walkTokens)).then(() => tokens) : tokens)
+							.then(tokens => parser(tokens, opt))
+							.then(html => opt.hooks ? opt.hooks.postprocess(html) : html)
+							.catch(throwError);
+					}
+					try {
+						if (opt.hooks) {
+							src = opt.hooks.preprocess(src);
+						}
+						let tokens = lexer(src, opt);
+						if (opt.hooks) {
+							tokens = opt.hooks.processAllTokens(tokens);
+						}
+						if (opt.walkTokens) {
+							this.walkTokens(tokens, opt.walkTokens);
+						}
+						let html = parser(tokens, opt);
+						if (opt.hooks) {
+							html = opt.hooks.postprocess(html);
+						}
+						return html;
+					}
+					catch (e) {
+						return throwError(e);
+					}
+				};
+				return parse;
+			}
+			onError(silent, async) {
+				return (e) => {
+					e.message += '\nPlease report this to https://github.com/markedjs/marked.';
+					if (silent) {
+						const msg = '<p>An error occurred:</p><pre>'
+							+ escape$1(e.message + '', true)
+							+ '</pre>';
+						if (async) {
+							return Promise.resolve(msg);
+						}
+						return msg;
+					}
+					if (async) {
+						return Promise.reject(e);
+					}
+					throw e;
+				};
+			}
+		}
+
+		const markedInstance = new Marked();
+		function marked(src, opt) {
+			return markedInstance.parse(src, opt);
+		}
+		/**
+		 * Sets the default options.
+		 *
+		 * @param options Hash of options
+		 */
+		marked.options =
+			marked.setOptions = function (options) {
+				markedInstance.setOptions(options);
+				marked.defaults = markedInstance.defaults;
+				changeDefaults(marked.defaults);
+				return marked;
+			};
+		/**
+		 * Gets the original marked default options.
+		 */
+		marked.getDefaults = _getDefaults;
+		marked.defaults = exports.defaults;
+		/**
+		 * Use Extension
+		 */
+		marked.use = function (...args) {
+			markedInstance.use(...args);
+			marked.defaults = markedInstance.defaults;
+			changeDefaults(marked.defaults);
+			return marked;
+		};
+		/**
+		 * Run callback for every token
+		 */
+		marked.walkTokens = function (tokens, callback) {
+			return markedInstance.walkTokens(tokens, callback);
+		};
+		/**
+		 * Compiles markdown to HTML without enclosing `p` tag.
+		 *
+		 * @param src String of markdown source to be compiled
+		 * @param options Hash of options
+		 * @return String of compiled HTML
+		 */
+		marked.parseInline = markedInstance.parseInline;
+		/**
+		 * Expose
+		 */
+		marked.Parser = _Parser;
+		marked.parser = _Parser.parse;
+		marked.Renderer = _Renderer;
+		marked.TextRenderer = _TextRenderer;
+		marked.Lexer = _Lexer;
+		marked.lexer = _Lexer.lex;
+		marked.Tokenizer = _Tokenizer;
+		marked.Hooks = _Hooks;
+		marked.parse = marked;
+		const options = marked.options;
+		const setOptions = marked.setOptions;
+		const use = marked.use;
+		const walkTokens = marked.walkTokens;
+		const parseInline = marked.parseInline;
+		const parse = marked;
+		const parser = _Parser.parse;
+		const lexer = _Lexer.lex;
+
+		exports.Hooks = _Hooks;
+		exports.Lexer = _Lexer;
+		exports.Marked = Marked;
+		exports.Parser = _Parser;
+		exports.Renderer = _Renderer;
+		exports.TextRenderer = _TextRenderer;
+		exports.Tokenizer = _Tokenizer;
+		exports.getDefaults = _getDefaults;
+		exports.lexer = lexer;
+		exports.marked = marked;
+		exports.options = options;
+		exports.parse = parse;
+		exports.parseInline = parseInline;
+		exports.parser = parser;
+		exports.setOptions = setOptions;
+		exports.use = use;
+		exports.walkTokens = walkTokens;
+	}));
+
+})();
+export var Hooks = (__marked_exports.Hooks || exports.Hooks);
+export var Lexer = (__marked_exports.Lexer || exports.Lexer);
+export var Marked = (__marked_exports.Marked || exports.Marked);
+export var Parser = (__marked_exports.Parser || exports.Parser);
+export var Renderer = (__marked_exports.Renderer || exports.Renderer);
+export var TextRenderer = (__marked_exports.TextRenderer || exports.TextRenderer);
+export var Tokenizer = (__marked_exports.Tokenizer || exports.Tokenizer);
+export var defaults = (__marked_exports.defaults || exports.defaults);
+export var getDefaults = (__marked_exports.getDefaults || exports.getDefaults);
+export var lexer = (__marked_exports.lexer || exports.lexer);
+export var marked = (__marked_exports.marked || exports.marked);
+export var options = (__marked_exports.options || exports.options);
+export var parse = (__marked_exports.parse || exports.parse);
+export var parseInline = (__marked_exports.parseInline || exports.parseInline);
+export var parser = (__marked_exports.parser || exports.parser);
+export var setOptions = (__marked_exports.setOptions || exports.setOptions);
+export var use = (__marked_exports.use || exports.use);
+export var walkTokens = (__marked_exports.walkTokens || exports.walkTokens);
+
+//# sourceMappingURL=marked.umd.js.map
diff --git a/src/vs/base/common/marshalling.ts b/src/vs/base/common/marshalling.ts
index a51f0094591..82fcd1234d0 100644
--- a/src/vs/base/common/marshalling.ts
+++ b/src/vs/base/common/marshalling.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { MarshalledId } from './marshallingIds';
+import { VSBuffer } from './buffer.js';
+import { URI, UriComponents } from './uri.js';
+import { MarshalledId } from './marshallingIds.js';
 
 export function stringify(obj: any): string {
 	return JSON.stringify(obj, replacer);
diff --git a/src/vs/base/common/mime.ts b/src/vs/base/common/mime.ts
index 288a8daf33b..41fe38f786b 100644
--- a/src/vs/base/common/mime.ts
+++ b/src/vs/base/common/mime.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { extname } from 'vs/base/common/path';
+import { extname } from './path.js';
 
 export const Mimes = Object.freeze({
 	text: 'text/plain',
diff --git a/src/vs/base/common/network.ts b/src/vs/base/common/network.ts
index 2d5f856ba7a..f220611a722 100644
--- a/src/vs/base/common/network.ts
+++ b/src/vs/base/common/network.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as errors from 'vs/base/common/errors';
-import * as platform from 'vs/base/common/platform';
-import { equalsIgnoreCase, startsWithIgnoreCase } from 'vs/base/common/strings';
-import { URI } from 'vs/base/common/uri';
-import * as paths from 'vs/base/common/path';
+import * as errors from './errors.js';
+import * as platform from './platform.js';
+import { equalsIgnoreCase, startsWithIgnoreCase } from './strings.js';
+import { URI } from './uri.js';
+import * as paths from './path.js';
 
 export namespace Schemas {
 
@@ -63,7 +63,10 @@ export namespace Schemas {
 
 	export const vscodeNotebookCell = 'vscode-notebook-cell';
 	export const vscodeNotebookCellMetadata = 'vscode-notebook-cell-metadata';
+	export const vscodeNotebookCellMetadataDiff = 'vscode-notebook-cell-metadata-diff';
 	export const vscodeNotebookCellOutput = 'vscode-notebook-cell-output';
+	export const vscodeNotebookCellOutputDiff = 'vscode-notebook-cell-output-diff';
+	export const vscodeNotebookMetadata = 'vscode-notebook-metadata';
 	export const vscodeInteractiveInput = 'vscode-interactive-input';
 
 	export const vscodeSettings = 'vscode-settings';
@@ -75,11 +78,6 @@ export namespace Schemas {
 	/** Scheme used for code blocks in chat. */
 	export const vscodeChatCodeBlock = 'vscode-chat-code-block';
 
-	/**
-	 * Scheme used for backing documents created by copilot for chat.
-	 */
-	export const vscodeCopilotBackingChatCodeBlock = 'vscode-copilot-chat-code-block';
-
 	/** Scheme used for LHS of code compare (aka diff) blocks in chat. */
 	export const vscodeChatCodeCompareBlock = 'vscode-chat-code-compare-block';
 
@@ -131,6 +129,16 @@ export namespace Schemas {
 	 * Scheme used for special rendering of settings in the release notes
 	 */
 	export const codeSetting = 'code-setting';
+
+	/**
+	 * Scheme used for output panel resources
+	 */
+	export const outputChannel = 'output';
+
+	/**
+	 * Scheme used for the accessible view
+	 */
+	export const accessibleView = 'accessible-view';
 }
 
 export function matchesScheme(target: URI | string, scheme: string): boolean {
@@ -253,7 +261,7 @@ class FileAccessImpl {
 	 * **Note:** use `dom.ts#asCSSUrl` whenever the URL is to be used in CSS context.
 	 */
 	asBrowserUri(resourcePath: AppResourcePath | ''): URI {
-		const uri = this.toUri(resourcePath, require);
+		const uri = this.toUri(resourcePath);
 		return this.uriToBrowserUri(uri);
 	}
 
@@ -300,7 +308,7 @@ class FileAccessImpl {
 	 * is responsible for loading.
 	 */
 	asFileUri(resourcePath: AppResourcePath | ''): URI {
-		const uri = this.toUri(resourcePath, require);
+		const uri = this.toUri(resourcePath);
 		return this.uriToFileUri(uri);
 	}
 
@@ -325,12 +333,25 @@ class FileAccessImpl {
 		return uri;
 	}
 
-	private toUri(uriOrModule: URI | string, moduleIdToUrl: { toUrl(moduleId: string): string }): URI {
+	private toUri(uriOrModule: URI | string, moduleIdToUrl?: { toUrl(moduleId: string): string }): URI {
 		if (URI.isUri(uriOrModule)) {
 			return uriOrModule;
 		}
 
-		return URI.parse(moduleIdToUrl.toUrl(uriOrModule));
+		if (globalThis._VSCODE_FILE_ROOT) {
+			const rootUriOrPath = globalThis._VSCODE_FILE_ROOT;
+
+			// File URL (with scheme)
+			if (/^\w[\w\d+.-]*:\/\//.test(rootUriOrPath)) {
+				return URI.joinPath(URI.parse(rootUriOrPath, true), uriOrModule);
+			}
+
+			// File Path (no scheme)
+			const modulePath = paths.join(rootUriOrPath, uriOrModule);
+			return URI.file(modulePath);
+		}
+
+		return URI.parse(moduleIdToUrl!.toUrl(uriOrModule));
 	}
 }
 
diff --git a/src/vs/base/common/normalization.ts b/src/vs/base/common/normalization.ts
index 01bd9d5cca4..1d4fbef7f72 100644
--- a/src/vs/base/common/normalization.ts
+++ b/src/vs/base/common/normalization.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { LRUCache } from 'vs/base/common/map';
+import { LRUCache } from './map.js';
 
 const nfcCache = new LRUCache<string, string>(10000); // bounded to 10000 elements
 export function normalizeNFC(str: string): string {
diff --git a/src/vs/base/common/objects.ts b/src/vs/base/common/objects.ts
index 14ec0e71974..94c2fb717d2 100644
--- a/src/vs/base/common/objects.ts
+++ b/src/vs/base/common/objects.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isTypedArray, isObject, isUndefinedOrNull } from 'vs/base/common/types';
+import { isTypedArray, isObject, isUndefinedOrNull } from './types.js';
 
 export function deepClone<T>(obj: T): T {
 	if (!obj || typeof obj !== 'object') {
@@ -215,7 +215,7 @@ export function distinct(base: obj, target: obj): obj {
 	return result;
 }
 
-export function getCaseInsensitive(target: obj, key: string): any {
+export function getCaseInsensitive(target: obj, key: string): unknown {
 	const lowercaseKey = key.toLowerCase();
 	const equivalentKey = Object.keys(target).find(k => k.toLowerCase() === lowercaseKey);
 	return equivalentKey ? target[equivalentKey] : target[key];
@@ -258,6 +258,7 @@ export function createProxyObject<T extends object>(methodNames: string[], invok
 		};
 	};
 
+	// eslint-disable-next-line local/code-no-dangerous-type-assertions
 	const result = {} as T;
 	for (const methodName of methodNames) {
 		(<any>result)[methodName] = createProxyMethod(methodName);
diff --git a/src/vs/base/common/observable.ts b/src/vs/base/common/observable.ts
index c090a272068..86ac5971a27 100644
--- a/src/vs/base/common/observable.ts
+++ b/src/vs/base/common/observable.ts
@@ -5,72 +5,4 @@
 
 // This is a facade for the observable implementation. Only import from here!
 
-export type {
-	IObservable,
-	IObserver,
-	IReader,
-	ISettable,
-	ISettableObservable,
-	ITransaction,
-	IChangeContext,
-	IChangeTracker,
-} from 'vs/base/common/observableInternal/base';
-
-export {
-	observableValue,
-	disposableObservableValue,
-	transaction,
-	subtransaction,
-} from 'vs/base/common/observableInternal/base';
-export {
-	derived,
-	derivedOpts,
-	derivedHandleChanges,
-	derivedWithStore,
-} from 'vs/base/common/observableInternal/derived';
-export {
-	autorun,
-	autorunDelta,
-	autorunHandleChanges,
-	autorunWithStore,
-	autorunOpts,
-	autorunWithStoreHandleChanges,
-} from 'vs/base/common/observableInternal/autorun';
-export type {
-	IObservableSignal,
-} from 'vs/base/common/observableInternal/utils';
-export {
-	constObservable,
-	debouncedObservable,
-	derivedObservableWithCache,
-	derivedObservableWithWritableCache,
-	keepObserved,
-	recomputeInitiallyAndOnChange,
-	observableFromEvent,
-	observableFromPromise,
-	observableSignal,
-	observableSignalFromEvent,
-	wasEventTriggeredRecently,
-} from 'vs/base/common/observableInternal/utils';
-export {
-	ObservableLazy,
-	ObservableLazyPromise,
-	ObservablePromise,
-	PromiseResult,
-	waitForState,
-	derivedWithCancellationToken,
-} from 'vs/base/common/observableInternal/promise';
-export {
-	observableValueOpts
-} from 'vs/base/common/observableInternal/api';
-
-import { ConsoleObservableLogger, setLogger } from 'vs/base/common/observableInternal/logging';
-
-// Remove "//" in the next line to enable logging
-const enableLogging = false
-	// || Boolean("true") // done "weirdly" so that a lint warning prevents you from pushing this
-	;
-
-if (enableLogging) {
-	setLogger(new ConsoleObservableLogger());
-}
+export * from './observableInternal/index.js';
diff --git a/src/vs/base/common/observableInternal/api.ts b/src/vs/base/common/observableInternal/api.ts
index 6e56671b7e5..0f7e63c3fa9 100644
--- a/src/vs/base/common/observableInternal/api.ts
+++ b/src/vs/base/common/observableInternal/api.ts
@@ -3,11 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { EqualityComparer, strictEquals } from 'vs/base/common/equals';
-import { ISettableObservable } from 'vs/base/common/observable';
-import { ObservableValue } from 'vs/base/common/observableInternal/base';
-import { IDebugNameData, DebugNameData } from 'vs/base/common/observableInternal/debugName';
-import { LazyObservableValue } from 'vs/base/common/observableInternal/lazyObservableValue';
+import { ISettableObservable, ObservableValue } from './base.js';
+import { DebugNameData, IDebugNameData } from './debugName.js';
+import { EqualityComparer, strictEquals } from './commonFacade/deps.js';
+import { LazyObservableValue } from './lazyObservableValue.js';
 
 export function observableValueOpts<T, TChange = void>(
 	options: IDebugNameData & {
diff --git a/src/vs/base/common/observableInternal/autorun.ts b/src/vs/base/common/observableInternal/autorun.ts
index a2f169ee4d6..f2011ef433d 100644
--- a/src/vs/base/common/observableInternal/autorun.ts
+++ b/src/vs/base/common/observableInternal/autorun.ts
@@ -3,11 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { assertFn } from 'vs/base/common/assert';
-import { DisposableStore, IDisposable, markAsDisposed, toDisposable, trackDisposable } from 'vs/base/common/lifecycle';
-import { IReader, IObservable, IObserver, IChangeContext } from 'vs/base/common/observableInternal/base';
-import { DebugNameData, IDebugNameData } from 'vs/base/common/observableInternal/debugName';
-import { getLogger } from 'vs/base/common/observableInternal/logging';
+import { IChangeContext, IObservable, IObserver, IReader } from './base.js';
+import { DebugNameData, IDebugNameData } from './debugName.js';
+import { assertFn, DisposableStore, IDisposable, markAsDisposed, onBugIndicatingError, toDisposable, trackDisposable } from './commonFacade/deps.js';
+import { getLogger } from './logging.js';
 
 /**
  * Runs immediately and whenever a transaction ends and an observed observable changed.
@@ -76,7 +75,7 @@ export function autorunWithStoreHandleChanges<TChangeSummary>(
 		{
 			owner: options.owner,
 			debugName: options.debugName,
-			debugReferenceFn: options.debugReferenceFn,
+			debugReferenceFn: options.debugReferenceFn ?? fn,
 			createEmptyChangeSummary: options.createEmptyChangeSummary,
 			handleChange: options.handleChange,
 		},
@@ -154,7 +153,7 @@ export class AutorunObserver<TChangeSummary = any> implements IObserver, IReader
 	}
 
 	constructor(
-		private readonly _debugNameData: DebugNameData,
+		public readonly _debugNameData: DebugNameData,
 		public readonly _runFn: (reader: IReader, changeSummary: TChangeSummary) => void,
 		private readonly createChangeSummary: (() => TChangeSummary) | undefined,
 		private readonly _handleChange: ((context: IChangeContext, summary: TChangeSummary) => boolean) | undefined,
@@ -192,8 +191,12 @@ export class AutorunObserver<TChangeSummary = any> implements IObserver, IReader
 			if (!isDisposed) {
 				getLogger()?.handleAutorunTriggered(this);
 				const changeSummary = this.changeSummary!;
-				this.changeSummary = this.createChangeSummary?.();
-				this._runFn(this, changeSummary);
+				try {
+					this.changeSummary = this.createChangeSummary?.();
+					this._runFn(this, changeSummary);
+				} catch (e) {
+					onBugIndicatingError(e);
+				}
 			}
 		} finally {
 			if (!isDisposed) {
@@ -221,23 +224,26 @@ export class AutorunObserver<TChangeSummary = any> implements IObserver, IReader
 	}
 
 	public endUpdate(): void {
-		if (this.updateCount === 1) {
-			do {
-				if (this.state === AutorunState.dependenciesMightHaveChanged) {
-					this.state = AutorunState.upToDate;
-					for (const d of this.dependencies) {
-						d.reportChanges();
-						if (this.state as AutorunState === AutorunState.stale) {
-							// The other dependencies will refresh on demand
-							break;
+		try {
+			if (this.updateCount === 1) {
+				do {
+					if (this.state === AutorunState.dependenciesMightHaveChanged) {
+						this.state = AutorunState.upToDate;
+						for (const d of this.dependencies) {
+							d.reportChanges();
+							if (this.state as AutorunState === AutorunState.stale) {
+								// The other dependencies will refresh on demand
+								break;
+							}
 						}
 					}
-				}
 
-				this._runIfNeeded();
-			} while (this.state !== AutorunState.upToDate);
+					this._runIfNeeded();
+				} while (this.state !== AutorunState.upToDate);
+			}
+		} finally {
+			this.updateCount--;
 		}
-		this.updateCount--;
 
 		assertFn(() => this.updateCount >= 0);
 	}
@@ -250,13 +256,17 @@ export class AutorunObserver<TChangeSummary = any> implements IObserver, IReader
 
 	public handleChange<T, TChange>(observable: IObservable<T, TChange>, change: TChange): void {
 		if (this.dependencies.has(observable) && !this.dependenciesToBeRemoved.has(observable)) {
-			const shouldReact = this._handleChange ? this._handleChange({
-				changedObservable: observable,
-				change,
-				didChange: (o): this is any => o === observable as any,
-			}, this.changeSummary!) : true;
-			if (shouldReact) {
-				this.state = AutorunState.stale;
+			try {
+				const shouldReact = this._handleChange ? this._handleChange({
+					changedObservable: observable,
+					change,
+					didChange: (o): this is any => o === observable as any,
+				}, this.changeSummary!) : true;
+				if (shouldReact) {
+					this.state = AutorunState.stale;
+				}
+			} catch (e) {
+				onBugIndicatingError(e);
 			}
 		}
 	}
diff --git a/src/vs/base/common/observableInternal/base.ts b/src/vs/base/common/observableInternal/base.ts
index fe3a465dfb1..3ce43ead2ae 100644
--- a/src/vs/base/common/observableInternal/base.ts
+++ b/src/vs/base/common/observableInternal/base.ts
@@ -3,12 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { strictEquals, EqualityComparer } from 'vs/base/common/equals';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { keepObserved, recomputeInitiallyAndOnChange } from 'vs/base/common/observable';
-import { DebugNameData, Owner, getFunctionName } from 'vs/base/common/observableInternal/debugName';
-import type { derivedOpts } from 'vs/base/common/observableInternal/derived';
-import { getLogger } from 'vs/base/common/observableInternal/logging';
+import { DebugNameData, DebugOwner, getFunctionName } from './debugName.js';
+import { DisposableStore, EqualityComparer, IDisposable, strictEquals } from './commonFacade/deps.js';
+import type { derivedOpts } from './derived.js';
+import { getLogger } from './logging.js';
+import { keepObserved, recomputeInitiallyAndOnChange } from './utils.js';
 
 /**
  * Represents an observable value.
@@ -66,6 +65,8 @@ export interface IObservable<T, TChange = unknown> {
 	map<TNew>(fn: (value: T, reader: IReader) => TNew): IObservable<TNew>;
 	map<TNew>(owner: object, fn: (value: T, reader: IReader) => TNew): IObservable<TNew>;
 
+	flatten<TNew>(this: IObservable<IObservable<TNew>>): IObservable<TNew>;
+
 	/**
 	 * Makes sure this value is computed eagerly.
 	 */
@@ -201,9 +202,9 @@ export abstract class ConvenientObservable<T, TChange> implements IObservable<T,
 
 	/** @sealed */
 	public map<TNew>(fn: (value: T, reader: IReader) => TNew): IObservable<TNew>;
-	public map<TNew>(owner: Owner, fn: (value: T, reader: IReader) => TNew): IObservable<TNew>;
-	public map<TNew>(fnOrOwner: Owner | ((value: T, reader: IReader) => TNew), fnOrUndefined?: (value: T, reader: IReader) => TNew): IObservable<TNew> {
-		const owner = fnOrUndefined === undefined ? undefined : fnOrOwner as Owner;
+	public map<TNew>(owner: DebugOwner, fn: (value: T, reader: IReader) => TNew): IObservable<TNew>;
+	public map<TNew>(fnOrOwner: DebugOwner | ((value: T, reader: IReader) => TNew), fnOrUndefined?: (value: T, reader: IReader) => TNew): IObservable<TNew> {
+		const owner = fnOrUndefined === undefined ? undefined : fnOrOwner as DebugOwner;
 		const fn = fnOrUndefined === undefined ? fnOrOwner as (value: T, reader: IReader) => TNew : fnOrUndefined;
 
 		return _derived(
@@ -232,6 +233,20 @@ export abstract class ConvenientObservable<T, TChange> implements IObservable<T,
 		);
 	}
 
+	/**
+	 * @sealed
+	 * Converts an observable of an observable value into a direct observable of the value.
+	*/
+	public flatten<TNew>(this: IObservable<IObservable<TNew, any>>): IObservable<TNew, unknown> {
+		return _derived(
+			{
+				owner: undefined,
+				debugName: () => `${this.debugName} (flattened)`,
+			},
+			(reader) => this.read(reader).read(reader),
+		);
+	}
+
 	public recomputeInitiallyAndOnChange(store: DisposableStore, handleValue?: (value: T) => void): IObservable<T> {
 		store.add(_recomputeInitiallyAndOnChange!(this, handleValue));
 		return this;
diff --git a/src/vs/workbench/contrib/notebook/common/services/notebookWorkerHost.ts b/src/vs/base/common/observableInternal/commonFacade/cancellation.ts
similarity index 72%
rename from src/vs/workbench/contrib/notebook/common/services/notebookWorkerHost.ts
rename to src/vs/base/common/observableInternal/commonFacade/cancellation.ts
index 44a4e22da79..af1686a3206 100644
--- a/src/vs/workbench/contrib/notebook/common/services/notebookWorkerHost.ts
+++ b/src/vs/base/common/observableInternal/commonFacade/cancellation.ts
@@ -3,7 +3,5 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-export interface INotebookWorkerHost {
-	// foreign host request
-	fhr(method: string, args: any[]): Promise<any>;
-}
+export { CancellationError } from '../../errors.js';
+export { CancellationToken, CancellationTokenSource } from '../../cancellation.js';
diff --git a/src/vs/base/common/observableInternal/commonFacade/deps.ts b/src/vs/base/common/observableInternal/commonFacade/deps.ts
new file mode 100644
index 00000000000..1ed8b1cc594
--- /dev/null
+++ b/src/vs/base/common/observableInternal/commonFacade/deps.ts
@@ -0,0 +1,10 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+export { assertFn } from '../../assert.js';
+export { type EqualityComparer, strictEquals } from '../../equals.js';
+export { BugIndicatingError, onBugIndicatingError } from '../../errors.js';
+export { Event, type IValueWithChangeEvent } from '../../event.js';
+export { DisposableStore, type IDisposable, markAsDisposed, toDisposable, trackDisposable } from '../../lifecycle.js';
diff --git a/src/vs/base/common/observableInternal/debugName.ts b/src/vs/base/common/observableInternal/debugName.ts
index 481d24f0377..1ff1f244357 100644
--- a/src/vs/base/common/observableInternal/debugName.ts
+++ b/src/vs/base/common/observableInternal/debugName.ts
@@ -8,7 +8,7 @@ export interface IDebugNameData {
 	 * The owner object of an observable.
 	 * Used for debugging only, such as computing a name for the observable by iterating over the fields of the owner.
 	 */
-	readonly owner?: Owner | undefined;
+	readonly owner?: DebugOwner | undefined;
 
 	/**
 	 * A string or function that returns a string that represents the name of the observable.
@@ -25,7 +25,7 @@ export interface IDebugNameData {
 
 export class DebugNameData {
 	constructor(
-		public readonly owner: Owner | undefined,
+		public readonly owner: DebugOwner | undefined,
 		public readonly debugNameSource: DebugNameSource | undefined,
 		public readonly referenceFn: Function | undefined,
 	) { }
@@ -36,10 +36,10 @@ export class DebugNameData {
 }
 
 /**
- * The owner object of an observable.
+ * The owning object of an observable.
  * Is only used for debugging purposes, such as computing a name for the observable by iterating over the fields of the owner.
  */
-export type Owner = object | undefined;
+export type DebugOwner = object | undefined;
 export type DebugNameSource = string | (() => string | undefined);
 
 const countPerName = new Map<string, number>();
diff --git a/src/vs/base/common/observableInternal/derived.ts b/src/vs/base/common/observableInternal/derived.ts
index 9e95bf9dccc..ed32875f8ba 100644
--- a/src/vs/base/common/observableInternal/derived.ts
+++ b/src/vs/base/common/observableInternal/derived.ts
@@ -3,12 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { assertFn } from 'vs/base/common/assert';
-import { EqualityComparer, strictEquals } from 'vs/base/common/equals';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { BaseObservable, IChangeContext, IObservable, IObserver, IReader, ISettableObservable, ITransaction, _setDerivedOpts, } from 'vs/base/common/observableInternal/base';
-import { DebugNameData, IDebugNameData, Owner } from 'vs/base/common/observableInternal/debugName';
-import { getLogger } from 'vs/base/common/observableInternal/logging';
+import { BaseObservable, IChangeContext, IObservable, IObserver, IReader, ISettableObservable, ITransaction, _setDerivedOpts, } from './base.js';
+import { DebugNameData, DebugOwner, IDebugNameData } from './debugName.js';
+import { DisposableStore, EqualityComparer, IDisposable, assertFn, onBugIndicatingError, strictEquals } from './commonFacade/deps.js';
+import { getLogger } from './logging.js';
 
 /**
  * Creates an observable that is derived from other observables.
@@ -17,8 +15,8 @@ import { getLogger } from 'vs/base/common/observableInternal/logging';
  * {@link computeFn} should start with a JS Doc using `@description` to name the derived.
  */
 export function derived<T>(computeFn: (reader: IReader) => T): IObservable<T>;
-export function derived<T>(owner: Owner, computeFn: (reader: IReader) => T): IObservable<T>;
-export function derived<T>(computeFnOrOwner: ((reader: IReader) => T) | Owner, computeFn?: ((reader: IReader) => T) | undefined): IObservable<T> {
+export function derived<T>(owner: DebugOwner, computeFn: (reader: IReader) => T): IObservable<T>;
+export function derived<T>(computeFnOrOwner: ((reader: IReader) => T) | DebugOwner, computeFn?: ((reader: IReader) => T) | undefined): IObservable<T> {
 	if (computeFn !== undefined) {
 		return new Derived(
 			new DebugNameData(computeFnOrOwner, undefined, computeFn),
@@ -39,7 +37,7 @@ export function derived<T>(computeFnOrOwner: ((reader: IReader) => T) | Owner, c
 	);
 }
 
-export function derivedWithSetter<T>(owner: Owner | undefined, computeFn: (reader: IReader) => T, setter: (value: T, transaction: ITransaction | undefined) => void): ISettableObservable<T> {
+export function derivedWithSetter<T>(owner: DebugOwner | undefined, computeFn: (reader: IReader) => T, setter: (value: T, transaction: ITransaction | undefined) => void): ISettableObservable<T> {
 	return new DerivedWithSetter(
 		new DebugNameData(owner, undefined, computeFn),
 		computeFn,
@@ -105,7 +103,7 @@ export function derivedWithStore<T>(computeFn: (reader: IReader, store: Disposab
 export function derivedWithStore<T>(owner: object, computeFn: (reader: IReader, store: DisposableStore) => T): IObservable<T>;
 export function derivedWithStore<T>(computeFnOrOwner: ((reader: IReader, store: DisposableStore) => T) | object, computeFnOrUndefined?: ((reader: IReader, store: DisposableStore) => T)): IObservable<T> {
 	let computeFn: (reader: IReader, store: DisposableStore) => T;
-	let owner: Owner;
+	let owner: DebugOwner;
 	if (computeFnOrUndefined === undefined) {
 		computeFn = computeFnOrOwner as any;
 		owner = undefined;
@@ -128,10 +126,10 @@ export function derivedWithStore<T>(computeFnOrOwner: ((reader: IReader, store:
 }
 
 export function derivedDisposable<T extends IDisposable | undefined>(computeFn: (reader: IReader) => T): IObservable<T>;
-export function derivedDisposable<T extends IDisposable | undefined>(owner: Owner, computeFn: (reader: IReader) => T): IObservable<T>;
-export function derivedDisposable<T extends IDisposable | undefined>(computeFnOrOwner: ((reader: IReader) => T) | Owner, computeFnOrUndefined?: ((reader: IReader) => T)): IObservable<T> {
+export function derivedDisposable<T extends IDisposable | undefined>(owner: DebugOwner, computeFn: (reader: IReader) => T): IObservable<T>;
+export function derivedDisposable<T extends IDisposable | undefined>(computeFnOrOwner: ((reader: IReader) => T) | DebugOwner, computeFnOrUndefined?: ((reader: IReader) => T)): IObservable<T> {
 	let computeFn: (reader: IReader) => T;
-	let owner: Owner;
+	let owner: DebugOwner;
 	if (computeFnOrUndefined === undefined) {
 		computeFn = computeFnOrOwner as any;
 		owner = undefined;
@@ -140,11 +138,15 @@ export function derivedDisposable<T extends IDisposable | undefined>(computeFnOr
 		computeFn = computeFnOrUndefined as any;
 	}
 
-	const store = new DisposableStore();
+	let store: DisposableStore | undefined = undefined;
 	return new Derived(
 		new DebugNameData(owner, undefined, computeFn),
 		r => {
-			store.clear();
+			if (!store) {
+				store = new DisposableStore();
+			} else {
+				store.clear();
+			}
 			const result = computeFn(r);
 			if (result) {
 				store.add(result);
@@ -152,7 +154,12 @@ export function derivedDisposable<T extends IDisposable | undefined>(computeFnOr
 			return result;
 		}, undefined,
 		undefined,
-		() => store.dispose(),
+		() => {
+			if (store) {
+				store.dispose();
+				store = undefined;
+			}
+		},
 		strictEquals
 	);
 }
@@ -192,7 +199,7 @@ export class Derived<T, TChangeSummary = any> extends BaseObservable<T, void> im
 	}
 
 	constructor(
-		private readonly _debugNameData: DebugNameData,
+		public readonly _debugNameData: DebugNameData,
 		public readonly _computeFn: (reader: IReader, changeSummary: TChangeSummary) => T,
 		private readonly createChangeSummary: (() => TChangeSummary) | undefined,
 		private readonly _handleChange: ((context: IChangeContext, summary: TChangeSummary) => boolean) | undefined,
@@ -268,30 +275,36 @@ export class Derived<T, TChangeSummary = any> extends BaseObservable<T, void> im
 		const oldValue = this.value;
 		this.state = DerivedState.upToDate;
 
-		const changeSummary = this.changeSummary!;
-		this.changeSummary = this.createChangeSummary?.();
+		let didChange = false;
+
 		try {
-			/** might call {@link handleChange} indirectly, which could invalidate us */
-			this.value = this._computeFn(this, changeSummary);
-		} finally {
-			// We don't want our observed observables to think that they are (not even temporarily) not being observed.
-			// Thus, we only unsubscribe from observables that are definitely not read anymore.
-			for (const o of this.dependenciesToBeRemoved) {
-				o.removeObserver(this);
+			const changeSummary = this.changeSummary!;
+			this.changeSummary = this.createChangeSummary?.();
+			try {
+				/** might call {@link handleChange} indirectly, which could invalidate us */
+				this.value = this._computeFn(this, changeSummary);
+			} finally {
+				// We don't want our observed observables to think that they are (not even temporarily) not being observed.
+				// Thus, we only unsubscribe from observables that are definitely not read anymore.
+				for (const o of this.dependenciesToBeRemoved) {
+					o.removeObserver(this);
+				}
+				this.dependenciesToBeRemoved.clear();
 			}
-			this.dependenciesToBeRemoved.clear();
+
+			didChange = hadValue && !(this._equalityComparator(oldValue!, this.value));
+
+			getLogger()?.handleDerivedRecomputed(this, {
+				oldValue,
+				newValue: this.value,
+				change: undefined,
+				didChange,
+				hadValue,
+			});
+		} catch (e) {
+			onBugIndicatingError(e);
 		}
 
-		const didChange = hadValue && !(this._equalityComparator(oldValue!, this.value));
-
-		getLogger()?.handleDerivedRecomputed(this, {
-			oldValue,
-			newValue: this.value,
-			change: undefined,
-			didChange,
-			hadValue,
-		});
-
 		if (didChange) {
 			for (const r of this.observers) {
 				r.handleChange(this, undefined);
@@ -347,11 +360,17 @@ export class Derived<T, TChangeSummary = any> extends BaseObservable<T, void> im
 
 	public handleChange<T, TChange>(observable: IObservable<T, TChange>, change: TChange): void {
 		if (this.dependencies.has(observable) && !this.dependenciesToBeRemoved.has(observable)) {
-			const shouldReact = this._handleChange ? this._handleChange({
-				changedObservable: observable,
-				change,
-				didChange: (o): this is any => o === observable as any,
-			}, this.changeSummary!) : true;
+			let shouldReact = false;
+			try {
+				shouldReact = this._handleChange ? this._handleChange({
+					changedObservable: observable,
+					change,
+					didChange: (o): this is any => o === observable as any,
+				}, this.changeSummary!) : true;
+			} catch (e) {
+				onBugIndicatingError(e);
+			}
+
 			const wasUpToDate = this.state === DerivedState.upToDate;
 			if (shouldReact && (this.state === DerivedState.dependenciesMightHaveChanged || wasUpToDate)) {
 				this.state = DerivedState.stale;
diff --git a/src/vs/base/common/observableInternal/index.ts b/src/vs/base/common/observableInternal/index.ts
new file mode 100644
index 00000000000..9295f2697d5
--- /dev/null
+++ b/src/vs/base/common/observableInternal/index.ts
@@ -0,0 +1,29 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// This is a facade for the observable implementation. Only import from here!
+
+export { observableValueOpts } from './api.js';
+export { autorun, autorunDelta, autorunHandleChanges, autorunOpts, autorunWithStore, autorunWithStoreHandleChanges } from './autorun.js';
+export { asyncTransaction, disposableObservableValue, globalTransaction, observableValue, subtransaction, transaction, TransactionImpl, type IChangeContext, type IChangeTracker, type IObservable, type IObserver, type IReader, type ISettable, type ISettableObservable, type ITransaction, } from './base.js';
+export { derived, derivedDisposable, derivedHandleChanges, derivedOpts, derivedWithSetter, derivedWithStore } from './derived.js';
+export { ObservableLazy, ObservableLazyPromise, ObservablePromise, PromiseResult, } from './promise.js';
+export { derivedWithCancellationToken, waitForState } from './utilsCancellation.js';
+export { constObservable, debouncedObservable, derivedConstOnceDefined, derivedObservableWithCache, derivedObservableWithWritableCache, keepObserved, latestChangedValue, mapObservableArrayCached, observableFromEvent, observableFromEventOpts, observableFromPromise, observableFromValueWithChangeEvent, observableSignal, observableSignalFromEvent, recomputeInitiallyAndOnChange, runOnChange, runOnChangeWithStore, signalFromObservable, ValueWithChangeEventFromObservable, wasEventTriggeredRecently, type IObservableSignal, } from './utils.js';
+export { type DebugOwner } from './debugName.js';
+
+import {
+	ConsoleObservableLogger,
+	setLogger
+} from './logging.js';
+
+// Remove "//" in the next line to enable logging
+const enableLogging = false
+	// || Boolean("true") // done "weirdly" so that a lint warning prevents you from pushing this
+	;
+
+if (enableLogging) {
+	setLogger(new ConsoleObservableLogger());
+}
diff --git a/src/vs/base/common/observableInternal/lazyObservableValue.ts b/src/vs/base/common/observableInternal/lazyObservableValue.ts
index 1c35f458161..8a3f63c05d7 100644
--- a/src/vs/base/common/observableInternal/lazyObservableValue.ts
+++ b/src/vs/base/common/observableInternal/lazyObservableValue.ts
@@ -3,10 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { EqualityComparer } from 'vs/base/common/equals';
-import { ISettableObservable, ITransaction } from 'vs/base/common/observable';
-import { BaseObservable, IObserver, TransactionImpl } from 'vs/base/common/observableInternal/base';
-import { DebugNameData } from 'vs/base/common/observableInternal/debugName';
+import { EqualityComparer } from './commonFacade/deps.js';
+import { BaseObservable, IObserver, ISettableObservable, ITransaction, TransactionImpl } from './base.js';
+import { DebugNameData } from './debugName.js';
 
 /**
  * Holds off updating observers until the value is actually read.
diff --git a/src/vs/base/common/observableInternal/logging.ts b/src/vs/base/common/observableInternal/logging.ts
index 01fcc3cdbbf..56f154e001e 100644
--- a/src/vs/base/common/observableInternal/logging.ts
+++ b/src/vs/base/common/observableInternal/logging.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { AutorunObserver } from 'vs/base/common/observableInternal/autorun';
-import { IObservable, ObservableValue, TransactionImpl } from 'vs/base/common/observableInternal/base';
-import { Derived } from 'vs/base/common/observableInternal/derived';
-import { FromEventObservable } from 'vs/base/common/observableInternal/utils';
+import { AutorunObserver } from './autorun.js';
+import { IObservable, ObservableValue, TransactionImpl } from './base.js';
+import { Derived } from './derived.js';
+import { FromEventObservable } from './utils.js';
 
 let globalObservableLogger: IObservableLogger | undefined;
 
@@ -114,7 +114,7 @@ export class ConsoleObservableLogger implements IObservableLogger {
 			styled(derived.debugName, { color: 'BlueViolet' }),
 			...this.formatInfo(info),
 			this.formatChanges(changedObservables),
-			{ data: [{ fn: derived._computeFn }] }
+			{ data: [{ fn: derived._debugNameData.referenceFn ?? derived._computeFn }] }
 		]));
 		changedObservables.clear();
 	}
@@ -143,7 +143,7 @@ export class ConsoleObservableLogger implements IObservableLogger {
 			formatKind('autorun'),
 			styled(autorun.debugName, { color: 'BlueViolet' }),
 			this.formatChanges(changedObservables),
-			{ data: [{ fn: autorun._runFn }] }
+			{ data: [{ fn: autorun._debugNameData.referenceFn ?? autorun._runFn }] }
 		]));
 		changedObservables.clear();
 		this.indentation++;
diff --git a/src/vs/base/common/observableInternal/promise.ts b/src/vs/base/common/observableInternal/promise.ts
index e0109a3941b..6551c21664c 100644
--- a/src/vs/base/common/observableInternal/promise.ts
+++ b/src/vs/base/common/observableInternal/promise.ts
@@ -2,13 +2,8 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { autorun } from 'vs/base/common/observableInternal/autorun';
-import { IObservable, IReader, observableValue, transaction } from './base';
-import { Derived, derived } from 'vs/base/common/observableInternal/derived';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { DebugNameData, Owner } from 'vs/base/common/observableInternal/debugName';
-import { strictEquals } from 'vs/base/common/equals';
-import { CancellationError } from 'vs/base/common/errors';
+import { IObservable, observableValue, transaction } from './base.js';
+import { derived } from './derived.js';
 
 export class ObservableLazy<T> {
 	private readonly _value = observableValue<T | undefined>(this, undefined);
@@ -40,6 +35,10 @@ export class ObservableLazy<T> {
  * A promise whose state is observable.
  */
 export class ObservablePromise<T> {
+	public static fromFn<T>(fn: () => Promise<T>): ObservablePromise<T> {
+		return new ObservablePromise(fn());
+	}
+
 	private readonly _value = observableValue<PromiseResult<T> | undefined>(this, undefined);
 
 	/**
@@ -116,90 +115,3 @@ export class ObservableLazyPromise<T> {
 		return this._lazyValue.getValue().promise;
 	}
 }
-
-/**
- * Resolves the promise when the observables state matches the predicate.
- */
-export function waitForState<T>(observable: IObservable<T | null | undefined>): Promise<T>;
-export function waitForState<T, TState extends T>(observable: IObservable<T>, predicate: (state: T) => state is TState, isError?: (state: T) => boolean | unknown | undefined, cancellationToken?: CancellationToken): Promise<TState>;
-export function waitForState<T>(observable: IObservable<T>, predicate: (state: T) => boolean, isError?: (state: T) => boolean | unknown | undefined, cancellationToken?: CancellationToken): Promise<T>;
-export function waitForState<T>(observable: IObservable<T>, predicate?: (state: T) => boolean, isError?: (state: T) => boolean | unknown | undefined, cancellationToken?: CancellationToken): Promise<T> {
-	if (!predicate) {
-		predicate = state => state !== null && state !== undefined;
-	}
-	return new Promise((resolve, reject) => {
-		let isImmediateRun = true;
-		let shouldDispose = false;
-		const stateObs = observable.map(state => {
-			/** @description waitForState.state */
-			return {
-				isFinished: predicate(state),
-				error: isError ? isError(state) : false,
-				state
-			};
-		});
-		const d = autorun(reader => {
-			/** @description waitForState */
-			const { isFinished, error, state } = stateObs.read(reader);
-			if (isFinished || error) {
-				if (isImmediateRun) {
-					// The variable `d` is not initialized yet
-					shouldDispose = true;
-				} else {
-					d.dispose();
-				}
-				if (error) {
-					reject(error === true ? state : error);
-				} else {
-					resolve(state);
-				}
-			}
-		});
-		if (cancellationToken) {
-			const dc = cancellationToken.onCancellationRequested(() => {
-				d.dispose();
-				dc.dispose();
-				reject(new CancellationError());
-			});
-			if (cancellationToken.isCancellationRequested) {
-				d.dispose();
-				dc.dispose();
-				reject(new CancellationError());
-				return;
-			}
-		}
-		isImmediateRun = false;
-		if (shouldDispose) {
-			d.dispose();
-		}
-	});
-}
-
-export function derivedWithCancellationToken<T>(computeFn: (reader: IReader, cancellationToken: CancellationToken) => T): IObservable<T>;
-export function derivedWithCancellationToken<T>(owner: object, computeFn: (reader: IReader, cancellationToken: CancellationToken) => T): IObservable<T>;
-export function derivedWithCancellationToken<T>(computeFnOrOwner: ((reader: IReader, cancellationToken: CancellationToken) => T) | object, computeFnOrUndefined?: ((reader: IReader, cancellationToken: CancellationToken) => T)): IObservable<T> {
-	let computeFn: (reader: IReader, store: CancellationToken) => T;
-	let owner: Owner;
-	if (computeFnOrUndefined === undefined) {
-		computeFn = computeFnOrOwner as any;
-		owner = undefined;
-	} else {
-		owner = computeFnOrOwner;
-		computeFn = computeFnOrUndefined as any;
-	}
-
-	let cancellationTokenSource: CancellationTokenSource | undefined = undefined;
-	return new Derived(
-		new DebugNameData(owner, undefined, computeFn),
-		r => {
-			if (cancellationTokenSource) {
-				cancellationTokenSource.dispose(true);
-			}
-			cancellationTokenSource = new CancellationTokenSource();
-			return computeFn(r, cancellationTokenSource.token);
-		}, undefined,
-		undefined,
-		() => cancellationTokenSource?.dispose(),
-		strictEquals,
-	);
-}
diff --git a/src/vs/base/common/observableInternal/utils.ts b/src/vs/base/common/observableInternal/utils.ts
index d1597b8b48a..2fb57d1a42a 100644
--- a/src/vs/base/common/observableInternal/utils.ts
+++ b/src/vs/base/common/observableInternal/utils.ts
@@ -3,14 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { autorun } from 'vs/base/common/observableInternal/autorun';
-import { BaseObservable, ConvenientObservable, IObservable, IObserver, IReader, ITransaction, _setKeepObserved, _setRecomputeInitiallyAndOnChange, observableValue, subtransaction, transaction } from 'vs/base/common/observableInternal/base';
-import { DebugNameData, Owner, getFunctionName } from 'vs/base/common/observableInternal/debugName';
-import { derived, derivedOpts } from 'vs/base/common/observableInternal/derived';
-import { getLogger } from 'vs/base/common/observableInternal/logging';
-import { IValueWithChangeEvent } from '../event';
+import { autorun, autorunOpts, autorunWithStoreHandleChanges } from './autorun.js';
+import { BaseObservable, ConvenientObservable, IObservable, IObserver, IReader, ITransaction, _setKeepObserved, _setRecomputeInitiallyAndOnChange, observableValue, subtransaction, transaction } from './base.js';
+import { DebugNameData, DebugOwner, IDebugNameData, getDebugName, } from './debugName.js';
+import { BugIndicatingError, DisposableStore, EqualityComparer, Event, IDisposable, IValueWithChangeEvent, strictEquals, toDisposable } from './commonFacade/deps.js';
+import { derived, derivedOpts } from './derived.js';
+import { getLogger } from './logging.js';
 
 /**
  * Represents an efficient observable whose value never changes.
@@ -52,11 +50,49 @@ export function observableFromPromise<T>(promise: Promise<T>): IObservable<{ val
 	return observable;
 }
 
+
+export function observableFromEvent<T, TArgs = unknown>(
+	owner: DebugOwner,
+	event: Event<TArgs>,
+	getValue: (args: TArgs | undefined) => T,
+): IObservable<T>;
 export function observableFromEvent<T, TArgs = unknown>(
 	event: Event<TArgs>,
 	getValue: (args: TArgs | undefined) => T,
+): IObservable<T>;
+export function observableFromEvent(...args:
+	[owner: DebugOwner, event: Event<any>, getValue: (args: any | undefined) => any]
+	| [event: Event<any>, getValue: (args: any | undefined) => any]
+): IObservable<any> {
+	let owner;
+	let event;
+	let getValue;
+	if (args.length === 3) {
+		[owner, event, getValue] = args;
+	} else {
+		[event, getValue] = args;
+	}
+	return new FromEventObservable(
+		new DebugNameData(owner, undefined, getValue),
+		event,
+		getValue,
+		() => FromEventObservable.globalTransaction,
+		strictEquals
+	);
+}
+
+export function observableFromEventOpts<T, TArgs = unknown>(
+	options: IDebugNameData & {
+		equalsFn?: EqualityComparer<T>;
+	},
+	event: Event<TArgs>,
+	getValue: (args: TArgs | undefined) => T,
 ): IObservable<T> {
-	return new FromEventObservable(event, getValue, () => FromEventObservable.globalTransaction);
+	return new FromEventObservable(
+		new DebugNameData(options.owner, options.debugName, options.debugReferenceFn ?? getValue),
+		event,
+		getValue, () => FromEventObservable.globalTransaction, options.equalsFn ?? strictEquals
+	);
 }
 
 export class FromEventObservable<TArgs, T> extends BaseObservable<T> {
@@ -67,15 +103,17 @@ export class FromEventObservable<TArgs, T> extends BaseObservable<T> {
 	private subscription: IDisposable | undefined;
 
 	constructor(
+		private readonly _debugNameData: DebugNameData,
 		private readonly event: Event<TArgs>,
 		public readonly _getValue: (args: TArgs | undefined) => T,
 		private readonly _getTransaction: () => ITransaction | undefined,
+		private readonly _equalityComparator: EqualityComparer<T>
 	) {
 		super();
 	}
 
 	private getDebugName(): string | undefined {
-		return getFunctionName(this._getValue);
+		return this._debugNameData.getDebugName(this);
 	}
 
 	public get debugName(): string {
@@ -91,7 +129,7 @@ export class FromEventObservable<TArgs, T> extends BaseObservable<T> {
 		const newValue = this._getValue(args);
 		const oldValue = this.value;
 
-		const didChange = !this.hasValue || oldValue !== newValue;
+		const didChange = !this.hasValue || !(this._equalityComparator(oldValue!, newValue));
 		let didRunTransaction = false;
 
 		if (didChange) {
@@ -260,6 +298,15 @@ class ObservableSignal<TChange> extends BaseObservable<void, TChange> implements
 	}
 }
 
+export function signalFromObservable<T>(owner: DebugOwner | undefined, observable: IObservable<T>): IObservable<void> {
+	return derivedOpts({
+		owner,
+		equalsFn: () => false,
+	}, reader => {
+		observable.read(reader);
+	});
+}
+
 /**
  * @deprecated Use `debouncedObservable2` instead.
  */
@@ -411,9 +458,9 @@ export class KeepAliveObserver implements IObserver {
 	}
 }
 
-export function derivedObservableWithCache<T>(owner: Owner, computeFn: (reader: IReader, lastValue: T | undefined) => T): IObservable<T> {
+export function derivedObservableWithCache<T>(owner: DebugOwner, computeFn: (reader: IReader, lastValue: T | undefined) => T): IObservable<T> {
 	let lastValue: T | undefined = undefined;
-	const observable = derived(owner, reader => {
+	const observable = derivedOpts({ owner, debugReferenceFn: computeFn }, reader => {
 		lastValue = computeFn(reader, lastValue);
 		return lastValue;
 	});
@@ -444,7 +491,7 @@ export function derivedObservableWithWritableCache<T>(owner: object, computeFn:
 /**
  * When the items array changes, referential equal items are not mapped again.
  */
-export function mapObservableArrayCached<TIn, TOut, TKey = TIn>(owner: Owner, items: IObservable<readonly TIn[]>, map: (input: TIn, store: DisposableStore) => TOut, keySelector?: (input: TIn) => TKey): IObservable<readonly TOut[]> {
+export function mapObservableArrayCached<TIn, TOut, TKey = TIn>(owner: DebugOwner, items: IObservable<readonly TIn[]>, map: (input: TIn, store: DisposableStore) => TOut, keySelector?: (input: TIn) => TKey): IObservable<readonly TOut[]> {
 	let m = new ArrayMap(map, keySelector);
 	const self = derivedOpts({
 		debugReferenceFn: map,
@@ -520,9 +567,98 @@ export class ValueWithChangeEventFromObservable<T> implements IValueWithChangeEv
 	}
 }
 
-export function observableFromValueWithChangeEvent<T>(_owner: Owner, value: IValueWithChangeEvent<T>): IObservable<T> {
+export function observableFromValueWithChangeEvent<T>(owner: DebugOwner, value: IValueWithChangeEvent<T>): IObservable<T> {
 	if (value instanceof ValueWithChangeEventFromObservable) {
 		return value.observable;
 	}
-	return observableFromEvent(value.onDidChange, () => value.value);
+	return observableFromEvent(owner, value.onDidChange, () => value.value);
+}
+
+/**
+ * Creates an observable that has the latest changed value of the given observables.
+ * Initially (and when not observed), it has the value of the last observable.
+ * When observed and any of the observables change, it has the value of the last changed observable.
+ * If multiple observables change in the same transaction, the last observable wins.
+*/
+export function latestChangedValue<T extends IObservable<any>[]>(owner: DebugOwner, observables: T): IObservable<ReturnType<T[number]['get']>> {
+	if (observables.length === 0) {
+		throw new BugIndicatingError();
+	}
+
+	let hasLastChangedValue = false;
+	let lastChangedValue: any = undefined;
+
+	const result = observableFromEvent<any, void>(owner, cb => {
+		const store = new DisposableStore();
+		for (const o of observables) {
+			store.add(autorunOpts({ debugName: () => getDebugName(result, new DebugNameData(owner, undefined, undefined)) + '.updateLastChangedValue' }, reader => {
+				hasLastChangedValue = true;
+				lastChangedValue = o.read(reader);
+				cb();
+			}));
+		}
+		store.add({
+			dispose() {
+				hasLastChangedValue = false;
+				lastChangedValue = undefined;
+			},
+		});
+		return store;
+	}, () => {
+		if (hasLastChangedValue) {
+			return lastChangedValue;
+		} else {
+			return observables[observables.length - 1].get();
+		}
+	});
+	return result;
+}
+
+/**
+ * Works like a derived.
+ * However, if the value is not undefined, it is cached and will not be recomputed anymore.
+ * In that case, the derived will unsubscribe from its dependencies.
+*/
+export function derivedConstOnceDefined<T>(owner: DebugOwner, fn: (reader: IReader) => T): IObservable<T | undefined> {
+	return derivedObservableWithCache<T | undefined>(owner, (reader, lastValue) => lastValue ?? fn(reader));
+}
+
+type RemoveUndefined<T> = T extends undefined ? never : T;
+
+export function runOnChange<T, TChange>(observable: IObservable<T, TChange>, cb: (value: T, previousValue: undefined | T, deltas: RemoveUndefined<TChange>[]) => void): IDisposable {
+	let _previousValue: T | undefined;
+	return autorunWithStoreHandleChanges({
+		createEmptyChangeSummary: () => ({ deltas: [] as RemoveUndefined<TChange>[], didChange: false }),
+		handleChange: (context, changeSummary) => {
+			if (context.didChange(observable)) {
+				const e = context.change;
+				if (e !== undefined) {
+					changeSummary.deltas.push(e as RemoveUndefined<TChange>);
+				}
+				changeSummary.didChange = true;
+			}
+			return true;
+		},
+	}, (reader, changeSummary) => {
+		const value = observable.read(reader);
+		const previousValue = _previousValue;
+		if (changeSummary.didChange) {
+			_previousValue = value;
+			cb(value, previousValue, changeSummary.deltas);
+		}
+	});
+}
+
+export function runOnChangeWithStore<T, TChange>(observable: IObservable<T, TChange>, cb: (value: T, previousValue: undefined | T, deltas: RemoveUndefined<TChange>[], store: DisposableStore) => void): IDisposable {
+	const store = new DisposableStore();
+	const disposable = runOnChange(observable, (value, previousValue: undefined | T, deltas) => {
+		store.clear();
+		cb(value, previousValue, deltas, store);
+	});
+	return {
+		dispose() {
+			disposable.dispose();
+			store.dispose();
+		}
+	};
 }
diff --git a/src/vs/base/common/observableInternal/utilsCancellation.ts b/src/vs/base/common/observableInternal/utilsCancellation.ts
new file mode 100644
index 00000000000..17e4ba9e308
--- /dev/null
+++ b/src/vs/base/common/observableInternal/utilsCancellation.ts
@@ -0,0 +1,98 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IReader, IObservable } from './base.js';
+import { DebugOwner, DebugNameData } from './debugName.js';
+import { CancellationError, CancellationToken, CancellationTokenSource } from './commonFacade/cancellation.js';
+import { Derived } from './derived.js';
+import { strictEquals } from './commonFacade/deps.js';
+import { autorun } from './autorun.js';
+
+/**
+ * Resolves the promise when the observables state matches the predicate.
+ */
+export function waitForState<T>(observable: IObservable<T | null | undefined>): Promise<T>;
+export function waitForState<T, TState extends T>(observable: IObservable<T>, predicate: (state: T) => state is TState, isError?: (state: T) => boolean | unknown | undefined, cancellationToken?: CancellationToken): Promise<TState>;
+export function waitForState<T>(observable: IObservable<T>, predicate: (state: T) => boolean, isError?: (state: T) => boolean | unknown | undefined, cancellationToken?: CancellationToken): Promise<T>;
+export function waitForState<T>(observable: IObservable<T>, predicate?: (state: T) => boolean, isError?: (state: T) => boolean | unknown | undefined, cancellationToken?: CancellationToken): Promise<T> {
+	if (!predicate) {
+		predicate = state => state !== null && state !== undefined;
+	}
+	return new Promise((resolve, reject) => {
+		let isImmediateRun = true;
+		let shouldDispose = false;
+		const stateObs = observable.map(state => {
+			/** @description waitForState.state */
+			return {
+				isFinished: predicate(state),
+				error: isError ? isError(state) : false,
+				state
+			};
+		});
+		const d = autorun(reader => {
+			/** @description waitForState */
+			const { isFinished, error, state } = stateObs.read(reader);
+			if (isFinished || error) {
+				if (isImmediateRun) {
+					// The variable `d` is not initialized yet
+					shouldDispose = true;
+				} else {
+					d.dispose();
+				}
+				if (error) {
+					reject(error === true ? state : error);
+				} else {
+					resolve(state);
+				}
+			}
+		});
+		if (cancellationToken) {
+			const dc = cancellationToken.onCancellationRequested(() => {
+				d.dispose();
+				dc.dispose();
+				reject(new CancellationError());
+			});
+			if (cancellationToken.isCancellationRequested) {
+				d.dispose();
+				dc.dispose();
+				reject(new CancellationError());
+				return;
+			}
+		}
+		isImmediateRun = false;
+		if (shouldDispose) {
+			d.dispose();
+		}
+	});
+}
+
+export function derivedWithCancellationToken<T>(computeFn: (reader: IReader, cancellationToken: CancellationToken) => T): IObservable<T>;
+export function derivedWithCancellationToken<T>(owner: object, computeFn: (reader: IReader, cancellationToken: CancellationToken) => T): IObservable<T>;
+export function derivedWithCancellationToken<T>(computeFnOrOwner: ((reader: IReader, cancellationToken: CancellationToken) => T) | object, computeFnOrUndefined?: ((reader: IReader, cancellationToken: CancellationToken) => T)): IObservable<T> {
+	let computeFn: (reader: IReader, store: CancellationToken) => T;
+	let owner: DebugOwner;
+	if (computeFnOrUndefined === undefined) {
+		computeFn = computeFnOrOwner as any;
+		owner = undefined;
+	} else {
+		owner = computeFnOrOwner;
+		computeFn = computeFnOrUndefined as any;
+	}
+
+	let cancellationTokenSource: CancellationTokenSource | undefined = undefined;
+	return new Derived(
+		new DebugNameData(owner, undefined, computeFn),
+		r => {
+			if (cancellationTokenSource) {
+				cancellationTokenSource.dispose(true);
+			}
+			cancellationTokenSource = new CancellationTokenSource();
+			return computeFn(r, cancellationTokenSource.token);
+		}, undefined,
+		undefined,
+		() => cancellationTokenSource?.dispose(),
+		strictEquals
+	);
+}
diff --git a/src/vs/base/common/paging.ts b/src/vs/base/common/paging.ts
index c13957cc0d8..b4e68132cbb 100644
--- a/src/vs/base/common/paging.ts
+++ b/src/vs/base/common/paging.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { range } from 'vs/base/common/arrays';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { CancellationError } from 'vs/base/common/errors';
+import { range } from './arrays.js';
+import { CancellationToken, CancellationTokenSource } from './cancellation.js';
+import { CancellationError } from './errors.js';
 
 /**
  * A Pager is a stateless abstraction over a paged collection.
diff --git a/src/vs/base/common/path.ts b/src/vs/base/common/path.ts
index 83140948bba..29621411b78 100644
--- a/src/vs/base/common/path.ts
+++ b/src/vs/base/common/path.ts
@@ -4,7 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 // NOTE: VSCode's copy of nodejs path library to be usable in common (non-node) namespace
-// Copied from: https://github.com/nodejs/node/blob/v16.14.2/lib/path.js
+// Copied from: https://github.com/nodejs/node/commits/v20.9.0/lib/path.js
+// Excluding: the change that adds primordials
+// (https://github.com/nodejs/node/commit/187a862d221dec42fa9a5c4214e7034d9092792f and others)
 
 /**
  * Copyright Joyent, Inc. and other Node contributors.
@@ -29,7 +31,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import * as process from 'vs/base/common/process';
+import * as process from './process.js';
 
 const CHAR_UPPERCASE_A = 65;/* A */
 const CHAR_LOWERCASE_A = 97; /* a */
@@ -159,11 +161,15 @@ function normalizeString(path: string, allowAboveRoot: boolean, separator: strin
 	return res;
 }
 
+function formatExt(ext: string): string {
+	return ext ? `${ext[0] === '.' ? '' : '.'}${ext}` : '';
+}
+
 function _format(sep: string, pathObject: ParsedPath) {
 	validateObject(pathObject, 'pathObject');
 	const dir = pathObject.dir || pathObject.root;
 	const base = pathObject.base ||
-		`${pathObject.name || ''}${pathObject.ext || ''}`;
+		`${pathObject.name || ''}${formatExt(pathObject.ext)}`;
 	if (!dir) {
 		return base;
 	}
@@ -185,7 +191,7 @@ export interface IPath {
 	resolve(...pathSegments: string[]): string;
 	relative(from: string, to: string): string;
 	dirname(path: string): string;
-	basename(path: string, ext?: string): string;
+	basename(path: string, suffix?: string): string;
 	extname(path: string): string;
 	format(pathObject: ParsedPath): string;
 	parse(path: string): ParsedPath;
@@ -207,7 +213,7 @@ export const win32: IPath = {
 			let path;
 			if (i >= 0) {
 				path = pathSegments[i];
-				validateString(path, 'path');
+				validateString(path, `paths[${i}]`);
 
 				// Skip empty entries
 				if (path.length === 0) {
@@ -757,9 +763,9 @@ export const win32: IPath = {
 		return path.slice(0, end);
 	},
 
-	basename(path: string, ext?: string): string {
-		if (ext !== undefined) {
-			validateString(ext, 'ext');
+	basename(path: string, suffix?: string): string {
+		if (suffix !== undefined) {
+			validateString(suffix, 'suffix');
 		}
 		validateString(path, 'path');
 		let start = 0;
@@ -776,11 +782,11 @@ export const win32: IPath = {
 			start = 2;
 		}
 
-		if (ext !== undefined && ext.length > 0 && ext.length <= path.length) {
-			if (ext === path) {
+		if (suffix !== undefined && suffix.length > 0 && suffix.length <= path.length) {
+			if (suffix === path) {
 				return '';
 			}
-			let extIdx = ext.length - 1;
+			let extIdx = suffix.length - 1;
 			let firstNonSlashEnd = -1;
 			for (i = path.length - 1; i >= start; --i) {
 				const code = path.charCodeAt(i);
@@ -800,7 +806,7 @@ export const win32: IPath = {
 					}
 					if (extIdx >= 0) {
 						// Try to match the explicit extension
-						if (code === ext.charCodeAt(extIdx)) {
+						if (code === suffix.charCodeAt(extIdx)) {
 							if (--extIdx === -1) {
 								// We matched the extension, so mark this as the end of our path
 								// component
@@ -1095,7 +1101,7 @@ export const posix: IPath = {
 		for (let i = pathSegments.length - 1; i >= -1 && !resolvedAbsolute; i--) {
 			const path = i >= 0 ? pathSegments[i] : posixCwd();
 
-			validateString(path, 'path');
+			validateString(path, `paths[${i}]`);
 
 			// Skip empty entries
 			if (path.length === 0) {
@@ -1280,9 +1286,9 @@ export const posix: IPath = {
 		return path.slice(0, end);
 	},
 
-	basename(path: string, ext?: string): string {
-		if (ext !== undefined) {
-			validateString(ext, 'ext');
+	basename(path: string, suffix?: string): string {
+		if (suffix !== undefined) {
+			validateString(suffix, 'ext');
 		}
 		validateString(path, 'path');
 
@@ -1291,11 +1297,11 @@ export const posix: IPath = {
 		let matchedSlash = true;
 		let i;
 
-		if (ext !== undefined && ext.length > 0 && ext.length <= path.length) {
-			if (ext === path) {
+		if (suffix !== undefined && suffix.length > 0 && suffix.length <= path.length) {
+			if (suffix === path) {
 				return '';
 			}
-			let extIdx = ext.length - 1;
+			let extIdx = suffix.length - 1;
 			let firstNonSlashEnd = -1;
 			for (i = path.length - 1; i >= 0; --i) {
 				const code = path.charCodeAt(i);
@@ -1315,7 +1321,7 @@ export const posix: IPath = {
 					}
 					if (extIdx >= 0) {
 						// Try to match the explicit extension
-						if (code === ext.charCodeAt(extIdx)) {
+						if (code === suffix.charCodeAt(extIdx)) {
 							if (--extIdx === -1) {
 								// We matched the extension, so mark this as the end of our path
 								// component
diff --git a/src/vs/base/common/performance.js b/src/vs/base/common/performance.js
deleted file mode 100644
index aff4d0734de..00000000000
--- a/src/vs/base/common/performance.js
+++ /dev/null
@@ -1,125 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-//@ts-check
-
-(function () {
-
-	/**
-	 * @returns {{mark(name:string):void, getMarks():{name:string, startTime:number}[]}}
-	 */
-	function _definePolyfillMarks(timeOrigin) {
-
-		const _data = [];
-		if (typeof timeOrigin === 'number') {
-			_data.push('code/timeOrigin', timeOrigin);
-		}
-
-		function mark(name) {
-			_data.push(name, Date.now());
-		}
-		function getMarks() {
-			const result = [];
-			for (let i = 0; i < _data.length; i += 2) {
-				result.push({
-					name: _data[i],
-					startTime: _data[i + 1],
-				});
-			}
-			return result;
-		}
-		return { mark, getMarks };
-	}
-
-	/**
-	 * @returns {{mark(name:string):void, getMarks():{name:string, startTime:number}[]}}
-	 */
-	function _define() {
-
-		// Identify browser environment when following property is not present
-		// https://nodejs.org/dist/latest-v16.x/docs/api/perf_hooks.html#performancenodetiming
-		if (typeof performance === 'object' && typeof performance.mark === 'function' && !performance.nodeTiming) {
-			// in a browser context, reuse performance-util
-
-			if (typeof performance.timeOrigin !== 'number' && !performance.timing) {
-				// safari & webworker: because there is no timeOrigin and no workaround
-				// we use the `Date.now`-based polyfill.
-				return _definePolyfillMarks();
-
-			} else {
-				// use "native" performance for mark and getMarks
-				return {
-					mark(name) {
-						performance.mark(name);
-					},
-					getMarks() {
-						let timeOrigin = performance.timeOrigin;
-						if (typeof timeOrigin !== 'number') {
-							// safari: there is no timerOrigin but in renderers there is the timing-property
-							// see https://bugs.webkit.org/show_bug.cgi?id=174862
-							timeOrigin = performance.timing.navigationStart || performance.timing.redirectStart || performance.timing.fetchStart;
-						}
-						const result = [{ name: 'code/timeOrigin', startTime: Math.round(timeOrigin) }];
-						for (const entry of performance.getEntriesByType('mark')) {
-							result.push({
-								name: entry.name,
-								startTime: Math.round(timeOrigin + entry.startTime)
-							});
-						}
-						return result;
-					}
-				};
-			}
-
-		} else if (typeof process === 'object') {
-			// node.js: use the normal polyfill but add the timeOrigin
-			// from the node perf_hooks API as very first mark
-			const timeOrigin = performance?.timeOrigin ?? Math.round((require.__$__nodeRequire || require)('perf_hooks').performance.timeOrigin);
-			return _definePolyfillMarks(timeOrigin);
-
-		} else {
-			// unknown environment
-			console.trace('perf-util loaded in UNKNOWN environment');
-			return _definePolyfillMarks();
-		}
-	}
-
-	function _factory(sharedObj) {
-		if (!sharedObj.MonacoPerformanceMarks) {
-			sharedObj.MonacoPerformanceMarks = _define();
-		}
-		return sharedObj.MonacoPerformanceMarks;
-	}
-
-	// This module can be loaded in an amd and commonjs-context.
-	// Because we want both instances to use the same perf-data
-	// we store them globally
-
-	// eslint-disable-next-line no-var
-	var sharedObj;
-	if (typeof global === 'object') {
-		// nodejs
-		sharedObj = global;
-	} else if (typeof self === 'object') {
-		// browser
-		sharedObj = self;
-	} else {
-		sharedObj = {};
-	}
-
-	if (typeof define === 'function') {
-		// amd
-		define([], function () { return _factory(sharedObj); });
-	} else if (typeof module === 'object' && typeof module.exports === 'object') {
-		// commonjs
-		module.exports = _factory(sharedObj);
-	} else {
-		console.trace('perf-util defined in UNKNOWN context (neither requirejs or commonjs)');
-		sharedObj.perf = _factory(sharedObj);
-	}
-
-})();
diff --git a/src/vs/base/common/performance.ts b/src/vs/base/common/performance.ts
new file mode 100644
index 00000000000..121b4710484
--- /dev/null
+++ b/src/vs/base/common/performance.ts
@@ -0,0 +1,102 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import type { INodeProcess } from './platform.js';
+
+function _definePolyfillMarks(timeOrigin?: number) {
+	const _data: [string?, number?] = [];
+	if (typeof timeOrigin === 'number') {
+		_data.push('code/timeOrigin', timeOrigin);
+	}
+
+	function mark(name: string) {
+		_data.push(name, Date.now());
+	}
+	function getMarks() {
+		const result = [];
+		for (let i = 0; i < _data.length; i += 2) {
+			result.push({
+				name: _data[i],
+				startTime: _data[i + 1],
+			});
+		}
+		return result;
+	}
+	return { mark, getMarks };
+}
+
+declare const process: INodeProcess;
+
+function _define() {
+
+	// Identify browser environment when following property is not present
+	// https://nodejs.org/dist/latest-v16.x/docs/api/perf_hooks.html#performancenodetiming
+	// @ts-ignore
+	if (typeof performance === 'object' && typeof performance.mark === 'function' && !performance.nodeTiming) {
+		// in a browser context, reuse performance-util
+
+		if (typeof performance.timeOrigin !== 'number' && !performance.timing) {
+			// safari & webworker: because there is no timeOrigin and no workaround
+			// we use the `Date.now`-based polyfill.
+			return _definePolyfillMarks();
+
+		} else {
+			// use "native" performance for mark and getMarks
+			return {
+				mark(name: string) {
+					performance.mark(name);
+				},
+				getMarks() {
+					let timeOrigin = performance.timeOrigin;
+					if (typeof timeOrigin !== 'number') {
+						// safari: there is no timerOrigin but in renderers there is the timing-property
+						// see https://bugs.webkit.org/show_bug.cgi?id=174862
+						timeOrigin = performance.timing.navigationStart || performance.timing.redirectStart || performance.timing.fetchStart;
+					}
+					const result = [{ name: 'code/timeOrigin', startTime: Math.round(timeOrigin) }];
+					for (const entry of performance.getEntriesByType('mark')) {
+						result.push({
+							name: entry.name,
+							startTime: Math.round(timeOrigin + entry.startTime)
+						});
+					}
+					return result;
+				}
+			};
+		}
+
+	} else if (typeof process === 'object') {
+		// node.js: use the normal polyfill but add the timeOrigin
+		// from the node perf_hooks API as very first mark
+		const timeOrigin = performance?.timeOrigin;
+		return _definePolyfillMarks(timeOrigin);
+
+	} else {
+		// unknown environment
+		console.trace('perf-util loaded in UNKNOWN environment');
+		return _definePolyfillMarks();
+	}
+}
+
+function _factory(sharedObj: any) {
+	if (!sharedObj.MonacoPerformanceMarks) {
+		sharedObj.MonacoPerformanceMarks = _define();
+	}
+	return sharedObj.MonacoPerformanceMarks;
+}
+
+const perf = _factory(globalThis);
+
+export const mark: (name: string) => void = perf.mark;
+
+export interface PerformanceMark {
+	readonly name: string;
+	readonly startTime: number;
+}
+
+/**
+ * Returns all marks, sorted by `startTime`.
+ */
+export const getMarks: () => PerformanceMark[] = perf.getMarks;
diff --git a/src/vs/base/common/platform.ts b/src/vs/base/common/platform.ts
index 2251c7db5ba..4bc8f61532b 100644
--- a/src/vs/base/common/platform.ts
+++ b/src/vs/base/common/platform.ts
@@ -2,7 +2,8 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import * as nls from 'vs/nls';
+
+import * as nls from '../../nls.js';
 
 export const LANGUAGE_DEFAULT = 'en';
 
@@ -22,13 +23,6 @@ let _platformLocale: string = LANGUAGE_DEFAULT;
 let _translationsConfigFile: string | undefined = undefined;
 let _userAgent: string | undefined = undefined;
 
-interface NLSConfig {
-	locale: string;
-	osLocale: string;
-	availableLanguages: { [key: string]: string };
-	_translationsConfigFile: string;
-}
-
 export interface IProcessEnvironment {
 	[key: string]: string | undefined;
 }
@@ -89,13 +83,11 @@ if (typeof nodeProcess === 'object') {
 	const rawNlsConfig = nodeProcess.env['VSCODE_NLS_CONFIG'];
 	if (rawNlsConfig) {
 		try {
-			const nlsConfig: NLSConfig = JSON.parse(rawNlsConfig);
-			const resolved = nlsConfig.availableLanguages['*'];
-			_locale = nlsConfig.locale;
+			const nlsConfig: nls.INLSConfiguration = JSON.parse(rawNlsConfig);
+			_locale = nlsConfig.userLocale;
 			_platformLocale = nlsConfig.osLocale;
-			// VSCode's default language is 'en'
-			_language = resolved ? resolved : LANGUAGE_DEFAULT;
-			_translationsConfigFile = nlsConfig._translationsConfigFile;
+			_language = nlsConfig.resolvedLanguage || LANGUAGE_DEFAULT;
+			_translationsConfigFile = nlsConfig.languagePack?.translationsConfigFile;
 		} catch (e) {
 		}
 	}
@@ -111,18 +103,9 @@ else if (typeof navigator === 'object' && !isElectronRenderer) {
 	_isLinux = _userAgent.indexOf('Linux') >= 0;
 	_isMobile = _userAgent?.indexOf('Mobi') >= 0;
 	_isWeb = true;
-
-	const configuredLocale = nls.getConfiguredDefaultLocale(
-		// This call _must_ be done in the file that calls `nls.getConfiguredDefaultLocale`
-		// to ensure that the NLS AMD Loader plugin has been loaded and configured.
-		// This is because the loader plugin decides what the default locale is based on
-		// how it's able to resolve the strings.
-		nls.localize({ key: 'ensureLoaderPluginIsLoaded', comment: ['{Locked}'] }, '_')
-	);
-
-	_locale = configuredLocale || LANGUAGE_DEFAULT;
-	_language = _locale;
-	_platformLocale = navigator.language;
+	_language = nls.getNLSLanguage() || LANGUAGE_DEFAULT;
+	_locale = navigator.language.toLowerCase();
+	_platformLocale = _locale;
 }
 
 // Unknown environment
@@ -178,7 +161,7 @@ export const userAgent = _userAgent;
 /**
  * The language used for the user interface. The format of
  * the string is all lower case (e.g. zh-tw for Traditional
- * Chinese)
+ * Chinese or de for German)
  */
 export const language = _language;
 
@@ -204,15 +187,16 @@ export namespace Language {
 }
 
 /**
- * The OS locale or the locale specified by --locale. The format of
- * the string is all lower case (e.g. zh-tw for Traditional
- * Chinese). The UI is not necessarily shown in the provided locale.
+ * Desktop: The OS locale or the locale specified by --locale or `argv.json`.
+ * Web: matches `platformLocale`.
+ *
+ * The UI is not necessarily shown in the provided locale.
  */
 export const locale = _locale;
 
 /**
  * This will always be set to the OS/browser's locale regardless of
- * what was specified by --locale. The format of the string is all
+ * what was specified otherwise. The format of the string is all
  * lower case (e.g. zh-tw for Traditional Chinese). The UI is not
  * necessarily shown in the provided locale.
  */
diff --git a/src/vs/base/common/prefixTree.ts b/src/vs/base/common/prefixTree.ts
index 8e839e2b4ff..7d13664b73b 100644
--- a/src/vs/base/common/prefixTree.ts
+++ b/src/vs/base/common/prefixTree.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Iterable } from 'vs/base/common/iterator';
+import { Iterable } from './iterator.js';
 
 const unset = Symbol('unset');
 
@@ -32,6 +32,11 @@ export class WellDefinedPrefixTree<V> {
 		return this.root.children?.values() || Iterable.empty();
 	}
 
+	/** Gets the top-level nodes of the tree */
+	public get entries(): Iterable<[string, IPrefixTreeNode<V>]> {
+		return this.root.children?.entries() || Iterable.empty();
+	}
+
 	/**
 	 * Inserts a new value in the prefix tree.
 	 * @param onNode - called for each node as we descend to the insertion point,
diff --git a/src/vs/base/common/process.ts b/src/vs/base/common/process.ts
index 48fcd8acb43..af67fda5669 100644
--- a/src/vs/base/common/process.ts
+++ b/src/vs/base/common/process.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { INodeProcess, isMacintosh, isWindows } from 'vs/base/common/platform';
+import { INodeProcess, isMacintosh, isWindows } from './platform.js';
 
 let safeProcess: Omit<INodeProcess, 'arch'> & { arch: string | undefined };
 declare const process: INodeProcess;
@@ -21,7 +21,7 @@ if (typeof vscodeGlobal !== 'undefined' && typeof vscodeGlobal.process !== 'unde
 }
 
 // Native node.js environment
-else if (typeof process !== 'undefined') {
+else if (typeof process !== 'undefined' && typeof process?.versions?.node === 'string') {
 	safeProcess = {
 		get platform() { return process.platform; },
 		get arch() { return process.arch; },
diff --git a/src/vs/base/common/processes.ts b/src/vs/base/common/processes.ts
index 417c4ba1168..2eea4cf091a 100644
--- a/src/vs/base/common/processes.ts
+++ b/src/vs/base/common/processes.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IProcessEnvironment, isLinux, isMacintosh } from 'vs/base/common/platform';
+import { IProcessEnvironment, isLinux } from './platform.js';
 
 /**
  * Options to be passed to the external program or shell.
@@ -140,13 +140,6 @@ export function removeDangerousEnvVariables(env: IProcessEnvironment | undefined
 	// See https://github.com/microsoft/vscode/issues/130072
 	delete env['DEBUG'];
 
-	if (isMacintosh) {
-		// Unset `DYLD_LIBRARY_PATH`, as it leads to process crashes
-		// See https://github.com/microsoft/vscode/issues/104525
-		// See https://github.com/microsoft/vscode/issues/105848
-		delete env['DYLD_LIBRARY_PATH'];
-	}
-
 	if (isLinux) {
 		// Unset `LD_PRELOAD`, as it might lead to process crashes
 		// See https://github.com/microsoft/vscode/issues/134177
diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
index c6e335aa3e7..1f58ce0fee8 100644
--- a/src/vs/base/common/product.ts
+++ b/src/vs/base/common/product.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IStringDictionary } from 'vs/base/common/collections';
-import { PlatformName } from 'vs/base/common/platform';
+import { IStringDictionary } from './collections.js';
+import { PlatformName } from './platform.js';
 
 export interface IBuiltInExtension {
 	readonly name: string;
@@ -82,6 +82,7 @@ export interface IProductConfiguration {
 	readonly webEndpointUrlTemplate?: string;
 	readonly webviewContentExternalBaseUrlTemplate?: string;
 	readonly target?: string;
+	readonly nlsCoreBaseUrl?: string;
 
 	readonly settingsSearchBuildId?: number;
 	readonly settingsSearchUrl?: string;
@@ -114,6 +115,7 @@ export interface IProductConfiguration {
 	readonly languageExtensionTips?: readonly string[];
 	readonly trustedExtensionUrlPublicKeys?: IStringDictionary<string[]>;
 	readonly trustedExtensionAuthAccess?: string[] | IStringDictionary<string[]>;
+	readonly inheritAuthAccountPreference?: IStringDictionary<string[]>;
 	readonly trustedExtensionProtocolHandlers?: readonly string[];
 
 	readonly commandPaletteSuggestedCommandIds?: string[];
@@ -159,7 +161,6 @@ export interface IProductConfiguration {
 	readonly tunnelApplicationConfig?: ITunnelApplicationConfig;
 
 	readonly npsSurveyUrl?: string;
-	readonly cesSurveyUrl?: string;
 	readonly surveys?: readonly ISurveyData[];
 
 	readonly checksums?: { [path: string]: string };
@@ -173,6 +174,7 @@ export interface IProductConfiguration {
 	readonly extensionPointExtensionKind?: { readonly [extensionPointId: string]: ('ui' | 'workspace' | 'web')[] };
 	readonly extensionSyncedKeys?: { readonly [extensionId: string]: string[] };
 
+	readonly extensionsEnabledWithApiProposalVersion?: string[];
 	readonly extensionEnabledApiProposals?: { readonly [extensionId: string]: string[] };
 	readonly extensionUntrustedWorkspaceSupport?: { readonly [extensionId: string]: ExtensionUntrustedWorkspaceSupport };
 	readonly extensionVirtualWorkspacesSupport?: { readonly [extensionId: string]: ExtensionVirtualWorkspaceSupport };
@@ -189,8 +191,9 @@ export interface IProductConfiguration {
 	readonly commonlyUsedSettings?: string[];
 	readonly aiGeneratedWorkspaceTrust?: IAiGeneratedWorkspaceTrust;
 	readonly gitHubEntitlement?: IGitHubEntitlement;
-	readonly chatWelcomeView?: IChatWelcomeView;
 	readonly chatParticipantRegistry?: string;
+
+	readonly emergencyAlertUrl?: string;
 }
 
 export interface ITunnelApplicationConfig {
@@ -206,6 +209,7 @@ export interface IExtensionRecommendations {
 
 export interface ISettingsEditorOpenCondition {
 	readonly prerelease?: boolean | string;
+	readonly descriptionOverride?: string;
 }
 
 export interface IExtensionRecommendationCondition {
@@ -304,9 +308,3 @@ export interface IGitHubEntitlement {
 	confirmationMessage: string;
 	confirmationAction: string;
 }
-
-export interface IChatWelcomeView {
-	welcomeViewId: string;
-	welcomeViewTitle: string;
-	welcomeViewContent: string;
-}
diff --git a/src/vs/base/common/resourceTree.ts b/src/vs/base/common/resourceTree.ts
index 7d44171c1b1..44cb55a065e 100644
--- a/src/vs/base/common/resourceTree.ts
+++ b/src/vs/base/common/resourceTree.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { memoize } from 'vs/base/common/decorators';
-import { PathIterator } from 'vs/base/common/ternarySearchTree';
-import * as paths from 'vs/base/common/path';
-import { extUri as defaultExtUri, IExtUri } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
+import { memoize } from './decorators.js';
+import { PathIterator } from './ternarySearchTree.js';
+import * as paths from './path.js';
+import { extUri as defaultExtUri, IExtUri } from './resources.js';
+import { URI } from './uri.js';
 
 export interface IResourceNode<T, C = void> {
 	readonly uri: URI;
diff --git a/src/vs/base/common/resources.ts b/src/vs/base/common/resources.ts
index ee48280997a..3b8370c160b 100644
--- a/src/vs/base/common/resources.ts
+++ b/src/vs/base/common/resources.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
-import * as extpath from 'vs/base/common/extpath';
-import { Schemas } from 'vs/base/common/network';
-import * as paths from 'vs/base/common/path';
-import { isLinux, isWindows } from 'vs/base/common/platform';
-import { compare as strCompare, equalsIgnoreCase } from 'vs/base/common/strings';
-import { URI, uriToFsPath } from 'vs/base/common/uri';
+import { CharCode } from './charCode.js';
+import * as extpath from './extpath.js';
+import { Schemas } from './network.js';
+import * as paths from './path.js';
+import { isLinux, isWindows } from './platform.js';
+import { compare as strCompare, equalsIgnoreCase } from './strings.js';
+import { URI, uriToFsPath } from './uri.js';
 
 export function originalFSPath(uri: URI): string {
 	return uriToFsPath(uri, true);
diff --git a/src/vs/base/common/scrollable.ts b/src/vs/base/common/scrollable.ts
index 4d1360c5860..5fe2c189a5e 100644
--- a/src/vs/base/common/scrollable.ts
+++ b/src/vs/base/common/scrollable.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
+import { Emitter, Event } from './event.js';
+import { Disposable, IDisposable } from './lifecycle.js';
 
 export const enum ScrollbarVisibility {
 	Auto = 1,
diff --git a/src/vs/base/common/search.ts b/src/vs/base/common/search.ts
index 24c5bf79296..3d036494cc2 100644
--- a/src/vs/base/common/search.ts
+++ b/src/vs/base/common/search.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as strings from './strings';
+import * as strings from './strings.js';
 
 export function buildReplaceStringWithCasePreserved(matches: string[] | null, pattern: string): string {
 	if (matches && (matches[0] !== '')) {
diff --git a/src/vs/base/common/semver/semver.d.ts b/src/vs/base/common/semver/semver.d.ts
index 61a55bac94f..93f47f94fff 100644
--- a/src/vs/base/common/semver/semver.d.ts
+++ b/src/vs/base/common/semver/semver.d.ts
@@ -3,9 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-export as namespace semver;
-
-export = semver;
+export * from 'semver'
 
 declare namespace semver {
 
diff --git a/src/vs/base/common/semver/semver.js b/src/vs/base/common/semver/semver.js
index 3eacfb1975f..78b83bc0545 100644
--- a/src/vs/base/common/semver/semver.js
+++ b/src/vs/base/common/semver/semver.js
@@ -8,4 +8,45 @@
  * DO NOT EDIT THIS FILE
  */
 
+const exports = {};
+const module = { exports };
+
 !function(e,r){if("object"==typeof exports&&"object"==typeof module)module.exports=r();else if("function"==typeof define&&define.amd)define([],r);else{var t=r();for(var n in t)("object"==typeof exports?exports:e)[n]=t[n]}}("undefined"!=typeof self?self:this,(function(){return function(e){var r={};function t(n){if(r[n])return r[n].exports;var o=r[n]={i:n,l:!1,exports:{}};return e[n].call(o.exports,o,o.exports,t),o.l=!0,o.exports}return t.m=e,t.c=r,t.d=function(e,r,n){t.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:n})},t.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.t=function(e,r){if(1&r&&(e=t(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(t.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var o in e)t.d(n,o,function(r){return e[r]}.bind(null,o));return n},t.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(r,"a",r),r},t.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},t.p="",t(t.s=0)}([function(e,r,t){(function(t){var n;r=e.exports=H,n="object"==typeof t&&t.env&&t.env.NODE_DEBUG&&/\bsemver\b/i.test(t.env.NODE_DEBUG)?function(){var e=Array.prototype.slice.call(arguments,0);e.unshift("SEMVER"),console.log.apply(console,e)}:function(){},r.SEMVER_SPEC_VERSION="2.0.0";var o=256,i=Number.MAX_SAFE_INTEGER||9007199254740991,s=r.re=[],a=r.src=[],u=0,c=u++;a[c]="0|[1-9]\\d*";var p=u++;a[p]="[0-9]+";var f=u++;a[f]="\\d*[a-zA-Z-][a-zA-Z0-9-]*";var l=u++;a[l]="("+a[c]+")\\.("+a[c]+")\\.("+a[c]+")";var h=u++;a[h]="("+a[p]+")\\.("+a[p]+")\\.("+a[p]+")";var v=u++;a[v]="(?:"+a[c]+"|"+a[f]+")";var m=u++;a[m]="(?:"+a[p]+"|"+a[f]+")";var w=u++;a[w]="(?:-("+a[v]+"(?:\\."+a[v]+")*))";var g=u++;a[g]="(?:-?("+a[m]+"(?:\\."+a[m]+")*))";var y=u++;a[y]="[0-9A-Za-z-]+";var d=u++;a[d]="(?:\\+("+a[y]+"(?:\\."+a[y]+")*))";var b=u++,j="v?"+a[l]+a[w]+"?"+a[d]+"?";a[b]="^"+j+"$";var E="[v=\\s]*"+a[h]+a[g]+"?"+a[d]+"?",T=u++;a[T]="^"+E+"$";var x=u++;a[x]="((?:<|>)?=?)";var $=u++;a[$]=a[p]+"|x|X|\\*";var k=u++;a[k]=a[c]+"|x|X|\\*";var S=u++;a[S]="[v=\\s]*("+a[k]+")(?:\\.("+a[k]+")(?:\\.("+a[k]+")(?:"+a[w]+")?"+a[d]+"?)?)?";var R=u++;a[R]="[v=\\s]*("+a[$]+")(?:\\.("+a[$]+")(?:\\.("+a[$]+")(?:"+a[g]+")?"+a[d]+"?)?)?";var I=u++;a[I]="^"+a[x]+"\\s*"+a[S]+"$";var _=u++;a[_]="^"+a[x]+"\\s*"+a[R]+"$";var O=u++;a[O]="(?:^|[^\\d])(\\d{1,16})(?:\\.(\\d{1,16}))?(?:\\.(\\d{1,16}))?(?:$|[^\\d])";var A=u++;a[A]="(?:~>?)";var M=u++;a[M]="(\\s*)"+a[A]+"\\s+",s[M]=new RegExp(a[M],"g");var V=u++;a[V]="^"+a[A]+a[S]+"$";var P=u++;a[P]="^"+a[A]+a[R]+"$";var C=u++;a[C]="(?:\\^)";var L=u++;a[L]="(\\s*)"+a[C]+"\\s+",s[L]=new RegExp(a[L],"g");var N=u++;a[N]="^"+a[C]+a[S]+"$";var q=u++;a[q]="^"+a[C]+a[R]+"$";var D=u++;a[D]="^"+a[x]+"\\s*("+E+")$|^$";var X=u++;a[X]="^"+a[x]+"\\s*("+j+")$|^$";var z=u++;a[z]="(\\s*)"+a[x]+"\\s*("+E+"|"+a[S]+")",s[z]=new RegExp(a[z],"g");var G=u++;a[G]="^\\s*("+a[S]+")\\s+-\\s+("+a[S]+")\\s*$";var Z=u++;a[Z]="^\\s*("+a[R]+")\\s+-\\s+("+a[R]+")\\s*$";var B=u++;a[B]="(<|>)?=?\\s*\\*";for(var U=0;U<35;U++)n(U,a[U]),s[U]||(s[U]=new RegExp(a[U]));function F(e,r){if(e instanceof H)return e;if("string"!=typeof e)return null;if(e.length>o)return null;if(!(r?s[T]:s[b]).test(e))return null;try{return new H(e,r)}catch(e){return null}}function H(e,r){if(e instanceof H){if(e.loose===r)return e;e=e.version}else if("string"!=typeof e)throw new TypeError("Invalid Version: "+e);if(e.length>o)throw new TypeError("version is longer than "+o+" characters");if(!(this instanceof H))return new H(e,r);n("SemVer",e,r),this.loose=r;var t=e.trim().match(r?s[T]:s[b]);if(!t)throw new TypeError("Invalid Version: "+e);if(this.raw=e,this.major=+t[1],this.minor=+t[2],this.patch=+t[3],this.major>i||this.major<0)throw new TypeError("Invalid major version");if(this.minor>i||this.minor<0)throw new TypeError("Invalid minor version");if(this.patch>i||this.patch<0)throw new TypeError("Invalid patch version");t[4]?this.prerelease=t[4].split(".").map((function(e){if(/^[0-9]+$/.test(e)){var r=+e;if(r>=0&&r<i)return r}return e})):this.prerelease=[],this.build=t[5]?t[5].split("."):[],this.format()}r.parse=F,r.valid=function(e,r){var t=F(e,r);return t?t.version:null},r.clean=function(e,r){var t=F(e.trim().replace(/^[=v]+/,""),r);return t?t.version:null},r.SemVer=H,H.prototype.format=function(){return this.version=this.major+"."+this.minor+"."+this.patch,this.prerelease.length&&(this.version+="-"+this.prerelease.join(".")),this.version},H.prototype.toString=function(){return this.version},H.prototype.compare=function(e){return n("SemVer.compare",this.version,this.loose,e),e instanceof H||(e=new H(e,this.loose)),this.compareMain(e)||this.comparePre(e)},H.prototype.compareMain=function(e){return e instanceof H||(e=new H(e,this.loose)),K(this.major,e.major)||K(this.minor,e.minor)||K(this.patch,e.patch)},H.prototype.comparePre=function(e){if(e instanceof H||(e=new H(e,this.loose)),this.prerelease.length&&!e.prerelease.length)return-1;if(!this.prerelease.length&&e.prerelease.length)return 1;if(!this.prerelease.length&&!e.prerelease.length)return 0;var r=0;do{var t=this.prerelease[r],o=e.prerelease[r];if(n("prerelease compare",r,t,o),void 0===t&&void 0===o)return 0;if(void 0===o)return 1;if(void 0===t)return-1;if(t!==o)return K(t,o)}while(++r)},H.prototype.inc=function(e,r){switch(e){case"premajor":this.prerelease.length=0,this.patch=0,this.minor=0,this.major++,this.inc("pre",r);break;case"preminor":this.prerelease.length=0,this.patch=0,this.minor++,this.inc("pre",r);break;case"prepatch":this.prerelease.length=0,this.inc("patch",r),this.inc("pre",r);break;case"prerelease":0===this.prerelease.length&&this.inc("patch",r),this.inc("pre",r);break;case"major":0===this.minor&&0===this.patch&&0!==this.prerelease.length||this.major++,this.minor=0,this.patch=0,this.prerelease=[];break;case"minor":0===this.patch&&0!==this.prerelease.length||this.minor++,this.patch=0,this.prerelease=[];break;case"patch":0===this.prerelease.length&&this.patch++,this.prerelease=[];break;case"pre":if(0===this.prerelease.length)this.prerelease=[0];else{for(var t=this.prerelease.length;--t>=0;)"number"==typeof this.prerelease[t]&&(this.prerelease[t]++,t=-2);-1===t&&this.prerelease.push(0)}r&&(this.prerelease[0]===r?isNaN(this.prerelease[1])&&(this.prerelease=[r,0]):this.prerelease=[r,0]);break;default:throw new Error("invalid increment argument: "+e)}return this.format(),this.raw=this.version,this},r.inc=function(e,r,t,n){"string"==typeof t&&(n=t,t=void 0);try{return new H(e,t).inc(r,n).version}catch(e){return null}},r.diff=function(e,r){if(ee(e,r))return null;var t=F(e),n=F(r);if(t.prerelease.length||n.prerelease.length){for(var o in t)if(("major"===o||"minor"===o||"patch"===o)&&t[o]!==n[o])return"pre"+o;return"prerelease"}for(var o in t)if(("major"===o||"minor"===o||"patch"===o)&&t[o]!==n[o])return o},r.compareIdentifiers=K;var J=/^[0-9]+$/;function K(e,r){var t=J.test(e),n=J.test(r);return t&&n&&(e=+e,r=+r),t&&!n?-1:n&&!t?1:e<r?-1:e>r?1:0}function Q(e,r,t){return new H(e,t).compare(new H(r,t))}function W(e,r,t){return Q(e,r,t)>0}function Y(e,r,t){return Q(e,r,t)<0}function ee(e,r,t){return 0===Q(e,r,t)}function re(e,r,t){return 0!==Q(e,r,t)}function te(e,r,t){return Q(e,r,t)>=0}function ne(e,r,t){return Q(e,r,t)<=0}function oe(e,r,t,n){var o;switch(r){case"===":"object"==typeof e&&(e=e.version),"object"==typeof t&&(t=t.version),o=e===t;break;case"!==":"object"==typeof e&&(e=e.version),"object"==typeof t&&(t=t.version),o=e!==t;break;case"":case"=":case"==":o=ee(e,t,n);break;case"!=":o=re(e,t,n);break;case">":o=W(e,t,n);break;case">=":o=te(e,t,n);break;case"<":o=Y(e,t,n);break;case"<=":o=ne(e,t,n);break;default:throw new TypeError("Invalid operator: "+r)}return o}function ie(e,r){if(e instanceof ie){if(e.loose===r)return e;e=e.value}if(!(this instanceof ie))return new ie(e,r);n("comparator",e,r),this.loose=r,this.parse(e),this.semver===se?this.value="":this.value=this.operator+this.semver.version,n("comp",this)}r.rcompareIdentifiers=function(e,r){return K(r,e)},r.major=function(e,r){return new H(e,r).major},r.minor=function(e,r){return new H(e,r).minor},r.patch=function(e,r){return new H(e,r).patch},r.compare=Q,r.compareLoose=function(e,r){return Q(e,r,!0)},r.rcompare=function(e,r,t){return Q(r,e,t)},r.sort=function(e,t){return e.sort((function(e,n){return r.compare(e,n,t)}))},r.rsort=function(e,t){return e.sort((function(e,n){return r.rcompare(e,n,t)}))},r.gt=W,r.lt=Y,r.eq=ee,r.neq=re,r.gte=te,r.lte=ne,r.cmp=oe,r.Comparator=ie;var se={};function ae(e,r){if(e instanceof ae)return e.loose===r?e:new ae(e.raw,r);if(e instanceof ie)return new ae(e.value,r);if(!(this instanceof ae))return new ae(e,r);if(this.loose=r,this.raw=e,this.set=e.split(/\s*\|\|\s*/).map((function(e){return this.parseRange(e.trim())}),this).filter((function(e){return e.length})),!this.set.length)throw new TypeError("Invalid SemVer Range: "+e);this.format()}function ue(e){return!e||"x"===e.toLowerCase()||"*"===e}function ce(e,r,t,n,o,i,s,a,u,c,p,f,l){return((r=ue(t)?"":ue(n)?">="+t+".0.0":ue(o)?">="+t+"."+n+".0":">="+r)+" "+(a=ue(u)?"":ue(c)?"<"+(+u+1)+".0.0":ue(p)?"<"+u+"."+(+c+1)+".0":f?"<="+u+"."+c+"."+p+"-"+f:"<="+a)).trim()}function pe(e,r){for(var t=0;t<e.length;t++)if(!e[t].test(r))return!1;if(r.prerelease.length){for(t=0;t<e.length;t++)if(n(e[t].semver),e[t].semver!==se&&e[t].semver.prerelease.length>0){var o=e[t].semver;if(o.major===r.major&&o.minor===r.minor&&o.patch===r.patch)return!0}return!1}return!0}function fe(e,r,t){try{r=new ae(r,t)}catch(e){return!1}return r.test(e)}function le(e,r,t,n){var o,i,s,a,u;switch(e=new H(e,n),r=new ae(r,n),t){case">":o=W,i=ne,s=Y,a=">",u=">=";break;case"<":o=Y,i=te,s=W,a="<",u="<=";break;default:throw new TypeError('Must provide a hilo val of "<" or ">"')}if(fe(e,r,n))return!1;for(var c=0;c<r.set.length;++c){var p=r.set[c],f=null,l=null;if(p.forEach((function(e){e.semver===se&&(e=new ie(">=0.0.0")),f=f||e,l=l||e,o(e.semver,f.semver,n)?f=e:s(e.semver,l.semver,n)&&(l=e)})),f.operator===a||f.operator===u)return!1;if((!l.operator||l.operator===a)&&i(e,l.semver))return!1;if(l.operator===u&&s(e,l.semver))return!1}return!0}ie.prototype.parse=function(e){var r=this.loose?s[D]:s[X],t=e.match(r);if(!t)throw new TypeError("Invalid comparator: "+e);this.operator=t[1],"="===this.operator&&(this.operator=""),t[2]?this.semver=new H(t[2],this.loose):this.semver=se},ie.prototype.toString=function(){return this.value},ie.prototype.test=function(e){return n("Comparator.test",e,this.loose),this.semver===se||("string"==typeof e&&(e=new H(e,this.loose)),oe(e,this.operator,this.semver,this.loose))},ie.prototype.intersects=function(e,r){if(!(e instanceof ie))throw new TypeError("a Comparator is required");var t;if(""===this.operator)return t=new ae(e.value,r),fe(this.value,t,r);if(""===e.operator)return t=new ae(this.value,r),fe(e.semver,t,r);var n=!(">="!==this.operator&&">"!==this.operator||">="!==e.operator&&">"!==e.operator),o=!("<="!==this.operator&&"<"!==this.operator||"<="!==e.operator&&"<"!==e.operator),i=this.semver.version===e.semver.version,s=!(">="!==this.operator&&"<="!==this.operator||">="!==e.operator&&"<="!==e.operator),a=oe(this.semver,"<",e.semver,r)&&(">="===this.operator||">"===this.operator)&&("<="===e.operator||"<"===e.operator),u=oe(this.semver,">",e.semver,r)&&("<="===this.operator||"<"===this.operator)&&(">="===e.operator||">"===e.operator);return n||o||i&&s||a||u},r.Range=ae,ae.prototype.format=function(){return this.range=this.set.map((function(e){return e.join(" ").trim()})).join("||").trim(),this.range},ae.prototype.toString=function(){return this.range},ae.prototype.parseRange=function(e){var r=this.loose;e=e.trim(),n("range",e,r);var t=r?s[Z]:s[G];e=e.replace(t,ce),n("hyphen replace",e),e=e.replace(s[z],"$1$2$3"),n("comparator trim",e,s[z]),e=(e=(e=e.replace(s[M],"$1~")).replace(s[L],"$1^")).split(/\s+/).join(" ");var o=r?s[D]:s[X],i=e.split(" ").map((function(e){return function(e,r){return n("comp",e),e=function(e,r){return e.trim().split(/\s+/).map((function(e){return function(e,r){n("caret",e,r);var t=r?s[q]:s[N];return e.replace(t,(function(r,t,o,i,s){var a;return n("caret",e,r,t,o,i,s),ue(t)?a="":ue(o)?a=">="+t+".0.0 <"+(+t+1)+".0.0":ue(i)?a="0"===t?">="+t+"."+o+".0 <"+t+"."+(+o+1)+".0":">="+t+"."+o+".0 <"+(+t+1)+".0.0":s?(n("replaceCaret pr",s),"-"!==s.charAt(0)&&(s="-"+s),a="0"===t?"0"===o?">="+t+"."+o+"."+i+s+" <"+t+"."+o+"."+(+i+1):">="+t+"."+o+"."+i+s+" <"+t+"."+(+o+1)+".0":">="+t+"."+o+"."+i+s+" <"+(+t+1)+".0.0"):(n("no pr"),a="0"===t?"0"===o?">="+t+"."+o+"."+i+" <"+t+"."+o+"."+(+i+1):">="+t+"."+o+"."+i+" <"+t+"."+(+o+1)+".0":">="+t+"."+o+"."+i+" <"+(+t+1)+".0.0"),n("caret return",a),a}))}(e,r)})).join(" ")}(e,r),n("caret",e),e=function(e,r){return e.trim().split(/\s+/).map((function(e){return function(e,r){var t=r?s[P]:s[V];return e.replace(t,(function(r,t,o,i,s){var a;return n("tilde",e,r,t,o,i,s),ue(t)?a="":ue(o)?a=">="+t+".0.0 <"+(+t+1)+".0.0":ue(i)?a=">="+t+"."+o+".0 <"+t+"."+(+o+1)+".0":s?(n("replaceTilde pr",s),"-"!==s.charAt(0)&&(s="-"+s),a=">="+t+"."+o+"."+i+s+" <"+t+"."+(+o+1)+".0"):a=">="+t+"."+o+"."+i+" <"+t+"."+(+o+1)+".0",n("tilde return",a),a}))}(e,r)})).join(" ")}(e,r),n("tildes",e),e=function(e,r){return n("replaceXRanges",e,r),e.split(/\s+/).map((function(e){return function(e,r){e=e.trim();var t=r?s[_]:s[I];return e.replace(t,(function(r,t,o,i,s,a){n("xRange",e,r,t,o,i,s,a);var u=ue(o),c=u||ue(i),p=c||ue(s);return"="===t&&p&&(t=""),u?r=">"===t||"<"===t?"<0.0.0":"*":t&&p?(c&&(i=0),p&&(s=0),">"===t?(t=">=",c?(o=+o+1,i=0,s=0):p&&(i=+i+1,s=0)):"<="===t&&(t="<",c?o=+o+1:i=+i+1),r=t+o+"."+i+"."+s):c?r=">="+o+".0.0 <"+(+o+1)+".0.0":p&&(r=">="+o+"."+i+".0 <"+o+"."+(+i+1)+".0"),n("xRange return",r),r}))}(e,r)})).join(" ")}(e,r),n("xrange",e),e=function(e,r){return n("replaceStars",e,r),e.trim().replace(s[B],"")}(e,r),n("stars",e),e}(e,r)})).join(" ").split(/\s+/);return this.loose&&(i=i.filter((function(e){return!!e.match(o)}))),i=i.map((function(e){return new ie(e,r)}))},ae.prototype.intersects=function(e,r){if(!(e instanceof ae))throw new TypeError("a Range is required");return this.set.some((function(t){return t.every((function(t){return e.set.some((function(e){return e.every((function(e){return t.intersects(e,r)}))}))}))}))},r.toComparators=function(e,r){return new ae(e,r).set.map((function(e){return e.map((function(e){return e.value})).join(" ").trim().split(" ")}))},ae.prototype.test=function(e){if(!e)return!1;"string"==typeof e&&(e=new H(e,this.loose));for(var r=0;r<this.set.length;r++)if(pe(this.set[r],e))return!0;return!1},r.satisfies=fe,r.maxSatisfying=function(e,r,t){var n=null,o=null;try{var i=new ae(r,t)}catch(e){return null}return e.forEach((function(e){i.test(e)&&(n&&-1!==o.compare(e)||(o=new H(n=e,t)))})),n},r.minSatisfying=function(e,r,t){var n=null,o=null;try{var i=new ae(r,t)}catch(e){return null}return e.forEach((function(e){i.test(e)&&(n&&1!==o.compare(e)||(o=new H(n=e,t)))})),n},r.validRange=function(e,r){try{return new ae(e,r).range||"*"}catch(e){return null}},r.ltr=function(e,r,t){return le(e,r,"<",t)},r.gtr=function(e,r,t){return le(e,r,">",t)},r.outside=le,r.prerelease=function(e,r){var t=F(e,r);return t&&t.prerelease.length?t.prerelease:null},r.intersects=function(e,r,t){return e=new ae(e,t),r=new ae(r,t),e.intersects(r)},r.coerce=function(e){if(e instanceof H)return e;if("string"!=typeof e)return null;var r=e.match(s[O]);return null==r?null:F((r[1]||"0")+"."+(r[2]||"0")+"."+(r[3]||"0"))}}).call(this,t(1))},function(e,r){var t,n,o=e.exports={};function i(){throw new Error("setTimeout has not been defined")}function s(){throw new Error("clearTimeout has not been defined")}function a(e){if(t===setTimeout)return setTimeout(e,0);if((t===i||!t)&&setTimeout)return t=setTimeout,setTimeout(e,0);try{return t(e,0)}catch(r){try{return t.call(null,e,0)}catch(r){return t.call(this,e,0)}}}!function(){try{t="function"==typeof setTimeout?setTimeout:i}catch(e){t=i}try{n="function"==typeof clearTimeout?clearTimeout:s}catch(e){n=s}}();var u,c=[],p=!1,f=-1;function l(){p&&u&&(p=!1,u.length?c=u.concat(c):f=-1,c.length&&h())}function h(){if(!p){var e=a(l);p=!0;for(var r=c.length;r;){for(u=c,c=[];++f<r;)u&&u[f].run();f=-1,r=c.length}u=null,p=!1,function(e){if(n===clearTimeout)return clearTimeout(e);if((n===s||!n)&&clearTimeout)return n=clearTimeout,clearTimeout(e);try{n(e)}catch(r){try{return n.call(null,e)}catch(r){return n.call(this,e)}}}(e)}}function v(e,r){this.fun=e,this.array=r}function m(){}o.nextTick=function(e){var r=new Array(arguments.length-1);if(arguments.length>1)for(var t=1;t<arguments.length;t++)r[t-1]=arguments[t];c.push(new v(e,r)),1!==c.length||p||a(h)},v.prototype.run=function(){this.fun.apply(null,this.array)},o.title="browser",o.browser=!0,o.env={},o.argv=[],o.version="",o.versions={},o.on=m,o.addListener=m,o.once=m,o.off=m,o.removeListener=m,o.removeAllListeners=m,o.emit=m,o.prependListener=m,o.prependOnceListener=m,o.listeners=function(e){return[]},o.binding=function(e){throw new Error("process.binding is not supported")},o.cwd=function(){return"/"},o.chdir=function(e){throw new Error("process.chdir is not supported")},o.umask=function(){return 0}}])}));
+
+export const SEMVER_SPEC_VERSION = module.exports.SEMVER_SPEC_VERSION;
+export const parse = module.exports.parse;
+export const valid = module.exports.valid;
+export const coerce = module.exports.coerce;
+export const clean = module.exports.clean;
+export const inc = module.exports.inc;
+export const major = module.exports.major;
+export const minor = module.exports.minor;
+export const patch = module.exports.patch;
+export const prerelease = module.exports.prerelease;
+export const gt = module.exports.gt;
+export const gte = module.exports.gte;
+export const lt = module.exports.lt;
+export const lte = module.exports.lte;
+export const eq = module.exports.eq;
+export const neq = module.exports.neq;
+export const cmp = module.exports.cmp;
+export const compare = module.exports.compare;
+export const rcompare = module.exports.rcompare;
+export const compareIdentifiers = module.exports.compareIdentifiers;
+export const rcompareIdentifiers = module.exports.rcompareIdentifiers;
+export const compareBuild = module.exports.compareBuild;
+export const sort = module.exports.sort;
+export const rsort = module.exports.rsort;
+export const diff = module.exports.diff;
+export const validRange = module.exports.validRange;
+export const satisfies = module.exports.satisfies;
+export const maxSatisfying = module.exports.maxSatisfying;
+export const minSatisfying = module.exports.minSatisfying;
+export const minVersion = module.exports.minVersion;
+export const gtr = module.exports.gtr;
+export const ltr = module.exports.ltr;
+export const outside = module.exports.outside;
+export const intersects = module.exports.intersects;
+export const SemVer = module.exports.SemVer;
+export const Comparator = module.exports.Comparator;
+export const Range = module.exports.Range;
diff --git a/src/vs/base/common/sequence.ts b/src/vs/base/common/sequence.ts
index b68bc7cdc8b..4e02d7fb6f8 100644
--- a/src/vs/base/common/sequence.ts
+++ b/src/vs/base/common/sequence.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
+import { Emitter, Event } from './event.js';
 
 export interface ISplice<T> {
 	readonly start: number;
diff --git a/src/vs/base/common/severity.ts b/src/vs/base/common/severity.ts
index 83e753d8cf2..d56cd728134 100644
--- a/src/vs/base/common/severity.ts
+++ b/src/vs/base/common/severity.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as strings from 'vs/base/common/strings';
+import * as strings from './strings.js';
 
 enum Severity {
 	Ignore = 0,
diff --git a/src/vs/base/common/stream.ts b/src/vs/base/common/stream.ts
index d6cd674b1de..7d990dfcab8 100644
--- a/src/vs/base/common/stream.ts
+++ b/src/vs/base/common/stream.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
+import { CancellationToken } from './cancellation.js';
+import { onUnexpectedError } from './errors.js';
+import { DisposableStore, toDisposable } from './lifecycle.js';
 
 /**
  * The payload that flows in readable stream events.
diff --git a/src/vs/base/common/strings.ts b/src/vs/base/common/strings.ts
index 70bded5a67d..a9b4486cdec 100644
--- a/src/vs/base/common/strings.ts
+++ b/src/vs/base/common/strings.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { LRUCachedFunction } from 'vs/base/common/cache';
-import { CharCode } from 'vs/base/common/charCode';
-import { Lazy } from 'vs/base/common/lazy';
-import { Constants } from 'vs/base/common/uint';
+import { LRUCachedFunction } from './cache.js';
+import { CharCode } from './charCode.js';
+import { Lazy } from './lazy.js';
+import { Constants } from './uint.js';
 
 export function isFalsyOrWhitespace(str: string | undefined): boolean {
 	if (!str || typeof str !== 'string') {
@@ -304,6 +304,12 @@ export function lastNonWhitespaceIndex(str: string, startIndex: number = str.len
 	return -1;
 }
 
+export function getIndentationLength(str: string): number {
+	const idx = firstNonWhitespaceIndex(str);
+	if (idx === -1) { return str.length; }
+	return idx;
+}
+
 /**
  * Function that works identically to String.prototype.replace, except, the
  * replace function is allowed to be async and return a Promise.
diff --git a/src/vs/base/common/stripComments.d.ts b/src/vs/base/common/stripComments.d.ts
deleted file mode 100644
index af5b182b5bf..00000000000
--- a/src/vs/base/common/stripComments.d.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-/**
- * Strips single and multi line JavaScript comments from JSON
- * content. Ignores characters in strings BUT doesn't support
- * string continuation across multiple lines since it is not
- * supported in JSON.
- * @param content the content to strip comments from
- * @returns the content without comments
-*/
-export function stripComments(content: string): string;
diff --git a/src/vs/base/common/stripComments.js b/src/vs/base/common/stripComments.js
deleted file mode 100644
index c59205e14ab..00000000000
--- a/src/vs/base/common/stripComments.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-//@ts-check
-
-(function () {
-	function factory(path, os, productName, cwd) {
-		// First group matches a double quoted string
-		// Second group matches a single quoted string
-		// Third group matches a multi line comment
-		// Forth group matches a single line comment
-		// Fifth group matches a trailing comma
-		const regexp = /("[^"\\]*(?:\\.[^"\\]*)*")|('[^'\\]*(?:\\.[^'\\]*)*')|(\/\*[^\/\*]*(?:(?:\*|\/)[^\/\*]*)*?\*\/)|(\/{2,}.*?(?:(?:\r?\n)|$))|(,\s*[}\]])/g;
-
-		/**
-		 *
-		 * @param {string} content
-		 * @returns {string}
-		 */
-		function stripComments(content) {
-			return content.replace(regexp, function (match, _m1, _m2, m3, m4, m5) {
-				// Only one of m1, m2, m3, m4, m5 matches
-				if (m3) {
-					// A block comment. Replace with nothing
-					return '';
-				} else if (m4) {
-					// Since m4 is a single line comment is is at least of length 2 (e.g. //)
-					// If it ends in \r?\n then keep it.
-					const length = m4.length;
-					if (m4[length - 1] === '\n') {
-						return m4[length - 2] === '\r' ? '\r\n' : '\n';
-					}
-					else {
-						return '';
-					}
-				} else if (m5) {
-					// Remove the trailing comma
-					return match.substring(1);
-				} else {
-					// We match a string
-					return match;
-				}
-			});
-		}
-		return {
-			stripComments
-		};
-	}
-
-
-	if (typeof define === 'function') {
-		// amd
-		define([], function () { return factory(); });
-	} else if (typeof module === 'object' && typeof module.exports === 'object') {
-		// commonjs
-		module.exports = factory();
-	} else {
-		console.trace('strip comments defined in UNKNOWN context (neither requirejs or commonjs)');
-	}
-})();
diff --git a/src/vs/base/common/ternarySearchTree.ts b/src/vs/base/common/ternarySearchTree.ts
index dafcdc76aeb..f31f58e703c 100644
--- a/src/vs/base/common/ternarySearchTree.ts
+++ b/src/vs/base/common/ternarySearchTree.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { shuffle } from 'vs/base/common/arrays';
-import { CharCode } from 'vs/base/common/charCode';
-import { compare, compareIgnoreCase, compareSubstring, compareSubstringIgnoreCase } from 'vs/base/common/strings';
-import { URI } from 'vs/base/common/uri';
+import { shuffle } from './arrays.js';
+import { CharCode } from './charCode.js';
+import { compare, compareIgnoreCase, compareSubstring, compareSubstringIgnoreCase } from './strings.js';
+import { URI } from './uri.js';
 
 export interface IKeyIterator<K> {
 	reset(key: K): this;
@@ -694,7 +694,7 @@ export class TernarySearchTree<K, V> {
 		return this._findSuperstrOrElement(key, true) !== undefined;
 	}
 
-	forEach(callback: (value: V, index: K) => any): void {
+	forEach(callback: (value: V, index: K) => unknown): void {
 		for (const [key, value] of this) {
 			callback(value, key);
 		}
diff --git a/src/vs/base/common/tfIdf.ts b/src/vs/base/common/tfIdf.ts
index 45042759613..682d06b73ac 100644
--- a/src/vs/base/common/tfIdf.ts
+++ b/src/vs/base/common/tfIdf.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
+import { CancellationToken } from './cancellation.js';
 
 type SparseEmbedding = Record</* word */ string, /* weight */number>;
 type TermFrequencies = Map</* word */ string, /*occurrences*/ number>;
diff --git a/src/vs/base/common/themables.ts b/src/vs/base/common/themables.ts
index 689a5328b80..a9273744ded 100644
--- a/src/vs/base/common/themables.ts
+++ b/src/vs/base/common/themables.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from 'vs/base/common/codicons';
+import { Codicon } from './codicons.js';
 
 export type ColorIdentifier = string;
 
diff --git a/src/vs/base/common/types.ts b/src/vs/base/common/types.ts
index 1acab57b758..6025a90c711 100644
--- a/src/vs/base/common/types.ts
+++ b/src/vs/base/common/types.ts
@@ -190,6 +190,16 @@ export function validateConstraint(arg: unknown, constraint: TypeConstraint | un
 	}
 }
 
+/**
+ * Helper type assertion that safely upcasts a type to a supertype.
+ *
+ * This can be used to make sure the argument correctly conforms to the subtype while still being able to pass it
+ * to contexts that expects the supertype.
+ */
+export function upcast<Base, Sub extends Base>(x: Sub): Base {
+	return x;
+}
+
 type AddFirstParameterToFunction<T, TargetFunctionsReturnType, FirstParameter> = T extends (...args: any[]) => TargetFunctionsReturnType ?
 	// Function: add param to function
 	(firstArg: FirstParameter, ...args: Parameters<T>) => ReturnType<T> :
diff --git a/src/vs/base/common/uri.ts b/src/vs/base/common/uri.ts
index 4d7e51431cb..73a3aa6cd49 100644
--- a/src/vs/base/common/uri.ts
+++ b/src/vs/base/common/uri.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
-import { MarshalledId } from 'vs/base/common/marshallingIds';
-import * as paths from 'vs/base/common/path';
-import { isWindows } from 'vs/base/common/platform';
+import { CharCode } from './charCode.js';
+import { MarshalledId } from './marshallingIds.js';
+import * as paths from './path.js';
+import { isWindows } from './platform.js';
 
 const _schemePattern = /^\w[\w\d+.-]*$/;
 const _singleSlashStart = /^\//;
@@ -413,6 +413,10 @@ export class URI implements UriComponents {
 			return result;
 		}
 	}
+
+	[Symbol.for('debug.description')]() {
+		return `URI(${this.toString()})`;
+	}
 }
 
 export interface UriComponents {
@@ -469,6 +473,7 @@ class Uri extends URI {
 	}
 
 	override toJSON(): UriComponents {
+		// eslint-disable-next-line local/code-no-dangerous-type-assertions
 		const res = <UriState>{
 			$mid: MarshalledId.Uri
 		};
diff --git a/src/vs/base/common/uriIpc.ts b/src/vs/base/common/uriIpc.ts
index 07daa360c54..8a8c18055a8 100644
--- a/src/vs/base/common/uriIpc.ts
+++ b/src/vs/base/common/uriIpc.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { MarshalledObject } from 'vs/base/common/marshalling';
-import { MarshalledId } from 'vs/base/common/marshallingIds';
-import { URI, UriComponents } from 'vs/base/common/uri';
+import { VSBuffer } from './buffer.js';
+import { MarshalledObject } from './marshalling.js';
+import { MarshalledId } from './marshallingIds.js';
+import { URI, UriComponents } from './uri.js';
 
 export interface IURITransformer {
 	transformIncoming(uri: UriComponents): UriComponents;
diff --git a/src/vs/base/common/verifier.ts b/src/vs/base/common/verifier.ts
index cf77d1800cc..a2576a3c1ca 100644
--- a/src/vs/base/common/verifier.ts
+++ b/src/vs/base/common/verifier.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isObject } from 'vs/base/common/types';
+import { isObject } from './types.js';
 
 interface IVerifier<T> {
 	verify(value: unknown): T;
diff --git a/src/vs/base/common/worker/simpleWorker.ts b/src/vs/base/common/worker/simpleWorker.ts
index 57cc59ee770..70a328db53f 100644
--- a/src/vs/base/common/worker/simpleWorker.ts
+++ b/src/vs/base/common/worker/simpleWorker.ts
@@ -3,13 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { transformErrorForSerialization } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { getAllMethodNames } from 'vs/base/common/objects';
-import { isWeb } from 'vs/base/common/platform';
-import * as strings from 'vs/base/common/strings';
+import { CharCode } from '../charCode.js';
+import { onUnexpectedError, transformErrorForSerialization } from '../errors.js';
+import { Emitter, Event } from '../event.js';
+import { Disposable, IDisposable } from '../lifecycle.js';
+import { AppResourcePath, FileAccess } from '../network.js';
+import { isWeb } from '../platform.js';
+import * as strings from '../strings.js';
+import { URI } from '../uri.js';
 
+const DEFAULT_CHANNEL = 'default';
 const INITIALIZE = '$initialize';
 
 export interface IWorker extends IDisposable {
@@ -22,7 +25,13 @@ export interface IWorkerCallback {
 }
 
 export interface IWorkerFactory {
-	create(moduleId: string, callback: IWorkerCallback, onErrorCallback: (err: any) => void): IWorker;
+	create(modules: IWorkerDescriptor, callback: IWorkerCallback, onErrorCallback: (err: any) => void): IWorker;
+}
+
+export interface IWorkerDescriptor {
+	readonly moduleId: string;
+	readonly esmModuleLocation: URI | undefined;
+	readonly label: string | undefined;
 }
 
 let webWorkerWarningLogged = false;
@@ -50,6 +59,7 @@ class RequestMessage {
 	constructor(
 		public readonly vsWorker: number,
 		public readonly req: string,
+		public readonly channel: string,
 		public readonly method: string,
 		public readonly args: any[]
 	) { }
@@ -68,6 +78,7 @@ class SubscribeEventMessage {
 	constructor(
 		public readonly vsWorker: number,
 		public readonly req: string,
+		public readonly channel: string,
 		public readonly eventName: string,
 		public readonly arg: any
 	) { }
@@ -96,8 +107,8 @@ interface IMessageReply {
 
 interface IMessageHandler {
 	sendMessage(msg: any, transfer?: ArrayBuffer[]): void;
-	handleMessage(method: string, args: any[]): Promise<any>;
-	handleEvent(eventName: string, arg: any): Event<any>;
+	handleMessage(channel: string, method: string, args: any[]): Promise<any>;
+	handleEvent(channel: string, eventName: string, arg: any): Event<any>;
 }
 
 class SimpleWorkerProtocol {
@@ -122,24 +133,24 @@ class SimpleWorkerProtocol {
 		this._workerId = workerId;
 	}
 
-	public sendMessage(method: string, args: any[]): Promise<any> {
+	public sendMessage(channel: string, method: string, args: any[]): Promise<any> {
 		const req = String(++this._lastSentReq);
 		return new Promise<any>((resolve, reject) => {
 			this._pendingReplies[req] = {
 				resolve: resolve,
 				reject: reject
 			};
-			this._send(new RequestMessage(this._workerId, req, method, args));
+			this._send(new RequestMessage(this._workerId, req, channel, method, args));
 		});
 	}
 
-	public listen(eventName: string, arg: any): Event<any> {
+	public listen(channel: string, eventName: string, arg: any): Event<any> {
 		let req: string | null = null;
 		const emitter = new Emitter<any>({
 			onWillAddFirstListener: () => {
 				req = String(++this._lastSentReq);
 				this._pendingEmitters.set(req, emitter);
-				this._send(new SubscribeEventMessage(this._workerId, req, eventName, arg));
+				this._send(new SubscribeEventMessage(this._workerId, req, channel, eventName, arg));
 			},
 			onDidRemoveLastListener: () => {
 				this._pendingEmitters.delete(req!);
@@ -160,6 +171,29 @@ class SimpleWorkerProtocol {
 		this._handleMessage(message);
 	}
 
+	public createProxyToRemoteChannel<T extends object>(channel: string, sendMessageBarrier?: () => Promise<void>): T {
+		const handler = {
+			get: (target: any, name: PropertyKey) => {
+				if (typeof name === 'string' && !target[name]) {
+					if (propertyIsDynamicEvent(name)) { // onDynamic...
+						target[name] = (arg: any): Event<any> => {
+							return this.listen(channel, name, arg);
+						};
+					} else if (propertyIsEvent(name)) { // on...
+						target[name] = this.listen(channel, name, undefined);
+					} else if (name.charCodeAt(0) === CharCode.DollarSign) { // $...
+						target[name] = async (...myArgs: any[]) => {
+							await sendMessageBarrier?.();
+							return this.sendMessage(channel, name, myArgs);
+						};
+					}
+				}
+				return target[name];
+			}
+		};
+		return new Proxy(Object.create(null), handler);
+	}
+
 	private _handleMessage(msg: Message): void {
 		switch (msg.type) {
 			case MessageType.Reply:
@@ -201,7 +235,7 @@ class SimpleWorkerProtocol {
 
 	private _handleRequestMessage(requestMessage: RequestMessage): void {
 		const req = requestMessage.req;
-		const result = this._handler.handleMessage(requestMessage.method, requestMessage.args);
+		const result = this._handler.handleMessage(requestMessage.channel, requestMessage.method, requestMessage.args);
 		result.then((r) => {
 			this._send(new ReplyMessage(this._workerId, req, r, undefined));
 		}, (e) => {
@@ -215,7 +249,7 @@ class SimpleWorkerProtocol {
 
 	private _handleSubscribeEventMessage(msg: SubscribeEventMessage): void {
 		const req = msg.req;
-		const disposable = this._handler.handleEvent(msg.eventName, msg.arg)((event) => {
+		const disposable = this._handler.handleEvent(msg.channel, msg.eventName, msg.arg)((event) => {
 			this._send(new EventMessage(this._workerId, req, event));
 		});
 		this._pendingEvents.set(req, disposable);
@@ -255,35 +289,60 @@ class SimpleWorkerProtocol {
 	}
 }
 
+type ProxiedMethodName = (`$${string}` | `on${string}`);
+
+export type Proxied<T> = { [K in keyof T]: T[K] extends (...args: infer A) => infer R
+	? (
+		K extends ProxiedMethodName
+		? (...args: A) => Promise<Awaited<R>>
+		: never
+	)
+	: never
+};
+
 export interface IWorkerClient<W> {
-	getProxyObject(): Promise<W>;
+	proxy: Proxied<W>;
 	dispose(): void;
+	setChannel<T extends object>(channel: string, handler: T): void;
+	getChannel<T extends object>(channel: string): Proxied<T>;
+}
+
+export interface IWorkerServer {
+	setChannel<T extends object>(channel: string, handler: T): void;
+	getChannel<T extends object>(channel: string): Proxied<T>;
 }
 
 /**
  * Main thread side
  */
-export class SimpleWorkerClient<W extends object, H extends object> extends Disposable implements IWorkerClient<W> {
+export class SimpleWorkerClient<W extends object> extends Disposable implements IWorkerClient<W> {
 
 	private readonly _worker: IWorker;
-	private readonly _onModuleLoaded: Promise<string[]>;
+	private readonly _onModuleLoaded: Promise<void>;
 	private readonly _protocol: SimpleWorkerProtocol;
-	private readonly _lazyProxy: Promise<W>;
+	public readonly proxy: Proxied<W>;
+	private readonly _localChannels: Map<string, object> = new Map();
+	private readonly _remoteChannels: Map<string, object> = new Map();
 
-	constructor(workerFactory: IWorkerFactory, moduleId: string, host: H) {
+	constructor(
+		workerFactory: IWorkerFactory,
+		workerDescriptor: IWorkerDescriptor,
+	) {
 		super();
 
-		let lazyProxyReject: ((err: any) => void) | null = null;
-
 		this._worker = this._register(workerFactory.create(
-			'vs/base/common/worker/simpleWorker',
+			{
+				moduleId: 'vs/base/common/worker/simpleWorker',
+				esmModuleLocation: workerDescriptor.esmModuleLocation,
+				label: workerDescriptor.label
+			},
 			(msg: Message) => {
 				this._protocol.handleMessage(msg);
 			},
 			(err: any) => {
 				// in Firefox, web workers fail lazily :(
 				// we will reject the proxy
-				lazyProxyReject?.(err);
+				onUnexpectedError(err);
 			}
 		));
 
@@ -291,33 +350,11 @@ export class SimpleWorkerClient<W extends object, H extends object> extends Disp
 			sendMessage: (msg: any, transfer: ArrayBuffer[]): void => {
 				this._worker.postMessage(msg, transfer);
 			},
-			handleMessage: (method: string, args: any[]): Promise<any> => {
-				if (typeof (host as any)[method] !== 'function') {
-					return Promise.reject(new Error('Missing method ' + method + ' on main thread host.'));
-				}
-
-				try {
-					return Promise.resolve((host as any)[method].apply(host, args));
-				} catch (e) {
-					return Promise.reject(e);
-				}
+			handleMessage: (channel: string, method: string, args: any[]): Promise<any> => {
+				return this._handleMessage(channel, method, args);
 			},
-			handleEvent: (eventName: string, arg: any): Event<any> => {
-				if (propertyIsDynamicEvent(eventName)) {
-					const event = (host as any)[eventName].call(host, arg);
-					if (typeof event !== 'function') {
-						throw new Error(`Missing dynamic event ${eventName} on main thread host.`);
-					}
-					return event;
-				}
-				if (propertyIsEvent(eventName)) {
-					const event = (host as any)[eventName];
-					if (typeof event !== 'function') {
-						throw new Error(`Missing event ${eventName} on main thread host.`);
-					}
-					return event;
-				}
-				throw new Error(`Malformed event name ${eventName}`);
+			handleEvent: (channel: string, eventName: string, arg: any): Event<any> => {
+				return this._handleEvent(channel, eventName, arg);
 			}
 		});
 		this._protocol.setWorkerId(this._worker.getId());
@@ -334,45 +371,67 @@ export class SimpleWorkerClient<W extends object, H extends object> extends Disp
 			loaderConfiguration = (globalThis as any).requirejs.s.contexts._.config;
 		}
 
-		const hostMethods = getAllMethodNames(host);
-
 		// Send initialize message
-		this._onModuleLoaded = this._protocol.sendMessage(INITIALIZE, [
+		this._onModuleLoaded = this._protocol.sendMessage(DEFAULT_CHANNEL, INITIALIZE, [
 			this._worker.getId(),
 			JSON.parse(JSON.stringify(loaderConfiguration)),
-			moduleId,
-			hostMethods,
+			workerDescriptor.moduleId,
 		]);
 
-		// Create proxy to loaded code
-		const proxyMethodRequest = (method: string, args: any[]): Promise<any> => {
-			return this._request(method, args);
-		};
-		const proxyListen = (eventName: string, arg: any): Event<any> => {
-			return this._protocol.listen(eventName, arg);
-		};
-
-		this._lazyProxy = new Promise<W>((resolve, reject) => {
-			lazyProxyReject = reject;
-			this._onModuleLoaded.then((availableMethods: string[]) => {
-				resolve(createProxyObject<W>(availableMethods, proxyMethodRequest, proxyListen));
-			}, (e) => {
-				reject(e);
-				this._onError('Worker failed to load ' + moduleId, e);
-			});
+		this.proxy = this._protocol.createProxyToRemoteChannel(DEFAULT_CHANNEL, async () => { await this._onModuleLoaded; });
+		this._onModuleLoaded.catch((e) => {
+			this._onError('Worker failed to load ' + workerDescriptor.moduleId, e);
 		});
 	}
 
-	public getProxyObject(): Promise<W> {
-		return this._lazyProxy;
+	private _handleMessage(channelName: string, method: string, args: any[]): Promise<any> {
+		const channel: object | undefined = this._localChannels.get(channelName);
+		if (!channel) {
+			return Promise.reject(new Error(`Missing channel ${channelName} on main thread`));
+		}
+		if (typeof (channel as any)[method] !== 'function') {
+			return Promise.reject(new Error(`Missing method ${method} on main thread channel ${channelName}`));
+		}
+
+		try {
+			return Promise.resolve((channel as any)[method].apply(channel, args));
+		} catch (e) {
+			return Promise.reject(e);
+		}
 	}
 
-	private _request(method: string, args: any[]): Promise<any> {
-		return new Promise<any>((resolve, reject) => {
-			this._onModuleLoaded.then(() => {
-				this._protocol.sendMessage(method, args).then(resolve, reject);
-			}, reject);
-		});
+	private _handleEvent(channelName: string, eventName: string, arg: any): Event<any> {
+		const channel: object | undefined = this._localChannels.get(channelName);
+		if (!channel) {
+			throw new Error(`Missing channel ${channelName} on main thread`);
+		}
+		if (propertyIsDynamicEvent(eventName)) {
+			const event = (channel as any)[eventName].call(channel, arg);
+			if (typeof event !== 'function') {
+				throw new Error(`Missing dynamic event ${eventName} on main thread channel ${channelName}.`);
+			}
+			return event;
+		}
+		if (propertyIsEvent(eventName)) {
+			const event = (channel as any)[eventName];
+			if (typeof event !== 'function') {
+				throw new Error(`Missing event ${eventName} on main thread channel ${channelName}.`);
+			}
+			return event;
+		}
+		throw new Error(`Malformed event name ${eventName}`);
+	}
+
+	public setChannel<T extends object>(channel: string, handler: T): void {
+		this._localChannels.set(channel, handler);
+	}
+
+	public getChannel<T extends object>(channel: string): Proxied<T> {
+		if (!this._remoteChannels.has(channel)) {
+			const inst = this._protocol.createProxyToRemoteChannel(channel, async () => { await this._onModuleLoaded; });
+			this._remoteChannels.set(channel, inst);
+		}
+		return this._remoteChannels.get(channel) as Proxied<T>;
 	}
 
 	private _onError(message: string, error?: any): void {
@@ -391,65 +450,35 @@ function propertyIsDynamicEvent(name: string): boolean {
 	return /^onDynamic/.test(name) && strings.isUpperAsciiLetter(name.charCodeAt(9));
 }
 
-function createProxyObject<T extends object>(
-	methodNames: string[],
-	invoke: (method: string, args: unknown[]) => unknown,
-	proxyListen: (eventName: string, arg: any) => Event<any>
-): T {
-	const createProxyMethod = (method: string): () => unknown => {
-		return function () {
-			const args = Array.prototype.slice.call(arguments, 0);
-			return invoke(method, args);
-		};
-	};
-	const createProxyDynamicEvent = (eventName: string): (arg: any) => Event<any> => {
-		return function (arg) {
-			return proxyListen(eventName, arg);
-		};
-	};
-
-	const result = {} as T;
-	for (const methodName of methodNames) {
-		if (propertyIsDynamicEvent(methodName)) {
-			(<any>result)[methodName] = createProxyDynamicEvent(methodName);
-			continue;
-		}
-		if (propertyIsEvent(methodName)) {
-			(<any>result)[methodName] = proxyListen(methodName, undefined);
-			continue;
-		}
-		(<any>result)[methodName] = createProxyMethod(methodName);
-	}
-	return result;
-}
-
 export interface IRequestHandler {
 	_requestHandlerBrand: any;
 	[prop: string]: any;
 }
 
-export interface IRequestHandlerFactory<H> {
-	(host: H): IRequestHandler;
+export interface IRequestHandlerFactory {
+	(workerServer: IWorkerServer): IRequestHandler;
 }
 
 /**
  * Worker side
  */
-export class SimpleWorkerServer<H extends object> {
+export class SimpleWorkerServer implements IWorkerServer {
 
-	private _requestHandlerFactory: IRequestHandlerFactory<H> | null;
+	private _requestHandlerFactory: IRequestHandlerFactory | null;
 	private _requestHandler: IRequestHandler | null;
 	private _protocol: SimpleWorkerProtocol;
+	private readonly _localChannels: Map<string, object> = new Map();
+	private readonly _remoteChannels: Map<string, object> = new Map();
 
-	constructor(postMessage: (msg: Message, transfer?: ArrayBuffer[]) => void, requestHandlerFactory: IRequestHandlerFactory<H> | null) {
+	constructor(postMessage: (msg: Message, transfer?: ArrayBuffer[]) => void, requestHandlerFactory: IRequestHandlerFactory | null) {
 		this._requestHandlerFactory = requestHandlerFactory;
 		this._requestHandler = null;
 		this._protocol = new SimpleWorkerProtocol({
 			sendMessage: (msg: any, transfer: ArrayBuffer[]): void => {
 				postMessage(msg, transfer);
 			},
-			handleMessage: (method: string, args: any[]): Promise<any> => this._handleMessage(method, args),
-			handleEvent: (eventName: string, arg: any): Event<any> => this._handleEvent(eventName, arg)
+			handleMessage: (channel: string, method: string, args: any[]): Promise<any> => this._handleMessage(channel, method, args),
+			handleEvent: (channel: string, eventName: string, arg: any): Event<any> => this._handleEvent(channel, eventName, arg)
 		});
 	}
 
@@ -457,35 +486,40 @@ export class SimpleWorkerServer<H extends object> {
 		this._protocol.handleMessage(msg);
 	}
 
-	private _handleMessage(method: string, args: any[]): Promise<any> {
-		if (method === INITIALIZE) {
-			return this.initialize(<number>args[0], <any>args[1], <string>args[2], <string[]>args[3]);
+	private _handleMessage(channel: string, method: string, args: any[]): Promise<any> {
+		if (channel === DEFAULT_CHANNEL && method === INITIALIZE) {
+			return this.initialize(<number>args[0], <any>args[1], <string>args[2]);
 		}
 
-		if (!this._requestHandler || typeof this._requestHandler[method] !== 'function') {
-			return Promise.reject(new Error('Missing requestHandler or method: ' + method));
+		const requestHandler: object | null | undefined = (channel === DEFAULT_CHANNEL ? this._requestHandler : this._localChannels.get(channel));
+		if (!requestHandler) {
+			return Promise.reject(new Error(`Missing channel ${channel} on worker thread`));
+		}
+		if (typeof (requestHandler as any)[method] !== 'function') {
+			return Promise.reject(new Error(`Missing method ${method} on worker thread channel ${channel}`));
 		}
 
 		try {
-			return Promise.resolve(this._requestHandler[method].apply(this._requestHandler, args));
+			return Promise.resolve((requestHandler as any)[method].apply(requestHandler, args));
 		} catch (e) {
 			return Promise.reject(e);
 		}
 	}
 
-	private _handleEvent(eventName: string, arg: any): Event<any> {
-		if (!this._requestHandler) {
-			throw new Error(`Missing requestHandler`);
+	private _handleEvent(channel: string, eventName: string, arg: any): Event<any> {
+		const requestHandler: object | null | undefined = (channel === DEFAULT_CHANNEL ? this._requestHandler : this._localChannels.get(channel));
+		if (!requestHandler) {
+			throw new Error(`Missing channel ${channel} on worker thread`);
 		}
 		if (propertyIsDynamicEvent(eventName)) {
-			const event = (this._requestHandler as any)[eventName].call(this._requestHandler, arg);
+			const event = (requestHandler as any)[eventName].call(requestHandler, arg);
 			if (typeof event !== 'function') {
 				throw new Error(`Missing dynamic event ${eventName} on request handler.`);
 			}
 			return event;
 		}
 		if (propertyIsEvent(eventName)) {
-			const event = (this._requestHandler as any)[eventName];
+			const event = (requestHandler as any)[eventName];
 			if (typeof event !== 'function') {
 				throw new Error(`Missing event ${eventName} on request handler.`);
 			}
@@ -494,22 +528,25 @@ export class SimpleWorkerServer<H extends object> {
 		throw new Error(`Malformed event name ${eventName}`);
 	}
 
-	private initialize(workerId: number, loaderConfig: any, moduleId: string, hostMethods: string[]): Promise<string[]> {
+	public setChannel<T extends object>(channel: string, handler: T): void {
+		this._localChannels.set(channel, handler);
+	}
+
+	public getChannel<T extends object>(channel: string): Proxied<T> {
+		if (!this._remoteChannels.has(channel)) {
+			const inst = this._protocol.createProxyToRemoteChannel(channel);
+			this._remoteChannels.set(channel, inst);
+		}
+		return this._remoteChannels.get(channel) as Proxied<T>;
+	}
+
+	private async initialize(workerId: number, loaderConfig: any, moduleId: string): Promise<void> {
 		this._protocol.setWorkerId(workerId);
 
-		const proxyMethodRequest = (method: string, args: any[]): Promise<any> => {
-			return this._protocol.sendMessage(method, args);
-		};
-		const proxyListen = (eventName: string, arg: any): Event<any> => {
-			return this._protocol.listen(eventName, arg);
-		};
-
-		const hostProxy = createProxyObject<H>(hostMethods, proxyMethodRequest, proxyListen);
-
 		if (this._requestHandlerFactory) {
 			// static request handler
-			this._requestHandler = this._requestHandlerFactory(hostProxy);
-			return Promise.resolve(getAllMethodNames(this._requestHandler));
+			this._requestHandler = this._requestHandlerFactory(this);
+			return;
 		}
 
 		if (loaderConfig) {
@@ -532,34 +569,21 @@ export class SimpleWorkerServer<H extends object> {
 			globalThis.require.config(loaderConfig);
 		}
 
-		return new Promise<string[]>((resolve, reject) => {
-			// Use the global require to be sure to get the global config
+		const url = FileAccess.asBrowserUri(`${moduleId}.js` as AppResourcePath).toString(true);
+		return import(`${url}`).then((module: { create: IRequestHandlerFactory }) => {
+			this._requestHandler = module.create(this);
 
-			// ESM-comment-begin
-			const req = (globalThis.require || require);
-			// ESM-comment-end
-			// ESM-uncomment-begin
-			// const req = globalThis.require;
-			// ESM-uncomment-end
-
-			req([moduleId], (module: { create: IRequestHandlerFactory<H> }) => {
-				this._requestHandler = module.create(hostProxy);
-
-				if (!this._requestHandler) {
-					reject(new Error(`No RequestHandler!`));
-					return;
-				}
-
-				resolve(getAllMethodNames(this._requestHandler));
-			}, reject);
+			if (!this._requestHandler) {
+				throw new Error(`No RequestHandler!`);
+			}
 		});
 	}
 }
 
 /**
- * Called on the worker side
+ * Defines the worker entry point. Must be exported and named `create`.
  * @skipMangle
  */
-export function create(postMessage: (msg: Message, transfer?: ArrayBuffer[]) => void): SimpleWorkerServer<any> {
+export function create(postMessage: (msg: Message, transfer?: ArrayBuffer[]) => void): SimpleWorkerServer {
 	return new SimpleWorkerServer(postMessage, null);
 }
diff --git a/src/vs/base/common/worker/simpleWorkerBootstrap.ts b/src/vs/base/common/worker/simpleWorkerBootstrap.ts
new file mode 100644
index 00000000000..f6b544e4ba5
--- /dev/null
+++ b/src/vs/base/common/worker/simpleWorkerBootstrap.ts
@@ -0,0 +1,42 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IRequestHandlerFactory, SimpleWorkerServer } from './simpleWorker.js';
+
+type MessageEvent = {
+	data: any;
+};
+
+declare const globalThis: {
+	postMessage: (message: any) => void;
+	onmessage: (event: MessageEvent) => void;
+};
+
+let initialized = false;
+
+function initialize(factory: IRequestHandlerFactory) {
+	if (initialized) {
+		return;
+	}
+	initialized = true;
+
+	const simpleWorker = new SimpleWorkerServer(
+		msg => globalThis.postMessage(msg),
+		(workerServer) => factory(workerServer)
+	);
+
+	globalThis.onmessage = (e: MessageEvent) => {
+		simpleWorker.onmessage(e.data);
+	};
+}
+
+export function bootstrapSimpleWorker(factory: IRequestHandlerFactory) {
+	globalThis.onmessage = (_e: MessageEvent) => {
+		// Ignore first message in this case and initialize if not yet initialized
+		if (!initialized) {
+			initialize(factory);
+		}
+	};
+}
diff --git a/src/vs/base/node/crypto.ts b/src/vs/base/node/crypto.ts
index 910d492e8ff..f1637f4057f 100644
--- a/src/vs/base/node/crypto.ts
+++ b/src/vs/base/node/crypto.ts
@@ -5,7 +5,7 @@
 
 import * as crypto from 'crypto';
 import * as fs from 'fs';
-import { createSingleCallFunction } from 'vs/base/common/functional';
+import { createSingleCallFunction } from '../common/functional.js';
 
 export async function checksum(path: string, sha256hash: string | undefined): Promise<void> {
 	const checksumPromise = new Promise<string | undefined>((resolve, reject) => {
diff --git a/src/vs/base/node/extpath.ts b/src/vs/base/node/extpath.ts
index a7ec9cf6d36..4fa8d7a0b2b 100644
--- a/src/vs/base/node/extpath.ts
+++ b/src/vs/base/node/extpath.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as fs from 'fs';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { basename, dirname, join, normalize, sep } from 'vs/base/common/path';
-import { isLinux } from 'vs/base/common/platform';
-import { rtrim } from 'vs/base/common/strings';
-import { Promises, readdirSync } from 'vs/base/node/pfs';
+import { CancellationToken } from '../common/cancellation.js';
+import { basename, dirname, join, normalize, sep } from '../common/path.js';
+import { isLinux } from '../common/platform.js';
+import { rtrim } from '../common/strings.js';
+import { Promises, readdirSync } from './pfs.js';
 
 /**
  * Copied from: https://github.com/microsoft/vscode-node-debug/blob/master/src/node/pathUtilities.ts#L83
@@ -119,7 +119,7 @@ export async function realpath(path: string): Promise<string> {
 		// to not resolve links but to simply see if the path is read accessible or not.
 		const normalizedPath = normalizePath(path);
 
-		await Promises.access(normalizedPath, fs.constants.R_OK);
+		await fs.promises.access(normalizedPath, fs.constants.R_OK);
 
 		return normalizedPath;
 	}
diff --git a/src/vs/base/node/id.ts b/src/vs/base/node/id.ts
index 043731f666d..f4e29d1e580 100644
--- a/src/vs/base/node/id.ts
+++ b/src/vs/base/node/id.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { networkInterfaces } from 'os';
-import { TernarySearchTree } from 'vs/base/common/ternarySearchTree';
-import * as uuid from 'vs/base/common/uuid';
-import { getMac } from 'vs/base/node/macAddress';
-import { isWindows } from 'vs/base/common/platform';
+import { TernarySearchTree } from '../common/ternarySearchTree.js';
+import * as uuid from '../common/uuid.js';
+import { getMac } from './macAddress.js';
+import { isWindows } from '../common/platform.js';
 
 // http://www.techrepublic.com/blog/data-center/mac-address-scorecard-for-common-virtual-machine-platforms/
 // VMware ESX 3, Server, Workstation, Player	00-50-56, 00-0C-29, 00-05-69
diff --git a/src/vs/base/node/languagePacks.d.ts b/src/vs/base/node/languagePacks.d.ts
deleted file mode 100644
index 5dd1b1f1ee9..00000000000
--- a/src/vs/base/node/languagePacks.d.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-export interface NLSConfiguration {
-	locale: string;
-	osLocale: string;
-	availableLanguages: {
-		[key: string]: string;
-	};
-	pseudo?: boolean;
-	_languagePackSupport?: boolean;
-}
-
-export interface InternalNLSConfiguration extends NLSConfiguration {
-	_languagePackId: string;
-	_translationsConfigFile: string;
-	_cacheRoot: string;
-	_resolvedLanguagePackCoreLocation: string;
-	_corruptedFile: string;
-	_languagePackSupport?: boolean;
-}
-
-export function getNLSConfiguration(commit: string | undefined, userDataPath: string, metaDataFile: string, locale: string, osLocale: string): Promise<NLSConfiguration>;
diff --git a/src/vs/base/node/languagePacks.js b/src/vs/base/node/languagePacks.js
deleted file mode 100644
index 0d3d1acf6a3..00000000000
--- a/src/vs/base/node/languagePacks.js
+++ /dev/null
@@ -1,264 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-/// <reference path="../../../typings/require.d.ts" />
-
-//@ts-check
-(function () {
-	'use strict';
-
-	/**
-	 * @param {typeof import('path')} path
-	 * @param {typeof import('fs')} fs
-	 * @param {typeof import('../common/performance')} perf
-	 */
-	function factory(path, fs, perf) {
-
-		/**
-		 * @param {string} file
-		 * @returns {Promise<boolean>}
-		 */
-		function exists(file) {
-			return new Promise(c => fs.exists(file, c));
-		}
-
-		/**
-		 * @param {string} file
-		 * @returns {Promise<void>}
-		 */
-		function touch(file) {
-			return new Promise((c, e) => { const d = new Date(); fs.utimes(file, d, d, err => err ? e(err) : c()); });
-		}
-
-		/**
-		 * @param {string} dir
-		 * @returns {Promise<string>}
-		 */
-		function mkdirp(dir) {
-			return new Promise((c, e) => fs.mkdir(dir, { recursive: true }, err => (err && err.code !== 'EEXIST') ? e(err) : c(dir)));
-		}
-
-		/**
-		 * @param {string} location
-		 * @returns {Promise<void>}
-		 */
-		function rimraf(location) {
-			return new Promise((c, e) => fs.rm(location, { recursive: true, force: true, maxRetries: 3 }, err => err ? e(err) : c()));
-		}
-
-		/**
-		 * @param {string} file
-		 * @returns {Promise<string>}
-		 */
-		function readFile(file) {
-			return new Promise((c, e) => fs.readFile(file, 'utf8', (err, data) => err ? e(err) : c(data)));
-		}
-
-		/**
-		 * @param {string} file
-		 * @param {string} content
-		 * @returns {Promise<void>}
-		 */
-		function writeFile(file, content) {
-			return new Promise((c, e) => fs.writeFile(file, content, 'utf8', err => err ? e(err) : c()));
-		}
-
-		/**
-		 * @param {string} userDataPath
-		 * @returns {Promise<object | undefined>}
-		 */
-		async function getLanguagePackConfigurations(userDataPath) {
-			const configFile = path.join(userDataPath, 'languagepacks.json');
-			try {
-				return JSON.parse(await readFile(configFile));
-			} catch (err) {
-				// Do nothing. If we can't read the file we have no
-				// language pack config.
-			}
-			return undefined;
-		}
-
-		/**
-		 * @param {object} config
-		 * @param {string | undefined} locale
-		 */
-		function resolveLanguagePackLocale(config, locale) {
-			try {
-				while (locale) {
-					if (config[locale]) {
-						return locale;
-					} else {
-						const index = locale.lastIndexOf('-');
-						if (index > 0) {
-							locale = locale.substring(0, index);
-						} else {
-							return undefined;
-						}
-					}
-				}
-			} catch (err) {
-				console.error('Resolving language pack configuration failed.', err);
-			}
-			return undefined;
-		}
-
-		/**
-		 * @param {string | undefined} commit
-		 * @param {string} userDataPath
-		 * @param {string} metaDataFile
-		 * @param {string} locale
-		 * @param {string} osLocale
-		 * @returns {Promise<import('./languagePacks').NLSConfiguration>}
-		 */
-		function getNLSConfiguration(commit, userDataPath, metaDataFile, locale, osLocale) {
-			const defaultResult = function (locale) {
-				perf.mark('code/didGenerateNls');
-				return Promise.resolve({ locale, osLocale, availableLanguages: {} });
-			};
-
-			perf.mark('code/willGenerateNls');
-
-			if (locale === 'pseudo') {
-				return Promise.resolve({ locale, osLocale, availableLanguages: {}, pseudo: true });
-			}
-
-			if (process.env['VSCODE_DEV']) {
-				return Promise.resolve({ locale, osLocale, availableLanguages: {} });
-			}
-
-			// We have a built version so we have extracted nls file. Try to find
-			// the right file to use.
-
-			// Check if we have an English or English US locale. If so fall to default since that is our
-			// English translation (we don't ship *.nls.en.json files)
-			if (locale && (locale === 'en' || locale === 'en-us')) {
-				return Promise.resolve({ locale, osLocale, availableLanguages: {} });
-			}
-
-			const initialLocale = locale;
-
-			try {
-				if (!commit) {
-					return defaultResult(initialLocale);
-				}
-				return getLanguagePackConfigurations(userDataPath).then(configs => {
-					if (!configs) {
-						return defaultResult(initialLocale);
-					}
-					const resolvedLocale = resolveLanguagePackLocale(configs, locale);
-					if (!resolvedLocale) {
-						return defaultResult(initialLocale);
-					}
-					locale = resolvedLocale;
-					const packConfig = configs[locale];
-					let mainPack;
-					if (!packConfig || typeof packConfig.hash !== 'string' || !packConfig.translations || typeof (mainPack = packConfig.translations['vscode']) !== 'string') {
-						return defaultResult(initialLocale);
-					}
-					return exists(mainPack).then(fileExists => {
-						if (!fileExists) {
-							return defaultResult(initialLocale);
-						}
-						const packId = packConfig.hash + '.' + locale;
-						const cacheRoot = path.join(userDataPath, 'clp', packId);
-						const coreLocation = path.join(cacheRoot, commit);
-						const translationsConfigFile = path.join(cacheRoot, 'tcf.json');
-						const corruptedFile = path.join(cacheRoot, 'corrupted.info');
-						const result = {
-							locale: initialLocale,
-							osLocale,
-							availableLanguages: { '*': locale },
-							_languagePackId: packId,
-							_translationsConfigFile: translationsConfigFile,
-							_cacheRoot: cacheRoot,
-							_resolvedLanguagePackCoreLocation: coreLocation,
-							_corruptedFile: corruptedFile
-						};
-						return exists(corruptedFile).then(corrupted => {
-							// The nls cache directory is corrupted.
-							let toDelete;
-							if (corrupted) {
-								toDelete = rimraf(cacheRoot);
-							} else {
-								toDelete = Promise.resolve(undefined);
-							}
-							return toDelete.then(() => {
-								return exists(coreLocation).then(fileExists => {
-									if (fileExists) {
-										// We don't wait for this. No big harm if we can't touch
-										touch(coreLocation).catch(() => { });
-										perf.mark('code/didGenerateNls');
-										return result;
-									}
-									return mkdirp(coreLocation).then(() => {
-										return Promise.all([readFile(metaDataFile), readFile(mainPack)]);
-									}).then(values => {
-										const metadata = JSON.parse(values[0]);
-										const packData = JSON.parse(values[1]).contents;
-										const bundles = Object.keys(metadata.bundles);
-										const writes = [];
-										for (const bundle of bundles) {
-											const modules = metadata.bundles[bundle];
-											const target = Object.create(null);
-											for (const module of modules) {
-												const keys = metadata.keys[module];
-												const defaultMessages = metadata.messages[module];
-												const translations = packData[module];
-												let targetStrings;
-												if (translations) {
-													targetStrings = [];
-													for (let i = 0; i < keys.length; i++) {
-														const elem = keys[i];
-														const key = typeof elem === 'string' ? elem : elem.key;
-														let translatedMessage = translations[key];
-														if (translatedMessage === undefined) {
-															translatedMessage = defaultMessages[i];
-														}
-														targetStrings.push(translatedMessage);
-													}
-												} else {
-													targetStrings = defaultMessages;
-												}
-												target[module] = targetStrings;
-											}
-											writes.push(writeFile(path.join(coreLocation, bundle.replace(/\//g, '!') + '.nls.json'), JSON.stringify(target)));
-										}
-										writes.push(writeFile(translationsConfigFile, JSON.stringify(packConfig.translations)));
-										return Promise.all(writes);
-									}).then(() => {
-										perf.mark('code/didGenerateNls');
-										return result;
-									}).catch(err => {
-										console.error('Generating translation files failed.', err);
-										return defaultResult(locale);
-									});
-								});
-							});
-						});
-					});
-				});
-			} catch (err) {
-				console.error('Generating translation files failed.', err);
-				return defaultResult(locale);
-			}
-		}
-
-		return {
-			getNLSConfiguration
-		};
-	}
-
-	if (typeof define === 'function') {
-		// amd
-		define(['path', 'fs', 'vs/base/common/performance'], function (/** @type {typeof import('path')} */ path, /** @type {typeof import('fs')} */ fs, /** @type {typeof import('../common/performance')} */ perf) { return factory(path, fs, perf); });
-	} else if (typeof module === 'object' && typeof module.exports === 'object') {
-		const path = require('path');
-		const fs = require('fs');
-		const perf = require('../common/performance');
-		module.exports = factory(path, fs, perf);
-	} else {
-		throw new Error('Unknown context');
-	}
-}());
diff --git a/src/vs/base/node/nls.ts b/src/vs/base/node/nls.ts
new file mode 100644
index 00000000000..c0784d05155
--- /dev/null
+++ b/src/vs/base/node/nls.ts
@@ -0,0 +1,233 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as path from 'path';
+import * as fs from 'fs';
+import * as perf from '../common/performance.js';
+import type { ILanguagePacks, INLSConfiguration } from '../../nls.js';
+
+export interface IResolveNLSConfigurationContext {
+
+	/**
+	 * Location where `nls.messages.json` and `nls.keys.json` are stored.
+	 */
+	readonly nlsMetadataPath: string;
+
+	/**
+	 * Path to the user data directory. Used as a cache for
+	 * language packs converted to the format we need.
+	 */
+	readonly userDataPath: string;
+
+	/**
+	 * Commit of the running application. Can be `undefined`
+	 * when not built.
+	 */
+	readonly commit: string | undefined;
+
+	/**
+	 * Locale as defined in `argv.json` or `app.getLocale()`.
+	 */
+	readonly userLocale: string;
+
+	/**
+	 * Locale as defined by the OS (e.g. `app.getPreferredSystemLanguages()`).
+	 */
+	readonly osLocale: string;
+}
+
+export async function resolveNLSConfiguration({ userLocale, osLocale, userDataPath, commit, nlsMetadataPath }: IResolveNLSConfigurationContext): Promise<INLSConfiguration> {
+	perf.mark('code/willGenerateNls');
+
+	if (
+		process.env['VSCODE_DEV'] ||
+		userLocale === 'pseudo' ||
+		userLocale.startsWith('en') ||
+		!commit ||
+		!userDataPath
+	) {
+		return defaultNLSConfiguration(userLocale, osLocale, nlsMetadataPath);
+	}
+
+	try {
+		const languagePacks = await getLanguagePackConfigurations(userDataPath);
+		if (!languagePacks) {
+			return defaultNLSConfiguration(userLocale, osLocale, nlsMetadataPath);
+		}
+
+		const resolvedLanguage = resolveLanguagePackLanguage(languagePacks, userLocale);
+		if (!resolvedLanguage) {
+			return defaultNLSConfiguration(userLocale, osLocale, nlsMetadataPath);
+		}
+
+		const languagePack = languagePacks[resolvedLanguage];
+		const mainLanguagePackPath = languagePack?.translations?.['vscode'];
+		if (
+			!languagePack ||
+			typeof languagePack.hash !== 'string' ||
+			!languagePack.translations ||
+			typeof mainLanguagePackPath !== 'string' ||
+			!(await exists(mainLanguagePackPath))
+		) {
+			return defaultNLSConfiguration(userLocale, osLocale, nlsMetadataPath);
+		}
+
+		const languagePackId = `${languagePack.hash}.${resolvedLanguage}`;
+		const globalLanguagePackCachePath = path.join(userDataPath, 'clp', languagePackId);
+		const commitLanguagePackCachePath = path.join(globalLanguagePackCachePath, commit);
+		const languagePackMessagesFile = path.join(commitLanguagePackCachePath, 'nls.messages.json');
+		const translationsConfigFile = path.join(globalLanguagePackCachePath, 'tcf.json');
+		const languagePackCorruptMarkerFile = path.join(globalLanguagePackCachePath, 'corrupted.info');
+
+		if (await exists(languagePackCorruptMarkerFile)) {
+			await fs.promises.rm(globalLanguagePackCachePath, { recursive: true, force: true, maxRetries: 3 }); // delete corrupted cache folder
+		}
+
+		const result: INLSConfiguration = {
+			userLocale,
+			osLocale,
+			resolvedLanguage,
+			defaultMessagesFile: path.join(nlsMetadataPath, 'nls.messages.json'),
+			languagePack: {
+				translationsConfigFile,
+				messagesFile: languagePackMessagesFile,
+				corruptMarkerFile: languagePackCorruptMarkerFile
+			},
+
+			// NLS: below properties are a relic from old times only used by vscode-nls and deprecated
+			locale: userLocale,
+			availableLanguages: { '*': resolvedLanguage },
+			_languagePackId: languagePackId,
+			_languagePackSupport: true,
+			_translationsConfigFile: translationsConfigFile,
+			_cacheRoot: globalLanguagePackCachePath,
+			_resolvedLanguagePackCoreLocation: commitLanguagePackCachePath,
+			_corruptedFile: languagePackCorruptMarkerFile
+		};
+
+		if (await exists(commitLanguagePackCachePath)) {
+			touch(commitLanguagePackCachePath).catch(() => { }); // We don't wait for this. No big harm if we can't touch
+			perf.mark('code/didGenerateNls');
+			return result;
+		}
+
+		const [
+			,
+			nlsDefaultKeys,
+			nlsDefaultMessages,
+			nlsPackdata
+		]:
+			[unknown, Array<[string, string[]]>, string[], { contents: Record<string, Record<string, string>> }]
+			//               ^moduleId ^nlsKeys                               ^moduleId      ^nlsKey ^nlsValue
+			= await Promise.all([
+				fs.promises.mkdir(commitLanguagePackCachePath, { recursive: true }),
+				JSON.parse(await fs.promises.readFile(path.join(nlsMetadataPath, 'nls.keys.json'), 'utf-8')),
+				JSON.parse(await fs.promises.readFile(path.join(nlsMetadataPath, 'nls.messages.json'), 'utf-8')),
+				JSON.parse(await fs.promises.readFile(mainLanguagePackPath, 'utf-8'))
+			]);
+
+		const nlsResult: string[] = [];
+
+		// We expect NLS messages to be in a flat array in sorted order as they
+		// where produced during build time. We use `nls.keys.json` to know the
+		// right order and then lookup the related message from the translation.
+		// If a translation does not exist, we fallback to the default message.
+
+		let nlsIndex = 0;
+		for (const [moduleId, nlsKeys] of nlsDefaultKeys) {
+			const moduleTranslations = nlsPackdata.contents[moduleId];
+			for (const nlsKey of nlsKeys) {
+				nlsResult.push(moduleTranslations?.[nlsKey] || nlsDefaultMessages[nlsIndex]);
+				nlsIndex++;
+			}
+		}
+
+		await Promise.all([
+			fs.promises.writeFile(languagePackMessagesFile, JSON.stringify(nlsResult), 'utf-8'),
+			fs.promises.writeFile(translationsConfigFile, JSON.stringify(languagePack.translations), 'utf-8')
+		]);
+
+		perf.mark('code/didGenerateNls');
+
+		return result;
+	} catch (error) {
+		console.error('Generating translation files failed.', error);
+	}
+
+	return defaultNLSConfiguration(userLocale, osLocale, nlsMetadataPath);
+}
+
+/**
+ * The `languagepacks.json` file is a JSON file that contains all metadata
+ * about installed language extensions per language. Specifically, for
+ * core (`vscode`) and all extensions it supports, it points to the related
+ * translation files.
+ *
+ * The file is updated whenever a new language pack is installed or removed.
+ */
+async function getLanguagePackConfigurations(userDataPath: string): Promise<ILanguagePacks | undefined> {
+	const configFile = path.join(userDataPath, 'languagepacks.json');
+	try {
+		return JSON.parse(await fs.promises.readFile(configFile, 'utf-8'));
+	} catch (err) {
+		return undefined; // Do nothing. If we can't read the file we have no language pack config.
+	}
+}
+
+function resolveLanguagePackLanguage(languagePacks: ILanguagePacks, locale: string | undefined): string | undefined {
+	try {
+		while (locale) {
+			if (languagePacks[locale]) {
+				return locale;
+			}
+
+			const index = locale.lastIndexOf('-');
+			if (index > 0) {
+				locale = locale.substring(0, index);
+			} else {
+				return undefined;
+			}
+		}
+	} catch (error) {
+		console.error('Resolving language pack configuration failed.', error);
+	}
+
+	return undefined;
+}
+
+function defaultNLSConfiguration(userLocale: string, osLocale: string, nlsMetadataPath: string): INLSConfiguration {
+	perf.mark('code/didGenerateNls');
+
+	return {
+		userLocale,
+		osLocale,
+		resolvedLanguage: 'en',
+		defaultMessagesFile: path.join(nlsMetadataPath, 'nls.messages.json'),
+
+		// NLS: below 2 are a relic from old times only used by vscode-nls and deprecated
+		locale: userLocale,
+		availableLanguages: {}
+	};
+}
+
+//#region fs helpers
+
+async function exists(path: string): Promise<boolean> {
+	try {
+		await fs.promises.access(path);
+
+		return true;
+	} catch {
+		return false;
+	}
+}
+
+function touch(path: string): Promise<void> {
+	const date = new Date();
+
+	return fs.promises.utimes(path, date, date);
+}
+
+//#endregion
diff --git a/src/vs/base/node/nodeStreams.ts b/src/vs/base/node/nodeStreams.ts
index 0719bb46787..0dba130a07d 100644
--- a/src/vs/base/node/nodeStreams.ts
+++ b/src/vs/base/node/nodeStreams.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import { Transform } from 'stream';
-import { binaryIndexOf } from 'vs/base/common/buffer';
+import { binaryIndexOf } from '../common/buffer.js';
 
 /**
  * A Transform stream that splits the input on the "splitter" substring.
diff --git a/src/vs/base/node/osDisplayProtocolInfo.ts b/src/vs/base/node/osDisplayProtocolInfo.ts
index c028dc88536..2dbc302e02a 100644
--- a/src/vs/base/node/osDisplayProtocolInfo.ts
+++ b/src/vs/base/node/osDisplayProtocolInfo.ts
@@ -3,10 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { constants as FSConstants } from 'fs';
-import { access } from 'fs/promises';
-import { join } from 'vs/base/common/path';
-import { env } from 'vs/base/common/process';
+import { constants as FSConstants, promises as FSPromises } from 'fs';
+import { join } from '../common/path.js';
+import { env } from '../common/process.js';
 
 const XDG_SESSION_TYPE = 'XDG_SESSION_TYPE';
 const WAYLAND_DISPLAY = 'WAYLAND_DISPLAY';
@@ -44,7 +43,7 @@ export async function getDisplayProtocol(errorLogger: (error: any) => void): Pro
 				const waylandServerPipe = join(xdgRuntimeDir, 'wayland-0');
 
 				try {
-					await access(waylandServerPipe, FSConstants.R_OK);
+					await FSPromises.access(waylandServerPipe, FSConstants.R_OK);
 
 					// If the file exists, then the session is wayland.
 					return DisplayProtocolType.Wayland;
diff --git a/src/vs/base/node/osReleaseInfo.ts b/src/vs/base/node/osReleaseInfo.ts
index f72b0fe82ba..8c34493531f 100644
--- a/src/vs/base/node/osReleaseInfo.ts
+++ b/src/vs/base/node/osReleaseInfo.ts
@@ -3,10 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { constants as FSConstants } from 'fs';
-import { open, FileHandle } from 'fs/promises';
+import { constants as FSConstants, promises as FSPromises } from 'fs';
 import { createInterface as readLines } from 'readline';
-import * as Platform from 'vs/base/common/platform';
+import * as Platform from '../common/platform.js';
 
 type ReleaseInfo = {
 	id: string;
@@ -22,10 +21,10 @@ export async function getOSReleaseInfo(errorLogger: (error: any) => void): Promi
 	// Extract release information on linux based systems
 	// using the identifiers specified in
 	// https://www.freedesktop.org/software/systemd/man/os-release.html
-	let handle: FileHandle | undefined;
+	let handle: FSPromises.FileHandle | undefined;
 	for (const filePath of ['/etc/os-release', '/usr/lib/os-release', '/etc/lsb-release']) {
 		try {
-			handle = await open(filePath, FSConstants.R_OK);
+			handle = await FSPromises.open(filePath, FSConstants.R_OK);
 			break;
 		} catch (err) { }
 	}
diff --git a/src/vs/base/node/pfs.ts b/src/vs/base/node/pfs.ts
index 1c0ce081625..6b7e1ee55de 100644
--- a/src/vs/base/node/pfs.ts
+++ b/src/vs/base/node/pfs.ts
@@ -6,13 +6,13 @@
 import * as fs from 'fs';
 import { tmpdir } from 'os';
 import { promisify } from 'util';
-import { ResourceQueue, timeout } from 'vs/base/common/async';
-import { isEqualOrParent, isRootOrDriveLetter, randomPath } from 'vs/base/common/extpath';
-import { normalizeNFC } from 'vs/base/common/normalization';
-import { join } from 'vs/base/common/path';
-import { isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
-import { extUriBiasedIgnorePathCase } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
+import { ResourceQueue, timeout } from '../common/async.js';
+import { isEqualOrParent, isRootOrDriveLetter, randomPath } from '../common/extpath.js';
+import { normalizeNFC } from '../common/normalization.js';
+import { join } from '../common/path.js';
+import { isLinux, isMacintosh, isWindows } from '../common/platform.js';
+import { extUriBiasedIgnorePathCase } from '../common/resources.js';
+import { URI } from '../common/uri.js';
 
 //#region rimraf
 
@@ -134,7 +134,7 @@ async function safeReaddirWithFileTypes(path: string): Promise<IDirent[]> {
 		let isSymbolicLink = false;
 
 		try {
-			const lstat = await Promises.lstat(join(path, child));
+			const lstat = await fs.promises.lstat(join(path, child));
 
 			isFile = lstat.isFile();
 			isDirectory = lstat.isDirectory();
@@ -259,7 +259,7 @@ export namespace SymlinkSupport {
 		// First stat the link
 		let lstats: fs.Stats | undefined;
 		try {
-			lstats = await Promises.lstat(path);
+			lstats = await fs.promises.lstat(path);
 
 			// Return early if the stat is not a symbolic link at all
 			if (!lstats.isSymbolicLink()) {
@@ -272,7 +272,7 @@ export namespace SymlinkSupport {
 		// If the stat is a symbolic link or failed to stat, use fs.stat()
 		// which for symbolic links will stat the target they point to
 		try {
-			const stats = await Promises.stat(path);
+			const stats = await fs.promises.stat(path);
 
 			return { stat: stats, symbolicLink: lstats?.isSymbolicLink() ? { dangling: false } : undefined };
 		} catch (error) {
@@ -287,7 +287,7 @@ export namespace SymlinkSupport {
 			// are not supported (https://github.com/nodejs/node/issues/36790)
 			if (isWindows && error.code === 'EACCES') {
 				try {
-					const stats = await Promises.stat(await Promises.readlink(path));
+					const stats = await fs.promises.stat(await fs.promises.readlink(path));
 
 					return { stat: stats, symbolicLink: { dangling: false } };
 				} catch (error) {
@@ -620,7 +620,7 @@ async function doCopy(source: string, target: string, payload: ICopyPayload): Pr
 async function doCopyDirectory(source: string, target: string, mode: number, payload: ICopyPayload): Promise<void> {
 
 	// Create folder
-	await Promises.mkdir(target, { recursive: true, mode });
+	await fs.promises.mkdir(target, { recursive: true, mode });
 
 	// Copy each file recursively
 	const files = await readdir(source);
@@ -632,16 +632,16 @@ async function doCopyDirectory(source: string, target: string, mode: number, pay
 async function doCopyFile(source: string, target: string, mode: number): Promise<void> {
 
 	// Copy file
-	await Promises.copyFile(source, target);
+	await fs.promises.copyFile(source, target);
 
 	// restore mode (https://github.com/nodejs/node/issues/1104)
-	await Promises.chmod(target, mode);
+	await fs.promises.chmod(target, mode);
 }
 
 async function doCopySymlink(source: string, target: string, payload: ICopyPayload): Promise<void> {
 
 	// Figure out link target
-	let linkTarget = await Promises.readlink(source);
+	let linkTarget = await fs.promises.readlink(source);
 
 	// Special case: the symlink points to a target that is
 	// actually within the path that is being copied. In that
@@ -652,7 +652,7 @@ async function doCopySymlink(source: string, target: string, payload: ICopyPaylo
 	}
 
 	// Create symlink
-	await Promises.symlink(linkTarget, target);
+	await fs.promises.symlink(linkTarget, target);
 }
 
 //#endregion
@@ -660,28 +660,19 @@ async function doCopySymlink(source: string, target: string, payload: ICopyPaylo
 //#region Promise based fs methods
 
 /**
- * Provides promise based 'fs' methods by wrapping around the
- * original callback based methods.
+ * Some low level `fs` methods provided as `Promises` similar to
+ * `fs.promises` but with notable differences, either implemented
+ * by us or by restoring the original callback based behavior.
  *
  * At least `realpath` is implemented differently in the promise
  * based implementation compared to the callback based one. The
  * promise based implementation actually calls `fs.realpath.native`.
  * (https://github.com/microsoft/vscode/issues/118562)
- *
- * TODO@bpasero we should move away from this towards `fs.promises`
- * eventually and only keep those methods around where we explicitly
- * want the callback based behaviour.
  */
 export const Promises = new class {
 
 	//#region Implemented by node.js
 
-	get access() { return fs.promises.access; }
-
-	get stat() { return fs.promises.stat; }
-	get lstat() { return fs.promises.lstat; }
-	get utimes() { return fs.promises.utimes; }
-
 	get read() {
 
 		// Not using `promisify` here for a reason: the return
@@ -700,7 +691,6 @@ export const Promises = new class {
 			});
 		};
 	}
-	get readFile() { return fs.promises.readFile; }
 
 	get write() {
 
@@ -721,26 +711,11 @@ export const Promises = new class {
 		};
 	}
 
-	get appendFile() { return fs.promises.appendFile; }
-
 	get fdatasync() { return promisify(fs.fdatasync); } // not exposed as API in 20.x yet
-	get truncate() { return fs.promises.truncate; }
-
-	get copyFile() { return fs.promises.copyFile; }
 
 	get open() { return promisify(fs.open); } 			// changed to return `FileHandle` in promise API
 	get close() { return promisify(fs.close); } 		// not exposed as API due to the `FileHandle` return type of `open`
 
-	get symlink() { return fs.promises.symlink; }
-	get readlink() { return fs.promises.readlink; }
-
-	get chmod() { return fs.promises.chmod; }
-
-	get mkdir() { return fs.promises.mkdir; }
-
-	get unlink() { return fs.promises.unlink; }
-	get rmdir() { return fs.promises.rmdir; }
-
 	get realpath() { return promisify(fs.realpath); }	// `fs.promises.realpath` will use `fs.realpath.native` which we do not want
 
 	//#endregion
@@ -749,7 +724,7 @@ export const Promises = new class {
 
 	async exists(path: string): Promise<boolean> {
 		try {
-			await Promises.access(path);
+			await fs.promises.access(path);
 
 			return true;
 		} catch {
diff --git a/src/vs/base/node/powershell.ts b/src/vs/base/node/powershell.ts
index c24c14f7c94..05d68e3cefd 100644
--- a/src/vs/base/node/powershell.ts
+++ b/src/vs/base/node/powershell.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as os from 'os';
-import * as path from 'vs/base/common/path';
-import * as pfs from 'vs/base/node/pfs';
+import * as path from '../common/path.js';
+import * as pfs from './pfs.js';
 
 // This is required, since parseInt("7-preview") will return 7.
 const IntRegex: RegExp = /^\d+$/;
diff --git a/src/vs/base/node/processes.ts b/src/vs/base/node/processes.ts
index 9c07f106711..bbf15d0db8e 100644
--- a/src/vs/base/node/processes.ts
+++ b/src/vs/base/node/processes.ts
@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as cp from 'child_process';
-import { Stats } from 'fs';
-import * as path from 'vs/base/common/path';
-import * as Platform from 'vs/base/common/platform';
-import * as process from 'vs/base/common/process';
-import { CommandOptions, ForkOptions, Source, SuccessData, TerminateResponse, TerminateResponseCode } from 'vs/base/common/processes';
-import * as Types from 'vs/base/common/types';
-import * as pfs from 'vs/base/node/pfs';
+import { Stats, promises } from 'fs';
+import * as path from '../common/path.js';
+import * as Platform from '../common/platform.js';
+import * as process from '../common/process.js';
+import { CommandOptions, ForkOptions, Source, SuccessData, TerminateResponse, TerminateResponseCode } from '../common/processes.js';
+import * as Types from '../common/types.js';
+import * as pfs from './pfs.js';
 export { type CommandOptions, type ForkOptions, type SuccessData, Source, type TerminateResponse, TerminateResponseCode };
 
 export type ValueCallback<T> = (value: T | Promise<T>) => void;
@@ -91,11 +91,11 @@ export namespace win32 {
 			if (await pfs.Promises.exists(path)) {
 				let statValue: Stats | undefined;
 				try {
-					statValue = await pfs.Promises.stat(path);
+					statValue = await promises.stat(path);
 				} catch (e) {
 					if (e.message.startsWith('EACCES')) {
 						// it might be symlink
-						statValue = await pfs.Promises.lstat(path);
+						statValue = await promises.lstat(path);
 					}
 				}
 				return statValue ? !statValue.isDirectory() : false;
diff --git a/src/vs/base/node/ps.ts b/src/vs/base/node/ps.ts
index 89c2df71e86..c17f8589129 100644
--- a/src/vs/base/node/ps.ts
+++ b/src/vs/base/node/ps.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { exec } from 'child_process';
-import { FileAccess } from 'vs/base/common/network';
-import { ProcessItem } from 'vs/base/common/processes';
+import { FileAccess } from '../common/network.js';
+import { ProcessItem } from '../common/processes.js';
 
 export function listProcesses(rootPid: number): Promise<ProcessItem> {
 
diff --git a/src/vs/base/node/shell.ts b/src/vs/base/node/shell.ts
index 55d97ca3580..ab2c0d1c693 100644
--- a/src/vs/base/node/shell.ts
+++ b/src/vs/base/node/shell.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { userInfo } from 'os';
-import * as platform from 'vs/base/common/platform';
-import { getFirstAvailablePowerShellInstallation } from 'vs/base/node/powershell';
-import * as processes from 'vs/base/node/processes';
+import * as platform from '../common/platform.js';
+import { getFirstAvailablePowerShellInstallation } from './powershell.js';
+import * as processes from './processes.js';
 
 /**
  * Gets the detected default shell for the _system_, not to be confused with VS Code's _default_
diff --git a/src/vs/base/node/terminalEncoding.ts b/src/vs/base/node/terminalEncoding.ts
index 32ff35ea028..287d36d3790 100644
--- a/src/vs/base/node/terminalEncoding.ts
+++ b/src/vs/base/node/terminalEncoding.ts
@@ -7,7 +7,7 @@
  * This code is also used by standalone cli's. Avoid adding dependencies to keep the size of the cli small.
  */
 import { exec } from 'child_process';
-import { isWindows } from 'vs/base/common/platform';
+import { isWindows } from '../common/platform.js';
 
 const windowsTerminalEncodings = {
 	'437': 'cp437', // United States
diff --git a/src/vs/base/node/unc.d.ts b/src/vs/base/node/unc.d.ts
deleted file mode 100644
index d131bba5d85..00000000000
--- a/src/vs/base/node/unc.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-/**
- * Helper to get the hostname of a possible UNC path.
- */
-export function getUNCHost(maybeUNCPath: string | undefined | null): string | undefined;
-
-/**
- * Returns the current list of allowed UNC hosts as defined by node.js.
- */
-export function getUNCHostAllowlist(): string[];
-
-/**
- * Adds one to many UNC host(s) to the allowed list in node.js.
- */
-export function addUNCHostToAllowlist(allowedHost: string | string[]): void;
-
-/**
- * Disables UNC Host allow list in node.js and thus disables UNC
- * path validation.
- */
-export function disableUNCAccessRestrictions(): void;
-
-/**
- * Whether UNC Host allow list in node.js is disabled.
- */
-export function isUNCAccessRestrictionsDisabled(): boolean;
diff --git a/src/vs/base/node/unc.js b/src/vs/base/node/unc.js
deleted file mode 100644
index b0af4d38b68..00000000000
--- a/src/vs/base/node/unc.js
+++ /dev/null
@@ -1,146 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-//@ts-check
-
-(function () {
-	function factory() {
-
-		/**
-		 * @returns {Set<string> | undefined}
-		 */
-		function processUNCHostAllowlist() {
-
-			// The property `process.uncHostAllowlist` is not available in official node.js
-			// releases, only in our own builds, so we have to probe for availability
-
-			return process.uncHostAllowlist;
-		}
-
-		/**
-		 * @param {unknown} arg0
-		 * @returns {string[]}
-		 */
-		function toSafeStringArray(arg0) {
-			const allowedUNCHosts = new Set();
-
-			if (Array.isArray(arg0)) {
-				for (const host of arg0) {
-					if (typeof host === 'string') {
-						allowedUNCHosts.add(host);
-					}
-				}
-			}
-
-			return Array.from(allowedUNCHosts);
-		}
-
-		/**
-		 * @returns {string[]}
-		 */
-		function getUNCHostAllowlist() {
-			const allowlist = processUNCHostAllowlist();
-			if (allowlist) {
-				return Array.from(allowlist);
-			}
-
-			return [];
-		}
-
-		/**
-		 * @param {string | string[]} allowedHost
-		 */
-		function addUNCHostToAllowlist(allowedHost) {
-			if (process.platform !== 'win32') {
-				return;
-			}
-
-			const allowlist = processUNCHostAllowlist();
-			if (allowlist) {
-				if (typeof allowedHost === 'string') {
-					allowlist.add(allowedHost.toLowerCase()); // UNC hosts are case-insensitive
-				} else {
-					for (const host of toSafeStringArray(allowedHost)) {
-						addUNCHostToAllowlist(host);
-					}
-				}
-			}
-		}
-
-		/**
-		 * @param {string | undefined | null} maybeUNCPath
-		 * @returns {string | undefined}
-		 */
-		function getUNCHost(maybeUNCPath) {
-			if (typeof maybeUNCPath !== 'string') {
-				return undefined; // require a valid string
-			}
-
-			const uncRoots = [
-				'\\\\.\\UNC\\',	// DOS Device paths (https://learn.microsoft.com/en-us/dotnet/standard/io/file-path-formats)
-				'\\\\?\\UNC\\',
-				'\\\\'			// standard UNC path
-			];
-
-			let host = undefined;
-
-			for (const uncRoot of uncRoots) {
-				const indexOfUNCRoot = maybeUNCPath.indexOf(uncRoot);
-				if (indexOfUNCRoot !== 0) {
-					continue; // not matching any of our expected UNC roots
-				}
-
-				const indexOfUNCPath = maybeUNCPath.indexOf('\\', uncRoot.length);
-				if (indexOfUNCPath === -1) {
-					continue; // no path component found
-				}
-
-				const hostCandidate = maybeUNCPath.substring(uncRoot.length, indexOfUNCPath);
-				if (hostCandidate) {
-					host = hostCandidate;
-					break;
-				}
-			}
-
-			return host;
-		}
-
-		function disableUNCAccessRestrictions() {
-			if (process.platform !== 'win32') {
-				return;
-			}
-
-			process.restrictUNCAccess = false;
-		}
-
-		function isUNCAccessRestrictionsDisabled() {
-			if (process.platform !== 'win32') {
-				return true;
-			}
-
-			return process.restrictUNCAccess === false;
-		}
-
-		return {
-			getUNCHostAllowlist,
-			addUNCHostToAllowlist,
-			getUNCHost,
-			disableUNCAccessRestrictions,
-			isUNCAccessRestrictionsDisabled
-		};
-	}
-
-	if (typeof define === 'function') {
-		// amd
-		define([], function () { return factory(); });
-	} else if (typeof module === 'object' && typeof module.exports === 'object') {
-		// commonjs
-		module.exports = factory();
-	} else {
-		console.trace('vs/base/node/unc defined in UNKNOWN context (neither requirejs or commonjs)');
-	}
-})();
diff --git a/src/vs/base/node/unc.ts b/src/vs/base/node/unc.ts
new file mode 100644
index 00000000000..e51fed72d1a
--- /dev/null
+++ b/src/vs/base/node/unc.ts
@@ -0,0 +1,102 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+export function getUNCHostAllowlist(): string[] {
+	const allowlist = processUNCHostAllowlist();
+	if (allowlist) {
+		return Array.from(allowlist);
+	}
+
+	return [];
+}
+
+function processUNCHostAllowlist(): Set<string> {
+
+	// The property `process.uncHostAllowlist` is not available in official node.js
+	// releases, only in our own builds, so we have to probe for availability
+
+	return (process as any).uncHostAllowlist;
+}
+
+export function addUNCHostToAllowlist(allowedHost: string | string[]): void {
+	if (process.platform !== 'win32') {
+		return;
+	}
+
+	const allowlist = processUNCHostAllowlist();
+	if (allowlist) {
+		if (typeof allowedHost === 'string') {
+			allowlist.add(allowedHost.toLowerCase()); // UNC hosts are case-insensitive
+		} else {
+			for (const host of toSafeStringArray(allowedHost)) {
+				addUNCHostToAllowlist(host);
+			}
+		}
+	}
+}
+
+function toSafeStringArray(arg0: unknown): string[] {
+	const allowedUNCHosts = new Set<string>();
+
+	if (Array.isArray(arg0)) {
+		for (const host of arg0) {
+			if (typeof host === 'string') {
+				allowedUNCHosts.add(host);
+			}
+		}
+	}
+
+	return Array.from(allowedUNCHosts);
+}
+
+export function getUNCHost(maybeUNCPath: string | undefined | null): string | undefined {
+	if (typeof maybeUNCPath !== 'string') {
+		return undefined; // require a valid string
+	}
+
+	const uncRoots = [
+		'\\\\.\\UNC\\',	// DOS Device paths (https://learn.microsoft.com/en-us/dotnet/standard/io/file-path-formats)
+		'\\\\?\\UNC\\',
+		'\\\\'			// standard UNC path
+	];
+
+	let host = undefined;
+
+	for (const uncRoot of uncRoots) {
+		const indexOfUNCRoot = maybeUNCPath.indexOf(uncRoot);
+		if (indexOfUNCRoot !== 0) {
+			continue; // not matching any of our expected UNC roots
+		}
+
+		const indexOfUNCPath = maybeUNCPath.indexOf('\\', uncRoot.length);
+		if (indexOfUNCPath === -1) {
+			continue; // no path component found
+		}
+
+		const hostCandidate = maybeUNCPath.substring(uncRoot.length, indexOfUNCPath);
+		if (hostCandidate) {
+			host = hostCandidate;
+			break;
+		}
+	}
+
+	return host;
+}
+
+export function disableUNCAccessRestrictions(): void {
+	if (process.platform !== 'win32') {
+		return;
+	}
+
+	(process as any).restrictUNCAccess = false;
+}
+
+export function isUNCAccessRestrictionsDisabled(): boolean {
+	if (process.platform !== 'win32') {
+		return true;
+	}
+
+	return (process as any).restrictUNCAccess === false;
+}
diff --git a/src/vs/base/node/zip.ts b/src/vs/base/node/zip.ts
index c0d9b4b8ecb..8de90376c70 100644
--- a/src/vs/base/node/zip.ts
+++ b/src/vs/base/node/zip.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createWriteStream, WriteStream } from 'fs';
+import { createWriteStream, WriteStream, promises } from 'fs';
 import { Readable } from 'stream';
-import { createCancelablePromise, Sequencer } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import * as path from 'vs/base/common/path';
-import { assertIsDefined } from 'vs/base/common/types';
-import { Promises } from 'vs/base/node/pfs';
-import * as nls from 'vs/nls';
+import { createCancelablePromise, Sequencer } from '../common/async.js';
+import { CancellationToken } from '../common/cancellation.js';
+import * as path from '../common/path.js';
+import { assertIsDefined } from '../common/types.js';
+import { Promises } from './pfs.js';
+import * as nls from '../../nls.js';
 import type { Entry, ZipFile } from 'yauzl';
 
 export const CorruptZipMessage: string = 'end of central directory record signature not found';
@@ -85,7 +85,7 @@ function extractEntry(stream: Readable, fileName: string, mode: number, targetPa
 		istream?.destroy();
 	});
 
-	return Promise.resolve(Promises.mkdir(targetDirName, { recursive: true })).then(() => new Promise<void>((c, e) => {
+	return Promise.resolve(promises.mkdir(targetDirName, { recursive: true })).then(() => new Promise<void>((c, e) => {
 		if (token.isCancellationRequested) {
 			return;
 		}
@@ -148,7 +148,7 @@ function extractZip(zipfile: ZipFile, targetPath: string, options: IOptions, tok
 			// directory file names end with '/'
 			if (/\/$/.test(fileName)) {
 				const targetFileName = path.join(targetPath, fileName);
-				last = createCancelablePromise(token => Promises.mkdir(targetFileName, { recursive: true }).then(() => readNextEntry(token)).then(undefined, e));
+				last = createCancelablePromise(token => promises.mkdir(targetFileName, { recursive: true }).then(() => readNextEntry(token)).then(undefined, e));
 				return;
 			}
 
diff --git a/src/vs/base/parts/contextmenu/electron-main/contextmenu.ts b/src/vs/base/parts/contextmenu/electron-main/contextmenu.ts
index a11a419bf55..988c43285f1 100644
--- a/src/vs/base/parts/contextmenu/electron-main/contextmenu.ts
+++ b/src/vs/base/parts/contextmenu/electron-main/contextmenu.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IpcMainEvent, Menu, MenuItem } from 'electron';
-import { validatedIpcMain } from 'vs/base/parts/ipc/electron-main/ipcMain';
-import { CONTEXT_MENU_CHANNEL, CONTEXT_MENU_CLOSE_CHANNEL, IPopupOptions, ISerializableContextMenuItem } from 'vs/base/parts/contextmenu/common/contextmenu';
+import { validatedIpcMain } from '../../ipc/electron-main/ipcMain.js';
+import { CONTEXT_MENU_CHANNEL, CONTEXT_MENU_CLOSE_CHANNEL, IPopupOptions, ISerializableContextMenuItem } from '../common/contextmenu.js';
 
 export function registerContextMenuListener(): void {
 	validatedIpcMain.on(CONTEXT_MENU_CHANNEL, (event: IpcMainEvent, contextMenuId: number, items: ISerializableContextMenuItem[], onClickChannel: string, options?: IPopupOptions) => {
diff --git a/src/vs/base/parts/contextmenu/electron-sandbox/contextmenu.ts b/src/vs/base/parts/contextmenu/electron-sandbox/contextmenu.ts
index 74ca18173c0..845cf33c343 100644
--- a/src/vs/base/parts/contextmenu/electron-sandbox/contextmenu.ts
+++ b/src/vs/base/parts/contextmenu/electron-sandbox/contextmenu.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CONTEXT_MENU_CHANNEL, CONTEXT_MENU_CLOSE_CHANNEL, IContextMenuEvent, IContextMenuItem, IPopupOptions, ISerializableContextMenuItem } from 'vs/base/parts/contextmenu/common/contextmenu';
-import { ipcRenderer } from 'vs/base/parts/sandbox/electron-sandbox/globals';
+import { CONTEXT_MENU_CHANNEL, CONTEXT_MENU_CLOSE_CHANNEL, IContextMenuEvent, IContextMenuItem, IPopupOptions, ISerializableContextMenuItem } from '../common/contextmenu.js';
+import { ipcRenderer } from '../../sandbox/electron-sandbox/globals.js';
 
 let contextMenuIdPool = 0;
 
diff --git a/src/vs/base/parts/ipc/browser/ipc.mp.ts b/src/vs/base/parts/ipc/browser/ipc.mp.ts
index a5871ddbf52..f1c882b6539 100644
--- a/src/vs/base/parts/ipc/browser/ipc.mp.ts
+++ b/src/vs/base/parts/ipc/browser/ipc.mp.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { Client as MessagePortClient } from 'vs/base/parts/ipc/common/ipc.mp';
+import { IDisposable } from '../../../common/lifecycle.js';
+import { Client as MessagePortClient } from '../common/ipc.mp.js';
 
 /**
  * An implementation of a `IPCClient` on top of DOM `MessagePort`.
diff --git a/src/vs/base/parts/ipc/common/ipc.electron.ts b/src/vs/base/parts/ipc/common/ipc.electron.ts
index 02409283fab..5dec77f297f 100644
--- a/src/vs/base/parts/ipc/common/ipc.electron.ts
+++ b/src/vs/base/parts/ipc/common/ipc.electron.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { Event } from 'vs/base/common/event';
-import { IMessagePassingProtocol } from 'vs/base/parts/ipc/common/ipc';
+import { VSBuffer } from '../../../common/buffer.js';
+import { Event } from '../../../common/event.js';
+import { IMessagePassingProtocol } from './ipc.js';
 
 export interface Sender {
 	send(channel: string, msg: unknown): void;
diff --git a/src/vs/base/parts/ipc/common/ipc.mp.ts b/src/vs/base/parts/ipc/common/ipc.mp.ts
index 9abf1d9b3e9..4fc2f0b6dac 100644
--- a/src/vs/base/parts/ipc/common/ipc.mp.ts
+++ b/src/vs/base/parts/ipc/common/ipc.mp.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { Event } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { IMessagePassingProtocol, IPCClient } from 'vs/base/parts/ipc/common/ipc';
+import { VSBuffer } from '../../../common/buffer.js';
+import { Event } from '../../../common/event.js';
+import { IDisposable } from '../../../common/lifecycle.js';
+import { IMessagePassingProtocol, IPCClient } from './ipc.js';
 
 /**
  * Declare minimal `MessageEvent` and `MessagePort` interfaces here
diff --git a/src/vs/base/parts/ipc/common/ipc.net.ts b/src/vs/base/parts/ipc/common/ipc.net.ts
index 1fe8ee07800..1bc63ba6878 100644
--- a/src/vs/base/parts/ipc/common/ipc.net.ts
+++ b/src/vs/base/parts/ipc/common/ipc.net.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { IIPCLogger, IMessagePassingProtocol, IPCClient } from 'vs/base/parts/ipc/common/ipc';
+import { VSBuffer } from '../../../common/buffer.js';
+import { Emitter, Event } from '../../../common/event.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../common/lifecycle.js';
+import { IIPCLogger, IMessagePassingProtocol, IPCClient } from './ipc.js';
 
 export const enum SocketDiagnosticsEventType {
 	Created = 'created',
@@ -597,6 +597,8 @@ export class Client<TContext = string> extends IPCClient<TContext> {
 	override dispose(): void {
 		super.dispose();
 		const socket = this.protocol.getSocket();
+		// should be sent gracefully with a .flush(), but try to send it out as a
+		// last resort here if nothing else:
 		this.protocol.sendDisconnect();
 		this.protocol.dispose();
 		socket.end();
@@ -808,6 +810,7 @@ export interface PersistentProtocolOptions {
 export class PersistentProtocol implements IMessagePassingProtocol {
 
 	private _isReconnecting: boolean;
+	private _didSendDisconnect?: boolean;
 
 	private _outgoingUnackMsg: Queue<ProtocolMessage>;
 	private _outgoingMsgId: number;
@@ -910,9 +913,12 @@ export class PersistentProtocol implements IMessagePassingProtocol {
 	}
 
 	sendDisconnect(): void {
-		const msg = new ProtocolMessage(ProtocolMessageType.Disconnect, 0, 0, getEmptyBuffer());
-		this._socketWriter.write(msg);
-		this._socketWriter.flush();
+		if (!this._didSendDisconnect) {
+			this._didSendDisconnect = true;
+			const msg = new ProtocolMessage(ProtocolMessageType.Disconnect, 0, 0, getEmptyBuffer());
+			this._socketWriter.write(msg);
+			this._socketWriter.flush();
+		}
 	}
 
 	sendPause(): void {
@@ -1181,39 +1187,3 @@ export class PersistentProtocol implements IMessagePassingProtocol {
 		this._socketWriter.write(msg);
 	}
 }
-
-// (() => {
-// 	if (!SocketDiagnostics.enableDiagnostics) {
-// 		return;
-// 	}
-// 	if (typeof require.__$__nodeRequire !== 'function') {
-// 		console.log(`Can only log socket diagnostics on native platforms.`);
-// 		return;
-// 	}
-// 	const type = (
-// 		process.argv.includes('--type=renderer')
-// 			? 'renderer'
-// 			: (process.argv.includes('--type=extensionHost')
-// 				? 'extensionHost'
-// 				: (process.argv.some(item => item.includes('server-main'))
-// 					? 'server'
-// 					: 'unknown'
-// 				)
-// 			)
-// 	);
-// 	setTimeout(() => {
-// 		SocketDiagnostics.records.forEach(r => {
-// 			if (r.buff) {
-// 				r.data = Buffer.from(r.buff.buffer).toString('base64');
-// 				r.buff = undefined;
-// 			}
-// 		});
-
-// 		const fs = <typeof import('fs')>require.__$__nodeRequire('fs');
-// 		const path = <typeof import('path')>require.__$__nodeRequire('path');
-// 		const logPath = path.join(process.cwd(),`${type}-${process.pid}`);
-
-// 		console.log(`dumping socket diagnostics at ${logPath}`);
-// 		fs.writeFileSync(logPath, JSON.stringify(SocketDiagnostics.records));
-// 	}, 20000);
-// })();
diff --git a/src/vs/base/parts/ipc/common/ipc.ts b/src/vs/base/parts/ipc/common/ipc.ts
index f1bed382c62..3f75e084d27 100644
--- a/src/vs/base/parts/ipc/common/ipc.ts
+++ b/src/vs/base/parts/ipc/common/ipc.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getRandomElement } from 'vs/base/common/arrays';
-import { CancelablePromise, createCancelablePromise, timeout } from 'vs/base/common/async';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { memoize } from 'vs/base/common/decorators';
-import { CancellationError, ErrorNoTelemetry } from 'vs/base/common/errors';
-import { Emitter, Event, EventMultiplexer, Relay } from 'vs/base/common/event';
-import { combinedDisposable, DisposableStore, dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { revive } from 'vs/base/common/marshalling';
-import * as strings from 'vs/base/common/strings';
-import { isFunction, isUndefinedOrNull } from 'vs/base/common/types';
+import { getRandomElement } from '../../../common/arrays.js';
+import { CancelablePromise, createCancelablePromise, timeout } from '../../../common/async.js';
+import { VSBuffer } from '../../../common/buffer.js';
+import { CancellationToken, CancellationTokenSource } from '../../../common/cancellation.js';
+import { memoize } from '../../../common/decorators.js';
+import { CancellationError, ErrorNoTelemetry } from '../../../common/errors.js';
+import { Emitter, Event, EventMultiplexer, Relay } from '../../../common/event.js';
+import { combinedDisposable, DisposableStore, dispose, IDisposable, toDisposable } from '../../../common/lifecycle.js';
+import { revive } from '../../../common/marshalling.js';
+import * as strings from '../../../common/strings.js';
+import { isFunction, isUndefinedOrNull } from '../../../common/types.js';
 
 /**
  * An `IChannel` is an abstraction over a collection of commands.
@@ -569,7 +569,7 @@ export class ChannelClient implements IChannelClient, IDisposable {
 		} as T;
 	}
 
-	private requestPromise(channelName: string, name: string, arg?: any, cancellationToken = CancellationToken.None): Promise<any> {
+	private requestPromise(channelName: string, name: string, arg?: any, cancellationToken = CancellationToken.None): Promise<unknown> {
 		const id = this.lastRequestId++;
 		const type = RequestType.Promise;
 		const request: IRawRequest = { id, type, channelName, name, arg };
diff --git a/src/vs/base/parts/ipc/electron-main/ipc.electron.ts b/src/vs/base/parts/ipc/electron-main/ipc.electron.ts
index b40d381cffb..732772819d9 100644
--- a/src/vs/base/parts/ipc/electron-main/ipc.electron.ts
+++ b/src/vs/base/parts/ipc/electron-main/ipc.electron.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { WebContents } from 'electron';
-import { validatedIpcMain } from 'vs/base/parts/ipc/electron-main/ipcMain';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { ClientConnectionEvent, IPCServer } from 'vs/base/parts/ipc/common/ipc';
-import { Protocol as ElectronProtocol } from 'vs/base/parts/ipc/common/ipc.electron';
+import { validatedIpcMain } from './ipcMain.js';
+import { VSBuffer } from '../../../common/buffer.js';
+import { Emitter, Event } from '../../../common/event.js';
+import { IDisposable, toDisposable } from '../../../common/lifecycle.js';
+import { ClientConnectionEvent, IPCServer } from '../common/ipc.js';
+import { Protocol as ElectronProtocol } from '../common/ipc.electron.js';
 
 interface IIPCEvent {
 	event: { sender: WebContents };
diff --git a/src/vs/base/parts/ipc/electron-main/ipc.mp.ts b/src/vs/base/parts/ipc/electron-main/ipc.mp.ts
index df6422ba227..dacaac11a56 100644
--- a/src/vs/base/parts/ipc/electron-main/ipc.mp.ts
+++ b/src/vs/base/parts/ipc/electron-main/ipc.mp.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { BrowserWindow, IpcMainEvent, MessagePortMain } from 'electron';
-import { validatedIpcMain } from 'vs/base/parts/ipc/electron-main/ipcMain';
-import { Event } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { generateUuid } from 'vs/base/common/uuid';
-import { Client as MessagePortClient } from 'vs/base/parts/ipc/common/ipc.mp';
+import { validatedIpcMain } from './ipcMain.js';
+import { Event } from '../../../common/event.js';
+import { IDisposable } from '../../../common/lifecycle.js';
+import { generateUuid } from '../../../common/uuid.js';
+import { Client as MessagePortClient } from '../common/ipc.mp.js';
 
 /**
  * An implementation of a `IPCClient` on top of Electron `MessagePortMain`.
diff --git a/src/vs/base/parts/ipc/electron-main/ipcMain.ts b/src/vs/base/parts/ipc/electron-main/ipcMain.ts
index c72b6e8e644..9a46b9e85bf 100644
--- a/src/vs/base/parts/ipc/electron-main/ipcMain.ts
+++ b/src/vs/base/parts/ipc/electron-main/ipcMain.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ipcMain as unsafeIpcMain, IpcMainEvent, IpcMainInvokeEvent } from 'electron';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Event } from 'vs/base/common/event';
-import { VSCODE_AUTHORITY } from 'vs/base/common/network';
+import electron from 'electron';
+import { onUnexpectedError } from '../../../common/errors.js';
+import { Event } from '../../../common/event.js';
+import { VSCODE_AUTHORITY } from '../../../common/network.js';
 
-type ipcMainListener = (event: IpcMainEvent, ...args: any[]) => void;
+type ipcMainListener = (event: electron.IpcMainEvent, ...args: any[]) => void;
 
 class ValidatedIpcMain implements Event.NodeEventEmitter {
 
@@ -25,7 +25,7 @@ class ValidatedIpcMain implements Event.NodeEventEmitter {
 
 		// Remember the wrapped listener so that later we can
 		// properly implement `removeListener`.
-		const wrappedListener = (event: IpcMainEvent, ...args: any[]) => {
+		const wrappedListener = (event: electron.IpcMainEvent, ...args: any[]) => {
 			if (this.validateEvent(channel, event)) {
 				listener(event, ...args);
 			}
@@ -33,7 +33,7 @@ class ValidatedIpcMain implements Event.NodeEventEmitter {
 
 		this.mapListenerToWrapper.set(listener, wrappedListener);
 
-		unsafeIpcMain.on(channel, wrappedListener);
+		electron.ipcMain.on(channel, wrappedListener);
 
 		return this;
 	}
@@ -43,7 +43,7 @@ class ValidatedIpcMain implements Event.NodeEventEmitter {
 	 * only the next time a message is sent to `channel`, after which it is removed.
 	 */
 	once(channel: string, listener: ipcMainListener): this {
-		unsafeIpcMain.once(channel, (event: IpcMainEvent, ...args: any[]) => {
+		electron.ipcMain.once(channel, (event: electron.IpcMainEvent, ...args: any[]) => {
 			if (this.validateEvent(channel, event)) {
 				listener(event, ...args);
 			}
@@ -68,8 +68,8 @@ class ValidatedIpcMain implements Event.NodeEventEmitter {
 	 * are serialized and only the `message` property from the original error is
 	 * provided to the renderer process. Please refer to #24427 for details.
 	 */
-	handle(channel: string, listener: (event: IpcMainInvokeEvent, ...args: any[]) => Promise<unknown>): this {
-		unsafeIpcMain.handle(channel, (event: IpcMainInvokeEvent, ...args: any[]) => {
+	handle(channel: string, listener: (event: electron.IpcMainInvokeEvent, ...args: any[]) => Promise<unknown>): this {
+		electron.ipcMain.handle(channel, (event: electron.IpcMainInvokeEvent, ...args: any[]) => {
 			if (this.validateEvent(channel, event)) {
 				return listener(event, ...args);
 			}
@@ -84,7 +84,7 @@ class ValidatedIpcMain implements Event.NodeEventEmitter {
 	 * Removes any handler for `channel`, if present.
 	 */
 	removeHandler(channel: string): this {
-		unsafeIpcMain.removeHandler(channel);
+		electron.ipcMain.removeHandler(channel);
 
 		return this;
 	}
@@ -96,14 +96,14 @@ class ValidatedIpcMain implements Event.NodeEventEmitter {
 	removeListener(channel: string, listener: ipcMainListener): this {
 		const wrappedListener = this.mapListenerToWrapper.get(listener);
 		if (wrappedListener) {
-			unsafeIpcMain.removeListener(channel, wrappedListener);
+			electron.ipcMain.removeListener(channel, wrappedListener);
 			this.mapListenerToWrapper.delete(listener);
 		}
 
 		return this;
 	}
 
-	private validateEvent(channel: string, event: IpcMainEvent | IpcMainInvokeEvent): boolean {
+	private validateEvent(channel: string, event: electron.IpcMainEvent | electron.IpcMainInvokeEvent): boolean {
 		if (!channel || !channel.startsWith('vscode:')) {
 			onUnexpectedError(`Refused to handle ipcMain event for channel '${channel}' because the channel is unknown.`);
 			return false; // unexpected channel
diff --git a/src/vs/base/parts/ipc/electron-sandbox/ipc.electron.ts b/src/vs/base/parts/ipc/electron-sandbox/ipc.electron.ts
index 9b95f2b4c63..553a310e978 100644
--- a/src/vs/base/parts/ipc/electron-sandbox/ipc.electron.ts
+++ b/src/vs/base/parts/ipc/electron-sandbox/ipc.electron.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { Event } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { IPCClient } from 'vs/base/parts/ipc/common/ipc';
-import { Protocol as ElectronProtocol } from 'vs/base/parts/ipc/common/ipc.electron';
-import { ipcRenderer } from 'vs/base/parts/sandbox/electron-sandbox/globals';
+import { VSBuffer } from '../../../common/buffer.js';
+import { Event } from '../../../common/event.js';
+import { IDisposable } from '../../../common/lifecycle.js';
+import { IPCClient } from '../common/ipc.js';
+import { Protocol as ElectronProtocol } from '../common/ipc.electron.js';
+import { ipcRenderer } from '../../sandbox/electron-sandbox/globals.js';
 
 /**
  * An implementation of `IPCClient` on top of Electron `ipcRenderer` IPC communication
diff --git a/src/vs/base/parts/ipc/electron-sandbox/ipc.mp.ts b/src/vs/base/parts/ipc/electron-sandbox/ipc.mp.ts
index bc2bfd17892..4a36b238817 100644
--- a/src/vs/base/parts/ipc/electron-sandbox/ipc.mp.ts
+++ b/src/vs/base/parts/ipc/electron-sandbox/ipc.mp.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { mainWindow } from 'vs/base/browser/window';
-import { Event } from 'vs/base/common/event';
-import { generateUuid } from 'vs/base/common/uuid';
-import { ipcMessagePort, ipcRenderer } from 'vs/base/parts/sandbox/electron-sandbox/globals';
+import { mainWindow } from '../../../browser/window.js';
+import { Event } from '../../../common/event.js';
+import { generateUuid } from '../../../common/uuid.js';
+import { ipcMessagePort, ipcRenderer } from '../../sandbox/electron-sandbox/globals.js';
 
 interface IMessageChannelResult {
 	nonce: string;
diff --git a/src/vs/base/parts/ipc/node/ipc.cp.ts b/src/vs/base/parts/ipc/node/ipc.cp.ts
index d51d77e3c81..2c5ef506bf1 100644
--- a/src/vs/base/parts/ipc/node/ipc.cp.ts
+++ b/src/vs/base/parts/ipc/node/ipc.cp.ts
@@ -4,17 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ChildProcess, fork, ForkOptions } from 'child_process';
-import { createCancelablePromise, Delayer } from 'vs/base/common/async';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { isRemoteConsoleLog, log } from 'vs/base/common/console';
-import * as errors from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { deepClone } from 'vs/base/common/objects';
-import { createQueuedSender } from 'vs/base/node/processes';
-import { removeDangerousEnvVariables } from 'vs/base/common/processes';
-import { ChannelClient as IPCClient, ChannelServer as IPCServer, IChannel, IChannelClient } from 'vs/base/parts/ipc/common/ipc';
+import { createCancelablePromise, Delayer } from '../../../common/async.js';
+import { VSBuffer } from '../../../common/buffer.js';
+import { CancellationToken } from '../../../common/cancellation.js';
+import { isRemoteConsoleLog, log } from '../../../common/console.js';
+import * as errors from '../../../common/errors.js';
+import { Emitter, Event } from '../../../common/event.js';
+import { dispose, IDisposable, toDisposable } from '../../../common/lifecycle.js';
+import { deepClone } from '../../../common/objects.js';
+import { createQueuedSender } from '../../../node/processes.js';
+import { removeDangerousEnvVariables } from '../../../common/processes.js';
+import { ChannelClient as IPCClient, ChannelServer as IPCServer, IChannel, IChannelClient } from '../common/ipc.js';
 
 /**
  * This implementation doesn't perform well since it uses base64 encoding for buffers.
@@ -102,6 +102,7 @@ export class Client implements IChannelClient, IDisposable {
 	getChannel<T extends IChannel>(channelName: string): T {
 		const that = this;
 
+		// eslint-disable-next-line local/code-no-dangerous-type-assertions
 		return {
 			call<T>(command: string, arg?: any, cancellationToken?: CancellationToken): Promise<T> {
 				return that.requestPromise<T>(channelName, command, arg, cancellationToken);
diff --git a/src/vs/base/parts/ipc/node/ipc.mp.ts b/src/vs/base/parts/ipc/node/ipc.mp.ts
index 73fdfe1edc1..87e1016f045 100644
--- a/src/vs/base/parts/ipc/node/ipc.mp.ts
+++ b/src/vs/base/parts/ipc/node/ipc.mp.ts
@@ -3,12 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { MessagePortMain, isUtilityProcess, MessageEvent } from 'vs/base/parts/sandbox/node/electronTypes';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { ClientConnectionEvent, IMessagePassingProtocol, IPCServer } from 'vs/base/parts/ipc/common/ipc';
-import { Emitter, Event } from 'vs/base/common/event';
-import { assertType } from 'vs/base/common/types';
-import { firstOrDefault } from 'vs/base/common/arrays';
+import { MessagePortMain, isUtilityProcess, MessageEvent } from '../../sandbox/node/electronTypes.js';
+import { VSBuffer } from '../../../common/buffer.js';
+import { ClientConnectionEvent, IMessagePassingProtocol, IPCServer } from '../common/ipc.js';
+import { Emitter, Event } from '../../../common/event.js';
+import { assertType } from '../../../common/types.js';
 
 /**
  * The MessagePort `Protocol` leverages MessagePortMain style IPC communication
@@ -67,7 +66,7 @@ export class Server extends IPCServer {
 				return;
 			}
 
-			const port = firstOrDefault(e.ports);
+			const port = e.ports.at(0);
 			if (port) {
 				onCreateMessageChannel.fire(port);
 			}
diff --git a/src/vs/base/parts/ipc/node/ipc.net.ts b/src/vs/base/parts/ipc/node/ipc.net.ts
index 7d57ca6cb47..629f2c4b8bb 100644
--- a/src/vs/base/parts/ipc/node/ipc.net.ts
+++ b/src/vs/base/parts/ipc/node/ipc.net.ts
@@ -7,15 +7,24 @@ import { createHash } from 'crypto';
 import { Server as NetServer, Socket, createServer, createConnection } from 'net';
 import { tmpdir } from 'os';
 import { createDeflateRaw, ZlibOptions, InflateRaw, DeflateRaw, createInflateRaw } from 'zlib';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { join } from 'vs/base/common/path';
-import { Platform, platform } from 'vs/base/common/platform';
-import { generateUuid } from 'vs/base/common/uuid';
-import { ClientConnectionEvent, IPCServer } from 'vs/base/parts/ipc/common/ipc';
-import { ChunkStream, Client, ISocket, Protocol, SocketCloseEvent, SocketCloseEventType, SocketDiagnostics, SocketDiagnosticsEventType } from 'vs/base/parts/ipc/common/ipc.net';
+import { VSBuffer } from '../../../common/buffer.js';
+import { onUnexpectedError } from '../../../common/errors.js';
+import { Emitter, Event } from '../../../common/event.js';
+import { Disposable, IDisposable } from '../../../common/lifecycle.js';
+import { join } from '../../../common/path.js';
+import { Platform, platform } from '../../../common/platform.js';
+import { generateUuid } from '../../../common/uuid.js';
+import { ClientConnectionEvent, IPCServer } from '../common/ipc.js';
+import { ChunkStream, Client, ISocket, Protocol, SocketCloseEvent, SocketCloseEventType, SocketDiagnostics, SocketDiagnosticsEventType } from '../common/ipc.net.js';
+
+/**
+ * Maximum time to wait for a 'close' event to fire after the socket stream
+ * ends. For unix domain sockets, the close event may not fire consistently
+ * due to what appears to be a Node.js bug.
+ *
+ * @see https://github.com/microsoft/vscode/issues/211462#issuecomment-2155471996
+ */
+const socketEndTimeoutMs = 30_000;
 
 export class NodeSocket implements ISocket {
 
@@ -51,15 +60,20 @@ export class NodeSocket implements ISocket {
 		};
 		this.socket.on('error', this._errorListener);
 
+		let endTimeoutHandle: NodeJS.Timeout | undefined;
 		this._closeListener = (hadError: boolean) => {
 			this.traceSocketEvent(SocketDiagnosticsEventType.Close, { hadError });
 			this._canWrite = false;
+			if (endTimeoutHandle) {
+				clearTimeout(endTimeoutHandle);
+			}
 		};
 		this.socket.on('close', this._closeListener);
 
 		this._endListener = () => {
 			this.traceSocketEvent(SocketDiagnosticsEventType.NodeEndReceived);
 			this._canWrite = false;
+			endTimeoutHandle = setTimeout(() => socket.destroy(), socketEndTimeoutMs);
 		};
 		this.socket.on('end', this._endListener);
 	}
diff --git a/src/vs/base/parts/ipc/test/browser/ipc.mp.test.ts b/src/vs/base/parts/ipc/test/browser/ipc.mp.test.ts
index c49d9bf8855..e3e84e4b3f3 100644
--- a/src/vs/base/parts/ipc/test/browser/ipc.mp.test.ts
+++ b/src/vs/base/parts/ipc/test/browser/ipc.mp.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Event } from 'vs/base/common/event';
-import { Client as MessagePortClient } from 'vs/base/parts/ipc/browser/ipc.mp';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { CancellationToken } from '../../../../common/cancellation.js';
+import { Event } from '../../../../common/event.js';
+import { Client as MessagePortClient } from '../../browser/ipc.mp.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../test/common/utils.js';
 
 suite('IPC, MessagePorts', () => {
 
diff --git a/src/vs/base/parts/ipc/test/common/ipc.test.ts b/src/vs/base/parts/ipc/test/common/ipc.test.ts
index b9fc881a222..1d5029273d8 100644
--- a/src/vs/base/parts/ipc/test/common/ipc.test.ts
+++ b/src/vs/base/parts/ipc/test/common/ipc.test.ts
@@ -4,16 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { timeout } from 'vs/base/common/async';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { canceled } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { isEqual } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { BufferReader, BufferWriter, ClientConnectionEvent, deserialize, IChannel, IMessagePassingProtocol, IPCClient, IPCServer, IServerChannel, ProxyChannel, serialize } from 'vs/base/parts/ipc/common/ipc';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { timeout } from '../../../../common/async.js';
+import { VSBuffer } from '../../../../common/buffer.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../common/cancellation.js';
+import { canceled } from '../../../../common/errors.js';
+import { Emitter, Event } from '../../../../common/event.js';
+import { DisposableStore } from '../../../../common/lifecycle.js';
+import { isEqual } from '../../../../common/resources.js';
+import { URI } from '../../../../common/uri.js';
+import { BufferReader, BufferWriter, ClientConnectionEvent, deserialize, IChannel, IMessagePassingProtocol, IPCClient, IPCServer, IServerChannel, ProxyChannel, serialize } from '../../common/ipc.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../test/common/utils.js';
 
 class QueueProtocol implements IMessagePassingProtocol {
 
diff --git a/src/vs/base/parts/ipc/test/electron-sandbox/ipc.mp.test.ts b/src/vs/base/parts/ipc/test/electron-sandbox/ipc.mp.test.ts
index 4bb851ebffe..414610ab311 100644
--- a/src/vs/base/parts/ipc/test/electron-sandbox/ipc.mp.test.ts
+++ b/src/vs/base/parts/ipc/test/electron-sandbox/ipc.mp.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Client as MessagePortClient } from 'vs/base/parts/ipc/browser/ipc.mp';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { Client as MessagePortClient } from '../../browser/ipc.mp.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../test/common/utils.js';
 
 suite('IPC, MessagePorts', () => {
 
diff --git a/src/vs/base/parts/ipc/test/node/ipc.cp.integrationTest.ts b/src/vs/base/parts/ipc/test/node/ipc.cp.integrationTest.ts
index 9caacd5b537..e43dc5be0b1 100644
--- a/src/vs/base/parts/ipc/test/node/ipc.cp.integrationTest.ts
+++ b/src/vs/base/parts/ipc/test/node/ipc.cp.integrationTest.ts
@@ -4,16 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Event } from 'vs/base/common/event';
-import { IChannel } from 'vs/base/parts/ipc/common/ipc';
-import { Client } from 'vs/base/parts/ipc/node/ipc.cp';
-import { ITestService, TestServiceClient } from './testService';
-import { FileAccess } from 'vs/base/common/network';
+import { Event } from '../../../../common/event.js';
+import { IChannel } from '../../common/ipc.js';
+import { Client } from '../../node/ipc.cp.js';
+import { ITestService, TestServiceClient } from './testService.js';
+import { FileAccess } from '../../../../common/network.js';
 
 function createClient(): Client {
 	return new Client(FileAccess.asFileUri('bootstrap-fork').fsPath, {
 		serverName: 'TestServer',
-		env: { VSCODE_AMD_ENTRYPOINT: 'vs/base/parts/ipc/test/node/testApp', verbose: true }
+		env: { VSCODE_ESM_ENTRYPOINT: 'vs/base/parts/ipc/test/node/testApp', verbose: true }
 	});
 }
 
diff --git a/src/vs/base/parts/ipc/test/node/ipc.net.test.ts b/src/vs/base/parts/ipc/test/node/ipc.net.test.ts
index 7186ee6b0b9..d13c8a9dce5 100644
--- a/src/vs/base/parts/ipc/test/node/ipc.net.test.ts
+++ b/src/vs/base/parts/ipc/test/node/ipc.net.test.ts
@@ -4,18 +4,19 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
+import sinon from 'sinon';
 import { EventEmitter } from 'events';
 import { AddressInfo, connect, createServer, Server, Socket } from 'net';
 import { tmpdir } from 'os';
-import { Barrier, timeout } from 'vs/base/common/async';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { ILoadEstimator, PersistentProtocol, Protocol, ProtocolConstants, SocketCloseEvent, SocketDiagnosticsEventType } from 'vs/base/parts/ipc/common/ipc.net';
-import { createRandomIPCHandle, createStaticIPCHandle, NodeSocket, WebSocketNodeSocket } from 'vs/base/parts/ipc/node/ipc.net';
-import { flakySuite } from 'vs/base/test/common/testUtils';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { Barrier, timeout } from '../../../../common/async.js';
+import { VSBuffer } from '../../../../common/buffer.js';
+import { Emitter, Event } from '../../../../common/event.js';
+import { Disposable, DisposableStore, toDisposable } from '../../../../common/lifecycle.js';
+import { ILoadEstimator, PersistentProtocol, Protocol, ProtocolConstants, SocketCloseEvent, SocketDiagnosticsEventType } from '../../common/ipc.net.js';
+import { createRandomIPCHandle, createStaticIPCHandle, NodeSocket, WebSocketNodeSocket } from '../../node/ipc.net.js';
+import { flakySuite } from '../../../../test/common/testUtils.js';
+import { runWithFakedTimers } from '../../../../test/common/timeTravelScheduler.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../test/common/utils.js';
 
 class MessageStream extends Disposable {
 
@@ -134,7 +135,7 @@ class Ether {
 
 suite('IPC, Socket Protocol', () => {
 
-	ensureNoDisposablesAreLeakedInTestSuite();
+	const ds = ensureNoDisposablesAreLeakedInTestSuite();
 
 	let ether: Ether;
 
@@ -186,6 +187,26 @@ suite('IPC, Socket Protocol', () => {
 		b.dispose();
 	});
 
+
+
+	test('issue #211462: destroy socket after end timeout', async () => {
+		const socket = new EventEmitter();
+		Object.assign(socket, { destroy: () => socket.emit('close') });
+		const protocol = ds.add(new Protocol(new NodeSocket(socket as Socket)));
+
+		const disposed = sinon.stub();
+		const timers = sinon.useFakeTimers();
+
+		ds.add(toDisposable(() => timers.restore()));
+		ds.add(protocol.onDidDispose(disposed));
+
+		socket.emit('end');
+		assert.ok(!disposed.called);
+		timers.tick(29_999);
+		assert.ok(!disposed.called);
+		timers.tick(1);
+		assert.ok(disposed.called);
+	});
 });
 
 suite('PersistentProtocol reconnection', () => {
diff --git a/src/vs/base/parts/ipc/test/node/testApp.ts b/src/vs/base/parts/ipc/test/node/testApp.ts
index 77b2232ff75..255cd963971 100644
--- a/src/vs/base/parts/ipc/test/node/testApp.ts
+++ b/src/vs/base/parts/ipc/test/node/testApp.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Server } from 'vs/base/parts/ipc/node/ipc.cp';
-import { TestChannel, TestService } from './testService';
+import { Server } from '../../node/ipc.cp.js';
+import { TestChannel, TestService } from './testService.js';
 
 const server = new Server('test');
 const service = new TestService();
diff --git a/src/vs/base/parts/ipc/test/node/testService.ts b/src/vs/base/parts/ipc/test/node/testService.ts
index ac7c42b703e..99b01eee2d6 100644
--- a/src/vs/base/parts/ipc/test/node/testService.ts
+++ b/src/vs/base/parts/ipc/test/node/testService.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { timeout } from 'vs/base/common/async';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IChannel, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
+import { timeout } from '../../../../common/async.js';
+import { Emitter, Event } from '../../../../common/event.js';
+import { IChannel, IServerChannel } from '../../common/ipc.js';
 
 export interface IMarcoPoloEvent {
 	answer: string;
diff --git a/src/vs/base/parts/request/browser/request.ts b/src/vs/base/parts/request/browser/request.ts
index 5802f6aa6ee..fe0fa0e7838 100644
--- a/src/vs/base/parts/request/browser/request.ts
+++ b/src/vs/base/parts/request/browser/request.ts
@@ -3,76 +3,96 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { bufferToStream, VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { canceled } from 'vs/base/common/errors';
-import { IRequestContext, IRequestOptions, OfflineError } from 'vs/base/parts/request/common/request';
+import { bufferToStream, VSBuffer } from '../../../common/buffer.js';
+import { CancellationToken } from '../../../common/cancellation.js';
+import { canceled } from '../../../common/errors.js';
+import { IHeaders, IRequestContext, IRequestOptions, OfflineError } from '../common/request.js';
 
-export function request(options: IRequestOptions, token: CancellationToken): Promise<IRequestContext> {
-	if (options.proxyAuthorization) {
-		options.headers = {
-			...(options.headers || {}),
-			'Proxy-Authorization': options.proxyAuthorization
-		};
+export async function request(options: IRequestOptions, token: CancellationToken): Promise<IRequestContext> {
+	if (token.isCancellationRequested) {
+		throw canceled();
 	}
 
-	const xhr = new XMLHttpRequest();
-	return new Promise<IRequestContext>((resolve, reject) => {
+	const cancellation = new AbortController();
+	const disposable = token.onCancellationRequested(() => cancellation.abort());
+	const signal = options.timeout ? AbortSignal.any([
+		cancellation.signal,
+		AbortSignal.timeout(options.timeout),
+	]) : cancellation.signal;
 
-		xhr.open(options.type || 'GET', options.url || '', true, options.user, options.password);
-		setRequestHeaders(xhr, options);
-
-		xhr.responseType = 'arraybuffer';
-		xhr.onerror = e => reject(
-			navigator.onLine ? new Error(xhr.statusText && ('XHR failed: ' + xhr.statusText) || 'XHR failed') : new OfflineError()
-		);
-		xhr.onload = (e) => {
-			resolve({
-				res: {
-					statusCode: xhr.status,
-					headers: getResponseHeaders(xhr)
-				},
-				stream: bufferToStream(VSBuffer.wrap(new Uint8Array(xhr.response)))
-			});
-		};
-		xhr.ontimeout = e => reject(new Error(`XHR timeout: ${options.timeout}ms`));
-
-		if (options.timeout) {
-			xhr.timeout = options.timeout;
-		}
-
-		xhr.send(options.data);
-
-		// cancel
-		token.onCancellationRequested(() => {
-			xhr.abort();
-			reject(canceled());
+	try {
+		const res = await fetch(options.url || '', {
+			method: options.type || 'GET',
+			headers: getRequestHeaders(options),
+			body: options.data,
+			signal,
 		});
-	});
+		return {
+			res: {
+				statusCode: res.status,
+				headers: getResponseHeaders(res),
+			},
+			stream: bufferToStream(VSBuffer.wrap(new Uint8Array(await res.arrayBuffer()))),
+		};
+	} catch (err) {
+		if (!navigator.onLine) {
+			throw new OfflineError();
+		}
+		if (err?.name === 'AbortError') {
+			throw canceled();
+		}
+		if (err?.name === 'TimeoutError') {
+			throw new Error(`Fetch timeout: ${options.timeout}ms`);
+		}
+		throw err;
+	} finally {
+		disposable.dispose();
+	}
 }
 
-function setRequestHeaders(xhr: XMLHttpRequest, options: IRequestOptions): void {
-	if (options.headers) {
+function getRequestHeaders(options: IRequestOptions) {
+	if (options.headers || options.user || options.password || options.proxyAuthorization) {
+		const headers: HeadersInit = new Headers();
 		outer: for (const k in options.headers) {
-			switch (k) {
-				case 'User-Agent':
-				case 'Accept-Encoding':
-				case 'Content-Length':
+			switch (k.toLowerCase()) {
+				case 'user-agent':
+				case 'accept-encoding':
+				case 'content-length':
 					// unsafe headers
 					continue outer;
 			}
-			xhr.setRequestHeader(k, options.headers[k]);
+			const header = options.headers[k];
+			if (typeof header === 'string') {
+				headers.set(k, header);
+			} else if (Array.isArray(header)) {
+				for (const h of header) {
+					headers.append(k, h);
+				}
+			}
 		}
+		if (options.user || options.password) {
+			headers.set('Authorization', 'Basic ' + btoa(`${options.user || ''}:${options.password || ''}`));
+		}
+		if (options.proxyAuthorization) {
+			headers.set('Proxy-Authorization', options.proxyAuthorization);
+		}
+		return headers;
 	}
+	return undefined;
 }
 
-function getResponseHeaders(xhr: XMLHttpRequest): { [name: string]: string } {
-	const headers: { [name: string]: string } = Object.create(null);
-	for (const line of xhr.getAllResponseHeaders().split(/\r\n|\n|\r/g)) {
-		if (line) {
-			const idx = line.indexOf(':');
-			headers[line.substr(0, idx).trim().toLowerCase()] = line.substr(idx + 1).trim();
+function getResponseHeaders(res: Response): IHeaders {
+	const headers: IHeaders = Object.create(null);
+	res.headers.forEach((value, key) => {
+		if (headers[key]) {
+			if (Array.isArray(headers[key])) {
+				headers[key].push(value);
+			} else {
+				headers[key] = [headers[key], value];
+			}
+		} else {
+			headers[key] = value;
 		}
-	}
+	});
 	return headers;
 }
diff --git a/src/vs/base/parts/request/common/request.ts b/src/vs/base/parts/request/common/request.ts
index 5fb56f8fad8..773021faacb 100644
--- a/src/vs/base/parts/request/common/request.ts
+++ b/src/vs/base/parts/request/common/request.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBufferReadableStream } from 'vs/base/common/buffer';
+import { VSBufferReadableStream } from '../../../common/buffer.js';
 
 const offlineName = 'Offline';
 
@@ -25,7 +25,14 @@ export class OfflineError extends Error {
 }
 
 export interface IHeaders {
-	[header: string]: string;
+	'Proxy-Authorization'?: string;
+	'x-operation-id'?: string;
+	'retry-after'?: string;
+	etag?: string;
+	'Content-Length'?: string;
+	'activityid'?: string;
+	'X-Market-User-Id'?: string;
+	[header: string]: string | string[] | undefined;
 }
 
 export interface IRequestOptions {
diff --git a/src/vs/base/parts/request/test/browser/request.test.ts b/src/vs/base/parts/request/test/browser/request.test.ts
new file mode 100644
index 00000000000..687c8c57b9d
--- /dev/null
+++ b/src/vs/base/parts/request/test/browser/request.test.ts
@@ -0,0 +1,117 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// eslint-disable-next-line local/code-import-patterns
+import * as http from 'http';
+// eslint-disable-next-line local/code-import-patterns
+import { AddressInfo } from 'net';
+import assert from 'assert';
+import { CancellationToken, CancellationTokenSource } from '../../../../common/cancellation.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../test/common/utils.js';
+import { request } from '../../browser/request.js';
+import { streamToBuffer } from '../../../../common/buffer.js';
+import { flakySuite } from '../../../../test/common/testUtils.js';
+
+flakySuite('Request', () => {
+
+	let port: number;
+	let server: http.Server;
+
+	setup(async () => {
+		port = await new Promise<number>((resolvePort, rejectPort) => {
+			server = http.createServer((req, res) => {
+				if (req.url === '/noreply') {
+					return; // never respond
+				}
+				res.setHeader('Content-Type', 'application/json');
+				if (req.headers['echo-header']) {
+					res.setHeader('echo-header', req.headers['echo-header']);
+				}
+				const data: Buffer[] = [];
+				req.on('data', chunk => data.push(chunk));
+				req.on('end', () => {
+					res.end(JSON.stringify({
+						method: req.method,
+						url: req.url,
+						data: Buffer.concat(data).toString()
+					}));
+				});
+			}).listen(0, '127.0.0.1', () => {
+				const address = server.address();
+				resolvePort((address as AddressInfo).port);
+			}).on('error', err => {
+				rejectPort(err);
+			});
+		});
+	});
+
+	teardown(async () => {
+		await new Promise<void>((resolve, reject) => {
+			server.close(err => err ? reject(err) : resolve());
+		});
+	});
+
+	test('GET', async () => {
+		const context = await request({
+			url: `http://127.0.0.1:${port}`,
+			headers: {
+				'echo-header': 'echo-value'
+			}
+		}, CancellationToken.None);
+		assert.strictEqual(context.res.statusCode, 200);
+		assert.strictEqual(context.res.headers['content-type'], 'application/json');
+		assert.strictEqual(context.res.headers['echo-header'], 'echo-value');
+		const buffer = await streamToBuffer(context.stream);
+		const body = JSON.parse(buffer.toString());
+		assert.strictEqual(body.method, 'GET');
+		assert.strictEqual(body.url, '/');
+	});
+
+	test('POST', async () => {
+		const context = await request({
+			type: 'POST',
+			url: `http://127.0.0.1:${port}/postpath`,
+			data: 'Some data',
+		}, CancellationToken.None);
+		assert.strictEqual(context.res.statusCode, 200);
+		assert.strictEqual(context.res.headers['content-type'], 'application/json');
+		const buffer = await streamToBuffer(context.stream);
+		const body = JSON.parse(buffer.toString());
+		assert.strictEqual(body.method, 'POST');
+		assert.strictEqual(body.url, '/postpath');
+		assert.strictEqual(body.data, 'Some data');
+	});
+
+	test('timeout', async () => {
+		try {
+			await request({
+				type: 'GET',
+				url: `http://127.0.0.1:${port}/noreply`,
+				timeout: 123,
+			}, CancellationToken.None);
+			assert.fail('Should fail with timeout');
+		} catch (err) {
+			assert.strictEqual(err.message, 'Fetch timeout: 123ms');
+		}
+	});
+
+	test('cancel', async () => {
+		try {
+			const source = new CancellationTokenSource();
+			const res = request({
+				type: 'GET',
+				url: `http://127.0.0.1:${port}/noreply`,
+			}, source.token);
+			await new Promise(resolve => setTimeout(resolve, 100));
+			source.cancel();
+			await res;
+			assert.fail('Should fail with cancellation');
+		} catch (err) {
+			assert.strictEqual(err.message, 'Canceled');
+		}
+	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+});
diff --git a/src/vs/base/parts/sandbox/common/electronTypes.ts b/src/vs/base/parts/sandbox/common/electronTypes.ts
index 43fa75079d4..ef8c1026be2 100644
--- a/src/vs/base/parts/sandbox/common/electronTypes.ts
+++ b/src/vs/base/parts/sandbox/common/electronTypes.ts
@@ -217,24 +217,6 @@ export interface FileFilter {
 	name: string;
 }
 
-export interface OpenDevToolsOptions {
-	/**
-	 * Opens the devtools with specified dock state, can be `left`, `right`, `bottom`,
-	 * `undocked`, `detach`. Defaults to last used dock state. In `undocked` mode it's
-	 * possible to dock back. In `detach` mode it's not.
-	 */
-	mode: ('left' | 'right' | 'bottom' | 'undocked' | 'detach');
-	/**
-	 * Whether to bring the opened devtools window to the foreground. The default is
-	 * `true`.
-	 */
-	activate?: boolean;
-	/**
-	 * A title for the DevTools window (only in `undocked` or `detach` mode).
-	 */
-	title?: string;
-}
-
 interface InputEvent {
 
 	// Docs: https://electronjs.org/docs/api/structures/input-event
diff --git a/src/vs/base/parts/sandbox/common/sandboxTypes.ts b/src/vs/base/parts/sandbox/common/sandboxTypes.ts
index 8c296184f7d..869c86f69fd 100644
--- a/src/vs/base/parts/sandbox/common/sandboxTypes.ts
+++ b/src/vs/base/parts/sandbox/common/sandboxTypes.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IProcessEnvironment } from 'vs/base/common/platform';
-import { IProductConfiguration } from 'vs/base/common/product';
+import { IProcessEnvironment } from '../../../common/platform.js';
+import { IProductConfiguration } from '../../../common/product.js';
 
 
 // #######################################################################
@@ -53,4 +53,26 @@ export interface ISandboxConfiguration {
 	 * Location of V8 code cache.
 	 */
 	codeCachePath?: string;
+
+	/**
+	 * NLS support
+	 */
+	nls: {
+
+		/**
+		 * All NLS messages produced by `localize` and `localize2` calls
+		 * under `src/vs`.
+		 */
+		messages: string[];
+
+		/**
+		 * The actual language of the NLS messages (e.g. 'en', de' or 'pt-br').
+		 */
+		language: string | undefined;
+	};
+
+	/**
+	 * DEV time only: All CSS-modules that we have.
+	 */
+	cssModules?: string[];
 }
diff --git a/src/vs/base/parts/sandbox/electron-sandbox/globals.ts b/src/vs/base/parts/sandbox/electron-sandbox/globals.ts
index 10737a23101..cd1e5387864 100644
--- a/src/vs/base/parts/sandbox/electron-sandbox/globals.ts
+++ b/src/vs/base/parts/sandbox/electron-sandbox/globals.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { INodeProcess, IProcessEnvironment } from 'vs/base/common/platform';
-import { ISandboxConfiguration } from 'vs/base/parts/sandbox/common/sandboxTypes';
-import { IpcRenderer, ProcessMemoryInfo, WebFrame, WebUtils } from 'vs/base/parts/sandbox/electron-sandbox/electronTypes';
+import { INodeProcess, IProcessEnvironment } from '../../../common/platform.js';
+import { ISandboxConfiguration } from '../common/sandboxTypes.js';
+import { IpcRenderer, ProcessMemoryInfo, WebFrame, WebUtils } from './electronTypes.js';
 
 /**
  * In Electron renderers we cannot expose all of the `process` global of node.js
@@ -123,11 +123,24 @@ export const process: ISandboxNodeProcess = vscodeGlobal.process;
 export const context: ISandboxContext = vscodeGlobal.context;
 export const webUtils: WebUtils = vscodeGlobal.webUtils;
 
+/**
+ * A set of globals only available to main windows that depend
+ * on `preload.js`.
+ */
+export interface IMainWindowSandboxGlobals {
+	readonly ipcRenderer: IpcRenderer;
+	readonly ipcMessagePort: IpcMessagePort;
+	readonly webFrame: WebFrame;
+	readonly process: ISandboxNodeProcess;
+	readonly context: ISandboxContext;
+	readonly webUtils: WebUtils;
+}
+
 /**
  * A set of globals that are available in all windows that either
  * depend on `preload.js` or `preload-aux.js`.
  */
 export interface ISandboxGlobals {
-	readonly ipcRenderer: Pick<import('vs/base/parts/sandbox/electron-sandbox/electronTypes').IpcRenderer, 'send' | 'invoke'>;
-	readonly webFrame: import('vs/base/parts/sandbox/electron-sandbox/electronTypes').WebFrame;
+	readonly ipcRenderer: Pick<import('./electronTypes.js').IpcRenderer, 'send' | 'invoke'>;
+	readonly webFrame: import('./electronTypes.js').WebFrame;
 }
diff --git a/src/vs/base/parts/sandbox/electron-sandbox/preload-aux.js b/src/vs/base/parts/sandbox/electron-sandbox/preload-aux.ts
similarity index 66%
rename from src/vs/base/parts/sandbox/electron-sandbox/preload-aux.js
rename to src/vs/base/parts/sandbox/electron-sandbox/preload-aux.ts
index c73cabcdfa5..83b7e91fc6f 100644
--- a/src/vs/base/parts/sandbox/electron-sandbox/preload-aux.js
+++ b/src/vs/base/parts/sandbox/electron-sandbox/preload-aux.ts
@@ -3,17 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-// @ts-check
 (function () {
-	'use strict';
 
 	const { ipcRenderer, webFrame, contextBridge } = require('electron');
 
-	/**
-	 * @param {string} channel
-	 * @returns {true | never}
-	 */
-	function validateIPC(channel) {
+	function validateIPC(channel: string): true | never {
 		if (!channel || !channel.startsWith('vscode:')) {
 			throw new Error(`Unsupported event IPC channel '${channel}'`);
 		}
@@ -26,29 +20,16 @@
 		/**
 		 * A minimal set of methods exposed from Electron's `ipcRenderer`
 		 * to support communication to main process.
-		 *
-		 * @typedef {Pick<import('./electronTypes').IpcRenderer, 'send' | 'invoke'>} IpcRenderer
-		 *
-		 * @type {IpcRenderer}
 		 */
 		ipcRenderer: {
 
-			/**
-			 * @param {string} channel
-			 * @param {any[]} args
-			 */
-			send(channel, ...args) {
+			send(channel: string, ...args: any[]): void {
 				if (validateIPC(channel)) {
 					ipcRenderer.send(channel, ...args);
 				}
 			},
 
-			/**
-			 * @param {string} channel
-			 * @param {any[]} args
-			 * @returns {Promise<any>}
-			 */
-			invoke(channel, ...args) {
+			invoke(channel: string, ...args: any[]): Promise<any> {
 				validateIPC(channel);
 
 				return ipcRenderer.invoke(channel, ...args);
@@ -57,15 +38,10 @@
 
 		/**
 		 * Support for subset of methods of Electron's `webFrame` type.
-		 *
-		 * @type {import('./electronTypes').WebFrame}
 		 */
 		webFrame: {
 
-			/**
-			 * @param {number} level
-			 */
-			setZoomLevel(level) {
+			setZoomLevel(level: number): void {
 				if (typeof level === 'number') {
 					webFrame.setZoomLevel(level);
 				}
diff --git a/src/vs/base/parts/sandbox/electron-sandbox/preload.js b/src/vs/base/parts/sandbox/electron-sandbox/preload.ts
similarity index 67%
rename from src/vs/base/parts/sandbox/electron-sandbox/preload.js
rename to src/vs/base/parts/sandbox/electron-sandbox/preload.ts
index e2161616487..ba5476ffb2c 100644
--- a/src/vs/base/parts/sandbox/electron-sandbox/preload.js
+++ b/src/vs/base/parts/sandbox/electron-sandbox/preload.ts
@@ -3,19 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-// @ts-check
+/* eslint-disable no-restricted-globals */
+
 (function () {
-	'use strict';
 
 	const { ipcRenderer, webFrame, contextBridge, webUtils } = require('electron');
 
+	type ISandboxConfiguration = import('vs/base/parts/sandbox/common/sandboxTypes.js').ISandboxConfiguration;
+
 	//#region Utilities
 
-	/**
-	 * @param {string} channel
-	 * @returns {true | never}
-	 */
-	function validateIPC(channel) {
+	function validateIPC(channel: string): true | never {
 		if (!channel || !channel.startsWith('vscode:')) {
 			throw new Error(`Unsupported event IPC channel '${channel}'`);
 		}
@@ -23,11 +21,7 @@
 		return true;
 	}
 
-	/**
-	 * @param {string} key the name of the process argument to parse
-	 * @returns {string | undefined}
-	 */
-	function parseArgv(key) {
+	function parseArgv(key: string): string | undefined {
 		for (const arg of process.argv) {
 			if (arg.indexOf(`--${key}=`) === 0) {
 				return arg.split('=')[1];
@@ -41,15 +35,9 @@
 
 	//#region Resolve Configuration
 
-	/**
-	 * @typedef {import('../common/sandboxTypes').ISandboxConfiguration} ISandboxConfiguration
-	 */
+	let configuration: ISandboxConfiguration | undefined = undefined;
 
-	/** @type {ISandboxConfiguration | undefined} */
-	let configuration = undefined;
-
-	/** @type {Promise<ISandboxConfiguration>} */
-	const resolveConfiguration = (async () => {
+	const resolveConfiguration: Promise<ISandboxConfiguration> = (async () => {
 		const windowConfigIpcChannel = parseArgv('vscode-window-config');
 		if (!windowConfigIpcChannel) {
 			throw new Error('Preload: did not find expected vscode-window-config in renderer process arguments list.');
@@ -59,7 +47,7 @@
 			validateIPC(windowConfigIpcChannel);
 
 			// Resolve configuration from electron-main
-			const resolvedConfiguration = configuration = await ipcRenderer.invoke(windowConfigIpcChannel);
+			const resolvedConfiguration: ISandboxConfiguration = configuration = await ipcRenderer.invoke(windowConfigIpcChannel);
 
 			// Apply `userEnv` directly
 			Object.assign(process.env, resolvedConfiguration.userEnv);
@@ -87,10 +75,8 @@
 	 * shell specific environment from the OS shell to ensure we are seeing
 	 * all development related environment variables. We do this from the
 	 * main process because it may involve spawning a shell.
-	 *
-	 * @type {Promise<typeof process.env>}
 	 */
-	const resolveShellEnv = (async () => {
+	const resolveShellEnv: Promise<typeof process.env> = (async () => {
 
 		// Resolve `userEnv` from configuration and
 		// `shellEnv` from the main side
@@ -114,50 +100,28 @@
 	// ###                                                                 ###
 	// #######################################################################
 
-	/**
-	 * @type {import('./globals')}
-	 */
 	const globals = {
 
 		/**
 		 * A minimal set of methods exposed from Electron's `ipcRenderer`
 		 * to support communication to main process.
-		 *
-		 * @typedef {import('./electronTypes').IpcRenderer} IpcRenderer
-		 * @typedef {import('electron').IpcRendererEvent} IpcRendererEvent
-		 *
-		 * @type {IpcRenderer}
 		 */
 
 		ipcRenderer: {
 
-			/**
-			 * @param {string} channel
-			 * @param {any[]} args
-			 */
-			send(channel, ...args) {
+			send(channel: string, ...args: any[]): void {
 				if (validateIPC(channel)) {
 					ipcRenderer.send(channel, ...args);
 				}
 			},
 
-			/**
-			 * @param {string} channel
-			 * @param {any[]} args
-			 * @returns {Promise<any>}
-			 */
-			invoke(channel, ...args) {
+			invoke(channel: string, ...args: any[]): Promise<any> {
 				validateIPC(channel);
 
 				return ipcRenderer.invoke(channel, ...args);
 			},
 
-			/**
-			 * @param {string} channel
-			 * @param {(event: IpcRendererEvent, ...args: any[]) => void} listener
-			 * @returns {IpcRenderer}
-			 */
-			on(channel, listener) {
+			on(channel: string, listener: (event: Electron.IpcRendererEvent, ...args: any[]) => void) {
 				validateIPC(channel);
 
 				ipcRenderer.on(channel, listener);
@@ -165,12 +129,7 @@
 				return this;
 			},
 
-			/**
-			 * @param {string} channel
-			 * @param {(event: IpcRendererEvent, ...args: any[]) => void} listener
-			 * @returns {IpcRenderer}
-			 */
-			once(channel, listener) {
+			once(channel: string, listener: (event: Electron.IpcRendererEvent, ...args: any[]) => void) {
 				validateIPC(channel);
 
 				ipcRenderer.once(channel, listener);
@@ -178,12 +137,7 @@
 				return this;
 			},
 
-			/**
-			 * @param {string} channel
-			 * @param {(event: IpcRendererEvent, ...args: any[]) => void} listener
-			 * @returns {IpcRenderer}
-			 */
-			removeListener(channel, listener) {
+			removeListener(channel: string, listener: (event: Electron.IpcRendererEvent, ...args: any[]) => void) {
 				validateIPC(channel);
 
 				ipcRenderer.removeListener(channel, listener);
@@ -192,18 +146,11 @@
 			}
 		},
 
-		/**
-		 * @type {import('./globals').IpcMessagePort}
-		 */
 		ipcMessagePort: {
 
-			/**
-			 * @param {string} responseChannel
-			 * @param {string} nonce
-			 */
-			acquire(responseChannel, nonce) {
+			acquire(responseChannel: string, nonce: string) {
 				if (validateIPC(responseChannel)) {
-					const responseListener = (/** @type {IpcRendererEvent} */ e, /** @type {string} */ responseNonce) => {
+					const responseListener = (e: Electron.IpcRendererEvent, responseNonce: string) => {
 						// validate that the nonce from the response is the same
 						// as when requested. and if so, use `postMessage` to
 						// send the `MessagePort` safely over, even when context
@@ -222,15 +169,10 @@
 
 		/**
 		 * Support for subset of methods of Electron's `webFrame` type.
-		 *
-		 * @type {import('./electronTypes').WebFrame}
 		 */
 		webFrame: {
 
-			/**
-			 * @param {number} level
-			 */
-			setZoomLevel(level) {
+			setZoomLevel(level: number): void {
 				if (typeof level === 'number') {
 					webFrame.setZoomLevel(level);
 				}
@@ -242,10 +184,7 @@
 		 */
 		webUtils: {
 
-			/**
-			 * @param {File} file
-			 */
-			getPathForFile(file) {
+			getPathForFile(file: File): string {
 				return webUtils.getPathForFile(file);
 			}
 		},
@@ -255,10 +194,6 @@
 		 *
 		 * Note: when `sandbox` is enabled, the only properties available
 		 * are https://github.com/electron/electron/blob/master/docs/api/process.md#sandbox
-		 *
-		 * @typedef {import('./globals').ISandboxNodeProcess} ISandboxNodeProcess
-		 *
-		 * @type {ISandboxNodeProcess}
 		 */
 		process: {
 			get platform() { return process.platform; },
@@ -268,42 +203,25 @@
 			get type() { return 'renderer'; },
 			get execPath() { return process.execPath; },
 
-			/**
-			 * @returns {string}
-			 */
-			cwd() {
+			cwd(): string {
 				return process.env['VSCODE_CWD'] || process.execPath.substr(0, process.execPath.lastIndexOf(process.platform === 'win32' ? '\\' : '/'));
 			},
 
-			/**
-			 * @returns {Promise<typeof process.env>}
-			 */
-			shellEnv() {
+			shellEnv(): Promise<typeof process.env> {
 				return resolveShellEnv;
 			},
 
-			/**
-			 * @returns {Promise<import('electron').ProcessMemoryInfo>}
-			 */
-			getProcessMemoryInfo() {
+			getProcessMemoryInfo(): Promise<Electron.ProcessMemoryInfo> {
 				return process.getProcessMemoryInfo();
 			},
 
-			/**
-			 * @param {string} type
-			 * @param {Function} callback
-			 * @returns {void}
-			 */
-			on(type, callback) {
-				// @ts-ignore
+			on(type: string, callback: (...args: any[]) => void): void {
 				process.on(type, callback);
 			}
 		},
 
 		/**
 		 * Some information about the context we are running in.
-		 *
-		 * @type {import('./globals').ISandboxContext}
 		 */
 		context: {
 
@@ -314,19 +232,15 @@
 			 * Note: intentionally not using a getter here because the
 			 * actual value will be set after `resolveConfiguration`
 			 * has finished.
-			 *
-			 * @returns {ISandboxConfiguration | undefined}
 			 */
-			configuration() {
+			configuration(): ISandboxConfiguration | undefined {
 				return configuration;
 			},
 
 			/**
 			 * Allows to await the resolution of the configuration object.
-			 *
-			 * @returns {Promise<ISandboxConfiguration>}
 			 */
-			async resolveConfiguration() {
+			async resolveConfiguration(): Promise<ISandboxConfiguration> {
 				return resolveConfiguration;
 			}
 		}
@@ -342,7 +256,6 @@
 			console.error(error);
 		}
 	} else {
-		// @ts-ignore
-		window.vscode = globals;
+		(window as any).vscode = globals;
 	}
 }());
diff --git a/src/vs/base/parts/sandbox/test/electron-sandbox/globals.test.ts b/src/vs/base/parts/sandbox/test/electron-sandbox/globals.test.ts
index 7724c4ed465..d979b221111 100644
--- a/src/vs/base/parts/sandbox/test/electron-sandbox/globals.test.ts
+++ b/src/vs/base/parts/sandbox/test/electron-sandbox/globals.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { context, ipcRenderer, process, webFrame, webUtils } from 'vs/base/parts/sandbox/electron-sandbox/globals';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { ipcRenderer, process, webFrame, webUtils } from '../../electron-sandbox/globals.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../test/common/utils.js';
 
 suite('Sandbox', () => {
 
@@ -14,10 +14,6 @@ suite('Sandbox', () => {
 		assert.ok(typeof webFrame.setZoomLevel === 'function');
 		assert.ok(typeof process.platform === 'string');
 		assert.ok(typeof webUtils.getPathForFile === 'function');
-
-		const config = await context.resolveConfiguration();
-		assert.ok(config);
-		assert.ok(context.configuration());
 	});
 
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/base/parts/storage/common/storage.ts b/src/vs/base/parts/storage/common/storage.ts
index a1afb1f23ea..9a3dab6dc70 100644
--- a/src/vs/base/parts/storage/common/storage.ts
+++ b/src/vs/base/parts/storage/common/storage.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ThrottledDelayer } from 'vs/base/common/async';
-import { Event, PauseableEmitter } from 'vs/base/common/event';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { parse, stringify } from 'vs/base/common/marshalling';
-import { isObject, isUndefinedOrNull } from 'vs/base/common/types';
+import { ThrottledDelayer } from '../../../common/async.js';
+import { Event, PauseableEmitter } from '../../../common/event.js';
+import { Disposable, IDisposable } from '../../../common/lifecycle.js';
+import { parse, stringify } from '../../../common/marshalling.js';
+import { isObject, isUndefinedOrNull } from '../../../common/types.js';
 
 export enum StorageHint {
 
diff --git a/src/vs/base/parts/storage/node/storage.ts b/src/vs/base/parts/storage/node/storage.ts
index 5d942007580..2def700f2b0 100644
--- a/src/vs/base/parts/storage/node/storage.ts
+++ b/src/vs/base/parts/storage/node/storage.ts
@@ -3,12 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { timeout } from 'vs/base/common/async';
-import { Event } from 'vs/base/common/event';
-import { mapToString, setToString } from 'vs/base/common/map';
-import { basename } from 'vs/base/common/path';
-import { Promises } from 'vs/base/node/pfs';
-import { IStorageDatabase, IStorageItemsChangeEvent, IUpdateRequest } from 'vs/base/parts/storage/common/storage';
+import * as fs from 'fs';
+import { timeout } from '../../../common/async.js';
+import { Event } from '../../../common/event.js';
+import { mapToString, setToString } from '../../../common/map.js';
+import { basename } from '../../../common/path.js';
+import { Promises } from '../../../node/pfs.js';
+import { IStorageDatabase, IStorageItemsChangeEvent, IUpdateRequest } from '../common/storage.js';
 import type { Database, Statement } from '@vscode/sqlite3';
 
 interface IDatabaseConnection {
@@ -194,7 +195,7 @@ export class SQLiteStorageDatabase implements IStorageDatabase {
 					// Delete the existing DB. If the path does not exist or fails to
 					// be deleted, we do not try to recover anymore because we assume
 					// that the path is no longer writeable for us.
-					return Promises.unlink(this.path).then(() => {
+					return fs.promises.unlink(this.path).then(() => {
 
 						// Re-open the DB fresh
 						return this.doConnect(this.path).then(recoveryConnection => {
@@ -280,7 +281,7 @@ export class SQLiteStorageDatabase implements IStorageDatabase {
 			// folder is really not writeable for us.
 			//
 			try {
-				await Promises.unlink(path);
+				await fs.promises.unlink(path);
 				try {
 					await Promises.rename(this.toBackupPath(path), path, false /* no retry */);
 				} catch (error) {
@@ -308,8 +309,9 @@ export class SQLiteStorageDatabase implements IStorageDatabase {
 	private doConnect(path: string): Promise<IDatabaseConnection> {
 		return new Promise((resolve, reject) => {
 			import('@vscode/sqlite3').then(sqlite3 => {
+				const ctor = (this.logger.isTracing ? sqlite3.default.verbose().Database : sqlite3.default.Database);
 				const connection: IDatabaseConnection = {
-					db: new (this.logger.isTracing ? sqlite3.verbose().Database : sqlite3.Database)(path, (error: (Error & { code?: string }) | null) => {
+					db: new ctor(path, (error: (Error & { code?: string }) | null) => {
 						if (error) {
 							return (connection.db && error.code !== 'SQLITE_CANTOPEN' /* https://github.com/TryGhost/node-sqlite3/issues/1617 */) ? connection.db.close(() => reject(error)) : reject(error);
 						}
diff --git a/src/vs/base/parts/storage/test/node/storage.integrationTest.ts b/src/vs/base/parts/storage/test/node/storage.integrationTest.ts
index 51c66ca1af8..994417ddc00 100644
--- a/src/vs/base/parts/storage/test/node/storage.integrationTest.ts
+++ b/src/vs/base/parts/storage/test/node/storage.integrationTest.ts
@@ -3,19 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as fs from 'fs';
 import { deepStrictEqual, ok, strictEqual } from 'assert';
 import { tmpdir } from 'os';
-import { timeout } from 'vs/base/common/async';
-import { Emitter, Event } from 'vs/base/common/event';
-import { join } from 'vs/base/common/path';
-import { isWindows } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { Promises } from 'vs/base/node/pfs';
-import { isStorageItemsChangeEvent, IStorageDatabase, IStorageItemsChangeEvent, Storage } from 'vs/base/parts/storage/common/storage';
-import { ISQLiteStorageDatabaseOptions, SQLiteStorageDatabase } from 'vs/base/parts/storage/node/storage';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { flakySuite, getRandomTestPath } from 'vs/base/test/node/testUtils';
+import { timeout } from '../../../../common/async.js';
+import { Emitter, Event } from '../../../../common/event.js';
+import { join } from '../../../../common/path.js';
+import { isWindows } from '../../../../common/platform.js';
+import { URI } from '../../../../common/uri.js';
+import { generateUuid } from '../../../../common/uuid.js';
+import { Promises } from '../../../../node/pfs.js';
+import { isStorageItemsChangeEvent, IStorageDatabase, IStorageItemsChangeEvent, Storage } from '../../common/storage.js';
+import { ISQLiteStorageDatabaseOptions, SQLiteStorageDatabase } from '../../node/storage.js';
+import { runWithFakedTimers } from '../../../../test/common/timeTravelScheduler.js';
+import { flakySuite, getRandomTestPath } from '../../../../test/node/testUtils.js';
 
 flakySuite('Storage Library', function () {
 
@@ -24,7 +25,7 @@ flakySuite('Storage Library', function () {
 	setup(function () {
 		testDir = getRandomTestPath(tmpdir(), 'vsctests', 'storagelibrary');
 
-		return Promises.mkdir(testDir, { recursive: true });
+		return fs.promises.mkdir(testDir, { recursive: true });
 	});
 
 	teardown(function () {
@@ -353,7 +354,7 @@ flakySuite('SQLite Storage Library', function () {
 	setup(function () {
 		testdir = getRandomTestPath(tmpdir(), 'vsctests', 'storagelibrary');
 
-		return Promises.mkdir(testdir, { recursive: true });
+		return fs.promises.mkdir(testdir, { recursive: true });
 	});
 
 	teardown(function () {
@@ -534,7 +535,7 @@ flakySuite('SQLite Storage Library', function () {
 		// on shutdown.
 		await storage.checkIntegrity(true).then(null, error => { } /* error is expected here but we do not want to fail */);
 
-		await Promises.unlink(backupPath); // also test that the recovery DB is backed up properly
+		await fs.promises.unlink(backupPath); // also test that the recovery DB is backed up properly
 
 		let recoveryCalled = false;
 		await storage.close(() => {
@@ -798,7 +799,7 @@ flakySuite('SQLite Storage Library', function () {
 		await storage.optimize();
 		await storage.close();
 
-		const sizeBeforeDeleteAndOptimize = (await Promises.stat(dbPath)).size;
+		const sizeBeforeDeleteAndOptimize = (await fs.promises.stat(dbPath)).size;
 
 		storage = new SQLiteStorageDatabase(dbPath);
 
@@ -820,7 +821,7 @@ flakySuite('SQLite Storage Library', function () {
 
 		await storage.close();
 
-		const sizeAfterDeleteAndOptimize = (await Promises.stat(dbPath)).size;
+		const sizeAfterDeleteAndOptimize = (await fs.promises.stat(dbPath)).size;
 
 		strictEqual(sizeAfterDeleteAndOptimize < sizeBeforeDeleteAndOptimize, true);
 	});
diff --git a/src/vs/base/test/browser/actionbar.test.ts b/src/vs/base/test/browser/actionbar.test.ts
index 5d197e8181b..7ec25b1bf11 100644
--- a/src/vs/base/test/browser/actionbar.test.ts
+++ b/src/vs/base/test/browser/actionbar.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ActionBar, prepareActions } from 'vs/base/browser/ui/actionbar/actionbar';
-import { Action, Separator } from 'vs/base/common/actions';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { ActionBar, prepareActions } from '../../browser/ui/actionbar/actionbar.js';
+import { Action, Separator } from '../../common/actions.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../common/utils.js';
 
 suite('Actionbar', () => {
 
diff --git a/src/vs/base/test/browser/browser.test.ts b/src/vs/base/test/browser/browser.test.ts
index 76049fb5721..4bb247b740b 100644
--- a/src/vs/base/test/browser/browser.test.ts
+++ b/src/vs/base/test/browser/browser.test.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { isMacintosh, isWindows } from 'vs/base/common/platform';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { isMacintosh, isWindows } from '../../common/platform.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../common/utils.js';
 
 suite('Browsers', () => {
 
diff --git a/src/vs/base/test/browser/comparers.test.ts b/src/vs/base/test/browser/comparers.test.ts
index 690e3eb4782..e29c6840100 100644
--- a/src/vs/base/test/browser/comparers.test.ts
+++ b/src/vs/base/test/browser/comparers.test.ts
@@ -6,8 +6,8 @@
 import assert from 'assert';
 import {
 	compareFileExtensions, compareFileExtensionsDefault, compareFileExtensionsLower, compareFileExtensionsUnicode, compareFileExtensionsUpper, compareFileNames, compareFileNamesDefault, compareFileNamesLower, compareFileNamesUnicode, compareFileNamesUpper
-} from 'vs/base/common/comparers';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+} from '../../common/comparers.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../common/utils.js';
 
 const compareLocale = (a: string, b: string) => a.localeCompare(b);
 const compareLocaleNumeric = (a: string, b: string) => a.localeCompare(b, undefined, { numeric: true });
diff --git a/src/vs/base/test/browser/dom.test.ts b/src/vs/base/test/browser/dom.test.ts
index 98ad9441a92..ede638b5920 100644
--- a/src/vs/base/test/browser/dom.test.ts
+++ b/src/vs/base/test/browser/dom.test.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { $, asCssValueWithDefault, h, multibyteAwareBtoa, trackAttributes, copyAttributes, disposableWindowInterval, getWindows, getWindowsCount, getWindowId, getWindowById, hasWindow, getWindow, getDocument, isHTMLElement } from 'vs/base/browser/dom';
-import { ensureCodeWindow, isAuxiliaryWindow, mainWindow } from 'vs/base/browser/window';
-import { DeferredPromise, timeout } from 'vs/base/common/async';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { $, asCssValueWithDefault, h, multibyteAwareBtoa, trackAttributes, copyAttributes, disposableWindowInterval, getWindows, getWindowsCount, getWindowId, getWindowById, hasWindow, getWindow, getDocument, isHTMLElement, SafeTriangle } from '../../browser/dom.js';
+import { ensureCodeWindow, isAuxiliaryWindow, mainWindow } from '../../browser/window.js';
+import { DeferredPromise, timeout } from '../../common/async.js';
+import { runWithFakedTimers } from '../common/timeTravelScheduler.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../common/utils.js';
 
 suite('dom', () => {
 	test('hasClass', () => {
@@ -407,5 +407,38 @@ suite('dom', () => {
 		});
 	});
 
+	suite('SafeTriangle', () => {
+		const fakeElement = (left: number, right: number, top: number, bottom: number): HTMLElement => {
+			return { getBoundingClientRect: () => ({ left, right, top, bottom }) } as any;
+		};
+
+		test('works', () => {
+			const safeTriangle = new SafeTriangle(0, 0, fakeElement(10, 20, 10, 20));
+
+			assert.strictEqual(safeTriangle.contains(5, 5), true); // in triangle region
+			assert.strictEqual(safeTriangle.contains(15, 5), false);
+			assert.strictEqual(safeTriangle.contains(25, 5), false);
+
+			assert.strictEqual(safeTriangle.contains(5, 15), false);
+			assert.strictEqual(safeTriangle.contains(15, 15), true);
+			assert.strictEqual(safeTriangle.contains(25, 15), false);
+
+			assert.strictEqual(safeTriangle.contains(5, 25), false);
+			assert.strictEqual(safeTriangle.contains(15, 25), false);
+			assert.strictEqual(safeTriangle.contains(25, 25), false);
+		});
+
+		test('other dirations', () => {
+			const a = new SafeTriangle(30, 30, fakeElement(10, 20, 10, 20));
+			assert.strictEqual(a.contains(25, 25), true);
+
+			const b = new SafeTriangle(0, 30, fakeElement(10, 20, 10, 20));
+			assert.strictEqual(b.contains(5, 25), true);
+
+			const c = new SafeTriangle(30, 0, fakeElement(10, 20, 10, 20));
+			assert.strictEqual(c.contains(25, 5), true);
+		});
+	});
+
 	ensureNoDisposablesAreLeakedInTestSuite();
 });
diff --git a/src/vs/base/test/browser/formattedTextRenderer.test.ts b/src/vs/base/test/browser/formattedTextRenderer.test.ts
index d4ba452786d..9a2f08748b0 100644
--- a/src/vs/base/test/browser/formattedTextRenderer.test.ts
+++ b/src/vs/base/test/browser/formattedTextRenderer.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { renderFormattedText, renderText } from 'vs/base/browser/formattedTextRenderer';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { renderFormattedText, renderText } from '../../browser/formattedTextRenderer.js';
+import { DisposableStore } from '../../common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../common/utils.js';
 
 suite('FormattedTextRenderer', () => {
 	const store = new DisposableStore();
diff --git a/src/vs/base/test/browser/hash.test.ts b/src/vs/base/test/browser/hash.test.ts
index d7f319bbe15..0d358adc6f5 100644
--- a/src/vs/base/test/browser/hash.test.ts
+++ b/src/vs/base/test/browser/hash.test.ts
@@ -4,9 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { sha1Hex } from 'vs/base/browser/hash';
-import { hash, StringSHA1 } from 'vs/base/common/hash';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { hash, hashAsync, StringSHA1 } from '../../common/hash.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../common/utils.js';
 
 suite('Hash', () => {
 	test('string', () => {
@@ -83,7 +82,7 @@ suite('Hash', () => {
 		assert.strictEqual(actual, expected);
 
 		// Test with crypto.subtle
-		actual = await sha1Hex(str);
+		actual = await hashAsync(str);
 		assert.strictEqual(actual, expected);
 	}
 
diff --git a/src/vs/base/test/browser/highlightedLabel.test.ts b/src/vs/base/test/browser/highlightedLabel.test.ts
index c18b2037062..27ca48e4906 100644
--- a/src/vs/base/test/browser/highlightedLabel.test.ts
+++ b/src/vs/base/test/browser/highlightedLabel.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { HighlightedLabel } from '../../browser/ui/highlightedlabel/highlightedLabel.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../common/utils.js';
 
 suite('HighlightedLabel', () => {
 	let label: HighlightedLabel;
diff --git a/src/vs/base/test/browser/iconLabels.test.ts b/src/vs/base/test/browser/iconLabels.test.ts
index 2a10f47241b..9059c0bd5c9 100644
--- a/src/vs/base/test/browser/iconLabels.test.ts
+++ b/src/vs/base/test/browser/iconLabels.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { isHTMLElement } from 'vs/base/browser/dom';
-import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { isHTMLElement } from '../../browser/dom.js';
+import { renderLabelWithIcons } from '../../browser/ui/iconLabel/iconLabels.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../common/utils.js';
 
 suite('renderLabelWithIcons', () => {
 
diff --git a/src/vs/base/test/browser/indexedDB.test.ts b/src/vs/base/test/browser/indexedDB.test.ts
index 8b1271562fd..5a3a261a362 100644
--- a/src/vs/base/test/browser/indexedDB.test.ts
+++ b/src/vs/base/test/browser/indexedDB.test.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { IndexedDB } from 'vs/base/browser/indexedDB';
-import { flakySuite } from 'vs/base/test/common/testUtils';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { IndexedDB } from '../../browser/indexedDB.js';
+import { flakySuite } from '../common/testUtils.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../common/utils.js';
 
 flakySuite('IndexedDB', () => {
 
diff --git a/src/vs/base/test/browser/markdownRenderer.test.ts b/src/vs/base/test/browser/markdownRenderer.test.ts
index 81abf8c9c9e..1c00e3cbdd2 100644
--- a/src/vs/base/test/browser/markdownRenderer.test.ts
+++ b/src/vs/base/test/browser/markdownRenderer.test.ts
@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { fillInIncompleteTokens, renderMarkdown, renderMarkdownAsPlaintext } from 'vs/base/browser/markdownRenderer';
-import { IMarkdownString, MarkdownString } from 'vs/base/common/htmlContent';
-import { marked } from 'vs/base/common/marked/marked';
-import { parse } from 'vs/base/common/marshalling';
-import { isWeb } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { fillInIncompleteTokens, renderMarkdown, renderMarkdownAsPlaintext } from '../../browser/markdownRenderer.js';
+import { IMarkdownString, MarkdownString } from '../../common/htmlContent.js';
+import * as marked from '../../common/marked/marked.js';
+import { parse } from '../../common/marshalling.js';
+import { isWeb } from '../../common/platform.js';
+import { URI } from '../../common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../common/utils.js';
 
 function strToNode(str: string): HTMLElement {
 	return new DOMParser().parseFromString(str, 'text/html').body.firstChild as HTMLElement;
@@ -259,8 +259,8 @@ suite('MarkdownRenderer', () => {
 	suite('PlaintextMarkdownRender', () => {
 
 		test('test code, blockquote, heading, list, listitem, paragraph, table, tablerow, tablecell, strong, em, br, del, text are rendered plaintext', () => {
-			const markdown = { value: '`code`\n>quote\n# heading\n- list\n\n\ntable | table2\n--- | --- \none | two\n\n\nbo**ld**\n_italic_\n~~del~~\nsome text' };
-			const expected = 'code\nquote\nheading\nlist\ntable table2 one two \nbold\nitalic\ndel\nsome text\n';
+			const markdown = { value: '`code`\n>quote\n# heading\n- list\n\ntable | table2\n--- | --- \none | two\n\n\nbo**ld**\n_italic_\n~~del~~\nsome text' };
+			const expected = 'code\nquote\nheading\nlist\n\ntable table2\none two\nbold\nitalic\ndel\nsome text\n';
 			const result: string = renderMarkdownAsPlaintext(markdown);
 			assert.strictEqual(result, expected);
 		});
@@ -342,15 +342,15 @@ suite('MarkdownRenderer', () => {
 
 		suite('table', () => {
 			test('complete table', () => {
-				const tokens = marked.lexer(completeTable);
+				const tokens = marked.marked.lexer(completeTable);
 				const newTokens = fillInIncompleteTokens(tokens);
 				assert.equal(newTokens, tokens);
 			});
 
 			test('full header only', () => {
 				const incompleteTable = '| a | b |';
-				const tokens = marked.lexer(incompleteTable);
-				const completeTableTokens = marked.lexer(completeTable);
+				const tokens = marked.marked.lexer(incompleteTable);
+				const completeTableTokens = marked.marked.lexer(completeTable);
 
 				const newTokens = fillInIncompleteTokens(tokens);
 				assert.deepStrictEqual(newTokens, completeTableTokens);
@@ -358,8 +358,8 @@ suite('MarkdownRenderer', () => {
 
 			test('full header only with trailing space', () => {
 				const incompleteTable = '| a | b | ';
-				const tokens = marked.lexer(incompleteTable);
-				const completeTableTokens = marked.lexer(completeTable);
+				const tokens = marked.marked.lexer(incompleteTable);
+				const completeTableTokens = marked.marked.lexer(completeTable);
 
 				const newTokens = fillInIncompleteTokens(tokens);
 				if (newTokens) {
@@ -370,8 +370,8 @@ suite('MarkdownRenderer', () => {
 
 			test('incomplete header', () => {
 				const incompleteTable = '| a | b';
-				const tokens = marked.lexer(incompleteTable);
-				const completeTableTokens = marked.lexer(completeTable);
+				const tokens = marked.marked.lexer(incompleteTable);
+				const completeTableTokens = marked.marked.lexer(completeTable);
 
 				const newTokens = fillInIncompleteTokens(tokens);
 
@@ -383,8 +383,8 @@ suite('MarkdownRenderer', () => {
 
 			test('incomplete header one column', () => {
 				const incompleteTable = '| a ';
-				const tokens = marked.lexer(incompleteTable);
-				const completeTableTokens = marked.lexer(incompleteTable + '|\n| --- |');
+				const tokens = marked.marked.lexer(incompleteTable);
+				const completeTableTokens = marked.marked.lexer(incompleteTable + '|\n| --- |');
 
 				const newTokens = fillInIncompleteTokens(tokens);
 
@@ -396,8 +396,8 @@ suite('MarkdownRenderer', () => {
 
 			test('full header with extras', () => {
 				const incompleteTable = '| a **bold** | b _italics_ |';
-				const tokens = marked.lexer(incompleteTable);
-				const completeTableTokens = marked.lexer(incompleteTable + '\n| --- | --- |');
+				const tokens = marked.marked.lexer(incompleteTable);
+				const completeTableTokens = marked.marked.lexer(incompleteTable + '\n| --- | --- |');
 
 				const newTokens = fillInIncompleteTokens(tokens);
 				assert.deepStrictEqual(newTokens, completeTableTokens);
@@ -406,8 +406,8 @@ suite('MarkdownRenderer', () => {
 			test('full header with leading text', () => {
 				// Parsing this gives one token and one 'text' subtoken
 				const incompleteTable = 'here is a table\n| a | b |';
-				const tokens = marked.lexer(incompleteTable);
-				const completeTableTokens = marked.lexer(incompleteTable + '\n| --- | --- |');
+				const tokens = marked.marked.lexer(incompleteTable);
+				const completeTableTokens = marked.marked.lexer(incompleteTable + '\n| --- | --- |');
 
 				const newTokens = fillInIncompleteTokens(tokens);
 				assert.deepStrictEqual(newTokens, completeTableTokens);
@@ -416,8 +416,8 @@ suite('MarkdownRenderer', () => {
 			test('full header with leading other stuff', () => {
 				// Parsing this gives one token and one 'text' subtoken
 				const incompleteTable = '```js\nconst xyz = 123;\n```\n| a | b |';
-				const tokens = marked.lexer(incompleteTable);
-				const completeTableTokens = marked.lexer(incompleteTable + '\n| --- | --- |');
+				const tokens = marked.marked.lexer(incompleteTable);
+				const completeTableTokens = marked.marked.lexer(incompleteTable + '\n| --- | --- |');
 
 				const newTokens = fillInIncompleteTokens(tokens);
 				assert.deepStrictEqual(newTokens, completeTableTokens);
@@ -425,8 +425,8 @@ suite('MarkdownRenderer', () => {
 
 			test('full header with incomplete separator', () => {
 				const incompleteTable = '| a | b |\n| ---';
-				const tokens = marked.lexer(incompleteTable);
-				const completeTableTokens = marked.lexer(completeTable);
+				const tokens = marked.marked.lexer(incompleteTable);
+				const completeTableTokens = marked.marked.lexer(completeTable);
 
 				const newTokens = fillInIncompleteTokens(tokens);
 				assert.deepStrictEqual(newTokens, completeTableTokens);
@@ -434,8 +434,8 @@ suite('MarkdownRenderer', () => {
 
 			test('full header with incomplete separator 2', () => {
 				const incompleteTable = '| a | b |\n| --- |';
-				const tokens = marked.lexer(incompleteTable);
-				const completeTableTokens = marked.lexer(completeTable);
+				const tokens = marked.marked.lexer(incompleteTable);
+				const completeTableTokens = marked.marked.lexer(completeTable);
 
 				const newTokens = fillInIncompleteTokens(tokens);
 				assert.deepStrictEqual(newTokens, completeTableTokens);
@@ -443,8 +443,8 @@ suite('MarkdownRenderer', () => {
 
 			test('full header with incomplete separator 3', () => {
 				const incompleteTable = '| a | b |\n|';
-				const tokens = marked.lexer(incompleteTable);
-				const completeTableTokens = marked.lexer(completeTable);
+				const tokens = marked.marked.lexer(incompleteTable);
+				const completeTableTokens = marked.marked.lexer(completeTable);
 
 				const newTokens = fillInIncompleteTokens(tokens);
 				assert.deepStrictEqual(newTokens, completeTableTokens);
@@ -452,7 +452,7 @@ suite('MarkdownRenderer', () => {
 
 			test('not a table', () => {
 				const incompleteTable = '| a | b |\nsome text';
-				const tokens = marked.lexer(incompleteTable);
+				const tokens = marked.marked.lexer(incompleteTable);
 
 				const newTokens = fillInIncompleteTokens(tokens);
 				assert.deepStrictEqual(newTokens, tokens);
@@ -460,104 +460,26 @@ suite('MarkdownRenderer', () => {
 
 			test('not a table 2', () => {
 				const incompleteTable = '| a | b |\n| --- |\nsome text';
-				const tokens = marked.lexer(incompleteTable);
+				const tokens = marked.marked.lexer(incompleteTable);
 
 				const newTokens = fillInIncompleteTokens(tokens);
 				assert.deepStrictEqual(newTokens, tokens);
 			});
 		});
 
-		suite('codeblock', () => {
-			test('complete code block', () => {
-				const completeCodeblock = '```js\nconst xyz = 123;\n```';
-				const tokens = marked.lexer(completeCodeblock);
-				const newTokens = fillInIncompleteTokens(tokens);
-				assert.equal(newTokens, tokens);
-			});
-
-			test('code block header only', () => {
-				const incompleteCodeblock = '```js';
-				const tokens = marked.lexer(incompleteCodeblock);
-				const newTokens = fillInIncompleteTokens(tokens);
-
-				const completeCodeblockTokens = marked.lexer(incompleteCodeblock + '\n```');
-				assert.deepStrictEqual(newTokens, completeCodeblockTokens);
-			});
-
-			test('code block header no lang', () => {
-				const incompleteCodeblock = '```';
-				const tokens = marked.lexer(incompleteCodeblock);
-				const newTokens = fillInIncompleteTokens(tokens);
-
-				const completeCodeblockTokens = marked.lexer(incompleteCodeblock + '\n```');
-				assert.deepStrictEqual(newTokens, completeCodeblockTokens);
-			});
-
-			test('code block header and some code', () => {
-				const incompleteCodeblock = '```js\nconst';
-				const tokens = marked.lexer(incompleteCodeblock);
-				const newTokens = fillInIncompleteTokens(tokens);
-
-				const completeCodeblockTokens = marked.lexer(incompleteCodeblock + '\n```');
-				assert.deepStrictEqual(newTokens, completeCodeblockTokens);
-			});
-
-			test('code block header with leading text', () => {
-				const incompleteCodeblock = 'some text\n```js';
-				const tokens = marked.lexer(incompleteCodeblock);
-				const newTokens = fillInIncompleteTokens(tokens);
-
-				const completeCodeblockTokens = marked.lexer(incompleteCodeblock + '\n```');
-				assert.deepStrictEqual(newTokens, completeCodeblockTokens);
-			});
-
-			test('code block header with leading text and some code', () => {
-				const incompleteCodeblock = 'some text\n```js\nconst';
-				const tokens = marked.lexer(incompleteCodeblock);
-				const newTokens = fillInIncompleteTokens(tokens);
-
-				const completeCodeblockTokens = marked.lexer(incompleteCodeblock + '\n```');
-				assert.deepStrictEqual(newTokens, completeCodeblockTokens);
-			});
-
-			test('code block header with more backticks', () => {
-				const incompleteCodeblock = 'some text\n`````js\nconst';
-				const tokens = marked.lexer(incompleteCodeblock);
-				const newTokens = fillInIncompleteTokens(tokens);
-
-				const completeCodeblockTokens = marked.lexer(incompleteCodeblock + '\n`````');
-				assert.deepStrictEqual(newTokens, completeCodeblockTokens);
-			});
-
-			test('code block header containing codeblock', () => {
-				const incompleteCodeblock = `some text
-\`\`\`\`\`js
-const x = 1;
-\`\`\`
-const y = 2;
-\`\`\`
-// foo`;
-				const tokens = marked.lexer(incompleteCodeblock);
-				const newTokens = fillInIncompleteTokens(tokens);
-
-				const completeCodeblockTokens = marked.lexer(incompleteCodeblock + '\n`````');
-				assert.deepStrictEqual(newTokens, completeCodeblockTokens);
-			});
-		});
-
 		function simpleMarkdownTestSuite(name: string, delimiter: string): void {
 			test(`incomplete ${name}`, () => {
 				const incomplete = `${delimiter}code`;
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + delimiter);
+				const completeTokens = marked.marked.lexer(incomplete + delimiter);
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test(`complete ${name}`, () => {
 				const text = `leading text ${delimiter}code${delimiter} trailing text`;
-				const tokens = marked.lexer(text);
+				const tokens = marked.marked.lexer(text);
 				const newTokens = fillInIncompleteTokens(tokens);
 
 				assert.deepStrictEqual(newTokens, tokens);
@@ -565,16 +487,16 @@ const y = 2;
 
 			test(`${name} with leading text`, () => {
 				const incomplete = `some text and ${delimiter}some code`;
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + delimiter);
+				const completeTokens = marked.marked.lexer(incomplete + delimiter);
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test(`single loose "${delimiter}"`, () => {
 				const text = `some text and ${delimiter}by itself\nmore text here`;
-				const tokens = marked.lexer(text);
+				const tokens = marked.marked.lexer(text);
 				const newTokens = fillInIncompleteTokens(tokens);
 
 				assert.deepStrictEqual(newTokens, tokens);
@@ -582,37 +504,46 @@ const y = 2;
 
 			test(`incomplete ${name} after newline`, () => {
 				const text = `some text\nmore text here and ${delimiter}text`;
-				const tokens = marked.lexer(text);
+				const tokens = marked.marked.lexer(text);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(text + delimiter);
+				const completeTokens = marked.marked.lexer(text + delimiter);
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test(`incomplete after complete ${name}`, () => {
 				const text = `leading text ${delimiter}code${delimiter} trailing text and ${delimiter}another`;
-				const tokens = marked.lexer(text);
+				const tokens = marked.marked.lexer(text);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(text + delimiter);
+				const completeTokens = marked.marked.lexer(text + delimiter);
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test(`incomplete ${name} in list`, () => {
 				const text = `- list item one\n- list item two and ${delimiter}text`;
-				const tokens = marked.lexer(text);
+				const tokens = marked.marked.lexer(text);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(text + delimiter);
+				const completeTokens = marked.marked.lexer(text + delimiter);
+				assert.deepStrictEqual(newTokens, completeTokens);
+			});
+
+			test(`incomplete ${name} in asterisk list`, () => {
+				const text = `* list item one\n* list item two and ${delimiter}text`;
+				const tokens = marked.marked.lexer(text);
+				const newTokens = fillInIncompleteTokens(tokens);
+
+				const completeTokens = marked.marked.lexer(text + delimiter);
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test(`incomplete ${name} in numbered list`, () => {
 				const text = `1. list item one\n2. list item two and ${delimiter}text`;
-				const tokens = marked.lexer(text);
+				const tokens = marked.marked.lexer(text);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(text + delimiter);
+				const completeTokens = marked.marked.lexer(text + delimiter);
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 		}
@@ -625,7 +556,7 @@ const y = 2;
 	\`\`\`
 - list item two
 `;
-				const tokens = marked.lexer(list);
+				const tokens = marked.marked.lexer(list);
 				const newTokens = fillInIncompleteTokens(tokens);
 
 				assert.deepStrictEqual(newTokens, tokens);
@@ -636,10 +567,10 @@ const y = 2;
 
 	\`\`\`js
 	let x = 1;`;
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + '\n	```');
+				const completeTokens = marked.marked.lexer(incomplete + '\n	```');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
@@ -649,7 +580,7 @@ const y = 2;
 - text
 	newline for some reason
 `;
-				const tokens = marked.lexer(list);
+				const tokens = marked.marked.lexer(list);
 				const newTokens = fillInIncompleteTokens(tokens);
 
 				assert.deepStrictEqual(newTokens, tokens);
@@ -661,7 +592,7 @@ const y = 2;
 2. text
 	newline for some reason
 `;
-				const tokens = marked.lexer(list);
+				const tokens = marked.marked.lexer(list);
 				const newTokens = fillInIncompleteTokens(tokens);
 
 				assert.deepStrictEqual(newTokens, tokens);
@@ -669,7 +600,7 @@ const y = 2;
 
 			test('list with stuff', () => {
 				const list = `- list item one \`codespan\` **bold** [link](http://microsoft.com) more text`;
-				const tokens = marked.lexer(list);
+				const tokens = marked.marked.lexer(list);
 				const newTokens = fillInIncompleteTokens(tokens);
 
 				assert.deepStrictEqual(newTokens, tokens);
@@ -678,70 +609,70 @@ const y = 2;
 			test('list with incomplete link text', () => {
 				const incomplete = `- list item one
 - item two [link`;
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + '](https://microsoft.com)');
+				const completeTokens = marked.marked.lexer(incomplete + '](https://microsoft.com)');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test('list with incomplete link target', () => {
 				const incomplete = `- list item one
 - item two [link](`;
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + ')');
+				const completeTokens = marked.marked.lexer(incomplete + ')');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test('ordered list with incomplete link target', () => {
 				const incomplete = `1. list item one
 2. item two [link](`;
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + ')');
+				const completeTokens = marked.marked.lexer(incomplete + ')');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test('ordered list with extra whitespace', () => {
 				const incomplete = `1. list item one
 2. item two [link](`;
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + ')');
+				const completeTokens = marked.marked.lexer(incomplete + ')');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test('list with extra whitespace', () => {
 				const incomplete = `- list item one
 - item two [link](`;
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + ')');
+				const completeTokens = marked.marked.lexer(incomplete + ')');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test('list with incomplete link with other stuff', () => {
 				const incomplete = `- list item one
 - item two [\`link`;
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + '\`](https://microsoft.com)');
+				const completeTokens = marked.marked.lexer(incomplete + '\`](https://microsoft.com)');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test('ordered list with incomplete link with other stuff', () => {
 				const incomplete = `1. list item one
 1. item two [\`link`;
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + '\`](https://microsoft.com)');
+				const completeTokens = marked.marked.lexer(incomplete + '\`](https://microsoft.com)');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 		});
@@ -751,19 +682,19 @@ const y = 2;
 
 			test(`backtick between letters`, () => {
 				const text = 'a`b';
-				const tokens = marked.lexer(text);
+				const tokens = marked.marked.lexer(text);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeCodespanTokens = marked.lexer(text + '`');
+				const completeCodespanTokens = marked.marked.lexer(text + '`');
 				assert.deepStrictEqual(newTokens, completeCodespanTokens);
 			});
 
 			test(`nested pattern`, () => {
 				const text = 'sldkfjsd `abc __def__ ghi';
-				const tokens = marked.lexer(text);
+				const tokens = marked.marked.lexer(text);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(text + '`');
+				const completeTokens = marked.marked.lexer(text + '`');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 		});
@@ -773,19 +704,19 @@ const y = 2;
 
 			test(`star between letters`, () => {
 				const text = 'sldkfjsd a*b';
-				const tokens = marked.lexer(text);
+				const tokens = marked.marked.lexer(text);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(text + '*');
+				const completeTokens = marked.marked.lexer(text + '*');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test(`nested pattern`, () => {
 				const text = 'sldkfjsd *abc __def__ ghi';
-				const tokens = marked.lexer(text);
+				const tokens = marked.marked.lexer(text);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(text + '*');
+				const completeTokens = marked.marked.lexer(text + '*');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 		});
@@ -795,10 +726,10 @@ const y = 2;
 
 			test(`double star between letters`, () => {
 				const text = 'a**b';
-				const tokens = marked.lexer(text);
+				const tokens = marked.marked.lexer(text);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(text + '**');
+				const completeTokens = marked.marked.lexer(text + '**');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 		});
@@ -808,7 +739,7 @@ const y = 2;
 
 			test(`underscore between letters`, () => {
 				const text = `this_not_italics`;
-				const tokens = marked.lexer(text);
+				const tokens = marked.marked.lexer(text);
 				const newTokens = fillInIncompleteTokens(tokens);
 
 				assert.deepStrictEqual(newTokens, tokens);
@@ -820,7 +751,7 @@ const y = 2;
 
 			test(`double underscore between letters`, () => {
 				const text = `this__not__bold`;
-				const tokens = marked.lexer(text);
+				const tokens = marked.marked.lexer(text);
 				const newTokens = fillInIncompleteTokens(tokens);
 
 				assert.deepStrictEqual(newTokens, tokens);
@@ -830,115 +761,115 @@ const y = 2;
 		suite('link', () => {
 			test('incomplete link text', () => {
 				const incomplete = 'abc [text';
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + '](https://microsoft.com)');
+				const completeTokens = marked.marked.lexer(incomplete + '](https://microsoft.com)');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test('incomplete link target', () => {
 				const incomplete = 'foo [text](http://microsoft';
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + ')');
+				const completeTokens = marked.marked.lexer(incomplete + ')');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test('incomplete link target 2', () => {
 				const incomplete = 'foo [text](http://microsoft.com';
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + ')');
+				const completeTokens = marked.marked.lexer(incomplete + ')');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test('incomplete link target with extra stuff', () => {
 				const incomplete = '[before `text` after](http://microsoft.com';
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + ')');
+				const completeTokens = marked.marked.lexer(incomplete + ')');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test('incomplete link target with extra stuff and incomplete arg', () => {
 				const incomplete = '[before `text` after](http://microsoft.com "more text ';
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + '")');
+				const completeTokens = marked.marked.lexer(incomplete + '")');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test('incomplete link target with incomplete arg', () => {
 				const incomplete = 'foo [text](http://microsoft.com "more text here ';
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + '")');
+				const completeTokens = marked.marked.lexer(incomplete + '")');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test('incomplete link target with incomplete arg 2', () => {
 				const incomplete = '[text](command:_github.copilot.openRelativePath "arg';
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + '")');
+				const completeTokens = marked.marked.lexer(incomplete + '")');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test('incomplete link target with complete arg', () => {
 				const incomplete = 'foo [text](http://microsoft.com "more text here"';
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + ')');
+				const completeTokens = marked.marked.lexer(incomplete + ')');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test('link text with incomplete codespan', () => {
 				const incomplete = `text [\`codespan`;
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + '`](https://microsoft.com)');
+				const completeTokens = marked.marked.lexer(incomplete + '`](https://microsoft.com)');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test('link text with incomplete stuff', () => {
 				const incomplete = `text [more text \`codespan\` text **bold`;
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + '**](https://microsoft.com)');
+				const completeTokens = marked.marked.lexer(incomplete + '**](https://microsoft.com)');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test('Looks like incomplete link target but isn\'t', () => {
 				const complete = '**bold** `codespan` text](';
-				const tokens = marked.lexer(complete);
+				const tokens = marked.marked.lexer(complete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(complete);
+				const completeTokens = marked.marked.lexer(complete);
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test.skip('incomplete link in list', () => {
 				const incomplete = '- [text';
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + '](https://microsoft.com)');
+				const completeTokens = marked.marked.lexer(incomplete + '](https://microsoft.com)');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test('square brace between letters', () => {
 				const incomplete = 'a[b';
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
 				assert.deepStrictEqual(newTokens, tokens);
@@ -946,7 +877,7 @@ const y = 2;
 
 			test('square brace on previous line', () => {
 				const incomplete = 'text[\nmore text';
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
 				assert.deepStrictEqual(newTokens, tokens);
@@ -954,7 +885,7 @@ const y = 2;
 
 			test('complete link', () => {
 				const incomplete = 'text [link](http://microsoft.com)';
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
 				assert.deepStrictEqual(newTokens, tokens);
diff --git a/src/vs/base/test/browser/progressBar.test.ts b/src/vs/base/test/browser/progressBar.test.ts
index 8490fd17897..fc9255f4034 100644
--- a/src/vs/base/test/browser/progressBar.test.ts
+++ b/src/vs/base/test/browser/progressBar.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
-import { mainWindow } from 'vs/base/browser/window';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { ProgressBar } from '../../browser/ui/progressbar/progressbar.js';
+import { mainWindow } from '../../browser/window.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../common/utils.js';
 
 suite('ProgressBar', () => {
 	let fixture: HTMLElement;
diff --git a/src/vs/base/test/browser/ui/contextview/contextview.test.ts b/src/vs/base/test/browser/ui/contextview/contextview.test.ts
index 45fded13807..4058d33f4a9 100644
--- a/src/vs/base/test/browser/ui/contextview/contextview.test.ts
+++ b/src/vs/base/test/browser/ui/contextview/contextview.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { layout, LayoutAnchorPosition } from 'vs/base/browser/ui/contextview/contextview';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { layout, LayoutAnchorPosition } from '../../../../browser/ui/contextview/contextview.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../common/utils.js';
 
 suite('Contextview', function () {
 
diff --git a/src/vs/base/test/browser/ui/grid/grid.test.ts b/src/vs/base/test/browser/ui/grid/grid.test.ts
index 92296d1880b..f76ba17a3d8 100644
--- a/src/vs/base/test/browser/ui/grid/grid.test.ts
+++ b/src/vs/base/test/browser/ui/grid/grid.test.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { createSerializedGrid, Direction, getRelativeLocation, Grid, GridNode, GridNodeDescriptor, ISerializableView, isGridBranchNode, IViewDeserializer, Orientation, sanitizeGridNodeDescriptor, SerializableGrid, Sizing } from 'vs/base/browser/ui/grid/grid';
-import { Event } from 'vs/base/common/event';
-import { deepClone } from 'vs/base/common/objects';
-import { nodesToArrays, TestView } from 'vs/base/test/browser/ui/grid/util';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import { createSerializedGrid, Direction, getRelativeLocation, Grid, GridNode, GridNodeDescriptor, ISerializableView, isGridBranchNode, IViewDeserializer, Orientation, sanitizeGridNodeDescriptor, SerializableGrid, Sizing } from '../../../../browser/ui/grid/grid.js';
+import { Event } from '../../../../common/event.js';
+import { deepClone } from '../../../../common/objects.js';
+import { nodesToArrays, TestView } from './util.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../common/utils.js';
+import { DisposableStore } from '../../../../common/lifecycle.js';
 
 // Simple example:
 //
diff --git a/src/vs/base/test/browser/ui/grid/gridview.test.ts b/src/vs/base/test/browser/ui/grid/gridview.test.ts
index df0c3838e6b..e1d8038527e 100644
--- a/src/vs/base/test/browser/ui/grid/gridview.test.ts
+++ b/src/vs/base/test/browser/ui/grid/gridview.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { $ } from 'vs/base/browser/dom';
-import { GridView, IView, Orientation, Sizing } from 'vs/base/browser/ui/grid/gridview';
-import { nodesToArrays, TestView } from 'vs/base/test/browser/ui/grid/util';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { $ } from '../../../../browser/dom.js';
+import { GridView, IView, Orientation, Sizing } from '../../../../browser/ui/grid/gridview.js';
+import { nodesToArrays, TestView } from './util.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../common/utils.js';
 
 suite('Gridview', function () {
 
diff --git a/src/vs/base/test/browser/ui/grid/util.ts b/src/vs/base/test/browser/ui/grid/util.ts
index ccadd7866e6..eeb080db29a 100644
--- a/src/vs/base/test/browser/ui/grid/util.ts
+++ b/src/vs/base/test/browser/ui/grid/util.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { IView } from 'vs/base/browser/ui/grid/grid';
-import { GridNode, isGridBranchNode } from 'vs/base/browser/ui/grid/gridview';
-import { Emitter, Event } from 'vs/base/common/event';
+import { IView } from '../../../../browser/ui/grid/grid.js';
+import { GridNode, isGridBranchNode } from '../../../../browser/ui/grid/gridview.js';
+import { Emitter, Event } from '../../../../common/event.js';
 
 export class TestView implements IView {
 
diff --git a/src/vs/base/test/browser/ui/list/listView.test.ts b/src/vs/base/test/browser/ui/list/listView.test.ts
index 0a6dede20cc..37426c29206 100644
--- a/src/vs/base/test/browser/ui/list/listView.test.ts
+++ b/src/vs/base/test/browser/ui/list/listView.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { IListRenderer, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { ListView } from 'vs/base/browser/ui/list/listView';
-import { range } from 'vs/base/common/arrays';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { IListRenderer, IListVirtualDelegate } from '../../../../browser/ui/list/list.js';
+import { ListView } from '../../../../browser/ui/list/listView.js';
+import { range } from '../../../../common/arrays.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../common/utils.js';
 
 suite('ListView', function () {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/base/test/browser/ui/list/listWidget.test.ts b/src/vs/base/test/browser/ui/list/listWidget.test.ts
index 6d1263dd89c..98dc9d1ef51 100644
--- a/src/vs/base/test/browser/ui/list/listWidget.test.ts
+++ b/src/vs/base/test/browser/ui/list/listWidget.test.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { IListRenderer, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { List } from 'vs/base/browser/ui/list/listWidget';
-import { range } from 'vs/base/common/arrays';
-import { timeout } from 'vs/base/common/async';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { IListRenderer, IListVirtualDelegate } from '../../../../browser/ui/list/list.js';
+import { List } from '../../../../browser/ui/list/listWidget.js';
+import { range } from '../../../../common/arrays.js';
+import { timeout } from '../../../../common/async.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../common/utils.js';
 
 suite('ListWidget', function () {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/base/test/browser/ui/list/rangeMap.test.ts b/src/vs/base/test/browser/ui/list/rangeMap.test.ts
index 0a4625c76b8..5ae5e6cd4d7 100644
--- a/src/vs/base/test/browser/ui/list/rangeMap.test.ts
+++ b/src/vs/base/test/browser/ui/list/rangeMap.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { consolidate, groupIntersect, RangeMap } from 'vs/base/browser/ui/list/rangeMap';
-import { Range } from 'vs/base/common/range';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { consolidate, groupIntersect, RangeMap } from '../../../../browser/ui/list/rangeMap.js';
+import { Range } from '../../../../common/range.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../common/utils.js';
 
 suite('RangeMap', () => {
 
diff --git a/src/vs/base/test/browser/ui/menu/menubar.test.ts b/src/vs/base/test/browser/ui/menu/menubar.test.ts
index af5e1da2e91..dfafda3fc5b 100644
--- a/src/vs/base/test/browser/ui/menu/menubar.test.ts
+++ b/src/vs/base/test/browser/ui/menu/menubar.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { $ } from 'vs/base/browser/dom';
-import { unthemedMenuStyles } from 'vs/base/browser/ui/menu/menu';
-import { MenuBar } from 'vs/base/browser/ui/menu/menubar';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { $ } from '../../../../browser/dom.js';
+import { unthemedMenuStyles } from '../../../../browser/ui/menu/menu.js';
+import { MenuBar } from '../../../../browser/ui/menu/menubar.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../common/utils.js';
 
 function getButtonElementByAriaLabel(menubarElement: HTMLElement, ariaLabel: string): HTMLElement | null {
 	let i;
diff --git a/src/vs/base/test/browser/ui/scrollbar/scrollableElement.test.ts b/src/vs/base/test/browser/ui/scrollbar/scrollableElement.test.ts
index cc662ab282f..a32702fef14 100644
--- a/src/vs/base/test/browser/ui/scrollbar/scrollableElement.test.ts
+++ b/src/vs/base/test/browser/ui/scrollbar/scrollableElement.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { MouseWheelClassifier } from 'vs/base/browser/ui/scrollbar/scrollableElement';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { MouseWheelClassifier } from '../../../../browser/ui/scrollbar/scrollableElement.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../common/utils.js';
 
 export type IMouseWheelEvent = [number, number, number];
 
diff --git a/src/vs/base/test/browser/ui/scrollbar/scrollbarState.test.ts b/src/vs/base/test/browser/ui/scrollbar/scrollbarState.test.ts
index 39876bc5d91..c659fd56dbe 100644
--- a/src/vs/base/test/browser/ui/scrollbar/scrollbarState.test.ts
+++ b/src/vs/base/test/browser/ui/scrollbar/scrollbarState.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ScrollbarState } from 'vs/base/browser/ui/scrollbar/scrollbarState';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { ScrollbarState } from '../../../../browser/ui/scrollbar/scrollbarState.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../common/utils.js';
 
 suite('ScrollbarState', () => {
 
diff --git a/src/vs/base/test/browser/ui/splitview/splitview.test.ts b/src/vs/base/test/browser/ui/splitview/splitview.test.ts
index 7e20426f5a8..76d7639b04c 100644
--- a/src/vs/base/test/browser/ui/splitview/splitview.test.ts
+++ b/src/vs/base/test/browser/ui/splitview/splitview.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Sash, SashState } from 'vs/base/browser/ui/sash/sash';
-import { IView, LayoutPriority, Sizing, SplitView } from 'vs/base/browser/ui/splitview/splitview';
-import { Emitter } from 'vs/base/common/event';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { Sash, SashState } from '../../../../browser/ui/sash/sash.js';
+import { IView, LayoutPriority, Sizing, SplitView } from '../../../../browser/ui/splitview/splitview.js';
+import { Emitter } from '../../../../common/event.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../common/utils.js';
 
 class TestView implements IView<number> {
 
diff --git a/src/vs/base/test/browser/ui/tree/asyncDataTree.test.ts b/src/vs/base/test/browser/ui/tree/asyncDataTree.test.ts
index 78b94a9577c..4f7ba0d46c8 100644
--- a/src/vs/base/test/browser/ui/tree/asyncDataTree.test.ts
+++ b/src/vs/base/test/browser/ui/tree/asyncDataTree.test.ts
@@ -4,14 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { IIdentityProvider, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { AsyncDataTree, CompressibleAsyncDataTree, ITreeCompressionDelegate } from 'vs/base/browser/ui/tree/asyncDataTree';
-import { ICompressedTreeNode } from 'vs/base/browser/ui/tree/compressedObjectTreeModel';
-import { ICompressibleTreeRenderer } from 'vs/base/browser/ui/tree/objectTree';
-import { IAsyncDataSource, ITreeNode } from 'vs/base/browser/ui/tree/tree';
-import { timeout } from 'vs/base/common/async';
-import { Iterable } from 'vs/base/common/iterator';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { IIdentityProvider, IListVirtualDelegate } from '../../../../browser/ui/list/list.js';
+import { AsyncDataTree, CompressibleAsyncDataTree, ITreeCompressionDelegate } from '../../../../browser/ui/tree/asyncDataTree.js';
+import { ICompressedTreeNode } from '../../../../browser/ui/tree/compressedObjectTreeModel.js';
+import { ICompressibleTreeRenderer } from '../../../../browser/ui/tree/objectTree.js';
+import { IAsyncDataSource, ITreeNode } from '../../../../browser/ui/tree/tree.js';
+import { timeout } from '../../../../common/async.js';
+import { Iterable } from '../../../../common/iterator.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../common/utils.js';
 
 interface Element {
 	id: string;
@@ -697,4 +697,149 @@ suite('AsyncDataTree', function () {
 		await tree.updateChildren(model.root, true);
 		assert.deepStrictEqual(Array.from(container.querySelectorAll('.monaco-list-row')).map(e => e.textContent), ['a', 'b', 'b.txt', 'c', 'c.txt']);
 	});
+
+	test('Tree Navigation: AsyncDataTree', async () => {
+		const container = document.createElement('div');
+
+		const model = new Model({
+			id: 'root',
+			children: [{
+				id: 'a', children: [{
+					id: 'aa', children: [{ id: 'aa.txt' }]
+				}, {
+					id: 'ab', children: [{ id: 'ab.txt' }]
+				}]
+			}, {
+				id: 'b', children: [{
+					id: 'ba', children: [{ id: 'ba.txt' }]
+				}, {
+					id: 'bb', children: [{ id: 'bb.txt' }]
+				}]
+			}, {
+				id: 'c', children: [{
+					id: 'ca', children: [{ id: 'ca.txt' }]
+				}, {
+					id: 'cb', children: [{ id: 'cb.txt' }]
+				}]
+			}]
+		});
+
+		const tree = store.add(new AsyncDataTree<Element, Element>('test', container, new VirtualDelegate(), [new Renderer()], new DataSource(), { identityProvider: new IdentityProvider() }));
+		tree.layout(200);
+
+		await tree.setInput(model.root);
+		assert.deepStrictEqual(Array.from(container.querySelectorAll('.monaco-list-row')).map(e => e.textContent), ['a', 'b', 'c']);
+
+		assert.strictEqual(tree.navigate().current(), null);
+		assert.strictEqual(tree.navigate().first()?.id, 'a');
+		assert.strictEqual(tree.navigate().last()?.id, 'c');
+
+		assert.strictEqual(tree.navigate(model.get('b')).previous()?.id, 'a');
+		assert.strictEqual(tree.navigate(model.get('b')).next()?.id, 'c');
+
+		await tree.expand(model.get('a'));
+		await tree.expand(model.get('aa'));
+		await tree.expand(model.get('ab'));
+
+		await tree.expand(model.get('b'));
+		await tree.expand(model.get('ba'));
+		await tree.expand(model.get('bb'));
+
+		await tree.expand(model.get('c'));
+		await tree.expand(model.get('ca'));
+		await tree.expand(model.get('cb'));
+
+		// Only the first 10 elements are rendered (total height is 200px, each element is 20px)
+		assert.deepStrictEqual(Array.from(container.querySelectorAll('.monaco-list-row')).map(e => e.textContent), ['a', 'aa', 'aa.txt', 'ab', 'ab.txt', 'b', 'ba', 'ba.txt', 'bb', 'bb.txt']);
+
+		assert.strictEqual(tree.navigate().first()?.id, 'a');
+		assert.strictEqual(tree.navigate().last()?.id, 'cb.txt');
+
+		assert.strictEqual(tree.navigate(model.get('b')).previous()?.id, 'ab.txt');
+		assert.strictEqual(tree.navigate(model.get('b')).next()?.id, 'ba');
+
+		assert.strictEqual(tree.navigate(model.get('ab.txt')).previous()?.id, 'ab');
+		assert.strictEqual(tree.navigate(model.get('ab.txt')).next()?.id, 'b');
+
+		assert.strictEqual(tree.navigate(model.get('bb.txt')).next()?.id, 'c');
+
+		tree.collapse(model.get('b'), false);
+		assert.deepStrictEqual(Array.from(container.querySelectorAll('.monaco-list-row')).map(e => e.textContent), ['a', 'aa', 'aa.txt', 'ab', 'ab.txt', 'b', 'c', 'ca', 'ca.txt', 'cb']);
+
+		assert.strictEqual(tree.navigate(model.get('b')).next()?.id, 'c');
+	});
+
+	test('Test Navigation: CompressibleAsyncDataTree', async () => {
+		const container = document.createElement('div');
+
+		const dataSource = new class implements IAsyncDataSource<Element, Element> {
+			hasChildren(element: Element): boolean {
+				return !!element.children && element.children.length > 0;
+			}
+			async getChildren(element: Element) {
+				return element.children ?? Iterable.empty();
+			}
+		};
+
+		const compressionDelegate = new class implements ITreeCompressionDelegate<Element> {
+			isIncompressible(element: Element): boolean {
+				return !dataSource.hasChildren(element);
+			}
+		};
+
+		const model = new Model({
+			id: 'root',
+			children: [
+				{
+					id: 'a', children: [{ id: 'aa', children: [{ id: 'aa.txt' }] }]
+				}, {
+					id: 'b', children: [{ id: 'ba', children: [{ id: 'ba.txt' }] }]
+				}, {
+					id: 'c', children: [{
+						id: 'ca', children: [{ id: 'ca.txt' }]
+					}, {
+						id: 'cb', children: [{ id: 'cb.txt' }]
+					}]
+				}
+			]
+		});
+
+		const tree = store.add(new CompressibleAsyncDataTree<Element, Element>('test', container, new VirtualDelegate(), compressionDelegate, [new Renderer()], dataSource, { identityProvider: new IdentityProvider() }));
+		tree.layout(200);
+
+		await tree.setInput(model.root);
+		assert.deepStrictEqual(Array.from(container.querySelectorAll('.monaco-list-row')).map(e => e.textContent), ['a', 'b', 'c']);
+
+		assert.strictEqual(tree.navigate().current(), null);
+		assert.strictEqual(tree.navigate().first()?.id, 'a');
+		assert.strictEqual(tree.navigate().last()?.id, 'c');
+
+		assert.strictEqual(tree.navigate(model.get('b')).previous()?.id, 'a');
+		assert.strictEqual(tree.navigate(model.get('b')).next()?.id, 'c');
+
+		await tree.expand(model.get('a'));
+		await tree.expand(model.get('aa'));
+
+		await tree.expand(model.get('b'));
+		await tree.expand(model.get('ba'));
+
+		await tree.expand(model.get('c'));
+		await tree.expand(model.get('ca'));
+		await tree.expand(model.get('cb'));
+
+		// Only the first 10 elements are rendered (total height is 200px, each element is 20px)
+		assert.deepStrictEqual(Array.from(container.querySelectorAll('.monaco-list-row')).map(e => e.textContent), ['a/aa', 'aa.txt', 'b/ba', 'ba.txt', 'c', 'ca', 'ca.txt', 'cb', 'cb.txt']);
+
+		assert.strictEqual(tree.navigate().first()?.id, 'aa');
+		assert.strictEqual(tree.navigate().last()?.id, 'cb.txt');
+
+		assert.strictEqual(tree.navigate(model.get('b')).previous()?.id, 'aa.txt');
+		assert.strictEqual(tree.navigate(model.get('ba')).previous()?.id, 'aa.txt');
+
+		assert.strictEqual(tree.navigate(model.get('b')).next()?.id, 'ba.txt');
+		assert.strictEqual(tree.navigate(model.get('ba')).next()?.id, 'ba.txt');
+
+		assert.strictEqual(tree.navigate(model.get('aa.txt')).previous()?.id, 'aa');
+		assert.strictEqual(tree.navigate(model.get('aa.txt')).next()?.id, 'ba');
+	});
 });
diff --git a/src/vs/base/test/browser/ui/tree/compressedObjectTreeModel.test.ts b/src/vs/base/test/browser/ui/tree/compressedObjectTreeModel.test.ts
index 9c5777b5fc5..dca017037f0 100644
--- a/src/vs/base/test/browser/ui/tree/compressedObjectTreeModel.test.ts
+++ b/src/vs/base/test/browser/ui/tree/compressedObjectTreeModel.test.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { compress, CompressedObjectTreeModel, decompress, ICompressedTreeElement, ICompressedTreeNode } from 'vs/base/browser/ui/tree/compressedObjectTreeModel';
-import { IList } from 'vs/base/browser/ui/tree/indexTreeModel';
-import { IObjectTreeModelSetChildrenOptions } from 'vs/base/browser/ui/tree/objectTreeModel';
-import { ITreeNode } from 'vs/base/browser/ui/tree/tree';
-import { Iterable } from 'vs/base/common/iterator';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { compress, CompressedObjectTreeModel, decompress, ICompressedTreeElement, ICompressedTreeNode } from '../../../../browser/ui/tree/compressedObjectTreeModel.js';
+import { IObjectTreeModelSetChildrenOptions } from '../../../../browser/ui/tree/objectTreeModel.js';
+import { ITreeModel, ITreeNode } from '../../../../browser/ui/tree/tree.js';
+import { Iterable } from '../../../../common/iterator.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../common/utils.js';
+import { IDisposable } from '../../../../common/lifecycle.js';
 
 interface IResolvedCompressedTreeElement<T> extends ICompressedTreeElement<T> {
 	readonly element: T;
@@ -293,13 +293,10 @@ suite('CompressedObjectTree', function () {
 		});
 	});
 
-	function toList<T>(arr: T[]): IList<T> {
-		return {
-			splice(start: number, deleteCount: number, elements: T[]): void {
-				arr.splice(start, deleteCount, ...elements);
-			},
-			updateElementHeight() { }
-		};
+	function bindListToModel<T>(list: ITreeNode<T>[], model: ITreeModel<T, any, any>): IDisposable {
+		return model.onDidSpliceRenderedNodes(({ start, deleteCount, elements }) => {
+			list.splice(start, deleteCount, ...elements);
+		});
 	}
 
 	function toArray<T>(list: ITreeNode<ICompressedTreeNode<T>>[]): T[][] {
@@ -319,16 +316,15 @@ suite('CompressedObjectTree', function () {
 
 
 		test('ctor', () => {
-			const list: ITreeNode<ICompressedTreeNode<number>>[] = [];
-			const model = new CompressedObjectTreeModel<number>('test', toList(list));
+			const model = new CompressedObjectTreeModel<number>('test');
 			assert(model);
-			assert.strictEqual(list.length, 0);
 			assert.strictEqual(model.size, 0);
 		});
 
 		test('flat', () => withSmartSplice(options => {
 			const list: ITreeNode<ICompressedTreeNode<number>>[] = [];
-			const model = new CompressedObjectTreeModel<number>('test', toList(list));
+			const model = new CompressedObjectTreeModel<number>('test');
+			const disposable = bindListToModel(list, model);
 
 			model.setChildren(null, [
 				{ element: 0 },
@@ -351,11 +347,14 @@ suite('CompressedObjectTree', function () {
 			model.setChildren(null, [], options);
 			assert.deepStrictEqual(toArray(list), []);
 			assert.strictEqual(model.size, 0);
+
+			disposable.dispose();
 		}));
 
 		test('nested', () => withSmartSplice(options => {
 			const list: ITreeNode<ICompressedTreeNode<number>>[] = [];
-			const model = new CompressedObjectTreeModel<number>('test', toList(list));
+			const model = new CompressedObjectTreeModel<number>('test');
+			const disposable = bindListToModel(list, model);
 
 			model.setChildren(null, [
 				{
@@ -387,11 +386,14 @@ suite('CompressedObjectTree', function () {
 			model.setChildren(null, [], options);
 			assert.deepStrictEqual(toArray(list), []);
 			assert.strictEqual(model.size, 0);
+
+			disposable.dispose();
 		}));
 
 		test('compressed', () => withSmartSplice(options => {
 			const list: ITreeNode<ICompressedTreeNode<number>>[] = [];
-			const model = new CompressedObjectTreeModel<number>('test', toList(list));
+			const model = new CompressedObjectTreeModel<number>('test');
+			const disposable = bindListToModel(list, model);
 
 			model.setChildren(null, [
 				{
@@ -440,6 +442,8 @@ suite('CompressedObjectTree', function () {
 
 			assert.deepStrictEqual(toArray(list), [[1, 11], [111], [112], [113, 1131], [1132], [1133]]);
 			assert.strictEqual(model.size, 8);
+
+			disposable.dispose();
 		}));
 	});
 });
diff --git a/src/vs/base/test/browser/ui/tree/dataTree.test.ts b/src/vs/base/test/browser/ui/tree/dataTree.test.ts
index 37c586f00e0..70cacb5fee4 100644
--- a/src/vs/base/test/browser/ui/tree/dataTree.test.ts
+++ b/src/vs/base/test/browser/ui/tree/dataTree.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { IIdentityProvider, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { DataTree } from 'vs/base/browser/ui/tree/dataTree';
-import { IDataSource, ITreeNode, ITreeRenderer } from 'vs/base/browser/ui/tree/tree';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { IIdentityProvider, IListVirtualDelegate } from '../../../../browser/ui/list/list.js';
+import { DataTree } from '../../../../browser/ui/tree/dataTree.js';
+import { IDataSource, ITreeNode, ITreeRenderer } from '../../../../browser/ui/tree/tree.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../common/utils.js';
 
 interface E {
 	value: number;
diff --git a/src/vs/base/test/browser/ui/tree/indexTreeModel.test.ts b/src/vs/base/test/browser/ui/tree/indexTreeModel.test.ts
index 70277e01c87..20d9d9c814b 100644
--- a/src/vs/base/test/browser/ui/tree/indexTreeModel.test.ts
+++ b/src/vs/base/test/browser/ui/tree/indexTreeModel.test.ts
@@ -4,18 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { IIndexTreeModelSpliceOptions, IIndexTreeNode, IList, IndexTreeModel } from 'vs/base/browser/ui/tree/indexTreeModel';
-import { ITreeElement, ITreeFilter, ITreeNode, TreeVisibility } from 'vs/base/browser/ui/tree/tree';
-import { timeout } from 'vs/base/common/async';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { IIndexTreeModelSpliceOptions, IIndexTreeNode, IndexTreeModel } from '../../../../browser/ui/tree/indexTreeModel.js';
+import { ITreeElement, ITreeFilter, ITreeNode, TreeVisibility } from '../../../../browser/ui/tree/tree.js';
+import { timeout } from '../../../../common/async.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../common/utils.js';
+import { DisposableStore, IDisposable } from '../../../../common/lifecycle.js';
 
-function toList<T>(arr: T[]): IList<T> {
-	return {
-		splice(start: number, deleteCount: number, elements: T[]): void {
-			arr.splice(start, deleteCount, ...elements);
-		},
-		updateElementHeight() { }
-	};
+function bindListToModel<T>(list: ITreeNode<T>[], model: IndexTreeModel<T>): IDisposable {
+	return model.onDidSpliceRenderedNodes(({ start, deleteCount, elements }) => {
+		list.splice(start, deleteCount, ...elements);
+	});
 }
 
 function toArray<T>(list: ITreeNode<T>[]): T[] {
@@ -42,16 +40,22 @@ suite('IndexTreeModel', () => {
 
 	ensureNoDisposablesAreLeakedInTestSuite();
 
+	const disposables = new DisposableStore();
+	teardown(() => {
+		disposables.clear();
+	});
+
 	test('ctor', () => {
 		const list: ITreeNode<number>[] = [];
-		const model = new IndexTreeModel<number>('test', toList(list), -1);
+		const model = new IndexTreeModel<number>('test', -1);
 		assert(model);
 		assert.strictEqual(list.length, 0);
 	});
 
 	test('insert', () => withSmartSplice(options => {
 		const list: ITreeNode<number>[] = [];
-		const model = new IndexTreeModel<number>('test', toList(list), -1);
+		const model = new IndexTreeModel<number>('test', -1);
+		const disposable = bindListToModel(list, model);
 
 		model.splice([0], 0, [
 			{ element: 0 },
@@ -69,11 +73,14 @@ suite('IndexTreeModel', () => {
 		assert.deepStrictEqual(list[2].element, 2);
 		assert.deepStrictEqual(list[2].collapsed, false);
 		assert.deepStrictEqual(list[2].depth, 1);
+
+		disposable.dispose();
 	}));
 
 	test('deep insert', () => withSmartSplice(options => {
 		const list: ITreeNode<number>[] = [];
-		const model = new IndexTreeModel<number>('test', toList(list), -1);
+		const model = new IndexTreeModel<number>('test', -1);
+		const disposable = bindListToModel(list, model);
 
 		model.splice([0], 0, [
 			{
@@ -106,11 +113,14 @@ suite('IndexTreeModel', () => {
 		assert.deepStrictEqual(list[5].element, 2);
 		assert.deepStrictEqual(list[5].collapsed, false);
 		assert.deepStrictEqual(list[5].depth, 1);
+
+		disposable.dispose();
 	}));
 
 	test('deep insert collapsed', () => withSmartSplice(options => {
 		const list: ITreeNode<number>[] = [];
-		const model = new IndexTreeModel<number>('test', toList(list), -1);
+		const model = new IndexTreeModel<number>('test', -1);
+		const disposable = bindListToModel(list, model);
 
 		model.splice([0], 0, [
 			{
@@ -134,11 +144,14 @@ suite('IndexTreeModel', () => {
 		assert.deepStrictEqual(list[2].element, 2);
 		assert.deepStrictEqual(list[2].collapsed, false);
 		assert.deepStrictEqual(list[2].depth, 1);
+
+		disposable.dispose();
 	}));
 
 	test('delete', () => withSmartSplice(options => {
 		const list: ITreeNode<number>[] = [];
-		const model = new IndexTreeModel<number>('test', toList(list), -1);
+		const model = new IndexTreeModel<number>('test', -1);
+		const disposable = bindListToModel(list, model);
 
 		model.splice([0], 0, [
 			{ element: 0 },
@@ -159,11 +172,14 @@ suite('IndexTreeModel', () => {
 
 		model.splice([0], 2, undefined, options);
 		assert.deepStrictEqual(list.length, 0);
+
+		disposable.dispose();
 	}));
 
 	test('nested delete', () => withSmartSplice(options => {
 		const list: ITreeNode<number>[] = [];
-		const model = new IndexTreeModel<number>('test', toList(list), -1);
+		const model = new IndexTreeModel<number>('test', -1);
+		const disposable = bindListToModel(list, model);
 
 		model.splice([0], 0, [
 			{
@@ -193,11 +209,14 @@ suite('IndexTreeModel', () => {
 		assert.deepStrictEqual(list[3].element, 12);
 		assert.deepStrictEqual(list[3].collapsed, false);
 		assert.deepStrictEqual(list[3].depth, 2);
+
+		disposable.dispose();
 	}));
 
 	test('deep delete', () => withSmartSplice(options => {
 		const list: ITreeNode<number>[] = [];
-		const model = new IndexTreeModel<number>('test', toList(list), -1);
+		const model = new IndexTreeModel<number>('test', -1);
+		const disposable = bindListToModel(list, model);
 
 		model.splice([0], 0, [
 			{
@@ -221,11 +240,14 @@ suite('IndexTreeModel', () => {
 		assert.deepStrictEqual(list[1].element, 2);
 		assert.deepStrictEqual(list[1].collapsed, false);
 		assert.deepStrictEqual(list[1].depth, 1);
+
+		disposable.dispose();
 	}));
 
 	test('smart splice deep', () => {
 		const list: ITreeNode<number>[] = [];
-		const model = new IndexTreeModel<number>('test', toList(list), -1);
+		const model = new IndexTreeModel<number>('test', -1);
+		const disposable = bindListToModel(list, model);
 
 		model.splice([0], 0, [
 			{ element: 0 },
@@ -255,11 +277,14 @@ suite('IndexTreeModel', () => {
 			{ e: 2, children: [2.1, { e: 2.2, children: [2.21] }] },
 			3,
 		]);
+
+		disposable.dispose();
 	});
 
 	test('hidden delete', () => withSmartSplice(options => {
 		const list: ITreeNode<number>[] = [];
-		const model = new IndexTreeModel<number>('test', toList(list), -1);
+		const model = new IndexTreeModel<number>('test', -1);
+		const disposable = bindListToModel(list, model);
 
 		model.splice([0], 0, [
 			{
@@ -280,11 +305,14 @@ suite('IndexTreeModel', () => {
 
 		model.splice([0, 0], 2, undefined, options);
 		assert.deepStrictEqual(list.length, 3);
+
+		disposable.dispose();
 	}));
 
 	test('collapse', () => withSmartSplice(options => {
 		const list: ITreeNode<number>[] = [];
-		const model = new IndexTreeModel<number>('test', toList(list), -1);
+		const model = new IndexTreeModel<number>('test', -1);
+		const disposable = bindListToModel(list, model);
 
 		model.splice([0], 0, [
 			{
@@ -311,11 +339,14 @@ suite('IndexTreeModel', () => {
 		assert.deepStrictEqual(list[2].element, 2);
 		assert.deepStrictEqual(list[2].collapsed, false);
 		assert.deepStrictEqual(list[2].depth, 1);
+
+		disposable.dispose();
 	}));
 
 	test('expand', () => withSmartSplice(options => {
 		const list: ITreeNode<number>[] = [];
-		const model = new IndexTreeModel<number>('test', toList(list), -1);
+		const model = new IndexTreeModel<number>('test', -1);
+		const disposable = bindListToModel(list, model);
 
 		model.splice([0], 0, [
 			{
@@ -351,6 +382,8 @@ suite('IndexTreeModel', () => {
 		assert.deepStrictEqual(list[5].element, 2);
 		assert.deepStrictEqual(list[5].collapsed, false);
 		assert.deepStrictEqual(list[5].depth, 1);
+
+		disposable.dispose();
 	}));
 
 	test('smart diff consistency', () => {
@@ -362,7 +395,8 @@ suite('IndexTreeModel', () => {
 		for (let i = 0; i < times; i++) {
 			const list: ITreeNode<number>[] = [];
 			const options = { diffIdentityProvider: { getId: (n: number) => String(n) } };
-			const model = new IndexTreeModel<number>('test', toList(list), -1);
+			const model = new IndexTreeModel<number>('test', -1);
+			const disposable = bindListToModel(list, model);
 
 			const changes = [];
 			const expected: number[] = [];
@@ -393,12 +427,15 @@ suite('IndexTreeModel', () => {
 
 				assert.deepStrictEqual(expected, listElements, `Expected ${listElements.join(', ')} to equal ${expected.join(', ')}. Steps:\n\n${changes.join('\n')}`);
 			}
+
+			disposable.dispose();
 		}
 	});
 
 	test('collapse should recursively adjust visible count', () => {
 		const list: ITreeNode<number>[] = [];
-		const model = new IndexTreeModel<number>('test', toList(list), -1);
+		const model = new IndexTreeModel<number>('test', -1);
+		const disposable = bindListToModel(list, model);
 
 		model.splice([0], 0, [
 			{
@@ -427,11 +464,14 @@ suite('IndexTreeModel', () => {
 		model.setCollapsed([1], true);
 		assert.deepStrictEqual(list.length, 3);
 		assert.deepStrictEqual(toArray(list), [1, 11, 2]);
+
+		disposable.dispose();
 	});
 
 	test('setCollapsible', () => {
 		const list: ITreeNode<number>[] = [];
-		const model = new IndexTreeModel<number>('test', toList(list), -1);
+		const model = new IndexTreeModel<number>('test', -1);
+		const disposable = bindListToModel(list, model);
 
 		model.splice([0], 0, [
 			{
@@ -490,6 +530,8 @@ suite('IndexTreeModel', () => {
 		assert.deepStrictEqual(list[1].element, 10);
 		assert.deepStrictEqual(list[1].collapsible, false);
 		assert.deepStrictEqual(list[1].collapsed, false);
+
+		disposable.dispose();
 	});
 
 	test('simple filter', () => {
@@ -500,7 +542,8 @@ suite('IndexTreeModel', () => {
 			}
 		};
 
-		const model = new IndexTreeModel<number>('test', toList(list), -1, { filter });
+		const model = new IndexTreeModel<number>('test', -1, { filter });
+		const disposable = bindListToModel(list, model);
 
 		model.splice([0], 0, [
 			{
@@ -524,6 +567,8 @@ suite('IndexTreeModel', () => {
 
 		model.setCollapsed([0], false);
 		assert.deepStrictEqual(toArray(list), [0, 2, 4, 6]);
+
+		disposable.dispose();
 	});
 
 	test('recursive filter on initial model', () => {
@@ -534,7 +579,8 @@ suite('IndexTreeModel', () => {
 			}
 		};
 
-		const model = new IndexTreeModel<number>('test', toList(list), -1, { filter });
+		const model = new IndexTreeModel<number>('test', -1, { filter });
+		const disposable = bindListToModel(list, model);
 
 		model.splice([0], 0, [
 			{
@@ -546,6 +592,8 @@ suite('IndexTreeModel', () => {
 		]);
 
 		assert.deepStrictEqual(toArray(list), []);
+
+		disposable.dispose();
 	});
 
 	test('refilter', () => {
@@ -557,7 +605,8 @@ suite('IndexTreeModel', () => {
 			}
 		};
 
-		const model = new IndexTreeModel<number>('test', toList(list), -1, { filter });
+		const model = new IndexTreeModel<number>('test', -1, { filter });
+		const disposable = bindListToModel(list, model);
 
 		model.splice([0], 0, [
 			{
@@ -585,6 +634,8 @@ suite('IndexTreeModel', () => {
 		shouldFilter = false;
 		model.refilter();
 		assert.deepStrictEqual(toArray(list), [0, 1, 2, 3, 4, 5, 6, 7]);
+
+		disposable.dispose();
 	});
 
 	test('recursive filter', () => {
@@ -596,7 +647,8 @@ suite('IndexTreeModel', () => {
 			}
 		};
 
-		const model = new IndexTreeModel<string>('test', toList(list), 'root', { filter });
+		const model = new IndexTreeModel<string>('test', 'root', { filter });
+		const disposable = bindListToModel(list, model);
 
 		model.splice([0], 0, [
 			{
@@ -631,6 +683,8 @@ suite('IndexTreeModel', () => {
 
 		model.setCollapsed([0], false);
 		assert.deepStrictEqual(toArray(list), ['vscode', '.build', 'github', 'build.js', 'build']);
+
+		disposable.dispose();
 	});
 
 	test('recursive filter updates when children change (#133272)', async () => {
@@ -642,7 +696,8 @@ suite('IndexTreeModel', () => {
 			}
 		};
 
-		const model = new IndexTreeModel<string>('test', toList(list), 'root', { filter });
+		const model = new IndexTreeModel<string>('test', 'root', { filter });
+		const disposable = bindListToModel(list, model);
 
 		model.splice([0], 0, [
 			{
@@ -667,6 +722,8 @@ suite('IndexTreeModel', () => {
 		await timeout(0); // wait for refilter microtask
 
 		assert.deepStrictEqual(toArray(list), ['a', 'b', 'visible']);
+
+		disposable.dispose();
 	});
 
 	test('recursive filter with collapse', () => {
@@ -678,7 +735,8 @@ suite('IndexTreeModel', () => {
 			}
 		};
 
-		const model = new IndexTreeModel<string>('test', toList(list), 'root', { filter });
+		const model = new IndexTreeModel<string>('test', 'root', { filter });
+		const disposable = bindListToModel(list, model);
 
 		model.splice([0], 0, [
 			{
@@ -713,6 +771,8 @@ suite('IndexTreeModel', () => {
 
 		model.setCollapsed([0], true);
 		assert.deepStrictEqual(toArray(list), ['vscode']);
+
+		disposable.dispose();
 	});
 
 	test('recursive filter while collapsed', () => {
@@ -724,7 +784,8 @@ suite('IndexTreeModel', () => {
 			}
 		};
 
-		const model = new IndexTreeModel<string>('test', toList(list), 'root', { filter });
+		const model = new IndexTreeModel<string>('test', 'root', { filter });
+		const disposable = bindListToModel(list, model);
 
 		model.splice([0], 0, [
 			{
@@ -766,13 +827,16 @@ suite('IndexTreeModel', () => {
 
 		model.setCollapsed([0], false);
 		assert.deepStrictEqual(list.length, 10);
+
+		disposable.dispose();
 	});
 
 	suite('getNodeLocation', () => {
 
 		test('simple', () => {
 			const list: IIndexTreeNode<number>[] = [];
-			const model = new IndexTreeModel<number>('test', toList(list), -1);
+			const model = new IndexTreeModel<number>('test', -1);
+			const disposable = bindListToModel(list, model);
 
 			model.splice([0], 0, [
 				{
@@ -792,6 +856,8 @@ suite('IndexTreeModel', () => {
 			assert.deepStrictEqual(model.getNodeLocation(list[3]), [0, 2]);
 			assert.deepStrictEqual(model.getNodeLocation(list[4]), [1]);
 			assert.deepStrictEqual(model.getNodeLocation(list[5]), [2]);
+
+			disposable.dispose();
 		});
 
 		test('with filter', () => {
@@ -802,7 +868,8 @@ suite('IndexTreeModel', () => {
 				}
 			};
 
-			const model = new IndexTreeModel<number>('test', toList(list), -1, { filter });
+			const model = new IndexTreeModel<number>('test', -1, { filter });
+			const disposable = bindListToModel(list, model);
 
 			model.splice([0], 0, [
 				{
@@ -822,6 +889,8 @@ suite('IndexTreeModel', () => {
 			assert.deepStrictEqual(model.getNodeLocation(list[1]), [0, 1]);
 			assert.deepStrictEqual(model.getNodeLocation(list[2]), [0, 3]);
 			assert.deepStrictEqual(model.getNodeLocation(list[3]), [0, 5]);
+
+			disposable.dispose();
 		});
 	});
 
@@ -834,7 +903,8 @@ suite('IndexTreeModel', () => {
 			}
 		};
 
-		const model = new IndexTreeModel<string>('test', toList(list), 'root', { filter });
+		const model = new IndexTreeModel<string>('test', 'root', { filter });
+		const disposable = bindListToModel(list, model);
 
 		model.splice([0], 0, [
 			{ element: 'silver' },
@@ -857,6 +927,8 @@ suite('IndexTreeModel', () => {
 
 		model.refilter();
 		assert.deepStrictEqual(toArray(list), ['platinum']);
+
+		disposable.dispose();
 	});
 
 	test('explicit hidden nodes should have renderNodeCount == 0, issue #83211', () => {
@@ -868,7 +940,8 @@ suite('IndexTreeModel', () => {
 			}
 		};
 
-		const model = new IndexTreeModel<string>('test', toList(list), 'root', { filter });
+		const model = new IndexTreeModel<string>('test', 'root', { filter });
+		const disposable = bindListToModel(list, model);
 
 		model.splice([0], 0, [
 			{ element: 'a', children: [{ element: 'aa' }] },
@@ -888,5 +961,7 @@ suite('IndexTreeModel', () => {
 		assert.deepStrictEqual(model.getListIndex([0, 0]), -1);
 		assert.deepStrictEqual(model.getListIndex([1]), 0);
 		assert.deepStrictEqual(model.getListIndex([1, 0]), 1);
+
+		disposable.dispose();
 	});
 });
diff --git a/src/vs/base/test/browser/ui/tree/objectTree.test.ts b/src/vs/base/test/browser/ui/tree/objectTree.test.ts
index eaed09db694..f8f02d88a8e 100644
--- a/src/vs/base/test/browser/ui/tree/objectTree.test.ts
+++ b/src/vs/base/test/browser/ui/tree/objectTree.test.ts
@@ -4,11 +4,18 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { IIdentityProvider, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { ICompressedTreeNode } from 'vs/base/browser/ui/tree/compressedObjectTreeModel';
-import { CompressibleObjectTree, ICompressibleTreeRenderer, ObjectTree } from 'vs/base/browser/ui/tree/objectTree';
-import { ITreeNode, ITreeRenderer } from 'vs/base/browser/ui/tree/tree';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { IIdentityProvider, IListVirtualDelegate } from '../../../../browser/ui/list/list.js';
+import { CompressibleObjectTreeModel, ICompressedTreeNode } from '../../../../browser/ui/tree/compressedObjectTreeModel.js';
+import { CompressibleObjectTree, ICompressibleTreeRenderer, ObjectTree } from '../../../../browser/ui/tree/objectTree.js';
+import { ITreeNode, ITreeRenderer } from '../../../../browser/ui/tree/tree.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../common/utils.js';
+import { ObjectTreeModel } from '../../../../browser/ui/tree/objectTreeModel.js';
+
+function getRowsTextContent(container: HTMLElement): string[] {
+	const rows = [...container.querySelectorAll('.monaco-list-row')];
+	rows.sort((a, b) => parseInt(a.getAttribute('data-index')!) - parseInt(b.getAttribute('data-index')!));
+	return rows.map(row => row.querySelector('.monaco-tl-contents')!.textContent!);
+}
 
 suite('ObjectTree', function () {
 
@@ -184,32 +191,36 @@ suite('ObjectTree', function () {
 		});
 	});
 
+	class Delegate implements IListVirtualDelegate<number> {
+		getHeight() { return 20; }
+		getTemplateId(): string { return 'default'; }
+	}
+
+	class Renderer implements ITreeRenderer<number, void, HTMLElement> {
+		readonly templateId = 'default';
+		renderTemplate(container: HTMLElement): HTMLElement {
+			return container;
+		}
+		renderElement(element: ITreeNode<number, void>, index: number, templateData: HTMLElement): void {
+			templateData.textContent = `${element.element}`;
+		}
+		disposeTemplate(): void { }
+	}
+
+	class IdentityProvider implements IIdentityProvider<number> {
+		getId(element: number): { toString(): string } {
+			return `${element % 100}`;
+		}
+	}
+
 	test('traits are preserved according to string identity', function () {
 		const container = document.createElement('div');
 		container.style.width = '200px';
 		container.style.height = '200px';
 
-		const delegate = new class implements IListVirtualDelegate<number> {
-			getHeight() { return 20; }
-			getTemplateId(): string { return 'default'; }
-		};
-
-		const renderer = new class implements ITreeRenderer<number, void, HTMLElement> {
-			readonly templateId = 'default';
-			renderTemplate(container: HTMLElement): HTMLElement {
-				return container;
-			}
-			renderElement(element: ITreeNode<number, void>, index: number, templateData: HTMLElement): void {
-				templateData.textContent = `${element.element}`;
-			}
-			disposeTemplate(): void { }
-		};
-
-		const identityProvider = new class implements IIdentityProvider<number> {
-			getId(element: number): { toString(): string } {
-				return `${element % 100}`;
-			}
-		};
+		const delegate = new Delegate();
+		const renderer = new Renderer();
+		const identityProvider = new IdentityProvider();
 
 		const tree = new ObjectTree<number>('test', container, delegate, [renderer], { identityProvider });
 		tree.layout(200);
@@ -221,13 +232,108 @@ suite('ObjectTree', function () {
 		tree.setChildren(null, [{ element: 100 }, { element: 101 }, { element: 102 }, { element: 103 }]);
 		assert.deepStrictEqual(tree.getFocus(), [101]);
 	});
-});
 
-function getRowsTextContent(container: HTMLElement): string[] {
-	const rows = [...container.querySelectorAll('.monaco-list-row')];
-	rows.sort((a, b) => parseInt(a.getAttribute('data-index')!) - parseInt(b.getAttribute('data-index')!));
-	return rows.map(row => row.querySelector('.monaco-tl-contents')!.textContent!);
-}
+	test('swap model', function () {
+		const container = document.createElement('div');
+		container.style.width = '200px';
+		container.style.height = '200px';
+
+		const delegate = new Delegate();
+		const renderer = new Renderer();
+		const identityProvider = new IdentityProvider();
+
+		const tree = new ObjectTree<number>('test', container, delegate, [renderer], { identityProvider });
+		tree.layout(200);
+
+		tree.setChildren(null, [{ element: 1 }, { element: 2 }, { element: 3 }, { element: 4 }]);
+		assert.deepStrictEqual(getRowsTextContent(container), ['1', '2', '3', '4']);
+
+		const oldModel = tree.getModel();
+
+		const newModel = new ObjectTreeModel<number, void>('test', {});
+		tree.setModel(newModel);
+		assert.deepStrictEqual(getRowsTextContent(container), []);
+
+		newModel.setChildren(null, [
+			{ element: 1, children: [{ element: 11 }] },
+			{ element: 2 }
+		]);
+		assert.deepStrictEqual(getRowsTextContent(container), ['1', '11', '2']);
+
+		tree.setChildren(11, [
+			{ element: 111, children: [{ element: 1111 }] },
+			{ element: 112 },
+		]);
+		assert.deepStrictEqual(getRowsTextContent(container), ['1', '11', '111', '1111', '112', '2']);
+
+		tree.setModel(oldModel);
+		assert.deepStrictEqual(getRowsTextContent(container), ['1', '2', '3', '4']);
+	});
+
+	test('swap model events', function () {
+		const container = document.createElement('div');
+		container.style.width = '200px';
+		container.style.height = '200px';
+
+		const delegate = new Delegate();
+		const renderer = new Renderer();
+		const identityProvider = new IdentityProvider();
+
+		const tree = new ObjectTree<number>('test', container, delegate, [renderer], { identityProvider });
+		tree.layout(200);
+
+		tree.setChildren(null, [{ element: 1 }, { element: 2 }, { element: 3 }, { element: 4 }]);
+		assert.deepStrictEqual(getRowsTextContent(container), ['1', '2', '3', '4']);
+
+		const newModel = new ObjectTreeModel<number, void>('test', {});
+		newModel.setChildren(null, [
+			{ element: 1, children: [{ element: 11 }] },
+			{ element: 2 }
+		]);
+
+		let didChangeModel = false;
+		let didChangeRenderNodeCount = false;
+		let didChangeCollapseState = false;
+
+		tree.onDidChangeModel(() => { didChangeModel = true; });
+		tree.onDidChangeRenderNodeCount(() => { didChangeRenderNodeCount = true; });
+		tree.onDidChangeCollapseState(() => { didChangeCollapseState = true; });
+
+		tree.setModel(newModel);
+
+		assert.strictEqual(didChangeModel, true);
+		assert.strictEqual(didChangeRenderNodeCount, true);
+		assert.strictEqual(didChangeCollapseState, false);
+	});
+
+	// TODO@benibenj: Make sure user is updated in the tree when model is swapped
+	test.skip('swap model TreeError uses updated user', function () {
+		const container = document.createElement('div');
+		container.style.width = '200px';
+		container.style.height = '200px';
+
+		const delegate = new Delegate();
+		const renderer = new Renderer();
+
+		const tree = new ObjectTree<number>('test', container, delegate, [renderer], {});
+		tree.layout(200);
+
+		tree.setChildren(null, [{ element: 1 }]);
+
+		const newModel = new ObjectTreeModel<number, void>('NEW_USER_NAME', {});
+		tree.setModel(newModel);
+
+		try {
+			// This should throw an error because no identity provider is provided
+			tree.getViewState();
+		} catch (e) {
+			assert.strictEqual(e.message.includes('NEW_USER_NAME'), true);
+			return;
+		}
+
+		assert.fail('Expected error');
+	});
+});
 
 suite('CompressibleObjectTree', function () {
 
@@ -368,4 +474,59 @@ suite('CompressibleObjectTree', function () {
 		tree.updateOptions({ compressionEnabled: true });
 		assert.deepStrictEqual(getRowsTextContent(container), ['1/11/111', '1111', '1112', '1113']);
 	});
+
+	test('swapModel', () => {
+		const container = document.createElement('div');
+		container.style.width = '200px';
+		container.style.height = '200px';
+
+		const tree = ds.add(new CompressibleObjectTree<number>('test', container, new Delegate(), [new Renderer()]));
+		tree.layout(200);
+
+		tree.setChildren(null, [
+			{
+				element: 1, children: [{
+					element: 11, children: [{
+						element: 111, children: [
+							{ element: 1111 },
+							{ element: 1112 },
+							{ element: 1113 },
+						]
+					}]
+				}]
+			}
+		]);
+
+		assert.deepStrictEqual(getRowsTextContent(container), ['1/11/111', '1111', '1112', '1113']);
+
+		const newModel = new CompressibleObjectTreeModel<number, void>('test', {});
+		newModel.setChildren(null, [
+			{
+				element: 1, children: [{
+					element: 11
+				}]
+			},
+			{
+				element: 2, children: [{
+					element: 21, children: [
+						{ element: 211 },
+						{ element: 212 },
+						{ element: 213 },
+					]
+				}]
+			}
+		]);
+
+		tree.setModel(newModel);
+		assert.deepStrictEqual(getRowsTextContent(container), ['1/11', '2/21', '211', '212', '213']);
+
+		tree.setChildren(11, [
+			{ element: 111 },
+			{ element: 112 },
+			{ element: 113 },
+		]);
+
+		assert.deepStrictEqual(getRowsTextContent(container), ['1/11', '111', '112', '113', '2/21', '211', '212', '213']);
+
+	});
 });
diff --git a/src/vs/base/test/browser/ui/tree/objectTreeModel.test.ts b/src/vs/base/test/browser/ui/tree/objectTreeModel.test.ts
index ffef4afb72b..96748c55b71 100644
--- a/src/vs/base/test/browser/ui/tree/objectTreeModel.test.ts
+++ b/src/vs/base/test/browser/ui/tree/objectTreeModel.test.ts
@@ -4,20 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { IList } from 'vs/base/browser/ui/tree/indexTreeModel';
-import { ObjectTreeModel } from 'vs/base/browser/ui/tree/objectTreeModel';
-import { ITreeFilter, ITreeNode, ObjectTreeElementCollapseState, TreeVisibility } from 'vs/base/browser/ui/tree/tree';
-import { timeout } from 'vs/base/common/async';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { ObjectTreeModel } from '../../../../browser/ui/tree/objectTreeModel.js';
+import { ITreeFilter, ITreeModel, ITreeNode, ObjectTreeElementCollapseState, TreeVisibility } from '../../../../browser/ui/tree/tree.js';
+import { timeout } from '../../../../common/async.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../common/utils.js';
+import { IDisposable } from '../../../../common/lifecycle.js';
 
-function toList<T>(arr: T[]): IList<T> {
-	return {
-		splice(start: number, deleteCount: number, elements: T[]): void {
-			// console.log(`splice (${start}, ${deleteCount}, ${elements.length} [${elements.join(', ')}] )`); // debugging
-			arr.splice(start, deleteCount, ...elements);
-		},
-		updateElementHeight() { }
-	};
+function bindListToModel<T>(list: ITreeNode<T>[], model: ITreeModel<T, any, any>): IDisposable {
+	return model.onDidSpliceRenderedNodes(({ start, deleteCount, elements }) => {
+		list.splice(start, deleteCount, ...elements);
+	});
 }
 
 function toArray<T>(list: ITreeNode<T>[]): T[] {
@@ -30,15 +26,20 @@ suite('ObjectTreeModel', function () {
 
 	test('ctor', () => {
 		const list: ITreeNode<number>[] = [];
-		const model = new ObjectTreeModel<number>('test', toList(list));
+		const model = new ObjectTreeModel<number>('test');
+		const disposable = bindListToModel(list, model);
+
 		assert(model);
 		assert.strictEqual(list.length, 0);
 		assert.strictEqual(model.size, 0);
+
+		disposable.dispose();
 	});
 
 	test('flat', () => {
 		const list: ITreeNode<number>[] = [];
-		const model = new ObjectTreeModel<number>('test', toList(list));
+		const model = new ObjectTreeModel<number>('test');
+		const disposable = bindListToModel(list, model);
 
 		model.setChildren(null, [
 			{ element: 0 },
@@ -61,11 +62,14 @@ suite('ObjectTreeModel', function () {
 		model.setChildren(null);
 		assert.deepStrictEqual(toArray(list), []);
 		assert.strictEqual(model.size, 0);
+
+		disposable.dispose();
 	});
 
 	test('nested', () => {
 		const list: ITreeNode<number>[] = [];
-		const model = new ObjectTreeModel<number>('test', toList(list));
+		const model = new ObjectTreeModel<number>('test');
+		const disposable = bindListToModel(list, model);
 
 		model.setChildren(null, [
 			{
@@ -97,11 +101,14 @@ suite('ObjectTreeModel', function () {
 		model.setChildren(null);
 		assert.deepStrictEqual(toArray(list), []);
 		assert.strictEqual(model.size, 0);
+
+		disposable.dispose();
 	});
 
 	test('setChildren on collapsed node', () => {
 		const list: ITreeNode<number>[] = [];
-		const model = new ObjectTreeModel<number>('test', toList(list));
+		const model = new ObjectTreeModel<number>('test');
+		const disposable = bindListToModel(list, model);
 
 		model.setChildren(null, [
 			{ element: 0, collapsed: true }
@@ -118,11 +125,14 @@ suite('ObjectTreeModel', function () {
 
 		model.setCollapsed(0, false);
 		assert.deepStrictEqual(toArray(list), [0, 1, 2]);
+
+		disposable.dispose();
 	});
 
 	test('setChildren on expanded, unrevealed node', () => {
 		const list: ITreeNode<number>[] = [];
-		const model = new ObjectTreeModel<number>('test', toList(list));
+		const model = new ObjectTreeModel<number>('test');
+		const disposable = bindListToModel(list, model);
 
 		model.setChildren(null, [
 			{
@@ -144,12 +154,15 @@ suite('ObjectTreeModel', function () {
 
 		model.setCollapsed(1, false);
 		assert.deepStrictEqual(toArray(list), [1, 11, 111, 112, 2]);
+
+		disposable.dispose();
 	});
 
 	test('collapse state is preserved with strict identity', () => {
 		const list: ITreeNode<string>[] = [];
-		const model = new ObjectTreeModel<string>('test', toList(list), { collapseByDefault: true });
+		const model = new ObjectTreeModel<string>('test', { collapseByDefault: true });
 		const data = [{ element: 'father', children: [{ element: 'child' }] }];
+		const disposable = bindListToModel(list, model);
 
 		model.setChildren(null, data);
 		assert.deepStrictEqual(toArray(list), ['father']);
@@ -172,12 +185,15 @@ suite('ObjectTreeModel', function () {
 
 		model.setChildren(null, data);
 		assert.deepStrictEqual(toArray(list), ['father']);
+
+		disposable.dispose();
 	});
 
 	test('collapse state can be optionally preserved with strict identity', () => {
 		const list: ITreeNode<string>[] = [];
-		const model = new ObjectTreeModel<string>('test', toList(list), { collapseByDefault: true });
+		const model = new ObjectTreeModel<string>('test', { collapseByDefault: true });
 		const data = [{ element: 'father', collapsed: ObjectTreeElementCollapseState.PreserveOrExpanded, children: [{ element: 'child' }] }];
+		const disposable = bindListToModel(list, model);
 
 		model.setChildren(null, data);
 		assert.deepStrictEqual(toArray(list), ['father', 'child']);
@@ -193,33 +209,39 @@ suite('ObjectTreeModel', function () {
 
 		model.setChildren(null, data);
 		assert.deepStrictEqual(toArray(list), ['father', 'child']);
+
+		disposable.dispose();
 	});
 
 	test('sorter', () => {
 		const compare: (a: string, b: string) => number = (a, b) => a < b ? -1 : 1;
 
 		const list: ITreeNode<string>[] = [];
-		const model = new ObjectTreeModel<string>('test', toList(list), { sorter: { compare(a, b) { return compare(a, b); } } });
+		const model = new ObjectTreeModel<string>('test', { sorter: { compare(a, b) { return compare(a, b); } } });
 		const data = [
 			{ element: 'cars', children: [{ element: 'sedan' }, { element: 'convertible' }, { element: 'compact' }] },
 			{ element: 'airplanes', children: [{ element: 'passenger' }, { element: 'jet' }] },
 			{ element: 'bicycles', children: [{ element: 'dutch' }, { element: 'mountain' }, { element: 'electric' }] },
 		];
+		const disposable = bindListToModel(list, model);
 
 		model.setChildren(null, data);
 		assert.deepStrictEqual(toArray(list), ['airplanes', 'jet', 'passenger', 'bicycles', 'dutch', 'electric', 'mountain', 'cars', 'compact', 'convertible', 'sedan']);
+
+		disposable.dispose();
 	});
 
 	test('resort', () => {
 		let compare: (a: string, b: string) => number = () => 0;
 
 		const list: ITreeNode<string>[] = [];
-		const model = new ObjectTreeModel<string>('test', toList(list), { sorter: { compare(a, b) { return compare(a, b); } } });
+		const model = new ObjectTreeModel<string>('test', { sorter: { compare(a, b) { return compare(a, b); } } });
 		const data = [
 			{ element: 'cars', children: [{ element: 'sedan' }, { element: 'convertible' }, { element: 'compact' }] },
 			{ element: 'airplanes', children: [{ element: 'passenger' }, { element: 'jet' }] },
 			{ element: 'bicycles', children: [{ element: 'dutch' }, { element: 'mountain' }, { element: 'electric' }] },
 		];
+		const disposable = bindListToModel(list, model);
 
 		model.setChildren(null, data);
 		assert.deepStrictEqual(toArray(list), ['cars', 'sedan', 'convertible', 'compact', 'airplanes', 'passenger', 'jet', 'bicycles', 'dutch', 'mountain', 'electric']);
@@ -245,11 +267,14 @@ suite('ObjectTreeModel', function () {
 		// recursive
 		model.resort();
 		assert.deepStrictEqual(toArray(list), ['cars', 'sedan', 'convertible', 'compact', 'bicycles', 'mountain', 'electric', 'dutch', 'airplanes', 'passenger', 'jet']);
+
+		disposable.dispose();
 	});
 
 	test('expandTo', () => {
 		const list: ITreeNode<number>[] = [];
-		const model = new ObjectTreeModel<number>('test', toList(list), { collapseByDefault: true });
+		const model = new ObjectTreeModel<number>('test', { collapseByDefault: true });
+		const disposable = bindListToModel(list, model);
 
 		model.setChildren(null, [
 			{
@@ -266,6 +291,8 @@ suite('ObjectTreeModel', function () {
 		assert.deepStrictEqual(toArray(list), [0, 1, 2]);
 		model.expandTo(1000);
 		assert.deepStrictEqual(toArray(list), [0, 10, 100, 1000, 11, 12, 1, 2]);
+
+		disposable.dispose();
 	});
 
 	test('issue #95641', async () => {
@@ -280,7 +307,8 @@ suite('ObjectTreeModel', function () {
 				return fn(element) ? TreeVisibility.Visible : parentVisibility;
 			}
 		};
-		const model = new ObjectTreeModel<string>('test', toList(list), { filter });
+		const model = new ObjectTreeModel<string>('test', { filter });
+		const disposable = bindListToModel(list, model);
 
 		model.setChildren(null, [{ element: 'file', children: [{ element: 'hello' }] }]);
 		assert.deepStrictEqual(toArray(list), ['file', 'hello']);
@@ -300,5 +328,7 @@ suite('ObjectTreeModel', function () {
 		model.setChildren('file', [{ element: 'world' }]);
 		await timeout(0); // wait for refilter microtask
 		assert.deepStrictEqual(toArray(list), ['file', 'world']);
+
+		disposable.dispose();
 	});
 });
diff --git a/src/vs/base/test/common/arrays.test.ts b/src/vs/base/test/common/arrays.test.ts
index 617a766c965..f1144fbb613 100644
--- a/src/vs/base/test/common/arrays.test.ts
+++ b/src/vs/base/test/common/arrays.test.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import * as arrays from 'vs/base/common/arrays';
-import * as arraysFind from 'vs/base/common/arraysFind';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import * as arrays from '../../common/arrays.js';
+import * as arraysFind from '../../common/arraysFind.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('Arrays', () => {
 
diff --git a/src/vs/base/test/common/arraysFind.test.ts b/src/vs/base/test/common/arraysFind.test.ts
index caeea0fed22..6e7e29d868d 100644
--- a/src/vs/base/test/common/arraysFind.test.ts
+++ b/src/vs/base/test/common/arraysFind.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { MonotonousArray, findFirstMonotonous, findLastMonotonous } from 'vs/base/common/arraysFind';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { MonotonousArray, findFirstMonotonous, findLastMonotonous } from '../../common/arraysFind.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('Arrays', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/base/test/common/assert.test.ts b/src/vs/base/test/common/assert.test.ts
index f0052bade97..11d99e8f2b3 100644
--- a/src/vs/base/test/common/assert.test.ts
+++ b/src/vs/base/test/common/assert.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ok } from 'vs/base/common/assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { ok } from '../../common/assert.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('Assert', () => {
 	test('ok', () => {
diff --git a/src/vs/base/test/common/async.test.ts b/src/vs/base/test/common/async.test.ts
index e55200ff192..317e8b33774 100644
--- a/src/vs/base/test/common/async.test.ts
+++ b/src/vs/base/test/common/async.test.ts
@@ -4,15 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import * as async from 'vs/base/common/async';
-import * as MicrotaskDelay from "vs/base/common/symbols";
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { isCancellationError } from 'vs/base/common/errors';
-import { Event } from 'vs/base/common/event';
-import { URI } from 'vs/base/common/uri';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import * as async from '../../common/async.js';
+import * as MicrotaskDelay from "../../common/symbols.js";
+import { CancellationToken, CancellationTokenSource } from '../../common/cancellation.js';
+import { isCancellationError } from '../../common/errors.js';
+import { Event } from '../../common/event.js';
+import { URI } from '../../common/uri.js';
+import { runWithFakedTimers } from './timeTravelScheduler.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
+import { DisposableStore } from '../../common/lifecycle.js';
 
 suite('Async', () => {
 
diff --git a/src/vs/base/test/common/buffer.test.ts b/src/vs/base/test/common/buffer.test.ts
index e94fd8755a0..3ff4056f2ef 100644
--- a/src/vs/base/test/common/buffer.test.ts
+++ b/src/vs/base/test/common/buffer.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { timeout } from 'vs/base/common/async';
-import { bufferedStreamToBuffer, bufferToReadable, bufferToStream, decodeBase64, encodeBase64, newWriteableBufferStream, readableToBuffer, streamToBuffer, VSBuffer } from 'vs/base/common/buffer';
-import { peekStream } from 'vs/base/common/stream';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { timeout } from '../../common/async.js';
+import { bufferedStreamToBuffer, bufferToReadable, bufferToStream, decodeBase64, encodeBase64, newWriteableBufferStream, readableToBuffer, streamToBuffer, VSBuffer } from '../../common/buffer.js';
+import { peekStream } from '../../common/stream.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('Buffer', () => {
 
diff --git a/src/vs/base/test/common/cache.test.ts b/src/vs/base/test/common/cache.test.ts
index ed4ca02f93b..0d4bd0a9d82 100644
--- a/src/vs/base/test/common/cache.test.ts
+++ b/src/vs/base/test/common/cache.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { timeout } from 'vs/base/common/async';
-import { Cache } from 'vs/base/common/cache';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { timeout } from '../../common/async.js';
+import { Cache } from '../../common/cache.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('Cache', () => {
 
diff --git a/src/vs/base/test/common/cancellation.test.ts b/src/vs/base/test/common/cancellation.test.ts
index 178f77cde1e..38ed33f8d62 100644
--- a/src/vs/base/test/common/cancellation.test.ts
+++ b/src/vs/base/test/common/cancellation.test.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { CancellationToken, CancellationTokenSource } from '../../common/cancellation.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('CancellationToken', function () {
 
diff --git a/src/vs/base/test/common/charCode.test.ts b/src/vs/base/test/common/charCode.test.ts
index 59c4e3fbcc9..6f2b6112f7d 100644
--- a/src/vs/base/test/common/charCode.test.ts
+++ b/src/vs/base/test/common/charCode.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { CharCode } from 'vs/base/common/charCode';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { CharCode } from '../../common/charCode.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('CharCode', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/base/test/common/collections.test.ts b/src/vs/base/test/common/collections.test.ts
index ae9ead05c41..fbf8f6e77b3 100644
--- a/src/vs/base/test/common/collections.test.ts
+++ b/src/vs/base/test/common/collections.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import * as collections from 'vs/base/common/collections';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import * as collections from '../../common/collections.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('Collections', () => {
 
@@ -32,4 +32,70 @@ suite('Collections', () => {
 		assert.strictEqual(grouped[group2].length, 1);
 		assert.strictEqual(grouped[group2][0].value, value3);
 	});
+
+	suite('SetWithKey', () => {
+		let setWithKey: collections.SetWithKey<{ someProp: string }>;
+
+		const initialValues = ['a', 'b', 'c'].map(s => ({ someProp: s }));
+		setup(() => {
+			setWithKey = new collections.SetWithKey<{ someProp: string }>(initialValues, value => value.someProp);
+		});
+
+		test('size', () => {
+			assert.strictEqual(setWithKey.size, 3);
+		});
+
+		test('add', () => {
+			setWithKey.add({ someProp: 'd' });
+			assert.strictEqual(setWithKey.size, 4);
+			assert.strictEqual(setWithKey.has({ someProp: 'd' }), true);
+		});
+
+		test('delete', () => {
+			assert.strictEqual(setWithKey.has({ someProp: 'b' }), true);
+			setWithKey.delete({ someProp: 'b' });
+			assert.strictEqual(setWithKey.size, 2);
+			assert.strictEqual(setWithKey.has({ someProp: 'b' }), false);
+		});
+
+		test('has', () => {
+			assert.strictEqual(setWithKey.has({ someProp: 'a' }), true);
+			assert.strictEqual(setWithKey.has({ someProp: 'b' }), true);
+		});
+
+		test('entries', () => {
+			const entries = Array.from(setWithKey.entries());
+			assert.deepStrictEqual(entries, initialValues.map(value => [value, value]));
+		});
+
+		test('keys and values', () => {
+			const keys = Array.from(setWithKey.keys());
+			const values = Array.from(setWithKey.values());
+			assert.deepStrictEqual(keys, initialValues);
+			assert.deepStrictEqual(values, initialValues);
+		});
+
+		test('clear', () => {
+			setWithKey.clear();
+			assert.strictEqual(setWithKey.size, 0);
+		});
+
+		test('forEach', () => {
+			const values: any[] = [];
+			setWithKey.forEach(value => values.push(value));
+			assert.deepStrictEqual(values, initialValues);
+		});
+
+		test('iterator', () => {
+			const values: any[] = [];
+			for (const value of setWithKey) {
+				values.push(value);
+			}
+			assert.deepStrictEqual(values, initialValues);
+		});
+
+		test('toStringTag', () => {
+			assert.strictEqual(setWithKey[Symbol.toStringTag], 'SetWithKey');
+		});
+	});
 });
diff --git a/src/vs/base/test/common/color.test.ts b/src/vs/base/test/common/color.test.ts
index 256397a713e..0f6c1a689cf 100644
--- a/src/vs/base/test/common/color.test.ts
+++ b/src/vs/base/test/common/color.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Color, HSLA, HSVA, RGBA } from 'vs/base/common/color';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { Color, HSLA, HSVA, RGBA } from '../../common/color.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('Color', () => {
 
@@ -253,4 +253,71 @@ suite('Color', () => {
 			});
 		});
 	});
+
+	const rgbaFromInt = (int: number) => new Color(new RGBA(
+		(int >> 24) & 0xff,
+		(int >> 16) & 0xff,
+		(int >> 8) & 0xff,
+		(int) & 0xff
+	));
+
+	const assertContrastRatio = (background: number, foreground: number, ratio: number, expected = foreground) => {
+		const bgColor = rgbaFromInt(background);
+		const fgColor = rgbaFromInt(foreground);
+		assert.deepStrictEqual(bgColor.ensureConstrast(fgColor, ratio).rgba, rgbaFromInt(expected).rgba);
+	};
+
+	// https://github.com/xtermjs/xterm.js/blob/44f9fa39ae03e2ca6d28354d88a399608686770e/src/common/Color.test.ts#L355
+	suite('ensureContrastRatio', () => {
+		test('should return undefined if the color already meets the contrast ratio (black bg)', () => {
+			assertContrastRatio(0x000000ff, 0x606060ff, 1, undefined);
+			assertContrastRatio(0x000000ff, 0x606060ff, 2, undefined);
+			assertContrastRatio(0x000000ff, 0x606060ff, 3, undefined);
+		});
+		test('should return a color that meets the contrast ratio (black bg)', () => {
+			assertContrastRatio(0x000000ff, 0x606060ff, 4, 0x707070ff);
+			assertContrastRatio(0x000000ff, 0x606060ff, 5, 0x7f7f7fff);
+			assertContrastRatio(0x000000ff, 0x606060ff, 6, 0x8c8c8cff);
+			assertContrastRatio(0x000000ff, 0x606060ff, 7, 0x989898ff);
+			assertContrastRatio(0x000000ff, 0x606060ff, 8, 0xa3a3a3ff);
+			assertContrastRatio(0x000000ff, 0x606060ff, 9, 0xadadadff);
+			assertContrastRatio(0x000000ff, 0x606060ff, 10, 0xb6b6b6ff);
+			assertContrastRatio(0x000000ff, 0x606060ff, 11, 0xbebebeff);
+			assertContrastRatio(0x000000ff, 0x606060ff, 12, 0xc5c5c5ff);
+			assertContrastRatio(0x000000ff, 0x606060ff, 13, 0xd1d1d1ff);
+			assertContrastRatio(0x000000ff, 0x606060ff, 14, 0xd6d6d6ff);
+			assertContrastRatio(0x000000ff, 0x606060ff, 15, 0xdbdbdbff);
+			assertContrastRatio(0x000000ff, 0x606060ff, 16, 0xe3e3e3ff);
+			assertContrastRatio(0x000000ff, 0x606060ff, 17, 0xe9e9e9ff);
+			assertContrastRatio(0x000000ff, 0x606060ff, 18, 0xeeeeeeff);
+			assertContrastRatio(0x000000ff, 0x606060ff, 19, 0xf4f4f4ff);
+			assertContrastRatio(0x000000ff, 0x606060ff, 20, 0xfafafaff);
+			assertContrastRatio(0x000000ff, 0x606060ff, 21, 0xffffffff);
+		});
+		test('should return undefined if the color already meets the contrast ratio (white bg)', () => {
+			assertContrastRatio(0xffffffff, 0x606060ff, 1, undefined);
+			assertContrastRatio(0xffffffff, 0x606060ff, 2, undefined);
+			assertContrastRatio(0xffffffff, 0x606060ff, 3, undefined);
+			assertContrastRatio(0xffffffff, 0x606060ff, 4, undefined);
+			assertContrastRatio(0xffffffff, 0x606060ff, 5, undefined);
+			assertContrastRatio(0xffffffff, 0x606060ff, 6, undefined);
+		});
+		test('should return a color that meets the contrast ratio (white bg)', () => {
+			assertContrastRatio(0xffffffff, 0x606060ff, 7, 0x565656ff);
+			assertContrastRatio(0xffffffff, 0x606060ff, 8, 0x4d4d4dff);
+			assertContrastRatio(0xffffffff, 0x606060ff, 9, 0x454545ff);
+			assertContrastRatio(0xffffffff, 0x606060ff, 10, 0x3e3e3eff);
+			assertContrastRatio(0xffffffff, 0x606060ff, 11, 0x373737ff);
+			assertContrastRatio(0xffffffff, 0x606060ff, 12, 0x313131ff);
+			assertContrastRatio(0xffffffff, 0x606060ff, 13, 0x313131ff);
+			assertContrastRatio(0xffffffff, 0x606060ff, 14, 0x272727ff);
+			assertContrastRatio(0xffffffff, 0x606060ff, 15, 0x232323ff);
+			assertContrastRatio(0xffffffff, 0x606060ff, 16, 0x1f1f1fff);
+			assertContrastRatio(0xffffffff, 0x606060ff, 17, 0x1b1b1bff);
+			assertContrastRatio(0xffffffff, 0x606060ff, 18, 0x151515ff);
+			assertContrastRatio(0xffffffff, 0x606060ff, 19, 0x101010ff);
+			assertContrastRatio(0xffffffff, 0x606060ff, 20, 0x080808ff);
+			assertContrastRatio(0xffffffff, 0x606060ff, 21, 0x000000ff);
+		});
+	});
 });
diff --git a/src/vs/base/test/common/console.test.ts b/src/vs/base/test/common/console.test.ts
index 457255eb627..d007d03be5b 100644
--- a/src/vs/base/test/common/console.test.ts
+++ b/src/vs/base/test/common/console.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { getFirstFrame } from 'vs/base/common/console';
-import { normalize } from 'vs/base/common/path';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { getFirstFrame } from '../../common/console.js';
+import { normalize } from '../../common/path.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('Console', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/base/test/common/date.test.ts b/src/vs/base/test/common/date.test.ts
index 2a140e87747..07346401690 100644
--- a/src/vs/base/test/common/date.test.ts
+++ b/src/vs/base/test/common/date.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { strictEqual } from 'assert';
-import { fromNow, getDurationString } from 'vs/base/common/date';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { fromNow, fromNowByDay, getDurationString } from '../../common/date.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('Date', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
@@ -28,6 +28,23 @@ suite('Date', () => {
 		});
 	});
 
+	suite('fromNowByDay', () => {
+		test('today', () => {
+			const now = new Date();
+			strictEqual(fromNowByDay(now), 'Today');
+		});
+		test('yesterday', () => {
+			const yesterday = new Date();
+			yesterday.setDate(yesterday.getDate() - 1);
+			strictEqual(fromNowByDay(yesterday), 'Yesterday');
+		});
+		test('daysAgo', () => {
+			const daysAgo = new Date();
+			daysAgo.setDate(daysAgo.getDate() - 5);
+			strictEqual(fromNowByDay(daysAgo, true), '5 days ago');
+		});
+	});
+
 	suite('getDurationString', () => {
 		test('basic', () => {
 			strictEqual(getDurationString(1), '1ms');
diff --git a/src/vs/base/test/common/decorators.test.ts b/src/vs/base/test/common/decorators.test.ts
index 33d78329dd5..bac27cd772e 100644
--- a/src/vs/base/test/common/decorators.test.ts
+++ b/src/vs/base/test/common/decorators.test.ts
@@ -5,8 +5,8 @@
 
 import assert from 'assert';
 import * as sinon from 'sinon';
-import { memoize, throttle } from 'vs/base/common/decorators';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { memoize, throttle } from '../../common/decorators.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('Decorators', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/base/test/common/diff/diff.test.ts b/src/vs/base/test/common/diff/diff.test.ts
index eeee6328c83..ba4af214325 100644
--- a/src/vs/base/test/common/diff/diff.test.ts
+++ b/src/vs/base/test/common/diff/diff.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { IDiffChange, LcsDiff, StringDiffSequence } from 'vs/base/common/diff/diff';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { IDiffChange, LcsDiff, StringDiffSequence } from '../../../common/diff/diff.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../utils.js';
 
 function createArray<T>(length: number, value: T): T[] {
 	const r: T[] = [];
diff --git a/src/vs/base/test/common/errors.test.ts b/src/vs/base/test/common/errors.test.ts
index 3ebfaffe4de..9e33ed81868 100644
--- a/src/vs/base/test/common/errors.test.ts
+++ b/src/vs/base/test/common/errors.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { toErrorMessage } from '../../common/errorMessage.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('Errors', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/base/test/common/event.test.ts b/src/vs/base/test/common/event.test.ts
index 3c65d9e77e9..9f08b144133 100644
--- a/src/vs/base/test/common/event.test.ts
+++ b/src/vs/base/test/common/event.test.ts
@@ -4,16 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
 import { stub } from 'sinon';
-import { tail2 } from 'vs/base/common/arrays';
-import { DeferredPromise, timeout } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { errorHandler, setUnexpectedErrorHandler } from 'vs/base/common/errors';
-import { AsyncEmitter, DebounceEmitter, DynamicListEventMultiplexer, Emitter, Event, EventBufferer, EventMultiplexer, IWaitUntil, ListenerLeakError, ListenerRefusalError, MicrotaskEmitter, PauseableEmitter, Relay, createEventDeliveryQueue } from 'vs/base/common/event';
-import { DisposableStore, IDisposable, isDisposable, setDisposableTracker, DisposableTracker } from 'vs/base/common/lifecycle';
-import { observableValue, transaction } from 'vs/base/common/observable';
-import { MicrotaskDelay } from 'vs/base/common/symbols';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { tail2 } from '../../common/arrays.js';
+import { DeferredPromise, timeout } from '../../common/async.js';
+import { CancellationToken } from '../../common/cancellation.js';
+import { errorHandler, setUnexpectedErrorHandler } from '../../common/errors.js';
+import { AsyncEmitter, DebounceEmitter, DynamicListEventMultiplexer, Emitter, Event, EventBufferer, EventMultiplexer, IWaitUntil, ListenerLeakError, ListenerRefusalError, MicrotaskEmitter, PauseableEmitter, Relay, createEventDeliveryQueue } from '../../common/event.js';
+import { DisposableStore, IDisposable, isDisposable, setDisposableTracker, DisposableTracker } from '../../common/lifecycle.js';
+import { observableValue, transaction } from '../../common/observable.js';
+import { MicrotaskDelay } from '../../common/symbols.js';
+import { runWithFakedTimers } from './timeTravelScheduler.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 namespace Samples {
 
diff --git a/src/vs/base/test/common/extpath.test.ts b/src/vs/base/test/common/extpath.test.ts
index 45e411a7e1c..818664b7042 100644
--- a/src/vs/base/test/common/extpath.test.ts
+++ b/src/vs/base/test/common/extpath.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { CharCode } from 'vs/base/common/charCode';
-import * as extpath from 'vs/base/common/extpath';
-import { isWindows } from 'vs/base/common/platform';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { CharCode } from '../../common/charCode.js';
+import * as extpath from '../../common/extpath.js';
+import { isWindows } from '../../common/platform.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('Paths', () => {
 
diff --git a/src/vs/base/test/common/filters.perf.test.ts b/src/vs/base/test/common/filters.perf.test.ts
index fd311ecd6f7..d64576b4952 100644
--- a/src/vs/base/test/common/filters.perf.test.ts
+++ b/src/vs/base/test/common/filters.perf.test.ts
@@ -2,9 +2,9 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { importAMDNodeModule } from 'vs/amdX';
-import * as filters from 'vs/base/common/filters';
-import { FileAccess } from 'vs/base/common/network';
+import { importAMDNodeModule } from '../../../amdX.js';
+import * as filters from '../../common/filters.js';
+import { FileAccess } from '../../common/network.js';
 
 const patterns = ['cci', 'ida', 'pos', 'CCI', 'enbled', 'callback', 'gGame', 'cons', 'zyx', 'aBc'];
 
@@ -19,7 +19,7 @@ function perfSuite(name: string, callback: (this: Mocha.Suite) => void) {
 perfSuite('Performance - fuzzyMatch', async function () {
 
 	const uri = FileAccess.asBrowserUri('vs/base/test/common/filters.perf.data').toString(true);
-	const { data } = await importAMDNodeModule<typeof import('vs/base/test/common/filters.perf.data')>(uri, '');
+	const { data } = await importAMDNodeModule<typeof import('./filters.perf.data.js')>(uri, '');
 
 	// suiteSetup(() => console.profile());
 	// suiteTeardown(() => console.profileEnd());
@@ -54,7 +54,7 @@ perfSuite('Performance - fuzzyMatch', async function () {
 perfSuite('Performance - IFilter', async function () {
 
 	const uri = FileAccess.asBrowserUri('vs/base/test/common/filters.perf.data').toString(true);
-	const { data } = await importAMDNodeModule<typeof import('vs/base/test/common/filters.perf.data')>(uri, '');
+	const { data } = await importAMDNodeModule<typeof import('./filters.perf.data.js')>(uri, '');
 
 	function perfTest(name: string, match: filters.IFilter) {
 		test(name, () => {
diff --git a/src/vs/base/test/common/filters.test.ts b/src/vs/base/test/common/filters.test.ts
index 5da3552ec56..ce70ad5f9c1 100644
--- a/src/vs/base/test/common/filters.test.ts
+++ b/src/vs/base/test/common/filters.test.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { anyScore, createMatches, fuzzyScore, fuzzyScoreGraceful, fuzzyScoreGracefulAggressive, FuzzyScorer, IFilter, IMatch, matchesCamelCase, matchesContiguousSubString, matchesPrefix, matchesStrictPrefix, matchesSubString, matchesWords, or } from 'vs/base/common/filters';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { anyScore, createMatches, fuzzyScore, fuzzyScoreGraceful, fuzzyScoreGracefulAggressive, FuzzyScorer, IFilter, IMatch, matchesCamelCase, matchesContiguousSubString, matchesPrefix, matchesStrictPrefix, matchesSubString, matchesWords, or } from '../../common/filters.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 function filterOk(filter: IFilter, word: string, wordToMatchAgainst: string, highlights?: { start: number; end: number }[]) {
 	const r = filter(word, wordToMatchAgainst);
diff --git a/src/vs/base/test/common/fuzzyScorer.test.ts b/src/vs/base/test/common/fuzzyScorer.test.ts
index 4e41662631d..b180df4422b 100644
--- a/src/vs/base/test/common/fuzzyScorer.test.ts
+++ b/src/vs/base/test/common/fuzzyScorer.test.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { compareItemsByFuzzyScore, FuzzyScore, FuzzyScore2, FuzzyScorerCache, IItemAccessor, IItemScore, pieceToQuery, prepareQuery, scoreFuzzy, scoreFuzzy2, scoreItemFuzzy } from 'vs/base/common/fuzzyScorer';
-import { Schemas } from 'vs/base/common/network';
-import { basename, dirname, posix, sep, win32 } from 'vs/base/common/path';
-import { isWindows } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { compareItemsByFuzzyScore, FuzzyScore, FuzzyScore2, FuzzyScorerCache, IItemAccessor, IItemScore, pieceToQuery, prepareQuery, scoreFuzzy, scoreFuzzy2, scoreItemFuzzy } from '../../common/fuzzyScorer.js';
+import { Schemas } from '../../common/network.js';
+import { basename, dirname, posix, sep, win32 } from '../../common/path.js';
+import { isWindows } from '../../common/platform.js';
+import { URI } from '../../common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 class ResourceAccessorClass implements IItemAccessor<URI> {
 
diff --git a/src/vs/base/test/common/glob.test.ts b/src/vs/base/test/common/glob.test.ts
index 2e721bd3002..3a57ae72492 100644
--- a/src/vs/base/test/common/glob.test.ts
+++ b/src/vs/base/test/common/glob.test.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import * as glob from 'vs/base/common/glob';
-import { sep } from 'vs/base/common/path';
-import { isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import * as glob from '../../common/glob.js';
+import { sep } from '../../common/path.js';
+import { isLinux, isMacintosh, isWindows } from '../../common/platform.js';
+import { URI } from '../../common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('Glob', () => {
 
diff --git a/src/vs/base/test/common/history.test.ts b/src/vs/base/test/common/history.test.ts
index 07443052e78..c836f610c2b 100644
--- a/src/vs/base/test/common/history.test.ts
+++ b/src/vs/base/test/common/history.test.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { HistoryNavigator, HistoryNavigator2 } from 'vs/base/common/history';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { HistoryNavigator, HistoryNavigator2 } from '../../common/history.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('History Navigator', () => {
 
diff --git a/src/vs/base/test/common/iconLabels.test.ts b/src/vs/base/test/common/iconLabels.test.ts
index 4ce6b493afa..83574bd2ae1 100644
--- a/src/vs/base/test/common/iconLabels.test.ts
+++ b/src/vs/base/test/common/iconLabels.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { IMatch } from 'vs/base/common/filters';
-import { escapeIcons, getCodiconAriaLabel, IParsedLabelWithIcons, markdownEscapeEscapedIcons, matchesFuzzyIconAware, parseLabelWithIcons, stripIcons } from 'vs/base/common/iconLabels';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { IMatch } from '../../common/filters.js';
+import { escapeIcons, getCodiconAriaLabel, IParsedLabelWithIcons, markdownEscapeEscapedIcons, matchesFuzzyIconAware, parseLabelWithIcons, stripIcons } from '../../common/iconLabels.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 interface IIconFilter {
 	// Returns null if word doesn't match.
diff --git a/src/vs/base/test/common/iterator.test.ts b/src/vs/base/test/common/iterator.test.ts
index 0d95a4afc24..c833ba4c8b0 100644
--- a/src/vs/base/test/common/iterator.test.ts
+++ b/src/vs/base/test/common/iterator.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Iterable } from 'vs/base/common/iterator';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { Iterable } from '../../common/iterator.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('Iterable', function () {
 
diff --git a/src/vs/base/test/common/json.test.ts b/src/vs/base/test/common/json.test.ts
index c8a6202bf06..91a2c976f48 100644
--- a/src/vs/base/test/common/json.test.ts
+++ b/src/vs/base/test/common/json.test.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { createScanner, Node, parse, ParseError, ParseErrorCode, ParseOptions, parseTree, ScanError, SyntaxKind } from 'vs/base/common/json';
-import { getParseErrorMessage } from 'vs/base/common/jsonErrorMessages';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { createScanner, Node, parse, ParseError, ParseErrorCode, ParseOptions, parseTree, ScanError, SyntaxKind } from '../../common/json.js';
+import { getParseErrorMessage } from '../../common/jsonErrorMessages.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 function assertKinds(text: string, ...kinds: SyntaxKind[]): void {
 	const scanner = createScanner(text);
diff --git a/src/vs/base/test/common/jsonEdit.test.ts b/src/vs/base/test/common/jsonEdit.test.ts
index 060884ae9ff..ffcdd9c0a30 100644
--- a/src/vs/base/test/common/jsonEdit.test.ts
+++ b/src/vs/base/test/common/jsonEdit.test.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { removeProperty, setProperty } from 'vs/base/common/jsonEdit';
-import { Edit, FormattingOptions } from 'vs/base/common/jsonFormatter';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { removeProperty, setProperty } from '../../common/jsonEdit.js';
+import { Edit, FormattingOptions } from '../../common/jsonFormatter.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('JSON - edits', () => {
 
diff --git a/src/vs/base/test/common/jsonFormatter.test.ts b/src/vs/base/test/common/jsonFormatter.test.ts
index 80d8a22fd35..ae25368df0a 100644
--- a/src/vs/base/test/common/jsonFormatter.test.ts
+++ b/src/vs/base/test/common/jsonFormatter.test.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import * as Formatter from 'vs/base/common/jsonFormatter';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import * as Formatter from '../../common/jsonFormatter.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('JSON - formatter', () => {
 
diff --git a/src/vs/base/test/common/stripComments.test.ts b/src/vs/base/test/common/jsonParse.test.ts
similarity index 56%
rename from src/vs/base/test/common/stripComments.test.ts
rename to src/vs/base/test/common/jsonParse.test.ts
index e3bdff0c278..83e520fad22 100644
--- a/src/vs/base/test/common/stripComments.test.ts
+++ b/src/vs/base/test/common/jsonParse.test.ts
@@ -4,12 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
 
-import { stripComments } from 'vs/base/common/stripComments';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { parse, stripComments } from '../../common/jsonc.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
-// We use this regular expression quite often to strip comments in JSON files.
-
-suite('Strip Comments', () => {
+suite('JSON Parse', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
 
 	test('Line comment', () => {
@@ -23,7 +21,7 @@ suite('Strip Comments', () => {
 			"  \"prop\": 10 ",
 			"}",
 		].join('\n');
-		assert.strictEqual(stripComments(content), expected);
+		assert.deepEqual(parse(content), JSON.parse(expected));
 	});
 	test('Line comment - EOF', () => {
 		const content: string = [
@@ -36,7 +34,7 @@ suite('Strip Comments', () => {
 			"}",
 			""
 		].join('\n');
-		assert.strictEqual(stripComments(content), expected);
+		assert.deepEqual(parse(content), JSON.parse(expected));
 	});
 	test('Line comment - \\r\\n', () => {
 		const content: string = [
@@ -49,7 +47,7 @@ suite('Strip Comments', () => {
 			"  \"prop\": 10 ",
 			"}",
 		].join('\r\n');
-		assert.strictEqual(stripComments(content), expected);
+		assert.deepEqual(parse(content), JSON.parse(expected));
 	});
 	test('Line comment - EOF - \\r\\n', () => {
 		const content: string = [
@@ -62,7 +60,7 @@ suite('Strip Comments', () => {
 			"}",
 			""
 		].join('\r\n');
-		assert.strictEqual(stripComments(content), expected);
+		assert.deepEqual(parse(content), JSON.parse(expected));
 	});
 	test('Block comment - single line', () => {
 		const content: string = [
@@ -75,7 +73,7 @@ suite('Strip Comments', () => {
 			"  \"prop\": 10",
 			"}",
 		].join('\n');
-		assert.strictEqual(stripComments(content), expected);
+		assert.deepEqual(parse(content), JSON.parse(expected));
 	});
 	test('Block comment - multi line', () => {
 		const content: string = [
@@ -92,7 +90,7 @@ suite('Strip Comments', () => {
 			"  \"prop\": 10",
 			"}",
 		].join('\n');
-		assert.strictEqual(stripComments(content), expected);
+		assert.deepEqual(parse(content), JSON.parse(expected));
 	});
 	test('Block comment - shortest match', () => {
 		const content = "/* abc */ */";
@@ -110,7 +108,7 @@ suite('Strip Comments', () => {
 			"  \"/* */\": 10",
 			"}"
 		].join('\n');
-		assert.strictEqual(stripComments(content), expected);
+		assert.deepEqual(parse(content), JSON.parse(expected));
 	});
 	test('No strings - single quote', () => {
 		const content: string = [
@@ -136,7 +134,7 @@ suite('Strip Comments', () => {
 			`  "a": 10`,
 			"}"
 		].join('\n');
-		assert.strictEqual(stripComments(content), expected);
+		assert.deepEqual(parse(content), JSON.parse(expected));
 	});
 	test('Trailing comma in array', () => {
 		const content: string = [
@@ -145,6 +143,52 @@ suite('Strip Comments', () => {
 		const expected: string = [
 			`[ "a", "b", "c" ]`
 		].join('\n');
-		assert.strictEqual(stripComments(content), expected);
+		assert.deepEqual(parse(content), JSON.parse(expected));
+	});
+
+	test('Trailing comma', () => {
+		const content: string = [
+			"{",
+			"  \"propA\": 10, // a comment",
+			"  \"propB\": false, // a trailing comma",
+			"}",
+		].join('\n');
+		const expected = [
+			"{",
+			"  \"propA\": 10,",
+			"  \"propB\": false",
+			"}",
+		].join('\n');
+		assert.deepEqual(parse(content), JSON.parse(expected));
+	});
+
+	test('Trailing comma - EOF', () => {
+		const content = `
+// This configuration file allows you to pass permanent command line arguments to VS Code.
+// Only a subset of arguments is currently supported to reduce the likelihood of breaking
+// the installation.
+//
+// PLEASE DO NOT CHANGE WITHOUT UNDERSTANDING THE IMPACT
+//
+// NOTE: Changing this file requires a restart of VS Code.
+{
+	// Use software rendering instead of hardware accelerated rendering.
+	// This can help in cases where you see rendering issues in VS Code.
+	// "disable-hardware-acceleration": true,
+	// Allows to disable crash reporting.
+	// Should restart the app if the value is changed.
+	"enable-crash-reporter": true,
+	// Unique id used for correlating crash reports sent from this instance.
+	// Do not edit this value.
+	"crash-reporter-id": "aaaaab31-7453-4506-97d0-93411b2c21c7",
+	"locale": "en",
+	// "log-level": "trace"
+}
+`;
+		assert.deepEqual(parse(content), {
+			"enable-crash-reporter": true,
+			"crash-reporter-id": "aaaaab31-7453-4506-97d0-93411b2c21c7",
+			"locale": "en"
+		});
 	});
 });
diff --git a/src/vs/base/test/common/jsonSchema.test.ts b/src/vs/base/test/common/jsonSchema.test.ts
new file mode 100644
index 00000000000..da678c56675
--- /dev/null
+++ b/src/vs/base/test/common/jsonSchema.test.ts
@@ -0,0 +1,574 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import assert from 'assert';
+import { getCompressedContent, IJSONSchema } from '../../common/jsonSchema.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
+
+suite('JSON Schema', () => {
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('getCompressedContent 1', () => {
+
+		const schema: IJSONSchema = {
+			type: 'object',
+			properties: {
+				a: {
+					type: 'object',
+					description: 'a',
+					properties: {
+						b: {
+							type: 'object',
+							properties: {
+								c: {
+									type: 'object',
+									properties: {
+										d: {
+											type: 'string'
+										}
+									}
+								}
+							}
+						}
+					}
+				},
+				e: {
+					type: 'object',
+					description: 'e',
+					properties: {
+						b: {
+							type: 'object',
+							properties: {
+								c: {
+									type: 'object',
+									properties: {
+										d: {
+											type: 'string'
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		};
+
+		const expected: IJSONSchema = {
+			type: 'object',
+			properties: {
+				a: {
+					type: 'object',
+					description: 'a',
+					properties: {
+						b: {
+							$ref: '#/$defs/_0'
+						}
+					}
+				},
+				e: {
+					type: 'object',
+					description: 'e',
+					properties: {
+						b: {
+							$ref: '#/$defs/_0'
+						}
+					}
+				}
+			},
+			$defs: {
+				"_0": {
+					type: 'object',
+					properties: {
+						c: {
+							type: 'object',
+							properties: {
+								d: {
+									type: 'string'
+								}
+							}
+						}
+					}
+				}
+			}
+
+		};
+
+		assert.deepEqual(getCompressedContent(schema), JSON.stringify(expected));
+	});
+
+	test('getCompressedContent 2', () => {
+
+		const schema: IJSONSchema = {
+			type: 'object',
+			properties: {
+				a: {
+					type: 'object',
+					properties: {
+						b: {
+							type: 'object',
+							properties: {
+								c: {
+									type: 'object',
+									properties: {
+										d: {
+											type: 'string'
+										}
+									}
+								}
+							}
+						}
+					}
+				},
+				e: {
+					type: 'object',
+					properties: {
+						b: {
+							type: 'object',
+							properties: {
+								c: {
+									type: 'object',
+									properties: {
+										d: {
+											type: 'string'
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		};
+
+		const expected: IJSONSchema = {
+			type: 'object',
+			properties: {
+				a: {
+					$ref: '#/$defs/_0'
+
+				},
+				e: {
+					$ref: '#/$defs/_0'
+				}
+			},
+			$defs: {
+				"_0": {
+					type: 'object',
+					properties: {
+						b: {
+							type: 'object',
+							properties: {
+								c: {
+									type: 'object',
+									properties: {
+										d: {
+											type: 'string'
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+
+		};
+
+		assert.deepEqual(getCompressedContent(schema), JSON.stringify(expected));
+	});
+
+	test('getCompressedContent 3', () => {
+
+
+		const schema: IJSONSchema = {
+			type: 'object',
+			properties: {
+				a: {
+					type: 'object',
+					oneOf: [
+						{
+							allOf: [
+								{
+									properties: {
+										name: {
+											type: 'string'
+										},
+										description: {
+											type: 'string'
+										}
+									}
+								},
+								{
+									properties: {
+										street: {
+											type: 'string'
+										},
+									}
+								}
+							]
+						},
+						{
+							allOf: [
+								{
+									properties: {
+										name: {
+											type: 'string'
+										},
+										description: {
+											type: 'string'
+										}
+									}
+								},
+								{
+									properties: {
+										river: {
+											type: 'string'
+										},
+									}
+								}
+							]
+						},
+						{
+							allOf: [
+								{
+									properties: {
+										name: {
+											type: 'string'
+										},
+										description: {
+											type: 'string'
+										}
+									}
+								},
+								{
+									properties: {
+										mountain: {
+											type: 'string'
+										},
+									}
+								}
+							]
+						}
+					]
+				},
+				b: {
+					type: 'object',
+					properties: {
+						street: {
+							properties: {
+								street: {
+									type: 'string'
+								}
+							}
+						}
+					}
+				}
+			}
+		};
+
+		const expected: IJSONSchema = {
+			"type": "object",
+			"properties": {
+				"a": {
+					"type": "object",
+					"oneOf": [
+						{
+							"allOf": [
+								{
+									"$ref": "#/$defs/_0"
+								},
+								{
+									"$ref": "#/$defs/_1"
+								}
+							]
+						},
+						{
+							"allOf": [
+								{
+									"$ref": "#/$defs/_0"
+								},
+								{
+									"properties": {
+										"river": {
+											"type": "string"
+										}
+									}
+								}
+							]
+						},
+						{
+							"allOf": [
+								{
+									"$ref": "#/$defs/_0"
+								},
+								{
+									"properties": {
+										"mountain": {
+											"type": "string"
+										}
+									}
+								}
+							]
+						}
+					]
+				},
+				"b": {
+					"type": "object",
+					"properties": {
+						"street": {
+							"$ref": "#/$defs/_1"
+						}
+					}
+				}
+			},
+			"$defs": {
+				"_0": {
+					"properties": {
+						"name": {
+							"type": "string"
+						},
+						"description": {
+							"type": "string"
+						}
+					}
+				},
+				"_1": {
+					"properties": {
+						"street": {
+							"type": "string"
+						}
+					}
+				}
+			}
+		};
+
+		const actual = getCompressedContent(schema);
+		assert.deepEqual(actual, JSON.stringify(expected));
+	});
+
+	test('getCompressedContent 4', () => {
+
+		const schema: IJSONSchema = {
+			type: 'object',
+			properties: {
+				a: {
+					type: 'object',
+					properties: {
+						b: {
+							type: 'object',
+							properties: {
+								c: {
+									type: 'object',
+									properties: {
+										d: {
+											type: 'string'
+										}
+									}
+								}
+							}
+						}
+					}
+				},
+				e: {
+					type: 'object',
+					properties: {
+						b: {
+							type: 'object',
+							properties: {
+								c: {
+									type: 'object',
+									properties: {
+										d: {
+											type: 'string'
+										}
+									}
+								}
+							}
+						}
+					}
+				},
+				f: {
+					type: 'object',
+					properties: {
+						d: {
+							type: 'string'
+						}
+					}
+				}
+			}
+		};
+
+		const expected: IJSONSchema = {
+			type: 'object',
+			properties: {
+				a: {
+					$ref: '#/$defs/_0'
+				},
+				e: {
+					$ref: '#/$defs/_0'
+				},
+				f: {
+					$ref: '#/$defs/_1'
+				}
+			},
+			$defs: {
+				"_0": {
+					type: 'object',
+					properties: {
+						b: {
+							type: 'object',
+							properties: {
+								c: {
+									$ref: '#/$defs/_1'
+								}
+							}
+						}
+					}
+				},
+				"_1": {
+					type: 'object',
+					properties: {
+						d: {
+							type: 'string'
+						}
+					}
+				}
+			}
+
+		};
+
+		assert.deepEqual(getCompressedContent(schema), JSON.stringify(expected));
+	});
+
+	test('getCompressedContent 5', () => {
+
+		const schema: IJSONSchema = {
+			type: 'object',
+			properties: {
+				a: {
+					type: 'array',
+					items: {
+						type: 'object',
+						properties: {
+							c: {
+								type: 'object',
+								properties: {
+									d: {
+										type: 'string'
+									}
+								}
+							}
+						}
+					}
+				},
+				e: {
+					type: 'array',
+					items: {
+						type: 'object',
+						properties: {
+							c: {
+								type: 'object',
+								properties: {
+									d: {
+										type: 'string'
+									}
+								}
+							}
+						}
+					}
+				},
+				f: {
+					type: 'object',
+					properties: {
+						b: {
+							type: 'object',
+							properties: {
+								c: {
+									type: 'object',
+									properties: {
+										d: {
+											type: 'string'
+										}
+									}
+								}
+							}
+						}
+					}
+				},
+				g: {
+					type: 'object',
+					properties: {
+						b: {
+							type: 'object',
+							properties: {
+								c: {
+									type: 'object',
+									properties: {
+										d: {
+											type: 'string'
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		};
+
+		const expected: IJSONSchema = {
+			type: 'object',
+			properties: {
+				a: {
+					$ref: '#/$defs/_0'
+				},
+				e: {
+					$ref: '#/$defs/_0'
+				},
+				f: {
+					$ref: '#/$defs/_1'
+				},
+				g: {
+					$ref: '#/$defs/_1'
+				}
+			},
+			$defs: {
+				"_0": {
+					type: 'array',
+					items: {
+						$ref: '#/$defs/_2'
+					}
+				},
+				"_1": {
+					type: 'object',
+					properties: {
+						b: {
+							$ref: '#/$defs/_2'
+						}
+					}
+				},
+				"_2": {
+					type: 'object',
+					properties: {
+						c: {
+							type: 'object',
+							properties: {
+								d: {
+									type: 'string'
+								}
+							}
+						}
+					}
+				}
+			}
+
+		};
+
+		assert.deepEqual(getCompressedContent(schema), JSON.stringify(expected));
+	});
+
+
+});
diff --git a/src/vs/base/test/common/keyCodes.test.ts b/src/vs/base/test/common/keyCodes.test.ts
index ea539be7c62..252cf4223f6 100644
--- a/src/vs/base/test/common/keyCodes.test.ts
+++ b/src/vs/base/test/common/keyCodes.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { EVENT_KEY_CODE_MAP, IMMUTABLE_CODE_TO_KEY_CODE, IMMUTABLE_KEY_CODE_TO_CODE, KeyChord, KeyCode, KeyCodeUtils, KeyMod, NATIVE_WINDOWS_KEY_CODE_TO_KEY_CODE, ScanCode, ScanCodeUtils } from 'vs/base/common/keyCodes';
-import { decodeKeybinding, KeyCodeChord, Keybinding } from 'vs/base/common/keybindings';
-import { OperatingSystem } from 'vs/base/common/platform';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { EVENT_KEY_CODE_MAP, IMMUTABLE_CODE_TO_KEY_CODE, IMMUTABLE_KEY_CODE_TO_CODE, KeyChord, KeyCode, KeyCodeUtils, KeyMod, NATIVE_WINDOWS_KEY_CODE_TO_KEY_CODE, ScanCode, ScanCodeUtils } from '../../common/keyCodes.js';
+import { decodeKeybinding, KeyCodeChord, Keybinding } from '../../common/keybindings.js';
+import { OperatingSystem } from '../../common/platform.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('keyCodes', () => {
 
diff --git a/src/vs/base/test/common/keybindings.test.ts b/src/vs/base/test/common/keybindings.test.ts
index 5959f510cda..9386f187762 100644
--- a/src/vs/base/test/common/keybindings.test.ts
+++ b/src/vs/base/test/common/keybindings.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { KeyCode, ScanCode } from 'vs/base/common/keyCodes';
-import { KeyCodeChord, ScanCodeChord } from 'vs/base/common/keybindings';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { KeyCode, ScanCode } from '../../common/keyCodes.js';
+import { KeyCodeChord, ScanCodeChord } from '../../common/keybindings.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('keyCodes', () => {
 
diff --git a/src/vs/base/test/common/labels.test.ts b/src/vs/base/test/common/labels.test.ts
index b74f0238c16..ba893354d6d 100644
--- a/src/vs/base/test/common/labels.test.ts
+++ b/src/vs/base/test/common/labels.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import * as labels from 'vs/base/common/labels';
-import { isMacintosh, isWindows, OperatingSystem } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import * as labels from '../../common/labels.js';
+import { isMacintosh, isWindows, OperatingSystem } from '../../common/platform.js';
+import { URI } from '../../common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('Labels', () => {
 	(!isWindows ? test.skip : test)('shorten - windows', () => {
diff --git a/src/vs/base/test/common/lazy.test.ts b/src/vs/base/test/common/lazy.test.ts
index 220d0da6d10..db6b1368e32 100644
--- a/src/vs/base/test/common/lazy.test.ts
+++ b/src/vs/base/test/common/lazy.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Lazy } from 'vs/base/common/lazy';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { Lazy } from '../../common/lazy.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('Lazy', () => {
 
diff --git a/src/vs/base/test/common/lifecycle.test.ts b/src/vs/base/test/common/lifecycle.test.ts
index 23080bc8a12..fd2fa4ef562 100644
--- a/src/vs/base/test/common/lifecycle.test.ts
+++ b/src/vs/base/test/common/lifecycle.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Emitter } from 'vs/base/common/event';
-import { DisposableStore, dispose, IDisposable, markAsSingleton, ReferenceCollection, SafeDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite, throwIfDisposablesAreLeaked } from 'vs/base/test/common/utils';
+import { Emitter } from '../../common/event.js';
+import { DisposableStore, dispose, IDisposable, markAsSingleton, ReferenceCollection, SafeDisposable, toDisposable } from '../../common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite, throwIfDisposablesAreLeaked } from './utils.js';
 
 class Disposable implements IDisposable {
 	isDisposed = false;
diff --git a/src/vs/base/test/common/linkedList.test.ts b/src/vs/base/test/common/linkedList.test.ts
index 8bd3f6519a7..d811dab2cfe 100644
--- a/src/vs/base/test/common/linkedList.test.ts
+++ b/src/vs/base/test/common/linkedList.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { LinkedList } from 'vs/base/common/linkedList';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { LinkedList } from '../../common/linkedList.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('LinkedList', function () {
 
diff --git a/src/vs/base/test/common/linkedText.test.ts b/src/vs/base/test/common/linkedText.test.ts
index 63f76d082c4..f1f410bf0da 100644
--- a/src/vs/base/test/common/linkedText.test.ts
+++ b/src/vs/base/test/common/linkedText.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { parseLinkedText } from 'vs/base/common/linkedText';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { parseLinkedText } from '../../common/linkedText.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('LinkedText', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/base/test/common/map.test.ts b/src/vs/base/test/common/map.test.ts
index f837920f1f9..aa424023885 100644
--- a/src/vs/base/test/common/map.test.ts
+++ b/src/vs/base/test/common/map.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { BidirectionalMap, LinkedMap, LRUCache, mapsStrictEqualIgnoreOrder, MRUCache, ResourceMap, SetMap, Touch } from 'vs/base/common/map';
-import { extUriIgnorePathCase } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { BidirectionalMap, FourKeyMap, LinkedMap, LRUCache, mapsStrictEqualIgnoreOrder, MRUCache, ResourceMap, SetMap, ThreeKeyMap, Touch, TwoKeyMap } from '../../common/map.js';
+import { extUriIgnorePathCase } from '../../common/resources.js';
+import { URI } from '../../common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('Map', () => {
 
@@ -681,5 +681,98 @@ suite('SetMap', () => {
 		const setMap = new SetMap<string, number>();
 		assert.deepStrictEqual([...setMap.get('a')], []);
 	});
-
+});
+
+suite('TwoKeyMap', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('set and get', () => {
+		const map = new TwoKeyMap<string, string, number>();
+		map.set('a', 'b', 1);
+		map.set('a', 'c', 2);
+		map.set('b', 'c', 3);
+		assert.strictEqual(map.get('a', 'b'), 1);
+		assert.strictEqual(map.get('a', 'c'), 2);
+		assert.strictEqual(map.get('b', 'c'), 3);
+		assert.strictEqual(map.get('a', 'd'), undefined);
+	});
+
+	test('clear', () => {
+		const map = new TwoKeyMap<string, string, number>();
+		map.set('a', 'b', 1);
+		map.set('a', 'c', 2);
+		map.set('b', 'c', 3);
+		map.clear();
+		assert.strictEqual(map.get('a', 'b'), undefined);
+		assert.strictEqual(map.get('a', 'c'), undefined);
+		assert.strictEqual(map.get('b', 'c'), undefined);
+	});
+
+	test('values', () => {
+		const map = new TwoKeyMap<string, string, number>();
+		map.set('a', 'b', 1);
+		map.set('a', 'c', 2);
+		map.set('b', 'c', 3);
+		assert.deepStrictEqual(Array.from(map.values()), [1, 2, 3]);
+	});
+});
+
+suite('ThreeKeyMap', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('set and get', () => {
+		const map = new ThreeKeyMap<string, string, string, number>();
+		map.set('a', 'b', 'c', 1);
+		map.set('a', 'c', 'd', 2);
+		map.set('b', 'c', 'e', 3);
+		assert.strictEqual(map.get('a', 'b', 'c'), 1);
+		assert.strictEqual(map.get('a', 'c', 'd'), 2);
+		assert.strictEqual(map.get('b', 'c', 'e'), 3);
+		assert.strictEqual(map.get('a', 'd', 'e'), undefined);
+	});
+
+	test('clear', () => {
+		const map = new ThreeKeyMap<string, string, string, number>();
+		map.set('a', 'b', 'c', 1);
+		map.set('a', 'c', 'd', 2);
+		map.set('b', 'c', 'e', 3);
+		map.clear();
+		assert.strictEqual(map.get('a', 'b', 'c'), undefined);
+		assert.strictEqual(map.get('a', 'c', 'd'), undefined);
+		assert.strictEqual(map.get('b', 'c', 'e'), undefined);
+	});
+
+	test('values', () => {
+		const map = new ThreeKeyMap<string, string, string, number>();
+		map.set('a', 'b', 'c', 1);
+		map.set('a', 'c', 'd', 2);
+		map.set('b', 'c', 'e', 3);
+		assert.deepStrictEqual(Array.from(map.values()), [1, 2, 3]);
+	});
+});
+
+suite('FourKeyMap', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('set and get', () => {
+		const map = new FourKeyMap<string, string, string, string, number>();
+		map.set('a', 'b', 'c', 'd', 1);
+		map.set('a', 'c', 'c', 'd', 2);
+		map.set('b', 'e', 'f', 'g', 3);
+		assert.strictEqual(map.get('a', 'b', 'c', 'd'), 1);
+		assert.strictEqual(map.get('a', 'c', 'c', 'd'), 2);
+		assert.strictEqual(map.get('b', 'e', 'f', 'g'), 3);
+		assert.strictEqual(map.get('a', 'b', 'c', 'a'), undefined);
+	});
+
+	test('clear', () => {
+		const map = new FourKeyMap<string, string, string, string, number>();
+		map.set('a', 'b', 'c', 'd', 1);
+		map.set('a', 'c', 'c', 'd', 2);
+		map.set('b', 'e', 'f', 'g', 3);
+		map.clear();
+		assert.strictEqual(map.get('a', 'b', 'c', 'd'), undefined);
+		assert.strictEqual(map.get('a', 'c', 'c', 'd'), undefined);
+		assert.strictEqual(map.get('b', 'e', 'f', 'g'), undefined);
+	});
 });
diff --git a/src/vs/base/test/common/markdownString.test.ts b/src/vs/base/test/common/markdownString.test.ts
index 4c402692512..509325d07c0 100644
--- a/src/vs/base/test/common/markdownString.test.ts
+++ b/src/vs/base/test/common/markdownString.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { MarkdownString } from '../../common/htmlContent.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('MarkdownString', () => {
 
diff --git a/src/vs/base/test/common/marshalling.test.ts b/src/vs/base/test/common/marshalling.test.ts
index 94d30b5b0bf..64acee58097 100644
--- a/src/vs/base/test/common/marshalling.test.ts
+++ b/src/vs/base/test/common/marshalling.test.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { parse, stringify } from 'vs/base/common/marshalling';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { parse, stringify } from '../../common/marshalling.js';
+import { URI } from '../../common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('Marshalling', () => {
 
diff --git a/src/vs/base/test/common/mime.test.ts b/src/vs/base/test/common/mime.test.ts
index 96fa3b6209e..324ed8bf882 100644
--- a/src/vs/base/test/common/mime.test.ts
+++ b/src/vs/base/test/common/mime.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { normalizeMimeType } from 'vs/base/common/mime';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { normalizeMimeType } from '../../common/mime.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('Mime', () => {
 
diff --git a/src/vs/base/test/common/naturalLanguage/korean.test.ts b/src/vs/base/test/common/naturalLanguage/korean.test.ts
index 6543d15cb75..1f231d89d21 100644
--- a/src/vs/base/test/common/naturalLanguage/korean.test.ts
+++ b/src/vs/base/test/common/naturalLanguage/korean.test.ts
@@ -6,8 +6,8 @@
 // allow-any-unicode-file
 
 import { strictEqual } from 'assert';
-import { getKoreanAltChars } from 'vs/base/common/naturalLanguage/korean';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { getKoreanAltChars } from '../../../common/naturalLanguage/korean.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../utils.js';
 
 function getKoreanAltCharsForString(text: string): string {
 	let result = '';
diff --git a/src/vs/base/test/common/network.test.ts b/src/vs/base/test/common/network.test.ts
index d741b0e4577..8f07f381e8f 100644
--- a/src/vs/base/test/common/network.test.ts
+++ b/src/vs/base/test/common/network.test.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { FileAccess, Schemas } from 'vs/base/common/network';
-import { isWeb } from 'vs/base/common/platform';
-import { isEqual } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { FileAccess, Schemas } from '../../common/network.js';
+import { isWeb } from '../../common/platform.js';
+import { isEqual } from '../../common/resources.js';
+import { URI } from '../../common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('network', () => {
 
diff --git a/src/vs/base/test/common/normalization.test.ts b/src/vs/base/test/common/normalization.test.ts
index 58f4fe77e81..8ef33d54cc4 100644
--- a/src/vs/base/test/common/normalization.test.ts
+++ b/src/vs/base/test/common/normalization.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { removeAccents } from 'vs/base/common/normalization';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { removeAccents } from '../../common/normalization.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('Normalization', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/base/test/common/numbers.test.ts b/src/vs/base/test/common/numbers.test.ts
index 7095b7aae40..ac544e76dfb 100644
--- a/src/vs/base/test/common/numbers.test.ts
+++ b/src/vs/base/test/common/numbers.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import { isPointWithinTriangle } from 'vs/base/common/numbers';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { isPointWithinTriangle } from '../../common/numbers.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('isPointWithinTriangle', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/base/test/common/objects.test.ts b/src/vs/base/test/common/objects.test.ts
index ce600eb0181..8ba6aafcf3f 100644
--- a/src/vs/base/test/common/objects.test.ts
+++ b/src/vs/base/test/common/objects.test.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import * as objects from 'vs/base/common/objects';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import * as objects from '../../common/objects.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 const check = (one: any, other: any, msg: string) => {
 	assert(objects.equals(one, other), msg);
diff --git a/src/vs/base/test/common/observable.test.ts b/src/vs/base/test/common/observable.test.ts
index 411d4c64ea5..91d09493c15 100644
--- a/src/vs/base/test/common/observable.test.ts
+++ b/src/vs/base/test/common/observable.test.ts
@@ -4,10 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Emitter, Event } from 'vs/base/common/event';
-import { ISettableObservable, autorun, derived, ITransaction, observableFromEvent, observableValue, transaction, keepObserved, waitForState, autorunHandleChanges, observableSignal } from 'vs/base/common/observable';
-import { BaseObservable, IObservable, IObserver } from 'vs/base/common/observableInternal/base';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { setUnexpectedErrorHandler } from '../../common/errors.js';
+import { Emitter, Event } from '../../common/event.js';
+import { DisposableStore } from '../../common/lifecycle.js';
+import { autorun, autorunHandleChanges, derived, derivedDisposable, IObservable, IObserver, ISettableObservable, ITransaction, keepObserved, observableFromEvent, observableSignal, observableValue, transaction, waitForState } from '../../common/observable.js';
+import { BaseObservable } from '../../common/observableInternal/base.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('observables', () => {
 	const ds = ensureNoDisposablesAreLeakedInTestSuite();
@@ -1123,6 +1125,31 @@ suite('observables', () => {
 		]);
 	});
 
+	test('bug: Event.fromObservable always should get events', () => {
+		const emitter = new Emitter();
+		const log = new Log();
+		let i = 0;
+		const obs = observableFromEvent(emitter.event, () => i);
+
+		i++;
+		emitter.fire(1);
+
+		const evt2 = Event.fromObservable(obs);
+		const d = evt2(e => {
+			log.log(`event fired ${e}`);
+		});
+
+		i++;
+		emitter.fire(2);
+		assert.deepStrictEqual(log.getAndClearEntries(), ["event fired 2"]);
+
+		i++;
+		emitter.fire(3);
+		assert.deepStrictEqual(log.getAndClearEntries(), ["event fired 3"]);
+
+		d.dispose();
+	});
+
 	test('dont run autorun after dispose', () => {
 		const log = new Log();
 		const myObservable = new LoggingObservableValue('myObservable', 0, log);
@@ -1236,6 +1263,35 @@ suite('observables', () => {
 				'rejected {\"state\":\"error\"}'
 			]);
 		});
+
+		test('derived as lazy', () => {
+			const store = new DisposableStore();
+			const log = new Log();
+			let i = 0;
+			const d = derivedDisposable(() => {
+				const id = i++;
+				log.log('myDerived ' + id);
+				return {
+					dispose: () => log.log(`disposed ${id}`)
+				};
+			});
+
+			d.get();
+			assert.deepStrictEqual(log.getAndClearEntries(), ['myDerived 0', 'disposed 0']);
+			d.get();
+			assert.deepStrictEqual(log.getAndClearEntries(), ['myDerived 1', 'disposed 1']);
+
+			d.keepObserved(store);
+			assert.deepStrictEqual(log.getAndClearEntries(), []);
+			d.get();
+			assert.deepStrictEqual(log.getAndClearEntries(), ['myDerived 2']);
+			d.get();
+			assert.deepStrictEqual(log.getAndClearEntries(), []);
+
+			store.dispose();
+
+			assert.deepStrictEqual(log.getAndClearEntries(), ['disposed 2']);
+		});
 	});
 
 	test('observableValue', () => {
@@ -1269,6 +1325,79 @@ suite('observables', () => {
 
 		d.dispose();
 	});
+
+	suite('autorun error handling', () => {
+		test('immediate throw', () => {
+			const log = new Log();
+
+			setUnexpectedErrorHandler(e => {
+				log.log(`error: ${e.message}`);
+			});
+
+			const myObservable = new LoggingObservableValue('myObservable', 0, log);
+
+			const d = autorun(reader => {
+				myObservable.read(reader);
+				throw new Error('foobar');
+			});
+
+			assert.deepStrictEqual(log.getAndClearEntries(), [
+				"myObservable.firstObserverAdded",
+				"myObservable.get",
+				"error: foobar"
+			]);
+
+			myObservable.set(1, undefined);
+
+			assert.deepStrictEqual(log.getAndClearEntries(), [
+				"myObservable.set (value 1)",
+				"myObservable.get",
+				"error: foobar",
+			]);
+
+			d.dispose();
+		});
+
+		test('late throw', () => {
+			const log = new Log();
+
+			setUnexpectedErrorHandler(e => {
+				log.log(`error: ${e.message}`);
+			});
+
+			const myObservable = new LoggingObservableValue('myObservable', 0, log);
+
+			const d = autorun(reader => {
+				const value = myObservable.read(reader);
+				if (value >= 1) {
+					throw new Error('foobar');
+				}
+			});
+
+			assert.deepStrictEqual(log.getAndClearEntries(), [
+				"myObservable.firstObserverAdded",
+				"myObservable.get",
+			]);
+
+			myObservable.set(1, undefined);
+
+			assert.deepStrictEqual(log.getAndClearEntries(), [
+				"myObservable.set (value 1)",
+				"myObservable.get",
+				"error: foobar",
+			]);
+
+			myObservable.set(2, undefined);
+
+			assert.deepStrictEqual(log.getAndClearEntries(), [
+				"myObservable.set (value 2)",
+				"myObservable.get",
+				"error: foobar",
+			]);
+
+			d.dispose();
+		});
+	});
 });
 
 export class LoggingObserver implements IObserver {
diff --git a/src/vs/base/test/common/paging.test.ts b/src/vs/base/test/common/paging.test.ts
index 772083f3613..aa35ec6e3d9 100644
--- a/src/vs/base/test/common/paging.test.ts
+++ b/src/vs/base/test/common/paging.test.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { disposableTimeout } from 'vs/base/common/async';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { CancellationError, isCancellationError } from 'vs/base/common/errors';
-import { IPager, PagedModel } from 'vs/base/common/paging';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { disposableTimeout } from '../../common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../common/cancellation.js';
+import { CancellationError, isCancellationError } from '../../common/errors.js';
+import { IPager, PagedModel } from '../../common/paging.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 function getPage(pageIndex: number, cancellationToken: CancellationToken): Promise<number[]> {
 	if (cancellationToken.isCancellationRequested) {
diff --git a/src/vs/base/test/common/path.test.ts b/src/vs/base/test/common/path.test.ts
index f42abd1fed3..5d4974d1d84 100644
--- a/src/vs/base/test/common/path.test.ts
+++ b/src/vs/base/test/common/path.test.ts
@@ -28,10 +28,10 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 import assert from 'assert';
-import * as path from 'vs/base/common/path';
-import { isWeb, isWindows } from 'vs/base/common/platform';
-import * as process from 'vs/base/common/process';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import * as path from '../../common/path.js';
+import { isWeb, isWindows } from '../../common/platform.js';
+import * as process from '../../common/process.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('Paths (Node Implementation)', () => {
 	const __filename = 'path.test.js';
diff --git a/src/vs/base/test/common/prefixTree.test.ts b/src/vs/base/test/common/prefixTree.test.ts
index 10b77d96bbc..067c8bc3d77 100644
--- a/src/vs/base/test/common/prefixTree.test.ts
+++ b/src/vs/base/test/common/prefixTree.test.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { WellDefinedPrefixTree } from 'vs/base/common/prefixTree';
+import { WellDefinedPrefixTree } from '../../common/prefixTree.js';
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('WellDefinedPrefixTree', () => {
 	let tree: WellDefinedPrefixTree<number>;
diff --git a/src/vs/base/test/common/processes.test.ts b/src/vs/base/test/common/processes.test.ts
index 6c0d88e62bb..b53c46da7dc 100644
--- a/src/vs/base/test/common/processes.test.ts
+++ b/src/vs/base/test/common/processes.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import * as processes from 'vs/base/common/processes';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import * as processes from '../../common/processes.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('Processes', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/base/test/common/resourceTree.test.ts b/src/vs/base/test/common/resourceTree.test.ts
index 51fba68f764..edff7b7ac6e 100644
--- a/src/vs/base/test/common/resourceTree.test.ts
+++ b/src/vs/base/test/common/resourceTree.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ResourceTree } from 'vs/base/common/resourceTree';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { ResourceTree } from '../../common/resourceTree.js';
+import { URI } from '../../common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('ResourceTree', function () {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/base/test/common/resources.test.ts b/src/vs/base/test/common/resources.test.ts
index d2315644376..deed570761b 100644
--- a/src/vs/base/test/common/resources.test.ts
+++ b/src/vs/base/test/common/resources.test.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { toSlashes } from 'vs/base/common/extpath';
-import { posix, win32 } from 'vs/base/common/path';
-import { isWindows } from 'vs/base/common/platform';
-import { addTrailingPathSeparator, basename, dirname, distinctParents, extUri, extUriIgnorePathCase, hasTrailingPathSeparator, isAbsolutePath, joinPath, normalizePath, relativePath, removeTrailingPathSeparator, resolvePath } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { toSlashes } from '../../common/extpath.js';
+import { posix, win32 } from '../../common/path.js';
+import { isWindows } from '../../common/platform.js';
+import { addTrailingPathSeparator, basename, dirname, distinctParents, extUri, extUriIgnorePathCase, hasTrailingPathSeparator, isAbsolutePath, joinPath, normalizePath, relativePath, removeTrailingPathSeparator, resolvePath } from '../../common/resources.js';
+import { URI } from '../../common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 
 suite('Resources', () => {
diff --git a/src/vs/base/test/common/scrollable.test.ts b/src/vs/base/test/common/scrollable.test.ts
index 41a33727b6e..5698af536f1 100644
--- a/src/vs/base/test/common/scrollable.test.ts
+++ b/src/vs/base/test/common/scrollable.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { SmoothScrollingOperation, SmoothScrollingUpdate } from 'vs/base/common/scrollable';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { SmoothScrollingOperation, SmoothScrollingUpdate } from '../../common/scrollable.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 class TestSmoothScrollingOperation extends SmoothScrollingOperation {
 
diff --git a/src/vs/base/test/common/skipList.test.ts b/src/vs/base/test/common/skipList.test.ts
index 096bd6a268f..d827e70c087 100644
--- a/src/vs/base/test/common/skipList.test.ts
+++ b/src/vs/base/test/common/skipList.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { binarySearch } from 'vs/base/common/arrays';
-import { SkipList } from 'vs/base/common/skipList';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { binarySearch } from '../../common/arrays.js';
+import { SkipList } from '../../common/skipList.js';
+import { StopWatch } from '../../common/stopwatch.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 
 suite('SkipList', function () {
diff --git a/src/vs/base/test/common/snapshot.ts b/src/vs/base/test/common/snapshot.ts
index 2cf2667679e..5aea30b4296 100644
--- a/src/vs/base/test/common/snapshot.ts
+++ b/src/vs/base/test/common/snapshot.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Lazy } from 'vs/base/common/lazy';
-import { FileAccess } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
+import { Lazy } from '../../common/lazy.js';
+import { FileAccess } from '../../common/network.js';
+import { URI } from '../../common/uri.js';
 
 declare const __readFileInTests: (path: string) => Promise<string>;
 declare const __writeFileInTests: (path: string, contents: string) => Promise<void>;
diff --git a/src/vs/base/test/common/stream.test.ts b/src/vs/base/test/common/stream.test.ts
index a8473f0ff8f..b25769c2415 100644
--- a/src/vs/base/test/common/stream.test.ts
+++ b/src/vs/base/test/common/stream.test.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { timeout } from 'vs/base/common/async';
-import { bufferToReadable, VSBuffer } from 'vs/base/common/buffer';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { consumeReadable, consumeStream, isReadable, isReadableBufferedStream, isReadableStream, listenStream, newWriteableStream, peekReadable, peekStream, prefixedReadable, prefixedStream, Readable, ReadableStream, toReadable, toStream, transform } from 'vs/base/common/stream';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { timeout } from '../../common/async.js';
+import { bufferToReadable, VSBuffer } from '../../common/buffer.js';
+import { CancellationTokenSource } from '../../common/cancellation.js';
+import { consumeReadable, consumeStream, isReadable, isReadableBufferedStream, isReadableStream, listenStream, newWriteableStream, peekReadable, peekStream, prefixedReadable, prefixedStream, Readable, ReadableStream, toReadable, toStream, transform } from '../../common/stream.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('Stream', () => {
 
diff --git a/src/vs/base/test/common/strings.test.ts b/src/vs/base/test/common/strings.test.ts
index b84a193eba1..b075808571e 100644
--- a/src/vs/base/test/common/strings.test.ts
+++ b/src/vs/base/test/common/strings.test.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import * as strings from 'vs/base/common/strings';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import * as strings from '../../common/strings.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('Strings', () => {
 	test('equalsIgnoreCase', () => {
diff --git a/src/vs/base/test/common/ternarySearchtree.test.ts b/src/vs/base/test/common/ternarySearchtree.test.ts
index 1e684933d46..dcb2771d27e 100644
--- a/src/vs/base/test/common/ternarySearchtree.test.ts
+++ b/src/vs/base/test/common/ternarySearchtree.test.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { shuffle } from 'vs/base/common/arrays';
-import { randomPath } from 'vs/base/common/extpath';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { ConfigKeysIterator, PathIterator, StringIterator, TernarySearchTree, UriIterator } from 'vs/base/common/ternarySearchTree';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { shuffle } from '../../common/arrays.js';
+import { randomPath } from '../../common/extpath.js';
+import { StopWatch } from '../../common/stopwatch.js';
+import { ConfigKeysIterator, PathIterator, StringIterator, TernarySearchTree, UriIterator } from '../../common/ternarySearchTree.js';
+import { URI } from '../../common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('Ternary Search Tree', () => {
 
diff --git a/src/vs/base/test/common/tfIdf.test.ts b/src/vs/base/test/common/tfIdf.test.ts
index df5e37da270..4121fc3f113 100644
--- a/src/vs/base/test/common/tfIdf.test.ts
+++ b/src/vs/base/test/common/tfIdf.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { TfIdfCalculator, TfIdfDocument, TfIdfScore } from 'vs/base/common/tfIdf';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { CancellationToken } from '../../common/cancellation.js';
+import { TfIdfCalculator, TfIdfDocument, TfIdfScore } from '../../common/tfIdf.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 /**
  * Generates all permutations of an array.
diff --git a/src/vs/base/test/common/timeTravelScheduler.ts b/src/vs/base/test/common/timeTravelScheduler.ts
index 6209c9a4212..37927cb258e 100644
--- a/src/vs/base/test/common/timeTravelScheduler.ts
+++ b/src/vs/base/test/common/timeTravelScheduler.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { compareBy, numberComparator, tieBreakComparators } from 'vs/base/common/arrays';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { setTimeout0, setTimeout0IsFaster } from 'vs/base/common/platform';
+import { compareBy, numberComparator, tieBreakComparators } from '../../common/arrays.js';
+import { Emitter, Event } from '../../common/event.js';
+import { Disposable, IDisposable } from '../../common/lifecycle.js';
+import { setTimeout0, setTimeout0IsFaster } from '../../common/platform.js';
 
 export type TimeOffset = number;
 
diff --git a/src/vs/base/test/common/troubleshooting.ts b/src/vs/base/test/common/troubleshooting.ts
index 0a728e8405c..f794f7e2033 100644
--- a/src/vs/base/test/common/troubleshooting.ts
+++ b/src/vs/base/test/common/troubleshooting.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable, IDisposableTracker, setDisposableTracker } from 'vs/base/common/lifecycle';
+import { IDisposable, IDisposableTracker, setDisposableTracker } from '../../common/lifecycle.js';
 
 class DisposableTracker implements IDisposableTracker {
 	allDisposables: [IDisposable, string][] = [];
diff --git a/src/vs/base/test/common/types.test.ts b/src/vs/base/test/common/types.test.ts
index f9b894fb73a..8f6eba0d0f3 100644
--- a/src/vs/base/test/common/types.test.ts
+++ b/src/vs/base/test/common/types.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import * as types from 'vs/base/common/types';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import * as types from '../../common/types.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('Types', () => {
 
diff --git a/src/vs/base/test/common/uri.test.ts b/src/vs/base/test/common/uri.test.ts
index fa65209a568..8e4239460d1 100644
--- a/src/vs/base/test/common/uri.test.ts
+++ b/src/vs/base/test/common/uri.test.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { isWindows } from 'vs/base/common/platform';
-import { URI, UriComponents, isUriComponents } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { isWindows } from '../../common/platform.js';
+import { URI, UriComponents, isUriComponents } from '../../common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 
 suite('URI', () => {
diff --git a/src/vs/base/test/common/utils.ts b/src/vs/base/test/common/utils.ts
index 36c6873073f..d07c2a595a6 100644
--- a/src/vs/base/test/common/utils.ts
+++ b/src/vs/base/test/common/utils.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DisposableStore, DisposableTracker, IDisposable, setDisposableTracker } from 'vs/base/common/lifecycle';
-import { join } from 'vs/base/common/path';
-import { isWindows } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
+import { DisposableStore, DisposableTracker, IDisposable, setDisposableTracker } from '../../common/lifecycle.js';
+import { join } from '../../common/path.js';
+import { isWindows } from '../../common/platform.js';
+import { URI } from '../../common/uri.js';
 
 export type ValueCallback<T = any> = (value: T | Promise<T>) => void;
 
diff --git a/src/vs/base/test/common/uuid.test.ts b/src/vs/base/test/common/uuid.test.ts
index 1cfbf5c12e8..d1787f2d028 100644
--- a/src/vs/base/test/common/uuid.test.ts
+++ b/src/vs/base/test/common/uuid.test.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import * as uuid from 'vs/base/common/uuid';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import * as uuid from '../../common/uuid.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('UUID', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/base/test/node/crypto.test.ts b/src/vs/base/test/node/crypto.test.ts
index ff929aaa21c..ed66c2c4b0d 100644
--- a/src/vs/base/test/node/crypto.test.ts
+++ b/src/vs/base/test/node/crypto.test.ts
@@ -3,12 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as fs from 'fs';
 import { tmpdir } from 'os';
-import { join } from 'vs/base/common/path';
-import { checksum } from 'vs/base/node/crypto';
-import { Promises } from 'vs/base/node/pfs';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { flakySuite, getRandomTestPath } from 'vs/base/test/node/testUtils';
+import { join } from '../../common/path.js';
+import { checksum } from '../../node/crypto.js';
+import { Promises } from '../../node/pfs.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../common/utils.js';
+import { flakySuite, getRandomTestPath } from './testUtils.js';
 
 flakySuite('Crypto', () => {
 
@@ -19,7 +20,7 @@ flakySuite('Crypto', () => {
 	setup(function () {
 		testDir = getRandomTestPath(tmpdir(), 'vsctests', 'crypto');
 
-		return Promises.mkdir(testDir, { recursive: true });
+		return fs.promises.mkdir(testDir, { recursive: true });
 	});
 
 	teardown(function () {
diff --git a/src/vs/base/test/node/css.build.test.ts b/src/vs/base/test/node/css.build.test.ts
index 4f824b375d9..f292b78b814 100644
--- a/src/vs/base/test/node/css.build.test.ts
+++ b/src/vs/base/test/node/css.build.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { CSSPluginUtilities, rewriteUrls } from 'vs/css.build';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../common/utils.js';
+import { CSSPluginUtilities, rewriteUrls } from '../../../css.build.js';
 
 suite('CSSPlugin', () => {
 
diff --git a/src/vs/base/test/node/extpath.test.ts b/src/vs/base/test/node/extpath.test.ts
index b7d78dbee46..9dbdf1ac87e 100644
--- a/src/vs/base/test/node/extpath.test.ts
+++ b/src/vs/base/test/node/extpath.test.ts
@@ -3,12 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as fs from 'fs';
 import assert from 'assert';
 import { tmpdir } from 'os';
-import { realcase, realcaseSync, realpath, realpathSync } from 'vs/base/node/extpath';
-import { Promises } from 'vs/base/node/pfs';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { flakySuite, getRandomTestPath } from 'vs/base/test/node/testUtils';
+import { realcase, realcaseSync, realpath, realpathSync } from '../../node/extpath.js';
+import { Promises } from '../../node/pfs.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../common/utils.js';
+import { flakySuite, getRandomTestPath } from './testUtils.js';
 
 flakySuite('Extpath', () => {
 	let testDir: string;
@@ -16,7 +17,7 @@ flakySuite('Extpath', () => {
 	setup(() => {
 		testDir = getRandomTestPath(tmpdir(), 'vsctests', 'extpath');
 
-		return Promises.mkdir(testDir, { recursive: true });
+		return fs.promises.mkdir(testDir, { recursive: true });
 	});
 
 	teardown(() => {
diff --git a/src/vs/base/test/node/id.test.ts b/src/vs/base/test/node/id.test.ts
index 259b2312c1d..9c862cb324d 100644
--- a/src/vs/base/test/node/id.test.ts
+++ b/src/vs/base/test/node/id.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { getMachineId, getSqmMachineId, getdevDeviceId } from 'vs/base/node/id';
-import { getMac } from 'vs/base/node/macAddress';
-import { flakySuite } from 'vs/base/test/node/testUtils';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { getMachineId, getSqmMachineId, getdevDeviceId } from '../../node/id.js';
+import { getMac } from '../../node/macAddress.js';
+import { flakySuite } from './testUtils.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../common/utils.js';
 
 flakySuite('ID', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/base/test/node/nodeStreams.test.ts b/src/vs/base/test/node/nodeStreams.test.ts
index 44e7dd9154d..6b21cc10141 100644
--- a/src/vs/base/test/node/nodeStreams.test.ts
+++ b/src/vs/base/test/node/nodeStreams.test.ts
@@ -6,8 +6,8 @@
 
 import { Writable } from 'stream';
 import assert from 'assert';
-import { StreamSplitter } from 'vs/base/node/nodeStreams';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { StreamSplitter } from '../../node/nodeStreams.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../common/utils.js';
 
 suite('StreamSplitter', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/base/test/node/pfs/pfs.test.ts b/src/vs/base/test/node/pfs/pfs.test.ts
index 8fec28d2bfc..1cc0b17f24d 100644
--- a/src/vs/base/test/node/pfs/pfs.test.ts
+++ b/src/vs/base/test/node/pfs/pfs.test.ts
@@ -6,15 +6,15 @@
 import assert from 'assert';
 import * as fs from 'fs';
 import { tmpdir } from 'os';
-import { timeout } from 'vs/base/common/async';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { randomPath } from 'vs/base/common/extpath';
-import { FileAccess } from 'vs/base/common/network';
-import { basename, dirname, join, sep } from 'vs/base/common/path';
-import { isWindows } from 'vs/base/common/platform';
-import { configureFlushOnWrite, Promises, RimRafMode, rimrafSync, SymlinkSupport, writeFileSync } from 'vs/base/node/pfs';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { flakySuite, getRandomTestPath } from 'vs/base/test/node/testUtils';
+import { timeout } from '../../../common/async.js';
+import { VSBuffer } from '../../../common/buffer.js';
+import { randomPath } from '../../../common/extpath.js';
+import { FileAccess } from '../../../common/network.js';
+import { basename, dirname, join, sep } from '../../../common/path.js';
+import { isWindows } from '../../../common/platform.js';
+import { configureFlushOnWrite, Promises, RimRafMode, rimrafSync, SymlinkSupport, writeFileSync } from '../../../node/pfs.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../common/utils.js';
+import { flakySuite, getRandomTestPath } from '../testUtils.js';
 
 configureFlushOnWrite(false); // speed up all unit tests by disabling flush on write
 
@@ -25,7 +25,7 @@ flakySuite('PFS', function () {
 	setup(() => {
 		testDir = getRandomTestPath(tmpdir(), 'vsctests', 'pfs');
 
-		return Promises.mkdir(testDir, { recursive: true });
+		return fs.promises.mkdir(testDir, { recursive: true });
 	});
 
 	teardown(() => {
@@ -39,7 +39,7 @@ flakySuite('PFS', function () {
 
 		await Promises.writeFile(testFile, 'Hello World', (null!));
 
-		assert.strictEqual((await Promises.readFile(testFile)).toString(), 'Hello World');
+		assert.strictEqual((await fs.promises.readFile(testFile)).toString(), 'Hello World');
 	});
 
 	test('writeFile - parallel write on different files works', async () => {
@@ -241,7 +241,7 @@ flakySuite('PFS', function () {
 		const symLink = randomPath(testDir);
 		const copyTarget = randomPath(testDir);
 
-		await Promises.mkdir(symbolicLinkTarget, { recursive: true });
+		await fs.promises.mkdir(symbolicLinkTarget, { recursive: true });
 
 		fs.symlinkSync(symbolicLinkTarget, symLink, 'junction');
 
@@ -258,7 +258,7 @@ flakySuite('PFS', function () {
 			assert.ok(symbolicLink);
 			assert.ok(!symbolicLink.dangling);
 
-			const target = await Promises.readlink(copyTarget);
+			const target = await fs.promises.readlink(copyTarget);
 			assert.strictEqual(target, symbolicLinkTarget);
 
 			// Copy does not preserve symlinks if configured as such
@@ -294,7 +294,7 @@ flakySuite('PFS', function () {
 		const sourceLinkTestFolder = join(sourceFolder, 'link-test');		// copy-test/link-test
 		const sourceLinkMD5JSFolder = join(sourceLinkTestFolder, 'md5');	// copy-test/link-test/md5
 		const sourceLinkMD5JSFile = join(sourceLinkMD5JSFolder, 'md5.js');	// copy-test/link-test/md5/md5.js
-		await Promises.mkdir(sourceLinkMD5JSFolder, { recursive: true });
+		await fs.promises.mkdir(sourceLinkMD5JSFolder, { recursive: true });
 		await Promises.writeFile(sourceLinkMD5JSFile, 'Hello from MD5');
 
 		const sourceLinkMD5JSFolderLinked = join(sourceLinkTestFolder, 'md5-linked');	// copy-test/link-test/md5-linked
@@ -319,7 +319,7 @@ flakySuite('PFS', function () {
 			assert.ok(fs.existsSync(targetLinkMD5JSFolderLinked));
 			assert.ok(fs.lstatSync(targetLinkMD5JSFolderLinked).isSymbolicLink());
 
-			const linkTarget = await Promises.readlink(targetLinkMD5JSFolderLinked);
+			const linkTarget = await fs.promises.readlink(targetLinkMD5JSFolderLinked);
 			assert.strictEqual(linkTarget, targetLinkMD5JSFolder);
 
 			await Promises.rm(targetLinkTestFolder);
@@ -353,7 +353,7 @@ flakySuite('PFS', function () {
 		const directory = randomPath(testDir);
 		const symbolicLink = randomPath(testDir);
 
-		await Promises.mkdir(directory, { recursive: true });
+		await fs.promises.mkdir(directory, { recursive: true });
 
 		fs.symlinkSync(directory, symbolicLink, 'junction');
 
@@ -369,7 +369,7 @@ flakySuite('PFS', function () {
 		const directory = randomPath(testDir);
 		const symbolicLink = randomPath(testDir);
 
-		await Promises.mkdir(directory, { recursive: true });
+		await fs.promises.mkdir(directory, { recursive: true });
 
 		fs.symlinkSync(directory, symbolicLink, 'junction');
 
@@ -385,7 +385,7 @@ flakySuite('PFS', function () {
 			const parent = randomPath(join(testDir, 'pfs'));
 			const newDir = join(parent, 'öäü');
 
-			await Promises.mkdir(newDir, { recursive: true });
+			await fs.promises.mkdir(newDir, { recursive: true });
 
 			assert.ok(fs.existsSync(newDir));
 
@@ -397,7 +397,7 @@ flakySuite('PFS', function () {
 	test('readdir (with file types)', async () => {
 		if (typeof process.versions['electron'] !== 'undefined' /* needs electron */) {
 			const newDir = join(testDir, 'öäü');
-			await Promises.mkdir(newDir, { recursive: true });
+			await fs.promises.mkdir(newDir, { recursive: true });
 
 			await Promises.writeFile(join(testDir, 'somefile.txt'), 'contents');
 
diff --git a/src/vs/base/test/node/port.test.ts b/src/vs/base/test/node/port.test.ts
index 048cfc69bd1..92473add570 100644
--- a/src/vs/base/test/node/port.test.ts
+++ b/src/vs/base/test/node/port.test.ts
@@ -5,9 +5,9 @@
 
 import assert from 'assert';
 import * as net from 'net';
-import * as ports from 'vs/base/node/ports';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { flakySuite } from 'vs/base/test/node/testUtils';
+import * as ports from '../../node/ports.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../common/utils.js';
+import { flakySuite } from './testUtils.js';
 
 flakySuite('Ports', () => {
 	(process.env['VSCODE_PID'] ? test.skip /* this test fails when run from within VS Code */ : test)('Finds a free port (no timeout)', function (done) {
diff --git a/src/vs/base/test/node/powershell.test.ts b/src/vs/base/test/node/powershell.test.ts
index de9b669c769..54cc3134c59 100644
--- a/src/vs/base/test/node/powershell.test.ts
+++ b/src/vs/base/test/node/powershell.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
 import * as fs from 'fs';
-import * as platform from 'vs/base/common/platform';
-import { enumeratePowerShellInstallations, getFirstAvailablePowerShellInstallation, IPowerShellExeDetails } from 'vs/base/node/powershell';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import * as platform from '../../common/platform.js';
+import { enumeratePowerShellInstallations, getFirstAvailablePowerShellInstallation, IPowerShellExeDetails } from '../../node/powershell.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../common/utils.js';
 
 function checkPath(exePath: string) {
 	// Check to see if the path exists
diff --git a/src/vs/base/test/node/processes/fixtures/fork.ts b/src/vs/base/test/node/processes/fixtures/fork.ts
index b6699469acb..d073df1ad94 100644
--- a/src/vs/base/test/node/processes/fixtures/fork.ts
+++ b/src/vs/base/test/node/processes/fixtures/fork.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as processes from 'vs/base/node/processes';
+import * as processes from '../../../../node/processes.js';
 
 const sender = processes.createQueuedSender(<any>process);
 
diff --git a/src/vs/base/test/node/processes/fixtures/fork_large.ts b/src/vs/base/test/node/processes/fixtures/fork_large.ts
index c0b7cf8a668..98dbae1ac19 100644
--- a/src/vs/base/test/node/processes/fixtures/fork_large.ts
+++ b/src/vs/base/test/node/processes/fixtures/fork_large.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as processes from 'vs/base/node/processes';
+import * as processes from '../../../../node/processes.js';
 
 const sender = processes.createQueuedSender(<any>process);
 
diff --git a/src/vs/base/test/node/processes/processes.integrationTest.ts b/src/vs/base/test/node/processes/processes.integrationTest.ts
index f8e827a8594..3f30e931271 100644
--- a/src/vs/base/test/node/processes/processes.integrationTest.ts
+++ b/src/vs/base/test/node/processes/processes.integrationTest.ts
@@ -5,15 +5,15 @@
 
 import assert from 'assert';
 import * as cp from 'child_process';
-import { FileAccess } from 'vs/base/common/network';
-import * as objects from 'vs/base/common/objects';
-import * as platform from 'vs/base/common/platform';
-import * as processes from 'vs/base/node/processes';
+import { FileAccess } from '../../../common/network.js';
+import * as objects from '../../../common/objects.js';
+import * as platform from '../../../common/platform.js';
+import * as processes from '../../../node/processes.js';
 
 function fork(id: string): cp.ChildProcess {
 	const opts: any = {
 		env: objects.mixin(objects.deepClone(process.env), {
-			VSCODE_AMD_ENTRYPOINT: id,
+			VSCODE_ESM_ENTRYPOINT: id,
 			VSCODE_PIPE_LOGGING: 'true',
 			VSCODE_VERBOSE_LOGGING: true
 		})
diff --git a/src/vs/base/test/node/snapshot.test.ts b/src/vs/base/test/node/snapshot.test.ts
index 48621bed95f..bd208530c8c 100644
--- a/src/vs/base/test/node/snapshot.test.ts
+++ b/src/vs/base/test/node/snapshot.test.ts
@@ -3,13 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as fs from 'fs';
 import { tmpdir } from 'os';
-import { getRandomTestPath } from 'vs/base/test/node/testUtils';
-import { Promises } from 'vs/base/node/pfs';
-import { SnapshotContext, assertSnapshot } from 'vs/base/test/common/snapshot';
-import { URI } from 'vs/base/common/uri';
+import { getRandomTestPath } from './testUtils.js';
+import { Promises } from '../../node/pfs.js';
+import { SnapshotContext, assertSnapshot } from '../common/snapshot.js';
+import { URI } from '../../common/uri.js';
 import * as path from 'path';
-import { assertThrowsAsync, ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { assertThrowsAsync, ensureNoDisposablesAreLeakedInTestSuite } from '../common/utils.js';
 
 // tests for snapshot are in Node so that we can use native FS operations to
 // set up and validate things.
@@ -23,7 +24,7 @@ suite('snapshot', () => {
 
 	setup(function () {
 		testDir = getRandomTestPath(tmpdir(), 'vsctests', 'snapshot');
-		return Promises.mkdir(testDir, { recursive: true });
+		return fs.promises.mkdir(testDir, { recursive: true });
 	});
 
 	teardown(function () {
@@ -46,8 +47,8 @@ suite('snapshot', () => {
 			const children = await Promises.readdir(dir);
 			for (const child of children) {
 				const p = path.join(dir, child);
-				if ((await Promises.stat(p)).isFile()) {
-					const content = await Promises.readFile(p, 'utf-8');
+				if ((await fs.promises.stat(p)).isFile()) {
+					const content = await fs.promises.readFile(p, 'utf-8');
 					str += `${' '.repeat(indent)}${child}:\n`;
 					for (const line of content.split('\n')) {
 						str += `${' '.repeat(indent + 2)}${line}\n`;
diff --git a/src/vs/base/test/node/testUtils.ts b/src/vs/base/test/node/testUtils.ts
index 067a9a07b5b..44c7c9551bd 100644
--- a/src/vs/base/test/node/testUtils.ts
+++ b/src/vs/base/test/node/testUtils.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { randomPath } from 'vs/base/common/extpath';
-import { join } from 'vs/base/common/path';
-import * as testUtils from 'vs/base/test/common/testUtils';
+import { randomPath } from '../../common/extpath.js';
+import { join } from '../../common/path.js';
+import * as testUtils from '../common/testUtils.js';
 
 export function getRandomTestPath(tmpdir: string, ...segments: string[]): string {
 	return randomPath(join(tmpdir, ...segments));
diff --git a/src/vs/base/test/node/unc.test.ts b/src/vs/base/test/node/unc.test.ts
index acbc3203536..ba779906756 100644
--- a/src/vs/base/test/node/unc.test.ts
+++ b/src/vs/base/test/node/unc.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { strictEqual } from 'assert';
-import { getUNCHost } from 'vs/base/node/unc';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { getUNCHost } from '../../node/unc.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../common/utils.js';
 
 suite('UNC', () => {
 
diff --git a/src/vs/base/test/node/uri.perf.test.ts b/src/vs/base/test/node/uri.perf.test.ts
index cd045f15d0b..ac819fae4ca 100644
--- a/src/vs/base/test/node/uri.perf.test.ts
+++ b/src/vs/base/test/node/uri.perf.test.ts
@@ -5,9 +5,9 @@
 
 import assert from 'assert';
 import { readFileSync } from 'fs';
-import { FileAccess } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { FileAccess } from '../../common/network.js';
+import { URI } from '../../common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../common/utils.js';
 
 suite('URI - perf', function () {
 
diff --git a/src/vs/base/test/node/zip/zip.test.ts b/src/vs/base/test/node/zip/zip.test.ts
index bde3eaf7482..c8cb44088c5 100644
--- a/src/vs/base/test/node/zip/zip.test.ts
+++ b/src/vs/base/test/node/zip/zip.test.ts
@@ -3,15 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as fs from 'fs';
 import assert from 'assert';
 import { tmpdir } from 'os';
-import { createCancelablePromise } from 'vs/base/common/async';
-import { FileAccess } from 'vs/base/common/network';
-import * as path from 'vs/base/common/path';
-import { Promises } from 'vs/base/node/pfs';
-import { extract } from 'vs/base/node/zip';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { getRandomTestPath } from 'vs/base/test/node/testUtils';
+import { createCancelablePromise } from '../../../common/async.js';
+import { FileAccess } from '../../../common/network.js';
+import * as path from '../../../common/path.js';
+import { Promises } from '../../../node/pfs.js';
+import { extract } from '../../../node/zip.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../common/utils.js';
+import { getRandomTestPath } from '../testUtils.js';
 
 suite('Zip', () => {
 
@@ -19,7 +20,7 @@ suite('Zip', () => {
 
 	test('extract should handle directories', async () => {
 		const testDir = getRandomTestPath(tmpdir(), 'vsctests', 'zip');
-		await Promises.mkdir(testDir, { recursive: true });
+		await fs.promises.mkdir(testDir, { recursive: true });
 
 		const fixtures = FileAccess.asFileUri('vs/base/test/node/zip/fixtures').fsPath;
 		const fixture = path.join(fixtures, 'extract.zip');
diff --git a/src/vs/base/worker/workerMain.ts b/src/vs/base/worker/workerMain.ts
index 35c685ff771..a094636cc84 100644
--- a/src/vs/base/worker/workerMain.ts
+++ b/src/vs/base/worker/workerMain.ts
@@ -5,136 +5,31 @@
 
 (function () {
 
-	interface IMonacoEnvironment {
-		baseUrl?: string;
-		createTrustedTypesPolicy<Options extends TrustedTypePolicyOptions>(
-			policyName: string,
-			policyOptions?: Options,
-		): undefined | Pick<TrustedTypePolicy<Options>, 'name' | Extract<keyof Options, keyof TrustedTypePolicyOptions>>;
-	}
-	const monacoEnvironment: IMonacoEnvironment | undefined = (globalThis as any).MonacoEnvironment;
-	const monacoBaseUrl = monacoEnvironment && monacoEnvironment.baseUrl ? monacoEnvironment.baseUrl : '../../../';
-
-	function createTrustedTypesPolicy<Options extends TrustedTypePolicyOptions>(
-		policyName: string,
-		policyOptions?: Options,
-	): undefined | Pick<TrustedTypePolicy<Options>, 'name' | Extract<keyof Options, keyof TrustedTypePolicyOptions>> {
-
-		if (monacoEnvironment?.createTrustedTypesPolicy) {
-			try {
-				return monacoEnvironment.createTrustedTypesPolicy(policyName, policyOptions);
-			} catch (err) {
-				console.warn(err);
-				return undefined;
-			}
-		}
-
-		try {
-			return self.trustedTypes?.createPolicy(policyName, policyOptions);
-		} catch (err) {
-			console.warn(err);
-			return undefined;
-		}
+	function loadCode(moduleId: string): Promise<SimpleWorkerModule> {
+		const moduleUrl = new URL(`${moduleId}.js`, globalThis._VSCODE_FILE_ROOT);
+		return import(moduleUrl.href);
 	}
 
-	const trustedTypesPolicy = createTrustedTypesPolicy('amdLoader', {
-		createScriptURL: value => value,
-		createScript: (_, ...args: string[]) => {
-			// workaround a chrome issue not allowing to create new functions
-			// see https://github.com/w3c/webappsec-trusted-types/wiki/Trusted-Types-for-function-constructor
-			const fnArgs = args.slice(0, -1).join(',');
-			const fnBody = args.pop()!.toString();
-			// Do not add a new line to fnBody, as this will confuse source maps.
-			const body = `(function anonymous(${fnArgs}) { ${fnBody}\n})`;
-			return body;
-		}
-	});
-
-	function canUseEval(): boolean {
-		try {
-			const func = (
-				trustedTypesPolicy
-					? globalThis.eval(<any>trustedTypesPolicy.createScript('', 'true')) // CodeQL [SM01632] fetch + eval is used on the web worker instead of importScripts if possible because importScripts is synchronous and we observed deadlocks on Safari
-					: new Function('true') // CodeQL [SM01632] fetch + eval is used on the web worker instead of importScripts if possible because importScripts is synchronous and we observed deadlocks on Safari
-			);
-			func.call(globalThis);
-			return true;
-		} catch (err) {
-			return false;
-		}
+	interface MessageHandler {
+		onmessage(msg: any, ports: readonly MessagePort[]): void;
 	}
 
-	function loadAMDLoader() {
-		return new Promise<void>((resolve, reject) => {
-			if (typeof (<any>globalThis).define === 'function' && (<any>globalThis).define.amd) {
-				return resolve();
-			}
-			const loaderSrc: string | TrustedScriptURL = monacoBaseUrl + 'vs/loader.js';
-
-			const isCrossOrigin = (/^((http:)|(https:)|(file:))/.test(loaderSrc) && loaderSrc.substring(0, globalThis.origin.length) !== globalThis.origin);
-			if (!isCrossOrigin && canUseEval()) {
-				// use `fetch` if possible because `importScripts`
-				// is synchronous and can lead to deadlocks on Safari
-				fetch(loaderSrc).then((response) => {
-					if (response.status !== 200) {
-						throw new Error(response.statusText);
-					}
-					return response.text();
-				}).then((text) => {
-					text = `${text}\n//# sourceURL=${loaderSrc}`;
-					const func = (
-						trustedTypesPolicy
-							? globalThis.eval(trustedTypesPolicy.createScript('', text) as unknown as string) // CodeQL [SM01632] fetch + eval is used on the web worker instead of importScripts if possible because importScripts is synchronous and we observed deadlocks on Safari
-							: new Function(text) // CodeQL [SM01632] fetch + eval is used on the web worker instead of importScripts if possible because importScripts is synchronous and we observed deadlocks on Safari
-					);
-					func.call(globalThis);
-					resolve();
-				}).then(undefined, reject);
-				return;
-			}
-
-			if (trustedTypesPolicy) {
-				importScripts(trustedTypesPolicy.createScriptURL(loaderSrc) as unknown as string);
-			} else {
-				importScripts(loaderSrc as string);
-			}
-			resolve();
-		});
+	// shape of vs/base/common/worker/simpleWorker.ts
+	interface SimpleWorkerModule {
+		create(postMessage: (msg: any, transfer?: Transferable[]) => void): MessageHandler;
 	}
 
-	function configureAMDLoader() {
-		require.config({
-			baseUrl: monacoBaseUrl,
-			catchError: true,
-			trustedTypesPolicy,
-			amdModulesPattern: /^vs\//
-		});
-	}
-
-	function loadCode(moduleId: string) {
-		loadAMDLoader().then(() => {
-			configureAMDLoader();
-			require([moduleId], function (ws) {
-				setTimeout(function () {
-					const messageHandler = ws.create((msg: any, transfer?: Transferable[]) => {
-						(<any>globalThis).postMessage(msg, transfer);
-					}, null);
-
-					globalThis.onmessage = (e: MessageEvent) => messageHandler.onmessage(e.data, e.ports);
-					while (beforeReadyMessages.length > 0) {
-						const e = beforeReadyMessages.shift()!;
-						messageHandler.onmessage(e.data, e.ports);
-					}
-				}, 0);
+	function setupWorkerServer(ws: SimpleWorkerModule) {
+		setTimeout(function () {
+			const messageHandler = ws.create((msg: any, transfer?: Transferable[]) => {
+				(<any>globalThis).postMessage(msg, transfer);
 			});
-		});
-	}
 
-	// If the loader is already defined, configure it immediately
-	// This helps in the bundled case, where we must load nls files
-	// and they need a correct baseUrl to be loaded.
-	if (typeof (<any>globalThis).define === 'function' && (<any>globalThis).define.amd) {
-		configureAMDLoader();
+			self.onmessage = (e: MessageEvent) => messageHandler.onmessage(e.data, e.ports);
+			while (beforeReadyMessages.length > 0) {
+				self.onmessage(beforeReadyMessages.shift()!);
+			}
+		}, 0);
 	}
 
 	let isFirstMessage = true;
@@ -146,6 +41,10 @@
 		}
 
 		isFirstMessage = false;
-		loadCode(message.data);
+		loadCode(message.data).then((ws) => {
+			setupWorkerServer(ws);
+		}, (err) => {
+			console.error(err);
+		});
 	};
 })();
diff --git a/src/vs/code/browser/workbench/workbench-dev.html b/src/vs/code/browser/workbench/workbench-dev.html
index be6d30bfb98..140030d8abe 100644
--- a/src/vs/code/browser/workbench/workbench-dev.html
+++ b/src/vs/code/browser/workbench/workbench-dev.html
@@ -28,6 +28,7 @@
 		<!-- Workbench Icon/Manifest/CSS -->
 		<link rel="icon" href="{{WORKBENCH_WEB_BASE_URL}}/resources/server/favicon.ico" type="image/x-icon" />
 		<link rel="manifest" href="{{WORKBENCH_WEB_BASE_URL}}/resources/server/manifest.json" crossorigin="use-credentials" />
+		<style id="vscode-css-modules" type="text/css" media="screen"></style>
 
 	</head>
 
@@ -35,31 +36,32 @@
 	</body>
 
 	<!-- Startup (do not modify order of script tags!) -->
-	<script src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/loader.js"></script>
-	<script src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/webPackagePaths.js"></script>
 	<script>
 		const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location.origin).toString();
-		Object.keys(self.webPackagePaths).map(function (key, index) {
-			self.webPackagePaths[key] = `${baseUrl}/remote/web/node_modules/${key}/${self.webPackagePaths[key]}`;
-		});
-		require.config({
-			baseUrl: `${baseUrl}/out`,
-			recordStats: true,
-			trustedTypesPolicy: window.trustedTypes?.createPolicy('amdLoader', {
-				createScriptURL(value) {
-					if(value.startsWith(window.location.origin)) {
-						return value;
-					}
-					throw new Error(`Invalid script url: ${value}`)
-				}
-			}),
-			paths: self.webPackagePaths
-		});
+		globalThis._VSCODE_FILE_ROOT = baseUrl + '/out/';
+	</script>
+	<script>
+		const sheet = document.getElementById('vscode-css-modules').sheet;
+		globalThis._VSCODE_CSS_LOAD = function (url) {
+			sheet.insertRule(`@import url(${url});`);
+		};
+
+		const importMap = { imports: {} };
+		const cssModules = JSON.parse('{{WORKBENCH_DEV_CSS_MODULES}}');
+		for (const cssModule of cssModules) {
+			const cssUrl = new URL(cssModule, globalThis._VSCODE_FILE_ROOT).href;
+			const jsSrc = `globalThis._VSCODE_CSS_LOAD('${cssUrl}');\n`;
+			const blob = new Blob([jsSrc], { type: 'application/javascript' });
+			importMap.imports[cssUrl] = URL.createObjectURL(blob);
+		}
+		const importMapElement = document.createElement('script');
+		importMapElement.type = 'importmap';
+		importMapElement.setAttribute('nonce', '1nline-m4p')
+		importMapElement.textContent = JSON.stringify(importMap, undefined, 2);
+		document.head.appendChild(importMapElement);
 	</script>
 	<script>
 		performance.mark('code/willLoadWorkbenchMain');
 	</script>
-	<script>
-		require(['vs/code/browser/workbench/workbench'], function() {});
-	</script>
+	<script type="module" src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/code/browser/workbench/workbench.js"></script>
 </html>
diff --git a/src/vs/code/browser/workbench/workbench.html b/src/vs/code/browser/workbench/workbench.html
index 700231f0357..77881982735 100644
--- a/src/vs/code/browser/workbench/workbench.html
+++ b/src/vs/code/browser/workbench/workbench.html
@@ -25,7 +25,7 @@
 		<!-- Workbench Icon/Manifest/CSS -->
 		<link rel="icon" href="{{WORKBENCH_WEB_BASE_URL}}/resources/server/favicon.ico" type="image/x-icon" />
 		<link rel="manifest" href="{{WORKBENCH_WEB_BASE_URL}}/resources/server/manifest.json" crossorigin="use-credentials" />
-		<link data-name="vs/workbench/workbench.web.main" rel="stylesheet" href="{{WORKBENCH_WEB_BASE_URL}}/out/vs/workbench/workbench.web.main.css">
+		<link rel="stylesheet" href="{{WORKBENCH_WEB_BASE_URL}}/out/vs/code/browser/workbench/workbench.css">
 
 	</head>
 
@@ -33,47 +33,16 @@
 	</body>
 
 	<!-- Startup (do not modify order of script tags!) -->
-	<script src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/loader.js"></script>
-	<script src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/webPackagePaths.js"></script>
 	<script>
 		const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location.origin).toString();
-		Object.keys(self.webPackagePaths).map(function (key, index) {
-			self.webPackagePaths[key] = `${baseUrl}/node_modules/${key}/${self.webPackagePaths[key]}`;
-		});
-
-		// Set up nls if the user is not using the default language (English)
-		const nlsConfig = {};
-		// Normalize locale to lowercase because translationServiceUrl is case-sensitive.
-		// ref: https://github.com/microsoft/vscode/issues/187795
-		const locale = localStorage.getItem('vscode.nls.locale') || navigator.language.toLowerCase();
-		if (!locale.startsWith('en')) {
-			nlsConfig['vs/nls'] = {
-				availableLanguages: {
-					'*': locale
-				},
-				translationServiceUrl: '{{WORKBENCH_NLS_BASE_URL}}'
-			};
-		}
-
-		require.config({
-			baseUrl: `${baseUrl}/out`,
-			recordStats: true,
-			trustedTypesPolicy: window.trustedTypes?.createPolicy('amdLoader', {
-				createScriptURL(value) {
-					if(value.startsWith(window.location.origin)) {
-						return value;
-					}
-					throw new Error(`Invalid script url: ${value}`)
-				}
-			}),
-			paths: self.webPackagePaths,
-			...nlsConfig
-		});
+		globalThis._VSCODE_FILE_ROOT = baseUrl + '/out/';
 	</script>
 	<script>
 		performance.mark('code/willLoadWorkbenchMain');
 	</script>
-	<script src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/workbench/workbench.web.main.nls.js"></script>
-	<script src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/workbench/workbench.web.main.js"></script>
-	<script src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/code/browser/workbench/workbench.js"></script>
+	<!-- always ensure built in english NLS messages -->
+	<script type="module" src="{{WORKBENCH_NLS_FALLBACK_URL}}"></script>
+	<!-- attempt to load NLS messages in case non-english -->
+	<script type="module" src="{{WORKBENCH_NLS_URL}}"></script>
+	<script type="module" src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/code/browser/workbench/workbench.js"></script>
 </html>
diff --git a/src/vs/code/browser/workbench/workbench.ts b/src/vs/code/browser/workbench/workbench.ts
index f8875029a8a..b98867e7ac3 100644
--- a/src/vs/code/browser/workbench/workbench.ts
+++ b/src/vs/code/browser/workbench/workbench.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isStandalone } from 'vs/base/browser/browser';
-import { mainWindow } from 'vs/base/browser/window';
-import { VSBuffer, decodeBase64, encodeBase64 } from 'vs/base/common/buffer';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { parse } from 'vs/base/common/marshalling';
-import { Schemas } from 'vs/base/common/network';
-import { posix } from 'vs/base/common/path';
-import { isEqual } from 'vs/base/common/resources';
-import { ltrim } from 'vs/base/common/strings';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import product from 'vs/platform/product/common/product';
-import { ISecretStorageProvider } from 'vs/platform/secrets/common/secrets';
-import { isFolderToOpen, isWorkspaceToOpen } from 'vs/platform/window/common/window';
-import type { IWorkbenchConstructionOptions, IWorkspace, IWorkspaceProvider } from 'vs/workbench/browser/web.api';
-import { AuthenticationSessionInfo } from 'vs/workbench/services/authentication/browser/authenticationService';
-import type { IURLCallbackProvider } from 'vs/workbench/services/url/browser/urlService';
-import { create } from 'vs/workbench/workbench.web.main';
+import { isStandalone } from '../../../base/browser/browser.js';
+import { mainWindow } from '../../../base/browser/window.js';
+import { VSBuffer, decodeBase64, encodeBase64 } from '../../../base/common/buffer.js';
+import { Emitter } from '../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../base/common/lifecycle.js';
+import { parse } from '../../../base/common/marshalling.js';
+import { Schemas } from '../../../base/common/network.js';
+import { posix } from '../../../base/common/path.js';
+import { isEqual } from '../../../base/common/resources.js';
+import { ltrim } from '../../../base/common/strings.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import product from '../../../platform/product/common/product.js';
+import { ISecretStorageProvider } from '../../../platform/secrets/common/secrets.js';
+import { isFolderToOpen, isWorkspaceToOpen } from '../../../platform/window/common/window.js';
+import type { IWorkbenchConstructionOptions, IWorkspace, IWorkspaceProvider } from '../../../workbench/browser/web.api.js';
+import { AuthenticationSessionInfo } from '../../../workbench/services/authentication/browser/authenticationService.js';
+import type { IURLCallbackProvider } from '../../../workbench/services/url/browser/urlService.js';
+import { create } from '../../../workbench/workbench.web.main.internal.js';
 
 interface ISecretStorageCrypto {
 	seal(data: string): Promise<string>;
diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index 5cd869bc657..4f758522309 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -4,123 +4,122 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { app, BrowserWindow, protocol, session, Session, systemPreferences, WebFrameMain } from 'electron';
-import { addUNCHostToAllowlist, disableUNCAccessRestrictions } from 'vs/base/node/unc';
-import { validatedIpcMain } from 'vs/base/parts/ipc/electron-main/ipcMain';
+import { addUNCHostToAllowlist, disableUNCAccessRestrictions } from '../../base/node/unc.js';
+import { validatedIpcMain } from '../../base/parts/ipc/electron-main/ipcMain.js';
 import { hostname, release } from 'os';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { isSigPipeError, onUnexpectedError, setUnexpectedErrorHandler } from 'vs/base/common/errors';
-import { isEqualOrParent } from 'vs/base/common/extpath';
-import { Event } from 'vs/base/common/event';
-import { stripComments } from 'vs/base/common/json';
-import { getPathLabel } from 'vs/base/common/labels';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { Schemas, VSCODE_AUTHORITY } from 'vs/base/common/network';
-import { isAbsolute, join, posix } from 'vs/base/common/path';
-import { IProcessEnvironment, isLinux, isLinuxSnap, isMacintosh, isWindows, OS } from 'vs/base/common/platform';
-import { assertType } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { registerContextMenuListener } from 'vs/base/parts/contextmenu/electron-main/contextmenu';
-import { getDelayedChannel, ProxyChannel, StaticRouter } from 'vs/base/parts/ipc/common/ipc';
-import { Server as ElectronIPCServer } from 'vs/base/parts/ipc/electron-main/ipc.electron';
-import { Client as MessagePortClient } from 'vs/base/parts/ipc/electron-main/ipc.mp';
-import { Server as NodeIPCServer } from 'vs/base/parts/ipc/node/ipc.net';
-import { ProxyAuthHandler } from 'vs/code/electron-main/auth';
-import { localize } from 'vs/nls';
-import { IBackupMainService } from 'vs/platform/backup/electron-main/backup';
-import { BackupMainService } from 'vs/platform/backup/electron-main/backupMainService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ElectronExtensionHostDebugBroadcastChannel } from 'vs/platform/debug/electron-main/extensionHostDebugIpc';
-import { IDiagnosticsService } from 'vs/platform/diagnostics/common/diagnostics';
-import { DiagnosticsMainService, IDiagnosticsMainService } from 'vs/platform/diagnostics/electron-main/diagnosticsMainService';
-import { DialogMainService, IDialogMainService } from 'vs/platform/dialogs/electron-main/dialogMainService';
-import { IEncryptionMainService } from 'vs/platform/encryption/common/encryptionService';
-import { EncryptionMainService } from 'vs/platform/encryption/electron-main/encryptionMainService';
-import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
-import { IEnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
-import { isLaunchedFromCli } from 'vs/platform/environment/node/argvHelper';
-import { getResolvedShellEnv } from 'vs/platform/shell/node/shellEnv';
-import { IExtensionHostStarter, ipcExtensionHostStarterChannelName } from 'vs/platform/extensions/common/extensionHostStarter';
-import { ExtensionHostStarter } from 'vs/platform/extensions/electron-main/extensionHostStarter';
-import { IExternalTerminalMainService } from 'vs/platform/externalTerminal/electron-main/externalTerminal';
-import { LinuxExternalTerminalService, MacExternalTerminalService, WindowsExternalTerminalService } from 'vs/platform/externalTerminal/node/externalTerminalService';
-import { LOCAL_FILE_SYSTEM_CHANNEL_NAME } from 'vs/platform/files/common/diskFileSystemProviderClient';
-import { IFileService } from 'vs/platform/files/common/files';
-import { DiskFileSystemProviderChannel } from 'vs/platform/files/electron-main/diskFileSystemProviderServer';
-import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IIssueMainService } from 'vs/platform/issue/common/issue';
-import { IssueMainService } from 'vs/platform/issue/electron-main/issueMainService';
-import { IKeyboardLayoutMainService, KeyboardLayoutMainService } from 'vs/platform/keyboardLayout/electron-main/keyboardLayoutMainService';
-import { ILaunchMainService, LaunchMainService } from 'vs/platform/launch/electron-main/launchMainService';
-import { ILifecycleMainService, LifecycleMainPhase, ShutdownReason } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
-import { ILoggerService, ILogService } from 'vs/platform/log/common/log';
-import { IMenubarMainService, MenubarMainService } from 'vs/platform/menubar/electron-main/menubarMainService';
-import { INativeHostMainService, NativeHostMainService } from 'vs/platform/native/electron-main/nativeHostMainService';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { getRemoteAuthority } from 'vs/platform/remote/common/remoteHosts';
-import { SharedProcess } from 'vs/platform/sharedProcess/electron-main/sharedProcess';
-import { ISignService } from 'vs/platform/sign/common/sign';
-import { IStateService } from 'vs/platform/state/node/state';
-import { StorageDatabaseChannel } from 'vs/platform/storage/electron-main/storageIpc';
-import { ApplicationStorageMainService, IApplicationStorageMainService, IStorageMainService, StorageMainService } from 'vs/platform/storage/electron-main/storageMainService';
-import { resolveCommonProperties } from 'vs/platform/telemetry/common/commonProperties';
-import { ITelemetryService, TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
-import { TelemetryAppenderClient } from 'vs/platform/telemetry/common/telemetryIpc';
-import { ITelemetryServiceConfig, TelemetryService } from 'vs/platform/telemetry/common/telemetryService';
-import { getPiiPathsFromEnvironment, getTelemetryLevel, isInternalTelemetry, NullTelemetryService, supportsTelemetry } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IUpdateService } from 'vs/platform/update/common/update';
-import { UpdateChannel } from 'vs/platform/update/common/updateIpc';
-import { DarwinUpdateService } from 'vs/platform/update/electron-main/updateService.darwin';
-import { LinuxUpdateService } from 'vs/platform/update/electron-main/updateService.linux';
-import { SnapUpdateService } from 'vs/platform/update/electron-main/updateService.snap';
-import { Win32UpdateService } from 'vs/platform/update/electron-main/updateService.win32';
-import { IOpenURLOptions, IURLService } from 'vs/platform/url/common/url';
-import { URLHandlerChannelClient, URLHandlerRouter } from 'vs/platform/url/common/urlIpc';
-import { NativeURLService } from 'vs/platform/url/common/urlService';
-import { ElectronURLListener } from 'vs/platform/url/electron-main/electronUrlListener';
-import { IWebviewManagerService } from 'vs/platform/webview/common/webviewManagerService';
-import { WebviewMainService } from 'vs/platform/webview/electron-main/webviewMainService';
-import { isFolderToOpen, isWorkspaceToOpen, IWindowOpenable } from 'vs/platform/window/common/window';
-import { IWindowsMainService, OpenContext } from 'vs/platform/windows/electron-main/windows';
-import { ICodeWindow } from 'vs/platform/window/electron-main/window';
-import { WindowsMainService } from 'vs/platform/windows/electron-main/windowsMainService';
-import { ActiveWindowManager } from 'vs/platform/windows/node/windowTracker';
-import { hasWorkspaceFileExtension } from 'vs/platform/workspace/common/workspace';
-import { IWorkspacesService } from 'vs/platform/workspaces/common/workspaces';
-import { IWorkspacesHistoryMainService, WorkspacesHistoryMainService } from 'vs/platform/workspaces/electron-main/workspacesHistoryMainService';
-import { WorkspacesMainService } from 'vs/platform/workspaces/electron-main/workspacesMainService';
-import { IWorkspacesManagementMainService, WorkspacesManagementMainService } from 'vs/platform/workspaces/electron-main/workspacesManagementMainService';
-import { IPolicyService } from 'vs/platform/policy/common/policy';
-import { PolicyChannel } from 'vs/platform/policy/common/policyIpc';
-import { IUserDataProfilesMainService } from 'vs/platform/userDataProfile/electron-main/userDataProfile';
-import { RequestChannel } from 'vs/platform/request/common/requestIpc';
-import { IRequestService } from 'vs/platform/request/common/request';
-import { IExtensionsProfileScannerService } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService';
-import { IExtensionsScannerService } from 'vs/platform/extensionManagement/common/extensionsScannerService';
-import { ExtensionsScannerService } from 'vs/platform/extensionManagement/node/extensionsScannerService';
-import { UserDataProfilesHandler } from 'vs/platform/userDataProfile/electron-main/userDataProfilesHandler';
-import { ProfileStorageChangesListenerChannel } from 'vs/platform/userDataProfile/electron-main/userDataProfileStorageIpc';
-import { Promises, RunOnceScheduler, runWhenGlobalIdle } from 'vs/base/common/async';
-import { resolveMachineId, resolveSqmId, resolvedevDeviceId } from 'vs/platform/telemetry/electron-main/telemetryUtils';
-import { ExtensionsProfileScannerService } from 'vs/platform/extensionManagement/node/extensionsProfileScannerService';
-import { LoggerChannel } from 'vs/platform/log/electron-main/logIpc';
-import { ILoggerMainService } from 'vs/platform/log/electron-main/loggerService';
-import { IInitialProtocolUrls, IProtocolUrl } from 'vs/platform/url/electron-main/url';
-import { IUtilityProcessWorkerMainService, UtilityProcessWorkerMainService } from 'vs/platform/utilityProcess/electron-main/utilityProcessWorkerMainService';
-import { ipcUtilityProcessWorkerChannelName } from 'vs/platform/utilityProcess/common/utilityProcessWorkerService';
-import { firstOrDefault } from 'vs/base/common/arrays';
-import { ILocalPtyService, LocalReconnectConstants, TerminalIpcChannels, TerminalSettingId } from 'vs/platform/terminal/common/terminal';
-import { ElectronPtyHostStarter } from 'vs/platform/terminal/electron-main/electronPtyHostStarter';
-import { PtyHostService } from 'vs/platform/terminal/node/ptyHostService';
-import { NODE_REMOTE_RESOURCE_CHANNEL_NAME, NODE_REMOTE_RESOURCE_IPC_METHOD_NAME, NodeRemoteResourceResponse, NodeRemoteResourceRouter } from 'vs/platform/remote/common/electronRemoteResources';
-import { Lazy } from 'vs/base/common/lazy';
-import { IAuxiliaryWindowsMainService } from 'vs/platform/auxiliaryWindow/electron-main/auxiliaryWindows';
-import { AuxiliaryWindowsMainService } from 'vs/platform/auxiliaryWindow/electron-main/auxiliaryWindowsMainService';
-import { normalizeNFC } from 'vs/base/common/normalization';
+import { VSBuffer } from '../../base/common/buffer.js';
+import { toErrorMessage } from '../../base/common/errorMessage.js';
+import { isSigPipeError, onUnexpectedError, setUnexpectedErrorHandler } from '../../base/common/errors.js';
+import { Event } from '../../base/common/event.js';
+import { parse } from '../../base/common/jsonc.js';
+import { getPathLabel } from '../../base/common/labels.js';
+import { Disposable, DisposableStore } from '../../base/common/lifecycle.js';
+import { Schemas, VSCODE_AUTHORITY } from '../../base/common/network.js';
+import { join, posix } from '../../base/common/path.js';
+import { IProcessEnvironment, isLinux, isLinuxSnap, isMacintosh, isWindows, OS } from '../../base/common/platform.js';
+import { assertType } from '../../base/common/types.js';
+import { URI } from '../../base/common/uri.js';
+import { generateUuid } from '../../base/common/uuid.js';
+import { registerContextMenuListener } from '../../base/parts/contextmenu/electron-main/contextmenu.js';
+import { getDelayedChannel, ProxyChannel, StaticRouter } from '../../base/parts/ipc/common/ipc.js';
+import { Server as ElectronIPCServer } from '../../base/parts/ipc/electron-main/ipc.electron.js';
+import { Client as MessagePortClient } from '../../base/parts/ipc/electron-main/ipc.mp.js';
+import { Server as NodeIPCServer } from '../../base/parts/ipc/node/ipc.net.js';
+import { IProxyAuthService, ProxyAuthService } from '../../platform/native/electron-main/auth.js';
+import { localize } from '../../nls.js';
+import { IBackupMainService } from '../../platform/backup/electron-main/backup.js';
+import { BackupMainService } from '../../platform/backup/electron-main/backupMainService.js';
+import { IConfigurationService } from '../../platform/configuration/common/configuration.js';
+import { ElectronExtensionHostDebugBroadcastChannel } from '../../platform/debug/electron-main/extensionHostDebugIpc.js';
+import { IDiagnosticsService } from '../../platform/diagnostics/common/diagnostics.js';
+import { DiagnosticsMainService, IDiagnosticsMainService } from '../../platform/diagnostics/electron-main/diagnosticsMainService.js';
+import { DialogMainService, IDialogMainService } from '../../platform/dialogs/electron-main/dialogMainService.js';
+import { IEncryptionMainService } from '../../platform/encryption/common/encryptionService.js';
+import { EncryptionMainService } from '../../platform/encryption/electron-main/encryptionMainService.js';
+import { NativeParsedArgs } from '../../platform/environment/common/argv.js';
+import { IEnvironmentMainService } from '../../platform/environment/electron-main/environmentMainService.js';
+import { isLaunchedFromCli } from '../../platform/environment/node/argvHelper.js';
+import { getResolvedShellEnv } from '../../platform/shell/node/shellEnv.js';
+import { IExtensionHostStarter, ipcExtensionHostStarterChannelName } from '../../platform/extensions/common/extensionHostStarter.js';
+import { ExtensionHostStarter } from '../../platform/extensions/electron-main/extensionHostStarter.js';
+import { IExternalTerminalMainService } from '../../platform/externalTerminal/electron-main/externalTerminal.js';
+import { LinuxExternalTerminalService, MacExternalTerminalService, WindowsExternalTerminalService } from '../../platform/externalTerminal/node/externalTerminalService.js';
+import { LOCAL_FILE_SYSTEM_CHANNEL_NAME } from '../../platform/files/common/diskFileSystemProviderClient.js';
+import { IFileService } from '../../platform/files/common/files.js';
+import { DiskFileSystemProviderChannel } from '../../platform/files/electron-main/diskFileSystemProviderServer.js';
+import { DiskFileSystemProvider } from '../../platform/files/node/diskFileSystemProvider.js';
+import { SyncDescriptor } from '../../platform/instantiation/common/descriptors.js';
+import { IInstantiationService, ServicesAccessor } from '../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../platform/instantiation/common/serviceCollection.js';
+import { IProcessMainService, IIssueMainService } from '../../platform/issue/common/issue.js';
+import { IssueMainService } from '../../platform/issue/electron-main/issueMainService.js';
+import { ProcessMainService } from '../../platform/issue/electron-main/processMainService.js';
+import { IKeyboardLayoutMainService, KeyboardLayoutMainService } from '../../platform/keyboardLayout/electron-main/keyboardLayoutMainService.js';
+import { ILaunchMainService, LaunchMainService } from '../../platform/launch/electron-main/launchMainService.js';
+import { ILifecycleMainService, LifecycleMainPhase, ShutdownReason } from '../../platform/lifecycle/electron-main/lifecycleMainService.js';
+import { ILoggerService, ILogService } from '../../platform/log/common/log.js';
+import { IMenubarMainService, MenubarMainService } from '../../platform/menubar/electron-main/menubarMainService.js';
+import { INativeHostMainService, NativeHostMainService } from '../../platform/native/electron-main/nativeHostMainService.js';
+import { IProductService } from '../../platform/product/common/productService.js';
+import { getRemoteAuthority } from '../../platform/remote/common/remoteHosts.js';
+import { SharedProcess } from '../../platform/sharedProcess/electron-main/sharedProcess.js';
+import { ISignService } from '../../platform/sign/common/sign.js';
+import { IStateService } from '../../platform/state/node/state.js';
+import { StorageDatabaseChannel } from '../../platform/storage/electron-main/storageIpc.js';
+import { ApplicationStorageMainService, IApplicationStorageMainService, IStorageMainService, StorageMainService } from '../../platform/storage/electron-main/storageMainService.js';
+import { resolveCommonProperties } from '../../platform/telemetry/common/commonProperties.js';
+import { ITelemetryService, TelemetryLevel } from '../../platform/telemetry/common/telemetry.js';
+import { TelemetryAppenderClient } from '../../platform/telemetry/common/telemetryIpc.js';
+import { ITelemetryServiceConfig, TelemetryService } from '../../platform/telemetry/common/telemetryService.js';
+import { getPiiPathsFromEnvironment, getTelemetryLevel, isInternalTelemetry, NullTelemetryService, supportsTelemetry } from '../../platform/telemetry/common/telemetryUtils.js';
+import { IUpdateService } from '../../platform/update/common/update.js';
+import { UpdateChannel } from '../../platform/update/common/updateIpc.js';
+import { DarwinUpdateService } from '../../platform/update/electron-main/updateService.darwin.js';
+import { LinuxUpdateService } from '../../platform/update/electron-main/updateService.linux.js';
+import { SnapUpdateService } from '../../platform/update/electron-main/updateService.snap.js';
+import { Win32UpdateService } from '../../platform/update/electron-main/updateService.win32.js';
+import { IOpenURLOptions, IURLService } from '../../platform/url/common/url.js';
+import { URLHandlerChannelClient, URLHandlerRouter } from '../../platform/url/common/urlIpc.js';
+import { NativeURLService } from '../../platform/url/common/urlService.js';
+import { ElectronURLListener } from '../../platform/url/electron-main/electronUrlListener.js';
+import { IWebviewManagerService } from '../../platform/webview/common/webviewManagerService.js';
+import { WebviewMainService } from '../../platform/webview/electron-main/webviewMainService.js';
+import { isFolderToOpen, isWorkspaceToOpen, IWindowOpenable } from '../../platform/window/common/window.js';
+import { IWindowsMainService, OpenContext } from '../../platform/windows/electron-main/windows.js';
+import { ICodeWindow } from '../../platform/window/electron-main/window.js';
+import { WindowsMainService } from '../../platform/windows/electron-main/windowsMainService.js';
+import { ActiveWindowManager } from '../../platform/windows/node/windowTracker.js';
+import { hasWorkspaceFileExtension } from '../../platform/workspace/common/workspace.js';
+import { IWorkspacesService } from '../../platform/workspaces/common/workspaces.js';
+import { IWorkspacesHistoryMainService, WorkspacesHistoryMainService } from '../../platform/workspaces/electron-main/workspacesHistoryMainService.js';
+import { WorkspacesMainService } from '../../platform/workspaces/electron-main/workspacesMainService.js';
+import { IWorkspacesManagementMainService, WorkspacesManagementMainService } from '../../platform/workspaces/electron-main/workspacesManagementMainService.js';
+import { IPolicyService } from '../../platform/policy/common/policy.js';
+import { PolicyChannel } from '../../platform/policy/common/policyIpc.js';
+import { IUserDataProfilesMainService } from '../../platform/userDataProfile/electron-main/userDataProfile.js';
+import { IExtensionsProfileScannerService } from '../../platform/extensionManagement/common/extensionsProfileScannerService.js';
+import { IExtensionsScannerService } from '../../platform/extensionManagement/common/extensionsScannerService.js';
+import { ExtensionsScannerService } from '../../platform/extensionManagement/node/extensionsScannerService.js';
+import { UserDataProfilesHandler } from '../../platform/userDataProfile/electron-main/userDataProfilesHandler.js';
+import { ProfileStorageChangesListenerChannel } from '../../platform/userDataProfile/electron-main/userDataProfileStorageIpc.js';
+import { Promises, RunOnceScheduler, runWhenGlobalIdle } from '../../base/common/async.js';
+import { resolveMachineId, resolveSqmId, resolvedevDeviceId } from '../../platform/telemetry/electron-main/telemetryUtils.js';
+import { ExtensionsProfileScannerService } from '../../platform/extensionManagement/node/extensionsProfileScannerService.js';
+import { LoggerChannel } from '../../platform/log/electron-main/logIpc.js';
+import { ILoggerMainService } from '../../platform/log/electron-main/loggerService.js';
+import { IInitialProtocolUrls, IProtocolUrl } from '../../platform/url/electron-main/url.js';
+import { IUtilityProcessWorkerMainService, UtilityProcessWorkerMainService } from '../../platform/utilityProcess/electron-main/utilityProcessWorkerMainService.js';
+import { ipcUtilityProcessWorkerChannelName } from '../../platform/utilityProcess/common/utilityProcessWorkerService.js';
+import { ILocalPtyService, LocalReconnectConstants, TerminalIpcChannels, TerminalSettingId } from '../../platform/terminal/common/terminal.js';
+import { ElectronPtyHostStarter } from '../../platform/terminal/electron-main/electronPtyHostStarter.js';
+import { PtyHostService } from '../../platform/terminal/node/ptyHostService.js';
+import { NODE_REMOTE_RESOURCE_CHANNEL_NAME, NODE_REMOTE_RESOURCE_IPC_METHOD_NAME, NodeRemoteResourceResponse, NodeRemoteResourceRouter } from '../../platform/remote/common/electronRemoteResources.js';
+import { Lazy } from '../../base/common/lazy.js';
+import { IAuxiliaryWindowsMainService } from '../../platform/auxiliaryWindow/electron-main/auxiliaryWindows.js';
+import { AuxiliaryWindowsMainService } from '../../platform/auxiliaryWindow/electron-main/auxiliaryWindowsMainService.js';
+import { normalizeNFC } from '../../base/common/normalization.js';
+import { ICSSDevelopmentService, CSSDevelopmentService } from '../../platform/cssDev/node/cssDevService.js';
+import { ExtensionSignatureVerificationService, IExtensionSignatureVerificationService } from '../../platform/extensionManagement/node/extensionSignatureVerificationService.js';
 
 /**
  * The main VS Code application. There will only ever be one instance,
@@ -497,24 +496,6 @@ export class CodeApplication extends Disposable {
 			return this.resolveShellEnvironment(args, env, false);
 		});
 
-		validatedIpcMain.handle('vscode:writeNlsFile', (event, path: unknown, data: unknown) => {
-			const uri = this.validateNlsPath([path]);
-			if (!uri || typeof data !== 'string') {
-				throw new Error('Invalid operation (vscode:writeNlsFile)');
-			}
-
-			return this.fileService.writeFile(uri, VSBuffer.fromString(data));
-		});
-
-		validatedIpcMain.handle('vscode:readNlsFile', async (event, ...paths: unknown[]) => {
-			const uri = this.validateNlsPath(paths);
-			if (!uri) {
-				throw new Error('Invalid operation (vscode:readNlsFile)');
-			}
-
-			return (await this.fileService.readFile(uri)).value.toString();
-		});
-
 		validatedIpcMain.on('vscode:toggleDevTools', event => event.sender.toggleDevTools());
 		validatedIpcMain.on('vscode:openDevTools', event => event.sender.openDevTools());
 
@@ -530,26 +511,6 @@ export class CodeApplication extends Disposable {
 		//#endregion
 	}
 
-	private validateNlsPath(pathSegments: unknown[]): URI | undefined {
-		let path: string | undefined = undefined;
-
-		for (const pathSegment of pathSegments) {
-			if (typeof pathSegment === 'string') {
-				if (typeof path !== 'string') {
-					path = pathSegment;
-				} else {
-					path = join(path, pathSegment);
-				}
-			}
-		}
-
-		if (typeof path !== 'string' || !isAbsolute(path) || !isEqualOrParent(path, this.environmentMainService.cachedLanguagesPath, !isLinux)) {
-			return undefined;
-		}
-
-		return URI.file(path);
-	}
-
 	private onUnexpectedError(error: Error): void {
 		if (error) {
 
@@ -626,7 +587,7 @@ export class CodeApplication extends Disposable {
 		const appInstantiationService = await this.initServices(machineId, sqmId, devDeviceId, sharedProcessReady);
 
 		// Auth Handler
-		this._register(appInstantiationService.createInstance(ProxyAuthHandler));
+		appInstantiationService.invokeFunction(accessor => accessor.get(IProxyAuthService));
 
 		// Transient profiles handler
 		this._register(appInstantiationService.createInstance(UserDataProfilesHandler));
@@ -866,34 +827,38 @@ export class CodeApplication extends Disposable {
 			//   To: vscode-remote://wsl+ubuntu/mnt/c/GitDevelopment/monaco
 
 			const secondSlash = uri.path.indexOf(posix.sep, 1 /* skip over the leading slash */);
+			let authority: string;
+			let path: string;
 			if (secondSlash !== -1) {
-				const authority = uri.path.substring(1, secondSlash);
-				const path = uri.path.substring(secondSlash);
-
-				let query = uri.query;
-				const params = new URLSearchParams(uri.query);
-				if (params.get('windowId') === '_blank') {
-					// Make sure to unset any `windowId=_blank` here
-					// https://github.com/microsoft/vscode/issues/191902
-					params.delete('windowId');
-					query = params.toString();
-				}
-
-				const remoteUri = URI.from({ scheme: Schemas.vscodeRemote, authority, path, query, fragment: uri.fragment });
-
-				if (hasWorkspaceFileExtension(path)) {
-					return { workspaceUri: remoteUri };
-				}
-
-				if (/:[\d]+$/.test(path)) {
-					// path with :line:column syntax
-					return { fileUri: remoteUri };
-				}
-
-				return { folderUri: remoteUri };
+				authority = uri.path.substring(1, secondSlash);
+				path = uri.path.substring(secondSlash);
+			} else {
+				authority = uri.path.substring(1);
+				path = '/';
 			}
-		}
 
+			let query = uri.query;
+			const params = new URLSearchParams(uri.query);
+			if (params.get('windowId') === '_blank') {
+				// Make sure to unset any `windowId=_blank` here
+				// https://github.com/microsoft/vscode/issues/191902
+				params.delete('windowId');
+				query = params.toString();
+			}
+
+			const remoteUri = URI.from({ scheme: Schemas.vscodeRemote, authority, path, query, fragment: uri.fragment });
+
+			if (hasWorkspaceFileExtension(path)) {
+				return { workspaceUri: remoteUri };
+			}
+
+			if (/:[\d]+$/.test(path)) {
+				// path with :line:column syntax
+				return { fileUri: remoteUri };
+			}
+
+			return { folderUri: remoteUri };
+		}
 		return undefined;
 	}
 
@@ -950,14 +915,14 @@ export class CodeApplication extends Disposable {
 			} else {
 				this.logService.trace('app#handleProtocolUrl() opening protocol url as window:', windowOpenableFromProtocolUrl, uri.toString(true));
 
-				const window = firstOrDefault(await windowsMainService.open({
-					context: OpenContext.API,
+				const window = (await windowsMainService.open({
+					context: OpenContext.LINK,
 					cli: { ...this.environmentMainService.args },
 					urisToOpen: [windowOpenableFromProtocolUrl],
 					forceNewWindow: shouldOpenInNewWindow,
 					gotoLineMode: true
 					// remoteAuthority: will be determined based on windowOpenableFromProtocolUrl
-				}));
+				})).at(0);
 
 				window?.focus(); // this should help ensuring that the right window gets focus when multiple are opened
 
@@ -969,14 +934,14 @@ export class CodeApplication extends Disposable {
 		if (shouldOpenInNewWindow) {
 			this.logService.trace('app#handleProtocolUrl() opening empty window and passing in protocol url:', uri.toString(true));
 
-			const window = firstOrDefault(await windowsMainService.open({
-				context: OpenContext.API,
+			const window = (await windowsMainService.open({
+				context: OpenContext.LINK,
 				cli: { ...this.environmentMainService.args },
 				forceNewWindow: true,
 				forceEmpty: true,
 				gotoLineMode: true,
 				remoteAuthority: getRemoteAuthority(uri)
-			}));
+			})).at(0);
 
 			await window?.ready();
 
@@ -1052,6 +1017,9 @@ export class CodeApplication extends Disposable {
 		// Issues
 		services.set(IIssueMainService, new SyncDescriptor(IssueMainService, [this.userEnv]));
 
+		// Process
+		services.set(IProcessMainService, new SyncDescriptor(ProcessMainService, [this.userEnv]));
+
 		// Encryption
 		services.set(IEncryptionMainService, new SyncDescriptor(EncryptionMainService));
 
@@ -1131,6 +1099,17 @@ export class CodeApplication extends Disposable {
 		// Utility Process Worker
 		services.set(IUtilityProcessWorkerMainService, new SyncDescriptor(UtilityProcessWorkerMainService, undefined, true));
 
+		// Proxy Auth
+		services.set(IProxyAuthService, new SyncDescriptor(ProxyAuthService));
+
+		// Dev Only: CSS service (for ESM)
+		services.set(ICSSDevelopmentService, new SyncDescriptor(CSSDevelopmentService, undefined, true));
+
+		if (this.productService.quality !== 'stable') {
+			// extensions signature verification service
+			services.set(IExtensionSignatureVerificationService, new SyncDescriptor(ExtensionSignatureVerificationService, undefined, true));
+		}
+
 		// Init services that require it
 		await Promises.settled([
 			backupMainService.initialize(),
@@ -1172,9 +1151,12 @@ export class CodeApplication extends Disposable {
 		mainProcessElectronServer.registerChannel('userDataProfiles', userDataProfilesService);
 		sharedProcessClient.then(client => client.registerChannel('userDataProfiles', userDataProfilesService));
 
-		// Request
-		const requestService = new RequestChannel(accessor.get(IRequestService));
-		sharedProcessClient.then(client => client.registerChannel('request', requestService));
+		if (this.productService.quality !== 'stable') {
+			// Extension signature verification service
+			const extensionSignatureVerificationService = accessor.get(IExtensionSignatureVerificationService);
+			sharedProcessClient.then(client => client.registerChannel('signatureVerificationService',
+				ProxyChannel.fromService(extensionSignatureVerificationService, disposables)));
+		}
 
 		// Update
 		const updateChannel = new UpdateChannel(accessor.get(IUpdateService));
@@ -1184,6 +1166,10 @@ export class CodeApplication extends Disposable {
 		const issueChannel = ProxyChannel.fromService(accessor.get(IIssueMainService), disposables);
 		mainProcessElectronServer.registerChannel('issue', issueChannel);
 
+		// Process
+		const processChannel = ProxyChannel.fromService(accessor.get(IProcessMainService), disposables);
+		mainProcessElectronServer.registerChannel('process', processChannel);
+
 		// Encryption
 		const encryptionChannel = ProxyChannel.fromService(accessor.get(IEncryptionMainService), disposables);
 		mainProcessElectronServer.registerChannel('encryption', encryptionChannel);
@@ -1395,10 +1381,10 @@ export class CodeApplication extends Disposable {
 		// Crash reporter
 		this.updateCrashReporterEnablement();
 
+		// macOS: rosetta translation warning
 		if (isMacintosh && app.runningUnderARM64Translation) {
 			this.windowsMainService?.sendToFocused('vscode:showTranslatedBuildWarning');
 		}
-
 	}
 
 	private async installMutex(): Promise<void> {
@@ -1438,7 +1424,7 @@ export class CodeApplication extends Disposable {
 		try {
 			const argvContent = await this.fileService.readFile(this.environmentMainService.argvResource);
 			const argvString = argvContent.value.toString();
-			const argvJSON = JSON.parse(stripComments(argvString));
+			const argvJSON = parse<{ 'enable-crash-reporter'?: boolean }>(argvString);
 			const telemetryLevel = getTelemetryLevel(this.configurationService);
 			const enableCrashReporter = telemetryLevel >= TelemetryLevel.CRASH;
 
@@ -1469,6 +1455,9 @@ export class CodeApplication extends Disposable {
 			}
 		} catch (error) {
 			this.logService.error(error);
+
+			// Inform the user via notification
+			this.windowsMainService?.sendToFocused('vscode:showArgvParseWarning');
 		}
 	}
 }
diff --git a/src/vs/code/electron-main/auth.ts b/src/vs/code/electron-main/auth.ts
deleted file mode 100644
index bf2a99f601c..00000000000
--- a/src/vs/code/electron-main/auth.ts
+++ /dev/null
@@ -1,247 +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 { app, AuthenticationResponseDetails, AuthInfo, Event as ElectronEvent, WebContents } from 'electron';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Event } from 'vs/base/common/event';
-import { hash } from 'vs/base/common/hash';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { generateUuid } from 'vs/base/common/uuid';
-import { IEncryptionMainService } from 'vs/platform/encryption/common/encryptionService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IApplicationStorageMainService } from 'vs/platform/storage/electron-main/storageMainService';
-import { IWindowsMainService } from 'vs/platform/windows/electron-main/windows';
-
-interface ElectronAuthenticationResponseDetails extends AuthenticationResponseDetails {
-	firstAuthAttempt?: boolean; // https://github.com/electron/electron/blob/84a42a050e7d45225e69df5bd2d2bf9f1037ea41/shell/browser/login_handler.cc#L70
-}
-
-type LoginEvent = {
-	event: ElectronEvent;
-	authInfo: AuthInfo;
-	req: ElectronAuthenticationResponseDetails;
-
-	callback: (username?: string, password?: string) => void;
-};
-
-type Credentials = {
-	username: string;
-	password: string;
-};
-
-enum ProxyAuthState {
-
-	/**
-	 * Initial state: we will try to use stored credentials
-	 * first to reply to the auth challenge.
-	 */
-	Initial = 1,
-
-	/**
-	 * We used stored credentials and are still challenged,
-	 * so we will show a login dialog next.
-	 */
-	StoredCredentialsUsed,
-
-	/**
-	 * Finally, if we showed a login dialog already, we will
-	 * not show any more login dialogs until restart to reduce
-	 * the UI noise.
-	 */
-	LoginDialogShown
-}
-
-export class ProxyAuthHandler extends Disposable {
-
-	private readonly PROXY_CREDENTIALS_SERVICE_KEY = 'proxy-credentials://';
-
-	private pendingProxyResolve: Promise<Credentials | undefined> | undefined = undefined;
-
-	private state = ProxyAuthState.Initial;
-
-	private sessionCredentials: Credentials | undefined = undefined;
-
-	constructor(
-		@ILogService private readonly logService: ILogService,
-		@IWindowsMainService private readonly windowsMainService: IWindowsMainService,
-		@IEncryptionMainService private readonly encryptionMainService: IEncryptionMainService,
-		@IApplicationStorageMainService private readonly applicationStorageMainService: IApplicationStorageMainService
-	) {
-		super();
-
-		this.registerListeners();
-	}
-
-	private registerListeners(): void {
-		const onLogin = Event.fromNodeEventEmitter<LoginEvent>(app, 'login', (event: ElectronEvent, webContents: WebContents, req: ElectronAuthenticationResponseDetails, authInfo: AuthInfo, callback) => ({ event, webContents, req, authInfo, callback }));
-		this._register(onLogin(this.onLogin, this));
-	}
-
-	private async onLogin({ event, authInfo, req, callback }: LoginEvent): Promise<void> {
-		if (!authInfo.isProxy) {
-			return; // only for proxy
-		}
-
-		if (!this.pendingProxyResolve && this.state === ProxyAuthState.LoginDialogShown && req.firstAuthAttempt) {
-			this.logService.trace('auth#onLogin (proxy) - exit - proxy dialog already shown');
-
-			return; // only one dialog per session at max (except when firstAuthAttempt: false which indicates a login problem)
-		}
-
-		// Signal we handle this event on our own, otherwise
-		// Electron will ignore our provided credentials.
-		event.preventDefault();
-
-		let credentials: Credentials | undefined = undefined;
-		if (!this.pendingProxyResolve) {
-			this.logService.trace('auth#onLogin (proxy) - no pending proxy handling found, starting new');
-
-			this.pendingProxyResolve = this.resolveProxyCredentials(authInfo);
-			try {
-				credentials = await this.pendingProxyResolve;
-			} finally {
-				this.pendingProxyResolve = undefined;
-			}
-		} else {
-			this.logService.trace('auth#onLogin (proxy) - pending proxy handling found');
-
-			credentials = await this.pendingProxyResolve;
-		}
-
-		// According to Electron docs, it is fine to call back without
-		// username or password to signal that the authentication was handled
-		// by us, even though without having credentials received:
-		//
-		// > If `callback` is called without a username or password, the authentication
-		// > request will be cancelled and the authentication error will be returned to the
-		// > page.
-		callback(credentials?.username, credentials?.password);
-	}
-
-	private async resolveProxyCredentials(authInfo: AuthInfo): Promise<Credentials | undefined> {
-		this.logService.trace('auth#resolveProxyCredentials (proxy) - enter');
-
-		try {
-			const credentials = await this.doResolveProxyCredentials(authInfo);
-			if (credentials) {
-				this.logService.trace('auth#resolveProxyCredentials (proxy) - got credentials');
-
-				return credentials;
-			} else {
-				this.logService.trace('auth#resolveProxyCredentials (proxy) - did not get credentials');
-			}
-		} finally {
-			this.logService.trace('auth#resolveProxyCredentials (proxy) - exit');
-		}
-
-		return undefined;
-	}
-
-	private async doResolveProxyCredentials(authInfo: AuthInfo): Promise<Credentials | undefined> {
-		this.logService.trace('auth#doResolveProxyCredentials - enter', authInfo);
-
-		// Compute a hash over the authentication info to be used
-		// with the credentials store to return the right credentials
-		// given the properties of the auth request
-		// (see https://github.com/microsoft/vscode/issues/109497)
-		const authInfoHash = String(hash({ scheme: authInfo.scheme, host: authInfo.host, port: authInfo.port }));
-
-		let storedUsername: string | undefined;
-		let storedPassword: string | undefined;
-		try {
-			// Try to find stored credentials for the given auth info
-			const encryptedValue = this.applicationStorageMainService.get(this.PROXY_CREDENTIALS_SERVICE_KEY + authInfoHash, StorageScope.APPLICATION);
-			if (encryptedValue) {
-				const credentials: Credentials = JSON.parse(await this.encryptionMainService.decrypt(encryptedValue));
-				storedUsername = credentials.username;
-				storedPassword = credentials.password;
-			}
-		} catch (error) {
-			this.logService.error(error); // handle errors by asking user for login via dialog
-		}
-
-		// Reply with stored credentials unless we used them already.
-		// In that case we need to show a login dialog again because
-		// they seem invalid.
-		if (this.state !== ProxyAuthState.StoredCredentialsUsed && typeof storedUsername === 'string' && typeof storedPassword === 'string') {
-			this.logService.trace('auth#doResolveProxyCredentials (proxy) - exit - found stored credentials to use');
-			this.state = ProxyAuthState.StoredCredentialsUsed;
-
-			return { username: storedUsername, password: storedPassword };
-		}
-
-		// Find suitable window to show dialog: prefer to show it in the
-		// active window because any other network request will wait on
-		// the credentials and we want the user to present the dialog.
-		const window = this.windowsMainService.getFocusedWindow() || this.windowsMainService.getLastActiveWindow();
-		if (!window) {
-			this.logService.trace('auth#doResolveProxyCredentials (proxy) - exit - no opened window found to show dialog in');
-
-			return undefined; // unexpected
-		}
-
-		this.logService.trace(`auth#doResolveProxyCredentials (proxy) - asking window ${window.id} to handle proxy login`);
-
-		// Open proxy dialog
-		const payload = {
-			authInfo,
-			username: this.sessionCredentials?.username ?? storedUsername, // prefer to show already used username (if any) over stored
-			password: this.sessionCredentials?.password ?? storedPassword, // prefer to show already used password (if any) over stored
-			replyChannel: `vscode:proxyAuthResponse:${generateUuid()}`
-		};
-		window.sendWhenReady('vscode:openProxyAuthenticationDialog', CancellationToken.None, payload);
-		this.state = ProxyAuthState.LoginDialogShown;
-
-		// Handle reply
-		const loginDialogCredentials = await new Promise<Credentials | undefined>(resolve => {
-			const proxyAuthResponseHandler = async (event: ElectronEvent, channel: string, reply: Credentials & { remember: boolean } | undefined /* canceled */) => {
-				if (channel === payload.replyChannel) {
-					this.logService.trace(`auth#doResolveProxyCredentials - exit - received credentials from window ${window.id}`);
-					window.win?.webContents.off('ipc-message', proxyAuthResponseHandler);
-
-					// We got credentials from the window
-					if (reply) {
-						const credentials: Credentials = { username: reply.username, password: reply.password };
-
-						// Update stored credentials based on `remember` flag
-						try {
-							if (reply.remember) {
-								const encryptedSerializedCredentials = await this.encryptionMainService.encrypt(JSON.stringify(credentials));
-								this.applicationStorageMainService.store(
-									this.PROXY_CREDENTIALS_SERVICE_KEY + authInfoHash,
-									encryptedSerializedCredentials,
-									StorageScope.APPLICATION,
-									// Always store in machine scope because we do not want these values to be synced
-									StorageTarget.MACHINE
-								);
-							} else {
-								this.applicationStorageMainService.remove(this.PROXY_CREDENTIALS_SERVICE_KEY + authInfoHash, StorageScope.APPLICATION);
-							}
-						} catch (error) {
-							this.logService.error(error); // handle gracefully
-						}
-
-						resolve({ username: credentials.username, password: credentials.password });
-					}
-
-					// We did not get any credentials from the window (e.g. cancelled)
-					else {
-						resolve(undefined);
-					}
-				}
-			};
-
-			window.win?.webContents.on('ipc-message', proxyAuthResponseHandler);
-		});
-
-		// Remember credentials for the session in case
-		// the credentials are wrong and we show the dialog
-		// again
-		this.sessionCredentials = loginDialogCredentials;
-
-		return loginDialogCredentials;
-	}
-}
diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts
index 8548fa7ce4d..3f819e1662b 100644
--- a/src/vs/code/electron-main/main.ts
+++ b/src/vs/code/electron-main/main.ts
@@ -3,75 +3,75 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/platform/update/common/update.config.contribution';
+import '../../platform/update/common/update.config.contribution.js';
 
 import { app, dialog } from 'electron';
-import { unlinkSync } from 'fs';
-import { URI } from 'vs/base/common/uri';
-import { coalesce, distinct } from 'vs/base/common/arrays';
-import { Promises } from 'vs/base/common/async';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { ExpectedError, setUnexpectedErrorHandler } from 'vs/base/common/errors';
-import { IPathWithLineAndColumn, isValidBasename, parseLineAndColumnAware, sanitizeFilePath } from 'vs/base/common/extpath';
-import { Event } from 'vs/base/common/event';
-import { getPathLabel } from 'vs/base/common/labels';
-import { Schemas } from 'vs/base/common/network';
-import { basename, resolve } from 'vs/base/common/path';
-import { mark } from 'vs/base/common/performance';
-import { IProcessEnvironment, isMacintosh, isWindows, OS } from 'vs/base/common/platform';
-import { cwd } from 'vs/base/common/process';
-import { rtrim, trim } from 'vs/base/common/strings';
-import { Promises as FSPromises } from 'vs/base/node/pfs';
-import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
-import { Client as NodeIPCClient } from 'vs/base/parts/ipc/common/ipc.net';
-import { connect as nodeIPCConnect, serve as nodeIPCServe, Server as NodeIPCServer, XDG_RUNTIME_DIR } from 'vs/base/parts/ipc/node/ipc.net';
-import { CodeApplication } from 'vs/code/electron-main/app';
-import { localize } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ConfigurationService } from 'vs/platform/configuration/common/configurationService';
-import { IDiagnosticsMainService } from 'vs/platform/diagnostics/electron-main/diagnosticsMainService';
-import { DiagnosticsService } from 'vs/platform/diagnostics/node/diagnosticsService';
-import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
-import { EnvironmentMainService, IEnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
-import { addArg, parseMainProcessArgv } from 'vs/platform/environment/node/argvHelper';
-import { createWaitMarkerFileSync } from 'vs/platform/environment/node/wait';
-import { IFileService } from 'vs/platform/files/common/files';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { ILaunchMainService } from 'vs/platform/launch/electron-main/launchMainService';
-import { ILifecycleMainService, LifecycleMainService } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
-import { BufferLogger } from 'vs/platform/log/common/bufferLog';
-import { ConsoleMainLogger, getLogLevel, ILoggerService, ILogService } from 'vs/platform/log/common/log';
-import product from 'vs/platform/product/common/product';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IProtocolMainService } from 'vs/platform/protocol/electron-main/protocol';
-import { ProtocolMainService } from 'vs/platform/protocol/electron-main/protocolMainService';
-import { ITunnelService } from 'vs/platform/tunnel/common/tunnel';
-import { TunnelService } from 'vs/platform/tunnel/node/tunnelService';
-import { IRequestService } from 'vs/platform/request/common/request';
-import { RequestMainService } from 'vs/platform/request/electron-main/requestMainService';
-import { ISignService } from 'vs/platform/sign/common/sign';
-import { SignService } from 'vs/platform/sign/node/signService';
-import { IStateReadService, IStateService } from 'vs/platform/state/node/state';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IThemeMainService, ThemeMainService } from 'vs/platform/theme/electron-main/themeMainService';
-import { IUserDataProfilesMainService, UserDataProfilesMainService } from 'vs/platform/userDataProfile/electron-main/userDataProfile';
-import { IPolicyService, NullPolicyService } from 'vs/platform/policy/common/policy';
-import { NativePolicyService } from 'vs/platform/policy/node/nativePolicyService';
-import { FilePolicyService } from 'vs/platform/policy/common/filePolicyService';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { ILoggerMainService, LoggerMainService } from 'vs/platform/log/electron-main/loggerService';
-import { LogService } from 'vs/platform/log/common/logService';
-import { massageMessageBoxOptions } from 'vs/platform/dialogs/common/dialogs';
-import { SaveStrategy, StateService } from 'vs/platform/state/node/stateService';
-import { FileUserDataProvider } from 'vs/platform/userData/common/fileUserDataProvider';
-import { addUNCHostToAllowlist, getUNCHost } from 'vs/base/node/unc';
+import { unlinkSync, promises } from 'fs';
+import { URI } from '../../base/common/uri.js';
+import { coalesce, distinct } from '../../base/common/arrays.js';
+import { Promises } from '../../base/common/async.js';
+import { toErrorMessage } from '../../base/common/errorMessage.js';
+import { ExpectedError, setUnexpectedErrorHandler } from '../../base/common/errors.js';
+import { IPathWithLineAndColumn, isValidBasename, parseLineAndColumnAware, sanitizeFilePath } from '../../base/common/extpath.js';
+import { Event } from '../../base/common/event.js';
+import { getPathLabel } from '../../base/common/labels.js';
+import { Schemas } from '../../base/common/network.js';
+import { basename, resolve } from '../../base/common/path.js';
+import { mark } from '../../base/common/performance.js';
+import { IProcessEnvironment, isMacintosh, isWindows, OS } from '../../base/common/platform.js';
+import { cwd } from '../../base/common/process.js';
+import { rtrim, trim } from '../../base/common/strings.js';
+import { Promises as FSPromises } from '../../base/node/pfs.js';
+import { ProxyChannel } from '../../base/parts/ipc/common/ipc.js';
+import { Client as NodeIPCClient } from '../../base/parts/ipc/common/ipc.net.js';
+import { connect as nodeIPCConnect, serve as nodeIPCServe, Server as NodeIPCServer, XDG_RUNTIME_DIR } from '../../base/parts/ipc/node/ipc.net.js';
+import { CodeApplication } from './app.js';
+import { localize } from '../../nls.js';
+import { IConfigurationService } from '../../platform/configuration/common/configuration.js';
+import { ConfigurationService } from '../../platform/configuration/common/configurationService.js';
+import { IDiagnosticsMainService } from '../../platform/diagnostics/electron-main/diagnosticsMainService.js';
+import { DiagnosticsService } from '../../platform/diagnostics/node/diagnosticsService.js';
+import { NativeParsedArgs } from '../../platform/environment/common/argv.js';
+import { EnvironmentMainService, IEnvironmentMainService } from '../../platform/environment/electron-main/environmentMainService.js';
+import { addArg, parseMainProcessArgv } from '../../platform/environment/node/argvHelper.js';
+import { createWaitMarkerFileSync } from '../../platform/environment/node/wait.js';
+import { IFileService } from '../../platform/files/common/files.js';
+import { FileService } from '../../platform/files/common/fileService.js';
+import { DiskFileSystemProvider } from '../../platform/files/node/diskFileSystemProvider.js';
+import { SyncDescriptor } from '../../platform/instantiation/common/descriptors.js';
+import { IInstantiationService, ServicesAccessor } from '../../platform/instantiation/common/instantiation.js';
+import { InstantiationService } from '../../platform/instantiation/common/instantiationService.js';
+import { ServiceCollection } from '../../platform/instantiation/common/serviceCollection.js';
+import { ILaunchMainService } from '../../platform/launch/electron-main/launchMainService.js';
+import { ILifecycleMainService, LifecycleMainService } from '../../platform/lifecycle/electron-main/lifecycleMainService.js';
+import { BufferLogger } from '../../platform/log/common/bufferLog.js';
+import { ConsoleMainLogger, getLogLevel, ILoggerService, ILogService } from '../../platform/log/common/log.js';
+import product from '../../platform/product/common/product.js';
+import { IProductService } from '../../platform/product/common/productService.js';
+import { IProtocolMainService } from '../../platform/protocol/electron-main/protocol.js';
+import { ProtocolMainService } from '../../platform/protocol/electron-main/protocolMainService.js';
+import { ITunnelService } from '../../platform/tunnel/common/tunnel.js';
+import { TunnelService } from '../../platform/tunnel/node/tunnelService.js';
+import { IRequestService } from '../../platform/request/common/request.js';
+import { RequestService } from '../../platform/request/electron-utility/requestService.js';
+import { ISignService } from '../../platform/sign/common/sign.js';
+import { SignService } from '../../platform/sign/node/signService.js';
+import { IStateReadService, IStateService } from '../../platform/state/node/state.js';
+import { NullTelemetryService } from '../../platform/telemetry/common/telemetryUtils.js';
+import { IThemeMainService, ThemeMainService } from '../../platform/theme/electron-main/themeMainService.js';
+import { IUserDataProfilesMainService, UserDataProfilesMainService } from '../../platform/userDataProfile/electron-main/userDataProfile.js';
+import { IPolicyService, NullPolicyService } from '../../platform/policy/common/policy.js';
+import { NativePolicyService } from '../../platform/policy/node/nativePolicyService.js';
+import { FilePolicyService } from '../../platform/policy/common/filePolicyService.js';
+import { DisposableStore } from '../../base/common/lifecycle.js';
+import { IUriIdentityService } from '../../platform/uriIdentity/common/uriIdentity.js';
+import { UriIdentityService } from '../../platform/uriIdentity/common/uriIdentityService.js';
+import { ILoggerMainService, LoggerMainService } from '../../platform/log/electron-main/loggerService.js';
+import { LogService } from '../../platform/log/common/logService.js';
+import { massageMessageBoxOptions } from '../../platform/dialogs/common/dialogs.js';
+import { SaveStrategy, StateService } from '../../platform/state/node/stateService.js';
+import { FileUserDataProvider } from '../../platform/userData/common/fileUserDataProvider.js';
+import { addUNCHostToAllowlist, getUNCHost } from '../../base/node/unc.js';
 
 /**
  * The main VS Code entry point.
@@ -99,7 +99,7 @@ class CodeMain {
 		setUnexpectedErrorHandler(err => console.error(err));
 
 		// Create services
-		const [instantiationService, instanceEnvironment, environmentMainService, configurationService, stateMainService, bufferLogService, productService, userDataProfilesMainService] = this.createServices();
+		const [instantiationService, instanceEnvironment, environmentMainService, configurationService, stateMainService, bufferLogger, productService, userDataProfilesMainService] = this.createServices();
 
 		try {
 
@@ -133,13 +133,13 @@ class CodeMain {
 				});
 
 				// Delay creation of spdlog for perf reasons (https://github.com/microsoft/vscode/issues/72906)
-				bufferLogService.logger = loggerService.createLogger('main', { name: localize('mainLog', "Main") });
+				bufferLogger.logger = loggerService.createLogger('main', { name: localize('mainLog', "Main") });
 
 				// Lifecycle
 				Event.once(lifecycleMainService.onWillShutdown)(evt => {
 					fileService.dispose();
 					configurationService.dispose();
-					evt.join('instanceLockfile', FSPromises.unlink(environmentMainService.mainLockfile).catch(() => { /* ignored */ }));
+					evt.join('instanceLockfile', promises.unlink(environmentMainService.mainLockfile).catch(() => { /* ignored */ }));
 				});
 
 				return instantiationService.createInstance(CodeApplication, mainProcessNodeIpcServer, instanceEnvironment).startup();
@@ -211,7 +211,7 @@ class CodeMain {
 		services.set(ILifecycleMainService, new SyncDescriptor(LifecycleMainService, undefined, false));
 
 		// Request
-		services.set(IRequestService, new SyncDescriptor(RequestMainService, undefined, true));
+		services.set(IRequestService, new SyncDescriptor(RequestService, undefined, true));
 
 		// Themes
 		services.set(IThemeMainService, new SyncDescriptor(ThemeMainService));
@@ -257,7 +257,7 @@ class CodeMain {
 				environmentMainService.workspaceStorageHome.with({ scheme: Schemas.file }).fsPath,
 				environmentMainService.localHistoryHome.with({ scheme: Schemas.file }).fsPath,
 				environmentMainService.backupHome
-			].map(path => path ? FSPromises.mkdir(path, { recursive: true }) : undefined)),
+			].map(path => path ? promises.mkdir(path, { recursive: true }) : undefined)),
 
 			// State service
 			stateService.init(),
diff --git a/src/vs/code/electron-sandbox/processExplorer/processExplorer-dev.html b/src/vs/code/electron-sandbox/processExplorer/processExplorer-dev.html
index 55f2c0fe81c..19d194fc1c5 100644
--- a/src/vs/code/electron-sandbox/processExplorer/processExplorer-dev.html
+++ b/src/vs/code/electron-sandbox/processExplorer/processExplorer-dev.html
@@ -15,6 +15,8 @@
 				;
 				script-src
 					'self'
+					blob:
+					'nonce-0c6a828f1297'
 				;
 				style-src
 					'self'
@@ -35,8 +37,6 @@
 	</body>
 
 	<!-- Startup (do not modify order of script tags!) -->
-	<script src="../../../../bootstrap.js"></script>
-	<script src="../../../../vs/loader.js"></script>
 	<script src="../../../../bootstrap-window.js"></script>
-	<script src="processExplorer.js"></script>
+	<script src="./processExplorer.js"></script>
 </html>
diff --git a/src/vs/code/electron-sandbox/processExplorer/processExplorer.html b/src/vs/code/electron-sandbox/processExplorer/processExplorer.html
index 845d024e626..d2747202950 100644
--- a/src/vs/code/electron-sandbox/processExplorer/processExplorer.html
+++ b/src/vs/code/electron-sandbox/processExplorer/processExplorer.html
@@ -15,6 +15,8 @@
 				;
 				script-src
 					'self'
+					blob:
+					'nonce-0c6a828f1297'
 				;
 				style-src
 					'self'
@@ -28,6 +30,7 @@
 					'self'
 				;
 		">
+		<link rel="stylesheet" href="./processExplorerMain.css">
 	</head>
 
 	<body aria-label="">
@@ -35,5 +38,5 @@
 	</body>
 
 	<!-- Startup (do not modify order of script tags!) -->
-	<script src="processExplorer.js"></script>
+	<script src="./processExplorer.js" type="module"></script>
 </html>
diff --git a/src/vs/code/electron-sandbox/processExplorer/processExplorer.js b/src/vs/code/electron-sandbox/processExplorer/processExplorer.js
deleted file mode 100644
index 8234b734d06..00000000000
--- a/src/vs/code/electron-sandbox/processExplorer/processExplorer.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-//@ts-check
-(function () {
-	'use strict';
-
-	const bootstrapWindow = bootstrapWindowLib();
-
-	// Load process explorer into window
-	bootstrapWindow.load(['vs/code/electron-sandbox/processExplorer/processExplorerMain'], function (processExplorer, configuration) {
-		return processExplorer.startup(configuration);
-	}, {
-		configureDeveloperSettings: function () {
-			return {
-				forceEnableDeveloperKeybindings: true
-			};
-		},
-	});
-
-	/**
-	 * @typedef {import('../../../base/parts/sandbox/common/sandboxTypes').ISandboxConfiguration} ISandboxConfiguration
-	 *
-	 * @returns {{
-	 *   load: (
-	 *     modules: string[],
-	 *     resultCallback: (result, configuration: ISandboxConfiguration) => unknown,
-	 *     options?: {
-	 *       configureDeveloperSettings?: (config: ISandboxConfiguration) => {
-	 * 			forceEnableDeveloperKeybindings?: boolean,
-	 * 			disallowReloadKeybinding?: boolean,
-	 * 			removeDeveloperKeybindingsAfterLoad?: boolean
-	 * 		 }
-	 *     }
-	 *   ) => Promise<unknown>
-	 * }}
-	 */
-	function bootstrapWindowLib() {
-		// @ts-ignore (defined in bootstrap-window.js)
-		return window.MonacoBootstrapWindow;
-	}
-}());
diff --git a/src/vs/code/electron-sandbox/processExplorer/processExplorer.ts b/src/vs/code/electron-sandbox/processExplorer/processExplorer.ts
new file mode 100644
index 00000000000..6df8c102be9
--- /dev/null
+++ b/src/vs/code/electron-sandbox/processExplorer/processExplorer.ts
@@ -0,0 +1,25 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/* eslint-disable no-restricted-globals */
+
+(async function () {
+
+	type IBootstrapWindow = import('vs/platform/window/electron-sandbox/window.js').IBootstrapWindow;
+	type IProcessExplorerMain = import('vs/code/electron-sandbox/processExplorer/processExplorerMain.js').IProcessExplorerMain;
+	type ProcessExplorerWindowConfiguration = import('vs/platform/issue/common/issue.js').ProcessExplorerWindowConfiguration;
+
+	const bootstrapWindow: IBootstrapWindow = (window as any).MonacoBootstrapWindow; // defined by bootstrap-window.ts
+
+	const { result, configuration } = await bootstrapWindow.load<IProcessExplorerMain, ProcessExplorerWindowConfiguration>('vs/code/electron-sandbox/processExplorer/processExplorerMain', {
+		configureDeveloperSettings: function () {
+			return {
+				forceEnableDeveloperKeybindings: true
+			};
+		},
+	});
+
+	result.startup(configuration);
+}());
diff --git a/src/vs/code/electron-sandbox/processExplorer/processExplorerMain.ts b/src/vs/code/electron-sandbox/processExplorer/processExplorerMain.ts
index 6acf0415bb8..d9f79c61fbb 100644
--- a/src/vs/code/electron-sandbox/processExplorer/processExplorerMain.ts
+++ b/src/vs/code/electron-sandbox/processExplorer/processExplorerMain.ts
@@ -3,29 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/processExplorer';
-import 'vs/base/browser/ui/codicons/codiconStyles'; // make sure codicon css is loaded
-import { localize } from 'vs/nls';
-import { $, append, createStyleSheet } from 'vs/base/browser/dom';
-import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { DataTree } from 'vs/base/browser/ui/tree/dataTree';
-import { IDataSource, ITreeNode, ITreeRenderer } from 'vs/base/browser/ui/tree/tree';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { ProcessItem } from 'vs/base/common/processes';
-import { IContextMenuItem } from 'vs/base/parts/contextmenu/common/contextmenu';
-import { popup } from 'vs/base/parts/contextmenu/electron-sandbox/contextmenu';
-import { ipcRenderer } from 'vs/base/parts/sandbox/electron-sandbox/globals';
-import { IRemoteDiagnosticError, isRemoteDiagnosticError } from 'vs/platform/diagnostics/common/diagnostics';
-import { ByteSize } from 'vs/platform/files/common/files';
-import { ElectronIPCMainProcessService } from 'vs/platform/ipc/electron-sandbox/mainProcessService';
-import { ProcessExplorerData, ProcessExplorerStyles, ProcessExplorerWindowConfiguration } from 'vs/platform/issue/common/issue';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { NativeHostService } from 'vs/platform/native/common/nativeHostService';
-import { getIconsStyleSheet } from 'vs/platform/theme/browser/iconsStyleSheet';
-import { applyZoom, zoomIn, zoomOut } from 'vs/platform/window/electron-sandbox/window';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { mainWindow } from 'vs/base/browser/window';
+import './media/processExplorer.css';
+import '../../../base/browser/ui/codicons/codiconStyles.js'; // make sure codicon css is loaded
+import { localize } from '../../../nls.js';
+import { $, append, createStyleSheet } from '../../../base/browser/dom.js';
+import { IListVirtualDelegate } from '../../../base/browser/ui/list/list.js';
+import { DataTree } from '../../../base/browser/ui/tree/dataTree.js';
+import { IDataSource, ITreeNode, ITreeRenderer } from '../../../base/browser/ui/tree/tree.js';
+import { RunOnceScheduler } from '../../../base/common/async.js';
+import { ProcessItem } from '../../../base/common/processes.js';
+import { IContextMenuItem } from '../../../base/parts/contextmenu/common/contextmenu.js';
+import { popup } from '../../../base/parts/contextmenu/electron-sandbox/contextmenu.js';
+import { ipcRenderer } from '../../../base/parts/sandbox/electron-sandbox/globals.js';
+import { IRemoteDiagnosticError, isRemoteDiagnosticError } from '../../../platform/diagnostics/common/diagnostics.js';
+import { ByteSize } from '../../../platform/files/common/files.js';
+import { ElectronIPCMainProcessService } from '../../../platform/ipc/electron-sandbox/mainProcessService.js';
+import { ProcessExplorerData, ProcessExplorerStyles, ProcessExplorerWindowConfiguration } from '../../../platform/issue/common/issue.js';
+import { INativeHostService } from '../../../platform/native/common/native.js';
+import { NativeHostService } from '../../../platform/native/common/nativeHostService.js';
+import { getIconsStyleSheet } from '../../../platform/theme/browser/iconsStyleSheet.js';
+import { applyZoom, zoomIn, zoomOut } from '../../../platform/window/electron-sandbox/window.js';
+import { StandardKeyboardEvent } from '../../../base/browser/keyboardEvent.js';
+import { KeyCode } from '../../../base/common/keyCodes.js';
+import { mainWindow } from '../../../base/browser/window.js';
 
 const DEBUG_FLAGS_PATTERN = /\s--inspect(?:-brk|port)?=(?<port>\d+)?/;
 const DEBUG_PORT_PATTERN = /\s--inspect-port=(?<port>\d+)/;
@@ -591,6 +591,10 @@ function createCodiconStyleSheet() {
 	delayer.schedule();
 }
 
+export interface IProcessExplorerMain {
+	startup(configuration: ProcessExplorerWindowConfiguration): void;
+}
+
 export function startup(configuration: ProcessExplorerWindowConfiguration): void {
 	const platformClass = configuration.data.platform === 'win32' ? 'windows' : configuration.data.platform === 'linux' ? 'linux' : 'mac';
 	mainWindow.document.body.classList.add(platformClass); // used by our fonts
diff --git a/src/vs/code/electron-sandbox/workbench/workbench-dev.html b/src/vs/code/electron-sandbox/workbench/workbench-dev.html
index a92bea242a4..ea5cbee848a 100644
--- a/src/vs/code/electron-sandbox/workbench/workbench-dev.html
+++ b/src/vs/code/electron-sandbox/workbench/workbench-dev.html
@@ -28,6 +28,7 @@
 					'self'
 					'unsafe-eval'
 					blob:
+					'nonce-0c6a828f1297'
 				;
 				style-src
 					'self'
@@ -48,6 +49,7 @@
 					'script'
 				;
 				trusted-types
+					vscode-bootstrapImportMap
 					amdLoader
 					cellRendererEditorText
 					defaultWorkerFactory
@@ -68,8 +70,6 @@
 	</body>
 
 	<!-- Startup (do not modify order of script tags!) -->
-	<script src="../../../../bootstrap.js"></script>
-	<script src="../../../../vs/loader.js"></script>
 	<script src="../../../../bootstrap-window.js"></script>
-	<script src="workbench.js"></script>
+	<script src="./workbench.js"></script>
 </html>
diff --git a/src/vs/code/electron-sandbox/workbench/workbench.html b/src/vs/code/electron-sandbox/workbench/workbench.html
index eb525bd59f6..c019f3d8913 100644
--- a/src/vs/code/electron-sandbox/workbench/workbench.html
+++ b/src/vs/code/electron-sandbox/workbench/workbench.html
@@ -62,11 +62,14 @@
 					tokenizeToString
 				;
 		"/>
+
+		<!-- Workbench CSS -->
+		<link rel="stylesheet" href="../../../workbench/workbench.desktop.main.css">
 	</head>
 
 	<body aria-label="">
 	</body>
 
 	<!-- Startup (do not modify order of script tags!) -->
-	<script src="workbench.js"></script>
+	<script src="./workbench.js" type="module"></script>
 </html>
diff --git a/src/vs/code/electron-sandbox/workbench/workbench.js b/src/vs/code/electron-sandbox/workbench/workbench.js
deleted file mode 100644
index 35e8368d3c9..00000000000
--- a/src/vs/code/electron-sandbox/workbench/workbench.js
+++ /dev/null
@@ -1,222 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-/// <reference path="../../../../typings/require.d.ts" />
-
-//@ts-check
-(function () {
-	'use strict';
-
-	const bootstrapWindow = bootstrapWindowLib();
-
-	// Add a perf entry right from the top
-	performance.mark('code/didStartRenderer');
-
-	// Load workbench main JS, CSS and NLS all in parallel. This is an
-	// optimization to prevent a waterfall of loading to happen, because
-	// we know for a fact that workbench.desktop.main will depend on
-	// the related CSS and NLS counterparts.
-	bootstrapWindow.load([
-		'vs/workbench/workbench.desktop.main',
-		'vs/nls!vs/workbench/workbench.desktop.main',
-		'vs/css!vs/workbench/workbench.desktop.main'
-	],
-		function (desktopMain, configuration) {
-
-			// Mark start of workbench
-			performance.mark('code/didLoadWorkbenchMain');
-
-			return desktopMain.main(configuration);
-		},
-		{
-			configureDeveloperSettings: function (windowConfig) {
-				return {
-					// disable automated devtools opening on error when running extension tests
-					// as this can lead to nondeterministic test execution (devtools steals focus)
-					forceDisableShowDevtoolsOnError: typeof windowConfig.extensionTestsPath === 'string' || windowConfig['enable-smoke-test-driver'] === true,
-					// enable devtools keybindings in extension development window
-					forceEnableDeveloperKeybindings: Array.isArray(windowConfig.extensionDevelopmentPath) && windowConfig.extensionDevelopmentPath.length > 0,
-					removeDeveloperKeybindingsAfterLoad: true
-				};
-			},
-			canModifyDOM: function (windowConfig) {
-				showSplash(windowConfig);
-			},
-			beforeLoaderConfig: function (loaderConfig) {
-				loaderConfig.recordStats = true;
-			},
-			beforeRequire: function (windowConfig) {
-				performance.mark('code/willLoadWorkbenchMain');
-
-				// Code windows have a `vscodeWindowId` property to identify them
-				Object.defineProperty(window, 'vscodeWindowId', {
-					get: () => windowConfig.windowId
-				});
-
-				// It looks like browsers only lazily enable
-				// the <canvas> element when needed. Since we
-				// leverage canvas elements in our code in many
-				// locations, we try to help the browser to
-				// initialize canvas when it is idle, right
-				// before we wait for the scripts to be loaded.
-				window.requestIdleCallback(() => {
-					const canvas = document.createElement('canvas');
-					const context = canvas.getContext('2d');
-					context?.clearRect(0, 0, canvas.width, canvas.height);
-					canvas.remove();
-				}, { timeout: 50 });
-			}
-		}
-	);
-
-	//#region Helpers
-
-	/**
-	 * @typedef {import('../../../platform/window/common/window').INativeWindowConfiguration} INativeWindowConfiguration
-	 * @typedef {import('../../../platform/environment/common/argv').NativeParsedArgs} NativeParsedArgs
-	 * @typedef {import('../../../base/parts/sandbox/common/sandboxTypes').ISandboxConfiguration} ISandboxConfiguration
-	 *
-	 * @returns {{
-	 *   load: (
-	 *     modules: string[],
-	 *     resultCallback: (result, configuration: INativeWindowConfiguration & NativeParsedArgs) => unknown,
-	 *     options?: {
-	 *       configureDeveloperSettings?: (config: INativeWindowConfiguration & NativeParsedArgs) => {
-	 * 			forceDisableShowDevtoolsOnError?: boolean,
-	 * 			forceEnableDeveloperKeybindings?: boolean,
-	 * 			disallowReloadKeybinding?: boolean,
-	 * 			removeDeveloperKeybindingsAfterLoad?: boolean
-	 * 		 },
-	 * 	     canModifyDOM?: (config: INativeWindowConfiguration & NativeParsedArgs) => void,
-	 * 	     beforeLoaderConfig?: (loaderConfig: object) => void,
-	 *       beforeRequire?: (config: ISandboxConfiguration) => void
-	 *     }
-	 *   ) => Promise<unknown>
-	 * }}
-	 */
-	function bootstrapWindowLib() {
-		// @ts-ignore (defined in bootstrap-window.js)
-		return window.MonacoBootstrapWindow;
-	}
-
-	/**
-	 * @param {INativeWindowConfiguration & NativeParsedArgs} configuration
-	 */
-	function showSplash(configuration) {
-		performance.mark('code/willShowPartsSplash');
-
-		let data = configuration.partsSplash;
-
-		if (data) {
-			// high contrast mode has been turned by the OS -> ignore stored colors and layouts
-			if (configuration.autoDetectHighContrast && configuration.colorScheme.highContrast) {
-				if ((configuration.colorScheme.dark && data.baseTheme !== 'hc-black') || (!configuration.colorScheme.dark && data.baseTheme !== 'hc-light')) {
-					data = undefined;
-				}
-			} else if (configuration.autoDetectColorScheme) {
-				// OS color scheme is tracked and has changed
-				if ((configuration.colorScheme.dark && data.baseTheme !== 'vs-dark') || (!configuration.colorScheme.dark && data.baseTheme !== 'vs')) {
-					data = undefined;
-				}
-			}
-		}
-
-		// developing an extension -> ignore stored layouts
-		if (data && configuration.extensionDevelopmentPath) {
-			data.layoutInfo = undefined;
-		}
-
-		// minimal color configuration (works with or without persisted data)
-		let baseTheme, shellBackground, shellForeground;
-		if (data) {
-			baseTheme = data.baseTheme;
-			shellBackground = data.colorInfo.editorBackground;
-			shellForeground = data.colorInfo.foreground;
-		} else if (configuration.autoDetectHighContrast && configuration.colorScheme.highContrast) {
-			if (configuration.colorScheme.dark) {
-				baseTheme = 'hc-black';
-				shellBackground = '#000000';
-				shellForeground = '#FFFFFF';
-			} else {
-				baseTheme = 'hc-light';
-				shellBackground = '#FFFFFF';
-				shellForeground = '#000000';
-			}
-		} else if (configuration.autoDetectColorScheme) {
-			if (configuration.colorScheme.dark) {
-				baseTheme = 'vs-dark';
-				shellBackground = '#1E1E1E';
-				shellForeground = '#CCCCCC';
-			} else {
-				baseTheme = 'vs';
-				shellBackground = '#FFFFFF';
-				shellForeground = '#000000';
-			}
-		}
-
-		const style = document.createElement('style');
-		style.className = 'initialShellColors';
-		document.head.appendChild(style);
-		style.textContent = `body { background-color: ${shellBackground}; color: ${shellForeground}; margin: 0; padding: 0; }`;
-
-		// set zoom level as soon as possible
-		if (typeof data?.zoomLevel === 'number' && typeof globalThis.vscode?.webFrame?.setZoomLevel === 'function') {
-			globalThis.vscode.webFrame.setZoomLevel(data.zoomLevel);
-		}
-
-		// restore parts if possible (we might not always store layout info)
-		if (data?.layoutInfo) {
-			const { layoutInfo, colorInfo } = data;
-
-			const splash = document.createElement('div');
-			splash.id = 'monaco-parts-splash';
-			splash.className = baseTheme;
-
-			if (layoutInfo.windowBorder) {
-				splash.style.position = 'relative';
-				splash.style.height = 'calc(100vh - 2px)';
-				splash.style.width = 'calc(100vw - 2px)';
-				splash.style.border = '1px solid var(--window-border-color)';
-				splash.style.setProperty('--window-border-color', colorInfo.windowBorder);
-
-				if (layoutInfo.windowBorderRadius) {
-					splash.style.borderRadius = layoutInfo.windowBorderRadius;
-				}
-			}
-
-			// ensure there is enough space
-			layoutInfo.sideBarWidth = Math.min(layoutInfo.sideBarWidth, window.innerWidth - (layoutInfo.activityBarWidth + layoutInfo.editorPartMinWidth));
-
-			// part: title
-			const titleDiv = document.createElement('div');
-			titleDiv.setAttribute('style', `position: absolute; width: 100%; left: 0; top: 0; height: ${layoutInfo.titleBarHeight}px; background-color: ${colorInfo.titleBarBackground}; -webkit-app-region: drag;`);
-			splash.appendChild(titleDiv);
-
-			// part: activity bar
-			const activityDiv = document.createElement('div');
-			activityDiv.setAttribute('style', `position: absolute; height: calc(100% - ${layoutInfo.titleBarHeight}px); top: ${layoutInfo.titleBarHeight}px; ${layoutInfo.sideBarSide}: 0; width: ${layoutInfo.activityBarWidth}px; background-color: ${colorInfo.activityBarBackground};`);
-			splash.appendChild(activityDiv);
-
-			// part: side bar (only when opening workspace/folder)
-			// folder or workspace -> status bar color, sidebar
-			if (configuration.workspace) {
-				const sideDiv = document.createElement('div');
-				sideDiv.setAttribute('style', `position: absolute; height: calc(100% - ${layoutInfo.titleBarHeight}px); top: ${layoutInfo.titleBarHeight}px; ${layoutInfo.sideBarSide}: ${layoutInfo.activityBarWidth}px; width: ${layoutInfo.sideBarWidth}px; background-color: ${colorInfo.sideBarBackground};`);
-				splash.appendChild(sideDiv);
-			}
-
-			// part: statusbar
-			const statusDiv = document.createElement('div');
-			statusDiv.setAttribute('style', `position: absolute; width: 100%; bottom: 0; left: 0; height: ${layoutInfo.statusBarHeight}px; background-color: ${configuration.workspace ? colorInfo.statusBarBackground : colorInfo.statusBarNoFolderBackground};`);
-			splash.appendChild(statusDiv);
-
-			document.body.appendChild(splash);
-		}
-
-		performance.mark('code/didShowPartsSplash');
-	}
-
-	//#endregion
-}());
diff --git a/src/vs/code/electron-sandbox/workbench/workbench.ts b/src/vs/code/electron-sandbox/workbench/workbench.ts
new file mode 100644
index 00000000000..daddd15eb07
--- /dev/null
+++ b/src/vs/code/electron-sandbox/workbench/workbench.ts
@@ -0,0 +1,270 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/* eslint-disable no-restricted-globals */
+
+(async function () {
+
+	// Add a perf entry right from the top
+	performance.mark('code/didStartRenderer');
+
+	type INativeWindowConfiguration = import('vs/platform/window/common/window.ts').INativeWindowConfiguration;
+	type IBootstrapWindow = import('vs/platform/window/electron-sandbox/window.js').IBootstrapWindow;
+	type IMainWindowSandboxGlobals = import('vs/base/parts/sandbox/electron-sandbox/globals.js').IMainWindowSandboxGlobals;
+	type IDesktopMain = import('vs/workbench/electron-sandbox/desktop.main.js').IDesktopMain;
+
+	const bootstrapWindow: IBootstrapWindow = (window as any).MonacoBootstrapWindow; 	// defined by bootstrap-window.ts
+	const preloadGlobals: IMainWindowSandboxGlobals = (window as any).vscode; 			// defined by preload.ts
+
+	//#region Splash Screen Helpers
+
+	function showSplash(configuration: INativeWindowConfiguration) {
+		performance.mark('code/willShowPartsSplash');
+
+		let data = configuration.partsSplash;
+		if (data) {
+			if (configuration.autoDetectHighContrast && configuration.colorScheme.highContrast) {
+				if ((configuration.colorScheme.dark && data.baseTheme !== 'hc-black') || (!configuration.colorScheme.dark && data.baseTheme !== 'hc-light')) {
+					data = undefined; // high contrast mode has been turned by the OS -> ignore stored colors and layouts
+				}
+			} else if (configuration.autoDetectColorScheme) {
+				if ((configuration.colorScheme.dark && data.baseTheme !== 'vs-dark') || (!configuration.colorScheme.dark && data.baseTheme !== 'vs')) {
+					data = undefined; // OS color scheme is tracked and has changed
+				}
+			}
+		}
+
+		// developing an extension -> ignore stored layouts
+		if (data && configuration.extensionDevelopmentPath) {
+			data.layoutInfo = undefined;
+		}
+
+		// minimal color configuration (works with or without persisted data)
+		let baseTheme;
+		let shellBackground;
+		let shellForeground;
+		if (data) {
+			baseTheme = data.baseTheme;
+			shellBackground = data.colorInfo.editorBackground;
+			shellForeground = data.colorInfo.foreground;
+		} else if (configuration.autoDetectHighContrast && configuration.colorScheme.highContrast) {
+			if (configuration.colorScheme.dark) {
+				baseTheme = 'hc-black';
+				shellBackground = '#000000';
+				shellForeground = '#FFFFFF';
+			} else {
+				baseTheme = 'hc-light';
+				shellBackground = '#FFFFFF';
+				shellForeground = '#000000';
+			}
+		} else if (configuration.autoDetectColorScheme) {
+			if (configuration.colorScheme.dark) {
+				baseTheme = 'vs-dark';
+				shellBackground = '#1E1E1E';
+				shellForeground = '#CCCCCC';
+			} else {
+				baseTheme = 'vs';
+				shellBackground = '#FFFFFF';
+				shellForeground = '#000000';
+			}
+		}
+
+		const style = document.createElement('style');
+		style.className = 'initialShellColors';
+		window.document.head.appendChild(style);
+		style.textContent = `body {	background-color: ${shellBackground}; color: ${shellForeground}; margin: 0; padding: 0; }`;
+
+		// set zoom level as soon as possible
+		if (typeof data?.zoomLevel === 'number' && typeof preloadGlobals?.webFrame?.setZoomLevel === 'function') {
+			preloadGlobals.webFrame.setZoomLevel(data.zoomLevel);
+		}
+
+		// restore parts if possible (we might not always store layout info)
+		if (data?.layoutInfo) {
+			const { layoutInfo, colorInfo } = data;
+
+			const splash = document.createElement('div');
+			splash.id = 'monaco-parts-splash';
+			splash.className = baseTheme ?? 'vs-dark';
+
+			if (layoutInfo.windowBorder && colorInfo.windowBorder) {
+				splash.style.position = 'relative';
+				splash.style.height = 'calc(100vh - 2px)';
+				splash.style.width = 'calc(100vw - 2px)';
+				splash.style.border = `1px solid var(--window-border-color)`;
+				splash.style.setProperty('--window-border-color', colorInfo.windowBorder);
+
+				if (layoutInfo.windowBorderRadius) {
+					splash.style.borderRadius = layoutInfo.windowBorderRadius;
+				}
+			}
+
+			// ensure there is enough space
+			layoutInfo.sideBarWidth = Math.min(layoutInfo.sideBarWidth, window.innerWidth - (layoutInfo.activityBarWidth + layoutInfo.editorPartMinWidth));
+
+			// part: title
+			const titleDiv = document.createElement('div');
+			titleDiv.style.position = 'absolute';
+			titleDiv.style.width = '100%';
+			titleDiv.style.height = `${layoutInfo.titleBarHeight}px`;
+			titleDiv.style.left = '0';
+			titleDiv.style.top = '0';
+			titleDiv.style.backgroundColor = `${colorInfo.titleBarBackground}`;
+			(titleDiv.style as any)['-webkit-app-region'] = 'drag';
+			splash.appendChild(titleDiv);
+
+			if (colorInfo.titleBarBorder && layoutInfo.titleBarHeight > 0) {
+				const titleBorder = document.createElement('div');
+				titleBorder.style.position = 'absolute';
+				titleBorder.style.width = '100%';
+				titleBorder.style.height = '1px';
+				titleBorder.style.left = '0';
+				titleBorder.style.bottom = '0';
+				titleBorder.style.borderBottom = `1px solid ${colorInfo.titleBarBorder}`;
+				titleDiv.appendChild(titleBorder);
+			}
+
+			// part: activity bar
+			const activityDiv = document.createElement('div');
+			activityDiv.style.position = 'absolute';
+			activityDiv.style.width = `${layoutInfo.activityBarWidth}px`;
+			activityDiv.style.height = `calc(100% - ${layoutInfo.titleBarHeight + layoutInfo.statusBarHeight}px)`;
+			activityDiv.style.top = `${layoutInfo.titleBarHeight}px`;
+			if (layoutInfo.sideBarSide === 'left') {
+				activityDiv.style.left = '0';
+			} else {
+				activityDiv.style.right = '0';
+			}
+			activityDiv.style.backgroundColor = `${colorInfo.activityBarBackground}`;
+			splash.appendChild(activityDiv);
+
+			if (colorInfo.activityBarBorder && layoutInfo.activityBarWidth > 0) {
+				const activityBorderDiv = document.createElement('div');
+				activityBorderDiv.style.position = 'absolute';
+				activityBorderDiv.style.width = '1px';
+				activityBorderDiv.style.height = '100%';
+				activityBorderDiv.style.top = '0';
+				if (layoutInfo.sideBarSide === 'left') {
+					activityBorderDiv.style.right = '0';
+					activityBorderDiv.style.borderRight = `1px solid ${colorInfo.activityBarBorder}`;
+				} else {
+					activityBorderDiv.style.left = '0';
+					activityBorderDiv.style.borderLeft = `1px solid ${colorInfo.activityBarBorder}`;
+				}
+				activityDiv.appendChild(activityBorderDiv);
+			}
+
+			// part: side bar (only when opening workspace/folder)
+			// folder or workspace -> status bar color, sidebar
+			if (configuration.workspace) {
+				const sideDiv = document.createElement('div');
+				sideDiv.style.position = 'absolute';
+				sideDiv.style.width = `${layoutInfo.sideBarWidth}px`;
+				sideDiv.style.height = `calc(100% - ${layoutInfo.titleBarHeight + layoutInfo.statusBarHeight}px)`;
+				sideDiv.style.top = `${layoutInfo.titleBarHeight}px`;
+				if (layoutInfo.sideBarSide === 'left') {
+					sideDiv.style.left = `${layoutInfo.activityBarWidth}px`;
+				} else {
+					sideDiv.style.right = `${layoutInfo.activityBarWidth}px`;
+				}
+				sideDiv.style.backgroundColor = `${colorInfo.sideBarBackground}`;
+				splash.appendChild(sideDiv);
+
+				if (colorInfo.sideBarBorder && layoutInfo.sideBarWidth > 0) {
+					const sideBorderDiv = document.createElement('div');
+					sideBorderDiv.style.position = 'absolute';
+					sideBorderDiv.style.width = '1px';
+					sideBorderDiv.style.height = '100%';
+					sideBorderDiv.style.top = '0';
+					sideBorderDiv.style.right = '0';
+					if (layoutInfo.sideBarSide === 'left') {
+						sideBorderDiv.style.borderRight = `1px solid ${colorInfo.sideBarBorder}`;
+					} else {
+						sideBorderDiv.style.left = '0';
+						sideBorderDiv.style.borderLeft = `1px solid ${colorInfo.sideBarBorder}`;
+					}
+					sideDiv.appendChild(sideBorderDiv);
+				}
+			}
+
+			// part: statusbar
+			const statusDiv = document.createElement('div');
+			statusDiv.style.position = 'absolute';
+			statusDiv.style.width = '100%';
+			statusDiv.style.height = `${layoutInfo.statusBarHeight}px`;
+			statusDiv.style.bottom = '0';
+			statusDiv.style.left = '0';
+			if (configuration.workspace && colorInfo.statusBarBackground) {
+				statusDiv.style.backgroundColor = colorInfo.statusBarBackground;
+			} else if (!configuration.workspace && colorInfo.statusBarNoFolderBackground) {
+				statusDiv.style.backgroundColor = colorInfo.statusBarNoFolderBackground;
+			}
+			splash.appendChild(statusDiv);
+
+			if (colorInfo.statusBarBorder && layoutInfo.statusBarHeight > 0) {
+				const statusBorderDiv = document.createElement('div');
+				statusBorderDiv.style.position = 'absolute';
+				statusBorderDiv.style.width = '100%';
+				statusBorderDiv.style.height = '1px';
+				statusBorderDiv.style.top = '0';
+				statusBorderDiv.style.borderTop = `1px solid ${colorInfo.statusBarBorder}`;
+				statusDiv.appendChild(statusBorderDiv);
+			}
+
+			window.document.body.appendChild(splash);
+		}
+
+		performance.mark('code/didShowPartsSplash');
+	}
+
+	//#endregion
+
+	const { result, configuration } = await bootstrapWindow.load<IDesktopMain, INativeWindowConfiguration>('vs/workbench/workbench.desktop.main',
+		{
+			configureDeveloperSettings: function (windowConfig) {
+				return {
+					// disable automated devtools opening on error when running extension tests
+					// as this can lead to nondeterministic test execution (devtools steals focus)
+					forceDisableShowDevtoolsOnError: typeof windowConfig.extensionTestsPath === 'string' || windowConfig['enable-smoke-test-driver'] === true,
+					// enable devtools keybindings in extension development window
+					forceEnableDeveloperKeybindings: Array.isArray(windowConfig.extensionDevelopmentPath) && windowConfig.extensionDevelopmentPath.length > 0,
+					removeDeveloperKeybindingsAfterLoad: true
+				};
+			},
+			beforeImport: function (windowConfig) {
+
+				// Show our splash as early as possible
+				showSplash(windowConfig);
+
+				// Code windows have a `vscodeWindowId` property to identify them
+				Object.defineProperty(window, 'vscodeWindowId', {
+					get: () => windowConfig.windowId
+				});
+
+				// It looks like browsers only lazily enable
+				// the <canvas> element when needed. Since we
+				// leverage canvas elements in our code in many
+				// locations, we try to help the browser to
+				// initialize canvas when it is idle, right
+				// before we wait for the scripts to be loaded.
+				window.requestIdleCallback(() => {
+					const canvas = document.createElement('canvas');
+					const context = canvas.getContext('2d');
+					context?.clearRect(0, 0, canvas.width, canvas.height);
+					canvas.remove();
+				}, { timeout: 50 });
+
+				// Track import() perf
+				performance.mark('code/willLoadWorkbenchMain');
+			}
+		}
+	);
+
+	// Mark start of workbench
+	performance.mark('code/didLoadWorkbenchMain');
+
+	// Load workbench
+	result.main(configuration);
+}());
diff --git a/src/vs/code/node/sharedProcess/contrib/codeCacheCleaner.ts b/src/vs/code/electron-utility/sharedProcess/contrib/codeCacheCleaner.ts
similarity index 79%
rename from src/vs/code/node/sharedProcess/contrib/codeCacheCleaner.ts
rename to src/vs/code/electron-utility/sharedProcess/contrib/codeCacheCleaner.ts
index 77ae5d9786a..7560b8fac32 100644
--- a/src/vs/code/node/sharedProcess/contrib/codeCacheCleaner.ts
+++ b/src/vs/code/electron-utility/sharedProcess/contrib/codeCacheCleaner.ts
@@ -3,13 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { basename, dirname, join } from 'vs/base/common/path';
-import { Promises } from 'vs/base/node/pfs';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
+import * as fs from 'fs';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { basename, dirname, join } from '../../../../base/common/path.js';
+import { Promises } from '../../../../base/node/pfs.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
 
 export class CodeCacheCleaner extends Disposable {
 
@@ -54,7 +55,7 @@ export class CodeCacheCleaner extends Disposable {
 
 				// Delete cache folder if old enough
 				const codeCacheEntryPath = join(codeCacheRootPath, codeCache);
-				const codeCacheEntryStat = await Promises.stat(codeCacheEntryPath);
+				const codeCacheEntryStat = await fs.promises.stat(codeCacheEntryPath);
 				if (codeCacheEntryStat.isDirectory() && (now - codeCacheEntryStat.mtime.getTime()) > this._DataMaxAge) {
 					this.logService.trace(`[code cache cleanup]: Removing code cache folder ${codeCache}.`);
 
diff --git a/src/vs/code/node/sharedProcess/contrib/extensions.ts b/src/vs/code/electron-utility/sharedProcess/contrib/extensions.ts
similarity index 67%
rename from src/vs/code/node/sharedProcess/contrib/extensions.ts
rename to src/vs/code/electron-utility/sharedProcess/contrib/extensions.ts
index f1f61f5fbbf..4140b645fab 100644
--- a/src/vs/code/node/sharedProcess/contrib/extensions.ts
+++ b/src/vs/code/electron-utility/sharedProcess/contrib/extensions.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IExtensionGalleryService, IGlobalExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { ExtensionStorageService, IExtensionStorageService } from 'vs/platform/extensionManagement/common/extensionStorage';
-import { migrateUnsupportedExtensions } from 'vs/platform/extensionManagement/common/unsupportedExtensionsMigration';
-import { INativeServerExtensionManagementService } from 'vs/platform/extensionManagement/node/extensionManagementService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IStorageService } from 'vs/platform/storage/common/storage';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IExtensionGalleryService, IGlobalExtensionEnablementService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { ExtensionStorageService, IExtensionStorageService } from '../../../../platform/extensionManagement/common/extensionStorage.js';
+import { migrateUnsupportedExtensions } from '../../../../platform/extensionManagement/common/unsupportedExtensionsMigration.js';
+import { INativeServerExtensionManagementService } from '../../../../platform/extensionManagement/node/extensionManagementService.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
 
 export class ExtensionsContributions extends Disposable {
 	constructor(
diff --git a/src/vs/code/node/sharedProcess/contrib/languagePackCachedDataCleaner.ts b/src/vs/code/electron-utility/sharedProcess/contrib/languagePackCachedDataCleaner.ts
similarity index 77%
rename from src/vs/code/node/sharedProcess/contrib/languagePackCachedDataCleaner.ts
rename to src/vs/code/electron-utility/sharedProcess/contrib/languagePackCachedDataCleaner.ts
index 68d2cc16661..0c70b33f15c 100644
--- a/src/vs/code/node/sharedProcess/contrib/languagePackCachedDataCleaner.ts
+++ b/src/vs/code/electron-utility/sharedProcess/contrib/languagePackCachedDataCleaner.ts
@@ -3,15 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { join } from 'vs/base/common/path';
-import { Promises } from 'vs/base/node/pfs';
-import { INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
+import * as fs from 'fs';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { IStringDictionary } from '../../../../base/common/collections.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { join } from '../../../../base/common/path.js';
+import { Promises } from '../../../../base/node/pfs.js';
+import { INativeEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
 
 interface IExtensionEntry {
 	version: string;
@@ -58,7 +59,7 @@ export class LanguagePackCachedDataCleaner extends Disposable {
 
 		try {
 			const installed: IStringDictionary<boolean> = Object.create(null);
-			const metaData: ILanguagePackFile = JSON.parse(await Promises.readFile(join(this.environmentService.userDataPath, 'languagepacks.json'), 'utf8'));
+			const metaData: ILanguagePackFile = JSON.parse(await fs.promises.readFile(join(this.environmentService.userDataPath, 'languagepacks.json'), 'utf8'));
 			for (const locale of Object.keys(metaData)) {
 				const entry = metaData[locale];
 				installed[`${entry.hash}.${locale}`] = true;
@@ -93,7 +94,7 @@ export class LanguagePackCachedDataCleaner extends Disposable {
 					}
 
 					const candidate = join(folder, entry);
-					const stat = await Promises.stat(candidate);
+					const stat = await fs.promises.stat(candidate);
 					if (stat.isDirectory() && (now - stat.mtime.getTime()) > this._DataMaxAge) {
 						this.logService.trace(`[language pack cache cleanup]: Removing language pack cache folder: ${join(packEntry, entry)}`);
 
diff --git a/src/vs/code/node/sharedProcess/contrib/localizationsUpdater.ts b/src/vs/code/electron-utility/sharedProcess/contrib/localizationsUpdater.ts
similarity index 70%
rename from src/vs/code/node/sharedProcess/contrib/localizationsUpdater.ts
rename to src/vs/code/electron-utility/sharedProcess/contrib/localizationsUpdater.ts
index f035c7d8e4f..59c74ecfb1a 100644
--- a/src/vs/code/node/sharedProcess/contrib/localizationsUpdater.ts
+++ b/src/vs/code/electron-utility/sharedProcess/contrib/localizationsUpdater.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ILanguagePackService } from 'vs/platform/languagePacks/common/languagePacks';
-import { NativeLanguagePackService } from 'vs/platform/languagePacks/node/languagePacks';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ILanguagePackService } from '../../../../platform/languagePacks/common/languagePacks.js';
+import { NativeLanguagePackService } from '../../../../platform/languagePacks/node/languagePacks.js';
 
 export class LocalizationsUpdater extends Disposable {
 
diff --git a/src/vs/code/node/sharedProcess/contrib/logsDataCleaner.ts b/src/vs/code/electron-utility/sharedProcess/contrib/logsDataCleaner.ts
similarity index 72%
rename from src/vs/code/node/sharedProcess/contrib/logsDataCleaner.ts
rename to src/vs/code/electron-utility/sharedProcess/contrib/logsDataCleaner.ts
index 60a3652edf0..384a49a8d0d 100644
--- a/src/vs/code/node/sharedProcess/contrib/logsDataCleaner.ts
+++ b/src/vs/code/electron-utility/sharedProcess/contrib/logsDataCleaner.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { join } from 'vs/base/common/path';
-import { basename, dirname } from 'vs/base/common/resources';
-import { Promises } from 'vs/base/node/pfs';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { ILogService } from 'vs/platform/log/common/log';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { join } from '../../../../base/common/path.js';
+import { basename, dirname } from '../../../../base/common/resources.js';
+import { Promises } from '../../../../base/node/pfs.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
 
 export class LogsDataCleaner extends Disposable {
 
diff --git a/src/vs/code/node/sharedProcess/contrib/storageDataCleaner.ts b/src/vs/code/electron-utility/sharedProcess/contrib/storageDataCleaner.ts
similarity index 71%
rename from src/vs/code/node/sharedProcess/contrib/storageDataCleaner.ts
rename to src/vs/code/electron-utility/sharedProcess/contrib/storageDataCleaner.ts
index 23af4d227b9..6e2e213c568 100644
--- a/src/vs/code/node/sharedProcess/contrib/storageDataCleaner.ts
+++ b/src/vs/code/electron-utility/sharedProcess/contrib/storageDataCleaner.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { join } from 'vs/base/common/path';
-import { Promises } from 'vs/base/node/pfs';
-import { INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-import { ILogService } from 'vs/platform/log/common/log';
-import { StorageClient } from 'vs/platform/storage/common/storageIpc';
-import { EXTENSION_DEVELOPMENT_EMPTY_WINDOW_WORKSPACE } from 'vs/platform/workspace/common/workspace';
-import { NON_EMPTY_WORKSPACE_ID_LENGTH } from 'vs/platform/workspaces/node/workspaces';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { IMainProcessService } from 'vs/platform/ipc/common/mainProcessService';
-import { Schemas } from 'vs/base/common/network';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { join } from '../../../../base/common/path.js';
+import { Promises } from '../../../../base/node/pfs.js';
+import { INativeEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { StorageClient } from '../../../../platform/storage/common/storageIpc.js';
+import { EXTENSION_DEVELOPMENT_EMPTY_WINDOW_WORKSPACE } from '../../../../platform/workspace/common/workspace.js';
+import { NON_EMPTY_WORKSPACE_ID_LENGTH } from '../../../../platform/workspaces/node/workspaces.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { IMainProcessService } from '../../../../platform/ipc/common/mainProcessService.js';
+import { Schemas } from '../../../../base/common/network.js';
 
 export class UnusedWorkspaceStorageDataCleaner extends Disposable {
 
diff --git a/src/vs/code/node/sharedProcess/contrib/userDataProfilesCleaner.ts b/src/vs/code/electron-utility/sharedProcess/contrib/userDataProfilesCleaner.ts
similarity index 73%
rename from src/vs/code/node/sharedProcess/contrib/userDataProfilesCleaner.ts
rename to src/vs/code/electron-utility/sharedProcess/contrib/userDataProfilesCleaner.ts
index 37c57771e24..f1fe69dd66d 100644
--- a/src/vs/code/node/sharedProcess/contrib/userDataProfilesCleaner.ts
+++ b/src/vs/code/electron-utility/sharedProcess/contrib/userDataProfilesCleaner.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
 
 export class UserDataProfilesCleaner extends Disposable {
 
diff --git a/src/vs/code/node/sharedProcess/sharedProcessMain.ts b/src/vs/code/electron-utility/sharedProcess/sharedProcessMain.ts
similarity index 67%
rename from src/vs/code/node/sharedProcess/sharedProcessMain.ts
rename to src/vs/code/electron-utility/sharedProcess/sharedProcessMain.ts
index f8e915491fc..80e8fdab810 100644
--- a/src/vs/code/node/sharedProcess/sharedProcessMain.ts
+++ b/src/vs/code/electron-utility/sharedProcess/sharedProcessMain.ts
@@ -4,121 +4,120 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { hostname, release } from 'os';
-import { MessagePortMain, MessageEvent } from 'vs/base/parts/sandbox/node/electronTypes';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { onUnexpectedError, setUnexpectedErrorHandler } from 'vs/base/common/errors';
-import { combinedDisposable, Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { firstOrDefault } from 'vs/base/common/arrays';
-import { Emitter } from 'vs/base/common/event';
-import { ProxyChannel, StaticRouter } from 'vs/base/parts/ipc/common/ipc';
-import { IClientConnectionFilter, Server as UtilityProcessMessagePortServer, once } from 'vs/base/parts/ipc/node/ipc.mp';
-import { CodeCacheCleaner } from 'vs/code/node/sharedProcess/contrib/codeCacheCleaner';
-import { LanguagePackCachedDataCleaner } from 'vs/code/node/sharedProcess/contrib/languagePackCachedDataCleaner';
-import { LocalizationsUpdater } from 'vs/code/node/sharedProcess/contrib/localizationsUpdater';
-import { LogsDataCleaner } from 'vs/code/node/sharedProcess/contrib/logsDataCleaner';
-import { UnusedWorkspaceStorageDataCleaner } from 'vs/code/node/sharedProcess/contrib/storageDataCleaner';
-import { IChecksumService } from 'vs/platform/checksum/common/checksumService';
-import { ChecksumService } from 'vs/platform/checksum/node/checksumService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ConfigurationService } from 'vs/platform/configuration/common/configurationService';
-import { IDiagnosticsService } from 'vs/platform/diagnostics/common/diagnostics';
-import { DiagnosticsService } from 'vs/platform/diagnostics/node/diagnosticsService';
-import { IDownloadService } from 'vs/platform/download/common/download';
-import { DownloadService } from 'vs/platform/download/common/downloadService';
-import { INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-import { GlobalExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionEnablementService';
-import { ExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionGalleryService';
-import { IExtensionGalleryService, IExtensionManagementService, IExtensionTipsService, IGlobalExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { ExtensionSignatureVerificationService, IExtensionSignatureVerificationService } from 'vs/platform/extensionManagement/node/extensionSignatureVerificationService';
-import { ExtensionManagementChannel, ExtensionTipsChannel } from 'vs/platform/extensionManagement/common/extensionManagementIpc';
-import { ExtensionManagementService, INativeServerExtensionManagementService } from 'vs/platform/extensionManagement/node/extensionManagementService';
-import { IExtensionRecommendationNotificationService } from 'vs/platform/extensionRecommendations/common/extensionRecommendations';
-import { IFileService } from 'vs/platform/files/common/files';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { ILanguagePackService } from 'vs/platform/languagePacks/common/languagePacks';
-import { NativeLanguagePackService } from 'vs/platform/languagePacks/node/languagePacks';
-import { ConsoleLogger, ILoggerService, ILogService } from 'vs/platform/log/common/log';
-import { LoggerChannelClient } from 'vs/platform/log/common/logIpc';
-import product from 'vs/platform/product/common/product';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IRequestService } from 'vs/platform/request/common/request';
-import { ISharedProcessConfiguration } from 'vs/platform/sharedProcess/node/sharedProcess';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { resolveCommonProperties } from 'vs/platform/telemetry/common/commonProperties';
-import { ICustomEndpointTelemetryService, ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { TelemetryAppenderChannel } from 'vs/platform/telemetry/common/telemetryIpc';
-import { TelemetryLogAppender } from 'vs/platform/telemetry/common/telemetryLogAppender';
-import { TelemetryService } from 'vs/platform/telemetry/common/telemetryService';
-import { supportsTelemetry, ITelemetryAppender, NullAppender, NullTelemetryService, getPiiPathsFromEnvironment, isInternalTelemetry, isLoggingOnly } from 'vs/platform/telemetry/common/telemetryUtils';
-import { CustomEndpointTelemetryService } from 'vs/platform/telemetry/node/customEndpointTelemetryService';
-import { ExtensionStorageService, IExtensionStorageService } from 'vs/platform/extensionManagement/common/extensionStorage';
-import { IgnoredExtensionsManagementService, IIgnoredExtensionsManagementService } from 'vs/platform/userDataSync/common/ignoredExtensions';
-import { IUserDataSyncLocalStoreService, IUserDataSyncLogService, IUserDataSyncEnablementService, IUserDataSyncService, IUserDataSyncStoreManagementService, IUserDataSyncStoreService, IUserDataSyncUtilService, registerConfiguration as registerUserDataSyncConfiguration, IUserDataSyncResourceProviderService } from 'vs/platform/userDataSync/common/userDataSync';
-import { IUserDataSyncAccountService, UserDataSyncAccountService } from 'vs/platform/userDataSync/common/userDataSyncAccount';
-import { UserDataSyncLocalStoreService } from 'vs/platform/userDataSync/common/userDataSyncLocalStoreService';
-import { UserDataSyncAccountServiceChannel, UserDataSyncStoreManagementServiceChannel } from 'vs/platform/userDataSync/common/userDataSyncIpc';
-import { UserDataSyncLogService } from 'vs/platform/userDataSync/common/userDataSyncLog';
-import { IUserDataSyncMachinesService, UserDataSyncMachinesService } from 'vs/platform/userDataSync/common/userDataSyncMachines';
-import { UserDataSyncEnablementService } from 'vs/platform/userDataSync/common/userDataSyncEnablementService';
-import { UserDataSyncService } from 'vs/platform/userDataSync/common/userDataSyncService';
-import { UserDataSyncServiceChannel } from 'vs/platform/userDataSync/common/userDataSyncServiceIpc';
-import { UserDataSyncStoreManagementService, UserDataSyncStoreService } from 'vs/platform/userDataSync/common/userDataSyncStoreService';
-import { IUserDataProfileStorageService } from 'vs/platform/userDataProfile/common/userDataProfileStorageService';
-import { NativeUserDataProfileStorageService } from 'vs/platform/userDataProfile/node/userDataProfileStorageService';
-import { ActiveWindowManager } from 'vs/platform/windows/node/windowTracker';
-import { ISignService } from 'vs/platform/sign/common/sign';
-import { SignService } from 'vs/platform/sign/node/signService';
-import { ISharedTunnelsService } from 'vs/platform/tunnel/common/tunnel';
-import { SharedTunnelsService } from 'vs/platform/tunnel/node/tunnelService';
-import { ipcSharedProcessTunnelChannelName, ISharedProcessTunnelService } from 'vs/platform/remote/common/sharedProcessTunnelService';
-import { SharedProcessTunnelService } from 'vs/platform/tunnel/node/sharedProcessTunnelService';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { isLinux } from 'vs/base/common/platform';
-import { FileUserDataProvider } from 'vs/platform/userData/common/fileUserDataProvider';
-import { DiskFileSystemProviderClient, LOCAL_FILE_SYSTEM_CHANNEL_NAME } from 'vs/platform/files/common/diskFileSystemProviderClient';
-import { InspectProfilingService as V8InspectProfilingService } from 'vs/platform/profiling/node/profilingService';
-import { IV8InspectProfilingService } from 'vs/platform/profiling/common/profiling';
-import { IExtensionsScannerService } from 'vs/platform/extensionManagement/common/extensionsScannerService';
-import { ExtensionsScannerService } from 'vs/platform/extensionManagement/node/extensionsScannerService';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IExtensionsProfileScannerService } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService';
-import { PolicyChannelClient } from 'vs/platform/policy/common/policyIpc';
-import { IPolicyService, NullPolicyService } from 'vs/platform/policy/common/policy';
-import { UserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfileIpc';
-import { OneDataSystemAppender } from 'vs/platform/telemetry/node/1dsAppender';
-import { UserDataProfilesCleaner } from 'vs/code/node/sharedProcess/contrib/userDataProfilesCleaner';
-import { IRemoteTunnelService } from 'vs/platform/remoteTunnel/common/remoteTunnel';
-import { UserDataSyncResourceProviderService } from 'vs/platform/userDataSync/common/userDataSyncResourceProvider';
-import { ExtensionsContributions } from 'vs/code/node/sharedProcess/contrib/extensions';
-import { localize } from 'vs/nls';
-import { LogService } from 'vs/platform/log/common/logService';
-import { ISharedProcessLifecycleService, SharedProcessLifecycleService } from 'vs/platform/lifecycle/node/sharedProcessLifecycleService';
-import { RemoteTunnelService } from 'vs/platform/remoteTunnel/node/remoteTunnelService';
-import { ExtensionsProfileScannerService } from 'vs/platform/extensionManagement/node/extensionsProfileScannerService';
-import { RequestChannelClient } from 'vs/platform/request/common/requestIpc';
-import { ExtensionRecommendationNotificationServiceChannelClient } from 'vs/platform/extensionRecommendations/common/extensionRecommendationsIpc';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { NativeHostService } from 'vs/platform/native/common/nativeHostService';
-import { UserDataAutoSyncService } from 'vs/platform/userDataSync/node/userDataAutoSyncService';
-import { ExtensionTipsService } from 'vs/platform/extensionManagement/node/extensionTipsService';
-import { IMainProcessService, MainProcessService } from 'vs/platform/ipc/common/mainProcessService';
-import { RemoteStorageService } from 'vs/platform/storage/common/storageService';
-import { IRemoteSocketFactoryService, RemoteSocketFactoryService } from 'vs/platform/remote/common/remoteSocketFactoryService';
-import { RemoteConnectionType } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { nodeSocketFactory } from 'vs/platform/remote/node/nodeSocketFactory';
-import { NativeEnvironmentService } from 'vs/platform/environment/node/environmentService';
-import { SharedProcessRawConnection, SharedProcessLifecycle } from 'vs/platform/sharedProcess/common/sharedProcess';
-import { getOSReleaseInfo } from 'vs/base/node/osReleaseInfo';
-import { getDesktopEnvironment } from 'vs/base/common/desktopEnvironmentInfo';
-import { getCodeDisplayProtocol, getDisplayProtocol } from 'vs/base/node/osDisplayProtocolInfo';
+import { MessagePortMain, MessageEvent } from '../../../base/parts/sandbox/node/electronTypes.js';
+import { toErrorMessage } from '../../../base/common/errorMessage.js';
+import { onUnexpectedError, setUnexpectedErrorHandler } from '../../../base/common/errors.js';
+import { combinedDisposable, Disposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { Schemas } from '../../../base/common/network.js';
+import { URI } from '../../../base/common/uri.js';
+import { Emitter } from '../../../base/common/event.js';
+import { ProxyChannel, StaticRouter } from '../../../base/parts/ipc/common/ipc.js';
+import { IClientConnectionFilter, Server as UtilityProcessMessagePortServer, once } from '../../../base/parts/ipc/node/ipc.mp.js';
+import { CodeCacheCleaner } from './contrib/codeCacheCleaner.js';
+import { LanguagePackCachedDataCleaner } from './contrib/languagePackCachedDataCleaner.js';
+import { LocalizationsUpdater } from './contrib/localizationsUpdater.js';
+import { LogsDataCleaner } from './contrib/logsDataCleaner.js';
+import { UnusedWorkspaceStorageDataCleaner } from './contrib/storageDataCleaner.js';
+import { IChecksumService } from '../../../platform/checksum/common/checksumService.js';
+import { ChecksumService } from '../../../platform/checksum/node/checksumService.js';
+import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
+import { ConfigurationService } from '../../../platform/configuration/common/configurationService.js';
+import { IDiagnosticsService } from '../../../platform/diagnostics/common/diagnostics.js';
+import { DiagnosticsService } from '../../../platform/diagnostics/node/diagnosticsService.js';
+import { IDownloadService } from '../../../platform/download/common/download.js';
+import { DownloadService } from '../../../platform/download/common/downloadService.js';
+import { INativeEnvironmentService } from '../../../platform/environment/common/environment.js';
+import { GlobalExtensionEnablementService } from '../../../platform/extensionManagement/common/extensionEnablementService.js';
+import { ExtensionGalleryService } from '../../../platform/extensionManagement/common/extensionGalleryService.js';
+import { IExtensionGalleryService, IExtensionManagementService, IExtensionTipsService, IGlobalExtensionEnablementService } from '../../../platform/extensionManagement/common/extensionManagement.js';
+import { ExtensionSignatureVerificationService, IExtensionSignatureVerificationService } from '../../../platform/extensionManagement/node/extensionSignatureVerificationService.js';
+import { ExtensionManagementChannel, ExtensionTipsChannel } from '../../../platform/extensionManagement/common/extensionManagementIpc.js';
+import { ExtensionManagementService, INativeServerExtensionManagementService } from '../../../platform/extensionManagement/node/extensionManagementService.js';
+import { IExtensionRecommendationNotificationService } from '../../../platform/extensionRecommendations/common/extensionRecommendations.js';
+import { IFileService } from '../../../platform/files/common/files.js';
+import { FileService } from '../../../platform/files/common/fileService.js';
+import { DiskFileSystemProvider } from '../../../platform/files/node/diskFileSystemProvider.js';
+import { SyncDescriptor } from '../../../platform/instantiation/common/descriptors.js';
+import { IInstantiationService, ServicesAccessor } from '../../../platform/instantiation/common/instantiation.js';
+import { InstantiationService } from '../../../platform/instantiation/common/instantiationService.js';
+import { ServiceCollection } from '../../../platform/instantiation/common/serviceCollection.js';
+import { ILanguagePackService } from '../../../platform/languagePacks/common/languagePacks.js';
+import { NativeLanguagePackService } from '../../../platform/languagePacks/node/languagePacks.js';
+import { ConsoleLogger, ILoggerService, ILogService } from '../../../platform/log/common/log.js';
+import { LoggerChannelClient } from '../../../platform/log/common/logIpc.js';
+import product from '../../../platform/product/common/product.js';
+import { IProductService } from '../../../platform/product/common/productService.js';
+import { IRequestService } from '../../../platform/request/common/request.js';
+import { ISharedProcessConfiguration } from '../../../platform/sharedProcess/node/sharedProcess.js';
+import { IStorageService } from '../../../platform/storage/common/storage.js';
+import { resolveCommonProperties } from '../../../platform/telemetry/common/commonProperties.js';
+import { ICustomEndpointTelemetryService, ITelemetryService } from '../../../platform/telemetry/common/telemetry.js';
+import { TelemetryAppenderChannel } from '../../../platform/telemetry/common/telemetryIpc.js';
+import { TelemetryLogAppender } from '../../../platform/telemetry/common/telemetryLogAppender.js';
+import { TelemetryService } from '../../../platform/telemetry/common/telemetryService.js';
+import { supportsTelemetry, ITelemetryAppender, NullAppender, NullTelemetryService, getPiiPathsFromEnvironment, isInternalTelemetry, isLoggingOnly } from '../../../platform/telemetry/common/telemetryUtils.js';
+import { CustomEndpointTelemetryService } from '../../../platform/telemetry/node/customEndpointTelemetryService.js';
+import { ExtensionStorageService, IExtensionStorageService } from '../../../platform/extensionManagement/common/extensionStorage.js';
+import { IgnoredExtensionsManagementService, IIgnoredExtensionsManagementService } from '../../../platform/userDataSync/common/ignoredExtensions.js';
+import { IUserDataSyncLocalStoreService, IUserDataSyncLogService, IUserDataSyncEnablementService, IUserDataSyncService, IUserDataSyncStoreManagementService, IUserDataSyncStoreService, IUserDataSyncUtilService, registerConfiguration as registerUserDataSyncConfiguration, IUserDataSyncResourceProviderService } from '../../../platform/userDataSync/common/userDataSync.js';
+import { IUserDataSyncAccountService, UserDataSyncAccountService } from '../../../platform/userDataSync/common/userDataSyncAccount.js';
+import { UserDataSyncLocalStoreService } from '../../../platform/userDataSync/common/userDataSyncLocalStoreService.js';
+import { UserDataSyncAccountServiceChannel, UserDataSyncStoreManagementServiceChannel } from '../../../platform/userDataSync/common/userDataSyncIpc.js';
+import { UserDataSyncLogService } from '../../../platform/userDataSync/common/userDataSyncLog.js';
+import { IUserDataSyncMachinesService, UserDataSyncMachinesService } from '../../../platform/userDataSync/common/userDataSyncMachines.js';
+import { UserDataSyncEnablementService } from '../../../platform/userDataSync/common/userDataSyncEnablementService.js';
+import { UserDataSyncService } from '../../../platform/userDataSync/common/userDataSyncService.js';
+import { UserDataSyncServiceChannel } from '../../../platform/userDataSync/common/userDataSyncServiceIpc.js';
+import { UserDataSyncStoreManagementService, UserDataSyncStoreService } from '../../../platform/userDataSync/common/userDataSyncStoreService.js';
+import { IUserDataProfileStorageService } from '../../../platform/userDataProfile/common/userDataProfileStorageService.js';
+import { SharedProcessUserDataProfileStorageService } from '../../../platform/userDataProfile/node/userDataProfileStorageService.js';
+import { ActiveWindowManager } from '../../../platform/windows/node/windowTracker.js';
+import { ISignService } from '../../../platform/sign/common/sign.js';
+import { SignService } from '../../../platform/sign/node/signService.js';
+import { ISharedTunnelsService } from '../../../platform/tunnel/common/tunnel.js';
+import { SharedTunnelsService } from '../../../platform/tunnel/node/tunnelService.js';
+import { ipcSharedProcessTunnelChannelName, ISharedProcessTunnelService } from '../../../platform/remote/common/sharedProcessTunnelService.js';
+import { SharedProcessTunnelService } from '../../../platform/tunnel/node/sharedProcessTunnelService.js';
+import { IUriIdentityService } from '../../../platform/uriIdentity/common/uriIdentity.js';
+import { UriIdentityService } from '../../../platform/uriIdentity/common/uriIdentityService.js';
+import { isLinux } from '../../../base/common/platform.js';
+import { FileUserDataProvider } from '../../../platform/userData/common/fileUserDataProvider.js';
+import { DiskFileSystemProviderClient, LOCAL_FILE_SYSTEM_CHANNEL_NAME } from '../../../platform/files/common/diskFileSystemProviderClient.js';
+import { InspectProfilingService as V8InspectProfilingService } from '../../../platform/profiling/node/profilingService.js';
+import { IV8InspectProfilingService } from '../../../platform/profiling/common/profiling.js';
+import { IExtensionsScannerService } from '../../../platform/extensionManagement/common/extensionsScannerService.js';
+import { ExtensionsScannerService } from '../../../platform/extensionManagement/node/extensionsScannerService.js';
+import { IUserDataProfilesService } from '../../../platform/userDataProfile/common/userDataProfile.js';
+import { IExtensionsProfileScannerService } from '../../../platform/extensionManagement/common/extensionsProfileScannerService.js';
+import { PolicyChannelClient } from '../../../platform/policy/common/policyIpc.js';
+import { IPolicyService, NullPolicyService } from '../../../platform/policy/common/policy.js';
+import { UserDataProfilesService } from '../../../platform/userDataProfile/common/userDataProfileIpc.js';
+import { OneDataSystemAppender } from '../../../platform/telemetry/node/1dsAppender.js';
+import { UserDataProfilesCleaner } from './contrib/userDataProfilesCleaner.js';
+import { IRemoteTunnelService } from '../../../platform/remoteTunnel/common/remoteTunnel.js';
+import { UserDataSyncResourceProviderService } from '../../../platform/userDataSync/common/userDataSyncResourceProvider.js';
+import { ExtensionsContributions } from './contrib/extensions.js';
+import { localize } from '../../../nls.js';
+import { LogService } from '../../../platform/log/common/logService.js';
+import { ISharedProcessLifecycleService, SharedProcessLifecycleService } from '../../../platform/lifecycle/node/sharedProcessLifecycleService.js';
+import { RemoteTunnelService } from '../../../platform/remoteTunnel/node/remoteTunnelService.js';
+import { ExtensionsProfileScannerService } from '../../../platform/extensionManagement/node/extensionsProfileScannerService.js';
+import { ExtensionRecommendationNotificationServiceChannelClient } from '../../../platform/extensionRecommendations/common/extensionRecommendationsIpc.js';
+import { INativeHostService } from '../../../platform/native/common/native.js';
+import { NativeHostService } from '../../../platform/native/common/nativeHostService.js';
+import { UserDataAutoSyncService } from '../../../platform/userDataSync/node/userDataAutoSyncService.js';
+import { ExtensionTipsService } from '../../../platform/extensionManagement/node/extensionTipsService.js';
+import { IMainProcessService, MainProcessService } from '../../../platform/ipc/common/mainProcessService.js';
+import { RemoteStorageService } from '../../../platform/storage/common/storageService.js';
+import { IRemoteSocketFactoryService, RemoteSocketFactoryService } from '../../../platform/remote/common/remoteSocketFactoryService.js';
+import { RemoteConnectionType } from '../../../platform/remote/common/remoteAuthorityResolver.js';
+import { nodeSocketFactory } from '../../../platform/remote/node/nodeSocketFactory.js';
+import { NativeEnvironmentService } from '../../../platform/environment/node/environmentService.js';
+import { SharedProcessRawConnection, SharedProcessLifecycle } from '../../../platform/sharedProcess/common/sharedProcess.js';
+import { getOSReleaseInfo } from '../../../base/node/osReleaseInfo.js';
+import { getDesktopEnvironment } from '../../../base/common/desktopEnvironmentInfo.js';
+import { getCodeDisplayProtocol, getDisplayProtocol } from '../../../base/node/osDisplayProtocolInfo.js';
+import { RequestService } from '../../../platform/request/electron-utility/requestService.js';
 
 class SharedProcessMain extends Disposable implements IClientConnectionFilter {
 
@@ -271,7 +270,7 @@ class SharedProcessMain extends Disposable implements IClientConnectionFilter {
 		]);
 
 		// Request
-		const requestService = new RequestChannelClient(mainProcessService.getChannel('request'));
+		const requestService = new RequestService(configurationService, environmentService, logService);
 		services.set(IRequestService, requestService);
 
 		// Checksum
@@ -327,7 +326,14 @@ class SharedProcessMain extends Disposable implements IClientConnectionFilter {
 		// Extension Management
 		services.set(IExtensionsProfileScannerService, new SyncDescriptor(ExtensionsProfileScannerService, undefined, true));
 		services.set(IExtensionsScannerService, new SyncDescriptor(ExtensionsScannerService, undefined, true));
-		services.set(IExtensionSignatureVerificationService, new SyncDescriptor(ExtensionSignatureVerificationService, undefined, true));
+
+		if (productService.quality === 'stable') {
+			services.set(IExtensionSignatureVerificationService, new SyncDescriptor(ExtensionSignatureVerificationService, undefined, true));
+		} else {
+			// Do extension signature verification in the main process in insiders
+			services.set(IExtensionSignatureVerificationService, ProxyChannel.toService(mainProcessService.getChannel('signatureVerificationService')));
+		}
+
 		services.set(INativeServerExtensionManagementService, new SyncDescriptor(ExtensionManagementService, undefined, true));
 
 		// Extension Gallery
@@ -355,7 +361,7 @@ class SharedProcessMain extends Disposable implements IClientConnectionFilter {
 		services.set(IUserDataSyncLocalStoreService, new SyncDescriptor(UserDataSyncLocalStoreService, undefined, false /* Eagerly cleans up old backups */));
 		services.set(IUserDataSyncEnablementService, new SyncDescriptor(UserDataSyncEnablementService, undefined, true));
 		services.set(IUserDataSyncService, new SyncDescriptor(UserDataSyncService, undefined, false /* Initializes the Sync State */));
-		services.set(IUserDataProfileStorageService, new SyncDescriptor(NativeUserDataProfileStorageService, undefined, true));
+		services.set(IUserDataProfileStorageService, new SyncDescriptor(SharedProcessUserDataProfileStorageService, undefined, true));
 		services.set(IUserDataSyncResourceProviderService, new SyncDescriptor(UserDataSyncResourceProviderService, undefined, true));
 
 		// Signing
@@ -514,7 +520,7 @@ class SharedProcessMain extends Disposable implements IClientConnectionFilter {
 			return false;
 		}
 
-		const port = firstOrDefault(e.ports);
+		const port = e.ports.at(0);
 		if (port) {
 			this.onDidWindowConnectRaw.fire(port);
 
diff --git a/src/vs/code/node/cli.ts b/src/vs/code/node/cli.ts
index 211d1dbf3e5..6ca979ca03f 100644
--- a/src/vs/code/node/cli.ts
+++ b/src/vs/code/node/cli.ts
@@ -7,27 +7,27 @@ import { ChildProcess, spawn, SpawnOptions, StdioOptions } from 'child_process';
 import { chmodSync, existsSync, readFileSync, statSync, truncateSync, unlinkSync } from 'fs';
 import { homedir, release, tmpdir } from 'os';
 import type { ProfilingSession, Target } from 'v8-inspect-profiler';
-import { Event } from 'vs/base/common/event';
-import { isAbsolute, resolve, join, dirname } from 'vs/base/common/path';
-import { IProcessEnvironment, isMacintosh, isWindows } from 'vs/base/common/platform';
-import { randomPort } from 'vs/base/common/ports';
-import { whenDeleted, writeFileSync } from 'vs/base/node/pfs';
-import { findFreePort } from 'vs/base/node/ports';
-import { watchFileContents } from 'vs/platform/files/node/watcher/nodejs/nodejsWatcherLib';
-import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
-import { buildHelpMessage, buildVersionMessage, NATIVE_CLI_COMMANDS, OPTIONS } from 'vs/platform/environment/node/argv';
-import { addArg, parseCLIProcessArgv } from 'vs/platform/environment/node/argvHelper';
-import { getStdinFilePath, hasStdinWithoutTty, readFromStdin, stdinDataListener } from 'vs/platform/environment/node/stdin';
-import { createWaitMarkerFileSync } from 'vs/platform/environment/node/wait';
-import product from 'vs/platform/product/common/product';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { isUNC, randomPath } from 'vs/base/common/extpath';
-import { Utils } from 'vs/platform/profiling/common/profiling';
-import { FileAccess } from 'vs/base/common/network';
-import { cwd } from 'vs/base/common/process';
-import { addUNCHostToAllowlist } from 'vs/base/node/unc';
-import { URI } from 'vs/base/common/uri';
-import { DeferredPromise } from 'vs/base/common/async';
+import { Event } from '../../base/common/event.js';
+import { isAbsolute, resolve, join, dirname } from '../../base/common/path.js';
+import { IProcessEnvironment, isMacintosh, isWindows } from '../../base/common/platform.js';
+import { randomPort } from '../../base/common/ports.js';
+import { whenDeleted, writeFileSync } from '../../base/node/pfs.js';
+import { findFreePort } from '../../base/node/ports.js';
+import { watchFileContents } from '../../platform/files/node/watcher/nodejs/nodejsWatcherLib.js';
+import { NativeParsedArgs } from '../../platform/environment/common/argv.js';
+import { buildHelpMessage, buildVersionMessage, NATIVE_CLI_COMMANDS, OPTIONS } from '../../platform/environment/node/argv.js';
+import { addArg, parseCLIProcessArgv } from '../../platform/environment/node/argvHelper.js';
+import { getStdinFilePath, hasStdinWithoutTty, readFromStdin, stdinDataListener } from '../../platform/environment/node/stdin.js';
+import { createWaitMarkerFileSync } from '../../platform/environment/node/wait.js';
+import product from '../../platform/product/common/product.js';
+import { CancellationTokenSource } from '../../base/common/cancellation.js';
+import { isUNC, randomPath } from '../../base/common/extpath.js';
+import { Utils } from '../../platform/profiling/common/profiling.js';
+import { FileAccess } from '../../base/common/network.js';
+import { cwd } from '../../base/common/process.js';
+import { addUNCHostToAllowlist } from '../../base/node/unc.js';
+import { URI } from '../../base/common/uri.js';
+import { DeferredPromise } from '../../base/common/async.js';
 
 function shouldSpawnCliProcess(argv: NativeParsedArgs): boolean {
 	return !!argv['install-source']
@@ -39,10 +39,6 @@ function shouldSpawnCliProcess(argv: NativeParsedArgs): boolean {
 		|| !!argv['telemetry'];
 }
 
-interface IMainCli {
-	main: (argv: NativeParsedArgs) => Promise<void>;
-}
-
 export async function main(argv: string[]): Promise<any> {
 	let args: NativeParsedArgs;
 
@@ -59,19 +55,28 @@ export async function main(argv: string[]): Promise<any> {
 				console.error(`'${subcommand}' command not supported in ${product.applicationName}`);
 				return;
 			}
+			const env: IProcessEnvironment = {
+				...process.env
+			};
+			// bootstrap-esm.js determines the electron environment based
+			// on the following variable. For the server we need to unset
+			// it to prevent importing any electron specific modules.
+			// Refs https://github.com/microsoft/vscode/issues/221883
+			delete env['ELECTRON_RUN_AS_NODE'];
+
 			const tunnelArgs = argv.slice(argv.indexOf(subcommand) + 1); // all arguments behind `tunnel`
 			return new Promise((resolve, reject) => {
 				let tunnelProcess: ChildProcess;
 				const stdio: StdioOptions = ['ignore', 'pipe', 'pipe'];
 				if (process.env['VSCODE_DEV']) {
-					tunnelProcess = spawn('cargo', ['run', '--', subcommand, ...tunnelArgs], { cwd: join(getAppRoot(), 'cli'), stdio });
+					tunnelProcess = spawn('cargo', ['run', '--', subcommand, ...tunnelArgs], { cwd: join(getAppRoot(), 'cli'), stdio, env });
 				} else {
 					const appPath = process.platform === 'darwin'
 						// ./Contents/MacOS/Electron => ./Contents/Resources/app/bin/code-tunnel-insiders
 						? join(dirname(dirname(process.execPath)), 'Resources', 'app')
 						: dirname(process.execPath);
 					const tunnelCommand = join(appPath, 'bin', `${product.tunnelApplicationName}${isWindows ? '.exe' : ''}`);
-					tunnelProcess = spawn(tunnelCommand, [subcommand, ...tunnelArgs], { cwd: cwd(), stdio });
+					tunnelProcess = spawn(tunnelCommand, [subcommand, ...tunnelArgs], { cwd: cwd(), stdio, env });
 				}
 
 				tunnelProcess.stdout!.pipe(process.stdout);
@@ -107,12 +112,25 @@ export async function main(argv: string[]): Promise<any> {
 			case 'fish': file = 'fish_xdg_data/fish/vendor_conf.d/shellIntegration.fish'; break;
 			default: throw new Error('Error using --locate-shell-integration-path: Invalid shell type');
 		}
-		console.log(join(getAppRoot(), 'out', 'vs', 'workbench', 'contrib', 'terminal', 'browser', 'media', file));
+		console.log(join(getAppRoot(), 'out', 'vs', 'workbench', 'contrib', 'terminal', 'common', 'scripts', file));
 	}
 
 	// Extensions Management
 	else if (shouldSpawnCliProcess(args)) {
-		const cli = await new Promise<IMainCli>((resolve, reject) => require(['vs/code/node/cliProcessMain'], resolve, reject));
+
+		// We do not bundle `cliProcessMain.js` into this file because
+		// it is rather large and only needed for very few CLI operations.
+		// This has the downside that we need to know if we run OSS or
+		// built, because our location on disk is different if built.
+
+		let cliProcessMain: string;
+		if (process.env['VSCODE_DEV']) {
+			cliProcessMain = './cliProcessMain.js';
+		} else {
+			cliProcessMain = './vs/code/node/cliProcessMain.js';
+		}
+
+		const cli = await import(cliProcessMain);
 		await cli.main(args);
 
 		return;
diff --git a/src/vs/code/node/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts
index 2c1d7afc54c..d3b20ecea47 100644
--- a/src/vs/code/node/cliProcessMain.ts
+++ b/src/vs/code/node/cliProcessMain.ts
@@ -3,67 +3,67 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as fs from 'fs';
 import { hostname, release } from 'os';
-import { raceTimeout } from 'vs/base/common/async';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { isSigPipeError, onUnexpectedError, setUnexpectedErrorHandler } from 'vs/base/common/errors';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { isAbsolute, join } from 'vs/base/common/path';
-import { isWindows } from 'vs/base/common/platform';
-import { cwd } from 'vs/base/common/process';
-import { URI } from 'vs/base/common/uri';
-import { Promises } from 'vs/base/node/pfs';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ConfigurationService } from 'vs/platform/configuration/common/configurationService';
-import { IDownloadService } from 'vs/platform/download/common/download';
-import { DownloadService } from 'vs/platform/download/common/downloadService';
-import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
-import { INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-import { NativeEnvironmentService } from 'vs/platform/environment/node/environmentService';
-import { ExtensionGalleryServiceWithNoStorageService } from 'vs/platform/extensionManagement/common/extensionGalleryService';
-import { IExtensionGalleryService, InstallOptions } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { ExtensionSignatureVerificationService, IExtensionSignatureVerificationService } from 'vs/platform/extensionManagement/node/extensionSignatureVerificationService';
-import { ExtensionManagementCLI } from 'vs/platform/extensionManagement/common/extensionManagementCLI';
-import { IExtensionsProfileScannerService } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService';
-import { IExtensionsScannerService } from 'vs/platform/extensionManagement/common/extensionsScannerService';
-import { ExtensionManagementService, INativeServerExtensionManagementService } from 'vs/platform/extensionManagement/node/extensionManagementService';
-import { ExtensionsScannerService } from 'vs/platform/extensionManagement/node/extensionsScannerService';
-import { IFileService } from 'vs/platform/files/common/files';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { ILanguagePackService } from 'vs/platform/languagePacks/common/languagePacks';
-import { NativeLanguagePackService } from 'vs/platform/languagePacks/node/languagePacks';
-import { ConsoleLogger, getLogLevel, ILogger, ILoggerService, ILogService, LogLevel } from 'vs/platform/log/common/log';
-import { FilePolicyService } from 'vs/platform/policy/common/filePolicyService';
-import { IPolicyService, NullPolicyService } from 'vs/platform/policy/common/policy';
-import { NativePolicyService } from 'vs/platform/policy/node/nativePolicyService';
-import product from 'vs/platform/product/common/product';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IRequestService } from 'vs/platform/request/common/request';
-import { RequestService } from 'vs/platform/request/node/requestService';
-import { SaveStrategy, StateReadonlyService } from 'vs/platform/state/node/stateService';
-import { resolveCommonProperties } from 'vs/platform/telemetry/common/commonProperties';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { ITelemetryServiceConfig, TelemetryService } from 'vs/platform/telemetry/common/telemetryService';
-import { supportsTelemetry, NullTelemetryService, getPiiPathsFromEnvironment, isInternalTelemetry, ITelemetryAppender } from 'vs/platform/telemetry/common/telemetryUtils';
-import { OneDataSystemAppender } from 'vs/platform/telemetry/node/1dsAppender';
-import { buildTelemetryMessage } from 'vs/platform/telemetry/node/telemetry';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { UserDataProfilesReadonlyService } from 'vs/platform/userDataProfile/node/userDataProfile';
-import { resolveMachineId, resolveSqmId, resolvedevDeviceId } from 'vs/platform/telemetry/node/telemetryUtils';
-import { ExtensionsProfileScannerService } from 'vs/platform/extensionManagement/node/extensionsProfileScannerService';
-import { LogService } from 'vs/platform/log/common/logService';
-import { LoggerService } from 'vs/platform/log/node/loggerService';
-import { localize } from 'vs/nls';
-import { FileUserDataProvider } from 'vs/platform/userData/common/fileUserDataProvider';
-import { addUNCHostToAllowlist, getUNCHost } from 'vs/base/node/unc';
+import { raceTimeout } from '../../base/common/async.js';
+import { toErrorMessage } from '../../base/common/errorMessage.js';
+import { isSigPipeError, onUnexpectedError, setUnexpectedErrorHandler } from '../../base/common/errors.js';
+import { Disposable } from '../../base/common/lifecycle.js';
+import { Schemas } from '../../base/common/network.js';
+import { isAbsolute, join } from '../../base/common/path.js';
+import { isWindows } from '../../base/common/platform.js';
+import { cwd } from '../../base/common/process.js';
+import { URI } from '../../base/common/uri.js';
+import { IConfigurationService } from '../../platform/configuration/common/configuration.js';
+import { ConfigurationService } from '../../platform/configuration/common/configurationService.js';
+import { IDownloadService } from '../../platform/download/common/download.js';
+import { DownloadService } from '../../platform/download/common/downloadService.js';
+import { NativeParsedArgs } from '../../platform/environment/common/argv.js';
+import { INativeEnvironmentService } from '../../platform/environment/common/environment.js';
+import { NativeEnvironmentService } from '../../platform/environment/node/environmentService.js';
+import { ExtensionGalleryServiceWithNoStorageService } from '../../platform/extensionManagement/common/extensionGalleryService.js';
+import { IExtensionGalleryService, InstallOptions } from '../../platform/extensionManagement/common/extensionManagement.js';
+import { ExtensionSignatureVerificationService, IExtensionSignatureVerificationService } from '../../platform/extensionManagement/node/extensionSignatureVerificationService.js';
+import { ExtensionManagementCLI } from '../../platform/extensionManagement/common/extensionManagementCLI.js';
+import { IExtensionsProfileScannerService } from '../../platform/extensionManagement/common/extensionsProfileScannerService.js';
+import { IExtensionsScannerService } from '../../platform/extensionManagement/common/extensionsScannerService.js';
+import { ExtensionManagementService, INativeServerExtensionManagementService } from '../../platform/extensionManagement/node/extensionManagementService.js';
+import { ExtensionsScannerService } from '../../platform/extensionManagement/node/extensionsScannerService.js';
+import { IFileService } from '../../platform/files/common/files.js';
+import { FileService } from '../../platform/files/common/fileService.js';
+import { DiskFileSystemProvider } from '../../platform/files/node/diskFileSystemProvider.js';
+import { SyncDescriptor } from '../../platform/instantiation/common/descriptors.js';
+import { IInstantiationService } from '../../platform/instantiation/common/instantiation.js';
+import { InstantiationService } from '../../platform/instantiation/common/instantiationService.js';
+import { ServiceCollection } from '../../platform/instantiation/common/serviceCollection.js';
+import { ILanguagePackService } from '../../platform/languagePacks/common/languagePacks.js';
+import { NativeLanguagePackService } from '../../platform/languagePacks/node/languagePacks.js';
+import { ConsoleLogger, getLogLevel, ILogger, ILoggerService, ILogService, LogLevel } from '../../platform/log/common/log.js';
+import { FilePolicyService } from '../../platform/policy/common/filePolicyService.js';
+import { IPolicyService, NullPolicyService } from '../../platform/policy/common/policy.js';
+import { NativePolicyService } from '../../platform/policy/node/nativePolicyService.js';
+import product from '../../platform/product/common/product.js';
+import { IProductService } from '../../platform/product/common/productService.js';
+import { IRequestService } from '../../platform/request/common/request.js';
+import { RequestService } from '../../platform/request/node/requestService.js';
+import { SaveStrategy, StateReadonlyService } from '../../platform/state/node/stateService.js';
+import { resolveCommonProperties } from '../../platform/telemetry/common/commonProperties.js';
+import { ITelemetryService } from '../../platform/telemetry/common/telemetry.js';
+import { ITelemetryServiceConfig, TelemetryService } from '../../platform/telemetry/common/telemetryService.js';
+import { supportsTelemetry, NullTelemetryService, getPiiPathsFromEnvironment, isInternalTelemetry, ITelemetryAppender } from '../../platform/telemetry/common/telemetryUtils.js';
+import { OneDataSystemAppender } from '../../platform/telemetry/node/1dsAppender.js';
+import { buildTelemetryMessage } from '../../platform/telemetry/node/telemetry.js';
+import { IUriIdentityService } from '../../platform/uriIdentity/common/uriIdentity.js';
+import { UriIdentityService } from '../../platform/uriIdentity/common/uriIdentityService.js';
+import { IUserDataProfile, IUserDataProfilesService } from '../../platform/userDataProfile/common/userDataProfile.js';
+import { UserDataProfilesReadonlyService } from '../../platform/userDataProfile/node/userDataProfile.js';
+import { resolveMachineId, resolveSqmId, resolvedevDeviceId } from '../../platform/telemetry/node/telemetryUtils.js';
+import { ExtensionsProfileScannerService } from '../../platform/extensionManagement/node/extensionsProfileScannerService.js';
+import { LogService } from '../../platform/log/common/logService.js';
+import { LoggerService } from '../../platform/log/node/loggerService.js';
+import { localize } from '../../nls.js';
+import { FileUserDataProvider } from '../../platform/userData/common/fileUserDataProvider.js';
+import { addUNCHostToAllowlist, getUNCHost } from '../../base/node/unc.js';
 
 class CliMain extends Disposable {
 
@@ -124,7 +124,7 @@ class CliMain extends Disposable {
 		await Promise.all([
 			this.allowWindowsUNCPath(environmentService.appSettingsHome.with({ scheme: Schemas.file }).fsPath),
 			this.allowWindowsUNCPath(environmentService.extensionsPath)
-		].map(path => path ? Promises.mkdir(path, { recursive: true }) : undefined));
+		].map(path => path ? fs.promises.mkdir(path, { recursive: true }) : undefined));
 
 		// Logger
 		const loggerService = new LoggerService(getLogLevel(environmentService), environmentService.logsHome);
@@ -195,7 +195,7 @@ class CliMain extends Disposable {
 		services.set(IUriIdentityService, new UriIdentityService(fileService));
 
 		// Request
-		const requestService = new RequestService(configurationService, environmentService, logService, loggerService);
+		const requestService = new RequestService(configurationService, environmentService, logService);
 		services.set(IRequestService, requestService);
 
 		// Download Service
diff --git a/src/vs/editor/browser/config/charWidthReader.ts b/src/vs/editor/browser/config/charWidthReader.ts
index e1d36f142bf..98846a73d0b 100644
--- a/src/vs/editor/browser/config/charWidthReader.ts
+++ b/src/vs/editor/browser/config/charWidthReader.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { applyFontInfo } from 'vs/editor/browser/config/domFontInfo';
-import { BareFontInfo } from 'vs/editor/common/config/fontInfo';
+import { applyFontInfo } from './domFontInfo.js';
+import { BareFontInfo } from '../../common/config/fontInfo.js';
 
 export const enum CharWidthRequestType {
 	Regular = 0,
diff --git a/src/vs/editor/browser/config/domFontInfo.ts b/src/vs/editor/browser/config/domFontInfo.ts
index dc4f38c54b7..7c235cb9282 100644
--- a/src/vs/editor/browser/config/domFontInfo.ts
+++ b/src/vs/editor/browser/config/domFontInfo.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { FastDomNode } from 'vs/base/browser/fastDomNode';
-import { BareFontInfo } from 'vs/editor/common/config/fontInfo';
+import { FastDomNode } from '../../../base/browser/fastDomNode.js';
+import { BareFontInfo } from '../../common/config/fontInfo.js';
 
 export function applyFontInfo(domNode: FastDomNode<HTMLElement> | HTMLElement, fontInfo: BareFontInfo): void {
 	if (domNode instanceof FastDomNode) {
diff --git a/src/vs/editor/browser/config/editorConfiguration.ts b/src/vs/editor/browser/config/editorConfiguration.ts
index 4de800bd521..d65d85cfe25 100644
--- a/src/vs/editor/browser/config/editorConfiguration.ts
+++ b/src/vs/editor/browser/config/editorConfiguration.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as browser from 'vs/base/browser/browser';
-import * as arrays from 'vs/base/common/arrays';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import * as objects from 'vs/base/common/objects';
-import * as platform from 'vs/base/common/platform';
-import { ElementSizeObserver } from 'vs/editor/browser/config/elementSizeObserver';
-import { FontMeasurements } from 'vs/editor/browser/config/fontMeasurements';
-import { migrateOptions } from 'vs/editor/browser/config/migrateOptions';
-import { TabFocus } from 'vs/editor/browser/config/tabFocus';
-import { ComputeOptionsMemory, ConfigurationChangedEvent, EditorOption, editorOptionsRegistry, FindComputedEditorOptionValueById, IComputedEditorOptions, IEditorOptions, IEnvironmentalOptions } from 'vs/editor/common/config/editorOptions';
-import { EditorZoom } from 'vs/editor/common/config/editorZoom';
-import { BareFontInfo, FontInfo, IValidatedEditorOptions } from 'vs/editor/common/config/fontInfo';
-import { IDimension } from 'vs/editor/common/core/dimension';
-import { IEditorConfiguration } from 'vs/editor/common/config/editorConfiguration';
-import { AccessibilitySupport, IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { getWindow, getWindowById } from 'vs/base/browser/dom';
-import { PixelRatio } from 'vs/base/browser/pixelRatio';
-import { MenuId } from 'vs/platform/actions/common/actions';
+import * as browser from '../../../base/browser/browser.js';
+import * as arrays from '../../../base/common/arrays.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import * as objects from '../../../base/common/objects.js';
+import * as platform from '../../../base/common/platform.js';
+import { ElementSizeObserver } from './elementSizeObserver.js';
+import { FontMeasurements } from './fontMeasurements.js';
+import { migrateOptions } from './migrateOptions.js';
+import { TabFocus } from './tabFocus.js';
+import { ComputeOptionsMemory, ConfigurationChangedEvent, EditorOption, editorOptionsRegistry, FindComputedEditorOptionValueById, IComputedEditorOptions, IEditorOptions, IEnvironmentalOptions } from '../../common/config/editorOptions.js';
+import { EditorZoom } from '../../common/config/editorZoom.js';
+import { BareFontInfo, FontInfo, IValidatedEditorOptions } from '../../common/config/fontInfo.js';
+import { IDimension } from '../../common/core/dimension.js';
+import { IEditorConfiguration } from '../../common/config/editorConfiguration.js';
+import { AccessibilitySupport, IAccessibilityService } from '../../../platform/accessibility/common/accessibility.js';
+import { getWindow, getWindowById } from '../../../base/browser/dom.js';
+import { PixelRatio } from '../../../base/browser/pixelRatio.js';
+import { MenuId } from '../../../platform/actions/common/actions.js';
 
 export interface IEditorConstructionOptions extends IEditorOptions {
 	/**
diff --git a/src/vs/editor/browser/config/elementSizeObserver.ts b/src/vs/editor/browser/config/elementSizeObserver.ts
index 33eefc3aba8..303d6377cdf 100644
--- a/src/vs/editor/browser/config/elementSizeObserver.ts
+++ b/src/vs/editor/browser/config/elementSizeObserver.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IDimension } from 'vs/editor/common/core/dimension';
-import { Emitter, Event } from 'vs/base/common/event';
-import { getWindow, scheduleAtNextAnimationFrame } from 'vs/base/browser/dom';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { IDimension } from '../../common/core/dimension.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { getWindow, scheduleAtNextAnimationFrame } from '../../../base/browser/dom.js';
 
 export class ElementSizeObserver extends Disposable {
 
diff --git a/src/vs/editor/browser/config/fontMeasurements.ts b/src/vs/editor/browser/config/fontMeasurements.ts
index 4b1ac7e21c9..d9a5cb897d9 100644
--- a/src/vs/editor/browser/config/fontMeasurements.ts
+++ b/src/vs/editor/browser/config/fontMeasurements.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getWindowId } from 'vs/base/browser/dom';
-import { PixelRatio } from 'vs/base/browser/pixelRatio';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { CharWidthRequest, CharWidthRequestType, readCharWidths } from 'vs/editor/browser/config/charWidthReader';
-import { EditorFontLigatures } from 'vs/editor/common/config/editorOptions';
-import { BareFontInfo, FontInfo, SERIALIZED_FONT_INFO_VERSION } from 'vs/editor/common/config/fontInfo';
+import { getWindowId } from '../../../base/browser/dom.js';
+import { PixelRatio } from '../../../base/browser/pixelRatio.js';
+import { Emitter } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { CharWidthRequest, CharWidthRequestType, readCharWidths } from './charWidthReader.js';
+import { EditorFontLigatures } from '../../common/config/editorOptions.js';
+import { BareFontInfo, FontInfo, SERIALIZED_FONT_INFO_VERSION } from '../../common/config/fontInfo.js';
 
 /**
  * Serializable font information.
diff --git a/src/vs/editor/browser/config/migrateOptions.ts b/src/vs/editor/browser/config/migrateOptions.ts
index c98f644a339..622994ed7f5 100644
--- a/src/vs/editor/browser/config/migrateOptions.ts
+++ b/src/vs/editor/browser/config/migrateOptions.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
+import { IEditorOptions } from '../../common/config/editorOptions.js';
 
 export interface ISettingsReader {
 	(key: string): any;
diff --git a/src/vs/editor/browser/config/tabFocus.ts b/src/vs/editor/browser/config/tabFocus.ts
index f0102e4c0c3..6d821bc2725 100644
--- a/src/vs/editor/browser/config/tabFocus.ts
+++ b/src/vs/editor/browser/config/tabFocus.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
+import { Emitter, Event } from '../../../base/common/event.js';
 
 class TabFocusImpl {
 	private _tabFocus: boolean = false;
diff --git a/src/vs/editor/browser/controller/editContext/clipboardUtils.ts b/src/vs/editor/browser/controller/editContext/clipboardUtils.ts
new file mode 100644
index 00000000000..d7091d613d6
--- /dev/null
+++ b/src/vs/editor/browser/controller/editContext/clipboardUtils.ts
@@ -0,0 +1,86 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import { IViewModel } from '../../../common/viewModel.js';
+import { Range } from '../../../common/core/range.js';
+import { isWindows } from '../../../../base/common/platform.js';
+
+export function getDataToCopy(viewModel: IViewModel, modelSelections: Range[], emptySelectionClipboard: boolean, copyWithSyntaxHighlighting: boolean): ClipboardDataToCopy {
+	const rawTextToCopy = viewModel.getPlainTextToCopy(modelSelections, emptySelectionClipboard, isWindows);
+	const newLineCharacter = viewModel.model.getEOL();
+
+	const isFromEmptySelection = (emptySelectionClipboard && modelSelections.length === 1 && modelSelections[0].isEmpty());
+	const multicursorText = (Array.isArray(rawTextToCopy) ? rawTextToCopy : null);
+	const text = (Array.isArray(rawTextToCopy) ? rawTextToCopy.join(newLineCharacter) : rawTextToCopy);
+
+	let html: string | null | undefined = undefined;
+	let mode: string | null = null;
+	if (CopyOptions.forceCopyWithSyntaxHighlighting || (copyWithSyntaxHighlighting && text.length < 65536)) {
+		const richText = viewModel.getRichTextToCopy(modelSelections, emptySelectionClipboard);
+		if (richText) {
+			html = richText.html;
+			mode = richText.mode;
+		}
+	}
+	const dataToCopy: ClipboardDataToCopy = {
+		isFromEmptySelection,
+		multicursorText,
+		text,
+		html,
+		mode
+	};
+	return dataToCopy;
+}
+
+/**
+ * Every time we write to the clipboard, we record a bit of extra metadata here.
+ * Every time we read from the cipboard, if the text matches our last written text,
+ * we can fetch the previous metadata.
+ */
+export class InMemoryClipboardMetadataManager {
+	public static readonly INSTANCE = new InMemoryClipboardMetadataManager();
+
+	private _lastState: InMemoryClipboardMetadata | null;
+
+	constructor() {
+		this._lastState = null;
+	}
+
+	public set(lastCopiedValue: string, data: ClipboardStoredMetadata): void {
+		this._lastState = { lastCopiedValue, data };
+	}
+
+	public get(pastedText: string): ClipboardStoredMetadata | null {
+		if (this._lastState && this._lastState.lastCopiedValue === pastedText) {
+			// match!
+			return this._lastState.data;
+		}
+		this._lastState = null;
+		return null;
+	}
+}
+
+export interface ClipboardDataToCopy {
+	isFromEmptySelection: boolean;
+	multicursorText: string[] | null | undefined;
+	text: string;
+	html: string | null | undefined;
+	mode: string | null;
+}
+
+export interface ClipboardStoredMetadata {
+	version: 1;
+	isFromEmptySelection: boolean | undefined;
+	multicursorText: string[] | null | undefined;
+	mode: string | null;
+}
+
+export const CopyOptions = {
+	forceCopyWithSyntaxHighlighting: false
+};
+
+interface InMemoryClipboardMetadata {
+	lastCopiedValue: string;
+	data: ClipboardStoredMetadata;
+}
diff --git a/src/vs/editor/browser/controller/editContext/editContext.ts b/src/vs/editor/browser/controller/editContext/editContext.ts
new file mode 100644
index 00000000000..edcf2be3361
--- /dev/null
+++ b/src/vs/editor/browser/controller/editContext/editContext.ts
@@ -0,0 +1,19 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { FastDomNode } from '../../../../base/browser/fastDomNode.js';
+import { Position } from '../../../common/core/position.js';
+import { IEditorAriaOptions } from '../../editorBrowser.js';
+import { ViewPart } from '../../view/viewPart.js';
+
+export abstract class AbstractEditContext extends ViewPart {
+	abstract domNode: FastDomNode<HTMLElement>;
+	abstract focus(): void;
+	abstract isFocused(): boolean;
+	abstract refreshFocusState(): void;
+	abstract setAriaOptions(options: IEditorAriaOptions): void;
+	abstract getLastRenderData(): Position | null;
+	abstract writeScreenReaderContent(reason: string): void;
+}
diff --git a/src/vs/editor/browser/controller/editContext/native/debugEditContext.ts b/src/vs/editor/browser/controller/editContext/native/debugEditContext.ts
new file mode 100644
index 00000000000..301c21dc5bb
--- /dev/null
+++ b/src/vs/editor/browser/controller/editContext/native/debugEditContext.ts
@@ -0,0 +1,225 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+const COLOR_FOR_CONTROL_BOUNDS = 'blue';
+const COLOR_FOR_SELECTION_BOUNDS = 'red';
+const COLOR_FOR_CHARACTER_BOUNDS = 'green';
+
+export class DebugEditContext extends EditContext {
+	private _isDebugging = true;
+	private _controlBounds: DOMRect | null = null;
+	private _selectionBounds: DOMRect | null = null;
+	private _characterBounds: { rangeStart: number; characterBounds: DOMRect[] } | null = null;
+
+	constructor(options?: EditContextInit | undefined) {
+		super(options);
+	}
+
+	override updateText(rangeStart: number, rangeEnd: number, text: string): void {
+		super.updateText(rangeStart, rangeEnd, text);
+		this.renderDebug();
+	}
+	override updateSelection(start: number, end: number): void {
+		super.updateSelection(start, end);
+		this.renderDebug();
+	}
+	override updateControlBounds(controlBounds: DOMRect): void {
+		super.updateControlBounds(controlBounds);
+		this._controlBounds = controlBounds;
+		this.renderDebug();
+	}
+	override updateSelectionBounds(selectionBounds: DOMRect): void {
+		super.updateSelectionBounds(selectionBounds);
+		this._selectionBounds = selectionBounds;
+		this.renderDebug();
+	}
+	override updateCharacterBounds(rangeStart: number, characterBounds: DOMRect[]): void {
+		super.updateCharacterBounds(rangeStart, characterBounds);
+		this._characterBounds = { rangeStart, characterBounds };
+		this.renderDebug();
+	}
+	override attachedElements(): HTMLElement[] {
+		return super.attachedElements();
+	}
+
+	override characterBounds(): DOMRect[] {
+		return super.characterBounds();
+	}
+
+	private readonly _ontextupdateWrapper = new EventListenerWrapper('textupdate', this);
+	private readonly _ontextformatupdateWrapper = new EventListenerWrapper('textformatupdate', this);
+	private readonly _oncharacterboundsupdateWrapper = new EventListenerWrapper('characterboundsupdate', this);
+	private readonly _oncompositionstartWrapper = new EventListenerWrapper('compositionstart', this);
+	private readonly _oncompositionendWrapper = new EventListenerWrapper('compositionend', this);
+
+	override get ontextupdate(): EventHandler | null { return this._ontextupdateWrapper.eventHandler; }
+	override set ontextupdate(value: EventHandler | null) { this._ontextupdateWrapper.eventHandler = value; }
+	override get ontextformatupdate(): EventHandler | null { return this._ontextformatupdateWrapper.eventHandler; }
+	override set ontextformatupdate(value: EventHandler | null) { this._ontextformatupdateWrapper.eventHandler = value; }
+	override get oncharacterboundsupdate(): EventHandler | null { return this._oncharacterboundsupdateWrapper.eventHandler; }
+	override set oncharacterboundsupdate(value: EventHandler | null) { this._oncharacterboundsupdateWrapper.eventHandler = value; }
+	override get oncompositionstart(): EventHandler | null { return this._oncompositionstartWrapper.eventHandler; }
+	override set oncompositionstart(value: EventHandler | null) { this._oncompositionstartWrapper.eventHandler = value; }
+	override get oncompositionend(): EventHandler | null { return this._oncompositionendWrapper.eventHandler; }
+	override set oncompositionend(value: EventHandler | null) { this._oncompositionendWrapper.eventHandler = value; }
+
+
+	private readonly _listenerMap = new Map<EventListenerOrEventListenerObject, EventListenerOrEventListenerObject>();
+
+	override addEventListener<K extends keyof EditContextEventHandlersEventMap>(type: K, listener: (this: GlobalEventHandlers, ev: EditContextEventHandlersEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
+	override addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void {
+		if (!listener) { return; }
+
+		const debugListener = (event: Event) => {
+			if (this._isDebugging) {
+				this.renderDebug();
+				console.log(`DebugEditContex.on_${type}`, event);
+			}
+			if (typeof listener === 'function') {
+				listener.call(this, event);
+			} else if (typeof listener === 'object' && 'handleEvent' in listener) {
+				listener.handleEvent(event);
+			}
+		};
+		this._listenerMap.set(listener, debugListener);
+		super.addEventListener(type, debugListener, options);
+		this.renderDebug();
+	}
+
+	override removeEventListener(type: string, listener: EventListenerOrEventListenerObject | null, options?: boolean | EventListenerOptions | undefined): void {
+		if (!listener) { return; }
+		const debugListener = this._listenerMap.get(listener);
+		if (debugListener) {
+			super.removeEventListener(type, debugListener, options);
+			this._listenerMap.delete(listener);
+		}
+		this.renderDebug();
+	}
+
+	override dispatchEvent(event: Event): boolean {
+		return super.dispatchEvent(event);
+	}
+
+	public startDebugging() {
+		this._isDebugging = true;
+		this.renderDebug();
+	}
+
+	public endDebugging() {
+		this._isDebugging = false;
+		this.renderDebug();
+	}
+
+	private _disposables: { dispose(): void }[] = [];
+
+	public renderDebug() {
+		this._disposables.forEach(d => d.dispose());
+		this._disposables = [];
+		if (!this._isDebugging || this._listenerMap.size === 0) {
+			return;
+		}
+		if (this._controlBounds) {
+			this._disposables.push(createRect(this._controlBounds, COLOR_FOR_CONTROL_BOUNDS));
+		}
+		if (this._selectionBounds) {
+			this._disposables.push(createRect(this._selectionBounds, COLOR_FOR_SELECTION_BOUNDS));
+		}
+		if (this._characterBounds) {
+			for (const rect of this._characterBounds.characterBounds) {
+				this._disposables.push(createRect(rect, COLOR_FOR_CHARACTER_BOUNDS));
+			}
+		}
+		this._disposables.push(createDiv(this.text, this.selectionStart, this.selectionEnd));
+	}
+}
+
+function createDiv(text: string, selectionStart: number, selectionEnd: number) {
+	const ret = document.createElement('div');
+	ret.className = 'debug-rect-marker';
+	ret.style.position = 'absolute';
+	ret.style.zIndex = '999999999';
+	ret.style.bottom = '50px';
+	ret.style.left = '60px';
+	ret.style.backgroundColor = 'white';
+	ret.style.border = '1px solid black';
+	ret.style.padding = '5px';
+	ret.style.whiteSpace = 'pre';
+	ret.style.font = '12px monospace';
+	ret.style.pointerEvents = 'none';
+
+	const before = text.substring(0, selectionStart);
+	const selected = text.substring(selectionStart, selectionEnd) || '|';
+	const after = text.substring(selectionEnd) + ' ';
+
+	const beforeNode = document.createTextNode(before);
+	ret.appendChild(beforeNode);
+
+	const selectedNode = document.createElement('span');
+	selectedNode.style.backgroundColor = 'yellow';
+	selectedNode.appendChild(document.createTextNode(selected));
+
+	selectedNode.style.minWidth = '2px';
+	selectedNode.style.minHeight = '16px';
+	ret.appendChild(selectedNode);
+
+	const afterNode = document.createTextNode(after);
+	ret.appendChild(afterNode);
+
+	// eslint-disable-next-line no-restricted-syntax
+	document.body.appendChild(ret);
+
+	return {
+		dispose: () => {
+			ret.remove();
+		}
+	};
+}
+
+function createRect(rect: DOMRect, color: 'green' | 'blue' | 'red') {
+	const ret = document.createElement('div');
+	ret.className = 'debug-rect-marker';
+	ret.style.position = 'absolute';
+	ret.style.zIndex = '999999999';
+	ret.style.outline = `2px solid ${color}`;
+	ret.style.pointerEvents = 'none';
+
+	ret.style.top = rect.top + 'px';
+	ret.style.left = rect.left + 'px';
+	ret.style.width = rect.width + 'px';
+	ret.style.height = rect.height + 'px';
+
+	// eslint-disable-next-line no-restricted-syntax
+	document.body.appendChild(ret);
+
+	return {
+		dispose: () => {
+			ret.remove();
+		}
+	};
+}
+
+class EventListenerWrapper {
+	private _eventHandler: EventHandler | null = null;
+
+	constructor(
+		private readonly _eventType: string,
+		private readonly _target: EventTarget,
+	) {
+	}
+
+	get eventHandler(): EventHandler | null {
+		return this._eventHandler;
+	}
+
+	set eventHandler(value: EventHandler | null) {
+		if (this._eventHandler) {
+			this._target.removeEventListener(this._eventType, this._eventHandler);
+		}
+		this._eventHandler = value;
+		if (value) {
+			this._target.addEventListener(this._eventType, value);
+		}
+	}
+}
diff --git a/src/vs/editor/browser/controller/editContext/native/nativeEditContext.css b/src/vs/editor/browser/controller/editContext/native/nativeEditContext.css
new file mode 100644
index 00000000000..bfdb765a37b
--- /dev/null
+++ b/src/vs/editor/browser/controller/editContext/native/nativeEditContext.css
@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.monaco-editor .native-edit-context {
+	margin: 0;
+	padding: 0;
+	position: absolute;
+	overflow: hidden;
+	z-index: -10;
+	white-space: pre-wrap;
+	text-wrap: nowrap;
+}
+
+.monaco-editor .edit-context-composition-none {
+	background-color: transparent;
+	border-bottom: none;
+}
+
+.monaco-editor :not(.hc-black, .hc-light) .edit-context-composition-secondary {
+	border-bottom: 1px solid var(--vscode-editor-compositionBorder);
+}
+
+.monaco-editor :not(.hc-black, .hc-light) .edit-context-composition-primary {
+	border-bottom: 2px solid var(--vscode-editor-compositionBorder);
+}
+
+.monaco-editor :is(.hc-black, .hc-light) .edit-context-composition-secondary {
+	border: 1px solid var(--vscode-editor-compositionBorder);
+}
+
+.monaco-editor :is(.hc-black, .hc-light) .edit-context-composition-primary {
+	border: 2px solid var(--vscode-editor-compositionBorder);
+}
diff --git a/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts b/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts
new file mode 100644
index 00000000000..b3cca2d4166
--- /dev/null
+++ b/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts
@@ -0,0 +1,380 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import './nativeEditContext.css';
+import { isFirefox } from '../../../../../base/browser/browser.js';
+import { addDisposableListener } from '../../../../../base/browser/dom.js';
+import { FastDomNode } from '../../../../../base/browser/fastDomNode.js';
+import { StandardKeyboardEvent } from '../../../../../base/browser/keyboardEvent.js';
+import { KeyCode } from '../../../../../base/common/keyCodes.js';
+import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { EditorOption } from '../../../../common/config/editorOptions.js';
+import { EndOfLinePreference, IModelDeltaDecoration } from '../../../../common/model.js';
+import { ViewConfigurationChangedEvent, ViewCursorStateChangedEvent } from '../../../../common/viewEvents.js';
+import { ViewContext } from '../../../../common/viewModel/viewContext.js';
+import { RestrictedRenderingContext, RenderingContext } from '../../../view/renderingContext.js';
+import { ViewController } from '../../../view/viewController.js';
+import { ClipboardStoredMetadata, getDataToCopy, InMemoryClipboardMetadataManager } from '../clipboardUtils.js';
+import { AbstractEditContext } from '../editContext.js';
+import { editContextAddDisposableListener, FocusTracker, ITypeData } from './nativeEditContextUtils.js';
+import { ScreenReaderSupport } from './screenReaderSupport.js';
+import { Range } from '../../../../common/core/range.js';
+import { Selection } from '../../../../common/core/selection.js';
+import { Position } from '../../../../common/core/position.js';
+import { IVisibleRangeProvider } from '../textArea/textAreaEditContext.js';
+import { PositionOffsetTransformer } from '../../../../common/core/positionToOffset.js';
+
+// Corresponds to classes in nativeEditContext.css
+enum CompositionClassName {
+	NONE = 'edit-context-composition-none',
+	SECONDARY = 'edit-context-composition-secondary',
+	PRIMARY = 'edit-context-composition-primary',
+}
+
+export class NativeEditContext extends AbstractEditContext {
+
+	public readonly domNode: FastDomNode<HTMLDivElement>;
+	private readonly _editContext: EditContext;
+	private readonly _screenReaderSupport: ScreenReaderSupport;
+
+	// Overflow guard container
+	private _parent: HTMLElement | undefined;
+	private _decorations: string[] = [];
+	private _primarySelection: Selection = new Selection(1, 1, 1, 1);
+
+	private _textStartPositionWithinEditor: Position = new Position(1, 1);
+
+	private readonly _focusTracker: FocusTracker;
+
+	constructor(
+		context: ViewContext,
+		overflowGuardContainer: FastDomNode<HTMLElement>,
+		viewController: ViewController,
+		private readonly _visibleRangeProvider: IVisibleRangeProvider,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IClipboardService clipboardService: IClipboardService,
+	) {
+		super(context);
+
+		this.domNode = new FastDomNode(document.createElement('div'));
+		this.domNode.setClassName(`native-edit-context`);
+		this._updateDomAttributes();
+
+		overflowGuardContainer.appendChild(this.domNode);
+		this._parent = overflowGuardContainer.domNode;
+
+		this._focusTracker = this._register(new FocusTracker(this.domNode.domNode, (newFocusValue: boolean) => this._context.viewModel.setHasFocus(newFocusValue)));
+
+		this._editContext = new EditContext();
+		this.domNode.domNode.editContext = this._editContext;
+
+		this._screenReaderSupport = instantiationService.createInstance(ScreenReaderSupport, this.domNode, context);
+
+		this._register(addDisposableListener(this.domNode.domNode, 'copy', () => this._ensureClipboardGetsEditorSelection(clipboardService)));
+		this._register(addDisposableListener(this.domNode.domNode, 'cut', () => {
+			this._ensureClipboardGetsEditorSelection(clipboardService);
+			viewController.cut();
+		}));
+
+		this._register(addDisposableListener(this.domNode.domNode, 'keyup', (e) => viewController.emitKeyUp(new StandardKeyboardEvent(e))));
+		this._register(addDisposableListener(this.domNode.domNode, 'keydown', async (e) => {
+
+			const standardKeyboardEvent = new StandardKeyboardEvent(e);
+
+			// When the IME is visible, the keys, like arrow-left and arrow-right, should be used to navigate in the IME, and should not be propagated further
+			if (standardKeyboardEvent.keyCode === KeyCode.KEY_IN_COMPOSITION) {
+				standardKeyboardEvent.stopPropagation();
+			}
+			viewController.emitKeyDown(standardKeyboardEvent);
+		}));
+		this._register(addDisposableListener(this.domNode.domNode, 'beforeinput', async (e) => {
+			if (e.inputType === 'insertParagraph') {
+				this._onType(viewController, { text: '\n', replacePrevCharCnt: 0, replaceNextCharCnt: 0, positionDelta: 0 });
+			}
+		}));
+
+		// Edit context events
+		this._register(editContextAddDisposableListener(this._editContext, 'textformatupdate', (e) => this._handleTextFormatUpdate(e)));
+		this._register(editContextAddDisposableListener(this._editContext, 'characterboundsupdate', (e) => this._updateCharacterBounds(e)));
+		this._register(editContextAddDisposableListener(this._editContext, 'textupdate', (e) => {
+			this._emitTypeEvent(viewController, e);
+		}));
+		this._register(editContextAddDisposableListener(this._editContext, 'compositionstart', (e) => {
+			// Utlimately fires onDidCompositionStart() on the editor to notify for example suggest model of composition state
+			// Updates the composition state of the cursor controller which determines behavior of typing with interceptors
+			viewController.compositionStart();
+			// Emits ViewCompositionStartEvent which can be depended on by ViewEventHandlers
+			this._context.viewModel.onCompositionStart();
+		}));
+		this._register(editContextAddDisposableListener(this._editContext, 'compositionend', (e) => {
+			// Utlimately fires compositionEnd() on the editor to notify for example suggest model of composition state
+			// Updates the composition state of the cursor controller which determines behavior of typing with interceptors
+			viewController.compositionEnd();
+			// Emits ViewCompositionEndEvent which can be depended on by ViewEventHandlers
+			this._context.viewModel.onCompositionEnd();
+		}));
+	}
+
+	// --- Public methods ---
+
+	public override dispose(): void {
+		// Force blue the dom node so can write in pane with no native edit context after disposal
+		this.domNode.domNode.blur();
+		this.domNode.domNode.remove();
+		super.dispose();
+	}
+
+	public setAriaOptions(): void {
+		this._screenReaderSupport.setAriaOptions();
+	}
+
+	/* Last rendered data needed for correct hit-testing and determining the mouse position.
+	 * Without this, the selection will blink as incorrect mouse position is calculated */
+	public getLastRenderData(): Position | null {
+		return this._primarySelection.getPosition();
+	}
+
+	public prepareRender(ctx: RenderingContext): void {
+		this._screenReaderSupport.prepareRender(ctx);
+		this._updateEditContext();
+		this._updateSelectionAndControlBounds(ctx);
+	}
+
+	public render(ctx: RestrictedRenderingContext): void {
+		this._screenReaderSupport.render(ctx);
+	}
+
+	public override onCursorStateChanged(e: ViewCursorStateChangedEvent): boolean {
+		this._primarySelection = e.modelSelections[0] ?? new Selection(1, 1, 1, 1);
+		this._screenReaderSupport.onCursorStateChanged(e);
+		return true;
+	}
+
+	public override onConfigurationChanged(e: ViewConfigurationChangedEvent): boolean {
+		this._screenReaderSupport.onConfigurationChanged(e);
+		this._updateDomAttributes();
+		return true;
+	}
+
+	public writeScreenReaderContent(): void {
+		this._screenReaderSupport.writeScreenReaderContent();
+	}
+
+	public isFocused(): boolean { return this._focusTracker.isFocused; }
+
+	public focus(): void { this._focusTracker.focus(); }
+
+	public refreshFocusState(): void { }
+
+	// --- Private methods ---
+
+	private _updateDomAttributes(): void {
+		const options = this._context.configuration.options;
+		this.domNode.domNode.setAttribute('tabindex', String(options.get(EditorOption.tabIndex)));
+	}
+
+	private _updateEditContext(): void {
+		const editContextState = this._getNewEditContextState();
+		this._editContext.updateText(0, Number.MAX_SAFE_INTEGER, editContextState.text);
+		this._editContext.updateSelection(editContextState.selectionStartOffset, editContextState.selectionEndOffset);
+		this._textStartPositionWithinEditor = editContextState.textStartPositionWithinEditor;
+	}
+
+	private _emitTypeEvent(viewController: ViewController, e: TextUpdateEvent): void {
+		if (!this._editContext) {
+			return;
+		}
+		const model = this._context.viewModel.model;
+		const offsetOfStartOfText = model.getOffsetAt(this._textStartPositionWithinEditor);
+		const offsetOfSelectionEnd = model.getOffsetAt(this._primarySelection.getEndPosition());
+		const offsetOfSelectionStart = model.getOffsetAt(this._primarySelection.getStartPosition());
+		const selectionEndOffset = offsetOfSelectionEnd - offsetOfStartOfText;
+		const selectionStartOffset = offsetOfSelectionStart - offsetOfStartOfText;
+
+		let replaceNextCharCnt = 0;
+		let replacePrevCharCnt = 0;
+		if (e.updateRangeEnd > selectionEndOffset) {
+			replaceNextCharCnt = e.updateRangeEnd - selectionEndOffset;
+		}
+		if (e.updateRangeStart < selectionStartOffset) {
+			replacePrevCharCnt = selectionStartOffset - e.updateRangeStart;
+		}
+		let text = '';
+		if (selectionStartOffset < e.updateRangeStart) {
+			text += this._editContext.text.substring(selectionStartOffset, e.updateRangeStart);
+		}
+		text += e.text;
+		if (selectionEndOffset > e.updateRangeEnd) {
+			text += this._editContext.text.substring(e.updateRangeEnd, selectionEndOffset);
+		}
+		const typeInput: ITypeData = {
+			text,
+			replacePrevCharCnt,
+			replaceNextCharCnt,
+			positionDelta: 0,
+		};
+		this._onType(viewController, typeInput);
+
+		// It could be that the typed letter does not produce a change in the editor text,
+		// for example if an extension registers a custom typing command, and the typing operation does something else like scrolling
+		// Need to update the edit context to reflect this
+		this._updateEditContext();
+	}
+
+	private _onType(viewController: ViewController, typeInput: ITypeData): void {
+		if (typeInput.replacePrevCharCnt || typeInput.replaceNextCharCnt || typeInput.positionDelta) {
+			viewController.compositionType(typeInput.text, typeInput.replacePrevCharCnt, typeInput.replaceNextCharCnt, typeInput.positionDelta);
+		} else {
+			viewController.type(typeInput.text);
+		}
+	}
+
+	private _getNewEditContextState(): { text: string; selectionStartOffset: number; selectionEndOffset: number; textStartPositionWithinEditor: Position } {
+		const model = this._context.viewModel.model;
+		const primarySelectionStartLine = this._primarySelection.startLineNumber;
+		const primarySelectionEndLine = this._primarySelection.endLineNumber;
+		const endColumnOfEndLineNumber = model.getLineMaxColumn(primarySelectionEndLine);
+		const rangeOfText = new Range(primarySelectionStartLine, 1, primarySelectionEndLine, endColumnOfEndLineNumber);
+		const text = model.getValueInRange(rangeOfText, EndOfLinePreference.TextDefined);
+		const selectionStartOffset = this._primarySelection.startColumn - 1;
+		const selectionEndOffset = text.length + this._primarySelection.endColumn - endColumnOfEndLineNumber;
+		const textStartPositionWithinEditor = rangeOfText.getStartPosition();
+		return {
+			text,
+			selectionStartOffset,
+			selectionEndOffset,
+			textStartPositionWithinEditor
+		};
+	}
+
+	private _handleTextFormatUpdate(e: TextFormatUpdateEvent): void {
+		if (!this._editContext) {
+			return;
+		}
+		const formats = e.getTextFormats();
+		const textStartPositionWithinEditor = this._textStartPositionWithinEditor;
+		const decorations: IModelDeltaDecoration[] = [];
+		formats.forEach(f => {
+			const textModel = this._context.viewModel.model;
+			const offsetOfEditContextText = textModel.getOffsetAt(textStartPositionWithinEditor);
+			const startPositionOfDecoration = textModel.getPositionAt(offsetOfEditContextText + f.rangeStart);
+			const endPositionOfDecoration = textModel.getPositionAt(offsetOfEditContextText + f.rangeEnd);
+			const decorationRange = Range.fromPositions(startPositionOfDecoration, endPositionOfDecoration);
+			const thickness = f.underlineThickness.toLowerCase();
+			let decorationClassName: string = CompositionClassName.NONE;
+			switch (thickness) {
+				case 'thin':
+					decorationClassName = CompositionClassName.SECONDARY;
+					break;
+				case 'thick':
+					decorationClassName = CompositionClassName.PRIMARY;
+					break;
+			}
+			decorations.push({
+				range: decorationRange,
+				options: {
+					description: 'textFormatDecoration',
+					inlineClassName: decorationClassName,
+				}
+			});
+		});
+		this._decorations = this._context.viewModel.model.deltaDecorations(this._decorations, decorations);
+	}
+
+	private _updateSelectionAndControlBounds(ctx: RenderingContext) {
+		if (!this._parent) {
+			return;
+		}
+		const options = this._context.configuration.options;
+		const lineHeight = options.get(EditorOption.lineHeight);
+		const contentLeft = options.get(EditorOption.layoutInfo).contentLeft;
+		const parentBounds = this._parent.getBoundingClientRect();
+		const modelStartPosition = this._primarySelection.getStartPosition();
+		const viewStartPosition = this._context.viewModel.coordinatesConverter.convertModelPositionToViewPosition(modelStartPosition);
+		const verticalOffsetStart = this._context.viewLayout.getVerticalOffsetForLineNumber(viewStartPosition.lineNumber);
+		const editorScrollTop = this._context.viewLayout.getCurrentScrollTop();
+		const editorScrollLeft = this._context.viewLayout.getCurrentScrollLeft();
+
+		const top = parentBounds.top + verticalOffsetStart - editorScrollTop;
+		const height = (this._primarySelection.endLineNumber - this._primarySelection.startLineNumber + 1) * lineHeight;
+		let left = parentBounds.left + contentLeft - editorScrollLeft;
+		let width: number;
+
+		if (this._primarySelection.isEmpty()) {
+			const linesVisibleRanges = ctx.visibleRangeForPosition(viewStartPosition);
+			if (linesVisibleRanges) {
+				left += linesVisibleRanges.left;
+			}
+			width = 0;
+		} else {
+			width = parentBounds.width - contentLeft;
+		}
+
+		const selectionBounds = new DOMRect(left, top, width, height);
+		this._editContext.updateSelectionBounds(selectionBounds);
+		this._editContext.updateControlBounds(selectionBounds);
+	}
+
+	private _updateCharacterBounds(e: CharacterBoundsUpdateEvent): void {
+		if (!this._parent) {
+			return;
+		}
+		const options = this._context.configuration.options;
+		const typicalHalfWidthCharacterWidth = options.get(EditorOption.fontInfo).typicalHalfwidthCharacterWidth;
+		const lineHeight = options.get(EditorOption.lineHeight);
+		const contentLeft = options.get(EditorOption.layoutInfo).contentLeft;
+		const parentBounds = this._parent.getBoundingClientRect();
+
+		const characterBounds: DOMRect[] = [];
+		const offsetTransformer = new PositionOffsetTransformer(this._editContext.text);
+		for (let offset = e.rangeStart; offset < e.rangeEnd; offset++) {
+			const editContextStartPosition = offsetTransformer.getPosition(offset);
+			const textStartLineOffsetWithinEditor = this._textStartPositionWithinEditor.lineNumber - 1;
+			const characterStartPosition = new Position(textStartLineOffsetWithinEditor + editContextStartPosition.lineNumber, editContextStartPosition.column);
+			const characterEndPosition = characterStartPosition.delta(0, 1);
+			const characterModelRange = Range.fromPositions(characterStartPosition, characterEndPosition);
+			const characterViewRange = this._context.viewModel.coordinatesConverter.convertModelRangeToViewRange(characterModelRange);
+			const characterLinesVisibleRanges = this._visibleRangeProvider.linesVisibleRangesForRange(characterViewRange, true) ?? [];
+			const characterVerticalOffset = this._context.viewLayout.getVerticalOffsetForLineNumber(characterViewRange.startLineNumber);
+			const editorScrollTop = this._context.viewLayout.getCurrentScrollTop();
+			const editorScrollLeft = this._context.viewLayout.getCurrentScrollLeft();
+			const top = parentBounds.top + characterVerticalOffset - editorScrollTop;
+
+			let left = 0;
+			let width = typicalHalfWidthCharacterWidth;
+			if (characterLinesVisibleRanges.length > 0) {
+				for (const visibleRange of characterLinesVisibleRanges[0].ranges) {
+					left = visibleRange.left;
+					width = visibleRange.width;
+					break;
+				}
+			}
+			characterBounds.push(new DOMRect(parentBounds.left + contentLeft + left - editorScrollLeft, top, width, lineHeight));
+		}
+		this._editContext.updateCharacterBounds(e.rangeStart, characterBounds);
+	}
+
+	private _ensureClipboardGetsEditorSelection(clipboardService: IClipboardService): void {
+		const options = this._context.configuration.options;
+		const emptySelectionClipboard = options.get(EditorOption.emptySelectionClipboard);
+		const copyWithSyntaxHighlighting = options.get(EditorOption.copyWithSyntaxHighlighting);
+		const selections = this._context.viewModel.getCursorStates().map(cursorState => cursorState.modelState.selection);
+		const dataToCopy = getDataToCopy(this._context.viewModel, selections, emptySelectionClipboard, copyWithSyntaxHighlighting);
+		const storedMetadata: ClipboardStoredMetadata = {
+			version: 1,
+			isFromEmptySelection: dataToCopy.isFromEmptySelection,
+			multicursorText: dataToCopy.multicursorText,
+			mode: dataToCopy.mode
+		};
+		InMemoryClipboardMetadataManager.INSTANCE.set(
+			// When writing "LINE\r\n" to the clipboard and then pasting,
+			// Firefox pastes "LINE\n", so let's work around this quirk
+			(isFirefox ? dataToCopy.text.replace(/\r\n/g, '\n') : dataToCopy.text),
+			storedMetadata
+		);
+		clipboardService.writeText(dataToCopy.text);
+	}
+}
diff --git a/src/vs/editor/browser/controller/editContext/native/nativeEditContextUtils.ts b/src/vs/editor/browser/controller/editContext/native/nativeEditContextUtils.ts
new file mode 100644
index 00000000000..e55e1521fac
--- /dev/null
+++ b/src/vs/editor/browser/controller/editContext/native/nativeEditContextUtils.ts
@@ -0,0 +1,55 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { addDisposableListener } from '../../../../../base/browser/dom.js';
+import { IDisposable, Disposable } from '../../../../../base/common/lifecycle.js';
+
+export interface ITypeData {
+	text: string;
+	replacePrevCharCnt: number;
+	replaceNextCharCnt: number;
+	positionDelta: number;
+}
+
+export class FocusTracker extends Disposable {
+	private _isFocused: boolean = false;
+
+	constructor(
+		private readonly _domNode: HTMLElement,
+		private readonly _onFocusChange: (newFocusValue: boolean) => void,
+	) {
+		super();
+		this._register(addDisposableListener(this._domNode, 'focus', () => this._handleFocusedChanged(true)));
+		this._register(addDisposableListener(this._domNode, 'blur', () => this._handleFocusedChanged(false)));
+	}
+
+	private _handleFocusedChanged(focused: boolean): void {
+		if (this._isFocused === focused) {
+			return;
+		}
+		this._isFocused = focused;
+		this._onFocusChange(this._isFocused);
+	}
+
+	public focus(): void {
+		// fixes: https://github.com/microsoft/vscode/issues/228147
+		// Immediately call this method in order to directly set the field isFocused to true so the textInputFocus context key is evaluated correctly
+		this._handleFocusedChanged(true);
+		this._domNode.focus();
+	}
+
+	get isFocused(): boolean {
+		return this._isFocused;
+	}
+}
+
+export function editContextAddDisposableListener<K extends keyof EditContextEventHandlersEventMap>(target: EventTarget, type: K, listener: (this: GlobalEventHandlers, ev: EditContextEventHandlersEventMap[K]) => any, options?: boolean | AddEventListenerOptions): IDisposable {
+	target.addEventListener(type, listener as any, options);
+	return {
+		dispose() {
+			target.removeEventListener(type, listener as any);
+		}
+	};
+}
diff --git a/src/vs/editor/browser/controller/editContext/native/screenReaderSupport.ts b/src/vs/editor/browser/controller/editContext/native/screenReaderSupport.ts
new file mode 100644
index 00000000000..bea87b94bf8
--- /dev/null
+++ b/src/vs/editor/browser/controller/editContext/native/screenReaderSupport.ts
@@ -0,0 +1,164 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { getActiveWindow } from '../../../../../base/browser/dom.js';
+import { FastDomNode } from '../../../../../base/browser/fastDomNode.js';
+import { localize } from '../../../../../nls.js';
+import { AccessibilitySupport } from '../../../../../platform/accessibility/common/accessibility.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { EditorOption } from '../../../../common/config/editorOptions.js';
+import { FontInfo } from '../../../../common/config/fontInfo.js';
+import { Position } from '../../../../common/core/position.js';
+import { Range } from '../../../../common/core/range.js';
+import { Selection } from '../../../../common/core/selection.js';
+import { EndOfLinePreference } from '../../../../common/model.js';
+import { ViewConfigurationChangedEvent, ViewCursorStateChangedEvent } from '../../../../common/viewEvents.js';
+import { ViewContext } from '../../../../common/viewModel/viewContext.js';
+import { applyFontInfo } from '../../../config/domFontInfo.js';
+import { RestrictedRenderingContext, RenderingContext } from '../../../view/renderingContext.js';
+import { ariaLabelForScreenReaderContent, ISimpleModel, newlinecount, PagedScreenReaderStrategy, ScreenReaderContentState } from '../screenReaderUtils.js';
+
+export class ScreenReaderSupport {
+
+	// Configuration values
+	private _contentLeft: number = 1;
+	private _contentWidth: number = 1;
+	private _lineHeight: number = 1;
+	private _fontInfo: FontInfo | undefined;
+	private _accessibilitySupport: AccessibilitySupport = AccessibilitySupport.Unknown;
+	private _accessibilityPageSize: number = 1;
+
+	private _primarySelection: Selection = new Selection(1, 1, 1, 1);
+	private _screenReaderContentState: ScreenReaderContentState | undefined;
+
+	constructor(
+		private readonly _domNode: FastDomNode<HTMLElement>,
+		private readonly _context: ViewContext,
+		@IKeybindingService private readonly _keybindingService: IKeybindingService,
+	) {
+		this._updateConfigurationSettings();
+		this._updateDomAttributes();
+	}
+
+	public onConfigurationChanged(e: ViewConfigurationChangedEvent): void {
+		this._updateConfigurationSettings();
+		this._updateDomAttributes();
+		if (e.hasChanged(EditorOption.accessibilitySupport)) {
+			this.writeScreenReaderContent();
+		}
+	}
+
+	private _updateConfigurationSettings(): void {
+		const options = this._context.configuration.options;
+		const layoutInfo = options.get(EditorOption.layoutInfo);
+		this._contentLeft = layoutInfo.contentLeft;
+		this._contentWidth = layoutInfo.contentWidth;
+		this._fontInfo = options.get(EditorOption.fontInfo);
+		this._lineHeight = options.get(EditorOption.lineHeight);
+		this._accessibilitySupport = options.get(EditorOption.accessibilitySupport);
+		this._accessibilityPageSize = options.get(EditorOption.accessibilityPageSize);
+	}
+
+	private _updateDomAttributes(): void {
+		const options = this._context.configuration.options;
+		this._domNode.domNode.setAttribute('role', 'textbox');
+		this._domNode.domNode.setAttribute('aria-required', options.get(EditorOption.ariaRequired) ? 'true' : 'false');
+		this._domNode.domNode.setAttribute('aria-multiline', 'true');
+		this._domNode.domNode.setAttribute('aria-autocomplete', options.get(EditorOption.readOnly) ? 'none' : 'both');
+		this._domNode.domNode.setAttribute('aria-roledescription', localize('editor', "editor"));
+		this._domNode.domNode.setAttribute('aria-label', ariaLabelForScreenReaderContent(options, this._keybindingService));
+		const tabSize = this._context.viewModel.model.getOptions().tabSize;
+		const spaceWidth = options.get(EditorOption.fontInfo).spaceWidth;
+		this._domNode.domNode.style.tabSize = `${tabSize * spaceWidth}px`;
+	}
+
+	public onCursorStateChanged(e: ViewCursorStateChangedEvent): void {
+		this._primarySelection = e.selections[0] ?? new Selection(1, 1, 1, 1);
+	}
+
+	public prepareRender(ctx: RenderingContext): void {
+		this.writeScreenReaderContent();
+	}
+
+	public render(ctx: RestrictedRenderingContext): void {
+		if (!this._screenReaderContentState) {
+			return;
+		}
+		// For correct alignment of the screen reader content, we need to apply the correct font
+		applyFontInfo(this._domNode, this._fontInfo!);
+
+		const verticalOffsetForPrimaryLineNumber = this._context.viewLayout.getVerticalOffsetForLineNumber(this._primarySelection.positionLineNumber);
+		const editorScrollTop = this._context.viewLayout.getCurrentScrollTop();
+		const top = verticalOffsetForPrimaryLineNumber - editorScrollTop;
+
+		this._domNode.setTop(top);
+		this._domNode.setLeft(this._contentLeft);
+		this._domNode.setWidth(this._contentWidth);
+		this._domNode.setHeight(this._lineHeight);
+
+		// Setting position within the screen reader content by modifying scroll position
+		const textContentBeforeSelection = this._screenReaderContentState.value.substring(0, this._screenReaderContentState.selectionStart);
+		const numberOfLinesOfContentBeforeSelection = newlinecount(textContentBeforeSelection);
+		this._domNode.domNode.scrollTop = numberOfLinesOfContentBeforeSelection * this._lineHeight;
+	}
+
+	public setAriaOptions(): void { }
+
+	public writeScreenReaderContent(): void {
+		const focusedElement = getActiveWindow().document.activeElement;
+		if (!focusedElement || focusedElement !== this._domNode.domNode) {
+			return;
+		}
+		this._screenReaderContentState = this._getScreenReaderContentState();
+		if (!this._screenReaderContentState) {
+			return;
+		}
+		if (this._domNode.domNode.textContent !== this._screenReaderContentState.value) {
+			this._domNode.domNode.textContent = this._screenReaderContentState.value;
+		}
+		this._setSelectionOfScreenReaderContent(this._screenReaderContentState.selectionStart, this._screenReaderContentState.selectionEnd);
+	}
+
+	private _getScreenReaderContentState(): ScreenReaderContentState | undefined {
+		if (this._accessibilitySupport === AccessibilitySupport.Disabled) {
+			return;
+		}
+		const simpleModel: ISimpleModel = {
+			getLineCount: (): number => {
+				return this._context.viewModel.getLineCount();
+			},
+			getLineMaxColumn: (lineNumber: number): number => {
+				return this._context.viewModel.getLineMaxColumn(lineNumber);
+			},
+			getValueInRange: (range: Range, eol: EndOfLinePreference): string => {
+				return this._context.viewModel.getValueInRange(range, eol);
+			},
+			getValueLengthInRange: (range: Range, eol: EndOfLinePreference): number => {
+				return this._context.viewModel.getValueLengthInRange(range, eol);
+			},
+			modifyPosition: (position: Position, offset: number): Position => {
+				return this._context.viewModel.modifyPosition(position, offset);
+			}
+		};
+		return PagedScreenReaderStrategy.fromEditorSelection(simpleModel, this._primarySelection, this._accessibilityPageSize, this._accessibilitySupport === AccessibilitySupport.Unknown);
+	}
+
+	private _setSelectionOfScreenReaderContent(selectionOffsetStart: number, selectionOffsetEnd: number): void {
+		const activeDocument = getActiveWindow().document;
+		const activeDocumentSelection = activeDocument.getSelection();
+		if (!activeDocumentSelection) {
+			return;
+		}
+		const textContent = this._domNode.domNode.firstChild;
+		if (!textContent) {
+			return;
+		}
+		const range = new globalThis.Range();
+		range.setStart(textContent, selectionOffsetStart);
+		range.setEnd(textContent, selectionOffsetEnd);
+		activeDocumentSelection.removeAllRanges();
+		activeDocumentSelection.addRange(range);
+	}
+}
diff --git a/src/vs/editor/browser/controller/editContext/screenReaderUtils.ts b/src/vs/editor/browser/controller/editContext/screenReaderUtils.ts
new file mode 100644
index 00000000000..cc2dcd3f371
--- /dev/null
+++ b/src/vs/editor/browser/controller/editContext/screenReaderUtils.ts
@@ -0,0 +1,138 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { EndOfLinePreference } from '../../../common/model.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { EditorOption, IComputedEditorOptions } from '../../../common/config/editorOptions.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { AccessibilitySupport } from '../../../../platform/accessibility/common/accessibility.js';
+import * as nls from '../../../../nls.js';
+
+export interface ISimpleModel {
+	getLineCount(): number;
+	getLineMaxColumn(lineNumber: number): number;
+	getValueInRange(range: Range, eol: EndOfLinePreference): string;
+	getValueLengthInRange(range: Range, eol: EndOfLinePreference): number;
+	modifyPosition(position: Position, offset: number): Position;
+}
+
+export interface ScreenReaderContentState {
+	value: string;
+
+	/** the offset where selection starts inside `value` */
+	selectionStart: number;
+
+	/** the offset where selection ends inside `value` */
+	selectionEnd: number;
+
+	/** the editor range in the view coordinate system that matches the selection inside `value` */
+	selection: Range;
+
+	/** the visible line count (wrapped, not necessarily matching \n characters) for the text in `value` before `selectionStart` */
+	newlineCountBeforeSelection: number;
+}
+
+export class PagedScreenReaderStrategy {
+	private static _getPageOfLine(lineNumber: number, linesPerPage: number): number {
+		return Math.floor((lineNumber - 1) / linesPerPage);
+	}
+
+	private static _getRangeForPage(page: number, linesPerPage: number): Range {
+		const offset = page * linesPerPage;
+		const startLineNumber = offset + 1;
+		const endLineNumber = offset + linesPerPage;
+		return new Range(startLineNumber, 1, endLineNumber + 1, 1);
+	}
+
+	public static fromEditorSelection(model: ISimpleModel, selection: Range, linesPerPage: number, trimLongText: boolean): ScreenReaderContentState {
+		// Chromium handles very poorly text even of a few thousand chars
+		// Cut text to avoid stalling the entire UI
+		const LIMIT_CHARS = 500;
+
+		const selectionStartPage = PagedScreenReaderStrategy._getPageOfLine(selection.startLineNumber, linesPerPage);
+		const selectionStartPageRange = PagedScreenReaderStrategy._getRangeForPage(selectionStartPage, linesPerPage);
+
+		const selectionEndPage = PagedScreenReaderStrategy._getPageOfLine(selection.endLineNumber, linesPerPage);
+		const selectionEndPageRange = PagedScreenReaderStrategy._getRangeForPage(selectionEndPage, linesPerPage);
+
+		let pretextRange = selectionStartPageRange.intersectRanges(new Range(1, 1, selection.startLineNumber, selection.startColumn))!;
+		if (trimLongText && model.getValueLengthInRange(pretextRange, EndOfLinePreference.LF) > LIMIT_CHARS) {
+			const pretextStart = model.modifyPosition(pretextRange.getEndPosition(), -LIMIT_CHARS);
+			pretextRange = Range.fromPositions(pretextStart, pretextRange.getEndPosition());
+		}
+		const pretext = model.getValueInRange(pretextRange, EndOfLinePreference.LF);
+
+		const lastLine = model.getLineCount();
+		const lastLineMaxColumn = model.getLineMaxColumn(lastLine);
+		let posttextRange = selectionEndPageRange.intersectRanges(new Range(selection.endLineNumber, selection.endColumn, lastLine, lastLineMaxColumn))!;
+		if (trimLongText && model.getValueLengthInRange(posttextRange, EndOfLinePreference.LF) > LIMIT_CHARS) {
+			const posttextEnd = model.modifyPosition(posttextRange.getStartPosition(), LIMIT_CHARS);
+			posttextRange = Range.fromPositions(posttextRange.getStartPosition(), posttextEnd);
+		}
+		const posttext = model.getValueInRange(posttextRange, EndOfLinePreference.LF);
+
+
+		let text: string;
+		if (selectionStartPage === selectionEndPage || selectionStartPage + 1 === selectionEndPage) {
+			// take full selection
+			text = model.getValueInRange(selection, EndOfLinePreference.LF);
+		} else {
+			const selectionRange1 = selectionStartPageRange.intersectRanges(selection)!;
+			const selectionRange2 = selectionEndPageRange.intersectRanges(selection)!;
+			text = (
+				model.getValueInRange(selectionRange1, EndOfLinePreference.LF)
+				+ String.fromCharCode(8230)
+				+ model.getValueInRange(selectionRange2, EndOfLinePreference.LF)
+			);
+		}
+		if (trimLongText && text.length > 2 * LIMIT_CHARS) {
+			text = text.substring(0, LIMIT_CHARS) + String.fromCharCode(8230) + text.substring(text.length - LIMIT_CHARS, text.length);
+		}
+
+		return {
+			value: pretext + text + posttext,
+			selection: selection,
+			selectionStart: pretext.length,
+			selectionEnd: pretext.length + text.length,
+			newlineCountBeforeSelection: pretextRange.endLineNumber - pretextRange.startLineNumber,
+		};
+	}
+}
+
+export function ariaLabelForScreenReaderContent(options: IComputedEditorOptions, keybindingService: IKeybindingService) {
+	const accessibilitySupport = options.get(EditorOption.accessibilitySupport);
+	if (accessibilitySupport === AccessibilitySupport.Disabled) {
+
+		const toggleKeybindingLabel = keybindingService.lookupKeybinding('editor.action.toggleScreenReaderAccessibilityMode')?.getAriaLabel();
+		const runCommandKeybindingLabel = keybindingService.lookupKeybinding('workbench.action.showCommands')?.getAriaLabel();
+		const keybindingEditorKeybindingLabel = keybindingService.lookupKeybinding('workbench.action.openGlobalKeybindings')?.getAriaLabel();
+		const editorNotAccessibleMessage = nls.localize('accessibilityModeOff', "The editor is not accessible at this time.");
+		if (toggleKeybindingLabel) {
+			return nls.localize('accessibilityOffAriaLabel', "{0} To enable screen reader optimized mode, use {1}", editorNotAccessibleMessage, toggleKeybindingLabel);
+		} else if (runCommandKeybindingLabel) {
+			return nls.localize('accessibilityOffAriaLabelNoKb', "{0} To enable screen reader optimized mode, open the quick pick with {1} and run the command Toggle Screen Reader Accessibility Mode, which is currently not triggerable via keyboard.", editorNotAccessibleMessage, runCommandKeybindingLabel);
+		} else if (keybindingEditorKeybindingLabel) {
+			return nls.localize('accessibilityOffAriaLabelNoKbs', "{0} Please assign a keybinding for the command Toggle Screen Reader Accessibility Mode by accessing the keybindings editor with {1} and run it.", editorNotAccessibleMessage, keybindingEditorKeybindingLabel);
+		} else {
+			// SOS
+			return editorNotAccessibleMessage;
+		}
+	}
+	return options.get(EditorOption.ariaLabel);
+}
+
+export function newlinecount(text: string): number {
+	let result = 0;
+	let startIndex = -1;
+	do {
+		startIndex = text.indexOf('\n', startIndex + 1);
+		if (startIndex === -1) {
+			break;
+		}
+		result++;
+	} while (true);
+	return result;
+}
diff --git a/src/vs/editor/browser/controller/textAreaHandler.css b/src/vs/editor/browser/controller/editContext/textArea/textAreaEditContext.css
similarity index 100%
rename from src/vs/editor/browser/controller/textAreaHandler.css
rename to src/vs/editor/browser/controller/editContext/textArea/textAreaEditContext.css
diff --git a/src/vs/editor/browser/controller/textAreaHandler.ts b/src/vs/editor/browser/controller/editContext/textArea/textAreaEditContext.ts
similarity index 85%
rename from src/vs/editor/browser/controller/textAreaHandler.ts
rename to src/vs/editor/browser/controller/editContext/textArea/textAreaEditContext.ts
index a5f824ca450..72887583691 100644
--- a/src/vs/editor/browser/controller/textAreaHandler.ts
+++ b/src/vs/editor/browser/controller/editContext/textArea/textAreaEditContext.ts
@@ -3,43 +3,47 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./textAreaHandler';
-import * as nls from 'vs/nls';
-import * as browser from 'vs/base/browser/browser';
-import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
-import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import * as platform from 'vs/base/common/platform';
-import * as strings from 'vs/base/common/strings';
-import { applyFontInfo } from 'vs/editor/browser/config/domFontInfo';
-import { CopyOptions, ICompositionData, IPasteData, ITextAreaInputHost, TextAreaInput, ClipboardDataToCopy, TextAreaWrapper } from 'vs/editor/browser/controller/textAreaInput';
-import { ISimpleModel, ITypeData, PagedScreenReaderStrategy, TextAreaState, _debugComposition } from 'vs/editor/browser/controller/textAreaState';
-import { ViewController } from 'vs/editor/browser/view/viewController';
-import { PartFingerprint, PartFingerprints, ViewPart } from 'vs/editor/browser/view/viewPart';
-import { LineNumbersOverlay } from 'vs/editor/browser/viewParts/lineNumbers/lineNumbers';
-import { Margin } from 'vs/editor/browser/viewParts/margin/margin';
-import { RenderLineNumbersType, EditorOption, IComputedEditorOptions, EditorOptions } from 'vs/editor/common/config/editorOptions';
-import { FontInfo } from 'vs/editor/common/config/fontInfo';
-import { WordCharacterClass, getMapForWordSeparators } from 'vs/editor/common/core/wordCharacterClassifier';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ScrollType } from 'vs/editor/common/editorCommon';
-import { EndOfLinePreference } from 'vs/editor/common/model';
-import { RenderingContext, RestrictedRenderingContext, HorizontalPosition } from 'vs/editor/browser/view/renderingContext';
-import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
-import * as viewEvents from 'vs/editor/common/viewEvents';
-import { AccessibilitySupport } from 'vs/platform/accessibility/common/accessibility';
-import { IEditorAriaOptions } from 'vs/editor/browser/editorBrowser';
-import { MOUSE_CURSOR_TEXT_CSS_CLASS_NAME } from 'vs/base/browser/ui/mouseCursor/mouseCursor';
-import { TokenizationRegistry } from 'vs/editor/common/languages';
-import { ColorId, ITokenPresentation } from 'vs/editor/common/encodedTokenAttributes';
-import { Color } from 'vs/base/common/color';
-import { IME } from 'vs/base/common/ime';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import './textAreaEditContext.css';
+import * as nls from '../../../../../nls.js';
+import * as browser from '../../../../../base/browser/browser.js';
+import { FastDomNode, createFastDomNode } from '../../../../../base/browser/fastDomNode.js';
+import { IKeyboardEvent } from '../../../../../base/browser/keyboardEvent.js';
+import * as platform from '../../../../../base/common/platform.js';
+import * as strings from '../../../../../base/common/strings.js';
+import { applyFontInfo } from '../../../config/domFontInfo.js';
+import { ViewController } from '../../../view/viewController.js';
+import { PartFingerprint, PartFingerprints } from '../../../view/viewPart.js';
+import { LineNumbersOverlay } from '../../../viewParts/lineNumbers/lineNumbers.js';
+import { Margin } from '../../../viewParts/margin/margin.js';
+import { RenderLineNumbersType, EditorOption, IComputedEditorOptions, EditorOptions } from '../../../../common/config/editorOptions.js';
+import { FontInfo } from '../../../../common/config/fontInfo.js';
+import { Position } from '../../../../common/core/position.js';
+import { Range } from '../../../../common/core/range.js';
+import { Selection } from '../../../../common/core/selection.js';
+import { ScrollType } from '../../../../common/editorCommon.js';
+import { EndOfLinePreference } from '../../../../common/model.js';
+import { RenderingContext, RestrictedRenderingContext, HorizontalPosition, LineVisibleRanges } from '../../../view/renderingContext.js';
+import { ViewContext } from '../../../../common/viewModel/viewContext.js';
+import * as viewEvents from '../../../../common/viewEvents.js';
+import { AccessibilitySupport } from '../../../../../platform/accessibility/common/accessibility.js';
+import { IEditorAriaOptions } from '../../../editorBrowser.js';
+import { MOUSE_CURSOR_TEXT_CSS_CLASS_NAME } from '../../../../../base/browser/ui/mouseCursor/mouseCursor.js';
+import { TokenizationRegistry } from '../../../../common/languages.js';
+import { ColorId, ITokenPresentation } from '../../../../common/encodedTokenAttributes.js';
+import { Color } from '../../../../../base/common/color.js';
+import { IME } from '../../../../../base/common/ime.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { AbstractEditContext } from '../editContext.js';
+import { ICompositionData, IPasteData, ITextAreaInputHost, TextAreaInput, TextAreaWrapper } from './textAreaEditContextInput.js';
+import { ariaLabelForScreenReaderContent, ISimpleModel, newlinecount, PagedScreenReaderStrategy } from '../screenReaderUtils.js';
+import { ClipboardDataToCopy, getDataToCopy } from '../clipboardUtils.js';
+import { _debugComposition, ITypeData, TextAreaState } from './textAreaEditContextState.js';
+import { getMapForWordSeparators, WordCharacterClass } from '../../../../common/core/wordCharacterClassifier.js';
 
 export interface IVisibleRangeProvider {
 	visibleRangeForPosition(position: Position): HorizontalPosition | null;
+	linesVisibleRangesForRange(range: Range, includeNewLines: boolean): LineVisibleRanges[] | null;
 }
 
 class VisibleTextAreaData {
@@ -106,7 +110,7 @@ class VisibleTextAreaData {
 
 const canUseZeroSizeTextarea = (browser.isFirefox);
 
-export class TextAreaHandler extends ViewPart {
+export class TextAreaEditContext extends AbstractEditContext {
 
 	private readonly _viewController: ViewController;
 	private readonly _visibleRangeProvider: IVisibleRangeProvider;
@@ -144,6 +148,7 @@ export class TextAreaHandler extends ViewPart {
 
 	constructor(
 		context: ViewContext,
+		overflowGuardContainer: FastDomNode<HTMLElement>,
 		viewController: ViewController,
 		visibleRangeProvider: IVisibleRangeProvider,
 		@IKeybindingService private readonly _keybindingService: IKeybindingService,
@@ -184,7 +189,7 @@ export class TextAreaHandler extends ViewPart {
 		this.textArea.setAttribute('autocapitalize', 'off');
 		this.textArea.setAttribute('autocomplete', 'off');
 		this.textArea.setAttribute('spellcheck', 'false');
-		this.textArea.setAttribute('aria-label', this._getAriaLabel(options));
+		this.textArea.setAttribute('aria-label', ariaLabelForScreenReaderContent(options, this._keybindingService));
 		this.textArea.setAttribute('aria-required', options.get(EditorOption.ariaRequired) ? 'true' : 'false');
 		this.textArea.setAttribute('tabindex', String(options.get(EditorOption.tabIndex)));
 		this.textArea.setAttribute('role', 'textbox');
@@ -197,6 +202,9 @@ export class TextAreaHandler extends ViewPart {
 		this.textAreaCover = createFastDomNode(document.createElement('div'));
 		this.textAreaCover.setPosition('absolute');
 
+		overflowGuardContainer.appendChild(this.textArea);
+		overflowGuardContainer.appendChild(this.textAreaCover);
+
 		const simpleModel: ISimpleModel = {
 			getLineCount: (): number => {
 				return this._context.viewModel.getLineCount();
@@ -217,29 +225,7 @@ export class TextAreaHandler extends ViewPart {
 
 		const textAreaInputHost: ITextAreaInputHost = {
 			getDataToCopy: (): ClipboardDataToCopy => {
-				const rawTextToCopy = this._context.viewModel.getPlainTextToCopy(this._modelSelections, this._emptySelectionClipboard, platform.isWindows);
-				const newLineCharacter = this._context.viewModel.model.getEOL();
-
-				const isFromEmptySelection = (this._emptySelectionClipboard && this._modelSelections.length === 1 && this._modelSelections[0].isEmpty());
-				const multicursorText = (Array.isArray(rawTextToCopy) ? rawTextToCopy : null);
-				const text = (Array.isArray(rawTextToCopy) ? rawTextToCopy.join(newLineCharacter) : rawTextToCopy);
-
-				let html: string | null | undefined = undefined;
-				let mode: string | null = null;
-				if (CopyOptions.forceCopyWithSyntaxHighlighting || (this._copyWithSyntaxHighlighting && text.length < 65536)) {
-					const richText = this._context.viewModel.getRichTextToCopy(this._modelSelections, this._emptySelectionClipboard);
-					if (richText) {
-						html = richText.html;
-						mode = richText.mode;
-					}
-				}
-				return {
-					isFromEmptySelection,
-					multicursorText,
-					text,
-					html,
-					mode
-				};
+				return getDataToCopy(this._context.viewModel, this._modelSelections, this._emptySelectionClipboard, this._copyWithSyntaxHighlighting);
 			},
 			getScreenReaderContent: (): TextAreaState => {
 				if (this._accessibilitySupport === AccessibilitySupport.Disabled) {
@@ -296,7 +282,8 @@ export class TextAreaHandler extends ViewPart {
 					return TextAreaState.EMPTY;
 				}
 
-				return PagedScreenReaderStrategy.fromEditorSelection(simpleModel, this._selections[0], this._accessibilityPageSize, this._accessibilitySupport === AccessibilitySupport.Unknown);
+				const screenReaderContentState = PagedScreenReaderStrategy.fromEditorSelection(simpleModel, this._selections[0], this._accessibilityPageSize, this._accessibilitySupport === AccessibilitySupport.Unknown);
+				return TextAreaState.fromScreenReaderContentState(screenReaderContentState);
 			},
 
 			deduceModelPosition: (viewAnchorPosition: Position, deltaOffset: number, lineFeedCnt: number): Position => {
@@ -479,12 +466,18 @@ export class TextAreaHandler extends ViewPart {
 		}));
 	}
 
+	public get domNode() {
+		return this.textArea;
+	}
+
 	public writeScreenReaderContent(reason: string): void {
 		this._textAreaInput.writeNativeTextAreaContent(reason);
 	}
 
 	public override dispose(): void {
 		super.dispose();
+		this.textArea.domNode.remove();
+		this.textAreaCover.domNode.remove();
 	}
 
 	private _getAndroidWordAtPosition(position: Position): [string, number] {
@@ -557,28 +550,6 @@ export class TextAreaHandler extends ViewPart {
 		return '';
 	}
 
-	private _getAriaLabel(options: IComputedEditorOptions): string {
-		const accessibilitySupport = options.get(EditorOption.accessibilitySupport);
-		if (accessibilitySupport === AccessibilitySupport.Disabled) {
-
-			const toggleKeybindingLabel = this._keybindingService.lookupKeybinding('editor.action.toggleScreenReaderAccessibilityMode')?.getAriaLabel();
-			const runCommandKeybindingLabel = this._keybindingService.lookupKeybinding('workbench.action.showCommands')?.getAriaLabel();
-			const keybindingEditorKeybindingLabel = this._keybindingService.lookupKeybinding('workbench.action.openGlobalKeybindings')?.getAriaLabel();
-			const editorNotAccessibleMessage = nls.localize('accessibilityModeOff', "The editor is not accessible at this time.");
-			if (toggleKeybindingLabel) {
-				return nls.localize('accessibilityOffAriaLabel', "{0} To enable screen reader optimized mode, use {1}", editorNotAccessibleMessage, toggleKeybindingLabel);
-			} else if (runCommandKeybindingLabel) {
-				return nls.localize('accessibilityOffAriaLabelNoKb', "{0} To enable screen reader optimized mode, open the quick pick with {1} and run the command Toggle Screen Reader Accessibility Mode, which is currently not triggerable via keyboard.", editorNotAccessibleMessage, runCommandKeybindingLabel);
-			} else if (keybindingEditorKeybindingLabel) {
-				return nls.localize('accessibilityOffAriaLabelNoKbs', "{0} Please assign a keybinding for the command Toggle Screen Reader Accessibility Mode by accessing the keybindings editor with {1} and run it.", editorNotAccessibleMessage, keybindingEditorKeybindingLabel);
-			} else {
-				// SOS
-				return editorNotAccessibleMessage;
-			}
-		}
-		return options.get(EditorOption.ariaLabel);
-	}
-
 	private _setAccessibilityOptions(options: IComputedEditorOptions): void {
 		this._accessibilitySupport = options.get(EditorOption.accessibilitySupport);
 		const accessibilityPageSize = options.get(EditorOption.accessibilityPageSize);
@@ -622,7 +593,7 @@ export class TextAreaHandler extends ViewPart {
 		this.textArea.setAttribute('wrap', this._textAreaWrapping && !this._visibleTextArea ? 'on' : 'off');
 		const { tabSize } = this._context.viewModel.model.getOptions();
 		this.textArea.domNode.style.tabSize = `${tabSize * this._fontInfo.spaceWidth}px`;
-		this.textArea.setAttribute('aria-label', this._getAriaLabel(options));
+		this.textArea.setAttribute('aria-label', ariaLabelForScreenReaderContent(options, this._keybindingService));
 		this.textArea.setAttribute('aria-required', options.get(EditorOption.ariaRequired) ? 'true' : 'false');
 		this.textArea.setAttribute('tabindex', String(options.get(EditorOption.tabIndex)));
 
@@ -677,7 +648,7 @@ export class TextAreaHandler extends ViewPart {
 		return this._textAreaInput.isFocused();
 	}
 
-	public focusTextArea(): void {
+	public focus(): void {
 		this._textAreaInput.focusTextArea();
 	}
 
@@ -742,7 +713,7 @@ export class TextAreaHandler extends ViewPart {
 			const endPosition = this._visibleTextArea.endPosition;
 			if (startPosition && endPosition && visibleStart && visibleEnd && visibleEnd.left >= this._scrollLeft && visibleStart.left <= this._scrollLeft + this._contentWidth) {
 				const top = (this._context.viewLayout.getVerticalOffsetForLineNumber(this._primaryCursorPosition.lineNumber) - this._scrollTop);
-				const lineCount = this._newlinecount(this.textArea.domNode.value.substr(0, this.textArea.domNode.selectionStart));
+				const lineCount = newlinecount(this.textArea.domNode.value.substr(0, this.textArea.domNode.selectionStart));
 
 				let scrollLeft = this._visibleTextArea.widthOfHiddenLineTextBefore;
 				let left = (this._contentLeft + visibleStart.left - this._scrollLeft);
@@ -834,7 +805,7 @@ export class TextAreaHandler extends ViewPart {
 			// In case the textarea contains a word, we're going to try to align the textarea's cursor
 			// with our cursor by scrolling the textarea as much as possible
 			this.textArea.domNode.scrollLeft = this._primaryCursorVisibleRange.left;
-			const lineCount = this._textAreaInput.textAreaState.newlineCountBeforeSelection ?? this._newlinecount(this.textArea.domNode.value.substr(0, this.textArea.domNode.selectionStart));
+			const lineCount = this._textAreaInput.textAreaState.newlineCountBeforeSelection ?? newlinecount(this.textArea.domNode.value.substring(0, this.textArea.domNode.selectionStart));
 			this.textArea.domNode.scrollTop = lineCount * this._lineHeight;
 			return;
 		}
@@ -849,19 +820,6 @@ export class TextAreaHandler extends ViewPart {
 		});
 	}
 
-	private _newlinecount(text: string): number {
-		let result = 0;
-		let startIndex = -1;
-		do {
-			startIndex = text.indexOf('\n', startIndex + 1);
-			if (startIndex === -1) {
-				break;
-			}
-			result++;
-		} while (true);
-		return result;
-	}
-
 	private _renderAtTopLeft(): void {
 		// (in WebKit the textarea is 1px by 1px because it cannot handle input to a 0x0 textarea)
 		// specifically, when doing Korean IME, setting the textarea to 0x0 breaks IME badly.
diff --git a/src/vs/editor/browser/controller/textAreaInput.ts b/src/vs/editor/browser/controller/editContext/textArea/textAreaEditContextInput.ts
similarity index 92%
rename from src/vs/editor/browser/controller/textAreaInput.ts
rename to src/vs/editor/browser/controller/editContext/textArea/textAreaEditContextInput.ts
index 88e783a1f7d..87e99556b33 100644
--- a/src/vs/editor/browser/controller/textAreaInput.ts
+++ b/src/vs/editor/browser/controller/editContext/textArea/textAreaEditContextInput.ts
@@ -3,23 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as browser from 'vs/base/browser/browser';
-import * as dom from 'vs/base/browser/dom';
-import { DomEmitter } from 'vs/base/browser/event';
-import { IKeyboardEvent, StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { inputLatency } from 'vs/base/browser/performance';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { Emitter, Event } from 'vs/base/common/event';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { Disposable, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { Mimes } from 'vs/base/common/mime';
-import { OperatingSystem } from 'vs/base/common/platform';
-import * as strings from 'vs/base/common/strings';
-import { ITextAreaWrapper, ITypeData, TextAreaState, _debugComposition } from 'vs/editor/browser/controller/textAreaState';
-import { Position } from 'vs/editor/common/core/position';
-import { Selection } from 'vs/editor/common/core/selection';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { ILogService } from 'vs/platform/log/common/log';
+import * as browser from '../../../../../base/browser/browser.js';
+import * as dom from '../../../../../base/browser/dom.js';
+import { DomEmitter } from '../../../../../base/browser/event.js';
+import { IKeyboardEvent, StandardKeyboardEvent } from '../../../../../base/browser/keyboardEvent.js';
+import { inputLatency } from '../../../../../base/browser/performance.js';
+import { RunOnceScheduler } from '../../../../../base/common/async.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { KeyCode } from '../../../../../base/common/keyCodes.js';
+import { Disposable, IDisposable, MutableDisposable } from '../../../../../base/common/lifecycle.js';
+import { Mimes } from '../../../../../base/common/mime.js';
+import { OperatingSystem } from '../../../../../base/common/platform.js';
+import * as strings from '../../../../../base/common/strings.js';
+import { Position } from '../../../../common/core/position.js';
+import { Selection } from '../../../../common/core/selection.js';
+import { IAccessibilityService } from '../../../../../platform/accessibility/common/accessibility.js';
+import { ILogService } from '../../../../../platform/log/common/log.js';
+import { ClipboardDataToCopy, ClipboardStoredMetadata, InMemoryClipboardMetadataManager } from '../clipboardUtils.js';
+import { _debugComposition, ITextAreaWrapper, ITypeData, TextAreaState } from './textAreaEditContextState.js';
 
 export namespace TextAreaSyntethicEvents {
 	export const Tap = '-monaco-textarea-synthetic-tap';
@@ -29,69 +30,18 @@ export interface ICompositionData {
 	data: string;
 }
 
-export const CopyOptions = {
-	forceCopyWithSyntaxHighlighting: false
-};
 
 export interface IPasteData {
 	text: string;
 	metadata: ClipboardStoredMetadata | null;
 }
 
-export interface ClipboardDataToCopy {
-	isFromEmptySelection: boolean;
-	multicursorText: string[] | null | undefined;
-	text: string;
-	html: string | null | undefined;
-	mode: string | null;
-}
-
-export interface ClipboardStoredMetadata {
-	version: 1;
-	isFromEmptySelection: boolean | undefined;
-	multicursorText: string[] | null | undefined;
-	mode: string | null;
-}
-
 export interface ITextAreaInputHost {
 	getDataToCopy(): ClipboardDataToCopy;
 	getScreenReaderContent(): TextAreaState;
 	deduceModelPosition(viewAnchorPosition: Position, deltaOffset: number, lineFeedCnt: number): Position;
 }
 
-interface InMemoryClipboardMetadata {
-	lastCopiedValue: string;
-	data: ClipboardStoredMetadata;
-}
-
-/**
- * Every time we write to the clipboard, we record a bit of extra metadata here.
- * Every time we read from the cipboard, if the text matches our last written text,
- * we can fetch the previous metadata.
- */
-export class InMemoryClipboardMetadataManager {
-	public static readonly INSTANCE = new InMemoryClipboardMetadataManager();
-
-	private _lastState: InMemoryClipboardMetadata | null;
-
-	constructor() {
-		this._lastState = null;
-	}
-
-	public set(lastCopiedValue: string, data: ClipboardStoredMetadata): void {
-		this._lastState = { lastCopiedValue, data };
-	}
-
-	public get(pastedText: string): ClipboardStoredMetadata | null {
-		if (this._lastState && this._lastState.lastCopiedValue === pastedText) {
-			// match!
-			return this._lastState.data;
-		}
-		this._lastState = null;
-		return null;
-	}
-}
-
 export interface ICompositionStartEvent {
 	data: string;
 }
diff --git a/src/vs/editor/browser/controller/textAreaState.ts b/src/vs/editor/browser/controller/editContext/textArea/textAreaEditContextState.ts
similarity index 66%
rename from src/vs/editor/browser/controller/textAreaState.ts
rename to src/vs/editor/browser/controller/editContext/textArea/textAreaEditContextState.ts
index adbf0ef7b3e..2e833a1b263 100644
--- a/src/vs/editor/browser/controller/textAreaState.ts
+++ b/src/vs/editor/browser/controller/editContext/textArea/textAreaEditContextState.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as strings from 'vs/base/common/strings';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { EndOfLinePreference } from 'vs/editor/common/model';
+import { commonPrefixLength, commonSuffixLength } from '../../../../../base/common/strings.js';
+import { Position } from '../../../../common/core/position.js';
+import { Range } from '../../../../common/core/range.js';
+import { ScreenReaderContentState } from '../screenReaderUtils.js';
 
 export const _debugComposition = false;
 
@@ -19,14 +19,6 @@ export interface ITextAreaWrapper {
 	setSelectionRange(reason: string, selectionStart: number, selectionEnd: number): void;
 }
 
-export interface ISimpleModel {
-	getLineCount(): number;
-	getLineMaxColumn(lineNumber: number): number;
-	getValueInRange(range: Range, eol: EndOfLinePreference): string;
-	getValueLengthInRange(range: Range, eol: EndOfLinePreference): number;
-	modifyPosition(position: Position, offset: number): Position;
-}
-
 export interface ITypeData {
 	text: string;
 	replacePrevCharCnt: number;
@@ -130,12 +122,12 @@ export class TextAreaState {
 		}
 
 		const prefixLength = Math.min(
-			strings.commonPrefixLength(previousState.value, currentState.value),
+			commonPrefixLength(previousState.value, currentState.value),
 			previousState.selectionStart,
 			currentState.selectionStart
 		);
 		const suffixLength = Math.min(
-			strings.commonSuffixLength(previousState.value, currentState.value),
+			commonSuffixLength(previousState.value, currentState.value),
 			previousState.value.length - previousState.selectionEnd,
 			currentState.value.length - currentState.selectionEnd
 		);
@@ -202,8 +194,8 @@ export class TextAreaState {
 			};
 		}
 
-		const prefixLength = Math.min(strings.commonPrefixLength(previousState.value, currentState.value), previousState.selectionEnd);
-		const suffixLength = Math.min(strings.commonSuffixLength(previousState.value, currentState.value), previousState.value.length - previousState.selectionEnd);
+		const prefixLength = Math.min(commonPrefixLength(previousState.value, currentState.value), previousState.selectionEnd);
+		const suffixLength = Math.min(commonSuffixLength(previousState.value, currentState.value), previousState.value.length - previousState.selectionEnd);
 		const previousValue = previousState.value.substring(prefixLength, previousState.value.length - suffixLength);
 		const currentValue = currentState.value.substring(prefixLength, currentState.value.length - suffixLength);
 		const previousSelectionStart = previousState.selectionStart - prefixLength;
@@ -223,65 +215,14 @@ export class TextAreaState {
 			positionDelta: currentSelectionEnd - currentValue.length
 		};
 	}
-}
 
-export class PagedScreenReaderStrategy {
-	private static _getPageOfLine(lineNumber: number, linesPerPage: number): number {
-		return Math.floor((lineNumber - 1) / linesPerPage);
-	}
-
-	private static _getRangeForPage(page: number, linesPerPage: number): Range {
-		const offset = page * linesPerPage;
-		const startLineNumber = offset + 1;
-		const endLineNumber = offset + linesPerPage;
-		return new Range(startLineNumber, 1, endLineNumber + 1, 1);
-	}
-
-	public static fromEditorSelection(model: ISimpleModel, selection: Range, linesPerPage: number, trimLongText: boolean): TextAreaState {
-		// Chromium handles very poorly text even of a few thousand chars
-		// Cut text to avoid stalling the entire UI
-		const LIMIT_CHARS = 500;
-
-		const selectionStartPage = PagedScreenReaderStrategy._getPageOfLine(selection.startLineNumber, linesPerPage);
-		const selectionStartPageRange = PagedScreenReaderStrategy._getRangeForPage(selectionStartPage, linesPerPage);
-
-		const selectionEndPage = PagedScreenReaderStrategy._getPageOfLine(selection.endLineNumber, linesPerPage);
-		const selectionEndPageRange = PagedScreenReaderStrategy._getRangeForPage(selectionEndPage, linesPerPage);
-
-		let pretextRange = selectionStartPageRange.intersectRanges(new Range(1, 1, selection.startLineNumber, selection.startColumn))!;
-		if (trimLongText && model.getValueLengthInRange(pretextRange, EndOfLinePreference.LF) > LIMIT_CHARS) {
-			const pretextStart = model.modifyPosition(pretextRange.getEndPosition(), -LIMIT_CHARS);
-			pretextRange = Range.fromPositions(pretextStart, pretextRange.getEndPosition());
-		}
-		const pretext = model.getValueInRange(pretextRange, EndOfLinePreference.LF);
-
-		const lastLine = model.getLineCount();
-		const lastLineMaxColumn = model.getLineMaxColumn(lastLine);
-		let posttextRange = selectionEndPageRange.intersectRanges(new Range(selection.endLineNumber, selection.endColumn, lastLine, lastLineMaxColumn))!;
-		if (trimLongText && model.getValueLengthInRange(posttextRange, EndOfLinePreference.LF) > LIMIT_CHARS) {
-			const posttextEnd = model.modifyPosition(posttextRange.getStartPosition(), LIMIT_CHARS);
-			posttextRange = Range.fromPositions(posttextRange.getStartPosition(), posttextEnd);
-		}
-		const posttext = model.getValueInRange(posttextRange, EndOfLinePreference.LF);
-
-
-		let text: string;
-		if (selectionStartPage === selectionEndPage || selectionStartPage + 1 === selectionEndPage) {
-			// take full selection
-			text = model.getValueInRange(selection, EndOfLinePreference.LF);
-		} else {
-			const selectionRange1 = selectionStartPageRange.intersectRanges(selection)!;
-			const selectionRange2 = selectionEndPageRange.intersectRanges(selection)!;
-			text = (
-				model.getValueInRange(selectionRange1, EndOfLinePreference.LF)
-				+ String.fromCharCode(8230)
-				+ model.getValueInRange(selectionRange2, EndOfLinePreference.LF)
-			);
-		}
-		if (trimLongText && text.length > 2 * LIMIT_CHARS) {
-			text = text.substring(0, LIMIT_CHARS) + String.fromCharCode(8230) + text.substring(text.length - LIMIT_CHARS, text.length);
-		}
-
-		return new TextAreaState(pretext + text + posttext, pretext.length, pretext.length + text.length, selection, pretextRange.endLineNumber - pretextRange.startLineNumber);
+	public static fromScreenReaderContentState(screenReaderContentState: ScreenReaderContentState) {
+		return new TextAreaState(
+			screenReaderContentState.value,
+			screenReaderContentState.selectionStart,
+			screenReaderContentState.selectionEnd,
+			screenReaderContentState.selection,
+			screenReaderContentState.newlineCountBeforeSelection
+		);
 	}
 }
diff --git a/src/vs/editor/browser/controller/mouseHandler.ts b/src/vs/editor/browser/controller/mouseHandler.ts
index 55d58d6eef9..cd9b92c4ed0 100644
--- a/src/vs/editor/browser/controller/mouseHandler.ts
+++ b/src/vs/editor/browser/controller/mouseHandler.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { StandardWheelEvent, IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import * as platform from 'vs/base/common/platform';
-import { HitTestContext, MouseTarget, MouseTargetFactory, PointerHandlerLastRenderData } from 'vs/editor/browser/controller/mouseTarget';
-import { IMouseTarget, IMouseTargetOutsideEditor, IMouseTargetViewZoneData, MouseTargetType } from 'vs/editor/browser/editorBrowser';
-import { ClientCoordinates, EditorMouseEvent, EditorMouseEventFactory, GlobalEditorPointerMoveMonitor, createEditorPagePosition, createCoordinatesRelativeToEditor, PageCoordinates } from 'vs/editor/browser/editorDom';
-import { ViewController } from 'vs/editor/browser/view/viewController';
-import { EditorZoom } from 'vs/editor/common/config/editorZoom';
-import { Position } from 'vs/editor/common/core/position';
-import { Selection } from 'vs/editor/common/core/selection';
-import { HorizontalPosition } from 'vs/editor/browser/view/renderingContext';
-import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
-import * as viewEvents from 'vs/editor/common/viewEvents';
-import { ViewEventHandler } from 'vs/editor/common/viewEventHandler';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { NavigationCommandRevealType } from 'vs/editor/browser/coreCommands';
-import { MouseWheelClassifier } from 'vs/base/browser/ui/scrollbar/scrollableElement';
+import * as dom from '../../../base/browser/dom.js';
+import { StandardWheelEvent, IMouseWheelEvent } from '../../../base/browser/mouseEvent.js';
+import { Disposable, IDisposable } from '../../../base/common/lifecycle.js';
+import * as platform from '../../../base/common/platform.js';
+import { HitTestContext, MouseTarget, MouseTargetFactory, PointerHandlerLastRenderData } from './mouseTarget.js';
+import { IMouseTarget, IMouseTargetOutsideEditor, IMouseTargetViewZoneData, MouseTargetType } from '../editorBrowser.js';
+import { ClientCoordinates, EditorMouseEvent, EditorMouseEventFactory, GlobalEditorPointerMoveMonitor, createEditorPagePosition, createCoordinatesRelativeToEditor, PageCoordinates } from '../editorDom.js';
+import { ViewController } from '../view/viewController.js';
+import { EditorZoom } from '../../common/config/editorZoom.js';
+import { Position } from '../../common/core/position.js';
+import { Selection } from '../../common/core/selection.js';
+import { HorizontalPosition } from '../view/renderingContext.js';
+import { ViewContext } from '../../common/viewModel/viewContext.js';
+import * as viewEvents from '../../common/viewEvents.js';
+import { ViewEventHandler } from '../../common/viewEventHandler.js';
+import { EditorOption } from '../../common/config/editorOptions.js';
+import { NavigationCommandRevealType } from '../coreCommands.js';
+import { MouseWheelClassifier } from '../../../base/browser/ui/scrollbar/scrollableElement.js';
 
 export interface IPointerHandlerHelper {
 	viewDomNode: HTMLElement;
diff --git a/src/vs/editor/browser/controller/mouseTarget.ts b/src/vs/editor/browser/controller/mouseTarget.ts
index 4a1addb3fc0..737daf6d294 100644
--- a/src/vs/editor/browser/controller/mouseTarget.ts
+++ b/src/vs/editor/browser/controller/mouseTarget.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IPointerHandlerHelper } from 'vs/editor/browser/controller/mouseHandler';
-import { IMouseTargetContentEmptyData, IMouseTargetMarginData, IMouseTarget, IMouseTargetContentEmpty, IMouseTargetContentText, IMouseTargetContentWidget, IMouseTargetMargin, IMouseTargetOutsideEditor, IMouseTargetOverlayWidget, IMouseTargetScrollbar, IMouseTargetTextarea, IMouseTargetUnknown, IMouseTargetViewZone, IMouseTargetContentTextData, IMouseTargetViewZoneData, MouseTargetType } from 'vs/editor/browser/editorBrowser';
-import { ClientCoordinates, EditorMouseEvent, EditorPagePosition, PageCoordinates, CoordinatesRelativeToEditor } from 'vs/editor/browser/editorDom';
-import { PartFingerprint, PartFingerprints } from 'vs/editor/browser/view/viewPart';
-import { ViewLine } from 'vs/editor/browser/viewParts/lines/viewLine';
-import { IViewCursorRenderData } from 'vs/editor/browser/viewParts/viewCursors/viewCursor';
-import { EditorLayoutInfo, EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Position } from 'vs/editor/common/core/position';
-import { Range as EditorRange } from 'vs/editor/common/core/range';
-import { HorizontalPosition } from 'vs/editor/browser/view/renderingContext';
-import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
-import { IViewModel } from 'vs/editor/common/viewModel';
-import { CursorColumns } from 'vs/editor/common/core/cursorColumns';
-import * as dom from 'vs/base/browser/dom';
-import { AtomicTabMoveOperations, Direction } from 'vs/editor/common/cursor/cursorAtomicMoveOperations';
-import { PositionAffinity } from 'vs/editor/common/model';
-import { InjectedText } from 'vs/editor/common/modelLineProjectionData';
-import { Mutable } from 'vs/base/common/types';
-import { Lazy } from 'vs/base/common/lazy';
+import { IPointerHandlerHelper } from './mouseHandler.js';
+import { IMouseTargetContentEmptyData, IMouseTargetMarginData, IMouseTarget, IMouseTargetContentEmpty, IMouseTargetContentText, IMouseTargetContentWidget, IMouseTargetMargin, IMouseTargetOutsideEditor, IMouseTargetOverlayWidget, IMouseTargetScrollbar, IMouseTargetTextarea, IMouseTargetUnknown, IMouseTargetViewZone, IMouseTargetContentTextData, IMouseTargetViewZoneData, MouseTargetType } from '../editorBrowser.js';
+import { ClientCoordinates, EditorMouseEvent, EditorPagePosition, PageCoordinates, CoordinatesRelativeToEditor } from '../editorDom.js';
+import { PartFingerprint, PartFingerprints } from '../view/viewPart.js';
+import { ViewLine } from '../viewParts/viewLines/viewLine.js';
+import { IViewCursorRenderData } from '../viewParts/viewCursors/viewCursor.js';
+import { EditorLayoutInfo, EditorOption } from '../../common/config/editorOptions.js';
+import { Position } from '../../common/core/position.js';
+import { Range as EditorRange } from '../../common/core/range.js';
+import { HorizontalPosition } from '../view/renderingContext.js';
+import { ViewContext } from '../../common/viewModel/viewContext.js';
+import { IViewModel } from '../../common/viewModel.js';
+import { CursorColumns } from '../../common/core/cursorColumns.js';
+import * as dom from '../../../base/browser/dom.js';
+import { AtomicTabMoveOperations, Direction } from '../../common/cursor/cursorAtomicMoveOperations.js';
+import { PositionAffinity } from '../../common/model.js';
+import { InjectedText } from '../../common/modelLineProjectionData.js';
+import { Mutable } from '../../../base/common/types.js';
+import { Lazy } from '../../../base/common/lazy.js';
 
 const enum HitTestResultType {
 	Unknown,
diff --git a/src/vs/editor/browser/controller/pointerHandler.ts b/src/vs/editor/browser/controller/pointerHandler.ts
index 2019016ac4c..80fc4825a83 100644
--- a/src/vs/editor/browser/controller/pointerHandler.ts
+++ b/src/vs/editor/browser/controller/pointerHandler.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BrowserFeatures } from 'vs/base/browser/canIUse';
-import * as dom from 'vs/base/browser/dom';
-import { EventType, Gesture, GestureEvent } from 'vs/base/browser/touch';
-import { mainWindow } from 'vs/base/browser/window';
-import { Disposable } from 'vs/base/common/lifecycle';
-import * as platform from 'vs/base/common/platform';
-import { IPointerHandlerHelper, MouseHandler } from 'vs/editor/browser/controller/mouseHandler';
-import { TextAreaSyntethicEvents } from 'vs/editor/browser/controller/textAreaInput';
-import { NavigationCommandRevealType } from 'vs/editor/browser/coreCommands';
-import { IMouseTarget, MouseTargetType } from 'vs/editor/browser/editorBrowser';
-import { EditorMouseEvent, EditorPointerEventFactory } from 'vs/editor/browser/editorDom';
-import { ViewController } from 'vs/editor/browser/view/viewController';
-import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
+import { BrowserFeatures } from '../../../base/browser/canIUse.js';
+import * as dom from '../../../base/browser/dom.js';
+import { EventType, Gesture, GestureEvent } from '../../../base/browser/touch.js';
+import { mainWindow } from '../../../base/browser/window.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import * as platform from '../../../base/common/platform.js';
+import { IPointerHandlerHelper, MouseHandler } from './mouseHandler.js';
+import { NavigationCommandRevealType } from '../coreCommands.js';
+import { IMouseTarget, MouseTargetType } from '../editorBrowser.js';
+import { EditorMouseEvent, EditorPointerEventFactory } from '../editorDom.js';
+import { ViewController } from '../view/viewController.js';
+import { ViewContext } from '../../common/viewModel/viewContext.js';
+import { TextAreaSyntethicEvents } from './editContext/textArea/textAreaEditContextInput.js';
 
 /**
  * Currently only tested on iOS 13/ iPadOS.
diff --git a/src/vs/editor/browser/coreCommands.ts b/src/vs/editor/browser/coreCommands.ts
index a05216711a1..8f1459c1fea 100644
--- a/src/vs/editor/browser/coreCommands.ts
+++ b/src/vs/editor/browser/coreCommands.ts
@@ -3,33 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { isFirefox } from 'vs/base/browser/browser';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import * as types from 'vs/base/common/types';
-import { status } from 'vs/base/browser/ui/aria/aria';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { Command, EditorCommand, ICommandOptions, registerEditorCommand, MultiCommand, UndoCommand, RedoCommand, SelectAllCommand } from 'vs/editor/browser/editorExtensions';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { ColumnSelection, IColumnSelectResult } from 'vs/editor/common/cursor/cursorColumnSelection';
-import { CursorState, EditOperationType, IColumnSelectData, PartialCursorState } from 'vs/editor/common/cursorCommon';
-import { DeleteOperations } from 'vs/editor/common/cursor/cursorDeleteOperations';
-import { CursorChangeReason } from 'vs/editor/common/cursorEvents';
-import { CursorMove as CursorMove_, CursorMoveCommands } from 'vs/editor/common/cursor/cursorMoveCommands';
-import { TypeOperations } from 'vs/editor/common/cursor/cursorTypeOperations';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { Handler, ScrollType } from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { VerticalRevealType } from 'vs/editor/common/viewEvents';
-import { ICommandMetadata } from 'vs/platform/commands/common/commands';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight, KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { IViewModel } from 'vs/editor/common/viewModel';
-import { ISelection } from 'vs/editor/common/core/selection';
-import { getActiveElement } from 'vs/base/browser/dom';
+import * as nls from '../../nls.js';
+import { isFirefox } from '../../base/browser/browser.js';
+import { KeyCode, KeyMod } from '../../base/common/keyCodes.js';
+import * as types from '../../base/common/types.js';
+import { status } from '../../base/browser/ui/aria/aria.js';
+import { ICodeEditor } from './editorBrowser.js';
+import { Command, EditorCommand, ICommandOptions, registerEditorCommand, MultiCommand, UndoCommand, RedoCommand, SelectAllCommand } from './editorExtensions.js';
+import { ICodeEditorService } from './services/codeEditorService.js';
+import { ColumnSelection, IColumnSelectResult } from '../common/cursor/cursorColumnSelection.js';
+import { CursorState, EditOperationType, IColumnSelectData, PartialCursorState } from '../common/cursorCommon.js';
+import { DeleteOperations } from '../common/cursor/cursorDeleteOperations.js';
+import { CursorChangeReason } from '../common/cursorEvents.js';
+import { CursorMove as CursorMove_, CursorMoveCommands } from '../common/cursor/cursorMoveCommands.js';
+import { TypeOperations } from '../common/cursor/cursorTypeOperations.js';
+import { IPosition, Position } from '../common/core/position.js';
+import { Range } from '../common/core/range.js';
+import { Handler, ScrollType } from '../common/editorCommon.js';
+import { EditorContextKeys } from '../common/editorContextKeys.js';
+import { VerticalRevealType } from '../common/viewEvents.js';
+import { ICommandMetadata } from '../../platform/commands/common/commands.js';
+import { ContextKeyExpr } from '../../platform/contextkey/common/contextkey.js';
+import { ServicesAccessor } from '../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight, KeybindingsRegistry } from '../../platform/keybinding/common/keybindingsRegistry.js';
+import { EditorOption } from '../common/config/editorOptions.js';
+import { IViewModel } from '../common/viewModel.js';
+import { ISelection } from '../common/core/selection.js';
+import { getActiveElement, isEditableElement } from '../../base/browser/dom.js';
+import { EnterOperation } from '../common/cursor/cursorTypeEditOperations.js';
 
 const CORE_WEIGHT = KeybindingWeight.EditorCore;
 
@@ -317,7 +318,7 @@ abstract class EditorOrNativeTextInputCommand {
 		target.addImplementation(1000, 'generic-dom-input-textarea', (accessor: ServicesAccessor, args: unknown) => {
 			// Only if focused on an element that allows for entering text
 			const activeElement = getActiveElement();
-			if (activeElement && ['input', 'textarea'].indexOf(activeElement.tagName.toLowerCase()) >= 0) {
+			if (activeElement && isEditableElement(activeElement)) {
 				this.runDOMCommand(activeElement);
 				return true;
 			}
@@ -1988,7 +1989,7 @@ export namespace CoreEditingCommands {
 
 		public runCoreEditingCommand(editor: ICodeEditor, viewModel: IViewModel, args: unknown): void {
 			editor.pushUndoStop();
-			editor.executeCommands(this.id, TypeOperations.lineBreakInsert(viewModel.cursorConfig, viewModel.model, viewModel.getCursorStates().map(s => s.modelState.selection)));
+			editor.executeCommands(this.id, EnterOperation.lineBreakInsert(viewModel.cursorConfig, viewModel.model, viewModel.getCursorStates().map(s => s.modelState.selection)));
 		}
 	});
 
diff --git a/src/vs/editor/browser/dnd.ts b/src/vs/editor/browser/dnd.ts
index 3003a4f65d5..9f74733b7f3 100644
--- a/src/vs/editor/browser/dnd.ts
+++ b/src/vs/editor/browser/dnd.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DataTransfers } from 'vs/base/browser/dnd';
-import { createFileDataTransferItem, createStringDataTransferItem, IDataTransferItem, UriList, VSDataTransfer } from 'vs/base/common/dataTransfer';
-import { Mimes } from 'vs/base/common/mime';
-import { URI } from 'vs/base/common/uri';
-import { CodeDataTransfers, FileAdditionalNativeProperties } from 'vs/platform/dnd/browser/dnd';
+import { DataTransfers } from '../../base/browser/dnd.js';
+import { createFileDataTransferItem, createStringDataTransferItem, IDataTransferItem, UriList, VSDataTransfer } from '../../base/common/dataTransfer.js';
+import { Mimes } from '../../base/common/mime.js';
+import { URI } from '../../base/common/uri.js';
+import { CodeDataTransfers, FileAdditionalNativeProperties } from '../../platform/dnd/browser/dnd.js';
 
 
 export function toVSDataTransfer(dataTransfer: DataTransfer) {
diff --git a/src/vs/editor/browser/editorBrowser.ts b/src/vs/editor/browser/editorBrowser.ts
index 2985f959335..7401ec5de61 100644
--- a/src/vs/editor/browser/editorBrowser.ts
+++ b/src/vs/editor/browser/editorBrowser.ts
@@ -3,28 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { IMouseEvent, IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
-import { IBoundarySashes } from 'vs/base/browser/ui/sash/sash';
-import { Event } from 'vs/base/common/event';
-import { IEditorConstructionOptions } from 'vs/editor/browser/config/editorConfiguration';
-import { ConfigurationChangedEvent, EditorLayoutInfo, EditorOption, FindComputedEditorOptionValueById, IComputedEditorOptions, IDiffEditorOptions, IEditorOptions, OverviewRulerPosition } from 'vs/editor/common/config/editorOptions';
-import { IDimension } from 'vs/editor/common/core/dimension';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { IWordAtPosition } from 'vs/editor/common/core/wordHelper';
-import { ICursorPositionChangedEvent, ICursorSelectionChangedEvent } from 'vs/editor/common/cursorEvents';
-import { IDiffComputationResult, ILineChange } from 'vs/editor/common/diff/legacyLinesDiffComputer';
-import * as editorCommon from 'vs/editor/common/editorCommon';
-import { GlyphMarginLane, ICursorStateComputer, IIdentifiedSingleEditOperation, IModelDecoration, IModelDeltaDecoration, ITextModel, PositionAffinity } from 'vs/editor/common/model';
-import { InjectedText } from 'vs/editor/common/modelLineProjectionData';
-import { IModelContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguageChangedEvent, IModelLanguageConfigurationChangedEvent, IModelOptionsChangedEvent, IModelTokensChangedEvent } from 'vs/editor/common/textModelEvents';
-import { IEditorWhitespace, IViewModel } from 'vs/editor/common/viewModel';
-import { OverviewRulerZone } from 'vs/editor/common/viewModel/overviewZoneManager';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { IKeyboardEvent } from '../../base/browser/keyboardEvent.js';
+import { IMouseEvent, IMouseWheelEvent } from '../../base/browser/mouseEvent.js';
+import { IBoundarySashes } from '../../base/browser/ui/sash/sash.js';
+import { Event } from '../../base/common/event.js';
+import { IEditorConstructionOptions } from './config/editorConfiguration.js';
+import { ConfigurationChangedEvent, EditorLayoutInfo, EditorOption, FindComputedEditorOptionValueById, IComputedEditorOptions, IDiffEditorOptions, IEditorOptions, OverviewRulerPosition } from '../common/config/editorOptions.js';
+import { IDimension } from '../common/core/dimension.js';
+import { IPosition, Position } from '../common/core/position.js';
+import { IRange, Range } from '../common/core/range.js';
+import { Selection } from '../common/core/selection.js';
+import { IWordAtPosition } from '../common/core/wordHelper.js';
+import { ICursorPositionChangedEvent, ICursorSelectionChangedEvent } from '../common/cursorEvents.js';
+import { IDiffComputationResult, ILineChange } from '../common/diff/legacyLinesDiffComputer.js';
+import * as editorCommon from '../common/editorCommon.js';
+import { GlyphMarginLane, ICursorStateComputer, IIdentifiedSingleEditOperation, IModelDecoration, IModelDeltaDecoration, ITextModel, PositionAffinity } from '../common/model.js';
+import { InjectedText } from '../common/modelLineProjectionData.js';
+import { IModelContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguageChangedEvent, IModelLanguageConfigurationChangedEvent, IModelOptionsChangedEvent, IModelTokensChangedEvent } from '../common/textModelEvents.js';
+import { IEditorWhitespace, IViewModel } from '../common/viewModel.js';
+import { OverviewRulerZone } from '../common/viewModel/overviewZoneManager.js';
+import { MenuId } from '../../platform/actions/common/actions.js';
+import { IContextKeyService } from '../../platform/contextkey/common/contextkey.js';
+import { ServicesAccessor } from '../../platform/instantiation/common/instantiation.js';
 
 /**
  * A view zone is a full horizontal rectangle that 'pushes' text down.
@@ -784,6 +784,12 @@ export interface ICodeEditor extends editorCommon.IEditor {
 	 */
 	readonly onDidChangeHiddenAreas: Event<void>;
 
+	/**
+	 * An event emitted before an editor
+	 * @internal
+	 */
+	readonly onWillTriggerEditorOperationEvent: Event<editorCommon.ITriggerEditorOperationEvent>;
+
 	/**
 	 * Some editor operations fire multiple events at once.
 	 * To allow users to react to multiple events fired by a single operation,
diff --git a/src/vs/editor/browser/editorDom.ts b/src/vs/editor/browser/editorDom.ts
index a894d0034ec..75bd4acfae7 100644
--- a/src/vs/editor/browser/editorDom.ts
+++ b/src/vs/editor/browser/editorDom.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { GlobalPointerMoveMonitor } from 'vs/base/browser/globalPointerMoveMonitor';
-import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { asCssVariable } from 'vs/platform/theme/common/colorRegistry';
-import { ThemeColor } from 'vs/base/common/themables';
+import * as dom from '../../base/browser/dom.js';
+import { GlobalPointerMoveMonitor } from '../../base/browser/globalPointerMoveMonitor.js';
+import { StandardMouseEvent } from '../../base/browser/mouseEvent.js';
+import { RunOnceScheduler } from '../../base/common/async.js';
+import { Disposable, DisposableStore, IDisposable } from '../../base/common/lifecycle.js';
+import { ICodeEditor } from './editorBrowser.js';
+import { asCssVariable } from '../../platform/theme/common/colorRegistry.js';
+import { ThemeColor } from '../../base/common/themables.js';
 
 /**
  * Coordinates relative to the whole document (e.g. mouse event's pageX and pageY)
diff --git a/src/vs/editor/browser/editorExtensions.ts b/src/vs/editor/browser/editorExtensions.ts
index 072be21a41c..b9c67238fd5 100644
--- a/src/vs/editor/browser/editorExtensions.ts
+++ b/src/vs/editor/browser/editorExtensions.ts
@@ -3,28 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { URI } from 'vs/base/common/uri';
-import { ICodeEditor, IDiffEditor } from 'vs/editor/browser/editorBrowser';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { Position } from 'vs/editor/common/core/position';
-import { IEditorContribution, IDiffEditorContribution } from 'vs/editor/common/editorCommon';
-import { ITextModel } from 'vs/editor/common/model';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { MenuId, MenuRegistry, Action2 } from 'vs/platform/actions/common/actions';
-import { CommandsRegistry, ICommandMetadata } from 'vs/platform/commands/common/commands';
-import { ContextKeyExpr, IContextKeyService, ContextKeyExpression } from 'vs/platform/contextkey/common/contextkey';
-import { ServicesAccessor as InstantiationServicesAccessor, BrandedService, IInstantiationService, IConstructorSignature } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindings, KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { assertType } from 'vs/base/common/types';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
-import { ILogService } from 'vs/platform/log/common/log';
-import { getActiveElement } from 'vs/base/browser/dom';
+import * as nls from '../../nls.js';
+import { URI } from '../../base/common/uri.js';
+import { ICodeEditor, IDiffEditor } from './editorBrowser.js';
+import { ICodeEditorService } from './services/codeEditorService.js';
+import { Position } from '../common/core/position.js';
+import { IEditorContribution, IDiffEditorContribution } from '../common/editorCommon.js';
+import { ITextModel } from '../common/model.js';
+import { IModelService } from '../common/services/model.js';
+import { ITextModelService } from '../common/services/resolverService.js';
+import { MenuId, MenuRegistry, Action2 } from '../../platform/actions/common/actions.js';
+import { CommandsRegistry, ICommandMetadata } from '../../platform/commands/common/commands.js';
+import { ContextKeyExpr, IContextKeyService, ContextKeyExpression } from '../../platform/contextkey/common/contextkey.js';
+import { ServicesAccessor as InstantiationServicesAccessor, BrandedService, IInstantiationService, IConstructorSignature } from '../../platform/instantiation/common/instantiation.js';
+import { IKeybindings, KeybindingsRegistry, KeybindingWeight } from '../../platform/keybinding/common/keybindingsRegistry.js';
+import { Registry } from '../../platform/registry/common/platform.js';
+import { ITelemetryService } from '../../platform/telemetry/common/telemetry.js';
+import { assertType } from '../../base/common/types.js';
+import { ThemeIcon } from '../../base/common/themables.js';
+import { IDisposable } from '../../base/common/lifecycle.js';
+import { KeyMod, KeyCode } from '../../base/common/keyCodes.js';
+import { ILogService } from '../../platform/log/common/log.js';
+import { getActiveElement } from '../../base/browser/dom.js';
 
 export type ServicesAccessor = InstantiationServicesAccessor;
 export type EditorContributionCtor = IConstructorSignature<IEditorContribution, [ICodeEditor]>;
diff --git a/src/vs/editor/browser/gpu/atlas/atlas.ts b/src/vs/editor/browser/gpu/atlas/atlas.ts
new file mode 100644
index 00000000000..e9719042705
--- /dev/null
+++ b/src/vs/editor/browser/gpu/atlas/atlas.ts
@@ -0,0 +1,95 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import type { ThreeKeyMap } from '../../../../base/common/map.js';
+import type { IBoundingBox, IRasterizedGlyph } from '../raster/raster.js';
+
+/**
+ * Information about a {@link IRasterizedGlyph rasterized glyph} that has been drawn to a texture
+ * atlas page.
+ */
+export interface ITextureAtlasPageGlyph {
+	/**
+	 * The page index of the texture atlas page that the glyph was drawn to.
+	 */
+	pageIndex: number;
+	/**
+	 * The index of the glyph in the texture atlas page.
+	 */
+	glyphIndex: number;
+	/** The x coordinate of the glyph on the texture atlas page. */
+	x: number;
+	/** The y coordinate of the glyph on the texture atlas page. */
+	y: number;
+	/** The width of the glyph in pixels. */
+	w: number;
+	/** The height of the glyph in pixels. */
+	h: number;
+	/** The x offset from {@link x} of the glyph's origin. */
+	originOffsetX: number;
+	/** The y offset from {@link y} of the glyph's origin. */
+	originOffsetY: number;
+}
+
+/**
+ * A texture atlas allocator is responsible for taking rasterized glyphs, drawing them to a texture
+ * atlas page canvas and return information on the texture atlas glyph.
+ */
+export interface ITextureAtlasAllocator {
+	/**
+	 * Allocates a rasterized glyph to the canvas, drawing it and returning information on its
+	 * position in the canvas. This will return undefined if the glyph does not fit on the canvas.
+	 */
+	allocate(rasterizedGlyph: Readonly<IRasterizedGlyph>): Readonly<ITextureAtlasPageGlyph> | undefined;
+	/**
+	 * Gets a usage preview of the atlas for debugging purposes.
+	 */
+	getUsagePreview(): Promise<Blob>;
+	/**
+	 * Gets statistics about the allocator's current state for debugging purposes.
+	 */
+	getStats(): string;
+}
+
+/**
+ * A texture atlas page that can be read from but not modified.
+ */
+export interface IReadableTextureAtlasPage {
+	/**
+	 * A unique identifier for the current state of the texture atlas page. This is a number that
+	 * increments whenever a glyph is drawn to the page.
+	 */
+	readonly version: number;
+	/**
+	 * A bounding box representing the area of the texture atlas page that is currently in use.
+	 */
+	readonly usedArea: Readonly<IBoundingBox>;
+	/**
+	 * An iterator over all glyphs that have been drawn to the page. This will iterate through
+	 * glyphs in the order they have been drawn.
+	 */
+	readonly glyphs: IterableIterator<Readonly<ITextureAtlasPageGlyph>>;
+	/**
+	 * The source canvas for the texture atlas page.
+	 */
+	readonly source: OffscreenCanvas;
+	/**
+	 * Gets a usage preview of the atlas for debugging purposes.
+	 */
+	getUsagePreview(): Promise<Blob>;
+	/**
+	 * Gets statistics about the allocator's current state for debugging purposes.
+	 */
+	getStats(): string;
+}
+
+export const enum UsagePreviewColors {
+	Unused = '#808080',
+	Used = '#4040FF',
+	Wasted = '#FF0000',
+	Restricted = '#FF000088',
+}
+
+export type GlyphMap<T> = ThreeKeyMap</*chars*/string, /*metadata*/number, /*rasterizerCacheKey*/string, T>;
diff --git a/src/vs/editor/browser/gpu/atlas/textureAtlas.ts b/src/vs/editor/browser/gpu/atlas/textureAtlas.ts
new file mode 100644
index 00000000000..e8b8ad73c7a
--- /dev/null
+++ b/src/vs/editor/browser/gpu/atlas/textureAtlas.ts
@@ -0,0 +1,179 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { getActiveWindow } from '../../../../base/browser/dom.js';
+import { CharCode } from '../../../../base/common/charCode.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, dispose, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { ThreeKeyMap } from '../../../../base/common/map.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { MetadataConsts } from '../../../common/encodedTokenAttributes.js';
+import { GlyphRasterizer } from '../raster/glyphRasterizer.js';
+import type { IGlyphRasterizer } from '../raster/raster.js';
+import { IdleTaskQueue } from '../taskQueue.js';
+import type { IReadableTextureAtlasPage, ITextureAtlasPageGlyph, GlyphMap } from './atlas.js';
+import { AllocatorType, TextureAtlasPage } from './textureAtlasPage.js';
+
+export interface ITextureAtlasOptions {
+	allocatorType?: AllocatorType;
+}
+
+export class TextureAtlas extends Disposable {
+	private _colorMap!: string[];
+	private readonly _warmUpTask: MutableDisposable<IdleTaskQueue> = this._register(new MutableDisposable());
+	private readonly _warmedUpRasterizers = new Set<number>();
+	private readonly _allocatorType: AllocatorType;
+
+	/**
+	 * The main texture atlas pages which are both larger textures and more efficiently packed
+	 * relative to the scratch page. The idea is the main pages are drawn to and uploaded to the GPU
+	 * much less frequently so as to not drop frames.
+	 */
+	private readonly _pages: TextureAtlasPage[] = [];
+	get pages(): IReadableTextureAtlasPage[] { return this._pages; }
+
+	readonly pageSize: number;
+
+	/**
+	 * A maps of glyph keys to the page to start searching for the glyph. This is set before
+	 * searching to have as little runtime overhead (branching, intermediate variables) as possible,
+	 * so it is not guaranteed to be the actual page the glyph is on. But it is guaranteed that all
+	 * pages with a lower index do not contain the glyph.
+	 */
+	private readonly _glyphPageIndex: GlyphMap<number> = new ThreeKeyMap();
+
+	private readonly _onDidDeleteGlyphs = this._register(new Emitter<void>());
+	readonly onDidDeleteGlyphs = this._onDidDeleteGlyphs.event;
+
+	constructor(
+		/** The maximum texture size supported by the GPU. */
+		private readonly _maxTextureSize: number,
+		options: ITextureAtlasOptions | undefined,
+		@IThemeService private readonly _themeService: IThemeService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService
+	) {
+		super();
+
+		this._allocatorType = options?.allocatorType ?? 'slab';
+
+		this._register(Event.runAndSubscribe(this._themeService.onDidColorThemeChange, () => {
+			// TODO: Clear entire atlas on theme change
+			this._colorMap = this._themeService.getColorTheme().tokenColorMap;
+		}));
+
+		const dprFactor = Math.max(1, Math.floor(getActiveWindow().devicePixelRatio));
+
+		this.pageSize = Math.min(1024 * dprFactor, this._maxTextureSize);
+		this._initFirstPage();
+
+		this._register(toDisposable(() => dispose(this._pages)));
+	}
+
+	private _initFirstPage() {
+		const firstPage = this._instantiationService.createInstance(TextureAtlasPage, 0, this.pageSize, this._allocatorType);
+		this._pages.push(firstPage);
+
+		// IMPORTANT: The first glyph on the first page must be an empty glyph such that zeroed out
+		// cells end up rendering nothing
+		// TODO: This currently means the first slab is for 0x0 glyphs and is wasted
+		const nullRasterizer = new GlyphRasterizer(1, '');
+		firstPage.getGlyph(nullRasterizer, '', 0);
+		nullRasterizer.dispose();
+	}
+
+	clear() {
+		// Clear all pages
+		for (const page of this._pages) {
+			page.dispose();
+		}
+		this._pages.length = 0;
+		this._glyphPageIndex.clear();
+		this._warmedUpRasterizers.clear();
+		this._warmUpTask.clear();
+
+		// Recreate first
+		this._initFirstPage();
+
+		// Tell listeners
+		this._onDidDeleteGlyphs.fire();
+	}
+
+	getGlyph(rasterizer: IGlyphRasterizer, chars: string, metadata: number): Readonly<ITextureAtlasPageGlyph> {
+		// TODO: Encode font size and family into key
+		// Ignore metadata that doesn't affect the glyph
+		metadata &= ~(MetadataConsts.LANGUAGEID_MASK | MetadataConsts.TOKEN_TYPE_MASK | MetadataConsts.BALANCED_BRACKETS_MASK);
+
+		// Warm up common glyphs
+		if (!this._warmedUpRasterizers.has(rasterizer.id)) {
+			this._warmUpAtlas(rasterizer);
+			this._warmedUpRasterizers.add(rasterizer.id);
+		}
+
+		// Try get the glyph, overflowing to a new page if necessary
+		return this._tryGetGlyph(this._glyphPageIndex.get(chars, metadata, rasterizer.cacheKey) ?? 0, rasterizer, chars, metadata);
+	}
+
+	private _tryGetGlyph(pageIndex: number, rasterizer: IGlyphRasterizer, chars: string, metadata: number): Readonly<ITextureAtlasPageGlyph> {
+		this._glyphPageIndex.set(chars, metadata, rasterizer.cacheKey, pageIndex);
+		return (
+			this._pages[pageIndex].getGlyph(rasterizer, chars, metadata)
+			?? (pageIndex + 1 < this._pages.length
+				? this._tryGetGlyph(pageIndex + 1, rasterizer, chars, metadata)
+				: undefined)
+			?? this._getGlyphFromNewPage(rasterizer, chars, metadata)
+		);
+	}
+
+	private _getGlyphFromNewPage(rasterizer: IGlyphRasterizer, chars: string, metadata: number): Readonly<ITextureAtlasPageGlyph> {
+		// TODO: Support more than 2 pages and the GPU texture layer limit
+		this._pages.push(this._instantiationService.createInstance(TextureAtlasPage, this._pages.length, this.pageSize, this._allocatorType));
+		this._glyphPageIndex.set(chars, metadata, rasterizer.cacheKey, this._pages.length - 1);
+		return this._pages[this._pages.length - 1].getGlyph(rasterizer, chars, metadata)!;
+	}
+
+	public getUsagePreview(): Promise<Blob[]> {
+		return Promise.all(this._pages.map(e => e.getUsagePreview()));
+	}
+
+	public getStats(): string[] {
+		return this._pages.map(e => e.getStats());
+	}
+
+	/**
+	 * Warms up the atlas by rasterizing all printable ASCII characters for each token color. This
+	 * is distrubuted over multiple idle callbacks to avoid blocking the main thread.
+	 */
+	private _warmUpAtlas(rasterizer: IGlyphRasterizer): void {
+		this._warmUpTask.value?.clear();
+		const taskQueue = this._warmUpTask.value = new IdleTaskQueue();
+		// Warm up using roughly the larger glyphs first to help optimize atlas allocation
+		// A-Z
+		for (let code = CharCode.A; code <= CharCode.Z; code++) {
+			taskQueue.enqueue(() => {
+				for (const fgColor of this._colorMap.keys()) {
+					this.getGlyph(rasterizer, String.fromCharCode(code), (fgColor << MetadataConsts.FOREGROUND_OFFSET) & MetadataConsts.FOREGROUND_MASK);
+				}
+			});
+		}
+		// a-z
+		for (let code = CharCode.a; code <= CharCode.z; code++) {
+			taskQueue.enqueue(() => {
+				for (const fgColor of this._colorMap.keys()) {
+					this.getGlyph(rasterizer, String.fromCharCode(code), (fgColor << MetadataConsts.FOREGROUND_OFFSET) & MetadataConsts.FOREGROUND_MASK);
+				}
+			});
+		}
+		// Remaining ascii
+		for (let code = CharCode.ExclamationMark; code <= CharCode.Tilde; code++) {
+			taskQueue.enqueue(() => {
+				for (const fgColor of this._colorMap.keys()) {
+					this.getGlyph(rasterizer, String.fromCharCode(code), (fgColor << MetadataConsts.FOREGROUND_OFFSET) & MetadataConsts.FOREGROUND_MASK);
+				}
+			});
+		}
+	}
+}
+
diff --git a/src/vs/editor/browser/gpu/atlas/textureAtlasPage.ts b/src/vs/editor/browser/gpu/atlas/textureAtlasPage.ts
new file mode 100644
index 00000000000..a661ef64bcc
--- /dev/null
+++ b/src/vs/editor/browser/gpu/atlas/textureAtlasPage.ts
@@ -0,0 +1,122 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Event } from '../../../../base/common/event.js';
+import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { ThreeKeyMap } from '../../../../base/common/map.js';
+import { ILogService, LogLevel } from '../../../../platform/log/common/log.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import type { IBoundingBox, IGlyphRasterizer } from '../raster/raster.js';
+import type { IReadableTextureAtlasPage, ITextureAtlasAllocator, ITextureAtlasPageGlyph, GlyphMap } from './atlas.js';
+import { TextureAtlasShelfAllocator } from './textureAtlasShelfAllocator.js';
+import { TextureAtlasSlabAllocator } from './textureAtlasSlabAllocator.js';
+
+export type AllocatorType = 'shelf' | 'slab' | ((canvas: OffscreenCanvas, textureIndex: number) => ITextureAtlasAllocator);
+
+export class TextureAtlasPage extends Disposable implements IReadableTextureAtlasPage {
+
+	private _version: number = 0;
+	get version(): number { return this._version; }
+
+	/**
+	 * The maximum number of glyphs that can be drawn to the page. This is currently a hard static
+	 * cap that must not be reached as it will cause the GPU buffer to overflow.
+	 */
+	static readonly maximumGlyphCount = 5_000;
+
+	private _usedArea: IBoundingBox = { left: 0, top: 0, right: 0, bottom: 0 };
+	public get usedArea(): Readonly<IBoundingBox> { return this._usedArea; }
+
+	private readonly _canvas: OffscreenCanvas;
+	get source(): OffscreenCanvas { return this._canvas; }
+
+	private readonly _glyphMap: GlyphMap<ITextureAtlasPageGlyph> = new ThreeKeyMap();
+	private readonly _glyphInOrderSet: Set<ITextureAtlasPageGlyph> = new Set();
+	get glyphs(): IterableIterator<ITextureAtlasPageGlyph> {
+		return this._glyphInOrderSet.values();
+	}
+
+	private readonly _allocator: ITextureAtlasAllocator;
+	private _colorMap!: string[];
+
+	constructor(
+		textureIndex: number,
+		pageSize: number,
+		allocatorType: AllocatorType,
+		@ILogService private readonly _logService: ILogService,
+		@IThemeService private readonly _themeService: IThemeService,
+	) {
+		super();
+
+		this._canvas = new OffscreenCanvas(pageSize, pageSize);
+
+		switch (allocatorType) {
+			case 'shelf': this._allocator = new TextureAtlasShelfAllocator(this._canvas, textureIndex); break;
+			case 'slab': this._allocator = new TextureAtlasSlabAllocator(this._canvas, textureIndex); break;
+			default: this._allocator = allocatorType(this._canvas, textureIndex); break;
+		}
+
+		this._register(Event.runAndSubscribe(this._themeService.onDidColorThemeChange, () => {
+			// TODO: Clear entire atlas on theme change
+			this._colorMap = this._themeService.getColorTheme().tokenColorMap;
+		}));
+
+		// Reduce impact of a memory leak if this object is not released
+		this._register(toDisposable(() => {
+			this._canvas.width = 1;
+			this._canvas.height = 1;
+		}));
+	}
+
+	public getGlyph(rasterizer: IGlyphRasterizer, chars: string, metadata: number): Readonly<ITextureAtlasPageGlyph> | undefined {
+		// IMPORTANT: There are intentionally no intermediate variables here to aid in runtime
+		// optimization as it's a very hot function
+		return this._glyphMap.get(chars, metadata, rasterizer.cacheKey) ?? this._createGlyph(rasterizer, chars, metadata);
+	}
+
+	private _createGlyph(rasterizer: IGlyphRasterizer, chars: string, metadata: number): Readonly<ITextureAtlasPageGlyph> | undefined {
+		// Ensure the glyph can fit on the page
+		if (this._glyphInOrderSet.size >= TextureAtlasPage.maximumGlyphCount) {
+			return undefined;
+		}
+
+		// Rasterize and allocate the glyph
+		const rasterizedGlyph = rasterizer.rasterizeGlyph(chars, metadata, this._colorMap);
+		const glyph = this._allocator.allocate(rasterizedGlyph);
+
+		// Ensure the glyph was allocated
+		if (glyph === undefined) {
+			return undefined;
+		}
+
+		// Save the glyph
+		this._glyphMap.set(chars, metadata, rasterizer.cacheKey, glyph);
+		this._glyphInOrderSet.add(glyph);
+
+		// Update page version and it's tracked used area
+		this._version++;
+		this._usedArea.right = Math.max(this._usedArea.right, glyph.x + glyph.w - 1);
+		this._usedArea.bottom = Math.max(this._usedArea.bottom, glyph.y + glyph.h - 1);
+
+		if (this._logService.getLevel() === LogLevel.Trace) {
+			this._logService.trace('New glyph', {
+				chars,
+				metadata,
+				rasterizedGlyph,
+				glyph
+			});
+		}
+
+		return glyph;
+	}
+
+	getUsagePreview(): Promise<Blob> {
+		return this._allocator.getUsagePreview();
+	}
+
+	getStats(): string {
+		return this._allocator.getStats();
+	}
+}
diff --git a/src/vs/editor/browser/gpu/atlas/textureAtlasShelfAllocator.ts b/src/vs/editor/browser/gpu/atlas/textureAtlasShelfAllocator.ts
new file mode 100644
index 00000000000..1bbf920997f
--- /dev/null
+++ b/src/vs/editor/browser/gpu/atlas/textureAtlasShelfAllocator.ts
@@ -0,0 +1,162 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { BugIndicatingError } from '../../../../base/common/errors.js';
+import { ensureNonNullable } from '../gpuUtils.js';
+import type { IRasterizedGlyph } from '../raster/raster.js';
+import { UsagePreviewColors, type ITextureAtlasAllocator, type ITextureAtlasPageGlyph } from './atlas.js';
+
+/**
+ * The shelf allocator is a simple allocator that places glyphs in rows, starting a new row when the
+ * current row is full. Due to its simplicity, it can waste space but it is very fast.
+ */
+export class TextureAtlasShelfAllocator implements ITextureAtlasAllocator {
+
+	private readonly _ctx: OffscreenCanvasRenderingContext2D;
+
+	private _currentRow: ITextureAtlasShelf = {
+		x: 0,
+		y: 0,
+		h: 0
+	};
+
+	/** A set of all glyphs allocated, this is only tracked to enable debug related functionality */
+	private readonly _allocatedGlyphs: Set<Readonly<ITextureAtlasPageGlyph>> = new Set();
+
+	private _nextIndex = 0;
+
+	constructor(
+		private readonly _canvas: OffscreenCanvas,
+		private readonly _textureIndex: number,
+	) {
+		this._ctx = ensureNonNullable(this._canvas.getContext('2d', {
+			willReadFrequently: true
+		}));
+	}
+
+	public allocate(rasterizedGlyph: IRasterizedGlyph): ITextureAtlasPageGlyph | undefined {
+		// The glyph does not fit into the atlas page
+		const glyphWidth = rasterizedGlyph.boundingBox.right - rasterizedGlyph.boundingBox.left + 1;
+		const glyphHeight = rasterizedGlyph.boundingBox.bottom - rasterizedGlyph.boundingBox.top + 1;
+		if (glyphWidth > this._canvas.width || glyphHeight > this._canvas.height) {
+			throw new BugIndicatingError('Glyph is too large for the atlas page');
+		}
+
+		// Finalize and increment row if it doesn't fix horizontally
+		if (rasterizedGlyph.boundingBox.right - rasterizedGlyph.boundingBox.left + 1 > this._canvas.width - this._currentRow.x) {
+			this._currentRow.x = 0;
+			this._currentRow.y += this._currentRow.h;
+			this._currentRow.h = 1;
+		}
+
+		// Return undefined if there isn't any room left
+		if (this._currentRow.y + rasterizedGlyph.boundingBox.bottom - rasterizedGlyph.boundingBox.top + 1 > this._canvas.height) {
+			return undefined;
+		}
+
+		// Draw glyph
+		this._ctx.drawImage(
+			rasterizedGlyph.source,
+			// source
+			rasterizedGlyph.boundingBox.left,
+			rasterizedGlyph.boundingBox.top,
+			glyphWidth,
+			glyphHeight,
+			// destination
+			this._currentRow.x,
+			this._currentRow.y,
+			glyphWidth,
+			glyphHeight
+		);
+
+		// Create glyph object
+		const glyph: ITextureAtlasPageGlyph = {
+			pageIndex: this._textureIndex,
+			glyphIndex: this._nextIndex++,
+			x: this._currentRow.x,
+			y: this._currentRow.y,
+			w: glyphWidth,
+			h: glyphHeight,
+			originOffsetX: rasterizedGlyph.originOffset.x,
+			originOffsetY: rasterizedGlyph.originOffset.y
+		};
+
+		// Shift current row
+		this._currentRow.x += glyphWidth;
+		this._currentRow.h = Math.max(this._currentRow.h, glyphHeight);
+
+		// Set the glyph
+		this._allocatedGlyphs.add(glyph);
+
+		return glyph;
+	}
+
+	public getUsagePreview(): Promise<Blob> {
+		const w = this._canvas.width;
+		const h = this._canvas.height;
+		const canvas = new OffscreenCanvas(w, h);
+		const ctx = ensureNonNullable(canvas.getContext('2d'));
+		ctx.fillStyle = UsagePreviewColors.Unused;
+		ctx.fillRect(0, 0, w, h);
+
+		const rowHeight: Map<number, number> = new Map(); // y -> h
+		const rowWidth: Map<number, number> = new Map(); // y -> w
+		for (const g of this._allocatedGlyphs) {
+			rowHeight.set(g.y, Math.max(rowHeight.get(g.y) ?? 0, g.h));
+			rowWidth.set(g.y, Math.max(rowWidth.get(g.y) ?? 0, g.x + g.w));
+		}
+		for (const g of this._allocatedGlyphs) {
+			ctx.fillStyle = UsagePreviewColors.Used;
+			ctx.fillRect(g.x, g.y, g.w, g.h);
+			ctx.fillStyle = UsagePreviewColors.Wasted;
+			ctx.fillRect(g.x, g.y + g.h, g.w, rowHeight.get(g.y)! - g.h);
+		}
+		for (const [rowY, rowW] of rowWidth.entries()) {
+			if (rowY !== this._currentRow.y) {
+				ctx.fillStyle = UsagePreviewColors.Wasted;
+				ctx.fillRect(rowW, rowY, w - rowW, rowHeight.get(rowY)!);
+			}
+		}
+		return canvas.convertToBlob();
+	}
+
+	getStats(): string {
+		const w = this._canvas.width;
+		const h = this._canvas.height;
+
+		let usedPixels = 0;
+		let wastedPixels = 0;
+		const totalPixels = w * h;
+
+		const rowHeight: Map<number, number> = new Map(); // y -> h
+		const rowWidth: Map<number, number> = new Map(); // y -> w
+		for (const g of this._allocatedGlyphs) {
+			rowHeight.set(g.y, Math.max(rowHeight.get(g.y) ?? 0, g.h));
+			rowWidth.set(g.y, Math.max(rowWidth.get(g.y) ?? 0, g.x + g.w));
+		}
+		for (const g of this._allocatedGlyphs) {
+			usedPixels += g.w * g.h;
+			wastedPixels += g.w * (rowHeight.get(g.y)! - g.h);
+		}
+		for (const [rowY, rowW] of rowWidth.entries()) {
+			if (rowY !== this._currentRow.y) {
+				wastedPixels += (w - rowW) * rowHeight.get(rowY)!;
+			}
+		}
+		return [
+			`page${this._textureIndex}:`,
+			`     Total: ${totalPixels} (${w}x${h})`,
+			`      Used: ${usedPixels} (${((usedPixels / totalPixels) * 100).toPrecision(2)}%)`,
+			`    Wasted: ${wastedPixels} (${((wastedPixels / totalPixels) * 100).toPrecision(2)}%)`,
+			`Efficiency: ${((usedPixels / (usedPixels + wastedPixels)) * 100).toPrecision(2)}%`,
+		].join('\n');
+	}
+}
+
+interface ITextureAtlasShelf {
+	x: number;
+	y: number;
+	h: number;
+}
diff --git a/src/vs/editor/browser/gpu/atlas/textureAtlasSlabAllocator.ts b/src/vs/editor/browser/gpu/atlas/textureAtlasSlabAllocator.ts
new file mode 100644
index 00000000000..b41fed6978c
--- /dev/null
+++ b/src/vs/editor/browser/gpu/atlas/textureAtlasSlabAllocator.ts
@@ -0,0 +1,433 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { getActiveWindow } from '../../../../base/browser/dom.js';
+import { BugIndicatingError } from '../../../../base/common/errors.js';
+import { TwoKeyMap } from '../../../../base/common/map.js';
+import { ensureNonNullable } from '../gpuUtils.js';
+import type { IRasterizedGlyph } from '../raster/raster.js';
+import { UsagePreviewColors, type ITextureAtlasAllocator, type ITextureAtlasPageGlyph } from './atlas.js';
+
+export interface TextureAtlasSlabAllocatorOptions {
+	slabW?: number;
+	slabH?: number;
+}
+
+/**
+ * The slab allocator is a more complex allocator that places glyphs in square slabs of a fixed
+ * size. Slabs are defined by a small range of glyphs sizes they can house, this places like-sized
+ * glyphs in the same slab which reduces wasted space.
+ *
+ * Slabs also may contain "unused" regions on the left and bottom depending on the size of the
+ * glyphs they include. This space is used to place very thin or short glyphs, which would otherwise
+ * waste a lot of space in their own slab.
+ */
+export class TextureAtlasSlabAllocator implements ITextureAtlasAllocator {
+
+	private readonly _ctx: OffscreenCanvasRenderingContext2D;
+
+	private readonly _slabs: ITextureAtlasSlab[] = [];
+	private readonly _activeSlabsByDims: TwoKeyMap<number, number, ITextureAtlasSlab> = new TwoKeyMap();
+
+	private readonly _unusedRects: ITextureAtlasSlabUnusedRect[] = [];
+
+	private readonly _openRegionsByHeight: Map<number, ITextureAtlasSlabUnusedRect[]> = new Map();
+	private readonly _openRegionsByWidth: Map<number, ITextureAtlasSlabUnusedRect[]> = new Map();
+
+	/** A set of all glyphs allocated, this is only tracked to enable debug related functionality */
+	private readonly _allocatedGlyphs: Set<Readonly<ITextureAtlasPageGlyph>> = new Set();
+
+	private _slabW: number;
+	private _slabH: number;
+	private _slabsPerRow: number;
+	private _slabsPerColumn: number;
+	private _nextIndex = 0;
+
+	constructor(
+		private readonly _canvas: OffscreenCanvas,
+		private readonly _textureIndex: number,
+		options?: TextureAtlasSlabAllocatorOptions
+	) {
+		this._ctx = ensureNonNullable(this._canvas.getContext('2d', {
+			willReadFrequently: true
+		}));
+
+		this._slabW = Math.min(
+			options?.slabW ?? (64 << (Math.floor(getActiveWindow().devicePixelRatio) - 1)),
+			this._canvas.width
+		);
+		this._slabH = Math.min(
+			options?.slabH ?? this._slabW,
+			this._canvas.height
+		);
+		this._slabsPerRow = Math.floor(this._canvas.width / this._slabW);
+		this._slabsPerColumn = Math.floor(this._canvas.height / this._slabH);
+	}
+
+	public allocate(rasterizedGlyph: IRasterizedGlyph): ITextureAtlasPageGlyph | undefined {
+		// Find ideal slab, creating it if there is none suitable
+		const glyphWidth = rasterizedGlyph.boundingBox.right - rasterizedGlyph.boundingBox.left + 1;
+		const glyphHeight = rasterizedGlyph.boundingBox.bottom - rasterizedGlyph.boundingBox.top + 1;
+
+		// The glyph does not fit into the atlas page, glyphs should never be this large in practice
+		if (glyphWidth > this._canvas.width || glyphHeight > this._canvas.height) {
+			throw new BugIndicatingError('Glyph is too large for the atlas page');
+		}
+
+		// The glyph does not fit into a slab
+		if (glyphWidth > this._slabW || glyphHeight > this._slabH) {
+			// Only if this is the allocator's first glyph, resize the slab size to fit the glyph.
+			if (this._allocatedGlyphs.size > 0) {
+				return undefined;
+			}
+			// Find the largest power of 2 devisor that the glyph fits into, this ensure there is no
+			// wasted space outside the allocated slabs.
+			let sizeCandidate = this._canvas.width;
+			while (glyphWidth < sizeCandidate / 2 && glyphHeight < sizeCandidate / 2) {
+				sizeCandidate /= 2;
+			}
+			this._slabW = sizeCandidate;
+			this._slabH = sizeCandidate;
+			this._slabsPerRow = Math.floor(this._canvas.width / this._slabW);
+			this._slabsPerColumn = Math.floor(this._canvas.height / this._slabH);
+		}
+
+		// const dpr = getActiveWindow().devicePixelRatio;
+
+		// TODO: Include font size as well as DPR in nearestXPixels calculation
+
+		// Round slab glyph dimensions to the nearest x pixels, where x scaled with device pixel ratio
+		// const nearestXPixels = Math.max(1, Math.floor(dpr / 0.5));
+		// const nearestXPixels = Math.max(1, Math.floor(dpr));
+		const desiredSlabSize = {
+			// Nearest square number
+			// TODO: This can probably be optimized
+			// w: 1 << Math.ceil(Math.sqrt(glyphWidth)),
+			// h: 1 << Math.ceil(Math.sqrt(glyphHeight)),
+
+			// Nearest x px
+			// w: Math.ceil(glyphWidth / nearestXPixels) * nearestXPixels,
+			// h: Math.ceil(glyphHeight / nearestXPixels) * nearestXPixels,
+
+			// Round odd numbers up
+			// w: glyphWidth % 0 === 1 ? glyphWidth + 1 : glyphWidth,
+			// h: glyphHeight % 0 === 1 ? glyphHeight + 1 : glyphHeight,
+
+			// Exact number only
+			w: glyphWidth,
+			h: glyphHeight,
+		};
+
+		// Get any existing slab
+		let slab = this._activeSlabsByDims.get(desiredSlabSize.w, desiredSlabSize.h);
+
+		// Check if the slab is full
+		if (slab) {
+			const glyphsPerSlab = Math.floor(this._slabW / slab.entryW) * Math.floor(this._slabH / slab.entryH);
+			if (slab.count >= glyphsPerSlab) {
+				slab = undefined;
+			}
+		}
+
+		let dx: number | undefined;
+		let dy: number | undefined;
+
+		// Search for suitable space in unused rectangles
+		if (!slab) {
+			// Only check availability for the smallest side
+			if (glyphWidth < glyphHeight) {
+				const openRegions = this._openRegionsByWidth.get(glyphWidth);
+				if (openRegions?.length) {
+					// TODO: Don't search everything?
+					// Search from the end so we can typically pop it off the stack
+					for (let i = openRegions.length - 1; i >= 0; i--) {
+						const r = openRegions[i];
+						if (r.w >= glyphWidth && r.h >= glyphHeight) {
+							dx = r.x;
+							dy = r.y;
+							if (glyphWidth < r.w) {
+								this._unusedRects.push({
+									x: r.x + glyphWidth,
+									y: r.y,
+									w: r.w - glyphWidth,
+									h: glyphHeight
+								});
+							}
+							r.y += glyphHeight;
+							r.h -= glyphHeight;
+							if (r.h === 0) {
+								if (i === openRegions.length - 1) {
+									openRegions.pop();
+								} else {
+									this._unusedRects.splice(i, 1);
+								}
+							}
+							break;
+						}
+					}
+				}
+			} else {
+				const openRegions = this._openRegionsByHeight.get(glyphHeight);
+				if (openRegions?.length) {
+					// TODO: Don't search everything?
+					// Search from the end so we can typically pop it off the stack
+					for (let i = openRegions.length - 1; i >= 0; i--) {
+						const r = openRegions[i];
+						if (r.w >= glyphWidth && r.h >= glyphHeight) {
+							dx = r.x;
+							dy = r.y;
+							if (glyphHeight < r.h) {
+								this._unusedRects.push({
+									x: r.x,
+									y: r.y + glyphHeight,
+									w: glyphWidth,
+									h: r.h - glyphHeight
+								});
+							}
+							r.x += glyphWidth;
+							r.w -= glyphWidth;
+							if (r.h === 0) {
+								if (i === openRegions.length - 1) {
+									openRegions.pop();
+								} else {
+									this._unusedRects.splice(i, 1);
+								}
+							}
+							break;
+						}
+					}
+				}
+			}
+		}
+
+		// Create a new slab
+		if (dx === undefined || dy === undefined) {
+			if (!slab) {
+				if (this._slabs.length >= this._slabsPerRow * this._slabsPerColumn) {
+					return undefined;
+				}
+
+				slab = {
+					x: Math.floor(this._slabs.length % this._slabsPerRow) * this._slabW,
+					y: Math.floor(this._slabs.length / this._slabsPerRow) * this._slabH,
+					entryW: desiredSlabSize.w,
+					entryH: desiredSlabSize.h,
+					count: 0
+				};
+				// Track unused regions to use for small glyphs
+				// +-------------+----+
+				// |             |    |
+				// |             |    | <- Unused W region
+				// |             |    |
+				// |-------------+----+
+				// |                  | <- Unused H region
+				// +------------------+
+				const unusedW = this._slabW % slab.entryW;
+				const unusedH = this._slabH % slab.entryH;
+				if (unusedW) {
+					addEntryToMapArray(this._openRegionsByWidth, unusedW, {
+						x: slab.x + this._slabW - unusedW,
+						w: unusedW,
+						y: slab.y,
+						h: this._slabH - (unusedH ?? 0)
+					});
+				}
+				if (unusedH) {
+					addEntryToMapArray(this._openRegionsByHeight, unusedH, {
+						x: slab.x,
+						w: this._slabW,
+						y: slab.y + this._slabH - unusedH,
+						h: unusedH
+					});
+				}
+				this._slabs.push(slab);
+				this._activeSlabsByDims.set(desiredSlabSize.w, desiredSlabSize.h, slab);
+			}
+
+			const glyphsPerRow = Math.floor(this._slabW / slab.entryW);
+			dx = slab.x + Math.floor(slab.count % glyphsPerRow) * slab.entryW;
+			dy = slab.y + Math.floor(slab.count / glyphsPerRow) * slab.entryH;
+
+			// Shift current row
+			slab.count++;
+		}
+
+		// Draw glyph
+		this._ctx.drawImage(
+			rasterizedGlyph.source,
+			// source
+			rasterizedGlyph.boundingBox.left,
+			rasterizedGlyph.boundingBox.top,
+			glyphWidth,
+			glyphHeight,
+			// destination
+			dx,
+			dy,
+			glyphWidth,
+			glyphHeight
+		);
+
+		// Create glyph object
+		const glyph: ITextureAtlasPageGlyph = {
+			pageIndex: this._textureIndex,
+			glyphIndex: this._nextIndex++,
+			x: dx,
+			y: dy,
+			w: glyphWidth,
+			h: glyphHeight,
+			originOffsetX: rasterizedGlyph.originOffset.x,
+			originOffsetY: rasterizedGlyph.originOffset.y
+		};
+
+		// Set the glyph
+		this._allocatedGlyphs.add(glyph);
+
+		return glyph;
+	}
+
+	public getUsagePreview(): Promise<Blob> {
+		const w = this._canvas.width;
+		const h = this._canvas.height;
+		const canvas = new OffscreenCanvas(w, h);
+		const ctx = ensureNonNullable(canvas.getContext('2d'));
+
+		ctx.fillStyle = UsagePreviewColors.Unused;
+		ctx.fillRect(0, 0, w, h);
+
+		let slabEntryPixels = 0;
+		let usedPixels = 0;
+		let slabEdgePixels = 0;
+		let restrictedPixels = 0;
+		const slabW = 64 << (Math.floor(getActiveWindow().devicePixelRatio) - 1);
+		const slabH = slabW;
+
+		// Draw wasted underneath glyphs first
+		for (const slab of this._slabs) {
+			let x = 0;
+			let y = 0;
+			for (let i = 0; i < slab.count; i++) {
+				if (x + slab.entryW > slabW) {
+					x = 0;
+					y += slab.entryH;
+				}
+				ctx.fillStyle = UsagePreviewColors.Wasted;
+				ctx.fillRect(slab.x + x, slab.y + y, slab.entryW, slab.entryH);
+
+				slabEntryPixels += slab.entryW * slab.entryH;
+				x += slab.entryW;
+			}
+			const entriesPerRow = Math.floor(slabW / slab.entryW);
+			const entriesPerCol = Math.floor(slabH / slab.entryH);
+			const thisSlabPixels = slab.entryW * entriesPerRow * slab.entryH * entriesPerCol;
+			slabEdgePixels += (slabW * slabH) - thisSlabPixels;
+		}
+
+		// Draw glyphs
+		for (const g of this._allocatedGlyphs) {
+			usedPixels += g.w * g.h;
+			ctx.fillStyle = UsagePreviewColors.Used;
+			ctx.fillRect(g.x, g.y, g.w, g.h);
+		}
+
+		// Draw unused space on side
+		const unusedRegions = Array.from(this._openRegionsByWidth.values()).flat().concat(Array.from(this._openRegionsByHeight.values()).flat());
+		for (const r of unusedRegions) {
+			ctx.fillStyle = UsagePreviewColors.Restricted;
+			ctx.fillRect(r.x, r.y, r.w, r.h);
+			restrictedPixels += r.w * r.h;
+		}
+
+
+		// Overlay actual glyphs on top
+		ctx.globalAlpha = 0.5;
+		ctx.drawImage(this._canvas, 0, 0);
+		ctx.globalAlpha = 1;
+
+		return canvas.convertToBlob();
+	}
+
+	public getStats(): string {
+		const w = this._canvas.width;
+		const h = this._canvas.height;
+
+		let slabEntryPixels = 0;
+		let usedPixels = 0;
+		let slabEdgePixels = 0;
+		let wastedPixels = 0;
+		let restrictedPixels = 0;
+		const totalPixels = w * h;
+		const slabW = 64 << (Math.floor(getActiveWindow().devicePixelRatio) - 1);
+		const slabH = slabW;
+
+		// Draw wasted underneath glyphs first
+		for (const slab of this._slabs) {
+			let x = 0;
+			let y = 0;
+			for (let i = 0; i < slab.count; i++) {
+				if (x + slab.entryW > slabW) {
+					x = 0;
+					y += slab.entryH;
+				}
+				slabEntryPixels += slab.entryW * slab.entryH;
+				x += slab.entryW;
+			}
+			const entriesPerRow = Math.floor(slabW / slab.entryW);
+			const entriesPerCol = Math.floor(slabH / slab.entryH);
+			const thisSlabPixels = slab.entryW * entriesPerRow * slab.entryH * entriesPerCol;
+			slabEdgePixels += (slabW * slabH) - thisSlabPixels;
+		}
+
+		// Draw glyphs
+		for (const g of this._allocatedGlyphs) {
+			usedPixels += g.w * g.h;
+		}
+
+		// Draw unused space on side
+		const unusedRegions = Array.from(this._openRegionsByWidth.values()).flat().concat(Array.from(this._openRegionsByHeight.values()).flat());
+		for (const r of unusedRegions) {
+			restrictedPixels += r.w * r.h;
+		}
+
+		const edgeUsedPixels = slabEdgePixels - restrictedPixels;
+		wastedPixels = slabEntryPixels - (usedPixels - edgeUsedPixels);
+
+		// usedPixels += slabEdgePixels - restrictedPixels;
+		const efficiency = usedPixels / (usedPixels + wastedPixels + restrictedPixels);
+
+		return [
+			`page[${this._textureIndex}]:`,
+			`     Total: ${totalPixels}px (${w}x${h})`,
+			`      Used: ${usedPixels}px (${((usedPixels / totalPixels) * 100).toFixed(2)}%)`,
+			`    Wasted: ${wastedPixels}px (${((wastedPixels / totalPixels) * 100).toFixed(2)}%)`,
+			`Restricted: ${restrictedPixels}px (${((restrictedPixels / totalPixels) * 100).toFixed(2)}%) (hard to allocate)`,
+			`Efficiency: ${efficiency === 1 ? '100' : (efficiency * 100).toFixed(2)}%`,
+			`     Slabs: ${this._slabs.length} of ${Math.floor(this._canvas.width / slabW) * Math.floor(this._canvas.height / slabH)}`
+		].join('\n');
+	}
+}
+
+interface ITextureAtlasSlab {
+	x: number;
+	y: number;
+	entryH: number;
+	entryW: number;
+	count: number;
+}
+
+interface ITextureAtlasSlabUnusedRect {
+	x: number;
+	y: number;
+	w: number;
+	h: number;
+}
+
+function addEntryToMapArray<K, V>(map: Map<K, V[]>, key: K, entry: V) {
+	let list = map.get(key);
+	if (!list) {
+		list = [];
+		map.set(key, list);
+	}
+	list.push(entry);
+}
diff --git a/src/vs/editor/browser/gpu/bufferDirtyTracker.ts b/src/vs/editor/browser/gpu/bufferDirtyTracker.ts
new file mode 100644
index 00000000000..58c9f8c39c2
--- /dev/null
+++ b/src/vs/editor/browser/gpu/bufferDirtyTracker.ts
@@ -0,0 +1,72 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+export interface IBufferDirtyTrackerReader {
+	/**
+	 * The index of the first dirty index.
+	 */
+	readonly dataOffset: number | undefined;
+	/**
+	 * The index of the last dirty index (inclusive).
+	 */
+	readonly dirtySize: number | undefined;
+	/**
+	 * Whether the buffer is dirty.
+	 */
+	readonly isDirty: boolean;
+	/**
+	 * Clear the dirty state.
+	 */
+	clear(): void;
+}
+
+/**
+ * A simple tracker for dirty regions in a buffer.
+ */
+export class BufferDirtyTracker implements IBufferDirtyTrackerReader {
+
+	private _startIndex: number | undefined;
+	private _endIndex: number | undefined;
+
+	get dataOffset(): number | undefined {
+		return this._startIndex;
+	}
+
+	get dirtySize(): number | undefined {
+		if (this._startIndex === undefined || this._endIndex === undefined) {
+			return undefined;
+		}
+		return this._endIndex - this._startIndex + 1;
+	}
+
+	get isDirty(): boolean { return this._startIndex !== undefined; }
+
+	/**
+	 * Flag the index(es) as modified. Returns the index flagged.
+	 * @param index An index to flag.
+	 * @param length An optional length to flag. Defaults to 1.
+	 */
+	flag(index: number, length: number = 1): number {
+		this._flag(index);
+		if (length > 1) {
+			this._flag(index + length - 1);
+		}
+		return index;
+	}
+
+	private _flag(index: number) {
+		if (this._startIndex === undefined || index < this._startIndex) {
+			this._startIndex = index;
+		}
+		if (this._endIndex === undefined || index > this._endIndex) {
+			this._endIndex = index;
+		}
+	}
+
+	clear() {
+		this._startIndex = undefined;
+		this._endIndex = undefined;
+	}
+}
diff --git a/src/vs/editor/browser/gpu/fullFileRenderStrategy.ts b/src/vs/editor/browser/gpu/fullFileRenderStrategy.ts
new file mode 100644
index 00000000000..561185b7971
--- /dev/null
+++ b/src/vs/editor/browser/gpu/fullFileRenderStrategy.ts
@@ -0,0 +1,301 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { getActiveWindow } from '../../../base/browser/dom.js';
+import { BugIndicatingError } from '../../../base/common/errors.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { EditorOption } from '../../common/config/editorOptions.js';
+import { CursorColumns } from '../../common/core/cursorColumns.js';
+import type { IViewLineTokens } from '../../common/tokens/lineTokens.js';
+import type { ViewportData } from '../../common/viewLayout/viewLinesViewportData.js';
+import type { ViewLineRenderingData } from '../../common/viewModel.js';
+import type { ViewContext } from '../../common/viewModel/viewContext.js';
+import type { ViewLineOptions } from '../viewParts/viewLines/viewLineOptions.js';
+import type { ITextureAtlasPageGlyph } from './atlas/atlas.js';
+import type { TextureAtlas } from './atlas/textureAtlas.js';
+import { fullFileRenderStrategyWgsl } from './fullFileRenderStrategy.wgsl.js';
+import { BindingId, type IGpuRenderStrategy } from './gpu.js';
+import { GPULifecycle } from './gpuDisposable.js';
+import { quadVertices } from './gpuUtils.js';
+import { GlyphRasterizer } from './raster/glyphRasterizer.js';
+import { ViewGpuContext } from './viewGpuContext.js';
+
+
+const enum Constants {
+	IndicesPerCell = 6,
+}
+
+const enum CellBufferInfo {
+	FloatsPerEntry = 6,
+	BytesPerEntry = CellBufferInfo.FloatsPerEntry * 4,
+	Offset_X = 0,
+	Offset_Y = 1,
+	Offset_Unused1 = 2,
+	Offset_Unused2 = 3,
+	GlyphIndex = 4,
+	TextureIndex = 5,
+}
+
+export class FullFileRenderStrategy extends Disposable implements IGpuRenderStrategy {
+
+	private static _lineCount = 3000;
+	private static _columnCount = 200;
+
+	readonly wgsl: string = fullFileRenderStrategyWgsl;
+
+	private readonly _glyphRasterizer: GlyphRasterizer;
+
+	private _cellBindBuffer!: GPUBuffer;
+
+	/**
+	 * The cell value buffers, these hold the cells and their glyphs. It's double buffers such that
+	 * the thread doesn't block when one is being uploaded to the GPU.
+	 */
+	private _cellValueBuffers!: [ArrayBuffer, ArrayBuffer];
+	private _activeDoubleBufferIndex: 0 | 1 = 0;
+
+	private readonly _upToDateLines: [Set<number>, Set<number>] = [new Set(), new Set()];
+	private _visibleObjectCount: number = 0;
+
+	private _scrollOffsetBindBuffer!: GPUBuffer;
+	private _scrollOffsetValueBuffers!: [Float32Array, Float32Array];
+
+	get bindGroupEntries(): GPUBindGroupEntry[] {
+		return [
+			{ binding: BindingId.Cells, resource: { buffer: this._cellBindBuffer } },
+			{ binding: BindingId.ScrollOffset, resource: { buffer: this._scrollOffsetBindBuffer } }
+		];
+	}
+
+	constructor(
+		private readonly _context: ViewContext,
+		private readonly _device: GPUDevice,
+		private readonly _canvas: HTMLCanvasElement,
+		private readonly _atlas: TextureAtlas,
+	) {
+		super();
+
+		// TODO: Detect when lines have been tokenized and clear _upToDateLines
+		const fontFamily = this._context.configuration.options.get(EditorOption.fontFamily);
+		const fontSize = this._context.configuration.options.get(EditorOption.fontSize);
+
+		this._glyphRasterizer = this._register(new GlyphRasterizer(fontSize, fontFamily));
+
+		const bufferSize = FullFileRenderStrategy._lineCount * FullFileRenderStrategy._columnCount * Constants.IndicesPerCell * Float32Array.BYTES_PER_ELEMENT;
+		this._cellBindBuffer = this._register(GPULifecycle.createBuffer(this._device, {
+			label: 'Monaco full file cell buffer',
+			size: bufferSize,
+			usage: GPUBufferUsage.STORAGE | GPUBufferUsage.COPY_DST,
+		})).object;
+		this._cellValueBuffers = [
+			new ArrayBuffer(bufferSize),
+			new ArrayBuffer(bufferSize),
+		];
+
+		const scrollOffsetBufferSize = 2;
+		this._scrollOffsetBindBuffer = this._register(GPULifecycle.createBuffer(this._device, {
+			label: 'Monaco scroll offset buffer',
+			size: scrollOffsetBufferSize * Float32Array.BYTES_PER_ELEMENT,
+			usage: GPUBufferUsage.UNIFORM | GPUBufferUsage.COPY_DST,
+		})).object;
+		this._scrollOffsetValueBuffers = [
+			new Float32Array(scrollOffsetBufferSize),
+			new Float32Array(scrollOffsetBufferSize),
+		];
+	}
+
+	reset() {
+		for (const bufferIndex of [0, 1]) {
+			// Zero out buffer and upload to GPU to prevent stale rows from rendering
+			const buffer = new Float32Array(this._cellValueBuffers[bufferIndex]);
+			buffer.fill(0, 0, buffer.length);
+			this._device.queue.writeBuffer(this._cellBindBuffer, 0, buffer.buffer, 0, buffer.byteLength);
+			this._upToDateLines[bufferIndex].clear();
+		}
+		this._visibleObjectCount = 0;
+	}
+
+	update(viewportData: ViewportData, viewLineOptions: ViewLineOptions): number {
+		// Pre-allocate variables to be shared within the loop - don't trust the JIT compiler to do
+		// this optimization to avoid additional blocking time in garbage collector
+		let chars = '';
+		let y = 0;
+		let x = 0;
+		let screenAbsoluteX = 0;
+		let screenAbsoluteY = 0;
+		let zeroToOneX = 0;
+		let zeroToOneY = 0;
+		let wgslX = 0;
+		let wgslY = 0;
+		let xOffset = 0;
+		let glyph: Readonly<ITextureAtlasPageGlyph>;
+		let cellIndex = 0;
+
+		let tokenStartIndex = 0;
+		let tokenEndIndex = 0;
+		let tokenMetadata = 0;
+
+		let lineData: ViewLineRenderingData;
+		let content: string = '';
+		let fillStartIndex = 0;
+		let fillEndIndex = 0;
+
+		let tokens: IViewLineTokens;
+
+		const dpr = getActiveWindow().devicePixelRatio;
+
+		// Update scroll offset
+		const scrollOffsetBuffer = this._scrollOffsetValueBuffers[this._activeDoubleBufferIndex];
+		scrollOffsetBuffer[0] = this._context.viewLayout.getCurrentScrollLeft() * dpr;
+		scrollOffsetBuffer[1] = this._context.viewLayout.getCurrentScrollTop() * dpr;
+		this._device.queue.writeBuffer(this._scrollOffsetBindBuffer, 0, scrollOffsetBuffer);
+
+		// Update cell data
+		const cellBuffer = new Float32Array(this._cellValueBuffers[this._activeDoubleBufferIndex]);
+		const lineIndexCount = FullFileRenderStrategy._columnCount * Constants.IndicesPerCell;
+
+		const upToDateLines = this._upToDateLines[this._activeDoubleBufferIndex];
+		let dirtyLineStart = Number.MAX_SAFE_INTEGER;
+		let dirtyLineEnd = 0;
+
+		for (y = viewportData.startLineNumber; y <= viewportData.endLineNumber; y++) {
+
+			// Only attempt to render lines that the GPU renderer can handle
+			if (!ViewGpuContext.canRender(viewLineOptions, viewportData, y)) {
+				continue;
+			}
+
+			// TODO: Update on dirty lines; is this known by line before rendering?
+			// if (upToDateLines.has(y)) {
+			// 	continue;
+			// }
+			dirtyLineStart = Math.min(dirtyLineStart, y);
+			dirtyLineEnd = Math.max(dirtyLineEnd, y);
+
+			lineData = viewportData.getViewLineRenderingData(y);
+			content = lineData.content;
+			xOffset = 0;
+
+			// See ViewLine#renderLine
+			// const renderLineInput = new RenderLineInput(
+			// 	options.useMonospaceOptimizations,
+			// 	options.canUseHalfwidthRightwardsArrow,
+			// 	lineData.content,
+			// 	lineData.continuesWithWrappedLine,
+			// 	lineData.isBasicASCII,
+			// 	lineData.containsRTL,
+			// 	lineData.minColumn - 1,
+			// 	lineData.tokens,
+			// 	actualInlineDecorations,
+			// 	lineData.tabSize,
+			// 	lineData.startVisibleColumn,
+			// 	options.spaceWidth,
+			// 	options.middotWidth,
+			// 	options.wsmiddotWidth,
+			// 	options.stopRenderingLineAfter,
+			// 	options.renderWhitespace,
+			// 	options.renderControlCharacters,
+			// 	options.fontLigatures !== EditorFontLigatures.OFF,
+			// 	selectionsOnLine
+			// );
+
+			tokens = lineData.tokens;
+			tokenStartIndex = lineData.minColumn - 1;
+			tokenEndIndex = 0;
+			for (let tokenIndex = 0, tokensLen = tokens.getCount(); tokenIndex < tokensLen; tokenIndex++) {
+				tokenEndIndex = tokens.getEndOffset(tokenIndex);
+				if (tokenEndIndex <= tokenStartIndex) {
+					// The faux indent part of the line should have no token type
+					continue;
+				}
+
+
+				tokenMetadata = tokens.getMetadata(tokenIndex);
+
+				// console.log(`token: start=${tokenStartIndex}, end=${tokenEndIndex}, fg=${colorMap[tokenFg]}`);
+
+
+				for (x = tokenStartIndex; x < tokenEndIndex; x++) {
+					// HACK: Prevent rendering past the end of the render buffer
+					// TODO: This needs to move to a dynamic long line rendering strategy
+					if (x > FullFileRenderStrategy._columnCount) {
+						break;
+					}
+					chars = content.charAt(x);
+					if (chars === ' ') {
+						continue;
+					}
+					if (chars === '\t') {
+						xOffset = CursorColumns.nextRenderTabStop(x + xOffset, lineData.tabSize) - x - 1;
+						continue;
+					}
+
+					glyph = this._atlas.getGlyph(this._glyphRasterizer, chars, tokenMetadata);
+
+					// TODO: Support non-standard character widths
+					screenAbsoluteX = Math.round((x + xOffset) * viewLineOptions.spaceWidth * dpr);
+					screenAbsoluteY = (
+						Math.ceil((
+							// Top of line including line height
+							viewportData.relativeVerticalOffset[y - viewportData.startLineNumber] +
+							// Delta to top of line after line height
+							Math.floor((viewportData.lineHeight - this._context.configuration.options.get(EditorOption.fontSize)) / 2)
+						) * dpr)
+					);
+					zeroToOneX = screenAbsoluteX / this._canvas.width;
+					zeroToOneY = screenAbsoluteY / this._canvas.height;
+					wgslX = zeroToOneX * 2 - 1;
+					wgslY = zeroToOneY * 2 - 1;
+
+					cellIndex = ((y - 1) * FullFileRenderStrategy._columnCount + (x + xOffset)) * Constants.IndicesPerCell;
+					cellBuffer[cellIndex + CellBufferInfo.Offset_X] = wgslX;
+					cellBuffer[cellIndex + CellBufferInfo.Offset_Y] = -wgslY;
+					cellBuffer[cellIndex + CellBufferInfo.GlyphIndex] = glyph.glyphIndex;
+					cellBuffer[cellIndex + CellBufferInfo.TextureIndex] = glyph.pageIndex;
+				}
+
+				tokenStartIndex = tokenEndIndex;
+			}
+
+			// Clear to end of line
+			fillStartIndex = ((y - 1) * FullFileRenderStrategy._columnCount + (tokenEndIndex + xOffset)) * Constants.IndicesPerCell;
+			fillEndIndex = (y * FullFileRenderStrategy._columnCount) * Constants.IndicesPerCell;
+			cellBuffer.fill(0, fillStartIndex, fillEndIndex);
+
+			upToDateLines.add(y);
+		}
+
+		const visibleObjectCount = (viewportData.endLineNumber - viewportData.startLineNumber + 1) * lineIndexCount;
+
+		// Only write when there is changed data
+		if (dirtyLineStart <= dirtyLineEnd) {
+			// Write buffer and swap it out to unblock writes
+			this._device.queue.writeBuffer(
+				this._cellBindBuffer,
+				(dirtyLineStart - 1) * lineIndexCount * Float32Array.BYTES_PER_ELEMENT,
+				cellBuffer.buffer,
+				(dirtyLineStart - 1) * lineIndexCount * Float32Array.BYTES_PER_ELEMENT,
+				(dirtyLineEnd - dirtyLineStart + 1) * lineIndexCount * Float32Array.BYTES_PER_ELEMENT
+			);
+		}
+
+		this._activeDoubleBufferIndex = this._activeDoubleBufferIndex ? 0 : 1;
+
+		this._visibleObjectCount = visibleObjectCount;
+		return visibleObjectCount;
+	}
+
+	draw(pass: GPURenderPassEncoder, viewportData: ViewportData): void {
+		if (this._visibleObjectCount <= 0) {
+			throw new BugIndicatingError('Attempt to draw 0 objects');
+		}
+		pass.draw(
+			quadVertices.length / 2,
+			this._visibleObjectCount,
+			undefined,
+			(viewportData.startLineNumber - 1) * FullFileRenderStrategy._columnCount
+		);
+	}
+}
diff --git a/src/vs/editor/browser/gpu/fullFileRenderStrategy.wgsl.ts b/src/vs/editor/browser/gpu/fullFileRenderStrategy.wgsl.ts
new file mode 100644
index 00000000000..c5072ffb616
--- /dev/null
+++ b/src/vs/editor/browser/gpu/fullFileRenderStrategy.wgsl.ts
@@ -0,0 +1,94 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { BindingId } from './gpu.js';
+
+export const fullFileRenderStrategyWgsl = /*wgsl*/ `
+struct GlyphInfo {
+	position: vec2f,
+	size: vec2f,
+	origin: vec2f,
+};
+
+struct Vertex {
+	@location(0) position: vec2f,
+};
+
+struct Cell {
+	position: vec2f,
+	unused1: vec2f,
+	glyphIndex: f32,
+	textureIndex: f32
+};
+
+struct LayoutInfo {
+	canvasDims: vec2f,
+	viewportOffset: vec2f,
+	viewportDims: vec2f,
+}
+
+struct ScrollOffset {
+	offset: vec2f
+}
+
+struct VSOutput {
+	@builtin(position) position:   vec4f,
+	@location(1)       layerIndex: f32,
+	@location(0)       texcoord:   vec2f,
+};
+
+// Uniforms
+@group(0) @binding(${BindingId.LayoutInfoUniform})       var<uniform>       layoutInfo:      LayoutInfo;
+@group(0) @binding(${BindingId.AtlasDimensionsUniform})  var<uniform>       atlasDims:       vec2f;
+@group(0) @binding(${BindingId.ScrollOffset})            var<uniform>       scrollOffset:    ScrollOffset;
+
+// Storage buffers
+@group(0) @binding(${BindingId.GlyphInfo0})              var<storage, read> glyphInfo0:      array<GlyphInfo>;
+@group(0) @binding(${BindingId.GlyphInfo1})              var<storage, read> glyphInfo1:      array<GlyphInfo>;
+@group(0) @binding(${BindingId.Cells})                   var<storage, read> cells:           array<Cell>;
+
+@vertex fn vs(
+	vert: Vertex,
+	@builtin(instance_index) instanceIndex: u32,
+	@builtin(vertex_index) vertexIndex : u32
+) -> VSOutput {
+	let cell = cells[instanceIndex];
+	// TODO: Is there a nicer way to init this?
+	var glyph = glyphInfo0[0];
+	let glyphIndex = u32(cell.glyphIndex);
+	if (u32(cell.textureIndex) == 0) {
+		glyph = glyphInfo0[glyphIndex];
+	} else {
+		glyph = glyphInfo1[glyphIndex];
+	}
+
+	var vsOut: VSOutput;
+	// Multiple vert.position by 2,-2 to get it into clipspace which ranged from -1 to 1
+	vsOut.position = vec4f(
+		(((vert.position * vec2f(2, -2)) / layoutInfo.canvasDims)) * glyph.size + cell.position + ((glyph.origin * vec2f(2, -2)) / layoutInfo.canvasDims) + (((layoutInfo.viewportOffset - scrollOffset.offset * vec2(1, -1)) * 2) / layoutInfo.canvasDims),
+		0.0,
+		1.0
+	);
+
+	vsOut.layerIndex = cell.textureIndex;
+	// Textures are flipped from natural direction on the y-axis, so flip it back
+	vsOut.texcoord = vert.position;
+	vsOut.texcoord = (
+		// Glyph offset (0-1)
+		(glyph.position / atlasDims) +
+		// Glyph coordinate (0-1)
+		(vsOut.texcoord * (glyph.size / atlasDims))
+	);
+
+	return vsOut;
+}
+
+@group(0) @binding(${BindingId.TextureSampler}) var ourSampler: sampler;
+@group(0) @binding(${BindingId.Texture})        var ourTexture: texture_2d_array<f32>;
+
+@fragment fn fs(vsOut: VSOutput) -> @location(0) vec4f {
+	return textureSample(ourTexture, ourSampler, vsOut.texcoord, u32(vsOut.layerIndex));
+}
+`;
diff --git a/src/vs/editor/browser/gpu/gpu.ts b/src/vs/editor/browser/gpu/gpu.ts
new file mode 100644
index 00000000000..3d4f2a28453
--- /dev/null
+++ b/src/vs/editor/browser/gpu/gpu.ts
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import type { ViewportData } from '../../common/viewLayout/viewLinesViewportData.js';
+import type { ViewLineOptions } from '../viewParts/viewLines/viewLineOptions.js';
+
+export const enum BindingId {
+	GlyphInfo0,
+	GlyphInfo1,
+	Cells,
+	TextureSampler,
+	Texture,
+	LayoutInfoUniform,
+	AtlasDimensionsUniform,
+	ScrollOffset,
+}
+
+export interface IGpuRenderStrategy {
+	readonly wgsl: string;
+	readonly bindGroupEntries: GPUBindGroupEntry[];
+
+	/**
+	 * Resets the render strategy, clearing all data and setting up for a new frame.
+	 */
+	reset(): void;
+	update(viewportData: ViewportData, viewLineOptions: ViewLineOptions): number;
+	draw?(pass: GPURenderPassEncoder, viewportData: ViewportData): void;
+}
diff --git a/src/vs/editor/browser/gpu/gpuDisposable.ts b/src/vs/editor/browser/gpu/gpuDisposable.ts
new file mode 100644
index 00000000000..1405eb898d2
--- /dev/null
+++ b/src/vs/editor/browser/gpu/gpuDisposable.ts
@@ -0,0 +1,46 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import type { IReference } from '../../../base/common/lifecycle.js';
+import { isFunction } from '../../../base/common/types.js';
+
+export namespace GPULifecycle {
+	export async function requestDevice(fallback?: (message: string) => void): Promise<IReference<GPUDevice>> {
+		try {
+			if (!navigator.gpu) {
+				throw new Error('This browser does not support WebGPU');
+			}
+			const adapter = (await navigator.gpu.requestAdapter())!;
+			if (!adapter) {
+				throw new Error('This browser supports WebGPU but it appears to be disabled');
+			}
+			return wrapDestroyableInDisposable(await adapter.requestDevice());
+		} catch (e) {
+			if (fallback) {
+				fallback(e.message);
+			}
+			throw e;
+		}
+	}
+
+	export function createBuffer(device: GPUDevice, descriptor: GPUBufferDescriptor, initialValues?: Float32Array | (() => Float32Array)): IReference<GPUBuffer> {
+		const buffer = device.createBuffer(descriptor);
+		if (initialValues) {
+			device.queue.writeBuffer(buffer, 0, isFunction(initialValues) ? initialValues() : initialValues);
+		}
+		return wrapDestroyableInDisposable(buffer);
+	}
+
+	export function createTexture(device: GPUDevice, descriptor: GPUTextureDescriptor): IReference<GPUTexture> {
+		return wrapDestroyableInDisposable(device.createTexture(descriptor));
+	}
+}
+
+function wrapDestroyableInDisposable<T extends { destroy(): void }>(value: T): IReference<T> {
+	return {
+		object: value,
+		dispose: () => value.destroy()
+	};
+}
diff --git a/src/vs/editor/browser/gpu/gpuUtils.ts b/src/vs/editor/browser/gpu/gpuUtils.ts
new file mode 100644
index 00000000000..6ced420acc2
--- /dev/null
+++ b/src/vs/editor/browser/gpu/gpuUtils.ts
@@ -0,0 +1,59 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { BugIndicatingError } from '../../../base/common/errors.js';
+import { toDisposable, type IDisposable } from '../../../base/common/lifecycle.js';
+
+export const quadVertices = new Float32Array([
+	1, 0,
+	1, 1,
+	0, 1,
+	0, 0,
+	0, 1,
+	1, 0,
+]);
+
+export function ensureNonNullable<T>(value: T | null): T {
+	if (!value) {
+		throw new Error(`Value "${value}" cannot be null`);
+	}
+	return value;
+}
+
+// TODO: Move capabilities into ElementSizeObserver?
+export function observeDevicePixelDimensions(element: HTMLElement, parentWindow: Window & typeof globalThis, callback: (deviceWidth: number, deviceHeight: number) => void): IDisposable {
+	// Observe any resizes to the element and extract the actual pixel size of the element if the
+	// devicePixelContentBoxSize API is supported. This allows correcting rounding errors when
+	// converting between CSS pixels and device pixels which causes blurry rendering when device
+	// pixel ratio is not a round number.
+	let observer: ResizeObserver | undefined = new parentWindow.ResizeObserver((entries) => {
+		const entry = entries.find((entry) => entry.target === element);
+		if (!entry) {
+			return;
+		}
+
+		// Disconnect if devicePixelContentBoxSize isn't supported by the browser
+		if (!('devicePixelContentBoxSize' in entry)) {
+			observer?.disconnect();
+			observer = undefined;
+			return;
+		}
+
+		// Fire the callback, ignore events where the dimensions are 0x0 as the canvas is likely hidden
+		const width = entry.devicePixelContentBoxSize[0].inlineSize;
+		const height = entry.devicePixelContentBoxSize[0].blockSize;
+		if (width > 0 && height > 0) {
+			callback(width, height);
+		}
+	});
+	try {
+		observer.observe(element, { box: ['device-pixel-content-box'] } as any);
+	} catch {
+		observer.disconnect();
+		observer = undefined;
+		throw new BugIndicatingError('Could not observe device pixel dimensions');
+	}
+	return toDisposable(() => observer?.disconnect());
+}
diff --git a/src/vs/editor/browser/gpu/objectCollectionBuffer.ts b/src/vs/editor/browser/gpu/objectCollectionBuffer.ts
new file mode 100644
index 00000000000..a61fe8c09de
--- /dev/null
+++ b/src/vs/editor/browser/gpu/objectCollectionBuffer.ts
@@ -0,0 +1,207 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable, dispose, toDisposable, type IDisposable } from '../../../base/common/lifecycle.js';
+import { LinkedList } from '../../../base/common/linkedList.js';
+import { BufferDirtyTracker, type IBufferDirtyTrackerReader } from './bufferDirtyTracker.js';
+
+export interface ObjectCollectionBufferPropertySpec {
+	name: string;
+}
+
+export type ObjectCollectionPropertyValues<T extends ObjectCollectionBufferPropertySpec[]> = {
+	[K in T[number]['name']]: number;
+};
+
+export interface IObjectCollectionBuffer<T extends ObjectCollectionBufferPropertySpec[]> extends IDisposable {
+	/**
+	 * The underlying buffer. This **should not** be modified externally.
+	 */
+	readonly buffer: ArrayBuffer;
+	/**
+	 * A view of the underlying buffer. This **should not** be modified externally.
+	 */
+	readonly view: Float32Array;
+	/**
+	 * The size of the used portion of the buffer (in bytes).
+	 */
+	readonly bufferUsedSize: number;
+	/**
+	 * The size of the used portion of the view (in float32s).
+	 */
+	readonly viewUsedSize: number;
+	/**
+	 * The number of entries in the buffer.
+	 */
+	readonly entryCount: number;
+
+	/**
+	 * A tracker for dirty regions in the buffer.
+	 */
+	readonly dirtyTracker: IBufferDirtyTrackerReader;
+
+	/**
+	 * Fires when the buffer is modified.
+	 */
+	readonly onDidChange: Event<void>;
+
+	/**
+	 * Fires when the buffer is recreated.
+	 */
+	readonly onDidChangeBuffer: Event<void>;
+
+	/**
+	 * Creates an entry in the collection. This will return a managed object that can be modified
+	 * which will update the underlying buffer.
+	 * @param data The data of the entry.
+	 */
+	createEntry(data: ObjectCollectionPropertyValues<T>): IObjectCollectionBufferEntry<T>;
+}
+
+/**
+ * An entry in an {@link ObjectCollectionBuffer}. Property values on the entry can be changed and
+ * their values will be updated automatically in the buffer.
+ */
+export interface IObjectCollectionBufferEntry<T extends ObjectCollectionBufferPropertySpec[]> extends IDisposable {
+	set(propertyName: T[number]['name'], value: number): void;
+	get(propertyName: T[number]['name']): number;
+	setRaw(data: ArrayLike<number>): void;
+}
+
+export function createObjectCollectionBuffer<T extends ObjectCollectionBufferPropertySpec[]>(
+	propertySpecs: T,
+	capacity: number
+): IObjectCollectionBuffer<T> {
+	return new ObjectCollectionBuffer<T>(propertySpecs, capacity);
+}
+
+class ObjectCollectionBuffer<T extends ObjectCollectionBufferPropertySpec[]> extends Disposable implements IObjectCollectionBuffer<T> {
+	buffer: ArrayBuffer;
+	view: Float32Array;
+
+	get bufferUsedSize() {
+		return this.viewUsedSize * Float32Array.BYTES_PER_ELEMENT;
+	}
+	get viewUsedSize() {
+		return this._entries.size * this._entrySize;
+	}
+	get entryCount() {
+		return this._entries.size;
+	}
+
+	private _dirtyTracker = new BufferDirtyTracker();
+	get dirtyTracker(): IBufferDirtyTrackerReader { return this._dirtyTracker; }
+
+	private readonly _propertySpecsMap: Map<string, ObjectCollectionBufferPropertySpec & { offset: number }> = new Map();
+	private readonly _entrySize: number;
+	private readonly _entries: LinkedList<ObjectCollectionBufferEntry<T>> = new LinkedList();
+
+	private readonly _onDidChange = this._register(new Emitter<void>());
+	readonly onDidChange = this._onDidChange.event;
+	private readonly _onDidChangeBuffer = this._register(new Emitter<void>());
+	readonly onDidChangeBuffer = this._onDidChangeBuffer.event;
+
+	constructor(
+		public propertySpecs: T,
+		public capacity: number
+	) {
+		super();
+
+		this.view = new Float32Array(capacity * propertySpecs.length);
+		this.buffer = this.view.buffer;
+		this._entrySize = propertySpecs.length;
+		for (let i = 0; i < propertySpecs.length; i++) {
+			const spec = {
+				offset: i,
+				...propertySpecs[i]
+			};
+			this._propertySpecsMap.set(spec.name, spec);
+		}
+		this._register(toDisposable(() => dispose(this._entries)));
+	}
+
+	createEntry(data: ObjectCollectionPropertyValues<T>): IObjectCollectionBufferEntry<T> {
+		if (this._entries.size === this.capacity) {
+			this._expandBuffer();
+			this._onDidChangeBuffer.fire();
+		}
+
+		const value = new ObjectCollectionBufferEntry(this.view, this._propertySpecsMap, this._dirtyTracker, this._entries.size, data);
+		const removeFromEntries = this._entries.push(value);
+		const listeners: IDisposable[] = [];
+		listeners.push(Event.forward(value.onDidChange, this._onDidChange));
+		listeners.push(value.onWillDispose(() => {
+			const deletedEntryIndex = value.i;
+			removeFromEntries();
+
+			// Shift all entries after the deleted entry to the left
+			this.view.set(this.view.subarray(deletedEntryIndex * this._entrySize + 2, this._entries.size * this._entrySize + 2), deletedEntryIndex * this._entrySize);
+
+			// Update entries to reflect the new i
+			for (const entry of this._entries) {
+				if (entry.i > deletedEntryIndex) {
+					entry.i--;
+				}
+			}
+			this._dirtyTracker.flag(deletedEntryIndex, (this._entries.size - deletedEntryIndex) * this._entrySize);
+			dispose(listeners);
+		}));
+		return value;
+	}
+
+	private _expandBuffer() {
+		this.capacity *= 2;
+		const newView = new Float32Array(this.capacity * this._entrySize);
+		newView.set(this.view);
+		this.view = newView;
+		this.buffer = this.view.buffer;
+	}
+}
+
+class ObjectCollectionBufferEntry<T extends ObjectCollectionBufferPropertySpec[]> extends Disposable implements IObjectCollectionBufferEntry<T> {
+
+	private readonly _onDidChange = this._register(new Emitter<void>());
+	readonly onDidChange = this._onDidChange.event;
+	private readonly _onWillDispose = this._register(new Emitter<void>());
+	readonly onWillDispose = this._onWillDispose.event;
+
+	constructor(
+		private _view: Float32Array,
+		private _propertySpecsMap: Map<string, ObjectCollectionBufferPropertySpec & { offset: number }>,
+		private _dirtyTracker: BufferDirtyTracker,
+		public i: number,
+		data: ObjectCollectionPropertyValues<T>,
+	) {
+		super();
+		for (const propertySpec of this._propertySpecsMap.values()) {
+			this._view[this.i * this._propertySpecsMap.size + propertySpec.offset] = data[propertySpec.name as keyof typeof data];
+		}
+		this._dirtyTracker.flag(this.i * this._propertySpecsMap.size, this._propertySpecsMap.size);
+	}
+
+	override dispose() {
+		this._onWillDispose.fire();
+		super.dispose();
+	}
+
+	set(propertyName: T[number]['name'], value: number): void {
+		const i = this.i * this._propertySpecsMap.size + this._propertySpecsMap.get(propertyName)!.offset;
+		this._view[this._dirtyTracker.flag(i)] = value;
+		this._onDidChange.fire();
+	}
+
+	get(propertyName: T[number]['name']): number {
+		return this._view[this.i * this._propertySpecsMap.size + this._propertySpecsMap.get(propertyName)!.offset];
+	}
+
+	setRaw(data: ArrayLike<number>): void {
+		if (data.length !== this._propertySpecsMap.size) {
+			throw new Error(`Data length ${data.length} does not match the number of properties in the collection (${this._propertySpecsMap.size})`);
+		}
+		this._view.set(data, this.i * this._propertySpecsMap.size);
+		this._dirtyTracker.flag(this.i * this._propertySpecsMap.size, this._propertySpecsMap.size);
+	}
+}
diff --git a/src/vs/editor/browser/gpu/raster/glyphRasterizer.ts b/src/vs/editor/browser/gpu/raster/glyphRasterizer.ts
new file mode 100644
index 00000000000..26010b7e386
--- /dev/null
+++ b/src/vs/editor/browser/gpu/raster/glyphRasterizer.ts
@@ -0,0 +1,240 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { getActiveWindow } from '../../../../base/browser/dom.js';
+import { memoize } from '../../../../base/common/decorators.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { StringBuilder } from '../../../common/core/stringBuilder.js';
+import { FontStyle, TokenMetadata } from '../../../common/encodedTokenAttributes.js';
+import { ensureNonNullable } from '../gpuUtils.js';
+import type { IBoundingBox, IGlyphRasterizer, IRasterizedGlyph } from './raster.js';
+
+let nextId = 0;
+
+export class GlyphRasterizer extends Disposable implements IGlyphRasterizer {
+	public readonly id = nextId++;
+
+	@memoize
+	public get cacheKey(): string {
+		return `${this._fontFamily}_${this._fontSize}px`;
+	}
+
+	private _canvas: OffscreenCanvas;
+	private _ctx: OffscreenCanvasRenderingContext2D;
+
+	private _workGlyph: IRasterizedGlyph = {
+		source: null!,
+		boundingBox: {
+			left: 0,
+			bottom: 0,
+			right: 0,
+			top: 0,
+		},
+		originOffset: {
+			x: 0,
+			y: 0,
+		}
+	};
+	private _workGlyphConfig: { chars: string | undefined; metadata: number } = { chars: undefined, metadata: 0 };
+
+	constructor(
+		private readonly _fontSize: number,
+		private readonly _fontFamily: string,
+	) {
+		super();
+
+		const devicePixelFontSize = Math.ceil(this._fontSize * getActiveWindow().devicePixelRatio);
+		this._canvas = new OffscreenCanvas(devicePixelFontSize * 3, devicePixelFontSize * 3);
+		this._ctx = ensureNonNullable(this._canvas.getContext('2d', {
+			willReadFrequently: true
+		}));
+		this._ctx.textBaseline = 'top';
+		this._ctx.fillStyle = '#FFFFFF';
+	}
+
+	// TODO: Support drawing multiple fonts and sizes
+	/**
+	 * Rasterizes a glyph. Note that the returned object is reused across different glyphs and
+	 * therefore is only safe for synchronous access.
+	 */
+	public rasterizeGlyph(
+		chars: string,
+		metadata: number,
+		colorMap: string[],
+	): Readonly<IRasterizedGlyph> {
+		if (chars === '') {
+			return {
+				source: this._canvas,
+				boundingBox: { top: 0, left: 0, bottom: -1, right: -1 },
+				originOffset: { x: 0, y: 0 }
+			};
+		}
+		// Check if the last glyph matches the config, reuse if so. This helps avoid unnecessary
+		// work when the rasterizer is called multiple times like when the glyph doesn't fit into a
+		// page.
+		if (this._workGlyphConfig.chars === chars && this._workGlyphConfig.metadata === metadata) {
+			return this._workGlyph;
+		}
+		this._workGlyphConfig.chars = chars;
+		this._workGlyphConfig.metadata = metadata;
+		return this._rasterizeGlyph(chars, metadata, colorMap);
+	}
+
+	public _rasterizeGlyph(
+		chars: string,
+		metadata: number,
+		colorMap: string[],
+	): Readonly<IRasterizedGlyph> {
+		const devicePixelFontSize = Math.ceil(this._fontSize * getActiveWindow().devicePixelRatio);
+		const canvasDim = devicePixelFontSize * 3;
+		if (this._canvas.width !== canvasDim) {
+			this._canvas.width = canvasDim;
+			this._canvas.height = canvasDim;
+		}
+
+		// TODO: Support workbench.fontAliasing
+		this._ctx.clearRect(0, 0, this._canvas.width, this._canvas.height);
+
+		const fontSb = new StringBuilder(200);
+		const fontStyle = TokenMetadata.getFontStyle(metadata);
+		if (fontStyle & FontStyle.Italic) {
+			fontSb.appendString('italic ');
+		}
+		if (fontStyle & FontStyle.Bold) {
+			fontSb.appendString('bold ');
+		}
+		fontSb.appendString(`${devicePixelFontSize}px ${this._fontFamily}`);
+		this._ctx.font = fontSb.build();
+
+		// TODO: Support FontStyle.Strikethrough and FontStyle.Underline text decorations, these
+		//       need to be drawn manually to the canvas. See xterm.js for "dodging" the text for
+		//       underlines.
+
+		const originX = devicePixelFontSize;
+		const originY = devicePixelFontSize;
+		this._ctx.fillStyle = colorMap[TokenMetadata.getForeground(metadata)];
+		// TODO: This might actually be slower
+		// const textMetrics = this._ctx.measureText(chars);
+		this._ctx.textBaseline = 'top';
+		this._ctx.fillText(chars, originX, originY);
+
+		const imageData = this._ctx.getImageData(0, 0, this._canvas.width, this._canvas.height);
+		this._findGlyphBoundingBox(imageData, this._workGlyph.boundingBox);
+		// const offset = {
+		// 	x: textMetrics.actualBoundingBoxLeft,
+		// 	y: textMetrics.actualBoundingBoxAscent
+		// };
+		// const size = {
+		// 	w: textMetrics.actualBoundingBoxRight + textMetrics.actualBoundingBoxLeft,
+		// 	y: textMetrics.actualBoundingBoxDescent + textMetrics.actualBoundingBoxAscent,
+		// 	wInt: Math.ceil(textMetrics.actualBoundingBoxRight + textMetrics.actualBoundingBoxLeft),
+		// 	yInt: Math.ceil(textMetrics.actualBoundingBoxDescent + textMetrics.actualBoundingBoxAscent),
+		// };
+		// console.log(`${chars}_${fg}`, textMetrics, boundingBox, originX, originY, { width: boundingBox.right - boundingBox.left, height: boundingBox.bottom - boundingBox.top });
+		this._workGlyph.source = this._canvas;
+		this._workGlyph.originOffset.x = this._workGlyph.boundingBox.left - originX;
+		this._workGlyph.originOffset.y = this._workGlyph.boundingBox.top - originY;
+		// const result2: IRasterizedGlyph = {
+		// 	source: this._canvas,
+		// 	boundingBox: {
+		// 		left: Math.floor(originX - textMetrics.actualBoundingBoxLeft),
+		// 		right: Math.ceil(originX + textMetrics.actualBoundingBoxRight),
+		// 		top: Math.floor(originY - textMetrics.actualBoundingBoxAscent),
+		// 		bottom: Math.ceil(originY + textMetrics.actualBoundingBoxDescent),
+		// 	},
+		// 	originOffset: {
+		// 		x: Math.floor(boundingBox.left - originX),
+		// 		y: Math.floor(boundingBox.top - originY)
+		// 	}
+		// };
+
+		// TODO: Verify result 1 and 2 are the same
+
+		// if (result2.boundingBox.left > result.boundingBox.left) {
+		// 	debugger;
+		// }
+		// if (result2.boundingBox.top > result.boundingBox.top) {
+		// 	debugger;
+		// }
+		// if (result2.boundingBox.right < result.boundingBox.right) {
+		// 	debugger;
+		// }
+		// if (result2.boundingBox.bottom < result.boundingBox.bottom) {
+		// 	debugger;
+		// }
+		// if (JSON.stringify(result2.originOffset) !== JSON.stringify(result.originOffset)) {
+		// 	debugger;
+		// }
+
+
+
+		return this._workGlyph;
+	}
+
+	// TODO: Does this even need to happen when measure text is used?
+	private _findGlyphBoundingBox(imageData: ImageData, outBoundingBox: IBoundingBox) {
+		const height = this._canvas.height;
+		const width = this._canvas.width;
+		let found = false;
+		for (let y = 0; y < height; y++) {
+			for (let x = 0; x < width; x++) {
+				const alphaOffset = y * width * 4 + x * 4 + 3;
+				if (imageData.data[alphaOffset] !== 0) {
+					outBoundingBox.top = y;
+					found = true;
+					break;
+				}
+			}
+			if (found) {
+				break;
+			}
+		}
+		outBoundingBox.left = 0;
+		found = false;
+		for (let x = 0; x < width; x++) {
+			for (let y = 0; y < height; y++) {
+				const alphaOffset = y * width * 4 + x * 4 + 3;
+				if (imageData.data[alphaOffset] !== 0) {
+					outBoundingBox.left = x;
+					found = true;
+					break;
+				}
+			}
+			if (found) {
+				break;
+			}
+		}
+		outBoundingBox.right = width;
+		found = false;
+		for (let x = width - 1; x >= outBoundingBox.left; x--) {
+			for (let y = 0; y < height; y++) {
+				const alphaOffset = y * width * 4 + x * 4 + 3;
+				if (imageData.data[alphaOffset] !== 0) {
+					outBoundingBox.right = x;
+					found = true;
+					break;
+				}
+			}
+			if (found) {
+				break;
+			}
+		}
+		outBoundingBox.bottom = outBoundingBox.top;
+		found = false;
+		for (let y = height - 1; y >= 0; y--) {
+			for (let x = 0; x < width; x++) {
+				const alphaOffset = y * width * 4 + x * 4 + 3;
+				if (imageData.data[alphaOffset] !== 0) {
+					outBoundingBox.bottom = y;
+					found = true;
+					break;
+				}
+			}
+			if (found) {
+				break;
+			}
+		}
+	}
+}
diff --git a/src/vs/editor/browser/gpu/raster/raster.ts b/src/vs/editor/browser/gpu/raster/raster.ts
new file mode 100644
index 00000000000..6eb41e680b2
--- /dev/null
+++ b/src/vs/editor/browser/gpu/raster/raster.ts
@@ -0,0 +1,65 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import type { MetadataConsts } from '../../../common/encodedTokenAttributes.js';
+
+export interface IGlyphRasterizer {
+	/**
+	 * A unique identifier for the rasterizer.
+	 */
+	readonly id: number;
+
+	/**
+	 * An identifier for properties inherent to rendering with this rasterizer. This will be the
+	 * same as other rasterizer cache keys provided they share the same property values in question.
+	 */
+	readonly cacheKey: string;
+
+	/**
+	 * Rasterizes a glyph.
+	 * @param chars The character(s) to rasterize. This can be a single character, a ligature, an
+	 * emoji, etc.
+	 * @param metadata The metadata of the glyph to rasterize. See {@link MetadataConsts} for how
+	 * this works.
+	 * @param colorMap A theme's color map.
+	 */
+	rasterizeGlyph(
+		chars: string,
+		metadata: number,
+		colorMap: string[],
+	): Readonly<IRasterizedGlyph>;
+}
+
+/**
+ * A simple bounding box in a 2D plane.
+ */
+export interface IBoundingBox {
+	/** The left x coordinate (inclusive). */
+	left: number;
+	/** The top y coordinate (inclusive). */
+	top: number;
+	/** The right x coordinate (inclusive). */
+	right: number;
+	/** The bottom y coordinate (inclusive). */
+	bottom: number;
+}
+
+/**
+ * A glyph that has been rasterized to a canvas.
+ */
+export interface IRasterizedGlyph {
+	/**
+	 * The source canvas the glyph was rasterized to.
+	 */
+	source: OffscreenCanvas;
+	/**
+	 * The bounding box of the glyph within {@link source}.
+	 */
+	boundingBox: IBoundingBox;
+	/**
+	 * The offset to the glyph's origin (where it should be drawn to).
+	 */
+	originOffset: { x: number; y: number };
+}
diff --git a/src/vs/editor/browser/gpu/rectangleRenderer.ts b/src/vs/editor/browser/gpu/rectangleRenderer.ts
new file mode 100644
index 00000000000..0859281f48b
--- /dev/null
+++ b/src/vs/editor/browser/gpu/rectangleRenderer.ts
@@ -0,0 +1,291 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { getActiveWindow } from '../../../base/browser/dom.js';
+import { Event } from '../../../base/common/event.js';
+import { IReference, MutableDisposable } from '../../../base/common/lifecycle.js';
+import { EditorOption } from '../../common/config/editorOptions.js';
+import { ViewEventHandler } from '../../common/viewEventHandler.js';
+import type { ViewScrollChangedEvent } from '../../common/viewEvents.js';
+import type { ViewportData } from '../../common/viewLayout/viewLinesViewportData.js';
+import type { ViewContext } from '../../common/viewModel/viewContext.js';
+import { GPULifecycle } from './gpuDisposable.js';
+import { observeDevicePixelDimensions, quadVertices } from './gpuUtils.js';
+import { createObjectCollectionBuffer, type IObjectCollectionBuffer, type IObjectCollectionBufferEntry } from './objectCollectionBuffer.js';
+import { RectangleRendererBindingId, rectangleRendererWgsl } from './rectangleRenderer.wgsl.js';
+
+export type RectangleRendererEntrySpec = [
+	{ name: 'x' },
+	{ name: 'y' },
+	{ name: 'width' },
+	{ name: 'height' },
+	{ name: 'red' },
+	{ name: 'green' },
+	{ name: 'blue' },
+	{ name: 'alpha' },
+];
+
+export class RectangleRenderer extends ViewEventHandler {
+
+	private _device!: GPUDevice;
+	private _renderPassDescriptor!: GPURenderPassDescriptor;
+	private _renderPassColorAttachment!: GPURenderPassColorAttachment;
+	private _bindGroup!: GPUBindGroup;
+	private _pipeline!: GPURenderPipeline;
+
+	private _vertexBuffer!: GPUBuffer;
+	private readonly _shapeBindBuffer: MutableDisposable<IReference<GPUBuffer>> = this._register(new MutableDisposable());
+
+	private _scrollOffsetBindBuffer!: GPUBuffer;
+	private _scrollOffsetValueBuffer!: Float32Array;
+
+	private _initialized: boolean = false;
+	private _scrollChanged: boolean = true;
+
+	private readonly _shapeCollection: IObjectCollectionBuffer<RectangleRendererEntrySpec> = this._register(createObjectCollectionBuffer([
+		{ name: 'x' },
+		{ name: 'y' },
+		{ name: 'width' },
+		{ name: 'height' },
+		{ name: 'red' },
+		{ name: 'green' },
+		{ name: 'blue' },
+		{ name: 'alpha' },
+	], 32));
+
+	constructor(
+		private readonly _context: ViewContext,
+		private readonly _canvas: HTMLCanvasElement,
+		private readonly _ctx: GPUCanvasContext,
+		device: Promise<GPUDevice>,
+	) {
+		super();
+
+		this._context.addEventHandler(this);
+
+		this._initWebgpu(device);
+	}
+
+	private async _initWebgpu(device: Promise<GPUDevice>) {
+
+		// #region General
+
+		this._device = await device;
+
+		if (this._store.isDisposed) {
+			return;
+		}
+
+		const presentationFormat = navigator.gpu.getPreferredCanvasFormat();
+		this._ctx.configure({
+			device: this._device,
+			format: presentationFormat,
+			alphaMode: 'premultiplied',
+		});
+
+		this._renderPassColorAttachment = {
+			view: null!, // Will be filled at render time
+			loadOp: 'load',
+			storeOp: 'store',
+		};
+		this._renderPassDescriptor = {
+			label: 'Monaco rectangle renderer render pass',
+			colorAttachments: [this._renderPassColorAttachment],
+		};
+
+		// #endregion General
+
+		// #region Uniforms
+
+		let layoutInfoUniformBuffer: GPUBuffer;
+		{
+			const enum Info {
+				FloatsPerEntry = 6,
+				BytesPerEntry = Info.FloatsPerEntry * 4,
+				Offset_CanvasWidth____ = 0,
+				Offset_CanvasHeight___ = 1,
+				Offset_ViewportOffsetX = 2,
+				Offset_ViewportOffsetY = 3,
+				Offset_ViewportWidth__ = 4,
+				Offset_ViewportHeight_ = 5,
+			}
+			const bufferValues = new Float32Array(Info.FloatsPerEntry);
+			const updateBufferValues = (canvasDevicePixelWidth: number = this._canvas.width, canvasDevicePixelHeight: number = this._canvas.height) => {
+				bufferValues[Info.Offset_CanvasWidth____] = canvasDevicePixelWidth;
+				bufferValues[Info.Offset_CanvasHeight___] = canvasDevicePixelHeight;
+				bufferValues[Info.Offset_ViewportOffsetX] = Math.ceil(this._context.configuration.options.get(EditorOption.layoutInfo).contentLeft * getActiveWindow().devicePixelRatio);
+				bufferValues[Info.Offset_ViewportOffsetY] = 0;
+				bufferValues[Info.Offset_ViewportWidth__] = bufferValues[Info.Offset_CanvasWidth____] - bufferValues[Info.Offset_ViewportOffsetX];
+				bufferValues[Info.Offset_ViewportHeight_] = bufferValues[Info.Offset_CanvasHeight___] - bufferValues[Info.Offset_ViewportOffsetY];
+				return bufferValues;
+			};
+			layoutInfoUniformBuffer = this._register(GPULifecycle.createBuffer(this._device, {
+				label: 'Monaco rectangle renderer uniform buffer',
+				size: Info.BytesPerEntry,
+				usage: GPUBufferUsage.UNIFORM | GPUBufferUsage.COPY_DST,
+			}, () => updateBufferValues())).object;
+			this._register(observeDevicePixelDimensions(this._canvas, getActiveWindow(), (w, h) => {
+				this._device.queue.writeBuffer(layoutInfoUniformBuffer, 0, updateBufferValues(w, h));
+			}));
+		}
+
+		const scrollOffsetBufferSize = 2;
+		this._scrollOffsetBindBuffer = this._register(GPULifecycle.createBuffer(this._device, {
+			label: 'Monaco rectangle renderer scroll offset buffer',
+			size: scrollOffsetBufferSize * Float32Array.BYTES_PER_ELEMENT,
+			usage: GPUBufferUsage.UNIFORM | GPUBufferUsage.COPY_DST,
+		})).object;
+		this._scrollOffsetValueBuffer = new Float32Array(scrollOffsetBufferSize);
+
+		// #endregion Uniforms
+
+		// #region Storage buffers
+
+		const createShapeBindBuffer = () => {
+			return GPULifecycle.createBuffer(this._device, {
+				label: 'Monaco rectangle renderer shape buffer',
+				size: this._shapeCollection.buffer.byteLength,
+				usage: GPUBufferUsage.STORAGE | GPUBufferUsage.COPY_DST,
+			});
+		};
+		this._shapeBindBuffer.value = createShapeBindBuffer();
+		this._register(Event.runAndSubscribe(this._shapeCollection.onDidChangeBuffer, () => {
+			this._shapeBindBuffer.value = createShapeBindBuffer();
+			if (this._pipeline) {
+				this._updateBindGroup(this._pipeline, layoutInfoUniformBuffer);
+			}
+		}));
+
+		// #endregion Storage buffers
+
+		// #region Vertex buffer
+
+		this._vertexBuffer = this._register(GPULifecycle.createBuffer(this._device, {
+			label: 'Monaco rectangle renderer vertex buffer',
+			size: quadVertices.byteLength,
+			usage: GPUBufferUsage.VERTEX | GPUBufferUsage.COPY_DST,
+		}, quadVertices)).object;
+
+		// #endregion Vertex buffer
+
+		// #region Shader module
+
+		const module = this._device.createShaderModule({
+			label: 'Monaco rectangle renderer shader module',
+			code: rectangleRendererWgsl,
+		});
+
+		// #endregion Shader module
+
+		// #region Pipeline
+
+		this._pipeline = this._device.createRenderPipeline({
+			label: 'Monaco rectangle renderer render pipeline',
+			layout: 'auto',
+			vertex: {
+				module,
+				buffers: [
+					{
+						arrayStride: 2 * Float32Array.BYTES_PER_ELEMENT, // 2 floats, 4 bytes each
+						attributes: [
+							{ shaderLocation: 0, offset: 0, format: 'float32x2' },  // position
+						],
+					}
+				]
+			},
+			fragment: {
+				module,
+				targets: [
+					{
+						format: presentationFormat,
+						blend: {
+							color: {
+								srcFactor: 'src-alpha',
+								dstFactor: 'one-minus-src-alpha'
+							},
+							alpha: {
+								srcFactor: 'src-alpha',
+								dstFactor: 'one-minus-src-alpha'
+							},
+						},
+					}
+				],
+			},
+		});
+
+		// #endregion Pipeline
+
+		// #region Bind group
+
+		this._updateBindGroup(this._pipeline, layoutInfoUniformBuffer);
+
+		// endregion Bind group
+
+		this._initialized = true;
+	}
+
+	private _updateBindGroup(pipeline: GPURenderPipeline, layoutInfoUniformBuffer: GPUBuffer) {
+		this._bindGroup = this._device.createBindGroup({
+			label: 'Monaco rectangle renderer bind group',
+			layout: pipeline.getBindGroupLayout(0),
+			entries: [
+				{ binding: RectangleRendererBindingId.Shapes, resource: { buffer: this._shapeBindBuffer.value!.object } },
+				{ binding: RectangleRendererBindingId.LayoutInfoUniform, resource: { buffer: layoutInfoUniformBuffer } },
+				{ binding: RectangleRendererBindingId.ScrollOffset, resource: { buffer: this._scrollOffsetBindBuffer } },
+			],
+		});
+	}
+
+	register(x: number, y: number, width: number, height: number, red: number, green: number, blue: number, alpha: number): IObjectCollectionBufferEntry<RectangleRendererEntrySpec> {
+		return this._shapeCollection.createEntry({ x, y, width, height, red, green, blue, alpha });
+	}
+
+	// --- begin event handlers
+
+	public override onScrollChanged(e: ViewScrollChangedEvent): boolean {
+		this._scrollChanged = true;
+		return super.onScrollChanged(e);
+	}
+
+	// --- end event handlers
+
+	private _update() {
+		const shapes = this._shapeCollection;
+		if (shapes.dirtyTracker.isDirty) {
+			this._device.queue.writeBuffer(this._shapeBindBuffer.value!.object, 0, shapes.buffer, shapes.dirtyTracker.dataOffset, shapes.dirtyTracker.dirtySize! * shapes.view.BYTES_PER_ELEMENT);
+			shapes.dirtyTracker.clear();
+		}
+
+		// Update scroll offset
+		if (this._scrollChanged) {
+			const dpr = getActiveWindow().devicePixelRatio;
+			this._scrollOffsetValueBuffer[0] = this._context.viewLayout.getCurrentScrollLeft() * dpr;
+			this._scrollOffsetValueBuffer[1] = this._context.viewLayout.getCurrentScrollTop() * dpr;
+			this._device.queue.writeBuffer(this._scrollOffsetBindBuffer, 0, this._scrollOffsetValueBuffer);
+		}
+	}
+
+	draw(viewportData: ViewportData) {
+		if (!this._initialized) {
+			return;
+		}
+
+		this._update();
+
+		const encoder = this._device.createCommandEncoder({ label: 'Monaco rectangle renderer command encoder' });
+
+		this._renderPassColorAttachment.view = this._ctx.getCurrentTexture().createView();
+		const pass = encoder.beginRenderPass(this._renderPassDescriptor);
+		pass.setPipeline(this._pipeline);
+		pass.setVertexBuffer(0, this._vertexBuffer);
+		pass.setBindGroup(0, this._bindGroup);
+
+		pass.draw(quadVertices.length / 2, this._shapeCollection.entryCount);
+		pass.end();
+
+		const commandBuffer = encoder.finish();
+		this._device.queue.submit([commandBuffer]);
+	}
+}
diff --git a/src/vs/editor/browser/gpu/rectangleRenderer.wgsl.ts b/src/vs/editor/browser/gpu/rectangleRenderer.wgsl.ts
new file mode 100644
index 00000000000..44865c932a7
--- /dev/null
+++ b/src/vs/editor/browser/gpu/rectangleRenderer.wgsl.ts
@@ -0,0 +1,73 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+export const enum RectangleRendererBindingId {
+	Shapes,
+	LayoutInfoUniform,
+	ScrollOffset,
+}
+
+export const rectangleRendererWgsl = /*wgsl*/ `
+
+struct Vertex {
+	@location(0) position: vec2f,
+};
+
+struct LayoutInfo {
+	canvasDims: vec2f,
+	viewportOffset: vec2f,
+	viewportDims: vec2f,
+}
+
+struct ScrollOffset {
+	offset: vec2f,
+}
+
+struct Shape {
+	position: vec2f,
+	size: vec2f,
+	color: vec4f,
+};
+
+struct VSOutput {
+	@builtin(position) position: vec4f,
+	@location(1)       color:    vec4f,
+};
+
+// Uniforms
+@group(0) @binding(${RectangleRendererBindingId.LayoutInfoUniform}) var<uniform>       layoutInfo:      LayoutInfo;
+
+// Storage buffers
+@group(0) @binding(${RectangleRendererBindingId.Shapes})            var<storage, read> shapes:          array<Shape>;
+@group(0) @binding(${RectangleRendererBindingId.ScrollOffset})      var<uniform>       scrollOffset:    ScrollOffset;
+
+@vertex fn vs(
+	vert: Vertex,
+	@builtin(instance_index) instanceIndex: u32,
+	@builtin(vertex_index) vertexIndex : u32
+) -> VSOutput {
+	let shape = shapes[instanceIndex];
+
+	var vsOut: VSOutput;
+	vsOut.position = vec4f(
+		(
+			// Top left corner
+			vec2f(-1,  1) +
+			// Convert pixel position to clipspace
+			vec2f( 2, -2) / layoutInfo.canvasDims *
+			// Shape position and size
+			(layoutInfo.viewportOffset - scrollOffset.offset + shape.position + vert.position * shape.size)
+		),
+		0.0,
+		1.0
+	);
+	vsOut.color = shape.color;
+	return vsOut;
+}
+
+@fragment fn fs(vsOut: VSOutput) -> @location(0) vec4f {
+	return vsOut.color;
+}
+`;
diff --git a/src/vs/editor/browser/gpu/taskQueue.ts b/src/vs/editor/browser/gpu/taskQueue.ts
new file mode 100644
index 00000000000..27d64d01fe2
--- /dev/null
+++ b/src/vs/editor/browser/gpu/taskQueue.ts
@@ -0,0 +1,172 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { getActiveWindow } from '../../../base/browser/dom.js';
+import { Disposable, toDisposable } from '../../../base/common/lifecycle.js';
+
+/**
+ * Copyright (c) 2022 The xterm.js authors. All rights reserved.
+ * @license MIT
+ */
+
+interface ITaskQueue {
+	/**
+	 * Adds a task to the queue which will run in a future idle callback.
+	 * To avoid perceivable stalls on the mainthread, tasks with heavy workload
+	 * should split their work into smaller pieces and return `true` to get
+	 * called again until the work is done (on falsy return value).
+	 */
+	enqueue(task: () => boolean | void): void;
+
+	/**
+	 * Flushes the queue, running all remaining tasks synchronously.
+	 */
+	flush(): void;
+
+	/**
+	 * Clears any remaining tasks from the queue, these will not be run.
+	 */
+	clear(): void;
+}
+
+interface ITaskDeadline {
+	timeRemaining(): number;
+}
+type CallbackWithDeadline = (deadline: ITaskDeadline) => void;
+
+abstract class TaskQueue extends Disposable implements ITaskQueue {
+	private _tasks: (() => boolean | void)[] = [];
+	private _idleCallback?: number;
+	private _i = 0;
+
+	constructor() {
+		super();
+		this._register(toDisposable(() => this.clear()));
+	}
+
+	protected abstract _requestCallback(callback: CallbackWithDeadline): number;
+	protected abstract _cancelCallback(identifier: number): void;
+
+	public enqueue(task: () => boolean | void): void {
+		this._tasks.push(task);
+		this._start();
+	}
+
+	public flush(): void {
+		while (this._i < this._tasks.length) {
+			if (!this._tasks[this._i]()) {
+				this._i++;
+			}
+		}
+		this.clear();
+	}
+
+	public clear(): void {
+		if (this._idleCallback) {
+			this._cancelCallback(this._idleCallback);
+			this._idleCallback = undefined;
+		}
+		this._i = 0;
+		this._tasks.length = 0;
+	}
+
+	private _start(): void {
+		if (!this._idleCallback) {
+			this._idleCallback = this._requestCallback(this._process.bind(this));
+		}
+	}
+
+	private _process(deadline: ITaskDeadline): void {
+		this._idleCallback = undefined;
+		let taskDuration = 0;
+		let longestTask = 0;
+		let lastDeadlineRemaining = deadline.timeRemaining();
+		let deadlineRemaining = 0;
+		while (this._i < this._tasks.length) {
+			taskDuration = Date.now();
+			if (!this._tasks[this._i]()) {
+				this._i++;
+			}
+			// other than performance.now, Date.now might not be stable (changes on wall clock changes),
+			// this is not an issue here as a clock change during a short running task is very unlikely
+			// in case it still happened and leads to negative duration, simply assume 1 msec
+			taskDuration = Math.max(1, Date.now() - taskDuration);
+			longestTask = Math.max(taskDuration, longestTask);
+			// Guess the following task will take a similar time to the longest task in this batch, allow
+			// additional room to try avoid exceeding the deadline
+			deadlineRemaining = deadline.timeRemaining();
+			if (longestTask * 1.5 > deadlineRemaining) {
+				// Warn when the time exceeding the deadline is over 20ms, if this happens in practice the
+				// task should be split into sub-tasks to ensure the UI remains responsive.
+				if (lastDeadlineRemaining - taskDuration < -20) {
+					console.warn(`task queue exceeded allotted deadline by ${Math.abs(Math.round(lastDeadlineRemaining - taskDuration))}ms`);
+				}
+				this._start();
+				return;
+			}
+			lastDeadlineRemaining = deadlineRemaining;
+		}
+		this.clear();
+	}
+}
+
+/**
+ * A queue of that runs tasks over several tasks via setTimeout, trying to maintain above 60 frames
+ * per second. The tasks will run in the order they are enqueued, but they will run some time later,
+ * and care should be taken to ensure they're non-urgent and will not introduce race conditions.
+ */
+export class PriorityTaskQueue extends TaskQueue {
+	protected _requestCallback(callback: CallbackWithDeadline): number {
+		return getActiveWindow().setTimeout(() => callback(this._createDeadline(16)));
+	}
+
+	protected _cancelCallback(identifier: number): void {
+		getActiveWindow().clearTimeout(identifier);
+	}
+
+	private _createDeadline(duration: number): ITaskDeadline {
+		const end = Date.now() + duration;
+		return {
+			timeRemaining: () => Math.max(0, end - Date.now())
+		};
+	}
+}
+
+/**
+ * A queue of that runs tasks over several idle callbacks, trying to respect the idle callback's
+ * deadline given by the environment. The tasks will run in the order they are enqueued, but they
+ * will run some time later, and care should be taken to ensure they're non-urgent and will not
+ * introduce race conditions.
+ */
+export class IdleTaskQueue extends TaskQueue {
+	protected _requestCallback(callback: IdleRequestCallback): number {
+		return getActiveWindow().requestIdleCallback(callback);
+	}
+
+	protected _cancelCallback(identifier: number): void {
+		getActiveWindow().cancelIdleCallback(identifier);
+	}
+}
+
+/**
+ * An object that tracks a single debounced task that will run on the next idle frame. When called
+ * multiple times, only the last set task will run.
+ */
+export class DebouncedIdleTask {
+	private _queue: ITaskQueue;
+
+	constructor() {
+		this._queue = new IdleTaskQueue();
+	}
+
+	public set(task: () => boolean | void): void {
+		this._queue.clear();
+		this._queue.enqueue(task);
+	}
+
+	public flush(): void {
+		this._queue.flush();
+	}
+}
diff --git a/src/vs/editor/browser/gpu/viewGpuContext.ts b/src/vs/editor/browser/gpu/viewGpuContext.ts
new file mode 100644
index 00000000000..877c1b3a868
--- /dev/null
+++ b/src/vs/editor/browser/gpu/viewGpuContext.ts
@@ -0,0 +1,123 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as nls from '../../../nls.js';
+import { addDisposableListener, getActiveWindow } from '../../../base/browser/dom.js';
+import { createFastDomNode, type FastDomNode } from '../../../base/browser/fastDomNode.js';
+import { BugIndicatingError } from '../../../base/common/errors.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import type { ViewportData } from '../../common/viewLayout/viewLinesViewportData.js';
+import type { ViewLineOptions } from '../viewParts/viewLines/viewLineOptions.js';
+import { observableValue, runOnChange, type IObservable } from '../../../base/common/observable.js';
+import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
+import { TextureAtlas } from './atlas/textureAtlas.js';
+import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
+import { INotificationService, IPromptChoice, Severity } from '../../../platform/notification/common/notification.js';
+import { GPULifecycle } from './gpuDisposable.js';
+import { ensureNonNullable, observeDevicePixelDimensions } from './gpuUtils.js';
+import { RectangleRenderer } from './rectangleRenderer.js';
+import type { ViewContext } from '../../common/viewModel/viewContext.js';
+
+export class ViewGpuContext extends Disposable {
+	readonly canvas: FastDomNode<HTMLCanvasElement>;
+	readonly ctx: GPUCanvasContext;
+
+	readonly device: Promise<GPUDevice>;
+
+	readonly rectangleRenderer: RectangleRenderer;
+
+	private static _atlas: TextureAtlas | undefined;
+
+
+	/**
+	 * The shared texture atlas to use across all views.
+	 *
+	 * @throws if called before the GPU device is resolved
+	 */
+	static get atlas(): TextureAtlas {
+		if (!ViewGpuContext._atlas) {
+			throw new BugIndicatingError('Cannot call ViewGpuContext.textureAtlas before device is resolved');
+		}
+		return ViewGpuContext._atlas;
+	}
+	/**
+	 * The shared texture atlas to use across all views. This is a convenience alias for
+	 * {@link ViewGpuContext.atlas}.
+	 *
+	 * @throws if called before the GPU device is resolved
+	 */
+	get atlas(): TextureAtlas {
+		return ViewGpuContext.atlas;
+	}
+
+	readonly canvasDevicePixelDimensions: IObservable<{ width: number; height: number }>;
+	readonly devicePixelRatio: IObservable<number>;
+
+	constructor(
+		context: ViewContext,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@INotificationService private readonly _notificationService: INotificationService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+	) {
+		super();
+
+		this.canvas = createFastDomNode(document.createElement('canvas'));
+		this.canvas.setClassName('editorCanvas');
+
+		this.ctx = ensureNonNullable(this.canvas.domNode.getContext('webgpu'));
+
+		this.device = GPULifecycle.requestDevice((message) => {
+			const choices: IPromptChoice[] = [{
+				label: nls.localize('editor.dom.render', "Use DOM-based rendering"),
+				run: () => this.configurationService.updateValue('editor.experimentalGpuAcceleration', 'off'),
+			}];
+			this._notificationService.prompt(Severity.Warning, message, choices);
+		}).then(ref => this._register(ref).object);
+		this.device.then(device => {
+			if (!ViewGpuContext._atlas) {
+				ViewGpuContext._atlas = this._instantiationService.createInstance(TextureAtlas, device.limits.maxTextureDimension2D, undefined);
+				runOnChange(this.devicePixelRatio, () => ViewGpuContext.atlas.clear());
+			}
+		});
+
+		this.rectangleRenderer = this._instantiationService.createInstance(RectangleRenderer, context, this.canvas.domNode, this.ctx, this.device);
+
+		const dprObs = observableValue(this, getActiveWindow().devicePixelRatio);
+		this._register(addDisposableListener(getActiveWindow(), 'resize', () => {
+			dprObs.set(getActiveWindow().devicePixelRatio, undefined);
+		}));
+		this.devicePixelRatio = dprObs;
+
+		const canvasDevicePixelDimensions = observableValue(this, { width: this.canvas.domNode.width, height: this.canvas.domNode.height });
+		this._register(observeDevicePixelDimensions(
+			this.canvas.domNode,
+			getActiveWindow(),
+			(width, height) => {
+				this.canvas.domNode.width = width;
+				this.canvas.domNode.height = height;
+				canvasDevicePixelDimensions.set({ width, height }, undefined);
+			}
+		));
+		this.canvasDevicePixelDimensions = canvasDevicePixelDimensions;
+	}
+
+	/**
+	 * This method determines which lines can be and are allowed to be rendered using the GPU
+	 * renderer. Eventually this should trend all lines, except maybe exceptional cases like
+	 * decorations that use class names.
+	 */
+	public static canRender(options: ViewLineOptions, viewportData: ViewportData, lineNumber: number): boolean {
+		const data = viewportData.getViewLineRenderingData(lineNumber);
+		if (
+			data.containsRTL ||
+			data.maxColumn > 200 ||
+			data.continuesWithWrappedLine ||
+			data.inlineDecorations.length > 0
+		) {
+			return false;
+		}
+		return true;
+	}
+}
diff --git a/src/vs/editor/browser/observableUtilities.ts b/src/vs/editor/browser/observableCodeEditor.ts
similarity index 63%
rename from src/vs/editor/browser/observableUtilities.ts
rename to src/vs/editor/browser/observableCodeEditor.ts
index 118c70a7a34..5747a39c438 100644
--- a/src/vs/editor/browser/observableUtilities.ts
+++ b/src/vs/editor/browser/observableCodeEditor.ts
@@ -3,17 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { equalsIfDefined, itemsEquals } from 'vs/base/common/equals';
-import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { IObservable, ITransaction, autorunOpts, autorunWithStoreHandleChanges, derived, derivedOpts, observableFromEvent, observableSignal, observableValue, observableValueOpts } from 'vs/base/common/observable';
-import { TransactionImpl } from 'vs/base/common/observableInternal/base';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorOption, FindComputedEditorOptionValueById } from 'vs/editor/common/config/editorOptions';
-import { Position } from 'vs/editor/common/core/position';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ICursorSelectionChangedEvent } from 'vs/editor/common/cursorEvents';
-import { IModelDeltaDecoration, ITextModel } from 'vs/editor/common/model';
-import { IModelContentChangedEvent } from 'vs/editor/common/textModelEvents';
+import { equalsIfDefined, itemsEquals } from '../../base/common/equals.js';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../base/common/lifecycle.js';
+import { IObservable, ITransaction, TransactionImpl, autorun, autorunOpts, derived, derivedOpts, derivedWithSetter, observableFromEvent, observableSignal, observableValue, observableValueOpts } from '../../base/common/observable.js';
+import { EditorOption, FindComputedEditorOptionValueById } from '../common/config/editorOptions.js';
+import { Position } from '../common/core/position.js';
+import { Selection } from '../common/core/selection.js';
+import { ICursorSelectionChangedEvent } from '../common/cursorEvents.js';
+import { IModelDeltaDecoration, ITextModel } from '../common/model.js';
+import { IModelContentChangedEvent } from '../common/textModelEvents.js';
+import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition } from './editorBrowser.js';
 
 /**
  * Returns a facade for the code editor that provides observables for various states/events.
@@ -23,7 +22,7 @@ export function observableCodeEditor(editor: ICodeEditor): ObservableCodeEditor
 }
 
 export class ObservableCodeEditor extends Disposable {
-	private static _map = new Map<ICodeEditor, ObservableCodeEditor>();
+	private static readonly _map = new Map<ICodeEditor, ObservableCodeEditor>();
 
 	/**
 	 * Make sure that editor is not disposed yet!
@@ -140,7 +139,7 @@ export class ObservableCodeEditor extends Disposable {
 	private readonly _model = observableValue(this, this.editor.getModel());
 	public readonly model: IObservable<ITextModel | null> = this._model;
 
-	public readonly isReadonly = observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.readOnly));
+	public readonly isReadonly = observableFromEvent(this, this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.readOnly));
 
 	private readonly _versionId = observableValueOpts<number | null, IModelContentChangedEvent | undefined>({ owner: this, lazy: true }, this.editor.getModel()?.getVersionId() ?? null);
 	public readonly versionId: IObservable<number | null, IModelContentChangedEvent | undefined> = this._versionId;
@@ -157,7 +156,7 @@ export class ObservableCodeEditor extends Disposable {
 		reader => this.selections.read(reader)?.map(s => s.getStartPosition()) ?? null
 	);
 
-	public readonly isFocused = observableFromEvent(e => {
+	public readonly isFocused = observableFromEvent(this, e => {
 		const d1 = this.editor.onDidFocusEditorWidget(e);
 		const d2 = this.editor.onDidBlurEditorWidget(e);
 		return {
@@ -168,14 +167,35 @@ export class ObservableCodeEditor extends Disposable {
 		};
 	}, () => this.editor.hasWidgetFocus());
 
-	public readonly value = derived(this, reader => { this.versionId.read(reader); return this.model.read(reader)?.getValue(); });
+	public readonly value = derivedWithSetter(this,
+		reader => { this.versionId.read(reader); return this.model.read(reader)?.getValue() ?? ''; },
+		(value, tx) => {
+			const model = this.model.get();
+			if (model !== null) {
+				if (value !== model.getValue()) {
+					model.setValue(value);
+				}
+			}
+		}
+	);
 	public readonly valueIsEmpty = derived(this, reader => { this.versionId.read(reader); return this.editor.getModel()?.getValueLength() === 0; });
+	public readonly cursorSelection = derivedOpts({ owner: this, equalsFn: equalsIfDefined(Selection.selectionsEqual) }, reader => this.selections.read(reader)?.[0] ?? null);
 	public readonly cursorPosition = derivedOpts({ owner: this, equalsFn: Position.equals }, reader => this.selections.read(reader)?.[0]?.getPosition() ?? null);
+	public readonly cursorLineNumber = derived<number | null>(this, reader => this.cursorPosition.read(reader)?.lineNumber ?? null);
 
 	public readonly onDidType = observableSignal<string>(this);
 
+	public readonly scrollTop = observableFromEvent(this.editor.onDidScrollChange, () => this.editor.getScrollTop());
+	public readonly scrollLeft = observableFromEvent(this.editor.onDidScrollChange, () => this.editor.getScrollLeft());
+
+	public readonly layoutInfo = observableFromEvent(this.editor.onDidLayoutChange, () => this.editor.getLayoutInfo());
+	public readonly layoutInfoContentLeft = this.layoutInfo.map(l => l.contentLeft);
+	public readonly layoutInfoDecorationsLeft = this.layoutInfo.map(l => l.decorationsLeft);
+
+	public readonly contentWidth = observableFromEvent(this.editor.onDidContentSizeChange, () => this.editor.getContentWidth());
+
 	public getOption<T extends EditorOption>(id: T): IObservable<FindComputedEditorOptionValueById<T>> {
-		return observableFromEvent(cb => this.editor.onDidChangeConfiguration(e => {
+		return observableFromEvent(this, cb => this.editor.onDidChangeConfiguration(e => {
 			if (e.hasChanged(id)) { cb(undefined); }
 		}), () => this.editor.getOption(id));
 	}
@@ -194,40 +214,34 @@ export class ObservableCodeEditor extends Disposable {
 		});
 		return d;
 	}
+
+	private _overlayWidgetCounter = 0;
+
+	public createOverlayWidget(widget: IObservableOverlayWidget): IDisposable {
+		const overlayWidgetId = 'observableOverlayWidget' + (this._overlayWidgetCounter++);
+		const w: IOverlayWidget = {
+			getDomNode: () => widget.domNode,
+			getPosition: () => widget.position.get(),
+			getId: () => overlayWidgetId,
+			allowEditorOverflow: widget.allowEditorOverflow,
+			getMinContentWidthInPx: () => widget.minContentWidthInPx.get(),
+		};
+		this.editor.addOverlayWidget(w);
+		const d = autorun(reader => {
+			widget.position.read(reader);
+			widget.minContentWidthInPx.read(reader);
+			this.editor.layoutOverlayWidget(w);
+		});
+		return toDisposable(() => {
+			d.dispose();
+			this.editor.removeOverlayWidget(w);
+		});
+	}
 }
 
-type RemoveUndefined<T> = T extends undefined ? never : T;
-export function reactToChange<T, TChange>(observable: IObservable<T, TChange>, cb: (value: T, deltas: RemoveUndefined<TChange>[]) => void): IDisposable {
-	return autorunWithStoreHandleChanges({
-		createEmptyChangeSummary: () => ({ deltas: [] as RemoveUndefined<TChange>[], didChange: false }),
-		handleChange: (context, changeSummary) => {
-			if (context.didChange(observable)) {
-				const e = context.change;
-				if (e !== undefined) {
-					changeSummary.deltas.push(e as RemoveUndefined<TChange>);
-				}
-				changeSummary.didChange = true;
-			}
-			return true;
-		},
-	}, (reader, changeSummary) => {
-		const value = observable.read(reader);
-		if (changeSummary.didChange) {
-			cb(value, changeSummary.deltas);
-		}
-	});
-}
-
-export function reactToChangeWithStore<T, TChange>(observable: IObservable<T, TChange>, cb: (value: T, deltas: RemoveUndefined<TChange>[], store: DisposableStore) => void): IDisposable {
-	const store = new DisposableStore();
-	const disposable = reactToChange(observable, (value, deltas) => {
-		store.clear();
-		cb(value, deltas, store);
-	});
-	return {
-		dispose() {
-			disposable.dispose();
-			store.dispose();
-		}
-	};
+interface IObservableOverlayWidget {
+	get domNode(): HTMLElement;
+	readonly position: IObservable<IOverlayWidgetPosition | null>;
+	readonly minContentWidthInPx: IObservable<number>;
+	get allowEditorOverflow(): boolean;
 }
diff --git a/src/vs/editor/browser/services/abstractCodeEditorService.ts b/src/vs/editor/browser/services/abstractCodeEditorService.ts
index 1fedb4d17c4..d92fc24c9cf 100644
--- a/src/vs/editor/browser/services/abstractCodeEditorService.ts
+++ b/src/vs/editor/browser/services/abstractCodeEditorService.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IDisposable, DisposableStore, Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { LinkedList } from 'vs/base/common/linkedList';
-import * as strings from 'vs/base/common/strings';
-import { URI } from 'vs/base/common/uri';
-import { ICodeEditor, IDiffEditor } from 'vs/editor/browser/editorBrowser';
-import { ICodeEditorOpenHandler, ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { IContentDecorationRenderOptions, IDecorationRenderOptions, IThemeDecorationRenderOptions, isThemeColor } from 'vs/editor/common/editorCommon';
-import { IModelDecorationOptions, IModelDecorationOverviewRulerOptions, InjectedTextOptions, ITextModel, OverviewRulerLane, TrackedRangeStickiness } from 'vs/editor/common/model';
-import { IResourceEditorInput } from 'vs/platform/editor/common/editor';
-import { IColorTheme, IThemeService } from 'vs/platform/theme/common/themeService';
-import { ThemeColor } from 'vs/base/common/themables';
+import * as dom from '../../../base/browser/dom.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { IDisposable, DisposableStore, Disposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { LinkedList } from '../../../base/common/linkedList.js';
+import * as strings from '../../../base/common/strings.js';
+import { URI } from '../../../base/common/uri.js';
+import { ICodeEditor, IDiffEditor } from '../editorBrowser.js';
+import { ICodeEditorOpenHandler, ICodeEditorService } from './codeEditorService.js';
+import { IContentDecorationRenderOptions, IDecorationRenderOptions, IThemeDecorationRenderOptions, isThemeColor } from '../../common/editorCommon.js';
+import { IModelDecorationOptions, IModelDecorationOverviewRulerOptions, InjectedTextOptions, ITextModel, OverviewRulerLane, TrackedRangeStickiness } from '../../common/model.js';
+import { IResourceEditorInput } from '../../../platform/editor/common/editor.js';
+import { IColorTheme, IThemeService } from '../../../platform/theme/common/themeService.js';
+import { ThemeColor } from '../../../base/common/themables.js';
 
 export abstract class AbstractCodeEditorService extends Disposable implements ICodeEditorService {
 
diff --git a/src/vs/editor/browser/services/bulkEditService.ts b/src/vs/editor/browser/services/bulkEditService.ts
index 4f06c9ca68b..cbc88fafc2f 100644
--- a/src/vs/editor/browser/services/bulkEditService.ts
+++ b/src/vs/editor/browser/services/bulkEditService.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { TextEdit, WorkspaceEdit, WorkspaceEditMetadata, IWorkspaceFileEdit, WorkspaceFileEditOptions, IWorkspaceTextEdit } from 'vs/editor/common/languages';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IProgress, IProgressStep } from 'vs/platform/progress/common/progress';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { isObject } from 'vs/base/common/types';
-import { UndoRedoSource } from 'vs/platform/undoRedo/common/undoRedo';
-import { CancellationToken } from 'vs/base/common/cancellation';
+import { ICodeEditor } from '../editorBrowser.js';
+import { TextEdit, WorkspaceEdit, WorkspaceEditMetadata, IWorkspaceFileEdit, WorkspaceFileEditOptions, IWorkspaceTextEdit } from '../../common/languages.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { IProgress, IProgressStep } from '../../../platform/progress/common/progress.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { URI } from '../../../base/common/uri.js';
+import { isObject } from '../../../base/common/types.js';
+import { UndoRedoSource } from '../../../platform/undoRedo/common/undoRedo.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
 
 export const IBulkEditService = createDecorator<IBulkEditService>('IWorkspaceEditService');
 
diff --git a/src/vs/editor/browser/services/codeEditorService.ts b/src/vs/editor/browser/services/codeEditorService.ts
index d7119b2506e..733018faea7 100644
--- a/src/vs/editor/browser/services/codeEditorService.ts
+++ b/src/vs/editor/browser/services/codeEditorService.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { ICodeEditor, IDiffEditor } from 'vs/editor/browser/editorBrowser';
-import { IDecorationRenderOptions } from 'vs/editor/common/editorCommon';
-import { IModelDecorationOptions, ITextModel } from 'vs/editor/common/model';
-import { ITextResourceEditorInput } from 'vs/platform/editor/common/editor';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { URI } from 'vs/base/common/uri';
-import { IDisposable } from 'vs/base/common/lifecycle';
+import { Event } from '../../../base/common/event.js';
+import { ICodeEditor, IDiffEditor } from '../editorBrowser.js';
+import { IDecorationRenderOptions } from '../../common/editorCommon.js';
+import { IModelDecorationOptions, ITextModel } from '../../common/model.js';
+import { ITextResourceEditorInput } from '../../../platform/editor/common/editor.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { URI } from '../../../base/common/uri.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
 
 export const ICodeEditorService = createDecorator<ICodeEditorService>('codeEditorService');
 
diff --git a/src/vs/editor/browser/services/editorWorkerService.ts b/src/vs/editor/browser/services/editorWorkerService.ts
index aa1e41c8985..6e01c738ab5 100644
--- a/src/vs/editor/browser/services/editorWorkerService.ts
+++ b/src/vs/editor/browser/services/editorWorkerService.ts
@@ -3,40 +3,36 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IntervalTimer, timeout } from 'vs/base/common/async';
-import { Disposable, IDisposable, dispose, toDisposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { SimpleWorkerClient, logOnceWebWorkerWarning, IWorkerClient } from 'vs/base/common/worker/simpleWorker';
-import { DefaultWorkerFactory } from 'vs/base/browser/defaultWorkerFactory';
-import { Position } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { ITextModel } from 'vs/editor/common/model';
-import * as languages from 'vs/editor/common/languages';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { EditorSimpleWorker } from 'vs/editor/common/services/editorSimpleWorker';
-import { DiffAlgorithmName, IDiffComputationResult, IEditorWorkerService, ILineChange, IUnicodeHighlightsResult } from 'vs/editor/common/services/editorWorker';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { isNonEmptyArray } from 'vs/base/common/arrays';
-import { ILogService } from 'vs/platform/log/common/log';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { canceled, onUnexpectedError } from 'vs/base/common/errors';
-import { UnicodeHighlighterOptions } from 'vs/editor/common/services/unicodeTextModelHighlighter';
-import { IEditorWorkerHost } from 'vs/editor/common/services/editorWorkerHost';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { IChange } from 'vs/editor/common/diff/legacyLinesDiffComputer';
-import { IDocumentDiff, IDocumentDiffProviderOptions } from 'vs/editor/common/diff/documentDiffProvider';
-import { ILinesDiffComputerOptions, MovedText } from 'vs/editor/common/diff/linesDiffComputer';
-import { DetailedLineRangeMapping, RangeMapping, LineRangeMapping } from 'vs/editor/common/diff/rangeMapping';
-import { LineRange } from 'vs/editor/common/core/lineRange';
-import { SectionHeader, FindSectionHeaderOptions } from 'vs/editor/common/services/findSectionHeaders';
-import { mainWindow } from 'vs/base/browser/window';
-import { WindowIntervalTimer } from 'vs/base/browser/dom';
-
-/**
- * Stop syncing a model to the worker if it was not needed for 1 min.
- */
-const STOP_SYNC_MODEL_DELTA_TIME_MS = 60 * 1000;
+import { timeout } from '../../../base/common/async.js';
+import { Disposable, IDisposable } from '../../../base/common/lifecycle.js';
+import { URI } from '../../../base/common/uri.js';
+import { logOnceWebWorkerWarning, IWorkerClient, Proxied, IWorkerDescriptor } from '../../../base/common/worker/simpleWorker.js';
+import { createWebWorker } from '../../../base/browser/defaultWorkerFactory.js';
+import { Position } from '../../common/core/position.js';
+import { IRange, Range } from '../../common/core/range.js';
+import { ITextModel } from '../../common/model.js';
+import * as languages from '../../common/languages.js';
+import { ILanguageConfigurationService } from '../../common/languages/languageConfigurationRegistry.js';
+import { EditorSimpleWorker } from '../../common/services/editorSimpleWorker.js';
+import { DiffAlgorithmName, IEditorWorkerService, ILineChange, IUnicodeHighlightsResult } from '../../common/services/editorWorker.js';
+import { IModelService } from '../../common/services/model.js';
+import { ITextResourceConfigurationService } from '../../common/services/textResourceConfiguration.js';
+import { isNonEmptyArray } from '../../../base/common/arrays.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { StopWatch } from '../../../base/common/stopwatch.js';
+import { canceled, onUnexpectedError } from '../../../base/common/errors.js';
+import { UnicodeHighlighterOptions } from '../../common/services/unicodeTextModelHighlighter.js';
+import { ILanguageFeaturesService } from '../../common/services/languageFeatures.js';
+import { IChange } from '../../common/diff/legacyLinesDiffComputer.js';
+import { IDocumentDiff, IDocumentDiffProviderOptions } from '../../common/diff/documentDiffProvider.js';
+import { ILinesDiffComputerOptions, MovedText } from '../../common/diff/linesDiffComputer.js';
+import { DetailedLineRangeMapping, RangeMapping, LineRangeMapping } from '../../common/diff/rangeMapping.js';
+import { LineRange } from '../../common/core/lineRange.js';
+import { SectionHeader, FindSectionHeaderOptions } from '../../common/services/findSectionHeaders.js';
+import { mainWindow } from '../../../base/browser/window.js';
+import { WindowIntervalTimer } from '../../../base/browser/dom.js';
+import { WorkerTextModelSyncClient } from '../../common/services/textModelSync/textModelSync.impl.js';
+import { EditorWorkerHost } from '../../common/services/editorWorkerHost.js';
 
 /**
  * Stop the worker if it was not needed for 5 min.
@@ -54,7 +50,7 @@ function canSyncModel(modelService: IModelService, resource: URI): boolean {
 	return true;
 }
 
-export class EditorWorkerService extends Disposable implements IEditorWorkerService {
+export abstract class EditorWorkerService extends Disposable implements IEditorWorkerService {
 
 	declare readonly _serviceBrand: undefined;
 
@@ -63,29 +59,30 @@ export class EditorWorkerService extends Disposable implements IEditorWorkerServ
 	private readonly _logService: ILogService;
 
 	constructor(
+		workerDescriptor: IWorkerDescriptor,
 		@IModelService modelService: IModelService,
 		@ITextResourceConfigurationService configurationService: ITextResourceConfigurationService,
 		@ILogService logService: ILogService,
-		@ILanguageConfigurationService languageConfigurationService: ILanguageConfigurationService,
+		@ILanguageConfigurationService private readonly _languageConfigurationService: ILanguageConfigurationService,
 		@ILanguageFeaturesService languageFeaturesService: ILanguageFeaturesService,
 	) {
 		super();
 		this._modelService = modelService;
-		this._workerManager = this._register(new WorkerManager(this._modelService, languageConfigurationService));
+		this._workerManager = this._register(new WorkerManager(workerDescriptor, this._modelService));
 		this._logService = logService;
 
 		// register default link-provider and default completions-provider
 		this._register(languageFeaturesService.linkProvider.register({ language: '*', hasAccessToAllModels: true }, {
-			provideLinks: (model, token) => {
+			provideLinks: async (model, token) => {
 				if (!canSyncModel(this._modelService, model.uri)) {
 					return Promise.resolve({ links: [] }); // File too large
 				}
-				return this._workerManager.withWorker().then(client => client.computeLinks(model.uri)).then(links => {
-					return links && { links };
-				});
+				const worker = await this._workerWithResources([model.uri]);
+				const links = await worker.$computeLinks(model.uri.toString());
+				return links && { links };
 			}
 		}));
-		this._register(languageFeaturesService.completionProvider.register('*', new WordBasedCompletionItemProvider(this._workerManager, configurationService, this._modelService, languageConfigurationService)));
+		this._register(languageFeaturesService.completionProvider.register('*', new WordBasedCompletionItemProvider(this._workerManager, configurationService, this._modelService, this._languageConfigurationService)));
 	}
 
 	public override dispose(): void {
@@ -96,12 +93,14 @@ export class EditorWorkerService extends Disposable implements IEditorWorkerServ
 		return canSyncModel(this._modelService, uri);
 	}
 
-	public computedUnicodeHighlights(uri: URI, options: UnicodeHighlighterOptions, range?: IRange): Promise<IUnicodeHighlightsResult> {
-		return this._workerManager.withWorker().then(client => client.computedUnicodeHighlights(uri, options, range));
+	public async computedUnicodeHighlights(uri: URI, options: UnicodeHighlighterOptions, range?: IRange): Promise<IUnicodeHighlightsResult> {
+		const worker = await this._workerWithResources([uri]);
+		return worker.$computeUnicodeHighlights(uri.toString(), options, range);
 	}
 
 	public async computeDiff(original: URI, modified: URI, options: IDocumentDiffProviderOptions, algorithm: DiffAlgorithmName): Promise<IDocumentDiff | null> {
-		const result = await this._workerManager.withWorker().then(client => client.computeDiff(original, modified, options, algorithm));
+		const worker = await this._workerWithResources([original, modified], /* forceLargeModels */true);
+		const result = await worker.$computeDiff(original.toString(), modified.toString(), options, algorithm);
 		if (!result) {
 			return null;
 		}
@@ -137,17 +136,18 @@ export class EditorWorkerService extends Disposable implements IEditorWorkerServ
 		return (canSyncModel(this._modelService, original) && canSyncModel(this._modelService, modified));
 	}
 
-	public computeDirtyDiff(original: URI, modified: URI, ignoreTrimWhitespace: boolean): Promise<IChange[] | null> {
-		return this._workerManager.withWorker().then(client => client.computeDirtyDiff(original, modified, ignoreTrimWhitespace));
+	public async computeDirtyDiff(original: URI, modified: URI, ignoreTrimWhitespace: boolean): Promise<IChange[] | null> {
+		const worker = await this._workerWithResources([original, modified]);
+		return worker.$computeDirtyDiff(original.toString(), modified.toString(), ignoreTrimWhitespace);
 	}
 
-	public computeMoreMinimalEdits(resource: URI, edits: languages.TextEdit[] | null | undefined, pretty: boolean = false): Promise<languages.TextEdit[] | undefined> {
+	public async computeMoreMinimalEdits(resource: URI, edits: languages.TextEdit[] | null | undefined, pretty: boolean = false): Promise<languages.TextEdit[] | undefined> {
 		if (isNonEmptyArray(edits)) {
 			if (!canSyncModel(this._modelService, resource)) {
 				return Promise.resolve(edits); // File too large
 			}
 			const sw = StopWatch.create();
-			const result = this._workerManager.withWorker().then(client => client.computeMoreMinimalEdits(resource, edits, pretty));
+			const result = this._workerWithResources([resource]).then(worker => worker.$computeMoreMinimalEdits(resource.toString(), edits, pretty));
 			result.finally(() => this._logService.trace('FORMAT#computeMoreMinimalEdits', resource.toString(true), sw.elapsed()));
 			return Promise.race([result, timeout(1000).then(() => edits)]);
 
@@ -162,12 +162,16 @@ export class EditorWorkerService extends Disposable implements IEditorWorkerServ
 				return Promise.resolve(edits); // File too large
 			}
 			const sw = StopWatch.create();
-			const result = this._workerManager.withWorker().then(client => client.computeHumanReadableDiff(resource, edits,
-				{ ignoreTrimWhitespace: false, maxComputationTimeMs: 1000, computeMoves: false, })).catch((err) => {
-					onUnexpectedError(err);
-					// In case of an exception, fall back to computeMoreMinimalEdits
-					return this.computeMoreMinimalEdits(resource, edits, true);
-				});
+			const opts: ILinesDiffComputerOptions = { ignoreTrimWhitespace: false, maxComputationTimeMs: 1000, computeMoves: false };
+			const result = (
+				this._workerWithResources([resource])
+					.then(worker => worker.$computeHumanReadableDiff(resource.toString(), edits, opts))
+					.catch((err) => {
+						onUnexpectedError(err);
+						// In case of an exception, fall back to computeMoreMinimalEdits
+						return this.computeMoreMinimalEdits(resource, edits, true);
+					})
+			);
 			result.finally(() => this._logService.trace('FORMAT#computeHumanReadableDiff', resource.toString(true), sw.elapsed()));
 			return result;
 
@@ -180,20 +184,47 @@ export class EditorWorkerService extends Disposable implements IEditorWorkerServ
 		return (canSyncModel(this._modelService, resource));
 	}
 
-	public navigateValueSet(resource: URI, range: IRange, up: boolean): Promise<languages.IInplaceReplaceSupportResult | null> {
-		return this._workerManager.withWorker().then(client => client.navigateValueSet(resource, range, up));
+	public async navigateValueSet(resource: URI, range: IRange, up: boolean): Promise<languages.IInplaceReplaceSupportResult | null> {
+		const model = this._modelService.getModel(resource);
+		if (!model) {
+			return null;
+		}
+		const wordDefRegExp = this._languageConfigurationService.getLanguageConfiguration(model.getLanguageId()).getWordDefinition();
+		const wordDef = wordDefRegExp.source;
+		const wordDefFlags = wordDefRegExp.flags;
+		const worker = await this._workerWithResources([resource]);
+		return worker.$navigateValueSet(resource.toString(), range, up, wordDef, wordDefFlags);
 	}
 
-	canComputeWordRanges(resource: URI): boolean {
+	public canComputeWordRanges(resource: URI): boolean {
 		return canSyncModel(this._modelService, resource);
 	}
 
-	computeWordRanges(resource: URI, range: IRange): Promise<{ [word: string]: IRange[] } | null> {
-		return this._workerManager.withWorker().then(client => client.computeWordRanges(resource, range));
+	public async computeWordRanges(resource: URI, range: IRange): Promise<{ [word: string]: IRange[] } | null> {
+		const model = this._modelService.getModel(resource);
+		if (!model) {
+			return Promise.resolve(null);
+		}
+		const wordDefRegExp = this._languageConfigurationService.getLanguageConfiguration(model.getLanguageId()).getWordDefinition();
+		const wordDef = wordDefRegExp.source;
+		const wordDefFlags = wordDefRegExp.flags;
+		const worker = await this._workerWithResources([resource]);
+		return worker.$computeWordRanges(resource.toString(), range, wordDef, wordDefFlags);
 	}
 
-	public findSectionHeaders(uri: URI, options: FindSectionHeaderOptions): Promise<SectionHeader[]> {
-		return this._workerManager.withWorker().then(client => client.findSectionHeaders(uri, options));
+	public async findSectionHeaders(uri: URI, options: FindSectionHeaderOptions): Promise<SectionHeader[]> {
+		const worker = await this._workerWithResources([uri]);
+		return worker.$findSectionHeaders(uri.toString(), options);
+	}
+
+	public async computeDefaultDocumentColors(uri: URI): Promise<languages.IColorInformation[] | null> {
+		const worker = await this._workerWithResources([uri]);
+		return worker.$computeDefaultDocumentColors(uri.toString());
+	}
+
+	private async _workerWithResources(resources: URI[], forceLargeModels: boolean = false): Promise<Proxied<EditorSimpleWorker>> {
+		const worker = await this._workerManager.withWorker();
+		return await worker.workerWithSyncedResources(resources, forceLargeModels);
 	}
 }
 
@@ -281,7 +312,10 @@ class WorkerManager extends Disposable {
 	private _editorWorkerClient: EditorWorkerClient | null;
 	private _lastWorkerUsedTime: number;
 
-	constructor(modelService: IModelService, private readonly languageConfigurationService: ILanguageConfigurationService) {
+	constructor(
+		private readonly _workerDescriptor: IWorkerDescriptor,
+		@IModelService modelService: IModelService
+	) {
 		super();
 		this._modelService = modelService;
 		this._editorWorkerClient = null;
@@ -335,124 +369,31 @@ class WorkerManager extends Disposable {
 	public withWorker(): Promise<EditorWorkerClient> {
 		this._lastWorkerUsedTime = (new Date()).getTime();
 		if (!this._editorWorkerClient) {
-			this._editorWorkerClient = new EditorWorkerClient(this._modelService, false, 'editorWorkerService', this.languageConfigurationService);
+			this._editorWorkerClient = new EditorWorkerClient(this._workerDescriptor, false, this._modelService);
 		}
 		return Promise.resolve(this._editorWorkerClient);
 	}
 }
 
-class EditorModelManager extends Disposable {
-
-	private readonly _proxy: EditorSimpleWorker;
-	private readonly _modelService: IModelService;
-	private _syncedModels: { [modelUrl: string]: IDisposable } = Object.create(null);
-	private _syncedModelsLastUsedTime: { [modelUrl: string]: number } = Object.create(null);
-
-	constructor(proxy: EditorSimpleWorker, modelService: IModelService, keepIdleModels: boolean) {
-		super();
-		this._proxy = proxy;
-		this._modelService = modelService;
-
-		if (!keepIdleModels) {
-			const timer = new IntervalTimer();
-			timer.cancelAndSet(() => this._checkStopModelSync(), Math.round(STOP_SYNC_MODEL_DELTA_TIME_MS / 2));
-			this._register(timer);
-		}
-	}
-
-	public override dispose(): void {
-		for (const modelUrl in this._syncedModels) {
-			dispose(this._syncedModels[modelUrl]);
-		}
-		this._syncedModels = Object.create(null);
-		this._syncedModelsLastUsedTime = Object.create(null);
-		super.dispose();
-	}
-
-	public ensureSyncedResources(resources: URI[], forceLargeModels: boolean): void {
-		for (const resource of resources) {
-			const resourceStr = resource.toString();
-
-			if (!this._syncedModels[resourceStr]) {
-				this._beginModelSync(resource, forceLargeModels);
-			}
-			if (this._syncedModels[resourceStr]) {
-				this._syncedModelsLastUsedTime[resourceStr] = (new Date()).getTime();
-			}
-		}
-	}
-
-	private _checkStopModelSync(): void {
-		const currentTime = (new Date()).getTime();
-
-		const toRemove: string[] = [];
-		for (const modelUrl in this._syncedModelsLastUsedTime) {
-			const elapsedTime = currentTime - this._syncedModelsLastUsedTime[modelUrl];
-			if (elapsedTime > STOP_SYNC_MODEL_DELTA_TIME_MS) {
-				toRemove.push(modelUrl);
-			}
-		}
-
-		for (const e of toRemove) {
-			this._stopModelSync(e);
-		}
-	}
-
-	private _beginModelSync(resource: URI, forceLargeModels: boolean): void {
-		const model = this._modelService.getModel(resource);
-		if (!model) {
-			return;
-		}
-		if (!forceLargeModels && model.isTooLargeForSyncing()) {
-			return;
-		}
-
-		const modelUrl = resource.toString();
-
-		this._proxy.acceptNewModel({
-			url: model.uri.toString(),
-			lines: model.getLinesContent(),
-			EOL: model.getEOL(),
-			versionId: model.getVersionId()
-		});
-
-		const toDispose = new DisposableStore();
-		toDispose.add(model.onDidChangeContent((e) => {
-			this._proxy.acceptModelChanged(modelUrl.toString(), e);
-		}));
-		toDispose.add(model.onWillDispose(() => {
-			this._stopModelSync(modelUrl);
-		}));
-		toDispose.add(toDisposable(() => {
-			this._proxy.acceptRemovedModel(modelUrl);
-		}));
-
-		this._syncedModels[modelUrl] = toDispose;
-	}
-
-	private _stopModelSync(modelUrl: string): void {
-		const toDispose = this._syncedModels[modelUrl];
-		delete this._syncedModels[modelUrl];
-		delete this._syncedModelsLastUsedTime[modelUrl];
-		dispose(toDispose);
-	}
-}
-
 class SynchronousWorkerClient<T extends IDisposable> implements IWorkerClient<T> {
 	private readonly _instance: T;
-	private readonly _proxyObj: Promise<T>;
+	public readonly proxy: Proxied<T>;
 
 	constructor(instance: T) {
 		this._instance = instance;
-		this._proxyObj = Promise.resolve(this._instance);
+		this.proxy = this._instance as Proxied<T>;
 	}
 
 	public dispose(): void {
 		this._instance.dispose();
 	}
 
-	public getProxyObject(): Promise<T> {
-		return this._proxyObj;
+	public setChannel<T extends object>(channel: string, handler: T): void {
+		throw new Error(`Not supported`);
+	}
+
+	public getChannel<T extends object>(channel: string): Proxied<T> {
+		throw new Error(`Not supported`);
 	}
 }
 
@@ -460,39 +401,22 @@ export interface IEditorWorkerClient {
 	fhr(method: string, args: any[]): Promise<any>;
 }
 
-export class EditorWorkerHost implements IEditorWorkerHost {
-
-	private readonly _workerClient: IEditorWorkerClient;
-
-	constructor(workerClient: IEditorWorkerClient) {
-		this._workerClient = workerClient;
-	}
-
-	// foreign host request
-	public fhr(method: string, args: any[]): Promise<any> {
-		return this._workerClient.fhr(method, args);
-	}
-}
-
 export class EditorWorkerClient extends Disposable implements IEditorWorkerClient {
 
 	private readonly _modelService: IModelService;
 	private readonly _keepIdleModels: boolean;
-	protected _worker: IWorkerClient<EditorSimpleWorker> | null;
-	protected readonly _workerFactory: DefaultWorkerFactory;
-	private _modelManager: EditorModelManager | null;
+	private _worker: IWorkerClient<EditorSimpleWorker> | null;
+	private _modelManager: WorkerTextModelSyncClient | null;
 	private _disposed = false;
 
 	constructor(
-		modelService: IModelService,
+		private readonly _workerDescriptor: IWorkerDescriptor,
 		keepIdleModels: boolean,
-		label: string | undefined,
-		private readonly languageConfigurationService: ILanguageConfigurationService
+		@IModelService modelService: IModelService,
 	) {
 		super();
 		this._modelService = modelService;
 		this._keepIdleModels = keepIdleModels;
-		this._workerFactory = new DefaultWorkerFactory(label);
 		this._worker = null;
 		this._modelManager = null;
 	}
@@ -505,123 +429,59 @@ export class EditorWorkerClient extends Disposable implements IEditorWorkerClien
 	private _getOrCreateWorker(): IWorkerClient<EditorSimpleWorker> {
 		if (!this._worker) {
 			try {
-				this._worker = this._register(new SimpleWorkerClient<EditorSimpleWorker, EditorWorkerHost>(
-					this._workerFactory,
-					'vs/editor/common/services/editorSimpleWorker',
-					new EditorWorkerHost(this)
-				));
+				this._worker = this._register(createWebWorker<EditorSimpleWorker>(this._workerDescriptor));
+				EditorWorkerHost.setChannel(this._worker, this._createEditorWorkerHost());
 			} catch (err) {
 				logOnceWebWorkerWarning(err);
-				this._worker = new SynchronousWorkerClient(new EditorSimpleWorker(new EditorWorkerHost(this), null));
+				this._worker = this._createFallbackLocalWorker();
 			}
 		}
 		return this._worker;
 	}
 
-	protected _getProxy(): Promise<EditorSimpleWorker> {
-		return this._getOrCreateWorker().getProxyObject().then(undefined, (err) => {
+	protected async _getProxy(): Promise<Proxied<EditorSimpleWorker>> {
+		try {
+			const proxy = this._getOrCreateWorker().proxy;
+			await proxy.$ping();
+			return proxy;
+		} catch (err) {
 			logOnceWebWorkerWarning(err);
-			this._worker = new SynchronousWorkerClient(new EditorSimpleWorker(new EditorWorkerHost(this), null));
-			return this._getOrCreateWorker().getProxyObject();
-		});
+			this._worker = this._createFallbackLocalWorker();
+			return this._worker.proxy;
+		}
 	}
 
-	private _getOrCreateModelManager(proxy: EditorSimpleWorker): EditorModelManager {
+	private _createFallbackLocalWorker(): SynchronousWorkerClient<EditorSimpleWorker> {
+		return new SynchronousWorkerClient(new EditorSimpleWorker(this._createEditorWorkerHost(), null));
+	}
+
+	private _createEditorWorkerHost(): EditorWorkerHost {
+		return {
+			$fhr: (method, args) => this.fhr(method, args)
+		};
+	}
+
+	private _getOrCreateModelManager(proxy: Proxied<EditorSimpleWorker>): WorkerTextModelSyncClient {
 		if (!this._modelManager) {
-			this._modelManager = this._register(new EditorModelManager(proxy, this._modelService, this._keepIdleModels));
+			this._modelManager = this._register(new WorkerTextModelSyncClient(proxy, this._modelService, this._keepIdleModels));
 		}
 		return this._modelManager;
 	}
 
-	protected async _withSyncedResources(resources: URI[], forceLargeModels: boolean = false): Promise<EditorSimpleWorker> {
+	public async workerWithSyncedResources(resources: URI[], forceLargeModels: boolean = false): Promise<Proxied<EditorSimpleWorker>> {
 		if (this._disposed) {
 			return Promise.reject(canceled());
 		}
-		return this._getProxy().then((proxy) => {
-			this._getOrCreateModelManager(proxy).ensureSyncedResources(resources, forceLargeModels);
-			return proxy;
-		});
-	}
-
-	public computedUnicodeHighlights(uri: URI, options: UnicodeHighlighterOptions, range?: IRange): Promise<IUnicodeHighlightsResult> {
-		return this._withSyncedResources([uri]).then(proxy => {
-			return proxy.computeUnicodeHighlights(uri.toString(), options, range);
-		});
-	}
-
-	public computeDiff(original: URI, modified: URI, options: IDocumentDiffProviderOptions, algorithm: DiffAlgorithmName): Promise<IDiffComputationResult | null> {
-		return this._withSyncedResources([original, modified], /* forceLargeModels */true).then(proxy => {
-			return proxy.computeDiff(original.toString(), modified.toString(), options, algorithm);
-		});
-	}
-
-	public computeDirtyDiff(original: URI, modified: URI, ignoreTrimWhitespace: boolean): Promise<IChange[] | null> {
-		return this._withSyncedResources([original, modified]).then(proxy => {
-			return proxy.computeDirtyDiff(original.toString(), modified.toString(), ignoreTrimWhitespace);
-		});
-	}
-
-	public computeMoreMinimalEdits(resource: URI, edits: languages.TextEdit[], pretty: boolean): Promise<languages.TextEdit[]> {
-		return this._withSyncedResources([resource]).then(proxy => {
-			return proxy.computeMoreMinimalEdits(resource.toString(), edits, pretty);
-		});
-	}
-
-	public computeHumanReadableDiff(resource: URI, edits: languages.TextEdit[], options: ILinesDiffComputerOptions): Promise<languages.TextEdit[]> {
-		return this._withSyncedResources([resource]).then(proxy => {
-			return proxy.computeHumanReadableDiff(resource.toString(), edits, options);
-		});
-	}
-
-	public computeLinks(resource: URI): Promise<languages.ILink[] | null> {
-		return this._withSyncedResources([resource]).then(proxy => {
-			return proxy.computeLinks(resource.toString());
-		});
-	}
-
-	public computeDefaultDocumentColors(resource: URI): Promise<languages.IColorInformation[] | null> {
-		return this._withSyncedResources([resource]).then(proxy => {
-			return proxy.computeDefaultDocumentColors(resource.toString());
-		});
+		const proxy = await this._getProxy();
+		this._getOrCreateModelManager(proxy).ensureSyncedResources(resources, forceLargeModels);
+		return proxy;
 	}
 
 	public async textualSuggest(resources: URI[], leadingWord: string | undefined, wordDefRegExp: RegExp): Promise<{ words: string[]; duration: number } | null> {
-		const proxy = await this._withSyncedResources(resources);
+		const proxy = await this.workerWithSyncedResources(resources);
 		const wordDef = wordDefRegExp.source;
 		const wordDefFlags = wordDefRegExp.flags;
-		return proxy.textualSuggest(resources.map(r => r.toString()), leadingWord, wordDef, wordDefFlags);
-	}
-
-	computeWordRanges(resource: URI, range: IRange): Promise<{ [word: string]: IRange[] } | null> {
-		return this._withSyncedResources([resource]).then(proxy => {
-			const model = this._modelService.getModel(resource);
-			if (!model) {
-				return Promise.resolve(null);
-			}
-			const wordDefRegExp = this.languageConfigurationService.getLanguageConfiguration(model.getLanguageId()).getWordDefinition();
-			const wordDef = wordDefRegExp.source;
-			const wordDefFlags = wordDefRegExp.flags;
-			return proxy.computeWordRanges(resource.toString(), range, wordDef, wordDefFlags);
-		});
-	}
-
-	public navigateValueSet(resource: URI, range: IRange, up: boolean): Promise<languages.IInplaceReplaceSupportResult | null> {
-		return this._withSyncedResources([resource]).then(proxy => {
-			const model = this._modelService.getModel(resource);
-			if (!model) {
-				return null;
-			}
-			const wordDefRegExp = this.languageConfigurationService.getLanguageConfiguration(model.getLanguageId()).getWordDefinition();
-			const wordDef = wordDefRegExp.source;
-			const wordDefFlags = wordDefRegExp.flags;
-			return proxy.navigateValueSet(resource.toString(), range, up, wordDef, wordDefFlags);
-		});
-	}
-
-	public findSectionHeaders(uri: URI, options: FindSectionHeaderOptions): Promise<SectionHeader[]> {
-		return this._withSyncedResources([uri]).then(proxy => {
-			return proxy.findSectionHeaders(uri.toString(), options);
-		});
+		return proxy.$textualSuggest(resources.map(r => r.toString()), leadingWord, wordDef, wordDefFlags);
 	}
 
 	override dispose(): void {
diff --git a/src/vs/editor/browser/services/hoverService/hoverService.ts b/src/vs/editor/browser/services/hoverService/hoverService.ts
index 20faf6cfa8c..249aed774b7 100644
--- a/src/vs/editor/browser/services/hoverService/hoverService.ts
+++ b/src/vs/editor/browser/services/hoverService/hoverService.ts
@@ -3,27 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { editorHoverBorder } from 'vs/platform/theme/common/colorRegistry';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { HoverWidget } from 'vs/editor/browser/services/hoverService/hoverWidget';
-import { IContextViewProvider, IDelegate } from 'vs/base/browser/ui/contextview/contextview';
-import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { addDisposableListener, EventType, getActiveElement, isAncestorOfActiveElement, isAncestor, getWindow, isHTMLElement } from 'vs/base/browser/dom';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { ResultKind } from 'vs/platform/keybinding/common/keybindingResolver';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
-import { mainWindow } from 'vs/base/browser/window';
-import { ContextViewHandler } from 'vs/platform/contextview/browser/contextViewService';
-import type { IHoverOptions, IHoverWidget, IManagedHover, IManagedHoverContentOrFactory, IManagedHoverOptions } from 'vs/base/browser/ui/hover/hover';
-import type { IHoverDelegate, IHoverDelegateTarget } from 'vs/base/browser/ui/hover/hoverDelegate';
-import { ManagedHoverWidget } from 'vs/editor/browser/services/hoverService/updatableHoverWidget';
-import { TimeoutTimer } from 'vs/base/common/async';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
+import { editorHoverBorder } from '../../../../platform/theme/common/colorRegistry.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { HoverWidget } from './hoverWidget.js';
+import { IContextViewProvider, IDelegate } from '../../../../base/browser/ui/contextview/contextview.js';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { addDisposableListener, EventType, getActiveElement, isAncestorOfActiveElement, isAncestor, getWindow, isHTMLElement, isEditableElement } from '../../../../base/browser/dom.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { ResultKind } from '../../../../platform/keybinding/common/keybindingResolver.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { ILayoutService } from '../../../../platform/layout/browser/layoutService.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { ContextViewHandler } from '../../../../platform/contextview/browser/contextViewService.js';
+import type { IHoverOptions, IHoverWidget, IManagedHover, IManagedHoverContentOrFactory, IManagedHoverOptions } from '../../../../base/browser/ui/hover/hover.js';
+import type { IHoverDelegate, IHoverDelegateTarget } from '../../../../base/browser/ui/hover/hoverDelegate.js';
+import { ManagedHoverWidget } from './updatableHoverWidget.js';
+import { TimeoutTimer } from '../../../../base/common/async.js';
 
 export class HoverService extends Disposable implements IHoverService {
 	declare readonly _serviceBrand: undefined;
@@ -293,8 +293,7 @@ export class HoverService extends Disposable implements IHoverService {
 
 		// Do not show hover when focusing an input or textarea
 		let focusDomEmitter: undefined | IDisposable;
-		const tagName = targetElement.tagName.toLowerCase();
-		if (tagName !== 'input' && tagName !== 'textarea') {
+		if (!isEditableElement(targetElement)) {
 			focusDomEmitter = addDisposableListener(targetElement, EventType.FOCUS, onFocus, true);
 		}
 
diff --git a/src/vs/editor/browser/services/hoverService/hoverWidget.ts b/src/vs/editor/browser/services/hoverService/hoverWidget.ts
index ed929bc965c..b46758c352f 100644
--- a/src/vs/editor/browser/services/hoverService/hoverWidget.ts
+++ b/src/vs/editor/browser/services/hoverService/hoverWidget.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./hover';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { Event, Emitter } from 'vs/base/common/event';
-import * as dom from 'vs/base/browser/dom';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { EDITOR_FONT_DEFAULTS, IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { HoverAction, HoverPosition, HoverWidget as BaseHoverWidget, getHoverAccessibleViewHint } from 'vs/base/browser/ui/hover/hoverWidget';
-import { Widget } from 'vs/base/browser/ui/widget';
-import { AnchorPosition } from 'vs/base/browser/ui/contextview/contextview';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { MarkdownRenderer, openLinkFromMarkdown } from 'vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
-import { isMarkdownString } from 'vs/base/common/htmlContent';
-import { localize } from 'vs/nls';
-import { isMacintosh } from 'vs/base/common/platform';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { status } from 'vs/base/browser/ui/aria/aria';
-import type { IHoverOptions, IHoverTarget, IHoverWidget } from 'vs/base/browser/ui/hover/hover';
+import './hover.css';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import * as dom from '../../../../base/browser/dom.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { EDITOR_FONT_DEFAULTS, IEditorOptions } from '../../../common/config/editorOptions.js';
+import { HoverAction, HoverPosition, HoverWidget as BaseHoverWidget, getHoverAccessibleViewHint } from '../../../../base/browser/ui/hover/hoverWidget.js';
+import { Widget } from '../../../../base/browser/ui/widget.js';
+import { AnchorPosition } from '../../../../base/browser/ui/contextview/contextview.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { MarkdownRenderer, openLinkFromMarkdown } from '../../widget/markdownRenderer/browser/markdownRenderer.js';
+import { isMarkdownString } from '../../../../base/common/htmlContent.js';
+import { localize } from '../../../../nls.js';
+import { isMacintosh } from '../../../../base/common/platform.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { status } from '../../../../base/browser/ui/aria/aria.js';
+import type { IHoverOptions, IHoverTarget, IHoverWidget } from '../../../../base/browser/ui/hover/hover.js';
 
 const $ = dom.$;
 type TargetRect = {
@@ -222,7 +222,7 @@ export class HoverWidget extends Widget implements IHoverWidget {
 		}
 
 		// Show the hover hint if needed
-		if (hideOnHover && options.appearance?.showHoverHint) {
+		if (options.appearance?.showHoverHint) {
 			const statusBarElement = $('div.hover-row.status-bar');
 			const infoElement = $('div.info');
 			infoElement.textContent = localize('hoverhint', 'Hold {0} key to mouse over', isMacintosh ? 'Option' : 'Alt');
diff --git a/src/vs/editor/browser/services/hoverService/updatableHoverWidget.ts b/src/vs/editor/browser/services/hoverService/updatableHoverWidget.ts
index cf9b355831f..c5b656b99d3 100644
--- a/src/vs/editor/browser/services/hoverService/updatableHoverWidget.ts
+++ b/src/vs/editor/browser/services/hoverService/updatableHoverWidget.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isHTMLElement } from 'vs/base/browser/dom';
-import type { IHoverWidget, IManagedHoverContent, IManagedHoverOptions } from 'vs/base/browser/ui/hover/hover';
-import type { IHoverDelegate, IHoverDelegateOptions, IHoverDelegateTarget } from 'vs/base/browser/ui/hover/hoverDelegate';
-import { HoverPosition } from 'vs/base/browser/ui/hover/hoverWidget';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { isMarkdownString, type IMarkdownString } from 'vs/base/common/htmlContent';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { isFunction, isString } from 'vs/base/common/types';
-import { localize } from 'vs/nls';
+import { isHTMLElement } from '../../../../base/browser/dom.js';
+import type { IHoverWidget, IManagedHoverContent, IManagedHoverOptions } from '../../../../base/browser/ui/hover/hover.js';
+import type { IHoverDelegate, IHoverDelegateOptions, IHoverDelegateTarget } from '../../../../base/browser/ui/hover/hoverDelegate.js';
+import { HoverPosition } from '../../../../base/browser/ui/hover/hoverWidget.js';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { isMarkdownString, type IMarkdownString } from '../../../../base/common/htmlContent.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { isFunction, isString } from '../../../../base/common/types.js';
+import { localize } from '../../../../nls.js';
 
 type IManagedHoverResolvedContent = IMarkdownString | string | HTMLElement | undefined;
 
@@ -71,14 +71,17 @@ export class ManagedHoverWidget implements IDisposable {
 			const hoverOptions: IHoverDelegateOptions = {
 				content,
 				target: this.target,
+				actions: options?.actions,
+				linkHandler: options?.linkHandler,
+				trapFocus: options?.trapFocus,
 				appearance: {
 					showPointer: this.hoverDelegate.placement === 'element',
 					skipFadeInAnimation: !this.fadeInAnimation || !!oldHoverWidget, // do not fade in if the hover is already showing
+					showHoverHint: options?.appearance?.showHoverHint,
 				},
 				position: {
 					hoverPosition: HoverPosition.BELOW,
 				},
-				...options
 			};
 
 			this._hoverWidget = this.hoverDelegate.showHover(hoverOptions, focus);
diff --git a/src/vs/editor/browser/services/markerDecorations.ts b/src/vs/editor/browser/services/markerDecorations.ts
index 55fe3c63512..eb519c43fd9 100644
--- a/src/vs/editor/browser/services/markerDecorations.ts
+++ b/src/vs/editor/browser/services/markerDecorations.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IMarkerDecorationsService } from 'vs/editor/common/services/markerDecorations';
-import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
+import { IMarkerDecorationsService } from '../../common/services/markerDecorations.js';
+import { EditorContributionInstantiation, registerEditorContribution } from '../editorExtensions.js';
+import { ICodeEditor } from '../editorBrowser.js';
+import { IEditorContribution } from '../../common/editorCommon.js';
 
 export class MarkerDecorationsContribution implements IEditorContribution {
 
diff --git a/src/vs/editor/browser/services/openerService.ts b/src/vs/editor/browser/services/openerService.ts
index 23f8d13ce46..870f27bdec7 100644
--- a/src/vs/editor/browser/services/openerService.ts
+++ b/src/vs/editor/browser/services/openerService.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { mainWindow } from 'vs/base/browser/window';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { LinkedList } from 'vs/base/common/linkedList';
-import { ResourceMap } from 'vs/base/common/map';
-import { parse } from 'vs/base/common/marshalling';
-import { matchesScheme, matchesSomeScheme, Schemas } from 'vs/base/common/network';
-import { normalizePath } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { EditorOpenSource } from 'vs/platform/editor/common/editor';
-import { extractSelection, IExternalOpener, IExternalUriResolver, IOpener, IOpenerService, IResolvedExternalUri, IValidator, OpenOptions, ResolveExternalUriOptions } from 'vs/platform/opener/common/opener';
+import * as dom from '../../../base/browser/dom.js';
+import { mainWindow } from '../../../base/browser/window.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { LinkedList } from '../../../base/common/linkedList.js';
+import { ResourceMap } from '../../../base/common/map.js';
+import { parse } from '../../../base/common/marshalling.js';
+import { matchesScheme, matchesSomeScheme, Schemas } from '../../../base/common/network.js';
+import { normalizePath } from '../../../base/common/resources.js';
+import { URI } from '../../../base/common/uri.js';
+import { ICodeEditorService } from './codeEditorService.js';
+import { ICommandService } from '../../../platform/commands/common/commands.js';
+import { EditorOpenSource } from '../../../platform/editor/common/editor.js';
+import { extractSelection, IExternalOpener, IExternalUriResolver, IOpener, IOpenerService, IResolvedExternalUri, IValidator, OpenOptions, ResolveExternalUriOptions } from '../../../platform/opener/common/opener.js';
 
 class CommandOpener implements IOpener {
 
diff --git a/src/vs/editor/browser/services/treeSitter/treeSitterParserService.ts b/src/vs/editor/browser/services/treeSitter/treeSitterParserService.ts
new file mode 100644
index 00000000000..c865456f6a2
--- /dev/null
+++ b/src/vs/editor/browser/services/treeSitter/treeSitterParserService.ts
@@ -0,0 +1,523 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import type { Parser } from '@vscode/tree-sitter-wasm';
+import { AppResourcePath, FileAccess, nodeModulesAsarUnpackedPath, nodeModulesPath } from '../../../../base/common/network.js';
+import { EDITOR_EXPERIMENTAL_PREFER_TREESITTER, ITreeSitterParserService, ITreeSitterParseResult } from '../../../common/services/treeSitterParserService.js';
+import { IModelService } from '../../../common/services/model.js';
+import { Disposable, DisposableMap, DisposableStore, dispose, IDisposable } from '../../../../base/common/lifecycle.js';
+import { ITextModel } from '../../../common/model.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IModelContentChange } from '../../../common/textModelEvents.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { setTimeout0 } from '../../../../base/common/platform.js';
+import { canASAR, importAMDNodeModule } from '../../../../amdX.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { CancellationToken, cancelOnDispose } from '../../../../base/common/cancellation.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { CancellationError, isCancellationError } from '../../../../base/common/errors.js';
+import { PromiseResult } from '../../../../base/common/observable.js';
+import { Range } from '../../../common/core/range.js';
+
+const EDITOR_TREESITTER_TELEMETRY = 'editor.experimental.treeSitterTelemetry';
+const MODULE_LOCATION_SUBPATH = `@vscode/tree-sitter-wasm/wasm`;
+const FILENAME_TREESITTER_WASM = `tree-sitter.wasm`;
+
+function getModuleLocation(environmentService: IEnvironmentService): AppResourcePath {
+	return `${(canASAR && environmentService.isBuilt) ? nodeModulesAsarUnpackedPath : nodeModulesPath}/${MODULE_LOCATION_SUBPATH}`;
+}
+
+export class TextModelTreeSitter extends Disposable {
+	private _onDidChangeParseResult: Emitter<Range[]> = this._register(new Emitter<Range[]>());
+	public readonly onDidChangeParseResult: Event<Range[]> = this._onDidChangeParseResult.event;
+	private _parseResult: TreeSitterParseResult | undefined;
+
+	get parseResult(): ITreeSitterParseResult | undefined { return this._parseResult; }
+
+	constructor(readonly model: ITextModel,
+		private readonly _treeSitterLanguages: TreeSitterLanguages,
+		private readonly _treeSitterImporter: TreeSitterImporter,
+		private readonly _logService: ILogService,
+		private readonly _telemetryService: ITelemetryService
+	) {
+		super();
+		this._register(Event.runAndSubscribe(this.model.onDidChangeLanguage, (e => this._onDidChangeLanguage(e ? e.newLanguage : this.model.getLanguageId()))));
+	}
+
+	private readonly _languageSessionDisposables = this._register(new DisposableStore());
+	/**
+	 * Be very careful when making changes to this method as it is easy to introduce race conditions.
+	 */
+	private async _onDidChangeLanguage(languageId: string) {
+		this._languageSessionDisposables.clear();
+		this._parseResult = undefined;
+
+		const token = cancelOnDispose(this._languageSessionDisposables);
+		let language: Parser.Language | undefined;
+		try {
+			language = await this._getLanguage(languageId, token);
+		} catch (e) {
+			if (isCancellationError(e)) {
+				return;
+			}
+			throw e;
+		}
+
+		const Parser = await this._treeSitterImporter.getParserClass();
+		if (token.isCancellationRequested) {
+			return;
+		}
+
+		const treeSitterTree = this._languageSessionDisposables.add(new TreeSitterParseResult(new Parser(), language, this._logService, this._telemetryService));
+		this._languageSessionDisposables.add(this.model.onDidChangeContent(e => this._onDidChangeContent(treeSitterTree, e.changes)));
+		await this._onDidChangeContent(treeSitterTree, []);
+		if (token.isCancellationRequested) {
+			return;
+		}
+
+		this._parseResult = treeSitterTree;
+	}
+
+	private _getLanguage(languageId: string, token: CancellationToken): Promise<Parser.Language> {
+		const language = this._treeSitterLanguages.getOrInitLanguage(languageId);
+		if (language) {
+			return Promise.resolve(language);
+		}
+		const disposables: IDisposable[] = [];
+
+		return new Promise((resolve, reject) => {
+			disposables.push(this._treeSitterLanguages.onDidAddLanguage(e => {
+				if (e.id === languageId) {
+					dispose(disposables);
+					resolve(e.language);
+				}
+			}));
+			token.onCancellationRequested(() => {
+				dispose(disposables);
+				reject(new CancellationError());
+			}, undefined, disposables);
+		});
+	}
+
+	private async _onDidChangeContent(treeSitterTree: TreeSitterParseResult, changes: IModelContentChange[]) {
+		const diff = await treeSitterTree.onDidChangeContent(this.model, changes);
+		if (!diff || diff.length > 0) {
+			// Tree sitter is 0 based, text model is 1 based
+			const ranges = diff ? diff.map(r => new Range(r.startPosition.row + 1, r.startPosition.column + 1, r.endPosition.row + 1, r.endPosition.column + 1)) : [this.model.getFullModelRange()];
+			this._onDidChangeParseResult.fire(ranges);
+		}
+	}
+}
+
+const enum TelemetryParseType {
+	Full = 'fullParse',
+	Incremental = 'incrementalParse'
+}
+
+export class TreeSitterParseResult implements IDisposable, ITreeSitterParseResult {
+	private _tree: Parser.Tree | undefined;
+	private _isDisposed: boolean = false;
+	constructor(public readonly parser: Parser,
+		public /** exposed for tests **/ readonly language: Parser.Language,
+		private readonly _logService: ILogService,
+		private readonly _telemetryService: ITelemetryService) {
+		this.parser.setTimeoutMicros(50 * 1000); // 50 ms
+		this.parser.setLanguage(language);
+	}
+	dispose(): void {
+		this._isDisposed = true;
+		this._tree?.delete();
+		this.parser?.delete();
+	}
+	get tree() { return this._tree; }
+	private set tree(newTree: Parser.Tree | undefined) {
+		this._tree?.delete();
+		this._tree = newTree;
+	}
+	get isDisposed() { return this._isDisposed; }
+
+	private _onDidChangeContentQueue: Promise<void> = Promise.resolve();
+	public async onDidChangeContent(model: ITextModel, changes: IModelContentChange[]): Promise<Parser.Range[] | undefined> {
+		const oldTree = this.tree?.copy();
+		this._applyEdits(model, changes);
+		return new Promise(resolve => {
+			this._onDidChangeContentQueue = this._onDidChangeContentQueue.then(async () => {
+				if (this.isDisposed) {
+					// No need to continue the queue if we are disposed
+					return;
+				}
+				await this._parseAndUpdateTree(model);
+				resolve((this.tree && oldTree) ? oldTree.getChangedRanges(this.tree) : undefined);
+
+			}).catch((e) => {
+				this._logService.error('Error parsing tree-sitter tree', e);
+			});
+		});
+	}
+
+	private _newEdits = true;
+	private _applyEdits(model: ITextModel, changes: IModelContentChange[]) {
+		for (const change of changes) {
+			const newEndOffset = change.rangeOffset + change.text.length;
+			const newEndPosition = model.getPositionAt(newEndOffset);
+
+			this.tree?.edit({
+				startIndex: change.rangeOffset,
+				oldEndIndex: change.rangeOffset + change.rangeLength,
+				newEndIndex: change.rangeOffset + change.text.length,
+				startPosition: { row: change.range.startLineNumber - 1, column: change.range.startColumn - 1 },
+				oldEndPosition: { row: change.range.endLineNumber - 1, column: change.range.endColumn - 1 },
+				newEndPosition: { row: newEndPosition.lineNumber - 1, column: newEndPosition.column - 1 }
+			});
+			this._newEdits = true;
+		}
+	}
+
+	private async _parseAndUpdateTree(model: ITextModel) {
+		const tree = await this._parse(model);
+		if (!this._newEdits) {
+			this.tree = tree;
+		}
+	}
+
+	private _parse(model: ITextModel): Promise<Parser.Tree | undefined> {
+		let parseType: TelemetryParseType = TelemetryParseType.Full;
+		if (this.tree) {
+			parseType = TelemetryParseType.Incremental;
+		}
+		return this._parseAndYield(model, parseType);
+	}
+
+	private async _parseAndYield(model: ITextModel, parseType: TelemetryParseType): Promise<Parser.Tree | undefined> {
+		const language = model.getLanguageId();
+		let tree: Parser.Tree | undefined;
+		let time: number = 0;
+		let passes: number = 0;
+		this._newEdits = false;
+		do {
+			const timer = performance.now();
+			try {
+				tree = this.parser.parse((index: number, position?: Parser.Point) => this._parseCallback(model, index), this.tree);
+			} catch (e) {
+				// parsing can fail when the timeout is reached, will resume upon next loop
+			} finally {
+				time += performance.now() - timer;
+				passes++;
+			}
+
+			// Even if the model changes and edits are applied, the tree parsing will continue correctly after the await.
+			await new Promise<void>(resolve => setTimeout0(resolve));
+
+			if (model.isDisposed() || this.isDisposed) {
+				return;
+			}
+		} while (!tree && !this._newEdits); // exit if there a new edits, as anhy parsing done while there are new edits is throw away work
+		this.sendParseTimeTelemetry(parseType, language, time, passes);
+		return tree;
+	}
+
+	private _parseCallback(textModel: ITextModel, index: number): string | null {
+		try {
+			return textModel.getTextBuffer().getNearestChunk(index);
+		} catch (e) {
+			this._logService.debug('Error getting chunk for tree-sitter parsing', e);
+		}
+		return null;
+	}
+
+	private sendParseTimeTelemetry(parseType: TelemetryParseType, languageId: string, time: number, passes: number): void {
+		this._logService.debug(`Tree parsing (${parseType}) took ${time} ms and ${passes} passes.`);
+		type ParseTimeClassification = {
+			owner: 'alros';
+			comment: 'Used to understand how long it takes to parse a tree-sitter tree';
+			languageId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The programming language ID.' };
+			time: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'The ms it took to parse' };
+			passes: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'The number of passes it took to parse' };
+		};
+		if (parseType === TelemetryParseType.Full) {
+			this._telemetryService.publicLog2<{ languageId: string; time: number; passes: number }, ParseTimeClassification>(`treeSitter.fullParse`, { languageId, time, passes });
+		} else {
+			this._telemetryService.publicLog2<{ languageId: string; time: number; passes: number }, ParseTimeClassification>(`treeSitter.incrementalParse`, { languageId, time, passes });
+		}
+	}
+}
+
+export class TreeSitterLanguages extends Disposable {
+	private _languages: AsyncCache<string, Parser.Language | undefined> = new AsyncCache();
+	public /*exposed for tests*/ readonly _onDidAddLanguage: Emitter<{ id: string; language: Parser.Language }> = this._register(new Emitter());
+	/**
+	 * If you're looking for a specific language, make sure to check if it already exists with `getLanguage` as it will kick off the process to add it if it doesn't exist.
+	 */
+	public readonly onDidAddLanguage: Event<{ id: string; language: Parser.Language }> = this._onDidAddLanguage.event;
+
+	constructor(private readonly _treeSitterImporter: TreeSitterImporter,
+		private readonly _fileService: IFileService,
+		private readonly _environmentService: IEnvironmentService,
+		private readonly _registeredLanguages: Map<string, string>,
+	) {
+		super();
+	}
+
+	public getOrInitLanguage(languageId: string): Parser.Language | undefined {
+		if (this._languages.isCached(languageId)) {
+			return this._languages.getSyncIfCached(languageId);
+		} else {
+			// kick off adding the language, but don't wait
+			this._addLanguage(languageId);
+			return undefined;
+		}
+	}
+
+	public async getLanguage(languageId: string): Promise<Parser.Language | undefined> {
+		if (this._languages.isCached(languageId)) {
+			return this._languages.getSyncIfCached(languageId);
+		} else {
+			await this._addLanguage(languageId);
+			return this._languages.get(languageId);
+		}
+	}
+
+	private async _addLanguage(languageId: string): Promise<void> {
+		const languagePromise = this._languages.get(languageId);
+		if (!languagePromise) {
+			this._languages.set(languageId, this._fetchLanguage(languageId));
+			const language = await this._languages.get(languageId);
+			if (!language) {
+				return undefined;
+			}
+			this._onDidAddLanguage.fire({ id: languageId, language });
+		}
+	}
+
+	private async _fetchLanguage(languageId: string): Promise<Parser.Language | undefined> {
+		const grammarName = this._registeredLanguages.get(languageId);
+		const languageLocation = this._getLanguageLocation(languageId);
+		if (!grammarName || !languageLocation) {
+			return undefined;
+		}
+		const wasmPath: AppResourcePath = `${languageLocation}/${grammarName}.wasm`;
+		const languageFile = await (this._fileService.readFile(FileAccess.asFileUri(wasmPath)));
+		const Parser = await this._treeSitterImporter.getParserClass();
+		return Parser.Language.load(languageFile.value.buffer);
+	}
+
+	private _getLanguageLocation(languageId: string): AppResourcePath | undefined {
+		const grammarName = this._registeredLanguages.get(languageId);
+		if (!grammarName) {
+			return undefined;
+		}
+		return getModuleLocation(this._environmentService);
+	}
+}
+
+export class TreeSitterImporter {
+	private _treeSitterImport: typeof import('@vscode/tree-sitter-wasm') | undefined;
+	private async _getTreeSitterImport() {
+		if (!this._treeSitterImport) {
+			this._treeSitterImport = await importAMDNodeModule<typeof import('@vscode/tree-sitter-wasm')>('@vscode/tree-sitter-wasm', 'wasm/tree-sitter.js');
+		}
+		return this._treeSitterImport;
+	}
+
+	private _parserClass: typeof Parser | undefined;
+	public async getParserClass() {
+		if (!this._parserClass) {
+			this._parserClass = (await this._getTreeSitterImport()).Parser;
+		}
+		return this._parserClass;
+	}
+}
+
+interface TextModelTreeSitterItem {
+	dispose(): void;
+	textModelTreeSitter: TextModelTreeSitter;
+	disposables: DisposableStore;
+}
+
+export class TreeSitterTextModelService extends Disposable implements ITreeSitterParserService {
+	readonly _serviceBrand: undefined;
+	private _init!: Promise<boolean>;
+	private _textModelTreeSitters: DisposableMap<ITextModel, TextModelTreeSitterItem> = this._register(new DisposableMap());
+	private readonly _registeredLanguages: Map<string, string> = new Map();
+	private readonly _treeSitterImporter: TreeSitterImporter = new TreeSitterImporter();
+	private readonly _treeSitterLanguages: TreeSitterLanguages;
+
+	public readonly onDidAddLanguage: Event<{ id: string; language: Parser.Language }>;
+	private _onDidUpdateTree: Emitter<{ textModel: ITextModel; ranges: Range[] }> = this._register(new Emitter());
+	public readonly onDidUpdateTree: Event<{ textModel: ITextModel; ranges: Range[] }> = this._onDidUpdateTree.event;
+
+	constructor(@IModelService private readonly _modelService: IModelService,
+		@IFileService fileService: IFileService,
+		@ITelemetryService private readonly _telemetryService: ITelemetryService,
+		@ILogService private readonly _logService: ILogService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IEnvironmentService private readonly _environmentService: IEnvironmentService
+	) {
+		super();
+		this._treeSitterLanguages = this._register(new TreeSitterLanguages(this._treeSitterImporter, fileService, this._environmentService, this._registeredLanguages));
+		this.onDidAddLanguage = this._treeSitterLanguages.onDidAddLanguage;
+		this._register(this._configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(EDITOR_EXPERIMENTAL_PREFER_TREESITTER)) {
+				this._supportedLanguagesChanged();
+			}
+		}));
+		this._supportedLanguagesChanged();
+	}
+
+	getOrInitLanguage(languageId: string): Parser.Language | undefined {
+		return this._treeSitterLanguages.getOrInitLanguage(languageId);
+	}
+
+	getParseResult(textModel: ITextModel): ITreeSitterParseResult | undefined {
+		const textModelTreeSitter = this._textModelTreeSitters.get(textModel);
+		return textModelTreeSitter?.textModelTreeSitter.parseResult;
+	}
+
+	async getTree(content: string, languageId: string): Promise<Parser.Tree | undefined> {
+		await this._init;
+
+		const language = await this._treeSitterLanguages.getLanguage(languageId);
+		const Parser = await this._treeSitterImporter.getParserClass();
+		if (language) {
+			const parser = new Parser();
+			parser.setLanguage(language);
+			return parser.parse(content);
+		}
+		return undefined;
+	}
+
+	private async _doInitParser() {
+		const Parser = await this._treeSitterImporter.getParserClass();
+		const environmentService = this._environmentService;
+		await Parser.init({
+			locateFile(_file: string, _folder: string) {
+				return FileAccess.asBrowserUri(`${getModuleLocation(environmentService)}/${FILENAME_TREESITTER_WASM}`).toString(true);
+			}
+		});
+		return true;
+	}
+
+	private _hasInit: boolean = false;
+	private async _initParser(hasLanguages: boolean): Promise<boolean> {
+		if (this._hasInit) {
+			return this._init;
+		}
+
+		if (hasLanguages) {
+			this._hasInit = true;
+			this._init = this._doInitParser();
+
+			// New init, we need to deal with all the existing text models and set up listeners
+			this._init.then(() => this._registerModelServiceListeners());
+		} else {
+			this._init = Promise.resolve(false);
+		}
+		return this._init;
+	}
+
+	private async _supportedLanguagesChanged() {
+		const setting = this._getSetting();
+
+		let hasLanguages = true;
+		if (setting.length === 0) {
+			hasLanguages = false;
+		}
+		// Eventually, this should actually use an extension point to add tree sitter grammars, but for now they are hard coded in core
+		if (setting.includes('typescript')) {
+			this._addGrammar('typescript', 'tree-sitter-typescript');
+		} else {
+			this._removeGrammar('typescript');
+		}
+
+		return this._initParser(hasLanguages);
+	}
+
+	private _getSetting(): string[] {
+		const setting = this._configurationService.getValue<string[]>(EDITOR_EXPERIMENTAL_PREFER_TREESITTER);
+		if (setting && setting.length > 0) {
+			return setting;
+		} else {
+			const expSetting = this._configurationService.getValue<boolean>(EDITOR_TREESITTER_TELEMETRY);
+			if (expSetting) {
+				return ['typescript'];
+			}
+		}
+		return [];
+	}
+
+	private async _registerModelServiceListeners() {
+		this._register(this._modelService.onModelAdded(model => {
+			this._createTextModelTreeSitter(model);
+		}));
+		this._register(this._modelService.onModelRemoved(model => {
+			this._textModelTreeSitters.deleteAndDispose(model);
+		}));
+		this._modelService.getModels().forEach(model => this._createTextModelTreeSitter(model));
+	}
+
+	private _createTextModelTreeSitter(model: ITextModel) {
+		const textModelTreeSitter = new TextModelTreeSitter(model, this._treeSitterLanguages, this._treeSitterImporter, this._logService, this._telemetryService);
+		const disposables = new DisposableStore();
+		disposables.add(textModelTreeSitter);
+		disposables.add(textModelTreeSitter.onDidChangeParseResult((ranges) => this._onDidUpdateTree.fire({ textModel: model, ranges })));
+		this._textModelTreeSitters.set(model, {
+			textModelTreeSitter,
+			disposables,
+			dispose: disposables.dispose.bind(disposables)
+		});
+	}
+
+	private _addGrammar(languageId: string, grammarName: string) {
+		if (!this._registeredLanguages.has(languageId)) {
+			this._registeredLanguages.set(languageId, grammarName);
+		}
+	}
+
+	private _removeGrammar(languageId: string) {
+		if (this._registeredLanguages.has(languageId)) {
+			this._registeredLanguages.delete('typescript');
+		}
+	}
+}
+
+class PromiseWithSyncAccess<T> {
+	private _result: PromiseResult<T> | undefined;
+	/**
+	 * Returns undefined if the promise did not resolve yet.
+	 */
+	get result(): PromiseResult<T> | undefined {
+		return this._result;
+	}
+
+	constructor(public readonly promise: Promise<T>) {
+		promise.then(result => {
+			this._result = new PromiseResult(result, undefined);
+		}).catch(e => {
+			this._result = new PromiseResult<T>(undefined, e);
+		});
+	}
+}
+
+class AsyncCache<TKey, T> {
+	private readonly _values = new Map<TKey, PromiseWithSyncAccess<T>>();
+
+	set(key: TKey, promise: Promise<T>) {
+		this._values.set(key, new PromiseWithSyncAccess(promise));
+	}
+
+	get(key: TKey): Promise<T> | undefined {
+		return this._values.get(key)?.promise;
+	}
+
+	getSyncIfCached(key: TKey): T | undefined {
+		return this._values.get(key)?.result?.data;
+	}
+
+	isCached(key: TKey): boolean {
+		return this._values.get(key)?.result !== undefined;
+	}
+}
diff --git a/src/vs/editor/browser/stableEditorScroll.ts b/src/vs/editor/browser/stableEditorScroll.ts
index 986e18ac6c0..66d4d450e8e 100644
--- a/src/vs/editor/browser/stableEditorScroll.ts
+++ b/src/vs/editor/browser/stableEditorScroll.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { Position } from 'vs/editor/common/core/position';
-import { ScrollType } from 'vs/editor/common/editorCommon';
+import { ICodeEditor } from './editorBrowser.js';
+import { Position } from '../common/core/position.js';
+import { ScrollType } from '../common/editorCommon.js';
 
 export class StableEditorScrollState {
 
diff --git a/src/vs/editor/browser/view.ts b/src/vs/editor/browser/view.ts
index 5558cf28cd4..239621d32b2 100644
--- a/src/vs/editor/browser/view.ts
+++ b/src/vs/editor/browser/view.ts
@@ -3,59 +3,64 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
-import { IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
-import { inputLatency } from 'vs/base/browser/performance';
-import { CodeWindow } from 'vs/base/browser/window';
-import { BugIndicatingError, onUnexpectedError } from 'vs/base/common/errors';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { IPointerHandlerHelper } from 'vs/editor/browser/controller/mouseHandler';
-import { PointerHandlerLastRenderData } from 'vs/editor/browser/controller/mouseTarget';
-import { PointerHandler } from 'vs/editor/browser/controller/pointerHandler';
-import { IVisibleRangeProvider, TextAreaHandler } from 'vs/editor/browser/controller/textAreaHandler';
-import { IContentWidget, IContentWidgetPosition, IEditorAriaOptions, IGlyphMarginWidget, IGlyphMarginWidgetPosition, IMouseTarget, IOverlayWidget, IOverlayWidgetPosition, IViewZoneChangeAccessor } from 'vs/editor/browser/editorBrowser';
-import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/browser/view/renderingContext';
-import { ICommandDelegate, ViewController } from 'vs/editor/browser/view/viewController';
-import { ContentViewOverlays, MarginViewOverlays } from 'vs/editor/browser/view/viewOverlays';
-import { PartFingerprint, PartFingerprints, ViewPart } from 'vs/editor/browser/view/viewPart';
-import { ViewUserInputEvents } from 'vs/editor/browser/view/viewUserInputEvents';
-import { BlockDecorations } from 'vs/editor/browser/viewParts/blockDecorations/blockDecorations';
-import { ViewContentWidgets } from 'vs/editor/browser/viewParts/contentWidgets/contentWidgets';
-import { CurrentLineHighlightOverlay, CurrentLineMarginHighlightOverlay } from 'vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight';
-import { DecorationsOverlay } from 'vs/editor/browser/viewParts/decorations/decorations';
-import { EditorScrollbar } from 'vs/editor/browser/viewParts/editorScrollbar/editorScrollbar';
-import { GlyphMarginWidgets } from 'vs/editor/browser/viewParts/glyphMargin/glyphMargin';
-import { IndentGuidesOverlay } from 'vs/editor/browser/viewParts/indentGuides/indentGuides';
-import { LineNumbersOverlay } from 'vs/editor/browser/viewParts/lineNumbers/lineNumbers';
-import { ViewLines } from 'vs/editor/browser/viewParts/lines/viewLines';
-import { LinesDecorationsOverlay } from 'vs/editor/browser/viewParts/linesDecorations/linesDecorations';
-import { Margin } from 'vs/editor/browser/viewParts/margin/margin';
-import { MarginViewLineDecorationsOverlay } from 'vs/editor/browser/viewParts/marginDecorations/marginDecorations';
-import { Minimap } from 'vs/editor/browser/viewParts/minimap/minimap';
-import { ViewOverlayWidgets } from 'vs/editor/browser/viewParts/overlayWidgets/overlayWidgets';
-import { DecorationsOverviewRuler } from 'vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler';
-import { OverviewRuler } from 'vs/editor/browser/viewParts/overviewRuler/overviewRuler';
-import { Rulers } from 'vs/editor/browser/viewParts/rulers/rulers';
-import { ScrollDecorationViewPart } from 'vs/editor/browser/viewParts/scrollDecoration/scrollDecoration';
-import { SelectionsOverlay } from 'vs/editor/browser/viewParts/selections/selections';
-import { ViewCursors } from 'vs/editor/browser/viewParts/viewCursors/viewCursors';
-import { ViewZones } from 'vs/editor/browser/viewParts/viewZones/viewZones';
-import { WhitespaceOverlay } from 'vs/editor/browser/viewParts/whitespace/whitespace';
-import { IEditorConfiguration } from 'vs/editor/common/config/editorConfiguration';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ScrollType } from 'vs/editor/common/editorCommon';
-import { GlyphMarginLane, IGlyphMarginLanesModel } from 'vs/editor/common/model';
-import { ViewEventHandler } from 'vs/editor/common/viewEventHandler';
-import * as viewEvents from 'vs/editor/common/viewEvents';
-import { ViewportData } from 'vs/editor/common/viewLayout/viewLinesViewportData';
-import { IViewModel } from 'vs/editor/common/viewModel';
-import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IColorTheme, getThemeTypeSelector } from 'vs/platform/theme/common/themeService';
+import * as dom from '../../base/browser/dom.js';
+import { FastDomNode, createFastDomNode } from '../../base/browser/fastDomNode.js';
+import { IMouseWheelEvent } from '../../base/browser/mouseEvent.js';
+import { inputLatency } from '../../base/browser/performance.js';
+import { CodeWindow } from '../../base/browser/window.js';
+import { BugIndicatingError, onUnexpectedError } from '../../base/common/errors.js';
+import { IDisposable } from '../../base/common/lifecycle.js';
+import { IPointerHandlerHelper } from './controller/mouseHandler.js';
+import { PointerHandlerLastRenderData } from './controller/mouseTarget.js';
+import { PointerHandler } from './controller/pointerHandler.js';
+import { IContentWidget, IContentWidgetPosition, IEditorAriaOptions, IGlyphMarginWidget, IGlyphMarginWidgetPosition, IMouseTarget, IOverlayWidget, IOverlayWidgetPosition, IViewZoneChangeAccessor } from './editorBrowser.js';
+import { LineVisibleRanges, RenderingContext, RestrictedRenderingContext } from './view/renderingContext.js';
+import { ICommandDelegate, ViewController } from './view/viewController.js';
+import { ContentViewOverlays, MarginViewOverlays } from './view/viewOverlays.js';
+import { PartFingerprint, PartFingerprints, ViewPart } from './view/viewPart.js';
+import { ViewUserInputEvents } from './view/viewUserInputEvents.js';
+import { BlockDecorations } from './viewParts/blockDecorations/blockDecorations.js';
+import { ViewContentWidgets } from './viewParts/contentWidgets/contentWidgets.js';
+import { CurrentLineHighlightOverlay, CurrentLineMarginHighlightOverlay } from './viewParts/currentLineHighlight/currentLineHighlight.js';
+import { DecorationsOverlay } from './viewParts/decorations/decorations.js';
+import { EditorScrollbar } from './viewParts/editorScrollbar/editorScrollbar.js';
+import { GlyphMarginWidgets } from './viewParts/glyphMargin/glyphMargin.js';
+import { IndentGuidesOverlay } from './viewParts/indentGuides/indentGuides.js';
+import { LineNumbersOverlay } from './viewParts/lineNumbers/lineNumbers.js';
+import { ViewLines } from './viewParts/viewLines/viewLines.js';
+import { LinesDecorationsOverlay } from './viewParts/linesDecorations/linesDecorations.js';
+import { Margin } from './viewParts/margin/margin.js';
+import { MarginViewLineDecorationsOverlay } from './viewParts/marginDecorations/marginDecorations.js';
+import { Minimap } from './viewParts/minimap/minimap.js';
+import { ViewOverlayWidgets } from './viewParts/overlayWidgets/overlayWidgets.js';
+import { DecorationsOverviewRuler } from './viewParts/overviewRuler/decorationsOverviewRuler.js';
+import { OverviewRuler } from './viewParts/overviewRuler/overviewRuler.js';
+import { Rulers } from './viewParts/rulers/rulers.js';
+import { ScrollDecorationViewPart } from './viewParts/scrollDecoration/scrollDecoration.js';
+import { SelectionsOverlay } from './viewParts/selections/selections.js';
+import { ViewCursors } from './viewParts/viewCursors/viewCursors.js';
+import { ViewZones } from './viewParts/viewZones/viewZones.js';
+import { WhitespaceOverlay } from './viewParts/whitespace/whitespace.js';
+import { IEditorConfiguration } from '../common/config/editorConfiguration.js';
+import { EditorOption } from '../common/config/editorOptions.js';
+import { Position } from '../common/core/position.js';
+import { Range } from '../common/core/range.js';
+import { Selection } from '../common/core/selection.js';
+import { ScrollType } from '../common/editorCommon.js';
+import { GlyphMarginLane, IGlyphMarginLanesModel } from '../common/model.js';
+import { ViewEventHandler } from '../common/viewEventHandler.js';
+import * as viewEvents from '../common/viewEvents.js';
+import { ViewportData } from '../common/viewLayout/viewLinesViewportData.js';
+import { IViewModel } from '../common/viewModel.js';
+import { ViewContext } from '../common/viewModel/viewContext.js';
+import { IInstantiationService } from '../../platform/instantiation/common/instantiation.js';
+import { IColorTheme, getThemeTypeSelector } from '../../platform/theme/common/themeService.js';
+import { ViewGpuContext } from './gpu/viewGpuContext.js';
+import { ViewLinesGpu } from './viewParts/viewLinesGpu/viewLinesGpu.js';
+import { AbstractEditContext } from './controller/editContext/editContext.js';
+import { IVisibleRangeProvider, TextAreaEditContext } from './controller/editContext/textArea/textAreaEditContext.js';
+import { NativeEditContext } from './controller/editContext/native/nativeEditContext.js';
+import { RulersGpu } from './viewParts/rulersGpu/rulersGpu.js';
 
 
 export interface IContentWidgetData {
@@ -77,10 +82,12 @@ export class View extends ViewEventHandler {
 
 	private readonly _scrollbar: EditorScrollbar;
 	private readonly _context: ViewContext;
+	private readonly _viewGpuContext?: ViewGpuContext;
 	private _selections: Selection[];
 
 	// The view lines
 	private readonly _viewLines: ViewLines;
+	private readonly _viewLinesGpu?: ViewLinesGpu;
 
 	// These are parts, but we must do some API related calls on them, so we keep a reference
 	private readonly _viewZones: ViewZones;
@@ -89,8 +96,10 @@ export class View extends ViewEventHandler {
 	private readonly _glyphMarginWidgets: GlyphMarginWidgets;
 	private readonly _viewCursors: ViewCursors;
 	private readonly _viewParts: ViewPart[];
+	private readonly _viewController: ViewController;
 
-	private readonly _textAreaHandler: TextAreaHandler;
+	private _experimentalEditContextEnabled: boolean;
+	private _editContext: AbstractEditContext;
 	private readonly _pointerHandler: PointerHandler;
 
 	// Dom nodes
@@ -115,7 +124,11 @@ export class View extends ViewEventHandler {
 		this._selections = [new Selection(1, 1, 1, 1)];
 		this._renderAnimationFrame = null;
 
-		const viewController = new ViewController(configuration, model, userInputEvents, commandDelegate);
+		this._overflowGuardContainer = createFastDomNode(document.createElement('div'));
+		PartFingerprints.write(this._overflowGuardContainer, PartFingerprint.OverflowGuard);
+		this._overflowGuardContainer.setClassName('overflow-guard');
+
+		this._viewController = new ViewController(configuration, model, userInputEvents, commandDelegate);
 
 		// The view context is passed on to most classes (basically to reduce param. counts in ctors)
 		this._context = new ViewContext(configuration, colorTheme, model);
@@ -126,8 +139,10 @@ export class View extends ViewEventHandler {
 		this._viewParts = [];
 
 		// Keyboard handler
-		this._textAreaHandler = this._instantiationService.createInstance(TextAreaHandler, this._context, viewController, this._createTextAreaHandlerHelper());
-		this._viewParts.push(this._textAreaHandler);
+		this._experimentalEditContextEnabled = this._context.configuration.options.get(EditorOption.experimentalEditContextEnabled);
+		this._editContext = this._instantiateEditContext(this._experimentalEditContextEnabled);
+
+		this._viewParts.push(this._editContext);
 
 		// These two dom nodes must be constructed up front, since references are needed in the layout provider (scrolling & co.)
 		this._linesContent = createFastDomNode(document.createElement('div'));
@@ -139,15 +154,18 @@ export class View extends ViewEventHandler {
 		// Set role 'code' for better screen reader support https://github.com/microsoft/vscode/issues/93438
 		this.domNode.setAttribute('role', 'code');
 
-		this._overflowGuardContainer = createFastDomNode(document.createElement('div'));
-		PartFingerprints.write(this._overflowGuardContainer, PartFingerprint.OverflowGuard);
-		this._overflowGuardContainer.setClassName('overflow-guard');
+		if (this._context.configuration.options.get(EditorOption.experimentalGpuAcceleration) === 'on') {
+			this._viewGpuContext = this._instantiationService.createInstance(ViewGpuContext, this._context);
+		}
 
 		this._scrollbar = new EditorScrollbar(this._context, this._linesContent, this.domNode, this._overflowGuardContainer);
 		this._viewParts.push(this._scrollbar);
 
 		// View Lines
 		this._viewLines = new ViewLines(this._context, this._linesContent);
+		if (this._viewGpuContext) {
+			this._viewLinesGpu = this._instantiationService.createInstance(ViewLinesGpu, this._context, this._viewGpuContext);
+		}
 
 		// View Zones
 		this._viewZones = new ViewZones(this._context);
@@ -197,7 +215,9 @@ export class View extends ViewEventHandler {
 		this._overlayWidgets = new ViewOverlayWidgets(this._context, this.domNode);
 		this._viewParts.push(this._overlayWidgets);
 
-		const rulers = new Rulers(this._context);
+		const rulers = this._viewGpuContext
+			? new RulersGpu(this._context, this._viewGpuContext)
+			: new Rulers(this._context);
 		this._viewParts.push(rulers);
 
 		const blockOutline = new BlockDecorations(this._context);
@@ -214,16 +234,19 @@ export class View extends ViewEventHandler {
 		}
 
 		this._linesContent.appendChild(contentViewOverlays.getDomNode());
-		this._linesContent.appendChild(rulers.domNode);
+		if ('domNode' in rulers) {
+			this._linesContent.appendChild(rulers.domNode);
+		}
 		this._linesContent.appendChild(this._viewZones.domNode);
 		this._linesContent.appendChild(this._viewLines.getDomNode());
 		this._linesContent.appendChild(this._contentWidgets.domNode);
 		this._linesContent.appendChild(this._viewCursors.getDomNode());
 		this._overflowGuardContainer.appendChild(margin.getDomNode());
 		this._overflowGuardContainer.appendChild(this._scrollbar.getDomNode());
+		if (this._viewGpuContext) {
+			this._overflowGuardContainer.appendChild(this._viewGpuContext.canvas);
+		}
 		this._overflowGuardContainer.appendChild(scrollDecoration.getDomNode());
-		this._overflowGuardContainer.appendChild(this._textAreaHandler.textArea);
-		this._overflowGuardContainer.appendChild(this._textAreaHandler.textAreaCover);
 		this._overflowGuardContainer.appendChild(this._overlayWidgets.getDomNode());
 		this._overflowGuardContainer.appendChild(minimap.getDomNode());
 		this._overflowGuardContainer.appendChild(blockOutline.domNode);
@@ -240,7 +263,26 @@ export class View extends ViewEventHandler {
 		this._applyLayout();
 
 		// Pointer handler
-		this._pointerHandler = this._register(new PointerHandler(this._context, viewController, this._createPointerHandlerHelper()));
+		this._pointerHandler = this._register(new PointerHandler(this._context, this._viewController, this._createPointerHandlerHelper()));
+	}
+
+	private _instantiateEditContext(experimentalEditContextEnabled: boolean): AbstractEditContext {
+		return this._instantiationService.createInstance(experimentalEditContextEnabled ? NativeEditContext : TextAreaEditContext, this._context, this._overflowGuardContainer, this._viewController, this._createTextAreaHandlerHelper());
+	}
+
+	private _updateEditContext(): void {
+		const experimentalEditContextEnabled = this._context.configuration.options.get(EditorOption.experimentalEditContextEnabled);
+		if (this._experimentalEditContextEnabled === experimentalEditContextEnabled) {
+			return;
+		}
+		this._experimentalEditContextEnabled = experimentalEditContextEnabled;
+		this._editContext.dispose();
+		this._editContext = this._instantiateEditContext(experimentalEditContextEnabled);
+		// Replace the view parts with the new edit context
+		const indexOfEditContextHandler = this._viewParts.indexOf(this._editContext);
+		if (indexOfEditContextHandler !== -1) {
+			this._viewParts.splice(indexOfEditContextHandler, 1, this._editContext);
+		}
 	}
 
 	private _computeGlyphMarginLanes(): IGlyphMarginLanesModel {
@@ -286,12 +328,12 @@ export class View extends ViewEventHandler {
 			},
 
 			dispatchTextAreaEvent: (event: CustomEvent) => {
-				this._textAreaHandler.textArea.domNode.dispatchEvent(event);
+				this._editContext.domNode.domNode.dispatchEvent(event);
 			},
 
 			getLastRenderData: (): PointerHandlerLastRenderData => {
 				const lastViewCursorsRenderData = this._viewCursors.getLastRenderData() || [];
-				const lastTextareaPosition = this._textAreaHandler.getLastRenderData();
+				const lastTextareaPosition = this._editContext.getLastRenderData();
 				return new PointerHandlerLastRenderData(lastViewCursorsRenderData, lastTextareaPosition);
 			},
 			renderNow: (): void => {
@@ -325,6 +367,10 @@ export class View extends ViewEventHandler {
 			visibleRangeForPosition: (position: Position) => {
 				this._flushAccumulatedAndRenderNow();
 				return this._viewLines.visibleRangeForPosition(position);
+			},
+			linesVisibleRangesForRange: (range: Range, includeNewLines: boolean): LineVisibleRanges[] | null => {
+				this._flushAccumulatedAndRenderNow();
+				return this._viewLines.linesVisibleRangesForRange(range, includeNewLines);
 			}
 		};
 	}
@@ -345,7 +391,7 @@ export class View extends ViewEventHandler {
 	}
 
 	private _getEditorClassName() {
-		const focused = this._textAreaHandler.isFocused() ? ' focused' : '';
+		const focused = this._editContext.isFocused() ? ' focused' : '';
 		return this._context.configuration.options.get(EditorOption.editorClassName) + ' ' + getThemeTypeSelector(this._context.theme.type) + focused;
 	}
 
@@ -356,6 +402,7 @@ export class View extends ViewEventHandler {
 	}
 	public override onConfigurationChanged(e: viewEvents.ViewConfigurationChangedEvent): boolean {
 		this.domNode.setClassName(this._getEditorClassName());
+		this._updateEditContext();
 		this._applyLayout();
 		return false;
 	}
@@ -388,10 +435,13 @@ export class View extends ViewEventHandler {
 		}
 
 		this._contentWidgets.overflowingContentWidgetsDomNode.domNode.remove();
+		this._overlayWidgets.overflowingOverlayWidgetsDomNode.domNode.remove();
 
 		this._context.removeEventHandler(this);
+		this._viewGpuContext?.dispose();
 
 		this._viewLines.dispose();
+		this._viewLinesGpu?.dispose();
 
 		// Destroy view parts
 		for (const viewPart of this._viewParts) {
@@ -408,7 +458,7 @@ export class View extends ViewEventHandler {
 		if (this._renderAnimationFrame === null) {
 			const rendering = this._createCoordinatedRendering();
 			this._renderAnimationFrame = EditorRenderingCoordinator.INSTANCE.scheduleCoordinatedRendering({
-				window: dom.getWindow(this.domNode.domNode),
+				window: dom.getWindow(this.domNode?.domNode),
 				prepareRenderText: () => {
 					if (this._store.isDisposed) {
 						throw new BugIndicatingError();
@@ -505,7 +555,12 @@ export class View extends ViewEventHandler {
 					viewPartsToRender = this._getViewPartsToRender();
 				}
 
-				return [viewPartsToRender, new RenderingContext(this._context.viewLayout, viewportData, this._viewLines)];
+				if (this._viewLinesGpu?.shouldRender()) {
+					this._viewLinesGpu.renderText(viewportData);
+					this._viewLinesGpu.onDidRender();
+				}
+
+				return [viewPartsToRender, new RenderingContext(this._context.viewLayout, viewportData, this._viewLines, this._viewLinesGpu)];
 			},
 			prepareRender: (viewPartsToRender: ViewPart[], ctx: RenderingContext) => {
 				for (const viewPart of viewPartsToRender) {
@@ -586,23 +641,23 @@ export class View extends ViewEventHandler {
 	}
 
 	public writeScreenReaderContent(reason: string): void {
-		this._textAreaHandler.writeScreenReaderContent(reason);
+		this._editContext.writeScreenReaderContent(reason);
 	}
 
 	public focus(): void {
-		this._textAreaHandler.focusTextArea();
+		this._editContext.focus();
 	}
 
 	public isFocused(): boolean {
-		return this._textAreaHandler.isFocused();
+		return this._editContext.isFocused();
 	}
 
 	public refreshFocusState() {
-		this._textAreaHandler.refreshFocusState();
+		this._editContext.refreshFocusState();
 	}
 
 	public setAriaOptions(options: IEditorAriaOptions): void {
-		this._textAreaHandler.setAriaOptions(options);
+		this._editContext.setAriaOptions(options);
 	}
 
 	public addContentWidget(widgetData: IContentWidgetData): void {
diff --git a/src/vs/editor/browser/view/domLineBreaksComputer.ts b/src/vs/editor/browser/view/domLineBreaksComputer.ts
index 2861fd8f82a..583d7f9cfa0 100644
--- a/src/vs/editor/browser/view/domLineBreaksComputer.ts
+++ b/src/vs/editor/browser/view/domLineBreaksComputer.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createTrustedTypesPolicy } from 'vs/base/browser/trustedTypes';
-import { CharCode } from 'vs/base/common/charCode';
-import * as strings from 'vs/base/common/strings';
-import { assertIsDefined } from 'vs/base/common/types';
-import { applyFontInfo } from 'vs/editor/browser/config/domFontInfo';
-import { WrappingIndent } from 'vs/editor/common/config/editorOptions';
-import { FontInfo } from 'vs/editor/common/config/fontInfo';
-import { StringBuilder } from 'vs/editor/common/core/stringBuilder';
-import { InjectedTextOptions } from 'vs/editor/common/model';
-import { ILineBreaksComputer, ILineBreaksComputerFactory, ModelLineProjectionData } from 'vs/editor/common/modelLineProjectionData';
-import { LineInjectedText } from 'vs/editor/common/textModelEvents';
+import { createTrustedTypesPolicy } from '../../../base/browser/trustedTypes.js';
+import { CharCode } from '../../../base/common/charCode.js';
+import * as strings from '../../../base/common/strings.js';
+import { assertIsDefined } from '../../../base/common/types.js';
+import { applyFontInfo } from '../config/domFontInfo.js';
+import { WrappingIndent } from '../../common/config/editorOptions.js';
+import { FontInfo } from '../../common/config/fontInfo.js';
+import { StringBuilder } from '../../common/core/stringBuilder.js';
+import { InjectedTextOptions } from '../../common/model.js';
+import { ILineBreaksComputer, ILineBreaksComputerFactory, ModelLineProjectionData } from '../../common/modelLineProjectionData.js';
+import { LineInjectedText } from '../../common/textModelEvents.js';
 
 const ttPolicy = createTrustedTypesPolicy('domLineBreaksComputer', { createHTML: value => value });
 
diff --git a/src/vs/editor/browser/view/dynamicViewOverlay.ts b/src/vs/editor/browser/view/dynamicViewOverlay.ts
index c8de7098816..048e76445fb 100644
--- a/src/vs/editor/browser/view/dynamicViewOverlay.ts
+++ b/src/vs/editor/browser/view/dynamicViewOverlay.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { RenderingContext } from 'vs/editor/browser/view/renderingContext';
-import { ViewEventHandler } from 'vs/editor/common/viewEventHandler';
+import { RenderingContext } from './renderingContext.js';
+import { ViewEventHandler } from '../../common/viewEventHandler.js';
 
 export abstract class DynamicViewOverlay extends ViewEventHandler {
 
diff --git a/src/vs/editor/browser/view/renderingContext.ts b/src/vs/editor/browser/view/renderingContext.ts
index 3396fb74b78..178f546082e 100644
--- a/src/vs/editor/browser/view/renderingContext.ts
+++ b/src/vs/editor/browser/view/renderingContext.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { ViewportData } from 'vs/editor/common/viewLayout/viewLinesViewportData';
-import { IViewLayout, ViewModelDecoration } from 'vs/editor/common/viewModel';
+import { Position } from '../../common/core/position.js';
+import { Range } from '../../common/core/range.js';
+import { ViewportData } from '../../common/viewLayout/viewLinesViewportData.js';
+import { IViewLayout, ViewModelDecoration } from '../../common/viewModel.js';
 
 export interface IViewLines {
 	linesVisibleRangesForRange(range: Range, includeNewLines: boolean): LineVisibleRanges[] | null;
@@ -71,18 +71,20 @@ export class RenderingContext extends RestrictedRenderingContext {
 	_renderingContextBrand: void = undefined;
 
 	private readonly _viewLines: IViewLines;
+	private readonly _viewLinesGpu?: IViewLines;
 
-	constructor(viewLayout: IViewLayout, viewportData: ViewportData, viewLines: IViewLines) {
+	constructor(viewLayout: IViewLayout, viewportData: ViewportData, viewLines: IViewLines, viewLinesGpu?: IViewLines) {
 		super(viewLayout, viewportData);
 		this._viewLines = viewLines;
+		this._viewLinesGpu = viewLinesGpu;
 	}
 
 	public linesVisibleRangesForRange(range: Range, includeNewLines: boolean): LineVisibleRanges[] | null {
-		return this._viewLines.linesVisibleRangesForRange(range, includeNewLines);
+		return this._viewLines.linesVisibleRangesForRange(range, includeNewLines) ?? this._viewLinesGpu?.linesVisibleRangesForRange(range, includeNewLines) ?? null;
 	}
 
 	public visibleRangeForPosition(position: Position): HorizontalPosition | null {
-		return this._viewLines.visibleRangeForPosition(position);
+		return this._viewLines.visibleRangeForPosition(position) ?? this._viewLinesGpu?.visibleRangeForPosition(position) ?? null;
 	}
 }
 
diff --git a/src/vs/editor/browser/view/viewController.ts b/src/vs/editor/browser/view/viewController.ts
index b6b8ebdd698..5e53d12d2e4 100644
--- a/src/vs/editor/browser/view/viewController.ts
+++ b/src/vs/editor/browser/view/viewController.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { CoreNavigationCommands, NavigationCommandRevealType } from 'vs/editor/browser/coreCommands';
-import { IEditorMouseEvent, IPartialEditorMouseEvent } from 'vs/editor/browser/editorBrowser';
-import { ViewUserInputEvents } from 'vs/editor/browser/view/viewUserInputEvents';
-import { Position } from 'vs/editor/common/core/position';
-import { Selection } from 'vs/editor/common/core/selection';
-import { IEditorConfiguration } from 'vs/editor/common/config/editorConfiguration';
-import { IViewModel } from 'vs/editor/common/viewModel';
-import { IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import * as platform from 'vs/base/common/platform';
+import { IKeyboardEvent } from '../../../base/browser/keyboardEvent.js';
+import { CoreNavigationCommands, NavigationCommandRevealType } from '../coreCommands.js';
+import { IEditorMouseEvent, IPartialEditorMouseEvent } from '../editorBrowser.js';
+import { ViewUserInputEvents } from './viewUserInputEvents.js';
+import { Position } from '../../common/core/position.js';
+import { Selection } from '../../common/core/selection.js';
+import { IEditorConfiguration } from '../../common/config/editorConfiguration.js';
+import { IViewModel } from '../../common/viewModel.js';
+import { IMouseWheelEvent } from '../../../base/browser/mouseEvent.js';
+import { EditorOption } from '../../common/config/editorOptions.js';
+import * as platform from '../../../base/common/platform.js';
 
 export interface IMouseDispatchData {
 	position: Position;
diff --git a/src/vs/editor/browser/view/viewLayer.ts b/src/vs/editor/browser/view/viewLayer.ts
index 971d8ae4011..7162a1bb939 100644
--- a/src/vs/editor/browser/view/viewLayer.ts
+++ b/src/vs/editor/browser/view/viewLayer.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
-import { createTrustedTypesPolicy } from 'vs/base/browser/trustedTypes';
-import { BugIndicatingError } from 'vs/base/common/errors';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { StringBuilder } from 'vs/editor/common/core/stringBuilder';
-import * as viewEvents from 'vs/editor/common/viewEvents';
-import { ViewportData } from 'vs/editor/common/viewLayout/viewLinesViewportData';
+import { FastDomNode, createFastDomNode } from '../../../base/browser/fastDomNode.js';
+import { createTrustedTypesPolicy } from '../../../base/browser/trustedTypes.js';
+import { BugIndicatingError } from '../../../base/common/errors.js';
+import { EditorOption } from '../../common/config/editorOptions.js';
+import { StringBuilder } from '../../common/core/stringBuilder.js';
+import * as viewEvents from '../../common/viewEvents.js';
+import { ViewportData } from '../../common/viewLayout/viewLinesViewportData.js';
 
 /**
  * Represents a visible line
@@ -35,13 +35,17 @@ export interface ILine {
 	onTokensChanged(): void;
 }
 
+export interface ILineFactory<T extends ILine> {
+	createLine(): T;
+}
+
 export class RenderedLinesCollection<T extends ILine> {
-	private readonly _createLine: () => T;
 	private _lines!: T[];
 	private _rendLineNumberStart!: number;
 
-	constructor(createLine: () => T) {
-		this._createLine = createLine;
+	constructor(
+		private readonly _lineFactory: ILineFactory<T>,
+	) {
 		this._set(1, []);
 	}
 
@@ -201,7 +205,7 @@ export class RenderedLinesCollection<T extends ILine> {
 		// insert inside the viewport, push out some lines, but not all remaining lines
 		const newLines: T[] = [];
 		for (let i = 0; i < insertCnt; i++) {
-			newLines[i] = this._createLine();
+			newLines[i] = this._lineFactory.createLine();
 		}
 		const insertIndex = insertFromLineNumber - this._rendLineNumberStart;
 		const beforeLines = this._lines.slice(0, insertIndex);
@@ -245,20 +249,14 @@ export class RenderedLinesCollection<T extends ILine> {
 	}
 }
 
-export interface IVisibleLinesHost<T extends IVisibleLine> {
-	createVisibleLine(): T;
-}
-
 export class VisibleLinesCollection<T extends IVisibleLine> {
 
-	private readonly _host: IVisibleLinesHost<T>;
-	public readonly domNode: FastDomNode<HTMLElement>;
-	private readonly _linesCollection: RenderedLinesCollection<T>;
+	public readonly domNode: FastDomNode<HTMLElement> = this._createDomNode();
+	private readonly _linesCollection: RenderedLinesCollection<T> = new RenderedLinesCollection<T>(this._lineFactory);
 
-	constructor(host: IVisibleLinesHost<T>) {
-		this._host = host;
-		this.domNode = this._createDomNode();
-		this._linesCollection = new RenderedLinesCollection<T>(() => this._host.createVisibleLine());
+	constructor(
+		private readonly _lineFactory: ILineFactory<T>
+	) {
 	}
 
 	private _createDomNode(): FastDomNode<HTMLElement> {
@@ -345,7 +343,7 @@ export class VisibleLinesCollection<T extends IVisibleLine> {
 
 		const inp = this._linesCollection._get();
 
-		const renderer = new ViewLayerRenderer<T>(this.domNode.domNode, this._host, viewportData);
+		const renderer = new ViewLayerRenderer<T>(this.domNode.domNode, this._lineFactory, viewportData);
 
 		const ctx: IRendererContext<T> = {
 			rendLineNumberStart: inp.rendLineNumberStart,
@@ -370,14 +368,11 @@ class ViewLayerRenderer<T extends IVisibleLine> {
 
 	private static _ttPolicy = createTrustedTypesPolicy('editorViewLayer', { createHTML: value => value });
 
-	readonly domNode: HTMLElement;
-	readonly host: IVisibleLinesHost<T>;
-	readonly viewportData: ViewportData;
-
-	constructor(domNode: HTMLElement, host: IVisibleLinesHost<T>, viewportData: ViewportData) {
-		this.domNode = domNode;
-		this.host = host;
-		this.viewportData = viewportData;
+	constructor(
+		private readonly _domNode: HTMLElement,
+		private readonly _lineFactory: ILineFactory<T>,
+		private readonly _viewportData: ViewportData,
+	) {
 	}
 
 	public render(inContext: IRendererContext<T>, startLineNumber: number, stopLineNumber: number, deltaTop: number[]): IRendererContext<T> {
@@ -394,7 +389,7 @@ class ViewLayerRenderer<T extends IVisibleLine> {
 			ctx.linesLength = stopLineNumber - startLineNumber + 1;
 			ctx.lines = [];
 			for (let x = startLineNumber; x <= stopLineNumber; x++) {
-				ctx.lines[x - startLineNumber] = this.host.createVisibleLine();
+				ctx.lines[x - startLineNumber] = this._lineFactory.createLine();
 			}
 			this._finishRendering(ctx, true, deltaTop);
 			return ctx;
@@ -461,7 +456,7 @@ class ViewLayerRenderer<T extends IVisibleLine> {
 
 		for (let i = startIndex; i <= endIndex; i++) {
 			const lineNumber = rendLineNumberStart + i;
-			lines[i].layoutLine(lineNumber, deltaTop[lineNumber - deltaLN], this.viewportData.lineHeight);
+			lines[i].layoutLine(lineNumber, deltaTop[lineNumber - deltaLN], this._viewportData.lineHeight);
 		}
 	}
 
@@ -469,7 +464,7 @@ class ViewLayerRenderer<T extends IVisibleLine> {
 		const newLines: T[] = [];
 		let newLinesLen = 0;
 		for (let lineNumber = fromLineNumber; lineNumber <= toLineNumber; lineNumber++) {
-			newLines[newLinesLen++] = this.host.createVisibleLine();
+			newLines[newLinesLen++] = this._lineFactory.createLine();
 		}
 		ctx.lines = newLines.concat(ctx.lines);
 	}
@@ -486,7 +481,7 @@ class ViewLayerRenderer<T extends IVisibleLine> {
 		const newLines: T[] = [];
 		let newLinesLen = 0;
 		for (let lineNumber = fromLineNumber; lineNumber <= toLineNumber; lineNumber++) {
-			newLines[newLinesLen++] = this.host.createVisibleLine();
+			newLines[newLinesLen++] = this._lineFactory.createLine();
 		}
 		ctx.lines = ctx.lines.concat(newLines);
 	}
@@ -505,14 +500,14 @@ class ViewLayerRenderer<T extends IVisibleLine> {
 		if (ViewLayerRenderer._ttPolicy) {
 			newLinesHTML = ViewLayerRenderer._ttPolicy.createHTML(newLinesHTML as string);
 		}
-		const lastChild = <HTMLElement>this.domNode.lastChild;
+		const lastChild = <HTMLElement>this._domNode.lastChild;
 		if (domNodeIsEmpty || !lastChild) {
-			this.domNode.innerHTML = newLinesHTML as string; // explains the ugly casts -> https://github.com/microsoft/vscode/issues/106396#issuecomment-692625393;
+			this._domNode.innerHTML = newLinesHTML as string; // explains the ugly casts -> https://github.com/microsoft/vscode/issues/106396#issuecomment-692625393;
 		} else {
 			lastChild.insertAdjacentHTML('afterend', newLinesHTML as string);
 		}
 
-		let currChild = <HTMLElement>this.domNode.lastChild;
+		let currChild = <HTMLElement>this._domNode.lastChild;
 		for (let i = ctx.linesLength - 1; i >= 0; i--) {
 			const line = ctx.lines[i];
 			if (wasNew[i]) {
@@ -565,7 +560,7 @@ class ViewLayerRenderer<T extends IVisibleLine> {
 					continue;
 				}
 
-				const renderResult = line.renderLine(i + rendLineNumberStart, deltaTop[i], this.viewportData.lineHeight, this.viewportData, sb);
+				const renderResult = line.renderLine(i + rendLineNumberStart, deltaTop[i], this._viewportData.lineHeight, this._viewportData, sb);
 				if (!renderResult) {
 					// line does not need rendering
 					continue;
@@ -595,7 +590,7 @@ class ViewLayerRenderer<T extends IVisibleLine> {
 					continue;
 				}
 
-				const renderResult = line.renderLine(i + rendLineNumberStart, deltaTop[i], this.viewportData.lineHeight, this.viewportData, sb);
+				const renderResult = line.renderLine(i + rendLineNumberStart, deltaTop[i], this._viewportData.lineHeight, this._viewportData, sb);
 				if (!renderResult) {
 					// line does not need rendering
 					continue;
diff --git a/src/vs/editor/browser/view/viewOverlays.ts b/src/vs/editor/browser/view/viewOverlays.ts
index 1041fd58a58..6b8e10f341c 100644
--- a/src/vs/editor/browser/view/viewOverlays.ts
+++ b/src/vs/editor/browser/view/viewOverlays.ts
@@ -3,38 +3,36 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
-import { applyFontInfo } from 'vs/editor/browser/config/domFontInfo';
-import { DynamicViewOverlay } from 'vs/editor/browser/view/dynamicViewOverlay';
-import { IVisibleLine, IVisibleLinesHost, VisibleLinesCollection } from 'vs/editor/browser/view/viewLayer';
-import { ViewPart } from 'vs/editor/browser/view/viewPart';
-import { StringBuilder } from 'vs/editor/common/core/stringBuilder';
-import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/browser/view/renderingContext';
-import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
-import * as viewEvents from 'vs/editor/common/viewEvents';
-import { ViewportData } from 'vs/editor/common/viewLayout/viewLinesViewportData';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-
-export class ViewOverlays extends ViewPart implements IVisibleLinesHost<ViewOverlayLine> {
+import { FastDomNode, createFastDomNode } from '../../../base/browser/fastDomNode.js';
+import { applyFontInfo } from '../config/domFontInfo.js';
+import { DynamicViewOverlay } from './dynamicViewOverlay.js';
+import { IVisibleLine, VisibleLinesCollection } from './viewLayer.js';
+import { ViewPart } from './viewPart.js';
+import { StringBuilder } from '../../common/core/stringBuilder.js';
+import { RenderingContext, RestrictedRenderingContext } from './renderingContext.js';
+import { ViewContext } from '../../common/viewModel/viewContext.js';
+import * as viewEvents from '../../common/viewEvents.js';
+import { ViewportData } from '../../common/viewLayout/viewLinesViewportData.js';
+import { EditorOption } from '../../common/config/editorOptions.js';
 
+export class ViewOverlays extends ViewPart {
 	private readonly _visibleLines: VisibleLinesCollection<ViewOverlayLine>;
 	protected readonly domNode: FastDomNode<HTMLElement>;
-	private _dynamicOverlays: DynamicViewOverlay[];
-	private _isFocused: boolean;
+	private _dynamicOverlays: DynamicViewOverlay[] = [];
+	private _isFocused: boolean = false;
 
 	constructor(context: ViewContext) {
 		super(context);
 
-		this._visibleLines = new VisibleLinesCollection<ViewOverlayLine>(this);
+		this._visibleLines = new VisibleLinesCollection({
+			createLine: () => new ViewOverlayLine(this._dynamicOverlays)
+		});
 		this.domNode = this._visibleLines.domNode;
 
 		const options = this._context.configuration.options;
 		const fontInfo = options.get(EditorOption.fontInfo);
 		applyFontInfo(this.domNode, fontInfo);
 
-		this._dynamicOverlays = [];
-		this._isFocused = false;
-
 		this.domNode.setClassName('view-overlays');
 	}
 
@@ -67,14 +65,6 @@ export class ViewOverlays extends ViewPart implements IVisibleLinesHost<ViewOver
 		return this.domNode;
 	}
 
-	// ---- begin IVisibleLinesHost
-
-	public createVisibleLine(): ViewOverlayLine {
-		return new ViewOverlayLine(this._dynamicOverlays);
-	}
-
-	// ---- end IVisibleLinesHost
-
 	public addDynamicOverlay(overlay: DynamicViewOverlay): void {
 		this._dynamicOverlays.push(overlay);
 	}
diff --git a/src/vs/editor/browser/view/viewPart.ts b/src/vs/editor/browser/view/viewPart.ts
index 8ae1a965ecf..78467eb2e23 100644
--- a/src/vs/editor/browser/view/viewPart.ts
+++ b/src/vs/editor/browser/view/viewPart.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { FastDomNode } from 'vs/base/browser/fastDomNode';
-import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/browser/view/renderingContext';
-import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
-import { ViewEventHandler } from 'vs/editor/common/viewEventHandler';
+import { FastDomNode } from '../../../base/browser/fastDomNode.js';
+import { RenderingContext, RestrictedRenderingContext } from './renderingContext.js';
+import { ViewContext } from '../../common/viewModel/viewContext.js';
+import { ViewEventHandler } from '../../common/viewEventHandler.js';
 
 export abstract class ViewPart extends ViewEventHandler {
 
diff --git a/src/vs/editor/browser/view/viewUserInputEvents.ts b/src/vs/editor/browser/view/viewUserInputEvents.ts
index 3cd22d6315d..8a8bf0aa8ff 100644
--- a/src/vs/editor/browser/view/viewUserInputEvents.ts
+++ b/src/vs/editor/browser/view/viewUserInputEvents.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { IEditorMouseEvent, IMouseTarget, IMouseTargetViewZoneData, IPartialEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
-import { ICoordinatesConverter } from 'vs/editor/common/viewModel';
-import { IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
-import { Position } from 'vs/editor/common/core/position';
+import { IKeyboardEvent } from '../../../base/browser/keyboardEvent.js';
+import { IEditorMouseEvent, IMouseTarget, IMouseTargetViewZoneData, IPartialEditorMouseEvent, MouseTargetType } from '../editorBrowser.js';
+import { ICoordinatesConverter } from '../../common/viewModel.js';
+import { IMouseWheelEvent } from '../../../base/browser/mouseEvent.js';
+import { Position } from '../../common/core/position.js';
 
 export interface EventCallback<T> {
 	(event: T): void;
diff --git a/src/vs/editor/browser/viewParts/blockDecorations/blockDecorations.ts b/src/vs/editor/browser/viewParts/blockDecorations/blockDecorations.ts
index 49d18e74873..70fe366c06c 100644
--- a/src/vs/editor/browser/viewParts/blockDecorations/blockDecorations.ts
+++ b/src/vs/editor/browser/viewParts/blockDecorations/blockDecorations.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createFastDomNode, FastDomNode } from 'vs/base/browser/fastDomNode';
-import 'vs/css!./blockDecorations';
-import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/browser/view/renderingContext';
-import { ViewPart } from 'vs/editor/browser/view/viewPart';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import * as viewEvents from 'vs/editor/common/viewEvents';
-import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
+import { createFastDomNode, FastDomNode } from '../../../../base/browser/fastDomNode.js';
+import './blockDecorations.css';
+import { RenderingContext, RestrictedRenderingContext } from '../../view/renderingContext.js';
+import { ViewPart } from '../../view/viewPart.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import * as viewEvents from '../../../common/viewEvents.js';
+import { ViewContext } from '../../../common/viewModel/viewContext.js';
 
 export class BlockDecorations extends ViewPart {
 
diff --git a/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts b/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts
index bdf8eb77d21..be7bd39b7f9 100644
--- a/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts
+++ b/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts
@@ -3,20 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
-import { ContentWidgetPositionPreference, IContentWidget } from 'vs/editor/browser/editorBrowser';
-import { PartFingerprint, PartFingerprints, ViewPart } from 'vs/editor/browser/view/viewPart';
-import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/browser/view/renderingContext';
-import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
-import * as viewEvents from 'vs/editor/common/viewEvents';
-import { ViewportData } from 'vs/editor/common/viewLayout/viewLinesViewportData';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { IDimension } from 'vs/editor/common/core/dimension';
-import { PositionAffinity } from 'vs/editor/common/model';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { IViewModel } from 'vs/editor/common/viewModel';
+import * as dom from '../../../../base/browser/dom.js';
+import { FastDomNode, createFastDomNode } from '../../../../base/browser/fastDomNode.js';
+import { ContentWidgetPositionPreference, IContentWidget } from '../../editorBrowser.js';
+import { PartFingerprint, PartFingerprints, ViewPart } from '../../view/viewPart.js';
+import { RenderingContext, RestrictedRenderingContext } from '../../view/renderingContext.js';
+import { ViewContext } from '../../../common/viewModel/viewContext.js';
+import * as viewEvents from '../../../common/viewEvents.js';
+import { ViewportData } from '../../../common/viewLayout/viewLinesViewportData.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { IDimension } from '../../../common/core/dimension.js';
+import { PositionAffinity } from '../../../common/model.js';
+import { IPosition, Position } from '../../../common/core/position.js';
+import { IViewModel } from '../../../common/viewModel.js';
 
+/**
+ * This view part is responsible for rendering the content widgets, which are
+ * used for rendering elements that are associated to an editor position,
+ * such as suggestions or the parameter hints.
+ */
 export class ViewContentWidgets extends ViewPart {
 
 	private readonly _viewDomNode: FastDomNode<HTMLElement>;
diff --git a/src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.ts b/src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.ts
index b35970ee373..8d627025769 100644
--- a/src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.ts
+++ b/src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./currentLineHighlight';
-import { DynamicViewOverlay } from 'vs/editor/browser/view/dynamicViewOverlay';
-import { editorLineHighlight, editorLineHighlightBorder } from 'vs/editor/common/core/editorColorRegistry';
-import { RenderingContext } from 'vs/editor/browser/view/renderingContext';
-import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
-import * as viewEvents from 'vs/editor/common/viewEvents';
-import * as arrays from 'vs/base/common/arrays';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { Selection } from 'vs/editor/common/core/selection';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { isHighContrast } from 'vs/platform/theme/common/theme';
-import { Position } from 'vs/editor/common/core/position';
+import './currentLineHighlight.css';
+import { DynamicViewOverlay } from '../../view/dynamicViewOverlay.js';
+import { editorLineHighlight, editorLineHighlightBorder } from '../../../common/core/editorColorRegistry.js';
+import { RenderingContext } from '../../view/renderingContext.js';
+import { ViewContext } from '../../../common/viewModel/viewContext.js';
+import * as viewEvents from '../../../common/viewEvents.js';
+import * as arrays from '../../../../base/common/arrays.js';
+import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
+import { Selection } from '../../../common/core/selection.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { isHighContrast } from '../../../../platform/theme/common/theme.js';
+import { Position } from '../../../common/core/position.js';
 
 export abstract class AbstractLineHighlightOverlay extends DynamicViewOverlay {
 	private readonly _context: ViewContext;
@@ -201,6 +201,9 @@ export abstract class AbstractLineHighlightOverlay extends DynamicViewOverlay {
 	protected abstract _renderOne(ctx: RenderingContext, exact: boolean): string;
 }
 
+/**
+ * Emphasizes the current line by drawing a border around it.
+ */
 export class CurrentLineHighlightOverlay extends AbstractLineHighlightOverlay {
 
 	protected _renderOne(ctx: RenderingContext, exact: boolean): string {
@@ -215,6 +218,9 @@ export class CurrentLineHighlightOverlay extends AbstractLineHighlightOverlay {
 	}
 }
 
+/**
+ * Emphasizes the current line margin/gutter by drawing a border around it.
+ */
 export class CurrentLineMarginHighlightOverlay extends AbstractLineHighlightOverlay {
 	protected _renderOne(ctx: RenderingContext, exact: boolean): string {
 		const className = 'current-line' + (this._shouldRenderInMargin() ? ' current-line-margin' : '') + (this._shouldRenderOther() ? ' current-line-margin-both' : '') + (this._shouldRenderInMargin() && exact ? ' current-line-exact-margin' : '');
diff --git a/src/vs/editor/browser/viewParts/decorations/decorations.ts b/src/vs/editor/browser/viewParts/decorations/decorations.ts
index a3baa510464..6ae2287ccfc 100644
--- a/src/vs/editor/browser/viewParts/decorations/decorations.ts
+++ b/src/vs/editor/browser/viewParts/decorations/decorations.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./decorations';
-import { DynamicViewOverlay } from 'vs/editor/browser/view/dynamicViewOverlay';
-import { HorizontalRange, RenderingContext } from 'vs/editor/browser/view/renderingContext';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Range } from 'vs/editor/common/core/range';
-import * as viewEvents from 'vs/editor/common/viewEvents';
-import { ViewModelDecoration } from 'vs/editor/common/viewModel';
-import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
+import './decorations.css';
+import { DynamicViewOverlay } from '../../view/dynamicViewOverlay.js';
+import { HorizontalRange, RenderingContext } from '../../view/renderingContext.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { Range } from '../../../common/core/range.js';
+import * as viewEvents from '../../../common/viewEvents.js';
+import { ViewModelDecoration } from '../../../common/viewModel.js';
+import { ViewContext } from '../../../common/viewModel/viewContext.js';
 
 export class DecorationsOverlay extends DynamicViewOverlay {
 
diff --git a/src/vs/editor/browser/viewParts/editorScrollbar/editorScrollbar.ts b/src/vs/editor/browser/viewParts/editorScrollbar/editorScrollbar.ts
index 6bd21420b1d..0e0f9413ab0 100644
--- a/src/vs/editor/browser/viewParts/editorScrollbar/editorScrollbar.ts
+++ b/src/vs/editor/browser/viewParts/editorScrollbar/editorScrollbar.ts
@@ -3,19 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
-import { IOverviewRulerLayoutInfo, SmoothScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
-import { ScrollableElementChangeOptions, ScrollableElementCreationOptions } from 'vs/base/browser/ui/scrollbar/scrollableElementOptions';
-import { PartFingerprint, PartFingerprints, ViewPart } from 'vs/editor/browser/view/viewPart';
-import { INewScrollPosition, ScrollType } from 'vs/editor/common/editorCommon';
-import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/browser/view/renderingContext';
-import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
-import * as viewEvents from 'vs/editor/common/viewEvents';
-import { getThemeTypeSelector } from 'vs/platform/theme/common/themeService';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
+import * as dom from '../../../../base/browser/dom.js';
+import { FastDomNode, createFastDomNode } from '../../../../base/browser/fastDomNode.js';
+import { IOverviewRulerLayoutInfo, SmoothScrollableElement } from '../../../../base/browser/ui/scrollbar/scrollableElement.js';
+import { ScrollableElementChangeOptions, ScrollableElementCreationOptions } from '../../../../base/browser/ui/scrollbar/scrollableElementOptions.js';
+import { PartFingerprint, PartFingerprints, ViewPart } from '../../view/viewPart.js';
+import { INewScrollPosition, ScrollType } from '../../../common/editorCommon.js';
+import { RenderingContext, RestrictedRenderingContext } from '../../view/renderingContext.js';
+import { ViewContext } from '../../../common/viewModel/viewContext.js';
+import * as viewEvents from '../../../common/viewEvents.js';
+import { getThemeTypeSelector } from '../../../../platform/theme/common/themeService.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { IMouseWheelEvent } from '../../../../base/browser/mouseEvent.js';
 
+/**
+ * The editor scrollbar built on VS Code's scrollable element that sits beside
+ * the minimap.
+ */
 export class EditorScrollbar extends ViewPart {
 
 	private readonly scrollbar: SmoothScrollableElement;
diff --git a/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts b/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts
index 164b2299b75..c1234141862 100644
--- a/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts
+++ b/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
-import { ArrayQueue } from 'vs/base/common/arrays';
-import 'vs/css!./glyphMargin';
-import { IGlyphMarginWidget, IGlyphMarginWidgetPosition } from 'vs/editor/browser/editorBrowser';
-import { DynamicViewOverlay } from 'vs/editor/browser/view/dynamicViewOverlay';
-import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/browser/view/renderingContext';
-import { ViewPart } from 'vs/editor/browser/view/viewPart';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { GlyphMarginLane } from 'vs/editor/common/model';
-import * as viewEvents from 'vs/editor/common/viewEvents';
-import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
+import { FastDomNode, createFastDomNode } from '../../../../base/browser/fastDomNode.js';
+import { ArrayQueue } from '../../../../base/common/arrays.js';
+import './glyphMargin.css';
+import { IGlyphMarginWidget, IGlyphMarginWidgetPosition } from '../../editorBrowser.js';
+import { DynamicViewOverlay } from '../../view/dynamicViewOverlay.js';
+import { RenderingContext, RestrictedRenderingContext } from '../../view/renderingContext.js';
+import { ViewPart } from '../../view/viewPart.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { GlyphMarginLane } from '../../../common/model.js';
+import * as viewEvents from '../../../common/viewEvents.js';
+import { ViewContext } from '../../../common/viewModel/viewContext.js';
 
 /**
  * Represents a decoration that should be shown along the lines from `startLineNumber` to `endLineNumber`.
diff --git a/src/vs/editor/browser/viewParts/indentGuides/indentGuides.ts b/src/vs/editor/browser/viewParts/indentGuides/indentGuides.ts
index 50b0b2b8661..a140386e6ca 100644
--- a/src/vs/editor/browser/viewParts/indentGuides/indentGuides.ts
+++ b/src/vs/editor/browser/viewParts/indentGuides/indentGuides.ts
@@ -3,21 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./indentGuides';
-import { DynamicViewOverlay } from 'vs/editor/browser/view/dynamicViewOverlay';
-import { editorBracketHighlightingForeground1, editorBracketHighlightingForeground2, editorBracketHighlightingForeground3, editorBracketHighlightingForeground4, editorBracketHighlightingForeground5, editorBracketHighlightingForeground6, editorBracketPairGuideActiveBackground1, editorBracketPairGuideActiveBackground2, editorBracketPairGuideActiveBackground3, editorBracketPairGuideActiveBackground4, editorBracketPairGuideActiveBackground5, editorBracketPairGuideActiveBackground6, editorBracketPairGuideBackground1, editorBracketPairGuideBackground2, editorBracketPairGuideBackground3, editorBracketPairGuideBackground4, editorBracketPairGuideBackground5, editorBracketPairGuideBackground6, editorIndentGuide1, editorIndentGuide2, editorIndentGuide3, editorIndentGuide4, editorIndentGuide5, editorIndentGuide6, editorActiveIndentGuide1, editorActiveIndentGuide2, editorActiveIndentGuide3, editorActiveIndentGuide4, editorActiveIndentGuide5, editorActiveIndentGuide6 } from 'vs/editor/common/core/editorColorRegistry';
-import { RenderingContext } from 'vs/editor/browser/view/renderingContext';
-import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
-import * as viewEvents from 'vs/editor/common/viewEvents';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { EditorOption, InternalGuidesOptions } from 'vs/editor/common/config/editorOptions';
-import { Position } from 'vs/editor/common/core/position';
-import { ArrayQueue } from 'vs/base/common/arrays';
-import { Color } from 'vs/base/common/color';
-import { isDefined } from 'vs/base/common/types';
-import { BracketPairGuidesClassNames } from 'vs/editor/common/model/guidesTextModelPart';
-import { IndentGuide, HorizontalGuidesState } from 'vs/editor/common/textModelGuides';
+import './indentGuides.css';
+import { DynamicViewOverlay } from '../../view/dynamicViewOverlay.js';
+import { editorBracketHighlightingForeground1, editorBracketHighlightingForeground2, editorBracketHighlightingForeground3, editorBracketHighlightingForeground4, editorBracketHighlightingForeground5, editorBracketHighlightingForeground6, editorBracketPairGuideActiveBackground1, editorBracketPairGuideActiveBackground2, editorBracketPairGuideActiveBackground3, editorBracketPairGuideActiveBackground4, editorBracketPairGuideActiveBackground5, editorBracketPairGuideActiveBackground6, editorBracketPairGuideBackground1, editorBracketPairGuideBackground2, editorBracketPairGuideBackground3, editorBracketPairGuideBackground4, editorBracketPairGuideBackground5, editorBracketPairGuideBackground6, editorIndentGuide1, editorIndentGuide2, editorIndentGuide3, editorIndentGuide4, editorIndentGuide5, editorIndentGuide6, editorActiveIndentGuide1, editorActiveIndentGuide2, editorActiveIndentGuide3, editorActiveIndentGuide4, editorActiveIndentGuide5, editorActiveIndentGuide6 } from '../../../common/core/editorColorRegistry.js';
+import { RenderingContext } from '../../view/renderingContext.js';
+import { ViewContext } from '../../../common/viewModel/viewContext.js';
+import * as viewEvents from '../../../common/viewEvents.js';
+import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
+import { EditorOption, InternalGuidesOptions } from '../../../common/config/editorOptions.js';
+import { Position } from '../../../common/core/position.js';
+import { ArrayQueue } from '../../../../base/common/arrays.js';
+import { Color } from '../../../../base/common/color.js';
+import { isDefined } from '../../../../base/common/types.js';
+import { BracketPairGuidesClassNames } from '../../../common/model/guidesTextModelPart.js';
+import { IndentGuide, HorizontalGuidesState } from '../../../common/textModelGuides.js';
 
+/**
+ * Indent guides are vertical lines that help identify the indentation level of
+ * the code.
+ */
 export class IndentGuidesOverlay extends DynamicViewOverlay {
 
 	private readonly _context: ViewContext;
diff --git a/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts b/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts
index dcebb27994e..ee6461fd7f8 100644
--- a/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts
+++ b/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts
@@ -3,18 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./lineNumbers';
-import * as platform from 'vs/base/common/platform';
-import { DynamicViewOverlay } from 'vs/editor/browser/view/dynamicViewOverlay';
-import { RenderLineNumbersType, EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { RenderingContext } from 'vs/editor/browser/view/renderingContext';
-import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
-import * as viewEvents from 'vs/editor/common/viewEvents';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { editorDimmedLineNumber, editorLineNumbers } from 'vs/editor/common/core/editorColorRegistry';
+import './lineNumbers.css';
+import * as platform from '../../../../base/common/platform.js';
+import { DynamicViewOverlay } from '../../view/dynamicViewOverlay.js';
+import { RenderLineNumbersType, EditorOption } from '../../../common/config/editorOptions.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { RenderingContext } from '../../view/renderingContext.js';
+import { ViewContext } from '../../../common/viewModel/viewContext.js';
+import * as viewEvents from '../../../common/viewEvents.js';
+import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
+import { editorDimmedLineNumber, editorLineNumbers } from '../../../common/core/editorColorRegistry.js';
 
+/**
+ * Renders line numbers to the left of the main view lines content.
+ */
 export class LineNumbersOverlay extends DynamicViewOverlay {
 
 	public static readonly CLASS_NAME = 'line-numbers';
diff --git a/src/vs/editor/browser/viewParts/linesDecorations/linesDecorations.ts b/src/vs/editor/browser/viewParts/linesDecorations/linesDecorations.ts
index 9bbfeffae57..2c1b1e495f0 100644
--- a/src/vs/editor/browser/viewParts/linesDecorations/linesDecorations.ts
+++ b/src/vs/editor/browser/viewParts/linesDecorations/linesDecorations.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./linesDecorations';
-import { DecorationToRender, DedupOverlay } from 'vs/editor/browser/viewParts/glyphMargin/glyphMargin';
-import { RenderingContext } from 'vs/editor/browser/view/renderingContext';
-import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
-import * as viewEvents from 'vs/editor/common/viewEvents';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
+import './linesDecorations.css';
+import { DecorationToRender, DedupOverlay } from '../glyphMargin/glyphMargin.js';
+import { RenderingContext } from '../../view/renderingContext.js';
+import { ViewContext } from '../../../common/viewModel/viewContext.js';
+import * as viewEvents from '../../../common/viewEvents.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 
 
 export class LinesDecorationsOverlay extends DedupOverlay {
diff --git a/src/vs/editor/browser/viewParts/margin/margin.ts b/src/vs/editor/browser/viewParts/margin/margin.ts
index 5748c0564dd..cd4660c834d 100644
--- a/src/vs/editor/browser/viewParts/margin/margin.ts
+++ b/src/vs/editor/browser/viewParts/margin/margin.ts
@@ -3,15 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./margin';
-import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
-import { ViewPart } from 'vs/editor/browser/view/viewPart';
-import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/browser/view/renderingContext';
-import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
-import * as viewEvents from 'vs/editor/common/viewEvents';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-
+import './margin.css';
+import { FastDomNode, createFastDomNode } from '../../../../base/browser/fastDomNode.js';
+import { ViewPart } from '../../view/viewPart.js';
+import { RenderingContext, RestrictedRenderingContext } from '../../view/renderingContext.js';
+import { ViewContext } from '../../../common/viewModel/viewContext.js';
+import * as viewEvents from '../../../common/viewEvents.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 
+/**
+ * Margin is a vertical strip located on the left of the editor's content area.
+ * It is used for various features such as line numbers, folding markers, and
+ * decorations that provide additional information about the lines of code.
+ */
 export class Margin extends ViewPart {
 
 	public static readonly CLASS_NAME = 'glyph-margin';
diff --git a/src/vs/editor/browser/viewParts/marginDecorations/marginDecorations.ts b/src/vs/editor/browser/viewParts/marginDecorations/marginDecorations.ts
index f8f879cb50e..7b814dc89a5 100644
--- a/src/vs/editor/browser/viewParts/marginDecorations/marginDecorations.ts
+++ b/src/vs/editor/browser/viewParts/marginDecorations/marginDecorations.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./marginDecorations';
-import { DecorationToRender, DedupOverlay } from 'vs/editor/browser/viewParts/glyphMargin/glyphMargin';
-import { RenderingContext } from 'vs/editor/browser/view/renderingContext';
-import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
-import * as viewEvents from 'vs/editor/common/viewEvents';
+import './marginDecorations.css';
+import { DecorationToRender, DedupOverlay } from '../glyphMargin/glyphMargin.js';
+import { RenderingContext } from '../../view/renderingContext.js';
+import { ViewContext } from '../../../common/viewModel/viewContext.js';
+import * as viewEvents from '../../../common/viewEvents.js';
 
 export class MarginViewLineDecorationsOverlay extends DedupOverlay {
 	private readonly _context: ViewContext;
diff --git a/src/vs/editor/browser/viewParts/minimap/minimap.ts b/src/vs/editor/browser/viewParts/minimap/minimap.ts
index 7b49f5b0dea..a54d780d996 100644
--- a/src/vs/editor/browser/viewParts/minimap/minimap.ts
+++ b/src/vs/editor/browser/viewParts/minimap/minimap.ts
@@ -3,40 +3,40 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./minimap';
-import * as dom from 'vs/base/browser/dom';
-import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
-import { GlobalPointerMoveMonitor } from 'vs/base/browser/globalPointerMoveMonitor';
-import { CharCode } from 'vs/base/common/charCode';
-import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
-import * as platform from 'vs/base/common/platform';
-import * as strings from 'vs/base/common/strings';
-import { ILine, RenderedLinesCollection } from 'vs/editor/browser/view/viewLayer';
-import { PartFingerprint, PartFingerprints, ViewPart } from 'vs/editor/browser/view/viewPart';
-import { RenderMinimap, EditorOption, MINIMAP_GUTTER_WIDTH, EditorLayoutInfoComputer } from 'vs/editor/common/config/editorOptions';
-import { Range } from 'vs/editor/common/core/range';
-import { RGBA8 } from 'vs/editor/common/core/rgba';
-import { ScrollType } from 'vs/editor/common/editorCommon';
-import { IEditorConfiguration } from 'vs/editor/common/config/editorConfiguration';
-import { ColorId } from 'vs/editor/common/encodedTokenAttributes';
-import { MinimapCharRenderer } from 'vs/editor/browser/viewParts/minimap/minimapCharRenderer';
-import { Constants } from 'vs/editor/browser/viewParts/minimap/minimapCharSheet';
-import { MinimapTokensColorTracker } from 'vs/editor/common/viewModel/minimapTokensColorTracker';
-import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/browser/view/renderingContext';
-import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
-import { EditorTheme } from 'vs/editor/common/editorTheme';
-import * as viewEvents from 'vs/editor/common/viewEvents';
-import { ViewLineData, ViewModelDecoration } from 'vs/editor/common/viewModel';
-import { minimapSelection, minimapBackground, minimapForegroundOpacity, editorForeground } from 'vs/platform/theme/common/colorRegistry';
-import { ModelDecorationMinimapOptions } from 'vs/editor/common/model/textModel';
-import { Selection } from 'vs/editor/common/core/selection';
-import { Color } from 'vs/base/common/color';
-import { GestureEvent, EventType, Gesture } from 'vs/base/browser/touch';
-import { MinimapCharRendererFactory } from 'vs/editor/browser/viewParts/minimap/minimapCharRendererFactory';
-import { MinimapPosition, MinimapSectionHeaderStyle, TextModelResolvedOptions } from 'vs/editor/common/model';
-import { createSingleCallFunction } from 'vs/base/common/functional';
-import { LRUCache } from 'vs/base/common/map';
-import { DEFAULT_FONT_FAMILY } from 'vs/base/browser/fonts';
+import './minimap.css';
+import * as dom from '../../../../base/browser/dom.js';
+import { FastDomNode, createFastDomNode } from '../../../../base/browser/fastDomNode.js';
+import { GlobalPointerMoveMonitor } from '../../../../base/browser/globalPointerMoveMonitor.js';
+import { CharCode } from '../../../../base/common/charCode.js';
+import { IDisposable, Disposable } from '../../../../base/common/lifecycle.js';
+import * as platform from '../../../../base/common/platform.js';
+import * as strings from '../../../../base/common/strings.js';
+import { ILine, RenderedLinesCollection } from '../../view/viewLayer.js';
+import { PartFingerprint, PartFingerprints, ViewPart } from '../../view/viewPart.js';
+import { RenderMinimap, EditorOption, MINIMAP_GUTTER_WIDTH, EditorLayoutInfoComputer } from '../../../common/config/editorOptions.js';
+import { Range } from '../../../common/core/range.js';
+import { RGBA8 } from '../../../common/core/rgba.js';
+import { ScrollType } from '../../../common/editorCommon.js';
+import { IEditorConfiguration } from '../../../common/config/editorConfiguration.js';
+import { ColorId } from '../../../common/encodedTokenAttributes.js';
+import { MinimapCharRenderer } from './minimapCharRenderer.js';
+import { Constants } from './minimapCharSheet.js';
+import { MinimapTokensColorTracker } from '../../../common/viewModel/minimapTokensColorTracker.js';
+import { RenderingContext, RestrictedRenderingContext } from '../../view/renderingContext.js';
+import { ViewContext } from '../../../common/viewModel/viewContext.js';
+import { EditorTheme } from '../../../common/editorTheme.js';
+import * as viewEvents from '../../../common/viewEvents.js';
+import { ViewLineData, ViewModelDecoration } from '../../../common/viewModel.js';
+import { minimapSelection, minimapBackground, minimapForegroundOpacity, editorForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import { ModelDecorationMinimapOptions } from '../../../common/model/textModel.js';
+import { Selection } from '../../../common/core/selection.js';
+import { Color } from '../../../../base/common/color.js';
+import { GestureEvent, EventType, Gesture } from '../../../../base/browser/touch.js';
+import { MinimapCharRendererFactory } from './minimapCharRendererFactory.js';
+import { MinimapPosition, MinimapSectionHeaderStyle, TextModelResolvedOptions } from '../../../common/model.js';
+import { createSingleCallFunction } from '../../../../base/common/functional.js';
+import { LRUCache } from '../../../../base/common/map.js';
+import { DEFAULT_FONT_FAMILY } from '../../../../base/browser/fonts.js';
 
 /**
  * The orthogonal distance to the slider at which dragging "resets". This implements "snapping"
@@ -445,9 +445,9 @@ class RenderData {
 	) {
 		this.renderedLayout = renderedLayout;
 		this._imageData = imageData;
-		this._renderedLines = new RenderedLinesCollection(
-			() => MinimapLine.INVALID
-		);
+		this._renderedLines = new RenderedLinesCollection({
+			createLine: () => MinimapLine.INVALID
+		});
 		this._renderedLines._set(renderedLayout.startLineNumber, lines);
 	}
 
@@ -803,6 +803,10 @@ class MinimapSamplingState {
 	}
 }
 
+/**
+ * The minimap appears beside the editor scroll bar and visualizes a zoomed out
+ * view of the file.
+ */
 export class Minimap extends ViewPart implements IMinimapModel {
 
 	public readonly tokensColorTracker: MinimapTokensColorTracker;
diff --git a/src/vs/editor/browser/viewParts/minimap/minimapCharRenderer.ts b/src/vs/editor/browser/viewParts/minimap/minimapCharRenderer.ts
index d9c20582f25..687ab96b521 100644
--- a/src/vs/editor/browser/viewParts/minimap/minimapCharRenderer.ts
+++ b/src/vs/editor/browser/viewParts/minimap/minimapCharRenderer.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { RGBA8 } from 'vs/editor/common/core/rgba';
-import { Constants, getCharIndex } from './minimapCharSheet';
-import { toUint8 } from 'vs/base/common/uint';
+import { RGBA8 } from '../../../common/core/rgba.js';
+import { Constants, getCharIndex } from './minimapCharSheet.js';
+import { toUint8 } from '../../../../base/common/uint.js';
 
 export class MinimapCharRenderer {
 	_minimapCharRendererBrand: void = undefined;
diff --git a/src/vs/editor/browser/viewParts/minimap/minimapCharRendererFactory.ts b/src/vs/editor/browser/viewParts/minimap/minimapCharRendererFactory.ts
index 7b0b9bfcd21..36846f1203b 100644
--- a/src/vs/editor/browser/viewParts/minimap/minimapCharRendererFactory.ts
+++ b/src/vs/editor/browser/viewParts/minimap/minimapCharRendererFactory.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { MinimapCharRenderer } from 'vs/editor/browser/viewParts/minimap/minimapCharRenderer';
-import { allCharCodes, Constants } from 'vs/editor/browser/viewParts/minimap/minimapCharSheet';
-import { prebakedMiniMaps } from 'vs/editor/browser/viewParts/minimap/minimapPreBaked';
-import { toUint8 } from 'vs/base/common/uint';
+import { MinimapCharRenderer } from './minimapCharRenderer.js';
+import { allCharCodes, Constants } from './minimapCharSheet.js';
+import { prebakedMiniMaps } from './minimapPreBaked.js';
+import { toUint8 } from '../../../../base/common/uint.js';
 
 /**
  * Creates character renderers. It takes a 'scale' that determines how large
diff --git a/src/vs/editor/browser/viewParts/minimap/minimapPreBaked.ts b/src/vs/editor/browser/viewParts/minimap/minimapPreBaked.ts
index 3679e8afad5..a9b5738be6d 100644
--- a/src/vs/editor/browser/viewParts/minimap/minimapPreBaked.ts
+++ b/src/vs/editor/browser/viewParts/minimap/minimapPreBaked.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createSingleCallFunction } from 'vs/base/common/functional';
+import { createSingleCallFunction } from '../../../../base/common/functional.js';
 
 const charTable: { [hex: string]: number } = {
 	'0': 0,
diff --git a/src/vs/editor/browser/viewParts/overlayWidgets/overlayWidgets.ts b/src/vs/editor/browser/viewParts/overlayWidgets/overlayWidgets.ts
index 5b3e86a042d..e34f35493d3 100644
--- a/src/vs/editor/browser/viewParts/overlayWidgets/overlayWidgets.ts
+++ b/src/vs/editor/browser/viewParts/overlayWidgets/overlayWidgets.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./overlayWidgets';
-import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
-import { IOverlayWidget, IOverlayWidgetPosition, IOverlayWidgetPositionCoordinates, OverlayWidgetPositionPreference } from 'vs/editor/browser/editorBrowser';
-import { PartFingerprint, PartFingerprints, ViewPart } from 'vs/editor/browser/view/viewPart';
-import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/browser/view/renderingContext';
-import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
-import * as viewEvents from 'vs/editor/common/viewEvents';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import * as dom from 'vs/base/browser/dom';
+import './overlayWidgets.css';
+import { FastDomNode, createFastDomNode } from '../../../../base/browser/fastDomNode.js';
+import { IOverlayWidget, IOverlayWidgetPosition, IOverlayWidgetPositionCoordinates, OverlayWidgetPositionPreference } from '../../editorBrowser.js';
+import { PartFingerprint, PartFingerprints, ViewPart } from '../../view/viewPart.js';
+import { RenderingContext, RestrictedRenderingContext } from '../../view/renderingContext.js';
+import { ViewContext } from '../../../common/viewModel/viewContext.js';
+import * as viewEvents from '../../../common/viewEvents.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import * as dom from '../../../../base/browser/dom.js';
 
 
 interface IWidgetData {
@@ -25,6 +25,11 @@ interface IWidgetMap {
 	[key: string]: IWidgetData;
 }
 
+/*
+ * This view part for rendering the overlay widgets, which are
+ * floating widgets positioned based on the editor's viewport,
+ * such as the find widget.
+ */
 export class ViewOverlayWidgets extends ViewPart {
 
 	private readonly _viewDomNode: FastDomNode<HTMLElement>;
diff --git a/src/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.ts b/src/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.ts
index 0ca31065a45..c494f6e2dfb 100644
--- a/src/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.ts
+++ b/src/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
-import { Color } from 'vs/base/common/color';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { ViewPart } from 'vs/editor/browser/view/viewPart';
-import { Position } from 'vs/editor/common/core/position';
-import { IEditorConfiguration } from 'vs/editor/common/config/editorConfiguration';
-import { TokenizationRegistry } from 'vs/editor/common/languages';
-import { editorCursorForeground, editorOverviewRulerBorder, editorOverviewRulerBackground, editorMultiCursorSecondaryForeground, editorMultiCursorPrimaryForeground } from 'vs/editor/common/core/editorColorRegistry';
-import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/browser/view/renderingContext';
-import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
-import { EditorTheme } from 'vs/editor/common/editorTheme';
-import * as viewEvents from 'vs/editor/common/viewEvents';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { OverviewRulerDecorationsGroup } from 'vs/editor/common/viewModel';
-import { equals } from 'vs/base/common/arrays';
+import { FastDomNode, createFastDomNode } from '../../../../base/browser/fastDomNode.js';
+import { Color } from '../../../../base/common/color.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { ViewPart } from '../../view/viewPart.js';
+import { Position } from '../../../common/core/position.js';
+import { IEditorConfiguration } from '../../../common/config/editorConfiguration.js';
+import { TokenizationRegistry } from '../../../common/languages.js';
+import { editorCursorForeground, editorOverviewRulerBorder, editorOverviewRulerBackground, editorMultiCursorSecondaryForeground, editorMultiCursorPrimaryForeground } from '../../../common/core/editorColorRegistry.js';
+import { RenderingContext, RestrictedRenderingContext } from '../../view/renderingContext.js';
+import { ViewContext } from '../../../common/viewModel/viewContext.js';
+import { EditorTheme } from '../../../common/editorTheme.js';
+import * as viewEvents from '../../../common/viewEvents.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { OverviewRulerDecorationsGroup } from '../../../common/viewModel.js';
+import { equals } from '../../../../base/common/arrays.js';
 
 class Settings {
 
@@ -512,9 +512,7 @@ export class DecorationsOverviewRuler extends ViewPart {
 			canvasCtx.strokeStyle = this._settings.borderColor;
 			canvasCtx.moveTo(0, 0);
 			canvasCtx.lineTo(0, canvasHeight);
-			canvasCtx.stroke();
-
-			canvasCtx.moveTo(0, 0);
+			canvasCtx.moveTo(1, 0);
 			canvasCtx.lineTo(canvasWidth, 0);
 			canvasCtx.stroke();
 		}
diff --git a/src/vs/editor/browser/viewParts/overviewRuler/overviewRuler.ts b/src/vs/editor/browser/viewParts/overviewRuler/overviewRuler.ts
index 78f3c94caae..11292eb56a1 100644
--- a/src/vs/editor/browser/viewParts/overviewRuler/overviewRuler.ts
+++ b/src/vs/editor/browser/viewParts/overviewRuler/overviewRuler.ts
@@ -3,14 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
-import { IOverviewRuler } from 'vs/editor/browser/editorBrowser';
-import { OverviewRulerPosition, EditorOption } from 'vs/editor/common/config/editorOptions';
-import { ColorZone, OverviewRulerZone, OverviewZoneManager } from 'vs/editor/common/viewModel/overviewZoneManager';
-import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
-import * as viewEvents from 'vs/editor/common/viewEvents';
-import { ViewEventHandler } from 'vs/editor/common/viewEventHandler';
+import { FastDomNode, createFastDomNode } from '../../../../base/browser/fastDomNode.js';
+import { IOverviewRuler } from '../../editorBrowser.js';
+import { OverviewRulerPosition, EditorOption } from '../../../common/config/editorOptions.js';
+import { ColorZone, OverviewRulerZone, OverviewZoneManager } from '../../../common/viewModel/overviewZoneManager.js';
+import { ViewContext } from '../../../common/viewModel/viewContext.js';
+import * as viewEvents from '../../../common/viewEvents.js';
+import { ViewEventHandler } from '../../../common/viewEventHandler.js';
 
+/**
+ * The overview ruler appears underneath the editor scroll bar and shows things
+ * like the cursor, various decorations, etc.
+ */
 export class OverviewRuler extends ViewEventHandler implements IOverviewRuler {
 
 	private readonly _context: ViewContext;
diff --git a/src/vs/editor/browser/viewParts/rulers/rulers.ts b/src/vs/editor/browser/viewParts/rulers/rulers.ts
index e924ed67d39..c0a46927d17 100644
--- a/src/vs/editor/browser/viewParts/rulers/rulers.ts
+++ b/src/vs/editor/browser/viewParts/rulers/rulers.ts
@@ -3,14 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./rulers';
-import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
-import { ViewPart } from 'vs/editor/browser/view/viewPart';
-import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/browser/view/renderingContext';
-import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
-import * as viewEvents from 'vs/editor/common/viewEvents';
-import { EditorOption, IRulerOption } from 'vs/editor/common/config/editorOptions';
+import './rulers.css';
+import { FastDomNode, createFastDomNode } from '../../../../base/browser/fastDomNode.js';
+import { ViewPart } from '../../view/viewPart.js';
+import { RenderingContext, RestrictedRenderingContext } from '../../view/renderingContext.js';
+import { ViewContext } from '../../../common/viewModel/viewContext.js';
+import * as viewEvents from '../../../common/viewEvents.js';
+import { EditorOption, IRulerOption } from '../../../common/config/editorOptions.js';
 
+/**
+ * Rulers are vertical lines that appear at certain columns in the editor. There can be >= 0 rulers
+ * at a time.
+ */
 export class Rulers extends ViewPart {
 
 	public domNode: FastDomNode<HTMLElement>;
diff --git a/src/vs/editor/browser/viewParts/rulersGpu/rulersGpu.ts b/src/vs/editor/browser/viewParts/rulersGpu/rulersGpu.ts
new file mode 100644
index 00000000000..8db2dc2823e
--- /dev/null
+++ b/src/vs/editor/browser/viewParts/rulersGpu/rulersGpu.ts
@@ -0,0 +1,80 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ViewPart } from '../../view/viewPart.js';
+import { RenderingContext, RestrictedRenderingContext } from '../../view/renderingContext.js';
+import { ViewContext } from '../../../common/viewModel/viewContext.js';
+import * as viewEvents from '../../../common/viewEvents.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import type { ViewGpuContext } from '../../gpu/viewGpuContext.js';
+import type { IObjectCollectionBufferEntry } from '../../gpu/objectCollectionBuffer.js';
+import type { RectangleRendererEntrySpec } from '../../gpu/rectangleRenderer.js';
+import { Color } from '../../../../base/common/color.js';
+import { editorRuler } from '../../../common/core/editorColorRegistry.js';
+import { autorun, type IReader } from '../../../../base/common/observable.js';
+
+/**
+ * Rulers are vertical lines that appear at certain columns in the editor. There can be >= 0 rulers
+ * at a time.
+ */
+export class RulersGpu extends ViewPart {
+
+	private readonly _gpuShapes: IObjectCollectionBufferEntry<RectangleRendererEntrySpec>[] = [];
+
+	constructor(
+		context: ViewContext,
+		private readonly _viewGpuContext: ViewGpuContext
+	) {
+		super(context);
+		this._register(autorun(reader => this._updateEntries(reader)));
+	}
+
+	// --- begin event handlers
+
+	public override onConfigurationChanged(e: viewEvents.ViewConfigurationChangedEvent): boolean {
+		this._updateEntries(undefined);
+		return true;
+	}
+
+	// --- end event handlers
+
+	public prepareRender(ctx: RenderingContext): void {
+		// Nothing to read
+	}
+
+	public render(ctx: RestrictedRenderingContext): void {
+		// Rendering is handled by RectangleRenderer
+	}
+
+	private _updateEntries(reader: IReader | undefined) {
+		const options = this._context.configuration.options;
+		const rulers = options.get(EditorOption.rulers);
+		const typicalHalfwidthCharacterWidth = options.get(EditorOption.fontInfo).typicalHalfwidthCharacterWidth;
+		const devicePixelRatio = this._viewGpuContext.devicePixelRatio.read(reader);
+		for (let i = 0, len = rulers.length; i < len; i++) {
+			const ruler = rulers[i];
+			const shape = this._gpuShapes[i];
+			const color = ruler.color ? Color.fromHex(ruler.color) : this._context.theme.getColor(editorRuler) ?? Color.white;
+			const rulerData = [
+				ruler.column * typicalHalfwidthCharacterWidth * devicePixelRatio,
+				0,
+				Math.max(1, Math.ceil(devicePixelRatio)),
+				Number.MAX_SAFE_INTEGER,
+				color.rgba.r / 255,
+				color.rgba.g / 255,
+				color.rgba.b / 255,
+				color.rgba.a,
+			] as const;
+			if (!shape) {
+				this._gpuShapes[i] = this._viewGpuContext.rectangleRenderer.register(...rulerData);
+			} else {
+				shape.setRaw(rulerData);
+			}
+		}
+		while (this._gpuShapes.length > rulers.length) {
+			this._gpuShapes.splice(-1, 1)[0].dispose();
+		}
+	}
+}
diff --git a/src/vs/editor/browser/viewParts/scrollDecoration/scrollDecoration.ts b/src/vs/editor/browser/viewParts/scrollDecoration/scrollDecoration.ts
index 1fc3347948b..71a9a7605c7 100644
--- a/src/vs/editor/browser/viewParts/scrollDecoration/scrollDecoration.ts
+++ b/src/vs/editor/browser/viewParts/scrollDecoration/scrollDecoration.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./scrollDecoration';
-import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
-import { ViewPart } from 'vs/editor/browser/view/viewPart';
-import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/browser/view/renderingContext';
-import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
-import * as viewEvents from 'vs/editor/common/viewEvents';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
+import './scrollDecoration.css';
+import { FastDomNode, createFastDomNode } from '../../../../base/browser/fastDomNode.js';
+import { ViewPart } from '../../view/viewPart.js';
+import { RenderingContext, RestrictedRenderingContext } from '../../view/renderingContext.js';
+import { ViewContext } from '../../../common/viewModel/viewContext.js';
+import * as viewEvents from '../../../common/viewEvents.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 
 
 export class ScrollDecorationViewPart extends ViewPart {
diff --git a/src/vs/editor/browser/viewParts/selections/selections.ts b/src/vs/editor/browser/viewParts/selections/selections.ts
index d53a5126e62..a882f80f4f1 100644
--- a/src/vs/editor/browser/viewParts/selections/selections.ts
+++ b/src/vs/editor/browser/viewParts/selections/selections.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./selections';
-import { DynamicViewOverlay } from 'vs/editor/browser/view/dynamicViewOverlay';
-import { Range } from 'vs/editor/common/core/range';
-import { HorizontalRange, LineVisibleRanges, RenderingContext } from 'vs/editor/browser/view/renderingContext';
-import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
-import * as viewEvents from 'vs/editor/common/viewEvents';
-import { editorSelectionForeground } from 'vs/platform/theme/common/colorRegistry';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
+import './selections.css';
+import { DynamicViewOverlay } from '../../view/dynamicViewOverlay.js';
+import { Range } from '../../../common/core/range.js';
+import { HorizontalRange, LineVisibleRanges, RenderingContext } from '../../view/renderingContext.js';
+import { ViewContext } from '../../../common/viewModel/viewContext.js';
+import * as viewEvents from '../../../common/viewEvents.js';
+import { editorSelectionForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 
 const enum CornerStyle {
 	EXTERN,
@@ -56,6 +56,9 @@ function toStyled(item: LineVisibleRanges): LineVisibleRangesWithStyle {
 	return new LineVisibleRangesWithStyle(item.lineNumber, item.ranges.map(toStyledRange));
 }
 
+/**
+ * This view part displays selected text to the user. Every line has its own selection overlay.
+ */
 export class SelectionsOverlay extends DynamicViewOverlay {
 
 	private static readonly SELECTION_CLASS_NAME = 'selected-text';
diff --git a/src/vs/editor/browser/viewParts/viewCursors/viewCursor.ts b/src/vs/editor/browser/viewParts/viewCursors/viewCursor.ts
index 4502698cfc5..b69180772cc 100644
--- a/src/vs/editor/browser/viewParts/viewCursors/viewCursor.ts
+++ b/src/vs/editor/browser/viewParts/viewCursors/viewCursor.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
-import * as strings from 'vs/base/common/strings';
-import { applyFontInfo } from 'vs/editor/browser/config/domFontInfo';
-import { TextEditorCursorStyle, EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/browser/view/renderingContext';
-import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
-import * as viewEvents from 'vs/editor/common/viewEvents';
-import { MOUSE_CURSOR_TEXT_CSS_CLASS_NAME } from 'vs/base/browser/ui/mouseCursor/mouseCursor';
+import * as dom from '../../../../base/browser/dom.js';
+import { FastDomNode, createFastDomNode } from '../../../../base/browser/fastDomNode.js';
+import * as strings from '../../../../base/common/strings.js';
+import { applyFontInfo } from '../../config/domFontInfo.js';
+import { TextEditorCursorStyle, EditorOption } from '../../../common/config/editorOptions.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { RenderingContext, RestrictedRenderingContext } from '../../view/renderingContext.js';
+import { ViewContext } from '../../../common/viewModel/viewContext.js';
+import * as viewEvents from '../../../common/viewEvents.js';
+import { MOUSE_CURSOR_TEXT_CSS_CLASS_NAME } from '../../../../base/browser/ui/mouseCursor/mouseCursor.js';
 
 export interface IViewCursorRenderData {
 	domNode: HTMLElement;
diff --git a/src/vs/editor/browser/viewParts/viewCursors/viewCursors.ts b/src/vs/editor/browser/viewParts/viewCursors/viewCursors.ts
index ceb27ce5ea3..fc8695d3e1f 100644
--- a/src/vs/editor/browser/viewParts/viewCursors/viewCursors.ts
+++ b/src/vs/editor/browser/viewParts/viewCursors/viewCursors.ts
@@ -3,26 +3,30 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./viewCursors';
-import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
-import { IntervalTimer, TimeoutTimer } from 'vs/base/common/async';
-import { ViewPart } from 'vs/editor/browser/view/viewPart';
-import { IViewCursorRenderData, ViewCursor, CursorPlurality } from 'vs/editor/browser/viewParts/viewCursors/viewCursor';
-import { TextEditorCursorBlinkingStyle, TextEditorCursorStyle, EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Position } from 'vs/editor/common/core/position';
+import './viewCursors.css';
+import { FastDomNode, createFastDomNode } from '../../../../base/browser/fastDomNode.js';
+import { IntervalTimer, TimeoutTimer } from '../../../../base/common/async.js';
+import { ViewPart } from '../../view/viewPart.js';
+import { IViewCursorRenderData, ViewCursor, CursorPlurality } from './viewCursor.js';
+import { TextEditorCursorBlinkingStyle, TextEditorCursorStyle, EditorOption } from '../../../common/config/editorOptions.js';
+import { Position } from '../../../common/core/position.js';
 import {
 	editorCursorBackground, editorCursorForeground,
 	editorMultiCursorPrimaryForeground, editorMultiCursorPrimaryBackground,
 	editorMultiCursorSecondaryForeground, editorMultiCursorSecondaryBackground
-} from 'vs/editor/common/core/editorColorRegistry';
-import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/browser/view/renderingContext';
-import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
-import * as viewEvents from 'vs/editor/common/viewEvents';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { isHighContrast } from 'vs/platform/theme/common/theme';
-import { CursorChangeReason } from 'vs/editor/common/cursorEvents';
-import { WindowIntervalTimer, getWindow } from 'vs/base/browser/dom';
+} from '../../../common/core/editorColorRegistry.js';
+import { RenderingContext, RestrictedRenderingContext } from '../../view/renderingContext.js';
+import { ViewContext } from '../../../common/viewModel/viewContext.js';
+import * as viewEvents from '../../../common/viewEvents.js';
+import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
+import { isHighContrast } from '../../../../platform/theme/common/theme.js';
+import { CursorChangeReason } from '../../../common/cursorEvents.js';
+import { WindowIntervalTimer, getWindow } from '../../../../base/browser/dom.js';
 
+/**
+ * View cursors is a view part responsible for rendering the primary cursor and
+ * any secondary cursors that are currently active.
+ */
 export class ViewCursors extends ViewPart {
 
 	static readonly BLINK_INTERVAL = 500;
@@ -31,6 +35,7 @@ export class ViewCursors extends ViewPart {
 	private _cursorBlinking: TextEditorCursorBlinkingStyle;
 	private _cursorStyle: TextEditorCursorStyle;
 	private _cursorSmoothCaretAnimation: 'off' | 'explicit' | 'on';
+	private _experimentalEditContextEnabled: boolean;
 	private _selectionIsEmpty: boolean;
 	private _isComposingInput: boolean;
 
@@ -56,6 +61,7 @@ export class ViewCursors extends ViewPart {
 		this._cursorBlinking = options.get(EditorOption.cursorBlinking);
 		this._cursorStyle = options.get(EditorOption.cursorStyle);
 		this._cursorSmoothCaretAnimation = options.get(EditorOption.cursorSmoothCaretAnimation);
+		this._experimentalEditContextEnabled = options.get(EditorOption.experimentalEditContextEnabled);
 		this._selectionIsEmpty = true;
 		this._isComposingInput = false;
 
@@ -110,6 +116,7 @@ export class ViewCursors extends ViewPart {
 		this._cursorBlinking = options.get(EditorOption.cursorBlinking);
 		this._cursorStyle = options.get(EditorOption.cursorStyle);
 		this._cursorSmoothCaretAnimation = options.get(EditorOption.cursorSmoothCaretAnimation);
+		this._experimentalEditContextEnabled = options.get(EditorOption.experimentalEditContextEnabled);
 
 		this._updateBlinking();
 		this._updateDomClassName();
@@ -218,7 +225,8 @@ export class ViewCursors extends ViewPart {
 	// ---- blinking logic
 
 	private _getCursorBlinking(): TextEditorCursorBlinkingStyle {
-		if (this._isComposingInput) {
+		// TODO: Remove the following if statement when experimental edit context is made default sole implementation
+		if (this._isComposingInput && !this._experimentalEditContextEnabled) {
 			// avoid double cursors
 			return TextEditorCursorBlinkingStyle.Hidden;
 		}
diff --git a/src/vs/editor/browser/viewParts/lines/domReadingContext.ts b/src/vs/editor/browser/viewParts/viewLines/domReadingContext.ts
similarity index 100%
rename from src/vs/editor/browser/viewParts/lines/domReadingContext.ts
rename to src/vs/editor/browser/viewParts/viewLines/domReadingContext.ts
diff --git a/src/vs/editor/browser/viewParts/lines/rangeUtil.ts b/src/vs/editor/browser/viewParts/viewLines/rangeUtil.ts
similarity index 96%
rename from src/vs/editor/browser/viewParts/lines/rangeUtil.ts
rename to src/vs/editor/browser/viewParts/viewLines/rangeUtil.ts
index fdb61a07f6c..3c0a4ba3964 100644
--- a/src/vs/editor/browser/viewParts/lines/rangeUtil.ts
+++ b/src/vs/editor/browser/viewParts/viewLines/rangeUtil.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Constants } from 'vs/base/common/uint';
-import { FloatHorizontalRange } from 'vs/editor/browser/view/renderingContext';
-import { DomReadingContext } from 'vs/editor/browser/viewParts/lines/domReadingContext';
+import { Constants } from '../../../../base/common/uint.js';
+import { FloatHorizontalRange } from '../../view/renderingContext.js';
+import { DomReadingContext } from './domReadingContext.js';
 
 export class RangeUtil {
 
diff --git a/src/vs/editor/browser/viewParts/lines/viewLine.ts b/src/vs/editor/browser/viewParts/viewLines/viewLine.ts
similarity index 87%
rename from src/vs/editor/browser/viewParts/lines/viewLine.ts
rename to src/vs/editor/browser/viewParts/viewLines/viewLine.ts
index 9a5d2f556bf..5e555246cea 100644
--- a/src/vs/editor/browser/viewParts/lines/viewLine.ts
+++ b/src/vs/editor/browser/viewParts/viewLines/viewLine.ts
@@ -3,21 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as browser from 'vs/base/browser/browser';
-import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
-import * as platform from 'vs/base/common/platform';
-import { IVisibleLine } from 'vs/editor/browser/view/viewLayer';
-import { RangeUtil } from 'vs/editor/browser/viewParts/lines/rangeUtil';
-import { StringBuilder } from 'vs/editor/common/core/stringBuilder';
-import { IEditorConfiguration } from 'vs/editor/common/config/editorConfiguration';
-import { FloatHorizontalRange, VisibleRanges } from 'vs/editor/browser/view/renderingContext';
-import { LineDecoration } from 'vs/editor/common/viewLayout/lineDecorations';
-import { CharacterMapping, ForeignElementType, RenderLineInput, renderViewLine, LineRange, DomPosition } from 'vs/editor/common/viewLayout/viewLineRenderer';
-import { ViewportData } from 'vs/editor/common/viewLayout/viewLinesViewportData';
-import { InlineDecorationType } from 'vs/editor/common/viewModel';
-import { ColorScheme, isHighContrast } from 'vs/platform/theme/common/theme';
-import { EditorOption, EditorFontLigatures } from 'vs/editor/common/config/editorOptions';
-import { DomReadingContext } from 'vs/editor/browser/viewParts/lines/domReadingContext';
+import * as browser from '../../../../base/browser/browser.js';
+import { FastDomNode, createFastDomNode } from '../../../../base/browser/fastDomNode.js';
+import * as platform from '../../../../base/common/platform.js';
+import { IVisibleLine } from '../../view/viewLayer.js';
+import { RangeUtil } from './rangeUtil.js';
+import { StringBuilder } from '../../../common/core/stringBuilder.js';
+import { FloatHorizontalRange, VisibleRanges } from '../../view/renderingContext.js';
+import { LineDecoration } from '../../../common/viewLayout/lineDecorations.js';
+import { CharacterMapping, ForeignElementType, RenderLineInput, renderViewLine, LineRange, DomPosition } from '../../../common/viewLayout/viewLineRenderer.js';
+import { ViewportData } from '../../../common/viewLayout/viewLinesViewportData.js';
+import { InlineDecorationType } from '../../../common/viewModel.js';
+import { isHighContrast } from '../../../../platform/theme/common/theme.js';
+import { EditorFontLigatures } from '../../../common/config/editorOptions.js';
+import { DomReadingContext } from './domReadingContext.js';
+import type { ViewLineOptions } from './viewLineOptions.js';
+import { ViewGpuContext } from '../../gpu/viewGpuContext.js';
 
 const canUseFastRenderedViewLine = (function () {
 	if (platform.isNative) {
@@ -45,61 +46,6 @@ const canUseFastRenderedViewLine = (function () {
 
 let monospaceAssumptionsAreValid = true;
 
-export class ViewLineOptions {
-	public readonly themeType: ColorScheme;
-	public readonly renderWhitespace: 'none' | 'boundary' | 'selection' | 'trailing' | 'all';
-	public readonly renderControlCharacters: boolean;
-	public readonly spaceWidth: number;
-	public readonly middotWidth: number;
-	public readonly wsmiddotWidth: number;
-	public readonly useMonospaceOptimizations: boolean;
-	public readonly canUseHalfwidthRightwardsArrow: boolean;
-	public readonly lineHeight: number;
-	public readonly stopRenderingLineAfter: number;
-	public readonly fontLigatures: string;
-
-	constructor(config: IEditorConfiguration, themeType: ColorScheme) {
-		this.themeType = themeType;
-		const options = config.options;
-		const fontInfo = options.get(EditorOption.fontInfo);
-		const experimentalWhitespaceRendering = options.get(EditorOption.experimentalWhitespaceRendering);
-		if (experimentalWhitespaceRendering === 'off') {
-			this.renderWhitespace = options.get(EditorOption.renderWhitespace);
-		} else {
-			// whitespace is rendered in a different layer
-			this.renderWhitespace = 'none';
-		}
-		this.renderControlCharacters = options.get(EditorOption.renderControlCharacters);
-		this.spaceWidth = fontInfo.spaceWidth;
-		this.middotWidth = fontInfo.middotWidth;
-		this.wsmiddotWidth = fontInfo.wsmiddotWidth;
-		this.useMonospaceOptimizations = (
-			fontInfo.isMonospace
-			&& !options.get(EditorOption.disableMonospaceOptimizations)
-		);
-		this.canUseHalfwidthRightwardsArrow = fontInfo.canUseHalfwidthRightwardsArrow;
-		this.lineHeight = options.get(EditorOption.lineHeight);
-		this.stopRenderingLineAfter = options.get(EditorOption.stopRenderingLineAfter);
-		this.fontLigatures = options.get(EditorOption.fontLigatures);
-	}
-
-	public equals(other: ViewLineOptions): boolean {
-		return (
-			this.themeType === other.themeType
-			&& this.renderWhitespace === other.renderWhitespace
-			&& this.renderControlCharacters === other.renderControlCharacters
-			&& this.spaceWidth === other.spaceWidth
-			&& this.middotWidth === other.middotWidth
-			&& this.wsmiddotWidth === other.wsmiddotWidth
-			&& this.useMonospaceOptimizations === other.useMonospaceOptimizations
-			&& this.canUseHalfwidthRightwardsArrow === other.canUseHalfwidthRightwardsArrow
-			&& this.lineHeight === other.lineHeight
-			&& this.stopRenderingLineAfter === other.stopRenderingLineAfter
-			&& this.fontLigatures === other.fontLigatures
-		);
-	}
-}
-
 export class ViewLine implements IVisibleLine {
 
 	public static readonly CLASS_NAME = 'view-line';
@@ -152,6 +98,12 @@ export class ViewLine implements IVisibleLine {
 	}
 
 	public renderLine(lineNumber: number, deltaTop: number, lineHeight: number, viewportData: ViewportData, sb: StringBuilder): boolean {
+		if (this._options.useGpu && ViewGpuContext.canRender(this._options, viewportData, lineNumber)) {
+			this._renderedViewLine?.domNode?.domNode.remove();
+			this._renderedViewLine = null;
+			return false;
+		}
+
 		if (this._isMaybeInvalid === false) {
 			// it appears that nothing relevant has changed
 			return false;
diff --git a/src/vs/editor/browser/viewParts/viewLines/viewLineOptions.ts b/src/vs/editor/browser/viewParts/viewLines/viewLineOptions.ts
new file mode 100644
index 00000000000..c75ea1740fe
--- /dev/null
+++ b/src/vs/editor/browser/viewParts/viewLines/viewLineOptions.ts
@@ -0,0 +1,66 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import type { ColorScheme } from '../../../../platform/theme/common/theme.js';
+import type { IEditorConfiguration } from '../../../common/config/editorConfiguration.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+
+export class ViewLineOptions {
+	public readonly themeType: ColorScheme;
+	public readonly renderWhitespace: 'none' | 'boundary' | 'selection' | 'trailing' | 'all';
+	public readonly renderControlCharacters: boolean;
+	public readonly spaceWidth: number;
+	public readonly middotWidth: number;
+	public readonly wsmiddotWidth: number;
+	public readonly useMonospaceOptimizations: boolean;
+	public readonly canUseHalfwidthRightwardsArrow: boolean;
+	public readonly lineHeight: number;
+	public readonly stopRenderingLineAfter: number;
+	public readonly fontLigatures: string;
+	public readonly useGpu: boolean;
+
+	constructor(config: IEditorConfiguration, themeType: ColorScheme) {
+		this.themeType = themeType;
+		const options = config.options;
+		const fontInfo = options.get(EditorOption.fontInfo);
+		const experimentalWhitespaceRendering = options.get(EditorOption.experimentalWhitespaceRendering);
+		if (experimentalWhitespaceRendering === 'off') {
+			this.renderWhitespace = options.get(EditorOption.renderWhitespace);
+		} else {
+			// whitespace is rendered in a different layer
+			this.renderWhitespace = 'none';
+		}
+		this.renderControlCharacters = options.get(EditorOption.renderControlCharacters);
+		this.spaceWidth = fontInfo.spaceWidth;
+		this.middotWidth = fontInfo.middotWidth;
+		this.wsmiddotWidth = fontInfo.wsmiddotWidth;
+		this.useMonospaceOptimizations = (
+			fontInfo.isMonospace
+			&& !options.get(EditorOption.disableMonospaceOptimizations)
+		);
+		this.canUseHalfwidthRightwardsArrow = fontInfo.canUseHalfwidthRightwardsArrow;
+		this.lineHeight = options.get(EditorOption.lineHeight);
+		this.stopRenderingLineAfter = options.get(EditorOption.stopRenderingLineAfter);
+		this.fontLigatures = options.get(EditorOption.fontLigatures);
+		this.useGpu = options.get(EditorOption.experimentalGpuAcceleration) === 'on';
+	}
+
+	public equals(other: ViewLineOptions): boolean {
+		return (
+			this.themeType === other.themeType
+			&& this.renderWhitespace === other.renderWhitespace
+			&& this.renderControlCharacters === other.renderControlCharacters
+			&& this.spaceWidth === other.spaceWidth
+			&& this.middotWidth === other.middotWidth
+			&& this.wsmiddotWidth === other.wsmiddotWidth
+			&& this.useMonospaceOptimizations === other.useMonospaceOptimizations
+			&& this.canUseHalfwidthRightwardsArrow === other.canUseHalfwidthRightwardsArrow
+			&& this.lineHeight === other.lineHeight
+			&& this.stopRenderingLineAfter === other.stopRenderingLineAfter
+			&& this.fontLigatures === other.fontLigatures
+			&& this.useGpu === other.useGpu
+		);
+	}
+}
diff --git a/src/vs/editor/browser/viewParts/lines/viewLines.css b/src/vs/editor/browser/viewParts/viewLines/viewLines.css
similarity index 100%
rename from src/vs/editor/browser/viewParts/lines/viewLines.css
rename to src/vs/editor/browser/viewParts/viewLines/viewLines.css
diff --git a/src/vs/editor/browser/viewParts/lines/viewLines.ts b/src/vs/editor/browser/viewParts/viewLines/viewLines.ts
similarity index 94%
rename from src/vs/editor/browser/viewParts/lines/viewLines.ts
rename to src/vs/editor/browser/viewParts/viewLines/viewLines.ts
index 220ef987255..b93a0028b0b 100644
--- a/src/vs/editor/browser/viewParts/lines/viewLines.ts
+++ b/src/vs/editor/browser/viewParts/viewLines/viewLines.ts
@@ -3,27 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { FastDomNode } from 'vs/base/browser/fastDomNode';
-import { MOUSE_CURSOR_TEXT_CSS_CLASS_NAME } from 'vs/base/browser/ui/mouseCursor/mouseCursor';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import * as platform from 'vs/base/common/platform';
-import { Constants } from 'vs/base/common/uint';
-import 'vs/css!./viewLines';
-import { applyFontInfo } from 'vs/editor/browser/config/domFontInfo';
-import { HorizontalPosition, HorizontalRange, IViewLines, LineVisibleRanges, VisibleRanges } from 'vs/editor/browser/view/renderingContext';
-import { IVisibleLinesHost, VisibleLinesCollection } from 'vs/editor/browser/view/viewLayer';
-import { PartFingerprint, PartFingerprints, ViewPart } from 'vs/editor/browser/view/viewPart';
-import { DomReadingContext } from 'vs/editor/browser/viewParts/lines/domReadingContext';
-import { ViewLine, ViewLineOptions } from 'vs/editor/browser/viewParts/lines/viewLine';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ScrollType } from 'vs/editor/common/editorCommon';
-import * as viewEvents from 'vs/editor/common/viewEvents';
-import { ViewportData } from 'vs/editor/common/viewLayout/viewLinesViewportData';
-import { Viewport } from 'vs/editor/common/viewModel';
-import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
+import { FastDomNode } from '../../../../base/browser/fastDomNode.js';
+import { MOUSE_CURSOR_TEXT_CSS_CLASS_NAME } from '../../../../base/browser/ui/mouseCursor/mouseCursor.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import * as platform from '../../../../base/common/platform.js';
+import { Constants } from '../../../../base/common/uint.js';
+import './viewLines.css';
+import { applyFontInfo } from '../../config/domFontInfo.js';
+import { HorizontalPosition, HorizontalRange, IViewLines, LineVisibleRanges, VisibleRanges } from '../../view/renderingContext.js';
+import { VisibleLinesCollection } from '../../view/viewLayer.js';
+import { PartFingerprint, PartFingerprints, ViewPart } from '../../view/viewPart.js';
+import { DomReadingContext } from './domReadingContext.js';
+import { ViewLine } from './viewLine.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { Selection } from '../../../common/core/selection.js';
+import { ScrollType } from '../../../common/editorCommon.js';
+import * as viewEvents from '../../../common/viewEvents.js';
+import { ViewportData } from '../../../common/viewLayout/viewLinesViewportData.js';
+import { Viewport } from '../../../common/viewModel.js';
+import { ViewContext } from '../../../common/viewModel/viewContext.js';
+import { ViewLineOptions } from './viewLineOptions.js';
 
 class LastRenderedData {
 
@@ -87,7 +88,11 @@ class HorizontalRevealSelectionsRequest {
 
 type HorizontalRevealRequest = HorizontalRevealRangeRequest | HorizontalRevealSelectionsRequest;
 
-export class ViewLines extends ViewPart implements IVisibleLinesHost<ViewLine>, IViewLines {
+/**
+ * The view lines part is responsible for rendering the actual content of a
+ * file.
+ */
+export class ViewLines extends ViewPart implements IViewLines {
 	/**
 	 * Adds this amount of pixels to the right of lines (no-one wants to type near the edge of the viewport)
 	 */
@@ -122,10 +127,6 @@ export class ViewLines extends ViewPart implements IVisibleLinesHost<ViewLine>,
 
 	constructor(context: ViewContext, linesContent: FastDomNode<HTMLElement>) {
 		super(context);
-		this._linesContent = linesContent;
-		this._textRangeRestingSpot = document.createElement('div');
-		this._visibleLines = new VisibleLinesCollection(this);
-		this.domNode = this._visibleLines.domNode;
 
 		const conf = this._context.configuration;
 		const options = this._context.configuration.options;
@@ -141,6 +142,13 @@ export class ViewLines extends ViewPart implements IVisibleLinesHost<ViewLine>,
 		this._canUseLayerHinting = !options.get(EditorOption.disableLayerHinting);
 		this._viewLineOptions = new ViewLineOptions(conf, this._context.theme.type);
 
+		this._linesContent = linesContent;
+		this._textRangeRestingSpot = document.createElement('div');
+		this._visibleLines = new VisibleLinesCollection({
+			createLine: () => new ViewLine(this._viewLineOptions),
+		});
+		this.domNode = this._visibleLines.domNode;
+
 		PartFingerprints.write(this.domNode, PartFingerprint.ViewLines);
 		this.domNode.setClassName(`view-lines ${MOUSE_CURSOR_TEXT_CSS_CLASS_NAME}`);
 		applyFontInfo(this.domNode, fontInfo);
@@ -173,14 +181,6 @@ export class ViewLines extends ViewPart implements IVisibleLinesHost<ViewLine>,
 		return this.domNode;
 	}
 
-	// ---- begin IVisibleLinesHost
-
-	public createVisibleLine(): ViewLine {
-		return new ViewLine(this._viewLineOptions);
-	}
-
-	// ---- end IVisibleLinesHost
-
 	// ---- begin view event handlers
 
 	public override onConfigurationChanged(e: viewEvents.ViewConfigurationChangedEvent): boolean {
@@ -710,12 +710,10 @@ export class ViewLines extends ViewPart implements IVisibleLinesHost<ViewLine>,
 		let paddingBottom: number = 0;
 
 		if (!shouldIgnoreScrollOff) {
-			const context = Math.min((viewportHeight / this._lineHeight) / 2, this._cursorSurroundingLines);
-			if (this._stickyScrollEnabled) {
-				paddingTop = Math.max(context, this._maxNumberStickyLines) * this._lineHeight;
-			} else {
-				paddingTop = context * this._lineHeight;
-			}
+			const maxLinesInViewport = (viewportHeight / this._lineHeight);
+			const surroundingLines = Math.max(this._cursorSurroundingLines, this._stickyScrollEnabled ? this._maxNumberStickyLines : 0);
+			const context = Math.min(maxLinesInViewport / 2, surroundingLines);
+			paddingTop = context * this._lineHeight;
 			paddingBottom = Math.max(0, (context - 1)) * this._lineHeight;
 		} else {
 			if (!minimalReveal) {
diff --git a/src/vs/editor/browser/viewParts/viewLinesGpu/viewLinesGpu.ts b/src/vs/editor/browser/viewParts/viewLinesGpu/viewLinesGpu.ts
new file mode 100644
index 00000000000..693bfc1f5da
--- /dev/null
+++ b/src/vs/editor/browser/viewParts/viewLinesGpu/viewLinesGpu.ts
@@ -0,0 +1,436 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { getActiveWindow } from '../../../../base/browser/dom.js';
+import { BugIndicatingError } from '../../../../base/common/errors.js';
+import { autorun } from '../../../../base/common/observable.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import type { Position } from '../../../common/core/position.js';
+import type { Range } from '../../../common/core/range.js';
+import type { ViewLinesChangedEvent, ViewScrollChangedEvent } from '../../../common/viewEvents.js';
+import type { ViewportData } from '../../../common/viewLayout/viewLinesViewportData.js';
+import type { ViewContext } from '../../../common/viewModel/viewContext.js';
+import { TextureAtlasPage } from '../../gpu/atlas/textureAtlasPage.js';
+import { FullFileRenderStrategy } from '../../gpu/fullFileRenderStrategy.js';
+import { BindingId, type IGpuRenderStrategy } from '../../gpu/gpu.js';
+import { GPULifecycle } from '../../gpu/gpuDisposable.js';
+import { observeDevicePixelDimensions, quadVertices } from '../../gpu/gpuUtils.js';
+import { ViewGpuContext } from '../../gpu/viewGpuContext.js';
+import { FloatHorizontalRange, HorizontalPosition, IViewLines, LineVisibleRanges, RenderingContext, RestrictedRenderingContext, VisibleRanges } from '../../view/renderingContext.js';
+import { ViewPart } from '../../view/viewPart.js';
+import { ViewLineOptions } from '../viewLines/viewLineOptions.js';
+
+
+const enum GlyphStorageBufferInfo {
+	FloatsPerEntry = 2 + 2 + 2,
+	BytesPerEntry = GlyphStorageBufferInfo.FloatsPerEntry * 4,
+	Offset_TexturePosition = 0,
+	Offset_TextureSize = 2,
+	Offset_OriginPosition = 4,
+}
+
+/**
+ * The GPU implementation of the ViewLines part.
+ */
+export class ViewLinesGpu extends ViewPart implements IViewLines {
+
+	private readonly canvas: HTMLCanvasElement;
+
+	private _lastViewportData?: ViewportData;
+	private _lastViewLineOptions?: ViewLineOptions;
+
+	private _device!: GPUDevice;
+	private _renderPassDescriptor!: GPURenderPassDescriptor;
+	private _renderPassColorAttachment!: GPURenderPassColorAttachment;
+	private _bindGroup!: GPUBindGroup;
+	private _pipeline!: GPURenderPipeline;
+
+	private _vertexBuffer!: GPUBuffer;
+
+	private readonly _glyphStorageBuffer: GPUBuffer[] = [];
+	private _atlasGpuTexture!: GPUTexture;
+	private readonly _atlasGpuTextureVersions: number[] = [];
+
+	private _initialized = false;
+
+	private _renderStrategy!: IGpuRenderStrategy;
+
+	constructor(
+		context: ViewContext,
+		private readonly _viewGpuContext: ViewGpuContext,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@ILogService private readonly _logService: ILogService,
+	) {
+		super(context);
+
+		this.canvas = this._viewGpuContext.canvas.domNode;
+
+		this._register(autorun(reader => {
+			/*const dims = */this._viewGpuContext.canvasDevicePixelDimensions.read(reader);
+			// TODO: Request render, should this just call renderText with the last viewportData
+		}));
+
+		this.initWebgpu();
+	}
+
+	async initWebgpu() {
+		// #region General
+
+		this._device = await this._viewGpuContext.device;
+
+		if (this._store.isDisposed) {
+			return;
+		}
+
+		const atlas = ViewGpuContext.atlas;
+
+		// Rerender when the texture atlas deletes glyphs
+		this._register(atlas.onDidDeleteGlyphs(() => {
+			this._atlasGpuTextureVersions.length = 0;
+			this._atlasGpuTextureVersions[0] = 0;
+			this._atlasGpuTextureVersions[1] = 0;
+			this._renderStrategy.reset();
+		}));
+
+		const presentationFormat = navigator.gpu.getPreferredCanvasFormat();
+		this._viewGpuContext.ctx.configure({
+			device: this._device,
+			format: presentationFormat,
+			alphaMode: 'premultiplied',
+		});
+
+		this._renderPassColorAttachment = {
+			view: null!, // Will be filled at render time
+			loadOp: 'load',
+			storeOp: 'store',
+		};
+		this._renderPassDescriptor = {
+			label: 'Monaco render pass',
+			colorAttachments: [this._renderPassColorAttachment],
+		};
+
+		// #endregion General
+
+		// #region Uniforms
+
+		let layoutInfoUniformBuffer: GPUBuffer;
+		{
+			const enum Info {
+				FloatsPerEntry = 6,
+				BytesPerEntry = Info.FloatsPerEntry * 4,
+				Offset_CanvasWidth____ = 0,
+				Offset_CanvasHeight___ = 1,
+				Offset_ViewportOffsetX = 2,
+				Offset_ViewportOffsetY = 3,
+				Offset_ViewportWidth__ = 4,
+				Offset_ViewportHeight_ = 5,
+			}
+			const bufferValues = new Float32Array(Info.FloatsPerEntry);
+			const updateBufferValues = (canvasDevicePixelWidth: number = this.canvas.width, canvasDevicePixelHeight: number = this.canvas.height) => {
+				bufferValues[Info.Offset_CanvasWidth____] = canvasDevicePixelWidth;
+				bufferValues[Info.Offset_CanvasHeight___] = canvasDevicePixelHeight;
+				bufferValues[Info.Offset_ViewportOffsetX] = Math.ceil(this._context.configuration.options.get(EditorOption.layoutInfo).contentLeft * getActiveWindow().devicePixelRatio);
+				bufferValues[Info.Offset_ViewportOffsetY] = 0;
+				bufferValues[Info.Offset_ViewportWidth__] = bufferValues[Info.Offset_CanvasWidth____] - bufferValues[Info.Offset_ViewportOffsetX];
+				bufferValues[Info.Offset_ViewportHeight_] = bufferValues[Info.Offset_CanvasHeight___] - bufferValues[Info.Offset_ViewportOffsetY];
+				return bufferValues;
+			};
+			layoutInfoUniformBuffer = this._register(GPULifecycle.createBuffer(this._device, {
+				label: 'Monaco uniform buffer',
+				size: Info.BytesPerEntry,
+				usage: GPUBufferUsage.UNIFORM | GPUBufferUsage.COPY_DST,
+			}, () => updateBufferValues())).object;
+			this._register(observeDevicePixelDimensions(this.canvas, getActiveWindow(), (w, h) => {
+				this._device.queue.writeBuffer(layoutInfoUniformBuffer, 0, updateBufferValues(w, h));
+			}));
+		}
+
+		let atlasInfoUniformBuffer: GPUBuffer;
+		{
+			const enum Info {
+				FloatsPerEntry = 2,
+				BytesPerEntry = Info.FloatsPerEntry * 4,
+				Offset_Width_ = 0,
+				Offset_Height = 1,
+			}
+			atlasInfoUniformBuffer = this._register(GPULifecycle.createBuffer(this._device, {
+				label: 'Monaco atlas info uniform buffer',
+				size: Info.BytesPerEntry,
+				usage: GPUBufferUsage.UNIFORM | GPUBufferUsage.COPY_DST,
+			}, () => {
+				const values = new Float32Array(Info.FloatsPerEntry);
+				values[Info.Offset_Width_] = atlas.pageSize;
+				values[Info.Offset_Height] = atlas.pageSize;
+				return values;
+			})).object;
+		}
+
+		// #endregion Uniforms
+
+		// #region Storage buffers
+
+		this._renderStrategy = this._register(this._instantiationService.createInstance(FullFileRenderStrategy, this._context, this._device, this.canvas, atlas));
+
+		this._glyphStorageBuffer[0] = this._register(GPULifecycle.createBuffer(this._device, {
+			label: 'Monaco glyph storage buffer',
+			size: GlyphStorageBufferInfo.BytesPerEntry * TextureAtlasPage.maximumGlyphCount,
+			usage: GPUBufferUsage.STORAGE | GPUBufferUsage.COPY_DST,
+		})).object;
+		this._glyphStorageBuffer[1] = this._register(GPULifecycle.createBuffer(this._device, {
+			label: 'Monaco glyph storage buffer',
+			size: GlyphStorageBufferInfo.BytesPerEntry * TextureAtlasPage.maximumGlyphCount,
+			usage: GPUBufferUsage.STORAGE | GPUBufferUsage.COPY_DST,
+		})).object;
+		this._atlasGpuTextureVersions[0] = 0;
+		this._atlasGpuTextureVersions[1] = 0;
+		this._atlasGpuTexture = this._register(GPULifecycle.createTexture(this._device, {
+			label: 'Monaco atlas texture',
+			format: 'rgba8unorm',
+			// TODO: Dynamically grow/shrink layer count
+			size: { width: atlas.pageSize, height: atlas.pageSize, depthOrArrayLayers: 2 },
+			dimension: '2d',
+			usage: GPUTextureUsage.TEXTURE_BINDING |
+				GPUTextureUsage.COPY_DST |
+				GPUTextureUsage.RENDER_ATTACHMENT,
+		})).object;
+
+		this._updateAtlasStorageBufferAndTexture();
+
+		// #endregion Storage buffers
+
+		// #region Vertex buffer
+
+		this._vertexBuffer = this._register(GPULifecycle.createBuffer(this._device, {
+			label: 'Monaco vertex buffer',
+			size: quadVertices.byteLength,
+			usage: GPUBufferUsage.VERTEX | GPUBufferUsage.COPY_DST,
+		}, quadVertices)).object;
+
+		// #endregion Vertex buffer
+
+		// #region Shader module
+
+		const module = this._device.createShaderModule({
+			label: 'Monaco shader module',
+			code: this._renderStrategy.wgsl,
+		});
+
+		// #endregion Shader module
+
+		// #region Pipeline
+
+		this._pipeline = this._device.createRenderPipeline({
+			label: 'Monaco render pipeline',
+			layout: 'auto',
+			vertex: {
+				module,
+				buffers: [
+					{
+						arrayStride: 2 * Float32Array.BYTES_PER_ELEMENT, // 2 floats, 4 bytes each
+						attributes: [
+							{ shaderLocation: 0, offset: 0, format: 'float32x2' },  // position
+						],
+					}
+				]
+			},
+			fragment: {
+				module,
+				targets: [
+					{
+						format: presentationFormat,
+						blend: {
+							color: {
+								srcFactor: 'src-alpha',
+								dstFactor: 'one-minus-src-alpha'
+							},
+							alpha: {
+								srcFactor: 'src-alpha',
+								dstFactor: 'one-minus-src-alpha'
+							},
+						},
+					}
+				],
+			},
+		});
+
+		// #endregion Pipeline
+
+		// #region Bind group
+
+		this._bindGroup = this._device.createBindGroup({
+			label: 'Monaco bind group',
+			layout: this._pipeline.getBindGroupLayout(0),
+			entries: [
+				// TODO: Pass in generically as array?
+				{ binding: BindingId.GlyphInfo0, resource: { buffer: this._glyphStorageBuffer[0] } },
+				{ binding: BindingId.GlyphInfo1, resource: { buffer: this._glyphStorageBuffer[1] } },
+				{
+					binding: BindingId.TextureSampler, resource: this._device.createSampler({
+						label: 'Monaco atlas sampler',
+						magFilter: 'nearest',
+						minFilter: 'nearest',
+					})
+				},
+				{ binding: BindingId.Texture, resource: this._atlasGpuTexture.createView() },
+				{ binding: BindingId.LayoutInfoUniform, resource: { buffer: layoutInfoUniformBuffer } },
+				{ binding: BindingId.AtlasDimensionsUniform, resource: { buffer: atlasInfoUniformBuffer } },
+				...this._renderStrategy.bindGroupEntries
+			],
+		});
+
+		// endregion Bind group
+
+		this._initialized = true;
+	}
+
+	private _updateAtlasStorageBufferAndTexture() {
+		for (const [layerIndex, page] of ViewGpuContext.atlas.pages.entries()) {
+			// Skip the update if it's already the latest version
+			if (page.version === this._atlasGpuTextureVersions[layerIndex]) {
+				continue;
+			}
+
+			this._logService.trace('Updating atlas page[', layerIndex, '] from version ', this._atlasGpuTextureVersions[layerIndex], ' to version ', page.version);
+
+			// TODO: Reuse buffer instead of reconstructing each time
+			// TODO: Dynamically set buffer size
+			const values = new Float32Array(GlyphStorageBufferInfo.FloatsPerEntry * TextureAtlasPage.maximumGlyphCount);
+			let entryOffset = 0;
+			for (const glyph of page.glyphs) {
+				values[entryOffset + GlyphStorageBufferInfo.Offset_TexturePosition] = glyph.x;
+				values[entryOffset + GlyphStorageBufferInfo.Offset_TexturePosition + 1] = glyph.y;
+				values[entryOffset + GlyphStorageBufferInfo.Offset_TextureSize] = glyph.w;
+				values[entryOffset + GlyphStorageBufferInfo.Offset_TextureSize + 1] = glyph.h;
+				values[entryOffset + GlyphStorageBufferInfo.Offset_OriginPosition] = glyph.originOffsetX;
+				values[entryOffset + GlyphStorageBufferInfo.Offset_OriginPosition + 1] = glyph.originOffsetY;
+				entryOffset += GlyphStorageBufferInfo.FloatsPerEntry;
+			}
+			if (entryOffset / GlyphStorageBufferInfo.FloatsPerEntry > TextureAtlasPage.maximumGlyphCount) {
+				throw new Error(`Attempting to write more glyphs (${entryOffset / GlyphStorageBufferInfo.FloatsPerEntry}) than the GPUBuffer can hold (${TextureAtlasPage.maximumGlyphCount})`);
+			}
+			this._device.queue.writeBuffer(this._glyphStorageBuffer[layerIndex], 0, values);
+			if (page.usedArea.right - page.usedArea.left > 0 && page.usedArea.bottom - page.usedArea.top > 0) {
+				this._device.queue.copyExternalImageToTexture(
+					{ source: page.source },
+					{
+						texture: this._atlasGpuTexture,
+						origin: {
+							x: page.usedArea.left,
+							y: page.usedArea.top,
+							z: layerIndex
+						}
+					},
+					{
+						width: page.usedArea.right - page.usedArea.left,
+						height: page.usedArea.bottom - page.usedArea.top
+					},
+				);
+			}
+			this._atlasGpuTextureVersions[layerIndex] = page.version;
+		}
+	}
+
+	public static canRender(options: ViewLineOptions, viewportData: ViewportData, lineNumber: number): boolean {
+		const d = viewportData.getViewLineRenderingData(lineNumber);
+		// TODO
+		return d.content.indexOf('e') !== -1;
+	}
+
+	public prepareRender(ctx: RenderingContext): void {
+		throw new BugIndicatingError('Should not be called');
+	}
+
+	public override render(ctx: RestrictedRenderingContext): void {
+		throw new BugIndicatingError('Should not be called');
+	}
+
+	override onLinesChanged(e: ViewLinesChangedEvent): boolean {
+		return true;
+	}
+
+	override onScrollChanged(e: ViewScrollChangedEvent): boolean {
+		return true;
+	}
+
+	// subscribe to more events
+
+	public renderText(viewportData: ViewportData): void {
+		if (this._initialized) {
+			return this._renderText(viewportData);
+		}
+	}
+
+	private _renderText(viewportData: ViewportData): void {
+		this._viewGpuContext.rectangleRenderer.draw(viewportData);
+
+		const options = new ViewLineOptions(this._context.configuration, this._context.theme.type);
+
+		const visibleObjectCount = this._renderStrategy.update(viewportData, options);
+
+		this._updateAtlasStorageBufferAndTexture();
+
+		const encoder = this._device.createCommandEncoder({ label: 'Monaco command encoder' });
+
+		this._renderPassColorAttachment.view = this._viewGpuContext.ctx.getCurrentTexture().createView({ label: 'Monaco canvas texture view' });
+		const pass = encoder.beginRenderPass(this._renderPassDescriptor);
+		pass.setPipeline(this._pipeline);
+		pass.setVertexBuffer(0, this._vertexBuffer);
+
+		pass.setBindGroup(0, this._bindGroup);
+
+		if (this._renderStrategy?.draw) {
+			// TODO: Don't draw lines if ViewLinesGpu.canRender is false
+			this._renderStrategy.draw(pass, viewportData);
+		} else {
+			pass.draw(quadVertices.length / 2, visibleObjectCount);
+		}
+
+		pass.end();
+
+		const commandBuffer = encoder.finish();
+
+		this._device.queue.submit([commandBuffer]);
+
+		this._lastViewportData = viewportData;
+		this._lastViewLineOptions = options;
+	}
+
+	linesVisibleRangesForRange(range: Range, includeNewLines: boolean): LineVisibleRanges[] | null {
+		return null;
+	}
+
+	private _visibleRangesForLineRange(lineNumber: number, startColumn: number, endColumn: number): VisibleRanges | null {
+		if (this.shouldRender()) {
+			// Cannot read from the DOM because it is dirty
+			// i.e. the model & the dom are out of sync, so I'd be reading something stale
+			return null;
+		}
+
+		const viewportData = this._lastViewportData;
+		const viewLineOptions = this._lastViewLineOptions;
+
+		if (!viewportData || !viewLineOptions || lineNumber < viewportData.startLineNumber || lineNumber > viewportData.endLineNumber) {
+			return null;
+		}
+
+		// Visible horizontal range in _scaled_ pixels
+		const result = new VisibleRanges(false, [new FloatHorizontalRange(
+			(startColumn - 1) * viewLineOptions.spaceWidth,
+			(endColumn - startColumn - 1) * viewLineOptions.spaceWidth)
+		]);
+
+		return result;
+	}
+
+	visibleRangeForPosition(position: Position): HorizontalPosition | null {
+		const visibleRanges = this._visibleRangesForLineRange(position.lineNumber, position.column, position.column);
+		if (!visibleRanges) {
+			return null;
+		}
+		return new HorizontalPosition(visibleRanges.outsideRenderedLine, visibleRanges.ranges[0].left);
+	}
+}
diff --git a/src/vs/editor/browser/viewParts/viewZones/viewZones.ts b/src/vs/editor/browser/viewParts/viewZones/viewZones.ts
index a99dac77cde..4b94e5660d3 100644
--- a/src/vs/editor/browser/viewParts/viewZones/viewZones.ts
+++ b/src/vs/editor/browser/viewParts/viewZones/viewZones.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { IViewZone, IViewZoneChangeAccessor } from 'vs/editor/browser/editorBrowser';
-import { ViewPart } from 'vs/editor/browser/view/viewPart';
-import { Position } from 'vs/editor/common/core/position';
-import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/browser/view/renderingContext';
-import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
-import * as viewEvents from 'vs/editor/common/viewEvents';
-import { IEditorWhitespace, IViewWhitespaceViewportData, IWhitespaceChangeAccessor } from 'vs/editor/common/viewModel';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
+import { FastDomNode, createFastDomNode } from '../../../../base/browser/fastDomNode.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { IViewZone, IViewZoneChangeAccessor } from '../../editorBrowser.js';
+import { ViewPart } from '../../view/viewPart.js';
+import { Position } from '../../../common/core/position.js';
+import { RenderingContext, RestrictedRenderingContext } from '../../view/renderingContext.js';
+import { ViewContext } from '../../../common/viewModel/viewContext.js';
+import * as viewEvents from '../../../common/viewEvents.js';
+import { IEditorWhitespace, IViewWhitespaceViewportData, IWhitespaceChangeAccessor } from '../../../common/viewModel.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 
 interface IMyViewZone {
 	whitespaceId: string;
@@ -32,6 +32,11 @@ interface IComputedViewZoneProps {
 
 const invalidFunc = () => { throw new Error(`Invalid change accessor`); };
 
+/**
+ * A view zone is a rectangle that is a section that is inserted into the editor
+ * lines that can be used for various purposes such as showing a diffs, peeking
+ * an implementation, etc.
+ */
 export class ViewZones extends ViewPart {
 
 	private _zones: { [id: string]: IMyViewZone };
diff --git a/src/vs/editor/browser/viewParts/whitespace/whitespace.ts b/src/vs/editor/browser/viewParts/whitespace/whitespace.ts
index 3bd29fc5e1e..56cc4692dc0 100644
--- a/src/vs/editor/browser/viewParts/whitespace/whitespace.ts
+++ b/src/vs/editor/browser/viewParts/whitespace/whitespace.ts
@@ -3,21 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./whitespace';
-import { DynamicViewOverlay } from 'vs/editor/browser/view/dynamicViewOverlay';
-import { Selection } from 'vs/editor/common/core/selection';
-import { RenderingContext } from 'vs/editor/browser/view/renderingContext';
-import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
-import * as viewEvents from 'vs/editor/common/viewEvents';
-import { ViewLineData } from 'vs/editor/common/viewModel';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { IEditorConfiguration } from 'vs/editor/common/config/editorConfiguration';
-import * as strings from 'vs/base/common/strings';
-import { CharCode } from 'vs/base/common/charCode';
-import { LineRange } from 'vs/editor/common/viewLayout/viewLineRenderer';
-import { Position } from 'vs/editor/common/core/position';
-import { editorWhitespaces } from 'vs/editor/common/core/editorColorRegistry';
+import './whitespace.css';
+import { DynamicViewOverlay } from '../../view/dynamicViewOverlay.js';
+import { Selection } from '../../../common/core/selection.js';
+import { RenderingContext } from '../../view/renderingContext.js';
+import { ViewContext } from '../../../common/viewModel/viewContext.js';
+import * as viewEvents from '../../../common/viewEvents.js';
+import { ViewLineData } from '../../../common/viewModel.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { IEditorConfiguration } from '../../../common/config/editorConfiguration.js';
+import * as strings from '../../../../base/common/strings.js';
+import { CharCode } from '../../../../base/common/charCode.js';
+import { LineRange } from '../../../common/viewLayout/viewLineRenderer.js';
+import { Position } from '../../../common/core/position.js';
+import { editorWhitespaces } from '../../../common/core/editorColorRegistry.js';
 
+/**
+ * The whitespace overlay will visual certain whitespace depending on the
+ * current editor configuration (boundary, selection, etc.).
+ */
 export class WhitespaceOverlay extends DynamicViewOverlay {
 
 	private readonly _context: ViewContext;
diff --git a/src/vs/editor/browser/widget/codeEditor/codeEditorContributions.ts b/src/vs/editor/browser/widget/codeEditor/codeEditorContributions.ts
index 840bcc4f525..107fa40928c 100644
--- a/src/vs/editor/browser/widget/codeEditor/codeEditorContributions.ts
+++ b/src/vs/editor/browser/widget/codeEditor/codeEditorContributions.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getWindow, runWhenWindowIdle } from 'vs/base/browser/dom';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Disposable, DisposableMap, IDisposable } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorContributionInstantiation, IEditorContributionDescription } from 'vs/editor/browser/editorExtensions';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { getWindow, runWhenWindowIdle } from '../../../../base/browser/dom.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { Disposable, DisposableMap, IDisposable } from '../../../../base/common/lifecycle.js';
+import { ICodeEditor } from '../../editorBrowser.js';
+import { EditorContributionInstantiation, IEditorContributionDescription } from '../../editorExtensions.js';
+import { IEditorContribution } from '../../../common/editorCommon.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 
 export class CodeEditorContributions extends Disposable {
 
diff --git a/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.ts b/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.ts
index f8ed64fba6c..59f027dd434 100644
--- a/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.ts
+++ b/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.ts
@@ -3,63 +3,63 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/editor/browser/services/markerDecorations';
-import * as dom from 'vs/base/browser/dom';
-import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
-import { Color } from 'vs/base/common/color';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Emitter, EmitterOptions, Event, EventDeliveryQueue, createEventDeliveryQueue } from 'vs/base/common/event';
-import { hash } from 'vs/base/common/hash';
-import { Disposable, DisposableStore, IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import 'vs/css!./editor';
-import { applyFontInfo } from 'vs/editor/browser/config/domFontInfo';
-import { EditorConfiguration, IEditorConstructionOptions } from 'vs/editor/browser/config/editorConfiguration';
-import { TabFocus } from 'vs/editor/browser/config/tabFocus';
-import * as editorBrowser from 'vs/editor/browser/editorBrowser';
-import { EditorExtensionsRegistry, IEditorContributionDescription } from 'vs/editor/browser/editorExtensions';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { IContentWidgetData, IGlyphMarginWidgetData, IOverlayWidgetData, View } from 'vs/editor/browser/view';
-import { DOMLineBreaksComputerFactory } from 'vs/editor/browser/view/domLineBreaksComputer';
-import { ICommandDelegate } from 'vs/editor/browser/view/viewController';
-import { ViewUserInputEvents } from 'vs/editor/browser/view/viewUserInputEvents';
-import { CodeEditorContributions } from 'vs/editor/browser/widget/codeEditor/codeEditorContributions';
-import { IEditorConfiguration } from 'vs/editor/common/config/editorConfiguration';
-import { ConfigurationChangedEvent, EditorLayoutInfo, EditorOption, FindComputedEditorOptionValueById, IComputedEditorOptions, IEditorOptions, filterValidationDecorations } from 'vs/editor/common/config/editorOptions';
-import { CursorColumns } from 'vs/editor/common/core/cursorColumns';
-import { IDimension } from 'vs/editor/common/core/dimension';
-import { editorUnnecessaryCodeOpacity } from 'vs/editor/common/core/editorColorRegistry';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { ISelection, Selection } from 'vs/editor/common/core/selection';
-import { IWordAtPosition } from 'vs/editor/common/core/wordHelper';
-import { WordOperations } from 'vs/editor/common/cursor/cursorWordOperations';
-import { CursorChangeReason, ICursorPositionChangedEvent, ICursorSelectionChangedEvent } from 'vs/editor/common/cursorEvents';
-import { InternalEditorAction } from 'vs/editor/common/editorAction';
-import * as editorCommon from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { EndOfLinePreference, IAttachedView, ICursorStateComputer, IIdentifiedSingleEditOperation, IModelDecoration, IModelDecorationOptions, IModelDecorationsChangeAccessor, IModelDeltaDecoration, ITextModel } from 'vs/editor/common/model';
-import { ClassName } from 'vs/editor/common/model/intervalTree';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { IModelContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguageChangedEvent, IModelLanguageConfigurationChangedEvent, IModelOptionsChangedEvent, IModelTokensChangedEvent } from 'vs/editor/common/textModelEvents';
-import { VerticalRevealType } from 'vs/editor/common/viewEvents';
-import { IEditorWhitespace, IViewModel } from 'vs/editor/common/viewModel';
-import { MonospaceLineBreaksComputerFactory } from 'vs/editor/common/viewModel/monospaceLineBreaksComputer';
-import { ViewModel } from 'vs/editor/common/viewModel/viewModelImpl';
-import { OutgoingViewModelEventKind } from 'vs/editor/common/viewModelEventDispatcher';
-import * as nls from 'vs/nls';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { ContextKeyValue, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { editorErrorForeground, editorHintForeground, editorInfoForeground, editorWarningForeground } from 'vs/platform/theme/common/colorRegistry';
-import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { MenuId } from 'vs/platform/actions/common/actions';
+import '../../services/markerDecorations.js';
+import * as dom from '../../../../base/browser/dom.js';
+import { IKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { IMouseWheelEvent } from '../../../../base/browser/mouseEvent.js';
+import { Color } from '../../../../base/common/color.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { Emitter, EmitterOptions, Event, EventDeliveryQueue, createEventDeliveryQueue } from '../../../../base/common/event.js';
+import { hash } from '../../../../base/common/hash.js';
+import { Disposable, DisposableStore, IDisposable, dispose } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import './editor.css';
+import { applyFontInfo } from '../../config/domFontInfo.js';
+import { EditorConfiguration, IEditorConstructionOptions } from '../../config/editorConfiguration.js';
+import { TabFocus } from '../../config/tabFocus.js';
+import * as editorBrowser from '../../editorBrowser.js';
+import { EditorExtensionsRegistry, IEditorContributionDescription } from '../../editorExtensions.js';
+import { ICodeEditorService } from '../../services/codeEditorService.js';
+import { IContentWidgetData, IGlyphMarginWidgetData, IOverlayWidgetData, View } from '../../view.js';
+import { DOMLineBreaksComputerFactory } from '../../view/domLineBreaksComputer.js';
+import { ICommandDelegate } from '../../view/viewController.js';
+import { ViewUserInputEvents } from '../../view/viewUserInputEvents.js';
+import { CodeEditorContributions } from './codeEditorContributions.js';
+import { IEditorConfiguration } from '../../../common/config/editorConfiguration.js';
+import { ConfigurationChangedEvent, EditorLayoutInfo, EditorOption, FindComputedEditorOptionValueById, IComputedEditorOptions, IEditorOptions, filterValidationDecorations } from '../../../common/config/editorOptions.js';
+import { CursorColumns } from '../../../common/core/cursorColumns.js';
+import { IDimension } from '../../../common/core/dimension.js';
+import { editorUnnecessaryCodeOpacity } from '../../../common/core/editorColorRegistry.js';
+import { IPosition, Position } from '../../../common/core/position.js';
+import { IRange, Range } from '../../../common/core/range.js';
+import { ISelection, Selection } from '../../../common/core/selection.js';
+import { IWordAtPosition } from '../../../common/core/wordHelper.js';
+import { WordOperations } from '../../../common/cursor/cursorWordOperations.js';
+import { CursorChangeReason, ICursorPositionChangedEvent, ICursorSelectionChangedEvent } from '../../../common/cursorEvents.js';
+import { InternalEditorAction } from '../../../common/editorAction.js';
+import * as editorCommon from '../../../common/editorCommon.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import { EndOfLinePreference, IAttachedView, ICursorStateComputer, IIdentifiedSingleEditOperation, IModelDecoration, IModelDecorationOptions, IModelDecorationsChangeAccessor, IModelDeltaDecoration, ITextModel } from '../../../common/model.js';
+import { ClassName } from '../../../common/model/intervalTree.js';
+import { ModelDecorationOptions } from '../../../common/model/textModel.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { IModelContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguageChangedEvent, IModelLanguageConfigurationChangedEvent, IModelOptionsChangedEvent, IModelTokensChangedEvent } from '../../../common/textModelEvents.js';
+import { VerticalRevealType } from '../../../common/viewEvents.js';
+import { IEditorWhitespace, IViewModel } from '../../../common/viewModel.js';
+import { MonospaceLineBreaksComputerFactory } from '../../../common/viewModel/monospaceLineBreaksComputer.js';
+import { ViewModel } from '../../../common/viewModel/viewModelImpl.js';
+import { OutgoingViewModelEventKind } from '../../../common/viewModelEventDispatcher.js';
+import * as nls from '../../../../nls.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { ContextKeyValue, IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { editorErrorForeground, editorHintForeground, editorInfoForeground, editorWarningForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import { IThemeService, registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
 
 export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeEditor {
 
@@ -188,6 +188,9 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 
 	private _updateCounter = 0;
 
+	private readonly _onWillTriggerEditorOperationEvent: Emitter<editorCommon.ITriggerEditorOperationEvent> = this._register(new Emitter<editorCommon.ITriggerEditorOperationEvent>());
+	public readonly onWillTriggerEditorOperationEvent: Event<editorCommon.ITriggerEditorOperationEvent> = this._onWillTriggerEditorOperationEvent.event;
+
 	private readonly _onBeginUpdate: Emitter<void> = this._register(new Emitter<void>());
 	public readonly onBeginUpdate: Event<void> = this._onBeginUpdate.event;
 
@@ -577,11 +580,12 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 		if (!this._modelData) {
 			return -1;
 		}
-		return CodeEditorWidget._getVerticalOffsetAfterPosition(this._modelData, lineNumber, 1, includeViewZones);
+		const maxCol = this._modelData.model.getLineMaxColumn(lineNumber);
+		return CodeEditorWidget._getVerticalOffsetAfterPosition(this._modelData, lineNumber, maxCol, includeViewZones);
 	}
 
-	public setHiddenAreas(ranges: IRange[], source?: unknown): void {
-		this._modelData?.viewModel.setHiddenAreas(ranges.map(r => Range.lift(r)), source);
+	public setHiddenAreas(ranges: IRange[], source?: unknown, forceUpdate?: boolean): void {
+		this._modelData?.viewModel.setHiddenAreas(ranges.map(r => Range.lift(r)), source, forceUpdate);
 	}
 
 	public getVisibleColumnFromPosition(rawPosition: IPosition): number {
@@ -1046,6 +1050,7 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 		payload = payload || {};
 
 		try {
+			this._onWillTriggerEditorOperationEvent.fire({ source: source, handlerId: handlerId, payload: payload });
 			this._beginUpdate();
 
 			switch (handlerId) {
diff --git a/src/vs/editor/browser/widget/codeEditor/editor.css b/src/vs/editor/browser/widget/codeEditor/editor.css
index 5ef7246d0fb..d33122122de 100644
--- a/src/vs/editor/browser/widget/codeEditor/editor.css
+++ b/src/vs/editor/browser/widget/codeEditor/editor.css
@@ -23,6 +23,7 @@
 	-webkit-text-size-adjust: 100%;
 	color: var(--vscode-editor-foreground);
 	background-color: var(--vscode-editor-background);
+	overflow-wrap: initial;
 }
 .monaco-editor-background {
 	background-color: var(--vscode-editor-background);
@@ -44,6 +45,14 @@
 	border-style: dotted;
 }
 
+.monaco-editor .editorCanvas {
+	position: absolute;
+	width: 100%;
+	height: 100%;
+	z-index: 0;
+	pointer-events: none;
+}
+
 /* -------------------- Misc -------------------- */
 
 .monaco-editor .overflow-guard {
diff --git a/src/vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget.ts b/src/vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget.ts
index 9fb3a8e69c2..b716aa61109 100644
--- a/src/vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget.ts
+++ b/src/vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as objects from 'vs/base/common/objects';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { CodeEditorWidget, ICodeEditorWidgetOptions } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { ConfigurationChangedEvent, IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
+import * as objects from '../../../../base/common/objects.js';
+import { ICodeEditor } from '../../editorBrowser.js';
+import { ICodeEditorService } from '../../services/codeEditorService.js';
+import { CodeEditorWidget, ICodeEditorWidgetOptions } from './codeEditorWidget.js';
+import { ConfigurationChangedEvent, IEditorOptions } from '../../../common/config/editorOptions.js';
+import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
 
 export class EmbeddedCodeEditorWidget extends CodeEditorWidget {
 	private readonly _parentEditor: ICodeEditor;
diff --git a/src/vs/editor/browser/widget/diffEditor/commands.ts b/src/vs/editor/browser/widget/diffEditor/commands.ts
index cdfff8f57fe..9e04b2aad05 100644
--- a/src/vs/editor/browser/widget/diffEditor/commands.ts
+++ b/src/vs/editor/browser/widget/diffEditor/commands.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getActiveElement } from 'vs/base/browser/dom';
-import { Codicon } from 'vs/base/common/codicons';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { ICodeEditor, IDiffEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction2, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditor/diffEditorWidget';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { localize2 } from 'vs/nls';
-import { ILocalizedString } from 'vs/platform/action/common/action';
-import { Action2, MenuId } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import './registrations.contribution';
-import { DiffEditorSelectionHunkToolbarContext } from 'vs/editor/browser/widget/diffEditor/features/gutterFeature';
-import { URI } from 'vs/base/common/uri';
+import { getActiveElement } from '../../../../base/browser/dom.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { ICodeEditor, IDiffEditor } from '../../editorBrowser.js';
+import { EditorAction2, ServicesAccessor } from '../../editorExtensions.js';
+import { ICodeEditorService } from '../../services/codeEditorService.js';
+import { DiffEditorWidget } from './diffEditorWidget.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { localize2 } from '../../../../nls.js';
+import { ILocalizedString } from '../../../../platform/action/common/action.js';
+import { Action2, MenuId } from '../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import './registrations.contribution.js';
+import { DiffEditorSelectionHunkToolbarContext } from './features/gutterFeature.js';
+import { URI } from '../../../../base/common/uri.js';
 
 export class ToggleCollapseUnchangedRegions extends Action2 {
 	constructor() {
diff --git a/src/vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer.ts b/src/vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer.ts
index 3c27606e5d6..a5add04022d 100644
--- a/src/vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer.ts
+++ b/src/vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer.ts
@@ -3,37 +3,37 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { addDisposableListener, addStandardDisposableListener, reset } from 'vs/base/browser/dom';
-import { createTrustedTypesPolicy } from 'vs/base/browser/trustedTypes';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
-import { Action } from 'vs/base/common/actions';
-import { forEachAdjacent, groupAdjacentBy } from 'vs/base/common/arrays';
-import { Codicon } from 'vs/base/common/codicons';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Disposable, DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { IObservable, ITransaction, autorun, autorunWithStore, derived, derivedWithStore, observableValue, subtransaction, transaction } from 'vs/base/common/observable';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { applyFontInfo } from 'vs/editor/browser/config/domFontInfo';
-import { applyStyle } from 'vs/editor/browser/widget/diffEditor/utils';
-import { EditorFontLigatures, EditorOption, IComputedEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { LineRange } from 'vs/editor/common/core/lineRange';
-import { OffsetRange } from 'vs/editor/common/core/offsetRange';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { DetailedLineRangeMapping, LineRangeMapping } from 'vs/editor/common/diff/rangeMapping';
-import { ILanguageIdCodec } from 'vs/editor/common/languages';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ITextModel, TextModelResolvedOptions } from 'vs/editor/common/model';
-import { LineTokens } from 'vs/editor/common/tokens/lineTokens';
-import { RenderLineInput, renderViewLine2 } from 'vs/editor/common/viewLayout/viewLineRenderer';
-import { ViewLineRenderingData } from 'vs/editor/common/viewModel';
-import { localize } from 'vs/nls';
-import { AccessibilitySignal, IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import 'vs/css!./accessibleDiffViewer';
-import { DiffEditorEditors } from 'vs/editor/browser/widget/diffEditor/components/diffEditorEditors';
+import { addDisposableListener, addStandardDisposableListener, reset } from '../../../../../base/browser/dom.js';
+import { createTrustedTypesPolicy } from '../../../../../base/browser/trustedTypes.js';
+import { ActionBar } from '../../../../../base/browser/ui/actionbar/actionbar.js';
+import { DomScrollableElement } from '../../../../../base/browser/ui/scrollbar/scrollableElement.js';
+import { Action } from '../../../../../base/common/actions.js';
+import { forEachAdjacent, groupAdjacentBy } from '../../../../../base/common/arrays.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { IObservable, ITransaction, autorun, autorunWithStore, derived, derivedWithStore, observableValue, subtransaction, transaction } from '../../../../../base/common/observable.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { applyFontInfo } from '../../../config/domFontInfo.js';
+import { applyStyle } from '../utils.js';
+import { EditorFontLigatures, EditorOption, IComputedEditorOptions } from '../../../../common/config/editorOptions.js';
+import { LineRange } from '../../../../common/core/lineRange.js';
+import { OffsetRange } from '../../../../common/core/offsetRange.js';
+import { Position } from '../../../../common/core/position.js';
+import { Range } from '../../../../common/core/range.js';
+import { DetailedLineRangeMapping, LineRangeMapping } from '../../../../common/diff/rangeMapping.js';
+import { ILanguageIdCodec } from '../../../../common/languages.js';
+import { ILanguageService } from '../../../../common/languages/language.js';
+import { ITextModel, TextModelResolvedOptions } from '../../../../common/model.js';
+import { LineTokens } from '../../../../common/tokens/lineTokens.js';
+import { RenderLineInput, renderViewLine2 } from '../../../../common/viewLayout/viewLineRenderer.js';
+import { ViewLineRenderingData } from '../../../../common/viewModel.js';
+import { localize } from '../../../../../nls.js';
+import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { registerIcon } from '../../../../../platform/theme/common/iconRegistry.js';
+import './accessibleDiffViewer.css';
+import { DiffEditorEditors } from './diffEditorEditors.js';
 
 const accessibleDiffViewerInsertIcon = registerIcon('diff-review-insert', Codicon.add, localize('accessibleDiffViewerInsertIcon', 'Icon for \'Insert\' in accessible diff viewer.'));
 const accessibleDiffViewerRemoveIcon = registerIcon('diff-review-remove', Codicon.remove, localize('accessibleDiffViewerRemoveIcon', 'Icon for \'Remove\' in accessible diff viewer.'));
diff --git a/src/vs/editor/browser/widget/diffEditor/components/diffEditorDecorations.ts b/src/vs/editor/browser/widget/diffEditor/components/diffEditorDecorations.ts
index a5992771a9a..609dd70fcef 100644
--- a/src/vs/editor/browser/widget/diffEditor/components/diffEditorDecorations.ts
+++ b/src/vs/editor/browser/widget/diffEditor/components/diffEditorDecorations.ts
@@ -3,16 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IObservable, derived } from 'vs/base/common/observable';
-import { DiffEditorEditors } from 'vs/editor/browser/widget/diffEditor/components/diffEditorEditors';
-import { DiffEditorOptions } from 'vs/editor/browser/widget/diffEditor/diffEditorOptions';
-import { DiffEditorViewModel } from 'vs/editor/browser/widget/diffEditor/diffEditorViewModel';
-import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditor/diffEditorWidget';
-import { MovedBlocksLinesFeature } from 'vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature';
-import { diffAddDecoration, diffAddDecorationEmpty, diffDeleteDecoration, diffDeleteDecorationEmpty, diffLineAddDecorationBackground, diffLineAddDecorationBackgroundWithIndicator, diffLineDeleteDecorationBackground, diffLineDeleteDecorationBackgroundWithIndicator, diffWholeLineAddDecoration, diffWholeLineDeleteDecoration } from 'vs/editor/browser/widget/diffEditor/registrations.contribution';
-import { applyObservableDecorations } from 'vs/editor/browser/widget/diffEditor/utils';
-import { IModelDeltaDecoration } from 'vs/editor/common/model';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { IObservable, derived } from '../../../../../base/common/observable.js';
+import { DiffEditorEditors } from './diffEditorEditors.js';
+import { allowsTrueInlineDiffRendering } from './diffEditorViewZones/diffEditorViewZones.js';
+import { DiffEditorOptions } from '../diffEditorOptions.js';
+import { DiffEditorViewModel } from '../diffEditorViewModel.js';
+import { DiffEditorWidget } from '../diffEditorWidget.js';
+import { MovedBlocksLinesFeature } from '../features/movedBlocksLinesFeature.js';
+import { diffAddDecoration, diffAddDecorationEmpty, diffDeleteDecoration, diffDeleteDecorationEmpty, diffLineAddDecorationBackground, diffLineAddDecorationBackgroundWithIndicator, diffLineDeleteDecorationBackground, diffLineDeleteDecorationBackgroundWithIndicator, diffWholeLineAddDecoration, diffWholeLineDeleteDecoration } from '../registrations.contribution.js';
+import { applyObservableDecorations } from '../utils.js';
+import { IModelDeltaDecoration } from '../../../../common/model.js';
 
 export class DiffEditorDecorations extends Disposable {
 	constructor(
@@ -28,7 +29,8 @@ export class DiffEditorDecorations extends Disposable {
 	}
 
 	private readonly _decorations = derived(this, (reader) => {
-		const diff = this._diffModel.read(reader)?.diff.read(reader);
+		const diffModel = this._diffModel.read(reader);
+		const diff = diffModel?.diff.read(reader);
 		if (!diff) {
 			return null;
 		}
@@ -56,13 +58,29 @@ export class DiffEditorDecorations extends Disposable {
 						modifiedDecorations.push({ range: m.lineRangeMapping.modified.toInclusiveRange()!, options: diffWholeLineAddDecoration });
 					}
 				} else {
+					const useInlineDiff = this._options.useTrueInlineDiffRendering.read(reader) && allowsTrueInlineDiffRendering(m.lineRangeMapping);
 					for (const i of m.lineRangeMapping.innerChanges || []) {
 						// Don't show empty markers outside the line range
 						if (m.lineRangeMapping.original.contains(i.originalRange.startLineNumber)) {
 							originalDecorations.push({ range: i.originalRange, options: (i.originalRange.isEmpty() && showEmptyDecorations) ? diffDeleteDecorationEmpty : diffDeleteDecoration });
 						}
 						if (m.lineRangeMapping.modified.contains(i.modifiedRange.startLineNumber)) {
-							modifiedDecorations.push({ range: i.modifiedRange, options: (i.modifiedRange.isEmpty() && showEmptyDecorations) ? diffAddDecorationEmpty : diffAddDecoration });
+							modifiedDecorations.push({ range: i.modifiedRange, options: (i.modifiedRange.isEmpty() && showEmptyDecorations && !useInlineDiff) ? diffAddDecorationEmpty : diffAddDecoration });
+						}
+						if (useInlineDiff) {
+							const deletedText = diffModel!.model.original.getValueInRange(i.originalRange);
+							modifiedDecorations.push({
+								range: i.modifiedRange,
+								options: {
+									description: 'deleted-text',
+									before: {
+										content: deletedText,
+										inlineClassName: 'inline-deleted-text',
+									},
+									zIndex: 100000,
+									showIfCollapsed: true,
+								}
+							});
 						}
 					}
 				}
diff --git a/src/vs/editor/browser/widget/diffEditor/components/diffEditorEditors.ts b/src/vs/editor/browser/widget/diffEditor/components/diffEditorEditors.ts
index 0169c380f04..5d8f652a485 100644
--- a/src/vs/editor/browser/widget/diffEditor/components/diffEditorEditors.ts
+++ b/src/vs/editor/browser/widget/diffEditor/components/diffEditorEditors.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IReader, autorunHandleChanges, derived, derivedOpts, observableFromEvent } from 'vs/base/common/observable';
-import { IEditorConstructionOptions } from 'vs/editor/browser/config/editorConfiguration';
-import { IDiffEditorConstructionOptions } from 'vs/editor/browser/editorBrowser';
-import { observableCodeEditor } from 'vs/editor/browser/observableUtilities';
-import { CodeEditorWidget, ICodeEditorWidgetOptions } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { IDiffCodeEditorWidgetOptions } from 'vs/editor/browser/widget/diffEditor/diffEditorWidget';
-import { OverviewRulerFeature } from 'vs/editor/browser/widget/diffEditor/features/overviewRulerFeature';
-import { EditorOptions, IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { Position } from 'vs/editor/common/core/position';
-import { IContentSizeChangedEvent } from 'vs/editor/common/editorCommon';
-import { localize } from 'vs/nls';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { DiffEditorOptions } from '../diffEditorOptions';
+import { Emitter } from '../../../../../base/common/event.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { IReader, autorunHandleChanges, derived, derivedOpts, observableFromEvent } from '../../../../../base/common/observable.js';
+import { IEditorConstructionOptions } from '../../../config/editorConfiguration.js';
+import { IDiffEditorConstructionOptions } from '../../../editorBrowser.js';
+import { observableCodeEditor } from '../../../observableCodeEditor.js';
+import { CodeEditorWidget, ICodeEditorWidgetOptions } from '../../codeEditor/codeEditorWidget.js';
+import { IDiffCodeEditorWidgetOptions } from '../diffEditorWidget.js';
+import { OverviewRulerFeature } from '../features/overviewRulerFeature.js';
+import { EditorOptions, IEditorOptions } from '../../../../common/config/editorOptions.js';
+import { Position } from '../../../../common/core/position.js';
+import { IContentSizeChangedEvent } from '../../../../common/editorCommon.js';
+import { localize } from '../../../../../nls.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { DiffEditorOptions } from '../diffEditorOptions.js';
 
 export class DiffEditorEditors extends Disposable {
 	public readonly original = this._register(this._createLeftHandSideEditor(this._options.editorOptions.get(), this._argCodeEditorWidgetOptions.originalEditor || {}));
@@ -27,15 +27,18 @@ export class DiffEditorEditors extends Disposable {
 	private readonly _onDidContentSizeChange = this._register(new Emitter<IContentSizeChangedEvent>());
 	public get onDidContentSizeChange() { return this._onDidContentSizeChange.event; }
 
-	public readonly modifiedScrollTop = observableFromEvent(this.modified.onDidScrollChange, () => /** @description modified.getScrollTop */ this.modified.getScrollTop());
-	public readonly modifiedScrollHeight = observableFromEvent(this.modified.onDidScrollChange, () => /** @description modified.getScrollHeight */ this.modified.getScrollHeight());
+	public readonly modifiedScrollTop = observableFromEvent(this, this.modified.onDidScrollChange, () => /** @description modified.getScrollTop */ this.modified.getScrollTop());
+	public readonly modifiedScrollHeight = observableFromEvent(this, this.modified.onDidScrollChange, () => /** @description modified.getScrollHeight */ this.modified.getScrollHeight());
 
-	public readonly modifiedModel = observableCodeEditor(this.modified).model;
+	public readonly modifiedObs = observableCodeEditor(this.modified);
+	public readonly originalObs = observableCodeEditor(this.original);
 
-	public readonly modifiedSelections = observableFromEvent(this.modified.onDidChangeCursorSelection, () => this.modified.getSelections() ?? []);
+	public readonly modifiedModel = this.modifiedObs.model;
+
+	public readonly modifiedSelections = observableFromEvent(this, this.modified.onDidChangeCursorSelection, () => this.modified.getSelections() ?? []);
 	public readonly modifiedCursor = derivedOpts({ owner: this, equalsFn: Position.equals }, reader => this.modifiedSelections.read(reader)[0]?.getPosition() ?? new Position(1, 1));
 
-	public readonly originalCursor = observableFromEvent(this.original.onDidChangeCursorPosition, () => this.original.getPosition() ?? new Position(1, 1));
+	public readonly originalCursor = observableFromEvent(this, this.original.onDidChangeCursorPosition, () => this.original.getPosition() ?? new Position(1, 1));
 
 	public readonly isOriginalFocused = observableCodeEditor(this.original).isFocused;
 	public readonly isModifiedFocused = observableCodeEditor(this.modified).isFocused;
diff --git a/src/vs/editor/browser/widget/diffEditor/components/diffEditorSash.ts b/src/vs/editor/browser/widget/diffEditor/components/diffEditorSash.ts
index 3361129a083..8abaddcceb9 100644
--- a/src/vs/editor/browser/widget/diffEditor/components/diffEditorSash.ts
+++ b/src/vs/editor/browser/widget/diffEditor/components/diffEditorSash.ts
@@ -3,11 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IBoundarySashes, ISashEvent, Orientation, Sash, SashState } from 'vs/base/browser/ui/sash/sash';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IObservable, IReader, ISettableObservable, autorun, observableValue } from 'vs/base/common/observable';
-import { DiffEditorOptions } from '../diffEditorOptions';
-import { derivedWithSetter } from 'vs/base/common/observableInternal/derived';
+import { IBoundarySashes, ISashEvent, Orientation, Sash, SashState } from '../../../../../base/browser/ui/sash/sash.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { IObservable, IReader, ISettableObservable, autorun, derivedWithSetter, observableValue } from '../../../../../base/common/observable.js';
+import { DiffEditorOptions } from '../diffEditorOptions.js';
 
 export class SashLayout {
 	public readonly sashLeft = derivedWithSetter(this, reader => {
diff --git a/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/diffEditorViewZones.ts b/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/diffEditorViewZones.ts
index d7c6be3e3a4..58e3c511825 100644
--- a/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/diffEditorViewZones.ts
+++ b/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/diffEditorViewZones.ts
@@ -3,33 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { $, addDisposableListener } from 'vs/base/browser/dom';
-import { ArrayQueue } from 'vs/base/common/arrays';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { Codicon } from 'vs/base/common/codicons';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { IObservable, autorun, derived, derivedWithStore, observableFromEvent, observableValue } from 'vs/base/common/observable';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { assertIsDefined } from 'vs/base/common/types';
-import { applyFontInfo } from 'vs/editor/browser/config/domFontInfo';
-import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { diffDeleteDecoration, diffRemoveIcon } from 'vs/editor/browser/widget/diffEditor/registrations.contribution';
-import { DiffEditorEditors } from 'vs/editor/browser/widget/diffEditor/components/diffEditorEditors';
-import { DiffEditorViewModel, DiffMapping } from 'vs/editor/browser/widget/diffEditor/diffEditorViewModel';
-import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditor/diffEditorWidget';
-import { InlineDiffDeletedCodeMargin } from 'vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/inlineDiffDeletedCodeMargin';
-import { LineSource, RenderOptions, renderLines } from 'vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/renderLines';
-import { IObservableViewZone, animatedObservable, joinCombine } from 'vs/editor/browser/widget/diffEditor/utils';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { LineRange } from 'vs/editor/common/core/lineRange';
-import { Position } from 'vs/editor/common/core/position';
-import { DetailedLineRangeMapping } from 'vs/editor/common/diff/rangeMapping';
-import { ScrollType } from 'vs/editor/common/editorCommon';
-import { BackgroundTokenizationState } from 'vs/editor/common/tokenizationTextModelPart';
-import { InlineDecoration, InlineDecorationType } from 'vs/editor/common/viewModel';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { DiffEditorOptions } from '../../diffEditorOptions';
+import { $, addDisposableListener } from '../../../../../../base/browser/dom.js';
+import { ArrayQueue } from '../../../../../../base/common/arrays.js';
+import { RunOnceScheduler } from '../../../../../../base/common/async.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { Disposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { IObservable, autorun, derived, derivedWithStore, observableFromEvent, observableValue } from '../../../../../../base/common/observable.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { assertIsDefined } from '../../../../../../base/common/types.js';
+import { applyFontInfo } from '../../../../config/domFontInfo.js';
+import { CodeEditorWidget } from '../../../codeEditor/codeEditorWidget.js';
+import { diffDeleteDecoration, diffRemoveIcon } from '../../registrations.contribution.js';
+import { DiffEditorEditors } from '../diffEditorEditors.js';
+import { DiffEditorViewModel, DiffMapping } from '../../diffEditorViewModel.js';
+import { DiffEditorWidget } from '../../diffEditorWidget.js';
+import { InlineDiffDeletedCodeMargin } from './inlineDiffDeletedCodeMargin.js';
+import { LineSource, RenderOptions, renderLines } from './renderLines.js';
+import { IObservableViewZone, animatedObservable, joinCombine } from '../../utils.js';
+import { EditorOption } from '../../../../../common/config/editorOptions.js';
+import { LineRange } from '../../../../../common/core/lineRange.js';
+import { Position } from '../../../../../common/core/position.js';
+import { DetailedLineRangeMapping } from '../../../../../common/diff/rangeMapping.js';
+import { ScrollType } from '../../../../../common/editorCommon.js';
+import { BackgroundTokenizationState } from '../../../../../common/tokenizationTextModelPart.js';
+import { InlineDecoration, InlineDecorationType } from '../../../../../common/viewModel.js';
+import { IClipboardService } from '../../../../../../platform/clipboard/common/clipboardService.js';
+import { IContextMenuService } from '../../../../../../platform/contextview/browser/contextView.js';
+import { DiffEditorOptions } from '../../diffEditorOptions.js';
+import { Range } from '../../../../../common/core/range.js';
 
 /**
  * Ensures both editors have the same height by aligning unchanged lines.
@@ -81,7 +82,7 @@ export class DiffEditorViewZones extends Disposable {
 		}));
 
 		const originalModelTokenizationCompleted = this._diffModel.map(m =>
-			m ? observableFromEvent(m.model.original.onDidChangeTokens, () => m.model.original.tokenization.backgroundTokenizationState === BackgroundTokenizationState.Completed) : undefined
+			m ? observableFromEvent(this, m.model.original.onDidChangeTokens, () => m.model.original.tokenization.backgroundTokenizationState === BackgroundTokenizationState.Completed) : undefined
 		).map((m, reader) => m?.read(reader));
 
 		const alignments = derived<ILineRangeAlignment[] | null>((reader) => {
@@ -187,7 +188,7 @@ export class DiffEditorViewZones extends Disposable {
 			const renderOptions = RenderOptions.fromEditor(this._editors.modified);
 
 			for (const a of alignmentsVal) {
-				if (a.diff && !renderSideBySide) {
+				if (a.diff && !renderSideBySide && (!this._options.useTrueInlineDiffRendering.read(reader) || !allowsTrueInlineDiffRendering(a.diff))) {
 					if (!a.originalRange.isEmpty) {
 						originalModelTokenizationCompleted.read(reader); // Update view-zones once tokenization completes
 
@@ -627,3 +628,17 @@ function getAdditionalLineHeights(editor: CodeEditorWidget, viewZonesToIgnore: R
 
 	return result;
 }
+
+export function allowsTrueInlineDiffRendering(mapping: DetailedLineRangeMapping): boolean {
+	if (!mapping.innerChanges) {
+		return false;
+	}
+	return mapping.innerChanges.every(c =>
+		(rangeIsSingleLine(c.modifiedRange) && rangeIsSingleLine(c.originalRange))
+		|| c.originalRange.equalsRange(new Range(1, 1, 1, 1))
+	);
+}
+
+function rangeIsSingleLine(range: Range): boolean {
+	return range.startLineNumber === range.endLineNumber;
+}
diff --git a/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/inlineDiffDeletedCodeMargin.ts b/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/inlineDiffDeletedCodeMargin.ts
index f6d88c3afe7..fa63055ff08 100644
--- a/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/inlineDiffDeletedCodeMargin.ts
+++ b/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/inlineDiffDeletedCodeMargin.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { addStandardDisposableListener, getDomNodePagePosition } from 'vs/base/browser/dom';
-import { Action } from 'vs/base/common/actions';
-import { Codicon } from 'vs/base/common/codicons';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { isIOS } from 'vs/base/common/platform';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
-import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditor/diffEditorWidget';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { DetailedLineRangeMapping } from 'vs/editor/common/diff/rangeMapping';
-import { EndOfLineSequence, ITextModel } from 'vs/editor/common/model';
-import { localize } from 'vs/nls';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
+import { addStandardDisposableListener, getDomNodePagePosition } from '../../../../../../base/browser/dom.js';
+import { Action } from '../../../../../../base/common/actions.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { isIOS } from '../../../../../../base/common/platform.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { IEditorMouseEvent, MouseTargetType } from '../../../../editorBrowser.js';
+import { CodeEditorWidget } from '../../../codeEditor/codeEditorWidget.js';
+import { DiffEditorWidget } from '../../diffEditorWidget.js';
+import { EditorOption } from '../../../../../common/config/editorOptions.js';
+import { DetailedLineRangeMapping } from '../../../../../common/diff/rangeMapping.js';
+import { EndOfLineSequence, ITextModel } from '../../../../../common/model.js';
+import { localize } from '../../../../../../nls.js';
+import { IClipboardService } from '../../../../../../platform/clipboard/common/clipboardService.js';
+import { IContextMenuService } from '../../../../../../platform/contextview/browser/contextView.js';
 
 export class InlineDiffDeletedCodeMargin extends Disposable {
 	private readonly _diffActions: HTMLElement;
diff --git a/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/renderLines.ts b/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/renderLines.ts
index f9d8b3f9a08..fc20d63c8f0 100644
--- a/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/renderLines.ts
+++ b/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/renderLines.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createTrustedTypesPolicy } from 'vs/base/browser/trustedTypes';
-import { applyFontInfo } from 'vs/editor/browser/config/domFontInfo';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorFontLigatures, EditorOption, FindComputedEditorOptionValueById } from 'vs/editor/common/config/editorOptions';
-import { FontInfo } from 'vs/editor/common/config/fontInfo';
-import { StringBuilder } from 'vs/editor/common/core/stringBuilder';
-import { ModelLineProjectionData } from 'vs/editor/common/modelLineProjectionData';
-import { IViewLineTokens, LineTokens } from 'vs/editor/common/tokens/lineTokens';
-import { LineDecoration } from 'vs/editor/common/viewLayout/lineDecorations';
-import { RenderLineInput, renderViewLine } from 'vs/editor/common/viewLayout/viewLineRenderer';
-import { InlineDecoration, ViewLineRenderingData } from 'vs/editor/common/viewModel';
+import { createTrustedTypesPolicy } from '../../../../../../base/browser/trustedTypes.js';
+import { applyFontInfo } from '../../../../config/domFontInfo.js';
+import { ICodeEditor } from '../../../../editorBrowser.js';
+import { EditorFontLigatures, EditorOption, FindComputedEditorOptionValueById } from '../../../../../common/config/editorOptions.js';
+import { FontInfo } from '../../../../../common/config/fontInfo.js';
+import { StringBuilder } from '../../../../../common/core/stringBuilder.js';
+import { ModelLineProjectionData } from '../../../../../common/modelLineProjectionData.js';
+import { IViewLineTokens, LineTokens } from '../../../../../common/tokens/lineTokens.js';
+import { LineDecoration } from '../../../../../common/viewLayout/lineDecorations.js';
+import { RenderLineInput, renderViewLine } from '../../../../../common/viewLayout/viewLineRenderer.js';
+import { InlineDecoration, ViewLineRenderingData } from '../../../../../common/viewModel.js';
 
 const ttPolicy = createTrustedTypesPolicy('diffEditorWidget', { createHTML: value => value });
 
diff --git a/src/vs/editor/browser/widget/diffEditor/delegatingEditorImpl.ts b/src/vs/editor/browser/widget/diffEditor/delegatingEditorImpl.ts
index 96a85f35eef..056db97f620 100644
--- a/src/vs/editor/browser/widget/diffEditor/delegatingEditorImpl.ts
+++ b/src/vs/editor/browser/widget/diffEditor/delegatingEditorImpl.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { IDimension } from 'vs/editor/common/core/dimension';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { ISelection, Selection } from 'vs/editor/common/core/selection';
-import { IDiffEditorViewModel, IEditor, IEditorAction, IEditorDecorationsCollection, IEditorModel, IEditorViewState, ScrollType } from 'vs/editor/common/editorCommon';
-import { IModelDecorationsChangeAccessor, IModelDeltaDecoration } from 'vs/editor/common/model';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { CodeEditorWidget } from '../codeEditor/codeEditorWidget.js';
+import { IEditorOptions } from '../../../common/config/editorOptions.js';
+import { IDimension } from '../../../common/core/dimension.js';
+import { IPosition, Position } from '../../../common/core/position.js';
+import { IRange, Range } from '../../../common/core/range.js';
+import { ISelection, Selection } from '../../../common/core/selection.js';
+import { IDiffEditorViewModel, IEditor, IEditorAction, IEditorDecorationsCollection, IEditorModel, IEditorViewState, ScrollType } from '../../../common/editorCommon.js';
+import { IModelDecorationsChangeAccessor, IModelDeltaDecoration } from '../../../common/model.js';
 
 export abstract class DelegatingEditor extends Disposable implements IEditor {
 	private static idCounter = 0;
diff --git a/src/vs/editor/browser/widget/diffEditor/diffEditor.contribution.ts b/src/vs/editor/browser/widget/diffEditor/diffEditor.contribution.ts
index 75017bce4c3..d264028a749 100644
--- a/src/vs/editor/browser/widget/diffEditor/diffEditor.contribution.ts
+++ b/src/vs/editor/browser/widget/diffEditor/diffEditor.contribution.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from 'vs/base/common/codicons';
-import { AccessibleDiffViewerNext, AccessibleDiffViewerPrev, CollapseAllUnchangedRegions, ExitCompareMove, RevertHunkOrSelection, ShowAllUnchangedRegions, SwitchSide, ToggleCollapseUnchangedRegions, ToggleShowMovedCodeBlocks, ToggleUseInlineViewWhenSpaceIsLimited } from 'vs/editor/browser/widget/diffEditor/commands';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { localize } from 'vs/nls';
-import { MenuId, MenuRegistry, registerAction2 } from 'vs/platform/actions/common/actions';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { ContextKeyEqualsExpr, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import './registrations.contribution';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { AccessibleDiffViewerNext, AccessibleDiffViewerPrev, CollapseAllUnchangedRegions, ExitCompareMove, RevertHunkOrSelection, ShowAllUnchangedRegions, SwitchSide, ToggleCollapseUnchangedRegions, ToggleShowMovedCodeBlocks, ToggleUseInlineViewWhenSpaceIsLimited } from './commands.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { localize } from '../../../../nls.js';
+import { MenuId, MenuRegistry, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { ContextKeyEqualsExpr, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import './registrations.contribution.js';
 
 registerAction2(ToggleCollapseUnchangedRegions);
 registerAction2(ToggleShowMovedCodeBlocks);
diff --git a/src/vs/editor/browser/widget/diffEditor/diffEditorOptions.ts b/src/vs/editor/browser/widget/diffEditor/diffEditorOptions.ts
index f5bbdb1b43f..0c1a533681f 100644
--- a/src/vs/editor/browser/widget/diffEditor/diffEditorOptions.ts
+++ b/src/vs/editor/browser/widget/diffEditor/diffEditorOptions.ts
@@ -3,11 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IObservable, ISettableObservable, derived, observableFromEvent, observableValue } from 'vs/base/common/observable';
-import { Constants } from 'vs/base/common/uint';
-import { diffEditorDefaultOptions } from 'vs/editor/common/config/diffEditor';
-import { IDiffEditorBaseOptions, IDiffEditorOptions, IEditorOptions, ValidDiffEditorBaseOptions, clampedFloat, clampedInt, boolean as validateBooleanOption, stringSet as validateStringSetOption } from 'vs/editor/common/config/editorOptions';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
+import { IObservable, ISettableObservable, derived, derivedConstOnceDefined, observableFromEvent, observableValue } from '../../../../base/common/observable.js';
+import { Constants } from '../../../../base/common/uint.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { diffEditorDefaultOptions } from '../../../common/config/diffEditor.js';
+import { IDiffEditorBaseOptions, IDiffEditorOptions, IEditorOptions, ValidDiffEditorBaseOptions, clampedFloat, clampedInt, boolean as validateBooleanOption, stringSet as validateStringSetOption } from '../../../common/config/editorOptions.js';
+import { LineRangeMapping } from '../../../common/diff/rangeMapping.js';
+import { allowsTrueInlineDiffRendering } from './components/diffEditorViewZones/diffEditorViewZones.js';
+import { DiffEditorViewModel, DiffState } from './diffEditorViewModel.js';
 
 export class DiffEditorOptions {
 	private readonly _options: ISettableObservable<IEditorOptions & Required<IDiffEditorBaseOptions>, { changedOptions: IDiffEditorOptions }>;
@@ -16,7 +19,7 @@ export class DiffEditorOptions {
 
 	private readonly _diffEditorWidth = observableValue<number>(this, 0);
 
-	private readonly _screenReaderMode = observableFromEvent(this._accessibilityService.onDidChangeScreenReaderOptimized, () => this._accessibilityService.isScreenReaderOptimized());
+	private readonly _screenReaderMode = observableFromEvent(this, this._accessibilityService.onDidChangeScreenReaderOptimized, () => this._accessibilityService.isScreenReaderOptimized());
 
 	constructor(
 		options: Readonly<IDiffEditorOptions>,
@@ -31,9 +34,16 @@ export class DiffEditorOptions {
 	);
 
 	public readonly renderOverviewRuler = derived(this, reader => this._options.read(reader).renderOverviewRuler);
-	public readonly renderSideBySide = derived(this, reader => this._options.read(reader).renderSideBySide
-		&& !(this._options.read(reader).useInlineViewWhenSpaceIsLimited && this.couldShowInlineViewBecauseOfSize.read(reader) && !this._screenReaderMode.read(reader))
-	);
+	public readonly renderSideBySide = derived(this, reader => {
+		if (this.compactMode.read(reader)) {
+			if (this.shouldRenderInlineViewInSmartMode.read(reader)) {
+				return false;
+			}
+		}
+
+		return this._options.read(reader).renderSideBySide
+			&& !(this._options.read(reader).useInlineViewWhenSpaceIsLimited && this.couldShowInlineViewBecauseOfSize.read(reader) && !this._screenReaderMode.read(reader));
+	});
 	public readonly readOnly = derived(this, reader => this._options.read(reader).readOnly);
 
 	public readonly shouldRenderOldRevertArrows = derived(this, reader => {
@@ -59,6 +69,14 @@ export class DiffEditorOptions {
 	public readonly diffAlgorithm = derived(this, reader => this._options.read(reader).diffAlgorithm);
 	public readonly showEmptyDecorations = derived(this, reader => this._options.read(reader).experimental.showEmptyDecorations!);
 	public readonly onlyShowAccessibleDiffViewer = derived(this, reader => this._options.read(reader).onlyShowAccessibleDiffViewer);
+	public readonly compactMode = derived(this, reader => this._options.read(reader).compactMode);
+	private readonly trueInlineDiffRenderingEnabled: IObservable<boolean> = derived(this, reader =>
+		this._options.read(reader).experimental.useTrueInlineView!
+	);
+
+	public readonly useTrueInlineDiffRendering: IObservable<boolean> = derived(this, reader =>
+		!this.renderSideBySide.read(reader) && this.trueInlineDiffRenderingEnabled.read(reader)
+	);
 
 	public readonly hideUnchangedRegions = derived(this, reader => this._options.read(reader).hideUnchangedRegions.enabled!);
 	public readonly hideUnchangedRegionsRevealLineCount = derived(this, reader => this._options.read(reader).hideUnchangedRegions.revealLineCount!);
@@ -74,9 +92,37 @@ export class DiffEditorOptions {
 	public setWidth(width: number): void {
 		this._diffEditorWidth.set(width, undefined);
 	}
+
+	private readonly _model = observableValue<DiffEditorViewModel | undefined>(this, undefined);
+
+	public setModel(model: DiffEditorViewModel | undefined) {
+		this._model.set(model, undefined);
+	}
+
+	private readonly shouldRenderInlineViewInSmartMode = this._model
+		.map(this, model => derivedConstOnceDefined(this, reader => {
+			const diffs = model?.diff.read(reader);
+			return diffs ? isSimpleDiff(diffs, this.trueInlineDiffRenderingEnabled.read(reader)) : undefined;
+		}))
+		.flatten()
+		.map(this, v => !!v);
+
+	public readonly inlineViewHideOriginalLineNumbers = this.compactMode;
 }
 
-function validateDiffEditorOptions(options: Readonly<IDiffEditorOptions>, defaults: ValidDiffEditorBaseOptions): ValidDiffEditorBaseOptions {
+function isSimpleDiff(diff: DiffState, supportsTrueDiffRendering: boolean): boolean {
+	return diff.mappings.every(m => isInsertion(m.lineRangeMapping) || isDeletion(m.lineRangeMapping) || (supportsTrueDiffRendering && allowsTrueInlineDiffRendering(m.lineRangeMapping)));
+}
+
+function isInsertion(mapping: LineRangeMapping): boolean {
+	return mapping.original.length === 0;
+}
+
+function isDeletion(mapping: LineRangeMapping): boolean {
+	return mapping.modified.length === 0;
+}
+
+function validateDiffEditorOptions(options: Readonly<IDiffEditorOptions>, defaults: typeof diffEditorDefaultOptions | ValidDiffEditorBaseOptions): ValidDiffEditorBaseOptions {
 	return {
 		enableSplitViewResizing: validateBooleanOption(options.enableSplitViewResizing, defaults.enableSplitViewResizing),
 		splitViewDefaultRatio: clampedFloat(options.splitViewDefaultRatio, 0.5, 0.1, 0.9),
@@ -95,6 +141,7 @@ function validateDiffEditorOptions(options: Readonly<IDiffEditorOptions>, defaul
 		experimental: {
 			showMoves: validateBooleanOption(options.experimental?.showMoves, defaults.experimental.showMoves!),
 			showEmptyDecorations: validateBooleanOption(options.experimental?.showEmptyDecorations, defaults.experimental.showEmptyDecorations!),
+			useTrueInlineView: validateBooleanOption(options.experimental?.useTrueInlineView, defaults.experimental.useTrueInlineView!),
 		},
 		hideUnchangedRegions: {
 			enabled: validateBooleanOption(options.hideUnchangedRegions?.enabled ?? (options.experimental as any)?.collapseUnchangedRegions, defaults.hideUnchangedRegions.enabled!),
@@ -107,5 +154,6 @@ function validateDiffEditorOptions(options: Readonly<IDiffEditorOptions>, defaul
 		renderSideBySideInlineBreakpoint: clampedInt(options.renderSideBySideInlineBreakpoint, defaults.renderSideBySideInlineBreakpoint, 0, Constants.MAX_SAFE_SMALL_INTEGER),
 		useInlineViewWhenSpaceIsLimited: validateBooleanOption(options.useInlineViewWhenSpaceIsLimited, defaults.useInlineViewWhenSpaceIsLimited),
 		renderGutterMenu: validateBooleanOption(options.renderGutterMenu, defaults.renderGutterMenu),
+		compactMode: validateBooleanOption(options.compactMode, defaults.compactMode),
 	};
 }
diff --git a/src/vs/editor/browser/widget/diffEditor/diffEditorViewModel.ts b/src/vs/editor/browser/widget/diffEditor/diffEditorViewModel.ts
index b1520c8821f..25a79288cc2 100644
--- a/src/vs/editor/browser/widget/diffEditor/diffEditorViewModel.ts
+++ b/src/vs/editor/browser/widget/diffEditor/diffEditorViewModel.ts
@@ -3,26 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IObservable, IReader, ISettableObservable, ITransaction, autorun, autorunWithStore, derived, observableSignal, observableSignalFromEvent, observableValue, transaction, waitForState } from 'vs/base/common/observable';
-import { IDiffProviderFactoryService } from 'vs/editor/browser/widget/diffEditor/diffProviderFactoryService';
-import { filterWithPrevious, readHotReloadableExport } from 'vs/editor/browser/widget/diffEditor/utils';
-import { ISerializedLineRange, LineRange, LineRangeSet } from 'vs/editor/common/core/lineRange';
-import { DefaultLinesDiffComputer } from 'vs/editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer';
-import { IDocumentDiff } from 'vs/editor/common/diff/documentDiffProvider';
-import { MovedText } from 'vs/editor/common/diff/linesDiffComputer';
-import { DetailedLineRangeMapping, LineRangeMapping, RangeMapping } from 'vs/editor/common/diff/rangeMapping';
-import { IDiffEditorModel, IDiffEditorViewModel } from 'vs/editor/common/editorCommon';
-import { ITextModel } from 'vs/editor/common/model';
-import { TextEditInfo } from 'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/beforeEditPositionMapper';
-import { combineTextEditInfos } from 'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/combineTextEditInfos';
-import { DiffEditorOptions } from './diffEditorOptions';
-import { optimizeSequenceDiffs } from 'vs/editor/common/diff/defaultLinesDiffComputer/heuristicSequenceOptimizations';
-import { isDefined } from 'vs/base/common/types';
-import { groupAdjacentBy } from 'vs/base/common/arrays';
-import { softAssert } from 'vs/base/common/assert';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { IObservable, IReader, ISettableObservable, ITransaction, autorun, autorunWithStore, derived, observableSignal, observableSignalFromEvent, observableValue, transaction, waitForState } from '../../../../base/common/observable.js';
+import { IDiffProviderFactoryService } from './diffProviderFactoryService.js';
+import { filterWithPrevious } from './utils.js';
+import { readHotReloadableExport } from '../../../../base/common/hotReloadHelpers.js';
+import { ISerializedLineRange, LineRange, LineRangeSet } from '../../../common/core/lineRange.js';
+import { DefaultLinesDiffComputer } from '../../../common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer.js';
+import { IDocumentDiff } from '../../../common/diff/documentDiffProvider.js';
+import { MovedText } from '../../../common/diff/linesDiffComputer.js';
+import { DetailedLineRangeMapping, LineRangeMapping, RangeMapping } from '../../../common/diff/rangeMapping.js';
+import { IDiffEditorModel, IDiffEditorViewModel } from '../../../common/editorCommon.js';
+import { ITextModel } from '../../../common/model.js';
+import { TextEditInfo } from '../../../common/model/bracketPairsTextModelPart/bracketPairsTree/beforeEditPositionMapper.js';
+import { combineTextEditInfos } from '../../../common/model/bracketPairsTextModelPart/bracketPairsTree/combineTextEditInfos.js';
+import { DiffEditorOptions } from './diffEditorOptions.js';
+import { optimizeSequenceDiffs } from '../../../common/diff/defaultLinesDiffComputer/heuristicSequenceOptimizations.js';
+import { isDefined } from '../../../../base/common/types.js';
+import { groupAdjacentBy } from '../../../../base/common/arrays.js';
+import { softAssert } from '../../../../base/common/assert.js';
 
 export class DiffEditorViewModel extends Disposable implements IDiffEditorViewModel {
 	private readonly _isDiffUpToDate = observableValue<boolean>(this, false);
@@ -393,6 +394,7 @@ function normalizeRangeMapping(rangeMapping: RangeMapping, original: ITextModel,
 	let originalRange = rangeMapping.originalRange;
 	let modifiedRange = rangeMapping.modifiedRange;
 	if (
+		originalRange.startColumn === 1 && modifiedRange.startColumn === 1 &&
 		(originalRange.endColumn !== 1 || modifiedRange.endColumn !== 1) &&
 		originalRange.endColumn === original.getLineMaxColumn(originalRange.endLineNumber)
 		&& modifiedRange.endColumn === modified.getLineMaxColumn(modifiedRange.endLineNumber)
diff --git a/src/vs/editor/browser/widget/diffEditor/diffEditorWidget.ts b/src/vs/editor/browser/widget/diffEditor/diffEditorWidget.ts
index 29942806d0c..da2e28f1c44 100644
--- a/src/vs/editor/browser/widget/diffEditor/diffEditorWidget.ts
+++ b/src/vs/editor/browser/widget/diffEditor/diffEditorWidget.ts
@@ -2,51 +2,51 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { getWindow, h } from 'vs/base/browser/dom';
-import { IBoundarySashes } from 'vs/base/browser/ui/sash/sash';
-import { findLast } from 'vs/base/common/arraysFind';
-import { BugIndicatingError, onUnexpectedError } from 'vs/base/common/errors';
-import { Event } from 'vs/base/common/event';
-import { toDisposable } from 'vs/base/common/lifecycle';
-import { IObservable, ITransaction, autorun, autorunWithStore, derived, observableFromEvent, observableValue, recomputeInitiallyAndOnChange, subtransaction, transaction } from 'vs/base/common/observable';
-import { derivedDisposable } from 'vs/base/common/observableInternal/derived';
-import 'vs/css!./style';
-import { IEditorConstructionOptions } from 'vs/editor/browser/config/editorConfiguration';
-import { ICodeEditor, IDiffEditor, IDiffEditorConstructionOptions } from 'vs/editor/browser/editorBrowser';
-import { EditorExtensionsRegistry, IDiffEditorContributionDescription } from 'vs/editor/browser/editorExtensions';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { StableEditorScrollState } from 'vs/editor/browser/stableEditorScroll';
-import { CodeEditorWidget, ICodeEditorWidgetOptions } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { AccessibleDiffViewer, AccessibleDiffViewerModelFromEditors } from 'vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer';
-import { DiffEditorDecorations } from 'vs/editor/browser/widget/diffEditor/components/diffEditorDecorations';
-import { DiffEditorSash, SashLayout } from 'vs/editor/browser/widget/diffEditor/components/diffEditorSash';
-import { DiffEditorViewZones } from 'vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/diffEditorViewZones';
-import { DiffEditorGutter } from 'vs/editor/browser/widget/diffEditor/features/gutterFeature';
-import { HideUnchangedRegionsFeature } from 'vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature';
-import { MovedBlocksLinesFeature } from 'vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature';
-import { OverviewRulerFeature } from 'vs/editor/browser/widget/diffEditor/features/overviewRulerFeature';
-import { RevertButtonsFeature } from 'vs/editor/browser/widget/diffEditor/features/revertButtonsFeature';
-import { CSSStyle, ObservableElementSizeObserver, applyStyle, applyViewZones, readHotReloadableExport, translatePosition } from 'vs/editor/browser/widget/diffEditor/utils';
-import { bindContextKey } from 'vs/platform/observable/common/platformObservableUtils';
-import { IDiffEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { IDimension } from 'vs/editor/common/core/dimension';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { CursorChangeReason, ICursorPositionChangedEvent } from 'vs/editor/common/cursorEvents';
-import { IDiffComputationResult, ILineChange } from 'vs/editor/common/diff/legacyLinesDiffComputer';
-import { LineRangeMapping, RangeMapping } from 'vs/editor/common/diff/rangeMapping';
-import { EditorType, IDiffEditorModel, IDiffEditorViewModel, IDiffEditorViewState } from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { IIdentifiedSingleEditOperation } from 'vs/editor/common/model';
-import { AccessibilitySignal, IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IEditorProgressService } from 'vs/platform/progress/common/progress';
-import { DiffEditorEditors } from './components/diffEditorEditors';
-import { DelegatingEditor } from './delegatingEditorImpl';
-import { DiffEditorOptions } from './diffEditorOptions';
-import { DiffEditorViewModel, DiffMapping, DiffState } from './diffEditorViewModel';
+import { getWindow, h } from '../../../../base/browser/dom.js';
+import { IBoundarySashes } from '../../../../base/browser/ui/sash/sash.js';
+import { findLast } from '../../../../base/common/arraysFind.js';
+import { BugIndicatingError, onUnexpectedError } from '../../../../base/common/errors.js';
+import { Event } from '../../../../base/common/event.js';
+import { readHotReloadableExport } from '../../../../base/common/hotReloadHelpers.js';
+import { toDisposable } from '../../../../base/common/lifecycle.js';
+import { IObservable, ITransaction, autorun, autorunWithStore, derived, derivedDisposable, disposableObservableValue, observableFromEvent, observableValue, recomputeInitiallyAndOnChange, subtransaction, transaction } from '../../../../base/common/observable.js';
+import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { bindContextKey } from '../../../../platform/observable/common/platformObservableUtils.js';
+import { IEditorProgressService } from '../../../../platform/progress/common/progress.js';
+import { IDiffEditorOptions } from '../../../common/config/editorOptions.js';
+import { IDimension } from '../../../common/core/dimension.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { CursorChangeReason, ICursorPositionChangedEvent } from '../../../common/cursorEvents.js';
+import { IDiffComputationResult, ILineChange } from '../../../common/diff/legacyLinesDiffComputer.js';
+import { LineRangeMapping, RangeMapping } from '../../../common/diff/rangeMapping.js';
+import { EditorType, IDiffEditorModel, IDiffEditorViewModel, IDiffEditorViewState } from '../../../common/editorCommon.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { IIdentifiedSingleEditOperation } from '../../../common/model.js';
+import { IEditorConstructionOptions } from '../../config/editorConfiguration.js';
+import { ICodeEditor, IDiffEditor, IDiffEditorConstructionOptions } from '../../editorBrowser.js';
+import { EditorExtensionsRegistry, IDiffEditorContributionDescription } from '../../editorExtensions.js';
+import { ICodeEditorService } from '../../services/codeEditorService.js';
+import { StableEditorScrollState } from '../../stableEditorScroll.js';
+import { CodeEditorWidget, ICodeEditorWidgetOptions } from '../codeEditor/codeEditorWidget.js';
+import { AccessibleDiffViewer, AccessibleDiffViewerModelFromEditors } from './components/accessibleDiffViewer.js';
+import { DiffEditorDecorations } from './components/diffEditorDecorations.js';
+import { DiffEditorEditors } from './components/diffEditorEditors.js';
+import { DiffEditorSash, SashLayout } from './components/diffEditorSash.js';
+import { DiffEditorViewZones } from './components/diffEditorViewZones/diffEditorViewZones.js';
+import { DelegatingEditor } from './delegatingEditorImpl.js';
+import { DiffEditorOptions } from './diffEditorOptions.js';
+import { DiffEditorViewModel, DiffMapping, DiffState } from './diffEditorViewModel.js';
+import { DiffEditorGutter } from './features/gutterFeature.js';
+import { HideUnchangedRegionsFeature } from './features/hideUnchangedRegionsFeature.js';
+import { MovedBlocksLinesFeature } from './features/movedBlocksLinesFeature.js';
+import { OverviewRulerFeature } from './features/overviewRulerFeature.js';
+import { RevertButtonsFeature } from './features/revertButtonsFeature.js';
+import './style.css';
+import { CSSStyle, ObservableElementSizeObserver, RefCounted, applyStyle, applyViewZones, translatePosition } from './utils.js';
 
 export interface IDiffCodeEditorWidgetOptions {
 	originalEditor?: ICodeEditorWidgetOptions;
@@ -61,8 +61,8 @@ export class DiffEditorWidget extends DelegatingEditor implements IDiffEditor {
 		h('div.editor.modified@modified', { style: { position: 'absolute', height: '100%', } }),
 		h('div.accessibleDiffViewer@accessibleDiffViewer', { style: { position: 'absolute', height: '100%' } }),
 	]);
-	private readonly _diffModel = observableValue<DiffEditorViewModel | undefined>(this, undefined);
-	private _shouldDisposeDiffModel = false;
+	private readonly _diffModelSrc = this._register(disposableObservableValue<RefCounted<DiffEditorViewModel> | undefined>(this, undefined));
+	private readonly _diffModel = derived<DiffEditorViewModel | undefined>(this, reader => this._diffModelSrc.read(reader)?.object);
 	public readonly onDidChangeModel = Event.fromObservableLight(this._diffModel);
 
 	public get onDidContentSizeChange() { return this._editors.onDidContentSizeChange; }
@@ -317,12 +317,6 @@ export class DiffEditorWidget extends DelegatingEditor implements IDiffEditor {
 			}
 		}));
 
-		this._register(toDisposable(() => {
-			if (this._shouldDisposeDiffModel) {
-				this._diffModel.get()?.dispose();
-			}
-		}));
-
 		this._register(autorunWithStore((reader, store) => {
 			store.add(new (readHotReloadableExport(RevertButtonsFeature, reader))(this._editors, this._diffModel, this._options, this));
 		}));
@@ -337,6 +331,10 @@ export class DiffEditorWidget extends DelegatingEditor implements IDiffEditor {
 				}));
 			}
 		}));
+
+		this._register(autorun(reader => {
+			this._options.setModel(this._diffModel.read(reader));
+		}));
 	}
 
 	public getViewWidth(): number {
@@ -386,8 +384,13 @@ export class DiffEditorWidget extends DelegatingEditor implements IDiffEditor {
 		} else {
 			gutterLeft = 0;
 
+			const shouldHideOriginalLineNumbers = this._options.inlineViewHideOriginalLineNumbers.read(reader);
 			originalLeft = gutterWidth;
-			originalWidth = Math.max(5, this._editors.original.getLayoutInfo().decorationsLeft);
+			if (shouldHideOriginalLineNumbers) {
+				originalWidth = 0;
+			} else {
+				originalWidth = Math.max(5, this._editors.originalObs.layoutInfoDecorationsLeft.read(reader));
+			}
 
 			modifiedLeft = gutterWidth + originalWidth;
 			modifiedWidth = fullWidth - modifiedLeft - overviewRulerPartWidth;
@@ -473,30 +476,36 @@ export class DiffEditorWidget extends DelegatingEditor implements IDiffEditor {
 
 	override getModel(): IDiffEditorModel | null { return this._diffModel.get()?.model ?? null; }
 
-	override setModel(model: IDiffEditorModel | null | IDiffEditorViewModel, tx?: ITransaction): void {
-		if (!model && this._diffModel.get()) {
+	override setModel(model: IDiffEditorModel | null | IDiffEditorViewModel): void {
+		const vm = !model ? null
+			: ('model' in model) ? RefCounted.create(model).createNewRef(this)
+				: RefCounted.create(this.createViewModel(model), this);
+		this.setDiffModel(vm);
+	}
+
+	setDiffModel(viewModel: RefCounted<IDiffEditorViewModel> | null, tx?: ITransaction): void {
+		const currentModel = this._diffModel.get();
+
+		if (!viewModel && currentModel) {
 			// Transitioning from a model to no-model
 			this._accessibleDiffViewer.get().close();
 		}
 
-		const vm = model ? ('model' in model) ? { model, shouldDispose: false } : { model: this.createViewModel(model), shouldDispose: true } : undefined;
-
-		if (this._diffModel.get() !== vm?.model) {
+		if (this._diffModel.get() !== viewModel?.object) {
 			subtransaction(tx, tx => {
+				const vm = viewModel?.object;
 				/** @description DiffEditorWidget.setModel */
 				observableFromEvent.batchEventsGlobally(tx, () => {
-					this._editors.original.setModel(vm ? vm.model.model.original : null);
-					this._editors.modified.setModel(vm ? vm.model.model.modified : null);
+					this._editors.original.setModel(vm ? vm.model.original : null);
+					this._editors.modified.setModel(vm ? vm.model.modified : null);
 				});
-				const prevValue = this._diffModel.get();
-				const shouldDispose = this._shouldDisposeDiffModel;
-
-				this._shouldDisposeDiffModel = vm?.shouldDispose ?? false;
-				this._diffModel.set(vm?.model as (DiffEditorViewModel | undefined), tx);
-
-				if (shouldDispose) {
-					prevValue?.dispose();
-				}
+				const prevValueRef = this._diffModelSrc.get()?.createNewRef(this);
+				this._diffModelSrc.set(viewModel?.createNewRef(this) as RefCounted<DiffEditorViewModel> | undefined, tx);
+				setTimeout(() => {
+					// async, so that this runs after the transaction finished.
+					// TODO: use the transaction to schedule disposal
+					prevValueRef?.dispose();
+				}, 0);
 			});
 		}
 	}
diff --git a/src/vs/editor/browser/widget/diffEditor/diffProviderFactoryService.ts b/src/vs/editor/browser/widget/diffEditor/diffProviderFactoryService.ts
index 467518518d1..ab087b4ffb6 100644
--- a/src/vs/editor/browser/widget/diffEditor/diffProviderFactoryService.ts
+++ b/src/vs/editor/browser/widget/diffEditor/diffProviderFactoryService.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IInstantiationService, createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { LineRange } from 'vs/editor/common/core/lineRange';
-import { IDocumentDiff, IDocumentDiffProvider, IDocumentDiffProviderOptions } from 'vs/editor/common/diff/documentDiffProvider';
-import { DetailedLineRangeMapping, RangeMapping } from 'vs/editor/common/diff/rangeMapping';
-import { ITextModel } from 'vs/editor/common/model';
-import { DiffAlgorithmName, IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IInstantiationService, createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { StopWatch } from '../../../../base/common/stopwatch.js';
+import { LineRange } from '../../../common/core/lineRange.js';
+import { IDocumentDiff, IDocumentDiffProvider, IDocumentDiffProviderOptions } from '../../../common/diff/documentDiffProvider.js';
+import { DetailedLineRangeMapping, RangeMapping } from '../../../common/diff/rangeMapping.js';
+import { ITextModel } from '../../../common/model.js';
+import { DiffAlgorithmName, IEditorWorkerService } from '../../../common/services/editorWorker.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 
 export const IDiffProviderFactoryService = createDecorator<IDiffProviderFactoryService>('diffProviderFactoryService');
 
@@ -152,7 +152,7 @@ export class WorkerBasedDocumentDiffProvider implements IDocumentDiffProvider, I
 
 		// max 10 items in cache
 		if (WorkerBasedDocumentDiffProvider.diffCache.size > 10) {
-			WorkerBasedDocumentDiffProvider.diffCache.delete(WorkerBasedDocumentDiffProvider.diffCache.keys().next().value);
+			WorkerBasedDocumentDiffProvider.diffCache.delete(WorkerBasedDocumentDiffProvider.diffCache.keys().next().value!);
 		}
 
 		WorkerBasedDocumentDiffProvider.diffCache.set(uriKey, { result, context });
diff --git a/src/vs/editor/browser/widget/diffEditor/embeddedDiffEditorWidget.ts b/src/vs/editor/browser/widget/diffEditor/embeddedDiffEditorWidget.ts
index 9156c17ead3..ce41de7bc70 100644
--- a/src/vs/editor/browser/widget/diffEditor/embeddedDiffEditorWidget.ts
+++ b/src/vs/editor/browser/widget/diffEditor/embeddedDiffEditorWidget.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as objects from 'vs/base/common/objects';
-import { ICodeEditor, IDiffEditorConstructionOptions } from 'vs/editor/browser/editorBrowser';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { DiffEditorWidget, IDiffCodeEditorWidgetOptions } from 'vs/editor/browser/widget/diffEditor/diffEditorWidget';
-import { ConfigurationChangedEvent, IDiffEditorOptions, IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IEditorProgressService } from 'vs/platform/progress/common/progress';
+import * as objects from '../../../../base/common/objects.js';
+import { ICodeEditor, IDiffEditorConstructionOptions } from '../../editorBrowser.js';
+import { ICodeEditorService } from '../../services/codeEditorService.js';
+import { DiffEditorWidget, IDiffCodeEditorWidgetOptions } from './diffEditorWidget.js';
+import { ConfigurationChangedEvent, IDiffEditorOptions, IEditorOptions } from '../../../common/config/editorOptions.js';
+import { IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IEditorProgressService } from '../../../../platform/progress/common/progress.js';
 export class EmbeddedDiffEditorWidget extends DiffEditorWidget {
 
 	private readonly _parentEditor: ICodeEditor;
diff --git a/src/vs/editor/browser/widget/diffEditor/features/gutterFeature.ts b/src/vs/editor/browser/widget/diffEditor/features/gutterFeature.ts
index e7c76c727cf..556378aebf3 100644
--- a/src/vs/editor/browser/widget/diffEditor/features/gutterFeature.ts
+++ b/src/vs/editor/browser/widget/diffEditor/features/gutterFeature.ts
@@ -3,41 +3,40 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { EventType, addDisposableListener, h } from 'vs/base/browser/dom';
-import { IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
-import { ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
-import { HoverPosition } from 'vs/base/browser/ui/hover/hoverWidget';
-import { IBoundarySashes } from 'vs/base/browser/ui/sash/sash';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IObservable, autorun, autorunWithStore, derived, observableFromEvent, observableValue } from 'vs/base/common/observable';
-import { derivedDisposable, derivedWithSetter } from 'vs/base/common/observableInternal/derived';
-import { URI } from 'vs/base/common/uri';
-import { DiffEditorEditors } from 'vs/editor/browser/widget/diffEditor/components/diffEditorEditors';
-import { DiffEditorSash, SashLayout } from 'vs/editor/browser/widget/diffEditor/components/diffEditorSash';
-import { DiffEditorOptions } from 'vs/editor/browser/widget/diffEditor/diffEditorOptions';
-import { DiffEditorViewModel } from 'vs/editor/browser/widget/diffEditor/diffEditorViewModel';
-import { appendRemoveOnDispose, applyStyle, prependRemoveOnDispose } from 'vs/editor/browser/widget/diffEditor/utils';
-import { EditorGutter, IGutterItemInfo, IGutterItemView } from 'vs/editor/browser/widget/diffEditor/utils/editorGutter';
-import { ActionRunnerWithContext } from 'vs/editor/browser/widget/multiDiffEditor/utils';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { LineRange, LineRangeSet } from 'vs/editor/common/core/lineRange';
-import { OffsetRange } from 'vs/editor/common/core/offsetRange';
-import { Range } from 'vs/editor/common/core/range';
-import { TextEdit } from 'vs/editor/common/core/textEdit';
-import { DetailedLineRangeMapping } from 'vs/editor/common/diff/rangeMapping';
-import { TextModelText } from 'vs/editor/common/model/textModelText';
-import { HiddenItemStrategy, MenuWorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
-import { IMenuService, MenuId } from 'vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { WorkbenchHoverDelegate } from 'vs/platform/hover/browser/hover';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { EventType, addDisposableListener, h } from '../../../../../base/browser/dom.js';
+import { IMouseWheelEvent } from '../../../../../base/browser/mouseEvent.js';
+import { ActionsOrientation } from '../../../../../base/browser/ui/actionbar/actionbar.js';
+import { HoverPosition } from '../../../../../base/browser/ui/hover/hoverWidget.js';
+import { IBoundarySashes } from '../../../../../base/browser/ui/sash/sash.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { IObservable, autorun, autorunWithStore, derived, derivedDisposable, derivedWithSetter, observableFromEvent, observableValue } from '../../../../../base/common/observable.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { HiddenItemStrategy, MenuWorkbenchToolBar } from '../../../../../platform/actions/browser/toolbar.js';
+import { IMenuService, MenuId } from '../../../../../platform/actions/common/actions.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { WorkbenchHoverDelegate } from '../../../../../platform/hover/browser/hover.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { EditorOption } from '../../../../common/config/editorOptions.js';
+import { LineRange, LineRangeSet } from '../../../../common/core/lineRange.js';
+import { OffsetRange } from '../../../../common/core/offsetRange.js';
+import { Range } from '../../../../common/core/range.js';
+import { TextEdit } from '../../../../common/core/textEdit.js';
+import { DetailedLineRangeMapping } from '../../../../common/diff/rangeMapping.js';
+import { TextModelText } from '../../../../common/model/textModelText.js';
+import { ActionRunnerWithContext } from '../../multiDiffEditor/utils.js';
+import { DiffEditorEditors } from '../components/diffEditorEditors.js';
+import { DiffEditorSash, SashLayout } from '../components/diffEditorSash.js';
+import { DiffEditorOptions } from '../diffEditorOptions.js';
+import { DiffEditorViewModel } from '../diffEditorViewModel.js';
+import { appendRemoveOnDispose, applyStyle, prependRemoveOnDispose } from '../utils.js';
+import { EditorGutter, IGutterItemInfo, IGutterItemView } from '../utils/editorGutter.js';
 
 const emptyArr: never[] = [];
 const width = 35;
 
 export class DiffEditorGutter extends Disposable {
 	private readonly _menu = this._register(this._menuService.createMenu(MenuId.DiffEditorHunkToolbar, this._contextKeyService));
-	private readonly _actions = observableFromEvent(this._menu.onDidChange, () => this._menu.getActions());
+	private readonly _actions = observableFromEvent(this, this._menu.onDidChange, () => this._menu.getActions());
 	private readonly _hasActions = this._actions.map(a => a.length > 0);
 	private readonly _showSash = derived(this, reader => this._options.renderSideBySide.read(reader) && this._hasActions.read(reader));
 
@@ -81,40 +80,42 @@ export class DiffEditorGutter extends Disposable {
 			);
 		}).recomputeInitiallyAndOnChange(this._store);
 
+		const gutterItems = derived(this, reader => {
+			const model = this._diffModel.read(reader);
+			if (!model) {
+				return [];
+			}
+			const diffs = model.diff.read(reader);
+			if (!diffs) { return []; }
+
+			const selection = this._selectedDiffs.read(reader);
+			if (selection.length > 0) {
+				const m = DetailedLineRangeMapping.fromRangeMappings(selection.flatMap(s => s.rangeMappings));
+				return [
+					new DiffGutterItem(
+						m,
+						true,
+						MenuId.DiffEditorSelectionToolbar,
+						undefined,
+						model.model.original.uri,
+						model.model.modified.uri,
+					)];
+			}
+
+			const currentDiff = this._currentDiff.read(reader);
+
+			return diffs.mappings.map(m => new DiffGutterItem(
+				m.lineRangeMapping.withInnerChangesFromLineRanges(),
+				m.lineRangeMapping === currentDiff?.lineRangeMapping,
+				MenuId.DiffEditorHunkToolbar,
+				undefined,
+				model.model.original.uri,
+				model.model.modified.uri,
+			));
+		});
+
 		this._register(new EditorGutter<DiffGutterItem>(this._editors.modified, this.elements.root, {
-			getIntersectingGutterItems: (range, reader) => {
-				const model = this._diffModel.read(reader);
-				if (!model) {
-					return [];
-				}
-				const diffs = model.diff.read(reader);
-				if (!diffs) { return []; }
-
-				const selection = this._selectedDiffs.read(reader);
-				if (selection.length > 0) {
-					const m = DetailedLineRangeMapping.fromRangeMappings(selection.flatMap(s => s.rangeMappings));
-					return [
-						new DiffGutterItem(
-							m,
-							true,
-							MenuId.DiffEditorSelectionToolbar,
-							undefined,
-							model.model.original.uri,
-							model.model.modified.uri,
-						)];
-				}
-
-				const currentDiff = this._currentDiff.read(reader);
-
-				return diffs.mappings.map(m => new DiffGutterItem(
-					m.lineRangeMapping.withInnerChangesFromLineRanges(),
-					m.lineRangeMapping === currentDiff?.lineRangeMapping,
-					MenuId.DiffEditorHunkToolbar,
-					undefined,
-					model.model.original.uri,
-					model.model.modified.uri,
-				));
-			},
+			getIntersectingGutterItems: (range, reader) => gutterItems.read(reader),
 			createView: (item, target) => {
 				return this._instantiationService.createInstance(DiffToolBar, item, target, this);
 			},
diff --git a/src/vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature.ts b/src/vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature.ts
index 248f2b46d81..e87fe47e055 100644
--- a/src/vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature.ts
+++ b/src/vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature.ts
@@ -3,35 +3,42 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { $, addDisposableListener, getWindow, h, reset } from 'vs/base/browser/dom';
-import { renderIcon, renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
-import { Codicon } from 'vs/base/common/codicons';
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { IObservable, IReader, autorun, derived, derivedWithStore, observableFromEvent, observableValue, transaction } from 'vs/base/common/observable';
-import { derivedDisposable } from 'vs/base/common/observableInternal/derived';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { isDefined } from 'vs/base/common/types';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { DiffEditorEditors } from 'vs/editor/browser/widget/diffEditor/components/diffEditorEditors';
-import { DiffEditorOptions } from 'vs/editor/browser/widget/diffEditor/diffEditorOptions';
-import { DiffEditorViewModel, RevealPreference, UnchangedRegion } from 'vs/editor/browser/widget/diffEditor/diffEditorViewModel';
-import { IObservableViewZone, PlaceholderViewZone, ViewZoneOverlayWidget, applyObservableDecorations, applyStyle } from 'vs/editor/browser/widget/diffEditor/utils';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { LineRange } from 'vs/editor/common/core/lineRange';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { CursorChangeReason } from 'vs/editor/common/cursorEvents';
-import { SymbolKind, SymbolKinds } from 'vs/editor/common/languages';
-import { IModelDecorationOptions, IModelDeltaDecoration, ITextModel } from 'vs/editor/common/model';
-import { localize } from 'vs/nls';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { $, addDisposableListener, getWindow, h, reset } from '../../../../../base/browser/dom.js';
+import { renderIcon, renderLabelWithIcons } from '../../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { MarkdownString } from '../../../../../base/common/htmlContent.js';
+import { Disposable, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { IObservable, IReader, autorun, derived, derivedDisposable, derivedWithStore, observableValue, transaction } from '../../../../../base/common/observable.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { isDefined } from '../../../../../base/common/types.js';
+import { localize } from '../../../../../nls.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { EditorOption } from '../../../../common/config/editorOptions.js';
+import { LineRange } from '../../../../common/core/lineRange.js';
+import { Position } from '../../../../common/core/position.js';
+import { Range } from '../../../../common/core/range.js';
+import { CursorChangeReason } from '../../../../common/cursorEvents.js';
+import { SymbolKind, SymbolKinds } from '../../../../common/languages.js';
+import { IModelDecorationOptions, IModelDeltaDecoration, ITextModel } from '../../../../common/model.js';
+import { ICodeEditor } from '../../../editorBrowser.js';
+import { observableCodeEditor } from '../../../observableCodeEditor.js';
+import { DiffEditorEditors } from '../components/diffEditorEditors.js';
+import { DiffEditorOptions } from '../diffEditorOptions.js';
+import { DiffEditorViewModel, RevealPreference, UnchangedRegion } from '../diffEditorViewModel.js';
+import { IObservableViewZone, PlaceholderViewZone, ViewZoneOverlayWidget, applyObservableDecorations, applyStyle } from '../utils.js';
 
 /**
  * Make sure to add the view zones to the editor!
  */
 export class HideUnchangedRegionsFeature extends Disposable {
-	private static readonly _breadcrumbsSourceFactory = observableValue<((textModel: ITextModel, instantiationService: IInstantiationService) => IDiffEditorBreadcrumbsSource) | undefined>('breadcrumbsSourceFactory', undefined);
+	private static readonly _breadcrumbsSourceFactory = observableValue<((textModel: ITextModel, instantiationService: IInstantiationService) => IDiffEditorBreadcrumbsSource)>(
+		HideUnchangedRegionsFeature, () => ({
+			dispose() {
+			},
+			getBreadcrumbItems(startRange, reader) {
+				return [];
+			},
+		}));
 	public static setBreadcrumbsSourceFactory(factory: (textModel: ITextModel, instantiationService: IInstantiationService) => IDiffEditorBreadcrumbsSource) {
 		this._breadcrumbsSourceFactory.set(factory, undefined);
 	}
@@ -97,41 +104,72 @@ export class HideUnchangedRegionsFeature extends Disposable {
 			const modViewZones: IObservableViewZone[] = [];
 			const sideBySide = this._options.renderSideBySide.read(reader);
 
+			const compactMode = this._options.compactMode.read(reader);
+
 			const curUnchangedRegions = unchangedRegions.read(reader);
-			for (const r of curUnchangedRegions) {
+			for (let i = 0; i < curUnchangedRegions.length; i++) {
+				const r = curUnchangedRegions[i];
 				if (r.shouldHideControls(reader)) {
 					continue;
 				}
 
-				{
-					const d = derived(this, reader => /** @description hiddenOriginalRangeStart */ r.getHiddenOriginalRange(reader).startLineNumber - 1);
-					const origVz = new PlaceholderViewZone(d, 24);
-					origViewZones.push(origVz);
-					store.add(new CollapsedCodeOverlayWidget(
-						this._editors.original,
-						origVz,
-						r,
-						r.originalUnchangedRange,
-						!sideBySide,
-						modifiedOutlineSource,
-						l => this._diffModel.get()!.ensureModifiedLineIsVisible(l, RevealPreference.FromBottom, undefined),
-						this._options,
-					));
+				if (compactMode && (i === 0 || i === curUnchangedRegions.length - 1)) {
+					continue;
 				}
-				{
-					const d = derived(this, reader => /** @description hiddenModifiedRangeStart */ r.getHiddenModifiedRange(reader).startLineNumber - 1);
-					const modViewZone = new PlaceholderViewZone(d, 24);
-					modViewZones.push(modViewZone);
-					store.add(new CollapsedCodeOverlayWidget(
-						this._editors.modified,
-						modViewZone,
-						r,
-						r.modifiedUnchangedRange,
-						false,
-						modifiedOutlineSource,
-						l => this._diffModel.get()!.ensureModifiedLineIsVisible(l, RevealPreference.FromBottom, undefined),
-						this._options,
-					));
+
+				if (compactMode) {
+					{
+						const d = derived(this, reader => /** @description hiddenOriginalRangeStart */ r.getHiddenOriginalRange(reader).startLineNumber - 1);
+						const origVz = new PlaceholderViewZone(d, 12);
+						origViewZones.push(origVz);
+						store.add(new CompactCollapsedCodeOverlayWidget(
+							this._editors.original,
+							origVz,
+							r,
+							!sideBySide,
+						));
+					}
+					{
+						const d = derived(this, reader => /** @description hiddenModifiedRangeStart */ r.getHiddenModifiedRange(reader).startLineNumber - 1);
+						const modViewZone = new PlaceholderViewZone(d, 12);
+						modViewZones.push(modViewZone);
+						store.add(new CompactCollapsedCodeOverlayWidget(
+							this._editors.modified,
+							modViewZone,
+							r,
+						));
+					}
+				} else {
+					{
+						const d = derived(this, reader => /** @description hiddenOriginalRangeStart */ r.getHiddenOriginalRange(reader).startLineNumber - 1);
+						const origVz = new PlaceholderViewZone(d, 24);
+						origViewZones.push(origVz);
+						store.add(new CollapsedCodeOverlayWidget(
+							this._editors.original,
+							origVz,
+							r,
+							r.originalUnchangedRange,
+							!sideBySide,
+							modifiedOutlineSource,
+							l => this._diffModel.get()!.ensureModifiedLineIsVisible(l, RevealPreference.FromBottom, undefined),
+							this._options,
+						));
+					}
+					{
+						const d = derived(this, reader => /** @description hiddenModifiedRangeStart */ r.getHiddenModifiedRange(reader).startLineNumber - 1);
+						const modViewZone = new PlaceholderViewZone(d, 24);
+						modViewZones.push(modViewZone);
+						store.add(new CollapsedCodeOverlayWidget(
+							this._editors.modified,
+							modViewZone,
+							r,
+							r.modifiedUnchangedRange,
+							false,
+							modifiedOutlineSource,
+							l => this._diffModel.get()!.ensureModifiedLineIsVisible(l, RevealPreference.FromBottom, undefined),
+							this._options,
+						));
+					}
 				}
 			}
 
@@ -228,6 +266,39 @@ export class HideUnchangedRegionsFeature extends Disposable {
 	}
 }
 
+class CompactCollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
+	private readonly _nodes = h('div.diff-hidden-lines-compact', [
+		h('div.line-left', []),
+		h('div.text@text', []),
+		h('div.line-right', [])
+	]);
+
+	constructor(
+		editor: ICodeEditor,
+		_viewZone: PlaceholderViewZone,
+		private readonly _unchangedRegion: UnchangedRegion,
+		private readonly _hide: boolean = false,
+	) {
+		const root = h('div.diff-hidden-lines-widget');
+		super(editor, _viewZone, root.root);
+		root.root.appendChild(this._nodes.root);
+
+		if (this._hide) {
+			this._nodes.root.replaceChildren();
+		}
+
+		this._register(autorun(reader => {
+			/** @description update labels */
+
+			if (!this._hide) {
+				const lineCount = this._unchangedRegion.getHiddenModifiedRange(reader).length;
+				const linesHiddenText = localize('hiddenLines', '{0} hidden lines', lineCount);
+				this._nodes.text.innerText = linesHiddenText;
+			}
+		}));
+	}
+}
+
 class CollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
 	private readonly _nodes = h('div.diff-hidden-lines', [
 		h('div.top@top', { title: localize('diff.hiddenLines.top', 'Click or drag to show more above') }),
@@ -255,12 +326,8 @@ class CollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
 		super(_editor, _viewZone, root.root);
 		root.root.appendChild(this._nodes.root);
 
-		const layoutInfo = observableFromEvent(this._editor.onDidLayoutChange, () =>
-			this._editor.getLayoutInfo()
-		);
-
 		if (!this._hide) {
-			this._register(applyStyle(this._nodes.first, { width: layoutInfo.map((l) => l.contentLeft) }));
+			this._register(applyStyle(this._nodes.first, { width: observableCodeEditor(this._editor).layoutInfoContentLeft }));
 		} else {
 			reset(this._nodes.first);
 		}
diff --git a/src/vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature.ts b/src/vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature.ts
index 7d0d3a992c1..a06947da06d 100644
--- a/src/vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature.ts
+++ b/src/vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature.ts
@@ -3,31 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { h } from 'vs/base/browser/dom';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { Action } from 'vs/base/common/actions';
-import { booleanComparator, compareBy, numberComparator, tieBreakComparators } from 'vs/base/common/arrays';
-import { findMaxIdx } from 'vs/base/common/arraysFind';
-import { Codicon } from 'vs/base/common/codicons';
-import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IObservable, autorun, autorunHandleChanges, autorunWithStore, constObservable, derived, derivedWithStore, observableFromEvent, observableSignalFromEvent, observableValue, recomputeInitiallyAndOnChange } from 'vs/base/common/observable';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { DiffEditorEditors } from 'vs/editor/browser/widget/diffEditor/components/diffEditorEditors';
-import { DiffEditorViewModel } from 'vs/editor/browser/widget/diffEditor/diffEditorViewModel';
-import { PlaceholderViewZone, ViewZoneOverlayWidget, applyStyle, applyViewZones } from 'vs/editor/browser/widget/diffEditor/utils';
-import { EditorLayoutInfo } from 'vs/editor/common/config/editorOptions';
-import { LineRange } from 'vs/editor/common/core/lineRange';
-import { OffsetRange, OffsetRangeSet } from 'vs/editor/common/core/offsetRange';
-import { MovedText } from 'vs/editor/common/diff/linesDiffComputer';
-import { localize } from 'vs/nls';
+import { h } from '../../../../../base/browser/dom.js';
+import { ActionBar } from '../../../../../base/browser/ui/actionbar/actionbar.js';
+import { Action } from '../../../../../base/common/actions.js';
+import { booleanComparator, compareBy, numberComparator, tieBreakComparators } from '../../../../../base/common/arrays.js';
+import { findMaxIdx } from '../../../../../base/common/arraysFind.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { Disposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { IObservable, autorun, autorunHandleChanges, autorunWithStore, constObservable, derived, derivedWithStore, observableFromEvent, observableSignalFromEvent, observableValue, recomputeInitiallyAndOnChange } from '../../../../../base/common/observable.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { ICodeEditor } from '../../../editorBrowser.js';
+import { DiffEditorEditors } from '../components/diffEditorEditors.js';
+import { DiffEditorViewModel } from '../diffEditorViewModel.js';
+import { PlaceholderViewZone, ViewZoneOverlayWidget, applyStyle, applyViewZones } from '../utils.js';
+import { EditorLayoutInfo } from '../../../../common/config/editorOptions.js';
+import { LineRange } from '../../../../common/core/lineRange.js';
+import { OffsetRange, OffsetRangeSet } from '../../../../common/core/offsetRange.js';
+import { MovedText } from '../../../../common/diff/linesDiffComputer.js';
+import { localize } from '../../../../../nls.js';
 
 export class MovedBlocksLinesFeature extends Disposable {
 	public static readonly movedCodeBlockPadding = 4;
 
 	private readonly _element: SVGElement;
-	private readonly _originalScrollTop = observableFromEvent(this._editors.original.onDidScrollChange, () => this._editors.original.getScrollTop());
-	private readonly _modifiedScrollTop = observableFromEvent(this._editors.modified.onDidScrollChange, () => this._editors.modified.getScrollTop());
+	private readonly _originalScrollTop = observableFromEvent(this, this._editors.original.onDidScrollChange, () => this._editors.original.getScrollTop());
+	private readonly _modifiedScrollTop = observableFromEvent(this, this._editors.modified.onDidScrollChange, () => this._editors.modified.getScrollTop());
 	private readonly _viewZonesChanged = observableSignalFromEvent('onDidChangeViewZones', this._editors.modified.onDidChangeViewZones);
 
 	public readonly width = observableValue(this, 0);
diff --git a/src/vs/editor/browser/widget/diffEditor/features/overviewRulerFeature.ts b/src/vs/editor/browser/widget/diffEditor/features/overviewRulerFeature.ts
index 8141cd9452c..1db18e1478b 100644
--- a/src/vs/editor/browser/widget/diffEditor/features/overviewRulerFeature.ts
+++ b/src/vs/editor/browser/widget/diffEditor/features/overviewRulerFeature.ts
@@ -3,27 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { EventType, addDisposableListener, addStandardDisposableListener, h } from 'vs/base/browser/dom';
-import { createFastDomNode } from 'vs/base/browser/fastDomNode';
-import { IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
-import { ScrollbarState } from 'vs/base/browser/ui/scrollbar/scrollbarState';
-import { Color } from 'vs/base/common/color';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IObservable, autorun, autorunWithStore, derived, observableFromEvent, observableSignalFromEvent } from 'vs/base/common/observable';
-import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { DiffEditorEditors } from 'vs/editor/browser/widget/diffEditor/components/diffEditorEditors';
-import { DiffEditorViewModel } from 'vs/editor/browser/widget/diffEditor/diffEditorViewModel';
-import { appendRemoveOnDispose } from 'vs/editor/browser/widget/diffEditor/utils';
-import { EditorLayoutInfo, EditorOption } from 'vs/editor/common/config/editorOptions';
-import { LineRange } from 'vs/editor/common/core/lineRange';
-import { Position } from 'vs/editor/common/core/position';
-import { OverviewRulerZone } from 'vs/editor/common/viewModel/overviewZoneManager';
-import { defaultInsertColor, defaultRemoveColor, diffInserted, diffOverviewRulerInserted, diffOverviewRulerRemoved, diffRemoved } from 'vs/platform/theme/common/colorRegistry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { EventType, addDisposableListener, addStandardDisposableListener, h } from '../../../../../base/browser/dom.js';
+import { createFastDomNode } from '../../../../../base/browser/fastDomNode.js';
+import { IMouseWheelEvent } from '../../../../../base/browser/mouseEvent.js';
+import { ScrollbarState } from '../../../../../base/browser/ui/scrollbar/scrollbarState.js';
+import { Color } from '../../../../../base/common/color.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { IObservable, autorun, autorunWithStore, derived, observableFromEvent, observableSignalFromEvent } from '../../../../../base/common/observable.js';
+import { CodeEditorWidget } from '../../codeEditor/codeEditorWidget.js';
+import { DiffEditorEditors } from '../components/diffEditorEditors.js';
+import { DiffEditorViewModel } from '../diffEditorViewModel.js';
+import { appendRemoveOnDispose } from '../utils.js';
+import { EditorLayoutInfo, EditorOption } from '../../../../common/config/editorOptions.js';
+import { LineRange } from '../../../../common/core/lineRange.js';
+import { Position } from '../../../../common/core/position.js';
+import { OverviewRulerZone } from '../../../../common/viewModel/overviewZoneManager.js';
+import { defaultInsertColor, defaultRemoveColor, diffInserted, diffOverviewRulerInserted, diffOverviewRulerRemoved, diffRemoved } from '../../../../../platform/theme/common/colorRegistry.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
 
 export class OverviewRulerFeature extends Disposable {
 	private static readonly ONE_OVERVIEW_WIDTH = 15;
-	public static readonly ENTIRE_DIFF_OVERVIEW_WIDTH = OverviewRulerFeature.ONE_OVERVIEW_WIDTH * 2;
+	public static readonly ENTIRE_DIFF_OVERVIEW_WIDTH = this.ONE_OVERVIEW_WIDTH * 2;
 	public readonly width = OverviewRulerFeature.ENTIRE_DIFF_OVERVIEW_WIDTH;
 
 	constructor(
diff --git a/src/vs/editor/browser/widget/diffEditor/features/revertButtonsFeature.ts b/src/vs/editor/browser/widget/diffEditor/features/revertButtonsFeature.ts
index b2a7d382320..2d94b6e0657 100644
--- a/src/vs/editor/browser/widget/diffEditor/features/revertButtonsFeature.ts
+++ b/src/vs/editor/browser/widget/diffEditor/features/revertButtonsFeature.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { addDisposableListener, h, EventType } from 'vs/base/browser/dom';
-import { renderIcon } from 'vs/base/browser/ui/iconLabel/iconLabels';
-import { Codicon } from 'vs/base/common/codicons';
-import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IObservable, autorunWithStore, derived } from 'vs/base/common/observable';
-import { IGlyphMarginWidget, IGlyphMarginWidgetPosition } from 'vs/editor/browser/editorBrowser';
-import { DiffEditorEditors } from 'vs/editor/browser/widget/diffEditor/components/diffEditorEditors';
-import { DiffEditorOptions } from 'vs/editor/browser/widget/diffEditor/diffEditorOptions';
-import { DiffEditorViewModel } from 'vs/editor/browser/widget/diffEditor/diffEditorViewModel';
-import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditor/diffEditorWidget';
-import { LineRange, LineRangeSet } from 'vs/editor/common/core/lineRange';
-import { Range } from 'vs/editor/common/core/range';
-import { LineRangeMapping, RangeMapping } from 'vs/editor/common/diff/rangeMapping';
-import { GlyphMarginLane } from 'vs/editor/common/model';
-import { localize } from 'vs/nls';
+import { addDisposableListener, h, EventType } from '../../../../../base/browser/dom.js';
+import { renderIcon } from '../../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { Disposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { IObservable, autorunWithStore, derived } from '../../../../../base/common/observable.js';
+import { IGlyphMarginWidget, IGlyphMarginWidgetPosition } from '../../../editorBrowser.js';
+import { DiffEditorEditors } from '../components/diffEditorEditors.js';
+import { DiffEditorOptions } from '../diffEditorOptions.js';
+import { DiffEditorViewModel } from '../diffEditorViewModel.js';
+import { DiffEditorWidget } from '../diffEditorWidget.js';
+import { LineRange, LineRangeSet } from '../../../../common/core/lineRange.js';
+import { Range } from '../../../../common/core/range.js';
+import { LineRangeMapping, RangeMapping } from '../../../../common/diff/rangeMapping.js';
+import { GlyphMarginLane } from '../../../../common/model.js';
+import { localize } from '../../../../../nls.js';
 
 const emptyArr: never[] = [];
 
diff --git a/src/vs/editor/browser/widget/diffEditor/registrations.contribution.ts b/src/vs/editor/browser/widget/diffEditor/registrations.contribution.ts
index 36bd4d465ff..2194ddadb7c 100644
--- a/src/vs/editor/browser/widget/diffEditor/registrations.contribution.ts
+++ b/src/vs/editor/browser/widget/diffEditor/registrations.contribution.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { localize } from 'vs/nls';
-import { registerColor } from 'vs/platform/theme/common/colorRegistry';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { ModelDecorationOptions } from '../../../common/model/textModel.js';
+import { localize } from '../../../../nls.js';
+import { registerColor } from '../../../../platform/theme/common/colorRegistry.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 
 export const diffMoveBorder = registerColor(
 	'diffEditor.move.border',
-	{ dark: '#8b8b8b9c', light: '#8b8b8b9c', hcDark: '#8b8b8b9c', hcLight: '#8b8b8b9c', },
+	'#8b8b8b9c',
 	localize('diffEditor.move.border', 'The border color for text that got moved in the diff editor.')
 );
 
 export const diffMoveBorderActive = registerColor(
 	'diffEditor.moveActive.border',
-	{ dark: '#FFA500', light: '#FFA500', hcDark: '#FFA500', hcLight: '#FFA500', },
+	'#FFA500',
 	localize('diffEditor.moveActive.border', 'The active border color for text that got moved in the diff editor.')
 );
 
diff --git a/src/vs/editor/browser/widget/diffEditor/style.css b/src/vs/editor/browser/widget/diffEditor/style.css
index ebb52234658..4489d84be38 100644
--- a/src/vs/editor/browser/widget/diffEditor/style.css
+++ b/src/vs/editor/browser/widget/diffEditor/style.css
@@ -276,10 +276,14 @@
 	background-color: var(--vscode-diffEditorGutter-insertedLineBackground, var(--vscode-diffEditor-insertedLineBackground), var(--vscode-diffEditor-insertedTextBackground));
 }
 
-.monaco-editor .char-delete, .monaco-diff-editor .char-delete {
+.monaco-editor .char-delete, .monaco-diff-editor .char-delete, .monaco-editor .inline-deleted-text {
 	background-color: var(--vscode-diffEditor-removedTextBackground);
 }
 
+.monaco-editor .inline-deleted-text {
+	text-decoration: line-through;
+}
+
 .monaco-editor .line-delete, .monaco-diff-editor .line-delete {
 	background-color: var(--vscode-diffEditor-removedLineBackground, var(--vscode-diffEditor-removedTextBackground));
 }
@@ -395,3 +399,29 @@
 		}
 	}
 }
+
+
+.monaco-diff-editor .diff-hidden-lines-compact {
+	display: flex;
+	height: 11px;
+	.line-left, .line-right {
+		height: 1px;
+		border-top: 1px solid;
+		border-color: var(--vscode-editorCodeLens-foreground);
+		opacity: 0.5;
+		margin: auto;
+		width: 100%;
+	}
+
+	.line-left {
+		width: 20px;
+	}
+
+	.text {
+		color: var(--vscode-editorCodeLens-foreground);
+		text-wrap: nowrap;
+		font-size: 11px;
+		line-height: 11px;
+		margin: 0 4px;
+	}
+}
diff --git a/src/vs/editor/browser/widget/diffEditor/utils.ts b/src/vs/editor/browser/widget/diffEditor/utils.ts
index 99d9580c94a..d34d60fd457 100644
--- a/src/vs/editor/browser/widget/diffEditor/utils.ts
+++ b/src/vs/editor/browser/widget/diffEditor/utils.ts
@@ -3,19 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDimension } from 'vs/base/browser/dom';
-import { findLast } from 'vs/base/common/arraysFind';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { isHotReloadEnabled, registerHotReloadHandler } from 'vs/base/common/hotReload';
-import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IObservable, IReader, ISettableObservable, autorun, autorunHandleChanges, autorunOpts, autorunWithStore, observableSignalFromEvent, observableValue, transaction } from 'vs/base/common/observable';
-import { ElementSizeObserver } from 'vs/editor/browser/config/elementSizeObserver';
-import { ICodeEditor, IOverlayWidget, IViewZone } from 'vs/editor/browser/editorBrowser';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { DetailedLineRangeMapping } from 'vs/editor/common/diff/rangeMapping';
-import { IModelDeltaDecoration } from 'vs/editor/common/model';
-import { TextLength } from 'vs/editor/common/core/textLength';
+import { IDimension } from '../../../../base/browser/dom.js';
+import { findLast } from '../../../../base/common/arraysFind.js';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { Disposable, DisposableStore, IDisposable, IReference, toDisposable } from '../../../../base/common/lifecycle.js';
+import { IObservable, ISettableObservable, autorun, autorunHandleChanges, autorunOpts, autorunWithStore, observableValue, transaction } from '../../../../base/common/observable.js';
+import { ElementSizeObserver } from '../../config/elementSizeObserver.js';
+import { ICodeEditor, IOverlayWidget, IViewZone } from '../../editorBrowser.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { DetailedLineRangeMapping } from '../../../common/diff/rangeMapping.js';
+import { IModelDeltaDecoration } from '../../../common/model.js';
+import { TextLength } from '../../../common/core/textLength.js';
 
 export function joinCombine<T>(arr1: readonly T[], arr2: readonly T[], keySelector: (val: T) => number, combine: (v1: T, v2: T) => T): readonly T[] {
 	if (arr1.length === 0) {
@@ -180,7 +179,7 @@ function easeOutExpo(t: number, b: number, c: number, d: number): number {
 }
 
 export function deepMerge<T extends {}>(source1: T, source2: Partial<T>): T {
-	const result = {} as T;
+	const result = {} as any as T;
 	for (const key in source1) {
 		result[key] = source1[key];
 	}
@@ -298,29 +297,6 @@ export function applyStyle(domNode: HTMLElement, style: Partial<{ [TKey in keyof
 	});
 }
 
-export function readHotReloadableExport<T>(value: T, reader: IReader | undefined): T {
-	observeHotReloadableExports([value], reader);
-	return value;
-}
-
-export function observeHotReloadableExports(values: any[], reader: IReader | undefined): void {
-	if (isHotReloadEnabled()) {
-		const o = observableSignalFromEvent(
-			'reload',
-			event => registerHotReloadHandler(({ oldExports }) => {
-				if (![...Object.values(oldExports)].some(v => values.includes(v))) {
-					return undefined;
-				}
-				return (_newExports) => {
-					event(undefined);
-					return true;
-				};
-			})
-		);
-		o.read(reader);
-	}
-}
-
 export function applyViewZones(editor: ICodeEditor, viewZones: IObservable<IObservableViewZone[]>, setIsUpdating?: (isUpdatingViewZones: boolean) => void, zoneIds?: Set<string>): IDisposable {
 	const store = new DisposableStore();
 	const lastViewZoneIds: string[] = [];
@@ -439,3 +415,104 @@ export function filterWithPrevious<T>(arr: T[], filter: (cur: T, prev: T | undef
 		return result;
 	});
 }
+
+export interface IRefCounted extends IDisposable {
+	createNewRef(): this;
+}
+
+export abstract class RefCounted<T> implements IDisposable, IReference<T> {
+	public static create<T extends IDisposable>(value: T, debugOwner: object | undefined = undefined): RefCounted<T> {
+		return new BaseRefCounted(value, value, debugOwner);
+	}
+
+	public static createWithDisposable<T extends IDisposable>(value: T, disposable: IDisposable, debugOwner: object | undefined = undefined): RefCounted<T> {
+		const store = new DisposableStore();
+		store.add(disposable);
+		store.add(value);
+		return new BaseRefCounted(value, store, debugOwner);
+	}
+
+	public static createOfNonDisposable<T>(value: T, disposable: IDisposable, debugOwner: object | undefined = undefined): RefCounted<T> {
+		return new BaseRefCounted(value, disposable, debugOwner);
+	}
+
+	public abstract createNewRef(debugOwner?: object | undefined): RefCounted<T>;
+
+	public abstract dispose(): void;
+
+	public abstract get object(): T;
+}
+
+class BaseRefCounted<T> extends RefCounted<T> {
+	private _refCount = 1;
+	private _isDisposed = false;
+	private readonly _owners: object[] = [];
+
+	constructor(
+		public override readonly object: T,
+		private readonly _disposable: IDisposable,
+		private readonly _debugOwner: object | undefined,
+	) {
+		super();
+
+		if (_debugOwner) {
+			this._addOwner(_debugOwner);
+		}
+	}
+
+	private _addOwner(debugOwner: object | undefined) {
+		if (debugOwner) {
+			this._owners.push(debugOwner);
+		}
+	}
+
+	public createNewRef(debugOwner?: object | undefined): RefCounted<T> {
+		this._refCount++;
+		if (debugOwner) {
+			this._addOwner(debugOwner);
+		}
+		return new ClonedRefCounted(this, debugOwner);
+	}
+
+	public dispose(): void {
+		if (this._isDisposed) { return; }
+		this._isDisposed = true;
+		this._decreaseRefCount(this._debugOwner);
+	}
+
+	public _decreaseRefCount(debugOwner?: object | undefined): void {
+		this._refCount--;
+		if (this._refCount === 0) {
+			this._disposable.dispose();
+		}
+
+		if (debugOwner) {
+			const idx = this._owners.indexOf(debugOwner);
+			if (idx !== -1) {
+				this._owners.splice(idx, 1);
+			}
+		}
+	}
+}
+
+class ClonedRefCounted<T> extends RefCounted<T> {
+	private _isDisposed = false;
+	constructor(
+		private readonly _base: BaseRefCounted<T>,
+		private readonly _debugOwner: object | undefined,
+	) {
+		super();
+	}
+
+	public get object(): T { return this._base.object; }
+
+	public createNewRef(debugOwner?: object | undefined): RefCounted<T> {
+		return this._base.createNewRef(debugOwner);
+	}
+
+	public dispose(): void {
+		if (this._isDisposed) { return; }
+		this._isDisposed = true;
+		this._base._decreaseRefCount(this._debugOwner);
+	}
+}
diff --git a/src/vs/editor/browser/widget/diffEditor/utils/editorGutter.ts b/src/vs/editor/browser/widget/diffEditor/utils/editorGutter.ts
index 9516f378572..bc149ec17ea 100644
--- a/src/vs/editor/browser/widget/diffEditor/utils/editorGutter.ts
+++ b/src/vs/editor/browser/widget/diffEditor/utils/editorGutter.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { h, reset } from 'vs/base/browser/dom';
-import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { autorun, IObservable, IReader, ISettableObservable, observableFromEvent, observableSignal, observableSignalFromEvent, observableValue, transaction } from 'vs/base/common/observable';
-import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { LineRange } from 'vs/editor/common/core/lineRange';
-import { OffsetRange } from 'vs/editor/common/core/offsetRange';
+import { h, reset } from '../../../../../base/browser/dom.js';
+import { Disposable, IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { autorun, IObservable, IReader, ISettableObservable, observableFromEvent, observableSignal, observableSignalFromEvent, observableValue, transaction } from '../../../../../base/common/observable.js';
+import { CodeEditorWidget } from '../../codeEditor/codeEditorWidget.js';
+import { LineRange } from '../../../../common/core/lineRange.js';
+import { OffsetRange } from '../../../../common/core/offsetRange.js';
 
 export class EditorGutter<T extends IGutterItemInfo = IGutterItemInfo> extends Disposable {
-	private readonly scrollTop = observableFromEvent(
+	private readonly scrollTop = observableFromEvent(this,
 		this._editor.onDidScrollChange,
 		(e) => /** @description editor.onDidScrollChange */ this._editor.getScrollTop()
 	);
 	private readonly isScrollTopZero = this.scrollTop.map((scrollTop) => /** @description isScrollTopZero */ scrollTop === 0);
-	private readonly modelAttached = observableFromEvent(
+	private readonly modelAttached = observableFromEvent(this,
 		this._editor.onDidChangeModel,
 		(e) => /** @description editor.onDidChangeModel */ this._editor.hasModel()
 	);
@@ -118,10 +118,10 @@ export class EditorGutter<T extends IGutterItemInfo = IGutterItemInfo> extends D
 							gutterItem.range.startLineNumber <= this._editor.getModel()!.getLineCount()
 								? this._editor.getTopForLineNumber(gutterItem.range.startLineNumber, true) - scrollTop
 								: this._editor.getBottomForLineNumber(gutterItem.range.startLineNumber - 1, false) - scrollTop;
-						const bottom = gutterItem.range.isEmpty
-							// Don't trust that `getBottomForLineNumber` for the previous line equals `getTopForLineNumber` for the current one.
-							? top
-							: (this._editor.getBottomForLineNumber(gutterItem.range.endLineNumberExclusive - 1, true) - scrollTop);
+						const bottom =
+							gutterItem.range.endLineNumberExclusive === 1 ?
+								Math.max(top, this._editor.getTopForLineNumber(gutterItem.range.startLineNumber, false) - scrollTop)
+								: Math.max(top, this._editor.getBottomForLineNumber(gutterItem.range.endLineNumberExclusive - 1, true) - scrollTop);
 
 						const height = bottom - top;
 						view.domNode.style.top = `${top}px`;
diff --git a/src/vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer.ts b/src/vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer.ts
index bb27260aa40..33d1adc99c8 100644
--- a/src/vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer.ts
+++ b/src/vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { MarkdownRenderOptions, MarkedOptions, renderMarkdown } from 'vs/base/browser/markdownRenderer';
-import { createTrustedTypesPolicy } from 'vs/base/browser/trustedTypes';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Emitter } from 'vs/base/common/event';
-import { IMarkdownString, MarkdownStringTrustedOptions } from 'vs/base/common/htmlContent';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import 'vs/css!./renderedMarkdown';
-import { applyFontInfo } from 'vs/editor/browser/config/domFontInfo';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { tokenizeToString } from 'vs/editor/common/languages/textToHtmlTokenizer';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
+import { MarkdownRenderOptions, MarkedOptions, renderMarkdown } from '../../../../../base/browser/markdownRenderer.js';
+import { createTrustedTypesPolicy } from '../../../../../base/browser/trustedTypes.js';
+import { onUnexpectedError } from '../../../../../base/common/errors.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { IMarkdownString, MarkdownStringTrustedOptions } from '../../../../../base/common/htmlContent.js';
+import { DisposableStore, IDisposable } from '../../../../../base/common/lifecycle.js';
+import './renderedMarkdown.css';
+import { applyFontInfo } from '../../../config/domFontInfo.js';
+import { ICodeEditor } from '../../../editorBrowser.js';
+import { EditorOption } from '../../../../common/config/editorOptions.js';
+import { ILanguageService } from '../../../../common/languages/language.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../../../../common/languages/modesRegistry.js';
+import { tokenizeToString } from '../../../../common/languages/textToHtmlTokenizer.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
 
 export interface IMarkdownRenderResult extends IDisposable {
 	readonly element: HTMLElement;
@@ -105,11 +105,15 @@ export class MarkdownRenderer {
 			},
 			asyncRenderCallback: () => this._onDidRenderAsync.fire(),
 			actionHandler: {
-				callback: (link) => openLinkFromMarkdown(this._openerService, link, markdown.isTrusted),
+				callback: (link) => this.openMarkdownLink(link, markdown),
 				disposables: disposables
 			}
 		};
 	}
+
+	protected async openMarkdownLink(link: string, markdown: IMarkdownString) {
+		await openLinkFromMarkdown(this._openerService, link, markdown.isTrusted);
+	}
 }
 
 export async function openLinkFromMarkdown(openerService: IOpenerService, link: string, isTrusted: boolean | MarkdownStringTrustedOptions | undefined): Promise<boolean> {
diff --git a/src/vs/editor/browser/widget/multiDiffEditor/colors.ts b/src/vs/editor/browser/widget/multiDiffEditor/colors.ts
index d58781aabfe..13652fd7f92 100644
--- a/src/vs/editor/browser/widget/multiDiffEditor/colors.ts
+++ b/src/vs/editor/browser/widget/multiDiffEditor/colors.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { registerColor } from 'vs/platform/theme/common/colorRegistry';
+import { localize } from '../../../../nls.js';
+import { registerColor, editorBackground } from '../../../../platform/theme/common/colorRegistry.js';
 
 export const multiDiffEditorHeaderBackground = registerColor(
 	'multiDiffEditor.headerBackground',
@@ -14,7 +14,7 @@ export const multiDiffEditorHeaderBackground = registerColor(
 
 export const multiDiffEditorBackground = registerColor(
 	'multiDiffEditor.background',
-	{ dark: 'editorBackground', light: 'editorBackground', hcDark: 'editorBackground', hcLight: 'editorBackground', },
+	editorBackground,
 	localize('multiDiffEditor.background', 'The background color of the multi file diff editor')
 );
 
diff --git a/src/vs/editor/browser/widget/multiDiffEditor/diffEditorItemTemplate.ts b/src/vs/editor/browser/widget/multiDiffEditor/diffEditorItemTemplate.ts
index 7ea85f66a72..48ac35815d4 100644
--- a/src/vs/editor/browser/widget/multiDiffEditor/diffEditorItemTemplate.ts
+++ b/src/vs/editor/browser/widget/multiDiffEditor/diffEditorItemTemplate.ts
@@ -2,24 +2,25 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { h } from 'vs/base/browser/dom';
-import { Button } from 'vs/base/browser/ui/button/button';
-import { Codicon } from 'vs/base/common/codicons';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { autorun, derived, observableFromEvent } from 'vs/base/common/observable';
-import { IObservable, globalTransaction, observableValue } from 'vs/base/common/observableInternal/base';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditor/diffEditorWidget';
-import { DocumentDiffItemViewModel } from 'vs/editor/browser/widget/multiDiffEditor/multiDiffEditorViewModel';
-import { IWorkbenchUIElementFactory } from 'vs/editor/browser/widget/multiDiffEditor/workbenchUIElementFactory';
-import { IDiffEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { OffsetRange } from 'vs/editor/common/core/offsetRange';
-import { MenuWorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IObjectData, IPooledObject } from './objectPool';
-import { ActionRunnerWithContext } from './utils';
-import { createActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
+import { h } from '../../../../base/browser/dom.js';
+import { Button } from '../../../../base/browser/ui/button/button.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { autorun, derived, globalTransaction, observableValue } from '../../../../base/common/observable.js';
+import { createActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { IContextKeyService, type IScopedContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { IDiffEditorOptions } from '../../../common/config/editorOptions.js';
+import { OffsetRange } from '../../../common/core/offsetRange.js';
+import { observableCodeEditor } from '../../observableCodeEditor.js';
+import { DiffEditorWidget } from '../diffEditor/diffEditorWidget.js';
+import { DocumentDiffItemViewModel } from './multiDiffEditorViewModel.js';
+import { IObjectData, IPooledObject } from './objectPool.js';
+import { ActionRunnerWithContext } from './utils.js';
+import { IWorkbenchUIElementFactory } from './workbenchUIElementFactory.js';
 
 export class TemplateData implements IObjectData {
 	constructor(
@@ -81,8 +82,8 @@ export class DiffEditorItemTemplate extends Disposable implements IPooledObject<
 		overflowWidgetsDomNode: this._overflowWidgetsDomNode,
 	}, {}));
 
-	private readonly isModifedFocused = isFocused(this.editor.getModifiedEditor());
-	private readonly isOriginalFocused = isFocused(this.editor.getOriginalEditor());
+	private readonly isModifedFocused = observableCodeEditor(this.editor.getModifiedEditor()).isFocused;
+	private readonly isOriginalFocused = observableCodeEditor(this.editor.getOriginalEditor()).isFocused;
 	public readonly isFocused = derived(this, reader => this.isModifedFocused.read(reader) || this.isOriginalFocused.read(reader));
 
 	private readonly _resourceLabel = this._workbenchUIElementFactory.createResourceLabel
@@ -94,12 +95,14 @@ export class DiffEditorItemTemplate extends Disposable implements IPooledObject<
 		: undefined;
 
 	private readonly _outerEditorHeight: number;
+	private readonly _contextKeyService: IScopedContextKeyService;
 
 	constructor(
 		private readonly _container: HTMLElement,
 		private readonly _overflowWidgetsDomNode: HTMLElement,
 		private readonly _workbenchUIElementFactory: IWorkbenchUIElementFactory,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IContextKeyService _parentContextKeyService: IContextKeyService,
 	) {
 		super();
 
@@ -155,13 +158,15 @@ export class DiffEditorItemTemplate extends Disposable implements IPooledObject<
 		this._container.appendChild(this._elements.root);
 		this._outerEditorHeight = this._headerHeight;
 
-		this._register(this._instantiationService.createInstance(MenuWorkbenchToolBar, this._elements.actions, MenuId.MultiDiffEditorFileToolbar, {
+		this._contextKeyService = this._register(_parentContextKeyService.createScoped(this._elements.actions));
+		const instantiationService = this._register(this._instantiationService.createChild(new ServiceCollection([IContextKeyService, this._contextKeyService])));
+		this._register(instantiationService.createInstance(MenuWorkbenchToolBar, this._elements.actions, MenuId.MultiDiffEditorFileToolbar, {
 			actionRunner: this._register(new ActionRunnerWithContext(() => (this._viewModel.get()?.modifiedUri))),
 			menuOptions: {
 				shouldForwardArgs: true,
 			},
 			toolbarOptions: { primaryGroup: g => g.startsWith('navigation') },
-			actionViewItemProvider: (action, options) => createActionViewItem(_instantiationService, action, options),
+			actionViewItemProvider: (action, options) => createActionViewItem(instantiationService, action, options),
 		}));
 	}
 
@@ -173,11 +178,11 @@ export class DiffEditorItemTemplate extends Disposable implements IPooledObject<
 		}
 	}
 
-	private readonly _dataStore = new DisposableStore();
+	private readonly _dataStore = this._register(new DisposableStore());
 
 	private _data: TemplateData | undefined;
 
-	public setData(data: TemplateData): void {
+	public setData(data: TemplateData | undefined): void {
 		this._data = data;
 		function updateOptions(options: IDiffEditorOptions): IDiffEditorOptions {
 			return {
@@ -198,13 +203,17 @@ export class DiffEditorItemTemplate extends Disposable implements IPooledObject<
 			};
 		}
 
-		const value = data.viewModel.entry.value!; // TODO
-
-		if (value.onOptionsDidChange) {
-			this._dataStore.add(value.onOptionsDidChange(() => {
-				this.editor.updateOptions(updateOptions(value.options ?? {}));
-			}));
+		if (!data) {
+			globalTransaction(tx => {
+				this._viewModel.set(undefined, tx);
+				this.editor.setDiffModel(null, tx);
+				this._dataStore.clear();
+			});
+			return;
 		}
+
+		const value = data.viewModel.documentDiffItem;
+
 		globalTransaction(tx => {
 			this._resourceLabel?.setUri(data.viewModel.modifiedUri ?? data.viewModel.originalUri!, { strikethrough: data.viewModel.modifiedUri === undefined });
 
@@ -231,9 +240,25 @@ export class DiffEditorItemTemplate extends Disposable implements IPooledObject<
 
 			this._dataStore.clear();
 			this._viewModel.set(data.viewModel, tx);
-			this.editor.setModel(data.viewModel.diffEditorViewModel, tx);
+			this.editor.setDiffModel(data.viewModel.diffEditorViewModelRef, tx);
 			this.editor.updateOptions(updateOptions(value.options ?? {}));
 		});
+		if (value.onOptionsDidChange) {
+			this._dataStore.add(value.onOptionsDidChange(() => {
+				this.editor.updateOptions(updateOptions(value.options ?? {}));
+			}));
+		}
+		data.viewModel.isAlive.recomputeInitiallyAndOnChange(this._dataStore, value => {
+			if (!value) {
+				this.setData(undefined);
+			}
+		});
+
+		if (data.viewModel.documentDiffItem.contextKeys) {
+			for (const [key, value] of Object.entries(data.viewModel.documentDiffItem.contextKeys)) {
+				this._contextKeyService.createKey(key, value);
+			}
+		}
 	}
 
 	private readonly _headerHeight = /*this._elements.header.clientHeight*/ 40;
@@ -276,15 +301,3 @@ export class DiffEditorItemTemplate extends Disposable implements IPooledObject<
 		this._elements.root.style.visibility = 'hidden'; // Some editor parts are still visible
 	}
 }
-
-function isFocused(editor: ICodeEditor): IObservable<boolean> {
-	return observableFromEvent(
-		h => {
-			const store = new DisposableStore();
-			store.add(editor.onDidFocusEditorWidget(() => h(true)));
-			store.add(editor.onDidBlurEditorWidget(() => h(false)));
-			return store;
-		},
-		() => editor.hasTextFocus()
-	);
-}
diff --git a/src/vs/editor/browser/widget/multiDiffEditor/model.ts b/src/vs/editor/browser/widget/multiDiffEditor/model.ts
index de8f43e4edc..32077320010 100644
--- a/src/vs/editor/browser/widget/multiDiffEditor/model.ts
+++ b/src/vs/editor/browser/widget/multiDiffEditor/model.ts
@@ -3,38 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event, IValueWithChangeEvent } from 'vs/base/common/event';
-import { IDiffEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { ITextModel } from 'vs/editor/common/model';
-import { ContextKeyValue } from 'vs/platform/contextkey/common/contextkey';
+import { Event, IValueWithChangeEvent } from '../../../../base/common/event.js';
+import { RefCounted } from '../diffEditor/utils.js';
+import { IDiffEditorOptions } from '../../../common/config/editorOptions.js';
+import { ITextModel } from '../../../common/model.js';
+import { ContextKeyValue } from '../../../../platform/contextkey/common/contextkey.js';
 
 export interface IMultiDiffEditorModel {
-	readonly documents: IValueWithChangeEvent<readonly LazyPromise<IDocumentDiffItem>[]>;
+	readonly documents: IValueWithChangeEvent<readonly RefCounted<IDocumentDiffItem>[] | 'loading'>;
 	readonly contextKeys?: Record<string, ContextKeyValue>;
 }
 
-export interface LazyPromise<T> {
-	request(): Promise<T>;
-	readonly value: T | undefined;
-	readonly onHasValueDidChange: Event<void>;
-}
-
-export class ConstLazyPromise<T> implements LazyPromise<T> {
-	public readonly onHasValueDidChange = Event.None;
-
-	constructor(
-		private readonly _value: T
-	) { }
-
-	public request(): Promise<T> {
-		return Promise.resolve(this._value);
-	}
-
-	public get value(): T {
-		return this._value;
-	}
-}
-
 export interface IDocumentDiffItem {
 	/**
 	 * undefined if the file was created.
@@ -47,4 +26,5 @@ export interface IDocumentDiffItem {
 	readonly modified: ITextModel | undefined;
 	readonly options?: IDiffEditorOptions;
 	readonly onOptionsDidChange?: Event<void>;
+	readonly contextKeys?: Record<string, ContextKeyValue>;
 }
diff --git a/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorViewModel.ts b/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorViewModel.ts
index a044eb438ed..49c674d0477 100644
--- a/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorViewModel.ts
+++ b/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorViewModel.ts
@@ -3,28 +3,41 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IObservable, ITransaction, derived, observableValue, transaction } from 'vs/base/common/observable';
-import { constObservable, derivedObservableWithWritableCache, mapObservableArrayCached, observableFromValueWithChangeEvent } from 'vs/base/common/observableInternal/utils';
-import { URI } from 'vs/base/common/uri';
-import { DiffEditorOptions } from 'vs/editor/browser/widget/diffEditor/diffEditorOptions';
-import { DiffEditorViewModel } from 'vs/editor/browser/widget/diffEditor/diffEditorViewModel';
-import { IDocumentDiffItem, IMultiDiffEditorModel, LazyPromise } from 'vs/editor/browser/widget/multiDiffEditor/model';
-import { IDiffEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { Selection } from 'vs/editor/common/core/selection';
-import { IDiffEditorViewModel } from 'vs/editor/common/editorCommon';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ContextKeyValue } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { IObservable, ITransaction, constObservable, derived, derivedObservableWithWritableCache, mapObservableArrayCached, observableFromValueWithChangeEvent, observableValue, transaction } from '../../../../base/common/observable.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ContextKeyValue } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IDiffEditorOptions } from '../../../common/config/editorOptions.js';
+import { Selection } from '../../../common/core/selection.js';
+import { IDiffEditorViewModel } from '../../../common/editorCommon.js';
+import { IModelService } from '../../../common/services/model.js';
+import { DiffEditorOptions } from '../diffEditor/diffEditorOptions.js';
+import { DiffEditorViewModel } from '../diffEditor/diffEditorViewModel.js';
+import { RefCounted } from '../diffEditor/utils.js';
+import { IDocumentDiffItem, IMultiDiffEditorModel } from './model.js';
 
 export class MultiDiffEditorViewModel extends Disposable {
-	private readonly _documents = observableFromValueWithChangeEvent(this.model, this.model.documents);
+	private readonly _documents: IObservable<readonly RefCounted<IDocumentDiffItem>[] | 'loading'> = observableFromValueWithChangeEvent(this.model, this.model.documents);
 
-	public readonly items = mapObservableArrayCached(this, this._documents, (d, store) => store.add(this._instantiationService.createInstance(DocumentDiffItemViewModel, d, this)))
-		.recomputeInitiallyAndOnChange(this._store);
+	private readonly _documentsArr = derived(this, reader => {
+		const result = this._documents.read(reader);
+		if (result === 'loading') { return []; }
+		return result;
+	});
+
+	public readonly isLoading = derived(this, reader => this._documents.read(reader) === 'loading');
+
+	public readonly items: IObservable<readonly DocumentDiffItemViewModel[]> = mapObservableArrayCached(
+		this,
+		this._documentsArr,
+		(d, store) => store.add(this._instantiationService.createInstance(DocumentDiffItemViewModel, d, this))
+	).recomputeInitiallyAndOnChange(this._store);
 
 	public readonly focusedDiffItem = derived(this, reader => this.items.read(reader).find(i => i.isFocused.read(reader)));
-	public readonly activeDiffItem = derivedObservableWithWritableCache<DocumentDiffItemViewModel | undefined>(this, (reader, lastValue) => this.focusedDiffItem.read(reader) ?? lastValue);
+	public readonly activeDiffItem = derivedObservableWithWritableCache<DocumentDiffItemViewModel | undefined>(this,
+		(reader, lastValue) => this.focusedDiffItem.read(reader) ?? (lastValue && this.items.read(reader).indexOf(lastValue) !== -1) ? lastValue : undefined
+	);
 
 	public async waitForDiffs(): Promise<void> {
 		for (const d of this.items.get()) {
@@ -61,7 +74,13 @@ export class MultiDiffEditorViewModel extends Disposable {
 }
 
 export class DocumentDiffItemViewModel extends Disposable {
-	public readonly diffEditorViewModel: IDiffEditorViewModel;
+	/**
+	 * The diff editor view model keeps its inner objects alive.
+	*/
+	public readonly diffEditorViewModelRef: RefCounted<IDiffEditorViewModel>;
+	public get diffEditorViewModel(): IDiffEditorViewModel {
+		return this.diffEditorViewModelRef.object;
+	}
 	public readonly collapsed = observableValue<boolean>(this, false);
 
 	public readonly lastTemplateData = observableValue<{ contentHeight: number; selections: Selection[] | undefined }>(
@@ -69,8 +88,8 @@ export class DocumentDiffItemViewModel extends Disposable {
 		{ contentHeight: 500, selections: undefined, }
 	);
 
-	public get originalUri(): URI | undefined { return this.entry.value!.original?.uri; }
-	public get modifiedUri(): URI | undefined { return this.entry.value!.modified?.uri; }
+	public get originalUri(): URI | undefined { return this.documentDiffItem.original?.uri; }
+	public get modifiedUri(): URI | undefined { return this.documentDiffItem.modified?.uri; }
 
 	public readonly isActive: IObservable<boolean> = derived(this, reader => this._editorViewModel.activeDiffItem.read(reader) === this);
 
@@ -81,14 +100,27 @@ export class DocumentDiffItemViewModel extends Disposable {
 		this._isFocusedSource.set(source, tx);
 	}
 
+	private readonly documentDiffItemRef: RefCounted<IDocumentDiffItem>;
+	public get documentDiffItem(): IDocumentDiffItem {
+		return this.documentDiffItemRef.object;
+	}
+
+	public readonly isAlive = observableValue<boolean>(this, true);
+
 	constructor(
-		public readonly entry: LazyPromise<IDocumentDiffItem>,
+		documentDiffItem: RefCounted<IDocumentDiffItem>,
 		private readonly _editorViewModel: MultiDiffEditorViewModel,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IModelService private readonly _modelService: IModelService,
 	) {
 		super();
 
+		this._register(toDisposable(() => {
+			this.isAlive.set(false, undefined);
+		}));
+
+		this.documentDiffItemRef = this._register(documentDiffItem.createNewRef(this));
+
 		function updateOptions(options: IDiffEditorOptions): IDiffEditorOptions {
 			return {
 				...options,
@@ -98,20 +130,26 @@ export class DocumentDiffItemViewModel extends Disposable {
 			};
 		}
 
-		const options = this._instantiationService.createInstance(DiffEditorOptions, updateOptions(this.entry.value!.options || {}));
-		if (this.entry.value!.onOptionsDidChange) {
-			this._register(this.entry.value!.onOptionsDidChange(() => {
-				options.updateOptions(updateOptions(this.entry.value!.options || {}));
+		const options = this._instantiationService.createInstance(DiffEditorOptions, updateOptions(this.documentDiffItem.options || {}));
+		if (this.documentDiffItem.onOptionsDidChange) {
+			this._register(this.documentDiffItem.onOptionsDidChange(() => {
+				options.updateOptions(updateOptions(this.documentDiffItem.options || {}));
 			}));
 		}
 
-		const originalTextModel = this.entry.value!.original ?? this._register(this._modelService.createModel('', null));
-		const modifiedTextModel = this.entry.value!.modified ?? this._register(this._modelService.createModel('', null));
+		const diffEditorViewModelStore = new DisposableStore();
+		const originalTextModel = this.documentDiffItem.original ?? diffEditorViewModelStore.add(this._modelService.createModel('', null));
+		const modifiedTextModel = this.documentDiffItem.modified ?? diffEditorViewModelStore.add(this._modelService.createModel('', null));
+		diffEditorViewModelStore.add(this.documentDiffItemRef.createNewRef(this));
 
-		this.diffEditorViewModel = this._register(this._instantiationService.createInstance(DiffEditorViewModel, {
-			original: originalTextModel,
-			modified: modifiedTextModel,
-		}, options));
+		this.diffEditorViewModelRef = this._register(RefCounted.createWithDisposable(
+			this._instantiationService.createInstance(DiffEditorViewModel, {
+				original: originalTextModel,
+				modified: modifiedTextModel,
+			}, options),
+			diffEditorViewModelStore,
+			this
+		));
 	}
 
 	public getKey(): string {
diff --git a/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidget.ts b/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidget.ts
index 496b002489b..d23ad8c87f6 100644
--- a/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidget.ts
+++ b/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidget.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Dimension } from 'vs/base/browser/dom';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { derived, derivedWithStore, observableValue, recomputeInitiallyAndOnChange } from 'vs/base/common/observable';
-import { readHotReloadableExport } from 'vs/editor/browser/widget/diffEditor/utils';
-import { IMultiDiffEditorModel } from 'vs/editor/browser/widget/multiDiffEditor/model';
-import { IMultiDiffEditorViewState, IMultiDiffResourceId, MultiDiffEditorWidgetImpl } from 'vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl';
-import { MultiDiffEditorViewModel } from './multiDiffEditorViewModel';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import './colors';
-import { DiffEditorItemTemplate } from 'vs/editor/browser/widget/multiDiffEditor/diffEditorItemTemplate';
-import { IWorkbenchUIElementFactory } from 'vs/editor/browser/widget/multiDiffEditor/workbenchUIElementFactory';
-import { Event } from 'vs/base/common/event';
-import { URI } from 'vs/base/common/uri';
-import { IDiffEditor } from 'vs/editor/common/editorCommon';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditor/diffEditorWidget';
-import { Range } from 'vs/editor/common/core/range';
+import { Dimension } from '../../../../base/browser/dom.js';
+import { Event } from '../../../../base/common/event.js';
+import { readHotReloadableExport } from '../../../../base/common/hotReloadHelpers.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { derived, derivedWithStore, observableValue, recomputeInitiallyAndOnChange } from '../../../../base/common/observable.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { Range } from '../../../common/core/range.js';
+import { IDiffEditor } from '../../../common/editorCommon.js';
+import { ICodeEditor } from '../../editorBrowser.js';
+import { DiffEditorWidget } from '../diffEditor/diffEditorWidget.js';
+import './colors.js';
+import { DiffEditorItemTemplate } from './diffEditorItemTemplate.js';
+import { IDocumentDiffItem, IMultiDiffEditorModel } from './model.js';
+import { MultiDiffEditorViewModel } from './multiDiffEditorViewModel.js';
+import { IMultiDiffEditorViewState, IMultiDiffResourceId, MultiDiffEditorWidgetImpl } from './multiDiffEditorWidgetImpl.js';
+import { IWorkbenchUIElementFactory } from './workbenchUIElementFactory.js';
 
 export class MultiDiffEditorWidget extends Disposable {
 	private readonly _dimension = observableValue<Dimension | undefined>(this, undefined);
@@ -81,6 +81,10 @@ export class MultiDiffEditorWidget extends Disposable {
 	public tryGetCodeEditor(resource: URI): { diffEditor: IDiffEditor; editor: ICodeEditor } | undefined {
 		return this._widgetImpl.get().tryGetCodeEditor(resource);
 	}
+
+	public findDocumentDiffItem(resource: URI): IDocumentDiffItem | undefined {
+		return this._widgetImpl.get().findDocumentDiffItem(resource);
+	}
 }
 
 export interface RevealOptions {
diff --git a/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.ts b/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.ts
index c29fc74bddd..ec0bf3cf64c 100644
--- a/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.ts
+++ b/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.ts
@@ -3,34 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Dimension, getWindow, h, scheduleAtNextAnimationFrame } from 'vs/base/browser/dom';
-import { SmoothScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
-import { compareBy, numberComparator } from 'vs/base/common/arrays';
-import { findFirstMax } from 'vs/base/common/arraysFind';
-import { BugIndicatingError } from 'vs/base/common/errors';
-import { Disposable, IReference, toDisposable } from 'vs/base/common/lifecycle';
-import { IObservable, IReader, autorun, autorunWithStore, derived, derivedWithStore, observableFromEvent, observableValue } from 'vs/base/common/observable';
-import { ITransaction, disposableObservableValue, globalTransaction, transaction } from 'vs/base/common/observableInternal/base';
-import { Scrollable, ScrollbarVisibility } from 'vs/base/common/scrollable';
-import { URI } from 'vs/base/common/uri';
-import 'vs/css!./style';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { ObservableElementSizeObserver } from 'vs/editor/browser/widget/diffEditor/utils';
-import { RevealOptions } from 'vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidget';
-import { IWorkbenchUIElementFactory } from 'vs/editor/browser/widget/multiDiffEditor/workbenchUIElementFactory';
-import { OffsetRange } from 'vs/editor/common/core/offsetRange';
-import { IRange } from 'vs/editor/common/core/range';
-import { ISelection, Selection } from 'vs/editor/common/core/selection';
-import { IDiffEditor } from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { ContextKeyValue, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ITextEditorOptions } from 'vs/platform/editor/common/editor';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { DiffEditorItemTemplate, TemplateData } from './diffEditorItemTemplate';
-import { DocumentDiffItemViewModel, MultiDiffEditorViewModel } from './multiDiffEditorViewModel';
-import { ObjectPool } from './objectPool';
-import { localize } from 'vs/nls';
+import { Dimension, getWindow, h, scheduleAtNextAnimationFrame } from '../../../../base/browser/dom.js';
+import { SmoothScrollableElement } from '../../../../base/browser/ui/scrollbar/scrollableElement.js';
+import { compareBy, numberComparator } from '../../../../base/common/arrays.js';
+import { findFirstMax } from '../../../../base/common/arraysFind.js';
+import { BugIndicatingError } from '../../../../base/common/errors.js';
+import { Disposable, IReference, toDisposable } from '../../../../base/common/lifecycle.js';
+import { IObservable, IReader, ITransaction, autorun, autorunWithStore, derived, derivedWithStore, disposableObservableValue, globalTransaction, observableFromEvent, observableValue, transaction } from '../../../../base/common/observable.js';
+import { Scrollable, ScrollbarVisibility } from '../../../../base/common/scrollable.js';
+import { URI } from '../../../../base/common/uri.js';
+import { localize } from '../../../../nls.js';
+import { ContextKeyValue, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { ITextEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { OffsetRange } from '../../../common/core/offsetRange.js';
+import { IRange } from '../../../common/core/range.js';
+import { ISelection, Selection } from '../../../common/core/selection.js';
+import { IDiffEditor } from '../../../common/editorCommon.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { ICodeEditor } from '../../editorBrowser.js';
+import { ObservableElementSizeObserver } from '../diffEditor/utils.js';
+import { DiffEditorItemTemplate, TemplateData } from './diffEditorItemTemplate.js';
+import { IDocumentDiffItem } from './model.js';
+import { DocumentDiffItemViewModel, MultiDiffEditorViewModel } from './multiDiffEditorViewModel.js';
+import { RevealOptions } from './multiDiffEditorWidget.js';
+import { ObjectPool } from './objectPool.js';
+import './style.css';
+import { IWorkbenchUIElementFactory } from './workbenchUIElementFactory.js';
 
 export class MultiDiffEditorWidgetImpl extends Disposable {
 	private readonly _scrollableElements = h('div.scrollContent', [
@@ -57,7 +57,7 @@ export class MultiDiffEditorWidgetImpl extends Disposable {
 
 	private readonly _elements = h('div.monaco-component.multiDiffEditor', {}, [
 		h('div', {}, [this._scrollableElement.getDomNode()]),
-		h('div.placeholder@placeholder', {}, [h('div', [localize('noChangedFiles', 'No Changed Files') as any])]),
+		h('div.placeholder@placeholder', {}, [h('div')]),
 	]);
 
 	private readonly _sizeObserver = this._register(new ObservableElementSizeObserver(this._element, undefined));
@@ -73,8 +73,8 @@ export class MultiDiffEditorWidgetImpl extends Disposable {
 		return template;
 	}));
 
-	public readonly scrollTop = observableFromEvent(this._scrollableElement.onScroll, () => /** @description scrollTop */ this._scrollableElement.getScrollPosition().scrollTop);
-	public readonly scrollLeft = observableFromEvent(this._scrollableElement.onScroll, () => /** @description scrollLeft */ this._scrollableElement.getScrollPosition().scrollLeft);
+	public readonly scrollTop = observableFromEvent(this, this._scrollableElement.onScroll, () => /** @description scrollTop */ this._scrollableElement.getScrollPosition().scrollTop);
+	public readonly scrollLeft = observableFromEvent(this, this._scrollableElement.onScroll, () => /** @description scrollLeft */ this._scrollableElement.getScrollPosition().scrollLeft);
 
 	private readonly _viewItemsInfo = derivedWithStore<{ items: readonly VirtualizedViewItem[]; getItem: (viewModel: DocumentDiffItemViewModel) => VirtualizedViewItem }>(this,
 		(reader, store) => {
@@ -128,8 +128,6 @@ export class MultiDiffEditorWidgetImpl extends Disposable {
 	) {
 		super();
 
-		this._contextKeyService.createKey(EditorContextKeys.inMultiDiffEditor.key, true);
-
 		this._register(autorunWithStore((reader, store) => {
 			const viewModel = this._viewModel.read(reader);
 			if (viewModel && viewModel.contextKeys) {
@@ -156,10 +154,20 @@ export class MultiDiffEditorWidgetImpl extends Disposable {
 			this._sizeObserver.observe(dimension);
 		}));
 
-		this._register(autorun((reader) => {
-			/** @description Update widget dimension */
+		const placeholderMessage = derived(reader => {
 			const items = this._viewItems.read(reader);
-			this._elements.placeholder.classList.toggle('visible', items.length === 0);
+			if (items.length > 0) { return undefined; }
+
+			const vm = this._viewModel.read(reader);
+			return (!vm || vm.isLoading.read(reader))
+				? localize('loading', 'Loading...')
+				: localize('noChangedFiles', 'No Changed Files');
+		});
+
+		this._register(autorun((reader) => {
+			const message = placeholderMessage.read(reader);
+			this._elements.placeholder.innerText = message ?? '';
+			this._elements.placeholder.classList.toggle('visible', !!message);
 		}));
 
 		this._scrollableElements.content.style.position = 'relative';
@@ -263,6 +271,14 @@ export class MultiDiffEditorWidgetImpl extends Disposable {
 		});
 	}
 
+	public findDocumentDiffItem(resource: URI): IDocumentDiffItem | undefined {
+		const item = this._viewItems.get().find(v =>
+			v.viewModel.diffEditorViewModel.model.modified.uri.toString() === resource.toString()
+			|| v.viewModel.diffEditorViewModel.model.original.uri.toString() === resource.toString()
+		);
+		return item?.viewModel.documentDiffItem;
+	}
+
 	public tryGetCodeEditor(resource: URI): { diffEditor: IDiffEditor; editor: ICodeEditor } | undefined {
 		const item = this._viewItems.get().find(v =>
 			v.viewModel.diffEditorViewModel.model.modified.uri.toString() === resource.toString()
@@ -272,6 +288,7 @@ export class MultiDiffEditorWidgetImpl extends Disposable {
 		if (!editor) {
 			return undefined;
 		}
+
 		if (item.viewModel.diffEditorViewModel.model.modified.uri.toString() === resource.toString()) {
 			return { diffEditor: editor, editor: editor.getModifiedEditor() };
 		} else {
@@ -396,7 +413,7 @@ class VirtualizedViewItem extends Disposable {
 	}
 
 	public override toString(): string {
-		return `VirtualViewItem(${this.viewModel.entry.value!.modified?.uri.toString()})`;
+		return `VirtualViewItem(${this.viewModel.documentDiffItem.modified?.uri.toString()})`;
 	}
 
 	public getKey(): string {
diff --git a/src/vs/editor/browser/widget/multiDiffEditor/objectPool.ts b/src/vs/editor/browser/widget/multiDiffEditor/objectPool.ts
index e41019fdb00..7bccd1cc59c 100644
--- a/src/vs/editor/browser/widget/multiDiffEditor/objectPool.ts
+++ b/src/vs/editor/browser/widget/multiDiffEditor/objectPool.ts
@@ -2,7 +2,7 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { IDisposable, IReference } from 'vs/base/common/lifecycle';
+import { IDisposable, IReference } from '../../../../base/common/lifecycle.js';
 
 export class ObjectPool<TData extends IObjectData, T extends IPooledObject<TData>> implements IDisposable {
 	private readonly _unused = new Set<T>();
diff --git a/src/vs/editor/browser/widget/multiDiffEditor/utils.ts b/src/vs/editor/browser/widget/multiDiffEditor/utils.ts
index be9240267e1..2806ae63c43 100644
--- a/src/vs/editor/browser/widget/multiDiffEditor/utils.ts
+++ b/src/vs/editor/browser/widget/multiDiffEditor/utils.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ActionRunner, IAction } from 'vs/base/common/actions';
+import { ActionRunner, IAction } from '../../../../base/common/actions.js';
 
 export class ActionRunnerWithContext extends ActionRunner {
 	constructor(private readonly _getContext: () => unknown) {
diff --git a/src/vs/editor/browser/widget/multiDiffEditor/workbenchUIElementFactory.ts b/src/vs/editor/browser/widget/multiDiffEditor/workbenchUIElementFactory.ts
index 80a018dead4..2f09d92ba05 100644
--- a/src/vs/editor/browser/widget/multiDiffEditor/workbenchUIElementFactory.ts
+++ b/src/vs/editor/browser/widget/multiDiffEditor/workbenchUIElementFactory.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
 
 /**
  * This solves the problem that the editor layer cannot depend on the workbench layer.
diff --git a/src/vs/editor/common/commands/replaceCommand.ts b/src/vs/editor/common/commands/replaceCommand.ts
index a3db197aedc..f4beabe78a6 100644
--- a/src/vs/editor/common/commands/replaceCommand.ts
+++ b/src/vs/editor/common/commands/replaceCommand.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Range } from 'vs/editor/common/core/range';
-import { Selection, SelectionDirection } from 'vs/editor/common/core/selection';
-import { ICommand, ICursorStateComputerData, IEditOperationBuilder } from 'vs/editor/common/editorCommon';
-import { ITextModel } from 'vs/editor/common/model';
+import { Range } from '../core/range.js';
+import { Selection, SelectionDirection } from '../core/selection.js';
+import { ICommand, ICursorStateComputerData, IEditOperationBuilder } from '../editorCommon.js';
+import { ITextModel } from '../model.js';
 
 export class ReplaceCommand implements ICommand {
 
diff --git a/src/vs/editor/common/commands/shiftCommand.ts b/src/vs/editor/common/commands/shiftCommand.ts
index 3c0c9bea6fb..aa10151dedc 100644
--- a/src/vs/editor/common/commands/shiftCommand.ts
+++ b/src/vs/editor/common/commands/shiftCommand.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
-import * as strings from 'vs/base/common/strings';
-import { CursorColumns } from 'vs/editor/common/core/cursorColumns';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection, SelectionDirection } from 'vs/editor/common/core/selection';
-import { ICommand, ICursorStateComputerData, IEditOperationBuilder } from 'vs/editor/common/editorCommon';
-import { ITextModel } from 'vs/editor/common/model';
-import { EditorAutoIndentStrategy } from 'vs/editor/common/config/editorOptions';
-import { getEnterAction } from 'vs/editor/common/languages/enterAction';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
+import { CharCode } from '../../../base/common/charCode.js';
+import * as strings from '../../../base/common/strings.js';
+import { CursorColumns } from '../core/cursorColumns.js';
+import { Range } from '../core/range.js';
+import { Selection, SelectionDirection } from '../core/selection.js';
+import { ICommand, ICursorStateComputerData, IEditOperationBuilder } from '../editorCommon.js';
+import { ITextModel } from '../model.js';
+import { EditorAutoIndentStrategy } from '../config/editorOptions.js';
+import { getEnterAction } from '../languages/enterAction.js';
+import { ILanguageConfigurationService } from '../languages/languageConfigurationRegistry.js';
 
 export interface IShiftCommandOpts {
 	isUnshift: boolean;
diff --git a/src/vs/editor/common/commands/surroundSelectionCommand.ts b/src/vs/editor/common/commands/surroundSelectionCommand.ts
index ac170a7b61c..58ba301fa4d 100644
--- a/src/vs/editor/common/commands/surroundSelectionCommand.ts
+++ b/src/vs/editor/common/commands/surroundSelectionCommand.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Range } from 'vs/editor/common/core/range';
-import { Position } from 'vs/editor/common/core/position';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ICommand, ICursorStateComputerData, IEditOperationBuilder } from 'vs/editor/common/editorCommon';
-import { ITextModel } from 'vs/editor/common/model';
+import { Range } from '../core/range.js';
+import { Position } from '../core/position.js';
+import { Selection } from '../core/selection.js';
+import { ICommand, ICursorStateComputerData, IEditOperationBuilder } from '../editorCommon.js';
+import { ITextModel } from '../model.js';
 
 export class SurroundSelectionCommand implements ICommand {
 	private readonly _range: Selection;
diff --git a/src/vs/editor/common/commands/trimTrailingWhitespaceCommand.ts b/src/vs/editor/common/commands/trimTrailingWhitespaceCommand.ts
index 343a5739f19..23e3f612373 100644
--- a/src/vs/editor/common/commands/trimTrailingWhitespaceCommand.ts
+++ b/src/vs/editor/common/commands/trimTrailingWhitespaceCommand.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as strings from 'vs/base/common/strings';
-import { EditOperation, ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ICommand, ICursorStateComputerData, IEditOperationBuilder } from 'vs/editor/common/editorCommon';
-import { StandardTokenType } from 'vs/editor/common/encodedTokenAttributes';
-import { ITextModel } from 'vs/editor/common/model';
+import * as strings from '../../../base/common/strings.js';
+import { EditOperation, ISingleEditOperation } from '../core/editOperation.js';
+import { Position } from '../core/position.js';
+import { Range } from '../core/range.js';
+import { Selection } from '../core/selection.js';
+import { ICommand, ICursorStateComputerData, IEditOperationBuilder } from '../editorCommon.js';
+import { StandardTokenType } from '../encodedTokenAttributes.js';
+import { ITextModel } from '../model.js';
 
 export class TrimTrailingWhitespaceCommand implements ICommand {
 
diff --git a/src/vs/editor/common/config/diffEditor.ts b/src/vs/editor/common/config/diffEditor.ts
index 2d0a312357e..43529c5b1be 100644
--- a/src/vs/editor/common/config/diffEditor.ts
+++ b/src/vs/editor/common/config/diffEditor.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ValidDiffEditorBaseOptions } from 'vs/editor/common/config/editorOptions';
+import { ValidDiffEditorBaseOptions } from './editorOptions.js';
 
 export const diffEditorDefaultOptions = {
 	enableSplitViewResizing: true,
@@ -24,6 +24,7 @@ export const diffEditorDefaultOptions = {
 	experimental: {
 		showMoves: false,
 		showEmptyDecorations: true,
+		useTrueInlineView: false,
 	},
 	hideUnchangedRegions: {
 		enabled: false,
@@ -35,4 +36,5 @@ export const diffEditorDefaultOptions = {
 	onlyShowAccessibleDiffViewer: false,
 	renderSideBySideInlineBreakpoint: 900,
 	useInlineViewWhenSpaceIsLimited: true,
+	compactMode: false,
 } satisfies ValidDiffEditorBaseOptions;
diff --git a/src/vs/editor/common/config/editorConfiguration.ts b/src/vs/editor/common/config/editorConfiguration.ts
index ccaa98425d7..08f45386aa2 100644
--- a/src/vs/editor/common/config/editorConfiguration.ts
+++ b/src/vs/editor/common/config/editorConfiguration.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { ConfigurationChangedEvent, IComputedEditorOptions, IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { IDimension } from 'vs/editor/common/core/dimension';
-import { MenuId } from 'vs/platform/actions/common/actions';
+import { Event } from '../../../base/common/event.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { ConfigurationChangedEvent, IComputedEditorOptions, IEditorOptions } from './editorOptions.js';
+import { IDimension } from '../core/dimension.js';
+import { MenuId } from '../../../platform/actions/common/actions.js';
 
 export interface IEditorConfiguration extends IDisposable {
 	/**
diff --git a/src/vs/editor/common/config/editorConfigurationSchema.ts b/src/vs/editor/common/config/editorConfigurationSchema.ts
index 42681b2653c..cdf4cda9512 100644
--- a/src/vs/editor/common/config/editorConfigurationSchema.ts
+++ b/src/vs/editor/common/config/editorConfigurationSchema.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type { IJSONSchemaSnippet } from 'vs/base/common/jsonSchema';
-import { diffEditorDefaultOptions } from 'vs/editor/common/config/diffEditor';
-import { editorOptionsRegistry } from 'vs/editor/common/config/editorOptions';
-import { EDITOR_MODEL_DEFAULTS } from 'vs/editor/common/core/textModelDefaults';
-import * as nls from 'vs/nls';
-import { ConfigurationScope, Extensions, IConfigurationNode, IConfigurationPropertySchema, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { Registry } from 'vs/platform/registry/common/platform';
+import { diffEditorDefaultOptions } from './diffEditor.js';
+import { editorOptionsRegistry } from './editorOptions.js';
+import { EDITOR_MODEL_DEFAULTS } from '../core/textModelDefaults.js';
+import * as nls from '../../../nls.js';
+import { ConfigurationScope, Extensions, IConfigurationNode, IConfigurationPropertySchema, IConfigurationRegistry } from '../../../platform/configuration/common/configurationRegistry.js';
+import { Registry } from '../../../platform/registry/common/platform.js';
 
 export const editorConfigurationBaseNode = Object.freeze<IConfigurationNode>({
 	id: 'editor',
@@ -95,7 +95,7 @@ const editorConfiguration: IConfigurationNode = {
 		},
 		'editor.experimental.asyncTokenization': {
 			type: 'boolean',
-			default: false,
+			default: true,
 			description: nls.localize('editor.experimental.asyncTokenization', "Controls whether the tokenization should happen asynchronously on a web worker."),
 			tags: ['experimental'],
 		},
@@ -110,6 +110,21 @@ const editorConfiguration: IConfigurationNode = {
 			description: nls.localize('editor.experimental.asyncTokenizationVerification', "Controls whether async tokenization should be verified against legacy background tokenization. Might slow down tokenization. For debugging only."),
 			tags: ['experimental'],
 		},
+		'editor.experimental.treeSitterTelemetry': {
+			type: 'boolean',
+			default: false,
+			markdownDescription: nls.localize('editor.experimental.treeSitterTelemetry', "Controls whether tree sitter parsing should be turned on and telemetry collected. Setting `editor.experimental.preferTreeSitter` for specific languages will take precedence."),
+			tags: ['experimental']
+		},
+		'editor.experimental.preferTreeSitter': {
+			type: 'array',
+			items: {
+				type: 'string',
+				enum: ['typescript']
+			},
+			default: [],
+			markdownDescription: nls.localize('editor.experimental.preferTreeSitter', "Controls whether tree sitter parsing should be turned on for specific languages. This will take precedence over `editor.experimental.treeSitterTelemetry` for the specified languages."),
+		},
 		'editor.language.brackets': {
 			type: ['array', 'null'],
 			default: null, // We want to distinguish the empty array from not configured.
@@ -248,7 +263,12 @@ const editorConfiguration: IConfigurationNode = {
 			type: 'boolean',
 			default: diffEditorDefaultOptions.experimental.showEmptyDecorations,
 			description: nls.localize('showEmptyDecorations', "Controls whether the diff editor shows empty decorations to see where characters got inserted or deleted."),
-		}
+		},
+		'diffEditor.experimental.useTrueInlineView': {
+			type: 'boolean',
+			default: diffEditorDefaultOptions.experimental.useTrueInlineView,
+			description: nls.localize('useTrueInlineView', "If enabled and the editor uses the inline view, word changes are rendered inline."),
+		},
 	}
 };
 
diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts
index 294e7030695..9c5f5a34d4f 100644
--- a/src/vs/editor/common/config/editorOptions.ts
+++ b/src/vs/editor/common/config/editorOptions.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as arrays from 'vs/base/common/arrays';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import * as objects from 'vs/base/common/objects';
-import * as platform from 'vs/base/common/platform';
-import { ScrollbarVisibility } from 'vs/base/common/scrollable';
-import { Constants } from 'vs/base/common/uint';
-import { FontInfo } from 'vs/editor/common/config/fontInfo';
-import { EDITOR_MODEL_DEFAULTS } from 'vs/editor/common/core/textModelDefaults';
-import { USUAL_WORD_SEPARATORS } from 'vs/editor/common/core/wordHelper';
-import * as nls from 'vs/nls';
-import { AccessibilitySupport } from 'vs/platform/accessibility/common/accessibility';
-import { IConfigurationPropertySchema } from 'vs/platform/configuration/common/configurationRegistry';
+import * as arrays from '../../../base/common/arrays.js';
+import { IMarkdownString } from '../../../base/common/htmlContent.js';
+import { IJSONSchema } from '../../../base/common/jsonSchema.js';
+import * as objects from '../../../base/common/objects.js';
+import * as platform from '../../../base/common/platform.js';
+import { ScrollbarVisibility } from '../../../base/common/scrollable.js';
+import { Constants } from '../../../base/common/uint.js';
+import { FontInfo } from './fontInfo.js';
+import { EDITOR_MODEL_DEFAULTS } from '../core/textModelDefaults.js';
+import { USUAL_WORD_SEPARATORS } from '../core/wordHelper.js';
+import * as nls from '../../../nls.js';
+import { AccessibilitySupport } from '../../../platform/accessibility/common/accessibility.js';
+import { IConfigurationPropertySchema } from '../../../platform/configuration/common/configurationRegistry.js';
 
 //#region typed options
 
@@ -634,6 +634,11 @@ export interface IEditorOptions {
 	 * Defaults to 'always'.
 	 */
 	matchBrackets?: 'never' | 'near' | 'always';
+	/**
+	 * Enable experimental rendering using WebGPU.
+	 * Defaults to 'off'.
+	 */
+	experimentalGpuAcceleration?: 'on' | 'off';
 	/**
 	 * Enable experimental whitespace rendering.
 	 * Defaults to 'svg'.
@@ -743,6 +748,11 @@ export interface IEditorOptions {
 	 */
 	dropIntoEditor?: IDropIntoEditorOptions;
 
+	/**
+	 * Sets whether the new experimental edit context should be used instead of the text area.
+	 */
+	experimentalEditContextEnabled?: boolean;
+
 	/**
 	 * Controls support for changing how content is pasted into the editor.
 	 */
@@ -771,75 +781,96 @@ export interface IDiffEditorBaseOptions {
 	 * Defaults to true.
 	 */
 	enableSplitViewResizing?: boolean;
+
 	/**
 	 * The default ratio when rendering side-by-side editors.
 	 * Must be a number between 0 and 1, min sizes apply.
 	 * Defaults to 0.5
 	 */
 	splitViewDefaultRatio?: number;
+
 	/**
 	 * Render the differences in two side-by-side editors.
 	 * Defaults to true.
 	 */
 	renderSideBySide?: boolean;
+
 	/**
 	 * When `renderSideBySide` is enabled, `useInlineViewWhenSpaceIsLimited` is set,
 	 * and the diff editor has a width less than `renderSideBySideInlineBreakpoint`, the inline view is used.
 	 */
 	renderSideBySideInlineBreakpoint?: number | undefined;
+
 	/**
 	 * When `renderSideBySide` is enabled, `useInlineViewWhenSpaceIsLimited` is set,
 	 * and the diff editor has a width less than `renderSideBySideInlineBreakpoint`, the inline view is used.
 	 */
 	useInlineViewWhenSpaceIsLimited?: boolean;
+
+	/**
+	 * If set, the diff editor is optimized for small views.
+	 * Defaults to `false`.
+	*/
+	compactMode?: boolean;
+
 	/**
 	 * Timeout in milliseconds after which diff computation is cancelled.
 	 * Defaults to 5000.
 	 */
 	maxComputationTime?: number;
+
 	/**
 	 * Maximum supported file size in MB.
 	 * Defaults to 50.
 	 */
 	maxFileSize?: number;
+
 	/**
 	 * Compute the diff by ignoring leading/trailing whitespace
 	 * Defaults to true.
 	 */
 	ignoreTrimWhitespace?: boolean;
+
 	/**
 	 * Render +/- indicators for added/deleted changes.
 	 * Defaults to true.
 	 */
 	renderIndicators?: boolean;
+
 	/**
 	 * Shows icons in the glyph margin to revert changes.
 	 * Default to true.
 	 */
 	renderMarginRevertIcon?: boolean;
+
 	/**
 	 * Indicates if the gutter menu should be rendered.
 	*/
 	renderGutterMenu?: boolean;
+
 	/**
 	 * Original model should be editable?
 	 * Defaults to false.
 	 */
 	originalEditable?: boolean;
+
 	/**
 	 * Should the diff editor enable code lens?
 	 * Defaults to false.
 	 */
 	diffCodeLens?: boolean;
+
 	/**
 	 * Is the diff editor should render overview ruler
 	 * Defaults to true
 	 */
 	renderOverviewRuler?: boolean;
+
 	/**
 	 * Control the wrapping of the diff editor.
 	 */
 	diffWordWrap?: 'off' | 'on' | 'inherit';
+
 	/**
 	 * Diff Algorithm
 	*/
@@ -857,6 +888,11 @@ export interface IDiffEditorBaseOptions {
 		showMoves?: boolean;
 
 		showEmptyDecorations?: boolean;
+
+		/**
+		 * Only applies when `renderSideBySide` is set to false.
+		*/
+		useTrueInlineView?: boolean;
 	};
 
 	/**
@@ -1451,7 +1487,10 @@ export const enum TextEditorCursorBlinkingStyle {
 	Solid = 5
 }
 
-function _cursorBlinkingStyleFromString(cursorBlinkingStyle: 'blink' | 'smooth' | 'phase' | 'expand' | 'solid'): TextEditorCursorBlinkingStyle {
+/**
+ * @internal
+ */
+export function cursorBlinkingStyleFromString(cursorBlinkingStyle: 'blink' | 'smooth' | 'phase' | 'expand' | 'solid'): TextEditorCursorBlinkingStyle {
 	switch (cursorBlinkingStyle) {
 		case 'blink': return TextEditorCursorBlinkingStyle.Blink;
 		case 'smooth': return TextEditorCursorBlinkingStyle.Smooth;
@@ -1509,7 +1548,10 @@ export function cursorStyleToString(cursorStyle: TextEditorCursorStyle): 'line'
 	}
 }
 
-function _cursorStyleFromString(cursorStyle: 'line' | 'block' | 'underline' | 'line-thin' | 'block-outline' | 'underline-thin'): TextEditorCursorStyle {
+/**
+ * @internal
+ */
+export function cursorStyleFromString(cursorStyle: 'line' | 'block' | 'underline' | 'line-thin' | 'block-outline' | 'underline-thin'): TextEditorCursorStyle {
 	switch (cursorStyle) {
 		case 'line': return TextEditorCursorStyle.Line;
 		case 'block': return TextEditorCursorStyle.Block;
@@ -1916,12 +1958,14 @@ export interface IGotoLocationOptions {
 	multipleDeclarations?: GoToLocationValues;
 	multipleImplementations?: GoToLocationValues;
 	multipleReferences?: GoToLocationValues;
+	multipleTests?: GoToLocationValues;
 
 	alternativeDefinitionCommand?: string;
 	alternativeTypeDefinitionCommand?: string;
 	alternativeDeclarationCommand?: string;
 	alternativeImplementationCommand?: string;
 	alternativeReferenceCommand?: string;
+	alternativeTestsCommand?: string;
 }
 
 /**
@@ -1939,11 +1983,13 @@ class EditorGoToLocation extends BaseEditorOption<EditorOption.gotoLocation, IGo
 			multipleDeclarations: 'peek',
 			multipleImplementations: 'peek',
 			multipleReferences: 'peek',
+			multipleTests: 'peek',
 			alternativeDefinitionCommand: 'editor.action.goToReferences',
 			alternativeTypeDefinitionCommand: 'editor.action.goToReferences',
 			alternativeDeclarationCommand: 'editor.action.goToReferences',
 			alternativeImplementationCommand: '',
 			alternativeReferenceCommand: '',
+			alternativeTestsCommand: '',
 		};
 		const jsonSubset: IJSONSchema = {
 			type: 'string',
@@ -2028,11 +2074,13 @@ class EditorGoToLocation extends BaseEditorOption<EditorOption.gotoLocation, IGo
 			multipleDeclarations: input.multipleDeclarations ?? stringSet<GoToLocationValues>(input.multipleDeclarations, 'peek', ['peek', 'gotoAndPeek', 'goto']),
 			multipleImplementations: input.multipleImplementations ?? stringSet<GoToLocationValues>(input.multipleImplementations, 'peek', ['peek', 'gotoAndPeek', 'goto']),
 			multipleReferences: input.multipleReferences ?? stringSet<GoToLocationValues>(input.multipleReferences, 'peek', ['peek', 'gotoAndPeek', 'goto']),
+			multipleTests: input.multipleTests ?? stringSet<GoToLocationValues>(input.multipleTests, 'peek', ['peek', 'gotoAndPeek', 'goto']),
 			alternativeDefinitionCommand: EditorStringOption.string(input.alternativeDefinitionCommand, this.defaultValue.alternativeDefinitionCommand),
 			alternativeTypeDefinitionCommand: EditorStringOption.string(input.alternativeTypeDefinitionCommand, this.defaultValue.alternativeTypeDefinitionCommand),
 			alternativeDeclarationCommand: EditorStringOption.string(input.alternativeDeclarationCommand, this.defaultValue.alternativeDeclarationCommand),
 			alternativeImplementationCommand: EditorStringOption.string(input.alternativeImplementationCommand, this.defaultValue.alternativeImplementationCommand),
 			alternativeReferenceCommand: EditorStringOption.string(input.alternativeReferenceCommand, this.defaultValue.alternativeReferenceCommand),
+			alternativeTestsCommand: EditorStringOption.string(input.alternativeTestsCommand, this.defaultValue.alternativeTestsCommand),
 		};
 	}
 }
@@ -2767,7 +2815,7 @@ export type EditorLightbulbOptions = Readonly<Required<IEditorLightbulbOptions>>
 class EditorLightbulb extends BaseEditorOption<EditorOption.lightbulb, IEditorLightbulbOptions, EditorLightbulbOptions> {
 
 	constructor() {
-		const defaults: EditorLightbulbOptions = { enabled: ShowLightbulbIconMode.On };
+		const defaults: EditorLightbulbOptions = { enabled: ShowLightbulbIconMode.OnCode };
 		super(
 			EditorOption.lightbulb, 'lightbulb', defaults,
 			{
@@ -2906,6 +2954,12 @@ export interface IEditorInlayHintsOptions {
 	 * Defaults to false.
 	 */
 	padding?: boolean;
+
+	/**
+	 * Maximum length for inlay hints per line
+	 * Set to 0 to have an unlimited length.
+	 */
+	maximumLength?: number;
 }
 
 /**
@@ -2916,7 +2970,7 @@ export type EditorInlayHintsOptions = Readonly<Required<IEditorInlayHintsOptions
 class EditorInlayHints extends BaseEditorOption<EditorOption.inlayHints, IEditorInlayHintsOptions, EditorInlayHintsOptions> {
 
 	constructor() {
-		const defaults: EditorInlayHintsOptions = { enabled: 'on', fontSize: 0, fontFamily: '', padding: false };
+		const defaults: EditorInlayHintsOptions = { enabled: 'on', fontSize: 0, fontFamily: '', padding: false, maximumLength: 43 };
 		super(
 			EditorOption.inlayHints, 'inlayHints', defaults,
 			{
@@ -2946,6 +3000,11 @@ class EditorInlayHints extends BaseEditorOption<EditorOption.inlayHints, IEditor
 					type: 'boolean',
 					default: defaults.padding,
 					description: nls.localize('inlayHints.padding', "Enables the padding around the inlay hints in the editor.")
+				},
+				'editor.inlayHints.maximumLength': {
+					type: 'number',
+					default: defaults.maximumLength,
+					markdownDescription: nls.localize('inlayHints.maximumLength', "Maximum overall length of inlay hints, for a single line, before they get truncated by the editor. Set to `0` to never truncate")
 				}
 			}
 		);
@@ -2963,7 +3022,8 @@ class EditorInlayHints extends BaseEditorOption<EditorOption.inlayHints, IEditor
 			enabled: stringSet<'on' | 'off' | 'offUnlessPressed' | 'onUnlessPressed'>(input.enabled, this.defaultValue.enabled, ['on', 'off', 'offUnlessPressed', 'onUnlessPressed']),
 			fontSize: EditorIntOption.clampedInt(input.fontSize, this.defaultValue.fontSize, 0, 100),
 			fontFamily: EditorStringOption.string(input.fontFamily, this.defaultValue.fontFamily),
-			padding: boolean(input.padding, this.defaultValue.padding)
+			padding: boolean(input.padding, this.defaultValue.padding),
+			maximumLength: EditorIntOption.clampedInt(input.maximumLength, this.defaultValue.maximumLength, 0, Number.MAX_SAFE_INTEGER),
 		};
 	}
 }
@@ -4071,6 +4131,8 @@ export interface IInlineSuggestOptions {
 
 	showToolbar?: 'always' | 'onHover' | 'never';
 
+	syntaxHighlightingEnabled?: boolean;
+
 	suppressSuggestions?: boolean;
 
 	/**
@@ -4100,7 +4162,8 @@ class InlineEditorSuggest extends BaseEditorOption<EditorOption.inlineSuggest, I
 			showToolbar: 'onHover',
 			suppressSuggestions: false,
 			keepOnBlur: false,
-			fontFamily: 'default'
+			fontFamily: 'default',
+			syntaxHighlightingEnabled: false,
 		};
 
 		super(
@@ -4122,6 +4185,11 @@ class InlineEditorSuggest extends BaseEditorOption<EditorOption.inlineSuggest, I
 					],
 					description: nls.localize('inlineSuggest.showToolbar', "Controls when to show the inline suggestion toolbar."),
 				},
+				'editor.inlineSuggest.syntaxHighlightingEnabled': {
+					type: 'boolean',
+					default: defaults.syntaxHighlightingEnabled,
+					description: nls.localize('inlineSuggest.syntaxHighlightingEnabled', "Controls whether to show syntax highlighting for inline suggestions in the editor."),
+				},
 				'editor.inlineSuggest.suppressSuggestions': {
 					type: 'boolean',
 					default: defaults.suppressSuggestions,
@@ -4147,7 +4215,8 @@ class InlineEditorSuggest extends BaseEditorOption<EditorOption.inlineSuggest, I
 			showToolbar: stringSet(input.showToolbar, this.defaultValue.showToolbar, ['always', 'onHover', 'never']),
 			suppressSuggestions: boolean(input.suppressSuggestions, this.defaultValue.suppressSuggestions),
 			keepOnBlur: boolean(input.keepOnBlur, this.defaultValue.keepOnBlur),
-			fontFamily: EditorStringOption.string(input.fontFamily, this.defaultValue.fontFamily)
+			fontFamily: EditorStringOption.string(input.fontFamily, this.defaultValue.fontFamily),
+			syntaxHighlightingEnabled: boolean(input.syntaxHighlightingEnabled, this.defaultValue.syntaxHighlightingEnabled),
 		};
 	}
 }
@@ -4171,8 +4240,6 @@ export interface IInlineEditOptions {
 	 * Does not clear active inline suggestions when the editor loses focus.
 	 */
 	keepOnBlur?: boolean;
-
-	backgroundColoring?: boolean;
 }
 
 /**
@@ -4187,7 +4254,6 @@ class InlineEditorEdit extends BaseEditorOption<EditorOption.inlineEdit, IInline
 			showToolbar: 'onHover',
 			fontFamily: 'default',
 			keepOnBlur: false,
-			backgroundColoring: false,
 		};
 
 		super(
@@ -4214,11 +4280,6 @@ class InlineEditorEdit extends BaseEditorOption<EditorOption.inlineEdit, IInline
 					default: defaults.fontFamily,
 					description: nls.localize('inlineEdit.fontFamily', "Controls the font family of the inline edit.")
 				},
-				'editor.experimentalInlineEdit.backgroundColoring': {
-					type: 'boolean',
-					default: defaults.backgroundColoring,
-					description: nls.localize('inlineEdit.backgroundColoring', "Controls whether to color the background of inline edits.")
-				},
 			}
 		);
 	}
@@ -4233,7 +4294,6 @@ class InlineEditorEdit extends BaseEditorOption<EditorOption.inlineEdit, IInline
 			showToolbar: stringSet(input.showToolbar, this.defaultValue.showToolbar, ['always', 'onHover', 'never']),
 			fontFamily: EditorStringOption.string(input.fontFamily, this.defaultValue.fontFamily),
 			keepOnBlur: boolean(input.keepOnBlur, this.defaultValue.keepOnBlur),
-			backgroundColoring: boolean(input.backgroundColoring, this.defaultValue.backgroundColoring)
 		};
 	}
 }
@@ -5329,7 +5389,9 @@ export const enum EditorOption {
 	domReadOnly,
 	dragAndDrop,
 	dropIntoEditor,
+	experimentalEditContextEnabled,
 	emptySelectionClipboard,
+	experimentalGpuAcceleration,
 	experimentalWhitespaceRendering,
 	extraEditorClassName,
 	fastScrollSensitivity,
@@ -5639,7 +5701,7 @@ export const EditorOptions = {
 		EditorOption.cursorBlinking, 'cursorBlinking',
 		TextEditorCursorBlinkingStyle.Blink, 'blink',
 		['blink', 'smooth', 'phase', 'expand', 'solid'],
-		_cursorBlinkingStyleFromString,
+		cursorBlinkingStyleFromString,
 		{ description: nls.localize('cursorBlinking', "Control the cursor animation style.") }
 	)),
 	cursorSmoothCaretAnimation: register(new EditorStringEnumOption(
@@ -5659,7 +5721,7 @@ export const EditorOptions = {
 		EditorOption.cursorStyle, 'cursorStyle',
 		TextEditorCursorStyle.Line, 'line',
 		['line', 'block', 'underline', 'line-thin', 'block-outline', 'underline-thin'],
-		_cursorStyleFromString,
+		cursorStyleFromString,
 		{ description: nls.localize('cursorStyle', "Controls the cursor style.") }
 	)),
 	cursorSurroundingLines: register(new EditorIntOption(
@@ -5699,7 +5761,27 @@ export const EditorOptions = {
 	)),
 	emptySelectionClipboard: register(new EditorEmptySelectionClipboard()),
 	dropIntoEditor: register(new EditorDropIntoEditor()),
+	experimentalEditContextEnabled: register(new EditorBooleanOption(
+		EditorOption.experimentalEditContextEnabled, 'experimentalEditContextEnabled', false,
+		{
+			description: nls.localize('experimentalEditContextEnabled', "Sets whether the new experimental edit context should be used instead of the text area.")
+		}
+	)),
 	stickyScroll: register(new EditorStickyScroll()),
+	experimentalGpuAcceleration: register(new EditorStringEnumOption(
+		EditorOption.experimentalGpuAcceleration, 'experimentalGpuAcceleration',
+		'off' as 'off' | 'on',
+		['off', 'on'] as const,
+		undefined
+		// TODO: Uncomment when we want to expose the setting to VS Code users
+		// {
+		// 	enumDescriptions: [
+		// 		nls.localize('experimentalGpuAcceleration.off', "Use regular DOM-based rendering."),
+		// 		nls.localize('experimentalGpuAcceleration.on', "Use GPU acceleration."),
+		// 	],
+		// 	description: nls.localize('experimentalGpuAcceleration', "Controls whether to use the (very) experimental GPU acceleration to render the editor.")
+		// }
+	)),
 	experimentalWhitespaceRendering: register(new EditorStringEnumOption(
 		EditorOption.experimentalWhitespaceRendering, 'experimentalWhitespaceRendering',
 		'svg' as 'svg' | 'font' | 'off',
diff --git a/src/vs/editor/common/config/editorZoom.ts b/src/vs/editor/common/config/editorZoom.ts
index 522cfa6e095..f7ee332e52c 100644
--- a/src/vs/editor/common/config/editorZoom.ts
+++ b/src/vs/editor/common/config/editorZoom.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
+import { Emitter, Event } from '../../../base/common/event.js';
 
 export interface IEditorZoom {
 	onDidChangeZoomLevel: Event<number>;
diff --git a/src/vs/editor/common/config/fontInfo.ts b/src/vs/editor/common/config/fontInfo.ts
index 5dafe560d04..6854c5f7672 100644
--- a/src/vs/editor/common/config/fontInfo.ts
+++ b/src/vs/editor/common/config/fontInfo.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as platform from 'vs/base/common/platform';
-import { EditorFontVariations, EditorOptions, EditorOption, FindComputedEditorOptionValueById, EDITOR_FONT_DEFAULTS } from 'vs/editor/common/config/editorOptions';
-import { EditorZoom } from 'vs/editor/common/config/editorZoom';
+import * as platform from '../../../base/common/platform.js';
+import { EditorFontVariations, EditorOptions, EditorOption, FindComputedEditorOptionValueById, EDITOR_FONT_DEFAULTS } from './editorOptions.js';
+import { EditorZoom } from './editorZoom.js';
 
 /**
  * Determined from empirical observations.
diff --git a/src/vs/editor/common/core/characterClassifier.ts b/src/vs/editor/common/core/characterClassifier.ts
index fb7b921eda4..595d08818f1 100644
--- a/src/vs/editor/common/core/characterClassifier.ts
+++ b/src/vs/editor/common/core/characterClassifier.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { toUint8 } from 'vs/base/common/uint';
+import { toUint8 } from '../../../base/common/uint.js';
 
 /**
  * A fast character classifier that uses a compact array for ASCII values.
diff --git a/src/vs/editor/common/core/cursorColumns.ts b/src/vs/editor/common/core/cursorColumns.ts
index 669c38b43f5..1d84b8635cc 100644
--- a/src/vs/editor/common/core/cursorColumns.ts
+++ b/src/vs/editor/common/core/cursorColumns.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
-import * as strings from 'vs/base/common/strings';
+import { CharCode } from '../../../base/common/charCode.js';
+import * as strings from '../../../base/common/strings.js';
 
 /**
  * A column in a position is the gap between two adjacent characters. The methods here
@@ -128,7 +128,7 @@ export class CursorColumns {
 	 * @see {@link CursorColumns}
 	 */
 	public static nextIndentTabStop(visibleColumn: number, indentSize: number): number {
-		return visibleColumn + indentSize - visibleColumn % indentSize;
+		return CursorColumns.nextRenderTabStop(visibleColumn, indentSize);
 	}
 
 	/**
@@ -144,6 +144,6 @@ export class CursorColumns {
 	 * @see {@link CursorColumns}
 	 */
 	public static prevIndentTabStop(column: number, indentSize: number): number {
-		return Math.max(0, column - 1 - (column - 1) % indentSize);
+		return CursorColumns.prevRenderTabStop(column, indentSize);
 	}
 }
diff --git a/src/vs/editor/common/core/editOperation.ts b/src/vs/editor/common/core/editOperation.ts
index 59a06a7dcc5..047330dc2ad 100644
--- a/src/vs/editor/common/core/editOperation.ts
+++ b/src/vs/editor/common/core/editOperation.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Position } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
+import { Position } from './position.js';
+import { IRange, Range } from './range.js';
 
 /**
  * A single edit operation, that acts as a simple replace.
diff --git a/src/vs/editor/common/core/editorColorRegistry.ts b/src/vs/editor/common/core/editorColorRegistry.ts
index f7ad150e80c..1bcf7252443 100644
--- a/src/vs/editor/common/core/editorColorRegistry.ts
+++ b/src/vs/editor/common/core/editorColorRegistry.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { Color, RGBA } from 'vs/base/common/color';
-import { activeContrastBorder, editorBackground, registerColor, editorWarningForeground, editorInfoForeground, editorWarningBorder, editorInfoBorder, contrastBorder, editorFindMatchHighlight, editorWarningBackground } from 'vs/platform/theme/common/colorRegistry';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
+import * as nls from '../../../nls.js';
+import { Color, RGBA } from '../../../base/common/color.js';
+import { activeContrastBorder, editorBackground, registerColor, editorWarningForeground, editorInfoForeground, editorWarningBorder, editorInfoBorder, contrastBorder, editorFindMatchHighlight, editorWarningBackground } from '../../../platform/theme/common/colorRegistry.js';
+import { registerThemingParticipant } from '../../../platform/theme/common/themeService.js';
 
 /**
  * Definition of the editor colors
  */
-export const editorLineHighlight = registerColor('editor.lineHighlightBackground', { dark: null, light: null, hcDark: null, hcLight: null }, nls.localize('lineHighlight', 'Background color for the highlight of line at the cursor position.'));
+export const editorLineHighlight = registerColor('editor.lineHighlightBackground', null, nls.localize('lineHighlight', 'Background color for the highlight of line at the cursor position.'));
 export const editorLineHighlightBorder = registerColor('editor.lineHighlightBorder', { dark: '#282828', light: '#eeeeee', hcDark: '#f38518', hcLight: contrastBorder }, nls.localize('lineHighlightBorderBox', 'Background color for the border around the line at the cursor position.'));
 export const editorRangeHighlight = registerColor('editor.rangeHighlightBackground', { dark: '#ffffff0b', light: '#fdff0033', hcDark: null, hcLight: null }, nls.localize('rangeHighlight', 'Background color of highlighted ranges, like by quick open and find features. The color must not be opaque so as not to hide underlying decorations.'), true);
 export const editorRangeHighlightBorder = registerColor('editor.rangeHighlightBorder', { dark: null, light: null, hcDark: activeContrastBorder, hcLight: activeContrastBorder }, nls.localize('rangeHighlightBorder', 'Background color of the border around highlighted ranges.'));
@@ -21,32 +21,32 @@ export const editorSymbolHighlightBorder = registerColor('editor.symbolHighlight
 export const editorCursorForeground = registerColor('editorCursor.foreground', { dark: '#AEAFAD', light: Color.black, hcDark: Color.white, hcLight: '#0F4A85' }, nls.localize('caret', 'Color of the editor cursor.'));
 export const editorCursorBackground = registerColor('editorCursor.background', null, nls.localize('editorCursorBackground', 'The background color of the editor cursor. Allows customizing the color of a character overlapped by a block cursor.'));
 export const editorMultiCursorPrimaryForeground = registerColor('editorMultiCursor.primary.foreground', editorCursorForeground, nls.localize('editorMultiCursorPrimaryForeground', 'Color of the primary editor cursor when multiple cursors are present.'));
-export const editorMultiCursorPrimaryBackground = registerColor('editorMultiCursor.primary.background', { dark: editorCursorBackground, light: editorCursorBackground, hcDark: editorCursorBackground, hcLight: editorCursorBackground }, nls.localize('editorMultiCursorPrimaryBackground', 'The background color of the primary editor cursor when multiple cursors are present. Allows customizing the color of a character overlapped by a block cursor.'));
-export const editorMultiCursorSecondaryForeground = registerColor('editorMultiCursor.secondary.foreground', { dark: editorCursorForeground, light: editorCursorForeground, hcDark: editorCursorForeground, hcLight: editorCursorForeground }, nls.localize('editorMultiCursorSecondaryForeground', 'Color of secondary editor cursors when multiple cursors are present.'));
-export const editorMultiCursorSecondaryBackground = registerColor('editorMultiCursor.secondary.background', { dark: editorCursorBackground, light: editorCursorBackground, hcDark: editorCursorBackground, hcLight: editorCursorBackground }, nls.localize('editorMultiCursorSecondaryBackground', 'The background color of secondary editor cursors when multiple cursors are present. Allows customizing the color of a character overlapped by a block cursor.'));
+export const editorMultiCursorPrimaryBackground = registerColor('editorMultiCursor.primary.background', editorCursorBackground, nls.localize('editorMultiCursorPrimaryBackground', 'The background color of the primary editor cursor when multiple cursors are present. Allows customizing the color of a character overlapped by a block cursor.'));
+export const editorMultiCursorSecondaryForeground = registerColor('editorMultiCursor.secondary.foreground', editorCursorForeground, nls.localize('editorMultiCursorSecondaryForeground', 'Color of secondary editor cursors when multiple cursors are present.'));
+export const editorMultiCursorSecondaryBackground = registerColor('editorMultiCursor.secondary.background', editorCursorBackground, nls.localize('editorMultiCursorSecondaryBackground', 'The background color of secondary editor cursors when multiple cursors are present. Allows customizing the color of a character overlapped by a block cursor.'));
 export const editorWhitespaces = registerColor('editorWhitespace.foreground', { dark: '#e3e4e229', light: '#33333333', hcDark: '#e3e4e229', hcLight: '#CCCCCC' }, nls.localize('editorWhitespaces', 'Color of whitespace characters in the editor.'));
 export const editorLineNumbers = registerColor('editorLineNumber.foreground', { dark: '#858585', light: '#237893', hcDark: Color.white, hcLight: '#292929' }, nls.localize('editorLineNumbers', 'Color of editor line numbers.'));
 
-export const deprecatedEditorIndentGuides = registerColor('editorIndentGuide.background', { dark: editorWhitespaces, light: editorWhitespaces, hcDark: editorWhitespaces, hcLight: editorWhitespaces }, nls.localize('editorIndentGuides', 'Color of the editor indentation guides.'), false, nls.localize('deprecatedEditorIndentGuides', '\'editorIndentGuide.background\' is deprecated. Use \'editorIndentGuide.background1\' instead.'));
-export const deprecatedEditorActiveIndentGuides = registerColor('editorIndentGuide.activeBackground', { dark: editorWhitespaces, light: editorWhitespaces, hcDark: editorWhitespaces, hcLight: editorWhitespaces }, nls.localize('editorActiveIndentGuide', 'Color of the active editor indentation guides.'), false, nls.localize('deprecatedEditorActiveIndentGuide', '\'editorIndentGuide.activeBackground\' is deprecated. Use \'editorIndentGuide.activeBackground1\' instead.'));
+export const deprecatedEditorIndentGuides = registerColor('editorIndentGuide.background', editorWhitespaces, nls.localize('editorIndentGuides', 'Color of the editor indentation guides.'), false, nls.localize('deprecatedEditorIndentGuides', '\'editorIndentGuide.background\' is deprecated. Use \'editorIndentGuide.background1\' instead.'));
+export const deprecatedEditorActiveIndentGuides = registerColor('editorIndentGuide.activeBackground', editorWhitespaces, nls.localize('editorActiveIndentGuide', 'Color of the active editor indentation guides.'), false, nls.localize('deprecatedEditorActiveIndentGuide', '\'editorIndentGuide.activeBackground\' is deprecated. Use \'editorIndentGuide.activeBackground1\' instead.'));
 
-export const editorIndentGuide1 = registerColor('editorIndentGuide.background1', { dark: deprecatedEditorIndentGuides, light: deprecatedEditorIndentGuides, hcDark: deprecatedEditorIndentGuides, hcLight: deprecatedEditorIndentGuides }, nls.localize('editorIndentGuides1', 'Color of the editor indentation guides (1).'));
-export const editorIndentGuide2 = registerColor('editorIndentGuide.background2', { dark: '#00000000', light: '#00000000', hcDark: '#00000000', hcLight: '#00000000' }, nls.localize('editorIndentGuides2', 'Color of the editor indentation guides (2).'));
-export const editorIndentGuide3 = registerColor('editorIndentGuide.background3', { dark: '#00000000', light: '#00000000', hcDark: '#00000000', hcLight: '#00000000' }, nls.localize('editorIndentGuides3', 'Color of the editor indentation guides (3).'));
-export const editorIndentGuide4 = registerColor('editorIndentGuide.background4', { dark: '#00000000', light: '#00000000', hcDark: '#00000000', hcLight: '#00000000' }, nls.localize('editorIndentGuides4', 'Color of the editor indentation guides (4).'));
-export const editorIndentGuide5 = registerColor('editorIndentGuide.background5', { dark: '#00000000', light: '#00000000', hcDark: '#00000000', hcLight: '#00000000' }, nls.localize('editorIndentGuides5', 'Color of the editor indentation guides (5).'));
-export const editorIndentGuide6 = registerColor('editorIndentGuide.background6', { dark: '#00000000', light: '#00000000', hcDark: '#00000000', hcLight: '#00000000' }, nls.localize('editorIndentGuides6', 'Color of the editor indentation guides (6).'));
+export const editorIndentGuide1 = registerColor('editorIndentGuide.background1', deprecatedEditorIndentGuides, nls.localize('editorIndentGuides1', 'Color of the editor indentation guides (1).'));
+export const editorIndentGuide2 = registerColor('editorIndentGuide.background2', '#00000000', nls.localize('editorIndentGuides2', 'Color of the editor indentation guides (2).'));
+export const editorIndentGuide3 = registerColor('editorIndentGuide.background3', '#00000000', nls.localize('editorIndentGuides3', 'Color of the editor indentation guides (3).'));
+export const editorIndentGuide4 = registerColor('editorIndentGuide.background4', '#00000000', nls.localize('editorIndentGuides4', 'Color of the editor indentation guides (4).'));
+export const editorIndentGuide5 = registerColor('editorIndentGuide.background5', '#00000000', nls.localize('editorIndentGuides5', 'Color of the editor indentation guides (5).'));
+export const editorIndentGuide6 = registerColor('editorIndentGuide.background6', '#00000000', nls.localize('editorIndentGuides6', 'Color of the editor indentation guides (6).'));
 
-export const editorActiveIndentGuide1 = registerColor('editorIndentGuide.activeBackground1', { dark: deprecatedEditorActiveIndentGuides, light: deprecatedEditorActiveIndentGuides, hcDark: deprecatedEditorActiveIndentGuides, hcLight: deprecatedEditorActiveIndentGuides }, nls.localize('editorActiveIndentGuide1', 'Color of the active editor indentation guides (1).'));
-export const editorActiveIndentGuide2 = registerColor('editorIndentGuide.activeBackground2', { dark: '#00000000', light: '#00000000', hcDark: '#00000000', hcLight: '#00000000' }, nls.localize('editorActiveIndentGuide2', 'Color of the active editor indentation guides (2).'));
-export const editorActiveIndentGuide3 = registerColor('editorIndentGuide.activeBackground3', { dark: '#00000000', light: '#00000000', hcDark: '#00000000', hcLight: '#00000000' }, nls.localize('editorActiveIndentGuide3', 'Color of the active editor indentation guides (3).'));
-export const editorActiveIndentGuide4 = registerColor('editorIndentGuide.activeBackground4', { dark: '#00000000', light: '#00000000', hcDark: '#00000000', hcLight: '#00000000' }, nls.localize('editorActiveIndentGuide4', 'Color of the active editor indentation guides (4).'));
-export const editorActiveIndentGuide5 = registerColor('editorIndentGuide.activeBackground5', { dark: '#00000000', light: '#00000000', hcDark: '#00000000', hcLight: '#00000000' }, nls.localize('editorActiveIndentGuide5', 'Color of the active editor indentation guides (5).'));
-export const editorActiveIndentGuide6 = registerColor('editorIndentGuide.activeBackground6', { dark: '#00000000', light: '#00000000', hcDark: '#00000000', hcLight: '#00000000' }, nls.localize('editorActiveIndentGuide6', 'Color of the active editor indentation guides (6).'));
+export const editorActiveIndentGuide1 = registerColor('editorIndentGuide.activeBackground1', deprecatedEditorActiveIndentGuides, nls.localize('editorActiveIndentGuide1', 'Color of the active editor indentation guides (1).'));
+export const editorActiveIndentGuide2 = registerColor('editorIndentGuide.activeBackground2', '#00000000', nls.localize('editorActiveIndentGuide2', 'Color of the active editor indentation guides (2).'));
+export const editorActiveIndentGuide3 = registerColor('editorIndentGuide.activeBackground3', '#00000000', nls.localize('editorActiveIndentGuide3', 'Color of the active editor indentation guides (3).'));
+export const editorActiveIndentGuide4 = registerColor('editorIndentGuide.activeBackground4', '#00000000', nls.localize('editorActiveIndentGuide4', 'Color of the active editor indentation guides (4).'));
+export const editorActiveIndentGuide5 = registerColor('editorIndentGuide.activeBackground5', '#00000000', nls.localize('editorActiveIndentGuide5', 'Color of the active editor indentation guides (5).'));
+export const editorActiveIndentGuide6 = registerColor('editorIndentGuide.activeBackground6', '#00000000', nls.localize('editorActiveIndentGuide6', 'Color of the active editor indentation guides (6).'));
 
 const deprecatedEditorActiveLineNumber = registerColor('editorActiveLineNumber.foreground', { dark: '#c6c6c6', light: '#0B216F', hcDark: activeContrastBorder, hcLight: activeContrastBorder }, nls.localize('editorActiveLineNumber', 'Color of editor active line number'), false, nls.localize('deprecatedEditorActiveLineNumber', 'Id is deprecated. Use \'editorLineNumber.activeForeground\' instead.'));
-export const editorActiveLineNumber = registerColor('editorLineNumber.activeForeground', { dark: deprecatedEditorActiveLineNumber, light: deprecatedEditorActiveLineNumber, hcDark: deprecatedEditorActiveLineNumber, hcLight: deprecatedEditorActiveLineNumber }, nls.localize('editorActiveLineNumber', 'Color of editor active line number'));
-export const editorDimmedLineNumber = registerColor('editorLineNumber.dimmedForeground', { dark: null, light: null, hcDark: null, hcLight: null }, nls.localize('editorDimmedLineNumber', 'Color of the final editor line when editor.renderFinalNewline is set to dimmed.'));
+export const editorActiveLineNumber = registerColor('editorLineNumber.activeForeground', deprecatedEditorActiveLineNumber, nls.localize('editorActiveLineNumber', 'Color of editor active line number'));
+export const editorDimmedLineNumber = registerColor('editorLineNumber.dimmedForeground', null, nls.localize('editorDimmedLineNumber', 'Color of the final editor line when editor.renderFinalNewline is set to dimmed.'));
 
 export const editorRuler = registerColor('editorRuler.foreground', { dark: '#5A5A5A', light: Color.lightgrey, hcDark: Color.white, hcLight: '#292929' }, nls.localize('editorRuler', 'Color of the editor rulers.'));
 
@@ -58,17 +58,17 @@ export const editorBracketMatchBorder = registerColor('editorBracketMatch.border
 export const editorOverviewRulerBorder = registerColor('editorOverviewRuler.border', { dark: '#7f7f7f4d', light: '#7f7f7f4d', hcDark: '#7f7f7f4d', hcLight: '#666666' }, nls.localize('editorOverviewRulerBorder', 'Color of the overview ruler border.'));
 export const editorOverviewRulerBackground = registerColor('editorOverviewRuler.background', null, nls.localize('editorOverviewRulerBackground', 'Background color of the editor overview ruler.'));
 
-export const editorGutter = registerColor('editorGutter.background', { dark: editorBackground, light: editorBackground, hcDark: editorBackground, hcLight: editorBackground }, nls.localize('editorGutter', 'Background color of the editor gutter. The gutter contains the glyph margins and the line numbers.'));
+export const editorGutter = registerColor('editorGutter.background', editorBackground, nls.localize('editorGutter', 'Background color of the editor gutter. The gutter contains the glyph margins and the line numbers.'));
 
 export const editorUnnecessaryCodeBorder = registerColor('editorUnnecessaryCode.border', { dark: null, light: null, hcDark: Color.fromHex('#fff').transparent(0.8), hcLight: contrastBorder }, nls.localize('unnecessaryCodeBorder', 'Border color of unnecessary (unused) source code in the editor.'));
 export const editorUnnecessaryCodeOpacity = registerColor('editorUnnecessaryCode.opacity', { dark: Color.fromHex('#000a'), light: Color.fromHex('#0007'), hcDark: null, hcLight: null }, nls.localize('unnecessaryCodeOpacity', 'Opacity of unnecessary (unused) source code in the editor. For example, "#000000c0" will render the code with 75% opacity. For high contrast themes, use the  \'editorUnnecessaryCode.border\' theme color to underline unnecessary code instead of fading it out.'));
 
 export const ghostTextBorder = registerColor('editorGhostText.border', { dark: null, light: null, hcDark: Color.fromHex('#fff').transparent(0.8), hcLight: Color.fromHex('#292929').transparent(0.8) }, nls.localize('editorGhostTextBorder', 'Border color of ghost text in the editor.'));
 export const ghostTextForeground = registerColor('editorGhostText.foreground', { dark: Color.fromHex('#ffffff56'), light: Color.fromHex('#0007'), hcDark: null, hcLight: null }, nls.localize('editorGhostTextForeground', 'Foreground color of the ghost text in the editor.'));
-export const ghostTextBackground = registerColor('editorGhostText.background', { dark: null, light: null, hcDark: null, hcLight: null }, nls.localize('editorGhostTextBackground', 'Background color of the ghost text in the editor.'));
+export const ghostTextBackground = registerColor('editorGhostText.background', null, nls.localize('editorGhostTextBackground', 'Background color of the ghost text in the editor.'));
 
 const rulerRangeDefault = new Color(new RGBA(0, 122, 204, 0.6));
-export const overviewRulerRangeHighlight = registerColor('editorOverviewRuler.rangeHighlightForeground', { dark: rulerRangeDefault, light: rulerRangeDefault, hcDark: rulerRangeDefault, hcLight: rulerRangeDefault }, nls.localize('overviewRulerRangeHighlight', 'Overview ruler marker color for range highlights. The color must not be opaque so as not to hide underlying decorations.'), true);
+export const overviewRulerRangeHighlight = registerColor('editorOverviewRuler.rangeHighlightForeground', rulerRangeDefault, nls.localize('overviewRulerRangeHighlight', 'Overview ruler marker color for range highlights. The color must not be opaque so as not to hide underlying decorations.'), true);
 export const overviewRulerError = registerColor('editorOverviewRuler.errorForeground', { dark: new Color(new RGBA(255, 18, 18, 0.7)), light: new Color(new RGBA(255, 18, 18, 0.7)), hcDark: new Color(new RGBA(255, 50, 50, 1)), hcLight: '#B5200D' }, nls.localize('overviewRuleError', 'Overview ruler marker color for errors.'));
 export const overviewRulerWarning = registerColor('editorOverviewRuler.warningForeground', { dark: editorWarningForeground, light: editorWarningForeground, hcDark: editorWarningBorder, hcLight: editorWarningBorder }, nls.localize('overviewRuleWarning', 'Overview ruler marker color for warnings.'));
 export const overviewRulerInfo = registerColor('editorOverviewRuler.infoForeground', { dark: editorInfoForeground, light: editorInfoForeground, hcDark: editorInfoBorder, hcLight: editorInfoBorder }, nls.localize('overviewRuleInfo', 'Overview ruler marker color for infos.'));
@@ -76,28 +76,28 @@ export const overviewRulerInfo = registerColor('editorOverviewRuler.infoForegrou
 export const editorBracketHighlightingForeground1 = registerColor('editorBracketHighlight.foreground1', { dark: '#FFD700', light: '#0431FAFF', hcDark: '#FFD700', hcLight: '#0431FAFF' }, nls.localize('editorBracketHighlightForeground1', 'Foreground color of brackets (1). Requires enabling bracket pair colorization.'));
 export const editorBracketHighlightingForeground2 = registerColor('editorBracketHighlight.foreground2', { dark: '#DA70D6', light: '#319331FF', hcDark: '#DA70D6', hcLight: '#319331FF' }, nls.localize('editorBracketHighlightForeground2', 'Foreground color of brackets (2). Requires enabling bracket pair colorization.'));
 export const editorBracketHighlightingForeground3 = registerColor('editorBracketHighlight.foreground3', { dark: '#179FFF', light: '#7B3814FF', hcDark: '#87CEFA', hcLight: '#7B3814FF' }, nls.localize('editorBracketHighlightForeground3', 'Foreground color of brackets (3). Requires enabling bracket pair colorization.'));
-export const editorBracketHighlightingForeground4 = registerColor('editorBracketHighlight.foreground4', { dark: '#00000000', light: '#00000000', hcDark: '#00000000', hcLight: '#00000000' }, nls.localize('editorBracketHighlightForeground4', 'Foreground color of brackets (4). Requires enabling bracket pair colorization.'));
-export const editorBracketHighlightingForeground5 = registerColor('editorBracketHighlight.foreground5', { dark: '#00000000', light: '#00000000', hcDark: '#00000000', hcLight: '#00000000' }, nls.localize('editorBracketHighlightForeground5', 'Foreground color of brackets (5). Requires enabling bracket pair colorization.'));
-export const editorBracketHighlightingForeground6 = registerColor('editorBracketHighlight.foreground6', { dark: '#00000000', light: '#00000000', hcDark: '#00000000', hcLight: '#00000000' }, nls.localize('editorBracketHighlightForeground6', 'Foreground color of brackets (6). Requires enabling bracket pair colorization.'));
+export const editorBracketHighlightingForeground4 = registerColor('editorBracketHighlight.foreground4', '#00000000', nls.localize('editorBracketHighlightForeground4', 'Foreground color of brackets (4). Requires enabling bracket pair colorization.'));
+export const editorBracketHighlightingForeground5 = registerColor('editorBracketHighlight.foreground5', '#00000000', nls.localize('editorBracketHighlightForeground5', 'Foreground color of brackets (5). Requires enabling bracket pair colorization.'));
+export const editorBracketHighlightingForeground6 = registerColor('editorBracketHighlight.foreground6', '#00000000', nls.localize('editorBracketHighlightForeground6', 'Foreground color of brackets (6). Requires enabling bracket pair colorization.'));
 
-export const editorBracketHighlightingUnexpectedBracketForeground = registerColor('editorBracketHighlight.unexpectedBracket.foreground', { dark: new Color(new RGBA(255, 18, 18, 0.8)), light: new Color(new RGBA(255, 18, 18, 0.8)), hcDark: new Color(new RGBA(255, 50, 50, 1)), hcLight: '' }, nls.localize('editorBracketHighlightUnexpectedBracketForeground', 'Foreground color of unexpected brackets.'));
+export const editorBracketHighlightingUnexpectedBracketForeground = registerColor('editorBracketHighlight.unexpectedBracket.foreground', { dark: new Color(new RGBA(255, 18, 18, 0.8)), light: new Color(new RGBA(255, 18, 18, 0.8)), hcDark: 'new Color(new RGBA(255, 50, 50, 1))', hcLight: '#B5200D' }, nls.localize('editorBracketHighlightUnexpectedBracketForeground', 'Foreground color of unexpected brackets.'));
 
-export const editorBracketPairGuideBackground1 = registerColor('editorBracketPairGuide.background1', { dark: '#00000000', light: '#00000000', hcDark: '#00000000', hcLight: '#00000000' }, nls.localize('editorBracketPairGuide.background1', 'Background color of inactive bracket pair guides (1). Requires enabling bracket pair guides.'));
-export const editorBracketPairGuideBackground2 = registerColor('editorBracketPairGuide.background2', { dark: '#00000000', light: '#00000000', hcDark: '#00000000', hcLight: '#00000000' }, nls.localize('editorBracketPairGuide.background2', 'Background color of inactive bracket pair guides (2). Requires enabling bracket pair guides.'));
-export const editorBracketPairGuideBackground3 = registerColor('editorBracketPairGuide.background3', { dark: '#00000000', light: '#00000000', hcDark: '#00000000', hcLight: '#00000000' }, nls.localize('editorBracketPairGuide.background3', 'Background color of inactive bracket pair guides (3). Requires enabling bracket pair guides.'));
-export const editorBracketPairGuideBackground4 = registerColor('editorBracketPairGuide.background4', { dark: '#00000000', light: '#00000000', hcDark: '#00000000', hcLight: '#00000000' }, nls.localize('editorBracketPairGuide.background4', 'Background color of inactive bracket pair guides (4). Requires enabling bracket pair guides.'));
-export const editorBracketPairGuideBackground5 = registerColor('editorBracketPairGuide.background5', { dark: '#00000000', light: '#00000000', hcDark: '#00000000', hcLight: '#00000000' }, nls.localize('editorBracketPairGuide.background5', 'Background color of inactive bracket pair guides (5). Requires enabling bracket pair guides.'));
-export const editorBracketPairGuideBackground6 = registerColor('editorBracketPairGuide.background6', { dark: '#00000000', light: '#00000000', hcDark: '#00000000', hcLight: '#00000000' }, nls.localize('editorBracketPairGuide.background6', 'Background color of inactive bracket pair guides (6). Requires enabling bracket pair guides.'));
+export const editorBracketPairGuideBackground1 = registerColor('editorBracketPairGuide.background1', '#00000000', nls.localize('editorBracketPairGuide.background1', 'Background color of inactive bracket pair guides (1). Requires enabling bracket pair guides.'));
+export const editorBracketPairGuideBackground2 = registerColor('editorBracketPairGuide.background2', '#00000000', nls.localize('editorBracketPairGuide.background2', 'Background color of inactive bracket pair guides (2). Requires enabling bracket pair guides.'));
+export const editorBracketPairGuideBackground3 = registerColor('editorBracketPairGuide.background3', '#00000000', nls.localize('editorBracketPairGuide.background3', 'Background color of inactive bracket pair guides (3). Requires enabling bracket pair guides.'));
+export const editorBracketPairGuideBackground4 = registerColor('editorBracketPairGuide.background4', '#00000000', nls.localize('editorBracketPairGuide.background4', 'Background color of inactive bracket pair guides (4). Requires enabling bracket pair guides.'));
+export const editorBracketPairGuideBackground5 = registerColor('editorBracketPairGuide.background5', '#00000000', nls.localize('editorBracketPairGuide.background5', 'Background color of inactive bracket pair guides (5). Requires enabling bracket pair guides.'));
+export const editorBracketPairGuideBackground6 = registerColor('editorBracketPairGuide.background6', '#00000000', nls.localize('editorBracketPairGuide.background6', 'Background color of inactive bracket pair guides (6). Requires enabling bracket pair guides.'));
 
-export const editorBracketPairGuideActiveBackground1 = registerColor('editorBracketPairGuide.activeBackground1', { dark: '#00000000', light: '#00000000', hcDark: '#00000000', hcLight: '#00000000' }, nls.localize('editorBracketPairGuide.activeBackground1', 'Background color of active bracket pair guides (1). Requires enabling bracket pair guides.'));
-export const editorBracketPairGuideActiveBackground2 = registerColor('editorBracketPairGuide.activeBackground2', { dark: '#00000000', light: '#00000000', hcDark: '#00000000', hcLight: '#00000000' }, nls.localize('editorBracketPairGuide.activeBackground2', 'Background color of active bracket pair guides (2). Requires enabling bracket pair guides.'));
-export const editorBracketPairGuideActiveBackground3 = registerColor('editorBracketPairGuide.activeBackground3', { dark: '#00000000', light: '#00000000', hcDark: '#00000000', hcLight: '#00000000' }, nls.localize('editorBracketPairGuide.activeBackground3', 'Background color of active bracket pair guides (3). Requires enabling bracket pair guides.'));
-export const editorBracketPairGuideActiveBackground4 = registerColor('editorBracketPairGuide.activeBackground4', { dark: '#00000000', light: '#00000000', hcDark: '#00000000', hcLight: '#00000000' }, nls.localize('editorBracketPairGuide.activeBackground4', 'Background color of active bracket pair guides (4). Requires enabling bracket pair guides.'));
-export const editorBracketPairGuideActiveBackground5 = registerColor('editorBracketPairGuide.activeBackground5', { dark: '#00000000', light: '#00000000', hcDark: '#00000000', hcLight: '#00000000' }, nls.localize('editorBracketPairGuide.activeBackground5', 'Background color of active bracket pair guides (5). Requires enabling bracket pair guides.'));
-export const editorBracketPairGuideActiveBackground6 = registerColor('editorBracketPairGuide.activeBackground6', { dark: '#00000000', light: '#00000000', hcDark: '#00000000', hcLight: '#00000000' }, nls.localize('editorBracketPairGuide.activeBackground6', 'Background color of active bracket pair guides (6). Requires enabling bracket pair guides.'));
+export const editorBracketPairGuideActiveBackground1 = registerColor('editorBracketPairGuide.activeBackground1', '#00000000', nls.localize('editorBracketPairGuide.activeBackground1', 'Background color of active bracket pair guides (1). Requires enabling bracket pair guides.'));
+export const editorBracketPairGuideActiveBackground2 = registerColor('editorBracketPairGuide.activeBackground2', '#00000000', nls.localize('editorBracketPairGuide.activeBackground2', 'Background color of active bracket pair guides (2). Requires enabling bracket pair guides.'));
+export const editorBracketPairGuideActiveBackground3 = registerColor('editorBracketPairGuide.activeBackground3', '#00000000', nls.localize('editorBracketPairGuide.activeBackground3', 'Background color of active bracket pair guides (3). Requires enabling bracket pair guides.'));
+export const editorBracketPairGuideActiveBackground4 = registerColor('editorBracketPairGuide.activeBackground4', '#00000000', nls.localize('editorBracketPairGuide.activeBackground4', 'Background color of active bracket pair guides (4). Requires enabling bracket pair guides.'));
+export const editorBracketPairGuideActiveBackground5 = registerColor('editorBracketPairGuide.activeBackground5', '#00000000', nls.localize('editorBracketPairGuide.activeBackground5', 'Background color of active bracket pair guides (5). Requires enabling bracket pair guides.'));
+export const editorBracketPairGuideActiveBackground6 = registerColor('editorBracketPairGuide.activeBackground6', '#00000000', nls.localize('editorBracketPairGuide.activeBackground6', 'Background color of active bracket pair guides (6). Requires enabling bracket pair guides.'));
 
-export const editorUnicodeHighlightBorder = registerColor('editorUnicodeHighlight.border', { dark: editorWarningForeground, light: editorWarningForeground, hcDark: editorWarningForeground, hcLight: editorWarningForeground }, nls.localize('editorUnicodeHighlight.border', 'Border color used to highlight unicode characters.'));
-export const editorUnicodeHighlightBackground = registerColor('editorUnicodeHighlight.background', { dark: editorWarningBackground, light: editorWarningBackground, hcDark: editorWarningBackground, hcLight: editorWarningBackground }, nls.localize('editorUnicodeHighlight.background', 'Background color used to highlight unicode characters.'));
+export const editorUnicodeHighlightBorder = registerColor('editorUnicodeHighlight.border', editorWarningForeground, nls.localize('editorUnicodeHighlight.border', 'Border color used to highlight unicode characters.'));
+export const editorUnicodeHighlightBackground = registerColor('editorUnicodeHighlight.background', editorWarningBackground, nls.localize('editorUnicodeHighlight.background', 'Background color used to highlight unicode characters.'));
 
 
 // contains all color rules that used to defined in editor/browser/widget/editor.css
diff --git a/src/vs/editor/common/core/eolCounter.ts b/src/vs/editor/common/core/eolCounter.ts
index 702b562cbed..42175b1a3f8 100644
--- a/src/vs/editor/common/core/eolCounter.ts
+++ b/src/vs/editor/common/core/eolCounter.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
+import { CharCode } from '../../../base/common/charCode.js';
 
 export const enum StringEOL {
 	Unknown = 0,
diff --git a/src/vs/editor/common/core/indentation.ts b/src/vs/editor/common/core/indentation.ts
index d4cd6d0e71a..03ce99442c8 100644
--- a/src/vs/editor/common/core/indentation.ts
+++ b/src/vs/editor/common/core/indentation.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as strings from 'vs/base/common/strings';
-import { CursorColumns } from 'vs/editor/common/core/cursorColumns';
+import * as strings from '../../../base/common/strings.js';
+import { CursorColumns } from './cursorColumns.js';
 
 function _normalizeIndentationFromWhitespace(str: string, indentSize: number, insertSpaces: boolean): string {
 	let spacesCnt = 0;
diff --git a/src/vs/editor/common/core/lineRange.ts b/src/vs/editor/common/core/lineRange.ts
index 1a7a0d6b527..007fa6b754b 100644
--- a/src/vs/editor/common/core/lineRange.ts
+++ b/src/vs/editor/common/core/lineRange.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BugIndicatingError } from 'vs/base/common/errors';
-import { OffsetRange } from 'vs/editor/common/core/offsetRange';
-import { Range } from 'vs/editor/common/core/range';
-import { findFirstIdxMonotonousOrArrLen, findLastIdxMonotonous, findLastMonotonous } from 'vs/base/common/arraysFind';
+import { BugIndicatingError } from '../../../base/common/errors.js';
+import { OffsetRange } from './offsetRange.js';
+import { Range } from './range.js';
+import { findFirstIdxMonotonousOrArrLen, findLastIdxMonotonous, findLastMonotonous } from '../../../base/common/arraysFind.js';
 
 /**
  * A range of lines (1-based).
diff --git a/src/vs/editor/common/core/offsetEdit.ts b/src/vs/editor/common/core/offsetEdit.ts
new file mode 100644
index 00000000000..7243a408a1f
--- /dev/null
+++ b/src/vs/editor/common/core/offsetEdit.ts
@@ -0,0 +1,322 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { BugIndicatingError } from '../../../base/common/errors.js';
+import { OffsetRange } from './offsetRange.js';
+
+/**
+ * Describes an edit to a (0-based) string.
+ * Use `TextEdit` to describe edits for a 1-based line/column text.
+*/
+export class OffsetEdit {
+	public static readonly empty = new OffsetEdit([]);
+
+	public static fromJson(data: IOffsetEdit): OffsetEdit {
+		return new OffsetEdit(data.map(SingleOffsetEdit.fromJson));
+	}
+
+	public static replace(
+		range: OffsetRange,
+		newText: string,
+	): OffsetEdit {
+		return new OffsetEdit([new SingleOffsetEdit(range, newText)]);
+	}
+
+	public static insert(
+		offset: number,
+		insertText: string,
+	): OffsetEdit {
+		return OffsetEdit.replace(OffsetRange.emptyAt(offset), insertText);
+	}
+
+	constructor(
+		public readonly edits: readonly SingleOffsetEdit[],
+	) {
+		let lastEndEx = -1;
+		for (const edit of edits) {
+			if (!(edit.replaceRange.start >= lastEndEx)) {
+				throw new BugIndicatingError(`Edits must be disjoint and sorted. Found ${edit} after ${lastEndEx}`);
+			}
+			lastEndEx = edit.replaceRange.endExclusive;
+		}
+	}
+
+	normalize(): OffsetEdit {
+		const edits: SingleOffsetEdit[] = [];
+		let lastEdit: SingleOffsetEdit | undefined;
+		for (const edit of this.edits) {
+			if (edit.newText.length === 0 && edit.replaceRange.length === 0) {
+				continue;
+			}
+			if (lastEdit && lastEdit.replaceRange.endExclusive === edit.replaceRange.start) {
+				lastEdit = new SingleOffsetEdit(
+					lastEdit.replaceRange.join(edit.replaceRange),
+					lastEdit.newText + edit.newText,
+				);
+			} else {
+				if (lastEdit) {
+					edits.push(lastEdit);
+				}
+				lastEdit = edit;
+			}
+		}
+		if (lastEdit) {
+			edits.push(lastEdit);
+		}
+		return new OffsetEdit(edits);
+	}
+
+	toString() {
+		const edits = this.edits.map(e => e.toString()).join(', ');
+		return `[${edits}]`;
+	}
+
+	apply(str: string): string {
+		const resultText: string[] = [];
+		let pos = 0;
+		for (const edit of this.edits) {
+			resultText.push(str.substring(pos, edit.replaceRange.start));
+			resultText.push(edit.newText);
+			pos = edit.replaceRange.endExclusive;
+		}
+		resultText.push(str.substring(pos));
+		return resultText.join('');
+	}
+
+	compose(other: OffsetEdit): OffsetEdit {
+		return joinEdits(this, other);
+	}
+
+	/**
+	 * Creates an edit that reverts this edit.
+	 */
+	inverse(originalStr: string): OffsetEdit {
+		const edits: SingleOffsetEdit[] = [];
+		let offset = 0;
+		for (const e of this.edits) {
+			edits.push(new SingleOffsetEdit(
+				OffsetRange.ofStartAndLength(e.replaceRange.start + offset, e.newText.length),
+				originalStr.substring(e.replaceRange.start, e.replaceRange.endExclusive),
+			));
+			offset += e.newText.length - e.replaceRange.length;
+		}
+		return new OffsetEdit(edits);
+	}
+
+	getNewTextRanges(): OffsetRange[] {
+		const ranges: OffsetRange[] = [];
+		let offset = 0;
+		for (const e of this.edits) {
+			ranges.push(OffsetRange.ofStartAndLength(e.replaceRange.start + offset, e.newText.length),);
+			offset += e.newText.length - e.replaceRange.length;
+		}
+		return ranges;
+	}
+
+	get isEmpty(): boolean {
+		return this.edits.length === 0;
+	}
+
+	/**
+	 * Consider `t1 := text o base` and `t2 := text o this`.
+	 * We are interested in `tm := tryMerge(t1, t2, base: text)`.
+	 * For that, we compute `tm' := t1 o base o this.rebase(base)`
+	 * such that `tm' === tm`.
+	 */
+	tryRebase(base: OffsetEdit): OffsetEdit {
+		const newEdits: SingleOffsetEdit[] = [];
+
+		let baseIdx = 0;
+		let ourIdx = 0;
+		let offset = 0;
+
+		while (ourIdx < this.edits.length || baseIdx < base.edits.length) {
+			// take the edit that starts first
+			const baseEdit = base.edits[baseIdx];
+			const ourEdit = this.edits[ourIdx];
+
+			if (!ourEdit) {
+				// We processed all our edits
+				break;
+			} else if (!baseEdit) {
+				// no more edits from base
+				newEdits.push(new SingleOffsetEdit(
+					ourEdit.replaceRange.delta(offset),
+					ourEdit.newText,
+				));
+				ourIdx++;
+			} else if (ourEdit.replaceRange.intersects(baseEdit.replaceRange)) {
+				ourIdx++; // Don't take our edit, as it is conflicting -> skip
+			} else if (ourEdit.replaceRange.start < baseEdit.replaceRange.start) {
+				// Our edit starts first
+				newEdits.push(new SingleOffsetEdit(
+					ourEdit.replaceRange.delta(offset),
+					ourEdit.newText,
+				));
+				ourIdx++;
+			} else {
+				baseIdx++;
+				offset += baseEdit.newText.length - baseEdit.replaceRange.length;
+			}
+		}
+
+		return new OffsetEdit(newEdits);
+	}
+
+	applyToOffset(originalOffset: number): number {
+		let accumulatedDelta = 0;
+		for (const edit of this.edits) {
+			if (edit.replaceRange.start <= originalOffset) {
+				if (originalOffset < edit.replaceRange.endExclusive) {
+					// the offset is in the replaced range
+					return edit.replaceRange.start + accumulatedDelta;
+				}
+				accumulatedDelta += edit.newText.length - edit.replaceRange.length;
+			} else {
+				break;
+			}
+		}
+		return originalOffset + accumulatedDelta;
+	}
+
+	applyToOffsetRange(originalRange: OffsetRange): OffsetRange {
+		return new OffsetRange(
+			this.applyToOffset(originalRange.start),
+			this.applyToOffset(originalRange.endExclusive)
+		);
+	}
+
+	applyInverseToOffset(postEditsOffset: number): number {
+		let accumulatedDelta = 0;
+		for (const edit of this.edits) {
+			const editLength = edit.newText.length;
+			if (edit.replaceRange.start <= postEditsOffset - accumulatedDelta) {
+				if (postEditsOffset - accumulatedDelta < edit.replaceRange.start + editLength) {
+					// the offset is in the replaced range
+					return edit.replaceRange.start;
+				}
+				accumulatedDelta += editLength - edit.replaceRange.length;
+			} else {
+				break;
+			}
+		}
+		return postEditsOffset - accumulatedDelta;
+	}
+}
+
+export type IOffsetEdit = ISingleOffsetEdit[];
+
+export interface ISingleOffsetEdit {
+	txt: string;
+	pos: number;
+	len: number;
+}
+
+export class SingleOffsetEdit {
+	public static fromJson(data: ISingleOffsetEdit): SingleOffsetEdit {
+		return new SingleOffsetEdit(OffsetRange.ofStartAndLength(data.pos, data.len), data.txt);
+	}
+
+	public static insert(offset: number, text: string): SingleOffsetEdit {
+		return new SingleOffsetEdit(OffsetRange.emptyAt(offset), text);
+	}
+
+	constructor(
+		public readonly replaceRange: OffsetRange,
+		public readonly newText: string,
+	) { }
+
+	toString(): string {
+		return `${this.replaceRange} -> "${this.newText}"`;
+	}
+
+	get isEmpty() {
+		return this.newText.length === 0 && this.replaceRange.length === 0;
+	}
+}
+
+/**
+ * Invariant:
+ * ```
+ * edits2.apply(edits1.apply(str)) = join(edits1, edits2).apply(str)
+ * ```
+ */
+function joinEdits(edits1: OffsetEdit, edits2: OffsetEdit): OffsetEdit {
+	edits1 = edits1.normalize();
+	edits2 = edits2.normalize();
+
+	if (edits1.isEmpty) { return edits2; }
+	if (edits2.isEmpty) { return edits1; }
+
+	const edit1Queue = [...edits1.edits];
+	const result: SingleOffsetEdit[] = [];
+
+	let edit1ToEdit2 = 0;
+
+	for (const edit2 of edits2.edits) {
+		// Copy over edit1 unmodified until it touches edit2.
+		while (true) {
+			const edit1 = edit1Queue[0]!;
+			if (!edit1 || edit1.replaceRange.start + edit1ToEdit2 + edit1.newText.length >= edit2.replaceRange.start) {
+				break;
+			}
+			edit1Queue.shift();
+
+			result.push(edit1);
+			edit1ToEdit2 += edit1.newText.length - edit1.replaceRange.length;
+		}
+
+		const firstEdit1ToEdit2 = edit1ToEdit2;
+		let firstIntersecting: SingleOffsetEdit | undefined; // or touching
+		let lastIntersecting: SingleOffsetEdit | undefined; // or touching
+
+		while (true) {
+			const edit1 = edit1Queue[0];
+			if (!edit1 || edit1.replaceRange.start + edit1ToEdit2 > edit2.replaceRange.endExclusive) {
+				break;
+			}
+			// else we intersect, because the new end of edit1 is after or equal to our start
+
+			if (!firstIntersecting) {
+				firstIntersecting = edit1;
+			}
+			lastIntersecting = edit1;
+			edit1Queue.shift();
+
+			edit1ToEdit2 += edit1.newText.length - edit1.replaceRange.length;
+		}
+
+		if (!firstIntersecting) {
+			result.push(new SingleOffsetEdit(edit2.replaceRange.delta(-edit1ToEdit2), edit2.newText));
+		} else {
+			let prefix = '';
+			const prefixLength = edit2.replaceRange.start - (firstIntersecting.replaceRange.start + firstEdit1ToEdit2);
+			if (prefixLength > 0) {
+				prefix = firstIntersecting.newText.slice(0, prefixLength);
+			}
+			const suffixLength = (lastIntersecting!.replaceRange.endExclusive + edit1ToEdit2) - edit2.replaceRange.endExclusive;
+			if (suffixLength > 0) {
+				const e = new SingleOffsetEdit(OffsetRange.ofStartAndLength(lastIntersecting!.replaceRange.endExclusive, 0), lastIntersecting!.newText.slice(-suffixLength));
+				edit1Queue.unshift(e);
+				edit1ToEdit2 -= e.newText.length - e.replaceRange.length;
+			}
+			const newText = prefix + edit2.newText;
+
+			const newReplaceRange = new OffsetRange(
+				Math.min(firstIntersecting.replaceRange.start, edit2.replaceRange.start - firstEdit1ToEdit2),
+				edit2.replaceRange.endExclusive - edit1ToEdit2
+			);
+			result.push(new SingleOffsetEdit(newReplaceRange, newText));
+		}
+	}
+
+	while (true) {
+		const item = edit1Queue.shift();
+		if (!item) { break; }
+		result.push(item);
+	}
+
+	return new OffsetEdit(result).normalize();
+}
diff --git a/src/vs/editor/common/core/offsetRange.ts b/src/vs/editor/common/core/offsetRange.ts
index 17857dd9488..5e2ef46d5a0 100644
--- a/src/vs/editor/common/core/offsetRange.ts
+++ b/src/vs/editor/common/core/offsetRange.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BugIndicatingError } from 'vs/base/common/errors';
+import { BugIndicatingError } from '../../../base/common/errors.js';
 
 export interface IOffsetRange {
 	readonly start: number;
@@ -47,6 +47,10 @@ export class OffsetRange implements IOffsetRange {
 		return new OffsetRange(start, start + length);
 	}
 
+	public static emptyAt(offset: number): OffsetRange {
+		return new OffsetRange(offset, offset);
+	}
+
 	constructor(public readonly start: number, public readonly endExclusive: number) {
 		if (start > endExclusive) {
 			throw new BugIndicatingError(`Invalid range: ${this.toString()}`);
@@ -112,6 +116,12 @@ export class OffsetRange implements IOffsetRange {
 		return undefined;
 	}
 
+	public intersectionLength(range: OffsetRange): number {
+		const start = Math.max(this.start, range.start);
+		const end = Math.min(this.endExclusive, range.endExclusive);
+		return Math.max(0, end - start);
+	}
+
 	public intersects(other: OffsetRange): boolean {
 		const start = Math.max(this.start, other.start);
 		const end = Math.min(this.endExclusive, other.endExclusive);
diff --git a/src/vs/editor/common/core/positionToOffset.ts b/src/vs/editor/common/core/positionToOffset.ts
index 484c0a3265f..e4a13a076d4 100644
--- a/src/vs/editor/common/core/positionToOffset.ts
+++ b/src/vs/editor/common/core/positionToOffset.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { findLastIdxMonotonous } from 'vs/base/common/arraysFind';
-import { OffsetRange } from 'vs/editor/common/core/offsetRange';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { TextLength } from 'vs/editor/common/core/textLength';
+import { findLastIdxMonotonous } from '../../../base/common/arraysFind.js';
+import { OffsetRange } from './offsetRange.js';
+import { Position } from './position.js';
+import { Range } from './range.js';
+import { TextLength } from './textLength.js';
 
 export class PositionOffsetTransformer {
 	private readonly lineStartOffsetByLineIdx: number[];
diff --git a/src/vs/editor/common/core/range.ts b/src/vs/editor/common/core/range.ts
index 72396396d1b..954c18e137f 100644
--- a/src/vs/editor/common/core/range.ts
+++ b/src/vs/editor/common/core/range.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IPosition, Position } from 'vs/editor/common/core/position';
+import { IPosition, Position } from './position.js';
 
 /**
  * A range in the editor. This interface is suitable for serialization.
diff --git a/src/vs/editor/common/core/rangeMapping.ts b/src/vs/editor/common/core/rangeMapping.ts
index 379e046357d..8d838cc1f75 100644
--- a/src/vs/editor/common/core/rangeMapping.ts
+++ b/src/vs/editor/common/core/rangeMapping.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { findLastMonotonous } from 'vs/base/common/arraysFind';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { TextLength } from 'vs/editor/common/core/textLength';
+import { findLastMonotonous } from '../../../base/common/arraysFind.js';
+import { Position } from './position.js';
+import { Range } from './range.js';
+import { TextLength } from './textLength.js';
 
 /**
  * Represents a list of mappings of ranges from one document to another.
diff --git a/src/vs/editor/common/core/selection.ts b/src/vs/editor/common/core/selection.ts
index 1e0db95c8f2..c436bb61ef6 100644
--- a/src/vs/editor/common/core/selection.ts
+++ b/src/vs/editor/common/core/selection.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
+import { IPosition, Position } from './position.js';
+import { Range } from './range.js';
 
 /**
  * A selection in the editor.
diff --git a/src/vs/editor/common/core/stringBuilder.ts b/src/vs/editor/common/core/stringBuilder.ts
index d4b74be68d3..4231fba27fa 100644
--- a/src/vs/editor/common/core/stringBuilder.ts
+++ b/src/vs/editor/common/core/stringBuilder.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as strings from 'vs/base/common/strings';
-import * as platform from 'vs/base/common/platform';
-import * as buffer from 'vs/base/common/buffer';
+import * as strings from '../../../base/common/strings.js';
+import * as platform from '../../../base/common/platform.js';
+import * as buffer from '../../../base/common/buffer.js';
 
 let _utf16LE_TextDecoder: TextDecoder | null;
 function getUTF16LE_TextDecoder(): TextDecoder {
diff --git a/src/vs/editor/common/core/textChange.ts b/src/vs/editor/common/core/textChange.ts
index aad78ed4c89..43925f18126 100644
--- a/src/vs/editor/common/core/textChange.ts
+++ b/src/vs/editor/common/core/textChange.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as buffer from 'vs/base/common/buffer';
-import { decodeUTF16LE } from 'vs/editor/common/core/stringBuilder';
+import * as buffer from '../../../base/common/buffer.js';
+import { decodeUTF16LE } from './stringBuilder.js';
 
 function escapeNewLine(str: string): string {
 	return (
diff --git a/src/vs/editor/common/core/textEdit.ts b/src/vs/editor/common/core/textEdit.ts
index 3b0d6d2f70a..2dcc4ec3dc7 100644
--- a/src/vs/editor/common/core/textEdit.ts
+++ b/src/vs/editor/common/core/textEdit.ts
@@ -3,19 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { assert, assertFn, checkAdjacentItems } from 'vs/base/common/assert';
-import { BugIndicatingError } from 'vs/base/common/errors';
-import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { Position } from 'vs/editor/common/core/position';
-import { PositionOffsetTransformer } from 'vs/editor/common/core/positionToOffset';
-import { Range } from 'vs/editor/common/core/range';
-import { TextLength } from 'vs/editor/common/core/textLength';
+import { assert, assertFn, checkAdjacentItems } from '../../../base/common/assert.js';
+import { BugIndicatingError } from '../../../base/common/errors.js';
+import { ISingleEditOperation } from './editOperation.js';
+import { Position } from './position.js';
+import { PositionOffsetTransformer } from './positionToOffset.js';
+import { Range } from './range.js';
+import { TextLength } from './textLength.js';
 
 export class TextEdit {
 	public static single(originalRange: Range, newText: string): TextEdit {
 		return new TextEdit([new SingleTextEdit(originalRange, newText)]);
 	}
 
+	public static insert(position: Position, newText: string): TextEdit {
+		return new TextEdit([new SingleTextEdit(Range.fromPositions(position, position), newText)]);
+	}
+
 	constructor(public readonly edits: readonly SingleTextEdit[]) {
 		assertFn(() => checkAdjacentItems(edits, (a, b) => a.range.getEndPosition().isBeforeOrEqual(b.range.getStartPosition())));
 	}
@@ -43,12 +47,12 @@ export class TextEdit {
 
 		for (const edit of this.edits) {
 			const start = edit.range.getStartPosition();
-			const end = edit.range.getEndPosition();
 
 			if (position.isBeforeOrEqual(start)) {
 				break;
 			}
 
+			const end = edit.range.getEndPosition();
 			const len = TextLength.ofText(edit.text);
 			if (position.isBefore(end)) {
 				const startPos = new Position(start.lineNumber + lineDelta, start.column + (start.lineNumber + lineDelta === curLine ? columnDeltaInCurLine : 0));
@@ -56,6 +60,10 @@ export class TextEdit {
 				return rangeFromPositions(startPos, endPos);
 			}
 
+			if (start.lineNumber + lineDelta !== curLine) {
+				columnDeltaInCurLine = 0;
+			}
+
 			lineDelta += len.lineCount - (edit.range.endLineNumber - edit.range.startLineNumber);
 
 			if (len.lineCount === 0) {
@@ -173,6 +181,14 @@ export class SingleTextEdit {
 			text: this.text,
 		};
 	}
+
+	public toEdit(): TextEdit {
+		return new TextEdit([this]);
+	}
+
+	public equals(other: SingleTextEdit): boolean {
+		return SingleTextEdit.equals(this, other);
+	}
 }
 
 function rangeFromPositions(start: Position, end: Position): Range {
@@ -195,6 +211,10 @@ export abstract class AbstractText {
 	getValue() {
 		return this.getValueOfRange(this.length.toRange());
 	}
+
+	getLineLength(lineNumber: number): number {
+		return this.getValueOfRange(new Range(lineNumber, 1, lineNumber, Number.MAX_SAFE_INTEGER)).length;
+	}
 }
 
 export class LineBasedText extends AbstractText {
@@ -207,7 +227,7 @@ export class LineBasedText extends AbstractText {
 		super();
 	}
 
-	getValueOfRange(range: Range): string {
+	override getValueOfRange(range: Range): string {
 		if (range.startLineNumber === range.endLineNumber) {
 			return this._getLineContent(range.startLineNumber).substring(range.startColumn - 1, range.endColumn - 1);
 		}
@@ -219,12 +239,25 @@ export class LineBasedText extends AbstractText {
 		return result;
 	}
 
+	override getLineLength(lineNumber: number): number {
+		return this._getLineContent(lineNumber).length;
+	}
+
 	get length(): TextLength {
 		const lastLine = this._getLineContent(this._lineCount);
 		return new TextLength(this._lineCount - 1, lastLine.length);
 	}
 }
 
+export class ArrayText extends LineBasedText {
+	constructor(lines: string[]) {
+		super(
+			lineNumber => lines[lineNumber - 1],
+			lines.length
+		);
+	}
+}
+
 export class StringText extends AbstractText {
 	private readonly _t = new PositionOffsetTransformer(this.value);
 
diff --git a/src/vs/editor/common/core/textLength.ts b/src/vs/editor/common/core/textLength.ts
index bee3897d5fd..91dbdd79637 100644
--- a/src/vs/editor/common/core/textLength.ts
+++ b/src/vs/editor/common/core/textLength.ts
@@ -2,8 +2,8 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
+import { Position } from './position.js';
+import { Range } from './range.js';
 
 /**
  * Represents a non-negative length of text in terms of line and column count.
@@ -30,6 +30,10 @@ export class TextLength {
 		}
 	}
 
+	public static fromPosition(pos: Position): TextLength {
+		return new TextLength(pos.lineNumber - 1, pos.column - 1);
+	}
+
 	public static ofRange(range: Range) {
 		return TextLength.betweenPositions(range.getStartPosition(), range.getEndPosition());
 	}
@@ -117,6 +121,13 @@ export class TextLength {
 		}
 	}
 
+	public addToRange(range: Range): Range {
+		return Range.fromPositions(
+			this.addToPosition(range.getStartPosition()),
+			this.addToPosition(range.getEndPosition())
+		);
+	}
+
 	toString() {
 		return `${this.lineCount},${this.columnCount}`;
 	}
diff --git a/src/vs/editor/common/core/wordCharacterClassifier.ts b/src/vs/editor/common/core/wordCharacterClassifier.ts
index b984c272657..649498c419e 100644
--- a/src/vs/editor/common/core/wordCharacterClassifier.ts
+++ b/src/vs/editor/common/core/wordCharacterClassifier.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
-import { LRUCache } from 'vs/base/common/map';
-import { CharacterClassifier } from 'vs/editor/common/core/characterClassifier';
+import { CharCode } from '../../../base/common/charCode.js';
+import { LRUCache } from '../../../base/common/map.js';
+import { CharacterClassifier } from './characterClassifier.js';
 
 export const enum WordCharacterClass {
 	Regular = 0,
diff --git a/src/vs/editor/common/core/wordHelper.ts b/src/vs/editor/common/core/wordHelper.ts
index 96e378d0eca..32838f92011 100644
--- a/src/vs/editor/common/core/wordHelper.ts
+++ b/src/vs/editor/common/core/wordHelper.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Iterable } from 'vs/base/common/iterator';
-import { toDisposable } from 'vs/base/common/lifecycle';
-import { LinkedList } from 'vs/base/common/linkedList';
+import { Iterable } from '../../../base/common/iterator.js';
+import { toDisposable } from '../../../base/common/lifecycle.js';
+import { LinkedList } from '../../../base/common/linkedList.js';
 
 export const USUAL_WORD_SEPARATORS = '`~!@#$%^&*()-=+[{]}\\|;:\'",.<>/?';
 
diff --git a/src/vs/editor/common/cursor/cursor.ts b/src/vs/editor/common/cursor/cursor.ts
index 4df16ec8db2..d68f60c56ed 100644
--- a/src/vs/editor/common/cursor/cursor.ts
+++ b/src/vs/editor/common/cursor/cursor.ts
@@ -3,24 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { onUnexpectedError } from 'vs/base/common/errors';
-import * as strings from 'vs/base/common/strings';
-import { CursorCollection } from 'vs/editor/common/cursor/cursorCollection';
-import { CursorConfiguration, CursorState, EditOperationResult, EditOperationType, IColumnSelectData, PartialCursorState, ICursorSimpleModel } from 'vs/editor/common/cursorCommon';
-import { CursorContext } from 'vs/editor/common/cursor/cursorContext';
-import { DeleteOperations } from 'vs/editor/common/cursor/cursorDeleteOperations';
-import { CursorChangeReason } from 'vs/editor/common/cursorEvents';
-import { CompositionOutcome, TypeOperations, TypeWithAutoClosingCommand } from 'vs/editor/common/cursor/cursorTypeOperations';
-import { Position } from 'vs/editor/common/core/position';
-import { Range, IRange } from 'vs/editor/common/core/range';
-import { ISelection, Selection, SelectionDirection } from 'vs/editor/common/core/selection';
-import * as editorCommon from 'vs/editor/common/editorCommon';
-import { ITextModel, TrackedRangeStickiness, IModelDeltaDecoration, ICursorStateComputer, IIdentifiedSingleEditOperation, IValidEditOperation } from 'vs/editor/common/model';
-import { RawContentChangedType, ModelInjectedTextChangedEvent, InternalModelContentChangeEvent } from 'vs/editor/common/textModelEvents';
-import { VerticalRevealType, ViewCursorStateChangedEvent, ViewRevealRangeRequestEvent } from 'vs/editor/common/viewEvents';
-import { dispose, Disposable } from 'vs/base/common/lifecycle';
-import { ICoordinatesConverter } from 'vs/editor/common/viewModel';
-import { CursorStateChangedEvent, ViewModelEventsCollector } from 'vs/editor/common/viewModelEventDispatcher';
+import { onUnexpectedError } from '../../../base/common/errors.js';
+import * as strings from '../../../base/common/strings.js';
+import { CursorCollection } from './cursorCollection.js';
+import { CursorConfiguration, CursorState, EditOperationResult, EditOperationType, IColumnSelectData, PartialCursorState, ICursorSimpleModel } from '../cursorCommon.js';
+import { CursorContext } from './cursorContext.js';
+import { DeleteOperations } from './cursorDeleteOperations.js';
+import { CursorChangeReason } from '../cursorEvents.js';
+import { CompositionOutcome, TypeOperations } from './cursorTypeOperations.js';
+import { BaseTypeWithAutoClosingCommand } from './cursorTypeEditOperations.js';
+import { Position } from '../core/position.js';
+import { Range, IRange } from '../core/range.js';
+import { ISelection, Selection, SelectionDirection } from '../core/selection.js';
+import * as editorCommon from '../editorCommon.js';
+import { ITextModel, TrackedRangeStickiness, IModelDeltaDecoration, ICursorStateComputer, IIdentifiedSingleEditOperation, IValidEditOperation } from '../model.js';
+import { RawContentChangedType, ModelInjectedTextChangedEvent, InternalModelContentChangeEvent } from '../textModelEvents.js';
+import { VerticalRevealType, ViewCursorStateChangedEvent, ViewRevealRangeRequestEvent } from '../viewEvents.js';
+import { dispose, Disposable } from '../../../base/common/lifecycle.js';
+import { ICoordinatesConverter } from '../viewModel.js';
+import { CursorStateChangedEvent, ViewModelEventsCollector } from '../viewModelEventDispatcher.js';
 
 export class CursorsController extends Disposable {
 
@@ -367,7 +368,7 @@ export class CursorsController extends Disposable {
 
 			for (let i = 0; i < opResult.commands.length; i++) {
 				const command = opResult.commands[i];
-				if (command instanceof TypeWithAutoClosingCommand && command.enclosingRange && command.closeCharacterRange) {
+				if (command instanceof BaseTypeWithAutoClosingCommand && command.enclosingRange && command.closeCharacterRange) {
 					autoClosedCharactersRanges.push(command.closeCharacterRange);
 					autoClosedEnclosingRanges.push(command.enclosingRange);
 				}
@@ -739,7 +740,7 @@ interface ICommandsData {
 	hadTrackedEditOperation: boolean;
 }
 
-class CommandExecutor {
+export class CommandExecutor {
 
 	public static executeCommands(model: ITextModel, selectionsBefore: Selection[], commands: (editorCommon.ICommand | null)[]): Selection[] | null {
 
diff --git a/src/vs/editor/common/cursor/cursorAtomicMoveOperations.ts b/src/vs/editor/common/cursor/cursorAtomicMoveOperations.ts
index 5cd406c3f9d..6b2c9cd1f87 100644
--- a/src/vs/editor/common/cursor/cursorAtomicMoveOperations.ts
+++ b/src/vs/editor/common/cursor/cursorAtomicMoveOperations.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
-import { CursorColumns } from 'vs/editor/common/core/cursorColumns';
+import { CharCode } from '../../../base/common/charCode.js';
+import { CursorColumns } from '../core/cursorColumns.js';
 
 export const enum Direction {
 	Left,
diff --git a/src/vs/editor/common/cursor/cursorCollection.ts b/src/vs/editor/common/cursor/cursorCollection.ts
index 626c139cbb6..ae1f4b6ca15 100644
--- a/src/vs/editor/common/cursor/cursorCollection.ts
+++ b/src/vs/editor/common/cursor/cursorCollection.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { compareBy } from 'vs/base/common/arrays';
-import { findLastMax, findFirstMin } from 'vs/base/common/arraysFind';
-import { CursorState, PartialCursorState } from 'vs/editor/common/cursorCommon';
-import { CursorContext } from 'vs/editor/common/cursor/cursorContext';
-import { Cursor } from 'vs/editor/common/cursor/oneCursor';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { ISelection, Selection } from 'vs/editor/common/core/selection';
+import { compareBy } from '../../../base/common/arrays.js';
+import { findLastMax, findFirstMin } from '../../../base/common/arraysFind.js';
+import { CursorState, PartialCursorState } from '../cursorCommon.js';
+import { CursorContext } from './cursorContext.js';
+import { Cursor } from './oneCursor.js';
+import { Position } from '../core/position.js';
+import { Range } from '../core/range.js';
+import { ISelection, Selection } from '../core/selection.js';
 
 export class CursorCollection {
 
diff --git a/src/vs/editor/common/cursor/cursorColumnSelection.ts b/src/vs/editor/common/cursor/cursorColumnSelection.ts
index e87cf910950..eef55621902 100644
--- a/src/vs/editor/common/cursor/cursorColumnSelection.ts
+++ b/src/vs/editor/common/cursor/cursorColumnSelection.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CursorConfiguration, ICursorSimpleModel, SingleCursorState, IColumnSelectData, SelectionStartKind } from 'vs/editor/common/cursorCommon';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
+import { CursorConfiguration, ICursorSimpleModel, SingleCursorState, IColumnSelectData, SelectionStartKind } from '../cursorCommon.js';
+import { Position } from '../core/position.js';
+import { Range } from '../core/range.js';
 
 export class ColumnSelection {
 
diff --git a/src/vs/editor/common/cursor/cursorContext.ts b/src/vs/editor/common/cursor/cursorContext.ts
index 19c6877bf7c..30c25a6d626 100644
--- a/src/vs/editor/common/cursor/cursorContext.ts
+++ b/src/vs/editor/common/cursor/cursorContext.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ITextModel } from 'vs/editor/common/model';
-import { ICoordinatesConverter } from 'vs/editor/common/viewModel';
-import { CursorConfiguration, ICursorSimpleModel } from 'vs/editor/common/cursorCommon';
+import { ITextModel } from '../model.js';
+import { ICoordinatesConverter } from '../viewModel.js';
+import { CursorConfiguration, ICursorSimpleModel } from '../cursorCommon.js';
 
 export class CursorContext {
 	_cursorContextBrand: void = undefined;
diff --git a/src/vs/editor/common/cursor/cursorDeleteOperations.ts b/src/vs/editor/common/cursor/cursorDeleteOperations.ts
index 13218ea71a6..acf11b2d3ba 100644
--- a/src/vs/editor/common/cursor/cursorDeleteOperations.ts
+++ b/src/vs/editor/common/cursor/cursorDeleteOperations.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as strings from 'vs/base/common/strings';
-import { ReplaceCommand } from 'vs/editor/common/commands/replaceCommand';
-import { EditorAutoClosingEditStrategy, EditorAutoClosingStrategy } from 'vs/editor/common/config/editorOptions';
-import { CursorConfiguration, EditOperationResult, EditOperationType, ICursorSimpleModel, isQuote } from 'vs/editor/common/cursorCommon';
-import { CursorColumns } from 'vs/editor/common/core/cursorColumns';
-import { MoveOperations } from 'vs/editor/common/cursor/cursorMoveOperations';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ICommand } from 'vs/editor/common/editorCommon';
-import { StandardAutoClosingPairConditional } from 'vs/editor/common/languages/languageConfiguration';
-import { Position } from 'vs/editor/common/core/position';
+import * as strings from '../../../base/common/strings.js';
+import { ReplaceCommand } from '../commands/replaceCommand.js';
+import { EditorAutoClosingEditStrategy, EditorAutoClosingStrategy } from '../config/editorOptions.js';
+import { CursorConfiguration, EditOperationResult, EditOperationType, ICursorSimpleModel, isQuote } from '../cursorCommon.js';
+import { CursorColumns } from '../core/cursorColumns.js';
+import { MoveOperations } from './cursorMoveOperations.js';
+import { Range } from '../core/range.js';
+import { Selection } from '../core/selection.js';
+import { ICommand } from '../editorCommon.js';
+import { StandardAutoClosingPairConditional } from '../languages/languageConfiguration.js';
+import { Position } from '../core/position.js';
 
 export class DeleteOperations {
 
diff --git a/src/vs/editor/common/cursor/cursorMoveCommands.ts b/src/vs/editor/common/cursor/cursorMoveCommands.ts
index 78c553732a9..46e2192ff3e 100644
--- a/src/vs/editor/common/cursor/cursorMoveCommands.ts
+++ b/src/vs/editor/common/cursor/cursorMoveCommands.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as types from 'vs/base/common/types';
-import { CursorState, ICursorSimpleModel, PartialCursorState, SelectionStartKind, SingleCursorState } from 'vs/editor/common/cursorCommon';
-import { MoveOperations } from 'vs/editor/common/cursor/cursorMoveOperations';
-import { WordOperations } from 'vs/editor/common/cursor/cursorWordOperations';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { ICommandMetadata } from 'vs/platform/commands/common/commands';
-import { IViewModel } from 'vs/editor/common/viewModel';
+import * as types from '../../../base/common/types.js';
+import { CursorState, ICursorSimpleModel, PartialCursorState, SelectionStartKind, SingleCursorState } from '../cursorCommon.js';
+import { MoveOperations } from './cursorMoveOperations.js';
+import { WordOperations } from './cursorWordOperations.js';
+import { IPosition, Position } from '../core/position.js';
+import { Range } from '../core/range.js';
+import { ICommandMetadata } from '../../../platform/commands/common/commands.js';
+import { IViewModel } from '../viewModel.js';
 
 export class CursorMoveCommands {
 
diff --git a/src/vs/editor/common/cursor/cursorMoveOperations.ts b/src/vs/editor/common/cursor/cursorMoveOperations.ts
index 5699917a4f4..ebfde76738d 100644
--- a/src/vs/editor/common/cursor/cursorMoveOperations.ts
+++ b/src/vs/editor/common/cursor/cursorMoveOperations.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as strings from 'vs/base/common/strings';
-import { Constants } from 'vs/base/common/uint';
-import { CursorColumns } from 'vs/editor/common/core/cursorColumns';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { AtomicTabMoveOperations, Direction } from 'vs/editor/common/cursor/cursorAtomicMoveOperations';
-import { CursorConfiguration, ICursorSimpleModel, SelectionStartKind, SingleCursorState } from 'vs/editor/common/cursorCommon';
-import { PositionAffinity } from 'vs/editor/common/model';
+import * as strings from '../../../base/common/strings.js';
+import { Constants } from '../../../base/common/uint.js';
+import { CursorColumns } from '../core/cursorColumns.js';
+import { Position } from '../core/position.js';
+import { Range } from '../core/range.js';
+import { AtomicTabMoveOperations, Direction } from './cursorAtomicMoveOperations.js';
+import { CursorConfiguration, ICursorSimpleModel, SelectionStartKind, SingleCursorState } from '../cursorCommon.js';
+import { PositionAffinity } from '../model.js';
 
 export class CursorPosition {
 	_cursorPositionBrand: void = undefined;
diff --git a/src/vs/editor/common/cursor/cursorTypeEditOperations.ts b/src/vs/editor/common/cursor/cursorTypeEditOperations.ts
new file mode 100644
index 00000000000..c20fcfad38a
--- /dev/null
+++ b/src/vs/editor/common/cursor/cursorTypeEditOperations.ts
@@ -0,0 +1,1030 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { CharCode } from '../../../base/common/charCode.js';
+import { onUnexpectedError } from '../../../base/common/errors.js';
+import * as strings from '../../../base/common/strings.js';
+import { ReplaceCommand, ReplaceCommandWithOffsetCursorState, ReplaceCommandWithoutChangingPosition, ReplaceCommandThatPreservesSelection } from '../commands/replaceCommand.js';
+import { ShiftCommand } from '../commands/shiftCommand.js';
+import { SurroundSelectionCommand } from '../commands/surroundSelectionCommand.js';
+import { CursorConfiguration, EditOperationResult, EditOperationType, ICursorSimpleModel, isQuote } from '../cursorCommon.js';
+import { WordCharacterClass, getMapForWordSeparators } from '../core/wordCharacterClassifier.js';
+import { Range } from '../core/range.js';
+import { Selection } from '../core/selection.js';
+import { Position } from '../core/position.js';
+import { ICommand, ICursorStateComputerData, IEditOperationBuilder } from '../editorCommon.js';
+import { ITextModel } from '../model.js';
+import { EnterAction, IndentAction, StandardAutoClosingPairConditional } from '../languages/languageConfiguration.js';
+import { getIndentationAtPosition } from '../languages/languageConfigurationRegistry.js';
+import { IElectricAction } from '../languages/supports/electricCharacter.js';
+import { EditorAutoClosingStrategy, EditorAutoIndentStrategy } from '../config/editorOptions.js';
+import { createScopedLineTokens } from '../languages/supports.js';
+import { getIndentActionForType, getIndentForEnter, getInheritIndentForLine } from '../languages/autoIndent.js';
+import { getEnterAction } from '../languages/enterAction.js';
+
+export class AutoIndentOperation {
+
+	public static getEdits(config: CursorConfiguration, model: ITextModel, selections: Selection[], ch: string, isDoingComposition: boolean): EditOperationResult | undefined {
+		if (!isDoingComposition && this._isAutoIndentType(config, model, selections)) {
+			const indentationForSelections: { selection: Selection; indentation: string }[] = [];
+			for (const selection of selections) {
+				const indentation = this._findActualIndentationForSelection(config, model, selection, ch);
+				if (indentation === null) {
+					// Auto indentation failed
+					return;
+				}
+				indentationForSelections.push({ selection, indentation });
+			}
+			const autoClosingPairClose = AutoClosingOpenCharTypeOperation.getAutoClosingPairClose(config, model, selections, ch, false);
+			return this._getIndentationAndAutoClosingPairEdits(config, model, indentationForSelections, ch, autoClosingPairClose);
+		}
+		return;
+	}
+
+	private static _isAutoIndentType(config: CursorConfiguration, model: ITextModel, selections: Selection[]): boolean {
+		if (config.autoIndent < EditorAutoIndentStrategy.Full) {
+			return false;
+		}
+		for (let i = 0, len = selections.length; i < len; i++) {
+			if (!model.tokenization.isCheapToTokenize(selections[i].getEndPosition().lineNumber)) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	private static _findActualIndentationForSelection(config: CursorConfiguration, model: ITextModel, selection: Selection, ch: string): string | null {
+		const actualIndentation = getIndentActionForType(config, model, selection, ch, {
+			shiftIndent: (indentation) => {
+				return shiftIndent(config, indentation);
+			},
+			unshiftIndent: (indentation) => {
+				return unshiftIndent(config, indentation);
+			},
+		}, config.languageConfigurationService);
+
+		if (actualIndentation === null) {
+			return null;
+		}
+
+		const currentIndentation = getIndentationAtPosition(model, selection.startLineNumber, selection.startColumn);
+		if (actualIndentation === config.normalizeIndentation(currentIndentation)) {
+			return null;
+		}
+		return actualIndentation;
+	}
+
+	private static _getIndentationAndAutoClosingPairEdits(config: CursorConfiguration, model: ITextModel, indentationForSelections: { selection: Selection; indentation: string }[], ch: string, autoClosingPairClose: string | null): EditOperationResult {
+		const commands: ICommand[] = indentationForSelections.map(({ selection, indentation }) => {
+			if (autoClosingPairClose !== null) {
+				// Apply both auto closing pair edits and auto indentation edits
+				const indentationEdit = this._getEditFromIndentationAndSelection(config, model, indentation, selection, ch, false);
+				return new TypeWithIndentationAndAutoClosingCommand(indentationEdit, selection, ch, autoClosingPairClose);
+			} else {
+				// Apply only auto indentation edits
+				const indentationEdit = this._getEditFromIndentationAndSelection(config, model, indentation, selection, ch, true);
+				return typeCommand(indentationEdit.range, indentationEdit.text, false);
+			}
+		});
+		const editOptions = { shouldPushStackElementBefore: true, shouldPushStackElementAfter: false };
+		return new EditOperationResult(EditOperationType.TypingOther, commands, editOptions);
+	}
+
+	private static _getEditFromIndentationAndSelection(config: CursorConfiguration, model: ITextModel, indentation: string, selection: Selection, ch: string, includeChInEdit: boolean = true): { range: Range; text: string } {
+		const startLineNumber = selection.startLineNumber;
+		const firstNonWhitespaceColumn = model.getLineFirstNonWhitespaceColumn(startLineNumber);
+		let text: string = config.normalizeIndentation(indentation);
+		if (firstNonWhitespaceColumn !== 0) {
+			const startLine = model.getLineContent(startLineNumber);
+			text += startLine.substring(firstNonWhitespaceColumn - 1, selection.startColumn - 1);
+		}
+		text += includeChInEdit ? ch : '';
+		const range = new Range(startLineNumber, 1, selection.endLineNumber, selection.endColumn);
+		return { range, text };
+	}
+}
+
+export class AutoClosingOvertypeOperation {
+
+	public static getEdits(prevEditOperationType: EditOperationType, config: CursorConfiguration, model: ITextModel, selections: Selection[], autoClosedCharacters: Range[], ch: string): EditOperationResult | undefined {
+		if (isAutoClosingOvertype(config, model, selections, autoClosedCharacters, ch)) {
+			return this._runAutoClosingOvertype(prevEditOperationType, selections, ch);
+		}
+		return;
+	}
+
+	private static _runAutoClosingOvertype(prevEditOperationType: EditOperationType, selections: Selection[], ch: string): EditOperationResult {
+		const commands: ICommand[] = [];
+		for (let i = 0, len = selections.length; i < len; i++) {
+			const selection = selections[i];
+			const position = selection.getPosition();
+			const typeSelection = new Range(position.lineNumber, position.column, position.lineNumber, position.column + 1);
+			commands[i] = new ReplaceCommand(typeSelection, ch);
+		}
+		return new EditOperationResult(EditOperationType.TypingOther, commands, {
+			shouldPushStackElementBefore: shouldPushStackElementBetween(prevEditOperationType, EditOperationType.TypingOther),
+			shouldPushStackElementAfter: false
+		});
+	}
+}
+
+export class AutoClosingOvertypeWithInterceptorsOperation {
+
+	public static getEdits(config: CursorConfiguration, model: ITextModel, selections: Selection[], autoClosedCharacters: Range[], ch: string): EditOperationResult | undefined {
+		if (isAutoClosingOvertype(config, model, selections, autoClosedCharacters, ch)) {
+			// Unfortunately, the close character is at this point "doubled", so we need to delete it...
+			const commands = selections.map(s => new ReplaceCommand(new Range(s.positionLineNumber, s.positionColumn, s.positionLineNumber, s.positionColumn + 1), '', false));
+			return new EditOperationResult(EditOperationType.TypingOther, commands, {
+				shouldPushStackElementBefore: true,
+				shouldPushStackElementAfter: false
+			});
+		}
+		return;
+	}
+}
+
+export class AutoClosingOpenCharTypeOperation {
+
+	public static getEdits(config: CursorConfiguration, model: ITextModel, selections: Selection[], ch: string, chIsAlreadyTyped: boolean, isDoingComposition: boolean): EditOperationResult | undefined {
+		if (!isDoingComposition) {
+			const autoClosingPairClose = this.getAutoClosingPairClose(config, model, selections, ch, chIsAlreadyTyped);
+			if (autoClosingPairClose !== null) {
+				return this._runAutoClosingOpenCharType(selections, ch, chIsAlreadyTyped, autoClosingPairClose);
+			}
+		}
+		return;
+	}
+
+	private static _runAutoClosingOpenCharType(selections: Selection[], ch: string, chIsAlreadyTyped: boolean, autoClosingPairClose: string): EditOperationResult {
+		const commands: ICommand[] = [];
+		for (let i = 0, len = selections.length; i < len; i++) {
+			const selection = selections[i];
+			commands[i] = new TypeWithAutoClosingCommand(selection, ch, !chIsAlreadyTyped, autoClosingPairClose);
+		}
+		return new EditOperationResult(EditOperationType.TypingOther, commands, {
+			shouldPushStackElementBefore: true,
+			shouldPushStackElementAfter: false
+		});
+	}
+
+	public static getAutoClosingPairClose(config: CursorConfiguration, model: ITextModel, selections: Selection[], ch: string, chIsAlreadyTyped: boolean): string | null {
+		for (const selection of selections) {
+			if (!selection.isEmpty()) {
+				return null;
+			}
+		}
+		// This method is called both when typing (regularly) and when composition ends
+		// This means that we need to work with a text buffer where sometimes `ch` is not
+		// there (it is being typed right now) or with a text buffer where `ch` has already been typed
+		//
+		// In order to avoid adding checks for `chIsAlreadyTyped` in all places, we will work
+		// with two conceptual positions, the position before `ch` and the position after `ch`
+		//
+		const positions: { lineNumber: number; beforeColumn: number; afterColumn: number }[] = selections.map((s) => {
+			const position = s.getPosition();
+			if (chIsAlreadyTyped) {
+				return { lineNumber: position.lineNumber, beforeColumn: position.column - ch.length, afterColumn: position.column };
+			} else {
+				return { lineNumber: position.lineNumber, beforeColumn: position.column, afterColumn: position.column };
+			}
+		});
+		// Find the longest auto-closing open pair in case of multiple ending in `ch`
+		// e.g. when having [f","] and [","], it picks [f","] if the character before is f
+		const pair = this._findAutoClosingPairOpen(config, model, positions.map(p => new Position(p.lineNumber, p.beforeColumn)), ch);
+		if (!pair) {
+			return null;
+		}
+		let autoCloseConfig: EditorAutoClosingStrategy;
+		let shouldAutoCloseBefore: (ch: string) => boolean;
+
+		const chIsQuote = isQuote(ch);
+		if (chIsQuote) {
+			autoCloseConfig = config.autoClosingQuotes;
+			shouldAutoCloseBefore = config.shouldAutoCloseBefore.quote;
+		} else {
+			const pairIsForComments = config.blockCommentStartToken ? pair.open.includes(config.blockCommentStartToken) : false;
+			if (pairIsForComments) {
+				autoCloseConfig = config.autoClosingComments;
+				shouldAutoCloseBefore = config.shouldAutoCloseBefore.comment;
+			} else {
+				autoCloseConfig = config.autoClosingBrackets;
+				shouldAutoCloseBefore = config.shouldAutoCloseBefore.bracket;
+			}
+		}
+		if (autoCloseConfig === 'never') {
+			return null;
+		}
+		// Sometimes, it is possible to have two auto-closing pairs that have a containment relationship
+		// e.g. when having [(,)] and [(*,*)]
+		// - when typing (, the resulting state is (|)
+		// - when typing *, the desired resulting state is (*|*), not (*|*))
+		const containedPair = this._findContainedAutoClosingPair(config, pair);
+		const containedPairClose = containedPair ? containedPair.close : '';
+		let isContainedPairPresent = true;
+
+		for (const position of positions) {
+			const { lineNumber, beforeColumn, afterColumn } = position;
+			const lineText = model.getLineContent(lineNumber);
+			const lineBefore = lineText.substring(0, beforeColumn - 1);
+			const lineAfter = lineText.substring(afterColumn - 1);
+
+			if (!lineAfter.startsWith(containedPairClose)) {
+				isContainedPairPresent = false;
+			}
+			// Only consider auto closing the pair if an allowed character follows or if another autoclosed pair closing brace follows
+			if (lineAfter.length > 0) {
+				const characterAfter = lineAfter.charAt(0);
+				const isBeforeCloseBrace = this._isBeforeClosingBrace(config, lineAfter);
+				if (!isBeforeCloseBrace && !shouldAutoCloseBefore(characterAfter)) {
+					return null;
+				}
+			}
+			// Do not auto-close ' or " after a word character
+			if (pair.open.length === 1 && (ch === '\'' || ch === '"') && autoCloseConfig !== 'always') {
+				const wordSeparators = getMapForWordSeparators(config.wordSeparators, []);
+				if (lineBefore.length > 0) {
+					const characterBefore = lineBefore.charCodeAt(lineBefore.length - 1);
+					if (wordSeparators.get(characterBefore) === WordCharacterClass.Regular) {
+						return null;
+					}
+				}
+			}
+			if (!model.tokenization.isCheapToTokenize(lineNumber)) {
+				// Do not force tokenization
+				return null;
+			}
+			model.tokenization.forceTokenization(lineNumber);
+			const lineTokens = model.tokenization.getLineTokens(lineNumber);
+			const scopedLineTokens = createScopedLineTokens(lineTokens, beforeColumn - 1);
+			if (!pair.shouldAutoClose(scopedLineTokens, beforeColumn - scopedLineTokens.firstCharOffset)) {
+				return null;
+			}
+			// Typing for example a quote could either start a new string, in which case auto-closing is desirable
+			// or it could end a previously started string, in which case auto-closing is not desirable
+			//
+			// In certain cases, it is really not possible to look at the previous token to determine
+			// what would happen. That's why we do something really unusual, we pretend to type a different
+			// character and ask the tokenizer what the outcome of doing that is: after typing a neutral
+			// character, are we in a string (i.e. the quote would most likely end a string) or not?
+			//
+			const neutralCharacter = pair.findNeutralCharacter();
+			if (neutralCharacter) {
+				const tokenType = model.tokenization.getTokenTypeIfInsertingCharacter(lineNumber, beforeColumn, neutralCharacter);
+				if (!pair.isOK(tokenType)) {
+					return null;
+				}
+			}
+		}
+		if (isContainedPairPresent) {
+			return pair.close.substring(0, pair.close.length - containedPairClose.length);
+		} else {
+			return pair.close;
+		}
+	}
+
+	/**
+	 * Find another auto-closing pair that is contained by the one passed in.
+	 *
+	 * e.g. when having [(,)] and [(*,*)] as auto-closing pairs
+	 * this method will find [(,)] as a containment pair for [(*,*)]
+	 */
+	private static _findContainedAutoClosingPair(config: CursorConfiguration, pair: StandardAutoClosingPairConditional): StandardAutoClosingPairConditional | null {
+		if (pair.open.length <= 1) {
+			return null;
+		}
+		const lastChar = pair.close.charAt(pair.close.length - 1);
+		// get candidates with the same last character as close
+		const candidates = config.autoClosingPairs.autoClosingPairsCloseByEnd.get(lastChar) || [];
+		let result: StandardAutoClosingPairConditional | null = null;
+		for (const candidate of candidates) {
+			if (candidate.open !== pair.open && pair.open.includes(candidate.open) && pair.close.endsWith(candidate.close)) {
+				if (!result || candidate.open.length > result.open.length) {
+					result = candidate;
+				}
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * Determine if typing `ch` at all `positions` in the `model` results in an
+	 * auto closing open sequence being typed.
+	 *
+	 * Auto closing open sequences can consist of multiple characters, which
+	 * can lead to ambiguities. In such a case, the longest auto-closing open
+	 * sequence is returned.
+	 */
+	private static _findAutoClosingPairOpen(config: CursorConfiguration, model: ITextModel, positions: Position[], ch: string): StandardAutoClosingPairConditional | null {
+		const candidates = config.autoClosingPairs.autoClosingPairsOpenByEnd.get(ch);
+		if (!candidates) {
+			return null;
+		}
+		// Determine which auto-closing pair it is
+		let result: StandardAutoClosingPairConditional | null = null;
+		for (const candidate of candidates) {
+			if (result === null || candidate.open.length > result.open.length) {
+				let candidateIsMatch = true;
+				for (const position of positions) {
+					const relevantText = model.getValueInRange(new Range(position.lineNumber, position.column - candidate.open.length + 1, position.lineNumber, position.column));
+					if (relevantText + ch !== candidate.open) {
+						candidateIsMatch = false;
+						break;
+					}
+				}
+				if (candidateIsMatch) {
+					result = candidate;
+				}
+			}
+		}
+		return result;
+	}
+
+	private static _isBeforeClosingBrace(config: CursorConfiguration, lineAfter: string) {
+		// If the start of lineAfter can be interpretted as both a starting or ending brace, default to returning false
+		const nextChar = lineAfter.charAt(0);
+		const potentialStartingBraces = config.autoClosingPairs.autoClosingPairsOpenByStart.get(nextChar) || [];
+		const potentialClosingBraces = config.autoClosingPairs.autoClosingPairsCloseByStart.get(nextChar) || [];
+
+		const isBeforeStartingBrace = potentialStartingBraces.some(x => lineAfter.startsWith(x.open));
+		const isBeforeClosingBrace = potentialClosingBraces.some(x => lineAfter.startsWith(x.close));
+
+		return !isBeforeStartingBrace && isBeforeClosingBrace;
+	}
+}
+
+export class SurroundSelectionOperation {
+
+	public static getEdits(config: CursorConfiguration, model: ITextModel, selections: Selection[], ch: string, isDoingComposition: boolean): EditOperationResult | undefined {
+		if (!isDoingComposition && this._isSurroundSelectionType(config, model, selections, ch)) {
+			return this._runSurroundSelectionType(config, selections, ch);
+		}
+		return;
+	}
+
+	private static _runSurroundSelectionType(config: CursorConfiguration, selections: Selection[], ch: string): EditOperationResult {
+		const commands: ICommand[] = [];
+		for (let i = 0, len = selections.length; i < len; i++) {
+			const selection = selections[i];
+			const closeCharacter = config.surroundingPairs[ch];
+			commands[i] = new SurroundSelectionCommand(selection, ch, closeCharacter);
+		}
+		return new EditOperationResult(EditOperationType.Other, commands, {
+			shouldPushStackElementBefore: true,
+			shouldPushStackElementAfter: true
+		});
+	}
+
+	private static _isSurroundSelectionType(config: CursorConfiguration, model: ITextModel, selections: Selection[], ch: string): boolean {
+		if (!shouldSurroundChar(config, ch) || !config.surroundingPairs.hasOwnProperty(ch)) {
+			return false;
+		}
+		const isTypingAQuoteCharacter = isQuote(ch);
+		for (const selection of selections) {
+			if (selection.isEmpty()) {
+				return false;
+			}
+			let selectionContainsOnlyWhitespace = true;
+			for (let lineNumber = selection.startLineNumber; lineNumber <= selection.endLineNumber; lineNumber++) {
+				const lineText = model.getLineContent(lineNumber);
+				const startIndex = (lineNumber === selection.startLineNumber ? selection.startColumn - 1 : 0);
+				const endIndex = (lineNumber === selection.endLineNumber ? selection.endColumn - 1 : lineText.length);
+				const selectedText = lineText.substring(startIndex, endIndex);
+				if (/[^ \t]/.test(selectedText)) {
+					// this selected text contains something other than whitespace
+					selectionContainsOnlyWhitespace = false;
+					break;
+				}
+			}
+			if (selectionContainsOnlyWhitespace) {
+				return false;
+			}
+			if (isTypingAQuoteCharacter && selection.startLineNumber === selection.endLineNumber && selection.startColumn + 1 === selection.endColumn) {
+				const selectionText = model.getValueInRange(selection);
+				if (isQuote(selectionText)) {
+					// Typing a quote character on top of another quote character
+					// => disable surround selection type
+					return false;
+				}
+			}
+		}
+		return true;
+	}
+}
+
+export class InterceptorElectricCharOperation {
+
+	public static getEdits(prevEditOperationType: EditOperationType, config: CursorConfiguration, model: ITextModel, selections: Selection[], ch: string, isDoingComposition: boolean): EditOperationResult | undefined {
+		// Electric characters make sense only when dealing with a single cursor,
+		// as multiple cursors typing brackets for example would interfer with bracket matching
+		if (!isDoingComposition && this._isTypeInterceptorElectricChar(config, model, selections)) {
+			const r = this._typeInterceptorElectricChar(prevEditOperationType, config, model, selections[0], ch);
+			if (r) {
+				return r;
+			}
+		}
+		return;
+	}
+
+	private static _isTypeInterceptorElectricChar(config: CursorConfiguration, model: ITextModel, selections: Selection[]) {
+		if (selections.length === 1 && model.tokenization.isCheapToTokenize(selections[0].getEndPosition().lineNumber)) {
+			return true;
+		}
+		return false;
+	}
+
+	private static _typeInterceptorElectricChar(prevEditOperationType: EditOperationType, config: CursorConfiguration, model: ITextModel, selection: Selection, ch: string): EditOperationResult | null {
+		if (!config.electricChars.hasOwnProperty(ch) || !selection.isEmpty()) {
+			return null;
+		}
+		const position = selection.getPosition();
+		model.tokenization.forceTokenization(position.lineNumber);
+		const lineTokens = model.tokenization.getLineTokens(position.lineNumber);
+		let electricAction: IElectricAction | null;
+		try {
+			electricAction = config.onElectricCharacter(ch, lineTokens, position.column);
+		} catch (e) {
+			onUnexpectedError(e);
+			return null;
+		}
+		if (!electricAction) {
+			return null;
+		}
+		if (electricAction.matchOpenBracket) {
+			const endColumn = (lineTokens.getLineContent() + ch).lastIndexOf(electricAction.matchOpenBracket) + 1;
+			const match = model.bracketPairs.findMatchingBracketUp(electricAction.matchOpenBracket, {
+				lineNumber: position.lineNumber,
+				column: endColumn
+			}, 500 /* give at most 500ms to compute */);
+			if (match) {
+				if (match.startLineNumber === position.lineNumber) {
+					// matched something on the same line => no change in indentation
+					return null;
+				}
+				const matchLine = model.getLineContent(match.startLineNumber);
+				const matchLineIndentation = strings.getLeadingWhitespace(matchLine);
+				const newIndentation = config.normalizeIndentation(matchLineIndentation);
+				const lineText = model.getLineContent(position.lineNumber);
+				const lineFirstNonBlankColumn = model.getLineFirstNonWhitespaceColumn(position.lineNumber) || position.column;
+				const prefix = lineText.substring(lineFirstNonBlankColumn - 1, position.column - 1);
+				const typeText = newIndentation + prefix + ch;
+				const typeSelection = new Range(position.lineNumber, 1, position.lineNumber, position.column);
+				const command = new ReplaceCommand(typeSelection, typeText);
+				return new EditOperationResult(getTypingOperation(typeText, prevEditOperationType), [command], {
+					shouldPushStackElementBefore: false,
+					shouldPushStackElementAfter: true
+				});
+			}
+		}
+		return null;
+	}
+}
+
+export class SimpleCharacterTypeOperation {
+
+	public static getEdits(prevEditOperationType: EditOperationType, selections: Selection[], ch: string): EditOperationResult {
+		// A simple character type
+		const commands: ICommand[] = [];
+		for (let i = 0, len = selections.length; i < len; i++) {
+			commands[i] = new ReplaceCommand(selections[i], ch);
+		}
+
+		const opType = getTypingOperation(ch, prevEditOperationType);
+		return new EditOperationResult(opType, commands, {
+			shouldPushStackElementBefore: shouldPushStackElementBetween(prevEditOperationType, opType),
+			shouldPushStackElementAfter: false
+		});
+	}
+}
+
+export class EnterOperation {
+
+	public static getEdits(config: CursorConfiguration, model: ITextModel, selections: Selection[], ch: string, isDoingComposition: boolean): EditOperationResult | undefined {
+		if (!isDoingComposition && ch === '\n') {
+			const commands: ICommand[] = [];
+			for (let i = 0, len = selections.length; i < len; i++) {
+				commands[i] = this._enter(config, model, false, selections[i]);
+			}
+			return new EditOperationResult(EditOperationType.TypingOther, commands, {
+				shouldPushStackElementBefore: true,
+				shouldPushStackElementAfter: false,
+			});
+		}
+		return;
+	}
+
+	private static _enter(config: CursorConfiguration, model: ITextModel, keepPosition: boolean, range: Range): ICommand {
+		if (config.autoIndent === EditorAutoIndentStrategy.None) {
+			return typeCommand(range, '\n', keepPosition);
+		}
+		if (!model.tokenization.isCheapToTokenize(range.getStartPosition().lineNumber) || config.autoIndent === EditorAutoIndentStrategy.Keep) {
+			const lineText = model.getLineContent(range.startLineNumber);
+			const indentation = strings.getLeadingWhitespace(lineText).substring(0, range.startColumn - 1);
+			return typeCommand(range, '\n' + config.normalizeIndentation(indentation), keepPosition);
+		}
+		const r = getEnterAction(config.autoIndent, model, range, config.languageConfigurationService);
+		if (r) {
+			if (r.indentAction === IndentAction.None) {
+				// Nothing special
+				return typeCommand(range, '\n' + config.normalizeIndentation(r.indentation + r.appendText), keepPosition);
+
+			} else if (r.indentAction === IndentAction.Indent) {
+				// Indent once
+				return typeCommand(range, '\n' + config.normalizeIndentation(r.indentation + r.appendText), keepPosition);
+
+			} else if (r.indentAction === IndentAction.IndentOutdent) {
+				// Ultra special
+				const normalIndent = config.normalizeIndentation(r.indentation);
+				const increasedIndent = config.normalizeIndentation(r.indentation + r.appendText);
+				const typeText = '\n' + increasedIndent + '\n' + normalIndent;
+				if (keepPosition) {
+					return new ReplaceCommandWithoutChangingPosition(range, typeText, true);
+				} else {
+					return new ReplaceCommandWithOffsetCursorState(range, typeText, -1, increasedIndent.length - normalIndent.length, true);
+				}
+			} else if (r.indentAction === IndentAction.Outdent) {
+				const actualIndentation = unshiftIndent(config, r.indentation);
+				return typeCommand(range, '\n' + config.normalizeIndentation(actualIndentation + r.appendText), keepPosition);
+			}
+		}
+
+		const lineText = model.getLineContent(range.startLineNumber);
+		const indentation = strings.getLeadingWhitespace(lineText).substring(0, range.startColumn - 1);
+
+		if (config.autoIndent >= EditorAutoIndentStrategy.Full) {
+			const ir = getIndentForEnter(config.autoIndent, model, range, {
+				unshiftIndent: (indent) => {
+					return unshiftIndent(config, indent);
+				},
+				shiftIndent: (indent) => {
+					return shiftIndent(config, indent);
+				},
+				normalizeIndentation: (indent) => {
+					return config.normalizeIndentation(indent);
+				}
+			}, config.languageConfigurationService);
+
+			if (ir) {
+				let oldEndViewColumn = config.visibleColumnFromColumn(model, range.getEndPosition());
+				const oldEndColumn = range.endColumn;
+				const newLineContent = model.getLineContent(range.endLineNumber);
+				const firstNonWhitespace = strings.firstNonWhitespaceIndex(newLineContent);
+				if (firstNonWhitespace >= 0) {
+					range = range.setEndPosition(range.endLineNumber, Math.max(range.endColumn, firstNonWhitespace + 1));
+				} else {
+					range = range.setEndPosition(range.endLineNumber, model.getLineMaxColumn(range.endLineNumber));
+				}
+				if (keepPosition) {
+					return new ReplaceCommandWithoutChangingPosition(range, '\n' + config.normalizeIndentation(ir.afterEnter), true);
+				} else {
+					let offset = 0;
+					if (oldEndColumn <= firstNonWhitespace + 1) {
+						if (!config.insertSpaces) {
+							oldEndViewColumn = Math.ceil(oldEndViewColumn / config.indentSize);
+						}
+						offset = Math.min(oldEndViewColumn + 1 - config.normalizeIndentation(ir.afterEnter).length - 1, 0);
+					}
+					return new ReplaceCommandWithOffsetCursorState(range, '\n' + config.normalizeIndentation(ir.afterEnter), 0, offset, true);
+				}
+			}
+		}
+		return typeCommand(range, '\n' + config.normalizeIndentation(indentation), keepPosition);
+	}
+
+
+	public static lineInsertBefore(config: CursorConfiguration, model: ITextModel | null, selections: Selection[] | null): ICommand[] {
+		if (model === null || selections === null) {
+			return [];
+		}
+		const commands: ICommand[] = [];
+		for (let i = 0, len = selections.length; i < len; i++) {
+			let lineNumber = selections[i].positionLineNumber;
+			if (lineNumber === 1) {
+				commands[i] = new ReplaceCommandWithoutChangingPosition(new Range(1, 1, 1, 1), '\n');
+			} else {
+				lineNumber--;
+				const column = model.getLineMaxColumn(lineNumber);
+
+				commands[i] = this._enter(config, model, false, new Range(lineNumber, column, lineNumber, column));
+			}
+		}
+		return commands;
+	}
+
+	public static lineInsertAfter(config: CursorConfiguration, model: ITextModel | null, selections: Selection[] | null): ICommand[] {
+		if (model === null || selections === null) {
+			return [];
+		}
+		const commands: ICommand[] = [];
+		for (let i = 0, len = selections.length; i < len; i++) {
+			const lineNumber = selections[i].positionLineNumber;
+			const column = model.getLineMaxColumn(lineNumber);
+			commands[i] = this._enter(config, model, false, new Range(lineNumber, column, lineNumber, column));
+		}
+		return commands;
+	}
+
+	public static lineBreakInsert(config: CursorConfiguration, model: ITextModel, selections: Selection[]): ICommand[] {
+		const commands: ICommand[] = [];
+		for (let i = 0, len = selections.length; i < len; i++) {
+			commands[i] = this._enter(config, model, true, selections[i]);
+		}
+		return commands;
+	}
+}
+
+export class PasteOperation {
+
+	public static getEdits(config: CursorConfiguration, model: ICursorSimpleModel, selections: Selection[], text: string, pasteOnNewLine: boolean, multicursorText: string[]) {
+		const distributedPaste = this._distributePasteToCursors(config, selections, text, pasteOnNewLine, multicursorText);
+		if (distributedPaste) {
+			selections = selections.sort(Range.compareRangesUsingStarts);
+			return this._distributedPaste(config, model, selections, distributedPaste);
+		} else {
+			return this._simplePaste(config, model, selections, text, pasteOnNewLine);
+		}
+	}
+
+	private static _distributePasteToCursors(config: CursorConfiguration, selections: Selection[], text: string, pasteOnNewLine: boolean, multicursorText: string[]): string[] | null {
+		if (pasteOnNewLine) {
+			return null;
+		}
+		if (selections.length === 1) {
+			return null;
+		}
+		if (multicursorText && multicursorText.length === selections.length) {
+			return multicursorText;
+		}
+		if (config.multiCursorPaste === 'spread') {
+			// Try to spread the pasted text in case the line count matches the cursor count
+			// Remove trailing \n if present
+			if (text.charCodeAt(text.length - 1) === CharCode.LineFeed) {
+				text = text.substring(0, text.length - 1);
+			}
+			// Remove trailing \r if present
+			if (text.charCodeAt(text.length - 1) === CharCode.CarriageReturn) {
+				text = text.substring(0, text.length - 1);
+			}
+			const lines = strings.splitLines(text);
+			if (lines.length === selections.length) {
+				return lines;
+			}
+		}
+		return null;
+	}
+
+	private static _distributedPaste(config: CursorConfiguration, model: ICursorSimpleModel, selections: Selection[], text: string[]): EditOperationResult {
+		const commands: ICommand[] = [];
+		for (let i = 0, len = selections.length; i < len; i++) {
+			commands[i] = new ReplaceCommand(selections[i], text[i]);
+		}
+		return new EditOperationResult(EditOperationType.Other, commands, {
+			shouldPushStackElementBefore: true,
+			shouldPushStackElementAfter: true
+		});
+	}
+
+	private static _simplePaste(config: CursorConfiguration, model: ICursorSimpleModel, selections: Selection[], text: string, pasteOnNewLine: boolean): EditOperationResult {
+		const commands: ICommand[] = [];
+		for (let i = 0, len = selections.length; i < len; i++) {
+			const selection = selections[i];
+			const position = selection.getPosition();
+			if (pasteOnNewLine && !selection.isEmpty()) {
+				pasteOnNewLine = false;
+			}
+			if (pasteOnNewLine && text.indexOf('\n') !== text.length - 1) {
+				pasteOnNewLine = false;
+			}
+			if (pasteOnNewLine) {
+				// Paste entire line at the beginning of line
+				const typeSelection = new Range(position.lineNumber, 1, position.lineNumber, 1);
+				commands[i] = new ReplaceCommandThatPreservesSelection(typeSelection, text, selection, true);
+			} else {
+				commands[i] = new ReplaceCommand(selection, text);
+			}
+		}
+		return new EditOperationResult(EditOperationType.Other, commands, {
+			shouldPushStackElementBefore: true,
+			shouldPushStackElementAfter: true
+		});
+	}
+}
+
+export class CompositionOperation {
+
+	public static getEdits(prevEditOperationType: EditOperationType, config: CursorConfiguration, model: ITextModel, selections: Selection[], text: string, replacePrevCharCnt: number, replaceNextCharCnt: number, positionDelta: number) {
+		const commands = selections.map(selection => this._compositionType(model, selection, text, replacePrevCharCnt, replaceNextCharCnt, positionDelta));
+		return new EditOperationResult(EditOperationType.TypingOther, commands, {
+			shouldPushStackElementBefore: shouldPushStackElementBetween(prevEditOperationType, EditOperationType.TypingOther),
+			shouldPushStackElementAfter: false
+		});
+	}
+
+	private static _compositionType(model: ITextModel, selection: Selection, text: string, replacePrevCharCnt: number, replaceNextCharCnt: number, positionDelta: number): ICommand | null {
+		if (!selection.isEmpty()) {
+			// looks like https://github.com/microsoft/vscode/issues/2773
+			// where a cursor operation occurred before a canceled composition
+			// => ignore composition
+			return null;
+		}
+		const pos = selection.getPosition();
+		const startColumn = Math.max(1, pos.column - replacePrevCharCnt);
+		const endColumn = Math.min(model.getLineMaxColumn(pos.lineNumber), pos.column + replaceNextCharCnt);
+		const range = new Range(pos.lineNumber, startColumn, pos.lineNumber, endColumn);
+		const oldText = model.getValueInRange(range);
+		if (oldText === text && positionDelta === 0) {
+			// => ignore composition that doesn't do anything
+			return null;
+		}
+		return new ReplaceCommandWithOffsetCursorState(range, text, 0, positionDelta);
+	}
+}
+
+export class TypeWithoutInterceptorsOperation {
+
+	public static getEdits(prevEditOperationType: EditOperationType, selections: Selection[], str: string): EditOperationResult {
+		const commands: ICommand[] = [];
+		for (let i = 0, len = selections.length; i < len; i++) {
+			commands[i] = new ReplaceCommand(selections[i], str);
+		}
+		const opType = getTypingOperation(str, prevEditOperationType);
+		return new EditOperationResult(opType, commands, {
+			shouldPushStackElementBefore: shouldPushStackElementBetween(prevEditOperationType, opType),
+			shouldPushStackElementAfter: false
+		});
+	}
+}
+
+export class TabOperation {
+
+	public static getCommands(config: CursorConfiguration, model: ITextModel, selections: Selection[]) {
+		const commands: ICommand[] = [];
+		for (let i = 0, len = selections.length; i < len; i++) {
+			const selection = selections[i];
+			if (selection.isEmpty()) {
+				const lineText = model.getLineContent(selection.startLineNumber);
+				if (/^\s*$/.test(lineText) && model.tokenization.isCheapToTokenize(selection.startLineNumber)) {
+					let goodIndent = this._goodIndentForLine(config, model, selection.startLineNumber);
+					goodIndent = goodIndent || '\t';
+					const possibleTypeText = config.normalizeIndentation(goodIndent);
+					if (!lineText.startsWith(possibleTypeText)) {
+						commands[i] = new ReplaceCommand(new Range(selection.startLineNumber, 1, selection.startLineNumber, lineText.length + 1), possibleTypeText, true);
+						continue;
+					}
+				}
+				commands[i] = this._replaceJumpToNextIndent(config, model, selection, true);
+			} else {
+				if (selection.startLineNumber === selection.endLineNumber) {
+					const lineMaxColumn = model.getLineMaxColumn(selection.startLineNumber);
+					if (selection.startColumn !== 1 || selection.endColumn !== lineMaxColumn) {
+						// This is a single line selection that is not the entire line
+						commands[i] = this._replaceJumpToNextIndent(config, model, selection, false);
+						continue;
+					}
+				}
+				commands[i] = new ShiftCommand(selection, {
+					isUnshift: false,
+					tabSize: config.tabSize,
+					indentSize: config.indentSize,
+					insertSpaces: config.insertSpaces,
+					useTabStops: config.useTabStops,
+					autoIndent: config.autoIndent
+				}, config.languageConfigurationService);
+			}
+		}
+		return commands;
+	}
+
+	private static _goodIndentForLine(config: CursorConfiguration, model: ITextModel, lineNumber: number): string | null {
+		let action: IndentAction | EnterAction | null = null;
+		let indentation: string = '';
+		const expectedIndentAction = getInheritIndentForLine(config.autoIndent, model, lineNumber, false, config.languageConfigurationService);
+		if (expectedIndentAction) {
+			action = expectedIndentAction.action;
+			indentation = expectedIndentAction.indentation;
+		} else if (lineNumber > 1) {
+			let lastLineNumber: number;
+			for (lastLineNumber = lineNumber - 1; lastLineNumber >= 1; lastLineNumber--) {
+				const lineText = model.getLineContent(lastLineNumber);
+				const nonWhitespaceIdx = strings.lastNonWhitespaceIndex(lineText);
+				if (nonWhitespaceIdx >= 0) {
+					break;
+				}
+			}
+			if (lastLineNumber < 1) {
+				// No previous line with content found
+				return null;
+			}
+			const maxColumn = model.getLineMaxColumn(lastLineNumber);
+			const expectedEnterAction = getEnterAction(config.autoIndent, model, new Range(lastLineNumber, maxColumn, lastLineNumber, maxColumn), config.languageConfigurationService);
+			if (expectedEnterAction) {
+				indentation = expectedEnterAction.indentation + expectedEnterAction.appendText;
+			}
+		}
+		if (action) {
+			if (action === IndentAction.Indent) {
+				indentation = shiftIndent(config, indentation);
+			}
+			if (action === IndentAction.Outdent) {
+				indentation = unshiftIndent(config, indentation);
+			}
+			indentation = config.normalizeIndentation(indentation);
+		}
+		if (!indentation) {
+			return null;
+		}
+		return indentation;
+	}
+
+	private static _replaceJumpToNextIndent(config: CursorConfiguration, model: ICursorSimpleModel, selection: Selection, insertsAutoWhitespace: boolean): ReplaceCommand {
+		let typeText = '';
+		const position = selection.getStartPosition();
+		if (config.insertSpaces) {
+			const visibleColumnFromColumn = config.visibleColumnFromColumn(model, position);
+			const indentSize = config.indentSize;
+			const spacesCnt = indentSize - (visibleColumnFromColumn % indentSize);
+			for (let i = 0; i < spacesCnt; i++) {
+				typeText += ' ';
+			}
+		} else {
+			typeText = '\t';
+		}
+		return new ReplaceCommand(selection, typeText, insertsAutoWhitespace);
+	}
+}
+
+export class BaseTypeWithAutoClosingCommand extends ReplaceCommandWithOffsetCursorState {
+
+	private readonly _openCharacter: string;
+	private readonly _closeCharacter: string;
+	public closeCharacterRange: Range | null;
+	public enclosingRange: Range | null;
+
+	constructor(selection: Selection, text: string, lineNumberDeltaOffset: number, columnDeltaOffset: number, openCharacter: string, closeCharacter: string) {
+		super(selection, text, lineNumberDeltaOffset, columnDeltaOffset);
+		this._openCharacter = openCharacter;
+		this._closeCharacter = closeCharacter;
+		this.closeCharacterRange = null;
+		this.enclosingRange = null;
+	}
+
+	protected _computeCursorStateWithRange(model: ITextModel, range: Range, helper: ICursorStateComputerData): Selection {
+		this.closeCharacterRange = new Range(range.startLineNumber, range.endColumn - this._closeCharacter.length, range.endLineNumber, range.endColumn);
+		this.enclosingRange = new Range(range.startLineNumber, range.endColumn - this._openCharacter.length - this._closeCharacter.length, range.endLineNumber, range.endColumn);
+		return super.computeCursorState(model, helper);
+	}
+}
+
+class TypeWithAutoClosingCommand extends BaseTypeWithAutoClosingCommand {
+
+	constructor(selection: Selection, openCharacter: string, insertOpenCharacter: boolean, closeCharacter: string) {
+		const text = (insertOpenCharacter ? openCharacter : '') + closeCharacter;
+		const lineNumberDeltaOffset = 0;
+		const columnDeltaOffset = -closeCharacter.length;
+		super(selection, text, lineNumberDeltaOffset, columnDeltaOffset, openCharacter, closeCharacter);
+	}
+
+	public override computeCursorState(model: ITextModel, helper: ICursorStateComputerData): Selection {
+		const inverseEditOperations = helper.getInverseEditOperations();
+		const range = inverseEditOperations[0].range;
+		return this._computeCursorStateWithRange(model, range, helper);
+	}
+}
+
+class TypeWithIndentationAndAutoClosingCommand extends BaseTypeWithAutoClosingCommand {
+
+	private readonly _autoIndentationEdit: { range: Range; text: string };
+	private readonly _autoClosingEdit: { range: Range; text: string };
+
+	constructor(autoIndentationEdit: { range: Range; text: string }, selection: Selection, openCharacter: string, closeCharacter: string) {
+		const text = openCharacter + closeCharacter;
+		const lineNumberDeltaOffset = 0;
+		const columnDeltaOffset = openCharacter.length;
+		super(selection, text, lineNumberDeltaOffset, columnDeltaOffset, openCharacter, closeCharacter);
+		this._autoIndentationEdit = autoIndentationEdit;
+		this._autoClosingEdit = { range: selection, text };
+	}
+
+	public override getEditOperations(model: ITextModel, builder: IEditOperationBuilder): void {
+		builder.addTrackedEditOperation(this._autoIndentationEdit.range, this._autoIndentationEdit.text);
+		builder.addTrackedEditOperation(this._autoClosingEdit.range, this._autoClosingEdit.text);
+	}
+
+	public override computeCursorState(model: ITextModel, helper: ICursorStateComputerData): Selection {
+		const inverseEditOperations = helper.getInverseEditOperations();
+		if (inverseEditOperations.length !== 2) {
+			throw new Error('There should be two inverse edit operations!');
+		}
+		const range1 = inverseEditOperations[0].range;
+		const range2 = inverseEditOperations[1].range;
+		const range = range1.plusRange(range2);
+		return this._computeCursorStateWithRange(model, range, helper);
+	}
+}
+
+function getTypingOperation(typedText: string, previousTypingOperation: EditOperationType): EditOperationType {
+	if (typedText === ' ') {
+		return previousTypingOperation === EditOperationType.TypingFirstSpace
+			|| previousTypingOperation === EditOperationType.TypingConsecutiveSpace
+			? EditOperationType.TypingConsecutiveSpace
+			: EditOperationType.TypingFirstSpace;
+	}
+
+	return EditOperationType.TypingOther;
+}
+
+function shouldPushStackElementBetween(previousTypingOperation: EditOperationType, typingOperation: EditOperationType): boolean {
+	if (isTypingOperation(previousTypingOperation) && !isTypingOperation(typingOperation)) {
+		// Always set an undo stop before non-type operations
+		return true;
+	}
+	if (previousTypingOperation === EditOperationType.TypingFirstSpace) {
+		// `abc |d`: No undo stop
+		// `abc  |d`: Undo stop
+		return false;
+	}
+	// Insert undo stop between different operation types
+	return normalizeOperationType(previousTypingOperation) !== normalizeOperationType(typingOperation);
+}
+
+function normalizeOperationType(type: EditOperationType): EditOperationType | 'space' {
+	return (type === EditOperationType.TypingConsecutiveSpace || type === EditOperationType.TypingFirstSpace)
+		? 'space'
+		: type;
+}
+
+function isTypingOperation(type: EditOperationType): boolean {
+	return type === EditOperationType.TypingOther
+		|| type === EditOperationType.TypingFirstSpace
+		|| type === EditOperationType.TypingConsecutiveSpace;
+}
+
+function isAutoClosingOvertype(config: CursorConfiguration, model: ITextModel, selections: Selection[], autoClosedCharacters: Range[], ch: string): boolean {
+	if (config.autoClosingOvertype === 'never') {
+		return false;
+	}
+	if (!config.autoClosingPairs.autoClosingPairsCloseSingleChar.has(ch)) {
+		return false;
+	}
+	for (let i = 0, len = selections.length; i < len; i++) {
+		const selection = selections[i];
+		if (!selection.isEmpty()) {
+			return false;
+		}
+		const position = selection.getPosition();
+		const lineText = model.getLineContent(position.lineNumber);
+		const afterCharacter = lineText.charAt(position.column - 1);
+		if (afterCharacter !== ch) {
+			return false;
+		}
+		// Do not over-type quotes after a backslash
+		const chIsQuote = isQuote(ch);
+		const beforeCharacter = position.column > 2 ? lineText.charCodeAt(position.column - 2) : CharCode.Null;
+		if (beforeCharacter === CharCode.Backslash && chIsQuote) {
+			return false;
+		}
+		// Must over-type a closing character typed by the editor
+		if (config.autoClosingOvertype === 'auto') {
+			let found = false;
+			for (let j = 0, lenJ = autoClosedCharacters.length; j < lenJ; j++) {
+				const autoClosedCharacter = autoClosedCharacters[j];
+				if (position.lineNumber === autoClosedCharacter.startLineNumber && position.column === autoClosedCharacter.startColumn) {
+					found = true;
+					break;
+				}
+			}
+			if (!found) {
+				return false;
+			}
+		}
+	}
+	return true;
+}
+
+function typeCommand(range: Range, text: string, keepPosition: boolean): ICommand {
+	if (keepPosition) {
+		return new ReplaceCommandWithoutChangingPosition(range, text, true);
+	} else {
+		return new ReplaceCommand(range, text, true);
+	}
+}
+
+export function shiftIndent(config: CursorConfiguration, indentation: string, count?: number): string {
+	count = count || 1;
+	return ShiftCommand.shiftIndent(indentation, indentation.length + count, config.tabSize, config.indentSize, config.insertSpaces);
+}
+
+export function unshiftIndent(config: CursorConfiguration, indentation: string, count?: number): string {
+	count = count || 1;
+	return ShiftCommand.unshiftIndent(indentation, indentation.length + count, config.tabSize, config.indentSize, config.insertSpaces);
+}
+
+export function shouldSurroundChar(config: CursorConfiguration, ch: string): boolean {
+	if (isQuote(ch)) {
+		return (config.autoSurround === 'quotes' || config.autoSurround === 'languageDefined');
+	} else {
+		// Character is a bracket
+		return (config.autoSurround === 'brackets' || config.autoSurround === 'languageDefined');
+	}
+}
diff --git a/src/vs/editor/common/cursor/cursorTypeOperations.ts b/src/vs/editor/common/cursor/cursorTypeOperations.ts
index ffa80cbb63c..c518f3f97c4 100644
--- a/src/vs/editor/common/cursor/cursorTypeOperations.ts
+++ b/src/vs/editor/common/cursor/cursorTypeOperations.ts
@@ -3,26 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import * as strings from 'vs/base/common/strings';
-import { ReplaceCommand, ReplaceCommandWithOffsetCursorState, ReplaceCommandWithoutChangingPosition, ReplaceCommandThatPreservesSelection } from 'vs/editor/common/commands/replaceCommand';
-import { ShiftCommand } from 'vs/editor/common/commands/shiftCommand';
-import { CompositionSurroundSelectionCommand, SurroundSelectionCommand } from 'vs/editor/common/commands/surroundSelectionCommand';
-import { CursorConfiguration, EditOperationResult, EditOperationType, ICursorSimpleModel, isQuote } from 'vs/editor/common/cursorCommon';
-import { WordCharacterClass, getMapForWordSeparators } from 'vs/editor/common/core/wordCharacterClassifier';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { Position } from 'vs/editor/common/core/position';
-import { ICommand, ICursorStateComputerData } from 'vs/editor/common/editorCommon';
-import { ITextModel } from 'vs/editor/common/model';
-import { EnterAction, IndentAction, StandardAutoClosingPairConditional } from 'vs/editor/common/languages/languageConfiguration';
-import { getIndentationAtPosition } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { IElectricAction } from 'vs/editor/common/languages/supports/electricCharacter';
-import { EditorAutoClosingStrategy, EditorAutoIndentStrategy } from 'vs/editor/common/config/editorOptions';
-import { createScopedLineTokens } from 'vs/editor/common/languages/supports';
-import { getIndentActionForType, getIndentForEnter, getInheritIndentForLine } from 'vs/editor/common/languages/autoIndent';
-import { getEnterAction } from 'vs/editor/common/languages/enterAction';
+import { ShiftCommand } from '../commands/shiftCommand.js';
+import { CompositionSurroundSelectionCommand } from '../commands/surroundSelectionCommand.js';
+import { CursorConfiguration, EditOperationResult, EditOperationType, ICursorSimpleModel, isQuote } from '../cursorCommon.js';
+import { Range } from '../core/range.js';
+import { Selection } from '../core/selection.js';
+import { Position } from '../core/position.js';
+import { ICommand } from '../editorCommon.js';
+import { ITextModel } from '../model.js';
+import { AutoClosingOpenCharTypeOperation, AutoClosingOvertypeOperation, AutoClosingOvertypeWithInterceptorsOperation, AutoIndentOperation, CompositionOperation, EnterOperation, InterceptorElectricCharOperation, PasteOperation, shiftIndent, shouldSurroundChar, SimpleCharacterTypeOperation, SurroundSelectionOperation, TabOperation, TypeWithoutInterceptorsOperation, unshiftIndent } from './cursorTypeEditOperations.js';
 
 export class TypeOperations {
 
@@ -61,777 +50,23 @@ export class TypeOperations {
 	}
 
 	public static shiftIndent(config: CursorConfiguration, indentation: string, count?: number): string {
-		count = count || 1;
-		return ShiftCommand.shiftIndent(indentation, indentation.length + count, config.tabSize, config.indentSize, config.insertSpaces);
+		return shiftIndent(config, indentation, count);
 	}
 
 	public static unshiftIndent(config: CursorConfiguration, indentation: string, count?: number): string {
-		count = count || 1;
-		return ShiftCommand.unshiftIndent(indentation, indentation.length + count, config.tabSize, config.indentSize, config.insertSpaces);
-	}
-
-	private static _distributedPaste(config: CursorConfiguration, model: ICursorSimpleModel, selections: Selection[], text: string[]): EditOperationResult {
-		const commands: ICommand[] = [];
-		for (let i = 0, len = selections.length; i < len; i++) {
-			commands[i] = new ReplaceCommand(selections[i], text[i]);
-		}
-		return new EditOperationResult(EditOperationType.Other, commands, {
-			shouldPushStackElementBefore: true,
-			shouldPushStackElementAfter: true
-		});
-	}
-
-	private static _simplePaste(config: CursorConfiguration, model: ICursorSimpleModel, selections: Selection[], text: string, pasteOnNewLine: boolean): EditOperationResult {
-		const commands: ICommand[] = [];
-		for (let i = 0, len = selections.length; i < len; i++) {
-			const selection = selections[i];
-			const position = selection.getPosition();
-
-			if (pasteOnNewLine && !selection.isEmpty()) {
-				pasteOnNewLine = false;
-			}
-			if (pasteOnNewLine && text.indexOf('\n') !== text.length - 1) {
-				pasteOnNewLine = false;
-			}
-
-			if (pasteOnNewLine) {
-				// Paste entire line at the beginning of line
-				const typeSelection = new Range(position.lineNumber, 1, position.lineNumber, 1);
-				commands[i] = new ReplaceCommandThatPreservesSelection(typeSelection, text, selection, true);
-			} else {
-				commands[i] = new ReplaceCommand(selection, text);
-			}
-		}
-		return new EditOperationResult(EditOperationType.Other, commands, {
-			shouldPushStackElementBefore: true,
-			shouldPushStackElementAfter: true
-		});
-	}
-
-	private static _distributePasteToCursors(config: CursorConfiguration, selections: Selection[], text: string, pasteOnNewLine: boolean, multicursorText: string[]): string[] | null {
-		if (pasteOnNewLine) {
-			return null;
-		}
-
-		if (selections.length === 1) {
-			return null;
-		}
-
-		if (multicursorText && multicursorText.length === selections.length) {
-			return multicursorText;
-		}
-
-		if (config.multiCursorPaste === 'spread') {
-			// Try to spread the pasted text in case the line count matches the cursor count
-			// Remove trailing \n if present
-			if (text.charCodeAt(text.length - 1) === CharCode.LineFeed) {
-				text = text.substr(0, text.length - 1);
-			}
-			// Remove trailing \r if present
-			if (text.charCodeAt(text.length - 1) === CharCode.CarriageReturn) {
-				text = text.substr(0, text.length - 1);
-			}
-			const lines = strings.splitLines(text);
-			if (lines.length === selections.length) {
-				return lines;
-			}
-		}
-
-		return null;
+		return unshiftIndent(config, indentation, count);
 	}
 
 	public static paste(config: CursorConfiguration, model: ICursorSimpleModel, selections: Selection[], text: string, pasteOnNewLine: boolean, multicursorText: string[]): EditOperationResult {
-		const distributedPaste = this._distributePasteToCursors(config, selections, text, pasteOnNewLine, multicursorText);
-
-		if (distributedPaste) {
-			selections = selections.sort(Range.compareRangesUsingStarts);
-			return this._distributedPaste(config, model, selections, distributedPaste);
-		} else {
-			return this._simplePaste(config, model, selections, text, pasteOnNewLine);
-		}
-	}
-
-	private static _goodIndentForLine(config: CursorConfiguration, model: ITextModel, lineNumber: number): string | null {
-		let action: IndentAction | EnterAction | null = null;
-		let indentation: string = '';
-
-		const expectedIndentAction = getInheritIndentForLine(config.autoIndent, model, lineNumber, false, config.languageConfigurationService);
-		if (expectedIndentAction) {
-			action = expectedIndentAction.action;
-			indentation = expectedIndentAction.indentation;
-		} else if (lineNumber > 1) {
-			let lastLineNumber: number;
-			for (lastLineNumber = lineNumber - 1; lastLineNumber >= 1; lastLineNumber--) {
-				const lineText = model.getLineContent(lastLineNumber);
-				const nonWhitespaceIdx = strings.lastNonWhitespaceIndex(lineText);
-				if (nonWhitespaceIdx >= 0) {
-					break;
-				}
-			}
-
-			if (lastLineNumber < 1) {
-				// No previous line with content found
-				return null;
-			}
-
-			const maxColumn = model.getLineMaxColumn(lastLineNumber);
-			const expectedEnterAction = getEnterAction(config.autoIndent, model, new Range(lastLineNumber, maxColumn, lastLineNumber, maxColumn), config.languageConfigurationService);
-			if (expectedEnterAction) {
-				indentation = expectedEnterAction.indentation + expectedEnterAction.appendText;
-			}
-		}
-
-		if (action) {
-			if (action === IndentAction.Indent) {
-				indentation = TypeOperations.shiftIndent(config, indentation);
-			}
-
-			if (action === IndentAction.Outdent) {
-				indentation = TypeOperations.unshiftIndent(config, indentation);
-			}
-
-			indentation = config.normalizeIndentation(indentation);
-		}
-
-		if (!indentation) {
-			return null;
-		}
-
-		return indentation;
-	}
-
-	private static _replaceJumpToNextIndent(config: CursorConfiguration, model: ICursorSimpleModel, selection: Selection, insertsAutoWhitespace: boolean): ReplaceCommand {
-		let typeText = '';
-
-		const position = selection.getStartPosition();
-		if (config.insertSpaces) {
-			const visibleColumnFromColumn = config.visibleColumnFromColumn(model, position);
-			const indentSize = config.indentSize;
-			const spacesCnt = indentSize - (visibleColumnFromColumn % indentSize);
-			for (let i = 0; i < spacesCnt; i++) {
-				typeText += ' ';
-			}
-		} else {
-			typeText = '\t';
-		}
-
-		return new ReplaceCommand(selection, typeText, insertsAutoWhitespace);
+		return PasteOperation.getEdits(config, model, selections, text, pasteOnNewLine, multicursorText);
 	}
 
 	public static tab(config: CursorConfiguration, model: ITextModel, selections: Selection[]): ICommand[] {
-		const commands: ICommand[] = [];
-		for (let i = 0, len = selections.length; i < len; i++) {
-			const selection = selections[i];
-
-			if (selection.isEmpty()) {
-
-				const lineText = model.getLineContent(selection.startLineNumber);
-
-				if (/^\s*$/.test(lineText) && model.tokenization.isCheapToTokenize(selection.startLineNumber)) {
-					let goodIndent = this._goodIndentForLine(config, model, selection.startLineNumber);
-					goodIndent = goodIndent || '\t';
-					const possibleTypeText = config.normalizeIndentation(goodIndent);
-					if (!lineText.startsWith(possibleTypeText)) {
-						commands[i] = new ReplaceCommand(new Range(selection.startLineNumber, 1, selection.startLineNumber, lineText.length + 1), possibleTypeText, true);
-						continue;
-					}
-				}
-
-				commands[i] = this._replaceJumpToNextIndent(config, model, selection, true);
-			} else {
-				if (selection.startLineNumber === selection.endLineNumber) {
-					const lineMaxColumn = model.getLineMaxColumn(selection.startLineNumber);
-					if (selection.startColumn !== 1 || selection.endColumn !== lineMaxColumn) {
-						// This is a single line selection that is not the entire line
-						commands[i] = this._replaceJumpToNextIndent(config, model, selection, false);
-						continue;
-					}
-				}
-
-				commands[i] = new ShiftCommand(selection, {
-					isUnshift: false,
-					tabSize: config.tabSize,
-					indentSize: config.indentSize,
-					insertSpaces: config.insertSpaces,
-					useTabStops: config.useTabStops,
-					autoIndent: config.autoIndent
-				}, config.languageConfigurationService);
-			}
-		}
-		return commands;
+		return TabOperation.getCommands(config, model, selections);
 	}
 
 	public static compositionType(prevEditOperationType: EditOperationType, config: CursorConfiguration, model: ITextModel, selections: Selection[], text: string, replacePrevCharCnt: number, replaceNextCharCnt: number, positionDelta: number): EditOperationResult {
-		const commands = selections.map(selection => this._compositionType(model, selection, text, replacePrevCharCnt, replaceNextCharCnt, positionDelta));
-		return new EditOperationResult(EditOperationType.TypingOther, commands, {
-			shouldPushStackElementBefore: shouldPushStackElementBetween(prevEditOperationType, EditOperationType.TypingOther),
-			shouldPushStackElementAfter: false
-		});
-	}
-
-	private static _compositionType(model: ITextModel, selection: Selection, text: string, replacePrevCharCnt: number, replaceNextCharCnt: number, positionDelta: number): ICommand | null {
-		if (!selection.isEmpty()) {
-			// looks like https://github.com/microsoft/vscode/issues/2773
-			// where a cursor operation occurred before a canceled composition
-			// => ignore composition
-			return null;
-		}
-		const pos = selection.getPosition();
-		const startColumn = Math.max(1, pos.column - replacePrevCharCnt);
-		const endColumn = Math.min(model.getLineMaxColumn(pos.lineNumber), pos.column + replaceNextCharCnt);
-		const range = new Range(pos.lineNumber, startColumn, pos.lineNumber, endColumn);
-		const oldText = model.getValueInRange(range);
-		if (oldText === text && positionDelta === 0) {
-			// => ignore composition that doesn't do anything
-			return null;
-		}
-		return new ReplaceCommandWithOffsetCursorState(range, text, 0, positionDelta);
-	}
-
-	private static _typeCommand(range: Range, text: string, keepPosition: boolean): ICommand {
-		if (keepPosition) {
-			return new ReplaceCommandWithoutChangingPosition(range, text, true);
-		} else {
-			return new ReplaceCommand(range, text, true);
-		}
-	}
-
-	private static _enter(config: CursorConfiguration, model: ITextModel, keepPosition: boolean, range: Range): ICommand {
-		if (config.autoIndent === EditorAutoIndentStrategy.None) {
-			return TypeOperations._typeCommand(range, '\n', keepPosition);
-		}
-		if (!model.tokenization.isCheapToTokenize(range.getStartPosition().lineNumber) || config.autoIndent === EditorAutoIndentStrategy.Keep) {
-			const lineText = model.getLineContent(range.startLineNumber);
-			const indentation = strings.getLeadingWhitespace(lineText).substring(0, range.startColumn - 1);
-			return TypeOperations._typeCommand(range, '\n' + config.normalizeIndentation(indentation), keepPosition);
-		}
-
-		const r = getEnterAction(config.autoIndent, model, range, config.languageConfigurationService);
-		if (r) {
-			if (r.indentAction === IndentAction.None) {
-				// Nothing special
-				return TypeOperations._typeCommand(range, '\n' + config.normalizeIndentation(r.indentation + r.appendText), keepPosition);
-
-			} else if (r.indentAction === IndentAction.Indent) {
-				// Indent once
-				return TypeOperations._typeCommand(range, '\n' + config.normalizeIndentation(r.indentation + r.appendText), keepPosition);
-
-			} else if (r.indentAction === IndentAction.IndentOutdent) {
-				// Ultra special
-				const normalIndent = config.normalizeIndentation(r.indentation);
-				const increasedIndent = config.normalizeIndentation(r.indentation + r.appendText);
-
-				const typeText = '\n' + increasedIndent + '\n' + normalIndent;
-
-				if (keepPosition) {
-					return new ReplaceCommandWithoutChangingPosition(range, typeText, true);
-				} else {
-					return new ReplaceCommandWithOffsetCursorState(range, typeText, -1, increasedIndent.length - normalIndent.length, true);
-				}
-			} else if (r.indentAction === IndentAction.Outdent) {
-				const actualIndentation = TypeOperations.unshiftIndent(config, r.indentation);
-				return TypeOperations._typeCommand(range, '\n' + config.normalizeIndentation(actualIndentation + r.appendText), keepPosition);
-			}
-		}
-
-		const lineText = model.getLineContent(range.startLineNumber);
-		const indentation = strings.getLeadingWhitespace(lineText).substring(0, range.startColumn - 1);
-
-		if (config.autoIndent >= EditorAutoIndentStrategy.Full) {
-			const ir = getIndentForEnter(config.autoIndent, model, range, {
-				unshiftIndent: (indent) => {
-					return TypeOperations.unshiftIndent(config, indent);
-				},
-				shiftIndent: (indent) => {
-					return TypeOperations.shiftIndent(config, indent);
-				},
-				normalizeIndentation: (indent) => {
-					return config.normalizeIndentation(indent);
-				}
-			}, config.languageConfigurationService);
-
-			if (ir) {
-				let oldEndViewColumn = config.visibleColumnFromColumn(model, range.getEndPosition());
-				const oldEndColumn = range.endColumn;
-				const newLineContent = model.getLineContent(range.endLineNumber);
-				const firstNonWhitespace = strings.firstNonWhitespaceIndex(newLineContent);
-				if (firstNonWhitespace >= 0) {
-					range = range.setEndPosition(range.endLineNumber, Math.max(range.endColumn, firstNonWhitespace + 1));
-				} else {
-					range = range.setEndPosition(range.endLineNumber, model.getLineMaxColumn(range.endLineNumber));
-				}
-
-				if (keepPosition) {
-					return new ReplaceCommandWithoutChangingPosition(range, '\n' + config.normalizeIndentation(ir.afterEnter), true);
-				} else {
-					let offset = 0;
-					if (oldEndColumn <= firstNonWhitespace + 1) {
-						if (!config.insertSpaces) {
-							oldEndViewColumn = Math.ceil(oldEndViewColumn / config.indentSize);
-						}
-						offset = Math.min(oldEndViewColumn + 1 - config.normalizeIndentation(ir.afterEnter).length - 1, 0);
-					}
-					return new ReplaceCommandWithOffsetCursorState(range, '\n' + config.normalizeIndentation(ir.afterEnter), 0, offset, true);
-				}
-			}
-		}
-
-		return TypeOperations._typeCommand(range, '\n' + config.normalizeIndentation(indentation), keepPosition);
-	}
-
-	private static _isAutoIndentType(config: CursorConfiguration, model: ITextModel, selections: Selection[]): boolean {
-		if (config.autoIndent < EditorAutoIndentStrategy.Full) {
-			return false;
-		}
-
-		for (let i = 0, len = selections.length; i < len; i++) {
-			if (!model.tokenization.isCheapToTokenize(selections[i].getEndPosition().lineNumber)) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	private static _runAutoIndentType(config: CursorConfiguration, model: ITextModel, range: Range, ch: string): ICommand | null {
-		const currentIndentation = getIndentationAtPosition(model, range.startLineNumber, range.startColumn);
-		const actualIndentation = getIndentActionForType(config.autoIndent, model, range, ch, {
-			shiftIndent: (indentation) => {
-				return TypeOperations.shiftIndent(config, indentation);
-			},
-			unshiftIndent: (indentation) => {
-				return TypeOperations.unshiftIndent(config, indentation);
-			},
-		}, config.languageConfigurationService);
-
-		if (actualIndentation === null) {
-			return null;
-		}
-
-		if (actualIndentation !== config.normalizeIndentation(currentIndentation)) {
-			const firstNonWhitespace = model.getLineFirstNonWhitespaceColumn(range.startLineNumber);
-			if (firstNonWhitespace === 0) {
-				return TypeOperations._typeCommand(
-					new Range(range.startLineNumber, 1, range.endLineNumber, range.endColumn),
-					config.normalizeIndentation(actualIndentation) + ch,
-					false
-				);
-			} else {
-				return TypeOperations._typeCommand(
-					new Range(range.startLineNumber, 1, range.endLineNumber, range.endColumn),
-					config.normalizeIndentation(actualIndentation) +
-					model.getLineContent(range.startLineNumber).substring(firstNonWhitespace - 1, range.startColumn - 1) + ch,
-					false
-				);
-			}
-		}
-
-		return null;
-	}
-
-	private static _isAutoClosingOvertype(config: CursorConfiguration, model: ITextModel, selections: Selection[], autoClosedCharacters: Range[], ch: string): boolean {
-		if (config.autoClosingOvertype === 'never') {
-			return false;
-		}
-
-		if (!config.autoClosingPairs.autoClosingPairsCloseSingleChar.has(ch)) {
-			return false;
-		}
-
-		for (let i = 0, len = selections.length; i < len; i++) {
-			const selection = selections[i];
-
-			if (!selection.isEmpty()) {
-				return false;
-			}
-
-			const position = selection.getPosition();
-			const lineText = model.getLineContent(position.lineNumber);
-			const afterCharacter = lineText.charAt(position.column - 1);
-
-			if (afterCharacter !== ch) {
-				return false;
-			}
-
-			// Do not over-type quotes after a backslash
-			const chIsQuote = isQuote(ch);
-			const beforeCharacter = position.column > 2 ? lineText.charCodeAt(position.column - 2) : CharCode.Null;
-			if (beforeCharacter === CharCode.Backslash && chIsQuote) {
-				return false;
-			}
-
-			// Must over-type a closing character typed by the editor
-			if (config.autoClosingOvertype === 'auto') {
-				let found = false;
-				for (let j = 0, lenJ = autoClosedCharacters.length; j < lenJ; j++) {
-					const autoClosedCharacter = autoClosedCharacters[j];
-					if (position.lineNumber === autoClosedCharacter.startLineNumber && position.column === autoClosedCharacter.startColumn) {
-						found = true;
-						break;
-					}
-				}
-				if (!found) {
-					return false;
-				}
-			}
-		}
-
-		return true;
-	}
-
-	private static _runAutoClosingOvertype(prevEditOperationType: EditOperationType, config: CursorConfiguration, model: ITextModel, selections: Selection[], ch: string): EditOperationResult {
-		const commands: ICommand[] = [];
-		for (let i = 0, len = selections.length; i < len; i++) {
-			const selection = selections[i];
-			const position = selection.getPosition();
-			const typeSelection = new Range(position.lineNumber, position.column, position.lineNumber, position.column + 1);
-			commands[i] = new ReplaceCommand(typeSelection, ch);
-		}
-		return new EditOperationResult(EditOperationType.TypingOther, commands, {
-			shouldPushStackElementBefore: shouldPushStackElementBetween(prevEditOperationType, EditOperationType.TypingOther),
-			shouldPushStackElementAfter: false
-		});
-	}
-
-	private static _isBeforeClosingBrace(config: CursorConfiguration, lineAfter: string) {
-		// If the start of lineAfter can be interpretted as both a starting or ending brace, default to returning false
-		const nextChar = lineAfter.charAt(0);
-		const potentialStartingBraces = config.autoClosingPairs.autoClosingPairsOpenByStart.get(nextChar) || [];
-		const potentialClosingBraces = config.autoClosingPairs.autoClosingPairsCloseByStart.get(nextChar) || [];
-
-		const isBeforeStartingBrace = potentialStartingBraces.some(x => lineAfter.startsWith(x.open));
-		const isBeforeClosingBrace = potentialClosingBraces.some(x => lineAfter.startsWith(x.close));
-
-		return !isBeforeStartingBrace && isBeforeClosingBrace;
-	}
-
-	/**
-	 * Determine if typing `ch` at all `positions` in the `model` results in an
-	 * auto closing open sequence being typed.
-	 *
-	 * Auto closing open sequences can consist of multiple characters, which
-	 * can lead to ambiguities. In such a case, the longest auto-closing open
-	 * sequence is returned.
-	 */
-	private static _findAutoClosingPairOpen(config: CursorConfiguration, model: ITextModel, positions: Position[], ch: string): StandardAutoClosingPairConditional | null {
-		const candidates = config.autoClosingPairs.autoClosingPairsOpenByEnd.get(ch);
-		if (!candidates) {
-			return null;
-		}
-
-		// Determine which auto-closing pair it is
-		let result: StandardAutoClosingPairConditional | null = null;
-		for (const candidate of candidates) {
-			if (result === null || candidate.open.length > result.open.length) {
-				let candidateIsMatch = true;
-				for (const position of positions) {
-					const relevantText = model.getValueInRange(new Range(position.lineNumber, position.column - candidate.open.length + 1, position.lineNumber, position.column));
-					if (relevantText + ch !== candidate.open) {
-						candidateIsMatch = false;
-						break;
-					}
-				}
-
-				if (candidateIsMatch) {
-					result = candidate;
-				}
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * Find another auto-closing pair that is contained by the one passed in.
-	 *
-	 * e.g. when having [(,)] and [(*,*)] as auto-closing pairs
-	 * this method will find [(,)] as a containment pair for [(*,*)]
-	 */
-	private static _findContainedAutoClosingPair(config: CursorConfiguration, pair: StandardAutoClosingPairConditional): StandardAutoClosingPairConditional | null {
-		if (pair.open.length <= 1) {
-			return null;
-		}
-		const lastChar = pair.close.charAt(pair.close.length - 1);
-		// get candidates with the same last character as close
-		const candidates = config.autoClosingPairs.autoClosingPairsCloseByEnd.get(lastChar) || [];
-		let result: StandardAutoClosingPairConditional | null = null;
-		for (const candidate of candidates) {
-			if (candidate.open !== pair.open && pair.open.includes(candidate.open) && pair.close.endsWith(candidate.close)) {
-				if (!result || candidate.open.length > result.open.length) {
-					result = candidate;
-				}
-			}
-		}
-		return result;
-	}
-
-	private static _getAutoClosingPairClose(config: CursorConfiguration, model: ITextModel, selections: Selection[], ch: string, chIsAlreadyTyped: boolean): string | null {
-
-		for (const selection of selections) {
-			if (!selection.isEmpty()) {
-				return null;
-			}
-		}
-
-		// This method is called both when typing (regularly) and when composition ends
-		// This means that we need to work with a text buffer where sometimes `ch` is not
-		// there (it is being typed right now) or with a text buffer where `ch` has already been typed
-		//
-		// In order to avoid adding checks for `chIsAlreadyTyped` in all places, we will work
-		// with two conceptual positions, the position before `ch` and the position after `ch`
-		//
-		const positions: { lineNumber: number; beforeColumn: number; afterColumn: number }[] = selections.map((s) => {
-			const position = s.getPosition();
-			if (chIsAlreadyTyped) {
-				return { lineNumber: position.lineNumber, beforeColumn: position.column - ch.length, afterColumn: position.column };
-			} else {
-				return { lineNumber: position.lineNumber, beforeColumn: position.column, afterColumn: position.column };
-			}
-		});
-
-
-		// Find the longest auto-closing open pair in case of multiple ending in `ch`
-		// e.g. when having [f","] and [","], it picks [f","] if the character before is f
-		const pair = this._findAutoClosingPairOpen(config, model, positions.map(p => new Position(p.lineNumber, p.beforeColumn)), ch);
-		if (!pair) {
-			return null;
-		}
-
-		let autoCloseConfig: EditorAutoClosingStrategy;
-		let shouldAutoCloseBefore: (ch: string) => boolean;
-
-		const chIsQuote = isQuote(ch);
-		if (chIsQuote) {
-			autoCloseConfig = config.autoClosingQuotes;
-			shouldAutoCloseBefore = config.shouldAutoCloseBefore.quote;
-		} else {
-			const pairIsForComments = config.blockCommentStartToken ? pair.open.includes(config.blockCommentStartToken) : false;
-			if (pairIsForComments) {
-				autoCloseConfig = config.autoClosingComments;
-				shouldAutoCloseBefore = config.shouldAutoCloseBefore.comment;
-			} else {
-				autoCloseConfig = config.autoClosingBrackets;
-				shouldAutoCloseBefore = config.shouldAutoCloseBefore.bracket;
-			}
-		}
-
-		if (autoCloseConfig === 'never') {
-			return null;
-		}
-
-		// Sometimes, it is possible to have two auto-closing pairs that have a containment relationship
-		// e.g. when having [(,)] and [(*,*)]
-		// - when typing (, the resulting state is (|)
-		// - when typing *, the desired resulting state is (*|*), not (*|*))
-		const containedPair = this._findContainedAutoClosingPair(config, pair);
-		const containedPairClose = containedPair ? containedPair.close : '';
-		let isContainedPairPresent = true;
-
-		for (const position of positions) {
-			const { lineNumber, beforeColumn, afterColumn } = position;
-			const lineText = model.getLineContent(lineNumber);
-			const lineBefore = lineText.substring(0, beforeColumn - 1);
-			const lineAfter = lineText.substring(afterColumn - 1);
-
-			if (!lineAfter.startsWith(containedPairClose)) {
-				isContainedPairPresent = false;
-			}
-
-			// Only consider auto closing the pair if an allowed character follows or if another autoclosed pair closing brace follows
-			if (lineAfter.length > 0) {
-				const characterAfter = lineAfter.charAt(0);
-				const isBeforeCloseBrace = TypeOperations._isBeforeClosingBrace(config, lineAfter);
-
-				if (!isBeforeCloseBrace && !shouldAutoCloseBefore(characterAfter)) {
-					return null;
-				}
-			}
-
-			// Do not auto-close ' or " after a word character
-			if (pair.open.length === 1 && (ch === '\'' || ch === '"') && autoCloseConfig !== 'always') {
-				const wordSeparators = getMapForWordSeparators(config.wordSeparators, []);
-				if (lineBefore.length > 0) {
-					const characterBefore = lineBefore.charCodeAt(lineBefore.length - 1);
-					if (wordSeparators.get(characterBefore) === WordCharacterClass.Regular) {
-						return null;
-					}
-				}
-			}
-
-			if (!model.tokenization.isCheapToTokenize(lineNumber)) {
-				// Do not force tokenization
-				return null;
-			}
-
-			model.tokenization.forceTokenization(lineNumber);
-			const lineTokens = model.tokenization.getLineTokens(lineNumber);
-			const scopedLineTokens = createScopedLineTokens(lineTokens, beforeColumn - 1);
-			if (!pair.shouldAutoClose(scopedLineTokens, beforeColumn - scopedLineTokens.firstCharOffset)) {
-				return null;
-			}
-
-			// Typing for example a quote could either start a new string, in which case auto-closing is desirable
-			// or it could end a previously started string, in which case auto-closing is not desirable
-			//
-			// In certain cases, it is really not possible to look at the previous token to determine
-			// what would happen. That's why we do something really unusual, we pretend to type a different
-			// character and ask the tokenizer what the outcome of doing that is: after typing a neutral
-			// character, are we in a string (i.e. the quote would most likely end a string) or not?
-			//
-			const neutralCharacter = pair.findNeutralCharacter();
-			if (neutralCharacter) {
-				const tokenType = model.tokenization.getTokenTypeIfInsertingCharacter(lineNumber, beforeColumn, neutralCharacter);
-				if (!pair.isOK(tokenType)) {
-					return null;
-				}
-			}
-		}
-
-		if (isContainedPairPresent) {
-			return pair.close.substring(0, pair.close.length - containedPairClose.length);
-		} else {
-			return pair.close;
-		}
-	}
-
-	private static _runAutoClosingOpenCharType(prevEditOperationType: EditOperationType, config: CursorConfiguration, model: ITextModel, selections: Selection[], ch: string, chIsAlreadyTyped: boolean, autoClosingPairClose: string): EditOperationResult {
-		const commands: ICommand[] = [];
-		for (let i = 0, len = selections.length; i < len; i++) {
-			const selection = selections[i];
-			commands[i] = new TypeWithAutoClosingCommand(selection, ch, !chIsAlreadyTyped, autoClosingPairClose);
-		}
-		return new EditOperationResult(EditOperationType.TypingOther, commands, {
-			shouldPushStackElementBefore: true,
-			shouldPushStackElementAfter: false
-		});
-	}
-
-	private static _shouldSurroundChar(config: CursorConfiguration, ch: string): boolean {
-		if (isQuote(ch)) {
-			return (config.autoSurround === 'quotes' || config.autoSurround === 'languageDefined');
-		} else {
-			// Character is a bracket
-			return (config.autoSurround === 'brackets' || config.autoSurround === 'languageDefined');
-		}
-	}
-
-	private static _isSurroundSelectionType(config: CursorConfiguration, model: ITextModel, selections: Selection[], ch: string): boolean {
-		if (!TypeOperations._shouldSurroundChar(config, ch) || !config.surroundingPairs.hasOwnProperty(ch)) {
-			return false;
-		}
-
-		const isTypingAQuoteCharacter = isQuote(ch);
-
-		for (const selection of selections) {
-
-			if (selection.isEmpty()) {
-				return false;
-			}
-
-			let selectionContainsOnlyWhitespace = true;
-
-			for (let lineNumber = selection.startLineNumber; lineNumber <= selection.endLineNumber; lineNumber++) {
-				const lineText = model.getLineContent(lineNumber);
-				const startIndex = (lineNumber === selection.startLineNumber ? selection.startColumn - 1 : 0);
-				const endIndex = (lineNumber === selection.endLineNumber ? selection.endColumn - 1 : lineText.length);
-				const selectedText = lineText.substring(startIndex, endIndex);
-				if (/[^ \t]/.test(selectedText)) {
-					// this selected text contains something other than whitespace
-					selectionContainsOnlyWhitespace = false;
-					break;
-				}
-			}
-
-			if (selectionContainsOnlyWhitespace) {
-				return false;
-			}
-
-			if (isTypingAQuoteCharacter && selection.startLineNumber === selection.endLineNumber && selection.startColumn + 1 === selection.endColumn) {
-				const selectionText = model.getValueInRange(selection);
-				if (isQuote(selectionText)) {
-					// Typing a quote character on top of another quote character
-					// => disable surround selection type
-					return false;
-				}
-			}
-		}
-
-		return true;
-	}
-
-	private static _runSurroundSelectionType(prevEditOperationType: EditOperationType, config: CursorConfiguration, model: ITextModel, selections: Selection[], ch: string): EditOperationResult {
-		const commands: ICommand[] = [];
-		for (let i = 0, len = selections.length; i < len; i++) {
-			const selection = selections[i];
-			const closeCharacter = config.surroundingPairs[ch];
-			commands[i] = new SurroundSelectionCommand(selection, ch, closeCharacter);
-		}
-		return new EditOperationResult(EditOperationType.Other, commands, {
-			shouldPushStackElementBefore: true,
-			shouldPushStackElementAfter: true
-		});
-	}
-
-	private static _isTypeInterceptorElectricChar(config: CursorConfiguration, model: ITextModel, selections: Selection[]) {
-		if (selections.length === 1 && model.tokenization.isCheapToTokenize(selections[0].getEndPosition().lineNumber)) {
-			return true;
-		}
-		return false;
-	}
-
-	private static _typeInterceptorElectricChar(prevEditOperationType: EditOperationType, config: CursorConfiguration, model: ITextModel, selection: Selection, ch: string): EditOperationResult | null {
-		if (!config.electricChars.hasOwnProperty(ch) || !selection.isEmpty()) {
-			return null;
-		}
-
-		const position = selection.getPosition();
-		model.tokenization.forceTokenization(position.lineNumber);
-		const lineTokens = model.tokenization.getLineTokens(position.lineNumber);
-
-		let electricAction: IElectricAction | null;
-		try {
-			electricAction = config.onElectricCharacter(ch, lineTokens, position.column);
-		} catch (e) {
-			onUnexpectedError(e);
-			return null;
-		}
-
-		if (!electricAction) {
-			return null;
-		}
-
-		if (electricAction.matchOpenBracket) {
-			const endColumn = (lineTokens.getLineContent() + ch).lastIndexOf(electricAction.matchOpenBracket) + 1;
-			const match = model.bracketPairs.findMatchingBracketUp(electricAction.matchOpenBracket, {
-				lineNumber: position.lineNumber,
-				column: endColumn
-			}, 500 /* give at most 500ms to compute */);
-
-			if (match) {
-				if (match.startLineNumber === position.lineNumber) {
-					// matched something on the same line => no change in indentation
-					return null;
-				}
-				const matchLine = model.getLineContent(match.startLineNumber);
-				const matchLineIndentation = strings.getLeadingWhitespace(matchLine);
-				const newIndentation = config.normalizeIndentation(matchLineIndentation);
-
-				const lineText = model.getLineContent(position.lineNumber);
-				const lineFirstNonBlankColumn = model.getLineFirstNonWhitespaceColumn(position.lineNumber) || position.column;
-
-				const prefix = lineText.substring(lineFirstNonBlankColumn - 1, position.column - 1);
-				const typeText = newIndentation + prefix + ch;
-
-				const typeSelection = new Range(position.lineNumber, 1, position.lineNumber, position.column);
-
-				const command = new ReplaceCommand(typeSelection, typeText);
-				return new EditOperationResult(getTypingOperation(typeText, prevEditOperationType), [command], {
-					shouldPushStackElementBefore: false,
-					shouldPushStackElementAfter: true
-				});
-			}
-		}
-
-		return null;
+		return CompositionOperation.getEdits(prevEditOperationType, config, model, selections, text, replacePrevCharCnt, replaceNextCharCnt, positionDelta);
 	}
 
 	/**
@@ -871,7 +106,7 @@ export class TypeOperations {
 		if (hasDeletion) {
 			// Check if this could have been a surround selection
 
-			if (!TypeOperations._shouldSurroundChar(config, ch) || !config.surroundingPairs.hasOwnProperty(ch)) {
+			if (!shouldSurroundChar(config, ch) || !config.surroundingPairs.hasOwnProperty(ch)) {
 				return null;
 			}
 
@@ -914,18 +149,14 @@ export class TypeOperations {
 			});
 		}
 
-		if (this._isAutoClosingOvertype(config, model, selections, autoClosedCharacters, ch)) {
-			// Unfortunately, the close character is at this point "doubled", so we need to delete it...
-			const commands = selections.map(s => new ReplaceCommand(new Range(s.positionLineNumber, s.positionColumn, s.positionLineNumber, s.positionColumn + 1), '', false));
-			return new EditOperationResult(EditOperationType.TypingOther, commands, {
-				shouldPushStackElementBefore: true,
-				shouldPushStackElementAfter: false
-			});
+		const autoClosingOvertypeEdits = AutoClosingOvertypeWithInterceptorsOperation.getEdits(config, model, selections, autoClosedCharacters, ch);
+		if (autoClosingOvertypeEdits !== undefined) {
+			return autoClosingOvertypeEdits;
 		}
 
-		const autoClosingPairClose = this._getAutoClosingPairClose(config, model, selections, ch, true);
-		if (autoClosingPairClose !== null) {
-			return this._runAutoClosingOpenCharType(prevEditOperationType, config, model, selections, ch, true, autoClosingPairClose);
+		const autoClosingOpenCharEdits = AutoClosingOpenCharTypeOperation.getEdits(config, model, selections, ch, true, false);
+		if (autoClosingOpenCharEdits !== undefined) {
+			return autoClosingOpenCharEdits;
 		}
 
 		return null;
@@ -933,149 +164,41 @@ export class TypeOperations {
 
 	public static typeWithInterceptors(isDoingComposition: boolean, prevEditOperationType: EditOperationType, config: CursorConfiguration, model: ITextModel, selections: Selection[], autoClosedCharacters: Range[], ch: string): EditOperationResult {
 
-		if (!isDoingComposition && ch === '\n') {
-			const commands: ICommand[] = [];
-			for (let i = 0, len = selections.length; i < len; i++) {
-				commands[i] = TypeOperations._enter(config, model, false, selections[i]);
-			}
-			return new EditOperationResult(EditOperationType.TypingOther, commands, {
-				shouldPushStackElementBefore: true,
-				shouldPushStackElementAfter: false,
-			});
+		const enterEdits = EnterOperation.getEdits(config, model, selections, ch, isDoingComposition);
+		if (enterEdits !== undefined) {
+			return enterEdits;
 		}
 
-		if (!isDoingComposition && this._isAutoIndentType(config, model, selections)) {
-			const commands: Array<ICommand | null> = [];
-			let autoIndentFails = false;
-			for (let i = 0, len = selections.length; i < len; i++) {
-				commands[i] = this._runAutoIndentType(config, model, selections[i], ch);
-				if (!commands[i]) {
-					autoIndentFails = true;
-					break;
-				}
-			}
-			if (!autoIndentFails) {
-				return new EditOperationResult(EditOperationType.TypingOther, commands, {
-					shouldPushStackElementBefore: true,
-					shouldPushStackElementAfter: false,
-				});
-			}
+		const autoIndentEdits = AutoIndentOperation.getEdits(config, model, selections, ch, isDoingComposition);
+		if (autoIndentEdits !== undefined) {
+			return autoIndentEdits;
 		}
 
-		if (this._isAutoClosingOvertype(config, model, selections, autoClosedCharacters, ch)) {
-			return this._runAutoClosingOvertype(prevEditOperationType, config, model, selections, ch);
+		const autoClosingOverTypeEdits = AutoClosingOvertypeOperation.getEdits(prevEditOperationType, config, model, selections, autoClosedCharacters, ch);
+		if (autoClosingOverTypeEdits !== undefined) {
+			return autoClosingOverTypeEdits;
 		}
 
-		if (!isDoingComposition) {
-			const autoClosingPairClose = this._getAutoClosingPairClose(config, model, selections, ch, false);
-			if (autoClosingPairClose) {
-				return this._runAutoClosingOpenCharType(prevEditOperationType, config, model, selections, ch, false, autoClosingPairClose);
-			}
+		const autoClosingOpenCharEdits = AutoClosingOpenCharTypeOperation.getEdits(config, model, selections, ch, false, isDoingComposition);
+		if (autoClosingOpenCharEdits !== undefined) {
+			return autoClosingOpenCharEdits;
 		}
 
-		if (!isDoingComposition && this._isSurroundSelectionType(config, model, selections, ch)) {
-			return this._runSurroundSelectionType(prevEditOperationType, config, model, selections, ch);
+		const surroundSelectionEdits = SurroundSelectionOperation.getEdits(config, model, selections, ch, isDoingComposition);
+		if (surroundSelectionEdits !== undefined) {
+			return surroundSelectionEdits;
 		}
 
-		// Electric characters make sense only when dealing with a single cursor,
-		// as multiple cursors typing brackets for example would interfer with bracket matching
-		if (!isDoingComposition && this._isTypeInterceptorElectricChar(config, model, selections)) {
-			const r = this._typeInterceptorElectricChar(prevEditOperationType, config, model, selections[0], ch);
-			if (r) {
-				return r;
-			}
+		const interceptorElectricCharOperation = InterceptorElectricCharOperation.getEdits(prevEditOperationType, config, model, selections, ch, isDoingComposition);
+		if (interceptorElectricCharOperation !== undefined) {
+			return interceptorElectricCharOperation;
 		}
 
-		// A simple character type
-		const commands: ICommand[] = [];
-		for (let i = 0, len = selections.length; i < len; i++) {
-			commands[i] = new ReplaceCommand(selections[i], ch);
-		}
-
-		const opType = getTypingOperation(ch, prevEditOperationType);
-		return new EditOperationResult(opType, commands, {
-			shouldPushStackElementBefore: shouldPushStackElementBetween(prevEditOperationType, opType),
-			shouldPushStackElementAfter: false
-		});
+		return SimpleCharacterTypeOperation.getEdits(prevEditOperationType, selections, ch);
 	}
 
 	public static typeWithoutInterceptors(prevEditOperationType: EditOperationType, config: CursorConfiguration, model: ITextModel, selections: Selection[], str: string): EditOperationResult {
-		const commands: ICommand[] = [];
-		for (let i = 0, len = selections.length; i < len; i++) {
-			commands[i] = new ReplaceCommand(selections[i], str);
-		}
-		const opType = getTypingOperation(str, prevEditOperationType);
-		return new EditOperationResult(opType, commands, {
-			shouldPushStackElementBefore: shouldPushStackElementBetween(prevEditOperationType, opType),
-			shouldPushStackElementAfter: false
-		});
-	}
-
-	public static lineInsertBefore(config: CursorConfiguration, model: ITextModel | null, selections: Selection[] | null): ICommand[] {
-		if (model === null || selections === null) {
-			return [];
-		}
-
-		const commands: ICommand[] = [];
-		for (let i = 0, len = selections.length; i < len; i++) {
-			let lineNumber = selections[i].positionLineNumber;
-
-			if (lineNumber === 1) {
-				commands[i] = new ReplaceCommandWithoutChangingPosition(new Range(1, 1, 1, 1), '\n');
-			} else {
-				lineNumber--;
-				const column = model.getLineMaxColumn(lineNumber);
-
-				commands[i] = this._enter(config, model, false, new Range(lineNumber, column, lineNumber, column));
-			}
-		}
-		return commands;
-	}
-
-	public static lineInsertAfter(config: CursorConfiguration, model: ITextModel | null, selections: Selection[] | null): ICommand[] {
-		if (model === null || selections === null) {
-			return [];
-		}
-
-		const commands: ICommand[] = [];
-		for (let i = 0, len = selections.length; i < len; i++) {
-			const lineNumber = selections[i].positionLineNumber;
-			const column = model.getLineMaxColumn(lineNumber);
-			commands[i] = this._enter(config, model, false, new Range(lineNumber, column, lineNumber, column));
-		}
-		return commands;
-	}
-
-	public static lineBreakInsert(config: CursorConfiguration, model: ITextModel, selections: Selection[]): ICommand[] {
-		const commands: ICommand[] = [];
-		for (let i = 0, len = selections.length; i < len; i++) {
-			commands[i] = this._enter(config, model, true, selections[i]);
-		}
-		return commands;
-	}
-}
-
-export class TypeWithAutoClosingCommand extends ReplaceCommandWithOffsetCursorState {
-
-	private readonly _openCharacter: string;
-	private readonly _closeCharacter: string;
-	public closeCharacterRange: Range | null;
-	public enclosingRange: Range | null;
-
-	constructor(selection: Selection, openCharacter: string, insertOpenCharacter: boolean, closeCharacter: string) {
-		super(selection, (insertOpenCharacter ? openCharacter : '') + closeCharacter, 0, -closeCharacter.length);
-		this._openCharacter = openCharacter;
-		this._closeCharacter = closeCharacter;
-		this.closeCharacterRange = null;
-		this.enclosingRange = null;
-	}
-
-	public override computeCursorState(model: ITextModel, helper: ICursorStateComputerData): Selection {
-		const inverseEditOperations = helper.getInverseEditOperations();
-		const range = inverseEditOperations[0].range;
-		this.closeCharacterRange = new Range(range.startLineNumber, range.endColumn - this._closeCharacter.length, range.endLineNumber, range.endColumn);
-		this.enclosingRange = new Range(range.startLineNumber, range.endColumn - this._openCharacter.length - this._closeCharacter.length, range.endLineNumber, range.endColumn);
-		return super.computeCursorState(model, helper);
+		return TypeWithoutInterceptorsOperation.getEdits(prevEditOperationType, selections, str);
 	}
 }
 
@@ -1089,40 +212,3 @@ export class CompositionOutcome {
 		public readonly insertedSelectionEnd: number,
 	) { }
 }
-
-function getTypingOperation(typedText: string, previousTypingOperation: EditOperationType): EditOperationType {
-	if (typedText === ' ') {
-		return previousTypingOperation === EditOperationType.TypingFirstSpace
-			|| previousTypingOperation === EditOperationType.TypingConsecutiveSpace
-			? EditOperationType.TypingConsecutiveSpace
-			: EditOperationType.TypingFirstSpace;
-	}
-
-	return EditOperationType.TypingOther;
-}
-
-function shouldPushStackElementBetween(previousTypingOperation: EditOperationType, typingOperation: EditOperationType): boolean {
-	if (isTypingOperation(previousTypingOperation) && !isTypingOperation(typingOperation)) {
-		// Always set an undo stop before non-type operations
-		return true;
-	}
-	if (previousTypingOperation === EditOperationType.TypingFirstSpace) {
-		// `abc |d`: No undo stop
-		// `abc  |d`: Undo stop
-		return false;
-	}
-	// Insert undo stop between different operation types
-	return normalizeOperationType(previousTypingOperation) !== normalizeOperationType(typingOperation);
-}
-
-function normalizeOperationType(type: EditOperationType): EditOperationType | 'space' {
-	return (type === EditOperationType.TypingConsecutiveSpace || type === EditOperationType.TypingFirstSpace)
-		? 'space'
-		: type;
-}
-
-function isTypingOperation(type: EditOperationType): boolean {
-	return type === EditOperationType.TypingOther
-		|| type === EditOperationType.TypingFirstSpace
-		|| type === EditOperationType.TypingConsecutiveSpace;
-}
diff --git a/src/vs/editor/common/cursor/cursorWordOperations.ts b/src/vs/editor/common/cursor/cursorWordOperations.ts
index b16172cc89a..3e1d066587d 100644
--- a/src/vs/editor/common/cursor/cursorWordOperations.ts
+++ b/src/vs/editor/common/cursor/cursorWordOperations.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
-import * as strings from 'vs/base/common/strings';
-import { EditorAutoClosingEditStrategy, EditorAutoClosingStrategy } from 'vs/editor/common/config/editorOptions';
-import { CursorConfiguration, ICursorSimpleModel, SelectionStartKind, SingleCursorState } from 'vs/editor/common/cursorCommon';
-import { DeleteOperations } from 'vs/editor/common/cursor/cursorDeleteOperations';
-import { WordCharacterClass, WordCharacterClassifier, IntlWordSegmentData, getMapForWordSeparators } from 'vs/editor/common/core/wordCharacterClassifier';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ITextModel } from 'vs/editor/common/model';
-import { IWordAtPosition } from 'vs/editor/common/core/wordHelper';
-import { AutoClosingPairs } from 'vs/editor/common/languages/languageConfiguration';
+import { CharCode } from '../../../base/common/charCode.js';
+import * as strings from '../../../base/common/strings.js';
+import { EditorAutoClosingEditStrategy, EditorAutoClosingStrategy } from '../config/editorOptions.js';
+import { CursorConfiguration, ICursorSimpleModel, SelectionStartKind, SingleCursorState } from '../cursorCommon.js';
+import { DeleteOperations } from './cursorDeleteOperations.js';
+import { WordCharacterClass, WordCharacterClassifier, IntlWordSegmentData, getMapForWordSeparators } from '../core/wordCharacterClassifier.js';
+import { Position } from '../core/position.js';
+import { Range } from '../core/range.js';
+import { Selection } from '../core/selection.js';
+import { ITextModel } from '../model.js';
+import { IWordAtPosition } from '../core/wordHelper.js';
+import { AutoClosingPairs } from '../languages/languageConfiguration.js';
 
 interface IFindWordResult {
 	/**
@@ -208,7 +208,7 @@ export class WordOperations {
 		return 0;
 	}
 
-	public static moveWordLeft(wordSeparators: WordCharacterClassifier, model: ICursorSimpleModel, position: Position, wordNavigationType: WordNavigationType): Position {
+	public static moveWordLeft(wordSeparators: WordCharacterClassifier, model: ICursorSimpleModel, position: Position, wordNavigationType: WordNavigationType, hasMulticursor: boolean): Position {
 		let lineNumber = position.lineNumber;
 		let column = position.column;
 
@@ -227,7 +227,8 @@ export class WordOperations {
 
 		if (wordNavigationType === WordNavigationType.WordStartFast) {
 			if (
-				prevWordOnLine
+				!hasMulticursor // avoid having multiple cursors stop at different locations when doing word start
+				&& prevWordOnLine
 				&& prevWordOnLine.wordType === WordType.Separator
 				&& prevWordOnLine.end - prevWordOnLine.start === 1
 				&& prevWordOnLine.nextCharClass === WordCharacterClass.Regular
@@ -830,10 +831,10 @@ export class WordPartOperations extends WordOperations {
 		return candidates[0];
 	}
 
-	public static moveWordPartLeft(wordSeparators: WordCharacterClassifier, model: ICursorSimpleModel, position: Position): Position {
+	public static moveWordPartLeft(wordSeparators: WordCharacterClassifier, model: ICursorSimpleModel, position: Position, hasMulticursor: boolean): Position {
 		const candidates = enforceDefined([
-			WordOperations.moveWordLeft(wordSeparators, model, position, WordNavigationType.WordStart),
-			WordOperations.moveWordLeft(wordSeparators, model, position, WordNavigationType.WordEnd),
+			WordOperations.moveWordLeft(wordSeparators, model, position, WordNavigationType.WordStart, hasMulticursor),
+			WordOperations.moveWordLeft(wordSeparators, model, position, WordNavigationType.WordEnd, hasMulticursor),
 			WordOperations._moveWordPartLeft(model, position)
 		]);
 		candidates.sort(Position.compare);
diff --git a/src/vs/editor/common/cursor/oneCursor.ts b/src/vs/editor/common/cursor/oneCursor.ts
index a0dc0eafc43..17bdb4e69e0 100644
--- a/src/vs/editor/common/cursor/oneCursor.ts
+++ b/src/vs/editor/common/cursor/oneCursor.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CursorState, ICursorSimpleModel, SelectionStartKind, SingleCursorState } from 'vs/editor/common/cursorCommon';
-import { CursorContext } from 'vs/editor/common/cursor/cursorContext';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { PositionAffinity, TrackedRangeStickiness } from 'vs/editor/common/model';
+import { CursorState, ICursorSimpleModel, SelectionStartKind, SingleCursorState } from '../cursorCommon.js';
+import { CursorContext } from './cursorContext.js';
+import { Position } from '../core/position.js';
+import { Range } from '../core/range.js';
+import { Selection } from '../core/selection.js';
+import { PositionAffinity, TrackedRangeStickiness } from '../model.js';
 
 /**
  * Represents a single cursor.
diff --git a/src/vs/editor/common/cursorCommon.ts b/src/vs/editor/common/cursorCommon.ts
index c5411aa8539..52f8673a327 100644
--- a/src/vs/editor/common/cursorCommon.ts
+++ b/src/vs/editor/common/cursorCommon.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ConfigurationChangedEvent, EditorAutoClosingEditStrategy, EditorAutoClosingStrategy, EditorAutoIndentStrategy, EditorAutoSurroundStrategy, EditorOption } from 'vs/editor/common/config/editorOptions';
-import { LineTokens } from 'vs/editor/common/tokens/lineTokens';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { ISelection, Selection } from 'vs/editor/common/core/selection';
-import { ICommand } from 'vs/editor/common/editorCommon';
-import { IEditorConfiguration } from 'vs/editor/common/config/editorConfiguration';
-import { PositionAffinity, TextModelResolvedOptions } from 'vs/editor/common/model';
-import { AutoClosingPairs } from 'vs/editor/common/languages/languageConfiguration';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { createScopedLineTokens } from 'vs/editor/common/languages/supports';
-import { IElectricAction } from 'vs/editor/common/languages/supports/electricCharacter';
-import { CursorColumns } from 'vs/editor/common/core/cursorColumns';
-import { normalizeIndentation } from 'vs/editor/common/core/indentation';
+import { ConfigurationChangedEvent, EditorAutoClosingEditStrategy, EditorAutoClosingStrategy, EditorAutoIndentStrategy, EditorAutoSurroundStrategy, EditorOption } from './config/editorOptions.js';
+import { LineTokens } from './tokens/lineTokens.js';
+import { Position } from './core/position.js';
+import { Range } from './core/range.js';
+import { ISelection, Selection } from './core/selection.js';
+import { ICommand } from './editorCommon.js';
+import { IEditorConfiguration } from './config/editorConfiguration.js';
+import { PositionAffinity, TextModelResolvedOptions } from './model.js';
+import { AutoClosingPairs } from './languages/languageConfiguration.js';
+import { ILanguageConfigurationService } from './languages/languageConfigurationRegistry.js';
+import { createScopedLineTokens } from './languages/supports.js';
+import { IElectricAction } from './languages/supports/electricCharacter.js';
+import { CursorColumns } from './core/cursorColumns.js';
+import { normalizeIndentation } from './core/indentation.js';
 
 export interface IColumnSelectData {
 	isReal: boolean;
diff --git a/src/vs/editor/common/cursorEvents.ts b/src/vs/editor/common/cursorEvents.ts
index eb3418b993f..e3b58c3126f 100644
--- a/src/vs/editor/common/cursorEvents.ts
+++ b/src/vs/editor/common/cursorEvents.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Position } from 'vs/editor/common/core/position';
-import { Selection } from 'vs/editor/common/core/selection';
+import { Position } from './core/position.js';
+import { Selection } from './core/selection.js';
 
 /**
  * Describes the reason the cursor has changed its position.
diff --git a/src/vs/editor/common/diff/defaultLinesDiffComputer/algorithms/diffAlgorithm.ts b/src/vs/editor/common/diff/defaultLinesDiffComputer/algorithms/diffAlgorithm.ts
index 50fbf66deba..0d0eae6d7e1 100644
--- a/src/vs/editor/common/diff/defaultLinesDiffComputer/algorithms/diffAlgorithm.ts
+++ b/src/vs/editor/common/diff/defaultLinesDiffComputer/algorithms/diffAlgorithm.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { forEachAdjacent } from 'vs/base/common/arrays';
-import { BugIndicatingError } from 'vs/base/common/errors';
-import { OffsetRange } from 'vs/editor/common/core/offsetRange';
+import { forEachAdjacent } from '../../../../../base/common/arrays.js';
+import { BugIndicatingError } from '../../../../../base/common/errors.js';
+import { OffsetRange } from '../../../core/offsetRange.js';
 
 /**
  * Represents a synchronous diff algorithm. Should be executed in a worker.
@@ -52,6 +52,18 @@ export class SequenceDiff {
 		);
 	}
 
+	public static assertSorted(sequenceDiffs: SequenceDiff[]): void {
+		let last: SequenceDiff | undefined = undefined;
+		for (const cur of sequenceDiffs) {
+			if (last) {
+				if (!(last.seq1Range.endExclusive <= cur.seq1Range.start && last.seq2Range.endExclusive <= cur.seq2Range.start)) {
+					throw new BugIndicatingError('Sequence diffs must be sorted');
+				}
+			}
+			last = cur;
+		}
+	}
+
 	constructor(
 		public readonly seq1Range: OffsetRange,
 		public readonly seq2Range: OffsetRange,
@@ -184,8 +196,6 @@ export class DateTimeout implements ITimeout {
 		const valid = Date.now() - this.startTime < this.timeout;
 		if (!valid && this.valid) {
 			this.valid = false; // timeout reached
-			// eslint-disable-next-line no-debugger
-			debugger; // WARNING: Most likely debugging caused the timeout. Call `this.disable()` to continue without timing out.
 		}
 		return this.valid;
 	}
diff --git a/src/vs/editor/common/diff/defaultLinesDiffComputer/algorithms/dynamicProgrammingDiffing.ts b/src/vs/editor/common/diff/defaultLinesDiffComputer/algorithms/dynamicProgrammingDiffing.ts
index f27644435b0..565560c5cf4 100644
--- a/src/vs/editor/common/diff/defaultLinesDiffComputer/algorithms/dynamicProgrammingDiffing.ts
+++ b/src/vs/editor/common/diff/defaultLinesDiffComputer/algorithms/dynamicProgrammingDiffing.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { OffsetRange } from 'vs/editor/common/core/offsetRange';
-import { IDiffAlgorithm, SequenceDiff, ISequence, ITimeout, InfiniteTimeout, DiffAlgorithmResult } from 'vs/editor/common/diff/defaultLinesDiffComputer/algorithms/diffAlgorithm';
-import { Array2D } from 'vs/editor/common/diff/defaultLinesDiffComputer/utils';
+import { OffsetRange } from '../../../core/offsetRange.js';
+import { IDiffAlgorithm, SequenceDiff, ISequence, ITimeout, InfiniteTimeout, DiffAlgorithmResult } from './diffAlgorithm.js';
+import { Array2D } from '../utils.js';
 
 /**
  * A O(MN) diffing algorithm that supports a score function.
diff --git a/src/vs/editor/common/diff/defaultLinesDiffComputer/algorithms/myersDiffAlgorithm.ts b/src/vs/editor/common/diff/defaultLinesDiffComputer/algorithms/myersDiffAlgorithm.ts
index c0843188927..b496d002de8 100644
--- a/src/vs/editor/common/diff/defaultLinesDiffComputer/algorithms/myersDiffAlgorithm.ts
+++ b/src/vs/editor/common/diff/defaultLinesDiffComputer/algorithms/myersDiffAlgorithm.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { OffsetRange } from 'vs/editor/common/core/offsetRange';
-import { DiffAlgorithmResult, IDiffAlgorithm, ISequence, ITimeout, InfiniteTimeout, SequenceDiff } from 'vs/editor/common/diff/defaultLinesDiffComputer/algorithms/diffAlgorithm';
+import { OffsetRange } from '../../../core/offsetRange.js';
+import { DiffAlgorithmResult, IDiffAlgorithm, ISequence, ITimeout, InfiniteTimeout, SequenceDiff } from './diffAlgorithm.js';
 
 /**
  * An O(ND) diff algorithm that has a quadratic space worst-case complexity.
diff --git a/src/vs/editor/common/diff/defaultLinesDiffComputer/computeMovedLines.ts b/src/vs/editor/common/diff/defaultLinesDiffComputer/computeMovedLines.ts
index 8f7183211d7..523486d84f1 100644
--- a/src/vs/editor/common/diff/defaultLinesDiffComputer/computeMovedLines.ts
+++ b/src/vs/editor/common/diff/defaultLinesDiffComputer/computeMovedLines.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ITimeout, SequenceDiff } from 'vs/editor/common/diff/defaultLinesDiffComputer/algorithms/diffAlgorithm';
-import { DetailedLineRangeMapping, LineRangeMapping } from '../rangeMapping';
-import { pushMany, compareBy, numberComparator, reverseOrder } from 'vs/base/common/arrays';
-import { MonotonousArray, findLastMonotonous } from 'vs/base/common/arraysFind';
-import { SetMap } from 'vs/base/common/map';
-import { LineRange, LineRangeSet } from 'vs/editor/common/core/lineRange';
-import { OffsetRange } from 'vs/editor/common/core/offsetRange';
-import { LinesSliceCharSequence } from 'vs/editor/common/diff/defaultLinesDiffComputer/linesSliceCharSequence';
-import { LineRangeFragment, isSpace } from 'vs/editor/common/diff/defaultLinesDiffComputer/utils';
-import { MyersDiffAlgorithm } from 'vs/editor/common/diff/defaultLinesDiffComputer/algorithms/myersDiffAlgorithm';
+import { ITimeout, SequenceDiff } from './algorithms/diffAlgorithm.js';
+import { DetailedLineRangeMapping, LineRangeMapping } from '../rangeMapping.js';
+import { pushMany, compareBy, numberComparator, reverseOrder } from '../../../../base/common/arrays.js';
+import { MonotonousArray, findLastMonotonous } from '../../../../base/common/arraysFind.js';
+import { SetMap } from '../../../../base/common/map.js';
+import { LineRange, LineRangeSet } from '../../core/lineRange.js';
+import { LinesSliceCharSequence } from './linesSliceCharSequence.js';
+import { LineRangeFragment, isSpace } from './utils.js';
+import { MyersDiffAlgorithm } from './algorithms/myersDiffAlgorithm.js';
+import { Range } from '../../core/range.js';
 
 export function computeMovedLines(
 	changes: DetailedLineRangeMapping[],
@@ -260,8 +260,8 @@ function areLinesSimilar(line1: string, line2: string, timeout: ITimeout): boole
 
 	const myersDiffingAlgorithm = new MyersDiffAlgorithm();
 	const result = myersDiffingAlgorithm.compute(
-		new LinesSliceCharSequence([line1], new OffsetRange(0, 1), false),
-		new LinesSliceCharSequence([line2], new OffsetRange(0, 1), false),
+		new LinesSliceCharSequence([line1], new Range(1, 1, 1, line1.length), false),
+		new LinesSliceCharSequence([line2], new Range(1, 1, 1, line2.length), false),
 		timeout
 	);
 	let commonNonSpaceCharCount = 0;
diff --git a/src/vs/editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer.ts b/src/vs/editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer.ts
index 2c3ee2fe094..3d3a14eb86b 100644
--- a/src/vs/editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer.ts
+++ b/src/vs/editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer.ts
@@ -3,21 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { equals, groupAdjacentBy } from 'vs/base/common/arrays';
-import { assertFn, checkAdjacentItems } from 'vs/base/common/assert';
-import { LineRange } from 'vs/editor/common/core/lineRange';
-import { OffsetRange } from 'vs/editor/common/core/offsetRange';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { DateTimeout, ITimeout, InfiniteTimeout, SequenceDiff } from 'vs/editor/common/diff/defaultLinesDiffComputer/algorithms/diffAlgorithm';
-import { DynamicProgrammingDiffing } from 'vs/editor/common/diff/defaultLinesDiffComputer/algorithms/dynamicProgrammingDiffing';
-import { MyersDiffAlgorithm } from 'vs/editor/common/diff/defaultLinesDiffComputer/algorithms/myersDiffAlgorithm';
-import { computeMovedLines } from 'vs/editor/common/diff/defaultLinesDiffComputer/computeMovedLines';
-import { extendDiffsToEntireWordIfAppropriate, optimizeSequenceDiffs, removeShortMatches, removeVeryShortMatchingLinesBetweenDiffs, removeVeryShortMatchingTextBetweenLongDiffs } from 'vs/editor/common/diff/defaultLinesDiffComputer/heuristicSequenceOptimizations';
-import { LineSequence } from 'vs/editor/common/diff/defaultLinesDiffComputer/lineSequence';
-import { LinesSliceCharSequence } from 'vs/editor/common/diff/defaultLinesDiffComputer/linesSliceCharSequence';
-import { ILinesDiffComputer, ILinesDiffComputerOptions, LinesDiff, MovedText } from 'vs/editor/common/diff/linesDiffComputer';
-import { DetailedLineRangeMapping, RangeMapping } from '../rangeMapping';
+import { equals } from '../../../../base/common/arrays.js';
+import { assertFn } from '../../../../base/common/assert.js';
+import { LineRange } from '../../core/lineRange.js';
+import { OffsetRange } from '../../core/offsetRange.js';
+import { Position } from '../../core/position.js';
+import { Range } from '../../core/range.js';
+import { ArrayText } from '../../core/textEdit.js';
+import { ILinesDiffComputer, ILinesDiffComputerOptions, LinesDiff, MovedText } from '../linesDiffComputer.js';
+import { DetailedLineRangeMapping, LineRangeMapping, lineRangeMappingFromRangeMappings, RangeMapping } from '../rangeMapping.js';
+import { DateTimeout, InfiniteTimeout, ITimeout, SequenceDiff } from './algorithms/diffAlgorithm.js';
+import { DynamicProgrammingDiffing } from './algorithms/dynamicProgrammingDiffing.js';
+import { MyersDiffAlgorithm } from './algorithms/myersDiffAlgorithm.js';
+import { computeMovedLines } from './computeMovedLines.js';
+import { extendDiffsToEntireWordIfAppropriate, optimizeSequenceDiffs, removeShortMatches, removeVeryShortMatchingLinesBetweenDiffs, removeVeryShortMatchingTextBetweenLongDiffs } from './heuristicSequenceOptimizations.js';
+import { LineSequence } from './lineSequence.js';
+import { LinesSliceCharSequence } from './linesSliceCharSequence.js';
 
 export class DefaultLinesDiffComputer implements ILinesDiffComputer {
 	private readonly dynamicProgrammingDiffing = new DynamicProgrammingDiffing();
@@ -140,7 +141,7 @@ export class DefaultLinesDiffComputer implements ILinesDiffComputer {
 
 		scanForWhitespaceChanges(originalLines.length - seq1LastStart);
 
-		const changes = lineRangeMappingFromRangeMappings(alignments, originalLines, modifiedLines);
+		const changes = lineRangeMappingFromRangeMappings(alignments, new ArrayText(originalLines), new ArrayText(modifiedLines));
 
 		let moves: MovedText[] = [];
 		if (options.computeMoves) {
@@ -167,7 +168,9 @@ export class DefaultLinesDiffComputer implements ILinesDiffComputer {
 				for (const ic of c.innerChanges) {
 					const valid = validatePosition(ic.modifiedRange.getStartPosition(), modifiedLines) && validatePosition(ic.modifiedRange.getEndPosition(), modifiedLines) &&
 						validatePosition(ic.originalRange.getStartPosition(), originalLines) && validatePosition(ic.originalRange.getEndPosition(), originalLines);
-					if (!valid) { return false; }
+					if (!valid) {
+						return false;
+					}
 				}
 				if (!validateRange(c.modified, modifiedLines) || !validateRange(c.original, originalLines)) {
 					return false;
@@ -201,25 +204,35 @@ export class DefaultLinesDiffComputer implements ILinesDiffComputer {
 				m.original.toOffsetRange(),
 				m.modified.toOffsetRange(),
 			), timeout, considerWhitespaceChanges);
-			const mappings = lineRangeMappingFromRangeMappings(moveChanges.mappings, originalLines, modifiedLines, true);
+			const mappings = lineRangeMappingFromRangeMappings(moveChanges.mappings, new ArrayText(originalLines), new ArrayText(modifiedLines), true);
 			return new MovedText(m, mappings);
 		});
 		return movesWithDiffs;
 	}
 
 	private refineDiff(originalLines: string[], modifiedLines: string[], diff: SequenceDiff, timeout: ITimeout, considerWhitespaceChanges: boolean): { mappings: RangeMapping[]; hitTimeout: boolean } {
-		const slice1 = new LinesSliceCharSequence(originalLines, diff.seq1Range, considerWhitespaceChanges);
-		const slice2 = new LinesSliceCharSequence(modifiedLines, diff.seq2Range, considerWhitespaceChanges);
+		const lineRangeMapping = toLineRangeMapping(diff);
+		const rangeMapping = lineRangeMapping.toRangeMapping2(originalLines, modifiedLines);
+
+		const slice1 = new LinesSliceCharSequence(originalLines, rangeMapping.originalRange, considerWhitespaceChanges);
+		const slice2 = new LinesSliceCharSequence(modifiedLines, rangeMapping.modifiedRange, considerWhitespaceChanges);
 
 		const diffResult = slice1.length + slice2.length < 500
 			? this.dynamicProgrammingDiffing.compute(slice1, slice2, timeout)
 			: this.myersDiffingAlgorithm.compute(slice1, slice2, timeout);
 
+		const check = false;
+
 		let diffs = diffResult.diffs;
+		if (check) { SequenceDiff.assertSorted(diffs); }
 		diffs = optimizeSequenceDiffs(slice1, slice2, diffs);
+		if (check) { SequenceDiff.assertSorted(diffs); }
 		diffs = extendDiffsToEntireWordIfAppropriate(slice1, slice2, diffs);
+		if (check) { SequenceDiff.assertSorted(diffs); }
 		diffs = removeShortMatches(slice1, slice2, diffs);
+		if (check) { SequenceDiff.assertSorted(diffs); }
 		diffs = removeVeryShortMatchingTextBetweenLongDiffs(slice1, slice2, diffs);
+		if (check) { SequenceDiff.assertSorted(diffs); }
 
 		const result = diffs.map(
 			(d) =>
@@ -229,6 +242,8 @@ export class DefaultLinesDiffComputer implements ILinesDiffComputer {
 				)
 		);
 
+		if (check) { RangeMapping.assertSorted(result); }
+
 		// Assert: result applied on original should be the same as diff applied to original
 
 		return {
@@ -238,77 +253,9 @@ export class DefaultLinesDiffComputer implements ILinesDiffComputer {
 	}
 }
 
-export function lineRangeMappingFromRangeMappings(alignments: RangeMapping[], originalLines: string[], modifiedLines: string[], dontAssertStartLine: boolean = false): DetailedLineRangeMapping[] {
-	const changes: DetailedLineRangeMapping[] = [];
-	for (const g of groupAdjacentBy(
-		alignments.map(a => getLineRangeMapping(a, originalLines, modifiedLines)),
-		(a1, a2) =>
-			a1.original.overlapOrTouch(a2.original)
-			|| a1.modified.overlapOrTouch(a2.modified)
-	)) {
-		const first = g[0];
-		const last = g[g.length - 1];
-
-		changes.push(new DetailedLineRangeMapping(
-			first.original.join(last.original),
-			first.modified.join(last.modified),
-			g.map(a => a.innerChanges![0]),
-		));
-	}
-
-	assertFn(() => {
-		if (!dontAssertStartLine && changes.length > 0) {
-			if (changes[0].modified.startLineNumber !== changes[0].original.startLineNumber) {
-				return false;
-			}
-			if (modifiedLines.length - changes[changes.length - 1].modified.endLineNumberExclusive !== originalLines.length - changes[changes.length - 1].original.endLineNumberExclusive) {
-				return false;
-			}
-		}
-		return checkAdjacentItems(changes,
-			(m1, m2) => m2.original.startLineNumber - m1.original.endLineNumberExclusive === m2.modified.startLineNumber - m1.modified.endLineNumberExclusive &&
-				// There has to be an unchanged line in between (otherwise both diffs should have been joined)
-				m1.original.endLineNumberExclusive < m2.original.startLineNumber &&
-				m1.modified.endLineNumberExclusive < m2.modified.startLineNumber,
-		);
-	});
-
-	return changes;
-}
-
-export function getLineRangeMapping(rangeMapping: RangeMapping, originalLines: string[], modifiedLines: string[]): DetailedLineRangeMapping {
-	let lineStartDelta = 0;
-	let lineEndDelta = 0;
-
-	// rangeMapping describes the edit that replaces `rangeMapping.originalRange` with `newText := getText(modifiedLines, rangeMapping.modifiedRange)`.
-
-	// original: ]xxx \n <- this line is not modified
-	// modified: ]xx  \n
-	if (rangeMapping.modifiedRange.endColumn === 1 && rangeMapping.originalRange.endColumn === 1
-		&& rangeMapping.originalRange.startLineNumber + lineStartDelta <= rangeMapping.originalRange.endLineNumber
-		&& rangeMapping.modifiedRange.startLineNumber + lineStartDelta <= rangeMapping.modifiedRange.endLineNumber) {
-		// We can only do this if the range is not empty yet
-		lineEndDelta = -1;
-	}
-
-	// original: xxx[ \n <- this line is not modified
-	// modified: xxx[ \n
-	if (rangeMapping.modifiedRange.startColumn - 1 >= modifiedLines[rangeMapping.modifiedRange.startLineNumber - 1].length
-		&& rangeMapping.originalRange.startColumn - 1 >= originalLines[rangeMapping.originalRange.startLineNumber - 1].length
-		&& rangeMapping.originalRange.startLineNumber <= rangeMapping.originalRange.endLineNumber + lineEndDelta
-		&& rangeMapping.modifiedRange.startLineNumber <= rangeMapping.modifiedRange.endLineNumber + lineEndDelta) {
-		// We can only do this if the range is not empty yet
-		lineStartDelta = 1;
-	}
-
-	const originalLineRange = new LineRange(
-		rangeMapping.originalRange.startLineNumber + lineStartDelta,
-		rangeMapping.originalRange.endLineNumber + 1 + lineEndDelta
+function toLineRangeMapping(sequenceDiff: SequenceDiff) {
+	return new LineRangeMapping(
+		new LineRange(sequenceDiff.seq1Range.start + 1, sequenceDiff.seq1Range.endExclusive + 1),
+		new LineRange(sequenceDiff.seq2Range.start + 1, sequenceDiff.seq2Range.endExclusive + 1),
 	);
-	const modifiedLineRange = new LineRange(
-		rangeMapping.modifiedRange.startLineNumber + lineStartDelta,
-		rangeMapping.modifiedRange.endLineNumber + 1 + lineEndDelta
-	);
-
-	return new DetailedLineRangeMapping(originalLineRange, modifiedLineRange, [rangeMapping]);
 }
diff --git a/src/vs/editor/common/diff/defaultLinesDiffComputer/heuristicSequenceOptimizations.ts b/src/vs/editor/common/diff/defaultLinesDiffComputer/heuristicSequenceOptimizations.ts
index fddfb1e0c61..c205457ac53 100644
--- a/src/vs/editor/common/diff/defaultLinesDiffComputer/heuristicSequenceOptimizations.ts
+++ b/src/vs/editor/common/diff/defaultLinesDiffComputer/heuristicSequenceOptimizations.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { forEachWithNeighbors } from 'vs/base/common/arrays';
-import { OffsetRange } from 'vs/editor/common/core/offsetRange';
-import { ISequence, OffsetPair, SequenceDiff } from 'vs/editor/common/diff/defaultLinesDiffComputer/algorithms/diffAlgorithm';
-import { LineSequence } from 'vs/editor/common/diff/defaultLinesDiffComputer/lineSequence';
-import { LinesSliceCharSequence } from 'vs/editor/common/diff/defaultLinesDiffComputer/linesSliceCharSequence';
+import { forEachWithNeighbors } from '../../../../base/common/arrays.js';
+import { OffsetRange } from '../../core/offsetRange.js';
+import { ISequence, OffsetPair, SequenceDiff } from './algorithms/diffAlgorithm.js';
+import { LineSequence } from './lineSequence.js';
+import { LinesSliceCharSequence } from './linesSliceCharSequence.js';
 
 export function optimizeSequenceDiffs(sequence1: ISequence, sequence2: ISequence, sequenceDiffs: SequenceDiff[]): SequenceDiff[] {
 	let result = sequenceDiffs;
diff --git a/src/vs/editor/common/diff/defaultLinesDiffComputer/lineSequence.ts b/src/vs/editor/common/diff/defaultLinesDiffComputer/lineSequence.ts
index fd48f598de0..998459b21e3 100644
--- a/src/vs/editor/common/diff/defaultLinesDiffComputer/lineSequence.ts
+++ b/src/vs/editor/common/diff/defaultLinesDiffComputer/lineSequence.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
-import { OffsetRange } from 'vs/editor/common/core/offsetRange';
-import { ISequence } from 'vs/editor/common/diff/defaultLinesDiffComputer/algorithms/diffAlgorithm';
+import { CharCode } from '../../../../base/common/charCode.js';
+import { OffsetRange } from '../../core/offsetRange.js';
+import { ISequence } from './algorithms/diffAlgorithm.js';
 
 export class LineSequence implements ISequence {
 	constructor(
diff --git a/src/vs/editor/common/diff/defaultLinesDiffComputer/linesSliceCharSequence.ts b/src/vs/editor/common/diff/defaultLinesDiffComputer/linesSliceCharSequence.ts
index 9edc63d335f..b56245bbc0f 100644
--- a/src/vs/editor/common/diff/defaultLinesDiffComputer/linesSliceCharSequence.ts
+++ b/src/vs/editor/common/diff/defaultLinesDiffComputer/linesSliceCharSequence.ts
@@ -3,62 +3,49 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { findLastIdxMonotonous, findLastMonotonous, findFirstMonotonous } from 'vs/base/common/arraysFind';
-import { CharCode } from 'vs/base/common/charCode';
-import { OffsetRange } from 'vs/editor/common/core/offsetRange';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { ISequence } from 'vs/editor/common/diff/defaultLinesDiffComputer/algorithms/diffAlgorithm';
-import { isSpace } from 'vs/editor/common/diff/defaultLinesDiffComputer/utils';
+import { findLastIdxMonotonous, findLastMonotonous, findFirstMonotonous } from '../../../../base/common/arraysFind.js';
+import { CharCode } from '../../../../base/common/charCode.js';
+import { OffsetRange } from '../../core/offsetRange.js';
+import { Position } from '../../core/position.js';
+import { Range } from '../../core/range.js';
+import { ISequence } from './algorithms/diffAlgorithm.js';
+import { isSpace } from './utils.js';
 
 export class LinesSliceCharSequence implements ISequence {
 	private readonly elements: number[] = [];
-	private readonly firstCharOffsetByLine: number[] = [];
-	public readonly lineRange: OffsetRange;
-	// To account for trimming
-	private readonly additionalOffsetByLine: number[] = [];
+	private readonly firstElementOffsetByLineIdx: number[] = [];
+	private readonly lineStartOffsets: number[] = [];
+	private readonly trimmedWsLengthsByLineIdx: number[] = [];
 
-	constructor(public readonly lines: string[], lineRange: OffsetRange, public readonly considerWhitespaceChanges: boolean) {
-		// This slice has to have lineRange.length many \n! (otherwise diffing against an empty slice will be problematic)
-		// (Unless it covers the entire document, in that case the other slice also has to cover the entire document ands it's okay)
+	constructor(public readonly lines: string[], private readonly range: Range, public readonly considerWhitespaceChanges: boolean) {
+		this.firstElementOffsetByLineIdx.push(0);
+		for (let lineNumber = this.range.startLineNumber; lineNumber <= this.range.endLineNumber; lineNumber++) {
+			let line = lines[lineNumber - 1];
+			let lineStartOffset = 0;
+			if (lineNumber === this.range.startLineNumber && this.range.startColumn > 1) {
+				lineStartOffset = this.range.startColumn - 1;
+				line = line.substring(lineStartOffset);
+			}
+			this.lineStartOffsets.push(lineStartOffset);
 
-		// If the slice covers the end, but does not start at the beginning, we include just the \n of the previous line.
-		let trimFirstLineFully = false;
-		if (lineRange.start > 0 && lineRange.endExclusive >= lines.length) {
-			lineRange = new OffsetRange(lineRange.start - 1, lineRange.endExclusive);
-			trimFirstLineFully = true;
-		}
-
-		this.lineRange = lineRange;
-
-		this.firstCharOffsetByLine[0] = 0;
-		for (let i = this.lineRange.start; i < this.lineRange.endExclusive; i++) {
-			let line = lines[i];
-			let offset = 0;
-			if (trimFirstLineFully) {
-				offset = line.length;
-				line = '';
-				trimFirstLineFully = false;
-			} else if (!considerWhitespaceChanges) {
+			let trimmedWsLength = 0;
+			if (!considerWhitespaceChanges) {
 				const trimmedStartLine = line.trimStart();
-				offset = line.length - trimmedStartLine.length;
+				trimmedWsLength = line.length - trimmedStartLine.length;
 				line = trimmedStartLine.trimEnd();
 			}
+			this.trimmedWsLengthsByLineIdx.push(trimmedWsLength);
 
-			this.additionalOffsetByLine.push(offset);
-
-			for (let i = 0; i < line.length; i++) {
+			const lineLength = lineNumber === this.range.endLineNumber ? Math.min(this.range.endColumn - 1 - lineStartOffset - trimmedWsLength, line.length) : line.length;
+			for (let i = 0; i < lineLength; i++) {
 				this.elements.push(line.charCodeAt(i));
 			}
 
-			// Don't add an \n that does not exist in the document.
-			if (i < lines.length - 1) {
+			if (lineNumber < this.range.endLineNumber) {
 				this.elements.push('\n'.charCodeAt(0));
-				this.firstCharOffsetByLine[i - this.lineRange.start + 1] = this.elements.length;
+				this.firstElementOffsetByLineIdx.push(this.elements.length);
 			}
 		}
-		// To account for the last line
-		this.additionalOffsetByLine.push(0);
 	}
 
 	toString() {
@@ -111,18 +98,23 @@ export class LinesSliceCharSequence implements ISequence {
 		return score;
 	}
 
-	public translateOffset(offset: number): Position {
+	public translateOffset(offset: number, preference: 'left' | 'right' = 'right'): Position {
 		// find smallest i, so that lineBreakOffsets[i] <= offset using binary search
-		if (this.lineRange.isEmpty) {
-			return new Position(this.lineRange.start + 1, 1);
-		}
-
-		const i = findLastIdxMonotonous(this.firstCharOffsetByLine, (value) => value <= offset);
-		return new Position(this.lineRange.start + i + 1, offset - this.firstCharOffsetByLine[i] + this.additionalOffsetByLine[i] + 1);
+		const i = findLastIdxMonotonous(this.firstElementOffsetByLineIdx, (value) => value <= offset);
+		const lineOffset = offset - this.firstElementOffsetByLineIdx[i];
+		return new Position(
+			this.range.startLineNumber + i,
+			1 + this.lineStartOffsets[i] + lineOffset + ((lineOffset === 0 && preference === 'left') ? 0 : this.trimmedWsLengthsByLineIdx[i])
+		);
 	}
 
 	public translateRange(range: OffsetRange): Range {
-		return Range.fromPositions(this.translateOffset(range.start), this.translateOffset(range.endExclusive));
+		const pos1 = this.translateOffset(range.start, 'right');
+		const pos2 = this.translateOffset(range.endExclusive, 'left');
+		if (pos2.isBefore(pos1)) {
+			return Range.fromPositions(pos2, pos2);
+		}
+		return Range.fromPositions(pos1, pos2);
 	}
 
 	/**
@@ -161,8 +153,8 @@ export class LinesSliceCharSequence implements ISequence {
 	}
 
 	public extendToFullLines(range: OffsetRange): OffsetRange {
-		const start = findLastMonotonous(this.firstCharOffsetByLine, x => x <= range.start) ?? 0;
-		const end = findFirstMonotonous(this.firstCharOffsetByLine, x => range.endExclusive <= x) ?? this.elements.length;
+		const start = findLastMonotonous(this.firstElementOffsetByLineIdx, x => x <= range.start) ?? 0;
+		const end = findFirstMonotonous(this.firstElementOffsetByLineIdx, x => range.endExclusive <= x) ?? this.elements.length;
 		return new OffsetRange(start, end);
 	}
 }
diff --git a/src/vs/editor/common/diff/defaultLinesDiffComputer/utils.ts b/src/vs/editor/common/diff/defaultLinesDiffComputer/utils.ts
index 533b71e3740..cc5e19a2c93 100644
--- a/src/vs/editor/common/diff/defaultLinesDiffComputer/utils.ts
+++ b/src/vs/editor/common/diff/defaultLinesDiffComputer/utils.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
-import { LineRange } from 'vs/editor/common/core/lineRange';
-import { DetailedLineRangeMapping } from 'vs/editor/common/diff/rangeMapping';
+import { CharCode } from '../../../../base/common/charCode.js';
+import { LineRange } from '../../core/lineRange.js';
+import { DetailedLineRangeMapping } from '../rangeMapping.js';
 
 export class Array2D<T> {
 	private readonly array: T[] = [];
diff --git a/src/vs/editor/common/diff/documentDiffProvider.ts b/src/vs/editor/common/diff/documentDiffProvider.ts
index 10dfca90888..161dde65da2 100644
--- a/src/vs/editor/common/diff/documentDiffProvider.ts
+++ b/src/vs/editor/common/diff/documentDiffProvider.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Event } from 'vs/base/common/event';
-import { MovedText } from 'vs/editor/common/diff/linesDiffComputer';
-import { DetailedLineRangeMapping } from './rangeMapping';
-import { ITextModel } from 'vs/editor/common/model';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Event } from '../../../base/common/event.js';
+import { MovedText } from './linesDiffComputer.js';
+import { DetailedLineRangeMapping } from './rangeMapping.js';
+import { ITextModel } from '../model.js';
 
 /**
  * A document diff provider computes the diff between two text models.
diff --git a/src/vs/editor/common/diff/legacyLinesDiffComputer.ts b/src/vs/editor/common/diff/legacyLinesDiffComputer.ts
index 8d7e05e0308..f3129ac9a7f 100644
--- a/src/vs/editor/common/diff/legacyLinesDiffComputer.ts
+++ b/src/vs/editor/common/diff/legacyLinesDiffComputer.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
-import { IDiffChange, ISequence, LcsDiff, IDiffResult } from 'vs/base/common/diff/diff';
-import { ILinesDiffComputer, ILinesDiffComputerOptions, LinesDiff } from 'vs/editor/common/diff/linesDiffComputer';
-import { RangeMapping, DetailedLineRangeMapping } from './rangeMapping';
-import * as strings from 'vs/base/common/strings';
-import { Range } from 'vs/editor/common/core/range';
-import { assertFn, checkAdjacentItems } from 'vs/base/common/assert';
-import { LineRange } from 'vs/editor/common/core/lineRange';
+import { CharCode } from '../../../base/common/charCode.js';
+import { IDiffChange, ISequence, LcsDiff, IDiffResult } from '../../../base/common/diff/diff.js';
+import { ILinesDiffComputer, ILinesDiffComputerOptions, LinesDiff } from './linesDiffComputer.js';
+import { RangeMapping, DetailedLineRangeMapping } from './rangeMapping.js';
+import * as strings from '../../../base/common/strings.js';
+import { Range } from '../core/range.js';
+import { assertFn, checkAdjacentItems } from '../../../base/common/assert.js';
+import { LineRange } from '../core/lineRange.js';
 
 const MINIMUM_MATCHING_CHARACTER_LENGTH = 3;
 
diff --git a/src/vs/editor/common/diff/linesDiffComputer.ts b/src/vs/editor/common/diff/linesDiffComputer.ts
index a11674f0127..054d1eebfdd 100644
--- a/src/vs/editor/common/diff/linesDiffComputer.ts
+++ b/src/vs/editor/common/diff/linesDiffComputer.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DetailedLineRangeMapping, LineRangeMapping } from './rangeMapping';
+import { DetailedLineRangeMapping, LineRangeMapping } from './rangeMapping.js';
 
 export interface ILinesDiffComputer {
 	computeDiff(originalLines: string[], modifiedLines: string[], options: ILinesDiffComputerOptions): LinesDiff;
diff --git a/src/vs/editor/common/diff/linesDiffComputers.ts b/src/vs/editor/common/diff/linesDiffComputers.ts
index 75c63fe6552..a0a17e5a42c 100644
--- a/src/vs/editor/common/diff/linesDiffComputers.ts
+++ b/src/vs/editor/common/diff/linesDiffComputers.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { LegacyLinesDiffComputer } from 'vs/editor/common/diff/legacyLinesDiffComputer';
-import { DefaultLinesDiffComputer } from 'vs/editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer';
-import { ILinesDiffComputer } from 'vs/editor/common/diff/linesDiffComputer';
+import { LegacyLinesDiffComputer } from './legacyLinesDiffComputer.js';
+import { DefaultLinesDiffComputer } from './defaultLinesDiffComputer/defaultLinesDiffComputer.js';
+import { ILinesDiffComputer } from './linesDiffComputer.js';
 
 export const linesDiffComputers = {
 	getLegacy: () => new LegacyLinesDiffComputer(),
diff --git a/src/vs/editor/common/diff/rangeMapping.ts b/src/vs/editor/common/diff/rangeMapping.ts
index f15b2a05310..80c18b9eddf 100644
--- a/src/vs/editor/common/diff/rangeMapping.ts
+++ b/src/vs/editor/common/diff/rangeMapping.ts
@@ -3,10 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BugIndicatingError } from 'vs/base/common/errors';
-import { LineRange } from 'vs/editor/common/core/lineRange';
-import { Range } from 'vs/editor/common/core/range';
-import { AbstractText, SingleTextEdit } from 'vs/editor/common/core/textEdit';
+import { groupAdjacentBy } from '../../../base/common/arrays.js';
+import { assertFn, checkAdjacentItems } from '../../../base/common/assert.js';
+import { BugIndicatingError } from '../../../base/common/errors.js';
+import { LineRange } from '../core/lineRange.js';
+import { Position } from '../core/position.js';
+import { Range } from '../core/range.js';
+import { AbstractText, SingleTextEdit, TextEdit } from '../core/textEdit.js';
 
 /**
  * Maps a line range in the original text model to a line range in the modified text model.
@@ -118,6 +121,70 @@ export class LineRangeMapping {
 			);
 		}
 	}
+
+	/**
+	 * This method assumes that the LineRangeMapping describes a valid diff!
+	 * I.e. if one range is empty, the other range cannot be the entire document.
+	 * It avoids various problems when the line range points to non-existing line-numbers.
+	*/
+	public toRangeMapping2(original: string[], modified: string[]): RangeMapping {
+		if (isValidLineNumber(this.original.endLineNumberExclusive, original)
+			&& isValidLineNumber(this.modified.endLineNumberExclusive, modified)) {
+			return new RangeMapping(
+				new Range(this.original.startLineNumber, 1, this.original.endLineNumberExclusive, 1),
+				new Range(this.modified.startLineNumber, 1, this.modified.endLineNumberExclusive, 1),
+			);
+		}
+
+		if (!this.original.isEmpty && !this.modified.isEmpty) {
+			return new RangeMapping(
+				Range.fromPositions(
+					new Position(this.original.startLineNumber, 1),
+					normalizePosition(new Position(this.original.endLineNumberExclusive - 1, Number.MAX_SAFE_INTEGER), original)
+				),
+				Range.fromPositions(
+					new Position(this.modified.startLineNumber, 1),
+					normalizePosition(new Position(this.modified.endLineNumberExclusive - 1, Number.MAX_SAFE_INTEGER), modified)
+				),
+			);
+		}
+
+		if (this.original.startLineNumber > 1 && this.modified.startLineNumber > 1) {
+			return new RangeMapping(
+				Range.fromPositions(
+					normalizePosition(new Position(this.original.startLineNumber - 1, Number.MAX_SAFE_INTEGER), original),
+					normalizePosition(new Position(this.original.endLineNumberExclusive - 1, Number.MAX_SAFE_INTEGER), original)
+				),
+				Range.fromPositions(
+					normalizePosition(new Position(this.modified.startLineNumber - 1, Number.MAX_SAFE_INTEGER), modified),
+					normalizePosition(new Position(this.modified.endLineNumberExclusive - 1, Number.MAX_SAFE_INTEGER), modified)
+				),
+			);
+		}
+
+		// Situation now: one range is empty and one range touches the last line and one range starts at line 1.
+		// I don't think this can happen.
+
+		throw new BugIndicatingError();
+	}
+}
+
+function normalizePosition(position: Position, content: string[]): Position {
+	if (position.lineNumber < 1) {
+		return new Position(1, 1);
+	}
+	if (position.lineNumber > content.length) {
+		return new Position(content.length, content[content.length - 1].length + 1);
+	}
+	const line = content[position.lineNumber - 1];
+	if (position.column > line.length + 1) {
+		return new Position(position.lineNumber, line.length + 1);
+	}
+	return position;
+}
+
+function isValidLineNumber(lineNumber: number, lines: string[]): boolean {
+	return lineNumber >= 1 && lineNumber <= lines.length;
 }
 
 /**
@@ -161,6 +228,42 @@ export class DetailedLineRangeMapping extends LineRangeMapping {
  * Maps a range in the original text model to a range in the modified text model.
  */
 export class RangeMapping {
+	public static fromEdit(edit: TextEdit): RangeMapping[] {
+		const newRanges = edit.getNewRanges();
+		const result = edit.edits.map((e, idx) => new RangeMapping(e.range, newRanges[idx]));
+		return result;
+	}
+
+	public static fromEditJoin(edit: TextEdit): RangeMapping {
+		const newRanges = edit.getNewRanges();
+		const result = edit.edits.map((e, idx) => new RangeMapping(e.range, newRanges[idx]));
+		return RangeMapping.join(result);
+	}
+
+	public static join(rangeMappings: RangeMapping[]): RangeMapping {
+		if (rangeMappings.length === 0) {
+			throw new BugIndicatingError('Cannot join an empty list of range mappings');
+		}
+		let result = rangeMappings[0];
+		for (let i = 1; i < rangeMappings.length; i++) {
+			result = result.join(rangeMappings[i]);
+		}
+		return result;
+	}
+
+	public static assertSorted(rangeMappings: RangeMapping[]): void {
+		for (let i = 1; i < rangeMappings.length; i++) {
+			const previous = rangeMappings[i - 1];
+			const current = rangeMappings[i];
+			if (!(
+				previous.originalRange.getEndPosition().isBeforeOrEqual(current.originalRange.getStartPosition())
+				&& previous.modifiedRange.getEndPosition().isBeforeOrEqual(current.modifiedRange.getStartPosition())
+			)) {
+				throw new BugIndicatingError('Range mappings must be sorted');
+			}
+		}
+	}
+
 	/**
 	 * The original range.
 	 */
@@ -194,4 +297,87 @@ export class RangeMapping {
 		const newText = modified.getValueOfRange(this.modifiedRange);
 		return new SingleTextEdit(this.originalRange, newText);
 	}
+
+	public join(other: RangeMapping): RangeMapping {
+		return new RangeMapping(
+			this.originalRange.plusRange(other.originalRange),
+			this.modifiedRange.plusRange(other.modifiedRange)
+		);
+	}
+}
+
+export function lineRangeMappingFromRangeMappings(alignments: readonly RangeMapping[], originalLines: AbstractText, modifiedLines: AbstractText, dontAssertStartLine: boolean = false): DetailedLineRangeMapping[] {
+	const changes: DetailedLineRangeMapping[] = [];
+	for (const g of groupAdjacentBy(
+		alignments.map(a => getLineRangeMapping(a, originalLines, modifiedLines)),
+		(a1, a2) =>
+			a1.original.overlapOrTouch(a2.original)
+			|| a1.modified.overlapOrTouch(a2.modified)
+	)) {
+		const first = g[0];
+		const last = g[g.length - 1];
+
+		changes.push(new DetailedLineRangeMapping(
+			first.original.join(last.original),
+			first.modified.join(last.modified),
+			g.map(a => a.innerChanges![0]),
+		));
+	}
+
+	assertFn(() => {
+		if (!dontAssertStartLine && changes.length > 0) {
+			if (changes[0].modified.startLineNumber !== changes[0].original.startLineNumber) {
+				return false;
+			}
+
+			if (modifiedLines.length.lineCount - changes[changes.length - 1].modified.endLineNumberExclusive !== originalLines.length.lineCount - changes[changes.length - 1].original.endLineNumberExclusive) {
+				return false;
+			}
+		}
+		return checkAdjacentItems(changes,
+			(m1, m2) => m2.original.startLineNumber - m1.original.endLineNumberExclusive === m2.modified.startLineNumber - m1.modified.endLineNumberExclusive &&
+				// There has to be an unchanged line in between (otherwise both diffs should have been joined)
+				m1.original.endLineNumberExclusive < m2.original.startLineNumber &&
+				m1.modified.endLineNumberExclusive < m2.modified.startLineNumber,
+		);
+	});
+
+	return changes;
+}
+
+export function getLineRangeMapping(rangeMapping: RangeMapping, originalLines: AbstractText, modifiedLines: AbstractText): DetailedLineRangeMapping {
+	let lineStartDelta = 0;
+	let lineEndDelta = 0;
+
+	// rangeMapping describes the edit that replaces `rangeMapping.originalRange` with `newText := getText(modifiedLines, rangeMapping.modifiedRange)`.
+
+	// original: ]xxx \n <- this line is not modified
+	// modified: ]xx  \n
+	if (rangeMapping.modifiedRange.endColumn === 1 && rangeMapping.originalRange.endColumn === 1
+		&& rangeMapping.originalRange.startLineNumber + lineStartDelta <= rangeMapping.originalRange.endLineNumber
+		&& rangeMapping.modifiedRange.startLineNumber + lineStartDelta <= rangeMapping.modifiedRange.endLineNumber) {
+		// We can only do this if the range is not empty yet
+		lineEndDelta = -1;
+	}
+
+	// original: xxx[ \n <- this line is not modified
+	// modified: xxx[ \n
+	if (rangeMapping.modifiedRange.startColumn - 1 >= modifiedLines.getLineLength(rangeMapping.modifiedRange.startLineNumber)
+		&& rangeMapping.originalRange.startColumn - 1 >= originalLines.getLineLength(rangeMapping.originalRange.startLineNumber)
+		&& rangeMapping.originalRange.startLineNumber <= rangeMapping.originalRange.endLineNumber + lineEndDelta
+		&& rangeMapping.modifiedRange.startLineNumber <= rangeMapping.modifiedRange.endLineNumber + lineEndDelta) {
+		// We can only do this if the range is not empty yet
+		lineStartDelta = 1;
+	}
+
+	const originalLineRange = new LineRange(
+		rangeMapping.originalRange.startLineNumber + lineStartDelta,
+		rangeMapping.originalRange.endLineNumber + 1 + lineEndDelta
+	);
+	const modifiedLineRange = new LineRange(
+		rangeMapping.modifiedRange.startLineNumber + lineStartDelta,
+		rangeMapping.modifiedRange.endLineNumber + 1 + lineEndDelta
+	);
+
+	return new DetailedLineRangeMapping(originalLineRange, modifiedLineRange, [rangeMapping]);
 }
diff --git a/src/vs/editor/common/editorAction.ts b/src/vs/editor/common/editorAction.ts
index 90924e7895a..7d8224d018f 100644
--- a/src/vs/editor/common/editorAction.ts
+++ b/src/vs/editor/common/editorAction.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IEditorAction } from 'vs/editor/common/editorCommon';
-import { ICommandMetadata } from 'vs/platform/commands/common/commands';
-import { ContextKeyExpression, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IEditorAction } from './editorCommon.js';
+import { ICommandMetadata } from '../../platform/commands/common/commands.js';
+import { ContextKeyExpression, IContextKeyService } from '../../platform/contextkey/common/contextkey.js';
 
 export class InternalEditorAction implements IEditorAction {
 
diff --git a/src/vs/editor/common/editorCommon.ts b/src/vs/editor/common/editorCommon.ts
index 57b9cde6268..e25edb4fb50 100644
--- a/src/vs/editor/common/editorCommon.ts
+++ b/src/vs/editor/common/editorCommon.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { ThemeColor } from 'vs/base/common/themables';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { IDimension } from 'vs/editor/common/core/dimension';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { ISelection, Selection } from 'vs/editor/common/core/selection';
-import { IModelDecoration, IModelDecorationsChangeAccessor, IModelDeltaDecoration, ITextModel, IValidEditOperation, OverviewRulerLane, TrackedRangeStickiness } from 'vs/editor/common/model';
-import { IModelDecorationsChangedEvent } from 'vs/editor/common/textModelEvents';
-import { ICommandMetadata } from 'vs/platform/commands/common/commands';
+import { Event } from '../../base/common/event.js';
+import { IMarkdownString } from '../../base/common/htmlContent.js';
+import { IDisposable } from '../../base/common/lifecycle.js';
+import { ThemeColor } from '../../base/common/themables.js';
+import { URI, UriComponents } from '../../base/common/uri.js';
+import { IEditorOptions } from './config/editorOptions.js';
+import { IDimension } from './core/dimension.js';
+import { IPosition, Position } from './core/position.js';
+import { IRange, Range } from './core/range.js';
+import { ISelection, Selection } from './core/selection.js';
+import { IModelDecoration, IModelDecorationsChangeAccessor, IModelDeltaDecoration, ITextModel, IValidEditOperation, OverviewRulerLane, TrackedRangeStickiness } from './model.js';
+import { IModelDecorationsChangedEvent } from './textModelEvents.js';
+import { ICommandMetadata } from '../../platform/commands/common/commands.js';
 
 /**
  * A builder and helper for edit operations for a command.
@@ -147,6 +147,15 @@ export interface IContentSizeChangedEvent {
 	readonly contentHeightChanged: boolean;
 }
 
+/**
+ * @internal
+ */
+export interface ITriggerEditorOperationEvent {
+	source: string | null | undefined;
+	handlerId: string;
+	payload: any;
+}
+
 export interface INewScrollPosition {
 	scrollLeft?: number;
 	scrollTop?: number;
@@ -770,4 +779,3 @@ export interface CompositionTypePayload {
 	replaceNextCharCnt: number;
 	positionDelta: number;
 }
-
diff --git a/src/vs/editor/common/editorContextKeys.ts b/src/vs/editor/common/editorContextKeys.ts
index 2311fbd3a85..8c6952a2e75 100644
--- a/src/vs/editor/common/editorContextKeys.ts
+++ b/src/vs/editor/common/editorContextKeys.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import * as nls from '../../nls.js';
+import { RawContextKey } from '../../platform/contextkey/common/contextkey.js';
 
 export namespace EditorContextKeys {
 
@@ -27,7 +27,6 @@ export namespace EditorContextKeys {
 	export const readOnly = new RawContextKey<boolean>('editorReadonly', false, nls.localize('editorReadonly', "Whether the editor is read-only"));
 	export const inDiffEditor = new RawContextKey<boolean>('inDiffEditor', false, nls.localize('inDiffEditor', "Whether the context is a diff editor"));
 	export const isEmbeddedDiffEditor = new RawContextKey<boolean>('isEmbeddedDiffEditor', false, nls.localize('isEmbeddedDiffEditor', "Whether the context is an embedded diff editor"));
-	export const inMultiDiffEditor = new RawContextKey<boolean>('inMultiDiffEditor', false, nls.localize('inMultiDiffEditor', "Whether the context is a multi diff editor"));
 	export const multiDiffEditorAllCollapsed = new RawContextKey<boolean>('multiDiffEditorAllCollapsed', undefined, nls.localize('multiDiffEditorAllCollapsed', "Whether all files in multi diff editor are collapsed"));
 	export const hasChanges = new RawContextKey<boolean>('diffEditorHasChanges', false, nls.localize('diffEditorHasChanges', "Whether the diff editor has changes"));
 	export const comparingMovedCode = new RawContextKey<boolean>('comparingMovedCode', false, nls.localize('comparingMovedCode', "Whether a moved code block is selected for comparison"));
diff --git a/src/vs/editor/common/editorFeatures.ts b/src/vs/editor/common/editorFeatures.ts
index 99d29778303..b68e3fcf200 100644
--- a/src/vs/editor/common/editorFeatures.ts
+++ b/src/vs/editor/common/editorFeatures.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BrandedService, IConstructorSignature } from 'vs/platform/instantiation/common/instantiation';
+import { BrandedService, IConstructorSignature } from '../../platform/instantiation/common/instantiation.js';
 
 /**
  * A feature that will be loaded when the first code editor is constructed and disposed when the system shuts down.
diff --git a/src/vs/editor/common/editorTheme.ts b/src/vs/editor/common/editorTheme.ts
index 6b5944133bb..eb0ba38307a 100644
--- a/src/vs/editor/common/editorTheme.ts
+++ b/src/vs/editor/common/editorTheme.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IColorTheme } from 'vs/platform/theme/common/themeService';
-import { ColorIdentifier } from 'vs/platform/theme/common/colorRegistry';
-import { Color } from 'vs/base/common/color';
-import { ColorScheme } from 'vs/platform/theme/common/theme';
+import { IColorTheme } from '../../platform/theme/common/themeService.js';
+import { ColorIdentifier } from '../../platform/theme/common/colorRegistry.js';
+import { Color } from '../../base/common/color.js';
+import { ColorScheme } from '../../platform/theme/common/theme.js';
 
 export class EditorTheme {
 
diff --git a/src/vs/editor/common/encodedTokenAttributes.ts b/src/vs/editor/common/encodedTokenAttributes.ts
index c0f2fad70f1..bf144bd8a17 100644
--- a/src/vs/editor/common/encodedTokenAttributes.ts
+++ b/src/vs/editor/common/encodedTokenAttributes.ts
@@ -65,26 +65,26 @@ export const enum StandardTokenType {
  *
  */
 export const enum MetadataConsts {
-	LANGUAGEID_MASK = 0b00000000000000000000000011111111,
-	TOKEN_TYPE_MASK = 0b00000000000000000000001100000000,
-	BALANCED_BRACKETS_MASK = 0b00000000000000000000010000000000,
-	FONT_STYLE_MASK = 0b00000000000000000111100000000000,
-	FOREGROUND_MASK = 0b00000000111111111000000000000000,
-	BACKGROUND_MASK = 0b11111111000000000000000000000000,
+	LANGUAGEID_MASK /*            */ = 0b00000000000000000000000011111111,
+	TOKEN_TYPE_MASK /*            */ = 0b00000000000000000000001100000000,
+	BALANCED_BRACKETS_MASK /*     */ = 0b00000000000000000000010000000000,
+	FONT_STYLE_MASK /*            */ = 0b00000000000000000111100000000000,
+	FOREGROUND_MASK /*            */ = 0b00000000111111111000000000000000,
+	BACKGROUND_MASK /*            */ = 0b11111111000000000000000000000000,
 
-	ITALIC_MASK = 0b00000000000000000000100000000000,
-	BOLD_MASK = 0b00000000000000000001000000000000,
-	UNDERLINE_MASK = 0b00000000000000000010000000000000,
-	STRIKETHROUGH_MASK = 0b00000000000000000100000000000000,
+	ITALIC_MASK /*                */ = 0b00000000000000000000100000000000,
+	BOLD_MASK /*                  */ = 0b00000000000000000001000000000000,
+	UNDERLINE_MASK /*             */ = 0b00000000000000000010000000000000,
+	STRIKETHROUGH_MASK /*         */ = 0b00000000000000000100000000000000,
 
 	// Semantic tokens cannot set the language id, so we can
 	// use the first 8 bits for control purposes
-	SEMANTIC_USE_ITALIC = 0b00000000000000000000000000000001,
-	SEMANTIC_USE_BOLD = 0b00000000000000000000000000000010,
-	SEMANTIC_USE_UNDERLINE = 0b00000000000000000000000000000100,
-	SEMANTIC_USE_STRIKETHROUGH = 0b00000000000000000000000000001000,
-	SEMANTIC_USE_FOREGROUND = 0b00000000000000000000000000010000,
-	SEMANTIC_USE_BACKGROUND = 0b00000000000000000000000000100000,
+	SEMANTIC_USE_ITALIC /*        */ = 0b00000000000000000000000000000001,
+	SEMANTIC_USE_BOLD /*          */ = 0b00000000000000000000000000000010,
+	SEMANTIC_USE_UNDERLINE  /*    */ = 0b00000000000000000000000000000100,
+	SEMANTIC_USE_STRIKETHROUGH /* */ = 0b00000000000000000000000000001000,
+	SEMANTIC_USE_FOREGROUND /*    */ = 0b00000000000000000000000000010000,
+	SEMANTIC_USE_BACKGROUND /*    */ = 0b00000000000000000000000000100000,
 
 	LANGUAGEID_OFFSET = 0,
 	TOKEN_TYPE_OFFSET = 8,
diff --git a/src/vs/editor/common/languageFeatureRegistry.ts b/src/vs/editor/common/languageFeatureRegistry.ts
index 53c14ac57b9..6bf6f851720 100644
--- a/src/vs/editor/common/languageFeatureRegistry.ts
+++ b/src/vs/editor/common/languageFeatureRegistry.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { ITextModel, shouldSynchronizeModel } from 'vs/editor/common/model';
-import { LanguageFilter, LanguageSelector, score } from 'vs/editor/common/languageSelector';
-import { URI } from 'vs/base/common/uri';
+import { Emitter } from '../../base/common/event.js';
+import { IDisposable, toDisposable } from '../../base/common/lifecycle.js';
+import { ITextModel, shouldSynchronizeModel } from './model.js';
+import { LanguageFilter, LanguageSelector, score } from './languageSelector.js';
+import { URI } from '../../base/common/uri.js';
 
 interface Entry<T> {
-	selector: LanguageSelector;
-	provider: T;
+	readonly selector: LanguageSelector;
+	readonly provider: T;
 	_score: number;
-	_time: number;
+	readonly _time: number;
 }
 
 function isExclusive(selector: LanguageSelector): boolean {
@@ -40,14 +40,16 @@ class MatchCandidate {
 		readonly uri: URI,
 		readonly languageId: string,
 		readonly notebookUri: URI | undefined,
-		readonly notebookType: string | undefined
+		readonly notebookType: string | undefined,
+		readonly recursive: boolean,
 	) { }
 
 	equals(other: MatchCandidate): boolean {
 		return this.notebookType === other.notebookType
 			&& this.languageId === other.languageId
 			&& this.uri.toString() === other.uri.toString()
-			&& this.notebookUri?.toString() === other.notebookUri?.toString();
+			&& this.notebookUri?.toString() === other.notebookUri?.toString()
+			&& this.recursive === other.recursive;
 	}
 }
 
@@ -96,7 +98,7 @@ export class LanguageFeatureRegistry<T> {
 			return [];
 		}
 
-		this._updateScores(model);
+		this._updateScores(model, false);
 		const result: T[] = [];
 
 		// from registry
@@ -109,9 +111,13 @@ export class LanguageFeatureRegistry<T> {
 		return result;
 	}
 
-	ordered(model: ITextModel): T[] {
+	allNoModel(): T[] {
+		return this._entries.map(entry => entry.provider);
+	}
+
+	ordered(model: ITextModel, recursive = false): T[] {
 		const result: T[] = [];
-		this._orderedForEach(model, entry => result.push(entry.provider));
+		this._orderedForEach(model, recursive, entry => result.push(entry.provider));
 		return result;
 	}
 
@@ -120,7 +126,7 @@ export class LanguageFeatureRegistry<T> {
 		let lastBucket: T[];
 		let lastBucketScore: number;
 
-		this._orderedForEach(model, entry => {
+		this._orderedForEach(model, false, entry => {
 			if (lastBucket && lastBucketScore === entry._score) {
 				lastBucket.push(entry.provider);
 			} else {
@@ -133,9 +139,9 @@ export class LanguageFeatureRegistry<T> {
 		return result;
 	}
 
-	private _orderedForEach(model: ITextModel, callback: (provider: Entry<T>) => any): void {
+	private _orderedForEach(model: ITextModel, recursive: boolean, callback: (provider: Entry<T>) => any): void {
 
-		this._updateScores(model);
+		this._updateScores(model, recursive);
 
 		for (const entry of this._entries) {
 			if (entry._score > 0) {
@@ -146,15 +152,15 @@ export class LanguageFeatureRegistry<T> {
 
 	private _lastCandidate: MatchCandidate | undefined;
 
-	private _updateScores(model: ITextModel): void {
+	private _updateScores(model: ITextModel, recursive: boolean): void {
 
 		const notebookInfo = this._notebookInfoResolver?.(model.uri);
 
 		// use the uri (scheme, pattern) of the notebook info iff we have one
 		// otherwise it's the model's/document's uri
 		const candidate = notebookInfo
-			? new MatchCandidate(model.uri, model.getLanguageId(), notebookInfo.uri, notebookInfo.type)
-			: new MatchCandidate(model.uri, model.getLanguageId(), undefined, undefined);
+			? new MatchCandidate(model.uri, model.getLanguageId(), notebookInfo.uri, notebookInfo.type, recursive)
+			: new MatchCandidate(model.uri, model.getLanguageId(), undefined, undefined, recursive);
 
 		if (this._lastCandidate?.equals(candidate)) {
 			// nothing has changed
@@ -167,13 +173,17 @@ export class LanguageFeatureRegistry<T> {
 			entry._score = score(entry.selector, candidate.uri, candidate.languageId, shouldSynchronizeModel(model), candidate.notebookUri, candidate.notebookType);
 
 			if (isExclusive(entry.selector) && entry._score > 0) {
-				// support for one exclusive selector that overwrites
-				// any other selector
-				for (const entry of this._entries) {
+				if (recursive) {
 					entry._score = 0;
+				} else {
+					// support for one exclusive selector that overwrites
+					// any other selector
+					for (const entry of this._entries) {
+						entry._score = 0;
+					}
+					entry._score = 1000;
+					break;
 				}
-				entry._score = 1000;
-				break;
 			}
 		}
 
diff --git a/src/vs/editor/common/languageSelector.ts b/src/vs/editor/common/languageSelector.ts
index db32360aa2e..6374d380f48 100644
--- a/src/vs/editor/common/languageSelector.ts
+++ b/src/vs/editor/common/languageSelector.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IRelativePattern, match as matchGlobPattern } from 'vs/base/common/glob';
-import { URI } from 'vs/base/common/uri';
-import { normalize } from 'vs/base/common/path';
+import { IRelativePattern, match as matchGlobPattern } from '../../base/common/glob.js';
+import { URI } from '../../base/common/uri.js';
+import { normalize } from '../../base/common/path.js';
 
 export interface LanguageFilter {
 	readonly language?: string;
diff --git a/src/vs/editor/common/languages.ts b/src/vs/editor/common/languages.ts
index 018258e559d..007c204ae98 100644
--- a/src/vs/editor/common/languages.ts
+++ b/src/vs/editor/common/languages.ts
@@ -3,29 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Codicon } from 'vs/base/common/codicons';
-import { Color } from 'vs/base/common/color';
-import { IReadonlyVSDataTransfer } from 'vs/base/common/dataTransfer';
-import { Event } from 'vs/base/common/event';
-import { HierarchicalKind } from 'vs/base/common/hierarchicalKind';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { EditOperation, ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { LanguageId } from 'vs/editor/common/encodedTokenAttributes';
-import { LanguageSelector } from 'vs/editor/common/languageSelector';
-import * as model from 'vs/editor/common/model';
-import { TokenizationRegistry as TokenizationRegistryImpl } from 'vs/editor/common/tokenizationRegistry';
-import { ContiguousMultilineTokens } from 'vs/editor/common/tokens/contiguousMultilineTokens';
-import { localize } from 'vs/nls';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { IMarkerData } from 'vs/platform/markers/common/markers';
+import { VSBuffer } from '../../base/common/buffer.js';
+import { CancellationToken } from '../../base/common/cancellation.js';
+import { Codicon } from '../../base/common/codicons.js';
+import { Color } from '../../base/common/color.js';
+import { IReadonlyVSDataTransfer } from '../../base/common/dataTransfer.js';
+import { Event } from '../../base/common/event.js';
+import { HierarchicalKind } from '../../base/common/hierarchicalKind.js';
+import { IMarkdownString } from '../../base/common/htmlContent.js';
+import { IDisposable } from '../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../base/common/themables.js';
+import { URI, UriComponents } from '../../base/common/uri.js';
+import { EditOperation, ISingleEditOperation } from './core/editOperation.js';
+import { IPosition, Position } from './core/position.js';
+import { IRange, Range } from './core/range.js';
+import { Selection } from './core/selection.js';
+import { LanguageId } from './encodedTokenAttributes.js';
+import { LanguageSelector } from './languageSelector.js';
+import * as model from './model.js';
+import { TokenizationRegistry as TokenizationRegistryImpl } from './tokenizationRegistry.js';
+import { ContiguousMultilineTokens } from './tokens/contiguousMultilineTokens.js';
+import { localize } from '../../nls.js';
+import { ExtensionIdentifier } from '../../platform/extensions/common/extensions.js';
+import { IMarkerData } from '../../platform/markers/common/markers.js';
+import { IModelTokensChangedEvent } from './textModelEvents.js';
+import type { Parser } from '@vscode/tree-sitter-wasm';
 
 /**
  * @internal
@@ -82,6 +84,17 @@ export class EncodedTokenizationResult {
 	}
 }
 
+/**
+ * An intermediate interface for scaffolding the new tree sitter tokenization support. Not final.
+ * @internal
+ */
+export interface ITreeSitterTokenizationSupport {
+	tokenizeEncoded(lineNumber: number, textModel: model.ITextModel): Uint32Array | undefined;
+	captureAtPosition(lineNumber: number, column: number, textModel: model.ITextModel): Parser.QueryCapture[];
+	captureAtPositionTree(lineNumber: number, column: number, tree: Parser.Tree): Parser.QueryCapture[];
+	onDidChangeTokens: Event<{ textModel: model.ITextModel; changes: IModelTokensChangedEvent }>;
+}
+
 /**
  * @internal
  */
@@ -687,6 +700,11 @@ export interface InlineCompletionContext {
 	 */
 	readonly triggerKind: InlineCompletionTriggerKind;
 	readonly selectedSuggestionInfo: SelectedSuggestionInfo | undefined;
+	/**
+	 * @experimental
+	 * @internal
+	*/
+	readonly userPrompt?: string | undefined;
 }
 
 export class SelectedSuggestionInfo {
@@ -743,6 +761,8 @@ export interface InlineCompletion {
 	 * Defaults to `false`.
 	*/
 	readonly completeBracketPairs?: boolean;
+
+	readonly isInlineEdit?: boolean;
 }
 
 export interface InlineCompletions<TItem extends InlineCompletion = InlineCompletion> {
@@ -765,6 +785,12 @@ export type InlineCompletionProviderGroupId = string;
 export interface InlineCompletionsProvider<T extends InlineCompletions = InlineCompletions> {
 	provideInlineCompletions(model: model.ITextModel, position: Position, context: InlineCompletionContext, token: CancellationToken): ProviderResult<T>;
 
+	/**
+	 * @experimental
+	 * @internal
+	*/
+	provideInlineEditsForRange?(model: model.ITextModel, range: Range, context: InlineCompletionContext, token: CancellationToken): ProviderResult<T>;
+
 	/**
 	 * Will be called when an item is shown.
 	 * @param updatedInsertText Is useful to understand bracket completion.
@@ -1186,6 +1212,16 @@ export function isLocationLink(thing: any): thing is LocationLink {
 		&& (Range.isIRange((thing as LocationLink).originSelectionRange) || Range.isIRange((thing as LocationLink).targetSelectionRange));
 }
 
+/**
+ * @internal
+ */
+export function isLocation(thing: any): thing is Location {
+	return thing
+		&& URI.isUri((thing as Location).uri)
+		&& Range.isIRange((thing as Location).range);
+}
+
+
 export type Definition = Location | Location[] | LocationLink[];
 
 /**
@@ -1865,7 +1901,7 @@ export interface CommentThread<T = IRange> {
 	range: T | undefined;
 	label: string | undefined;
 	contextValue: string | undefined;
-	comments: Comment[] | undefined;
+	comments: ReadonlyArray<Comment> | undefined;
 	onDidChangeComments: Event<readonly Comment[] | undefined>;
 	collapsibleState?: CommentThreadCollapsibleState;
 	initialCollapsibleState?: CommentThreadCollapsibleState;
@@ -1875,7 +1911,6 @@ export interface CommentThread<T = IRange> {
 	canReply: boolean;
 	input?: CommentInput;
 	onDidChangeInput: Event<CommentInput | undefined>;
-	onDidChangeRange: Event<T | undefined>;
 	onDidChangeLabel: Event<string | undefined>;
 	onDidChangeCollapsibleState: Event<CommentThreadCollapsibleState | undefined>;
 	onDidChangeState: Event<CommentThreadState | undefined>;
@@ -2095,17 +2130,17 @@ export interface ITokenizationSupportChangedEvent {
 /**
  * @internal
  */
-export interface ILazyTokenizationSupport {
-	get tokenizationSupport(): Promise<ITokenizationSupport | null>;
+export interface ILazyTokenizationSupport<TSupport> {
+	get tokenizationSupport(): Promise<TSupport | null>;
 }
 
 /**
  * @internal
  */
-export class LazyTokenizationSupport implements IDisposable, ILazyTokenizationSupport {
-	private _tokenizationSupport: Promise<ITokenizationSupport & IDisposable | null> | null = null;
+export class LazyTokenizationSupport<TSupport = ITokenizationSupport> implements IDisposable, ILazyTokenizationSupport<TSupport> {
+	private _tokenizationSupport: Promise<TSupport & IDisposable | null> | null = null;
 
-	constructor(private readonly createSupport: () => Promise<ITokenizationSupport & IDisposable | null>) {
+	constructor(private readonly createSupport: () => Promise<TSupport & IDisposable | null>) {
 	}
 
 	dispose(): void {
@@ -2118,7 +2153,7 @@ export class LazyTokenizationSupport implements IDisposable, ILazyTokenizationSu
 		}
 	}
 
-	get tokenizationSupport(): Promise<ITokenizationSupport | null> {
+	get tokenizationSupport(): Promise<TSupport | null> {
 		if (!this._tokenizationSupport) {
 			this._tokenizationSupport = this.createSupport();
 		}
@@ -2129,7 +2164,7 @@ export class LazyTokenizationSupport implements IDisposable, ILazyTokenizationSu
 /**
  * @internal
  */
-export interface ITokenizationRegistry {
+export interface ITokenizationRegistry<TSupport> {
 
 	/**
 	 * An event triggered when:
@@ -2147,24 +2182,24 @@ export interface ITokenizationRegistry {
 	/**
 	 * Register a tokenization support.
 	 */
-	register(languageId: string, support: ITokenizationSupport): IDisposable;
+	register(languageId: string, support: TSupport): IDisposable;
 
 	/**
 	 * Register a tokenization support factory.
 	 */
-	registerFactory(languageId: string, factory: ILazyTokenizationSupport): IDisposable;
+	registerFactory(languageId: string, factory: ILazyTokenizationSupport<TSupport>): IDisposable;
 
 	/**
 	 * Get or create the tokenization support for a language.
 	 * Returns `null` if not found.
 	 */
-	getOrCreate(languageId: string): Promise<ITokenizationSupport | null>;
+	getOrCreate(languageId: string): Promise<TSupport | null>;
 
 	/**
 	 * Get the tokenization support for a language.
 	 * Returns `null` if not found.
 	 */
-	get(languageId: string): ITokenizationSupport | null;
+	get(languageId: string): TSupport | null;
 
 	/**
 	 * Returns false if a factory is still pending.
@@ -2184,8 +2219,12 @@ export interface ITokenizationRegistry {
 /**
  * @internal
  */
-export const TokenizationRegistry: ITokenizationRegistry = new TokenizationRegistryImpl();
+export const TokenizationRegistry: ITokenizationRegistry<ITokenizationSupport> = new TokenizationRegistryImpl();
 
+/**
+ * @internal
+ */
+export const TreeSitterTokenizationRegistry: ITokenizationRegistry<ITreeSitterTokenizationSupport> = new TokenizationRegistryImpl();
 
 /**
  * @internal
@@ -2214,6 +2253,14 @@ export interface DocumentDropEdit {
 	additionalEdit?: WorkspaceEdit;
 }
 
+/**
+ * @internal
+ */
+export interface DocumentDropEditsSession {
+	edits: readonly DocumentDropEdit[];
+	dispose(): void;
+}
+
 /**
  * @internal
  */
@@ -2221,7 +2268,7 @@ export interface DocumentDropEditProvider {
 	readonly id?: string;
 	readonly dropMimeTypes?: readonly string[];
 
-	provideDocumentDropEdits(model: model.ITextModel, position: IPosition, dataTransfer: IReadonlyVSDataTransfer, token: CancellationToken): ProviderResult<DocumentDropEdit[]>;
+	provideDocumentDropEdits(model: model.ITextModel, position: IPosition, dataTransfer: IReadonlyVSDataTransfer, token: CancellationToken): ProviderResult<DocumentDropEditsSession>;
 	resolveDocumentDropEdit?(edit: DocumentDropEdit, token: CancellationToken): Promise<DocumentDropEdit>;
 }
 
@@ -2233,17 +2280,42 @@ export interface DocumentContextItem {
 
 export interface MappedEditsContext {
 	/** The outer array is sorted by priority - from highest to lowest. The inner arrays contain elements of the same priority. */
-	documents: DocumentContextItem[][];
+	readonly documents: DocumentContextItem[][];
+	/**
+	 * @internal
+	 */
+	readonly conversation?: (ConversationRequest | ConversationResponse)[];
+}
+
+/**
+ * @internal
+ */
+export interface ConversationRequest {
+	readonly type: 'request';
+	readonly message: string;
+}
+
+/**
+ * @internal
+ */
+export interface ConversationResponse {
+	readonly type: 'response';
+	readonly message: string;
+	readonly references?: DocumentContextItem[];
 }
 
 export interface MappedEditsProvider {
+	/**
+	 * @internal
+	 */
+	readonly displayName: string; // internal
 
 	/**
 	 * Provider maps code blocks from the chat into a workspace edit.
 	 *
 	 * @param document The document to provide mapped edits for.
 	 * @param codeBlocks Code blocks that come from an LLM's reply.
-	 * 						"Insert at cursor" in the panel chat only sends one edit that the user clicks on, but inline chat can send multiple blocks and let the lang server decide what to do with them.
+	 * 						"Apply in Editor" in the panel chat only sends one edit that the user clicks on, but inline chat can send multiple blocks and let the lang server decide what to do with them.
 	 * @param context The context for providing mapped edits.
 	 * @param token A cancellation token.
 	 * @returns A provider result of text edits.
diff --git a/src/vs/editor/common/languages/autoIndent.ts b/src/vs/editor/common/languages/autoIndent.ts
index 680d3a7d5f9..d2083853ead 100644
--- a/src/vs/editor/common/languages/autoIndent.ts
+++ b/src/vs/editor/common/languages/autoIndent.ts
@@ -3,15 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as strings from 'vs/base/common/strings';
-import { Range } from 'vs/editor/common/core/range';
-import { ITextModel } from 'vs/editor/common/model';
-import { IndentAction } from 'vs/editor/common/languages/languageConfiguration';
-import { IndentConsts } from 'vs/editor/common/languages/supports/indentRules';
-import { EditorAutoIndentStrategy } from 'vs/editor/common/config/editorOptions';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { IViewLineTokens } from 'vs/editor/common/tokens/lineTokens';
-import { IndentationContextProcessor, isLanguageDifferentFromLineStart, ProcessedIndentRulesSupport } from 'vs/editor/common/languages/supports/indentationLineProcessor';
+import * as strings from '../../../base/common/strings.js';
+import { Range } from '../core/range.js';
+import { ITextModel } from '../model.js';
+import { IndentAction } from './languageConfiguration.js';
+import { IndentConsts } from './supports/indentRules.js';
+import { EditorAutoIndentStrategy } from '../config/editorOptions.js';
+import { ILanguageConfigurationService } from './languageConfigurationRegistry.js';
+import { IViewLineTokens } from '../tokens/lineTokens.js';
+import { IndentationContextProcessor, isLanguageDifferentFromLineStart, ProcessedIndentRulesSupport } from './supports/indentationLineProcessor.js';
+import { CursorConfiguration } from '../cursorCommon.js';
 
 export interface IVirtualModel {
 	tokenization: {
@@ -357,13 +358,14 @@ export function getIndentForEnter(
  * this line doesn't match decreaseIndentPattern, we should not adjust the indentation.
  */
 export function getIndentActionForType(
-	autoIndent: EditorAutoIndentStrategy,
+	cursorConfig: CursorConfiguration,
 	model: ITextModel,
 	range: Range,
 	ch: string,
 	indentConverter: IIndentConverter,
 	languageConfigurationService: ILanguageConfigurationService
 ): string | null {
+	const autoIndent = cursorConfig.autoIndent;
 	if (autoIndent < EditorAutoIndentStrategy.Full) {
 		return null;
 	}
@@ -404,6 +406,29 @@ export function getIndentActionForType(
 		return indentation;
 	}
 
+	const previousLineNumber = range.startLineNumber - 1;
+	if (previousLineNumber > 0) {
+		const previousLine = model.getLineContent(previousLineNumber);
+		if (indentRulesSupport.shouldIndentNextLine(previousLine) && indentRulesSupport.shouldIncrease(textAroundRangeWithCharacter)) {
+			const inheritedIndentationData = getInheritIndentForLine(autoIndent, model, range.startLineNumber, false, languageConfigurationService);
+			const inheritedIndentation = inheritedIndentationData?.indentation;
+			if (inheritedIndentation !== undefined) {
+				const currentLine = model.getLineContent(range.startLineNumber);
+				const actualCurrentIndentation = strings.getLeadingWhitespace(currentLine);
+				const inferredCurrentIndentation = indentConverter.shiftIndent(inheritedIndentation);
+				// If the inferred current indentation is not equal to the actual current indentation, then the indentation has been intentionally changed, in that case keep it
+				const inferredIndentationEqualsActual = inferredCurrentIndentation === actualCurrentIndentation;
+				const textAroundRangeContainsOnlyWhitespace = /^\s*$/.test(textAroundRange);
+				const autoClosingPairs = cursorConfig.autoClosingPairs.autoClosingPairsOpenByEnd.get(ch);
+				const autoClosingPairExists = autoClosingPairs && autoClosingPairs.length > 0;
+				const isChFirstNonWhitespaceCharacterAndInAutoClosingPair = autoClosingPairExists && textAroundRangeContainsOnlyWhitespace;
+				if (inferredIndentationEqualsActual && isChFirstNonWhitespaceCharacterAndInAutoClosingPair) {
+					return inheritedIndentation;
+				}
+			}
+		}
+	}
+
 	return null;
 }
 
diff --git a/src/vs/editor/common/languages/defaultDocumentColorsComputer.ts b/src/vs/editor/common/languages/defaultDocumentColorsComputer.ts
index 02e447145b7..c188113e8a2 100644
--- a/src/vs/editor/common/languages/defaultDocumentColorsComputer.ts
+++ b/src/vs/editor/common/languages/defaultDocumentColorsComputer.ts
@@ -2,10 +2,10 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { Color, HSLA } from 'vs/base/common/color';
-import { IPosition } from 'vs/editor/common/core/position';
-import { IRange } from 'vs/editor/common/core/range';
-import { IColor, IColorInformation } from 'vs/editor/common/languages';
+import { Color, HSLA } from '../../../base/common/color.js';
+import { IPosition } from '../core/position.js';
+import { IRange } from '../core/range.js';
+import { IColor, IColorInformation } from '../languages.js';
 
 export interface IDocumentColorComputerTarget {
 	getValue(): string;
diff --git a/src/vs/editor/common/languages/enterAction.ts b/src/vs/editor/common/languages/enterAction.ts
index 27669db6ebe..454cc1e5b53 100644
--- a/src/vs/editor/common/languages/enterAction.ts
+++ b/src/vs/editor/common/languages/enterAction.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Range } from 'vs/editor/common/core/range';
-import { ITextModel } from 'vs/editor/common/model';
-import { IndentAction, CompleteEnterAction } from 'vs/editor/common/languages/languageConfiguration';
-import { EditorAutoIndentStrategy } from 'vs/editor/common/config/editorOptions';
-import { getIndentationAtPosition, ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { IndentationContextProcessor } from 'vs/editor/common/languages/supports/indentationLineProcessor';
+import { Range } from '../core/range.js';
+import { ITextModel } from '../model.js';
+import { IndentAction, CompleteEnterAction } from './languageConfiguration.js';
+import { EditorAutoIndentStrategy } from '../config/editorOptions.js';
+import { getIndentationAtPosition, ILanguageConfigurationService } from './languageConfigurationRegistry.js';
+import { IndentationContextProcessor } from './supports/indentationLineProcessor.js';
 
 export function getEnterAction(
 	autoIndent: EditorAutoIndentStrategy,
diff --git a/src/vs/editor/common/languages/highlights/typescript.scm b/src/vs/editor/common/languages/highlights/typescript.scm
new file mode 100644
index 00000000000..5f6a6796883
--- /dev/null
+++ b/src/vs/editor/common/languages/highlights/typescript.scm
@@ -0,0 +1,321 @@
+; Order matters! Place lower precedence first.
+; Adapted from https://github.com/zed-industries/zed/blob/main/crates/languages/src/typescript/highlights.scm
+
+; Variables
+
+(identifier) @variable
+
+; Literals
+
+(this) @variable.language.this
+(super) @variable.language.super
+
+(comment) @comment
+
+; TODO: This doesn't seem to be working
+(escape_sequence) @constant.character.escape
+
+[
+  (string)
+  (template_string)
+  (template_literal_type)
+] @string
+
+; NOTE: the typescript grammar doesn't break regex into nice parts so as to capture parts of it separately
+(regex) @string.regexp
+(number) @constant.numeric
+
+; Template TODO: These don't seem to be working
+
+(template_substitution
+  "${" @punctuation.definition.template-expression.begin
+  "}" @punctuation.definition.template-expression.end)
+
+(template_type
+  "${" @punctuation.definition.template-expression.begin
+  "}" @punctuation.definition.template-expression.end)
+
+(type_arguments
+  "<" @punctuation.bracket
+  ">" @punctuation.bracket)
+
+; Properties
+
+(member_expression
+  object: (this)
+  property: (property_identifier) @variable)
+
+(member_expression
+  property: (property_identifier) @variable.other.constant
+  (#match? @variable.other.constant "^[A-Z][A-Z_]+$"))
+
+[
+  (property_identifier)
+  (shorthand_property_identifier)
+  (shorthand_property_identifier_pattern)] @variable
+
+; Function and method definitions
+
+(function_expression
+  name: (identifier) @entity.name.function)
+(function_declaration
+  name: (identifier) @entity.name.function)
+(method_definition
+  name: (property_identifier) @meta.definition.method @entity.name.function
+  (#not-eq? @entity.name.function "constructor"))
+(method_definition
+  name: (property_identifier) @meta.definition.method @storage.type
+  (#eq? @storage.type "constructor"))
+(method_signature
+  name: (property_identifier) @meta.definition.method @entity.name.function)
+
+(pair
+  key: (property_identifier) @entity.name.function
+  value: [(function_expression) (arrow_function)])
+
+(assignment_expression
+  left: (member_expression
+    property: (property_identifier) @entity.name.function)
+  right: [(function_expression) (arrow_function)])
+
+(variable_declarator
+  name: (identifier) @entity.name.function
+  value: [(function_expression) (arrow_function)])
+
+(assignment_expression
+  left: (identifier) @entity.name.function
+  right: [(function_expression) (arrow_function)])
+
+; Function and method calls
+
+(call_expression
+  function: (identifier) @entity.name.function)
+
+(call_expression
+  function: (member_expression
+  	object: (identifier) @support.class.promise)
+    (#eq? @support.class.promise "Promise"))
+
+(call_expression
+  function: (member_expression
+    property: (property_identifier) @entity.name.function))
+
+(new_expression
+  constructor: (identifier) @entity.name.function)
+
+
+; Special identifiers
+
+(predefined_type) @support.type
+(predefined_type (["string" "boolean" "number" "any"])) @support.type.primitive
+(type_identifier) @entity.name.type
+
+([
+  (identifier)
+  (shorthand_property_identifier)
+  (shorthand_property_identifier_pattern)] @variable.other.constant
+  (#match? @variable.other.constant "^[A-Z][A-Z_]+$"))
+
+(extends_clause
+  value: (identifier) @entity.other.inherited-class)
+
+; Tokens
+
+[
+  ";"
+  "?."
+  "."
+  ","
+  ":"
+  "?"
+] @punctuation.delimiter
+
+[
+  "!"
+  "~"
+  "==="
+  "!=="
+  "&&"
+  "||"
+  "??"
+] @keyword.operator.logical
+
+(binary_expression ([
+  "-"
+  "+"
+  "*"
+  "/"
+  "%"
+  "^"
+]) @keyword.operator.arithmetic)
+
+(binary_expression ([
+  "<"
+  "<="
+  ">"
+  ">="
+]) @keyword.operator.relational)
+
+[
+  "="
+] @keyword.operator.assignment
+
+(augmented_assignment_expression ([
+  "-="
+  "+="
+  "*="
+  "/="
+  "%="
+  "^="
+  "&="
+  "|="
+  "&&="
+  "||="
+  "??="
+]) @keyword.operator.assignment.compound)
+
+[
+  "++"
+] @keyword.operator.increment
+
+[
+  "--"
+] @keyword.operator.decrement
+
+[
+  "**"
+  "**="
+  "<<"
+  "<<="
+  "=="
+  "!="
+  ">>"
+  ">>="
+  ">>>"
+  ">>>="
+  "~"
+  "&"
+  "|"
+] @keyword.operator
+
+; Keywords
+
+("typeof") @keyword.operator.expression.typeof
+
+(binary_expression "instanceof" @keyword.operator.expression.instanceof)
+
+("of") @keyword.operator.expression.of
+
+("is") @keyword.operator.expression.is
+
+[
+  "delete"
+  "in"
+  "infer"
+  "keyof"
+] @keyword.operator.expression
+
+[
+  "as"
+  "await"
+  "break"
+  "case"
+  "catch"
+  "continue"
+  "default"
+  "do"
+  "else"
+  "export"
+  "finally"
+  "for"
+  "from"
+  "if"
+  "import"
+  "require"
+  "return"
+  "satisfies"
+  "switch"
+  "throw"
+  "try"
+  "type"
+  "while"
+  "yield"
+] @keyword.control
+
+[
+  "abstract"
+  "async"
+  "declare"
+  "extends"
+  "implements"
+  "override"
+  "private"
+  "protected"
+  "public"
+  "readonly"
+  "static"
+] @storage.modifier
+
+[
+  "=>"
+  "class"
+  "const"
+  "enum"
+  "function"
+  "get"
+  "interface"
+  "let"
+  "namespace"
+  "set"
+  "var"
+] @storage.type
+
+[
+  "debugger"
+  "target"
+  "with"
+] @keyword
+
+(regex_flags) @keyword
+
+[
+  "void"
+] @support.type.primitive
+
+[
+  "new"
+] @keyword.operator.new
+
+(public_field_definition
+  ("?") @keyword.operator.optional)
+
+(optional_parameter)
+  ([
+    "?"
+    ":"
+  ]) @keyword.operator.optional
+
+(ternary_expression
+  ([
+    "?"
+    ":"
+  ]) @keyword.operator.ternary)
+
+(optional_chain
+  ("?.") @punctuation.accessor.optional)
+
+(rest_pattern) @keyword.operator.rest
+
+(spread_element) @keyword.operator.spread
+
+; Language constants
+
+[
+  (true)
+  (false)
+  (null)
+  (undefined)
+] @constant.language
+
+(namespace_import
+  "*" @constant.language)
diff --git a/src/vs/editor/common/languages/language.ts b/src/vs/editor/common/languages/language.ts
index f0be928ea73..065ab092af2 100644
--- a/src/vs/editor/common/languages/language.ts
+++ b/src/vs/editor/common/languages/language.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { ILanguageIdCodec } from 'vs/editor/common/languages';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { Event } from '../../../base/common/event.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { URI } from '../../../base/common/uri.js';
+import { ILanguageIdCodec } from '../languages.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
 
 export const ILanguageService = createDecorator<ILanguageService>('languageService');
 
diff --git a/src/vs/editor/common/languages/languageConfiguration.ts b/src/vs/editor/common/languages/languageConfiguration.ts
index 69b852e407c..b6aa902f78a 100644
--- a/src/vs/editor/common/languages/languageConfiguration.ts
+++ b/src/vs/editor/common/languages/languageConfiguration.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
-import { StandardTokenType } from 'vs/editor/common/encodedTokenAttributes';
-import { ScopedLineTokens } from 'vs/editor/common/languages/supports';
+import { CharCode } from '../../../base/common/charCode.js';
+import { StandardTokenType } from '../encodedTokenAttributes.js';
+import { ScopedLineTokens } from './supports.js';
 
 /**
  * Describes how comments for a language work.
diff --git a/src/vs/editor/common/languages/languageConfigurationRegistry.ts b/src/vs/editor/common/languages/languageConfigurationRegistry.ts
index 7ff5ddec8a6..bf0516d531b 100644
--- a/src/vs/editor/common/languages/languageConfigurationRegistry.ts
+++ b/src/vs/editor/common/languages/languageConfigurationRegistry.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import * as strings from 'vs/base/common/strings';
-import { ITextModel } from 'vs/editor/common/model';
-import { DEFAULT_WORD_REGEXP, ensureValidWordDefinition } from 'vs/editor/common/core/wordHelper';
-import { EnterAction, FoldingRules, IAutoClosingPair, IndentationRule, LanguageConfiguration, AutoClosingPairs, CharacterPair, ExplicitLanguageConfiguration } from 'vs/editor/common/languages/languageConfiguration';
-import { CharacterPairSupport } from 'vs/editor/common/languages/supports/characterPair';
-import { BracketElectricCharacterSupport } from 'vs/editor/common/languages/supports/electricCharacter';
-import { IndentRulesSupport } from 'vs/editor/common/languages/supports/indentRules';
-import { OnEnterSupport } from 'vs/editor/common/languages/supports/onEnter';
-import { RichEditBrackets } from 'vs/editor/common/languages/supports/richEditBrackets';
-import { EditorAutoIndentStrategy } from 'vs/editor/common/config/editorOptions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { LanguageBracketsConfiguration } from 'vs/editor/common/languages/supports/languageBracketsConfiguration';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import * as strings from '../../../base/common/strings.js';
+import { ITextModel } from '../model.js';
+import { DEFAULT_WORD_REGEXP, ensureValidWordDefinition } from '../core/wordHelper.js';
+import { EnterAction, FoldingRules, IAutoClosingPair, IndentationRule, LanguageConfiguration, AutoClosingPairs, CharacterPair, ExplicitLanguageConfiguration } from './languageConfiguration.js';
+import { CharacterPairSupport } from './supports/characterPair.js';
+import { BracketElectricCharacterSupport } from './supports/electricCharacter.js';
+import { IndentRulesSupport } from './supports/indentRules.js';
+import { OnEnterSupport } from './supports/onEnter.js';
+import { RichEditBrackets } from './supports/richEditBrackets.js';
+import { EditorAutoIndentStrategy } from '../config/editorOptions.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
+import { ILanguageService } from './language.js';
+import { InstantiationType, registerSingleton } from '../../../platform/instantiation/common/extensions.js';
+import { PLAINTEXT_LANGUAGE_ID } from './modesRegistry.js';
+import { LanguageBracketsConfiguration } from './supports/languageBracketsConfiguration.js';
 
 /**
  * Interface used to support insertion of mode specific comments.
diff --git a/src/vs/editor/common/languages/linkComputer.ts b/src/vs/editor/common/languages/linkComputer.ts
index 52f4eaee2fb..2c954d7f374 100644
--- a/src/vs/editor/common/languages/linkComputer.ts
+++ b/src/vs/editor/common/languages/linkComputer.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
-import { CharacterClassifier } from 'vs/editor/common/core/characterClassifier';
-import { ILink } from 'vs/editor/common/languages';
+import { CharCode } from '../../../base/common/charCode.js';
+import { CharacterClassifier } from '../core/characterClassifier.js';
+import { ILink } from '../languages.js';
 
 export interface ILinkComputerTarget {
 	getLineCount(): number;
diff --git a/src/vs/editor/common/languages/modesRegistry.ts b/src/vs/editor/common/languages/modesRegistry.ts
index 7376d0c069b..871265804d2 100644
--- a/src/vs/editor/common/languages/modesRegistry.ts
+++ b/src/vs/editor/common/languages/modesRegistry.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { Emitter, Event } from 'vs/base/common/event';
-import { ILanguageExtensionPoint } from 'vs/editor/common/languages/language';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { Mimes } from 'vs/base/common/mime';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
+import * as nls from '../../../nls.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { ILanguageExtensionPoint } from './language.js';
+import { Registry } from '../../../platform/registry/common/platform.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { Mimes } from '../../../base/common/mime.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from '../../../platform/configuration/common/configurationRegistry.js';
 
 // Define extension point ids
 export const Extensions = {
diff --git a/src/vs/editor/common/languages/nullTokenize.ts b/src/vs/editor/common/languages/nullTokenize.ts
index 2bf77a6acd8..8966ab8b734 100644
--- a/src/vs/editor/common/languages/nullTokenize.ts
+++ b/src/vs/editor/common/languages/nullTokenize.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Token, TokenizationResult, EncodedTokenizationResult, IState } from 'vs/editor/common/languages';
-import { LanguageId, FontStyle, ColorId, StandardTokenType, MetadataConsts } from 'vs/editor/common/encodedTokenAttributes';
+import { Token, TokenizationResult, EncodedTokenizationResult, IState } from '../languages.js';
+import { LanguageId, FontStyle, ColorId, StandardTokenType, MetadataConsts } from '../encodedTokenAttributes.js';
 
 export const NullState: IState = new class implements IState {
 	public clone(): IState {
diff --git a/src/vs/editor/common/languages/supports.ts b/src/vs/editor/common/languages/supports.ts
index 730fa2a1b73..10e352b96d2 100644
--- a/src/vs/editor/common/languages/supports.ts
+++ b/src/vs/editor/common/languages/supports.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IViewLineTokens, LineTokens } from 'vs/editor/common/tokens/lineTokens';
-import { StandardTokenType } from 'vs/editor/common/encodedTokenAttributes';
-import { ILanguageIdCodec } from 'vs/editor/common/languages';
+import { IViewLineTokens, LineTokens } from '../tokens/lineTokens.js';
+import { StandardTokenType } from '../encodedTokenAttributes.js';
+import { ILanguageIdCodec } from '../languages.js';
 
 export function createScopedLineTokens(context: LineTokens, offset: number): ScopedLineTokens {
 	const tokenCount = context.getCount();
diff --git a/src/vs/editor/common/languages/supports/characterPair.ts b/src/vs/editor/common/languages/supports/characterPair.ts
index 18eee773dd2..37fd6c968a9 100644
--- a/src/vs/editor/common/languages/supports/characterPair.ts
+++ b/src/vs/editor/common/languages/supports/characterPair.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IAutoClosingPair, StandardAutoClosingPairConditional, LanguageConfiguration } from 'vs/editor/common/languages/languageConfiguration';
+import { IAutoClosingPair, StandardAutoClosingPairConditional, LanguageConfiguration } from '../languageConfiguration.js';
 
 export class CharacterPairSupport {
 
diff --git a/src/vs/editor/common/languages/supports/electricCharacter.ts b/src/vs/editor/common/languages/supports/electricCharacter.ts
index 0aa80d23edb..23a78745a8c 100644
--- a/src/vs/editor/common/languages/supports/electricCharacter.ts
+++ b/src/vs/editor/common/languages/supports/electricCharacter.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { distinct } from 'vs/base/common/arrays';
-import { ScopedLineTokens, ignoreBracketsInToken } from 'vs/editor/common/languages/supports';
-import { BracketsUtils, RichEditBrackets } from 'vs/editor/common/languages/supports/richEditBrackets';
+import { distinct } from '../../../../base/common/arrays.js';
+import { ScopedLineTokens, ignoreBracketsInToken } from '../supports.js';
+import { BracketsUtils, RichEditBrackets } from './richEditBrackets.js';
 
 /**
  * Interface used to support electric characters
diff --git a/src/vs/editor/common/languages/supports/indentRules.ts b/src/vs/editor/common/languages/supports/indentRules.ts
index 6bb319dbd7e..09b70e31a0e 100644
--- a/src/vs/editor/common/languages/supports/indentRules.ts
+++ b/src/vs/editor/common/languages/supports/indentRules.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IndentationRule } from 'vs/editor/common/languages/languageConfiguration';
+import { IndentationRule } from '../languageConfiguration.js';
 
 export const enum IndentConsts {
 	INCREASE_MASK = 0b00000001,
diff --git a/src/vs/editor/common/languages/supports/indentationLineProcessor.ts b/src/vs/editor/common/languages/supports/indentationLineProcessor.ts
index 919cb3cd4c8..762c13e4eb4 100644
--- a/src/vs/editor/common/languages/supports/indentationLineProcessor.ts
+++ b/src/vs/editor/common/languages/supports/indentationLineProcessor.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as strings from 'vs/base/common/strings';
-import { Range } from 'vs/editor/common/core/range';
-import { ITextModel } from 'vs/editor/common/model';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { createScopedLineTokens, ScopedLineTokens } from 'vs/editor/common/languages/supports';
-import { IVirtualModel } from 'vs/editor/common/languages/autoIndent';
-import { IViewLineTokens, LineTokens } from 'vs/editor/common/tokens/lineTokens';
-import { IndentRulesSupport } from 'vs/editor/common/languages/supports/indentRules';
-import { StandardTokenType } from 'vs/editor/common/encodedTokenAttributes';
-import { Position } from 'vs/editor/common/core/position';
+import * as strings from '../../../../base/common/strings.js';
+import { Range } from '../../core/range.js';
+import { ITextModel } from '../../model.js';
+import { ILanguageConfigurationService } from '../languageConfigurationRegistry.js';
+import { createScopedLineTokens, ScopedLineTokens } from '../supports.js';
+import { IVirtualModel } from '../autoIndent.js';
+import { IViewLineTokens, LineTokens } from '../../tokens/lineTokens.js';
+import { IndentRulesSupport } from './indentRules.js';
+import { StandardTokenType } from '../../encodedTokenAttributes.js';
+import { Position } from '../../core/position.js';
 
 /**
  * This class is a wrapper class around {@link IndentRulesSupport}.
diff --git a/src/vs/editor/common/languages/supports/inplaceReplaceSupport.ts b/src/vs/editor/common/languages/supports/inplaceReplaceSupport.ts
index 93f2e892f8d..f4443b24b94 100644
--- a/src/vs/editor/common/languages/supports/inplaceReplaceSupport.ts
+++ b/src/vs/editor/common/languages/supports/inplaceReplaceSupport.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IRange } from 'vs/editor/common/core/range';
-import { IInplaceReplaceSupportResult } from 'vs/editor/common/languages';
+import { IRange } from '../../core/range.js';
+import { IInplaceReplaceSupportResult } from '../../languages.js';
 
 export class BasicInplaceReplace {
 
diff --git a/src/vs/editor/common/languages/supports/languageBracketsConfiguration.ts b/src/vs/editor/common/languages/supports/languageBracketsConfiguration.ts
index 4989395b264..f3f1205f18e 100644
--- a/src/vs/editor/common/languages/supports/languageBracketsConfiguration.ts
+++ b/src/vs/editor/common/languages/supports/languageBracketsConfiguration.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CachedFunction } from 'vs/base/common/cache';
-import { RegExpOptions } from 'vs/base/common/strings';
-import { LanguageConfiguration } from 'vs/editor/common/languages/languageConfiguration';
-import { createBracketOrRegExp } from 'vs/editor/common/languages/supports/richEditBrackets';
+import { CachedFunction } from '../../../../base/common/cache.js';
+import { RegExpOptions } from '../../../../base/common/strings.js';
+import { LanguageConfiguration } from '../languageConfiguration.js';
+import { createBracketOrRegExp } from './richEditBrackets.js';
 
 /**
  * Captures all bracket related configurations for a single language.
diff --git a/src/vs/editor/common/languages/supports/onEnter.ts b/src/vs/editor/common/languages/supports/onEnter.ts
index 5952586199b..322ae2d2991 100644
--- a/src/vs/editor/common/languages/supports/onEnter.ts
+++ b/src/vs/editor/common/languages/supports/onEnter.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { onUnexpectedError } from 'vs/base/common/errors';
-import * as strings from 'vs/base/common/strings';
-import { CharacterPair, EnterAction, IndentAction, OnEnterRule } from 'vs/editor/common/languages/languageConfiguration';
-import { EditorAutoIndentStrategy } from 'vs/editor/common/config/editorOptions';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import * as strings from '../../../../base/common/strings.js';
+import { CharacterPair, EnterAction, IndentAction, OnEnterRule } from '../languageConfiguration.js';
+import { EditorAutoIndentStrategy } from '../../config/editorOptions.js';
 
 export interface IOnEnterSupportOptions {
 	brackets?: CharacterPair[];
diff --git a/src/vs/editor/common/languages/supports/richEditBrackets.ts b/src/vs/editor/common/languages/supports/richEditBrackets.ts
index 7733719f049..c6436e60ef4 100644
--- a/src/vs/editor/common/languages/supports/richEditBrackets.ts
+++ b/src/vs/editor/common/languages/supports/richEditBrackets.ts
@@ -3,11 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as strings from 'vs/base/common/strings';
-import * as stringBuilder from 'vs/editor/common/core/stringBuilder';
-import { Range } from 'vs/editor/common/core/range';
-import { CharacterPair } from 'vs/editor/common/languages/languageConfiguration';
-import { RegExpOptions } from 'vs/base/common/strings';
+import * as strings from '../../../../base/common/strings.js';
+import * as stringBuilder from '../../core/stringBuilder.js';
+import { Range } from '../../core/range.js';
+import { CharacterPair } from '../languageConfiguration.js';
 
 interface InternalBracket {
 	open: string[];
@@ -409,7 +408,7 @@ function prepareBracketForRegExp(str: string): string {
 	return (insertWordBoundaries ? `\\b${str}\\b` : str);
 }
 
-export function createBracketOrRegExp(pieces: string[], options?: RegExpOptions): RegExp {
+export function createBracketOrRegExp(pieces: string[], options?: strings.RegExpOptions): RegExp {
 	const regexStr = `(${pieces.map(prepareBracketForRegExp).join(')|(')})`;
 	return strings.createRegExp(regexStr, true, options);
 }
diff --git a/src/vs/editor/common/languages/supports/tokenization.ts b/src/vs/editor/common/languages/supports/tokenization.ts
index 7fa14b20a5c..f6322a09dda 100644
--- a/src/vs/editor/common/languages/supports/tokenization.ts
+++ b/src/vs/editor/common/languages/supports/tokenization.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Color } from 'vs/base/common/color';
-import { LanguageId, FontStyle, ColorId, StandardTokenType, MetadataConsts } from 'vs/editor/common/encodedTokenAttributes';
+import { Color } from '../../../../base/common/color.js';
+import { LanguageId, FontStyle, ColorId, StandardTokenType, MetadataConsts } from '../../encodedTokenAttributes.js';
 
 export interface ITokenThemeRule {
 	token: string;
diff --git a/src/vs/editor/common/languages/textToHtmlTokenizer.ts b/src/vs/editor/common/languages/textToHtmlTokenizer.ts
index 66651f25410..b0745eda9f8 100644
--- a/src/vs/editor/common/languages/textToHtmlTokenizer.ts
+++ b/src/vs/editor/common/languages/textToHtmlTokenizer.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
-import * as strings from 'vs/base/common/strings';
-import { IViewLineTokens, LineTokens } from 'vs/editor/common/tokens/lineTokens';
-import { ILanguageIdCodec, IState, ITokenizationSupport, TokenizationRegistry } from 'vs/editor/common/languages';
-import { LanguageId } from 'vs/editor/common/encodedTokenAttributes';
-import { NullState, nullTokenizeEncoded } from 'vs/editor/common/languages/nullTokenize';
-import { ILanguageService } from 'vs/editor/common/languages/language';
+import { CharCode } from '../../../base/common/charCode.js';
+import * as strings from '../../../base/common/strings.js';
+import { IViewLineTokens, LineTokens } from '../tokens/lineTokens.js';
+import { ILanguageIdCodec, IState, ITokenizationSupport, TokenizationRegistry } from '../languages.js';
+import { LanguageId } from '../encodedTokenAttributes.js';
+import { NullState, nullTokenizeEncoded } from './nullTokenize.js';
+import { ILanguageService } from './language.js';
 
 export type IReducedTokenizationSupport = Omit<ITokenizationSupport, 'tokenize'>;
 
diff --git a/src/vs/editor/common/model.ts b/src/vs/editor/common/model.ts
index e21aa7d600c..640d694083c 100644
--- a/src/vs/editor/common/model.ts
+++ b/src/vs/editor/common/model.ts
@@ -3,26 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { equals } from 'vs/base/common/objects';
-import { ThemeColor } from 'vs/base/common/themables';
-import { URI } from 'vs/base/common/uri';
-import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { TextChange } from 'vs/editor/common/core/textChange';
-import { WordCharacterClassifier } from 'vs/editor/common/core/wordCharacterClassifier';
-import { IWordAtPosition } from 'vs/editor/common/core/wordHelper';
-import { FormattingOptions } from 'vs/editor/common/languages';
-import { ILanguageSelection } from 'vs/editor/common/languages/language';
-import { IBracketPairsTextModelPart } from 'vs/editor/common/textModelBracketPairs';
-import { IModelContentChange, IModelContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguageChangedEvent, IModelLanguageConfigurationChangedEvent, IModelOptionsChangedEvent, IModelTokensChangedEvent, InternalModelContentChangeEvent, ModelInjectedTextChangedEvent } from 'vs/editor/common/textModelEvents';
-import { IGuidesTextModelPart } from 'vs/editor/common/textModelGuides';
-import { ITokenizationTextModelPart } from 'vs/editor/common/tokenizationTextModelPart';
-import { UndoRedoGroup } from 'vs/platform/undoRedo/common/undoRedo';
+import { Event } from '../../base/common/event.js';
+import { IMarkdownString } from '../../base/common/htmlContent.js';
+import { IDisposable } from '../../base/common/lifecycle.js';
+import { equals } from '../../base/common/objects.js';
+import { ThemeColor } from '../../base/common/themables.js';
+import { URI } from '../../base/common/uri.js';
+import { ISingleEditOperation } from './core/editOperation.js';
+import { IPosition, Position } from './core/position.js';
+import { IRange, Range } from './core/range.js';
+import { Selection } from './core/selection.js';
+import { TextChange } from './core/textChange.js';
+import { WordCharacterClassifier } from './core/wordCharacterClassifier.js';
+import { IWordAtPosition } from './core/wordHelper.js';
+import { FormattingOptions } from './languages.js';
+import { ILanguageSelection } from './languages/language.js';
+import { IBracketPairsTextModelPart } from './textModelBracketPairs.js';
+import { IModelContentChange, IModelContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguageChangedEvent, IModelLanguageConfigurationChangedEvent, IModelOptionsChangedEvent, IModelTokensChangedEvent, InternalModelContentChangeEvent, ModelInjectedTextChangedEvent } from './textModelEvents.js';
+import { IGuidesTextModelPart } from './textModelGuides.js';
+import { ITokenizationTextModelPart } from './tokenizationTextModelPart.js';
+import { UndoRedoGroup } from '../../platform/undoRedo/common/undoRedo.js';
+import { TokenArray } from './tokens/tokenArray.js';
 
 /**
  * Vertical Lane in the overview ruler of the editor.
@@ -286,6 +287,11 @@ export interface InjectedTextOptions {
 	 */
 	readonly content: string;
 
+	/**
+	 * @internal
+	*/
+	readonly tokens?: TokenArray | null;
+
 	/**
 	 * If set, the decoration will be rendered inline with the text with this CSS class name.
 	 */
@@ -1428,9 +1434,16 @@ export interface IReadonlyTextBuffer {
 	getLineCharCode(lineNumber: number, index: number): number;
 	getCharCode(offset: number): number;
 	getLineLength(lineNumber: number): number;
+	getLineMinColumn(lineNumber: number): number;
+	getLineMaxColumn(lineNumber: number): number;
 	getLineFirstNonWhitespaceColumn(lineNumber: number): number;
 	getLineLastNonWhitespaceColumn(lineNumber: number): number;
 	findMatchesLineByLine(searchRange: Range, searchData: SearchData, captureMatches: boolean, limitResultCount: number): FindMatch[];
+
+	/**
+	 * Get nearest chunk of text after `offset` in the text buffer.
+	 */
+	getNearestChunk(offset: number): string;
 }
 
 /**
diff --git a/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsImpl.ts b/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsImpl.ts
index 3d3fe2e3649..546daf83fdc 100644
--- a/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsImpl.ts
+++ b/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsImpl.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CallbackIterable, compareBy } from 'vs/base/common/arrays';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable, DisposableStore, IDisposable, IReference, MutableDisposable } from 'vs/base/common/lifecycle';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { ILanguageConfigurationService, LanguageConfigurationServiceChangeEvent } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { ignoreBracketsInToken } from 'vs/editor/common/languages/supports';
-import { LanguageBracketsConfiguration } from 'vs/editor/common/languages/supports/languageBracketsConfiguration';
-import { BracketsUtils, RichEditBracket, RichEditBrackets } from 'vs/editor/common/languages/supports/richEditBrackets';
-import { BracketPairsTree } from 'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/bracketPairsTree';
-import { TextModel } from 'vs/editor/common/model/textModel';
-import { BracketInfo, BracketPairInfo, BracketPairWithMinIndentationInfo, IBracketPairsTextModelPart, IFoundBracket } from 'vs/editor/common/textModelBracketPairs';
-import { IModelContentChangedEvent, IModelLanguageChangedEvent, IModelOptionsChangedEvent, IModelTokensChangedEvent } from 'vs/editor/common/textModelEvents';
-import { LineTokens } from 'vs/editor/common/tokens/lineTokens';
+import { CallbackIterable, compareBy } from '../../../../base/common/arrays.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable, DisposableStore, IDisposable, IReference, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { IPosition, Position } from '../../core/position.js';
+import { Range } from '../../core/range.js';
+import { ILanguageConfigurationService, LanguageConfigurationServiceChangeEvent } from '../../languages/languageConfigurationRegistry.js';
+import { ignoreBracketsInToken } from '../../languages/supports.js';
+import { LanguageBracketsConfiguration } from '../../languages/supports/languageBracketsConfiguration.js';
+import { BracketsUtils, RichEditBracket, RichEditBrackets } from '../../languages/supports/richEditBrackets.js';
+import { BracketPairsTree } from './bracketPairsTree/bracketPairsTree.js';
+import { TextModel } from '../textModel.js';
+import { BracketInfo, BracketPairInfo, BracketPairWithMinIndentationInfo, IBracketPairsTextModelPart, IFoundBracket } from '../../textModelBracketPairs.js';
+import { IModelContentChangedEvent, IModelLanguageChangedEvent, IModelOptionsChangedEvent, IModelTokensChangedEvent } from '../../textModelEvents.js';
+import { LineTokens } from '../../tokens/lineTokens.js';
 
 export class BracketPairsTextModelPart extends Disposable implements IBracketPairsTextModelPart {
 	private readonly bracketPairsTree = this._register(new MutableDisposable<IReference<BracketPairsTree>>());
diff --git a/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/ast.ts b/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/ast.ts
index e304dd1faa9..a5141b51624 100644
--- a/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/ast.ts
+++ b/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/ast.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BugIndicatingError } from 'vs/base/common/errors';
-import { CursorColumns } from 'vs/editor/common/core/cursorColumns';
-import { BracketKind } from 'vs/editor/common/languages/supports/languageBracketsConfiguration';
-import { ITextModel } from 'vs/editor/common/model';
-import { Length, lengthAdd, lengthGetLineCount, lengthToObj, lengthZero } from './length';
-import { SmallImmutableSet } from './smallImmutableSet';
-import { OpeningBracketId } from './tokenizer';
+import { BugIndicatingError } from '../../../../../base/common/errors.js';
+import { CursorColumns } from '../../../core/cursorColumns.js';
+import { BracketKind } from '../../../languages/supports/languageBracketsConfiguration.js';
+import { ITextModel } from '../../../model.js';
+import { Length, lengthAdd, lengthGetLineCount, lengthToObj, lengthZero } from './length.js';
+import { SmallImmutableSet } from './smallImmutableSet.js';
+import { OpeningBracketId } from './tokenizer.js';
 
 export const enum AstNodeKind {
 	Text = 0,
diff --git a/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/beforeEditPositionMapper.ts b/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/beforeEditPositionMapper.ts
index 1f95f84df48..d5560fdd2ba 100644
--- a/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/beforeEditPositionMapper.ts
+++ b/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/beforeEditPositionMapper.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Range } from 'vs/editor/common/core/range';
-import { Length, lengthAdd, lengthDiffNonNegative, lengthLessThanEqual, lengthOfString, lengthToObj, positionToLength, toLength } from './length';
-import { TextLength } from 'vs/editor/common/core/textLength';
-import { IModelContentChange } from 'vs/editor/common/textModelEvents';
+import { Range } from '../../../core/range.js';
+import { Length, lengthAdd, lengthDiffNonNegative, lengthLessThanEqual, lengthOfString, lengthToObj, positionToLength, toLength } from './length.js';
+import { TextLength } from '../../../core/textLength.js';
+import { IModelContentChange } from '../../../textModelEvents.js';
 
 export class TextEditInfo {
 	public static fromModelContentChanges(changes: IModelContentChange[]): TextEditInfo[] {
diff --git a/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/bracketPairsTree.ts b/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/bracketPairsTree.ts
index acb25d8bfeb..42a40e99797 100644
--- a/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/bracketPairsTree.ts
+++ b/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/bracketPairsTree.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Range } from 'vs/editor/common/core/range';
-import { ITextModel } from 'vs/editor/common/model';
-import { BracketInfo, BracketPairWithMinIndentationInfo, IFoundBracket } from 'vs/editor/common/textModelBracketPairs';
-import { TextModel } from 'vs/editor/common/model/textModel';
-import { IModelContentChangedEvent, IModelTokensChangedEvent } from 'vs/editor/common/textModelEvents';
-import { ResolvedLanguageConfiguration } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { AstNode, AstNodeKind } from './ast';
-import { TextEditInfo } from './beforeEditPositionMapper';
-import { LanguageAgnosticBracketTokens } from './brackets';
-import { Length, lengthAdd, lengthGreaterThanEqual, lengthLessThan, lengthLessThanEqual, lengthsToRange, lengthZero, positionToLength, toLength } from './length';
-import { parseDocument } from './parser';
-import { DenseKeyProvider } from './smallImmutableSet';
-import { FastTokenizer, TextBufferTokenizer } from './tokenizer';
-import { BackgroundTokenizationState } from 'vs/editor/common/tokenizationTextModelPart';
-import { Position } from 'vs/editor/common/core/position';
-import { CallbackIterable } from 'vs/base/common/arrays';
-import { combineTextEditInfos } from 'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/combineTextEditInfos';
-import { ClosingBracketKind, OpeningBracketKind } from 'vs/editor/common/languages/supports/languageBracketsConfiguration';
+import { Emitter } from '../../../../../base/common/event.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { Range } from '../../../core/range.js';
+import { ITextModel } from '../../../model.js';
+import { BracketInfo, BracketPairWithMinIndentationInfo, IFoundBracket } from '../../../textModelBracketPairs.js';
+import { TextModel } from '../../textModel.js';
+import { IModelContentChangedEvent, IModelTokensChangedEvent } from '../../../textModelEvents.js';
+import { ResolvedLanguageConfiguration } from '../../../languages/languageConfigurationRegistry.js';
+import { AstNode, AstNodeKind } from './ast.js';
+import { TextEditInfo } from './beforeEditPositionMapper.js';
+import { LanguageAgnosticBracketTokens } from './brackets.js';
+import { Length, lengthAdd, lengthGreaterThanEqual, lengthLessThan, lengthLessThanEqual, lengthsToRange, lengthZero, positionToLength, toLength } from './length.js';
+import { parseDocument } from './parser.js';
+import { DenseKeyProvider } from './smallImmutableSet.js';
+import { FastTokenizer, TextBufferTokenizer } from './tokenizer.js';
+import { BackgroundTokenizationState } from '../../../tokenizationTextModelPart.js';
+import { Position } from '../../../core/position.js';
+import { CallbackIterable } from '../../../../../base/common/arrays.js';
+import { combineTextEditInfos } from './combineTextEditInfos.js';
+import { ClosingBracketKind, OpeningBracketKind } from '../../../languages/supports/languageBracketsConfiguration.js';
 
 export class BracketPairsTree extends Disposable {
 	private readonly didChangeEmitter = new Emitter<void>();
diff --git a/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/brackets.ts b/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/brackets.ts
index b4b31932e67..c0445ee917c 100644
--- a/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/brackets.ts
+++ b/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/brackets.ts
@@ -2,13 +2,13 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { escapeRegExpCharacters } from 'vs/base/common/strings';
-import { ResolvedLanguageConfiguration } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { BracketKind } from 'vs/editor/common/languages/supports/languageBracketsConfiguration';
-import { BracketAstNode } from './ast';
-import { toLength } from './length';
-import { DenseKeyProvider, identityKeyProvider, SmallImmutableSet } from './smallImmutableSet';
-import { OpeningBracketId, Token, TokenKind } from './tokenizer';
+import { escapeRegExpCharacters } from '../../../../../base/common/strings.js';
+import { ResolvedLanguageConfiguration } from '../../../languages/languageConfigurationRegistry.js';
+import { BracketKind } from '../../../languages/supports/languageBracketsConfiguration.js';
+import { BracketAstNode } from './ast.js';
+import { toLength } from './length.js';
+import { DenseKeyProvider, identityKeyProvider, SmallImmutableSet } from './smallImmutableSet.js';
+import { OpeningBracketId, Token, TokenKind } from './tokenizer.js';
 
 export class BracketTokens {
 	static createFromLanguage(configuration: ResolvedLanguageConfiguration, denseKeyProvider: DenseKeyProvider<string>): BracketTokens {
diff --git a/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/combineTextEditInfos.ts b/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/combineTextEditInfos.ts
index 29cf5a65271..d522d0916ac 100644
--- a/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/combineTextEditInfos.ts
+++ b/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/combineTextEditInfos.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ArrayQueue } from 'vs/base/common/arrays';
-import { TextEditInfo } from 'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/beforeEditPositionMapper';
-import { Length, lengthAdd, lengthDiffNonNegative, lengthEquals, lengthIsZero, lengthToObj, lengthZero, sumLengths } from 'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/length';
+import { ArrayQueue } from '../../../../../base/common/arrays.js';
+import { TextEditInfo } from './beforeEditPositionMapper.js';
+import { Length, lengthAdd, lengthDiffNonNegative, lengthEquals, lengthIsZero, lengthToObj, lengthZero, sumLengths } from './length.js';
 
 export function combineTextEditInfos(textEditInfoFirst: TextEditInfo[], textEditInfoSecond: TextEditInfo[]): TextEditInfo[] {
 	if (textEditInfoFirst.length === 0) {
diff --git a/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/concat23Trees.ts b/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/concat23Trees.ts
index aab40426436..eacd35a9a7b 100644
--- a/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/concat23Trees.ts
+++ b/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/concat23Trees.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { AstNode, AstNodeKind, ListAstNode } from './ast';
+import { AstNode, AstNodeKind, ListAstNode } from './ast.js';
 
 /**
  * Concatenates a list of (2,3) AstNode's into a single (2,3) AstNode.
diff --git a/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/length.ts b/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/length.ts
index d41a62233e5..b858a7d4d79 100644
--- a/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/length.ts
+++ b/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/length.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { splitLines } from 'vs/base/common/strings';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { TextLength } from 'vs/editor/common/core/textLength';
+import { splitLines } from '../../../../../base/common/strings.js';
+import { Position } from '../../../core/position.js';
+import { Range } from '../../../core/range.js';
+import { TextLength } from '../../../core/textLength.js';
 
 /**
  * The end must be greater than or equal to the start.
diff --git a/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/nodeReader.ts b/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/nodeReader.ts
index 4d15eb51764..e71df26d592 100644
--- a/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/nodeReader.ts
+++ b/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/nodeReader.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { AstNode } from './ast';
-import { lengthAdd, lengthZero, Length, lengthLessThan } from './length';
+import { AstNode } from './ast.js';
+import { lengthAdd, lengthZero, Length, lengthLessThan } from './length.js';
 
 /**
  * Allows to efficiently find a longest child at a given offset in a fixed node.
diff --git a/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/parser.ts b/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/parser.ts
index cdf202699d3..5ae84a1068c 100644
--- a/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/parser.ts
+++ b/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/parser.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { AstNode, AstNodeKind, BracketAstNode, InvalidBracketAstNode, ListAstNode, PairAstNode, TextAstNode } from './ast';
-import { BeforeEditPositionMapper, TextEditInfo } from './beforeEditPositionMapper';
-import { SmallImmutableSet } from './smallImmutableSet';
-import { lengthIsZero, lengthLessThan } from './length';
-import { concat23Trees, concat23TreesOfSameHeight } from './concat23Trees';
-import { NodeReader } from './nodeReader';
-import { OpeningBracketId, Tokenizer, TokenKind } from './tokenizer';
+import { AstNode, AstNodeKind, BracketAstNode, InvalidBracketAstNode, ListAstNode, PairAstNode, TextAstNode } from './ast.js';
+import { BeforeEditPositionMapper, TextEditInfo } from './beforeEditPositionMapper.js';
+import { SmallImmutableSet } from './smallImmutableSet.js';
+import { lengthIsZero, lengthLessThan } from './length.js';
+import { concat23Trees, concat23TreesOfSameHeight } from './concat23Trees.js';
+import { NodeReader } from './nodeReader.js';
+import { OpeningBracketId, Tokenizer, TokenKind } from './tokenizer.js';
 
 /**
  * Non incrementally built ASTs are immutable.
diff --git a/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/tokenizer.ts b/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/tokenizer.ts
index 54c9daaa90d..ae8cce61d56 100644
--- a/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/tokenizer.ts
+++ b/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/tokenizer.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { NotSupportedError } from 'vs/base/common/errors';
-import { StandardTokenType, TokenMetadata } from 'vs/editor/common/encodedTokenAttributes';
-import { IViewLineTokens } from 'vs/editor/common/tokens/lineTokens';
-import { BracketAstNode, TextAstNode } from './ast';
-import { BracketTokens, LanguageAgnosticBracketTokens } from './brackets';
-import { Length, lengthAdd, lengthDiff, lengthGetColumnCountIfZeroLineCount, lengthToObj, lengthZero, toLength } from './length';
-import { SmallImmutableSet } from './smallImmutableSet';
+import { NotSupportedError } from '../../../../../base/common/errors.js';
+import { StandardTokenType, TokenMetadata } from '../../../encodedTokenAttributes.js';
+import { IViewLineTokens } from '../../../tokens/lineTokens.js';
+import { BracketAstNode, TextAstNode } from './ast.js';
+import { BracketTokens, LanguageAgnosticBracketTokens } from './brackets.js';
+import { Length, lengthAdd, lengthDiff, lengthGetColumnCountIfZeroLineCount, lengthToObj, lengthZero, toLength } from './length.js';
+import { SmallImmutableSet } from './smallImmutableSet.js';
 
 export interface Tokenizer {
 	readonly offset: Length;
diff --git a/src/vs/editor/common/model/bracketPairsTextModelPart/colorizedBracketPairsDecorationProvider.ts b/src/vs/editor/common/model/bracketPairsTextModelPart/colorizedBracketPairsDecorationProvider.ts
index 0f9c341a4f8..2b431cb64bd 100644
--- a/src/vs/editor/common/model/bracketPairsTextModelPart/colorizedBracketPairsDecorationProvider.ts
+++ b/src/vs/editor/common/model/bracketPairsTextModelPart/colorizedBracketPairsDecorationProvider.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Color } from 'vs/base/common/color';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Range } from 'vs/editor/common/core/range';
-import { BracketPairColorizationOptions, IModelDecoration } from 'vs/editor/common/model';
-import { BracketInfo } from 'vs/editor/common/textModelBracketPairs';
-import { DecorationProvider } from 'vs/editor/common/model/decorationProvider';
-import { TextModel } from 'vs/editor/common/model/textModel';
+import { Color } from '../../../../base/common/color.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Range } from '../../core/range.js';
+import { BracketPairColorizationOptions, IModelDecoration } from '../../model.js';
+import { BracketInfo } from '../../textModelBracketPairs.js';
+import { DecorationProvider } from '../decorationProvider.js';
+import { TextModel } from '../textModel.js';
 import {
 	editorBracketHighlightingForeground1, editorBracketHighlightingForeground2, editorBracketHighlightingForeground3, editorBracketHighlightingForeground4, editorBracketHighlightingForeground5, editorBracketHighlightingForeground6, editorBracketHighlightingUnexpectedBracketForeground
-} from 'vs/editor/common/core/editorColorRegistry';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { IModelOptionsChangedEvent } from 'vs/editor/common/textModelEvents';
+} from '../../core/editorColorRegistry.js';
+import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
+import { IModelOptionsChangedEvent } from '../../textModelEvents.js';
 
 export class ColorizedBracketPairsDecorationProvider extends Disposable implements DecorationProvider {
 	private colorizationOptions: BracketPairColorizationOptions;
diff --git a/src/vs/editor/common/model/bracketPairsTextModelPart/fixBrackets.ts b/src/vs/editor/common/model/bracketPairsTextModelPart/fixBrackets.ts
index d9db755673f..e35608b5bdf 100644
--- a/src/vs/editor/common/model/bracketPairsTextModelPart/fixBrackets.ts
+++ b/src/vs/editor/common/model/bracketPairsTextModelPart/fixBrackets.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { AstNode, AstNodeKind } from 'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/ast';
-import { LanguageAgnosticBracketTokens } from 'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/brackets';
-import { Length, lengthAdd, lengthGetColumnCountIfZeroLineCount, lengthZero } from 'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/length';
-import { parseDocument } from 'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/parser';
-import { DenseKeyProvider } from 'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/smallImmutableSet';
-import { ITokenizerSource, TextBufferTokenizer } from 'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/tokenizer';
-import { IViewLineTokens } from 'vs/editor/common/tokens/lineTokens';
+import { ILanguageConfigurationService } from '../../languages/languageConfigurationRegistry.js';
+import { AstNode, AstNodeKind } from './bracketPairsTree/ast.js';
+import { LanguageAgnosticBracketTokens } from './bracketPairsTree/brackets.js';
+import { Length, lengthAdd, lengthGetColumnCountIfZeroLineCount, lengthZero } from './bracketPairsTree/length.js';
+import { parseDocument } from './bracketPairsTree/parser.js';
+import { DenseKeyProvider } from './bracketPairsTree/smallImmutableSet.js';
+import { ITokenizerSource, TextBufferTokenizer } from './bracketPairsTree/tokenizer.js';
+import { IViewLineTokens } from '../../tokens/lineTokens.js';
 
 export function fixBracketsInLine(tokens: IViewLineTokens, languageConfigurationService: ILanguageConfigurationService): string {
 	const denseKeyProvider = new DenseKeyProvider<string>();
diff --git a/src/vs/editor/common/model/decorationProvider.ts b/src/vs/editor/common/model/decorationProvider.ts
index af8452a6101..0cb68740e2d 100644
--- a/src/vs/editor/common/model/decorationProvider.ts
+++ b/src/vs/editor/common/model/decorationProvider.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { Range } from 'vs/editor/common/core/range';
-import { IModelDecoration } from 'vs/editor/common/model';
+import { Event } from '../../../base/common/event.js';
+import { Range } from '../core/range.js';
+import { IModelDecoration } from '../model.js';
 
 export interface DecorationProvider {
 	/**
diff --git a/src/vs/editor/common/model/editStack.ts b/src/vs/editor/common/model/editStack.ts
index 8c9f1c4d6e2..b7a5fe5378d 100644
--- a/src/vs/editor/common/model/editStack.ts
+++ b/src/vs/editor/common/model/editStack.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Selection } from 'vs/editor/common/core/selection';
-import { EndOfLineSequence, ICursorStateComputer, IValidEditOperation, ITextModel } from 'vs/editor/common/model';
-import { TextModel } from 'vs/editor/common/model/textModel';
-import { IUndoRedoService, IResourceUndoRedoElement, UndoRedoElementType, IWorkspaceUndoRedoElement, UndoRedoGroup } from 'vs/platform/undoRedo/common/undoRedo';
-import { URI } from 'vs/base/common/uri';
-import { TextChange, compressConsecutiveTextChanges } from 'vs/editor/common/core/textChange';
-import * as buffer from 'vs/base/common/buffer';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { basename } from 'vs/base/common/resources';
-import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
+import * as nls from '../../../nls.js';
+import { onUnexpectedError } from '../../../base/common/errors.js';
+import { Selection } from '../core/selection.js';
+import { EndOfLineSequence, ICursorStateComputer, IValidEditOperation, ITextModel } from '../model.js';
+import { TextModel } from './textModel.js';
+import { IUndoRedoService, IResourceUndoRedoElement, UndoRedoElementType, IWorkspaceUndoRedoElement, UndoRedoGroup } from '../../../platform/undoRedo/common/undoRedo.js';
+import { URI } from '../../../base/common/uri.js';
+import { TextChange, compressConsecutiveTextChanges } from '../core/textChange.js';
+import * as buffer from '../../../base/common/buffer.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { basename } from '../../../base/common/resources.js';
+import { ISingleEditOperation } from '../core/editOperation.js';
 
 function uriGetComparisonKey(resource: URI): string {
 	return resource.toString();
diff --git a/src/vs/editor/common/model/fixedArray.ts b/src/vs/editor/common/model/fixedArray.ts
index 1d57ce2914b..1ebfe07cba7 100644
--- a/src/vs/editor/common/model/fixedArray.ts
+++ b/src/vs/editor/common/model/fixedArray.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { arrayInsert } from 'vs/base/common/arrays';
+import { arrayInsert } from '../../../base/common/arrays.js';
 
 /**
  * An array that avoids being sparse by always
diff --git a/src/vs/editor/common/model/guidesTextModelPart.ts b/src/vs/editor/common/model/guidesTextModelPart.ts
index 7963063d044..157717fa9c1 100644
--- a/src/vs/editor/common/model/guidesTextModelPart.ts
+++ b/src/vs/editor/common/model/guidesTextModelPart.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { findLast } from 'vs/base/common/arraysFind';
-import * as strings from 'vs/base/common/strings';
-import { CursorColumns } from 'vs/editor/common/core/cursorColumns';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import type { TextModel } from 'vs/editor/common/model/textModel';
-import { TextModelPart } from 'vs/editor/common/model/textModelPart';
-import { computeIndentLevel } from 'vs/editor/common/model/utils';
-import { ILanguageConfigurationService, ResolvedLanguageConfiguration } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { BracketGuideOptions, HorizontalGuidesState, IActiveIndentGuideInfo, IGuidesTextModelPart, IndentGuide, IndentGuideHorizontalLine } from 'vs/editor/common/textModelGuides';
-import { BugIndicatingError } from 'vs/base/common/errors';
+import { findLast } from '../../../base/common/arraysFind.js';
+import * as strings from '../../../base/common/strings.js';
+import { CursorColumns } from '../core/cursorColumns.js';
+import { IPosition, Position } from '../core/position.js';
+import { Range } from '../core/range.js';
+import type { TextModel } from './textModel.js';
+import { TextModelPart } from './textModelPart.js';
+import { computeIndentLevel } from './utils.js';
+import { ILanguageConfigurationService, ResolvedLanguageConfiguration } from '../languages/languageConfigurationRegistry.js';
+import { BracketGuideOptions, HorizontalGuidesState, IActiveIndentGuideInfo, IGuidesTextModelPart, IndentGuide, IndentGuideHorizontalLine } from '../textModelGuides.js';
+import { BugIndicatingError } from '../../../base/common/errors.js';
 
 export class GuidesTextModelPart extends TextModelPart implements IGuidesTextModelPart {
 	constructor(
diff --git a/src/vs/editor/common/model/indentationGuesser.ts b/src/vs/editor/common/model/indentationGuesser.ts
index bd32bfa2782..ba6a7f64089 100644
--- a/src/vs/editor/common/model/indentationGuesser.ts
+++ b/src/vs/editor/common/model/indentationGuesser.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
-import { ITextBuffer } from 'vs/editor/common/model';
+import { CharCode } from '../../../base/common/charCode.js';
+import { ITextBuffer } from '../model.js';
 
 class SpacesDiffResult {
 	public spacesDiff: number = 0;
diff --git a/src/vs/editor/common/model/intervalTree.ts b/src/vs/editor/common/model/intervalTree.ts
index ff5d9105dd2..99809d0f967 100644
--- a/src/vs/editor/common/model/intervalTree.ts
+++ b/src/vs/editor/common/model/intervalTree.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Range } from 'vs/editor/common/core/range';
-import { TrackedRangeStickiness, TrackedRangeStickiness as ActualTrackedRangeStickiness } from 'vs/editor/common/model';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
+import { Range } from '../core/range.js';
+import { TrackedRangeStickiness, TrackedRangeStickiness as ActualTrackedRangeStickiness } from '../model.js';
+import { ModelDecorationOptions } from './textModel.js';
 
 //
 // The red-black tree is based on the "Introduction to Algorithms" by Cormen, Leiserson and Rivest.
diff --git a/src/vs/editor/common/model/mirrorTextModel.ts b/src/vs/editor/common/model/mirrorTextModel.ts
index 19356007c3a..59482286e01 100644
--- a/src/vs/editor/common/model/mirrorTextModel.ts
+++ b/src/vs/editor/common/model/mirrorTextModel.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { splitLines } from 'vs/base/common/strings';
-import { URI } from 'vs/base/common/uri';
-import { Position } from 'vs/editor/common/core/position';
-import { IRange } from 'vs/editor/common/core/range';
-import { IModelContentChange } from 'vs/editor/common/textModelEvents';
-import { PrefixSumComputer } from 'vs/editor/common/model/prefixSumComputer';
+import { splitLines } from '../../../base/common/strings.js';
+import { URI } from '../../../base/common/uri.js';
+import { Position } from '../core/position.js';
+import { IRange } from '../core/range.js';
+import { IModelContentChange } from '../textModelEvents.js';
+import { PrefixSumComputer } from './prefixSumComputer.js';
 
 export interface IModelChangedEvent {
 	/**
diff --git a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
index b75d0d75a70..0d52df0cc51 100644
--- a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
+++ b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { FindMatch, ITextSnapshot, SearchData } from 'vs/editor/common/model';
-import { NodeColor, SENTINEL, TreeNode, fixInsert, leftest, rbDelete, righttest, updateTreeMetadata } from 'vs/editor/common/model/pieceTreeTextBuffer/rbTreeBase';
-import { Searcher, createFindMatch, isValidMatch } from 'vs/editor/common/model/textModelSearch';
+import { CharCode } from '../../../../base/common/charCode.js';
+import { Position } from '../../core/position.js';
+import { Range } from '../../core/range.js';
+import { FindMatch, ITextSnapshot, SearchData } from '../../model.js';
+import { NodeColor, SENTINEL, TreeNode, fixInsert, leftest, rbDelete, righttest, updateTreeMetadata } from './rbTreeBase.js';
+import { Searcher, createFindMatch, isValidMatch } from '../textModelSearch.js';
 
 // const lfRegex = new RegExp(/\r\n|\r|\n/g);
 const AverageBufferSize = 65535;
@@ -666,6 +666,27 @@ export class PieceTreeBase {
 		return this._getCharCode(nodePos);
 	}
 
+	public getNearestChunk(offset: number): string {
+		const nodePos = this.nodeAt(offset);
+		if (nodePos.remainder === nodePos.node.piece.length) {
+			// the offset is at the head of next node.
+			const matchingNode = nodePos.node.next();
+			if (!matchingNode || matchingNode === SENTINEL) {
+				return '';
+			}
+
+			const buffer = this._buffers[matchingNode.piece.bufferIndex];
+			const startOffset = this.offsetInBuffer(matchingNode.piece.bufferIndex, matchingNode.piece.start);
+			return buffer.buffer.substring(startOffset, startOffset + matchingNode.piece.length);
+		} else {
+			const buffer = this._buffers[nodePos.node.piece.bufferIndex];
+			const startOffset = this.offsetInBuffer(nodePos.node.piece.bufferIndex, nodePos.node.piece.start);
+			const targetOffset = startOffset + nodePos.remainder;
+			const targetEnd = startOffset + nodePos.node.piece.length;
+			return buffer.buffer.substring(targetOffset, targetEnd);
+		}
+	}
+
 	public findMatchesInNode(node: TreeNode, searcher: Searcher, startLineNumber: number, startColumn: number, startCursor: BufferCursor, endCursor: BufferCursor, searchData: SearchData, captureMatches: boolean, limitResultCount: number, resultLen: number, result: FindMatch[]) {
 		const buffer = this._buffers[node.piece.bufferIndex];
 		const startOffsetInBuffer = this.offsetInBuffer(node.piece.bufferIndex, node.piece.start);
diff --git a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts
index 12d7e0b0981..42d1995e367 100644
--- a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts
+++ b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import * as strings from 'vs/base/common/strings';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { ApplyEditsResult, EndOfLinePreference, FindMatch, IInternalModelContentChange, ISingleEditOperationIdentifier, ITextBuffer, ITextSnapshot, ValidAnnotatedEditOperation, IValidEditOperation, SearchData } from 'vs/editor/common/model';
-import { PieceTreeBase, StringBuffer } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase';
-import { countEOL, StringEOL } from 'vs/editor/common/core/eolCounter';
-import { TextChange } from 'vs/editor/common/core/textChange';
-import { Disposable } from 'vs/base/common/lifecycle';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import * as strings from '../../../../base/common/strings.js';
+import { Position } from '../../core/position.js';
+import { Range } from '../../core/range.js';
+import { ApplyEditsResult, EndOfLinePreference, FindMatch, IInternalModelContentChange, ISingleEditOperationIdentifier, ITextBuffer, ITextSnapshot, ValidAnnotatedEditOperation, IValidEditOperation, SearchData } from '../../model.js';
+import { PieceTreeBase, StringBuffer } from './pieceTreeBase.js';
+import { countEOL, StringEOL } from '../../core/eolCounter.js';
+import { TextChange } from '../../core/textChange.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
 
 export interface IValidatedEditOperation {
 	sortIndex: number;
@@ -167,6 +167,10 @@ export class PieceTreeTextBuffer extends Disposable implements ITextBuffer {
 		return this.getValueLengthInRange(range, eol);
 	}
 
+	public getNearestChunk(offset: number): string {
+		return this._pieceTree.getNearestChunk(offset);
+	}
+
 	public getLength(): number {
 		return this._pieceTree.getLength();
 	}
diff --git a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder.ts
index 824a5674a32..3ee4d87991a 100644
--- a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder.ts
+++ b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import * as strings from 'vs/base/common/strings';
-import { DefaultEndOfLine, ITextBuffer, ITextBufferBuilder, ITextBufferFactory } from 'vs/editor/common/model';
-import { StringBuffer, createLineStarts, createLineStartsFast } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase';
-import { PieceTreeTextBuffer } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer';
+import { CharCode } from '../../../../base/common/charCode.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import * as strings from '../../../../base/common/strings.js';
+import { DefaultEndOfLine, ITextBuffer, ITextBufferBuilder, ITextBufferFactory } from '../../model.js';
+import { StringBuffer, createLineStarts, createLineStartsFast } from './pieceTreeBase.js';
+import { PieceTreeTextBuffer } from './pieceTreeTextBuffer.js';
 
 class PieceTreeTextBufferFactory implements ITextBufferFactory {
 
diff --git a/src/vs/editor/common/model/pieceTreeTextBuffer/rbTreeBase.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/rbTreeBase.ts
index 1d6301b12c6..7dfd9d8373a 100644
--- a/src/vs/editor/common/model/pieceTreeTextBuffer/rbTreeBase.ts
+++ b/src/vs/editor/common/model/pieceTreeTextBuffer/rbTreeBase.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Piece, PieceTreeBase } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase';
+import { Piece, PieceTreeBase } from './pieceTreeBase.js';
 
 export class TreeNode {
 	parent: TreeNode;
diff --git a/src/vs/editor/common/model/prefixSumComputer.ts b/src/vs/editor/common/model/prefixSumComputer.ts
index 0f3c184714f..08376d50d8e 100644
--- a/src/vs/editor/common/model/prefixSumComputer.ts
+++ b/src/vs/editor/common/model/prefixSumComputer.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { arrayInsert } from 'vs/base/common/arrays';
-import { toUint32 } from 'vs/base/common/uint';
+import { arrayInsert } from '../../../base/common/arrays.js';
+import { toUint32 } from '../../../base/common/uint.js';
 
 export class PrefixSumComputer {
 
diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts
index 97b5a483fc3..0313e5c208a 100644
--- a/src/vs/editor/common/model/textModel.ts
+++ b/src/vs/editor/common/model/textModel.ts
@@ -3,48 +3,50 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ArrayQueue, pushMany } from 'vs/base/common/arrays';
-import { VSBuffer, VSBufferReadableStream } from 'vs/base/common/buffer';
-import { Color } from 'vs/base/common/color';
-import { BugIndicatingError, illegalArgument, onUnexpectedError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { Disposable, IDisposable, MutableDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
-import { listenStream } from 'vs/base/common/stream';
-import * as strings from 'vs/base/common/strings';
-import { ThemeColor } from 'vs/base/common/themables';
-import { Constants } from 'vs/base/common/uint';
-import { URI } from 'vs/base/common/uri';
-import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { countEOL } from 'vs/editor/common/core/eolCounter';
-import { normalizeIndentation } from 'vs/editor/common/core/indentation';
-import { LineRange } from 'vs/editor/common/core/lineRange';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { TextChange } from 'vs/editor/common/core/textChange';
-import { EDITOR_MODEL_DEFAULTS } from 'vs/editor/common/core/textModelDefaults';
-import { IWordAtPosition } from 'vs/editor/common/core/wordHelper';
-import { FormattingOptions } from 'vs/editor/common/languages';
-import { ILanguageSelection, ILanguageService } from 'vs/editor/common/languages/language';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import * as model from 'vs/editor/common/model';
-import { BracketPairsTextModelPart } from 'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsImpl';
-import { ColorizedBracketPairsDecorationProvider } from 'vs/editor/common/model/bracketPairsTextModelPart/colorizedBracketPairsDecorationProvider';
-import { EditStack } from 'vs/editor/common/model/editStack';
-import { GuidesTextModelPart } from 'vs/editor/common/model/guidesTextModelPart';
-import { guessIndentation } from 'vs/editor/common/model/indentationGuesser';
-import { IntervalNode, IntervalTree, recomputeMaxEnd } from 'vs/editor/common/model/intervalTree';
-import { PieceTreeTextBuffer } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer';
-import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder';
-import { SearchParams, TextModelSearch } from 'vs/editor/common/model/textModelSearch';
-import { TokenizationTextModelPart } from 'vs/editor/common/model/tokenizationTextModelPart';
-import { IBracketPairsTextModelPart } from 'vs/editor/common/textModelBracketPairs';
-import { IModelContentChangedEvent, IModelDecorationsChangedEvent, IModelOptionsChangedEvent, InternalModelContentChangeEvent, LineInjectedText, ModelInjectedTextChangedEvent, ModelRawChange, ModelRawContentChangedEvent, ModelRawEOLChanged, ModelRawFlush, ModelRawLineChanged, ModelRawLinesDeleted, ModelRawLinesInserted } from 'vs/editor/common/textModelEvents';
-import { IGuidesTextModelPart } from 'vs/editor/common/textModelGuides';
-import { ITokenizationTextModelPart } from 'vs/editor/common/tokenizationTextModelPart';
-import { IColorTheme } from 'vs/platform/theme/common/themeService';
-import { IUndoRedoService, ResourceEditStackSnapshot, UndoRedoGroup } from 'vs/platform/undoRedo/common/undoRedo';
+import { ArrayQueue, pushMany } from '../../../base/common/arrays.js';
+import { VSBuffer, VSBufferReadableStream } from '../../../base/common/buffer.js';
+import { Color } from '../../../base/common/color.js';
+import { BugIndicatingError, illegalArgument, onUnexpectedError } from '../../../base/common/errors.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { IMarkdownString } from '../../../base/common/htmlContent.js';
+import { Disposable, IDisposable, MutableDisposable, combinedDisposable } from '../../../base/common/lifecycle.js';
+import { listenStream } from '../../../base/common/stream.js';
+import * as strings from '../../../base/common/strings.js';
+import { ThemeColor } from '../../../base/common/themables.js';
+import { Constants } from '../../../base/common/uint.js';
+import { URI } from '../../../base/common/uri.js';
+import { ISingleEditOperation } from '../core/editOperation.js';
+import { countEOL } from '../core/eolCounter.js';
+import { normalizeIndentation } from '../core/indentation.js';
+import { IPosition, Position } from '../core/position.js';
+import { IRange, Range } from '../core/range.js';
+import { Selection } from '../core/selection.js';
+import { TextChange } from '../core/textChange.js';
+import { EDITOR_MODEL_DEFAULTS } from '../core/textModelDefaults.js';
+import { IWordAtPosition } from '../core/wordHelper.js';
+import { FormattingOptions } from '../languages.js';
+import { ILanguageSelection, ILanguageService } from '../languages/language.js';
+import { ILanguageConfigurationService } from '../languages/languageConfigurationRegistry.js';
+import * as model from '../model.js';
+import { BracketPairsTextModelPart } from './bracketPairsTextModelPart/bracketPairsImpl.js';
+import { ColorizedBracketPairsDecorationProvider } from './bracketPairsTextModelPart/colorizedBracketPairsDecorationProvider.js';
+import { EditStack } from './editStack.js';
+import { GuidesTextModelPart } from './guidesTextModelPart.js';
+import { guessIndentation } from './indentationGuesser.js';
+import { IntervalNode, IntervalTree, recomputeMaxEnd } from './intervalTree.js';
+import { PieceTreeTextBuffer } from './pieceTreeTextBuffer/pieceTreeTextBuffer.js';
+import { PieceTreeTextBufferBuilder } from './pieceTreeTextBuffer/pieceTreeTextBufferBuilder.js';
+import { SearchParams, TextModelSearch } from './textModelSearch.js';
+import { TokenizationTextModelPart } from './tokenizationTextModelPart.js';
+import { AttachedViews } from './tokens.js';
+import { IBracketPairsTextModelPart } from '../textModelBracketPairs.js';
+import { IModelContentChangedEvent, IModelDecorationsChangedEvent, IModelOptionsChangedEvent, InternalModelContentChangeEvent, LineInjectedText, ModelInjectedTextChangedEvent, ModelRawChange, ModelRawContentChangedEvent, ModelRawEOLChanged, ModelRawFlush, ModelRawLineChanged, ModelRawLinesDeleted, ModelRawLinesInserted } from '../textModelEvents.js';
+import { IGuidesTextModelPart } from '../textModelGuides.js';
+import { ITokenizationTextModelPart } from '../tokenizationTextModelPart.js';
+import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
+import { IColorTheme } from '../../../platform/theme/common/themeService.js';
+import { IUndoRedoService, ResourceEditStackSnapshot, UndoRedoGroup } from '../../../platform/undoRedo/common/undoRedo.js';
+import { TokenArray } from '../tokens/tokenArray.js';
 
 export function createTextBufferFactory(text: string): model.ITextBufferFactory {
 	const builder = new PieceTreeTextBufferBuilder();
@@ -299,6 +301,7 @@ export class TextModel extends Disposable implements model.ITextModel, IDecorati
 		@IUndoRedoService private readonly _undoRedoService: IUndoRedoService,
 		@ILanguageService private readonly _languageService: ILanguageService,
 		@ILanguageConfigurationService private readonly _languageConfigurationService: ILanguageConfigurationService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService
 	) {
 		super();
 
@@ -327,13 +330,11 @@ export class TextModel extends Disposable implements model.ITextModel, IDecorati
 		this._bracketPairs = this._register(new BracketPairsTextModelPart(this, this._languageConfigurationService));
 		this._guidesTextModelPart = this._register(new GuidesTextModelPart(this, this._languageConfigurationService));
 		this._decorationProvider = this._register(new ColorizedBracketPairsDecorationProvider(this));
-		this._tokenizationTextModelPart = new TokenizationTextModelPart(
-			this._languageService,
-			this._languageConfigurationService,
+		this._tokenizationTextModelPart = this.instantiationService.createInstance(TokenizationTextModelPart,
 			this,
 			this._bracketPairs,
 			languageId,
-			this._attachedViews,
+			this._attachedViews
 		);
 
 		const bufferLineCount = this._buffer.getLineCount();
@@ -1989,7 +1990,7 @@ export class TextModel extends Disposable implements model.ITextModel, IDecorati
 	}
 }
 
-function indentOfLine(line: string): number {
+export function indentOfLine(line: string): number {
 	let indent = 0;
 	for (const c of line) {
 		if (c === ' ' || c === '\t') {
@@ -2268,6 +2269,7 @@ export class ModelDecorationInjectedTextOptions implements model.InjectedTextOpt
 	}
 
 	public readonly content: string;
+	public readonly tokens: TokenArray | null;
 	readonly inlineClassName: string | null;
 	readonly inlineClassNameAffectsLetterSpacing: boolean;
 	readonly attachedData: unknown | null;
@@ -2275,6 +2277,7 @@ export class ModelDecorationInjectedTextOptions implements model.InjectedTextOpt
 
 	private constructor(options: model.InjectedTextOptions) {
 		this.content = options.content || '';
+		this.tokens = options.tokens ?? null;
 		this.inlineClassName = options.inlineClassName || null;
 		this.inlineClassNameAffectsLetterSpacing = options.inlineClassNameAffectsLetterSpacing || false;
 		this.attachedData = options.attachedData || null;
@@ -2528,43 +2531,3 @@ class DidChangeContentEmitter extends Disposable {
 		this._slowEmitter.fire(e);
 	}
 }
-
-/**
- * @internal
- */
-export class AttachedViews {
-	private readonly _onDidChangeVisibleRanges = new Emitter<{ view: model.IAttachedView; state: IAttachedViewState | undefined }>();
-	public readonly onDidChangeVisibleRanges = this._onDidChangeVisibleRanges.event;
-
-	private readonly _views = new Set<AttachedViewImpl>();
-
-	public attachView(): model.IAttachedView {
-		const view = new AttachedViewImpl((state) => {
-			this._onDidChangeVisibleRanges.fire({ view, state });
-		});
-		this._views.add(view);
-		return view;
-	}
-
-	public detachView(view: model.IAttachedView): void {
-		this._views.delete(view as AttachedViewImpl);
-		this._onDidChangeVisibleRanges.fire({ view, state: undefined });
-	}
-}
-
-/**
- * @internal
- */
-export interface IAttachedViewState {
-	readonly visibleLineRanges: readonly LineRange[];
-	readonly stabilized: boolean;
-}
-
-class AttachedViewImpl implements model.IAttachedView {
-	constructor(private readonly handleStateChange: (state: IAttachedViewState) => void) { }
-
-	setVisibleLines(visibleLines: { startLineNumber: number; endLineNumber: number }[], stabilized: boolean): void {
-		const visibleLineRanges = visibleLines.map((line) => new LineRange(line.startLineNumber, line.endLineNumber + 1));
-		this.handleStateChange({ visibleLineRanges, stabilized });
-	}
-}
diff --git a/src/vs/editor/common/model/textModelPart.ts b/src/vs/editor/common/model/textModelPart.ts
index ef061c2ba9c..d1b2bebc823 100644
--- a/src/vs/editor/common/model/textModelPart.ts
+++ b/src/vs/editor/common/model/textModelPart.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
+import { Disposable } from '../../../base/common/lifecycle.js';
 
 export class TextModelPart extends Disposable {
 	private _isDisposed = false;
diff --git a/src/vs/editor/common/model/textModelSearch.ts b/src/vs/editor/common/model/textModelSearch.ts
index 81f6cbc5e20..ae259f035d5 100644
--- a/src/vs/editor/common/model/textModelSearch.ts
+++ b/src/vs/editor/common/model/textModelSearch.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
-import * as strings from 'vs/base/common/strings';
-import { WordCharacterClass, WordCharacterClassifier, getMapForWordSeparators } from 'vs/editor/common/core/wordCharacterClassifier';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { EndOfLinePreference, FindMatch, SearchData } from 'vs/editor/common/model';
-import { TextModel } from 'vs/editor/common/model/textModel';
+import { CharCode } from '../../../base/common/charCode.js';
+import * as strings from '../../../base/common/strings.js';
+import { WordCharacterClass, WordCharacterClassifier, getMapForWordSeparators } from '../core/wordCharacterClassifier.js';
+import { Position } from '../core/position.js';
+import { Range } from '../core/range.js';
+import { EndOfLinePreference, FindMatch, SearchData } from '../model.js';
+import { TextModel } from './textModel.js';
 
 const LIMIT_FIND_COUNT = 999;
 
diff --git a/src/vs/editor/common/model/textModelText.ts b/src/vs/editor/common/model/textModelText.ts
index 0a603fa1ed2..0a4d6de5364 100644
--- a/src/vs/editor/common/model/textModelText.ts
+++ b/src/vs/editor/common/model/textModelText.ts
@@ -3,20 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Range } from 'vs/editor/common/core/range';
-import { AbstractText } from 'vs/editor/common/core/textEdit';
-import { TextLength } from 'vs/editor/common/core/textLength';
-import { ITextModel } from 'vs/editor/common/model';
+import { Range } from '../core/range.js';
+import { AbstractText } from '../core/textEdit.js';
+import { TextLength } from '../core/textLength.js';
+import { ITextModel } from '../model.js';
 
 export class TextModelText extends AbstractText {
 	constructor(private readonly _textModel: ITextModel) {
 		super();
 	}
 
-	getValueOfRange(range: Range): string {
+	override getValueOfRange(range: Range): string {
 		return this._textModel.getValueInRange(range);
 	}
 
+	override getLineLength(lineNumber: number): number {
+		return this._textModel.getLineLength(lineNumber);
+	}
+
 	get length(): TextLength {
 		const lastLineNumber = this._textModel.getLineCount();
 		const lastLineLen = this._textModel.getLineLength(lastLineNumber);
diff --git a/src/vs/editor/common/model/textModelTokens.ts b/src/vs/editor/common/model/textModelTokens.ts
index fb1b7364d49..85068d38984 100644
--- a/src/vs/editor/common/model/textModelTokens.ts
+++ b/src/vs/editor/common/model/textModelTokens.ts
@@ -3,22 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IdleDeadline, runWhenGlobalIdle } from 'vs/base/common/async';
-import { BugIndicatingError, onUnexpectedError } from 'vs/base/common/errors';
-import { setTimeout0 } from 'vs/base/common/platform';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { countEOL } from 'vs/editor/common/core/eolCounter';
-import { LineRange } from 'vs/editor/common/core/lineRange';
-import { OffsetRange } from 'vs/editor/common/core/offsetRange';
-import { Position } from 'vs/editor/common/core/position';
-import { StandardTokenType } from 'vs/editor/common/encodedTokenAttributes';
-import { EncodedTokenizationResult, IBackgroundTokenizationStore, IBackgroundTokenizer, ILanguageIdCodec, IState, ITokenizationSupport } from 'vs/editor/common/languages';
-import { nullTokenizeEncoded } from 'vs/editor/common/languages/nullTokenize';
-import { ITextModel } from 'vs/editor/common/model';
-import { FixedArray } from 'vs/editor/common/model/fixedArray';
-import { IModelContentChange } from 'vs/editor/common/textModelEvents';
-import { ContiguousMultilineTokensBuilder } from 'vs/editor/common/tokens/contiguousMultilineTokensBuilder';
-import { LineTokens } from 'vs/editor/common/tokens/lineTokens';
+import { IdleDeadline, runWhenGlobalIdle } from '../../../base/common/async.js';
+import { BugIndicatingError, onUnexpectedError } from '../../../base/common/errors.js';
+import { setTimeout0 } from '../../../base/common/platform.js';
+import { StopWatch } from '../../../base/common/stopwatch.js';
+import { countEOL } from '../core/eolCounter.js';
+import { LineRange } from '../core/lineRange.js';
+import { OffsetRange } from '../core/offsetRange.js';
+import { Position } from '../core/position.js';
+import { StandardTokenType } from '../encodedTokenAttributes.js';
+import { EncodedTokenizationResult, IBackgroundTokenizationStore, IBackgroundTokenizer, ILanguageIdCodec, IState, ITokenizationSupport } from '../languages.js';
+import { nullTokenizeEncoded } from '../languages/nullTokenize.js';
+import { ITextModel } from '../model.js';
+import { FixedArray } from './fixedArray.js';
+import { IModelContentChange } from '../textModelEvents.js';
+import { ITokenizeLineWithEditResult, LineEditWithAdditionalLines } from '../tokenizationTextModelPart.js';
+import { ContiguousMultilineTokensBuilder } from '../tokens/contiguousMultilineTokensBuilder.js';
+import { LineTokens } from '../tokens/lineTokens.js';
 
 const enum Constants {
 	CHEAP_TOKENIZATION_LENGTH_LIMIT = 2048
@@ -101,18 +102,14 @@ export class TokenizerWithStateStoreAndTextModel<TState extends IState = IState>
 	}
 
 	/** assumes state is up to date */
-	public tokenizeLineWithEdit(position: Position, length: number, newText: string): LineTokens | null {
-		const lineNumber = position.lineNumber;
-		const column = position.column;
-
+	public tokenizeLineWithEdit(lineNumber: number, edit: LineEditWithAdditionalLines): ITokenizeLineWithEditResult {
 		const lineStartState = this.getStartState(lineNumber);
 		if (!lineStartState) {
-			return null;
+			return { mainLineTokens: null, additionalLines: null };
 		}
 
 		const curLineContent = this._textModel.getLineContent(lineNumber);
-		const newLineContent = curLineContent.substring(0, column - 1)
-			+ newText + curLineContent.substring(column - 1 + length);
+		const newLineContent = edit.lineEdit.apply(curLineContent);
 
 		const languageId = this._textModel.getLanguageIdAtPosition(lineNumber, 0);
 		const result = safeTokenize(
@@ -124,8 +121,19 @@ export class TokenizerWithStateStoreAndTextModel<TState extends IState = IState>
 			lineStartState
 		);
 
-		const lineTokens = new LineTokens(result.tokens, newLineContent, this._languageIdCodec);
-		return lineTokens;
+		let additionalLines: LineTokens[] | null = null;
+		if (edit.additionalLines) {
+			additionalLines = [];
+			let state = result.endState;
+			for (const line of edit.additionalLines) {
+				const r = safeTokenize(this._languageIdCodec, languageId, this.tokenizationSupport, line, true, state);
+				additionalLines.push(new LineTokens(r.tokens, line, this._languageIdCodec));
+				state = r.endState;
+			}
+		}
+
+		const mainLineTokens = new LineTokens(result.tokens, newLineContent, this._languageIdCodec);
+		return { mainLineTokens, additionalLines };
 	}
 
 	public hasAccurateTokensForLine(lineNumber: number): boolean {
diff --git a/src/vs/editor/common/model/tokenizationTextModelPart.ts b/src/vs/editor/common/model/tokenizationTextModelPart.ts
index 40c6c921afc..ae4bc09c82e 100644
--- a/src/vs/editor/common/model/tokenizationTextModelPart.ts
+++ b/src/vs/editor/common/model/tokenizationTextModelPart.ts
@@ -3,34 +3,35 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { equals } from 'vs/base/common/arrays';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { CharCode } from 'vs/base/common/charCode';
-import { BugIndicatingError, onUnexpectedError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableMap, MutableDisposable } from 'vs/base/common/lifecycle';
-import { countEOL } from 'vs/editor/common/core/eolCounter';
-import { LineRange } from 'vs/editor/common/core/lineRange';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { IWordAtPosition, getWordAtText } from 'vs/editor/common/core/wordHelper';
-import { StandardTokenType } from 'vs/editor/common/encodedTokenAttributes';
-import { IBackgroundTokenizationStore, IBackgroundTokenizer, ILanguageIdCodec, IState, ITokenizationSupport, TokenizationRegistry } from 'vs/editor/common/languages';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ILanguageConfigurationService, LanguageConfigurationServiceChangeEvent, ResolvedLanguageConfiguration } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { IAttachedView } from 'vs/editor/common/model';
-import { BracketPairsTextModelPart } from 'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsImpl';
-import { AttachedViews, IAttachedViewState, TextModel } from 'vs/editor/common/model/textModel';
-import { TextModelPart } from 'vs/editor/common/model/textModelPart';
-import { DefaultBackgroundTokenizer, TokenizerWithStateStoreAndTextModel, TrackingTokenizationStateStore } from 'vs/editor/common/model/textModelTokens';
-import { IModelContentChangedEvent, IModelLanguageChangedEvent, IModelLanguageConfigurationChangedEvent, IModelTokensChangedEvent } from 'vs/editor/common/textModelEvents';
-import { BackgroundTokenizationState, ITokenizationTextModelPart } from 'vs/editor/common/tokenizationTextModelPart';
-import { ContiguousMultilineTokens } from 'vs/editor/common/tokens/contiguousMultilineTokens';
-import { ContiguousMultilineTokensBuilder } from 'vs/editor/common/tokens/contiguousMultilineTokensBuilder';
-import { ContiguousTokensStore } from 'vs/editor/common/tokens/contiguousTokensStore';
-import { LineTokens } from 'vs/editor/common/tokens/lineTokens';
-import { SparseMultilineTokens } from 'vs/editor/common/tokens/sparseMultilineTokens';
-import { SparseTokensStore } from 'vs/editor/common/tokens/sparseTokensStore';
+import { CharCode } from '../../../base/common/charCode.js';
+import { BugIndicatingError, onUnexpectedError } from '../../../base/common/errors.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { DisposableMap, DisposableStore, MutableDisposable } from '../../../base/common/lifecycle.js';
+import { countEOL } from '../core/eolCounter.js';
+import { LineRange } from '../core/lineRange.js';
+import { IPosition, Position } from '../core/position.js';
+import { Range } from '../core/range.js';
+import { IWordAtPosition, getWordAtText } from '../core/wordHelper.js';
+import { StandardTokenType } from '../encodedTokenAttributes.js';
+import { IBackgroundTokenizationStore, IBackgroundTokenizer, ILanguageIdCodec, IState, ITokenizationSupport, TokenizationRegistry, TreeSitterTokenizationRegistry } from '../languages.js';
+import { ILanguageService } from '../languages/language.js';
+import { ILanguageConfigurationService, LanguageConfigurationServiceChangeEvent, ResolvedLanguageConfiguration } from '../languages/languageConfigurationRegistry.js';
+import { IAttachedView } from '../model.js';
+import { BracketPairsTextModelPart } from './bracketPairsTextModelPart/bracketPairsImpl.js';
+import { TextModel } from './textModel.js';
+import { TextModelPart } from './textModelPart.js';
+import { DefaultBackgroundTokenizer, TokenizerWithStateStoreAndTextModel, TrackingTokenizationStateStore } from './textModelTokens.js';
+import { AbstractTokens, AttachedViewHandler, AttachedViews } from './tokens.js';
+import { TreeSitterTokens } from './treeSitterTokens.js';
+import { ITreeSitterParserService } from '../services/treeSitterParserService.js';
+import { IModelContentChangedEvent, IModelLanguageChangedEvent, IModelLanguageConfigurationChangedEvent, IModelTokensChangedEvent } from '../textModelEvents.js';
+import { BackgroundTokenizationState, ITokenizationTextModelPart, ITokenizeLineWithEditResult, LineEditWithAdditionalLines } from '../tokenizationTextModelPart.js';
+import { ContiguousMultilineTokens } from '../tokens/contiguousMultilineTokens.js';
+import { ContiguousMultilineTokensBuilder } from '../tokens/contiguousMultilineTokensBuilder.js';
+import { ContiguousTokensStore } from '../tokens/contiguousTokensStore.js';
+import { LineTokens } from '../tokens/lineTokens.js';
+import { SparseMultilineTokens } from '../tokens/sparseMultilineTokens.js';
+import { SparseTokensStore } from '../tokens/sparseTokensStore.js';
 
 export class TokenizationTextModelPart extends TextModelPart implements ITokenizationTextModelPart {
 	private readonly _semanticTokens: SparseTokensStore = new SparseTokensStore(this._languageService.languageIdCodec);
@@ -44,25 +45,71 @@ export class TokenizationTextModelPart extends TextModelPart implements ITokeniz
 	private readonly _onDidChangeTokens: Emitter<IModelTokensChangedEvent> = this._register(new Emitter<IModelTokensChangedEvent>());
 	public readonly onDidChangeTokens: Event<IModelTokensChangedEvent> = this._onDidChangeTokens.event;
 
-	private readonly grammarTokens = this._register(new GrammarTokens(this._languageService.languageIdCodec, this._textModel, () => this._languageId, this._attachedViews));
+	private _tokens!: AbstractTokens;
+	private readonly _tokensDisposables: DisposableStore = this._register(new DisposableStore());
 
 	constructor(
-		private readonly _languageService: ILanguageService,
-		private readonly _languageConfigurationService: ILanguageConfigurationService,
 		private readonly _textModel: TextModel,
 		private readonly _bracketPairsTextModelPart: BracketPairsTextModelPart,
 		private _languageId: string,
 		private readonly _attachedViews: AttachedViews,
+		@ILanguageService private readonly _languageService: ILanguageService,
+		@ILanguageConfigurationService private readonly _languageConfigurationService: ILanguageConfigurationService,
+		@ITreeSitterParserService private readonly _treeSitterService: ITreeSitterParserService,
 	) {
 		super();
 
-		this._register(this.grammarTokens.onDidChangeTokens(e => {
+		this._register(this._languageConfigurationService.onDidChange(e => {
+			if (e.affects(this._languageId)) {
+				this._onDidChangeLanguageConfiguration.fire({});
+			}
+		}));
+
+		// We just look at registry changes to determine whether to use tree sitter.
+		// This means that removing a language from the setting will not cause a switch to textmate and will require a reload.
+		// Adding a language to the setting will not need a reload, however.
+		this._register(Event.filter(TreeSitterTokenizationRegistry.onDidChange, (e) => e.changedLanguages.includes(this._languageId))(() => {
+			this.createPreferredTokenProvider();
+		}));
+		this.createPreferredTokenProvider();
+	}
+
+	private createGrammarTokens() {
+		return this._register(new GrammarTokens(this._languageService.languageIdCodec, this._textModel, () => this._languageId, this._attachedViews));
+	}
+
+	private createTreeSitterTokens(): AbstractTokens {
+		return this._register(new TreeSitterTokens(this._treeSitterService, this._languageService.languageIdCodec, this._textModel, () => this._languageId));
+	}
+
+	private createTokens(useTreeSitter: boolean): void {
+		const needsReset = this._tokens !== undefined;
+		this._tokens?.dispose();
+		this._tokens = useTreeSitter ? this.createTreeSitterTokens() : this.createGrammarTokens();
+		this._tokensDisposables.clear();
+		this._tokensDisposables.add(this._tokens.onDidChangeTokens(e => {
 			this._emitModelTokensChangedEvent(e);
 		}));
 
-		this._register(this.grammarTokens.onDidChangeBackgroundTokenizationState(e => {
+		this._tokensDisposables.add(this._tokens.onDidChangeBackgroundTokenizationState(e => {
 			this._bracketPairsTextModelPart.handleDidChangeBackgroundTokenizationState();
 		}));
+		if (needsReset) {
+			// We need to reset the tokenization, as the new token provider otherwise won't have a chance to provide tokens until some action happens in the editor.
+			this._tokens.resetTokenization();
+		}
+	}
+
+	private createPreferredTokenProvider() {
+		if (TreeSitterTokenizationRegistry.get(this._languageId)) {
+			if (!(this._tokens instanceof TreeSitterTokens)) {
+				this.createTokens(true);
+			}
+		} else {
+			if (!(this._tokens instanceof GrammarTokens)) {
+				this.createTokens(false);
+			}
+		}
 	}
 
 	_hasListeners(): boolean {
@@ -94,11 +141,11 @@ export class TokenizationTextModelPart extends TextModelPart implements ITokeniz
 			}
 		}
 
-		this.grammarTokens.handleDidChangeContent(e);
+		this._tokens.handleDidChangeContent(e);
 	}
 
 	public handleDidChangeAttached(): void {
-		this.grammarTokens.handleDidChangeAttached();
+		this._tokens.handleDidChangeAttached();
 	}
 
 	/**
@@ -106,7 +153,7 @@ export class TokenizationTextModelPart extends TextModelPart implements ITokeniz
 	 */
 	public getLineTokens(lineNumber: number): LineTokens {
 		this.validateLineNumber(lineNumber);
-		const syntacticTokens = this.grammarTokens.getLineTokens(lineNumber);
+		const syntacticTokens = this._tokens.getLineTokens(lineNumber);
 		return this._semanticTokens.addSparseTokens(lineNumber, syntacticTokens);
 	}
 
@@ -126,43 +173,43 @@ export class TokenizationTextModelPart extends TextModelPart implements ITokeniz
 	}
 
 	public get hasTokens(): boolean {
-		return this.grammarTokens.hasTokens;
+		return this._tokens.hasTokens;
 	}
 
 	public resetTokenization() {
-		this.grammarTokens.resetTokenization();
+		this._tokens.resetTokenization();
 	}
 
 	public get backgroundTokenizationState() {
-		return this.grammarTokens.backgroundTokenizationState;
+		return this._tokens.backgroundTokenizationState;
 	}
 
 	public forceTokenization(lineNumber: number): void {
 		this.validateLineNumber(lineNumber);
-		this.grammarTokens.forceTokenization(lineNumber);
+		this._tokens.forceTokenization(lineNumber);
 	}
 
 	public hasAccurateTokensForLine(lineNumber: number): boolean {
 		this.validateLineNumber(lineNumber);
-		return this.grammarTokens.hasAccurateTokensForLine(lineNumber);
+		return this._tokens.hasAccurateTokensForLine(lineNumber);
 	}
 
 	public isCheapToTokenize(lineNumber: number): boolean {
 		this.validateLineNumber(lineNumber);
-		return this.grammarTokens.isCheapToTokenize(lineNumber);
+		return this._tokens.isCheapToTokenize(lineNumber);
 	}
 
 	public tokenizeIfCheap(lineNumber: number): void {
 		this.validateLineNumber(lineNumber);
-		this.grammarTokens.tokenizeIfCheap(lineNumber);
+		this._tokens.tokenizeIfCheap(lineNumber);
 	}
 
 	public getTokenTypeIfInsertingCharacter(lineNumber: number, column: number, character: string): StandardTokenType {
-		return this.grammarTokens.getTokenTypeIfInsertingCharacter(lineNumber, column, character);
+		return this._tokens.getTokenTypeIfInsertingCharacter(lineNumber, column, character);
 	}
 
-	public tokenizeLineWithEdit(position: IPosition, length: number, newText: string): LineTokens | null {
-		return this.grammarTokens.tokenizeLineWithEdit(position, length, newText);
+	public tokenizeLineWithEdit(lineNumber: number, edit: LineEditWithAdditionalLines): ITokenizeLineWithEditResult {
+		return this._tokens.tokenizeLineWithEdit(lineNumber, edit);
 	}
 
 	// #endregion
@@ -327,7 +374,8 @@ export class TokenizationTextModelPart extends TextModelPart implements ITokeniz
 		this._languageId = languageId;
 
 		this._bracketPairsTextModelPart.handleDidChangeLanguage(e);
-		this.grammarTokens.resetTokenization();
+		this._tokens.resetTokenization();
+		this.createPreferredTokenProvider();
 		this._onDidChangeLanguage.fire(e);
 		this._onDidChangeLanguageConfiguration.fire({});
 	}
@@ -335,7 +383,7 @@ export class TokenizationTextModelPart extends TextModelPart implements ITokeniz
 	// #endregion
 }
 
-class GrammarTokens extends Disposable {
+class GrammarTokens extends AbstractTokens {
 	private _tokenizer: TokenizerWithStateStoreAndTextModel | null = null;
 	private _defaultBackgroundTokenizer: DefaultBackgroundTokenizer | null = null;
 	private readonly _backgroundTokenizer = this._register(new MutableDisposable<IBackgroundTokenizer>());
@@ -346,28 +394,15 @@ class GrammarTokens extends Disposable {
 
 	private readonly _debugBackgroundTokenizer = this._register(new MutableDisposable<IBackgroundTokenizer>());
 
-	private _backgroundTokenizationState = BackgroundTokenizationState.InProgress;
-	public get backgroundTokenizationState(): BackgroundTokenizationState {
-		return this._backgroundTokenizationState;
-	}
-
-	private readonly _onDidChangeBackgroundTokenizationState = this._register(new Emitter<void>());
-	/** @internal, should not be exposed by the text model! */
-	public readonly onDidChangeBackgroundTokenizationState: Event<void> = this._onDidChangeBackgroundTokenizationState.event;
-
-	private readonly _onDidChangeTokens = this._register(new Emitter<IModelTokensChangedEvent>());
-	/** @internal, should not be exposed by the text model! */
-	public readonly onDidChangeTokens: Event<IModelTokensChangedEvent> = this._onDidChangeTokens.event;
-
 	private readonly _attachedViewStates = this._register(new DisposableMap<IAttachedView, AttachedViewHandler>());
 
 	constructor(
-		private readonly _languageIdCodec: ILanguageIdCodec,
-		private readonly _textModel: TextModel,
-		private getLanguageId: () => string,
+		languageIdCodec: ILanguageIdCodec,
+		textModel: TextModel,
+		getLanguageId: () => string,
 		attachedViews: AttachedViews,
 	) {
-		super();
+		super(languageIdCodec, textModel, getLanguageId);
 
 		this._register(TokenizationRegistry.onDidChange((e) => {
 			const languageId = this.getLanguageId();
@@ -587,12 +622,6 @@ class GrammarTokens extends Disposable {
 		return this._tokenizer.isCheapToTokenize(lineNumber);
 	}
 
-	public tokenizeIfCheap(lineNumber: number): void {
-		if (this.isCheapToTokenize(lineNumber)) {
-			this.forceTokenization(lineNumber);
-		}
-	}
-
 	public getLineTokens(lineNumber: number): LineTokens {
 		const lineText = this._textModel.getLineContent(lineNumber);
 		const result = this._tokens.getTokens(
@@ -625,47 +654,15 @@ class GrammarTokens extends Disposable {
 		return this._tokenizer.getTokenTypeIfInsertingCharacter(position, character);
 	}
 
-	public tokenizeLineWithEdit(position: IPosition, length: number, newText: string): LineTokens | null {
+	public tokenizeLineWithEdit(lineNumber: number, edit: LineEditWithAdditionalLines): ITokenizeLineWithEditResult {
 		if (!this._tokenizer) {
-			return null;
+			return { mainLineTokens: null, additionalLines: null };
 		}
-
-		const validatedPosition = this._textModel.validatePosition(position);
-		this.forceTokenization(validatedPosition.lineNumber);
-		return this._tokenizer.tokenizeLineWithEdit(validatedPosition, length, newText);
+		this.forceTokenization(lineNumber);
+		return this._tokenizer.tokenizeLineWithEdit(lineNumber, edit);
 	}
 
 	public get hasTokens(): boolean {
 		return this._tokens.hasTokens;
 	}
 }
-
-class AttachedViewHandler extends Disposable {
-	private readonly runner = this._register(new RunOnceScheduler(() => this.update(), 50));
-
-	private _computedLineRanges: readonly LineRange[] = [];
-	private _lineRanges: readonly LineRange[] = [];
-	public get lineRanges(): readonly LineRange[] { return this._lineRanges; }
-
-	constructor(private readonly _refreshTokens: () => void) {
-		super();
-	}
-
-	private update(): void {
-		if (equals(this._computedLineRanges, this._lineRanges, (a, b) => a.equals(b))) {
-			return;
-		}
-		this._computedLineRanges = this._lineRanges;
-		this._refreshTokens();
-	}
-
-	public handleStateChange(state: IAttachedViewState): void {
-		this._lineRanges = state.visibleLineRanges;
-		if (state.stabilized) {
-			this.runner.cancel();
-			this.update();
-		} else {
-			this.runner.schedule();
-		}
-	}
-}
diff --git a/src/vs/editor/common/model/tokens.ts b/src/vs/editor/common/model/tokens.ts
new file mode 100644
index 00000000000..0e4ed56480c
--- /dev/null
+++ b/src/vs/editor/common/model/tokens.ts
@@ -0,0 +1,137 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { equals } from '../../../base/common/arrays.js';
+import { RunOnceScheduler } from '../../../base/common/async.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { LineRange } from '../core/lineRange.js';
+import { StandardTokenType } from '../encodedTokenAttributes.js';
+import { ILanguageIdCodec } from '../languages.js';
+import { IAttachedView } from '../model.js';
+import { TextModel } from './textModel.js';
+import { IModelContentChangedEvent, IModelTokensChangedEvent } from '../textModelEvents.js';
+import { BackgroundTokenizationState, ITokenizeLineWithEditResult, LineEditWithAdditionalLines } from '../tokenizationTextModelPart.js';
+import { LineTokens } from '../tokens/lineTokens.js';
+
+/**
+ * @internal
+ */
+export class AttachedViews {
+	private readonly _onDidChangeVisibleRanges = new Emitter<{ view: IAttachedView; state: IAttachedViewState | undefined }>();
+	public readonly onDidChangeVisibleRanges = this._onDidChangeVisibleRanges.event;
+
+	private readonly _views = new Set<AttachedViewImpl>();
+
+	public attachView(): IAttachedView {
+		const view = new AttachedViewImpl((state) => {
+			this._onDidChangeVisibleRanges.fire({ view, state });
+		});
+		this._views.add(view);
+		return view;
+	}
+
+	public detachView(view: IAttachedView): void {
+		this._views.delete(view as AttachedViewImpl);
+		this._onDidChangeVisibleRanges.fire({ view, state: undefined });
+	}
+}
+
+/**
+ * @internal
+ */
+export interface IAttachedViewState {
+	readonly visibleLineRanges: readonly LineRange[];
+	readonly stabilized: boolean;
+}
+
+class AttachedViewImpl implements IAttachedView {
+	constructor(private readonly handleStateChange: (state: IAttachedViewState) => void) { }
+
+	setVisibleLines(visibleLines: { startLineNumber: number; endLineNumber: number }[], stabilized: boolean): void {
+		const visibleLineRanges = visibleLines.map((line) => new LineRange(line.startLineNumber, line.endLineNumber + 1));
+		this.handleStateChange({ visibleLineRanges, stabilized });
+	}
+}
+
+
+export class AttachedViewHandler extends Disposable {
+	private readonly runner = this._register(new RunOnceScheduler(() => this.update(), 50));
+
+	private _computedLineRanges: readonly LineRange[] = [];
+	private _lineRanges: readonly LineRange[] = [];
+	public get lineRanges(): readonly LineRange[] { return this._lineRanges; }
+
+	constructor(private readonly _refreshTokens: () => void) {
+		super();
+	}
+
+	private update(): void {
+		if (equals(this._computedLineRanges, this._lineRanges, (a, b) => a.equals(b))) {
+			return;
+		}
+		this._computedLineRanges = this._lineRanges;
+		this._refreshTokens();
+	}
+
+	public handleStateChange(state: IAttachedViewState): void {
+		this._lineRanges = state.visibleLineRanges;
+		if (state.stabilized) {
+			this.runner.cancel();
+			this.update();
+		} else {
+			this.runner.schedule();
+		}
+	}
+}
+
+export abstract class AbstractTokens extends Disposable {
+	protected _backgroundTokenizationState = BackgroundTokenizationState.InProgress;
+	public get backgroundTokenizationState(): BackgroundTokenizationState {
+		return this._backgroundTokenizationState;
+	}
+
+	protected readonly _onDidChangeBackgroundTokenizationState = this._register(new Emitter<void>());
+	/** @internal, should not be exposed by the text model! */
+	public readonly onDidChangeBackgroundTokenizationState: Event<void> = this._onDidChangeBackgroundTokenizationState.event;
+
+	protected readonly _onDidChangeTokens = this._register(new Emitter<IModelTokensChangedEvent>());
+	/** @internal, should not be exposed by the text model! */
+	public readonly onDidChangeTokens: Event<IModelTokensChangedEvent> = this._onDidChangeTokens.event;
+
+	constructor(
+		protected readonly _languageIdCodec: ILanguageIdCodec,
+		protected readonly _textModel: TextModel,
+		protected getLanguageId: () => string,
+	) {
+		super();
+	}
+
+	public abstract resetTokenization(fireTokenChangeEvent?: boolean): void;
+
+	public abstract handleDidChangeAttached(): void;
+
+	public abstract handleDidChangeContent(e: IModelContentChangedEvent): void;
+
+	public abstract forceTokenization(lineNumber: number): void;
+
+	public abstract hasAccurateTokensForLine(lineNumber: number): boolean;
+
+	public abstract isCheapToTokenize(lineNumber: number): boolean;
+
+	public tokenizeIfCheap(lineNumber: number): void {
+		if (this.isCheapToTokenize(lineNumber)) {
+			this.forceTokenization(lineNumber);
+		}
+	}
+
+	public abstract getLineTokens(lineNumber: number): LineTokens;
+
+	public abstract getTokenTypeIfInsertingCharacter(lineNumber: number, column: number, character: string): StandardTokenType;
+
+	public abstract tokenizeLineWithEdit(lineNumber: number, edit: LineEditWithAdditionalLines): ITokenizeLineWithEditResult;
+
+	public abstract get hasTokens(): boolean;
+}
diff --git a/src/vs/editor/common/model/treeSitterTokens.ts b/src/vs/editor/common/model/treeSitterTokens.ts
new file mode 100644
index 00000000000..43ab00f0f0f
--- /dev/null
+++ b/src/vs/editor/common/model/treeSitterTokens.ts
@@ -0,0 +1,107 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ILanguageIdCodec, ITreeSitterTokenizationSupport, TreeSitterTokenizationRegistry } from '../languages.js';
+import { LineTokens } from '../tokens/lineTokens.js';
+import { StandardTokenType } from '../encodedTokenAttributes.js';
+import { TextModel } from './textModel.js';
+import { ITreeSitterParserService } from '../services/treeSitterParserService.js';
+import { IModelContentChangedEvent } from '../textModelEvents.js';
+import { AbstractTokens } from './tokens.js';
+import { ITokenizeLineWithEditResult, LineEditWithAdditionalLines } from '../tokenizationTextModelPart.js';
+import { IDisposable, MutableDisposable } from '../../../base/common/lifecycle.js';
+
+export class TreeSitterTokens extends AbstractTokens {
+	private _tokenizationSupport: ITreeSitterTokenizationSupport | null = null;
+	private _lastLanguageId: string | undefined;
+	private readonly _tokensChangedListener: MutableDisposable<IDisposable> = this._register(new MutableDisposable());
+
+	constructor(private readonly _treeSitterService: ITreeSitterParserService,
+		languageIdCodec: ILanguageIdCodec,
+		textModel: TextModel,
+		languageId: () => string) {
+		super(languageIdCodec, textModel, languageId);
+
+		this._initialize();
+	}
+
+	private _initialize() {
+		const newLanguage = this.getLanguageId();
+		if (!this._tokenizationSupport || this._lastLanguageId !== newLanguage) {
+			this._lastLanguageId = newLanguage;
+			this._tokenizationSupport = TreeSitterTokenizationRegistry.get(newLanguage);
+			this._tokensChangedListener.value = this._tokenizationSupport?.onDidChangeTokens((e) => {
+				if (e.textModel === this._textModel) {
+					this._onDidChangeTokens.fire(e.changes);
+				}
+			});
+		}
+	}
+
+	public getLineTokens(lineNumber: number): LineTokens {
+		const content = this._textModel.getLineContent(lineNumber);
+		if (this._tokenizationSupport) {
+			const rawTokens = this._tokenizationSupport.tokenizeEncoded(lineNumber, this._textModel);
+			if (rawTokens) {
+				return new LineTokens(rawTokens, content, this._languageIdCodec);
+			}
+		}
+		return LineTokens.createEmpty(content, this._languageIdCodec);
+	}
+
+	public resetTokenization(fireTokenChangeEvent: boolean = true): void {
+		if (fireTokenChangeEvent) {
+			this._onDidChangeTokens.fire({
+				semanticTokensApplied: false,
+				ranges: [
+					{
+						fromLineNumber: 1,
+						toLineNumber: this._textModel.getLineCount(),
+					},
+				],
+			});
+		}
+		this._initialize();
+	}
+
+	public override handleDidChangeAttached(): void {
+		// TODO @alexr00 implement for background tokenization
+	}
+
+	public override handleDidChangeContent(e: IModelContentChangedEvent): void {
+		if (e.isFlush) {
+			// Don't fire the event, as the view might not have got the text change event yet
+			this.resetTokenization(false);
+		}
+	}
+
+	public override forceTokenization(lineNumber: number): void {
+		// TODO @alexr00 implement
+	}
+
+	public override hasAccurateTokensForLine(lineNumber: number): boolean {
+		// TODO @alexr00 update for background tokenization
+		return true;
+	}
+
+	public override isCheapToTokenize(lineNumber: number): boolean {
+		// TODO @alexr00 update for background tokenization
+		return true;
+	}
+
+	public override getTokenTypeIfInsertingCharacter(lineNumber: number, column: number, character: string): StandardTokenType {
+		// TODO @alexr00 implement once we have custom parsing and don't just feed in the whole text model value
+		return StandardTokenType.Other;
+	}
+	public override tokenizeLineWithEdit(lineNumber: number, edit: LineEditWithAdditionalLines): ITokenizeLineWithEditResult {
+		// TODO @alexr00 understand what this is for and implement
+		return { mainLineTokens: null, additionalLines: null };
+	}
+	public override get hasTokens(): boolean {
+		// TODO @alexr00 once we have a token store, implement properly
+		const hasTree = this._treeSitterService.getParseResult(this._textModel) !== undefined;
+		return hasTree;
+	}
+}
diff --git a/src/vs/editor/common/model/utils.ts b/src/vs/editor/common/model/utils.ts
index 96148dfdeea..5fde2c377c1 100644
--- a/src/vs/editor/common/model/utils.ts
+++ b/src/vs/editor/common/model/utils.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
+import { CharCode } from '../../../base/common/charCode.js';
 
 /**
  * Returns:
diff --git a/src/vs/editor/common/modelLineProjectionData.ts b/src/vs/editor/common/modelLineProjectionData.ts
index 78d14ef17de..f35a4adc6e5 100644
--- a/src/vs/editor/common/modelLineProjectionData.ts
+++ b/src/vs/editor/common/modelLineProjectionData.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { assertNever } from 'vs/base/common/assert';
-import { WrappingIndent } from 'vs/editor/common/config/editorOptions';
-import { FontInfo } from 'vs/editor/common/config/fontInfo';
-import { Position } from 'vs/editor/common/core/position';
-import { InjectedTextCursorStops, InjectedTextOptions, PositionAffinity } from 'vs/editor/common/model';
-import { LineInjectedText } from 'vs/editor/common/textModelEvents';
+import { assertNever } from '../../base/common/assert.js';
+import { WrappingIndent } from './config/editorOptions.js';
+import { FontInfo } from './config/fontInfo.js';
+import { Position } from './core/position.js';
+import { InjectedTextCursorStops, InjectedTextOptions, PositionAffinity } from './model.js';
+import { LineInjectedText } from './textModelEvents.js';
 
 /**
  * *input*:
diff --git a/src/vs/editor/common/services/editorBaseApi.ts b/src/vs/editor/common/services/editorBaseApi.ts
index 3a27abbaf7a..6fbc1c4df93 100644
--- a/src/vs/editor/common/services/editorBaseApi.ts
+++ b/src/vs/editor/common/services/editorBaseApi.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Emitter } from 'vs/base/common/event';
-import { KeyChord, KeyMod as ConstKeyMod } from 'vs/base/common/keyCodes';
-import { URI } from 'vs/base/common/uri';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { Token } from 'vs/editor/common/languages';
-import * as standaloneEnums from 'vs/editor/common/standalone/standaloneEnums';
+import { CancellationTokenSource } from '../../../base/common/cancellation.js';
+import { Emitter } from '../../../base/common/event.js';
+import { KeyChord, KeyMod as ConstKeyMod } from '../../../base/common/keyCodes.js';
+import { URI } from '../../../base/common/uri.js';
+import { Position } from '../core/position.js';
+import { Range } from '../core/range.js';
+import { Selection } from '../core/selection.js';
+import { Token } from '../languages.js';
+import * as standaloneEnums from '../standalone/standaloneEnums.js';
 
 export class KeyMod {
 	public static readonly CtrlCmd: number = ConstKeyMod.CtrlCmd;
diff --git a/src/vs/editor/common/services/editorSimpleWorker.ts b/src/vs/editor/common/services/editorSimpleWorker.ts
index 195a870b0af..2432a8f657a 100644
--- a/src/vs/editor/common/services/editorSimpleWorker.ts
+++ b/src/vs/editor/common/services/editorSimpleWorker.ts
@@ -3,32 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { stringDiff } from 'vs/base/common/diff/diff';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { IRequestHandler } from 'vs/base/common/worker/simpleWorker';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { EndOfLineSequence, ITextModel } from 'vs/editor/common/model';
-import { IMirrorTextModel, IModelChangedEvent, MirrorTextModel as BaseMirrorModel } from 'vs/editor/common/model/mirrorTextModel';
-import { ensureValidWordDefinition, getWordAtText, IWordAtPosition } from 'vs/editor/common/core/wordHelper';
-import { IColorInformation, IInplaceReplaceSupportResult, ILink, TextEdit } from 'vs/editor/common/languages';
-import { ILinkComputerTarget, computeLinks } from 'vs/editor/common/languages/linkComputer';
-import { BasicInplaceReplace } from 'vs/editor/common/languages/supports/inplaceReplaceSupport';
-import { DiffAlgorithmName, IDiffComputationResult, ILineChange, IUnicodeHighlightsResult } from 'vs/editor/common/services/editorWorker';
-import { createMonacoBaseAPI } from 'vs/editor/common/services/editorBaseApi';
-import { IEditorWorkerHost } from 'vs/editor/common/services/editorWorkerHost';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { UnicodeTextModelHighlighter, UnicodeHighlighterOptions } from 'vs/editor/common/services/unicodeTextModelHighlighter';
-import { DiffComputer, IChange } from 'vs/editor/common/diff/legacyLinesDiffComputer';
-import { ILinesDiffComputer, ILinesDiffComputerOptions } from 'vs/editor/common/diff/linesDiffComputer';
-import { DetailedLineRangeMapping } from '../diff/rangeMapping';
-import { linesDiffComputers } from 'vs/editor/common/diff/linesDiffComputers';
-import { createProxyObject, getAllMethodNames } from 'vs/base/common/objects';
-import { IDocumentDiffProviderOptions } from 'vs/editor/common/diff/documentDiffProvider';
-import { BugIndicatingError } from 'vs/base/common/errors';
-import { IDocumentColorComputerTarget, computeDefaultDocumentColors } from 'vs/editor/common/languages/defaultDocumentColorsComputer';
-import { FindSectionHeaderOptions, SectionHeader, findSectionHeaders } from 'vs/editor/common/services/findSectionHeaders';
+import { stringDiff } from '../../../base/common/diff/diff.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { URI } from '../../../base/common/uri.js';
+import { IRequestHandler, IWorkerServer } from '../../../base/common/worker/simpleWorker.js';
+import { Position } from '../core/position.js';
+import { IRange, Range } from '../core/range.js';
+import { EndOfLineSequence, ITextModel } from '../model.js';
+import { IMirrorTextModel, IModelChangedEvent } from '../model/mirrorTextModel.js';
+import { IColorInformation, IInplaceReplaceSupportResult, ILink, TextEdit } from '../languages.js';
+import { computeLinks } from '../languages/linkComputer.js';
+import { BasicInplaceReplace } from '../languages/supports/inplaceReplaceSupport.js';
+import { DiffAlgorithmName, IDiffComputationResult, ILineChange, IUnicodeHighlightsResult } from './editorWorker.js';
+import { createMonacoBaseAPI } from './editorBaseApi.js';
+import { EditorWorkerHost } from './editorWorkerHost.js';
+import { StopWatch } from '../../../base/common/stopwatch.js';
+import { UnicodeTextModelHighlighter, UnicodeHighlighterOptions } from './unicodeTextModelHighlighter.js';
+import { DiffComputer, IChange } from '../diff/legacyLinesDiffComputer.js';
+import { ILinesDiffComputer, ILinesDiffComputerOptions } from '../diff/linesDiffComputer.js';
+import { DetailedLineRangeMapping } from '../diff/rangeMapping.js';
+import { linesDiffComputers } from '../diff/linesDiffComputers.js';
+import { createProxyObject, getAllMethodNames } from '../../../base/common/objects.js';
+import { IDocumentDiffProviderOptions } from '../diff/documentDiffProvider.js';
+import { AppResourcePath, FileAccess } from '../../../base/common/network.js';
+import { BugIndicatingError } from '../../../base/common/errors.js';
+import { computeDefaultDocumentColors } from '../languages/defaultDocumentColorsComputer.js';
+import { FindSectionHeaderOptions, SectionHeader, findSectionHeaders } from './findSectionHeaders.js';
+import { IRawModelData, IWorkerTextModelSyncChannelServer } from './textModelSync/textModelSync.protocol.js';
+import { ICommonModel, WorkerTextModelSyncServer } from './textModelSync/textModelSync.impl.js';
 
 export interface IMirrorModel extends IMirrorTextModel {
 	readonly uri: URI;
@@ -47,43 +49,11 @@ export interface IWorkerContext<H = undefined> {
 	getMirrorModels(): IMirrorModel[];
 }
 
-/**
- * @internal
- */
-export interface IRawModelData {
-	url: string;
-	versionId: number;
-	lines: string[];
-	EOL: string;
-}
-
-/**
- * @internal
- */
-export interface ICommonModel extends ILinkComputerTarget, IDocumentColorComputerTarget, IMirrorModel {
-	uri: URI;
-	version: number;
-	eol: string;
-	getValue(): string;
-
-	getLinesContent(): string[];
-	getLineCount(): number;
-	getLineContent(lineNumber: number): string;
-	getLineWords(lineNumber: number, wordDefinition: RegExp): IWordAtPosition[];
-	words(wordDefinition: RegExp): Iterable<string>;
-	getWordUntilPosition(position: IPosition, wordDefinition: RegExp): IWordAtPosition;
-	getValueInRange(range: IRange): string;
-	getWordAtPosition(position: IPosition, wordDefinition: RegExp): Range | null;
-	offsetAt(position: IPosition): number;
-	positionAt(offset: number): IPosition;
-	findMatches(regex: RegExp): RegExpMatchArray[];
-}
-
 /**
  * Range of a word inside a model.
  * @internal
  */
-interface IWordRange {
+export interface IWordRange {
 	/**
 	 * The index where the word starts.
 	 */
@@ -94,246 +64,6 @@ interface IWordRange {
 	readonly end: number;
 }
 
-/**
- * @internal
- */
-class MirrorModel extends BaseMirrorModel implements ICommonModel {
-
-	public get uri(): URI {
-		return this._uri;
-	}
-
-	public get eol(): string {
-		return this._eol;
-	}
-
-	public getValue(): string {
-		return this.getText();
-	}
-
-	public findMatches(regex: RegExp): RegExpMatchArray[] {
-		const matches = [];
-		for (let i = 0; i < this._lines.length; i++) {
-			const line = this._lines[i];
-			const offsetToAdd = this.offsetAt(new Position(i + 1, 1));
-			const iteratorOverMatches = line.matchAll(regex);
-			for (const match of iteratorOverMatches) {
-				if (match.index || match.index === 0) {
-					match.index = match.index + offsetToAdd;
-				}
-				matches.push(match);
-			}
-		}
-		return matches;
-	}
-
-	public getLinesContent(): string[] {
-		return this._lines.slice(0);
-	}
-
-	public getLineCount(): number {
-		return this._lines.length;
-	}
-
-	public getLineContent(lineNumber: number): string {
-		return this._lines[lineNumber - 1];
-	}
-
-	public getWordAtPosition(position: IPosition, wordDefinition: RegExp): Range | null {
-
-		const wordAtText = getWordAtText(
-			position.column,
-			ensureValidWordDefinition(wordDefinition),
-			this._lines[position.lineNumber - 1],
-			0
-		);
-
-		if (wordAtText) {
-			return new Range(position.lineNumber, wordAtText.startColumn, position.lineNumber, wordAtText.endColumn);
-		}
-
-		return null;
-	}
-
-	public getWordUntilPosition(position: IPosition, wordDefinition: RegExp): IWordAtPosition {
-		const wordAtPosition = this.getWordAtPosition(position, wordDefinition);
-		if (!wordAtPosition) {
-			return {
-				word: '',
-				startColumn: position.column,
-				endColumn: position.column
-			};
-		}
-		return {
-			word: this._lines[position.lineNumber - 1].substring(wordAtPosition.startColumn - 1, position.column - 1),
-			startColumn: wordAtPosition.startColumn,
-			endColumn: position.column
-		};
-	}
-
-
-	public words(wordDefinition: RegExp): Iterable<string> {
-
-		const lines = this._lines;
-		const wordenize = this._wordenize.bind(this);
-
-		let lineNumber = 0;
-		let lineText = '';
-		let wordRangesIdx = 0;
-		let wordRanges: IWordRange[] = [];
-
-		return {
-			*[Symbol.iterator]() {
-				while (true) {
-					if (wordRangesIdx < wordRanges.length) {
-						const value = lineText.substring(wordRanges[wordRangesIdx].start, wordRanges[wordRangesIdx].end);
-						wordRangesIdx += 1;
-						yield value;
-					} else {
-						if (lineNumber < lines.length) {
-							lineText = lines[lineNumber];
-							wordRanges = wordenize(lineText, wordDefinition);
-							wordRangesIdx = 0;
-							lineNumber += 1;
-						} else {
-							break;
-						}
-					}
-				}
-			}
-		};
-	}
-
-	public getLineWords(lineNumber: number, wordDefinition: RegExp): IWordAtPosition[] {
-		const content = this._lines[lineNumber - 1];
-		const ranges = this._wordenize(content, wordDefinition);
-		const words: IWordAtPosition[] = [];
-		for (const range of ranges) {
-			words.push({
-				word: content.substring(range.start, range.end),
-				startColumn: range.start + 1,
-				endColumn: range.end + 1
-			});
-		}
-		return words;
-	}
-
-	private _wordenize(content: string, wordDefinition: RegExp): IWordRange[] {
-		const result: IWordRange[] = [];
-		let match: RegExpExecArray | null;
-
-		wordDefinition.lastIndex = 0; // reset lastIndex just to be sure
-
-		while (match = wordDefinition.exec(content)) {
-			if (match[0].length === 0) {
-				// it did match the empty string
-				break;
-			}
-			result.push({ start: match.index, end: match.index + match[0].length });
-		}
-		return result;
-	}
-
-	public getValueInRange(range: IRange): string {
-		range = this._validateRange(range);
-
-		if (range.startLineNumber === range.endLineNumber) {
-			return this._lines[range.startLineNumber - 1].substring(range.startColumn - 1, range.endColumn - 1);
-		}
-
-		const lineEnding = this._eol;
-		const startLineIndex = range.startLineNumber - 1;
-		const endLineIndex = range.endLineNumber - 1;
-		const resultLines: string[] = [];
-
-		resultLines.push(this._lines[startLineIndex].substring(range.startColumn - 1));
-		for (let i = startLineIndex + 1; i < endLineIndex; i++) {
-			resultLines.push(this._lines[i]);
-		}
-		resultLines.push(this._lines[endLineIndex].substring(0, range.endColumn - 1));
-
-		return resultLines.join(lineEnding);
-	}
-
-	public offsetAt(position: IPosition): number {
-		position = this._validatePosition(position);
-		this._ensureLineStarts();
-		return this._lineStarts!.getPrefixSum(position.lineNumber - 2) + (position.column - 1);
-	}
-
-	public positionAt(offset: number): IPosition {
-		offset = Math.floor(offset);
-		offset = Math.max(0, offset);
-
-		this._ensureLineStarts();
-		const out = this._lineStarts!.getIndexOf(offset);
-		const lineLength = this._lines[out.index].length;
-
-		// Ensure we return a valid position
-		return {
-			lineNumber: 1 + out.index,
-			column: 1 + Math.min(out.remainder, lineLength)
-		};
-	}
-
-	private _validateRange(range: IRange): IRange {
-
-		const start = this._validatePosition({ lineNumber: range.startLineNumber, column: range.startColumn });
-		const end = this._validatePosition({ lineNumber: range.endLineNumber, column: range.endColumn });
-
-		if (start.lineNumber !== range.startLineNumber
-			|| start.column !== range.startColumn
-			|| end.lineNumber !== range.endLineNumber
-			|| end.column !== range.endColumn) {
-
-			return {
-				startLineNumber: start.lineNumber,
-				startColumn: start.column,
-				endLineNumber: end.lineNumber,
-				endColumn: end.column
-			};
-		}
-
-		return range;
-	}
-
-	private _validatePosition(position: IPosition): IPosition {
-		if (!Position.isIPosition(position)) {
-			throw new Error('bad position');
-		}
-		let { lineNumber, column } = position;
-		let hasChanged = false;
-
-		if (lineNumber < 1) {
-			lineNumber = 1;
-			column = 1;
-			hasChanged = true;
-
-		} else if (lineNumber > this._lines.length) {
-			lineNumber = this._lines.length;
-			column = this._lines[lineNumber - 1].length + 1;
-			hasChanged = true;
-
-		} else {
-			const maxCharacter = this._lines[lineNumber - 1].length + 1;
-			if (column < 1) {
-				column = 1;
-				hasChanged = true;
-			}
-			else if (column > maxCharacter) {
-				column = maxCharacter;
-				hasChanged = true;
-			}
-		}
-
-		if (!hasChanged) {
-			return position;
-		} else {
-			return { lineNumber, column };
-		}
-	}
-}
-
 /**
  * @internal
  */
@@ -346,55 +76,38 @@ declare const require: any;
 /**
  * @internal
  */
-export class EditorSimpleWorker implements IRequestHandler, IDisposable {
+export class BaseEditorSimpleWorker implements IDisposable, IWorkerTextModelSyncChannelServer, IRequestHandler {
 	_requestHandlerBrand: any;
 
-	protected readonly _host: IEditorWorkerHost;
-	private _models: { [uri: string]: MirrorModel };
-	private readonly _foreignModuleFactory: IForeignModuleFactory | null;
-	private _foreignModule: any;
+	private readonly _workerTextModelSyncServer = new WorkerTextModelSyncServer();
 
-	constructor(host: IEditorWorkerHost, foreignModuleFactory: IForeignModuleFactory | null) {
-		this._host = host;
-		this._models = Object.create(null);
-		this._foreignModuleFactory = foreignModuleFactory;
-		this._foreignModule = null;
+	constructor() {
 	}
 
-	public dispose(): void {
-		this._models = Object.create(null);
+	dispose(): void {
 	}
 
-	protected _getModel(uri: string): ICommonModel {
-		return this._models[uri];
+	protected _getModel(uri: string): ICommonModel | undefined {
+		return this._workerTextModelSyncServer.getModel(uri);
 	}
 
-	private _getModels(): ICommonModel[] {
-		const all: MirrorModel[] = [];
-		Object.keys(this._models).forEach((key) => all.push(this._models[key]));
-		return all;
+	protected _getModels(): ICommonModel[] {
+		return this._workerTextModelSyncServer.getModels();
 	}
 
-	public acceptNewModel(data: IRawModelData): void {
-		this._models[data.url] = new MirrorModel(URI.parse(data.url), data.lines, data.EOL, data.versionId);
+	public $acceptNewModel(data: IRawModelData): void {
+		this._workerTextModelSyncServer.$acceptNewModel(data);
 	}
 
-	public acceptModelChanged(strURL: string, e: IModelChangedEvent): void {
-		if (!this._models[strURL]) {
-			return;
-		}
-		const model = this._models[strURL];
-		model.onEvents(e);
+	public $acceptModelChanged(uri: string, e: IModelChangedEvent): void {
+		this._workerTextModelSyncServer.$acceptModelChanged(uri, e);
 	}
 
-	public acceptRemovedModel(strURL: string): void {
-		if (!this._models[strURL]) {
-			return;
-		}
-		delete this._models[strURL];
+	public $acceptRemovedModel(uri: string): void {
+		this._workerTextModelSyncServer.$acceptRemovedModel(uri);
 	}
 
-	public async computeUnicodeHighlights(url: string, options: UnicodeHighlighterOptions, range?: IRange): Promise<IUnicodeHighlightsResult> {
+	public async $computeUnicodeHighlights(url: string, options: UnicodeHighlighterOptions, range?: IRange): Promise<IUnicodeHighlightsResult> {
 		const model = this._getModel(url);
 		if (!model) {
 			return { ranges: [], hasMore: false, ambiguousCharacterCount: 0, invisibleCharacterCount: 0, nonBasicAsciiCharacterCount: 0 };
@@ -402,7 +115,7 @@ export class EditorSimpleWorker implements IRequestHandler, IDisposable {
 		return UnicodeTextModelHighlighter.computeUnicodeHighlights(model, options, range);
 	}
 
-	public async findSectionHeaders(url: string, options: FindSectionHeaderOptions): Promise<SectionHeader[]> {
+	public async $findSectionHeaders(url: string, options: FindSectionHeaderOptions): Promise<SectionHeader[]> {
 		const model = this._getModel(url);
 		if (!model) {
 			return [];
@@ -412,7 +125,7 @@ export class EditorSimpleWorker implements IRequestHandler, IDisposable {
 
 	// ---- BEGIN diff --------------------------------------------------------------------------
 
-	public async computeDiff(originalUrl: string, modifiedUrl: string, options: IDocumentDiffProviderOptions, algorithm: DiffAlgorithmName): Promise<IDiffComputationResult | null> {
+	public async $computeDiff(originalUrl: string, modifiedUrl: string, options: IDocumentDiffProviderOptions, algorithm: DiffAlgorithmName): Promise<IDiffComputationResult | null> {
 		const original = this._getModel(originalUrl);
 		const modified = this._getModel(modifiedUrl);
 		if (!original || !modified) {
@@ -476,7 +189,7 @@ export class EditorSimpleWorker implements IRequestHandler, IDisposable {
 		return true;
 	}
 
-	public async computeDirtyDiff(originalUrl: string, modifiedUrl: string, ignoreTrimWhitespace: boolean): Promise<IChange[] | null> {
+	public async $computeDirtyDiff(originalUrl: string, modifiedUrl: string, ignoreTrimWhitespace: boolean): Promise<IChange[] | null> {
 		const original = this._getModel(originalUrl);
 		const modified = this._getModel(modifiedUrl);
 		if (!original || !modified) {
@@ -502,7 +215,7 @@ export class EditorSimpleWorker implements IRequestHandler, IDisposable {
 
 	private static readonly _diffLimit = 100000;
 
-	public async computeMoreMinimalEdits(modelUrl: string, edits: TextEdit[], pretty: boolean): Promise<TextEdit[]> {
+	public async $computeMoreMinimalEdits(modelUrl: string, edits: TextEdit[], pretty: boolean): Promise<TextEdit[]> {
 		const model = this._getModel(modelUrl);
 		if (!model) {
 			return edits;
@@ -584,7 +297,7 @@ export class EditorSimpleWorker implements IRequestHandler, IDisposable {
 		return result;
 	}
 
-	public computeHumanReadableDiff(modelUrl: string, edits: TextEdit[], options: ILinesDiffComputerOptions): TextEdit[] {
+	public $computeHumanReadableDiff(modelUrl: string, edits: TextEdit[], options: ILinesDiffComputerOptions): TextEdit[] {
 		const model = this._getModel(modelUrl);
 		if (!model) {
 			return edits;
@@ -684,7 +397,7 @@ export class EditorSimpleWorker implements IRequestHandler, IDisposable {
 
 	// ---- END minimal edits ---------------------------------------------------------------
 
-	public async computeLinks(modelUrl: string): Promise<ILink[] | null> {
+	public async $computeLinks(modelUrl: string): Promise<ILink[] | null> {
 		const model = this._getModel(modelUrl);
 		if (!model) {
 			return null;
@@ -695,7 +408,7 @@ export class EditorSimpleWorker implements IRequestHandler, IDisposable {
 
 	// --- BEGIN default document colors -----------------------------------------------------------
 
-	public async computeDefaultDocumentColors(modelUrl: string): Promise<IColorInformation[] | null> {
+	public async $computeDefaultDocumentColors(modelUrl: string): Promise<IColorInformation[] | null> {
 		const model = this._getModel(modelUrl);
 		if (!model) {
 			return null;
@@ -707,7 +420,7 @@ export class EditorSimpleWorker implements IRequestHandler, IDisposable {
 
 	private static readonly _suggestionsLimit = 10000;
 
-	public async textualSuggest(modelUrls: string[], leadingWord: string | undefined, wordDef: string, wordDefFlags: string): Promise<{ words: string[]; duration: number } | null> {
+	public async $textualSuggest(modelUrls: string[], leadingWord: string | undefined, wordDef: string, wordDefFlags: string): Promise<{ words: string[]; duration: number } | null> {
 
 		const sw = new StopWatch();
 		const wordDefRegExp = new RegExp(wordDef, wordDefFlags);
@@ -738,7 +451,7 @@ export class EditorSimpleWorker implements IRequestHandler, IDisposable {
 
 	//#region -- word ranges --
 
-	public async computeWordRanges(modelUrl: string, range: IRange, wordDef: string, wordDefFlags: string): Promise<{ [word: string]: IRange[] }> {
+	public async $computeWordRanges(modelUrl: string, range: IRange, wordDef: string, wordDefFlags: string): Promise<{ [word: string]: IRange[] }> {
 		const model = this._getModel(modelUrl);
 		if (!model) {
 			return Object.create(null);
@@ -769,7 +482,7 @@ export class EditorSimpleWorker implements IRequestHandler, IDisposable {
 
 	//#endregion
 
-	public async navigateValueSet(modelUrl: string, range: IRange, up: boolean, wordDef: string, wordDefFlags: string): Promise<IInplaceReplaceSupportResult | null> {
+	public async $navigateValueSet(modelUrl: string, range: IRange, up: boolean, wordDef: string, wordDefFlags: string): Promise<IInplaceReplaceSupportResult | null> {
 		const model = this._getModel(modelUrl);
 		if (!model) {
 			return null;
@@ -796,12 +509,31 @@ export class EditorSimpleWorker implements IRequestHandler, IDisposable {
 		const result = BasicInplaceReplace.INSTANCE.navigateValueSet(range, selectionText, wordRange, word, up);
 		return result;
 	}
+}
+
+/**
+ * @internal
+ */
+export class EditorSimpleWorker extends BaseEditorSimpleWorker {
+
+	private _foreignModule: any = null;
+
+	constructor(
+		private readonly _host: EditorWorkerHost,
+		private readonly _foreignModuleFactory: IForeignModuleFactory | null
+	) {
+		super();
+	}
+
+	public async $ping() {
+		return 'pong';
+	}
 
 	// ---- BEGIN foreign module support --------------------------------------------------------------------------
 
-	public loadForeignModule(moduleId: string, createData: any, foreignHostMethods: string[]): Promise<string[]> {
+	public $loadForeignModule(moduleId: string, createData: any, foreignHostMethods: string[]): Promise<string[]> {
 		const proxyMethodRequest = (method: string, args: any[]): Promise<any> => {
-			return this._host.fhr(method, args);
+			return this._host.$fhr(method, args);
 		};
 
 		const foreignHost = createProxyObject(foreignHostMethods, proxyMethodRequest);
@@ -818,24 +550,21 @@ export class EditorSimpleWorker implements IRequestHandler, IDisposable {
 			// static foreing module
 			return Promise.resolve(getAllMethodNames(this._foreignModule));
 		}
-		// ESM-comment-begin
+
 		return new Promise<any>((resolve, reject) => {
-			require([moduleId], (foreignModule: { create: IForeignModuleFactory }) => {
+
+			const onModuleCallback = (foreignModule: { create: IForeignModuleFactory }) => {
 				this._foreignModule = foreignModule.create(ctx, createData);
-
 				resolve(getAllMethodNames(this._foreignModule));
+			};
 
-			}, reject);
+			const url = FileAccess.asBrowserUri(`${moduleId}.js` as AppResourcePath).toString(true);
+			import(`${url}`).then(onModuleCallback).catch(reject);
 		});
-		// ESM-comment-end
-
-		// ESM-uncomment-begin
-		// return Promise.reject(new Error(`Unexpected usage`));
-		// ESM-uncomment-end
 	}
 
 	// foreign method request
-	public fmr(method: string, args: any[]): Promise<any> {
+	public $fmr(method: string, args: any[]): Promise<any> {
 		if (!this._foreignModule || typeof this._foreignModule[method] !== 'function') {
 			return Promise.reject(new Error('Missing requestHandler or method: ' + method));
 		}
@@ -851,11 +580,12 @@ export class EditorSimpleWorker implements IRequestHandler, IDisposable {
 }
 
 /**
- * Called on the worker side
+ * Defines the worker entry point. Must be exported and named `create`.
+ * @skipMangle
  * @internal
  */
-export function create(host: IEditorWorkerHost): IRequestHandler {
-	return new EditorSimpleWorker(host, null);
+export function create(workerServer: IWorkerServer): IRequestHandler {
+	return new EditorSimpleWorker(EditorWorkerHost.getChannel(workerServer), null);
 }
 
 // This is only available in a Web Worker
diff --git a/src/vs/editor/common/services/editorSimpleWorkerMain.ts b/src/vs/editor/common/services/editorSimpleWorkerMain.ts
new file mode 100644
index 00000000000..8d0e18738f4
--- /dev/null
+++ b/src/vs/editor/common/services/editorSimpleWorkerMain.ts
@@ -0,0 +1,9 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { create } from './editorSimpleWorker.js';
+import { bootstrapSimpleEditorWorker } from './editorWorkerBootstrap.js';
+
+bootstrapSimpleEditorWorker(create);
diff --git a/src/vs/editor/common/services/editorWorker.ts b/src/vs/editor/common/services/editorWorker.ts
index 7e87024cafc..c7b03cd784c 100644
--- a/src/vs/editor/common/services/editorWorker.ts
+++ b/src/vs/editor/common/services/editorWorker.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { IRange } from 'vs/editor/common/core/range';
-import { IDocumentDiff, IDocumentDiffProviderOptions } from 'vs/editor/common/diff/documentDiffProvider';
-import { IChange } from 'vs/editor/common/diff/legacyLinesDiffComputer';
-import { IInplaceReplaceSupportResult, TextEdit } from 'vs/editor/common/languages';
-import { UnicodeHighlighterOptions } from 'vs/editor/common/services/unicodeTextModelHighlighter';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import type { EditorSimpleWorker } from 'vs/editor/common/services/editorSimpleWorker';
-import { SectionHeader, FindSectionHeaderOptions } from 'vs/editor/common/services/findSectionHeaders';
+import { URI } from '../../../base/common/uri.js';
+import { IRange } from '../core/range.js';
+import { IDocumentDiff, IDocumentDiffProviderOptions } from '../diff/documentDiffProvider.js';
+import { IChange } from '../diff/legacyLinesDiffComputer.js';
+import { IColorInformation, IInplaceReplaceSupportResult, TextEdit } from '../languages.js';
+import { UnicodeHighlighterOptions } from './unicodeTextModelHighlighter.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import type { BaseEditorSimpleWorker } from './editorSimpleWorker.js';
+import { SectionHeader, FindSectionHeaderOptions } from './findSectionHeaders.js';
 
 export const IEditorWorkerService = createDecorator<IEditorWorkerService>('editorWorkerService');
 
@@ -23,7 +23,7 @@ export interface IEditorWorkerService {
 	canComputeUnicodeHighlights(uri: URI): boolean;
 	computedUnicodeHighlights(uri: URI, options: UnicodeHighlighterOptions, range?: IRange): Promise<IUnicodeHighlightsResult>;
 
-	/** Implementation in {@link EditorSimpleWorker.computeDiff} */
+	/** Implementation in {@link BaseEditorSimpleWorker.computeDiff} */
 	computeDiff(original: URI, modified: URI, options: IDocumentDiffProviderOptions, algorithm: DiffAlgorithmName): Promise<IDocumentDiff | null>;
 
 	canComputeDirtyDiff(original: URI, modified: URI): boolean;
@@ -39,6 +39,9 @@ export interface IEditorWorkerService {
 	navigateValueSet(resource: URI, range: IRange, up: boolean): Promise<IInplaceReplaceSupportResult | null>;
 
 	findSectionHeaders(uri: URI, options: FindSectionHeaderOptions): Promise<SectionHeader[]>;
+
+	computeDefaultDocumentColors(uri: URI): Promise<IColorInformation[] | null>;
+
 }
 
 export interface IDiffComputationResult {
diff --git a/src/vs/editor/common/services/editorWorkerBootstrap.ts b/src/vs/editor/common/services/editorWorkerBootstrap.ts
new file mode 100644
index 00000000000..f754fe8fd4a
--- /dev/null
+++ b/src/vs/editor/common/services/editorWorkerBootstrap.ts
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IWorkerServer, SimpleWorkerServer } from '../../../base/common/worker/simpleWorker.js';
+import { EditorSimpleWorker } from './editorSimpleWorker.js';
+import { EditorWorkerHost } from './editorWorkerHost.js';
+
+type MessageEvent = {
+	data: any;
+};
+
+declare const globalThis: {
+	postMessage: (message: any) => void;
+	onmessage: (event: MessageEvent) => void;
+};
+
+let initialized = false;
+
+export function initialize(factory: any) {
+	if (initialized) {
+		return;
+	}
+	initialized = true;
+
+	const simpleWorker = new SimpleWorkerServer((msg) => {
+		globalThis.postMessage(msg);
+	}, (workerServer: IWorkerServer) => new EditorSimpleWorker(EditorWorkerHost.getChannel(workerServer), null));
+
+	globalThis.onmessage = (e: MessageEvent) => {
+		simpleWorker.onmessage(e.data);
+	};
+}
+
+globalThis.onmessage = (e: MessageEvent) => {
+	// Ignore first message in this case and initialize if not yet initialized
+	if (!initialized) {
+		initialize(null);
+	}
+};
+
+type CreateFunction<C, D, R = any> = (ctx: C, data: D) => R;
+
+export function bootstrapSimpleEditorWorker<C, D, R>(createFn: CreateFunction<C, D, R>) {
+	globalThis.onmessage = () => {
+		initialize((ctx: C, createData: D) => {
+			return createFn.call(self, ctx, createData);
+		});
+	};
+}
diff --git a/src/vs/editor/common/services/editorWorkerHost.ts b/src/vs/editor/common/services/editorWorkerHost.ts
index df0a6aa1c35..54751e1cebf 100644
--- a/src/vs/editor/common/services/editorWorkerHost.ts
+++ b/src/vs/editor/common/services/editorWorkerHost.ts
@@ -3,7 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-export interface IEditorWorkerHost {
+import { IWorkerServer, IWorkerClient } from '../../../base/common/worker/simpleWorker.js';
+
+export abstract class EditorWorkerHost {
+	public static CHANNEL_NAME = 'editorWorkerHost';
+	public static getChannel(workerServer: IWorkerServer): EditorWorkerHost {
+		return workerServer.getChannel<EditorWorkerHost>(EditorWorkerHost.CHANNEL_NAME);
+	}
+	public static setChannel(workerClient: IWorkerClient<any>, obj: EditorWorkerHost): void {
+		workerClient.setChannel<EditorWorkerHost>(EditorWorkerHost.CHANNEL_NAME, obj);
+	}
+
 	// foreign host request
-	fhr(method: string, args: any[]): Promise<any>;
+	abstract $fhr(method: string, args: any[]): Promise<any>;
 }
diff --git a/src/vs/editor/common/services/findSectionHeaders.ts b/src/vs/editor/common/services/findSectionHeaders.ts
index 8e03723d0dd..9c80a3a22df 100644
--- a/src/vs/editor/common/services/findSectionHeaders.ts
+++ b/src/vs/editor/common/services/findSectionHeaders.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IRange } from 'vs/editor/common/core/range';
-import { FoldingRules } from 'vs/editor/common/languages/languageConfiguration';
+import { IRange } from '../core/range.js';
+import { FoldingRules } from '../languages/languageConfiguration.js';
 
 export interface ISectionHeaderFinderTarget {
 	getLineCount(): number;
diff --git a/src/vs/editor/common/services/getIconClasses.ts b/src/vs/editor/common/services/getIconClasses.ts
index 52a1e2633e6..61fd63dc827 100644
--- a/src/vs/editor/common/services/getIconClasses.ts
+++ b/src/vs/editor/common/services/getIconClasses.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Schemas } from 'vs/base/common/network';
-import { DataUri } from 'vs/base/common/resources';
-import { URI, URI as uri } from 'vs/base/common/uri';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IModelService } from 'vs/editor/common/services/model';
-import { FileKind } from 'vs/platform/files/common/files';
-import { ThemeIcon } from 'vs/base/common/themables';
+import { Schemas } from '../../../base/common/network.js';
+import { DataUri } from '../../../base/common/resources.js';
+import { URI, URI as uri } from '../../../base/common/uri.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../languages/modesRegistry.js';
+import { ILanguageService } from '../languages/language.js';
+import { IModelService } from './model.js';
+import { FileKind } from '../../../platform/files/common/files.js';
+import { ThemeIcon } from '../../../base/common/themables.js';
 
 const fileIconDirectoryRegex = /(?:\/|^)(?:([^\/]+)\/)?([^\/]+)$/;
 
@@ -123,5 +123,5 @@ function detectLanguageId(modelService: IModelService, languageService: ILanguag
 }
 
 function cssEscape(str: string): string {
-	return str.replace(/[\x11\x12\x14\x15\x40]/g, '/'); // HTML class names can not contain certain whitespace characters, use / instead, which doesn't exist in file names.
+	return str.replace(/[\s]/g, '/'); // HTML class names can not contain certain whitespace characters (https://dom.spec.whatwg.org/#interface-domtokenlist), use / instead, which doesn't exist in file names.
 }
diff --git a/src/vs/editor/common/services/languageFeatureDebounce.ts b/src/vs/editor/common/services/languageFeatureDebounce.ts
index 5f82d301a61..f4a2b3b4d55 100644
--- a/src/vs/editor/common/services/languageFeatureDebounce.ts
+++ b/src/vs/editor/common/services/languageFeatureDebounce.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { doHash } from 'vs/base/common/hash';
-import { LRUCache } from 'vs/base/common/map';
-import { clamp, MovingAverage, SlidingWindowAverage } from 'vs/base/common/numbers';
-import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import { ITextModel } from 'vs/editor/common/model';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { matchesScheme } from 'vs/base/common/network';
+import { doHash } from '../../../base/common/hash.js';
+import { LRUCache } from '../../../base/common/map.js';
+import { clamp, MovingAverage, SlidingWindowAverage } from '../../../base/common/numbers.js';
+import { LanguageFeatureRegistry } from '../languageFeatureRegistry.js';
+import { ITextModel } from '../model.js';
+import { IEnvironmentService } from '../../../platform/environment/common/environment.js';
+import { InstantiationType, registerSingleton } from '../../../platform/instantiation/common/extensions.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { matchesScheme } from '../../../base/common/network.js';
 
 
 export const ILanguageFeatureDebounceService = createDecorator<ILanguageFeatureDebounceService>('ILanguageFeatureDebounceService');
diff --git a/src/vs/editor/common/services/languageFeatures.ts b/src/vs/editor/common/services/languageFeatures.ts
index 205d1b86f10..13977f1c1f6 100644
--- a/src/vs/editor/common/services/languageFeatures.ts
+++ b/src/vs/editor/common/services/languageFeatures.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { LanguageFeatureRegistry, NotebookInfoResolver } from 'vs/editor/common/languageFeatureRegistry';
-import { CodeActionProvider, CodeLensProvider, CompletionItemProvider, DeclarationProvider, DefinitionProvider, DocumentColorProvider, DocumentFormattingEditProvider, DocumentHighlightProvider, DocumentDropEditProvider, DocumentPasteEditProvider, DocumentRangeFormattingEditProvider, DocumentRangeSemanticTokensProvider, DocumentSemanticTokensProvider, DocumentSymbolProvider, EvaluatableExpressionProvider, FoldingRangeProvider, HoverProvider, ImplementationProvider, InlayHintsProvider, InlineCompletionsProvider, InlineValuesProvider, LinkedEditingRangeProvider, LinkProvider, MappedEditsProvider, MultiDocumentHighlightProvider, NewSymbolNamesProvider, OnTypeFormattingEditProvider, ReferenceProvider, RenameProvider, SelectionRangeProvider, SignatureHelpProvider, TypeDefinitionProvider, InlineEditProvider } from 'vs/editor/common/languages';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { LanguageFeatureRegistry, NotebookInfoResolver } from '../languageFeatureRegistry.js';
+import { CodeActionProvider, CodeLensProvider, CompletionItemProvider, DeclarationProvider, DefinitionProvider, DocumentColorProvider, DocumentFormattingEditProvider, DocumentHighlightProvider, DocumentDropEditProvider, DocumentPasteEditProvider, DocumentRangeFormattingEditProvider, DocumentRangeSemanticTokensProvider, DocumentSemanticTokensProvider, DocumentSymbolProvider, EvaluatableExpressionProvider, FoldingRangeProvider, HoverProvider, ImplementationProvider, InlayHintsProvider, InlineCompletionsProvider, InlineValuesProvider, LinkedEditingRangeProvider, LinkProvider, MappedEditsProvider, MultiDocumentHighlightProvider, NewSymbolNamesProvider, OnTypeFormattingEditProvider, ReferenceProvider, RenameProvider, SelectionRangeProvider, SignatureHelpProvider, TypeDefinitionProvider, InlineEditProvider } from '../languages.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
 
 export const ILanguageFeaturesService = createDecorator<ILanguageFeaturesService>('ILanguageFeaturesService');
 
diff --git a/src/vs/editor/common/services/languageFeaturesService.ts b/src/vs/editor/common/services/languageFeaturesService.ts
index 2b1384ba099..5c8d6de6919 100644
--- a/src/vs/editor/common/services/languageFeaturesService.ts
+++ b/src/vs/editor/common/services/languageFeaturesService.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { LanguageFeatureRegistry, NotebookInfo, NotebookInfoResolver } from 'vs/editor/common/languageFeatureRegistry';
-import { CodeActionProvider, CodeLensProvider, CompletionItemProvider, DocumentPasteEditProvider, DeclarationProvider, DefinitionProvider, DocumentColorProvider, DocumentFormattingEditProvider, MultiDocumentHighlightProvider, DocumentHighlightProvider, DocumentDropEditProvider, DocumentRangeFormattingEditProvider, DocumentRangeSemanticTokensProvider, DocumentSemanticTokensProvider, DocumentSymbolProvider, EvaluatableExpressionProvider, FoldingRangeProvider, HoverProvider, ImplementationProvider, InlayHintsProvider, InlineCompletionsProvider, InlineValuesProvider, LinkedEditingRangeProvider, LinkProvider, OnTypeFormattingEditProvider, ReferenceProvider, RenameProvider, SelectionRangeProvider, SignatureHelpProvider, TypeDefinitionProvider, MappedEditsProvider, NewSymbolNamesProvider, InlineEditProvider } from 'vs/editor/common/languages';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { URI } from '../../../base/common/uri.js';
+import { LanguageFeatureRegistry, NotebookInfo, NotebookInfoResolver } from '../languageFeatureRegistry.js';
+import { CodeActionProvider, CodeLensProvider, CompletionItemProvider, DocumentPasteEditProvider, DeclarationProvider, DefinitionProvider, DocumentColorProvider, DocumentFormattingEditProvider, MultiDocumentHighlightProvider, DocumentHighlightProvider, DocumentDropEditProvider, DocumentRangeFormattingEditProvider, DocumentRangeSemanticTokensProvider, DocumentSemanticTokensProvider, DocumentSymbolProvider, EvaluatableExpressionProvider, FoldingRangeProvider, HoverProvider, ImplementationProvider, InlayHintsProvider, InlineCompletionsProvider, InlineValuesProvider, LinkedEditingRangeProvider, LinkProvider, OnTypeFormattingEditProvider, ReferenceProvider, RenameProvider, SelectionRangeProvider, SignatureHelpProvider, TypeDefinitionProvider, MappedEditsProvider, NewSymbolNamesProvider, InlineEditProvider } from '../languages.js';
+import { ILanguageFeaturesService } from './languageFeatures.js';
+import { InstantiationType, registerSingleton } from '../../../platform/instantiation/common/extensions.js';
 
 export class LanguageFeaturesService implements ILanguageFeaturesService {
 
diff --git a/src/vs/editor/common/services/languageService.ts b/src/vs/editor/common/services/languageService.ts
index 6d96f2a2502..dffe6ea3d2f 100644
--- a/src/vs/editor/common/services/languageService.ts
+++ b/src/vs/editor/common/services/languageService.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { LanguagesRegistry } from 'vs/editor/common/services/languagesRegistry';
-import { ILanguageNameIdPair, ILanguageSelection, ILanguageService, ILanguageIcon, ILanguageExtensionPoint } from 'vs/editor/common/languages/language';
-import { firstOrDefault } from 'vs/base/common/arrays';
-import { ILanguageIdCodec, TokenizationRegistry } from 'vs/editor/common/languages';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../base/common/lifecycle.js';
+import { URI } from '../../../base/common/uri.js';
+import { LanguagesRegistry } from './languagesRegistry.js';
+import { ILanguageNameIdPair, ILanguageSelection, ILanguageService, ILanguageIcon, ILanguageExtensionPoint } from '../languages/language.js';
+import { ILanguageIdCodec, TokenizationRegistry } from '../languages.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../languages/modesRegistry.js';
+import { IObservable, observableFromEvent } from '../../../base/common/observable.js';
 
 export class LanguageService extends Disposable implements ILanguageService {
 	public _serviceBrand: undefined;
@@ -95,7 +95,7 @@ export class LanguageService extends Disposable implements ILanguageService {
 
 	public guessLanguageIdByFilepathOrFirstLine(resource: URI | null, firstLine?: string): string | null {
 		const languageIds = this._registry.guessLanguageIdByFilepathOrFirstLine(resource, firstLine);
-		return firstOrDefault(languageIds, null);
+		return languageIds.at(0) ?? null;
 	}
 
 	public createById(languageId: string | null | undefined): ILanguageSelection {
@@ -150,51 +150,15 @@ export class LanguageService extends Disposable implements ILanguageService {
 }
 
 class LanguageSelection implements ILanguageSelection {
+	private readonly _value: IObservable<string>;
+	public readonly onDidChange: Event<string>;
 
-	public languageId: string;
-
-	private _listener: IDisposable | null = null;
-	private _emitter: Emitter<string> | null = null;
-
-	constructor(
-		private readonly _onDidChangeLanguages: Event<void>,
-		private readonly _selector: () => string
-	) {
-		this.languageId = this._selector();
+	constructor(onDidChangeLanguages: Event<void>, selector: () => string) {
+		this._value = observableFromEvent(this, onDidChangeLanguages, () => selector());
+		this.onDidChange = Event.fromObservable(this._value);
 	}
 
-	private _dispose(): void {
-		if (this._listener) {
-			this._listener.dispose();
-			this._listener = null;
-		}
-		if (this._emitter) {
-			this._emitter.dispose();
-			this._emitter = null;
-		}
-	}
-
-	public get onDidChange(): Event<string> {
-		if (!this._listener) {
-			this._listener = this._onDidChangeLanguages(() => this._evaluate());
-		}
-		if (!this._emitter) {
-			this._emitter = new Emitter<string>({
-				onDidRemoveLastListener: () => {
-					this._dispose();
-				}
-			});
-		}
-		return this._emitter.event;
-	}
-
-	private _evaluate(): void {
-		const languageId = this._selector();
-		if (languageId === this.languageId) {
-			// no change
-			return;
-		}
-		this.languageId = languageId;
-		this._emitter?.fire(this.languageId);
+	public get languageId(): string {
+		return this._value.get();
 	}
 }
diff --git a/src/vs/editor/common/services/languagesAssociations.ts b/src/vs/editor/common/services/languagesAssociations.ts
index ac7eb2b567b..2bfe45a8746 100644
--- a/src/vs/editor/common/services/languagesAssociations.ts
+++ b/src/vs/editor/common/services/languagesAssociations.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ParsedPattern, parse } from 'vs/base/common/glob';
-import { Mimes } from 'vs/base/common/mime';
-import { Schemas } from 'vs/base/common/network';
-import { basename, posix } from 'vs/base/common/path';
-import { DataUri } from 'vs/base/common/resources';
-import { startsWithUTF8BOM } from 'vs/base/common/strings';
-import { URI } from 'vs/base/common/uri';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
+import { ParsedPattern, parse } from '../../../base/common/glob.js';
+import { Mimes } from '../../../base/common/mime.js';
+import { Schemas } from '../../../base/common/network.js';
+import { basename, posix } from '../../../base/common/path.js';
+import { DataUri } from '../../../base/common/resources.js';
+import { startsWithUTF8BOM } from '../../../base/common/strings.js';
+import { URI } from '../../../base/common/uri.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../languages/modesRegistry.js';
 
 export interface ILanguageAssociation {
 	readonly id: string;
diff --git a/src/vs/editor/common/services/languagesRegistry.ts b/src/vs/editor/common/services/languagesRegistry.ts
index 9216a625543..3ea71cff4ee 100644
--- a/src/vs/editor/common/services/languagesRegistry.ts
+++ b/src/vs/editor/common/services/languagesRegistry.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { compareIgnoreCase, regExpLeadsToEndlessLoop } from 'vs/base/common/strings';
-import { clearPlatformLanguageAssociations, getLanguageIds, registerPlatformLanguageAssociation } from 'vs/editor/common/services/languagesAssociations';
-import { URI } from 'vs/base/common/uri';
-import { ILanguageIdCodec } from 'vs/editor/common/languages';
-import { LanguageId } from 'vs/editor/common/encodedTokenAttributes';
-import { ModesRegistry, PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { ILanguageExtensionPoint, ILanguageNameIdPair, ILanguageIcon } from 'vs/editor/common/languages/language';
-import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { Registry } from 'vs/platform/registry/common/platform';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../base/common/lifecycle.js';
+import { compareIgnoreCase, regExpLeadsToEndlessLoop } from '../../../base/common/strings.js';
+import { clearPlatformLanguageAssociations, getLanguageIds, registerPlatformLanguageAssociation } from './languagesAssociations.js';
+import { URI } from '../../../base/common/uri.js';
+import { ILanguageIdCodec } from '../languages.js';
+import { LanguageId } from '../encodedTokenAttributes.js';
+import { ModesRegistry, PLAINTEXT_LANGUAGE_ID } from '../languages/modesRegistry.js';
+import { ILanguageExtensionPoint, ILanguageNameIdPair, ILanguageIcon } from '../languages/language.js';
+import { Extensions, IConfigurationRegistry } from '../../../platform/configuration/common/configurationRegistry.js';
+import { Registry } from '../../../platform/registry/common/platform.js';
 
 const hasOwnProperty = Object.prototype.hasOwnProperty;
 const NULL_LANGUAGE_ID = 'vs.editor.nullLanguage';
diff --git a/src/vs/editor/common/services/markerDecorations.ts b/src/vs/editor/common/services/markerDecorations.ts
index 221f72379b3..8b315075c93 100644
--- a/src/vs/editor/common/services/markerDecorations.ts
+++ b/src/vs/editor/common/services/markerDecorations.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ITextModel, IModelDecoration } from 'vs/editor/common/model';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IMarker } from 'vs/platform/markers/common/markers';
-import { Event } from 'vs/base/common/event';
-import { Range } from 'vs/editor/common/core/range';
-import { URI } from 'vs/base/common/uri';
+import { ITextModel, IModelDecoration } from '../model.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { IMarker } from '../../../platform/markers/common/markers.js';
+import { Event } from '../../../base/common/event.js';
+import { Range } from '../core/range.js';
+import { URI } from '../../../base/common/uri.js';
 
 export const IMarkerDecorationsService = createDecorator<IMarkerDecorationsService>('markerDecorationsService');
 
diff --git a/src/vs/editor/common/services/markerDecorationsService.ts b/src/vs/editor/common/services/markerDecorationsService.ts
index de2c54e9e01..7cbd80e89f8 100644
--- a/src/vs/editor/common/services/markerDecorationsService.ts
+++ b/src/vs/editor/common/services/markerDecorationsService.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IMarkerService, IMarker, MarkerSeverity, MarkerTag } from 'vs/platform/markers/common/markers';
-import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { IModelDeltaDecoration, ITextModel, IModelDecorationOptions, TrackedRangeStickiness, OverviewRulerLane, IModelDecoration, MinimapPosition, IModelDecorationMinimapOptions } from 'vs/editor/common/model';
-import { ClassName } from 'vs/editor/common/model/intervalTree';
-import { themeColorFromId } from 'vs/platform/theme/common/themeService';
-import { ThemeColor } from 'vs/base/common/themables';
-import { overviewRulerWarning, overviewRulerInfo, overviewRulerError } from 'vs/editor/common/core/editorColorRegistry';
-import { IModelService } from 'vs/editor/common/services/model';
-import { Range } from 'vs/editor/common/core/range';
-import { IMarkerDecorationsService } from 'vs/editor/common/services/markerDecorations';
-import { Schemas } from 'vs/base/common/network';
-import { Emitter, Event } from 'vs/base/common/event';
-import { minimapInfo, minimapWarning, minimapError } from 'vs/platform/theme/common/colorRegistry';
-import { BidirectionalMap, ResourceMap } from 'vs/base/common/map';
-import { diffSets } from 'vs/base/common/collections';
+import { IMarkerService, IMarker, MarkerSeverity, MarkerTag } from '../../../platform/markers/common/markers.js';
+import { Disposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { URI } from '../../../base/common/uri.js';
+import { IModelDeltaDecoration, ITextModel, IModelDecorationOptions, TrackedRangeStickiness, OverviewRulerLane, IModelDecoration, MinimapPosition, IModelDecorationMinimapOptions } from '../model.js';
+import { ClassName } from '../model/intervalTree.js';
+import { themeColorFromId } from '../../../platform/theme/common/themeService.js';
+import { ThemeColor } from '../../../base/common/themables.js';
+import { overviewRulerWarning, overviewRulerInfo, overviewRulerError } from '../core/editorColorRegistry.js';
+import { IModelService } from './model.js';
+import { Range } from '../core/range.js';
+import { IMarkerDecorationsService } from './markerDecorations.js';
+import { Schemas } from '../../../base/common/network.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { minimapInfo, minimapWarning, minimapError } from '../../../platform/theme/common/colorRegistry.js';
+import { BidirectionalMap, ResourceMap } from '../../../base/common/map.js';
+import { diffSets } from '../../../base/common/collections.js';
 
 export class MarkerDecorationsService extends Disposable implements IMarkerDecorationsService {
 
diff --git a/src/vs/editor/common/services/model.ts b/src/vs/editor/common/services/model.ts
index 17355399606..d7eda7d8987 100644
--- a/src/vs/editor/common/services/model.ts
+++ b/src/vs/editor/common/services/model.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { URI } from 'vs/base/common/uri';
-import { ITextBufferFactory, ITextModel, ITextModelCreationOptions } from 'vs/editor/common/model';
-import { ILanguageSelection } from 'vs/editor/common/languages/language';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { DocumentSemanticTokensProvider, DocumentRangeSemanticTokensProvider } from 'vs/editor/common/languages';
+import { Event } from '../../../base/common/event.js';
+import { URI } from '../../../base/common/uri.js';
+import { ITextBufferFactory, ITextModel, ITextModelCreationOptions } from '../model.js';
+import { ILanguageSelection } from '../languages/language.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { DocumentSemanticTokensProvider, DocumentRangeSemanticTokensProvider } from '../languages.js';
 
 export const IModelService = createDecorator<IModelService>('modelService');
 
diff --git a/src/vs/editor/common/services/modelService.ts b/src/vs/editor/common/services/modelService.ts
index 2bbda14a026..c0293db8390 100644
--- a/src/vs/editor/common/services/modelService.ts
+++ b/src/vs/editor/common/services/modelService.ts
@@ -3,27 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, IDisposable, DisposableStore } from 'vs/base/common/lifecycle';
-import * as platform from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { EditOperation, ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { Range } from 'vs/editor/common/core/range';
-import { DefaultEndOfLine, EndOfLinePreference, EndOfLineSequence, ITextBuffer, ITextBufferFactory, ITextModel, ITextModelCreationOptions } from 'vs/editor/common/model';
-import { TextModel, createTextBuffer } from 'vs/editor/common/model/textModel';
-import { EDITOR_MODEL_DEFAULTS } from 'vs/editor/common/core/textModelDefaults';
-import { IModelLanguageChangedEvent } from 'vs/editor/common/textModelEvents';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { ILanguageSelection, ILanguageService } from 'vs/editor/common/languages/language';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfiguration';
-import { IConfigurationChangeEvent, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IUndoRedoService, ResourceEditStackSnapshot } from 'vs/platform/undoRedo/common/undoRedo';
-import { StringSHA1 } from 'vs/base/common/hash';
-import { isEditStackElement } from 'vs/editor/common/model/editStack';
-import { Schemas } from 'vs/base/common/network';
-import { equals } from 'vs/base/common/objects';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable, IDisposable, DisposableStore } from '../../../base/common/lifecycle.js';
+import * as platform from '../../../base/common/platform.js';
+import { URI } from '../../../base/common/uri.js';
+import { EditOperation, ISingleEditOperation } from '../core/editOperation.js';
+import { Range } from '../core/range.js';
+import { DefaultEndOfLine, EndOfLinePreference, EndOfLineSequence, ITextBuffer, ITextBufferFactory, ITextModel, ITextModelCreationOptions } from '../model.js';
+import { TextModel, createTextBuffer } from '../model/textModel.js';
+import { EDITOR_MODEL_DEFAULTS } from '../core/textModelDefaults.js';
+import { IModelLanguageChangedEvent } from '../textModelEvents.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../languages/modesRegistry.js';
+import { ILanguageSelection } from '../languages/language.js';
+import { IModelService } from './model.js';
+import { ITextResourcePropertiesService } from './textResourceConfiguration.js';
+import { IConfigurationChangeEvent, IConfigurationService } from '../../../platform/configuration/common/configuration.js';
+import { IUndoRedoService, ResourceEditStackSnapshot } from '../../../platform/undoRedo/common/undoRedo.js';
+import { StringSHA1 } from '../../../base/common/hash.js';
+import { isEditStackElement } from '../model/editStack.js';
+import { Schemas } from '../../../base/common/network.js';
+import { equals } from '../../../base/common/objects.js';
+import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
 
 function MODEL_ID(resource: URI): string {
 	return resource.toString();
@@ -107,8 +107,7 @@ export class ModelService extends Disposable implements IModelService {
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@ITextResourcePropertiesService private readonly _resourcePropertiesService: ITextResourcePropertiesService,
 		@IUndoRedoService private readonly _undoRedoService: IUndoRedoService,
-		@ILanguageService private readonly _languageService: ILanguageService,
-		@ILanguageConfigurationService private readonly _languageConfigurationService: ILanguageConfigurationService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService
 	) {
 		super();
 		this._modelCreationOptionsByLanguageAndResource = Object.create(null);
@@ -314,14 +313,11 @@ export class ModelService extends Disposable implements IModelService {
 	private _createModelData(value: string | ITextBufferFactory, languageIdOrSelection: string | ILanguageSelection, resource: URI | undefined, isForSimpleWidget: boolean): ModelData {
 		// create & save the model
 		const options = this.getCreationOptions(languageIdOrSelection, resource, isForSimpleWidget);
-		const model: TextModel = new TextModel(
+		const model: TextModel = this._instantiationService.createInstance(TextModel,
 			value,
 			languageIdOrSelection,
 			options,
-			resource,
-			this._undoRedoService,
-			this._languageService,
-			this._languageConfigurationService,
+			resource
 		);
 		if (resource && this._disposedModels.has(MODEL_ID(resource))) {
 			const disposedModelData = this._removeDisposedModel(resource)!;
diff --git a/src/vs/editor/common/services/modelUndoRedoParticipant.ts b/src/vs/editor/common/services/modelUndoRedoParticipant.ts
index c199b6bb751..ffb0760eb26 100644
--- a/src/vs/editor/common/services/modelUndoRedoParticipant.ts
+++ b/src/vs/editor/common/services/modelUndoRedoParticipant.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IModelService } from 'vs/editor/common/services/model';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
-import { IUndoRedoDelegate, MultiModelEditStackElement } from 'vs/editor/common/model/editStack';
+import { IModelService } from './model.js';
+import { ITextModelService } from './resolverService.js';
+import { Disposable, IDisposable, dispose } from '../../../base/common/lifecycle.js';
+import { IUndoRedoService } from '../../../platform/undoRedo/common/undoRedo.js';
+import { IUndoRedoDelegate, MultiModelEditStackElement } from '../model/editStack.js';
 
 export class ModelUndoRedoParticipant extends Disposable implements IUndoRedoDelegate {
 	constructor(
diff --git a/src/vs/editor/common/services/resolverService.ts b/src/vs/editor/common/services/resolverService.ts
index d8eac79e364..348f4b34121 100644
--- a/src/vs/editor/common/services/resolverService.ts
+++ b/src/vs/editor/common/services/resolverService.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { IDisposable, IReference } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { ITextModel, ITextSnapshot } from 'vs/editor/common/model';
-import { IResolvableEditorModel } from 'vs/platform/editor/common/editor';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { Event } from '../../../base/common/event.js';
+import { IMarkdownString } from '../../../base/common/htmlContent.js';
+import { IDisposable, IReference } from '../../../base/common/lifecycle.js';
+import { URI } from '../../../base/common/uri.js';
+import { ITextModel, ITextSnapshot } from '../model.js';
+import { IResolvableEditorModel } from '../../../platform/editor/common/editor.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
 
 export const ITextModelService = createDecorator<ITextModelService>('textModelService');
 
diff --git a/src/vs/editor/common/services/semanticTokensDto.ts b/src/vs/editor/common/services/semanticTokensDto.ts
index 652ae69b65a..4fd9cc88859 100644
--- a/src/vs/editor/common/services/semanticTokensDto.ts
+++ b/src/vs/editor/common/services/semanticTokensDto.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import * as platform from 'vs/base/common/platform';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import * as platform from '../../../base/common/platform.js';
 
 export interface IFullSemanticTokensDto {
 	id: number;
diff --git a/src/vs/editor/common/services/semanticTokensProviderStyling.ts b/src/vs/editor/common/services/semanticTokensProviderStyling.ts
index 1bb2e0d6ed1..ca9026d66fe 100644
--- a/src/vs/editor/common/services/semanticTokensProviderStyling.ts
+++ b/src/vs/editor/common/services/semanticTokensProviderStyling.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SemanticTokensLegend, SemanticTokens } from 'vs/editor/common/languages';
-import { FontStyle, MetadataConsts, TokenMetadata } from 'vs/editor/common/encodedTokenAttributes';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ILogService, LogLevel } from 'vs/platform/log/common/log';
-import { SparseMultilineTokens } from 'vs/editor/common/tokens/sparseMultilineTokens';
-import { ILanguageService } from 'vs/editor/common/languages/language';
+import { SemanticTokensLegend, SemanticTokens } from '../languages.js';
+import { FontStyle, MetadataConsts, TokenMetadata } from '../encodedTokenAttributes.js';
+import { IThemeService } from '../../../platform/theme/common/themeService.js';
+import { ILogService, LogLevel } from '../../../platform/log/common/log.js';
+import { SparseMultilineTokens } from '../tokens/sparseMultilineTokens.js';
+import { ILanguageService } from '../languages/language.js';
 
 const enum SemanticTokensProviderStylingConstants {
 	NO_STYLING = 0b01111111111111111111111111111111
diff --git a/src/vs/editor/common/services/semanticTokensStyling.ts b/src/vs/editor/common/services/semanticTokensStyling.ts
index 935c9aed528..6ee050718c9 100644
--- a/src/vs/editor/common/services/semanticTokensStyling.ts
+++ b/src/vs/editor/common/services/semanticTokensStyling.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { DocumentSemanticTokensProvider, DocumentRangeSemanticTokensProvider } from 'vs/editor/common/languages';
-import { SemanticTokensProviderStyling } from 'vs/editor/common/services/semanticTokensProviderStyling';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { DocumentSemanticTokensProvider, DocumentRangeSemanticTokensProvider } from '../languages.js';
+import { SemanticTokensProviderStyling } from './semanticTokensProviderStyling.js';
 
 export const ISemanticTokensStylingService = createDecorator<ISemanticTokensStylingService>('semanticTokensStylingService');
 
diff --git a/src/vs/editor/common/services/semanticTokensStylingService.ts b/src/vs/editor/common/services/semanticTokensStylingService.ts
index 8aba1f0a601..5479905c409 100644
--- a/src/vs/editor/common/services/semanticTokensStylingService.ts
+++ b/src/vs/editor/common/services/semanticTokensStylingService.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { DocumentTokensProvider } from 'vs/editor/common/services/model';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { SemanticTokensProviderStyling } from 'vs/editor/common/services/semanticTokensProviderStyling';
-import { ISemanticTokensStylingService } from 'vs/editor/common/services/semanticTokensStyling';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { ILanguageService } from '../languages/language.js';
+import { DocumentTokensProvider } from './model.js';
+import { IThemeService } from '../../../platform/theme/common/themeService.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { SemanticTokensProviderStyling } from './semanticTokensProviderStyling.js';
+import { ISemanticTokensStylingService } from './semanticTokensStyling.js';
+import { InstantiationType, registerSingleton } from '../../../platform/instantiation/common/extensions.js';
 
 export class SemanticTokensStylingService extends Disposable implements ISemanticTokensStylingService {
 
diff --git a/src/vs/editor/common/services/textModelSync/textModelSync.impl.ts b/src/vs/editor/common/services/textModelSync/textModelSync.impl.ts
new file mode 100644
index 00000000000..77bb17bec86
--- /dev/null
+++ b/src/vs/editor/common/services/textModelSync/textModelSync.impl.ts
@@ -0,0 +1,427 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IntervalTimer } from '../../../../base/common/async.js';
+import { Disposable, DisposableStore, dispose, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IWorkerClient, IWorkerServer } from '../../../../base/common/worker/simpleWorker.js';
+import { IPosition, Position } from '../../core/position.js';
+import { IRange, Range } from '../../core/range.js';
+import { ensureValidWordDefinition, getWordAtText, IWordAtPosition } from '../../core/wordHelper.js';
+import { IDocumentColorComputerTarget } from '../../languages/defaultDocumentColorsComputer.js';
+import { ILinkComputerTarget } from '../../languages/linkComputer.js';
+import { MirrorTextModel as BaseMirrorModel, IModelChangedEvent } from '../../model/mirrorTextModel.js';
+import { IMirrorModel, IWordRange } from '../editorSimpleWorker.js';
+import { IModelService } from '../model.js';
+import { IRawModelData, IWorkerTextModelSyncChannelServer } from './textModelSync.protocol.js';
+
+/**
+ * Stop syncing a model to the worker if it was not needed for 1 min.
+ */
+export const STOP_SYNC_MODEL_DELTA_TIME_MS = 60 * 1000;
+
+export const WORKER_TEXT_MODEL_SYNC_CHANNEL = 'workerTextModelSync';
+
+export class WorkerTextModelSyncClient extends Disposable {
+
+	public static create(workerClient: IWorkerClient<any>, modelService: IModelService): WorkerTextModelSyncClient {
+		return new WorkerTextModelSyncClient(
+			workerClient.getChannel<IWorkerTextModelSyncChannelServer>(WORKER_TEXT_MODEL_SYNC_CHANNEL),
+			modelService
+		);
+	}
+
+	private readonly _proxy: IWorkerTextModelSyncChannelServer;
+	private readonly _modelService: IModelService;
+	private _syncedModels: { [modelUrl: string]: IDisposable } = Object.create(null);
+	private _syncedModelsLastUsedTime: { [modelUrl: string]: number } = Object.create(null);
+
+	constructor(proxy: IWorkerTextModelSyncChannelServer, modelService: IModelService, keepIdleModels: boolean = false) {
+		super();
+		this._proxy = proxy;
+		this._modelService = modelService;
+
+		if (!keepIdleModels) {
+			const timer = new IntervalTimer();
+			timer.cancelAndSet(() => this._checkStopModelSync(), Math.round(STOP_SYNC_MODEL_DELTA_TIME_MS / 2));
+			this._register(timer);
+		}
+	}
+
+	public override dispose(): void {
+		for (const modelUrl in this._syncedModels) {
+			dispose(this._syncedModels[modelUrl]);
+		}
+		this._syncedModels = Object.create(null);
+		this._syncedModelsLastUsedTime = Object.create(null);
+		super.dispose();
+	}
+
+	public ensureSyncedResources(resources: URI[], forceLargeModels: boolean = false): void {
+		for (const resource of resources) {
+			const resourceStr = resource.toString();
+
+			if (!this._syncedModels[resourceStr]) {
+				this._beginModelSync(resource, forceLargeModels);
+			}
+			if (this._syncedModels[resourceStr]) {
+				this._syncedModelsLastUsedTime[resourceStr] = (new Date()).getTime();
+			}
+		}
+	}
+
+	private _checkStopModelSync(): void {
+		const currentTime = (new Date()).getTime();
+
+		const toRemove: string[] = [];
+		for (const modelUrl in this._syncedModelsLastUsedTime) {
+			const elapsedTime = currentTime - this._syncedModelsLastUsedTime[modelUrl];
+			if (elapsedTime > STOP_SYNC_MODEL_DELTA_TIME_MS) {
+				toRemove.push(modelUrl);
+			}
+		}
+
+		for (const e of toRemove) {
+			this._stopModelSync(e);
+		}
+	}
+
+	private _beginModelSync(resource: URI, forceLargeModels: boolean): void {
+		const model = this._modelService.getModel(resource);
+		if (!model) {
+			return;
+		}
+		if (!forceLargeModels && model.isTooLargeForSyncing()) {
+			return;
+		}
+
+		const modelUrl = resource.toString();
+
+		this._proxy.$acceptNewModel({
+			url: model.uri.toString(),
+			lines: model.getLinesContent(),
+			EOL: model.getEOL(),
+			versionId: model.getVersionId()
+		});
+
+		const toDispose = new DisposableStore();
+		toDispose.add(model.onDidChangeContent((e) => {
+			this._proxy.$acceptModelChanged(modelUrl.toString(), e);
+		}));
+		toDispose.add(model.onWillDispose(() => {
+			this._stopModelSync(modelUrl);
+		}));
+		toDispose.add(toDisposable(() => {
+			this._proxy.$acceptRemovedModel(modelUrl);
+		}));
+
+		this._syncedModels[modelUrl] = toDispose;
+	}
+
+	private _stopModelSync(modelUrl: string): void {
+		const toDispose = this._syncedModels[modelUrl];
+		delete this._syncedModels[modelUrl];
+		delete this._syncedModelsLastUsedTime[modelUrl];
+		dispose(toDispose);
+	}
+}
+
+export class WorkerTextModelSyncServer implements IWorkerTextModelSyncChannelServer {
+
+	private readonly _models: { [uri: string]: MirrorModel };
+
+	constructor() {
+		this._models = Object.create(null);
+	}
+
+	public bindToServer(workerServer: IWorkerServer): void {
+		workerServer.setChannel(WORKER_TEXT_MODEL_SYNC_CHANNEL, this);
+	}
+
+	public getModel(uri: string): ICommonModel | undefined {
+		return this._models[uri];
+	}
+
+	public getModels(): ICommonModel[] {
+		const all: MirrorModel[] = [];
+		Object.keys(this._models).forEach((key) => all.push(this._models[key]));
+		return all;
+	}
+
+	$acceptNewModel(data: IRawModelData): void {
+		this._models[data.url] = new MirrorModel(URI.parse(data.url), data.lines, data.EOL, data.versionId);
+	}
+
+	$acceptModelChanged(uri: string, e: IModelChangedEvent): void {
+		if (!this._models[uri]) {
+			return;
+		}
+		const model = this._models[uri];
+		model.onEvents(e);
+	}
+
+	$acceptRemovedModel(uri: string): void {
+		if (!this._models[uri]) {
+			return;
+		}
+		delete this._models[uri];
+	}
+}
+
+export class MirrorModel extends BaseMirrorModel implements ICommonModel {
+
+	public get uri(): URI {
+		return this._uri;
+	}
+
+	public get eol(): string {
+		return this._eol;
+	}
+
+	public getValue(): string {
+		return this.getText();
+	}
+
+	public findMatches(regex: RegExp): RegExpMatchArray[] {
+		const matches = [];
+		for (let i = 0; i < this._lines.length; i++) {
+			const line = this._lines[i];
+			const offsetToAdd = this.offsetAt(new Position(i + 1, 1));
+			const iteratorOverMatches = line.matchAll(regex);
+			for (const match of iteratorOverMatches) {
+				if (match.index || match.index === 0) {
+					match.index = match.index + offsetToAdd;
+				}
+				matches.push(match);
+			}
+		}
+		return matches;
+	}
+
+	public getLinesContent(): string[] {
+		return this._lines.slice(0);
+	}
+
+	public getLineCount(): number {
+		return this._lines.length;
+	}
+
+	public getLineContent(lineNumber: number): string {
+		return this._lines[lineNumber - 1];
+	}
+
+	public getWordAtPosition(position: IPosition, wordDefinition: RegExp): Range | null {
+
+		const wordAtText = getWordAtText(
+			position.column,
+			ensureValidWordDefinition(wordDefinition),
+			this._lines[position.lineNumber - 1],
+			0
+		);
+
+		if (wordAtText) {
+			return new Range(position.lineNumber, wordAtText.startColumn, position.lineNumber, wordAtText.endColumn);
+		}
+
+		return null;
+	}
+
+	public getWordUntilPosition(position: IPosition, wordDefinition: RegExp): IWordAtPosition {
+		const wordAtPosition = this.getWordAtPosition(position, wordDefinition);
+		if (!wordAtPosition) {
+			return {
+				word: '',
+				startColumn: position.column,
+				endColumn: position.column
+			};
+		}
+		return {
+			word: this._lines[position.lineNumber - 1].substring(wordAtPosition.startColumn - 1, position.column - 1),
+			startColumn: wordAtPosition.startColumn,
+			endColumn: position.column
+		};
+	}
+
+
+	public words(wordDefinition: RegExp): Iterable<string> {
+
+		const lines = this._lines;
+		const wordenize = this._wordenize.bind(this);
+
+		let lineNumber = 0;
+		let lineText = '';
+		let wordRangesIdx = 0;
+		let wordRanges: IWordRange[] = [];
+
+		return {
+			*[Symbol.iterator]() {
+				while (true) {
+					if (wordRangesIdx < wordRanges.length) {
+						const value = lineText.substring(wordRanges[wordRangesIdx].start, wordRanges[wordRangesIdx].end);
+						wordRangesIdx += 1;
+						yield value;
+					} else {
+						if (lineNumber < lines.length) {
+							lineText = lines[lineNumber];
+							wordRanges = wordenize(lineText, wordDefinition);
+							wordRangesIdx = 0;
+							lineNumber += 1;
+						} else {
+							break;
+						}
+					}
+				}
+			}
+		};
+	}
+
+	public getLineWords(lineNumber: number, wordDefinition: RegExp): IWordAtPosition[] {
+		const content = this._lines[lineNumber - 1];
+		const ranges = this._wordenize(content, wordDefinition);
+		const words: IWordAtPosition[] = [];
+		for (const range of ranges) {
+			words.push({
+				word: content.substring(range.start, range.end),
+				startColumn: range.start + 1,
+				endColumn: range.end + 1
+			});
+		}
+		return words;
+	}
+
+	private _wordenize(content: string, wordDefinition: RegExp): IWordRange[] {
+		const result: IWordRange[] = [];
+		let match: RegExpExecArray | null;
+
+		wordDefinition.lastIndex = 0; // reset lastIndex just to be sure
+
+		while (match = wordDefinition.exec(content)) {
+			if (match[0].length === 0) {
+				// it did match the empty string
+				break;
+			}
+			result.push({ start: match.index, end: match.index + match[0].length });
+		}
+		return result;
+	}
+
+	public getValueInRange(range: IRange): string {
+		range = this._validateRange(range);
+
+		if (range.startLineNumber === range.endLineNumber) {
+			return this._lines[range.startLineNumber - 1].substring(range.startColumn - 1, range.endColumn - 1);
+		}
+
+		const lineEnding = this._eol;
+		const startLineIndex = range.startLineNumber - 1;
+		const endLineIndex = range.endLineNumber - 1;
+		const resultLines: string[] = [];
+
+		resultLines.push(this._lines[startLineIndex].substring(range.startColumn - 1));
+		for (let i = startLineIndex + 1; i < endLineIndex; i++) {
+			resultLines.push(this._lines[i]);
+		}
+		resultLines.push(this._lines[endLineIndex].substring(0, range.endColumn - 1));
+
+		return resultLines.join(lineEnding);
+	}
+
+	public offsetAt(position: IPosition): number {
+		position = this._validatePosition(position);
+		this._ensureLineStarts();
+		return this._lineStarts!.getPrefixSum(position.lineNumber - 2) + (position.column - 1);
+	}
+
+	public positionAt(offset: number): IPosition {
+		offset = Math.floor(offset);
+		offset = Math.max(0, offset);
+
+		this._ensureLineStarts();
+		const out = this._lineStarts!.getIndexOf(offset);
+		const lineLength = this._lines[out.index].length;
+
+		// Ensure we return a valid position
+		return {
+			lineNumber: 1 + out.index,
+			column: 1 + Math.min(out.remainder, lineLength)
+		};
+	}
+
+	private _validateRange(range: IRange): IRange {
+
+		const start = this._validatePosition({ lineNumber: range.startLineNumber, column: range.startColumn });
+		const end = this._validatePosition({ lineNumber: range.endLineNumber, column: range.endColumn });
+
+		if (start.lineNumber !== range.startLineNumber
+			|| start.column !== range.startColumn
+			|| end.lineNumber !== range.endLineNumber
+			|| end.column !== range.endColumn) {
+
+			return {
+				startLineNumber: start.lineNumber,
+				startColumn: start.column,
+				endLineNumber: end.lineNumber,
+				endColumn: end.column
+			};
+		}
+
+		return range;
+	}
+
+	private _validatePosition(position: IPosition): IPosition {
+		if (!Position.isIPosition(position)) {
+			throw new Error('bad position');
+		}
+		let { lineNumber, column } = position;
+		let hasChanged = false;
+
+		if (lineNumber < 1) {
+			lineNumber = 1;
+			column = 1;
+			hasChanged = true;
+
+		} else if (lineNumber > this._lines.length) {
+			lineNumber = this._lines.length;
+			column = this._lines[lineNumber - 1].length + 1;
+			hasChanged = true;
+
+		} else {
+			const maxCharacter = this._lines[lineNumber - 1].length + 1;
+			if (column < 1) {
+				column = 1;
+				hasChanged = true;
+			}
+			else if (column > maxCharacter) {
+				column = maxCharacter;
+				hasChanged = true;
+			}
+		}
+
+		if (!hasChanged) {
+			return position;
+		} else {
+			return { lineNumber, column };
+		}
+	}
+}
+
+export interface ICommonModel extends ILinkComputerTarget, IDocumentColorComputerTarget, IMirrorModel {
+	uri: URI;
+	version: number;
+	eol: string;
+	getValue(): string;
+
+	getLinesContent(): string[];
+	getLineCount(): number;
+	getLineContent(lineNumber: number): string;
+	getLineWords(lineNumber: number, wordDefinition: RegExp): IWordAtPosition[];
+	words(wordDefinition: RegExp): Iterable<string>;
+	getWordUntilPosition(position: IPosition, wordDefinition: RegExp): IWordAtPosition;
+	getValueInRange(range: IRange): string;
+	getWordAtPosition(position: IPosition, wordDefinition: RegExp): Range | null;
+	offsetAt(position: IPosition): number;
+	positionAt(offset: number): IPosition;
+	findMatches(regex: RegExp): RegExpMatchArray[];
+}
diff --git a/src/vs/editor/common/services/textModelSync/textModelSync.protocol.ts b/src/vs/editor/common/services/textModelSync/textModelSync.protocol.ts
new file mode 100644
index 00000000000..a9100cd5042
--- /dev/null
+++ b/src/vs/editor/common/services/textModelSync/textModelSync.protocol.ts
@@ -0,0 +1,21 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IModelChangedEvent } from '../../model/mirrorTextModel.js';
+
+export interface IWorkerTextModelSyncChannelServer {
+	$acceptNewModel(data: IRawModelData): void;
+
+	$acceptModelChanged(strURL: string, e: IModelChangedEvent): void;
+
+	$acceptRemovedModel(strURL: string): void;
+}
+
+export interface IRawModelData {
+	url: string;
+	versionId: number;
+	lines: string[];
+	EOL: string;
+}
diff --git a/src/vs/editor/common/services/textResourceConfiguration.ts b/src/vs/editor/common/services/textResourceConfiguration.ts
index 0921cba713d..f2edf685f2b 100644
--- a/src/vs/editor/common/services/textResourceConfiguration.ts
+++ b/src/vs/editor/common/services/textResourceConfiguration.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { URI } from 'vs/base/common/uri';
-import { IPosition } from 'vs/editor/common/core/position';
-import { ConfigurationTarget, IConfigurationValue } from 'vs/platform/configuration/common/configuration';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { Event } from '../../../base/common/event.js';
+import { URI } from '../../../base/common/uri.js';
+import { IPosition } from '../core/position.js';
+import { ConfigurationTarget, IConfigurationValue } from '../../../platform/configuration/common/configuration.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
 
 export const ITextResourceConfigurationService = createDecorator<ITextResourceConfigurationService>('textResourceConfigurationService');
 
diff --git a/src/vs/editor/common/services/textResourceConfigurationService.ts b/src/vs/editor/common/services/textResourceConfigurationService.ts
index 39390cbd033..567eac5b8b8 100644
--- a/src/vs/editor/common/services/textResourceConfigurationService.ts
+++ b/src/vs/editor/common/services/textResourceConfigurationService.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ITextResourceConfigurationService, ITextResourceConfigurationChangeEvent } from 'vs/editor/common/services/textResourceConfiguration';
-import { IConfigurationService, ConfigurationTarget, IConfigurationValue, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { URI } from '../../../base/common/uri.js';
+import { IPosition, Position } from '../core/position.js';
+import { ILanguageService } from '../languages/language.js';
+import { IModelService } from './model.js';
+import { ITextResourceConfigurationService, ITextResourceConfigurationChangeEvent } from './textResourceConfiguration.js';
+import { IConfigurationService, ConfigurationTarget, IConfigurationValue, IConfigurationChangeEvent } from '../../../platform/configuration/common/configuration.js';
 
 export class TextResourceConfigurationService extends Disposable implements ITextResourceConfigurationService {
 
diff --git a/src/vs/editor/common/services/treeSitterParserService.ts b/src/vs/editor/common/services/treeSitterParserService.ts
new file mode 100644
index 00000000000..d88b09a6e93
--- /dev/null
+++ b/src/vs/editor/common/services/treeSitterParserService.ts
@@ -0,0 +1,28 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import type { Parser } from '@vscode/tree-sitter-wasm';
+import { Event } from '../../../base/common/event.js';
+import { ITextModel } from '../model.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { Range } from '../core/range.js';
+
+export const EDITOR_EXPERIMENTAL_PREFER_TREESITTER = 'editor.experimental.preferTreeSitter';
+
+export const ITreeSitterParserService = createDecorator<ITreeSitterParserService>('treeSitterParserService');
+
+export interface ITreeSitterParserService {
+	readonly _serviceBrand: undefined;
+	onDidAddLanguage: Event<{ id: string; language: Parser.Language }>;
+	getOrInitLanguage(languageId: string): Parser.Language | undefined;
+	getParseResult(textModel: ITextModel): ITreeSitterParseResult | undefined;
+	getTree(content: string, languageId: string): Promise<Parser.Tree | undefined>;
+	onDidUpdateTree: Event<{ textModel: ITextModel; ranges: Range[] }>;
+}
+
+export interface ITreeSitterParseResult {
+	readonly tree: Parser.Tree | undefined;
+	readonly language: Parser.Language;
+}
diff --git a/src/vs/editor/common/services/treeViewsDndService.ts b/src/vs/editor/common/services/treeViewsDndService.ts
index 6130072bfb0..e7b3ebb9d07 100644
--- a/src/vs/editor/common/services/treeViewsDndService.ts
+++ b/src/vs/editor/common/services/treeViewsDndService.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { VSDataTransfer } from 'vs/base/common/dataTransfer';
-import { ITreeViewsDnDService as ITreeViewsDnDServiceCommon, TreeViewsDnDService } from 'vs/editor/common/services/treeViewsDnd';
+import { InstantiationType, registerSingleton } from '../../../platform/instantiation/common/extensions.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { VSDataTransfer } from '../../../base/common/dataTransfer.js';
+import { ITreeViewsDnDService as ITreeViewsDnDServiceCommon, TreeViewsDnDService } from './treeViewsDnd.js';
 
 export interface ITreeViewsDnDService extends ITreeViewsDnDServiceCommon<VSDataTransfer> { }
 export const ITreeViewsDnDService = createDecorator<ITreeViewsDnDService>('treeViewsDndService');
diff --git a/src/vs/editor/common/services/unicodeTextModelHighlighter.ts b/src/vs/editor/common/services/unicodeTextModelHighlighter.ts
index 86103738c48..d9e86c3e68b 100644
--- a/src/vs/editor/common/services/unicodeTextModelHighlighter.ts
+++ b/src/vs/editor/common/services/unicodeTextModelHighlighter.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { Searcher } from 'vs/editor/common/model/textModelSearch';
-import * as strings from 'vs/base/common/strings';
-import { IUnicodeHighlightsResult } from 'vs/editor/common/services/editorWorker';
-import { assertNever } from 'vs/base/common/assert';
-import { DEFAULT_WORD_REGEXP, getWordAtText } from 'vs/editor/common/core/wordHelper';
+import { IRange, Range } from '../core/range.js';
+import { Searcher } from '../model/textModelSearch.js';
+import * as strings from '../../../base/common/strings.js';
+import { IUnicodeHighlightsResult } from './editorWorker.js';
+import { assertNever } from '../../../base/common/assert.js';
+import { DEFAULT_WORD_REGEXP, getWordAtText } from '../core/wordHelper.js';
 
 export class UnicodeTextModelHighlighter {
 	public static computeUnicodeHighlights(model: IUnicodeCharacterSearcherTarget, options: UnicodeHighlighterOptions, range?: IRange): IUnicodeHighlightsResult {
diff --git a/src/vs/editor/common/standalone/standaloneEnums.ts b/src/vs/editor/common/standalone/standaloneEnums.ts
index 7cd16daae8b..600112188c3 100644
--- a/src/vs/editor/common/standalone/standaloneEnums.ts
+++ b/src/vs/editor/common/standalone/standaloneEnums.ts
@@ -210,120 +210,122 @@ export enum EditorOption {
 	domReadOnly = 34,
 	dragAndDrop = 35,
 	dropIntoEditor = 36,
-	emptySelectionClipboard = 37,
-	experimentalWhitespaceRendering = 38,
-	extraEditorClassName = 39,
-	fastScrollSensitivity = 40,
-	find = 41,
-	fixedOverflowWidgets = 42,
-	folding = 43,
-	foldingStrategy = 44,
-	foldingHighlight = 45,
-	foldingImportsByDefault = 46,
-	foldingMaximumRegions = 47,
-	unfoldOnClickAfterEndOfLine = 48,
-	fontFamily = 49,
-	fontInfo = 50,
-	fontLigatures = 51,
-	fontSize = 52,
-	fontWeight = 53,
-	fontVariations = 54,
-	formatOnPaste = 55,
-	formatOnType = 56,
-	glyphMargin = 57,
-	gotoLocation = 58,
-	hideCursorInOverviewRuler = 59,
-	hover = 60,
-	inDiffEditor = 61,
-	inlineSuggest = 62,
-	inlineEdit = 63,
-	letterSpacing = 64,
-	lightbulb = 65,
-	lineDecorationsWidth = 66,
-	lineHeight = 67,
-	lineNumbers = 68,
-	lineNumbersMinChars = 69,
-	linkedEditing = 70,
-	links = 71,
-	matchBrackets = 72,
-	minimap = 73,
-	mouseStyle = 74,
-	mouseWheelScrollSensitivity = 75,
-	mouseWheelZoom = 76,
-	multiCursorMergeOverlapping = 77,
-	multiCursorModifier = 78,
-	multiCursorPaste = 79,
-	multiCursorLimit = 80,
-	occurrencesHighlight = 81,
-	overviewRulerBorder = 82,
-	overviewRulerLanes = 83,
-	padding = 84,
-	pasteAs = 85,
-	parameterHints = 86,
-	peekWidgetDefaultFocus = 87,
-	placeholder = 88,
-	definitionLinkOpensInPeek = 89,
-	quickSuggestions = 90,
-	quickSuggestionsDelay = 91,
-	readOnly = 92,
-	readOnlyMessage = 93,
-	renameOnType = 94,
-	renderControlCharacters = 95,
-	renderFinalNewline = 96,
-	renderLineHighlight = 97,
-	renderLineHighlightOnlyWhenFocus = 98,
-	renderValidationDecorations = 99,
-	renderWhitespace = 100,
-	revealHorizontalRightPadding = 101,
-	roundedSelection = 102,
-	rulers = 103,
-	scrollbar = 104,
-	scrollBeyondLastColumn = 105,
-	scrollBeyondLastLine = 106,
-	scrollPredominantAxis = 107,
-	selectionClipboard = 108,
-	selectionHighlight = 109,
-	selectOnLineNumbers = 110,
-	showFoldingControls = 111,
-	showUnused = 112,
-	snippetSuggestions = 113,
-	smartSelect = 114,
-	smoothScrolling = 115,
-	stickyScroll = 116,
-	stickyTabStops = 117,
-	stopRenderingLineAfter = 118,
-	suggest = 119,
-	suggestFontSize = 120,
-	suggestLineHeight = 121,
-	suggestOnTriggerCharacters = 122,
-	suggestSelection = 123,
-	tabCompletion = 124,
-	tabIndex = 125,
-	unicodeHighlighting = 126,
-	unusualLineTerminators = 127,
-	useShadowDOM = 128,
-	useTabStops = 129,
-	wordBreak = 130,
-	wordSegmenterLocales = 131,
-	wordSeparators = 132,
-	wordWrap = 133,
-	wordWrapBreakAfterCharacters = 134,
-	wordWrapBreakBeforeCharacters = 135,
-	wordWrapColumn = 136,
-	wordWrapOverride1 = 137,
-	wordWrapOverride2 = 138,
-	wrappingIndent = 139,
-	wrappingStrategy = 140,
-	showDeprecated = 141,
-	inlayHints = 142,
-	editorClassName = 143,
-	pixelRatio = 144,
-	tabFocusMode = 145,
-	layoutInfo = 146,
-	wrappingInfo = 147,
-	defaultColorDecorators = 148,
-	colorDecoratorsActivatedOn = 149,
-	inlineCompletionsAccessibilityVerbose = 150
+	experimentalEditContextEnabled = 37,
+	emptySelectionClipboard = 38,
+	experimentalGpuAcceleration = 39,
+	experimentalWhitespaceRendering = 40,
+	extraEditorClassName = 41,
+	fastScrollSensitivity = 42,
+	find = 43,
+	fixedOverflowWidgets = 44,
+	folding = 45,
+	foldingStrategy = 46,
+	foldingHighlight = 47,
+	foldingImportsByDefault = 48,
+	foldingMaximumRegions = 49,
+	unfoldOnClickAfterEndOfLine = 50,
+	fontFamily = 51,
+	fontInfo = 52,
+	fontLigatures = 53,
+	fontSize = 54,
+	fontWeight = 55,
+	fontVariations = 56,
+	formatOnPaste = 57,
+	formatOnType = 58,
+	glyphMargin = 59,
+	gotoLocation = 60,
+	hideCursorInOverviewRuler = 61,
+	hover = 62,
+	inDiffEditor = 63,
+	inlineSuggest = 64,
+	inlineEdit = 65,
+	letterSpacing = 66,
+	lightbulb = 67,
+	lineDecorationsWidth = 68,
+	lineHeight = 69,
+	lineNumbers = 70,
+	lineNumbersMinChars = 71,
+	linkedEditing = 72,
+	links = 73,
+	matchBrackets = 74,
+	minimap = 75,
+	mouseStyle = 76,
+	mouseWheelScrollSensitivity = 77,
+	mouseWheelZoom = 78,
+	multiCursorMergeOverlapping = 79,
+	multiCursorModifier = 80,
+	multiCursorPaste = 81,
+	multiCursorLimit = 82,
+	occurrencesHighlight = 83,
+	overviewRulerBorder = 84,
+	overviewRulerLanes = 85,
+	padding = 86,
+	pasteAs = 87,
+	parameterHints = 88,
+	peekWidgetDefaultFocus = 89,
+	placeholder = 90,
+	definitionLinkOpensInPeek = 91,
+	quickSuggestions = 92,
+	quickSuggestionsDelay = 93,
+	readOnly = 94,
+	readOnlyMessage = 95,
+	renameOnType = 96,
+	renderControlCharacters = 97,
+	renderFinalNewline = 98,
+	renderLineHighlight = 99,
+	renderLineHighlightOnlyWhenFocus = 100,
+	renderValidationDecorations = 101,
+	renderWhitespace = 102,
+	revealHorizontalRightPadding = 103,
+	roundedSelection = 104,
+	rulers = 105,
+	scrollbar = 106,
+	scrollBeyondLastColumn = 107,
+	scrollBeyondLastLine = 108,
+	scrollPredominantAxis = 109,
+	selectionClipboard = 110,
+	selectionHighlight = 111,
+	selectOnLineNumbers = 112,
+	showFoldingControls = 113,
+	showUnused = 114,
+	snippetSuggestions = 115,
+	smartSelect = 116,
+	smoothScrolling = 117,
+	stickyScroll = 118,
+	stickyTabStops = 119,
+	stopRenderingLineAfter = 120,
+	suggest = 121,
+	suggestFontSize = 122,
+	suggestLineHeight = 123,
+	suggestOnTriggerCharacters = 124,
+	suggestSelection = 125,
+	tabCompletion = 126,
+	tabIndex = 127,
+	unicodeHighlighting = 128,
+	unusualLineTerminators = 129,
+	useShadowDOM = 130,
+	useTabStops = 131,
+	wordBreak = 132,
+	wordSegmenterLocales = 133,
+	wordSeparators = 134,
+	wordWrap = 135,
+	wordWrapBreakAfterCharacters = 136,
+	wordWrapBreakBeforeCharacters = 137,
+	wordWrapColumn = 138,
+	wordWrapOverride1 = 139,
+	wordWrapOverride2 = 140,
+	wrappingIndent = 141,
+	wrappingStrategy = 142,
+	showDeprecated = 143,
+	inlayHints = 144,
+	editorClassName = 145,
+	pixelRatio = 146,
+	tabFocusMode = 147,
+	layoutInfo = 148,
+	wrappingInfo = 149,
+	defaultColorDecorators = 150,
+	colorDecoratorsActivatedOn = 151,
+	inlineCompletionsAccessibilityVerbose = 152
 }
 
 /**
diff --git a/src/vs/editor/common/standaloneStrings.ts b/src/vs/editor/common/standaloneStrings.ts
index 81ffaa07895..a90add96865 100644
--- a/src/vs/editor/common/standaloneStrings.ts
+++ b/src/vs/editor/common/standaloneStrings.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
+import * as nls from '../../nls.js';
 
 export namespace AccessibilityHelpNLS {
 	export const accessibilityHelpTitle = nls.localize('accessibilityHelpTitle', "Accessibility Help");
@@ -18,14 +18,22 @@ export namespace AccessibilityHelpNLS {
 	export const auto_off = nls.localize("auto_off", "The application is configured to never be optimized for usage with a Screen Reader.");
 	export const screenReaderModeEnabled = nls.localize("screenReaderModeEnabled", "Screen Reader Optimized Mode enabled.");
 	export const screenReaderModeDisabled = nls.localize("screenReaderModeDisabled", "Screen Reader Optimized Mode disabled.");
-	export const tabFocusModeOnMsg = nls.localize("tabFocusModeOnMsg", "Pressing Tab in the current editor will move focus to the next focusable element. Toggle this behavior<keybinding:editor.action.toggleTabFocusMode>");
-	export const tabFocusModeOffMsg = nls.localize("tabFocusModeOffMsg", "Pressing Tab in the current editor will insert the tab character. Toggle this behavior<keybinding:editor.action.toggleTabFocusMode>");
-	export const stickScroll = nls.localize("stickScrollKb", "Focus Sticky Scroll<keybinding:editor.action.focusStickyScroll> to focus the currently nested scopes.");
+	export const tabFocusModeOnMsg = nls.localize("tabFocusModeOnMsg", "Pressing Tab in the current editor will move focus to the next focusable element. Toggle this behavior{0}.", '<keybinding:editor.action.toggleTabFocusMode>');
+	export const tabFocusModeOffMsg = nls.localize("tabFocusModeOffMsg", "Pressing Tab in the current editor will insert the tab character. Toggle this behavior{0}.", '<keybinding:editor.action.toggleTabFocusMode>');
+	export const stickScroll = nls.localize("stickScrollKb", "Focus Sticky Scroll{0} to focus the currently nested scopes.", '<keybinding:editor.action.focusStickyDebugConsole>');
+	export const codeFolding = nls.localize("codeFolding", "Use code folding to collapse blocks of code and focus on the code you're interested in via the Toggle Folding Command{0}.", '<keybinding:editor.toggleFold>');
+	export const intellisense = nls.localize("intellisense", "Use Intellisense to improve coding efficiency and reduce errors. Trigger suggestions{0}.", '<keybinding:editor.action.triggerSuggest>');
+	export const showOrFocusHover = nls.localize("showOrFocusHover", "Show or focus the hover{0} to read information about the current symbol.", '<keybinding:editor.action.showHover>');
+	export const goToSymbol = nls.localize("goToSymbol", "Go to Symbol{0} to quickly navigate between symbols in the current file.", '<keybinding:workbench.action.gotoSymbol>');
 	export const showAccessibilityHelpAction = nls.localize("showAccessibilityHelpAction", "Show Accessibility Help");
 	export const listSignalSounds = nls.localize("listSignalSoundsCommand", "Run the command: List Signal Sounds for an overview of all sounds and their current status.");
 	export const listAlerts = nls.localize("listAnnouncementsCommand", "Run the command: List Signal Announcements for an overview of announcements and their current status.");
-	export const quickChat = nls.localize("quickChatCommand", "Toggle quick chat<keybinding:workbench.action.quickchat.toggle> to open or close a chat session.",);
-	export const startInlineChat = nls.localize("startInlineChatCommand", "Start inline chat<keybinding:inlineChat.start> to create an in editor chat session.");
+	export const quickChat = nls.localize("quickChatCommand", "Toggle quick chat{0} to open or close a chat session.", '<keybinding:workbench.action.quickchat.toggle>');
+	export const startInlineChat = nls.localize("startInlineChatCommand", "Start inline chat{0} to create an in editor chat session.", '<keybinding:inlineChat.start>');
+	export const startDebugging = nls.localize('debug.startDebugging', "The Debug: Start Debugging command{0} will start a debug session.", '<keybinding:workbench.action.debug.start>');
+	export const setBreakpoint = nls.localize('debugConsole.setBreakpoint', "The Debug: Inline Breakpoint command{0} will set or unset a breakpoint at the current cursor position in the active editor.", '<keybinding:editor.debug.action.toggleInlineBreakpoint>');
+	export const addToWatch = nls.localize('debugConsole.addToWatch', "The Debug: Add to Watch command{0} will add the selected text to the watch view.", '<keybinding:editor.debug.action.selectionToWatch>');
+	export const debugExecuteSelection = nls.localize('debugConsole.executeSelection', "The Debug: Execute Selection command{0} will execute the selected text in the debug console.", '<keybinding:editor.debug.action.selectionToRepl>');
 }
 
 export namespace InspectTokensNLS {
@@ -52,7 +60,6 @@ export namespace QuickOutlineNLS {
 
 export namespace StandaloneCodeEditorNLS {
 	export const editorViewAccessibleLabel = nls.localize('editorViewAccessibleLabel', "Editor content");
-	export const accessibilityHelpMessage = nls.localize('accessibilityHelpMessage', "Press Alt+F1 for Accessibility Options.");
 }
 
 export namespace ToggleHighContrastNLS {
diff --git a/src/vs/editor/common/textModelBracketPairs.ts b/src/vs/editor/common/textModelBracketPairs.ts
index 8d916800b2c..03fc83cff1f 100644
--- a/src/vs/editor/common/textModelBracketPairs.ts
+++ b/src/vs/editor/common/textModelBracketPairs.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CallbackIterable } from 'vs/base/common/arrays';
-import { Event } from 'vs/base/common/event';
-import { IPosition } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { ClosingBracketKind, OpeningBracketKind } from 'vs/editor/common/languages/supports/languageBracketsConfiguration';
-import { PairAstNode } from 'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/ast';
+import { CallbackIterable } from '../../base/common/arrays.js';
+import { Event } from '../../base/common/event.js';
+import { IPosition } from './core/position.js';
+import { IRange, Range } from './core/range.js';
+import { ClosingBracketKind, OpeningBracketKind } from './languages/supports/languageBracketsConfiguration.js';
+import { PairAstNode } from './model/bracketPairsTextModelPart/bracketPairsTree/ast.js';
 
 export interface IBracketPairsTextModelPart {
 	/**
diff --git a/src/vs/editor/common/textModelEvents.ts b/src/vs/editor/common/textModelEvents.ts
index 58c720ac87c..768563c4be6 100644
--- a/src/vs/editor/common/textModelEvents.ts
+++ b/src/vs/editor/common/textModelEvents.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IRange } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { IModelDecoration, InjectedTextOptions } from 'vs/editor/common/model';
+import { IRange } from './core/range.js';
+import { Selection } from './core/selection.js';
+import { IModelDecoration, InjectedTextOptions } from './model.js';
 
 /**
  * An event describing that the current language associated with a model has changed.
@@ -55,6 +55,9 @@ export interface IModelContentChange {
  * An event describing a change in the text of a model.
  */
 export interface IModelContentChangedEvent {
+	/**
+	 * The changes are ordered from the end of the document to the beginning, so they should be safe to apply in sequence.
+	 */
 	readonly changes: IModelContentChange[];
 	/**
 	 * The (new) end-of-line character.
diff --git a/src/vs/editor/common/textModelGuides.ts b/src/vs/editor/common/textModelGuides.ts
index 01789ed6b0c..a109109e430 100644
--- a/src/vs/editor/common/textModelGuides.ts
+++ b/src/vs/editor/common/textModelGuides.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IPosition } from 'vs/editor/common/core/position';
+import { IPosition } from './core/position.js';
 
 export interface IGuidesTextModelPart {
 	/**
diff --git a/src/vs/editor/common/tokenizationRegistry.ts b/src/vs/editor/common/tokenizationRegistry.ts
index d9fb1bba82f..d6c0c2f39bf 100644
--- a/src/vs/editor/common/tokenizationRegistry.ts
+++ b/src/vs/editor/common/tokenizationRegistry.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Color } from 'vs/base/common/color';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { ITokenizationRegistry, ITokenizationSupport, ITokenizationSupportChangedEvent, ILazyTokenizationSupport } from 'vs/editor/common/languages';
-import { ColorId } from 'vs/editor/common/encodedTokenAttributes';
+import { Color } from '../../base/common/color.js';
+import { Emitter, Event } from '../../base/common/event.js';
+import { Disposable, IDisposable, toDisposable } from '../../base/common/lifecycle.js';
+import { ITokenizationRegistry, ITokenizationSupportChangedEvent, ILazyTokenizationSupport } from './languages.js';
+import { ColorId } from './encodedTokenAttributes.js';
 
-export class TokenizationRegistry implements ITokenizationRegistry {
+export class TokenizationRegistry<TSupport> implements ITokenizationRegistry<TSupport> {
 
-	private readonly _tokenizationSupports = new Map<string, ITokenizationSupport>();
-	private readonly _factories = new Map<string, TokenizationSupportFactoryData>();
+	private readonly _tokenizationSupports = new Map<string, TSupport>();
+	private readonly _factories = new Map<string, TokenizationSupportFactoryData<TSupport>>();
 
 	private readonly _onDidChange = new Emitter<ITokenizationSupportChangedEvent>();
 	public readonly onDidChange: Event<ITokenizationSupportChangedEvent> = this._onDidChange.event;
@@ -30,7 +30,7 @@ export class TokenizationRegistry implements ITokenizationRegistry {
 		});
 	}
 
-	public register(languageId: string, support: ITokenizationSupport): IDisposable {
+	public register(languageId: string, support: TSupport): IDisposable {
 		this._tokenizationSupports.set(languageId, support);
 		this.handleChange([languageId]);
 		return toDisposable(() => {
@@ -42,11 +42,11 @@ export class TokenizationRegistry implements ITokenizationRegistry {
 		});
 	}
 
-	public get(languageId: string): ITokenizationSupport | null {
+	public get(languageId: string): TSupport | null {
 		return this._tokenizationSupports.get(languageId) || null;
 	}
 
-	public registerFactory(languageId: string, factory: ILazyTokenizationSupport): IDisposable {
+	public registerFactory(languageId: string, factory: ILazyTokenizationSupport<TSupport>): IDisposable {
 		this._factories.get(languageId)?.dispose();
 		const myData = new TokenizationSupportFactoryData(this, languageId, factory);
 		this._factories.set(languageId, myData);
@@ -60,7 +60,7 @@ export class TokenizationRegistry implements ITokenizationRegistry {
 		});
 	}
 
-	public async getOrCreate(languageId: string): Promise<ITokenizationSupport | null> {
+	public async getOrCreate(languageId: string): Promise<TSupport | null> {
 		// check first if the support is already set
 		const tokenizationSupport = this.get(languageId);
 		if (tokenizationSupport) {
@@ -112,7 +112,7 @@ export class TokenizationRegistry implements ITokenizationRegistry {
 	}
 }
 
-class TokenizationSupportFactoryData extends Disposable {
+class TokenizationSupportFactoryData<TSupport> extends Disposable {
 
 	private _isDisposed: boolean = false;
 	private _resolvePromise: Promise<void> | null = null;
@@ -123,9 +123,9 @@ class TokenizationSupportFactoryData extends Disposable {
 	}
 
 	constructor(
-		private readonly _registry: TokenizationRegistry,
+		private readonly _registry: TokenizationRegistry<TSupport>,
 		private readonly _languageId: string,
-		private readonly _factory: ILazyTokenizationSupport,
+		private readonly _factory: ILazyTokenizationSupport<TSupport>,
 	) {
 		super();
 	}
diff --git a/src/vs/editor/common/tokenizationTextModelPart.ts b/src/vs/editor/common/tokenizationTextModelPart.ts
index 07eb06f9fdc..25e7569b2f9 100644
--- a/src/vs/editor/common/tokenizationTextModelPart.ts
+++ b/src/vs/editor/common/tokenizationTextModelPart.ts
@@ -3,11 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IPosition } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { StandardTokenType } from 'vs/editor/common/encodedTokenAttributes';
-import { LineTokens } from 'vs/editor/common/tokens/lineTokens';
-import { SparseMultilineTokens } from 'vs/editor/common/tokens/sparseMultilineTokens';
+import { OffsetEdit } from './core/offsetEdit.js';
+import { OffsetRange } from './core/offsetRange.js';
+import { Range } from './core/range.js';
+import { StandardTokenType } from './encodedTokenAttributes.js';
+import { LineTokens } from './tokens/lineTokens.js';
+import { SparseMultilineTokens } from './tokens/sparseMultilineTokens.js';
 
 /**
  * Provides tokenization related functionality of the text model.
@@ -86,7 +87,7 @@ export interface ITokenizationTextModelPart {
 	/**
 	 * @internal
 	*/
-	tokenizeLineWithEdit(position: IPosition, length: number, newText: string): LineTokens | null;
+	tokenizeLineWithEdit(lineNumber: number, edit: LineEditWithAdditionalLines): ITokenizeLineWithEditResult;
 
 	getLanguageId(): string;
 	getLanguageIdAtPosition(lineNumber: number, column: number): string;
@@ -96,6 +97,32 @@ export interface ITokenizationTextModelPart {
 	readonly backgroundTokenizationState: BackgroundTokenizationState;
 }
 
+export class LineEditWithAdditionalLines {
+	public static replace(range: OffsetRange, text: string): LineEditWithAdditionalLines {
+		return new LineEditWithAdditionalLines(
+			OffsetEdit.replace(range, text),
+			null,
+		);
+	}
+
+	constructor(
+		/**
+		 * The edit for the main line.
+		*/
+		readonly lineEdit: OffsetEdit,
+
+		/**
+		 * Full lines appended after the main line.
+		*/
+		readonly additionalLines: string[] | null,
+	) { }
+}
+
+export interface ITokenizeLineWithEditResult {
+	readonly mainLineTokens: LineTokens | null;
+	readonly additionalLines: LineTokens[] | null;
+}
+
 export const enum BackgroundTokenizationState {
 	InProgress = 1,
 	Completed = 2,
diff --git a/src/vs/editor/common/tokens/contiguousMultilineTokens.ts b/src/vs/editor/common/tokens/contiguousMultilineTokens.ts
index f4d267fba0a..3e3e8886f1b 100644
--- a/src/vs/editor/common/tokens/contiguousMultilineTokens.ts
+++ b/src/vs/editor/common/tokens/contiguousMultilineTokens.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as arrays from 'vs/base/common/arrays';
-import { readUInt32BE, writeUInt32BE } from 'vs/base/common/buffer';
-import { Position } from 'vs/editor/common/core/position';
-import { IRange } from 'vs/editor/common/core/range';
-import { countEOL } from 'vs/editor/common/core/eolCounter';
-import { ContiguousTokensEditing } from 'vs/editor/common/tokens/contiguousTokensEditing';
-import { LineRange } from 'vs/editor/common/core/lineRange';
+import * as arrays from '../../../base/common/arrays.js';
+import { readUInt32BE, writeUInt32BE } from '../../../base/common/buffer.js';
+import { Position } from '../core/position.js';
+import { IRange } from '../core/range.js';
+import { countEOL } from '../core/eolCounter.js';
+import { ContiguousTokensEditing } from './contiguousTokensEditing.js';
+import { LineRange } from '../core/lineRange.js';
 
 /**
  * Represents contiguous tokens over a contiguous range of lines.
diff --git a/src/vs/editor/common/tokens/contiguousMultilineTokensBuilder.ts b/src/vs/editor/common/tokens/contiguousMultilineTokensBuilder.ts
index 0c46da70b0a..f2b34cc9cd1 100644
--- a/src/vs/editor/common/tokens/contiguousMultilineTokensBuilder.ts
+++ b/src/vs/editor/common/tokens/contiguousMultilineTokensBuilder.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { readUInt32BE, writeUInt32BE } from 'vs/base/common/buffer';
-import { ContiguousMultilineTokens } from 'vs/editor/common/tokens/contiguousMultilineTokens';
+import { readUInt32BE, writeUInt32BE } from '../../../base/common/buffer.js';
+import { ContiguousMultilineTokens } from './contiguousMultilineTokens.js';
 
 export class ContiguousMultilineTokensBuilder {
 
diff --git a/src/vs/editor/common/tokens/contiguousTokensEditing.ts b/src/vs/editor/common/tokens/contiguousTokensEditing.ts
index 1ccb5b5ba72..28d444a2df0 100644
--- a/src/vs/editor/common/tokens/contiguousTokensEditing.ts
+++ b/src/vs/editor/common/tokens/contiguousTokensEditing.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { LineTokens } from 'vs/editor/common/tokens/lineTokens';
+import { LineTokens } from './lineTokens.js';
 
 export const EMPTY_LINE_TOKENS = (new Uint32Array(0)).buffer;
 
diff --git a/src/vs/editor/common/tokens/contiguousTokensStore.ts b/src/vs/editor/common/tokens/contiguousTokensStore.ts
index 02b47bfd4f0..4134eee8507 100644
--- a/src/vs/editor/common/tokens/contiguousTokensStore.ts
+++ b/src/vs/editor/common/tokens/contiguousTokensStore.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as arrays from 'vs/base/common/arrays';
-import { Position } from 'vs/editor/common/core/position';
-import { IRange } from 'vs/editor/common/core/range';
-import { ContiguousTokensEditing, EMPTY_LINE_TOKENS, toUint32Array } from 'vs/editor/common/tokens/contiguousTokensEditing';
-import { LineTokens } from 'vs/editor/common/tokens/lineTokens';
-import { ILanguageIdCodec } from 'vs/editor/common/languages';
-import { LanguageId, FontStyle, ColorId, StandardTokenType, MetadataConsts, TokenMetadata } from 'vs/editor/common/encodedTokenAttributes';
-import { ITextModel } from 'vs/editor/common/model';
-import { ContiguousMultilineTokens } from 'vs/editor/common/tokens/contiguousMultilineTokens';
+import * as arrays from '../../../base/common/arrays.js';
+import { Position } from '../core/position.js';
+import { IRange } from '../core/range.js';
+import { ContiguousTokensEditing, EMPTY_LINE_TOKENS, toUint32Array } from './contiguousTokensEditing.js';
+import { LineTokens } from './lineTokens.js';
+import { ILanguageIdCodec } from '../languages.js';
+import { LanguageId, FontStyle, ColorId, StandardTokenType, MetadataConsts, TokenMetadata } from '../encodedTokenAttributes.js';
+import { ITextModel } from '../model.js';
+import { ContiguousMultilineTokens } from './contiguousMultilineTokens.js';
 
 /**
  * Represents contiguous tokens in a text model.
diff --git a/src/vs/editor/common/tokens/lineTokens.ts b/src/vs/editor/common/tokens/lineTokens.ts
index 67cdf815001..6409d662db5 100644
--- a/src/vs/editor/common/tokens/lineTokens.ts
+++ b/src/vs/editor/common/tokens/lineTokens.ts
@@ -3,10 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ILanguageIdCodec } from 'vs/editor/common/languages';
-import { FontStyle, ColorId, StandardTokenType, MetadataConsts, TokenMetadata, ITokenPresentation } from 'vs/editor/common/encodedTokenAttributes';
-import { IPosition } from 'vs/editor/common/core/position';
-import { ITextModel } from 'vs/editor/common/model';
+import { ILanguageIdCodec } from '../languages.js';
+import { FontStyle, ColorId, StandardTokenType, MetadataConsts, TokenMetadata, ITokenPresentation } from '../encodedTokenAttributes.js';
+import { IPosition } from '../core/position.js';
+import { ITextModel } from '../model.js';
+import { OffsetRange } from '../core/offsetRange.js';
+import { TokenArray, TokenArrayBuilder } from './tokenArray.js';
+
 
 export interface IViewLineTokens {
 	languageIdCodec: ILanguageIdCodec;
@@ -27,20 +30,6 @@ export interface IViewLineTokens {
 }
 
 export class LineTokens implements IViewLineTokens {
-	_lineTokensBrand: void = undefined;
-
-	private readonly _tokens: Uint32Array;
-	private readonly _tokensCount: number;
-	private readonly _text: string;
-
-	public readonly languageIdCodec: ILanguageIdCodec;
-
-	public static defaultTokenMetadata = (
-		(FontStyle.None << MetadataConsts.FONT_STYLE_OFFSET)
-		| (ColorId.DefaultForeground << MetadataConsts.FOREGROUND_OFFSET)
-		| (ColorId.DefaultBackground << MetadataConsts.BACKGROUND_OFFSET)
-	) >>> 0;
-
 	public static createEmpty(lineContent: string, decoder: ILanguageIdCodec): LineTokens {
 		const defaultMetadata = LineTokens.defaultTokenMetadata;
 
@@ -63,6 +52,54 @@ export class LineTokens implements IViewLineTokens {
 		return new LineTokens(new Uint32Array(tokens), fullText, decoder);
 	}
 
+	public static convertToEndOffset(tokens: Uint32Array, lineTextLength: number): void {
+		const tokenCount = (tokens.length >>> 1);
+		const lastTokenIndex = tokenCount - 1;
+		for (let tokenIndex = 0; tokenIndex < lastTokenIndex; tokenIndex++) {
+			tokens[tokenIndex << 1] = tokens[(tokenIndex + 1) << 1];
+		}
+		tokens[lastTokenIndex << 1] = lineTextLength;
+	}
+
+	public static findIndexInTokensArray(tokens: Uint32Array, desiredIndex: number): number {
+		if (tokens.length <= 2) {
+			return 0;
+		}
+
+		let low = 0;
+		let high = (tokens.length >>> 1) - 1;
+
+		while (low < high) {
+
+			const mid = low + Math.floor((high - low) / 2);
+			const endOffset = tokens[(mid << 1)];
+
+			if (endOffset === desiredIndex) {
+				return mid + 1;
+			} else if (endOffset < desiredIndex) {
+				low = mid + 1;
+			} else if (endOffset > desiredIndex) {
+				high = mid;
+			}
+		}
+
+		return low;
+	}
+
+	_lineTokensBrand: void = undefined;
+
+	private readonly _tokens: Uint32Array;
+	private readonly _tokensCount: number;
+	private readonly _text: string;
+
+	public readonly languageIdCodec: ILanguageIdCodec;
+
+	public static defaultTokenMetadata = (
+		(FontStyle.None << MetadataConsts.FONT_STYLE_OFFSET)
+		| (ColorId.DefaultForeground << MetadataConsts.FOREGROUND_OFFSET)
+		| (ColorId.DefaultBackground << MetadataConsts.BACKGROUND_OFFSET)
+	) >>> 0;
+
 	constructor(tokens: Uint32Array, text: string, decoder: ILanguageIdCodec) {
 		this._tokens = tokens;
 		this._tokensCount = (this._tokens.length >>> 1);
@@ -166,40 +203,6 @@ export class LineTokens implements IViewLineTokens {
 		return new SliceLineTokens(this, startOffset, endOffset, deltaOffset);
 	}
 
-	public static convertToEndOffset(tokens: Uint32Array, lineTextLength: number): void {
-		const tokenCount = (tokens.length >>> 1);
-		const lastTokenIndex = tokenCount - 1;
-		for (let tokenIndex = 0; tokenIndex < lastTokenIndex; tokenIndex++) {
-			tokens[tokenIndex << 1] = tokens[(tokenIndex + 1) << 1];
-		}
-		tokens[lastTokenIndex << 1] = lineTextLength;
-	}
-
-	public static findIndexInTokensArray(tokens: Uint32Array, desiredIndex: number): number {
-		if (tokens.length <= 2) {
-			return 0;
-		}
-
-		let low = 0;
-		let high = (tokens.length >>> 1) - 1;
-
-		while (low < high) {
-
-			const mid = low + Math.floor((high - low) / 2);
-			const endOffset = tokens[(mid << 1)];
-
-			if (endOffset === desiredIndex) {
-				return mid + 1;
-			} else if (endOffset < desiredIndex) {
-				low = mid + 1;
-			} else if (endOffset > desiredIndex) {
-				high = mid;
-			}
-		}
-
-		return low;
-	}
-
 	/**
 	 * @pure
 	 * @param insertTokens Must be sorted by offset.
@@ -247,6 +250,23 @@ export class LineTokens implements IViewLineTokens {
 		return new LineTokens(new Uint32Array(newTokens), text, this.languageIdCodec);
 	}
 
+	public getTokensInRange(range: OffsetRange): TokenArray {
+		const builder = new TokenArrayBuilder();
+
+		const startTokenIndex = this.findTokenIndexAtOffset(range.start);
+		const endTokenIndex = this.findTokenIndexAtOffset(range.endExclusive);
+
+		for (let tokenIndex = startTokenIndex; tokenIndex <= endTokenIndex; tokenIndex++) {
+			const tokenRange = new OffsetRange(this.getStartOffset(tokenIndex), this.getEndOffset(tokenIndex));
+			const length = tokenRange.intersectionLength(range);
+			if (length > 0) {
+				builder.add(length, this.getMetadata(tokenIndex));
+			}
+		}
+
+		return builder.build();
+	}
+
 	public getTokenText(tokenIndex: number): string {
 		const startOffset = this.getStartOffset(tokenIndex);
 		const endOffset = this.getEndOffset(tokenIndex);
diff --git a/src/vs/editor/common/tokens/sparseMultilineTokens.ts b/src/vs/editor/common/tokens/sparseMultilineTokens.ts
index e46f9aeca36..50887a06af6 100644
--- a/src/vs/editor/common/tokens/sparseMultilineTokens.ts
+++ b/src/vs/editor/common/tokens/sparseMultilineTokens.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
-import { Position } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { countEOL } from 'vs/editor/common/core/eolCounter';
+import { CharCode } from '../../../base/common/charCode.js';
+import { Position } from '../core/position.js';
+import { IRange, Range } from '../core/range.js';
+import { countEOL } from '../core/eolCounter.js';
 
 /**
  * Represents sparse tokens over a contiguous range of lines.
diff --git a/src/vs/editor/common/tokens/sparseTokensStore.ts b/src/vs/editor/common/tokens/sparseTokensStore.ts
index 90a1f3ab818..dd89936c989 100644
--- a/src/vs/editor/common/tokens/sparseTokensStore.ts
+++ b/src/vs/editor/common/tokens/sparseTokensStore.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as arrays from 'vs/base/common/arrays';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { LineTokens } from 'vs/editor/common/tokens/lineTokens';
-import { SparseMultilineTokens } from 'vs/editor/common/tokens/sparseMultilineTokens';
-import { ILanguageIdCodec } from 'vs/editor/common/languages';
-import { MetadataConsts } from 'vs/editor/common/encodedTokenAttributes';
+import * as arrays from '../../../base/common/arrays.js';
+import { IRange, Range } from '../core/range.js';
+import { LineTokens } from './lineTokens.js';
+import { SparseMultilineTokens } from './sparseMultilineTokens.js';
+import { ILanguageIdCodec } from '../languages.js';
+import { MetadataConsts } from '../encodedTokenAttributes.js';
 
 /**
  * Represents sparse tokens in a text model.
diff --git a/src/vs/editor/common/tokens/tokenArray.ts b/src/vs/editor/common/tokens/tokenArray.ts
new file mode 100644
index 00000000000..1b6891f223d
--- /dev/null
+++ b/src/vs/editor/common/tokens/tokenArray.ts
@@ -0,0 +1,79 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { OffsetRange } from '../core/offsetRange.js';
+
+/**
+ * This class represents a sequence of tokens.
+ * Conceptually, each token has a length and a metadata number.
+ * A token array might be used to annotate a string with metadata.
+ * Use {@link TokenArrayBuilder} to efficiently create a token array.
+ *
+ * TODO: Make this class more efficient (e.g. by using a Int32Array).
+*/
+export class TokenArray {
+	public static create(tokenInfo: TokenInfo[]): TokenArray {
+		return new TokenArray(tokenInfo);
+	}
+
+	private constructor(
+		private readonly _tokenInfo: TokenInfo[],
+	) { }
+
+	public forEach(cb: (range: OffsetRange, tokenInfo: TokenInfo) => void): void {
+		let lengthSum = 0;
+		for (const tokenInfo of this._tokenInfo) {
+			const range = new OffsetRange(lengthSum, lengthSum + tokenInfo.length);
+			cb(range, tokenInfo);
+			lengthSum += tokenInfo.length;
+		}
+	}
+
+	public slice(range: OffsetRange): TokenArray {
+		const result: TokenInfo[] = [];
+		let lengthSum = 0;
+		for (const tokenInfo of this._tokenInfo) {
+			const tokenStart = lengthSum;
+			const tokenEndEx = tokenStart + tokenInfo.length;
+			if (tokenEndEx > range.start) {
+				if (tokenStart >= range.endExclusive) {
+					break;
+				}
+
+				const deltaBefore = Math.max(0, range.start - tokenStart);
+				const deltaAfter = Math.max(0, tokenEndEx - range.endExclusive);
+
+				result.push(new TokenInfo(tokenInfo.length - deltaBefore - deltaAfter, tokenInfo.metadata));
+			}
+
+			lengthSum += tokenInfo.length;
+		}
+		return TokenArray.create(result);
+	}
+}
+
+export type TokenMetadata = number;
+
+export class TokenInfo {
+	constructor(
+		public readonly length: number,
+		public readonly metadata: TokenMetadata,
+	) { }
+}
+
+/**
+ * TODO: Make this class more efficient (e.g. by using a Int32Array).
+*/
+export class TokenArrayBuilder {
+	private readonly _tokens: TokenInfo[] = [];
+
+	public add(length: number, metadata: TokenMetadata): void {
+		this._tokens.push(new TokenInfo(length, metadata));
+	}
+
+	public build(): TokenArray {
+		return TokenArray.create(this._tokens);
+	}
+}
diff --git a/src/vs/editor/common/viewEventHandler.ts b/src/vs/editor/common/viewEventHandler.ts
index a80b59c50ea..952bfdd1d8f 100644
--- a/src/vs/editor/common/viewEventHandler.ts
+++ b/src/vs/editor/common/viewEventHandler.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import * as viewEvents from 'vs/editor/common/viewEvents';
+import { Disposable } from '../../base/common/lifecycle.js';
+import * as viewEvents from './viewEvents.js';
 
 export class ViewEventHandler extends Disposable {
 
diff --git a/src/vs/editor/common/viewEvents.ts b/src/vs/editor/common/viewEvents.ts
index f607afe73e9..ce107651bac 100644
--- a/src/vs/editor/common/viewEvents.ts
+++ b/src/vs/editor/common/viewEvents.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ScrollEvent } from 'vs/base/common/scrollable';
-import { ConfigurationChangedEvent, EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { CursorChangeReason } from 'vs/editor/common/cursorEvents';
-import { ScrollType } from 'vs/editor/common/editorCommon';
-import { IModelDecorationsChangedEvent } from 'vs/editor/common/textModelEvents';
-import { IColorTheme } from 'vs/platform/theme/common/themeService';
+import { ScrollEvent } from '../../base/common/scrollable.js';
+import { ConfigurationChangedEvent, EditorOption } from './config/editorOptions.js';
+import { Range } from './core/range.js';
+import { Selection } from './core/selection.js';
+import { CursorChangeReason } from './cursorEvents.js';
+import { ScrollType } from './editorCommon.js';
+import { IModelDecorationsChangedEvent } from './textModelEvents.js';
+import { IColorTheme } from '../../platform/theme/common/themeService.js';
 
 export const enum ViewEventType {
 	ViewCompositionStart,
diff --git a/src/vs/editor/common/viewLayout/lineDecorations.ts b/src/vs/editor/common/viewLayout/lineDecorations.ts
index 381e8cfb4b1..c607968187d 100644
--- a/src/vs/editor/common/viewLayout/lineDecorations.ts
+++ b/src/vs/editor/common/viewLayout/lineDecorations.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as strings from 'vs/base/common/strings';
-import { Constants } from 'vs/base/common/uint';
-import { LinePartMetadata } from 'vs/editor/common/viewLayout/linePart';
-import { InlineDecoration, InlineDecorationType } from 'vs/editor/common/viewModel';
+import * as strings from '../../../base/common/strings.js';
+import { Constants } from '../../../base/common/uint.js';
+import { LinePartMetadata } from './linePart.js';
+import { InlineDecoration, InlineDecorationType } from '../viewModel.js';
 
 export class LineDecoration {
 	_lineDecorationBrand: void = undefined;
diff --git a/src/vs/editor/common/viewLayout/linesLayout.ts b/src/vs/editor/common/viewLayout/linesLayout.ts
index 71bf9d5b956..f7988abddce 100644
--- a/src/vs/editor/common/viewLayout/linesLayout.ts
+++ b/src/vs/editor/common/viewLayout/linesLayout.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IEditorWhitespace, IPartialViewLinesViewportData, IViewWhitespaceViewportData, IWhitespaceChangeAccessor } from 'vs/editor/common/viewModel';
-import * as strings from 'vs/base/common/strings';
+import { IEditorWhitespace, IPartialViewLinesViewportData, IViewWhitespaceViewportData, IWhitespaceChangeAccessor } from '../viewModel.js';
+import * as strings from '../../../base/common/strings.js';
 
 interface IPendingChange { id: string; newAfterLineNumber: number; newHeight: number }
 interface IPendingRemove { id: string }
diff --git a/src/vs/editor/common/viewLayout/viewLayout.ts b/src/vs/editor/common/viewLayout/viewLayout.ts
index e6209088e75..767a308db9a 100644
--- a/src/vs/editor/common/viewLayout/viewLayout.ts
+++ b/src/vs/editor/common/viewLayout/viewLayout.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event, Emitter } from 'vs/base/common/event';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { IScrollPosition, ScrollEvent, Scrollable, ScrollbarVisibility, INewScrollPosition } from 'vs/base/common/scrollable';
-import { ConfigurationChangedEvent, EditorOption } from 'vs/editor/common/config/editorOptions';
-import { ScrollType } from 'vs/editor/common/editorCommon';
-import { IEditorConfiguration } from 'vs/editor/common/config/editorConfiguration';
-import { LinesLayout } from 'vs/editor/common/viewLayout/linesLayout';
-import { IEditorWhitespace, IPartialViewLinesViewportData, IViewLayout, IViewWhitespaceViewportData, IWhitespaceChangeAccessor, Viewport } from 'vs/editor/common/viewModel';
-import { ContentSizeChangedEvent } from 'vs/editor/common/viewModelEventDispatcher';
+import { Event, Emitter } from '../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../base/common/lifecycle.js';
+import { IScrollPosition, ScrollEvent, Scrollable, ScrollbarVisibility, INewScrollPosition } from '../../../base/common/scrollable.js';
+import { ConfigurationChangedEvent, EditorOption } from '../config/editorOptions.js';
+import { ScrollType } from '../editorCommon.js';
+import { IEditorConfiguration } from '../config/editorConfiguration.js';
+import { LinesLayout } from './linesLayout.js';
+import { IEditorWhitespace, IPartialViewLinesViewportData, IViewLayout, IViewWhitespaceViewportData, IWhitespaceChangeAccessor, Viewport } from '../viewModel.js';
+import { ContentSizeChangedEvent } from '../viewModelEventDispatcher.js';
 
 const SMOOTH_SCROLLING_TIME = 125;
 
diff --git a/src/vs/editor/common/viewLayout/viewLineRenderer.ts b/src/vs/editor/common/viewLayout/viewLineRenderer.ts
index 0e94382f9a8..b19b34e040c 100644
--- a/src/vs/editor/common/viewLayout/viewLineRenderer.ts
+++ b/src/vs/editor/common/viewLayout/viewLineRenderer.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { CharCode } from 'vs/base/common/charCode';
-import * as strings from 'vs/base/common/strings';
-import { IViewLineTokens } from 'vs/editor/common/tokens/lineTokens';
-import { StringBuilder } from 'vs/editor/common/core/stringBuilder';
-import { LineDecoration, LineDecorationsNormalizer } from 'vs/editor/common/viewLayout/lineDecorations';
-import { InlineDecorationType } from 'vs/editor/common/viewModel';
-import { LinePart, LinePartMetadata } from 'vs/editor/common/viewLayout/linePart';
+import * as nls from '../../../nls.js';
+import { CharCode } from '../../../base/common/charCode.js';
+import * as strings from '../../../base/common/strings.js';
+import { IViewLineTokens } from '../tokens/lineTokens.js';
+import { StringBuilder } from '../core/stringBuilder.js';
+import { LineDecoration, LineDecorationsNormalizer } from './lineDecorations.js';
+import { InlineDecorationType } from '../viewModel.js';
+import { LinePart, LinePartMetadata } from './linePart.js';
 
 export const enum RenderWhitespace {
 	None = 0,
diff --git a/src/vs/editor/common/viewLayout/viewLinesViewportData.ts b/src/vs/editor/common/viewLayout/viewLinesViewportData.ts
index 6e072c52648..91eaceca811 100644
--- a/src/vs/editor/common/viewLayout/viewLinesViewportData.ts
+++ b/src/vs/editor/common/viewLayout/viewLinesViewportData.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { IPartialViewLinesViewportData, IViewModel, IViewWhitespaceViewportData, ViewLineRenderingData, ViewModelDecoration } from 'vs/editor/common/viewModel';
+import { Range } from '../core/range.js';
+import { Selection } from '../core/selection.js';
+import { IPartialViewLinesViewportData, IViewModel, IViewWhitespaceViewportData, ViewLineRenderingData, ViewModelDecoration } from '../viewModel.js';
 
 /**
  * Contains all data needed to render at a specific viewport.
diff --git a/src/vs/editor/common/viewModel.ts b/src/vs/editor/common/viewModel.ts
index 3ff0d5f0917..444bac5d610 100644
--- a/src/vs/editor/common/viewModel.ts
+++ b/src/vs/editor/common/viewModel.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as arrays from 'vs/base/common/arrays';
-import { IScrollPosition, Scrollable } from 'vs/base/common/scrollable';
-import * as strings from 'vs/base/common/strings';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { CursorConfiguration, CursorState, EditOperationType, IColumnSelectData, ICursorSimpleModel, PartialCursorState } from 'vs/editor/common/cursorCommon';
-import { CursorChangeReason } from 'vs/editor/common/cursorEvents';
-import { INewScrollPosition, ScrollType } from 'vs/editor/common/editorCommon';
-import { EditorTheme } from 'vs/editor/common/editorTheme';
-import { EndOfLinePreference, IGlyphMarginLanesModel, IModelDecorationOptions, ITextModel, PositionAffinity } from 'vs/editor/common/model';
-import { ILineBreaksComputer, InjectedText } from 'vs/editor/common/modelLineProjectionData';
-import { BracketGuideOptions, IActiveIndentGuideInfo, IndentGuide } from 'vs/editor/common/textModelGuides';
-import { IViewLineTokens } from 'vs/editor/common/tokens/lineTokens';
-import { ViewEventHandler } from 'vs/editor/common/viewEventHandler';
-import { VerticalRevealType } from 'vs/editor/common/viewEvents';
+import * as arrays from '../../base/common/arrays.js';
+import { IScrollPosition, Scrollable } from '../../base/common/scrollable.js';
+import * as strings from '../../base/common/strings.js';
+import { IPosition, Position } from './core/position.js';
+import { Range } from './core/range.js';
+import { CursorConfiguration, CursorState, EditOperationType, IColumnSelectData, ICursorSimpleModel, PartialCursorState } from './cursorCommon.js';
+import { CursorChangeReason } from './cursorEvents.js';
+import { INewScrollPosition, ScrollType } from './editorCommon.js';
+import { EditorTheme } from './editorTheme.js';
+import { EndOfLinePreference, IGlyphMarginLanesModel, IModelDecorationOptions, ITextModel, PositionAffinity } from './model.js';
+import { ILineBreaksComputer, InjectedText } from './modelLineProjectionData.js';
+import { BracketGuideOptions, IActiveIndentGuideInfo, IndentGuide } from './textModelGuides.js';
+import { IViewLineTokens } from './tokens/lineTokens.js';
+import { ViewEventHandler } from './viewEventHandler.js';
+import { VerticalRevealType } from './viewEvents.js';
 
 export interface IViewModel extends ICursorSimpleModel {
 
diff --git a/src/vs/editor/common/viewModel/glyphLanesModel.ts b/src/vs/editor/common/viewModel/glyphLanesModel.ts
index c63c9b24f8d..3efbb9e7cb2 100644
--- a/src/vs/editor/common/viewModel/glyphLanesModel.ts
+++ b/src/vs/editor/common/viewModel/glyphLanesModel.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Range } from 'vs/editor/common/core/range';
-import { GlyphMarginLane, IGlyphMarginLanesModel } from 'vs/editor/common/model';
+import { Range } from '../core/range.js';
+import { GlyphMarginLane, IGlyphMarginLanesModel } from '../model.js';
 
 
 const MAX_LANE = GlyphMarginLane.Right;
diff --git a/src/vs/editor/common/viewModel/minimapTokensColorTracker.ts b/src/vs/editor/common/viewModel/minimapTokensColorTracker.ts
index a063d37a0ce..a0f36078c5b 100644
--- a/src/vs/editor/common/viewModel/minimapTokensColorTracker.ts
+++ b/src/vs/editor/common/viewModel/minimapTokensColorTracker.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, markAsSingleton } from 'vs/base/common/lifecycle';
-import { RGBA8 } from 'vs/editor/common/core/rgba';
-import { TokenizationRegistry } from 'vs/editor/common/languages';
-import { ColorId } from 'vs/editor/common/encodedTokenAttributes';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable, markAsSingleton } from '../../../base/common/lifecycle.js';
+import { RGBA8 } from '../core/rgba.js';
+import { TokenizationRegistry } from '../languages.js';
+import { ColorId } from '../encodedTokenAttributes.js';
 
 export class MinimapTokensColorTracker extends Disposable {
 	private static _INSTANCE: MinimapTokensColorTracker | null = null;
diff --git a/src/vs/editor/common/viewModel/modelLineProjection.ts b/src/vs/editor/common/viewModel/modelLineProjection.ts
index e66499cd98e..b01a1de2898 100644
--- a/src/vs/editor/common/viewModel/modelLineProjection.ts
+++ b/src/vs/editor/common/viewModel/modelLineProjection.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { LineTokens } from 'vs/editor/common/tokens/lineTokens';
-import { Position } from 'vs/editor/common/core/position';
-import { IRange } from 'vs/editor/common/core/range';
-import { EndOfLinePreference, ITextModel, PositionAffinity } from 'vs/editor/common/model';
-import { LineInjectedText } from 'vs/editor/common/textModelEvents';
-import { InjectedText, ModelLineProjectionData } from 'vs/editor/common/modelLineProjectionData';
-import { SingleLineInlineDecoration, ViewLineData } from 'vs/editor/common/viewModel';
+import { LineTokens } from '../tokens/lineTokens.js';
+import { Position } from '../core/position.js';
+import { IRange } from '../core/range.js';
+import { EndOfLinePreference, ITextModel, PositionAffinity } from '../model.js';
+import { LineInjectedText } from '../textModelEvents.js';
+import { InjectedText, ModelLineProjectionData } from '../modelLineProjectionData.js';
+import { SingleLineInlineDecoration, ViewLineData } from '../viewModel.js';
 
 export interface IModelLineProjection {
 	isVisible(): boolean;
@@ -213,11 +213,29 @@ class ModelLineProjection implements IModelLineProjection {
 
 		let lineWithInjections: LineTokens;
 		if (injectionOffsets) {
-			lineWithInjections = model.tokenization.getLineTokens(modelLineNumber).withInserted(injectionOffsets.map((offset, idx) => ({
-				offset,
-				text: injectionOptions![idx].content,
-				tokenMetadata: LineTokens.defaultTokenMetadata
-			})));
+			const tokensToInsert: { offset: number; text: string; tokenMetadata: number }[] = [];
+
+			for (let idx = 0; idx < injectionOffsets.length; idx++) {
+				const offset = injectionOffsets[idx];
+				const tokens = injectionOptions![idx].tokens;
+				if (tokens) {
+					tokens.forEach((range, info) => {
+						tokensToInsert.push({
+							offset,
+							text: range.substring(injectionOptions![idx].content),
+							tokenMetadata: info.metadata,
+						});
+					});
+				} else {
+					tokensToInsert.push({
+						offset,
+						text: injectionOptions![idx].content,
+						tokenMetadata: LineTokens.defaultTokenMetadata,
+					});
+				}
+			}
+
+			lineWithInjections = model.tokenization.getLineTokens(modelLineNumber).withInserted(tokensToInsert);
 		} else {
 			lineWithInjections = model.tokenization.getLineTokens(modelLineNumber);
 		}
diff --git a/src/vs/editor/common/viewModel/monospaceLineBreaksComputer.ts b/src/vs/editor/common/viewModel/monospaceLineBreaksComputer.ts
index 05a54a8ab29..434e322b6f0 100644
--- a/src/vs/editor/common/viewModel/monospaceLineBreaksComputer.ts
+++ b/src/vs/editor/common/viewModel/monospaceLineBreaksComputer.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
-import * as strings from 'vs/base/common/strings';
-import { WrappingIndent, IComputedEditorOptions, EditorOption } from 'vs/editor/common/config/editorOptions';
-import { CharacterClassifier } from 'vs/editor/common/core/characterClassifier';
-import { FontInfo } from 'vs/editor/common/config/fontInfo';
-import { LineInjectedText } from 'vs/editor/common/textModelEvents';
-import { InjectedTextOptions } from 'vs/editor/common/model';
-import { ILineBreaksComputerFactory, ILineBreaksComputer, ModelLineProjectionData } from 'vs/editor/common/modelLineProjectionData';
+import { CharCode } from '../../../base/common/charCode.js';
+import * as strings from '../../../base/common/strings.js';
+import { WrappingIndent, IComputedEditorOptions, EditorOption } from '../config/editorOptions.js';
+import { CharacterClassifier } from '../core/characterClassifier.js';
+import { FontInfo } from '../config/fontInfo.js';
+import { LineInjectedText } from '../textModelEvents.js';
+import { InjectedTextOptions } from '../model.js';
+import { ILineBreaksComputerFactory, ILineBreaksComputer, ModelLineProjectionData } from '../modelLineProjectionData.js';
 
 export class MonospaceLineBreaksComputerFactory implements ILineBreaksComputerFactory {
 	public static create(options: IComputedEditorOptions): MonospaceLineBreaksComputerFactory {
diff --git a/src/vs/editor/common/viewModel/viewContext.ts b/src/vs/editor/common/viewModel/viewContext.ts
index 1b401b18f76..3669ff7e6f4 100644
--- a/src/vs/editor/common/viewModel/viewContext.ts
+++ b/src/vs/editor/common/viewModel/viewContext.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IEditorConfiguration } from 'vs/editor/common/config/editorConfiguration';
-import { ViewEventHandler } from 'vs/editor/common/viewEventHandler';
-import { IViewLayout, IViewModel } from 'vs/editor/common/viewModel';
-import { IColorTheme } from 'vs/platform/theme/common/themeService';
-import { EditorTheme } from 'vs/editor/common/editorTheme';
+import { IEditorConfiguration } from '../config/editorConfiguration.js';
+import { ViewEventHandler } from '../viewEventHandler.js';
+import { IViewLayout, IViewModel } from '../viewModel.js';
+import { IColorTheme } from '../../../platform/theme/common/themeService.js';
+import { EditorTheme } from '../editorTheme.js';
 
 export class ViewContext {
 
diff --git a/src/vs/editor/common/viewModel/viewModelDecorations.ts b/src/vs/editor/common/viewModel/viewModelDecorations.ts
index 4725c903073..553cc7d3389 100644
--- a/src/vs/editor/common/viewModel/viewModelDecorations.ts
+++ b/src/vs/editor/common/viewModel/viewModelDecorations.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { IEditorConfiguration } from 'vs/editor/common/config/editorConfiguration';
-import { IModelDecoration, ITextModel, PositionAffinity } from 'vs/editor/common/model';
-import { IViewModelLines } from 'vs/editor/common/viewModel/viewModelLines';
-import { ICoordinatesConverter, InlineDecoration, InlineDecorationType, ViewModelDecoration } from 'vs/editor/common/viewModel';
-import { filterValidationDecorations } from 'vs/editor/common/config/editorOptions';
-import { StandardTokenType } from 'vs/editor/common/encodedTokenAttributes';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { Position } from '../core/position.js';
+import { Range } from '../core/range.js';
+import { IEditorConfiguration } from '../config/editorConfiguration.js';
+import { IModelDecoration, ITextModel, PositionAffinity } from '../model.js';
+import { IViewModelLines } from './viewModelLines.js';
+import { ICoordinatesConverter, InlineDecoration, InlineDecorationType, ViewModelDecoration } from '../viewModel.js';
+import { filterValidationDecorations } from '../config/editorOptions.js';
+import { StandardTokenType } from '../encodedTokenAttributes.js';
 
 export interface IDecorationsViewportData {
 	/**
diff --git a/src/vs/editor/common/viewModel/viewModelImpl.ts b/src/vs/editor/common/viewModel/viewModelImpl.ts
index 50366d54958..96043722d84 100644
--- a/src/vs/editor/common/viewModel/viewModelImpl.ts
+++ b/src/vs/editor/common/viewModel/viewModelImpl.ts
@@ -3,43 +3,43 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ArrayQueue } from 'vs/base/common/arrays';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { Color } from 'vs/base/common/color';
-import { Event } from 'vs/base/common/event';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import * as platform from 'vs/base/common/platform';
-import * as strings from 'vs/base/common/strings';
-import { ConfigurationChangedEvent, EditorOption, EDITOR_FONT_DEFAULTS, filterValidationDecorations } from 'vs/editor/common/config/editorOptions';
-import { CursorsController } from 'vs/editor/common/cursor/cursor';
-import { CursorConfiguration, CursorState, EditOperationType, IColumnSelectData, PartialCursorState } from 'vs/editor/common/cursorCommon';
-import { CursorChangeReason } from 'vs/editor/common/cursorEvents';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { ISelection, Selection } from 'vs/editor/common/core/selection';
-import { ICommand, ICursorState, IViewState, ScrollType } from 'vs/editor/common/editorCommon';
-import { IEditorConfiguration } from 'vs/editor/common/config/editorConfiguration';
-import { EndOfLinePreference, IAttachedView, ICursorStateComputer, IGlyphMarginLanesModel, IIdentifiedSingleEditOperation, ITextModel, PositionAffinity, TrackedRangeStickiness } from 'vs/editor/common/model';
-import { IActiveIndentGuideInfo, BracketGuideOptions, IndentGuide } from 'vs/editor/common/textModelGuides';
-import { ModelDecorationMinimapOptions, ModelDecorationOptions, ModelDecorationOverviewRulerOptions } from 'vs/editor/common/model/textModel';
-import * as textModelEvents from 'vs/editor/common/textModelEvents';
-import { TokenizationRegistry } from 'vs/editor/common/languages';
-import { ColorId } from 'vs/editor/common/encodedTokenAttributes';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { tokenizeLineToHTML } from 'vs/editor/common/languages/textToHtmlTokenizer';
-import { EditorTheme } from 'vs/editor/common/editorTheme';
-import * as viewEvents from 'vs/editor/common/viewEvents';
-import { ViewLayout } from 'vs/editor/common/viewLayout/viewLayout';
-import { MinimapTokensColorTracker } from 'vs/editor/common/viewModel/minimapTokensColorTracker';
-import { ILineBreaksComputer, ILineBreaksComputerFactory, InjectedText } from 'vs/editor/common/modelLineProjectionData';
-import { ViewEventHandler } from 'vs/editor/common/viewEventHandler';
-import { ICoordinatesConverter, InlineDecoration, IViewModel, IWhitespaceChangeAccessor, MinimapLinesRenderingData, OverviewRulerDecorationsGroup, ViewLineData, ViewLineRenderingData, ViewModelDecoration } from 'vs/editor/common/viewModel';
-import { ViewModelDecorations } from 'vs/editor/common/viewModel/viewModelDecorations';
-import { FocusChangedEvent, HiddenAreasChangedEvent, ModelContentChangedEvent, ModelDecorationsChangedEvent, ModelLanguageChangedEvent, ModelLanguageConfigurationChangedEvent, ModelOptionsChangedEvent, ModelTokensChangedEvent, OutgoingViewModelEvent, ReadOnlyEditAttemptEvent, ScrollChangedEvent, ViewModelEventDispatcher, ViewModelEventsCollector, ViewZonesChangedEvent } from 'vs/editor/common/viewModelEventDispatcher';
-import { IViewModelLines, ViewModelLinesFromModelAsIs, ViewModelLinesFromProjectedModel } from 'vs/editor/common/viewModel/viewModelLines';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { GlyphMarginLanesModel } from 'vs/editor/common/viewModel/glyphLanesModel';
+import { ArrayQueue } from '../../../base/common/arrays.js';
+import { RunOnceScheduler } from '../../../base/common/async.js';
+import { Color } from '../../../base/common/color.js';
+import { Event } from '../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../base/common/lifecycle.js';
+import * as platform from '../../../base/common/platform.js';
+import * as strings from '../../../base/common/strings.js';
+import { ConfigurationChangedEvent, EditorOption, EDITOR_FONT_DEFAULTS, filterValidationDecorations } from '../config/editorOptions.js';
+import { CursorsController } from '../cursor/cursor.js';
+import { CursorConfiguration, CursorState, EditOperationType, IColumnSelectData, PartialCursorState } from '../cursorCommon.js';
+import { CursorChangeReason } from '../cursorEvents.js';
+import { IPosition, Position } from '../core/position.js';
+import { Range } from '../core/range.js';
+import { ISelection, Selection } from '../core/selection.js';
+import { ICommand, ICursorState, IViewState, ScrollType } from '../editorCommon.js';
+import { IEditorConfiguration } from '../config/editorConfiguration.js';
+import { EndOfLinePreference, IAttachedView, ICursorStateComputer, IGlyphMarginLanesModel, IIdentifiedSingleEditOperation, ITextModel, PositionAffinity, TrackedRangeStickiness } from '../model.js';
+import { IActiveIndentGuideInfo, BracketGuideOptions, IndentGuide } from '../textModelGuides.js';
+import { ModelDecorationMinimapOptions, ModelDecorationOptions, ModelDecorationOverviewRulerOptions } from '../model/textModel.js';
+import * as textModelEvents from '../textModelEvents.js';
+import { TokenizationRegistry } from '../languages.js';
+import { ColorId } from '../encodedTokenAttributes.js';
+import { ILanguageConfigurationService } from '../languages/languageConfigurationRegistry.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../languages/modesRegistry.js';
+import { tokenizeLineToHTML } from '../languages/textToHtmlTokenizer.js';
+import { EditorTheme } from '../editorTheme.js';
+import * as viewEvents from '../viewEvents.js';
+import { ViewLayout } from '../viewLayout/viewLayout.js';
+import { MinimapTokensColorTracker } from './minimapTokensColorTracker.js';
+import { ILineBreaksComputer, ILineBreaksComputerFactory, InjectedText } from '../modelLineProjectionData.js';
+import { ViewEventHandler } from '../viewEventHandler.js';
+import { ICoordinatesConverter, InlineDecoration, IViewModel, IWhitespaceChangeAccessor, MinimapLinesRenderingData, OverviewRulerDecorationsGroup, ViewLineData, ViewLineRenderingData, ViewModelDecoration } from '../viewModel.js';
+import { ViewModelDecorations } from './viewModelDecorations.js';
+import { FocusChangedEvent, HiddenAreasChangedEvent, ModelContentChangedEvent, ModelDecorationsChangedEvent, ModelLanguageChangedEvent, ModelLanguageConfigurationChangedEvent, ModelOptionsChangedEvent, ModelTokensChangedEvent, OutgoingViewModelEvent, ReadOnlyEditAttemptEvent, ScrollChangedEvent, ViewModelEventDispatcher, ViewModelEventsCollector, ViewZonesChangedEvent } from '../viewModelEventDispatcher.js';
+import { IViewModelLines, ViewModelLinesFromModelAsIs, ViewModelLinesFromProjectedModel } from './viewModelLines.js';
+import { IThemeService } from '../../../platform/theme/common/themeService.js';
+import { GlyphMarginLanesModel } from './glyphLanesModel.js';
 
 const USE_IDENTITY_LINES_COLLECTION = true;
 
@@ -476,10 +476,15 @@ export class ViewModel extends Disposable implements IViewModel {
 	private readonly hiddenAreasModel = new HiddenAreasModel();
 	private previousHiddenAreas: readonly Range[] = [];
 
-	public setHiddenAreas(ranges: Range[], source?: unknown): void {
+	/**
+	 * @param forceUpdate If true, the hidden areas will be updated even if the new ranges are the same as the previous ranges.
+	 * This is because the model might have changed, which resets the hidden areas, but not the last cached value.
+	 * This needs a better fix in the future.
+	*/
+	public setHiddenAreas(ranges: Range[], source?: unknown, forceUpdate?: boolean): void {
 		this.hiddenAreasModel.setHiddenAreas(source, ranges);
 		const mergedRanges = this.hiddenAreasModel.getMergedRanges();
-		if (mergedRanges === this.previousHiddenAreas) {
+		if (mergedRanges === this.previousHiddenAreas && !forceUpdate) {
 			return;
 		}
 
diff --git a/src/vs/editor/common/viewModel/viewModelLines.ts b/src/vs/editor/common/viewModel/viewModelLines.ts
index bcabeffed2b..8c1142270c5 100644
--- a/src/vs/editor/common/viewModel/viewModelLines.ts
+++ b/src/vs/editor/common/viewModel/viewModelLines.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as arrays from 'vs/base/common/arrays';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { WrappingIndent } from 'vs/editor/common/config/editorOptions';
-import { FontInfo } from 'vs/editor/common/config/fontInfo';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { IModelDecoration, IModelDeltaDecoration, ITextModel, PositionAffinity } from 'vs/editor/common/model';
-import { IActiveIndentGuideInfo, BracketGuideOptions, IndentGuide, IndentGuideHorizontalLine } from 'vs/editor/common/textModelGuides';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { LineInjectedText } from 'vs/editor/common/textModelEvents';
-import * as viewEvents from 'vs/editor/common/viewEvents';
-import { createModelLineProjection, IModelLineProjection } from 'vs/editor/common/viewModel/modelLineProjection';
-import { ILineBreaksComputer, ModelLineProjectionData, InjectedText, ILineBreaksComputerFactory } from 'vs/editor/common/modelLineProjectionData';
-import { ConstantTimePrefixSumComputer } from 'vs/editor/common/model/prefixSumComputer';
-import { ICoordinatesConverter, ViewLineData } from 'vs/editor/common/viewModel';
+import * as arrays from '../../../base/common/arrays.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { WrappingIndent } from '../config/editorOptions.js';
+import { FontInfo } from '../config/fontInfo.js';
+import { IPosition, Position } from '../core/position.js';
+import { Range } from '../core/range.js';
+import { IModelDecoration, IModelDeltaDecoration, ITextModel, PositionAffinity } from '../model.js';
+import { IActiveIndentGuideInfo, BracketGuideOptions, IndentGuide, IndentGuideHorizontalLine } from '../textModelGuides.js';
+import { ModelDecorationOptions } from '../model/textModel.js';
+import { LineInjectedText } from '../textModelEvents.js';
+import * as viewEvents from '../viewEvents.js';
+import { createModelLineProjection, IModelLineProjection } from './modelLineProjection.js';
+import { ILineBreaksComputer, ModelLineProjectionData, InjectedText, ILineBreaksComputerFactory } from '../modelLineProjectionData.js';
+import { ConstantTimePrefixSumComputer } from '../model/prefixSumComputer.js';
+import { ICoordinatesConverter, ViewLineData } from '../viewModel.js';
 
 export interface IViewModelLines extends IDisposable {
 	createCoordinatesConverter(): ICoordinatesConverter;
diff --git a/src/vs/editor/common/viewModelEventDispatcher.ts b/src/vs/editor/common/viewModelEventDispatcher.ts
index 49d467a7afe..7fddb80251f 100644
--- a/src/vs/editor/common/viewModelEventDispatcher.ts
+++ b/src/vs/editor/common/viewModelEventDispatcher.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ViewEventHandler } from 'vs/editor/common/viewEventHandler';
-import { ViewEvent } from 'vs/editor/common/viewEvents';
-import { IContentSizeChangedEvent } from 'vs/editor/common/editorCommon';
-import { Emitter } from 'vs/base/common/event';
-import { Selection } from 'vs/editor/common/core/selection';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { CursorChangeReason } from 'vs/editor/common/cursorEvents';
-import { IModelContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguageChangedEvent, IModelLanguageConfigurationChangedEvent, IModelOptionsChangedEvent, IModelTokensChangedEvent } from 'vs/editor/common/textModelEvents';
+import { ViewEventHandler } from './viewEventHandler.js';
+import { ViewEvent } from './viewEvents.js';
+import { IContentSizeChangedEvent } from './editorCommon.js';
+import { Emitter } from '../../base/common/event.js';
+import { Selection } from './core/selection.js';
+import { Disposable } from '../../base/common/lifecycle.js';
+import { CursorChangeReason } from './cursorEvents.js';
+import { IModelContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguageChangedEvent, IModelLanguageConfigurationChangedEvent, IModelOptionsChangedEvent, IModelTokensChangedEvent } from './textModelEvents.js';
 
 export class ViewModelEventDispatcher extends Disposable {
 
diff --git a/src/vs/editor/contrib/anchorSelect/browser/anchorSelect.ts b/src/vs/editor/contrib/anchorSelect/browser/anchorSelect.ts
index ab93153c7e8..9de6d473500 100644
--- a/src/vs/editor/contrib/anchorSelect/browser/anchorSelect.ts
+++ b/src/vs/editor/contrib/anchorSelect/browser/anchorSelect.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { alert } from 'vs/base/browser/ui/aria/aria';
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import 'vs/css!./anchorSelect';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, EditorContributionInstantiation, registerEditorAction, registerEditorContribution, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { Selection } from 'vs/editor/common/core/selection';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { TrackedRangeStickiness } from 'vs/editor/common/model';
-import { localize } from 'vs/nls';
-import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { alert } from '../../../../base/browser/ui/aria/aria.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { KeyChord, KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import './anchorSelect.css';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorAction, EditorContributionInstantiation, registerEditorAction, registerEditorContribution, ServicesAccessor } from '../../../browser/editorExtensions.js';
+import { Selection } from '../../../common/core/selection.js';
+import { IEditorContribution } from '../../../common/editorCommon.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { TrackedRangeStickiness } from '../../../common/model.js';
+import { localize } from '../../../../nls.js';
+import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 
 export const SelectionAnchorSet = new RawContextKey('selectionAnchorSet', false);
 
diff --git a/src/vs/editor/contrib/bracketMatching/browser/bracketMatching.ts b/src/vs/editor/contrib/bracketMatching/browser/bracketMatching.ts
index ffd9e3240dd..01ba78eefb2 100644
--- a/src/vs/editor/contrib/bracketMatching/browser/bracketMatching.ts
+++ b/src/vs/editor/contrib/bracketMatching/browser/bracketMatching.ts
@@ -3,27 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Disposable } from 'vs/base/common/lifecycle';
-import 'vs/css!./bracketMatching';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, EditorContributionInstantiation, registerEditorAction, registerEditorContribution, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { IEditorContribution, IEditorDecorationsCollection } from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { IModelDeltaDecoration, OverviewRulerLane, TrackedRangeStickiness } from 'vs/editor/common/model';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import * as nls from 'vs/nls';
-import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { registerColor } from 'vs/platform/theme/common/colorRegistry';
-import { themeColorFromId } from 'vs/platform/theme/common/themeService';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import './bracketMatching.css';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorAction, EditorContributionInstantiation, registerEditorAction, registerEditorContribution, ServicesAccessor } from '../../../browser/editorExtensions.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { Selection } from '../../../common/core/selection.js';
+import { IEditorContribution, IEditorDecorationsCollection } from '../../../common/editorCommon.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { IModelDeltaDecoration, OverviewRulerLane, TrackedRangeStickiness } from '../../../common/model.js';
+import { ModelDecorationOptions } from '../../../common/model/textModel.js';
+import * as nls from '../../../../nls.js';
+import { MenuId, MenuRegistry } from '../../../../platform/actions/common/actions.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { registerColor } from '../../../../platform/theme/common/colorRegistry.js';
+import { themeColorFromId } from '../../../../platform/theme/common/themeService.js';
 
-const overviewRulerBracketMatchForeground = registerColor('editorOverviewRuler.bracketMatchForeground', { dark: '#A0A0A0', light: '#A0A0A0', hcDark: '#A0A0A0', hcLight: '#A0A0A0' }, nls.localize('overviewRulerBracketMatchForeground', 'Overview ruler marker color for matching brackets.'));
+const overviewRulerBracketMatchForeground = registerColor('editorOverviewRuler.bracketMatchForeground', '#A0A0A0', nls.localize('overviewRulerBracketMatchForeground', 'Overview ruler marker color for matching brackets.'));
 
 class JumpToBracketAction extends EditorAction {
 	constructor() {
diff --git a/src/vs/editor/contrib/bracketMatching/test/browser/bracketMatching.test.ts b/src/vs/editor/contrib/bracketMatching/test/browser/bracketMatching.test.ts
index 7a5f7e106e7..e9d26789cf3 100644
--- a/src/vs/editor/contrib/bracketMatching/test/browser/bracketMatching.test.ts
+++ b/src/vs/editor/contrib/bracketMatching/test/browser/bracketMatching.test.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { Position } from 'vs/editor/common/core/position';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { BracketMatchingController } from 'vs/editor/contrib/bracketMatching/browser/bracketMatching';
-import { createCodeEditorServices, instantiateTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
-import { instantiateTextModel } from 'vs/editor/test/common/testTextModel';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { Position } from '../../../../common/core/position.js';
+import { Selection } from '../../../../common/core/selection.js';
+import { ILanguageConfigurationService } from '../../../../common/languages/languageConfigurationRegistry.js';
+import { BracketMatchingController } from '../../browser/bracketMatching.js';
+import { createCodeEditorServices, instantiateTestCodeEditor } from '../../../../test/browser/testCodeEditor.js';
+import { instantiateTextModel } from '../../../../test/common/testTextModel.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { ILanguageService } from '../../../../common/languages/language.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('bracket matching', () => {
 	let disposables: DisposableStore;
diff --git a/src/vs/editor/contrib/caretOperations/browser/caretOperations.ts b/src/vs/editor/contrib/caretOperations/browser/caretOperations.ts
index 9279dedf100..95843f60410 100644
--- a/src/vs/editor/contrib/caretOperations/browser/caretOperations.ts
+++ b/src/vs/editor/contrib/caretOperations/browser/caretOperations.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, IActionOptions, registerEditorAction, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { ICommand } from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { MoveCaretCommand } from 'vs/editor/contrib/caretOperations/browser/moveCaretCommand';
-import * as nls from 'vs/nls';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorAction, IActionOptions, registerEditorAction, ServicesAccessor } from '../../../browser/editorExtensions.js';
+import { ICommand } from '../../../common/editorCommon.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { MoveCaretCommand } from './moveCaretCommand.js';
+import * as nls from '../../../../nls.js';
 
 class MoveCaretAction extends EditorAction {
 
diff --git a/src/vs/editor/contrib/caretOperations/browser/moveCaretCommand.ts b/src/vs/editor/contrib/caretOperations/browser/moveCaretCommand.ts
index 81db0fd6217..e3dabdc3318 100644
--- a/src/vs/editor/contrib/caretOperations/browser/moveCaretCommand.ts
+++ b/src/vs/editor/contrib/caretOperations/browser/moveCaretCommand.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ICommand, ICursorStateComputerData, IEditOperationBuilder } from 'vs/editor/common/editorCommon';
-import { ITextModel } from 'vs/editor/common/model';
+import { Range } from '../../../common/core/range.js';
+import { Selection } from '../../../common/core/selection.js';
+import { ICommand, ICursorStateComputerData, IEditOperationBuilder } from '../../../common/editorCommon.js';
+import { ITextModel } from '../../../common/model.js';
 
 export class MoveCaretCommand implements ICommand {
 
diff --git a/src/vs/editor/contrib/caretOperations/browser/transpose.ts b/src/vs/editor/contrib/caretOperations/browser/transpose.ts
index 50733bd6ba9..e0fff82551e 100644
--- a/src/vs/editor/contrib/caretOperations/browser/transpose.ts
+++ b/src/vs/editor/contrib/caretOperations/browser/transpose.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, registerEditorAction, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { ReplaceCommand } from 'vs/editor/common/commands/replaceCommand';
-import { MoveOperations } from 'vs/editor/common/cursor/cursorMoveOperations';
-import { Range } from 'vs/editor/common/core/range';
-import { ICommand } from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import * as nls from 'vs/nls';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorAction, registerEditorAction, ServicesAccessor } from '../../../browser/editorExtensions.js';
+import { ReplaceCommand } from '../../../common/commands/replaceCommand.js';
+import { MoveOperations } from '../../../common/cursor/cursorMoveOperations.js';
+import { Range } from '../../../common/core/range.js';
+import { ICommand } from '../../../common/editorCommon.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import * as nls from '../../../../nls.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 
 class TransposeLettersAction extends EditorAction {
 
diff --git a/src/vs/editor/contrib/caretOperations/test/browser/moveCarretCommand.test.ts b/src/vs/editor/contrib/caretOperations/test/browser/moveCarretCommand.test.ts
index dc1d3133000..254f228ede5 100644
--- a/src/vs/editor/contrib/caretOperations/test/browser/moveCarretCommand.test.ts
+++ b/src/vs/editor/contrib/caretOperations/test/browser/moveCarretCommand.test.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Selection } from 'vs/editor/common/core/selection';
-import { MoveCaretCommand } from 'vs/editor/contrib/caretOperations/browser/moveCaretCommand';
-import { testCommand } from 'vs/editor/test/browser/testCommand';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Selection } from '../../../../common/core/selection.js';
+import { MoveCaretCommand } from '../../browser/moveCaretCommand.js';
+import { testCommand } from '../../../../test/browser/testCommand.js';
 
 
 function testMoveCaretLeftCommand(lines: string[], selection: Selection, expectedLines: string[], expectedSelection: Selection): void {
diff --git a/src/vs/editor/contrib/clipboard/browser/clipboard.ts b/src/vs/editor/contrib/clipboard/browser/clipboard.ts
index e10b43e1f37..de4c9a35407 100644
--- a/src/vs/editor/contrib/clipboard/browser/clipboard.ts
+++ b/src/vs/editor/contrib/clipboard/browser/clipboard.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as browser from 'vs/base/browser/browser';
-import { getActiveDocument } from 'vs/base/browser/dom';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import * as platform from 'vs/base/common/platform';
-import { CopyOptions, InMemoryClipboardMetadataManager } from 'vs/editor/browser/controller/textAreaInput';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { Command, EditorAction, MultiCommand, registerEditorAction } from 'vs/editor/browser/editorExtensions';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Handler } from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { CopyPasteController } from 'vs/editor/contrib/dropOrPasteInto/browser/copyPasteController';
-import * as nls from 'vs/nls';
-import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import * as browser from '../../../../base/browser/browser.js';
+import { getActiveDocument } from '../../../../base/browser/dom.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import * as platform from '../../../../base/common/platform.js';
+import * as nls from '../../../../nls.js';
+import { MenuId, MenuRegistry } from '../../../../platform/actions/common/actions.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { CopyOptions, InMemoryClipboardMetadataManager } from '../../../browser/controller/editContext/clipboardUtils.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { Command, EditorAction, MultiCommand, registerEditorAction } from '../../../browser/editorExtensions.js';
+import { ICodeEditorService } from '../../../browser/services/codeEditorService.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { Handler } from '../../../common/editorCommon.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { CopyPasteController } from '../../dropOrPasteInto/browser/copyPasteController.js';
 
 const CLIPBOARD_CONTEXT_MENU_GROUP = '9_cutcopypaste';
 
@@ -201,7 +201,14 @@ function registerExecCommandImpl(target: MultiCommand | undefined, browserComman
 			if (selection && selection.isEmpty() && !emptySelectionClipboard) {
 				return true;
 			}
-			focusedEditor.getContainerDomNode().ownerDocument.execCommand(browserCommand);
+			// TODO this is very ugly. The entire copy/paste/cut system needs a complete refactoring.
+			if (focusedEditor.getOption(EditorOption.experimentalEditContextEnabled) && browserCommand === 'cut') {
+				// execCommand(copy) works for edit context, but not execCommand(cut).
+				focusedEditor.getContainerDomNode().ownerDocument.execCommand('copy');
+				focusedEditor.trigger(undefined, Handler.Cut, undefined);
+			} else {
+				focusedEditor.getContainerDomNode().ownerDocument.execCommand(browserCommand);
+			}
 			return true;
 		}
 		return false;
@@ -226,10 +233,12 @@ if (PasteAction) {
 		// Only if editor text focus (i.e. not if editor has widget focus).
 		const focusedEditor = codeEditorService.getFocusedCodeEditor();
 		if (focusedEditor && focusedEditor.hasTextFocus()) {
-			const result = focusedEditor.getContainerDomNode().ownerDocument.execCommand('paste');
+			// execCommand(paste) does not work with edit context
+			const canDoDocumentExecCommand = !focusedEditor.getOption(EditorOption.experimentalEditContextEnabled);
+			const result = canDoDocumentExecCommand && focusedEditor.getContainerDomNode().ownerDocument.execCommand('paste');
 			if (result) {
 				return CopyPasteController.get(focusedEditor)?.finishedPaste() ?? Promise.resolve();
-			} else if (platform.isWeb) {
+			} else if (platform.isWeb || !canDoDocumentExecCommand) {
 				// Use the clipboard service if document.execCommand('paste') was not successful
 				return (async () => {
 					const clipboardText = await clipboardService.readText();
diff --git a/src/vs/editor/contrib/codeAction/browser/codeAction.ts b/src/vs/editor/contrib/codeAction/browser/codeAction.ts
index 048d3cb55c9..84160dcd249 100644
--- a/src/vs/editor/contrib/codeAction/browser/codeAction.ts
+++ b/src/vs/editor/contrib/codeAction/browser/codeAction.ts
@@ -3,29 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { coalesce, equals, isNonEmptyArray } from 'vs/base/common/arrays';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { illegalArgument, isCancellationError, onUnexpectedExternalError } from 'vs/base/common/errors';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IBulkEditService } from 'vs/editor/browser/services/bulkEditService';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import * as languages from 'vs/editor/common/languages';
-import { ITextModel } from 'vs/editor/common/model';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { IModelService } from 'vs/editor/common/services/model';
-import { TextModelCancellationTokenSource } from 'vs/editor/contrib/editorState/browser/editorState';
-import * as nls from 'vs/nls';
-import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IProgress, Progress } from 'vs/platform/progress/common/progress';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { CodeActionFilter, CodeActionItem, CodeActionKind, CodeActionSet, CodeActionTrigger, CodeActionTriggerSource, filtersAction, mayIncludeActionsOfKind } from '../common/types';
-import { HierarchicalKind } from 'vs/base/common/hierarchicalKind';
+import { coalesce, equals, isNonEmptyArray } from '../../../../base/common/arrays.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { illegalArgument, isCancellationError, onUnexpectedExternalError } from '../../../../base/common/errors.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { IBulkEditService } from '../../../browser/services/bulkEditService.js';
+import { Range } from '../../../common/core/range.js';
+import { Selection } from '../../../common/core/selection.js';
+import { LanguageFeatureRegistry } from '../../../common/languageFeatureRegistry.js';
+import * as languages from '../../../common/languages.js';
+import { ITextModel } from '../../../common/model.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { IModelService } from '../../../common/services/model.js';
+import { TextModelCancellationTokenSource } from '../../editorState/browser/editorState.js';
+import * as nls from '../../../../nls.js';
+import { CommandsRegistry, ICommandService } from '../../../../platform/commands/common/commands.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IProgress, Progress } from '../../../../platform/progress/common/progress.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { CodeActionFilter, CodeActionItem, CodeActionKind, CodeActionSet, CodeActionTrigger, CodeActionTriggerSource, filtersAction, mayIncludeActionsOfKind } from '../common/types.js';
+import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
+
+
 
 export const codeActionCommandId = 'editor.action.codeAction';
 export const quickFixCommandId = 'editor.action.quickFix';
diff --git a/src/vs/editor/contrib/codeAction/browser/codeActionCommands.ts b/src/vs/editor/contrib/codeAction/browser/codeActionCommands.ts
index ae15cf9bae0..a8dbc97530d 100644
--- a/src/vs/editor/contrib/codeAction/browser/codeActionCommands.ts
+++ b/src/vs/editor/contrib/codeAction/browser/codeActionCommands.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { HierarchicalKind } from 'vs/base/common/hierarchicalKind';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { escapeRegExpCharacters } from 'vs/base/common/strings';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, EditorCommand, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { autoFixCommandId, codeActionCommandId, fixAllCommandId, organizeImportsCommandId, quickFixCommandId, refactorCommandId, sourceActionCommandId } from 'vs/editor/contrib/codeAction/browser/codeAction';
-import * as nls from 'vs/nls';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { CodeActionAutoApply, CodeActionCommandArgs, CodeActionFilter, CodeActionKind, CodeActionTriggerSource } from '../common/types';
-import { CodeActionController } from './codeActionController';
-import { SUPPORTED_CODE_ACTIONS } from './codeActionModel';
+import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
+import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { escapeRegExpCharacters } from '../../../../base/common/strings.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorAction, EditorCommand, ServicesAccessor } from '../../../browser/editorExtensions.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { autoFixCommandId, codeActionCommandId, fixAllCommandId, organizeImportsCommandId, quickFixCommandId, refactorCommandId, sourceActionCommandId } from './codeAction.js';
+import * as nls from '../../../../nls.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { CodeActionAutoApply, CodeActionCommandArgs, CodeActionFilter, CodeActionKind, CodeActionTriggerSource } from '../common/types.js';
+import { CodeActionController } from './codeActionController.js';
+import { SUPPORTED_CODE_ACTIONS } from './codeActionModel.js';
 
 function contextKeyForSupportedActions(kind: HierarchicalKind) {
 	return ContextKeyExpr.regex(
diff --git a/src/vs/editor/contrib/codeAction/browser/codeActionContributions.ts b/src/vs/editor/contrib/codeAction/browser/codeActionContributions.ts
index 4a11f63060c..ca5a06c9817 100644
--- a/src/vs/editor/contrib/codeAction/browser/codeActionContributions.ts
+++ b/src/vs/editor/contrib/codeAction/browser/codeActionContributions.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { EditorContributionInstantiation, registerEditorAction, registerEditorCommand, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { editorConfigurationBaseNode } from 'vs/editor/common/config/editorConfigurationSchema';
-import { AutoFixAction, CodeActionCommand, FixAllAction, OrganizeImportsAction, QuickFixAction, RefactorAction, SourceAction } from 'vs/editor/contrib/codeAction/browser/codeActionCommands';
-import { CodeActionController } from 'vs/editor/contrib/codeAction/browser/codeActionController';
-import { LightBulbWidget } from 'vs/editor/contrib/codeAction/browser/lightBulbWidget';
-import * as nls from 'vs/nls';
-import { ConfigurationScope, Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { Registry } from 'vs/platform/registry/common/platform';
+import { EditorContributionInstantiation, registerEditorAction, registerEditorCommand, registerEditorContribution } from '../../../browser/editorExtensions.js';
+import { editorConfigurationBaseNode } from '../../../common/config/editorConfigurationSchema.js';
+import { AutoFixAction, CodeActionCommand, FixAllAction, OrganizeImportsAction, QuickFixAction, RefactorAction, SourceAction } from './codeActionCommands.js';
+import { CodeActionController } from './codeActionController.js';
+import { LightBulbWidget } from './lightBulbWidget.js';
+import * as nls from '../../../../nls.js';
+import { ConfigurationScope, Extensions, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
 
 registerEditorContribution(CodeActionController.ID, CodeActionController, EditorContributionInstantiation.Eventually);
 registerEditorContribution(LightBulbWidget.ID, LightBulbWidget, EditorContributionInstantiation.Lazy);
@@ -45,3 +45,15 @@ Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfigurat
 		},
 	}
 });
+
+Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfiguration({
+	...editorConfigurationBaseNode,
+	properties: {
+		'editor.codeActions.triggerOnFocusChange': {
+			type: 'boolean',
+			scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
+			markdownDescription: nls.localize('triggerOnFocusChange', 'Enable triggering {0} when {1} is set to {2}. Code Actions must be set to {3} to be triggered for window and focus changes.', '`#editor.codeActionsOnSave#`', '`#files.autoSave#`', '`afterDelay`', '`always`'),
+			default: false,
+		},
+	}
+});
diff --git a/src/vs/editor/contrib/codeAction/browser/codeActionController.ts b/src/vs/editor/contrib/codeAction/browser/codeActionController.ts
index 65dc839da2c..3485e0a18a8 100644
--- a/src/vs/editor/contrib/codeAction/browser/codeActionController.ts
+++ b/src/vs/editor/contrib/codeAction/browser/codeActionController.ts
@@ -3,44 +3,43 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getDomNodePagePosition } from 'vs/base/browser/dom';
-import * as aria from 'vs/base/browser/ui/aria/aria';
-import { IAnchor } from 'vs/base/browser/ui/contextview/contextview';
-import { IAction } from 'vs/base/common/actions';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Color } from 'vs/base/common/color';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Lazy } from 'vs/base/common/lazy';
-import { Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { IEditorContribution, ScrollType } from 'vs/editor/common/editorCommon';
-import { CodeActionTriggerType } from 'vs/editor/common/languages';
-import { IModelDeltaDecoration } from 'vs/editor/common/model';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { ApplyCodeActionReason, applyCodeAction } from 'vs/editor/contrib/codeAction/browser/codeAction';
-import { CodeActionKeybindingResolver } from 'vs/editor/contrib/codeAction/browser/codeActionKeybindingResolver';
-import { toMenuItems } from 'vs/editor/contrib/codeAction/browser/codeActionMenu';
-import { LightBulbWidget } from 'vs/editor/contrib/codeAction/browser/lightBulbWidget';
-import { MessageController } from 'vs/editor/contrib/message/browser/messageController';
-import { localize } from 'vs/nls';
-import { IActionListDelegate } from 'vs/platform/actionWidget/browser/actionList';
-import { IActionWidgetService } from 'vs/platform/actionWidget/browser/actionWidget';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IMarkerService } from 'vs/platform/markers/common/markers';
-import { IEditorProgressService } from 'vs/platform/progress/common/progress';
-import { editorFindMatchHighlight, editorFindMatchHighlightBorder } from 'vs/platform/theme/common/colorRegistry';
-import { isHighContrast } from 'vs/platform/theme/common/theme';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { CodeActionAutoApply, CodeActionFilter, CodeActionItem, CodeActionKind, CodeActionSet, CodeActionTrigger, CodeActionTriggerSource } from 'vs/editor/contrib/codeAction/common/types';
-import { CodeActionModel, CodeActionsState } from 'vs/editor/contrib/codeAction/browser/codeActionModel';
-import { HierarchicalKind } from 'vs/base/common/hierarchicalKind';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-
+import { getDomNodePagePosition } from '../../../../base/browser/dom.js';
+import * as aria from '../../../../base/browser/ui/aria/aria.js';
+import { IAnchor } from '../../../../base/browser/ui/contextview/contextview.js';
+import { IAction } from '../../../../base/common/actions.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Color } from '../../../../base/common/color.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { Lazy } from '../../../../base/common/lazy.js';
+import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { IPosition, Position } from '../../../common/core/position.js';
+import { IEditorContribution, ScrollType } from '../../../common/editorCommon.js';
+import { CodeActionTriggerType } from '../../../common/languages.js';
+import { IModelDeltaDecoration } from '../../../common/model.js';
+import { ModelDecorationOptions } from '../../../common/model/textModel.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { ApplyCodeActionReason, applyCodeAction } from './codeAction.js';
+import { CodeActionKeybindingResolver } from './codeActionKeybindingResolver.js';
+import { toMenuItems } from './codeActionMenu.js';
+import { LightBulbWidget } from './lightBulbWidget.js';
+import { MessageController } from '../../message/browser/messageController.js';
+import { localize } from '../../../../nls.js';
+import { IActionListDelegate } from '../../../../platform/actionWidget/browser/actionList.js';
+import { IActionWidgetService } from '../../../../platform/actionWidget/browser/actionWidget.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IMarkerService } from '../../../../platform/markers/common/markers.js';
+import { IEditorProgressService } from '../../../../platform/progress/common/progress.js';
+import { editorFindMatchHighlight, editorFindMatchHighlightBorder } from '../../../../platform/theme/common/colorRegistry.js';
+import { isHighContrast } from '../../../../platform/theme/common/theme.js';
+import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
+import { CodeActionAutoApply, CodeActionFilter, CodeActionItem, CodeActionKind, CodeActionSet, CodeActionTrigger, CodeActionTriggerSource } from '../common/types.js';
+import { CodeActionModel, CodeActionsState } from './codeActionModel.js';
+import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 
 interface IActionShowOptions {
 	readonly includeDisabledActions?: boolean;
@@ -85,7 +84,7 @@ export class CodeActionController extends Disposable implements IEditorContribut
 		super();
 
 		this._editor = editor;
-		this._model = this._register(new CodeActionModel(this._editor, languageFeaturesService.codeActionProvider, markerService, contextKeyService, progressService, _configurationService));
+		this._model = this._register(new CodeActionModel(this._editor, languageFeaturesService.codeActionProvider, markerService, contextKeyService, progressService, _configurationService, this._telemetryService));
 		this._register(this._model.onDidChangeState(newState => this.update(newState)));
 
 		this._lightBulbWidget = new Lazy(() => {
@@ -107,29 +106,6 @@ export class CodeActionController extends Disposable implements IEditorContribut
 	}
 
 	private async showCodeActionsFromLightbulb(actions: CodeActionSet, at: IAnchor | IPosition): Promise<void> {
-
-		// Telemetry for showing code actions from lightbulb. Shows us how often it was clicked.
-		type ShowCodeActionListEvent = {
-			codeActionListLength: number;
-			codeActions: string[];
-			codeActionProviders: string[];
-		};
-
-		type ShowListEventClassification = {
-			codeActionListLength: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The length of the code action list from the lightbulb widget.' };
-			codeActions: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The title of code actions in this menu.' };
-			codeActionProviders: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The provider of code actions in this menu.' };
-			owner: 'justschen';
-			comment: 'Event used to gain insights into what code actions are being shown';
-		};
-
-		this._telemetryService.publicLog2<ShowCodeActionListEvent, ShowListEventClassification>('codeAction.showCodeActionsFromLightbulb', {
-			codeActionListLength: actions.validActions.length,
-			codeActions: actions.validActions.map(action => action.action.title),
-			codeActionProviders: actions.validActions.map(action => action.provider?.displayName ?? ''),
-		});
-
-
 		if (actions.allAIFixes && actions.validActions.length === 1) {
 			const actionItem = actions.validActions[0];
 			const command = actionItem.action.command;
@@ -183,11 +159,12 @@ export class CodeActionController extends Disposable implements IEditorContribut
 
 	public hideLightBulbWidget(): void {
 		this._lightBulbWidget.rawValue?.hide();
+		this._lightBulbWidget.rawValue?.gutterHide();
 	}
 
 	private async update(newState: CodeActionsState.State): Promise<void> {
 		if (newState.type !== CodeActionsState.Type.Triggered) {
-			this._lightBulbWidget.rawValue?.hide();
+			this.hideLightBulbWidget();
 			return;
 		}
 
@@ -203,6 +180,12 @@ export class CodeActionController extends Disposable implements IEditorContribut
 			return;
 		}
 
+
+		const selection = this._editor.getSelection();
+		if (selection?.startLineNumber !== newState.position.lineNumber) {
+			return;
+		}
+
 		this._lightBulbWidget.value?.update(actions, newState.trigger, newState.position);
 
 		if (newState.trigger.type === CodeActionTriggerType.Invoke) {
@@ -212,7 +195,7 @@ export class CodeActionController extends Disposable implements IEditorContribut
 				const validActionToApply = this.tryGetValidActionToApply(newState.trigger, actions);
 				if (validActionToApply) {
 					try {
-						this._lightBulbWidget.value?.hide();
+						this.hideLightBulbWidget();
 						await this._applyCodeAction(validActionToApply, false, false, ApplyCodeActionReason.FromCodeActions);
 					} finally {
 						actions.dispose();
@@ -312,28 +295,6 @@ export class CodeActionController extends Disposable implements IEditorContribut
 			onHide: (didCancel?) => {
 				this._editor?.focus();
 				currentDecorations.clear();
-				// Telemetry for showing code actions here. only log on `showLightbulb`. Logs when code action list is quit out.
-				if (options.fromLightbulb && didCancel !== undefined) {
-					type ShowCodeActionListEvent = {
-						codeActionListLength: number;
-						didCancel: boolean;
-						codeActions: string[];
-					};
-
-					type ShowListEventClassification = {
-						codeActionListLength: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The length of the code action list when quit out. Can be from any code action menu.' };
-						didCancel: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the code action was cancelled or selected.' };
-						codeActions: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'What code actions were available when cancelled.' };
-						owner: 'justschen';
-						comment: 'Event used to gain insights into how many valid code actions are being shown';
-					};
-
-					this._telemetryService.publicLog2<ShowCodeActionListEvent, ShowListEventClassification>('codeAction.showCodeActionList.onHide', {
-						codeActionListLength: actions.validActions.length,
-						didCancel: didCancel,
-						codeActions: actions.validActions.map(action => action.action.title),
-					});
-				}
 			},
 			onHover: async (action: CodeActionItem, token: CancellationToken) => {
 				if (token.isCancellationRequested) {
diff --git a/src/vs/editor/contrib/codeAction/browser/codeActionKeybindingResolver.ts b/src/vs/editor/contrib/codeAction/browser/codeActionKeybindingResolver.ts
index 088fcfc9558..faae3562de2 100644
--- a/src/vs/editor/contrib/codeAction/browser/codeActionKeybindingResolver.ts
+++ b/src/vs/editor/contrib/codeAction/browser/codeActionKeybindingResolver.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { HierarchicalKind } from 'vs/base/common/hierarchicalKind';
-import { ResolvedKeybinding } from 'vs/base/common/keybindings';
-import { Lazy } from 'vs/base/common/lazy';
-import { CodeAction } from 'vs/editor/common/languages';
-import { codeActionCommandId, fixAllCommandId, organizeImportsCommandId, refactorCommandId, sourceActionCommandId } from 'vs/editor/contrib/codeAction/browser/codeAction';
-import { CodeActionAutoApply, CodeActionCommandArgs, CodeActionKind } from 'vs/editor/contrib/codeAction/common/types';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
+import { ResolvedKeybinding } from '../../../../base/common/keybindings.js';
+import { Lazy } from '../../../../base/common/lazy.js';
+import { CodeAction } from '../../../common/languages.js';
+import { codeActionCommandId, fixAllCommandId, organizeImportsCommandId, refactorCommandId, sourceActionCommandId } from './codeAction.js';
+import { CodeActionAutoApply, CodeActionCommandArgs, CodeActionKind } from '../common/types.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 
 interface ResolveCodeActionKeybinding {
 	readonly kind: HierarchicalKind;
diff --git a/src/vs/editor/contrib/codeAction/browser/codeActionMenu.ts b/src/vs/editor/contrib/codeAction/browser/codeActionMenu.ts
index 8763487cb1d..5384b7a5b15 100644
--- a/src/vs/editor/contrib/codeAction/browser/codeActionMenu.ts
+++ b/src/vs/editor/contrib/codeAction/browser/codeActionMenu.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/base/browser/ui/codicons/codiconStyles'; // The codicon symbol styles are defined here and must be loaded
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { ResolvedKeybinding } from 'vs/base/common/keybindings';
-import { CodeAction } from 'vs/editor/common/languages';
-import { CodeActionItem, CodeActionKind } from 'vs/editor/contrib/codeAction/common/types';
-import 'vs/editor/contrib/symbolIcons/browser/symbolIcons'; // The codicon symbol colors are defined here and must be loaded to get colors
-import { localize } from 'vs/nls';
-import { ActionListItemKind, IActionListItem } from 'vs/platform/actionWidget/browser/actionList';
-import { HierarchicalKind } from 'vs/base/common/hierarchicalKind';
+import '../../../../base/browser/ui/codicons/codiconStyles.js'; // The codicon symbol styles are defined here and must be loaded
+import { Codicon } from '../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { ResolvedKeybinding } from '../../../../base/common/keybindings.js';
+import { CodeAction } from '../../../common/languages.js';
+import { CodeActionItem, CodeActionKind } from '../common/types.js';
+import '../../symbolIcons/browser/symbolIcons.js'; // The codicon symbol colors are defined here and must be loaded to get colors
+import { localize } from '../../../../nls.js';
+import { ActionListItemKind, IActionListItem } from '../../../../platform/actionWidget/browser/actionList.js';
+import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
 
 interface ActionGroup {
 	readonly kind: HierarchicalKind;
diff --git a/src/vs/editor/contrib/codeAction/browser/codeActionModel.ts b/src/vs/editor/contrib/codeAction/browser/codeActionModel.ts
index 0e11fef86ab..a909d559ed8 100644
--- a/src/vs/editor/contrib/codeAction/browser/codeActionModel.ts
+++ b/src/vs/editor/contrib/codeAction/browser/codeActionModel.ts
@@ -3,25 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancelablePromise, createCancelablePromise, TimeoutTimer } from 'vs/base/common/async';
-import { isCancellationError } from 'vs/base/common/errors';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { isEqual } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorOption, ShowLightbulbIconMode } from 'vs/editor/common/config/editorOptions';
-import { Position } from 'vs/editor/common/core/position';
-import { Selection } from 'vs/editor/common/core/selection';
-import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import { CodeActionProvider, CodeActionTriggerType } from 'vs/editor/common/languages';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IMarkerService } from 'vs/platform/markers/common/markers';
-import { IEditorProgressService, Progress } from 'vs/platform/progress/common/progress';
-import { CodeActionKind, CodeActionSet, CodeActionTrigger, CodeActionTriggerSource } from '../common/types';
-import { getCodeActions } from './codeAction';
-import { HierarchicalKind } from 'vs/base/common/hierarchicalKind';
+import { CancelablePromise, createCancelablePromise, TimeoutTimer } from '../../../../base/common/async.js';
+import { isCancellationError } from '../../../../base/common/errors.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorOption, ShowLightbulbIconMode } from '../../../common/config/editorOptions.js';
+import { Position } from '../../../common/core/position.js';
+import { Selection } from '../../../common/core/selection.js';
+import { LanguageFeatureRegistry } from '../../../common/languageFeatureRegistry.js';
+import { CodeActionProvider, CodeActionTriggerType } from '../../../common/languages.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IMarkerService } from '../../../../platform/markers/common/markers.js';
+import { IEditorProgressService, Progress } from '../../../../platform/progress/common/progress.js';
+import { CodeActionKind, CodeActionSet, CodeActionTrigger, CodeActionTriggerSource } from '../common/types.js';
+import { getCodeActions } from './codeAction.js';
+import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
+import { StopWatch } from '../../../../base/common/stopwatch.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 
 export const SUPPORTED_CODE_ACTIONS = new RawContextKey<string>('supportedCodeAction', '');
 
@@ -172,6 +174,7 @@ export class CodeActionModel extends Disposable {
 		contextKeyService: IContextKeyService,
 		private readonly _progressService?: IEditorProgressService,
 		private readonly _configurationService?: IConfigurationService,
+		private readonly _telemetryService?: ITelemetryService
 	) {
 		super();
 		this._supportedCodeActions = SUPPORTED_CODE_ACTIONS.bindTo(contextKeyService);
@@ -315,7 +318,35 @@ export class CodeActionModel extends Disposable {
 							}
 						}
 					}
-					// temporarilly hiding here as this is enabled/disabled behind a setting.
+
+					// Case for manual triggers - specifically Source Actions and Refactors
+					if (trigger.trigger.type === CodeActionTriggerType.Invoke) {
+						const sw = new StopWatch();
+						const codeActions = await getCodeActions(this._registry, model, trigger.selection, trigger.trigger, Progress.None, token);
+
+						// Telemetry for duration of each code action on save.
+						if (this._telemetryService) {
+							type RenderActionMenu = {
+								codeActions: number;
+								duration: number;
+							};
+
+							type RenderActionMenuClassification = {
+								owner: 'justschen';
+								comment: 'Information about how long it took for code actions to be received from the provider and shown in the UI.';
+								codeActions: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Number of valid code actions received from TS.' };
+								duration: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Duration it took for TS to return the action to run for each kind. ' };
+							};
+
+							this._telemetryService.publicLog2<RenderActionMenu, RenderActionMenuClassification>('codeAction.invokedDurations', {
+								codeActions: codeActions.validActions.length,
+								duration: sw.elapsed()
+							});
+						}
+
+						return codeActions;
+					}
+
 					return getCodeActions(this._registry, model, trigger.selection, trigger.trigger, Progress.None, token);
 				});
 				if (trigger.trigger.type === CodeActionTriggerType.Invoke) {
diff --git a/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.css b/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.css
index cbadb2348ef..4961d4c92cb 100644
--- a/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.css
+++ b/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.css
@@ -43,3 +43,23 @@
 	opacity: 0.3;
 	z-index: 1;
 }
+
+/* gutter decoration */
+.monaco-editor .glyph-margin-widgets .cgmr[class*="codicon-gutter-lightbulb"] {
+	display: block;
+	cursor: pointer;
+}
+
+.monaco-editor .glyph-margin-widgets .cgmr.codicon-gutter-lightbulb,
+.monaco-editor .glyph-margin-widgets .cgmr.codicon-gutter-lightbulb-sparkle {
+	color: var(--vscode-editorLightBulb-foreground);
+}
+
+.monaco-editor .glyph-margin-widgets .cgmr.codicon-gutter-lightbulb-auto-fix,
+.monaco-editor .glyph-margin-widgets .cgmr.codicon-gutter-lightbulb-aifix-auto-fix {
+	color: var(--vscode-editorLightBulbAutoFix-foreground, var(--vscode-editorLightBulb-foreground));
+}
+
+.monaco-editor .glyph-margin-widgets .cgmr.codicon-gutter-lightbulb-sparkle-filled {
+	color: var(--vscode-editorLightBulbAi-foreground, var(--vscode-icon-foreground));
+}
diff --git a/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.ts b/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.ts
index bd391744ab3..39dd29629f5 100644
--- a/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.ts
+++ b/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.ts
@@ -3,22 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { Gesture } from 'vs/base/browser/touch';
-import { Codicon } from 'vs/base/common/codicons';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ThemeIcon } from 'vs/base/common/themables';
-import 'vs/css!./lightBulbWidget';
-import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from 'vs/editor/browser/editorBrowser';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { IPosition } from 'vs/editor/common/core/position';
-import { computeIndentLevel } from 'vs/editor/common/model/utils';
-import { autoFixCommandId, quickFixCommandId } from 'vs/editor/contrib/codeAction/browser/codeAction';
-import { CodeActionSet, CodeActionTrigger } from 'vs/editor/contrib/codeAction/common/types';
-import * as nls from 'vs/nls';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import * as dom from '../../../../base/browser/dom.js';
+import { Gesture } from '../../../../base/browser/touch.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import './lightBulbWidget.css';
+import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition, IEditorMouseEvent } from '../../../browser/editorBrowser.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { IPosition } from '../../../common/core/position.js';
+import { GlyphMarginLane, IModelDecorationsChangeAccessor, TrackedRangeStickiness } from '../../../common/model.js';
+import { ModelDecorationOptions } from '../../../common/model/textModel.js';
+import { computeIndentLevel } from '../../../common/model/utils.js';
+import { autoFixCommandId, quickFixCommandId } from './codeAction.js';
+import { CodeActionSet, CodeActionTrigger } from '../common/types.js';
+import * as nls from '../../../../nls.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { Range } from '../../../common/core/range.js';
+
+const GUTTER_LIGHTBULB_ICON = registerIcon('gutter-lightbulb', Codicon.lightBulb, nls.localize('gutterLightbulbWidget', 'Icon which spawns code actions menu from the gutter when there is no space in the editor.'));
+const GUTTER_LIGHTBULB_AUTO_FIX_ICON = registerIcon('gutter-lightbulb-auto-fix', Codicon.lightbulbAutofix, nls.localize('gutterLightbulbAutoFixWidget', 'Icon which spawns code actions menu from the gutter when there is no space in the editor and a quick fix is available.'));
+const GUTTER_LIGHTBULB_AIFIX_ICON = registerIcon('gutter-lightbulb-sparkle', Codicon.lightbulbSparkle, nls.localize('gutterLightbulbAIFixWidget', 'Icon which spawns code actions menu from the gutter when there is no space in the editor and an AI fix is available.'));
+const GUTTER_LIGHTBULB_AIFIX_AUTO_FIX_ICON = registerIcon('gutter-lightbulb-aifix-auto-fix', Codicon.lightbulbSparkleAutofix, nls.localize('gutterLightbulbAIFixAutoFixWidget', 'Icon which spawns code actions menu from the gutter when there is no space in the editor and an AI fix and a quick fix is available.'));
+const GUTTER_SPARKLE_FILLED_ICON = registerIcon('gutter-lightbulb-sparkle-filled', Codicon.sparkleFilled, nls.localize('gutterLightbulbSparkleFilledWidget', 'Icon which spawns code actions menu from the gutter when there is no space in the editor and an AI fix and a quick fix is available.'));
 
 namespace LightBulbState {
 
@@ -44,6 +53,14 @@ namespace LightBulbState {
 }
 
 export class LightBulbWidget extends Disposable implements IContentWidget {
+	private _gutterDecorationID: string | undefined;
+
+	private static readonly GUTTER_DECORATION = ModelDecorationOptions.register({
+		description: 'codicon-gutter-lightbulb-decoration',
+		glyphMarginClassName: ThemeIcon.asClassName(Codicon.lightBulb),
+		glyphMargin: { position: GlyphMarginLane.Left },
+		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
+	});
 
 	public static readonly ID = 'editor.contrib.lightbulbWidget';
 
@@ -55,15 +72,25 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
 	public readonly onClick = this._onClick.event;
 
 	private _state: LightBulbState.State = LightBulbState.Hidden;
+	private _gutterState: LightBulbState.State = LightBulbState.Hidden;
 	private _iconClasses: string[] = [];
 
+	private readonly lightbulbClasses = [
+		'codicon-' + GUTTER_LIGHTBULB_ICON.id,
+		'codicon-' + GUTTER_LIGHTBULB_AIFIX_AUTO_FIX_ICON.id,
+		'codicon-' + GUTTER_LIGHTBULB_AUTO_FIX_ICON.id,
+		'codicon-' + GUTTER_LIGHTBULB_AIFIX_ICON.id,
+		'codicon-' + GUTTER_SPARKLE_FILLED_ICON.id
+	];
+
 	private _preferredKbLabel?: string;
 	private _quickFixKbLabel?: string;
 
+	private gutterDecoration: ModelDecorationOptions = LightBulbWidget.GUTTER_DECORATION;
+
 	constructor(
 		private readonly _editor: ICodeEditor,
-		@IKeybindingService private readonly _keybindingService: IKeybindingService,
-		@ICommandService commandService: ICommandService
+		@IKeybindingService private readonly _keybindingService: IKeybindingService
 	) {
 		super();
 
@@ -79,6 +106,10 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
 			if (this.state.type !== LightBulbState.Type.Showing || !editorModel || this.state.editorPosition.lineNumber >= editorModel.getLineCount()) {
 				this.hide();
 			}
+
+			if (this.gutterState.type !== LightBulbState.Type.Showing || !editorModel || this.gutterState.editorPosition.lineNumber >= editorModel.getLineCount()) {
+				this.gutterHide();
+			}
 		}));
 
 		this._register(dom.addStandardDisposableGenericMouseDownListener(this._domNode, e => {
@@ -121,14 +152,47 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
 		this._register(Event.runAndSubscribe(this._keybindingService.onDidUpdateKeybindings, () => {
 			this._preferredKbLabel = this._keybindingService.lookupKeybinding(autoFixCommandId)?.getLabel() ?? undefined;
 			this._quickFixKbLabel = this._keybindingService.lookupKeybinding(quickFixCommandId)?.getLabel() ?? undefined;
-
 			this._updateLightBulbTitleAndIcon();
 		}));
+
+		this._register(this._editor.onMouseDown(async (e: IEditorMouseEvent) => {
+
+			if (!e.target.element || !this.lightbulbClasses.some(cls => e.target.element && e.target.element.classList.contains(cls))) {
+				return;
+			}
+
+			if (this.gutterState.type !== LightBulbState.Type.Showing) {
+				return;
+			}
+
+			// Make sure that focus / cursor location is not lost when clicking widget icon
+			this._editor.focus();
+
+			// a bit of extra work to make sure the menu
+			// doesn't cover the line-text
+			const { top, height } = dom.getDomNodePagePosition(e.target.element);
+			const lineHeight = this._editor.getOption(EditorOption.lineHeight);
+
+			let pad = Math.floor(lineHeight / 3);
+			if (this.gutterState.widgetPosition.position !== null && this.gutterState.widgetPosition.position.lineNumber < this.gutterState.editorPosition.lineNumber) {
+				pad += lineHeight;
+			}
+
+			this._onClick.fire({
+				x: e.event.posx,
+				y: top + height + pad,
+				actions: this.gutterState.actions,
+				trigger: this.gutterState.trigger,
+			});
+		}));
 	}
 
 	override dispose(): void {
 		super.dispose();
 		this._editor.removeContentWidget(this);
+		if (this._gutterDecorationID) {
+			this._removeGutterDecoration(this._gutterDecorationID);
+		}
 	}
 
 	getId(): string {
@@ -145,17 +209,26 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
 
 	public update(actions: CodeActionSet, trigger: CodeActionTrigger, atPosition: IPosition) {
 		if (actions.validActions.length <= 0) {
+			this.gutterHide();
+			return this.hide();
+		}
+
+		const hasTextFocus = this._editor.hasTextFocus();
+		if (!hasTextFocus) {
+			this.gutterHide();
 			return this.hide();
 		}
 
 		const options = this._editor.getOptions();
 		if (!options.get(EditorOption.lightbulb).enabled) {
+			this.gutterHide();
 			return this.hide();
 		}
 
 
 		const model = this._editor.getModel();
 		if (!model) {
+			this.gutterHide();
 			return this.hide();
 		}
 
@@ -170,10 +243,23 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
 			return lineNumber > 2 && this._editor.getTopForLineNumber(lineNumber) === this._editor.getTopForLineNumber(lineNumber - 1);
 		};
 
+		// Check for glyph margin decorations of any kind
+		const currLineDecorations = this._editor.getLineDecorations(lineNumber);
+		let hasDecoration = false;
+		if (currLineDecorations) {
+			for (const decoration of currLineDecorations) {
+				const glyphClass = decoration.options.glyphMarginClassName;
+
+				if (glyphClass && !this.lightbulbClasses.some(className => glyphClass.includes(className))) {
+					hasDecoration = true;
+					break;
+				}
+			}
+		}
+
 		let effectiveLineNumber = lineNumber;
 		let effectiveColumnNumber = 1;
 		if (!lineHasSpace) {
-
 			// Checks if line is empty or starts with any amount of whitespace
 			const isLineEmptyOrIndented = (lineNumber: number): boolean => {
 				const lineContent = model.getLineContent(lineNumber);
@@ -188,12 +274,32 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
 				const currLineEmptyOrIndented = isLineEmptyOrIndented(lineNumber);
 				const notEmpty = !nextLineEmptyOrIndented && !prevLineEmptyOrIndented;
 
-				// check above and below. if both are blocked, display lightbulb below.
-				if (prevLineEmptyOrIndented || endLine || (notEmpty && !currLineEmptyOrIndented)) {
+				// check above and below. if both are blocked, display lightbulb in the gutter.
+				if (!nextLineEmptyOrIndented && !prevLineEmptyOrIndented && !hasDecoration) {
+					this.gutterState = new LightBulbState.Showing(actions, trigger, atPosition, {
+						position: { lineNumber: effectiveLineNumber, column: effectiveColumnNumber },
+						preference: LightBulbWidget._posPref
+					});
+					this.renderGutterLightbub();
+					return this.hide();
+				} else if (prevLineEmptyOrIndented || endLine || (prevLineEmptyOrIndented && !currLineEmptyOrIndented)) {
 					effectiveLineNumber -= 1;
 				} else if (nextLineEmptyOrIndented || (notEmpty && currLineEmptyOrIndented)) {
 					effectiveLineNumber += 1;
 				}
+			} else if (lineNumber === 1 && (lineNumber === model.getLineCount() || !isLineEmptyOrIndented(lineNumber + 1) && !isLineEmptyOrIndented(lineNumber))) {
+				// special checks for first line blocked vs. not blocked.
+				this.gutterState = new LightBulbState.Showing(actions, trigger, atPosition, {
+					position: { lineNumber: effectiveLineNumber, column: effectiveColumnNumber },
+					preference: LightBulbWidget._posPref
+				});
+
+				if (hasDecoration) {
+					this.gutterHide();
+				} else {
+					this.renderGutterLightbub();
+					return this.hide();
+				}
 			} else if ((lineNumber < model.getLineCount()) && !isFolded(lineNumber + 1)) {
 				effectiveLineNumber += 1;
 			} else if (column * fontInfo.spaceWidth < 22) {
@@ -209,6 +315,11 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
 			preference: LightBulbWidget._posPref
 		});
 
+		if (this._gutterDecorationID) {
+			this._removeGutterDecoration(this._gutterDecorationID);
+			this.gutterHide();
+		}
+
 		const validActions = actions.validActions;
 		const actionKind = actions.validActions[0].action.kind;
 		if (validActions.length !== 1 || !actionKind) {
@@ -216,7 +327,6 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
 			return;
 		}
 
-
 		this._editor.layoutContentWidget(this);
 	}
 
@@ -229,6 +339,18 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
 		this._editor.layoutContentWidget(this);
 	}
 
+	public gutterHide(): void {
+		if (this.gutterState === LightBulbState.Hidden) {
+			return;
+		}
+
+		if (this._gutterDecorationID) {
+			this._removeGutterDecoration(this._gutterDecorationID);
+		}
+
+		this.gutterState = LightBulbState.Hidden;
+	}
+
 	private get state(): LightBulbState.State { return this._state; }
 
 	private set state(value) {
@@ -236,6 +358,13 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
 		this._updateLightBulbTitleAndIcon();
 	}
 
+	private get gutterState(): LightBulbState.State { return this._gutterState; }
+
+	private set gutterState(value) {
+		this._gutterState = value;
+		this._updateGutterLightBulbTitleAndIcon();
+	}
+
 	private _updateLightBulbTitleAndIcon(): void {
 		this._domNode.classList.remove(...this._iconClasses);
 		this._iconClasses = [];
@@ -265,6 +394,74 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
 		this._domNode.classList.add(...this._iconClasses);
 	}
 
+	private _updateGutterLightBulbTitleAndIcon(): void {
+		if (this.gutterState.type !== LightBulbState.Type.Showing) {
+			return;
+		}
+		let icon: ThemeIcon;
+		let autoRun = false;
+		if (this.gutterState.actions.allAIFixes) {
+			icon = GUTTER_SPARKLE_FILLED_ICON;
+			if (this.gutterState.actions.validActions.length === 1) {
+				autoRun = true;
+			}
+		} else if (this.gutterState.actions.hasAutoFix) {
+			if (this.gutterState.actions.hasAIFix) {
+				icon = GUTTER_LIGHTBULB_AIFIX_AUTO_FIX_ICON;
+			} else {
+				icon = GUTTER_LIGHTBULB_AUTO_FIX_ICON;
+			}
+		} else if (this.gutterState.actions.hasAIFix) {
+			icon = GUTTER_LIGHTBULB_AIFIX_ICON;
+		} else {
+			icon = GUTTER_LIGHTBULB_ICON;
+		}
+		this._updateLightbulbTitle(this.gutterState.actions.hasAutoFix, autoRun);
+
+		const GUTTER_DECORATION = ModelDecorationOptions.register({
+			description: 'codicon-gutter-lightbulb-decoration',
+			glyphMarginClassName: ThemeIcon.asClassName(icon),
+			glyphMargin: { position: GlyphMarginLane.Left },
+			stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
+		});
+
+		this.gutterDecoration = GUTTER_DECORATION;
+	}
+
+	/* Gutter Helper Functions */
+	private renderGutterLightbub(): void {
+		const selection = this._editor.getSelection();
+		if (!selection) {
+			return;
+		}
+
+		if (this._gutterDecorationID === undefined) {
+			this._addGutterDecoration(selection.startLineNumber);
+		} else {
+			this._updateGutterDecoration(this._gutterDecorationID, selection.startLineNumber);
+		}
+	}
+
+	private _addGutterDecoration(lineNumber: number) {
+		this._editor.changeDecorations((accessor: IModelDecorationsChangeAccessor) => {
+			this._gutterDecorationID = accessor.addDecoration(new Range(lineNumber, 0, lineNumber, 0), this.gutterDecoration);
+		});
+	}
+
+	private _removeGutterDecoration(decorationId: string) {
+		this._editor.changeDecorations((accessor: IModelDecorationsChangeAccessor) => {
+			accessor.removeDecoration(decorationId);
+			this._gutterDecorationID = undefined;
+		});
+	}
+
+	private _updateGutterDecoration(decorationId: string, lineNumber: number) {
+		this._editor.changeDecorations((accessor: IModelDecorationsChangeAccessor) => {
+			accessor.changeDecoration(decorationId, new Range(lineNumber, 0, lineNumber, 0));
+			accessor.changeDecorationOptions(decorationId, this.gutterDecoration);
+		});
+	}
+
 	private _updateLightbulbTitle(autoFix: boolean, autoRun: boolean): void {
 		if (this.state.type !== LightBulbState.Type.Showing) {
 			return;
diff --git a/src/vs/editor/contrib/codeAction/common/types.ts b/src/vs/editor/contrib/codeAction/common/types.ts
index febdfda4d39..691a0e816c2 100644
--- a/src/vs/editor/contrib/codeAction/common/types.ts
+++ b/src/vs/editor/contrib/codeAction/common/types.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { onUnexpectedExternalError } from 'vs/base/common/errors';
-import { HierarchicalKind } from 'vs/base/common/hierarchicalKind';
-import { Position } from 'vs/editor/common/core/position';
-import * as languages from 'vs/editor/common/languages';
-import { ActionSet } from 'vs/platform/actionWidget/common/actionWidget';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { onUnexpectedExternalError } from '../../../../base/common/errors.js';
+import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
+import { Position } from '../../../common/core/position.js';
+import * as languages from '../../../common/languages.js';
+import { ActionSet } from '../../../../platform/actionWidget/common/actionWidget.js';
 
 export const CodeActionKind = new class {
 	public readonly QuickFix = new HierarchicalKind('quickfix');
diff --git a/src/vs/editor/contrib/codeAction/test/browser/codeAction.test.ts b/src/vs/editor/contrib/codeAction/test/browser/codeAction.test.ts
index a98da2b0e0d..d3265cf48c9 100644
--- a/src/vs/editor/contrib/codeAction/test/browser/codeAction.test.ts
+++ b/src/vs/editor/contrib/codeAction/test/browser/codeAction.test.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { HierarchicalKind } from 'vs/base/common/hierarchicalKind';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Range } from 'vs/editor/common/core/range';
-import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import * as languages from 'vs/editor/common/languages';
-import { TextModel } from 'vs/editor/common/model/textModel';
-import { getCodeActions } from 'vs/editor/contrib/codeAction/browser/codeAction';
-import { CodeActionItem, CodeActionKind, CodeActionTriggerSource } from 'vs/editor/contrib/codeAction/common/types';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
-import { IMarkerData, MarkerSeverity } from 'vs/platform/markers/common/markers';
-import { Progress } from 'vs/platform/progress/common/progress';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { HierarchicalKind } from '../../../../../base/common/hierarchicalKind.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Range } from '../../../../common/core/range.js';
+import { LanguageFeatureRegistry } from '../../../../common/languageFeatureRegistry.js';
+import * as languages from '../../../../common/languages.js';
+import { TextModel } from '../../../../common/model/textModel.js';
+import { getCodeActions } from '../../browser/codeAction.js';
+import { CodeActionItem, CodeActionKind, CodeActionTriggerSource } from '../../common/types.js';
+import { createTextModel } from '../../../../test/common/testTextModel.js';
+import { IMarkerData, MarkerSeverity } from '../../../../../platform/markers/common/markers.js';
+import { Progress } from '../../../../../platform/progress/common/progress.js';
 
 function staticCodeActionProvider(...actions: languages.CodeAction[]): languages.CodeActionProvider {
 	return new class implements languages.CodeActionProvider {
diff --git a/src/vs/editor/contrib/codeAction/test/browser/codeActionKeybindingResolver.test.ts b/src/vs/editor/contrib/codeAction/test/browser/codeActionKeybindingResolver.test.ts
index 664a36b2dca..0172318d9dd 100644
--- a/src/vs/editor/contrib/codeAction/test/browser/codeActionKeybindingResolver.test.ts
+++ b/src/vs/editor/contrib/codeAction/test/browser/codeActionKeybindingResolver.test.ts
@@ -4,16 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { KeyCodeChord } from 'vs/base/common/keybindings';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { OperatingSystem } from 'vs/base/common/platform';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { organizeImportsCommandId, refactorCommandId } from 'vs/editor/contrib/codeAction/browser/codeAction';
-import { CodeActionKeybindingResolver } from 'vs/editor/contrib/codeAction/browser/codeActionKeybindingResolver';
-import { CodeActionKind } from 'vs/editor/contrib/codeAction/common/types';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
-import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayoutResolvedKeybinding';
+import { KeyCodeChord } from '../../../../../base/common/keybindings.js';
+import { KeyCode } from '../../../../../base/common/keyCodes.js';
+import { OperatingSystem } from '../../../../../base/common/platform.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { organizeImportsCommandId, refactorCommandId } from '../../browser/codeAction.js';
+import { CodeActionKeybindingResolver } from '../../browser/codeActionKeybindingResolver.js';
+import { CodeActionKind } from '../../common/types.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { ResolvedKeybindingItem } from '../../../../../platform/keybinding/common/resolvedKeybindingItem.js';
+import { USLayoutResolvedKeybinding } from '../../../../../platform/keybinding/common/usLayoutResolvedKeybinding.js';
 
 suite('CodeActionKeybindingResolver', () => {
 
diff --git a/src/vs/editor/contrib/codeAction/test/browser/codeActionModel.test.ts b/src/vs/editor/contrib/codeAction/test/browser/codeActionModel.test.ts
index 5946fb24f50..666b185bda5 100644
--- a/src/vs/editor/contrib/codeAction/test/browser/codeActionModel.test.ts
+++ b/src/vs/editor/contrib/codeAction/test/browser/codeActionModel.test.ts
@@ -4,20 +4,20 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { promiseWithResolvers } from 'vs/base/common/async';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { assertType } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import * as languages from 'vs/editor/common/languages';
-import { TextModel } from 'vs/editor/common/model/textModel';
-import { CodeActionModel, CodeActionsState } from 'vs/editor/contrib/codeAction/browser/codeActionModel';
-import { createTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
-import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { MarkerService } from 'vs/platform/markers/common/markerService';
+import { promiseWithResolvers } from '../../../../../base/common/async.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { assertType } from '../../../../../base/common/types.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { runWithFakedTimers } from '../../../../../base/test/common/timeTravelScheduler.js';
+import { ICodeEditor } from '../../../../browser/editorBrowser.js';
+import { LanguageFeatureRegistry } from '../../../../common/languageFeatureRegistry.js';
+import * as languages from '../../../../common/languages.js';
+import { TextModel } from '../../../../common/model/textModel.js';
+import { CodeActionModel, CodeActionsState } from '../../browser/codeActionModel.js';
+import { createTestCodeEditor } from '../../../../test/browser/testCodeEditor.js';
+import { createTextModel } from '../../../../test/common/testTextModel.js';
+import { MockContextKeyService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { MarkerService } from '../../../../../platform/markers/common/markerService.js';
 
 const testProvider = {
 	provideCodeActions(): languages.CodeActionList {
diff --git a/src/vs/editor/contrib/codelens/browser/codeLensCache.ts b/src/vs/editor/contrib/codelens/browser/codeLensCache.ts
index 67fa3b8009c..5f479695091 100644
--- a/src/vs/editor/contrib/codelens/browser/codeLensCache.ts
+++ b/src/vs/editor/contrib/codelens/browser/codeLensCache.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { LRUCache } from 'vs/base/common/map';
-import { Range } from 'vs/editor/common/core/range';
-import { ITextModel } from 'vs/editor/common/model';
-import { CodeLens, CodeLensList, CodeLensProvider } from 'vs/editor/common/languages';
-import { CodeLensModel } from 'vs/editor/contrib/codelens/browser/codelens';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IStorageService, StorageScope, StorageTarget, WillSaveStateReason } from 'vs/platform/storage/common/storage';
-import { mainWindow } from 'vs/base/browser/window';
-import { runWhenWindowIdle } from 'vs/base/browser/dom';
+import { Event } from '../../../../base/common/event.js';
+import { LRUCache } from '../../../../base/common/map.js';
+import { Range } from '../../../common/core/range.js';
+import { ITextModel } from '../../../common/model.js';
+import { CodeLens, CodeLensList, CodeLensProvider } from '../../../common/languages.js';
+import { CodeLensModel } from './codelens.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService, StorageScope, StorageTarget, WillSaveStateReason } from '../../../../platform/storage/common/storage.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { runWhenWindowIdle } from '../../../../base/browser/dom.js';
 
 export const ICodeLensCache = createDecorator<ICodeLensCache>('ICodeLensCache');
 
@@ -61,18 +61,17 @@ export class CodeLensCache implements ICodeLensCache {
 		this._deserialize(raw);
 
 		// store lens data on shutdown
-		Event.once(storageService.onWillSaveState)(e => {
-			if (e.reason === WillSaveStateReason.SHUTDOWN) {
-				storageService.store(key, this._serialize(), StorageScope.WORKSPACE, StorageTarget.MACHINE);
-			}
+		const onWillSaveStateBecauseOfShutdown = Event.filter(storageService.onWillSaveState, e => e.reason === WillSaveStateReason.SHUTDOWN);
+		Event.once(onWillSaveStateBecauseOfShutdown)(e => {
+			storageService.store(key, this._serialize(), StorageScope.WORKSPACE, StorageTarget.MACHINE);
 		});
 	}
 
 	put(model: ITextModel, data: CodeLensModel): void {
 		// create a copy of the model that is without command-ids
 		// but with comand-labels
-		const copyItems = data.lenses.map(item => {
-			return <CodeLens>{
+		const copyItems = data.lenses.map((item): CodeLens => {
+			return {
 				range: item.symbol.range,
 				command: item.symbol.command && { id: '', title: item.symbol.command?.title },
 			};
diff --git a/src/vs/editor/contrib/codelens/browser/codelens.ts b/src/vs/editor/contrib/codelens/browser/codelens.ts
index 682531509b6..0a777339b04 100644
--- a/src/vs/editor/contrib/codelens/browser/codelens.ts
+++ b/src/vs/editor/contrib/codelens/browser/codelens.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { illegalArgument, onUnexpectedExternalError } from 'vs/base/common/errors';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { assertType } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { ITextModel } from 'vs/editor/common/model';
-import { CodeLens, CodeLensList, CodeLensProvider } from 'vs/editor/common/languages';
-import { IModelService } from 'vs/editor/common/services/model';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { illegalArgument, onUnexpectedExternalError } from '../../../../base/common/errors.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { assertType } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ITextModel } from '../../../common/model.js';
+import { CodeLens, CodeLensList, CodeLensProvider } from '../../../common/languages.js';
+import { IModelService } from '../../../common/services/model.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { LanguageFeatureRegistry } from '../../../common/languageFeatureRegistry.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 
 export interface CodeLensItem {
 	symbol: CodeLens;
diff --git a/src/vs/editor/contrib/codelens/browser/codelensController.ts b/src/vs/editor/contrib/codelens/browser/codelensController.ts
index 494336475f3..6eca903fd57 100644
--- a/src/vs/editor/contrib/codelens/browser/codelensController.ts
+++ b/src/vs/editor/contrib/codelens/browser/codelensController.ts
@@ -4,26 +4,26 @@
  *--------------------------------------------------------------------------------------------*/
 
 
-import { CancelablePromise, createCancelablePromise, disposableTimeout, RunOnceScheduler } from 'vs/base/common/async';
-import { onUnexpectedError, onUnexpectedExternalError } from 'vs/base/common/errors';
-import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { StableEditorScrollState } from 'vs/editor/browser/stableEditorScroll';
-import { IActiveCodeEditor, ICodeEditor, IViewZoneChangeAccessor, MouseTargetType } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, EditorContributionInstantiation, registerEditorAction, registerEditorContribution, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { EditorOption, EDITOR_FONT_DEFAULTS } from 'vs/editor/common/config/editorOptions';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { IModelDecorationsChangeAccessor } from 'vs/editor/common/model';
-import { CodeLens, Command } from 'vs/editor/common/languages';
-import { CodeLensItem, CodeLensModel, getCodeLensModel } from 'vs/editor/contrib/codelens/browser/codelens';
-import { ICodeLensCache } from 'vs/editor/contrib/codelens/browser/codeLensCache';
-import { CodeLensHelper, CodeLensWidget } from 'vs/editor/contrib/codelens/browser/codelensWidget';
-import { localize } from 'vs/nls';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { IFeatureDebounceInformation, ILanguageFeatureDebounceService } from 'vs/editor/common/services/languageFeatureDebounce';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
+import { CancelablePromise, createCancelablePromise, disposableTimeout, RunOnceScheduler } from '../../../../base/common/async.js';
+import { onUnexpectedError, onUnexpectedExternalError } from '../../../../base/common/errors.js';
+import { DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { StableEditorScrollState } from '../../../browser/stableEditorScroll.js';
+import { IActiveCodeEditor, ICodeEditor, IViewZoneChangeAccessor, MouseTargetType } from '../../../browser/editorBrowser.js';
+import { EditorAction, EditorContributionInstantiation, registerEditorAction, registerEditorContribution, ServicesAccessor } from '../../../browser/editorExtensions.js';
+import { EditorOption, EDITOR_FONT_DEFAULTS } from '../../../common/config/editorOptions.js';
+import { IEditorContribution } from '../../../common/editorCommon.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { IModelDecorationsChangeAccessor } from '../../../common/model.js';
+import { CodeLens, Command } from '../../../common/languages.js';
+import { CodeLensItem, CodeLensModel, getCodeLensModel } from './codelens.js';
+import { ICodeLensCache } from './codeLensCache.js';
+import { CodeLensHelper, CodeLensWidget } from './codelensWidget.js';
+import { localize } from '../../../../nls.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { IFeatureDebounceInformation, ILanguageFeatureDebounceService } from '../../../common/services/languageFeatureDebounce.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 
 export class CodeLensContribution implements IEditorContribution {
 
diff --git a/src/vs/editor/contrib/codelens/browser/codelensWidget.ts b/src/vs/editor/contrib/codelens/browser/codelensWidget.ts
index c89fc7fdf19..394c333b2e5 100644
--- a/src/vs/editor/contrib/codelens/browser/codelensWidget.ts
+++ b/src/vs/editor/contrib/codelens/browser/codelensWidget.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
-import { Constants } from 'vs/base/common/uint';
-import 'vs/css!./codelensWidget';
-import { ContentWidgetPositionPreference, IActiveCodeEditor, IContentWidget, IContentWidgetPosition, IViewZone, IViewZoneChangeAccessor } from 'vs/editor/browser/editorBrowser';
-import { Range } from 'vs/editor/common/core/range';
-import { IModelDecorationsChangeAccessor, IModelDeltaDecoration, ITextModel } from 'vs/editor/common/model';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { CodeLens, Command } from 'vs/editor/common/languages';
-import { CodeLensItem } from 'vs/editor/contrib/codelens/browser/codelens';
+import * as dom from '../../../../base/browser/dom.js';
+import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { Constants } from '../../../../base/common/uint.js';
+import './codelensWidget.css';
+import { ContentWidgetPositionPreference, IActiveCodeEditor, IContentWidget, IContentWidgetPosition, IViewZone, IViewZoneChangeAccessor } from '../../../browser/editorBrowser.js';
+import { Range } from '../../../common/core/range.js';
+import { IModelDecorationsChangeAccessor, IModelDeltaDecoration, ITextModel } from '../../../common/model.js';
+import { ModelDecorationOptions } from '../../../common/model/textModel.js';
+import { CodeLens, Command } from '../../../common/languages.js';
+import { CodeLensItem } from './codelens.js';
 
 class CodeLensViewZone implements IViewZone {
 
diff --git a/src/vs/editor/contrib/colorPicker/browser/color.ts b/src/vs/editor/contrib/colorPicker/browser/color.ts
index 9cf73f794fa..e6766ffb70b 100644
--- a/src/vs/editor/contrib/colorPicker/browser/color.ts
+++ b/src/vs/editor/contrib/colorPicker/browser/color.ts
@@ -3,19 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { illegalArgument, onUnexpectedExternalError } from 'vs/base/common/errors';
-import { URI } from 'vs/base/common/uri';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { ITextModel } from 'vs/editor/common/model';
-import { DocumentColorProvider, IColorInformation, IColorPresentation } from 'vs/editor/common/languages';
-import { IModelService } from 'vs/editor/common/services/model';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import { DefaultDocumentColorProvider } from 'vs/editor/contrib/colorPicker/browser/defaultDocumentColorProvider';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { illegalArgument, onUnexpectedExternalError } from '../../../../base/common/errors.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IRange } from '../../../common/core/range.js';
+import { ITextModel } from '../../../common/model.js';
+import { DocumentColorProvider, IColorInformation, IColorPresentation } from '../../../common/languages.js';
+import { IModelService } from '../../../common/services/model.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { LanguageFeatureRegistry } from '../../../common/languageFeatureRegistry.js';
+import { DefaultDocumentColorProvider } from './defaultDocumentColorProvider.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ServicesAccessor } from '../../../browser/editorExtensions.js';
 
 export async function getColors(colorProviderRegistry: LanguageFeatureRegistry<DocumentColorProvider>, model: ITextModel, token: CancellationToken, isDefaultColorDecoratorsEnabled: boolean = true): Promise<IColorData[]> {
 	return _findColorData<IColorData>(new ColorDataCollector(), colorProviderRegistry, model, token, isDefaultColorDecoratorsEnabled);
@@ -30,7 +29,7 @@ export interface IColorData {
 	provider: DocumentColorProvider;
 }
 
-interface IExtColorData { range: IRange; color: [number, number, number, number] }
+export interface IExtColorData { range: IRange; color: [number, number, number, number] }
 
 interface DataCollector<T> {
 	compute(provider: DocumentColorProvider, model: ITextModel, token: CancellationToken, result: T[]): Promise<boolean>;
@@ -49,7 +48,7 @@ class ColorDataCollector implements DataCollector<IColorData> {
 	}
 }
 
-class ExtColorDataCollector implements DataCollector<IExtColorData> {
+export class ExtColorDataCollector implements DataCollector<IExtColorData> {
 	constructor() { }
 	async compute(provider: DocumentColorProvider, model: ITextModel, token: CancellationToken, colors: IExtColorData[]): Promise<boolean> {
 		const documentColors = await provider.provideDocumentColors(model, token);
@@ -63,7 +62,7 @@ class ExtColorDataCollector implements DataCollector<IExtColorData> {
 
 }
 
-class ColorPresentationsCollector implements DataCollector<IColorPresentation> {
+export class ColorPresentationsCollector implements DataCollector<IColorPresentation> {
 	constructor(private colorInfo: IColorInformation) { }
 	async compute(provider: DocumentColorProvider, model: ITextModel, _token: CancellationToken, colors: IColorPresentation[]): Promise<boolean> {
 		const documentColors = await provider.provideColorPresentations(model, this.colorInfo, CancellationToken.None);
@@ -74,7 +73,7 @@ class ColorPresentationsCollector implements DataCollector<IColorPresentation> {
 	}
 }
 
-async function _findColorData<T extends IColorPresentation | IExtColorData | IColorData>(collector: DataCollector<T>, colorProviderRegistry: LanguageFeatureRegistry<DocumentColorProvider>, model: ITextModel, token: CancellationToken, isDefaultColorDecoratorsEnabled: boolean): Promise<T[]> {
+export async function _findColorData<T extends IColorPresentation | IExtColorData | IColorData>(collector: DataCollector<T>, colorProviderRegistry: LanguageFeatureRegistry<DocumentColorProvider>, model: ITextModel, token: CancellationToken, isDefaultColorDecoratorsEnabled: boolean): Promise<T[]> {
 	let validDocumentColorProviderFound = false;
 	let defaultProvider: DefaultDocumentColorProvider | undefined;
 	const colorData: T[] = [];
@@ -103,7 +102,7 @@ async function _findColorData<T extends IColorPresentation | IExtColorData | ICo
 	return [];
 }
 
-function _setupColorCommand(accessor: ServicesAccessor, resource: URI): { model: ITextModel; colorProviderRegistry: LanguageFeatureRegistry<DocumentColorProvider>; isDefaultColorDecoratorsEnabled: boolean } {
+export function _setupColorCommand(accessor: ServicesAccessor, resource: URI): { model: ITextModel; colorProviderRegistry: LanguageFeatureRegistry<DocumentColorProvider>; isDefaultColorDecoratorsEnabled: boolean } {
 	const { colorProvider: colorProviderRegistry } = accessor.get(ILanguageFeaturesService);
 	const model = accessor.get(IModelService).getModel(resource);
 	if (!model) {
@@ -113,22 +112,3 @@ function _setupColorCommand(accessor: ServicesAccessor, resource: URI): { model:
 	return { model, colorProviderRegistry, isDefaultColorDecoratorsEnabled };
 }
 
-CommandsRegistry.registerCommand('_executeDocumentColorProvider', function (accessor, ...args) {
-	const [resource] = args;
-	if (!(resource instanceof URI)) {
-		throw illegalArgument();
-	}
-	const { model, colorProviderRegistry, isDefaultColorDecoratorsEnabled } = _setupColorCommand(accessor, resource);
-	return _findColorData<IExtColorData>(new ExtColorDataCollector(), colorProviderRegistry, model, CancellationToken.None, isDefaultColorDecoratorsEnabled);
-});
-
-CommandsRegistry.registerCommand('_executeColorPresentationProvider', function (accessor, ...args) {
-	const [color, context] = args;
-	const { uri, range } = context;
-	if (!(uri instanceof URI) || !Array.isArray(color) || color.length !== 4 || !Range.isIRange(range)) {
-		throw illegalArgument();
-	}
-	const { model, colorProviderRegistry, isDefaultColorDecoratorsEnabled } = _setupColorCommand(accessor, uri);
-	const [red, green, blue, alpha] = color;
-	return _findColorData<IColorPresentation>(new ColorPresentationsCollector({ range: range, color: { red, green, blue, alpha } }), colorProviderRegistry, model, CancellationToken.None, isDefaultColorDecoratorsEnabled);
-});
diff --git a/src/vs/editor/contrib/colorPicker/browser/colorDetector.ts b/src/vs/editor/contrib/colorPicker/browser/colorDetector.ts
index 150f23daa07..19d9d9d5737 100644
--- a/src/vs/editor/contrib/colorPicker/browser/colorDetector.ts
+++ b/src/vs/editor/contrib/colorPicker/browser/colorDetector.ts
@@ -3,26 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancelablePromise, createCancelablePromise, TimeoutTimer } from 'vs/base/common/async';
-import { RGBA } from 'vs/base/common/color';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { noBreakWhitespace } from 'vs/base/common/strings';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { DynamicCssRules } from 'vs/editor/browser/editorDom';
-import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { IModelDecoration, IModelDeltaDecoration } from 'vs/editor/common/model';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { IFeatureDebounceInformation, ILanguageFeatureDebounceService } from 'vs/editor/common/services/languageFeatureDebounce';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { getColors, IColorData } from 'vs/editor/contrib/colorPicker/browser/color';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { CancelablePromise, createCancelablePromise, TimeoutTimer } from '../../../../base/common/async.js';
+import { RGBA } from '../../../../base/common/color.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { StopWatch } from '../../../../base/common/stopwatch.js';
+import { noBreakWhitespace } from '../../../../base/common/strings.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { DynamicCssRules } from '../../../browser/editorDom.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { IEditorContribution } from '../../../common/editorCommon.js';
+import { IModelDecoration, IModelDeltaDecoration } from '../../../common/model.js';
+import { ModelDecorationOptions } from '../../../common/model/textModel.js';
+import { IFeatureDebounceInformation, ILanguageFeatureDebounceService } from '../../../common/services/languageFeatureDebounce.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { getColors, IColorData } from './color.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 
 export const ColorDecorationInjectedTextMarker = Object.create({});
 
@@ -288,5 +287,3 @@ export class DecoratorLimitReporter {
 		}
 	}
 }
-
-registerEditorContribution(ColorDetector.ID, ColorDetector, EditorContributionInstantiation.AfterFirstRender);
diff --git a/src/vs/editor/contrib/colorPicker/browser/colorHoverParticipant.ts b/src/vs/editor/contrib/colorPicker/browser/colorHoverParticipant.ts
deleted file mode 100644
index 1bbdde4c746..00000000000
--- a/src/vs/editor/contrib/colorPicker/browser/colorHoverParticipant.ts
+++ /dev/null
@@ -1,264 +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 { AsyncIterableObject } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Color, RGBA } from 'vs/base/common/color';
-import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { IActiveCodeEditor, ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Range } from 'vs/editor/common/core/range';
-import { IModelDecoration, ITextModel, TrackedRangeStickiness } from 'vs/editor/common/model';
-import { DocumentColorProvider, IColorInformation } from 'vs/editor/common/languages';
-import { getColorPresentations, getColors } from 'vs/editor/contrib/colorPicker/browser/color';
-import { ColorDetector } from 'vs/editor/contrib/colorPicker/browser/colorDetector';
-import { ColorPickerModel } from 'vs/editor/contrib/colorPicker/browser/colorPickerModel';
-import { ColorPickerWidget } from 'vs/editor/contrib/colorPicker/browser/colorPickerWidget';
-import { HoverAnchor, HoverAnchorType, IEditorHoverParticipant, IEditorHoverRenderContext, IHoverPart } from 'vs/editor/contrib/hover/browser/hoverTypes';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import { Dimension } from 'vs/base/browser/dom';
-
-export class ColorHover implements IHoverPart {
-
-	/**
-	 * Force the hover to always be rendered at this specific range,
-	 * even in the case of multiple hover parts.
-	 */
-	public readonly forceShowAtRange: boolean = true;
-
-	constructor(
-		public readonly owner: IEditorHoverParticipant<ColorHover>,
-		public readonly range: Range,
-		public readonly model: ColorPickerModel,
-		public readonly provider: DocumentColorProvider
-	) { }
-
-	public isValidForHoverAnchor(anchor: HoverAnchor): boolean {
-		return (
-			anchor.type === HoverAnchorType.Range
-			&& this.range.startColumn <= anchor.range.startColumn
-			&& this.range.endColumn >= anchor.range.endColumn
-		);
-	}
-}
-
-export class ColorHoverParticipant implements IEditorHoverParticipant<ColorHover> {
-
-	public readonly hoverOrdinal: number = 2;
-
-	private _colorPicker: ColorPickerWidget | undefined;
-
-	constructor(
-		private readonly _editor: ICodeEditor,
-		@IThemeService private readonly _themeService: IThemeService,
-	) { }
-
-	public computeSync(_anchor: HoverAnchor, _lineDecorations: IModelDecoration[]): ColorHover[] {
-		return [];
-	}
-
-	public computeAsync(anchor: HoverAnchor, lineDecorations: IModelDecoration[], token: CancellationToken): AsyncIterableObject<ColorHover> {
-		return AsyncIterableObject.fromPromise(this._computeAsync(anchor, lineDecorations, token));
-	}
-
-	private async _computeAsync(_anchor: HoverAnchor, lineDecorations: IModelDecoration[], _token: CancellationToken): Promise<ColorHover[]> {
-		if (!this._editor.hasModel()) {
-			return [];
-		}
-		const colorDetector = ColorDetector.get(this._editor);
-		if (!colorDetector) {
-			return [];
-		}
-		for (const d of lineDecorations) {
-			if (!colorDetector.isColorDecoration(d)) {
-				continue;
-			}
-
-			const colorData = colorDetector.getColorData(d.range.getStartPosition());
-			if (colorData) {
-				const colorHover = await _createColorHover(this, this._editor.getModel(), colorData.colorInfo, colorData.provider);
-				return [colorHover];
-			}
-
-		}
-		return [];
-	}
-
-	public renderHoverParts(context: IEditorHoverRenderContext, hoverParts: ColorHover[]): IDisposable {
-		const { disposables, colorPicker } = renderHoverParts(this, this._editor, this._themeService, hoverParts, context);
-		this._colorPicker = colorPicker;
-		return disposables;
-	}
-
-	public handleResize(): void {
-		this._colorPicker?.layout();
-	}
-
-	public isColorPickerVisible(): boolean {
-		return !!this._colorPicker;
-	}
-}
-
-export class StandaloneColorPickerHover {
-	constructor(
-		public readonly owner: StandaloneColorPickerParticipant,
-		public readonly range: Range,
-		public readonly model: ColorPickerModel,
-		public readonly provider: DocumentColorProvider
-	) { }
-}
-
-export class StandaloneColorPickerParticipant {
-
-	public readonly hoverOrdinal: number = 2;
-	private _color: Color | null = null;
-
-	constructor(
-		private readonly _editor: ICodeEditor,
-		@IThemeService private readonly _themeService: IThemeService,
-	) { }
-
-	public async createColorHover(defaultColorInfo: IColorInformation, defaultColorProvider: DocumentColorProvider, colorProviderRegistry: LanguageFeatureRegistry<DocumentColorProvider>): Promise<{ colorHover: StandaloneColorPickerHover; foundInEditor: boolean } | null> {
-		if (!this._editor.hasModel()) {
-			return null;
-		}
-		const colorDetector = ColorDetector.get(this._editor);
-		if (!colorDetector) {
-			return null;
-		}
-		const colors = await getColors(colorProviderRegistry, this._editor.getModel(), CancellationToken.None);
-		let foundColorInfo: IColorInformation | null = null;
-		let foundColorProvider: DocumentColorProvider | null = null;
-		for (const colorData of colors) {
-			const colorInfo = colorData.colorInfo;
-			if (Range.containsRange(colorInfo.range, defaultColorInfo.range)) {
-				foundColorInfo = colorInfo;
-				foundColorProvider = colorData.provider;
-			}
-		}
-		const colorInfo = foundColorInfo ?? defaultColorInfo;
-		const colorProvider = foundColorProvider ?? defaultColorProvider;
-		const foundInEditor = !!foundColorInfo;
-		return { colorHover: await _createColorHover(this, this._editor.getModel(), colorInfo, colorProvider), foundInEditor: foundInEditor };
-	}
-
-	public async updateEditorModel(colorHoverData: StandaloneColorPickerHover): Promise<void> {
-		if (!this._editor.hasModel()) {
-			return;
-		}
-		const colorPickerModel = colorHoverData.model;
-		let range = new Range(colorHoverData.range.startLineNumber, colorHoverData.range.startColumn, colorHoverData.range.endLineNumber, colorHoverData.range.endColumn);
-		if (this._color) {
-			await _updateColorPresentations(this._editor.getModel(), colorPickerModel, this._color, range, colorHoverData);
-			range = _updateEditorModel(this._editor, range, colorPickerModel);
-		}
-	}
-
-	public renderHoverParts(context: IEditorHoverRenderContext, hoverParts: ColorHover[] | StandaloneColorPickerHover[]): { disposables: IDisposable; colorPicker: ColorPickerWidget | undefined } {
-		return renderHoverParts(this, this._editor, this._themeService, hoverParts, context);
-	}
-
-	public set color(color: Color | null) {
-		this._color = color;
-	}
-
-	public get color(): Color | null {
-		return this._color;
-	}
-}
-
-async function _createColorHover<T extends ColorHoverParticipant | StandaloneColorPickerParticipant>(participant: T, editorModel: ITextModel, colorInfo: IColorInformation, provider: DocumentColorProvider): Promise<T extends ColorHoverParticipant ? ColorHover : StandaloneColorPickerHover>;
-async function _createColorHover(participant: ColorHoverParticipant | StandaloneColorPickerParticipant, editorModel: ITextModel, colorInfo: IColorInformation, provider: DocumentColorProvider): Promise<ColorHover | StandaloneColorPickerHover> {
-	const originalText = editorModel.getValueInRange(colorInfo.range);
-	const { red, green, blue, alpha } = colorInfo.color;
-	const rgba = new RGBA(Math.round(red * 255), Math.round(green * 255), Math.round(blue * 255), alpha);
-	const color = new Color(rgba);
-
-	const colorPresentations = await getColorPresentations(editorModel, colorInfo, provider, CancellationToken.None);
-	const model = new ColorPickerModel(color, [], 0);
-	model.colorPresentations = colorPresentations || [];
-	model.guessColorPresentation(color, originalText);
-
-	if (participant instanceof ColorHoverParticipant) {
-		return new ColorHover(participant, Range.lift(colorInfo.range), model, provider);
-	} else {
-		return new StandaloneColorPickerHover(participant, Range.lift(colorInfo.range), model, provider);
-	}
-}
-
-function renderHoverParts(participant: ColorHoverParticipant | StandaloneColorPickerParticipant, editor: ICodeEditor, themeService: IThemeService, hoverParts: ColorHover[] | StandaloneColorPickerHover[], context: IEditorHoverRenderContext): { disposables: IDisposable; colorPicker: ColorPickerWidget | undefined } {
-	if (hoverParts.length === 0 || !editor.hasModel()) {
-		return { disposables: Disposable.None, colorPicker: undefined };
-	}
-	if (context.setMinimumDimensions) {
-		const minimumHeight = editor.getOption(EditorOption.lineHeight) + 8;
-		context.setMinimumDimensions(new Dimension(302, minimumHeight));
-	}
-
-	const disposables = new DisposableStore();
-	const colorHover = hoverParts[0];
-	const editorModel = editor.getModel();
-	const model = colorHover.model;
-	const colorPicker = disposables.add(new ColorPickerWidget(context.fragment, model, editor.getOption(EditorOption.pixelRatio), themeService, participant instanceof StandaloneColorPickerParticipant));
-
-	let editorUpdatedByColorPicker = false;
-	let range = new Range(colorHover.range.startLineNumber, colorHover.range.startColumn, colorHover.range.endLineNumber, colorHover.range.endColumn);
-	if (participant instanceof StandaloneColorPickerParticipant) {
-		const color = hoverParts[0].model.color;
-		participant.color = color;
-		_updateColorPresentations(editorModel, model, color, range, colorHover);
-		disposables.add(model.onColorFlushed((color: Color) => {
-			participant.color = color;
-		}));
-	} else {
-		disposables.add(model.onColorFlushed(async (color: Color) => {
-			await _updateColorPresentations(editorModel, model, color, range, colorHover);
-			editorUpdatedByColorPicker = true;
-			range = _updateEditorModel(editor, range, model);
-		}));
-	}
-	disposables.add(model.onDidChangeColor((color: Color) => {
-		_updateColorPresentations(editorModel, model, color, range, colorHover);
-	}));
-	disposables.add(editor.onDidChangeModelContent((e) => {
-		if (editorUpdatedByColorPicker) {
-			editorUpdatedByColorPicker = false;
-		} else {
-			context.hide();
-			editor.focus();
-		}
-	}));
-	return { disposables, colorPicker };
-}
-
-function _updateEditorModel(editor: IActiveCodeEditor, range: Range, model: ColorPickerModel): Range {
-	const textEdits: ISingleEditOperation[] = [];
-	const edit = model.presentation.textEdit ?? { range, text: model.presentation.label, forceMoveMarkers: false };
-	textEdits.push(edit);
-
-	if (model.presentation.additionalTextEdits) {
-		textEdits.push(...model.presentation.additionalTextEdits);
-	}
-	const replaceRange = Range.lift(edit.range);
-	const trackedRange = editor.getModel()._setTrackedRange(null, replaceRange, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter);
-	editor.executeEdits('colorpicker', textEdits);
-	editor.pushUndoStop();
-	return editor.getModel()._getTrackedRange(trackedRange) ?? replaceRange;
-}
-
-async function _updateColorPresentations(editorModel: ITextModel, colorPickerModel: ColorPickerModel, color: Color, range: Range, colorHover: ColorHover | StandaloneColorPickerHover) {
-	const colorPresentations = await getColorPresentations(editorModel, {
-		range: range,
-		color: {
-			red: color.rgba.r / 255,
-			green: color.rgba.g / 255,
-			blue: color.rgba.b / 255,
-			alpha: color.rgba.a
-		}
-	}, colorHover.provider, CancellationToken.None);
-	colorPickerModel.colorPresentations = colorPresentations || [];
-}
diff --git a/src/vs/editor/contrib/colorPicker/browser/colorPickerContribution.ts b/src/vs/editor/contrib/colorPicker/browser/colorPickerContribution.ts
new file mode 100644
index 00000000000..9bdfa72e65b
--- /dev/null
+++ b/src/vs/editor/contrib/colorPicker/browser/colorPickerContribution.ts
@@ -0,0 +1,53 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { illegalArgument } from '../../../../base/common/errors.js';
+import { URI } from '../../../../base/common/uri.js';
+import { registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { EditorContributionInstantiation, registerEditorAction, registerEditorContribution } from '../../../browser/editorExtensions.js';
+import { registerEditorFeature } from '../../../common/editorFeatures.js';
+import { IColorPresentation } from '../../../common/languages.js';
+import { HoverParticipantRegistry } from '../../hover/browser/hoverTypes.js';
+import { _findColorData, _setupColorCommand, ColorPresentationsCollector, ExtColorDataCollector, IExtColorData } from './color.js';
+import { ColorDetector } from './colorDetector.js';
+import { DefaultDocumentColorProviderFeature } from './defaultDocumentColorProvider.js';
+import { HoverColorPickerContribution } from './hoverColorPicker/hoverColorPickerContribution.js';
+import { HoverColorPickerParticipant } from './hoverColorPicker/hoverColorPickerParticipant.js';
+import { HideStandaloneColorPicker, InsertColorWithStandaloneColorPicker, ShowOrFocusStandaloneColorPicker } from './standaloneColorPicker/standaloneColorPickerActions.js';
+import { StandaloneColorPickerController } from './standaloneColorPicker/standaloneColorPickerController.js';
+import { Range } from '../../../common/core/range.js';
+
+registerEditorAction(HideStandaloneColorPicker);
+registerEditorAction(InsertColorWithStandaloneColorPicker);
+registerAction2(ShowOrFocusStandaloneColorPicker);
+
+registerEditorContribution(HoverColorPickerContribution.ID, HoverColorPickerContribution, EditorContributionInstantiation.BeforeFirstInteraction);
+registerEditorContribution(StandaloneColorPickerController.ID, StandaloneColorPickerController, EditorContributionInstantiation.AfterFirstRender);
+registerEditorContribution(ColorDetector.ID, ColorDetector, EditorContributionInstantiation.AfterFirstRender);
+registerEditorFeature(DefaultDocumentColorProviderFeature);
+
+HoverParticipantRegistry.register(HoverColorPickerParticipant);
+
+CommandsRegistry.registerCommand('_executeDocumentColorProvider', function (accessor, ...args) {
+	const [resource] = args;
+	if (!(resource instanceof URI)) {
+		throw illegalArgument();
+	}
+	const { model, colorProviderRegistry, isDefaultColorDecoratorsEnabled } = _setupColorCommand(accessor, resource);
+	return _findColorData<IExtColorData>(new ExtColorDataCollector(), colorProviderRegistry, model, CancellationToken.None, isDefaultColorDecoratorsEnabled);
+});
+
+CommandsRegistry.registerCommand('_executeColorPresentationProvider', function (accessor, ...args) {
+	const [color, context] = args;
+	const { uri, range } = context;
+	if (!(uri instanceof URI) || !Array.isArray(color) || color.length !== 4 || !Range.isIRange(range)) {
+		throw illegalArgument();
+	}
+	const { model, colorProviderRegistry, isDefaultColorDecoratorsEnabled } = _setupColorCommand(accessor, uri);
+	const [red, green, blue, alpha] = color;
+	return _findColorData<IColorPresentation>(new ColorPresentationsCollector({ range: range, color: { red, green, blue, alpha } }), colorProviderRegistry, model, CancellationToken.None, isDefaultColorDecoratorsEnabled);
+});
diff --git a/src/vs/editor/contrib/colorPicker/browser/colorPickerModel.ts b/src/vs/editor/contrib/colorPicker/browser/colorPickerModel.ts
index 0bd8ff1c171..06a0c278e27 100644
--- a/src/vs/editor/contrib/colorPicker/browser/colorPickerModel.ts
+++ b/src/vs/editor/contrib/colorPicker/browser/colorPickerModel.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Color } from 'vs/base/common/color';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IColorPresentation } from 'vs/editor/common/languages';
+import { Color } from '../../../../base/common/color.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { IColorPresentation } from '../../../common/languages.js';
 
 export class ColorPickerModel {
 
diff --git a/src/vs/editor/contrib/colorPicker/browser/colorPickerParticipantUtils.ts b/src/vs/editor/contrib/colorPicker/browser/colorPickerParticipantUtils.ts
new file mode 100644
index 00000000000..0975790a57a
--- /dev/null
+++ b/src/vs/editor/contrib/colorPicker/browser/colorPickerParticipantUtils.ts
@@ -0,0 +1,66 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Color, RGBA } from '../../../../base/common/color.js';
+import { IActiveCodeEditor } from '../../../browser/editorBrowser.js';
+import { ISingleEditOperation } from '../../../common/core/editOperation.js';
+import { DocumentColorProvider, IColorInformation } from '../../../common/languages.js';
+import { ITextModel, TrackedRangeStickiness } from '../../../common/model.js';
+import { getColorPresentations } from './color.js';
+import { ColorPickerModel } from './colorPickerModel.js';
+import { Range } from '../../../common/core/range.js';
+
+export interface BaseColor {
+	readonly range: Range;
+	readonly model: ColorPickerModel;
+	readonly provider: DocumentColorProvider;
+}
+
+export async function createColorHover(editorModel: ITextModel, colorInfo: IColorInformation, provider: DocumentColorProvider): Promise<BaseColor> {
+	const originalText = editorModel.getValueInRange(colorInfo.range);
+	const { red, green, blue, alpha } = colorInfo.color;
+	const rgba = new RGBA(Math.round(red * 255), Math.round(green * 255), Math.round(blue * 255), alpha);
+	const color = new Color(rgba);
+
+	const colorPresentations = await getColorPresentations(editorModel, colorInfo, provider, CancellationToken.None);
+	const model = new ColorPickerModel(color, [], 0);
+	model.colorPresentations = colorPresentations || [];
+	model.guessColorPresentation(color, originalText);
+
+	return {
+		range: Range.lift(colorInfo.range),
+		model,
+		provider
+	};
+}
+
+export function updateEditorModel(editor: IActiveCodeEditor, range: Range, model: ColorPickerModel): Range {
+	const textEdits: ISingleEditOperation[] = [];
+	const edit = model.presentation.textEdit ?? { range, text: model.presentation.label, forceMoveMarkers: false };
+	textEdits.push(edit);
+
+	if (model.presentation.additionalTextEdits) {
+		textEdits.push(...model.presentation.additionalTextEdits);
+	}
+	const replaceRange = Range.lift(edit.range);
+	const trackedRange = editor.getModel()._setTrackedRange(null, replaceRange, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter);
+	editor.executeEdits('colorpicker', textEdits);
+	editor.pushUndoStop();
+	return editor.getModel()._getTrackedRange(trackedRange) ?? replaceRange;
+}
+
+export async function updateColorPresentations(editorModel: ITextModel, colorPickerModel: ColorPickerModel, color: Color, range: Range, colorHover: BaseColor): Promise<void> {
+	const colorPresentations = await getColorPresentations(editorModel, {
+		range: range,
+		color: {
+			red: color.rgba.r / 255,
+			green: color.rgba.g / 255,
+			blue: color.rgba.b / 255,
+			alpha: color.rgba.a
+		}
+	}, colorHover.provider, CancellationToken.None);
+	colorPickerModel.colorPresentations = colorPresentations || [];
+}
diff --git a/src/vs/editor/contrib/colorPicker/browser/colorPickerParts/colorPickerBody.ts b/src/vs/editor/contrib/colorPicker/browser/colorPickerParts/colorPickerBody.ts
new file mode 100644
index 00000000000..aa8c5428826
--- /dev/null
+++ b/src/vs/editor/contrib/colorPicker/browser/colorPickerParts/colorPickerBody.ts
@@ -0,0 +1,97 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import '../colorPicker.css';
+import * as dom from '../../../../../base/browser/dom.js';
+import { Color, HSVA } from '../../../../../base/common/color.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { ColorPickerModel } from '../colorPickerModel.js';
+import { SaturationBox } from './colorPickerSaturationBox.js';
+import { InsertButton } from './colorPickerInsertButton.js';
+import { HueStrip, OpacityStrip, Strip } from './colorPickerStrip.js';
+
+const $ = dom.$;
+
+export class ColorPickerBody extends Disposable {
+
+	private readonly _domNode: HTMLElement;
+	private readonly _saturationBox: SaturationBox;
+	private readonly _hueStrip: Strip;
+	private readonly _opacityStrip: Strip;
+	private readonly _insertButton: InsertButton | null = null;
+
+	constructor(container: HTMLElement, private readonly model: ColorPickerModel, private pixelRatio: number, isStandaloneColorPicker: boolean = false) {
+		super();
+
+		this._domNode = $('.colorpicker-body');
+		dom.append(container, this._domNode);
+
+		this._saturationBox = new SaturationBox(this._domNode, this.model, this.pixelRatio);
+		this._register(this._saturationBox);
+		this._register(this._saturationBox.onDidChange(this.onDidSaturationValueChange, this));
+		this._register(this._saturationBox.onColorFlushed(this.flushColor, this));
+
+		this._opacityStrip = new OpacityStrip(this._domNode, this.model, isStandaloneColorPicker);
+		this._register(this._opacityStrip);
+		this._register(this._opacityStrip.onDidChange(this.onDidOpacityChange, this));
+		this._register(this._opacityStrip.onColorFlushed(this.flushColor, this));
+
+		this._hueStrip = new HueStrip(this._domNode, this.model, isStandaloneColorPicker);
+		this._register(this._hueStrip);
+		this._register(this._hueStrip.onDidChange(this.onDidHueChange, this));
+		this._register(this._hueStrip.onColorFlushed(this.flushColor, this));
+
+		if (isStandaloneColorPicker) {
+			this._insertButton = this._register(new InsertButton(this._domNode));
+			this._domNode.classList.add('standalone-colorpicker');
+		}
+	}
+
+	private flushColor(): void {
+		this.model.flushColor();
+	}
+
+	private onDidSaturationValueChange({ s, v }: { s: number; v: number }): void {
+		const hsva = this.model.color.hsva;
+		this.model.color = new Color(new HSVA(hsva.h, s, v, hsva.a));
+	}
+
+	private onDidOpacityChange(a: number): void {
+		const hsva = this.model.color.hsva;
+		this.model.color = new Color(new HSVA(hsva.h, hsva.s, hsva.v, a));
+	}
+
+	private onDidHueChange(value: number): void {
+		const hsva = this.model.color.hsva;
+		const h = (1 - value) * 360;
+
+		this.model.color = new Color(new HSVA(h === 360 ? 0 : h, hsva.s, hsva.v, hsva.a));
+	}
+
+	get domNode() {
+		return this._domNode;
+	}
+
+	get saturationBox() {
+		return this._saturationBox;
+	}
+
+	get opacityStrip() {
+		return this._opacityStrip;
+	}
+
+	get hueStrip() {
+		return this._hueStrip;
+	}
+
+	get enterButton() {
+		return this._insertButton;
+	}
+
+	layout(): void {
+		this._saturationBox.layout();
+		this._opacityStrip.layout();
+		this._hueStrip.layout();
+	}
+}
diff --git a/src/vs/editor/contrib/colorPicker/browser/colorPickerParts/colorPickerCloseButton.ts b/src/vs/editor/contrib/colorPicker/browser/colorPickerParts/colorPickerCloseButton.ts
new file mode 100644
index 00000000000..4b8bc2b45f6
--- /dev/null
+++ b/src/vs/editor/contrib/colorPicker/browser/colorPickerParts/colorPickerCloseButton.ts
@@ -0,0 +1,38 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import '../colorPicker.css';
+import * as dom from '../../../../../base/browser/dom.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { localize } from '../../../../../nls.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { registerIcon } from '../../../../../platform/theme/common/iconRegistry.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+
+const $ = dom.$;
+
+export class CloseButton extends Disposable {
+
+	private _button: HTMLElement;
+	private readonly _onClicked = this._register(new Emitter<void>());
+	public readonly onClicked = this._onClicked.event;
+
+	constructor(container: HTMLElement) {
+		super();
+		this._button = document.createElement('div');
+		this._button.classList.add('close-button');
+		dom.append(container, this._button);
+
+		const innerDiv = document.createElement('div');
+		innerDiv.classList.add('close-button-inner-div');
+		dom.append(this._button, innerDiv);
+
+		const closeButton = dom.append(innerDiv, $('.button' + ThemeIcon.asCSSSelector(registerIcon('color-picker-close', Codicon.close, localize('closeIcon', 'Icon to close the color picker')))));
+		closeButton.classList.add('close-icon');
+		this._register(dom.addDisposableListener(this._button, dom.EventType.CLICK, () => {
+			this._onClicked.fire();
+		}));
+	}
+}
diff --git a/src/vs/editor/contrib/colorPicker/browser/colorPickerParts/colorPickerHeader.ts b/src/vs/editor/contrib/colorPicker/browser/colorPickerParts/colorPickerHeader.ts
new file mode 100644
index 00000000000..92cd6c65e68
--- /dev/null
+++ b/src/vs/editor/contrib/colorPicker/browser/colorPickerParts/colorPickerHeader.ts
@@ -0,0 +1,93 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import '../colorPicker.css';
+import * as dom from '../../../../../base/browser/dom.js';
+import { Color } from '../../../../../base/common/color.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { ColorPickerModel } from '../colorPickerModel.js';
+import { localize } from '../../../../../nls.js';
+import { editorHoverBackground } from '../../../../../platform/theme/common/colorRegistry.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { CloseButton } from './colorPickerCloseButton.js';
+
+const $ = dom.$;
+
+export class ColorPickerHeader extends Disposable {
+
+	private readonly _domNode: HTMLElement;
+	private readonly _pickedColorNode: HTMLElement;
+	private readonly _pickedColorPresentation: HTMLElement;
+	private readonly _originalColorNode: HTMLElement;
+	private readonly _closeButton: CloseButton | null = null;
+	private backgroundColor: Color;
+
+	constructor(container: HTMLElement, private readonly model: ColorPickerModel, themeService: IThemeService, private showingStandaloneColorPicker: boolean = false) {
+		super();
+
+		this._domNode = $('.colorpicker-header');
+		dom.append(container, this._domNode);
+
+		this._pickedColorNode = dom.append(this._domNode, $('.picked-color'));
+		dom.append(this._pickedColorNode, $('span.codicon.codicon-color-mode'));
+		this._pickedColorPresentation = dom.append(this._pickedColorNode, document.createElement('span'));
+		this._pickedColorPresentation.classList.add('picked-color-presentation');
+
+		const tooltip = localize('clickToToggleColorOptions', "Click to toggle color options (rgb/hsl/hex)");
+		this._pickedColorNode.setAttribute('title', tooltip);
+
+		this._originalColorNode = dom.append(this._domNode, $('.original-color'));
+		this._originalColorNode.style.backgroundColor = Color.Format.CSS.format(this.model.originalColor) || '';
+
+		this.backgroundColor = themeService.getColorTheme().getColor(editorHoverBackground) || Color.white;
+		this._register(themeService.onDidColorThemeChange(theme => {
+			this.backgroundColor = theme.getColor(editorHoverBackground) || Color.white;
+		}));
+
+		this._register(dom.addDisposableListener(this._pickedColorNode, dom.EventType.CLICK, () => this.model.selectNextColorPresentation()));
+		this._register(dom.addDisposableListener(this._originalColorNode, dom.EventType.CLICK, () => {
+			this.model.color = this.model.originalColor;
+			this.model.flushColor();
+		}));
+		this._register(model.onDidChangeColor(this.onDidChangeColor, this));
+		this._register(model.onDidChangePresentation(this.onDidChangePresentation, this));
+		this._pickedColorNode.style.backgroundColor = Color.Format.CSS.format(model.color) || '';
+		this._pickedColorNode.classList.toggle('light', model.color.rgba.a < 0.5 ? this.backgroundColor.isLighter() : model.color.isLighter());
+
+		this.onDidChangeColor(this.model.color);
+
+		// When the color picker widget is a standalone color picker widget, then add a close button
+		if (this.showingStandaloneColorPicker) {
+			this._domNode.classList.add('standalone-colorpicker');
+			this._closeButton = this._register(new CloseButton(this._domNode));
+		}
+	}
+
+	public get domNode(): HTMLElement {
+		return this._domNode;
+	}
+
+	public get closeButton(): CloseButton | null {
+		return this._closeButton;
+	}
+
+	public get pickedColorNode(): HTMLElement {
+		return this._pickedColorNode;
+	}
+
+	public get originalColorNode(): HTMLElement {
+		return this._originalColorNode;
+	}
+
+	private onDidChangeColor(color: Color): void {
+		this._pickedColorNode.style.backgroundColor = Color.Format.CSS.format(color) || '';
+		this._pickedColorNode.classList.toggle('light', color.rgba.a < 0.5 ? this.backgroundColor.isLighter() : color.isLighter());
+		this.onDidChangePresentation();
+	}
+
+	private onDidChangePresentation(): void {
+		this._pickedColorPresentation.textContent = this.model.presentation ? this.model.presentation.label : '';
+	}
+}
diff --git a/src/vs/editor/contrib/colorPicker/browser/colorPickerParts/colorPickerInsertButton.ts b/src/vs/editor/contrib/colorPicker/browser/colorPickerParts/colorPickerInsertButton.ts
new file mode 100644
index 00000000000..83c7ec84f1b
--- /dev/null
+++ b/src/vs/editor/contrib/colorPicker/browser/colorPickerParts/colorPickerInsertButton.ts
@@ -0,0 +1,29 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import '../colorPicker.css';
+import * as dom from '../../../../../base/browser/dom.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+
+export class InsertButton extends Disposable {
+
+	private _button: HTMLElement;
+	private readonly _onClicked = this._register(new Emitter<void>());
+	public readonly onClicked = this._onClicked.event;
+
+	constructor(container: HTMLElement) {
+		super();
+		this._button = dom.append(container, document.createElement('button'));
+		this._button.classList.add('insert-button');
+		this._button.textContent = 'Insert';
+		this._register(dom.addDisposableListener(this._button, dom.EventType.CLICK, () => {
+			this._onClicked.fire();
+		}));
+	}
+
+	public get button(): HTMLElement {
+		return this._button;
+	}
+}
diff --git a/src/vs/editor/contrib/colorPicker/browser/colorPickerParts/colorPickerSaturationBox.ts b/src/vs/editor/contrib/colorPicker/browser/colorPickerParts/colorPickerSaturationBox.ts
new file mode 100644
index 00000000000..feb65929064
--- /dev/null
+++ b/src/vs/editor/contrib/colorPicker/browser/colorPickerParts/colorPickerSaturationBox.ts
@@ -0,0 +1,138 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import '../colorPicker.css';
+import * as dom from '../../../../../base/browser/dom.js';
+import { GlobalPointerMoveMonitor } from '../../../../../base/browser/globalPointerMoveMonitor.js';
+import { Color, HSVA } from '../../../../../base/common/color.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { ColorPickerModel } from '../colorPickerModel.js';
+
+const $ = dom.$;
+
+export class SaturationBox extends Disposable {
+
+	private readonly _domNode: HTMLElement;
+	private readonly selection: HTMLElement;
+	private readonly _canvas: HTMLCanvasElement;
+	private width!: number;
+	private height!: number;
+
+	private monitor: GlobalPointerMoveMonitor | null;
+	private readonly _onDidChange = new Emitter<{ s: number; v: number }>();
+	readonly onDidChange: Event<{ s: number; v: number }> = this._onDidChange.event;
+
+	private readonly _onColorFlushed = new Emitter<void>();
+	readonly onColorFlushed: Event<void> = this._onColorFlushed.event;
+
+	constructor(container: HTMLElement, private readonly model: ColorPickerModel, private pixelRatio: number) {
+		super();
+
+		this._domNode = $('.saturation-wrap');
+		dom.append(container, this._domNode);
+
+		// Create canvas, draw selected color
+		this._canvas = document.createElement('canvas');
+		this._canvas.className = 'saturation-box';
+		dom.append(this._domNode, this._canvas);
+
+		// Add selection circle
+		this.selection = $('.saturation-selection');
+		dom.append(this._domNode, this.selection);
+
+		this.layout();
+
+		this._register(dom.addDisposableListener(this._domNode, dom.EventType.POINTER_DOWN, e => this.onPointerDown(e)));
+		this._register(this.model.onDidChangeColor(this.onDidChangeColor, this));
+		this.monitor = null;
+	}
+
+	public get domNode() {
+		return this._domNode;
+	}
+
+	public get canvas() {
+		return this._canvas;
+	}
+
+	private onPointerDown(e: PointerEvent): void {
+		if (!e.target || !(e.target instanceof Element)) {
+			return;
+		}
+		this.monitor = this._register(new GlobalPointerMoveMonitor());
+		const origin = dom.getDomNodePagePosition(this._domNode);
+
+		if (e.target !== this.selection) {
+			this.onDidChangePosition(e.offsetX, e.offsetY);
+		}
+
+		this.monitor.startMonitoring(e.target, e.pointerId, e.buttons, event => this.onDidChangePosition(event.pageX - origin.left, event.pageY - origin.top), () => null);
+
+		const pointerUpListener = dom.addDisposableListener(e.target.ownerDocument, dom.EventType.POINTER_UP, () => {
+			this._onColorFlushed.fire();
+			pointerUpListener.dispose();
+			if (this.monitor) {
+				this.monitor.stopMonitoring(true);
+				this.monitor = null;
+			}
+		}, true);
+	}
+
+	private onDidChangePosition(left: number, top: number): void {
+		const s = Math.max(0, Math.min(1, left / this.width));
+		const v = Math.max(0, Math.min(1, 1 - (top / this.height)));
+
+		this.paintSelection(s, v);
+		this._onDidChange.fire({ s, v });
+	}
+
+	layout(): void {
+		this.width = this._domNode.offsetWidth;
+		this.height = this._domNode.offsetHeight;
+		this._canvas.width = this.width * this.pixelRatio;
+		this._canvas.height = this.height * this.pixelRatio;
+		this.paint();
+
+		const hsva = this.model.color.hsva;
+		this.paintSelection(hsva.s, hsva.v);
+	}
+
+	private paint(): void {
+		const hsva = this.model.color.hsva;
+		const saturatedColor = new Color(new HSVA(hsva.h, 1, 1, 1));
+		const ctx = this._canvas.getContext('2d')!;
+
+		const whiteGradient = ctx.createLinearGradient(0, 0, this._canvas.width, 0);
+		whiteGradient.addColorStop(0, 'rgba(255, 255, 255, 1)');
+		whiteGradient.addColorStop(0.5, 'rgba(255, 255, 255, 0.5)');
+		whiteGradient.addColorStop(1, 'rgba(255, 255, 255, 0)');
+
+		const blackGradient = ctx.createLinearGradient(0, 0, 0, this._canvas.height);
+		blackGradient.addColorStop(0, 'rgba(0, 0, 0, 0)');
+		blackGradient.addColorStop(1, 'rgba(0, 0, 0, 1)');
+
+		ctx.rect(0, 0, this._canvas.width, this._canvas.height);
+		ctx.fillStyle = Color.Format.CSS.format(saturatedColor)!;
+		ctx.fill();
+		ctx.fillStyle = whiteGradient;
+		ctx.fill();
+		ctx.fillStyle = blackGradient;
+		ctx.fill();
+	}
+
+	private paintSelection(s: number, v: number): void {
+		this.selection.style.left = `${s * this.width}px`;
+		this.selection.style.top = `${this.height - v * this.height}px`;
+	}
+
+	private onDidChangeColor(color: Color): void {
+		if (this.monitor && this.monitor.isMonitoring()) {
+			return;
+		}
+		this.paint();
+		const hsva = color.hsva;
+		this.paintSelection(hsva.s, hsva.v);
+	}
+}
diff --git a/src/vs/editor/contrib/colorPicker/browser/colorPickerParts/colorPickerStrip.ts b/src/vs/editor/contrib/colorPicker/browser/colorPickerParts/colorPickerStrip.ts
new file mode 100644
index 00000000000..ff72ddf8732
--- /dev/null
+++ b/src/vs/editor/contrib/colorPicker/browser/colorPickerParts/colorPickerStrip.ts
@@ -0,0 +1,126 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import '../colorPicker.css';
+import * as dom from '../../../../../base/browser/dom.js';
+import { GlobalPointerMoveMonitor } from '../../../../../base/browser/globalPointerMoveMonitor.js';
+import { Color, RGBA } from '../../../../../base/common/color.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { ColorPickerModel } from '../colorPickerModel.js';
+
+const $ = dom.$;
+
+export abstract class Strip extends Disposable {
+
+	protected domNode: HTMLElement;
+	protected overlay: HTMLElement;
+	protected slider: HTMLElement;
+	private height!: number;
+
+	private readonly _onDidChange = new Emitter<number>();
+	readonly onDidChange: Event<number> = this._onDidChange.event;
+
+	private readonly _onColorFlushed = new Emitter<void>();
+	readonly onColorFlushed: Event<void> = this._onColorFlushed.event;
+
+	constructor(container: HTMLElement, protected model: ColorPickerModel, showingStandaloneColorPicker: boolean = false) {
+		super();
+		if (showingStandaloneColorPicker) {
+			this.domNode = dom.append(container, $('.standalone-strip'));
+			this.overlay = dom.append(this.domNode, $('.standalone-overlay'));
+		} else {
+			this.domNode = dom.append(container, $('.strip'));
+			this.overlay = dom.append(this.domNode, $('.overlay'));
+		}
+		this.slider = dom.append(this.domNode, $('.slider'));
+		this.slider.style.top = `0px`;
+
+		this._register(dom.addDisposableListener(this.domNode, dom.EventType.POINTER_DOWN, e => this.onPointerDown(e)));
+		this._register(model.onDidChangeColor(this.onDidChangeColor, this));
+		this.layout();
+	}
+
+	layout(): void {
+		this.height = this.domNode.offsetHeight - this.slider.offsetHeight;
+
+		const value = this.getValue(this.model.color);
+		this.updateSliderPosition(value);
+	}
+
+	protected onDidChangeColor(color: Color) {
+		const value = this.getValue(color);
+		this.updateSliderPosition(value);
+	}
+
+	private onPointerDown(e: PointerEvent): void {
+		if (!e.target || !(e.target instanceof Element)) {
+			return;
+		}
+		const monitor = this._register(new GlobalPointerMoveMonitor());
+		const origin = dom.getDomNodePagePosition(this.domNode);
+		this.domNode.classList.add('grabbing');
+
+		if (e.target !== this.slider) {
+			this.onDidChangeTop(e.offsetY);
+		}
+
+		monitor.startMonitoring(e.target, e.pointerId, e.buttons, event => this.onDidChangeTop(event.pageY - origin.top), () => null);
+
+		const pointerUpListener = dom.addDisposableListener(e.target.ownerDocument, dom.EventType.POINTER_UP, () => {
+			this._onColorFlushed.fire();
+			pointerUpListener.dispose();
+			monitor.stopMonitoring(true);
+			this.domNode.classList.remove('grabbing');
+		}, true);
+	}
+
+	private onDidChangeTop(top: number): void {
+		const value = Math.max(0, Math.min(1, 1 - (top / this.height)));
+
+		this.updateSliderPosition(value);
+		this._onDidChange.fire(value);
+	}
+
+	private updateSliderPosition(value: number): void {
+		this.slider.style.top = `${(1 - value) * this.height}px`;
+	}
+
+	protected abstract getValue(color: Color): number;
+}
+
+export class OpacityStrip extends Strip {
+
+	constructor(container: HTMLElement, model: ColorPickerModel, showingStandaloneColorPicker: boolean = false) {
+		super(container, model, showingStandaloneColorPicker);
+		this.domNode.classList.add('opacity-strip');
+
+		this.onDidChangeColor(this.model.color);
+	}
+
+	protected override onDidChangeColor(color: Color): void {
+		super.onDidChangeColor(color);
+		const { r, g, b } = color.rgba;
+		const opaque = new Color(new RGBA(r, g, b, 1));
+		const transparent = new Color(new RGBA(r, g, b, 0));
+
+		this.overlay.style.background = `linear-gradient(to bottom, ${opaque} 0%, ${transparent} 100%)`;
+	}
+
+	protected getValue(color: Color): number {
+		return color.hsva.a;
+	}
+}
+
+export class HueStrip extends Strip {
+
+	constructor(container: HTMLElement, model: ColorPickerModel, showingStandaloneColorPicker: boolean = false) {
+		super(container, model, showingStandaloneColorPicker);
+		this.domNode.classList.add('hue-strip');
+	}
+
+	protected getValue(color: Color): number {
+		return 1 - (color.hsva.h / 360);
+	}
+}
diff --git a/src/vs/editor/contrib/colorPicker/browser/colorPickerWidget.ts b/src/vs/editor/contrib/colorPicker/browser/colorPickerWidget.ts
deleted file mode 100644
index 7688defca5f..00000000000
--- a/src/vs/editor/contrib/colorPicker/browser/colorPickerWidget.ts
+++ /dev/null
@@ -1,494 +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 { PixelRatio } from 'vs/base/browser/pixelRatio';
-import * as dom from 'vs/base/browser/dom';
-import { GlobalPointerMoveMonitor } from 'vs/base/browser/globalPointerMoveMonitor';
-import { Widget } from 'vs/base/browser/ui/widget';
-import { Codicon } from 'vs/base/common/codicons';
-import { Color, HSVA, RGBA } from 'vs/base/common/color';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ThemeIcon } from 'vs/base/common/themables';
-import 'vs/css!./colorPicker';
-import { ColorPickerModel } from 'vs/editor/contrib/colorPicker/browser/colorPickerModel';
-import { IEditorHoverColorPickerWidget } from 'vs/editor/contrib/hover/browser/hoverTypes';
-import { localize } from 'vs/nls';
-import { editorHoverBackground } from 'vs/platform/theme/common/colorRegistry';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-
-const $ = dom.$;
-
-export class ColorPickerHeader extends Disposable {
-
-	private readonly _domNode: HTMLElement;
-	private readonly _pickedColorNode: HTMLElement;
-	private readonly _pickedColorPresentation: HTMLElement;
-	private readonly _originalColorNode: HTMLElement;
-	private readonly _closeButton: CloseButton | null = null;
-	private backgroundColor: Color;
-
-	constructor(container: HTMLElement, private readonly model: ColorPickerModel, themeService: IThemeService, private showingStandaloneColorPicker: boolean = false) {
-		super();
-
-		this._domNode = $('.colorpicker-header');
-		dom.append(container, this._domNode);
-
-		this._pickedColorNode = dom.append(this._domNode, $('.picked-color'));
-		dom.append(this._pickedColorNode, $('span.codicon.codicon-color-mode'));
-		this._pickedColorPresentation = dom.append(this._pickedColorNode, document.createElement('span'));
-		this._pickedColorPresentation.classList.add('picked-color-presentation');
-
-		const tooltip = localize('clickToToggleColorOptions', "Click to toggle color options (rgb/hsl/hex)");
-		this._pickedColorNode.setAttribute('title', tooltip);
-
-		this._originalColorNode = dom.append(this._domNode, $('.original-color'));
-		this._originalColorNode.style.backgroundColor = Color.Format.CSS.format(this.model.originalColor) || '';
-
-		this.backgroundColor = themeService.getColorTheme().getColor(editorHoverBackground) || Color.white;
-		this._register(themeService.onDidColorThemeChange(theme => {
-			this.backgroundColor = theme.getColor(editorHoverBackground) || Color.white;
-		}));
-
-		this._register(dom.addDisposableListener(this._pickedColorNode, dom.EventType.CLICK, () => this.model.selectNextColorPresentation()));
-		this._register(dom.addDisposableListener(this._originalColorNode, dom.EventType.CLICK, () => {
-			this.model.color = this.model.originalColor;
-			this.model.flushColor();
-		}));
-		this._register(model.onDidChangeColor(this.onDidChangeColor, this));
-		this._register(model.onDidChangePresentation(this.onDidChangePresentation, this));
-		this._pickedColorNode.style.backgroundColor = Color.Format.CSS.format(model.color) || '';
-		this._pickedColorNode.classList.toggle('light', model.color.rgba.a < 0.5 ? this.backgroundColor.isLighter() : model.color.isLighter());
-
-		this.onDidChangeColor(this.model.color);
-
-		// When the color picker widget is a standalone color picker widget, then add a close button
-		if (this.showingStandaloneColorPicker) {
-			this._domNode.classList.add('standalone-colorpicker');
-			this._closeButton = this._register(new CloseButton(this._domNode));
-		}
-	}
-
-	public get domNode(): HTMLElement {
-		return this._domNode;
-	}
-
-	public get closeButton(): CloseButton | null {
-		return this._closeButton;
-	}
-
-	public get pickedColorNode(): HTMLElement {
-		return this._pickedColorNode;
-	}
-
-	public get originalColorNode(): HTMLElement {
-		return this._originalColorNode;
-	}
-
-	private onDidChangeColor(color: Color): void {
-		this._pickedColorNode.style.backgroundColor = Color.Format.CSS.format(color) || '';
-		this._pickedColorNode.classList.toggle('light', color.rgba.a < 0.5 ? this.backgroundColor.isLighter() : color.isLighter());
-		this.onDidChangePresentation();
-	}
-
-	private onDidChangePresentation(): void {
-		this._pickedColorPresentation.textContent = this.model.presentation ? this.model.presentation.label : '';
-	}
-}
-
-class CloseButton extends Disposable {
-
-	private _button: HTMLElement;
-	private readonly _onClicked = this._register(new Emitter<void>());
-	public readonly onClicked = this._onClicked.event;
-
-	constructor(container: HTMLElement) {
-		super();
-		this._button = document.createElement('div');
-		this._button.classList.add('close-button');
-		dom.append(container, this._button);
-
-		const innerDiv = document.createElement('div');
-		innerDiv.classList.add('close-button-inner-div');
-		dom.append(this._button, innerDiv);
-
-		const closeButton = dom.append(innerDiv, $('.button' + ThemeIcon.asCSSSelector(registerIcon('color-picker-close', Codicon.close, localize('closeIcon', 'Icon to close the color picker')))));
-		closeButton.classList.add('close-icon');
-		this._register(dom.addDisposableListener(this._button, dom.EventType.CLICK, () => {
-			this._onClicked.fire();
-		}));
-	}
-}
-
-export class ColorPickerBody extends Disposable {
-
-	private readonly _domNode: HTMLElement;
-	private readonly _saturationBox: SaturationBox;
-	private readonly _hueStrip: Strip;
-	private readonly _opacityStrip: Strip;
-	private readonly _insertButton: InsertButton | null = null;
-
-	constructor(container: HTMLElement, private readonly model: ColorPickerModel, private pixelRatio: number, isStandaloneColorPicker: boolean = false) {
-		super();
-
-		this._domNode = $('.colorpicker-body');
-		dom.append(container, this._domNode);
-
-		this._saturationBox = new SaturationBox(this._domNode, this.model, this.pixelRatio);
-		this._register(this._saturationBox);
-		this._register(this._saturationBox.onDidChange(this.onDidSaturationValueChange, this));
-		this._register(this._saturationBox.onColorFlushed(this.flushColor, this));
-
-		this._opacityStrip = new OpacityStrip(this._domNode, this.model, isStandaloneColorPicker);
-		this._register(this._opacityStrip);
-		this._register(this._opacityStrip.onDidChange(this.onDidOpacityChange, this));
-		this._register(this._opacityStrip.onColorFlushed(this.flushColor, this));
-
-		this._hueStrip = new HueStrip(this._domNode, this.model, isStandaloneColorPicker);
-		this._register(this._hueStrip);
-		this._register(this._hueStrip.onDidChange(this.onDidHueChange, this));
-		this._register(this._hueStrip.onColorFlushed(this.flushColor, this));
-
-		if (isStandaloneColorPicker) {
-			this._insertButton = this._register(new InsertButton(this._domNode));
-			this._domNode.classList.add('standalone-colorpicker');
-		}
-	}
-
-	private flushColor(): void {
-		this.model.flushColor();
-	}
-
-	private onDidSaturationValueChange({ s, v }: { s: number; v: number }): void {
-		const hsva = this.model.color.hsva;
-		this.model.color = new Color(new HSVA(hsva.h, s, v, hsva.a));
-	}
-
-	private onDidOpacityChange(a: number): void {
-		const hsva = this.model.color.hsva;
-		this.model.color = new Color(new HSVA(hsva.h, hsva.s, hsva.v, a));
-	}
-
-	private onDidHueChange(value: number): void {
-		const hsva = this.model.color.hsva;
-		const h = (1 - value) * 360;
-
-		this.model.color = new Color(new HSVA(h === 360 ? 0 : h, hsva.s, hsva.v, hsva.a));
-	}
-
-	get domNode() {
-		return this._domNode;
-	}
-
-	get saturationBox() {
-		return this._saturationBox;
-	}
-
-	get opacityStrip() {
-		return this._opacityStrip;
-	}
-
-	get hueStrip() {
-		return this._hueStrip;
-	}
-
-	get enterButton() {
-		return this._insertButton;
-	}
-
-	layout(): void {
-		this._saturationBox.layout();
-		this._opacityStrip.layout();
-		this._hueStrip.layout();
-	}
-}
-
-class SaturationBox extends Disposable {
-
-	private readonly _domNode: HTMLElement;
-	private readonly selection: HTMLElement;
-	private readonly _canvas: HTMLCanvasElement;
-	private width!: number;
-	private height!: number;
-
-	private monitor: GlobalPointerMoveMonitor | null;
-	private readonly _onDidChange = new Emitter<{ s: number; v: number }>();
-	readonly onDidChange: Event<{ s: number; v: number }> = this._onDidChange.event;
-
-	private readonly _onColorFlushed = new Emitter<void>();
-	readonly onColorFlushed: Event<void> = this._onColorFlushed.event;
-
-	constructor(container: HTMLElement, private readonly model: ColorPickerModel, private pixelRatio: number) {
-		super();
-
-		this._domNode = $('.saturation-wrap');
-		dom.append(container, this._domNode);
-
-		// Create canvas, draw selected color
-		this._canvas = document.createElement('canvas');
-		this._canvas.className = 'saturation-box';
-		dom.append(this._domNode, this._canvas);
-
-		// Add selection circle
-		this.selection = $('.saturation-selection');
-		dom.append(this._domNode, this.selection);
-
-		this.layout();
-
-		this._register(dom.addDisposableListener(this._domNode, dom.EventType.POINTER_DOWN, e => this.onPointerDown(e)));
-		this._register(this.model.onDidChangeColor(this.onDidChangeColor, this));
-		this.monitor = null;
-	}
-
-	public get domNode() {
-		return this._domNode;
-	}
-
-	public get canvas() {
-		return this._canvas;
-	}
-
-	private onPointerDown(e: PointerEvent): void {
-		if (!e.target || !(e.target instanceof Element)) {
-			return;
-		}
-		this.monitor = this._register(new GlobalPointerMoveMonitor());
-		const origin = dom.getDomNodePagePosition(this._domNode);
-
-		if (e.target !== this.selection) {
-			this.onDidChangePosition(e.offsetX, e.offsetY);
-		}
-
-		this.monitor.startMonitoring(e.target, e.pointerId, e.buttons, event => this.onDidChangePosition(event.pageX - origin.left, event.pageY - origin.top), () => null);
-
-		const pointerUpListener = dom.addDisposableListener(e.target.ownerDocument, dom.EventType.POINTER_UP, () => {
-			this._onColorFlushed.fire();
-			pointerUpListener.dispose();
-			if (this.monitor) {
-				this.monitor.stopMonitoring(true);
-				this.monitor = null;
-			}
-		}, true);
-	}
-
-	private onDidChangePosition(left: number, top: number): void {
-		const s = Math.max(0, Math.min(1, left / this.width));
-		const v = Math.max(0, Math.min(1, 1 - (top / this.height)));
-
-		this.paintSelection(s, v);
-		this._onDidChange.fire({ s, v });
-	}
-
-	layout(): void {
-		this.width = this._domNode.offsetWidth;
-		this.height = this._domNode.offsetHeight;
-		this._canvas.width = this.width * this.pixelRatio;
-		this._canvas.height = this.height * this.pixelRatio;
-		this.paint();
-
-		const hsva = this.model.color.hsva;
-		this.paintSelection(hsva.s, hsva.v);
-	}
-
-	private paint(): void {
-		const hsva = this.model.color.hsva;
-		const saturatedColor = new Color(new HSVA(hsva.h, 1, 1, 1));
-		const ctx = this._canvas.getContext('2d')!;
-
-		const whiteGradient = ctx.createLinearGradient(0, 0, this._canvas.width, 0);
-		whiteGradient.addColorStop(0, 'rgba(255, 255, 255, 1)');
-		whiteGradient.addColorStop(0.5, 'rgba(255, 255, 255, 0.5)');
-		whiteGradient.addColorStop(1, 'rgba(255, 255, 255, 0)');
-
-		const blackGradient = ctx.createLinearGradient(0, 0, 0, this._canvas.height);
-		blackGradient.addColorStop(0, 'rgba(0, 0, 0, 0)');
-		blackGradient.addColorStop(1, 'rgba(0, 0, 0, 1)');
-
-		ctx.rect(0, 0, this._canvas.width, this._canvas.height);
-		ctx.fillStyle = Color.Format.CSS.format(saturatedColor)!;
-		ctx.fill();
-		ctx.fillStyle = whiteGradient;
-		ctx.fill();
-		ctx.fillStyle = blackGradient;
-		ctx.fill();
-	}
-
-	private paintSelection(s: number, v: number): void {
-		this.selection.style.left = `${s * this.width}px`;
-		this.selection.style.top = `${this.height - v * this.height}px`;
-	}
-
-	private onDidChangeColor(color: Color): void {
-		if (this.monitor && this.monitor.isMonitoring()) {
-			return;
-		}
-		this.paint();
-		const hsva = color.hsva;
-		this.paintSelection(hsva.s, hsva.v);
-	}
-}
-
-abstract class Strip extends Disposable {
-
-	protected domNode: HTMLElement;
-	protected overlay: HTMLElement;
-	protected slider: HTMLElement;
-	private height!: number;
-
-	private readonly _onDidChange = new Emitter<number>();
-	readonly onDidChange: Event<number> = this._onDidChange.event;
-
-	private readonly _onColorFlushed = new Emitter<void>();
-	readonly onColorFlushed: Event<void> = this._onColorFlushed.event;
-
-	constructor(container: HTMLElement, protected model: ColorPickerModel, showingStandaloneColorPicker: boolean = false) {
-		super();
-		if (showingStandaloneColorPicker) {
-			this.domNode = dom.append(container, $('.standalone-strip'));
-			this.overlay = dom.append(this.domNode, $('.standalone-overlay'));
-		} else {
-			this.domNode = dom.append(container, $('.strip'));
-			this.overlay = dom.append(this.domNode, $('.overlay'));
-		}
-		this.slider = dom.append(this.domNode, $('.slider'));
-		this.slider.style.top = `0px`;
-
-		this._register(dom.addDisposableListener(this.domNode, dom.EventType.POINTER_DOWN, e => this.onPointerDown(e)));
-		this._register(model.onDidChangeColor(this.onDidChangeColor, this));
-		this.layout();
-	}
-
-	layout(): void {
-		this.height = this.domNode.offsetHeight - this.slider.offsetHeight;
-
-		const value = this.getValue(this.model.color);
-		this.updateSliderPosition(value);
-	}
-
-	protected onDidChangeColor(color: Color) {
-		const value = this.getValue(color);
-		this.updateSliderPosition(value);
-	}
-
-	private onPointerDown(e: PointerEvent): void {
-		if (!e.target || !(e.target instanceof Element)) {
-			return;
-		}
-		const monitor = this._register(new GlobalPointerMoveMonitor());
-		const origin = dom.getDomNodePagePosition(this.domNode);
-		this.domNode.classList.add('grabbing');
-
-		if (e.target !== this.slider) {
-			this.onDidChangeTop(e.offsetY);
-		}
-
-		monitor.startMonitoring(e.target, e.pointerId, e.buttons, event => this.onDidChangeTop(event.pageY - origin.top), () => null);
-
-		const pointerUpListener = dom.addDisposableListener(e.target.ownerDocument, dom.EventType.POINTER_UP, () => {
-			this._onColorFlushed.fire();
-			pointerUpListener.dispose();
-			monitor.stopMonitoring(true);
-			this.domNode.classList.remove('grabbing');
-		}, true);
-	}
-
-	private onDidChangeTop(top: number): void {
-		const value = Math.max(0, Math.min(1, 1 - (top / this.height)));
-
-		this.updateSliderPosition(value);
-		this._onDidChange.fire(value);
-	}
-
-	private updateSliderPosition(value: number): void {
-		this.slider.style.top = `${(1 - value) * this.height}px`;
-	}
-
-	protected abstract getValue(color: Color): number;
-}
-
-class OpacityStrip extends Strip {
-
-	constructor(container: HTMLElement, model: ColorPickerModel, showingStandaloneColorPicker: boolean = false) {
-		super(container, model, showingStandaloneColorPicker);
-		this.domNode.classList.add('opacity-strip');
-
-		this.onDidChangeColor(this.model.color);
-	}
-
-	protected override onDidChangeColor(color: Color): void {
-		super.onDidChangeColor(color);
-		const { r, g, b } = color.rgba;
-		const opaque = new Color(new RGBA(r, g, b, 1));
-		const transparent = new Color(new RGBA(r, g, b, 0));
-
-		this.overlay.style.background = `linear-gradient(to bottom, ${opaque} 0%, ${transparent} 100%)`;
-	}
-
-	protected getValue(color: Color): number {
-		return color.hsva.a;
-	}
-}
-
-class HueStrip extends Strip {
-
-	constructor(container: HTMLElement, model: ColorPickerModel, showingStandaloneColorPicker: boolean = false) {
-		super(container, model, showingStandaloneColorPicker);
-		this.domNode.classList.add('hue-strip');
-	}
-
-	protected getValue(color: Color): number {
-		return 1 - (color.hsva.h / 360);
-	}
-}
-
-export class InsertButton extends Disposable {
-
-	private _button: HTMLElement;
-	private readonly _onClicked = this._register(new Emitter<void>());
-	public readonly onClicked = this._onClicked.event;
-
-	constructor(container: HTMLElement) {
-		super();
-		this._button = dom.append(container, document.createElement('button'));
-		this._button.classList.add('insert-button');
-		this._button.textContent = 'Insert';
-		this._register(dom.addDisposableListener(this._button, dom.EventType.CLICK, () => {
-			this._onClicked.fire();
-		}));
-	}
-
-	public get button(): HTMLElement {
-		return this._button;
-	}
-}
-
-export class ColorPickerWidget extends Widget implements IEditorHoverColorPickerWidget {
-
-	private static readonly ID = 'editor.contrib.colorPickerWidget';
-
-	body: ColorPickerBody;
-	header: ColorPickerHeader;
-
-	constructor(container: Node, readonly model: ColorPickerModel, private pixelRatio: number, themeService: IThemeService, standaloneColorPicker: boolean = false) {
-		super();
-
-		this._register(PixelRatio.getInstance(dom.getWindow(container)).onDidChange(() => this.layout()));
-
-		const element = $('.colorpicker-widget');
-		container.appendChild(element);
-
-		this.header = this._register(new ColorPickerHeader(element, this.model, themeService, standaloneColorPicker));
-		this.body = this._register(new ColorPickerBody(element, this.model, this.pixelRatio, standaloneColorPicker));
-	}
-
-	getId(): string {
-		return ColorPickerWidget.ID;
-	}
-
-	layout(): void {
-		this.body.layout();
-	}
-}
diff --git a/src/vs/editor/contrib/colorPicker/browser/defaultDocumentColorProvider.ts b/src/vs/editor/contrib/colorPicker/browser/defaultDocumentColorProvider.ts
index 8bb5e3ad56a..63a231f23ea 100644
--- a/src/vs/editor/contrib/colorPicker/browser/defaultDocumentColorProvider.ts
+++ b/src/vs/editor/contrib/colorPicker/browser/defaultDocumentColorProvider.ts
@@ -3,30 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Color, RGBA } from 'vs/base/common/color';
-import { ITextModel } from 'vs/editor/common/model';
-import { DocumentColorProvider, IColor, IColorInformation, IColorPresentation } from 'vs/editor/common/languages';
-import { EditorWorkerClient } from 'vs/editor/browser/services/editorWorkerService';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { registerEditorFeature } from 'vs/editor/common/editorFeatures';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Color, RGBA } from '../../../../base/common/color.js';
+import { ITextModel } from '../../../common/model.js';
+import { DocumentColorProvider, IColor, IColorInformation, IColorPresentation } from '../../../common/languages.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { IEditorWorkerService } from '../../../common/services/editorWorker.js';
 
 export class DefaultDocumentColorProvider implements DocumentColorProvider {
 
-	private _editorWorkerClient: EditorWorkerClient;
-
 	constructor(
-		modelService: IModelService,
-		languageConfigurationService: ILanguageConfigurationService,
-	) {
-		this._editorWorkerClient = new EditorWorkerClient(modelService, false, 'editorWorkerService', languageConfigurationService);
-	}
+		@IEditorWorkerService private readonly _editorWorkerService: IEditorWorkerService,
+	) { }
 
 	async provideDocumentColors(model: ITextModel, _token: CancellationToken): Promise<IColorInformation[] | null> {
-		return this._editorWorkerClient.computeDefaultDocumentColors(model.uri);
+		return this._editorWorkerService.computeDefaultDocumentColors(model.uri);
 	}
 
 	provideColorPresentations(_model: ITextModel, colorInfo: IColorInformation, _token: CancellationToken): IColorPresentation[] {
@@ -47,15 +39,13 @@ export class DefaultDocumentColorProvider implements DocumentColorProvider {
 	}
 }
 
-class DefaultDocumentColorProviderFeature extends Disposable {
+export class DefaultDocumentColorProviderFeature extends Disposable {
 	constructor(
-		@IModelService _modelService: IModelService,
-		@ILanguageConfigurationService _languageConfigurationService: ILanguageConfigurationService,
 		@ILanguageFeaturesService _languageFeaturesService: ILanguageFeaturesService,
+		@IEditorWorkerService editorWorkerService: IEditorWorkerService,
 	) {
 		super();
-		this._register(_languageFeaturesService.colorProvider.register('*', new DefaultDocumentColorProvider(_modelService, _languageConfigurationService)));
+		this._register(_languageFeaturesService.colorProvider.register('*', new DefaultDocumentColorProvider(editorWorkerService)));
 	}
 }
 
-registerEditorFeature(DefaultDocumentColorProviderFeature);
diff --git a/src/vs/editor/contrib/colorPicker/browser/colorContributions.ts b/src/vs/editor/contrib/colorPicker/browser/hoverColorPicker/hoverColorPickerContribution.ts
similarity index 57%
rename from src/vs/editor/contrib/colorPicker/browser/colorContributions.ts
rename to src/vs/editor/contrib/colorPicker/browser/hoverColorPicker/hoverColorPickerContribution.ts
index e7642a17e7d..46f7660dd2e 100644
--- a/src/vs/editor/contrib/colorPicker/browser/colorContributions.ts
+++ b/src/vs/editor/contrib/colorPicker/browser/hoverColorPicker/hoverColorPickerContribution.ts
@@ -3,19 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
-import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Range } from 'vs/editor/common/core/range';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { ColorDecorationInjectedTextMarker } from 'vs/editor/contrib/colorPicker/browser/colorDetector';
-import { ColorHoverParticipant } from 'vs/editor/contrib/colorPicker/browser/colorHoverParticipant';
-import { HoverController } from 'vs/editor/contrib/hover/browser/hoverController';
-import { HoverStartMode, HoverStartSource } from 'vs/editor/contrib/hover/browser/hoverOperation';
-import { HoverParticipantRegistry } from 'vs/editor/contrib/hover/browser/hoverTypes';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from '../../../../browser/editorBrowser.js';
+import { EditorOption } from '../../../../common/config/editorOptions.js';
+import { Range } from '../../../../common/core/range.js';
+import { IEditorContribution } from '../../../../common/editorCommon.js';
+import { ColorDecorationInjectedTextMarker } from '../colorDetector.js';
+import { ContentHoverController } from '../../../hover/browser/contentHoverController.js';
+import { HoverStartMode, HoverStartSource } from '../../../hover/browser/hoverOperation.js';
 
-export class ColorContribution extends Disposable implements IEditorContribution {
+export class HoverColorPickerContribution extends Disposable implements IEditorContribution {
 
 	public static readonly ID: string = 'editor.contrib.colorContribution';
 
@@ -56,7 +53,7 @@ export class ColorContribution extends Disposable implements IEditorContribution
 			return;
 		}
 
-		const hoverController = this._editor.getContribution<HoverController>(HoverController.ID);
+		const hoverController = this._editor.getContribution<ContentHoverController>(ContentHoverController.ID);
 		if (!hoverController) {
 			return;
 		}
@@ -66,6 +63,3 @@ export class ColorContribution extends Disposable implements IEditorContribution
 		}
 	}
 }
-
-registerEditorContribution(ColorContribution.ID, ColorContribution, EditorContributionInstantiation.BeforeFirstInteraction);
-HoverParticipantRegistry.register(ColorHoverParticipant);
diff --git a/src/vs/editor/contrib/colorPicker/browser/hoverColorPicker/hoverColorPickerParticipant.ts b/src/vs/editor/contrib/colorPicker/browser/hoverColorPicker/hoverColorPickerParticipant.ts
new file mode 100644
index 00000000000..7c7d4afeb06
--- /dev/null
+++ b/src/vs/editor/contrib/colorPicker/browser/hoverColorPicker/hoverColorPickerParticipant.ts
@@ -0,0 +1,148 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { AsyncIterableObject } from '../../../../../base/common/async.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { ICodeEditor } from '../../../../browser/editorBrowser.js';
+import { Range } from '../../../../common/core/range.js';
+import { IModelDecoration } from '../../../../common/model.js';
+import { DocumentColorProvider } from '../../../../common/languages.js';
+import { ColorDetector } from '../colorDetector.js';
+import { ColorPickerModel } from '../colorPickerModel.js';
+import { ColorPickerWidget } from './hoverColorPickerWidget.js';
+import { HoverAnchor, HoverAnchorType, IEditorHoverParticipant, IEditorHoverRenderContext, IHoverPart, IRenderedHoverPart, IRenderedHoverParts, RenderedHoverParts } from '../../../hover/browser/hoverTypes.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import * as nls from '../../../../../nls.js';
+import { BaseColor, createColorHover, updateColorPresentations, updateEditorModel } from '../colorPickerParticipantUtils.js';
+import { EditorOption } from '../../../../common/config/editorOptions.js';
+import { Dimension } from '../../../../../base/browser/dom.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { Color } from '../../../../../base/common/color.js';
+
+export class ColorHover implements IHoverPart, BaseColor {
+
+	/**
+	 * Force the hover to always be rendered at this specific range,
+	 * even in the case of multiple hover parts.
+	 */
+	public readonly forceShowAtRange: boolean = true;
+
+	constructor(
+		public readonly owner: IEditorHoverParticipant<ColorHover>,
+		public readonly range: Range,
+		public readonly model: ColorPickerModel,
+		public readonly provider: DocumentColorProvider
+	) { }
+
+	public isValidForHoverAnchor(anchor: HoverAnchor): boolean {
+		return (
+			anchor.type === HoverAnchorType.Range
+			&& this.range.startColumn <= anchor.range.startColumn
+			&& this.range.endColumn >= anchor.range.endColumn
+		);
+	}
+
+	public static fromBaseColor(owner: IEditorHoverParticipant<ColorHover>, color: BaseColor): ColorHover {
+		return new ColorHover(owner, color.range, color.model, color.provider);
+	}
+}
+
+export class HoverColorPickerParticipant implements IEditorHoverParticipant<ColorHover> {
+
+	public readonly hoverOrdinal: number = 2;
+
+	private _colorPicker: ColorPickerWidget | undefined;
+
+	constructor(
+		private readonly _editor: ICodeEditor,
+		@IThemeService private readonly _themeService: IThemeService,
+	) { }
+
+	public computeSync(_anchor: HoverAnchor, _lineDecorations: IModelDecoration[]): ColorHover[] {
+		return [];
+	}
+
+	public computeAsync(anchor: HoverAnchor, lineDecorations: IModelDecoration[], token: CancellationToken): AsyncIterableObject<ColorHover> {
+		return AsyncIterableObject.fromPromise(this._computeAsync(anchor, lineDecorations, token));
+	}
+
+	private async _computeAsync(_anchor: HoverAnchor, lineDecorations: IModelDecoration[], _token: CancellationToken): Promise<ColorHover[]> {
+		if (!this._editor.hasModel()) {
+			return [];
+		}
+		const colorDetector = ColorDetector.get(this._editor);
+		if (!colorDetector) {
+			return [];
+		}
+		for (const d of lineDecorations) {
+			if (!colorDetector.isColorDecoration(d)) {
+				continue;
+			}
+
+			const colorData = colorDetector.getColorData(d.range.getStartPosition());
+			if (colorData) {
+				const colorHover = ColorHover.fromBaseColor(this, await createColorHover(this._editor.getModel(), colorData.colorInfo, colorData.provider));
+				return [colorHover];
+			}
+
+		}
+		return [];
+	}
+
+	public renderHoverParts(context: IEditorHoverRenderContext, hoverParts: ColorHover[]): IRenderedHoverParts<ColorHover> {
+		const editor = this._editor;
+		if (hoverParts.length === 0 || !editor.hasModel()) {
+			return new RenderedHoverParts([]);
+		}
+		if (context.setMinimumDimensions) {
+			const minimumHeight = editor.getOption(EditorOption.lineHeight) + 8;
+			context.setMinimumDimensions(new Dimension(302, minimumHeight));
+		}
+
+		const disposables = new DisposableStore();
+		const colorHover = hoverParts[0];
+		const editorModel = editor.getModel();
+		const model = colorHover.model;
+		this._colorPicker = disposables.add(new ColorPickerWidget(context.fragment, model, editor.getOption(EditorOption.pixelRatio), this._themeService, false));
+
+		let editorUpdatedByColorPicker = false;
+		let range = new Range(colorHover.range.startLineNumber, colorHover.range.startColumn, colorHover.range.endLineNumber, colorHover.range.endColumn);
+
+		disposables.add(model.onColorFlushed(async (color: Color) => {
+			await updateColorPresentations(editorModel, model, color, range, colorHover);
+			editorUpdatedByColorPicker = true;
+			range = updateEditorModel(editor, range, model);
+		}));
+		disposables.add(model.onDidChangeColor((color: Color) => {
+			updateColorPresentations(editorModel, model, color, range, colorHover);
+		}));
+		disposables.add(editor.onDidChangeModelContent((e) => {
+			if (editorUpdatedByColorPicker) {
+				editorUpdatedByColorPicker = false;
+			} else {
+				context.hide();
+				editor.focus();
+			}
+		}));
+		const renderedHoverPart: IRenderedHoverPart<ColorHover> = {
+			hoverPart: ColorHover.fromBaseColor(this, colorHover),
+			hoverElement: this._colorPicker.domNode,
+			dispose() { disposables.dispose(); }
+		};
+		return new RenderedHoverParts([renderedHoverPart]);
+	}
+
+	public getAccessibleContent(hoverPart: ColorHover): string {
+		return nls.localize('hoverAccessibilityColorParticipant', 'There is a color picker here.');
+	}
+
+	public handleResize(): void {
+		this._colorPicker?.layout();
+	}
+
+	public isColorPickerVisible(): boolean {
+		return !!this._colorPicker;
+	}
+}
diff --git a/src/vs/editor/contrib/colorPicker/browser/hoverColorPicker/hoverColorPickerWidget.ts b/src/vs/editor/contrib/colorPicker/browser/hoverColorPicker/hoverColorPickerWidget.ts
new file mode 100644
index 00000000000..9ba946953f9
--- /dev/null
+++ b/src/vs/editor/contrib/colorPicker/browser/hoverColorPicker/hoverColorPickerWidget.ts
@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import '../colorPicker.css';
+import { PixelRatio } from '../../../../../base/browser/pixelRatio.js';
+import * as dom from '../../../../../base/browser/dom.js';
+import { Widget } from '../../../../../base/browser/ui/widget.js';
+import { ColorPickerModel } from '../colorPickerModel.js';
+import { IEditorHoverColorPickerWidget } from '../../../hover/browser/hoverTypes.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { ColorPickerBody } from '../colorPickerParts/colorPickerBody.js';
+import { ColorPickerHeader } from '../colorPickerParts/colorPickerHeader.js';
+
+const $ = dom.$;
+
+export class ColorPickerWidget extends Widget implements IEditorHoverColorPickerWidget {
+
+	private static readonly ID = 'editor.contrib.colorPickerWidget';
+	private readonly _domNode: HTMLElement;
+
+	body: ColorPickerBody;
+	header: ColorPickerHeader;
+
+	constructor(container: Node, readonly model: ColorPickerModel, private pixelRatio: number, themeService: IThemeService, standaloneColorPicker: boolean = false) {
+		super();
+
+		this._register(PixelRatio.getInstance(dom.getWindow(container)).onDidChange(() => this.layout()));
+
+		this._domNode = $('.colorpicker-widget');
+		container.appendChild(this._domNode);
+
+		this.header = this._register(new ColorPickerHeader(this._domNode, this.model, themeService, standaloneColorPicker));
+		this.body = this._register(new ColorPickerBody(this._domNode, this.model, this.pixelRatio, standaloneColorPicker));
+	}
+
+	getId(): string {
+		return ColorPickerWidget.ID;
+	}
+
+	layout(): void {
+		this.body.layout();
+	}
+
+	get domNode(): HTMLElement {
+		return this._domNode;
+	}
+}
diff --git a/src/vs/editor/contrib/colorPicker/browser/standaloneColorPickerActions.ts b/src/vs/editor/contrib/colorPicker/browser/standaloneColorPicker/standaloneColorPickerActions.ts
similarity index 74%
rename from src/vs/editor/contrib/colorPicker/browser/standaloneColorPickerActions.ts
rename to src/vs/editor/contrib/colorPicker/browser/standaloneColorPicker/standaloneColorPickerActions.ts
index 9d531552008..6ac80b945f6 100644
--- a/src/vs/editor/contrib/colorPicker/browser/standaloneColorPickerActions.ts
+++ b/src/vs/editor/contrib/colorPicker/browser/standaloneColorPicker/standaloneColorPickerActions.ts
@@ -3,15 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, EditorAction2, ServicesAccessor, registerEditorAction } from 'vs/editor/browser/editorExtensions';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { localize, localize2 } from 'vs/nls';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { StandaloneColorPickerController } from 'vs/editor/contrib/colorPicker/browser/standaloneColorPickerWidget';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import 'vs/css!./colorPicker';
+import { ICodeEditor } from '../../../../browser/editorBrowser.js';
+import { EditorAction, EditorAction2, ServicesAccessor } from '../../../../browser/editorExtensions.js';
+import { KeyCode } from '../../../../../base/common/keyCodes.js';
+import { localize, localize2 } from '../../../../../nls.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { EditorContextKeys } from '../../../../common/editorContextKeys.js';
+import { MenuId } from '../../../../../platform/actions/common/actions.js';
+import { StandaloneColorPickerController } from './standaloneColorPickerController.js';
 
 export class ShowOrFocusStandaloneColorPicker extends EditorAction2 {
 	constructor() {
@@ -35,7 +34,7 @@ export class ShowOrFocusStandaloneColorPicker extends EditorAction2 {
 	}
 }
 
-class HideStandaloneColorPicker extends EditorAction {
+export class HideStandaloneColorPicker extends EditorAction {
 	constructor() {
 		super({
 			id: 'editor.action.hideColorPicker',
@@ -61,7 +60,7 @@ class HideStandaloneColorPicker extends EditorAction {
 	}
 }
 
-class InsertColorWithStandaloneColorPicker extends EditorAction {
+export class InsertColorWithStandaloneColorPicker extends EditorAction {
 	constructor() {
 		super({
 			id: 'editor.action.insertColorWithStandaloneColorPicker',
@@ -86,7 +85,3 @@ class InsertColorWithStandaloneColorPicker extends EditorAction {
 		StandaloneColorPickerController.get(editor)?.insertColor();
 	}
 }
-
-registerEditorAction(HideStandaloneColorPicker);
-registerEditorAction(InsertColorWithStandaloneColorPicker);
-registerAction2(ShowOrFocusStandaloneColorPicker);
diff --git a/src/vs/editor/contrib/colorPicker/browser/standaloneColorPicker/standaloneColorPickerController.ts b/src/vs/editor/contrib/colorPicker/browser/standaloneColorPicker/standaloneColorPickerController.ts
new file mode 100644
index 00000000000..8cbeedd4dac
--- /dev/null
+++ b/src/vs/editor/contrib/colorPicker/browser/standaloneColorPicker/standaloneColorPickerController.ts
@@ -0,0 +1,63 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IContextKey, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ICodeEditor } from '../../../../browser/editorBrowser.js';
+import { IEditorContribution } from '../../../../common/editorCommon.js';
+import { EditorContextKeys } from '../../../../common/editorContextKeys.js';
+import { StandaloneColorPickerWidget } from './standaloneColorPickerWidget.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+
+export class StandaloneColorPickerController extends Disposable implements IEditorContribution {
+
+	public static ID = 'editor.contrib.standaloneColorPickerController';
+	private _standaloneColorPickerWidget: StandaloneColorPickerWidget | null = null;
+	private _standaloneColorPickerVisible: IContextKey<boolean>;
+	private _standaloneColorPickerFocused: IContextKey<boolean>;
+
+	constructor(
+		private readonly _editor: ICodeEditor,
+		@IContextKeyService _contextKeyService: IContextKeyService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+	) {
+		super();
+		this._standaloneColorPickerVisible = EditorContextKeys.standaloneColorPickerVisible.bindTo(_contextKeyService);
+		this._standaloneColorPickerFocused = EditorContextKeys.standaloneColorPickerFocused.bindTo(_contextKeyService);
+	}
+
+	public showOrFocus() {
+		if (!this._editor.hasModel()) {
+			return;
+		}
+		if (!this._standaloneColorPickerVisible.get()) {
+			this._standaloneColorPickerWidget = this._instantiationService.createInstance(
+				StandaloneColorPickerWidget,
+				this._editor,
+				this._standaloneColorPickerVisible,
+				this._standaloneColorPickerFocused
+			);
+		} else if (!this._standaloneColorPickerFocused.get()) {
+			this._standaloneColorPickerWidget?.focus();
+		}
+	}
+
+	public hide() {
+		this._standaloneColorPickerFocused.set(false);
+		this._standaloneColorPickerVisible.set(false);
+		this._standaloneColorPickerWidget?.hide();
+		this._editor.focus();
+	}
+
+	public insertColor() {
+		this._standaloneColorPickerWidget?.updateEditor();
+		this.hide();
+	}
+
+	public static get(editor: ICodeEditor) {
+		return editor.getContribution<StandaloneColorPickerController>(StandaloneColorPickerController.ID);
+	}
+}
+
diff --git a/src/vs/editor/contrib/colorPicker/browser/standaloneColorPicker/standaloneColorPickerParticipant.ts b/src/vs/editor/contrib/colorPicker/browser/standaloneColorPicker/standaloneColorPickerParticipant.ts
new file mode 100644
index 00000000000..bbd3f287a2e
--- /dev/null
+++ b/src/vs/editor/contrib/colorPicker/browser/standaloneColorPicker/standaloneColorPickerParticipant.ts
@@ -0,0 +1,119 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { Color } from '../../../../../base/common/color.js';
+import { DisposableStore, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { ICodeEditor } from '../../../../browser/editorBrowser.js';
+import { LanguageFeatureRegistry } from '../../../../common/languageFeatureRegistry.js';
+import { DocumentColorProvider, IColorInformation } from '../../../../common/languages.js';
+import { IEditorHoverRenderContext } from '../../../hover/browser/hoverTypes.js';
+import { getColors } from '../color.js';
+import { ColorDetector } from '../colorDetector.js';
+import { ColorPickerModel } from '../colorPickerModel.js';
+import { BaseColor, createColorHover, updateColorPresentations, updateEditorModel } from '../colorPickerParticipantUtils.js';
+import { ColorPickerWidget } from '../hoverColorPicker/hoverColorPickerWidget.js';
+import { Range } from '../../../../common/core/range.js';
+import { EditorOption } from '../../../../common/config/editorOptions.js';
+import { Dimension } from '../../../../../base/browser/dom.js';
+
+export class StandaloneColorPickerHover implements BaseColor {
+	constructor(
+		public readonly owner: StandaloneColorPickerParticipant,
+		public readonly range: Range,
+		public readonly model: ColorPickerModel,
+		public readonly provider: DocumentColorProvider
+	) { }
+
+	public static fromBaseColor(owner: StandaloneColorPickerParticipant, color: BaseColor) {
+		return new StandaloneColorPickerHover(owner, color.range, color.model, color.provider);
+	}
+}
+
+export class StandaloneColorPickerParticipant {
+
+	public readonly hoverOrdinal: number = 2;
+	private _color: Color | null = null;
+
+	constructor(
+		private readonly _editor: ICodeEditor,
+		@IThemeService private readonly _themeService: IThemeService,
+	) { }
+
+	public async createColorHover(defaultColorInfo: IColorInformation, defaultColorProvider: DocumentColorProvider, colorProviderRegistry: LanguageFeatureRegistry<DocumentColorProvider>): Promise<{ colorHover: StandaloneColorPickerHover; foundInEditor: boolean } | null> {
+		if (!this._editor.hasModel()) {
+			return null;
+		}
+		const colorDetector = ColorDetector.get(this._editor);
+		if (!colorDetector) {
+			return null;
+		}
+		const colors = await getColors(colorProviderRegistry, this._editor.getModel(), CancellationToken.None);
+		let foundColorInfo: IColorInformation | null = null;
+		let foundColorProvider: DocumentColorProvider | null = null;
+		for (const colorData of colors) {
+			const colorInfo = colorData.colorInfo;
+			if (Range.containsRange(colorInfo.range, defaultColorInfo.range)) {
+				foundColorInfo = colorInfo;
+				foundColorProvider = colorData.provider;
+			}
+		}
+		const colorInfo = foundColorInfo ?? defaultColorInfo;
+		const colorProvider = foundColorProvider ?? defaultColorProvider;
+		const foundInEditor = !!foundColorInfo;
+		const colorHover = StandaloneColorPickerHover.fromBaseColor(this, await createColorHover(this._editor.getModel(), colorInfo, colorProvider));
+		return { colorHover, foundInEditor };
+	}
+
+	public async updateEditorModel(colorHoverData: StandaloneColorPickerHover): Promise<void> {
+		if (!this._editor.hasModel()) {
+			return;
+		}
+		const colorPickerModel = colorHoverData.model;
+		let range = new Range(colorHoverData.range.startLineNumber, colorHoverData.range.startColumn, colorHoverData.range.endLineNumber, colorHoverData.range.endColumn);
+		if (this._color) {
+			await updateColorPresentations(this._editor.getModel(), colorPickerModel, this._color, range, colorHoverData);
+			range = updateEditorModel(this._editor, range, colorPickerModel);
+		}
+	}
+
+	public renderHoverParts(context: IEditorHoverRenderContext, hoverParts: StandaloneColorPickerHover[]): { disposables: IDisposable; hoverPart: StandaloneColorPickerHover; colorPicker: ColorPickerWidget } | undefined {
+		if (hoverParts.length === 0 || !this._editor.hasModel()) {
+			return undefined;
+		}
+		if (context.setMinimumDimensions) {
+			const minimumHeight = this._editor.getOption(EditorOption.lineHeight) + 8;
+			context.setMinimumDimensions(new Dimension(302, minimumHeight));
+		}
+
+		const disposables = new DisposableStore();
+		const colorHover = hoverParts[0];
+		const editorModel = this._editor.getModel();
+		const model = colorHover.model;
+		const colorPicker = disposables.add(new ColorPickerWidget(context.fragment, model, this._editor.getOption(EditorOption.pixelRatio), this._themeService, true));
+
+		let editorUpdatedByColorPicker = false;
+		const range = new Range(colorHover.range.startLineNumber, colorHover.range.startColumn, colorHover.range.endLineNumber, colorHover.range.endColumn);
+		const color = colorHover.model.color;
+		this._color = color;
+		updateColorPresentations(editorModel, model, color, range, colorHover);
+		disposables.add(model.onColorFlushed((color: Color) => {
+			this._color = color;
+		}));
+		disposables.add(model.onDidChangeColor((color: Color) => {
+			updateColorPresentations(editorModel, model, color, range, colorHover);
+		}));
+		disposables.add(this._editor.onDidChangeModelContent((e) => {
+			if (editorUpdatedByColorPicker) {
+				editorUpdatedByColorPicker = false;
+			} else {
+				context.hide();
+				this._editor.focus();
+			}
+		}));
+		return { hoverPart: colorHover, colorPicker, disposables };
+	}
+}
diff --git a/src/vs/editor/contrib/colorPicker/browser/standaloneColorPickerWidget.ts b/src/vs/editor/contrib/colorPicker/browser/standaloneColorPicker/standaloneColorPickerWidget.ts
similarity index 61%
rename from src/vs/editor/contrib/colorPicker/browser/standaloneColorPickerWidget.ts
rename to src/vs/editor/contrib/colorPicker/browser/standaloneColorPicker/standaloneColorPickerWidget.ts
index 7f9cad0d757..1a007476876 100644
--- a/src/vs/editor/contrib/colorPicker/browser/standaloneColorPickerWidget.ts
+++ b/src/vs/editor/contrib/colorPicker/browser/standaloneColorPicker/standaloneColorPickerWidget.ts
@@ -3,82 +3,35 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IEditorHoverRenderContext } from 'vs/editor/contrib/hover/browser/hoverTypes';
-import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from 'vs/editor/browser/editorBrowser';
-import { PositionAffinity } from 'vs/editor/common/model';
-import { Position } from 'vs/editor/common/core/position';
-import { StandaloneColorPickerHover, StandaloneColorPickerParticipant } from 'vs/editor/contrib/colorPicker/browser/colorHoverParticipant';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { EditorHoverStatusBar } from 'vs/editor/contrib/hover/browser/contentHoverStatusBar';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { InsertButton } from 'vs/editor/contrib/colorPicker/browser/colorPickerWidget';
-import { Emitter } from 'vs/base/common/event';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { IColorInformation } from 'vs/editor/common/languages';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IRange } from 'vs/editor/common/core/range';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { DefaultDocumentColorProvider } from 'vs/editor/contrib/colorPicker/browser/defaultDocumentColorProvider';
-import * as dom from 'vs/base/browser/dom';
-import 'vs/css!./colorPicker';
-
-export class StandaloneColorPickerController extends Disposable implements IEditorContribution {
-
-	public static ID = 'editor.contrib.standaloneColorPickerController';
-	private _standaloneColorPickerWidget: StandaloneColorPickerWidget | null = null;
-	private _standaloneColorPickerVisible: IContextKey<boolean>;
-	private _standaloneColorPickerFocused: IContextKey<boolean>;
+import '../colorPicker.css';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { IEditorHoverRenderContext } from '../../../hover/browser/hoverTypes.js';
+import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from '../../../../browser/editorBrowser.js';
+import { PositionAffinity } from '../../../../common/model.js';
+import { Position } from '../../../../common/core/position.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { EditorHoverStatusBar } from '../../../hover/browser/contentHoverStatusBar.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { EditorOption } from '../../../../common/config/editorOptions.js';
+import { IColorInformation } from '../../../../common/languages.js';
+import { ILanguageFeaturesService } from '../../../../common/services/languageFeatures.js';
+import { IContextKey } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IRange } from '../../../../common/core/range.js';
+import { DefaultDocumentColorProvider } from '../defaultDocumentColorProvider.js';
+import { IEditorWorkerService } from '../../../../common/services/editorWorker.js';
+import { StandaloneColorPickerHover, StandaloneColorPickerParticipant } from './standaloneColorPickerParticipant.js';
+import * as dom from '../../../../../base/browser/dom.js';
+import { InsertButton } from '../colorPickerParts/colorPickerInsertButton.js';
 
+class StandaloneColorPickerResult {
+	// The color picker result consists of: an array of color results and a boolean indicating if the color was found in the editor
 	constructor(
-		private readonly _editor: ICodeEditor,
-		@IContextKeyService _contextKeyService: IContextKeyService,
-		@IModelService private readonly _modelService: IModelService,
-		@IKeybindingService private readonly _keybindingService: IKeybindingService,
-		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-		@ILanguageFeaturesService private readonly _languageFeatureService: ILanguageFeaturesService,
-		@ILanguageConfigurationService private readonly _languageConfigurationService: ILanguageConfigurationService
-	) {
-		super();
-		this._standaloneColorPickerVisible = EditorContextKeys.standaloneColorPickerVisible.bindTo(_contextKeyService);
-		this._standaloneColorPickerFocused = EditorContextKeys.standaloneColorPickerFocused.bindTo(_contextKeyService);
-	}
-
-	public showOrFocus() {
-		if (!this._editor.hasModel()) {
-			return;
-		}
-		if (!this._standaloneColorPickerVisible.get()) {
-			this._standaloneColorPickerWidget = new StandaloneColorPickerWidget(this._editor, this._standaloneColorPickerVisible, this._standaloneColorPickerFocused, this._instantiationService, this._modelService, this._keybindingService, this._languageFeatureService, this._languageConfigurationService);
-		} else if (!this._standaloneColorPickerFocused.get()) {
-			this._standaloneColorPickerWidget?.focus();
-		}
-	}
-
-	public hide() {
-		this._standaloneColorPickerFocused.set(false);
-		this._standaloneColorPickerVisible.set(false);
-		this._standaloneColorPickerWidget?.hide();
-		this._editor.focus();
-	}
-
-	public insertColor() {
-		this._standaloneColorPickerWidget?.updateEditor();
-		this.hide();
-	}
-
-	public static get(editor: ICodeEditor) {
-		return editor.getContribution<StandaloneColorPickerController>(StandaloneColorPickerController.ID);
-	}
+		public readonly value: StandaloneColorPickerHover,
+		public readonly foundInEditor: boolean
+	) { }
 }
 
-registerEditorContribution(StandaloneColorPickerController.ID, StandaloneColorPickerController, EditorContributionInstantiation.AfterFirstRender);
-
 const PADDING = 8;
 const CLOSE_BUTTON_WIDTH = 22;
 
@@ -102,10 +55,9 @@ export class StandaloneColorPickerWidget extends Disposable implements IContentW
 		private readonly _standaloneColorPickerVisible: IContextKey<boolean>,
 		private readonly _standaloneColorPickerFocused: IContextKey<boolean>,
 		@IInstantiationService _instantiationService: IInstantiationService,
-		@IModelService private readonly _modelService: IModelService,
 		@IKeybindingService private readonly _keybindingService: IKeybindingService,
 		@ILanguageFeaturesService private readonly _languageFeaturesService: ILanguageFeaturesService,
-		@ILanguageConfigurationService private readonly _languageConfigurationService: ILanguageConfigurationService
+		@IEditorWorkerService private readonly _editorWorkerService: IEditorWorkerService,
 	) {
 		super();
 		this._standaloneColorPickerVisible.set(true);
@@ -205,7 +157,7 @@ export class StandaloneColorPickerWidget extends Disposable implements IContentW
 			range: range,
 			color: { red: 0, green: 0, blue: 0, alpha: 1 }
 		};
-		const colorHoverResult: { colorHover: StandaloneColorPickerHover; foundInEditor: boolean } | null = await this._standaloneColorPickerParticipant.createColorHover(colorInfo, new DefaultDocumentColorProvider(this._modelService, this._languageConfigurationService), this._languageFeaturesService.colorProvider);
+		const colorHoverResult: { colorHover: StandaloneColorPickerHover; foundInEditor: boolean } | null = await this._standaloneColorPickerParticipant.createColorHover(colorInfo, new DefaultDocumentColorProvider(this._editorWorkerService), this._languageFeaturesService.colorProvider);
 		if (!colorHoverResult) {
 			return null;
 		}
@@ -224,11 +176,12 @@ export class StandaloneColorPickerWidget extends Disposable implements IContentW
 		};
 
 		this._colorHover = colorHover;
-		const { disposables, colorPicker } = this._standaloneColorPickerParticipant.renderHoverParts(context, [colorHover]);
-		this._register(disposables);
-		if (colorPicker === undefined) {
+		const renderedHoverPart = this._standaloneColorPickerParticipant.renderHoverParts(context, [colorHover]);
+		if (!renderedHoverPart) {
 			return;
 		}
+		this._register(renderedHoverPart.disposables);
+		const colorPicker = renderedHoverPart.colorPicker;
 		this._body.classList.add('standalone-colorpicker-body');
 		this._body.style.maxHeight = Math.max(this._editor.getLayoutInfo().height / 4, 250) + 'px';
 		this._body.style.maxWidth = Math.max(this._editor.getLayoutInfo().width * 0.66, 500) + 'px';
@@ -264,11 +217,3 @@ export class StandaloneColorPickerWidget extends Disposable implements IContentW
 		this._editor.layoutContentWidget(this);
 	}
 }
-
-class StandaloneColorPickerResult {
-	// The color picker result consists of: an array of color results and a boolean indicating if the color was found in the editor
-	constructor(
-		public readonly value: StandaloneColorPickerHover,
-		public readonly foundInEditor: boolean
-	) { }
-}
diff --git a/src/vs/editor/contrib/comment/browser/blockCommentCommand.ts b/src/vs/editor/contrib/comment/browser/blockCommentCommand.ts
index fdf01f17058..79c543e14f6 100644
--- a/src/vs/editor/contrib/comment/browser/blockCommentCommand.ts
+++ b/src/vs/editor/contrib/comment/browser/blockCommentCommand.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
-import { EditOperation, ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ICommand, ICursorStateComputerData, IEditOperationBuilder } from 'vs/editor/common/editorCommon';
-import { ITextModel } from 'vs/editor/common/model';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
+import { CharCode } from '../../../../base/common/charCode.js';
+import { EditOperation, ISingleEditOperation } from '../../../common/core/editOperation.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { Selection } from '../../../common/core/selection.js';
+import { ICommand, ICursorStateComputerData, IEditOperationBuilder } from '../../../common/editorCommon.js';
+import { ITextModel } from '../../../common/model.js';
+import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
 
 export class BlockCommentCommand implements ICommand {
 
diff --git a/src/vs/editor/contrib/comment/browser/comment.ts b/src/vs/editor/contrib/comment/browser/comment.ts
index 2a2a4c28360..eafaa331b00 100644
--- a/src/vs/editor/contrib/comment/browser/comment.ts
+++ b/src/vs/editor/contrib/comment/browser/comment.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, IActionOptions, registerEditorAction, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Range } from 'vs/editor/common/core/range';
-import { ICommand } from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { BlockCommentCommand } from 'vs/editor/contrib/comment/browser/blockCommentCommand';
-import { LineCommentCommand, Type } from 'vs/editor/contrib/comment/browser/lineCommentCommand';
-import * as nls from 'vs/nls';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeyChord, KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorAction, IActionOptions, registerEditorAction, ServicesAccessor } from '../../../browser/editorExtensions.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { Range } from '../../../common/core/range.js';
+import { ICommand } from '../../../common/editorCommon.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import { BlockCommentCommand } from './blockCommentCommand.js';
+import { LineCommentCommand, Type } from './lineCommentCommand.js';
+import * as nls from '../../../../nls.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 
 abstract class CommentLineAction extends EditorAction {
 
diff --git a/src/vs/editor/contrib/comment/browser/lineCommentCommand.ts b/src/vs/editor/contrib/comment/browser/lineCommentCommand.ts
index a5e19fd79e1..53875399585 100644
--- a/src/vs/editor/contrib/comment/browser/lineCommentCommand.ts
+++ b/src/vs/editor/contrib/comment/browser/lineCommentCommand.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
-import * as strings from 'vs/base/common/strings';
-import { Constants } from 'vs/base/common/uint';
-import { EditOperation, ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ICommand, ICursorStateComputerData, IEditOperationBuilder } from 'vs/editor/common/editorCommon';
-import { ITextModel } from 'vs/editor/common/model';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { BlockCommentCommand } from 'vs/editor/contrib/comment/browser/blockCommentCommand';
+import { CharCode } from '../../../../base/common/charCode.js';
+import * as strings from '../../../../base/common/strings.js';
+import { Constants } from '../../../../base/common/uint.js';
+import { EditOperation, ISingleEditOperation } from '../../../common/core/editOperation.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { Selection } from '../../../common/core/selection.js';
+import { ICommand, ICursorStateComputerData, IEditOperationBuilder } from '../../../common/editorCommon.js';
+import { ITextModel } from '../../../common/model.js';
+import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import { BlockCommentCommand } from './blockCommentCommand.js';
 
 export interface IInsertionPoint {
 	ignore: boolean;
diff --git a/src/vs/editor/contrib/comment/test/browser/blockCommentCommand.test.ts b/src/vs/editor/contrib/comment/test/browser/blockCommentCommand.test.ts
index 1888af3a963..2b5e6eeff3d 100644
--- a/src/vs/editor/contrib/comment/test/browser/blockCommentCommand.test.ts
+++ b/src/vs/editor/contrib/comment/test/browser/blockCommentCommand.test.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ICommand } from 'vs/editor/common/editorCommon';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { BlockCommentCommand } from 'vs/editor/contrib/comment/browser/blockCommentCommand';
-import { testCommand } from 'vs/editor/test/browser/testCommand';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Selection } from '../../../../common/core/selection.js';
+import { ICommand } from '../../../../common/editorCommon.js';
+import { ILanguageService } from '../../../../common/languages/language.js';
+import { ILanguageConfigurationService } from '../../../../common/languages/languageConfigurationRegistry.js';
+import { BlockCommentCommand } from '../../browser/blockCommentCommand.js';
+import { testCommand } from '../../../../test/browser/testCommand.js';
+import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
 
 function _testCommentCommand(lines: string[], selection: Selection, commandFactory: (accessor: ServicesAccessor, selection: Selection) => ICommand, expectedLines: string[], expectedSelection: Selection): void {
 	const languageId = 'commentMode';
diff --git a/src/vs/editor/contrib/comment/test/browser/lineCommentCommand.test.ts b/src/vs/editor/contrib/comment/test/browser/lineCommentCommand.test.ts
index f40f7b1e252..e738c1d865d 100644
--- a/src/vs/editor/contrib/comment/test/browser/lineCommentCommand.test.ts
+++ b/src/vs/editor/contrib/comment/test/browser/lineCommentCommand.test.ts
@@ -4,20 +4,20 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ICommand } from 'vs/editor/common/editorCommon';
-import { ColorId, MetadataConsts } from 'vs/editor/common/encodedTokenAttributes';
-import { EncodedTokenizationResult, IState, TokenizationRegistry } from 'vs/editor/common/languages';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { CommentRule } from 'vs/editor/common/languages/languageConfiguration';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { NullState } from 'vs/editor/common/languages/nullTokenize';
-import { ILinePreflightData, IPreflightData, ISimpleModel, LineCommentCommand, Type } from 'vs/editor/contrib/comment/browser/lineCommentCommand';
-import { testCommand } from 'vs/editor/test/browser/testCommand';
-import { TestLanguageConfigurationService } from 'vs/editor/test/common/modes/testLanguageConfigurationService';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Selection } from '../../../../common/core/selection.js';
+import { ICommand } from '../../../../common/editorCommon.js';
+import { ColorId, MetadataConsts } from '../../../../common/encodedTokenAttributes.js';
+import { EncodedTokenizationResult, IState, TokenizationRegistry } from '../../../../common/languages.js';
+import { ILanguageService } from '../../../../common/languages/language.js';
+import { CommentRule } from '../../../../common/languages/languageConfiguration.js';
+import { ILanguageConfigurationService } from '../../../../common/languages/languageConfigurationRegistry.js';
+import { NullState } from '../../../../common/languages/nullTokenize.js';
+import { ILinePreflightData, IPreflightData, ISimpleModel, LineCommentCommand, Type } from '../../browser/lineCommentCommand.js';
+import { testCommand } from '../../../../test/browser/testCommand.js';
+import { TestLanguageConfigurationService } from '../../../../test/common/modes/testLanguageConfigurationService.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
 
 function createTestCommandHelper(commentsConfig: CommentRule, commandFactory: (accessor: ServicesAccessor, selection: Selection) => ICommand): (lines: string[], selection: Selection, expectedLines: string[], expectedSelection: Selection) => void {
 	return (lines: string[], selection: Selection, expectedLines: string[], expectedSelection: Selection) => {
diff --git a/src/vs/editor/contrib/contextmenu/browser/contextmenu.ts b/src/vs/editor/contrib/contextmenu/browser/contextmenu.ts
index 95609201da3..74a6f26192e 100644
--- a/src/vs/editor/contrib/contextmenu/browser/contextmenu.ts
+++ b/src/vs/editor/contrib/contextmenu/browser/contextmenu.ts
@@ -3,30 +3,30 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { IMouseEvent, IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
-import { ActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { IAnchor } from 'vs/base/browser/ui/contextview/contextview';
-import { IAction, Separator, SubmenuAction } from 'vs/base/common/actions';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { ResolvedKeybinding } from 'vs/base/common/keybindings';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { isIOS } from 'vs/base/common/platform';
-import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, EditorContributionInstantiation, registerEditorAction, registerEditorContribution, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { IEditorContribution, ScrollType } from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { ITextModel } from 'vs/editor/common/model';
-import * as nls from 'vs/nls';
-import { IMenuService, MenuId, SubmenuItemAction } from 'vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IWorkspaceContextService, isStandaloneEditorWorkspace } from 'vs/platform/workspace/common/workspace';
+import * as dom from '../../../../base/browser/dom.js';
+import { IKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { IMouseEvent, IMouseWheelEvent } from '../../../../base/browser/mouseEvent.js';
+import { ActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { IAnchor } from '../../../../base/browser/ui/contextview/contextview.js';
+import { IAction, Separator, SubmenuAction } from '../../../../base/common/actions.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { ResolvedKeybinding } from '../../../../base/common/keybindings.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { isIOS } from '../../../../base/common/platform.js';
+import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from '../../../browser/editorBrowser.js';
+import { EditorAction, EditorContributionInstantiation, registerEditorAction, registerEditorContribution, ServicesAccessor } from '../../../browser/editorExtensions.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { IEditorContribution, ScrollType } from '../../../common/editorCommon.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { ITextModel } from '../../../common/model.js';
+import * as nls from '../../../../nls.js';
+import { IMenuService, MenuId, SubmenuItemAction } from '../../../../platform/actions/common/actions.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService, IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IWorkspaceContextService, isStandaloneEditorWorkspace } from '../../../../platform/workspace/common/workspace.js';
 
 export class ContextMenuController implements IEditorContribution {
 
@@ -160,9 +160,7 @@ export class ContextMenuController implements IEditorContribution {
 		const result: IAction[] = [];
 
 		// get menu groups
-		const menu = this._menuService.createMenu(menuId, this._contextKeyService);
-		const groups = menu.getActions({ arg: model.uri });
-		menu.dispose();
+		const groups = this._menuService.getMenuActions(menuId, this._contextKeyService, { arg: model.uri });
 
 		// translate them into other actions
 		for (const group of groups) {
@@ -227,7 +225,7 @@ export class ContextMenuController implements IEditorContribution {
 		// Show menu
 		this._contextMenuIsBeingShownCount++;
 		this._contextMenuService.showContextMenu({
-			domForShadowRoot: useShadowDOM ? this._editor.getDomNode() : undefined,
+			domForShadowRoot: useShadowDOM ? this._editor.getOverflowWidgetsDomNode() ?? this._editor.getDomNode() : undefined,
 
 			getAnchor: () => anchor,
 
diff --git a/src/vs/editor/contrib/cursorUndo/browser/cursorUndo.ts b/src/vs/editor/contrib/cursorUndo/browser/cursorUndo.ts
index bd4c56bc1b1..09146e0410f 100644
--- a/src/vs/editor/contrib/cursorUndo/browser/cursorUndo.ts
+++ b/src/vs/editor/contrib/cursorUndo/browser/cursorUndo.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, EditorContributionInstantiation, registerEditorAction, registerEditorContribution, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { Selection } from 'vs/editor/common/core/selection';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import * as nls from 'vs/nls';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorAction, EditorContributionInstantiation, registerEditorAction, registerEditorContribution, ServicesAccessor } from '../../../browser/editorExtensions.js';
+import { Selection } from '../../../common/core/selection.js';
+import { IEditorContribution } from '../../../common/editorCommon.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import * as nls from '../../../../nls.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 
 class CursorState {
 	readonly selections: readonly Selection[];
diff --git a/src/vs/editor/contrib/cursorUndo/test/browser/cursorUndo.test.ts b/src/vs/editor/contrib/cursorUndo/test/browser/cursorUndo.test.ts
index d0e3423a47b..786fccbad25 100644
--- a/src/vs/editor/contrib/cursorUndo/test/browser/cursorUndo.test.ts
+++ b/src/vs/editor/contrib/cursorUndo/test/browser/cursorUndo.test.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { CoreEditingCommands, CoreNavigationCommands } from 'vs/editor/browser/coreCommands';
-import { Selection } from 'vs/editor/common/core/selection';
-import { Handler } from 'vs/editor/common/editorCommon';
-import { CursorUndo, CursorUndoRedoController } from 'vs/editor/contrib/cursorUndo/browser/cursorUndo';
-import { withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { CoreEditingCommands, CoreNavigationCommands } from '../../../../browser/coreCommands.js';
+import { Selection } from '../../../../common/core/selection.js';
+import { Handler } from '../../../../common/editorCommon.js';
+import { CursorUndo, CursorUndoRedoController } from '../../browser/cursorUndo.js';
+import { withTestCodeEditor } from '../../../../test/browser/testCodeEditor.js';
 
 suite('FindController', () => {
 
diff --git a/src/vs/editor/contrib/diffEditorBreadcrumbs/browser/contribution.ts b/src/vs/editor/contrib/diffEditorBreadcrumbs/browser/contribution.ts
index 2a99c7ff329..0eb179dc3b0 100644
--- a/src/vs/editor/contrib/diffEditorBreadcrumbs/browser/contribution.ts
+++ b/src/vs/editor/contrib/diffEditorBreadcrumbs/browser/contribution.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { reverseOrder, compareBy, numberComparator } from 'vs/base/common/arrays';
-import { observableValue, observableSignalFromEvent, autorunWithStore, IReader } from 'vs/base/common/observable';
-import { HideUnchangedRegionsFeature, IDiffEditorBreadcrumbsSource } from 'vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature';
-import { DisposableCancellationTokenSource } from 'vs/editor/browser/widget/diffEditor/utils';
-import { LineRange } from 'vs/editor/common/core/lineRange';
-import { ITextModel } from 'vs/editor/common/model';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { IOutlineModelService, OutlineModel } from 'vs/editor/contrib/documentSymbols/browser/outlineModel';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Event } from 'vs/base/common/event';
-import { SymbolKind } from 'vs/editor/common/languages';
+import { reverseOrder, compareBy, numberComparator } from '../../../../base/common/arrays.js';
+import { observableValue, observableSignalFromEvent, autorunWithStore, IReader } from '../../../../base/common/observable.js';
+import { HideUnchangedRegionsFeature, IDiffEditorBreadcrumbsSource } from '../../../browser/widget/diffEditor/features/hideUnchangedRegionsFeature.js';
+import { DisposableCancellationTokenSource } from '../../../browser/widget/diffEditor/utils.js';
+import { LineRange } from '../../../common/core/lineRange.js';
+import { ITextModel } from '../../../common/model.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { IOutlineModelService, OutlineModel } from '../../documentSymbols/browser/outlineModel.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Event } from '../../../../base/common/event.js';
+import { SymbolKind } from '../../../common/languages.js';
 
 class DiffEditorBreadcrumbsSource extends Disposable implements IDiffEditorBreadcrumbsSource {
 	private readonly _currentModel = observableValue<OutlineModel | undefined>(this, undefined);
diff --git a/src/vs/editor/contrib/dnd/browser/dnd.ts b/src/vs/editor/contrib/dnd/browser/dnd.ts
index 9e355410d48..8ca7e29f781 100644
--- a/src/vs/editor/contrib/dnd/browser/dnd.ts
+++ b/src/vs/editor/contrib/dnd/browser/dnd.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { IMouseEvent } from 'vs/base/browser/mouseEvent';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { isMacintosh } from 'vs/base/common/platform';
-import 'vs/css!./dnd';
-import { ICodeEditor, IEditorMouseEvent, IMouseTarget, IPartialEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
-import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { CursorChangeReason } from 'vs/editor/common/cursorEvents';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { IEditorContribution, IEditorDecorationsCollection, ScrollType } from 'vs/editor/common/editorCommon';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { DragAndDropCommand } from 'vs/editor/contrib/dnd/browser/dragAndDropCommand';
+import { IKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { IMouseEvent } from '../../../../base/browser/mouseEvent.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { isMacintosh } from '../../../../base/common/platform.js';
+import './dnd.css';
+import { ICodeEditor, IEditorMouseEvent, IMouseTarget, IPartialEditorMouseEvent, MouseTargetType } from '../../../browser/editorBrowser.js';
+import { EditorContributionInstantiation, registerEditorContribution } from '../../../browser/editorExtensions.js';
+import { CodeEditorWidget } from '../../../browser/widget/codeEditor/codeEditorWidget.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { CursorChangeReason } from '../../../common/cursorEvents.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { Selection } from '../../../common/core/selection.js';
+import { IEditorContribution, IEditorDecorationsCollection, ScrollType } from '../../../common/editorCommon.js';
+import { ModelDecorationOptions } from '../../../common/model/textModel.js';
+import { DragAndDropCommand } from './dragAndDropCommand.js';
 
 function hasTriggerModifier(e: IKeyboardEvent | IMouseEvent): boolean {
 	if (isMacintosh) {
diff --git a/src/vs/editor/contrib/dnd/browser/dragAndDropCommand.ts b/src/vs/editor/contrib/dnd/browser/dragAndDropCommand.ts
index 28043b18462..7dd03062c6f 100644
--- a/src/vs/editor/contrib/dnd/browser/dragAndDropCommand.ts
+++ b/src/vs/editor/contrib/dnd/browser/dragAndDropCommand.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ICommand, ICursorStateComputerData, IEditOperationBuilder } from 'vs/editor/common/editorCommon';
-import { ITextModel } from 'vs/editor/common/model';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { Selection } from '../../../common/core/selection.js';
+import { ICommand, ICursorStateComputerData, IEditOperationBuilder } from '../../../common/editorCommon.js';
+import { ITextModel } from '../../../common/model.js';
 
 
 export class DragAndDropCommand implements ICommand {
diff --git a/src/vs/editor/contrib/documentSymbols/browser/documentSymbols.ts b/src/vs/editor/contrib/documentSymbols/browser/documentSymbols.ts
index cda0a4df066..949af74822a 100644
--- a/src/vs/editor/contrib/documentSymbols/browser/documentSymbols.ts
+++ b/src/vs/editor/contrib/documentSymbols/browser/documentSymbols.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { assertType } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { IOutlineModelService } from 'vs/editor/contrib/documentSymbols/browser/outlineModel';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { assertType } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ITextModelService } from '../../../common/services/resolverService.js';
+import { IOutlineModelService } from './outlineModel.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
 
 CommandsRegistry.registerCommand('_executeDocumentSymbolProvider', async function (accessor, ...args) {
 	const [resource] = args;
diff --git a/src/vs/editor/contrib/documentSymbols/browser/outlineModel.ts b/src/vs/editor/contrib/documentSymbols/browser/outlineModel.ts
index e7f72b1a2a0..dfe95eccddd 100644
--- a/src/vs/editor/contrib/documentSymbols/browser/outlineModel.ts
+++ b/src/vs/editor/contrib/documentSymbols/browser/outlineModel.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { binarySearch, coalesceInPlace, equals } from 'vs/base/common/arrays';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { onUnexpectedExternalError } from 'vs/base/common/errors';
-import { Iterable } from 'vs/base/common/iterator';
-import { LRUCache } from 'vs/base/common/map';
-import { commonPrefixLength } from 'vs/base/common/strings';
-import { URI } from 'vs/base/common/uri';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { ITextModel } from 'vs/editor/common/model';
-import { DocumentSymbol, DocumentSymbolProvider } from 'vs/editor/common/languages';
-import { MarkerSeverity } from 'vs/platform/markers/common/markers';
-import { IFeatureDebounceInformation, ILanguageFeatureDebounceService } from 'vs/editor/common/services/languageFeatureDebounce';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IModelService } from 'vs/editor/common/services/model';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
+import { binarySearch, coalesceInPlace, equals } from '../../../../base/common/arrays.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { onUnexpectedExternalError } from '../../../../base/common/errors.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { LRUCache } from '../../../../base/common/map.js';
+import { commonPrefixLength } from '../../../../base/common/strings.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IPosition, Position } from '../../../common/core/position.js';
+import { IRange, Range } from '../../../common/core/range.js';
+import { ITextModel } from '../../../common/model.js';
+import { DocumentSymbol, DocumentSymbolProvider } from '../../../common/languages.js';
+import { MarkerSeverity } from '../../../../platform/markers/common/markers.js';
+import { IFeatureDebounceInformation, ILanguageFeatureDebounceService } from '../../../common/services/languageFeatureDebounce.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IModelService } from '../../../common/services/model.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { LanguageFeatureRegistry } from '../../../common/languageFeatureRegistry.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 
 export abstract class TreeElement {
 
diff --git a/src/vs/editor/contrib/documentSymbols/test/browser/outlineModel.test.ts b/src/vs/editor/contrib/documentSymbols/test/browser/outlineModel.test.ts
index 185d30db3e6..a59d3a904dc 100644
--- a/src/vs/editor/contrib/documentSymbols/test/browser/outlineModel.test.ts
+++ b/src/vs/editor/contrib/documentSymbols/test/browser/outlineModel.test.ts
@@ -4,21 +4,21 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { Range } from 'vs/editor/common/core/range';
-import { DocumentSymbol, SymbolKind } from 'vs/editor/common/languages';
-import { LanguageFeatureDebounceService } from 'vs/editor/common/services/languageFeatureDebounce';
-import { LanguageFeaturesService } from 'vs/editor/common/services/languageFeaturesService';
-import { IModelService } from 'vs/editor/common/services/model';
-import { createModelServices, createTextModel } from 'vs/editor/test/common/testTextModel';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { IMarker, MarkerSeverity } from 'vs/platform/markers/common/markers';
-import { OutlineElement, OutlineGroup, OutlineModel, OutlineModelService } from '../../browser/outlineModel';
-import { mock } from 'vs/base/test/common/mock';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { CancellationToken, CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { Range } from '../../../../common/core/range.js';
+import { DocumentSymbol, SymbolKind } from '../../../../common/languages.js';
+import { LanguageFeatureDebounceService } from '../../../../common/services/languageFeatureDebounce.js';
+import { LanguageFeaturesService } from '../../../../common/services/languageFeaturesService.js';
+import { IModelService } from '../../../../common/services/model.js';
+import { createModelServices, createTextModel } from '../../../../test/common/testTextModel.js';
+import { NullLogService } from '../../../../../platform/log/common/log.js';
+import { IMarker, MarkerSeverity } from '../../../../../platform/markers/common/markers.js';
+import { OutlineElement, OutlineGroup, OutlineModel, OutlineModelService } from '../../browser/outlineModel.js';
+import { mock } from '../../../../../base/test/common/mock.js';
+import { IEnvironmentService } from '../../../../../platform/environment/common/environment.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('OutlineModel', function () {
 
diff --git a/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteContribution.ts b/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteContribution.ts
index 20ed163b4b2..f4f13d510a8 100644
--- a/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteContribution.ts
+++ b/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteContribution.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { HierarchicalKind } from 'vs/base/common/hierarchicalKind';
-import { IJSONSchema, SchemaToType } from 'vs/base/common/jsonSchema';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, EditorCommand, EditorContributionInstantiation, ServicesAccessor, registerEditorAction, registerEditorCommand, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { registerEditorFeature } from 'vs/editor/common/editorFeatures';
-import { CopyPasteController, changePasteTypeCommandId, pasteWidgetVisibleCtx } from 'vs/editor/contrib/dropOrPasteInto/browser/copyPasteController';
-import { DefaultPasteProvidersFeature, DefaultTextPasteOrDropEditProvider } from 'vs/editor/contrib/dropOrPasteInto/browser/defaultProviders';
-import * as nls from 'vs/nls';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
+import { IJSONSchema, SchemaToType } from '../../../../base/common/jsonSchema.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorAction, EditorCommand, EditorContributionInstantiation, ServicesAccessor, registerEditorAction, registerEditorCommand, registerEditorContribution } from '../../../browser/editorExtensions.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { registerEditorFeature } from '../../../common/editorFeatures.js';
+import { CopyPasteController, changePasteTypeCommandId, pasteWidgetVisibleCtx } from './copyPasteController.js';
+import { DefaultPasteProvidersFeature, DefaultTextPasteOrDropEditProvider } from './defaultProviders.js';
+import * as nls from '../../../../nls.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 
 registerEditorContribution(CopyPasteController.ID, CopyPasteController, EditorContributionInstantiation.Eager); // eager because it listens to events on the container dom node of the editor
 registerEditorFeature(DefaultPasteProvidersFeature);
diff --git a/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.ts b/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.ts
index 87cddb00a8d..5f10ec82e0c 100644
--- a/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.ts
+++ b/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.ts
@@ -3,39 +3,40 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { addDisposableListener, getActiveDocument } from 'vs/base/browser/dom';
-import { coalesce } from 'vs/base/common/arrays';
-import { CancelablePromise, createCancelablePromise, raceCancellation } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { UriList, VSDataTransfer, createStringDataTransferItem, matchesMimeType } from 'vs/base/common/dataTransfer';
-import { HierarchicalKind } from 'vs/base/common/hierarchicalKind';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Mimes } from 'vs/base/common/mime';
-import * as platform from 'vs/base/common/platform';
-import { generateUuid } from 'vs/base/common/uuid';
-import { ClipboardEventUtils } from 'vs/editor/browser/controller/textAreaInput';
-import { toExternalVSDataTransfer, toVSDataTransfer } from 'vs/editor/browser/dnd';
-import { ICodeEditor, PastePayload } from 'vs/editor/browser/editorBrowser';
-import { IBulkEditService } from 'vs/editor/browser/services/bulkEditService';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { Handler, IEditorContribution } from 'vs/editor/common/editorCommon';
-import { DocumentPasteContext, DocumentPasteEdit, DocumentPasteEditProvider, DocumentPasteTriggerKind } from 'vs/editor/common/languages';
-import { ITextModel } from 'vs/editor/common/model';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { DefaultTextPasteOrDropEditProvider } from 'vs/editor/contrib/dropOrPasteInto/browser/defaultProviders';
-import { createCombinedWorkspaceEdit, sortEditsByYieldTo } from 'vs/editor/contrib/dropOrPasteInto/browser/edit';
-import { CodeEditorStateFlag, EditorStateCancellationTokenSource } from 'vs/editor/contrib/editorState/browser/editorState';
-import { InlineProgressManager } from 'vs/editor/contrib/inlineProgress/browser/inlineProgress';
-import { MessageController } from 'vs/editor/contrib/message/browser/messageController';
-import { localize } from 'vs/nls';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
-import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { PostEditWidgetManager } from './postEditWidget';
+import { addDisposableListener, getActiveDocument } from '../../../../base/browser/dom.js';
+import { coalesce } from '../../../../base/common/arrays.js';
+import { CancelablePromise, createCancelablePromise, DeferredPromise, raceCancellation } from '../../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { UriList, VSDataTransfer, createStringDataTransferItem, matchesMimeType } from '../../../../base/common/dataTransfer.js';
+import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { Mimes } from '../../../../base/common/mime.js';
+import * as platform from '../../../../base/common/platform.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { toExternalVSDataTransfer, toVSDataTransfer } from '../../../browser/dnd.js';
+import { ICodeEditor, PastePayload } from '../../../browser/editorBrowser.js';
+import { IBulkEditService } from '../../../browser/services/bulkEditService.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { IRange, Range } from '../../../common/core/range.js';
+import { Selection } from '../../../common/core/selection.js';
+import { Handler, IEditorContribution } from '../../../common/editorCommon.js';
+import { DocumentPasteContext, DocumentPasteEdit, DocumentPasteEditProvider, DocumentPasteTriggerKind } from '../../../common/languages.js';
+import { ITextModel } from '../../../common/model.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { DefaultTextPasteOrDropEditProvider } from './defaultProviders.js';
+import { createCombinedWorkspaceEdit, sortEditsByYieldTo } from './edit.js';
+import { CodeEditorStateFlag, EditorStateCancellationTokenSource } from '../../editorState/browser/editorState.js';
+import { InlineProgressManager } from '../../inlineProgress/browser/inlineProgress.js';
+import { MessageController } from '../../message/browser/messageController.js';
+import { localize } from '../../../../nls.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IProgressService, ProgressLocation } from '../../../../platform/progress/common/progress.js';
+import { IQuickInputService, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
+import { PostEditWidgetManager } from './postEditWidget.js';
+import { CancellationError, isCancellationError } from '../../../../base/common/errors.js';
+import { ClipboardEventUtils } from '../../../browser/controller/editContext/textArea/textAreaEditContextInput.js';
 
 export const changePasteTypeCommandId = 'editor.changePasteType';
 
@@ -54,6 +55,12 @@ type PasteEditWithProvider = DocumentPasteEdit & {
 	provider: DocumentPasteEditProvider;
 };
 
+
+interface DocumentPasteWithProviderEditsSession {
+	edits: readonly PasteEditWithProvider[];
+	dispose(): void;
+}
+
 type PastePreference =
 	| HierarchicalKind
 	| { providerId: string };
@@ -128,8 +135,7 @@ export class CopyPasteController extends Disposable implements IEditorContributi
 	}
 
 	private isPasteAsEnabled(): boolean {
-		return this._editor.getOption(EditorOption.pasteAs).enabled
-			&& !this._editor.getOption(EditorOption.readOnly);
+		return this._editor.getOption(EditorOption.pasteAs).enabled;
 	}
 
 	public async finishedPaste(): Promise<void> {
@@ -141,12 +147,10 @@ export class CopyPasteController extends Disposable implements IEditorContributi
 			return;
 		}
 
-		if (platform.isWeb) {
-			// Explicitly clear the web resources clipboard.
-			// This is needed because on web, the browser clipboard is faked out using an in-memory store.
-			// This means the resources clipboard is not properly updated when copying from the editor.
-			this._clipboardService.writeResources([]);
-		}
+		// Explicitly clear the clipboard internal state.
+		// This is needed because on web, the browser clipboard is faked out using an in-memory store.
+		// This means the resources clipboard is not properly updated when copying from the editor.
+		this._clipboardService.clearInternalState?.();
 
 		if (!e.clipboardData || !this.isPasteAsEnabled()) {
 			return;
@@ -241,8 +245,8 @@ export class CopyPasteController extends Disposable implements IEditorContributi
 		}
 
 		if (
-			!this.isPasteAsEnabled()
-			&& !this._pasteAsActionContext // Still enable if paste as was explicitly requested
+			this._editor.getOption(EditorOption.readOnly) // Never enabled if editor is readonly.
+			|| (!this.isPasteAsEnabled() && !this._pasteAsActionContext) // Or feature disabled (but still enable if paste was explicitly requested)
 		) {
 			return;
 		}
@@ -251,8 +255,11 @@ export class CopyPasteController extends Disposable implements IEditorContributi
 		const dataTransfer = toExternalVSDataTransfer(e.clipboardData);
 		dataTransfer.delete(vscodeClipboardMime);
 
+		const fileTypes = Array.from(e.clipboardData.files).map(file => file.type);
+
 		const allPotentialMimeTypes = [
 			...e.clipboardData.types,
+			...fileTypes,
 			...metadata?.providerCopyMimeTypes ?? [],
 			// TODO: always adds `uri-list` because this get set if there are resources in the system clipboard.
 			// However we can only check the system clipboard async. For this early check, just add it in.
@@ -299,17 +306,28 @@ export class CopyPasteController extends Disposable implements IEditorContributi
 	}
 
 	private doPasteInline(allProviders: readonly DocumentPasteEditProvider[], selections: readonly Selection[], dataTransfer: VSDataTransfer, metadata: CopyMetadata | undefined, clipboardEvent: ClipboardEvent): void {
-		const p = createCancelablePromise(async (token) => {
+		const editor = this._editor;
+		if (!editor.hasModel()) {
+			return;
+		}
+
+		const editorStateCts = new EditorStateCancellationTokenSource(editor, CodeEditorStateFlag.Value | CodeEditorStateFlag.Selection, undefined);
+
+		const p = createCancelablePromise(async (pToken) => {
 			const editor = this._editor;
 			if (!editor.hasModel()) {
 				return;
 			}
 			const model = editor.getModel();
 
-			const tokenSource = new EditorStateCancellationTokenSource(editor, CodeEditorStateFlag.Value | CodeEditorStateFlag.Selection, undefined, token);
+			const disposables = new DisposableStore();
+			const cts = disposables.add(new CancellationTokenSource(pToken));
+			disposables.add(editorStateCts.token.onCancellationRequested(() => cts.cancel()));
+
+			const token = cts.token;
 			try {
-				await this.mergeInDataFromCopy(dataTransfer, metadata, tokenSource.token);
-				if (tokenSource.token.isCancellationRequested) {
+				await this.mergeInDataFromCopy(dataTransfer, metadata, token);
+				if (token.isCancellationRequested) {
 					return;
 				}
 
@@ -317,43 +335,75 @@ export class CopyPasteController extends Disposable implements IEditorContributi
 				if (!supportedProviders.length
 					|| (supportedProviders.length === 1 && supportedProviders[0] instanceof DefaultTextPasteOrDropEditProvider) // Only our default text provider is active
 				) {
-					return this.applyDefaultPasteHandler(dataTransfer, metadata, tokenSource.token, clipboardEvent);
+					return this.applyDefaultPasteHandler(dataTransfer, metadata, token, clipboardEvent);
 				}
 
 				const context: DocumentPasteContext = {
 					triggerKind: DocumentPasteTriggerKind.Automatic,
 				};
-				const providerEdits = await this.getPasteEdits(supportedProviders, dataTransfer, model, selections, context, tokenSource.token);
-				if (tokenSource.token.isCancellationRequested) {
+				const editSession = await this.getPasteEdits(supportedProviders, dataTransfer, model, selections, context, token);
+				disposables.add(editSession);
+				if (token.isCancellationRequested) {
 					return;
 				}
 
 				// If the only edit returned is our default text edit, use the default paste handler
-				if (providerEdits.length === 1 && providerEdits[0].provider instanceof DefaultTextPasteOrDropEditProvider) {
-					return this.applyDefaultPasteHandler(dataTransfer, metadata, tokenSource.token, clipboardEvent);
+				if (editSession.edits.length === 1 && editSession.edits[0].provider instanceof DefaultTextPasteOrDropEditProvider) {
+					return this.applyDefaultPasteHandler(dataTransfer, metadata, token, clipboardEvent);
 				}
 
-				if (providerEdits.length) {
+				if (editSession.edits.length) {
 					const canShowWidget = editor.getOption(EditorOption.pasteAs).showPasteSelector === 'afterPaste';
-					return this._postPasteWidgetManager.applyEditAndShowIfNeeded(selections, { activeEditIndex: 0, allEdits: providerEdits }, canShowWidget, async (edit, token) => {
-						const resolved = await edit.provider.resolveDocumentPasteEdit?.(edit, token);
-						if (resolved) {
-							edit.additionalEdit = resolved.additionalEdit;
-						}
-						return edit;
-					}, tokenSource.token);
+					return this._postPasteWidgetManager.applyEditAndShowIfNeeded(selections, { activeEditIndex: 0, allEdits: editSession.edits }, canShowWidget, (edit, token) => {
+						return new Promise<PasteEditWithProvider>((resolve, reject) => {
+							(async () => {
+								try {
+									const resolveP = edit.provider.resolveDocumentPasteEdit?.(edit, token);
+									const showP = new DeferredPromise<void>();
+									const resolved = resolveP && await this._pasteProgressManager.showWhile(selections[0].getEndPosition(), localize('resolveProcess', "Resolving paste edit. Click to cancel"), Promise.race([showP.p, resolveP]), {
+										cancel: () => {
+											showP.cancel();
+											return reject(new CancellationError());
+										}
+									}, 0);
+									if (resolved) {
+										edit.additionalEdit = resolved.additionalEdit;
+									}
+									return resolve(edit);
+								} catch (err) {
+									return reject(err);
+								}
+							})();
+						});
+					}, token);
 				}
 
-				await this.applyDefaultPasteHandler(dataTransfer, metadata, tokenSource.token, clipboardEvent);
+				await this.applyDefaultPasteHandler(dataTransfer, metadata, token, clipboardEvent);
 			} finally {
-				tokenSource.dispose();
+				disposables.dispose();
 				if (this._currentPasteOperation === p) {
 					this._currentPasteOperation = undefined;
 				}
 			}
 		});
 
-		this._pasteProgressManager.showWhile(selections[0].getEndPosition(), localize('pasteIntoEditorProgress', "Running paste handlers. Click to cancel"), p);
+		this._pasteProgressManager.showWhile(selections[0].getEndPosition(), localize('pasteIntoEditorProgress', "Running paste handlers. Click to cancel and do basic paste"), p, {
+			cancel: async () => {
+				try {
+					p.cancel();
+
+					if (editorStateCts.token.isCancellationRequested) {
+						return;
+					}
+
+					await this.applyDefaultPasteHandler(dataTransfer, metadata, editorStateCts.token, clipboardEvent);
+				} finally {
+					editorStateCts.dispose();
+				}
+			}
+		}).then(() => {
+			editorStateCts.dispose();
+		});
 		this._currentPasteOperation = p;
 	}
 
@@ -365,7 +415,8 @@ export class CopyPasteController extends Disposable implements IEditorContributi
 			}
 			const model = editor.getModel();
 
-			const tokenSource = new EditorStateCancellationTokenSource(editor, CodeEditorStateFlag.Value | CodeEditorStateFlag.Selection, undefined, token);
+			const disposables = new DisposableStore();
+			const tokenSource = disposables.add(new EditorStateCancellationTokenSource(editor, CodeEditorStateFlag.Value | CodeEditorStateFlag.Selection, undefined, token));
 			try {
 				await this.mergeInDataFromCopy(dataTransfer, metadata, tokenSource.token);
 				if (tokenSource.token.isCancellationRequested) {
@@ -383,23 +434,26 @@ export class CopyPasteController extends Disposable implements IEditorContributi
 					triggerKind: DocumentPasteTriggerKind.PasteAs,
 					only: preference && preference instanceof HierarchicalKind ? preference : undefined,
 				};
-				let providerEdits = await this.getPasteEdits(supportedProviders, dataTransfer, model, selections, context, tokenSource.token);
+				let editSession = disposables.add(await this.getPasteEdits(supportedProviders, dataTransfer, model, selections, context, tokenSource.token));
 				if (tokenSource.token.isCancellationRequested) {
 					return;
 				}
 
 				// Filter out any edits that don't match the requested kind
 				if (preference) {
-					providerEdits = providerEdits.filter(edit => {
-						if (preference instanceof HierarchicalKind) {
-							return preference.contains(edit.kind);
-						} else {
-							return preference.providerId === edit.provider.id;
-						}
-					});
+					editSession = {
+						edits: editSession.edits.filter(edit => {
+							if (preference instanceof HierarchicalKind) {
+								return preference.contains(edit.kind);
+							} else {
+								return preference.providerId === edit.provider.id;
+							}
+						}),
+						dispose: editSession.dispose
+					};
 				}
 
-				if (!providerEdits.length) {
+				if (!editSession.edits.length) {
 					if (context.only) {
 						this.showPasteAsNoEditMessage(selections, context.only);
 					}
@@ -408,10 +462,10 @@ export class CopyPasteController extends Disposable implements IEditorContributi
 
 				let pickedEdit: DocumentPasteEdit | undefined;
 				if (preference) {
-					pickedEdit = providerEdits.at(0);
+					pickedEdit = editSession.edits.at(0);
 				} else {
 					const selected = await this._quickInputService.pick(
-						providerEdits.map((edit): IQuickPickItem & { edit: DocumentPasteEdit } => ({
+						editSession.edits.map((edit): IQuickPickItem & { edit: DocumentPasteEdit } => ({
 							label: edit.title,
 							description: edit.kind?.value,
 							edit,
@@ -428,7 +482,7 @@ export class CopyPasteController extends Disposable implements IEditorContributi
 				const combinedWorkspaceEdit = createCombinedWorkspaceEdit(model.uri, selections, pickedEdit);
 				await this._bulkEditService.apply(combinedWorkspaceEdit, { editor: this._editor });
 			} finally {
-				tokenSource.dispose();
+				disposables.dispose();
 				if (this._currentPasteOperation === p) {
 					this._currentPasteOperation = undefined;
 				}
@@ -499,23 +553,32 @@ export class CopyPasteController extends Disposable implements IEditorContributi
 		}
 	}
 
-	private async getPasteEdits(providers: readonly DocumentPasteEditProvider[], dataTransfer: VSDataTransfer, model: ITextModel, selections: readonly Selection[], context: DocumentPasteContext, token: CancellationToken): Promise<PasteEditWithProvider[]> {
+	private async getPasteEdits(providers: readonly DocumentPasteEditProvider[], dataTransfer: VSDataTransfer, model: ITextModel, selections: readonly Selection[], context: DocumentPasteContext, token: CancellationToken): Promise<DocumentPasteWithProviderEditsSession> {
+		const disposables = new DisposableStore();
+
 		const results = await raceCancellation(
 			Promise.all(providers.map(async provider => {
 				try {
 					const edits = await provider.provideDocumentPasteEdits?.(model, selections, dataTransfer, context, token);
-					// TODO: dispose of edits
+					if (edits) {
+						disposables.add(edits);
+					}
 					return edits?.edits?.map(edit => ({ ...edit, provider }));
 				} catch (err) {
-					console.error(err);
+					if (!isCancellationError(err)) {
+						console.error(err);
+					}
+					return undefined;
 				}
-				return undefined;
 			})),
 			token);
 		const edits = coalesce(results ?? []).flat().filter(edit => {
 			return !context.only || context.only.contains(edit.kind);
 		});
-		return sortEditsByYieldTo(edits);
+		return {
+			edits: sortEditsByYieldTo(edits),
+			dispose: () => disposables.dispose()
+		};
 	}
 
 	private async applyDefaultPasteHandler(dataTransfer: VSDataTransfer, metadata: CopyMetadata | undefined, token: CancellationToken, clipboardEvent: ClipboardEvent) {
diff --git a/src/vs/editor/contrib/dropOrPasteInto/browser/defaultProviders.ts b/src/vs/editor/contrib/dropOrPasteInto/browser/defaultProviders.ts
index 006713618a6..f3beb9c518c 100644
--- a/src/vs/editor/contrib/dropOrPasteInto/browser/defaultProviders.ts
+++ b/src/vs/editor/contrib/dropOrPasteInto/browser/defaultProviders.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { coalesce } from 'vs/base/common/arrays';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IReadonlyVSDataTransfer, UriList } from 'vs/base/common/dataTransfer';
-import { HierarchicalKind } from 'vs/base/common/hierarchicalKind';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Mimes } from 'vs/base/common/mime';
-import { Schemas } from 'vs/base/common/network';
-import { relativePath } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { IPosition } from 'vs/editor/common/core/position';
-import { IRange } from 'vs/editor/common/core/range';
-import { DocumentDropEdit, DocumentDropEditProvider, DocumentPasteContext, DocumentPasteEdit, DocumentPasteEditProvider, DocumentPasteEditsSession, DocumentPasteTriggerKind } from 'vs/editor/common/languages';
-import { ITextModel } from 'vs/editor/common/model';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { localize } from 'vs/nls';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { coalesce } from '../../../../base/common/arrays.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IReadonlyVSDataTransfer, UriList } from '../../../../base/common/dataTransfer.js';
+import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Mimes } from '../../../../base/common/mime.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { relativePath } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IPosition } from '../../../common/core/position.js';
+import { IRange } from '../../../common/core/range.js';
+import { DocumentDropEditProvider, DocumentDropEditsSession, DocumentPasteContext, DocumentPasteEdit, DocumentPasteEditProvider, DocumentPasteEditsSession, DocumentPasteTriggerKind } from '../../../common/languages.js';
+import { ITextModel } from '../../../common/model.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { localize } from '../../../../nls.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
 
 
 abstract class SimplePasteAndDropProvider implements DocumentDropEditProvider, DocumentPasteEditProvider {
@@ -34,14 +34,20 @@ abstract class SimplePasteAndDropProvider implements DocumentDropEditProvider, D
 		}
 
 		return {
+			edits: [{ insertText: edit.insertText, title: edit.title, kind: edit.kind, handledMimeType: edit.handledMimeType, yieldTo: edit.yieldTo }],
 			dispose() { },
-			edits: [{ insertText: edit.insertText, title: edit.title, kind: edit.kind, handledMimeType: edit.handledMimeType, yieldTo: edit.yieldTo }]
 		};
 	}
 
-	async provideDocumentDropEdits(_model: ITextModel, _position: IPosition, dataTransfer: IReadonlyVSDataTransfer, token: CancellationToken): Promise<DocumentDropEdit[] | undefined> {
+	async provideDocumentDropEdits(_model: ITextModel, _position: IPosition, dataTransfer: IReadonlyVSDataTransfer, token: CancellationToken): Promise<DocumentDropEditsSession | undefined> {
 		const edit = await this.getEdit(dataTransfer, token);
-		return edit ? [{ insertText: edit.insertText, title: edit.title, kind: edit.kind, handledMimeType: edit.handledMimeType, yieldTo: edit.yieldTo }] : undefined;
+		if (!edit) {
+			return;
+		}
+		return {
+			edits: [{ insertText: edit.insertText, title: edit.title, kind: edit.kind, handledMimeType: edit.handledMimeType, yieldTo: edit.yieldTo }],
+			dispose() { },
+		};
 	}
 
 	protected abstract getEdit(dataTransfer: IReadonlyVSDataTransfer, token: CancellationToken): Promise<DocumentPasteEdit | undefined>;
diff --git a/src/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorContribution.ts b/src/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorContribution.ts
index 52dc73b8ce2..7af24cf81e8 100644
--- a/src/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorContribution.ts
+++ b/src/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorContribution.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorCommand, EditorContributionInstantiation, ServicesAccessor, registerEditorCommand, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { editorConfigurationBaseNode } from 'vs/editor/common/config/editorConfigurationSchema';
-import { registerEditorFeature } from 'vs/editor/common/editorFeatures';
-import { DefaultDropProvidersFeature } from 'vs/editor/contrib/dropOrPasteInto/browser/defaultProviders';
-import * as nls from 'vs/nls';
-import { Extensions as ConfigurationExtensions, ConfigurationScope, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { DropIntoEditorController, changeDropTypeCommandId, defaultProviderConfig, dropWidgetVisibleCtx } from './dropIntoEditorController';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorCommand, EditorContributionInstantiation, ServicesAccessor, registerEditorCommand, registerEditorContribution } from '../../../browser/editorExtensions.js';
+import { editorConfigurationBaseNode } from '../../../common/config/editorConfigurationSchema.js';
+import { registerEditorFeature } from '../../../common/editorFeatures.js';
+import { DefaultDropProvidersFeature } from './defaultProviders.js';
+import * as nls from '../../../../nls.js';
+import { Extensions as ConfigurationExtensions, ConfigurationScope, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { DropIntoEditorController, changeDropTypeCommandId, defaultProviderConfig, dropWidgetVisibleCtx } from './dropIntoEditorController.js';
 
 registerEditorContribution(DropIntoEditorController.ID, DropIntoEditorController, EditorContributionInstantiation.BeforeFirstInteraction);
 registerEditorFeature(DefaultDropProvidersFeature);
diff --git a/src/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorController.ts b/src/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorController.ts
index 20adc65da11..da8ef9147c7 100644
--- a/src/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorController.ts
+++ b/src/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorController.ts
@@ -3,31 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { coalesce } from 'vs/base/common/arrays';
-import { CancelablePromise, createCancelablePromise, raceCancellation } from 'vs/base/common/async';
-import { VSDataTransfer, matchesMimeType } from 'vs/base/common/dataTransfer';
-import { HierarchicalKind } from 'vs/base/common/hierarchicalKind';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { toExternalVSDataTransfer } from 'vs/editor/browser/dnd';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { IPosition } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { DocumentDropEdit, DocumentDropEditProvider } from 'vs/editor/common/languages';
-import { ITextModel } from 'vs/editor/common/model';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { DraggedTreeItemsIdentifier } from 'vs/editor/common/services/treeViewsDnd';
-import { ITreeViewsDnDService } from 'vs/editor/common/services/treeViewsDndService';
-import { CodeEditorStateFlag, EditorStateCancellationTokenSource } from 'vs/editor/contrib/editorState/browser/editorState';
-import { InlineProgressManager } from 'vs/editor/contrib/inlineProgress/browser/inlineProgress';
-import { localize } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { LocalSelectionTransfer } from 'vs/platform/dnd/browser/dnd';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { sortEditsByYieldTo } from './edit';
-import { PostEditWidgetManager } from './postEditWidget';
+import { coalesce } from '../../../../base/common/arrays.js';
+import { CancelablePromise, createCancelablePromise, raceCancellation } from '../../../../base/common/async.js';
+import { VSDataTransfer, matchesMimeType } from '../../../../base/common/dataTransfer.js';
+import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { toExternalVSDataTransfer } from '../../../browser/dnd.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { IPosition } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { IEditorContribution } from '../../../common/editorCommon.js';
+import { DocumentDropEdit, DocumentDropEditProvider } from '../../../common/languages.js';
+import { ITextModel } from '../../../common/model.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { DraggedTreeItemsIdentifier } from '../../../common/services/treeViewsDnd.js';
+import { ITreeViewsDnDService } from '../../../common/services/treeViewsDndService.js';
+import { CodeEditorStateFlag, EditorStateCancellationTokenSource } from '../../editorState/browser/editorState.js';
+import { InlineProgressManager } from '../../inlineProgress/browser/inlineProgress.js';
+import { localize } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { LocalSelectionTransfer } from '../../../../platform/dnd/browser/dnd.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { sortEditsByYieldTo } from './edit.js';
+import { PostEditWidgetManager } from './postEditWidget.js';
 
 export const defaultProviderConfig = 'editor.experimental.dropIntoEditor.defaultProvider';
 
@@ -84,8 +84,9 @@ export class DropIntoEditorController extends Disposable implements IEditorContr
 		editor.setPosition(position);
 
 		const p = createCancelablePromise(async (token) => {
-			const tokenSource = new EditorStateCancellationTokenSource(editor, CodeEditorStateFlag.Value, undefined, token);
+			const disposables = new DisposableStore();
 
+			const tokenSource = disposables.add(new EditorStateCancellationTokenSource(editor, CodeEditorStateFlag.Value, undefined, token));
 			try {
 				const ourDataTransfer = await this.extractDataTransferData(dragEvent);
 				if (ourDataTransfer.size === 0 || tokenSource.token.isCancellationRequested) {
@@ -107,34 +108,39 @@ export class DropIntoEditorController extends Disposable implements IEditorContr
 						return provider.dropMimeTypes.some(mime => ourDataTransfer.matches(mime));
 					});
 
-				const edits = await this.getDropEdits(providers, model, position, ourDataTransfer, tokenSource);
+				const editSession = disposables.add(await this.getDropEdits(providers, model, position, ourDataTransfer, tokenSource));
 				if (tokenSource.token.isCancellationRequested) {
 					return;
 				}
 
-				if (edits.length) {
-					const activeEditIndex = this.getInitialActiveEditIndex(model, edits);
+				if (editSession.edits.length) {
+					const activeEditIndex = this.getInitialActiveEditIndex(model, editSession.edits);
 					const canShowWidget = editor.getOption(EditorOption.dropIntoEditor).showDropSelector === 'afterDrop';
 					// Pass in the parent token here as it tracks cancelling the entire drop operation
-					await this._postDropWidgetManager.applyEditAndShowIfNeeded([Range.fromPositions(position)], { activeEditIndex, allEdits: edits }, canShowWidget, async edit => edit, token);
+					await this._postDropWidgetManager.applyEditAndShowIfNeeded([Range.fromPositions(position)], { activeEditIndex, allEdits: editSession.edits }, canShowWidget, async edit => edit, token);
 				}
 			} finally {
-				tokenSource.dispose();
+				disposables.dispose();
 				if (this._currentOperation === p) {
 					this._currentOperation = undefined;
 				}
 			}
 		});
 
-		this._dropProgressManager.showWhile(position, localize('dropIntoEditorProgress', "Running drop handlers. Click to cancel"), p);
+		this._dropProgressManager.showWhile(position, localize('dropIntoEditorProgress', "Running drop handlers. Click to cancel"), p, { cancel: () => p.cancel() });
 		this._currentOperation = p;
 	}
 
 	private async getDropEdits(providers: readonly DocumentDropEditProvider[], model: ITextModel, position: IPosition, dataTransfer: VSDataTransfer, tokenSource: EditorStateCancellationTokenSource) {
+		const disposables = new DisposableStore();
+
 		const results = await raceCancellation(Promise.all(providers.map(async provider => {
 			try {
 				const edits = await provider.provideDocumentDropEdits(model, position, dataTransfer, tokenSource.token);
-				return edits?.map(edit => ({ ...edit, providerId: provider.id }));
+				if (edits) {
+					disposables.add(edits);
+				}
+				return edits?.edits.map(edit => ({ ...edit, providerId: provider.id }));
 			} catch (err) {
 				console.error(err);
 			}
@@ -142,7 +148,10 @@ export class DropIntoEditorController extends Disposable implements IEditorContr
 		})), tokenSource.token);
 
 		const edits = coalesce(results ?? []).flat();
-		return sortEditsByYieldTo(edits);
+		return {
+			edits: sortEditsByYieldTo(edits),
+			dispose: () => disposables.dispose()
+		};
 	}
 
 	private getInitialActiveEditIndex(model: ITextModel, edits: ReadonlyArray<DocumentDropEdit & { readonly providerId?: string }>) {
diff --git a/src/vs/editor/contrib/dropOrPasteInto/browser/edit.ts b/src/vs/editor/contrib/dropOrPasteInto/browser/edit.ts
index e612cfc0bfc..0b47ad3d3e5 100644
--- a/src/vs/editor/contrib/dropOrPasteInto/browser/edit.ts
+++ b/src/vs/editor/contrib/dropOrPasteInto/browser/edit.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { ResourceTextEdit } from 'vs/editor/browser/services/bulkEditService';
-import { DocumentDropEdit, DocumentPasteEdit, DropYieldTo, WorkspaceEdit } from 'vs/editor/common/languages';
-import { Range } from 'vs/editor/common/core/range';
-import { SnippetParser } from 'vs/editor/contrib/snippet/browser/snippetParser';
-import { HierarchicalKind } from 'vs/base/common/hierarchicalKind';
+import { URI } from '../../../../base/common/uri.js';
+import { ResourceTextEdit } from '../../../browser/services/bulkEditService.js';
+import { DocumentDropEdit, DocumentPasteEdit, DropYieldTo, WorkspaceEdit } from '../../../common/languages.js';
+import { Range } from '../../../common/core/range.js';
+import { SnippetParser } from '../../snippet/browser/snippetParser.js';
+import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
 
 /**
  * Given a {@link DropOrPasteEdit} and set of ranges, creates a {@link WorkspaceEdit} that applies the insert text from
diff --git a/src/vs/editor/contrib/dropOrPasteInto/browser/postEditWidget.ts b/src/vs/editor/contrib/dropOrPasteInto/browser/postEditWidget.ts
index 9443f52cc05..6be92c50daa 100644
--- a/src/vs/editor/contrib/dropOrPasteInto/browser/postEditWidget.ts
+++ b/src/vs/editor/contrib/dropOrPasteInto/browser/postEditWidget.ts
@@ -3,27 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { Button } from 'vs/base/browser/ui/button/button';
-import { toAction } from 'vs/base/common/actions';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { isCancellationError } from 'vs/base/common/errors';
-import { Event } from 'vs/base/common/event';
-import { Disposable, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import 'vs/css!./postEditWidget';
-import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from 'vs/editor/browser/editorBrowser';
-import { IBulkEditResult, IBulkEditService } from 'vs/editor/browser/services/bulkEditService';
-import { Range } from 'vs/editor/common/core/range';
-import { DocumentDropEdit, DocumentPasteEdit } from 'vs/editor/common/languages';
-import { TrackedRangeStickiness } from 'vs/editor/common/model';
-import { createCombinedWorkspaceEdit } from 'vs/editor/contrib/dropOrPasteInto/browser/edit';
-import { localize } from 'vs/nls';
-import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { INotificationService } from 'vs/platform/notification/common/notification';
+import * as dom from '../../../../base/browser/dom.js';
+import { Button } from '../../../../base/browser/ui/button/button.js';
+import { toAction } from '../../../../base/common/actions.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { toErrorMessage } from '../../../../base/common/errorMessage.js';
+import { isCancellationError } from '../../../../base/common/errors.js';
+import { Event } from '../../../../base/common/event.js';
+import { Disposable, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import './postEditWidget.css';
+import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from '../../../browser/editorBrowser.js';
+import { IBulkEditResult, IBulkEditService } from '../../../browser/services/bulkEditService.js';
+import { Range } from '../../../common/core/range.js';
+import { DocumentDropEdit, DocumentPasteEdit } from '../../../common/languages.js';
+import { TrackedRangeStickiness } from '../../../common/model.js';
+import { createCombinedWorkspaceEdit } from './edit.js';
+import { localize } from '../../../../nls.js';
+import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
 
 
 interface EditSet<Edit extends DocumentPasteEdit | DocumentDropEdit> {
diff --git a/src/vs/editor/contrib/dropOrPasteInto/test/browser/editSort.test.ts b/src/vs/editor/contrib/dropOrPasteInto/test/browser/editSort.test.ts
index ec61f04a463..c989e4ec338 100644
--- a/src/vs/editor/contrib/dropOrPasteInto/test/browser/editSort.test.ts
+++ b/src/vs/editor/contrib/dropOrPasteInto/test/browser/editSort.test.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { HierarchicalKind } from 'vs/base/common/hierarchicalKind';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { DocumentDropEdit } from 'vs/editor/common/languages';
-import { sortEditsByYieldTo } from 'vs/editor/contrib/dropOrPasteInto/browser/edit';
+import { HierarchicalKind } from '../../../../../base/common/hierarchicalKind.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { DocumentDropEdit } from '../../../../common/languages.js';
+import { sortEditsByYieldTo } from '../../browser/edit.js';
 
 
 function createTestEdit(kind: string, args?: Partial<DocumentDropEdit>): DocumentDropEdit {
diff --git a/src/vs/editor/contrib/editorState/browser/editorState.ts b/src/vs/editor/contrib/editorState/browser/editorState.ts
index 3bfadf65dae..fdb296ee7f7 100644
--- a/src/vs/editor/contrib/editorState/browser/editorState.ts
+++ b/src/vs/editor/contrib/editorState/browser/editorState.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as strings from 'vs/base/common/strings';
-import { ICodeEditor, IActiveCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { Position } from 'vs/editor/common/core/position';
-import { Range, IRange } from 'vs/editor/common/core/range';
-import { CancellationTokenSource, CancellationToken } from 'vs/base/common/cancellation';
-import { IDisposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { ITextModel } from 'vs/editor/common/model';
-import { EditorKeybindingCancellationTokenSource } from 'vs/editor/contrib/editorState/browser/keybindingCancellation';
+import * as strings from '../../../../base/common/strings.js';
+import { ICodeEditor, IActiveCodeEditor } from '../../../browser/editorBrowser.js';
+import { Position } from '../../../common/core/position.js';
+import { Range, IRange } from '../../../common/core/range.js';
+import { CancellationTokenSource, CancellationToken } from '../../../../base/common/cancellation.js';
+import { IDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { ITextModel } from '../../../common/model.js';
+import { EditorKeybindingCancellationTokenSource } from './keybindingCancellation.js';
 
 export const enum CodeEditorStateFlag {
 	Value = 1,
diff --git a/src/vs/editor/contrib/editorState/browser/keybindingCancellation.ts b/src/vs/editor/contrib/editorState/browser/keybindingCancellation.ts
index 76de62975c5..94020ce96b9 100644
--- a/src/vs/editor/contrib/editorState/browser/keybindingCancellation.ts
+++ b/src/vs/editor/contrib/editorState/browser/keybindingCancellation.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { EditorCommand, registerEditorCommand } from 'vs/editor/browser/editorExtensions';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IContextKeyService, RawContextKey, IContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { CancellationTokenSource, CancellationToken } from 'vs/base/common/cancellation';
-import { LinkedList } from 'vs/base/common/linkedList';
-import { createDecorator, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { localize } from 'vs/nls';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { EditorCommand, registerEditorCommand } from '../../../browser/editorExtensions.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { IContextKeyService, RawContextKey, IContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { CancellationTokenSource, CancellationToken } from '../../../../base/common/cancellation.js';
+import { LinkedList } from '../../../../base/common/linkedList.js';
+import { createDecorator, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { localize } from '../../../../nls.js';
 
 
 const IEditorCancellationTokens = createDecorator<IEditorCancellationTokens>('IEditorCancelService');
diff --git a/src/vs/editor/contrib/editorState/test/browser/editorState.test.ts b/src/vs/editor/contrib/editorState/test/browser/editorState.test.ts
index 239da13d225..c72c5a7b7e6 100644
--- a/src/vs/editor/contrib/editorState/test/browser/editorState.test.ts
+++ b/src/vs/editor/contrib/editorState/test/browser/editorState.test.ts
@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { Position } from 'vs/editor/common/core/position';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ITextModel } from 'vs/editor/common/model';
-import { CodeEditorStateFlag, EditorState } from 'vs/editor/contrib/editorState/browser/editorState';
+import { URI } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { ICodeEditor } from '../../../../browser/editorBrowser.js';
+import { Position } from '../../../../common/core/position.js';
+import { Selection } from '../../../../common/core/selection.js';
+import { ITextModel } from '../../../../common/model.js';
+import { CodeEditorStateFlag, EditorState } from '../../browser/editorState.js';
 
 interface IStubEditorState {
 	model?: { uri?: URI; version?: number };
diff --git a/src/vs/editor/contrib/find/browser/findController.ts b/src/vs/editor/contrib/find/browser/findController.ts
index bbcc79d0750..5033c2565d9 100644
--- a/src/vs/editor/contrib/find/browser/findController.ts
+++ b/src/vs/editor/contrib/find/browser/findController.ts
@@ -3,35 +3,35 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Delayer } from 'vs/base/common/async';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Disposable } from 'vs/base/common/lifecycle';
-import * as strings from 'vs/base/common/strings';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, EditorCommand, EditorContributionInstantiation, MultiEditorAction, registerEditorAction, registerEditorCommand, registerEditorContribution, registerMultiEditorAction, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { overviewRulerRangeHighlight } from 'vs/editor/common/core/editorColorRegistry';
-import { IRange } from 'vs/editor/common/core/range';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { OverviewRulerLane } from 'vs/editor/common/model';
-import { CONTEXT_FIND_INPUT_FOCUSED, CONTEXT_FIND_WIDGET_VISIBLE, CONTEXT_REPLACE_INPUT_FOCUSED, FindModelBoundToEditorModel, FIND_IDS, ToggleCaseSensitiveKeybinding, TogglePreserveCaseKeybinding, ToggleRegexKeybinding, ToggleSearchScopeKeybinding, ToggleWholeWordKeybinding } from 'vs/editor/contrib/find/browser/findModel';
-import { FindOptionsWidget } from 'vs/editor/contrib/find/browser/findOptionsWidget';
-import { FindReplaceState, FindReplaceStateChangedEvent, INewFindReplaceState } from 'vs/editor/contrib/find/browser/findState';
-import { FindWidget, IFindController } from 'vs/editor/contrib/find/browser/findWidget';
-import * as nls from 'vs/nls';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { ContextKeyExpr, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IThemeService, themeColorFromId } from 'vs/platform/theme/common/themeService';
-import { Selection } from 'vs/editor/common/core/selection';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import { Delayer } from '../../../../base/common/async.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import * as strings from '../../../../base/common/strings.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorAction, EditorCommand, EditorContributionInstantiation, MultiEditorAction, registerEditorAction, registerEditorCommand, registerEditorContribution, registerMultiEditorAction, ServicesAccessor } from '../../../browser/editorExtensions.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { overviewRulerRangeHighlight } from '../../../common/core/editorColorRegistry.js';
+import { IRange } from '../../../common/core/range.js';
+import { IEditorContribution } from '../../../common/editorCommon.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { OverviewRulerLane } from '../../../common/model.js';
+import { CONTEXT_FIND_INPUT_FOCUSED, CONTEXT_FIND_WIDGET_VISIBLE, CONTEXT_REPLACE_INPUT_FOCUSED, FindModelBoundToEditorModel, FIND_IDS, ToggleCaseSensitiveKeybinding, TogglePreserveCaseKeybinding, ToggleRegexKeybinding, ToggleSearchScopeKeybinding, ToggleWholeWordKeybinding } from './findModel.js';
+import { FindOptionsWidget } from './findOptionsWidget.js';
+import { FindReplaceState, FindReplaceStateChangedEvent, INewFindReplaceState } from './findState.js';
+import { FindWidget, IFindController } from './findWidget.js';
+import * as nls from '../../../../nls.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IThemeService, themeColorFromId } from '../../../../platform/theme/common/themeService.js';
+import { Selection } from '../../../common/core/selection.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 
 const SEARCH_STRING_MAX_LENGTH = 524288;
 
@@ -771,7 +771,8 @@ export class MoveToMatchFindAction extends EditorAction {
 		}
 
 		const quickInputService = accessor.get(IQuickInputService);
-		const inputBox = quickInputService.createInputBox();
+		const disposables = new DisposableStore();
+		const inputBox = disposables.add(quickInputService.createInputBox());
 		inputBox.placeholder = nls.localize('findMatchAction.inputPlaceHolder', "Type a number to go to a specific match (between 1 and {0})", matchesCount);
 
 		const toFindMatchIndex = (value: string): number | undefined => {
@@ -805,11 +806,11 @@ export class MoveToMatchFindAction extends EditorAction {
 				this.clearDecorations(editor);
 			}
 		};
-		inputBox.onDidChangeValue(value => {
+		disposables.add(inputBox.onDidChangeValue(value => {
 			updatePickerAndEditor(value);
-		});
+		}));
 
-		inputBox.onDidAccept(() => {
+		disposables.add(inputBox.onDidAccept(() => {
 			const index = toFindMatchIndex(inputBox.value);
 			if (typeof index === 'number') {
 				controller.goToMatch(index);
@@ -817,12 +818,12 @@ export class MoveToMatchFindAction extends EditorAction {
 			} else {
 				inputBox.validationMessage = nls.localize('findMatchAction.inputValidationMessage', "Please type a number between 1 and {0}", controller.getState().matchesCount);
 			}
-		});
+		}));
 
-		inputBox.onDidHide(() => {
+		disposables.add(inputBox.onDidHide(() => {
 			this.clearDecorations(editor);
-			inputBox.dispose();
-		});
+			disposables.dispose();
+		}));
 
 		inputBox.show();
 	}
diff --git a/src/vs/editor/contrib/find/browser/findDecorations.ts b/src/vs/editor/contrib/find/browser/findDecorations.ts
index e5e9018464a..cfa856aaa32 100644
--- a/src/vs/editor/contrib/find/browser/findDecorations.ts
+++ b/src/vs/editor/contrib/find/browser/findDecorations.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { IActiveCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { FindMatch, IModelDecorationsChangeAccessor, IModelDeltaDecoration, MinimapPosition, OverviewRulerLane, TrackedRangeStickiness } from 'vs/editor/common/model';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { minimapFindMatch, overviewRulerFindMatchForeground } from 'vs/platform/theme/common/colorRegistry';
-import { themeColorFromId } from 'vs/platform/theme/common/themeService';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { IActiveCodeEditor } from '../../../browser/editorBrowser.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { FindMatch, IModelDecorationsChangeAccessor, IModelDeltaDecoration, MinimapPosition, OverviewRulerLane, TrackedRangeStickiness } from '../../../common/model.js';
+import { ModelDecorationOptions } from '../../../common/model/textModel.js';
+import { minimapFindMatch, overviewRulerFindMatchForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import { themeColorFromId } from '../../../../platform/theme/common/themeService.js';
 
 export class FindDecorations implements IDisposable {
 
diff --git a/src/vs/editor/contrib/find/browser/findModel.ts b/src/vs/editor/contrib/find/browser/findModel.ts
index a4611d37daf..bd6fa9baedc 100644
--- a/src/vs/editor/contrib/find/browser/findModel.ts
+++ b/src/vs/editor/contrib/find/browser/findModel.ts
@@ -3,27 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { findFirstIdxMonotonousOrArrLen } from 'vs/base/common/arraysFind';
-import { RunOnceScheduler, TimeoutTimer } from 'vs/base/common/async';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { DisposableStore, dispose } from 'vs/base/common/lifecycle';
-import { Constants } from 'vs/base/common/uint';
-import { IActiveCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { ReplaceCommand, ReplaceCommandThatPreservesSelection } from 'vs/editor/common/commands/replaceCommand';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { CursorChangeReason, ICursorPositionChangedEvent } from 'vs/editor/common/cursorEvents';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ICommand, ScrollType } from 'vs/editor/common/editorCommon';
-import { EndOfLinePreference, FindMatch, ITextModel } from 'vs/editor/common/model';
-import { SearchParams } from 'vs/editor/common/model/textModelSearch';
-import { FindDecorations } from 'vs/editor/contrib/find/browser/findDecorations';
-import { FindReplaceState, FindReplaceStateChangedEvent } from 'vs/editor/contrib/find/browser/findState';
-import { ReplaceAllCommand } from 'vs/editor/contrib/find/browser/replaceAllCommand';
-import { parseReplaceString, ReplacePattern } from 'vs/editor/contrib/find/browser/replacePattern';
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IKeybindings } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { findFirstIdxMonotonousOrArrLen } from '../../../../base/common/arraysFind.js';
+import { RunOnceScheduler, TimeoutTimer } from '../../../../base/common/async.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { DisposableStore, dispose } from '../../../../base/common/lifecycle.js';
+import { Constants } from '../../../../base/common/uint.js';
+import { IActiveCodeEditor } from '../../../browser/editorBrowser.js';
+import { ReplaceCommand, ReplaceCommandThatPreservesSelection } from '../../../common/commands/replaceCommand.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { CursorChangeReason, ICursorPositionChangedEvent } from '../../../common/cursorEvents.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { Selection } from '../../../common/core/selection.js';
+import { ICommand, ScrollType } from '../../../common/editorCommon.js';
+import { EndOfLinePreference, FindMatch, ITextModel } from '../../../common/model.js';
+import { SearchParams } from '../../../common/model/textModelSearch.js';
+import { FindDecorations } from './findDecorations.js';
+import { FindReplaceState, FindReplaceStateChangedEvent } from './findState.js';
+import { ReplaceAllCommand } from './replaceAllCommand.js';
+import { parseReplaceString, ReplacePattern } from './replacePattern.js';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IKeybindings } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 
 export const CONTEXT_FIND_WIDGET_VISIBLE = new RawContextKey<boolean>('findWidgetVisible', false);
 export const CONTEXT_FIND_WIDGET_NOT_VISIBLE = CONTEXT_FIND_WIDGET_VISIBLE.toNegated();
@@ -97,7 +97,12 @@ export class FindModelBoundToEditorModel {
 		this._decorations = new FindDecorations(editor);
 		this._toDispose.add(this._decorations);
 
-		this._updateDecorationsScheduler = new RunOnceScheduler(() => this.research(false), 100);
+		this._updateDecorationsScheduler = new RunOnceScheduler(() => {
+			if (!this._editor.hasModel()) {
+				return;
+			}
+			return this.research(false);
+		}, 100);
 		this._toDispose.add(this._updateDecorationsScheduler);
 
 		this._toDispose.add(this._editor.onDidChangeCursorPosition((e: ICursorPositionChangedEvent) => {
diff --git a/src/vs/editor/contrib/find/browser/findOptionsWidget.ts b/src/vs/editor/contrib/find/browser/findOptionsWidget.ts
index 007723f6986..137f792ff50 100644
--- a/src/vs/editor/contrib/find/browser/findOptionsWidget.ts
+++ b/src/vs/editor/contrib/find/browser/findOptionsWidget.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import 'vs/css!./findOptionsWidget';
-import { CaseSensitiveToggle, RegexToggle, WholeWordsToggle } from 'vs/base/browser/ui/findinput/findInputToggles';
-import { Widget } from 'vs/base/browser/ui/widget';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, OverlayWidgetPositionPreference } from 'vs/editor/browser/editorBrowser';
-import { FIND_IDS } from 'vs/editor/contrib/find/browser/findModel';
-import { FindReplaceState } from 'vs/editor/contrib/find/browser/findState';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { asCssVariable, inputActiveOptionBackground, inputActiveOptionBorder, inputActiveOptionForeground } from 'vs/platform/theme/common/colorRegistry';
-import { createInstantHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
+import * as dom from '../../../../base/browser/dom.js';
+import './findOptionsWidget.css';
+import { CaseSensitiveToggle, RegexToggle, WholeWordsToggle } from '../../../../base/browser/ui/findinput/findInputToggles.js';
+import { Widget } from '../../../../base/browser/ui/widget.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, OverlayWidgetPositionPreference } from '../../../browser/editorBrowser.js';
+import { FIND_IDS } from './findModel.js';
+import { FindReplaceState } from './findState.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { asCssVariable, inputActiveOptionBackground, inputActiveOptionBorder, inputActiveOptionForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import { createInstantHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 
 export class FindOptionsWidget extends Widget implements IOverlayWidget {
 
diff --git a/src/vs/editor/contrib/find/browser/findState.ts b/src/vs/editor/contrib/find/browser/findState.ts
index 9dec252361a..f48d60c1763 100644
--- a/src/vs/editor/contrib/find/browser/findState.ts
+++ b/src/vs/editor/contrib/find/browser/findState.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Range } from 'vs/editor/common/core/range';
-import { MATCHES_LIMIT } from './findModel';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Range } from '../../../common/core/range.js';
+import { MATCHES_LIMIT } from './findModel.js';
 
 export interface FindReplaceStateChangedEvent {
 	moveCursor: boolean;
diff --git a/src/vs/editor/contrib/find/browser/findWidget.ts b/src/vs/editor/contrib/find/browser/findWidget.ts
index 9645d4b54ba..bb3054e0db1 100644
--- a/src/vs/editor/contrib/find/browser/findWidget.ts
+++ b/src/vs/editor/contrib/find/browser/findWidget.ts
@@ -3,49 +3,49 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { IMouseEvent } from 'vs/base/browser/mouseEvent';
-import { alert as alertFn } from 'vs/base/browser/ui/aria/aria';
-import { Toggle } from 'vs/base/browser/ui/toggle/toggle';
-import { IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview';
-import { FindInput } from 'vs/base/browser/ui/findinput/findInput';
-import { ReplaceInput } from 'vs/base/browser/ui/findinput/replaceInput';
-import { IMessage as InputBoxMessage } from 'vs/base/browser/ui/inputbox/inputBox';
-import { ISashEvent, IVerticalSashLayoutProvider, Orientation, Sash } from 'vs/base/browser/ui/sash/sash';
-import { Widget } from 'vs/base/browser/ui/widget';
-import { Delayer } from 'vs/base/common/async';
-import { Codicon } from 'vs/base/common/codicons';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { toDisposable } from 'vs/base/common/lifecycle';
-import * as platform from 'vs/base/common/platform';
-import * as strings from 'vs/base/common/strings';
-import 'vs/css!./findWidget';
-import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, IViewZone, OverlayWidgetPositionPreference } from 'vs/editor/browser/editorBrowser';
-import { ConfigurationChangedEvent, EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Range } from 'vs/editor/common/core/range';
-import { CONTEXT_FIND_INPUT_FOCUSED, CONTEXT_REPLACE_INPUT_FOCUSED, FIND_IDS, MATCHES_LIMIT } from 'vs/editor/contrib/find/browser/findModel';
-import { FindReplaceState, FindReplaceStateChangedEvent } from 'vs/editor/contrib/find/browser/findState';
-import * as nls from 'vs/nls';
-import { AccessibilitySupport } from 'vs/platform/accessibility/common/accessibility';
-import { ContextScopedFindInput, ContextScopedReplaceInput } from 'vs/platform/history/browser/contextScopedHistoryWidget';
-import { showHistoryKeybindingHint } from 'vs/platform/history/browser/historyWidgetKeybindingHint';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { asCssVariable, contrastBorder, editorFindMatchForeground, editorFindMatchHighlightBorder, editorFindMatchHighlightForeground, editorFindRangeHighlightBorder, inputActiveOptionBackground, inputActiveOptionBorder, inputActiveOptionForeground } from 'vs/platform/theme/common/colorRegistry';
-import { registerIcon, widgetClose } from 'vs/platform/theme/common/iconRegistry';
-import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { isHighContrast } from 'vs/platform/theme/common/theme';
-import { assertIsDefined } from 'vs/base/common/types';
-import { defaultInputBoxStyles, defaultToggleStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { Selection } from 'vs/editor/common/core/selection';
-import { createInstantHoverDelegate, getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { IHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import * as dom from '../../../../base/browser/dom.js';
+import { IKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { IMouseEvent } from '../../../../base/browser/mouseEvent.js';
+import { alert as alertFn } from '../../../../base/browser/ui/aria/aria.js';
+import { Toggle } from '../../../../base/browser/ui/toggle/toggle.js';
+import { IContextViewProvider } from '../../../../base/browser/ui/contextview/contextview.js';
+import { FindInput } from '../../../../base/browser/ui/findinput/findInput.js';
+import { ReplaceInput } from '../../../../base/browser/ui/findinput/replaceInput.js';
+import { IMessage as InputBoxMessage } from '../../../../base/browser/ui/inputbox/inputBox.js';
+import { ISashEvent, IVerticalSashLayoutProvider, Orientation, Sash } from '../../../../base/browser/ui/sash/sash.js';
+import { Widget } from '../../../../base/browser/ui/widget.js';
+import { Delayer } from '../../../../base/common/async.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { toDisposable } from '../../../../base/common/lifecycle.js';
+import * as platform from '../../../../base/common/platform.js';
+import * as strings from '../../../../base/common/strings.js';
+import './findWidget.css';
+import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, IViewZone, OverlayWidgetPositionPreference } from '../../../browser/editorBrowser.js';
+import { ConfigurationChangedEvent, EditorOption } from '../../../common/config/editorOptions.js';
+import { Range } from '../../../common/core/range.js';
+import { CONTEXT_FIND_INPUT_FOCUSED, CONTEXT_REPLACE_INPUT_FOCUSED, FIND_IDS, MATCHES_LIMIT } from './findModel.js';
+import { FindReplaceState, FindReplaceStateChangedEvent } from './findState.js';
+import * as nls from '../../../../nls.js';
+import { AccessibilitySupport } from '../../../../platform/accessibility/common/accessibility.js';
+import { ContextScopedFindInput, ContextScopedReplaceInput } from '../../../../platform/history/browser/contextScopedHistoryWidget.js';
+import { showHistoryKeybindingHint } from '../../../../platform/history/browser/historyWidgetKeybindingHint.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { asCssVariable, contrastBorder, editorFindMatchForeground, editorFindMatchHighlightBorder, editorFindMatchHighlightForeground, editorFindRangeHighlightBorder, inputActiveOptionBackground, inputActiveOptionBorder, inputActiveOptionForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import { registerIcon, widgetClose } from '../../../../platform/theme/common/iconRegistry.js';
+import { IThemeService, registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { isHighContrast } from '../../../../platform/theme/common/theme.js';
+import { assertIsDefined } from '../../../../base/common/types.js';
+import { defaultInputBoxStyles, defaultToggleStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { Selection } from '../../../common/core/selection.js';
+import { createInstantHoverDelegate, getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { IHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegate.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 
 const findCollapsedIcon = registerIcon('find-collapsed', Codicon.chevronRight, nls.localize('findCollapsedIcon', 'Icon to indicate that the editor find widget is collapsed.'));
 const findExpandedIcon = registerIcon('find-expanded', Codicon.chevronDown, nls.localize('findExpandedIcon', 'Icon to indicate that the editor find widget is expanded.'));
diff --git a/src/vs/editor/contrib/find/browser/replaceAllCommand.ts b/src/vs/editor/contrib/find/browser/replaceAllCommand.ts
index 8f5773aa434..0926711fb3d 100644
--- a/src/vs/editor/contrib/find/browser/replaceAllCommand.ts
+++ b/src/vs/editor/contrib/find/browser/replaceAllCommand.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ICommand, ICursorStateComputerData, IEditOperationBuilder } from 'vs/editor/common/editorCommon';
-import { ITextModel } from 'vs/editor/common/model';
+import { Range } from '../../../common/core/range.js';
+import { Selection } from '../../../common/core/selection.js';
+import { ICommand, ICursorStateComputerData, IEditOperationBuilder } from '../../../common/editorCommon.js';
+import { ITextModel } from '../../../common/model.js';
 
 interface IEditOperation {
 	range: Range;
diff --git a/src/vs/editor/contrib/find/browser/replacePattern.ts b/src/vs/editor/contrib/find/browser/replacePattern.ts
index bc0d3b9b8c9..70c0f5bbad6 100644
--- a/src/vs/editor/contrib/find/browser/replacePattern.ts
+++ b/src/vs/editor/contrib/find/browser/replacePattern.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
-import { buildReplaceStringWithCasePreserved } from 'vs/base/common/search';
+import { CharCode } from '../../../../base/common/charCode.js';
+import { buildReplaceStringWithCasePreserved } from '../../../../base/common/search.js';
 
 const enum ReplacePatternKind {
 	StaticValue = 0,
diff --git a/src/vs/editor/contrib/find/test/browser/find.test.ts b/src/vs/editor/contrib/find/test/browser/find.test.ts
index 580ea739b76..8b0cd2a87a5 100644
--- a/src/vs/editor/contrib/find/test/browser/find.test.ts
+++ b/src/vs/editor/contrib/find/test/browser/find.test.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { getSelectionSearchString } from 'vs/editor/contrib/find/browser/findController';
-import { withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Position } from '../../../../common/core/position.js';
+import { Range } from '../../../../common/core/range.js';
+import { getSelectionSearchString } from '../../browser/findController.js';
+import { withTestCodeEditor } from '../../../../test/browser/testCodeEditor.js';
 
 
 suite('Find', () => {
diff --git a/src/vs/editor/contrib/find/test/browser/findController.test.ts b/src/vs/editor/contrib/find/test/browser/findController.test.ts
index 49fef95baf8..bab641242e1 100644
--- a/src/vs/editor/contrib/find/test/browser/findController.test.ts
+++ b/src/vs/editor/contrib/find/test/browser/findController.test.ts
@@ -4,25 +4,25 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Delayer } from 'vs/base/common/async';
-import * as platform from 'vs/base/common/platform';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction } from 'vs/editor/browser/editorExtensions';
-import { EditOperation } from 'vs/editor/common/core/editOperation';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { CommonFindController, FindStartFocusAction, IFindStartOptions, NextMatchFindAction, NextSelectionMatchFindAction, StartFindAction, StartFindReplaceAction, StartFindWithSelectionAction } from 'vs/editor/contrib/find/browser/findController';
-import { CONTEXT_FIND_INPUT_FOCUSED } from 'vs/editor/contrib/find/browser/findModel';
-import { withAsyncTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IStorageService, InMemoryStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
+import { Delayer } from '../../../../../base/common/async.js';
+import * as platform from '../../../../../base/common/platform.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { ICodeEditor } from '../../../../browser/editorBrowser.js';
+import { EditorAction } from '../../../../browser/editorExtensions.js';
+import { EditOperation } from '../../../../common/core/editOperation.js';
+import { Position } from '../../../../common/core/position.js';
+import { Range } from '../../../../common/core/range.js';
+import { Selection } from '../../../../common/core/selection.js';
+import { CommonFindController, FindStartFocusAction, IFindStartOptions, NextMatchFindAction, NextSelectionMatchFindAction, StartFindAction, StartFindReplaceAction, StartFindWithSelectionAction } from '../../browser/findController.js';
+import { CONTEXT_FIND_INPUT_FOCUSED } from '../../browser/findModel.js';
+import { withAsyncTestCodeEditor } from '../../../../test/browser/testCodeEditor.js';
+import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js';
+import { IContextKey, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
+import { INotificationService } from '../../../../../platform/notification/common/notification.js';
+import { IStorageService, InMemoryStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
 
 class TestFindController extends CommonFindController {
 
diff --git a/src/vs/editor/contrib/find/test/browser/findModel.test.ts b/src/vs/editor/contrib/find/test/browser/findModel.test.ts
index 8cc753388b9..09a0de5a7ae 100644
--- a/src/vs/editor/contrib/find/test/browser/findModel.test.ts
+++ b/src/vs/editor/contrib/find/test/browser/findModel.test.ts
@@ -4,17 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { CoreNavigationCommands } from 'vs/editor/browser/coreCommands';
-import { IActiveCodeEditor, ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder';
-import { FindModelBoundToEditorModel } from 'vs/editor/contrib/find/browser/findModel';
-import { FindReplaceState } from 'vs/editor/contrib/find/browser/findState';
-import { withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { CoreNavigationCommands } from '../../../../browser/coreCommands.js';
+import { IActiveCodeEditor, ICodeEditor } from '../../../../browser/editorBrowser.js';
+import { Position } from '../../../../common/core/position.js';
+import { Range } from '../../../../common/core/range.js';
+import { Selection } from '../../../../common/core/selection.js';
+import { PieceTreeTextBufferBuilder } from '../../../../common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder.js';
+import { FindModelBoundToEditorModel } from '../../browser/findModel.js';
+import { FindReplaceState } from '../../browser/findState.js';
+import { withTestCodeEditor } from '../../../../test/browser/testCodeEditor.js';
 
 suite('FindModel', () => {
 
diff --git a/src/vs/editor/contrib/find/test/browser/replacePattern.test.ts b/src/vs/editor/contrib/find/test/browser/replacePattern.test.ts
index 1f534bbdae3..26c65b3d8be 100644
--- a/src/vs/editor/contrib/find/test/browser/replacePattern.test.ts
+++ b/src/vs/editor/contrib/find/test/browser/replacePattern.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { buildReplaceStringWithCasePreserved } from 'vs/base/common/search';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { parseReplaceString, ReplacePattern, ReplacePiece } from 'vs/editor/contrib/find/browser/replacePattern';
+import { buildReplaceStringWithCasePreserved } from '../../../../../base/common/search.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { parseReplaceString, ReplacePattern, ReplacePiece } from '../../browser/replacePattern.js';
 
 suite('Replace Pattern test', () => {
 
diff --git a/src/vs/editor/contrib/folding/browser/folding.css b/src/vs/editor/contrib/folding/browser/folding.css
index f973d5f7a30..5f7ab05db78 100644
--- a/src/vs/editor/contrib/folding/browser/folding.css
+++ b/src/vs/editor/contrib/folding/browser/folding.css
@@ -31,7 +31,7 @@
 }
 
 .monaco-editor .inline-folded:after {
-	color: grey;
+	color: var(--vscode-editor-foldPlaceholderForeground);
 	margin: 0.1em 0.2em 0 0.2em;
 	content: "\22EF"; /* ellipses unicode character */
 	display: inline;
@@ -49,4 +49,3 @@
 .monaco-editor .cldr.codicon.codicon-folding-manual-collapsed {
 	color: var(--vscode-editorGutter-foldingControlForeground) !important;
 }
-
diff --git a/src/vs/editor/contrib/folding/browser/folding.ts b/src/vs/editor/contrib/folding/browser/folding.ts
index 25988ac7370..ee657d44e14 100644
--- a/src/vs/editor/contrib/folding/browser/folding.ts
+++ b/src/vs/editor/contrib/folding/browser/folding.ts
@@ -3,44 +3,45 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancelablePromise, createCancelablePromise, Delayer, RunOnceScheduler } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { illegalArgument, onUnexpectedError } from 'vs/base/common/errors';
-import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { escapeRegExpCharacters } from 'vs/base/common/strings';
-import * as types from 'vs/base/common/types';
-import 'vs/css!./folding';
-import { StableEditorScrollState } from 'vs/editor/browser/stableEditorScroll';
-import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, EditorContributionInstantiation, registerEditorAction, registerEditorContribution, registerInstantiatedEditorAction, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { ConfigurationChangedEvent, EditorOption } from 'vs/editor/common/config/editorOptions';
-import { IPosition } from 'vs/editor/common/core/position';
-import { IRange } from 'vs/editor/common/core/range';
-import { IEditorContribution, ScrollType } from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { ITextModel } from 'vs/editor/common/model';
-import { IModelContentChangedEvent } from 'vs/editor/common/textModelEvents';
-import { FoldingRange, FoldingRangeKind, FoldingRangeProvider } from 'vs/editor/common/languages';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { CollapseMemento, FoldingModel, getNextFoldLine, getParentFoldLine as getParentFoldLine, getPreviousFoldLine, setCollapseStateAtLevel, setCollapseStateForMatchingLines, setCollapseStateForRest, setCollapseStateForType, setCollapseStateLevelsDown, setCollapseStateLevelsUp, setCollapseStateUp, toggleCollapseState } from 'vs/editor/contrib/folding/browser/foldingModel';
-import { HiddenRangeModel } from 'vs/editor/contrib/folding/browser/hiddenRangeModel';
-import { IndentRangeProvider } from 'vs/editor/contrib/folding/browser/indentRangeProvider';
-import * as nls from 'vs/nls';
-import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { FoldingDecorationProvider } from './foldingDecorations';
-import { FoldingRegion, FoldingRegions, FoldRange, FoldSource, ILineRange } from './foldingRanges';
-import { SyntaxRangeProvider } from './syntaxRangeProvider';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IFeatureDebounceInformation, ILanguageFeatureDebounceService } from 'vs/editor/common/services/languageFeatureDebounce';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { Emitter, Event } from 'vs/base/common/event';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { URI } from 'vs/base/common/uri';
-import { IModelService } from 'vs/editor/common/services/model';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { CancelablePromise, createCancelablePromise, Delayer, RunOnceScheduler } from '../../../../base/common/async.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { illegalArgument, onUnexpectedError } from '../../../../base/common/errors.js';
+import { KeyChord, KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import { escapeRegExpCharacters } from '../../../../base/common/strings.js';
+import * as types from '../../../../base/common/types.js';
+import './folding.css';
+import { StableEditorScrollState } from '../../../browser/stableEditorScroll.js';
+import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from '../../../browser/editorBrowser.js';
+import { EditorAction, EditorContributionInstantiation, registerEditorAction, registerEditorContribution, registerInstantiatedEditorAction, ServicesAccessor } from '../../../browser/editorExtensions.js';
+import { ConfigurationChangedEvent, EditorOption } from '../../../common/config/editorOptions.js';
+import { IPosition } from '../../../common/core/position.js';
+import { IRange } from '../../../common/core/range.js';
+import { Selection } from '../../../common/core/selection.js';
+import { IEditorContribution, ScrollType } from '../../../common/editorCommon.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { ITextModel } from '../../../common/model.js';
+import { IModelContentChangedEvent } from '../../../common/textModelEvents.js';
+import { FoldingRange, FoldingRangeKind, FoldingRangeProvider } from '../../../common/languages.js';
+import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import { CollapseMemento, FoldingModel, getNextFoldLine, getParentFoldLine as getParentFoldLine, getPreviousFoldLine, setCollapseStateAtLevel, setCollapseStateForMatchingLines, setCollapseStateForRest, setCollapseStateForType, setCollapseStateLevelsDown, setCollapseStateLevelsUp, setCollapseStateUp, toggleCollapseState } from './foldingModel.js';
+import { HiddenRangeModel } from './hiddenRangeModel.js';
+import { IndentRangeProvider } from './indentRangeProvider.js';
+import * as nls from '../../../../nls.js';
+import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { FoldingDecorationProvider } from './foldingDecorations.js';
+import { FoldingRegion, FoldingRegions, FoldRange, FoldSource, ILineRange } from './foldingRanges.js';
+import { SyntaxRangeProvider } from './syntaxRangeProvider.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IFeatureDebounceInformation, ILanguageFeatureDebounceService } from '../../../common/services/languageFeatureDebounce.js';
+import { StopWatch } from '../../../../base/common/stopwatch.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IModelService } from '../../../common/services/model.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 
 const CONTEXT_FOLDING_ENABLED = new RawContextKey<boolean>('foldingEnabled', false);
 
@@ -328,8 +329,7 @@ export class FoldingController extends Disposable implements IEditorContribution
 
 						// some cursors might have moved into hidden regions, make sure they are in expanded regions
 						const selections = this.editor.getSelections();
-						const selectionLineNumbers = selections ? selections.map(s => s.startLineNumber) : [];
-						foldingModel.update(foldingRanges, selectionLineNumbers);
+						foldingModel.update(foldingRanges, toSelectedLines(selections));
 
 						scrollState?.restore(this.editor);
 
@@ -582,6 +582,29 @@ abstract class FoldingAction<T> extends EditorAction {
 	}
 }
 
+export interface SelectedLines {
+	startsInside(startLine: number, endLine: number): boolean;
+}
+
+export function toSelectedLines(selections: Selection[] | null): SelectedLines {
+	if (!selections || selections.length === 0) {
+		return {
+			startsInside: () => false
+		};
+	}
+	return {
+		startsInside(startLine: number, endLine: number): boolean {
+			for (const s of selections) {
+				const line = s.startLineNumber;
+				if (line >= startLine && line <= endLine) {
+					return true;
+				}
+			}
+			return false;
+		}
+	};
+}
+
 interface FoldingArguments {
 	levels?: number;
 	direction?: 'up' | 'down';
@@ -1208,6 +1231,35 @@ class RemoveFoldRangeFromSelectionAction extends FoldingAction<void> {
 }
 
 
+class ToggleImportFoldAction extends FoldingAction<void> {
+
+	constructor() {
+		super({
+			id: 'editor.toggleImportFold',
+			label: nls.localize('toggleImportFold.label', "Toggle Import Fold"),
+			alias: 'Toggle Import Fold',
+			precondition: CONTEXT_FOLDING_ENABLED,
+			kbOpts: {
+				kbExpr: EditorContextKeys.editorTextFocus,
+				weight: KeybindingWeight.EditorContrib
+			}
+		});
+	}
+
+	async invoke(foldingController: FoldingController, foldingModel: FoldingModel): Promise<void> {
+		const regionsToToggle: FoldingRegion[] = [];
+		const regions = foldingModel.regions;
+		for (let i = regions.length - 1; i >= 0; i--) {
+			if (regions.getType(i) === FoldingRangeKind.Imports.value) {
+				regionsToToggle.push(regions.toRegion(i));
+			}
+		}
+		foldingModel.toggleCollapseState(regionsToToggle);
+		foldingController.triggerFoldingModelChanged();
+	}
+}
+
+
 registerEditorContribution(FoldingController.ID, FoldingController, EditorContributionInstantiation.Eager); // eager because it uses `saveViewState`/`restoreViewState`
 registerEditorAction(UnfoldAction);
 registerEditorAction(UnFoldRecursivelyAction);
@@ -1227,6 +1279,7 @@ registerEditorAction(GotoPreviousFoldAction);
 registerEditorAction(GotoNextFoldAction);
 registerEditorAction(FoldRangeFromSelectionAction);
 registerEditorAction(RemoveFoldRangeFromSelectionAction);
+registerEditorAction(ToggleImportFoldAction);
 
 for (let i = 1; i <= 7; i++) {
 	registerInstantiatedEditorAction(
diff --git a/src/vs/editor/contrib/folding/browser/foldingDecorations.ts b/src/vs/editor/contrib/folding/browser/foldingDecorations.ts
index 03a9b4a402c..821badb88af 100644
--- a/src/vs/editor/contrib/folding/browser/foldingDecorations.ts
+++ b/src/vs/editor/contrib/folding/browser/foldingDecorations.ts
@@ -3,19 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from 'vs/base/common/codicons';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IModelDecorationOptions, IModelDecorationsChangeAccessor, MinimapPosition, TrackedRangeStickiness } from 'vs/editor/common/model';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { IDecorationProvider } from 'vs/editor/contrib/folding/browser/foldingModel';
-import { localize } from 'vs/nls';
-import { editorSelectionBackground, iconForeground, registerColor, transparent } from 'vs/platform/theme/common/colorRegistry';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { themeColorFromId } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { IModelDecorationOptions, IModelDecorationsChangeAccessor, MinimapPosition, TrackedRangeStickiness } from '../../../common/model.js';
+import { ModelDecorationOptions } from '../../../common/model/textModel.js';
+import { IDecorationProvider } from './foldingModel.js';
+import { localize } from '../../../../nls.js';
+import { editorSelectionBackground, iconForeground, registerColor, transparent } from '../../../../platform/theme/common/colorRegistry.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { themeColorFromId } from '../../../../platform/theme/common/themeService.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
 
 const foldBackground = registerColor('editor.foldBackground', { light: transparent(editorSelectionBackground, 0.3), dark: transparent(editorSelectionBackground, 0.3), hcDark: null, hcLight: null }, localize('foldBackgroundBackground', "Background color behind folded ranges. The color must not be opaque so as not to hide underlying decorations."), true);
-registerColor('editorGutter.foldingControlForeground', { dark: iconForeground, light: iconForeground, hcDark: iconForeground, hcLight: iconForeground }, localize('editorGutter.foldingControlForeground', 'Color of the folding control in the editor gutter.'));
+registerColor('editor.foldPlaceholderForeground', { light: '#808080', dark: '#808080', hcDark: null, hcLight: null }, localize('collapsedTextColor', "Color of the collapsed text after the first line of a folded range."));
+registerColor('editorGutter.foldingControlForeground', iconForeground, localize('editorGutter.foldingControlForeground', 'Color of the folding control in the editor gutter.'));
 
 export const foldingExpandedIcon = registerIcon('folding-expanded', Codicon.chevronDown, localize('foldingExpandedIcon', 'Icon for expanded ranges in the editor glyph margin.'));
 export const foldingCollapsedIcon = registerIcon('folding-collapsed', Codicon.chevronRight, localize('foldingCollapsedIcon', 'Icon for collapsed ranges in the editor glyph margin.'));
diff --git a/src/vs/editor/contrib/folding/browser/foldingModel.ts b/src/vs/editor/contrib/folding/browser/foldingModel.ts
index b031a05abcc..c7721163695 100644
--- a/src/vs/editor/contrib/folding/browser/foldingModel.ts
+++ b/src/vs/editor/contrib/folding/browser/foldingModel.ts
@@ -3,10 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { IModelDecorationOptions, IModelDecorationsChangeAccessor, IModelDeltaDecoration, ITextModel } from 'vs/editor/common/model';
-import { FoldingRegion, FoldingRegions, ILineRange, FoldRange, FoldSource } from './foldingRanges';
-import { hash } from 'vs/base/common/hash';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { IModelDecorationOptions, IModelDecorationsChangeAccessor, IModelDeltaDecoration, ITextModel } from '../../../common/model.js';
+import { FoldingRegion, FoldingRegions, ILineRange, FoldRange, FoldSource } from './foldingRanges.js';
+import { hash } from '../../../../base/common/hash.js';
+import { SelectedLines } from './folding.js';
 
 export interface IDecorationProvider {
 	getDecorationOption(isCollapsed: boolean, isHidden: boolean, isManual: boolean): IModelDecorationOptions;
@@ -111,9 +112,9 @@ export class FoldingModel {
 		this.updatePost(FoldingRegions.fromFoldRanges(newFoldingRanges));
 	}
 
-	public update(newRegions: FoldingRegions, blockedLineNumers: number[] = []): void {
-		const foldedOrManualRanges = this._currentFoldedOrManualRanges(blockedLineNumers);
-		const newRanges = FoldingRegions.sanitizeAndMerge(newRegions, foldedOrManualRanges, this._textModel.getLineCount());
+	public update(newRegions: FoldingRegions, selection?: SelectedLines): void {
+		const foldedOrManualRanges = this._currentFoldedOrManualRanges(selection);
+		const newRanges = FoldingRegions.sanitizeAndMerge(newRegions, foldedOrManualRanges, this._textModel.getLineCount(), selection);
 		this.updatePost(FoldingRegions.fromFoldRanges(newRanges));
 	}
 
@@ -141,17 +142,7 @@ export class FoldingModel {
 		this._updateEventEmitter.fire({ model: this });
 	}
 
-	private _currentFoldedOrManualRanges(blockedLineNumers: number[] = []): FoldRange[] {
-
-		const isBlocked = (startLineNumber: number, endLineNumber: number) => {
-			for (const blockedLineNumber of blockedLineNumers) {
-				if (startLineNumber < blockedLineNumber && blockedLineNumber <= endLineNumber) { // first line is visible
-					return true;
-				}
-			}
-			return false;
-		};
-
+	private _currentFoldedOrManualRanges(selection?: SelectedLines): FoldRange[] {
 		const foldedRanges: FoldRange[] = [];
 		for (let i = 0, limit = this._regions.length; i < limit; i++) {
 			let isCollapsed = this.regions.isCollapsed(i);
@@ -160,7 +151,7 @@ export class FoldingModel {
 				const foldRange = this._regions.toFoldRange(i);
 				const decRange = this._textModel.getDecorationRange(this._editorDecorationIds[i]);
 				if (decRange) {
-					if (isCollapsed && isBlocked(decRange.startLineNumber, decRange.endLineNumber)) {
+					if (isCollapsed && selection?.startsInside(decRange.startLineNumber + 1, decRange.endLineNumber)) {
 						isCollapsed = false; // uncollapse is the range is blocked
 					}
 					foldedRanges.push({
diff --git a/src/vs/editor/contrib/folding/browser/foldingRanges.ts b/src/vs/editor/contrib/folding/browser/foldingRanges.ts
index ee23abbfc74..45291a36e5f 100644
--- a/src/vs/editor/contrib/folding/browser/foldingRanges.ts
+++ b/src/vs/editor/contrib/folding/browser/foldingRanges.ts
@@ -3,6 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { SelectedLines } from './folding.js';
+
 export interface ILineRange {
 	startLineNumber: number;
 	endLineNumber: number;
@@ -299,7 +301,10 @@ export class FoldingRegions {
 	public static sanitizeAndMerge(
 		rangesA: FoldingRegions | FoldRange[],
 		rangesB: FoldingRegions | FoldRange[],
-		maxLineNumber: number | undefined): FoldRange[] {
+		maxLineNumber: number | undefined,
+		selection?: SelectedLines
+	): FoldRange[] {
+
 		maxLineNumber = maxLineNumber ?? Number.MAX_VALUE;
 
 		const getIndexedFunction = (r: FoldingRegions | FoldRange[], limit: number) => {
@@ -330,7 +335,8 @@ export class FoldingRegions {
 					} else {
 						// a previously folded range or a (possibly unfolded) recovered range
 						useRange = nextA;
-						useRange.isCollapsed = nextB.isCollapsed && nextA.endLineNumber === nextB.endLineNumber;
+						// stays collapsed if the range still has the same number of lines or the selection is not in the range or after it
+						useRange.isCollapsed = nextB.isCollapsed && (nextA.endLineNumber === nextB.endLineNumber || !selection?.startsInside(nextA.startLineNumber + 1, nextA.endLineNumber + 1));
 						useRange.source = FoldSource.provider;
 					}
 					nextA = getA(++indexA); // not necessary, just for speed
diff --git a/src/vs/editor/contrib/folding/browser/hiddenRangeModel.ts b/src/vs/editor/contrib/folding/browser/hiddenRangeModel.ts
index 6d72da79026..9994afcb847 100644
--- a/src/vs/editor/contrib/folding/browser/hiddenRangeModel.ts
+++ b/src/vs/editor/contrib/folding/browser/hiddenRangeModel.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { findFirstIdxMonotonousOrArrLen } from 'vs/base/common/arraysFind';
+import { findFirstIdxMonotonousOrArrLen } from '../../../../base/common/arraysFind.js';
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { IModelContentChangedEvent } from 'vs/editor/common/textModelEvents';
-import { countEOL } from 'vs/editor/common/core/eolCounter';
-import { FoldingModel } from 'vs/editor/contrib/folding/browser/foldingModel';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { IRange, Range } from '../../../common/core/range.js';
+import { Selection } from '../../../common/core/selection.js';
+import { IModelContentChangedEvent } from '../../../common/textModelEvents.js';
+import { countEOL } from '../../../common/core/eolCounter.js';
+import { FoldingModel } from './foldingModel.js';
 
 export class HiddenRangeModel {
 
diff --git a/src/vs/editor/contrib/folding/browser/indentRangeProvider.ts b/src/vs/editor/contrib/folding/browser/indentRangeProvider.ts
index de53762d48f..e1bbe8a949c 100644
--- a/src/vs/editor/contrib/folding/browser/indentRangeProvider.ts
+++ b/src/vs/editor/contrib/folding/browser/indentRangeProvider.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { ITextModel } from 'vs/editor/common/model';
-import { computeIndentLevel } from 'vs/editor/common/model/utils';
-import { FoldingMarkers } from 'vs/editor/common/languages/languageConfiguration';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { FoldingRegions, MAX_LINE_NUMBER } from 'vs/editor/contrib/folding/browser/foldingRanges';
-import { FoldingLimitReporter, RangeProvider } from './folding';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { ITextModel } from '../../../common/model.js';
+import { computeIndentLevel } from '../../../common/model/utils.js';
+import { FoldingMarkers } from '../../../common/languages/languageConfiguration.js';
+import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import { FoldingRegions, MAX_LINE_NUMBER } from './foldingRanges.js';
+import { FoldingLimitReporter, RangeProvider } from './folding.js';
 
 const MAX_FOLDING_REGIONS_FOR_INDENT_DEFAULT = 5000;
 
diff --git a/src/vs/editor/contrib/folding/browser/syntaxRangeProvider.ts b/src/vs/editor/contrib/folding/browser/syntaxRangeProvider.ts
index 49e03d708fe..97fa12bb6ca 100644
--- a/src/vs/editor/contrib/folding/browser/syntaxRangeProvider.ts
+++ b/src/vs/editor/contrib/folding/browser/syntaxRangeProvider.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { onUnexpectedExternalError } from 'vs/base/common/errors';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ITextModel } from 'vs/editor/common/model';
-import { FoldingContext, FoldingRange, FoldingRangeProvider } from 'vs/editor/common/languages';
-import { FoldingLimitReporter, RangeProvider } from './folding';
-import { FoldingRegions, MAX_LINE_NUMBER } from './foldingRanges';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { onUnexpectedExternalError } from '../../../../base/common/errors.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { ITextModel } from '../../../common/model.js';
+import { FoldingContext, FoldingRange, FoldingRangeProvider } from '../../../common/languages.js';
+import { FoldingLimitReporter, RangeProvider } from './folding.js';
+import { FoldingRegions, MAX_LINE_NUMBER } from './foldingRanges.js';
 
 export interface IFoldingRangeData extends FoldingRange {
 	rank: number;
diff --git a/src/vs/editor/contrib/folding/test/browser/foldingModel.test.ts b/src/vs/editor/contrib/folding/test/browser/foldingModel.test.ts
index 1ea615a5bd9..0a498e74f38 100644
--- a/src/vs/editor/contrib/folding/test/browser/foldingModel.test.ts
+++ b/src/vs/editor/contrib/folding/test/browser/foldingModel.test.ts
@@ -3,17 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { escapeRegExpCharacters } from 'vs/base/common/strings';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { EditOperation } from 'vs/editor/common/core/editOperation';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { IModelDecorationsChangeAccessor, ITextModel, TrackedRangeStickiness } from 'vs/editor/common/model';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { FoldingModel, getNextFoldLine, getParentFoldLine, getPreviousFoldLine, setCollapseStateAtLevel, setCollapseStateForMatchingLines, setCollapseStateForRest, setCollapseStateLevelsDown, setCollapseStateLevelsUp, setCollapseStateUp } from 'vs/editor/contrib/folding/browser/foldingModel';
-import { FoldingRegion } from 'vs/editor/contrib/folding/browser/foldingRanges';
-import { computeRanges } from 'vs/editor/contrib/folding/browser/indentRangeProvider';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
+import { escapeRegExpCharacters } from '../../../../../base/common/strings.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { EditOperation } from '../../../../common/core/editOperation.js';
+import { Position } from '../../../../common/core/position.js';
+import { Range } from '../../../../common/core/range.js';
+import { Selection } from '../../../../common/core/selection.js';
+import { IModelDecorationsChangeAccessor, ITextModel, TrackedRangeStickiness } from '../../../../common/model.js';
+import { ModelDecorationOptions } from '../../../../common/model/textModel.js';
+import { toSelectedLines } from '../../browser/folding.js';
+import { FoldingModel, getNextFoldLine, getParentFoldLine, getPreviousFoldLine, setCollapseStateAtLevel, setCollapseStateForMatchingLines, setCollapseStateForRest, setCollapseStateLevelsDown, setCollapseStateLevelsUp, setCollapseStateUp } from '../../browser/foldingModel.js';
+import { FoldingRegion } from '../../browser/foldingRanges.js';
+import { computeRanges } from '../../browser/indentRangeProvider.js';
+import { createTextModel } from '../../../../test/common/testTextModel.js';
 
 
 interface ExpectedRegion {
@@ -288,7 +290,7 @@ suite('Folding Model', () => {
 
 			textModel.applyEdits([EditOperation.delete(new Range(6, 11, 9, 0))]);
 
-			foldingModel.update(computeRanges(textModel, false, undefined));
+			foldingModel.update(computeRanges(textModel, true, undefined), toSelectedLines([new Selection(7, 1, 7, 1)]));
 
 			assertRanges(foldingModel, [r(1, 9, false), r(2, 8, false), r(3, 5, false), r(6, 8, false)]);
 		} finally {
diff --git a/src/vs/editor/contrib/folding/test/browser/foldingRanges.test.ts b/src/vs/editor/contrib/folding/test/browser/foldingRanges.test.ts
index a1a6dbe1dc1..02876c26aa2 100644
--- a/src/vs/editor/contrib/folding/test/browser/foldingRanges.test.ts
+++ b/src/vs/editor/contrib/folding/test/browser/foldingRanges.test.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { FoldingMarkers } from 'vs/editor/common/languages/languageConfiguration';
-import { MAX_FOLDING_REGIONS, FoldRange, FoldingRegions, FoldSource } from 'vs/editor/contrib/folding/browser/foldingRanges';
-import { RangesCollector, computeRanges } from 'vs/editor/contrib/folding/browser/indentRangeProvider';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { FoldingMarkers } from '../../../../common/languages/languageConfiguration.js';
+import { MAX_FOLDING_REGIONS, FoldRange, FoldingRegions, FoldSource } from '../../browser/foldingRanges.js';
+import { RangesCollector, computeRanges } from '../../browser/indentRangeProvider.js';
+import { createTextModel } from '../../../../test/common/testTextModel.js';
 
 const markers: FoldingMarkers = {
 	start: /^#region$/,
diff --git a/src/vs/editor/contrib/folding/test/browser/hiddenRangeModel.test.ts b/src/vs/editor/contrib/folding/test/browser/hiddenRangeModel.test.ts
index 6d57dec4e78..6570dfe84ce 100644
--- a/src/vs/editor/contrib/folding/test/browser/hiddenRangeModel.test.ts
+++ b/src/vs/editor/contrib/folding/test/browser/hiddenRangeModel.test.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { IRange } from 'vs/editor/common/core/range';
-import { FoldingModel } from 'vs/editor/contrib/folding/browser/foldingModel';
-import { HiddenRangeModel } from 'vs/editor/contrib/folding/browser/hiddenRangeModel';
-import { computeRanges } from 'vs/editor/contrib/folding/browser/indentRangeProvider';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
-import { TestDecorationProvider } from './foldingModel.test';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { IRange } from '../../../../common/core/range.js';
+import { FoldingModel } from '../../browser/foldingModel.js';
+import { HiddenRangeModel } from '../../browser/hiddenRangeModel.js';
+import { computeRanges } from '../../browser/indentRangeProvider.js';
+import { createTextModel } from '../../../../test/common/testTextModel.js';
+import { TestDecorationProvider } from './foldingModel.test.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 
 interface ExpectedRange {
diff --git a/src/vs/editor/contrib/folding/test/browser/indentFold.test.ts b/src/vs/editor/contrib/folding/test/browser/indentFold.test.ts
index 25db0e6d15d..ebbe9842003 100644
--- a/src/vs/editor/contrib/folding/test/browser/indentFold.test.ts
+++ b/src/vs/editor/contrib/folding/test/browser/indentFold.test.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { computeRanges } from 'vs/editor/contrib/folding/browser/indentRangeProvider';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { computeRanges } from '../../browser/indentRangeProvider.js';
+import { createTextModel } from '../../../../test/common/testTextModel.js';
 
 interface IndentRange {
 	start: number;
diff --git a/src/vs/editor/contrib/folding/test/browser/indentRangeProvider.test.ts b/src/vs/editor/contrib/folding/test/browser/indentRangeProvider.test.ts
index 837dd6c0bc4..70d3c589741 100644
--- a/src/vs/editor/contrib/folding/test/browser/indentRangeProvider.test.ts
+++ b/src/vs/editor/contrib/folding/test/browser/indentRangeProvider.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { FoldingMarkers } from 'vs/editor/common/languages/languageConfiguration';
-import { computeRanges } from 'vs/editor/contrib/folding/browser/indentRangeProvider';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { FoldingMarkers } from '../../../../common/languages/languageConfiguration.js';
+import { computeRanges } from '../../browser/indentRangeProvider.js';
+import { createTextModel } from '../../../../test/common/testTextModel.js';
 
 interface ExpectedIndentRange {
 	startLineNumber: number;
diff --git a/src/vs/editor/contrib/folding/test/browser/syntaxFold.test.ts b/src/vs/editor/contrib/folding/test/browser/syntaxFold.test.ts
index 3b2bdb0648e..22387ee2fc9 100644
--- a/src/vs/editor/contrib/folding/test/browser/syntaxFold.test.ts
+++ b/src/vs/editor/contrib/folding/test/browser/syntaxFold.test.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { ITextModel } from 'vs/editor/common/model';
-import { FoldingContext, FoldingRange, FoldingRangeProvider, ProviderResult } from 'vs/editor/common/languages';
-import { SyntaxRangeProvider } from 'vs/editor/contrib/folding/browser/syntaxRangeProvider';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
-import { FoldingLimitReporter } from 'vs/editor/contrib/folding/browser/folding';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { ITextModel } from '../../../../common/model.js';
+import { FoldingContext, FoldingRange, FoldingRangeProvider, ProviderResult } from '../../../../common/languages.js';
+import { SyntaxRangeProvider } from '../../browser/syntaxRangeProvider.js';
+import { createTextModel } from '../../../../test/common/testTextModel.js';
+import { FoldingLimitReporter } from '../../browser/folding.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 interface IndentRange {
 	start: number;
diff --git a/src/vs/editor/contrib/fontZoom/browser/fontZoom.ts b/src/vs/editor/contrib/fontZoom/browser/fontZoom.ts
index bdbf9804563..8093cfb91af 100644
--- a/src/vs/editor/contrib/fontZoom/browser/fontZoom.ts
+++ b/src/vs/editor/contrib/fontZoom/browser/fontZoom.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, registerEditorAction, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { EditorZoom } from 'vs/editor/common/config/editorZoom';
-import * as nls from 'vs/nls';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorAction, registerEditorAction, ServicesAccessor } from '../../../browser/editorExtensions.js';
+import { EditorZoom } from '../../../common/config/editorZoom.js';
+import * as nls from '../../../../nls.js';
 
 class EditorFontZoomIn extends EditorAction {
 
diff --git a/src/vs/editor/contrib/format/browser/format.ts b/src/vs/editor/contrib/format/browser/format.ts
index bb449bb7934..586663691d1 100644
--- a/src/vs/editor/contrib/format/browser/format.ts
+++ b/src/vs/editor/contrib/format/browser/format.ts
@@ -3,34 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { asArray, isNonEmptyArray } from 'vs/base/common/arrays';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { onUnexpectedExternalError } from 'vs/base/common/errors';
-import { Iterable } from 'vs/base/common/iterator';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { LinkedList } from 'vs/base/common/linkedList';
-import { assertType } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { CodeEditorStateFlag, EditorStateCancellationTokenSource, TextModelCancellationTokenSource } from 'vs/editor/contrib/editorState/browser/editorState';
-import { IActiveCodeEditor, isCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ScrollType } from 'vs/editor/common/editorCommon';
-import { ITextModel } from 'vs/editor/common/model';
-import { DocumentFormattingEditProvider, DocumentRangeFormattingEditProvider, FormattingOptions, TextEdit } from 'vs/editor/common/languages';
-import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { FormattingEdit } from 'vs/editor/contrib/format/browser/formattingEdit';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { ExtensionIdentifierSet } from 'vs/platform/extensions/common/extensions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IProgress } from 'vs/platform/progress/common/progress';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import { ILogService } from 'vs/platform/log/common/log';
-import { AccessibilitySignal, IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
+import { asArray, isNonEmptyArray } from '../../../../base/common/arrays.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { onUnexpectedExternalError } from '../../../../base/common/errors.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { LinkedList } from '../../../../base/common/linkedList.js';
+import { assertType } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { CodeEditorStateFlag, EditorStateCancellationTokenSource, TextModelCancellationTokenSource } from '../../editorState/browser/editorState.js';
+import { IActiveCodeEditor, isCodeEditor } from '../../../browser/editorBrowser.js';
+import { ServicesAccessor } from '../../../browser/editorExtensions.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { Selection } from '../../../common/core/selection.js';
+import { ScrollType } from '../../../common/editorCommon.js';
+import { ITextModel } from '../../../common/model.js';
+import { DocumentFormattingEditProvider, DocumentRangeFormattingEditProvider, FormattingOptions, TextEdit } from '../../../common/languages.js';
+import { IEditorWorkerService } from '../../../common/services/editorWorker.js';
+import { ITextModelService } from '../../../common/services/resolverService.js';
+import { FormattingEdit } from './formattingEdit.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { ExtensionIdentifierSet } from '../../../../platform/extensions/common/extensions.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IProgress } from '../../../../platform/progress/common/progress.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { LanguageFeatureRegistry } from '../../../common/languageFeatureRegistry.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
 
 export function getRealAndSyntheticDocumentFormattersOrdered(
 	documentFormattingEditProvider: LanguageFeatureRegistry<DocumentFormattingEditProvider>,
diff --git a/src/vs/editor/contrib/format/browser/formatActions.ts b/src/vs/editor/contrib/format/browser/formatActions.ts
index 1f345ac5329..6f43b2ddc5c 100644
--- a/src/vs/editor/contrib/format/browser/formatActions.ts
+++ b/src/vs/editor/contrib/format/browser/formatActions.ts
@@ -3,30 +3,30 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isNonEmptyArray } from 'vs/base/common/arrays';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, EditorContributionInstantiation, registerEditorAction, registerEditorContribution, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { CharacterSet } from 'vs/editor/common/core/characterClassifier';
-import { Range } from 'vs/editor/common/core/range';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { formatDocumentRangesWithSelectedProvider, formatDocumentWithSelectedProvider, FormattingMode, getOnTypeFormattingEdits } from 'vs/editor/contrib/format/browser/format';
-import { FormattingEdit } from 'vs/editor/contrib/format/browser/formattingEdit';
-import * as nls from 'vs/nls';
-import { AccessibilitySignal, IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { IEditorProgressService, Progress } from 'vs/platform/progress/common/progress';
+import { isNonEmptyArray } from '../../../../base/common/arrays.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { KeyChord, KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorAction, EditorContributionInstantiation, registerEditorAction, registerEditorContribution, ServicesAccessor } from '../../../browser/editorExtensions.js';
+import { ICodeEditorService } from '../../../browser/services/codeEditorService.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { CharacterSet } from '../../../common/core/characterClassifier.js';
+import { Range } from '../../../common/core/range.js';
+import { IEditorContribution } from '../../../common/editorCommon.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { IEditorWorkerService } from '../../../common/services/editorWorker.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { formatDocumentRangesWithSelectedProvider, formatDocumentWithSelectedProvider, FormattingMode, getOnTypeFormattingEdits } from './format.js';
+import { FormattingEdit } from './formattingEdit.js';
+import * as nls from '../../../../nls.js';
+import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { CommandsRegistry, ICommandService } from '../../../../platform/commands/common/commands.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IEditorProgressService, Progress } from '../../../../platform/progress/common/progress.js';
 
 export class FormatOnType implements IEditorContribution {
 
diff --git a/src/vs/editor/contrib/format/browser/formattingEdit.ts b/src/vs/editor/contrib/format/browser/formattingEdit.ts
index 2f4a830a5cf..e2d0dacda38 100644
--- a/src/vs/editor/contrib/format/browser/formattingEdit.ts
+++ b/src/vs/editor/contrib/format/browser/formattingEdit.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditOperation, ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { Range } from 'vs/editor/common/core/range';
-import { EndOfLineSequence } from 'vs/editor/common/model';
-import { TextEdit } from 'vs/editor/common/languages';
-import { StableEditorScrollState } from 'vs/editor/browser/stableEditorScroll';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditOperation, ISingleEditOperation } from '../../../common/core/editOperation.js';
+import { Range } from '../../../common/core/range.js';
+import { EndOfLineSequence } from '../../../common/model.js';
+import { TextEdit } from '../../../common/languages.js';
+import { StableEditorScrollState } from '../../../browser/stableEditorScroll.js';
 
 export class FormattingEdit {
 
diff --git a/src/vs/editor/contrib/gotoError/browser/gotoError.ts b/src/vs/editor/contrib/gotoError/browser/gotoError.ts
index ae9c8eceb23..1dc7c5833ea 100644
--- a/src/vs/editor/contrib/gotoError/browser/gotoError.ts
+++ b/src/vs/editor/contrib/gotoError/browser/gotoError.ts
@@ -3,27 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from 'vs/base/common/codicons';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, EditorCommand, EditorContributionInstantiation, IActionOptions, registerEditorAction, registerEditorCommand, registerEditorContribution, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { IMarkerNavigationService, MarkerList } from 'vs/editor/contrib/gotoError/browser/markerNavigationService';
-import * as nls from 'vs/nls';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { TextEditorSelectionRevealType } from 'vs/platform/editor/common/editor';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { IMarker } from 'vs/platform/markers/common/markers';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { MarkerNavigationWidget } from './gotoErrorWidget';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorAction, EditorCommand, EditorContributionInstantiation, IActionOptions, registerEditorAction, registerEditorCommand, registerEditorContribution, ServicesAccessor } from '../../../browser/editorExtensions.js';
+import { ICodeEditorService } from '../../../browser/services/codeEditorService.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { IEditorContribution } from '../../../common/editorCommon.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { IMarkerNavigationService, MarkerList } from './markerNavigationService.js';
+import * as nls from '../../../../nls.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { TextEditorSelectionRevealType } from '../../../../platform/editor/common/editor.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IMarker } from '../../../../platform/markers/common/markers.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { MarkerNavigationWidget } from './gotoErrorWidget.js';
 
 export class MarkerController implements IEditorContribution {
 
diff --git a/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.ts b/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.ts
index 24ffac212bd..b757cfd5de1 100644
--- a/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.ts
+++ b/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.ts
@@ -3,33 +3,33 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { ScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
-import { IAction } from 'vs/base/common/actions';
-import { isNonEmptyArray } from 'vs/base/common/arrays';
-import { Color } from 'vs/base/common/color';
-import { Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore, dispose } from 'vs/base/common/lifecycle';
-import { basename } from 'vs/base/common/resources';
-import { ScrollbarVisibility } from 'vs/base/common/scrollable';
-import { splitLines } from 'vs/base/common/strings';
-import 'vs/css!./media/gotoErrorWidget';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Range } from 'vs/editor/common/core/range';
-import { ScrollType } from 'vs/editor/common/editorCommon';
-import { peekViewTitleForeground, peekViewTitleInfoForeground, PeekViewWidget } from 'vs/editor/contrib/peekView/browser/peekView';
-import * as nls from 'vs/nls';
-import { createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IMenuService, MenuId } from 'vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { IMarker, IRelatedInformation, MarkerSeverity } from 'vs/platform/markers/common/markers';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { SeverityIcon } from 'vs/platform/severityIcon/browser/severityIcon';
-import { contrastBorder, editorBackground, editorErrorBorder, editorErrorForeground, editorInfoBorder, editorInfoForeground, editorWarningBorder, editorWarningForeground, oneOf, registerColor, transparent } from 'vs/platform/theme/common/colorRegistry';
-import { IColorTheme, IThemeService } from 'vs/platform/theme/common/themeService';
+import * as dom from '../../../../base/browser/dom.js';
+import { ScrollableElement } from '../../../../base/browser/ui/scrollbar/scrollableElement.js';
+import { IAction } from '../../../../base/common/actions.js';
+import { isNonEmptyArray } from '../../../../base/common/arrays.js';
+import { Color } from '../../../../base/common/color.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { DisposableStore, dispose } from '../../../../base/common/lifecycle.js';
+import { basename } from '../../../../base/common/resources.js';
+import { ScrollbarVisibility } from '../../../../base/common/scrollable.js';
+import { splitLines } from '../../../../base/common/strings.js';
+import './media/gotoErrorWidget.css';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { Range } from '../../../common/core/range.js';
+import { ScrollType } from '../../../common/editorCommon.js';
+import { peekViewTitleForeground, peekViewTitleInfoForeground, PeekViewWidget } from '../../peekView/browser/peekView.js';
+import * as nls from '../../../../nls.js';
+import { createAndFillInActionBarActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IMenuService, MenuId } from '../../../../platform/actions/common/actions.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { IMarker, IRelatedInformation, MarkerSeverity } from '../../../../platform/markers/common/markers.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { SeverityIcon } from '../../../../platform/severityIcon/browser/severityIcon.js';
+import { contrastBorder, editorBackground, editorErrorBorder, editorErrorForeground, editorInfoBorder, editorInfoForeground, editorWarningBorder, editorWarningForeground, oneOf, registerColor, transparent } from '../../../../platform/theme/common/colorRegistry.js';
+import { IColorTheme, IThemeService } from '../../../../platform/theme/common/themeService.js';
 
 class MessageWidget {
 
@@ -308,10 +308,9 @@ export class MarkerNavigationWidget extends PeekViewWidget {
 		this._disposables.add(this._actionbarWidget!.actionRunner.onWillRun(e => this.editor.focus()));
 
 		const actions: IAction[] = [];
-		const menu = this._menuService.createMenu(MarkerNavigationWidget.TitleMenu, this._contextKeyService);
-		createAndFillInActionBarActions(menu, undefined, actions);
+		const menu = this._menuService.getMenuActions(MarkerNavigationWidget.TitleMenu, this._contextKeyService);
+		createAndFillInActionBarActions(menu, actions);
 		this._actionbarWidget!.push(actions, { label: false, icon: true, index: 0 });
-		menu.dispose();
 	}
 
 	protected override _fillTitleIcon(container: HTMLElement): void {
@@ -410,4 +409,4 @@ const editorMarkerNavigationWarningHeader = registerColor('editorMarkerNavigatio
 const editorMarkerNavigationInfo = registerColor('editorMarkerNavigationInfo.background', { dark: infoDefault, light: infoDefault, hcDark: contrastBorder, hcLight: contrastBorder }, nls.localize('editorMarkerNavigationInfo', 'Editor marker navigation widget info color.'));
 const editorMarkerNavigationInfoHeader = registerColor('editorMarkerNavigationInfo.headerBackground', { dark: transparent(editorMarkerNavigationInfo, .1), light: transparent(editorMarkerNavigationInfo, .1), hcDark: null, hcLight: null }, nls.localize('editorMarkerNavigationInfoHeaderBackground', 'Editor marker navigation widget info heading background.'));
 
-const editorMarkerNavigationBackground = registerColor('editorMarkerNavigation.background', { dark: editorBackground, light: editorBackground, hcDark: editorBackground, hcLight: editorBackground }, nls.localize('editorMarkerNavigationBackground', 'Editor marker navigation widget background.'));
+const editorMarkerNavigationBackground = registerColor('editorMarkerNavigation.background', editorBackground, nls.localize('editorMarkerNavigationBackground', 'Editor marker navigation widget background.'));
diff --git a/src/vs/editor/contrib/gotoError/browser/markerNavigationService.ts b/src/vs/editor/contrib/gotoError/browser/markerNavigationService.ts
index 1162ef145ea..61b92a3e865 100644
--- a/src/vs/editor/contrib/gotoError/browser/markerNavigationService.ts
+++ b/src/vs/editor/contrib/gotoError/browser/markerNavigationService.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { binarySearch } from 'vs/base/common/arrays';
-import { Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { LinkedList } from 'vs/base/common/linkedList';
-import { compare } from 'vs/base/common/strings';
-import { URI } from 'vs/base/common/uri';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { ITextModel } from 'vs/editor/common/model';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IMarker, IMarkerService, MarkerSeverity } from 'vs/platform/markers/common/markers';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { binarySearch } from '../../../../base/common/arrays.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { LinkedList } from '../../../../base/common/linkedList.js';
+import { compare } from '../../../../base/common/strings.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { ITextModel } from '../../../common/model.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IMarker, IMarkerService, MarkerSeverity } from '../../../../platform/markers/common/markers.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 
 export class MarkerCoordinate {
 	constructor(
diff --git a/src/vs/editor/contrib/gotoSymbol/browser/goToCommands.ts b/src/vs/editor/contrib/gotoSymbol/browser/goToCommands.ts
index 76b08cc63c2..b48cef6910c 100644
--- a/src/vs/editor/contrib/gotoSymbol/browser/goToCommands.ts
+++ b/src/vs/editor/contrib/gotoSymbol/browser/goToCommands.ts
@@ -3,43 +3,43 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { alert } from 'vs/base/browser/ui/aria/aria';
-import { createCancelablePromise, raceCancellation } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { assertType } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { CodeEditorStateFlag, EditorStateCancellationTokenSource } from 'vs/editor/contrib/editorState/browser/editorState';
-import { IActiveCodeEditor, ICodeEditor, isCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction2, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget';
-import { EditorOption, GoToLocationValues } from 'vs/editor/common/config/editorOptions';
-import * as corePosition from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { ScrollType } from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { ITextModel } from 'vs/editor/common/model';
-import { isLocationLink, Location, LocationLink } from 'vs/editor/common/languages';
-import { ReferencesController } from 'vs/editor/contrib/gotoSymbol/browser/peek/referencesController';
-import { ReferencesModel } from 'vs/editor/contrib/gotoSymbol/browser/referencesModel';
-import { ISymbolNavigationService } from 'vs/editor/contrib/gotoSymbol/browser/symbolNavigation';
-import { MessageController } from 'vs/editor/contrib/message/browser/messageController';
-import { PeekContext } from 'vs/editor/contrib/peekView/browser/peekView';
-import * as nls from 'vs/nls';
-import { IAction2F1RequiredOptions, IAction2Options, ISubmenuItem, MenuId, MenuRegistry, registerAction2 } from 'vs/platform/actions/common/actions';
-import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { TextEditorSelectionRevealType, TextEditorSelectionSource } from 'vs/platform/editor/common/editor';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IEditorProgressService } from 'vs/platform/progress/common/progress';
-import { getDeclarationsAtPosition, getDefinitionsAtPosition, getImplementationsAtPosition, getReferencesAtPosition, getTypeDefinitionsAtPosition } from './goToSymbol';
-import { IWordAtPosition } from 'vs/editor/common/core/wordHelper';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { Iterable } from 'vs/base/common/iterator';
-import { IsWebContext } from 'vs/platform/contextkey/common/contextkeys';
+import { alert } from '../../../../base/browser/ui/aria/aria.js';
+import { createCancelablePromise, raceCancellation } from '../../../../base/common/async.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { KeyChord, KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { assertType } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { CodeEditorStateFlag, EditorStateCancellationTokenSource } from '../../editorState/browser/editorState.js';
+import { IActiveCodeEditor, ICodeEditor, isCodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorAction2, ServicesAccessor } from '../../../browser/editorExtensions.js';
+import { ICodeEditorService } from '../../../browser/services/codeEditorService.js';
+import { EmbeddedCodeEditorWidget } from '../../../browser/widget/codeEditor/embeddedCodeEditorWidget.js';
+import { EditorOption, GoToLocationValues } from '../../../common/config/editorOptions.js';
+import * as corePosition from '../../../common/core/position.js';
+import { IRange, Range } from '../../../common/core/range.js';
+import { ScrollType } from '../../../common/editorCommon.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { ITextModel } from '../../../common/model.js';
+import { isLocationLink, Location, LocationLink } from '../../../common/languages.js';
+import { ReferencesController } from './peek/referencesController.js';
+import { ReferencesModel } from './referencesModel.js';
+import { ISymbolNavigationService } from './symbolNavigation.js';
+import { MessageController } from '../../message/browser/messageController.js';
+import { PeekContext } from '../../peekView/browser/peekView.js';
+import * as nls from '../../../../nls.js';
+import { IAction2F1RequiredOptions, IAction2Options, ISubmenuItem, MenuId, MenuRegistry, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { CommandsRegistry, ICommandService } from '../../../../platform/commands/common/commands.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { TextEditorSelectionRevealType, TextEditorSelectionSource } from '../../../../platform/editor/common/editor.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IEditorProgressService } from '../../../../platform/progress/common/progress.js';
+import { getDeclarationsAtPosition, getDefinitionsAtPosition, getImplementationsAtPosition, getReferencesAtPosition, getTypeDefinitionsAtPosition } from './goToSymbol.js';
+import { IWordAtPosition } from '../../../common/core/wordHelper.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { IsWebContext } from '../../../../platform/contextkey/common/contextkeys.js';
 
 MenuRegistry.appendMenuItem(MenuId.EditorContext, {
 	submenu: MenuId.EditorContextPeek,
@@ -253,7 +253,7 @@ export abstract class SymbolNavigationAction extends EditorAction2 {
 export class DefinitionAction extends SymbolNavigationAction {
 
 	protected async _getLocationModel(languageFeaturesService: ILanguageFeaturesService, model: ITextModel, position: corePosition.Position, token: CancellationToken): Promise<ReferencesModel> {
-		return new ReferencesModel(await getDefinitionsAtPosition(languageFeaturesService.definitionProvider, model, position, token), nls.localize('def.title', 'Definitions'));
+		return new ReferencesModel(await getDefinitionsAtPosition(languageFeaturesService.definitionProvider, model, position, false, token), nls.localize('def.title', 'Definitions'));
 	}
 
 	protected _getNoResultFoundMessage(info: IWordAtPosition | null): string {
@@ -380,7 +380,7 @@ registerAction2(class PeekDefinitionAction extends DefinitionAction {
 class DeclarationAction extends SymbolNavigationAction {
 
 	protected async _getLocationModel(languageFeaturesService: ILanguageFeaturesService, model: ITextModel, position: corePosition.Position, token: CancellationToken): Promise<ReferencesModel> {
-		return new ReferencesModel(await getDeclarationsAtPosition(languageFeaturesService.declarationProvider, model, position, token), nls.localize('decl.title', 'Declarations'));
+		return new ReferencesModel(await getDeclarationsAtPosition(languageFeaturesService.declarationProvider, model, position, false, token), nls.localize('decl.title', 'Declarations'));
 	}
 
 	protected _getNoResultFoundMessage(info: IWordAtPosition | null): string {
@@ -467,7 +467,7 @@ registerAction2(class PeekDeclarationAction extends DeclarationAction {
 class TypeDefinitionAction extends SymbolNavigationAction {
 
 	protected async _getLocationModel(languageFeaturesService: ILanguageFeaturesService, model: ITextModel, position: corePosition.Position, token: CancellationToken): Promise<ReferencesModel> {
-		return new ReferencesModel(await getTypeDefinitionsAtPosition(languageFeaturesService.typeDefinitionProvider, model, position, token), nls.localize('typedef.title', 'Type Definitions'));
+		return new ReferencesModel(await getTypeDefinitionsAtPosition(languageFeaturesService.typeDefinitionProvider, model, position, false, token), nls.localize('typedef.title', 'Type Definitions'));
 	}
 
 	protected _getNoResultFoundMessage(info: IWordAtPosition | null): string {
@@ -553,7 +553,7 @@ registerAction2(class PeekTypeDefinitionAction extends TypeDefinitionAction {
 class ImplementationAction extends SymbolNavigationAction {
 
 	protected async _getLocationModel(languageFeaturesService: ILanguageFeaturesService, model: ITextModel, position: corePosition.Position, token: CancellationToken): Promise<ReferencesModel> {
-		return new ReferencesModel(await getImplementationsAtPosition(languageFeaturesService.implementationProvider, model, position, token), nls.localize('impl.title', 'Implementations'));
+		return new ReferencesModel(await getImplementationsAtPosition(languageFeaturesService.implementationProvider, model, position, false, token), nls.localize('impl.title', 'Implementations'));
 	}
 
 	protected _getNoResultFoundMessage(info: IWordAtPosition | null): string {
@@ -695,7 +695,7 @@ registerAction2(class GoToReferencesAction extends ReferencesAction {
 	}
 
 	protected async _getLocationModel(languageFeaturesService: ILanguageFeaturesService, model: ITextModel, position: corePosition.Position, token: CancellationToken): Promise<ReferencesModel> {
-		return new ReferencesModel(await getReferencesAtPosition(languageFeaturesService.referenceProvider, model, position, true, token), nls.localize('ref.title', 'References'));
+		return new ReferencesModel(await getReferencesAtPosition(languageFeaturesService.referenceProvider, model, position, true, false, token), nls.localize('ref.title', 'References'));
 	}
 });
 
@@ -723,7 +723,7 @@ registerAction2(class PeekReferencesAction extends ReferencesAction {
 	}
 
 	protected async _getLocationModel(languageFeaturesService: ILanguageFeaturesService, model: ITextModel, position: corePosition.Position, token: CancellationToken): Promise<ReferencesModel> {
-		return new ReferencesModel(await getReferencesAtPosition(languageFeaturesService.referenceProvider, model, position, false, token), nls.localize('ref.title', 'References'));
+		return new ReferencesModel(await getReferencesAtPosition(languageFeaturesService.referenceProvider, model, position, false, false, token), nls.localize('ref.title', 'References'));
 	}
 });
 
@@ -846,7 +846,7 @@ CommandsRegistry.registerCommand({
 				return undefined;
 			}
 
-			const references = createCancelablePromise(token => getReferencesAtPosition(languageFeaturesService.referenceProvider, control.getModel(), corePosition.Position.lift(position), false, token).then(references => new ReferencesModel(references, nls.localize('ref.title', 'References'))));
+			const references = createCancelablePromise(token => getReferencesAtPosition(languageFeaturesService.referenceProvider, control.getModel(), corePosition.Position.lift(position), false, false, token).then(references => new ReferencesModel(references, nls.localize('ref.title', 'References'))));
 			const range = new Range(position.lineNumber, position.column, position.lineNumber, position.column);
 			return Promise.resolve(controller.toggleWidget(range, references, false));
 		});
diff --git a/src/vs/editor/contrib/gotoSymbol/browser/goToSymbol.ts b/src/vs/editor/contrib/gotoSymbol/browser/goToSymbol.ts
index 738af806684..c76e80dbda7 100644
--- a/src/vs/editor/contrib/gotoSymbol/browser/goToSymbol.ts
+++ b/src/vs/editor/contrib/gotoSymbol/browser/goToSymbol.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { coalesce } from 'vs/base/common/arrays';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { onUnexpectedExternalError } from 'vs/base/common/errors';
-import { matchesSomeScheme, Schemas } from 'vs/base/common/network';
-import { registerModelAndPositionCommand } from 'vs/editor/browser/editorExtensions';
-import { Position } from 'vs/editor/common/core/position';
-import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import { DeclarationProvider, DefinitionProvider, ImplementationProvider, LocationLink, ProviderResult, ReferenceProvider, TypeDefinitionProvider } from 'vs/editor/common/languages';
-import { ITextModel } from 'vs/editor/common/model';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { ReferencesModel } from 'vs/editor/contrib/gotoSymbol/browser/referencesModel';
+import { coalesce } from '../../../../base/common/arrays.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { onUnexpectedExternalError } from '../../../../base/common/errors.js';
+import { matchesSomeScheme, Schemas } from '../../../../base/common/network.js';
+import { registerModelAndPositionCommand } from '../../../browser/editorExtensions.js';
+import { Position } from '../../../common/core/position.js';
+import { LanguageFeatureRegistry } from '../../../common/languageFeatureRegistry.js';
+import { DeclarationProvider, DefinitionProvider, ImplementationProvider, LocationLink, ProviderResult, ReferenceProvider, TypeDefinitionProvider } from '../../../common/languages.js';
+import { ITextModel } from '../../../common/model.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { ReferencesModel } from './referencesModel.js';
 
 function shouldIncludeLocationLink(sourceModel: ITextModel, loc: LocationLink): boolean {
 	// Always allow the location if the request comes from a document with the same scheme.
@@ -22,7 +22,7 @@ function shouldIncludeLocationLink(sourceModel: ITextModel, loc: LocationLink):
 	}
 
 	// Otherwise filter out locations from internal schemes
-	if (matchesSomeScheme(loc.uri, Schemas.walkThroughSnippet, Schemas.vscodeChatCodeBlock, Schemas.vscodeChatCodeCompareBlock, Schemas.vscodeCopilotBackingChatCodeBlock)) {
+	if (matchesSomeScheme(loc.uri, Schemas.walkThroughSnippet, Schemas.vscodeChatCodeBlock, Schemas.vscodeChatCodeCompareBlock)) {
 		return false;
 	}
 
@@ -33,9 +33,10 @@ async function getLocationLinks<T>(
 	model: ITextModel,
 	position: Position,
 	registry: LanguageFeatureRegistry<T>,
+	recursive: boolean,
 	provide: (provider: T, model: ITextModel, position: Position) => ProviderResult<LocationLink | LocationLink[]>
 ): Promise<LocationLink[]> {
-	const provider = registry.ordered(model);
+	const provider = registry.ordered(model, recursive);
 
 	// get results
 	const promises = provider.map((provider): Promise<LocationLink | LocationLink[] | undefined> => {
@@ -49,32 +50,32 @@ async function getLocationLinks<T>(
 	return coalesce(values.flat()).filter(loc => shouldIncludeLocationLink(model, loc));
 }
 
-export function getDefinitionsAtPosition(registry: LanguageFeatureRegistry<DefinitionProvider>, model: ITextModel, position: Position, token: CancellationToken): Promise<LocationLink[]> {
-	return getLocationLinks(model, position, registry, (provider, model, position) => {
+export function getDefinitionsAtPosition(registry: LanguageFeatureRegistry<DefinitionProvider>, model: ITextModel, position: Position, recursive: boolean, token: CancellationToken): Promise<LocationLink[]> {
+	return getLocationLinks(model, position, registry, recursive, (provider, model, position) => {
 		return provider.provideDefinition(model, position, token);
 	});
 }
 
-export function getDeclarationsAtPosition(registry: LanguageFeatureRegistry<DeclarationProvider>, model: ITextModel, position: Position, token: CancellationToken): Promise<LocationLink[]> {
-	return getLocationLinks(model, position, registry, (provider, model, position) => {
+export function getDeclarationsAtPosition(registry: LanguageFeatureRegistry<DeclarationProvider>, model: ITextModel, position: Position, recursive: boolean, token: CancellationToken): Promise<LocationLink[]> {
+	return getLocationLinks(model, position, registry, recursive, (provider, model, position) => {
 		return provider.provideDeclaration(model, position, token);
 	});
 }
 
-export function getImplementationsAtPosition(registry: LanguageFeatureRegistry<ImplementationProvider>, model: ITextModel, position: Position, token: CancellationToken): Promise<LocationLink[]> {
-	return getLocationLinks(model, position, registry, (provider, model, position) => {
+export function getImplementationsAtPosition(registry: LanguageFeatureRegistry<ImplementationProvider>, model: ITextModel, position: Position, recursive: boolean, token: CancellationToken): Promise<LocationLink[]> {
+	return getLocationLinks(model, position, registry, recursive, (provider, model, position) => {
 		return provider.provideImplementation(model, position, token);
 	});
 }
 
-export function getTypeDefinitionsAtPosition(registry: LanguageFeatureRegistry<TypeDefinitionProvider>, model: ITextModel, position: Position, token: CancellationToken): Promise<LocationLink[]> {
-	return getLocationLinks(model, position, registry, (provider, model, position) => {
+export function getTypeDefinitionsAtPosition(registry: LanguageFeatureRegistry<TypeDefinitionProvider>, model: ITextModel, position: Position, recursive: boolean, token: CancellationToken): Promise<LocationLink[]> {
+	return getLocationLinks(model, position, registry, recursive, (provider, model, position) => {
 		return provider.provideTypeDefinition(model, position, token);
 	});
 }
 
-export function getReferencesAtPosition(registry: LanguageFeatureRegistry<ReferenceProvider>, model: ITextModel, position: Position, compact: boolean, token: CancellationToken): Promise<LocationLink[]> {
-	return getLocationLinks(model, position, registry, async (provider, model, position) => {
+export function getReferencesAtPosition(registry: LanguageFeatureRegistry<ReferenceProvider>, model: ITextModel, position: Position, compact: boolean, recursive: boolean, token: CancellationToken): Promise<LocationLink[]> {
+	return getLocationLinks(model, position, registry, recursive, async (provider, model, position) => {
 		const result = (await provider.provideReferences(model, position, { includeDeclaration: true }, token))?.filter(ref => shouldIncludeLocationLink(model, ref));
 		if (!compact || !result || result.length !== 2) {
 			return result;
@@ -99,30 +100,59 @@ async function _sortedAndDeduped(callback: () => Promise<LocationLink[]>): Promi
 
 registerModelAndPositionCommand('_executeDefinitionProvider', (accessor, model, position) => {
 	const languageFeaturesService = accessor.get(ILanguageFeaturesService);
-	const promise = getDefinitionsAtPosition(languageFeaturesService.definitionProvider, model, position, CancellationToken.None);
+	const promise = getDefinitionsAtPosition(languageFeaturesService.definitionProvider, model, position, false, CancellationToken.None);
+	return _sortedAndDeduped(() => promise);
+});
+
+registerModelAndPositionCommand('_executeDefinitionProvider_recursive', (accessor, model, position) => {
+	const languageFeaturesService = accessor.get(ILanguageFeaturesService);
+	const promise = getDefinitionsAtPosition(languageFeaturesService.definitionProvider, model, position, true, CancellationToken.None);
 	return _sortedAndDeduped(() => promise);
 });
 
 registerModelAndPositionCommand('_executeTypeDefinitionProvider', (accessor, model, position) => {
 	const languageFeaturesService = accessor.get(ILanguageFeaturesService);
-	const promise = getTypeDefinitionsAtPosition(languageFeaturesService.typeDefinitionProvider, model, position, CancellationToken.None);
+	const promise = getTypeDefinitionsAtPosition(languageFeaturesService.typeDefinitionProvider, model, position, false, CancellationToken.None);
+	return _sortedAndDeduped(() => promise);
+});
+
+registerModelAndPositionCommand('_executeTypeDefinitionProvider_recursive', (accessor, model, position) => {
+	const languageFeaturesService = accessor.get(ILanguageFeaturesService);
+	const promise = getTypeDefinitionsAtPosition(languageFeaturesService.typeDefinitionProvider, model, position, true, CancellationToken.None);
 	return _sortedAndDeduped(() => promise);
 });
 
 registerModelAndPositionCommand('_executeDeclarationProvider', (accessor, model, position) => {
 	const languageFeaturesService = accessor.get(ILanguageFeaturesService);
-	const promise = getDeclarationsAtPosition(languageFeaturesService.declarationProvider, model, position, CancellationToken.None);
+	const promise = getDeclarationsAtPosition(languageFeaturesService.declarationProvider, model, position, false, CancellationToken.None);
+	return _sortedAndDeduped(() => promise);
+});
+registerModelAndPositionCommand('_executeDeclarationProvider_recursive', (accessor, model, position) => {
+	const languageFeaturesService = accessor.get(ILanguageFeaturesService);
+	const promise = getDeclarationsAtPosition(languageFeaturesService.declarationProvider, model, position, true, CancellationToken.None);
 	return _sortedAndDeduped(() => promise);
 });
 
 registerModelAndPositionCommand('_executeReferenceProvider', (accessor, model, position) => {
 	const languageFeaturesService = accessor.get(ILanguageFeaturesService);
-	const promise = getReferencesAtPosition(languageFeaturesService.referenceProvider, model, position, false, CancellationToken.None);
+	const promise = getReferencesAtPosition(languageFeaturesService.referenceProvider, model, position, false, false, CancellationToken.None);
+	return _sortedAndDeduped(() => promise);
+});
+
+registerModelAndPositionCommand('_executeReferenceProvider_recursive', (accessor, model, position) => {
+	const languageFeaturesService = accessor.get(ILanguageFeaturesService);
+	const promise = getReferencesAtPosition(languageFeaturesService.referenceProvider, model, position, false, true, CancellationToken.None);
 	return _sortedAndDeduped(() => promise);
 });
 
 registerModelAndPositionCommand('_executeImplementationProvider', (accessor, model, position) => {
 	const languageFeaturesService = accessor.get(ILanguageFeaturesService);
-	const promise = getImplementationsAtPosition(languageFeaturesService.implementationProvider, model, position, CancellationToken.None);
+	const promise = getImplementationsAtPosition(languageFeaturesService.implementationProvider, model, position, false, CancellationToken.None);
+	return _sortedAndDeduped(() => promise);
+});
+
+registerModelAndPositionCommand('_executeImplementationProvider_recursive', (accessor, model, position) => {
+	const languageFeaturesService = accessor.get(ILanguageFeaturesService);
+	const promise = getImplementationsAtPosition(languageFeaturesService.implementationProvider, model, position, true, CancellationToken.None);
 	return _sortedAndDeduped(() => promise);
 });
diff --git a/src/vs/editor/contrib/gotoSymbol/browser/link/clickLinkGesture.ts b/src/vs/editor/contrib/gotoSymbol/browser/link/clickLinkGesture.ts
index 2e74af467a9..fb7ab9003ef 100644
--- a/src/vs/editor/contrib/gotoSymbol/browser/link/clickLinkGesture.ts
+++ b/src/vs/editor/contrib/gotoSymbol/browser/link/clickLinkGesture.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { Emitter, Event } from 'vs/base/common/event';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { Disposable } from 'vs/base/common/lifecycle';
-import * as platform from 'vs/base/common/platform';
-import { ICodeEditor, IEditorMouseEvent, IMouseTarget } from 'vs/editor/browser/editorBrowser';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { ICursorSelectionChangedEvent } from 'vs/editor/common/cursorEvents';
+import { IKeyboardEvent } from '../../../../../base/browser/keyboardEvent.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { KeyCode } from '../../../../../base/common/keyCodes.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import * as platform from '../../../../../base/common/platform.js';
+import { ICodeEditor, IEditorMouseEvent, IMouseTarget } from '../../../../browser/editorBrowser.js';
+import { EditorOption } from '../../../../common/config/editorOptions.js';
+import { ICursorSelectionChangedEvent } from '../../../../common/cursorEvents.js';
 
 function hasModifier(e: { ctrlKey: boolean; shiftKey: boolean; altKey: boolean; metaKey: boolean }, modifier: 'ctrlKey' | 'shiftKey' | 'altKey' | 'metaKey'): boolean {
 	return !!e[modifier];
diff --git a/src/vs/editor/contrib/gotoSymbol/browser/link/goToDefinitionAtPosition.ts b/src/vs/editor/contrib/gotoSymbol/browser/link/goToDefinitionAtPosition.ts
index f5a08f94c1e..6f6f8323e02 100644
--- a/src/vs/editor/contrib/gotoSymbol/browser/link/goToDefinitionAtPosition.ts
+++ b/src/vs/editor/contrib/gotoSymbol/browser/link/goToDefinitionAtPosition.ts
@@ -3,34 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import 'vs/css!./goToDefinitionAtPosition';
-import { CodeEditorStateFlag, EditorState } from 'vs/editor/contrib/editorState/browser/editorState';
-import { ICodeEditor, MouseTargetType } from 'vs/editor/browser/editorBrowser';
-import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Position } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { IEditorContribution, IEditorDecorationsCollection } from 'vs/editor/common/editorCommon';
-import { IModelDeltaDecoration, ITextModel } from 'vs/editor/common/model';
-import { LocationLink } from 'vs/editor/common/languages';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { ClickLinkGesture, ClickLinkKeyboardEvent, ClickLinkMouseEvent } from 'vs/editor/contrib/gotoSymbol/browser/link/clickLinkGesture';
-import { PeekContext } from 'vs/editor/contrib/peekView/browser/peekView';
-import * as nls from 'vs/nls';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { DefinitionAction } from '../goToCommands';
-import { getDefinitionsAtPosition } from '../goToSymbol';
-import { IWordAtPosition } from 'vs/editor/common/core/wordHelper';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { ModelDecorationInjectedTextOptions } from 'vs/editor/common/model/textModel';
+import { IKeyboardEvent } from '../../../../../base/browser/keyboardEvent.js';
+import { CancelablePromise, createCancelablePromise } from '../../../../../base/common/async.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { onUnexpectedError } from '../../../../../base/common/errors.js';
+import { MarkdownString } from '../../../../../base/common/htmlContent.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import './goToDefinitionAtPosition.css';
+import { CodeEditorStateFlag, EditorState } from '../../../editorState/browser/editorState.js';
+import { ICodeEditor, MouseTargetType } from '../../../../browser/editorBrowser.js';
+import { EditorContributionInstantiation, registerEditorContribution } from '../../../../browser/editorExtensions.js';
+import { EditorOption } from '../../../../common/config/editorOptions.js';
+import { Position } from '../../../../common/core/position.js';
+import { IRange, Range } from '../../../../common/core/range.js';
+import { IEditorContribution, IEditorDecorationsCollection } from '../../../../common/editorCommon.js';
+import { IModelDeltaDecoration, ITextModel } from '../../../../common/model.js';
+import { LocationLink } from '../../../../common/languages.js';
+import { ILanguageService } from '../../../../common/languages/language.js';
+import { ITextModelService } from '../../../../common/services/resolverService.js';
+import { ClickLinkGesture, ClickLinkKeyboardEvent, ClickLinkMouseEvent } from './clickLinkGesture.js';
+import { PeekContext } from '../../../peekView/browser/peekView.js';
+import * as nls from '../../../../../nls.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { DefinitionAction } from '../goToCommands.js';
+import { getDefinitionsAtPosition } from '../goToSymbol.js';
+import { IWordAtPosition } from '../../../../common/core/wordHelper.js';
+import { ILanguageFeaturesService } from '../../../../common/services/languageFeatures.js';
+import { ModelDecorationInjectedTextOptions } from '../../../../common/model/textModel.js';
 
 export class GotoDefinitionAtPositionEditorContribution implements IEditorContribution {
 
@@ -297,7 +297,7 @@ export class GotoDefinitionAtPositionEditorContribution implements IEditorContri
 			return Promise.resolve(null);
 		}
 
-		return getDefinitionsAtPosition(this.languageFeaturesService.definitionProvider, model, position, token);
+		return getDefinitionsAtPosition(this.languageFeaturesService.definitionProvider, model, position, false, token);
 	}
 
 	private gotoDefinition(position: Position, openToSide: boolean): Promise<any> {
diff --git a/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesController.ts b/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesController.ts
index 40d344f3e3a..175e4c8b49c 100644
--- a/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesController.ts
+++ b/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesController.ts
@@ -3,32 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { Location } from 'vs/editor/common/languages';
-import { getOuterEditor, PeekContext } from 'vs/editor/contrib/peekView/browser/peekView';
-import * as nls from 'vs/nls';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { TextEditorSelectionSource } from 'vs/platform/editor/common/editor';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { IListService, WorkbenchListFocusContextKey, WorkbenchTreeElementCanCollapse, WorkbenchTreeElementCanExpand } from 'vs/platform/list/browser/listService';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { OneReference, ReferencesModel } from '../referencesModel';
-import { LayoutData, ReferenceWidget } from './referencesWidget';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { InputFocusedContext } from 'vs/platform/contextkey/common/contextkeys';
+import { CancelablePromise, createCancelablePromise } from '../../../../../base/common/async.js';
+import { onUnexpectedError } from '../../../../../base/common/errors.js';
+import { KeyChord, KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ICodeEditor } from '../../../../browser/editorBrowser.js';
+import { ICodeEditorService } from '../../../../browser/services/codeEditorService.js';
+import { EditorOption } from '../../../../common/config/editorOptions.js';
+import { Position } from '../../../../common/core/position.js';
+import { Range } from '../../../../common/core/range.js';
+import { IEditorContribution } from '../../../../common/editorCommon.js';
+import { Location } from '../../../../common/languages.js';
+import { getOuterEditor, PeekContext } from '../../../peekView/browser/peekView.js';
+import * as nls from '../../../../../nls.js';
+import { CommandsRegistry } from '../../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from '../../../../../platform/contextkey/common/contextkey.js';
+import { TextEditorSelectionSource } from '../../../../../platform/editor/common/editor.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IListService, WorkbenchListFocusContextKey, WorkbenchTreeElementCanCollapse, WorkbenchTreeElementCanExpand } from '../../../../../platform/list/browser/listService.js';
+import { INotificationService } from '../../../../../platform/notification/common/notification.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { OneReference, ReferencesModel } from '../referencesModel.js';
+import { LayoutData, ReferenceWidget } from './referencesWidget.js';
+import { EditorContextKeys } from '../../../../common/editorContextKeys.js';
+import { InputFocusedContext } from '../../../../../platform/contextkey/common/contextkeys.js';
 
 export const ctxReferenceSearchVisible = new RawContextKey<boolean>('referenceSearchVisible', false, nls.localize('referenceSearchVisible', "Whether reference peek is visible, like 'Peek References' or 'Peek Definition'"));
 
@@ -105,9 +105,14 @@ export abstract class ReferencesController implements IEditorContribution {
 			modelPromise.cancel();
 			if (this._widget) {
 				this._storageService.store(storageKey, JSON.stringify(this._widget.layoutData), StorageScope.PROFILE, StorageTarget.MACHINE);
+				if (!this._widget.isClosing) {
+					// to prevent calling this too many times, check whether it was already closing.
+					this.closeWidget();
+				}
 				this._widget = undefined;
+			} else {
+				this.closeWidget();
 			}
-			this.closeWidget();
 		}));
 
 		this._disposables.add(this._widget.onDidSelectReference(event => {
diff --git a/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesTree.ts b/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesTree.ts
index bb76dd67d6c..15e550cfcfc 100644
--- a/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesTree.ts
+++ b/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesTree.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge';
-import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
-import { IconLabel } from 'vs/base/browser/ui/iconLabel/iconLabel';
-import { IIdentityProvider, IKeyboardNavigationLabelProvider, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
-import { IAsyncDataSource, ITreeNode, ITreeRenderer } from 'vs/base/browser/ui/tree/tree';
-import { createMatches, FuzzyScore, IMatch } from 'vs/base/common/filters';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { basename, dirname } from 'vs/base/common/resources';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { localize } from 'vs/nls';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { defaultCountBadgeStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { FileReferences, OneReference, ReferencesModel } from '../referencesModel';
+import * as dom from '../../../../../base/browser/dom.js';
+import { IKeyboardEvent } from '../../../../../base/browser/keyboardEvent.js';
+import { CountBadge } from '../../../../../base/browser/ui/countBadge/countBadge.js';
+import { HighlightedLabel } from '../../../../../base/browser/ui/highlightedlabel/highlightedLabel.js';
+import { IconLabel } from '../../../../../base/browser/ui/iconLabel/iconLabel.js';
+import { IIdentityProvider, IKeyboardNavigationLabelProvider, IListVirtualDelegate } from '../../../../../base/browser/ui/list/list.js';
+import { IListAccessibilityProvider } from '../../../../../base/browser/ui/list/listWidget.js';
+import { IAsyncDataSource, ITreeNode, ITreeRenderer } from '../../../../../base/browser/ui/tree/tree.js';
+import { createMatches, FuzzyScore, IMatch } from '../../../../../base/common/filters.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { basename, dirname } from '../../../../../base/common/resources.js';
+import { ITextModelService } from '../../../../common/services/resolverService.js';
+import { localize } from '../../../../../nls.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { ILabelService } from '../../../../../platform/label/common/label.js';
+import { defaultCountBadgeStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
+import { FileReferences, OneReference, ReferencesModel } from '../referencesModel.js';
 
 //#region data source
 
diff --git a/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesWidget.ts b/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesWidget.ts
index 0941671756d..fce167fb08f 100644
--- a/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesWidget.ts
+++ b/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesWidget.ts
@@ -3,40 +3,37 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { IMouseEvent } from 'vs/base/browser/mouseEvent';
-import { Orientation } from 'vs/base/browser/ui/sash/sash';
-import { Sizing, SplitView } from 'vs/base/browser/ui/splitview/splitview';
-import { Color } from 'vs/base/common/color';
-import { Emitter, Event } from 'vs/base/common/event';
-import { FuzzyScore } from 'vs/base/common/filters';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { DisposableStore, dispose, IDisposable, IReference } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { basenameOrAuthority, dirname } from 'vs/base/common/resources';
-import 'vs/css!./referencesWidget';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget';
-import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { ScrollType } from 'vs/editor/common/editorCommon';
-import { IModelDeltaDecoration, TrackedRangeStickiness } from 'vs/editor/common/model';
-import { ModelDecorationOptions, TextModel } from 'vs/editor/common/model/textModel';
-import { Location } from 'vs/editor/common/languages';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ITextEditorModel, ITextModelService } from 'vs/editor/common/services/resolverService';
-import { AccessibilityProvider, DataSource, Delegate, FileReferencesRenderer, IdentityProvider, OneReferenceRenderer, StringRepresentationProvider, TreeElement } from 'vs/editor/contrib/gotoSymbol/browser/peek/referencesTree';
-import * as peekView from 'vs/editor/contrib/peekView/browser/peekView';
-import * as nls from 'vs/nls';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { IWorkbenchAsyncDataTreeOptions, WorkbenchAsyncDataTree } from 'vs/platform/list/browser/listService';
-import { IColorTheme, IThemeService } from 'vs/platform/theme/common/themeService';
-import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
-import { FileReferences, OneReference, ReferencesModel } from '../referencesModel';
+import * as dom from '../../../../../base/browser/dom.js';
+import { IMouseEvent } from '../../../../../base/browser/mouseEvent.js';
+import { Orientation } from '../../../../../base/browser/ui/sash/sash.js';
+import { Sizing, SplitView } from '../../../../../base/browser/ui/splitview/splitview.js';
+import { Color } from '../../../../../base/common/color.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { FuzzyScore } from '../../../../../base/common/filters.js';
+import { KeyCode } from '../../../../../base/common/keyCodes.js';
+import { DisposableStore, dispose, IDisposable, IReference } from '../../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { basenameOrAuthority, dirname } from '../../../../../base/common/resources.js';
+import './referencesWidget.css';
+import { ICodeEditor } from '../../../../browser/editorBrowser.js';
+import { EmbeddedCodeEditorWidget } from '../../../../browser/widget/codeEditor/embeddedCodeEditorWidget.js';
+import { IEditorOptions } from '../../../../common/config/editorOptions.js';
+import { IRange, Range } from '../../../../common/core/range.js';
+import { ScrollType } from '../../../../common/editorCommon.js';
+import { IModelDeltaDecoration, TrackedRangeStickiness } from '../../../../common/model.js';
+import { ModelDecorationOptions, TextModel } from '../../../../common/model/textModel.js';
+import { Location } from '../../../../common/languages.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../../../../common/languages/modesRegistry.js';
+import { ITextEditorModel, ITextModelService } from '../../../../common/services/resolverService.js';
+import { AccessibilityProvider, DataSource, Delegate, FileReferencesRenderer, IdentityProvider, OneReferenceRenderer, StringRepresentationProvider, TreeElement } from './referencesTree.js';
+import * as peekView from '../../../peekView/browser/peekView.js';
+import * as nls from '../../../../../nls.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { ILabelService } from '../../../../../platform/label/common/label.js';
+import { IWorkbenchAsyncDataTreeOptions, WorkbenchAsyncDataTree } from '../../../../../platform/list/browser/listService.js';
+import { IColorTheme, IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { FileReferences, OneReference, ReferencesModel } from '../referencesModel.js';
 
 class DecorationsManager implements IDisposable {
 
@@ -214,6 +211,7 @@ export class ReferenceWidget extends peekView.PeekViewWidget {
 	private _previewContainer!: HTMLElement;
 	private _messageContainer!: HTMLElement;
 	private _dim = new dom.Dimension(0, 0);
+	private _isClosing = false; // whether or not a dispose is already in progress
 
 	constructor(
 		editor: ICodeEditor,
@@ -224,10 +222,7 @@ export class ReferenceWidget extends peekView.PeekViewWidget {
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@peekView.IPeekViewService private readonly _peekViewService: peekView.IPeekViewService,
 		@ILabelService private readonly _uriLabel: ILabelService,
-		@IUndoRedoService private readonly _undoRedoService: IUndoRedoService,
 		@IKeybindingService private readonly _keybindingService: IKeybindingService,
-		@ILanguageService private readonly _languageService: ILanguageService,
-		@ILanguageConfigurationService private readonly _languageConfigurationService: ILanguageConfigurationService,
 	) {
 		super(editor, { showFrame: false, showArrow: true, isResizeable: true, isAccessible: true, supportOnTitleClick: true }, _instantiationService);
 
@@ -237,7 +232,12 @@ export class ReferenceWidget extends peekView.PeekViewWidget {
 		this.create();
 	}
 
+	get isClosing() {
+		return this._isClosing;
+	}
+
 	override dispose(): void {
+		this._isClosing = true;
 		this.setModel(undefined);
 		this._callOnDispose.dispose();
 		this._disposeOnNewModel.dispose();
@@ -315,7 +315,7 @@ export class ReferenceWidget extends peekView.PeekViewWidget {
 		};
 		this._preview = this._instantiationService.createInstance(EmbeddedCodeEditorWidget, this._previewContainer, options, {}, this.editor);
 		dom.hide(this._previewContainer);
-		this._previewNotAvailableMessage = new TextModel(nls.localize('missingPreviewMessage', "no preview available"), PLAINTEXT_LANGUAGE_ID, TextModel.DEFAULT_CREATION_OPTIONS, null, this._undoRedoService, this._languageService, this._languageConfigurationService);
+		this._previewNotAvailableMessage = this._instantiationService.createInstance(TextModel, nls.localize('missingPreviewMessage', "no preview available"), PLAINTEXT_LANGUAGE_ID, TextModel.DEFAULT_CREATION_OPTIONS, null);
 
 		// tree
 		this._treeContainer = dom.append(containerElement, dom.$('div.ref-tree.inline'));
diff --git a/src/vs/editor/contrib/gotoSymbol/browser/referencesModel.ts b/src/vs/editor/contrib/gotoSymbol/browser/referencesModel.ts
index 9b52c88aeb8..6248ead0979 100644
--- a/src/vs/editor/contrib/gotoSymbol/browser/referencesModel.ts
+++ b/src/vs/editor/contrib/gotoSymbol/browser/referencesModel.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IMatch } from 'vs/base/common/filters';
-import { defaultGenerator } from 'vs/base/common/idGenerator';
-import { dispose, IDisposable, IReference } from 'vs/base/common/lifecycle';
-import { ResourceMap } from 'vs/base/common/map';
-import { basename, extUri } from 'vs/base/common/resources';
-import * as strings from 'vs/base/common/strings';
-import { Constants } from 'vs/base/common/uint';
-import { URI } from 'vs/base/common/uri';
-import { Position } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { Location, LocationLink } from 'vs/editor/common/languages';
-import { ITextEditorModel, ITextModelService } from 'vs/editor/common/services/resolverService';
-import { localize } from 'vs/nls';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { IMatch } from '../../../../base/common/filters.js';
+import { defaultGenerator } from '../../../../base/common/idGenerator.js';
+import { dispose, IDisposable, IReference } from '../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { basename, extUri } from '../../../../base/common/resources.js';
+import * as strings from '../../../../base/common/strings.js';
+import { Constants } from '../../../../base/common/uint.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Position } from '../../../common/core/position.js';
+import { IRange, Range } from '../../../common/core/range.js';
+import { Location, LocationLink } from '../../../common/languages.js';
+import { ITextEditorModel, ITextModelService } from '../../../common/services/resolverService.js';
+import { localize } from '../../../../nls.js';
 
 export class OneReference {
 
diff --git a/src/vs/editor/contrib/gotoSymbol/browser/symbolNavigation.ts b/src/vs/editor/contrib/gotoSymbol/browser/symbolNavigation.ts
index 2c7046f3d31..e02392bdad9 100644
--- a/src/vs/editor/contrib/gotoSymbol/browser/symbolNavigation.ts
+++ b/src/vs/editor/contrib/gotoSymbol/browser/symbolNavigation.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { combinedDisposable, DisposableStore, dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { isEqual } from 'vs/base/common/resources';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorCommand, registerEditorCommand } from 'vs/editor/browser/editorExtensions';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { Range } from 'vs/editor/common/core/range';
-import { OneReference, ReferencesModel } from 'vs/editor/contrib/gotoSymbol/browser/referencesModel';
-import { localize } from 'vs/nls';
-import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { TextEditorSelectionRevealType } from 'vs/platform/editor/common/editor';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { createDecorator, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { INotificationService } from 'vs/platform/notification/common/notification';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { combinedDisposable, DisposableStore, dispose, IDisposable } from '../../../../base/common/lifecycle.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorCommand, registerEditorCommand } from '../../../browser/editorExtensions.js';
+import { ICodeEditorService } from '../../../browser/services/codeEditorService.js';
+import { Range } from '../../../common/core/range.js';
+import { OneReference, ReferencesModel } from './referencesModel.js';
+import { localize } from '../../../../nls.js';
+import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { TextEditorSelectionRevealType } from '../../../../platform/editor/common/editor.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { createDecorator, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
 
 export const ctxHasSymbols = new RawContextKey('hasSymbols', false, localize('hasSymbols', "Whether there are symbol locations that can be navigated via keyboard-only."));
 
diff --git a/src/vs/editor/contrib/gotoSymbol/test/browser/referencesModel.test.ts b/src/vs/editor/contrib/gotoSymbol/test/browser/referencesModel.test.ts
index a547f9450e1..58e29282327 100644
--- a/src/vs/editor/contrib/gotoSymbol/test/browser/referencesModel.test.ts
+++ b/src/vs/editor/contrib/gotoSymbol/test/browser/referencesModel.test.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { ReferencesModel } from 'vs/editor/contrib/gotoSymbol/browser/referencesModel';
+import { URI } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Position } from '../../../../common/core/position.js';
+import { Range } from '../../../../common/core/range.js';
+import { ReferencesModel } from '../../browser/referencesModel.js';
 
 suite('references', function () {
 
diff --git a/src/vs/editor/contrib/gpu/browser/gpuActions.ts b/src/vs/editor/contrib/gpu/browser/gpuActions.ts
new file mode 100644
index 00000000000..e029dd3632c
--- /dev/null
+++ b/src/vs/editor/contrib/gpu/browser/gpuActions.ts
@@ -0,0 +1,145 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { URI } from '../../../../base/common/uri.js';
+import { localize } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import type { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorAction, registerEditorAction, type ServicesAccessor } from '../../../browser/editorExtensions.js';
+import { ensureNonNullable } from '../../../browser/gpu/gpuUtils.js';
+import { GlyphRasterizer } from '../../../browser/gpu/raster/glyphRasterizer.js';
+import { ViewGpuContext } from '../../../browser/gpu/viewGpuContext.js';
+
+class DebugEditorGpuRendererAction extends EditorAction {
+
+	constructor() {
+		super({
+			id: 'editor.action.debugEditorGpuRenderer',
+			label: localize('gpuDebug.label', "Developer: Debug Editor GPU Renderer"),
+			alias: 'Developer: Debug Editor GPU Renderer',
+			// TODO: Why doesn't `ContextKeyExpr.equals('config:editor.experimentalGpuAcceleration', 'on')` work?
+			precondition: ContextKeyExpr.true(),
+		});
+	}
+
+	async run(accessor: ServicesAccessor, editor: ICodeEditor): Promise<void> {
+		const instantiationService = accessor.get(IInstantiationService);
+		const quickInputService = accessor.get(IQuickInputService);
+		const choice = await quickInputService.pick([
+			{
+				label: localize('logTextureAtlasStats.label', "Log Texture Atlas Stats"),
+				id: 'logTextureAtlasStats',
+			},
+			{
+				label: localize('saveTextureAtlas.label', "Save Texture Atlas"),
+				id: 'saveTextureAtlas',
+			},
+			{
+				label: localize('drawGlyph.label', "Draw Glyph"),
+				id: 'drawGlyph',
+			},
+		], { canPickMany: false });
+		if (!choice) {
+			return;
+		}
+		switch (choice.id) {
+			case 'logTextureAtlasStats':
+				instantiationService.invokeFunction(accessor => {
+					const logService = accessor.get(ILogService);
+
+					const atlas = ViewGpuContext.atlas;
+					if (!ViewGpuContext.atlas) {
+						logService.error('No texture atlas found');
+						return;
+					}
+
+					const stats = atlas.getStats();
+					logService.info(['Texture atlas stats', ...stats].join('\n\n'));
+				});
+				break;
+			case 'saveTextureAtlas':
+				instantiationService.invokeFunction(async accessor => {
+					const workspaceContextService = accessor.get(IWorkspaceContextService);
+					const fileService = accessor.get(IFileService);
+					const folders = workspaceContextService.getWorkspace().folders;
+					if (folders.length > 0) {
+						const atlas = ViewGpuContext.atlas;
+						const promises = [];
+						for (const [layerIndex, page] of atlas.pages.entries()) {
+							promises.push(...[
+								fileService.writeFile(
+									URI.joinPath(folders[0].uri, `textureAtlasPage${layerIndex}_actual.png`),
+									VSBuffer.wrap(new Uint8Array(await (await page.source.convertToBlob()).arrayBuffer()))
+								),
+								fileService.writeFile(
+									URI.joinPath(folders[0].uri, `textureAtlasPage${layerIndex}_usage.png`),
+									VSBuffer.wrap(new Uint8Array(await (await page.getUsagePreview()).arrayBuffer()))
+								),
+							]);
+						}
+						await Promise.all(promises);
+					}
+				});
+				break;
+			case 'drawGlyph':
+				instantiationService.invokeFunction(async accessor => {
+					const configurationService = accessor.get(IConfigurationService);
+					const fileService = accessor.get(IFileService);
+					const quickInputService = accessor.get(IQuickInputService);
+					const workspaceContextService = accessor.get(IWorkspaceContextService);
+
+					const folders = workspaceContextService.getWorkspace().folders;
+					if (folders.length === 0) {
+						return;
+					}
+
+					const atlas = ViewGpuContext.atlas;
+					const fontFamily = configurationService.getValue<string>('editor.fontFamily');
+					const fontSize = configurationService.getValue<number>('editor.fontSize');
+					const rasterizer = new GlyphRasterizer(fontSize, fontFamily);
+					let chars = await quickInputService.input({
+						prompt: 'Enter a character to draw (prefix with 0x for code point))'
+					});
+					if (!chars) {
+						return;
+					}
+					const codePoint = chars.match(/0x(?<codePoint>[0-9a-f]+)/i)?.groups?.codePoint;
+					if (codePoint !== undefined) {
+						chars = String.fromCodePoint(parseInt(codePoint, 16));
+					}
+					const metadata = 0;
+					const rasterizedGlyph = atlas.getGlyph(rasterizer, chars, metadata);
+					if (!rasterizedGlyph) {
+						return;
+					}
+					const imageData = atlas.pages[rasterizedGlyph.pageIndex].source.getContext('2d')?.getImageData(
+						rasterizedGlyph.x,
+						rasterizedGlyph.y,
+						rasterizedGlyph.w,
+						rasterizedGlyph.h
+					);
+					if (!imageData) {
+						return;
+					}
+					const canvas = new OffscreenCanvas(imageData.width, imageData.height);
+					const ctx = ensureNonNullable(canvas.getContext('2d'));
+					ctx.putImageData(imageData, 0, 0);
+					const blob = await canvas.convertToBlob({ type: 'image/png' });
+					const resource = URI.joinPath(folders[0].uri, `glyph_${chars}_${metadata}_${fontSize}px_${fontFamily.replaceAll(/[,\\\/\.'\s]/g, '_')}.png`);
+					await fileService.writeFile(resource, VSBuffer.wrap(new Uint8Array(await blob.arrayBuffer())));
+				});
+				break;
+		}
+	}
+}
+
+registerEditorAction(DebugEditorGpuRendererAction);
diff --git a/src/vs/editor/contrib/hover/browser/contentHoverComputer.ts b/src/vs/editor/contrib/hover/browser/contentHoverComputer.ts
index d5d0e6c85fd..c24cc160749 100644
--- a/src/vs/editor/contrib/hover/browser/contentHoverComputer.ts
+++ b/src/vs/editor/contrib/hover/browser/contentHoverComputer.ts
@@ -3,31 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { coalesce } from 'vs/base/common/arrays';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IActiveCodeEditor, ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IModelDecoration } from 'vs/editor/common/model';
-import { HoverStartSource, IHoverComputer } from 'vs/editor/contrib/hover/browser/hoverOperation';
-import { HoverAnchor, HoverAnchorType, IEditorHoverParticipant, IHoverPart } from 'vs/editor/contrib/hover/browser/hoverTypes';
-import { AsyncIterableObject } from 'vs/base/common/async';
+import { coalesce } from '../../../../base/common/arrays.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IActiveCodeEditor, ICodeEditor } from '../../../browser/editorBrowser.js';
+import { IModelDecoration } from '../../../common/model.js';
+import { HoverStartSource, IHoverComputer } from './hoverOperation.js';
+import { HoverAnchor, HoverAnchorType, IEditorHoverParticipant, IHoverPart } from './hoverTypes.js';
+import { AsyncIterableObject } from '../../../../base/common/async.js';
 
-export class ContentHoverComputer implements IHoverComputer<IHoverPart> {
+export interface ContentHoverComputerOptions {
+	shouldFocus: boolean;
+	anchor: HoverAnchor;
+	source: HoverStartSource;
+	insistOnKeepingHoverVisible: boolean;
+}
 
-	private _anchor: HoverAnchor | null = null;
-	public get anchor(): HoverAnchor | null { return this._anchor; }
-	public set anchor(value: HoverAnchor | null) { this._anchor = value; }
-
-	private _shouldFocus: boolean = false;
-	public get shouldFocus(): boolean { return this._shouldFocus; }
-	public set shouldFocus(value: boolean) { this._shouldFocus = value; }
-
-	private _source: HoverStartSource = HoverStartSource.Mouse;
-	public get source(): HoverStartSource { return this._source; }
-	public set source(value: HoverStartSource) { this._source = value; }
-
-	private _insistOnKeepingHoverVisible: boolean = false;
-	public get insistOnKeepingHoverVisible(): boolean { return this._insistOnKeepingHoverVisible; }
-	public set insistOnKeepingHoverVisible(value: boolean) { this._insistOnKeepingHoverVisible = value; }
+export class ContentHoverComputer implements IHoverComputer<ContentHoverComputerOptions, IHoverPart> {
 
 	constructor(
 		private readonly _editor: ICodeEditor,
@@ -73,8 +64,8 @@ export class ContentHoverComputer implements IHoverComputer<IHoverPart> {
 		});
 	}
 
-	public computeAsync(token: CancellationToken): AsyncIterableObject<IHoverPart> {
-		const anchor = this._anchor;
+	public computeAsync(options: ContentHoverComputerOptions, token: CancellationToken): AsyncIterableObject<IHoverPart> {
+		const anchor = options.anchor;
 
 		if (!this._editor.hasModel() || !anchor) {
 			return AsyncIterableObject.EMPTY;
@@ -92,16 +83,17 @@ export class ContentHoverComputer implements IHoverComputer<IHoverPart> {
 		);
 	}
 
-	public computeSync(): IHoverPart[] {
-		if (!this._editor.hasModel() || !this._anchor) {
+	public computeSync(options: ContentHoverComputerOptions): IHoverPart[] {
+		if (!this._editor.hasModel()) {
 			return [];
 		}
 
-		const lineDecorations = ContentHoverComputer._getLineDecorations(this._editor, this._anchor);
+		const anchor = options.anchor;
+		const lineDecorations = ContentHoverComputer._getLineDecorations(this._editor, anchor);
 
 		let result: IHoverPart[] = [];
 		for (const participant of this._participants) {
-			result = result.concat(participant.computeSync(this._anchor, lineDecorations));
+			result = result.concat(participant.computeSync(anchor, lineDecorations));
 		}
 
 		return coalesce(result);
diff --git a/src/vs/editor/contrib/hover/browser/contentHoverController.ts b/src/vs/editor/contrib/hover/browser/contentHoverController.ts
index 7f49ad50a41..ba56f278b99 100644
--- a/src/vs/editor/contrib/hover/browser/contentHoverController.ts
+++ b/src/vs/editor/contrib/hover/browser/contentHoverController.ts
@@ -3,395 +3,432 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Range } from 'vs/editor/common/core/range';
-import { TokenizationRegistry } from 'vs/editor/common/languages';
-import { HoverOperation, HoverStartMode, HoverStartSource } from 'vs/editor/contrib/hover/browser/hoverOperation';
-import { HoverAnchor, HoverParticipantRegistry, HoverRangeAnchor, IEditorHoverContext, IEditorHoverParticipant, IHoverPart, IHoverWidget } from 'vs/editor/contrib/hover/browser/hoverTypes';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { MarkdownHoverParticipant } from 'vs/editor/contrib/hover/browser/markdownHoverParticipant';
-import { InlayHintsHover } from 'vs/editor/contrib/inlayHints/browser/inlayHintsHover';
-import { HoverVerbosityAction } from 'vs/editor/common/standalone/standaloneEnums';
-import { ContentHoverWidget } from 'vs/editor/contrib/hover/browser/contentHoverWidget';
-import { ContentHoverComputer } from 'vs/editor/contrib/hover/browser/contentHoverComputer';
-import { HoverResult } from 'vs/editor/contrib/hover/browser/contentHoverTypes';
-import { Emitter } from 'vs/base/common/event';
-import { ColorHoverParticipant } from 'vs/editor/contrib/colorPicker/browser/colorHoverParticipant';
-import { RenderedContentHover } from 'vs/editor/contrib/hover/browser/contentHoverRendered';
+import { DECREASE_HOVER_VERBOSITY_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACTION_ID, SHOW_OR_FOCUS_HOVER_ACTION_ID } from './hoverActionIds.js';
+import { IKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { ICodeEditor, IEditorMouseEvent, IPartialEditorMouseEvent } from '../../../browser/editorBrowser.js';
+import { ConfigurationChangedEvent, EditorOption } from '../../../common/config/editorOptions.js';
+import { Range } from '../../../common/core/range.js';
+import { IEditorContribution, IScrollEvent } from '../../../common/editorCommon.js';
+import { HoverStartMode, HoverStartSource } from './hoverOperation.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IHoverWidget } from './hoverTypes.js';
+import { InlineSuggestionHintsContentWidget } from '../../inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { ResultKind } from '../../../../platform/keybinding/common/keybindingResolver.js';
+import { HoverVerbosityAction } from '../../../common/languages.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { isMousePositionWithinElement } from './hoverUtils.js';
+import { ContentHoverWidgetWrapper } from './contentHoverWidgetWrapper.js';
+import './hover.css';
+import { Emitter } from '../../../../base/common/event.js';
 
-export class ContentHoverController extends Disposable implements IHoverWidget {
+// sticky hover widget which doesn't disappear on focus out and such
+const _sticky = false
+	// || Boolean("true") // done "weirdly" so that a lint warning prevents you from pushing this
+	;
 
-	private _currentResult: HoverResult | null = null;
+interface IHoverSettings {
+	readonly enabled: boolean;
+	readonly sticky: boolean;
+	readonly hidingDelay: number;
+}
 
-	private readonly _computer: ContentHoverComputer;
-	private readonly _contentHoverWidget: ContentHoverWidget;
-	private readonly _participants: IEditorHoverParticipant[];
-	// TODO@aiday-mar make array of participants, dispatch between them
-	private readonly _markdownHoverParticipant: MarkdownHoverParticipant | undefined;
-	private readonly _colorHoverParticipant: ColorHoverParticipant | undefined;
-	private readonly _hoverOperation: HoverOperation<IHoverPart>;
+interface IHoverState {
+	mouseDown: boolean;
+	activatedByDecoratorClick: boolean;
+}
 
-	private readonly _onContentsChanged = this._register(new Emitter<void>());
-	public readonly onContentsChanged = this._onContentsChanged.event;
+export class ContentHoverController extends Disposable implements IEditorContribution {
+
+	private readonly _onHoverContentsChanged = this._register(new Emitter<void>());
+	public readonly onHoverContentsChanged = this._onHoverContentsChanged.event;
+
+	public static readonly ID = 'editor.contrib.contentHover';
+
+	public shouldKeepOpenOnEditorMouseMoveOrLeave: boolean = false;
+
+	private readonly _listenersStore = new DisposableStore();
+
+	private _contentWidget: ContentHoverWidgetWrapper | undefined;
+
+	private _mouseMoveEvent: IEditorMouseEvent | undefined;
+	private _reactToEditorMouseMoveRunner: RunOnceScheduler;
+
+	private _hoverSettings!: IHoverSettings;
+	private _hoverState: IHoverState = {
+		mouseDown: false,
+		activatedByDecoratorClick: false
+	};
 
 	constructor(
 		private readonly _editor: ICodeEditor,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-		@IKeybindingService private readonly _keybindingService: IKeybindingService,
+		@IKeybindingService private readonly _keybindingService: IKeybindingService
 	) {
 		super();
-		this._contentHoverWidget = this._register(this._instantiationService.createInstance(ContentHoverWidget, this._editor));
-		const initializedParticipants = this._initializeHoverParticipants();
-		this._participants = initializedParticipants.participants;
-		this._markdownHoverParticipant = initializedParticipants.markdownHoverParticipant;
-		this._colorHoverParticipant = initializedParticipants.colorHoverParticipant;
-		this._computer = new ContentHoverComputer(this._editor, this._participants);
-		this._hoverOperation = this._register(new HoverOperation(this._editor, this._computer));
-		this._registerListeners();
+		this._reactToEditorMouseMoveRunner = this._register(
+			new RunOnceScheduler(
+				() => this._reactToEditorMouseMove(this._mouseMoveEvent), 0
+			)
+		);
+		this._hookListeners();
+		this._register(this._editor.onDidChangeConfiguration((e: ConfigurationChangedEvent) => {
+			if (e.hasChanged(EditorOption.hover)) {
+				this._unhookListeners();
+				this._hookListeners();
+			}
+		}));
 	}
 
-	private _initializeHoverParticipants(): { participants: IEditorHoverParticipant[]; markdownHoverParticipant: MarkdownHoverParticipant | undefined; colorHoverParticipant: ColorHoverParticipant | undefined } {
-		const participants: IEditorHoverParticipant[] = [];
-		let markdownHoverParticipant: MarkdownHoverParticipant | undefined;
-		let colorHoverParticipant: ColorHoverParticipant | undefined;
-		for (const participant of HoverParticipantRegistry.getAll()) {
-			const participantInstance = this._instantiationService.createInstance(participant, this._editor);
-			if (participantInstance instanceof MarkdownHoverParticipant && !(participantInstance instanceof InlayHintsHover)) {
-				markdownHoverParticipant = participantInstance;
-			}
-			if (participantInstance instanceof ColorHoverParticipant) {
-				colorHoverParticipant = participantInstance;
-			}
-			participants.push(participantInstance);
+	static get(editor: ICodeEditor): ContentHoverController | null {
+		return editor.getContribution<ContentHoverController>(ContentHoverController.ID);
+	}
+
+	private _hookListeners(): void {
+
+		const hoverOpts = this._editor.getOption(EditorOption.hover);
+		this._hoverSettings = {
+			enabled: hoverOpts.enabled,
+			sticky: hoverOpts.sticky,
+			hidingDelay: hoverOpts.hidingDelay
+		};
+
+		if (hoverOpts.enabled) {
+			this._listenersStore.add(this._editor.onMouseDown((e: IEditorMouseEvent) => this._onEditorMouseDown(e)));
+			this._listenersStore.add(this._editor.onMouseUp(() => this._onEditorMouseUp()));
+			this._listenersStore.add(this._editor.onMouseMove((e: IEditorMouseEvent) => this._onEditorMouseMove(e)));
+			this._listenersStore.add(this._editor.onKeyDown((e: IKeyboardEvent) => this._onKeyDown(e)));
+		} else {
+			this._listenersStore.add(this._editor.onMouseMove((e: IEditorMouseEvent) => this._onEditorMouseMove(e)));
+			this._listenersStore.add(this._editor.onKeyDown((e: IKeyboardEvent) => this._onKeyDown(e)));
 		}
-		participants.sort((p1, p2) => p1.hoverOrdinal - p2.hoverOrdinal);
-		this._register(this._contentHoverWidget.onDidResize(() => {
-			this._participants.forEach(participant => participant.handleResize?.());
+
+		this._listenersStore.add(this._editor.onMouseLeave((e) => this._onEditorMouseLeave(e)));
+		this._listenersStore.add(this._editor.onDidChangeModel(() => {
+			this._cancelScheduler();
+			this._hideWidgets();
 		}));
-		return { participants, markdownHoverParticipant, colorHoverParticipant };
+		this._listenersStore.add(this._editor.onDidChangeModelContent(() => this._cancelScheduler()));
+		this._listenersStore.add(this._editor.onDidScrollChange((e: IScrollEvent) => this._onEditorScrollChanged(e)));
 	}
 
-	private _registerListeners(): void {
-		this._register(this._hoverOperation.onResult((result) => {
-			if (!this._computer.anchor) {
-				// invalid state, ignore result
-				return;
-			}
-			const messages = (result.hasLoadingMessage ? this._addLoadingMessage(result.value) : result.value);
-			this._withResult(new HoverResult(this._computer.anchor, messages, result.isComplete));
-		}));
-		this._register(dom.addStandardDisposableListener(this._contentHoverWidget.getDomNode(), 'keydown', (e) => {
-			if (e.equals(KeyCode.Escape)) {
-				this.hide();
-			}
-		}));
-		this._register(TokenizationRegistry.onDidChange(() => {
-			if (this._contentHoverWidget.position && this._currentResult) {
-				this._setCurrentResult(this._currentResult); // render again
-			}
-		}));
+	private _unhookListeners(): void {
+		this._listenersStore.clear();
 	}
 
-	/**
-	 * Returns true if the hover shows now or will show.
-	 */
-	private _startShowingOrUpdateHover(
-		anchor: HoverAnchor | null,
+	private _cancelScheduler() {
+		this._mouseMoveEvent = undefined;
+		this._reactToEditorMouseMoveRunner.cancel();
+	}
+
+	private _onEditorScrollChanged(e: IScrollEvent): void {
+		if (e.scrollTopChanged || e.scrollLeftChanged) {
+			this._hideWidgets();
+		}
+	}
+
+	private _onEditorMouseDown(mouseEvent: IEditorMouseEvent): void {
+
+		this._hoverState.mouseDown = true;
+
+		const shouldNotHideCurrentHoverWidget = this._shouldNotHideCurrentHoverWidget(mouseEvent);
+		if (shouldNotHideCurrentHoverWidget) {
+			return;
+		}
+
+		this._hideWidgets();
+	}
+
+	private _shouldNotHideCurrentHoverWidget(mouseEvent: IPartialEditorMouseEvent): boolean {
+		return this._isMouseOnContentHoverWidget(mouseEvent) || this._isContentWidgetResizing();
+	}
+
+	private _isMouseOnContentHoverWidget(mouseEvent: IPartialEditorMouseEvent): boolean {
+		const contentWidgetNode = this._contentWidget?.getDomNode();
+		if (contentWidgetNode) {
+			return isMousePositionWithinElement(contentWidgetNode, mouseEvent.event.posx, mouseEvent.event.posy);
+		}
+		return false;
+	}
+
+	private _onEditorMouseUp(): void {
+		this._hoverState.mouseDown = false;
+	}
+
+	private _onEditorMouseLeave(mouseEvent: IPartialEditorMouseEvent): void {
+		if (this.shouldKeepOpenOnEditorMouseMoveOrLeave) {
+			return;
+		}
+
+		this._cancelScheduler();
+
+		const shouldNotHideCurrentHoverWidget = this._shouldNotHideCurrentHoverWidget(mouseEvent);
+		if (shouldNotHideCurrentHoverWidget) {
+			return;
+		}
+		if (_sticky) {
+			return;
+		}
+		this._hideWidgets();
+	}
+
+	private _shouldNotRecomputeCurrentHoverWidget(mouseEvent: IEditorMouseEvent): boolean {
+
+		const isHoverSticky = this._hoverSettings.sticky;
+
+		const isMouseOnStickyContentHoverWidget = (mouseEvent: IEditorMouseEvent, isHoverSticky: boolean): boolean => {
+			const isMouseOnContentHoverWidget = this._isMouseOnContentHoverWidget(mouseEvent);
+			return isHoverSticky && isMouseOnContentHoverWidget;
+		};
+		const isMouseOnColorPicker = (mouseEvent: IEditorMouseEvent): boolean => {
+			const isMouseOnContentHoverWidget = this._isMouseOnContentHoverWidget(mouseEvent);
+			const isColorPickerVisible = this._contentWidget?.isColorPickerVisible ?? false;
+			return isMouseOnContentHoverWidget && isColorPickerVisible;
+		};
+		// TODO@aiday-mar verify if the following is necessary code
+		const isTextSelectedWithinContentHoverWidget = (mouseEvent: IEditorMouseEvent, sticky: boolean): boolean => {
+			return (sticky
+				&& this._contentWidget?.containsNode(mouseEvent.event.browserEvent.view?.document.activeElement)
+				&& !mouseEvent.event.browserEvent.view?.getSelection()?.isCollapsed) ?? false;
+		};
+
+		return isMouseOnStickyContentHoverWidget(mouseEvent, isHoverSticky)
+			|| isMouseOnColorPicker(mouseEvent)
+			|| isTextSelectedWithinContentHoverWidget(mouseEvent, isHoverSticky);
+	}
+
+	private _onEditorMouseMove(mouseEvent: IEditorMouseEvent): void {
+		if (this.shouldKeepOpenOnEditorMouseMoveOrLeave) {
+			return;
+		}
+
+		this._mouseMoveEvent = mouseEvent;
+		if (this._contentWidget?.isFocused || this._contentWidget?.isResizing) {
+			return;
+		}
+		const sticky = this._hoverSettings.sticky;
+		if (sticky && this._contentWidget?.isVisibleFromKeyboard) {
+			// Sticky mode is on and the hover has been shown via keyboard
+			// so moving the mouse has no effect
+			return;
+		}
+
+		const shouldNotRecomputeCurrentHoverWidget = this._shouldNotRecomputeCurrentHoverWidget(mouseEvent);
+		if (shouldNotRecomputeCurrentHoverWidget) {
+			this._reactToEditorMouseMoveRunner.cancel();
+			return;
+		}
+
+		const hidingDelay = this._hoverSettings.hidingDelay;
+		const isContentHoverWidgetVisible = this._contentWidget?.isVisible;
+		// If the mouse is not over the widget, and if sticky is on,
+		// then give it a grace period before reacting to the mouse event
+		const shouldRescheduleHoverComputation = isContentHoverWidgetVisible && sticky && hidingDelay > 0;
+
+		if (shouldRescheduleHoverComputation) {
+			if (!this._reactToEditorMouseMoveRunner.isScheduled()) {
+				this._reactToEditorMouseMoveRunner.schedule(hidingDelay);
+			}
+			return;
+		}
+		this._reactToEditorMouseMove(mouseEvent);
+	}
+
+	private _reactToEditorMouseMove(mouseEvent: IEditorMouseEvent | undefined): void {
+
+		if (!mouseEvent) {
+			return;
+		}
+
+		const target = mouseEvent.target;
+		const mouseOnDecorator = target.element?.classList.contains('colorpicker-color-decoration');
+		const decoratorActivatedOn = this._editor.getOption(EditorOption.colorDecoratorsActivatedOn);
+
+		const enabled = this._hoverSettings.enabled;
+		const activatedByDecoratorClick = this._hoverState.activatedByDecoratorClick;
+		if (
+			(
+				mouseOnDecorator && (
+					(decoratorActivatedOn === 'click' && !activatedByDecoratorClick) ||
+					(decoratorActivatedOn === 'hover' && !enabled && !_sticky) ||
+					(decoratorActivatedOn === 'clickAndHover' && !enabled && !activatedByDecoratorClick))
+			) || (
+				!mouseOnDecorator && !enabled && !activatedByDecoratorClick
+			)
+		) {
+			this._hideWidgets();
+			return;
+		}
+
+		const contentHoverShowsOrWillShow = this._tryShowHoverWidget(mouseEvent);
+		if (contentHoverShowsOrWillShow) {
+			return;
+		}
+
+		if (_sticky) {
+			return;
+		}
+		this._hideWidgets();
+	}
+
+	private _tryShowHoverWidget(mouseEvent: IEditorMouseEvent): boolean {
+		const contentWidget: IHoverWidget = this._getOrCreateContentWidget();
+		return contentWidget.showsOrWillShow(mouseEvent);
+	}
+
+	private _onKeyDown(e: IKeyboardEvent): void {
+		if (!this._editor.hasModel()) {
+			return;
+		}
+
+		const resolvedKeyboardEvent = this._keybindingService.softDispatch(e, this._editor.getDomNode());
+
+		// If the beginning of a multi-chord keybinding is pressed,
+		// or the command aims to focus the hover,
+		// set the variable to true, otherwise false
+		const shouldKeepHoverVisible = (
+			resolvedKeyboardEvent.kind === ResultKind.MoreChordsNeeded ||
+			(resolvedKeyboardEvent.kind === ResultKind.KbFound
+				&& (resolvedKeyboardEvent.commandId === SHOW_OR_FOCUS_HOVER_ACTION_ID
+					|| resolvedKeyboardEvent.commandId === INCREASE_HOVER_VERBOSITY_ACTION_ID
+					|| resolvedKeyboardEvent.commandId === DECREASE_HOVER_VERBOSITY_ACTION_ID)
+				&& this._contentWidget?.isVisible
+			)
+		);
+
+		if (
+			e.keyCode === KeyCode.Ctrl
+			|| e.keyCode === KeyCode.Alt
+			|| e.keyCode === KeyCode.Meta
+			|| e.keyCode === KeyCode.Shift
+			|| shouldKeepHoverVisible
+		) {
+			// Do not hide hover when a modifier key is pressed
+			return;
+		}
+
+		this._hideWidgets();
+	}
+
+	private _hideWidgets(): void {
+		if (_sticky) {
+			return;
+		}
+		if ((
+			this._hoverState.mouseDown
+			&& this._contentWidget?.isColorPickerVisible
+		) || InlineSuggestionHintsContentWidget.dropDownVisible) {
+			return;
+		}
+		this._hoverState.activatedByDecoratorClick = false;
+		this._contentWidget?.hide();
+	}
+
+	private _getOrCreateContentWidget(): ContentHoverWidgetWrapper {
+		if (!this._contentWidget) {
+			this._contentWidget = this._instantiationService.createInstance(ContentHoverWidgetWrapper, this._editor);
+			this._listenersStore.add(this._contentWidget.onContentsChanged(() => this._onHoverContentsChanged.fire()));
+		}
+		return this._contentWidget;
+	}
+
+	public hideContentHover(): void {
+		this._hideWidgets();
+	}
+
+	public showContentHover(
+		range: Range,
 		mode: HoverStartMode,
 		source: HoverStartSource,
 		focus: boolean,
-		mouseEvent: IEditorMouseEvent | null
-	): boolean {
-		const contentHoverIsVisible = this._contentHoverWidget.position && this._currentResult;
-		if (!contentHoverIsVisible) {
-			if (anchor) {
-				this._startHoverOperationIfNecessary(anchor, mode, source, focus, false);
-				return true;
-			}
-			return false;
-		}
-		const isHoverSticky = this._editor.getOption(EditorOption.hover).sticky;
-		const isMouseGettingCloser = mouseEvent && this._contentHoverWidget.isMouseGettingCloser(mouseEvent.event.posx, mouseEvent.event.posy);
-		const isHoverStickyAndIsMouseGettingCloser = isHoverSticky && isMouseGettingCloser;
-		// The mouse is getting closer to the hover, so we will keep the hover untouched
-		// But we will kick off a hover update at the new anchor, insisting on keeping the hover visible.
-		if (isHoverStickyAndIsMouseGettingCloser) {
-			if (anchor) {
-				this._startHoverOperationIfNecessary(anchor, mode, source, focus, true);
-			}
-			return true;
-		}
-		// If mouse is not getting closer and anchor not defined, hide the hover
-		if (!anchor) {
-			this._setCurrentResult(null);
-			return false;
-		}
-		// If mouse if not getting closer and anchor is defined, and the new anchor is the same as the previous anchor
-		const currentAnchorEqualsPreviousAnchor = this._currentResult!.anchor.equals(anchor);
-		if (currentAnchorEqualsPreviousAnchor) {
-			return true;
-		}
-		// If mouse if not getting closer and anchor is defined, and the new anchor is not compatible with the previous anchor
-		const currentAnchorCompatibleWithPreviousAnchor = anchor.canAdoptVisibleHover(this._currentResult!.anchor, this._contentHoverWidget.position);
-		if (!currentAnchorCompatibleWithPreviousAnchor) {
-			this._setCurrentResult(null);
-			this._startHoverOperationIfNecessary(anchor, mode, source, focus, false);
-			return true;
-		}
-		// We aren't getting any closer to the hover, so we will filter existing results
-		// and keep those which also apply to the new anchor.
-		this._setCurrentResult(this._currentResult!.filter(anchor));
-		this._startHoverOperationIfNecessary(anchor, mode, source, focus, false);
-		return true;
+		activatedByColorDecoratorClick: boolean = false
+	): void {
+		this._hoverState.activatedByDecoratorClick = activatedByColorDecoratorClick;
+		this._getOrCreateContentWidget().startShowingAtRange(range, mode, source, focus);
 	}
 
-	private _startHoverOperationIfNecessary(anchor: HoverAnchor, mode: HoverStartMode, source: HoverStartSource, focus: boolean, insistOnKeepingHoverVisible: boolean): void {
-		const currentAnchorEqualToPreviousHover = this._computer.anchor && this._computer.anchor.equals(anchor);
-		if (currentAnchorEqualToPreviousHover) {
-			return;
-		}
-		this._hoverOperation.cancel();
-		this._computer.anchor = anchor;
-		this._computer.shouldFocus = focus;
-		this._computer.source = source;
-		this._computer.insistOnKeepingHoverVisible = insistOnKeepingHoverVisible;
-		this._hoverOperation.start(mode);
+	private _isContentWidgetResizing(): boolean {
+		return this._contentWidget?.widget.isResizing || false;
 	}
 
-	private _setCurrentResult(hoverResult: HoverResult | null): void {
-		let currentHoverResult = hoverResult;
-		const currentResultEqualToPreviousResult = this._currentResult === currentHoverResult;
-		if (currentResultEqualToPreviousResult) {
-			return;
-		}
-		const currentHoverResultIsEmpty = currentHoverResult && currentHoverResult.hoverParts.length === 0;
-		if (currentHoverResultIsEmpty) {
-			currentHoverResult = null;
-		}
-		this._currentResult = currentHoverResult;
-		if (this._currentResult) {
-			this._showHover(this._currentResult);
-		} else {
-			this._hideHover();
-		}
+	public focusedHoverPartIndex(): number {
+		return this._getOrCreateContentWidget().focusedHoverPartIndex();
 	}
 
-	private _addLoadingMessage(result: IHoverPart[]): IHoverPart[] {
-		if (!this._computer.anchor) {
-			return result;
-		}
-		for (const participant of this._participants) {
-			if (!participant.createLoadingMessage) {
-				continue;
-			}
-			const loadingMessage = participant.createLoadingMessage(this._computer.anchor);
-			if (!loadingMessage) {
-				continue;
-			}
-			return result.slice(0).concat([loadingMessage]);
-		}
-		return result;
+	public doesHoverAtIndexSupportVerbosityAction(index: number, action: HoverVerbosityAction): boolean {
+		return this._getOrCreateContentWidget().doesHoverAtIndexSupportVerbosityAction(index, action);
 	}
 
-	private _withResult(hoverResult: HoverResult): void {
-		const previousHoverIsVisibleWithCompleteResult = this._contentHoverWidget.position && this._currentResult && this._currentResult.isComplete;
-		if (!previousHoverIsVisibleWithCompleteResult) {
-			this._setCurrentResult(hoverResult);
-		}
-		// The hover is visible with a previous complete result.
-		const isCurrentHoverResultComplete = hoverResult.isComplete;
-		if (!isCurrentHoverResultComplete) {
-			// Instead of rendering the new partial result, we wait for the result to be complete.
-			return;
-		}
-		const currentHoverResultIsEmpty = hoverResult.hoverParts.length === 0;
-		const insistOnKeepingPreviousHoverVisible = this._computer.insistOnKeepingHoverVisible;
-		const shouldKeepPreviousHoverVisible = currentHoverResultIsEmpty && insistOnKeepingPreviousHoverVisible;
-		if (shouldKeepPreviousHoverVisible) {
-			// The hover would now hide normally, so we'll keep the previous messages
-			return;
-		}
-		this._setCurrentResult(hoverResult);
-	}
-
-	private _showHover(hoverResult: HoverResult): void {
-		const context = this._getHoverContext();
-		const renderedHover = new RenderedContentHover(this._editor, hoverResult, this._participants, this._computer, context, this._keybindingService);
-		if (renderedHover.domNodeHasChildren) {
-			this._contentHoverWidget.show(renderedHover);
-		} else {
-			renderedHover.dispose();
-		}
-	}
-
-	private _hideHover(): void {
-		this._contentHoverWidget.hide();
-	}
-
-	private _getHoverContext(): IEditorHoverContext {
-		const hide = () => {
-			this.hide();
-		};
-		const onContentsChanged = () => {
-			this._onContentsChanged.fire();
-			this._contentHoverWidget.onContentsChanged();
-		};
-		const setMinimumDimensions = (dimensions: dom.Dimension) => {
-			this._contentHoverWidget.setMinimumDimensions(dimensions);
-		};
-		return { hide, onContentsChanged, setMinimumDimensions };
-	}
-
-
-	public showsOrWillShow(mouseEvent: IEditorMouseEvent): boolean {
-		const isContentWidgetResizing = this._contentHoverWidget.isResizing;
-		if (isContentWidgetResizing) {
-			return true;
-		}
-		const anchorCandidates: HoverAnchor[] = this._findHoverAnchorCandidates(mouseEvent);
-		const anchorCandidatesExist = anchorCandidates.length > 0;
-		if (!anchorCandidatesExist) {
-			return this._startShowingOrUpdateHover(null, HoverStartMode.Delayed, HoverStartSource.Mouse, false, mouseEvent);
-		}
-		const anchor = anchorCandidates[0];
-		return this._startShowingOrUpdateHover(anchor, HoverStartMode.Delayed, HoverStartSource.Mouse, false, mouseEvent);
-	}
-
-	private _findHoverAnchorCandidates(mouseEvent: IEditorMouseEvent): HoverAnchor[] {
-		const anchorCandidates: HoverAnchor[] = [];
-		for (const participant of this._participants) {
-			if (!participant.suggestHoverAnchor) {
-				continue;
-			}
-			const anchor = participant.suggestHoverAnchor(mouseEvent);
-			if (!anchor) {
-				continue;
-			}
-			anchorCandidates.push(anchor);
-		}
-		const target = mouseEvent.target;
-		switch (target.type) {
-			case MouseTargetType.CONTENT_TEXT: {
-				anchorCandidates.push(new HoverRangeAnchor(0, target.range, mouseEvent.event.posx, mouseEvent.event.posy));
-				break;
-			}
-			case MouseTargetType.CONTENT_EMPTY: {
-				const epsilon = this._editor.getOption(EditorOption.fontInfo).typicalHalfwidthCharacterWidth / 2;
-				// Let hover kick in even when the mouse is technically in the empty area after a line, given the distance is small enough
-				const mouseIsWithinLinesAndCloseToHover = !target.detail.isAfterLines
-					&& typeof target.detail.horizontalDistanceToText === 'number'
-					&& target.detail.horizontalDistanceToText < epsilon;
-				if (!mouseIsWithinLinesAndCloseToHover) {
-					break;
-				}
-				anchorCandidates.push(new HoverRangeAnchor(0, target.range, mouseEvent.event.posx, mouseEvent.event.posy));
-				break;
-			}
-		}
-		anchorCandidates.sort((a, b) => b.priority - a.priority);
-		return anchorCandidates;
-	}
-
-	public startShowingAtRange(range: Range, mode: HoverStartMode, source: HoverStartSource, focus: boolean): void {
-		this._startShowingOrUpdateHover(new HoverRangeAnchor(0, range, undefined, undefined), mode, source, focus, null);
-	}
-
-	public async updateMarkdownHoverVerbosityLevel(action: HoverVerbosityAction, index?: number, focus?: boolean): Promise<void> {
-		this._markdownHoverParticipant?.updateMarkdownHoverVerbosityLevel(action, index, focus);
-	}
-
-	public focusedMarkdownHoverIndex(): number {
-		return this._markdownHoverParticipant?.focusedMarkdownHoverIndex() ?? -1;
-	}
-
-	public markdownHoverContentAtIndex(index: number): string {
-		return this._markdownHoverParticipant?.markdownHoverContentAtIndex(index) ?? '';
-	}
-
-	public doesMarkdownHoverAtIndexSupportVerbosityAction(index: number, action: HoverVerbosityAction): boolean {
-		return this._markdownHoverParticipant?.doesMarkdownHoverAtIndexSupportVerbosityAction(index, action) ?? false;
-	}
-
-	public getWidgetContent(): string | undefined {
-		const node = this._contentHoverWidget.getDomNode();
-		if (!node.textContent) {
-			return undefined;
-		}
-		return node.textContent;
-	}
-
-	public containsNode(node: Node | null | undefined): boolean {
-		return (node ? this._contentHoverWidget.getDomNode().contains(node) : false);
+	public updateHoverVerbosityLevel(action: HoverVerbosityAction, index: number, focus?: boolean): void {
+		this._getOrCreateContentWidget().updateHoverVerbosityLevel(action, index, focus);
 	}
 
 	public focus(): void {
-		this._contentHoverWidget.focus();
+		this._contentWidget?.focus();
+	}
+
+	public focusHoverPartWithIndex(index: number): void {
+		this._contentWidget?.focusHoverPartWithIndex(index);
 	}
 
 	public scrollUp(): void {
-		this._contentHoverWidget.scrollUp();
+		this._contentWidget?.scrollUp();
 	}
 
 	public scrollDown(): void {
-		this._contentHoverWidget.scrollDown();
+		this._contentWidget?.scrollDown();
 	}
 
 	public scrollLeft(): void {
-		this._contentHoverWidget.scrollLeft();
+		this._contentWidget?.scrollLeft();
 	}
 
 	public scrollRight(): void {
-		this._contentHoverWidget.scrollRight();
+		this._contentWidget?.scrollRight();
 	}
 
 	public pageUp(): void {
-		this._contentHoverWidget.pageUp();
+		this._contentWidget?.pageUp();
 	}
 
 	public pageDown(): void {
-		this._contentHoverWidget.pageDown();
+		this._contentWidget?.pageDown();
 	}
 
 	public goToTop(): void {
-		this._contentHoverWidget.goToTop();
+		this._contentWidget?.goToTop();
 	}
 
 	public goToBottom(): void {
-		this._contentHoverWidget.goToBottom();
+		this._contentWidget?.goToBottom();
 	}
 
-	public hide(): void {
-		this._computer.anchor = null;
-		this._hoverOperation.cancel();
-		this._setCurrentResult(null);
+	public getWidgetContent(): string | undefined {
+		return this._contentWidget?.getWidgetContent();
 	}
 
-	public get isColorPickerVisible(): boolean {
-		return this._colorHoverParticipant?.isColorPickerVisible() ?? false;
+	public getAccessibleWidgetContent(): string | undefined {
+		return this._contentWidget?.getAccessibleWidgetContent();
 	}
 
-	public get isVisibleFromKeyboard(): boolean {
-		return this._contentHoverWidget.isVisibleFromKeyboard;
+	public getAccessibleWidgetContentAtIndex(index: number): string | undefined {
+		return this._contentWidget?.getAccessibleWidgetContentAtIndex(index);
 	}
 
-	public get isVisible(): boolean {
-		return this._contentHoverWidget.isVisible;
+	public get isColorPickerVisible(): boolean | undefined {
+		return this._contentWidget?.isColorPickerVisible;
 	}
 
-	public get isFocused(): boolean {
-		return this._contentHoverWidget.isFocused;
+	public get isHoverVisible(): boolean | undefined {
+		return this._contentWidget?.isVisible;
 	}
 
-	public get isResizing(): boolean {
-		return this._contentHoverWidget.isResizing;
-	}
-
-	public get widget() {
-		return this._contentHoverWidget;
+	public override dispose(): void {
+		super.dispose();
+		this._unhookListeners();
+		this._listenersStore.dispose();
+		this._contentWidget?.dispose();
 	}
 }
diff --git a/src/vs/editor/contrib/hover/browser/contentHoverRendered.ts b/src/vs/editor/contrib/hover/browser/contentHoverRendered.ts
index 5d9c6f52c8c..af9f9f7397b 100644
--- a/src/vs/editor/contrib/hover/browser/contentHoverRendered.ts
+++ b/src/vs/editor/contrib/hover/browser/contentHoverRendered.ts
@@ -3,17 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IEditorHoverContext, IEditorHoverParticipant, IEditorHoverRenderContext, IHoverPart } from 'vs/editor/contrib/hover/browser/hoverTypes';
-import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { ContentHoverComputer } from 'vs/editor/contrib/hover/browser/contentHoverComputer';
-import { EditorHoverStatusBar } from 'vs/editor/contrib/hover/browser/contentHoverStatusBar';
-import { HoverStartSource } from 'vs/editor/contrib/hover/browser/hoverOperation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { HoverResult } from 'vs/editor/contrib/hover/browser/contentHoverTypes';
+import { IEditorHoverContext, IEditorHoverParticipant, IEditorHoverRenderContext, IHoverPart, IRenderedHoverParts, RenderedHoverParts } from './hoverTypes.js';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { EditorHoverStatusBar } from './contentHoverStatusBar.js';
+import { HoverStartSource } from './hoverOperation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { ModelDecorationOptions } from '../../../common/model/textModel.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { ContentHoverResult } from './contentHoverTypes.js';
+import * as dom from '../../../../base/browser/dom.js';
+import { HoverVerbosityAction } from '../../../common/languages.js';
+import { MarkdownHoverParticipant } from './markdownHoverParticipant.js';
+import { HoverColorPickerParticipant } from '../../colorPicker/browser/hoverColorPicker/hoverColorPickerParticipant.js';
+import { localize } from '../../../../nls.js';
+import { InlayHintsHover } from '../../inlayHints/browser/inlayHintsHover.js';
+import { BugIndicatingError } from '../../../../base/common/errors.js';
+import { HoverAction } from '../../../../base/browser/ui/hover/hoverWidget.js';
 
 export class RenderedContentHover extends Disposable {
 
@@ -31,30 +38,30 @@ export class RenderedContentHover extends Disposable {
 
 	constructor(
 		editor: ICodeEditor,
-		hoverResult: HoverResult,
+		hoverResult: ContentHoverResult,
 		participants: IEditorHoverParticipant<IHoverPart>[],
-		computer: ContentHoverComputer,
 		context: IEditorHoverContext,
 		keybindingService: IKeybindingService
 	) {
 		super();
-		const anchor = hoverResult.anchor;
 		const parts = hoverResult.hoverParts;
 		this._renderedHoverParts = this._register(new RenderedContentHoverParts(
 			editor,
 			participants,
 			parts,
-			context,
-			keybindingService
+			keybindingService,
+			context
 		));
+		const contentHoverComputerOptions = hoverResult.options;
+		const anchor = contentHoverComputerOptions.anchor;
 		const { showAtPosition, showAtSecondaryPosition } = RenderedContentHover.computeHoverPositions(editor, anchor.range, parts);
 		this.shouldAppearBeforeContent = parts.some(m => m.isBeforeContent);
 		this.showAtPosition = showAtPosition;
 		this.showAtSecondaryPosition = showAtSecondaryPosition;
 		this.initialMousePosX = anchor.initialMousePosX;
 		this.initialMousePosY = anchor.initialMousePosY;
-		this.shouldFocus = computer.shouldFocus;
-		this.source = computer.source;
+		this.shouldFocus = contentHoverComputerOptions.shouldFocus;
+		this.source = contentHoverComputerOptions.source;
 	}
 
 	public get domNode(): DocumentFragment {
@@ -65,6 +72,34 @@ export class RenderedContentHover extends Disposable {
 		return this._renderedHoverParts.domNodeHasChildren;
 	}
 
+	public get focusedHoverPartIndex(): number {
+		return this._renderedHoverParts.focusedHoverPartIndex;
+	}
+
+	public focusHoverPartWithIndex(index: number): void {
+		this._renderedHoverParts.focusHoverPartWithIndex(index);
+	}
+
+	public getAccessibleWidgetContent(): string {
+		return this._renderedHoverParts.getAccessibleContent();
+	}
+
+	public getAccessibleWidgetContentAtIndex(index: number): string {
+		return this._renderedHoverParts.getAccessibleHoverContentAtIndex(index);
+	}
+
+	public async updateHoverVerbosityLevel(action: HoverVerbosityAction, index: number, focus?: boolean): Promise<void> {
+		this._renderedHoverParts.updateHoverVerbosityLevel(action, index, focus);
+	}
+
+	public doesHoverAtIndexSupportVerbosityAction(index: number, action: HoverVerbosityAction): boolean {
+		return this._renderedHoverParts.doesHoverAtIndexSupportVerbosityAction(index, action);
+	}
+
+	public isColorPickerVisible(): boolean {
+		return this._renderedHoverParts.isColorPickerVisible();
+	}
+
 	public static computeHoverPositions(editor: ICodeEditor, anchorRange: Range, hoverParts: IHoverPart[]): { showAtPosition: Position; showAtSecondaryPosition: Position } {
 
 		let startColumnBoundary = 1;
@@ -116,6 +151,61 @@ export class RenderedContentHover extends Disposable {
 	}
 }
 
+interface IRenderedContentHoverPart {
+	/**
+	 * Type of rendered part
+	 */
+	type: 'hoverPart';
+	/**
+	 * Participant of the rendered hover part
+	 */
+	participant: IEditorHoverParticipant<IHoverPart>;
+	/**
+	 * The rendered hover part
+	 */
+	hoverPart: IHoverPart;
+	/**
+	 * The HTML element containing the hover status bar.
+	 */
+	hoverElement: HTMLElement;
+}
+
+interface IRenderedContentStatusBar {
+	/**
+	 * Type of rendered part
+	 */
+	type: 'statusBar';
+	/**
+	 * The HTML element containing the hover status bar.
+	 */
+	hoverElement: HTMLElement;
+	/**
+	 * The actions of the hover status bar.
+	 */
+	actions: HoverAction[];
+}
+
+type IRenderedContentHoverPartOrStatusBar = IRenderedContentHoverPart | IRenderedContentStatusBar;
+
+class RenderedStatusBar implements IDisposable {
+
+	constructor(fragment: DocumentFragment, private readonly _statusBar: EditorHoverStatusBar) {
+		fragment.appendChild(this._statusBar.hoverElement);
+	}
+
+	get hoverElement(): HTMLElement {
+		return this._statusBar.hoverElement;
+	}
+
+	get actions(): HoverAction[] {
+		return this._statusBar.actions;
+	}
+
+	dispose() {
+		this._statusBar.dispose();
+	}
+}
+
 class RenderedContentHoverParts extends Disposable {
 
 	private static readonly _DECORATION_OPTIONS = ModelDecorationOptions.register({
@@ -123,27 +213,31 @@ class RenderedContentHoverParts extends Disposable {
 		className: 'hoverHighlight'
 	});
 
-	private readonly _participants: IEditorHoverParticipant<IHoverPart>[];
+	private readonly _renderedParts: IRenderedContentHoverPartOrStatusBar[] = [];
 	private readonly _fragment: DocumentFragment;
+	private readonly _context: IEditorHoverContext;
+
+	private _markdownHoverParticipant: MarkdownHoverParticipant | undefined;
+	private _colorHoverParticipant: HoverColorPickerParticipant | undefined;
+	private _focusedHoverPartIndex: number = -1;
 
 	constructor(
 		editor: ICodeEditor,
 		participants: IEditorHoverParticipant<IHoverPart>[],
 		hoverParts: IHoverPart[],
-		context: IEditorHoverContext,
-		keybindingService: IKeybindingService
+		keybindingService: IKeybindingService,
+		context: IEditorHoverContext
 	) {
 		super();
-		this._participants = participants;
+		this._context = context;
 		this._fragment = document.createDocumentFragment();
-		const statusBar = new EditorHoverStatusBar(keybindingService);
-		const hoverContext: IEditorHoverRenderContext = { fragment: this._fragment, statusBar, ...context };
-		this._register(this._renderHoverParts(hoverContext, hoverParts));
-		this._register(this._renderStatusBar(this._fragment, statusBar));
-		this._register(this._addEditorDecorations(editor, hoverParts));
+		this._register(this._renderParts(participants, hoverParts, context, keybindingService));
+		this._register(this._registerListenersOnRenderedParts());
+		this._register(this._createEditorDecorations(editor, hoverParts));
+		this._updateMarkdownAndColorParticipantInfo(participants);
 	}
 
-	private _addEditorDecorations(editor: ICodeEditor, hoverParts: IHoverPart[]): IDisposable {
+	private _createEditorDecorations(editor: ICodeEditor, hoverParts: IHoverPart[]): IDisposable {
 		if (hoverParts.length === 0) {
 			return Disposable.None;
 		}
@@ -162,25 +256,169 @@ class RenderedContentHoverParts extends Disposable {
 		});
 	}
 
-	private _renderHoverParts(context: IEditorHoverRenderContext, hoverParts: IHoverPart[]): IDisposable {
+	private _renderParts(participants: IEditorHoverParticipant<IHoverPart>[], hoverParts: IHoverPart[], hoverContext: IEditorHoverContext, keybindingService: IKeybindingService): IDisposable {
+		const statusBar = new EditorHoverStatusBar(keybindingService);
+		const hoverRenderingContext: IEditorHoverRenderContext = {
+			fragment: this._fragment,
+			statusBar,
+			...hoverContext
+		};
 		const disposables = new DisposableStore();
-		for (const participant of this._participants) {
-			const hoverPartsForParticipant = hoverParts.filter(hoverPart => hoverPart.owner === participant);
-			const hasHoverPartsForParticipant = hoverPartsForParticipant.length > 0;
-			if (!hasHoverPartsForParticipant) {
-				continue;
+		for (const participant of participants) {
+			const renderedHoverParts = this._renderHoverPartsForParticipant(hoverParts, participant, hoverRenderingContext);
+			disposables.add(renderedHoverParts);
+			for (const renderedHoverPart of renderedHoverParts.renderedHoverParts) {
+				this._renderedParts.push({
+					type: 'hoverPart',
+					participant,
+					hoverPart: renderedHoverPart.hoverPart,
+					hoverElement: renderedHoverPart.hoverElement,
+				});
 			}
-			disposables.add(participant.renderHoverParts(context, hoverPartsForParticipant));
 		}
+		const renderedStatusBar = this._renderStatusBar(this._fragment, statusBar);
+		if (renderedStatusBar) {
+			disposables.add(renderedStatusBar);
+			this._renderedParts.push({
+				type: 'statusBar',
+				hoverElement: renderedStatusBar.hoverElement,
+				actions: renderedStatusBar.actions,
+			});
+		}
+		return toDisposable(() => { disposables.dispose(); });
+	}
+
+	private _renderHoverPartsForParticipant(hoverParts: IHoverPart[], participant: IEditorHoverParticipant<IHoverPart>, hoverRenderingContext: IEditorHoverRenderContext): IRenderedHoverParts<IHoverPart> {
+		const hoverPartsForParticipant = hoverParts.filter(hoverPart => hoverPart.owner === participant);
+		const hasHoverPartsForParticipant = hoverPartsForParticipant.length > 0;
+		if (!hasHoverPartsForParticipant) {
+			return new RenderedHoverParts([]);
+		}
+		return participant.renderHoverParts(hoverRenderingContext, hoverPartsForParticipant);
+	}
+
+	private _renderStatusBar(fragment: DocumentFragment, statusBar: EditorHoverStatusBar): RenderedStatusBar | undefined {
+		if (!statusBar.hasContent) {
+			return undefined;
+		}
+		return new RenderedStatusBar(fragment, statusBar);
+	}
+
+	private _registerListenersOnRenderedParts(): IDisposable {
+		const disposables = new DisposableStore();
+		this._renderedParts.forEach((renderedPart: IRenderedContentHoverPartOrStatusBar, index: number) => {
+			const element = renderedPart.hoverElement;
+			element.tabIndex = 0;
+			disposables.add(dom.addDisposableListener(element, dom.EventType.FOCUS_IN, (event: Event) => {
+				event.stopPropagation();
+				this._focusedHoverPartIndex = index;
+			}));
+			disposables.add(dom.addDisposableListener(element, dom.EventType.FOCUS_OUT, (event: Event) => {
+				event.stopPropagation();
+				this._focusedHoverPartIndex = -1;
+			}));
+		});
 		return disposables;
 	}
 
-	private _renderStatusBar(fragment: DocumentFragment, statusBar: EditorHoverStatusBar): IDisposable {
-		if (!statusBar.hasContent) {
-			return Disposable.None;
+	private _updateMarkdownAndColorParticipantInfo(participants: IEditorHoverParticipant<IHoverPart>[]) {
+		const markdownHoverParticipant = participants.find(p => {
+			return (p instanceof MarkdownHoverParticipant) && !(p instanceof InlayHintsHover);
+		});
+		if (markdownHoverParticipant) {
+			this._markdownHoverParticipant = markdownHoverParticipant as MarkdownHoverParticipant;
 		}
-		fragment.appendChild(statusBar.hoverElement);
-		return statusBar;
+		this._colorHoverParticipant = participants.find(p => p instanceof HoverColorPickerParticipant);
+	}
+
+	public focusHoverPartWithIndex(index: number): void {
+		if (index < 0 || index >= this._renderedParts.length) {
+			return;
+		}
+		this._renderedParts[index].hoverElement.focus();
+	}
+
+	public getAccessibleContent(): string {
+		const content: string[] = [];
+		for (let i = 0; i < this._renderedParts.length; i++) {
+			content.push(this.getAccessibleHoverContentAtIndex(i));
+		}
+		return content.join('\n\n');
+	}
+
+	public getAccessibleHoverContentAtIndex(index: number): string {
+		const renderedPart = this._renderedParts[index];
+		if (!renderedPart) {
+			return '';
+		}
+		if (renderedPart.type === 'statusBar') {
+			const statusBarDescription = [localize('hoverAccessibilityStatusBar', "This is a hover status bar.")];
+			for (const action of renderedPart.actions) {
+				const keybinding = action.actionKeybindingLabel;
+				if (keybinding) {
+					statusBarDescription.push(localize('hoverAccessibilityStatusBarActionWithKeybinding', "It has an action with label {0} and keybinding {1}.", action.actionLabel, keybinding));
+				} else {
+					statusBarDescription.push(localize('hoverAccessibilityStatusBarActionWithoutKeybinding', "It has an action with label {0}.", action.actionLabel));
+				}
+			}
+			return statusBarDescription.join('\n');
+		}
+		return renderedPart.participant.getAccessibleContent(renderedPart.hoverPart);
+	}
+
+	public async updateHoverVerbosityLevel(action: HoverVerbosityAction, index: number, focus?: boolean): Promise<void> {
+		if (!this._markdownHoverParticipant) {
+			return;
+		}
+		const normalizedMarkdownHoverIndex = this._normalizedIndexToMarkdownHoverIndexRange(this._markdownHoverParticipant, index);
+		if (normalizedMarkdownHoverIndex === undefined) {
+			return;
+		}
+		const renderedPart = await this._markdownHoverParticipant.updateMarkdownHoverVerbosityLevel(action, normalizedMarkdownHoverIndex, focus);
+		if (!renderedPart) {
+			return;
+		}
+		this._renderedParts[index] = {
+			type: 'hoverPart',
+			participant: this._markdownHoverParticipant,
+			hoverPart: renderedPart.hoverPart,
+			hoverElement: renderedPart.hoverElement,
+		};
+		this._context.onContentsChanged();
+	}
+
+	public doesHoverAtIndexSupportVerbosityAction(index: number, action: HoverVerbosityAction): boolean {
+		if (!this._markdownHoverParticipant) {
+			return false;
+		}
+		const normalizedMarkdownHoverIndex = this._normalizedIndexToMarkdownHoverIndexRange(this._markdownHoverParticipant, index);
+		if (normalizedMarkdownHoverIndex === undefined) {
+			return false;
+		}
+		return this._markdownHoverParticipant.doesMarkdownHoverAtIndexSupportVerbosityAction(normalizedMarkdownHoverIndex, action);
+	}
+
+	public isColorPickerVisible(): boolean {
+		return this._colorHoverParticipant?.isColorPickerVisible() ?? false;
+	}
+
+	private _normalizedIndexToMarkdownHoverIndexRange(markdownHoverParticipant: MarkdownHoverParticipant, index: number): number | undefined {
+		const renderedPart = this._renderedParts[index];
+		if (!renderedPart || renderedPart.type !== 'hoverPart') {
+			return undefined;
+		}
+		const isHoverPartMarkdownHover = renderedPart.participant === markdownHoverParticipant;
+		if (!isHoverPartMarkdownHover) {
+			return undefined;
+		}
+		const firstIndexOfMarkdownHovers = this._renderedParts.findIndex(renderedPart =>
+			renderedPart.type === 'hoverPart'
+			&& renderedPart.participant === markdownHoverParticipant
+		);
+		if (firstIndexOfMarkdownHovers === -1) {
+			throw new BugIndicatingError();
+		}
+		return index - firstIndexOfMarkdownHovers;
 	}
 
 	public get domNode(): DocumentFragment {
@@ -190,4 +428,8 @@ class RenderedContentHoverParts extends Disposable {
 	public get domNodeHasChildren(): boolean {
 		return this._fragment.hasChildNodes();
 	}
+
+	public get focusedHoverPartIndex(): number {
+		return this._focusedHoverPartIndex;
+	}
 }
diff --git a/src/vs/editor/contrib/hover/browser/contentHoverStatusBar.ts b/src/vs/editor/contrib/hover/browser/contentHoverStatusBar.ts
index 04d84593d06..220b7597603 100644
--- a/src/vs/editor/contrib/hover/browser/contentHoverStatusBar.ts
+++ b/src/vs/editor/contrib/hover/browser/contentHoverStatusBar.ts
@@ -2,17 +2,19 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import * as dom from 'vs/base/browser/dom';
-import { HoverAction } from 'vs/base/browser/ui/hover/hoverWidget';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IEditorHoverAction, IEditorHoverStatusBar } from 'vs/editor/contrib/hover/browser/hoverTypes';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import * as dom from '../../../../base/browser/dom.js';
+import { HoverAction } from '../../../../base/browser/ui/hover/hoverWidget.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IEditorHoverAction, IEditorHoverStatusBar } from './hoverTypes.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 
 const $ = dom.$;
 
 export class EditorHoverStatusBar extends Disposable implements IEditorHoverStatusBar {
 
 	public readonly hoverElement: HTMLElement;
+	public readonly actions: HoverAction[] = [];
+
 	private readonly actionsElement: HTMLElement;
 	private _hasContent: boolean = false;
 
@@ -39,7 +41,9 @@ export class EditorHoverStatusBar extends Disposable implements IEditorHoverStat
 		const keybinding = this._keybindingService.lookupKeybinding(actionOptions.commandId);
 		const keybindingLabel = keybinding ? keybinding.getLabel() : null;
 		this._hasContent = true;
-		return this._register(HoverAction.render(this.actionsElement, actionOptions, keybindingLabel));
+		const action = this._register(HoverAction.render(this.actionsElement, actionOptions, keybindingLabel));
+		this.actions.push(action);
+		return action;
 	}
 
 	public append(element: HTMLElement): HTMLElement {
diff --git a/src/vs/editor/contrib/hover/browser/contentHoverTypes.ts b/src/vs/editor/contrib/hover/browser/contentHoverTypes.ts
index a52d758baa7..81bc25d3597 100644
--- a/src/vs/editor/contrib/hover/browser/contentHoverTypes.ts
+++ b/src/vs/editor/contrib/hover/browser/contentHoverTypes.ts
@@ -3,37 +3,38 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { HoverAnchor, IHoverPart } from 'vs/editor/contrib/hover/browser/hoverTypes';
+import { ContentHoverComputerOptions } from './contentHoverComputer.js';
+import { HoverAnchor, IHoverPart } from './hoverTypes.js';
 
-export class HoverResult {
+export class ContentHoverResult {
 
 	constructor(
-		public readonly anchor: HoverAnchor,
 		public readonly hoverParts: IHoverPart[],
-		public readonly isComplete: boolean
+		public readonly isComplete: boolean,
+		public readonly options: ContentHoverComputerOptions
 	) { }
 
-	public filter(anchor: HoverAnchor): HoverResult {
+	public filter(anchor: HoverAnchor): ContentHoverResult {
 		const filteredHoverParts = this.hoverParts.filter((m) => m.isValidForHoverAnchor(anchor));
 		if (filteredHoverParts.length === this.hoverParts.length) {
 			return this;
 		}
-		return new FilteredHoverResult(this, this.anchor, filteredHoverParts, this.isComplete);
+		return new FilteredContentHoverResult(this, filteredHoverParts, this.isComplete, this.options);
 	}
 }
 
-export class FilteredHoverResult extends HoverResult {
+export class FilteredContentHoverResult extends ContentHoverResult {
 
 	constructor(
-		private readonly original: HoverResult,
-		anchor: HoverAnchor,
+		private readonly original: ContentHoverResult,
 		messages: IHoverPart[],
-		isComplete: boolean
+		isComplete: boolean,
+		options: ContentHoverComputerOptions
 	) {
-		super(anchor, messages, isComplete);
+		super(messages, isComplete, options);
 	}
 
-	public override filter(anchor: HoverAnchor): HoverResult {
+	public override filter(anchor: HoverAnchor): ContentHoverResult {
 		return this.original.filter(anchor);
 	}
 }
diff --git a/src/vs/editor/contrib/hover/browser/contentHoverWidget.ts b/src/vs/editor/contrib/hover/browser/contentHoverWidget.ts
index 37cf8740e37..5dc30190980 100644
--- a/src/vs/editor/contrib/hover/browser/contentHoverWidget.ts
+++ b/src/vs/editor/contrib/hover/browser/contentHoverWidget.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { ContentWidgetPositionPreference, ICodeEditor, IContentWidgetPosition } from 'vs/editor/browser/editorBrowser';
-import { ConfigurationChangedEvent, EditorOption } from 'vs/editor/common/config/editorOptions';
-import { HoverStartSource } from 'vs/editor/contrib/hover/browser/hoverOperation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ResizableContentWidget } from 'vs/editor/contrib/hover/browser/resizableContentWidget';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { getHoverAccessibleViewHint, HoverWidget } from 'vs/base/browser/ui/hover/hoverWidget';
-import { PositionAffinity } from 'vs/editor/common/model';
-import { Emitter } from 'vs/base/common/event';
-import { RenderedContentHover } from 'vs/editor/contrib/hover/browser/contentHoverRendered';
+import * as dom from '../../../../base/browser/dom.js';
+import { ContentWidgetPositionPreference, ICodeEditor, IContentWidgetPosition } from '../../../browser/editorBrowser.js';
+import { ConfigurationChangedEvent, EditorOption } from '../../../common/config/editorOptions.js';
+import { HoverStartSource } from './hoverOperation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { ResizableContentWidget } from './resizableContentWidget.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { getHoverAccessibleViewHint, HoverWidget } from '../../../../base/browser/ui/hover/hoverWidget.js';
+import { PositionAffinity } from '../../../common/model.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { RenderedContentHover } from './contentHoverRendered.js';
 
 const HORIZONTAL_SCROLLING_BY = 30;
 const CONTAINER_HEIGHT_PADDING = 6;
@@ -291,7 +291,7 @@ export class ContentHoverWidget extends ResizableContentWidget {
 
 	private _updateMaxDimensions() {
 		const height = Math.max(this._editor.getLayoutInfo().height / 4, 250, ContentHoverWidget._lastDimensions.height);
-		const width = Math.max(this._editor.getLayoutInfo().width * 0.66, 500, ContentHoverWidget._lastDimensions.width);
+		const width = Math.max(this._editor.getLayoutInfo().width * 0.66, 750, ContentHoverWidget._lastDimensions.width);
 		this._setHoverWidgetMaxDimensions(width, height);
 	}
 
diff --git a/src/vs/editor/contrib/hover/browser/contentHoverWidgetWrapper.ts b/src/vs/editor/contrib/hover/browser/contentHoverWidgetWrapper.ts
new file mode 100644
index 00000000000..61c2be8e63e
--- /dev/null
+++ b/src/vs/editor/contrib/hover/browser/contentHoverWidgetWrapper.ts
@@ -0,0 +1,400 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from '../../../../base/browser/dom.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from '../../../browser/editorBrowser.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { Range } from '../../../common/core/range.js';
+import { TokenizationRegistry } from '../../../common/languages.js';
+import { HoverOperation, HoverResult, HoverStartMode, HoverStartSource } from './hoverOperation.js';
+import { HoverAnchor, HoverParticipantRegistry, HoverRangeAnchor, IEditorHoverContext, IEditorHoverParticipant, IHoverPart, IHoverWidget } from './hoverTypes.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { HoverVerbosityAction } from '../../../common/standalone/standaloneEnums.js';
+import { ContentHoverWidget } from './contentHoverWidget.js';
+import { ContentHoverComputer, ContentHoverComputerOptions } from './contentHoverComputer.js';
+import { ContentHoverResult } from './contentHoverTypes.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { RenderedContentHover } from './contentHoverRendered.js';
+import { isMousePositionWithinElement } from './hoverUtils.js';
+
+export class ContentHoverWidgetWrapper extends Disposable implements IHoverWidget {
+
+	private _currentResult: ContentHoverResult | null = null;
+	private _renderedContentHover: RenderedContentHover | undefined;
+
+	private readonly _contentHoverWidget: ContentHoverWidget;
+	private readonly _participants: IEditorHoverParticipant[];
+	private readonly _hoverOperation: HoverOperation<ContentHoverComputerOptions, IHoverPart>;
+
+	private readonly _onContentsChanged = this._register(new Emitter<void>());
+	public readonly onContentsChanged = this._onContentsChanged.event;
+
+	constructor(
+		private readonly _editor: ICodeEditor,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IKeybindingService private readonly _keybindingService: IKeybindingService,
+	) {
+		super();
+		this._contentHoverWidget = this._register(this._instantiationService.createInstance(ContentHoverWidget, this._editor));
+		this._participants = this._initializeHoverParticipants();
+		this._hoverOperation = this._register(new HoverOperation(this._editor, new ContentHoverComputer(this._editor, this._participants)));
+		this._registerListeners();
+	}
+
+	private _initializeHoverParticipants(): IEditorHoverParticipant[] {
+		const participants: IEditorHoverParticipant[] = [];
+		for (const participant of HoverParticipantRegistry.getAll()) {
+			const participantInstance = this._instantiationService.createInstance(participant, this._editor);
+			participants.push(participantInstance);
+		}
+		participants.sort((p1, p2) => p1.hoverOrdinal - p2.hoverOrdinal);
+		this._register(this._contentHoverWidget.onDidResize(() => {
+			this._participants.forEach(participant => participant.handleResize?.());
+		}));
+		return participants;
+	}
+
+	private _registerListeners(): void {
+		this._register(this._hoverOperation.onResult((result) => {
+			const messages = (result.hasLoadingMessage ? this._addLoadingMessage(result) : result.value);
+			this._withResult(new ContentHoverResult(messages, result.isComplete, result.options));
+		}));
+		const contentHoverWidgetNode = this._contentHoverWidget.getDomNode();
+		this._register(dom.addStandardDisposableListener(contentHoverWidgetNode, 'keydown', (e) => {
+			if (e.equals(KeyCode.Escape)) {
+				this.hide();
+			}
+		}));
+		this._register(dom.addStandardDisposableListener(contentHoverWidgetNode, 'mouseleave', (e) => {
+			this._onMouseLeave(e);
+		}));
+		this._register(TokenizationRegistry.onDidChange(() => {
+			if (this._contentHoverWidget.position && this._currentResult) {
+				this._setCurrentResult(this._currentResult); // render again
+			}
+		}));
+	}
+
+	/**
+	 * Returns true if the hover shows now or will show.
+	 */
+	private _startShowingOrUpdateHover(
+		anchor: HoverAnchor | null,
+		mode: HoverStartMode,
+		source: HoverStartSource,
+		focus: boolean,
+		mouseEvent: IEditorMouseEvent | null
+	): boolean {
+		const contentHoverIsVisible = this._contentHoverWidget.position && this._currentResult;
+		if (!contentHoverIsVisible) {
+			if (anchor) {
+				this._startHoverOperationIfNecessary(anchor, mode, source, focus, false);
+				return true;
+			}
+			return false;
+		}
+		const isHoverSticky = this._editor.getOption(EditorOption.hover).sticky;
+		const isMouseGettingCloser = mouseEvent && this._contentHoverWidget.isMouseGettingCloser(mouseEvent.event.posx, mouseEvent.event.posy);
+		const isHoverStickyAndIsMouseGettingCloser = isHoverSticky && isMouseGettingCloser;
+		// The mouse is getting closer to the hover, so we will keep the hover untouched
+		// But we will kick off a hover update at the new anchor, insisting on keeping the hover visible.
+		if (isHoverStickyAndIsMouseGettingCloser) {
+			if (anchor) {
+				this._startHoverOperationIfNecessary(anchor, mode, source, focus, true);
+			}
+			return true;
+		}
+		// If mouse is not getting closer and anchor not defined, hide the hover
+		if (!anchor) {
+			this._setCurrentResult(null);
+			return false;
+		}
+		// If mouse if not getting closer and anchor is defined, and the new anchor is the same as the previous anchor
+		const currentAnchorEqualsPreviousAnchor = this._currentResult && this._currentResult.options.anchor.equals(anchor);
+		if (currentAnchorEqualsPreviousAnchor) {
+			return true;
+		}
+		// If mouse if not getting closer and anchor is defined, and the new anchor is not compatible with the previous anchor
+		const currentAnchorCompatibleWithPreviousAnchor = this._currentResult && anchor.canAdoptVisibleHover(this._currentResult.options.anchor, this._contentHoverWidget.position);
+		if (!currentAnchorCompatibleWithPreviousAnchor) {
+			this._setCurrentResult(null);
+			this._startHoverOperationIfNecessary(anchor, mode, source, focus, false);
+			return true;
+		}
+		// We aren't getting any closer to the hover, so we will filter existing results
+		// and keep those which also apply to the new anchor.
+		if (this._currentResult) {
+			this._setCurrentResult(this._currentResult.filter(anchor));
+		}
+		this._startHoverOperationIfNecessary(anchor, mode, source, focus, false);
+		return true;
+	}
+
+	private _startHoverOperationIfNecessary(anchor: HoverAnchor, mode: HoverStartMode, source: HoverStartSource, shouldFocus: boolean, insistOnKeepingHoverVisible: boolean): void {
+		const currentAnchorEqualToPreviousHover = this._hoverOperation.options && this._hoverOperation.options.anchor.equals(anchor);
+		if (currentAnchorEqualToPreviousHover) {
+			return;
+		}
+		this._hoverOperation.cancel();
+		const contentHoverComputerOptions: ContentHoverComputerOptions = {
+			anchor,
+			source,
+			shouldFocus,
+			insistOnKeepingHoverVisible
+		};
+		this._hoverOperation.start(mode, contentHoverComputerOptions);
+	}
+
+	private _setCurrentResult(hoverResult: ContentHoverResult | null): void {
+		let currentHoverResult = hoverResult;
+		const currentResultEqualToPreviousResult = this._currentResult === currentHoverResult;
+		if (currentResultEqualToPreviousResult) {
+			return;
+		}
+		const currentHoverResultIsEmpty = currentHoverResult && currentHoverResult.hoverParts.length === 0;
+		if (currentHoverResultIsEmpty) {
+			currentHoverResult = null;
+		}
+		this._currentResult = currentHoverResult;
+		if (this._currentResult) {
+			this._showHover(this._currentResult);
+		} else {
+			this._hideHover();
+		}
+	}
+
+	private _addLoadingMessage(hoverResult: HoverResult<ContentHoverComputerOptions, IHoverPart>): IHoverPart[] {
+		for (const participant of this._participants) {
+			if (!participant.createLoadingMessage) {
+				continue;
+			}
+			const loadingMessage = participant.createLoadingMessage(hoverResult.options.anchor);
+			if (!loadingMessage) {
+				continue;
+			}
+			return hoverResult.value.slice(0).concat([loadingMessage]);
+		}
+		return hoverResult.value;
+	}
+
+	private _withResult(hoverResult: ContentHoverResult): void {
+		const previousHoverIsVisibleWithCompleteResult = this._contentHoverWidget.position && this._currentResult && this._currentResult.isComplete;
+		if (!previousHoverIsVisibleWithCompleteResult) {
+			this._setCurrentResult(hoverResult);
+		}
+		// The hover is visible with a previous complete result.
+		const isCurrentHoverResultComplete = hoverResult.isComplete;
+		if (!isCurrentHoverResultComplete) {
+			// Instead of rendering the new partial result, we wait for the result to be complete.
+			return;
+		}
+		const currentHoverResultIsEmpty = hoverResult.hoverParts.length === 0;
+		const insistOnKeepingPreviousHoverVisible = hoverResult.options.insistOnKeepingHoverVisible;
+		const shouldKeepPreviousHoverVisible = currentHoverResultIsEmpty && insistOnKeepingPreviousHoverVisible;
+		if (shouldKeepPreviousHoverVisible) {
+			// The hover would now hide normally, so we'll keep the previous messages
+			return;
+		}
+		this._setCurrentResult(hoverResult);
+	}
+
+	private _showHover(hoverResult: ContentHoverResult): void {
+		const context = this._getHoverContext();
+		this._renderedContentHover = new RenderedContentHover(this._editor, hoverResult, this._participants, context, this._keybindingService);
+		if (this._renderedContentHover.domNodeHasChildren) {
+			this._contentHoverWidget.show(this._renderedContentHover);
+		} else {
+			this._renderedContentHover.dispose();
+		}
+	}
+
+	private _hideHover(): void {
+		this._contentHoverWidget.hide();
+	}
+
+	private _getHoverContext(): IEditorHoverContext {
+		const hide = () => {
+			this.hide();
+		};
+		const onContentsChanged = () => {
+			this._onContentsChanged.fire();
+			this._contentHoverWidget.onContentsChanged();
+		};
+		const setMinimumDimensions = (dimensions: dom.Dimension) => {
+			this._contentHoverWidget.setMinimumDimensions(dimensions);
+		};
+		return { hide, onContentsChanged, setMinimumDimensions };
+	}
+
+
+	public showsOrWillShow(mouseEvent: IEditorMouseEvent): boolean {
+		const isContentWidgetResizing = this._contentHoverWidget.isResizing;
+		if (isContentWidgetResizing) {
+			return true;
+		}
+		const anchorCandidates: HoverAnchor[] = this._findHoverAnchorCandidates(mouseEvent);
+		const anchorCandidatesExist = anchorCandidates.length > 0;
+		if (!anchorCandidatesExist) {
+			return this._startShowingOrUpdateHover(null, HoverStartMode.Delayed, HoverStartSource.Mouse, false, mouseEvent);
+		}
+		const anchor = anchorCandidates[0];
+		return this._startShowingOrUpdateHover(anchor, HoverStartMode.Delayed, HoverStartSource.Mouse, false, mouseEvent);
+	}
+
+	private _findHoverAnchorCandidates(mouseEvent: IEditorMouseEvent): HoverAnchor[] {
+		const anchorCandidates: HoverAnchor[] = [];
+		for (const participant of this._participants) {
+			if (!participant.suggestHoverAnchor) {
+				continue;
+			}
+			const anchor = participant.suggestHoverAnchor(mouseEvent);
+			if (!anchor) {
+				continue;
+			}
+			anchorCandidates.push(anchor);
+		}
+		const target = mouseEvent.target;
+		switch (target.type) {
+			case MouseTargetType.CONTENT_TEXT: {
+				anchorCandidates.push(new HoverRangeAnchor(0, target.range, mouseEvent.event.posx, mouseEvent.event.posy));
+				break;
+			}
+			case MouseTargetType.CONTENT_EMPTY: {
+				const epsilon = this._editor.getOption(EditorOption.fontInfo).typicalHalfwidthCharacterWidth / 2;
+				// Let hover kick in even when the mouse is technically in the empty area after a line, given the distance is small enough
+				const mouseIsWithinLinesAndCloseToHover = !target.detail.isAfterLines
+					&& typeof target.detail.horizontalDistanceToText === 'number'
+					&& target.detail.horizontalDistanceToText < epsilon;
+				if (!mouseIsWithinLinesAndCloseToHover) {
+					break;
+				}
+				anchorCandidates.push(new HoverRangeAnchor(0, target.range, mouseEvent.event.posx, mouseEvent.event.posy));
+				break;
+			}
+		}
+		anchorCandidates.sort((a, b) => b.priority - a.priority);
+		return anchorCandidates;
+	}
+
+	private _onMouseLeave(e: MouseEvent): void {
+		const editorDomNode = this._editor.getDomNode();
+		const isMousePositionOutsideOfEditor = !editorDomNode || !isMousePositionWithinElement(editorDomNode, e.x, e.y);
+		if (isMousePositionOutsideOfEditor) {
+			this.hide();
+		}
+	}
+
+	public startShowingAtRange(range: Range, mode: HoverStartMode, source: HoverStartSource, focus: boolean): void {
+		this._startShowingOrUpdateHover(new HoverRangeAnchor(0, range, undefined, undefined), mode, source, focus, null);
+	}
+
+	public getWidgetContent(): string | undefined {
+		const node = this._contentHoverWidget.getDomNode();
+		if (!node.textContent) {
+			return undefined;
+		}
+		return node.textContent;
+	}
+
+	public async updateHoverVerbosityLevel(action: HoverVerbosityAction, index: number, focus?: boolean): Promise<void> {
+		this._renderedContentHover?.updateHoverVerbosityLevel(action, index, focus);
+	}
+
+	public doesHoverAtIndexSupportVerbosityAction(index: number, action: HoverVerbosityAction): boolean {
+		return this._renderedContentHover?.doesHoverAtIndexSupportVerbosityAction(index, action) ?? false;
+	}
+
+	public getAccessibleWidgetContent(): string | undefined {
+		return this._renderedContentHover?.getAccessibleWidgetContent();
+	}
+
+	public getAccessibleWidgetContentAtIndex(index: number): string | undefined {
+		return this._renderedContentHover?.getAccessibleWidgetContentAtIndex(index);
+	}
+
+	public focusedHoverPartIndex(): number {
+		return this._renderedContentHover?.focusedHoverPartIndex ?? -1;
+	}
+
+	public containsNode(node: Node | null | undefined): boolean {
+		return (node ? this._contentHoverWidget.getDomNode().contains(node) : false);
+	}
+
+	public focus(): void {
+		this._contentHoverWidget.focus();
+	}
+
+	public focusHoverPartWithIndex(index: number): void {
+		this._renderedContentHover?.focusHoverPartWithIndex(index);
+	}
+
+	public scrollUp(): void {
+		this._contentHoverWidget.scrollUp();
+	}
+
+	public scrollDown(): void {
+		this._contentHoverWidget.scrollDown();
+	}
+
+	public scrollLeft(): void {
+		this._contentHoverWidget.scrollLeft();
+	}
+
+	public scrollRight(): void {
+		this._contentHoverWidget.scrollRight();
+	}
+
+	public pageUp(): void {
+		this._contentHoverWidget.pageUp();
+	}
+
+	public pageDown(): void {
+		this._contentHoverWidget.pageDown();
+	}
+
+	public goToTop(): void {
+		this._contentHoverWidget.goToTop();
+	}
+
+	public goToBottom(): void {
+		this._contentHoverWidget.goToBottom();
+	}
+
+	public hide(): void {
+		this._hoverOperation.cancel();
+		this._setCurrentResult(null);
+	}
+
+	public getDomNode(): HTMLElement {
+		return this._contentHoverWidget.getDomNode();
+	}
+
+	public get isColorPickerVisible(): boolean {
+		return this._renderedContentHover?.isColorPickerVisible() ?? false;
+	}
+
+	public get isVisibleFromKeyboard(): boolean {
+		return this._contentHoverWidget.isVisibleFromKeyboard;
+	}
+
+	public get isVisible(): boolean {
+		return this._contentHoverWidget.isVisible;
+	}
+
+	public get isFocused(): boolean {
+		return this._contentHoverWidget.isFocused;
+	}
+
+	public get isResizing(): boolean {
+		return this._contentHoverWidget.isResizing;
+	}
+
+	public get widget() {
+		return this._contentHoverWidget;
+	}
+}
diff --git a/src/vs/editor/contrib/hover/browser/getHover.ts b/src/vs/editor/contrib/hover/browser/getHover.ts
index 608f8a1dc96..7c000ed2aa8 100644
--- a/src/vs/editor/contrib/hover/browser/getHover.ts
+++ b/src/vs/editor/contrib/hover/browser/getHover.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { AsyncIterableObject } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { onUnexpectedExternalError } from 'vs/base/common/errors';
-import { registerModelAndPositionCommand } from 'vs/editor/browser/editorExtensions';
-import { Position } from 'vs/editor/common/core/position';
-import { ITextModel } from 'vs/editor/common/model';
-import { Hover, HoverProvider } from 'vs/editor/common/languages';
-import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
+import { AsyncIterableObject } from '../../../../base/common/async.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { onUnexpectedExternalError } from '../../../../base/common/errors.js';
+import { registerModelAndPositionCommand } from '../../../browser/editorExtensions.js';
+import { Position } from '../../../common/core/position.js';
+import { ITextModel } from '../../../common/model.js';
+import { Hover, HoverProvider } from '../../../common/languages.js';
+import { LanguageFeatureRegistry } from '../../../common/languageFeatureRegistry.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 
 export class HoverProviderResult {
 	constructor(
@@ -34,14 +34,14 @@ async function executeProvider(provider: HoverProvider, ordinal: number, model:
 	return new HoverProviderResult(provider, result, ordinal);
 }
 
-export function getHoverProviderResultsAsAsyncIterable(registry: LanguageFeatureRegistry<HoverProvider>, model: ITextModel, position: Position, token: CancellationToken): AsyncIterableObject<HoverProviderResult> {
-	const providers = registry.ordered(model);
+export function getHoverProviderResultsAsAsyncIterable(registry: LanguageFeatureRegistry<HoverProvider>, model: ITextModel, position: Position, token: CancellationToken, recursive = false): AsyncIterableObject<HoverProviderResult> {
+	const providers = registry.ordered(model, recursive);
 	const promises = providers.map((provider, index) => executeProvider(provider, index, model, position, token));
 	return AsyncIterableObject.fromPromises(promises).coalesce();
 }
 
-export function getHoversPromise(registry: LanguageFeatureRegistry<HoverProvider>, model: ITextModel, position: Position, token: CancellationToken): Promise<Hover[]> {
-	return getHoverProviderResultsAsAsyncIterable(registry, model, position, token).map(item => item.hover).toPromise();
+export function getHoversPromise(registry: LanguageFeatureRegistry<HoverProvider>, model: ITextModel, position: Position, token: CancellationToken, recursive = false): Promise<Hover[]> {
+	return getHoverProviderResultsAsAsyncIterable(registry, model, position, token, recursive).map(item => item.hover).toPromise();
 }
 
 registerModelAndPositionCommand('_executeHoverProvider', (accessor, model, position): Promise<Hover[]> => {
@@ -49,6 +49,11 @@ registerModelAndPositionCommand('_executeHoverProvider', (accessor, model, posit
 	return getHoversPromise(languageFeaturesService.hoverProvider, model, position, CancellationToken.None);
 });
 
+registerModelAndPositionCommand('_executeHoverProvider_recursive', (accessor, model, position): Promise<Hover[]> => {
+	const languageFeaturesService = accessor.get(ILanguageFeaturesService);
+	return getHoversPromise(languageFeaturesService.hoverProvider, model, position, CancellationToken.None, true);
+});
+
 function isValid(result: Hover) {
 	const hasRange = (typeof result.range !== 'undefined');
 	const hasHtmlContent = typeof result.contents !== 'undefined' && result.contents && result.contents.length > 0;
diff --git a/src/vs/editor/contrib/hover/browser/marginHoverComputer.ts b/src/vs/editor/contrib/hover/browser/glyphHoverComputer.ts
similarity index 53%
rename from src/vs/editor/contrib/hover/browser/marginHoverComputer.ts
rename to src/vs/editor/contrib/hover/browser/glyphHoverComputer.ts
index 0bc61948152..760d00fb644 100644
--- a/src/vs/editor/contrib/hover/browser/marginHoverComputer.ts
+++ b/src/vs/editor/contrib/hover/browser/glyphHoverComputer.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { asArray } from 'vs/base/common/arrays';
-import { IMarkdownString, isEmptyMarkdownString } from 'vs/base/common/htmlContent';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IHoverComputer } from 'vs/editor/contrib/hover/browser/hoverOperation';
-import { GlyphMarginLane } from 'vs/editor/common/model';
+import { asArray } from '../../../../base/common/arrays.js';
+import { IMarkdownString, isEmptyMarkdownString } from '../../../../base/common/htmlContent.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { IHoverComputer } from './hoverOperation.js';
+import { GlyphMarginLane } from '../../../common/model.js';
 
 export type LaneOrLineNumber = GlyphMarginLane | 'lineNo';
 
@@ -15,33 +15,19 @@ export interface IHoverMessage {
 	value: IMarkdownString;
 }
 
-export class MarginHoverComputer implements IHoverComputer<IHoverMessage> {
+export interface GlyphHoverComputerOptions {
+	lineNumber: number;
+	laneOrLine: LaneOrLineNumber;
+}
 
-	private _lineNumber: number = -1;
-	private _laneOrLine: LaneOrLineNumber = GlyphMarginLane.Center;
-
-	public get lineNumber(): number {
-		return this._lineNumber;
-	}
-
-	public set lineNumber(value: number) {
-		this._lineNumber = value;
-	}
-
-	public get lane(): LaneOrLineNumber {
-		return this._laneOrLine;
-	}
-
-	public set lane(value: LaneOrLineNumber) {
-		this._laneOrLine = value;
-	}
+export class GlyphHoverComputer implements IHoverComputer<GlyphHoverComputerOptions, IHoverMessage> {
 
 	constructor(
 		private readonly _editor: ICodeEditor
 	) {
 	}
 
-	public computeSync(): IHoverMessage[] {
+	public computeSync(opts: GlyphHoverComputerOptions): IHoverMessage[] {
 
 		const toHoverMessage = (contents: IMarkdownString): IHoverMessage => {
 			return {
@@ -49,17 +35,17 @@ export class MarginHoverComputer implements IHoverComputer<IHoverMessage> {
 			};
 		};
 
-		const lineDecorations = this._editor.getLineDecorations(this._lineNumber);
+		const lineDecorations = this._editor.getLineDecorations(opts.lineNumber);
 
 		const result: IHoverMessage[] = [];
-		const isLineHover = this._laneOrLine === 'lineNo';
+		const isLineHover = opts.laneOrLine === 'lineNo';
 		if (!lineDecorations) {
 			return result;
 		}
 
 		for (const d of lineDecorations) {
 			const lane = d.options.glyphMargin?.position ?? GlyphMarginLane.Center;
-			if (!isLineHover && lane !== this._laneOrLine) {
+			if (!isLineHover && lane !== opts.laneOrLine) {
 				continue;
 			}
 
diff --git a/src/vs/editor/contrib/hover/browser/glyphHoverController.ts b/src/vs/editor/contrib/hover/browser/glyphHoverController.ts
new file mode 100644
index 00000000000..c0d37ae82e0
--- /dev/null
+++ b/src/vs/editor/contrib/hover/browser/glyphHoverController.ts
@@ -0,0 +1,232 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { ICodeEditor, IEditorMouseEvent, IPartialEditorMouseEvent } from '../../../browser/editorBrowser.js';
+import { ConfigurationChangedEvent, EditorOption } from '../../../common/config/editorOptions.js';
+import { IEditorContribution, IScrollEvent } from '../../../common/editorCommon.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IHoverWidget } from './hoverTypes.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { isMousePositionWithinElement } from './hoverUtils.js';
+import './hover.css';
+import { GlyphHoverWidget } from './glyphHoverWidget.js';
+
+// sticky hover widget which doesn't disappear on focus out and such
+const _sticky = false
+	// || Boolean("true") // done "weirdly" so that a lint warning prevents you from pushing this
+	;
+
+interface IHoverSettings {
+	readonly enabled: boolean;
+	readonly sticky: boolean;
+	readonly hidingDelay: number;
+}
+
+interface IHoverState {
+	mouseDown: boolean;
+}
+
+export class GlyphHoverController extends Disposable implements IEditorContribution {
+
+	public static readonly ID = 'editor.contrib.marginHover';
+
+	public shouldKeepOpenOnEditorMouseMoveOrLeave: boolean = false;
+
+	private readonly _listenersStore = new DisposableStore();
+
+	private _glyphWidget: GlyphHoverWidget | undefined;
+	private _mouseMoveEvent: IEditorMouseEvent | undefined;
+	private _reactToEditorMouseMoveRunner: RunOnceScheduler;
+
+	private _hoverSettings!: IHoverSettings;
+	private _hoverState: IHoverState = {
+		mouseDown: false
+	};
+
+	constructor(
+		private readonly _editor: ICodeEditor,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService
+	) {
+		super();
+		this._reactToEditorMouseMoveRunner = this._register(
+			new RunOnceScheduler(
+				() => this._reactToEditorMouseMove(this._mouseMoveEvent), 0
+			)
+		);
+		this._hookListeners();
+		this._register(this._editor.onDidChangeConfiguration((e: ConfigurationChangedEvent) => {
+			if (e.hasChanged(EditorOption.hover)) {
+				this._unhookListeners();
+				this._hookListeners();
+			}
+		}));
+	}
+
+	static get(editor: ICodeEditor): GlyphHoverController | null {
+		return editor.getContribution<GlyphHoverController>(GlyphHoverController.ID);
+	}
+
+	private _hookListeners(): void {
+
+		const hoverOpts = this._editor.getOption(EditorOption.hover);
+		this._hoverSettings = {
+			enabled: hoverOpts.enabled,
+			sticky: hoverOpts.sticky,
+			hidingDelay: hoverOpts.hidingDelay
+		};
+
+		if (hoverOpts.enabled) {
+			this._listenersStore.add(this._editor.onMouseDown((e: IEditorMouseEvent) => this._onEditorMouseDown(e)));
+			this._listenersStore.add(this._editor.onMouseUp(() => this._onEditorMouseUp()));
+			this._listenersStore.add(this._editor.onMouseMove((e: IEditorMouseEvent) => this._onEditorMouseMove(e)));
+			this._listenersStore.add(this._editor.onKeyDown((e: IKeyboardEvent) => this._onKeyDown(e)));
+		} else {
+			this._listenersStore.add(this._editor.onMouseMove((e: IEditorMouseEvent) => this._onEditorMouseMove(e)));
+			this._listenersStore.add(this._editor.onKeyDown((e: IKeyboardEvent) => this._onKeyDown(e)));
+		}
+
+		this._listenersStore.add(this._editor.onMouseLeave((e) => this._onEditorMouseLeave(e)));
+		this._listenersStore.add(this._editor.onDidChangeModel(() => {
+			this._cancelScheduler();
+			this._hideWidgets();
+		}));
+		this._listenersStore.add(this._editor.onDidChangeModelContent(() => this._cancelScheduler()));
+		this._listenersStore.add(this._editor.onDidScrollChange((e: IScrollEvent) => this._onEditorScrollChanged(e)));
+	}
+
+	private _unhookListeners(): void {
+		this._listenersStore.clear();
+	}
+
+	private _cancelScheduler() {
+		this._mouseMoveEvent = undefined;
+		this._reactToEditorMouseMoveRunner.cancel();
+	}
+
+	private _onEditorScrollChanged(e: IScrollEvent): void {
+		if (e.scrollTopChanged || e.scrollLeftChanged) {
+			this._hideWidgets();
+		}
+	}
+
+	private _onEditorMouseDown(mouseEvent: IEditorMouseEvent): void {
+		this._hoverState.mouseDown = true;
+		const shouldNotHideCurrentHoverWidget = this._isMouseOnGlyphHoverWidget(mouseEvent);
+		if (shouldNotHideCurrentHoverWidget) {
+			return;
+		}
+		this._hideWidgets();
+	}
+
+	private _isMouseOnGlyphHoverWidget(mouseEvent: IPartialEditorMouseEvent): boolean {
+		const glyphHoverWidgetNode = this._glyphWidget?.getDomNode();
+		if (glyphHoverWidgetNode) {
+			return isMousePositionWithinElement(glyphHoverWidgetNode, mouseEvent.event.posx, mouseEvent.event.posy);
+		}
+		return false;
+	}
+
+	private _onEditorMouseUp(): void {
+		this._hoverState.mouseDown = false;
+	}
+
+	private _onEditorMouseLeave(mouseEvent: IPartialEditorMouseEvent): void {
+		if (this.shouldKeepOpenOnEditorMouseMoveOrLeave) {
+			return;
+		}
+
+		this._cancelScheduler();
+		const shouldNotHideCurrentHoverWidget = this._isMouseOnGlyphHoverWidget(mouseEvent);
+		if (shouldNotHideCurrentHoverWidget) {
+			return;
+		}
+		if (_sticky) {
+			return;
+		}
+		this._hideWidgets();
+	}
+
+	private _shouldNotRecomputeCurrentHoverWidget(mouseEvent: IEditorMouseEvent): boolean {
+		const isHoverSticky = this._hoverSettings.sticky;
+		const isMouseOnGlyphHoverWidget = this._isMouseOnGlyphHoverWidget(mouseEvent);
+		return isHoverSticky && isMouseOnGlyphHoverWidget;
+	}
+
+	private _onEditorMouseMove(mouseEvent: IEditorMouseEvent): void {
+		if (this.shouldKeepOpenOnEditorMouseMoveOrLeave) {
+			return;
+		}
+
+		this._mouseMoveEvent = mouseEvent;
+		const shouldNotRecomputeCurrentHoverWidget = this._shouldNotRecomputeCurrentHoverWidget(mouseEvent);
+		if (shouldNotRecomputeCurrentHoverWidget) {
+			this._reactToEditorMouseMoveRunner.cancel();
+			return;
+		}
+		this._reactToEditorMouseMove(mouseEvent);
+	}
+
+	private _reactToEditorMouseMove(mouseEvent: IEditorMouseEvent | undefined): void {
+
+		if (!mouseEvent) {
+			return;
+		}
+		const glyphWidgetShowsOrWillShow = this._tryShowHoverWidget(mouseEvent);
+		if (glyphWidgetShowsOrWillShow) {
+			return;
+		}
+		if (_sticky) {
+			return;
+		}
+		this._hideWidgets();
+	}
+
+	private _tryShowHoverWidget(mouseEvent: IEditorMouseEvent): boolean {
+		const glyphWidget: IHoverWidget = this._getOrCreateGlyphWidget();
+		return glyphWidget.showsOrWillShow(mouseEvent);
+	}
+
+	private _onKeyDown(e: IKeyboardEvent): void {
+		if (!this._editor.hasModel()) {
+			return;
+		}
+		if (e.keyCode === KeyCode.Ctrl
+			|| e.keyCode === KeyCode.Alt
+			|| e.keyCode === KeyCode.Meta
+			|| e.keyCode === KeyCode.Shift) {
+			// Do not hide hover when a modifier key is pressed
+			return;
+		}
+		this._hideWidgets();
+	}
+
+	private _hideWidgets(): void {
+		if (_sticky) {
+			return;
+		}
+		this._glyphWidget?.hide();
+	}
+
+	private _getOrCreateGlyphWidget(): GlyphHoverWidget {
+		if (!this._glyphWidget) {
+			this._glyphWidget = this._instantiationService.createInstance(GlyphHoverWidget, this._editor);
+		}
+		return this._glyphWidget;
+	}
+
+	public hideContentHover(): void {
+		this._hideWidgets();
+	}
+
+	public override dispose(): void {
+		super.dispose();
+		this._unhookListeners();
+		this._listenersStore.dispose();
+		this._glyphWidget?.dispose();
+	}
+}
diff --git a/src/vs/editor/contrib/hover/browser/marginHoverWidget.ts b/src/vs/editor/contrib/hover/browser/glyphHoverWidget.ts
similarity index 61%
rename from src/vs/editor/contrib/hover/browser/marginHoverWidget.ts
rename to src/vs/editor/contrib/hover/browser/glyphHoverWidget.ts
index e909575d66e..8432aa39f3a 100644
--- a/src/vs/editor/contrib/hover/browser/marginHoverWidget.ts
+++ b/src/vs/editor/contrib/hover/browser/glyphHoverWidget.ts
@@ -3,21 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { MarkdownRenderer } from 'vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
-import { ICodeEditor, IEditorMouseEvent, IOverlayWidget, IOverlayWidgetPosition, MouseTargetType } from 'vs/editor/browser/editorBrowser';
-import { ConfigurationChangedEvent, EditorOption } from 'vs/editor/common/config/editorOptions';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { HoverOperation, HoverStartMode } from 'vs/editor/contrib/hover/browser/hoverOperation';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { HoverWidget } from 'vs/base/browser/ui/hover/hoverWidget';
-import { IHoverWidget } from 'vs/editor/contrib/hover/browser/hoverTypes';
-import { IHoverMessage, LaneOrLineNumber, MarginHoverComputer } from 'vs/editor/contrib/hover/browser/marginHoverComputer';
+import * as dom from '../../../../base/browser/dom.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { MarkdownRenderer } from '../../../browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import { ICodeEditor, IEditorMouseEvent, IOverlayWidget, IOverlayWidgetPosition, MouseTargetType } from '../../../browser/editorBrowser.js';
+import { ConfigurationChangedEvent, EditorOption } from '../../../common/config/editorOptions.js';
+import { ILanguageService } from '../../../common/languages/language.js';
+import { HoverOperation, HoverResult, HoverStartMode } from './hoverOperation.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { HoverWidget } from '../../../../base/browser/ui/hover/hoverWidget.js';
+import { IHoverWidget } from './hoverTypes.js';
+import { IHoverMessage, LaneOrLineNumber, GlyphHoverComputer, GlyphHoverComputerOptions } from './glyphHoverComputer.js';
+import { isMousePositionWithinElement } from './hoverUtils.js';
 
 const $ = dom.$;
 
-export class MarginHoverWidget extends Disposable implements IOverlayWidget, IHoverWidget {
+export class GlyphHoverWidget extends Disposable implements IOverlayWidget, IHoverWidget {
 
 	public static readonly ID = 'editor.contrib.modesGlyphHoverWidget';
 
@@ -28,14 +29,15 @@ export class MarginHoverWidget extends Disposable implements IOverlayWidget, IHo
 	private _messages: IHoverMessage[];
 
 	private readonly _markdownRenderer: MarkdownRenderer;
-	private readonly _computer: MarginHoverComputer;
-	private readonly _hoverOperation: HoverOperation<IHoverMessage>;
+	private readonly _hoverOperation: HoverOperation<GlyphHoverComputerOptions, IHoverMessage>;
 	private readonly _renderDisposeables = this._register(new DisposableStore());
 
+	private _hoverComputerOptions: GlyphHoverComputerOptions | undefined;
+
 	constructor(
 		editor: ICodeEditor,
-		languageService: ILanguageService,
-		openerService: IOpenerService,
+		@ILanguageService languageService: ILanguageService,
+		@IOpenerService openerService: IOpenerService,
 	) {
 		super();
 		this._editor = editor;
@@ -47,11 +49,8 @@ export class MarginHoverWidget extends Disposable implements IOverlayWidget, IHo
 		this._hover.containerDomNode.classList.toggle('hidden', !this._isVisible);
 
 		this._markdownRenderer = this._register(new MarkdownRenderer({ editor: this._editor }, languageService, openerService));
-		this._computer = new MarginHoverComputer(this._editor);
-		this._hoverOperation = this._register(new HoverOperation(this._editor, this._computer));
-		this._register(this._hoverOperation.onResult((result) => {
-			this._withResult(result.value);
-		}));
+		this._hoverOperation = this._register(new HoverOperation(this._editor, new GlyphHoverComputer(this._editor)));
+		this._register(this._hoverOperation.onResult((result) => this._withResult(result)));
 
 		this._register(this._editor.onDidChangeModelDecorations(() => this._onModelDecorationsChanged()));
 		this._register(this._editor.onDidChangeConfiguration((e: ConfigurationChangedEvent) => {
@@ -59,17 +58,20 @@ export class MarginHoverWidget extends Disposable implements IOverlayWidget, IHo
 				this._updateFont();
 			}
 		}));
-
+		this._register(dom.addStandardDisposableListener(this._hover.containerDomNode, 'mouseleave', (e) => {
+			this._onMouseLeave(e);
+		}));
 		this._editor.addOverlayWidget(this);
 	}
 
 	public override dispose(): void {
+		this._hoverComputerOptions = undefined;
 		this._editor.removeOverlayWidget(this);
 		super.dispose();
 	}
 
 	public getId(): string {
-		return MarginHoverWidget.ID;
+		return GlyphHoverWidget.ID;
 	}
 
 	public getDomNode(): HTMLElement {
@@ -86,11 +88,11 @@ export class MarginHoverWidget extends Disposable implements IOverlayWidget, IHo
 	}
 
 	private _onModelDecorationsChanged(): void {
-		if (this._isVisible) {
+		if (this._isVisible && this._hoverComputerOptions) {
 			// The decorations have changed and the hover is visible,
 			// we need to recompute the displayed text
 			this._hoverOperation.cancel();
-			this._hoverOperation.start(HoverStartMode.Delayed);
+			this._hoverOperation.start(HoverStartMode.Delayed, this._hoverComputerOptions);
 		}
 	}
 
@@ -108,22 +110,20 @@ export class MarginHoverWidget extends Disposable implements IOverlayWidget, IHo
 	}
 
 	private _startShowingAt(lineNumber: number, laneOrLine: LaneOrLineNumber): void {
-		if (this._computer.lineNumber === lineNumber && this._computer.lane === laneOrLine) {
+		if (this._hoverComputerOptions
+			&& this._hoverComputerOptions.lineNumber === lineNumber
+			&& this._hoverComputerOptions.laneOrLine === laneOrLine) {
 			// We have to show the widget at the exact same line number as before, so no work is needed
 			return;
 		}
-
 		this._hoverOperation.cancel();
-
 		this.hide();
-
-		this._computer.lineNumber = lineNumber;
-		this._computer.lane = laneOrLine;
-		this._hoverOperation.start(HoverStartMode.Delayed);
+		this._hoverComputerOptions = { lineNumber, laneOrLine };
+		this._hoverOperation.start(HoverStartMode.Delayed, this._hoverComputerOptions);
 	}
 
 	public hide(): void {
-		this._computer.lineNumber = -1;
+		this._hoverComputerOptions = undefined;
 		this._hoverOperation.cancel();
 		if (!this._isVisible) {
 			return;
@@ -132,17 +132,17 @@ export class MarginHoverWidget extends Disposable implements IOverlayWidget, IHo
 		this._hover.containerDomNode.classList.toggle('hidden', !this._isVisible);
 	}
 
-	private _withResult(result: IHoverMessage[]): void {
-		this._messages = result;
+	private _withResult(result: HoverResult<GlyphHoverComputerOptions, IHoverMessage>): void {
+		this._messages = result.value;
 
 		if (this._messages.length > 0) {
-			this._renderMessages(this._computer.lineNumber, this._messages);
+			this._renderMessages(result.options.lineNumber, result.options.laneOrLine, this._messages);
 		} else {
 			this.hide();
 		}
 	}
 
-	private _renderMessages(lineNumber: number, messages: IHoverMessage[]): void {
+	private _renderMessages(lineNumber: number, laneOrLine: LaneOrLineNumber, messages: IHoverMessage[]): void {
 		this._renderDisposeables.clear();
 
 		const fragment = document.createDocumentFragment();
@@ -156,7 +156,7 @@ export class MarginHoverWidget extends Disposable implements IOverlayWidget, IHo
 		}
 
 		this._updateContents(fragment);
-		this._showAt(lineNumber);
+		this._showAt(lineNumber, laneOrLine);
 	}
 
 	private _updateContents(node: Node): void {
@@ -165,7 +165,7 @@ export class MarginHoverWidget extends Disposable implements IOverlayWidget, IHo
 		this._updateFont();
 	}
 
-	private _showAt(lineNumber: number): void {
+	private _showAt(lineNumber: number, laneOrLine: LaneOrLineNumber): void {
 		if (!this._isVisible) {
 			this._isVisible = true;
 			this._hover.containerDomNode.classList.toggle('hidden', !this._isVisible);
@@ -177,8 +177,16 @@ export class MarginHoverWidget extends Disposable implements IOverlayWidget, IHo
 		const lineHeight = this._editor.getOption(EditorOption.lineHeight);
 		const nodeHeight = this._hover.containerDomNode.clientHeight;
 		const top = topForLineNumber - editorScrollTop - ((nodeHeight - lineHeight) / 2);
-		const left = editorLayout.glyphMarginLeft + editorLayout.glyphMarginWidth + (this._computer.lane === 'lineNo' ? editorLayout.lineNumbersWidth : 0);
+		const left = editorLayout.glyphMarginLeft + editorLayout.glyphMarginWidth + (laneOrLine === 'lineNo' ? editorLayout.lineNumbersWidth : 0);
 		this._hover.containerDomNode.style.left = `${left}px`;
 		this._hover.containerDomNode.style.top = `${Math.max(Math.round(top), 0)}px`;
 	}
+
+	private _onMouseLeave(e: MouseEvent): void {
+		const editorDomNode = this._editor.getDomNode();
+		const isMousePositionOutsideOfEditor = !editorDomNode || !isMousePositionWithinElement(editorDomNode, e.x, e.y);
+		if (isMousePositionOutsideOfEditor) {
+			this.hide();
+		}
+	}
 }
diff --git a/src/vs/editor/contrib/hover/browser/hover.css b/src/vs/editor/contrib/hover/browser/hover.css
index 2520856e59d..958f1ee9cf4 100644
--- a/src/vs/editor/contrib/hover/browser/hover.css
+++ b/src/vs/editor/contrib/hover/browser/hover.css
@@ -43,7 +43,7 @@
 	flex-direction: column;
 	padding-left: 5px;
 	padding-right: 5px;
-	justify-content: end;
+	justify-content: flex-end;
 	border-right: 1px solid var(--vscode-editorHoverWidget-border);
 }
 
diff --git a/src/vs/editor/contrib/hover/browser/hoverAccessibleViews.ts b/src/vs/editor/contrib/hover/browser/hoverAccessibleViews.ts
index 2998c0e3e30..ffce8901c85 100644
--- a/src/vs/editor/contrib/hover/browser/hoverAccessibleViews.ts
+++ b/src/vs/editor/contrib/hover/browser/hoverAccessibleViews.ts
@@ -2,31 +2,29 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { localize } from 'vs/nls';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { HoverController } from 'vs/editor/contrib/hover/browser/hoverController';
-import { AccessibleViewType, AccessibleViewProviderId, AdvancedContentProvider, IAccessibleViewContentProvider, IAccessibleViewOptions } from 'vs/platform/accessibility/browser/accessibleView';
-import { IAccessibleViewImplentation } from 'vs/platform/accessibility/browser/accessibleViewRegistry';
-import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { HoverVerbosityAction } from 'vs/editor/common/languages';
-import { DECREASE_HOVER_VERBOSITY_ACCESSIBLE_ACTION_ID, DECREASE_HOVER_VERBOSITY_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACCESSIBLE_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACTION_ID } from 'vs/editor/contrib/hover/browser/hoverActionIds';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { Action, IAction } from 'vs/base/common/actions';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { Codicon } from 'vs/base/common/codicons';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { labelForHoverVerbosityAction } from 'vs/editor/contrib/hover/browser/markdownHoverParticipant';
+import { localize } from '../../../../nls.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { ContentHoverController } from './contentHoverController.js';
+import { AccessibleViewType, AccessibleViewProviderId, AccessibleContentProvider, IAccessibleViewContentProvider, IAccessibleViewOptions } from '../../../../platform/accessibility/browser/accessibleView.js';
+import { IAccessibleViewImplentation } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
+import { IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { HoverVerbosityAction } from '../../../common/languages.js';
+import { DECREASE_HOVER_VERBOSITY_ACCESSIBLE_ACTION_ID, DECREASE_HOVER_VERBOSITY_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACCESSIBLE_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACTION_ID } from './hoverActionIds.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { ICodeEditorService } from '../../../browser/services/codeEditorService.js';
+import { Action, IAction } from '../../../../base/common/actions.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { labelForHoverVerbosityAction } from './markdownHoverParticipant.js';
 
 namespace HoverAccessibilityHelpNLS {
-	export const intro = localize('intro', "Focus on the hover widget to cycle through the hover parts with the Tab key.");
-	export const increaseVerbosity = localize('increaseVerbosity', "- The focused hover part verbosity level can be increased with the Increase Hover Verbosity command<keybinding:{0}>.", INCREASE_HOVER_VERBOSITY_ACTION_ID);
-	export const decreaseVerbosity = localize('decreaseVerbosity', "- The focused hover part verbosity level can be decreased with the Decrease Hover Verbosity command<keybinding:{0}>.", DECREASE_HOVER_VERBOSITY_ACTION_ID);
-	export const hoverContent = localize('contentHover', "The last focused hover content is the following.");
+	export const increaseVerbosity = localize('increaseVerbosity', '- The focused hover part verbosity level can be increased with the Increase Hover Verbosity command.', `<keybinding:${INCREASE_HOVER_VERBOSITY_ACTION_ID}>`);
+	export const decreaseVerbosity = localize('decreaseVerbosity', '- The focused hover part verbosity level can be decreased with the Decrease Hover Verbosity command.', `<keybinding:${DECREASE_HOVER_VERBOSITY_ACTION_ID}>`);
 }
 
 export class HoverAccessibleView implements IAccessibleViewImplentation {
@@ -36,25 +34,18 @@ export class HoverAccessibleView implements IAccessibleViewImplentation {
 	public readonly name = 'hover';
 	public readonly when = EditorContextKeys.hoverFocused;
 
-	private _provider: HoverAccessibleViewProvider | undefined;
-
-	getProvider(accessor: ServicesAccessor): AdvancedContentProvider | undefined {
+	getProvider(accessor: ServicesAccessor): AccessibleContentProvider | undefined {
 		const codeEditorService = accessor.get(ICodeEditorService);
 		const codeEditor = codeEditorService.getActiveCodeEditor() || codeEditorService.getFocusedCodeEditor();
 		if (!codeEditor) {
 			throw new Error('No active or focused code editor');
 		}
-		const hoverController = HoverController.get(codeEditor);
+		const hoverController = ContentHoverController.get(codeEditor);
 		if (!hoverController) {
 			return;
 		}
 		const keybindingService = accessor.get(IKeybindingService);
-		this._provider = accessor.get(IInstantiationService).createInstance(HoverAccessibleViewProvider, keybindingService, codeEditor, hoverController);
-		return this._provider;
-	}
-
-	dispose(): void {
-		this._provider?.dispose();
+		return accessor.get(IInstantiationService).createInstance(HoverAccessibleViewProvider, keybindingService, codeEditor, hoverController);
 	}
 }
 
@@ -65,27 +56,20 @@ export class HoverAccessibilityHelp implements IAccessibleViewImplentation {
 	public readonly type = AccessibleViewType.Help;
 	public readonly when = EditorContextKeys.hoverVisible;
 
-	private _provider: HoverAccessibleViewProvider | undefined;
-
-	getProvider(accessor: ServicesAccessor): AdvancedContentProvider | undefined {
+	getProvider(accessor: ServicesAccessor): AccessibleContentProvider | undefined {
 		const codeEditorService = accessor.get(ICodeEditorService);
 		const codeEditor = codeEditorService.getActiveCodeEditor() || codeEditorService.getFocusedCodeEditor();
 		if (!codeEditor) {
 			throw new Error('No active or focused code editor');
 		}
-		const hoverController = HoverController.get(codeEditor);
+		const hoverController = ContentHoverController.get(codeEditor);
 		if (!hoverController) {
 			return;
 		}
 		return accessor.get(IInstantiationService).createInstance(HoverAccessibilityHelpProvider, hoverController);
 	}
-
-	dispose(): void {
-		this._provider?.dispose();
-	}
 }
 
-
 abstract class BaseHoverAccessibleViewProvider extends Disposable implements IAccessibleViewContentProvider {
 
 	abstract provideContent(): string;
@@ -97,12 +81,9 @@ abstract class BaseHoverAccessibleViewProvider extends Disposable implements IAc
 	private readonly _onDidChangeContent: Emitter<void> = this._register(new Emitter<void>());
 	public readonly onDidChangeContent: Event<void> = this._onDidChangeContent.event;
 
-	protected _markdownHoverFocusedIndex: number = -1;
-	private _onHoverContentsChanged: IDisposable | undefined;
+	protected _focusedHoverPartIndex: number = -1;
 
-	constructor(
-		protected readonly _hoverController: HoverController,
-	) {
+	constructor(protected readonly _hoverController: ContentHoverController) {
 		super();
 	}
 
@@ -111,8 +92,8 @@ abstract class BaseHoverAccessibleViewProvider extends Disposable implements IAc
 			return;
 		}
 		this._hoverController.shouldKeepOpenOnEditorMouseMoveOrLeave = true;
-		this._markdownHoverFocusedIndex = this._hoverController.focusedMarkdownHoverIndex();
-		this._onHoverContentsChanged = this._register(this._hoverController.onHoverContentsChanged(() => {
+		this._focusedHoverPartIndex = this._hoverController.focusedHoverPartIndex();
+		this._register(this._hoverController.onHoverContentsChanged(() => {
 			this._onDidChangeContent.fire();
 		}));
 	}
@@ -121,33 +102,36 @@ abstract class BaseHoverAccessibleViewProvider extends Disposable implements IAc
 		if (!this._hoverController) {
 			return;
 		}
-		this._markdownHoverFocusedIndex = -1;
-		this._hoverController.focus();
+		if (this._focusedHoverPartIndex === -1) {
+			this._hoverController.focus();
+		} else {
+			this._hoverController.focusHoverPartWithIndex(this._focusedHoverPartIndex);
+		}
+		this._focusedHoverPartIndex = -1;
 		this._hoverController.shouldKeepOpenOnEditorMouseMoveOrLeave = false;
-		this._onHoverContentsChanged?.dispose();
-	}
-}
-
-export class HoverAccessibilityHelpProvider extends BaseHoverAccessibleViewProvider implements IAccessibleViewContentProvider {
-
-	public readonly options: IAccessibleViewOptions = { type: AccessibleViewType.Help };
-
-	constructor(
-		hoverController: HoverController,
-	) {
-		super(hoverController);
 	}
 
-	provideContent(): string {
-		return this.provideContentAtIndex(this._markdownHoverFocusedIndex);
-	}
-
-	provideContentAtIndex(index: number): string {
-		const content: string[] = [];
-		content.push(HoverAccessibilityHelpNLS.intro);
-		content.push(...this._descriptionsOfVerbosityActionsForIndex(index));
-		content.push(...this._descriptionOfFocusedMarkdownHoverAtIndex(index));
-		return content.join('\n');
+	provideContentAtIndex(focusedHoverIndex: number, includeVerbosityActions: boolean): string {
+		if (focusedHoverIndex !== -1) {
+			const accessibleContent = this._hoverController.getAccessibleWidgetContentAtIndex(focusedHoverIndex);
+			if (accessibleContent === undefined) {
+				return '';
+			}
+			const contents: string[] = [];
+			if (includeVerbosityActions) {
+				contents.push(...this._descriptionsOfVerbosityActionsForIndex(focusedHoverIndex));
+			}
+			contents.push(accessibleContent);
+			return contents.join('\n');
+		} else {
+			const accessibleContent = this._hoverController.getAccessibleWidgetContent();
+			if (accessibleContent === undefined) {
+				return '';
+			}
+			const contents: string[] = [];
+			contents.push(accessibleContent);
+			return contents.join('\n');
+		}
 	}
 
 	private _descriptionsOfVerbosityActionsForIndex(index: number): string[] {
@@ -164,7 +148,7 @@ export class HoverAccessibilityHelpProvider extends BaseHoverAccessibleViewProvi
 	}
 
 	private _descriptionOfVerbosityActionForIndex(action: HoverVerbosityAction, index: number): string | undefined {
-		const isActionSupported = this._hoverController.doesMarkdownHoverAtIndexSupportVerbosityAction(index, action);
+		const isActionSupported = this._hoverController.doesHoverAtIndexSupportVerbosityAction(index, action);
 		if (!isActionSupported) {
 			return;
 		}
@@ -175,15 +159,18 @@ export class HoverAccessibilityHelpProvider extends BaseHoverAccessibleViewProvi
 				return HoverAccessibilityHelpNLS.decreaseVerbosity;
 		}
 	}
+}
 
-	protected _descriptionOfFocusedMarkdownHoverAtIndex(index: number): string[] {
-		const content: string[] = [];
-		const hoverContent = this._hoverController.markdownHoverContentAtIndex(index);
-		if (hoverContent) {
-			content.push('\n' + HoverAccessibilityHelpNLS.hoverContent);
-			content.push('\n' + hoverContent);
-		}
-		return content;
+export class HoverAccessibilityHelpProvider extends BaseHoverAccessibleViewProvider implements IAccessibleViewContentProvider {
+
+	public readonly options: IAccessibleViewOptions = { type: AccessibleViewType.Help };
+
+	constructor(hoverController: ContentHoverController) {
+		super(hoverController);
+	}
+
+	provideContent(): string {
+		return this.provideContentAtIndex(this._focusedHoverPartIndex, true);
 	}
 }
 
@@ -194,15 +181,14 @@ export class HoverAccessibleViewProvider extends BaseHoverAccessibleViewProvider
 	constructor(
 		private readonly _keybindingService: IKeybindingService,
 		private readonly _editor: ICodeEditor,
-		hoverController: HoverController,
+		hoverController: ContentHoverController,
 	) {
 		super(hoverController);
 		this._initializeOptions(this._editor, hoverController);
 	}
 
 	public provideContent(): string {
-		const hoverContent = this._hoverController.markdownHoverContentAtIndex(this._markdownHoverFocusedIndex);
-		return hoverContent.length > 0 ? hoverContent : this._hoverController.getWidgetContent() || HoverAccessibilityHelpNLS.intro;
+		return this.provideContentAtIndex(this._focusedHoverPartIndex, false);
 	}
 
 	public get actions(): IAction[] {
@@ -229,26 +215,25 @@ export class HoverAccessibleViewProvider extends BaseHoverAccessibleViewProvider
 				break;
 		}
 		const actionLabel = labelForHoverVerbosityAction(this._keybindingService, action);
-		const actionEnabled = this._hoverController.doesMarkdownHoverAtIndexSupportVerbosityAction(this._markdownHoverFocusedIndex, action);
+		const actionEnabled = this._hoverController.doesHoverAtIndexSupportVerbosityAction(this._focusedHoverPartIndex, action);
 		return new Action(accessibleActionId, actionLabel, ThemeIcon.asClassName(actionCodicon), actionEnabled, () => {
-			editor.getAction(actionId)?.run({ index: this._markdownHoverFocusedIndex, focus: false });
+			editor.getAction(actionId)?.run({ index: this._focusedHoverPartIndex, focus: false });
 		});
 	}
 
-	private _initializeOptions(editor: ICodeEditor, hoverController: HoverController): void {
+	private _initializeOptions(editor: ICodeEditor, hoverController: ContentHoverController): void {
 		const helpProvider = this._register(new HoverAccessibilityHelpProvider(hoverController));
 		this.options.language = editor.getModel()?.getLanguageId();
-		this.options.customHelp = () => { return helpProvider.provideContentAtIndex(this._markdownHoverFocusedIndex); };
+		this.options.customHelp = () => { return helpProvider.provideContentAtIndex(this._focusedHoverPartIndex, true); };
 	}
 }
 
 export class ExtHoverAccessibleView implements IAccessibleViewImplentation {
-
 	public readonly type = AccessibleViewType.View;
 	public readonly priority = 90;
 	public readonly name = 'extension-hover';
 
-	getProvider(accessor: ServicesAccessor): AdvancedContentProvider | undefined {
+	getProvider(accessor: ServicesAccessor): AccessibleContentProvider | undefined {
 		const contextViewService = accessor.get(IContextViewService);
 		const contextViewElement = contextViewService.getContextViewElement();
 		const extensionHoverContent = contextViewElement?.textContent ?? undefined;
@@ -258,16 +243,14 @@ export class ExtHoverAccessibleView implements IAccessibleViewImplentation {
 			// The accessible view, itself, uses the context view service to display the text. We don't want to read that.
 			return;
 		}
-		return {
-			id: AccessibleViewProviderId.Hover,
-			verbositySettingKey: 'accessibility.verbosity.hover',
-			provideContent() { return extensionHoverContent; },
-			onClose() {
+		return new AccessibleContentProvider(
+			AccessibleViewProviderId.Hover,
+			{ language: 'typescript', type: AccessibleViewType.View },
+			() => { return extensionHoverContent; },
+			() => {
 				hoverService.showAndFocusLastHover();
 			},
-			options: { language: 'typescript', type: AccessibleViewType.View }
-		};
+			'accessibility.verbosity.hover',
+		);
 	}
-
-	dispose() { }
 }
diff --git a/src/vs/editor/contrib/hover/browser/hoverActionIds.ts b/src/vs/editor/contrib/hover/browser/hoverActionIds.ts
index 2ade6360ac1..95cd48dda49 100644
--- a/src/vs/editor/contrib/hover/browser/hoverActionIds.ts
+++ b/src/vs/editor/contrib/hover/browser/hoverActionIds.ts
@@ -2,7 +2,7 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import * as nls from 'vs/nls';
+import * as nls from '../../../../nls.js';
 
 export const SHOW_OR_FOCUS_HOVER_ACTION_ID = 'editor.action.showHover';
 export const SHOW_DEFINITION_PREVIEW_HOVER_ACTION_ID = 'editor.action.showDefinitionPreviewHover';
diff --git a/src/vs/editor/contrib/hover/browser/hoverActions.ts b/src/vs/editor/contrib/hover/browser/hoverActions.ts
index 20a5148fd74..7a4fbfe6228 100644
--- a/src/vs/editor/contrib/hover/browser/hoverActions.ts
+++ b/src/vs/editor/contrib/hover/browser/hoverActions.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DECREASE_HOVER_VERBOSITY_ACTION_ID, DECREASE_HOVER_VERBOSITY_ACTION_LABEL, GO_TO_BOTTOM_HOVER_ACTION_ID, GO_TO_TOP_HOVER_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACTION_LABEL, PAGE_DOWN_HOVER_ACTION_ID, PAGE_UP_HOVER_ACTION_ID, SCROLL_DOWN_HOVER_ACTION_ID, SCROLL_LEFT_HOVER_ACTION_ID, SCROLL_RIGHT_HOVER_ACTION_ID, SCROLL_UP_HOVER_ACTION_ID, SHOW_DEFINITION_PREVIEW_HOVER_ACTION_ID, SHOW_OR_FOCUS_HOVER_ACTION_ID } from 'vs/editor/contrib/hover/browser/hoverActionIds';
-import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Range } from 'vs/editor/common/core/range';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { GotoDefinitionAtPositionEditorContribution } from 'vs/editor/contrib/gotoSymbol/browser/link/goToDefinitionAtPosition';
-import { HoverStartMode, HoverStartSource } from 'vs/editor/contrib/hover/browser/hoverOperation';
-import { AccessibilitySupport } from 'vs/platform/accessibility/common/accessibility';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { HoverController } from 'vs/editor/contrib/hover/browser/hoverController';
-import { HoverVerbosityAction } from 'vs/editor/common/languages';
-import * as nls from 'vs/nls';
-import 'vs/css!./hover';
+import { DECREASE_HOVER_VERBOSITY_ACTION_ID, DECREASE_HOVER_VERBOSITY_ACTION_LABEL, GO_TO_BOTTOM_HOVER_ACTION_ID, GO_TO_TOP_HOVER_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACTION_LABEL, PAGE_DOWN_HOVER_ACTION_ID, PAGE_UP_HOVER_ACTION_ID, SCROLL_DOWN_HOVER_ACTION_ID, SCROLL_LEFT_HOVER_ACTION_ID, SCROLL_RIGHT_HOVER_ACTION_ID, SCROLL_UP_HOVER_ACTION_ID, SHOW_DEFINITION_PREVIEW_HOVER_ACTION_ID, SHOW_OR_FOCUS_HOVER_ACTION_ID } from './hoverActionIds.js';
+import { KeyChord, KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorAction, ServicesAccessor } from '../../../browser/editorExtensions.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { Range } from '../../../common/core/range.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { GotoDefinitionAtPositionEditorContribution } from '../../gotoSymbol/browser/link/goToDefinitionAtPosition.js';
+import { HoverStartMode, HoverStartSource } from './hoverOperation.js';
+import { AccessibilitySupport } from '../../../../platform/accessibility/common/accessibility.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ContentHoverController } from './contentHoverController.js';
+import { HoverVerbosityAction } from '../../../common/languages.js';
+import * as nls from '../../../../nls.js';
+import './hover.css';
 
 enum HoverFocusBehavior {
 	NoAutoFocus = 'noAutoFocus',
@@ -74,7 +74,7 @@ export class ShowOrFocusHoverAction extends EditorAction {
 			return;
 		}
 
-		const controller = HoverController.get(editor);
+		const controller = ContentHoverController.get(editor);
 		if (!controller) {
 			return;
 		}
@@ -128,7 +128,7 @@ export class ShowDefinitionPreviewHoverAction extends EditorAction {
 	}
 
 	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
-		const controller = HoverController.get(editor);
+		const controller = ContentHoverController.get(editor);
 		if (!controller) {
 			return;
 		}
@@ -176,7 +176,7 @@ export class ScrollUpHoverAction extends EditorAction {
 	}
 
 	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
-		const controller = HoverController.get(editor);
+		const controller = ContentHoverController.get(editor);
 		if (!controller) {
 			return;
 		}
@@ -209,7 +209,7 @@ export class ScrollDownHoverAction extends EditorAction {
 	}
 
 	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
-		const controller = HoverController.get(editor);
+		const controller = ContentHoverController.get(editor);
 		if (!controller) {
 			return;
 		}
@@ -242,7 +242,7 @@ export class ScrollLeftHoverAction extends EditorAction {
 	}
 
 	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
-		const controller = HoverController.get(editor);
+		const controller = ContentHoverController.get(editor);
 		if (!controller) {
 			return;
 		}
@@ -275,7 +275,7 @@ export class ScrollRightHoverAction extends EditorAction {
 	}
 
 	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
-		const controller = HoverController.get(editor);
+		const controller = ContentHoverController.get(editor);
 		if (!controller) {
 			return;
 		}
@@ -309,7 +309,7 @@ export class PageUpHoverAction extends EditorAction {
 	}
 
 	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
-		const controller = HoverController.get(editor);
+		const controller = ContentHoverController.get(editor);
 		if (!controller) {
 			return;
 		}
@@ -343,7 +343,7 @@ export class PageDownHoverAction extends EditorAction {
 	}
 
 	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
-		const controller = HoverController.get(editor);
+		const controller = ContentHoverController.get(editor);
 		if (!controller) {
 			return;
 		}
@@ -377,7 +377,7 @@ export class GoToTopHoverAction extends EditorAction {
 	}
 
 	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
-		const controller = HoverController.get(editor);
+		const controller = ContentHoverController.get(editor);
 		if (!controller) {
 			return;
 		}
@@ -412,7 +412,7 @@ export class GoToBottomHoverAction extends EditorAction {
 	}
 
 	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
-		const controller = HoverController.get(editor);
+		const controller = ContentHoverController.get(editor);
 		if (!controller) {
 			return;
 		}
@@ -432,7 +432,12 @@ export class IncreaseHoverVerbosityLevel extends EditorAction {
 	}
 
 	public run(accessor: ServicesAccessor, editor: ICodeEditor, args?: { index: number; focus: boolean }): void {
-		HoverController.get(editor)?.updateMarkdownHoverVerbosityLevel(HoverVerbosityAction.Increase, args?.index, args?.focus);
+		const hoverController = ContentHoverController.get(editor);
+		if (!hoverController) {
+			return;
+		}
+		const index = args?.index !== undefined ? args.index : hoverController.focusedHoverPartIndex();
+		hoverController.updateHoverVerbosityLevel(HoverVerbosityAction.Increase, index, args?.focus);
 	}
 }
 
@@ -448,6 +453,11 @@ export class DecreaseHoverVerbosityLevel extends EditorAction {
 	}
 
 	public run(accessor: ServicesAccessor, editor: ICodeEditor, args?: { index: number; focus: boolean }): void {
-		HoverController.get(editor)?.updateMarkdownHoverVerbosityLevel(HoverVerbosityAction.Decrease, args?.index, args?.focus);
+		const hoverController = ContentHoverController.get(editor);
+		if (!hoverController) {
+			return;
+		}
+		const index = args?.index !== undefined ? args.index : hoverController.focusedHoverPartIndex();
+		ContentHoverController.get(editor)?.updateHoverVerbosityLevel(HoverVerbosityAction.Decrease, index, args?.focus);
 	}
 }
diff --git a/src/vs/editor/contrib/hover/browser/hoverContribution.ts b/src/vs/editor/contrib/hover/browser/hoverContribution.ts
index bf24cdc1c69..0143aa6ac24 100644
--- a/src/vs/editor/contrib/hover/browser/hoverContribution.ts
+++ b/src/vs/editor/contrib/hover/browser/hoverContribution.ts
@@ -3,19 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DecreaseHoverVerbosityLevel, GoToBottomHoverAction, GoToTopHoverAction, IncreaseHoverVerbosityLevel, PageDownHoverAction, PageUpHoverAction, ScrollDownHoverAction, ScrollLeftHoverAction, ScrollRightHoverAction, ScrollUpHoverAction, ShowDefinitionPreviewHoverAction, ShowOrFocusHoverAction } from 'vs/editor/contrib/hover/browser/hoverActions';
-import { EditorContributionInstantiation, registerEditorAction, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { editorHoverBorder } from 'vs/platform/theme/common/colorRegistry';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { HoverParticipantRegistry } from 'vs/editor/contrib/hover/browser/hoverTypes';
-import { MarkdownHoverParticipant } from 'vs/editor/contrib/hover/browser/markdownHoverParticipant';
-import { MarkerHoverParticipant } from 'vs/editor/contrib/hover/browser/markerHoverParticipant';
-import { HoverController } from 'vs/editor/contrib/hover/browser/hoverController';
-import 'vs/css!./hover';
-import { AccessibleViewRegistry } from 'vs/platform/accessibility/browser/accessibleViewRegistry';
-import { ExtHoverAccessibleView, HoverAccessibilityHelp, HoverAccessibleView } from 'vs/editor/contrib/hover/browser/hoverAccessibleViews';
+import { DecreaseHoverVerbosityLevel, GoToBottomHoverAction, GoToTopHoverAction, IncreaseHoverVerbosityLevel, PageDownHoverAction, PageUpHoverAction, ScrollDownHoverAction, ScrollLeftHoverAction, ScrollRightHoverAction, ScrollUpHoverAction, ShowDefinitionPreviewHoverAction, ShowOrFocusHoverAction } from './hoverActions.js';
+import { EditorContributionInstantiation, registerEditorAction, registerEditorContribution } from '../../../browser/editorExtensions.js';
+import { editorHoverBorder } from '../../../../platform/theme/common/colorRegistry.js';
+import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
+import { HoverParticipantRegistry } from './hoverTypes.js';
+import { MarkdownHoverParticipant } from './markdownHoverParticipant.js';
+import { MarkerHoverParticipant } from './markerHoverParticipant.js';
+import { ContentHoverController } from './contentHoverController.js';
+import { GlyphHoverController } from './glyphHoverController.js';
+import './hover.css';
+import { AccessibleViewRegistry } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
+import { ExtHoverAccessibleView, HoverAccessibilityHelp, HoverAccessibleView } from './hoverAccessibleViews.js';
 
-registerEditorContribution(HoverController.ID, HoverController, EditorContributionInstantiation.BeforeFirstInteraction);
+registerEditorContribution(ContentHoverController.ID, ContentHoverController, EditorContributionInstantiation.BeforeFirstInteraction);
+registerEditorContribution(GlyphHoverController.ID, GlyphHoverController, EditorContributionInstantiation.BeforeFirstInteraction);
 registerEditorAction(ShowOrFocusHoverAction);
 registerEditorAction(ShowDefinitionPreviewHoverAction);
 registerEditorAction(ScrollUpHoverAction);
diff --git a/src/vs/editor/contrib/hover/browser/hoverController.ts b/src/vs/editor/contrib/hover/browser/hoverController.ts
deleted file mode 100644
index 293902db46d..00000000000
--- a/src/vs/editor/contrib/hover/browser/hoverController.ts
+++ /dev/null
@@ -1,491 +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 { DECREASE_HOVER_VERBOSITY_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACTION_ID, SHOW_OR_FOCUS_HOVER_ACTION_ID } from 'vs/editor/contrib/hover/browser/hoverActionIds';
-import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { ICodeEditor, IEditorMouseEvent, IPartialEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
-import { ConfigurationChangedEvent, EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Range } from 'vs/editor/common/core/range';
-import { IEditorContribution, IScrollEvent } from 'vs/editor/common/editorCommon';
-import { HoverStartMode, HoverStartSource } from 'vs/editor/contrib/hover/browser/hoverOperation';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IHoverWidget } from 'vs/editor/contrib/hover/browser/hoverTypes';
-import { InlineSuggestionHintsContentWidget } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ResultKind } from 'vs/platform/keybinding/common/keybindingResolver';
-import { HoverVerbosityAction } from 'vs/editor/common/languages';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { ContentHoverWidget } from 'vs/editor/contrib/hover/browser/contentHoverWidget';
-import { ContentHoverController } from 'vs/editor/contrib/hover/browser/contentHoverController';
-import 'vs/css!./hover';
-import { MarginHoverWidget } from 'vs/editor/contrib/hover/browser/marginHoverWidget';
-import { Emitter } from 'vs/base/common/event';
-
-// sticky hover widget which doesn't disappear on focus out and such
-const _sticky = false
-	// || Boolean("true") // done "weirdly" so that a lint warning prevents you from pushing this
-	;
-
-interface IHoverSettings {
-	readonly enabled: boolean;
-	readonly sticky: boolean;
-	readonly hidingDelay: number;
-}
-
-interface IHoverState {
-	mouseDown: boolean;
-	activatedByDecoratorClick: boolean;
-}
-
-const enum HoverWidgetType {
-	Content,
-	Glyph,
-}
-
-export class HoverController extends Disposable implements IEditorContribution {
-
-	private readonly _onHoverContentsChanged = this._register(new Emitter<void>());
-	public readonly onHoverContentsChanged = this._onHoverContentsChanged.event;
-
-	public static readonly ID = 'editor.contrib.hover';
-
-	public shouldKeepOpenOnEditorMouseMoveOrLeave: boolean = false;
-
-	private readonly _listenersStore = new DisposableStore();
-
-	private _glyphWidget: MarginHoverWidget | undefined;
-	private _contentWidget: ContentHoverController | undefined;
-
-	private _mouseMoveEvent: IEditorMouseEvent | undefined;
-	private _reactToEditorMouseMoveRunner: RunOnceScheduler;
-
-	private _hoverSettings!: IHoverSettings;
-	private _hoverState: IHoverState = {
-		mouseDown: false,
-		activatedByDecoratorClick: false
-	};
-
-	constructor(
-		private readonly _editor: ICodeEditor,
-		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-		@IKeybindingService private readonly _keybindingService: IKeybindingService
-	) {
-		super();
-		this._reactToEditorMouseMoveRunner = this._register(
-			new RunOnceScheduler(
-				() => this._reactToEditorMouseMove(this._mouseMoveEvent), 0
-			)
-		);
-		this._hookListeners();
-		this._register(this._editor.onDidChangeConfiguration((e: ConfigurationChangedEvent) => {
-			if (e.hasChanged(EditorOption.hover)) {
-				this._unhookListeners();
-				this._hookListeners();
-			}
-		}));
-	}
-
-	static get(editor: ICodeEditor): HoverController | null {
-		return editor.getContribution<HoverController>(HoverController.ID);
-	}
-
-	private _hookListeners(): void {
-
-		const hoverOpts = this._editor.getOption(EditorOption.hover);
-		this._hoverSettings = {
-			enabled: hoverOpts.enabled,
-			sticky: hoverOpts.sticky,
-			hidingDelay: hoverOpts.delay
-		};
-
-		if (hoverOpts.enabled) {
-			this._listenersStore.add(this._editor.onMouseDown((e: IEditorMouseEvent) => this._onEditorMouseDown(e)));
-			this._listenersStore.add(this._editor.onMouseUp(() => this._onEditorMouseUp()));
-			this._listenersStore.add(this._editor.onMouseMove((e: IEditorMouseEvent) => this._onEditorMouseMove(e)));
-			this._listenersStore.add(this._editor.onKeyDown((e: IKeyboardEvent) => this._onKeyDown(e)));
-		} else {
-			this._listenersStore.add(this._editor.onMouseMove((e: IEditorMouseEvent) => this._onEditorMouseMove(e)));
-			this._listenersStore.add(this._editor.onKeyDown((e: IKeyboardEvent) => this._onKeyDown(e)));
-		}
-
-		this._listenersStore.add(this._editor.onMouseLeave((e) => this._onEditorMouseLeave(e)));
-		this._listenersStore.add(this._editor.onDidChangeModel(() => {
-			this._cancelScheduler();
-			this._hideWidgets();
-		}));
-		this._listenersStore.add(this._editor.onDidChangeModelContent(() => this._cancelScheduler()));
-		this._listenersStore.add(this._editor.onDidScrollChange((e: IScrollEvent) => this._onEditorScrollChanged(e)));
-	}
-
-	private _unhookListeners(): void {
-		this._listenersStore.clear();
-	}
-
-	private _cancelScheduler() {
-		this._mouseMoveEvent = undefined;
-		this._reactToEditorMouseMoveRunner.cancel();
-	}
-
-	private _onEditorScrollChanged(e: IScrollEvent): void {
-		if (e.scrollTopChanged || e.scrollLeftChanged) {
-			this._hideWidgets();
-		}
-	}
-
-	private _onEditorMouseDown(mouseEvent: IEditorMouseEvent): void {
-
-		this._hoverState.mouseDown = true;
-
-		const shouldNotHideCurrentHoverWidget = this._shouldNotHideCurrentHoverWidget(mouseEvent);
-		if (shouldNotHideCurrentHoverWidget) {
-			return;
-		}
-
-		this._hideWidgets();
-	}
-
-	private _shouldNotHideCurrentHoverWidget(mouseEvent: IPartialEditorMouseEvent): boolean {
-		if (
-			this._isMouseOnContentHoverWidget(mouseEvent)
-			|| this._isMouseOnMarginHoverWidget(mouseEvent)
-			|| this._isContentWidgetResizing()
-		) {
-			return true;
-		}
-		return false;
-	}
-
-	private _isMouseOnMarginHoverWidget(mouseEvent: IPartialEditorMouseEvent): boolean {
-		const target = mouseEvent.target;
-		if (!target) {
-			return false;
-		}
-		return target.type === MouseTargetType.OVERLAY_WIDGET && target.detail === MarginHoverWidget.ID;
-	}
-
-	private _isMouseOnContentHoverWidget(mouseEvent: IPartialEditorMouseEvent): boolean {
-		const target = mouseEvent.target;
-		if (!target) {
-			return false;
-		}
-		return target.type === MouseTargetType.CONTENT_WIDGET && target.detail === ContentHoverWidget.ID;
-	}
-
-	private _onEditorMouseUp(): void {
-		this._hoverState.mouseDown = false;
-	}
-
-	private _onEditorMouseLeave(mouseEvent: IPartialEditorMouseEvent): void {
-		if (this.shouldKeepOpenOnEditorMouseMoveOrLeave) {
-			return;
-		}
-
-		this._cancelScheduler();
-
-		const shouldNotHideCurrentHoverWidget = this._shouldNotHideCurrentHoverWidget(mouseEvent);
-		if (shouldNotHideCurrentHoverWidget) {
-			return;
-		}
-		if (_sticky) {
-			return;
-		}
-		this._hideWidgets();
-	}
-
-	private _shouldNotRecomputeCurrentHoverWidget(mouseEvent: IEditorMouseEvent): boolean {
-
-		const isHoverSticky = this._hoverSettings.sticky;
-
-		const isMouseOnStickyMarginHoverWidget = (mouseEvent: IEditorMouseEvent, isHoverSticky: boolean) => {
-			const isMouseOnMarginHoverWidget = this._isMouseOnMarginHoverWidget(mouseEvent);
-			return isHoverSticky && isMouseOnMarginHoverWidget;
-		};
-		const isMouseOnStickyContentHoverWidget = (mouseEvent: IEditorMouseEvent, isHoverSticky: boolean) => {
-			const isMouseOnContentHoverWidget = this._isMouseOnContentHoverWidget(mouseEvent);
-			return isHoverSticky && isMouseOnContentHoverWidget;
-		};
-		const isMouseOnColorPicker = (mouseEvent: IEditorMouseEvent) => {
-			const isMouseOnContentHoverWidget = this._isMouseOnContentHoverWidget(mouseEvent);
-			const isColorPickerVisible = this._contentWidget?.isColorPickerVisible;
-			return isMouseOnContentHoverWidget && isColorPickerVisible;
-		};
-		// TODO@aiday-mar verify if the following is necessary code
-		const isTextSelectedWithinContentHoverWidget = (mouseEvent: IEditorMouseEvent, sticky: boolean) => {
-			return sticky
-				&& this._contentWidget?.containsNode(mouseEvent.event.browserEvent.view?.document.activeElement)
-				&& !mouseEvent.event.browserEvent.view?.getSelection()?.isCollapsed;
-		};
-
-		if (
-			isMouseOnStickyMarginHoverWidget(mouseEvent, isHoverSticky)
-			|| isMouseOnStickyContentHoverWidget(mouseEvent, isHoverSticky)
-			|| isMouseOnColorPicker(mouseEvent)
-			|| isTextSelectedWithinContentHoverWidget(mouseEvent, isHoverSticky)
-		) {
-			return true;
-		}
-		return false;
-	}
-
-	private _onEditorMouseMove(mouseEvent: IEditorMouseEvent): void {
-		if (this.shouldKeepOpenOnEditorMouseMoveOrLeave) {
-			return;
-		}
-
-		this._mouseMoveEvent = mouseEvent;
-		if (this._contentWidget?.isFocused || this._contentWidget?.isResizing) {
-			return;
-		}
-		const sticky = this._hoverSettings.sticky;
-		if (sticky && this._contentWidget?.isVisibleFromKeyboard) {
-			// Sticky mode is on and the hover has been shown via keyboard
-			// so moving the mouse has no effect
-			return;
-		}
-
-		const shouldNotRecomputeCurrentHoverWidget = this._shouldNotRecomputeCurrentHoverWidget(mouseEvent);
-		if (shouldNotRecomputeCurrentHoverWidget) {
-			this._reactToEditorMouseMoveRunner.cancel();
-			return;
-		}
-
-		const hidingDelay = this._hoverSettings.hidingDelay;
-		const isContentHoverWidgetVisible = this._contentWidget?.isVisible;
-		// If the mouse is not over the widget, and if sticky is on,
-		// then give it a grace period before reacting to the mouse event
-		const shouldRescheduleHoverComputation = isContentHoverWidgetVisible && sticky && hidingDelay > 0;
-
-		if (shouldRescheduleHoverComputation) {
-			if (!this._reactToEditorMouseMoveRunner.isScheduled()) {
-				this._reactToEditorMouseMoveRunner.schedule(hidingDelay);
-			}
-			return;
-		}
-		this._reactToEditorMouseMove(mouseEvent);
-	}
-
-	private _reactToEditorMouseMove(mouseEvent: IEditorMouseEvent | undefined): void {
-
-		if (!mouseEvent) {
-			return;
-		}
-
-		const target = mouseEvent.target;
-		const mouseOnDecorator = target.element?.classList.contains('colorpicker-color-decoration');
-		const decoratorActivatedOn = this._editor.getOption(EditorOption.colorDecoratorsActivatedOn);
-
-		const enabled = this._hoverSettings.enabled;
-		const activatedByDecoratorClick = this._hoverState.activatedByDecoratorClick;
-		if (
-			(
-				mouseOnDecorator && (
-					(decoratorActivatedOn === 'click' && !activatedByDecoratorClick) ||
-					(decoratorActivatedOn === 'hover' && !enabled && !_sticky) ||
-					(decoratorActivatedOn === 'clickAndHover' && !enabled && !activatedByDecoratorClick))
-			) || (
-				!mouseOnDecorator && !enabled && !activatedByDecoratorClick
-			)
-		) {
-			this._hideWidgets();
-			return;
-		}
-
-		const contentHoverShowsOrWillShow = this._tryShowHoverWidget(mouseEvent, HoverWidgetType.Content);
-		if (contentHoverShowsOrWillShow) {
-			return;
-		}
-
-		const glyphWidgetShowsOrWillShow = this._tryShowHoverWidget(mouseEvent, HoverWidgetType.Glyph);
-		if (glyphWidgetShowsOrWillShow) {
-			return;
-		}
-		if (_sticky) {
-			return;
-		}
-		this._hideWidgets();
-	}
-
-	private _tryShowHoverWidget(mouseEvent: IEditorMouseEvent, hoverWidgetType: HoverWidgetType): boolean {
-		const contentWidget: IHoverWidget = this._getOrCreateContentWidget();
-		const glyphWidget: IHoverWidget = this._getOrCreateGlyphWidget();
-		let currentWidget: IHoverWidget;
-		let otherWidget: IHoverWidget;
-		switch (hoverWidgetType) {
-			case HoverWidgetType.Content:
-				currentWidget = contentWidget;
-				otherWidget = glyphWidget;
-				break;
-			case HoverWidgetType.Glyph:
-				currentWidget = glyphWidget;
-				otherWidget = contentWidget;
-				break;
-			default:
-				throw new Error(`HoverWidgetType ${hoverWidgetType} is unrecognized`);
-		}
-
-		const showsOrWillShow = currentWidget.showsOrWillShow(mouseEvent);
-		if (showsOrWillShow) {
-			otherWidget.hide();
-		}
-		return showsOrWillShow;
-	}
-
-	private _onKeyDown(e: IKeyboardEvent): void {
-		if (!this._editor.hasModel()) {
-			return;
-		}
-
-		const resolvedKeyboardEvent = this._keybindingService.softDispatch(e, this._editor.getDomNode());
-
-		// If the beginning of a multi-chord keybinding is pressed,
-		// or the command aims to focus the hover,
-		// set the variable to true, otherwise false
-		const shouldKeepHoverVisible = (
-			resolvedKeyboardEvent.kind === ResultKind.MoreChordsNeeded ||
-			(resolvedKeyboardEvent.kind === ResultKind.KbFound
-				&& (resolvedKeyboardEvent.commandId === SHOW_OR_FOCUS_HOVER_ACTION_ID
-					|| resolvedKeyboardEvent.commandId === INCREASE_HOVER_VERBOSITY_ACTION_ID
-					|| resolvedKeyboardEvent.commandId === DECREASE_HOVER_VERBOSITY_ACTION_ID)
-				&& this._contentWidget?.isVisible
-			)
-		);
-
-		if (
-			e.keyCode === KeyCode.Ctrl
-			|| e.keyCode === KeyCode.Alt
-			|| e.keyCode === KeyCode.Meta
-			|| e.keyCode === KeyCode.Shift
-			|| shouldKeepHoverVisible
-		) {
-			// Do not hide hover when a modifier key is pressed
-			return;
-		}
-
-		this._hideWidgets();
-	}
-
-	private _hideWidgets(): void {
-		if (_sticky) {
-			return;
-		}
-		if ((
-			this._hoverState.mouseDown
-			&& this._contentWidget?.isColorPickerVisible
-		) || InlineSuggestionHintsContentWidget.dropDownVisible) {
-			return;
-		}
-		this._hoverState.activatedByDecoratorClick = false;
-		this._glyphWidget?.hide();
-		this._contentWidget?.hide();
-	}
-
-	private _getOrCreateContentWidget(): ContentHoverController {
-		if (!this._contentWidget) {
-			this._contentWidget = this._instantiationService.createInstance(ContentHoverController, this._editor);
-			this._listenersStore.add(this._contentWidget.onContentsChanged(() => this._onHoverContentsChanged.fire()));
-		}
-		return this._contentWidget;
-	}
-
-	private _getOrCreateGlyphWidget(): MarginHoverWidget {
-		if (!this._glyphWidget) {
-			this._glyphWidget = this._instantiationService.createInstance(MarginHoverWidget, this._editor);
-		}
-		return this._glyphWidget;
-	}
-
-	public hideContentHover(): void {
-		this._hideWidgets();
-	}
-
-	public showContentHover(
-		range: Range,
-		mode: HoverStartMode,
-		source: HoverStartSource,
-		focus: boolean,
-		activatedByColorDecoratorClick: boolean = false
-	): void {
-		this._hoverState.activatedByDecoratorClick = activatedByColorDecoratorClick;
-		this._getOrCreateContentWidget().startShowingAtRange(range, mode, source, focus);
-	}
-
-	private _isContentWidgetResizing(): boolean {
-		return this._contentWidget?.widget.isResizing || false;
-	}
-
-	public focusedMarkdownHoverIndex(): number {
-		return this._getOrCreateContentWidget().focusedMarkdownHoverIndex();
-	}
-
-	public markdownHoverContentAtIndex(index: number): string {
-		return this._getOrCreateContentWidget().markdownHoverContentAtIndex(index);
-	}
-
-	public doesMarkdownHoverAtIndexSupportVerbosityAction(index: number, action: HoverVerbosityAction): boolean {
-		return this._getOrCreateContentWidget().doesMarkdownHoverAtIndexSupportVerbosityAction(index, action);
-	}
-
-	public updateMarkdownHoverVerbosityLevel(action: HoverVerbosityAction, index?: number, focus?: boolean): void {
-		this._getOrCreateContentWidget().updateMarkdownHoverVerbosityLevel(action, index, focus);
-	}
-
-	public focus(): void {
-		this._contentWidget?.focus();
-	}
-
-	public scrollUp(): void {
-		this._contentWidget?.scrollUp();
-	}
-
-	public scrollDown(): void {
-		this._contentWidget?.scrollDown();
-	}
-
-	public scrollLeft(): void {
-		this._contentWidget?.scrollLeft();
-	}
-
-	public scrollRight(): void {
-		this._contentWidget?.scrollRight();
-	}
-
-	public pageUp(): void {
-		this._contentWidget?.pageUp();
-	}
-
-	public pageDown(): void {
-		this._contentWidget?.pageDown();
-	}
-
-	public goToTop(): void {
-		this._contentWidget?.goToTop();
-	}
-
-	public goToBottom(): void {
-		this._contentWidget?.goToBottom();
-	}
-
-	public getWidgetContent(): string | undefined {
-		return this._contentWidget?.getWidgetContent();
-	}
-
-	public get isColorPickerVisible(): boolean | undefined {
-		return this._contentWidget?.isColorPickerVisible;
-	}
-
-	public get isHoverVisible(): boolean | undefined {
-		return this._contentWidget?.isVisible;
-	}
-
-	public override dispose(): void {
-		super.dispose();
-		this._unhookListeners();
-		this._listenersStore.dispose();
-		this._glyphWidget?.dispose();
-		this._contentWidget?.dispose();
-	}
-}
diff --git a/src/vs/editor/contrib/hover/browser/hoverOperation.ts b/src/vs/editor/contrib/hover/browser/hoverOperation.ts
index 79c56ade663..cb73dddfb5c 100644
--- a/src/vs/editor/contrib/hover/browser/hoverOperation.ts
+++ b/src/vs/editor/contrib/hover/browser/hoverOperation.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { AsyncIterableObject, CancelableAsyncIterableObject, createCancelableAsyncIterable, RunOnceScheduler } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
+import { AsyncIterableObject, CancelableAsyncIterableObject, createCancelableAsyncIterable, RunOnceScheduler } from '../../../../base/common/async.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 
-export interface IHoverComputer<T> {
+export interface IHoverComputer<TArgs, TResult> {
 	/**
 	 * This is called after half the hover time
 	 */
-	computeAsync?: (token: CancellationToken) => AsyncIterableObject<T>;
+	computeAsync?: (args: TArgs, token: CancellationToken) => AsyncIterableObject<TResult>;
 	/**
 	 * This is called after all the hover time
 	 */
-	computeSync?: () => T[];
+	computeSync?: (args: TArgs) => TResult[];
 }
 
 const enum HoverOperationState {
@@ -40,11 +40,12 @@ export const enum HoverStartSource {
 	Keyboard = 1
 }
 
-export class HoverResult<T> {
+export class HoverResult<TArgs, TResult> {
 	constructor(
-		public readonly value: T[],
+		public readonly value: TResult[],
 		public readonly isComplete: boolean,
 		public readonly hasLoadingMessage: boolean,
+		public readonly options: TArgs
 	) { }
 }
 
@@ -58,23 +59,24 @@ export class HoverResult<T> {
  *   - if there are sync or async results, they are rendered.
  * - at 900ms, if the async computation hasn't finished, a "Loading..." result is added.
  */
-export class HoverOperation<T> extends Disposable {
+export class HoverOperation<TArgs, TResult> extends Disposable {
 
-	private readonly _onResult = this._register(new Emitter<HoverResult<T>>());
+	private readonly _onResult = this._register(new Emitter<HoverResult<TArgs, TResult>>());
 	public readonly onResult = this._onResult.event;
 
-	private readonly _firstWaitScheduler = this._register(new RunOnceScheduler(() => this._triggerAsyncComputation(), 0));
-	private readonly _secondWaitScheduler = this._register(new RunOnceScheduler(() => this._triggerSyncComputation(), 0));
-	private readonly _loadingMessageScheduler = this._register(new RunOnceScheduler(() => this._triggerLoadingMessage(), 0));
+	private readonly _asyncComputationScheduler = this._register(new Debouncer((options: TArgs) => this._triggerAsyncComputation(options), 0));
+	private readonly _syncComputationScheduler = this._register(new Debouncer((options: TArgs) => this._triggerSyncComputation(options), 0));
+	private readonly _loadingMessageScheduler = this._register(new Debouncer((options: TArgs) => this._triggerLoadingMessage(options), 0));
 
 	private _state = HoverOperationState.Idle;
-	private _asyncIterable: CancelableAsyncIterableObject<T> | null = null;
+	private _asyncIterable: CancelableAsyncIterableObject<TResult> | null = null;
 	private _asyncIterableDone: boolean = false;
-	private _result: T[] = [];
+	private _result: TResult[] = [];
+	private _options: TArgs | undefined;
 
 	constructor(
 		private readonly _editor: ICodeEditor,
-		private readonly _computer: IHoverComputer<T>
+		private readonly _computer: IHoverComputer<TArgs, TResult>
 	) {
 		super();
 	}
@@ -84,6 +86,7 @@ export class HoverOperation<T> extends Disposable {
 			this._asyncIterable.cancel();
 			this._asyncIterable = null;
 		}
+		this._options = undefined;
 		super.dispose();
 	}
 
@@ -103,33 +106,31 @@ export class HoverOperation<T> extends Disposable {
 		return 3 * this._hoverTime;
 	}
 
-	private _setState(state: HoverOperationState, fireResult: boolean = true): void {
+	private _setState(state: HoverOperationState, options: TArgs): void {
 		this._state = state;
-		if (fireResult) {
-			this._fireResult();
-		}
+		this._fireResult(options);
 	}
 
-	private _triggerAsyncComputation(): void {
-		this._setState(HoverOperationState.SecondWait);
-		this._secondWaitScheduler.schedule(this._secondWaitTime);
+	private _triggerAsyncComputation(options: TArgs): void {
+		this._setState(HoverOperationState.SecondWait, options);
+		this._syncComputationScheduler.schedule(options, this._secondWaitTime);
 
 		if (this._computer.computeAsync) {
 			this._asyncIterableDone = false;
-			this._asyncIterable = createCancelableAsyncIterable(token => this._computer.computeAsync!(token));
+			this._asyncIterable = createCancelableAsyncIterable(token => this._computer.computeAsync!(options, token));
 
 			(async () => {
 				try {
 					for await (const item of this._asyncIterable!) {
 						if (item) {
 							this._result.push(item);
-							this._fireResult();
+							this._fireResult(options);
 						}
 					}
 					this._asyncIterableDone = true;
 
 					if (this._state === HoverOperationState.WaitingForAsync || this._state === HoverOperationState.WaitingForAsyncShowingLoading) {
-						this._setState(HoverOperationState.Idle);
+						this._setState(HoverOperationState.Idle, options);
 					}
 
 				} catch (e) {
@@ -142,61 +143,86 @@ export class HoverOperation<T> extends Disposable {
 		}
 	}
 
-	private _triggerSyncComputation(): void {
+	private _triggerSyncComputation(options: TArgs): void {
 		if (this._computer.computeSync) {
-			this._result = this._result.concat(this._computer.computeSync());
+			this._result = this._result.concat(this._computer.computeSync(options));
 		}
-		this._setState(this._asyncIterableDone ? HoverOperationState.Idle : HoverOperationState.WaitingForAsync);
+		this._setState(this._asyncIterableDone ? HoverOperationState.Idle : HoverOperationState.WaitingForAsync, options);
 	}
 
-	private _triggerLoadingMessage(): void {
+	private _triggerLoadingMessage(options: TArgs): void {
 		if (this._state === HoverOperationState.WaitingForAsync) {
-			this._setState(HoverOperationState.WaitingForAsyncShowingLoading);
+			this._setState(HoverOperationState.WaitingForAsyncShowingLoading, options);
 		}
 	}
 
-	private _fireResult(): void {
+	private _fireResult(options: TArgs): void {
 		if (this._state === HoverOperationState.FirstWait || this._state === HoverOperationState.SecondWait) {
 			// Do not send out results before the hover time
 			return;
 		}
 		const isComplete = (this._state === HoverOperationState.Idle);
 		const hasLoadingMessage = (this._state === HoverOperationState.WaitingForAsyncShowingLoading);
-		this._onResult.fire(new HoverResult(this._result.slice(0), isComplete, hasLoadingMessage));
+		this._onResult.fire(new HoverResult(this._result.slice(0), isComplete, hasLoadingMessage, options));
 	}
 
-	public start(mode: HoverStartMode): void {
+	public start(mode: HoverStartMode, options: TArgs): void {
 		if (mode === HoverStartMode.Delayed) {
 			if (this._state === HoverOperationState.Idle) {
-				this._setState(HoverOperationState.FirstWait);
-				this._firstWaitScheduler.schedule(this._firstWaitTime);
-				this._loadingMessageScheduler.schedule(this._loadingMessageTime);
+				this._setState(HoverOperationState.FirstWait, options);
+				this._asyncComputationScheduler.schedule(options, this._firstWaitTime);
+				this._loadingMessageScheduler.schedule(options, this._loadingMessageTime);
 			}
 		} else {
 			switch (this._state) {
 				case HoverOperationState.Idle:
-					this._triggerAsyncComputation();
-					this._secondWaitScheduler.cancel();
-					this._triggerSyncComputation();
+					this._triggerAsyncComputation(options);
+					this._syncComputationScheduler.cancel();
+					this._triggerSyncComputation(options);
 					break;
 				case HoverOperationState.SecondWait:
-					this._secondWaitScheduler.cancel();
-					this._triggerSyncComputation();
+					this._syncComputationScheduler.cancel();
+					this._triggerSyncComputation(options);
 					break;
 			}
 		}
 	}
 
 	public cancel(): void {
-		this._firstWaitScheduler.cancel();
-		this._secondWaitScheduler.cancel();
+		this._asyncComputationScheduler.cancel();
+		this._syncComputationScheduler.cancel();
 		this._loadingMessageScheduler.cancel();
 		if (this._asyncIterable) {
 			this._asyncIterable.cancel();
 			this._asyncIterable = null;
 		}
 		this._result = [];
-		this._setState(HoverOperationState.Idle, false);
+		this._options = undefined;
+		this._state = HoverOperationState.Idle;
 	}
 
+	public get options(): TArgs | undefined {
+		return this._options;
+	}
+}
+
+class Debouncer<TArgs> extends Disposable {
+
+	private readonly _scheduler: RunOnceScheduler;
+
+	private _options: TArgs | undefined;
+
+	constructor(runner: (options: TArgs) => void, debounceTimeMs: number) {
+		super();
+		this._scheduler = this._register(new RunOnceScheduler(() => runner(this._options!), debounceTimeMs));
+	}
+
+	schedule(options: TArgs, debounceTimeMs: number): void {
+		this._options = options;
+		this._scheduler.schedule(debounceTimeMs);
+	}
+
+	cancel(): void {
+		this._scheduler.cancel();
+	}
 }
diff --git a/src/vs/editor/contrib/hover/browser/hoverTypes.ts b/src/vs/editor/contrib/hover/browser/hoverTypes.ts
index 0caaba7f030..b557fce3ba3 100644
--- a/src/vs/editor/contrib/hover/browser/hoverTypes.ts
+++ b/src/vs/editor/contrib/hover/browser/hoverTypes.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Dimension } from 'vs/base/browser/dom';
-import { AsyncIterableObject } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { ICodeEditor, IEditorMouseEvent } from 'vs/editor/browser/editorBrowser';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { IModelDecoration } from 'vs/editor/common/model';
-import { BrandedService, IConstructorSignature } from 'vs/platform/instantiation/common/instantiation';
+import { Dimension } from '../../../../base/browser/dom.js';
+import { AsyncIterableObject } from '../../../../base/common/async.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { ICodeEditor, IEditorMouseEvent } from '../../../browser/editorBrowser.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { IModelDecoration } from '../../../common/model.js';
+import { BrandedService, IConstructorSignature } from '../../../../platform/instantiation/common/instantiation.js';
 
 export interface IHoverPart {
 	/**
@@ -120,13 +120,46 @@ export interface IEditorHoverRenderContext extends IEditorHoverContext {
 	readonly statusBar: IEditorHoverStatusBar;
 }
 
+export interface IRenderedHoverPart<T extends IHoverPart> extends IDisposable {
+	/**
+	 * The rendered hover part.
+	 */
+	hoverPart: T;
+	/**
+	 * The HTML element containing the hover part.
+	 */
+	hoverElement: HTMLElement;
+}
+
+export interface IRenderedHoverParts<T extends IHoverPart> extends IDisposable {
+	/**
+	 * Array of rendered hover parts.
+	 */
+	renderedHoverParts: IRenderedHoverPart<T>[];
+}
+
+/**
+ * Default implementation of IRenderedHoverParts.
+ */
+export class RenderedHoverParts<T extends IHoverPart> implements IRenderedHoverParts<T> {
+
+	constructor(public readonly renderedHoverParts: IRenderedHoverPart<T>[]) { }
+
+	dispose() {
+		for (const part of this.renderedHoverParts) {
+			part.dispose();
+		}
+	}
+}
+
 export interface IEditorHoverParticipant<T extends IHoverPart = IHoverPart> {
 	readonly hoverOrdinal: number;
 	suggestHoverAnchor?(mouseEvent: IEditorMouseEvent): HoverAnchor | null;
 	computeSync(anchor: HoverAnchor, lineDecorations: IModelDecoration[]): T[];
 	computeAsync?(anchor: HoverAnchor, lineDecorations: IModelDecoration[], token: CancellationToken): AsyncIterableObject<T>;
 	createLoadingMessage?(anchor: HoverAnchor): T | null;
-	renderHoverParts(context: IEditorHoverRenderContext, hoverParts: T[]): IDisposable;
+	renderHoverParts(context: IEditorHoverRenderContext, hoverParts: T[]): IRenderedHoverParts<T>;
+	getAccessibleContent(hoverPart: T): string;
 	handleResize?(): void;
 }
 
diff --git a/src/vs/editor/contrib/hover/browser/hoverUtils.ts b/src/vs/editor/contrib/hover/browser/hoverUtils.ts
new file mode 100644
index 00000000000..7f4a74956b6
--- /dev/null
+++ b/src/vs/editor/contrib/hover/browser/hoverUtils.ts
@@ -0,0 +1,17 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from '../../../../base/browser/dom.js';
+
+export function isMousePositionWithinElement(element: HTMLElement, posx: number, posy: number): boolean {
+	const elementRect = dom.getDomNodePagePosition(element);
+	if (posx < elementRect.left
+		|| posx > elementRect.left + elementRect.width
+		|| posy < elementRect.top
+		|| posy > elementRect.top + elementRect.height) {
+		return false;
+	}
+	return true;
+}
diff --git a/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.ts b/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.ts
index 7bc9ae9985e..db9528985a7 100644
--- a/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.ts
+++ b/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.ts
@@ -3,36 +3,37 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { asArray, compareBy, numberComparator } from 'vs/base/common/arrays';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { IMarkdownString, isEmptyMarkdownString, MarkdownString } from 'vs/base/common/htmlContent';
-import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { MarkdownRenderer } from 'vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
-import { DECREASE_HOVER_VERBOSITY_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACTION_ID } from 'vs/editor/contrib/hover/browser/hoverActionIds';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { IModelDecoration, ITextModel } from 'vs/editor/common/model';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { HoverAnchor, HoverAnchorType, HoverRangeAnchor, IEditorHoverParticipant, IEditorHoverRenderContext, IHoverPart } from 'vs/editor/contrib/hover/browser/hoverTypes';
-import * as nls from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Hover, HoverContext, HoverProvider, HoverVerbosityAction } from 'vs/editor/common/languages';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { onUnexpectedExternalError } from 'vs/base/common/errors';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ClickAction, HoverPosition, KeyDownAction } from 'vs/base/browser/ui/hover/hoverWidget';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { IHoverService, WorkbenchHoverDelegate } from 'vs/platform/hover/browser/hover';
-import { AsyncIterableObject } from 'vs/base/common/async';
-import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import { getHoverProviderResultsAsAsyncIterable } from 'vs/editor/contrib/hover/browser/getHover';
+import * as dom from '../../../../base/browser/dom.js';
+import { asArray, compareBy, numberComparator } from '../../../../base/common/arrays.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { IMarkdownString, isEmptyMarkdownString, MarkdownString } from '../../../../base/common/htmlContent.js';
+import { DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { MarkdownRenderer } from '../../../browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import { DECREASE_HOVER_VERBOSITY_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACTION_ID } from './hoverActionIds.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { IModelDecoration, ITextModel } from '../../../common/model.js';
+import { ILanguageService } from '../../../common/languages/language.js';
+import { HoverAnchor, HoverAnchorType, HoverRangeAnchor, IEditorHoverParticipant, IEditorHoverRenderContext, IHoverPart, IRenderedHoverPart, IRenderedHoverParts, RenderedHoverParts } from './hoverTypes.js';
+import * as nls from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { Hover, HoverContext, HoverProvider, HoverVerbosityAction } from '../../../common/languages.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { onUnexpectedExternalError } from '../../../../base/common/errors.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { ClickAction, HoverPosition, KeyDownAction } from '../../../../base/browser/ui/hover/hoverWidget.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { IHoverService, WorkbenchHoverDelegate } from '../../../../platform/hover/browser/hover.js';
+import { AsyncIterableObject } from '../../../../base/common/async.js';
+import { LanguageFeatureRegistry } from '../../../common/languageFeatureRegistry.js';
+import { getHoverProviderResultsAsAsyncIterable } from './getHover.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
 
 const $ = dom.$;
 const increaseHoverVerbosityIcon = registerIcon('hover-increase-verbosity', Codicon.add, nls.localize('increaseHoverVerbosity', 'Icon for increaseing hover verbosity.'));
@@ -90,6 +91,7 @@ export class MarkdownHoverParticipant implements IEditorHoverParticipant<Markdow
 		@ILanguageFeaturesService protected readonly _languageFeaturesService: ILanguageFeaturesService,
 		@IKeybindingService private readonly _keybindingService: IKeybindingService,
 		@IHoverService private readonly _hoverService: IHoverService,
+		@ICommandService private readonly _commandService: ICommandService,
 	) { }
 
 	public createLoadingMessage(anchor: HoverAnchor): MarkdownHover | null {
@@ -176,13 +178,15 @@ export class MarkdownHoverParticipant implements IEditorHoverParticipant<Markdow
 		return markdownHovers;
 	}
 
-	public renderHoverParts(context: IEditorHoverRenderContext, hoverParts: MarkdownHover[]): IDisposable {
+	public renderHoverParts(context: IEditorHoverRenderContext, hoverParts: MarkdownHover[]): IRenderedHoverParts<MarkdownHover> {
 		this._renderedHoverParts = new MarkdownRenderedHoverParts(
 			hoverParts,
 			context.fragment,
+			this,
 			this._editor,
 			this._languageService,
 			this._openerService,
+			this._commandService,
 			this._keybindingService,
 			this._hoverService,
 			this._configurationService,
@@ -191,55 +195,65 @@ export class MarkdownHoverParticipant implements IEditorHoverParticipant<Markdow
 		return this._renderedHoverParts;
 	}
 
-	public markdownHoverContentAtIndex(index: number): string {
-		return this._renderedHoverParts?.markdownHoverContentAtIndex(index) ?? '';
-	}
-
-	public focusedMarkdownHoverIndex(): number {
-		return this._renderedHoverParts?.focusedMarkdownHoverIndex() ?? 1;
+	public getAccessibleContent(hoverPart: MarkdownHover): string {
+		return this._renderedHoverParts?.getAccessibleContent(hoverPart) ?? '';
 	}
 
 	public doesMarkdownHoverAtIndexSupportVerbosityAction(index: number, action: HoverVerbosityAction): boolean {
 		return this._renderedHoverParts?.doesMarkdownHoverAtIndexSupportVerbosityAction(index, action) ?? false;
 	}
 
-	public updateMarkdownHoverVerbosityLevel(action: HoverVerbosityAction, index?: number, focus?: boolean) {
-		this._renderedHoverParts?.updateMarkdownHoverPartVerbosityLevel(action, index, focus);
+	public updateMarkdownHoverVerbosityLevel(action: HoverVerbosityAction, index: number, focus?: boolean): Promise<{ hoverPart: MarkdownHover; hoverElement: HTMLElement } | undefined> {
+		return Promise.resolve(this._renderedHoverParts?.updateMarkdownHoverPartVerbosityLevel(action, index, focus));
 	}
 }
 
-interface RenderedHoverPart {
-	renderedMarkdown: HTMLElement;
-	disposables: DisposableStore;
-	hoverSource?: HoverSource;
-}
-
-class MarkdownRenderedHoverParts extends Disposable {
-
-	private _renderedHoverParts: RenderedHoverPart[];
-	private _focusedHoverPartIndex: number = -1;
-	private _ongoingHoverOperations: Map<HoverProvider, { verbosityDelta: number; tokenSource: CancellationTokenSource }> = new Map();
+class RenderedMarkdownHoverPart implements IRenderedHoverPart<MarkdownHover> {
 
 	constructor(
-		hoverParts: MarkdownHover[], // we own!
+		public readonly hoverPart: MarkdownHover,
+		public readonly hoverElement: HTMLElement,
+		public readonly disposables: DisposableStore,
+	) { }
+
+	get hoverAccessibleContent(): string {
+		return this.hoverElement.innerText.trim();
+	}
+
+	dispose(): void {
+		this.disposables.dispose();
+	}
+}
+
+class MarkdownRenderedHoverParts implements IRenderedHoverParts<MarkdownHover> {
+
+	public renderedHoverParts: RenderedMarkdownHoverPart[];
+
+	private _ongoingHoverOperations: Map<HoverProvider, { verbosityDelta: number; tokenSource: CancellationTokenSource }> = new Map();
+
+	private readonly _disposables = new DisposableStore();
+
+	constructor(
+		hoverParts: MarkdownHover[],
 		hoverPartsContainer: DocumentFragment,
+		private readonly _hoverParticipant: MarkdownHoverParticipant,
 		private readonly _editor: ICodeEditor,
 		private readonly _languageService: ILanguageService,
 		private readonly _openerService: IOpenerService,
+		private readonly _commandService: ICommandService,
 		private readonly _keybindingService: IKeybindingService,
 		private readonly _hoverService: IHoverService,
 		private readonly _configurationService: IConfigurationService,
 		private readonly _onFinishedRendering: () => void,
 	) {
-		super();
-		this._renderedHoverParts = this._renderHoverParts(hoverParts, hoverPartsContainer, this._onFinishedRendering);
-		this._register(toDisposable(() => {
-			this._renderedHoverParts.forEach(renderedHoverPart => {
-				renderedHoverPart.disposables.dispose();
+		this.renderedHoverParts = this._renderHoverParts(hoverParts, hoverPartsContainer, this._onFinishedRendering);
+		this._disposables.add(toDisposable(() => {
+			this.renderedHoverParts.forEach(renderedHoverPart => {
+				renderedHoverPart.dispose();
+			});
+			this._ongoingHoverOperations.forEach(operation => {
+				operation.tokenSource.dispose(true);
 			});
-		}));
-		this._register(toDisposable(() => {
-			this._ongoingHoverOperations.forEach(operation => { operation.tokenSource.dispose(true); });
 		}));
 	}
 
@@ -247,75 +261,57 @@ class MarkdownRenderedHoverParts extends Disposable {
 		hoverParts: MarkdownHover[],
 		hoverPartsContainer: DocumentFragment,
 		onFinishedRendering: () => void,
-	): RenderedHoverPart[] {
+	): RenderedMarkdownHoverPart[] {
 		hoverParts.sort(compareBy(hover => hover.ordinal, numberComparator));
-		return hoverParts.map((hoverPart, hoverIndex) => {
-			const renderedHoverPart = this._renderHoverPart(
-				hoverIndex,
-				hoverPart.contents,
-				hoverPart.source,
-				onFinishedRendering
-			);
-			hoverPartsContainer.appendChild(renderedHoverPart.renderedMarkdown);
+		return hoverParts.map(hoverPart => {
+			const renderedHoverPart = this._renderHoverPart(hoverPart, onFinishedRendering);
+			hoverPartsContainer.appendChild(renderedHoverPart.hoverElement);
 			return renderedHoverPart;
 		});
 	}
 
 	private _renderHoverPart(
-		hoverPartIndex: number,
-		hoverContents: IMarkdownString[],
-		hoverSource: HoverSource | undefined,
+		hoverPart: MarkdownHover,
 		onFinishedRendering: () => void
-	): RenderedHoverPart {
+	): RenderedMarkdownHoverPart {
 
-		const { renderedMarkdown, disposables } = this._renderMarkdownContent(hoverContents, onFinishedRendering);
+		const renderedMarkdownPart = this._renderMarkdownHover(hoverPart, onFinishedRendering);
+		const renderedMarkdownElement = renderedMarkdownPart.hoverElement;
+		const hoverSource = hoverPart.source;
+		const disposables = new DisposableStore();
+		disposables.add(renderedMarkdownPart);
 
 		if (!hoverSource) {
-			return { renderedMarkdown, disposables };
+			return new RenderedMarkdownHoverPart(hoverPart, renderedMarkdownElement, disposables);
 		}
 
 		const canIncreaseVerbosity = hoverSource.supportsVerbosityAction(HoverVerbosityAction.Increase);
 		const canDecreaseVerbosity = hoverSource.supportsVerbosityAction(HoverVerbosityAction.Decrease);
 
 		if (!canIncreaseVerbosity && !canDecreaseVerbosity) {
-			return { renderedMarkdown, disposables, hoverSource };
+			return new RenderedMarkdownHoverPart(hoverPart, renderedMarkdownElement, disposables);
 		}
 
 		const actionsContainer = $('div.verbosity-actions');
-		renderedMarkdown.prepend(actionsContainer);
+		renderedMarkdownElement.prepend(actionsContainer);
 
 		disposables.add(this._renderHoverExpansionAction(actionsContainer, HoverVerbosityAction.Increase, canIncreaseVerbosity));
 		disposables.add(this._renderHoverExpansionAction(actionsContainer, HoverVerbosityAction.Decrease, canDecreaseVerbosity));
-
-		this._register(dom.addDisposableListener(renderedMarkdown, dom.EventType.FOCUS_IN, (event: Event) => {
-			event.stopPropagation();
-			this._focusedHoverPartIndex = hoverPartIndex;
-		}));
-		this._register(dom.addDisposableListener(renderedMarkdown, dom.EventType.FOCUS_OUT, (event: Event) => {
-			event.stopPropagation();
-			this._focusedHoverPartIndex = -1;
-		}));
-		return { renderedMarkdown, disposables, hoverSource };
+		return new RenderedMarkdownHoverPart(hoverPart, renderedMarkdownElement, disposables);
 	}
 
-	private _renderMarkdownContent(
-		markdownContent: IMarkdownString[],
+	private _renderMarkdownHover(
+		markdownHover: MarkdownHover,
 		onFinishedRendering: () => void
-	): RenderedHoverPart {
-		const renderedMarkdown = $('div.hover-row');
-		renderedMarkdown.tabIndex = 0;
-		const renderedMarkdownContents = $('div.hover-row-contents');
-		renderedMarkdown.appendChild(renderedMarkdownContents);
-		const disposables = new DisposableStore();
-		disposables.add(renderMarkdownInContainer(
+	): IRenderedHoverPart<MarkdownHover> {
+		const renderedMarkdownHover = renderMarkdownInContainer(
 			this._editor,
-			renderedMarkdownContents,
-			markdownContent,
+			markdownHover,
 			this._languageService,
 			this._openerService,
 			onFinishedRendering,
-		));
-		return { renderedMarkdown, disposables };
+		);
+		return renderedMarkdownHover;
 	}
 
 	private _renderHoverExpansionAction(container: HTMLElement, action: HoverVerbosityAction, actionEnabled: boolean): DisposableStore {
@@ -330,53 +326,68 @@ class MarkdownRenderedHoverParts extends Disposable {
 			return store;
 		}
 		actionElement.classList.add('enabled');
-		const actionFunction = () => this.updateMarkdownHoverPartVerbosityLevel(action);
+		const actionFunction = () => this._commandService.executeCommand(action === HoverVerbosityAction.Increase ? INCREASE_HOVER_VERBOSITY_ACTION_ID : DECREASE_HOVER_VERBOSITY_ACTION_ID);
 		store.add(new ClickAction(actionElement, actionFunction));
 		store.add(new KeyDownAction(actionElement, actionFunction, [KeyCode.Enter, KeyCode.Space]));
 		return store;
 	}
 
-	public async updateMarkdownHoverPartVerbosityLevel(action: HoverVerbosityAction, index: number = -1, focus: boolean = true): Promise<void> {
+	public async updateMarkdownHoverPartVerbosityLevel(action: HoverVerbosityAction, index: number, focus: boolean = true): Promise<{ hoverPart: MarkdownHover; hoverElement: HTMLElement } | undefined> {
 		const model = this._editor.getModel();
 		if (!model) {
-			return;
+			return undefined;
 		}
-		const indexOfInterest = index !== -1 ? index : this._focusedHoverPartIndex;
-		const hoverRenderedPart = this._getRenderedHoverPartAtIndex(indexOfInterest);
-		if (!hoverRenderedPart || !hoverRenderedPart.hoverSource?.supportsVerbosityAction(action)) {
-			return;
+		const hoverRenderedPart = this._getRenderedHoverPartAtIndex(index);
+		const hoverSource = hoverRenderedPart?.hoverPart.source;
+		if (!hoverRenderedPart || !hoverSource?.supportsVerbosityAction(action)) {
+			return undefined;
 		}
-		const hoverSource = hoverRenderedPart.hoverSource;
 		const newHover = await this._fetchHover(hoverSource, model, action);
 		if (!newHover) {
-			return;
+			return undefined;
 		}
 		const newHoverSource = new HoverSource(newHover, hoverSource.hoverProvider, hoverSource.hoverPosition);
-		const newHoverRenderedPart = this._renderHoverPart(
-			indexOfInterest,
+		const initialHoverPart = hoverRenderedPart.hoverPart;
+		const newHoverPart = new MarkdownHover(
+			this._hoverParticipant,
+			initialHoverPart.range,
 			newHover.contents,
-			newHoverSource,
+			initialHoverPart.isBeforeContent,
+			initialHoverPart.ordinal,
+			newHoverSource
+		);
+		const newHoverRenderedPart = this._renderHoverPart(
+			newHoverPart,
 			this._onFinishedRendering
 		);
-		this._replaceRenderedHoverPartAtIndex(indexOfInterest, newHoverRenderedPart);
+		this._replaceRenderedHoverPartAtIndex(index, newHoverRenderedPart, newHoverPart);
 		if (focus) {
-			this._focusOnHoverPartWithIndex(indexOfInterest);
+			this._focusOnHoverPartWithIndex(index);
 		}
-		this._onFinishedRendering();
+		return {
+			hoverPart: newHoverPart,
+			hoverElement: newHoverRenderedPart.hoverElement
+		};
 	}
 
-	public markdownHoverContentAtIndex(index: number): string {
-		const hoverRenderedPart = this._getRenderedHoverPartAtIndex(index);
-		return hoverRenderedPart?.renderedMarkdown.innerText ?? '';
-	}
-
-	public focusedMarkdownHoverIndex(): number {
-		return this._focusedHoverPartIndex;
+	public getAccessibleContent(hoverPart: MarkdownHover): string | undefined {
+		const renderedHoverPartIndex = this.renderedHoverParts.findIndex(renderedHoverPart => renderedHoverPart.hoverPart === hoverPart);
+		if (renderedHoverPartIndex === -1) {
+			return undefined;
+		}
+		const renderedHoverPart = this._getRenderedHoverPartAtIndex(renderedHoverPartIndex);
+		if (!renderedHoverPart) {
+			return undefined;
+		}
+		const hoverElementInnerText = renderedHoverPart.hoverElement.innerText;
+		const accessibleContent = hoverElementInnerText.replace(/[^\S\n\r]+/gu, ' ');
+		return accessibleContent;
 	}
 
 	public doesMarkdownHoverAtIndexSupportVerbosityAction(index: number, action: HoverVerbosityAction): boolean {
 		const hoverRenderedPart = this._getRenderedHoverPartAtIndex(index);
-		if (!hoverRenderedPart || !hoverRenderedPart.hoverSource?.supportsVerbosityAction(action)) {
+		const hoverSource = hoverRenderedPart?.hoverPart.source;
+		if (!hoverRenderedPart || !hoverSource?.supportsVerbosityAction(action)) {
 			return false;
 		}
 		return true;
@@ -404,76 +415,94 @@ class MarkdownRenderedHoverParts extends Disposable {
 		return hover;
 	}
 
-	private _replaceRenderedHoverPartAtIndex(index: number, renderedHoverPart: RenderedHoverPart): void {
-		if (index >= this._renderHoverParts.length || index < 0) {
+	private _replaceRenderedHoverPartAtIndex(index: number, renderedHoverPart: RenderedMarkdownHoverPart, hoverPart: MarkdownHover): void {
+		if (index >= this.renderedHoverParts.length || index < 0) {
 			return;
 		}
-		const currentRenderedHoverPart = this._renderedHoverParts[index];
-		const currentRenderedMarkdown = currentRenderedHoverPart.renderedMarkdown;
-		currentRenderedMarkdown.replaceWith(renderedHoverPart.renderedMarkdown);
-		currentRenderedHoverPart.disposables.dispose();
-		this._renderedHoverParts[index] = renderedHoverPart;
+		const currentRenderedHoverPart = this.renderedHoverParts[index];
+		const currentRenderedMarkdown = currentRenderedHoverPart.hoverElement;
+		const renderedMarkdown = renderedHoverPart.hoverElement;
+		const renderedChildrenElements = Array.from(renderedMarkdown.children);
+		currentRenderedMarkdown.replaceChildren(...renderedChildrenElements);
+		const newRenderedHoverPart = new RenderedMarkdownHoverPart(
+			hoverPart,
+			currentRenderedMarkdown,
+			renderedHoverPart.disposables
+		);
+		currentRenderedMarkdown.focus();
+		currentRenderedHoverPart.dispose();
+		this.renderedHoverParts[index] = newRenderedHoverPart;
 	}
 
 	private _focusOnHoverPartWithIndex(index: number): void {
-		this._renderedHoverParts[index].renderedMarkdown.focus();
+		this.renderedHoverParts[index].hoverElement.focus();
 	}
 
-	private _getRenderedHoverPartAtIndex(index: number): RenderedHoverPart | undefined {
-		return this._renderedHoverParts[index];
+	private _getRenderedHoverPartAtIndex(index: number): RenderedMarkdownHoverPart | undefined {
+		return this.renderedHoverParts[index];
+	}
+
+	public dispose(): void {
+		this._disposables.dispose();
 	}
 }
 
 export function renderMarkdownHovers(
 	context: IEditorHoverRenderContext,
-	hoverParts: MarkdownHover[],
+	markdownHovers: MarkdownHover[],
 	editor: ICodeEditor,
 	languageService: ILanguageService,
 	openerService: IOpenerService,
-): IDisposable {
+): IRenderedHoverParts<MarkdownHover> {
 
 	// Sort hover parts to keep them stable since they might come in async, out-of-order
-	hoverParts.sort(compareBy(hover => hover.ordinal, numberComparator));
-
-	const disposables = new DisposableStore();
-	for (const hoverPart of hoverParts) {
-		disposables.add(renderMarkdownInContainer(
+	markdownHovers.sort(compareBy(hover => hover.ordinal, numberComparator));
+	const renderedHoverParts: IRenderedHoverPart<MarkdownHover>[] = [];
+	for (const markdownHover of markdownHovers) {
+		renderedHoverParts.push(renderMarkdownInContainer(
 			editor,
-			context.fragment,
-			hoverPart.contents,
+			markdownHover,
 			languageService,
 			openerService,
 			context.onContentsChanged,
 		));
 	}
-	return disposables;
+	return new RenderedHoverParts(renderedHoverParts);
 }
 
 function renderMarkdownInContainer(
 	editor: ICodeEditor,
-	container: DocumentFragment | HTMLElement,
-	markdownStrings: IMarkdownString[],
+	markdownHover: MarkdownHover,
 	languageService: ILanguageService,
 	openerService: IOpenerService,
 	onFinishedRendering: () => void,
-): IDisposable {
-	const store = new DisposableStore();
-	for (const contents of markdownStrings) {
-		if (isEmptyMarkdownString(contents)) {
+): IRenderedHoverPart<MarkdownHover> {
+	const disposables = new DisposableStore();
+	const renderedMarkdown = $('div.hover-row');
+	const renderedMarkdownContents = $('div.hover-row-contents');
+	renderedMarkdown.appendChild(renderedMarkdownContents);
+	const markdownStrings = markdownHover.contents;
+	for (const markdownString of markdownStrings) {
+		if (isEmptyMarkdownString(markdownString)) {
 			continue;
 		}
 		const markdownHoverElement = $('div.markdown-hover');
 		const hoverContentsElement = dom.append(markdownHoverElement, $('div.hover-contents'));
-		const renderer = store.add(new MarkdownRenderer({ editor }, languageService, openerService));
-		store.add(renderer.onDidRenderAsync(() => {
+		const renderer = disposables.add(new MarkdownRenderer({ editor }, languageService, openerService));
+		disposables.add(renderer.onDidRenderAsync(() => {
 			hoverContentsElement.className = 'hover-contents code-hover-contents';
 			onFinishedRendering();
 		}));
-		const renderedContents = store.add(renderer.render(contents));
+		const renderedContents = disposables.add(renderer.render(markdownString));
 		hoverContentsElement.appendChild(renderedContents.element);
-		container.appendChild(markdownHoverElement);
+		renderedMarkdownContents.appendChild(markdownHoverElement);
 	}
-	return store;
+	const renderedHoverPart: IRenderedHoverPart<MarkdownHover> = {
+		hoverPart: markdownHover,
+		hoverElement: renderedMarkdown,
+		dispose() { disposables.dispose(); }
+	};
+	return renderedHoverPart;
 }
 
 export function labelForHoverVerbosityAction(keybindingService: IKeybindingService, action: HoverVerbosityAction): string {
diff --git a/src/vs/editor/contrib/hover/browser/markerHoverParticipant.ts b/src/vs/editor/contrib/hover/browser/markerHoverParticipant.ts
index 3ed0b3fab14..1a8c3709b1a 100644
--- a/src/vs/editor/contrib/hover/browser/markerHoverParticipant.ts
+++ b/src/vs/editor/contrib/hover/browser/markerHoverParticipant.ts
@@ -3,29 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { isNonEmptyArray } from 'vs/base/common/arrays';
-import { CancelablePromise, createCancelablePromise, disposableTimeout } from 'vs/base/common/async';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { basename } from 'vs/base/common/resources';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Range } from 'vs/editor/common/core/range';
-import { CodeActionTriggerType } from 'vs/editor/common/languages';
-import { IModelDecoration } from 'vs/editor/common/model';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { IMarkerDecorationsService } from 'vs/editor/common/services/markerDecorations';
-import { getCodeActions, quickFixCommandId } from 'vs/editor/contrib/codeAction/browser/codeAction';
-import { CodeActionController } from 'vs/editor/contrib/codeAction/browser/codeActionController';
-import { CodeActionKind, CodeActionSet, CodeActionTrigger, CodeActionTriggerSource } from 'vs/editor/contrib/codeAction/common/types';
-import { MarkerController, NextMarkerAction } from 'vs/editor/contrib/gotoError/browser/gotoError';
-import { HoverAnchor, HoverAnchorType, IEditorHoverParticipant, IEditorHoverRenderContext, IHoverPart } from 'vs/editor/contrib/hover/browser/hoverTypes';
-import * as nls from 'vs/nls';
-import { ITextEditorOptions } from 'vs/platform/editor/common/editor';
-import { IMarker, IMarkerData, MarkerSeverity } from 'vs/platform/markers/common/markers';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { Progress } from 'vs/platform/progress/common/progress';
+import * as dom from '../../../../base/browser/dom.js';
+import { isNonEmptyArray } from '../../../../base/common/arrays.js';
+import { CancelablePromise, createCancelablePromise, disposableTimeout } from '../../../../base/common/async.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { basename } from '../../../../base/common/resources.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { Range } from '../../../common/core/range.js';
+import { CodeActionTriggerType } from '../../../common/languages.js';
+import { IModelDecoration } from '../../../common/model.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { IMarkerDecorationsService } from '../../../common/services/markerDecorations.js';
+import { getCodeActions, quickFixCommandId } from '../../codeAction/browser/codeAction.js';
+import { CodeActionController } from '../../codeAction/browser/codeActionController.js';
+import { CodeActionKind, CodeActionSet, CodeActionTrigger, CodeActionTriggerSource } from '../../codeAction/common/types.js';
+import { MarkerController, NextMarkerAction } from '../../gotoError/browser/gotoError.js';
+import { HoverAnchor, HoverAnchorType, IEditorHoverParticipant, IEditorHoverRenderContext, IHoverPart, IRenderedHoverPart, IRenderedHoverParts, RenderedHoverParts } from './hoverTypes.js';
+import * as nls from '../../../../nls.js';
+import { ITextEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { IMarker, IMarkerData, MarkerSeverity } from '../../../../platform/markers/common/markers.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { Progress } from '../../../../platform/progress/common/progress.js';
 
 const $ = dom.$;
 
@@ -90,20 +90,29 @@ export class MarkerHoverParticipant implements IEditorHoverParticipant<MarkerHov
 		return result;
 	}
 
-	public renderHoverParts(context: IEditorHoverRenderContext, hoverParts: MarkerHover[]): IDisposable {
+	public renderHoverParts(context: IEditorHoverRenderContext, hoverParts: MarkerHover[]): IRenderedHoverParts<MarkerHover> {
 		if (!hoverParts.length) {
-			return Disposable.None;
+			return new RenderedHoverParts([]);
 		}
 		const disposables = new DisposableStore();
-		hoverParts.forEach(msg => context.fragment.appendChild(this.renderMarkerHover(msg, disposables)));
+		const renderedHoverParts: IRenderedHoverPart<MarkerHover>[] = [];
+		hoverParts.forEach(hoverPart => {
+			const renderedMarkerHover = this._renderMarkerHover(hoverPart);
+			context.fragment.appendChild(renderedMarkerHover.hoverElement);
+			renderedHoverParts.push(renderedMarkerHover);
+		});
 		const markerHoverForStatusbar = hoverParts.length === 1 ? hoverParts[0] : hoverParts.sort((a, b) => MarkerSeverity.compare(a.marker.severity, b.marker.severity))[0];
 		this.renderMarkerStatusbar(context, markerHoverForStatusbar, disposables);
-		return disposables;
+		return new RenderedHoverParts(renderedHoverParts);
 	}
 
-	private renderMarkerHover(markerHover: MarkerHover, disposables: DisposableStore): HTMLElement {
+	public getAccessibleContent(hoverPart: MarkerHover): string {
+		return hoverPart.marker.message;
+	}
+
+	private _renderMarkerHover(markerHover: MarkerHover): IRenderedHoverPart<MarkerHover> {
+		const disposables: DisposableStore = new DisposableStore();
 		const hoverElement = $('div.hover-row');
-		hoverElement.tabIndex = 0;
 		const markerElement = dom.append(hoverElement, $('div.marker.hover-contents'));
 		const { source, message, code, relatedInformation } = markerHover.marker;
 
@@ -121,7 +130,7 @@ export class MarkerHoverParticipant implements IEditorHoverParticipant<MarkerHov
 					sourceElement.innerText = source;
 				}
 				const codeLink = dom.append(sourceAndCodeElement, $('a.code-link'));
-				codeLink.setAttribute('href', code.target.toString());
+				codeLink.setAttribute('href', code.target.toString(true));
 
 				disposables.add(dom.addDisposableListener(codeLink, 'click', (e) => {
 					this._openerService.open(code.target, { allowCommands: true });
@@ -154,9 +163,10 @@ export class MarkerHoverParticipant implements IEditorHoverParticipant<MarkerHov
 					e.stopPropagation();
 					e.preventDefault();
 					if (this._openerService) {
+						const editorOptions: ITextEditorOptions = { selection: { startLineNumber, startColumn } };
 						this._openerService.open(resource, {
 							fromUserGesture: true,
-							editorOptions: <ITextEditorOptions>{ selection: { startLineNumber, startColumn } }
+							editorOptions
 						}).catch(onUnexpectedError);
 					}
 				}));
@@ -166,7 +176,12 @@ export class MarkerHoverParticipant implements IEditorHoverParticipant<MarkerHov
 			}
 		}
 
-		return hoverElement;
+		const renderedHoverPart: IRenderedHoverPart<MarkerHover> = {
+			hoverPart: markerHover,
+			hoverElement,
+			dispose: () => disposables.dispose()
+		};
+		return renderedHoverPart;
 	}
 
 	private renderMarkerStatusbar(context: IEditorHoverRenderContext, markerHover: MarkerHover, disposables: DisposableStore): void {
diff --git a/src/vs/editor/contrib/hover/browser/resizableContentWidget.ts b/src/vs/editor/contrib/hover/browser/resizableContentWidget.ts
index 72736b8ab6e..7ff606a1e15 100644
--- a/src/vs/editor/contrib/hover/browser/resizableContentWidget.ts
+++ b/src/vs/editor/contrib/hover/browser/resizableContentWidget.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ResizableHTMLElement } from 'vs/base/browser/ui/resizable/resizable';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from 'vs/editor/browser/editorBrowser';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import * as dom from 'vs/base/browser/dom';
+import { ResizableHTMLElement } from '../../../../base/browser/ui/resizable/resizable.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from '../../../browser/editorBrowser.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { IPosition, Position } from '../../../common/core/position.js';
+import * as dom from '../../../../base/browser/dom.js';
 
 const TOP_HEIGHT = 30;
 const BOTTOM_HEIGHT = 24;
diff --git a/src/vs/editor/contrib/hover/test/browser/contentHover.test.ts b/src/vs/editor/contrib/hover/test/browser/contentHover.test.ts
index 65762f5905b..65337368f9c 100644
--- a/src/vs/editor/contrib/hover/test/browser/contentHover.test.ts
+++ b/src/vs/editor/contrib/hover/test/browser/contentHover.test.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { RenderedContentHover } from 'vs/editor/contrib/hover/browser/contentHoverRendered';
-import { IHoverPart } from 'vs/editor/contrib/hover/browser/hoverTypes';
-import { TestCodeEditorInstantiationOptions, withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Position } from '../../../../common/core/position.js';
+import { Range } from '../../../../common/core/range.js';
+import { RenderedContentHover } from '../../browser/contentHoverRendered.js';
+import { IHoverPart } from '../../browser/hoverTypes.js';
+import { TestCodeEditorInstantiationOptions, withTestCodeEditor } from '../../../../test/browser/testCodeEditor.js';
 
 suite('Content Hover', () => {
 
diff --git a/src/vs/editor/contrib/inPlaceReplace/browser/inPlaceReplace.ts b/src/vs/editor/contrib/inPlaceReplace/browser/inPlaceReplace.ts
index 6b207f2785a..248747f56a7 100644
--- a/src/vs/editor/contrib/inPlaceReplace/browser/inPlaceReplace.ts
+++ b/src/vs/editor/contrib/inPlaceReplace/browser/inPlaceReplace.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancelablePromise, createCancelablePromise, timeout } from 'vs/base/common/async';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { CodeEditorStateFlag, EditorState } from 'vs/editor/contrib/editorState/browser/editorState';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, EditorContributionInstantiation, registerEditorAction, registerEditorContribution, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { IEditorContribution, IEditorDecorationsCollection } from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { IInplaceReplaceSupportResult } from 'vs/editor/common/languages';
-import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import * as nls from 'vs/nls';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { InPlaceReplaceCommand } from './inPlaceReplaceCommand';
-import 'vs/css!./inPlaceReplace';
+import { CancelablePromise, createCancelablePromise, timeout } from '../../../../base/common/async.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { CodeEditorStateFlag, EditorState } from '../../editorState/browser/editorState.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorAction, EditorContributionInstantiation, registerEditorAction, registerEditorContribution, ServicesAccessor } from '../../../browser/editorExtensions.js';
+import { Range } from '../../../common/core/range.js';
+import { Selection } from '../../../common/core/selection.js';
+import { IEditorContribution, IEditorDecorationsCollection } from '../../../common/editorCommon.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { ModelDecorationOptions } from '../../../common/model/textModel.js';
+import { IInplaceReplaceSupportResult } from '../../../common/languages.js';
+import { IEditorWorkerService } from '../../../common/services/editorWorker.js';
+import * as nls from '../../../../nls.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { InPlaceReplaceCommand } from './inPlaceReplaceCommand.js';
+import './inPlaceReplace.css';
 
 class InPlaceReplaceController implements IEditorContribution {
 
diff --git a/src/vs/editor/contrib/inPlaceReplace/browser/inPlaceReplaceCommand.ts b/src/vs/editor/contrib/inPlaceReplace/browser/inPlaceReplaceCommand.ts
index 83c220946fc..4bd38f64ef4 100644
--- a/src/vs/editor/contrib/inPlaceReplace/browser/inPlaceReplaceCommand.ts
+++ b/src/vs/editor/contrib/inPlaceReplace/browser/inPlaceReplaceCommand.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ICommand, ICursorStateComputerData, IEditOperationBuilder } from 'vs/editor/common/editorCommon';
-import { ITextModel } from 'vs/editor/common/model';
+import { Range } from '../../../common/core/range.js';
+import { Selection } from '../../../common/core/selection.js';
+import { ICommand, ICursorStateComputerData, IEditOperationBuilder } from '../../../common/editorCommon.js';
+import { ITextModel } from '../../../common/model.js';
 
 export class InPlaceReplaceCommand implements ICommand {
 
diff --git a/src/vs/editor/contrib/indentation/browser/indentation.ts b/src/vs/editor/contrib/indentation/browser/indentation.ts
index 84760fdb6f4..2773edebf9b 100644
--- a/src/vs/editor/contrib/indentation/browser/indentation.ts
+++ b/src/vs/editor/contrib/indentation/browser/indentation.ts
@@ -3,30 +3,30 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import * as strings from 'vs/base/common/strings';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, EditorContributionInstantiation, IActionOptions, registerEditorAction, registerEditorContribution, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { ShiftCommand } from 'vs/editor/common/commands/shiftCommand';
-import { EditorAutoIndentStrategy, EditorOption } from 'vs/editor/common/config/editorOptions';
-import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ICommand, ICursorStateComputerData, IEditOperationBuilder, IEditorContribution } from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { EndOfLineSequence, ITextModel } from 'vs/editor/common/model';
-import { TextEdit } from 'vs/editor/common/languages';
-import { StandardTokenType } from 'vs/editor/common/encodedTokenAttributes';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { IndentConsts } from 'vs/editor/common/languages/supports/indentRules';
-import { IModelService } from 'vs/editor/common/services/model';
-import * as indentUtils from 'vs/editor/contrib/indentation/common/indentUtils';
-import * as nls from 'vs/nls';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { getGoodIndentForLine, getIndentMetadata } from 'vs/editor/common/languages/autoIndent';
-import { getReindentEditOperations } from '../common/indentation';
-import { getStandardTokenTypeAtPosition } from 'vs/editor/common/tokens/lineTokens';
-import { Position } from 'vs/editor/common/core/position';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import * as strings from '../../../../base/common/strings.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorAction, EditorContributionInstantiation, IActionOptions, registerEditorAction, registerEditorContribution, ServicesAccessor } from '../../../browser/editorExtensions.js';
+import { ShiftCommand } from '../../../common/commands/shiftCommand.js';
+import { EditorAutoIndentStrategy, EditorOption } from '../../../common/config/editorOptions.js';
+import { ISingleEditOperation } from '../../../common/core/editOperation.js';
+import { IRange, Range } from '../../../common/core/range.js';
+import { Selection } from '../../../common/core/selection.js';
+import { ICommand, ICursorStateComputerData, IEditOperationBuilder, IEditorContribution } from '../../../common/editorCommon.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { EndOfLineSequence, ITextModel } from '../../../common/model.js';
+import { TextEdit } from '../../../common/languages.js';
+import { StandardTokenType } from '../../../common/encodedTokenAttributes.js';
+import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import { IndentConsts } from '../../../common/languages/supports/indentRules.js';
+import { IModelService } from '../../../common/services/model.js';
+import * as indentUtils from '../common/indentUtils.js';
+import * as nls from '../../../../nls.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { getGoodIndentForLine, getIndentMetadata } from '../../../common/languages/autoIndent.js';
+import { getReindentEditOperations } from '../common/indentation.js';
+import { getStandardTokenTypeAtPosition } from '../../../common/tokens/lineTokens.js';
+import { Position } from '../../../common/core/position.js';
 
 export class IndentationToSpacesAction extends EditorAction {
 	public static readonly ID = 'editor.action.indentationToSpaces';
diff --git a/src/vs/editor/contrib/indentation/common/indentation.ts b/src/vs/editor/contrib/indentation/common/indentation.ts
index 599d8012e0f..f1046f84728 100644
--- a/src/vs/editor/contrib/indentation/common/indentation.ts
+++ b/src/vs/editor/contrib/indentation/common/indentation.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as strings from 'vs/base/common/strings';
-import { ShiftCommand } from 'vs/editor/common/commands/shiftCommand';
-import { EditOperation, ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { normalizeIndentation } from 'vs/editor/common/core/indentation';
-import { Selection } from 'vs/editor/common/core/selection';
-import { StandardTokenType } from 'vs/editor/common/encodedTokenAttributes';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { ProcessedIndentRulesSupport } from 'vs/editor/common/languages/supports/indentationLineProcessor';
-import { ITextModel } from 'vs/editor/common/model';
+import * as strings from '../../../../base/common/strings.js';
+import { ShiftCommand } from '../../../common/commands/shiftCommand.js';
+import { EditOperation, ISingleEditOperation } from '../../../common/core/editOperation.js';
+import { normalizeIndentation } from '../../../common/core/indentation.js';
+import { Selection } from '../../../common/core/selection.js';
+import { StandardTokenType } from '../../../common/encodedTokenAttributes.js';
+import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import { ProcessedIndentRulesSupport } from '../../../common/languages/supports/indentationLineProcessor.js';
+import { ITextModel } from '../../../common/model.js';
 
 export function getReindentEditOperations(model: ITextModel, languageConfigurationService: ILanguageConfigurationService, startLineNumber: number, endLineNumber: number): ISingleEditOperation[] {
 	if (model.getLineCount() === 1 && model.getLineMaxColumn(1) === 1) {
diff --git a/src/vs/editor/contrib/indentation/test/browser/indentation.test.ts b/src/vs/editor/contrib/indentation/test/browser/indentation.test.ts
index 4bf73105994..b4019cbea94 100644
--- a/src/vs/editor/contrib/indentation/test/browser/indentation.test.ts
+++ b/src/vs/editor/contrib/indentation/test/browser/indentation.test.ts
@@ -4,25 +4,28 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { MetadataConsts, StandardTokenType } from 'vs/editor/common/encodedTokenAttributes';
-import { EncodedTokenizationResult, IState, ITokenizationSupport, TokenizationRegistry } from 'vs/editor/common/languages';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { NullState } from 'vs/editor/common/languages/nullTokenize';
-import { AutoIndentOnPaste, IndentationToSpacesCommand, IndentationToTabsCommand } from 'vs/editor/contrib/indentation/browser/indentation';
-import { withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
-import { testCommand } from 'vs/editor/test/browser/testCommand';
-import { goIndentationRules, htmlIndentationRules, javascriptIndentationRules, latexIndentationRules, luaIndentationRules, phpIndentationRules, rubyIndentationRules } from 'vs/editor/test/common/modes/supports/indentationRules';
-import { cppOnEnterRules, htmlOnEnterRules, javascriptOnEnterRules, phpOnEnterRules } from 'vs/editor/test/common/modes/supports/onEnterRules';
-import { TypeOperations } from 'vs/editor/common/cursor/cursorTypeOperations';
-import { cppBracketRules, goBracketRules, htmlBracketRules, latexBracketRules, luaBracketRules, phpBracketRules, rubyBracketRules, typescriptBracketRules, vbBracketRules } from 'vs/editor/test/common/modes/supports/bracketRules';
-import { latexAutoClosingPairsRules } from 'vs/editor/test/common/modes/supports/autoClosingPairsRules';
+import { DisposableStore, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { ILanguageConfigurationService } from '../../../../common/languages/languageConfigurationRegistry.js';
+import { createTextModel } from '../../../../test/common/testTextModel.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { Range } from '../../../../common/core/range.js';
+import { Selection } from '../../../../common/core/selection.js';
+import { MetadataConsts, StandardTokenType } from '../../../../common/encodedTokenAttributes.js';
+import { EncodedTokenizationResult, IState, ITokenizationSupport, TokenizationRegistry } from '../../../../common/languages.js';
+import { ILanguageService } from '../../../../common/languages/language.js';
+import { NullState } from '../../../../common/languages/nullTokenize.js';
+import { AutoIndentOnPaste, IndentationToSpacesCommand, IndentationToTabsCommand } from '../../browser/indentation.js';
+import { withTestCodeEditor } from '../../../../test/browser/testCodeEditor.js';
+import { testCommand } from '../../../../test/browser/testCommand.js';
+import { goIndentationRules, htmlIndentationRules, javascriptIndentationRules, latexIndentationRules, luaIndentationRules, phpIndentationRules, rubyIndentationRules } from '../../../../test/common/modes/supports/indentationRules.js';
+import { cppOnEnterRules, htmlOnEnterRules, javascriptOnEnterRules, phpOnEnterRules } from '../../../../test/common/modes/supports/onEnterRules.js';
+import { TypeOperations } from '../../../../common/cursor/cursorTypeOperations.js';
+import { cppBracketRules, goBracketRules, htmlBracketRules, latexBracketRules, luaBracketRules, phpBracketRules, rubyBracketRules, typescriptBracketRules, vbBracketRules } from '../../../../test/common/modes/supports/bracketRules.js';
+import { javascriptAutoClosingPairsRules, latexAutoClosingPairsRules } from '../../../../test/common/modes/supports/autoClosingPairsRules.js';
+import { LanguageService } from '../../../../common/services/languageService.js';
+import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
+import { TestLanguageConfigurationService } from '../../../../test/common/modes/testLanguageConfigurationService.js';
 
 export enum Language {
 	TypeScript = 'ts-test',
@@ -44,16 +47,11 @@ function testIndentationToTabsCommand(lines: string[], selection: Selection, tab
 	testCommand(lines, null, selection, (accessor, sel) => new IndentationToTabsCommand(sel, tabSize), expectedLines, expectedSelection);
 }
 
-export function registerLanguage(instantiationService: TestInstantiationService, language: Language): IDisposable {
-	const disposables = new DisposableStore();
-	const languageService = instantiationService.get(ILanguageService);
-	disposables.add(registerLanguageConfiguration(instantiationService, language));
-	disposables.add(languageService.registerLanguage({ id: language }));
-	return disposables;
+export function registerLanguage(languageService: ILanguageService, language: Language): IDisposable {
+	return languageService.registerLanguage({ id: language });
 }
 
-export function registerLanguageConfiguration(instantiationService: TestInstantiationService, language: Language): IDisposable {
-	const languageConfigurationService = instantiationService.get(ILanguageConfigurationService);
+export function registerLanguageConfiguration(languageConfigurationService: ILanguageConfigurationService, language: Language): IDisposable {
 	switch (language) {
 		case Language.TypeScript:
 			return languageConfigurationService.register(language, {
@@ -62,6 +60,7 @@ export function registerLanguageConfiguration(instantiationService: TestInstanti
 					lineComment: '//',
 					blockComment: ['/*', '*/']
 				},
+				autoClosingPairs: javascriptAutoClosingPairsRules,
 				indentationRules: javascriptIndentationRules,
 				onEnterRules: javascriptOnEnterRules
 			});
@@ -317,9 +316,20 @@ suite('Indent With Tab - TypeScript/JavaScript', () => {
 
 	const languageId = Language.TypeScript;
 	let disposables: DisposableStore;
+	let serviceCollection: ServiceCollection;
 
 	setup(() => {
 		disposables = new DisposableStore();
+		const languageService = new LanguageService();
+		const languageConfigurationService = new TestLanguageConfigurationService();
+		disposables.add(languageService);
+		disposables.add(languageConfigurationService);
+		disposables.add(registerLanguage(languageService, languageId));
+		disposables.add(registerLanguageConfiguration(languageConfigurationService, languageId));
+		serviceCollection = new ServiceCollection(
+			[ILanguageService, languageService],
+			[ILanguageConfigurationService, languageConfigurationService]
+		);
 	});
 
 	teardown(() => {
@@ -343,9 +353,7 @@ suite('Indent With Tab - TypeScript/JavaScript', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
-
-			disposables.add(registerLanguage(instantiationService, languageId));
+		withTestCodeEditor(model, { autoIndent: "full", serviceCollection }, (editor, viewModel, instantiationService) => {
 			editor.setSelection(new Selection(1, 1, 3, 5));
 			editor.executeCommands('editor.action.indentLines', TypeOperations.indent(viewModel.cursorConfig, editor.getModel(), editor.getSelections()));
 			assert.strictEqual(model.getValue(), [
@@ -369,9 +377,7 @@ suite('Indent With Tab - TypeScript/JavaScript', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
-
-			disposables.add(registerLanguage(instantiationService, languageId));
+		withTestCodeEditor(model, { autoIndent: "full", serviceCollection }, (editor, viewModel, instantiationService) => {
 			editor.setSelection(new Selection(1, 1, 5, 2));
 			editor.executeCommands('editor.action.indentLines', TypeOperations.indent(viewModel.cursorConfig, editor.getModel(), editor.getSelections()));
 			assert.strictEqual(model.getValue(), [
@@ -389,9 +395,20 @@ suite('Auto Indent On Paste - TypeScript/JavaScript', () => {
 
 	const languageId = Language.TypeScript;
 	let disposables: DisposableStore;
+	let serviceCollection: ServiceCollection;
 
 	setup(() => {
 		disposables = new DisposableStore();
+		const languageService = new LanguageService();
+		const languageConfigurationService = new TestLanguageConfigurationService();
+		disposables.add(languageService);
+		disposables.add(languageConfigurationService);
+		disposables.add(registerLanguage(languageService, languageId));
+		disposables.add(registerLanguageConfiguration(languageConfigurationService, languageId));
+		serviceCollection = new ServiceCollection(
+			[ILanguageService, languageService],
+			[ILanguageConfigurationService, languageConfigurationService]
+		);
 	});
 
 	teardown(() => {
@@ -405,7 +422,7 @@ suite('Auto Indent On Paste - TypeScript/JavaScript', () => {
 		const model = createTextModel("", languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: 'full' }, (editor, viewModel, instantiationService) => {
+		withTestCodeEditor(model, { autoIndent: 'full', serviceCollection }, (editor, viewModel, instantiationService) => {
 			const pasteText = [
 				'/**',
 				' * JSDoc',
@@ -439,7 +456,6 @@ suite('Auto Indent On Paste - TypeScript/JavaScript', () => {
 					{ startIndex: 15, standardTokenType: StandardTokenType.Other },
 				]
 			];
-			disposables.add(registerLanguage(instantiationService, languageId));
 			disposables.add(registerTokenizationSupport(instantiationService, tokens, languageId));
 			const autoIndentOnPasteController = editor.registerAndInstantiateContribution(AutoIndentOnPaste.ID, AutoIndentOnPaste);
 			viewModel.paste(pasteText, true, undefined, 'keyboard');
@@ -453,7 +469,7 @@ suite('Auto Indent On Paste - TypeScript/JavaScript', () => {
 		const model = createTextModel("", languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: 'full' }, (editor, viewModel, instantiationService) => {
+		withTestCodeEditor(model, { autoIndent: 'full', serviceCollection }, (editor, viewModel, instantiationService) => {
 
 			// no need for tokenization because there are no comments
 			const pasteText = [
@@ -470,7 +486,6 @@ suite('Auto Indent On Paste - TypeScript/JavaScript', () => {
 				'}'
 			].join('\n');
 
-			disposables.add(registerLanguage(instantiationService, languageId));
 			const autoIndentOnPasteController = editor.registerAndInstantiateContribution(AutoIndentOnPaste.ID, AutoIndentOnPaste);
 			viewModel.paste(pasteText, true, undefined, 'keyboard');
 			autoIndentOnPasteController.trigger(new Range(1, 1, 11, 2));
@@ -488,8 +503,7 @@ suite('Auto Indent On Paste - TypeScript/JavaScript', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: 'full' }, (editor, viewModel, instantiationService) => {
-			disposables.add(registerLanguage(instantiationService, languageId));
+		withTestCodeEditor(model, { autoIndent: 'full', serviceCollection }, (editor, viewModel, instantiationService) => {
 			editor.setSelection(new Selection(2, 6, 2, 6));
 			const text = ', null';
 			viewModel.paste(text, true, undefined, 'keyboard');
@@ -516,8 +530,7 @@ suite('Auto Indent On Paste - TypeScript/JavaScript', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: 'full' }, (editor, viewModel, instantiationService) => {
-			disposables.add(registerLanguage(instantiationService, languageId));
+		withTestCodeEditor(model, { autoIndent: 'full', serviceCollection }, (editor, viewModel, instantiationService) => {
 			editor.setSelection(new Selection(5, 24, 5, 34));
 			const text = 'IMacLinuxKeyMapping';
 			viewModel.paste(text, true, undefined, 'keyboard');
@@ -541,8 +554,7 @@ suite('Auto Indent On Paste - TypeScript/JavaScript', () => {
 		const model = createTextModel('', languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: 'full' }, (editor, viewModel, instantiationService) => {
-			disposables.add(registerLanguage(instantiationService, languageId));
+		withTestCodeEditor(model, { autoIndent: 'full', serviceCollection }, (editor, viewModel, instantiationService) => {
 			const text = [
 				'/*----------------',
 				' *  Copyright (c) ',
@@ -569,7 +581,7 @@ suite('Auto Indent On Paste - TypeScript/JavaScript', () => {
 		const model = createTextModel(initialText, languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: 'full' }, (editor, viewModel, instantiationService) => {
+		withTestCodeEditor(model, { autoIndent: 'full', serviceCollection }, (editor, viewModel, instantiationService) => {
 			const tokens: StandardTokenTypeData[][] = [
 				[
 					{ startIndex: 0, standardTokenType: StandardTokenType.Other },
@@ -582,7 +594,6 @@ suite('Auto Indent On Paste - TypeScript/JavaScript', () => {
 					{ startIndex: 0, standardTokenType: StandardTokenType.String },
 				]
 			];
-			disposables.add(registerLanguage(instantiationService, languageId));
 			disposables.add(registerTokenizationSupport(instantiationService, tokens, languageId));
 
 			editor.setSelection(new Selection(2, 10, 2, 15));
@@ -602,7 +613,7 @@ suite('Auto Indent On Paste - TypeScript/JavaScript', () => {
 		const model = createTextModel("", languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: 'full' }, (editor, viewModel, instantiationService) => {
+		withTestCodeEditor(model, { autoIndent: 'full', serviceCollection }, (editor, viewModel, instantiationService) => {
 			const text = [
 				'/**',
 				' * @typedef {',
@@ -634,7 +645,6 @@ suite('Auto Indent On Paste - TypeScript/JavaScript', () => {
 					{ startIndex: 3, standardTokenType: StandardTokenType.Other },
 				]
 			];
-			disposables.add(registerLanguage(instantiationService, languageId));
 			disposables.add(registerTokenizationSupport(instantiationService, tokens, languageId));
 			const autoIndentOnPasteController = editor.registerAndInstantiateContribution(AutoIndentOnPaste.ID, AutoIndentOnPaste);
 			viewModel.paste(text, true, undefined, 'keyboard');
@@ -654,7 +664,7 @@ suite('Auto Indent On Paste - TypeScript/JavaScript', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: 'full' }, (editor, viewModel, instantiationService) => {
+		withTestCodeEditor(model, { autoIndent: 'full', serviceCollection }, (editor, viewModel, instantiationService) => {
 			editor.setSelection(new Selection(2, 1, 2, 1));
 			const text = [
 				'() => {',
@@ -662,7 +672,6 @@ suite('Auto Indent On Paste - TypeScript/JavaScript', () => {
 				'}',
 				''
 			].join('\n');
-			disposables.add(registerLanguage(instantiationService, languageId));
 			const autoIndentOnPasteController = editor.registerAndInstantiateContribution(AutoIndentOnPaste.ID, AutoIndentOnPaste);
 			viewModel.paste(text, true, undefined, 'keyboard');
 			autoIndentOnPasteController.trigger(new Range(2, 1, 5, 1));
@@ -696,7 +705,7 @@ suite('Auto Indent On Paste - TypeScript/JavaScript', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: 'full' }, (editor, viewModel, instantiationService) => {
+		withTestCodeEditor(model, { autoIndent: 'full', serviceCollection }, (editor, viewModel, instantiationService) => {
 			editor.setSelection(new Selection(2, 5, 2, 5));
 			const text = [
 				'() => {',
@@ -704,7 +713,6 @@ suite('Auto Indent On Paste - TypeScript/JavaScript', () => {
 				'}',
 				' '
 			].join('\n');
-			disposables.add(registerLanguage(instantiationService, languageId));
 			const autoIndentOnPasteController = editor.registerAndInstantiateContribution(AutoIndentOnPaste.ID, AutoIndentOnPaste);
 			viewModel.paste(text, true, undefined, 'keyboard');
 			// todo@aiday-mar, make sure range is correct, and make test work as in real life
@@ -727,7 +735,7 @@ suite('Auto Indent On Paste - TypeScript/JavaScript', () => {
 		const model = createTextModel('', languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: 'full' }, (editor, viewModel, instantiationService) => {
+		withTestCodeEditor(model, { autoIndent: 'full', serviceCollection }, (editor, viewModel, instantiationService) => {
 			editor.setSelection(new Selection(2, 5, 2, 5));
 			const text = [
 				'function makeSub(a,b) {',
@@ -735,7 +743,6 @@ suite('Auto Indent On Paste - TypeScript/JavaScript', () => {
 				'return subsent;',
 				'}',
 			].join('\n');
-			disposables.add(registerLanguage(instantiationService, languageId));
 			const autoIndentOnPasteController = editor.registerAndInstantiateContribution(AutoIndentOnPaste.ID, AutoIndentOnPaste);
 			viewModel.paste(text, true, undefined, 'keyboard');
 			// todo@aiday-mar, make sure range is correct, and make test work as in real life
@@ -760,7 +767,7 @@ suite('Auto Indent On Paste - TypeScript/JavaScript', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: 'full' }, (editor, viewModel, instantiationService) => {
+		withTestCodeEditor(model, { autoIndent: 'full', serviceCollection }, (editor, viewModel, instantiationService) => {
 			const tokens: StandardTokenTypeData[][] = [
 				[
 					{ startIndex: 0, standardTokenType: StandardTokenType.Other },
@@ -791,7 +798,6 @@ suite('Auto Indent On Paste - TypeScript/JavaScript', () => {
 					{ startIndex: 0, standardTokenType: StandardTokenType.Other },
 					{ startIndex: 1, standardTokenType: StandardTokenType.Other }]
 			];
-			disposables.add(registerLanguage(instantiationService, languageId));
 			disposables.add(registerTokenizationSupport(instantiationService, tokens, languageId));
 
 			editor.setSelection(new Selection(2, 1, 2, 1));
@@ -799,7 +805,6 @@ suite('Auto Indent On Paste - TypeScript/JavaScript', () => {
 				'// comment',
 				'const foo = 42',
 			].join('\n');
-			disposables.add(registerLanguage(instantiationService, languageId));
 			const autoIndentOnPasteController = editor.registerAndInstantiateContribution(AutoIndentOnPaste.ID, AutoIndentOnPaste);
 			viewModel.paste(text, true, undefined, 'keyboard');
 			autoIndentOnPasteController.trigger(new Range(2, 1, 3, 15));
@@ -817,9 +822,20 @@ suite('Auto Indent On Type - TypeScript/JavaScript', () => {
 
 	const languageId = Language.TypeScript;
 	let disposables: DisposableStore;
+	let serviceCollection: ServiceCollection;
 
 	setup(() => {
 		disposables = new DisposableStore();
+		const languageService = new LanguageService();
+		const languageConfigurationService = new TestLanguageConfigurationService();
+		disposables.add(languageService);
+		disposables.add(languageConfigurationService);
+		disposables.add(registerLanguage(languageService, languageId));
+		disposables.add(registerLanguageConfiguration(languageConfigurationService, languageId));
+		serviceCollection = new ServiceCollection(
+			[ILanguageService, languageService],
+			[ILanguageConfigurationService, languageConfigurationService]
+		);
 	});
 
 	teardown(() => {
@@ -837,8 +853,7 @@ suite('Auto Indent On Type - TypeScript/JavaScript', () => {
 		const model = createTextModel("", languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
-			disposables.add(registerLanguage(instantiationService, languageId));
+		withTestCodeEditor(model, { autoIndent: "full", serviceCollection }, (editor, viewModel) => {
 			viewModel.type('const add1 = (n) =>');
 			viewModel.type("\n", 'keyboard');
 			assert.strictEqual(model.getValue(), [
@@ -859,8 +874,7 @@ suite('Auto Indent On Type - TypeScript/JavaScript', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
-			disposables.add(registerLanguage(instantiationService, languageId));
+		withTestCodeEditor(model, { autoIndent: "full", serviceCollection }, (editor, viewModel) => {
 			editor.setSelection(new Selection(3, 9, 3, 9));
 			viewModel.type("\n", 'keyboard');
 			assert.strictEqual(model.getValue(), [
@@ -879,10 +893,7 @@ suite('Auto Indent On Type - TypeScript/JavaScript', () => {
 		const model = createTextModel("", languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
-
-			disposables.add(registerLanguage(instantiationService, languageId));
-
+		withTestCodeEditor(model, { autoIndent: "full", serviceCollection }, (editor, viewModel) => {
 			viewModel.type([
 				'const add1 = (n) =>',
 				'    n + 1;',
@@ -908,9 +919,7 @@ suite('Auto Indent On Type - TypeScript/JavaScript', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
-
-			disposables.add(registerLanguage(instantiationService, languageId));
+		withTestCodeEditor(model, { autoIndent: "full", serviceCollection }, (editor, viewModel) => {
 			editor.setSelection(new Selection(3, 1, 3, 1));
 			viewModel.type('\n', 'keyboard');
 			assert.strictEqual(model.getValue(), [
@@ -939,8 +948,7 @@ suite('Auto Indent On Type - TypeScript/JavaScript', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: 'advanced' }, (editor, viewModel, instantiationService) => {
-			disposables.add(registerLanguage(instantiationService, languageId));
+		withTestCodeEditor(model, { autoIndent: 'advanced', serviceCollection }, (editor, viewModel) => {
 			editor.setSelection(new Selection(7, 6, 7, 6));
 			viewModel.type('\n', 'keyboard');
 			assert.strictEqual(model.getValue(),
@@ -970,8 +978,7 @@ suite('Auto Indent On Type - TypeScript/JavaScript', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: 'advanced' }, (editor, viewModel, instantiationService) => {
-			disposables.add(registerLanguage(instantiationService, languageId));
+		withTestCodeEditor(model, { autoIndent: 'advanced', serviceCollection }, (editor, viewModel) => {
 			editor.setSelection(new Selection(1, 4, 1, 4));
 			viewModel.type('\n', 'keyboard');
 			assert.strictEqual(model.getValue(),
@@ -996,8 +1003,7 @@ suite('Auto Indent On Type - TypeScript/JavaScript', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
-			disposables.add(registerLanguage(instantiationService, languageId));
+		withTestCodeEditor(model, { autoIndent: "full", serviceCollection }, (editor, viewModel) => {
 			editor.setSelection(new Selection(2, 12, 2, 12));
 			viewModel.type("\n", 'keyboard');
 			assert.strictEqual(model.getValue(), [
@@ -1020,9 +1026,7 @@ suite('Auto Indent On Type - TypeScript/JavaScript', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
-
-			disposables.add(registerLanguage(instantiationService, languageId));
+		withTestCodeEditor(model, { autoIndent: "full", serviceCollection }, (editor, viewModel) => {
 			editor.setSelection(new Selection(2, 19, 2, 19));
 			viewModel.type("\n", 'keyboard');
 			assert.strictEqual(model.getValue(), [
@@ -1055,9 +1059,7 @@ suite('Auto Indent On Type - TypeScript/JavaScript', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
-
-			disposables.add(registerLanguage(instantiationService, languageId));
+		withTestCodeEditor(model, { autoIndent: "full", serviceCollection }, (editor, viewModel, instantiationService) => {
 			const tokens: StandardTokenTypeData[][] = [
 				[{ startIndex: 0, standardTokenType: StandardTokenType.Comment }],
 				[{ startIndex: 0, standardTokenType: StandardTokenType.Comment }],
@@ -1075,6 +1077,38 @@ suite('Auto Indent On Type - TypeScript/JavaScript', () => {
 		});
 	});
 
+	test('issue #209802: allman style braces in JavaScript', () => {
+
+		// https://github.com/microsoft/vscode/issues/209802
+
+		const model = createTextModel([
+			'if (/*condition*/)',
+		].join('\n'), languageId, {});
+		disposables.add(model);
+
+		withTestCodeEditor(model, { autoIndent: "full", serviceCollection }, (editor, viewModel) => {
+			editor.setSelection(new Selection(1, 19, 1, 19));
+			viewModel.type("\n", 'keyboard');
+			assert.strictEqual(model.getValue(), [
+				'if (/*condition*/)',
+				'    '
+			].join('\n'));
+			viewModel.type("{", 'keyboard');
+			assert.strictEqual(model.getValue(), [
+				'if (/*condition*/)',
+				'{}'
+			].join('\n'));
+			editor.setSelection(new Selection(2, 2, 2, 2));
+			viewModel.type("\n", 'keyboard');
+			assert.strictEqual(model.getValue(), [
+				'if (/*condition*/)',
+				'{',
+				'    ',
+				'}'
+			].join('\n'));
+		});
+	});
+
 	// Failing tests...
 
 	test.skip('issue #43244: indent after equal sign is detected', () => {
@@ -1090,8 +1124,7 @@ suite('Auto Indent On Type - TypeScript/JavaScript', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
-			disposables.add(registerLanguage(instantiationService, languageId));
+		withTestCodeEditor(model, { autoIndent: "full", serviceCollection }, (editor, viewModel) => {
 			editor.setSelection(new Selection(1, 14, 1, 14));
 			viewModel.type("\n", 'keyboard');
 			assert.strictEqual(model.getValue(), [
@@ -1114,8 +1147,7 @@ suite('Auto Indent On Type - TypeScript/JavaScript', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
-			disposables.add(registerLanguage(instantiationService, languageId));
+		withTestCodeEditor(model, { autoIndent: "full", serviceCollection }, (editor, viewModel) => {
 			editor.setSelection(new Selection(2, 7, 2, 7));
 			viewModel.type("\n", 'keyboard');
 			assert.strictEqual(model.getValue(), [
@@ -1138,8 +1170,7 @@ suite('Auto Indent On Type - TypeScript/JavaScript', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
-			disposables.add(registerLanguage(instantiationService, languageId));
+		withTestCodeEditor(model, { autoIndent: "full", serviceCollection }, (editor, viewModel) => {
 			editor.setSelection(new Selection(2, 7, 2, 7));
 			viewModel.type("\n", 'keyboard');
 			viewModel.type(".");
@@ -1163,8 +1194,7 @@ suite('Auto Indent On Type - TypeScript/JavaScript', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
-			disposables.add(registerLanguage(instantiationService, languageId));
+		withTestCodeEditor(model, { autoIndent: "full", serviceCollection }, (editor, viewModel) => {
 			editor.setSelection(new Selection(2, 24, 2, 24));
 			viewModel.type("\n", 'keyboard');
 			assert.strictEqual(model.getValue(), [
@@ -1189,8 +1219,7 @@ suite('Auto Indent On Type - TypeScript/JavaScript', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
-			disposables.add(registerLanguage(instantiationService, languageId));
+		withTestCodeEditor(model, { autoIndent: "full", serviceCollection }, (editor, viewModel) => {
 			editor.setSelection(new Selection(3, 5, 3, 5));
 			viewModel.type(".");
 			assert.strictEqual(model.getValue(), [
@@ -1213,8 +1242,7 @@ suite('Auto Indent On Type - TypeScript/JavaScript', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
-			disposables.add(registerLanguage(instantiationService, languageId));
+		withTestCodeEditor(model, { autoIndent: "full", serviceCollection }, (editor, viewModel) => {
 			editor.setSelection(new Selection(2, 25, 2, 25));
 			viewModel.type("\n", 'keyboard');
 			assert.strictEqual(model.getValue(), [
@@ -1233,10 +1261,7 @@ suite('Auto Indent On Type - TypeScript/JavaScript', () => {
 		const model = createTextModel('function foo() {}', languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
-
-			disposables.add(registerLanguage(instantiationService, languageId));
-
+		withTestCodeEditor(model, { autoIndent: "full", serviceCollection }, (editor, viewModel) => {
 			editor.setSelection(new Selection(1, 17, 1, 17));
 			viewModel.type("\n", 'keyboard');
 			assert.strictEqual(model.getValue(), [
@@ -1267,9 +1292,7 @@ suite('Auto Indent On Type - TypeScript/JavaScript', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
-
-			disposables.add(registerLanguage(instantiationService, languageId));
+		withTestCodeEditor(model, { autoIndent: "full", serviceCollection }, (editor, viewModel) => {
 			editor.setSelection(new Selection(3, 14, 3, 14));
 			viewModel.type("\n", 'keyboard');
 			assert.strictEqual(model.getValue(), [
@@ -1295,9 +1318,7 @@ suite('Auto Indent On Type - TypeScript/JavaScript', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
-
-			disposables.add(registerLanguage(instantiationService, languageId));
+		withTestCodeEditor(model, { autoIndent: "full", serviceCollection }, (editor, viewModel) => {
 			editor.setSelection(new Selection(4, 1, 4, 1));
 			viewModel.type("}", 'keyboard');
 			assert.strictEqual(model.getValue(), [
@@ -1319,16 +1340,13 @@ suite('Auto Indent On Type - TypeScript/JavaScript', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
-
-			disposables.add(registerLanguage(instantiationService, languageId));
+		withTestCodeEditor(model, { autoIndent: "full", serviceCollection }, (editor, viewModel) => {
 			editor.setSelection(new Selection(2, 5, 2, 5));
 			viewModel.type("{}", 'keyboard');
 			assert.strictEqual(model.getValue(), [
 				'if (true)',
 				'{}',
 			].join('\n'));
-
 			editor.setSelection(new Selection(2, 2, 2, 2));
 			viewModel.type("\n", 'keyboard');
 			assert.strictEqual(model.getValue(), [
@@ -1350,8 +1368,7 @@ suite('Auto Indent On Type - TypeScript/JavaScript', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: "keep" }, (editor, viewModel, instantiationService) => {
-			disposables.add(registerLanguage(instantiationService, languageId));
+		withTestCodeEditor(model, { autoIndent: "keep", serviceCollection }, (editor, viewModel) => {
 			editor.setSelection(new Selection(2, 5, 2, 5));
 			viewModel.type("}", 'keyboard');
 			assert.strictEqual(model.getValue(), [
@@ -1366,9 +1383,20 @@ suite('Auto Indent On Type - Ruby', () => {
 
 	const languageId = Language.Ruby;
 	let disposables: DisposableStore;
+	let serviceCollection: ServiceCollection;
 
 	setup(() => {
 		disposables = new DisposableStore();
+		const languageService = new LanguageService();
+		const languageConfigurationService = new TestLanguageConfigurationService();
+		disposables.add(languageService);
+		disposables.add(languageConfigurationService);
+		disposables.add(registerLanguage(languageService, languageId));
+		disposables.add(registerLanguageConfiguration(languageConfigurationService, languageId));
+		serviceCollection = new ServiceCollection(
+			[ILanguageService, languageService],
+			[ILanguageConfigurationService, languageConfigurationService]
+		);
 	});
 
 	teardown(() => {
@@ -1384,10 +1412,7 @@ suite('Auto Indent On Type - Ruby', () => {
 		const model = createTextModel("", languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
-
-			disposables.add(registerLanguage(instantiationService, languageId));
-
+		withTestCodeEditor(model, { autoIndent: "full", serviceCollection }, (editor, viewModel) => {
 			viewModel.type("def foo\n        i");
 			viewModel.type("n", 'keyboard');
 			assert.strictEqual(model.getValue(), "def foo\n        in");
@@ -1412,10 +1437,7 @@ suite('Auto Indent On Type - Ruby', () => {
 		const model = createTextModel("", languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
-
-			disposables.add(registerLanguage(instantiationService, languageId));
-
+		withTestCodeEditor(model, { autoIndent: "full", serviceCollection }, (editor, viewModel) => {
 			viewModel.type("method('#foo') do");
 			viewModel.type("\n", 'keyboard');
 			assert.strictEqual(model.getValue(), [
@@ -1430,9 +1452,20 @@ suite('Auto Indent On Type - PHP', () => {
 
 	const languageId = Language.PHP;
 	let disposables: DisposableStore;
+	let serviceCollection: ServiceCollection;
 
 	setup(() => {
 		disposables = new DisposableStore();
+		const languageService = new LanguageService();
+		const languageConfigurationService = new TestLanguageConfigurationService();
+		disposables.add(languageService);
+		disposables.add(languageConfigurationService);
+		disposables.add(registerLanguage(languageService, languageId));
+		disposables.add(registerLanguageConfiguration(languageConfigurationService, languageId));
+		serviceCollection = new ServiceCollection(
+			[ILanguageService, languageService],
+			[ILanguageConfigurationService, languageConfigurationService]
+		);
 	});
 
 	teardown(() => {
@@ -1448,9 +1481,7 @@ suite('Auto Indent On Type - PHP', () => {
 		const model = createTextModel("preg_replace('{');", languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
-
-			disposables.add(registerLanguage(instantiationService, languageId));
+		withTestCodeEditor(model, { autoIndent: "full", serviceCollection }, (editor, viewModel, instantiationService) => {
 			const tokens: StandardTokenTypeData[][] = [
 				[
 					{ startIndex: 0, standardTokenType: StandardTokenType.Other },
@@ -1473,9 +1504,20 @@ suite('Auto Indent On Paste - Go', () => {
 
 	const languageId = Language.Go;
 	let disposables: DisposableStore;
+	let serviceCollection: ServiceCollection;
 
 	setup(() => {
 		disposables = new DisposableStore();
+		const languageService = new LanguageService();
+		const languageConfigurationService = new TestLanguageConfigurationService();
+		disposables.add(languageService);
+		disposables.add(languageConfigurationService);
+		disposables.add(registerLanguage(languageService, languageId));
+		disposables.add(registerLanguageConfiguration(languageConfigurationService, languageId));
+		serviceCollection = new ServiceCollection(
+			[ILanguageService, languageService],
+			[ILanguageConfigurationService, languageConfigurationService]
+		);
 	});
 
 	teardown(() => {
@@ -1500,8 +1542,7 @@ suite('Auto Indent On Paste - Go', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
-			disposables.add(registerLanguage(instantiationService, languageId));
+		withTestCodeEditor(model, { autoIndent: "full", serviceCollection }, (editor, viewModel) => {
 			editor.setSelection(new Selection(3, 1, 3, 1));
 			const text = '  ';
 			const autoIndentOnPasteController = editor.registerAndInstantiateContribution(AutoIndentOnPaste.ID, AutoIndentOnPaste);
@@ -1521,9 +1562,20 @@ suite('Auto Indent On Type - CPP', () => {
 
 	const languageId = Language.CPP;
 	let disposables: DisposableStore;
+	let serviceCollection: ServiceCollection;
 
 	setup(() => {
 		disposables = new DisposableStore();
+		const languageService = new LanguageService();
+		const languageConfigurationService = new TestLanguageConfigurationService();
+		disposables.add(languageService);
+		disposables.add(languageConfigurationService);
+		disposables.add(registerLanguage(languageService, languageId));
+		disposables.add(registerLanguageConfiguration(languageConfigurationService, languageId));
+		serviceCollection = new ServiceCollection(
+			[ILanguageService, languageService],
+			[ILanguageConfigurationService, languageConfigurationService]
+		);
 	});
 
 	teardown(() => {
@@ -1546,8 +1598,7 @@ suite('Auto Indent On Type - CPP', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
-			disposables.add(registerLanguage(instantiationService, languageId));
+		withTestCodeEditor(model, { autoIndent: "full", serviceCollection }, (editor, viewModel) => {
 			editor.setSelection(new Selection(2, 20, 2, 20));
 			viewModel.type("\n", 'keyboard');
 			assert.strictEqual(model.getValue(), [
@@ -1569,8 +1620,7 @@ suite('Auto Indent On Type - CPP', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
-			disposables.add(registerLanguage(instantiationService, languageId));
+		withTestCodeEditor(model, { autoIndent: "full", serviceCollection }, (editor, viewModel) => {
 			editor.setSelection(new Selection(1, 20, 1, 20));
 			viewModel.type("\n", 'keyboard');
 			assert.strictEqual(model.getValue(), [
@@ -1591,9 +1641,7 @@ suite('Auto Indent On Type - CPP', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: "none" }, (editor, viewModel, instantiationService) => {
-
-			disposables.add(registerLanguage(instantiationService, languageId));
+		withTestCodeEditor(model, { autoIndent: "none", serviceCollection }, (editor, viewModel) => {
 			editor.setSelection(new Selection(2, 3, 2, 3));
 			viewModel.type("}", 'keyboard');
 			assert.strictEqual(model.getValue(), [
@@ -1609,9 +1657,20 @@ suite('Auto Indent On Type - HTML', () => {
 
 	const languageId = Language.HTML;
 	let disposables: DisposableStore;
+	let serviceCollection: ServiceCollection;
 
 	setup(() => {
 		disposables = new DisposableStore();
+		const languageService = new LanguageService();
+		const languageConfigurationService = new TestLanguageConfigurationService();
+		disposables.add(languageService);
+		disposables.add(languageConfigurationService);
+		disposables.add(registerLanguage(languageService, languageId));
+		disposables.add(registerLanguageConfiguration(languageConfigurationService, languageId));
+		serviceCollection = new ServiceCollection(
+			[ILanguageService, languageService],
+			[ILanguageConfigurationService, languageConfigurationService]
+		);
 	});
 
 	teardown(() => {
@@ -1635,8 +1694,7 @@ suite('Auto Indent On Type - HTML', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
-			disposables.add(registerLanguage(instantiationService, languageId));
+		withTestCodeEditor(model, { autoIndent: "full", serviceCollection }, (editor, viewModel) => {
 			editor.setSelection(new Selection(2, 48, 2, 48));
 			viewModel.type("\n", 'keyboard');
 			assert.strictEqual(model.getValue(), [
@@ -1653,9 +1711,20 @@ suite('Auto Indent On Type - Visual Basic', () => {
 
 	const languageId = Language.VB;
 	let disposables: DisposableStore;
+	let serviceCollection: ServiceCollection;
 
 	setup(() => {
 		disposables = new DisposableStore();
+		const languageService = new LanguageService();
+		const languageConfigurationService = new TestLanguageConfigurationService();
+		disposables.add(languageService);
+		disposables.add(languageConfigurationService);
+		disposables.add(registerLanguage(languageService, languageId));
+		disposables.add(registerLanguageConfiguration(languageConfigurationService, languageId));
+		serviceCollection = new ServiceCollection(
+			[ILanguageService, languageService],
+			[ILanguageConfigurationService, languageConfigurationService]
+		);
 	});
 
 	teardown(() => {
@@ -1679,8 +1748,7 @@ suite('Auto Indent On Type - Visual Basic', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
-			disposables.add(registerLanguage(instantiationService, languageId));
+		withTestCodeEditor(model, { autoIndent: "full", serviceCollection }, (editor, viewModel, instantiationService) => {
 			editor.setSelection(new Selection(3, 10, 3, 10));
 			viewModel.type("f", 'keyboard');
 			assert.strictEqual(model.getValue(), [
@@ -1697,9 +1765,20 @@ suite('Auto Indent On Type - Latex', () => {
 
 	const languageId = Language.Latex;
 	let disposables: DisposableStore;
+	let serviceCollection: ServiceCollection;
 
 	setup(() => {
 		disposables = new DisposableStore();
+		const languageService = new LanguageService();
+		const languageConfigurationService = new TestLanguageConfigurationService();
+		disposables.add(languageService);
+		disposables.add(languageConfigurationService);
+		disposables.add(registerLanguage(languageService, languageId));
+		disposables.add(registerLanguageConfiguration(languageConfigurationService, languageId));
+		serviceCollection = new ServiceCollection(
+			[ILanguageService, languageService],
+			[ILanguageConfigurationService, languageConfigurationService]
+		);
 	});
 
 	teardown(() => {
@@ -1722,8 +1801,7 @@ suite('Auto Indent On Type - Latex', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
-			disposables.add(registerLanguage(instantiationService, languageId));
+		withTestCodeEditor(model, { autoIndent: "full", serviceCollection }, (editor, viewModel) => {
 			editor.setSelection(new Selection(2, 9, 2, 9));
 			viewModel.type("{", 'keyboard');
 			assert.strictEqual(model.getValue(), [
@@ -1738,9 +1816,20 @@ suite('Auto Indent On Type - Lua', () => {
 
 	const languageId = Language.Lua;
 	let disposables: DisposableStore;
+	let serviceCollection: ServiceCollection;
 
 	setup(() => {
 		disposables = new DisposableStore();
+		const languageService = new LanguageService();
+		const languageConfigurationService = new TestLanguageConfigurationService();
+		disposables.add(languageService);
+		disposables.add(languageConfigurationService);
+		disposables.add(registerLanguage(languageService, languageId));
+		disposables.add(registerLanguageConfiguration(languageConfigurationService, languageId));
+		serviceCollection = new ServiceCollection(
+			[ILanguageService, languageService],
+			[ILanguageConfigurationService, languageConfigurationService]
+		);
 	});
 
 	teardown(() => {
@@ -1762,8 +1851,7 @@ suite('Auto Indent On Type - Lua', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
-			disposables.add(registerLanguage(instantiationService, languageId));
+		withTestCodeEditor(model, { autoIndent: "full", serviceCollection }, (editor, viewModel) => {
 			editor.setSelection(new Selection(1, 28, 1, 28));
 			viewModel.type("\n", 'keyboard');
 			assert.strictEqual(model.getValue(), [
diff --git a/src/vs/editor/contrib/indentation/test/browser/indentationLineProcessor.test.ts b/src/vs/editor/contrib/indentation/test/browser/indentationLineProcessor.test.ts
index 0a1b40949d7..20a08cd14b7 100644
--- a/src/vs/editor/contrib/indentation/test/browser/indentationLineProcessor.test.ts
+++ b/src/vs/editor/contrib/indentation/test/browser/indentationLineProcessor.test.ts
@@ -3,23 +3,38 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { StandardTokenType } from 'vs/editor/common/encodedTokenAttributes';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { IndentationContextProcessor, ProcessedIndentRulesSupport } from 'vs/editor/common/languages/supports/indentationLineProcessor';
-import { Language, registerLanguage, registerTokenizationSupport, StandardTokenTypeData } from 'vs/editor/contrib/indentation/test/browser/indentation.test';
-import { withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
-import { Range } from 'vs/editor/common/core/range';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { StandardTokenType } from '../../../../common/encodedTokenAttributes.js';
+import { ILanguageConfigurationService } from '../../../../common/languages/languageConfigurationRegistry.js';
+import { IndentationContextProcessor, ProcessedIndentRulesSupport } from '../../../../common/languages/supports/indentationLineProcessor.js';
+import { Language, registerLanguage, registerLanguageConfiguration, registerTokenizationSupport, StandardTokenTypeData } from './indentation.test.js';
+import { withTestCodeEditor } from '../../../../test/browser/testCodeEditor.js';
+import { createTextModel } from '../../../../test/common/testTextModel.js';
+import { Range } from '../../../../common/core/range.js';
+import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
+import { LanguageService } from '../../../../common/services/languageService.js';
+import { TestLanguageConfigurationService } from '../../../../test/common/modes/testLanguageConfigurationService.js';
+import { ILanguageService } from '../../../../common/languages/language.js';
 
 suite('Indentation Context Processor - TypeScript/JavaScript', () => {
 
 	const languageId = Language.TypeScript;
 	let disposables: DisposableStore;
+	let serviceCollection: ServiceCollection;
 
 	setup(() => {
 		disposables = new DisposableStore();
+		const languageService = new LanguageService();
+		const languageConfigurationService = new TestLanguageConfigurationService();
+		disposables.add(languageService);
+		disposables.add(languageConfigurationService);
+		disposables.add(registerLanguage(languageService, languageId));
+		disposables.add(registerLanguageConfiguration(languageConfigurationService, languageId));
+		serviceCollection = new ServiceCollection(
+			[ILanguageService, languageService],
+			[ILanguageConfigurationService, languageConfigurationService]
+		);
 	});
 
 	teardown(() => {
@@ -35,13 +50,12 @@ suite('Indentation Context Processor - TypeScript/JavaScript', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
+		withTestCodeEditor(model, { autoIndent: "full", serviceCollection }, (editor, viewModel, instantiationService) => {
 			const tokens: StandardTokenTypeData[][] = [[
 				{ startIndex: 0, standardTokenType: StandardTokenType.Other },
 				{ startIndex: 16, standardTokenType: StandardTokenType.String },
 				{ startIndex: 28, standardTokenType: StandardTokenType.String }
 			]];
-			disposables.add(registerLanguage(instantiationService, languageId));
 			disposables.add(registerTokenizationSupport(instantiationService, tokens, languageId));
 			const languageConfigurationService = instantiationService.get(ILanguageConfigurationService);
 			const indentationContextProcessor = new IndentationContextProcessor(model, languageConfigurationService);
@@ -60,7 +74,7 @@ suite('Indentation Context Processor - TypeScript/JavaScript', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
+		withTestCodeEditor(model, { autoIndent: "full", serviceCollection }, (editor, viewModel, instantiationService) => {
 			const tokens: StandardTokenTypeData[][] = [
 				[
 					{ startIndex: 0, standardTokenType: StandardTokenType.Other },
@@ -72,7 +86,6 @@ suite('Indentation Context Processor - TypeScript/JavaScript', () => {
 					{ startIndex: 46, standardTokenType: StandardTokenType.Other },
 					{ startIndex: 47, standardTokenType: StandardTokenType.String }
 				]];
-			disposables.add(registerLanguage(instantiationService, languageId));
 			disposables.add(registerTokenizationSupport(instantiationService, tokens, languageId));
 			const languageConfigurationService = instantiationService.get(ILanguageConfigurationService);
 			const indentationContextProcessor = new IndentationContextProcessor(model, languageConfigurationService);
@@ -91,7 +104,7 @@ suite('Indentation Context Processor - TypeScript/JavaScript', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
+		withTestCodeEditor(model, { autoIndent: "full", serviceCollection }, (editor, viewModel, instantiationService) => {
 			const tokens: StandardTokenTypeData[][] = [
 				[
 					{ startIndex: 0, standardTokenType: StandardTokenType.Other },
@@ -104,7 +117,6 @@ suite('Indentation Context Processor - TypeScript/JavaScript', () => {
 					{ startIndex: 44, standardTokenType: StandardTokenType.Other },
 				]
 			];
-			disposables.add(registerLanguage(instantiationService, languageId));
 			disposables.add(registerTokenizationSupport(instantiationService, tokens, languageId));
 			const languageConfigurationService = instantiationService.get(ILanguageConfigurationService);
 			const indentationContextProcessor = new IndentationContextProcessor(model, languageConfigurationService);
@@ -120,9 +132,20 @@ suite('Processed Indent Rules Support - TypeScript/JavaScript', () => {
 
 	const languageId = Language.TypeScript;
 	let disposables: DisposableStore;
+	let serviceCollection: ServiceCollection;
 
 	setup(() => {
 		disposables = new DisposableStore();
+		const languageService = new LanguageService();
+		const languageConfigurationService = new TestLanguageConfigurationService();
+		disposables.add(languageService);
+		disposables.add(languageConfigurationService);
+		disposables.add(registerLanguage(languageService, languageId));
+		disposables.add(registerLanguageConfiguration(languageConfigurationService, languageId));
+		serviceCollection = new ServiceCollection(
+			[ILanguageService, languageService],
+			[ILanguageConfigurationService, languageConfigurationService]
+		);
 	});
 
 	teardown(() => {
@@ -140,7 +163,7 @@ suite('Processed Indent Rules Support - TypeScript/JavaScript', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
+		withTestCodeEditor(model, { autoIndent: "full", serviceCollection }, (editor, viewModel, instantiationService) => {
 			const tokens: StandardTokenTypeData[][] = [
 				[
 					{ startIndex: 0, standardTokenType: StandardTokenType.Other }
@@ -154,7 +177,6 @@ suite('Processed Indent Rules Support - TypeScript/JavaScript', () => {
 					{ startIndex: 17, standardTokenType: StandardTokenType.Comment },
 				]
 			];
-			disposables.add(registerLanguage(instantiationService, languageId));
 			disposables.add(registerTokenizationSupport(instantiationService, tokens, languageId));
 			const languageConfigurationService = instantiationService.get(ILanguageConfigurationService);
 			const indentationRulesSupport = languageConfigurationService.getLanguageConfiguration(languageId).indentRulesSupport;
@@ -177,13 +199,12 @@ suite('Processed Indent Rules Support - TypeScript/JavaScript', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
+		withTestCodeEditor(model, { autoIndent: "full", serviceCollection }, (editor, viewModel, instantiationService) => {
 			const tokens: StandardTokenTypeData[][] = [
 				[{ startIndex: 0, standardTokenType: StandardTokenType.Other }],
 				[{ startIndex: 0, standardTokenType: StandardTokenType.String }],
 				[{ startIndex: 0, standardTokenType: StandardTokenType.Comment }]
 			];
-			disposables.add(registerLanguage(instantiationService, languageId));
 			disposables.add(registerTokenizationSupport(instantiationService, tokens, languageId));
 			const languageConfigurationService = instantiationService.get(ILanguageConfigurationService);
 			const indentationRulesSupport = languageConfigurationService.getLanguageConfiguration(languageId).indentRulesSupport;
@@ -206,7 +227,7 @@ suite('Processed Indent Rules Support - TypeScript/JavaScript', () => {
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
-		withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
+		withTestCodeEditor(model, { autoIndent: "full", serviceCollection }, (editor, viewModel, instantiationService) => {
 			const tokens: StandardTokenTypeData[][] = [
 				[
 					{ startIndex: 0, standardTokenType: StandardTokenType.Other }
@@ -220,7 +241,6 @@ suite('Processed Indent Rules Support - TypeScript/JavaScript', () => {
 					{ startIndex: 18, standardTokenType: StandardTokenType.RegEx }
 				]
 			];
-			disposables.add(registerLanguage(instantiationService, languageId));
 			disposables.add(registerTokenizationSupport(instantiationService, tokens, languageId));
 			const languageConfigurationService = instantiationService.get(ILanguageConfigurationService);
 			const indentationRulesSupport = languageConfigurationService.getLanguageConfiguration(languageId).indentRulesSupport;
diff --git a/src/vs/editor/contrib/inlayHints/browser/inlayHints.ts b/src/vs/editor/contrib/inlayHints/browser/inlayHints.ts
index c5905ab7cf4..8ce3830a3f2 100644
--- a/src/vs/editor/contrib/inlayHints/browser/inlayHints.ts
+++ b/src/vs/editor/contrib/inlayHints/browser/inlayHints.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { CancellationError, onUnexpectedExternalError } from 'vs/base/common/errors';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import { InlayHint, InlayHintList, InlayHintsProvider, Command } from 'vs/editor/common/languages';
-import { ITextModel } from 'vs/editor/common/model';
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { CancellationError, onUnexpectedExternalError } from '../../../../base/common/errors.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { IPosition, Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { LanguageFeatureRegistry } from '../../../common/languageFeatureRegistry.js';
+import { InlayHint, InlayHintList, InlayHintsProvider, Command } from '../../../common/languages.js';
+import { ITextModel } from '../../../common/model.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { URI } from '../../../../base/common/uri.js';
 
 export class InlayHintAnchor {
 	constructor(readonly range: Range, readonly direction: 'before' | 'after') { }
diff --git a/src/vs/editor/contrib/inlayHints/browser/inlayHintsContribution.ts b/src/vs/editor/contrib/inlayHints/browser/inlayHintsContribution.ts
index ae4d54b7d96..508762b52b9 100644
--- a/src/vs/editor/contrib/inlayHints/browser/inlayHintsContribution.ts
+++ b/src/vs/editor/contrib/inlayHints/browser/inlayHintsContribution.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { HoverParticipantRegistry } from 'vs/editor/contrib/hover/browser/hoverTypes';
-import { InlayHintsController } from 'vs/editor/contrib/inlayHints/browser/inlayHintsController';
-import { InlayHintsHover } from 'vs/editor/contrib/inlayHints/browser/inlayHintsHover';
+import { EditorContributionInstantiation, registerEditorContribution } from '../../../browser/editorExtensions.js';
+import { HoverParticipantRegistry } from '../../hover/browser/hoverTypes.js';
+import { InlayHintsController } from './inlayHintsController.js';
+import { InlayHintsHover } from './inlayHintsHover.js';
 
 registerEditorContribution(InlayHintsController.ID, InlayHintsController, EditorContributionInstantiation.AfterFirstRender);
 HoverParticipantRegistry.register(InlayHintsHover);
diff --git a/src/vs/editor/contrib/inlayHints/browser/inlayHintsController.ts b/src/vs/editor/contrib/inlayHints/browser/inlayHintsController.ts
index accb88043ff..913e8075b3c 100644
--- a/src/vs/editor/contrib/inlayHints/browser/inlayHintsController.ts
+++ b/src/vs/editor/contrib/inlayHints/browser/inlayHintsController.ts
@@ -3,38 +3,39 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isHTMLElement, ModifierKeyEmitter } from 'vs/base/browser/dom';
-import { isNonEmptyArray } from 'vs/base/common/arrays';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { LRUCache } from 'vs/base/common/map';
-import { IRange } from 'vs/base/common/range';
-import { assertType } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { IActiveCodeEditor, ICodeEditor, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
-import { ClassNameReference, CssProperties, DynamicCssRules } from 'vs/editor/browser/editorDom';
-import { StableEditorScrollState } from 'vs/editor/browser/stableEditorScroll';
-import { EditorOption, EDITOR_FONT_DEFAULTS } from 'vs/editor/common/config/editorOptions';
-import { EditOperation } from 'vs/editor/common/core/editOperation';
-import { Range } from 'vs/editor/common/core/range';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import * as languages from 'vs/editor/common/languages';
-import { IModelDeltaDecoration, InjectedTextCursorStops, InjectedTextOptions, ITextModel, TrackedRangeStickiness } from 'vs/editor/common/model';
-import { ModelDecorationInjectedTextOptions } from 'vs/editor/common/model/textModel';
-import { IFeatureDebounceInformation, ILanguageFeatureDebounceService } from 'vs/editor/common/services/languageFeatureDebounce';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { ClickLinkGesture, ClickLinkMouseEvent } from 'vs/editor/contrib/gotoSymbol/browser/link/clickLinkGesture';
-import { InlayHintAnchor, InlayHintItem, InlayHintsFragments } from 'vs/editor/contrib/inlayHints/browser/inlayHints';
-import { goToDefinitionWithLocation, showGoToContextMenu } from 'vs/editor/contrib/inlayHints/browser/inlayHintsLocations';
-import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import * as colors from 'vs/platform/theme/common/colorRegistry';
-import { themeColorFromId } from 'vs/platform/theme/common/themeService';
+import { isHTMLElement, ModifierKeyEmitter } from '../../../../base/browser/dom.js';
+import { isNonEmptyArray } from '../../../../base/common/arrays.js';
+import { disposableTimeout, RunOnceScheduler } from '../../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { DisposableStore, IDisposable, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { LRUCache } from '../../../../base/common/map.js';
+import { IRange } from '../../../../base/common/range.js';
+import { assertType } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IActiveCodeEditor, ICodeEditor, IEditorMouseEvent, MouseTargetType } from '../../../browser/editorBrowser.js';
+import { ClassNameReference, CssProperties, DynamicCssRules } from '../../../browser/editorDom.js';
+import { StableEditorScrollState } from '../../../browser/stableEditorScroll.js';
+import { EditorOption, EDITOR_FONT_DEFAULTS } from '../../../common/config/editorOptions.js';
+import { EditOperation } from '../../../common/core/editOperation.js';
+import { Range } from '../../../common/core/range.js';
+import { IEditorContribution } from '../../../common/editorCommon.js';
+import * as languages from '../../../common/languages.js';
+import { IModelDeltaDecoration, InjectedTextCursorStops, InjectedTextOptions, ITextModel, TrackedRangeStickiness } from '../../../common/model.js';
+import { ModelDecorationInjectedTextOptions } from '../../../common/model/textModel.js';
+import { IFeatureDebounceInformation, ILanguageFeatureDebounceService } from '../../../common/services/languageFeatureDebounce.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { ITextModelService } from '../../../common/services/resolverService.js';
+import { ClickLinkGesture, ClickLinkMouseEvent } from '../../gotoSymbol/browser/link/clickLinkGesture.js';
+import { InlayHintAnchor, InlayHintItem, InlayHintsFragments } from './inlayHints.js';
+import { goToDefinitionWithLocation, showGoToContextMenu } from './inlayHintsLocations.js';
+import { CommandsRegistry, ICommandService } from '../../../../platform/commands/common/commands.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { createDecorator, IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import * as colors from '../../../../platform/theme/common/colorRegistry.js';
+import { themeColorFromId } from '../../../../platform/theme/common/themeService.js';
+import { Position } from '../../../common/core/position.js';
 
 // --- hint caching service (per session)
 
@@ -100,7 +101,7 @@ export class InlayHintsController implements IEditorContribution {
 	static readonly ID: string = 'editor.contrib.InlayHints';
 
 	private static readonly _MAX_DECORATORS = 1500;
-	private static readonly _MAX_LABEL_LEN = 43;
+	private static readonly _whitespaceData = {};
 
 	static get(editor: ICodeEditor): InlayHintsController | undefined {
 		return editor.getContribution<InlayHintsController>(InlayHintsController.ID) ?? undefined;
@@ -112,6 +113,7 @@ export class InlayHintsController implements IEditorContribution {
 	private readonly _decorationsMetadata = new Map<string, InlayHintDecorationRenderInfo>();
 	private readonly _ruleFactory = new DynamicCssRules(this._editor);
 
+	private _cursorInfo?: { position: Position; notEarlierThan: number };
 	private _activeRenderMode = RenderMode.Normal;
 	private _activeInlayHintPart?: ActiveInlayHintInfo;
 
@@ -257,12 +259,23 @@ export class InlayHintsController implements IEditorContribution {
 				scheduler.schedule();
 			}
 		}));
+
+		const cursor = this._sessionDisposables.add(new MutableDisposable());
 		this._sessionDisposables.add(this._editor.onDidChangeModelContent((e) => {
 			cts?.cancel();
 
-			// update less aggressive when typing
-			const delay = Math.max(scheduler.delay, 1250);
-			scheduler.schedule(delay);
+			// mark current cursor position and time after which the whole can be updated/redrawn
+			const delay = Math.max(scheduler.delay, 800);
+			this._cursorInfo = { position: this._editor.getPosition()!, notEarlierThan: Date.now() + delay };
+			cursor.value = disposableTimeout(() => scheduler.schedule(0), delay);
+
+			scheduler.schedule();
+		}));
+
+		this._sessionDisposables.add(this._editor.onDidChangeConfiguration(e => {
+			if (e.hasChanged(EditorOption.inlayHints)) {
+				scheduler.schedule();
+			}
 		}));
 
 		// mouse gestures
@@ -435,9 +448,65 @@ export class InlayHintsController implements IEditorContribution {
 
 	private _updateHintsDecorators(ranges: readonly Range[], items: readonly InlayHintItem[]): void {
 
+		const itemFixedLengths = new Map<InlayHintItem, number>();
+
+		if (this._cursorInfo
+			&& this._cursorInfo.notEarlierThan > Date.now()
+			&& ranges.some(range => range.containsPosition(this._cursorInfo!.position))
+		) {
+			// collect inlay hints that are on the same line and before the cursor. Those "old" hints
+			// define fixed lengths so that the cursor does not jump back and worth while typing.
+			const { position } = this._cursorInfo;
+			this._cursorInfo = undefined;
+
+			const lengths = new Map<InlayHintItem, number>();
+
+			for (const deco of this._editor.getLineDecorations(position.lineNumber) ?? []) {
+
+				const data = this._decorationsMetadata.get(deco.id);
+				if (deco.range.startColumn > position.column) {
+					continue;
+				}
+				const opts = data?.decoration.options[data.item.anchor.direction];
+				if (opts && opts.attachedData !== InlayHintsController._whitespaceData) {
+					const len = lengths.get(data.item) ?? 0;
+					lengths.set(data.item, len + opts.content.length);
+				}
+			}
+
+
+			// on the cursor line and before the cursor-column
+			const newItemsWithFixedLength = items.filter(item => item.anchor.range.startLineNumber === position.lineNumber && item.anchor.range.endColumn <= position.column);
+			const fixedLengths = Array.from(lengths.values());
+
+			// match up fixed lengths with items and distribute the remaining lengths to the last item
+			let lastItem: InlayHintItem | undefined;
+			while (true) {
+				const targetItem = newItemsWithFixedLength.shift();
+				const fixedLength = fixedLengths.shift();
+
+				if (!fixedLength && !targetItem) {
+					break; // DONE
+				}
+
+				if (targetItem) {
+					itemFixedLengths.set(targetItem, fixedLength ?? 0);
+					lastItem = targetItem;
+
+				} else if (lastItem && fixedLength) {
+					// still lengths but no more item. give it all to the last
+					let len = itemFixedLengths.get(lastItem)!;
+					len += fixedLength;
+					len += fixedLengths.reduce((p, c) => p + c, 0);
+					fixedLengths.length = 0;
+					break; // DONE
+				}
+			}
+		}
+
 		// utils to collect/create injected text decorations
 		const newDecorationsData: InlayHintDecorationRenderInfo[] = [];
-		const addInjectedText = (item: InlayHintItem, ref: ClassNameReference, content: string, cursorStops: InjectedTextCursorStops, attachedData?: RenderedInlayHintLabelPart): void => {
+		const addInjectedText = (item: InlayHintItem, ref: ClassNameReference, content: string, cursorStops: InjectedTextCursorStops, attachedData?: RenderedInlayHintLabelPart | object): void => {
 			const opts: InjectedTextOptions = {
 				content,
 				inlineClassNameAffectsLetterSpacing: true,
@@ -467,12 +536,13 @@ export class InlayHintsController implements IEditorContribution {
 				width: `${(fontSize / 3) | 0}px`,
 				display: 'inline-block'
 			});
-			addInjectedText(item, marginRule, '\u200a', isLast ? InjectedTextCursorStops.Right : InjectedTextCursorStops.None);
+			addInjectedText(item, marginRule, '\u200a', isLast ? InjectedTextCursorStops.Right : InjectedTextCursorStops.None, InlayHintsController._whitespaceData);
 		};
 
 
 		//
 		const { fontSize, fontFamily, padding, isUniform } = this._getLayoutInfo();
+		const maxLength = this._editor.getOption(EditorOption.inlayHints).maximumLength;
 		const fontFamilyVar = '--code-editorInlayHintsFontFamily';
 		this._editor.getContainerDomNode().style.setProperty(fontFamilyVar, fontFamily);
 
@@ -480,13 +550,14 @@ export class InlayHintsController implements IEditorContribution {
 		type ILineInfo = { line: number; totalLen: number };
 		let currentLineInfo: ILineInfo = { line: 0, totalLen: 0 };
 
-		for (const item of items) {
+		for (let i = 0; i < items.length; i++) {
+			const item = items[i];
 
 			if (currentLineInfo.line !== item.anchor.range.startLineNumber) {
 				currentLineInfo = { line: item.anchor.range.startLineNumber, totalLen: 0 };
 			}
 
-			if (currentLineInfo.totalLen > InlayHintsController._MAX_LABEL_LEN) {
+			if (maxLength && currentLineInfo.totalLen > maxLength) {
 				continue;
 			}
 
@@ -500,6 +571,9 @@ export class InlayHintsController implements IEditorContribution {
 				? [{ label: item.hint.label }]
 				: item.hint.label;
 
+			const itemFixedLength = itemFixedLengths.get(item);
+			let itemActualLength = 0;
+
 			for (let i = 0; i < parts.length; i++) {
 				const part = parts[i];
 
@@ -528,8 +602,29 @@ export class InlayHintsController implements IEditorContribution {
 					}
 				}
 
+				let textlabel = part.label;
+				currentLineInfo.totalLen += textlabel.length;
+				let tooLong = false;
+				const over = maxLength !== 0 ? (currentLineInfo.totalLen - maxLength) : 0;
+				if (over > 0) {
+					textlabel = textlabel.slice(0, -over) + '…';
+					tooLong = true;
+				}
+
+				itemActualLength += textlabel.length;
+
+				if (itemFixedLength !== undefined) {
+					const overFixedLength = itemActualLength - itemFixedLength;
+					if (overFixedLength >= 0) {
+						// longer than fixed length, trim
+						itemActualLength -= overFixedLength;
+						textlabel = textlabel.slice(0, -(1 + overFixedLength)) + '…';
+						tooLong = true;
+					}
+				}
+
 				if (padding) {
-					if (isFirst && isLast) {
+					if (isFirst && (isLast || tooLong)) {
 						// only element
 						cssProperties.padding = `1px ${Math.max(1, fontSize / 4) | 0}px`;
 						cssProperties.borderRadius = `${(fontSize / 4) | 0}px`;
@@ -537,7 +632,7 @@ export class InlayHintsController implements IEditorContribution {
 						// first element
 						cssProperties.padding = `1px 0 1px ${Math.max(1, fontSize / 4) | 0}px`;
 						cssProperties.borderRadius = `${(fontSize / 4) | 0}px 0 0 ${(fontSize / 4) | 0}px`;
-					} else if (isLast) {
+					} else if ((isLast || tooLong)) {
 						// last element
 						cssProperties.padding = `1px ${Math.max(1, fontSize / 4) | 0}px 1px 0`;
 						cssProperties.borderRadius = `0 ${(fontSize / 4) | 0}px ${(fontSize / 4) | 0}px 0`;
@@ -546,15 +641,6 @@ export class InlayHintsController implements IEditorContribution {
 					}
 				}
 
-				let textlabel = part.label;
-				currentLineInfo.totalLen += textlabel.length;
-				let tooLong = false;
-				const over = currentLineInfo.totalLen - InlayHintsController._MAX_LABEL_LEN;
-				if (over > 0) {
-					textlabel = textlabel.slice(0, -over) + '…';
-					tooLong = true;
-				}
-
 				addInjectedText(
 					item,
 					this._ruleFactory.createClassNameRef(cssProperties),
@@ -568,6 +654,17 @@ export class InlayHintsController implements IEditorContribution {
 				}
 			}
 
+			if (itemFixedLength !== undefined && itemActualLength < itemFixedLength) {
+				// shorter than fixed length, pad
+				const pad = (itemFixedLength - itemActualLength);
+				addInjectedText(
+					item,
+					this._ruleFactory.createClassNameRef({}),
+					'\u200a'.repeat(pad),
+					InjectedTextCursorStops.None
+				);
+			}
+
 			// whitespace trailing the actual label
 			if (item.hint.paddingRight) {
 				addInjectedWhitespace(item, true);
diff --git a/src/vs/editor/contrib/inlayHints/browser/inlayHintsHover.ts b/src/vs/editor/contrib/inlayHints/browser/inlayHintsHover.ts
index d49a4bb781f..7587ab9a72d 100644
--- a/src/vs/editor/contrib/inlayHints/browser/inlayHintsHover.ts
+++ b/src/vs/editor/contrib/inlayHints/browser/inlayHintsHover.ts
@@ -3,29 +3,30 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { AsyncIterableObject } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IMarkdownString, isEmptyMarkdownString, MarkdownString } from 'vs/base/common/htmlContent';
-import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
-import { Position } from 'vs/editor/common/core/position';
-import { IModelDecoration } from 'vs/editor/common/model';
-import { ModelDecorationInjectedTextOptions } from 'vs/editor/common/model/textModel';
-import { HoverAnchor, HoverForeignElementAnchor, IEditorHoverParticipant } from 'vs/editor/contrib/hover/browser/hoverTypes';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { getHoverProviderResultsAsAsyncIterable } from 'vs/editor/contrib/hover/browser/getHover';
-import { MarkdownHover, MarkdownHoverParticipant } from 'vs/editor/contrib/hover/browser/markdownHoverParticipant';
-import { RenderedInlayHintLabelPart, InlayHintsController } from 'vs/editor/contrib/inlayHints/browser/inlayHintsController';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { localize } from 'vs/nls';
-import * as platform from 'vs/base/common/platform';
-import { asCommandLink } from 'vs/editor/contrib/inlayHints/browser/inlayHints';
-import { isNonEmptyArray } from 'vs/base/common/arrays';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import { AsyncIterableObject } from '../../../../base/common/async.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IMarkdownString, isEmptyMarkdownString, MarkdownString } from '../../../../base/common/htmlContent.js';
+import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from '../../../browser/editorBrowser.js';
+import { Position } from '../../../common/core/position.js';
+import { IModelDecoration } from '../../../common/model.js';
+import { ModelDecorationInjectedTextOptions } from '../../../common/model/textModel.js';
+import { HoverAnchor, HoverForeignElementAnchor, IEditorHoverParticipant } from '../../hover/browser/hoverTypes.js';
+import { ILanguageService } from '../../../common/languages/language.js';
+import { ITextModelService } from '../../../common/services/resolverService.js';
+import { getHoverProviderResultsAsAsyncIterable } from '../../hover/browser/getHover.js';
+import { MarkdownHover, MarkdownHoverParticipant } from '../../hover/browser/markdownHoverParticipant.js';
+import { RenderedInlayHintLabelPart, InlayHintsController } from './inlayHintsController.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { localize } from '../../../../nls.js';
+import * as platform from '../../../../base/common/platform.js';
+import { asCommandLink } from './inlayHints.js';
+import { isNonEmptyArray } from '../../../../base/common/arrays.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
 
 class InlayHintsHoverAnchor extends HoverForeignElementAnchor {
 	constructor(
@@ -51,8 +52,9 @@ export class InlayHintsHover extends MarkdownHoverParticipant implements IEditor
 		@IConfigurationService configurationService: IConfigurationService,
 		@ITextModelService private readonly _resolverService: ITextModelService,
 		@ILanguageFeaturesService languageFeaturesService: ILanguageFeaturesService,
+		@ICommandService commandService: ICommandService
 	) {
-		super(editor, languageService, openerService, configurationService, languageFeaturesService, keybindingService, hoverService);
+		super(editor, languageService, openerService, configurationService, languageFeaturesService, keybindingService, hoverService, commandService);
 	}
 
 	suggestHoverAnchor(mouseEvent: IEditorMouseEvent): HoverAnchor | null {
diff --git a/src/vs/editor/contrib/inlayHints/browser/inlayHintsLocations.ts b/src/vs/editor/contrib/inlayHints/browser/inlayHintsLocations.ts
index 4228e056034..edf82acff9a 100644
--- a/src/vs/editor/contrib/inlayHints/browser/inlayHintsLocations.ts
+++ b/src/vs/editor/contrib/inlayHints/browser/inlayHintsLocations.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { Action, IAction, Separator } from 'vs/base/common/actions';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { generateUuid } from 'vs/base/common/uuid';
-import { IActiveCodeEditor, ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Range } from 'vs/editor/common/core/range';
-import { Location } from 'vs/editor/common/languages';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { DefinitionAction, SymbolNavigationAction, SymbolNavigationAnchor } from 'vs/editor/contrib/gotoSymbol/browser/goToCommands';
-import { ClickLinkMouseEvent } from 'vs/editor/contrib/gotoSymbol/browser/link/clickLinkGesture';
-import { RenderedInlayHintLabelPart } from 'vs/editor/contrib/inlayHints/browser/inlayHintsController';
-import { PeekContext } from 'vs/editor/contrib/peekView/browser/peekView';
-import { isIMenuItem, MenuId, MenuItemAction, MenuRegistry } from 'vs/platform/actions/common/actions';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
+import * as dom from '../../../../base/browser/dom.js';
+import { Action, IAction, Separator } from '../../../../base/common/actions.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { IActiveCodeEditor, ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { Range } from '../../../common/core/range.js';
+import { Location } from '../../../common/languages.js';
+import { ITextModelService } from '../../../common/services/resolverService.js';
+import { DefinitionAction, SymbolNavigationAction, SymbolNavigationAnchor } from '../../gotoSymbol/browser/goToCommands.js';
+import { ClickLinkMouseEvent } from '../../gotoSymbol/browser/link/clickLinkGesture.js';
+import { RenderedInlayHintLabelPart } from './inlayHintsController.js';
+import { PeekContext } from '../../peekView/browser/peekView.js';
+import { isIMenuItem, MenuId, MenuItemAction, MenuRegistry } from '../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
 
 export async function showGoToContextMenu(accessor: ServicesAccessor, editor: ICodeEditor, anchor: HTMLElement, part: RenderedInlayHintLabelPart) {
 
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/commandIds.ts b/src/vs/editor/contrib/inlineCompletions/browser/controller/commandIds.ts
similarity index 100%
rename from src/vs/editor/contrib/inlineCompletions/browser/commandIds.ts
rename to src/vs/editor/contrib/inlineCompletions/browser/controller/commandIds.ts
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/commands.ts b/src/vs/editor/contrib/inlineCompletions/browser/controller/commands.ts
similarity index 66%
rename from src/vs/editor/contrib/inlineCompletions/browser/commands.ts
rename to src/vs/editor/contrib/inlineCompletions/browser/controller/commands.ts
index ddfde90862d..4e59d278b7e 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/commands.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/controller/commands.ts
@@ -3,21 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { transaction } from 'vs/base/common/observable';
-import { asyncTransaction } from 'vs/base/common/observableInternal/base';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { showNextInlineSuggestionActionId, showPreviousInlineSuggestionActionId, inlineSuggestCommitId } from 'vs/editor/contrib/inlineCompletions/browser/commandIds';
-import { InlineCompletionContextKeys } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionContextKeys';
-import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController';
-import { Context as SuggestContext } from 'vs/editor/contrib/suggest/browser/suggest';
-import * as nls from 'vs/nls';
-import { MenuId, Action2 } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
+import { asyncTransaction, transaction } from '../../../../../base/common/observable.js';
+import * as nls from '../../../../../nls.js';
+import { Action2, MenuId } from '../../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ICodeEditor } from '../../../../browser/editorBrowser.js';
+import { EditorAction, ServicesAccessor } from '../../../../browser/editorExtensions.js';
+import { EditorContextKeys } from '../../../../common/editorContextKeys.js';
+import { Context as SuggestContext } from '../../../suggest/browser/suggest.js';
+import { inlineSuggestCommitId, showNextInlineSuggestionActionId, showPreviousInlineSuggestionActionId } from './commandIds.js';
+import { InlineCompletionContextKeys } from './inlineCompletionContextKeys.js';
+import { InlineCompletionsController } from './inlineCompletionsController.js';
 
 export class ShowNextInlineSuggestionAction extends EditorAction {
 	public static ID = showNextInlineSuggestionActionId;
@@ -139,22 +138,40 @@ export class AcceptInlineCompletion extends EditorAction {
 			id: inlineSuggestCommitId,
 			label: nls.localize('action.inlineSuggest.accept', "Accept Inline Suggestion"),
 			alias: 'Accept Inline Suggestion',
-			precondition: InlineCompletionContextKeys.inlineSuggestionVisible,
+			precondition: ContextKeyExpr.or(InlineCompletionContextKeys.inlineSuggestionVisible, InlineCompletionContextKeys.inlineEditVisible),
 			menuOpts: [{
 				menuId: MenuId.InlineSuggestionToolbar,
 				title: nls.localize('accept', "Accept"),
 				group: 'primary',
 				order: 1,
+			}, {
+				menuId: MenuId.InlineEditsActions,
+				title: nls.localize('accept', "Accept"),
+				group: 'primary',
+				order: 1,
 			}],
 			kbOpts: {
 				primary: KeyCode.Tab,
 				weight: 200,
-				kbExpr: ContextKeyExpr.and(
-					InlineCompletionContextKeys.inlineSuggestionVisible,
-					EditorContextKeys.tabMovesFocus.toNegated(),
-					InlineCompletionContextKeys.inlineSuggestionHasIndentationLessThanTabSize,
-					SuggestContext.Visible.toNegated(),
-					EditorContextKeys.hoverFocused.toNegated(),
+				kbExpr: ContextKeyExpr.or(
+					ContextKeyExpr.and(
+						InlineCompletionContextKeys.inlineSuggestionVisible,
+						EditorContextKeys.tabMovesFocus.toNegated(),
+						SuggestContext.Visible.toNegated(),
+						EditorContextKeys.hoverFocused.toNegated(),
+
+						InlineCompletionContextKeys.inlineSuggestionHasIndentationLessThanTabSize,
+					),
+					ContextKeyExpr.and(
+						InlineCompletionContextKeys.inlineEditVisible,
+						EditorContextKeys.tabMovesFocus.toNegated(),
+						SuggestContext.Visible.toNegated(),
+						EditorContextKeys.hoverFocused.toNegated(),
+
+						//InlineCompletionContextKeys.cursorInIndentation.toNegated(),
+						InlineCompletionContextKeys.hasSelection.toNegated(),
+						InlineCompletionContextKeys.cursorAtInlineEdit,
+					)
 				),
 			}
 		});
@@ -169,6 +186,44 @@ export class AcceptInlineCompletion extends EditorAction {
 	}
 }
 
+export class JumpToNextInlineEdit extends EditorAction {
+	constructor() {
+		super({
+			id: 'editor.action.inlineSuggest.jump',
+			label: nls.localize('action.inlineSuggest.jump', "Jump to next inline edit"),
+			alias: 'Jump to next inline edit',
+			precondition: InlineCompletionContextKeys.inlineEditVisible,
+			menuOpts: [{
+				menuId: MenuId.InlineEditsActions,
+				title: nls.localize('jump', "Jump"),
+				group: 'primary',
+				order: 2,
+				when: InlineCompletionContextKeys.cursorAtInlineEdit.toNegated(),
+			}],
+			kbOpts: {
+				primary: KeyCode.Tab,
+				weight: 201,
+				kbExpr: ContextKeyExpr.and(
+					InlineCompletionContextKeys.inlineEditVisible,
+					//InlineCompletionContextKeys.cursorInIndentation.toNegated(),
+					InlineCompletionContextKeys.hasSelection.toNegated(),
+					EditorContextKeys.tabMovesFocus.toNegated(),
+					SuggestContext.Visible.toNegated(),
+					EditorContextKeys.hoverFocused.toNegated(),
+					InlineCompletionContextKeys.cursorAtInlineEdit.toNegated(),
+				),
+			}
+		});
+	}
+
+	public async run(accessor: ServicesAccessor | undefined, editor: ICodeEditor): Promise<void> {
+		const controller = InlineCompletionsController.get(editor);
+		if (controller) {
+			controller.jump();
+		}
+	}
+}
+
 export class HideInlineCompletion extends EditorAction {
 	public static ID = 'editor.action.inlineSuggest.hide';
 
@@ -177,7 +232,7 @@ export class HideInlineCompletion extends EditorAction {
 			id: HideInlineCompletion.ID,
 			label: nls.localize('action.inlineSuggest.hide', "Hide Inline Suggestion"),
 			alias: 'Hide Inline Suggestion',
-			precondition: InlineCompletionContextKeys.inlineSuggestionVisible,
+			precondition: ContextKeyExpr.or(InlineCompletionContextKeys.inlineSuggestionVisible, InlineCompletionContextKeys.inlineEditVisible),
 			kbOpts: {
 				weight: 100,
 				primary: KeyCode.Escape,
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionContextKeys.ts b/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionContextKeys.ts
similarity index 72%
rename from src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionContextKeys.ts
rename to src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionContextKeys.ts
index fcbcd62120f..18ac9852887 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionContextKeys.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionContextKeys.ts
@@ -3,20 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IObservable, autorun } from 'vs/base/common/observable';
-import { firstNonWhitespaceIndex } from 'vs/base/common/strings';
-import { CursorColumns } from 'vs/editor/common/core/cursorColumns';
-import { InlineCompletionsModel } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel';
-import { RawContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { localize } from 'vs/nls';
+import { IObservable, autorun } from '../../../../../base/common/observable.js';
+import { firstNonWhitespaceIndex } from '../../../../../base/common/strings.js';
+import { CursorColumns } from '../../../../common/core/cursorColumns.js';
+import { InlineCompletionsModel } from '../model/inlineCompletionsModel.js';
+import { RawContextKey, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { localize } from '../../../../../nls.js';
+import { bindContextKey } from '../../../../../platform/observable/common/platformObservableUtils.js';
 
 export class InlineCompletionContextKeys extends Disposable {
+
 	public static readonly inlineSuggestionVisible = new RawContextKey<boolean>('inlineSuggestionVisible', false, localize('inlineSuggestionVisible', "Whether an inline suggestion is visible"));
 	public static readonly inlineSuggestionHasIndentation = new RawContextKey<boolean>('inlineSuggestionHasIndentation', false, localize('inlineSuggestionHasIndentation', "Whether the inline suggestion starts with whitespace"));
 	public static readonly inlineSuggestionHasIndentationLessThanTabSize = new RawContextKey<boolean>('inlineSuggestionHasIndentationLessThanTabSize', true, localize('inlineSuggestionHasIndentationLessThanTabSize', "Whether the inline suggestion starts with whitespace that is less than what would be inserted by tab"));
 	public static readonly suppressSuggestions = new RawContextKey<boolean | undefined>('inlineSuggestionSuppressSuggestions', undefined, localize('suppressSuggestions', "Whether suggestions should be suppressed for the current suggestion"));
 
+	public static readonly cursorInIndentation = new RawContextKey<boolean | undefined>('cursorInIndentation', false, localize('cursorInIndentation', "Whether the cursor is in indentation"));
+	public static readonly hasSelection = new RawContextKey<boolean | undefined>('editor.hasSelection', false, localize('editor.hasSelection', "Whether the editor has a selection"));
+	public static readonly cursorAtInlineEdit = new RawContextKey<boolean | undefined>('cursorAtInlineEdit', false, localize('cursorAtInlineEdit', "Whether the cursor is at an inline edit"));
+	public static readonly inlineEditVisible = new RawContextKey<boolean>('inlineEditIsVisible', false, localize('inlineEditVisible', "Whether an inline edit is visible"));
+
+
 	public readonly inlineCompletionVisible = InlineCompletionContextKeys.inlineSuggestionVisible.bindTo(this.contextKeyService);
 	public readonly inlineCompletionSuggestsIndentation = InlineCompletionContextKeys.inlineSuggestionHasIndentation.bindTo(this.contextKeyService);
 	public readonly inlineCompletionSuggestsIndentationLessThanTabSize = InlineCompletionContextKeys.inlineSuggestionHasIndentationLessThanTabSize.bindTo(this.contextKeyService);
@@ -28,6 +36,12 @@ export class InlineCompletionContextKeys extends Disposable {
 	) {
 		super();
 
+		this._register(bindContextKey(
+			InlineCompletionContextKeys.inlineEditVisible,
+			this.contextKeyService,
+			reader => this.model.read(reader)?.stateInlineEdit.read(reader) !== undefined
+		));
+
 		this._register(autorun(reader => {
 			/** @description update context key: inlineCompletionVisible, suppressSuggestions */
 			const model = this.model.read(reader);
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController.ts b/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts
similarity index 58%
rename from src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController.ts
rename to src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts
index 4fdd739ab40..53e1dca1747 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts
@@ -3,49 +3,54 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createStyleSheetFromObservable } from 'vs/base/browser/domObservable';
-import { alert } from 'vs/base/browser/ui/aria/aria';
-import { timeout } from 'vs/base/common/async';
-import { cancelOnDispose } from 'vs/base/common/cancellation';
-import { Disposable, DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { IObservable, ITransaction, autorun, constObservable, derived, observableFromEvent, observableSignal, observableValue, transaction, waitForState } from 'vs/base/common/observable';
-import { ISettableObservable } from 'vs/base/common/observableInternal/base';
-import { derivedDisposable } from 'vs/base/common/observableInternal/derived';
-import { derivedObservableWithCache, mapObservableArrayCached } from 'vs/base/common/observableInternal/utils';
-import { isUndefined } from 'vs/base/common/types';
-import { CoreEditingCommands } from 'vs/editor/browser/coreCommands';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { observableCodeEditor, reactToChange, reactToChangeWithStore } from 'vs/editor/browser/observableUtilities';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { CursorChangeReason } from 'vs/editor/common/cursorEvents';
-import { ILanguageFeatureDebounceService } from 'vs/editor/common/services/languageFeatureDebounce';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { inlineSuggestCommitId } from 'vs/editor/contrib/inlineCompletions/browser/commandIds';
-import { GhostTextWidget } from 'vs/editor/contrib/inlineCompletions/browser/ghostTextWidget';
-import { InlineCompletionContextKeys } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionContextKeys';
-import { InlineCompletionsHintsWidget, InlineSuggestionHintsContentWidget } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget';
-import { InlineCompletionsModel } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel';
-import { SuggestWidgetAdaptor } from 'vs/editor/contrib/inlineCompletions/browser/suggestWidgetInlineCompletionProvider';
-import { localize } from 'vs/nls';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { AccessibilitySignal, IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { createStyleSheetFromObservable } from '../../../../../base/browser/domObservable.js';
+import { alert } from '../../../../../base/browser/ui/aria/aria.js';
+import { timeout } from '../../../../../base/common/async.js';
+import { cancelOnDispose } from '../../../../../base/common/cancellation.js';
+import { createHotClass, readHotReloadableExport } from '../../../../../base/common/hotReloadHelpers.js';
+import { Disposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { ITransaction, autorun, constObservable, derived, derivedDisposable, derivedObservableWithCache, mapObservableArrayCached, observableFromEvent, observableSignal, runOnChange, runOnChangeWithStore, transaction, waitForState } from '../../../../../base/common/observable.js';
+import { isUndefined } from '../../../../../base/common/types.js';
+import { localize } from '../../../../../nls.js';
+import { IAccessibilityService } from '../../../../../platform/accessibility/common/accessibility.js';
+import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { bindContextKey } from '../../../../../platform/observable/common/platformObservableUtils.js';
+import { hotClassGetOriginalInstance } from '../../../../../platform/observable/common/wrapInHotClass.js';
+import { CoreEditingCommands } from '../../../../browser/coreCommands.js';
+import { ICodeEditor } from '../../../../browser/editorBrowser.js';
+import { observableCodeEditor } from '../../../../browser/observableCodeEditor.js';
+import { EditorOption } from '../../../../common/config/editorOptions.js';
+import { LineRange } from '../../../../common/core/lineRange.js';
+import { Position } from '../../../../common/core/position.js';
+import { Range } from '../../../../common/core/range.js';
+import { CursorChangeReason } from '../../../../common/cursorEvents.js';
+import { ILanguageFeatureDebounceService } from '../../../../common/services/languageFeatureDebounce.js';
+import { ILanguageFeaturesService } from '../../../../common/services/languageFeatures.js';
+import { InlineCompletionsHintsWidget, InlineSuggestionHintsContentWidget } from '../hintsWidget/inlineCompletionsHintsWidget.js';
+import { InlineCompletionsModel } from '../model/inlineCompletionsModel.js';
+import { SuggestWidgetAdaptor } from '../model/suggestWidgetAdaptor.js';
+import { convertItemsToStableObservables } from '../utils.js';
+import { GhostTextView } from '../view/ghostText/ghostTextView.js';
+import { InlineEditsViewAndDiffProducer } from '../view/inlineEdits/inlineEditsView.js';
+import { inlineSuggestCommitId } from './commandIds.js';
+import { InlineCompletionContextKeys } from './inlineCompletionContextKeys.js';
 
 export class InlineCompletionsController extends Disposable {
+	public static hot = createHotClass(InlineCompletionsController);
+
 	static ID = 'editor.contrib.inlineCompletionsController';
 
 	public static get(editor: ICodeEditor): InlineCompletionsController | null {
-		return editor.getContribution<InlineCompletionsController>(InlineCompletionsController.ID);
+		return hotClassGetOriginalInstance(editor.getContribution<InlineCompletionsController>(InlineCompletionsController.ID));
 	}
 
 	private readonly _editorObs = observableCodeEditor(this.editor);
-	private readonly _positions = derived(this, reader => this._editorObs.positions.read(reader) ?? [new Position(1, 1)]);
+	private readonly _positions = derived(this, reader => this._editorObs.selections.read(reader)?.map(s => s.getEndPosition()) ?? [new Position(1, 1)]);
 
 	private readonly _suggestWidgetAdaptor = this._register(new SuggestWidgetAdaptor(
 		this.editor,
@@ -59,14 +64,14 @@ export class InlineCompletionsController extends Disposable {
 		})
 	));
 
-	private readonly _suggestWidgetSelectedItem = observableFromEvent(cb => this._suggestWidgetAdaptor.onDidSelectedItemChange(() => {
+	private readonly _suggestWidgetSelectedItem = observableFromEvent(this, cb => this._suggestWidgetAdaptor.onDidSelectedItemChange(() => {
 		this._editorObs.forceUpdate(_tx => cb(undefined));
 	}), () => this._suggestWidgetAdaptor.selectedItem);
 
 
-	private readonly _enabledInConfig = observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.inlineSuggest).enabled);
-	private readonly _isScreenReaderEnabled = observableFromEvent(this._accessibilityService.onDidChangeScreenReaderOptimized, () => this._accessibilityService.isScreenReaderOptimized());
-	private readonly _editorDictationInProgress = observableFromEvent(
+	private readonly _enabledInConfig = observableFromEvent(this, this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.inlineSuggest).enabled);
+	private readonly _isScreenReaderEnabled = observableFromEvent(this, this._accessibilityService.onDidChangeScreenReaderOptimized, () => this._accessibilityService.isScreenReaderOptimized());
+	private readonly _editorDictationInProgress = observableFromEvent(this,
 		this._contextKeyService.onDidChangeContext,
 		() => this._contextKeyService.getContext(this.editor.getDomNode()).getValue('editorDictation.inProgress') === true
 	);
@@ -105,16 +110,32 @@ export class InlineCompletionsController extends Disposable {
 	private readonly _stablizedGhostTexts = convertItemsToStableObservables(this._ghostTexts, this._store);
 
 	private readonly _ghostTextWidgets = mapObservableArrayCached(this, this._stablizedGhostTexts, (ghostText, store) =>
-		store.add(this._instantiationService.createInstance(GhostTextWidget, this.editor, {
-			ghostText: ghostText,
-			minReservedLineCount: constObservable(0),
-			targetTextModel: this.model.map(v => v?.textModel),
-		}))
+		derivedDisposable((reader) =>
+			this._instantiationService.createInstance(readHotReloadableExport(GhostTextView, reader), this.editor, {
+				ghostText: ghostText,
+				minReservedLineCount: constObservable(0),
+				targetTextModel: this.model.map(v => v?.textModel),
+			})
+		).recomputeInitiallyAndOnChange(store)
 	).recomputeInitiallyAndOnChange(this._store);
 
+	private readonly _inlineEdit = derived(this, reader => {
+		const s = this.model.read(reader)?.stateWithInlineEdit.read(reader);
+		if (s?.kind === 'inlineEdit') {
+			return s.inlineEdit;
+		}
+		return undefined;
+	});
+	private readonly _everHadInlineEdit = derivedObservableWithCache<boolean>(this, (reader, last) => last || !!this._inlineEdit.read(reader));
+	protected readonly _inlineEditWidget = derivedDisposable(reader => {
+		if (!this._everHadInlineEdit.read(reader)) { return undefined; }
+		return this._instantiationService.createInstance(InlineEditsViewAndDiffProducer.hot.read(reader), this.editor, this._inlineEdit);
+	})
+		.recomputeInitiallyAndOnChange(this._store);
+
 	private readonly _playAccessibilitySignal = observableSignal(this);
 
-	private readonly _fontFamily = observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.inlineSuggest).fontFamily);
+	private readonly _fontFamily = this._editorObs.getOption(EditorOption.inlineSuggest).map(val => val.fontFamily);
 
 	constructor(
 		public readonly editor: ICodeEditor,
@@ -132,7 +153,7 @@ export class InlineCompletionsController extends Disposable {
 
 		this._register(new InlineCompletionContextKeys(this._contextKeyService, this.model));
 
-		this._register(reactToChange(this._editorObs.onDidType, (_value, _changes) => {
+		this._register(runOnChange(this._editorObs.onDidType, (_value, _changes) => {
 			if (this._enabled.get()) {
 				this.model.get()?.trigger();
 			}
@@ -155,7 +176,7 @@ export class InlineCompletionsController extends Disposable {
 			}
 		}));
 
-		this._register(reactToChange(this._editorObs.selections, (_value, changes) => {
+		this._register(runOnChange(this._editorObs.selections, (_value, _, changes) => {
 			if (changes.some(e => e.reason === CursorChangeReason.Explicit || e.source === 'api')) {
 				this.model.get()?.stop();
 			}
@@ -199,11 +220,11 @@ export class InlineCompletionsController extends Disposable {
 			}
 			return state?.inlineCompletion?.semanticId;
 		});
-		this._register(reactToChangeWithStore(derived(reader => {
+		this._register(runOnChangeWithStore(derived(reader => {
 			this._playAccessibilitySignal.read(reader);
 			currentInlineCompletionBySemanticId.read(reader);
 			return {};
-		}), async (_value, _deltas, store) => {
+		}), async (_value, _, _deltas, store) => {
 			/** @description InlineCompletionsController.playAccessibilitySignalAndReadSuggestion */
 			const model = this.model.get();
 			const state = model?.state.get();
@@ -239,8 +260,43 @@ export class InlineCompletionsController extends Disposable {
 			}
 		}));
 		this.editor.updateOptions({ inlineCompletionsAccessibilityVerbose: this._configurationService.getValue('accessibility.verbosity.inlineCompletions') });
+
+		this._register(bindContextKey(
+			InlineCompletionContextKeys.cursorInIndentation,
+			this._contextKeyService,
+			reader => this._cursorIsInIndentation.read(reader),
+		));
+
+		this._register(bindContextKey(
+			InlineCompletionContextKeys.hasSelection,
+			this._contextKeyService,
+			reader => !this._editorObs.cursorSelection.read(reader)?.isEmpty(),
+		));
+
+		this._register(bindContextKey(
+			InlineCompletionContextKeys.cursorAtInlineEdit,
+			this._contextKeyService,
+			reader => {
+				const cursorPos = this._editorObs.cursorPosition.read(reader);
+				if (cursorPos === null) { return false; }
+				const edit = this.model.read(reader)?.stateInlineEdit.read(reader);
+				if (!edit) { return false; }
+				return LineRange.fromRangeInclusive(edit.inlineEdit.range).contains(cursorPos.lineNumber);
+			}
+		));
+
 	}
 
+	private readonly _cursorIsInIndentation = derived(this, reader => {
+		const cursorPos = this._editorObs.cursorPosition.read(reader);
+		if (cursorPos === null) { return false; }
+		const model = this._editorObs.model.read(reader);
+		if (!model) { return false; }
+		this._editorObs.versionId.read(reader);
+		const indentMaxColumn = model.getLineIndentColumn(cursorPos.lineNumber);
+		return cursorPos.column <= indentMaxColumn;
+	});
+
 	public playAccessibilitySignal(tx: ITransaction) {
 		this._playAccessibilitySignal.trigger(tx);
 	}
@@ -264,7 +320,7 @@ export class InlineCompletionsController extends Disposable {
 	}
 
 	public shouldShowHoverAtViewZone(viewZoneId: string): boolean {
-		return this._ghostTextWidgets.get()[0]?.ownsViewZone(viewZoneId) ?? false;
+		return this._ghostTextWidgets.get()[0]?.get().ownsViewZone(viewZoneId) ?? false;
 	}
 
 	public hide() {
@@ -272,28 +328,17 @@ export class InlineCompletionsController extends Disposable {
 			this.model.get()?.stop(tx);
 		});
 	}
-}
 
-function convertItemsToStableObservables<T>(items: IObservable<readonly T[]>, store: DisposableStore): IObservable<IObservable<T>[]> {
-	const result = observableValue<IObservable<T>[]>('result', []);
-	const innerObservables: ISettableObservable<T>[] = [];
-
-	store.add(autorun(reader => {
-		const itemsValue = items.read(reader);
+	public jump(): void {
+		const m = this.model.get();
+		const s = m?.stateInlineEdit.get();
+		if (!s) { return; }
 
 		transaction(tx => {
-			if (itemsValue.length !== innerObservables.length) {
-				innerObservables.length = itemsValue.length;
-				for (let i = 0; i < innerObservables.length; i++) {
-					if (!innerObservables[i]) {
-						innerObservables[i] = observableValue<T>('item', itemsValue[i]);
-					}
-				}
-				result.set([...innerObservables], tx);
-			}
-			innerObservables.forEach((o, i) => o.set(itemsValue[i], tx));
+			m!.dontRefetchSignal.trigger(tx);
+			this.editor.setPosition(s.inlineEdit.range.getStartPosition(), 'inlineCompletions.jump');
+			this.editor.revealLine(s.inlineEdit.range.startLineNumber);
+			this.editor.focus();
 		});
-	}));
-
-	return result;
+	}
 }
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/ghostTextWidget.ts b/src/vs/editor/contrib/inlineCompletions/browser/ghostTextWidget.ts
deleted file mode 100644
index 0c93d8465ab..00000000000
--- a/src/vs/editor/contrib/inlineCompletions/browser/ghostTextWidget.ts
+++ /dev/null
@@ -1,328 +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 { createTrustedTypesPolicy } from 'vs/base/browser/trustedTypes';
-import { Event } from 'vs/base/common/event';
-import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IObservable, autorun, derived, observableFromEvent, observableSignalFromEvent, observableValue } from 'vs/base/common/observable';
-import * as strings from 'vs/base/common/strings';
-import 'vs/css!./ghostText';
-import { applyFontInfo } from 'vs/editor/browser/config/domFontInfo';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorFontLigatures, EditorOption, IComputedEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { StringBuilder } from 'vs/editor/common/core/stringBuilder';
-import { ILanguageIdCodec } from 'vs/editor/common/languages';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IModelDeltaDecoration, ITextModel, InjectedTextCursorStops, PositionAffinity } from 'vs/editor/common/model';
-import { LineTokens } from 'vs/editor/common/tokens/lineTokens';
-import { LineDecoration } from 'vs/editor/common/viewLayout/lineDecorations';
-import { RenderLineInput, renderViewLine } from 'vs/editor/common/viewLayout/viewLineRenderer';
-import { InlineDecorationType } from 'vs/editor/common/viewModel';
-import { GhostText, GhostTextReplacement } from 'vs/editor/contrib/inlineCompletions/browser/ghostText';
-import { ColumnRange, applyObservableDecorations } from 'vs/editor/contrib/inlineCompletions/browser/utils';
-
-export const GHOST_TEXT_DESCRIPTION = 'ghost-text';
-export interface IGhostTextWidgetModel {
-	readonly targetTextModel: IObservable<ITextModel | undefined>;
-	readonly ghostText: IObservable<GhostText | GhostTextReplacement | undefined>;
-	readonly minReservedLineCount: IObservable<number>;
-}
-
-export class GhostTextWidget extends Disposable {
-	private readonly isDisposed = observableValue(this, false);
-	private readonly currentTextModel = observableFromEvent(this.editor.onDidChangeModel, () => /** @description editor.model */ this.editor.getModel());
-
-	constructor(
-		private readonly editor: ICodeEditor,
-		private readonly model: IGhostTextWidgetModel,
-		@ILanguageService private readonly languageService: ILanguageService,
-	) {
-		super();
-
-		this._register(toDisposable(() => { this.isDisposed.set(true, undefined); }));
-		this._register(applyObservableDecorations(this.editor, this.decorations));
-	}
-
-	private readonly uiState = derived(this, reader => {
-		if (this.isDisposed.read(reader)) {
-			return undefined;
-		}
-		const textModel = this.currentTextModel.read(reader);
-		if (textModel !== this.model.targetTextModel.read(reader)) {
-			return undefined;
-		}
-		const ghostText = this.model.ghostText.read(reader);
-		if (!ghostText) {
-			return undefined;
-		}
-
-		const replacedRange = ghostText instanceof GhostTextReplacement ? ghostText.columnRange : undefined;
-
-		const inlineTexts: { column: number; text: string; preview: boolean }[] = [];
-		const additionalLines: LineData[] = [];
-
-		function addToAdditionalLines(lines: readonly string[], className: string | undefined) {
-			if (additionalLines.length > 0) {
-				const lastLine = additionalLines[additionalLines.length - 1];
-				if (className) {
-					lastLine.decorations.push(new LineDecoration(lastLine.content.length + 1, lastLine.content.length + 1 + lines[0].length, className, InlineDecorationType.Regular));
-				}
-				lastLine.content += lines[0];
-
-				lines = lines.slice(1);
-			}
-			for (const line of lines) {
-				additionalLines.push({
-					content: line,
-					decorations: className ? [new LineDecoration(1, line.length + 1, className, InlineDecorationType.Regular)] : []
-				});
-			}
-		}
-
-		const textBufferLine = textModel.getLineContent(ghostText.lineNumber);
-
-		let hiddenTextStartColumn: number | undefined = undefined;
-		let lastIdx = 0;
-		for (const part of ghostText.parts) {
-			let lines = part.lines;
-			if (hiddenTextStartColumn === undefined) {
-				inlineTexts.push({
-					column: part.column,
-					text: lines[0],
-					preview: part.preview,
-				});
-				lines = lines.slice(1);
-			} else {
-				addToAdditionalLines([textBufferLine.substring(lastIdx, part.column - 1)], undefined);
-			}
-
-			if (lines.length > 0) {
-				addToAdditionalLines(lines, GHOST_TEXT_DESCRIPTION);
-				if (hiddenTextStartColumn === undefined && part.column <= textBufferLine.length) {
-					hiddenTextStartColumn = part.column;
-				}
-			}
-
-			lastIdx = part.column - 1;
-		}
-		if (hiddenTextStartColumn !== undefined) {
-			addToAdditionalLines([textBufferLine.substring(lastIdx)], undefined);
-		}
-
-		const hiddenRange = hiddenTextStartColumn !== undefined ? new ColumnRange(hiddenTextStartColumn, textBufferLine.length + 1) : undefined;
-
-		return {
-			replacedRange,
-			inlineTexts,
-			additionalLines,
-			hiddenRange,
-			lineNumber: ghostText.lineNumber,
-			additionalReservedLineCount: this.model.minReservedLineCount.read(reader),
-			targetTextModel: textModel,
-		};
-	});
-
-	private readonly decorations = derived(this, reader => {
-		const uiState = this.uiState.read(reader);
-		if (!uiState) {
-			return [];
-		}
-
-		const decorations: IModelDeltaDecoration[] = [];
-
-		if (uiState.replacedRange) {
-			decorations.push({
-				range: uiState.replacedRange.toRange(uiState.lineNumber),
-				options: { inlineClassName: 'inline-completion-text-to-replace', description: 'GhostTextReplacement' }
-			});
-		}
-
-		if (uiState.hiddenRange) {
-			decorations.push({
-				range: uiState.hiddenRange.toRange(uiState.lineNumber),
-				options: { inlineClassName: 'ghost-text-hidden', description: 'ghost-text-hidden', }
-			});
-		}
-
-		for (const p of uiState.inlineTexts) {
-			decorations.push({
-				range: Range.fromPositions(new Position(uiState.lineNumber, p.column)),
-				options: {
-					description: GHOST_TEXT_DESCRIPTION,
-					after: { content: p.text, inlineClassName: p.preview ? 'ghost-text-decoration-preview' : 'ghost-text-decoration', cursorStops: InjectedTextCursorStops.Left },
-					showIfCollapsed: true,
-				}
-			});
-		}
-
-		return decorations;
-	});
-
-	private readonly additionalLinesWidget = this._register(
-		new AdditionalLinesWidget(
-			this.editor,
-			this.languageService.languageIdCodec,
-			derived(reader => {
-				/** @description lines */
-				const uiState = this.uiState.read(reader);
-				return uiState ? {
-					lineNumber: uiState.lineNumber,
-					additionalLines: uiState.additionalLines,
-					minReservedLineCount: uiState.additionalReservedLineCount,
-					targetTextModel: uiState.targetTextModel,
-				} : undefined;
-			})
-		)
-	);
-
-	public ownsViewZone(viewZoneId: string): boolean {
-		return this.additionalLinesWidget.viewZoneId === viewZoneId;
-	}
-}
-
-export class AdditionalLinesWidget extends Disposable {
-	private _viewZoneId: string | undefined = undefined;
-	public get viewZoneId(): string | undefined { return this._viewZoneId; }
-
-	private readonly editorOptionsChanged = observableSignalFromEvent('editorOptionChanged', Event.filter(
-		this.editor.onDidChangeConfiguration,
-		e => e.hasChanged(EditorOption.disableMonospaceOptimizations)
-			|| e.hasChanged(EditorOption.stopRenderingLineAfter)
-			|| e.hasChanged(EditorOption.renderWhitespace)
-			|| e.hasChanged(EditorOption.renderControlCharacters)
-			|| e.hasChanged(EditorOption.fontLigatures)
-			|| e.hasChanged(EditorOption.fontInfo)
-			|| e.hasChanged(EditorOption.lineHeight)
-	));
-
-	constructor(
-		private readonly editor: ICodeEditor,
-		private readonly languageIdCodec: ILanguageIdCodec,
-		private readonly lines: IObservable<{ targetTextModel: ITextModel; lineNumber: number; additionalLines: LineData[]; minReservedLineCount: number } | undefined>
-	) {
-		super();
-
-		this._register(autorun(reader => {
-			/** @description update view zone */
-			const lines = this.lines.read(reader);
-			this.editorOptionsChanged.read(reader);
-
-			if (lines) {
-				this.updateLines(lines.lineNumber, lines.additionalLines, lines.minReservedLineCount);
-			} else {
-				this.clear();
-			}
-		}));
-	}
-
-	public override dispose(): void {
-		super.dispose();
-		this.clear();
-	}
-
-	private clear(): void {
-		this.editor.changeViewZones((changeAccessor) => {
-			if (this._viewZoneId) {
-				changeAccessor.removeZone(this._viewZoneId);
-				this._viewZoneId = undefined;
-			}
-		});
-	}
-
-	private updateLines(lineNumber: number, additionalLines: LineData[], minReservedLineCount: number): void {
-		const textModel = this.editor.getModel();
-		if (!textModel) {
-			return;
-		}
-
-		const { tabSize } = textModel.getOptions();
-
-		this.editor.changeViewZones((changeAccessor) => {
-			if (this._viewZoneId) {
-				changeAccessor.removeZone(this._viewZoneId);
-				this._viewZoneId = undefined;
-			}
-
-			const heightInLines = Math.max(additionalLines.length, minReservedLineCount);
-			if (heightInLines > 0) {
-				const domNode = document.createElement('div');
-				renderLines(domNode, tabSize, additionalLines, this.editor.getOptions(), this.languageIdCodec);
-
-				this._viewZoneId = changeAccessor.addZone({
-					afterLineNumber: lineNumber,
-					heightInLines: heightInLines,
-					domNode,
-					afterColumnAffinity: PositionAffinity.Right
-				});
-			}
-		});
-	}
-}
-
-export interface LineData {
-	content: string; // Must not contain a linebreak!
-	decorations: LineDecoration[];
-}
-
-function renderLines(domNode: HTMLElement, tabSize: number, lines: LineData[], opts: IComputedEditorOptions, languageIdCodec: ILanguageIdCodec): void {
-	const disableMonospaceOptimizations = opts.get(EditorOption.disableMonospaceOptimizations);
-	const stopRenderingLineAfter = opts.get(EditorOption.stopRenderingLineAfter);
-	// To avoid visual confusion, we don't want to render visible whitespace
-	const renderWhitespace = 'none';
-	const renderControlCharacters = opts.get(EditorOption.renderControlCharacters);
-	const fontLigatures = opts.get(EditorOption.fontLigatures);
-	const fontInfo = opts.get(EditorOption.fontInfo);
-	const lineHeight = opts.get(EditorOption.lineHeight);
-
-	const sb = new StringBuilder(10000);
-	sb.appendString('<div class="suggest-preview-text">');
-
-	for (let i = 0, len = lines.length; i < len; i++) {
-		const lineData = lines[i];
-		const line = lineData.content;
-		sb.appendString('<div class="view-line');
-		sb.appendString('" style="top:');
-		sb.appendString(String(i * lineHeight));
-		sb.appendString('px;width:1000000px;">');
-
-		const isBasicASCII = strings.isBasicASCII(line);
-		const containsRTL = strings.containsRTL(line);
-		const lineTokens = LineTokens.createEmpty(line, languageIdCodec);
-
-		renderViewLine(new RenderLineInput(
-			(fontInfo.isMonospace && !disableMonospaceOptimizations),
-			fontInfo.canUseHalfwidthRightwardsArrow,
-			line,
-			false,
-			isBasicASCII,
-			containsRTL,
-			0,
-			lineTokens,
-			lineData.decorations,
-			tabSize,
-			0,
-			fontInfo.spaceWidth,
-			fontInfo.middotWidth,
-			fontInfo.wsmiddotWidth,
-			stopRenderingLineAfter,
-			renderWhitespace,
-			renderControlCharacters,
-			fontLigatures !== EditorFontLigatures.OFF,
-			null
-		), sb);
-
-		sb.appendString('</div>');
-	}
-	sb.appendString('</div>');
-
-	applyFontInfo(domNode, fontInfo);
-	const html = sb.build();
-	const trustedhtml = ttPolicy ? ttPolicy.createHTML(html) : html;
-	domNode.innerHTML = trustedhtml as string;
-}
-
-export const ttPolicy = createTrustedTypesPolicy('editorGhostText', { createHTML: value => value });
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/hoverParticipant.ts b/src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/hoverParticipant.ts
similarity index 66%
rename from src/vs/editor/contrib/inlineCompletions/browser/hoverParticipant.ts
rename to src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/hoverParticipant.ts
index 90d4ffcba0c..fefa9400dfc 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/hoverParticipant.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/hoverParticipant.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { autorun, constObservable } from 'vs/base/common/observable';
-import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Range } from 'vs/editor/common/core/range';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IModelDecoration } from 'vs/editor/common/model';
-import { HoverAnchor, HoverAnchorType, HoverForeignElementAnchor, IEditorHoverParticipant, IEditorHoverRenderContext, IHoverPart } from 'vs/editor/contrib/hover/browser/hoverTypes';
-import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController';
-import { InlineSuggestionHintsContentWidget } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget';
-import { MarkdownRenderer } from 'vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
-import * as nls from 'vs/nls';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import * as dom from '../../../../../base/browser/dom.js';
+import { MarkdownString } from '../../../../../base/common/htmlContent.js';
+import { DisposableStore, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { autorun, constObservable } from '../../../../../base/common/observable.js';
+import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from '../../../../browser/editorBrowser.js';
+import { EditorOption } from '../../../../common/config/editorOptions.js';
+import { Range } from '../../../../common/core/range.js';
+import { ILanguageService } from '../../../../common/languages/language.js';
+import { IModelDecoration } from '../../../../common/model.js';
+import { HoverAnchor, HoverAnchorType, HoverForeignElementAnchor, IEditorHoverParticipant, IEditorHoverRenderContext, IHoverPart, IRenderedHoverPart, IRenderedHoverParts, RenderedHoverParts } from '../../../hover/browser/hoverTypes.js';
+import { InlineCompletionsController } from '../controller/inlineCompletionsController.js';
+import { InlineSuggestionHintsContentWidget } from './inlineCompletionsHintsWidget.js';
+import { MarkdownRenderer } from '../../../../browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import * as nls from '../../../../../nls.js';
+import { IAccessibilityService } from '../../../../../platform/accessibility/common/accessibility.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
 
 export class InlineCompletionsHover implements IHoverPart {
 	constructor(
@@ -94,8 +94,8 @@ export class InlineCompletionsHoverParticipant implements IEditorHoverParticipan
 		return [];
 	}
 
-	renderHoverParts(context: IEditorHoverRenderContext, hoverParts: InlineCompletionsHover[]): IDisposable {
-		const disposableStore = new DisposableStore();
+	renderHoverParts(context: IEditorHoverRenderContext, hoverParts: InlineCompletionsHover[]): IRenderedHoverParts<InlineCompletionsHover> {
+		const disposables = new DisposableStore();
 		const part = hoverParts[0];
 
 		this._telemetryService.publicLog2<{}, {
@@ -104,7 +104,7 @@ export class InlineCompletionsHoverParticipant implements IEditorHoverParticipan
 		}>('inlineCompletionHover.shown');
 
 		if (this.accessibilityService.isScreenReaderOptimized() && !this._editor.getOption(EditorOption.screenReaderAnnounceInlineSuggestion)) {
-			this.renderScreenReaderText(context, part, disposableStore);
+			disposables.add(this.renderScreenReaderText(context, part));
 		}
 
 		const model = part.controller.model.get()!;
@@ -115,32 +115,42 @@ export class InlineCompletionsHoverParticipant implements IEditorHoverParticipan
 			model.inlineCompletionsCount,
 			model.activeCommands,
 		);
-		context.fragment.appendChild(w.getDomNode());
+		const widgetNode: HTMLElement = w.getDomNode();
+		context.fragment.appendChild(widgetNode);
 
 		model.triggerExplicitly();
 
-		disposableStore.add(w);
-
-		return disposableStore;
+		disposables.add(w);
+		const renderedHoverPart: IRenderedHoverPart<InlineCompletionsHover> = {
+			hoverPart: part,
+			hoverElement: widgetNode,
+			dispose() { disposables.dispose(); }
+		};
+		return new RenderedHoverParts([renderedHoverPart]);
 	}
 
-	private renderScreenReaderText(context: IEditorHoverRenderContext, part: InlineCompletionsHover, disposableStore: DisposableStore) {
+	getAccessibleContent(hoverPart: InlineCompletionsHover): string {
+		return nls.localize('hoverAccessibilityStatusBar', 'There are inline completions here');
+	}
+
+	private renderScreenReaderText(context: IEditorHoverRenderContext, part: InlineCompletionsHover): IDisposable {
+		const disposables = new DisposableStore();
 		const $ = dom.$;
 		const markdownHoverElement = $('div.hover-row.markdown-hover');
 		const hoverContentsElement = dom.append(markdownHoverElement, $('div.hover-contents', { ['aria-live']: 'assertive' }));
-		const renderer = disposableStore.add(new MarkdownRenderer({ editor: this._editor }, this._languageService, this._openerService));
+		const renderer = disposables.add(new MarkdownRenderer({ editor: this._editor }, this._languageService, this._openerService));
 		const render = (code: string) => {
-			disposableStore.add(renderer.onDidRenderAsync(() => {
+			disposables.add(renderer.onDidRenderAsync(() => {
 				hoverContentsElement.className = 'hover-contents code-hover-contents';
 				context.onContentsChanged();
 			}));
 
 			const inlineSuggestionAvailable = nls.localize('inlineSuggestionFollows', "Suggestion:");
-			const renderedContents = disposableStore.add(renderer.render(new MarkdownString().appendText(inlineSuggestionAvailable).appendCodeblock('text', code)));
+			const renderedContents = disposables.add(renderer.render(new MarkdownString().appendText(inlineSuggestionAvailable).appendCodeblock('text', code)));
 			hoverContentsElement.replaceChildren(renderedContents.element);
 		};
 
-		disposableStore.add(autorun(reader => {
+		disposables.add(autorun(reader => {
 			/** @description update hover */
 			const ghostText = part.controller.model.read(reader)?.primaryGhostText.read(reader);
 			if (ghostText) {
@@ -152,5 +162,6 @@ export class InlineCompletionsHoverParticipant implements IEditorHoverParticipan
 		}));
 
 		context.fragment.appendChild(markdownHoverElement);
+		return disposables;
 	}
 }
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget.css b/src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.css
similarity index 100%
rename from src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget.css
rename to src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.css
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget.ts b/src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.ts
similarity index 83%
rename from src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget.ts
rename to src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.ts
index 9f7d3d17ba8..1625099889f 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.ts
@@ -3,40 +3,39 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { h } from 'vs/base/browser/dom';
-import { ActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { KeybindingLabel, unthemedKeybindingLabelOptions } from 'vs/base/browser/ui/keybindingLabel/keybindingLabel';
-import { Action, IAction, Separator } from 'vs/base/common/actions';
-import { equals } from 'vs/base/common/arrays';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { Codicon } from 'vs/base/common/codicons';
-import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IObservable, autorun, autorunWithStore, derived, derivedObservableWithCache, observableFromEvent } from 'vs/base/common/observable';
-import { derivedWithStore } from 'vs/base/common/observableInternal/derived';
-import { OS } from 'vs/base/common/platform';
-import { ThemeIcon } from 'vs/base/common/themables';
-import 'vs/css!./inlineCompletionsHintsWidget';
-import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from 'vs/editor/browser/editorBrowser';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Position } from 'vs/editor/common/core/position';
-import { Command, InlineCompletionTriggerKind } from 'vs/editor/common/languages';
-import { PositionAffinity } from 'vs/editor/common/model';
-import { showNextInlineSuggestionActionId, showPreviousInlineSuggestionActionId } from 'vs/editor/contrib/inlineCompletions/browser/commandIds';
-import { InlineCompletionsModel } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel';
-import { localize } from 'vs/nls';
-import { MenuEntryActionViewItem, createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IMenuWorkbenchToolBarOptions, WorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
-import { IMenuService, MenuId, MenuItemAction } from 'vs/platform/actions/common/actions';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
+import { h } from '../../../../../base/browser/dom.js';
+import { ActionViewItem } from '../../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { KeybindingLabel, unthemedKeybindingLabelOptions } from '../../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
+import { Action, IAction, Separator } from '../../../../../base/common/actions.js';
+import { equals } from '../../../../../base/common/arrays.js';
+import { RunOnceScheduler } from '../../../../../base/common/async.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { Disposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { IObservable, autorun, autorunWithStore, derived, derivedObservableWithCache, derivedWithStore, observableFromEvent } from '../../../../../base/common/observable.js';
+import { OS } from '../../../../../base/common/platform.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { localize } from '../../../../../nls.js';
+import { MenuEntryActionViewItem, createAndFillInActionBarActions } from '../../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IMenuWorkbenchToolBarOptions, WorkbenchToolBar } from '../../../../../platform/actions/browser/toolbar.js';
+import { IMenuService, MenuId, MenuItemAction } from '../../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { registerIcon } from '../../../../../platform/theme/common/iconRegistry.js';
+import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from '../../../../browser/editorBrowser.js';
+import { EditorOption } from '../../../../common/config/editorOptions.js';
+import { Position } from '../../../../common/core/position.js';
+import { Command, InlineCompletionTriggerKind } from '../../../../common/languages.js';
+import { PositionAffinity } from '../../../../common/model.js';
+import { showNextInlineSuggestionActionId, showPreviousInlineSuggestionActionId } from '../controller/commandIds.js';
+import { InlineCompletionsModel } from '../model/inlineCompletionsModel.js';
+import './inlineCompletionsHintsWidget.css';
 
 export class InlineCompletionsHintsWidget extends Disposable {
-	private readonly alwaysShowToolbar = observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.inlineSuggest).showToolbar === 'always');
+	private readonly alwaysShowToolbar = observableFromEvent(this, this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.inlineSuggest).showToolbar === 'always');
 
 	private sessionPosition: Position | undefined = undefined;
 
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletions.contribution.ts b/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletions.contribution.ts
index 2819af72061..321a2d2e3d7 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletions.contribution.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletions.contribution.ts
@@ -3,16 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { EditorContributionInstantiation, registerEditorAction, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { HoverParticipantRegistry } from 'vs/editor/contrib/hover/browser/hoverTypes';
-import { TriggerInlineSuggestionAction, ShowNextInlineSuggestionAction, ShowPreviousInlineSuggestionAction, AcceptNextWordOfInlineCompletion, AcceptInlineCompletion, HideInlineCompletion, ToggleAlwaysShowInlineSuggestionToolbar, AcceptNextLineOfInlineCompletion } from 'vs/editor/contrib/inlineCompletions/browser/commands';
-import { InlineCompletionsHoverParticipant } from 'vs/editor/contrib/inlineCompletions/browser/hoverParticipant';
-import { InlineCompletionsAccessibleView } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsAccessibleView';
-import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController';
-import { AccessibleViewRegistry } from 'vs/platform/accessibility/browser/accessibleViewRegistry';
-import { registerAction2 } from 'vs/platform/actions/common/actions';
+import { AccessibleViewRegistry } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
+import { registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { wrapInHotClass1 } from '../../../../platform/observable/common/wrapInHotClass.js';
+import { EditorContributionInstantiation, registerEditorAction, registerEditorContribution } from '../../../browser/editorExtensions.js';
+import { HoverParticipantRegistry } from '../../hover/browser/hoverTypes.js';
+import { AcceptInlineCompletion, AcceptNextLineOfInlineCompletion, AcceptNextWordOfInlineCompletion, HideInlineCompletion, JumpToNextInlineEdit, ShowNextInlineSuggestionAction, ShowPreviousInlineSuggestionAction, ToggleAlwaysShowInlineSuggestionToolbar, TriggerInlineSuggestionAction } from './controller/commands.js';
+import { InlineCompletionsController } from './controller/inlineCompletionsController.js';
+import { InlineCompletionsHoverParticipant } from './hintsWidget/hoverParticipant.js';
+import { InlineCompletionsAccessibleView } from './inlineCompletionsAccessibleView.js';
+import { InlineEditsAdapterContribution } from './model/inlineEditsAdapter.js';
 
-registerEditorContribution(InlineCompletionsController.ID, InlineCompletionsController, EditorContributionInstantiation.Eventually);
+registerEditorContribution(InlineEditsAdapterContribution.ID, InlineEditsAdapterContribution, EditorContributionInstantiation.Eventually);
+
+
+registerEditorContribution(InlineCompletionsController.ID, wrapInHotClass1(InlineCompletionsController.hot), EditorContributionInstantiation.Eventually);
 
 registerEditorAction(TriggerInlineSuggestionAction);
 registerEditorAction(ShowNextInlineSuggestionAction);
@@ -21,8 +26,8 @@ registerEditorAction(AcceptNextWordOfInlineCompletion);
 registerEditorAction(AcceptNextLineOfInlineCompletion);
 registerEditorAction(AcceptInlineCompletion);
 registerEditorAction(HideInlineCompletion);
+registerEditorAction(JumpToNextInlineEdit);
 registerAction2(ToggleAlwaysShowInlineSuggestionToolbar);
 
 HoverParticipantRegistry.register(InlineCompletionsHoverParticipant);
-
 AccessibleViewRegistry.register(new InlineCompletionsAccessibleView());
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsAccessibleView.ts b/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsAccessibleView.ts
index 6182681a3b5..e0954e2bd8e 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsAccessibleView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsAccessibleView.ts
@@ -3,60 +3,77 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { InlineCompletionContextKeys } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionContextKeys';
-import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController';
-import { AccessibleViewType, AccessibleViewProviderId } from 'vs/platform/accessibility/browser/accessibleView';
-import { IAccessibleViewImplentation } from 'vs/platform/accessibility/browser/accessibleViewRegistry';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { ICodeEditorService } from '../../../browser/services/codeEditorService.js';
+import { InlineCompletionContextKeys } from './controller/inlineCompletionContextKeys.js';
+import { InlineCompletionsController } from './controller/inlineCompletionsController.js';
+import { AccessibleViewType, AccessibleViewProviderId, IAccessibleViewContentProvider } from '../../../../platform/accessibility/browser/accessibleView.js';
+import { IAccessibleViewImplentation } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { InlineCompletionsModel } from './model/inlineCompletionsModel.js';
 
-export class InlineCompletionsAccessibleView extends Disposable implements IAccessibleViewImplentation {
+export class InlineCompletionsAccessibleView implements IAccessibleViewImplentation {
 	readonly type = AccessibleViewType.View;
 	readonly priority = 95;
 	readonly name = 'inline-completions';
 	readonly when = ContextKeyExpr.and(InlineCompletionContextKeys.inlineSuggestionVisible);
 	getProvider(accessor: ServicesAccessor) {
 		const codeEditorService = accessor.get(ICodeEditorService);
-		function resolveProvider() {
-			const editor = codeEditorService.getActiveCodeEditor() || codeEditorService.getFocusedCodeEditor();
-			if (!editor) {
-				return;
-			}
-			const model = InlineCompletionsController.get(editor)?.model.get();
-			const state = model?.state.get();
-			if (!model || !state) {
-				return;
-			}
-			const lineText = model.textModel.getLineContent(state.primaryGhostText.lineNumber);
-			const ghostText = state.primaryGhostText.renderForScreenReader(lineText);
-			if (!ghostText) {
-				return;
-			}
-			const language = editor.getModel()?.getLanguageId() ?? undefined;
-			return {
-				id: AccessibleViewProviderId.InlineCompletions,
-				verbositySettingKey: 'accessibility.verbosity.inlineCompletions',
-				provideContent() { return lineText + ghostText; },
-				onClose() {
-					model.stop();
-					editor.focus();
-				},
-				next() {
-					model.next();
-					setTimeout(() => resolveProvider(), 50);
-				},
-				previous() {
-					model.previous();
-					setTimeout(() => resolveProvider(), 50);
-				},
-				options: { language, type: AccessibleViewType.View }
-			};
+		const editor = codeEditorService.getActiveCodeEditor() || codeEditorService.getFocusedCodeEditor();
+		if (!editor) {
+			return;
 		}
-		return resolveProvider();
-	}
-	constructor() {
-		super();
+
+		const model = InlineCompletionsController.get(editor)?.model.get();
+		if (!model?.state.get()) {
+			return;
+		}
+
+		return new InlineCompletionsAccessibleViewContentProvider(editor, model);
+	}
+}
+
+class InlineCompletionsAccessibleViewContentProvider extends Disposable implements IAccessibleViewContentProvider {
+	private readonly _onDidChangeContent: Emitter<void> = this._register(new Emitter<void>());
+	public readonly onDidChangeContent: Event<void> = this._onDidChangeContent.event;
+	constructor(
+		private readonly _editor: ICodeEditor,
+		private readonly _model: InlineCompletionsModel,
+	) {
+		super();
+	}
+
+	public readonly id = AccessibleViewProviderId.InlineCompletions;
+	public readonly verbositySettingKey = 'accessibility.verbosity.inlineCompletions';
+	public readonly options = { language: this._editor.getModel()?.getLanguageId() ?? undefined, type: AccessibleViewType.View };
+
+	public provideContent(): string {
+		const state = this._model.state.get();
+		if (!state) {
+			throw new Error('Inline completion is visible but state is not available');
+		}
+		const lineText = this._model.textModel.getLineContent(state.primaryGhostText.lineNumber);
+		const ghostText = state.primaryGhostText.renderForScreenReader(lineText);
+		if (!ghostText) {
+			throw new Error('Inline completion is visible but ghost text is not available');
+		}
+		return lineText + ghostText;
+	}
+	public provideNextContent(): string | undefined {
+		// asynchronously update the model and fire the event
+		this._model.next().then((() => this._onDidChangeContent.fire()));
+		return;
+	}
+	public providePreviousContent(): string | undefined {
+		// asynchronously update the model and fire the event
+		this._model.previous().then((() => this._onDidChangeContent.fire()));
+		return;
+	}
+	public onClose(): void {
+		this._model.stop();
+		this._editor.focus();
 	}
 }
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/singleTextEdit.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/computeGhostText.ts
similarity index 74%
rename from src/vs/editor/contrib/inlineCompletions/browser/singleTextEdit.ts
rename to src/vs/editor/contrib/inlineCompletions/browser/model/computeGhostText.ts
index 750eb459829..f5bf0689028 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/singleTextEdit.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/computeGhostText.ts
@@ -3,32 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDiffChange, LcsDiff } from 'vs/base/common/diff/diff';
-import { commonPrefixLength, getLeadingWhitespace } from 'vs/base/common/strings';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { TextLength } from 'vs/editor/common/core/textLength';
-import { SingleTextEdit } from 'vs/editor/common/core/textEdit';
-import { EndOfLinePreference, ITextModel } from 'vs/editor/common/model';
-import { GhostText, GhostTextPart } from 'vs/editor/contrib/inlineCompletions/browser/ghostText';
-
-export function singleTextRemoveCommonPrefix(edit: SingleTextEdit, model: ITextModel, validModelRange?: Range): SingleTextEdit {
-	const modelRange = validModelRange ? edit.range.intersectRanges(validModelRange) : edit.range;
-	if (!modelRange) {
-		return edit;
-	}
-	const valueToReplace = model.getValueInRange(modelRange, EndOfLinePreference.LF);
-	const commonPrefixLen = commonPrefixLength(valueToReplace, edit.text);
-	const start = TextLength.ofText(valueToReplace.substring(0, commonPrefixLen)).addToPosition(edit.range.getStartPosition());
-	const text = edit.text.substring(commonPrefixLen);
-	const range = Range.fromPositions(start, edit.range.getEndPosition());
-	return new SingleTextEdit(range, text);
-}
-
-export function singleTextEditAugments(edit: SingleTextEdit, base: SingleTextEdit): boolean {
-	// The augmented completion must replace the base range, but can replace even more
-	return edit.text.startsWith(base.text) && rangeExtends(edit.range, base.range);
-}
+import { IDiffChange, LcsDiff } from '../../../../../base/common/diff/diff.js';
+import { getLeadingWhitespace } from '../../../../../base/common/strings.js';
+import { Position } from '../../../../common/core/position.js';
+import { Range } from '../../../../common/core/range.js';
+import { SingleTextEdit } from '../../../../common/core/textEdit.js';
+import { ITextModel } from '../../../../common/model.js';
+import { GhostText, GhostTextPart } from './ghostText.js';
+import { singleTextRemoveCommonPrefix } from './singleTextEditHelpers.js';
 
 /**
  * @param previewSuffixLength Sets where to split `inlineCompletion.text`.
@@ -58,27 +40,23 @@ export function computeGhostText(
 		//              ^^^^^^^^^^ ^^^^^^ sourceIndentationLength
 		//                         ^^^^^^ replacedIndentation.length
 		//                               ^^^ rangeThatDoesNotReplaceIndentation
-
 		// inlineCompletion.text: '··foo'
 		//                         ^^ suggestionAddedIndentationLength
-
 		const suggestionAddedIndentationLength = getLeadingWhitespace(e.text).length;
 
 		const replacedIndentation = sourceLine.substring(e.range.startColumn - 1, sourceIndentationLength);
 
 		const [startPosition, endPosition] = [e.range.getStartPosition(), e.range.getEndPosition()];
-		const newStartPosition =
-			startPosition.column + replacedIndentation.length <= endPosition.column
-				? startPosition.delta(0, replacedIndentation.length)
-				: endPosition;
+		const newStartPosition = startPosition.column + replacedIndentation.length <= endPosition.column
+			? startPosition.delta(0, replacedIndentation.length)
+			: endPosition;
 		const rangeThatDoesNotReplaceIndentation = Range.fromPositions(newStartPosition, endPosition);
 
-		const suggestionWithoutIndentationChange =
-			e.text.startsWith(replacedIndentation)
-				// Adds more indentation without changing existing indentation: We can add ghost text for this
-				? e.text.substring(replacedIndentation.length)
-				// Changes or removes existing indentation. Only add ghost text for the non-indentation part.
-				: e.text.substring(suggestionAddedIndentationLength);
+		const suggestionWithoutIndentationChange = e.text.startsWith(replacedIndentation)
+			// Adds more indentation without changing existing indentation: We can add ghost text for this
+			? e.text.substring(replacedIndentation.length)
+			// Changes or removes existing indentation. Only add ghost text for the non-indentation part.
+			: e.text.substring(suggestionAddedIndentationLength);
 
 		e = new SingleTextEdit(rangeThatDoesNotReplaceIndentation, suggestionWithoutIndentationChange);
 	}
@@ -139,11 +117,6 @@ export function computeGhostText(
 	return new GhostText(lineNumber, parts);
 }
 
-function rangeExtends(extendingRange: Range, rangeToExtend: Range): boolean {
-	return rangeToExtend.getStartPosition().equals(extendingRange.getStartPosition())
-		&& rangeToExtend.getEndPosition().isBeforeOrEqual(extendingRange.getEndPosition());
-}
-
 let lastRequest: { originalValue: string; newValue: string; changes: readonly IDiffChange[] | undefined } | undefined = undefined;
 function cachingDiff(originalValue: string, newValue: string): readonly IDiffChange[] | undefined {
 	if (lastRequest?.originalValue === originalValue && lastRequest?.newValue === newValue) {
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/ghostText.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/ghostText.ts
similarity index 92%
rename from src/vs/editor/contrib/inlineCompletions/browser/ghostText.ts
rename to src/vs/editor/contrib/inlineCompletions/browser/model/ghostText.ts
index 47ee2e9f972..43cb07a899d 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/ghostText.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/ghostText.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { equals } from 'vs/base/common/arrays';
-import { splitLines } from 'vs/base/common/strings';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { SingleTextEdit, TextEdit } from 'vs/editor/common/core/textEdit';
-import { ColumnRange } from 'vs/editor/contrib/inlineCompletions/browser/utils';
+import { equals } from '../../../../../base/common/arrays.js';
+import { splitLines } from '../../../../../base/common/strings.js';
+import { Position } from '../../../../common/core/position.js';
+import { Range } from '../../../../common/core/range.js';
+import { SingleTextEdit, TextEdit } from '../../../../common/core/textEdit.js';
+import { ColumnRange } from '../utils.js';
 
 export class GhostText {
 	constructor(
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
similarity index 78%
rename from src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel.ts
rename to src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
index 92013fd5982..786529449fd 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
@@ -3,35 +3,37 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { compareBy, Permutation } from 'vs/base/common/arrays';
-import { mapFindFirst } from 'vs/base/common/arraysFind';
-import { itemsEquals } from 'vs/base/common/equals';
-import { BugIndicatingError, onUnexpectedError, onUnexpectedExternalError } from 'vs/base/common/errors';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IObservable, IReader, ITransaction, autorun, derived, derivedHandleChanges, derivedOpts, observableSignal, observableValue, recomputeInitiallyAndOnChange, subtransaction, transaction } from 'vs/base/common/observable';
-import { commonPrefixLength, splitLinesIncludeSeparators } from 'vs/base/common/strings';
-import { isDefined } from 'vs/base/common/types';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditOperation } from 'vs/editor/common/core/editOperation';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { SingleTextEdit, TextEdit } from 'vs/editor/common/core/textEdit';
-import { TextLength } from 'vs/editor/common/core/textLength';
-import { ScrollType } from 'vs/editor/common/editorCommon';
-import { Command, InlineCompletionContext, InlineCompletionTriggerKind, PartialAcceptTriggerKind } from 'vs/editor/common/languages';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { EndOfLinePreference, ITextModel } from 'vs/editor/common/model';
-import { IFeatureDebounceInformation } from 'vs/editor/common/services/languageFeatureDebounce';
-import { IModelContentChangedEvent } from 'vs/editor/common/textModelEvents';
-import { GhostText, GhostTextOrReplacement, ghostTextOrReplacementEquals, ghostTextsOrReplacementsEqual } from 'vs/editor/contrib/inlineCompletions/browser/ghostText';
-import { InlineCompletionWithUpdatedRange, InlineCompletionsSource } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsSource';
-import { computeGhostText, singleTextEditAugments, singleTextRemoveCommonPrefix } from 'vs/editor/contrib/inlineCompletions/browser/singleTextEdit';
-import { SuggestItemInfo } from 'vs/editor/contrib/inlineCompletions/browser/suggestWidgetInlineCompletionProvider';
-import { addPositions, subtractPositions } from 'vs/editor/contrib/inlineCompletions/browser/utils';
-import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { mapFindFirst } from '../../../../../base/common/arraysFind.js';
+import { itemsEquals } from '../../../../../base/common/equals.js';
+import { BugIndicatingError, onUnexpectedError, onUnexpectedExternalError } from '../../../../../base/common/errors.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { IObservable, IReader, ITransaction, autorun, derived, derivedHandleChanges, derivedOpts, observableSignal, observableValue, recomputeInitiallyAndOnChange, subtransaction, transaction } from '../../../../../base/common/observable.js';
+import { commonPrefixLength } from '../../../../../base/common/strings.js';
+import { isDefined } from '../../../../../base/common/types.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ICodeEditor } from '../../../../browser/editorBrowser.js';
+import { EditOperation } from '../../../../common/core/editOperation.js';
+import { Position } from '../../../../common/core/position.js';
+import { Range } from '../../../../common/core/range.js';
+import { Selection } from '../../../../common/core/selection.js';
+import { SingleTextEdit } from '../../../../common/core/textEdit.js';
+import { TextLength } from '../../../../common/core/textLength.js';
+import { ScrollType } from '../../../../common/editorCommon.js';
+import { Command, InlineCompletionContext, InlineCompletionTriggerKind, PartialAcceptTriggerKind } from '../../../../common/languages.js';
+import { ILanguageConfigurationService } from '../../../../common/languages/languageConfigurationRegistry.js';
+import { EndOfLinePreference, ITextModel } from '../../../../common/model.js';
+import { IFeatureDebounceInformation } from '../../../../common/services/languageFeatureDebounce.js';
+import { IModelContentChangedEvent } from '../../../../common/textModelEvents.js';
+import { SnippetController2 } from '../../../snippet/browser/snippetController2.js';
+import { addPositions, getEndPositionsAfterApplying, substringPos, subtractPositions } from '../utils.js';
+import { computeGhostText } from './computeGhostText.js';
+import { GhostText, GhostTextOrReplacement, ghostTextOrReplacementEquals, ghostTextsOrReplacementsEqual } from './ghostText.js';
+import { InlineCompletionWithUpdatedRange, InlineCompletionsSource } from './inlineCompletionsSource.js';
+import { InlineEdit } from './inlineEdit.js';
+import { InlineCompletionItem } from './provideInlineCompletions.js';
+import { singleTextEditAugments, singleTextRemoveCommonPrefix } from './singleTextEditHelpers.js';
+import { SuggestItemInfo } from './suggestWidgetAdaptor.js';
 
 export class InlineCompletionsModel extends Disposable {
 	private readonly _source = this._register(this._instantiationService.createInstance(InlineCompletionsSource, this.textModel, this._textModelVersionId, this._debounceValue));
@@ -92,9 +94,12 @@ export class InlineCompletionsModel extends Disposable {
 		return VersionIdChangeReason.Other;
 	}
 
+	public readonly dontRefetchSignal = observableSignal(this);
+
 	private readonly _fetchInlineCompletionsPromise = derivedHandleChanges({
 		owner: this,
 		createEmptyChangeSummary: () => ({
+			dontRefetch: false,
 			preserveCurrentCompletion: false,
 			inlineCompletionTriggerKind: InlineCompletionTriggerKind.Automatic
 		}),
@@ -104,10 +109,13 @@ export class InlineCompletionsModel extends Disposable {
 				changeSummary.preserveCurrentCompletion = true;
 			} else if (ctx.didChange(this._forceUpdateExplicitlySignal)) {
 				changeSummary.inlineCompletionTriggerKind = InlineCompletionTriggerKind.Explicit;
+			} else if (ctx.didChange(this.dontRefetchSignal)) {
+				changeSummary.dontRefetch = true;
 			}
 			return true;
 		},
 	}, (reader, changeSummary) => {
+		this.dontRefetchSignal.read(reader);
 		this._forceUpdateExplicitlySignal.read(reader);
 		const shouldUpdate = (this._enabled.read(reader) && this.selectedSuggestItem.read(reader)) || this._isActive.read(reader);
 		if (!shouldUpdate) {
@@ -131,6 +139,10 @@ export class InlineCompletionsModel extends Disposable {
 		}
 
 		const cursorPosition = this._primaryPosition.read(reader);
+		if (changeSummary.dontRefetch) {
+			return Promise.resolve(true);
+		}
+
 		const context: InlineCompletionContext = {
 			triggerKind: changeSummary.inlineCompletionTriggerKind,
 			selectedSuggestionInfo: suggestItem?.toSelectedSuggestionInfo(),
@@ -161,12 +173,30 @@ export class InlineCompletionsModel extends Disposable {
 		});
 	}
 
-	private readonly _filteredInlineCompletionItems = derivedOpts({ owner: this, equalsFn: itemsEquals() }, reader => {
+	private readonly _inlineCompletionItems = derivedOpts({ owner: this }, reader => {
 		const c = this._source.inlineCompletions.read(reader);
-		if (!c) { return []; }
+		if (!c) { return undefined; }
 		const cursorPosition = this._primaryPosition.read(reader);
-		const filteredCompletions = c.inlineCompletions.filter(c => c.isVisible(this.textModel, cursorPosition, reader));
-		return filteredCompletions;
+		let inlineEditCompletion: InlineCompletionWithUpdatedRange | undefined = undefined;
+		const filteredCompletions: InlineCompletionWithUpdatedRange[] = [];
+		for (const completion of c.inlineCompletions) {
+			if (!completion.inlineCompletion.sourceInlineCompletion.isInlineEdit) {
+				if (completion.isVisible(this.textModel, cursorPosition, reader)) {
+					filteredCompletions.push(completion);
+				}
+			} else if (filteredCompletions.length === 0 && completion.inlineCompletion.sourceInlineCompletion.isInlineEdit) {
+				inlineEditCompletion = completion;
+			}
+		}
+		return {
+			items: filteredCompletions,
+			inlineEditCompletion,
+		};
+	});
+
+	private readonly _filteredInlineCompletionItems = derivedOpts({ owner: this, equalsFn: itemsEquals() }, reader => {
+		const c = this._inlineCompletionItems.read(reader);
+		return c?.items ?? [];
 	});
 
 	public readonly selectedInlineCompletionIndex = derived<number>(this, (reader) => {
@@ -203,23 +233,42 @@ export class InlineCompletionsModel extends Disposable {
 		}
 	});
 
-	public readonly state = derivedOpts<{
+	public readonly stateWithInlineEdit = derivedOpts<{
+		kind: 'ghostText';
 		edits: readonly SingleTextEdit[];
 		primaryGhostText: GhostTextOrReplacement;
 		ghostTexts: readonly GhostTextOrReplacement[];
 		suggestItem: SuggestItemInfo | undefined;
 		inlineCompletion: InlineCompletionWithUpdatedRange | undefined;
+	} | {
+		kind: 'inlineEdit';
+		edits: readonly SingleTextEdit[];
+		inlineEdit: InlineEdit;
+		inlineCompletion: InlineCompletionWithUpdatedRange;
 	} | undefined>({
 		owner: this,
 		equalsFn: (a, b) => {
 			if (!a || !b) { return a === b; }
-			return ghostTextsOrReplacementsEqual(a.ghostTexts, b.ghostTexts)
-				&& a.inlineCompletion === b.inlineCompletion
-				&& a.suggestItem === b.suggestItem;
+
+			if (a.kind === 'ghostText' && b.kind === 'ghostText') {
+				return ghostTextsOrReplacementsEqual(a.ghostTexts, b.ghostTexts)
+					&& a.inlineCompletion === b.inlineCompletion
+					&& a.suggestItem === b.suggestItem;
+			} else if (a.kind === 'inlineEdit' && b.kind === 'inlineEdit') {
+				return a.inlineEdit.edit.equals(b.inlineEdit.edit);
+			}
+			return false;
 		}
 	}, (reader) => {
 		const model = this.textModel;
 
+		const item = this._inlineCompletionItems.read(reader);
+		if (item?.inlineEditCompletion) {
+			let edit = item.inlineEditCompletion.toSingleTextEdit(reader);
+			edit = singleTextRemoveCommonPrefix(edit, model);
+			return { kind: 'inlineEdit', inlineEdit: new InlineEdit(edit), inlineCompletion: item.inlineEditCompletion, edits: [edit] };
+		}
+
 		const suggestItem = this.selectedSuggestItem.read(reader);
 		if (suggestItem) {
 			const suggestCompletionEdit = singleTextRemoveCommonPrefix(suggestItem.toSingleTextEdit(), model);
@@ -238,7 +287,7 @@ export class InlineCompletionsModel extends Disposable {
 				.map((edit, idx) => computeGhostText(edit, model, mode, positions[idx], fullEditPreviewLength))
 				.filter(isDefined);
 			const primaryGhostText = ghostTexts[0] ?? new GhostText(fullEdit.range.endLineNumber, []);
-			return { edits, primaryGhostText, ghostTexts, inlineCompletion: augmentation?.completion, suggestItem };
+			return { kind: 'ghostText', edits, primaryGhostText, ghostTexts, inlineCompletion: augmentation?.completion, suggestItem };
 		} else {
 			if (!this._isActive.read(reader)) { return undefined; }
 			const inlineCompletion = this.selectedInlineCompletion.read(reader);
@@ -252,10 +301,22 @@ export class InlineCompletionsModel extends Disposable {
 				.map((edit, idx) => computeGhostText(edit, model, mode, positions[idx], 0))
 				.filter(isDefined);
 			if (!ghostTexts[0]) { return undefined; }
-			return { edits, primaryGhostText: ghostTexts[0], ghostTexts, inlineCompletion, suggestItem: undefined };
+			return { kind: 'ghostText', edits, primaryGhostText: ghostTexts[0], ghostTexts, inlineCompletion, suggestItem: undefined };
 		}
 	});
 
+	public readonly state = derived(reader => {
+		const s = this.stateWithInlineEdit.read(reader);
+		if (!s || s.kind !== 'ghostText') { return undefined; }
+		return s;
+	});
+
+	public readonly stateInlineEdit = derived(reader => {
+		const s = this.stateWithInlineEdit.read(reader);
+		if (!s || s.kind !== 'inlineEdit') { return undefined; }
+		return s;
+	});
+
 	private _computeAugmentation(suggestCompletion: SingleTextEdit, reader: IReader | undefined) {
 		const model = this.textModel;
 		const suggestWidgetInlineCompletions = this._source.suggestWidgetInlineCompletions.read(reader);
@@ -313,11 +374,19 @@ export class InlineCompletionsModel extends Disposable {
 			throw new BugIndicatingError();
 		}
 
-		const state = this.state.get();
-		if (!state || state.primaryGhostText.isEmpty() || !state.inlineCompletion) {
+		let completion: InlineCompletionItem;
+
+		const state = this.stateWithInlineEdit.get();
+		if (state?.kind === 'ghostText') {
+			if (!state || state.primaryGhostText.isEmpty() || !state.inlineCompletion) {
+				return;
+			}
+			completion = state.inlineCompletion.toInlineCompletion(undefined);
+		} else if (state?.kind === 'inlineEdit') {
+			completion = state.inlineCompletion.toInlineCompletion(undefined);
+		} else {
 			return;
 		}
-		const completion = state.inlineCompletion.toInlineCompletion(undefined);
 
 		if (completion.command) {
 			// Make sure the completion list will not be disposed.
@@ -515,20 +584,3 @@ export function getSecondaryEdits(textModel: ITextModel, positions: readonly Pos
 		return new SingleTextEdit(range, secondaryEditText);
 	});
 }
-
-function substringPos(text: string, pos: Position): string {
-	let subtext = '';
-	const lines = splitLinesIncludeSeparators(text);
-	for (let i = pos.lineNumber - 1; i < lines.length; i++) {
-		subtext += lines[i].substring(i === pos.lineNumber - 1 ? pos.column - 1 : 0);
-	}
-	return subtext;
-}
-
-function getEndPositionsAfterApplying(edits: readonly SingleTextEdit[]): Position[] {
-	const sortPerm = Permutation.createSortPermutation(edits, compareBy(e => e.range, Range.compareRangesUsingStarts));
-	const edit = new TextEdit(sortPerm.apply(edits));
-	const sortedNewRanges = edit.getNewRanges();
-	const newRanges = sortPerm.inverse().apply(sortedNewRanges);
-	return newRanges.map(range => range.getEndPosition());
-}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsSource.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts
similarity index 69%
rename from src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsSource.ts
rename to src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts
index 1eb06aa11c1..7031a4fb698 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsSource.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts
@@ -3,44 +3,57 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { equalsIfDefined, itemEquals } from 'vs/base/common/equals';
-import { matchesSubString } from 'vs/base/common/filters';
-import { Disposable, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { IObservable, IReader, ITransaction, derivedOpts, disposableObservableValue, transaction } from 'vs/base/common/observable';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { SingleTextEdit } from 'vs/editor/common/core/textEdit';
-import { TextLength } from 'vs/editor/common/core/textLength';
-import { InlineCompletionContext, InlineCompletionTriggerKind } from 'vs/editor/common/languages';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { EndOfLinePreference, ITextModel } from 'vs/editor/common/model';
-import { IFeatureDebounceInformation } from 'vs/editor/common/services/languageFeatureDebounce';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { InlineCompletionItem, InlineCompletionProviderResult, provideInlineCompletions } from 'vs/editor/contrib/inlineCompletions/browser/provideInlineCompletions';
-import { singleTextRemoveCommonPrefix } from 'vs/editor/contrib/inlineCompletions/browser/singleTextEdit';
+import { CancellationToken, CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { equalsIfDefined, itemEquals } from '../../../../../base/common/equals.js';
+import { matchesSubString } from '../../../../../base/common/filters.js';
+import { Disposable, IDisposable, MutableDisposable } from '../../../../../base/common/lifecycle.js';
+import { IObservable, IReader, ITransaction, derivedOpts, disposableObservableValue, transaction } from '../../../../../base/common/observable.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { ILogService } from '../../../../../platform/log/common/log.js';
+import { observableConfigValue } from '../../../../../platform/observable/common/platformObservableUtils.js';
+import { Position } from '../../../../common/core/position.js';
+import { Range } from '../../../../common/core/range.js';
+import { SingleTextEdit } from '../../../../common/core/textEdit.js';
+import { TextLength } from '../../../../common/core/textLength.js';
+import { InlineCompletionContext, InlineCompletionTriggerKind } from '../../../../common/languages.js';
+import { ILanguageConfigurationService } from '../../../../common/languages/languageConfigurationRegistry.js';
+import { EndOfLinePreference, ITextModel } from '../../../../common/model.js';
+import { IFeatureDebounceInformation } from '../../../../common/services/languageFeatureDebounce.js';
+import { ILanguageFeaturesService } from '../../../../common/services/languageFeatures.js';
+import { InlineCompletionItem, InlineCompletionProviderResult, provideInlineCompletions } from './provideInlineCompletions.js';
+import { singleTextRemoveCommonPrefix } from './singleTextEditHelpers.js';
 
 export class InlineCompletionsSource extends Disposable {
+	private static _requestId = 0;
+
 	private readonly _updateOperation = this._register(new MutableDisposable<UpdateOperation>());
 	public readonly inlineCompletions = disposableObservableValue<UpToDateInlineCompletions | undefined>('inlineCompletions', undefined);
 	public readonly suggestWidgetInlineCompletions = disposableObservableValue<UpToDateInlineCompletions | undefined>('suggestWidgetInlineCompletions', undefined);
 
+	private readonly _loggingEnabled = observableConfigValue('editor.inlineSuggest.logFetch', false, this._configurationService).recomputeInitiallyAndOnChange(this._store);
+
 	constructor(
-		private readonly textModel: ITextModel,
-		private readonly versionId: IObservable<number | null>,
+		private readonly _textModel: ITextModel,
+		private readonly _versionId: IObservable<number | null>,
 		private readonly _debounceValue: IFeatureDebounceInformation,
-		@ILanguageFeaturesService private readonly languageFeaturesService: ILanguageFeaturesService,
-		@ILanguageConfigurationService private readonly languageConfigurationService: ILanguageConfigurationService,
+		@ILanguageFeaturesService private readonly _languageFeaturesService: ILanguageFeaturesService,
+		@ILanguageConfigurationService private readonly _languageConfigurationService: ILanguageConfigurationService,
+		@ILogService private readonly _logService: ILogService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
 	) {
 		super();
 
-		this._register(this.textModel.onDidChangeContent(() => {
+		this._register(this._textModel.onDidChangeContent(() => {
 			this._updateOperation.clear();
 		}));
 	}
 
+	private _log(entry: { kind: 'start'; uri: string; modelVersion: number; requestId: number; context: unknown } | { kind: 'end'; error: any; durationMs: number; result: unknown; requestId: number }) {
+		this._logService.info('InlineCompletionsSource.fetch ' + JSON.stringify(entry));
+	}
+
 	public fetch(position: Position, context: InlineCompletionContext, activeInlineCompletion: InlineCompletionWithUpdatedRange | undefined): Promise<boolean> {
-		const request = new UpdateRequest(position, context, this.textModel.getVersionId());
+		const request = new UpdateRequest(position, context, this._textModel.getVersionId());
 
 		const target = context.selectedSuggestionInfo ? this.suggestWidgetInlineCompletions : this.inlineCompletions;
 
@@ -59,34 +72,59 @@ export class InlineCompletionsSource extends Disposable {
 			const shouldDebounce = updateOngoing || context.triggerKind === InlineCompletionTriggerKind.Automatic;
 			if (shouldDebounce) {
 				// This debounces the operation
-				await wait(this._debounceValue.get(this.textModel), source.token);
+				await wait(this._debounceValue.get(this._textModel), source.token);
 			}
 
-			if (source.token.isCancellationRequested || this._store.isDisposed || this.textModel.getVersionId() !== request.versionId) {
+			if (source.token.isCancellationRequested || this._store.isDisposed || this._textModel.getVersionId() !== request.versionId) {
 				return false;
 			}
 
-			const startTime = new Date();
-			const updatedCompletions = await provideInlineCompletions(
-				this.languageFeaturesService.inlineCompletionsProvider,
-				position,
-				this.textModel,
-				context,
-				source.token,
-				this.languageConfigurationService
-			);
+			const requestId = InlineCompletionsSource._requestId++;
+			if (this._loggingEnabled.get()) {
+				this._log({ kind: 'start', requestId, uri: this._textModel.uri.toString(), modelVersion: this._textModel.getVersionId(), context: { triggerKind: context.triggerKind } });
+			}
 
-			if (source.token.isCancellationRequested || this._store.isDisposed || this.textModel.getVersionId() !== request.versionId) {
+			const startTime = new Date();
+			let updatedCompletions: InlineCompletionProviderResult | undefined = undefined;
+			let error: any = undefined;
+			try {
+				updatedCompletions = await provideInlineCompletions(
+					this._languageFeaturesService.inlineCompletionsProvider,
+					position,
+					this._textModel,
+					context,
+					source.token,
+					this._languageConfigurationService
+				);
+			} catch (e) {
+				error = e;
+				throw e;
+			} finally {
+				if (this._loggingEnabled.get()) {
+					if (source.token.isCancellationRequested) {
+						error = 'canceled';
+					}
+					const result = updatedCompletions?.completions.map(c => ({
+						range: c.range.toString(),
+						text: c.insertText,
+						isInlineEdit: !!c.sourceInlineCompletion.isInlineEdit,
+						source: c.source.provider.groupId,
+					}));
+					this._log({ kind: 'end', requestId, durationMs: (Date.now() - startTime.getTime()), error, result });
+				}
+			}
+
+			if (source.token.isCancellationRequested || this._store.isDisposed || this._textModel.getVersionId() !== request.versionId) {
 				return false;
 			}
 
 			const endTime = new Date();
-			this._debounceValue.update(this.textModel, endTime.getTime() - startTime.getTime());
+			this._debounceValue.update(this._textModel, endTime.getTime() - startTime.getTime());
 
-			const completions = new UpToDateInlineCompletions(updatedCompletions, request, this.textModel, this.versionId);
+			const completions = new UpToDateInlineCompletions(updatedCompletions, request, this._textModel, this._versionId);
 			if (activeInlineCompletion) {
 				const asInlineCompletion = activeInlineCompletion.toInlineCompletion(undefined);
-				if (activeInlineCompletion.canBeReused(this.textModel, position) && !updatedCompletions.has(asInlineCompletion)) {
+				if (activeInlineCompletion.canBeReused(this._textModel, position) && !updatedCompletions.has(asInlineCompletion)) {
 					completions.prepend(activeInlineCompletion.inlineCompletion, asInlineCompletion.range, true);
 				}
 			}
@@ -273,6 +311,7 @@ export class InlineCompletionWithUpdatedRange {
 			!updatedRange
 			|| !this.inlineCompletion.range.getStartPosition().equals(updatedRange.getStartPosition())
 			|| cursorPosition.lineNumber !== minimizedReplacement.range.startLineNumber
+			|| minimizedReplacement.isEmpty // if the completion is empty after removing the common prefix of the completion and the model, the completion item would not be visible
 		) {
 			return false;
 		}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineEdit.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineEdit.ts
new file mode 100644
index 00000000000..2daf10bd10e
--- /dev/null
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineEdit.ts
@@ -0,0 +1,20 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { SingleTextEdit } from '../../../../common/core/textEdit.js';
+
+export class InlineEdit {
+	constructor(
+		public readonly edit: SingleTextEdit,
+	) { }
+
+	public get range() {
+		return this.edit.range;
+	}
+
+	public get text() {
+		return this.edit.text;
+	}
+}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineEditsAdapter.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineEditsAdapter.ts
new file mode 100644
index 00000000000..c03fb7bfa61
--- /dev/null
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineEditsAdapter.ts
@@ -0,0 +1,90 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { autorunWithStore, observableSignalFromEvent } from '../../../../../base/common/observable.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { observableConfigValue } from '../../../../../platform/observable/common/platformObservableUtils.js';
+import { ICodeEditor } from '../../../../browser/editorBrowser.js';
+import { Position } from '../../../../common/core/position.js';
+import { IInlineEdit, InlineCompletionContext, InlineCompletions, InlineCompletionsProvider, InlineEditProvider, InlineEditTriggerKind } from '../../../../common/languages.js';
+import { ITextModel } from '../../../../common/model.js';
+import { ILanguageFeaturesService } from '../../../../common/services/languageFeatures.js';
+
+export class InlineEditsAdapterContribution extends Disposable {
+	public static ID = 'editor.contrib.inlineEditsAdapter';
+	public static isFirst = true;
+
+	constructor(
+		_editor: ICodeEditor,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+	) {
+		super();
+
+		if (InlineEditsAdapterContribution.isFirst) {
+			InlineEditsAdapterContribution.isFirst = false;
+			this.instantiationService.createInstance(InlineEditsAdapter);
+		}
+	}
+}
+
+export class InlineEditsAdapter extends Disposable {
+	public static experimentalInlineEditsEnabled = 'editor.inlineSuggest.experimentalInlineEditsEnabled';
+	private readonly _inlineCompletionInlineEdits = observableConfigValue(InlineEditsAdapter.experimentalInlineEditsEnabled, false, this._configurationService);
+
+	constructor(
+		@ILanguageFeaturesService private readonly _languageFeaturesService: ILanguageFeaturesService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+	) {
+		super();
+
+		const didChangeSignal = observableSignalFromEvent('didChangeSignal', this._languageFeaturesService.inlineEditProvider.onDidChange);
+
+		this._register(autorunWithStore((reader, store) => {
+			if (!this._inlineCompletionInlineEdits.read(reader)) { return; }
+			didChangeSignal.read(reader);
+
+			type InlineCompletionsAndEdits = InlineCompletions & {
+				edits: {
+					result: IInlineEdit;
+					provider: InlineEditProvider<IInlineEdit>;
+				}[];
+			};
+
+			store.add(this._languageFeaturesService.inlineCompletionsProvider.register('*', new class implements InlineCompletionsProvider<InlineCompletionsAndEdits> {
+				async provideInlineCompletions(model: ITextModel, position: Position, context: InlineCompletionContext, token: CancellationToken): Promise<InlineCompletionsAndEdits> {
+					const allInlineEditProvider = _languageFeaturesService.inlineEditProvider.all(model);
+					const inlineEdits = await Promise.all(allInlineEditProvider.map(async provider => {
+						const result = await provider.provideInlineEdit(model, {
+							triggerKind: InlineEditTriggerKind.Automatic,
+						}, token);
+						if (!result) { return undefined; }
+						return { result, provider };
+					}));
+
+					const definedEdits = inlineEdits.filter(e => !!e);
+					return {
+						edits: definedEdits,
+						items: definedEdits.map(e => {
+							return {
+								range: e.result.range,
+								insertText: e.result.text,
+								command: e.result.accepted,
+								isInlineEdit: true,
+							};
+						}),
+					};
+				}
+				freeInlineCompletions(c: InlineCompletionsAndEdits) {
+					for (const e of c.edits) {
+						e.provider.freeInlineEdit(e.result);
+					}
+				}
+			}));
+		}));
+	}
+}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/provideInlineCompletions.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts
similarity index 81%
rename from src/vs/editor/contrib/inlineCompletions/browser/provideInlineCompletions.ts
rename to src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts
index 28052040c32..fc7e6b42ee1 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/provideInlineCompletions.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts
@@ -3,34 +3,36 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { assertNever } from 'vs/base/common/assert';
-import { DeferredPromise } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { SetMap } from 'vs/base/common/map';
-import { onUnexpectedExternalError } from 'vs/base/common/errors';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import { Command, InlineCompletion, InlineCompletionContext, InlineCompletionProviderGroupId, InlineCompletions, InlineCompletionsProvider } from 'vs/editor/common/languages';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { ITextModel } from 'vs/editor/common/model';
-import { fixBracketsInLine } from 'vs/editor/common/model/bracketPairsTextModelPart/fixBrackets';
-import { SingleTextEdit } from 'vs/editor/common/core/textEdit';
-import { getReadonlyEmptyArray } from 'vs/editor/contrib/inlineCompletions/browser/utils';
-import { SnippetParser, Text } from 'vs/editor/contrib/snippet/browser/snippetParser';
+import { assertNever } from '../../../../../base/common/assert.js';
+import { DeferredPromise } from '../../../../../base/common/async.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { SetMap } from '../../../../../base/common/map.js';
+import { onUnexpectedExternalError } from '../../../../../base/common/errors.js';
+import { IDisposable } from '../../../../../base/common/lifecycle.js';
+import { ISingleEditOperation } from '../../../../common/core/editOperation.js';
+import { Position } from '../../../../common/core/position.js';
+import { Range } from '../../../../common/core/range.js';
+import { LanguageFeatureRegistry } from '../../../../common/languageFeatureRegistry.js';
+import { Command, InlineCompletion, InlineCompletionContext, InlineCompletionProviderGroupId, InlineCompletions, InlineCompletionsProvider } from '../../../../common/languages.js';
+import { ILanguageConfigurationService } from '../../../../common/languages/languageConfigurationRegistry.js';
+import { ITextModel } from '../../../../common/model.js';
+import { fixBracketsInLine } from '../../../../common/model/bracketPairsTextModelPart/fixBrackets.js';
+import { SingleTextEdit } from '../../../../common/core/textEdit.js';
+import { getReadonlyEmptyArray } from '../utils.js';
+import { SnippetParser, Text } from '../../../snippet/browser/snippetParser.js';
+import { LineEditWithAdditionalLines } from '../../../../common/tokenizationTextModelPart.js';
+import { OffsetRange } from '../../../../common/core/offsetRange.js';
 
 export async function provideInlineCompletions(
 	registry: LanguageFeatureRegistry<InlineCompletionsProvider>,
-	position: Position,
+	positionOrRange: Position | Range,
 	model: ITextModel,
 	context: InlineCompletionContext,
 	token: CancellationToken = CancellationToken.None,
 	languageConfigurationService?: ILanguageConfigurationService,
 ): Promise<InlineCompletionProviderResult> {
 	// Important: Don't use position after the await calls, as the model could have been changed in the meantime!
-	const defaultReplaceRange = getDefaultRange(position, model);
+	const defaultReplaceRange = positionOrRange instanceof Position ? getDefaultRange(positionOrRange, model) : positionOrRange;
 	const providers = registry.all(model);
 
 	const multiMap = new SetMap<InlineCompletionProviderGroupId, InlineCompletionsProvider<any>>();
@@ -73,7 +75,7 @@ export async function provideInlineCompletions(
 		return undefined;
 	}
 
-	function processProvider(provider: InlineCompletionsProvider<any>): Result {
+	function processProvider(provider: InlineCompletionsProvider<InlineCompletions>): Result {
 		const state = states.get(provider);
 		if (state) {
 			return state;
@@ -100,8 +102,13 @@ export async function provideInlineCompletions(
 			}
 
 			try {
-				const completions = await provider.provideInlineCompletions(model, position, context, token);
-				return completions;
+				if (positionOrRange instanceof Position) {
+					const completions = await provider.provideInlineCompletions(model, positionOrRange, context, token);
+					return completions;
+				} else {
+					const completions = await provider.provideInlineEditsForRange?.(model, positionOrRange, context, token);
+					return completions;
+				}
 			} catch (e) {
 				onUnexpectedExternalError(e);
 				return undefined;
@@ -328,8 +335,9 @@ function closeBrackets(text: string, position: Position, model: ITextModel, lang
 	const lineStart = model.getLineContent(position.lineNumber).substring(0, position.column - 1);
 	const newLine = lineStart + text;
 
-	const newTokens = model.tokenization.tokenizeLineWithEdit(position, newLine.length - (position.column - 1), text);
-	const slicedTokens = newTokens?.sliceAndInflate(position.column - 1, newLine.length, 0);
+	const edit = LineEditWithAdditionalLines.replace(OffsetRange.ofStartAndLength(position.column - 1, newLine.length - (position.column - 1)), text);
+	const newTokens = model.tokenization.tokenizeLineWithEdit(position.lineNumber, edit);
+	const slicedTokens = newTokens?.mainLineTokens?.sliceAndInflate(position.column - 1, newLine.length, 0);
 	if (!slicedTokens) {
 		return text;
 	}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/singleTextEditHelpers.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/singleTextEditHelpers.ts
new file mode 100644
index 00000000000..3c4d51ef8d9
--- /dev/null
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/singleTextEditHelpers.ts
@@ -0,0 +1,34 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { commonPrefixLength } from '../../../../../base/common/strings.js';
+import { Range } from '../../../../common/core/range.js';
+import { TextLength } from '../../../../common/core/textLength.js';
+import { SingleTextEdit } from '../../../../common/core/textEdit.js';
+import { EndOfLinePreference, ITextModel } from '../../../../common/model.js';
+
+export function singleTextRemoveCommonPrefix(edit: SingleTextEdit, model: ITextModel, validModelRange?: Range): SingleTextEdit {
+	const modelRange = validModelRange ? edit.range.intersectRanges(validModelRange) : edit.range;
+	if (!modelRange) {
+		return edit;
+	}
+	const normalizedText = edit.text.replaceAll('\r\n', '\n');
+	const valueToReplace = model.getValueInRange(modelRange, EndOfLinePreference.LF);
+	const commonPrefixLen = commonPrefixLength(valueToReplace, normalizedText);
+	const start = TextLength.ofText(valueToReplace.substring(0, commonPrefixLen)).addToPosition(edit.range.getStartPosition());
+	const text = normalizedText.substring(commonPrefixLen);
+	const range = Range.fromPositions(start, edit.range.getEndPosition());
+	return new SingleTextEdit(range, text);
+}
+
+export function singleTextEditAugments(edit: SingleTextEdit, base: SingleTextEdit): boolean {
+	// The augmented completion must replace the base range, but can replace even more
+	return edit.text.startsWith(base.text) && rangeExtends(edit.range, base.range);
+}
+
+function rangeExtends(extendingRange: Range, rangeToExtend: Range): boolean {
+	return rangeToExtend.getStartPosition().equals(extendingRange.getStartPosition())
+		&& rangeToExtend.getEndPosition().isBeforeOrEqual(extendingRange.getEndPosition());
+}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/suggestWidgetInlineCompletionProvider.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/suggestWidgetAdaptor.ts
similarity index 87%
rename from src/vs/editor/contrib/inlineCompletions/browser/suggestWidgetInlineCompletionProvider.ts
rename to src/vs/editor/contrib/inlineCompletions/browser/model/suggestWidgetAdaptor.ts
index daf73173ef4..cb86cfea852 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/suggestWidgetInlineCompletionProvider.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/suggestWidgetAdaptor.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { compareBy, numberComparator } from 'vs/base/common/arrays';
-import { findFirstMax } from 'vs/base/common/arraysFind';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { SingleTextEdit } from 'vs/editor/common/core/textEdit';
-import { CompletionItemInsertTextRule, CompletionItemKind, SelectedSuggestionInfo } from 'vs/editor/common/languages';
-import { ITextModel } from 'vs/editor/common/model';
-import { singleTextEditAugments, singleTextRemoveCommonPrefix } from 'vs/editor/contrib/inlineCompletions/browser/singleTextEdit';
-import { SnippetParser } from 'vs/editor/contrib/snippet/browser/snippetParser';
-import { SnippetSession } from 'vs/editor/contrib/snippet/browser/snippetSession';
-import { CompletionItem } from 'vs/editor/contrib/suggest/browser/suggest';
-import { SuggestController } from 'vs/editor/contrib/suggest/browser/suggestController';
+import { compareBy, numberComparator } from '../../../../../base/common/arrays.js';
+import { findFirstMax } from '../../../../../base/common/arraysFind.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { ICodeEditor } from '../../../../browser/editorBrowser.js';
+import { Position } from '../../../../common/core/position.js';
+import { Range } from '../../../../common/core/range.js';
+import { SingleTextEdit } from '../../../../common/core/textEdit.js';
+import { CompletionItemInsertTextRule, CompletionItemKind, SelectedSuggestionInfo } from '../../../../common/languages.js';
+import { ITextModel } from '../../../../common/model.js';
+import { singleTextEditAugments, singleTextRemoveCommonPrefix } from './singleTextEditHelpers.js';
+import { SnippetParser } from '../../../snippet/browser/snippetParser.js';
+import { SnippetSession } from '../../../snippet/browser/snippetSession.js';
+import { CompletionItem } from '../../../suggest/browser/suggest.js';
+import { SuggestController } from '../../../suggest/browser/suggestController.js';
 
 export class SuggestWidgetAdaptor extends Disposable {
 	private isSuggestWidgetVisible: boolean = false;
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/utils.ts b/src/vs/editor/contrib/inlineCompletions/browser/utils.ts
index 20236aade3b..0b1a504e56c 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/utils.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/utils.ts
@@ -3,13 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BugIndicatingError } from 'vs/base/common/errors';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { IObservable, autorunOpts } from 'vs/base/common/observable';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { IModelDeltaDecoration } from 'vs/editor/common/model';
+import { Permutation, compareBy } from '../../../../base/common/arrays.js';
+import { BugIndicatingError } from '../../../../base/common/errors.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { IObservable, observableValue, ISettableObservable, autorun, transaction } from '../../../../base/common/observable.js';
+import { splitLinesIncludeSeparators } from '../../../../base/common/strings.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { SingleTextEdit, TextEdit } from '../../../common/core/textEdit.js';
 
 const array: ReadonlyArray<any> = [];
 export function getReadonlyEmptyArray<T>(): readonly T[] {
@@ -36,21 +37,6 @@ export class ColumnRange {
 	}
 }
 
-export function applyObservableDecorations(editor: ICodeEditor, decorations: IObservable<IModelDeltaDecoration[]>): IDisposable {
-	const d = new DisposableStore();
-	const decorationsCollection = editor.createDecorationsCollection();
-	d.add(autorunOpts({ debugName: () => `Apply decorations from ${decorations.debugName}` }, reader => {
-		const d = decorations.read(reader);
-		decorationsCollection.set(d);
-	}));
-	d.add({
-		dispose: () => {
-			decorationsCollection.clear();
-		}
-	});
-	return d;
-}
-
 export function addPositions(pos1: Position, pos2: Position): Position {
 	return new Position(pos1.lineNumber + pos2.lineNumber - 1, pos2.lineNumber === 1 ? pos1.column + pos2.column - 1 : pos2.column);
 }
@@ -58,3 +44,44 @@ export function addPositions(pos1: Position, pos2: Position): Position {
 export function subtractPositions(pos1: Position, pos2: Position): Position {
 	return new Position(pos1.lineNumber - pos2.lineNumber + 1, pos1.lineNumber - pos2.lineNumber === 0 ? pos1.column - pos2.column + 1 : pos1.column);
 }
+
+export function substringPos(text: string, pos: Position): string {
+	let subtext = '';
+	const lines = splitLinesIncludeSeparators(text);
+	for (let i = pos.lineNumber - 1; i < lines.length; i++) {
+		subtext += lines[i].substring(i === pos.lineNumber - 1 ? pos.column - 1 : 0);
+	}
+	return subtext;
+}
+
+export function getEndPositionsAfterApplying(edits: readonly SingleTextEdit[]): Position[] {
+	const sortPerm = Permutation.createSortPermutation(edits, compareBy(e => e.range, Range.compareRangesUsingStarts));
+	const edit = new TextEdit(sortPerm.apply(edits));
+	const sortedNewRanges = edit.getNewRanges();
+	const newRanges = sortPerm.inverse().apply(sortedNewRanges);
+	return newRanges.map(range => range.getEndPosition());
+}
+
+export function convertItemsToStableObservables<T>(items: IObservable<readonly T[]>, store: DisposableStore): IObservable<IObservable<T>[]> {
+	const result = observableValue<IObservable<T>[]>('result', []);
+	const innerObservables: ISettableObservable<T>[] = [];
+
+	store.add(autorun(reader => {
+		const itemsValue = items.read(reader);
+
+		transaction(tx => {
+			if (itemsValue.length !== innerObservables.length) {
+				innerObservables.length = itemsValue.length;
+				for (let i = 0; i < innerObservables.length; i++) {
+					if (!innerObservables[i]) {
+						innerObservables[i] = observableValue<T>('item', itemsValue[i]);
+					}
+				}
+				result.set([...innerObservables], tx);
+			}
+			innerObservables.forEach((o, i) => o.set(itemsValue[i], tx));
+		});
+	}));
+
+	return result;
+}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/ghostText.css b/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.css
similarity index 90%
rename from src/vs/editor/contrib/inlineCompletions/browser/ghostText.css
rename to src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.css
index ea7193a130d..1ed8b6d0be9 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/ghostText.css
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.css
@@ -36,7 +36,12 @@
 .monaco-editor .ghost-text-decoration,
 .monaco-editor .ghost-text-decoration-preview,
 .monaco-editor .suggest-preview-text .ghost-text {
-	color: var(--vscode-editorGhostText-foreground) !important;
+	&.syntax-highlighted {
+		opacity: 0.7;
+	}
+	&:not(.syntax-highlighted) {
+		color: var(--vscode-editorGhostText-foreground);
+	}
 	background-color: var(--vscode-editorGhostText-background);
 	border: 1px solid var(--vscode-editorGhostText-border);
 }
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.ts
new file mode 100644
index 00000000000..8bff9b3efba
--- /dev/null
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.ts
@@ -0,0 +1,365 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { createTrustedTypesPolicy } from '../../../../../../base/browser/trustedTypes.js';
+import { Event } from '../../../../../../base/common/event.js';
+import { Disposable, toDisposable } from '../../../../../../base/common/lifecycle.js';
+import { IObservable, autorun, derived, observableSignalFromEvent, observableValue } from '../../../../../../base/common/observable.js';
+import * as strings from '../../../../../../base/common/strings.js';
+import { applyFontInfo } from '../../../../../browser/config/domFontInfo.js';
+import { ICodeEditor } from '../../../../../browser/editorBrowser.js';
+import { observableCodeEditor } from '../../../../../browser/observableCodeEditor.js';
+import { EditorFontLigatures, EditorOption, IComputedEditorOptions } from '../../../../../common/config/editorOptions.js';
+import { OffsetEdit, SingleOffsetEdit } from '../../../../../common/core/offsetEdit.js';
+import { Position } from '../../../../../common/core/position.js';
+import { Range } from '../../../../../common/core/range.js';
+import { StringBuilder } from '../../../../../common/core/stringBuilder.js';
+import { ILanguageService } from '../../../../../common/languages/language.js';
+import { IModelDeltaDecoration, ITextModel, InjectedTextCursorStops, PositionAffinity } from '../../../../../common/model.js';
+import { LineEditWithAdditionalLines } from '../../../../../common/tokenizationTextModelPart.js';
+import { LineTokens } from '../../../../../common/tokens/lineTokens.js';
+import { LineDecoration } from '../../../../../common/viewLayout/lineDecorations.js';
+import { RenderLineInput, renderViewLine } from '../../../../../common/viewLayout/viewLineRenderer.js';
+import { InlineDecorationType } from '../../../../../common/viewModel.js';
+import { GhostText, GhostTextReplacement } from '../../model/ghostText.js';
+import { ColumnRange } from '../../utils.js';
+import './ghostTextView.css';
+
+export interface IGhostTextWidgetModel {
+	readonly targetTextModel: IObservable<ITextModel | undefined>;
+	readonly ghostText: IObservable<GhostText | GhostTextReplacement | undefined>;
+	readonly minReservedLineCount: IObservable<number>;
+}
+
+export class GhostTextView extends Disposable {
+	private readonly _isDisposed = observableValue(this, false);
+	private readonly _editorObs = observableCodeEditor(this._editor);
+
+	constructor(
+		private readonly _editor: ICodeEditor,
+		private readonly _model: IGhostTextWidgetModel,
+		@ILanguageService private readonly _languageService: ILanguageService,
+	) {
+		super();
+
+		this._register(toDisposable(() => { this._isDisposed.set(true, undefined); }));
+		this._register(this._editorObs.setDecorations(this.decorations));
+	}
+
+	private readonly _useSyntaxHighlighting = this._editorObs.getOption(EditorOption.inlineSuggest).map(v => v.syntaxHighlightingEnabled);
+
+	private readonly uiState = derived(this, reader => {
+		if (this._isDisposed.read(reader)) { return undefined; }
+		const textModel = this._editorObs.model.read(reader);
+		if (textModel !== this._model.targetTextModel.read(reader)) { return undefined; }
+		const ghostText = this._model.ghostText.read(reader);
+		if (!ghostText) { return undefined; }
+
+		const replacedRange = ghostText instanceof GhostTextReplacement ? ghostText.columnRange : undefined;
+
+		const syntaxHighlightingEnabled = this._useSyntaxHighlighting.read(reader);
+		const extraClassName = syntaxHighlightingEnabled ? ' syntax-highlighted' : '';
+		const { inlineTexts, additionalLines, hiddenRange } = computeGhostTextViewData(ghostText, textModel, 'ghost-text' + extraClassName);
+
+		const edit = new OffsetEdit(inlineTexts.map(t => SingleOffsetEdit.insert(t.column - 1, t.text)));
+		const tokens = syntaxHighlightingEnabled ? textModel.tokenization.tokenizeLineWithEdit(ghostText.lineNumber, new LineEditWithAdditionalLines(
+			edit,
+			additionalLines.map(l => l.content)
+		)) : undefined;
+		const newRanges = edit.getNewTextRanges();
+		const inlineTextsWithTokens = inlineTexts.map((t, idx) => ({ ...t, tokens: tokens?.mainLineTokens?.getTokensInRange(newRanges[idx]) }));
+
+		const tokenizedAdditionalLines: LineData[] = additionalLines.map((l, idx) => ({
+			content: tokens?.additionalLines?.[idx] ?? LineTokens.createEmpty(l.content, this._languageService.languageIdCodec),
+			decorations: l.decorations,
+		}));
+
+		return {
+			replacedRange,
+			inlineTexts: inlineTextsWithTokens,
+			additionalLines: tokenizedAdditionalLines,
+			hiddenRange,
+			lineNumber: ghostText.lineNumber,
+			additionalReservedLineCount: this._model.minReservedLineCount.read(reader),
+			targetTextModel: textModel,
+			syntaxHighlightingEnabled,
+		};
+	});
+
+	private readonly decorations = derived(this, reader => {
+		const uiState = this.uiState.read(reader);
+		if (!uiState) { return []; }
+
+		const decorations: IModelDeltaDecoration[] = [];
+
+		const extraClassName = uiState.syntaxHighlightingEnabled ? ' syntax-highlighted' : '';
+
+		if (uiState.replacedRange) {
+			decorations.push({
+				range: uiState.replacedRange.toRange(uiState.lineNumber),
+				options: { inlineClassName: 'inline-completion-text-to-replace' + extraClassName, description: 'GhostTextReplacement' }
+			});
+		}
+
+		if (uiState.hiddenRange) {
+			decorations.push({
+				range: uiState.hiddenRange.toRange(uiState.lineNumber),
+				options: { inlineClassName: 'ghost-text-hidden', description: 'ghost-text-hidden', }
+			});
+		}
+
+		for (const p of uiState.inlineTexts) {
+			decorations.push({
+				range: Range.fromPositions(new Position(uiState.lineNumber, p.column)),
+				options: {
+					description: 'ghost-text-decoration',
+					after: {
+						content: p.text,
+						tokens: p.tokens,
+						inlineClassName: p.preview ? 'ghost-text-decoration-preview' : 'ghost-text-decoration' + extraClassName,
+						cursorStops: InjectedTextCursorStops.Left
+					},
+					showIfCollapsed: true,
+				}
+			});
+		}
+
+		return decorations;
+	});
+
+	private readonly additionalLinesWidget = this._register(
+		new AdditionalLinesWidget(
+			this._editor,
+			derived(reader => {
+				/** @description lines */
+				const uiState = this.uiState.read(reader);
+				return uiState ? {
+					lineNumber: uiState.lineNumber,
+					additionalLines: uiState.additionalLines,
+					minReservedLineCount: uiState.additionalReservedLineCount,
+					targetTextModel: uiState.targetTextModel,
+				} : undefined;
+			})
+		)
+	);
+
+	public ownsViewZone(viewZoneId: string): boolean {
+		return this.additionalLinesWidget.viewZoneId === viewZoneId;
+	}
+}
+
+function computeGhostTextViewData(ghostText: GhostText | GhostTextReplacement, textModel: ITextModel, ghostTextClassName: string) {
+	const inlineTexts: { column: number; text: string; preview: boolean }[] = [];
+	const additionalLines: { content: string; decorations: LineDecoration[] }[] = [];
+
+	function addToAdditionalLines(lines: readonly string[], className: string | undefined) {
+		if (additionalLines.length > 0) {
+			const lastLine = additionalLines[additionalLines.length - 1];
+			if (className) {
+				lastLine.decorations.push(new LineDecoration(
+					lastLine.content.length + 1,
+					lastLine.content.length + 1 + lines[0].length,
+					className,
+					InlineDecorationType.Regular
+				));
+			}
+			lastLine.content += lines[0];
+
+			lines = lines.slice(1);
+		}
+		for (const line of lines) {
+			additionalLines.push({
+				content: line,
+				decorations: className ? [new LineDecoration(
+					1,
+					line.length + 1,
+					className,
+					InlineDecorationType.Regular
+				)] : []
+			});
+		}
+	}
+
+	const textBufferLine = textModel.getLineContent(ghostText.lineNumber);
+
+	let hiddenTextStartColumn: number | undefined = undefined;
+	let lastIdx = 0;
+	for (const part of ghostText.parts) {
+		let lines = part.lines;
+		if (hiddenTextStartColumn === undefined) {
+			inlineTexts.push({ column: part.column, text: lines[0], preview: part.preview });
+			lines = lines.slice(1);
+		} else {
+			addToAdditionalLines([textBufferLine.substring(lastIdx, part.column - 1)], undefined);
+		}
+
+		if (lines.length > 0) {
+			addToAdditionalLines(lines, ghostTextClassName);
+			if (hiddenTextStartColumn === undefined && part.column <= textBufferLine.length) {
+				hiddenTextStartColumn = part.column;
+			}
+		}
+
+		lastIdx = part.column - 1;
+	}
+	if (hiddenTextStartColumn !== undefined) {
+		addToAdditionalLines([textBufferLine.substring(lastIdx)], undefined);
+	}
+
+	const hiddenRange = hiddenTextStartColumn !== undefined ? new ColumnRange(hiddenTextStartColumn, textBufferLine.length + 1) : undefined;
+
+	return {
+		inlineTexts,
+		additionalLines,
+		hiddenRange,
+	};
+}
+
+export class AdditionalLinesWidget extends Disposable {
+	private _viewZoneId: string | undefined = undefined;
+	public get viewZoneId(): string | undefined { return this._viewZoneId; }
+
+	private readonly editorOptionsChanged = observableSignalFromEvent('editorOptionChanged', Event.filter(
+		this.editor.onDidChangeConfiguration,
+		e => e.hasChanged(EditorOption.disableMonospaceOptimizations)
+			|| e.hasChanged(EditorOption.stopRenderingLineAfter)
+			|| e.hasChanged(EditorOption.renderWhitespace)
+			|| e.hasChanged(EditorOption.renderControlCharacters)
+			|| e.hasChanged(EditorOption.fontLigatures)
+			|| e.hasChanged(EditorOption.fontInfo)
+			|| e.hasChanged(EditorOption.lineHeight)
+	));
+
+	constructor(
+		private readonly editor: ICodeEditor,
+		private readonly lines: IObservable<{
+			targetTextModel: ITextModel;
+			lineNumber: number;
+			additionalLines: LineData[];
+			minReservedLineCount: number;
+		} | undefined>
+	) {
+		super();
+
+		this._register(autorun(reader => {
+			/** @description update view zone */
+			const lines = this.lines.read(reader);
+			this.editorOptionsChanged.read(reader);
+
+			if (lines) {
+				this.updateLines(lines.lineNumber, lines.additionalLines, lines.minReservedLineCount);
+			} else {
+				this.clear();
+			}
+		}));
+	}
+
+	public override dispose(): void {
+		super.dispose();
+		this.clear();
+	}
+
+	private clear(): void {
+		this.editor.changeViewZones((changeAccessor) => {
+			if (this._viewZoneId) {
+				changeAccessor.removeZone(this._viewZoneId);
+				this._viewZoneId = undefined;
+			}
+		});
+	}
+
+	private updateLines(lineNumber: number, additionalLines: LineData[], minReservedLineCount: number): void {
+		const textModel = this.editor.getModel();
+		if (!textModel) {
+			return;
+		}
+
+		const { tabSize } = textModel.getOptions();
+
+		this.editor.changeViewZones((changeAccessor) => {
+			if (this._viewZoneId) {
+				changeAccessor.removeZone(this._viewZoneId);
+				this._viewZoneId = undefined;
+			}
+
+			const heightInLines = Math.max(additionalLines.length, minReservedLineCount);
+			if (heightInLines > 0) {
+				const domNode = document.createElement('div');
+				renderLines(domNode, tabSize, additionalLines, this.editor.getOptions());
+
+				this._viewZoneId = changeAccessor.addZone({
+					afterLineNumber: lineNumber,
+					heightInLines: heightInLines,
+					domNode,
+					afterColumnAffinity: PositionAffinity.Right
+				});
+			}
+		});
+	}
+}
+
+export interface LineData {
+	content: LineTokens; // Must not contain a linebreak!
+	decorations: LineDecoration[];
+}
+
+function renderLines(domNode: HTMLElement, tabSize: number, lines: LineData[], opts: IComputedEditorOptions): void {
+	const disableMonospaceOptimizations = opts.get(EditorOption.disableMonospaceOptimizations);
+	const stopRenderingLineAfter = opts.get(EditorOption.stopRenderingLineAfter);
+	// To avoid visual confusion, we don't want to render visible whitespace
+	const renderWhitespace = 'none';
+	const renderControlCharacters = opts.get(EditorOption.renderControlCharacters);
+	const fontLigatures = opts.get(EditorOption.fontLigatures);
+	const fontInfo = opts.get(EditorOption.fontInfo);
+	const lineHeight = opts.get(EditorOption.lineHeight);
+
+	const sb = new StringBuilder(10000);
+	sb.appendString('<div class="suggest-preview-text">');
+
+	for (let i = 0, len = lines.length; i < len; i++) {
+		const lineData = lines[i];
+		const lineTokens = lineData.content;
+		sb.appendString('<div class="view-line');
+		sb.appendString('" style="top:');
+		sb.appendString(String(i * lineHeight));
+		sb.appendString('px;width:1000000px;">');
+
+		const line = lineTokens.getLineContent();
+		const isBasicASCII = strings.isBasicASCII(line);
+		const containsRTL = strings.containsRTL(line);
+
+		renderViewLine(new RenderLineInput(
+			(fontInfo.isMonospace && !disableMonospaceOptimizations),
+			fontInfo.canUseHalfwidthRightwardsArrow,
+			line,
+			false,
+			isBasicASCII,
+			containsRTL,
+			0,
+			lineTokens,
+			lineData.decorations,
+			tabSize,
+			0,
+			fontInfo.spaceWidth,
+			fontInfo.middotWidth,
+			fontInfo.wsmiddotWidth,
+			stopRenderingLineAfter,
+			renderWhitespace,
+			renderControlCharacters,
+			fontLigatures !== EditorFontLigatures.OFF,
+			null
+		), sb);
+
+		sb.appendString('</div>');
+	}
+	sb.appendString('</div>');
+
+	applyFontInfo(domNode, fontInfo);
+	const html = sb.build();
+	const trustedhtml = ttPolicy ? ttPolicy.createHTML(html) : html;
+	domNode.innerHTML = trustedhtml as string;
+}
+
+export const ttPolicy = createTrustedTypesPolicy('editorGhostText', { createHTML: value => value });
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.css b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.css
new file mode 100644
index 00000000000..6c65ff7d812
--- /dev/null
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.css
@@ -0,0 +1,138 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/*
+	@keyframes blink { 50% { border-color: orange; }  }
+*/
+
+.monaco-editor div.inline-edits-view-indicator {
+	display: flex;
+
+	z-index: 1000000;
+	height: 20px;
+
+	color: var(--vscode-editorHoverWidget-foreground);
+	background-color: var(--vscode-editorHoverWidget-background);
+	border: 1px solid var(--vscode-editorHoverWidget-border);
+	border-radius: 3px;
+
+	align-items: center;
+	padding: 2px;
+	padding-right: 10px;
+	margin: 0 4px;
+
+	/*
+	animation: blink 1s;
+	animation-iteration-count: 3;
+	*/
+
+	opacity: 0;
+
+	&.contained {
+		transition: opacity 0.2s ease-in-out;
+		transition-delay: 0.4s;
+	}
+
+
+	&.top {
+		opacity: 1;
+
+		.icon {
+			transform: rotate(90deg);
+		}
+	}
+
+	&.bottom {
+		opacity: 1;
+
+		.icon {
+			transform: rotate(-90deg);
+		}
+	}
+
+	.icon {
+		display: flex;
+		align-items: center;
+		margin: 0 2px;
+		transform: none;
+		transition: transform 0.2s ease-in-out;
+	}
+
+	.label {
+		margin: 0 2px;
+
+		display: flex;
+		justify-content: center;
+		width: 100%;
+	}
+}
+
+.monaco-editor div.inline-edits-view {
+	--widget-color: var(--vscode-editorHoverWidget-background);
+
+	&.toolbarDropdownVisible,
+	.editorContainer:hover {
+		.toolbar {
+			display: block;
+		}
+	}
+
+	.editorContainer {
+		color: var(--vscode-editorHoverWidget-foreground);
+		background-color: var(--vscode-editorHoverWidget-background);
+		border: 1px solid var(--vscode-editorHoverWidget-border);
+		border-radius: 3px;
+
+		.toolbar {
+			display: none;
+			border-top: 1px solid rgba(69, 69, 69, 0.5);
+			background-color: var(--vscode-editorHoverWidget-statusBarBackground);
+
+			a {
+				color: var(--vscode-foreground);
+			}
+
+			a:hover {
+				color: var(--vscode-foreground);
+			}
+
+			.keybinding {
+				display: flex;
+				margin-left: 4px;
+				opacity: 0.6;
+			}
+
+			.keybinding .monaco-keybinding-key {
+				font-size: 8px;
+				padding: 2px 3px;
+			}
+
+			.availableSuggestionCount a {
+				display: flex;
+				min-width: 19px;
+				justify-content: center;
+			}
+
+			.inlineSuggestionStatusBarItemLabel {
+				margin-right: 2px;
+			}
+
+		}
+
+		.preview {
+			.monaco-editor {
+				.view-overlays .current-line-exact {
+					border: none;
+				}
+
+				.current-line-margin {
+					border: none;
+				}
+
+				--vscode-editor-background: var(--widget-color);
+			}
+		}
+	}
+}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts
new file mode 100644
index 00000000000..fc42e61d8a8
--- /dev/null
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts
@@ -0,0 +1,418 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { h } from '../../../../../../base/browser/dom.js';
+import { renderIcon } from '../../../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { numberComparator } from '../../../../../../base/common/arrays.js';
+import { findFirstMin } from '../../../../../../base/common/arraysFind.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { createHotClass } from '../../../../../../base/common/hotReloadHelpers.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { autorun, constObservable, derived, derivedDisposable, derivedWithCancellationToken, IObservable, observableFromEvent, ObservablePromise } from '../../../../../../base/common/observable.js';
+import { getIndentationLength, splitLines } from '../../../../../../base/common/strings.js';
+import { MenuWorkbenchToolBar } from '../../../../../../platform/actions/browser/toolbar.js';
+import { MenuId, MenuItemAction } from '../../../../../../platform/actions/common/actions.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { ICodeEditor } from '../../../../../browser/editorBrowser.js';
+import { observableCodeEditor } from '../../../../../browser/observableCodeEditor.js';
+import { EmbeddedCodeEditorWidget } from '../../../../../browser/widget/codeEditor/embeddedCodeEditorWidget.js';
+import { IDiffProviderFactoryService } from '../../../../../browser/widget/diffEditor/diffProviderFactoryService.js';
+import { diffAddDecoration, diffAddDecorationEmpty, diffDeleteDecorationEmpty, diffWholeLineAddDecoration, diffWholeLineDeleteDecoration } from '../../../../../browser/widget/diffEditor/registrations.contribution.js';
+import { appendRemoveOnDispose, applyStyle } from '../../../../../browser/widget/diffEditor/utils.js';
+import { EditorOption } from '../../../../../common/config/editorOptions.js';
+import { LineRange } from '../../../../../common/core/lineRange.js';
+import { OffsetRange } from '../../../../../common/core/offsetRange.js';
+import { Position } from '../../../../../common/core/position.js';
+import { Range } from '../../../../../common/core/range.js';
+import { ArrayText, SingleTextEdit, TextEdit } from '../../../../../common/core/textEdit.js';
+import { TextLength } from '../../../../../common/core/textLength.js';
+import { lineRangeMappingFromRangeMappings, RangeMapping } from '../../../../../common/diff/rangeMapping.js';
+import { IModelDeltaDecoration } from '../../../../../common/model.js';
+import { TextModel } from '../../../../../common/model/textModel.js';
+import { TextModelText } from '../../../../../common/model/textModelText.js';
+import { IModelService } from '../../../../../common/services/model.js';
+import { InlineEdit } from '../../model/inlineEdit.js';
+import './inlineEditsView.css';
+import { applyEditToModifiedRangeMappings, maxLeftInRange, Point, StatusBarViewItem, UniqueUriGenerator } from './utils.js';
+
+export class InlineEditsViewAndDiffProducer extends Disposable {
+	public static readonly hot = createHotClass(InlineEditsViewAndDiffProducer);
+
+	private readonly _modelUriGenerator = new UniqueUriGenerator('inline-edits');
+
+	private readonly _originalModel = derivedDisposable(() => this._modelService.createModel(
+		'', null, this._modelUriGenerator.getUniqueUri())).keepObserved(this._store);
+	private readonly _modifiedModel = derivedDisposable(() => this._modelService.createModel(
+		'', null, this._modelUriGenerator.getUniqueUri())).keepObserved(this._store);
+
+	private readonly _inlineEditPromise = derivedWithCancellationToken<ObservablePromise<InlineEditWithChanges | undefined> | undefined>(this, (reader, token) => {
+		const edit = this._edit.read(reader);
+		if (!edit) { return undefined; }
+		const range = edit.range;
+		if (edit.text.trim() === '') {
+			return undefined;
+		}
+
+		this._originalModel.get().setValue(this._editor.getModel()!.getValueInRange(range));
+		this._modifiedModel.get().setValue(edit.text);
+
+		const d = this._diffProviderFactoryService.createDiffProvider({ diffAlgorithm: 'advanced' });
+		return ObservablePromise.fromFn(async () => {
+			const result = await d.computeDiff(this._originalModel.get(), this._modifiedModel.get(), {
+				computeMoves: false,
+				ignoreTrimWhitespace: false,
+				maxComputationTimeMs: 1000,
+			}, token);
+
+			if (result.identical) { return undefined; }
+
+			const rangeStartPos = Range.lift(edit.range).getStartPosition();
+			const innerChanges = result.changes.flatMap(c => c.innerChanges!);
+
+			function addRangeToPos(pos: Position, range: Range): Range {
+				const start = TextLength.fromPosition(range.getStartPosition());
+				return TextLength.ofRange(range).createRange(start.addToPosition(pos));
+			}
+
+			const edits = innerChanges.map(c => new SingleTextEdit(addRangeToPos(rangeStartPos, c.originalRange), this._modifiedModel.get()!.getValueInRange(c.modifiedRange)));
+
+			/*if (edit.range.startColumn !== 1) {
+				const range = edit.range;
+				const textBefore = this._editor.getModel()!.getValueInRange(new Range(range.startLineNumber, 1, range.startLineNumber, range.startColumn));
+				const skippedTextEdit = TextEdit.insert(new Position(1, 1), textBefore);
+				innerChanges = applyEditToOriginalRangeMappings(innerChanges, skippedTextEdit);
+			}*/
+
+			return new InlineEditWithChanges(new TextEdit(edits));
+		});
+	});
+
+	private readonly _inlineEdit = this._inlineEditPromise.map((p, reader) => p?.promiseResult?.read(reader)?.data);
+
+	constructor(
+		private readonly _editor: ICodeEditor,
+		private readonly _edit: IObservable<InlineEdit | undefined>,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IDiffProviderFactoryService private readonly _diffProviderFactoryService: IDiffProviderFactoryService,
+		@IModelService private readonly _modelService: IModelService,
+	) {
+		super();
+
+		this._register(new InlineEditsView(this._editor, this._inlineEdit, this._instantiationService));
+	}
+}
+
+export class InlineEditWithChanges {
+	public readonly originalLineRange = LineRange.fromRangeInclusive(RangeMapping.fromEditJoin(this.diffedTextEdit).originalRange);
+	public readonly modifiedLineRange = LineRange.fromRangeInclusive(RangeMapping.fromEditJoin(this.diffedTextEdit).modifiedRange);
+
+	constructor(
+		public readonly diffedTextEdit: TextEdit,
+	) {
+	}
+}
+
+export class InlineEditsView extends Disposable {
+	private readonly _editorObs = observableCodeEditor(this._editor);
+
+	private readonly _elements = h('div.inline-edits-view', {
+		style: {
+			position: 'absolute',
+			overflow: 'visible',
+			top: '0px',
+			left: '0px',
+		},
+	}, [
+		h('div.editorContainer@editorContainer', { style: { position: 'absolute' } }, [
+			h('div.preview@editor', { style: {} }),
+			h('div.toolbar@toolbar', { style: {} }),
+		]),
+	]);
+
+	private readonly _indicator = h('div.inline-edits-view-indicator', {
+		style: {
+			position: 'absolute',
+			overflow: 'visible',
+		},
+	}, [
+		h('div.icon', {}, [
+			renderIcon(Codicon.arrowLeft),
+		]),
+		h('div.label', {}, [
+			' inline edit'
+		])
+	]);
+
+	private readonly _previewEditorWidth = derived(this, reader => {
+		const edit = this._edit.read(reader);
+		if (!edit) { return 0; }
+
+		return maxLeftInRange(this._previewEditorObs, edit.modifiedLineRange, reader);
+	});
+
+	constructor(
+		private readonly _editor: ICodeEditor,
+		private readonly _edit: IObservable<InlineEditWithChanges | undefined>,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+	) {
+		super();
+		const visible = derived(this, reader => this._edit.read(reader) !== undefined);
+		this._register(applyStyle(this._elements.root, {
+			display: derived(this, reader => visible.read(reader) ? 'block' : 'none')
+		}));
+
+		this._register(appendRemoveOnDispose(this._editor.getDomNode()!, this._elements.root));
+
+		this._register(observableCodeEditor(_editor).createOverlayWidget({
+			domNode: this._elements.root,
+			position: constObservable(null),
+			allowEditorOverflow: false,
+			minContentWidthInPx: derived(reader => {
+				const x = this._layout1.read(reader)?.left;
+				if (x === undefined) { return 0; }
+				const width = this._previewEditorWidth.read(reader);
+				return x + width;
+			}),
+		}));
+
+		this._register(observableCodeEditor(_editor).createOverlayWidget({
+			domNode: this._indicator.root,
+			position: constObservable(null),
+			allowEditorOverflow: false,
+			minContentWidthInPx: constObservable(0),
+		}));
+
+		this._previewEditor.setModel(this._previewTextModel);
+
+		this._register(this._previewEditorObs.setDecorations(this._decorations.map(d => d?.modifiedDecorations ?? [])));
+
+		this._register(observableCodeEditor(_editor).setDecorations(this._decorations.map(d => d?.originalDecorations ?? [])));
+
+		this._register(autorun(reader => {
+			const layoutInfo = this._layout.read(reader);
+			if (!layoutInfo) {
+				this._indicator.root.style.visibility = 'hidden';
+				return;
+			}
+			this._indicator.root.style.visibility = '';
+
+			const { topEdit, editHeight } = layoutInfo;
+
+			this._elements.editorContainer.style.top = `${topEdit.y}px`;
+			this._elements.editorContainer.style.left = `${topEdit.x}px`;
+
+			const width = this._previewEditorWidth.read(reader);
+			this._previewEditor.layout({ height: editHeight, width });
+
+			const i = this._editorObs.layoutInfo.read(reader);
+
+
+			const range = new OffsetRange(0, i.height - 30);
+
+			this._indicator.root.classList.toggle('top', topEdit.y < range.start);
+			this._indicator.root.classList.toggle('bottom', topEdit.y > range.endExclusive);
+			this._indicator.root.classList.toggle('contained', range.contains(topEdit.y));
+
+
+			this._indicator.root.style.top = `${range.clip(topEdit.y)}px`;
+			this._indicator.root.style.right = `${i.minimap.minimapWidth + i.verticalScrollbarWidth}px`;
+		}));
+
+		const toolbarDropdownVisible = observableFromEvent(this, this._toolbar.onDidChangeDropdownVisibility, (e) => e ?? false);
+
+		this._register(autorun(reader => {
+			this._elements.root.classList.toggle('toolbarDropdownVisible', toolbarDropdownVisible.read(reader));
+		}));
+	}
+
+	private readonly _uiState = derived(this, reader => {
+		const edit = this._edit.read(reader);
+		if (!edit) { return undefined; }
+
+		let newText = edit.diffedTextEdit.apply(new TextModelText(this._editor.getModel()!));
+
+		let mappings = RangeMapping.fromEdit(edit.diffedTextEdit);
+
+		const newLines = splitLines(newText);
+
+		function offsetRangeToRange(offsetRange: OffsetRange, startPos: Position): Range {
+			return new Range(
+				startPos.lineNumber,
+				startPos.column + offsetRange.start,
+				startPos.lineNumber,
+				startPos.column + offsetRange.endExclusive,
+			);
+		}
+
+		const edits: SingleTextEdit[] = [];
+		const minIndent = findFirstMin(edit.modifiedLineRange.mapToLineArray(l => getIndentationLength(newLines[l - 1])), numberComparator)!;
+		edit.modifiedLineRange.forEach(lineNumber => {
+			edits.push(new SingleTextEdit(offsetRangeToRange(new OffsetRange(0, minIndent), new Position(lineNumber, 1)), ''));
+		});
+		const indentationAdjustmentEdit = new TextEdit(edits);
+
+		newText = indentationAdjustmentEdit.applyToString(newText);
+		mappings = applyEditToModifiedRangeMappings(mappings, indentationAdjustmentEdit);
+
+		const diff = lineRangeMappingFromRangeMappings(mappings, new TextModelText(this._editor.getModel()!), new ArrayText(newLines));
+
+		return {
+			diff,
+			edit,
+			newText,
+			newTextLineCount: edit.modifiedLineRange.length,
+		};
+	});
+
+	protected readonly _toolbar = this._register(this._instantiationService.createInstance(MenuWorkbenchToolBar, this._elements.toolbar, MenuId.InlineEditsActions, {
+		menuOptions: { renderShortTitle: true },
+		toolbarOptions: {
+			primaryGroup: g => g.startsWith('primary'),
+		},
+		actionViewItemProvider: (action, options) => {
+			if (action instanceof MenuItemAction) {
+				return this._instantiationService.createInstance(StatusBarViewItem, action, undefined);
+			}
+			return undefined;
+		},
+	}));
+	private readonly _previewTextModel = this._register(this._instantiationService.createInstance(
+		TextModel,
+		'',
+		this._editor.getModel()!.getLanguageId(),
+		{ ...TextModel.DEFAULT_CREATION_OPTIONS, bracketPairColorizationOptions: { enabled: true, independentColorPoolPerBracketType: false } },
+		null
+	));
+
+	private readonly _previewEditor = this._register(this._instantiationService.createInstance(
+		EmbeddedCodeEditorWidget,
+		this._elements.editor,
+		{
+			glyphMargin: false,
+			lineNumbers: 'off',
+			minimap: { enabled: false },
+			guides: {
+				indentation: false,
+				bracketPairs: false,
+				bracketPairsHorizontal: false,
+				highlightActiveIndentation: false,
+			},
+			folding: false,
+			selectOnLineNumbers: false,
+			selectionHighlight: false,
+			columnSelection: false,
+			overviewRulerBorder: false,
+			overviewRulerLanes: 0,
+			lineDecorationsWidth: 0,
+			lineNumbersMinChars: 0,
+			bracketPairColorization: { enabled: true, independentColorPoolPerBracketType: false },
+			scrollBeyondLastLine: false,
+			scrollbar: {
+				vertical: 'hidden',
+				horizontal: 'hidden',
+			},
+			readOnly: true,
+		},
+		{ contributions: [], },
+		this._editor
+	));
+
+	private readonly _previewEditorObs = observableCodeEditor(this._previewEditor);
+
+	private readonly _ensureModelTextIsSet = derived(reader => {
+		const uiState = this._uiState.read(reader);
+		if (!uiState) { return; }
+
+		this._previewTextModel.setValue(uiState.newText);
+		const range = uiState.edit.originalLineRange;
+
+		this._previewEditor.setHiddenAreas([
+			new Range(1, 1, range.startLineNumber - 1, 1),
+			new Range(range.startLineNumber + uiState.newTextLineCount, 1, this._previewTextModel.getLineCount() + 1, 1),
+		], undefined, true);
+
+	}).recomputeInitiallyAndOnChange(this._store);
+
+	private readonly _decorations = derived(this, (reader) => {
+		this._ensureModelTextIsSet.read(reader);
+		const s = this._uiState.read(reader);
+		if (!s) { return undefined; }
+		const diff = s.diff;
+		const originalDecorations: IModelDeltaDecoration[] = [];
+		const modifiedDecorations: IModelDeltaDecoration[] = [];
+
+		for (const m of diff) {
+			if (m.modified.isEmpty || m.original.isEmpty) {
+				if (!m.original.isEmpty) {
+					originalDecorations.push({ range: m.original.toInclusiveRange()!, options: diffWholeLineDeleteDecoration });
+				}
+				if (!m.modified.isEmpty) {
+					modifiedDecorations.push({ range: m.modified.toInclusiveRange()!, options: diffWholeLineAddDecoration });
+				}
+			} else {
+				for (const i of m.innerChanges || []) {
+					// Don't show empty markers outside the line range
+					if (m.original.contains(i.originalRange.startLineNumber)) {
+						originalDecorations.push({
+							range: i.originalRange, options: i.originalRange.isEmpty() ? diffDeleteDecorationEmpty : {
+								className: 'char-delete',
+								description: 'char-delete',
+								shouldFillLineOnLineBreak: false,
+							}
+						});
+					}
+					if (m.modified.contains(i.modifiedRange.startLineNumber)) {
+						modifiedDecorations.push({ range: i.modifiedRange, options: i.modifiedRange.isEmpty() ? diffAddDecorationEmpty : diffAddDecoration });
+					}
+				}
+			}
+		}
+
+		return { originalDecorations, modifiedDecorations };
+	});
+
+	private readonly _layout1 = derived(this, reader => {
+		const inlineEdit = this._edit.read(reader);
+		if (!inlineEdit) { return null; }
+
+		const maxLeft = maxLeftInRange(this._editorObs, inlineEdit.originalLineRange, reader);
+
+		const contentLeft = this._editorObs.layoutInfoContentLeft.read(reader);
+		return { left: contentLeft + maxLeft };
+	});
+
+	private readonly _layout = derived(this, (reader) => {
+		const inlineEdit = this._edit.read(reader);
+		if (!inlineEdit) { return null; }
+
+		const range = inlineEdit.originalLineRange;
+
+		const scrollLeft = this._editorObs.scrollLeft.read(reader);
+
+		const left = this._layout1.read(reader)!.left + 20 - scrollLeft;
+
+		const selectionTop = this._editor.getTopForLineNumber(range.startLineNumber) - this._editorObs.scrollTop.read(reader);
+		const selectionBottom = this._editor.getTopForLineNumber(range.endLineNumberExclusive) - this._editorObs.scrollTop.read(reader);
+
+		const topCode = new Point(left, selectionTop);
+		const bottomCode = new Point(left, selectionBottom);
+		const codeHeight = selectionBottom - selectionTop;
+
+		const codeEditDist = 50;
+		const editHeight = this._editor.getOption(EditorOption.lineHeight) * inlineEdit.modifiedLineRange.length;
+
+		const topEdit = new Point(left + codeEditDist, selectionTop);
+		const bottomEdit = new Point(left + codeEditDist, selectionBottom);
+
+		return {
+			topCode,
+			bottomCode,
+			codeHeight,
+			topEdit,
+			bottomEdit,
+			editHeight,
+		};
+	});
+}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts
new file mode 100644
index 00000000000..ee3c11fcd1e
--- /dev/null
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts
@@ -0,0 +1,86 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { h } from '../../../../../../base/browser/dom.js';
+import { KeybindingLabel, unthemedKeybindingLabelOptions } from '../../../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
+import { IReader } from '../../../../../../base/common/observable.js';
+import { OS } from '../../../../../../base/common/platform.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { MenuEntryActionViewItem } from '../../../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { ObservableCodeEditor } from '../../../../../browser/observableCodeEditor.js';
+import { LineRange } from '../../../../../common/core/lineRange.js';
+import { TextEdit } from '../../../../../common/core/textEdit.js';
+import { RangeMapping } from '../../../../../common/diff/rangeMapping.js';
+
+export function maxLeftInRange(editor: ObservableCodeEditor, range: LineRange, reader: IReader): number {
+	editor.layoutInfo.read(reader);
+	editor.value.read(reader);
+	const model = editor.model.get()!;
+	if (!model) { return 0; }
+	let maxLeft = 0;
+
+	editor.scrollTop.read(reader);
+	for (let i = range.startLineNumber; i < range.endLineNumberExclusive; i++) {
+		const column = model.getLineMaxColumn(i);
+		const left = editor.editor.getOffsetForColumn(i, column);
+		maxLeft = Math.max(maxLeft, left);
+	}
+	return maxLeft;
+}
+
+export class StatusBarViewItem extends MenuEntryActionViewItem {
+	protected override updateLabel() {
+		const kb = this._keybindingService.lookupKeybinding(this._action.id, this._contextKeyService);
+		if (!kb) {
+			return super.updateLabel();
+		}
+		if (this.label) {
+			const div = h('div.keybinding').root;
+			const keybindingLabel = this._register(new KeybindingLabel(div, OS, { disableTitle: true, ...unthemedKeybindingLabelOptions }));
+			keybindingLabel.set(kb);
+			this.label.textContent = this._action.label;
+			this.label.appendChild(div);
+			this.label.classList.add('inlineSuggestionStatusBarItemLabel');
+		}
+	}
+
+	protected override updateTooltip(): void {
+		// NOOP, disable tooltip
+	}
+}
+
+export class Point {
+	constructor(
+		public readonly x: number,
+		public readonly y: number,
+	) { }
+
+	public add(other: Point): Point {
+		return new Point(this.x + other.x, this.y + other.y);
+	}
+
+	public deltaX(delta: number): Point {
+		return new Point(this.x + delta, this.y);
+	}
+}
+export class UniqueUriGenerator {
+	private static _modelId = 0;
+
+	constructor(
+		public readonly scheme: string
+	) { }
+
+	public getUniqueUri(): URI {
+		return URI.from({ scheme: this.scheme, path: new Date().toString() + String(UniqueUriGenerator._modelId++) });
+	}
+}
+export function applyEditToModifiedRangeMappings(rangeMapping: RangeMapping[], edit: TextEdit): RangeMapping[] {
+	const updatedMappings: RangeMapping[] = [];
+	for (const m of rangeMapping) {
+		const updatedRange = edit.mapRange(m.modifiedRange);
+		updatedMappings.push(new RangeMapping(m.originalRange, updatedRange));
+	}
+	return updatedMappings;
+}
diff --git a/src/vs/editor/contrib/inlineCompletions/test/browser/inlineCompletionsModel.test.ts b/src/vs/editor/contrib/inlineCompletions/test/browser/inlineCompletionsModel.test.ts
index 63ab19affbe..6ba5f06b158 100644
--- a/src/vs/editor/contrib/inlineCompletions/test/browser/inlineCompletionsModel.test.ts
+++ b/src/vs/editor/contrib/inlineCompletions/test/browser/inlineCompletionsModel.test.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { Position } from 'vs/editor/common/core/position';
-import { getSecondaryEdits } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel';
-import { SingleTextEdit } from 'vs/editor/common/core/textEdit';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
-import { Range } from 'vs/editor/common/core/range';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { Position } from '../../../../common/core/position.js';
+import { getSecondaryEdits } from '../../browser/model/inlineCompletionsModel.js';
+import { SingleTextEdit } from '../../../../common/core/textEdit.js';
+import { createTextModel } from '../../../../test/common/testTextModel.js';
+import { Range } from '../../../../common/core/range.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('inlineCompletionModel', () => {
 
diff --git a/src/vs/editor/contrib/inlineCompletions/test/browser/inlineCompletionsProvider.test.ts b/src/vs/editor/contrib/inlineCompletions/test/browser/inlineCompletionsProvider.test.ts
index e318702da15..28bd5ab66a4 100644
--- a/src/vs/editor/contrib/inlineCompletions/test/browser/inlineCompletionsProvider.test.ts
+++ b/src/vs/editor/contrib/inlineCompletions/test/browser/inlineCompletionsProvider.test.ts
@@ -4,25 +4,25 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { timeout } from 'vs/base/common/async';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Range } from 'vs/editor/common/core/range';
-import { InlineCompletionsProvider } from 'vs/editor/common/languages';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { LanguageFeaturesService } from 'vs/editor/common/services/languageFeaturesService';
-import { ViewModel } from 'vs/editor/common/viewModel/viewModelImpl';
-import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController';
-import { InlineCompletionsModel } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel';
-import { SingleTextEdit } from 'vs/editor/common/core/textEdit';
-import { GhostTextContext, MockInlineCompletionsProvider } from 'vs/editor/contrib/inlineCompletions/test/browser/utils';
-import { ITestCodeEditor, TestCodeEditorInstantiationOptions, withAsyncTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
-import { IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { Selection } from 'vs/editor/common/core/selection';
-import { computeGhostText } from 'vs/editor/contrib/inlineCompletions/browser/singleTextEdit';
+import { timeout } from '../../../../../base/common/async.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { runWithFakedTimers } from '../../../../../base/test/common/timeTravelScheduler.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Range } from '../../../../common/core/range.js';
+import { InlineCompletionsProvider } from '../../../../common/languages.js';
+import { ILanguageFeaturesService } from '../../../../common/services/languageFeatures.js';
+import { LanguageFeaturesService } from '../../../../common/services/languageFeaturesService.js';
+import { ViewModel } from '../../../../common/viewModel/viewModelImpl.js';
+import { InlineCompletionsController } from '../../browser/controller/inlineCompletionsController.js';
+import { InlineCompletionsModel } from '../../browser/model/inlineCompletionsModel.js';
+import { SingleTextEdit } from '../../../../common/core/textEdit.js';
+import { GhostTextContext, MockInlineCompletionsProvider } from './utils.js';
+import { ITestCodeEditor, TestCodeEditorInstantiationOptions, withAsyncTestCodeEditor } from '../../../../test/browser/testCodeEditor.js';
+import { createTextModel } from '../../../../test/common/testTextModel.js';
+import { IAccessibilitySignalService } from '../../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
+import { Selection } from '../../../../common/core/selection.js';
+import { computeGhostText } from '../../browser/model/computeGhostText.js';
 
 suite('Inline Completions', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/editor/contrib/inlineCompletions/test/browser/suggestWidgetModel.test.ts b/src/vs/editor/contrib/inlineCompletions/test/browser/suggestWidgetModel.test.ts
index a860898c64e..aa8fe85b002 100644
--- a/src/vs/editor/contrib/inlineCompletions/test/browser/suggestWidgetModel.test.ts
+++ b/src/vs/editor/contrib/inlineCompletions/test/browser/suggestWidgetModel.test.ts
@@ -3,39 +3,39 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { timeout } from 'vs/base/common/async';
-import { Event } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { mock } from 'vs/base/test/common/mock';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { Range } from 'vs/editor/common/core/range';
-import { CompletionItemKind, CompletionItemProvider } from 'vs/editor/common/languages';
-import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { ViewModel } from 'vs/editor/common/viewModel/viewModelImpl';
-import { GhostTextContext } from 'vs/editor/contrib/inlineCompletions/test/browser/utils';
-import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2';
-import { SuggestController } from 'vs/editor/contrib/suggest/browser/suggestController';
-import { ISuggestMemoryService } from 'vs/editor/contrib/suggest/browser/suggestMemory';
-import { ITestCodeEditor, TestCodeEditorInstantiationOptions, withAsyncTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
-import { IMenu, IMenuService } from 'vs/platform/actions/common/actions';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { MockKeybindingService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { ILogService, NullLogService } from 'vs/platform/log/common/log';
-import { InMemoryStorageService, IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
+import { timeout } from '../../../../../base/common/async.js';
+import { Event } from '../../../../../base/common/event.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { mock } from '../../../../../base/test/common/mock.js';
+import { runWithFakedTimers } from '../../../../../base/test/common/timeTravelScheduler.js';
+import { Range } from '../../../../common/core/range.js';
+import { CompletionItemKind, CompletionItemProvider } from '../../../../common/languages.js';
+import { IEditorWorkerService } from '../../../../common/services/editorWorker.js';
+import { ViewModel } from '../../../../common/viewModel/viewModelImpl.js';
+import { GhostTextContext } from './utils.js';
+import { SnippetController2 } from '../../../snippet/browser/snippetController2.js';
+import { SuggestController } from '../../../suggest/browser/suggestController.js';
+import { ISuggestMemoryService } from '../../../suggest/browser/suggestMemory.js';
+import { ITestCodeEditor, TestCodeEditorInstantiationOptions, withAsyncTestCodeEditor } from '../../../../test/browser/testCodeEditor.js';
+import { IMenu, IMenuService } from '../../../../../platform/actions/common/actions.js';
+import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { MockKeybindingService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { ILogService, NullLogService } from '../../../../../platform/log/common/log.js';
+import { InMemoryStorageService, IStorageService } from '../../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { NullTelemetryService } from '../../../../../platform/telemetry/common/telemetryUtils.js';
 import assert from 'assert';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { LanguageFeaturesService } from 'vs/editor/common/services/languageFeaturesService';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { InlineCompletionsModel } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel';
-import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController';
-import { autorun } from 'vs/base/common/observable';
-import { setUnexpectedErrorHandler } from 'vs/base/common/errors';
-import { IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { ILabelService } from '../../../../../platform/label/common/label.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { LanguageFeaturesService } from '../../../../common/services/languageFeaturesService.js';
+import { ILanguageFeaturesService } from '../../../../common/services/languageFeatures.js';
+import { InlineCompletionsModel } from '../../browser/model/inlineCompletionsModel.js';
+import { InlineCompletionsController } from '../../browser/controller/inlineCompletionsController.js';
+import { autorun } from '../../../../../base/common/observable.js';
+import { setUnexpectedErrorHandler } from '../../../../../base/common/errors.js';
+import { IAccessibilitySignalService } from '../../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('Suggest Widget Model', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/editor/contrib/inlineCompletions/test/browser/utils.ts b/src/vs/editor/contrib/inlineCompletions/test/browser/utils.ts
index 11c24b0b0e6..9cd0d114694 100644
--- a/src/vs/editor/contrib/inlineCompletions/test/browser/utils.ts
+++ b/src/vs/editor/contrib/inlineCompletions/test/browser/utils.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { timeout } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { CoreEditingCommands, CoreNavigationCommands } from 'vs/editor/browser/coreCommands';
-import { Position } from 'vs/editor/common/core/position';
-import { ITextModel } from 'vs/editor/common/model';
-import { InlineCompletion, InlineCompletionContext, InlineCompletionsProvider } from 'vs/editor/common/languages';
-import { ITestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
-import { InlineCompletionsModel } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel';
-import { autorun } from 'vs/base/common/observable';
+import { timeout } from '../../../../../base/common/async.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { CoreEditingCommands, CoreNavigationCommands } from '../../../../browser/coreCommands.js';
+import { Position } from '../../../../common/core/position.js';
+import { ITextModel } from '../../../../common/model.js';
+import { InlineCompletion, InlineCompletionContext, InlineCompletionsProvider } from '../../../../common/languages.js';
+import { ITestCodeEditor } from '../../../../test/browser/testCodeEditor.js';
+import { InlineCompletionsModel } from '../../browser/model/inlineCompletionsModel.js';
+import { autorun } from '../../../../../base/common/observable.js';
 
 export class MockInlineCompletionsProvider implements InlineCompletionsProvider {
 	private returnValue: InlineCompletion[] = [];
diff --git a/src/vs/editor/contrib/inlineEdit/browser/commands.ts b/src/vs/editor/contrib/inlineEdit/browser/commands.ts
index d7e1f4fe8cb..268fba6229a 100644
--- a/src/vs/editor/contrib/inlineEdit/browser/commands.ts
+++ b/src/vs/editor/contrib/inlineEdit/browser/commands.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { inlineEditAcceptId, inlineEditJumpBackId, inlineEditJumpToId, inlineEditRejectId } from 'vs/editor/contrib/inlineEdit/browser/commandIds';
-import { InlineEditController } from 'vs/editor/contrib/inlineEdit/browser/inlineEditController';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorAction, ServicesAccessor } from '../../../browser/editorExtensions.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { inlineEditAcceptId, inlineEditJumpBackId, inlineEditJumpToId, inlineEditRejectId } from './commandIds.js';
+import { InlineEditController } from './inlineEditController.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 
 export class AcceptInlineEdit extends EditorAction {
 	constructor() {
diff --git a/src/vs/editor/contrib/inlineEdit/browser/ghostTextWidget.ts b/src/vs/editor/contrib/inlineEdit/browser/ghostTextWidget.ts
index 298fcd4452e..5941538ef69 100644
--- a/src/vs/editor/contrib/inlineEdit/browser/ghostTextWidget.ts
+++ b/src/vs/editor/contrib/inlineEdit/browser/ghostTextWidget.ts
@@ -3,19 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IObservable, derived, observableFromEvent, observableValue } from 'vs/base/common/observable';
-import 'vs/css!./inlineEdit';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { Position } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IModelDeltaDecoration, ITextModel, InjectedTextCursorStops } from 'vs/editor/common/model';
-import { LineDecoration } from 'vs/editor/common/viewLayout/lineDecorations';
-import { InlineDecorationType } from 'vs/editor/common/viewModel';
-import { AdditionalLinesWidget, LineData } from 'vs/editor/contrib/inlineCompletions/browser/ghostTextWidget';
-import { GhostText } from 'vs/editor/contrib/inlineCompletions/browser/ghostText';
-import { ColumnRange, applyObservableDecorations } from 'vs/editor/contrib/inlineCompletions/browser/utils';
+import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { IObservable, derived, observableFromEvent, observableValue } from '../../../../base/common/observable.js';
+import './inlineEdit.css';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { Position } from '../../../common/core/position.js';
+import { IRange, Range } from '../../../common/core/range.js';
+import { ILanguageService } from '../../../common/languages/language.js';
+import { IModelDeltaDecoration, ITextModel, InjectedTextCursorStops } from '../../../common/model.js';
+import { LineDecoration } from '../../../common/viewLayout/lineDecorations.js';
+import { InlineDecorationType } from '../../../common/viewModel.js';
+import { AdditionalLinesWidget, LineData } from '../../inlineCompletions/browser/view/ghostText/ghostTextView.js';
+import { GhostText } from '../../inlineCompletions/browser/model/ghostText.js';
+import { ColumnRange } from '../../inlineCompletions/browser/utils.js';
+import { diffDeleteDecoration, diffLineDeleteDecorationBackgroundWithIndicator } from '../../../browser/widget/diffEditor/registrations.contribution.js';
+import { LineTokens } from '../../../common/tokens/lineTokens.js';
+import { observableCodeEditor } from '../../../browser/observableCodeEditor.js';
 
 export const INLINE_EDIT_DESCRIPTION = 'inline-edit';
 export interface IGhostTextWidgetModel {
@@ -23,22 +26,24 @@ export interface IGhostTextWidgetModel {
 	readonly ghostText: IObservable<GhostText | undefined>;
 	readonly minReservedLineCount: IObservable<number>;
 	readonly range: IObservable<IRange | undefined>;
-	readonly backgroundColoring: IObservable<boolean>;
 }
 
 export class GhostTextWidget extends Disposable {
 	private readonly isDisposed = observableValue(this, false);
-	private readonly currentTextModel = observableFromEvent(this.editor.onDidChangeModel, () => /** @description editor.model */ this.editor.getModel());
+	private readonly currentTextModel = observableFromEvent(this, this._editor.onDidChangeModel, () => /** @description editor.model */ this._editor.getModel());
+
+	private readonly _editorObs = observableCodeEditor(this._editor);
 
 	constructor(
-		private readonly editor: ICodeEditor,
+		private readonly _editor: ICodeEditor,
 		readonly model: IGhostTextWidgetModel,
 		@ILanguageService private readonly languageService: ILanguageService,
 	) {
 		super();
 
 		this._register(toDisposable(() => { this.isDisposed.set(true, undefined); }));
-		this._register(applyObservableDecorations(this.editor, this.decorations));
+
+		this._register(this._editorObs.setDecorations(this.decorations));
 	}
 
 	private readonly uiState = derived(this, reader => {
@@ -54,7 +59,6 @@ export class GhostTextWidget extends Disposable {
 			return undefined;
 		}
 
-
 		let range = this.model.range?.read(reader);
 		//if range is empty, we want to remove it
 		if (range && range.startLineNumber === range.endLineNumber && range.startColumn === range.endColumn) {
@@ -68,13 +72,20 @@ export class GhostTextWidget extends Disposable {
 		const isPureRemove = ghostText.parts.length === 1 && ghostText.parts[0].lines.every(l => l.length === 0);
 
 		const inlineTexts: { column: number; text: string; preview: boolean }[] = [];
-		const additionalLines: LineData[] = [];
+		const additionalLines: { content: string; decorations: LineDecoration[] }[] = [];
 
 		function addToAdditionalLines(lines: readonly string[], className: string | undefined) {
 			if (additionalLines.length > 0) {
 				const lastLine = additionalLines[additionalLines.length - 1];
 				if (className) {
-					lastLine.decorations.push(new LineDecoration(lastLine.content.length + 1, lastLine.content.length + 1 + lines[0].length, className, InlineDecorationType.Regular));
+					lastLine.decorations.push(
+						new LineDecoration(
+							lastLine.content.length + 1,
+							lastLine.content.length + 1 + lines[0].length,
+							className,
+							InlineDecorationType.Regular
+						)
+					);
 				}
 				lastLine.content += lines[0];
 
@@ -92,7 +103,7 @@ export class GhostTextWidget extends Disposable {
 
 		let hiddenTextStartColumn: number | undefined = undefined;
 		let lastIdx = 0;
-		if (!isPureRemove) {
+		if (!isPureRemove && (isSingleLine || !range)) {
 			for (const part of ghostText.parts) {
 				let lines = part.lines;
 				//If remove range is set, we want to push all new liens to virtual area
@@ -140,7 +151,6 @@ export class GhostTextWidget extends Disposable {
 			range,
 			isSingleLine,
 			isPureRemove,
-			backgroundColoring: this.model.backgroundColoring.read(reader)
 		};
 	});
 
@@ -164,7 +174,7 @@ export class GhostTextWidget extends Disposable {
 			if (uiState.isSingleLine) {
 				ranges.push(uiState.range);
 			}
-			else if (uiState.isPureRemove) {
+			else if (!uiState.isPureRemove) {
 				const lines = uiState.range.endLineNumber - uiState.range.startLineNumber;
 				for (let i = 0; i < lines; i++) {
 					const line = uiState.range.startLineNumber + i;
@@ -174,24 +184,22 @@ export class GhostTextWidget extends Disposable {
 					ranges.push(range);
 				}
 			}
-			else {
-				const lines = uiState.range.endLineNumber - uiState.range.startLineNumber;
-				for (let i = 0; i < lines; i++) {
-					const line = uiState.range.startLineNumber + i;
-					const firstNonWhitespace = uiState.targetTextModel.getLineFirstNonWhitespaceColumn(line);
-					const lastNonWhitespace = uiState.targetTextModel.getLineLastNonWhitespaceColumn(line);
-					const range = new Range(line, firstNonWhitespace, line, lastNonWhitespace);
-					ranges.push(range);
-				}
-			}
-			const className = uiState.backgroundColoring ? 'inline-edit-remove backgroundColoring' : 'inline-edit-remove';
 			for (const range of ranges) {
 				decorations.push({
 					range,
-					options: { inlineClassName: className, description: 'inline-edit-remove', }
+					options: diffDeleteDecoration
 				});
 			}
 		}
+		if (uiState.range && !uiState.isSingleLine && uiState.isPureRemove) {
+			const r = new Range(uiState.range.startLineNumber, 1, uiState.range.endLineNumber - 1, 1);
+
+			decorations.push({
+				range: r,
+				options: diffLineDeleteDecorationBackgroundWithIndicator
+			});
+
+		}
 
 		for (const p of uiState.inlineTexts) {
 
@@ -210,14 +218,16 @@ export class GhostTextWidget extends Disposable {
 
 	private readonly additionalLinesWidget = this._register(
 		new AdditionalLinesWidget(
-			this.editor,
-			this.languageService.languageIdCodec,
+			this._editor,
 			derived(reader => {
 				/** @description lines */
 				const uiState = this.uiState.read(reader);
-				return uiState && !uiState.isPureRemove ? {
+				return uiState && !uiState.isPureRemove && (uiState.isSingleLine || !uiState.range) ? {
 					lineNumber: uiState.lineNumber,
-					additionalLines: uiState.additionalLines,
+					additionalLines: uiState.additionalLines.map(l => ({
+						content: LineTokens.createEmpty(l.content, this.languageService.languageIdCodec),
+						decorations: l.decorations
+					} satisfies LineData)),
 					minReservedLineCount: uiState.additionalReservedLineCount,
 					targetTextModel: uiState.targetTextModel,
 				} : undefined;
diff --git a/src/vs/editor/contrib/inlineEdit/browser/hoverParticipant.ts b/src/vs/editor/contrib/inlineEdit/browser/hoverParticipant.ts
index 6c1c7337f7f..41ffacc77bd 100644
--- a/src/vs/editor/contrib/inlineEdit/browser/hoverParticipant.ts
+++ b/src/vs/editor/contrib/inlineEdit/browser/hoverParticipant.ts
@@ -3,17 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { constObservable } from 'vs/base/common/observable';
-import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Range } from 'vs/editor/common/core/range';
-import { IModelDecoration } from 'vs/editor/common/model';
-import { HoverAnchor, HoverAnchorType, HoverForeignElementAnchor, IEditorHoverParticipant, IEditorHoverRenderContext, IHoverPart } from 'vs/editor/contrib/hover/browser/hoverTypes';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { InlineEditController } from 'vs/editor/contrib/inlineEdit/browser/inlineEditController';
-import { InlineEditHintsContentWidget } from 'vs/editor/contrib/inlineEdit/browser/inlineEditHintsWidget';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { constObservable } from '../../../../base/common/observable.js';
+import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from '../../../browser/editorBrowser.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { Range } from '../../../common/core/range.js';
+import { IModelDecoration } from '../../../common/model.js';
+import { HoverAnchor, HoverAnchorType, HoverForeignElementAnchor, IEditorHoverParticipant, IEditorHoverRenderContext, IHoverPart, IRenderedHoverPart, IRenderedHoverParts, RenderedHoverParts } from '../../hover/browser/hoverTypes.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { InlineEditController } from './inlineEditController.js';
+import { InlineEditHintsContentWidget } from './inlineEditHintsWidget.js';
+import * as nls from '../../../../nls.js';
 
 export class InlineEditHover implements IHoverPart {
 	constructor(
@@ -86,8 +87,8 @@ export class InlineEditHoverParticipant implements IEditorHoverParticipant<Inlin
 		return [];
 	}
 
-	renderHoverParts(context: IEditorHoverRenderContext, hoverParts: InlineEditHover[]): IDisposable {
-		const disposableStore = new DisposableStore();
+	renderHoverParts(context: IEditorHoverRenderContext, hoverParts: InlineEditHover[]): IRenderedHoverParts<InlineEditHover> {
+		const disposables = new DisposableStore();
 
 		this._telemetryService.publicLog2<{}, {
 			owner: 'hediet';
@@ -97,9 +98,17 @@ export class InlineEditHoverParticipant implements IEditorHoverParticipant<Inlin
 		const w = this._instantiationService.createInstance(InlineEditHintsContentWidget, this._editor, false,
 			constObservable(null),
 		);
-		context.fragment.appendChild(w.getDomNode());
-		disposableStore.add(w);
+		disposables.add(w);
+		const widgetNode: HTMLElement = w.getDomNode();
+		const renderedHoverPart: IRenderedHoverPart<InlineEditHover> = {
+			hoverPart: hoverParts[0],
+			hoverElement: widgetNode,
+			dispose: () => disposables.dispose()
+		};
+		return new RenderedHoverParts([renderedHoverPart]);
+	}
 
-		return disposableStore;
+	getAccessibleContent(hoverPart: InlineEditHover): string {
+		return nls.localize('hoverAccessibilityInlineEdits', 'There are inline edits here.');
 	}
 }
diff --git a/src/vs/editor/contrib/inlineEdit/browser/inlineEdit.contribution.ts b/src/vs/editor/contrib/inlineEdit/browser/inlineEdit.contribution.ts
index 7196773a7cf..9f5a6c3dfb8 100644
--- a/src/vs/editor/contrib/inlineEdit/browser/inlineEdit.contribution.ts
+++ b/src/vs/editor/contrib/inlineEdit/browser/inlineEdit.contribution.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { EditorContributionInstantiation, registerEditorAction, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { HoverParticipantRegistry } from 'vs/editor/contrib/hover/browser/hoverTypes';
-import { AcceptInlineEdit, JumpBackInlineEdit, JumpToInlineEdit, RejectInlineEdit, TriggerInlineEdit } from 'vs/editor/contrib/inlineEdit/browser/commands';
-import { InlineEditHoverParticipant } from 'vs/editor/contrib/inlineEdit/browser/hoverParticipant';
-import { InlineEditController } from 'vs/editor/contrib/inlineEdit/browser/inlineEditController';
+import { EditorContributionInstantiation, registerEditorAction, registerEditorContribution } from '../../../browser/editorExtensions.js';
+// import { HoverParticipantRegistry } from 'vs/editor/contrib/hover/browser/hoverTypes';
+import { AcceptInlineEdit, JumpBackInlineEdit, JumpToInlineEdit, RejectInlineEdit, TriggerInlineEdit } from './commands.js';
+// import { InlineEditHoverParticipant } from 'vs/editor/contrib/inlineEdit/browser/hoverParticipant';
+import { InlineEditController } from './inlineEditController.js';
 
 registerEditorAction(AcceptInlineEdit);
 registerEditorAction(RejectInlineEdit);
@@ -17,4 +17,4 @@ registerEditorAction(TriggerInlineEdit);
 registerEditorContribution(InlineEditController.ID, InlineEditController, EditorContributionInstantiation.Eventually);
 
 
-HoverParticipantRegistry.register(InlineEditHoverParticipant);
+// HoverParticipantRegistry.register(InlineEditHoverParticipant);
diff --git a/src/vs/editor/contrib/inlineEdit/browser/inlineEdit.css b/src/vs/editor/contrib/inlineEdit/browser/inlineEdit.css
index d6d156544e0..aced5d6271e 100644
--- a/src/vs/editor/contrib/inlineEdit/browser/inlineEdit.css
+++ b/src/vs/editor/contrib/inlineEdit/browser/inlineEdit.css
@@ -6,11 +6,6 @@
 .monaco-editor .inline-edit-remove {
 	background-color: var(--vscode-editorGhostText-background);
 	font-style: italic;
-	text-decoration: line-through;
-}
-
-.monaco-editor .inline-edit-remove.backgroundColoring {
-	background-color: var(--vscode-diffEditor-removedLineBackground);
 }
 
 .monaco-editor .inline-edit-hidden {
diff --git a/src/vs/editor/contrib/inlineEdit/browser/inlineEditController.ts b/src/vs/editor/contrib/inlineEdit/browser/inlineEditController.ts
index 283e72be068..fdd3995abdf 100644
--- a/src/vs/editor/contrib/inlineEdit/browser/inlineEditController.ts
+++ b/src/vs/editor/contrib/inlineEdit/browser/inlineEditController.ts
@@ -3,58 +3,83 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { ISettableObservable, autorun, constObservable, disposableObservableValue, observableFromEvent, observableSignalFromEvent, observableValue, transaction } from 'vs/base/common/observable';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditOperation } from 'vs/editor/common/core/editOperation';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { GhostTextWidget } from 'vs/editor/contrib/inlineEdit/browser/ghostTextWidget';
-import { IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IInlineEdit, InlineEditTriggerKind } from 'vs/editor/common/languages';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { GhostText, GhostTextPart } from 'vs/editor/contrib/inlineCompletions/browser/ghostText';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { InlineEditHintsWidget } from 'vs/editor/contrib/inlineEdit/browser/inlineEditHintsWidget';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { createStyleSheet2 } from 'vs/base/browser/dom';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { onUnexpectedExternalError } from 'vs/base/common/errors';
-
-export class InlineEditWidget implements IDisposable {
-	constructor(public readonly widget: GhostTextWidget, public readonly edit: IInlineEdit) { }
-
-	dispose(): void {
-		this.widget.dispose();
-	}
-}
+import { createStyleSheet2 } from '../../../../base/browser/dom.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { onUnexpectedExternalError } from '../../../../base/common/errors.js';
+import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
+import { ISettableObservable, autorun, constObservable, derived, derivedDisposable, observableFromEvent, observableSignalFromEvent, observableValue, transaction } from '../../../../base/common/observable.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { observableConfigValue } from '../../../../platform/observable/common/platformObservableUtils.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { IDiffProviderFactoryService } from '../../../browser/widget/diffEditor/diffProviderFactoryService.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { EditOperation } from '../../../common/core/editOperation.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { IInlineEdit, InlineEditTriggerKind } from '../../../common/languages.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { IModelService } from '../../../common/services/model.js';
+import { GhostText, GhostTextPart } from '../../inlineCompletions/browser/model/ghostText.js';
+import { InlineEditsAdapter } from '../../inlineCompletions/browser/model/inlineEditsAdapter.js';
+import { GhostTextWidget } from './ghostTextWidget.js';
+import { InlineEditHintsWidget } from './inlineEditHintsWidget.js';
+import { InlineEditSideBySideWidget } from './inlineEditSideBySideWidget.js';
 
 export class InlineEditController extends Disposable {
 	static ID = 'editor.contrib.inlineEditController';
 
 	public static readonly inlineEditVisibleKey = 'inlineEditVisible';
-	public static readonly inlineEditVisibleContext = new RawContextKey<boolean>(InlineEditController.inlineEditVisibleKey, false);
+	public static readonly inlineEditVisibleContext = new RawContextKey<boolean>(this.inlineEditVisibleKey, false);
 	private _isVisibleContext = InlineEditController.inlineEditVisibleContext.bindTo(this.contextKeyService);
 
 	public static readonly cursorAtInlineEditKey = 'cursorAtInlineEdit';
-	public static readonly cursorAtInlineEditContext = new RawContextKey<boolean>(InlineEditController.cursorAtInlineEditKey, false);
+	public static readonly cursorAtInlineEditContext = new RawContextKey<boolean>(this.cursorAtInlineEditKey, false);
 	private _isCursorAtInlineEditContext = InlineEditController.cursorAtInlineEditContext.bindTo(this.contextKeyService);
 
 	public static get(editor: ICodeEditor): InlineEditController | null {
 		return editor.getContribution<InlineEditController>(InlineEditController.ID);
 	}
 
-	private _currentEdit: ISettableObservable<InlineEditWidget | undefined> = this._register(disposableObservableValue(this, undefined));
+	private _currentEdit: ISettableObservable<IInlineEdit | undefined> = observableValue(this, undefined);
+	private _currentWidget = derivedDisposable(this._currentEdit, (reader) => {
+		const edit = this._currentEdit.read(reader);
+		if (!edit) {
+			return undefined;
+		}
+		const line = edit.range.endLineNumber;
+		const column = edit.range.endColumn;
+		const textToDisplay = edit.text.endsWith('\n') && !(edit.range.startLineNumber === edit.range.endLineNumber && edit.range.startColumn === edit.range.endColumn) ? edit.text.slice(0, -1) : edit.text;
+		const ghostText = new GhostText(line, [new GhostTextPart(column, textToDisplay, false)]);
+		//only show ghost text for single line edits
+		//unless it is a pure removal
+		//multi line edits are shown in the side by side widget
+		const isSingleLine = edit.range.startLineNumber === edit.range.endLineNumber && ghostText.parts.length === 1 && ghostText.parts[0].lines.length === 1;
+		const isPureRemoval = edit.text === '';
+		if (!isSingleLine && !isPureRemoval) {
+			return undefined;
+		}
+		const instance = this.instantiationService.createInstance(GhostTextWidget, this.editor, {
+			ghostText: constObservable(ghostText),
+			minReservedLineCount: constObservable(0),
+			targetTextModel: constObservable(this.editor.getModel() ?? undefined),
+			range: constObservable(edit.range)
+		});
+		return instance;
+	});
 	private _currentRequestCts: CancellationTokenSource | undefined;
 
 	private _jumpBackPosition: Position | undefined;
 	private _isAccepting: ISettableObservable<boolean> = observableValue(this, false);
 
-	private readonly _enabled = observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.inlineEdit).enabled);
-	private readonly _fontFamily = observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.inlineEdit).fontFamily);
-	private readonly _backgroundColoring = observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.inlineEdit).backgroundColoring);
+	private readonly _inlineCompletionInlineEdits = observableConfigValue(InlineEditsAdapter.experimentalInlineEditsEnabled, false, this._configurationService);
+
+	private readonly _inlineEditEnabled = observableFromEvent(this, this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.inlineEdit).enabled);
+	private readonly _enabled = derived(this, reader => this._inlineEditEnabled.read(reader) && !this._inlineCompletionInlineEdits.read(reader));
+
+	private readonly _fontFamily = observableFromEvent(this, this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.inlineEdit).fontFamily);
 
 
 	constructor(
@@ -64,6 +89,8 @@ export class InlineEditController extends Disposable {
 		@ILanguageFeaturesService private readonly languageFeaturesService: ILanguageFeaturesService,
 		@ICommandService private readonly _commandService: ICommandService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IDiffProviderFactoryService private readonly _diffProviderFactoryService: IDiffProviderFactoryService,
+		@IModelService private readonly _modelService: IModelService,
 	) {
 		super();
 
@@ -84,7 +111,7 @@ export class InlineEditController extends Disposable {
 		}));
 
 		//Check if the cursor is at the ghost text
-		const cursorPosition = observableFromEvent(editor.onDidChangeCursorPosition, () => editor.getPosition());
+		const cursorPosition = observableFromEvent(this, editor.onDidChangeCursorPosition, () => editor.getPosition());
 		this._register(autorun(reader => {
 			/** @description InlineEditController.cursorPositionChanged model */
 			if (!this._enabled.read(reader)) {
@@ -154,7 +181,8 @@ export class InlineEditController extends Disposable {
 }`);
 		}));
 
-		this._register(new InlineEditHintsWidget(this.editor, this._currentEdit, this.instantiationService));
+		this._register(new InlineEditHintsWidget(this.editor, this._currentWidget, this.instantiationService));
+		this._register(new InlineEditSideBySideWidget(this.editor, this._currentEdit, this.instantiationService, this._diffProviderFactoryService, this._modelService));
 	}
 
 	private checkCursorPosition(position: Position) {
@@ -162,7 +190,7 @@ export class InlineEditController extends Disposable {
 			this._isCursorAtInlineEditContext.set(false);
 			return;
 		}
-		const gt = this._currentEdit.get()?.edit;
+		const gt = this._currentEdit.get();
 		if (!gt) {
 			this._isCursorAtInlineEditContext.set(false);
 			return;
@@ -231,18 +259,7 @@ export class InlineEditController extends Disposable {
 		if (!edit) {
 			return;
 		}
-		const line = edit.range.endLineNumber;
-		const column = edit.range.endColumn;
-		const textToDisplay = edit.text.endsWith('\n') && !(edit.range.startLineNumber === edit.range.endLineNumber && edit.range.startColumn === edit.range.endColumn) ? edit.text.slice(0, -1) : edit.text;
-		const ghostText = new GhostText(line, [new GhostTextPart(column, textToDisplay, false)]);
-		const instance = this.instantiationService.createInstance(GhostTextWidget, this.editor, {
-			ghostText: constObservable(ghostText),
-			minReservedLineCount: constObservable(0),
-			targetTextModel: constObservable(this.editor.getModel() ?? undefined),
-			range: constObservable(edit.range),
-			backgroundColoring: this._backgroundColoring
-		});
-		this._currentEdit.set(new InlineEditWidget(instance, edit), undefined);
+		this._currentEdit.set(edit, undefined);
 	}
 
 	public async trigger() {
@@ -260,7 +277,7 @@ export class InlineEditController extends Disposable {
 
 	public async accept() {
 		this._isAccepting.set(true, undefined);
-		const data = this._currentEdit.get()?.edit;
+		const data = this._currentEdit.get();
 		if (!data) {
 			return;
 		}
@@ -287,7 +304,7 @@ export class InlineEditController extends Disposable {
 	public jumpToCurrent(): void {
 		this._jumpBackPosition = this.editor.getSelection()?.getStartPosition();
 
-		const data = this._currentEdit.get()?.edit;
+		const data = this._currentEdit.get();
 		if (!data) {
 			return;
 		}
@@ -298,7 +315,7 @@ export class InlineEditController extends Disposable {
 	}
 
 	public async clear(sendRejection: boolean = true) {
-		const edit = this._currentEdit.get()?.edit;
+		const edit = this._currentEdit.get();
 		if (edit && edit?.rejected && sendRejection) {
 			await this._commandService
 				.executeCommand(edit.rejected.id, ...(edit.rejected.arguments || []))
@@ -324,11 +341,15 @@ export class InlineEditController extends Disposable {
 
 	public shouldShowHoverAt(range: Range) {
 		const currentEdit = this._currentEdit.get();
+		const currentWidget = this._currentWidget.get();
 		if (!currentEdit) {
 			return false;
 		}
-		const edit = currentEdit.edit;
-		const model = currentEdit.widget.model;
+		if (!currentWidget) {
+			return false;
+		}
+		const edit = currentEdit;
+		const model = currentWidget.model;
 		const overReplaceRange = Range.containsPosition(edit.range, range.getStartPosition()) || Range.containsPosition(edit.range, range.getEndPosition());
 		if (overReplaceRange) {
 			return true;
@@ -341,7 +362,7 @@ export class InlineEditController extends Disposable {
 	}
 
 	public shouldShowHoverAtViewZone(viewZoneId: string): boolean {
-		return this._currentEdit.get()?.widget.ownsViewZone(viewZoneId) ?? false;
+		return this._currentWidget.get()?.ownsViewZone(viewZoneId) ?? false;
 	}
 
 }
diff --git a/src/vs/editor/contrib/inlineEdit/browser/inlineEditHintsWidget.ts b/src/vs/editor/contrib/inlineEdit/browser/inlineEditHintsWidget.ts
index ee0b537a88c..6bbbe5fce5d 100644
--- a/src/vs/editor/contrib/inlineEdit/browser/inlineEditHintsWidget.ts
+++ b/src/vs/editor/contrib/inlineEdit/browser/inlineEditHintsWidget.ts
@@ -3,36 +3,36 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { h } from 'vs/base/browser/dom';
-import { KeybindingLabel, unthemedKeybindingLabelOptions } from 'vs/base/browser/ui/keybindingLabel/keybindingLabel';
-import { IAction, Separator } from 'vs/base/common/actions';
-import { equals } from 'vs/base/common/arrays';
-import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IObservable, autorun, autorunWithStore, derived, observableFromEvent } from 'vs/base/common/observable';
-import { OS } from 'vs/base/common/platform';
-import 'vs/css!./inlineEditHintsWidget';
-import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from 'vs/editor/browser/editorBrowser';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Position } from 'vs/editor/common/core/position';
-import { PositionAffinity } from 'vs/editor/common/model';
-import { InlineEditWidget } from 'vs/editor/contrib/inlineEdit/browser/inlineEditController';
-import { MenuEntryActionViewItem, createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IMenuWorkbenchToolBarOptions, WorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
-import { IMenuService, MenuId, MenuItemAction } from 'vs/platform/actions/common/actions';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { h } from '../../../../base/browser/dom.js';
+import { KeybindingLabel, unthemedKeybindingLabelOptions } from '../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
+import { IAction, Separator } from '../../../../base/common/actions.js';
+import { equals } from '../../../../base/common/arrays.js';
+import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { IObservable, autorun, autorunWithStore, derived, observableFromEvent } from '../../../../base/common/observable.js';
+import { OS } from '../../../../base/common/platform.js';
+import './inlineEditHintsWidget.css';
+import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from '../../../browser/editorBrowser.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { Position } from '../../../common/core/position.js';
+import { PositionAffinity } from '../../../common/model.js';
+import { GhostTextWidget } from './ghostTextWidget.js';
+import { MenuEntryActionViewItem, createAndFillInActionBarActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IMenuWorkbenchToolBarOptions, WorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
+import { IMenuService, MenuId, MenuItemAction } from '../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 
 export class InlineEditHintsWidget extends Disposable {
-	private readonly alwaysShowToolbar = observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.inlineEdit).showToolbar === 'always');
+	private readonly alwaysShowToolbar = observableFromEvent(this, this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.inlineEdit).showToolbar === 'always');
 
 	private sessionPosition: Position | undefined = undefined;
 
 	private readonly position = derived(this, reader => {
-		const ghostText = this.model.read(reader)?.widget.model.ghostText.read(reader);
+		const ghostText = this.model.read(reader)?.model.ghostText.read(reader);
 
 		if (!this.alwaysShowToolbar.read(reader) || !ghostText || ghostText.parts.length === 0) {
 			this.sessionPosition = undefined;
@@ -51,7 +51,7 @@ export class InlineEditHintsWidget extends Disposable {
 
 	constructor(
 		private readonly editor: ICodeEditor,
-		private readonly model: IObservable<InlineEditWidget | undefined>,
+		private readonly model: IObservable<GhostTextWidget | undefined>,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 	) {
 		super();
diff --git a/src/vs/editor/contrib/inlineEdit/browser/inlineEditSideBySideWidget.css b/src/vs/editor/contrib/inlineEdit/browser/inlineEditSideBySideWidget.css
new file mode 100644
index 00000000000..bc7e553e4d8
--- /dev/null
+++ b/src/vs/editor/contrib/inlineEdit/browser/inlineEditSideBySideWidget.css
@@ -0,0 +1,12 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.monaco-editor .inlineEditSideBySide {
+	z-index: 39;
+	color: var(--vscode-editorHoverWidget-foreground);
+	background-color: var(--vscode-editorHoverWidget-background);
+	border: 1px solid var(--vscode-editorHoverWidget-border);
+	white-space: pre;
+}
diff --git a/src/vs/editor/contrib/inlineEdit/browser/inlineEditSideBySideWidget.ts b/src/vs/editor/contrib/inlineEdit/browser/inlineEditSideBySideWidget.ts
new file mode 100644
index 00000000000..4655e81186d
--- /dev/null
+++ b/src/vs/editor/contrib/inlineEdit/browser/inlineEditSideBySideWidget.ts
@@ -0,0 +1,354 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { $ } from '../../../../base/browser/dom.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { IObservable, ObservablePromise, autorun, autorunWithStore, derived, derivedDisposable, observableSignalFromEvent } from '../../../../base/common/observable.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition } from '../../../browser/editorBrowser.js';
+import { observableCodeEditor } from '../../../browser/observableCodeEditor.js';
+import { EmbeddedCodeEditorWidget } from '../../../browser/widget/codeEditor/embeddedCodeEditorWidget.js';
+import { IDiffProviderFactoryService } from '../../../browser/widget/diffEditor/diffProviderFactoryService.js';
+import { diffAddDecoration, diffAddDecorationEmpty, diffDeleteDecoration, diffDeleteDecorationEmpty, diffLineAddDecorationBackgroundWithIndicator, diffLineDeleteDecorationBackgroundWithIndicator, diffWholeLineAddDecoration, diffWholeLineDeleteDecoration } from '../../../browser/widget/diffEditor/registrations.contribution.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { Position } from '../../../common/core/position.js';
+import { IRange, Range } from '../../../common/core/range.js';
+import { DetailedLineRangeMapping } from '../../../common/diff/rangeMapping.js';
+import { IInlineEdit } from '../../../common/languages.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../../../common/languages/modesRegistry.js';
+import { IModelDeltaDecoration } from '../../../common/model.js';
+import { TextModel } from '../../../common/model/textModel.js';
+import { IModelService } from '../../../common/services/model.js';
+import './inlineEditSideBySideWidget.css';
+
+function* range(start: number, end: number, step = 1) {
+	if (end === undefined) { [end, start] = [start, 0]; }
+	for (let n = start; n < end; n += step) { yield n; }
+}
+
+function removeIndentation(lines: string[]) {
+	const indentation = lines[0].match(/^\s*/)?.[0] ?? '';
+	const length = indentation.length;
+
+	return {
+		text: lines.map(l => l.replace(new RegExp('^' + indentation), '')),
+		shift: length
+	};
+}
+
+type Pos = {
+	top: number;
+	left: Position;
+};
+
+export class InlineEditSideBySideWidget extends Disposable {
+	private static _modelId = 0;
+	private static _createUniqueUri(): URI {
+		return URI.from({ scheme: 'inline-edit-widget', path: new Date().toString() + String(InlineEditSideBySideWidget._modelId++) });
+	}
+
+	private readonly _position = derived(this, reader => {
+		const ghostText = this._model.read(reader);
+
+		if (!ghostText || ghostText.text.length === 0) {
+			return null;
+		}
+		if (ghostText.range.startLineNumber === ghostText.range.endLineNumber && !(ghostText.range.startColumn === ghostText.range.endColumn && ghostText.range.startColumn === 1)) {
+			//for inner-line suggestions we still want to use minimal ghost text
+			return null;
+		}
+		const editorModel = this._editor.getModel();
+		if (!editorModel) {
+			return null;
+		}
+		const lines = Array.from(range(ghostText.range.startLineNumber, ghostText.range.endLineNumber + 1));
+		const lengths = lines.map(lineNumber => editorModel.getLineLastNonWhitespaceColumn(lineNumber));
+		const maxColumn = Math.max(...lengths);
+		const lineOfMaxColumn = lines[lengths.indexOf(maxColumn)];
+
+		const position = new Position(lineOfMaxColumn, maxColumn);
+		const pos = {
+			top: ghostText.range.startLineNumber,
+			left: position
+		};
+
+		return pos;
+	});
+
+	private readonly _text = derived(this, reader => {
+		const ghostText = this._model.read(reader);
+		if (!ghostText) {
+			return { text: '', shift: 0 };
+		}
+		const t = removeIndentation(ghostText.text.split('\n'));
+		return {
+			text: t.text.join('\n'),
+			shift: t.shift
+		};
+	});
+
+
+	private readonly _originalModel = derivedDisposable(() => this._modelService.createModel('', null, InlineEditSideBySideWidget._createUniqueUri())).keepObserved(this._store);
+	private readonly _modifiedModel = derivedDisposable(() => this._modelService.createModel('', null, InlineEditSideBySideWidget._createUniqueUri())).keepObserved(this._store);
+
+	private readonly _diff = derived(this, reader => {
+		return this._diffPromise.read(reader)?.promiseResult.read(reader)?.data;
+	});
+
+	private readonly _diffPromise = derived(this, reader => {
+		const ghostText = this._model.read(reader);
+		if (!ghostText) {
+			return;
+		}
+		const editorModel = this._editor.getModel();
+		if (!editorModel) {
+			return;
+		}
+		const originalText = removeIndentation(editorModel.getValueInRange(ghostText.range).split('\n')).text.join('\n');
+		const modifiedText = removeIndentation(ghostText.text.split('\n')).text.join('\n');
+		this._originalModel.get().setValue(originalText);
+		this._modifiedModel.get().setValue(modifiedText);
+		const d = this._diffProviderFactoryService.createDiffProvider({ diffAlgorithm: 'advanced' });
+		return ObservablePromise.fromFn(async () => {
+			const result = await d.computeDiff(this._originalModel.get(), this._modifiedModel.get(), {
+				computeMoves: false,
+				ignoreTrimWhitespace: false,
+				maxComputationTimeMs: 1000,
+			}, CancellationToken.None);
+
+			if (result.identical) {
+				return undefined;
+			}
+
+			return result.changes;
+		});
+	});
+
+	constructor(
+		private readonly _editor: ICodeEditor,
+		private readonly _model: IObservable<IInlineEdit | undefined>,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IDiffProviderFactoryService private readonly _diffProviderFactoryService: IDiffProviderFactoryService,
+		@IModelService private readonly _modelService: IModelService,
+	) {
+		super();
+
+		this._register(autorunWithStore((reader, store) => {
+			/** @description setup content widget */
+			const model = this._model.read(reader);
+			if (!model) {
+				return;
+			}
+			if (this._position.get() === null) {
+				return;
+			}
+			const contentWidget = store.add(this._instantiationService.createInstance(
+				InlineEditSideBySideContentWidget,
+				this._editor,
+				this._position,
+				this._text.map(t => t.text),
+				this._text.map(t => t.shift),
+				this._diff
+			));
+			_editor.addOverlayWidget(contentWidget);
+			store.add(toDisposable(() => _editor.removeOverlayWidget(contentWidget)));
+		}));
+	}
+}
+
+class InlineEditSideBySideContentWidget extends Disposable implements IOverlayWidget {
+	private static _dropDownVisible = false;
+	public static get dropDownVisible() { return this._dropDownVisible; }
+
+	private static id = 0;
+
+	private readonly id = `InlineEditSideBySideContentWidget${InlineEditSideBySideContentWidget.id++}`;
+	public readonly allowEditorOverflow = false;
+
+	private readonly _nodes = $('div.inlineEditSideBySide', undefined);
+
+	private readonly _scrollChanged = observableSignalFromEvent('editor.onDidScrollChange', this._editor.onDidScrollChange);
+
+	private readonly _previewEditor = this._register(this._instantiationService.createInstance(
+		EmbeddedCodeEditorWidget,
+		this._nodes,
+		{
+			glyphMargin: false,
+			lineNumbers: 'off',
+			minimap: { enabled: false },
+			guides: {
+				indentation: false,
+				bracketPairs: false,
+				bracketPairsHorizontal: false,
+				highlightActiveIndentation: false,
+			},
+			folding: false,
+			selectOnLineNumbers: false,
+			selectionHighlight: false,
+			columnSelection: false,
+			overviewRulerBorder: false,
+			overviewRulerLanes: 0,
+			lineDecorationsWidth: 0,
+			lineNumbersMinChars: 0,
+			scrollbar: { vertical: 'hidden', horizontal: 'hidden', alwaysConsumeMouseWheel: false, handleMouseWheel: false },
+			readOnly: true,
+			wordWrap: 'off',
+			wordWrapOverride1: 'off',
+			wordWrapOverride2: 'off',
+			wrappingIndent: 'none',
+			wrappingStrategy: undefined,
+		},
+		{ contributions: [], isSimpleWidget: true },
+		this._editor
+	));
+
+	private readonly _previewEditorObs = observableCodeEditor(this._previewEditor);
+	private readonly _editorObs = observableCodeEditor(this._editor);
+
+	private readonly _previewTextModel = this._register(this._instantiationService.createInstance(
+		TextModel,
+		'',
+		this._editor.getModel()?.getLanguageId() ?? PLAINTEXT_LANGUAGE_ID,
+		TextModel.DEFAULT_CREATION_OPTIONS,
+		null
+	));
+
+	private readonly _setText = derived(reader => {
+		const edit = this._text.read(reader);
+		if (!edit) { return; }
+		this._previewTextModel.setValue(edit);
+	}).recomputeInitiallyAndOnChange(this._store);
+
+
+	private readonly _decorations = derived(this, (reader) => {
+		this._setText.read(reader);
+		const position = this._position.read(reader);
+		if (!position) { return { org: [], mod: [] }; }
+		const diff = this._diff.read(reader);
+		if (!diff) { return { org: [], mod: [] }; }
+
+		const originalDecorations: IModelDeltaDecoration[] = [];
+		const modifiedDecorations: IModelDeltaDecoration[] = [];
+
+		if (diff.length === 1 && diff[0].innerChanges![0].modifiedRange.equalsRange(this._previewTextModel.getFullModelRange())) {
+			return { org: [], mod: [] };
+		}
+		const shift = this._shift.get();
+
+		const moveRange = (range: IRange) => {
+			return new Range(range.startLineNumber + position.top - 1, range.startColumn + shift, range.endLineNumber + position.top - 1, range.endColumn + shift);
+		};
+
+		for (const m of diff) {
+			if (!m.original.isEmpty) {
+				originalDecorations.push({ range: moveRange(m.original.toInclusiveRange()!), options: diffLineDeleteDecorationBackgroundWithIndicator });
+			}
+			if (!m.modified.isEmpty) {
+				modifiedDecorations.push({ range: m.modified.toInclusiveRange()!, options: diffLineAddDecorationBackgroundWithIndicator });
+			}
+
+			if (m.modified.isEmpty || m.original.isEmpty) {
+				if (!m.original.isEmpty) {
+					originalDecorations.push({ range: moveRange(m.original.toInclusiveRange()!), options: diffWholeLineDeleteDecoration });
+				}
+				if (!m.modified.isEmpty) {
+					modifiedDecorations.push({ range: m.modified.toInclusiveRange()!, options: diffWholeLineAddDecoration });
+				}
+			} else {
+				for (const i of m.innerChanges || []) {
+					// Don't show empty markers outside the line range
+					if (m.original.contains(i.originalRange.startLineNumber)) {
+						originalDecorations.push({ range: moveRange(i.originalRange), options: i.originalRange.isEmpty() ? diffDeleteDecorationEmpty : diffDeleteDecoration });
+					}
+					if (m.modified.contains(i.modifiedRange.startLineNumber)) {
+						modifiedDecorations.push({ range: i.modifiedRange, options: i.modifiedRange.isEmpty() ? diffAddDecorationEmpty : diffAddDecoration });
+					}
+				}
+			}
+		}
+
+		return { org: originalDecorations, mod: modifiedDecorations };
+	});
+
+	private readonly _originalDecorations = derived(this, reader => {
+		return this._decorations.read(reader).org;
+	});
+
+	private readonly _modifiedDecorations = derived(this, reader => {
+		return this._decorations.read(reader).mod;
+	});
+
+	constructor(
+		private readonly _editor: ICodeEditor,
+		private readonly _position: IObservable<Pos | null>,
+		private readonly _text: IObservable<string>,
+		private readonly _shift: IObservable<number>,
+		private readonly _diff: IObservable<readonly DetailedLineRangeMapping[] | undefined>,
+
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+	) {
+		super();
+
+		this._previewEditor.setModel(this._previewTextModel);
+
+		this._register(this._editorObs.setDecorations(this._originalDecorations));
+		this._register(this._previewEditorObs.setDecorations(this._modifiedDecorations));
+
+		this._register(autorun(reader => {
+			const width = this._previewEditorObs.contentWidth.read(reader);
+			const lines = this._text.read(reader).split('\n').length - 1;
+			const height = this._editor.getOption(EditorOption.lineHeight) * lines;
+			if (width <= 0) {
+				return;
+			}
+			this._previewEditor.layout({ height: height, width: width });
+		}));
+
+		this._register(autorun(reader => {
+			/** @description update position */
+			this._position.read(reader);
+			this._editor.layoutOverlayWidget(this);
+		}));
+
+		this._register(autorun(reader => {
+			/** @description scroll change */
+			this._scrollChanged.read(reader);
+			const position = this._position.read(reader);
+			if (!position) {
+				return;
+			}
+			this._editor.layoutOverlayWidget(this);
+		}));
+	}
+
+	getId(): string { return this.id; }
+
+	getDomNode(): HTMLElement {
+		return this._nodes;
+	}
+
+	getPosition(): IOverlayWidgetPosition | null {
+		const position = this._position.get();
+		if (!position) {
+			return null;
+		}
+		const layoutInfo = this._editor.getLayoutInfo();
+		const visibPos = this._editor.getScrolledVisiblePosition(new Position(position.top, 1));
+		if (!visibPos) {
+			return null;
+		}
+		const top = visibPos.top - 1; //-1 to offset the border width
+		const offset = this._editor.getOffsetForColumn(position.left.lineNumber, position.left.column);
+		const left = layoutInfo.contentLeft + offset + 10;
+		return {
+			preference: {
+				left,
+				top,
+			}
+		};
+	}
+}
diff --git a/src/vs/editor/contrib/inlineProgress/browser/inlineProgress.ts b/src/vs/editor/contrib/inlineProgress/browser/inlineProgress.ts
index db892ea676c..5b238c21476 100644
--- a/src/vs/editor/contrib/inlineProgress/browser/inlineProgress.ts
+++ b/src/vs/editor/contrib/inlineProgress/browser/inlineProgress.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { CancelablePromise, disposableTimeout } from 'vs/base/common/async';
-import { Codicon } from 'vs/base/common/codicons';
-import { Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { noBreakWhitespace } from 'vs/base/common/strings';
-import { ThemeIcon } from 'vs/base/common/themables';
-import 'vs/css!./inlineProgressWidget';
-import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from 'vs/editor/browser/editorBrowser';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { IPosition } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { IEditorDecorationsCollection } from 'vs/editor/common/editorCommon';
-import { TrackedRangeStickiness } from 'vs/editor/common/model';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import * as dom from '../../../../base/browser/dom.js';
+import { disposableTimeout } from '../../../../base/common/async.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { noBreakWhitespace } from '../../../../base/common/strings.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import './inlineProgressWidget.css';
+import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from '../../../browser/editorBrowser.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { IPosition } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { IEditorDecorationsCollection } from '../../../common/editorCommon.js';
+import { TrackedRangeStickiness } from '../../../common/model.js';
+import { ModelDecorationOptions } from '../../../common/model/textModel.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 
 const inlineProgressDecoration = ModelDecorationOptions.register({
 	description: 'inline-progress-widget',
@@ -114,13 +114,13 @@ export class InlineProgressManager extends Disposable {
 	private readonly _showPromise = this._register(new MutableDisposable());
 
 	private readonly _currentDecorations: IEditorDecorationsCollection;
-	private readonly _currentWidget = new MutableDisposable<InlineProgressWidget>();
+	private readonly _currentWidget = this._register(new MutableDisposable<InlineProgressWidget>());
 
 	private _operationIdPool = 0;
 	private _currentOperation?: number;
 
 	constructor(
-		readonly id: string,
+		private readonly id: string,
 		private readonly _editor: ICodeEditor,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 	) {
@@ -129,7 +129,12 @@ export class InlineProgressManager extends Disposable {
 		this._currentDecorations = _editor.createDecorationsCollection();
 	}
 
-	public async showWhile<R>(position: IPosition, title: string, promise: CancelablePromise<R>): Promise<R> {
+	public override dispose(): void {
+		super.dispose();
+		this._currentDecorations.clear();
+	}
+
+	public async showWhile<R>(position: IPosition, title: string, promise: Promise<R>, delegate: InlineProgressDelegate, delayOverride?: number): Promise<R> {
 		const operationId = this._operationIdPool++;
 		this._currentOperation = operationId;
 
@@ -143,9 +148,9 @@ export class InlineProgressManager extends Disposable {
 			}]);
 
 			if (decorationIds.length > 0) {
-				this._currentWidget.value = this._instantiationService.createInstance(InlineProgressWidget, this.id, this._editor, range, title, promise);
+				this._currentWidget.value = this._instantiationService.createInstance(InlineProgressWidget, this.id, this._editor, range, title, delegate);
 			}
-		}, this._showDelay);
+		}, delayOverride ?? this._showDelay);
 
 		try {
 			return await promise;
diff --git a/src/vs/editor/contrib/lineSelection/browser/lineSelection.ts b/src/vs/editor/contrib/lineSelection/browser/lineSelection.ts
index f2b2a2df9b5..1ad614b8d74 100644
--- a/src/vs/editor/contrib/lineSelection/browser/lineSelection.ts
+++ b/src/vs/editor/contrib/lineSelection/browser/lineSelection.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, registerEditorAction, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { CursorChangeReason } from 'vs/editor/common/cursorEvents';
-import { CursorMoveCommands } from 'vs/editor/common/cursor/cursorMoveCommands';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import * as nls from 'vs/nls';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorAction, registerEditorAction, ServicesAccessor } from '../../../browser/editorExtensions.js';
+import { CursorChangeReason } from '../../../common/cursorEvents.js';
+import { CursorMoveCommands } from '../../../common/cursor/cursorMoveCommands.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import * as nls from '../../../../nls.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 
 export class ExpandLineSelectionAction extends EditorAction {
 	constructor() {
diff --git a/src/vs/editor/contrib/lineSelection/test/browser/lineSelection.test.ts b/src/vs/editor/contrib/lineSelection/test/browser/lineSelection.test.ts
index 17b47434db7..b5c075ca416 100644
--- a/src/vs/editor/contrib/lineSelection/test/browser/lineSelection.test.ts
+++ b/src/vs/editor/contrib/lineSelection/test/browser/lineSelection.test.ts
@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import type { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction } from 'vs/editor/browser/editorExtensions';
-import { Position } from 'vs/editor/common/core/position';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ExpandLineSelectionAction } from 'vs/editor/contrib/lineSelection/browser/lineSelection';
-import { withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import type { ICodeEditor } from '../../../../browser/editorBrowser.js';
+import { EditorAction } from '../../../../browser/editorExtensions.js';
+import { Position } from '../../../../common/core/position.js';
+import { Selection } from '../../../../common/core/selection.js';
+import { ExpandLineSelectionAction } from '../../browser/lineSelection.js';
+import { withTestCodeEditor } from '../../../../test/browser/testCodeEditor.js';
 
 function executeAction(action: EditorAction, editor: ICodeEditor): void {
 	action.run(null!, editor, undefined);
diff --git a/src/vs/editor/contrib/linesOperations/browser/copyLinesCommand.ts b/src/vs/editor/contrib/linesOperations/browser/copyLinesCommand.ts
index 8f15843cfd1..ccc16cd5360 100644
--- a/src/vs/editor/contrib/linesOperations/browser/copyLinesCommand.ts
+++ b/src/vs/editor/contrib/linesOperations/browser/copyLinesCommand.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Range } from 'vs/editor/common/core/range';
-import { Selection, SelectionDirection } from 'vs/editor/common/core/selection';
-import { ICommand, ICursorStateComputerData, IEditOperationBuilder } from 'vs/editor/common/editorCommon';
-import { ITextModel } from 'vs/editor/common/model';
+import { Range } from '../../../common/core/range.js';
+import { Selection, SelectionDirection } from '../../../common/core/selection.js';
+import { ICommand, ICursorStateComputerData, IEditOperationBuilder } from '../../../common/editorCommon.js';
+import { ITextModel } from '../../../common/model.js';
 
 export class CopyLinesCommand implements ICommand {
 
diff --git a/src/vs/editor/contrib/linesOperations/browser/linesOperations.ts b/src/vs/editor/contrib/linesOperations/browser/linesOperations.ts
index 45b3fafba71..c9cff45b8f1 100644
--- a/src/vs/editor/contrib/linesOperations/browser/linesOperations.ts
+++ b/src/vs/editor/contrib/linesOperations/browser/linesOperations.ts
@@ -3,29 +3,30 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { CoreEditingCommands } from 'vs/editor/browser/coreCommands';
-import { IActiveCodeEditor, ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, IActionOptions, registerEditorAction, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { ReplaceCommand, ReplaceCommandThatPreservesSelection, ReplaceCommandThatSelectsText } from 'vs/editor/common/commands/replaceCommand';
-import { TrimTrailingWhitespaceCommand } from 'vs/editor/common/commands/trimTrailingWhitespaceCommand';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { TypeOperations } from 'vs/editor/common/cursor/cursorTypeOperations';
-import { EditOperation, ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ICommand } from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { ITextModel } from 'vs/editor/common/model';
-import { CopyLinesCommand } from 'vs/editor/contrib/linesOperations/browser/copyLinesCommand';
-import { MoveLinesCommand } from 'vs/editor/contrib/linesOperations/browser/moveLinesCommand';
-import { SortLinesCommand } from 'vs/editor/contrib/linesOperations/browser/sortLinesCommand';
-import * as nls from 'vs/nls';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { KeyChord, KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { CoreEditingCommands } from '../../../browser/coreCommands.js';
+import { IActiveCodeEditor, ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorAction, IActionOptions, registerEditorAction, ServicesAccessor } from '../../../browser/editorExtensions.js';
+import { ReplaceCommand, ReplaceCommandThatPreservesSelection, ReplaceCommandThatSelectsText } from '../../../common/commands/replaceCommand.js';
+import { TrimTrailingWhitespaceCommand } from '../../../common/commands/trimTrailingWhitespaceCommand.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { TypeOperations } from '../../../common/cursor/cursorTypeOperations.js';
+import { EnterOperation } from '../../../common/cursor/cursorTypeEditOperations.js';
+import { EditOperation, ISingleEditOperation } from '../../../common/core/editOperation.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { Selection } from '../../../common/core/selection.js';
+import { ICommand } from '../../../common/editorCommon.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { ITextModel } from '../../../common/model.js';
+import { CopyLinesCommand } from './copyLinesCommand.js';
+import { MoveLinesCommand } from './moveLinesCommand.js';
+import { SortLinesCommand } from './sortLinesCommand.js';
+import * as nls from '../../../../nls.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 
 // copy lines
 
@@ -594,7 +595,7 @@ export class InsertLineBeforeAction extends EditorAction {
 			return;
 		}
 		editor.pushUndoStop();
-		editor.executeCommands(this.id, TypeOperations.lineInsertBefore(viewModel.cursorConfig, editor.getModel(), editor.getSelections()));
+		editor.executeCommands(this.id, EnterOperation.lineInsertBefore(viewModel.cursorConfig, editor.getModel(), editor.getSelections()));
 	}
 }
 
@@ -619,7 +620,7 @@ export class InsertLineAfterAction extends EditorAction {
 			return;
 		}
 		editor.pushUndoStop();
-		editor.executeCommands(this.id, TypeOperations.lineInsertAfter(viewModel.cursorConfig, editor.getModel(), editor.getSelections()));
+		editor.executeCommands(this.id, EnterOperation.lineInsertAfter(viewModel.cursorConfig, editor.getModel(), editor.getSelections()));
 	}
 }
 
diff --git a/src/vs/editor/contrib/linesOperations/browser/moveLinesCommand.ts b/src/vs/editor/contrib/linesOperations/browser/moveLinesCommand.ts
index 68614a2f432..40fdd0378e1 100644
--- a/src/vs/editor/contrib/linesOperations/browser/moveLinesCommand.ts
+++ b/src/vs/editor/contrib/linesOperations/browser/moveLinesCommand.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as strings from 'vs/base/common/strings';
-import { ShiftCommand } from 'vs/editor/common/commands/shiftCommand';
-import { EditorAutoIndentStrategy } from 'vs/editor/common/config/editorOptions';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ICommand, ICursorStateComputerData, IEditOperationBuilder } from 'vs/editor/common/editorCommon';
-import { ITextModel } from 'vs/editor/common/model';
-import { CompleteEnterAction, IndentAction } from 'vs/editor/common/languages/languageConfiguration';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { IndentConsts } from 'vs/editor/common/languages/supports/indentRules';
-import * as indentUtils from 'vs/editor/contrib/indentation/common/indentUtils';
-import { getGoodIndentForLine, getIndentMetadata, IIndentConverter, IVirtualModel } from 'vs/editor/common/languages/autoIndent';
-import { getEnterAction } from 'vs/editor/common/languages/enterAction';
+import * as strings from '../../../../base/common/strings.js';
+import { ShiftCommand } from '../../../common/commands/shiftCommand.js';
+import { EditorAutoIndentStrategy } from '../../../common/config/editorOptions.js';
+import { Range } from '../../../common/core/range.js';
+import { Selection } from '../../../common/core/selection.js';
+import { ICommand, ICursorStateComputerData, IEditOperationBuilder } from '../../../common/editorCommon.js';
+import { ITextModel } from '../../../common/model.js';
+import { CompleteEnterAction, IndentAction } from '../../../common/languages/languageConfiguration.js';
+import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import { IndentConsts } from '../../../common/languages/supports/indentRules.js';
+import * as indentUtils from '../../indentation/common/indentUtils.js';
+import { getGoodIndentForLine, getIndentMetadata, IIndentConverter, IVirtualModel } from '../../../common/languages/autoIndent.js';
+import { getEnterAction } from '../../../common/languages/enterAction.js';
 
 export class MoveLinesCommand implements ICommand {
 
@@ -42,6 +42,13 @@ export class MoveLinesCommand implements ICommand {
 
 	public getEditOperations(model: ITextModel, builder: IEditOperationBuilder): void {
 
+		const getLanguageId = () => {
+			return model.getLanguageId();
+		};
+		const getLanguageIdAtPosition = (lineNumber: number, column: number) => {
+			return model.getLanguageIdAtPosition(lineNumber, column);
+		};
+
 		const modelLineCount = model.getLineCount();
 
 		if (this._isMovingDown && this._selection.endLineNumber === modelLineCount) {
@@ -63,20 +70,6 @@ export class MoveLinesCommand implements ICommand {
 
 		const { tabSize, indentSize, insertSpaces } = model.getOptions();
 		const indentConverter = this.buildIndentConverter(tabSize, indentSize, insertSpaces);
-		const virtualModel: IVirtualModel = {
-			tokenization: {
-				getLineTokens: (lineNumber: number) => {
-					return model.tokenization.getLineTokens(lineNumber);
-				},
-				getLanguageId: () => {
-					return model.getLanguageId();
-				},
-				getLanguageIdAtPosition: (lineNumber: number, column: number) => {
-					return model.getLanguageIdAtPosition(lineNumber, column);
-				},
-			},
-			getLineContent: null as unknown as (lineNumber: number) => string,
-		};
 
 		if (s.startLineNumber === s.endLineNumber && model.getLineMaxColumn(s.startLineNumber) === 1) {
 			// Current line is empty
@@ -120,12 +113,25 @@ export class MoveLinesCommand implements ICommand {
 						insertingText = newIndentation + this.trimStart(movingLineText);
 					} else {
 						// no enter rule matches, let's check indentatin rules then.
-						virtualModel.getLineContent = (lineNumber: number) => {
-							if (lineNumber === s.startLineNumber) {
-								return model.getLineContent(movingLineNumber);
-							} else {
-								return model.getLineContent(lineNumber);
-							}
+						const virtualModel: IVirtualModel = {
+							tokenization: {
+								getLineTokens: (lineNumber: number) => {
+									if (lineNumber === s.startLineNumber) {
+										return model.tokenization.getLineTokens(movingLineNumber);
+									} else {
+										return model.tokenization.getLineTokens(lineNumber);
+									}
+								},
+								getLanguageId,
+								getLanguageIdAtPosition,
+							},
+							getLineContent: (lineNumber: number) => {
+								if (lineNumber === s.startLineNumber) {
+									return model.getLineContent(movingLineNumber);
+								} else {
+									return model.getLineContent(lineNumber);
+								}
+							},
 						};
 						const indentOfMovingLine = getGoodIndentForLine(
 							this._autoIndent,
@@ -159,14 +165,30 @@ export class MoveLinesCommand implements ICommand {
 						}
 					} else {
 						// it doesn't match onEnter rules, let's check indentation rules then.
-						virtualModel.getLineContent = (lineNumber: number) => {
-							if (lineNumber === s.startLineNumber) {
-								return insertingText;
-							} else if (lineNumber >= s.startLineNumber + 1 && lineNumber <= s.endLineNumber + 1) {
-								return model.getLineContent(lineNumber - 1);
-							} else {
-								return model.getLineContent(lineNumber);
-							}
+						const virtualModel: IVirtualModel = {
+							tokenization: {
+								getLineTokens: (lineNumber: number) => {
+									if (lineNumber === s.startLineNumber) {
+										// TODO@aiday-mar: the tokens here don't correspond exactly to the corresponding content (after indentation adjustment), have to fix this.
+										return model.tokenization.getLineTokens(movingLineNumber);
+									} else if (lineNumber >= s.startLineNumber + 1 && lineNumber <= s.endLineNumber + 1) {
+										return model.tokenization.getLineTokens(lineNumber - 1);
+									} else {
+										return model.tokenization.getLineTokens(lineNumber);
+									}
+								},
+								getLanguageId,
+								getLanguageIdAtPosition,
+							},
+							getLineContent: (lineNumber: number) => {
+								if (lineNumber === s.startLineNumber) {
+									return insertingText;
+								} else if (lineNumber >= s.startLineNumber + 1 && lineNumber <= s.endLineNumber + 1) {
+									return model.getLineContent(lineNumber - 1);
+								} else {
+									return model.getLineContent(lineNumber);
+								}
+							},
 						};
 
 						const newIndentatOfMovingBlock = getGoodIndentForLine(
@@ -204,12 +226,25 @@ export class MoveLinesCommand implements ICommand {
 				builder.addEditOperation(new Range(s.endLineNumber, model.getLineMaxColumn(s.endLineNumber), s.endLineNumber, model.getLineMaxColumn(s.endLineNumber)), '\n' + movingLineText);
 
 				if (this.shouldAutoIndent(model, s)) {
-					virtualModel.getLineContent = (lineNumber: number) => {
-						if (lineNumber === movingLineNumber) {
-							return model.getLineContent(s.startLineNumber);
-						} else {
-							return model.getLineContent(lineNumber);
-						}
+					const virtualModel: IVirtualModel = {
+						tokenization: {
+							getLineTokens: (lineNumber: number) => {
+								if (lineNumber === movingLineNumber) {
+									return model.tokenization.getLineTokens(s.startLineNumber);
+								} else {
+									return model.tokenization.getLineTokens(lineNumber);
+								}
+							},
+							getLanguageId,
+							getLanguageIdAtPosition,
+						},
+						getLineContent: (lineNumber: number) => {
+							if (lineNumber === movingLineNumber) {
+								return model.getLineContent(s.startLineNumber);
+							} else {
+								return model.getLineContent(lineNumber);
+							}
+						},
 					};
 
 					const ret = this.matchEnterRule(model, indentConverter, tabSize, s.startLineNumber, s.startLineNumber - 2);
diff --git a/src/vs/editor/contrib/linesOperations/browser/sortLinesCommand.ts b/src/vs/editor/contrib/linesOperations/browser/sortLinesCommand.ts
index 0680bd1f7ce..4c13058d104 100644
--- a/src/vs/editor/contrib/linesOperations/browser/sortLinesCommand.ts
+++ b/src/vs/editor/contrib/linesOperations/browser/sortLinesCommand.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { EditOperation, ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ICommand, ICursorStateComputerData, IEditOperationBuilder } from 'vs/editor/common/editorCommon';
-import { ITextModel } from 'vs/editor/common/model';
+import { EditOperation, ISingleEditOperation } from '../../../common/core/editOperation.js';
+import { Range } from '../../../common/core/range.js';
+import { Selection } from '../../../common/core/selection.js';
+import { ICommand, ICursorStateComputerData, IEditOperationBuilder } from '../../../common/editorCommon.js';
+import { ITextModel } from '../../../common/model.js';
 
 export class SortLinesCommand implements ICommand {
 
diff --git a/src/vs/editor/contrib/linesOperations/test/browser/copyLinesCommand.test.ts b/src/vs/editor/contrib/linesOperations/test/browser/copyLinesCommand.test.ts
index 48348ae9690..763389a5ddf 100644
--- a/src/vs/editor/contrib/linesOperations/test/browser/copyLinesCommand.test.ts
+++ b/src/vs/editor/contrib/linesOperations/test/browser/copyLinesCommand.test.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Selection } from 'vs/editor/common/core/selection';
-import { CopyLinesCommand } from 'vs/editor/contrib/linesOperations/browser/copyLinesCommand';
-import { DuplicateSelectionAction } from 'vs/editor/contrib/linesOperations/browser/linesOperations';
-import { withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
-import { testCommand } from 'vs/editor/test/browser/testCommand';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Selection } from '../../../../common/core/selection.js';
+import { CopyLinesCommand } from '../../browser/copyLinesCommand.js';
+import { DuplicateSelectionAction } from '../../browser/linesOperations.js';
+import { withTestCodeEditor } from '../../../../test/browser/testCodeEditor.js';
+import { testCommand } from '../../../../test/browser/testCommand.js';
 
 function testCopyLinesDownCommand(lines: string[], selection: Selection, expectedLines: string[], expectedSelection: Selection): void {
 	testCommand(lines, null, selection, (accessor, sel) => new CopyLinesCommand(sel, true), expectedLines, expectedSelection);
diff --git a/src/vs/editor/contrib/linesOperations/test/browser/linesOperations.test.ts b/src/vs/editor/contrib/linesOperations/test/browser/linesOperations.test.ts
index f99fb62422d..199b22c12ba 100644
--- a/src/vs/editor/contrib/linesOperations/test/browser/linesOperations.test.ts
+++ b/src/vs/editor/contrib/linesOperations/test/browser/linesOperations.test.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { CoreEditingCommands } from 'vs/editor/browser/coreCommands';
-import type { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction } from 'vs/editor/browser/editorExtensions';
-import { Position } from 'vs/editor/common/core/position';
-import { Selection } from 'vs/editor/common/core/selection';
-import { Handler } from 'vs/editor/common/editorCommon';
-import { ITextModel } from 'vs/editor/common/model';
-import { ViewModel } from 'vs/editor/common/viewModel/viewModelImpl';
-import { CamelCaseAction, PascalCaseAction, DeleteAllLeftAction, DeleteAllRightAction, DeleteDuplicateLinesAction, DeleteLinesAction, IndentLinesAction, InsertLineAfterAction, InsertLineBeforeAction, JoinLinesAction, KebabCaseAction, LowerCaseAction, SnakeCaseAction, SortLinesAscendingAction, SortLinesDescendingAction, TitleCaseAction, TransposeAction, UpperCaseAction } from 'vs/editor/contrib/linesOperations/browser/linesOperations';
-import { withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { CoreEditingCommands } from '../../../../browser/coreCommands.js';
+import type { ICodeEditor } from '../../../../browser/editorBrowser.js';
+import { EditorAction } from '../../../../browser/editorExtensions.js';
+import { Position } from '../../../../common/core/position.js';
+import { Selection } from '../../../../common/core/selection.js';
+import { Handler } from '../../../../common/editorCommon.js';
+import { ITextModel } from '../../../../common/model.js';
+import { ViewModel } from '../../../../common/viewModel/viewModelImpl.js';
+import { CamelCaseAction, PascalCaseAction, DeleteAllLeftAction, DeleteAllRightAction, DeleteDuplicateLinesAction, DeleteLinesAction, IndentLinesAction, InsertLineAfterAction, InsertLineBeforeAction, JoinLinesAction, KebabCaseAction, LowerCaseAction, SnakeCaseAction, SortLinesAscendingAction, SortLinesDescendingAction, TitleCaseAction, TransposeAction, UpperCaseAction } from '../../browser/linesOperations.js';
+import { withTestCodeEditor } from '../../../../test/browser/testCodeEditor.js';
+import { createTextModel } from '../../../../test/common/testTextModel.js';
 
 function assertSelection(editor: ICodeEditor, expected: Selection | Selection[]): void {
 	if (!Array.isArray(expected)) {
diff --git a/src/vs/editor/contrib/linesOperations/test/browser/moveLinesCommand.test.ts b/src/vs/editor/contrib/linesOperations/test/browser/moveLinesCommand.test.ts
index 65941bd977b..f83419cc70e 100644
--- a/src/vs/editor/contrib/linesOperations/test/browser/moveLinesCommand.test.ts
+++ b/src/vs/editor/contrib/linesOperations/test/browser/moveLinesCommand.test.ts
@@ -2,17 +2,17 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { EditorAutoIndentStrategy } from 'vs/editor/common/config/editorOptions';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IndentationRule } from 'vs/editor/common/languages/languageConfiguration';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { LanguageService } from 'vs/editor/common/services/languageService';
-import { MoveLinesCommand } from 'vs/editor/contrib/linesOperations/browser/moveLinesCommand';
-import { testCommand } from 'vs/editor/test/browser/testCommand';
-import { TestLanguageConfigurationService } from 'vs/editor/test/common/modes/testLanguageConfigurationService';
+import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { EditorAutoIndentStrategy } from '../../../../common/config/editorOptions.js';
+import { Selection } from '../../../../common/core/selection.js';
+import { ILanguageService } from '../../../../common/languages/language.js';
+import { IndentationRule } from '../../../../common/languages/languageConfiguration.js';
+import { ILanguageConfigurationService } from '../../../../common/languages/languageConfigurationRegistry.js';
+import { LanguageService } from '../../../../common/services/languageService.js';
+import { MoveLinesCommand } from '../../browser/moveLinesCommand.js';
+import { testCommand } from '../../../../test/browser/testCommand.js';
+import { TestLanguageConfigurationService } from '../../../../test/common/modes/testLanguageConfigurationService.js';
 
 const enum MoveLinesDirection {
 	Up,
diff --git a/src/vs/editor/contrib/linesOperations/test/browser/sortLinesCommand.test.ts b/src/vs/editor/contrib/linesOperations/test/browser/sortLinesCommand.test.ts
index 423001a7160..3e79cb3436e 100644
--- a/src/vs/editor/contrib/linesOperations/test/browser/sortLinesCommand.test.ts
+++ b/src/vs/editor/contrib/linesOperations/test/browser/sortLinesCommand.test.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Selection } from 'vs/editor/common/core/selection';
-import { SortLinesCommand } from 'vs/editor/contrib/linesOperations/browser/sortLinesCommand';
-import { testCommand } from 'vs/editor/test/browser/testCommand';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Selection } from '../../../../common/core/selection.js';
+import { SortLinesCommand } from '../../browser/sortLinesCommand.js';
+import { testCommand } from '../../../../test/browser/testCommand.js';
 
 function testSortLinesAscendingCommand(lines: string[], selection: Selection, expectedLines: string[], expectedSelection: Selection): void {
 	testCommand(lines, null, selection, (accessor, sel) => new SortLinesCommand(sel, false), expectedLines, expectedSelection);
diff --git a/src/vs/editor/contrib/linkedEditing/browser/linkedEditing.ts b/src/vs/editor/contrib/linkedEditing/browser/linkedEditing.ts
index 491c00b67d4..62c8ab664b0 100644
--- a/src/vs/editor/contrib/linkedEditing/browser/linkedEditing.ts
+++ b/src/vs/editor/contrib/linkedEditing/browser/linkedEditing.ts
@@ -3,38 +3,38 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as arrays from 'vs/base/common/arrays';
-import { Delayer, first } from 'vs/base/common/async';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Color } from 'vs/base/common/color';
-import { isCancellationError, onUnexpectedError, onUnexpectedExternalError } from 'vs/base/common/errors';
-import { Event } from 'vs/base/common/event';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import * as strings from 'vs/base/common/strings';
-import { URI } from 'vs/base/common/uri';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, EditorCommand, EditorContributionInstantiation, registerEditorAction, registerEditorCommand, registerEditorContribution, registerModelAndPositionCommand, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { IEditorContribution, IEditorDecorationsCollection } from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { IModelDeltaDecoration, ITextModel, TrackedRangeStickiness } from 'vs/editor/common/model';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { LinkedEditingRangeProvider, LinkedEditingRanges } from 'vs/editor/common/languages';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import * as nls from 'vs/nls';
-import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { registerColor } from 'vs/platform/theme/common/colorRegistry';
-import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { IFeatureDebounceInformation, ILanguageFeatureDebounceService } from 'vs/editor/common/services/languageFeatureDebounce';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import 'vs/css!./linkedEditing';
+import * as arrays from '../../../../base/common/arrays.js';
+import { Delayer, first } from '../../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { Color } from '../../../../base/common/color.js';
+import { isCancellationError, onUnexpectedError, onUnexpectedExternalError } from '../../../../base/common/errors.js';
+import { Event } from '../../../../base/common/event.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import * as strings from '../../../../base/common/strings.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorAction, EditorCommand, EditorContributionInstantiation, registerEditorAction, registerEditorCommand, registerEditorContribution, registerModelAndPositionCommand, ServicesAccessor } from '../../../browser/editorExtensions.js';
+import { ICodeEditorService } from '../../../browser/services/codeEditorService.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { IPosition, Position } from '../../../common/core/position.js';
+import { IRange, Range } from '../../../common/core/range.js';
+import { IEditorContribution, IEditorDecorationsCollection } from '../../../common/editorCommon.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { IModelDeltaDecoration, ITextModel, TrackedRangeStickiness } from '../../../common/model.js';
+import { ModelDecorationOptions } from '../../../common/model/textModel.js';
+import { LinkedEditingRangeProvider, LinkedEditingRanges } from '../../../common/languages.js';
+import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import * as nls from '../../../../nls.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { registerColor } from '../../../../platform/theme/common/colorRegistry.js';
+import { LanguageFeatureRegistry } from '../../../common/languageFeatureRegistry.js';
+import { ISingleEditOperation } from '../../../common/core/editOperation.js';
+import { IFeatureDebounceInformation, ILanguageFeatureDebounceService } from '../../../common/services/languageFeatureDebounce.js';
+import { StopWatch } from '../../../../base/common/stopwatch.js';
+import './linkedEditing.css';
 
 export const CONTEXT_ONTYPE_RENAME_INPUT_VISIBLE = new RawContextKey<boolean>('LinkedEditingInputVisible', false);
 
diff --git a/src/vs/editor/contrib/linkedEditing/test/browser/linkedEditing.test.ts b/src/vs/editor/contrib/linkedEditing/test/browser/linkedEditing.test.ts
index 80d6ed93730..df4e2720674 100644
--- a/src/vs/editor/contrib/linkedEditing/test/browser/linkedEditing.test.ts
+++ b/src/vs/editor/contrib/linkedEditing/test/browser/linkedEditing.test.ts
@@ -4,24 +4,24 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { CoreEditingCommands } from 'vs/editor/browser/coreCommands';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { USUAL_WORD_SEPARATORS } from 'vs/editor/common/core/wordHelper';
-import { Handler } from 'vs/editor/common/editorCommon';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { ITextModel } from 'vs/editor/common/model';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { DeleteAllLeftAction } from 'vs/editor/contrib/linesOperations/browser/linesOperations';
-import { LinkedEditingContribution } from 'vs/editor/contrib/linkedEditing/browser/linkedEditing';
-import { DeleteWordLeft } from 'vs/editor/contrib/wordOperations/browser/wordOperations';
-import { ITestCodeEditor, createCodeEditorServices, instantiateTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
-import { instantiateTextModel } from 'vs/editor/test/common/testTextModel';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { runWithFakedTimers } from '../../../../../base/test/common/timeTravelScheduler.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { CoreEditingCommands } from '../../../../browser/coreCommands.js';
+import { IPosition, Position } from '../../../../common/core/position.js';
+import { IRange, Range } from '../../../../common/core/range.js';
+import { USUAL_WORD_SEPARATORS } from '../../../../common/core/wordHelper.js';
+import { Handler } from '../../../../common/editorCommon.js';
+import { ILanguageConfigurationService } from '../../../../common/languages/languageConfigurationRegistry.js';
+import { ITextModel } from '../../../../common/model.js';
+import { ILanguageFeaturesService } from '../../../../common/services/languageFeatures.js';
+import { DeleteAllLeftAction } from '../../../linesOperations/browser/linesOperations.js';
+import { LinkedEditingContribution } from '../../browser/linkedEditing.js';
+import { DeleteWordLeft } from '../../../wordOperations/browser/wordOperations.js';
+import { ITestCodeEditor, createCodeEditorServices, instantiateTestCodeEditor } from '../../../../test/browser/testCodeEditor.js';
+import { instantiateTextModel } from '../../../../test/common/testTextModel.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
 
 const mockFile = URI.parse('test:somefile.ttt');
 const mockFileSelector = { scheme: 'test' };
diff --git a/src/vs/editor/contrib/links/browser/getLinks.ts b/src/vs/editor/contrib/links/browser/getLinks.ts
index 5eabfc7586e..cd2e19c756e 100644
--- a/src/vs/editor/contrib/links/browser/getLinks.ts
+++ b/src/vs/editor/contrib/links/browser/getLinks.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { coalesce } from 'vs/base/common/arrays';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { onUnexpectedExternalError } from 'vs/base/common/errors';
-import { DisposableStore, isDisposable } from 'vs/base/common/lifecycle';
-import { assertType } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { ITextModel } from 'vs/editor/common/model';
-import { ILink, ILinksList, LinkProvider } from 'vs/editor/common/languages';
-import { IModelService } from 'vs/editor/common/services/model';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
+import { coalesce } from '../../../../base/common/arrays.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { onUnexpectedExternalError } from '../../../../base/common/errors.js';
+import { DisposableStore, isDisposable } from '../../../../base/common/lifecycle.js';
+import { assertType } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IRange, Range } from '../../../common/core/range.js';
+import { ITextModel } from '../../../common/model.js';
+import { ILink, ILinksList, LinkProvider } from '../../../common/languages.js';
+import { IModelService } from '../../../common/services/model.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { LanguageFeatureRegistry } from '../../../common/languageFeatureRegistry.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 
 export class Link implements ILink {
 
diff --git a/src/vs/editor/contrib/links/browser/links.ts b/src/vs/editor/contrib/links/browser/links.ts
index 073c85c85ea..4fc3c17d938 100644
--- a/src/vs/editor/contrib/links/browser/links.ts
+++ b/src/vs/editor/contrib/links/browser/links.ts
@@ -3,33 +3,33 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createCancelablePromise, CancelablePromise, RunOnceScheduler } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import * as platform from 'vs/base/common/platform';
-import * as resources from 'vs/base/common/resources';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { URI } from 'vs/base/common/uri';
-import 'vs/css!./links';
-import { ICodeEditor, MouseTargetType } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, EditorContributionInstantiation, registerEditorAction, registerEditorContribution, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Position } from 'vs/editor/common/core/position';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import { LinkProvider } from 'vs/editor/common/languages';
-import { IModelDecorationsChangeAccessor, IModelDeltaDecoration, TrackedRangeStickiness } from 'vs/editor/common/model';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { IFeatureDebounceInformation, ILanguageFeatureDebounceService } from 'vs/editor/common/services/languageFeatureDebounce';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { ClickLinkGesture, ClickLinkKeyboardEvent, ClickLinkMouseEvent } from 'vs/editor/contrib/gotoSymbol/browser/link/clickLinkGesture';
-import { getLinks, Link, LinksList } from 'vs/editor/contrib/links/browser/getLinks';
-import * as nls from 'vs/nls';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
+import { createCancelablePromise, CancelablePromise, RunOnceScheduler } from '../../../../base/common/async.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import * as platform from '../../../../base/common/platform.js';
+import * as resources from '../../../../base/common/resources.js';
+import { StopWatch } from '../../../../base/common/stopwatch.js';
+import { URI } from '../../../../base/common/uri.js';
+import './links.css';
+import { ICodeEditor, MouseTargetType } from '../../../browser/editorBrowser.js';
+import { EditorAction, EditorContributionInstantiation, registerEditorAction, registerEditorContribution, ServicesAccessor } from '../../../browser/editorExtensions.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { Position } from '../../../common/core/position.js';
+import { IEditorContribution } from '../../../common/editorCommon.js';
+import { LanguageFeatureRegistry } from '../../../common/languageFeatureRegistry.js';
+import { LinkProvider } from '../../../common/languages.js';
+import { IModelDecorationsChangeAccessor, IModelDeltaDecoration, TrackedRangeStickiness } from '../../../common/model.js';
+import { ModelDecorationOptions } from '../../../common/model/textModel.js';
+import { IFeatureDebounceInformation, ILanguageFeatureDebounceService } from '../../../common/services/languageFeatureDebounce.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { ClickLinkGesture, ClickLinkKeyboardEvent, ClickLinkMouseEvent } from '../../gotoSymbol/browser/link/clickLinkGesture.js';
+import { getLinks, Link, LinksList } from './getLinks.js';
+import * as nls from '../../../../nls.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 
 export class LinkDetector extends Disposable implements IEditorContribution {
 
diff --git a/src/vs/editor/contrib/longLinesHelper/browser/longLinesHelper.ts b/src/vs/editor/contrib/longLinesHelper/browser/longLinesHelper.ts
index 6ac8f6f7d88..4869ad013cb 100644
--- a/src/vs/editor/contrib/longLinesHelper/browser/longLinesHelper.ts
+++ b/src/vs/editor/contrib/longLinesHelper/browser/longLinesHelper.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ICodeEditor, MouseTargetType } from 'vs/editor/browser/editorBrowser';
-import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ICodeEditor, MouseTargetType } from '../../../browser/editorBrowser.js';
+import { EditorContributionInstantiation, registerEditorContribution } from '../../../browser/editorExtensions.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { IEditorContribution } from '../../../common/editorCommon.js';
 
 class LongLinesHelper extends Disposable implements IEditorContribution {
 	public static readonly ID = 'editor.contrib.longLinesHelper';
diff --git a/src/vs/editor/contrib/message/browser/messageController.ts b/src/vs/editor/contrib/message/browser/messageController.ts
index dd32227654c..8e4d1e2e9c3 100644
--- a/src/vs/editor/contrib/message/browser/messageController.ts
+++ b/src/vs/editor/contrib/message/browser/messageController.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { renderMarkdown } from 'vs/base/browser/markdownRenderer';
-import { alert } from 'vs/base/browser/ui/aria/aria';
-import { Event } from 'vs/base/common/event';
-import { IMarkdownString, isMarkdownString } from 'vs/base/common/htmlContent';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { DisposableStore, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import 'vs/css!./messageController';
-import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from 'vs/editor/browser/editorBrowser';
-import { EditorCommand, EditorContributionInstantiation, registerEditorCommand, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { IPosition } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { IEditorContribution, ScrollType } from 'vs/editor/common/editorCommon';
-import { PositionAffinity } from 'vs/editor/common/model';
-import { openLinkFromMarkdown } from 'vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
-import * as nls from 'vs/nls';
-import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import * as dom from 'vs/base/browser/dom';
+import { renderMarkdown } from '../../../../base/browser/markdownRenderer.js';
+import { alert } from '../../../../base/browser/ui/aria/aria.js';
+import { Event } from '../../../../base/common/event.js';
+import { IMarkdownString, isMarkdownString } from '../../../../base/common/htmlContent.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { DisposableStore, IDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import './messageController.css';
+import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from '../../../browser/editorBrowser.js';
+import { EditorCommand, EditorContributionInstantiation, registerEditorCommand, registerEditorContribution } from '../../../browser/editorExtensions.js';
+import { IPosition } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { IEditorContribution, ScrollType } from '../../../common/editorCommon.js';
+import { PositionAffinity } from '../../../common/model.js';
+import { openLinkFromMarkdown } from '../../../browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import * as nls from '../../../../nls.js';
+import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import * as dom from '../../../../base/browser/dom.js';
 
 export class MessageController implements IEditorContribution {
 
diff --git a/src/vs/editor/contrib/multicursor/browser/multicursor.ts b/src/vs/editor/contrib/multicursor/browser/multicursor.ts
index 02e7a44e7f5..d9b7237f221 100644
--- a/src/vs/editor/contrib/multicursor/browser/multicursor.ts
+++ b/src/vs/editor/contrib/multicursor/browser/multicursor.ts
@@ -3,31 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { status } from 'vs/base/browser/ui/aria/aria';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { Constants } from 'vs/base/common/uint';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, EditorContributionInstantiation, registerEditorAction, registerEditorContribution, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { CursorState } from 'vs/editor/common/cursorCommon';
-import { CursorChangeReason, ICursorSelectionChangedEvent } from 'vs/editor/common/cursorEvents';
-import { CursorMoveCommands } from 'vs/editor/common/cursor/cursorMoveCommands';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { IEditorContribution, IEditorDecorationsCollection, ScrollType } from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { FindMatch, ITextModel } from 'vs/editor/common/model';
-import { CommonFindController } from 'vs/editor/contrib/find/browser/findController';
-import { FindOptionOverride, INewFindReplaceState } from 'vs/editor/contrib/find/browser/findState';
-import * as nls from 'vs/nls';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { getSelectionHighlightDecorationOptions } from 'vs/editor/contrib/wordHighlighter/browser/highlightDecorations';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { status } from '../../../../base/browser/ui/aria/aria.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { KeyChord, KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { Constants } from '../../../../base/common/uint.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorAction, EditorContributionInstantiation, registerEditorAction, registerEditorContribution, ServicesAccessor } from '../../../browser/editorExtensions.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { CursorState } from '../../../common/cursorCommon.js';
+import { CursorChangeReason, ICursorSelectionChangedEvent } from '../../../common/cursorEvents.js';
+import { CursorMoveCommands } from '../../../common/cursor/cursorMoveCommands.js';
+import { Range } from '../../../common/core/range.js';
+import { Selection } from '../../../common/core/selection.js';
+import { IEditorContribution, IEditorDecorationsCollection, ScrollType } from '../../../common/editorCommon.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { FindMatch, ITextModel } from '../../../common/model.js';
+import { CommonFindController } from '../../find/browser/findController.js';
+import { FindOptionOverride, INewFindReplaceState } from '../../find/browser/findState.js';
+import * as nls from '../../../../nls.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { getSelectionHighlightDecorationOptions } from '../../wordHighlighter/browser/highlightDecorations.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 
 function announceCursorChange(previousCursorState: CursorState[], cursorState: CursorState[]): void {
 	const cursorDiff = cursorState.filter(cs => !previousCursorState.find(pcs => pcs.equals(cs)));
diff --git a/src/vs/editor/contrib/multicursor/test/browser/multicursor.test.ts b/src/vs/editor/contrib/multicursor/test/browser/multicursor.test.ts
index 008150e7c09..06b13749659 100644
--- a/src/vs/editor/contrib/multicursor/test/browser/multicursor.test.ts
+++ b/src/vs/editor/contrib/multicursor/test/browser/multicursor.test.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { Handler } from 'vs/editor/common/editorCommon';
-import { EndOfLineSequence } from 'vs/editor/common/model';
-import { CommonFindController } from 'vs/editor/contrib/find/browser/findController';
-import { AddSelectionToNextFindMatchAction, InsertCursorAbove, InsertCursorBelow, MultiCursorSelectionController, SelectHighlightsAction } from 'vs/editor/contrib/multicursor/browser/multicursor';
-import { ITestCodeEditor, withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IStorageService, InMemoryStorageService } from 'vs/platform/storage/common/storage';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Range } from '../../../../common/core/range.js';
+import { Selection } from '../../../../common/core/selection.js';
+import { Handler } from '../../../../common/editorCommon.js';
+import { EndOfLineSequence } from '../../../../common/model.js';
+import { CommonFindController } from '../../../find/browser/findController.js';
+import { AddSelectionToNextFindMatchAction, InsertCursorAbove, InsertCursorBelow, MultiCursorSelectionController, SelectHighlightsAction } from '../../browser/multicursor.js';
+import { ITestCodeEditor, withTestCodeEditor } from '../../../../test/browser/testCodeEditor.js';
+import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
+import { IStorageService, InMemoryStorageService } from '../../../../../platform/storage/common/storage.js';
 
 suite('Multicursor', () => {
 
diff --git a/src/vs/editor/contrib/parameterHints/browser/parameterHints.css b/src/vs/editor/contrib/parameterHints/browser/parameterHints.css
index 93758171dac..3efac6c122c 100644
--- a/src/vs/editor/contrib/parameterHints/browser/parameterHints.css
+++ b/src/vs/editor/contrib/parameterHints/browser/parameterHints.css
@@ -69,6 +69,10 @@
 	border-bottom: 1px solid var(--vscode-editorHoverWidget-border);
 }
 
+.monaco-editor .parameter-hints-widget .code {
+	font-family: var(--vscode-parameterHintsWidget-editorFontFamily), var(--vscode-parameterHintsWidget-editorFontFamilyDefault);
+}
+
 .monaco-editor .parameter-hints-widget .docs {
 	padding: 0 10px 0 5px;
 	white-space: pre-wrap;
diff --git a/src/vs/editor/contrib/parameterHints/browser/parameterHints.ts b/src/vs/editor/contrib/parameterHints/browser/parameterHints.ts
index dda7f97531a..afeaa40c903 100644
--- a/src/vs/editor/contrib/parameterHints/browser/parameterHints.ts
+++ b/src/vs/editor/contrib/parameterHints/browser/parameterHints.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Lazy } from 'vs/base/common/lazy';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, EditorCommand, EditorContributionInstantiation, registerEditorAction, registerEditorCommand, registerEditorContribution, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import * as languages from 'vs/editor/common/languages';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { ParameterHintsModel, TriggerContext } from 'vs/editor/contrib/parameterHints/browser/parameterHintsModel';
-import { Context } from 'vs/editor/contrib/parameterHints/browser/provideSignatureHelp';
-import * as nls from 'vs/nls';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ParameterHintsWidget } from './parameterHintsWidget';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { Lazy } from '../../../../base/common/lazy.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorAction, EditorCommand, EditorContributionInstantiation, registerEditorAction, registerEditorCommand, registerEditorContribution, ServicesAccessor } from '../../../browser/editorExtensions.js';
+import { IEditorContribution } from '../../../common/editorCommon.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import * as languages from '../../../common/languages.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { ParameterHintsModel, TriggerContext } from './parameterHintsModel.js';
+import { Context } from './provideSignatureHelp.js';
+import * as nls from '../../../../nls.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ParameterHintsWidget } from './parameterHintsWidget.js';
 
 export class ParameterHintsController extends Disposable implements IEditorContribution {
 
diff --git a/src/vs/editor/contrib/parameterHints/browser/parameterHintsModel.ts b/src/vs/editor/contrib/parameterHints/browser/parameterHintsModel.ts
index 033e842d409..0c07303dc17 100644
--- a/src/vs/editor/contrib/parameterHints/browser/parameterHintsModel.ts
+++ b/src/vs/editor/contrib/parameterHints/browser/parameterHintsModel.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancelablePromise, createCancelablePromise, Delayer } from 'vs/base/common/async';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { CharacterSet } from 'vs/editor/common/core/characterClassifier';
-import { ICursorSelectionChangedEvent } from 'vs/editor/common/cursorEvents';
-import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import * as languages from 'vs/editor/common/languages';
-import { provideSignatureHelp } from 'vs/editor/contrib/parameterHints/browser/provideSignatureHelp';
+import { CancelablePromise, createCancelablePromise, Delayer } from '../../../../base/common/async.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { CharacterSet } from '../../../common/core/characterClassifier.js';
+import { ICursorSelectionChangedEvent } from '../../../common/cursorEvents.js';
+import { LanguageFeatureRegistry } from '../../../common/languageFeatureRegistry.js';
+import * as languages from '../../../common/languages.js';
+import { provideSignatureHelp } from './provideSignatureHelp.js';
 
 export interface TriggerContext {
 	readonly triggerKind: languages.SignatureHelpTriggerKind;
diff --git a/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.ts b/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.ts
index f5b8af528e3..b2f044f2f5c 100644
--- a/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.ts
+++ b/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.ts
@@ -3,31 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import * as aria from 'vs/base/browser/ui/aria/aria';
-import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
-import { Codicon } from 'vs/base/common/codicons';
-import { Event } from 'vs/base/common/event';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { escapeRegExpCharacters } from 'vs/base/common/strings';
-import { assertIsDefined } from 'vs/base/common/types';
-import 'vs/css!./parameterHints';
-import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from 'vs/editor/browser/editorBrowser';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import * as languages from 'vs/editor/common/languages';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IMarkdownRenderResult, MarkdownRenderer } from 'vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
-import { ParameterHintsModel } from 'vs/editor/contrib/parameterHints/browser/parameterHintsModel';
-import { Context } from 'vs/editor/contrib/parameterHints/browser/provideSignatureHelp';
-import * as nls from 'vs/nls';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { listHighlightForeground, registerColor } from 'vs/platform/theme/common/colorRegistry';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import * as dom from '../../../../base/browser/dom.js';
+import * as aria from '../../../../base/browser/ui/aria/aria.js';
+import { DomScrollableElement } from '../../../../base/browser/ui/scrollbar/scrollableElement.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Event } from '../../../../base/common/event.js';
+import { IMarkdownString } from '../../../../base/common/htmlContent.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { escapeRegExpCharacters } from '../../../../base/common/strings.js';
+import { assertIsDefined } from '../../../../base/common/types.js';
+import './parameterHints.css';
+import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from '../../../browser/editorBrowser.js';
+import { EDITOR_FONT_DEFAULTS, EditorOption } from '../../../common/config/editorOptions.js';
+import * as languages from '../../../common/languages.js';
+import { ILanguageService } from '../../../common/languages/language.js';
+import { IMarkdownRenderResult, MarkdownRenderer } from '../../../browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import { ParameterHintsModel } from './parameterHintsModel.js';
+import { Context } from './provideSignatureHelp.js';
+import * as nls from '../../../../nls.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { listHighlightForeground, registerColor } from '../../../../platform/theme/common/colorRegistry.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { StopWatch } from '../../../../base/common/stopwatch.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 
 const $ = dom.$;
 
@@ -126,9 +126,13 @@ export class ParameterHintsWidget extends Disposable implements IContentWidget {
 			if (!this.domNodes) {
 				return;
 			}
+
 			const fontInfo = this.editor.getOption(EditorOption.fontInfo);
-			this.domNodes.element.style.fontSize = `${fontInfo.fontSize}px`;
-			this.domNodes.element.style.lineHeight = `${fontInfo.lineHeight / fontInfo.fontSize}`;
+			const element = this.domNodes.element;
+			element.style.fontSize = `${fontInfo.fontSize}px`;
+			element.style.lineHeight = `${fontInfo.lineHeight / fontInfo.fontSize}`;
+			element.style.setProperty('--vscode-parameterHintsWidget-editorFontFamily', fontInfo.fontFamily);
+			element.style.setProperty('--vscode-parameterHintsWidget-editorFontFamilyDefault', EDITOR_FONT_DEFAULTS.fontFamily);
 		};
 
 		updateFont();
@@ -203,10 +207,6 @@ export class ParameterHintsWidget extends Disposable implements IContentWidget {
 		}
 
 		const code = dom.append(this.domNodes.signature, $('.code'));
-		const fontInfo = this.editor.getOption(EditorOption.fontInfo);
-		code.style.fontSize = `${fontInfo.fontSize}px`;
-		code.style.fontFamily = fontInfo.fontFamily;
-
 		const hasParameters = signature.parameters.length > 0;
 		const activeParameterIndex = signature.activeParameter ?? hints.activeParameter;
 
@@ -387,4 +387,4 @@ export class ParameterHintsWidget extends Disposable implements IContentWidget {
 	}
 }
 
-registerColor('editorHoverWidget.highlightForeground', { dark: listHighlightForeground, light: listHighlightForeground, hcDark: listHighlightForeground, hcLight: listHighlightForeground }, nls.localize('editorHoverWidgetHighlightForeground', 'Foreground color of the active item in the parameter hint.'));
+registerColor('editorHoverWidget.highlightForeground', listHighlightForeground, nls.localize('editorHoverWidgetHighlightForeground', 'Foreground color of the active item in the parameter hint.'));
diff --git a/src/vs/editor/contrib/parameterHints/browser/provideSignatureHelp.ts b/src/vs/editor/contrib/parameterHints/browser/provideSignatureHelp.ts
index 8f4341b481f..b35d6e0e217 100644
--- a/src/vs/editor/contrib/parameterHints/browser/provideSignatureHelp.ts
+++ b/src/vs/editor/contrib/parameterHints/browser/provideSignatureHelp.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { onUnexpectedExternalError } from 'vs/base/common/errors';
-import { assertType } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import * as languages from 'vs/editor/common/languages';
-import { ITextModel } from 'vs/editor/common/model';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { onUnexpectedExternalError } from '../../../../base/common/errors.js';
+import { assertType } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IPosition, Position } from '../../../common/core/position.js';
+import { LanguageFeatureRegistry } from '../../../common/languageFeatureRegistry.js';
+import * as languages from '../../../common/languages.js';
+import { ITextModel } from '../../../common/model.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { ITextModelService } from '../../../common/services/resolverService.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 
 export const Context = {
 	Visible: new RawContextKey<boolean>('parameterHintsVisible', false),
diff --git a/src/vs/editor/contrib/parameterHints/test/browser/parameterHintsModel.test.ts b/src/vs/editor/contrib/parameterHints/test/browser/parameterHintsModel.test.ts
index 10372b408c4..a0138cb395a 100644
--- a/src/vs/editor/contrib/parameterHints/test/browser/parameterHintsModel.test.ts
+++ b/src/vs/editor/contrib/parameterHints/test/browser/parameterHintsModel.test.ts
@@ -4,24 +4,24 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { promiseWithResolvers } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Position } from 'vs/editor/common/core/position';
-import { Handler } from 'vs/editor/common/editorCommon';
-import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import * as languages from 'vs/editor/common/languages';
-import { ITextModel } from 'vs/editor/common/model';
-import { ParameterHintsModel } from 'vs/editor/contrib/parameterHints/browser/parameterHintsModel';
-import { createTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { InMemoryStorageService, IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
+import { promiseWithResolvers } from '../../../../../base/common/async.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { runWithFakedTimers } from '../../../../../base/test/common/timeTravelScheduler.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Position } from '../../../../common/core/position.js';
+import { Handler } from '../../../../common/editorCommon.js';
+import { LanguageFeatureRegistry } from '../../../../common/languageFeatureRegistry.js';
+import * as languages from '../../../../common/languages.js';
+import { ITextModel } from '../../../../common/model.js';
+import { ParameterHintsModel } from '../../browser/parameterHintsModel.js';
+import { createTestCodeEditor } from '../../../../test/browser/testCodeEditor.js';
+import { createTextModel } from '../../../../test/common/testTextModel.js';
+import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
+import { InMemoryStorageService, IStorageService } from '../../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { NullTelemetryService } from '../../../../../platform/telemetry/common/telemetryUtils.js';
 
 const mockFile = URI.parse('test:somefile.ttt');
 const mockFileSelector = { scheme: 'test' };
diff --git a/src/vs/editor/contrib/peekView/browser/peekView.ts b/src/vs/editor/contrib/peekView/browser/peekView.ts
index a0f2dfd914e..17084e7ae64 100644
--- a/src/vs/editor/contrib/peekView/browser/peekView.ts
+++ b/src/vs/editor/contrib/peekView/browser/peekView.ts
@@ -3,30 +3,30 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { IMouseEvent } from 'vs/base/browser/mouseEvent';
-import { ActionBar, ActionsOrientation, IActionBarOptions } from 'vs/base/browser/ui/actionbar/actionbar';
-import { Action } from 'vs/base/common/actions';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { Color } from 'vs/base/common/color';
-import { Emitter } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import * as objects from 'vs/base/common/objects';
-import 'vs/css!./media/peekViewWidget';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { IOptions, IStyles, ZoneWidget } from 'vs/editor/contrib/zoneWidget/browser/zoneWidget';
-import * as nls from 'vs/nls';
-import { createActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { createDecorator, IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { activeContrastBorder, contrastBorder, editorForeground, editorInfoForeground, registerColor } from 'vs/platform/theme/common/colorRegistry';
+import * as dom from '../../../../base/browser/dom.js';
+import { IMouseEvent } from '../../../../base/browser/mouseEvent.js';
+import { ActionBar, ActionsOrientation, IActionBarOptions } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { Action } from '../../../../base/common/actions.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { Color } from '../../../../base/common/color.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import * as objects from '../../../../base/common/objects.js';
+import './media/peekViewWidget.css';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorContributionInstantiation, registerEditorContribution } from '../../../browser/editorExtensions.js';
+import { ICodeEditorService } from '../../../browser/services/codeEditorService.js';
+import { EmbeddedCodeEditorWidget } from '../../../browser/widget/codeEditor/embeddedCodeEditorWidget.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { IEditorContribution } from '../../../common/editorCommon.js';
+import { IOptions, IStyles, ZoneWidget } from '../../zoneWidget/browser/zoneWidget.js';
+import * as nls from '../../../../nls.js';
+import { createActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { createDecorator, IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { activeContrastBorder, contrastBorder, editorForeground, editorInfoForeground, registerColor } from '../../../../platform/theme/common/colorRegistry.js';
 
 export const IPeekViewService = createDecorator<IPeekViewService>('IPeekViewService');
 export interface IPeekViewService {
@@ -289,8 +289,8 @@ export const peekViewResultsFileForeground = registerColor('peekViewResult.fileF
 export const peekViewResultsSelectionBackground = registerColor('peekViewResult.selectionBackground', { dark: '#3399ff33', light: '#3399ff33', hcDark: null, hcLight: null }, nls.localize('peekViewResultsSelectionBackground', 'Background color of the selected entry in the peek view result list.'));
 export const peekViewResultsSelectionForeground = registerColor('peekViewResult.selectionForeground', { dark: Color.white, light: '#6C6C6C', hcDark: Color.white, hcLight: editorForeground }, nls.localize('peekViewResultsSelectionForeground', 'Foreground color of the selected entry in the peek view result list.'));
 export const peekViewEditorBackground = registerColor('peekViewEditor.background', { dark: '#001F33', light: '#F2F8FC', hcDark: Color.black, hcLight: Color.white }, nls.localize('peekViewEditorBackground', 'Background color of the peek view editor.'));
-export const peekViewEditorGutterBackground = registerColor('peekViewEditorGutter.background', { dark: peekViewEditorBackground, light: peekViewEditorBackground, hcDark: peekViewEditorBackground, hcLight: peekViewEditorBackground }, nls.localize('peekViewEditorGutterBackground', 'Background color of the gutter in the peek view editor.'));
-export const peekViewEditorStickyScrollBackground = registerColor('peekViewEditorStickyScroll.background', { dark: peekViewEditorBackground, light: peekViewEditorBackground, hcDark: peekViewEditorBackground, hcLight: peekViewEditorBackground }, nls.localize('peekViewEditorStickScrollBackground', 'Background color of sticky scroll in the peek view editor.'));
+export const peekViewEditorGutterBackground = registerColor('peekViewEditorGutter.background', peekViewEditorBackground, nls.localize('peekViewEditorGutterBackground', 'Background color of the gutter in the peek view editor.'));
+export const peekViewEditorStickyScrollBackground = registerColor('peekViewEditorStickyScroll.background', peekViewEditorBackground, nls.localize('peekViewEditorStickScrollBackground', 'Background color of sticky scroll in the peek view editor.'));
 
 export const peekViewResultsMatchHighlight = registerColor('peekViewResult.matchHighlightBackground', { dark: '#ea5c004d', light: '#ea5c004d', hcDark: null, hcLight: null }, nls.localize('peekViewResultsMatchHighlight', 'Match highlight color in the peek view result list.'));
 export const peekViewEditorMatchHighlight = registerColor('peekViewEditor.matchHighlightBackground', { dark: '#ff8f0099', light: '#f5d802de', hcDark: null, hcLight: null }, nls.localize('peekViewEditorMatchHighlight', 'Match highlight color in the peek view editor.'));
diff --git a/src/vs/editor/contrib/placeholderText/browser/placeholderText.contribution.ts b/src/vs/editor/contrib/placeholderText/browser/placeholderText.contribution.ts
index 0a7bf00c99b..8cb84d9463c 100644
--- a/src/vs/editor/contrib/placeholderText/browser/placeholderText.contribution.ts
+++ b/src/vs/editor/contrib/placeholderText/browser/placeholderText.contribution.ts
@@ -3,69 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { structuralEquals } from 'vs/base/common/equals';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { derived, derivedOpts } from 'vs/base/common/observable';
-import 'vs/css!./placeholderText';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { observableCodeEditor } from 'vs/editor/browser/observableUtilities';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { ghostTextForeground } from 'vs/editor/common/core/editorColorRegistry';
-import { Range } from 'vs/editor/common/core/range';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { IModelDeltaDecoration, InjectedTextCursorStops } from 'vs/editor/common/model';
-import { localize } from 'vs/nls';
-import { registerColor } from 'vs/platform/theme/common/colorUtils';
+import './placeholderText.css';
+import { EditorContributionInstantiation, registerEditorContribution } from '../../../browser/editorExtensions.js';
+import { ghostTextForeground } from '../../../common/core/editorColorRegistry.js';
+import { localize } from '../../../../nls.js';
+import { registerColor } from '../../../../platform/theme/common/colorUtils.js';
+import { PlaceholderTextContribution } from './placeholderTextContribution.js';
+import { wrapInReloadableClass1 } from '../../../../platform/observable/common/wrapInReloadableClass.js';
 
-/**
- * Use the editor option to set the placeholder text.
-*/
-export class PlaceholderTextContribution extends Disposable implements IEditorContribution {
-	public static get(editor: ICodeEditor): PlaceholderTextContribution {
-		return editor.getContribution<PlaceholderTextContribution>(PlaceholderTextContribution.ID)!;
-	}
+registerEditorContribution(PlaceholderTextContribution.ID, wrapInReloadableClass1(() => PlaceholderTextContribution), EditorContributionInstantiation.Eager);
 
-	public static readonly ID = 'editor.contrib.placeholderText';
-	private readonly _editorObs = observableCodeEditor(this._editor);
-
-	private readonly _placeholderText = this._editorObs.getOption(EditorOption.placeholder);
-
-	private readonly _decorationOptions = derivedOpts<{ placeholder: string } | undefined>({ owner: this, equalsFn: structuralEquals }, reader => {
-		const p = this._placeholderText.read(reader);
-		if (!p) { return undefined; }
-		if (!this._editorObs.valueIsEmpty.read(reader)) { return undefined; }
-
-		return { placeholder: p };
-	});
-
-	private readonly _decorations = derived<IModelDeltaDecoration[]>(this, (reader) => {
-		const options = this._decorationOptions.read(reader);
-		if (!options) { return []; }
-
-		return [{
-			range: new Range(1, 1, 1, 1),
-			options: {
-				description: 'placeholder',
-				showIfCollapsed: true,
-				after: {
-					content: options.placeholder,
-					cursorStops: InjectedTextCursorStops.None,
-					inlineClassName: 'placeholder-text'
-				}
-			}
-		}];
-	});
-
-	constructor(
-		private readonly _editor: ICodeEditor,
-	) {
-		super();
-
-		this._register(this._editorObs.setDecorations(this._decorations));
-	}
-}
-
-registerEditorContribution(PlaceholderTextContribution.ID, PlaceholderTextContribution, EditorContributionInstantiation.Eager);
-
-registerColor('editor.placeholder.foreground', { dark: ghostTextForeground, light: ghostTextForeground, hcDark: ghostTextForeground, hcLight: ghostTextForeground }, localize('placeholderForeground', 'Foreground color of the placeholder text in the editor.'));
+registerColor('editor.placeholder.foreground', ghostTextForeground, localize('placeholderForeground', 'Foreground color of the placeholder text in the editor.'));
diff --git a/src/vs/editor/contrib/placeholderText/browser/placeholderText.css b/src/vs/editor/contrib/placeholderText/browser/placeholderText.css
index 65843a23be7..043b6f15632 100644
--- a/src/vs/editor/contrib/placeholderText/browser/placeholderText.css
+++ b/src/vs/editor/contrib/placeholderText/browser/placeholderText.css
@@ -4,9 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 .monaco-editor {
-	--vscode-editor-placeholder-foreground: rgba(0, 0, 0, 0.5);
-}
+	--vscode-editor-placeholder-foreground: var(--vscode-editorGhostText-foreground);
 
-.monaco-editor .placeholder-text {
-	color: var(--vscode-editor-placeholder-foreground);
+	.editorPlaceholder {
+		top: 0px;
+		position: absolute;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		text-wrap: nowrap;
+		pointer-events: none;
+
+		color: var(--vscode-editor-placeholder-foreground);
+	}
 }
diff --git a/src/vs/editor/contrib/placeholderText/browser/placeholderTextContribution.ts b/src/vs/editor/contrib/placeholderText/browser/placeholderTextContribution.ts
new file mode 100644
index 00000000000..b06224c3e9d
--- /dev/null
+++ b/src/vs/editor/contrib/placeholderText/browser/placeholderTextContribution.ts
@@ -0,0 +1,80 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { h } from '../../../../base/browser/dom.js';
+import { structuralEquals } from '../../../../base/common/equals.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { autorun, constObservable, DebugOwner, derivedObservableWithCache, derivedOpts, derivedWithStore, IObservable, IReader } from '../../../../base/common/observable.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { observableCodeEditor } from '../../../browser/observableCodeEditor.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { IEditorContribution } from '../../../common/editorCommon.js';
+
+/**
+ * Use the editor option to set the placeholder text.
+*/
+export class PlaceholderTextContribution extends Disposable implements IEditorContribution {
+	public static get(editor: ICodeEditor): PlaceholderTextContribution {
+		return editor.getContribution<PlaceholderTextContribution>(PlaceholderTextContribution.ID)!;
+	}
+
+	public static readonly ID = 'editor.contrib.placeholderText';
+	private readonly _editorObs = observableCodeEditor(this._editor);
+
+	private readonly _placeholderText = this._editorObs.getOption(EditorOption.placeholder);
+
+	private readonly _state = derivedOpts<{ placeholder: string } | undefined>({ owner: this, equalsFn: structuralEquals }, reader => {
+		const p = this._placeholderText.read(reader);
+		if (!p) { return undefined; }
+		if (!this._editorObs.valueIsEmpty.read(reader)) { return undefined; }
+		return { placeholder: p };
+	});
+
+	private readonly _shouldViewBeAlive = isOrWasTrue(this, reader => this._state.read(reader)?.placeholder !== undefined);
+
+	private readonly _view = derivedWithStore((reader, store) => {
+		if (!this._shouldViewBeAlive.read(reader)) { return; }
+
+		const element = h('div.editorPlaceholder');
+
+		store.add(autorun(reader => {
+			const data = this._state.read(reader);
+			const shouldBeVisibile = data?.placeholder !== undefined;
+			element.root.style.display = shouldBeVisibile ? 'block' : 'none';
+			element.root.innerText = data?.placeholder ?? '';
+		}));
+		store.add(autorun(reader => {
+			const info = this._editorObs.layoutInfo.read(reader);
+			element.root.style.left = `${info.contentLeft}px`;
+			element.root.style.width = (info.contentWidth - info.verticalScrollbarWidth) + 'px';
+			element.root.style.top = `${this._editor.getTopForLineNumber(0)}px`;
+		}));
+		store.add(autorun(reader => {
+			element.root.style.fontFamily = this._editorObs.getOption(EditorOption.fontFamily).read(reader);
+			element.root.style.fontSize = this._editorObs.getOption(EditorOption.fontSize).read(reader) + 'px';
+			element.root.style.lineHeight = this._editorObs.getOption(EditorOption.lineHeight).read(reader) + 'px';
+		}));
+		store.add(this._editorObs.createOverlayWidget({
+			allowEditorOverflow: false,
+			minContentWidthInPx: constObservable(0),
+			position: constObservable(null),
+			domNode: element.root,
+		}));
+	});
+
+	constructor(
+		private readonly _editor: ICodeEditor,
+	) {
+		super();
+		this._view.recomputeInitiallyAndOnChange(this._store);
+	}
+}
+
+function isOrWasTrue(owner: DebugOwner, fn: (reader: IReader) => boolean): IObservable<boolean> {
+	return derivedObservableWithCache<boolean>(owner, (reader, lastValue) => {
+		if (lastValue === true) { return true; }
+		return fn(reader);
+	});
+}
diff --git a/src/vs/editor/contrib/quickAccess/browser/commandsQuickAccess.ts b/src/vs/editor/contrib/quickAccess/browser/commandsQuickAccess.ts
index 9334d7fcde1..b1fa0b3f77b 100644
--- a/src/vs/editor/contrib/quickAccess/browser/commandsQuickAccess.ts
+++ b/src/vs/editor/contrib/quickAccess/browser/commandsQuickAccess.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { stripIcons } from 'vs/base/common/iconLabels';
-import { IEditor } from 'vs/editor/common/editorCommon';
-import { ILocalizedString } from 'vs/nls';
-import { isLocalizedString } from 'vs/platform/action/common/action';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { AbstractCommandsQuickAccessProvider, ICommandQuickPick, ICommandsQuickAccessOptions } from 'vs/platform/quickinput/browser/commandsQuickAccess';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { stripIcons } from '../../../../base/common/iconLabels.js';
+import { IEditor } from '../../../common/editorCommon.js';
+import { ILocalizedString } from '../../../../nls.js';
+import { isLocalizedString } from '../../../../platform/action/common/action.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { AbstractCommandsQuickAccessProvider, ICommandQuickPick, ICommandsQuickAccessOptions } from '../../../../platform/quickinput/browser/commandsQuickAccess.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 
 export abstract class AbstractEditorCommandsQuickAccessProvider extends AbstractCommandsQuickAccessProvider {
 
diff --git a/src/vs/editor/contrib/quickAccess/browser/editorNavigationQuickAccess.ts b/src/vs/editor/contrib/quickAccess/browser/editorNavigationQuickAccess.ts
index 05c099c63c4..749259c2711 100644
--- a/src/vs/editor/contrib/quickAccess/browser/editorNavigationQuickAccess.ts
+++ b/src/vs/editor/contrib/quickAccess/browser/editorNavigationQuickAccess.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Event } from 'vs/base/common/event';
-import { createSingleCallFunction } from 'vs/base/common/functional';
-import { DisposableStore, IDisposable, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { getCodeEditor, isDiffEditor } from 'vs/editor/browser/editorBrowser';
-import { IRange } from 'vs/editor/common/core/range';
-import { IDiffEditor, IEditor, ScrollType } from 'vs/editor/common/editorCommon';
-import { IModelDeltaDecoration, ITextModel, OverviewRulerLane } from 'vs/editor/common/model';
-import { overviewRulerRangeHighlight } from 'vs/editor/common/core/editorColorRegistry';
-import { IQuickAccessProvider, IQuickAccessProviderRunOptions } from 'vs/platform/quickinput/common/quickAccess';
-import { IKeyMods, IQuickPick, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { themeColorFromId } from 'vs/platform/theme/common/themeService';
-import { status } from 'vs/base/browser/ui/aria/aria';
-import { TextEditorSelectionSource } from 'vs/platform/editor/common/editor';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Event } from '../../../../base/common/event.js';
+import { createSingleCallFunction } from '../../../../base/common/functional.js';
+import { DisposableStore, IDisposable, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { getCodeEditor, isDiffEditor } from '../../../browser/editorBrowser.js';
+import { IRange } from '../../../common/core/range.js';
+import { IDiffEditor, IEditor, ScrollType } from '../../../common/editorCommon.js';
+import { IModelDeltaDecoration, ITextModel, OverviewRulerLane } from '../../../common/model.js';
+import { overviewRulerRangeHighlight } from '../../../common/core/editorColorRegistry.js';
+import { IQuickAccessProvider, IQuickAccessProviderRunOptions } from '../../../../platform/quickinput/common/quickAccess.js';
+import { IKeyMods, IQuickPick, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
+import { themeColorFromId } from '../../../../platform/theme/common/themeService.js';
+import { status } from '../../../../base/browser/ui/aria/aria.js';
+import { TextEditorSelectionSource } from '../../../../platform/editor/common/editor.js';
 
 interface IEditorLineDecoration {
 	readonly rangeHighlightId: string;
@@ -52,7 +52,7 @@ export abstract class AbstractEditorNavigationQuickAccessProvider implements IQu
 
 	//#region Provider methods
 
-	provide(picker: IQuickPick<IQuickPickItem>, token: CancellationToken, runOptions?: IQuickAccessProviderRunOptions): IDisposable {
+	provide(picker: IQuickPick<IQuickPickItem, { useSeparators: true }>, token: CancellationToken, runOptions?: IQuickAccessProviderRunOptions): IDisposable {
 		const disposables = new DisposableStore();
 
 		// Apply options if any
@@ -78,7 +78,7 @@ export abstract class AbstractEditorNavigationQuickAccessProvider implements IQu
 		return disposables;
 	}
 
-	private doProvide(picker: IQuickPick<IQuickPickItem>, token: CancellationToken, runOptions?: IQuickAccessProviderRunOptions): IDisposable {
+	private doProvide(picker: IQuickPick<IQuickPickItem, { useSeparators: true }>, token: CancellationToken, runOptions?: IQuickAccessProviderRunOptions): IDisposable {
 		const disposables = new DisposableStore();
 
 		// With text control
@@ -134,12 +134,12 @@ export abstract class AbstractEditorNavigationQuickAccessProvider implements IQu
 	/**
 	 * Subclasses to implement to provide picks for the picker when an editor is active.
 	 */
-	protected abstract provideWithTextEditor(context: IQuickAccessTextEditorContext, picker: IQuickPick<IQuickPickItem>, token: CancellationToken, runOptions?: IQuickAccessProviderRunOptions): IDisposable;
+	protected abstract provideWithTextEditor(context: IQuickAccessTextEditorContext, picker: IQuickPick<IQuickPickItem, { useSeparators: true }>, token: CancellationToken, runOptions?: IQuickAccessProviderRunOptions): IDisposable;
 
 	/**
 	 * Subclasses to implement to provide picks for the picker when no editor is active.
 	 */
-	protected abstract provideWithoutTextEditor(picker: IQuickPick<IQuickPickItem>, token: CancellationToken): IDisposable;
+	protected abstract provideWithoutTextEditor(picker: IQuickPick<IQuickPickItem, { useSeparators: true }>, token: CancellationToken): IDisposable;
 
 	protected gotoLocation({ editor }: IQuickAccessTextEditorContext, options: { range: IRange; keyMods: IKeyMods; forceSideBySide?: boolean; preserveFocus?: boolean }): void {
 		editor.setSelection(options.range, TextEditorSelectionSource.JUMP);
diff --git a/src/vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess.ts b/src/vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess.ts
index 6db58ae6cc0..4d720513f9f 100644
--- a/src/vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess.ts
+++ b/src/vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { getCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorOption, RenderLineNumbersType } from 'vs/editor/common/config/editorOptions';
-import { IPosition } from 'vs/editor/common/core/position';
-import { IRange } from 'vs/editor/common/core/range';
-import { IEditor, ScrollType } from 'vs/editor/common/editorCommon';
-import { AbstractEditorNavigationQuickAccessProvider, IQuickAccessTextEditorContext } from 'vs/editor/contrib/quickAccess/browser/editorNavigationQuickAccess';
-import { localize } from 'vs/nls';
-import { IQuickPick, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { getCodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorOption, RenderLineNumbersType } from '../../../common/config/editorOptions.js';
+import { IPosition } from '../../../common/core/position.js';
+import { IRange } from '../../../common/core/range.js';
+import { IEditor, ScrollType } from '../../../common/editorCommon.js';
+import { AbstractEditorNavigationQuickAccessProvider, IQuickAccessTextEditorContext } from './editorNavigationQuickAccess.js';
+import { localize } from '../../../../nls.js';
+import { IQuickPick, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
 
 interface IGotoLineQuickPickItem extends IQuickPickItem, Partial<IPosition> { }
 
@@ -24,7 +24,7 @@ export abstract class AbstractGotoLineQuickAccessProvider extends AbstractEditor
 		super({ canAcceptInBackground: true });
 	}
 
-	protected provideWithoutTextEditor(picker: IQuickPick<IGotoLineQuickPickItem>): IDisposable {
+	protected provideWithoutTextEditor(picker: IQuickPick<IGotoLineQuickPickItem, { useSeparators: true }>): IDisposable {
 		const label = localize('cannotRunGotoLine', "Open a text editor first to go to a line.");
 
 		picker.items = [{ label }];
@@ -33,7 +33,7 @@ export abstract class AbstractGotoLineQuickAccessProvider extends AbstractEditor
 		return Disposable.None;
 	}
 
-	protected provideWithTextEditor(context: IQuickAccessTextEditorContext, picker: IQuickPick<IGotoLineQuickPickItem>, token: CancellationToken): IDisposable {
+	protected provideWithTextEditor(context: IQuickAccessTextEditorContext, picker: IQuickPick<IGotoLineQuickPickItem, { useSeparators: true }>, token: CancellationToken): IDisposable {
 		const editor = context.editor;
 		const disposables = new DisposableStore();
 
diff --git a/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.ts b/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.ts
index 46aeeda1706..4472fd93156 100644
--- a/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.ts
+++ b/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.ts
@@ -3,27 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DeferredPromise } from 'vs/base/common/async';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IMatch } from 'vs/base/common/filters';
-import { IPreparedQuery, pieceToQuery, prepareQuery, scoreFuzzy2 } from 'vs/base/common/fuzzyScorer';
-import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { format, trim } from 'vs/base/common/strings';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { ScrollType } from 'vs/editor/common/editorCommon';
-import { ITextModel } from 'vs/editor/common/model';
-import { DocumentSymbol, SymbolKind, SymbolKinds, SymbolTag, getAriaLabelForSymbol } from 'vs/editor/common/languages';
-import { IOutlineModelService } from 'vs/editor/contrib/documentSymbols/browser/outlineModel';
-import { AbstractEditorNavigationQuickAccessProvider, IEditorNavigationQuickAccessOptions, IQuickAccessTextEditorContext } from 'vs/editor/contrib/quickAccess/browser/editorNavigationQuickAccess';
-import { localize } from 'vs/nls';
-import { IQuickInputButton, IQuickPick, IQuickPickItem, IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { Position } from 'vs/editor/common/core/position';
-import { findLast } from 'vs/base/common/arraysFind';
-import { IQuickAccessProviderRunOptions } from 'vs/platform/quickinput/common/quickAccess';
-import { URI } from 'vs/base/common/uri';
+import { DeferredPromise } from '../../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { IMatch } from '../../../../base/common/filters.js';
+import { IPreparedQuery, pieceToQuery, prepareQuery, scoreFuzzy2 } from '../../../../base/common/fuzzyScorer.js';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { format, trim } from '../../../../base/common/strings.js';
+import { IRange, Range } from '../../../common/core/range.js';
+import { ScrollType } from '../../../common/editorCommon.js';
+import { ITextModel } from '../../../common/model.js';
+import { DocumentSymbol, SymbolKind, SymbolKinds, SymbolTag, getAriaLabelForSymbol } from '../../../common/languages.js';
+import { IOutlineModelService } from '../../documentSymbols/browser/outlineModel.js';
+import { AbstractEditorNavigationQuickAccessProvider, IEditorNavigationQuickAccessOptions, IQuickAccessTextEditorContext } from './editorNavigationQuickAccess.js';
+import { localize } from '../../../../nls.js';
+import { IQuickInputButton, IQuickPick, IQuickPickItem, IQuickPickSeparator } from '../../../../platform/quickinput/common/quickInput.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { Position } from '../../../common/core/position.js';
+import { findLast } from '../../../../base/common/arraysFind.js';
+import { IQuickAccessProviderRunOptions } from '../../../../platform/quickinput/common/quickAccess.js';
+import { URI } from '../../../../base/common/uri.js';
 
 export interface IGotoSymbolQuickPickItem extends IQuickPickItem {
 	kind: SymbolKind;
@@ -48,7 +48,7 @@ export abstract class AbstractGotoSymbolQuickAccessProvider extends AbstractEdit
 
 	static PREFIX = '@';
 	static SCOPE_PREFIX = ':';
-	static PREFIX_BY_CATEGORY = `${AbstractGotoSymbolQuickAccessProvider.PREFIX}${AbstractGotoSymbolQuickAccessProvider.SCOPE_PREFIX}`;
+	static PREFIX_BY_CATEGORY = `${this.PREFIX}${this.SCOPE_PREFIX}`;
 
 	protected override readonly options: IGotoSymbolQuickAccessProviderOptions;
 
@@ -63,13 +63,13 @@ export abstract class AbstractGotoSymbolQuickAccessProvider extends AbstractEdit
 		this.options.canAcceptInBackground = true;
 	}
 
-	protected provideWithoutTextEditor(picker: IQuickPick<IGotoSymbolQuickPickItem>): IDisposable {
+	protected provideWithoutTextEditor(picker: IQuickPick<IGotoSymbolQuickPickItem, { useSeparators: true }>): IDisposable {
 		this.provideLabelPick(picker, localize('cannotRunGotoSymbolWithoutEditor', "To go to a symbol, first open a text editor with symbol information."));
 
 		return Disposable.None;
 	}
 
-	protected provideWithTextEditor(context: IQuickAccessTextEditorContext, picker: IQuickPick<IGotoSymbolQuickPickItem>, token: CancellationToken, runOptions?: IQuickAccessProviderRunOptions): IDisposable {
+	protected provideWithTextEditor(context: IQuickAccessTextEditorContext, picker: IQuickPick<IGotoSymbolQuickPickItem, { useSeparators: true }>, token: CancellationToken, runOptions?: IQuickAccessProviderRunOptions): IDisposable {
 		const editor = context.editor;
 		const model = this.getModel(editor);
 		if (!model) {
@@ -87,7 +87,7 @@ export abstract class AbstractGotoSymbolQuickAccessProvider extends AbstractEdit
 		return this.doProvideWithoutEditorSymbols(context, model, picker, token);
 	}
 
-	private doProvideWithoutEditorSymbols(context: IQuickAccessTextEditorContext, model: ITextModel, picker: IQuickPick<IGotoSymbolQuickPickItem>, token: CancellationToken): IDisposable {
+	private doProvideWithoutEditorSymbols(context: IQuickAccessTextEditorContext, model: ITextModel, picker: IQuickPick<IGotoSymbolQuickPickItem, { useSeparators: true }>, token: CancellationToken): IDisposable {
 		const disposables = new DisposableStore();
 
 		// Generic pick for not having any symbol information
@@ -110,7 +110,7 @@ export abstract class AbstractGotoSymbolQuickAccessProvider extends AbstractEdit
 		return disposables;
 	}
 
-	private provideLabelPick(picker: IQuickPick<IGotoSymbolQuickPickItem>, label: string): void {
+	private provideLabelPick(picker: IQuickPick<IGotoSymbolQuickPickItem, { useSeparators: true }>, label: string): void {
 		picker.items = [{ label, index: 0, kind: SymbolKind.String }];
 		picker.ariaLabel = label;
 	}
@@ -137,7 +137,7 @@ export abstract class AbstractGotoSymbolQuickAccessProvider extends AbstractEdit
 		return symbolProviderRegistryPromise.p;
 	}
 
-	private doProvideWithEditorSymbols(context: IQuickAccessTextEditorContext, model: ITextModel, picker: IQuickPick<IGotoSymbolQuickPickItem>, token: CancellationToken, runOptions?: IQuickAccessProviderRunOptions): IDisposable {
+	private doProvideWithEditorSymbols(context: IQuickAccessTextEditorContext, model: ITextModel, picker: IQuickPick<IGotoSymbolQuickPickItem, { useSeparators: true }>, token: CancellationToken, runOptions?: IQuickAccessProviderRunOptions): IDisposable {
 		const editor = context.editor;
 		const disposables = new DisposableStore();
 
diff --git a/src/vs/editor/contrib/readOnlyMessage/browser/contribution.ts b/src/vs/editor/contrib/readOnlyMessage/browser/contribution.ts
index 36ff95e8105..85c34684807 100644
--- a/src/vs/editor/contrib/readOnlyMessage/browser/contribution.ts
+++ b/src/vs/editor/contrib/readOnlyMessage/browser/contribution.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { MessageController } from 'vs/editor/contrib/message/browser/messageController';
-import * as nls from 'vs/nls';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorContributionInstantiation, registerEditorContribution } from '../../../browser/editorExtensions.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { IEditorContribution } from '../../../common/editorCommon.js';
+import { MessageController } from '../../message/browser/messageController.js';
+import * as nls from '../../../../nls.js';
 
 export class ReadOnlyMessageController extends Disposable implements IEditorContribution {
 
diff --git a/src/vs/editor/contrib/rename/browser/rename.ts b/src/vs/editor/contrib/rename/browser/rename.ts
index ef5783aa500..e6e77aa01ae 100644
--- a/src/vs/editor/contrib/rename/browser/rename.ts
+++ b/src/vs/editor/contrib/rename/browser/rename.ts
@@ -3,42 +3,42 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { alert } from 'vs/base/browser/ui/aria/aria';
-import { raceCancellation } from 'vs/base/common/async';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { CancellationError, onUnexpectedError } from 'vs/base/common/errors';
-import { isMarkdownString } from 'vs/base/common/htmlContent';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { assertType } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, EditorCommand, EditorContributionInstantiation, ServicesAccessor, registerEditorAction, registerEditorCommand, registerEditorContribution, registerModelAndPositionCommand } from 'vs/editor/browser/editorExtensions';
-import { IBulkEditService } from 'vs/editor/browser/services/bulkEditService';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import { NewSymbolNameTriggerKind, Rejection, RenameLocation, RenameProvider, WorkspaceEdit } from 'vs/editor/common/languages';
-import { ITextModel } from 'vs/editor/common/model';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { CodeEditorStateFlag, EditorStateCancellationTokenSource } from 'vs/editor/contrib/editorState/browser/editorState';
-import { MessageController } from 'vs/editor/contrib/message/browser/messageController';
-import * as nls from 'vs/nls';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ConfigurationScope, Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ILogService } from 'vs/platform/log/common/log';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IEditorProgressService } from 'vs/platform/progress/common/progress';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { CONTEXT_RENAME_INPUT_VISIBLE, NewNameSource, RenameWidget, RenameWidgetResult } from './renameWidget';
+import { alert } from '../../../../base/browser/ui/aria/aria.js';
+import { raceCancellation } from '../../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { CancellationError, onUnexpectedError } from '../../../../base/common/errors.js';
+import { isMarkdownString } from '../../../../base/common/htmlContent.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { assertType } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorAction, EditorCommand, EditorContributionInstantiation, ServicesAccessor, registerEditorAction, registerEditorCommand, registerEditorContribution, registerModelAndPositionCommand } from '../../../browser/editorExtensions.js';
+import { IBulkEditService } from '../../../browser/services/bulkEditService.js';
+import { ICodeEditorService } from '../../../browser/services/codeEditorService.js';
+import { IPosition, Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { IEditorContribution } from '../../../common/editorCommon.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { LanguageFeatureRegistry } from '../../../common/languageFeatureRegistry.js';
+import { NewSymbolNameTriggerKind, Rejection, RenameLocation, RenameProvider, WorkspaceEdit } from '../../../common/languages.js';
+import { ITextModel } from '../../../common/model.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { ITextResourceConfigurationService } from '../../../common/services/textResourceConfiguration.js';
+import { CodeEditorStateFlag, EditorStateCancellationTokenSource } from '../../editorState/browser/editorState.js';
+import { MessageController } from '../../message/browser/messageController.js';
+import * as nls from '../../../../nls.js';
+import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { ConfigurationScope, Extensions, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IEditorProgressService } from '../../../../platform/progress/common/progress.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { CONTEXT_RENAME_INPUT_VISIBLE, NewNameSource, RenameWidget, RenameWidgetResult } from './renameWidget.js';
 
 class RenameSkeleton {
 
diff --git a/src/vs/editor/contrib/rename/browser/renameWidget.ts b/src/vs/editor/contrib/rename/browser/renameWidget.ts
index fc1c165a90d..f9294c16cda 100644
--- a/src/vs/editor/contrib/rename/browser/renameWidget.ts
+++ b/src/vs/editor/contrib/rename/browser/renameWidget.ts
@@ -3,40 +3,39 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import * as aria from 'vs/base/browser/ui/aria/aria';
-import { IManagedHover } from 'vs/base/browser/ui/hover/hover';
-import { getBaseLayerHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate2';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { renderIcon } from 'vs/base/browser/ui/iconLabel/iconLabels';
-import { IListRenderer, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { List } from 'vs/base/browser/ui/list/listWidget';
-import * as arrays from 'vs/base/common/arrays';
-import { DeferredPromise, raceCancellation } from 'vs/base/common/async';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Codicon } from 'vs/base/common/codicons';
-import { Emitter } from 'vs/base/common/event';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { assertType, isDefined } from 'vs/base/common/types';
-import 'vs/css!./renameWidget';
-import * as domFontInfo from 'vs/editor/browser/config/domFontInfo';
-import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from 'vs/editor/browser/editorBrowser';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { FontInfo } from 'vs/editor/common/config/fontInfo';
-import { IDimension } from 'vs/editor/common/core/dimension';
-import { Position } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { ScrollType } from 'vs/editor/common/editorCommon';
-import { NewSymbolName, NewSymbolNameTag, NewSymbolNameTriggerKind, ProviderResult } from 'vs/editor/common/languages';
-import * as nls from 'vs/nls';
-import { localize } from 'vs/nls';
-import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ILogService } from 'vs/platform/log/common/log';
-import { getListStyles } from 'vs/platform/theme/browser/defaultStyles';
+import * as dom from '../../../../base/browser/dom.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import * as aria from '../../../../base/browser/ui/aria/aria.js';
+import { IManagedHover } from '../../../../base/browser/ui/hover/hover.js';
+import { getBaseLayerHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegate2.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { IListRenderer, IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
+import { List } from '../../../../base/browser/ui/list/listWidget.js';
+import * as arrays from '../../../../base/common/arrays.js';
+import { DeferredPromise, raceCancellation } from '../../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { StopWatch } from '../../../../base/common/stopwatch.js';
+import { assertType, isDefined } from '../../../../base/common/types.js';
+import './renameWidget.css';
+import * as domFontInfo from '../../../browser/config/domFontInfo.js';
+import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from '../../../browser/editorBrowser.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { FontInfo } from '../../../common/config/fontInfo.js';
+import { IDimension } from '../../../common/core/dimension.js';
+import { Position } from '../../../common/core/position.js';
+import { IRange, Range } from '../../../common/core/range.js';
+import { ScrollType } from '../../../common/editorCommon.js';
+import { NewSymbolName, NewSymbolNameTag, NewSymbolNameTriggerKind, ProviderResult } from '../../../common/languages.js';
+import * as nls from '../../../../nls.js';
+import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { getListStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import {
 	editorWidgetBackground,
 	inputBackground,
@@ -46,8 +45,8 @@ import {
 	quickInputListFocusForeground,
 	widgetBorder,
 	widgetShadow
-} from 'vs/platform/theme/common/colorRegistry';
-import { IColorTheme, IThemeService } from 'vs/platform/theme/common/themeService';
+} from '../../../../platform/theme/common/colorRegistry.js';
+import { IColorTheme, IThemeService } from '../../../../platform/theme/common/themeService.js';
 
 /** for debugging */
 const _sticky = false
@@ -55,8 +54,8 @@ const _sticky = false
 	;
 
 
-export const CONTEXT_RENAME_INPUT_VISIBLE = new RawContextKey<boolean>('renameInputVisible', false, localize('renameInputVisible', "Whether the rename input widget is visible"));
-export const CONTEXT_RENAME_INPUT_FOCUSED = new RawContextKey<boolean>('renameInputFocused', false, localize('renameInputFocused', "Whether the rename input widget is focused"));
+export const CONTEXT_RENAME_INPUT_VISIBLE = new RawContextKey<boolean>('renameInputVisible', false, nls.localize('renameInputVisible', "Whether the rename input widget is visible"));
+export const CONTEXT_RENAME_INPUT_FOCUSED = new RawContextKey<boolean>('renameInputFocused', false, nls.localize('renameInputFocused', "Whether the rename input widget is focused"));
 
 /**
  * "Source" of the new name:
@@ -311,7 +310,7 @@ export class RenameWidget implements IRenameWidget, IContentWidget, IDisposable
 
 	beforeRender(): IDimension | null {
 		const [accept, preview] = this._acceptKeybindings;
-		this._label!.innerText = localize({ key: 'label', comment: ['placeholders are keybindings, e.g "F2 to Rename, Shift+F2 to Preview"'] }, "{0} to Rename, {1} to Preview", this._keybindingService.lookupKeybinding(accept)?.getLabel(), this._keybindingService.lookupKeybinding(preview)?.getLabel());
+		this._label!.innerText = nls.localize({ key: 'label', comment: ['placeholders are keybindings, e.g "F2 to Rename, Shift+F2 to Preview"'] }, "{0} to Rename, {1} to Preview", this._keybindingService.lookupKeybinding(accept)?.getLabel(), this._keybindingService.lookupKeybinding(preview)?.getLabel());
 
 		this._domNode!.style.minWidth = `200px`; // to prevent from widening when candidates come in
 
@@ -319,7 +318,8 @@ export class RenameWidget implements IRenameWidget, IContentWidget, IDisposable
 	}
 
 	afterRender(position: ContentWidgetPositionPreference | null): void {
-		this._trace('invoking afterRender, position: ', position ? 'not null' : 'null');
+		// FIXME@ulugbekna: commenting trace log out until we start unmounting the widget from editor properly - https://github.com/microsoft/vscode/issues/226975
+		// this._trace('invoking afterRender, position: ', position ? 'not null' : 'null');
 		if (position === null) {
 			// cancel rename when input widget isn't rendered anymore
 			this.cancelInput(true, 'afterRender (because position is null)');
@@ -364,7 +364,7 @@ export class RenameWidget implements IRenameWidget, IContentWidget, IDisposable
 	}
 
 	cancelInput(focusEditor: boolean, caller: string): void {
-		this._trace(`invoking cancelInput, caller: ${caller}, _currentCancelInput: ${this._currentAcceptInput ? 'not undefined' : 'undefined'}`);
+		// this._trace(`invoking cancelInput, caller: ${caller}, _currentCancelInput: ${this._currentAcceptInput ? 'not undefined' : 'undefined'}`);
 		this._currentCancelInput?.(focusEditor);
 	}
 
@@ -750,7 +750,7 @@ class RenameCandidateListView {
 		this._listContainer.style.height = `${height}px`;
 		this._listContainer.style.width = `${width}px`;
 
-		aria.status(localize('renameSuggestionsReceivedAria', "Received {0} rename suggestions", candidates.length));
+		aria.status(nls.localize('renameSuggestionsReceivedAria', "Received {0} rename suggestions", candidates.length));
 	}
 
 	public clearCandidates(): void {
@@ -924,7 +924,7 @@ class InputWithButton implements IDisposable {
 			this._inputNode.className = 'rename-input';
 			this._inputNode.type = 'text';
 			this._inputNode.style.border = 'none';
-			this._inputNode.setAttribute('aria-label', localize('renameAriaLabel', "Rename input. Type new name and press Enter to commit."));
+			this._inputNode.setAttribute('aria-label', nls.localize('renameAriaLabel', "Rename input. Type new name and press Enter to commit."));
 
 			this._domNode.appendChild(this._inputNode);
 
diff --git a/src/vs/editor/contrib/sectionHeaders/browser/sectionHeaders.ts b/src/vs/editor/contrib/sectionHeaders/browser/sectionHeaders.ts
index 2a60e180cfd..0d66e4dd3c4 100644
--- a/src/vs/editor/contrib/sectionHeaders/browser/sectionHeaders.ts
+++ b/src/vs/editor/contrib/sectionHeaders/browser/sectionHeaders.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancelablePromise, RunOnceScheduler } from 'vs/base/common/async';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { EditorOption, IEditorMinimapOptions } from 'vs/editor/common/config/editorOptions';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { StandardTokenType } from 'vs/editor/common/encodedTokenAttributes';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { IModelDeltaDecoration, MinimapPosition, MinimapSectionHeaderStyle, TrackedRangeStickiness } from 'vs/editor/common/model';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { FindSectionHeaderOptions, SectionHeader } from 'vs/editor/common/services/findSectionHeaders';
+import { CancelablePromise, RunOnceScheduler } from '../../../../base/common/async.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorContributionInstantiation, registerEditorContribution } from '../../../browser/editorExtensions.js';
+import { EditorOption, IEditorMinimapOptions } from '../../../common/config/editorOptions.js';
+import { IEditorContribution } from '../../../common/editorCommon.js';
+import { StandardTokenType } from '../../../common/encodedTokenAttributes.js';
+import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import { IModelDeltaDecoration, MinimapPosition, MinimapSectionHeaderStyle, TrackedRangeStickiness } from '../../../common/model.js';
+import { ModelDecorationOptions } from '../../../common/model/textModel.js';
+import { IEditorWorkerService } from '../../../common/services/editorWorker.js';
+import { FindSectionHeaderOptions, SectionHeader } from '../../../common/services/findSectionHeaders.js';
 
 export class SectionHeaderDetector extends Disposable implements IEditorContribution {
 
diff --git a/src/vs/editor/contrib/semanticTokens/browser/documentSemanticTokens.ts b/src/vs/editor/contrib/semanticTokens/browser/documentSemanticTokens.ts
index 72e01d3330a..836b30f9b9b 100644
--- a/src/vs/editor/contrib/semanticTokens/browser/documentSemanticTokens.ts
+++ b/src/vs/editor/contrib/semanticTokens/browser/documentSemanticTokens.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
-import * as errors from 'vs/base/common/errors';
-import { ITextModel } from 'vs/editor/common/model';
-import { IModelContentChangedEvent } from 'vs/editor/common/textModelEvents';
-import { DocumentSemanticTokensProvider, SemanticTokens, SemanticTokensEdits } from 'vs/editor/common/languages';
-import { IModelService } from 'vs/editor/common/services/model';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { SemanticTokensProviderStyling, toMultilineTokens2 } from 'vs/editor/common/services/semanticTokensProviderStyling';
-import { getDocumentSemanticTokens, hasDocumentSemanticTokensProvider, isSemanticTokens, isSemanticTokensEdits } from 'vs/editor/contrib/semanticTokens/common/getSemanticTokens';
-import { IFeatureDebounceInformation, ILanguageFeatureDebounceService } from 'vs/editor/common/services/languageFeatureDebounce';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import { ISemanticTokensStylingService } from 'vs/editor/common/services/semanticTokensStyling';
-import { registerEditorFeature } from 'vs/editor/common/editorFeatures';
-import { SEMANTIC_HIGHLIGHTING_SETTING_ID, isSemanticColoringEnabled } from 'vs/editor/contrib/semanticTokens/common/semanticTokensConfig';
+import { Disposable, IDisposable, dispose } from '../../../../base/common/lifecycle.js';
+import * as errors from '../../../../base/common/errors.js';
+import { ITextModel } from '../../../common/model.js';
+import { IModelContentChangedEvent } from '../../../common/textModelEvents.js';
+import { DocumentSemanticTokensProvider, SemanticTokens, SemanticTokensEdits } from '../../../common/languages.js';
+import { IModelService } from '../../../common/services/model.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { SemanticTokensProviderStyling, toMultilineTokens2 } from '../../../common/services/semanticTokensProviderStyling.js';
+import { getDocumentSemanticTokens, hasDocumentSemanticTokensProvider, isSemanticTokens, isSemanticTokensEdits } from '../common/getSemanticTokens.js';
+import { IFeatureDebounceInformation, ILanguageFeatureDebounceService } from '../../../common/services/languageFeatureDebounce.js';
+import { StopWatch } from '../../../../base/common/stopwatch.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { LanguageFeatureRegistry } from '../../../common/languageFeatureRegistry.js';
+import { ISemanticTokensStylingService } from '../../../common/services/semanticTokensStyling.js';
+import { registerEditorFeature } from '../../../common/editorFeatures.js';
+import { SEMANTIC_HIGHLIGHTING_SETTING_ID, isSemanticColoringEnabled } from '../common/semanticTokensConfig.js';
 
 export class DocumentSemanticTokensFeature extends Disposable {
 
diff --git a/src/vs/editor/contrib/semanticTokens/browser/viewportSemanticTokens.ts b/src/vs/editor/contrib/semanticTokens/browser/viewportSemanticTokens.ts
index 52a1f9401ac..1662f1fec59 100644
--- a/src/vs/editor/contrib/semanticTokens/browser/viewportSemanticTokens.ts
+++ b/src/vs/editor/contrib/semanticTokens/browser/viewportSemanticTokens.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancelablePromise, createCancelablePromise, RunOnceScheduler } from 'vs/base/common/async';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { Range } from 'vs/editor/common/core/range';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { ITextModel } from 'vs/editor/common/model';
-import { getDocumentRangeSemanticTokens, hasDocumentRangeSemanticTokensProvider } from 'vs/editor/contrib/semanticTokens/common/getSemanticTokens';
-import { isSemanticColoringEnabled, SEMANTIC_HIGHLIGHTING_SETTING_ID } from 'vs/editor/contrib/semanticTokens/common/semanticTokensConfig';
-import { toMultilineTokens2 } from 'vs/editor/common/services/semanticTokensProviderStyling';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IFeatureDebounceInformation, ILanguageFeatureDebounceService } from 'vs/editor/common/services/languageFeatureDebounce';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import { DocumentRangeSemanticTokensProvider } from 'vs/editor/common/languages';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { ISemanticTokensStylingService } from 'vs/editor/common/services/semanticTokensStyling';
+import { CancelablePromise, createCancelablePromise, RunOnceScheduler } from '../../../../base/common/async.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorContributionInstantiation, registerEditorContribution } from '../../../browser/editorExtensions.js';
+import { Range } from '../../../common/core/range.js';
+import { IEditorContribution } from '../../../common/editorCommon.js';
+import { ITextModel } from '../../../common/model.js';
+import { getDocumentRangeSemanticTokens, hasDocumentRangeSemanticTokensProvider } from '../common/getSemanticTokens.js';
+import { isSemanticColoringEnabled, SEMANTIC_HIGHLIGHTING_SETTING_ID } from '../common/semanticTokensConfig.js';
+import { toMultilineTokens2 } from '../../../common/services/semanticTokensProviderStyling.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IFeatureDebounceInformation, ILanguageFeatureDebounceService } from '../../../common/services/languageFeatureDebounce.js';
+import { StopWatch } from '../../../../base/common/stopwatch.js';
+import { LanguageFeatureRegistry } from '../../../common/languageFeatureRegistry.js';
+import { DocumentRangeSemanticTokensProvider } from '../../../common/languages.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { ISemanticTokensStylingService } from '../../../common/services/semanticTokensStyling.js';
 
 export class ViewportSemanticTokensContribution extends Disposable implements IEditorContribution {
 
diff --git a/src/vs/editor/contrib/semanticTokens/common/getSemanticTokens.ts b/src/vs/editor/contrib/semanticTokens/common/getSemanticTokens.ts
index 298da0ce0f6..cd7cbd3e7c1 100644
--- a/src/vs/editor/contrib/semanticTokens/common/getSemanticTokens.ts
+++ b/src/vs/editor/contrib/semanticTokens/common/getSemanticTokens.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { onUnexpectedExternalError } from 'vs/base/common/errors';
-import { URI } from 'vs/base/common/uri';
-import { ITextModel } from 'vs/editor/common/model';
-import { DocumentSemanticTokensProvider, SemanticTokens, SemanticTokensEdits, SemanticTokensLegend, DocumentRangeSemanticTokensProvider } from 'vs/editor/common/languages';
-import { IModelService } from 'vs/editor/common/services/model';
-import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
-import { assertType } from 'vs/base/common/types';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { encodeSemanticTokensDto } from 'vs/editor/common/services/semanticTokensDto';
-import { Range } from 'vs/editor/common/core/range';
-import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { onUnexpectedExternalError } from '../../../../base/common/errors.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ITextModel } from '../../../common/model.js';
+import { DocumentSemanticTokensProvider, SemanticTokens, SemanticTokensEdits, SemanticTokensLegend, DocumentRangeSemanticTokensProvider } from '../../../common/languages.js';
+import { IModelService } from '../../../common/services/model.js';
+import { CommandsRegistry, ICommandService } from '../../../../platform/commands/common/commands.js';
+import { assertType } from '../../../../base/common/types.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { encodeSemanticTokensDto } from '../../../common/services/semanticTokensDto.js';
+import { Range } from '../../../common/core/range.js';
+import { LanguageFeatureRegistry } from '../../../common/languageFeatureRegistry.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 
 export function isSemanticTokens(v: SemanticTokens | SemanticTokensEdits): v is SemanticTokens {
 	return v && !!((<SemanticTokens>v).data);
diff --git a/src/vs/editor/contrib/semanticTokens/common/semanticTokensConfig.ts b/src/vs/editor/contrib/semanticTokens/common/semanticTokensConfig.ts
index ebf4f3b2932..c7b39855911 100644
--- a/src/vs/editor/contrib/semanticTokens/common/semanticTokensConfig.ts
+++ b/src/vs/editor/contrib/semanticTokens/common/semanticTokensConfig.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ITextModel } from 'vs/editor/common/model';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { ITextModel } from '../../../common/model.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
 
 export const SEMANTIC_HIGHLIGHTING_SETTING_ID = 'editor.semanticHighlighting';
 
diff --git a/src/vs/editor/contrib/semanticTokens/test/browser/documentSemanticTokens.test.ts b/src/vs/editor/contrib/semanticTokens/test/browser/documentSemanticTokens.test.ts
index 86d3bf5d62d..ba4eb555285 100644
--- a/src/vs/editor/contrib/semanticTokens/test/browser/documentSemanticTokens.test.ts
+++ b/src/vs/editor/contrib/semanticTokens/test/browser/documentSemanticTokens.test.ts
@@ -4,36 +4,38 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Barrier, timeout } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { mock } from 'vs/base/test/common/mock';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Range } from 'vs/editor/common/core/range';
-import { DocumentSemanticTokensProvider, SemanticTokens, SemanticTokensEdits, SemanticTokensLegend } from 'vs/editor/common/languages';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ITextModel } from 'vs/editor/common/model';
-import { LanguageFeatureDebounceService } from 'vs/editor/common/services/languageFeatureDebounce';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { LanguageFeaturesService } from 'vs/editor/common/services/languageFeaturesService';
-import { LanguageService } from 'vs/editor/common/services/languageService';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ModelService } from 'vs/editor/common/services/modelService';
-import { SemanticTokensStylingService } from 'vs/editor/common/services/semanticTokensStylingService';
-import { DocumentSemanticTokensFeature } from 'vs/editor/contrib/semanticTokens/browser/documentSemanticTokens';
-import { getDocumentSemanticTokens, isSemanticTokens } from 'vs/editor/contrib/semanticTokens/common/getSemanticTokens';
-import { TestLanguageConfigurationService } from 'vs/editor/test/common/modes/testLanguageConfigurationService';
-import { TestTextResourcePropertiesService } from 'vs/editor/test/common/services/testTextResourcePropertiesService';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { TestDialogService } from 'vs/platform/dialogs/test/common/testDialogService';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
-import { ColorScheme } from 'vs/platform/theme/common/theme';
-import { TestColorTheme, TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
-import { UndoRedoService } from 'vs/platform/undoRedo/common/undoRedoService';
+import { Barrier, timeout } from '../../../../../base/common/async.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { mock } from '../../../../../base/test/common/mock.js';
+import { runWithFakedTimers } from '../../../../../base/test/common/timeTravelScheduler.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Range } from '../../../../common/core/range.js';
+import { DocumentSemanticTokensProvider, SemanticTokens, SemanticTokensEdits, SemanticTokensLegend } from '../../../../common/languages.js';
+import { ILanguageService } from '../../../../common/languages/language.js';
+import { ILanguageConfigurationService } from '../../../../common/languages/languageConfigurationRegistry.js';
+import { ITextModel } from '../../../../common/model.js';
+import { LanguageFeatureDebounceService } from '../../../../common/services/languageFeatureDebounce.js';
+import { ILanguageFeaturesService } from '../../../../common/services/languageFeatures.js';
+import { LanguageFeaturesService } from '../../../../common/services/languageFeaturesService.js';
+import { LanguageService } from '../../../../common/services/languageService.js';
+import { IModelService } from '../../../../common/services/model.js';
+import { ModelService } from '../../../../common/services/modelService.js';
+import { SemanticTokensStylingService } from '../../../../common/services/semanticTokensStylingService.js';
+import { DocumentSemanticTokensFeature } from '../../browser/documentSemanticTokens.js';
+import { getDocumentSemanticTokens, isSemanticTokens } from '../../common/getSemanticTokens.js';
+import { TestLanguageConfigurationService } from '../../../../test/common/modes/testLanguageConfigurationService.js';
+import { TestTextResourcePropertiesService } from '../../../../test/common/services/testTextResourcePropertiesService.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { TestDialogService } from '../../../../../platform/dialogs/test/common/testDialogService.js';
+import { IEnvironmentService } from '../../../../../platform/environment/common/environment.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { NullLogService } from '../../../../../platform/log/common/log.js';
+import { TestNotificationService } from '../../../../../platform/notification/test/common/testNotificationService.js';
+import { ColorScheme } from '../../../../../platform/theme/common/theme.js';
+import { TestColorTheme, TestThemeService } from '../../../../../platform/theme/test/common/testThemeService.js';
+import { UndoRedoService } from '../../../../../platform/undoRedo/common/undoRedoService.js';
 
 suite('ModelSemanticColoring', () => {
 
@@ -50,12 +52,14 @@ suite('ModelSemanticColoring', () => {
 		languageFeaturesService = new LanguageFeaturesService();
 		languageService = disposables.add(new LanguageService(false));
 		const semanticTokensStylingService = disposables.add(new SemanticTokensStylingService(themeService, logService, languageService));
+		const instantiationService = new TestInstantiationService();
+		instantiationService.set(ILanguageService, languageService);
+		instantiationService.set(ILanguageConfigurationService, new TestLanguageConfigurationService());
 		modelService = disposables.add(new ModelService(
 			configService,
 			new TestTextResourcePropertiesService(configService),
 			new UndoRedoService(new TestDialogService(), new TestNotificationService()),
-			languageService,
-			new TestLanguageConfigurationService(),
+			instantiationService
 		));
 		const envService = new class extends mock<IEnvironmentService>() {
 			override isBuilt: boolean = true;
diff --git a/src/vs/editor/contrib/semanticTokens/test/browser/getSemanticTokens.test.ts b/src/vs/editor/contrib/semanticTokens/test/browser/getSemanticTokens.test.ts
index 6ac97ecde96..467fbc77132 100644
--- a/src/vs/editor/contrib/semanticTokens/test/browser/getSemanticTokens.test.ts
+++ b/src/vs/editor/contrib/semanticTokens/test/browser/getSemanticTokens.test.ts
@@ -4,15 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { canceled } from 'vs/base/common/errors';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import { DocumentSemanticTokensProvider, ProviderResult, SemanticTokens, SemanticTokensEdits, SemanticTokensLegend } from 'vs/editor/common/languages';
-import { ITextModel } from 'vs/editor/common/model';
-import { getDocumentSemanticTokens } from 'vs/editor/contrib/semanticTokens/common/getSemanticTokens';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { canceled } from '../../../../../base/common/errors.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { LanguageFeatureRegistry } from '../../../../common/languageFeatureRegistry.js';
+import { DocumentSemanticTokensProvider, ProviderResult, SemanticTokens, SemanticTokensEdits, SemanticTokensLegend } from '../../../../common/languages.js';
+import { ITextModel } from '../../../../common/model.js';
+import { getDocumentSemanticTokens } from '../../common/getSemanticTokens.js';
+import { createTextModel } from '../../../../test/common/testTextModel.js';
 
 suite('getSemanticTokens', () => {
 
diff --git a/src/vs/editor/contrib/smartSelect/browser/bracketSelections.ts b/src/vs/editor/contrib/smartSelect/browser/bracketSelections.ts
index eda8cd7f397..a85d4e05b17 100644
--- a/src/vs/editor/contrib/smartSelect/browser/bracketSelections.ts
+++ b/src/vs/editor/contrib/smartSelect/browser/bracketSelections.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { LinkedList } from 'vs/base/common/linkedList';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { ITextModel } from 'vs/editor/common/model';
-import { SelectionRange, SelectionRangeProvider } from 'vs/editor/common/languages';
+import { LinkedList } from '../../../../base/common/linkedList.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { ITextModel } from '../../../common/model.js';
+import { SelectionRange, SelectionRangeProvider } from '../../../common/languages.js';
 
 export class BracketSelectionRangeProvider implements SelectionRangeProvider {
 
diff --git a/src/vs/editor/contrib/smartSelect/browser/smartSelect.ts b/src/vs/editor/contrib/smartSelect/browser/smartSelect.ts
index 99572b42cb7..650f6c9111d 100644
--- a/src/vs/editor/contrib/smartSelect/browser/smartSelect.ts
+++ b/src/vs/editor/contrib/smartSelect/browser/smartSelect.ts
@@ -3,32 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as arrays from 'vs/base/common/arrays';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { onUnexpectedExternalError } from 'vs/base/common/errors';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, EditorContributionInstantiation, IActionOptions, registerEditorAction, registerEditorContribution, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { ITextModel } from 'vs/editor/common/model';
-import * as languages from 'vs/editor/common/languages';
-import { BracketSelectionRangeProvider } from 'vs/editor/contrib/smartSelect/browser/bracketSelections';
-import { WordSelectionRangeProvider } from 'vs/editor/contrib/smartSelect/browser/wordSelections';
-import * as nls from 'vs/nls';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { assertType } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
+import * as arrays from '../../../../base/common/arrays.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { onUnexpectedExternalError } from '../../../../base/common/errors.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorAction, EditorContributionInstantiation, IActionOptions, registerEditorAction, registerEditorContribution, ServicesAccessor } from '../../../browser/editorExtensions.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { Selection } from '../../../common/core/selection.js';
+import { IEditorContribution } from '../../../common/editorCommon.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { ITextModel } from '../../../common/model.js';
+import * as languages from '../../../common/languages.js';
+import { BracketSelectionRangeProvider } from './bracketSelections.js';
+import { WordSelectionRangeProvider } from './wordSelections.js';
+import * as nls from '../../../../nls.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { LanguageFeatureRegistry } from '../../../common/languageFeatureRegistry.js';
+import { ITextModelService } from '../../../common/services/resolverService.js';
+import { assertType } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
 
 class SelectionRanges {
 
diff --git a/src/vs/editor/contrib/smartSelect/browser/wordSelections.ts b/src/vs/editor/contrib/smartSelect/browser/wordSelections.ts
index d42513998a4..213cc2f5bbd 100644
--- a/src/vs/editor/contrib/smartSelect/browser/wordSelections.ts
+++ b/src/vs/editor/contrib/smartSelect/browser/wordSelections.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
-import { isLowerAsciiLetter, isUpperAsciiLetter } from 'vs/base/common/strings';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { ITextModel } from 'vs/editor/common/model';
-import { SelectionRange, SelectionRangeProvider } from 'vs/editor/common/languages';
+import { CharCode } from '../../../../base/common/charCode.js';
+import { isLowerAsciiLetter, isUpperAsciiLetter } from '../../../../base/common/strings.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { ITextModel } from '../../../common/model.js';
+import { SelectionRange, SelectionRangeProvider } from '../../../common/languages.js';
 
 export class WordSelectionRangeProvider implements SelectionRangeProvider {
 
diff --git a/src/vs/editor/contrib/smartSelect/test/browser/smartSelect.test.ts b/src/vs/editor/contrib/smartSelect/test/browser/smartSelect.test.ts
index 1de9179cc28..3e774fc932f 100644
--- a/src/vs/editor/contrib/smartSelect/test/browser/smartSelect.test.ts
+++ b/src/vs/editor/contrib/smartSelect/test/browser/smartSelect.test.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Event } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { Position } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { SelectionRangeProvider } from 'vs/editor/common/languages';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { IModelService } from 'vs/editor/common/services/model';
-import { BracketSelectionRangeProvider } from 'vs/editor/contrib/smartSelect/browser/bracketSelections';
-import { provideSelectionRanges } from 'vs/editor/contrib/smartSelect/browser/smartSelect';
-import { WordSelectionRangeProvider } from 'vs/editor/contrib/smartSelect/browser/wordSelections';
-import { createModelServices } from 'vs/editor/test/common/testTextModel';
-import { javascriptOnEnterRules } from 'vs/editor/test/common/modes/supports/onEnterRules';
-import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import { ILanguageSelection, ILanguageService } from 'vs/editor/common/languages/language';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { Event } from '../../../../../base/common/event.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { Position } from '../../../../common/core/position.js';
+import { IRange, Range } from '../../../../common/core/range.js';
+import { SelectionRangeProvider } from '../../../../common/languages.js';
+import { ILanguageConfigurationService } from '../../../../common/languages/languageConfigurationRegistry.js';
+import { IModelService } from '../../../../common/services/model.js';
+import { BracketSelectionRangeProvider } from '../../browser/bracketSelections.js';
+import { provideSelectionRanges } from '../../browser/smartSelect.js';
+import { WordSelectionRangeProvider } from '../../browser/wordSelections.js';
+import { createModelServices } from '../../../../test/common/testTextModel.js';
+import { javascriptOnEnterRules } from '../../../../test/common/modes/supports/onEnterRules.js';
+import { LanguageFeatureRegistry } from '../../../../common/languageFeatureRegistry.js';
+import { ILanguageSelection, ILanguageService } from '../../../../common/languages/language.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 class StaticLanguageSelector implements ILanguageSelection {
 	readonly onDidChange: Event<string> = Event.None;
diff --git a/src/vs/editor/contrib/snippet/browser/snippetController2.ts b/src/vs/editor/contrib/snippet/browser/snippetController2.ts
index e066ef8ee56..a201d83b80e 100644
--- a/src/vs/editor/contrib/snippet/browser/snippetController2.ts
+++ b/src/vs/editor/contrib/snippet/browser/snippetController2.ts
@@ -3,27 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { assertType } from 'vs/base/common/types';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorCommand, EditorContributionInstantiation, registerEditorCommand, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { CompletionItem, CompletionItemKind, CompletionItemProvider } from 'vs/editor/common/languages';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { ITextModel } from 'vs/editor/common/model';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { Choice } from 'vs/editor/contrib/snippet/browser/snippetParser';
-import { showSimpleSuggestions } from 'vs/editor/contrib/suggest/browser/suggest';
-import { OvertypingCapturer } from 'vs/editor/contrib/suggest/browser/suggestOvertypingCapturer';
-import { localize } from 'vs/nls';
-import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ISnippetEdit, SnippetSession } from './snippetSession';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import { assertType } from '../../../../base/common/types.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorCommand, EditorContributionInstantiation, registerEditorCommand, registerEditorContribution } from '../../../browser/editorExtensions.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { IEditorContribution } from '../../../common/editorCommon.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { CompletionItem, CompletionItemKind, CompletionItemProvider } from '../../../common/languages.js';
+import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import { ITextModel } from '../../../common/model.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { Choice } from './snippetParser.js';
+import { showSimpleSuggestions } from '../../suggest/browser/suggest.js';
+import { OvertypingCapturer } from '../../suggest/browser/suggestOvertypingCapturer.js';
+import { localize } from '../../../../nls.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { ISnippetEdit, SnippetSession } from './snippetSession.js';
 
 export interface ISnippetInsertOptions {
 	overwriteBefore: number;
diff --git a/src/vs/editor/contrib/snippet/browser/snippetParser.ts b/src/vs/editor/contrib/snippet/browser/snippetParser.ts
index 7e7b42a7be9..a5f1c16c285 100644
--- a/src/vs/editor/contrib/snippet/browser/snippetParser.ts
+++ b/src/vs/editor/contrib/snippet/browser/snippetParser.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
+import { CharCode } from '../../../../base/common/charCode.js';
 
 export const enum TokenType {
 	Dollar,
diff --git a/src/vs/editor/contrib/snippet/browser/snippetSession.ts b/src/vs/editor/contrib/snippet/browser/snippetSession.ts
index 80a9959f475..34bf99e7d4a 100644
--- a/src/vs/editor/contrib/snippet/browser/snippetSession.ts
+++ b/src/vs/editor/contrib/snippet/browser/snippetSession.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { groupBy } from 'vs/base/common/arrays';
-import { CharCode } from 'vs/base/common/charCode';
-import { dispose } from 'vs/base/common/lifecycle';
-import { getLeadingWhitespace } from 'vs/base/common/strings';
-import 'vs/css!./snippetSession';
-import { IActiveCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { EditOperation, ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { IPosition } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { TextChange } from 'vs/editor/common/core/textChange';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { IIdentifiedSingleEditOperation, ITextModel, TrackedRangeStickiness } from 'vs/editor/common/model';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { OvertypingCapturer } from 'vs/editor/contrib/suggest/browser/suggestOvertypingCapturer';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { Choice, Marker, Placeholder, SnippetParser, Text, TextmateSnippet } from './snippetParser';
-import { ClipboardBasedVariableResolver, CommentBasedVariableResolver, CompositeSnippetVariableResolver, ModelBasedVariableResolver, RandomBasedVariableResolver, SelectionBasedVariableResolver, TimeBasedVariableResolver, WorkspaceBasedVariableResolver } from './snippetVariables';
+import { groupBy } from '../../../../base/common/arrays.js';
+import { CharCode } from '../../../../base/common/charCode.js';
+import { dispose } from '../../../../base/common/lifecycle.js';
+import { getLeadingWhitespace } from '../../../../base/common/strings.js';
+import './snippetSession.css';
+import { IActiveCodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { EditOperation, ISingleEditOperation } from '../../../common/core/editOperation.js';
+import { IPosition } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { Selection } from '../../../common/core/selection.js';
+import { TextChange } from '../../../common/core/textChange.js';
+import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import { IIdentifiedSingleEditOperation, ITextModel, TrackedRangeStickiness } from '../../../common/model.js';
+import { ModelDecorationOptions } from '../../../common/model/textModel.js';
+import { OvertypingCapturer } from '../../suggest/browser/suggestOvertypingCapturer.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { Choice, Marker, Placeholder, SnippetParser, Text, TextmateSnippet } from './snippetParser.js';
+import { ClipboardBasedVariableResolver, CommentBasedVariableResolver, CompositeSnippetVariableResolver, ModelBasedVariableResolver, RandomBasedVariableResolver, SelectionBasedVariableResolver, TimeBasedVariableResolver, WorkspaceBasedVariableResolver } from './snippetVariables.js';
 
 export class OneSnippet {
 
diff --git a/src/vs/editor/contrib/snippet/browser/snippetVariables.ts b/src/vs/editor/contrib/snippet/browser/snippetVariables.ts
index 2b82fb2d417..615e1174fca 100644
--- a/src/vs/editor/contrib/snippet/browser/snippetVariables.ts
+++ b/src/vs/editor/contrib/snippet/browser/snippetVariables.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { normalizeDriveLetter } from 'vs/base/common/labels';
-import * as path from 'vs/base/common/path';
-import { dirname } from 'vs/base/common/resources';
-import { commonPrefixLength, getLeadingWhitespace, isFalsyOrWhitespace, splitLines } from 'vs/base/common/strings';
-import { generateUuid } from 'vs/base/common/uuid';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ITextModel } from 'vs/editor/common/model';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { Text, Variable, VariableResolver } from 'vs/editor/contrib/snippet/browser/snippetParser';
-import { OvertypingCapturer } from 'vs/editor/contrib/suggest/browser/suggestOvertypingCapturer';
-import * as nls from 'vs/nls';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { WORKSPACE_EXTENSION, isSingleFolderWorkspaceIdentifier, toWorkspaceIdentifier, IWorkspaceContextService, ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier, isEmptyWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
+import { normalizeDriveLetter } from '../../../../base/common/labels.js';
+import * as path from '../../../../base/common/path.js';
+import { dirname } from '../../../../base/common/resources.js';
+import { commonPrefixLength, getLeadingWhitespace, isFalsyOrWhitespace, splitLines } from '../../../../base/common/strings.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { Selection } from '../../../common/core/selection.js';
+import { ITextModel } from '../../../common/model.js';
+import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import { Text, Variable, VariableResolver } from './snippetParser.js';
+import { OvertypingCapturer } from '../../suggest/browser/suggestOvertypingCapturer.js';
+import * as nls from '../../../../nls.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { WORKSPACE_EXTENSION, isSingleFolderWorkspaceIdentifier, toWorkspaceIdentifier, IWorkspaceContextService, ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier, isEmptyWorkspaceIdentifier } from '../../../../platform/workspace/common/workspace.js';
 
 export const KnownSnippetVariableNames = Object.freeze<{ [key: string]: true }>({
 	'CURRENT_YEAR': true,
diff --git a/src/vs/editor/contrib/snippet/test/browser/snippetController2.old.test.ts b/src/vs/editor/contrib/snippet/test/browser/snippetController2.old.test.ts
index 236ad70f27d..22fed982098 100644
--- a/src/vs/editor/contrib/snippet/test/browser/snippetController2.old.test.ts
+++ b/src/vs/editor/contrib/snippet/test/browser/snippetController2.old.test.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { mock } from 'vs/base/test/common/mock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { Position } from 'vs/editor/common/core/position';
-import { Selection } from 'vs/editor/common/core/selection';
-import { LanguageFeaturesService } from 'vs/editor/common/services/languageFeaturesService';
-import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2';
-import { ITestCodeEditor, withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
-import { TestLanguageConfigurationService } from 'vs/editor/test/common/modes/testLanguageConfigurationService';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { mock } from '../../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { ICodeEditor } from '../../../../browser/editorBrowser.js';
+import { Position } from '../../../../common/core/position.js';
+import { Selection } from '../../../../common/core/selection.js';
+import { LanguageFeaturesService } from '../../../../common/services/languageFeaturesService.js';
+import { SnippetController2 } from '../../browser/snippetController2.js';
+import { ITestCodeEditor, withTestCodeEditor } from '../../../../test/browser/testCodeEditor.js';
+import { TestLanguageConfigurationService } from '../../../../test/common/modes/testLanguageConfigurationService.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
+import { ILabelService } from '../../../../../platform/label/common/label.js';
+import { NullLogService } from '../../../../../platform/log/common/log.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
 
 class TestSnippetController extends SnippetController2 {
 
diff --git a/src/vs/editor/contrib/snippet/test/browser/snippetController2.test.ts b/src/vs/editor/contrib/snippet/test/browser/snippetController2.test.ts
index 5b9a5e434f8..a5a1addf0b0 100644
--- a/src/vs/editor/contrib/snippet/test/browser/snippetController2.test.ts
+++ b/src/vs/editor/contrib/snippet/test/browser/snippetController2.test.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { mock } from 'vs/base/test/common/mock';
-import { CoreEditingCommands } from 'vs/editor/browser/coreCommands';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { Selection } from 'vs/editor/common/core/selection';
-import { Range } from 'vs/editor/common/core/range';
-import { Handler } from 'vs/editor/common/editorCommon';
-import { TextModel } from 'vs/editor/common/model/textModel';
-import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2';
-import { createTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { ILogService, NullLogService } from 'vs/platform/log/common/log';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { EndOfLineSequence } from 'vs/editor/common/model';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { mock } from '../../../../../base/test/common/mock.js';
+import { CoreEditingCommands } from '../../../../browser/coreCommands.js';
+import { ICodeEditor } from '../../../../browser/editorBrowser.js';
+import { Selection } from '../../../../common/core/selection.js';
+import { Range } from '../../../../common/core/range.js';
+import { Handler } from '../../../../common/editorCommon.js';
+import { TextModel } from '../../../../common/model/textModel.js';
+import { SnippetController2 } from '../../browser/snippetController2.js';
+import { createTestCodeEditor } from '../../../../test/browser/testCodeEditor.js';
+import { createTextModel } from '../../../../test/common/testTextModel.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { InstantiationService } from '../../../../../platform/instantiation/common/instantiationService.js';
+import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
+import { MockContextKeyService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { ILabelService } from '../../../../../platform/label/common/label.js';
+import { ILogService, NullLogService } from '../../../../../platform/log/common/log.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { EndOfLineSequence } from '../../../../common/model.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('SnippetController2', function () {
 
diff --git a/src/vs/editor/contrib/snippet/test/browser/snippetParser.test.ts b/src/vs/editor/contrib/snippet/test/browser/snippetParser.test.ts
index bbf24168409..31fda916089 100644
--- a/src/vs/editor/contrib/snippet/test/browser/snippetParser.test.ts
+++ b/src/vs/editor/contrib/snippet/test/browser/snippetParser.test.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Choice, FormatString, Marker, Placeholder, Scanner, SnippetParser, Text, TextmateSnippet, TokenType, Transform, Variable } from 'vs/editor/contrib/snippet/browser/snippetParser';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Choice, FormatString, Marker, Placeholder, Scanner, SnippetParser, Text, TextmateSnippet, TokenType, Transform, Variable } from '../../browser/snippetParser.js';
 
 suite('SnippetParser', () => {
 
diff --git a/src/vs/editor/contrib/snippet/test/browser/snippetSession.test.ts b/src/vs/editor/contrib/snippet/test/browser/snippetSession.test.ts
index 0a9a3c76462..89914234286 100644
--- a/src/vs/editor/contrib/snippet/test/browser/snippetSession.test.ts
+++ b/src/vs/editor/contrib/snippet/test/browser/snippetSession.test.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { mock } from 'vs/base/test/common/mock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IActiveCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { TextModel } from 'vs/editor/common/model/textModel';
-import { SnippetParser } from 'vs/editor/contrib/snippet/browser/snippetParser';
-import { SnippetSession } from 'vs/editor/contrib/snippet/browser/snippetSession';
-import { createTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
-import { TestLanguageConfigurationService } from 'vs/editor/test/common/modes/testLanguageConfigurationService';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { mock } from '../../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IActiveCodeEditor } from '../../../../browser/editorBrowser.js';
+import { IPosition, Position } from '../../../../common/core/position.js';
+import { Range } from '../../../../common/core/range.js';
+import { Selection } from '../../../../common/core/selection.js';
+import { ILanguageConfigurationService } from '../../../../common/languages/languageConfigurationRegistry.js';
+import { TextModel } from '../../../../common/model/textModel.js';
+import { SnippetParser } from '../../browser/snippetParser.js';
+import { SnippetSession } from '../../browser/snippetSession.js';
+import { createTestCodeEditor } from '../../../../test/browser/testCodeEditor.js';
+import { TestLanguageConfigurationService } from '../../../../test/common/modes/testLanguageConfigurationService.js';
+import { createTextModel } from '../../../../test/common/testTextModel.js';
+import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
+import { ILabelService } from '../../../../../platform/label/common/label.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
 
 suite('SnippetSession', function () {
 
diff --git a/src/vs/editor/contrib/snippet/test/browser/snippetVariables.test.ts b/src/vs/editor/contrib/snippet/test/browser/snippetVariables.test.ts
index b8ea4e52342..276ed3376f6 100644
--- a/src/vs/editor/contrib/snippet/test/browser/snippetVariables.test.ts
+++ b/src/vs/editor/contrib/snippet/test/browser/snippetVariables.test.ts
@@ -4,22 +4,22 @@
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
 import * as sinon from 'sinon';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { sep } from 'vs/base/common/path';
-import { isWindows } from 'vs/base/common/platform';
-import { extUriBiasedIgnorePathCase } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { mock } from 'vs/base/test/common/mock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Selection } from 'vs/editor/common/core/selection';
-import { TextModel } from 'vs/editor/common/model/textModel';
-import { SnippetParser, Variable, VariableResolver } from 'vs/editor/contrib/snippet/browser/snippetParser';
-import { ClipboardBasedVariableResolver, CompositeSnippetVariableResolver, ModelBasedVariableResolver, SelectionBasedVariableResolver, TimeBasedVariableResolver, WorkspaceBasedVariableResolver } from 'vs/editor/contrib/snippet/browser/snippetVariables';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { IWorkspace, IWorkspaceContextService, toWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { Workspace } from 'vs/platform/workspace/test/common/testWorkspace';
-import { toWorkspaceFolders } from 'vs/platform/workspaces/common/workspaces';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { sep } from '../../../../../base/common/path.js';
+import { isWindows } from '../../../../../base/common/platform.js';
+import { extUriBiasedIgnorePathCase } from '../../../../../base/common/resources.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { mock } from '../../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Selection } from '../../../../common/core/selection.js';
+import { TextModel } from '../../../../common/model/textModel.js';
+import { SnippetParser, Variable, VariableResolver } from '../../browser/snippetParser.js';
+import { ClipboardBasedVariableResolver, CompositeSnippetVariableResolver, ModelBasedVariableResolver, SelectionBasedVariableResolver, TimeBasedVariableResolver, WorkspaceBasedVariableResolver } from '../../browser/snippetVariables.js';
+import { createTextModel } from '../../../../test/common/testTextModel.js';
+import { ILabelService } from '../../../../../platform/label/common/label.js';
+import { IWorkspace, IWorkspaceContextService, toWorkspaceFolder } from '../../../../../platform/workspace/common/workspace.js';
+import { Workspace } from '../../../../../platform/workspace/test/common/testWorkspace.js';
+import { toWorkspaceFolders } from '../../../../../platform/workspaces/common/workspaces.js';
 
 suite('Snippet Variables Resolver', function () {
 
diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScroll.css b/src/vs/editor/contrib/stickyScroll/browser/stickyScroll.css
index 3bc52c6c915..276082256f6 100644
--- a/src/vs/editor/contrib/stickyScroll/browser/stickyScroll.css
+++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScroll.css
@@ -61,7 +61,7 @@
 
 .monaco-editor .sticky-widget {
 	width: 100%;
-	box-shadow: var(--vscode-editorStickyScroll-shadow) 0 3px 2px -2px;
+	box-shadow: var(--vscode-editorStickyScroll-shadow) 0 4px 2px -2px;
 	z-index: 4;
 	background-color: var(--vscode-editorStickyScroll-background);
 	right: initial !important;
diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollActions.ts b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollActions.ts
index bbeb000ad8c..5065cd8667f 100644
--- a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollActions.ts
+++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollActions.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { EditorAction2, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { localize, localize2 } from 'vs/nls';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { Action2, MenuId } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { StickyScrollController } from 'vs/editor/contrib/stickyScroll/browser/stickyScrollController';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { EditorAction2, ServicesAccessor } from '../../../browser/editorExtensions.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { Action2, MenuId } from '../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { StickyScrollController } from './stickyScrollController.js';
 
 export class ToggleStickyScroll extends Action2 {
 
diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollContribution.ts b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollContribution.ts
index e242c05227e..2758663f1f0 100644
--- a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollContribution.ts
+++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollContribution.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { ToggleStickyScroll, FocusStickyScroll, SelectEditor, SelectPreviousStickyScrollLine, SelectNextStickyScrollLine, GoToStickyScrollLine } from 'vs/editor/contrib/stickyScroll/browser/stickyScrollActions';
-import { StickyScrollController } from 'vs/editor/contrib/stickyScroll/browser/stickyScrollController';
-import { registerAction2 } from 'vs/platform/actions/common/actions';
+import { EditorContributionInstantiation, registerEditorContribution } from '../../../browser/editorExtensions.js';
+import { ToggleStickyScroll, FocusStickyScroll, SelectEditor, SelectPreviousStickyScrollLine, SelectNextStickyScrollLine, GoToStickyScrollLine } from './stickyScrollActions.js';
+import { StickyScrollController } from './stickyScrollController.js';
+import { registerAction2 } from '../../../../platform/actions/common/actions.js';
 
 registerEditorContribution(StickyScrollController.ID, StickyScrollController, EditorContributionInstantiation.AfterFirstRender);
 registerAction2(ToggleStickyScroll);
diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts
index 22b8c67a294..86d6b902b82 100644
--- a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts
+++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts
@@ -3,32 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { IActiveCodeEditor, ICodeEditor, MouseTargetType } from 'vs/editor/browser/editorBrowser';
-import { IEditorContribution, ScrollType } from 'vs/editor/common/editorCommon';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { EditorOption, RenderLineNumbersType, ConfigurationChangedEvent } from 'vs/editor/common/config/editorOptions';
-import { StickyScrollWidget, StickyScrollWidgetState } from './stickyScrollWidget';
-import { IStickyLineCandidateProvider, StickyLineCandidateProvider } from './stickyScrollProvider';
-import { IModelTokensChangedEvent } from 'vs/editor/common/textModelEvents';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { ClickLinkGesture, ClickLinkMouseEvent } from 'vs/editor/contrib/gotoSymbol/browser/link/clickLinkGesture';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { getDefinitionsAtPosition } from 'vs/editor/contrib/gotoSymbol/browser/goToSymbol';
-import { goToDefinitionWithLocation } from 'vs/editor/contrib/inlayHints/browser/inlayHintsLocations';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { ILanguageFeatureDebounceService } from 'vs/editor/common/services/languageFeatureDebounce';
-import * as dom from 'vs/base/browser/dom';
-import { StickyRange } from 'vs/editor/contrib/stickyScroll/browser/stickyScrollElement';
-import { IMouseEvent, StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { FoldingController } from 'vs/editor/contrib/folding/browser/folding';
-import { FoldingModel, toggleCollapseState } from 'vs/editor/contrib/folding/browser/foldingModel';
+import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { IActiveCodeEditor, ICodeEditor, MouseTargetType } from '../../../browser/editorBrowser.js';
+import { IEditorContribution, ScrollType } from '../../../common/editorCommon.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { EditorOption, RenderLineNumbersType, ConfigurationChangedEvent } from '../../../common/config/editorOptions.js';
+import { StickyScrollWidget, StickyScrollWidgetState } from './stickyScrollWidget.js';
+import { IStickyLineCandidateProvider, StickyLineCandidateProvider } from './stickyScrollProvider.js';
+import { IModelTokensChangedEvent } from '../../../common/textModelEvents.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { ClickLinkGesture, ClickLinkMouseEvent } from '../../gotoSymbol/browser/link/clickLinkGesture.js';
+import { IRange, Range } from '../../../common/core/range.js';
+import { getDefinitionsAtPosition } from '../../gotoSymbol/browser/goToSymbol.js';
+import { goToDefinitionWithLocation } from '../../inlayHints/browser/inlayHintsLocations.js';
+import { IPosition, Position } from '../../../common/core/position.js';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import { ILanguageFeatureDebounceService } from '../../../common/services/languageFeatureDebounce.js';
+import * as dom from '../../../../base/browser/dom.js';
+import { StickyRange } from './stickyScrollElement.js';
+import { IMouseEvent, StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
+import { FoldingController } from '../../folding/browser/folding.js';
+import { FoldingModel, toggleCollapseState } from '../../folding/browser/foldingModel.js';
 
 export interface IStickyScrollController {
 	get stickyScrollCandidateProvider(): IStickyLineCandidateProvider;
@@ -324,7 +324,7 @@ export class StickyScrollController extends Disposable implements IEditorContrib
 
 			let currentHTMLChild: HTMLElement;
 
-			getDefinitionsAtPosition(this._languageFeaturesService.definitionProvider, this._editor.getModel(), new Position(range.startLineNumber, range.startColumn + 1), cancellationToken.token).then((candidateDefinitions => {
+			getDefinitionsAtPosition(this._languageFeaturesService.definitionProvider, this._editor.getModel(), new Position(range.startLineNumber, range.startColumn + 1), false, cancellationToken.token).then((candidateDefinitions => {
 				if (cancellationToken.token.isCancellationRequested) {
 					return;
 				}
@@ -572,7 +572,9 @@ export class StickyScrollController extends Disposable implements IEditorContrib
 					if (topOfElementAtDepth > topOfEndLine && topOfElementAtDepth <= bottomOfEndLine) {
 						startLineNumbers.push(start);
 						endLineNumbers.push(end + 1);
-						lastLineRelativePosition = bottomOfEndLine - bottomOfElementAtDepth;
+						if (topOfElementAtDepth > bottomOfEndLine - lineHeight) {
+							lastLineRelativePosition = bottomOfEndLine - bottomOfElementAtDepth;
+						}
 						break;
 					}
 					else if (bottomOfElementAtDepth > bottomOfBeginningLine && bottomOfElementAtDepth <= bottomOfEndLine) {
diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollElement.ts b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollElement.ts
index 1bbf4f5e5bf..151ee916491 100644
--- a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollElement.ts
+++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollElement.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
+import { URI } from '../../../../base/common/uri.js';
 
 export class StickyRange {
 	constructor(
diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollModelProvider.ts b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollModelProvider.ts
index 22cfdb013a7..b313d5490df 100644
--- a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollModelProvider.ts
+++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollModelProvider.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { IActiveCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { OutlineElement, OutlineGroup, OutlineModel } from 'vs/editor/contrib/documentSymbols/browser/outlineModel';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { CancelablePromise, createCancelablePromise, Delayer } from 'vs/base/common/async';
-import { FoldingController, RangesLimitReporter } from 'vs/editor/contrib/folding/browser/folding';
-import { SyntaxRangeProvider } from 'vs/editor/contrib/folding/browser/syntaxRangeProvider';
-import { IndentRangeProvider } from 'vs/editor/contrib/folding/browser/indentRangeProvider';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { FoldingRegions } from 'vs/editor/contrib/folding/browser/foldingRanges';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { StickyElement, StickyModel, StickyRange } from 'vs/editor/contrib/stickyScroll/browser/stickyScrollElement';
-import { Iterable } from 'vs/base/common/iterator';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
+import { Disposable, DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import { IActiveCodeEditor } from '../../../browser/editorBrowser.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { OutlineElement, OutlineGroup, OutlineModel } from '../../documentSymbols/browser/outlineModel.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { CancelablePromise, createCancelablePromise, Delayer } from '../../../../base/common/async.js';
+import { FoldingController, RangesLimitReporter } from '../../folding/browser/folding.js';
+import { SyntaxRangeProvider } from '../../folding/browser/syntaxRangeProvider.js';
+import { IndentRangeProvider } from '../../folding/browser/indentRangeProvider.js';
+import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import { FoldingRegions } from '../../folding/browser/foldingRanges.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { StickyElement, StickyModel, StickyRange } from './stickyScrollElement.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 
 enum ModelProvider {
 	OUTLINE_MODEL = 'outlineModel',
diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollProvider.ts b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollProvider.ts
index 705ef76489e..77cd911f9f4 100644
--- a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollProvider.ts
+++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollProvider.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { CancellationToken, CancellationTokenSource, } from 'vs/base/common/cancellation';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { Range } from 'vs/editor/common/core/range';
-import { binarySearch } from 'vs/base/common/arrays';
-import { Event, Emitter } from 'vs/base/common/event';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { StickyModelProvider, IStickyModelProvider } from 'vs/editor/contrib/stickyScroll/browser/stickyScrollModelProvider';
-import { StickyElement, StickyModel, StickyRange } from 'vs/editor/contrib/stickyScroll/browser/stickyScrollElement';
+import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { CancellationToken, CancellationTokenSource, } from '../../../../base/common/cancellation.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { Range } from '../../../common/core/range.js';
+import { binarySearch } from '../../../../base/common/arrays.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import { StickyModelProvider, IStickyModelProvider } from './stickyScrollModelProvider.js';
+import { StickyElement, StickyModel, StickyRange } from './stickyScrollElement.js';
 
 export class StickyLineCandidate {
 	constructor(
diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts
index 27d3d8e1a58..8dff7940199 100644
--- a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts
+++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { createTrustedTypesPolicy } from 'vs/base/browser/trustedTypes';
-import { equals } from 'vs/base/common/arrays';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { ThemeIcon } from 'vs/base/common/themables';
-import 'vs/css!./stickyScroll';
-import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, OverlayWidgetPositionPreference } from 'vs/editor/browser/editorBrowser';
-import { getColumnOfNodeOffset } from 'vs/editor/browser/viewParts/lines/viewLine';
-import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget';
-import { EditorLayoutInfo, EditorOption, RenderLineNumbersType } from 'vs/editor/common/config/editorOptions';
-import { Position } from 'vs/editor/common/core/position';
-import { StringBuilder } from 'vs/editor/common/core/stringBuilder';
-import { LineDecoration } from 'vs/editor/common/viewLayout/lineDecorations';
-import { CharacterMapping, RenderLineInput, renderViewLine } from 'vs/editor/common/viewLayout/viewLineRenderer';
-import { foldingCollapsedIcon, foldingExpandedIcon } from 'vs/editor/contrib/folding/browser/foldingDecorations';
-import { FoldingModel } from 'vs/editor/contrib/folding/browser/foldingModel';
+import * as dom from '../../../../base/browser/dom.js';
+import { createTrustedTypesPolicy } from '../../../../base/browser/trustedTypes.js';
+import { equals } from '../../../../base/common/arrays.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import './stickyScroll.css';
+import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, OverlayWidgetPositionPreference } from '../../../browser/editorBrowser.js';
+import { getColumnOfNodeOffset } from '../../../browser/viewParts/viewLines/viewLine.js';
+import { EmbeddedCodeEditorWidget } from '../../../browser/widget/codeEditor/embeddedCodeEditorWidget.js';
+import { EditorLayoutInfo, EditorOption, RenderLineNumbersType } from '../../../common/config/editorOptions.js';
+import { Position } from '../../../common/core/position.js';
+import { StringBuilder } from '../../../common/core/stringBuilder.js';
+import { LineDecoration } from '../../../common/viewLayout/lineDecorations.js';
+import { CharacterMapping, RenderLineInput, renderViewLine } from '../../../common/viewLayout/viewLineRenderer.js';
+import { foldingCollapsedIcon, foldingExpandedIcon } from '../../folding/browser/foldingDecorations.js';
+import { FoldingModel } from '../../folding/browser/foldingModel.js';
 
 export class StickyScrollWidgetState {
 	constructor(
@@ -139,6 +139,7 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 		const isWidgetHeightZero = this._isWidgetHeightZero(_state);
 		const state = isWidgetHeightZero ? undefined : _state;
 		const rebuildFromLine = isWidgetHeightZero ? 0 : this._findLineToRebuildWidgetFrom(_state, _rebuildFromLine);
+
 		this._renderRootNode(state, foldingModel, rebuildFromLine);
 		this._previousState = _state;
 	}
diff --git a/src/vs/editor/contrib/stickyScroll/test/browser/stickyScroll.test.ts b/src/vs/editor/contrib/stickyScroll/test/browser/stickyScroll.test.ts
index aaefcb65f3d..7ac05581732 100644
--- a/src/vs/editor/contrib/stickyScroll/test/browser/stickyScroll.test.ts
+++ b/src/vs/editor/contrib/stickyScroll/test/browser/stickyScroll.test.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { withAsyncTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
-import { StickyScrollController } from 'vs/editor/contrib/stickyScroll/browser/stickyScrollController';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
-import { LanguageFeaturesService } from 'vs/editor/common/services/languageFeaturesService';
-import { DocumentSymbol, SymbolKind } from 'vs/editor/common/languages';
-import { StickyLineCandidate, StickyLineCandidateProvider } from 'vs/editor/contrib/stickyScroll/browser/stickyScrollProvider';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { ILogService, NullLogService } from 'vs/platform/log/common/log';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { mock } from 'vs/base/test/common/mock';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { ILanguageFeatureDebounceService, LanguageFeatureDebounceService } from 'vs/editor/common/services/languageFeatureDebounce';
-import { TestLanguageConfigurationService } from 'vs/editor/test/common/modes/testLanguageConfigurationService';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import { withAsyncTestCodeEditor } from '../../../../test/browser/testCodeEditor.js';
+import { StickyScrollController } from '../../browser/stickyScrollController.js';
+import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
+import { ILanguageFeaturesService } from '../../../../common/services/languageFeatures.js';
+import { createTextModel } from '../../../../test/common/testTextModel.js';
+import { LanguageFeaturesService } from '../../../../common/services/languageFeaturesService.js';
+import { DocumentSymbol, SymbolKind } from '../../../../common/languages.js';
+import { StickyLineCandidate, StickyLineCandidateProvider } from '../../browser/stickyScrollProvider.js';
+import { EditorOption } from '../../../../common/config/editorOptions.js';
+import { ILogService, NullLogService } from '../../../../../platform/log/common/log.js';
+import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
+import { mock } from '../../../../../base/test/common/mock.js';
+import { ILanguageConfigurationService } from '../../../../common/languages/languageConfigurationRegistry.js';
+import { ILanguageFeatureDebounceService, LanguageFeatureDebounceService } from '../../../../common/services/languageFeatureDebounce.js';
+import { TestLanguageConfigurationService } from '../../../../test/common/modes/testLanguageConfigurationService.js';
+import { SyncDescriptor } from '../../../../../platform/instantiation/common/descriptors.js';
+import { runWithFakedTimers } from '../../../../../base/test/common/timeTravelScheduler.js';
+import { IEnvironmentService } from '../../../../../platform/environment/common/environment.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
 
 suite('Sticky Scroll Tests', () => {
 
diff --git a/src/vs/editor/contrib/suggest/browser/completionModel.ts b/src/vs/editor/contrib/suggest/browser/completionModel.ts
index de860b992e2..ecf72cef8ed 100644
--- a/src/vs/editor/contrib/suggest/browser/completionModel.ts
+++ b/src/vs/editor/contrib/suggest/browser/completionModel.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { quickSelect } from 'vs/base/common/arrays';
-import { CharCode } from 'vs/base/common/charCode';
-import { anyScore, fuzzyScore, FuzzyScore, fuzzyScoreGracefulAggressive, FuzzyScoreOptions, FuzzyScorer } from 'vs/base/common/filters';
-import { compareIgnoreCase } from 'vs/base/common/strings';
-import { InternalSuggestOptions } from 'vs/editor/common/config/editorOptions';
-import { CompletionItemKind, CompletionItemProvider } from 'vs/editor/common/languages';
-import { WordDistance } from 'vs/editor/contrib/suggest/browser/wordDistance';
-import { CompletionItem } from './suggest';
+import { quickSelect } from '../../../../base/common/arrays.js';
+import { CharCode } from '../../../../base/common/charCode.js';
+import { anyScore, fuzzyScore, FuzzyScore, fuzzyScoreGracefulAggressive, FuzzyScoreOptions, FuzzyScorer } from '../../../../base/common/filters.js';
+import { compareIgnoreCase } from '../../../../base/common/strings.js';
+import { InternalSuggestOptions } from '../../../common/config/editorOptions.js';
+import { CompletionItemKind, CompletionItemProvider } from '../../../common/languages.js';
+import { WordDistance } from './wordDistance.js';
+import { CompletionItem } from './suggest.js';
 
 type StrictCompletionItem = Required<CompletionItem>;
 
diff --git a/src/vs/editor/contrib/suggest/browser/media/suggest.css b/src/vs/editor/contrib/suggest/browser/media/suggest.css
index 597fa5411b3..e836d840e7b 100644
--- a/src/vs/editor/contrib/suggest/browser/media/suggest.css
+++ b/src/vs/editor/contrib/suggest/browser/media/suggest.css
@@ -352,7 +352,7 @@
 	color: var(--vscode-editorSuggestWidget-foreground);
 }
 
-.monaco-editor .suggest-details.focused {
+.monaco-editor .suggest-details:focus {
 	border-color: var(--vscode-focusBorder);
 }
 
diff --git a/src/vs/editor/contrib/suggest/browser/suggest.ts b/src/vs/editor/contrib/suggest/browser/suggest.ts
index 0ca6b0e09d0..c63d3bb81b1 100644
--- a/src/vs/editor/contrib/suggest/browser/suggest.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggest.ts
@@ -3,31 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { CancellationError, isCancellationError, onUnexpectedExternalError } from 'vs/base/common/errors';
-import { FuzzyScore } from 'vs/base/common/filters';
-import { DisposableStore, IDisposable, isDisposable } from 'vs/base/common/lifecycle';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { assertType } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { ITextModel } from 'vs/editor/common/model';
-import * as languages from 'vs/editor/common/languages';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { SnippetParser } from 'vs/editor/contrib/snippet/browser/snippetParser';
-import { localize } from 'vs/nls';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { historyNavigationVisible } from 'vs/platform/history/browser/contextScopedHistoryWidget';
-import { InternalQuickSuggestionsOptions, QuickSuggestionsValue } from 'vs/editor/common/config/editorOptions';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { StandardTokenType } from 'vs/editor/common/encodedTokenAttributes';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { CancellationError, isCancellationError, onUnexpectedExternalError } from '../../../../base/common/errors.js';
+import { FuzzyScore } from '../../../../base/common/filters.js';
+import { DisposableStore, IDisposable, isDisposable } from '../../../../base/common/lifecycle.js';
+import { StopWatch } from '../../../../base/common/stopwatch.js';
+import { assertType } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { IPosition, Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { IEditorContribution } from '../../../common/editorCommon.js';
+import { ITextModel } from '../../../common/model.js';
+import * as languages from '../../../common/languages.js';
+import { ITextModelService } from '../../../common/services/resolverService.js';
+import { SnippetParser } from '../../snippet/browser/snippetParser.js';
+import { localize } from '../../../../nls.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { LanguageFeatureRegistry } from '../../../common/languageFeatureRegistry.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { historyNavigationVisible } from '../../../../platform/history/browser/contextScopedHistoryWidget.js';
+import { InternalQuickSuggestionsOptions, QuickSuggestionsValue } from '../../../common/config/editorOptions.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { StandardTokenType } from '../../../common/encodedTokenAttributes.js';
 
 export const Context = {
 	Visible: historyNavigationVisible,
@@ -178,13 +178,13 @@ export class CompletionOptions {
 	) { }
 }
 
-let _snippetSuggestSupport: languages.CompletionItemProvider;
+let _snippetSuggestSupport: languages.CompletionItemProvider | undefined;
 
-export function getSnippetSuggestSupport(): languages.CompletionItemProvider {
+export function getSnippetSuggestSupport(): languages.CompletionItemProvider | undefined {
 	return _snippetSuggestSupport;
 }
 
-export function setSnippetSuggestSupport(support: languages.CompletionItemProvider): languages.CompletionItemProvider {
+export function setSnippetSuggestSupport(support: languages.CompletionItemProvider | undefined): languages.CompletionItemProvider | undefined {
 	const old = _snippetSuggestSupport;
 	_snippetSuggestSupport = support;
 	return old;
diff --git a/src/vs/editor/contrib/suggest/browser/suggestAlternatives.ts b/src/vs/editor/contrib/suggest/browser/suggestAlternatives.ts
index 2422c361a35..f108e89874d 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestAlternatives.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestAlternatives.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { CompletionModel } from './completionModel';
-import { ISelectedSuggestion } from './suggestWidget';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { CompletionModel } from './completionModel.js';
+import { ISelectedSuggestion } from './suggestWidget.js';
 
 export class SuggestAlternatives {
 
diff --git a/src/vs/editor/contrib/suggest/browser/suggestCommitCharacters.ts b/src/vs/editor/contrib/suggest/browser/suggestCommitCharacters.ts
index 61080e43376..fb2eb635ca2 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestCommitCharacters.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestCommitCharacters.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isNonEmptyArray } from 'vs/base/common/arrays';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { CharacterSet } from 'vs/editor/common/core/characterClassifier';
-import { State, SuggestModel } from 'vs/editor/contrib/suggest/browser/suggestModel';
-import { ISelectedSuggestion, SuggestWidget } from './suggestWidget';
+import { isNonEmptyArray } from '../../../../base/common/arrays.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { CharacterSet } from '../../../common/core/characterClassifier.js';
+import { State, SuggestModel } from './suggestModel.js';
+import { ISelectedSuggestion, SuggestWidget } from './suggestWidget.js';
 
 export class CommitCharacterController {
 
diff --git a/src/vs/editor/contrib/suggest/browser/suggestController.ts b/src/vs/editor/contrib/suggest/browser/suggestController.ts
index 31eb7c7ea5f..0bf524ab1ee 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestController.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestController.ts
@@ -3,49 +3,49 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { alert } from 'vs/base/browser/ui/aria/aria';
-import { isNonEmptyArray } from 'vs/base/common/arrays';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { onUnexpectedError, onUnexpectedExternalError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { KeyCodeChord } from 'vs/base/common/keybindings';
-import { DisposableStore, dispose, IDisposable, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import * as platform from 'vs/base/common/platform';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { assertType, isObject } from 'vs/base/common/types';
-import { StableEditorScrollState } from 'vs/editor/browser/stableEditorScroll';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, EditorCommand, EditorContributionInstantiation, registerEditorAction, registerEditorCommand, registerEditorContribution, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { EditOperation } from 'vs/editor/common/core/editOperation';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { IEditorContribution, ScrollType } from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { ITextModel, TrackedRangeStickiness } from 'vs/editor/common/model';
-import { CompletionItemInsertTextRule, CompletionItemProvider, CompletionTriggerKind } from 'vs/editor/common/languages';
-import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2';
-import { SnippetParser } from 'vs/editor/contrib/snippet/browser/snippetParser';
-import { ISuggestMemoryService } from 'vs/editor/contrib/suggest/browser/suggestMemory';
-import { WordContextKey } from 'vs/editor/contrib/suggest/browser/wordContextKey';
-import * as nls from 'vs/nls';
-import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
-import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ILogService } from 'vs/platform/log/common/log';
-import { CompletionItem, Context as SuggestContext, ISuggestItemPreselector, suggestWidgetStatusbarMenu } from './suggest';
-import { SuggestAlternatives } from './suggestAlternatives';
-import { CommitCharacterController } from './suggestCommitCharacters';
-import { State, SuggestModel } from './suggestModel';
-import { OvertypingCapturer } from './suggestOvertypingCapturer';
-import { ISelectedSuggestion, SuggestWidget } from './suggestWidget';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { basename, extname } from 'vs/base/common/resources';
-import { hash } from 'vs/base/common/hash';
-import { WindowIdleValue, getWindow } from 'vs/base/browser/dom';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
+import { alert } from '../../../../base/browser/ui/aria/aria.js';
+import { isNonEmptyArray } from '../../../../base/common/arrays.js';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { onUnexpectedError, onUnexpectedExternalError } from '../../../../base/common/errors.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { KeyCodeChord } from '../../../../base/common/keybindings.js';
+import { DisposableStore, dispose, IDisposable, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import * as platform from '../../../../base/common/platform.js';
+import { StopWatch } from '../../../../base/common/stopwatch.js';
+import { assertType, isObject } from '../../../../base/common/types.js';
+import { StableEditorScrollState } from '../../../browser/stableEditorScroll.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorAction, EditorCommand, EditorContributionInstantiation, registerEditorAction, registerEditorCommand, registerEditorContribution, ServicesAccessor } from '../../../browser/editorExtensions.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { EditOperation } from '../../../common/core/editOperation.js';
+import { IPosition, Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { IEditorContribution, ScrollType } from '../../../common/editorCommon.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { ITextModel, TrackedRangeStickiness } from '../../../common/model.js';
+import { CompletionItemInsertTextRule, CompletionItemProvider, CompletionTriggerKind } from '../../../common/languages.js';
+import { SnippetController2 } from '../../snippet/browser/snippetController2.js';
+import { SnippetParser } from '../../snippet/browser/snippetParser.js';
+import { ISuggestMemoryService } from './suggestMemory.js';
+import { WordContextKey } from './wordContextKey.js';
+import * as nls from '../../../../nls.js';
+import { CommandsRegistry, ICommandService } from '../../../../platform/commands/common/commands.js';
+import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { CompletionItem, Context as SuggestContext, ISuggestItemPreselector, suggestWidgetStatusbarMenu } from './suggest.js';
+import { SuggestAlternatives } from './suggestAlternatives.js';
+import { CommitCharacterController } from './suggestCommitCharacters.js';
+import { State, SuggestModel } from './suggestModel.js';
+import { OvertypingCapturer } from './suggestOvertypingCapturer.js';
+import { ISelectedSuggestion, SuggestWidget } from './suggestWidget.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { basename, extname } from '../../../../base/common/resources.js';
+import { hash } from '../../../../base/common/hash.js';
+import { WindowIdleValue, getWindow } from '../../../../base/browser/dom.js';
+import { ModelDecorationOptions } from '../../../common/model/textModel.js';
 
 // sticky suggest widget which doesn't disappear on focus out and such
 const _sticky = false
@@ -509,26 +509,42 @@ export class SuggestController implements IEditorContribution {
 
 		// clear only now - after all tasks are done
 		Promise.all(tasks).finally(() => {
-			this._reportSuggestionAcceptedTelemetry(item, model, isResolved, _commandExectionDuration, _additionalEditsAppliedAsync);
+			this._reportSuggestionAcceptedTelemetry(item, model, isResolved, _commandExectionDuration, _additionalEditsAppliedAsync, event.index, event.model.items);
 
 			this.model.clear();
 			cts.dispose();
 		});
 	}
 
-	private _reportSuggestionAcceptedTelemetry(item: CompletionItem, model: ITextModel, itemResolved: boolean, commandExectionDuration: number, additionalEditsAppliedAsync: number) {
-
+	private _reportSuggestionAcceptedTelemetry(item: CompletionItem, model: ITextModel, itemResolved: boolean, commandExectionDuration: number, additionalEditsAppliedAsync: number, index: number, completionItems: CompletionItem[]): void {
 		if (Math.floor(Math.random() * 100) === 0) {
 			// throttle telemetry event because accepting completions happens a lot
 			return;
 		}
 
+		const labelMap = new Map<string, number[]>();
+
+		for (let i = 0; i < Math.min(30, completionItems.length); i++) {
+			const label = completionItems[i].textLabel;
+
+			if (labelMap.has(label)) {
+				labelMap.get(label)!.push(i);
+			} else {
+				labelMap.set(label, [i]);
+			}
+		}
+
+		const firstIndexArray = labelMap.get(item.textLabel);
+		const hasDuplicates = firstIndexArray && firstIndexArray.length > 1;
+		const firstIndex = hasDuplicates ? firstIndexArray[0] : -1;
+
 		type AcceptedSuggestion = {
 			extensionId: string; providerId: string;
 			fileExtension: string; languageId: string; basenameHash: string; kind: number;
 			resolveInfo: number; resolveDuration: number;
 			commandDuration: number;
 			additionalEditsAsync: number;
+			index: number; firstIndex: number;
 		};
 		type AcceptedSuggestionClassification = {
 			owner: 'jrieken';
@@ -543,6 +559,8 @@ export class SuggestController implements IEditorContribution {
 			resolveDuration: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'How long resolving took to finish' };
 			commandDuration: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'How long a completion item command took' };
 			additionalEditsAsync: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Info about asynchronously applying additional edits' };
+			index: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The index of the completion item in the sorted list.' };
+			firstIndex: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'When there are multiple completions, the index of the first instance.' };
 		};
 
 		this._telemetryService.publicLog2<AcceptedSuggestion, AcceptedSuggestionClassification>('suggest.acceptedSuggestion', {
@@ -555,7 +573,9 @@ export class SuggestController implements IEditorContribution {
 			resolveInfo: !item.provider.resolveCompletionItem ? -1 : itemResolved ? 1 : 0,
 			resolveDuration: item.resolveDuration,
 			commandDuration: commandExectionDuration,
-			additionalEditsAsync: additionalEditsAppliedAsync
+			additionalEditsAsync: additionalEditsAppliedAsync,
+			index,
+			firstIndex,
 		});
 	}
 
@@ -1005,13 +1025,13 @@ registerEditorCommand(new SuggestCommand({
 		group: 'right',
 		order: 1,
 		when: ContextKeyExpr.and(SuggestContext.DetailsVisible, SuggestContext.CanResolve),
-		title: nls.localize('detail.more', "show less")
+		title: nls.localize('detail.more', "Show Less")
 	}, {
 		menuId: suggestWidgetStatusbarMenu,
 		group: 'right',
 		order: 1,
 		when: ContextKeyExpr.and(SuggestContext.DetailsVisible.toNegated(), SuggestContext.CanResolve),
-		title: nls.localize('detail.less', "show more")
+		title: nls.localize('detail.less', "Show More")
 	}]
 }));
 
diff --git a/src/vs/editor/contrib/suggest/browser/suggestInlineCompletions.ts b/src/vs/editor/contrib/suggest/browser/suggestInlineCompletions.ts
index 81d6f7d4d8f..e5f38891d53 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestInlineCompletions.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestInlineCompletions.ts
@@ -3,27 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { FuzzyScore } from 'vs/base/common/filters';
-import { Iterable } from 'vs/base/common/iterator';
-import { Disposable, RefCountedDisposable } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { IWordAtPosition } from 'vs/editor/common/core/wordHelper';
-import { registerEditorFeature } from 'vs/editor/common/editorFeatures';
-import { Command, CompletionItemInsertTextRule, CompletionItemProvider, CompletionTriggerKind, InlineCompletion, InlineCompletionContext, InlineCompletions, InlineCompletionsProvider } from 'vs/editor/common/languages';
-import { ITextModel } from 'vs/editor/common/model';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { CompletionModel, LineContext } from 'vs/editor/contrib/suggest/browser/completionModel';
-import { CompletionItem, CompletionItemModel, CompletionOptions, provideSuggestionItems, QuickSuggestionsOptions } from 'vs/editor/contrib/suggest/browser/suggest';
-import { ISuggestMemoryService } from 'vs/editor/contrib/suggest/browser/suggestMemory';
-import { SuggestModel } from 'vs/editor/contrib/suggest/browser/suggestModel';
-import { WordDistance } from 'vs/editor/contrib/suggest/browser/wordDistance';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { FuzzyScore } from '../../../../base/common/filters.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { Disposable, RefCountedDisposable } from '../../../../base/common/lifecycle.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { ICodeEditorService } from '../../../browser/services/codeEditorService.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { ISingleEditOperation } from '../../../common/core/editOperation.js';
+import { IPosition, Position } from '../../../common/core/position.js';
+import { IRange, Range } from '../../../common/core/range.js';
+import { IWordAtPosition } from '../../../common/core/wordHelper.js';
+import { registerEditorFeature } from '../../../common/editorFeatures.js';
+import { Command, CompletionItemInsertTextRule, CompletionItemProvider, CompletionTriggerKind, InlineCompletion, InlineCompletionContext, InlineCompletions, InlineCompletionsProvider } from '../../../common/languages.js';
+import { ITextModel } from '../../../common/model.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { CompletionModel, LineContext } from './completionModel.js';
+import { CompletionItem, CompletionItemModel, CompletionOptions, provideSuggestionItems, QuickSuggestionsOptions } from './suggest.js';
+import { ISuggestMemoryService } from './suggestMemory.js';
+import { SuggestModel } from './suggestModel.js';
+import { WordDistance } from './wordDistance.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
 
 class SuggestInlineCompletion implements InlineCompletion {
 
diff --git a/src/vs/editor/contrib/suggest/browser/suggestMemory.ts b/src/vs/editor/contrib/suggest/browser/suggestMemory.ts
index ff7df7cc7cb..7aa97af48e1 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestMemory.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestMemory.ts
@@ -4,18 +4,18 @@
  *--------------------------------------------------------------------------------------------*/
 
 
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { LRUCache } from 'vs/base/common/map';
-import { TernarySearchTree } from 'vs/base/common/ternarySearchTree';
-import { IPosition } from 'vs/editor/common/core/position';
-import { ITextModel } from 'vs/editor/common/model';
-import { CompletionItemKind, CompletionItemKinds } from 'vs/editor/common/languages';
-import { CompletionItem } from 'vs/editor/contrib/suggest/browser/suggest';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IStorageService, StorageScope, StorageTarget, WillSaveStateReason } from 'vs/platform/storage/common/storage';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { LRUCache } from '../../../../base/common/map.js';
+import { TernarySearchTree } from '../../../../base/common/ternarySearchTree.js';
+import { IPosition } from '../../../common/core/position.js';
+import { ITextModel } from '../../../common/model.js';
+import { CompletionItemKind, CompletionItemKinds } from '../../../common/languages.js';
+import { CompletionItem } from './suggest.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService, StorageScope, StorageTarget, WillSaveStateReason } from '../../../../platform/storage/common/storage.js';
 
 export abstract class Memory {
 
diff --git a/src/vs/editor/contrib/suggest/browser/suggestModel.ts b/src/vs/editor/contrib/suggest/browser/suggestModel.ts
index 0e4124b39f8..7a7019032ca 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestModel.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestModel.ts
@@ -3,35 +3,35 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { TimeoutTimer } from 'vs/base/common/async';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore, dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { getLeadingWhitespace, isHighSurrogate, isLowSurrogate } from 'vs/base/common/strings';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { CursorChangeReason, ICursorSelectionChangedEvent } from 'vs/editor/common/cursorEvents';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ITextModel } from 'vs/editor/common/model';
-import { CompletionContext, CompletionItemKind, CompletionItemProvider, CompletionTriggerKind } from 'vs/editor/common/languages';
-import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { WordDistance } from 'vs/editor/contrib/suggest/browser/wordDistance';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { CompletionModel } from './completionModel';
-import { CompletionDurations, CompletionItem, CompletionOptions, getSnippetSuggestSupport, provideSuggestionItems, QuickSuggestionsOptions, SnippetSortOrder } from './suggest';
-import { IWordAtPosition } from 'vs/editor/common/core/wordHelper';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { FuzzyScoreOptions } from 'vs/base/common/filters';
-import { assertType } from 'vs/base/common/types';
-import { InlineCompletionContextKeys } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionContextKeys';
-import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { TimeoutTimer } from '../../../../base/common/async.js';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { DisposableStore, dispose, IDisposable } from '../../../../base/common/lifecycle.js';
+import { getLeadingWhitespace, isHighSurrogate, isLowSurrogate } from '../../../../base/common/strings.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { CursorChangeReason, ICursorSelectionChangedEvent } from '../../../common/cursorEvents.js';
+import { IPosition, Position } from '../../../common/core/position.js';
+import { Selection } from '../../../common/core/selection.js';
+import { ITextModel } from '../../../common/model.js';
+import { CompletionContext, CompletionItemKind, CompletionItemProvider, CompletionTriggerKind } from '../../../common/languages.js';
+import { IEditorWorkerService } from '../../../common/services/editorWorker.js';
+import { WordDistance } from './wordDistance.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { CompletionModel } from './completionModel.js';
+import { CompletionDurations, CompletionItem, CompletionOptions, getSnippetSuggestSupport, provideSuggestionItems, QuickSuggestionsOptions, SnippetSortOrder } from './suggest.js';
+import { IWordAtPosition } from '../../../common/core/wordHelper.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { FuzzyScoreOptions } from '../../../../base/common/filters.js';
+import { assertType } from '../../../../base/common/types.js';
+import { InlineCompletionContextKeys } from '../../inlineCompletions/browser/controller/inlineCompletionContextKeys.js';
+import { SnippetController2 } from '../../snippet/browser/snippetController2.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
 
 export interface ICancelEvent {
 	readonly retrigger: boolean;
@@ -230,7 +230,10 @@ export class SuggestModel implements IDisposable {
 				let set = supportsByTriggerCharacter.get(ch);
 				if (!set) {
 					set = new Set();
-					set.add(getSnippetSuggestSupport());
+					const suggestSupport = getSnippetSuggestSupport();
+					if (suggestSupport) {
+						set.add(suggestSupport);
+					}
 					supportsByTriggerCharacter.set(ch, set);
 				}
 				set.add(support);
diff --git a/src/vs/editor/contrib/suggest/browser/suggestOvertypingCapturer.ts b/src/vs/editor/contrib/suggest/browser/suggestOvertypingCapturer.ts
index a8f60b54fa9..eb6d9d1578d 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestOvertypingCapturer.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestOvertypingCapturer.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { SuggestModel } from 'vs/editor/contrib/suggest/browser/suggestModel';
+import { DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { SuggestModel } from './suggestModel.js';
 
 export class OvertypingCapturer implements IDisposable {
 
diff --git a/src/vs/editor/contrib/suggest/browser/suggestWidget.ts b/src/vs/editor/contrib/suggest/browser/suggestWidget.ts
index 2eeb94d99b6..7b728a6e171 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestWidget.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestWidget.ts
@@ -3,51 +3,51 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import 'vs/base/browser/ui/codicons/codiconStyles'; // The codicon symbol styles are defined here and must be loaded
-import { IListEvent, IListGestureEvent, IListMouseEvent } from 'vs/base/browser/ui/list/list';
-import { List } from 'vs/base/browser/ui/list/listWidget';
-import { CancelablePromise, createCancelablePromise, disposableTimeout, TimeoutTimer } from 'vs/base/common/async';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Emitter, Event, PauseableEmitter } from 'vs/base/common/event';
-import { DisposableStore, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { clamp } from 'vs/base/common/numbers';
-import * as strings from 'vs/base/common/strings';
-import 'vs/css!./media/suggest';
-import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition, IEditorMouseEvent } from 'vs/editor/browser/editorBrowser';
-import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { IPosition } from 'vs/editor/common/core/position';
-import { SuggestWidgetStatus } from 'vs/editor/contrib/suggest/browser/suggestWidgetStatus';
-import 'vs/editor/contrib/symbolIcons/browser/symbolIcons'; // The codicon symbol colors are defined here and must be loaded to get colors
-import * as nls from 'vs/nls';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { activeContrastBorder, editorForeground, editorWidgetBackground, editorWidgetBorder, listFocusHighlightForeground, listHighlightForeground, quickInputListFocusBackground, quickInputListFocusForeground, quickInputListFocusIconForeground, registerColor, transparent } from 'vs/platform/theme/common/colorRegistry';
-import { isHighContrast } from 'vs/platform/theme/common/theme';
-import { IColorTheme, IThemeService } from 'vs/platform/theme/common/themeService';
-import { CompletionModel } from './completionModel';
-import { ResizableHTMLElement } from 'vs/base/browser/ui/resizable/resizable';
-import { CompletionItem, Context as SuggestContext, suggestWidgetStatusbarMenu } from './suggest';
-import { canExpandCompletionItem, SuggestDetailsOverlay, SuggestDetailsWidget } from './suggestWidgetDetails';
-import { getAriaId, ItemRenderer } from './suggestWidgetRenderer';
-import { getListStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { status } from 'vs/base/browser/ui/aria/aria';
+import * as dom from '../../../../base/browser/dom.js';
+import { IKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import '../../../../base/browser/ui/codicons/codiconStyles.js'; // The codicon symbol styles are defined here and must be loaded
+import { IListEvent, IListGestureEvent, IListMouseEvent } from '../../../../base/browser/ui/list/list.js';
+import { List } from '../../../../base/browser/ui/list/listWidget.js';
+import { CancelablePromise, createCancelablePromise, disposableTimeout, TimeoutTimer } from '../../../../base/common/async.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { Emitter, Event, PauseableEmitter } from '../../../../base/common/event.js';
+import { DisposableStore, IDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { clamp } from '../../../../base/common/numbers.js';
+import * as strings from '../../../../base/common/strings.js';
+import './media/suggest.css';
+import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition, IEditorMouseEvent } from '../../../browser/editorBrowser.js';
+import { EmbeddedCodeEditorWidget } from '../../../browser/widget/codeEditor/embeddedCodeEditorWidget.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { IPosition } from '../../../common/core/position.js';
+import { SuggestWidgetStatus } from './suggestWidgetStatus.js';
+import '../../symbolIcons/browser/symbolIcons.js'; // The codicon symbol colors are defined here and must be loaded to get colors
+import * as nls from '../../../../nls.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { activeContrastBorder, editorForeground, editorWidgetBackground, editorWidgetBorder, listFocusHighlightForeground, listHighlightForeground, quickInputListFocusBackground, quickInputListFocusForeground, quickInputListFocusIconForeground, registerColor, transparent } from '../../../../platform/theme/common/colorRegistry.js';
+import { isHighContrast } from '../../../../platform/theme/common/theme.js';
+import { IColorTheme, IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { CompletionModel } from './completionModel.js';
+import { ResizableHTMLElement } from '../../../../base/browser/ui/resizable/resizable.js';
+import { CompletionItem, Context as SuggestContext, suggestWidgetStatusbarMenu } from './suggest.js';
+import { canExpandCompletionItem, SuggestDetailsOverlay, SuggestDetailsWidget } from './suggestWidgetDetails.js';
+import { getAriaId, ItemRenderer } from './suggestWidgetRenderer.js';
+import { getListStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { status } from '../../../../base/browser/ui/aria/aria.js';
 
 /**
  * Suggest widget colors
  */
-registerColor('editorSuggestWidget.background', { dark: editorWidgetBackground, light: editorWidgetBackground, hcDark: editorWidgetBackground, hcLight: editorWidgetBackground }, nls.localize('editorSuggestWidgetBackground', 'Background color of the suggest widget.'));
-registerColor('editorSuggestWidget.border', { dark: editorWidgetBorder, light: editorWidgetBorder, hcDark: editorWidgetBorder, hcLight: editorWidgetBorder }, nls.localize('editorSuggestWidgetBorder', 'Border color of the suggest widget.'));
-const editorSuggestWidgetForeground = registerColor('editorSuggestWidget.foreground', { dark: editorForeground, light: editorForeground, hcDark: editorForeground, hcLight: editorForeground }, nls.localize('editorSuggestWidgetForeground', 'Foreground color of the suggest widget.'));
-registerColor('editorSuggestWidget.selectedForeground', { dark: quickInputListFocusForeground, light: quickInputListFocusForeground, hcDark: quickInputListFocusForeground, hcLight: quickInputListFocusForeground }, nls.localize('editorSuggestWidgetSelectedForeground', 'Foreground color of the selected entry in the suggest widget.'));
-registerColor('editorSuggestWidget.selectedIconForeground', { dark: quickInputListFocusIconForeground, light: quickInputListFocusIconForeground, hcDark: quickInputListFocusIconForeground, hcLight: quickInputListFocusIconForeground }, nls.localize('editorSuggestWidgetSelectedIconForeground', 'Icon foreground color of the selected entry in the suggest widget.'));
-export const editorSuggestWidgetSelectedBackground = registerColor('editorSuggestWidget.selectedBackground', { dark: quickInputListFocusBackground, light: quickInputListFocusBackground, hcDark: quickInputListFocusBackground, hcLight: quickInputListFocusBackground }, nls.localize('editorSuggestWidgetSelectedBackground', 'Background color of the selected entry in the suggest widget.'));
-registerColor('editorSuggestWidget.highlightForeground', { dark: listHighlightForeground, light: listHighlightForeground, hcDark: listHighlightForeground, hcLight: listHighlightForeground }, nls.localize('editorSuggestWidgetHighlightForeground', 'Color of the match highlights in the suggest widget.'));
-registerColor('editorSuggestWidget.focusHighlightForeground', { dark: listFocusHighlightForeground, light: listFocusHighlightForeground, hcDark: listFocusHighlightForeground, hcLight: listFocusHighlightForeground }, nls.localize('editorSuggestWidgetFocusHighlightForeground', 'Color of the match highlights in the suggest widget when an item is focused.'));
-registerColor('editorSuggestWidgetStatus.foreground', { dark: transparent(editorSuggestWidgetForeground, .5), light: transparent(editorSuggestWidgetForeground, .5), hcDark: transparent(editorSuggestWidgetForeground, .5), hcLight: transparent(editorSuggestWidgetForeground, .5) }, nls.localize('editorSuggestWidgetStatusForeground', 'Foreground color of the suggest widget status.'));
+registerColor('editorSuggestWidget.background', editorWidgetBackground, nls.localize('editorSuggestWidgetBackground', 'Background color of the suggest widget.'));
+registerColor('editorSuggestWidget.border', editorWidgetBorder, nls.localize('editorSuggestWidgetBorder', 'Border color of the suggest widget.'));
+const editorSuggestWidgetForeground = registerColor('editorSuggestWidget.foreground', editorForeground, nls.localize('editorSuggestWidgetForeground', 'Foreground color of the suggest widget.'));
+registerColor('editorSuggestWidget.selectedForeground', quickInputListFocusForeground, nls.localize('editorSuggestWidgetSelectedForeground', 'Foreground color of the selected entry in the suggest widget.'));
+registerColor('editorSuggestWidget.selectedIconForeground', quickInputListFocusIconForeground, nls.localize('editorSuggestWidgetSelectedIconForeground', 'Icon foreground color of the selected entry in the suggest widget.'));
+export const editorSuggestWidgetSelectedBackground = registerColor('editorSuggestWidget.selectedBackground', quickInputListFocusBackground, nls.localize('editorSuggestWidgetSelectedBackground', 'Background color of the selected entry in the suggest widget.'));
+registerColor('editorSuggestWidget.highlightForeground', listHighlightForeground, nls.localize('editorSuggestWidgetHighlightForeground', 'Color of the match highlights in the suggest widget.'));
+registerColor('editorSuggestWidget.focusHighlightForeground', listFocusHighlightForeground, nls.localize('editorSuggestWidgetFocusHighlightForeground', 'Color of the match highlights in the suggest widget when an item is focused.'));
+registerColor('editorSuggestWidgetStatus.foreground', transparent(editorSuggestWidgetForeground, .5), nls.localize('editorSuggestWidgetStatusForeground', 'Foreground color of the suggest widget status.'));
 
 const enum State {
 	Hidden,
@@ -55,7 +55,8 @@ const enum State {
 	Empty,
 	Open,
 	Frozen,
-	Details
+	Details,
+	onDetailsKeyDown
 }
 
 export interface ISelectedSuggestion {
@@ -210,7 +211,7 @@ export class SuggestWidget implements IDisposable {
 		this._listElement = dom.append(this.element.domNode, dom.$('.tree'));
 
 		const details = this._disposables.add(instantiationService.createInstance(SuggestDetailsWidget, this.editor));
-		details.onDidClose(this.toggleDetails, this, this._disposables);
+		details.onDidClose(() => this.toggleDetails(), this, this._disposables);
 		this._details = new SuggestDetailsOverlay(details, this.editor);
 
 		const applyIconStyle = () => this.element.domNode.classList.toggle('no-icons', !this.editor.getOption(EditorOption.suggest).showIcons);
@@ -366,6 +367,12 @@ export class SuggestWidget implements IDisposable {
 			return;
 		}
 
+		if (this._state === State.Details) {
+			// This can happen when focus is in the details-panel and when
+			// arrow keys are pressed to select next/prev items
+			this._setState(State.Open);
+		}
+
 		if (!e.elements.length) {
 			if (this._currentSuggestionDetails) {
 				this._currentSuggestionDetails.cancel();
@@ -398,7 +405,7 @@ export class SuggestWidget implements IDisposable {
 			this._currentSuggestionDetails = createCancelablePromise(async token => {
 				const loading = disposableTimeout(() => {
 					if (this._isDetailsVisible()) {
-						this.showDetails(true);
+						this._showDetails(true, false);
 					}
 				}, 250);
 				const sub = token.onCancellationRequested(() => loading.dispose());
@@ -422,7 +429,7 @@ export class SuggestWidget implements IDisposable {
 				this._ignoreFocusEvents = false;
 
 				if (this._isDetailsVisible()) {
-					this.showDetails(false);
+					this._showDetails(false, false);
 				} else {
 					this.element.domNode.classList.remove('docs-side');
 				}
@@ -496,6 +503,7 @@ export class SuggestWidget implements IDisposable {
 				dom.show(this._listElement, this._status.element);
 				this._details.show();
 				this._show();
+				this._details.widget.focus();
 				break;
 		}
 	}
@@ -686,16 +694,20 @@ export class SuggestWidget implements IDisposable {
 
 	toggleDetailsFocus(): void {
 		if (this._state === State.Details) {
+			// Should return the focus to the list item.
+			this._list.setFocus(this._list.getFocus());
 			this._setState(State.Open);
-			this._details.widget.domNode.classList.remove('focused');
-
-		} else if (this._state === State.Open && this._isDetailsVisible()) {
+		} else if (this._state === State.Open) {
 			this._setState(State.Details);
-			this._details.widget.domNode.classList.add('focused');
+			if (!this._isDetailsVisible()) {
+				this.toggleDetails(true);
+			} else {
+				this._details.widget.focus();
+			}
 		}
 	}
 
-	toggleDetails(): void {
+	toggleDetails(focused: boolean = false): void {
 		if (this._isDetailsVisible()) {
 			// hide details widget
 			this._pendingShowDetails.clear();
@@ -708,14 +720,15 @@ export class SuggestWidget implements IDisposable {
 			// show details widget (iff possible)
 			this._ctxSuggestWidgetDetailsVisible.set(true);
 			this._setDetailsVisible(true);
-			this.showDetails(false);
+			this._showDetails(false, focused);
 		}
 	}
 
-	showDetails(loading: boolean): void {
+	private _showDetails(loading: boolean, focused: boolean): void {
 		this._pendingShowDetails.value = dom.runAtThisOrScheduleAtNextAnimationFrame(dom.getWindow(this.element.domNode), () => {
 			this._pendingShowDetails.clear();
 			this._details.show();
+			let didFocusDetails = false;
 			if (loading) {
 				this._details.widget.renderLoading();
 			} else {
@@ -724,10 +737,16 @@ export class SuggestWidget implements IDisposable {
 			if (!this._details.widget.isEmpty) {
 				this._positionDetails();
 				this.element.domNode.classList.add('shows-details');
+				if (focused) {
+					this._details.widget.focus();
+					didFocusDetails = true;
+				}
 			} else {
 				this._details.hide();
 			}
-			this.editor.focus();
+			if (!didFocusDetails) {
+				this.editor.focus();
+			}
 		});
 	}
 
@@ -737,7 +756,7 @@ export class SuggestWidget implements IDisposable {
 			if (!this._isDetailsVisible()) {
 				this.toggleDetails();
 			} else {
-				this.showDetails(false);
+				this._showDetails(false, false);
 			}
 		}
 	}
diff --git a/src/vs/editor/contrib/suggest/browser/suggestWidgetDetails.ts b/src/vs/editor/contrib/suggest/browser/suggestWidgetDetails.ts
index 5d2a5fbf282..22f29a981c5 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestWidgetDetails.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestWidgetDetails.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { Emitter, Event } from 'vs/base/common/event';
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { MarkdownRenderer } from 'vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
-import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition } from 'vs/editor/browser/editorBrowser';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { ResizableHTMLElement } from 'vs/base/browser/ui/resizable/resizable';
-import * as nls from 'vs/nls';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { CompletionItem } from './suggest';
+import * as dom from '../../../../base/browser/dom.js';
+import { DomScrollableElement } from '../../../../base/browser/ui/scrollbar/scrollableElement.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { MarkdownRenderer } from '../../../browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition } from '../../../browser/editorBrowser.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { ResizableHTMLElement } from '../../../../base/browser/ui/resizable/resizable.js';
+import * as nls from '../../../../nls.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { CompletionItem } from './suggest.js';
 
 export function canExpandCompletionItem(item: CompletionItem | undefined): boolean {
 	return !!item && Boolean(item.completion.documentation || item.completion.detail && item.completion.detail !== item.completion.label);
@@ -65,6 +65,8 @@ export class SuggestDetailsWidget {
 		this._header = dom.append(this._body, dom.$('.header'));
 		this._close = dom.append(this._header, dom.$('span' + ThemeIcon.asCSSSelector(Codicon.close)));
 		this._close.title = nls.localize('details.close', "Close");
+		this._close.role = 'button';
+		this._close.tabIndex = -1;
 		this._type = dom.append(this._header, dom.$('p.type'));
 
 		this._docs = dom.append(this._body, dom.$('p.docs'));
@@ -254,6 +256,10 @@ export class SuggestDetailsWidget {
 	get borderWidth() {
 		return this._borderWidth;
 	}
+
+	focus() {
+		this.domNode.focus();
+	}
 }
 
 interface TopLeftPosition {
diff --git a/src/vs/editor/contrib/suggest/browser/suggestWidgetRenderer.ts b/src/vs/editor/contrib/suggest/browser/suggestWidgetRenderer.ts
index 75c44777e22..24fb6d3106f 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestWidgetRenderer.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestWidgetRenderer.ts
@@ -3,27 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { $, append, hide, show } from 'vs/base/browser/dom';
-import { IconLabel, IIconLabelValueOptions } from 'vs/base/browser/ui/iconLabel/iconLabel';
-import { IListRenderer } from 'vs/base/browser/ui/list/list';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { Emitter, Event } from 'vs/base/common/event';
-import { createMatches } from 'vs/base/common/filters';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { CompletionItemKind, CompletionItemKinds, CompletionItemTag } from 'vs/editor/common/languages';
-import { getIconClasses } from 'vs/editor/common/services/getIconClasses';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import * as nls from 'vs/nls';
-import { FileKind } from 'vs/platform/files/common/files';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { CompletionItem } from './suggest';
-import { canExpandCompletionItem } from './suggestWidgetDetails';
+import { $, append, hide, show } from '../../../../base/browser/dom.js';
+import { IconLabel, IIconLabelValueOptions } from '../../../../base/browser/ui/iconLabel/iconLabel.js';
+import { IListRenderer } from '../../../../base/browser/ui/list/list.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { createMatches } from '../../../../base/common/filters.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { CompletionItemKind, CompletionItemKinds, CompletionItemTag } from '../../../common/languages.js';
+import { getIconClasses } from '../../../common/services/getIconClasses.js';
+import { IModelService } from '../../../common/services/model.js';
+import { ILanguageService } from '../../../common/languages/language.js';
+import * as nls from '../../../../nls.js';
+import { FileKind } from '../../../../platform/files/common/files.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { CompletionItem } from './suggest.js';
+import { canExpandCompletionItem } from './suggestWidgetDetails.js';
 
 export function getAriaId(index: number): string {
 	return `suggest-aria-id:${index}`;
diff --git a/src/vs/editor/contrib/suggest/browser/suggestWidgetStatus.ts b/src/vs/editor/contrib/suggest/browser/suggestWidgetStatus.ts
index 25d19c054d2..3714840e0f0 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestWidgetStatus.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestWidgetStatus.ts
@@ -3,33 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { ActionBar, IActionViewItemProvider } from 'vs/base/browser/ui/actionbar/actionbar';
-import { IAction } from 'vs/base/common/actions';
-import { ResolvedKeybinding } from 'vs/base/common/keybindings';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { localize } from 'vs/nls';
-import { MenuEntryActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IMenuService, MenuId, MenuItemAction } from 'vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-
-class StatusBarViewItem extends MenuEntryActionViewItem {
-
-	protected override updateLabel() {
-		const kb = this._keybindingService.lookupKeybinding(this._action.id, this._contextKeyService);
-		if (!kb) {
-			return super.updateLabel();
-		}
-		if (this.label) {
-			this.label.textContent = localize({ key: 'content', comment: ['A label', 'A keybinding'] }, '{0} ({1})', this._action.label, StatusBarViewItem.symbolPrintEnter(kb));
-		}
-	}
-
-	static symbolPrintEnter(kb: ResolvedKeybinding) {
-		return kb.getLabel()?.replace(/\benter\b/gi, '\u23CE');
-	}
-}
+import * as dom from '../../../../base/browser/dom.js';
+import { ActionBar, IActionViewItemProvider } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { IAction } from '../../../../base/common/actions.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { TextOnlyMenuEntryActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IMenuService, MenuId, MenuItemAction } from '../../../../platform/actions/common/actions.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 
 export class SuggestWidgetStatus {
 
@@ -49,7 +30,7 @@ export class SuggestWidgetStatus {
 		this.element = dom.append(container, dom.$('.suggest-status-bar'));
 
 		const actionViewItemProvider = <IActionViewItemProvider>(action => {
-			return action instanceof MenuItemAction ? instantiationService.createInstance(StatusBarViewItem, action, undefined) : undefined;
+			return action instanceof MenuItemAction ? instantiationService.createInstance(TextOnlyMenuEntryActionViewItem, action, { useComma: true }) : undefined;
 		});
 		this._leftActions = new ActionBar(this.element, { actionViewItemProvider });
 		this._rightActions = new ActionBar(this.element, { actionViewItemProvider });
diff --git a/src/vs/editor/contrib/suggest/browser/wordContextKey.ts b/src/vs/editor/contrib/suggest/browser/wordContextKey.ts
index ae8fd6e1a2d..901b440d8a5 100644
--- a/src/vs/editor/contrib/suggest/browser/wordContextKey.ts
+++ b/src/vs/editor/contrib/suggest/browser/wordContextKey.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 
 export class WordContextKey {
 
diff --git a/src/vs/editor/contrib/suggest/browser/wordDistance.ts b/src/vs/editor/contrib/suggest/browser/wordDistance.ts
index 610e8bfb607..3c992c6d5ed 100644
--- a/src/vs/editor/contrib/suggest/browser/wordDistance.ts
+++ b/src/vs/editor/contrib/suggest/browser/wordDistance.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { binarySearch, isFalsyOrEmpty } from 'vs/base/common/arrays';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { IPosition } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { CompletionItem, CompletionItemKind } from 'vs/editor/common/languages';
-import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { BracketSelectionRangeProvider } from 'vs/editor/contrib/smartSelect/browser/bracketSelections';
+import { binarySearch, isFalsyOrEmpty } from '../../../../base/common/arrays.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { IPosition } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { CompletionItem, CompletionItemKind } from '../../../common/languages.js';
+import { IEditorWorkerService } from '../../../common/services/editorWorker.js';
+import { BracketSelectionRangeProvider } from '../../smartSelect/browser/bracketSelections.js';
 
 export abstract class WordDistance {
 
diff --git a/src/vs/editor/contrib/suggest/test/browser/completionModel.test.ts b/src/vs/editor/contrib/suggest/test/browser/completionModel.test.ts
index 823d6865a84..79b58979fe5 100644
--- a/src/vs/editor/contrib/suggest/test/browser/completionModel.test.ts
+++ b/src/vs/editor/contrib/suggest/test/browser/completionModel.test.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { EditorOptions, InternalSuggestOptions } from 'vs/editor/common/config/editorOptions';
-import { IPosition } from 'vs/editor/common/core/position';
-import * as languages from 'vs/editor/common/languages';
-import { CompletionModel } from 'vs/editor/contrib/suggest/browser/completionModel';
-import { CompletionItem, getSuggestionComparator, SnippetSortOrder } from 'vs/editor/contrib/suggest/browser/suggest';
-import { WordDistance } from 'vs/editor/contrib/suggest/browser/wordDistance';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { EditorOptions, InternalSuggestOptions } from '../../../../common/config/editorOptions.js';
+import { IPosition } from '../../../../common/core/position.js';
+import * as languages from '../../../../common/languages.js';
+import { CompletionModel } from '../../browser/completionModel.js';
+import { CompletionItem, getSuggestionComparator, SnippetSortOrder } from '../../browser/suggest.js';
+import { WordDistance } from '../../browser/wordDistance.js';
 
 export function createSuggestItem(label: string | languages.CompletionItemLabel, overwriteBefore: number, kind = languages.CompletionItemKind.Property, incomplete: boolean = false, position: IPosition = { lineNumber: 1, column: 1 }, sortText?: string, filterText?: string): CompletionItem {
 	const suggestion: languages.CompletionItem = {
diff --git a/src/vs/editor/contrib/suggest/test/browser/suggest.test.ts b/src/vs/editor/contrib/suggest/test/browser/suggest.test.ts
index b2e9fc03577..3b90caf5301 100644
--- a/src/vs/editor/contrib/suggest/test/browser/suggest.test.ts
+++ b/src/vs/editor/contrib/suggest/test/browser/suggest.test.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { TextModel } from 'vs/editor/common/model/textModel';
-import { CompletionItemKind, CompletionItemProvider } from 'vs/editor/common/languages';
-import { CompletionOptions, provideSuggestionItems, SnippetSortOrder } from 'vs/editor/contrib/suggest/browser/suggest';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
-import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { IDisposable } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { Position } from '../../../../common/core/position.js';
+import { Range } from '../../../../common/core/range.js';
+import { TextModel } from '../../../../common/model/textModel.js';
+import { CompletionItemKind, CompletionItemProvider } from '../../../../common/languages.js';
+import { CompletionOptions, provideSuggestionItems, SnippetSortOrder } from '../../browser/suggest.js';
+import { createTextModel } from '../../../../test/common/testTextModel.js';
+import { LanguageFeatureRegistry } from '../../../../common/languageFeatureRegistry.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 
 suite('Suggest', function () {
diff --git a/src/vs/editor/contrib/suggest/test/browser/suggestController.test.ts b/src/vs/editor/contrib/suggest/test/browser/suggestController.test.ts
index 64123de47db..7f83d7ecbcc 100644
--- a/src/vs/editor/contrib/suggest/test/browser/suggestController.test.ts
+++ b/src/vs/editor/contrib/suggest/test/browser/suggestController.test.ts
@@ -4,35 +4,35 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { timeout } from 'vs/base/common/async';
-import { Event } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { mock } from 'vs/base/test/common/mock';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { TextModel } from 'vs/editor/common/model/textModel';
-import { CompletionItemInsertTextRule, CompletionItemKind } from 'vs/editor/common/languages';
-import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2';
-import { SuggestController } from 'vs/editor/contrib/suggest/browser/suggestController';
-import { ISuggestMemoryService } from 'vs/editor/contrib/suggest/browser/suggestMemory';
-import { createTestCodeEditor, ITestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
-import { IMenu, IMenuService } from 'vs/platform/actions/common/actions';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { MockKeybindingService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { ILogService, NullLogService } from 'vs/platform/log/common/log';
-import { InMemoryStorageService, IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { LanguageFeaturesService } from 'vs/editor/common/services/languageFeaturesService';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { DeleteLinesAction } from 'vs/editor/contrib/linesOperations/browser/linesOperations';
+import { timeout } from '../../../../../base/common/async.js';
+import { Event } from '../../../../../base/common/event.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { mock } from '../../../../../base/test/common/mock.js';
+import { Range } from '../../../../common/core/range.js';
+import { Selection } from '../../../../common/core/selection.js';
+import { TextModel } from '../../../../common/model/textModel.js';
+import { CompletionItemInsertTextRule, CompletionItemKind } from '../../../../common/languages.js';
+import { IEditorWorkerService } from '../../../../common/services/editorWorker.js';
+import { SnippetController2 } from '../../../snippet/browser/snippetController2.js';
+import { SuggestController } from '../../browser/suggestController.js';
+import { ISuggestMemoryService } from '../../browser/suggestMemory.js';
+import { createTestCodeEditor, ITestCodeEditor } from '../../../../test/browser/testCodeEditor.js';
+import { createTextModel } from '../../../../test/common/testTextModel.js';
+import { IMenu, IMenuService } from '../../../../../platform/actions/common/actions.js';
+import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { MockKeybindingService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { ILabelService } from '../../../../../platform/label/common/label.js';
+import { ILogService, NullLogService } from '../../../../../platform/log/common/log.js';
+import { InMemoryStorageService, IStorageService } from '../../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { NullTelemetryService } from '../../../../../platform/telemetry/common/telemetryUtils.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { LanguageFeaturesService } from '../../../../common/services/languageFeaturesService.js';
+import { ILanguageFeaturesService } from '../../../../common/services/languageFeatures.js';
+import { IEnvironmentService } from '../../../../../platform/environment/common/environment.js';
+import { DeleteLinesAction } from '../../../linesOperations/browser/linesOperations.js';
 
 suite('SuggestController', function () {
 
diff --git a/src/vs/editor/contrib/suggest/test/browser/suggestInlineCompletions.test.ts b/src/vs/editor/contrib/suggest/test/browser/suggestInlineCompletions.test.ts
index 91d42374b1f..ba843af4abb 100644
--- a/src/vs/editor/contrib/suggest/test/browser/suggestInlineCompletions.test.ts
+++ b/src/vs/editor/contrib/suggest/test/browser/suggestInlineCompletions.test.ts
@@ -4,23 +4,23 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { mock } from 'vs/base/test/common/mock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { CompletionContext, CompletionItem, CompletionItemKind, CompletionItemProvider, CompletionList, InlineCompletionTriggerKind, ProviderResult } from 'vs/editor/common/languages';
-import { ITextModel } from 'vs/editor/common/model';
-import { TextModel } from 'vs/editor/common/model/textModel';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { SuggestInlineCompletions } from 'vs/editor/contrib/suggest/browser/suggestInlineCompletions';
-import { ISuggestMemoryService } from 'vs/editor/contrib/suggest/browser/suggestMemory';
-import { createCodeEditorServices, instantiateTestCodeEditor, ITestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { mock } from '../../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Position } from '../../../../common/core/position.js';
+import { Range } from '../../../../common/core/range.js';
+import { CompletionContext, CompletionItem, CompletionItemKind, CompletionItemProvider, CompletionList, InlineCompletionTriggerKind, ProviderResult } from '../../../../common/languages.js';
+import { ITextModel } from '../../../../common/model.js';
+import { TextModel } from '../../../../common/model/textModel.js';
+import { ILanguageFeaturesService } from '../../../../common/services/languageFeatures.js';
+import { SuggestInlineCompletions } from '../../browser/suggestInlineCompletions.js';
+import { ISuggestMemoryService } from '../../browser/suggestMemory.js';
+import { createCodeEditorServices, instantiateTestCodeEditor, ITestCodeEditor } from '../../../../test/browser/testCodeEditor.js';
+import { createTextModel } from '../../../../test/common/testTextModel.js';
+import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
 
 
 suite('Suggest Inline Completions', function () {
diff --git a/src/vs/editor/contrib/suggest/test/browser/suggestMemory.test.ts b/src/vs/editor/contrib/suggest/test/browser/suggestMemory.test.ts
index 57d0d030d48..053a0fa5e99 100644
--- a/src/vs/editor/contrib/suggest/test/browser/suggestMemory.test.ts
+++ b/src/vs/editor/contrib/suggest/test/browser/suggestMemory.test.ts
@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IPosition } from 'vs/editor/common/core/position';
-import { ITextModel } from 'vs/editor/common/model';
-import { CompletionItem } from 'vs/editor/contrib/suggest/browser/suggest';
-import { LRUMemory, Memory, NoMemory, PrefixMemory } from 'vs/editor/contrib/suggest/browser/suggestMemory';
-import { createSuggestItem } from 'vs/editor/contrib/suggest/test/browser/completionModel.test';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IPosition } from '../../../../common/core/position.js';
+import { ITextModel } from '../../../../common/model.js';
+import { CompletionItem } from '../../browser/suggest.js';
+import { LRUMemory, Memory, NoMemory, PrefixMemory } from '../../browser/suggestMemory.js';
+import { createSuggestItem } from './completionModel.test.js';
+import { createTextModel } from '../../../../test/common/testTextModel.js';
 
 suite('SuggestMemories', function () {
 
diff --git a/src/vs/editor/contrib/suggest/test/browser/suggestModel.test.ts b/src/vs/editor/contrib/suggest/test/browser/suggestModel.test.ts
index 5c673c0f355..51d159923bd 100644
--- a/src/vs/editor/contrib/suggest/test/browser/suggestModel.test.ts
+++ b/src/vs/editor/contrib/suggest/test/browser/suggestModel.test.ts
@@ -3,44 +3,44 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { mock } from 'vs/base/test/common/mock';
-import { CoreEditingCommands } from 'vs/editor/browser/coreCommands';
-import { EditOperation } from 'vs/editor/common/core/editOperation';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { Handler } from 'vs/editor/common/editorCommon';
-import { ITextModel } from 'vs/editor/common/model';
-import { TextModel } from 'vs/editor/common/model/textModel';
-import { CompletionItemKind, CompletionItemProvider, CompletionList, CompletionTriggerKind, EncodedTokenizationResult, IState, TokenizationRegistry } from 'vs/editor/common/languages';
-import { MetadataConsts } from 'vs/editor/common/encodedTokenAttributes';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { NullState } from 'vs/editor/common/languages/nullTokenize';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2';
-import { SuggestController } from 'vs/editor/contrib/suggest/browser/suggestController';
-import { ISuggestMemoryService } from 'vs/editor/contrib/suggest/browser/suggestMemory';
-import { LineContext, SuggestModel } from 'vs/editor/contrib/suggest/browser/suggestModel';
-import { ISelectedSuggestion } from 'vs/editor/contrib/suggest/browser/suggestWidget';
-import { createTestCodeEditor, ITestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
-import { createModelServices, createTextModel, instantiateTextModel } from 'vs/editor/test/common/testTextModel';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { MockKeybindingService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { InMemoryStorageService, IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { LanguageFeaturesService } from 'vs/editor/common/services/languageFeaturesService';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { getSnippetSuggestSupport, setSnippetSuggestSupport } from 'vs/editor/contrib/suggest/browser/suggest';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { Event } from '../../../../../base/common/event.js';
+import { Disposable, DisposableStore, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { mock } from '../../../../../base/test/common/mock.js';
+import { CoreEditingCommands } from '../../../../browser/coreCommands.js';
+import { EditOperation } from '../../../../common/core/editOperation.js';
+import { Position } from '../../../../common/core/position.js';
+import { Range } from '../../../../common/core/range.js';
+import { Selection } from '../../../../common/core/selection.js';
+import { Handler } from '../../../../common/editorCommon.js';
+import { ITextModel } from '../../../../common/model.js';
+import { TextModel } from '../../../../common/model/textModel.js';
+import { CompletionItemKind, CompletionItemProvider, CompletionList, CompletionTriggerKind, EncodedTokenizationResult, IState, TokenizationRegistry } from '../../../../common/languages.js';
+import { MetadataConsts } from '../../../../common/encodedTokenAttributes.js';
+import { ILanguageConfigurationService } from '../../../../common/languages/languageConfigurationRegistry.js';
+import { NullState } from '../../../../common/languages/nullTokenize.js';
+import { ILanguageService } from '../../../../common/languages/language.js';
+import { SnippetController2 } from '../../../snippet/browser/snippetController2.js';
+import { SuggestController } from '../../browser/suggestController.js';
+import { ISuggestMemoryService } from '../../browser/suggestMemory.js';
+import { LineContext, SuggestModel } from '../../browser/suggestModel.js';
+import { ISelectedSuggestion } from '../../browser/suggestWidget.js';
+import { createTestCodeEditor, ITestCodeEditor } from '../../../../test/browser/testCodeEditor.js';
+import { createModelServices, createTextModel, instantiateTextModel } from '../../../../test/common/testTextModel.js';
+import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { MockKeybindingService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { ILabelService } from '../../../../../platform/label/common/label.js';
+import { InMemoryStorageService, IStorageService } from '../../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { NullTelemetryService } from '../../../../../platform/telemetry/common/telemetryUtils.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { LanguageFeaturesService } from '../../../../common/services/languageFeaturesService.js';
+import { ILanguageFeaturesService } from '../../../../common/services/languageFeatures.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { getSnippetSuggestSupport, setSnippetSuggestSupport } from '../../browser/suggest.js';
+import { IEnvironmentService } from '../../../../../platform/environment/common/environment.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 
 function createMockEditor(model: TextModel, languageFeaturesService: ILanguageFeaturesService): ITestCodeEditor {
diff --git a/src/vs/editor/contrib/suggest/test/browser/wordDistance.test.ts b/src/vs/editor/contrib/suggest/test/browser/wordDistance.test.ts
index 15f238b1627..0057e3cf389 100644
--- a/src/vs/editor/contrib/suggest/test/browser/wordDistance.test.ts
+++ b/src/vs/editor/contrib/suggest/test/browser/wordDistance.test.ts
@@ -4,29 +4,28 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Event } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { mock } from 'vs/base/test/common/mock';
-import { IPosition } from 'vs/editor/common/core/position';
-import { IRange } from 'vs/editor/common/core/range';
-import { DEFAULT_WORD_REGEXP } from 'vs/editor/common/core/wordHelper';
-import * as languages from 'vs/editor/common/languages';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { EditorSimpleWorker } from 'vs/editor/common/services/editorSimpleWorker';
-import { EditorWorkerService } from 'vs/editor/browser/services/editorWorkerService';
-import { IEditorWorkerHost } from 'vs/editor/common/services/editorWorkerHost';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { CompletionItem } from 'vs/editor/contrib/suggest/browser/suggest';
-import { WordDistance } from 'vs/editor/contrib/suggest/browser/wordDistance';
-import { createCodeEditorServices, instantiateTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
-import { instantiateTextModel } from 'vs/editor/test/common/testTextModel';
-import { TestLanguageConfigurationService } from 'vs/editor/test/common/modes/testLanguageConfigurationService';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { LanguageFeaturesService } from 'vs/editor/common/services/languageFeaturesService';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { Event } from '../../../../../base/common/event.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { mock } from '../../../../../base/test/common/mock.js';
+import { IPosition } from '../../../../common/core/position.js';
+import { IRange } from '../../../../common/core/range.js';
+import { DEFAULT_WORD_REGEXP } from '../../../../common/core/wordHelper.js';
+import * as languages from '../../../../common/languages.js';
+import { ILanguageConfigurationService } from '../../../../common/languages/languageConfigurationRegistry.js';
+import { BaseEditorSimpleWorker } from '../../../../common/services/editorSimpleWorker.js';
+import { EditorWorkerService } from '../../../../browser/services/editorWorkerService.js';
+import { IModelService } from '../../../../common/services/model.js';
+import { ITextResourceConfigurationService } from '../../../../common/services/textResourceConfiguration.js';
+import { CompletionItem } from '../../browser/suggest.js';
+import { WordDistance } from '../../browser/wordDistance.js';
+import { createCodeEditorServices, instantiateTestCodeEditor } from '../../../../test/browser/testCodeEditor.js';
+import { instantiateTextModel } from '../../../../test/common/testTextModel.js';
+import { TestLanguageConfigurationService } from '../../../../test/common/modes/testLanguageConfigurationService.js';
+import { NullLogService } from '../../../../../platform/log/common/log.js';
+import { LanguageFeaturesService } from '../../../../common/services/languageFeaturesService.js';
+import { ILanguageService } from '../../../../common/languages/language.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('suggest, word distance', function () {
 
@@ -63,20 +62,20 @@ suite('suggest, word distance', function () {
 
 		const service = new class extends EditorWorkerService {
 
-			private _worker = new EditorSimpleWorker(new class extends mock<IEditorWorkerHost>() { }, null);
+			private _worker = new BaseEditorSimpleWorker();
 
 			constructor() {
-				super(modelService, new class extends mock<ITextResourceConfigurationService>() { }, new NullLogService(), new TestLanguageConfigurationService(), new LanguageFeaturesService());
-				this._worker.acceptNewModel({
+				super(null!, modelService, new class extends mock<ITextResourceConfigurationService>() { }, new NullLogService(), new TestLanguageConfigurationService(), new LanguageFeaturesService());
+				this._worker.$acceptNewModel({
 					url: model.uri.toString(),
 					lines: model.getLinesContent(),
 					EOL: model.getEOL(),
 					versionId: model.getVersionId()
 				});
-				model.onDidChangeContent(e => this._worker.acceptModelChanged(model.uri.toString(), e));
+				model.onDidChangeContent(e => this._worker.$acceptModelChanged(model.uri.toString(), e));
 			}
 			override computeWordRanges(resource: URI, range: IRange): Promise<{ [word: string]: IRange[] } | null> {
-				return this._worker.computeWordRanges(resource.toString(), range, DEFAULT_WORD_REGEXP.source, DEFAULT_WORD_REGEXP.flags);
+				return this._worker.$computeWordRanges(resource.toString(), range, DEFAULT_WORD_REGEXP.source, DEFAULT_WORD_REGEXP.flags);
 			}
 		};
 
diff --git a/src/vs/editor/contrib/symbolIcons/browser/symbolIcons.ts b/src/vs/editor/contrib/symbolIcons/browser/symbolIcons.ts
index 64ccb1bc618..a2795f7541c 100644
--- a/src/vs/editor/contrib/symbolIcons/browser/symbolIcons.ts
+++ b/src/vs/editor/contrib/symbolIcons/browser/symbolIcons.ts
@@ -3,23 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./symbolIcons';
-import { localize } from 'vs/nls';
-import { foreground, registerColor } from 'vs/platform/theme/common/colorRegistry';
+import './symbolIcons.css';
+import { localize } from '../../../../nls.js';
+import { foreground, registerColor } from '../../../../platform/theme/common/colorRegistry.js';
 
-export const SYMBOL_ICON_ARRAY_FOREGROUND = registerColor('symbolIcon.arrayForeground', {
-	dark: foreground,
-	light: foreground,
-	hcDark: foreground,
-	hcLight: foreground,
-}, localize('symbolIcon.arrayForeground', 'The foreground color for array symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+export const SYMBOL_ICON_ARRAY_FOREGROUND = registerColor('symbolIcon.arrayForeground', foreground, localize('symbolIcon.arrayForeground', 'The foreground color for array symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
 
-export const SYMBOL_ICON_BOOLEAN_FOREGROUND = registerColor('symbolIcon.booleanForeground', {
-	dark: foreground,
-	light: foreground,
-	hcDark: foreground,
-	hcLight: foreground,
-}, localize('symbolIcon.booleanForeground', 'The foreground color for boolean symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+export const SYMBOL_ICON_BOOLEAN_FOREGROUND = registerColor('symbolIcon.booleanForeground', foreground, localize('symbolIcon.booleanForeground', 'The foreground color for boolean symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
 
 export const SYMBOL_ICON_CLASS_FOREGROUND = registerColor('symbolIcon.classForeground', {
 	dark: '#EE9D28',
@@ -28,19 +18,9 @@ export const SYMBOL_ICON_CLASS_FOREGROUND = registerColor('symbolIcon.classForeg
 	hcLight: '#D67E00'
 }, localize('symbolIcon.classForeground', 'The foreground color for class symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
 
-export const SYMBOL_ICON_COLOR_FOREGROUND = registerColor('symbolIcon.colorForeground', {
-	dark: foreground,
-	light: foreground,
-	hcDark: foreground,
-	hcLight: foreground
-}, localize('symbolIcon.colorForeground', 'The foreground color for color symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+export const SYMBOL_ICON_COLOR_FOREGROUND = registerColor('symbolIcon.colorForeground', foreground, localize('symbolIcon.colorForeground', 'The foreground color for color symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
 
-export const SYMBOL_ICON_CONSTANT_FOREGROUND = registerColor('symbolIcon.constantForeground', {
-	dark: foreground,
-	light: foreground,
-	hcDark: foreground,
-	hcLight: foreground
-}, localize('symbolIcon.constantForeground', 'The foreground color for constant symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+export const SYMBOL_ICON_CONSTANT_FOREGROUND = registerColor('symbolIcon.constantForeground', foreground, localize('symbolIcon.constantForeground', 'The foreground color for constant symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
 
 export const SYMBOL_ICON_CONSTRUCTOR_FOREGROUND = registerColor('symbolIcon.constructorForeground', {
 	dark: '#B180D7',
@@ -77,19 +57,9 @@ export const SYMBOL_ICON_FIELD_FOREGROUND = registerColor('symbolIcon.fieldForeg
 	hcLight: '#007ACC'
 }, localize('symbolIcon.fieldForeground', 'The foreground color for field symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
 
-export const SYMBOL_ICON_FILE_FOREGROUND = registerColor('symbolIcon.fileForeground', {
-	dark: foreground,
-	light: foreground,
-	hcDark: foreground,
-	hcLight: foreground
-}, localize('symbolIcon.fileForeground', 'The foreground color for file symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+export const SYMBOL_ICON_FILE_FOREGROUND = registerColor('symbolIcon.fileForeground', foreground, localize('symbolIcon.fileForeground', 'The foreground color for file symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
 
-export const SYMBOL_ICON_FOLDER_FOREGROUND = registerColor('symbolIcon.folderForeground', {
-	dark: foreground,
-	light: foreground,
-	hcDark: foreground,
-	hcLight: foreground
-}, localize('symbolIcon.folderForeground', 'The foreground color for folder symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+export const SYMBOL_ICON_FOLDER_FOREGROUND = registerColor('symbolIcon.folderForeground', foreground, localize('symbolIcon.folderForeground', 'The foreground color for folder symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
 
 export const SYMBOL_ICON_FUNCTION_FOREGROUND = registerColor('symbolIcon.functionForeground', {
 	dark: '#B180D7',
@@ -105,19 +75,9 @@ export const SYMBOL_ICON_INTERFACE_FOREGROUND = registerColor('symbolIcon.interf
 	hcLight: '#007ACC'
 }, localize('symbolIcon.interfaceForeground', 'The foreground color for interface symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
 
-export const SYMBOL_ICON_KEY_FOREGROUND = registerColor('symbolIcon.keyForeground', {
-	dark: foreground,
-	light: foreground,
-	hcDark: foreground,
-	hcLight: foreground
-}, localize('symbolIcon.keyForeground', 'The foreground color for key symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+export const SYMBOL_ICON_KEY_FOREGROUND = registerColor('symbolIcon.keyForeground', foreground, localize('symbolIcon.keyForeground', 'The foreground color for key symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
 
-export const SYMBOL_ICON_KEYWORD_FOREGROUND = registerColor('symbolIcon.keywordForeground', {
-	dark: foreground,
-	light: foreground,
-	hcDark: foreground,
-	hcLight: foreground
-}, localize('symbolIcon.keywordForeground', 'The foreground color for keyword symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+export const SYMBOL_ICON_KEYWORD_FOREGROUND = registerColor('symbolIcon.keywordForeground', foreground, localize('symbolIcon.keywordForeground', 'The foreground color for keyword symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
 
 export const SYMBOL_ICON_METHOD_FOREGROUND = registerColor('symbolIcon.methodForeground', {
 	dark: '#B180D7',
@@ -126,110 +86,35 @@ export const SYMBOL_ICON_METHOD_FOREGROUND = registerColor('symbolIcon.methodFor
 	hcLight: '#652D90'
 }, localize('symbolIcon.methodForeground', 'The foreground color for method symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
 
-export const SYMBOL_ICON_MODULE_FOREGROUND = registerColor('symbolIcon.moduleForeground', {
-	dark: foreground,
-	light: foreground,
-	hcDark: foreground,
-	hcLight: foreground
-}, localize('symbolIcon.moduleForeground', 'The foreground color for module symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+export const SYMBOL_ICON_MODULE_FOREGROUND = registerColor('symbolIcon.moduleForeground', foreground, localize('symbolIcon.moduleForeground', 'The foreground color for module symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
 
-export const SYMBOL_ICON_NAMESPACE_FOREGROUND = registerColor('symbolIcon.namespaceForeground', {
-	dark: foreground,
-	light: foreground,
-	hcDark: foreground,
-	hcLight: foreground
-}, localize('symbolIcon.namespaceForeground', 'The foreground color for namespace symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+export const SYMBOL_ICON_NAMESPACE_FOREGROUND = registerColor('symbolIcon.namespaceForeground', foreground, localize('symbolIcon.namespaceForeground', 'The foreground color for namespace symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
 
-export const SYMBOL_ICON_NULL_FOREGROUND = registerColor('symbolIcon.nullForeground', {
-	dark: foreground,
-	light: foreground,
-	hcDark: foreground,
-	hcLight: foreground
-}, localize('symbolIcon.nullForeground', 'The foreground color for null symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+export const SYMBOL_ICON_NULL_FOREGROUND = registerColor('symbolIcon.nullForeground', foreground, localize('symbolIcon.nullForeground', 'The foreground color for null symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
 
-export const SYMBOL_ICON_NUMBER_FOREGROUND = registerColor('symbolIcon.numberForeground', {
-	dark: foreground,
-	light: foreground,
-	hcDark: foreground,
-	hcLight: foreground
-}, localize('symbolIcon.numberForeground', 'The foreground color for number symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+export const SYMBOL_ICON_NUMBER_FOREGROUND = registerColor('symbolIcon.numberForeground', foreground, localize('symbolIcon.numberForeground', 'The foreground color for number symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
 
-export const SYMBOL_ICON_OBJECT_FOREGROUND = registerColor('symbolIcon.objectForeground', {
-	dark: foreground,
-	light: foreground,
-	hcDark: foreground,
-	hcLight: foreground
-}, localize('symbolIcon.objectForeground', 'The foreground color for object symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+export const SYMBOL_ICON_OBJECT_FOREGROUND = registerColor('symbolIcon.objectForeground', foreground, localize('symbolIcon.objectForeground', 'The foreground color for object symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
 
-export const SYMBOL_ICON_OPERATOR_FOREGROUND = registerColor('symbolIcon.operatorForeground', {
-	dark: foreground,
-	light: foreground,
-	hcDark: foreground,
-	hcLight: foreground
-}, localize('symbolIcon.operatorForeground', 'The foreground color for operator symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+export const SYMBOL_ICON_OPERATOR_FOREGROUND = registerColor('symbolIcon.operatorForeground', foreground, localize('symbolIcon.operatorForeground', 'The foreground color for operator symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
 
-export const SYMBOL_ICON_PACKAGE_FOREGROUND = registerColor('symbolIcon.packageForeground', {
-	dark: foreground,
-	light: foreground,
-	hcDark: foreground,
-	hcLight: foreground
-}, localize('symbolIcon.packageForeground', 'The foreground color for package symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+export const SYMBOL_ICON_PACKAGE_FOREGROUND = registerColor('symbolIcon.packageForeground', foreground, localize('symbolIcon.packageForeground', 'The foreground color for package symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
 
-export const SYMBOL_ICON_PROPERTY_FOREGROUND = registerColor('symbolIcon.propertyForeground', {
-	dark: foreground,
-	light: foreground,
-	hcDark: foreground,
-	hcLight: foreground
-}, localize('symbolIcon.propertyForeground', 'The foreground color for property symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+export const SYMBOL_ICON_PROPERTY_FOREGROUND = registerColor('symbolIcon.propertyForeground', foreground, localize('symbolIcon.propertyForeground', 'The foreground color for property symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
 
-export const SYMBOL_ICON_REFERENCE_FOREGROUND = registerColor('symbolIcon.referenceForeground', {
-	dark: foreground,
-	light: foreground,
-	hcDark: foreground,
-	hcLight: foreground
-}, localize('symbolIcon.referenceForeground', 'The foreground color for reference symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+export const SYMBOL_ICON_REFERENCE_FOREGROUND = registerColor('symbolIcon.referenceForeground', foreground, localize('symbolIcon.referenceForeground', 'The foreground color for reference symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
 
-export const SYMBOL_ICON_SNIPPET_FOREGROUND = registerColor('symbolIcon.snippetForeground', {
-	dark: foreground,
-	light: foreground,
-	hcDark: foreground,
-	hcLight: foreground
-}, localize('symbolIcon.snippetForeground', 'The foreground color for snippet symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+export const SYMBOL_ICON_SNIPPET_FOREGROUND = registerColor('symbolIcon.snippetForeground', foreground, localize('symbolIcon.snippetForeground', 'The foreground color for snippet symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
 
-export const SYMBOL_ICON_STRING_FOREGROUND = registerColor('symbolIcon.stringForeground', {
-	dark: foreground,
-	light: foreground,
-	hcDark: foreground,
-	hcLight: foreground
-}, localize('symbolIcon.stringForeground', 'The foreground color for string symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+export const SYMBOL_ICON_STRING_FOREGROUND = registerColor('symbolIcon.stringForeground', foreground, localize('symbolIcon.stringForeground', 'The foreground color for string symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
 
-export const SYMBOL_ICON_STRUCT_FOREGROUND = registerColor('symbolIcon.structForeground', {
-	dark: foreground,
-	light: foreground,
-	hcDark: foreground,
-	hcLight: foreground,
-}, localize('symbolIcon.structForeground', 'The foreground color for struct symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+export const SYMBOL_ICON_STRUCT_FOREGROUND = registerColor('symbolIcon.structForeground', foreground, localize('symbolIcon.structForeground', 'The foreground color for struct symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
 
-export const SYMBOL_ICON_TEXT_FOREGROUND = registerColor('symbolIcon.textForeground', {
-	dark: foreground,
-	light: foreground,
-	hcDark: foreground,
-	hcLight: foreground
-}, localize('symbolIcon.textForeground', 'The foreground color for text symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+export const SYMBOL_ICON_TEXT_FOREGROUND = registerColor('symbolIcon.textForeground', foreground, localize('symbolIcon.textForeground', 'The foreground color for text symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
 
-export const SYMBOL_ICON_TYPEPARAMETER_FOREGROUND = registerColor('symbolIcon.typeParameterForeground', {
-	dark: foreground,
-	light: foreground,
-	hcDark: foreground,
-	hcLight: foreground
-}, localize('symbolIcon.typeParameterForeground', 'The foreground color for type parameter symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+export const SYMBOL_ICON_TYPEPARAMETER_FOREGROUND = registerColor('symbolIcon.typeParameterForeground', foreground, localize('symbolIcon.typeParameterForeground', 'The foreground color for type parameter symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
 
-export const SYMBOL_ICON_UNIT_FOREGROUND = registerColor('symbolIcon.unitForeground', {
-	dark: foreground,
-	light: foreground,
-	hcDark: foreground,
-	hcLight: foreground
-}, localize('symbolIcon.unitForeground', 'The foreground color for unit symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+export const SYMBOL_ICON_UNIT_FOREGROUND = registerColor('symbolIcon.unitForeground', foreground, localize('symbolIcon.unitForeground', 'The foreground color for unit symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
 
 export const SYMBOL_ICON_VARIABLE_FOREGROUND = registerColor('symbolIcon.variableForeground', {
 	dark: '#75BEFF',
diff --git a/src/vs/editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode.ts b/src/vs/editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode.ts
index 7578cd62f8e..a200bf817eb 100644
--- a/src/vs/editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode.ts
+++ b/src/vs/editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { alert } from 'vs/base/browser/ui/aria/aria';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { TabFocus } from 'vs/editor/browser/config/tabFocus';
-import * as nls from 'vs/nls';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { alert } from '../../../../base/browser/ui/aria/aria.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { TabFocus } from '../../../browser/config/tabFocus.js';
+import * as nls from '../../../../nls.js';
+import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 
 export class ToggleTabFocusModeAction extends Action2 {
 
diff --git a/src/vs/editor/contrib/tokenization/browser/tokenization.ts b/src/vs/editor/contrib/tokenization/browser/tokenization.ts
index 800f950ad29..ba16ce46091 100644
--- a/src/vs/editor/contrib/tokenization/browser/tokenization.ts
+++ b/src/vs/editor/contrib/tokenization/browser/tokenization.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, registerEditorAction, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import * as nls from 'vs/nls';
+import { StopWatch } from '../../../../base/common/stopwatch.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorAction, registerEditorAction, ServicesAccessor } from '../../../browser/editorExtensions.js';
+import * as nls from '../../../../nls.js';
 
 class ForceRetokenizeAction extends EditorAction {
 	constructor() {
diff --git a/src/vs/editor/contrib/unicodeHighlighter/browser/bannerController.ts b/src/vs/editor/contrib/unicodeHighlighter/browser/bannerController.ts
index b5a54c49f20..d96488677d9 100644
--- a/src/vs/editor/contrib/unicodeHighlighter/browser/bannerController.ts
+++ b/src/vs/editor/contrib/unicodeHighlighter/browser/bannerController.ts
@@ -2,18 +2,18 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import 'vs/css!./bannerController';
-import { $, append, clearNode } from 'vs/base/browser/dom';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { Action } from 'vs/base/common/actions';
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { MarkdownRenderer } from 'vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILinkDescriptor, Link } from 'vs/platform/opener/browser/link';
-import { widgetClose } from 'vs/platform/theme/common/iconRegistry';
-import { ThemeIcon } from 'vs/base/common/themables';
+import './bannerController.css';
+import { $, append, clearNode } from '../../../../base/browser/dom.js';
+import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { Action } from '../../../../base/common/actions.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { MarkdownRenderer } from '../../../browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILinkDescriptor, Link } from '../../../../platform/opener/browser/link.js';
+import { widgetClose } from '../../../../platform/theme/common/iconRegistry.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
 
 const BANNER_ELEMENT_HEIGHT = 26;
 
diff --git a/src/vs/editor/contrib/unicodeHighlighter/browser/unicodeHighlighter.ts b/src/vs/editor/contrib/unicodeHighlighter/browser/unicodeHighlighter.ts
index f44fc76e0bd..d3747c2cdeb 100644
--- a/src/vs/editor/contrib/unicodeHighlighter/browser/unicodeHighlighter.ts
+++ b/src/vs/editor/contrib/unicodeHighlighter/browser/unicodeHighlighter.ts
@@ -3,35 +3,35 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { CharCode } from 'vs/base/common/charCode';
-import { Codicon } from 'vs/base/common/codicons';
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import * as platform from 'vs/base/common/platform';
-import { InvisibleCharacters, isBasicASCII } from 'vs/base/common/strings';
-import 'vs/css!./unicodeHighlighter';
-import { IActiveCodeEditor, ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, EditorContributionInstantiation, registerEditorAction, registerEditorContribution, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { InUntrustedWorkspace, inUntrustedWorkspace, EditorOption, InternalUnicodeHighlightOptions, unicodeHighlightConfigKeys } from 'vs/editor/common/config/editorOptions';
-import { Range } from 'vs/editor/common/core/range';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { IModelDecoration, IModelDeltaDecoration, ITextModel, TrackedRangeStickiness } from 'vs/editor/common/model';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { UnicodeHighlighterOptions, UnicodeHighlighterReason, UnicodeHighlighterReasonKind, UnicodeTextModelHighlighter } from 'vs/editor/common/services/unicodeTextModelHighlighter';
-import { IEditorWorkerService, IUnicodeHighlightsResult } from 'vs/editor/common/services/editorWorker';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { isModelDecorationInComment, isModelDecorationInString, isModelDecorationVisible } from 'vs/editor/common/viewModel/viewModelDecorations';
-import { HoverAnchor, HoverAnchorType, HoverParticipantRegistry, IEditorHoverParticipant, IEditorHoverRenderContext, IHoverPart } from 'vs/editor/contrib/hover/browser/hoverTypes';
-import { MarkdownHover, renderMarkdownHovers } from 'vs/editor/contrib/hover/browser/markdownHoverParticipant';
-import { BannerController } from 'vs/editor/contrib/unicodeHighlighter/browser/bannerController';
-import * as nls from 'vs/nls';
-import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { IWorkspaceTrustManagementService } from 'vs/platform/workspace/common/workspaceTrust';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { CharCode } from '../../../../base/common/charCode.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import * as platform from '../../../../base/common/platform.js';
+import { InvisibleCharacters, isBasicASCII } from '../../../../base/common/strings.js';
+import './unicodeHighlighter.css';
+import { IActiveCodeEditor, ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorAction, EditorContributionInstantiation, registerEditorAction, registerEditorContribution, ServicesAccessor } from '../../../browser/editorExtensions.js';
+import { InUntrustedWorkspace, inUntrustedWorkspace, EditorOption, InternalUnicodeHighlightOptions, unicodeHighlightConfigKeys } from '../../../common/config/editorOptions.js';
+import { Range } from '../../../common/core/range.js';
+import { IEditorContribution } from '../../../common/editorCommon.js';
+import { IModelDecoration, IModelDeltaDecoration, ITextModel, TrackedRangeStickiness } from '../../../common/model.js';
+import { ModelDecorationOptions } from '../../../common/model/textModel.js';
+import { UnicodeHighlighterOptions, UnicodeHighlighterReason, UnicodeHighlighterReasonKind, UnicodeTextModelHighlighter } from '../../../common/services/unicodeTextModelHighlighter.js';
+import { IEditorWorkerService, IUnicodeHighlightsResult } from '../../../common/services/editorWorker.js';
+import { ILanguageService } from '../../../common/languages/language.js';
+import { isModelDecorationInComment, isModelDecorationInString, isModelDecorationVisible } from '../../../common/viewModel/viewModelDecorations.js';
+import { HoverAnchor, HoverAnchorType, HoverParticipantRegistry, IEditorHoverParticipant, IEditorHoverRenderContext, IHoverPart, IRenderedHoverParts } from '../../hover/browser/hoverTypes.js';
+import { MarkdownHover, renderMarkdownHovers } from '../../hover/browser/markdownHoverParticipant.js';
+import { BannerController } from './bannerController.js';
+import * as nls from '../../../../nls.js';
+import { ConfigurationTarget, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IQuickInputService, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { IWorkspaceTrustManagementService } from '../../../../platform/workspace/common/workspaceTrust.js';
 
 export const warningIcon = registerIcon('extensions-warning-message', Codicon.warning, nls.localize('warningIcon', 'Icon shown with a warning message in the extensions editor.'));
 
@@ -506,9 +506,13 @@ export class UnicodeHighlighterHoverParticipant implements IEditorHoverParticipa
 		return result;
 	}
 
-	public renderHoverParts(context: IEditorHoverRenderContext, hoverParts: MarkdownHover[]): IDisposable {
+	public renderHoverParts(context: IEditorHoverRenderContext, hoverParts: MarkdownHover[]): IRenderedHoverParts<MarkdownHover> {
 		return renderMarkdownHovers(context, hoverParts, this._editor, this._languageService, this._openerService);
 	}
+
+	public getAccessibleContent(hoverPart: MarkdownHover): string {
+		return hoverPart.contents.map(c => c.value).join('\n');
+	}
 }
 
 function codePointToHex(codePoint: number): string {
diff --git a/src/vs/editor/contrib/unusualLineTerminators/browser/unusualLineTerminators.ts b/src/vs/editor/contrib/unusualLineTerminators/browser/unusualLineTerminators.ts
index 98818af898c..e4a24035103 100644
--- a/src/vs/editor/contrib/unusualLineTerminators/browser/unusualLineTerminators.ts
+++ b/src/vs/editor/contrib/unusualLineTerminators/browser/unusualLineTerminators.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { basename } from 'vs/base/common/resources';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { ITextModel } from 'vs/editor/common/model';
-import * as nls from 'vs/nls';
-import { IConfirmationResult, IDialogService } from 'vs/platform/dialogs/common/dialogs';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { basename } from '../../../../base/common/resources.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorContributionInstantiation, registerEditorContribution } from '../../../browser/editorExtensions.js';
+import { ICodeEditorService } from '../../../browser/services/codeEditorService.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { IEditorContribution } from '../../../common/editorCommon.js';
+import { ITextModel } from '../../../common/model.js';
+import * as nls from '../../../../nls.js';
+import { IConfirmationResult, IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 
 const ignoreUnusualLineTerminators = 'ignoreUnusualLineTerminators';
 
diff --git a/src/vs/editor/contrib/wordHighlighter/browser/highlightDecorations.ts b/src/vs/editor/contrib/wordHighlighter/browser/highlightDecorations.ts
index b3825b0f05d..67744514340 100644
--- a/src/vs/editor/contrib/wordHighlighter/browser/highlightDecorations.ts
+++ b/src/vs/editor/contrib/wordHighlighter/browser/highlightDecorations.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./highlightDecorations';
-import { MinimapPosition, OverviewRulerLane, TrackedRangeStickiness } from 'vs/editor/common/model';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { DocumentHighlightKind } from 'vs/editor/common/languages';
-import * as nls from 'vs/nls';
-import { activeContrastBorder, editorSelectionHighlight, minimapSelectionOccurrenceHighlight, overviewRulerSelectionHighlightForeground, registerColor } from 'vs/platform/theme/common/colorRegistry';
-import { registerThemingParticipant, themeColorFromId } from 'vs/platform/theme/common/themeService';
+import './highlightDecorations.css';
+import { MinimapPosition, OverviewRulerLane, TrackedRangeStickiness } from '../../../common/model.js';
+import { ModelDecorationOptions } from '../../../common/model/textModel.js';
+import { DocumentHighlightKind } from '../../../common/languages.js';
+import * as nls from '../../../../nls.js';
+import { activeContrastBorder, editorSelectionHighlight, minimapSelectionOccurrenceHighlight, overviewRulerSelectionHighlightForeground, registerColor } from '../../../../platform/theme/common/colorRegistry.js';
+import { registerThemingParticipant, themeColorFromId } from '../../../../platform/theme/common/themeService.js';
 
 const wordHighlightBackground = registerColor('editor.wordHighlightBackground', { dark: '#575757B8', light: '#57575740', hcDark: null, hcLight: null }, nls.localize('wordHighlight', 'Background color of a symbol during read-access, like reading a variable. The color must not be opaque so as not to hide underlying decorations.'), true);
 registerColor('editor.wordHighlightStrongBackground', { dark: '#004972B8', light: '#0e639c40', hcDark: null, hcLight: null }, nls.localize('wordHighlightStrong', 'Background color of a symbol during write-access, like writing to a variable. The color must not be opaque so as not to hide underlying decorations.'), true);
-registerColor('editor.wordHighlightTextBackground', { light: wordHighlightBackground, dark: wordHighlightBackground, hcDark: wordHighlightBackground, hcLight: wordHighlightBackground }, nls.localize('wordHighlightText', 'Background color of a textual occurrence for a symbol. The color must not be opaque so as not to hide underlying decorations.'), true);
+registerColor('editor.wordHighlightTextBackground', wordHighlightBackground, nls.localize('wordHighlightText', 'Background color of a textual occurrence for a symbol. The color must not be opaque so as not to hide underlying decorations.'), true);
 const wordHighlightBorder = registerColor('editor.wordHighlightBorder', { light: null, dark: null, hcDark: activeContrastBorder, hcLight: activeContrastBorder }, nls.localize('wordHighlightBorder', 'Border color of a symbol during read-access, like reading a variable.'));
 registerColor('editor.wordHighlightStrongBorder', { light: null, dark: null, hcDark: activeContrastBorder, hcLight: activeContrastBorder }, nls.localize('wordHighlightStrongBorder', 'Border color of a symbol during write-access, like writing to a variable.'));
-registerColor('editor.wordHighlightTextBorder', { light: wordHighlightBorder, dark: wordHighlightBorder, hcDark: wordHighlightBorder, hcLight: wordHighlightBorder }, nls.localize('wordHighlightTextBorder', "Border color of a textual occurrence for a symbol."));
-const overviewRulerWordHighlightForeground = registerColor('editorOverviewRuler.wordHighlightForeground', { dark: '#A0A0A0CC', light: '#A0A0A0CC', hcDark: '#A0A0A0CC', hcLight: '#A0A0A0CC' }, nls.localize('overviewRulerWordHighlightForeground', 'Overview ruler marker color for symbol highlights. The color must not be opaque so as not to hide underlying decorations.'), true);
-const overviewRulerWordHighlightStrongForeground = registerColor('editorOverviewRuler.wordHighlightStrongForeground', { dark: '#C0A0C0CC', light: '#C0A0C0CC', hcDark: '#C0A0C0CC', hcLight: '#C0A0C0CC' }, nls.localize('overviewRulerWordHighlightStrongForeground', 'Overview ruler marker color for write-access symbol highlights. The color must not be opaque so as not to hide underlying decorations.'), true);
-const overviewRulerWordHighlightTextForeground = registerColor('editorOverviewRuler.wordHighlightTextForeground', { dark: overviewRulerSelectionHighlightForeground, light: overviewRulerSelectionHighlightForeground, hcDark: overviewRulerSelectionHighlightForeground, hcLight: overviewRulerSelectionHighlightForeground }, nls.localize('overviewRulerWordHighlightTextForeground', 'Overview ruler marker color of a textual occurrence for a symbol. The color must not be opaque so as not to hide underlying decorations.'), true);
+registerColor('editor.wordHighlightTextBorder', wordHighlightBorder, nls.localize('wordHighlightTextBorder', "Border color of a textual occurrence for a symbol."));
+const overviewRulerWordHighlightForeground = registerColor('editorOverviewRuler.wordHighlightForeground', '#A0A0A0CC', nls.localize('overviewRulerWordHighlightForeground', 'Overview ruler marker color for symbol highlights. The color must not be opaque so as not to hide underlying decorations.'), true);
+const overviewRulerWordHighlightStrongForeground = registerColor('editorOverviewRuler.wordHighlightStrongForeground', '#C0A0C0CC', nls.localize('overviewRulerWordHighlightStrongForeground', 'Overview ruler marker color for write-access symbol highlights. The color must not be opaque so as not to hide underlying decorations.'), true);
+const overviewRulerWordHighlightTextForeground = registerColor('editorOverviewRuler.wordHighlightTextForeground', overviewRulerSelectionHighlightForeground, nls.localize('overviewRulerWordHighlightTextForeground', 'Overview ruler marker color of a textual occurrence for a symbol. The color must not be opaque so as not to hide underlying decorations.'), true);
 
 const _WRITE_OPTIONS = ModelDecorationOptions.register({
 	description: 'word-highlight-strong',
diff --git a/src/vs/editor/contrib/wordHighlighter/browser/textualHighlightProvider.ts b/src/vs/editor/contrib/wordHighlighter/browser/textualHighlightProvider.ts
index 1d7a65695d3..075b2d6c41b 100644
--- a/src/vs/editor/contrib/wordHighlighter/browser/textualHighlightProvider.ts
+++ b/src/vs/editor/contrib/wordHighlighter/browser/textualHighlightProvider.ts
@@ -3,21 +3,44 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { USUAL_WORD_SEPARATORS } from 'vs/editor/common/core/wordHelper';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { DocumentHighlight, DocumentHighlightKind, MultiDocumentHighlightProvider, ProviderResult } from 'vs/editor/common/languages';
-import { ITextModel } from 'vs/editor/common/model';
-import { Position } from 'vs/editor/common/core/position';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ResourceMap } from 'vs/base/common/map';
-import { LanguageFilter } from 'vs/editor/common/languageSelector';
+import { USUAL_WORD_SEPARATORS } from '../../../common/core/wordHelper.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { DocumentHighlight, DocumentHighlightKind, DocumentHighlightProvider, MultiDocumentHighlightProvider, ProviderResult } from '../../../common/languages.js';
+import { ITextModel } from '../../../common/model.js';
+import { Position } from '../../../common/core/position.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { LanguageFilter } from '../../../common/languageSelector.js';
 
 
-class TextualDocumentHighlightProvider implements MultiDocumentHighlightProvider {
+class TextualDocumentHighlightProvider implements DocumentHighlightProvider, MultiDocumentHighlightProvider {
 
 	selector: LanguageFilter = { language: '*' };
 
+	provideDocumentHighlights(model: ITextModel, position: Position, token: CancellationToken): ProviderResult<DocumentHighlight[]> {
+		const result: DocumentHighlight[] = [];
+
+		const word = model.getWordAtPosition({
+			lineNumber: position.lineNumber,
+			column: position.column
+		});
+
+		if (!word) {
+			return Promise.resolve(result);
+		}
+
+		if (model.isDisposed()) {
+			return;
+		}
+
+		const matches = model.findMatches(word.word, true, false, true, USUAL_WORD_SEPARATORS, false);
+		return matches.map(m => ({
+			range: m.range,
+			kind: DocumentHighlightKind.Text
+		}));
+	}
+
 	provideMultiDocumentHighlights(primaryModel: ITextModel, position: Position, otherModels: ITextModel[], token: CancellationToken): ProviderResult<ResourceMap<DocumentHighlight[]>> {
 
 		const result = new ResourceMap<DocumentHighlight[]>();
@@ -57,7 +80,7 @@ export class TextualMultiDocumentHighlightFeature extends Disposable {
 		@ILanguageFeaturesService languageFeaturesService: ILanguageFeaturesService,
 	) {
 		super();
-
+		this._register(languageFeaturesService.documentHighlightProvider.register('*', new TextualDocumentHighlightProvider()));
 		this._register(languageFeaturesService.multiDocumentHighlightProvider.register('*', new TextualDocumentHighlightProvider()));
 	}
 }
diff --git a/src/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.ts b/src/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.ts
index cae43742902..f052aac9c10 100644
--- a/src/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.ts
+++ b/src/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.ts
@@ -3,38 +3,40 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import * as arrays from 'vs/base/common/arrays';
-import { alert } from 'vs/base/browser/ui/aria/aria';
-import { CancelablePromise, createCancelablePromise, first, timeout } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { onUnexpectedError, onUnexpectedExternalError } from 'vs/base/common/errors';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { IActiveCodeEditor, ICodeEditor, isDiffEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, EditorContributionInstantiation, IActionOptions, registerEditorAction, registerEditorContribution, registerModelAndPositionCommand } from 'vs/editor/browser/editorExtensions';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { IWordAtPosition } from 'vs/editor/common/core/wordHelper';
-import { CursorChangeReason, ICursorPositionChangedEvent } from 'vs/editor/common/cursorEvents';
-import { IDiffEditor, IEditorContribution, IEditorDecorationsCollection } from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import { DocumentHighlight, DocumentHighlightKind, DocumentHighlightProvider, MultiDocumentHighlightProvider } from 'vs/editor/common/languages';
-import { IModelDeltaDecoration, ITextModel, shouldSynchronizeModel } from 'vs/editor/common/model';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { getHighlightDecorationOptions } from 'vs/editor/contrib/wordHighlighter/browser/highlightDecorations';
-import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { Schemas } from 'vs/base/common/network';
-import { ResourceMap } from 'vs/base/common/map';
-import { score } from 'vs/editor/common/languageSelector';
-// import { TextualMultiDocumentHighlightFeature } from 'vs/editor/contrib/wordHighlighter/browser/textualHighlightProvider';
-// import { registerEditorFeature } from 'vs/editor/common/editorFeatures';
+import * as nls from '../../../../nls.js';
+import { alert } from '../../../../base/browser/ui/aria/aria.js';
+import { CancelablePromise, createCancelablePromise, Delayer, first } from '../../../../base/common/async.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { onUnexpectedError, onUnexpectedExternalError } from '../../../../base/common/errors.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { matchesScheme, Schemas } from '../../../../base/common/network.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IActiveCodeEditor, ICodeEditor, isDiffEditor } from '../../../browser/editorBrowser.js';
+import { EditorAction, EditorContributionInstantiation, IActionOptions, registerEditorAction, registerEditorContribution, registerModelAndPositionCommand } from '../../../browser/editorExtensions.js';
+import { ICodeEditorService } from '../../../browser/services/codeEditorService.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { Selection } from '../../../common/core/selection.js';
+import { IWordAtPosition } from '../../../common/core/wordHelper.js';
+import { CursorChangeReason, ICursorPositionChangedEvent } from '../../../common/cursorEvents.js';
+import { IDiffEditor, IEditorContribution, IEditorDecorationsCollection } from '../../../common/editorCommon.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { registerEditorFeature } from '../../../common/editorFeatures.js';
+import { LanguageFeatureRegistry } from '../../../common/languageFeatureRegistry.js';
+import { DocumentHighlight, DocumentHighlightProvider, MultiDocumentHighlightProvider } from '../../../common/languages.js';
+import { score } from '../../../common/languageSelector.js';
+import { IModelDeltaDecoration, ITextModel, shouldSynchronizeModel } from '../../../common/model.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { ITextModelService } from '../../../common/services/resolverService.js';
+import { getHighlightDecorationOptions } from './highlightDecorations.js';
+import { TextualMultiDocumentHighlightFeature } from './textualHighlightProvider.js';
 
 const ctxHasWordHighlights = new RawContextKey<boolean>('hasWordHighlights', false);
 
@@ -43,11 +45,12 @@ export function getOccurrencesAtPosition(registry: LanguageFeatureRegistry<Docum
 
 	// in order of score ask the occurrences provider
 	// until someone response with a good result
-	// (good = none empty array)
+	// (good = non undefined and non null value)
+	// (result of size == 0 is valid, no highlights is a valid/expected result -- not a signal to fall back to other providers)
 	return first<DocumentHighlight[] | null | undefined>(orderedByScore.map(provider => () => {
 		return Promise.resolve(provider.provideDocumentHighlights(model, position, token))
 			.then(undefined, onUnexpectedExternalError);
-	}), arrays.isNonEmptyArray).then(result => {
+	}), (result): result is DocumentHighlight[] => result !== undefined && result !== null).then(result => {
 		if (result) {
 			const map = new ResourceMap<DocumentHighlight[]>();
 			map.set(model.uri, result);
@@ -57,22 +60,22 @@ export function getOccurrencesAtPosition(registry: LanguageFeatureRegistry<Docum
 	});
 }
 
-export function getOccurrencesAcrossMultipleModels(registry: LanguageFeatureRegistry<MultiDocumentHighlightProvider>, model: ITextModel, position: Position, wordSeparators: string, token: CancellationToken, otherModels: ITextModel[]): Promise<ResourceMap<DocumentHighlight[]> | null | undefined> {
+export function getOccurrencesAcrossMultipleModels(registry: LanguageFeatureRegistry<MultiDocumentHighlightProvider>, model: ITextModel, position: Position, token: CancellationToken, otherModels: ITextModel[]): Promise<ResourceMap<DocumentHighlight[]> | null | undefined> {
 	const orderedByScore = registry.ordered(model);
 
 	// in order of score ask the occurrences provider
 	// until someone response with a good result
-	// (good = none empty array)
+	// (good = non undefined and non null ResourceMap)
+	// (result of size == 0 is valid, no highlights is a valid/expected result -- not a signal to fall back to other providers)
 	return first<ResourceMap<DocumentHighlight[]> | null | undefined>(orderedByScore.map(provider => () => {
 		const filteredModels = otherModels.filter(otherModel => {
 			return shouldSynchronizeModel(otherModel);
 		}).filter(otherModel => {
 			return score(provider.selector, otherModel.uri, otherModel.getLanguageId(), true, undefined, undefined) > 0;
 		});
-
 		return Promise.resolve(provider.provideMultiDocumentHighlights(model, position, filteredModels, token))
 			.then(undefined, onUnexpectedExternalError);
-	}), (t: ResourceMap<DocumentHighlight[]> | null | undefined): t is ResourceMap<DocumentHighlight[]> => t instanceof ResourceMap && t.size > 0);
+	}), (result): result is ResourceMap<DocumentHighlight[]> => result !== undefined && result !== null);
 }
 
 interface IOccurenceAtPositionRequest {
@@ -83,10 +86,9 @@ interface IOccurenceAtPositionRequest {
 
 interface IWordHighlighterQuery {
 	modelInfo: {
-		model: ITextModel;
+		modelURI: URI;
 		selection: Selection;
 	} | null;
-	readonly word: IWordAtPosition | null;
 }
 
 abstract class OccurenceAtPositionRequest implements IOccurenceAtPositionRequest {
@@ -174,7 +176,7 @@ class MultiModelOccurenceRequest extends OccurenceAtPositionRequest {
 	}
 
 	protected override _compute(model: ITextModel, selection: Selection, wordSeparators: string, token: CancellationToken): Promise<ResourceMap<DocumentHighlight[]>> {
-		return getOccurrencesAcrossMultipleModels(this._providers, model, selection.getPosition(), wordSeparators, token, this._otherModels).then(value => {
+		return getOccurrencesAcrossMultipleModels(this._providers, model, selection.getPosition(), token, this._otherModels).then(value => {
 			if (!value) {
 				return new ResourceMap<DocumentHighlight[]>();
 			}
@@ -183,76 +185,13 @@ class MultiModelOccurenceRequest extends OccurenceAtPositionRequest {
 	}
 }
 
-class TextualOccurenceRequest extends OccurenceAtPositionRequest {
 
-	private readonly _otherModels: ITextModel[];
-	private readonly _selectionIsEmpty: boolean;
-	private readonly _word: IWordAtPosition | null;
-
-	constructor(model: ITextModel, selection: Selection, word: IWordAtPosition | null, wordSeparators: string, otherModels: ITextModel[]) {
-		super(model, selection, wordSeparators);
-		this._otherModels = otherModels;
-		this._selectionIsEmpty = selection.isEmpty();
-		this._word = word;
-	}
-
-	protected _compute(model: ITextModel, selection: Selection, wordSeparators: string, token: CancellationToken): Promise<ResourceMap<DocumentHighlight[]>> {
-		return timeout(250, token).then(() => {
-			const result = new ResourceMap<DocumentHighlight[]>();
-
-			let wordResult;
-			if (this._word) {
-				wordResult = this._word;
-			} else {
-				wordResult = model.getWordAtPosition(selection.getPosition());
-			}
-
-			if (!wordResult) {
-				return new ResourceMap<DocumentHighlight[]>();
-			}
-
-			const allModels = [model, ...this._otherModels];
-
-			for (const otherModel of allModels) {
-				if (otherModel.isDisposed()) {
-					continue;
-				}
-
-				const matches = otherModel.findMatches(wordResult.word, true, false, true, wordSeparators, false);
-				const highlights = matches.map(m => ({
-					range: m.range,
-					kind: DocumentHighlightKind.Text
-				}));
-
-				if (highlights) {
-					result.set(otherModel.uri, highlights);
-				}
-			}
-			return result;
-		});
-	}
-
-	public override isValid(model: ITextModel, selection: Selection, decorations: IEditorDecorationsCollection): boolean {
-		const currentSelectionIsEmpty = selection.isEmpty();
-		if (this._selectionIsEmpty !== currentSelectionIsEmpty) {
-			return false;
-		}
-		return super.isValid(model, selection, decorations);
-	}
+function computeOccurencesAtPosition(registry: LanguageFeatureRegistry<DocumentHighlightProvider>, model: ITextModel, selection: Selection, wordSeparators: string): IOccurenceAtPositionRequest {
+	return new SemanticOccurenceAtPositionRequest(model, selection, wordSeparators, registry);
 }
 
-function computeOccurencesAtPosition(registry: LanguageFeatureRegistry<DocumentHighlightProvider>, model: ITextModel, selection: Selection, word: IWordAtPosition | null, wordSeparators: string): IOccurenceAtPositionRequest {
-	if (registry.has(model)) {
-		return new SemanticOccurenceAtPositionRequest(model, selection, wordSeparators, registry);
-	}
-	return new TextualOccurenceRequest(model, selection, word, wordSeparators, []);
-}
-
-function computeOccurencesMultiModel(registry: LanguageFeatureRegistry<MultiDocumentHighlightProvider>, model: ITextModel, selection: Selection, word: IWordAtPosition | null, wordSeparators: string, otherModels: ITextModel[]): IOccurenceAtPositionRequest {
-	if (registry.has(model)) {
-		return new MultiModelOccurenceRequest(model, selection, wordSeparators, registry, otherModels);
-	}
-	return new TextualOccurenceRequest(model, selection, word, wordSeparators, otherModels);
+function computeOccurencesMultiModel(registry: LanguageFeatureRegistry<MultiDocumentHighlightProvider>, model: ITextModel, selection: Selection, wordSeparators: string, otherModels: ITextModel[]): IOccurenceAtPositionRequest {
+	return new MultiModelOccurenceRequest(model, selection, wordSeparators, registry, otherModels);
 }
 
 registerModelAndPositionCommand('_executeDocumentHighlights', async (accessor, model, position) => {
@@ -266,12 +205,15 @@ class WordHighlighter {
 	private readonly editor: IActiveCodeEditor;
 	private readonly providers: LanguageFeatureRegistry<DocumentHighlightProvider>;
 	private readonly multiDocumentProviders: LanguageFeatureRegistry<MultiDocumentHighlightProvider>;
-	private occurrencesHighlight: string;
 	private readonly model: ITextModel;
 	private readonly decorations: IEditorDecorationsCollection;
 	private readonly toUnhook = new DisposableStore();
+
+	private readonly textModelService: ITextModelService;
 	private readonly codeEditorService: ICodeEditorService;
 
+	private occurrencesHighlight: string;
+
 	private workerRequestTokenId: number = 0;
 	private workerRequest: IOccurenceAtPositionRequest | null;
 	private workerRequestCompleted: boolean = false;
@@ -283,18 +225,31 @@ class WordHighlighter {
 	private readonly _hasWordHighlights: IContextKey<boolean>;
 	private _ignorePositionChangeEvent: boolean;
 
-	private static storedDecorations: ResourceMap<string[]> = new ResourceMap();
+	private readonly runDelayer: Delayer<void> = this.toUnhook.add(new Delayer<void>(25));
+
+	private static storedDecorationIDs: ResourceMap<string[]> = new ResourceMap();
 	private static query: IWordHighlighterQuery | null = null;
 
-	constructor(editor: IActiveCodeEditor, providers: LanguageFeatureRegistry<DocumentHighlightProvider>, multiProviders: LanguageFeatureRegistry<MultiDocumentHighlightProvider>, contextKeyService: IContextKeyService, @ICodeEditorService codeEditorService: ICodeEditorService) {
+	constructor(
+		editor: IActiveCodeEditor,
+		providers: LanguageFeatureRegistry<DocumentHighlightProvider>,
+		multiProviders: LanguageFeatureRegistry<MultiDocumentHighlightProvider>,
+		contextKeyService: IContextKeyService,
+		@ITextModelService textModelService: ITextModelService,
+		@ICodeEditorService codeEditorService: ICodeEditorService,
+	) {
 		this.editor = editor;
 		this.providers = providers;
 		this.multiDocumentProviders = multiProviders;
+
 		this.codeEditorService = codeEditorService;
+		this.textModelService = textModelService;
+
 		this._hasWordHighlights = ctxHasWordHighlights.bindTo(contextKeyService);
 		this._ignorePositionChangeEvent = false;
 		this.occurrencesHighlight = this.editor.getOption(EditorOption.occurrencesHighlight);
 		this.model = this.editor.getModel();
+
 		this.toUnhook.add(editor.onDidChangeCursorPosition((e: ICursorPositionChangedEvent) => {
 			if (this._ignorePositionChangeEvent) {
 				// We are changing the position => ignore this event
@@ -307,7 +262,7 @@ class WordHighlighter {
 				return;
 			}
 
-			this._onPositionChanged(e);
+			this.runDelayer.trigger(() => { this._onPositionChanged(e); });
 		}));
 		this.toUnhook.add(editor.onDidFocusEditorText((e) => {
 			if (this.occurrencesHighlight === 'off') {
@@ -316,25 +271,53 @@ class WordHighlighter {
 			}
 
 			if (!this.workerRequest) {
-				this._run();
+				this.runDelayer.trigger(() => { this._run(); });
 			}
 		}));
 		this.toUnhook.add(editor.onDidChangeModelContent((e) => {
-			this._stopAll();
+			if (!matchesScheme(this.model.uri, 'output')) {
+				this._stopAll();
+			}
 		}));
 		this.toUnhook.add(editor.onDidChangeModel((e) => {
 			if (!e.newModelUrl && e.oldModelUrl) {
 				this._stopSingular();
-			} else {
-				if (WordHighlighter.query) {
-					this._run();
-				}
+			} else if (WordHighlighter.query) {
+				this._run();
 			}
 		}));
 		this.toUnhook.add(editor.onDidChangeConfiguration((e) => {
 			const newValue = this.editor.getOption(EditorOption.occurrencesHighlight);
 			if (this.occurrencesHighlight !== newValue) {
 				this.occurrencesHighlight = newValue;
+				switch (newValue) {
+					case 'off':
+						this._stopAll();
+						break;
+					case 'singleFile':
+						this._stopAll(WordHighlighter.query?.modelInfo?.modelURI);
+						break;
+					case 'multiFile':
+						if (WordHighlighter.query) {
+							this._run(true);
+						}
+						break;
+					default:
+						console.warn('Unknown occurrencesHighlight setting value:', newValue);
+						break;
+				}
+			}
+		}));
+		this.toUnhook.add(editor.onDidBlurEditorWidget(() => {
+			// logic is as follows
+			// - didBlur => active null => stopall
+			// - didBlur => active nb   => if this.editor is notebook, do nothing (new cell, so we don't want to stopAll)
+			//              active nb   => if this.editor is NOT nb,   stopAll
+
+			const activeEditor = this.codeEditorService.getFocusedCodeEditor();
+			if (!activeEditor) { // clicked into nb cell list, outline, terminal, etc
+				this._stopAll();
+			} else if (activeEditor.getModel()?.uri.scheme === Schemas.vscodeNotebookCell && this.editor.getModel()?.uri.scheme !== Schemas.vscodeNotebookCell) { // switched tabs from non-nb to nb
 				this._stopAll();
 			}
 		}));
@@ -361,9 +344,16 @@ class WordHighlighter {
 		if (this.occurrencesHighlight === 'off') {
 			return;
 		}
+
+		this.runDelayer.cancel();
 		this._run();
 	}
 
+	public trigger() {
+		this.runDelayer.cancel();
+		this._run(false, true); // immediate rendering (noDelay = true)
+	}
+
 	public stop(): void {
 		if (this.occurrencesHighlight === 'off') {
 			return;
@@ -423,13 +413,13 @@ class WordHighlighter {
 			return;
 		}
 
-		const currentDecorationIDs = WordHighlighter.storedDecorations.get(this.editor.getModel().uri);
+		const currentDecorationIDs = WordHighlighter.storedDecorationIDs.get(this.editor.getModel().uri);
 		if (!currentDecorationIDs) {
 			return;
 		}
 
 		this.editor.removeDecorations(currentDecorationIDs);
-		WordHighlighter.storedDecorations.delete(this.editor.getModel().uri);
+		WordHighlighter.storedDecorationIDs.delete(this.editor.getModel().uri);
 
 		if (this.decorations.length > 0) {
 			this.decorations.clear();
@@ -437,16 +427,16 @@ class WordHighlighter {
 		}
 	}
 
-	private _removeAllDecorations(): void {
+	private _removeAllDecorations(preservedModel?: URI): void {
 		const currentEditors = this.codeEditorService.listCodeEditors();
 		const deleteURI = [];
 		// iterate over editors and store models in currentModels
 		for (const editor of currentEditors) {
-			if (!editor.hasModel()) {
+			if (!editor.hasModel() || isEqual(editor.getModel().uri, preservedModel)) {
 				continue;
 			}
 
-			const currentDecorationIDs = WordHighlighter.storedDecorations.get(editor.getModel().uri);
+			const currentDecorationIDs = WordHighlighter.storedDecorationIDs.get(editor.getModel().uri);
 			if (!currentDecorationIDs) {
 				continue;
 			}
@@ -467,7 +457,7 @@ class WordHighlighter {
 		}
 
 		for (const uri of deleteURI) {
-			WordHighlighter.storedDecorations.delete(uri);
+			WordHighlighter.storedDecorationIDs.delete(uri);
 		}
 	}
 
@@ -476,7 +466,7 @@ class WordHighlighter {
 		this._removeSingleDecorations();
 
 		if (this.editor.hasTextFocus()) {
-			if (this.editor.getModel()?.uri.scheme !== Schemas.vscodeNotebookCell && WordHighlighter.query?.modelInfo?.model.uri.scheme !== Schemas.vscodeNotebookCell) { // clear query if focused non-nb editor
+			if (this.editor.getModel()?.uri.scheme !== Schemas.vscodeNotebookCell && WordHighlighter.query?.modelInfo?.modelURI.scheme !== Schemas.vscodeNotebookCell) { // clear query if focused non-nb editor
 				WordHighlighter.query = null;
 				this._run(); // TODO: @Yoyokrazy -- investigate why we need a full rerun here. likely addressed a case/patch in the first iteration of this feature
 			} else { // remove modelInfo to account for nb cell being disposed
@@ -505,11 +495,11 @@ class WordHighlighter {
 		}
 	}
 
-	private _stopAll() {
+	private _stopAll(preservedModel?: URI): void {
 		// Remove any existing decorations
 		// TODO: @Yoyokrazy -- this triggers as notebooks scroll, causing highlights to disappear momentarily.
 		// maybe a nb type check?
-		this._removeAllDecorations();
+		this._removeAllDecorations(preservedModel);
 
 		// Cancel any renderDecorationsTimer
 		if (this.renderDecorationsTimer !== -1) {
@@ -623,13 +613,13 @@ class WordHighlighter {
 		return currentModels;
 	}
 
-	private _run(): void {
+	private async _run(multiFileConfigChange?: boolean, noDelay?: boolean): Promise<void> {
 
-		let workerRequestIsValid;
 		const hasTextFocus = this.editor.hasTextFocus();
 
 		if (!hasTextFocus) { // new nb cell scrolled in, didChangeModel fires
 			if (!WordHighlighter.query) { // no previous query, nothing to highlight off of
+				this._stopAll();
 				return;
 			}
 		} else { // has text focus
@@ -655,44 +645,33 @@ class WordHighlighter {
 				return;
 			}
 
-			// All the effort below is trying to achieve this:
-			// - when cursor is moved to a word, trigger immediately a findOccurrences request
-			// - 250ms later after the last cursor move event, render the occurrences
-			// - no flickering!
-			workerRequestIsValid = (this.workerRequest && this.workerRequest.isValid(this.model, editorSelection, this.decorations));
-
 			WordHighlighter.query = {
 				modelInfo: {
-					model: this.model,
+					modelURI: this.model.uri,
 					selection: editorSelection,
-				},
-				word: word
+				}
 			};
 		}
 
-		// There are 4 cases:
-		// a) old workerRequest is valid & completed, renderDecorationsTimer fired
-		// b) old workerRequest is valid & completed, renderDecorationsTimer not fired
-		// c) old workerRequest is valid, but not completed
-		// d) old workerRequest is not valid
-
-		// For a) no action is needed
-		// For c), member 'lastCursorPositionChangeTime' will be used when installing the timer so no action is needed
 
 		this.lastCursorPositionChangeTime = (new Date()).getTime();
 
-		if (workerRequestIsValid) {
-			if (this.workerRequestCompleted && this.renderDecorationsTimer !== -1) {
-				// case b)
-				// Delay the firing of renderDecorationsTimer by an extra 250 ms
-				clearTimeout(this.renderDecorationsTimer);
-				this.renderDecorationsTimer = -1;
-				this._beginRenderDecorations();
-			}
-		} else {
+		if (isEqual(this.editor.getModel().uri, WordHighlighter.query.modelInfo?.modelURI)) { // only trigger new worker requests from the primary model that initiated the query
 			// case d)
-			// Stop all previous actions and start fresh
-			this._stopAll();
+
+			// check if the new queried word is contained in the range of a stored decoration for this model
+			if (!multiFileConfigChange) {
+				const currentModelDecorationRanges = this.decorations.getRanges();
+				for (const storedRange of currentModelDecorationRanges) {
+					if (storedRange.containsPosition(this.editor.getPosition())) {
+						return;
+					}
+				}
+			}
+
+			// stop all previous actions if new word is highlighted
+			// if we trigger the run off a setting change -> multifile highlighting, we do not want to remove decorations from this model
+			this._stopAll(multiFileConfigChange ? this.model.uri : undefined);
 
 			const myRequestId = ++this.workerRequestTokenId;
 			this.workerRequestCompleted = false;
@@ -703,10 +682,12 @@ class WordHighlighter {
 			// 		1) we have text focus, and a valid query was updated.
 			// 		2) we do not have text focus, and a valid query is cached.
 			// the query will ALWAYS have the correct data for the current highlight request, so it can always be passed to the workerRequest safely
-			if (!WordHighlighter.query.modelInfo || WordHighlighter.query.modelInfo.model.isDisposed()) {
+			if (!WordHighlighter.query || !WordHighlighter.query.modelInfo) {
 				return;
 			}
-			this.workerRequest = this.computeWithModel(WordHighlighter.query.modelInfo.model, WordHighlighter.query.modelInfo.selection, WordHighlighter.query.word, otherModelsToHighlight);
+			const queryModelRef = await this.textModelService.createModelReference(WordHighlighter.query.modelInfo.modelURI);
+			const queryModel = queryModelRef.object.textEditorModel;
+			this.workerRequest = this.computeWithModel(queryModel, WordHighlighter.query.modelInfo.selection, otherModelsToHighlight);
 
 			this.workerRequest?.result.then(data => {
 				if (myRequestId === this.workerRequestTokenId) {
@@ -715,20 +696,43 @@ class WordHighlighter {
 					this._beginRenderDecorations();
 				}
 			}, onUnexpectedError);
+		} else if (this.model.uri.scheme === Schemas.vscodeNotebookCell) {
+			// new wordHighlighter coming from a different model, NOT the query model, need to create a textModel ref
+
+			// this._stopAll(multiFileConfigChange ? this.model.uri : undefined);
+
+			const myRequestId = ++this.workerRequestTokenId;
+			this.workerRequestCompleted = false;
+
+			if (!WordHighlighter.query || !WordHighlighter.query.modelInfo) {
+				return;
+			}
+
+			const queryModelRef = await this.textModelService.createModelReference(WordHighlighter.query.modelInfo.modelURI);
+			const queryModel = queryModelRef.object.textEditorModel;
+			this.workerRequest = this.computeWithModel(queryModel, WordHighlighter.query.modelInfo.selection, [this.model]);
+
+			this.workerRequest?.result.then(data => {
+				if (myRequestId === this.workerRequestTokenId) {
+					this.workerRequestCompleted = true;
+					this.workerRequestValue = data || [];
+					this._beginRenderDecorations(noDelay);
+				}
+			}, onUnexpectedError);
 		}
 	}
 
-	private computeWithModel(model: ITextModel, selection: Selection, word: IWordAtPosition | null, otherModels: ITextModel[]): IOccurenceAtPositionRequest | null {
+	private computeWithModel(model: ITextModel, selection: Selection, otherModels: ITextModel[]): IOccurenceAtPositionRequest | null {
 		if (!otherModels.length) {
-			return computeOccurencesAtPosition(this.providers, model, selection, word, this.editor.getOption(EditorOption.wordSeparators));
+			return computeOccurencesAtPosition(this.providers, model, selection, this.editor.getOption(EditorOption.wordSeparators));
 		} else {
-			return computeOccurencesMultiModel(this.multiDocumentProviders, model, selection, word, this.editor.getOption(EditorOption.wordSeparators), otherModels);
+			return computeOccurencesMultiModel(this.multiDocumentProviders, model, selection, this.editor.getOption(EditorOption.wordSeparators), otherModels);
 		}
 	}
 
-	private _beginRenderDecorations(): void {
+	private _beginRenderDecorations(noDelay?: boolean): void {
 		const currentTime = (new Date()).getTime();
-		const minimumRenderTime = this.lastCursorPositionChangeTime + 250;
+		const minimumRenderTime = this.lastCursorPositionChangeTime + (noDelay ? 0 : 250);
 
 		if (currentTime >= minimumRenderTime) {
 			// Synchronous
@@ -757,7 +761,7 @@ class WordHighlighter {
 			const newDecorations: IModelDeltaDecoration[] = [];
 			const uri = editor.getModel()?.uri;
 			if (uri && this.workerRequestValue.has(uri)) {
-				const oldDecorationIDs: string[] | undefined = WordHighlighter.storedDecorations.get(uri);
+				const oldDecorationIDs: string[] | undefined = WordHighlighter.storedDecorationIDs.get(uri);
 				const newDocumentHighlights = this.workerRequestValue.get(uri);
 				if (newDocumentHighlights) {
 					for (const highlight of newDocumentHighlights) {
@@ -775,7 +779,7 @@ class WordHighlighter {
 				editor.changeDecorations((changeAccessor) => {
 					newDecorationIDs = changeAccessor.deltaDecorations(oldDecorationIDs ?? [], newDecorations);
 				});
-				WordHighlighter.storedDecorations = WordHighlighter.storedDecorations.set(uri, newDecorationIDs);
+				WordHighlighter.storedDecorationIDs = WordHighlighter.storedDecorationIDs.set(uri, newDecorationIDs);
 
 				if (newDecorations.length > 0) {
 					editorHighlighterContrib.wordHighlighter?.decorations.set(newDecorations);
@@ -783,6 +787,9 @@ class WordHighlighter {
 				}
 			}
 		}
+
+		// clear the worker request when decorations are completed
+		this.workerRequest = null;
 	}
 
 	public dispose(): void {
@@ -801,16 +808,26 @@ export class WordHighlighterContribution extends Disposable implements IEditorCo
 
 	private _wordHighlighter: WordHighlighter | null;
 
-	constructor(editor: ICodeEditor, @IContextKeyService contextKeyService: IContextKeyService, @ILanguageFeaturesService languageFeaturesService: ILanguageFeaturesService, @ICodeEditorService codeEditorService: ICodeEditorService) {
+	constructor(
+		editor: ICodeEditor,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@ILanguageFeaturesService languageFeaturesService: ILanguageFeaturesService,
+		@ICodeEditorService codeEditorService: ICodeEditorService,
+		@ITextModelService textModelService: ITextModelService,
+	) {
 		super();
 		this._wordHighlighter = null;
 		const createWordHighlighterIfPossible = () => {
 			if (editor.hasModel() && !editor.getModel().isTooLargeForTokenization()) {
-				this._wordHighlighter = new WordHighlighter(editor, languageFeaturesService.documentHighlightProvider, languageFeaturesService.multiDocumentHighlightProvider, contextKeyService, codeEditorService);
+				this._wordHighlighter = new WordHighlighter(editor, languageFeaturesService.documentHighlightProvider, languageFeaturesService.multiDocumentHighlightProvider, contextKeyService, textModelService, codeEditorService);
 			}
 		};
 		this._register(editor.onDidChangeModel((e) => {
 			if (this._wordHighlighter) {
+				if (!e.newModelUrl && e.oldModelUrl?.scheme !== Schemas.vscodeNotebookCell) { // happens when switching tabs to a notebook that has focus in the cell list, no new model URI (this also doesn't make it to the wordHighlighter, bc no editor.hasModel)
+					this.wordHighlighter?.stop();
+				}
+
 				this._wordHighlighter.dispose();
 				this._wordHighlighter = null;
 			}
@@ -919,7 +936,7 @@ class TriggerWordHighlightAction extends EditorAction {
 			id: 'editor.action.wordHighlight.trigger',
 			label: nls.localize('wordHighlight.trigger.label', "Trigger Symbol Highlight"),
 			alias: 'Trigger Symbol Highlight',
-			precondition: ctxHasWordHighlights.toNegated(),
+			precondition: undefined,
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
 				primary: 0,
@@ -942,4 +959,4 @@ registerEditorContribution(WordHighlighterContribution.ID, WordHighlighterContri
 registerEditorAction(NextWordHighlightAction);
 registerEditorAction(PrevWordHighlightAction);
 registerEditorAction(TriggerWordHighlightAction);
-// registerEditorFeature(TextualMultiDocumentHighlightFeature);
+registerEditorFeature(TextualMultiDocumentHighlightFeature);
diff --git a/src/vs/editor/contrib/wordOperations/browser/wordOperations.ts b/src/vs/editor/contrib/wordOperations/browser/wordOperations.ts
index 388d42021d2..7022ec9bf38 100644
--- a/src/vs/editor/contrib/wordOperations/browser/wordOperations.ts
+++ b/src/vs/editor/contrib/wordOperations/browser/wordOperations.ts
@@ -3,27 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, EditorCommand, ICommandOptions, registerEditorAction, registerEditorCommand, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { ReplaceCommand } from 'vs/editor/common/commands/replaceCommand';
-import { EditorOption, EditorOptions } from 'vs/editor/common/config/editorOptions';
-import { CursorState } from 'vs/editor/common/cursorCommon';
-import { CursorChangeReason } from 'vs/editor/common/cursorEvents';
-import { DeleteWordContext, WordNavigationType, WordOperations } from 'vs/editor/common/cursor/cursorWordOperations';
-import { getMapForWordSeparators, WordCharacterClassifier } from 'vs/editor/common/core/wordCharacterClassifier';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ScrollType } from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { ITextModel } from 'vs/editor/common/model';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import * as nls from 'vs/nls';
-import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from 'vs/platform/accessibility/common/accessibility';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IsWindowsContext } from 'vs/platform/contextkey/common/contextkeys';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorAction, EditorCommand, ICommandOptions, registerEditorAction, registerEditorCommand, ServicesAccessor } from '../../../browser/editorExtensions.js';
+import { ReplaceCommand } from '../../../common/commands/replaceCommand.js';
+import { EditorOption, EditorOptions } from '../../../common/config/editorOptions.js';
+import { CursorState } from '../../../common/cursorCommon.js';
+import { CursorChangeReason } from '../../../common/cursorEvents.js';
+import { DeleteWordContext, WordNavigationType, WordOperations } from '../../../common/cursor/cursorWordOperations.js';
+import { getMapForWordSeparators, WordCharacterClassifier } from '../../../common/core/wordCharacterClassifier.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { Selection } from '../../../common/core/selection.js';
+import { ScrollType } from '../../../common/editorCommon.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { ITextModel } from '../../../common/model.js';
+import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import * as nls from '../../../../nls.js';
+import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from '../../../../platform/accessibility/common/accessibility.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { IsWindowsContext } from '../../../../platform/contextkey/common/contextkeys.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 
 export interface MoveWordOptions extends ICommandOptions {
 	inSelectionMode: boolean;
@@ -48,10 +48,10 @@ export abstract class MoveWordCommand extends EditorCommand {
 		const wordSeparators = getMapForWordSeparators(editor.getOption(EditorOption.wordSeparators), editor.getOption(EditorOption.wordSegmenterLocales));
 		const model = editor.getModel();
 		const selections = editor.getSelections();
-
+		const hasMulticursor = selections.length > 1;
 		const result = selections.map((sel) => {
 			const inPosition = new Position(sel.positionLineNumber, sel.positionColumn);
-			const outPosition = this._move(wordSeparators, model, inPosition, this._wordNavigationType);
+			const outPosition = this._move(wordSeparators, model, inPosition, this._wordNavigationType, hasMulticursor);
 			return this._moveTo(sel, outPosition, this._inSelectionMode);
 		});
 
@@ -83,17 +83,17 @@ export abstract class MoveWordCommand extends EditorCommand {
 		}
 	}
 
-	protected abstract _move(wordSeparators: WordCharacterClassifier, model: ITextModel, position: Position, wordNavigationType: WordNavigationType): Position;
+	protected abstract _move(wordSeparators: WordCharacterClassifier, model: ITextModel, position: Position, wordNavigationType: WordNavigationType, hasMulticursor: boolean): Position;
 }
 
 export class WordLeftCommand extends MoveWordCommand {
-	protected _move(wordSeparators: WordCharacterClassifier, model: ITextModel, position: Position, wordNavigationType: WordNavigationType): Position {
-		return WordOperations.moveWordLeft(wordSeparators, model, position, wordNavigationType);
+	protected _move(wordSeparators: WordCharacterClassifier, model: ITextModel, position: Position, wordNavigationType: WordNavigationType, hasMulticursor: boolean): Position {
+		return WordOperations.moveWordLeft(wordSeparators, model, position, wordNavigationType, hasMulticursor);
 	}
 }
 
 export class WordRightCommand extends MoveWordCommand {
-	protected _move(wordSeparators: WordCharacterClassifier, model: ITextModel, position: Position, wordNavigationType: WordNavigationType): Position {
+	protected _move(wordSeparators: WordCharacterClassifier, model: ITextModel, position: Position, wordNavigationType: WordNavigationType, hasMulticursor: boolean): Position {
 		return WordOperations.moveWordRight(wordSeparators, model, position, wordNavigationType);
 	}
 }
@@ -187,8 +187,8 @@ export class CursorWordAccessibilityLeft extends WordLeftCommand {
 		});
 	}
 
-	protected override _move(wordCharacterClassifier: WordCharacterClassifier, model: ITextModel, position: Position, wordNavigationType: WordNavigationType): Position {
-		return super._move(getMapForWordSeparators(EditorOptions.wordSeparators.defaultValue, wordCharacterClassifier.intlSegmenterLocales), model, position, wordNavigationType);
+	protected override _move(wordCharacterClassifier: WordCharacterClassifier, model: ITextModel, position: Position, wordNavigationType: WordNavigationType, hasMulticursor: boolean): Position {
+		return super._move(getMapForWordSeparators(EditorOptions.wordSeparators.defaultValue, wordCharacterClassifier.intlSegmenterLocales), model, position, wordNavigationType, hasMulticursor);
 	}
 }
 
@@ -202,8 +202,8 @@ export class CursorWordAccessibilityLeftSelect extends WordLeftCommand {
 		});
 	}
 
-	protected override _move(wordCharacterClassifier: WordCharacterClassifier, model: ITextModel, position: Position, wordNavigationType: WordNavigationType): Position {
-		return super._move(getMapForWordSeparators(EditorOptions.wordSeparators.defaultValue, wordCharacterClassifier.intlSegmenterLocales), model, position, wordNavigationType);
+	protected override _move(wordCharacterClassifier: WordCharacterClassifier, model: ITextModel, position: Position, wordNavigationType: WordNavigationType, hasMulticursor: boolean): Position {
+		return super._move(getMapForWordSeparators(EditorOptions.wordSeparators.defaultValue, wordCharacterClassifier.intlSegmenterLocales), model, position, wordNavigationType, hasMulticursor);
 	}
 }
 
@@ -295,8 +295,8 @@ export class CursorWordAccessibilityRight extends WordRightCommand {
 		});
 	}
 
-	protected override _move(wordCharacterClassifier: WordCharacterClassifier, model: ITextModel, position: Position, wordNavigationType: WordNavigationType): Position {
-		return super._move(getMapForWordSeparators(EditorOptions.wordSeparators.defaultValue, wordCharacterClassifier.intlSegmenterLocales), model, position, wordNavigationType);
+	protected override _move(wordCharacterClassifier: WordCharacterClassifier, model: ITextModel, position: Position, wordNavigationType: WordNavigationType, hasMulticursor: boolean): Position {
+		return super._move(getMapForWordSeparators(EditorOptions.wordSeparators.defaultValue, wordCharacterClassifier.intlSegmenterLocales), model, position, wordNavigationType, hasMulticursor);
 	}
 }
 
@@ -310,8 +310,8 @@ export class CursorWordAccessibilityRightSelect extends WordRightCommand {
 		});
 	}
 
-	protected override _move(wordCharacterClassifier: WordCharacterClassifier, model: ITextModel, position: Position, wordNavigationType: WordNavigationType): Position {
-		return super._move(getMapForWordSeparators(EditorOptions.wordSeparators.defaultValue, wordCharacterClassifier.intlSegmenterLocales), model, position, wordNavigationType);
+	protected override _move(wordCharacterClassifier: WordCharacterClassifier, model: ITextModel, position: Position, wordNavigationType: WordNavigationType, hasMulticursor: boolean): Position {
+		return super._move(getMapForWordSeparators(EditorOptions.wordSeparators.defaultValue, wordCharacterClassifier.intlSegmenterLocales), model, position, wordNavigationType, hasMulticursor);
 	}
 }
 
diff --git a/src/vs/editor/contrib/wordOperations/test/browser/wordOperations.test.ts b/src/vs/editor/contrib/wordOperations/test/browser/wordOperations.test.ts
index e65c88eeae3..237945f6465 100644
--- a/src/vs/editor/contrib/wordOperations/test/browser/wordOperations.test.ts
+++ b/src/vs/editor/contrib/wordOperations/test/browser/wordOperations.test.ts
@@ -4,21 +4,22 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { CoreEditingCommands } from 'vs/editor/browser/coreCommands';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorCommand } from 'vs/editor/browser/editorExtensions';
-import { Position } from 'vs/editor/common/core/position';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { ViewModel } from 'vs/editor/common/viewModel/viewModelImpl';
-import { CursorWordAccessibilityLeft, CursorWordAccessibilityLeftSelect, CursorWordAccessibilityRight, CursorWordAccessibilityRightSelect, CursorWordEndLeft, CursorWordEndLeftSelect, CursorWordEndRight, CursorWordEndRightSelect, CursorWordLeft, CursorWordLeftSelect, CursorWordRight, CursorWordRightSelect, CursorWordStartLeft, CursorWordStartLeftSelect, CursorWordStartRight, CursorWordStartRightSelect, DeleteInsideWord, DeleteWordEndLeft, DeleteWordEndRight, DeleteWordLeft, DeleteWordRight, DeleteWordStartLeft, DeleteWordStartRight } from 'vs/editor/contrib/wordOperations/browser/wordOperations';
-import { deserializePipePositions, serializePipePositions, testRepeatedActionAndExtractPositions } from 'vs/editor/contrib/wordOperations/test/browser/wordTestUtils';
-import { createCodeEditorServices, instantiateTestCodeEditor, withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
-import { instantiateTextModel } from 'vs/editor/test/common/testTextModel';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { isFirefox } from '../../../../../base/common/platform.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { CoreEditingCommands } from '../../../../browser/coreCommands.js';
+import { ICodeEditor } from '../../../../browser/editorBrowser.js';
+import { EditorCommand } from '../../../../browser/editorExtensions.js';
+import { Position } from '../../../../common/core/position.js';
+import { Selection } from '../../../../common/core/selection.js';
+import { ILanguageService } from '../../../../common/languages/language.js';
+import { ILanguageConfigurationService } from '../../../../common/languages/languageConfigurationRegistry.js';
+import { ViewModel } from '../../../../common/viewModel/viewModelImpl.js';
+import { CursorWordAccessibilityLeft, CursorWordAccessibilityLeftSelect, CursorWordAccessibilityRight, CursorWordAccessibilityRightSelect, CursorWordEndLeft, CursorWordEndLeftSelect, CursorWordEndRight, CursorWordEndRightSelect, CursorWordLeft, CursorWordLeftSelect, CursorWordRight, CursorWordRightSelect, CursorWordStartLeft, CursorWordStartLeftSelect, CursorWordStartRight, CursorWordStartRightSelect, DeleteInsideWord, DeleteWordEndLeft, DeleteWordEndRight, DeleteWordLeft, DeleteWordRight, DeleteWordStartLeft, DeleteWordStartRight } from '../../browser/wordOperations.js';
+import { deserializePipePositions, serializePipePositions, testRepeatedActionAndExtractPositions } from './wordTestUtils.js';
+import { createCodeEditorServices, instantiateTestCodeEditor, withTestCodeEditor } from '../../../../test/browser/testCodeEditor.js';
+import { instantiateTextModel } from '../../../../test/common/testTextModel.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
 
 suite('WordOperations', () => {
 
@@ -179,7 +180,11 @@ suite('WordOperations', () => {
 		assert.deepStrictEqual(actual, EXPECTED);
 	});
 
-	test('cursorWordLeft - Recognize words', () => {
+	test('cursorWordLeft - Recognize words', function () {
+		if (isFirefox) {
+			// https://github.com/microsoft/vscode/issues/219843
+			return this.skip();
+		}
 		const EXPECTED = [
 			'|/* |これ|は|テスト|です |/*',
 		].join('\n');
@@ -217,6 +222,40 @@ suite('WordOperations', () => {
 		assert.deepStrictEqual(actual, EXPECTED);
 	});
 
+	test('cursorWordLeft - issue #169904: cursors out of sync', () => {
+		const text = [
+			'.grid1 {',
+			'  display: grid;',
+			'  grid-template-columns:',
+			'    [full-start] minmax(1em, 1fr)',
+			'    [main-start] minmax(0, 40em) [main-end]',
+			'    minmax(1em, 1fr) [full-end];',
+			'}',
+			'.grid2 {',
+			'  display: grid;',
+			'  grid-template-columns:',
+			'    [full-start] minmax(1em, 1fr)',
+			'    [main-start] minmax(0, 40em) [main-end] minmax(1em, 1fr) [full-end];',
+			'}',
+		];
+		withTestCodeEditor(text, {}, (editor) => {
+			editor.setSelections([
+				new Selection(5, 44, 5, 44),
+				new Selection(6, 32, 6, 32),
+				new Selection(12, 44, 12, 44),
+				new Selection(12, 72, 12, 72),
+			]);
+			cursorWordLeft(editor, false);
+			assert.deepStrictEqual(editor.getSelections(), [
+				new Selection(5, 43, 5, 43),
+				new Selection(6, 31, 6, 31),
+				new Selection(12, 43, 12, 43),
+				new Selection(12, 71, 12, 71),
+			]);
+
+		});
+	});
+
 	test('cursorWordLeftSelect - issue #74369: cursorWordLeft and cursorWordLeftSelect do not behave consistently', () => {
 		const EXPECTED = [
 			'|this.|is.|a.|test',
@@ -365,7 +404,11 @@ suite('WordOperations', () => {
 		assert.deepStrictEqual(actual, EXPECTED);
 	});
 
-	test('cursorWordRight - Recognize words', () => {
+	test('cursorWordRight - Recognize words', function () {
+		if (isFirefox) {
+			// https://github.com/microsoft/vscode/issues/219843
+			return this.skip();
+		}
 		const EXPECTED = [
 			'/*| これ|は|テスト|です|/*|',
 		].join('\n');
diff --git a/src/vs/editor/contrib/wordOperations/test/browser/wordTestUtils.ts b/src/vs/editor/contrib/wordOperations/test/browser/wordTestUtils.ts
index 540c1a0d496..36ed4fa2055 100644
--- a/src/vs/editor/contrib/wordOperations/test/browser/wordTestUtils.ts
+++ b/src/vs/editor/contrib/wordOperations/test/browser/wordTestUtils.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Position } from 'vs/editor/common/core/position';
-import { ITestCodeEditor, TestCodeEditorInstantiationOptions, withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
+import { Position } from '../../../../common/core/position.js';
+import { ITestCodeEditor, TestCodeEditorInstantiationOptions, withTestCodeEditor } from '../../../../test/browser/testCodeEditor.js';
 
 export function deserializePipePositions(text: string): [string, Position[]] {
 	let resultText = '';
diff --git a/src/vs/editor/contrib/wordPartOperations/browser/wordPartOperations.ts b/src/vs/editor/contrib/wordPartOperations/browser/wordPartOperations.ts
index ebcabc415a4..9bee3f0e0c2 100644
--- a/src/vs/editor/contrib/wordPartOperations/browser/wordPartOperations.ts
+++ b/src/vs/editor/contrib/wordPartOperations/browser/wordPartOperations.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { registerEditorCommand } from 'vs/editor/browser/editorExtensions';
-import { DeleteWordContext, WordNavigationType, WordPartOperations } from 'vs/editor/common/cursor/cursorWordOperations';
-import { WordCharacterClassifier } from 'vs/editor/common/core/wordCharacterClassifier';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { ITextModel } from 'vs/editor/common/model';
-import { DeleteWordCommand, MoveWordCommand } from 'vs/editor/contrib/wordOperations/browser/wordOperations';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { registerEditorCommand } from '../../../browser/editorExtensions.js';
+import { DeleteWordContext, WordNavigationType, WordPartOperations } from '../../../common/cursor/cursorWordOperations.js';
+import { WordCharacterClassifier } from '../../../common/core/wordCharacterClassifier.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { ITextModel } from '../../../common/model.js';
+import { DeleteWordCommand, MoveWordCommand } from '../../wordOperations/browser/wordOperations.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 
 export class DeleteWordPartLeft extends DeleteWordCommand {
 	constructor() {
@@ -68,8 +68,8 @@ export class DeleteWordPartRight extends DeleteWordCommand {
 }
 
 export class WordPartLeftCommand extends MoveWordCommand {
-	protected _move(wordSeparators: WordCharacterClassifier, model: ITextModel, position: Position, wordNavigationType: WordNavigationType): Position {
-		return WordPartOperations.moveWordPartLeft(wordSeparators, model, position);
+	protected _move(wordSeparators: WordCharacterClassifier, model: ITextModel, position: Position, wordNavigationType: WordNavigationType, hasMulticursor: boolean): Position {
+		return WordPartOperations.moveWordPartLeft(wordSeparators, model, position, hasMulticursor);
 	}
 }
 export class CursorWordPartLeft extends WordPartLeftCommand {
@@ -111,7 +111,7 @@ export class CursorWordPartLeftSelect extends WordPartLeftCommand {
 CommandsRegistry.registerCommandAlias('cursorWordPartStartLeftSelect', 'cursorWordPartLeftSelect');
 
 export class WordPartRightCommand extends MoveWordCommand {
-	protected _move(wordSeparators: WordCharacterClassifier, model: ITextModel, position: Position, wordNavigationType: WordNavigationType): Position {
+	protected _move(wordSeparators: WordCharacterClassifier, model: ITextModel, position: Position, wordNavigationType: WordNavigationType, hasMulticursor: boolean): Position {
 		return WordPartOperations.moveWordPartRight(wordSeparators, model, position);
 	}
 }
diff --git a/src/vs/editor/contrib/wordPartOperations/test/browser/utils.ts b/src/vs/editor/contrib/wordPartOperations/test/browser/utils.ts
index 7610bd18937..c5afe453def 100644
--- a/src/vs/editor/contrib/wordPartOperations/test/browser/utils.ts
+++ b/src/vs/editor/contrib/wordPartOperations/test/browser/utils.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ServiceIdentifier, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { ServiceIdentifier, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
 
 export class StaticServiceAccessor implements ServicesAccessor {
 	private services = new Map<ServiceIdentifier<any>, any>();
diff --git a/src/vs/editor/contrib/wordPartOperations/test/browser/wordPartOperations.test.ts b/src/vs/editor/contrib/wordPartOperations/test/browser/wordPartOperations.test.ts
index b3a72759a04..bf9d0a504a4 100644
--- a/src/vs/editor/contrib/wordPartOperations/test/browser/wordPartOperations.test.ts
+++ b/src/vs/editor/contrib/wordPartOperations/test/browser/wordPartOperations.test.ts
@@ -4,15 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorCommand } from 'vs/editor/browser/editorExtensions';
-import { Position } from 'vs/editor/common/core/position';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { deserializePipePositions, serializePipePositions, testRepeatedActionAndExtractPositions } from 'vs/editor/contrib/wordOperations/test/browser/wordTestUtils';
-import { CursorWordPartLeft, CursorWordPartLeftSelect, CursorWordPartRight, CursorWordPartRightSelect, DeleteWordPartLeft, DeleteWordPartRight } from 'vs/editor/contrib/wordPartOperations/browser/wordPartOperations';
-import { StaticServiceAccessor } from 'vs/editor/contrib/wordPartOperations/test/browser/utils';
-import { TestLanguageConfigurationService } from 'vs/editor/test/common/modes/testLanguageConfigurationService';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { ICodeEditor } from '../../../../browser/editorBrowser.js';
+import { EditorCommand } from '../../../../browser/editorExtensions.js';
+import { Position } from '../../../../common/core/position.js';
+import { ILanguageConfigurationService } from '../../../../common/languages/languageConfigurationRegistry.js';
+import { deserializePipePositions, serializePipePositions, testRepeatedActionAndExtractPositions } from '../../../wordOperations/test/browser/wordTestUtils.js';
+import { CursorWordPartLeft, CursorWordPartLeftSelect, CursorWordPartRight, CursorWordPartRightSelect, DeleteWordPartLeft, DeleteWordPartRight } from '../../browser/wordPartOperations.js';
+import { StaticServiceAccessor } from './utils.js';
+import { TestLanguageConfigurationService } from '../../../../test/common/modes/testLanguageConfigurationService.js';
 
 suite('WordPartOperations', () => {
 
diff --git a/src/vs/editor/contrib/zoneWidget/browser/zoneWidget.ts b/src/vs/editor/contrib/zoneWidget/browser/zoneWidget.ts
index 57d3dd3819b..e1d387deb12 100644
--- a/src/vs/editor/contrib/zoneWidget/browser/zoneWidget.ts
+++ b/src/vs/editor/contrib/zoneWidget/browser/zoneWidget.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { IHorizontalSashLayoutProvider, ISashEvent, Orientation, Sash, SashState } from 'vs/base/browser/ui/sash/sash';
-import { Color, RGBA } from 'vs/base/common/color';
-import { IdGenerator } from 'vs/base/common/idGenerator';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import * as objects from 'vs/base/common/objects';
-import 'vs/css!./zoneWidget';
-import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, IViewZone, IViewZoneChangeAccessor } from 'vs/editor/browser/editorBrowser';
-import { EditorLayoutInfo, EditorOption } from 'vs/editor/common/config/editorOptions';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { IEditorDecorationsCollection, ScrollType } from 'vs/editor/common/editorCommon';
-import { TrackedRangeStickiness } from 'vs/editor/common/model';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
+import * as dom from '../../../../base/browser/dom.js';
+import { IHorizontalSashLayoutProvider, ISashEvent, Orientation, Sash, SashState } from '../../../../base/browser/ui/sash/sash.js';
+import { Color, RGBA } from '../../../../base/common/color.js';
+import { IdGenerator } from '../../../../base/common/idGenerator.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import * as objects from '../../../../base/common/objects.js';
+import './zoneWidget.css';
+import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, IViewZone, IViewZoneChangeAccessor } from '../../../browser/editorBrowser.js';
+import { EditorLayoutInfo, EditorOption } from '../../../common/config/editorOptions.js';
+import { IPosition, Position } from '../../../common/core/position.js';
+import { IRange, Range } from '../../../common/core/range.js';
+import { IEditorDecorationsCollection, ScrollType } from '../../../common/editorCommon.js';
+import { TrackedRangeStickiness } from '../../../common/model.js';
+import { ModelDecorationOptions } from '../../../common/model/textModel.js';
 
 export interface IOptions {
 	showFrame?: boolean;
diff --git a/src/vs/editor/editor.all.ts b/src/vs/editor/editor.all.ts
index ed1e6badc50..e41780c0bad 100644
--- a/src/vs/editor/editor.all.ts
+++ b/src/vs/editor/editor.all.ts
@@ -3,68 +3,68 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/editor/browser/coreCommands';
-import 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import 'vs/editor/browser/widget/diffEditor/diffEditor.contribution';
-import 'vs/editor/contrib/anchorSelect/browser/anchorSelect';
-import 'vs/editor/contrib/bracketMatching/browser/bracketMatching';
-import 'vs/editor/contrib/caretOperations/browser/caretOperations';
-import 'vs/editor/contrib/caretOperations/browser/transpose';
-import 'vs/editor/contrib/clipboard/browser/clipboard';
-import 'vs/editor/contrib/codeAction/browser/codeActionContributions';
-import 'vs/editor/contrib/codelens/browser/codelensController';
-import 'vs/editor/contrib/colorPicker/browser/colorContributions';
-import 'vs/editor/contrib/colorPicker/browser/standaloneColorPickerActions';
-import 'vs/editor/contrib/comment/browser/comment';
-import 'vs/editor/contrib/contextmenu/browser/contextmenu';
-import 'vs/editor/contrib/cursorUndo/browser/cursorUndo';
-import 'vs/editor/contrib/dnd/browser/dnd';
-import 'vs/editor/contrib/dropOrPasteInto/browser/copyPasteContribution';
-import 'vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorContribution';
-import 'vs/editor/contrib/find/browser/findController';
-import 'vs/editor/contrib/folding/browser/folding';
-import 'vs/editor/contrib/fontZoom/browser/fontZoom';
-import 'vs/editor/contrib/format/browser/formatActions';
-import 'vs/editor/contrib/documentSymbols/browser/documentSymbols';
-import 'vs/editor/contrib/inlineCompletions/browser/inlineCompletions.contribution';
-import 'vs/editor/contrib/inlineProgress/browser/inlineProgress';
-import 'vs/editor/contrib/gotoSymbol/browser/goToCommands';
-import 'vs/editor/contrib/gotoSymbol/browser/link/goToDefinitionAtPosition';
-import 'vs/editor/contrib/gotoError/browser/gotoError';
-import 'vs/editor/contrib/hover/browser/hoverContribution';
-import 'vs/editor/contrib/indentation/browser/indentation';
-import 'vs/editor/contrib/inlayHints/browser/inlayHintsContribution';
-import 'vs/editor/contrib/inPlaceReplace/browser/inPlaceReplace';
-import 'vs/editor/contrib/lineSelection/browser/lineSelection';
-import 'vs/editor/contrib/linesOperations/browser/linesOperations';
-import 'vs/editor/contrib/linkedEditing/browser/linkedEditing';
-import 'vs/editor/contrib/links/browser/links';
-import 'vs/editor/contrib/longLinesHelper/browser/longLinesHelper';
-import 'vs/editor/contrib/multicursor/browser/multicursor';
-import 'vs/editor/contrib/inlineEdit/browser/inlineEdit.contribution';
-import 'vs/editor/contrib/parameterHints/browser/parameterHints';
-import 'vs/editor/contrib/placeholderText/browser/placeholderText.contribution';
-import 'vs/editor/contrib/rename/browser/rename';
-import 'vs/editor/contrib/sectionHeaders/browser/sectionHeaders';
-import 'vs/editor/contrib/semanticTokens/browser/documentSemanticTokens';
-import 'vs/editor/contrib/semanticTokens/browser/viewportSemanticTokens';
-import 'vs/editor/contrib/smartSelect/browser/smartSelect';
-import 'vs/editor/contrib/snippet/browser/snippetController2';
-import 'vs/editor/contrib/stickyScroll/browser/stickyScrollContribution';
-import 'vs/editor/contrib/suggest/browser/suggestController';
-import 'vs/editor/contrib/suggest/browser/suggestInlineCompletions';
-import 'vs/editor/contrib/tokenization/browser/tokenization';
-import 'vs/editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode';
-import 'vs/editor/contrib/unicodeHighlighter/browser/unicodeHighlighter';
-import 'vs/editor/contrib/unusualLineTerminators/browser/unusualLineTerminators';
-import 'vs/editor/contrib/wordHighlighter/browser/wordHighlighter';
-import 'vs/editor/contrib/wordOperations/browser/wordOperations';
-import 'vs/editor/contrib/wordPartOperations/browser/wordPartOperations';
-import 'vs/editor/contrib/readOnlyMessage/browser/contribution';
-import 'vs/editor/contrib/diffEditorBreadcrumbs/browser/contribution';
+import './browser/coreCommands.js';
+import './browser/widget/codeEditor/codeEditorWidget.js';
+import './browser/widget/diffEditor/diffEditor.contribution.js';
+import './contrib/anchorSelect/browser/anchorSelect.js';
+import './contrib/bracketMatching/browser/bracketMatching.js';
+import './contrib/caretOperations/browser/caretOperations.js';
+import './contrib/caretOperations/browser/transpose.js';
+import './contrib/clipboard/browser/clipboard.js';
+import './contrib/codeAction/browser/codeActionContributions.js';
+import './contrib/codelens/browser/codelensController.js';
+import './contrib/colorPicker/browser/colorPickerContribution.js';
+import './contrib/comment/browser/comment.js';
+import './contrib/contextmenu/browser/contextmenu.js';
+import './contrib/cursorUndo/browser/cursorUndo.js';
+import './contrib/dnd/browser/dnd.js';
+import './contrib/dropOrPasteInto/browser/copyPasteContribution.js';
+import './contrib/dropOrPasteInto/browser/dropIntoEditorContribution.js';
+import './contrib/find/browser/findController.js';
+import './contrib/folding/browser/folding.js';
+import './contrib/fontZoom/browser/fontZoom.js';
+import './contrib/format/browser/formatActions.js';
+import './contrib/documentSymbols/browser/documentSymbols.js';
+import './contrib/inlineCompletions/browser/inlineCompletions.contribution.js';
+import './contrib/inlineProgress/browser/inlineProgress.js';
+import './contrib/gotoSymbol/browser/goToCommands.js';
+import './contrib/gotoSymbol/browser/link/goToDefinitionAtPosition.js';
+import './contrib/gotoError/browser/gotoError.js';
+import './contrib/gpu/browser/gpuActions.js';
+import './contrib/hover/browser/hoverContribution.js';
+import './contrib/indentation/browser/indentation.js';
+import './contrib/inlayHints/browser/inlayHintsContribution.js';
+import './contrib/inPlaceReplace/browser/inPlaceReplace.js';
+import './contrib/lineSelection/browser/lineSelection.js';
+import './contrib/linesOperations/browser/linesOperations.js';
+import './contrib/linkedEditing/browser/linkedEditing.js';
+import './contrib/links/browser/links.js';
+import './contrib/longLinesHelper/browser/longLinesHelper.js';
+import './contrib/multicursor/browser/multicursor.js';
+import './contrib/inlineEdit/browser/inlineEdit.contribution.js';
+import './contrib/parameterHints/browser/parameterHints.js';
+import './contrib/placeholderText/browser/placeholderText.contribution.js';
+import './contrib/rename/browser/rename.js';
+import './contrib/sectionHeaders/browser/sectionHeaders.js';
+import './contrib/semanticTokens/browser/documentSemanticTokens.js';
+import './contrib/semanticTokens/browser/viewportSemanticTokens.js';
+import './contrib/smartSelect/browser/smartSelect.js';
+import './contrib/snippet/browser/snippetController2.js';
+import './contrib/stickyScroll/browser/stickyScrollContribution.js';
+import './contrib/suggest/browser/suggestController.js';
+import './contrib/suggest/browser/suggestInlineCompletions.js';
+import './contrib/tokenization/browser/tokenization.js';
+import './contrib/toggleTabFocusMode/browser/toggleTabFocusMode.js';
+import './contrib/unicodeHighlighter/browser/unicodeHighlighter.js';
+import './contrib/unusualLineTerminators/browser/unusualLineTerminators.js';
+import './contrib/wordHighlighter/browser/wordHighlighter.js';
+import './contrib/wordOperations/browser/wordOperations.js';
+import './contrib/wordPartOperations/browser/wordPartOperations.js';
+import './contrib/readOnlyMessage/browser/contribution.js';
+import './contrib/diffEditorBreadcrumbs/browser/contribution.js';
 
 // Load up these strings even in VSCode, even if they are not used
 // in order to get them translated
-import 'vs/editor/common/standaloneStrings';
+import './common/standaloneStrings.js';
 
-import 'vs/base/browser/ui/codicons/codiconStyles'; // The codicons are defined here and must be loaded
+import '../base/browser/ui/codicons/codiconStyles.js'; // The codicons are defined here and must be loaded
diff --git a/src/vs/editor/editor.api.ts b/src/vs/editor/editor.api.ts
index a9fc0b29404..2a7c13dc136 100644
--- a/src/vs/editor/editor.api.ts
+++ b/src/vs/editor/editor.api.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { EditorOptions, WrappingIndent, EditorAutoIndentStrategy } from 'vs/editor/common/config/editorOptions';
-import { createMonacoBaseAPI } from 'vs/editor/common/services/editorBaseApi';
-import { createMonacoEditorAPI } from 'vs/editor/standalone/browser/standaloneEditor';
-import { createMonacoLanguagesAPI } from 'vs/editor/standalone/browser/standaloneLanguages';
-import { FormattingConflicts } from 'vs/editor/contrib/format/browser/format';
+import { EditorOptions, WrappingIndent, EditorAutoIndentStrategy } from './common/config/editorOptions.js';
+import { createMonacoBaseAPI } from './common/services/editorBaseApi.js';
+import { createMonacoEditorAPI } from './standalone/browser/standaloneEditor.js';
+import { createMonacoLanguagesAPI } from './standalone/browser/standaloneLanguages.js';
+import { FormattingConflicts } from './contrib/format/browser/format.js';
 
 // Set defaults for standalone editor
 EditorOptions.wrappingIndent.defaultValue = WrappingIndent.None;
diff --git a/src/vs/editor/editor.main.ts b/src/vs/editor/editor.main.ts
index 23d547570e9..fbdf6a7219e 100644
--- a/src/vs/editor/editor.main.ts
+++ b/src/vs/editor/editor.main.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/editor/editor.all';
-import 'vs/editor/standalone/browser/iPadShowKeyboard/iPadShowKeyboard';
-import 'vs/editor/standalone/browser/inspectTokens/inspectTokens';
-import 'vs/editor/standalone/browser/quickAccess/standaloneHelpQuickAccess';
-import 'vs/editor/standalone/browser/quickAccess/standaloneGotoLineQuickAccess';
-import 'vs/editor/standalone/browser/quickAccess/standaloneGotoSymbolQuickAccess';
-import 'vs/editor/standalone/browser/quickAccess/standaloneCommandsQuickAccess';
-import 'vs/editor/standalone/browser/referenceSearch/standaloneReferenceSearch';
-import 'vs/editor/standalone/browser/toggleHighContrast/toggleHighContrast';
+import './editor.all.js';
+import './standalone/browser/iPadShowKeyboard/iPadShowKeyboard.js';
+import './standalone/browser/inspectTokens/inspectTokens.js';
+import './standalone/browser/quickAccess/standaloneHelpQuickAccess.js';
+import './standalone/browser/quickAccess/standaloneGotoLineQuickAccess.js';
+import './standalone/browser/quickAccess/standaloneGotoSymbolQuickAccess.js';
+import './standalone/browser/quickAccess/standaloneCommandsQuickAccess.js';
+import './standalone/browser/referenceSearch/standaloneReferenceSearch.js';
+import './standalone/browser/toggleHighContrast/toggleHighContrast.js';
 
-export * from 'vs/editor/editor.api';
+export * from './editor.api.js';
diff --git a/src/vs/editor/editor.worker.ts b/src/vs/editor/editor.worker.ts
index 7c53a6094b2..0fd98caff25 100644
--- a/src/vs/editor/editor.worker.ts
+++ b/src/vs/editor/editor.worker.ts
@@ -3,30 +3,4 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SimpleWorkerServer } from 'vs/base/common/worker/simpleWorker';
-import { EditorSimpleWorker } from 'vs/editor/common/services/editorSimpleWorker';
-import { IEditorWorkerHost } from 'vs/editor/common/services/editorWorkerHost';
-
-let initialized = false;
-
-export function initialize(foreignModule: any) {
-	if (initialized) {
-		return;
-	}
-	initialized = true;
-
-	const simpleWorker = new SimpleWorkerServer((msg) => {
-		globalThis.postMessage(msg);
-	}, (host: IEditorWorkerHost) => new EditorSimpleWorker(host, foreignModule));
-
-	globalThis.onmessage = (e: MessageEvent) => {
-		simpleWorker.onmessage(e.data);
-	};
-}
-
-globalThis.onmessage = (e: MessageEvent) => {
-	// Ignore first message in this case and initialize if not yet initialized
-	if (!initialized) {
-		initialize(null);
-	}
-};
+export * from './common/services/editorWorkerBootstrap.js';
diff --git a/src/vs/editor/standalone/browser/colorizer.ts b/src/vs/editor/standalone/browser/colorizer.ts
index 1562ff2cd1d..0136434b1ff 100644
--- a/src/vs/editor/standalone/browser/colorizer.ts
+++ b/src/vs/editor/standalone/browser/colorizer.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createTrustedTypesPolicy } from 'vs/base/browser/trustedTypes';
-import * as strings from 'vs/base/common/strings';
-import { ColorId, FontStyle, MetadataConsts } from 'vs/editor/common/encodedTokenAttributes';
-import { ILanguageIdCodec, ITokenizationSupport, TokenizationRegistry } from 'vs/editor/common/languages';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ITextModel } from 'vs/editor/common/model';
-import { IViewLineTokens, LineTokens } from 'vs/editor/common/tokens/lineTokens';
-import { RenderLineInput, renderViewLine2 as renderViewLine } from 'vs/editor/common/viewLayout/viewLineRenderer';
-import { ViewLineRenderingData } from 'vs/editor/common/viewModel';
-import { MonarchTokenizer } from 'vs/editor/standalone/common/monarch/monarchLexer';
-import { IStandaloneThemeService } from 'vs/editor/standalone/common/standaloneTheme';
+import { createTrustedTypesPolicy } from '../../../base/browser/trustedTypes.js';
+import * as strings from '../../../base/common/strings.js';
+import { ColorId, FontStyle, MetadataConsts } from '../../common/encodedTokenAttributes.js';
+import { ILanguageIdCodec, ITokenizationSupport, TokenizationRegistry } from '../../common/languages.js';
+import { ILanguageService } from '../../common/languages/language.js';
+import { ITextModel } from '../../common/model.js';
+import { IViewLineTokens, LineTokens } from '../../common/tokens/lineTokens.js';
+import { RenderLineInput, renderViewLine2 as renderViewLine } from '../../common/viewLayout/viewLineRenderer.js';
+import { ViewLineRenderingData } from '../../common/viewModel.js';
+import { MonarchTokenizer } from '../common/monarch/monarchLexer.js';
+import { IStandaloneThemeService } from '../common/standaloneTheme.js';
 
 const ttPolicy = createTrustedTypesPolicy('standaloneColorizer', { createHTML: value => value });
 
diff --git a/src/vs/editor/standalone/browser/iPadShowKeyboard/iPadShowKeyboard.ts b/src/vs/editor/standalone/browser/iPadShowKeyboard/iPadShowKeyboard.ts
index 9ac07b2b232..3c3ce892ce9 100644
--- a/src/vs/editor/standalone/browser/iPadShowKeyboard/iPadShowKeyboard.ts
+++ b/src/vs/editor/standalone/browser/iPadShowKeyboard/iPadShowKeyboard.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./iPadShowKeyboard';
-import * as dom from 'vs/base/browser/dom';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, OverlayWidgetPositionPreference } from 'vs/editor/browser/editorBrowser';
-import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { isIOS } from 'vs/base/common/platform';
+import './iPadShowKeyboard.css';
+import * as dom from '../../../../base/browser/dom.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, OverlayWidgetPositionPreference } from '../../../browser/editorBrowser.js';
+import { EditorContributionInstantiation, registerEditorContribution } from '../../../browser/editorExtensions.js';
+import { IEditorContribution } from '../../../common/editorCommon.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { isIOS } from '../../../../base/common/platform.js';
 
 export class IPadShowKeyboard extends Disposable implements IEditorContribution {
 
diff --git a/src/vs/editor/standalone/browser/inspectTokens/inspectTokens.ts b/src/vs/editor/standalone/browser/inspectTokens/inspectTokens.ts
index da8a7c35334..2eb75568747 100644
--- a/src/vs/editor/standalone/browser/inspectTokens/inspectTokens.ts
+++ b/src/vs/editor/standalone/browser/inspectTokens/inspectTokens.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./inspectTokens';
-import { $, append, reset } from 'vs/base/browser/dom';
-import { CharCode } from 'vs/base/common/charCode';
-import { Color } from 'vs/base/common/color';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ContentWidgetPositionPreference, IActiveCodeEditor, ICodeEditor, IContentWidget, IContentWidgetPosition } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, ServicesAccessor, registerEditorAction, registerEditorContribution, EditorContributionInstantiation } from 'vs/editor/browser/editorExtensions';
-import { Position } from 'vs/editor/common/core/position';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { ITextModel } from 'vs/editor/common/model';
-import { IState, ITokenizationSupport, TokenizationRegistry, ILanguageIdCodec, Token } from 'vs/editor/common/languages';
-import { FontStyle, StandardTokenType, TokenMetadata } from 'vs/editor/common/encodedTokenAttributes';
-import { NullState, nullTokenize, nullTokenizeEncoded } from 'vs/editor/common/languages/nullTokenize';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IStandaloneThemeService } from 'vs/editor/standalone/common/standaloneTheme';
-import { InspectTokensNLS } from 'vs/editor/common/standaloneStrings';
+import './inspectTokens.css';
+import { $, append, reset } from '../../../../base/browser/dom.js';
+import { CharCode } from '../../../../base/common/charCode.js';
+import { Color } from '../../../../base/common/color.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ContentWidgetPositionPreference, IActiveCodeEditor, ICodeEditor, IContentWidget, IContentWidgetPosition } from '../../../browser/editorBrowser.js';
+import { EditorAction, ServicesAccessor, registerEditorAction, registerEditorContribution, EditorContributionInstantiation } from '../../../browser/editorExtensions.js';
+import { Position } from '../../../common/core/position.js';
+import { IEditorContribution } from '../../../common/editorCommon.js';
+import { ITextModel } from '../../../common/model.js';
+import { IState, ITokenizationSupport, TokenizationRegistry, ILanguageIdCodec, Token } from '../../../common/languages.js';
+import { FontStyle, StandardTokenType, TokenMetadata } from '../../../common/encodedTokenAttributes.js';
+import { NullState, nullTokenize, nullTokenizeEncoded } from '../../../common/languages/nullTokenize.js';
+import { ILanguageService } from '../../../common/languages/language.js';
+import { IStandaloneThemeService } from '../../common/standaloneTheme.js';
+import { InspectTokensNLS } from '../../../common/standaloneStrings.js';
 
 
 class InspectTokensController extends Disposable implements IEditorContribution {
diff --git a/src/vs/editor/standalone/browser/quickAccess/standaloneCommandsQuickAccess.ts b/src/vs/editor/standalone/browser/quickAccess/standaloneCommandsQuickAccess.ts
index 171a395e6f3..b0b4d80980b 100644
--- a/src/vs/editor/standalone/browser/quickAccess/standaloneCommandsQuickAccess.ts
+++ b/src/vs/editor/standalone/browser/quickAccess/standaloneCommandsQuickAccess.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IQuickAccessRegistry, Extensions } from 'vs/platform/quickinput/common/quickAccess';
-import { QuickCommandNLS } from 'vs/editor/common/standaloneStrings';
-import { ICommandQuickPick } from 'vs/platform/quickinput/browser/commandsQuickAccess';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { AbstractEditorCommandsQuickAccessProvider } from 'vs/editor/contrib/quickAccess/browser/commandsQuickAccess';
-import { IEditor } from 'vs/editor/common/editorCommon';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { EditorAction, registerEditorAction } from 'vs/editor/browser/editorExtensions';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IQuickAccessRegistry, Extensions } from '../../../../platform/quickinput/common/quickAccess.js';
+import { QuickCommandNLS } from '../../../common/standaloneStrings.js';
+import { ICommandQuickPick } from '../../../../platform/quickinput/browser/commandsQuickAccess.js';
+import { ICodeEditorService } from '../../../browser/services/codeEditorService.js';
+import { AbstractEditorCommandsQuickAccessProvider } from '../../../contrib/quickAccess/browser/commandsQuickAccess.js';
+import { IEditor } from '../../../common/editorCommon.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { EditorAction, registerEditorAction } from '../../../browser/editorExtensions.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
 
 export class StandaloneCommandsQuickAccessProvider extends AbstractEditorCommandsQuickAccessProvider {
 
diff --git a/src/vs/editor/standalone/browser/quickAccess/standaloneGotoLineQuickAccess.ts b/src/vs/editor/standalone/browser/quickAccess/standaloneGotoLineQuickAccess.ts
index c6ccecf960c..8fdee5d82f8 100644
--- a/src/vs/editor/standalone/browser/quickAccess/standaloneGotoLineQuickAccess.ts
+++ b/src/vs/editor/standalone/browser/quickAccess/standaloneGotoLineQuickAccess.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { AbstractGotoLineQuickAccessProvider } from 'vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IQuickAccessRegistry, Extensions } from 'vs/platform/quickinput/common/quickAccess';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { GoToLineNLS } from 'vs/editor/common/standaloneStrings';
-import { Event } from 'vs/base/common/event';
-import { EditorAction, registerEditorAction, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
+import { AbstractGotoLineQuickAccessProvider } from '../../../contrib/quickAccess/browser/gotoLineQuickAccess.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IQuickAccessRegistry, Extensions } from '../../../../platform/quickinput/common/quickAccess.js';
+import { ICodeEditorService } from '../../../browser/services/codeEditorService.js';
+import { GoToLineNLS } from '../../../common/standaloneStrings.js';
+import { Event } from '../../../../base/common/event.js';
+import { EditorAction, registerEditorAction, ServicesAccessor } from '../../../browser/editorExtensions.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { KeyMod, KeyCode } from '../../../../base/common/keyCodes.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
 
 export class StandaloneGotoLineQuickAccessProvider extends AbstractGotoLineQuickAccessProvider {
 
diff --git a/src/vs/editor/standalone/browser/quickAccess/standaloneGotoSymbolQuickAccess.ts b/src/vs/editor/standalone/browser/quickAccess/standaloneGotoSymbolQuickAccess.ts
index 0c2cfb8617b..aa05b05255f 100644
--- a/src/vs/editor/standalone/browser/quickAccess/standaloneGotoSymbolQuickAccess.ts
+++ b/src/vs/editor/standalone/browser/quickAccess/standaloneGotoSymbolQuickAccess.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/base/browser/ui/codicons/codiconStyles'; // The codicon symbol styles are defined here and must be loaded
-import 'vs/editor/contrib/symbolIcons/browser/symbolIcons'; // The codicon symbol colors are defined here and must be loaded to get colors
-import { AbstractGotoSymbolQuickAccessProvider } from 'vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IQuickAccessRegistry, Extensions } from 'vs/platform/quickinput/common/quickAccess';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { QuickOutlineNLS } from 'vs/editor/common/standaloneStrings';
-import { Event } from 'vs/base/common/event';
-import { EditorAction, registerEditorAction } from 'vs/editor/browser/editorExtensions';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IQuickInputService, ItemActivation } from 'vs/platform/quickinput/common/quickInput';
-import { IOutlineModelService } from 'vs/editor/contrib/documentSymbols/browser/outlineModel';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
+import '../../../../base/browser/ui/codicons/codiconStyles.js'; // The codicon symbol styles are defined here and must be loaded
+import '../../../contrib/symbolIcons/browser/symbolIcons.js'; // The codicon symbol colors are defined here and must be loaded to get colors
+import { AbstractGotoSymbolQuickAccessProvider } from '../../../contrib/quickAccess/browser/gotoSymbolQuickAccess.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IQuickAccessRegistry, Extensions } from '../../../../platform/quickinput/common/quickAccess.js';
+import { ICodeEditorService } from '../../../browser/services/codeEditorService.js';
+import { QuickOutlineNLS } from '../../../common/standaloneStrings.js';
+import { Event } from '../../../../base/common/event.js';
+import { EditorAction, registerEditorAction } from '../../../browser/editorExtensions.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { KeyMod, KeyCode } from '../../../../base/common/keyCodes.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IQuickInputService, ItemActivation } from '../../../../platform/quickinput/common/quickInput.js';
+import { IOutlineModelService } from '../../../contrib/documentSymbols/browser/outlineModel.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 
 export class StandaloneGotoSymbolQuickAccessProvider extends AbstractGotoSymbolQuickAccessProvider {
 
diff --git a/src/vs/editor/standalone/browser/quickAccess/standaloneHelpQuickAccess.ts b/src/vs/editor/standalone/browser/quickAccess/standaloneHelpQuickAccess.ts
index 31c5511035c..aae4222cfc3 100644
--- a/src/vs/editor/standalone/browser/quickAccess/standaloneHelpQuickAccess.ts
+++ b/src/vs/editor/standalone/browser/quickAccess/standaloneHelpQuickAccess.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IQuickAccessRegistry, Extensions } from 'vs/platform/quickinput/common/quickAccess';
-import { QuickHelpNLS } from 'vs/editor/common/standaloneStrings';
-import { HelpQuickAccessProvider } from 'vs/platform/quickinput/browser/helpQuickAccess';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IQuickAccessRegistry, Extensions } from '../../../../platform/quickinput/common/quickAccess.js';
+import { QuickHelpNLS } from '../../../common/standaloneStrings.js';
+import { HelpQuickAccessProvider } from '../../../../platform/quickinput/browser/helpQuickAccess.js';
 
 Registry.as<IQuickAccessRegistry>(Extensions.Quickaccess).registerQuickAccessProvider({
 	ctor: HelpQuickAccessProvider,
diff --git a/src/vs/editor/standalone/browser/quickInput/standaloneQuickInputService.ts b/src/vs/editor/standalone/browser/quickInput/standaloneQuickInputService.ts
index e251afa2543..d46bbff59c3 100644
--- a/src/vs/editor/standalone/browser/quickInput/standaloneQuickInputService.ts
+++ b/src/vs/editor/standalone/browser/quickInput/standaloneQuickInputService.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./standaloneQuickInput';
-import { Event } from 'vs/base/common/event';
-import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, OverlayWidgetPositionPreference } from 'vs/editor/browser/editorBrowser';
-import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IQuickInputService, IQuickPickItem, IQuickPick, IInputBox, IQuickNavigateConfiguration, IPickOptions, QuickPickInput, IInputOptions, IQuickWidget } from 'vs/platform/quickinput/common/quickInput';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { EditorScopedLayoutService } from 'vs/editor/standalone/browser/standaloneLayoutService';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { QuickInputController, IQuickInputControllerHost } from 'vs/platform/quickinput/browser/quickInputController';
-import { QuickInputService } from 'vs/platform/quickinput/browser/quickInputService';
-import { createSingleCallFunction } from 'vs/base/common/functional';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import './standaloneQuickInput.css';
+import { Event } from '../../../../base/common/event.js';
+import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, OverlayWidgetPositionPreference } from '../../../browser/editorBrowser.js';
+import { EditorContributionInstantiation, registerEditorContribution } from '../../../browser/editorExtensions.js';
+import { IEditorContribution } from '../../../common/editorCommon.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IQuickInputService, IQuickPickItem, IQuickPick, IInputBox, IQuickNavigateConfiguration, IPickOptions, QuickPickInput, IInputOptions, IQuickWidget } from '../../../../platform/quickinput/common/quickInput.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { EditorScopedLayoutService } from '../standaloneLayoutService.js';
+import { ICodeEditorService } from '../../../browser/services/codeEditorService.js';
+import { QuickInputController, IQuickInputControllerHost } from '../../../../platform/quickinput/browser/quickInputController.js';
+import { QuickInputService } from '../../../../platform/quickinput/browser/quickInputService.js';
+import { createSingleCallFunction } from '../../../../base/common/functional.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 
 class EditorScopedQuickInputService extends QuickInputService {
 
@@ -111,7 +111,7 @@ export class StandaloneQuickInputService implements IQuickInputService {
 	) {
 	}
 
-	pick<T extends IQuickPickItem, O extends IPickOptions<T>>(picks: Promise<QuickPickInput<T>[]> | QuickPickInput<T>[], options: O = <O>{}, token: CancellationToken = CancellationToken.None): Promise<(O extends { canPickMany: true } ? T[] : T) | undefined> {
+	pick<T extends IQuickPickItem, O extends IPickOptions<T>>(picks: Promise<QuickPickInput<T>[]> | QuickPickInput<T>[], options?: O, token: CancellationToken = CancellationToken.None): Promise<(O extends { canPickMany: true } ? T[] : T) | undefined> {
 		return (this.activeService as unknown as QuickInputController /* TS fail */).pick(picks, options, token);
 	}
 
@@ -119,8 +119,10 @@ export class StandaloneQuickInputService implements IQuickInputService {
 		return this.activeService.input(options, token);
 	}
 
-	createQuickPick<T extends IQuickPickItem>(): IQuickPick<T> {
-		return this.activeService.createQuickPick();
+	createQuickPick<T extends IQuickPickItem>(options: { useSeparators: true }): IQuickPick<T, { useSeparators: true }>;
+	createQuickPick<T extends IQuickPickItem>(options?: { useSeparators: boolean }): IQuickPick<T, { useSeparators: false }>;
+	createQuickPick<T extends IQuickPickItem>(options: { useSeparators: boolean } = { useSeparators: false }): IQuickPick<T, { useSeparators: boolean }> {
+		return this.activeService.createQuickPick(options);
 	}
 
 	createInputBox(): IInputBox {
diff --git a/src/vs/editor/standalone/browser/referenceSearch/standaloneReferenceSearch.ts b/src/vs/editor/standalone/browser/referenceSearch/standaloneReferenceSearch.ts
index 23f8f72cced..4f287b772ea 100644
--- a/src/vs/editor/standalone/browser/referenceSearch/standaloneReferenceSearch.ts
+++ b/src/vs/editor/standalone/browser/referenceSearch/standaloneReferenceSearch.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { ReferencesController } from 'vs/editor/contrib/gotoSymbol/browser/peek/referencesController';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IStorageService } from 'vs/platform/storage/common/storage';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorContributionInstantiation, registerEditorContribution } from '../../../browser/editorExtensions.js';
+import { ICodeEditorService } from '../../../browser/services/codeEditorService.js';
+import { ReferencesController } from '../../../contrib/gotoSymbol/browser/peek/referencesController.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
 
 export class StandaloneReferencesController extends ReferencesController {
 
diff --git a/src/vs/editor/standalone/browser/standaloneCodeEditor.ts b/src/vs/editor/standalone/browser/standaloneCodeEditor.ts
index 84deb53c57d..2b7abea38c1 100644
--- a/src/vs/editor/standalone/browser/standaloneCodeEditor.ts
+++ b/src/vs/editor/standalone/browser/standaloneCodeEditor.ts
@@ -3,45 +3,45 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as aria from 'vs/base/browser/ui/aria/aria';
-import { Disposable, IDisposable, toDisposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { ICodeEditor, IDiffEditor, IDiffEditorConstructionOptions } from 'vs/editor/browser/editorBrowser';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { IDiffEditorOptions, IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { InternalEditorAction } from 'vs/editor/common/editorAction';
-import { IModelChangedEvent } from 'vs/editor/common/editorCommon';
-import { ITextModel } from 'vs/editor/common/model';
-import { StandaloneKeybindingService, updateConfigurationService } from 'vs/editor/standalone/browser/standaloneServices';
-import { IStandaloneThemeService } from 'vs/editor/standalone/common/standaloneTheme';
-import { IMenuItem, MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
-import { CommandsRegistry, ICommandHandler, ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr, ContextKeyValue, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { StandaloneCodeEditorNLS } from 'vs/editor/common/standaloneStrings';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { IEditorProgressService } from 'vs/platform/progress/common/progress';
-import { StandaloneThemeService } from 'vs/editor/standalone/browser/standaloneThemeService';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILanguageSelection, ILanguageService } from 'vs/editor/common/languages/language';
-import { URI } from 'vs/base/common/uri';
-import { StandaloneCodeEditorService } from 'vs/editor/standalone/browser/standaloneCodeEditorService';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { IEditorConstructionOptions } from 'vs/editor/browser/config/editorConfiguration';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditor/diffEditorWidget';
-import { IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { mainWindow } from 'vs/base/browser/window';
-import { setHoverDelegateFactory } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { IHoverService, WorkbenchHoverDelegate } from 'vs/platform/hover/browser/hover';
-import { setBaseLayerHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate2';
+import * as aria from '../../../base/browser/ui/aria/aria.js';
+import { Disposable, IDisposable, toDisposable, DisposableStore } from '../../../base/common/lifecycle.js';
+import { ICodeEditor, IDiffEditor, IDiffEditorConstructionOptions } from '../../browser/editorBrowser.js';
+import { ICodeEditorService } from '../../browser/services/codeEditorService.js';
+import { CodeEditorWidget } from '../../browser/widget/codeEditor/codeEditorWidget.js';
+import { IDiffEditorOptions, IEditorOptions } from '../../common/config/editorOptions.js';
+import { InternalEditorAction } from '../../common/editorAction.js';
+import { IModelChangedEvent } from '../../common/editorCommon.js';
+import { ITextModel } from '../../common/model.js';
+import { StandaloneKeybindingService, updateConfigurationService } from './standaloneServices.js';
+import { IStandaloneThemeService } from '../common/standaloneTheme.js';
+import { IMenuItem, MenuId, MenuRegistry } from '../../../platform/actions/common/actions.js';
+import { CommandsRegistry, ICommandHandler, ICommandService } from '../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr, ContextKeyValue, IContextKey, IContextKeyService } from '../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService, ServicesAccessor } from '../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../platform/keybinding/common/keybinding.js';
+import { INotificationService } from '../../../platform/notification/common/notification.js';
+import { IThemeService } from '../../../platform/theme/common/themeService.js';
+import { IAccessibilityService } from '../../../platform/accessibility/common/accessibility.js';
+import { StandaloneCodeEditorNLS } from '../../common/standaloneStrings.js';
+import { IClipboardService } from '../../../platform/clipboard/common/clipboardService.js';
+import { IEditorProgressService } from '../../../platform/progress/common/progress.js';
+import { StandaloneThemeService } from './standaloneThemeService.js';
+import { IModelService } from '../../common/services/model.js';
+import { ILanguageSelection, ILanguageService } from '../../common/languages/language.js';
+import { URI } from '../../../base/common/uri.js';
+import { StandaloneCodeEditorService } from './standaloneCodeEditorService.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../../common/languages/modesRegistry.js';
+import { ILanguageConfigurationService } from '../../common/languages/languageConfigurationRegistry.js';
+import { IEditorConstructionOptions } from '../../browser/config/editorConfiguration.js';
+import { ILanguageFeaturesService } from '../../common/services/languageFeatures.js';
+import { DiffEditorWidget } from '../../browser/widget/diffEditor/diffEditorWidget.js';
+import { IAccessibilitySignalService } from '../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { mainWindow } from '../../../base/browser/window.js';
+import { setHoverDelegateFactory } from '../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { IHoverService, WorkbenchHoverDelegate } from '../../../platform/hover/browser/hover.js';
+import { setBaseLayerHoverDelegate } from '../../../base/browser/ui/hover/hoverDelegate2.js';
 
 /**
  * Description of an action contribution
@@ -283,7 +283,6 @@ export class StandaloneCodeEditor extends CodeEditorWidget implements IStandalon
 	) {
 		const options = { ..._options };
 		options.ariaLabel = options.ariaLabel || StandaloneCodeEditorNLS.editorViewAccessibleLabel;
-		options.ariaLabel = options.ariaLabel + ';' + (StandaloneCodeEditorNLS.accessibilityHelpMessage);
 		super(domElement, options, {}, instantiationService, codeEditorService, commandService, contextKeyService, themeService, notificationService, accessibilityService, languageConfigurationService, languageFeaturesService);
 
 		if (keybindingService instanceof StandaloneKeybindingService) {
diff --git a/src/vs/editor/standalone/browser/standaloneCodeEditorService.ts b/src/vs/editor/standalone/browser/standaloneCodeEditorService.ts
index fff134d4902..700140df35c 100644
--- a/src/vs/editor/standalone/browser/standaloneCodeEditorService.ts
+++ b/src/vs/editor/standalone/browser/standaloneCodeEditorService.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { windowOpenNoOpener } from 'vs/base/browser/dom';
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { AbstractCodeEditorService } from 'vs/editor/browser/services/abstractCodeEditorService';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { IRange } from 'vs/editor/common/core/range';
-import { ScrollType } from 'vs/editor/common/editorCommon';
-import { ITextModel } from 'vs/editor/common/model';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ITextResourceEditorInput } from 'vs/platform/editor/common/editor';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { windowOpenNoOpener } from '../../../base/browser/dom.js';
+import { Schemas } from '../../../base/common/network.js';
+import { URI } from '../../../base/common/uri.js';
+import { ICodeEditor } from '../../browser/editorBrowser.js';
+import { AbstractCodeEditorService } from '../../browser/services/abstractCodeEditorService.js';
+import { ICodeEditorService } from '../../browser/services/codeEditorService.js';
+import { IRange } from '../../common/core/range.js';
+import { ScrollType } from '../../common/editorCommon.js';
+import { ITextModel } from '../../common/model.js';
+import { IContextKey, IContextKeyService } from '../../../platform/contextkey/common/contextkey.js';
+import { ITextResourceEditorInput } from '../../../platform/editor/common/editor.js';
+import { InstantiationType, registerSingleton } from '../../../platform/instantiation/common/extensions.js';
+import { IThemeService } from '../../../platform/theme/common/themeService.js';
 
 export class StandaloneCodeEditorService extends AbstractCodeEditorService {
 
diff --git a/src/vs/editor/standalone/browser/standaloneEditor.ts b/src/vs/editor/standalone/browser/standaloneEditor.ts
index d1a70eba3d2..92df7c57a64 100644
--- a/src/vs/editor/standalone/browser/standaloneEditor.ts
+++ b/src/vs/editor/standalone/browser/standaloneEditor.ts
@@ -3,43 +3,42 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { mainWindow } from 'vs/base/browser/window';
-import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { splitLines } from 'vs/base/common/strings';
-import { URI } from 'vs/base/common/uri';
-import 'vs/css!./standalone-tokens';
-import { FontMeasurements } from 'vs/editor/browser/config/fontMeasurements';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorCommand, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { IWebWorkerOptions, MonacoWebWorker, createWebWorker as actualCreateWebWorker } from 'vs/editor/browser/services/webWorker';
-import { ApplyUpdateResult, ConfigurationChangedEvent, EditorOptions } from 'vs/editor/common/config/editorOptions';
-import { EditorZoom } from 'vs/editor/common/config/editorZoom';
-import { BareFontInfo, FontInfo } from 'vs/editor/common/config/fontInfo';
-import { IPosition } from 'vs/editor/common/core/position';
-import { IRange } from 'vs/editor/common/core/range';
-import { EditorType, IDiffEditor } from 'vs/editor/common/editorCommon';
-import * as languages from 'vs/editor/common/languages';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { NullState, nullTokenize } from 'vs/editor/common/languages/nullTokenize';
-import { FindMatch, ITextModel, TextModelResolvedOptions } from 'vs/editor/common/model';
-import { IModelService } from 'vs/editor/common/services/model';
-import * as standaloneEnums from 'vs/editor/common/standalone/standaloneEnums';
-import { Colorizer, IColorizerElementOptions, IColorizerOptions } from 'vs/editor/standalone/browser/colorizer';
-import { IActionDescriptor, IStandaloneCodeEditor, IStandaloneDiffEditor, IStandaloneDiffEditorConstructionOptions, IStandaloneEditorConstructionOptions, StandaloneDiffEditor2, StandaloneEditor, createTextModel } from 'vs/editor/standalone/browser/standaloneCodeEditor';
-import { IEditorOverrideServices, StandaloneKeybindingService, StandaloneServices } from 'vs/editor/standalone/browser/standaloneServices';
-import { StandaloneThemeService } from 'vs/editor/standalone/browser/standaloneThemeService';
-import { IStandaloneThemeData, IStandaloneThemeService } from 'vs/editor/standalone/common/standaloneTheme';
-import { IMenuItem, MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
-import { CommandsRegistry, ICommandHandler } from 'vs/platform/commands/common/commands';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { ITextResourceEditorInput } from 'vs/platform/editor/common/editor';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IMarker, IMarkerData, IMarkerService } from 'vs/platform/markers/common/markers';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { MultiDiffEditorWidget } from 'vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidget';
+import { mainWindow } from '../../../base/browser/window.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../base/common/lifecycle.js';
+import { splitLines } from '../../../base/common/strings.js';
+import { URI } from '../../../base/common/uri.js';
+import './standalone-tokens.css';
+import { FontMeasurements } from '../../browser/config/fontMeasurements.js';
+import { ICodeEditor } from '../../browser/editorBrowser.js';
+import { EditorCommand, ServicesAccessor } from '../../browser/editorExtensions.js';
+import { ICodeEditorService } from '../../browser/services/codeEditorService.js';
+import { IWebWorkerOptions, MonacoWebWorker, createWebWorker as actualCreateWebWorker } from './standaloneWebWorker.js';
+import { ApplyUpdateResult, ConfigurationChangedEvent, EditorOptions } from '../../common/config/editorOptions.js';
+import { EditorZoom } from '../../common/config/editorZoom.js';
+import { BareFontInfo, FontInfo } from '../../common/config/fontInfo.js';
+import { IPosition } from '../../common/core/position.js';
+import { IRange } from '../../common/core/range.js';
+import { EditorType, IDiffEditor } from '../../common/editorCommon.js';
+import * as languages from '../../common/languages.js';
+import { ILanguageService } from '../../common/languages/language.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../../common/languages/modesRegistry.js';
+import { NullState, nullTokenize } from '../../common/languages/nullTokenize.js';
+import { FindMatch, ITextModel, TextModelResolvedOptions } from '../../common/model.js';
+import { IModelService } from '../../common/services/model.js';
+import * as standaloneEnums from '../../common/standalone/standaloneEnums.js';
+import { Colorizer, IColorizerElementOptions, IColorizerOptions } from './colorizer.js';
+import { IActionDescriptor, IStandaloneCodeEditor, IStandaloneDiffEditor, IStandaloneDiffEditorConstructionOptions, IStandaloneEditorConstructionOptions, StandaloneDiffEditor2, StandaloneEditor, createTextModel } from './standaloneCodeEditor.js';
+import { IEditorOverrideServices, StandaloneKeybindingService, StandaloneServices } from './standaloneServices.js';
+import { StandaloneThemeService } from './standaloneThemeService.js';
+import { IStandaloneThemeData, IStandaloneThemeService } from '../common/standaloneTheme.js';
+import { IMenuItem, MenuId, MenuRegistry } from '../../../platform/actions/common/actions.js';
+import { CommandsRegistry, ICommandHandler } from '../../../platform/commands/common/commands.js';
+import { ContextKeyExpr } from '../../../platform/contextkey/common/contextkey.js';
+import { ITextResourceEditorInput } from '../../../platform/editor/common/editor.js';
+import { IKeybindingService } from '../../../platform/keybinding/common/keybinding.js';
+import { IMarker, IMarkerData, IMarkerService } from '../../../platform/markers/common/markers.js';
+import { IOpenerService } from '../../../platform/opener/common/opener.js';
+import { MultiDiffEditorWidget } from '../../browser/widget/multiDiffEditor/multiDiffEditorWidget.js';
 
 /**
  * Create a new editor under `domElement`.
@@ -333,7 +332,7 @@ export function onDidChangeModelLanguage(listener: (e: { readonly model: ITextMo
  * Specify an AMD module to load that will `create` an object that will be proxied.
  */
 export function createWebWorker<T extends object>(opts: IWebWorkerOptions): MonacoWebWorker<T> {
-	return actualCreateWebWorker<T>(StandaloneServices.get(IModelService), StandaloneServices.get(ILanguageConfigurationService), opts);
+	return actualCreateWebWorker<T>(StandaloneServices.get(IModelService), opts);
 }
 
 /**
diff --git a/src/vs/editor/standalone/browser/standaloneLanguages.ts b/src/vs/editor/standalone/browser/standaloneLanguages.ts
index c91190d439c..849e4dc42d7 100644
--- a/src/vs/editor/standalone/browser/standaloneLanguages.ts
+++ b/src/vs/editor/standalone/browser/standaloneLanguages.ts
@@ -3,28 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Color } from 'vs/base/common/color';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { MetadataConsts } from 'vs/editor/common/encodedTokenAttributes';
-import * as languages from 'vs/editor/common/languages';
-import { ILanguageExtensionPoint, ILanguageService } from 'vs/editor/common/languages/language';
-import { LanguageConfiguration } from 'vs/editor/common/languages/languageConfiguration';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { ModesRegistry } from 'vs/editor/common/languages/modesRegistry';
-import { LanguageSelector } from 'vs/editor/common/languageSelector';
-import * as model from 'vs/editor/common/model';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import * as standaloneEnums from 'vs/editor/common/standalone/standaloneEnums';
-import { StandaloneServices } from 'vs/editor/standalone/browser/standaloneServices';
-import { compile } from 'vs/editor/standalone/common/monarch/monarchCompile';
-import { MonarchTokenizer } from 'vs/editor/standalone/common/monarch/monarchLexer';
-import { IMonarchLanguage } from 'vs/editor/standalone/common/monarch/monarchTypes';
-import { IStandaloneThemeService } from 'vs/editor/standalone/common/standaloneTheme';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IMarkerData, IMarkerService } from 'vs/platform/markers/common/markers';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Color } from '../../../base/common/color.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { Position } from '../../common/core/position.js';
+import { Range } from '../../common/core/range.js';
+import { MetadataConsts } from '../../common/encodedTokenAttributes.js';
+import * as languages from '../../common/languages.js';
+import { ILanguageExtensionPoint, ILanguageService } from '../../common/languages/language.js';
+import { LanguageConfiguration } from '../../common/languages/languageConfiguration.js';
+import { ILanguageConfigurationService } from '../../common/languages/languageConfigurationRegistry.js';
+import { ModesRegistry } from '../../common/languages/modesRegistry.js';
+import { LanguageSelector } from '../../common/languageSelector.js';
+import * as model from '../../common/model.js';
+import { ILanguageFeaturesService } from '../../common/services/languageFeatures.js';
+import * as standaloneEnums from '../../common/standalone/standaloneEnums.js';
+import { StandaloneServices } from './standaloneServices.js';
+import { compile } from '../common/monarch/monarchCompile.js';
+import { MonarchTokenizer } from '../common/monarch/monarchLexer.js';
+import { IMonarchLanguage } from '../common/monarch/monarchTypes.js';
+import { IStandaloneThemeService } from '../common/standaloneTheme.js';
+import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
+import { IMarkerData, IMarkerService } from '../../../platform/markers/common/markers.js';
 
 /**
  * Register information about a new language.
diff --git a/src/vs/editor/standalone/browser/standaloneLayoutService.ts b/src/vs/editor/standalone/browser/standaloneLayoutService.ts
index 8b55de680ba..18ec806b162 100644
--- a/src/vs/editor/standalone/browser/standaloneLayoutService.ts
+++ b/src/vs/editor/standalone/browser/standaloneLayoutService.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { mainWindow } from 'vs/base/browser/window';
-import { coalesce, firstOrDefault } from 'vs/base/common/arrays';
-import { Event } from 'vs/base/common/event';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ILayoutOffsetInfo, ILayoutService } from 'vs/platform/layout/browser/layoutService';
+import * as dom from '../../../base/browser/dom.js';
+import { mainWindow } from '../../../base/browser/window.js';
+import { coalesce } from '../../../base/common/arrays.js';
+import { Event } from '../../../base/common/event.js';
+import { ICodeEditorService } from '../../browser/services/codeEditorService.js';
+import { InstantiationType, registerSingleton } from '../../../platform/instantiation/common/extensions.js';
+import { ILayoutOffsetInfo, ILayoutService } from '../../../platform/layout/browser/layoutService.js';
 
 class StandaloneLayoutService implements ILayoutService {
 	declare readonly _serviceBrand: undefined;
@@ -21,7 +21,7 @@ class StandaloneLayoutService implements ILayoutService {
 	readonly onDidAddContainer = Event.None;
 
 	get mainContainer(): HTMLElement {
-		return firstOrDefault(this._codeEditorService.listCodeEditors())?.getContainerDomNode() ?? mainWindow.document.body;
+		return this._codeEditorService.listCodeEditors().at(0)?.getContainerDomNode() ?? mainWindow.document.body;
 	}
 
 	get activeContainer(): HTMLElement {
diff --git a/src/vs/editor/standalone/browser/standaloneServices.ts b/src/vs/editor/standalone/browser/standaloneServices.ts
index 9682a3cfb0f..0e6637019c1 100644
--- a/src/vs/editor/standalone/browser/standaloneServices.ts
+++ b/src/vs/editor/standalone/browser/standaloneServices.ts
@@ -3,98 +3,102 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/editor/common/languages/languageConfigurationRegistry';
-import 'vs/editor/standalone/browser/standaloneCodeEditorService';
-import 'vs/editor/standalone/browser/standaloneLayoutService';
-import 'vs/platform/undoRedo/common/undoRedoService';
-import 'vs/editor/common/services/languageFeatureDebounce';
-import 'vs/editor/common/services/semanticTokensStylingService';
-import 'vs/editor/common/services/languageFeaturesService';
-import 'vs/editor/browser/services/hoverService/hoverService';
+import './standaloneCodeEditorService.js';
+import './standaloneLayoutService.js';
+import '../../../platform/undoRedo/common/undoRedoService.js';
+import '../../common/services/languageFeatureDebounce.js';
+import '../../common/services/semanticTokensStylingService.js';
+import '../../common/services/languageFeaturesService.js';
+import '../../browser/services/hoverService/hoverService.js';
 
-import * as strings from 'vs/base/common/strings';
-import * as dom from 'vs/base/browser/dom';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { Emitter, Event, IValueWithChangeEvent, ValueWithChangeEvent } from 'vs/base/common/event';
-import { ResolvedKeybinding, KeyCodeChord, Keybinding, decodeKeybinding } from 'vs/base/common/keybindings';
-import { IDisposable, IReference, ImmortalReference, toDisposable, DisposableStore, Disposable, combinedDisposable } from 'vs/base/common/lifecycle';
-import { OS, isLinux, isMacintosh } from 'vs/base/common/platform';
-import Severity from 'vs/base/common/severity';
-import { URI } from 'vs/base/common/uri';
-import { IBulkEditOptions, IBulkEditResult, IBulkEditService, ResourceEdit, ResourceTextEdit } from 'vs/editor/browser/services/bulkEditService';
-import { isDiffEditorConfigurationKey, isEditorConfigurationKey } from 'vs/editor/common/config/editorConfigurationSchema';
-import { EditOperation, ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { IPosition, Position as Pos } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { ITextModel, ITextSnapshot } from 'vs/editor/common/model';
-import { IModelService } from 'vs/editor/common/services/model';
-import { IResolvedTextEditorModel, ITextModelContentProvider, ITextModelService } from 'vs/editor/common/services/resolverService';
-import { ITextResourceConfigurationService, ITextResourcePropertiesService, ITextResourceConfigurationChangeEvent } from 'vs/editor/common/services/textResourceConfiguration';
-import { CommandsRegistry, ICommandEvent, ICommandHandler, ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationChangeEvent, IConfigurationData, IConfigurationOverrides, IConfigurationService, IConfigurationModel, IConfigurationValue, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
-import { Configuration, ConfigurationModel, ConfigurationChangeEvent } from 'vs/platform/configuration/common/configurationModels';
-import { IContextKeyService, ContextKeyExpression } from 'vs/platform/contextkey/common/contextkey';
-import { IConfirmation, IConfirmationResult, IDialogService, IInputResult, IPrompt, IPromptResult, IPromptWithCustomCancel, IPromptResultWithCancel, IPromptWithDefaultCancel, IPromptBaseButton } from 'vs/platform/dialogs/common/dialogs';
-import { createDecorator, IInstantiationService, ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
-import { AbstractKeybindingService } from 'vs/platform/keybinding/common/abstractKeybindingService';
-import { IKeybindingService, IKeyboardEvent, KeybindingsSchemaContribution } from 'vs/platform/keybinding/common/keybinding';
-import { KeybindingResolver } from 'vs/platform/keybinding/common/keybindingResolver';
-import { IKeybindingItem, KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
-import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayoutResolvedKeybinding';
-import { ILabelService, ResourceLabelFormatter, IFormatterChangeEvent, Verbosity } from 'vs/platform/label/common/label';
-import { INotification, INotificationHandle, INotificationService, IPromptChoice, IPromptOptions, NoOpNotification, IStatusMessageOptions, INotificationSource, INotificationSourceFilter, NotificationsFilter } from 'vs/platform/notification/common/notification';
-import { IProgressRunner, IEditorProgressService, IProgressService, IProgress, IProgressCompositeOptions, IProgressDialogOptions, IProgressNotificationOptions, IProgressOptions, IProgressStep, IProgressWindowOptions } from 'vs/platform/progress/common/progress';
-import { ITelemetryService, TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
-import { ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier, IWorkspace, IWorkspaceContextService, IWorkspaceFolder, IWorkspaceFoldersChangeEvent, IWorkspaceFoldersWillChangeEvent, WorkbenchState, WorkspaceFolder, STANDALONE_EDITOR_WORKSPACE_ID } from 'vs/platform/workspace/common/workspace';
-import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
-import { StandaloneServicesNLS } from 'vs/editor/common/standaloneStrings';
-import { basename } from 'vs/base/common/resources';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { ConsoleLogger, ILogService } from 'vs/platform/log/common/log';
-import { IWorkspaceTrustManagementService, IWorkspaceTrustTransitionParticipant, IWorkspaceTrustUriInfo } from 'vs/platform/workspace/common/workspaceTrust';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { ICodeEditor, IDiffEditor } from 'vs/editor/browser/editorBrowser';
-import { IContextMenuService, IContextViewDelegate, IContextViewService, IOpenContextView } from 'vs/platform/contextview/browser/contextView';
-import { ContextViewService } from 'vs/platform/contextview/browser/contextViewService';
-import { LanguageService } from 'vs/editor/common/services/languageService';
-import { ContextMenuService } from 'vs/platform/contextview/browser/contextMenuService';
-import { getSingletonServiceDescriptors, InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { OpenerService } from 'vs/editor/browser/services/openerService';
-import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { EditorWorkerService } from 'vs/editor/browser/services/editorWorkerService';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { MarkerDecorationsService } from 'vs/editor/common/services/markerDecorationsService';
-import { IMarkerDecorationsService } from 'vs/editor/common/services/markerDecorations';
-import { ModelService } from 'vs/editor/common/services/modelService';
-import { StandaloneQuickInputService } from 'vs/editor/standalone/browser/quickInput/standaloneQuickInputService';
-import { StandaloneThemeService } from 'vs/editor/standalone/browser/standaloneThemeService';
-import { IStandaloneThemeService } from 'vs/editor/standalone/common/standaloneTheme';
-import { AccessibilityService } from 'vs/platform/accessibility/browser/accessibilityService';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { IMenuService } from 'vs/platform/actions/common/actions';
-import { MenuService } from 'vs/platform/actions/common/menuService';
-import { BrowserClipboardService } from 'vs/platform/clipboard/browser/clipboardService';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { ContextKeyService } from 'vs/platform/contextkey/browser/contextKeyService';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IListService, ListService } from 'vs/platform/list/browser/listService';
-import { IMarkerService } from 'vs/platform/markers/common/markers';
-import { MarkerService } from 'vs/platform/markers/common/markerService';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { IStorageService, InMemoryStorageService } from 'vs/platform/storage/common/storage';
-import { DefaultConfiguration } from 'vs/platform/configuration/common/configurations';
-import { WorkspaceEdit } from 'vs/editor/common/languages';
-import { AccessibilitySignal, AccessibilityModality, IAccessibilitySignalService, Sound } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { LogService } from 'vs/platform/log/common/logService';
-import { getEditorFeatures } from 'vs/editor/common/editorFeatures';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { ExtensionKind, IEnvironmentService, IExtensionHostDebugParams } from 'vs/platform/environment/common/environment';
-import { mainWindow } from 'vs/base/browser/window';
-import { ResourceMap } from 'vs/base/common/map';
+import * as strings from '../../../base/common/strings.js';
+import * as dom from '../../../base/browser/dom.js';
+import { StandardKeyboardEvent } from '../../../base/browser/keyboardEvent.js';
+import { Emitter, Event, IValueWithChangeEvent, ValueWithChangeEvent } from '../../../base/common/event.js';
+import { ResolvedKeybinding, KeyCodeChord, Keybinding, decodeKeybinding } from '../../../base/common/keybindings.js';
+import { IDisposable, IReference, ImmortalReference, toDisposable, DisposableStore, Disposable, combinedDisposable } from '../../../base/common/lifecycle.js';
+import { OS, isLinux, isMacintosh } from '../../../base/common/platform.js';
+import Severity from '../../../base/common/severity.js';
+import { URI } from '../../../base/common/uri.js';
+import { IBulkEditOptions, IBulkEditResult, IBulkEditService, ResourceEdit, ResourceTextEdit } from '../../browser/services/bulkEditService.js';
+import { isDiffEditorConfigurationKey, isEditorConfigurationKey } from '../../common/config/editorConfigurationSchema.js';
+import { EditOperation, ISingleEditOperation } from '../../common/core/editOperation.js';
+import { IPosition, Position as Pos } from '../../common/core/position.js';
+import { Range } from '../../common/core/range.js';
+import { ITextModel, ITextSnapshot } from '../../common/model.js';
+import { IModelService } from '../../common/services/model.js';
+import { IResolvedTextEditorModel, ITextModelContentProvider, ITextModelService } from '../../common/services/resolverService.js';
+import { ITextResourceConfigurationService, ITextResourcePropertiesService, ITextResourceConfigurationChangeEvent } from '../../common/services/textResourceConfiguration.js';
+import { CommandsRegistry, ICommandEvent, ICommandHandler, ICommandService } from '../../../platform/commands/common/commands.js';
+import { IConfigurationChangeEvent, IConfigurationData, IConfigurationOverrides, IConfigurationService, IConfigurationModel, IConfigurationValue, ConfigurationTarget } from '../../../platform/configuration/common/configuration.js';
+import { Configuration, ConfigurationModel, ConfigurationChangeEvent } from '../../../platform/configuration/common/configurationModels.js';
+import { IContextKeyService, ContextKeyExpression } from '../../../platform/contextkey/common/contextkey.js';
+import { IConfirmation, IConfirmationResult, IDialogService, IInputResult, IPrompt, IPromptResult, IPromptWithCustomCancel, IPromptResultWithCancel, IPromptWithDefaultCancel, IPromptBaseButton } from '../../../platform/dialogs/common/dialogs.js';
+import { createDecorator, IInstantiationService, ServiceIdentifier } from '../../../platform/instantiation/common/instantiation.js';
+import { AbstractKeybindingService } from '../../../platform/keybinding/common/abstractKeybindingService.js';
+import { IKeybindingService, IKeyboardEvent, KeybindingsSchemaContribution } from '../../../platform/keybinding/common/keybinding.js';
+import { KeybindingResolver } from '../../../platform/keybinding/common/keybindingResolver.js';
+import { IKeybindingItem, KeybindingsRegistry } from '../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ResolvedKeybindingItem } from '../../../platform/keybinding/common/resolvedKeybindingItem.js';
+import { USLayoutResolvedKeybinding } from '../../../platform/keybinding/common/usLayoutResolvedKeybinding.js';
+import { ILabelService, ResourceLabelFormatter, IFormatterChangeEvent, Verbosity } from '../../../platform/label/common/label.js';
+import { INotification, INotificationHandle, INotificationService, IPromptChoice, IPromptOptions, NoOpNotification, IStatusMessageOptions, INotificationSource, INotificationSourceFilter, NotificationsFilter } from '../../../platform/notification/common/notification.js';
+import { IProgressRunner, IEditorProgressService, IProgressService, IProgress, IProgressCompositeOptions, IProgressDialogOptions, IProgressNotificationOptions, IProgressOptions, IProgressStep, IProgressWindowOptions } from '../../../platform/progress/common/progress.js';
+import { ITelemetryService, TelemetryLevel } from '../../../platform/telemetry/common/telemetry.js';
+import { ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier, IWorkspace, IWorkspaceContextService, IWorkspaceFolder, IWorkspaceFoldersChangeEvent, IWorkspaceFoldersWillChangeEvent, WorkbenchState, WorkspaceFolder, STANDALONE_EDITOR_WORKSPACE_ID } from '../../../platform/workspace/common/workspace.js';
+import { ILayoutService } from '../../../platform/layout/browser/layoutService.js';
+import { StandaloneServicesNLS } from '../../common/standaloneStrings.js';
+import { basename } from '../../../base/common/resources.js';
+import { ICodeEditorService } from '../../browser/services/codeEditorService.js';
+import { ConsoleLogger, ILogService } from '../../../platform/log/common/log.js';
+import { IWorkspaceTrustManagementService, IWorkspaceTrustTransitionParticipant, IWorkspaceTrustUriInfo } from '../../../platform/workspace/common/workspaceTrust.js';
+import { EditorOption } from '../../common/config/editorOptions.js';
+import { ICodeEditor, IDiffEditor } from '../../browser/editorBrowser.js';
+import { IContextMenuService, IContextViewDelegate, IContextViewService, IOpenContextView } from '../../../platform/contextview/browser/contextView.js';
+import { ContextViewService } from '../../../platform/contextview/browser/contextViewService.js';
+import { LanguageService } from '../../common/services/languageService.js';
+import { ContextMenuService } from '../../../platform/contextview/browser/contextMenuService.js';
+import { getSingletonServiceDescriptors, InstantiationType, registerSingleton } from '../../../platform/instantiation/common/extensions.js';
+import { OpenerService } from '../../browser/services/openerService.js';
+import { IEditorWorkerService } from '../../common/services/editorWorker.js';
+import { EditorWorkerService } from '../../browser/services/editorWorkerService.js';
+import { ILanguageService } from '../../common/languages/language.js';
+import { MarkerDecorationsService } from '../../common/services/markerDecorationsService.js';
+import { IMarkerDecorationsService } from '../../common/services/markerDecorations.js';
+import { ModelService } from '../../common/services/modelService.js';
+import { StandaloneQuickInputService } from './quickInput/standaloneQuickInputService.js';
+import { StandaloneThemeService } from './standaloneThemeService.js';
+import { IStandaloneThemeService } from '../common/standaloneTheme.js';
+import { AccessibilityService } from '../../../platform/accessibility/browser/accessibilityService.js';
+import { IAccessibilityService } from '../../../platform/accessibility/common/accessibility.js';
+import { IMenuService } from '../../../platform/actions/common/actions.js';
+import { MenuService } from '../../../platform/actions/common/menuService.js';
+import { BrowserClipboardService } from '../../../platform/clipboard/browser/clipboardService.js';
+import { IClipboardService } from '../../../platform/clipboard/common/clipboardService.js';
+import { ContextKeyService } from '../../../platform/contextkey/browser/contextKeyService.js';
+import { SyncDescriptor } from '../../../platform/instantiation/common/descriptors.js';
+import { InstantiationService } from '../../../platform/instantiation/common/instantiationService.js';
+import { ServiceCollection } from '../../../platform/instantiation/common/serviceCollection.js';
+import { IListService, ListService } from '../../../platform/list/browser/listService.js';
+import { IMarkerService } from '../../../platform/markers/common/markers.js';
+import { MarkerService } from '../../../platform/markers/common/markerService.js';
+import { IOpenerService } from '../../../platform/opener/common/opener.js';
+import { IQuickInputService } from '../../../platform/quickinput/common/quickInput.js';
+import { IStorageService, InMemoryStorageService } from '../../../platform/storage/common/storage.js';
+import { DefaultConfiguration } from '../../../platform/configuration/common/configurations.js';
+import { WorkspaceEdit } from '../../common/languages.js';
+import { AccessibilitySignal, AccessibilityModality, IAccessibilitySignalService, Sound } from '../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { ILanguageFeaturesService } from '../../common/services/languageFeatures.js';
+import { ILanguageConfigurationService } from '../../common/languages/languageConfigurationRegistry.js';
+import { LogService } from '../../../platform/log/common/logService.js';
+import { getEditorFeatures } from '../../common/editorFeatures.js';
+import { onUnexpectedError } from '../../../base/common/errors.js';
+import { ExtensionKind, IEnvironmentService, IExtensionHostDebugParams } from '../../../platform/environment/common/environment.js';
+import { mainWindow } from '../../../base/browser/window.js';
+import { ResourceMap } from '../../../base/common/map.js';
+import { ITreeSitterParserService } from '../../common/services/treeSitterParserService.js';
+import { StandaloneTreeSitterParserService } from './standaloneTreeSitterService.js';
+import { IWorkerDescriptor } from '../../../base/common/worker/simpleWorker.js';
 
 class SimpleModel implements IResolvedTextEditorModel {
 
@@ -1072,6 +1076,24 @@ class StandaloneContextMenuService extends ContextMenuService {
 	}
 }
 
+export const standaloneEditorWorkerDescriptor: IWorkerDescriptor = {
+	moduleId: 'vs/editor/common/services/editorSimpleWorker',
+	esmModuleLocation: undefined,
+	label: 'editorWorkerService'
+};
+
+class StandaloneEditorWorkerService extends EditorWorkerService {
+	constructor(
+		@IModelService modelService: IModelService,
+		@ITextResourceConfigurationService configurationService: ITextResourceConfigurationService,
+		@ILogService logService: ILogService,
+		@ILanguageConfigurationService languageConfigurationService: ILanguageConfigurationService,
+		@ILanguageFeaturesService languageFeaturesService: ILanguageFeaturesService,
+	) {
+		super(standaloneEditorWorkerDescriptor, modelService, configurationService, logService, languageConfigurationService, languageFeaturesService);
+	}
+}
+
 class StandaloneAccessbilitySignalService implements IAccessibilitySignalService {
 	_serviceBrand: undefined;
 	async playSignal(cue: AccessibilitySignal, options: {}): Promise<void> {
@@ -1130,7 +1152,7 @@ registerSingleton(IContextKeyService, ContextKeyService, InstantiationType.Eager
 registerSingleton(IProgressService, StandaloneProgressService, InstantiationType.Eager);
 registerSingleton(IEditorProgressService, StandaloneEditorProgressService, InstantiationType.Eager);
 registerSingleton(IStorageService, InMemoryStorageService, InstantiationType.Eager);
-registerSingleton(IEditorWorkerService, EditorWorkerService, InstantiationType.Eager);
+registerSingleton(IEditorWorkerService, StandaloneEditorWorkerService, InstantiationType.Eager);
 registerSingleton(IBulkEditService, StandaloneBulkEditService, InstantiationType.Eager);
 registerSingleton(IWorkspaceTrustManagementService, StandaloneWorkspaceTrustManagementService, InstantiationType.Eager);
 registerSingleton(ITextModelService, StandaloneTextModelService, InstantiationType.Eager);
@@ -1145,6 +1167,7 @@ registerSingleton(IClipboardService, BrowserClipboardService, InstantiationType.
 registerSingleton(IContextMenuService, StandaloneContextMenuService, InstantiationType.Eager);
 registerSingleton(IMenuService, MenuService, InstantiationType.Eager);
 registerSingleton(IAccessibilitySignalService, StandaloneAccessbilitySignalService, InstantiationType.Eager);
+registerSingleton(ITreeSitterParserService, StandaloneTreeSitterParserService, InstantiationType.Eager);
 
 /**
  * We don't want to eagerly instantiate services because embedders get a one time chance
diff --git a/src/vs/editor/standalone/browser/standaloneThemeService.ts b/src/vs/editor/standalone/browser/standaloneThemeService.ts
index 959ca90487a..eb2470683cc 100644
--- a/src/vs/editor/standalone/browser/standaloneThemeService.ts
+++ b/src/vs/editor/standalone/browser/standaloneThemeService.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { addMatchMediaChangeListener } from 'vs/base/browser/browser';
-import { Color } from 'vs/base/common/color';
-import { Emitter } from 'vs/base/common/event';
-import { TokenizationRegistry } from 'vs/editor/common/languages';
-import { FontStyle, TokenMetadata } from 'vs/editor/common/encodedTokenAttributes';
-import { ITokenThemeRule, TokenTheme, generateTokensCSSForColorMap } from 'vs/editor/common/languages/supports/tokenization';
-import { BuiltinTheme, IStandaloneTheme, IStandaloneThemeData, IStandaloneThemeService } from 'vs/editor/standalone/common/standaloneTheme';
-import { hc_black, hc_light, vs, vs_dark } from 'vs/editor/standalone/common/themes';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { asCssVariableName, ColorIdentifier, Extensions, IColorRegistry } from 'vs/platform/theme/common/colorRegistry';
-import { Extensions as ThemingExtensions, ICssStyleCollector, IFileIconTheme, IProductIconTheme, IThemingRegistry, ITokenStyle } from 'vs/platform/theme/common/themeService';
-import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
-import { ColorScheme, isDark, isHighContrast } from 'vs/platform/theme/common/theme';
-import { getIconsStyleSheet, UnthemedProductIconTheme } from 'vs/platform/theme/browser/iconsStyleSheet';
-import { mainWindow } from 'vs/base/browser/window';
+import * as dom from '../../../base/browser/dom.js';
+import { addMatchMediaChangeListener } from '../../../base/browser/browser.js';
+import { Color } from '../../../base/common/color.js';
+import { Emitter } from '../../../base/common/event.js';
+import { TokenizationRegistry } from '../../common/languages.js';
+import { FontStyle, TokenMetadata } from '../../common/encodedTokenAttributes.js';
+import { ITokenThemeRule, TokenTheme, generateTokensCSSForColorMap } from '../../common/languages/supports/tokenization.js';
+import { BuiltinTheme, IStandaloneTheme, IStandaloneThemeData, IStandaloneThemeService } from '../common/standaloneTheme.js';
+import { hc_black, hc_light, vs, vs_dark } from '../common/themes.js';
+import { IEnvironmentService } from '../../../platform/environment/common/environment.js';
+import { Registry } from '../../../platform/registry/common/platform.js';
+import { asCssVariableName, ColorIdentifier, Extensions, IColorRegistry } from '../../../platform/theme/common/colorRegistry.js';
+import { Extensions as ThemingExtensions, ICssStyleCollector, IFileIconTheme, IProductIconTheme, IThemingRegistry, ITokenStyle } from '../../../platform/theme/common/themeService.js';
+import { IDisposable, Disposable } from '../../../base/common/lifecycle.js';
+import { ColorScheme, isDark, isHighContrast } from '../../../platform/theme/common/theme.js';
+import { getIconsStyleSheet, UnthemedProductIconTheme } from '../../../platform/theme/browser/iconsStyleSheet.js';
+import { mainWindow } from '../../../base/browser/window.js';
 
 export const VS_LIGHT_THEME_NAME = 'vs';
 export const VS_DARK_THEME_NAME = 'vs-dark';
diff --git a/src/vs/editor/standalone/browser/standaloneTreeSitterService.ts b/src/vs/editor/standalone/browser/standaloneTreeSitterService.ts
new file mode 100644
index 00000000000..de27e7bea6e
--- /dev/null
+++ b/src/vs/editor/standalone/browser/standaloneTreeSitterService.ts
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import type { Parser } from '@vscode/tree-sitter-wasm';
+import { Event } from '../../../base/common/event.js';
+import { ITextModel } from '../../common/model.js';
+import { ITreeSitterParseResult, ITreeSitterParserService } from '../../common/services/treeSitterParserService.js';
+import { Range } from '../../common/core/range.js';
+
+/**
+ * The monaco build doesn't like the dynamic import of tree sitter in the real service.
+ * We use a dummy sertive here to make the build happy.
+ */
+export class StandaloneTreeSitterParserService implements ITreeSitterParserService {
+	async getTree(content: string, languageId: string): Promise<Parser.Tree | undefined> {
+		return undefined;
+	}
+	onDidUpdateTree: Event<{ textModel: ITextModel; ranges: Range[] }> = Event.None;
+	readonly _serviceBrand: undefined;
+	onDidAddLanguage: Event<{ id: string; language: Parser.Language }> = Event.None;
+
+	getOrInitLanguage(_languageId: string): Parser.Language | undefined {
+		return undefined;
+	}
+	getParseResult(textModel: ITextModel): ITreeSitterParseResult | undefined {
+		return undefined;
+	}
+}
diff --git a/src/vs/editor/browser/services/webWorker.ts b/src/vs/editor/standalone/browser/standaloneWebWorker.ts
similarity index 75%
rename from src/vs/editor/browser/services/webWorker.ts
rename to src/vs/editor/standalone/browser/standaloneWebWorker.ts
index b5757c58865..bd557c7bbcb 100644
--- a/src/vs/editor/browser/services/webWorker.ts
+++ b/src/vs/editor/standalone/browser/standaloneWebWorker.ts
@@ -3,18 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getAllMethodNames } from 'vs/base/common/objects';
-import { URI } from 'vs/base/common/uri';
-import { EditorWorkerClient } from 'vs/editor/browser/services/editorWorkerService';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { IModelService } from 'vs/editor/common/services/model';
+import { getAllMethodNames } from '../../../base/common/objects.js';
+import { URI } from '../../../base/common/uri.js';
+import { IWorkerDescriptor } from '../../../base/common/worker/simpleWorker.js';
+import { EditorWorkerClient } from '../../browser/services/editorWorkerService.js';
+import { IModelService } from '../../common/services/model.js';
+import { standaloneEditorWorkerDescriptor } from './standaloneServices.js';
 
 /**
  * Create a new web worker that has model syncing capabilities built in.
  * Specify an AMD module to load that will `create` an object that will be proxied.
  */
-export function createWebWorker<T extends object>(modelService: IModelService, languageConfigurationService: ILanguageConfigurationService, opts: IWebWorkerOptions): MonacoWebWorker<T> {
-	return new MonacoWebWorkerImpl<T>(modelService, languageConfigurationService, opts);
+export function createWebWorker<T extends object>(modelService: IModelService, opts: IWebWorkerOptions): MonacoWebWorker<T> {
+	return new MonacoWebWorkerImpl<T>(modelService, opts);
 }
 
 /**
@@ -68,8 +69,13 @@ class MonacoWebWorkerImpl<T extends object> extends EditorWorkerClient implement
 	private _foreignModuleCreateData: any | null;
 	private _foreignProxy: Promise<T> | null;
 
-	constructor(modelService: IModelService, languageConfigurationService: ILanguageConfigurationService, opts: IWebWorkerOptions) {
-		super(modelService, opts.keepIdleModels || false, opts.label, languageConfigurationService);
+	constructor(modelService: IModelService, opts: IWebWorkerOptions) {
+		const workerDescriptor: IWorkerDescriptor = {
+			moduleId: standaloneEditorWorkerDescriptor.moduleId,
+			esmModuleLocation: standaloneEditorWorkerDescriptor.esmModuleLocation,
+			label: opts.label,
+		};
+		super(workerDescriptor, opts.keepIdleModels || false, modelService);
 		this._foreignModuleId = opts.moduleId;
 		this._foreignModuleCreateData = opts.createData || null;
 		this._foreignModuleHost = opts.host || null;
@@ -93,11 +99,11 @@ class MonacoWebWorkerImpl<T extends object> extends EditorWorkerClient implement
 		if (!this._foreignProxy) {
 			this._foreignProxy = this._getProxy().then((proxy) => {
 				const foreignHostMethods = this._foreignModuleHost ? getAllMethodNames(this._foreignModuleHost) : [];
-				return proxy.loadForeignModule(this._foreignModuleId, this._foreignModuleCreateData, foreignHostMethods).then((foreignMethods) => {
+				return proxy.$loadForeignModule(this._foreignModuleId, this._foreignModuleCreateData, foreignHostMethods).then((foreignMethods) => {
 					this._foreignModuleCreateData = null;
 
 					const proxyMethodRequest = (method: string, args: any[]): Promise<any> => {
-						return proxy.fmr(method, args);
+						return proxy.$fmr(method, args);
 					};
 
 					const createProxyMethod = (method: string, proxyMethodRequest: (method: string, args: any[]) => Promise<any>): () => Promise<any> => {
@@ -107,7 +113,7 @@ class MonacoWebWorkerImpl<T extends object> extends EditorWorkerClient implement
 						};
 					};
 
-					const foreignProxy = {} as T;
+					const foreignProxy = {} as any as T;
 					for (const foreignMethod of foreignMethods) {
 						(<any>foreignProxy)[foreignMethod] = createProxyMethod(foreignMethod, proxyMethodRequest);
 					}
@@ -124,6 +130,6 @@ class MonacoWebWorkerImpl<T extends object> extends EditorWorkerClient implement
 	}
 
 	public withSyncedResources(resources: URI[]): Promise<T> {
-		return this._withSyncedResources(resources).then(_ => this.getProxy());
+		return this.workerWithSyncedResources(resources).then(_ => this.getProxy());
 	}
 }
diff --git a/src/vs/editor/standalone/browser/toggleHighContrast/toggleHighContrast.ts b/src/vs/editor/standalone/browser/toggleHighContrast/toggleHighContrast.ts
index 4fe1552ebd5..a824d4b615f 100644
--- a/src/vs/editor/standalone/browser/toggleHighContrast/toggleHighContrast.ts
+++ b/src/vs/editor/standalone/browser/toggleHighContrast/toggleHighContrast.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, ServicesAccessor, registerEditorAction } from 'vs/editor/browser/editorExtensions';
-import { IStandaloneThemeService } from 'vs/editor/standalone/common/standaloneTheme';
-import { ToggleHighContrastNLS } from 'vs/editor/common/standaloneStrings';
-import { isDark, isHighContrast } from 'vs/platform/theme/common/theme';
-import { HC_BLACK_THEME_NAME, HC_LIGHT_THEME_NAME, VS_DARK_THEME_NAME, VS_LIGHT_THEME_NAME } from 'vs/editor/standalone/browser/standaloneThemeService';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorAction, ServicesAccessor, registerEditorAction } from '../../../browser/editorExtensions.js';
+import { IStandaloneThemeService } from '../../common/standaloneTheme.js';
+import { ToggleHighContrastNLS } from '../../../common/standaloneStrings.js';
+import { isDark, isHighContrast } from '../../../../platform/theme/common/theme.js';
+import { HC_BLACK_THEME_NAME, HC_LIGHT_THEME_NAME, VS_DARK_THEME_NAME, VS_LIGHT_THEME_NAME } from '../standaloneThemeService.js';
 
 class ToggleHighContrast extends EditorAction {
 
diff --git a/src/vs/editor/standalone/common/monarch/monarchCompile.ts b/src/vs/editor/standalone/common/monarch/monarchCompile.ts
index 599c89a0213..8f3e2bef672 100644
--- a/src/vs/editor/standalone/common/monarch/monarchCompile.ts
+++ b/src/vs/editor/standalone/common/monarch/monarchCompile.ts
@@ -8,8 +8,8 @@
  * into a typed and checked ILexer definition.
  */
 
-import * as monarchCommon from 'vs/editor/standalone/common/monarch/monarchCommon';
-import { IMonarchLanguage, IMonarchLanguageBracket } from 'vs/editor/standalone/common/monarch/monarchTypes';
+import * as monarchCommon from './monarchCommon.js';
+import { IMonarchLanguage, IMonarchLanguageBracket } from './monarchTypes.js';
 
 /*
  * Type helpers
diff --git a/src/vs/editor/standalone/common/monarch/monarchLexer.ts b/src/vs/editor/standalone/common/monarch/monarchLexer.ts
index d1d2c2c1f76..b48d54598e5 100644
--- a/src/vs/editor/standalone/common/monarch/monarchLexer.ts
+++ b/src/vs/editor/standalone/common/monarch/monarchLexer.ts
@@ -8,15 +8,15 @@
  * using regular expressions.
  */
 
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import * as languages from 'vs/editor/common/languages';
-import { NullState, nullTokenizeEncoded, nullTokenize } from 'vs/editor/common/languages/nullTokenize';
-import { TokenTheme } from 'vs/editor/common/languages/supports/tokenization';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import * as monarchCommon from 'vs/editor/standalone/common/monarch/monarchCommon';
-import { IStandaloneThemeService } from 'vs/editor/standalone/common/standaloneTheme';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { LanguageId, MetadataConsts } from 'vs/editor/common/encodedTokenAttributes';
+import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
+import * as languages from '../../../common/languages.js';
+import { NullState, nullTokenizeEncoded, nullTokenize } from '../../../common/languages/nullTokenize.js';
+import { TokenTheme } from '../../../common/languages/supports/tokenization.js';
+import { ILanguageService } from '../../../common/languages/language.js';
+import * as monarchCommon from './monarchCommon.js';
+import { IStandaloneThemeService } from '../standaloneTheme.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { LanguageId, MetadataConsts } from '../../../common/encodedTokenAttributes.js';
 
 const CACHE_STACK_DEPTH = 5;
 
diff --git a/src/vs/editor/standalone/common/standaloneTheme.ts b/src/vs/editor/standalone/common/standaloneTheme.ts
index 44ed8d14cd9..717b0de4fb2 100644
--- a/src/vs/editor/standalone/common/standaloneTheme.ts
+++ b/src/vs/editor/standalone/common/standaloneTheme.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Color } from 'vs/base/common/color';
-import { ITokenThemeRule, TokenTheme } from 'vs/editor/common/languages/supports/tokenization';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IColorTheme, IThemeService } from 'vs/platform/theme/common/themeService';
+import { Color } from '../../../base/common/color.js';
+import { ITokenThemeRule, TokenTheme } from '../../common/languages/supports/tokenization.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { IColorTheme, IThemeService } from '../../../platform/theme/common/themeService.js';
 
 export const IStandaloneThemeService = createDecorator<IStandaloneThemeService>('themeService');
 
diff --git a/src/vs/editor/standalone/common/themes.ts b/src/vs/editor/standalone/common/themes.ts
index e5f9b91bf22..2e24698ecf0 100644
--- a/src/vs/editor/standalone/common/themes.ts
+++ b/src/vs/editor/standalone/common/themes.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { editorActiveIndentGuide1, editorIndentGuide1 } from 'vs/editor/common/core/editorColorRegistry';
-import { IStandaloneThemeData } from 'vs/editor/standalone/common/standaloneTheme';
-import { editorBackground, editorForeground, editorInactiveSelection, editorSelectionHighlight } from 'vs/platform/theme/common/colorRegistry';
+import { editorActiveIndentGuide1, editorIndentGuide1 } from '../../common/core/editorColorRegistry.js';
+import { IStandaloneThemeData } from './standaloneTheme.js';
+import { editorBackground, editorForeground, editorInactiveSelection, editorSelectionHighlight } from '../../../platform/theme/common/colorRegistry.js';
 
 /* -------------------------------- Begin vs theme -------------------------------- */
 export const vs: IStandaloneThemeData = {
diff --git a/src/vs/editor/standalone/test/browser/monarch.test.ts b/src/vs/editor/standalone/test/browser/monarch.test.ts
index fbe58b62169..f7048db8e35 100644
--- a/src/vs/editor/standalone/test/browser/monarch.test.ts
+++ b/src/vs/editor/standalone/test/browser/monarch.test.ts
@@ -4,17 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Token, TokenizationRegistry } from 'vs/editor/common/languages';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { LanguageService } from 'vs/editor/common/services/languageService';
-import { StandaloneConfigurationService } from 'vs/editor/standalone/browser/standaloneServices';
-import { compile } from 'vs/editor/standalone/common/monarch/monarchCompile';
-import { MonarchTokenizer } from 'vs/editor/standalone/common/monarch/monarchLexer';
-import { IMonarchLanguage } from 'vs/editor/standalone/common/monarch/monarchTypes';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { NullLogService } from 'vs/platform/log/common/log';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { Token, TokenizationRegistry } from '../../../common/languages.js';
+import { ILanguageService } from '../../../common/languages/language.js';
+import { LanguageService } from '../../../common/services/languageService.js';
+import { StandaloneConfigurationService } from '../../browser/standaloneServices.js';
+import { compile } from '../../common/monarch/monarchCompile.js';
+import { MonarchTokenizer } from '../../common/monarch/monarchLexer.js';
+import { IMonarchLanguage } from '../../common/monarch/monarchTypes.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { NullLogService } from '../../../../platform/log/common/log.js';
 
 suite('Monarch', () => {
 
@@ -233,7 +233,7 @@ suite('Monarch', () => {
 			uselessReplaceKey2: '@uselessReplaceKey3',
 			uselessReplaceKey3: '@uselessReplaceKey4',
 			uselessReplaceKey4: '@uselessReplaceKey5',
-			uselessReplaceKey5: '@ham' || '',
+			uselessReplaceKey5: '@ham',
 			tokenizer: {
 				root: [
 					{
diff --git a/src/vs/editor/standalone/test/browser/standaloneLanguages.test.ts b/src/vs/editor/standalone/test/browser/standaloneLanguages.test.ts
index 745c0075541..0fa82cf782b 100644
--- a/src/vs/editor/standalone/test/browser/standaloneLanguages.test.ts
+++ b/src/vs/editor/standalone/test/browser/standaloneLanguages.test.ts
@@ -4,20 +4,20 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Color } from 'vs/base/common/color';
-import { Emitter } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { LanguageId, MetadataConsts } from 'vs/editor/common/encodedTokenAttributes';
-import { IState, Token } from 'vs/editor/common/languages';
-import { TokenTheme } from 'vs/editor/common/languages/supports/tokenization';
-import { LanguageService } from 'vs/editor/common/services/languageService';
-import { ILineTokens, IToken, TokenizationSupportAdapter, TokensProvider } from 'vs/editor/standalone/browser/standaloneLanguages';
-import { IStandaloneTheme, IStandaloneThemeData, IStandaloneThemeService } from 'vs/editor/standalone/common/standaloneTheme';
-import { UnthemedProductIconTheme } from 'vs/platform/theme/browser/iconsStyleSheet';
-import { ColorIdentifier } from 'vs/platform/theme/common/colorRegistry';
-import { ColorScheme } from 'vs/platform/theme/common/theme';
-import { IColorTheme, IFileIconTheme, IProductIconTheme, ITokenStyle } from 'vs/platform/theme/common/themeService';
+import { Color } from '../../../../base/common/color.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { LanguageId, MetadataConsts } from '../../../common/encodedTokenAttributes.js';
+import { IState, Token } from '../../../common/languages.js';
+import { TokenTheme } from '../../../common/languages/supports/tokenization.js';
+import { LanguageService } from '../../../common/services/languageService.js';
+import { ILineTokens, IToken, TokenizationSupportAdapter, TokensProvider } from '../../browser/standaloneLanguages.js';
+import { IStandaloneTheme, IStandaloneThemeData, IStandaloneThemeService } from '../../common/standaloneTheme.js';
+import { UnthemedProductIconTheme } from '../../../../platform/theme/browser/iconsStyleSheet.js';
+import { ColorIdentifier } from '../../../../platform/theme/common/colorRegistry.js';
+import { ColorScheme } from '../../../../platform/theme/common/theme.js';
+import { IColorTheme, IFileIconTheme, IProductIconTheme, ITokenStyle } from '../../../../platform/theme/common/themeService.js';
 
 suite('TokenizationSupport2Adapter', () => {
 
diff --git a/src/vs/editor/standalone/test/browser/standaloneServices.test.ts b/src/vs/editor/standalone/test/browser/standaloneServices.test.ts
index 649783848e3..666ddc2a6b9 100644
--- a/src/vs/editor/standalone/test/browser/standaloneServices.test.ts
+++ b/src/vs/editor/standalone/test/browser/standaloneServices.test.ts
@@ -4,18 +4,18 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { StandaloneCodeEditorService } from 'vs/editor/standalone/browser/standaloneCodeEditorService';
-import { StandaloneCommandService, StandaloneConfigurationService, StandaloneKeybindingService, StandaloneNotificationService } from 'vs/editor/standalone/browser/standaloneServices';
-import { StandaloneThemeService } from 'vs/editor/standalone/browser/standaloneThemeService';
-import { ContextKeyService } from 'vs/platform/contextkey/browser/contextKeyService';
-import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { StandaloneCodeEditorService } from '../../browser/standaloneCodeEditorService.js';
+import { StandaloneCommandService, StandaloneConfigurationService, StandaloneKeybindingService, StandaloneNotificationService } from '../../browser/standaloneServices.js';
+import { StandaloneThemeService } from '../../browser/standaloneThemeService.js';
+import { ContextKeyService } from '../../../../platform/contextkey/browser/contextKeyService.js';
+import { InstantiationService } from '../../../../platform/instantiation/common/instantiationService.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { IKeyboardEvent } from '../../../../platform/keybinding/common/keybinding.js';
+import { NullLogService } from '../../../../platform/log/common/log.js';
+import { NullTelemetryService } from '../../../../platform/telemetry/common/telemetryUtils.js';
 
 suite('StandaloneKeybindingService', () => {
 
diff --git a/src/vs/editor/test/browser/commands/shiftCommand.test.ts b/src/vs/editor/test/browser/commands/shiftCommand.test.ts
index 8d98e803658..9e78a5568ec 100644
--- a/src/vs/editor/test/browser/commands/shiftCommand.test.ts
+++ b/src/vs/editor/test/browser/commands/shiftCommand.test.ts
@@ -4,20 +4,20 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ShiftCommand } from 'vs/editor/common/commands/shiftCommand';
-import { EditorAutoIndentStrategy } from 'vs/editor/common/config/editorOptions';
-import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { getEditOperation, testCommand } from 'vs/editor/test/browser/testCommand';
-import { javascriptOnEnterRules } from 'vs/editor/test/common/modes/supports/onEnterRules';
-import { TestLanguageConfigurationService } from 'vs/editor/test/common/modes/testLanguageConfigurationService';
-import { withEditorModel } from 'vs/editor/test/common/testTextModel';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { ShiftCommand } from '../../../common/commands/shiftCommand.js';
+import { EditorAutoIndentStrategy } from '../../../common/config/editorOptions.js';
+import { ISingleEditOperation } from '../../../common/core/editOperation.js';
+import { Range } from '../../../common/core/range.js';
+import { Selection } from '../../../common/core/selection.js';
+import { ILanguageService } from '../../../common/languages/language.js';
+import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import { getEditOperation, testCommand } from '../testCommand.js';
+import { javascriptOnEnterRules } from '../../common/modes/supports/onEnterRules.js';
+import { TestLanguageConfigurationService } from '../../common/modes/testLanguageConfigurationService.js';
+import { withEditorModel } from '../../common/testTextModel.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 
 /**
  * Create single edit operation
diff --git a/src/vs/editor/test/browser/commands/sideEditing.test.ts b/src/vs/editor/test/browser/commands/sideEditing.test.ts
index fbd9a36c95a..db35d5e1ab6 100644
--- a/src/vs/editor/test/browser/commands/sideEditing.test.ts
+++ b/src/vs/editor/test/browser/commands/sideEditing.test.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { EditOperation, ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { EditOperation, ISingleEditOperation } from '../../../common/core/editOperation.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { Selection } from '../../../common/core/selection.js';
+import { withTestCodeEditor } from '../testCodeEditor.js';
 
 function testCommand(lines: string[], selections: Selection[], edits: ISingleEditOperation[], expectedLines: string[], expectedSelections: Selection[]): void {
 	withTestCodeEditor(lines, {}, (editor, viewModel) => {
diff --git a/src/vs/editor/test/browser/commands/trimTrailingWhitespaceCommand.test.ts b/src/vs/editor/test/browser/commands/trimTrailingWhitespaceCommand.test.ts
index 15f9bb999d4..503dc55f875 100644
--- a/src/vs/editor/test/browser/commands/trimTrailingWhitespaceCommand.test.ts
+++ b/src/vs/editor/test/browser/commands/trimTrailingWhitespaceCommand.test.ts
@@ -4,19 +4,19 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { TrimTrailingWhitespaceCommand, trimTrailingWhitespace } from 'vs/editor/common/commands/trimTrailingWhitespaceCommand';
-import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { MetadataConsts, StandardTokenType } from 'vs/editor/common/encodedTokenAttributes';
-import { EncodedTokenizationResult, ITokenizationSupport, TokenizationRegistry } from 'vs/editor/common/languages';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { NullState } from 'vs/editor/common/languages/nullTokenize';
-import { getEditOperation } from 'vs/editor/test/browser/testCommand';
-import { createModelServices, instantiateTextModel, withEditorModel } from 'vs/editor/test/common/testTextModel';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { TrimTrailingWhitespaceCommand, trimTrailingWhitespace } from '../../../common/commands/trimTrailingWhitespaceCommand.js';
+import { ISingleEditOperation } from '../../../common/core/editOperation.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { Selection } from '../../../common/core/selection.js';
+import { MetadataConsts, StandardTokenType } from '../../../common/encodedTokenAttributes.js';
+import { EncodedTokenizationResult, ITokenizationSupport, TokenizationRegistry } from '../../../common/languages.js';
+import { ILanguageService } from '../../../common/languages/language.js';
+import { NullState } from '../../../common/languages/nullTokenize.js';
+import { getEditOperation } from '../testCommand.js';
+import { createModelServices, instantiateTextModel, withEditorModel } from '../../common/testTextModel.js';
 
 /**
  * Create single edit operation
diff --git a/src/vs/editor/test/browser/config/editorConfiguration.test.ts b/src/vs/editor/test/browser/config/editorConfiguration.test.ts
index 911b73018c3..3dcf646314f 100644
--- a/src/vs/editor/test/browser/config/editorConfiguration.test.ts
+++ b/src/vs/editor/test/browser/config/editorConfiguration.test.ts
@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IEnvConfiguration } from 'vs/editor/browser/config/editorConfiguration';
-import { migrateOptions } from 'vs/editor/browser/config/migrateOptions';
-import { ConfigurationChangedEvent, EditorOption, IEditorHoverOptions, IQuickSuggestionsOptions } from 'vs/editor/common/config/editorOptions';
-import { EditorZoom } from 'vs/editor/common/config/editorZoom';
-import { TestConfiguration } from 'vs/editor/test/browser/config/testConfiguration';
-import { AccessibilitySupport } from 'vs/platform/accessibility/common/accessibility';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { IEnvConfiguration } from '../../../browser/config/editorConfiguration.js';
+import { migrateOptions } from '../../../browser/config/migrateOptions.js';
+import { ConfigurationChangedEvent, EditorOption, IEditorHoverOptions, IQuickSuggestionsOptions } from '../../../common/config/editorOptions.js';
+import { EditorZoom } from '../../../common/config/editorZoom.js';
+import { TestConfiguration } from './testConfiguration.js';
+import { AccessibilitySupport } from '../../../../platform/accessibility/common/accessibility.js';
 
 suite('Common Editor Config', () => {
 
diff --git a/src/vs/editor/test/browser/config/editorLayoutProvider.test.ts b/src/vs/editor/test/browser/config/editorLayoutProvider.test.ts
index a2e3ace58f6..8966df17f3f 100644
--- a/src/vs/editor/test/browser/config/editorLayoutProvider.test.ts
+++ b/src/vs/editor/test/browser/config/editorLayoutProvider.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ComputedEditorOptions } from 'vs/editor/browser/config/editorConfiguration';
-import { EditorLayoutInfo, EditorLayoutInfoComputer, EditorMinimapOptions, EditorOption, EditorOptions, InternalEditorRenderLineNumbersOptions, InternalEditorScrollbarOptions, RenderLineNumbersType, RenderMinimap } from 'vs/editor/common/config/editorOptions';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { ComputedEditorOptions } from '../../../browser/config/editorConfiguration.js';
+import { EditorLayoutInfo, EditorLayoutInfoComputer, EditorMinimapOptions, EditorOption, EditorOptions, InternalEditorRenderLineNumbersOptions, InternalEditorScrollbarOptions, RenderLineNumbersType, RenderMinimap } from '../../../common/config/editorOptions.js';
 
 interface IEditorLayoutProviderOpts {
 	readonly outerWidth: number;
diff --git a/src/vs/editor/test/browser/config/testConfiguration.ts b/src/vs/editor/test/browser/config/testConfiguration.ts
index 4a2e87e6d48..3c1862c967d 100644
--- a/src/vs/editor/test/browser/config/testConfiguration.ts
+++ b/src/vs/editor/test/browser/config/testConfiguration.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { EditorConfiguration, IEnvConfiguration } from 'vs/editor/browser/config/editorConfiguration';
-import { EditorFontLigatures, EditorFontVariations } from 'vs/editor/common/config/editorOptions';
-import { BareFontInfo, FontInfo } from 'vs/editor/common/config/fontInfo';
-import { TestCodeEditorCreationOptions } from 'vs/editor/test/browser/testCodeEditor';
-import { AccessibilitySupport } from 'vs/platform/accessibility/common/accessibility';
-import { TestAccessibilityService } from 'vs/platform/accessibility/test/common/testAccessibilityService';
-import { MenuId } from 'vs/platform/actions/common/actions';
+import { EditorConfiguration, IEnvConfiguration } from '../../../browser/config/editorConfiguration.js';
+import { EditorFontLigatures, EditorFontVariations } from '../../../common/config/editorOptions.js';
+import { BareFontInfo, FontInfo } from '../../../common/config/fontInfo.js';
+import { TestCodeEditorCreationOptions } from '../testCodeEditor.js';
+import { AccessibilitySupport } from '../../../../platform/accessibility/common/accessibility.js';
+import { TestAccessibilityService } from '../../../../platform/accessibility/test/common/testAccessibilityService.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
 
 export class TestConfiguration extends EditorConfiguration {
 
diff --git a/src/vs/editor/test/browser/controller/cursor.integrationTest.ts b/src/vs/editor/test/browser/controller/cursor.integrationTest.ts
index bd956a35398..d39b24c36fd 100644
--- a/src/vs/editor/test/browser/controller/cursor.integrationTest.ts
+++ b/src/vs/editor/test/browser/controller/cursor.integrationTest.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Selection } from 'vs/editor/common/core/selection';
-import { withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
+import { Selection } from '../../../common/core/selection.js';
+import { withTestCodeEditor } from '../testCodeEditor.js';
 
 suite('Editor Controller', () => {
 
diff --git a/src/vs/editor/test/browser/controller/cursor.test.ts b/src/vs/editor/test/browser/controller/cursor.test.ts
index bb2abffb9c9..2eb1303c28c 100644
--- a/src/vs/editor/test/browser/controller/cursor.test.ts
+++ b/src/vs/editor/test/browser/controller/cursor.test.ts
@@ -4,30 +4,30 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { CoreEditingCommands, CoreNavigationCommands } from 'vs/editor/browser/coreCommands';
-import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { EditOperation } from 'vs/editor/common/core/editOperation';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ICursorPositionChangedEvent } from 'vs/editor/common/cursorEvents';
-import { ICommand, ICursorStateComputerData, IEditOperationBuilder } from 'vs/editor/common/editorCommon';
-import { MetadataConsts, StandardTokenType } from 'vs/editor/common/encodedTokenAttributes';
-import { EncodedTokenizationResult, IState, ITokenizationSupport, TokenizationRegistry } from 'vs/editor/common/languages';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IndentAction, IndentationRule } from 'vs/editor/common/languages/languageConfiguration';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { NullState } from 'vs/editor/common/languages/nullTokenize';
-import { EndOfLinePreference, EndOfLineSequence, ITextModel } from 'vs/editor/common/model';
-import { TextModel } from 'vs/editor/common/model/textModel';
-import { ViewModel } from 'vs/editor/common/viewModel/viewModelImpl';
-import { OutgoingViewModelEventKind } from 'vs/editor/common/viewModelEventDispatcher';
-import { ITestCodeEditor, TestCodeEditorInstantiationOptions, createCodeEditorServices, instantiateTestCodeEditor, withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
-import { IRelaxedTextModelCreationOptions, createTextModel, instantiateTextModel } from 'vs/editor/test/common/testTextModel';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { CoreEditingCommands, CoreNavigationCommands } from '../../../browser/coreCommands.js';
+import { IEditorOptions } from '../../../common/config/editorOptions.js';
+import { EditOperation } from '../../../common/core/editOperation.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { Selection } from '../../../common/core/selection.js';
+import { ICursorPositionChangedEvent } from '../../../common/cursorEvents.js';
+import { ICommand, ICursorStateComputerData, IEditOperationBuilder } from '../../../common/editorCommon.js';
+import { MetadataConsts, StandardTokenType } from '../../../common/encodedTokenAttributes.js';
+import { EncodedTokenizationResult, IState, ITokenizationSupport, TokenizationRegistry } from '../../../common/languages.js';
+import { ILanguageService } from '../../../common/languages/language.js';
+import { IndentAction, IndentationRule } from '../../../common/languages/languageConfiguration.js';
+import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import { NullState } from '../../../common/languages/nullTokenize.js';
+import { EndOfLinePreference, EndOfLineSequence, ITextModel } from '../../../common/model.js';
+import { TextModel } from '../../../common/model/textModel.js';
+import { ViewModel } from '../../../common/viewModel/viewModelImpl.js';
+import { OutgoingViewModelEventKind } from '../../../common/viewModelEventDispatcher.js';
+import { ITestCodeEditor, TestCodeEditorInstantiationOptions, createCodeEditorServices, instantiateTestCodeEditor, withTestCodeEditor } from '../testCodeEditor.js';
+import { IRelaxedTextModelCreationOptions, createTextModel, instantiateTextModel } from '../../common/testTextModel.js';
+import { TestInstantiationService } from '../../../../platform/instantiation/test/common/instantiationServiceMock.js';
 
 // --------- utils
 
diff --git a/src/vs/editor/test/browser/controller/cursorMoveCommand.test.ts b/src/vs/editor/test/browser/controller/cursorMoveCommand.test.ts
index c4bee4b9f2b..51184271569 100644
--- a/src/vs/editor/test/browser/controller/cursorMoveCommand.test.ts
+++ b/src/vs/editor/test/browser/controller/cursorMoveCommand.test.ts
@@ -4,14 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { CoreNavigationCommands } from 'vs/editor/browser/coreCommands';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { CursorMove } from 'vs/editor/common/cursor/cursorMoveCommands';
-import { ViewModel } from 'vs/editor/common/viewModel/viewModelImpl';
-import { ITestCodeEditor, withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { CoreNavigationCommands } from '../../../browser/coreCommands.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { Selection } from '../../../common/core/selection.js';
+import { CursorMove } from '../../../common/cursor/cursorMoveCommands.js';
+import { ViewModel } from '../../../common/viewModel/viewModelImpl.js';
+import { ITestCodeEditor, withTestCodeEditor } from '../testCodeEditor.js';
 
 suite('Cursor move command test', () => {
 
diff --git a/src/vs/editor/test/browser/controller/imeRecordedTypes.ts b/src/vs/editor/test/browser/controller/imeRecordedTypes.ts
index 70499b308f1..8777d4c43aa 100644
--- a/src/vs/editor/test/browser/controller/imeRecordedTypes.ts
+++ b/src/vs/editor/test/browser/controller/imeRecordedTypes.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { OperatingSystem } from 'vs/base/common/platform';
-import { IBrowser } from 'vs/editor/browser/controller/textAreaInput';
+import { OperatingSystem } from '../../../../base/common/platform.js';
+import { IBrowser } from '../../../browser/controller/editContext/textArea/textAreaEditContextInput.js';
 
 export interface IRecordedTextareaState {
 	selectionDirection: 'forward' | 'backward' | 'none';
diff --git a/src/vs/editor/test/browser/controller/imeRecorder.ts b/src/vs/editor/test/browser/controller/imeRecorder.ts
index 36290eb2e98..4b22ced5131 100644
--- a/src/vs/editor/test/browser/controller/imeRecorder.ts
+++ b/src/vs/editor/test/browser/controller/imeRecorder.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { TextAreaWrapper } from 'vs/editor/browser/controller/textAreaInput';
-import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { IRecorded, IRecordedCompositionEvent, IRecordedEvent, IRecordedInputEvent, IRecordedKeyboardEvent, IRecordedTextareaState } from 'vs/editor/test/browser/controller/imeRecordedTypes';
-import * as browser from 'vs/base/browser/browser';
-import * as platform from 'vs/base/common/platform';
-import { mainWindow } from 'vs/base/browser/window';
+import { DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { IRecorded, IRecordedCompositionEvent, IRecordedEvent, IRecordedInputEvent, IRecordedKeyboardEvent, IRecordedTextareaState } from './imeRecordedTypes.js';
+import * as browser from '../../../../base/browser/browser.js';
+import * as platform from '../../../../base/common/platform.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { TextAreaWrapper } from '../../../browser/controller/editContext/textArea/textAreaEditContextInput.js';
 
 (() => {
 
diff --git a/src/vs/editor/test/browser/controller/imeTester.ts b/src/vs/editor/test/browser/controller/imeTester.ts
index 3aeaed1d9d4..25a9e6c5180 100644
--- a/src/vs/editor/test/browser/controller/imeTester.ts
+++ b/src/vs/editor/test/browser/controller/imeTester.ts
@@ -3,17 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ITextAreaInputHost, TextAreaInput, TextAreaWrapper } from 'vs/editor/browser/controller/textAreaInput';
-import { ISimpleModel, PagedScreenReaderStrategy, TextAreaState } from 'vs/editor/browser/controller/textAreaState';
-import { Position } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { EndOfLinePreference } from 'vs/editor/common/model';
-import * as dom from 'vs/base/browser/dom';
-import * as browser from 'vs/base/browser/browser';
-import * as platform from 'vs/base/common/platform';
-import { mainWindow } from 'vs/base/browser/window';
-import { TestAccessibilityService } from 'vs/platform/accessibility/test/common/testAccessibilityService';
-import { NullLogService } from 'vs/platform/log/common/log';
+import { Position } from '../../../common/core/position.js';
+import { IRange, Range } from '../../../common/core/range.js';
+import { EndOfLinePreference } from '../../../common/model.js';
+import * as dom from '../../../../base/browser/dom.js';
+import * as browser from '../../../../base/browser/browser.js';
+import * as platform from '../../../../base/common/platform.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { TestAccessibilityService } from '../../../../platform/accessibility/test/common/testAccessibilityService.js';
+import { NullLogService } from '../../../../platform/log/common/log.js';
+import { ISimpleModel, PagedScreenReaderStrategy } from '../../../browser/controller/editContext/screenReaderUtils.js';
+import { TextAreaState } from '../../../browser/controller/editContext/textArea/textAreaEditContextState.js';
+import { ITextAreaInputHost, TextAreaInput, TextAreaWrapper } from '../../../browser/controller/editContext/textArea/textAreaEditContextInput.js';
 
 // To run this test, open imeTester.html
 
@@ -117,7 +118,8 @@ function doCreateTest(description: string, inputStr: string, expectedStr: string
 		getScreenReaderContent: (): TextAreaState => {
 			const selection = new Range(1, 1 + cursorOffset, 1, 1 + cursorOffset + cursorLength);
 
-			return PagedScreenReaderStrategy.fromEditorSelection(model, selection, 10, true);
+			const screenReaderContentState = PagedScreenReaderStrategy.fromEditorSelection(model, selection, 10, true);
+			return TextAreaState.fromScreenReaderContentState(screenReaderContentState);
 		},
 		deduceModelPosition: (viewAnchorPosition: Position, deltaOffset: number, lineFeedCnt: number): Position => {
 			return null!;
diff --git a/src/vs/editor/test/browser/controller/textAreaInput.test.ts b/src/vs/editor/test/browser/controller/textAreaInput.test.ts
index fd2e23e3751..a1cfa19429d 100644
--- a/src/vs/editor/test/browser/controller/textAreaInput.test.ts
+++ b/src/vs/editor/test/browser/controller/textAreaInput.test.ts
@@ -4,16 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { OperatingSystem } from 'vs/base/common/platform';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ClipboardDataToCopy, IBrowser, ICompleteTextAreaWrapper, ITextAreaInputHost, TextAreaInput } from 'vs/editor/browser/controller/textAreaInput';
-import { TextAreaState } from 'vs/editor/browser/controller/textAreaState';
-import { Position } from 'vs/editor/common/core/position';
-import { IRecorded, IRecordedEvent, IRecordedTextareaState } from 'vs/editor/test/browser/controller/imeRecordedTypes';
-import { TestAccessibilityService } from 'vs/platform/accessibility/test/common/testAccessibilityService';
-import { NullLogService } from 'vs/platform/log/common/log';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { OperatingSystem } from '../../../../base/common/platform.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { Position } from '../../../common/core/position.js';
+import { IRecorded, IRecordedEvent, IRecordedTextareaState } from './imeRecordedTypes.js';
+import { TestAccessibilityService } from '../../../../platform/accessibility/test/common/testAccessibilityService.js';
+import { NullLogService } from '../../../../platform/log/common/log.js';
+import { IBrowser, ICompleteTextAreaWrapper, ITextAreaInputHost, TextAreaInput } from '../../../browser/controller/editContext/textArea/textAreaEditContextInput.js';
+import { ClipboardDataToCopy } from '../../../browser/controller/editContext/clipboardUtils.js';
+import { TextAreaState } from '../../../browser/controller/editContext/textArea/textAreaEditContextState.js';
 
 suite('TextAreaInput', () => {
 
diff --git a/src/vs/editor/test/browser/controller/textAreaState.test.ts b/src/vs/editor/test/browser/controller/textAreaState.test.ts
index 2baa9ddda39..a0f9ce82e25 100644
--- a/src/vs/editor/test/browser/controller/textAreaState.test.ts
+++ b/src/vs/editor/test/browser/controller/textAreaState.test.ts
@@ -4,12 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ITextAreaWrapper, PagedScreenReaderStrategy, TextAreaState } from 'vs/editor/browser/controller/textAreaState';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { ITextAreaWrapper, TextAreaState } from '../../../browser/controller/editContext/textArea/textAreaEditContextState.js';
+import { Range } from '../../../common/core/range.js';
+import { Selection } from '../../../common/core/selection.js';
+import { createTextModel } from '../../common/testTextModel.js';
+import { PagedScreenReaderStrategy } from '../../../browser/controller/editContext/screenReaderUtils.js';
 
 class MockTextAreaWrapper extends Disposable implements ITextAreaWrapper {
 
@@ -364,8 +365,9 @@ suite('TextAreaState', () => {
 
 		function testPagedScreenReaderStrategy(lines: string[], selection: Selection, expected: TextAreaState): void {
 			const model = createTextModel(lines.join('\n'));
-			const actual = PagedScreenReaderStrategy.fromEditorSelection(model, selection, 10, true);
-			assert.ok(equalsTextAreaState(actual, expected));
+			const screenReaderContentState = PagedScreenReaderStrategy.fromEditorSelection(model, selection, 10, true);
+			const textAreaState = TextAreaState.fromScreenReaderContentState(screenReaderContentState);
+			assert.ok(equalsTextAreaState(textAreaState, expected));
 			model.dispose();
 		}
 
diff --git a/src/vs/editor/test/browser/diff/testDiffProviderFactoryService.ts b/src/vs/editor/test/browser/diff/testDiffProviderFactoryService.ts
index 275c4995988..7d889f5012a 100644
--- a/src/vs/editor/test/browser/diff/testDiffProviderFactoryService.ts
+++ b/src/vs/editor/test/browser/diff/testDiffProviderFactoryService.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { toDisposable } from 'vs/base/common/lifecycle';
-import { IDocumentDiff, IDocumentDiffProvider, IDocumentDiffProviderOptions } from 'vs/editor/common/diff/documentDiffProvider';
-import { linesDiffComputers } from 'vs/editor/common/diff/linesDiffComputers';
-import { ITextModel } from 'vs/editor/common/model';
-import { Event } from 'vs/base/common/event';
-import { IDiffProviderFactoryService } from 'vs/editor/browser/widget/diffEditor/diffProviderFactoryService';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { toDisposable } from '../../../../base/common/lifecycle.js';
+import { IDocumentDiff, IDocumentDiffProvider, IDocumentDiffProviderOptions } from '../../../common/diff/documentDiffProvider.js';
+import { linesDiffComputers } from '../../../common/diff/linesDiffComputers.js';
+import { ITextModel } from '../../../common/model.js';
+import { Event } from '../../../../base/common/event.js';
+import { IDiffProviderFactoryService } from '../../../browser/widget/diffEditor/diffProviderFactoryService.js';
 
 export class TestDiffProviderFactoryService implements IDiffProviderFactoryService {
 	declare readonly _serviceBrand: undefined;
diff --git a/src/vs/editor/test/browser/editorTestServices.ts b/src/vs/editor/test/browser/editorTestServices.ts
index 951759f9fbf..861a8f778d2 100644
--- a/src/vs/editor/test/browser/editorTestServices.ts
+++ b/src/vs/editor/test/browser/editorTestServices.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { AbstractCodeEditorService, GlobalStyleSheet } from 'vs/editor/browser/services/abstractCodeEditorService';
-import { CommandsRegistry, ICommandEvent, ICommandService } from 'vs/platform/commands/common/commands';
-import { IResourceEditorInput } from 'vs/platform/editor/common/editor';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { ICodeEditor } from '../../browser/editorBrowser.js';
+import { AbstractCodeEditorService, GlobalStyleSheet } from '../../browser/services/abstractCodeEditorService.js';
+import { CommandsRegistry, ICommandEvent, ICommandService } from '../../../platform/commands/common/commands.js';
+import { IResourceEditorInput } from '../../../platform/editor/common/editor.js';
+import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
 
 export class TestCodeEditorService extends AbstractCodeEditorService {
 
diff --git a/src/vs/editor/test/browser/services/decorationRenderOptions.test.ts b/src/vs/editor/test/browser/services/decorationRenderOptions.test.ts
index 9160c07070a..7a35640c79b 100644
--- a/src/vs/editor/test/browser/services/decorationRenderOptions.test.ts
+++ b/src/vs/editor/test/browser/services/decorationRenderOptions.test.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import * as platform from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IDecorationRenderOptions } from 'vs/editor/common/editorCommon';
-import { TestCodeEditorService, TestGlobalStyleSheet } from 'vs/editor/test/browser/editorTestServices';
-import { TestColorTheme, TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
+import * as platform from '../../../../base/common/platform.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { IDecorationRenderOptions } from '../../../common/editorCommon.js';
+import { TestCodeEditorService, TestGlobalStyleSheet } from '../editorTestServices.js';
+import { TestColorTheme, TestThemeService } from '../../../../platform/theme/test/common/testThemeService.js';
 
 suite('Decoration Render Options', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/editor/test/browser/services/openerService.test.ts b/src/vs/editor/test/browser/services/openerService.test.ts
index d732776a800..8e35ac41078 100644
--- a/src/vs/editor/test/browser/services/openerService.test.ts
+++ b/src/vs/editor/test/browser/services/openerService.test.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { OpenerService } from 'vs/editor/browser/services/openerService';
-import { TestCodeEditorService } from 'vs/editor/test/browser/editorTestServices';
-import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
-import { NullCommandService } from 'vs/platform/commands/test/common/nullCommandService';
-import { ITextEditorOptions } from 'vs/platform/editor/common/editor';
-import { matchesScheme, matchesSomeScheme } from 'vs/base/common/network';
-import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { OpenerService } from '../../../browser/services/openerService.js';
+import { TestCodeEditorService } from '../editorTestServices.js';
+import { CommandsRegistry, ICommandService } from '../../../../platform/commands/common/commands.js';
+import { NullCommandService } from '../../../../platform/commands/test/common/nullCommandService.js';
+import { ITextEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { matchesScheme, matchesSomeScheme } from '../../../../base/common/network.js';
+import { TestThemeService } from '../../../../platform/theme/test/common/testThemeService.js';
 
 suite('OpenerService', function () {
 	const themeService = new TestThemeService();
diff --git a/src/vs/editor/test/browser/services/treeSitterParserService.test.ts b/src/vs/editor/test/browser/services/treeSitterParserService.test.ts
new file mode 100644
index 00000000000..d90cca2af99
--- /dev/null
+++ b/src/vs/editor/test/browser/services/treeSitterParserService.test.ts
@@ -0,0 +1,151 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import assert from 'assert';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { TextModelTreeSitter, TreeSitterImporter, TreeSitterLanguages } from '../../../browser/services/treeSitter/treeSitterParserService.js';
+import type { Parser } from '@vscode/tree-sitter-wasm';
+import { createTextModel } from '../../common/testTextModel.js';
+import { timeout } from '../../../../base/common/async.js';
+import { ConsoleMainLogger, ILogService } from '../../../../platform/log/common/log.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { LogService } from '../../../../platform/log/common/logService.js';
+import { mock } from '../../../../base/test/common/mock.js';
+
+class MockParser implements Parser {
+	static async init(): Promise<void> { }
+	delete(): void { }
+	parse(input: string | Parser.Input, oldTree?: Parser.Tree, options?: Parser.Options): Parser.Tree {
+		return new MockTree();
+	}
+	getIncludedRanges(): Parser.Range[] {
+		return [];
+	}
+	getTimeoutMicros(): number { return 0; }
+	setTimeoutMicros(timeout: number): void { }
+	reset(): void { }
+	getLanguage(): Parser.Language { return {} as any; }
+	setLanguage(): void { }
+	getLogger(): Parser.Logger {
+		throw new Error('Method not implemented.');
+	}
+	setLogger(logFunc?: Parser.Logger | false | null): void {
+		throw new Error('Method not implemented.');
+	}
+}
+
+class MockTreeSitterImporter extends TreeSitterImporter {
+	public override async getParserClass(): Promise<typeof Parser> {
+		return MockParser as any;
+	}
+}
+
+class MockTree implements Parser.Tree {
+	editorLanguage: string = '';
+	editorContents: string = '';
+	rootNode: Parser.SyntaxNode = {} as any;
+	rootNodeWithOffset(offsetBytes: number, offsetExtent: Parser.Point): Parser.SyntaxNode {
+		throw new Error('Method not implemented.');
+	}
+	copy(): Parser.Tree {
+		throw new Error('Method not implemented.');
+	}
+	delete(): void { }
+	edit(edit: Parser.Edit): Parser.Tree {
+		return this;
+	}
+	walk(): Parser.TreeCursor {
+		throw new Error('Method not implemented.');
+	}
+	getChangedRanges(other: Parser.Tree): Parser.Range[] {
+		throw new Error('Method not implemented.');
+	}
+	getIncludedRanges(): Parser.Range[] {
+		throw new Error('Method not implemented.');
+	}
+	getEditedRange(other: Parser.Tree): Parser.Range {
+		throw new Error('Method not implemented.');
+	}
+	getLanguage(): Parser.Language {
+		throw new Error('Method not implemented.');
+	}
+}
+
+class MockLanguage implements Parser.Language {
+	version: number = 0;
+	fieldCount: number = 0;
+	stateCount: number = 0;
+	nodeTypeCount: number = 0;
+	fieldNameForId(fieldId: number): string | null {
+		throw new Error('Method not implemented.');
+	}
+	fieldIdForName(fieldName: string): number | null {
+		throw new Error('Method not implemented.');
+	}
+	idForNodeType(type: string, named: boolean): number {
+		throw new Error('Method not implemented.');
+	}
+	nodeTypeForId(typeId: number): string | null {
+		throw new Error('Method not implemented.');
+	}
+	nodeTypeIsNamed(typeId: number): boolean {
+		throw new Error('Method not implemented.');
+	}
+	nodeTypeIsVisible(typeId: number): boolean {
+		throw new Error('Method not implemented.');
+	}
+	nextState(stateId: number, typeId: number): number {
+		throw new Error('Method not implemented.');
+	}
+	query(source: string): Parser.Query {
+		throw new Error('Method not implemented.');
+	}
+	lookaheadIterator(stateId: number): Parser.LookaheadIterable | null {
+		throw new Error('Method not implemented.');
+	}
+	languageId: string = '';
+}
+
+suite('TreeSitterParserService', function () {
+	const treeSitterImporter: TreeSitterImporter = new MockTreeSitterImporter();
+	let logService: ILogService;
+	let telemetryService: ITelemetryService;
+	setup(function () {
+		logService = new LogService(new ConsoleMainLogger());
+		telemetryService = new class extends mock<ITelemetryService>() {
+			override async publicLog2() {
+				//
+			}
+		};
+	});
+
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('TextModelTreeSitter race condition: first language is slow to load', async function () {
+		class MockTreeSitterLanguages extends TreeSitterLanguages {
+			private async _fetchJavascript(): Promise<void> {
+				await timeout(200);
+				const language = new MockLanguage();
+				language.languageId = 'javascript';
+				this._onDidAddLanguage.fire({ id: 'javascript', language });
+			}
+			public override getOrInitLanguage(languageId: string): Parser.Language | undefined {
+				if (languageId === 'javascript') {
+					this._fetchJavascript();
+					return undefined;
+				}
+				const language = new MockLanguage();
+				language.languageId = languageId;
+				return language;
+			}
+		}
+
+		const treeSitterParser: TreeSitterLanguages = store.add(new MockTreeSitterLanguages(treeSitterImporter, {} as any, { isBuilt: false } as any, new Map()));
+		const textModel = store.add(createTextModel('console.log("Hello, world!");', 'javascript'));
+		const textModelTreeSitter = store.add(new TextModelTreeSitter(textModel, treeSitterParser, treeSitterImporter, logService, telemetryService));
+		textModel.setLanguage('typescript');
+		await timeout(300);
+		assert.strictEqual((textModelTreeSitter.parseResult?.language as MockLanguage).languageId, 'typescript');
+	});
+});
diff --git a/src/vs/editor/test/browser/testCodeEditor.ts b/src/vs/editor/test/browser/testCodeEditor.ts
index 5fcd0c1bd4c..72da1933953 100644
--- a/src/vs/editor/test/browser/testCodeEditor.ts
+++ b/src/vs/editor/test/browser/testCodeEditor.ts
@@ -3,62 +3,64 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { mock } from 'vs/base/test/common/mock';
-import { EditorConfiguration } from 'vs/editor/browser/config/editorConfiguration';
-import { IActiveCodeEditor, ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { View } from 'vs/editor/browser/view';
-import { CodeEditorWidget, ICodeEditorWidgetOptions } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import * as editorOptions from 'vs/editor/common/config/editorOptions';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { ITextBufferFactory, ITextModel } from 'vs/editor/common/model';
-import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { ILanguageFeatureDebounceService, LanguageFeatureDebounceService } from 'vs/editor/common/services/languageFeatureDebounce';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { LanguageFeaturesService } from 'vs/editor/common/services/languageFeaturesService';
-import { LanguageService } from 'vs/editor/common/services/languageService';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ModelService } from 'vs/editor/common/services/modelService';
-import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfiguration';
-import { ViewModel } from 'vs/editor/common/viewModel/viewModelImpl';
-import { TestConfiguration } from 'vs/editor/test/browser/config/testConfiguration';
-import { TestCodeEditorService, TestCommandService } from 'vs/editor/test/browser/editorTestServices';
-import { TestLanguageConfigurationService } from 'vs/editor/test/common/modes/testLanguageConfigurationService';
-import { TestEditorWorkerService } from 'vs/editor/test/common/services/testEditorWorkerService';
-import { TestTextResourcePropertiesService } from 'vs/editor/test/common/services/testTextResourcePropertiesService';
-import { instantiateTextModel } from 'vs/editor/test/common/testTextModel';
-import { AccessibilitySupport, IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { TestAccessibilityService } from 'vs/platform/accessibility/test/common/testAccessibilityService';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { TestClipboardService } from 'vs/platform/clipboard/test/common/testClipboardService';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { IContextKeyService, IContextKeyServiceTarget } from 'vs/platform/contextkey/common/contextkey';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { TestDialogService } from 'vs/platform/dialogs/test/common/testDialogService';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { BrandedService, IInstantiationService, ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { MockContextKeyService, MockKeybindingService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { ILogService, NullLogService } from 'vs/platform/log/common/log';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { NullOpenerService } from 'vs/platform/opener/test/common/nullOpenerService';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { NullTelemetryServiceShape } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
-import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
-import { UndoRedoService } from 'vs/platform/undoRedo/common/undoRedoService';
+import { DisposableStore, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { mock } from '../../../base/test/common/mock.js';
+import { EditorConfiguration } from '../../browser/config/editorConfiguration.js';
+import { IActiveCodeEditor, ICodeEditor } from '../../browser/editorBrowser.js';
+import { ICodeEditorService } from '../../browser/services/codeEditorService.js';
+import { View } from '../../browser/view.js';
+import { CodeEditorWidget, ICodeEditorWidgetOptions } from '../../browser/widget/codeEditor/codeEditorWidget.js';
+import * as editorOptions from '../../common/config/editorOptions.js';
+import { IEditorContribution } from '../../common/editorCommon.js';
+import { ILanguageService } from '../../common/languages/language.js';
+import { ILanguageConfigurationService } from '../../common/languages/languageConfigurationRegistry.js';
+import { ITextBufferFactory, ITextModel } from '../../common/model.js';
+import { IEditorWorkerService } from '../../common/services/editorWorker.js';
+import { ILanguageFeatureDebounceService, LanguageFeatureDebounceService } from '../../common/services/languageFeatureDebounce.js';
+import { ILanguageFeaturesService } from '../../common/services/languageFeatures.js';
+import { LanguageFeaturesService } from '../../common/services/languageFeaturesService.js';
+import { LanguageService } from '../../common/services/languageService.js';
+import { IModelService } from '../../common/services/model.js';
+import { ModelService } from '../../common/services/modelService.js';
+import { ITextResourcePropertiesService } from '../../common/services/textResourceConfiguration.js';
+import { ITreeSitterParserService } from '../../common/services/treeSitterParserService.js';
+import { ViewModel } from '../../common/viewModel/viewModelImpl.js';
+import { TestConfiguration } from './config/testConfiguration.js';
+import { TestCodeEditorService, TestCommandService } from './editorTestServices.js';
+import { TestTreeSitterParserService } from '../common/services/testTreeSitterService.js';
+import { TestLanguageConfigurationService } from '../common/modes/testLanguageConfigurationService.js';
+import { TestEditorWorkerService } from '../common/services/testEditorWorkerService.js';
+import { TestTextResourcePropertiesService } from '../common/services/testTextResourcePropertiesService.js';
+import { instantiateTextModel } from '../common/testTextModel.js';
+import { AccessibilitySupport, IAccessibilityService } from '../../../platform/accessibility/common/accessibility.js';
+import { TestAccessibilityService } from '../../../platform/accessibility/test/common/testAccessibilityService.js';
+import { MenuId } from '../../../platform/actions/common/actions.js';
+import { IClipboardService } from '../../../platform/clipboard/common/clipboardService.js';
+import { TestClipboardService } from '../../../platform/clipboard/test/common/testClipboardService.js';
+import { ICommandService } from '../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../platform/configuration/test/common/testConfigurationService.js';
+import { IContextKeyService, IContextKeyServiceTarget } from '../../../platform/contextkey/common/contextkey.js';
+import { IDialogService } from '../../../platform/dialogs/common/dialogs.js';
+import { TestDialogService } from '../../../platform/dialogs/test/common/testDialogService.js';
+import { IEnvironmentService } from '../../../platform/environment/common/environment.js';
+import { SyncDescriptor } from '../../../platform/instantiation/common/descriptors.js';
+import { BrandedService, IInstantiationService, ServiceIdentifier } from '../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../platform/instantiation/common/serviceCollection.js';
+import { TestInstantiationService } from '../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { IKeybindingService } from '../../../platform/keybinding/common/keybinding.js';
+import { MockContextKeyService, MockKeybindingService } from '../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { ILogService, NullLogService } from '../../../platform/log/common/log.js';
+import { INotificationService } from '../../../platform/notification/common/notification.js';
+import { TestNotificationService } from '../../../platform/notification/test/common/testNotificationService.js';
+import { IOpenerService } from '../../../platform/opener/common/opener.js';
+import { NullOpenerService } from '../../../platform/opener/test/common/nullOpenerService.js';
+import { ITelemetryService } from '../../../platform/telemetry/common/telemetry.js';
+import { NullTelemetryServiceShape } from '../../../platform/telemetry/common/telemetryUtils.js';
+import { IThemeService } from '../../../platform/theme/common/themeService.js';
+import { TestThemeService } from '../../../platform/theme/test/common/testThemeService.js';
+import { IUndoRedoService } from '../../../platform/undoRedo/common/undoRedo.js';
+import { UndoRedoService } from '../../../platform/undoRedo/common/undoRedoService.js';
 
 export interface ITestCodeEditor extends IActiveCodeEditor {
 	getViewModel(): ViewModel | undefined;
@@ -177,7 +179,7 @@ function _withTestCodeEditor(arg: ITextModel | string | string[] | ITextBufferFa
 	disposables.dispose();
 }
 
-export function createCodeEditorServices(disposables: DisposableStore, services: ServiceCollection = new ServiceCollection()): TestInstantiationService {
+export function createCodeEditorServices(disposables: Pick<DisposableStore, 'add'>, services: ServiceCollection = new ServiceCollection()): TestInstantiationService {
 	const serviceIdentifiers: ServiceIdentifier<any>[] = [];
 	const define = <T>(id: ServiceIdentifier<T>, ctor: new (...args: any[]) => T) => {
 		if (!services.has(id)) {
@@ -218,6 +220,7 @@ export function createCodeEditorServices(disposables: DisposableStore, services:
 	});
 	define(ILanguageFeatureDebounceService, LanguageFeatureDebounceService);
 	define(ILanguageFeaturesService, LanguageFeaturesService);
+	define(ITreeSitterParserService, TestTreeSitterParserService);
 
 	const instantiationService = disposables.add(new TestInstantiationService(services, true));
 	disposables.add(toDisposable(() => {
diff --git a/src/vs/editor/test/browser/testCommand.ts b/src/vs/editor/test/browser/testCommand.ts
index e12d2cc526a..2d54a5f2eb4 100644
--- a/src/vs/editor/test/browser/testCommand.ts
+++ b/src/vs/editor/test/browser/testCommand.ts
@@ -4,15 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { IRange } from 'vs/editor/common/core/range';
-import { Selection, ISelection } from 'vs/editor/common/core/selection';
-import { ICommand, IEditOperationBuilder } from 'vs/editor/common/editorCommon';
-import { ITextModel } from 'vs/editor/common/model';
-import { instantiateTestCodeEditor, createCodeEditorServices } from 'vs/editor/test/browser/testCodeEditor';
-import { instantiateTextModel } from 'vs/editor/test/common/testTextModel';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
+import { IRange } from '../../common/core/range.js';
+import { Selection, ISelection } from '../../common/core/selection.js';
+import { ICommand, IEditOperationBuilder } from '../../common/editorCommon.js';
+import { ITextModel } from '../../common/model.js';
+import { instantiateTestCodeEditor, createCodeEditorServices } from './testCodeEditor.js';
+import { instantiateTextModel } from '../common/testTextModel.js';
+import { ServicesAccessor } from '../../../platform/instantiation/common/instantiation.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { ISingleEditOperation } from '../../common/core/editOperation.js';
 
 export function testCommand(
 	lines: string[],
diff --git a/src/vs/editor/test/browser/view/gpu/atlas/testUtil.ts b/src/vs/editor/test/browser/view/gpu/atlas/testUtil.ts
new file mode 100644
index 00000000000..73d1e167f1e
--- /dev/null
+++ b/src/vs/editor/test/browser/view/gpu/atlas/testUtil.ts
@@ -0,0 +1,55 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { fail, ok } from 'assert';
+import type { ITextureAtlasPageGlyph } from '../../../../../browser/gpu/atlas/atlas.js';
+import { TextureAtlas } from '../../../../../browser/gpu/atlas/textureAtlas.js';
+import { isNumber } from '../../../../../../base/common/types.js';
+import { ensureNonNullable } from '../../../../../browser/gpu/gpuUtils.js';
+
+export function assertIsValidGlyph(glyph: Readonly<ITextureAtlasPageGlyph> | undefined, atlasOrSource: TextureAtlas | OffscreenCanvas) {
+	if (glyph === undefined) {
+		fail('glyph is undefined');
+	}
+	const pageW = atlasOrSource instanceof TextureAtlas ? atlasOrSource.pageSize : atlasOrSource.width;
+	const pageH = atlasOrSource instanceof TextureAtlas ? atlasOrSource.pageSize : atlasOrSource.width;
+	const source = atlasOrSource instanceof TextureAtlas ? atlasOrSource.pages[glyph.pageIndex].source : atlasOrSource;
+
+	// (x,y) are valid coordinates
+	ok(isNumber(glyph.x));
+	ok(glyph.x >= 0);
+	ok(glyph.x < pageW);
+	ok(isNumber(glyph.y));
+	ok(glyph.y >= 0);
+	ok(glyph.y < pageH);
+
+	// (w,h) are valid dimensions
+	ok(isNumber(glyph.w));
+	ok(glyph.w > 0);
+	ok(glyph.w <= pageW);
+	ok(isNumber(glyph.h));
+	ok(glyph.h > 0);
+	ok(glyph.h <= pageH);
+
+	// (originOffsetX, originOffsetY) are valid offsets
+	ok(isNumber(glyph.originOffsetX));
+	ok(isNumber(glyph.originOffsetY));
+
+	// (x,y) + (w,h) are within the bounds of the atlas
+	ok(glyph.x + glyph.w <= pageW);
+	ok(glyph.y + glyph.h <= pageH);
+
+	// Each of the glyph's outer pixel edges contain at least 1 non-transparent pixel
+	const ctx = ensureNonNullable(source.getContext('2d'));
+	const edges = [
+		ctx.getImageData(glyph.x, glyph.y, glyph.w, 1).data,
+		ctx.getImageData(glyph.x, glyph.y + glyph.h - 1, glyph.w, 1).data,
+		ctx.getImageData(glyph.x, glyph.y, 1, glyph.h).data,
+		ctx.getImageData(glyph.x + glyph.w - 1, glyph.y, 1, glyph.h).data,
+	];
+	for (const edge of edges) {
+		ok(edge.some(color => (color & 0xFF) !== 0));
+	}
+}
diff --git a/src/vs/editor/test/browser/view/gpu/atlas/textureAtlas.test.ts b/src/vs/editor/test/browser/view/gpu/atlas/textureAtlas.test.ts
new file mode 100644
index 00000000000..5a4353a1d19
--- /dev/null
+++ b/src/vs/editor/test/browser/view/gpu/atlas/textureAtlas.test.ts
@@ -0,0 +1,130 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { strictEqual, throws } from 'assert';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import type { IGlyphRasterizer, IRasterizedGlyph } from '../../../../../browser/gpu/raster/raster.js';
+import { ensureNonNullable } from '../../../../../browser/gpu/gpuUtils.js';
+import type { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { TextureAtlas } from '../../../../../browser/gpu/atlas/textureAtlas.js';
+import { createCodeEditorServices } from '../../../testCodeEditor.js';
+import { assertIsValidGlyph } from './testUtil.js';
+import { TextureAtlasSlabAllocator } from '../../../../../browser/gpu/atlas/textureAtlasSlabAllocator.js';
+
+const blackInt = 0x000000FF;
+
+let lastUniqueGlyph: string | undefined;
+function getUniqueGlyphId(): [chars: string, tokenFg: number] {
+	if (!lastUniqueGlyph) {
+		lastUniqueGlyph = 'a';
+	} else {
+		lastUniqueGlyph = String.fromCharCode(lastUniqueGlyph.charCodeAt(0) + 1);
+	}
+	return [lastUniqueGlyph, blackInt];
+}
+
+class TestGlyphRasterizer implements IGlyphRasterizer {
+	readonly id = 0;
+	readonly cacheKey = '';
+	nextGlyphColor: [number, number, number, number] = [0, 0, 0, 0];
+	nextGlyphDimensions: [number, number] = [0, 0];
+	rasterizeGlyph(chars: string, metadata: number, colorMap: string[]): Readonly<IRasterizedGlyph> {
+		const w = this.nextGlyphDimensions[0];
+		const h = this.nextGlyphDimensions[1];
+		if (w === 0 || h === 0) {
+			throw new Error('TestGlyphRasterizer.nextGlyphDimensions must be set to a non-zero value before calling rasterizeGlyph');
+		}
+		const imageData = new ImageData(w, h);
+		let i = 0;
+		for (let y = 0; y < h; y++) {
+			for (let x = 0; x < w; x++) {
+				const [r, g, b, a] = this.nextGlyphColor;
+				i = (y * w + x) * 4;
+				imageData.data[i + 0] = r;
+				imageData.data[i + 1] = g;
+				imageData.data[i + 2] = b;
+				imageData.data[i + 3] = a;
+			}
+		}
+		const canvas = new OffscreenCanvas(w, h);
+		const ctx = ensureNonNullable(canvas.getContext('2d'));
+		ctx.putImageData(imageData, 0, 0);
+		return {
+			source: canvas,
+			boundingBox: { top: 0, left: 0, bottom: h - 1, right: w - 1 },
+			originOffset: { x: 0, y: 0 },
+		};
+	}
+}
+
+suite('TextureAtlas', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+	suiteSetup(() => {
+		lastUniqueGlyph = undefined;
+	});
+
+	let instantiationService: IInstantiationService;
+
+	let atlas: TextureAtlas;
+	let glyphRasterizer: TestGlyphRasterizer;
+
+	setup(() => {
+		instantiationService = createCodeEditorServices(store);
+		atlas = store.add(instantiationService.createInstance(TextureAtlas, 2, undefined));
+		glyphRasterizer = new TestGlyphRasterizer();
+		glyphRasterizer.nextGlyphDimensions = [1, 1];
+		glyphRasterizer.nextGlyphColor = [0, 0, 0, 0xFF];
+	});
+
+	test('get single glyph', () => {
+		assertIsValidGlyph(atlas.getGlyph(glyphRasterizer, ...getUniqueGlyphId()), atlas);
+	});
+
+	test('get multiple glyphs', () => {
+		atlas = store.add(instantiationService.createInstance(TextureAtlas, 32, undefined));
+		for (let i = 0; i < 10; i++) {
+			assertIsValidGlyph(atlas.getGlyph(glyphRasterizer, ...getUniqueGlyphId()), atlas);
+		}
+	});
+
+	test('adding glyph to full page creates new page', () => {
+		let pageCount: number | undefined;
+		for (let i = 0; i < 4; i++) {
+			assertIsValidGlyph(atlas.getGlyph(glyphRasterizer, ...getUniqueGlyphId()), atlas);
+			if (pageCount === undefined) {
+				pageCount = atlas.pages.length;
+			} else {
+				strictEqual(atlas.pages.length, pageCount, 'the number of pages should not change when the page is being filled');
+			}
+		}
+		assertIsValidGlyph(atlas.getGlyph(glyphRasterizer, ...getUniqueGlyphId()), atlas);
+		strictEqual(atlas.pages.length, pageCount! + 1, 'the 5th glyph should overflow to a new page');
+	});
+
+	test('adding a glyph larger than the atlas', () => {
+		glyphRasterizer.nextGlyphDimensions = [3, 2];
+		throws(() => atlas.getGlyph(glyphRasterizer, ...getUniqueGlyphId()), 'should throw when the glyph is too large, this should not happen in practice');
+	});
+
+	test('adding a glyph larger than the standard slab size', () => {
+		glyphRasterizer.nextGlyphDimensions = [2, 2];
+		atlas = store.add(instantiationService.createInstance(TextureAtlas, 32, {
+			allocatorType: (canvas, textureIndex) => new TextureAtlasSlabAllocator(canvas, textureIndex, { slabW: 1, slabH: 1 })
+		}));
+		assertIsValidGlyph(atlas.getGlyph(glyphRasterizer, ...getUniqueGlyphId()), atlas);
+	});
+
+	test('adding a non-first glyph larger than the standard slab size, causing an overflow to a new page', () => {
+		atlas = store.add(instantiationService.createInstance(TextureAtlas, 2, {
+			allocatorType: (canvas, textureIndex) => new TextureAtlasSlabAllocator(canvas, textureIndex, { slabW: 1, slabH: 1 })
+		}));
+		assertIsValidGlyph(atlas.getGlyph(glyphRasterizer, ...getUniqueGlyphId()), atlas);
+		strictEqual(atlas.pages.length, 1);
+		glyphRasterizer.nextGlyphDimensions = [2, 2];
+		assertIsValidGlyph(atlas.getGlyph(glyphRasterizer, ...getUniqueGlyphId()), atlas);
+		strictEqual(atlas.pages.length, 2, 'the 2nd glyph should overflow to a new page with a larger slab size');
+	});
+});
diff --git a/src/vs/editor/test/browser/view/gpu/atlas/textureAtlasAllocator.test.ts b/src/vs/editor/test/browser/view/gpu/atlas/textureAtlasAllocator.test.ts
new file mode 100644
index 00000000000..92d354a5f78
--- /dev/null
+++ b/src/vs/editor/test/browser/view/gpu/atlas/textureAtlasAllocator.test.ts
@@ -0,0 +1,202 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { deepStrictEqual, strictEqual, throws } from 'assert';
+import type { IRasterizedGlyph } from '../../../../../browser/gpu/raster/raster.js';
+import { ensureNonNullable } from '../../../../../browser/gpu/gpuUtils.js';
+import type { ITextureAtlasAllocator } from '../../../../../browser/gpu/atlas/atlas.js';
+import { TextureAtlasShelfAllocator } from '../../../../../browser/gpu/atlas/textureAtlasShelfAllocator.js';
+import { TextureAtlasSlabAllocator, type TextureAtlasSlabAllocatorOptions } from '../../../../../browser/gpu/atlas/textureAtlasSlabAllocator.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { assertIsValidGlyph } from './testUtil.js';
+import { BugIndicatingError } from '../../../../../../base/common/errors.js';
+
+const blackArr = [0x00, 0x00, 0x00, 0xFF];
+
+const pixel1x1 = createRasterizedGlyph(1, 1, [...blackArr]);
+const pixel2x1 = createRasterizedGlyph(2, 1, [...blackArr, ...blackArr]);
+const pixel1x2 = createRasterizedGlyph(1, 2, [...blackArr, ...blackArr]);
+
+function createRasterizedGlyph(w: number, h: number, data: ArrayLike<number>): IRasterizedGlyph {
+	strictEqual(w * h * 4, data.length);
+	const source = new OffscreenCanvas(w, h);
+	const imageData = new ImageData(w, h);
+	imageData.data.set(data);
+	ensureNonNullable(source.getContext('2d')).putImageData(imageData, 0, 0);
+	return {
+		source,
+		boundingBox: { top: 0, left: 0, bottom: h - 1, right: w - 1 },
+		originOffset: { x: 0, y: 0 },
+	};
+}
+
+function allocateAndAssert(allocator: ITextureAtlasAllocator, rasterizedGlyph: IRasterizedGlyph, expected: { x: number; y: number; w: number; h: number } | undefined): void {
+	const actual = allocator.allocate(rasterizedGlyph);
+	if (!actual) {
+		strictEqual(actual, expected);
+		return;
+	}
+	deepStrictEqual({
+		x: actual.x,
+		y: actual.y,
+		w: actual.w,
+		h: actual.h,
+	}, expected);
+}
+
+function initShelfAllocator(w: number, h: number): { canvas: OffscreenCanvas; allocator: TextureAtlasShelfAllocator } {
+	const canvas = new OffscreenCanvas(w, h);
+	const allocator = new TextureAtlasShelfAllocator(canvas, 0);
+	return { canvas, allocator };
+}
+
+function initSlabAllocator(w: number, h: number, options?: TextureAtlasSlabAllocatorOptions): { canvas: OffscreenCanvas; allocator: TextureAtlasSlabAllocator } {
+	const canvas = new OffscreenCanvas(w, h);
+	const allocator = new TextureAtlasSlabAllocator(canvas, 0, options);
+	return { canvas, allocator };
+}
+
+const allocatorDefinitions: { name: string; initAllocator: (w: number, h: number) => { canvas: OffscreenCanvas; allocator: ITextureAtlasAllocator } }[] = [
+	{ name: 'shelf', initAllocator: initShelfAllocator },
+	{ name: 'slab', initAllocator: initSlabAllocator },
+];
+
+suite('TextureAtlasAllocator', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	suite('shared tests', () => {
+		for (const { name, initAllocator } of allocatorDefinitions) {
+			test(`(${name}) single allocation`, () => {
+				const { canvas, allocator } = initAllocator(2, 2);
+				assertIsValidGlyph(allocator.allocate(pixel1x1), canvas);
+			});
+			// Skipping because it fails unexpectedly on web only when asserting the error message
+			test.skip(`(${name}) glyph too large for canvas`, () => {
+				const { allocator } = initAllocator(1, 1);
+				throws(() => allocateAndAssert(allocator, pixel2x1, undefined), new BugIndicatingError('Glyph is too large for the atlas page'));
+			});
+		}
+	});
+
+	suite('TextureAtlasShelfAllocator', () => {
+		const initAllocator = initShelfAllocator;
+
+		test('single allocation', () => {
+			const { allocator } = initAllocator(2, 2);
+			// 1o
+			// oo
+			allocateAndAssert(allocator, pixel1x1, { x: 0, y: 0, w: 1, h: 1 });
+		});
+		test('wrapping', () => {
+			const { allocator } = initAllocator(5, 4);
+
+			// 1233o
+			// o2ooo
+			// ooooo
+			// ooooo
+			allocateAndAssert(allocator, pixel1x1, { x: 0, y: 0, w: 1, h: 1 });
+			allocateAndAssert(allocator, pixel1x2, { x: 1, y: 0, w: 1, h: 2 });
+			allocateAndAssert(allocator, pixel2x1, { x: 2, y: 0, w: 2, h: 1 });
+
+			// 1233x
+			// x2xxx
+			// 44556
+			// ooooo
+			allocateAndAssert(allocator, pixel2x1, { x: 0, y: 2, w: 2, h: 1 });
+			allocateAndAssert(allocator, pixel2x1, { x: 2, y: 2, w: 2, h: 1 });
+			allocateAndAssert(allocator, pixel1x1, { x: 4, y: 2, w: 1, h: 1 });
+
+			// 1233x
+			// x2xxx
+			// 44556
+			// 7oooo
+			allocateAndAssert(allocator, pixel1x1, { x: 0, y: 3, w: 1, h: 1 });
+		});
+		test('full', () => {
+			const { allocator } = initAllocator(3, 2);
+			// 122
+			// 1oo
+			allocateAndAssert(allocator, pixel1x2, { x: 0, y: 0, w: 1, h: 2 });
+			allocateAndAssert(allocator, pixel2x1, { x: 1, y: 0, w: 2, h: 1 });
+			allocateAndAssert(allocator, pixel1x1, undefined);
+		});
+	});
+
+	suite('TextureAtlasSlabAllocator', () => {
+		const initAllocator = initSlabAllocator;
+
+		test('single allocation', () => {
+			const { allocator } = initAllocator(2, 2);
+			// 1o
+			// oo
+			allocateAndAssert(allocator, pixel1x1, { x: 0, y: 0, w: 1, h: 1 });
+		});
+
+		test('single slab single glyph full', () => {
+			const { allocator } = initAllocator(1, 1, { slabW: 1, slabH: 1 });
+
+			// 1
+			allocateAndAssert(allocator, pixel1x1, { x: 0, y: 0, w: 1, h: 1 });
+
+			allocateAndAssert(allocator, pixel1x1, undefined);
+		});
+
+		test('single slab multiple glyph full', () => {
+			const { allocator } = initAllocator(2, 2, { slabW: 2, slabH: 2 });
+
+			// 1
+			// 1
+			allocateAndAssert(allocator, pixel1x2, { x: 0, y: 0, w: 1, h: 2 });
+			allocateAndAssert(allocator, pixel1x2, { x: 1, y: 0, w: 1, h: 2 });
+
+			allocateAndAssert(allocator, pixel1x2, undefined);
+		});
+
+		test('allocate 1x1 to multiple slabs until full', () => {
+			const { allocator } = initAllocator(4, 2, { slabW: 2, slabH: 2 });
+
+			// 12│oo
+			// 34│oo
+			allocateAndAssert(allocator, pixel1x1, { x: 0, y: 0, w: 1, h: 1 });
+			allocateAndAssert(allocator, pixel1x1, { x: 1, y: 0, w: 1, h: 1 });
+			allocateAndAssert(allocator, pixel1x1, { x: 0, y: 1, w: 1, h: 1 });
+			allocateAndAssert(allocator, pixel1x1, { x: 1, y: 1, w: 1, h: 1 });
+
+			// 12│56
+			// 34│78
+			allocateAndAssert(allocator, pixel1x1, { x: 2, y: 0, w: 1, h: 1 });
+			allocateAndAssert(allocator, pixel1x1, { x: 3, y: 0, w: 1, h: 1 });
+			allocateAndAssert(allocator, pixel1x1, { x: 2, y: 1, w: 1, h: 1 });
+			allocateAndAssert(allocator, pixel1x1, { x: 3, y: 1, w: 1, h: 1 });
+
+			allocateAndAssert(allocator, pixel1x1, undefined);
+		});
+
+		test('glyph too large for slab (increase slab size for first glyph)', () => {
+			const { allocator } = initAllocator(2, 2, { slabW: 1, slabH: 1 });
+			allocateAndAssert(allocator, pixel2x1, { x: 0, y: 0, w: 2, h: 1 });
+		});
+
+		test('glyph too large for slab (undefined as it\'s not the first glyph)', () => {
+			const { allocator } = initAllocator(2, 2, { slabW: 1, slabH: 1 });
+			allocateAndAssert(allocator, pixel1x1, { x: 0, y: 0, w: 1, h: 1 });
+			allocateAndAssert(allocator, pixel2x1, undefined);
+		});
+
+		test('separate slabs for different sized glyphs', () => {
+			const { allocator } = initAllocator(4, 2, { slabW: 2, slabH: 2 });
+
+			// 10│2o
+			// 00│2o
+			allocateAndAssert(allocator, pixel1x1, { x: 0, y: 0, w: 1, h: 1 });
+			allocateAndAssert(allocator, pixel1x2, { x: 2, y: 0, w: 1, h: 2 });
+
+			// 14│23
+			// 00│23
+			allocateAndAssert(allocator, pixel1x2, { x: 3, y: 0, w: 1, h: 2 });
+			allocateAndAssert(allocator, pixel1x1, { x: 1, y: 0, w: 1, h: 1 });
+		});
+	});
+});
diff --git a/src/vs/editor/test/browser/view/gpu/bufferDirtyTracker.test.ts b/src/vs/editor/test/browser/view/gpu/bufferDirtyTracker.test.ts
new file mode 100644
index 00000000000..0ddc7a5befe
--- /dev/null
+++ b/src/vs/editor/test/browser/view/gpu/bufferDirtyTracker.test.ts
@@ -0,0 +1,46 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { strictEqual } from 'assert';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { BufferDirtyTracker } from '../../../../browser/gpu/bufferDirtyTracker.js';
+
+suite('BufferDirtyTracker', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	let bdt: BufferDirtyTracker;
+
+	function assertState(dataOffset: number | undefined, dirtySize: number | undefined) {
+		strictEqual(bdt.dataOffset, dataOffset);
+		strictEqual(bdt.dirtySize, dirtySize);
+		strictEqual(bdt.isDirty, dataOffset !== undefined);
+	}
+
+	setup(() => {
+		bdt = new BufferDirtyTracker();
+	});
+
+	test('flag(index)', () => {
+		strictEqual(bdt.flag(0), 0);
+		assertState(0, 1);
+		strictEqual(bdt.flag(31), 31);
+		assertState(0, 32);
+		bdt.clear();
+		assertState(undefined, undefined);
+		strictEqual(bdt.flag(10), 10);
+		assertState(10, 1);
+		strictEqual(bdt.flag(15), 15);
+		assertState(10, 6);
+	});
+
+	test('flag(index, length)', () => {
+		bdt.flag(0, 32);
+		assertState(0, 32);
+		bdt.clear();
+		assertState(undefined, undefined);
+		bdt.flag(10, 6);
+		assertState(10, 6);
+	});
+});
diff --git a/src/vs/editor/test/browser/view/gpu/objectCollectionBuffer.test.ts b/src/vs/editor/test/browser/view/gpu/objectCollectionBuffer.test.ts
new file mode 100644
index 00000000000..ae8c0670d2b
--- /dev/null
+++ b/src/vs/editor/test/browser/view/gpu/objectCollectionBuffer.test.ts
@@ -0,0 +1,108 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { deepStrictEqual, strictEqual } from 'assert';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { createObjectCollectionBuffer, type IObjectCollectionBuffer } from '../../../../browser/gpu/objectCollectionBuffer.js';
+
+suite('ObjectCollectionBuffer', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+	function assertUsedData(buffer: IObjectCollectionBuffer<any>, expected: number[]) {
+		deepStrictEqual(Array.from(buffer.view.subarray(0, buffer.viewUsedSize)), expected);
+	}
+
+	test('createEntry', () => {
+		const buffer = store.add(createObjectCollectionBuffer([
+			{ name: 'a' },
+			{ name: 'b' },
+		] as const, 5));
+		assertUsedData(buffer, []);
+
+		store.add(buffer.createEntry({ a: 1, b: 2 }));
+		store.add(buffer.createEntry({ a: 3, b: 4 }));
+		store.add(buffer.createEntry({ a: 5, b: 6 }));
+		store.add(buffer.createEntry({ a: 7, b: 8 }));
+		store.add(buffer.createEntry({ a: 9, b: 10 }));
+		assertUsedData(buffer, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
+	});
+
+	test('createEntry beyond capacity', () => {
+		const buffer = store.add(createObjectCollectionBuffer([
+			{ name: 'a' },
+			{ name: 'b' },
+		] as const, 1));
+		store.add(buffer.createEntry({ a: 1, b: 2 }));
+		strictEqual(buffer.entryCount, 1);
+		strictEqual(buffer.buffer.byteLength, 8);
+		buffer.createEntry({ a: 3, b: 4 });
+		strictEqual(buffer.entryCount, 2);
+		strictEqual(buffer.buffer.byteLength, 16);
+	});
+
+	test('dispose entry', () => {
+		const buffer = store.add(createObjectCollectionBuffer([
+			{ name: 'a' },
+			{ name: 'b' },
+		] as const, 5));
+		store.add(buffer.createEntry({ a: 1, b: 2 }));
+		const entry1 = buffer.createEntry({ a: 3, b: 4 });
+		store.add(buffer.createEntry({ a: 5, b: 6 }));
+		const entry2 = buffer.createEntry({ a: 7, b: 8 });
+		store.add(buffer.createEntry({ a: 9, b: 10 }));
+		entry1.dispose();
+		entry2.dispose();
+		// Data from disposed entries is stale and doesn't need to be validated
+		assertUsedData(buffer, [1, 2, 5, 6, 9, 10]);
+	});
+
+	test('entryCount, viewUsedSize, bufferUsedSize', () => {
+		const buffer = store.add(createObjectCollectionBuffer([
+			{ name: 'foo' },
+			{ name: 'bar' },
+		] as const, 5));
+		strictEqual(buffer.entryCount, 0);
+		strictEqual(buffer.bufferUsedSize, 0);
+		strictEqual(buffer.viewUsedSize, 0);
+		buffer.createEntry({ foo: 1, bar: 2 });
+		strictEqual(buffer.entryCount, 1);
+		strictEqual(buffer.viewUsedSize, 2);
+		strictEqual(buffer.bufferUsedSize, 8);
+		const entry = buffer.createEntry({ foo: 3, bar: 4 });
+		strictEqual(buffer.entryCount, 2);
+		strictEqual(buffer.viewUsedSize, 4);
+		strictEqual(buffer.bufferUsedSize, 16);
+		entry.dispose();
+		strictEqual(buffer.entryCount, 1);
+		strictEqual(buffer.viewUsedSize, 2);
+		strictEqual(buffer.bufferUsedSize, 8);
+	});
+
+	test('entry.get', () => {
+		const buffer = store.add(createObjectCollectionBuffer([
+			{ name: 'foo' },
+			{ name: 'bar' },
+		] as const, 5));
+		const entry = store.add(buffer.createEntry({ foo: 1, bar: 2 }));
+		strictEqual(entry.get('foo'), 1);
+		strictEqual(entry.get('bar'), 2);
+	});
+
+	test('entry.set', () => {
+		const buffer = store.add(createObjectCollectionBuffer([
+			{ name: 'foo' },
+			{ name: 'bar' },
+		] as const, 5));
+		const entry = store.add(buffer.createEntry({ foo: 1, bar: 2 }));
+		let changeCount = 0;
+		store.add(buffer.onDidChange(() => changeCount++));
+		entry.set('foo', 3);
+		strictEqual(changeCount, 1);
+		strictEqual(entry.get('foo'), 3);
+		entry.set('bar', 4);
+		strictEqual(changeCount, 2);
+		strictEqual(entry.get('bar'), 4);
+	});
+});
diff --git a/src/vs/editor/test/browser/view/minimapCharRenderer.test.ts b/src/vs/editor/test/browser/view/minimapCharRenderer.test.ts
index 4fcfa5cf3cd..20af8f3d03f 100644
--- a/src/vs/editor/test/browser/view/minimapCharRenderer.test.ts
+++ b/src/vs/editor/test/browser/view/minimapCharRenderer.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { MinimapCharRendererFactory } from 'vs/editor/browser/viewParts/minimap/minimapCharRendererFactory';
-import { Constants } from 'vs/editor/browser/viewParts/minimap/minimapCharSheet';
-import { RGBA8 } from 'vs/editor/common/core/rgba';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { MinimapCharRendererFactory } from '../../../browser/viewParts/minimap/minimapCharRendererFactory.js';
+import { Constants } from '../../../browser/viewParts/minimap/minimapCharSheet.js';
+import { RGBA8 } from '../../../common/core/rgba.js';
 
 suite('MinimapCharRenderer', () => {
 
diff --git a/src/vs/editor/test/browser/view/viewLayer.test.ts b/src/vs/editor/test/browser/view/viewLayer.test.ts
index 0f9588d870c..e9632a4c991 100644
--- a/src/vs/editor/test/browser/view/viewLayer.test.ts
+++ b/src/vs/editor/test/browser/view/viewLayer.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ILine, RenderedLinesCollection } from 'vs/editor/browser/view/viewLayer';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { ILine, RenderedLinesCollection } from '../../../browser/view/viewLayer.js';
 
 class TestLine implements ILine {
 
@@ -45,7 +45,7 @@ suite('RenderedLinesCollection onLinesDeleted', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
 
 	function testOnModelLinesDeleted(deleteFromLineNumber: number, deleteToLineNumber: number, expectedDeleted: string[], expectedState: ILinesCollectionState): void {
-		const col = new RenderedLinesCollection<TestLine>(() => new TestLine('new'));
+		const col = new RenderedLinesCollection<TestLine>({ createLine: () => new TestLine('new') });
 		col._set(6, [
 			new TestLine('old6'),
 			new TestLine('old7'),
@@ -322,7 +322,7 @@ suite('RenderedLinesCollection onLineChanged', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
 
 	function testOnModelLineChanged(changedLineNumber: number, expectedPinged: boolean, expectedState: ILinesCollectionState): void {
-		const col = new RenderedLinesCollection<TestLine>(() => new TestLine('new'));
+		const col = new RenderedLinesCollection<TestLine>({ createLine: () => new TestLine('new') });
 		col._set(6, [
 			new TestLine('old6'),
 			new TestLine('old7'),
@@ -405,7 +405,7 @@ suite('RenderedLinesCollection onLinesInserted', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
 
 	function testOnModelLinesInserted(insertFromLineNumber: number, insertToLineNumber: number, expectedDeleted: string[], expectedState: ILinesCollectionState): void {
-		const col = new RenderedLinesCollection<TestLine>(() => new TestLine('new'));
+		const col = new RenderedLinesCollection<TestLine>({ createLine: () => new TestLine('new') });
 		col._set(6, [
 			new TestLine('old6'),
 			new TestLine('old7'),
@@ -683,7 +683,7 @@ suite('RenderedLinesCollection onTokensChanged', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
 
 	function testOnModelTokensChanged(changedFromLineNumber: number, changedToLineNumber: number, expectedPinged: boolean, expectedState: ILinesCollectionState): void {
-		const col = new RenderedLinesCollection<TestLine>(() => new TestLine('new'));
+		const col = new RenderedLinesCollection<TestLine>({ createLine: () => new TestLine('new') });
 		col._set(6, [
 			new TestLine('old6'),
 			new TestLine('old7'),
diff --git a/src/vs/editor/test/browser/viewModel/modelLineProjection.test.ts b/src/vs/editor/test/browser/viewModel/modelLineProjection.test.ts
index 292aa0ed1fa..417249f546b 100644
--- a/src/vs/editor/test/browser/viewModel/modelLineProjection.test.ts
+++ b/src/vs/editor/test/browser/viewModel/modelLineProjection.test.ts
@@ -4,24 +4,24 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Position } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { MetadataConsts } from 'vs/editor/common/encodedTokenAttributes';
-import * as languages from 'vs/editor/common/languages';
-import { NullState } from 'vs/editor/common/languages/nullTokenize';
-import { EndOfLinePreference } from 'vs/editor/common/model';
-import { TextModel } from 'vs/editor/common/model/textModel';
-import { ModelLineProjectionData } from 'vs/editor/common/modelLineProjectionData';
-import { IViewLineTokens } from 'vs/editor/common/tokens/lineTokens';
-import { ViewLineData } from 'vs/editor/common/viewModel';
-import { IModelLineProjection, ISimpleModel, createModelLineProjection } from 'vs/editor/common/viewModel/modelLineProjection';
-import { MonospaceLineBreaksComputerFactory } from 'vs/editor/common/viewModel/monospaceLineBreaksComputer';
-import { ViewModelLinesFromProjectedModel } from 'vs/editor/common/viewModel/viewModelLines';
-import { TestConfiguration } from 'vs/editor/test/browser/config/testConfiguration';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { Position } from '../../../common/core/position.js';
+import { IRange, Range } from '../../../common/core/range.js';
+import { MetadataConsts } from '../../../common/encodedTokenAttributes.js';
+import * as languages from '../../../common/languages.js';
+import { NullState } from '../../../common/languages/nullTokenize.js';
+import { EndOfLinePreference } from '../../../common/model.js';
+import { TextModel } from '../../../common/model/textModel.js';
+import { ModelLineProjectionData } from '../../../common/modelLineProjectionData.js';
+import { IViewLineTokens } from '../../../common/tokens/lineTokens.js';
+import { ViewLineData } from '../../../common/viewModel.js';
+import { IModelLineProjection, ISimpleModel, createModelLineProjection } from '../../../common/viewModel/modelLineProjection.js';
+import { MonospaceLineBreaksComputerFactory } from '../../../common/viewModel/monospaceLineBreaksComputer.js';
+import { ViewModelLinesFromProjectedModel } from '../../../common/viewModel/viewModelLines.js';
+import { TestConfiguration } from '../config/testConfiguration.js';
+import { createTextModel } from '../../common/testTextModel.js';
 
 suite('Editor ViewModel - SplitLinesCollection', () => {
 
diff --git a/src/vs/editor/test/browser/viewModel/testViewModel.ts b/src/vs/editor/test/browser/viewModel/testViewModel.ts
index 36749b71bd6..1c59f3de14e 100644
--- a/src/vs/editor/test/browser/viewModel/testViewModel.ts
+++ b/src/vs/editor/test/browser/viewModel/testViewModel.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { TextModel } from 'vs/editor/common/model/textModel';
-import { ViewModel } from 'vs/editor/common/viewModel/viewModelImpl';
-import { TestConfiguration } from 'vs/editor/test/browser/config/testConfiguration';
-import { MonospaceLineBreaksComputerFactory } from 'vs/editor/common/viewModel/monospaceLineBreaksComputer';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
-import { TestLanguageConfigurationService } from 'vs/editor/test/common/modes/testLanguageConfigurationService';
-import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
+import { IEditorOptions } from '../../../common/config/editorOptions.js';
+import { TextModel } from '../../../common/model/textModel.js';
+import { ViewModel } from '../../../common/viewModel/viewModelImpl.js';
+import { TestConfiguration } from '../config/testConfiguration.js';
+import { MonospaceLineBreaksComputerFactory } from '../../../common/viewModel/monospaceLineBreaksComputer.js';
+import { createTextModel } from '../../common/testTextModel.js';
+import { TestLanguageConfigurationService } from '../../common/modes/testLanguageConfigurationService.js';
+import { TestThemeService } from '../../../../platform/theme/test/common/testThemeService.js';
 
 export function testViewModel(text: string[], options: IEditorOptions, callback: (viewModel: ViewModel, model: TextModel) => void): void {
 	const EDITOR_ID = 1;
diff --git a/src/vs/editor/test/browser/viewModel/viewModelDecorations.test.ts b/src/vs/editor/test/browser/viewModel/viewModelDecorations.test.ts
index a89fc01e245..bed88ad1260 100644
--- a/src/vs/editor/test/browser/viewModel/viewModelDecorations.test.ts
+++ b/src/vs/editor/test/browser/viewModel/viewModelDecorations.test.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { Range } from 'vs/editor/common/core/range';
-import { InlineDecoration, InlineDecorationType } from 'vs/editor/common/viewModel';
-import { testViewModel } from 'vs/editor/test/browser/viewModel/testViewModel';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { IEditorOptions } from '../../../common/config/editorOptions.js';
+import { Range } from '../../../common/core/range.js';
+import { InlineDecoration, InlineDecorationType } from '../../../common/viewModel.js';
+import { testViewModel } from './testViewModel.js';
 
 suite('ViewModelDecorations', () => {
 
diff --git a/src/vs/editor/test/browser/viewModel/viewModelImpl.test.ts b/src/vs/editor/test/browser/viewModel/viewModelImpl.test.ts
index ff16b570be1..8afa07a8b56 100644
--- a/src/vs/editor/test/browser/viewModel/viewModelImpl.test.ts
+++ b/src/vs/editor/test/browser/viewModel/viewModelImpl.test.ts
@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { EndOfLineSequence, PositionAffinity } from 'vs/editor/common/model';
-import { ViewEventHandler } from 'vs/editor/common/viewEventHandler';
-import { ViewEvent } from 'vs/editor/common/viewEvents';
-import { testViewModel } from 'vs/editor/test/browser/viewModel/testViewModel';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { EndOfLineSequence, PositionAffinity } from '../../../common/model.js';
+import { ViewEventHandler } from '../../../common/viewEventHandler.js';
+import { ViewEvent } from '../../../common/viewEvents.js';
+import { testViewModel } from './testViewModel.js';
 
 suite('ViewModel', () => {
 
diff --git a/src/vs/editor/test/browser/widget/codeEditorWidget.test.ts b/src/vs/editor/test/browser/widget/codeEditorWidget.test.ts
index a09d5c98f18..fead379bd24 100644
--- a/src/vs/editor/test/browser/widget/codeEditorWidget.test.ts
+++ b/src/vs/editor/test/browser/widget/codeEditorWidget.test.ts
@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { Range } from '../../../common/core/range.js';
+import { Selection } from '../../../common/core/selection.js';
+import { ILanguageService } from '../../../common/languages/language.js';
+import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import { withTestCodeEditor } from '../testCodeEditor.js';
 
 suite('CodeEditorWidget', () => {
 
diff --git a/src/vs/editor/test/browser/widget/diffEditorWidget.test.ts b/src/vs/editor/test/browser/widget/diffEditorWidget.test.ts
index 53ecda34e13..eeac9f526e5 100644
--- a/src/vs/editor/test/browser/widget/diffEditorWidget.test.ts
+++ b/src/vs/editor/test/browser/widget/diffEditorWidget.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { UnchangedRegion } from 'vs/editor/browser/widget/diffEditor/diffEditorViewModel';
-import { LineRange } from 'vs/editor/common/core/lineRange';
-import { DetailedLineRangeMapping } from 'vs/editor/common/diff/rangeMapping';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { UnchangedRegion } from '../../../browser/widget/diffEditor/diffEditorViewModel.js';
+import { LineRange } from '../../../common/core/lineRange.js';
+import { DetailedLineRangeMapping } from '../../../common/diff/rangeMapping.js';
 
 suite('DiffEditorWidget2', () => {
 
diff --git a/src/vs/editor/test/browser/widget/observableCodeEditor.test.ts b/src/vs/editor/test/browser/widget/observableCodeEditor.test.ts
index 313c561788c..d9144896afe 100644
--- a/src/vs/editor/test/browser/widget/observableCodeEditor.test.ts
+++ b/src/vs/editor/test/browser/widget/observableCodeEditor.test.ts
@@ -4,21 +4,21 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from "assert";
-import { DisposableStore } from "vs/base/common/lifecycle";
-import { IObservable, derivedHandleChanges } from "vs/base/common/observable";
-import { ensureNoDisposablesAreLeakedInTestSuite } from "vs/base/test/common/utils";
-import { ICodeEditor } from "vs/editor/browser/editorBrowser";
-import { ObservableCodeEditor, observableCodeEditor } from "vs/editor/browser/observableUtilities";
-import { Position } from "vs/editor/common/core/position";
-import { Range } from "vs/editor/common/core/range";
-import { ViewModel } from "vs/editor/common/viewModel/viewModelImpl";
-import { withTestCodeEditor } from "vs/editor/test/browser/testCodeEditor";
+import { DisposableStore } from "../../../../base/common/lifecycle.js";
+import { IObservable, derivedHandleChanges } from "../../../../base/common/observable.js";
+import { ensureNoDisposablesAreLeakedInTestSuite } from "../../../../base/test/common/utils.js";
+import { ICodeEditor } from "../../../browser/editorBrowser.js";
+import { ObservableCodeEditor, observableCodeEditor } from "../../../browser/observableCodeEditor.js";
+import { Position } from "../../../common/core/position.js";
+import { Range } from "../../../common/core/range.js";
+import { ViewModel } from "../../../common/viewModel/viewModelImpl.js";
+import { withTestCodeEditor } from "../testCodeEditor.js";
 
 suite("CodeEditorWidget", () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
 
 	function withTestFixture(
-		cb: (args: { editor: ICodeEditor; viewModel: ViewModel; log: Log; derived: IObservable<string>; }) => void
+		cb: (args: { editor: ICodeEditor; viewModel: ViewModel; log: Log; derived: IObservable<string> }) => void
 	) {
 		withEditorSetupTestFixture(undefined, cb);
 	}
@@ -27,7 +27,7 @@ suite("CodeEditorWidget", () => {
 		preSetupCallback:
 			| ((editor: ICodeEditor, disposables: DisposableStore) => void)
 			| undefined,
-		cb: (args: { editor: ICodeEditor; viewModel: ViewModel; log: Log; derived: IObservable<string>; }) => void
+		cb: (args: { editor: ICodeEditor; viewModel: ViewModel; log: Log; derived: IObservable<string> }) => void
 	) {
 		withTestCodeEditor("hello world", {}, (editor, viewModel) => {
 			const disposables = new DisposableStore();
diff --git a/src/vs/editor/test/common/controller/cursorAtomicMoveOperations.test.ts b/src/vs/editor/test/common/controller/cursorAtomicMoveOperations.test.ts
index 9c2efda4f77..819c2b9622e 100644
--- a/src/vs/editor/test/common/controller/cursorAtomicMoveOperations.test.ts
+++ b/src/vs/editor/test/common/controller/cursorAtomicMoveOperations.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { AtomicTabMoveOperations, Direction } from 'vs/editor/common/cursor/cursorAtomicMoveOperations';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { AtomicTabMoveOperations, Direction } from '../../../common/cursor/cursorAtomicMoveOperations.js';
 
 suite('Cursor move command test', () => {
 
diff --git a/src/vs/editor/test/common/core/characterClassifier.test.ts b/src/vs/editor/test/common/core/characterClassifier.test.ts
index 4271d91f923..7bd42977c34 100644
--- a/src/vs/editor/test/common/core/characterClassifier.test.ts
+++ b/src/vs/editor/test/common/core/characterClassifier.test.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { CharCode } from 'vs/base/common/charCode';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { CharacterClassifier } from 'vs/editor/common/core/characterClassifier';
+import { CharCode } from '../../../../base/common/charCode.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { CharacterClassifier } from '../../../common/core/characterClassifier.js';
 
 suite('CharacterClassifier', () => {
 
diff --git a/src/vs/editor/test/common/controller/cursorMoveHelper.test.ts b/src/vs/editor/test/common/core/cursorColumns.test.ts
similarity index 77%
rename from src/vs/editor/test/common/controller/cursorMoveHelper.test.ts
rename to src/vs/editor/test/common/core/cursorColumns.test.ts
index e90bdd5a571..9e9f2728046 100644
--- a/src/vs/editor/test/common/controller/cursorMoveHelper.test.ts
+++ b/src/vs/editor/test/common/core/cursorColumns.test.ts
@@ -3,45 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { CursorColumns } from 'vs/editor/common/core/cursorColumns';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { CursorColumns } from '../../../common/core/cursorColumns.js';
 
-suite('CursorMove', () => {
+suite('CursorColumns', () => {
 
 	ensureNoDisposablesAreLeakedInTestSuite();
 
-	test('nextRenderTabStop', () => {
-		assert.strictEqual(CursorColumns.nextRenderTabStop(0, 4), 4);
-		assert.strictEqual(CursorColumns.nextRenderTabStop(1, 4), 4);
-		assert.strictEqual(CursorColumns.nextRenderTabStop(2, 4), 4);
-		assert.strictEqual(CursorColumns.nextRenderTabStop(3, 4), 4);
-		assert.strictEqual(CursorColumns.nextRenderTabStop(4, 4), 8);
-		assert.strictEqual(CursorColumns.nextRenderTabStop(5, 4), 8);
-		assert.strictEqual(CursorColumns.nextRenderTabStop(6, 4), 8);
-		assert.strictEqual(CursorColumns.nextRenderTabStop(7, 4), 8);
-		assert.strictEqual(CursorColumns.nextRenderTabStop(8, 4), 12);
-
-		assert.strictEqual(CursorColumns.nextRenderTabStop(0, 2), 2);
-		assert.strictEqual(CursorColumns.nextRenderTabStop(1, 2), 2);
-		assert.strictEqual(CursorColumns.nextRenderTabStop(2, 2), 4);
-		assert.strictEqual(CursorColumns.nextRenderTabStop(3, 2), 4);
-		assert.strictEqual(CursorColumns.nextRenderTabStop(4, 2), 6);
-		assert.strictEqual(CursorColumns.nextRenderTabStop(5, 2), 6);
-		assert.strictEqual(CursorColumns.nextRenderTabStop(6, 2), 8);
-		assert.strictEqual(CursorColumns.nextRenderTabStop(7, 2), 8);
-		assert.strictEqual(CursorColumns.nextRenderTabStop(8, 2), 10);
-
-		assert.strictEqual(CursorColumns.nextRenderTabStop(0, 1), 1);
-		assert.strictEqual(CursorColumns.nextRenderTabStop(1, 1), 2);
-		assert.strictEqual(CursorColumns.nextRenderTabStop(2, 1), 3);
-		assert.strictEqual(CursorColumns.nextRenderTabStop(3, 1), 4);
-		assert.strictEqual(CursorColumns.nextRenderTabStop(4, 1), 5);
-		assert.strictEqual(CursorColumns.nextRenderTabStop(5, 1), 6);
-		assert.strictEqual(CursorColumns.nextRenderTabStop(6, 1), 7);
-		assert.strictEqual(CursorColumns.nextRenderTabStop(7, 1), 8);
-		assert.strictEqual(CursorColumns.nextRenderTabStop(8, 1), 9);
-	});
-
 	test('visibleColumnFromColumn', () => {
 
 		function testVisibleColumnFromColumn(text: string, tabSize: number, column: number, expected: number): void {
@@ -101,6 +69,62 @@ suite('CursorMove', () => {
 		testVisibleColumnFromColumn('📚az', 4, 5, 4);
 	});
 
+	test('toStatusbarColumn', () => {
+
+		function t(text: string, tabSize: number, column: number, expected: number): void {
+			assert.strictEqual(CursorColumns.toStatusbarColumn(text, column, tabSize), expected, `<<t('${text}', ${tabSize}, ${column}, ${expected})>>`);
+		}
+
+		t('    spaces', 4, 1, 1);
+		t('    spaces', 4, 2, 2);
+		t('    spaces', 4, 3, 3);
+		t('    spaces', 4, 4, 4);
+		t('    spaces', 4, 5, 5);
+		t('    spaces', 4, 6, 6);
+		t('    spaces', 4, 7, 7);
+		t('    spaces', 4, 8, 8);
+		t('    spaces', 4, 9, 9);
+		t('    spaces', 4, 10, 10);
+		t('    spaces', 4, 11, 11);
+
+		t('\ttab', 4, 1, 1);
+		t('\ttab', 4, 2, 5);
+		t('\ttab', 4, 3, 6);
+		t('\ttab', 4, 4, 7);
+		t('\ttab', 4, 5, 8);
+
+		t('𐌀𐌁𐌂𐌃𐌄𐌅𐌆', 4, 1, 1);
+		t('𐌀𐌁𐌂𐌃𐌄𐌅𐌆', 4, 2, 2);
+		t('𐌀𐌁𐌂𐌃𐌄𐌅𐌆', 4, 3, 2);
+		t('𐌀𐌁𐌂𐌃𐌄𐌅𐌆', 4, 4, 3);
+		t('𐌀𐌁𐌂𐌃𐌄𐌅𐌆', 4, 5, 3);
+		t('𐌀𐌁𐌂𐌃𐌄𐌅𐌆', 4, 6, 4);
+		t('𐌀𐌁𐌂𐌃𐌄𐌅𐌆', 4, 7, 4);
+		t('𐌀𐌁𐌂𐌃𐌄𐌅𐌆', 4, 8, 5);
+		t('𐌀𐌁𐌂𐌃𐌄𐌅𐌆', 4, 9, 5);
+		t('𐌀𐌁𐌂𐌃𐌄𐌅𐌆', 4, 10, 6);
+		t('𐌀𐌁𐌂𐌃𐌄𐌅𐌆', 4, 11, 6);
+		t('𐌀𐌁𐌂𐌃𐌄𐌅𐌆', 4, 12, 7);
+		t('𐌀𐌁𐌂𐌃𐌄𐌅𐌆', 4, 13, 7);
+		t('𐌀𐌁𐌂𐌃𐌄𐌅𐌆', 4, 14, 8);
+		t('𐌀𐌁𐌂𐌃𐌄𐌅𐌆', 4, 15, 8);
+
+		t('🎈🎈🎈🎈', 4, 1, 1);
+		t('🎈🎈🎈🎈', 4, 2, 2);
+		t('🎈🎈🎈🎈', 4, 3, 2);
+		t('🎈🎈🎈🎈', 4, 4, 3);
+		t('🎈🎈🎈🎈', 4, 5, 3);
+		t('🎈🎈🎈🎈', 4, 6, 4);
+		t('🎈🎈🎈🎈', 4, 7, 4);
+		t('🎈🎈🎈🎈', 4, 8, 5);
+		t('🎈🎈🎈🎈', 4, 9, 5);
+
+		t('何何何何', 4, 1, 1);
+		t('何何何何', 4, 2, 2);
+		t('何何何何', 4, 3, 3);
+		t('何何何何', 4, 4, 4);
+	});
+
 	test('columnFromVisibleColumn', () => {
 
 		function testColumnFromVisibleColumn(text: string, tabSize: number, visibleColumn: number, expected: number): void {
@@ -177,59 +201,81 @@ suite('CursorMove', () => {
 		testColumnFromVisibleColumn('📚az', 4, 4, 5);
 	});
 
-	test('toStatusbarColumn', () => {
+	for (const [name, fn] of [
+		['nextRenderTabStop', CursorColumns.nextRenderTabStop],
+		['nextIndentTabStop', CursorColumns.nextIndentTabStop],
+	] as const) {
+		test(name, () => {
+			assert.strictEqual(fn(0, 4), 4);
+			assert.strictEqual(fn(1, 4), 4);
+			assert.strictEqual(fn(2, 4), 4);
+			assert.strictEqual(fn(3, 4), 4);
+			assert.strictEqual(fn(4, 4), 8);
+			assert.strictEqual(fn(5, 4), 8);
+			assert.strictEqual(fn(6, 4), 8);
+			assert.strictEqual(fn(7, 4), 8);
+			assert.strictEqual(fn(8, 4), 12);
 
-		function t(text: string, tabSize: number, column: number, expected: number): void {
-			assert.strictEqual(CursorColumns.toStatusbarColumn(text, column, tabSize), expected, `<<t('${text}', ${tabSize}, ${column}, ${expected})>>`);
-		}
+			assert.strictEqual(fn(0, 2), 2);
+			assert.strictEqual(fn(1, 2), 2);
+			assert.strictEqual(fn(2, 2), 4);
+			assert.strictEqual(fn(3, 2), 4);
+			assert.strictEqual(fn(4, 2), 6);
+			assert.strictEqual(fn(5, 2), 6);
+			assert.strictEqual(fn(6, 2), 8);
+			assert.strictEqual(fn(7, 2), 8);
+			assert.strictEqual(fn(8, 2), 10);
 
-		t('    spaces', 4, 1, 1);
-		t('    spaces', 4, 2, 2);
-		t('    spaces', 4, 3, 3);
-		t('    spaces', 4, 4, 4);
-		t('    spaces', 4, 5, 5);
-		t('    spaces', 4, 6, 6);
-		t('    spaces', 4, 7, 7);
-		t('    spaces', 4, 8, 8);
-		t('    spaces', 4, 9, 9);
-		t('    spaces', 4, 10, 10);
-		t('    spaces', 4, 11, 11);
+			assert.strictEqual(fn(0, 1), 1);
+			assert.strictEqual(fn(1, 1), 2);
+			assert.strictEqual(fn(2, 1), 3);
+			assert.strictEqual(fn(3, 1), 4);
+			assert.strictEqual(fn(4, 1), 5);
+			assert.strictEqual(fn(5, 1), 6);
+			assert.strictEqual(fn(6, 1), 7);
+			assert.strictEqual(fn(7, 1), 8);
+			assert.strictEqual(fn(8, 1), 9);
+		});
+	}
 
-		t('\ttab', 4, 1, 1);
-		t('\ttab', 4, 2, 5);
-		t('\ttab', 4, 3, 6);
-		t('\ttab', 4, 4, 7);
-		t('\ttab', 4, 5, 8);
+	for (const [name, fn] of [
+		['prevRenderTabStop', CursorColumns.prevRenderTabStop],
+		['prevIndentTabStop', CursorColumns.prevIndentTabStop],
+	] as const) {
+		test(name, () => {
+			assert.strictEqual(fn(0, 4), 0);
+			assert.strictEqual(fn(1, 4), 0);
+			assert.strictEqual(fn(2, 4), 0);
+			assert.strictEqual(fn(3, 4), 0);
+			assert.strictEqual(fn(4, 4), 0);
+			assert.strictEqual(fn(5, 4), 4);
+			assert.strictEqual(fn(6, 4), 4);
+			assert.strictEqual(fn(7, 4), 4);
+			assert.strictEqual(fn(8, 4), 4);
+			assert.strictEqual(fn(9, 4), 8);
 
-		t('𐌀𐌁𐌂𐌃𐌄𐌅𐌆', 4, 1, 1);
-		t('𐌀𐌁𐌂𐌃𐌄𐌅𐌆', 4, 2, 2);
-		t('𐌀𐌁𐌂𐌃𐌄𐌅𐌆', 4, 3, 2);
-		t('𐌀𐌁𐌂𐌃𐌄𐌅𐌆', 4, 4, 3);
-		t('𐌀𐌁𐌂𐌃𐌄𐌅𐌆', 4, 5, 3);
-		t('𐌀𐌁𐌂𐌃𐌄𐌅𐌆', 4, 6, 4);
-		t('𐌀𐌁𐌂𐌃𐌄𐌅𐌆', 4, 7, 4);
-		t('𐌀𐌁𐌂𐌃𐌄𐌅𐌆', 4, 8, 5);
-		t('𐌀𐌁𐌂𐌃𐌄𐌅𐌆', 4, 9, 5);
-		t('𐌀𐌁𐌂𐌃𐌄𐌅𐌆', 4, 10, 6);
-		t('𐌀𐌁𐌂𐌃𐌄𐌅𐌆', 4, 11, 6);
-		t('𐌀𐌁𐌂𐌃𐌄𐌅𐌆', 4, 12, 7);
-		t('𐌀𐌁𐌂𐌃𐌄𐌅𐌆', 4, 13, 7);
-		t('𐌀𐌁𐌂𐌃𐌄𐌅𐌆', 4, 14, 8);
-		t('𐌀𐌁𐌂𐌃𐌄𐌅𐌆', 4, 15, 8);
+			assert.strictEqual(fn(0, 2), 0);
+			assert.strictEqual(fn(1, 2), 0);
+			assert.strictEqual(fn(2, 2), 0);
+			assert.strictEqual(fn(3, 2), 2);
+			assert.strictEqual(fn(4, 2), 2);
+			assert.strictEqual(fn(5, 2), 4);
+			assert.strictEqual(fn(6, 2), 4);
+			assert.strictEqual(fn(7, 2), 6);
+			assert.strictEqual(fn(8, 2), 6);
+			assert.strictEqual(fn(9, 2), 8);
 
-		t('🎈🎈🎈🎈', 4, 1, 1);
-		t('🎈🎈🎈🎈', 4, 2, 2);
-		t('🎈🎈🎈🎈', 4, 3, 2);
-		t('🎈🎈🎈🎈', 4, 4, 3);
-		t('🎈🎈🎈🎈', 4, 5, 3);
-		t('🎈🎈🎈🎈', 4, 6, 4);
-		t('🎈🎈🎈🎈', 4, 7, 4);
-		t('🎈🎈🎈🎈', 4, 8, 5);
-		t('🎈🎈🎈🎈', 4, 9, 5);
+			assert.strictEqual(fn(0, 1), 0);
+			assert.strictEqual(fn(1, 1), 0);
+			assert.strictEqual(fn(2, 1), 1);
+			assert.strictEqual(fn(3, 1), 2);
+			assert.strictEqual(fn(4, 1), 3);
+			assert.strictEqual(fn(5, 1), 4);
+			assert.strictEqual(fn(6, 1), 5);
+			assert.strictEqual(fn(7, 1), 6);
+			assert.strictEqual(fn(8, 1), 7);
+			assert.strictEqual(fn(9, 1), 8);
+		});
+	}
 
-		t('何何何何', 4, 1, 1);
-		t('何何何何', 4, 2, 2);
-		t('何何何何', 4, 3, 3);
-		t('何何何何', 4, 4, 4);
-	});
 });
diff --git a/src/vs/editor/test/common/core/lineRange.test.ts b/src/vs/editor/test/common/core/lineRange.test.ts
index 1b45b3f2829..30832250039 100644
--- a/src/vs/editor/test/common/core/lineRange.test.ts
+++ b/src/vs/editor/test/common/core/lineRange.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { LineRange, LineRangeSet } from 'vs/editor/common/core/lineRange';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { LineRange, LineRangeSet } from '../../../common/core/lineRange.js';
 
 suite('LineRange', () => {
 
diff --git a/src/vs/editor/test/common/core/lineTokens.test.ts b/src/vs/editor/test/common/core/lineTokens.test.ts
index d2457fa2bc8..cb53c9d2be1 100644
--- a/src/vs/editor/test/common/core/lineTokens.test.ts
+++ b/src/vs/editor/test/common/core/lineTokens.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { MetadataConsts } from 'vs/editor/common/encodedTokenAttributes';
-import { LanguageIdCodec } from 'vs/editor/common/services/languagesRegistry';
-import { IViewLineTokens, LineTokens } from 'vs/editor/common/tokens/lineTokens';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { MetadataConsts } from '../../../common/encodedTokenAttributes.js';
+import { LanguageIdCodec } from '../../../common/services/languagesRegistry.js';
+import { IViewLineTokens, LineTokens } from '../../../common/tokens/lineTokens.js';
 
 suite('LineTokens', () => {
 
diff --git a/src/vs/editor/test/common/core/positionOffsetTransformer.test.ts b/src/vs/editor/test/common/core/positionOffsetTransformer.test.ts
index 1811a08e90f..e44b41bd6d6 100644
--- a/src/vs/editor/test/common/core/positionOffsetTransformer.test.ts
+++ b/src/vs/editor/test/common/core/positionOffsetTransformer.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { OffsetRange } from 'vs/editor/common/core/offsetRange';
-import { PositionOffsetTransformer } from 'vs/editor/common/core/positionToOffset';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { OffsetRange } from '../../../common/core/offsetRange.js';
+import { PositionOffsetTransformer } from '../../../common/core/positionToOffset.js';
 
 suite('PositionOffsetTransformer', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/editor/test/common/core/random.ts b/src/vs/editor/test/common/core/random.ts
index d48f4173f82..cbf9a5feca6 100644
--- a/src/vs/editor/test/common/core/random.ts
+++ b/src/vs/editor/test/common/core/random.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { numberComparator } from 'vs/base/common/arrays';
-import { OffsetRange } from 'vs/editor/common/core/offsetRange';
-import { Position } from 'vs/editor/common/core/position';
-import { PositionOffsetTransformer } from 'vs/editor/common/core/positionToOffset';
-import { Range } from 'vs/editor/common/core/range';
-import { AbstractText, SingleTextEdit, TextEdit } from 'vs/editor/common/core/textEdit';
+import { numberComparator } from '../../../../base/common/arrays.js';
+import { OffsetRange } from '../../../common/core/offsetRange.js';
+import { Position } from '../../../common/core/position.js';
+import { PositionOffsetTransformer } from '../../../common/core/positionToOffset.js';
+import { Range } from '../../../common/core/range.js';
+import { AbstractText, SingleTextEdit, TextEdit } from '../../../common/core/textEdit.js';
 
 export abstract class Random {
 	public static basicAlphabet: string = '      abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
diff --git a/src/vs/editor/test/common/core/range.test.ts b/src/vs/editor/test/common/core/range.test.ts
index fcbb0cd0fcc..5916ebe3370 100644
--- a/src/vs/editor/test/common/core/range.test.ts
+++ b/src/vs/editor/test/common/core/range.test.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
 
 suite('Editor Core - Range', () => {
 
diff --git a/src/vs/editor/test/common/core/stringBuilder.test.ts b/src/vs/editor/test/common/core/stringBuilder.test.ts
index 6afe99db33a..add3121186a 100644
--- a/src/vs/editor/test/common/core/stringBuilder.test.ts
+++ b/src/vs/editor/test/common/core/stringBuilder.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { writeUInt16LE } from 'vs/base/common/buffer';
-import { CharCode } from 'vs/base/common/charCode';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { decodeUTF16LE, StringBuilder } from 'vs/editor/common/core/stringBuilder';
+import { writeUInt16LE } from '../../../../base/common/buffer.js';
+import { CharCode } from '../../../../base/common/charCode.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { decodeUTF16LE, StringBuilder } from '../../../common/core/stringBuilder.js';
 
 suite('decodeUTF16LE', () => {
 
diff --git a/src/vs/editor/test/common/core/testLineToken.ts b/src/vs/editor/test/common/core/testLineToken.ts
index f3c49807941..1d4d832d5c7 100644
--- a/src/vs/editor/test/common/core/testLineToken.ts
+++ b/src/vs/editor/test/common/core/testLineToken.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IViewLineTokens } from 'vs/editor/common/tokens/lineTokens';
-import { ColorId, TokenMetadata, ITokenPresentation, StandardTokenType } from 'vs/editor/common/encodedTokenAttributes';
-import { ILanguageIdCodec } from 'vs/editor/common/languages';
+import { IViewLineTokens } from '../../../common/tokens/lineTokens.js';
+import { ColorId, TokenMetadata, ITokenPresentation, StandardTokenType } from '../../../common/encodedTokenAttributes.js';
+import { ILanguageIdCodec } from '../../../common/languages.js';
 
 /**
  * A token on a line.
diff --git a/src/vs/editor/test/common/core/textEdit.test.ts b/src/vs/editor/test/common/core/textEdit.test.ts
index 4458eaf8a5b..c048f0fbd97 100644
--- a/src/vs/editor/test/common/core/textEdit.test.ts
+++ b/src/vs/editor/test/common/core/textEdit.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { OffsetRange } from 'vs/editor/common/core/offsetRange';
-import { StringText } from 'vs/editor/common/core/textEdit';
-import { Random } from 'vs/editor/test/common/core/random';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { OffsetRange } from '../../../common/core/offsetRange.js';
+import { StringText } from '../../../common/core/textEdit.js';
+import { Random } from './random.js';
 
 suite('TextEdit', () => {
 	suite('inverse', () => {
diff --git a/src/vs/editor/test/common/diff/diffComputer.test.ts b/src/vs/editor/test/common/diff/diffComputer.test.ts
index 651dc5a79f2..d751ff5f43d 100644
--- a/src/vs/editor/test/common/diff/diffComputer.test.ts
+++ b/src/vs/editor/test/common/diff/diffComputer.test.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { Constants } from 'vs/base/common/uint';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Range } from 'vs/editor/common/core/range';
-import { DiffComputer, ICharChange, ILineChange } from 'vs/editor/common/diff/legacyLinesDiffComputer';
-import { IIdentifiedSingleEditOperation, ITextModel } from 'vs/editor/common/model';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
+import { Constants } from '../../../../base/common/uint.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { Range } from '../../../common/core/range.js';
+import { DiffComputer, ICharChange, ILineChange } from '../../../common/diff/legacyLinesDiffComputer.js';
+import { IIdentifiedSingleEditOperation, ITextModel } from '../../../common/model.js';
+import { createTextModel } from '../testTextModel.js';
 
 function assertDiff(originalLines: string[], modifiedLines: string[], expectedChanges: ILineChange[], shouldComputeCharChanges: boolean = true, shouldPostProcessCharChanges: boolean = false, shouldIgnoreTrimWhitespace: boolean = false) {
 	const diffComputer = new DiffComputer(originalLines, modifiedLines, {
diff --git a/src/vs/editor/test/common/model/bracketPairColorizer/beforeEditPositionMapper.test.ts b/src/vs/editor/test/common/model/bracketPairColorizer/beforeEditPositionMapper.test.ts
index 514556238b5..47d8cd1f2d5 100644
--- a/src/vs/editor/test/common/model/bracketPairColorizer/beforeEditPositionMapper.test.ts
+++ b/src/vs/editor/test/common/model/bracketPairColorizer/beforeEditPositionMapper.test.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { splitLines } from 'vs/base/common/strings';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Position } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { BeforeEditPositionMapper, TextEditInfo } from 'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/beforeEditPositionMapper';
-import { Length, lengthOfString, lengthToObj, lengthToPosition, toLength } from 'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/length';
+import { splitLines } from '../../../../../base/common/strings.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Position } from '../../../../common/core/position.js';
+import { IRange, Range } from '../../../../common/core/range.js';
+import { BeforeEditPositionMapper, TextEditInfo } from '../../../../common/model/bracketPairsTextModelPart/bracketPairsTree/beforeEditPositionMapper.js';
+import { Length, lengthOfString, lengthToObj, lengthToPosition, toLength } from '../../../../common/model/bracketPairsTextModelPart/bracketPairsTree/length.js';
 
 suite('Bracket Pair Colorizer - BeforeEditPositionMapper', () => {
 
diff --git a/src/vs/editor/test/common/model/bracketPairColorizer/brackets.test.ts b/src/vs/editor/test/common/model/bracketPairColorizer/brackets.test.ts
index 1c2ea8c3b49..d98e324eca8 100644
--- a/src/vs/editor/test/common/model/bracketPairColorizer/brackets.test.ts
+++ b/src/vs/editor/test/common/model/bracketPairColorizer/brackets.test.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { LanguageAgnosticBracketTokens } from 'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/brackets';
-import { SmallImmutableSet, DenseKeyProvider } from 'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/smallImmutableSet';
-import { Token, TokenKind } from 'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/tokenizer';
-import { TestLanguageConfigurationService } from 'vs/editor/test/common/modes/testLanguageConfigurationService';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { LanguageAgnosticBracketTokens } from '../../../../common/model/bracketPairsTextModelPart/bracketPairsTree/brackets.js';
+import { SmallImmutableSet, DenseKeyProvider } from '../../../../common/model/bracketPairsTextModelPart/bracketPairsTree/smallImmutableSet.js';
+import { Token, TokenKind } from '../../../../common/model/bracketPairsTextModelPart/bracketPairsTree/tokenizer.js';
+import { TestLanguageConfigurationService } from '../../modes/testLanguageConfigurationService.js';
 
 suite('Bracket Pair Colorizer - Brackets', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/editor/test/common/model/bracketPairColorizer/combineTextEditInfos.test.ts b/src/vs/editor/test/common/model/bracketPairColorizer/combineTextEditInfos.test.ts
index a1def431d2b..2d60eb41508 100644
--- a/src/vs/editor/test/common/model/bracketPairColorizer/combineTextEditInfos.test.ts
+++ b/src/vs/editor/test/common/model/bracketPairColorizer/combineTextEditInfos.test.ts
@@ -4,15 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Range } from 'vs/editor/common/core/range';
-import { SingleTextEdit } from 'vs/editor/common/core/textEdit';
-import { TextEditInfo } from 'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/beforeEditPositionMapper';
-import { combineTextEditInfos } from 'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/combineTextEditInfos';
-import { lengthAdd, lengthToObj, lengthToPosition, positionToLength, toLength } from 'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/length';
-import { TextModel } from 'vs/editor/common/model/textModel';
-import { Random } from 'vs/editor/test/common/core/random';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Range } from '../../../../common/core/range.js';
+import { SingleTextEdit } from '../../../../common/core/textEdit.js';
+import { TextEditInfo } from '../../../../common/model/bracketPairsTextModelPart/bracketPairsTree/beforeEditPositionMapper.js';
+import { combineTextEditInfos } from '../../../../common/model/bracketPairsTextModelPart/bracketPairsTree/combineTextEditInfos.js';
+import { lengthAdd, lengthToObj, lengthToPosition, positionToLength, toLength } from '../../../../common/model/bracketPairsTextModelPart/bracketPairsTree/length.js';
+import { TextModel } from '../../../../common/model/textModel.js';
+import { Random } from '../../core/random.js';
+import { createTextModel } from '../../testTextModel.js';
 
 suite('combineTextEditInfos', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/editor/test/common/model/bracketPairColorizer/concat23Trees.test.ts b/src/vs/editor/test/common/model/bracketPairColorizer/concat23Trees.test.ts
index 6fced6cef3e..fbf5a1ba33e 100644
--- a/src/vs/editor/test/common/model/bracketPairColorizer/concat23Trees.test.ts
+++ b/src/vs/editor/test/common/model/bracketPairColorizer/concat23Trees.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { AstNode, AstNodeKind, ListAstNode, TextAstNode } from 'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/ast';
-import { concat23Trees } from 'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/concat23Trees';
-import { toLength } from 'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/length';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { AstNode, AstNodeKind, ListAstNode, TextAstNode } from '../../../../common/model/bracketPairsTextModelPart/bracketPairsTree/ast.js';
+import { concat23Trees } from '../../../../common/model/bracketPairsTextModelPart/bracketPairsTree/concat23Trees.js';
+import { toLength } from '../../../../common/model/bracketPairsTextModelPart/bracketPairsTree/length.js';
 
 suite('Bracket Pair Colorizer - mergeItems', () => {
 
diff --git a/src/vs/editor/test/common/model/bracketPairColorizer/getBracketPairsInRange.test.ts b/src/vs/editor/test/common/model/bracketPairColorizer/getBracketPairsInRange.test.ts
index 87215503dc4..c3293730e82 100644
--- a/src/vs/editor/test/common/model/bracketPairColorizer/getBracketPairsInRange.test.ts
+++ b/src/vs/editor/test/common/model/bracketPairColorizer/getBracketPairsInRange.test.ts
@@ -4,18 +4,18 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DisposableStore, disposeOnReturn } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { StandardTokenType } from 'vs/editor/common/encodedTokenAttributes';
-import { TokenizationRegistry } from 'vs/editor/common/languages';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { TextModel } from 'vs/editor/common/model/textModel';
-import { BracketPairInfo } from 'vs/editor/common/textModelBracketPairs';
-import { TokenInfo, TokenizedDocument } from 'vs/editor/test/common/model/bracketPairColorizer/tokenizer.test';
-import { createModelServices, instantiateTextModel } from 'vs/editor/test/common/testTextModel';
+import { DisposableStore, disposeOnReturn } from '../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Position } from '../../../../common/core/position.js';
+import { Range } from '../../../../common/core/range.js';
+import { StandardTokenType } from '../../../../common/encodedTokenAttributes.js';
+import { TokenizationRegistry } from '../../../../common/languages.js';
+import { ILanguageService } from '../../../../common/languages/language.js';
+import { ILanguageConfigurationService } from '../../../../common/languages/languageConfigurationRegistry.js';
+import { TextModel } from '../../../../common/model/textModel.js';
+import { BracketPairInfo } from '../../../../common/textModelBracketPairs.js';
+import { TokenInfo, TokenizedDocument } from './tokenizer.test.js';
+import { createModelServices, instantiateTextModel } from '../../testTextModel.js';
 
 suite('Bracket Pair Colorizer - getBracketPairsInRange', () => {
 
diff --git a/src/vs/editor/test/common/model/bracketPairColorizer/length.test.ts b/src/vs/editor/test/common/model/bracketPairColorizer/length.test.ts
index 57086d81ff8..174f0d85cd0 100644
--- a/src/vs/editor/test/common/model/bracketPairColorizer/length.test.ts
+++ b/src/vs/editor/test/common/model/bracketPairColorizer/length.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Length, lengthAdd, lengthDiffNonNegative, lengthToObj, toLength } from 'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/length';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Length, lengthAdd, lengthDiffNonNegative, lengthToObj, toLength } from '../../../../common/model/bracketPairsTextModelPart/bracketPairsTree/length.js';
 
 suite('Bracket Pair Colorizer - Length', () => {
 
diff --git a/src/vs/editor/test/common/model/bracketPairColorizer/smallImmutableSet.test.ts b/src/vs/editor/test/common/model/bracketPairColorizer/smallImmutableSet.test.ts
index 2b5026e4f0c..3714c31fac6 100644
--- a/src/vs/editor/test/common/model/bracketPairColorizer/smallImmutableSet.test.ts
+++ b/src/vs/editor/test/common/model/bracketPairColorizer/smallImmutableSet.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { DenseKeyProvider, SmallImmutableSet } from 'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/smallImmutableSet';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { DenseKeyProvider, SmallImmutableSet } from '../../../../common/model/bracketPairsTextModelPart/bracketPairsTree/smallImmutableSet.js';
 
 suite('Bracket Pair Colorizer - ImmutableSet', () => {
 
diff --git a/src/vs/editor/test/common/model/bracketPairColorizer/tokenizer.test.ts b/src/vs/editor/test/common/model/bracketPairColorizer/tokenizer.test.ts
index f306d99ccab..3b18e1d835c 100644
--- a/src/vs/editor/test/common/model/bracketPairColorizer/tokenizer.test.ts
+++ b/src/vs/editor/test/common/model/bracketPairColorizer/tokenizer.test.ts
@@ -4,18 +4,18 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { LanguageId, MetadataConsts, StandardTokenType } from 'vs/editor/common/encodedTokenAttributes';
-import { EncodedTokenizationResult, IState, ITokenizationSupport, TokenizationRegistry } from 'vs/editor/common/languages';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { LanguageAgnosticBracketTokens } from 'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/brackets';
-import { Length, lengthAdd, lengthsToRange, lengthZero } from 'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/length';
-import { DenseKeyProvider } from 'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/smallImmutableSet';
-import { TextBufferTokenizer, Token, Tokenizer, TokenKind } from 'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/tokenizer';
-import { TextModel } from 'vs/editor/common/model/textModel';
-import { createModelServices, instantiateTextModel } from 'vs/editor/test/common/testTextModel';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { LanguageId, MetadataConsts, StandardTokenType } from '../../../../common/encodedTokenAttributes.js';
+import { EncodedTokenizationResult, IState, ITokenizationSupport, TokenizationRegistry } from '../../../../common/languages.js';
+import { ILanguageService } from '../../../../common/languages/language.js';
+import { ILanguageConfigurationService } from '../../../../common/languages/languageConfigurationRegistry.js';
+import { LanguageAgnosticBracketTokens } from '../../../../common/model/bracketPairsTextModelPart/bracketPairsTree/brackets.js';
+import { Length, lengthAdd, lengthsToRange, lengthZero } from '../../../../common/model/bracketPairsTextModelPart/bracketPairsTree/length.js';
+import { DenseKeyProvider } from '../../../../common/model/bracketPairsTextModelPart/bracketPairsTree/smallImmutableSet.js';
+import { TextBufferTokenizer, Token, Tokenizer, TokenKind } from '../../../../common/model/bracketPairsTextModelPart/bracketPairsTree/tokenizer.js';
+import { TextModel } from '../../../../common/model/textModel.js';
+import { createModelServices, instantiateTextModel } from '../../testTextModel.js';
 
 suite('Bracket Pair Colorizer - Tokenizer', () => {
 
diff --git a/src/vs/editor/test/common/model/editStack.test.ts b/src/vs/editor/test/common/model/editStack.test.ts
index da409c9d8a3..4572a71a4a7 100644
--- a/src/vs/editor/test/common/model/editStack.test.ts
+++ b/src/vs/editor/test/common/model/editStack.test.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Selection } from 'vs/editor/common/core/selection';
-import { TextChange } from 'vs/editor/common/core/textChange';
-import { EndOfLineSequence } from 'vs/editor/common/model';
-import { SingleModelEditStackData } from 'vs/editor/common/model/editStack';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { Selection } from '../../../common/core/selection.js';
+import { TextChange } from '../../../common/core/textChange.js';
+import { EndOfLineSequence } from '../../../common/model.js';
+import { SingleModelEditStackData } from '../../../common/model/editStack.js';
 
 suite('EditStack', () => {
 
diff --git a/src/vs/editor/test/common/model/editableTextModel.test.ts b/src/vs/editor/test/common/model/editableTextModel.test.ts
index d2af9519432..d2b73c7f536 100644
--- a/src/vs/editor/test/common/model/editableTextModel.test.ts
+++ b/src/vs/editor/test/common/model/editableTextModel.test.ts
@@ -4,15 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { Range } from 'vs/editor/common/core/range';
-import { EndOfLinePreference, EndOfLineSequence } from 'vs/editor/common/model';
-import { MirrorTextModel } from 'vs/editor/common/model/mirrorTextModel';
-import { IModelContentChangedEvent } from 'vs/editor/common/textModelEvents';
-import { assertSyncedModels, testApplyEditsWithSyncedModels } from 'vs/editor/test/common/model/editableTextModelTestUtils';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { ISingleEditOperation } from '../../../common/core/editOperation.js';
+import { Range } from '../../../common/core/range.js';
+import { EndOfLinePreference, EndOfLineSequence } from '../../../common/model.js';
+import { MirrorTextModel } from '../../../common/model/mirrorTextModel.js';
+import { IModelContentChangedEvent } from '../../../common/textModelEvents.js';
+import { assertSyncedModels, testApplyEditsWithSyncedModels } from './editableTextModelTestUtils.js';
+import { createTextModel } from '../testTextModel.js';
 
 suite('EditorModel - EditableTextModel.applyEdits updates mightContainRTL', () => {
 
diff --git a/src/vs/editor/test/common/model/editableTextModelAuto.test.ts b/src/vs/editor/test/common/model/editableTextModelAuto.test.ts
index 31e118bbc82..f8dfb21eb05 100644
--- a/src/vs/editor/test/common/model/editableTextModelAuto.test.ts
+++ b/src/vs/editor/test/common/model/editableTextModelAuto.test.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { testApplyEditsWithSyncedModels } from 'vs/editor/test/common/model/editableTextModelTestUtils';
+import { CharCode } from '../../../../base/common/charCode.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { ISingleEditOperation } from '../../../common/core/editOperation.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { testApplyEditsWithSyncedModels } from './editableTextModelTestUtils.js';
 
 const GENERATE_TESTS = false;
 
diff --git a/src/vs/editor/test/common/model/editableTextModelTestUtils.ts b/src/vs/editor/test/common/model/editableTextModelTestUtils.ts
index 2228a6174a4..2014dc290b0 100644
--- a/src/vs/editor/test/common/model/editableTextModelTestUtils.ts
+++ b/src/vs/editor/test/common/model/editableTextModelTestUtils.ts
@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { Position } from 'vs/editor/common/core/position';
-import { EndOfLinePreference, EndOfLineSequence } from 'vs/editor/common/model';
-import { MirrorTextModel } from 'vs/editor/common/model/mirrorTextModel';
-import { TextModel } from 'vs/editor/common/model/textModel';
-import { IModelContentChangedEvent } from 'vs/editor/common/textModelEvents';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
+import { ISingleEditOperation } from '../../../common/core/editOperation.js';
+import { Position } from '../../../common/core/position.js';
+import { EndOfLinePreference, EndOfLineSequence } from '../../../common/model.js';
+import { MirrorTextModel } from '../../../common/model/mirrorTextModel.js';
+import { TextModel } from '../../../common/model/textModel.js';
+import { IModelContentChangedEvent } from '../../../common/textModelEvents.js';
+import { createTextModel } from '../testTextModel.js';
 
 export function testApplyEditsWithSyncedModels(original: string[], edits: ISingleEditOperation[], expected: string[], inputEditsAreInvalid: boolean = false): void {
 	const originalStr = original.join('\n');
diff --git a/src/vs/editor/test/common/model/intervalTree.test.ts b/src/vs/editor/test/common/model/intervalTree.test.ts
index dd2fd332be5..b6b09e38314 100644
--- a/src/vs/editor/test/common/model/intervalTree.test.ts
+++ b/src/vs/editor/test/common/model/intervalTree.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { TrackedRangeStickiness } from 'vs/editor/common/model';
-import { IntervalNode, IntervalTree, NodeColor, SENTINEL, getNodeColor, intervalCompare, nodeAcceptEdit, setNodeStickiness } from 'vs/editor/common/model/intervalTree';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { TrackedRangeStickiness } from '../../../common/model.js';
+import { IntervalNode, IntervalTree, NodeColor, SENTINEL, getNodeColor, intervalCompare, nodeAcceptEdit, setNodeStickiness } from '../../../common/model/intervalTree.js';
 
 const GENERATE_TESTS = false;
 const TEST_COUNT = GENERATE_TESTS ? 10000 : 0;
diff --git a/src/vs/editor/test/common/model/linesTextBuffer/linesTextBuffer.test.ts b/src/vs/editor/test/common/model/linesTextBuffer/linesTextBuffer.test.ts
index a4604874d65..db95c092633 100644
--- a/src/vs/editor/test/common/model/linesTextBuffer/linesTextBuffer.test.ts
+++ b/src/vs/editor/test/common/model/linesTextBuffer/linesTextBuffer.test.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Range } from 'vs/editor/common/core/range';
-import { DefaultEndOfLine } from 'vs/editor/common/model';
-import { IValidatedEditOperation, PieceTreeTextBuffer } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer';
-import { createTextBufferFactory } from 'vs/editor/common/model/textModel';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Range } from '../../../../common/core/range.js';
+import { DefaultEndOfLine } from '../../../../common/model.js';
+import { IValidatedEditOperation, PieceTreeTextBuffer } from '../../../../common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.js';
+import { createTextBufferFactory } from '../../../../common/model/textModel.js';
 
 suite('PieceTreeTextBuffer._getInverseEdits', () => {
 
diff --git a/src/vs/editor/test/common/model/linesTextBuffer/linesTextBufferBuilder.test.ts b/src/vs/editor/test/common/model/linesTextBuffer/linesTextBufferBuilder.test.ts
index 662ef1fe8fd..a855ea2ca4d 100644
--- a/src/vs/editor/test/common/model/linesTextBuffer/linesTextBufferBuilder.test.ts
+++ b/src/vs/editor/test/common/model/linesTextBuffer/linesTextBufferBuilder.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import * as strings from 'vs/base/common/strings';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { DefaultEndOfLine } from 'vs/editor/common/model';
-import { createTextBufferFactory } from 'vs/editor/common/model/textModel';
+import * as strings from '../../../../../base/common/strings.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { DefaultEndOfLine } from '../../../../common/model.js';
+import { createTextBufferFactory } from '../../../../common/model/textModel.js';
 
 function testTextBufferFactory(text: string, eol: string, mightContainNonBasicASCII: boolean, mightContainRTL: boolean): void {
 	const { disposable, textBuffer } = createTextBufferFactory(text).create(DefaultEndOfLine.LF);
diff --git a/src/vs/editor/test/common/model/model.line.test.ts b/src/vs/editor/test/common/model/model.line.test.ts
index 91279c1d70d..446e7acaf42 100644
--- a/src/vs/editor/test/common/model/model.line.test.ts
+++ b/src/vs/editor/test/common/model/model.line.test.ts
@@ -4,16 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Range } from 'vs/editor/common/core/range';
-import { MetadataConsts } from 'vs/editor/common/encodedTokenAttributes';
-import { EncodedTokenizationResult, IBackgroundTokenizationStore, IBackgroundTokenizer, IState, ITokenizationSupport, TokenizationRegistry, TokenizationResult } from 'vs/editor/common/languages';
-import { ITextModel } from 'vs/editor/common/model';
-import { computeIndentLevel } from 'vs/editor/common/model/utils';
-import { ContiguousMultilineTokensBuilder } from 'vs/editor/common/tokens/contiguousMultilineTokensBuilder';
-import { LineTokens } from 'vs/editor/common/tokens/lineTokens';
-import { TestLineToken, TestLineTokenFactory } from 'vs/editor/test/common/core/testLineToken';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { Range } from '../../../common/core/range.js';
+import { MetadataConsts } from '../../../common/encodedTokenAttributes.js';
+import { EncodedTokenizationResult, IBackgroundTokenizationStore, IBackgroundTokenizer, IState, ITokenizationSupport, TokenizationRegistry, TokenizationResult } from '../../../common/languages.js';
+import { ITextModel } from '../../../common/model.js';
+import { computeIndentLevel } from '../../../common/model/utils.js';
+import { ContiguousMultilineTokensBuilder } from '../../../common/tokens/contiguousMultilineTokensBuilder.js';
+import { LineTokens } from '../../../common/tokens/lineTokens.js';
+import { TestLineToken, TestLineTokenFactory } from '../core/testLineToken.js';
+import { createTextModel } from '../testTextModel.js';
 
 interface ILineEdit {
 	startColumn: number;
diff --git a/src/vs/editor/test/common/model/model.modes.test.ts b/src/vs/editor/test/common/model/model.modes.test.ts
index 66df53d83df..a7ad097c019 100644
--- a/src/vs/editor/test/common/model/model.modes.test.ts
+++ b/src/vs/editor/test/common/model/model.modes.test.ts
@@ -4,15 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { EditOperation } from 'vs/editor/common/core/editOperation';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import * as languages from 'vs/editor/common/languages';
-import { NullState } from 'vs/editor/common/languages/nullTokenize';
-import { TextModel } from 'vs/editor/common/model/textModel';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { EditOperation } from '../../../common/core/editOperation.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import * as languages from '../../../common/languages.js';
+import { NullState } from '../../../common/languages/nullTokenize.js';
+import { TextModel } from '../../../common/model/textModel.js';
+import { createTextModel } from '../testTextModel.js';
 
 // --------- utils
 
diff --git a/src/vs/editor/test/common/model/model.test.ts b/src/vs/editor/test/common/model/model.test.ts
index e699174a650..e18b8438525 100644
--- a/src/vs/editor/test/common/model/model.test.ts
+++ b/src/vs/editor/test/common/model/model.test.ts
@@ -4,19 +4,19 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Disposable, DisposableStore, dispose } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { EditOperation } from 'vs/editor/common/core/editOperation';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { MetadataConsts } from 'vs/editor/common/encodedTokenAttributes';
-import { EncodedTokenizationResult, IState, TokenizationRegistry } from 'vs/editor/common/languages';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { NullState } from 'vs/editor/common/languages/nullTokenize';
-import { TextModel } from 'vs/editor/common/model/textModel';
-import { InternalModelContentChangeEvent, ModelRawContentChangedEvent, ModelRawFlush, ModelRawLineChanged, ModelRawLinesDeleted, ModelRawLinesInserted } from 'vs/editor/common/textModelEvents';
-import { createModelServices, createTextModel, instantiateTextModel } from 'vs/editor/test/common/testTextModel';
+import { Disposable, DisposableStore, dispose } from '../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { EditOperation } from '../../../common/core/editOperation.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { MetadataConsts } from '../../../common/encodedTokenAttributes.js';
+import { EncodedTokenizationResult, IState, TokenizationRegistry } from '../../../common/languages.js';
+import { ILanguageService } from '../../../common/languages/language.js';
+import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import { NullState } from '../../../common/languages/nullTokenize.js';
+import { TextModel } from '../../../common/model/textModel.js';
+import { InternalModelContentChangeEvent, ModelRawContentChangedEvent, ModelRawFlush, ModelRawLineChanged, ModelRawLinesDeleted, ModelRawLinesInserted } from '../../../common/textModelEvents.js';
+import { createModelServices, createTextModel, instantiateTextModel } from '../testTextModel.js';
 
 // --------- utils
 
diff --git a/src/vs/editor/test/common/model/modelDecorations.test.ts b/src/vs/editor/test/common/model/modelDecorations.test.ts
index c00d0ce8f2a..142bbead17a 100644
--- a/src/vs/editor/test/common/model/modelDecorations.test.ts
+++ b/src/vs/editor/test/common/model/modelDecorations.test.ts
@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { EditOperation } from 'vs/editor/common/core/editOperation';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { EndOfLineSequence, IModelDeltaDecoration, TrackedRangeStickiness } from 'vs/editor/common/model';
-import { TextModel } from 'vs/editor/common/model/textModel';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { EditOperation } from '../../../common/core/editOperation.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { EndOfLineSequence, IModelDeltaDecoration, TrackedRangeStickiness } from '../../../common/model.js';
+import { TextModel } from '../../../common/model/textModel.js';
+import { createTextModel } from '../testTextModel.js';
 
 // --------- utils
 
diff --git a/src/vs/editor/test/common/model/modelEditOperation.test.ts b/src/vs/editor/test/common/model/modelEditOperation.test.ts
index 0aeebe90c6f..fba9c92cff0 100644
--- a/src/vs/editor/test/common/model/modelEditOperation.test.ts
+++ b/src/vs/editor/test/common/model/modelEditOperation.test.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { Range } from 'vs/editor/common/core/range';
-import { TextModel } from 'vs/editor/common/model/textModel';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { ISingleEditOperation } from '../../../common/core/editOperation.js';
+import { Range } from '../../../common/core/range.js';
+import { TextModel } from '../../../common/model/textModel.js';
+import { createTextModel } from '../testTextModel.js';
 
 suite('Editor Model - Model Edit Operation', () => {
 	const LINE1 = 'My First Line';
diff --git a/src/vs/editor/test/common/model/modelInjectedText.test.ts b/src/vs/editor/test/common/model/modelInjectedText.test.ts
index f7c023c4f8a..b342e6bfb01 100644
--- a/src/vs/editor/test/common/model/modelInjectedText.test.ts
+++ b/src/vs/editor/test/common/model/modelInjectedText.test.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { EditOperation } from 'vs/editor/common/core/editOperation';
-import { Range } from 'vs/editor/common/core/range';
-import { InternalModelContentChangeEvent, LineInjectedText, ModelRawChange, RawContentChangedType } from 'vs/editor/common/textModelEvents';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { EditOperation } from '../../../common/core/editOperation.js';
+import { Range } from '../../../common/core/range.js';
+import { InternalModelContentChangeEvent, LineInjectedText, ModelRawChange, RawContentChangedType } from '../../../common/textModelEvents.js';
+import { createTextModel } from '../testTextModel.js';
 
 suite('Editor Model - Injected Text Events', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts b/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts
index 67a70b1bbb2..cb60242c20b 100644
--- a/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts
+++ b/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts
@@ -4,17 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { WordCharacterClassifier } from 'vs/editor/common/core/wordCharacterClassifier';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { DefaultEndOfLine, ITextSnapshot, SearchData } from 'vs/editor/common/model';
-import { PieceTreeBase } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase';
-import { PieceTreeTextBuffer } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer';
-import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder';
-import { NodeColor, SENTINEL, TreeNode } from 'vs/editor/common/model/pieceTreeTextBuffer/rbTreeBase';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
-import { splitLines } from 'vs/base/common/strings';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { WordCharacterClassifier } from '../../../../common/core/wordCharacterClassifier.js';
+import { Position } from '../../../../common/core/position.js';
+import { Range } from '../../../../common/core/range.js';
+import { DefaultEndOfLine, ITextSnapshot, SearchData } from '../../../../common/model.js';
+import { PieceTreeBase } from '../../../../common/model/pieceTreeTextBuffer/pieceTreeBase.js';
+import { PieceTreeTextBuffer } from '../../../../common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.js';
+import { PieceTreeTextBufferBuilder } from '../../../../common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder.js';
+import { NodeColor, SENTINEL, TreeNode } from '../../../../common/model/pieceTreeTextBuffer/rbTreeBase.js';
+import { createTextModel } from '../../testTextModel.js';
+import { splitLines } from '../../../../../base/common/strings.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 const alphabet = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\r\n';
 
@@ -1817,6 +1817,22 @@ suite('buffer api', () => {
 		assert.strictEqual(pieceTable.getLineCharCode(2, 3), 'e'.charCodeAt(0), 'e');
 		assert.strictEqual(pieceTable.getLineCharCode(2, 4), '2'.charCodeAt(0), '2');
 	});
+
+	test('getNearestChunk', () => {
+		const pieceTree = createTextBuffer(['012345678']);
+		ds.add(pieceTree);
+		const pt = pieceTree.getPieceTree();
+
+		pt.insert(3, 'ABC');
+		assert.equal(pt.getLineContent(1), '012ABC345678');
+		assert.equal(pt.getNearestChunk(3), 'ABC');
+		assert.equal(pt.getNearestChunk(6), '345678');
+
+		pt.delete(9, 1);
+		assert.equal(pt.getLineContent(1), '012ABC34578');
+		assert.equal(pt.getNearestChunk(6), '345');
+		assert.equal(pt.getNearestChunk(9), '78');
+	});
 });
 
 suite('search offset cache', () => {
diff --git a/src/vs/editor/test/common/model/textChange.test.ts b/src/vs/editor/test/common/model/textChange.test.ts
index a58430b309f..5c0292b4281 100644
--- a/src/vs/editor/test/common/model/textChange.test.ts
+++ b/src/vs/editor/test/common/model/textChange.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { compressConsecutiveTextChanges, TextChange } from 'vs/editor/common/core/textChange';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { compressConsecutiveTextChanges, TextChange } from '../../../common/core/textChange.js';
 
 const GENERATE_TESTS = false;
 
diff --git a/src/vs/editor/test/common/model/textModel.test.ts b/src/vs/editor/test/common/model/textModel.test.ts
index 3270a563386..9165d77afbf 100644
--- a/src/vs/editor/test/common/model/textModel.test.ts
+++ b/src/vs/editor/test/common/model/textModel.test.ts
@@ -4,16 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { UTF8_BOM_CHARACTER } from 'vs/base/common/strings';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { EndOfLinePreference } from 'vs/editor/common/model';
-import { TextModel, createTextBuffer } from 'vs/editor/common/model/textModel';
-import { createModelServices, createTextModel } from 'vs/editor/test/common/testTextModel';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { UTF8_BOM_CHARACTER } from '../../../../base/common/strings.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../../../common/languages/modesRegistry.js';
+import { EndOfLinePreference } from '../../../common/model.js';
+import { TextModel, createTextBuffer } from '../../../common/model/textModel.js';
+import { createModelServices, createTextModel } from '../testTextModel.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 
 function testGuessIndentation(defaultInsertSpaces: boolean, defaultTabSize: number, expectedInsertSpaces: boolean, expectedTabSize: number, text: string[], msg?: string): void {
 	const m = createTextModel(
diff --git a/src/vs/editor/test/common/model/textModelSearch.test.ts b/src/vs/editor/test/common/model/textModelSearch.test.ts
index 0f03a1e0730..dac7171f5a7 100644
--- a/src/vs/editor/test/common/model/textModelSearch.test.ts
+++ b/src/vs/editor/test/common/model/textModelSearch.test.ts
@@ -4,15 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { getMapForWordSeparators } from 'vs/editor/common/core/wordCharacterClassifier';
-import { USUAL_WORD_SEPARATORS } from 'vs/editor/common/core/wordHelper';
-import { EndOfLineSequence, FindMatch, SearchData } from 'vs/editor/common/model';
-import { TextModel } from 'vs/editor/common/model/textModel';
-import { SearchParams, TextModelSearch, isMultilineRegexSource } from 'vs/editor/common/model/textModelSearch';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { getMapForWordSeparators } from '../../../common/core/wordCharacterClassifier.js';
+import { USUAL_WORD_SEPARATORS } from '../../../common/core/wordHelper.js';
+import { EndOfLineSequence, FindMatch, SearchData } from '../../../common/model.js';
+import { TextModel } from '../../../common/model/textModel.js';
+import { SearchParams, TextModelSearch, isMultilineRegexSource } from '../../../common/model/textModelSearch.js';
+import { createTextModel } from '../testTextModel.js';
 
 // --------- Find
 suite('TextModelSearch', () => {
diff --git a/src/vs/editor/test/common/model/textModelTokens.test.ts b/src/vs/editor/test/common/model/textModelTokens.test.ts
index 34171ea9b1d..8850c911cfd 100644
--- a/src/vs/editor/test/common/model/textModelTokens.test.ts
+++ b/src/vs/editor/test/common/model/textModelTokens.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { OffsetRange } from 'vs/editor/common/core/offsetRange';
-import { RangePriorityQueueImpl } from 'vs/editor/common/model/textModelTokens';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { OffsetRange } from '../../../common/core/offsetRange.js';
+import { RangePriorityQueueImpl } from '../../../common/model/textModelTokens.js';
 
 suite('RangePriorityQueueImpl', () => {
 
diff --git a/src/vs/editor/test/common/model/textModelWithTokens.test.ts b/src/vs/editor/test/common/model/textModelWithTokens.test.ts
index 54ef6b8d628..3783e8e2606 100644
--- a/src/vs/editor/test/common/model/textModelWithTokens.test.ts
+++ b/src/vs/editor/test/common/model/textModelWithTokens.test.ts
@@ -4,21 +4,21 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { IFoundBracket } from 'vs/editor/common/textModelBracketPairs';
-import { TextModel } from 'vs/editor/common/model/textModel';
-import { ITokenizationSupport, TokenizationRegistry, EncodedTokenizationResult } from 'vs/editor/common/languages';
-import { StandardTokenType, MetadataConsts } from 'vs/editor/common/encodedTokenAttributes';
-import { CharacterPair } from 'vs/editor/common/languages/languageConfiguration';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { NullState } from 'vs/editor/common/languages/nullTokenize';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { TestLineToken } from 'vs/editor/test/common/core/testLineToken';
-import { createModelServices, createTextModel, instantiateTextModel } from 'vs/editor/test/common/testTextModel';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { IFoundBracket } from '../../../common/textModelBracketPairs.js';
+import { TextModel } from '../../../common/model/textModel.js';
+import { ITokenizationSupport, TokenizationRegistry, EncodedTokenizationResult } from '../../../common/languages.js';
+import { StandardTokenType, MetadataConsts } from '../../../common/encodedTokenAttributes.js';
+import { CharacterPair } from '../../../common/languages/languageConfiguration.js';
+import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import { NullState } from '../../../common/languages/nullTokenize.js';
+import { ILanguageService } from '../../../common/languages/language.js';
+import { TestLineToken } from '../core/testLineToken.js';
+import { createModelServices, createTextModel, instantiateTextModel } from '../testTextModel.js';
+import { TestInstantiationService } from '../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 
 function createTextModelWithBrackets(disposables: DisposableStore, text: string, brackets: CharacterPair[]): TextModel {
 	const languageId = 'bracketMode2';
diff --git a/src/vs/editor/test/common/model/tokensStore.test.ts b/src/vs/editor/test/common/model/tokensStore.test.ts
index f4e9413a422..c40695bd46f 100644
--- a/src/vs/editor/test/common/model/tokensStore.test.ts
+++ b/src/vs/editor/test/common/model/tokensStore.test.ts
@@ -4,19 +4,19 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { ColorId, FontStyle, MetadataConsts, TokenMetadata } from 'vs/editor/common/encodedTokenAttributes';
-import { ILanguageConfigurationService, LanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { TextModel } from 'vs/editor/common/model/textModel';
-import { LanguageIdCodec } from 'vs/editor/common/services/languagesRegistry';
-import { LineTokens } from 'vs/editor/common/tokens/lineTokens';
-import { SparseMultilineTokens } from 'vs/editor/common/tokens/sparseMultilineTokens';
-import { SparseTokensStore } from 'vs/editor/common/tokens/sparseTokensStore';
-import { createModelServices, createTextModel, instantiateTextModel } from 'vs/editor/test/common/testTextModel';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { ISingleEditOperation } from '../../../common/core/editOperation.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { ColorId, FontStyle, MetadataConsts, TokenMetadata } from '../../../common/encodedTokenAttributes.js';
+import { ILanguageConfigurationService, LanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import { TextModel } from '../../../common/model/textModel.js';
+import { LanguageIdCodec } from '../../../common/services/languagesRegistry.js';
+import { LineTokens } from '../../../common/tokens/lineTokens.js';
+import { SparseMultilineTokens } from '../../../common/tokens/sparseMultilineTokens.js';
+import { SparseTokensStore } from '../../../common/tokens/sparseTokensStore.js';
+import { createModelServices, createTextModel, instantiateTextModel } from '../testTextModel.js';
 
 suite('TokensStore', () => {
 
diff --git a/src/vs/editor/test/common/modes/languageConfiguration.test.ts b/src/vs/editor/test/common/modes/languageConfiguration.test.ts
index 28e6340d9f3..f6e4fb34a93 100644
--- a/src/vs/editor/test/common/modes/languageConfiguration.test.ts
+++ b/src/vs/editor/test/common/modes/languageConfiguration.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { StandardTokenType } from 'vs/editor/common/encodedTokenAttributes';
-import { StandardAutoClosingPairConditional } from 'vs/editor/common/languages/languageConfiguration';
-import { TestLanguageConfigurationService } from 'vs/editor/test/common/modes/testLanguageConfigurationService';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { StandardTokenType } from '../../../common/encodedTokenAttributes.js';
+import { StandardAutoClosingPairConditional } from '../../../common/languages/languageConfiguration.js';
+import { TestLanguageConfigurationService } from './testLanguageConfigurationService.js';
 
 suite('StandardAutoClosingPairConditional', () => {
 
diff --git a/src/vs/editor/test/common/modes/languageSelector.test.ts b/src/vs/editor/test/common/modes/languageSelector.test.ts
index 3de1b762b59..31f6c051af4 100644
--- a/src/vs/editor/test/common/modes/languageSelector.test.ts
+++ b/src/vs/editor/test/common/modes/languageSelector.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { LanguageSelector, score } from 'vs/editor/common/languageSelector';
+import { URI } from '../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { LanguageSelector, score } from '../../../common/languageSelector.js';
 
 suite('LanguageSelector', function () {
 
diff --git a/src/vs/editor/test/common/modes/linkComputer.test.ts b/src/vs/editor/test/common/modes/linkComputer.test.ts
index 2d769837672..8a955f9684c 100644
--- a/src/vs/editor/test/common/modes/linkComputer.test.ts
+++ b/src/vs/editor/test/common/modes/linkComputer.test.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ILink } from 'vs/editor/common/languages';
-import { ILinkComputerTarget, computeLinks } from 'vs/editor/common/languages/linkComputer';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { ILink } from '../../../common/languages.js';
+import { ILinkComputerTarget, computeLinks } from '../../../common/languages/linkComputer.js';
 
 class SimpleLinkComputerTarget implements ILinkComputerTarget {
 
diff --git a/src/vs/editor/test/common/modes/supports/autoClosingPairsRules.ts b/src/vs/editor/test/common/modes/supports/autoClosingPairsRules.ts
index 968bd350892..d9e226ee0db 100644
--- a/src/vs/editor/test/common/modes/supports/autoClosingPairsRules.ts
+++ b/src/vs/editor/test/common/modes/supports/autoClosingPairsRules.ts
@@ -3,7 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IAutoClosingPair } from 'vs/editor/common/languages/languageConfiguration';
+import { IAutoClosingPair, IAutoClosingPairConditional } from '../../../../common/languages/languageConfiguration.js';
+
+export const javascriptAutoClosingPairsRules: IAutoClosingPairConditional[] = [
+	{ open: '{', close: '}' },
+	{ open: '[', close: ']' },
+	{ open: '(', close: ')' },
+	{ open: '\'', close: '\'', notIn: ['string', 'comment'] },
+	{ open: '"', close: '"', notIn: ['string'] },
+	{ open: '`', close: '`', notIn: ['string', 'comment'] },
+	{ open: '/**', close: ' */', notIn: ['string'] }
+];
 
 export const latexAutoClosingPairsRules: IAutoClosingPair[] = [
 	{ open: '\\left(', close: '\\right)' },
diff --git a/src/vs/editor/test/common/modes/supports/bracketRules.ts b/src/vs/editor/test/common/modes/supports/bracketRules.ts
index d21b70a6dc3..0ce5793a417 100644
--- a/src/vs/editor/test/common/modes/supports/bracketRules.ts
+++ b/src/vs/editor/test/common/modes/supports/bracketRules.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharacterPair } from 'vs/editor/common/languages/languageConfiguration';
+import { CharacterPair } from '../../../../common/languages/languageConfiguration.js';
 
 const standardBracketRules: CharacterPair[] = [
 	['{', '}'],
diff --git a/src/vs/editor/test/common/modes/supports/characterPair.test.ts b/src/vs/editor/test/common/modes/supports/characterPair.test.ts
index e92b7db2e6e..0e0f4e01922 100644
--- a/src/vs/editor/test/common/modes/supports/characterPair.test.ts
+++ b/src/vs/editor/test/common/modes/supports/characterPair.test.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { StandardTokenType } from 'vs/editor/common/encodedTokenAttributes';
-import { StandardAutoClosingPairConditional } from 'vs/editor/common/languages/languageConfiguration';
-import { CharacterPairSupport } from 'vs/editor/common/languages/supports/characterPair';
-import { TokenText, createFakeScopedLineTokens } from 'vs/editor/test/common/modesTestUtils';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { StandardTokenType } from '../../../../common/encodedTokenAttributes.js';
+import { StandardAutoClosingPairConditional } from '../../../../common/languages/languageConfiguration.js';
+import { CharacterPairSupport } from '../../../../common/languages/supports/characterPair.js';
+import { TokenText, createFakeScopedLineTokens } from '../../modesTestUtils.js';
 
 suite('CharacterPairSupport', () => {
 
diff --git a/src/vs/editor/test/common/modes/supports/electricCharacter.test.ts b/src/vs/editor/test/common/modes/supports/electricCharacter.test.ts
index 20170cb8f48..f6258de670f 100644
--- a/src/vs/editor/test/common/modes/supports/electricCharacter.test.ts
+++ b/src/vs/editor/test/common/modes/supports/electricCharacter.test.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { StandardTokenType } from 'vs/editor/common/encodedTokenAttributes';
-import { BracketElectricCharacterSupport, IElectricAction } from 'vs/editor/common/languages/supports/electricCharacter';
-import { RichEditBrackets } from 'vs/editor/common/languages/supports/richEditBrackets';
-import { TokenText, createFakeScopedLineTokens } from 'vs/editor/test/common/modesTestUtils';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { StandardTokenType } from '../../../../common/encodedTokenAttributes.js';
+import { BracketElectricCharacterSupport, IElectricAction } from '../../../../common/languages/supports/electricCharacter.js';
+import { RichEditBrackets } from '../../../../common/languages/supports/richEditBrackets.js';
+import { TokenText, createFakeScopedLineTokens } from '../../modesTestUtils.js';
 
 const fakeLanguageId = 'test';
 
diff --git a/src/vs/editor/test/common/modes/supports/onEnter.test.ts b/src/vs/editor/test/common/modes/supports/onEnter.test.ts
index 4ed40eb1abb..901ad06fb4e 100644
--- a/src/vs/editor/test/common/modes/supports/onEnter.test.ts
+++ b/src/vs/editor/test/common/modes/supports/onEnter.test.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { CharacterPair, IndentAction } from 'vs/editor/common/languages/languageConfiguration';
-import { OnEnterSupport } from 'vs/editor/common/languages/supports/onEnter';
-import { javascriptOnEnterRules } from 'vs/editor/test/common/modes/supports/onEnterRules';
-import { EditorAutoIndentStrategy } from 'vs/editor/common/config/editorOptions';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { CharacterPair, IndentAction } from '../../../../common/languages/languageConfiguration.js';
+import { OnEnterSupport } from '../../../../common/languages/supports/onEnter.js';
+import { javascriptOnEnterRules } from './onEnterRules.js';
+import { EditorAutoIndentStrategy } from '../../../../common/config/editorOptions.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('OnEnter', () => {
 
diff --git a/src/vs/editor/test/common/modes/supports/onEnterRules.ts b/src/vs/editor/test/common/modes/supports/onEnterRules.ts
index 66e683fdcf8..b3cb35e27d5 100644
--- a/src/vs/editor/test/common/modes/supports/onEnterRules.ts
+++ b/src/vs/editor/test/common/modes/supports/onEnterRules.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IndentAction } from 'vs/editor/common/languages/languageConfiguration';
+import { IndentAction } from '../../../../common/languages/languageConfiguration.js';
 
 export const javascriptOnEnterRules = [
 	{
diff --git a/src/vs/editor/test/common/modes/supports/richEditBrackets.test.ts b/src/vs/editor/test/common/modes/supports/richEditBrackets.test.ts
index 5fd90a71561..27f27e7d54e 100644
--- a/src/vs/editor/test/common/modes/supports/richEditBrackets.test.ts
+++ b/src/vs/editor/test/common/modes/supports/richEditBrackets.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Range } from 'vs/editor/common/core/range';
-import { BracketsUtils } from 'vs/editor/common/languages/supports/richEditBrackets';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Range } from '../../../../common/core/range.js';
+import { BracketsUtils } from '../../../../common/languages/supports/richEditBrackets.js';
 
 suite('richEditBrackets', () => {
 
diff --git a/src/vs/editor/test/common/modes/supports/tokenization.test.ts b/src/vs/editor/test/common/modes/supports/tokenization.test.ts
index b5386ec1b3b..69fe4beaac0 100644
--- a/src/vs/editor/test/common/modes/supports/tokenization.test.ts
+++ b/src/vs/editor/test/common/modes/supports/tokenization.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { FontStyle } from 'vs/editor/common/encodedTokenAttributes';
-import { ColorMap, ExternalThemeTrieElement, ParsedTokenThemeRule, ThemeTrieElementRule, TokenTheme, parseTokenTheme, strcmp } from 'vs/editor/common/languages/supports/tokenization';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { FontStyle } from '../../../../common/encodedTokenAttributes.js';
+import { ColorMap, ExternalThemeTrieElement, ParsedTokenThemeRule, ThemeTrieElementRule, TokenTheme, parseTokenTheme, strcmp } from '../../../../common/languages/supports/tokenization.js';
 
 suite('Token theme matching', () => {
 
diff --git a/src/vs/editor/test/common/modes/testLanguageConfigurationService.ts b/src/vs/editor/test/common/modes/testLanguageConfigurationService.ts
index ece0981cbd7..fb3a5042571 100644
--- a/src/vs/editor/test/common/modes/testLanguageConfigurationService.ts
+++ b/src/vs/editor/test/common/modes/testLanguageConfigurationService.ts
@@ -2,10 +2,10 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { Emitter } from 'vs/base/common/event';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { LanguageConfiguration } from 'vs/editor/common/languages/languageConfiguration';
-import { ILanguageConfigurationService, LanguageConfigurationRegistry, LanguageConfigurationServiceChangeEvent, ResolvedLanguageConfiguration } from 'vs/editor/common/languages/languageConfigurationRegistry';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
+import { LanguageConfiguration } from '../../../common/languages/languageConfiguration.js';
+import { ILanguageConfigurationService, LanguageConfigurationRegistry, LanguageConfigurationServiceChangeEvent, ResolvedLanguageConfiguration } from '../../../common/languages/languageConfigurationRegistry.js';
 
 export class TestLanguageConfigurationService extends Disposable implements ILanguageConfigurationService {
 	_serviceBrand: undefined;
diff --git a/src/vs/editor/test/common/modes/textToHtmlTokenizer.test.ts b/src/vs/editor/test/common/modes/textToHtmlTokenizer.test.ts
index af7015a19b6..31230b13358 100644
--- a/src/vs/editor/test/common/modes/textToHtmlTokenizer.test.ts
+++ b/src/vs/editor/test/common/modes/textToHtmlTokenizer.test.ts
@@ -4,16 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ColorId, FontStyle, MetadataConsts } from 'vs/editor/common/encodedTokenAttributes';
-import { EncodedTokenizationResult, IState, TokenizationRegistry } from 'vs/editor/common/languages';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { _tokenizeToString, tokenizeLineToHTML } from 'vs/editor/common/languages/textToHtmlTokenizer';
-import { LanguageIdCodec } from 'vs/editor/common/services/languagesRegistry';
-import { TestLineToken, TestLineTokens } from 'vs/editor/test/common/core/testLineToken';
-import { createModelServices } from 'vs/editor/test/common/testTextModel';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { ColorId, FontStyle, MetadataConsts } from '../../../common/encodedTokenAttributes.js';
+import { EncodedTokenizationResult, IState, TokenizationRegistry } from '../../../common/languages.js';
+import { ILanguageService } from '../../../common/languages/language.js';
+import { _tokenizeToString, tokenizeLineToHTML } from '../../../common/languages/textToHtmlTokenizer.js';
+import { LanguageIdCodec } from '../../../common/services/languagesRegistry.js';
+import { TestLineToken, TestLineTokens } from '../core/testLineToken.js';
+import { createModelServices } from '../testTextModel.js';
+import { TestInstantiationService } from '../../../../platform/instantiation/test/common/instantiationServiceMock.js';
 
 suite('Editor Modes - textToHtmlTokenizer', () => {
 
diff --git a/src/vs/editor/test/common/modesTestUtils.ts b/src/vs/editor/test/common/modesTestUtils.ts
index b96bea4d814..509eff0ea8a 100644
--- a/src/vs/editor/test/common/modesTestUtils.ts
+++ b/src/vs/editor/test/common/modesTestUtils.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { LineTokens } from 'vs/editor/common/tokens/lineTokens';
-import { StandardTokenType, MetadataConsts } from 'vs/editor/common/encodedTokenAttributes';
-import { ScopedLineTokens, createScopedLineTokens } from 'vs/editor/common/languages/supports';
-import { LanguageIdCodec } from 'vs/editor/common/services/languagesRegistry';
+import { LineTokens } from '../../common/tokens/lineTokens.js';
+import { StandardTokenType, MetadataConsts } from '../../common/encodedTokenAttributes.js';
+import { ScopedLineTokens, createScopedLineTokens } from '../../common/languages/supports.js';
+import { LanguageIdCodec } from '../../common/services/languagesRegistry.js';
 
 export interface TokenText {
 	text: string;
diff --git a/src/vs/editor/test/common/services/editorSimpleWorker.test.ts b/src/vs/editor/test/common/services/editorSimpleWorker.test.ts
index 781ff450211..1cc3d022d55 100644
--- a/src/vs/editor/test/common/services/editorSimpleWorker.test.ts
+++ b/src/vs/editor/test/common/services/editorSimpleWorker.test.ts
@@ -4,18 +4,18 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Position } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { TextEdit } from 'vs/editor/common/languages';
-import { EditorSimpleWorker, ICommonModel } from 'vs/editor/common/services/editorSimpleWorker';
-import { IEditorWorkerHost } from 'vs/editor/common/services/editorWorkerHost';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { Position } from '../../../common/core/position.js';
+import { IRange, Range } from '../../../common/core/range.js';
+import { TextEdit } from '../../../common/languages.js';
+import { BaseEditorSimpleWorker } from '../../../common/services/editorSimpleWorker.js';
+import { ICommonModel } from '../../../common/services/textModelSync/textModelSync.impl.js';
 
 suite('EditorSimpleWorker', () => {
 
 	ensureNoDisposablesAreLeakedInTestSuite();
 
-	class WorkerWithModels extends EditorSimpleWorker {
+	class WorkerWithModels extends BaseEditorSimpleWorker {
 
 		getModel(uri: string) {
 			return this._getModel(uri);
@@ -23,13 +23,13 @@ suite('EditorSimpleWorker', () => {
 
 		addModel(lines: string[], eol: string = '\n') {
 			const uri = 'test:file#' + Date.now();
-			this.acceptNewModel({
+			this.$acceptNewModel({
 				url: uri,
 				versionId: 1,
 				lines: lines,
 				EOL: eol
 			});
-			return this._getModel(uri);
+			return this._getModel(uri)!;
 		}
 	}
 
@@ -37,7 +37,7 @@ suite('EditorSimpleWorker', () => {
 	let model: ICommonModel;
 
 	setup(() => {
-		worker = new WorkerWithModels(<IEditorWorkerHost>null!, null);
+		worker = new WorkerWithModels();
 		model = worker.addModel([
 			'This is line one', //16
 			'and this is line number two', //27
@@ -93,7 +93,7 @@ suite('EditorSimpleWorker', () => {
 
 	test('MoreMinimal', () => {
 
-		return worker.computeMoreMinimalEdits(model.uri.toString(), [{ text: 'This is line One', range: new Range(1, 1, 1, 17) }], false).then(edits => {
+		return worker.$computeMoreMinimalEdits(model.uri.toString(), [{ text: 'This is line One', range: new Range(1, 1, 1, 17) }], false).then(edits => {
 			assert.strictEqual(edits.length, 1);
 			const [first] = edits;
 			assert.strictEqual(first.text, 'O');
@@ -112,7 +112,7 @@ suite('EditorSimpleWorker', () => {
 		], '\n');
 
 
-		const newEdits = await worker.computeMoreMinimalEdits(model.uri.toString(), [
+		const newEdits = await worker.$computeMoreMinimalEdits(model.uri.toString(), [
 			{
 				range: new Range(1, 1, 2, 1),
 				text: 'one\ntwo\nthree\n',
@@ -144,7 +144,7 @@ suite('EditorSimpleWorker', () => {
 			'}'
 		], '\n');
 
-		return worker.computeMoreMinimalEdits(model.uri.toString(), [{ text: '{\r\n\t"a":1\r\n}', range: new Range(1, 1, 3, 2) }], false).then(edits => {
+		return worker.$computeMoreMinimalEdits(model.uri.toString(), [{ text: '{\r\n\t"a":1\r\n}', range: new Range(1, 1, 3, 2) }], false).then(edits => {
 			assert.strictEqual(edits.length, 0);
 		});
 	});
@@ -157,7 +157,7 @@ suite('EditorSimpleWorker', () => {
 			'}'
 		], '\n');
 
-		return worker.computeMoreMinimalEdits(model.uri.toString(), [{ text: '{\r\n\t"b":1\r\n}', range: new Range(1, 1, 3, 2) }], false).then(edits => {
+		return worker.$computeMoreMinimalEdits(model.uri.toString(), [{ text: '{\r\n\t"b":1\r\n}', range: new Range(1, 1, 3, 2) }], false).then(edits => {
 			assert.strictEqual(edits.length, 1);
 			const [first] = edits;
 			assert.strictEqual(first.text, 'b');
@@ -173,7 +173,7 @@ suite('EditorSimpleWorker', () => {
 			'}'				// 3
 		]);
 
-		return worker.computeMoreMinimalEdits(model.uri.toString(), [{ text: '\n', range: new Range(3, 2, 4, 1000) }], false).then(edits => {
+		return worker.$computeMoreMinimalEdits(model.uri.toString(), [{ text: '\n', range: new Range(3, 2, 4, 1000) }], false).then(edits => {
 			assert.strictEqual(edits.length, 1);
 			const [first] = edits;
 			assert.strictEqual(first.text, '\n');
@@ -184,7 +184,7 @@ suite('EditorSimpleWorker', () => {
 	async function testEdits(lines: string[], edits: TextEdit[]): Promise<unknown> {
 		const model = worker.addModel(lines);
 
-		const smallerEdits = await worker.computeHumanReadableDiff(
+		const smallerEdits = await worker.$computeHumanReadableDiff(
 			model.uri.toString(),
 			edits,
 			{ ignoreTrimWhitespace: false, maxComputationTimeMs: 0, computeMoves: false }
@@ -286,7 +286,7 @@ suite('EditorSimpleWorker', () => {
 			'f f'	// 2
 		]);
 
-		return worker.textualSuggest([model.uri.toString()], 'f', '[a-z]+', 'img').then((result) => {
+		return worker.$textualSuggest([model.uri.toString()], 'f', '[a-z]+', 'img').then((result) => {
 			if (!result) {
 				assert.ok(false);
 			}
diff --git a/src/vs/editor/test/common/services/languageService.test.ts b/src/vs/editor/test/common/services/languageService.test.ts
index e8317e6ae88..ba3c588fa01 100644
--- a/src/vs/editor/test/common/services/languageService.test.ts
+++ b/src/vs/editor/test/common/services/languageService.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { LanguageService } from 'vs/editor/common/services/languageService';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../../../common/languages/modesRegistry.js';
+import { LanguageService } from '../../../common/services/languageService.js';
 
 suite('LanguageService', () => {
 
diff --git a/src/vs/editor/test/common/services/languagesAssociations.test.ts b/src/vs/editor/test/common/services/languagesAssociations.test.ts
index 7d6ce3ba4dc..891260d0fb5 100644
--- a/src/vs/editor/test/common/services/languagesAssociations.test.ts
+++ b/src/vs/editor/test/common/services/languagesAssociations.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { getMimeTypes, registerPlatformLanguageAssociation, registerConfiguredLanguageAssociation } from 'vs/editor/common/services/languagesAssociations';
+import { URI } from '../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { getMimeTypes, registerPlatformLanguageAssociation, registerConfiguredLanguageAssociation } from '../../../common/services/languagesAssociations.js';
 
 suite('LanguagesAssociations', () => {
 
diff --git a/src/vs/editor/test/common/services/languagesRegistry.test.ts b/src/vs/editor/test/common/services/languagesRegistry.test.ts
index d4715b8534c..9789d1380aa 100644
--- a/src/vs/editor/test/common/services/languagesRegistry.test.ts
+++ b/src/vs/editor/test/common/services/languagesRegistry.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { LanguagesRegistry } from 'vs/editor/common/services/languagesRegistry';
+import { URI } from '../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { LanguagesRegistry } from '../../../common/services/languagesRegistry.js';
 
 suite('LanguagesRegistry', () => {
 
diff --git a/src/vs/editor/test/common/services/modelService.test.ts b/src/vs/editor/test/common/services/modelService.test.ts
index cd4b53d86df..ccc2fabc213 100644
--- a/src/vs/editor/test/common/services/modelService.test.ts
+++ b/src/vs/editor/test/common/services/modelService.test.ts
@@ -4,23 +4,23 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { CharCode } from 'vs/base/common/charCode';
-import * as platform from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { EditOperation } from 'vs/editor/common/core/editOperation';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { StringBuilder } from 'vs/editor/common/core/stringBuilder';
-import { DefaultEndOfLine, ITextBuffer, ITextBufferFactory, ITextSnapshot } from 'vs/editor/common/model';
-import { createTextBuffer } from 'vs/editor/common/model/textModel';
-import { ModelService } from 'vs/editor/common/services/modelService';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { createModelServices, createTextModel } from 'vs/editor/test/common/testTextModel';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { IModelService } from 'vs/editor/common/services/model';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { CharCode } from '../../../../base/common/charCode.js';
+import * as platform from '../../../../base/common/platform.js';
+import { URI } from '../../../../base/common/uri.js';
+import { EditOperation } from '../../../common/core/editOperation.js';
+import { Range } from '../../../common/core/range.js';
+import { Selection } from '../../../common/core/selection.js';
+import { StringBuilder } from '../../../common/core/stringBuilder.js';
+import { DefaultEndOfLine, ITextBuffer, ITextBufferFactory, ITextSnapshot } from '../../../common/model.js';
+import { createTextBuffer } from '../../../common/model/textModel.js';
+import { ModelService } from '../../../common/services/modelService.js';
+import { TestConfigurationService } from '../../../../platform/configuration/test/common/testConfigurationService.js';
+import { createModelServices, createTextModel } from '../testTextModel.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { IModelService } from '../../../common/services/model.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { TestInstantiationService } from '../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 
 const GENERATE_TESTS = false;
 
diff --git a/src/vs/editor/test/common/services/semanticTokensDto.test.ts b/src/vs/editor/test/common/services/semanticTokensDto.test.ts
index 7093691179d..05980e011a0 100644
--- a/src/vs/editor/test/common/services/semanticTokensDto.test.ts
+++ b/src/vs/editor/test/common/services/semanticTokensDto.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { IFullSemanticTokensDto, IDeltaSemanticTokensDto, encodeSemanticTokensDto, ISemanticTokensDto, decodeSemanticTokensDto } from 'vs/editor/common/services/semanticTokensDto';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { IFullSemanticTokensDto, IDeltaSemanticTokensDto, encodeSemanticTokensDto, ISemanticTokensDto, decodeSemanticTokensDto } from '../../../common/services/semanticTokensDto.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 
 suite('SemanticTokensDto', () => {
 
diff --git a/src/vs/editor/test/common/services/semanticTokensProviderStyling.test.ts b/src/vs/editor/test/common/services/semanticTokensProviderStyling.test.ts
index 1128768e919..98894403654 100644
--- a/src/vs/editor/test/common/services/semanticTokensProviderStyling.test.ts
+++ b/src/vs/editor/test/common/services/semanticTokensProviderStyling.test.ts
@@ -4,15 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { SparseMultilineTokens } from 'vs/editor/common/tokens/sparseMultilineTokens';
-import { MetadataConsts } from 'vs/editor/common/encodedTokenAttributes';
-import { SemanticTokensProviderStyling, toMultilineTokens2 } from 'vs/editor/common/services/semanticTokensProviderStyling';
-import { createModelServices } from 'vs/editor/test/common/testTextModel';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { IColorTheme, IThemeService, ITokenStyle } from 'vs/platform/theme/common/themeService';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { SparseMultilineTokens } from '../../../common/tokens/sparseMultilineTokens.js';
+import { MetadataConsts } from '../../../common/encodedTokenAttributes.js';
+import { SemanticTokensProviderStyling, toMultilineTokens2 } from '../../../common/services/semanticTokensProviderStyling.js';
+import { createModelServices } from '../testTextModel.js';
+import { TestInstantiationService } from '../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { IColorTheme, IThemeService, ITokenStyle } from '../../../../platform/theme/common/themeService.js';
+import { ILanguageService } from '../../../common/languages/language.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 
 suite('ModelService', () => {
 	let disposables: DisposableStore;
diff --git a/src/vs/editor/test/common/services/testEditorWorkerService.ts b/src/vs/editor/test/common/services/testEditorWorkerService.ts
index e7d5154f9f6..44a9d5fffc3 100644
--- a/src/vs/editor/test/common/services/testEditorWorkerService.ts
+++ b/src/vs/editor/test/common/services/testEditorWorkerService.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { IRange } from 'vs/editor/common/core/range';
-import { DiffAlgorithmName, IEditorWorkerService, IUnicodeHighlightsResult } from 'vs/editor/common/services/editorWorker';
-import { TextEdit, IInplaceReplaceSupportResult } from 'vs/editor/common/languages';
-import { IDocumentDiff, IDocumentDiffProviderOptions } from 'vs/editor/common/diff/documentDiffProvider';
-import { IChange } from 'vs/editor/common/diff/legacyLinesDiffComputer';
-import { SectionHeader } from 'vs/editor/common/services/findSectionHeaders';
+import { URI } from '../../../../base/common/uri.js';
+import { IRange } from '../../../common/core/range.js';
+import { DiffAlgorithmName, IEditorWorkerService, IUnicodeHighlightsResult } from '../../../common/services/editorWorker.js';
+import { TextEdit, IInplaceReplaceSupportResult, IColorInformation } from '../../../common/languages.js';
+import { IDocumentDiff, IDocumentDiffProviderOptions } from '../../../common/diff/documentDiffProvider.js';
+import { IChange } from '../../../common/diff/legacyLinesDiffComputer.js';
+import { SectionHeader } from '../../../common/services/findSectionHeaders.js';
 
 export class TestEditorWorkerService implements IEditorWorkerService {
 
@@ -27,4 +27,5 @@ export class TestEditorWorkerService implements IEditorWorkerService {
 	canNavigateValueSet(resource: URI): boolean { return false; }
 	async navigateValueSet(resource: URI, range: IRange, up: boolean): Promise<IInplaceReplaceSupportResult | null> { return null; }
 	async findSectionHeaders(uri: URI): Promise<SectionHeader[]> { return []; }
+	async computeDefaultDocumentColors(uri: URI): Promise<IColorInformation[] | null> { return null; }
 }
diff --git a/src/vs/editor/test/common/services/testTextResourcePropertiesService.ts b/src/vs/editor/test/common/services/testTextResourcePropertiesService.ts
index c7079676e20..77a92fa0ee3 100644
--- a/src/vs/editor/test/common/services/testTextResourcePropertiesService.ts
+++ b/src/vs/editor/test/common/services/testTextResourcePropertiesService.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as platform from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfiguration';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import * as platform from '../../../../base/common/platform.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ITextResourcePropertiesService } from '../../../common/services/textResourceConfiguration.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 
 export class TestTextResourcePropertiesService implements ITextResourcePropertiesService {
 
diff --git a/src/vs/editor/test/common/services/testTreeSitterService.ts b/src/vs/editor/test/common/services/testTreeSitterService.ts
new file mode 100644
index 00000000000..2d5721bb32f
--- /dev/null
+++ b/src/vs/editor/test/common/services/testTreeSitterService.ts
@@ -0,0 +1,29 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import type { Parser } from '@vscode/tree-sitter-wasm';
+import { Event } from '../../../../base/common/event.js';
+import { ITextModel } from '../../../common/model.js';
+import { ITreeSitterParserService, ITreeSitterParseResult } from '../../../common/services/treeSitterParserService.js';
+import { Range } from '../../../common/core/range.js';
+
+export class TestTreeSitterParserService implements ITreeSitterParserService {
+	getTree(content: string, languageId: string): Promise<Parser.Tree | undefined> {
+		throw new Error('Method not implemented.');
+	}
+	onDidUpdateTree: Event<{ textModel: ITextModel; ranges: Range[] }> = Event.None;
+	onDidAddLanguage: Event<{ id: string; language: Parser.Language }> = Event.None;
+	_serviceBrand: undefined;
+	getOrInitLanguage(languageId: string): Parser.Language | undefined {
+		throw new Error('Method not implemented.');
+	}
+	waitForLanguage(languageId: string): Promise<Parser.Language | undefined> {
+		throw new Error('Method not implemented.');
+	}
+	getParseResult(textModel: ITextModel): ITreeSitterParseResult | undefined {
+		throw new Error('Method not implemented.');
+	}
+
+}
diff --git a/src/vs/editor/test/common/services/textResourceConfigurationService.test.ts b/src/vs/editor/test/common/services/textResourceConfigurationService.test.ts
index c7fbd1afff2..f3299fdba92 100644
--- a/src/vs/editor/test/common/services/textResourceConfigurationService.test.ts
+++ b/src/vs/editor/test/common/services/textResourceConfigurationService.test.ts
@@ -4,14 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IConfigurationValue, IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
-import { TextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfigurationService';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { TestConfigurationService } from '../../../../platform/configuration/test/common/testConfigurationService.js';
+import { TestInstantiationService } from '../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { IModelService } from '../../../common/services/model.js';
+import { ILanguageService } from '../../../common/languages/language.js';
+import { IConfigurationValue, IConfigurationService, ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
+import { TextResourceConfigurationService } from '../../../common/services/textResourceConfigurationService.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 
 
 suite('TextResourceConfigurationService - Update', () => {
diff --git a/src/vs/editor/test/common/services/unicodeTextModelHighlighter.test.ts b/src/vs/editor/test/common/services/unicodeTextModelHighlighter.test.ts
index 9b5351bd618..3b4b550cfad 100644
--- a/src/vs/editor/test/common/services/unicodeTextModelHighlighter.test.ts
+++ b/src/vs/editor/test/common/services/unicodeTextModelHighlighter.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Range } from 'vs/editor/common/core/range';
-import { UnicodeHighlighterOptions, UnicodeTextModelHighlighter } from 'vs/editor/common/services/unicodeTextModelHighlighter';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { Range } from '../../../common/core/range.js';
+import { UnicodeHighlighterOptions, UnicodeTextModelHighlighter } from '../../../common/services/unicodeTextModelHighlighter.js';
+import { createTextModel } from '../testTextModel.js';
 
 suite('UnicodeTextModelHighlighter', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/editor/test/common/testTextModel.ts b/src/vs/editor/test/common/testTextModel.ts
index cdab452aa9c..01732b71158 100644
--- a/src/vs/editor/test/common/testTextModel.ts
+++ b/src/vs/editor/test/common/testTextModel.ts
@@ -3,37 +3,39 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { BracketPairColorizationOptions, DefaultEndOfLine, ITextBufferFactory, ITextModelCreationOptions } from 'vs/editor/common/model';
-import { TextModel } from 'vs/editor/common/model/textModel';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { LanguageService } from 'vs/editor/common/services/languageService';
-import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfiguration';
-import { TestLanguageConfigurationService } from 'vs/editor/test/common/modes/testLanguageConfigurationService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { TestDialogService } from 'vs/platform/dialogs/test/common/testDialogService';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService, NullLogService } from 'vs/platform/log/common/log';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
-import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
-import { UndoRedoService } from 'vs/platform/undoRedo/common/undoRedoService';
-import { TestTextResourcePropertiesService } from 'vs/editor/test/common/services/testTextResourcePropertiesService';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ModelService } from 'vs/editor/common/services/modelService';
-import { createServices, ServiceIdCtorPair, TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { ILanguageFeatureDebounceService, LanguageFeatureDebounceService } from 'vs/editor/common/services/languageFeatureDebounce';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { LanguageFeaturesService } from 'vs/editor/common/services/languageFeaturesService';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { mock } from 'vs/base/test/common/mock';
+import { DisposableStore, IDisposable } from '../../../base/common/lifecycle.js';
+import { URI } from '../../../base/common/uri.js';
+import { BracketPairColorizationOptions, DefaultEndOfLine, ITextBufferFactory, ITextModelCreationOptions } from '../../common/model.js';
+import { TextModel } from '../../common/model/textModel.js';
+import { ILanguageConfigurationService } from '../../common/languages/languageConfigurationRegistry.js';
+import { ILanguageService } from '../../common/languages/language.js';
+import { LanguageService } from '../../common/services/languageService.js';
+import { ITextResourcePropertiesService } from '../../common/services/textResourceConfiguration.js';
+import { TestLanguageConfigurationService } from './modes/testLanguageConfigurationService.js';
+import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../platform/configuration/test/common/testConfigurationService.js';
+import { IDialogService } from '../../../platform/dialogs/common/dialogs.js';
+import { TestDialogService } from '../../../platform/dialogs/test/common/testDialogService.js';
+import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
+import { ILogService, NullLogService } from '../../../platform/log/common/log.js';
+import { INotificationService } from '../../../platform/notification/common/notification.js';
+import { TestNotificationService } from '../../../platform/notification/test/common/testNotificationService.js';
+import { IThemeService } from '../../../platform/theme/common/themeService.js';
+import { TestThemeService } from '../../../platform/theme/test/common/testThemeService.js';
+import { IUndoRedoService } from '../../../platform/undoRedo/common/undoRedo.js';
+import { UndoRedoService } from '../../../platform/undoRedo/common/undoRedoService.js';
+import { TestTextResourcePropertiesService } from './services/testTextResourcePropertiesService.js';
+import { IModelService } from '../../common/services/model.js';
+import { ModelService } from '../../common/services/modelService.js';
+import { createServices, ServiceIdCtorPair, TestInstantiationService } from '../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../../common/languages/modesRegistry.js';
+import { ILanguageFeatureDebounceService, LanguageFeatureDebounceService } from '../../common/services/languageFeatureDebounce.js';
+import { ILanguageFeaturesService } from '../../common/services/languageFeatures.js';
+import { LanguageFeaturesService } from '../../common/services/languageFeaturesService.js';
+import { IEnvironmentService } from '../../../platform/environment/common/environment.js';
+import { mock } from '../../../base/test/common/mock.js';
+import { ITreeSitterParserService } from '../../common/services/treeSitterParserService.js';
+import { TestTreeSitterParserService } from './services/testTreeSitterService.js';
 
 class TestTextModel extends TextModel {
 	public registerDisposable(disposable: IDisposable): void {
@@ -105,5 +107,6 @@ export function createModelServices(disposables: DisposableStore, services: Serv
 		[ILanguageFeatureDebounceService, LanguageFeatureDebounceService],
 		[ILanguageFeaturesService, LanguageFeaturesService],
 		[IModelService, ModelService],
+		[ITreeSitterParserService, TestTreeSitterParserService]
 	]));
 }
diff --git a/src/vs/editor/test/common/view/overviewZoneManager.test.ts b/src/vs/editor/test/common/view/overviewZoneManager.test.ts
index b488141d7d7..c3b253058e9 100644
--- a/src/vs/editor/test/common/view/overviewZoneManager.test.ts
+++ b/src/vs/editor/test/common/view/overviewZoneManager.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ColorZone, OverviewRulerZone, OverviewZoneManager } from 'vs/editor/common/viewModel/overviewZoneManager';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { ColorZone, OverviewRulerZone, OverviewZoneManager } from '../../../common/viewModel/overviewZoneManager.js';
 
 suite('Editor View - OverviewZoneManager', () => {
 
diff --git a/src/vs/editor/test/common/viewLayout/lineDecorations.test.ts b/src/vs/editor/test/common/viewLayout/lineDecorations.test.ts
index d1058c42293..59f87b95b43 100644
--- a/src/vs/editor/test/common/viewLayout/lineDecorations.test.ts
+++ b/src/vs/editor/test/common/viewLayout/lineDecorations.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Range } from 'vs/editor/common/core/range';
-import { DecorationSegment, LineDecoration, LineDecorationsNormalizer } from 'vs/editor/common/viewLayout/lineDecorations';
-import { InlineDecoration, InlineDecorationType } from 'vs/editor/common/viewModel';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { Range } from '../../../common/core/range.js';
+import { DecorationSegment, LineDecoration, LineDecorationsNormalizer } from '../../../common/viewLayout/lineDecorations.js';
+import { InlineDecoration, InlineDecorationType } from '../../../common/viewModel.js';
 
 suite('Editor ViewLayout - ViewLineParts', () => {
 
diff --git a/src/vs/editor/test/common/viewLayout/linesLayout.test.ts b/src/vs/editor/test/common/viewLayout/linesLayout.test.ts
index 58f9217ea56..087c24e457b 100644
--- a/src/vs/editor/test/common/viewLayout/linesLayout.test.ts
+++ b/src/vs/editor/test/common/viewLayout/linesLayout.test.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { EditorWhitespace, LinesLayout } from 'vs/editor/common/viewLayout/linesLayout';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { EditorWhitespace, LinesLayout } from '../../../common/viewLayout/linesLayout.js';
 
 suite('Editor ViewLayout - LinesLayout', () => {
 
diff --git a/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts b/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts
index 22e1c60f7af..c35690fe93a 100644
--- a/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts
+++ b/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts
@@ -4,15 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { CharCode } from 'vs/base/common/charCode';
-import * as strings from 'vs/base/common/strings';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { MetadataConsts } from 'vs/editor/common/encodedTokenAttributes';
-import { IViewLineTokens } from 'vs/editor/common/tokens/lineTokens';
-import { LineDecoration } from 'vs/editor/common/viewLayout/lineDecorations';
-import { CharacterMapping, DomPosition, LineRange, RenderLineInput, RenderLineOutput2, renderViewLine2 as renderViewLine } from 'vs/editor/common/viewLayout/viewLineRenderer';
-import { InlineDecorationType } from 'vs/editor/common/viewModel';
-import { TestLineToken, TestLineTokens } from 'vs/editor/test/common/core/testLineToken';
+import { CharCode } from '../../../../base/common/charCode.js';
+import * as strings from '../../../../base/common/strings.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { MetadataConsts } from '../../../common/encodedTokenAttributes.js';
+import { IViewLineTokens } from '../../../common/tokens/lineTokens.js';
+import { LineDecoration } from '../../../common/viewLayout/lineDecorations.js';
+import { CharacterMapping, DomPosition, LineRange, RenderLineInput, RenderLineOutput2, renderViewLine2 as renderViewLine } from '../../../common/viewLayout/viewLineRenderer.js';
+import { InlineDecorationType } from '../../../common/viewModel.js';
+import { TestLineToken, TestLineTokens } from '../core/testLineToken.js';
 
 function createViewLineTokens(viewLineTokens: TestLineToken[]): IViewLineTokens {
 	return new TestLineTokens(viewLineTokens);
diff --git a/src/vs/editor/test/common/viewModel/glyphLanesModel.test.ts b/src/vs/editor/test/common/viewModel/glyphLanesModel.test.ts
index 84659a045c6..39f80ae0a32 100644
--- a/src/vs/editor/test/common/viewModel/glyphLanesModel.test.ts
+++ b/src/vs/editor/test/common/viewModel/glyphLanesModel.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { GlyphMarginLanesModel, } from 'vs/editor/common/viewModel/glyphLanesModel';
-import { Range } from 'vs/editor/common/core/range';
-import { GlyphMarginLane } from 'vs/editor/common/model';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { GlyphMarginLanesModel, } from '../../../common/viewModel/glyphLanesModel.js';
+import { Range } from '../../../common/core/range.js';
+import { GlyphMarginLane } from '../../../common/model.js';
 
 suite('GlyphLanesModel', () => {
 	let model: GlyphMarginLanesModel;
diff --git a/src/vs/editor/test/common/viewModel/lineBreakData.test.ts b/src/vs/editor/test/common/viewModel/lineBreakData.test.ts
index b771b7e5ff8..b621632fe1d 100644
--- a/src/vs/editor/test/common/viewModel/lineBreakData.test.ts
+++ b/src/vs/editor/test/common/viewModel/lineBreakData.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { PositionAffinity } from 'vs/editor/common/model';
-import { ModelDecorationInjectedTextOptions } from 'vs/editor/common/model/textModel';
-import { ModelLineProjectionData } from 'vs/editor/common/modelLineProjectionData';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { PositionAffinity } from '../../../common/model.js';
+import { ModelDecorationInjectedTextOptions } from '../../../common/model/textModel.js';
+import { ModelLineProjectionData } from '../../../common/modelLineProjectionData.js';
 
 suite('Editor ViewModel - LineBreakData', () => {
 
diff --git a/src/vs/editor/test/common/viewModel/monospaceLineBreaksComputer.test.ts b/src/vs/editor/test/common/viewModel/monospaceLineBreaksComputer.test.ts
index a1defd0c4f5..b5f0e782224 100644
--- a/src/vs/editor/test/common/viewModel/monospaceLineBreaksComputer.test.ts
+++ b/src/vs/editor/test/common/viewModel/monospaceLineBreaksComputer.test.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { EditorOptions, WrappingIndent } from 'vs/editor/common/config/editorOptions';
-import { FontInfo } from 'vs/editor/common/config/fontInfo';
-import { ILineBreaksComputerFactory, ModelLineProjectionData } from 'vs/editor/common/modelLineProjectionData';
-import { MonospaceLineBreaksComputerFactory } from 'vs/editor/common/viewModel/monospaceLineBreaksComputer';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { EditorOptions, WrappingIndent } from '../../../common/config/editorOptions.js';
+import { FontInfo } from '../../../common/config/fontInfo.js';
+import { ILineBreaksComputerFactory, ModelLineProjectionData } from '../../../common/modelLineProjectionData.js';
+import { MonospaceLineBreaksComputerFactory } from '../../../common/viewModel/monospaceLineBreaksComputer.js';
 
 function parseAnnotatedText(annotatedText: string): { text: string; indices: number[] } {
 	let text = '';
diff --git a/src/vs/editor/test/common/viewModel/prefixSumComputer.test.ts b/src/vs/editor/test/common/viewModel/prefixSumComputer.test.ts
index e1820e6e920..a7f934a6247 100644
--- a/src/vs/editor/test/common/viewModel/prefixSumComputer.test.ts
+++ b/src/vs/editor/test/common/viewModel/prefixSumComputer.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { toUint32 } from 'vs/base/common/uint';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { PrefixSumComputer, PrefixSumIndexOfResult } from 'vs/editor/common/model/prefixSumComputer';
+import { toUint32 } from '../../../../base/common/uint.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { PrefixSumComputer, PrefixSumIndexOfResult } from '../../../common/model/prefixSumComputer.js';
 
 function toUint32Array(arr: number[]): Uint32Array {
 	const len = arr.length;
diff --git a/src/vs/editor/test/node/classification/typescript.test.ts b/src/vs/editor/test/node/classification/typescript.test.ts
index d2657a7ce41..4166eadcd23 100644
--- a/src/vs/editor/test/node/classification/typescript.test.ts
+++ b/src/vs/editor/test/node/classification/typescript.test.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { StandardTokenType } from 'vs/editor/common/encodedTokenAttributes';
+import { StandardTokenType } from '../../../common/encodedTokenAttributes.js';
 import * as fs from 'fs';
 // import { getPathFromAmdModule } from 'vs/base/test/node/testUtils';
 // import { parse } from 'vs/editor/common/modes/tokenization/typescript';
-import { toStandardTokenType } from 'vs/editor/common/languages/supports/tokenization';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { toStandardTokenType } from '../../../common/languages/supports/tokenization.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 
 interface IParseFunc {
 	(text: string): number[];
diff --git a/src/vs/editor/test/node/diffing/defaultLinesDiffComputer.test.ts b/src/vs/editor/test/node/diffing/defaultLinesDiffComputer.test.ts
index 57a34dfc364..7e93197efec 100644
--- a/src/vs/editor/test/node/diffing/defaultLinesDiffComputer.test.ts
+++ b/src/vs/editor/test/node/diffing/defaultLinesDiffComputer.test.ts
@@ -4,21 +4,21 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Range } from 'vs/editor/common/core/range';
-import { RangeMapping } from 'vs/editor/common/diff/rangeMapping';
-import { OffsetRange } from 'vs/editor/common/core/offsetRange';
-import { getLineRangeMapping } from 'vs/editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer';
-import { LinesSliceCharSequence } from 'vs/editor/common/diff/defaultLinesDiffComputer/linesSliceCharSequence';
-import { MyersDiffAlgorithm } from 'vs/editor/common/diff/defaultLinesDiffComputer/algorithms/myersDiffAlgorithm';
-import { DynamicProgrammingDiffing } from 'vs/editor/common/diff/defaultLinesDiffComputer/algorithms/dynamicProgrammingDiffing';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { Range } from '../../../common/core/range.js';
+import { getLineRangeMapping, RangeMapping } from '../../../common/diff/rangeMapping.js';
+import { OffsetRange } from '../../../common/core/offsetRange.js';
+import { LinesSliceCharSequence } from '../../../common/diff/defaultLinesDiffComputer/linesSliceCharSequence.js';
+import { MyersDiffAlgorithm } from '../../../common/diff/defaultLinesDiffComputer/algorithms/myersDiffAlgorithm.js';
+import { DynamicProgrammingDiffing } from '../../../common/diff/defaultLinesDiffComputer/algorithms/dynamicProgrammingDiffing.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { ArrayText } from '../../../common/core/textEdit.js';
 
 suite('myers', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
 
 	test('1', () => {
-		const s1 = new LinesSliceCharSequence(['hello world'], new OffsetRange(0, 1), true);
-		const s2 = new LinesSliceCharSequence(['hallo welt'], new OffsetRange(0, 1), true);
+		const s1 = new LinesSliceCharSequence(['hello world'], new Range(1, 1, 1, Number.MAX_SAFE_INTEGER), true);
+		const s2 = new LinesSliceCharSequence(['hallo welt'], new Range(1, 1, 1, Number.MAX_SAFE_INTEGER), true);
 
 		const a = true ? new MyersDiffAlgorithm() : new DynamicProgrammingDiffing();
 		a.compute(s1, s2);
@@ -35,15 +35,15 @@ suite('lineRangeMapping', () => {
 					new Range(2, 1, 3, 1),
 					new Range(2, 1, 2, 1)
 				),
-				[
+				new ArrayText([
 					'const abc = "helloworld".split("");',
 					'',
 					''
-				],
-				[
+				]),
+				new ArrayText([
 					'const asciiLower = "helloworld".split("");',
 					''
-				]
+				])
 			).toString(),
 			"{[2,3)->[2,2)}"
 		);
@@ -56,16 +56,16 @@ suite('lineRangeMapping', () => {
 					new Range(2, 1, 2, 1),
 					new Range(2, 1, 4, 1),
 				),
-				[
+				new ArrayText([
 					'',
 					'',
-				],
-				[
+				]),
+				new ArrayText([
 					'',
 					'',
 					'',
 					'',
-				]
+				])
 			).toString(),
 			"{[2,2)->[2,4)}"
 		);
@@ -83,7 +83,7 @@ suite('LinesSliceCharSequence', () => {
 			'line4: hello world',
 			'line5: bazz',
 		],
-		new OffsetRange(1, 4), true
+		new Range(2, 1, 5, 1), true
 	);
 
 	test('translateOffset', () => {
diff --git a/src/vs/editor/test/node/diffing/fixtures.test.ts b/src/vs/editor/test/node/diffing/fixtures.test.ts
index 901ed758ff1..e85d69f1260 100644
--- a/src/vs/editor/test/node/diffing/fixtures.test.ts
+++ b/src/vs/editor/test/node/diffing/fixtures.test.ts
@@ -6,13 +6,15 @@
 import assert from 'assert';
 import { existsSync, readFileSync, readdirSync, rmSync, writeFileSync } from 'fs';
 import { join, resolve } from 'path';
-import { setUnexpectedErrorHandler } from 'vs/base/common/errors';
-import { FileAccess } from 'vs/base/common/network';
-import { DetailedLineRangeMapping } from 'vs/editor/common/diff/rangeMapping';
-import { LegacyLinesDiffComputer } from 'vs/editor/common/diff/legacyLinesDiffComputer';
-import { DefaultLinesDiffComputer } from 'vs/editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer';
-import { Range } from 'vs/editor/common/core/range';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { setUnexpectedErrorHandler } from '../../../../base/common/errors.js';
+import { FileAccess } from '../../../../base/common/network.js';
+import { DetailedLineRangeMapping, RangeMapping } from '../../../common/diff/rangeMapping.js';
+import { LegacyLinesDiffComputer } from '../../../common/diff/legacyLinesDiffComputer.js';
+import { DefaultLinesDiffComputer } from '../../../common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer.js';
+import { Range } from '../../../common/core/range.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { AbstractText, ArrayText, SingleTextEdit, TextEdit } from '../../../common/core/textEdit.js';
+import { LinesDiff } from '../../../common/diff/linesDiffComputer.js';
 
 suite('diffing fixtures', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
@@ -47,7 +49,15 @@ suite('diffing fixtures', () => {
 		const ignoreTrimWhitespace = folder.indexOf('trimws') >= 0;
 		const diff = diffingAlgo.computeDiff(firstContentLines, secondContentLines, { ignoreTrimWhitespace, maxComputationTimeMs: Number.MAX_SAFE_INTEGER, computeMoves: true });
 
+		if (diffingAlgoName === 'advanced' && !ignoreTrimWhitespace) {
+			assertDiffCorrectness(diff, firstContentLines, secondContentLines);
+		}
+
 		function getDiffs(changes: readonly DetailedLineRangeMapping[]): IDetailedDiff[] {
+			for (const c of changes) {
+				RangeMapping.assertSorted(c.innerChanges ?? []);
+			}
+
 			return changes.map<IDetailedDiff>(c => ({
 				originalRange: c.original.toString(),
 				modifiedRange: c.modified.toString(),
@@ -123,7 +133,7 @@ suite('diffing fixtures', () => {
 	}
 
 	test(`test`, () => {
-		runTest('issue-214049', 'advanced');
+		runTest('invalid-diff-trimws', 'advanced');
 	});
 
 	for (const folder of folders) {
@@ -160,3 +170,20 @@ interface IMoveInfo {
 
 	changes: IDetailedDiff[];
 }
+
+function assertDiffCorrectness(diff: LinesDiff, original: string[], modified: string[]) {
+	const allInnerChanges = diff.changes.flatMap(c => c.innerChanges!);
+	const edit = rangeMappingsToTextEdit(allInnerChanges, new ArrayText(modified));
+	const result = edit.normalize().apply(new ArrayText(original));
+
+	assert.deepStrictEqual(result, modified.join('\n'));
+}
+
+function rangeMappingsToTextEdit(rangeMappings: readonly RangeMapping[], modified: AbstractText): TextEdit {
+	return new TextEdit(rangeMappings.map(m => {
+		return new SingleTextEdit(
+			m.originalRange,
+			modified.getValueOfRange(m.modifiedRange)
+		);
+	}));
+}
diff --git a/src/vs/editor/test/node/diffing/fixtures/invalid-diff-trimws/advanced.expected.diff.json b/src/vs/editor/test/node/diffing/fixtures/invalid-diff-trimws/advanced.expected.diff.json
index bdaa293acd4..b9b792ab068 100644
--- a/src/vs/editor/test/node/diffing/fixtures/invalid-diff-trimws/advanced.expected.diff.json
+++ b/src/vs/editor/test/node/diffing/fixtures/invalid-diff-trimws/advanced.expected.diff.json
@@ -13,7 +13,7 @@
 			"modifiedRange": "[742,751)",
 			"innerChanges": [
 				{
-					"originalRange": "[742,3 -> 742,3]",
+					"originalRange": "[742,1 -> 742,1]",
 					"modifiedRange": "[742,1 -> 743,8]"
 				},
 				{
diff --git a/src/vs/editor/test/node/diffing/fixtures/sorted-offsets/1.tst b/src/vs/editor/test/node/diffing/fixtures/sorted-offsets/1.tst
new file mode 100644
index 00000000000..7d4c1415308
--- /dev/null
+++ b/src/vs/editor/test/node/diffing/fixtures/sorted-offsets/1.tst
@@ -0,0 +1,102 @@
+import { neverAbortedSignal } from './common/abort';
+import { defer } from './common/defer';
+import { EventEmitter } from './common/Event';
+import { ExecuteWrapper } from './common/Executor';
+import { BulkheadRejectedError } from './errors/BulkheadRejectedError';
+import { TaskCancelledError } from './errors/Errors';
+import { IDefaultPolicyContext, IPolicy } from './Policy';
+
+interface IQueueItem<T> {
+	signal: AbortSignal;
+	fn(context: IDefaultPolicyContext): Promise<T> | T;
+	resolve(value: T): void;
+	reject(error: Error): void;
+}
+
+export class BulkheadPolicy implements IPolicy {
+	public declare readonly _altReturn: never;
+
+	private active = 0;
+	private readonly queue: Array<IQueueItem<unknown>> = [];
+	private readonly onRejectEmitter = new EventEmitter<void>();
+	private readonly executor = new ExecuteWrapper();
+
+	/**
+	 * @inheritdoc
+	 */
+	public readonly onSuccess = this.executor.onSuccess;
+
+	/**
+	 * @inheritdoc
+	 */
+	public readonly onFailure = this.executor.onFailure;
+
+	/**
+	 * Emitter that fires when an item is rejected from the bulkhead.
+	 */
+	public readonly onReject = this.onRejectEmitter.addListener;
+
+	/**
+	 * Returns the number of available execution slots at this point in time.
+	 */
+	public get executionSlots() {
+		return this.capacity - this.active;
+	}
+
+	/**
+	 * Returns the number of queue slots at this point in time.
+	 */
+	public get queueSlots() {
+		return this.queueCapacity - this.queue.length;
+	}
+
+	/**
+	 * Bulkhead limits concurrent requests made.
+	 */
+	constructor(private readonly capacity: number, private readonly queueCapacity: number) { }
+
+	/**
+	 * Executes the given function.
+	 * @param fn Function to execute
+	 * @throws a {@link BulkheadRejectedException} if the bulkhead limits are exceeeded
+	 */
+	public async execute<T>(
+		fn: (context: IDefaultPolicyContext) => PromiseLike<T> | T,
+		signal = neverAbortedSignal,
+	): Promise<T> {
+		if (signal.aborted) {
+			throw new TaskCancelledError();
+		}
+
+		if (this.active < this.capacity) {
+			this.active++;
+			try {
+				return await fn({ signal });
+			} finally {
+				this.active--;
+				this.dequeue();
+			}
+		}
+
+		if (this.queue.length > this.queueCapacity) {
+			const { resolve, reject, promise } = defer<T>();
+			this.queue.push({ signal, fn, resolve, reject });
+			return promise;
+		}
+
+		this.onRejectEmitter.emit();
+		throw new BulkheadRejectedError(this.capacity, this.queueCapacity);
+	}
+
+	private dequeue() {
+		const item = this.queue.shift();
+		if (!item) {
+			return;
+		}
+
+		Promise.resolve()
+			.then(() => this.execute(item.fn, item.signal))
+			.then(item.resolve)
+			.catch(item.reject);
+	}
+}
diff --git a/src/vs/editor/test/node/diffing/fixtures/sorted-offsets/2.tst b/src/vs/editor/test/node/diffing/fixtures/sorted-offsets/2.tst
new file mode 100644
index 00000000000..9b3687d776a
--- /dev/null
+++ b/src/vs/editor/test/node/diffing/fixtures/sorted-offsets/2.tst
@@ -0,0 +1,87 @@
+import { neverAbortedSignal } from './common/abort';
+import { defer } from './common/defer';
+import { EventEmitter } from './common/Event';
+import { ExecuteWrapper } from './common/Executor';
+import { BulkheadRejectedError } from './errors/BulkheadRejectedError';
+import { TaskCancelledError } from './errors/Errors';
+import { IDefaultPolicyContext, IPolicy } from './Policy';
+
+interface IQueueItem<T> {
+	signal: AbortSignal;
+	fn(context: IDefaultPolicyContext): Promise<T> | T;
+	resolve(value: T): void;
+	reject(error: Error): void;
+}
+
+export class BulkheadPolicy implements IPolicy {
+	public declare readonly _altReturn: never;
+
+	private active = 0;
+	private readonly queue: Array<IQueueItem<unknown>> = [];
+	private readonly onRejectEmitter = new EventEmitter<void>();
+	private readonly executor = new ExecuteWrapper();
+
+	/**
+	 * @inheritdoc
+	 */
+	public readonly onSuccess = this.executor.onSuccess;
+
+	/**
+	 * @inheritdoc
+	 */
+	public readonly onFailure = this.executor.onFailure;
+
+	/**
+	 * Emitter that fires when an item is rejected from the bulkhead.
+	 */
+	public readonly onReject = this.onRejectEmitter.addListener;
+
+	/**
+	 * Returns the number of available execution slots at this point in time.
+	 */
+	public get executionSlots() {
+		return this.capacity - this.active;
+	}
+
+	/**
+	 * Returns the number of queue slots at this point in time.
+	 */
+	public get queueSlots() {
+		return this.queueCapacity - this.queue.length;
+	}
+
+	/**
+	 * Bulkhead limits concurrent requests made.
+	 */
+	constructor(private readonly capacity: number, private readonly queueCapacity: number) { }
+
+	/**
+	 * Executes the given function.
+	 * @param fn Function to execute
+	 * @throws a {@link BulkheadRejectedException} if the bulkhead limits are exceeeded
+	 */
+	public async execute<T>(
+		fn: (context: IDefaultPolicyContext) => PromiseLike<T> | T,
+		signal = neverAbortedSignal,
+	): Promise<T> {
+		if (signal.aborted) {
+			throw new TaskCancelledError();
+		}
+
+		if (this.active < this.capacity) {
+			this.active++;
+			try {
+				return await fn({ signal });
+			} finally {
+				this.active--;
+				this.dequeue();
+			}
+		}
+
+		if (this.queue.length >= this.queueCapacity) {
+			this.onRejectEmitter.emit();
+			throw new BulkheadRejectedError(this.capacity, this.queueCapacity);
+		}
+		const { resolve, reject, promise } = defer<T>();
+		this.queue.push({ signal, fn, resolve, reject });
+		return promise;
diff --git a/src/vs/editor/test/node/diffing/fixtures/sorted-offsets/advanced.expected.diff.json b/src/vs/editor/test/node/diffing/fixtures/sorted-offsets/advanced.expected.diff.json
new file mode 100644
index 00000000000..06f0ca747cf
--- /dev/null
+++ b/src/vs/editor/test/node/diffing/fixtures/sorted-offsets/advanced.expected.diff.json
@@ -0,0 +1,42 @@
+{
+	"original": {
+		"content": "import { neverAbortedSignal } from './common/abort';\nimport { defer } from './common/defer';\nimport { EventEmitter } from './common/Event';\nimport { ExecuteWrapper } from './common/Executor';\nimport { BulkheadRejectedError } from './errors/BulkheadRejectedError';\nimport { TaskCancelledError } from './errors/Errors';\nimport { IDefaultPolicyContext, IPolicy } from './Policy';\n\ninterface IQueueItem<T> {\n\tsignal: AbortSignal;\n\tfn(context: IDefaultPolicyContext): Promise<T> | T;\n\tresolve(value: T): void;\n\treject(error: Error): void;\n}\n\nexport class BulkheadPolicy implements IPolicy {\n\tpublic declare readonly _altReturn: never;\n\n\tprivate active = 0;\n\tprivate readonly queue: Array<IQueueItem<unknown>> = [];\n\tprivate readonly onRejectEmitter = new EventEmitter<void>();\n\tprivate readonly executor = new ExecuteWrapper();\n\n\t/**\n\t * @inheritdoc\n\t */\n\tpublic readonly onSuccess = this.executor.onSuccess;\n\n\t/**\n\t * @inheritdoc\n\t */\n\tpublic readonly onFailure = this.executor.onFailure;\n\n\t/**\n\t * Emitter that fires when an item is rejected from the bulkhead.\n\t */\n\tpublic readonly onReject = this.onRejectEmitter.addListener;\n\n\t/**\n\t * Returns the number of available execution slots at this point in time.\n\t */\n\tpublic get executionSlots() {\n\t\treturn this.capacity - this.active;\n\t}\n\n\t/**\n\t * Returns the number of queue slots at this point in time.\n\t */\n\tpublic get queueSlots() {\n\t\treturn this.queueCapacity - this.queue.length;\n\t}\n\n\t/**\n\t * Bulkhead limits concurrent requests made.\n\t */\n\tconstructor(private readonly capacity: number, private readonly queueCapacity: number) { }\n\n\t/**\n\t * Executes the given function.\n\t * @param fn Function to execute\n\t * @throws a {@link BulkheadRejectedException} if the bulkhead limits are exceeeded\n\t */\n\tpublic async execute<T>(\n\t\tfn: (context: IDefaultPolicyContext) => PromiseLike<T> | T,\n\t\tsignal = neverAbortedSignal,\n\t): Promise<T> {\n\t\tif (signal.aborted) {\n\t\t\tthrow new TaskCancelledError();\n\t\t}\n\n\t\tif (this.active < this.capacity) {\n\t\t\tthis.active++;\n\t\t\ttry {\n\t\t\t\treturn await fn({ signal });\n\t\t\t} finally {\n\t\t\t\tthis.active--;\n\t\t\t\tthis.dequeue();\n\t\t\t}\n\t\t}\n\n\t\tif (this.queue.length > this.queueCapacity) {\n\t\t\tconst { resolve, reject, promise } = defer<T>();\n\t\t\tthis.queue.push({ signal, fn, resolve, reject });\n\t\t\treturn promise;\n\t\t}\n\n\t\tthis.onRejectEmitter.emit();\n\t\tthrow new BulkheadRejectedError(this.capacity, this.queueCapacity);\n\t}\n\n\tprivate dequeue() {\n\t\tconst item = this.queue.shift();\n\t\tif (!item) {\n\t\t\treturn;\n\t\t}\n\n\t\tPromise.resolve()\n\t\t\t.then(() => this.execute(item.fn, item.signal))\n\t\t\t.then(item.resolve)\n\t\t\t.catch(item.reject);\n\t}\n}\n",
+		"fileName": "./1.tst"
+	},
+	"modified": {
+		"content": "import { neverAbortedSignal } from './common/abort';\nimport { defer } from './common/defer';\nimport { EventEmitter } from './common/Event';\nimport { ExecuteWrapper } from './common/Executor';\nimport { BulkheadRejectedError } from './errors/BulkheadRejectedError';\nimport { TaskCancelledError } from './errors/Errors';\nimport { IDefaultPolicyContext, IPolicy } from './Policy';\n\ninterface IQueueItem<T> {\n\tsignal: AbortSignal;\n\tfn(context: IDefaultPolicyContext): Promise<T> | T;\n\tresolve(value: T): void;\n\treject(error: Error): void;\n}\n\nexport class BulkheadPolicy implements IPolicy {\n\tpublic declare readonly _altReturn: never;\n\n\tprivate active = 0;\n\tprivate readonly queue: Array<IQueueItem<unknown>> = [];\n\tprivate readonly onRejectEmitter = new EventEmitter<void>();\n\tprivate readonly executor = new ExecuteWrapper();\n\n\t/**\n\t * @inheritdoc\n\t */\n\tpublic readonly onSuccess = this.executor.onSuccess;\n\n\t/**\n\t * @inheritdoc\n\t */\n\tpublic readonly onFailure = this.executor.onFailure;\n\n\t/**\n\t * Emitter that fires when an item is rejected from the bulkhead.\n\t */\n\tpublic readonly onReject = this.onRejectEmitter.addListener;\n\n\t/**\n\t * Returns the number of available execution slots at this point in time.\n\t */\n\tpublic get executionSlots() {\n\t\treturn this.capacity - this.active;\n\t}\n\n\t/**\n\t * Returns the number of queue slots at this point in time.\n\t */\n\tpublic get queueSlots() {\n\t\treturn this.queueCapacity - this.queue.length;\n\t}\n\n\t/**\n\t * Bulkhead limits concurrent requests made.\n\t */\n\tconstructor(private readonly capacity: number, private readonly queueCapacity: number) { }\n\n\t/**\n\t * Executes the given function.\n\t * @param fn Function to execute\n\t * @throws a {@link BulkheadRejectedException} if the bulkhead limits are exceeeded\n\t */\n\tpublic async execute<T>(\n\t\tfn: (context: IDefaultPolicyContext) => PromiseLike<T> | T,\n\t\tsignal = neverAbortedSignal,\n\t): Promise<T> {\n\t\tif (signal.aborted) {\n\t\t\tthrow new TaskCancelledError();\n\t\t}\n\n\t\tif (this.active < this.capacity) {\n\t\t\tthis.active++;\n\t\t\ttry {\n\t\t\t\treturn await fn({ signal });\n\t\t\t} finally {\n\t\t\t\tthis.active--;\n\t\t\t\tthis.dequeue();\n\t\t\t}\n\t\t}\n\n\t\tif (this.queue.length >= this.queueCapacity) {\n\t\t\tthis.onRejectEmitter.emit();\n\t\t\tthrow new BulkheadRejectedError(this.capacity, this.queueCapacity);\n\t\t}\n\t\tconst { resolve, reject, promise } = defer<T>();\n\t\tthis.queue.push({ signal, fn, resolve, reject });\n\t\treturn promise;\n",
+		"fileName": "./2.tst"
+	},
+	"diffs": [
+		{
+			"originalRange": "[81,103)",
+			"modifiedRange": "[81,88)",
+			"innerChanges": [
+				{
+					"originalRange": "[81,26 -> 81,26]",
+					"modifiedRange": "[81,26 -> 81,27]"
+				},
+				{
+					"originalRange": "[82,1 -> 82,1]",
+					"modifiedRange": "[82,1 -> 85,1]"
+				},
+				{
+					"originalRange": "[82,1 -> 82,2]",
+					"modifiedRange": "[85,1 -> 85,1]"
+				},
+				{
+					"originalRange": "[83,1 -> 83,2]",
+					"modifiedRange": "[86,1 -> 86,1]"
+				},
+				{
+					"originalRange": "[84,1 -> 84,2]",
+					"modifiedRange": "[87,1 -> 87,1]"
+				},
+				{
+					"originalRange": "[85,1 -> 103,1 EOL]",
+					"modifiedRange": "[88,1 -> 88,1 EOL]"
+				}
+			]
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/vs/editor/test/node/diffing/fixtures/sorted-offsets/legacy.expected.diff.json b/src/vs/editor/test/node/diffing/fixtures/sorted-offsets/legacy.expected.diff.json
new file mode 100644
index 00000000000..88d6c0c6cf8
--- /dev/null
+++ b/src/vs/editor/test/node/diffing/fixtures/sorted-offsets/legacy.expected.diff.json
@@ -0,0 +1,74 @@
+{
+	"original": {
+		"content": "import { neverAbortedSignal } from './common/abort';\nimport { defer } from './common/defer';\nimport { EventEmitter } from './common/Event';\nimport { ExecuteWrapper } from './common/Executor';\nimport { BulkheadRejectedError } from './errors/BulkheadRejectedError';\nimport { TaskCancelledError } from './errors/Errors';\nimport { IDefaultPolicyContext, IPolicy } from './Policy';\n\ninterface IQueueItem<T> {\n\tsignal: AbortSignal;\n\tfn(context: IDefaultPolicyContext): Promise<T> | T;\n\tresolve(value: T): void;\n\treject(error: Error): void;\n}\n\nexport class BulkheadPolicy implements IPolicy {\n\tpublic declare readonly _altReturn: never;\n\n\tprivate active = 0;\n\tprivate readonly queue: Array<IQueueItem<unknown>> = [];\n\tprivate readonly onRejectEmitter = new EventEmitter<void>();\n\tprivate readonly executor = new ExecuteWrapper();\n\n\t/**\n\t * @inheritdoc\n\t */\n\tpublic readonly onSuccess = this.executor.onSuccess;\n\n\t/**\n\t * @inheritdoc\n\t */\n\tpublic readonly onFailure = this.executor.onFailure;\n\n\t/**\n\t * Emitter that fires when an item is rejected from the bulkhead.\n\t */\n\tpublic readonly onReject = this.onRejectEmitter.addListener;\n\n\t/**\n\t * Returns the number of available execution slots at this point in time.\n\t */\n\tpublic get executionSlots() {\n\t\treturn this.capacity - this.active;\n\t}\n\n\t/**\n\t * Returns the number of queue slots at this point in time.\n\t */\n\tpublic get queueSlots() {\n\t\treturn this.queueCapacity - this.queue.length;\n\t}\n\n\t/**\n\t * Bulkhead limits concurrent requests made.\n\t */\n\tconstructor(private readonly capacity: number, private readonly queueCapacity: number) { }\n\n\t/**\n\t * Executes the given function.\n\t * @param fn Function to execute\n\t * @throws a {@link BulkheadRejectedException} if the bulkhead limits are exceeeded\n\t */\n\tpublic async execute<T>(\n\t\tfn: (context: IDefaultPolicyContext) => PromiseLike<T> | T,\n\t\tsignal = neverAbortedSignal,\n\t): Promise<T> {\n\t\tif (signal.aborted) {\n\t\t\tthrow new TaskCancelledError();\n\t\t}\n\n\t\tif (this.active < this.capacity) {\n\t\t\tthis.active++;\n\t\t\ttry {\n\t\t\t\treturn await fn({ signal });\n\t\t\t} finally {\n\t\t\t\tthis.active--;\n\t\t\t\tthis.dequeue();\n\t\t\t}\n\t\t}\n\n\t\tif (this.queue.length > this.queueCapacity) {\n\t\t\tconst { resolve, reject, promise } = defer<T>();\n\t\t\tthis.queue.push({ signal, fn, resolve, reject });\n\t\t\treturn promise;\n\t\t}\n\n\t\tthis.onRejectEmitter.emit();\n\t\tthrow new BulkheadRejectedError(this.capacity, this.queueCapacity);\n\t}\n\n\tprivate dequeue() {\n\t\tconst item = this.queue.shift();\n\t\tif (!item) {\n\t\t\treturn;\n\t\t}\n\n\t\tPromise.resolve()\n\t\t\t.then(() => this.execute(item.fn, item.signal))\n\t\t\t.then(item.resolve)\n\t\t\t.catch(item.reject);\n\t}\n}\n",
+		"fileName": "./1.tst"
+	},
+	"modified": {
+		"content": "import { neverAbortedSignal } from './common/abort';\nimport { defer } from './common/defer';\nimport { EventEmitter } from './common/Event';\nimport { ExecuteWrapper } from './common/Executor';\nimport { BulkheadRejectedError } from './errors/BulkheadRejectedError';\nimport { TaskCancelledError } from './errors/Errors';\nimport { IDefaultPolicyContext, IPolicy } from './Policy';\n\ninterface IQueueItem<T> {\n\tsignal: AbortSignal;\n\tfn(context: IDefaultPolicyContext): Promise<T> | T;\n\tresolve(value: T): void;\n\treject(error: Error): void;\n}\n\nexport class BulkheadPolicy implements IPolicy {\n\tpublic declare readonly _altReturn: never;\n\n\tprivate active = 0;\n\tprivate readonly queue: Array<IQueueItem<unknown>> = [];\n\tprivate readonly onRejectEmitter = new EventEmitter<void>();\n\tprivate readonly executor = new ExecuteWrapper();\n\n\t/**\n\t * @inheritdoc\n\t */\n\tpublic readonly onSuccess = this.executor.onSuccess;\n\n\t/**\n\t * @inheritdoc\n\t */\n\tpublic readonly onFailure = this.executor.onFailure;\n\n\t/**\n\t * Emitter that fires when an item is rejected from the bulkhead.\n\t */\n\tpublic readonly onReject = this.onRejectEmitter.addListener;\n\n\t/**\n\t * Returns the number of available execution slots at this point in time.\n\t */\n\tpublic get executionSlots() {\n\t\treturn this.capacity - this.active;\n\t}\n\n\t/**\n\t * Returns the number of queue slots at this point in time.\n\t */\n\tpublic get queueSlots() {\n\t\treturn this.queueCapacity - this.queue.length;\n\t}\n\n\t/**\n\t * Bulkhead limits concurrent requests made.\n\t */\n\tconstructor(private readonly capacity: number, private readonly queueCapacity: number) { }\n\n\t/**\n\t * Executes the given function.\n\t * @param fn Function to execute\n\t * @throws a {@link BulkheadRejectedException} if the bulkhead limits are exceeeded\n\t */\n\tpublic async execute<T>(\n\t\tfn: (context: IDefaultPolicyContext) => PromiseLike<T> | T,\n\t\tsignal = neverAbortedSignal,\n\t): Promise<T> {\n\t\tif (signal.aborted) {\n\t\t\tthrow new TaskCancelledError();\n\t\t}\n\n\t\tif (this.active < this.capacity) {\n\t\t\tthis.active++;\n\t\t\ttry {\n\t\t\t\treturn await fn({ signal });\n\t\t\t} finally {\n\t\t\t\tthis.active--;\n\t\t\t\tthis.dequeue();\n\t\t\t}\n\t\t}\n\n\t\tif (this.queue.length >= this.queueCapacity) {\n\t\t\tthis.onRejectEmitter.emit();\n\t\t\tthrow new BulkheadRejectedError(this.capacity, this.queueCapacity);\n\t\t}\n\t\tconst { resolve, reject, promise } = defer<T>();\n\t\tthis.queue.push({ signal, fn, resolve, reject });\n\t\treturn promise;\n",
+		"fileName": "./2.tst"
+	},
+	"diffs": [
+		{
+			"originalRange": "[81,103)",
+			"modifiedRange": "[81,88)",
+			"innerChanges": [
+				{
+					"originalRange": "[81,26 -> 81,26]",
+					"modifiedRange": "[81,26 -> 81,27]"
+				},
+				{
+					"originalRange": "[81,48 -> 86,1 EOL]",
+					"modifiedRange": "[81,49 -> 81,49 EOL]"
+				},
+				{
+					"originalRange": "[87,1 -> 87,1]",
+					"modifiedRange": "[82,1 -> 82,2]"
+				},
+				{
+					"originalRange": "[88,1 -> 88,1]",
+					"modifiedRange": "[83,1 -> 83,2]"
+				},
+				{
+					"originalRange": "[89,1 -> 89,1]",
+					"modifiedRange": "[84,1 -> 84,2]"
+				},
+				{
+					"originalRange": "[90,1 -> 92,1]",
+					"modifiedRange": "[85,1 -> 85,1]"
+				},
+				{
+					"originalRange": "[92,9 -> 97,4]",
+					"modifiedRange": "[85,9 -> 85,29]"
+				},
+				{
+					"originalRange": "[97,10 -> 97,20 EOL]",
+					"modifiedRange": "[85,35 -> 85,51 EOL]"
+				},
+				{
+					"originalRange": "[98,3 -> 98,16]",
+					"modifiedRange": "[86,3 -> 86,3]"
+				},
+				{
+					"originalRange": "[98,21 -> 98,43]",
+					"modifiedRange": "[86,8 -> 86,21]"
+				},
+				{
+					"originalRange": "[98,49 -> 99,15]",
+					"modifiedRange": "[86,27 -> 86,33]"
+				},
+				{
+					"originalRange": "[99,22 -> 100,16]",
+					"modifiedRange": "[86,40 -> 86,42]"
+				},
+				{
+					"originalRange": "[100,22 -> 100,22]",
+					"modifiedRange": "[86,48 -> 86,50]"
+				},
+				{
+					"originalRange": "[101,2 -> 102,2 EOL]",
+					"modifiedRange": "[87,2 -> 87,18 EOL]"
+				}
+			]
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
index d12441499ea..851575355f8 100644
--- a/src/vs/monaco.d.ts
+++ b/src/vs/monaco.d.ts
@@ -2919,6 +2919,9 @@ declare namespace monaco.editor {
 	 * An event describing a change in the text of a model.
 	 */
 	export interface IModelContentChangedEvent {
+		/**
+		 * The changes are ordered from the end of the document to the beginning, so they should be safe to apply in sequence.
+		 */
 		readonly changes: IModelContentChange[];
 		/**
 		 * The (new) end-of-line character.
@@ -3677,6 +3680,11 @@ declare namespace monaco.editor {
 		 * Defaults to 'always'.
 		 */
 		matchBrackets?: 'never' | 'near' | 'always';
+		/**
+		 * Enable experimental rendering using WebGPU.
+		 * Defaults to 'off'.
+		 */
+		experimentalGpuAcceleration?: 'on' | 'off';
 		/**
 		 * Enable experimental whitespace rendering.
 		 * Defaults to 'svg'.
@@ -3780,6 +3788,10 @@ declare namespace monaco.editor {
 		 * When enabled, this shows a preview of the drop location and triggers an `onDropIntoEditor` event.
 		 */
 		dropIntoEditor?: IDropIntoEditorOptions;
+		/**
+		 * Sets whether the new experimental edit context should be used instead of the text area.
+		 */
+		experimentalEditContextEnabled?: boolean;
 		/**
 		 * Controls support for changing how content is pasted into the editor.
 		 */
@@ -3821,6 +3833,11 @@ declare namespace monaco.editor {
 		 * and the diff editor has a width less than `renderSideBySideInlineBreakpoint`, the inline view is used.
 		 */
 		useInlineViewWhenSpaceIsLimited?: boolean;
+		/**
+		 * If set, the diff editor is optimized for small views.
+		 * Defaults to `false`.
+		*/
+		compactMode?: boolean;
 		/**
 		 * Timeout in milliseconds after which diff computation is cancelled.
 		 * Defaults to 5000.
@@ -3883,6 +3900,10 @@ declare namespace monaco.editor {
 			 */
 			showMoves?: boolean;
 			showEmptyDecorations?: boolean;
+			/**
+			 * Only applies when `renderSideBySide` is set to false.
+			*/
+			useTrueInlineView?: boolean;
 		};
 		/**
 		 * Is the diff editor inside another editor
@@ -4048,11 +4069,13 @@ declare namespace monaco.editor {
 		multipleDeclarations?: GoToLocationValues;
 		multipleImplementations?: GoToLocationValues;
 		multipleReferences?: GoToLocationValues;
+		multipleTests?: GoToLocationValues;
 		alternativeDefinitionCommand?: string;
 		alternativeTypeDefinitionCommand?: string;
 		alternativeDeclarationCommand?: string;
 		alternativeImplementationCommand?: string;
 		alternativeReferenceCommand?: string;
+		alternativeTestsCommand?: string;
 	}
 
 	/**
@@ -4267,6 +4290,11 @@ declare namespace monaco.editor {
 		 * Defaults to false.
 		 */
 		padding?: boolean;
+		/**
+		 * Maximum length for inlay hints per line
+		 * Set to 0 to have an unlimited length.
+		 */
+		maximumLength?: number;
 	}
 
 	/**
@@ -4546,6 +4574,7 @@ declare namespace monaco.editor {
 		*/
 		mode?: 'prefix' | 'subword' | 'subwordSmart';
 		showToolbar?: 'always' | 'onHover' | 'never';
+		syntaxHighlightingEnabled?: boolean;
 		suppressSuggestions?: boolean;
 		/**
 		 * Does not clear active inline suggestions when the editor loses focus.
@@ -4571,7 +4600,6 @@ declare namespace monaco.editor {
 		 * Does not clear active inline suggestions when the editor loses focus.
 		 */
 		keepOnBlur?: boolean;
-		backgroundColoring?: boolean;
 	}
 
 	export interface IBracketPairColorizationOptions {
@@ -4883,120 +4911,122 @@ declare namespace monaco.editor {
 		domReadOnly = 34,
 		dragAndDrop = 35,
 		dropIntoEditor = 36,
-		emptySelectionClipboard = 37,
-		experimentalWhitespaceRendering = 38,
-		extraEditorClassName = 39,
-		fastScrollSensitivity = 40,
-		find = 41,
-		fixedOverflowWidgets = 42,
-		folding = 43,
-		foldingStrategy = 44,
-		foldingHighlight = 45,
-		foldingImportsByDefault = 46,
-		foldingMaximumRegions = 47,
-		unfoldOnClickAfterEndOfLine = 48,
-		fontFamily = 49,
-		fontInfo = 50,
-		fontLigatures = 51,
-		fontSize = 52,
-		fontWeight = 53,
-		fontVariations = 54,
-		formatOnPaste = 55,
-		formatOnType = 56,
-		glyphMargin = 57,
-		gotoLocation = 58,
-		hideCursorInOverviewRuler = 59,
-		hover = 60,
-		inDiffEditor = 61,
-		inlineSuggest = 62,
-		inlineEdit = 63,
-		letterSpacing = 64,
-		lightbulb = 65,
-		lineDecorationsWidth = 66,
-		lineHeight = 67,
-		lineNumbers = 68,
-		lineNumbersMinChars = 69,
-		linkedEditing = 70,
-		links = 71,
-		matchBrackets = 72,
-		minimap = 73,
-		mouseStyle = 74,
-		mouseWheelScrollSensitivity = 75,
-		mouseWheelZoom = 76,
-		multiCursorMergeOverlapping = 77,
-		multiCursorModifier = 78,
-		multiCursorPaste = 79,
-		multiCursorLimit = 80,
-		occurrencesHighlight = 81,
-		overviewRulerBorder = 82,
-		overviewRulerLanes = 83,
-		padding = 84,
-		pasteAs = 85,
-		parameterHints = 86,
-		peekWidgetDefaultFocus = 87,
-		placeholder = 88,
-		definitionLinkOpensInPeek = 89,
-		quickSuggestions = 90,
-		quickSuggestionsDelay = 91,
-		readOnly = 92,
-		readOnlyMessage = 93,
-		renameOnType = 94,
-		renderControlCharacters = 95,
-		renderFinalNewline = 96,
-		renderLineHighlight = 97,
-		renderLineHighlightOnlyWhenFocus = 98,
-		renderValidationDecorations = 99,
-		renderWhitespace = 100,
-		revealHorizontalRightPadding = 101,
-		roundedSelection = 102,
-		rulers = 103,
-		scrollbar = 104,
-		scrollBeyondLastColumn = 105,
-		scrollBeyondLastLine = 106,
-		scrollPredominantAxis = 107,
-		selectionClipboard = 108,
-		selectionHighlight = 109,
-		selectOnLineNumbers = 110,
-		showFoldingControls = 111,
-		showUnused = 112,
-		snippetSuggestions = 113,
-		smartSelect = 114,
-		smoothScrolling = 115,
-		stickyScroll = 116,
-		stickyTabStops = 117,
-		stopRenderingLineAfter = 118,
-		suggest = 119,
-		suggestFontSize = 120,
-		suggestLineHeight = 121,
-		suggestOnTriggerCharacters = 122,
-		suggestSelection = 123,
-		tabCompletion = 124,
-		tabIndex = 125,
-		unicodeHighlighting = 126,
-		unusualLineTerminators = 127,
-		useShadowDOM = 128,
-		useTabStops = 129,
-		wordBreak = 130,
-		wordSegmenterLocales = 131,
-		wordSeparators = 132,
-		wordWrap = 133,
-		wordWrapBreakAfterCharacters = 134,
-		wordWrapBreakBeforeCharacters = 135,
-		wordWrapColumn = 136,
-		wordWrapOverride1 = 137,
-		wordWrapOverride2 = 138,
-		wrappingIndent = 139,
-		wrappingStrategy = 140,
-		showDeprecated = 141,
-		inlayHints = 142,
-		editorClassName = 143,
-		pixelRatio = 144,
-		tabFocusMode = 145,
-		layoutInfo = 146,
-		wrappingInfo = 147,
-		defaultColorDecorators = 148,
-		colorDecoratorsActivatedOn = 149,
-		inlineCompletionsAccessibilityVerbose = 150
+		experimentalEditContextEnabled = 37,
+		emptySelectionClipboard = 38,
+		experimentalGpuAcceleration = 39,
+		experimentalWhitespaceRendering = 40,
+		extraEditorClassName = 41,
+		fastScrollSensitivity = 42,
+		find = 43,
+		fixedOverflowWidgets = 44,
+		folding = 45,
+		foldingStrategy = 46,
+		foldingHighlight = 47,
+		foldingImportsByDefault = 48,
+		foldingMaximumRegions = 49,
+		unfoldOnClickAfterEndOfLine = 50,
+		fontFamily = 51,
+		fontInfo = 52,
+		fontLigatures = 53,
+		fontSize = 54,
+		fontWeight = 55,
+		fontVariations = 56,
+		formatOnPaste = 57,
+		formatOnType = 58,
+		glyphMargin = 59,
+		gotoLocation = 60,
+		hideCursorInOverviewRuler = 61,
+		hover = 62,
+		inDiffEditor = 63,
+		inlineSuggest = 64,
+		inlineEdit = 65,
+		letterSpacing = 66,
+		lightbulb = 67,
+		lineDecorationsWidth = 68,
+		lineHeight = 69,
+		lineNumbers = 70,
+		lineNumbersMinChars = 71,
+		linkedEditing = 72,
+		links = 73,
+		matchBrackets = 74,
+		minimap = 75,
+		mouseStyle = 76,
+		mouseWheelScrollSensitivity = 77,
+		mouseWheelZoom = 78,
+		multiCursorMergeOverlapping = 79,
+		multiCursorModifier = 80,
+		multiCursorPaste = 81,
+		multiCursorLimit = 82,
+		occurrencesHighlight = 83,
+		overviewRulerBorder = 84,
+		overviewRulerLanes = 85,
+		padding = 86,
+		pasteAs = 87,
+		parameterHints = 88,
+		peekWidgetDefaultFocus = 89,
+		placeholder = 90,
+		definitionLinkOpensInPeek = 91,
+		quickSuggestions = 92,
+		quickSuggestionsDelay = 93,
+		readOnly = 94,
+		readOnlyMessage = 95,
+		renameOnType = 96,
+		renderControlCharacters = 97,
+		renderFinalNewline = 98,
+		renderLineHighlight = 99,
+		renderLineHighlightOnlyWhenFocus = 100,
+		renderValidationDecorations = 101,
+		renderWhitespace = 102,
+		revealHorizontalRightPadding = 103,
+		roundedSelection = 104,
+		rulers = 105,
+		scrollbar = 106,
+		scrollBeyondLastColumn = 107,
+		scrollBeyondLastLine = 108,
+		scrollPredominantAxis = 109,
+		selectionClipboard = 110,
+		selectionHighlight = 111,
+		selectOnLineNumbers = 112,
+		showFoldingControls = 113,
+		showUnused = 114,
+		snippetSuggestions = 115,
+		smartSelect = 116,
+		smoothScrolling = 117,
+		stickyScroll = 118,
+		stickyTabStops = 119,
+		stopRenderingLineAfter = 120,
+		suggest = 121,
+		suggestFontSize = 122,
+		suggestLineHeight = 123,
+		suggestOnTriggerCharacters = 124,
+		suggestSelection = 125,
+		tabCompletion = 126,
+		tabIndex = 127,
+		unicodeHighlighting = 128,
+		unusualLineTerminators = 129,
+		useShadowDOM = 130,
+		useTabStops = 131,
+		wordBreak = 132,
+		wordSegmenterLocales = 133,
+		wordSeparators = 134,
+		wordWrap = 135,
+		wordWrapBreakAfterCharacters = 136,
+		wordWrapBreakBeforeCharacters = 137,
+		wordWrapColumn = 138,
+		wordWrapOverride1 = 139,
+		wordWrapOverride2 = 140,
+		wrappingIndent = 141,
+		wrappingStrategy = 142,
+		showDeprecated = 143,
+		inlayHints = 144,
+		editorClassName = 145,
+		pixelRatio = 146,
+		tabFocusMode = 147,
+		layoutInfo = 148,
+		wrappingInfo = 149,
+		defaultColorDecorators = 150,
+		colorDecoratorsActivatedOn = 151,
+		inlineCompletionsAccessibilityVerbose = 152
 	}
 
 	export const EditorOptions: {
@@ -5040,7 +5070,9 @@ declare namespace monaco.editor {
 		dragAndDrop: IEditorOption<EditorOption.dragAndDrop, boolean>;
 		emptySelectionClipboard: IEditorOption<EditorOption.emptySelectionClipboard, boolean>;
 		dropIntoEditor: IEditorOption<EditorOption.dropIntoEditor, Readonly<Required<IDropIntoEditorOptions>>>;
+		experimentalEditContextEnabled: IEditorOption<EditorOption.experimentalEditContextEnabled, boolean>;
 		stickyScroll: IEditorOption<EditorOption.stickyScroll, Readonly<Required<IEditorStickyScrollOptions>>>;
+		experimentalGpuAcceleration: IEditorOption<EditorOption.experimentalGpuAcceleration, 'on' | 'off'>;
 		experimentalWhitespaceRendering: IEditorOption<EditorOption.experimentalWhitespaceRendering, 'off' | 'svg' | 'font'>;
 		extraEditorClassName: IEditorOption<EditorOption.extraEditorClassName, string>;
 		fastScrollSensitivity: IEditorOption<EditorOption.fastScrollSensitivity, number>;
@@ -7202,6 +7234,7 @@ declare namespace monaco.languages {
 		 * Defaults to `false`.
 		*/
 		readonly completeBracketPairs?: boolean;
+		readonly isInlineEdit?: boolean;
 	}
 
 	export interface InlineCompletions<TItem extends InlineCompletion = InlineCompletion> {
@@ -8056,7 +8089,7 @@ declare namespace monaco.languages {
 
 	export interface MappedEditsContext {
 		/** The outer array is sorted by priority - from highest to lowest. The inner arrays contain elements of the same priority. */
-		documents: DocumentContextItem[][];
+		readonly documents: DocumentContextItem[][];
 	}
 
 	export interface MappedEditsProvider {
@@ -8065,7 +8098,7 @@ declare namespace monaco.languages {
 		 *
 		 * @param document The document to provide mapped edits for.
 		 * @param codeBlocks Code blocks that come from an LLM's reply.
-		 * 						"Insert at cursor" in the panel chat only sends one edit that the user clicks on, but inline chat can send multiple blocks and let the lang server decide what to do with them.
+		 * 						"Apply in Editor" in the panel chat only sends one edit that the user clicks on, but inline chat can send multiple blocks and let the lang server decide what to do with them.
 		 * @param context The context for providing mapped edits.
 		 * @param token A cancellation token.
 		 * @returns A provider result of text edits.
diff --git a/src/vs/nls.build.ts b/src/vs/nls.build.ts
deleted file mode 100644
index 05c063fa291..00000000000
--- a/src/vs/nls.build.ts
+++ /dev/null
@@ -1,88 +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 buildMap: { [name: string]: string[] } = {};
-const buildMapKeys: { [name: string]: string[] } = {};
-const entryPoints: { [entryPoint: string]: string[] } = {};
-
-export interface ILocalizeInfo {
-	key: string;
-	comment: string[];
-}
-
-export function localize(data: ILocalizeInfo | string, message: string, ...args: (string | number | boolean | undefined | null)[]): string {
-	throw new Error(`Not supported at build time!`);
-}
-
-export function localize2(data: ILocalizeInfo | string, message: string, ...args: (string | number | boolean | undefined | null)[]): never {
-	throw new Error(`Not supported at build time!`);
-}
-
-export function getConfiguredDefaultLocale(): string | undefined {
-	throw new Error(`Not supported at build time!`);
-}
-
-/**
- * Invoked by the loader at build-time
- */
-export function load(name: string, req: AMDLoader.IRelativeRequire, load: AMDLoader.IPluginLoadCallback, config: AMDLoader.IConfigurationOptions): void {
-	if (!name || name.length === 0) {
-		load({ localize, localize2, getConfiguredDefaultLocale });
-	} else {
-		req([name + '.nls', name + '.nls.keys'], function (messages: string[], keys: string[]) {
-			buildMap[name] = messages;
-			buildMapKeys[name] = keys;
-			load(messages);
-		});
-	}
-}
-
-/**
- * Invoked by the loader at build-time
- */
-export function write(pluginName: string, moduleName: string, write: AMDLoader.IPluginWriteCallback): void {
-	const entryPoint = write.getEntryPoint();
-
-	entryPoints[entryPoint] = entryPoints[entryPoint] || [];
-	entryPoints[entryPoint].push(moduleName);
-
-	if (moduleName !== entryPoint) {
-		write.asModule(pluginName + '!' + moduleName, 'define([\'vs/nls\', \'vs/nls!' + entryPoint + '\'], function(nls, data) { return nls.create("' + moduleName + '", data); });');
-	}
-}
-
-/**
- * Invoked by the loader at build-time
- */
-export function writeFile(pluginName: string, moduleName: string, req: AMDLoader.IRelativeRequire, write: AMDLoader.IPluginWriteFileCallback, config: AMDLoader.IConfigurationOptions): void {
-	if (entryPoints.hasOwnProperty(moduleName)) {
-		const fileName = req.toUrl(moduleName + '.nls.js');
-		const contents = [
-			'/*---------------------------------------------------------',
-			' * Copyright (c) Microsoft Corporation. All rights reserved.',
-			' *--------------------------------------------------------*/'
-		],
-			entries = entryPoints[moduleName];
-
-		const data: { [moduleName: string]: string[] } = {};
-		for (let i = 0; i < entries.length; i++) {
-			data[entries[i]] = buildMap[entries[i]];
-		}
-
-		contents.push('define("' + moduleName + '.nls", ' + JSON.stringify(data, null, '\t') + ');');
-		write(fileName, contents.join('\r\n'));
-	}
-}
-
-/**
- * Invoked by the loader at build-time
- */
-export function finishBuild(write: AMDLoader.IPluginWriteFileCallback): void {
-	write('nls.metadata.json', JSON.stringify({
-		keys: buildMapKeys,
-		messages: buildMap,
-		bundles: entryPoints
-	}, null, '\t'));
-}
diff --git a/src/vs/nls.messages.ts b/src/vs/nls.messages.ts
new file mode 100644
index 00000000000..2e8b096686b
--- /dev/null
+++ b/src/vs/nls.messages.ts
@@ -0,0 +1,17 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/*
+ * This module exists so that the AMD build of the monaco editor can replace this with an async loader plugin.
+ * If you add new functions to this module make sure that they are also provided in the AMD build of the monaco editor.
+ */
+
+export function getNLSMessages(): string[] {
+	return globalThis._VSCODE_NLS_MESSAGES;
+}
+
+export function getNLSLanguage(): string | undefined {
+	return globalThis._VSCODE_NLS_LANGUAGE;
+}
diff --git a/src/vs/nls.mock.ts b/src/vs/nls.mock.ts
deleted file mode 100644
index 5323c6c6340..00000000000
--- a/src/vs/nls.mock.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-export interface ILocalizeInfo {
-	key: string;
-	comment: string[];
-}
-
-export interface ILocalizedString {
-	original: string;
-	value: string;
-}
-
-function _format(message: string, args: any[]): string {
-	let result: string;
-	if (args.length === 0) {
-		result = message;
-	} else {
-		result = message.replace(/\{(\d+)\}/g, function (match, rest) {
-			const index = rest[0];
-			return typeof args[index] !== 'undefined' ? args[index] : match;
-		});
-	}
-	return result;
-}
-
-export function localize(data: ILocalizeInfo | string, message: string, ...args: any[]): string {
-	return _format(message, args);
-}
-
-export function localize2(data: ILocalizeInfo | string, message: string, ...args: any[]): ILocalizedString {
-	const res = _format(message, args);
-	return {
-		original: res,
-		value: res
-	};
-}
-
-export function getConfiguredDefaultLocale(_: string) {
-	return undefined;
-}
diff --git a/src/vs/nls.ts b/src/vs/nls.ts
index 233840e65ab..e730d0a761e 100644
--- a/src/vs/nls.ts
+++ b/src/vs/nls.ts
@@ -3,27 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-let isPseudo = (typeof document !== 'undefined' && document.location && document.location.hash.indexOf('pseudo=true') >= 0);
-const DEFAULT_TAG = 'i-default';
+// eslint-disable-next-line local/code-import-patterns
+import { getNLSLanguage, getNLSMessages } from './nls.messages.js';
+// eslint-disable-next-line local/code-import-patterns
+export { getNLSLanguage, getNLSMessages } from './nls.messages.js';
 
-interface INLSPluginConfig {
-	availableLanguages?: INLSPluginConfigAvailableLanguages;
-	loadBundle?: BundleLoader;
-	translationServiceUrl?: string;
-}
-
-export interface INLSPluginConfigAvailableLanguages {
-	'*'?: string;
-	[module: string]: string | undefined;
-}
-
-interface BundleLoader {
-	(bundle: string, locale: string | null, cb: (err: Error, messages: string[] | IBundledStrings) => void): void;
-}
-
-interface IBundledStrings {
-	[moduleId: string]: string[];
-}
+const isPseudo = getNLSLanguage() === 'pseudo' || (typeof document !== 'undefined' && document.location && typeof document.location.hash === 'string' && document.location.hash.indexOf('pseudo=true') >= 0);
 
 export interface ILocalizeInfo {
 	key: string;
@@ -35,30 +20,6 @@ export interface ILocalizedString {
 	value: string;
 }
 
-interface ILocalizeFunc {
-	(info: ILocalizeInfo, message: string, ...args: (string | number | boolean | undefined | null)[]): string;
-	(key: string, message: string, ...args: (string | number | boolean | undefined | null)[]): string;
-}
-
-interface IBoundLocalizeFunc {
-	(idx: number, defaultValue: null): string;
-}
-
-interface ILocalize2Func {
-	(info: ILocalizeInfo, message: string, ...args: (string | number | boolean | undefined | null)[]): ILocalizedString;
-	(key: string, message: string, ...args: (string | number | boolean | undefined | null)[]): ILocalizedString;
-}
-
-interface IBoundLocalize2Func {
-	(idx: number, defaultValue: string): ILocalizedString;
-}
-
-interface IConsumerAPI {
-	localize: ILocalizeFunc | IBoundLocalizeFunc;
-	localize2: ILocalize2Func | IBoundLocalize2Func;
-	getConfiguredDefaultLocale(stringFromLocalizeCall: string): string | undefined;
-}
-
 function _format(message: string, args: (string | number | boolean | undefined | null)[]): string {
 	let result: string;
 
@@ -86,49 +47,6 @@ function _format(message: string, args: (string | number | boolean | undefined |
 	return result;
 }
 
-function findLanguageForModule(config: INLSPluginConfigAvailableLanguages, name: string) {
-	let result = config[name];
-	if (result) {
-		return result;
-	}
-	result = config['*'];
-	if (result) {
-		return result;
-	}
-	return null;
-}
-
-function endWithSlash(path: string): string {
-	if (path.charAt(path.length - 1) === '/') {
-		return path;
-	}
-	return path + '/';
-}
-
-async function getMessagesFromTranslationsService(translationServiceUrl: string, language: string, name: string): Promise<string[] | IBundledStrings> {
-	const url = endWithSlash(translationServiceUrl) + endWithSlash(language) + 'vscode/' + endWithSlash(name);
-	const res = await fetch(url);
-	if (res.ok) {
-		const messages = await res.json() as string[] | IBundledStrings;
-		return messages;
-	}
-	throw new Error(`${res.status} - ${res.statusText}`);
-}
-
-function createScopedLocalize(scope: string[]): IBoundLocalizeFunc {
-	return function (idx: number, defaultValue: null) {
-		const restArgs = Array.prototype.slice.call(arguments, 2);
-		return _format(scope[idx], restArgs);
-	};
-}
-
-function createScopedLocalize2(scope: string[]): IBoundLocalize2Func {
-	return (idx: number, defaultValue: string, ...args) => ({
-		value: _format(scope[idx], args),
-		original: _format(defaultValue, args)
-	});
-}
-
 /**
  * Marks a string to be localized. Returns the localized string.
  *
@@ -160,10 +78,29 @@ export function localize(key: string, message: string, ...args: (string | number
 /**
  * @skipMangle
  */
-export function localize(data: ILocalizeInfo | string, message: string, ...args: (string | number | boolean | undefined | null)[]): string {
+export function localize(data: ILocalizeInfo | string /* | number when built */, message: string /* | null when built */, ...args: (string | number | boolean | undefined | null)[]): string {
+	if (typeof data === 'number') {
+		return _format(lookupMessage(data, message), args);
+	}
 	return _format(message, args);
 }
 
+/**
+ * Only used when built: Looks up the message in the global NLS table.
+ * This table is being made available as a global through bootstrapping
+ * depending on the target context.
+ */
+function lookupMessage(index: number, fallback: string | null): string {
+	const message = getNLSMessages()?.[index];
+	if (typeof message !== 'string') {
+		if (typeof fallback === 'string') {
+			return fallback;
+		}
+		throw new Error(`!!! NLS MISSING: ${index} !!!`);
+	}
+	return message;
+}
+
 /**
  * Marks a string to be localized. Returns an {@linkcode ILocalizedString}
  * which contains the localized string and the original string.
@@ -197,123 +134,107 @@ export function localize2(key: string, message: string, ...args: (string | numbe
 /**
  * @skipMangle
  */
-export function localize2(data: ILocalizeInfo | string, message: string, ...args: (string | number | boolean | undefined | null)[]): ILocalizedString {
-	const original = _format(message, args);
-	return {
-		value: original,
-		original
-	};
-}
-
-/**
- *
- * @param stringFromLocalizeCall You must pass in a string that was returned from a `nls.localize()` call
- * in order to ensure the loader plugin has been initialized before this function is called.
- */
-export function getConfiguredDefaultLocale(stringFromLocalizeCall: string): string | undefined;
-/**
- * @skipMangle
- */
-export function getConfiguredDefaultLocale(_: string): string | undefined {
-	// This returns undefined because this implementation isn't used and is overwritten by the loader
-	// when loaded.
-	return undefined;
-}
-
-/**
- * @skipMangle
- */
-export function setPseudoTranslation(value: boolean) {
-	isPseudo = value;
-}
-
-/**
- * Invoked in a built product at run-time
- * @skipMangle
- */
-export function create(key: string, data: IBundledStrings & IConsumerAPI): IConsumerAPI {
-	return {
-		localize: createScopedLocalize(data[key]),
-		localize2: createScopedLocalize2(data[key]),
-		getConfiguredDefaultLocale: data.getConfiguredDefaultLocale ?? ((_: string) => undefined)
-	};
-}
-
-/**
- * Invoked by the loader at run-time
- * @skipMangle
- */
-export function load(name: string, req: AMDLoader.IRelativeRequire, load: AMDLoader.IPluginLoadCallback, config: AMDLoader.IConfigurationOptions): void {
-	const pluginConfig: INLSPluginConfig = config['vs/nls'] ?? {};
-	if (!name || name.length === 0) {
-		// TODO: We need to give back the mangled names here
-		return load({
-			localize: localize,
-			localize2: localize2,
-			getConfiguredDefaultLocale: () => pluginConfig.availableLanguages?.['*']
-		} as IConsumerAPI);
-	}
-	const language = pluginConfig.availableLanguages ? findLanguageForModule(pluginConfig.availableLanguages, name) : null;
-	const useDefaultLanguage = language === null || language === DEFAULT_TAG;
-	let suffix = '.nls';
-	if (!useDefaultLanguage) {
-		suffix = suffix + '.' + language;
-	}
-	const messagesLoaded = (messages: string[] | IBundledStrings) => {
-		if (Array.isArray(messages)) {
-			(messages as any as IConsumerAPI).localize = createScopedLocalize(messages);
-			(messages as any as IConsumerAPI).localize2 = createScopedLocalize2(messages);
-		} else {
-			(messages as any as IConsumerAPI).localize = createScopedLocalize(messages[name]);
-			(messages as any as IConsumerAPI).localize2 = createScopedLocalize2(messages[name]);
-		}
-		(messages as any as IConsumerAPI).getConfiguredDefaultLocale = () => pluginConfig.availableLanguages?.['*'];
-		load(messages);
-	};
-	if (typeof pluginConfig.loadBundle === 'function') {
-		(pluginConfig.loadBundle as BundleLoader)(name, language, (err: Error, messages) => {
-			// We have an error. Load the English default strings to not fail
-			if (err) {
-				req([name + '.nls'], messagesLoaded);
-			} else {
-				messagesLoaded(messages);
-			}
-		});
-	} else if (pluginConfig.translationServiceUrl && !useDefaultLanguage) {
-		(async () => {
-			try {
-				const messages = await getMessagesFromTranslationsService(pluginConfig.translationServiceUrl!, language, name);
-				return messagesLoaded(messages);
-			} catch (err) {
-				// Language is already as generic as it gets, so require default messages
-				if (!language.includes('-')) {
-					console.error(err);
-					return req([name + '.nls'], messagesLoaded);
-				}
-				try {
-					// Since there is a dash, the language configured is a specific sub-language of the same generic language.
-					// Since we were unable to load the specific language, try to load the generic language. Ex. we failed to find a
-					// Swiss German (de-CH), so try to load the generic German (de) messages instead.
-					const genericLanguage = language.split('-')[0];
-					const messages = await getMessagesFromTranslationsService(pluginConfig.translationServiceUrl!, genericLanguage, name);
-					// We got some messages, so we configure the configuration to use the generic language for this session.
-					pluginConfig.availableLanguages ??= {};
-					pluginConfig.availableLanguages['*'] = genericLanguage;
-					return messagesLoaded(messages);
-				} catch (err) {
-					console.error(err);
-					return req([name + '.nls'], messagesLoaded);
-				}
-			}
-		})();
+export function localize2(data: ILocalizeInfo | string /* | number when built */, originalMessage: string, ...args: (string | number | boolean | undefined | null)[]): ILocalizedString {
+	let message: string;
+	if (typeof data === 'number') {
+		message = lookupMessage(data, originalMessage);
 	} else {
-		req([name + suffix], messagesLoaded, (err: Error) => {
-			if (suffix === '.nls') {
-				console.error('Failed trying to load default language strings', err);
-				return;
-			}
-			console.error(`Failed to load message bundle for language ${language}. Falling back to the default language:`, err);
-			req([name + '.nls'], messagesLoaded);
-		});
+		message = originalMessage;
 	}
+
+	const value = _format(message, args);
+
+	return {
+		value,
+		original: originalMessage === message ? value : _format(originalMessage, args)
+	};
 }
+
+export interface INLSLanguagePackConfiguration {
+
+	/**
+	 * The path to the translations config file that contains pointers to
+	 * all message bundles for `main` and extensions.
+	 */
+	readonly translationsConfigFile: string;
+
+	/**
+	 * The path to the file containing the translations for this language
+	 * pack as flat string array.
+	 */
+	readonly messagesFile: string;
+
+	/**
+	 * The path to the file that can be used to signal a corrupt language
+	 * pack, for example when reading the `messagesFile` fails. This will
+	 * instruct the application to re-create the cache on next startup.
+	 */
+	readonly corruptMarkerFile: string;
+}
+
+export interface INLSConfiguration {
+
+	/**
+	 * Locale as defined in `argv.json` or `app.getLocale()`.
+	 */
+	readonly userLocale: string;
+
+	/**
+	 * Locale as defined by the OS (e.g. `app.getPreferredSystemLanguages()`).
+	 */
+	readonly osLocale: string;
+
+	/**
+	 * The actual language of the UI that ends up being used considering `userLocale`
+	 * and `osLocale`.
+	 */
+	readonly resolvedLanguage: string;
+
+	/**
+	 * Defined if a language pack is used that is not the
+	 * default english language pack. This requires a language
+	 * pack to be installed as extension.
+	 */
+	readonly languagePack?: INLSLanguagePackConfiguration;
+
+	/**
+	 * The path to the file containing the default english messages
+	 * as flat string array. The file is only present in built
+	 * versions of the application.
+	 */
+	readonly defaultMessagesFile: string;
+
+	/**
+	 * Below properties are deprecated and only there to continue support
+	 * for `vscode-nls` module that depends on them.
+	 * Refs https://github.com/microsoft/vscode-nls/blob/main/src/node/main.ts#L36-L46
+	 */
+	/** @deprecated */
+	readonly locale: string;
+	/** @deprecated */
+	readonly availableLanguages: Record<string, string>;
+	/** @deprecated */
+	readonly _languagePackSupport?: boolean;
+	/** @deprecated */
+	readonly _languagePackId?: string;
+	/** @deprecated */
+	readonly _translationsConfigFile?: string;
+	/** @deprecated */
+	readonly _cacheRoot?: string;
+	/** @deprecated */
+	readonly _resolvedLanguagePackCoreLocation?: string;
+	/** @deprecated */
+	readonly _corruptedFile?: string;
+}
+
+export interface ILanguagePack {
+	readonly hash: string;
+	readonly label: string | undefined;
+	readonly extensions: {
+		readonly extensionIdentifier: { readonly id: string; readonly uuid?: string };
+		readonly version: string;
+	}[];
+	readonly translations: Record<string, string | undefined>;
+}
+
+export type ILanguagePacks = Record<string, ILanguagePack | undefined>;
diff --git a/src/vs/platform/accessibility/browser/accessibilityService.ts b/src/vs/platform/accessibility/browser/accessibilityService.ts
index bd84abbc6dc..b12806bf754 100644
--- a/src/vs/platform/accessibility/browser/accessibilityService.ts
+++ b/src/vs/platform/accessibility/browser/accessibilityService.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { addDisposableListener } from 'vs/base/browser/dom';
-import { alert, status } from 'vs/base/browser/ui/aria/aria';
-import { mainWindow } from 'vs/base/browser/window';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { AccessibilitySupport, CONTEXT_ACCESSIBILITY_MODE_ENABLED, IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
+import { addDisposableListener } from '../../../base/browser/dom.js';
+import { alert, status } from '../../../base/browser/ui/aria/aria.js';
+import { mainWindow } from '../../../base/browser/window.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { AccessibilitySupport, CONTEXT_ACCESSIBILITY_MODE_ENABLED, IAccessibilityService } from '../common/accessibility.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { IContextKey, IContextKeyService } from '../../contextkey/common/contextkey.js';
+import { ILayoutService } from '../../layout/browser/layoutService.js';
 
 export class AccessibilityService extends Disposable implements IAccessibilityService {
 	declare readonly _serviceBrand: undefined;
@@ -24,6 +24,9 @@ export class AccessibilityService extends Disposable implements IAccessibilitySe
 	protected _systemMotionReduced: boolean;
 	protected readonly _onDidChangeReducedMotion = new Emitter<void>();
 
+	private _linkUnderlinesEnabled: boolean;
+	protected readonly _onDidChangeLinkUnderline = new Emitter<void>();
+
 	constructor(
 		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
 		@ILayoutService private readonly _layoutService: ILayoutService,
@@ -50,7 +53,10 @@ export class AccessibilityService extends Disposable implements IAccessibilitySe
 		this._systemMotionReduced = reduceMotionMatcher.matches;
 		this._configMotionReduced = this._configurationService.getValue<'auto' | 'on' | 'off'>('workbench.reduceMotion');
 
+		this._linkUnderlinesEnabled = this._configurationService.getValue('accessibility.underlineLinks');
+
 		this.initReducedMotionListeners(reduceMotionMatcher);
+		this.initLinkUnderlineListeners();
 	}
 
 	private initReducedMotionListeners(reduceMotionMatcher: MediaQueryList) {
@@ -72,6 +78,29 @@ export class AccessibilityService extends Disposable implements IAccessibilitySe
 		this._register(this.onDidChangeReducedMotion(() => updateRootClasses()));
 	}
 
+	private initLinkUnderlineListeners() {
+		this._register(this._configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration('accessibility.underlineLinks')) {
+				const linkUnderlinesEnabled = this._configurationService.getValue<boolean>('accessibility.underlineLinks');
+				this._linkUnderlinesEnabled = linkUnderlinesEnabled;
+				this._onDidChangeLinkUnderline.fire();
+			}
+		}));
+
+		const updateLinkUnderlineClasses = () => {
+			const underlineLinks = this._linkUnderlinesEnabled;
+			this._layoutService.mainContainer.classList.toggle('underline-links', underlineLinks);
+		};
+
+		updateLinkUnderlineClasses();
+
+		this._register(this.onDidChangeLinkUnderlines(() => updateLinkUnderlineClasses()));
+	}
+
+	public onDidChangeLinkUnderlines(listener: () => void) {
+		return this._onDidChangeLinkUnderline.event(listener);
+	}
+
 	get onDidChangeScreenReaderOptimized(): Event<void> {
 		return this._onDidChangeScreenReaderOptimized.event;
 	}
diff --git a/src/vs/platform/accessibility/browser/accessibleView.ts b/src/vs/platform/accessibility/browser/accessibleView.ts
index d71a5871195..a7b7b572479 100644
--- a/src/vs/platform/accessibility/browser/accessibleView.ts
+++ b/src/vs/platform/accessibility/browser/accessibleView.ts
@@ -3,12 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding';
-import { IPickerQuickAccessItem } from 'vs/platform/quickinput/browser/pickerQuickAccess';
-import { Event } from 'vs/base/common/event';
-import { IAction } from 'vs/base/common/actions';
-import { IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { IKeyboardEvent } from '../../keybinding/common/keybinding.js';
+import { IPickerQuickAccessItem } from '../../quickinput/browser/pickerQuickAccess.js';
+import { Event } from '../../../base/common/event.js';
+import { IAction } from '../../../base/common/actions.js';
+import { IQuickPickItem } from '../../quickinput/common/quickInput.js';
+import { IDisposable, Disposable } from '../../../base/common/lifecycle.js';
 
 export const IAccessibleViewService = createDecorator<IAccessibleViewService>('accessibleViewService');
 
@@ -22,11 +23,17 @@ export const enum AccessibleViewProviderId {
 	InlineCompletions = 'inlineCompletions',
 	KeybindingsEditor = 'keybindingsEditor',
 	Notebook = 'notebook',
+	ReplEditor = 'replEditor',
 	Editor = 'editor',
 	Hover = 'hover',
 	Notification = 'notification',
 	EmptyEditorHint = 'emptyEditorHint',
-	Comments = 'comments'
+	Comments = 'comments',
+	CommentThread = 'commentThread',
+	Repl = 'repl',
+	ReplHelp = 'replHelp',
+	RunAndDebug = 'runAndDebug',
+	Walkthrough = 'walkthrough',
 }
 
 export const enum AccessibleViewType {
@@ -66,10 +73,15 @@ export interface IAccessibleViewOptions {
 	 * Keybinding items to configure
 	 */
 	configureKeybindingItems?: IQuickPickItem[];
+
+	/**
+	 * Keybinding items that are already configured
+	 */
+	configuredKeybindingItems?: IQuickPickItem[];
 }
 
 
-export interface IAccessibleViewContentProvider extends IBasicContentProvider {
+export interface IAccessibleViewContentProvider extends IBasicContentProvider, IDisposable {
 	id: AccessibleViewProviderId;
 	verbositySettingKey: string;
 	/**
@@ -102,6 +114,7 @@ export interface IPosition {
 
 export interface IAccessibleViewService {
 	readonly _serviceBrand: undefined;
+	// The provider will be disposed when the view is closed
 	show(provider: AccesibleViewContentProvider, position?: IPosition): void;
 	showLastProvider(id: AccessibleViewProviderId): void;
 	showAccessibleViewHelp(): void;
@@ -111,7 +124,7 @@ export interface IAccessibleViewService {
 	goToSymbol(): void;
 	disableHint(): void;
 	getPosition(id: AccessibleViewProviderId): IPosition | undefined;
-	setPosition(position: IPosition, reveal?: boolean): void;
+	setPosition(position: IPosition, reveal?: boolean, select?: boolean): void;
 	getLastPosition(): IPosition | undefined;
 	/**
 	 * If the setting is enabled, provides the open accessible view hint as a localized string.
@@ -119,7 +132,7 @@ export interface IAccessibleViewService {
 	 */
 	getOpenAriaHint(verbositySettingKey: string): string | null;
 	getCodeBlockContext(): ICodeBlockActionContext | undefined;
-	configureKeybindings(): void;
+	configureKeybindings(unassigned: boolean): void;
 	openHelpLink(): void;
 }
 
@@ -131,9 +144,9 @@ export interface ICodeBlockActionContext {
 	element: unknown;
 }
 
-export type AccesibleViewContentProvider = AdvancedContentProvider | ExtensionContentProvider;
+export type AccesibleViewContentProvider = AccessibleContentProvider | ExtensionContentProvider;
 
-export class AdvancedContentProvider implements IAccessibleViewContentProvider {
+export class AccessibleContentProvider extends Disposable implements IAccessibleViewContentProvider {
 
 	constructor(
 		public id: AccessibleViewProviderId,
@@ -143,16 +156,18 @@ export class AdvancedContentProvider implements IAccessibleViewContentProvider {
 		public verbositySettingKey: string,
 		public onOpen?: () => void,
 		public actions?: IAction[],
-		public next?: () => void,
-		public previous?: () => void,
+		public provideNextContent?: () => string | undefined,
+		public providePreviousContent?: () => string | undefined,
 		public onDidChangeContent?: Event<void>,
 		public onKeyDown?: (e: IKeyboardEvent) => void,
 		public getSymbols?: () => IAccessibleViewSymbol[],
 		public onDidRequestClearLastProvider?: Event<AccessibleViewProviderId>,
-	) { }
+	) {
+		super();
+	}
 }
 
-export class ExtensionContentProvider implements IBasicContentProvider {
+export class ExtensionContentProvider extends Disposable implements IBasicContentProvider {
 
 	constructor(
 		public readonly id: string,
@@ -160,21 +175,23 @@ export class ExtensionContentProvider implements IBasicContentProvider {
 		public provideContent: () => string,
 		public onClose: () => void,
 		public onOpen?: () => void,
-		public next?: () => void,
-		public previous?: () => void,
+		public provideNextContent?: () => string | undefined,
+		public providePreviousContent?: () => string | undefined,
 		public actions?: IAction[],
 		public onDidChangeContent?: Event<void>,
-	) { }
+	) {
+		super();
+	}
 }
 
-export interface IBasicContentProvider {
+export interface IBasicContentProvider extends IDisposable {
 	id: string;
 	options: IAccessibleViewOptions;
 	onClose(): void;
 	provideContent(): string;
 	onOpen?(): void;
 	actions?: IAction[];
-	previous?(): void;
-	next?(): void;
+	providePreviousContent?(): void;
+	provideNextContent?(): void;
 	onDidChangeContent?: Event<void>;
 }
diff --git a/src/vs/platform/accessibility/browser/accessibleViewRegistry.ts b/src/vs/platform/accessibility/browser/accessibleViewRegistry.ts
index 0a6369565bb..fd643b97def 100644
--- a/src/vs/platform/accessibility/browser/accessibleViewRegistry.ts
+++ b/src/vs/platform/accessibility/browser/accessibleViewRegistry.ts
@@ -3,20 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { AccessibleViewType, AdvancedContentProvider, ExtensionContentProvider } from 'vs/platform/accessibility/browser/accessibleView';
-import { ContextKeyExpression } from 'vs/platform/contextkey/common/contextkey';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { alert } from 'vs/base/browser/ui/aria/aria';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { AccessibleViewType, AccessibleContentProvider, ExtensionContentProvider } from './accessibleView.js';
+import { ContextKeyExpression } from '../../contextkey/common/contextkey.js';
+import { ServicesAccessor } from '../../instantiation/common/instantiation.js';
 
-export interface IAccessibleViewImplentation extends IDisposable {
+export interface IAccessibleViewImplentation {
 	type: AccessibleViewType;
 	priority: number;
 	name: string;
 	/**
 	 * @returns the provider or undefined if the view should not be shown
 	 */
-	getProvider: (accessor: ServicesAccessor) => AdvancedContentProvider | ExtensionContentProvider | undefined;
+	getProvider: (accessor: ServicesAccessor) => AccessibleContentProvider | ExtensionContentProvider | undefined;
 	when?: ContextKeyExpression | undefined;
 }
 
@@ -31,7 +30,6 @@ export const AccessibleViewRegistry = new class AccessibleViewRegistry {
 				if (idx !== -1) {
 					this._implementations.splice(idx, 1);
 				}
-				implementation.dispose();
 			}
 		};
 	}
@@ -41,16 +39,3 @@ export const AccessibleViewRegistry = new class AccessibleViewRegistry {
 	}
 };
 
-export function alertAccessibleViewFocusChange(index: number | undefined, length: number | undefined, type: 'next' | 'previous'): void {
-	if (index === undefined || length === undefined) {
-		return;
-	}
-	const number = index + 1;
-
-	if (type === 'next' && number + 1 <= length) {
-		alert(`Focused ${number + 1} of ${length}`);
-	} else if (type === 'previous' && number - 1 > 0) {
-		alert(`Focused ${number - 1} of ${length}`);
-	}
-	return;
-}
diff --git a/src/vs/platform/accessibility/common/accessibility.ts b/src/vs/platform/accessibility/common/accessibility.ts
index 3022a90e867..d12fb600dd5 100644
--- a/src/vs/platform/accessibility/common/accessibility.ts
+++ b/src/vs/platform/accessibility/common/accessibility.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { Event } from '../../../base/common/event.js';
+import { RawContextKey } from '../../contextkey/common/contextkey.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 export const IAccessibilityService = createDecorator<IAccessibilityService>('accessibilityService');
 
diff --git a/src/vs/platform/accessibility/test/common/testAccessibilityService.ts b/src/vs/platform/accessibility/test/common/testAccessibilityService.ts
index f8dbe1da875..3357330e6cd 100644
--- a/src/vs/platform/accessibility/test/common/testAccessibilityService.ts
+++ b/src/vs/platform/accessibility/test/common/testAccessibilityService.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { IAccessibilityService, AccessibilitySupport } from 'vs/platform/accessibility/common/accessibility';
+import { Event } from '../../../../base/common/event.js';
+import { IAccessibilityService, AccessibilitySupport } from '../../common/accessibility.js';
 
 export class TestAccessibilityService implements IAccessibilityService {
 
diff --git a/src/vs/platform/accessibilitySignal/browser/accessibilitySignalService.ts b/src/vs/platform/accessibilitySignal/browser/accessibilitySignalService.ts
index 65515c237ad..ed312b7113e 100644
--- a/src/vs/platform/accessibilitySignal/browser/accessibilitySignalService.ts
+++ b/src/vs/platform/accessibilitySignal/browser/accessibilitySignalService.ts
@@ -3,19 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CachedFunction } from 'vs/base/common/cache';
-import { getStructuralKey } from 'vs/base/common/equals';
-import { Event, IValueWithChangeEvent } from 'vs/base/common/event';
-import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { FileAccess } from 'vs/base/common/network';
-import { derived, observableFromEvent } from 'vs/base/common/observable';
-import { ValueWithChangeEventFromObservable } from 'vs/base/common/observableInternal/utils';
-import { localize } from 'vs/nls';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { observableConfigValue } from 'vs/platform/observable/common/platformObservableUtils';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { CachedFunction } from '../../../base/common/cache.js';
+import { getStructuralKey } from '../../../base/common/equals.js';
+import { Event, IValueWithChangeEvent } from '../../../base/common/event.js';
+import { Disposable, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { FileAccess } from '../../../base/common/network.js';
+import { derived, observableFromEvent, ValueWithChangeEventFromObservable } from '../../../base/common/observable.js';
+import { localize } from '../../../nls.js';
+import { IAccessibilityService } from '../../accessibility/common/accessibility.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { observableConfigValue } from '../../observable/common/platformObservableUtils.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
 
 export const IAccessibilitySignalService = createDecorator<IAccessibilitySignalService>('accessibilitySignalService');
 
@@ -26,7 +25,7 @@ export interface IAccessibilitySignalService {
 	playSignalLoop(signal: AccessibilitySignal, milliseconds: number): IDisposable;
 
 	getEnabledState(signal: AccessibilitySignal, userGesture: boolean, modality?: AccessibilityModality | undefined): IValueWithChangeEvent<boolean>;
-	getDelayMs(signal: AccessibilitySignal, modality: AccessibilityModality): number;
+	getDelayMs(signal: AccessibilitySignal, modality: AccessibilityModality, mode: 'line' | 'positional'): number;
 	/**
 	 * Avoid this method and prefer `.playSignal`!
 	 * Only use it when you want to play the sound regardless of enablement, e.g. in the settings quick pick.
@@ -67,7 +66,7 @@ export interface IAccessbilitySignalOptions {
 export class AccessibilitySignalService extends Disposable implements IAccessibilitySignalService {
 	readonly _serviceBrand: undefined;
 	private readonly sounds: Map<string, HTMLAudioElement> = new Map();
-	private readonly screenReaderAttached = observableFromEvent(
+	private readonly screenReaderAttached = observableFromEvent(this,
 		this.accessibilityService.onDidChangeScreenReaderOptimized,
 		() => /** @description accessibilityService.onDidChangeScreenReaderOptimized */ this.accessibilityService.isScreenReaderOptimized()
 	);
@@ -145,7 +144,7 @@ export class AccessibilitySignalService extends Disposable implements IAccessibi
 	}
 
 	private getVolumeInPercent(): number {
-		const volume = this.configurationService.getValue<number>('accessibilitySignals.volume');
+		const volume = this.configurationService.getValue<number>('accessibility.signalOptions.volume');
 		if (typeof volume !== 'number') {
 			return 50;
 		}
@@ -241,10 +240,19 @@ export class AccessibilitySignalService extends Disposable implements IAccessibi
 		return this.getEnabledState(signal, false).onDidChange;
 	}
 
-	public getDelayMs(signal: AccessibilitySignal, modality: AccessibilityModality): number {
-		const delaySettingsKey = signal.delaySettingsKey ?? 'accessibility.signalOptions.delays.general';
-		const delaySettingsValue: { sound: number; announcement: number } = this.configurationService.getValue(delaySettingsKey);
-		return modality === 'sound' ? delaySettingsValue.sound : delaySettingsValue.announcement;
+	public getDelayMs(signal: AccessibilitySignal, modality: AccessibilityModality, mode: 'line' | 'positional'): number {
+		if (!this.configurationService.getValue('accessibility.signalOptions.debouncePositionChanges')) {
+			return 0;
+		}
+		let value: { sound: number; announcement: number };
+		if (signal.name === AccessibilitySignal.errorAtPosition.name && mode === 'positional') {
+			value = this.configurationService.getValue('accessibility.signalOptions.experimental.delays.errorAtPosition');
+		} else if (signal.name === AccessibilitySignal.warningAtPosition.name && mode === 'positional') {
+			value = this.configurationService.getValue('accessibility.signalOptions.experimental.delays.warningAtPosition');
+		} else {
+			value = this.configurationService.getValue('accessibility.signalOptions.experimental.delays.general');
+		}
+		return modality === 'sound' ? value.sound : value.announcement;
 	}
 }
 
@@ -333,8 +341,7 @@ export class AccessibilitySignal {
 		public readonly legacySoundSettingsKey: string | undefined,
 		public readonly settingsKey: string,
 		public readonly legacyAnnouncementSettingsKey: string | undefined,
-		public readonly announcementMessage: string | undefined,
-		public readonly delaySettingsKey: string | undefined
+		public readonly announcementMessage: string | undefined
 	) { }
 
 	private static _signals = new Set<AccessibilitySignal>();
@@ -361,7 +368,6 @@ export class AccessibilitySignal {
 			options.settingsKey,
 			options.legacyAnnouncementSettingsKey,
 			options.announcementMessage,
-			options.delaySettingsKey
 		);
 		AccessibilitySignal._signals.add(signal);
 		return signal;
diff --git a/src/vs/platform/accessibilitySignal/browser/media/voiceRecordingStarted.mp3 b/src/vs/platform/accessibilitySignal/browser/media/voiceRecordingStarted.mp3
index 488754fdd58..3c7de8ca03b 100644
Binary files a/src/vs/platform/accessibilitySignal/browser/media/voiceRecordingStarted.mp3 and b/src/vs/platform/accessibilitySignal/browser/media/voiceRecordingStarted.mp3 differ
diff --git a/src/vs/platform/accessibilitySignal/browser/media/voiceRecordingStopped.mp3 b/src/vs/platform/accessibilitySignal/browser/media/voiceRecordingStopped.mp3
index 0532cf6b15a..d99bf74152d 100644
Binary files a/src/vs/platform/accessibilitySignal/browser/media/voiceRecordingStopped.mp3 and b/src/vs/platform/accessibilitySignal/browser/media/voiceRecordingStopped.mp3 differ
diff --git a/src/vs/platform/accessibilitySignal/browser/progressAccessibilitySignalScheduler.ts b/src/vs/platform/accessibilitySignal/browser/progressAccessibilitySignalScheduler.ts
index faa617f4566..40e28f2c578 100644
--- a/src/vs/platform/accessibilitySignal/browser/progressAccessibilitySignalScheduler.ts
+++ b/src/vs/platform/accessibilitySignal/browser/progressAccessibilitySignalScheduler.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { AccessibilitySignal, IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
+import { RunOnceScheduler } from '../../../base/common/async.js';
+import { Disposable, IDisposable } from '../../../base/common/lifecycle.js';
+import { AccessibilitySignal, IAccessibilitySignalService } from './accessibilitySignalService.js';
 
 const PROGRESS_SIGNAL_LOOP_DELAY = 5000;
 
diff --git a/src/vs/platform/action/common/action.ts b/src/vs/platform/action/common/action.ts
index c0f4c2dd053..67c67bf1128 100644
--- a/src/vs/platform/action/common/action.ts
+++ b/src/vs/platform/action/common/action.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI, UriDto } from 'vs/base/common/uri';
-import { ContextKeyExpression } from 'vs/platform/contextkey/common/contextkey';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { Categories } from './actionCommonCategories';
-import { ICommandMetadata } from 'vs/platform/commands/common/commands';
+import { URI, UriDto } from '../../../base/common/uri.js';
+import { ContextKeyExpression } from '../../contextkey/common/contextkey.js';
+import { ThemeIcon } from '../../../base/common/themables.js';
+import { Categories } from './actionCommonCategories.js';
+import { ICommandMetadata } from '../../commands/common/commands.js';
 
 export interface ILocalizedString {
 
diff --git a/src/vs/platform/action/common/actionCommonCategories.ts b/src/vs/platform/action/common/actionCommonCategories.ts
index dddc652d868..0d725e26993 100644
--- a/src/vs/platform/action/common/actionCommonCategories.ts
+++ b/src/vs/platform/action/common/actionCommonCategories.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize2 } from 'vs/nls';
+import { localize2 } from '../../../nls.js';
 
 export const Categories = Object.freeze({
 	View: localize2('view', 'View'),
diff --git a/src/vs/platform/actionWidget/browser/actionList.ts b/src/vs/platform/actionWidget/browser/actionList.ts
index 8eeeee2df29..9a48bf706a3 100644
--- a/src/vs/platform/actionWidget/browser/actionList.ts
+++ b/src/vs/platform/actionWidget/browser/actionList.ts
@@ -2,22 +2,22 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import * as dom from 'vs/base/browser/dom';
-import { KeybindingLabel } from 'vs/base/browser/ui/keybindingLabel/keybindingLabel';
-import { IListEvent, IListMouseEvent, IListRenderer, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { List } from 'vs/base/browser/ui/list/listWidget';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Codicon } from 'vs/base/common/codicons';
-import { ResolvedKeybinding } from 'vs/base/common/keybindings';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { OS } from 'vs/base/common/platform';
-import { ThemeIcon } from 'vs/base/common/themables';
-import 'vs/css!./actionWidget';
-import { localize } from 'vs/nls';
-import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { defaultListStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { asCssVariable } from 'vs/platform/theme/common/colorRegistry';
+import * as dom from '../../../base/browser/dom.js';
+import { KeybindingLabel } from '../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
+import { IListEvent, IListMouseEvent, IListRenderer, IListVirtualDelegate } from '../../../base/browser/ui/list/list.js';
+import { List } from '../../../base/browser/ui/list/listWidget.js';
+import { CancellationToken, CancellationTokenSource } from '../../../base/common/cancellation.js';
+import { Codicon } from '../../../base/common/codicons.js';
+import { ResolvedKeybinding } from '../../../base/common/keybindings.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { OS } from '../../../base/common/platform.js';
+import { ThemeIcon } from '../../../base/common/themables.js';
+import './actionWidget.css';
+import { localize } from '../../../nls.js';
+import { IContextViewService } from '../../contextview/browser/contextView.js';
+import { IKeybindingService } from '../../keybinding/common/keybinding.js';
+import { defaultListStyles } from '../../theme/browser/defaultStyles.js';
+import { asCssVariable } from '../../theme/common/colorRegistry.js';
 
 export const acceptSelectedActionCommand = 'acceptSelectedCodeAction';
 export const previewSelectedActionCommand = 'previewSelectedCodeAction';
diff --git a/src/vs/platform/actionWidget/browser/actionWidget.css b/src/vs/platform/actionWidget/browser/actionWidget.css
index 2354e1af5cd..d205c7ab791 100644
--- a/src/vs/platform/actionWidget/browser/actionWidget.css
+++ b/src/vs/platform/actionWidget/browser/actionWidget.css
@@ -12,9 +12,11 @@
 	display: block;
 	width: 100%;
 	border: 1px solid var(--vscode-editorWidget-border) !important;
-	border-radius: 2px;
-	background-color: var(--vscode-editorWidget-background);
-	color: var(--vscode-editorWidget-foreground);
+	border-radius: 5px;
+	background-color: var(--vscode-editorActionList-background);
+	color: var(--vscode-editorActionList-foreground);
+	padding: 4px;
+	box-shadow: 0 2px 8px var(--vscode-widget-shadow);
 }
 
 .context-view-block {
@@ -59,11 +61,12 @@
 	cursor: pointer;
 	touch-action: none;
 	width: 100%;
+	border-radius: 4px;
 }
 
 .action-widget .monaco-list .monaco-list-row.action.focused:not(.option-disabled) {
-	background-color: var(--vscode-quickInputList-focusBackground) !important;
-	color: var(--vscode-quickInputList-focusForeground);
+	background-color: var(--vscode-editorActionList-focusBackground) !important;
+	color: var(--vscode-editorActionList-focusForeground);
 	outline: 1px solid var(--vscode-menu-selectionBorder, transparent);
 	outline-offset: -1px;
 }
@@ -71,6 +74,11 @@
 .action-widget .monaco-list-row.group-header {
 	color: var(--vscode-descriptionForeground) !important;
 	font-weight: 600;
+	font-size: 12px;
+}
+
+.action-widget .monaco-list-row.group-header:not(:first-of-type) {
+	margin-top: 2px;
 }
 
 .action-widget .monaco-list .group-header,
@@ -88,7 +96,7 @@
 
 .action-widget .monaco-list-row.action {
 	display: flex;
-	gap: 6px;
+	gap: 8px;
 	align-items: center;
 }
 
@@ -124,8 +132,9 @@
 /* Action bar */
 
 .action-widget .action-widget-action-bar {
-	background-color: var(--vscode-editorHoverWidget-statusBarBackground);
+	background-color: var(--vscode-editorActionList-background);
 	border-top: 1px solid var(--vscode-editorHoverWidget-border);
+	margin-top: 2px;
 }
 
 .action-widget .action-widget-action-bar::before {
@@ -135,7 +144,7 @@
 }
 
 .action-widget .action-widget-action-bar .actions-container {
-	padding: 0 8px;
+	padding: 3px 8px 0;
 }
 
 .action-widget-action-bar .action-label {
diff --git a/src/vs/platform/actionWidget/browser/actionWidget.ts b/src/vs/platform/actionWidget/browser/actionWidget.ts
index e7b26382eae..450126a0f27 100644
--- a/src/vs/platform/actionWidget/browser/actionWidget.ts
+++ b/src/vs/platform/actionWidget/browser/actionWidget.ts
@@ -2,26 +2,26 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import * as dom from 'vs/base/browser/dom';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { IAnchor } from 'vs/base/browser/ui/contextview/contextview';
-import { IAction } from 'vs/base/common/actions';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Disposable, DisposableStore, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import 'vs/css!./actionWidget';
-import { localize, localize2 } from 'vs/nls';
-import { acceptSelectedActionCommand, ActionList, IActionListDelegate, IActionListItem, previewSelectedActionCommand } from 'vs/platform/actionWidget/browser/actionList';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { createDecorator, IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { inputActiveOptionBackground, registerColor } from 'vs/platform/theme/common/colorRegistry';
+import * as dom from '../../../base/browser/dom.js';
+import { ActionBar } from '../../../base/browser/ui/actionbar/actionbar.js';
+import { IAnchor } from '../../../base/browser/ui/contextview/contextview.js';
+import { IAction } from '../../../base/common/actions.js';
+import { KeyCode, KeyMod } from '../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore, IDisposable, MutableDisposable } from '../../../base/common/lifecycle.js';
+import './actionWidget.css';
+import { localize, localize2 } from '../../../nls.js';
+import { acceptSelectedActionCommand, ActionList, IActionListDelegate, IActionListItem, previewSelectedActionCommand } from './actionList.js';
+import { Action2, registerAction2 } from '../../actions/common/actions.js';
+import { IContextKeyService, RawContextKey } from '../../contextkey/common/contextkey.js';
+import { IContextViewService } from '../../contextview/browser/contextView.js';
+import { InstantiationType, registerSingleton } from '../../instantiation/common/extensions.js';
+import { createDecorator, IInstantiationService, ServicesAccessor } from '../../instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../keybinding/common/keybindingsRegistry.js';
+import { inputActiveOptionBackground, registerColor } from '../../theme/common/colorRegistry.js';
 
 registerColor(
 	'actionBar.toggledBackground',
-	{ dark: inputActiveOptionBackground, light: inputActiveOptionBackground, hcDark: inputActiveOptionBackground, hcLight: inputActiveOptionBackground, },
+	inputActiveOptionBackground,
 	localize('actionBar.toggledBackground', 'Background color for toggled action items in action bar.')
 );
 
diff --git a/src/vs/platform/actionWidget/common/actionWidget.ts b/src/vs/platform/actionWidget/common/actionWidget.ts
index bd1714df754..70bf0aecff6 100644
--- a/src/vs/platform/actionWidget/common/actionWidget.ts
+++ b/src/vs/platform/actionWidget/common/actionWidget.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable } from '../../../base/common/lifecycle.js';
 
 export interface ActionSet<T> extends IDisposable {
 	readonly validActions: readonly T[];
diff --git a/src/vs/platform/actions/browser/actionViewItemService.ts b/src/vs/platform/actions/browser/actionViewItemService.ts
new file mode 100644
index 00000000000..851b6c9117e
--- /dev/null
+++ b/src/vs/platform/actions/browser/actionViewItemService.ts
@@ -0,0 +1,82 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IActionViewItemProvider } from '../../../base/browser/ui/actionbar/actionbar.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { InstantiationType, registerSingleton } from '../../instantiation/common/extensions.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { MenuId } from '../common/actions.js';
+
+
+export const IActionViewItemService = createDecorator<IActionViewItemService>('IActionViewItemService');
+
+export interface IActionViewItemService {
+
+	_serviceBrand: undefined;
+
+	onDidChange: Event<MenuId>;
+
+	register(menu: MenuId, submenu: MenuId, provider: IActionViewItemProvider, event?: Event<unknown>): IDisposable;
+	register(menu: MenuId, commandId: string, provider: IActionViewItemProvider, event?: Event<unknown>): IDisposable;
+
+	lookUp(menu: MenuId, submenu: MenuId): IActionViewItemProvider | undefined;
+	lookUp(menu: MenuId, commandId: string): IActionViewItemProvider | undefined;
+}
+
+export class NullActionViewItemService implements IActionViewItemService {
+	_serviceBrand: undefined;
+
+	onDidChange: Event<MenuId> = Event.None;
+
+	register(menu: MenuId, commandId: string | MenuId, provider: IActionViewItemProvider, event?: Event<unknown>): IDisposable {
+		return Disposable.None;
+	}
+
+	lookUp(menu: MenuId, commandId: string | MenuId): IActionViewItemProvider | undefined {
+		return undefined;
+	}
+}
+
+class ActionViewItemService implements IActionViewItemService {
+
+	declare _serviceBrand: undefined;
+
+	private readonly _providers = new Map<string, IActionViewItemProvider>();
+
+	private readonly _onDidChange = new Emitter<MenuId>();
+	readonly onDidChange: Event<MenuId> = this._onDidChange.event;
+
+	dispose(): void {
+		this._onDidChange.dispose();
+	}
+
+	register(menu: MenuId, commandOrSubmenuId: string | MenuId, provider: IActionViewItemProvider, event?: Event<unknown>): IDisposable {
+		const id = this._makeKey(menu, commandOrSubmenuId);
+		if (this._providers.has(id)) {
+			throw new Error(`A provider for the command ${commandOrSubmenuId} and menu ${menu} is already registered.`);
+		}
+		this._providers.set(id, provider);
+
+		const listener = event?.(() => {
+			this._onDidChange.fire(menu);
+		});
+
+		return toDisposable(() => {
+			listener?.dispose();
+			this._providers.delete(id);
+		});
+	}
+
+	lookUp(menu: MenuId, commandOrMenuId: string | MenuId): IActionViewItemProvider | undefined {
+		return this._providers.get(this._makeKey(menu, commandOrMenuId));
+	}
+
+	private _makeKey(menu: MenuId, commandOrMenuId: string | MenuId) {
+		return `${menu.id}/${(commandOrMenuId instanceof MenuId ? commandOrMenuId.id : commandOrMenuId)}`;
+	}
+}
+
+registerSingleton(IActionViewItemService, ActionViewItemService, InstantiationType.Delayed);
diff --git a/src/vs/platform/actions/browser/buttonbar.ts b/src/vs/platform/actions/browser/buttonbar.ts
index c8d858d4677..57497a38352 100644
--- a/src/vs/platform/actions/browser/buttonbar.ts
+++ b/src/vs/platform/actions/browser/buttonbar.ts
@@ -3,21 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ButtonBar, IButton } from 'vs/base/browser/ui/button/button';
-import { createInstantHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { ActionRunner, IAction, IActionRunner, SubmenuAction, WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from 'vs/base/common/actions';
-import { Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { localize } from 'vs/nls';
-import { MenuId, IMenuService, MenuItemAction } from 'vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { ButtonBar, IButton } from '../../../base/browser/ui/button/button.js';
+import { createInstantHoverDelegate } from '../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { ActionRunner, IAction, IActionRunner, SubmenuAction, WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from '../../../base/common/actions.js';
+import { Codicon } from '../../../base/common/codicons.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../base/common/themables.js';
+import { localize } from '../../../nls.js';
+import { createAndFillInActionBarActions } from './menuEntryActionViewItem.js';
+import { IToolBarRenderOptions } from './toolbar.js';
+import { MenuId, IMenuService, MenuItemAction, IMenuActionOptions } from '../common/actions.js';
+import { IContextKeyService } from '../../contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../contextview/browser/contextView.js';
+import { IHoverService } from '../../hover/browser/hover.js';
+import { IKeybindingService } from '../../keybinding/common/keybinding.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
 
-export type IButtonConfigProvider = (action: IAction) => {
+export type IButtonConfigProvider = (action: IAction, index: number) => {
 	showIcon?: boolean;
 	showLabel?: boolean;
 	isSecondary?: boolean;
@@ -66,7 +69,7 @@ export class WorkbenchButtonBar extends ButtonBar {
 		super.dispose();
 	}
 
-	update(actions: IAction[]): void {
+	update(actions: IAction[], secondary: IAction[]): void {
 
 		const conifgProvider: IButtonConfigProvider = this._options?.buttonConfigProvider ?? (() => ({ showLabel: true }));
 
@@ -87,7 +90,7 @@ export class WorkbenchButtonBar extends ButtonBar {
 				const [first, ...rest] = actionOrSubmenu.actions;
 				action = <MenuItemAction>first;
 				btn = this.addButtonWithDropdown({
-					secondary: conifgProvider(action)?.isSecondary ?? secondary,
+					secondary: conifgProvider(action, i)?.isSecondary ?? secondary,
 					actionRunner: this._actionRunner,
 					actions: rest,
 					contextMenuProvider: this._contextMenuService,
@@ -96,19 +99,20 @@ export class WorkbenchButtonBar extends ButtonBar {
 			} else {
 				action = actionOrSubmenu;
 				btn = this.addButton({
-					secondary: conifgProvider(action)?.isSecondary ?? secondary,
+					secondary: conifgProvider(action, i)?.isSecondary ?? secondary,
 					ariaLabel: action.label
 				});
 			}
 
 			btn.enabled = action.enabled;
+			btn.checked = action.checked ?? false;
 			btn.element.classList.add('default-colors');
-			if (conifgProvider(action)?.showLabel ?? true) {
+			if (conifgProvider(action, i)?.showLabel ?? true) {
 				btn.label = action.label;
 			} else {
 				btn.element.classList.add('monaco-text-button');
 			}
-			if (conifgProvider(action)?.showIcon) {
+			if (conifgProvider(action, i)?.showIcon) {
 				if (action instanceof MenuItemAction && ThemeIcon.isThemeIcon(action.item.icon)) {
 					btn.icon = action.item.icon;
 				} else if (action.class) {
@@ -127,16 +131,46 @@ export class WorkbenchButtonBar extends ButtonBar {
 				this._actionRunner.run(action);
 			}));
 		}
+
+		if (secondary.length > 0) {
+
+			const btn = this.addButton({
+				secondary: true,
+				ariaLabel: localize('moreActions', "More Actions")
+			});
+
+			btn.icon = Codicon.dropDownButton;
+			btn.element.classList.add('default-colors', 'monaco-text-button');
+
+			btn.enabled = true;
+			this._updateStore.add(this._hoverService.setupManagedHover(hoverDelegate, btn.element, localize('moreActions', "More Actions")));
+			this._updateStore.add(btn.onDidClick(async () => {
+				this._contextMenuService.showContextMenu({
+					getAnchor: () => btn.element,
+					getActions: () => secondary,
+					actionRunner: this._actionRunner,
+					onHide: () => btn.element.setAttribute('aria-expanded', 'false')
+				});
+				btn.element.setAttribute('aria-expanded', 'true');
+
+			}));
+		}
 		this._onDidChange.fire(this);
 	}
 }
 
+export interface IMenuWorkbenchButtonBarOptions extends IWorkbenchButtonBarOptions {
+	menuOptions?: IMenuActionOptions;
+
+	toolbarOptions?: IToolBarRenderOptions;
+}
+
 export class MenuWorkbenchButtonBar extends WorkbenchButtonBar {
 
 	constructor(
 		container: HTMLElement,
 		menuId: MenuId,
-		options: IWorkbenchButtonBarOptions | undefined,
+		options: IMenuWorkbenchButtonBarOptions | undefined,
 		@IMenuService menuService: IMenuService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IContextMenuService contextMenuService: IContextMenuService,
@@ -153,12 +187,16 @@ export class MenuWorkbenchButtonBar extends WorkbenchButtonBar {
 
 			this.clear();
 
-			const actions = menu
-				.getActions({ renderShortTitle: true })
-				.flatMap(entry => entry[1]);
-
-			super.update(actions);
+			const primary: IAction[] = [];
+			const secondary: IAction[] = [];
+			createAndFillInActionBarActions(
+				menu,
+				options?.menuOptions,
+				{ primary, secondary },
+				options?.toolbarOptions?.primaryGroup
+			);
 
+			super.update(primary, secondary);
 		};
 		this._store.add(menu.onDidChange(update));
 		update();
diff --git a/src/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem.ts b/src/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem.ts
index 69883110543..e8f00698cf8 100644
--- a/src/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem.ts
+++ b/src/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { ActionViewItem, BaseActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { DropdownMenuActionViewItem } from 'vs/base/browser/ui/dropdown/dropdownActionViewItem';
-import { IAction, IActionRunner } from 'vs/base/common/actions';
-import { Event } from 'vs/base/common/event';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { ResolvedKeybinding } from 'vs/base/common/keybindings';
-import { MenuEntryActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { MenuItemAction } from 'vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { IHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate';
+import * as DOM from '../../../base/browser/dom.js';
+import { StandardKeyboardEvent } from '../../../base/browser/keyboardEvent.js';
+import { ActionViewItem, BaseActionViewItem } from '../../../base/browser/ui/actionbar/actionViewItems.js';
+import { DropdownMenuActionViewItem } from '../../../base/browser/ui/dropdown/dropdownActionViewItem.js';
+import { IAction, IActionRunner } from '../../../base/common/actions.js';
+import { Event } from '../../../base/common/event.js';
+import { KeyCode } from '../../../base/common/keyCodes.js';
+import { ResolvedKeybinding } from '../../../base/common/keybindings.js';
+import { MenuEntryActionViewItem } from './menuEntryActionViewItem.js';
+import { MenuItemAction } from '../common/actions.js';
+import { IContextKeyService } from '../../contextkey/common/contextkey.js';
+import { IKeybindingService } from '../../keybinding/common/keybinding.js';
+import { INotificationService } from '../../notification/common/notification.js';
+import { IThemeService } from '../../theme/common/themeService.js';
+import { IContextMenuService } from '../../contextview/browser/contextView.js';
+import { IAccessibilityService } from '../../accessibility/common/accessibility.js';
+import { IHoverDelegate } from '../../../base/browser/ui/hover/hoverDelegate.js';
 
 export interface IDropdownWithPrimaryActionViewItemOptions {
 	actionRunner?: IActionRunner;
@@ -29,7 +29,7 @@ export interface IDropdownWithPrimaryActionViewItemOptions {
 }
 
 export class DropdownWithPrimaryActionViewItem extends BaseActionViewItem {
-	private _primaryAction: ActionViewItem;
+	protected readonly _primaryAction: ActionViewItem;
 	private _dropdown: DropdownMenuActionViewItem;
 	private _container: HTMLElement | null = null;
 	private _dropdownContainer: HTMLElement | null = null;
@@ -41,10 +41,10 @@ export class DropdownWithPrimaryActionViewItem extends BaseActionViewItem {
 	constructor(
 		primaryAction: MenuItemAction,
 		dropdownAction: IAction,
-		dropdownMenuActions: IAction[],
+		dropdownMenuActions: readonly IAction[],
 		className: string,
-		private readonly _contextMenuProvider: IContextMenuService,
 		private readonly _options: IDropdownWithPrimaryActionViewItemOptions | undefined,
+		@IContextMenuService private readonly _contextMenuProvider: IContextMenuService,
 		@IKeybindingService _keybindingService: IKeybindingService,
 		@INotificationService _notificationService: INotificationService,
 		@IContextKeyService _contextKeyService: IContextKeyService,
@@ -61,7 +61,7 @@ export class DropdownWithPrimaryActionViewItem extends BaseActionViewItem {
 			menuAsChild: _options?.menuAsChild ?? true,
 			classNames: className ? ['codicon', 'codicon-chevron-down', className] : ['codicon', 'codicon-chevron-down'],
 			actionRunner: this._options?.actionRunner,
-			keybindingProvider: this._options?.getKeyBinding,
+			keybindingProvider: this._options?.getKeyBinding ?? (action => _keybindingService.lookupKeybinding(action.id)),
 			hoverDelegate: _options?.hoverDelegate
 		});
 	}
diff --git a/src/vs/platform/actions/browser/floatingMenu.ts b/src/vs/platform/actions/browser/floatingMenu.ts
index e7285146aa0..dc72cf005c3 100644
--- a/src/vs/platform/actions/browser/floatingMenu.ts
+++ b/src/vs/platform/actions/browser/floatingMenu.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { $, append, clearNode } from 'vs/base/browser/dom';
-import { Widget } from 'vs/base/browser/ui/widget';
-import { IAction } from 'vs/base/common/actions';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable, DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IMenu, IMenuService, MenuId } from 'vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { asCssVariable, asCssVariableWithDefault, buttonBackground, buttonForeground, contrastBorder, editorBackground, editorForeground } from 'vs/platform/theme/common/colorRegistry';
+import { $, append, clearNode } from '../../../base/browser/dom.js';
+import { Widget } from '../../../base/browser/ui/widget.js';
+import { IAction } from '../../../base/common/actions.js';
+import { Emitter } from '../../../base/common/event.js';
+import { Disposable, DisposableStore, toDisposable } from '../../../base/common/lifecycle.js';
+import { createAndFillInActionBarActions } from './menuEntryActionViewItem.js';
+import { IMenu, IMenuService, MenuId } from '../common/actions.js';
+import { IContextKeyService } from '../../contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../instantiation/common/instantiation.js';
+import { asCssVariable, asCssVariableWithDefault, buttonBackground, buttonForeground, contrastBorder, editorBackground, editorForeground } from '../../theme/common/colorRegistry.js';
 
 export class FloatingClickWidget extends Widget {
 
diff --git a/src/vs/platform/actions/browser/menuEntryActionViewItem.css b/src/vs/platform/actions/browser/menuEntryActionViewItem.css
index c5cba140485..7eb35af7e4b 100644
--- a/src/vs/platform/actions/browser/menuEntryActionViewItem.css
+++ b/src/vs/platform/actions/browser/menuEntryActionViewItem.css
@@ -11,6 +11,20 @@
 	background-size: 16px;
 }
 
+.monaco-action-bar .action-item.menu-entry.text-only .action-label {
+	color: var(--vscode-descriptionForeground);
+	overflow: hidden;
+	border-radius: 2px;
+}
+
+.monaco-action-bar .action-item.menu-entry.text-only.use-comma:not(:last-of-type) .action-label::after {
+	content: ', ';
+}
+
+.monaco-action-bar .action-item.menu-entry.text-only + .action-item:not(.text-only) > .monaco-dropdown .action-label {
+	color: var(--vscode-descriptionForeground);
+}
+
 .monaco-dropdown-with-default {
 	display: flex !important;
 	flex-direction: row;
diff --git a/src/vs/platform/actions/browser/menuEntryActionViewItem.ts b/src/vs/platform/actions/browser/menuEntryActionViewItem.ts
index da596a8fc6c..03080a71d7e 100644
--- a/src/vs/platform/actions/browser/menuEntryActionViewItem.ts
+++ b/src/vs/platform/actions/browser/menuEntryActionViewItem.ts
@@ -3,37 +3,53 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { $, addDisposableListener, append, asCSSUrl, EventType, ModifierKeyEmitter, prepend } from 'vs/base/browser/dom';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { ActionViewItem, BaseActionViewItem, SelectActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { DropdownMenuActionViewItem, IDropdownMenuActionViewItemOptions } from 'vs/base/browser/ui/dropdown/dropdownActionViewItem';
-import { ActionRunner, IAction, IRunEvent, Separator, SubmenuAction } from 'vs/base/common/actions';
-import { Event } from 'vs/base/common/event';
-import { UILabelProvider } from 'vs/base/common/keybindingLabels';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { combinedDisposable, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { isLinux, isWindows, OS } from 'vs/base/common/platform';
-import 'vs/css!./menuEntryActionViewItem';
-import { localize } from 'vs/nls';
-import { IMenu, IMenuActionOptions, IMenuService, MenuItemAction, SubmenuItemAction } from 'vs/platform/actions/common/actions';
-import { ICommandAction, isICommandActionToggleInfo } from 'vs/platform/action/common/action';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { isDark } from 'vs/platform/theme/common/theme';
-import { IHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate';
-import { assertType } from 'vs/base/common/types';
-import { asCssVariable, selectBorder } from 'vs/platform/theme/common/colorRegistry';
-import { defaultSelectBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
+import { $, addDisposableListener, append, asCSSUrl, EventType, ModifierKeyEmitter, prepend } from '../../../base/browser/dom.js';
+import { StandardKeyboardEvent } from '../../../base/browser/keyboardEvent.js';
+import { ActionViewItem, BaseActionViewItem, SelectActionViewItem } from '../../../base/browser/ui/actionbar/actionViewItems.js';
+import { DropdownMenuActionViewItem, IDropdownMenuActionViewItemOptions } from '../../../base/browser/ui/dropdown/dropdownActionViewItem.js';
+import { ActionRunner, IAction, IRunEvent, Separator, SubmenuAction } from '../../../base/common/actions.js';
+import { Event } from '../../../base/common/event.js';
+import { UILabelProvider } from '../../../base/common/keybindingLabels.js';
+import { KeyCode } from '../../../base/common/keyCodes.js';
+import { combinedDisposable, MutableDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { isLinux, isWindows, OS } from '../../../base/common/platform.js';
+import './menuEntryActionViewItem.css';
+import { localize } from '../../../nls.js';
+import { IMenu, IMenuActionOptions, IMenuService, MenuItemAction, SubmenuItemAction } from '../common/actions.js';
+import { ICommandAction, isICommandActionToggleInfo } from '../../action/common/action.js';
+import { IContextKeyService } from '../../contextkey/common/contextkey.js';
+import { IContextMenuService, IContextViewService } from '../../contextview/browser/contextView.js';
+import { IInstantiationService } from '../../instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../keybinding/common/keybinding.js';
+import { INotificationService } from '../../notification/common/notification.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../storage/common/storage.js';
+import { IThemeService } from '../../theme/common/themeService.js';
+import { ThemeIcon } from '../../../base/common/themables.js';
+import { isDark } from '../../theme/common/theme.js';
+import { IHoverDelegate } from '../../../base/browser/ui/hover/hoverDelegate.js';
+import { assertType } from '../../../base/common/types.js';
+import { asCssVariable, selectBorder } from '../../theme/common/colorRegistry.js';
+import { defaultSelectBoxStyles } from '../../theme/browser/defaultStyles.js';
+import { IAccessibilityService } from '../../accessibility/common/accessibility.js';
+import { ResolvedKeybinding } from '../../../base/common/keybindings.js';
+
+export function createAndFillInContextMenuActions(menu: IMenu, options: IMenuActionOptions | undefined, target: IAction[] | { primary: IAction[]; secondary: IAction[] }, primaryGroup?: string): void;
+export function createAndFillInContextMenuActions(menu: [string, Array<MenuItemAction | SubmenuItemAction>][], target: IAction[] | { primary: IAction[]; secondary: IAction[] }, primaryGroup?: string): void;
+export function createAndFillInContextMenuActions(menu: IMenu | [string, Array<MenuItemAction | SubmenuItemAction>][], optionsOrTarget: IMenuActionOptions | undefined | IAction[] | { primary: IAction[]; secondary: IAction[] }, targetOrPrimaryGroup?: IAction[] | { primary: IAction[]; secondary: IAction[] } | string, primaryGroupOrUndefined?: string): void {
+	let target: IAction[] | { primary: IAction[]; secondary: IAction[] };
+	let primaryGroup: string | ((actionGroup: string) => boolean) | undefined;
+	let groups: [string, Array<MenuItemAction | SubmenuItemAction>][];
+	if (Array.isArray(menu)) {
+		groups = menu;
+		target = optionsOrTarget as IAction[] | { primary: IAction[]; secondary: IAction[] };
+		primaryGroup = targetOrPrimaryGroup as string | undefined;
+	} else {
+		const options: IMenuActionOptions | undefined = optionsOrTarget as IMenuActionOptions | undefined;
+		groups = menu.getActions(options);
+		target = targetOrPrimaryGroup as IAction[] | { primary: IAction[]; secondary: IAction[] };
+		primaryGroup = primaryGroupOrUndefined;
+	}
 
-export function createAndFillInContextMenuActions(menu: IMenu, options: IMenuActionOptions | undefined, target: IAction[] | { primary: IAction[]; secondary: IAction[] }, primaryGroup?: string): void {
-	const groups = menu.getActions(options);
 	const modifierKeyEmitter = ModifierKeyEmitter.getInstance();
 	const useAlternativeActions = modifierKeyEmitter.keyStatus.altKey || ((isWindows || isLinux) && modifierKeyEmitter.keyStatus.shiftKey);
 	fillInActions(groups, target, useAlternativeActions, primaryGroup ? actionGroup => actionGroup === primaryGroup : actionGroup => actionGroup === 'navigation');
@@ -46,8 +62,42 @@ export function createAndFillInActionBarActions(
 	primaryGroup?: string | ((actionGroup: string) => boolean),
 	shouldInlineSubmenu?: (action: SubmenuAction, group: string, groupSize: number) => boolean,
 	useSeparatorsInPrimaryActions?: boolean
+): void;
+export function createAndFillInActionBarActions(
+	menu: [string, Array<MenuItemAction | SubmenuItemAction>][],
+	target: IAction[] | { primary: IAction[]; secondary: IAction[] },
+	primaryGroup?: string | ((actionGroup: string) => boolean),
+	shouldInlineSubmenu?: (action: SubmenuAction, group: string, groupSize: number) => boolean,
+	useSeparatorsInPrimaryActions?: boolean
+): void;
+export function createAndFillInActionBarActions(
+	menu: IMenu | [string, Array<MenuItemAction | SubmenuItemAction>][],
+	optionsOrTarget: IMenuActionOptions | undefined | IAction[] | { primary: IAction[]; secondary: IAction[] },
+	targetOrPrimaryGroup?: IAction[] | { primary: IAction[]; secondary: IAction[] } | string | ((actionGroup: string) => boolean),
+	primaryGroupOrShouldInlineSubmenu?: string | ((actionGroup: string) => boolean) | ((action: SubmenuAction, group: string, groupSize: number) => boolean),
+	shouldInlineSubmenuOrUseSeparatorsInPrimaryActions?: ((action: SubmenuAction, group: string, groupSize: number) => boolean) | boolean,
+	useSeparatorsInPrimaryActionsOrUndefined?: boolean
 ): void {
-	const groups = menu.getActions(options);
+	let target: IAction[] | { primary: IAction[]; secondary: IAction[] };
+	let primaryGroup: string | ((actionGroup: string) => boolean) | undefined;
+	let shouldInlineSubmenu: ((action: SubmenuAction, group: string, groupSize: number) => boolean) | undefined;
+	let useSeparatorsInPrimaryActions: boolean | undefined;
+	let groups: [string, Array<MenuItemAction | SubmenuItemAction>][];
+	if (Array.isArray(menu)) {
+		groups = menu;
+		target = optionsOrTarget as IAction[] | { primary: IAction[]; secondary: IAction[] };
+		primaryGroup = targetOrPrimaryGroup as string | ((actionGroup: string) => boolean) | undefined;
+		shouldInlineSubmenu = primaryGroupOrShouldInlineSubmenu as (action: SubmenuAction, group: string, groupSize: number) => boolean;
+		useSeparatorsInPrimaryActions = shouldInlineSubmenuOrUseSeparatorsInPrimaryActions as boolean | undefined;
+	} else {
+		const options: IMenuActionOptions | undefined = optionsOrTarget as IMenuActionOptions | undefined;
+		groups = menu.getActions(options);
+		target = targetOrPrimaryGroup as IAction[] | { primary: IAction[]; secondary: IAction[] };
+		primaryGroup = primaryGroupOrShouldInlineSubmenu as string | ((actionGroup: string) => boolean) | undefined;
+		shouldInlineSubmenu = shouldInlineSubmenuOrUseSeparatorsInPrimaryActions as (action: SubmenuAction, group: string, groupSize: number) => boolean;
+		useSeparatorsInPrimaryActions = useSeparatorsInPrimaryActionsOrUndefined;
+	}
+
 	const isPrimaryAction = typeof primaryGroup === 'string' ? (actionGroup: string) => actionGroup === primaryGroup : primaryGroup;
 
 	// Action bars handle alternative actions on their own so the alternative actions should be ignored
@@ -121,7 +171,7 @@ export interface IMenuEntryActionViewItemOptions {
 	hoverDelegate?: IHoverDelegate;
 }
 
-export class MenuEntryActionViewItem extends ActionViewItem {
+export class MenuEntryActionViewItem<T extends IMenuEntryActionViewItemOptions = IMenuEntryActionViewItemOptions> extends ActionViewItem {
 
 	private _wantsAltCommand: boolean = false;
 	private readonly _itemClassDispose = this._register(new MutableDisposable());
@@ -129,7 +179,7 @@ export class MenuEntryActionViewItem extends ActionViewItem {
 
 	constructor(
 		action: MenuItemAction,
-		options: IMenuEntryActionViewItemOptions | undefined,
+		protected _options: T | undefined,
 		@IKeybindingService protected readonly _keybindingService: IKeybindingService,
 		@INotificationService protected _notificationService: INotificationService,
 		@IContextKeyService protected _contextKeyService: IContextKeyService,
@@ -137,7 +187,7 @@ export class MenuEntryActionViewItem extends ActionViewItem {
 		@IContextMenuService protected _contextMenuService: IContextMenuService,
 		@IAccessibilityService private readonly _accessibilityService: IAccessibilityService
 	) {
-		super(undefined, action, { icon: !!(action.class || action.item.icon), label: !action.class && !action.item.icon, draggable: options?.draggable, keybinding: options?.keybinding, hoverDelegate: options?.hoverDelegate });
+		super(undefined, action, { icon: !!(action.class || action.item.icon), label: !action.class && !action.item.icon, draggable: _options?.draggable, keybinding: _options?.keybinding, hoverDelegate: _options?.hoverDelegate });
 		this._altKey = ModifierKeyEmitter.getInstance();
 	}
 
@@ -285,6 +335,45 @@ export class MenuEntryActionViewItem extends ActionViewItem {
 	}
 }
 
+export interface ITextOnlyMenuEntryActionViewItemOptions extends IMenuEntryActionViewItemOptions {
+	conversational?: boolean;
+	useComma?: boolean;
+}
+
+export class TextOnlyMenuEntryActionViewItem extends MenuEntryActionViewItem<ITextOnlyMenuEntryActionViewItemOptions> {
+
+	override render(container: HTMLElement): void {
+		this.options.label = true;
+		this.options.icon = false;
+		super.render(container);
+		container.classList.add('text-only');
+		container.classList.toggle('use-comma', this._options?.useComma ?? false);
+	}
+
+	protected override updateLabel() {
+		const kb = this._keybindingService.lookupKeybinding(this._action.id, this._contextKeyService);
+		if (!kb) {
+			return super.updateLabel();
+		}
+		if (this.label) {
+			const kb2 = TextOnlyMenuEntryActionViewItem._symbolPrintEnter(kb);
+
+			if (this._options?.conversational) {
+				this.label.textContent = localize({ key: 'content2', comment: ['A label with keybindg like "ESC to dismiss"'] }, '{1} to {0}', this._action.label, kb2);
+
+			} else {
+				this.label.textContent = localize({ key: 'content', comment: ['A label', 'A keybinding'] }, '{0} ({1})', this._action.label, kb2);
+			}
+		}
+	}
+
+	private static _symbolPrintEnter(kb: ResolvedKeybinding) {
+		return kb.getLabel()
+			?.replace(/\benter\b/gi, '\u23CE')
+			.replace(/\bEscape\b/gi, 'Esc');
+	}
+}
+
 export class SubmenuEntryActionViewItem extends DropdownMenuActionViewItem {
 
 	constructor(
diff --git a/src/vs/platform/actions/browser/toolbar.ts b/src/vs/platform/actions/browser/toolbar.ts
index 4857d4bc07b..741f946c6f8 100644
--- a/src/vs/platform/actions/browser/toolbar.ts
+++ b/src/vs/platform/actions/browser/toolbar.ts
@@ -3,25 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { addDisposableListener, getWindow } from 'vs/base/browser/dom';
-import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { IToolBarOptions, ToggleMenuAction, ToolBar } from 'vs/base/browser/ui/toolbar/toolbar';
-import { IAction, Separator, SubmenuAction, toAction, WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from 'vs/base/common/actions';
-import { coalesceInPlace } from 'vs/base/common/arrays';
-import { intersection } from 'vs/base/common/collections';
-import { BugIndicatingError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Iterable } from 'vs/base/common/iterator';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { localize } from 'vs/nls';
-import { createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IMenuActionOptions, IMenuService, MenuId, MenuItemAction, SubmenuItemAction } from 'vs/platform/actions/common/actions';
-import { createConfigureKeybindingAction } from 'vs/platform/actions/common/menuService';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { addDisposableListener, getWindow } from '../../../base/browser/dom.js';
+import { StandardMouseEvent } from '../../../base/browser/mouseEvent.js';
+import { IToolBarOptions, ToggleMenuAction, ToolBar } from '../../../base/browser/ui/toolbar/toolbar.js';
+import { IAction, Separator, SubmenuAction, toAction, WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from '../../../base/common/actions.js';
+import { coalesceInPlace } from '../../../base/common/arrays.js';
+import { intersection } from '../../../base/common/collections.js';
+import { BugIndicatingError } from '../../../base/common/errors.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Iterable } from '../../../base/common/iterator.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { localize } from '../../../nls.js';
+import { createActionViewItem, createAndFillInActionBarActions } from './menuEntryActionViewItem.js';
+import { IMenuActionOptions, IMenuService, MenuId, MenuItemAction, SubmenuItemAction } from '../common/actions.js';
+import { createConfigureKeybindingAction } from '../common/menuService.js';
+import { ICommandService } from '../../commands/common/commands.js';
+import { IContextKeyService } from '../../contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../contextview/browser/contextView.js';
+import { IKeybindingService } from '../../keybinding/common/keybinding.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
+import { IActionViewItemService } from './actionViewItemService.js';
+import { IInstantiationService } from '../../instantiation/common/instantiation.js';
 
 export const enum HiddenItemStrategy {
 	/** This toolbar doesn't support hiding*/
@@ -202,7 +204,9 @@ export class WorkbenchToolBar extends ToolBar {
 				if (action instanceof MenuItemAction && action.menuKeybinding) {
 					primaryActions.push(action.menuKeybinding);
 				} else if (!(action instanceof SubmenuItemAction || action instanceof ToggleMenuAction)) {
-					primaryActions.push(createConfigureKeybindingAction(action.id, undefined, this._commandService, this._keybindingService));
+					// only enable the configure keybinding action for actions that support keybindings
+					const supportsKeybindings = !!this._keybindingService.lookupKeybinding(action.id);
+					primaryActions.push(createConfigureKeybindingAction(this._commandService, this._keybindingService, action.id, undefined, supportsKeybindings));
 				}
 
 				// -- Hide Actions --
@@ -311,6 +315,11 @@ export interface IMenuWorkbenchToolBarOptions extends IWorkbenchToolBarOptions {
 	 * id is used.
 	 */
 	resetMenu?: undefined;
+
+	/**
+	 * Customize the debounce delay for menu updates
+	 */
+	eventDebounceDelay?: number;
 }
 
 /**
@@ -333,11 +342,27 @@ export class MenuWorkbenchToolBar extends WorkbenchToolBar {
 		@IKeybindingService keybindingService: IKeybindingService,
 		@ICommandService commandService: ICommandService,
 		@ITelemetryService telemetryService: ITelemetryService,
+		@IActionViewItemService actionViewService: IActionViewItemService,
+		@IInstantiationService instaService: IInstantiationService,
 	) {
-		super(container, { resetMenu: menuId, ...options }, menuService, contextKeyService, contextMenuService, keybindingService, commandService, telemetryService);
+		super(container, {
+			resetMenu: menuId,
+			...options,
+			actionViewItemProvider: (action, opts) => {
+				let provider = actionViewService.lookUp(menuId, action instanceof SubmenuItemAction ? action.item.submenu.id : action.id);
+				if (!provider) {
+					provider = options?.actionViewItemProvider;
+				}
+				const viewItem = provider?.(action, opts);
+				if (viewItem) {
+					return viewItem;
+				}
+				return createActionViewItem(instaService, action, opts);
+			}
+		}, menuService, contextKeyService, contextMenuService, keybindingService, commandService, telemetryService);
 
 		// update logic
-		const menu = this._store.add(menuService.createMenu(menuId, contextKeyService, { emitEventsForSubmenuChanges: true }));
+		const menu = this._store.add(menuService.createMenu(menuId, contextKeyService, { emitEventsForSubmenuChanges: true, eventDebounceDelay: options?.eventDebounceDelay }));
 		const updateToolbar = () => {
 			const primary: IAction[] = [];
 			const secondary: IAction[] = [];
@@ -355,6 +380,12 @@ export class MenuWorkbenchToolBar extends WorkbenchToolBar {
 			updateToolbar();
 			this._onDidChangeMenuItems.fire(this);
 		}));
+
+		this._store.add(actionViewService.onDidChange(e => {
+			if (e === menuId) {
+				updateToolbar();
+			}
+		}));
 		updateToolbar();
 	}
 
diff --git a/src/vs/platform/actions/common/actions.contribution.ts b/src/vs/platform/actions/common/actions.contribution.ts
index 4c0aa9037f3..d0c4c353e70 100644
--- a/src/vs/platform/actions/common/actions.contribution.ts
+++ b/src/vs/platform/actions/common/actions.contribution.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IMenuService, registerAction2 } from 'vs/platform/actions/common/actions';
-import { MenuHiddenStatesReset } from 'vs/platform/actions/common/menuResetAction';
-import { MenuService } from 'vs/platform/actions/common/menuService';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { IMenuService, registerAction2 } from './actions.js';
+import { MenuHiddenStatesReset } from './menuResetAction.js';
+import { MenuService } from './menuService.js';
+import { InstantiationType, registerSingleton } from '../../instantiation/common/extensions.js';
 
 registerSingleton(IMenuService, MenuService, InstantiationType.Delayed);
 
diff --git a/src/vs/platform/actions/common/actions.ts b/src/vs/platform/actions/common/actions.ts
index fa9bd76ed8a..b49b11c8687 100644
--- a/src/vs/platform/actions/common/actions.ts
+++ b/src/vs/platform/actions/common/actions.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IAction, SubmenuAction } from 'vs/base/common/actions';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { Event, MicrotaskEmitter } from 'vs/base/common/event';
-import { DisposableStore, dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { LinkedList } from 'vs/base/common/linkedList';
-import { ICommandAction, ICommandActionTitle, Icon, ILocalizedString } from 'vs/platform/action/common/action';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
-import { ContextKeyExpr, ContextKeyExpression, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { createDecorator, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingRule, KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { IAction, SubmenuAction } from '../../../base/common/actions.js';
+import { ThemeIcon } from '../../../base/common/themables.js';
+import { Event, MicrotaskEmitter } from '../../../base/common/event.js';
+import { DisposableStore, dispose, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { LinkedList } from '../../../base/common/linkedList.js';
+import { ICommandAction, ICommandActionTitle, Icon, ILocalizedString } from '../../action/common/action.js';
+import { Categories } from '../../action/common/actionCommonCategories.js';
+import { CommandsRegistry, ICommandService } from '../../commands/common/commands.js';
+import { ContextKeyExpr, ContextKeyExpression, IContextKeyService } from '../../contextkey/common/contextkey.js';
+import { createDecorator, ServicesAccessor } from '../../instantiation/common/instantiation.js';
+import { IKeybindingRule, KeybindingsRegistry } from '../../keybinding/common/keybindingsRegistry.js';
 
 export interface IMenuItem {
 	command: ICommandAction;
@@ -60,6 +60,8 @@ export class MenuId {
 	static readonly DebugWatchContext = new MenuId('DebugWatchContext');
 	static readonly DebugToolBar = new MenuId('DebugToolBar');
 	static readonly DebugToolBarStop = new MenuId('DebugToolBarStop');
+	static readonly DebugCallStackToolbar = new MenuId('DebugCallStackToolbar');
+	static readonly DebugCreateConfiguration = new MenuId('DebugCreateConfiguration');
 	static readonly EditorContext = new MenuId('EditorContext');
 	static readonly SimpleEditorContext = new MenuId('SimpleEditorContext');
 	static readonly EditorContent = new MenuId('EditorContent');
@@ -80,6 +82,7 @@ export class MenuId {
 	static readonly ExplorerContext = new MenuId('ExplorerContext');
 	static readonly ExplorerContextShare = new MenuId('ExplorerContextShare');
 	static readonly ExtensionContext = new MenuId('ExtensionContext');
+	static readonly ExtensionEditorContextMenu = new MenuId('ExtensionEditorContextMenu');
 	static readonly GlobalActivity = new MenuId('GlobalActivity');
 	static readonly CommandCenter = new MenuId('CommandCenter');
 	static readonly CommandCenterCenter = new MenuId('CommandCenterCenter');
@@ -111,17 +114,7 @@ export class MenuId {
 	static readonly OpenEditorsContextShare = new MenuId('OpenEditorsContextShare');
 	static readonly ProblemsPanelContext = new MenuId('ProblemsPanelContext');
 	static readonly SCMInputBox = new MenuId('SCMInputBox');
-	static readonly SCMChangesSeparator = new MenuId('SCMChangesSeparator');
-	static readonly SCMIncomingChanges = new MenuId('SCMIncomingChanges');
-	static readonly SCMIncomingChangesContext = new MenuId('SCMIncomingChangesContext');
-	static readonly SCMIncomingChangesSetting = new MenuId('SCMIncomingChangesSetting');
-	static readonly SCMOutgoingChanges = new MenuId('SCMOutgoingChanges');
-	static readonly SCMOutgoingChangesContext = new MenuId('SCMOutgoingChangesContext');
-	static readonly SCMOutgoingChangesSetting = new MenuId('SCMOutgoingChangesSetting');
-	static readonly SCMIncomingChangesAllChangesContext = new MenuId('SCMIncomingChangesAllChangesContext');
-	static readonly SCMIncomingChangesHistoryItemContext = new MenuId('SCMIncomingChangesHistoryItemContext');
-	static readonly SCMOutgoingChangesAllChangesContext = new MenuId('SCMOutgoingChangesAllChangesContext');
-	static readonly SCMOutgoingChangesHistoryItemContext = new MenuId('SCMOutgoingChangesHistoryItemContext');
+	static readonly SCMChangesContext = new MenuId('SCMChangesContext');
 	static readonly SCMChangeContext = new MenuId('SCMChangeContext');
 	static readonly SCMResourceContext = new MenuId('SCMResourceContext');
 	static readonly SCMResourceContextShare = new MenuId('SCMResourceContextShare');
@@ -130,6 +123,7 @@ export class MenuId {
 	static readonly SCMSourceControl = new MenuId('SCMSourceControl');
 	static readonly SCMSourceControlInline = new MenuId('SCMSourceControlInline');
 	static readonly SCMSourceControlTitle = new MenuId('SCMSourceControlTitle');
+	static readonly SCMHistoryTitle = new MenuId('SCMHistoryTitle');
 	static readonly SCMTitle = new MenuId('SCMTitle');
 	static readonly SearchContext = new MenuId('SearchContext');
 	static readonly SearchActionMenu = new MenuId('SearchActionContext');
@@ -138,10 +132,12 @@ export class MenuId {
 	static readonly StickyScrollContext = new MenuId('StickyScrollContext');
 	static readonly TestItem = new MenuId('TestItem');
 	static readonly TestItemGutter = new MenuId('TestItemGutter');
+	static readonly TestProfilesContext = new MenuId('TestProfilesContext');
 	static readonly TestMessageContext = new MenuId('TestMessageContext');
 	static readonly TestMessageContent = new MenuId('TestMessageContent');
 	static readonly TestPeekElement = new MenuId('TestPeekElement');
 	static readonly TestPeekTitle = new MenuId('TestPeekTitle');
+	static readonly TestCallStack = new MenuId('TestCallStack');
 	static readonly TouchBarContext = new MenuId('TouchBarContext');
 	static readonly TitleBarContext = new MenuId('TitleBarContext');
 	static readonly TitleBarTitleContext = new MenuId('TitleBarTitleContext');
@@ -171,6 +167,8 @@ export class MenuId {
 	static readonly InteractiveCellDelete = new MenuId('InteractiveCellDelete');
 	static readonly InteractiveCellExecute = new MenuId('InteractiveCellExecute');
 	static readonly InteractiveInputExecute = new MenuId('InteractiveInputExecute');
+	static readonly InteractiveInputConfig = new MenuId('InteractiveInputConfig');
+	static readonly ReplInputExecute = new MenuId('ReplInputExecute');
 	static readonly IssueReporter = new MenuId('IssueReporter');
 	static readonly NotebookToolbar = new MenuId('NotebookToolbar');
 	static readonly NotebookStickyScrollContext = new MenuId('NotebookStickyScrollContext');
@@ -183,6 +181,7 @@ export class MenuId {
 	static readonly NotebookCellExecuteGoTo = new MenuId('NotebookCellExecuteGoTo');
 	static readonly NotebookCellExecutePrimary = new MenuId('NotebookCellExecutePrimary');
 	static readonly NotebookDiffCellInputTitle = new MenuId('NotebookDiffCellInputTitle');
+	static readonly NotebookDiffDocumentMetadata = new MenuId('NotebookDiffDocumentMetadata');
 	static readonly NotebookDiffCellMetadataTitle = new MenuId('NotebookDiffCellMetadataTitle');
 	static readonly NotebookDiffCellOutputsTitle = new MenuId('NotebookDiffCellOutputsTitle');
 	static readonly NotebookOutputToolbar = new MenuId('NotebookOutputToolbar');
@@ -209,6 +208,7 @@ export class MenuId {
 	static readonly TerminalStickyScrollContext = new MenuId('TerminalStickyScrollContext');
 	static readonly WebviewContext = new MenuId('WebviewContext');
 	static readonly InlineCompletionsActions = new MenuId('InlineCompletionsActions');
+	static readonly InlineEditsActions = new MenuId('InlineEditsActions');
 	static readonly InlineEditActions = new MenuId('InlineEditActions');
 	static readonly NewFile = new MenuId('NewFile');
 	static readonly MergeInput1Toolbar = new MenuId('MergeToolbar1Toolbar');
@@ -221,9 +221,16 @@ export class MenuId {
 	static readonly ChatCodeBlock = new MenuId('ChatCodeblock');
 	static readonly ChatCompareBlock = new MenuId('ChatCompareBlock');
 	static readonly ChatMessageTitle = new MenuId('ChatMessageTitle');
+	static readonly ChatMessageFooter = new MenuId('ChatMessageFooter');
 	static readonly ChatExecute = new MenuId('ChatExecute');
 	static readonly ChatExecuteSecondary = new MenuId('ChatExecuteSecondary');
+	static readonly ChatInput = new MenuId('ChatInput');
 	static readonly ChatInputSide = new MenuId('ChatInputSide');
+	static readonly ChatEditingSessionWidgetToolbar = new MenuId('ChatEditingSession');
+	static readonly ChatInlineResourceAnchorContext = new MenuId('ChatInlineResourceAnchorContext');
+	static readonly ChatInlineSymbolAnchorContext = new MenuId('ChatInlineSymbolAnchorContext');
+	static readonly ChatCommandCenter = new MenuId('ChatCommandCenter');
+	static readonly ChatAttachmentsContext = new MenuId('ChatAttachmentsContext');
 	static readonly AccessibleView = new MenuId('AccessibleView');
 	static readonly MultiDiffEditorFileToolbar = new MenuId('MultiDiffEditorFileToolbar');
 	static readonly DiffEditorHunkToolbar = new MenuId('DiffEditorHunkToolbar');
@@ -271,6 +278,11 @@ export interface IMenu extends IDisposable {
 	getActions(options?: IMenuActionOptions): [string, Array<MenuItemAction | SubmenuItemAction>][];
 }
 
+export interface IMenuData {
+	contexts: ReadonlySet<string>;
+	actions: [string, Array<MenuItemAction | SubmenuItemAction>][];
+}
+
 export const IMenuService = createDecorator<IMenuService>('menuService');
 
 export interface IMenuCreateOptions {
@@ -283,6 +295,8 @@ export interface IMenuService {
 	readonly _serviceBrand: undefined;
 
 	/**
+	 * Consider using getMenuActions if you don't need to listen to events.
+	 *
 	 * Create a new menu for the given menu identifier. A menu sends events when it's entries
 	 * have changed (placement, enablement, checked-state). By default it does not send events for
 	 * submenu entries. That is more expensive and must be explicitly enabled with the
@@ -290,6 +304,16 @@ export interface IMenuService {
 	 */
 	createMenu(id: MenuId, contextKeyService: IContextKeyService, options?: IMenuCreateOptions): IMenu;
 
+	/**
+	 * Creates a new menu, gets the actions, and then disposes of the menu.
+	 */
+	getMenuActions(id: MenuId, contextKeyService: IContextKeyService, options?: IMenuActionOptions): [string, Array<MenuItemAction | SubmenuItemAction>][];
+
+	/**
+	 * Gets the names of the contexts that this menu listens on.
+	 */
+	getMenuContexts(id: MenuId): ReadonlySet<string>;
+
 	/**
 	 * Reset **all** menu item hidden states.
 	 */
@@ -444,7 +468,7 @@ export class SubmenuItemAction extends SubmenuAction {
 	constructor(
 		readonly item: ISubmenuItem,
 		readonly hideActions: IMenuItemHide | undefined,
-		actions: IAction[],
+		actions: readonly IAction[],
 	) {
 		super(`submenuitem.${item.submenu.id}`, typeof item.title === 'string' ? item.title : item.title.value, actions, 'submenu');
 	}
diff --git a/src/vs/platform/actions/common/menuResetAction.ts b/src/vs/platform/actions/common/menuResetAction.ts
index 01e77dd3c56..534931a7100 100644
--- a/src/vs/platform/actions/common/menuResetAction.ts
+++ b/src/vs/platform/actions/common/menuResetAction.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize2 } from 'vs/nls';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { Action2, IMenuService } from 'vs/platform/actions/common/actions';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
+import { localize2 } from '../../../nls.js';
+import { Categories } from '../../action/common/actionCommonCategories.js';
+import { Action2, IMenuService } from './actions.js';
+import { ServicesAccessor } from '../../instantiation/common/instantiation.js';
+import { ILogService } from '../../log/common/log.js';
 
 export class MenuHiddenStatesReset extends Action2 {
 
diff --git a/src/vs/platform/actions/common/menuService.ts b/src/vs/platform/actions/common/menuService.ts
index 61fefa8e4ae..f5b7046bbb9 100644
--- a/src/vs/platform/actions/common/menuService.ts
+++ b/src/vs/platform/actions/common/menuService.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { DebounceEmitter, Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { IMenu, IMenuActionOptions, IMenuChangeEvent, IMenuCreateOptions, IMenuItem, IMenuItemHide, IMenuService, isIMenuItem, isISubmenuItem, ISubmenuItem, MenuId, MenuItemAction, MenuRegistry, SubmenuItemAction } from 'vs/platform/actions/common/actions';
-import { ICommandAction, ILocalizedString } from 'vs/platform/action/common/action';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { ContextKeyExpression, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IAction, Separator, toAction } from 'vs/base/common/actions';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { removeFastWithoutKeepingOrder } from 'vs/base/common/arrays';
-import { localize } from 'vs/nls';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { RunOnceScheduler } from '../../../base/common/async.js';
+import { DebounceEmitter, Emitter, Event } from '../../../base/common/event.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { IMenu, IMenuActionOptions, IMenuChangeEvent, IMenuCreateOptions, IMenuItem, IMenuItemHide, IMenuService, isIMenuItem, isISubmenuItem, ISubmenuItem, MenuId, MenuItemAction, MenuRegistry, SubmenuItemAction } from './actions.js';
+import { ICommandAction, ILocalizedString } from '../../action/common/action.js';
+import { ICommandService } from '../../commands/common/commands.js';
+import { ContextKeyExpression, IContextKeyService } from '../../contextkey/common/contextkey.js';
+import { IAction, Separator, toAction } from '../../../base/common/actions.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../storage/common/storage.js';
+import { removeFastWithoutKeepingOrder } from '../../../base/common/arrays.js';
+import { localize } from '../../../nls.js';
+import { IKeybindingService } from '../../keybinding/common/keybinding.js';
 
 export class MenuService implements IMenuService {
 
@@ -34,6 +34,18 @@ export class MenuService implements IMenuService {
 		return new MenuImpl(id, this._hiddenStates, { emitEventsForSubmenuChanges: false, eventDebounceDelay: 50, ...options }, this._commandService, this._keybindingService, contextKeyService);
 	}
 
+	getMenuActions(id: MenuId, contextKeyService: IContextKeyService, options?: IMenuActionOptions): [string, Array<MenuItemAction | SubmenuItemAction>][] {
+		const menu = new MenuImpl(id, this._hiddenStates, { emitEventsForSubmenuChanges: false, eventDebounceDelay: 50, ...options }, this._commandService, this._keybindingService, contextKeyService);
+		const actions = menu.getActions(options);
+		menu.dispose();
+		return actions;
+	}
+
+	getMenuContexts(id: MenuId): ReadonlySet<string> {
+		const menuInfo = new MenuInfoSnapshot(id, false);
+		return new Set<string>([...menuInfo.structureContextKeys, ...menuInfo.preconditionContextKeys, ...menuInfo.toggledContextKeys]);
+	}
+
 	resetHiddenStates(ids?: MenuId[]): void {
 		this._hiddenStates.reset(ids);
 	}
@@ -152,24 +164,24 @@ class PersistedMenuHideState {
 
 type MenuItemGroup = [string, Array<IMenuItem | ISubmenuItem>];
 
-class MenuInfo {
-
-	private _menuGroups: MenuItemGroup[] = [];
+class MenuInfoSnapshot {
+	protected _menuGroups: MenuItemGroup[] = [];
+	private _allMenuIds: Set<MenuId> = new Set();
 	private _structureContextKeys: Set<string> = new Set();
 	private _preconditionContextKeys: Set<string> = new Set();
 	private _toggledContextKeys: Set<string> = new Set();
 
 	constructor(
-		private readonly _id: MenuId,
-		private readonly _hiddenStates: PersistedMenuHideState,
-		private readonly _collectContextKeysForSubmenus: boolean,
-		@ICommandService private readonly _commandService: ICommandService,
-		@IKeybindingService private readonly _keybindingService: IKeybindingService,
-		@IContextKeyService private readonly _contextKeyService: IContextKeyService
+		protected readonly _id: MenuId,
+		protected readonly _collectContextKeysForSubmenus: boolean,
 	) {
 		this.refresh();
 	}
 
+	get allMenuIds(): ReadonlySet<MenuId> {
+		return this._allMenuIds;
+	}
+
 	get structureContextKeys(): ReadonlySet<string> {
 		return this._structureContextKeys;
 	}
@@ -186,14 +198,13 @@ class MenuInfo {
 
 		// reset
 		this._menuGroups.length = 0;
+		this._allMenuIds.clear();
 		this._structureContextKeys.clear();
 		this._preconditionContextKeys.clear();
 		this._toggledContextKeys.clear();
 
-		const menuItems = MenuRegistry.getMenuItems(this._id);
-
+		const menuItems = this._sort(MenuRegistry.getMenuItems(this._id));
 		let group: MenuItemGroup | undefined;
-		menuItems.sort(MenuInfo._compareMenuItems);
 
 		for (const item of menuItems) {
 			// group by groupId
@@ -204,33 +215,65 @@ class MenuInfo {
 			}
 			group[1].push(item);
 
-			// keep keys for eventing
-			this._collectContextKeys(item);
+			// keep keys and submenu ids for eventing
+			this._collectContextKeysAndSubmenuIds(item);
 		}
+		this._allMenuIds.add(this._id);
 	}
 
-	private _collectContextKeys(item: IMenuItem | ISubmenuItem): void {
+	protected _sort(menuItems: (IMenuItem | ISubmenuItem)[]) {
+		// no sorting needed in snapshot
+		return menuItems;
+	}
 
-		MenuInfo._fillInKbExprKeys(item.when, this._structureContextKeys);
+	private _collectContextKeysAndSubmenuIds(item: IMenuItem | ISubmenuItem): void {
+
+		MenuInfoSnapshot._fillInKbExprKeys(item.when, this._structureContextKeys);
 
 		if (isIMenuItem(item)) {
 			// keep precondition keys for event if applicable
 			if (item.command.precondition) {
-				MenuInfo._fillInKbExprKeys(item.command.precondition, this._preconditionContextKeys);
+				MenuInfoSnapshot._fillInKbExprKeys(item.command.precondition, this._preconditionContextKeys);
 			}
 			// keep toggled keys for event if applicable
 			if (item.command.toggled) {
 				const toggledExpression: ContextKeyExpression = (item.command.toggled as { condition: ContextKeyExpression }).condition || item.command.toggled;
-				MenuInfo._fillInKbExprKeys(toggledExpression, this._toggledContextKeys);
+				MenuInfoSnapshot._fillInKbExprKeys(toggledExpression, this._toggledContextKeys);
 			}
 
 		} else if (this._collectContextKeysForSubmenus) {
 			// recursively collect context keys from submenus so that this
 			// menu fires events when context key changes affect submenus
-			MenuRegistry.getMenuItems(item.submenu).forEach(this._collectContextKeys, this);
+			MenuRegistry.getMenuItems(item.submenu).forEach(this._collectContextKeysAndSubmenuIds, this);
+
+			this._allMenuIds.add(item.submenu);
 		}
 	}
 
+	private static _fillInKbExprKeys(exp: ContextKeyExpression | undefined, set: Set<string>): void {
+		if (exp) {
+			for (const key of exp.keys()) {
+				set.add(key);
+			}
+		}
+	}
+
+}
+
+class MenuInfo extends MenuInfoSnapshot {
+
+	constructor(
+		_id: MenuId,
+		private readonly _hiddenStates: PersistedMenuHideState,
+		_collectContextKeysForSubmenus: boolean,
+		@ICommandService private readonly _commandService: ICommandService,
+		@IKeybindingService private readonly _keybindingService: IKeybindingService,
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService
+	) {
+		super(_id, _collectContextKeysForSubmenus);
+		this.refresh();
+	}
+
 	createActionGroups(options: IMenuActionOptions | undefined): [string, Array<MenuItemAction | SubmenuItemAction>][] {
 		const result: [string, Array<MenuItemAction | SubmenuItemAction>][] = [];
 
@@ -248,7 +291,7 @@ class MenuInfo {
 					const menuHide = createMenuHide(this._id, isMenuItem ? item.command : item, this._hiddenStates);
 					if (isMenuItem) {
 						// MenuItemAction
-						const menuKeybinding = createConfigureKeybindingAction(item.command.id, item.when, this._commandService, this._keybindingService);
+						const menuKeybinding = createConfigureKeybindingAction(this._commandService, this._keybindingService, item.command.id, item.when);
 						(activeActions ??= []).push(new MenuItemAction(item.command, item.alt, options, menuHide, menuKeybinding, this._contextKeyService, this._commandService));
 					} else {
 						// SubmenuItemAction
@@ -267,12 +310,8 @@ class MenuInfo {
 		return result;
 	}
 
-	private static _fillInKbExprKeys(exp: ContextKeyExpression | undefined, set: Set<string>): void {
-		if (exp) {
-			for (const key of exp.keys()) {
-				set.add(key);
-			}
-		}
+	protected override _sort(menuItems: (IMenuItem | ISubmenuItem)[]): (IMenuItem | ISubmenuItem)[] {
+		return menuItems.sort(MenuInfo._compareMenuItems);
 	}
 
 	private static _compareMenuItems(a: IMenuItem | ISubmenuItem, b: IMenuItem | ISubmenuItem): number {
@@ -353,8 +392,11 @@ class MenuImpl implements IMenu {
 		}, options.eventDebounceDelay);
 		this._disposables.add(rebuildMenuSoon);
 		this._disposables.add(MenuRegistry.onDidChangeMenu(e => {
-			if (e.has(id)) {
-				rebuildMenuSoon.schedule();
+			for (const id of this._menuInfo.allMenuIds) {
+				if (e.has(id)) {
+					rebuildMenuSoon.schedule();
+					break;
+				}
 			}
 		}));
 
@@ -442,10 +484,11 @@ function createMenuHide(menu: MenuId, command: ICommandAction | ISubmenuItem, st
 	};
 }
 
-export function createConfigureKeybindingAction(commandId: string, when: ContextKeyExpression | undefined = undefined, commandService: ICommandService, keybindingService: IKeybindingService): IAction {
+export function createConfigureKeybindingAction(commandService: ICommandService, keybindingService: IKeybindingService, commandId: string, when: ContextKeyExpression | undefined = undefined, enabled = true): IAction {
 	return toAction({
 		id: `configureKeybinding/${commandId}`,
 		label: localize('configure keybinding', "Configure Keybinding"),
+		enabled,
 		run() {
 			// Only set the when clause when there is no keybinding
 			// It is possible that the action and the keybinding have different when clauses
diff --git a/src/vs/platform/actions/test/common/menuService.test.ts b/src/vs/platform/actions/test/common/menuService.test.ts
index 8a3b2c421a9..b7044f46bd5 100644
--- a/src/vs/platform/actions/test/common/menuService.test.ts
+++ b/src/vs/platform/actions/test/common/menuService.test.ts
@@ -4,14 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { generateUuid } from 'vs/base/common/uuid';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { isIMenuItem, MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
-import { MenuService } from 'vs/platform/actions/common/menuService';
-import { NullCommandService } from 'vs/platform/commands/test/common/nullCommandService';
-import { MockContextKeyService, MockKeybindingService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { InMemoryStorageService } from 'vs/platform/storage/common/storage';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { isIMenuItem, MenuId, MenuRegistry } from '../../common/actions.js';
+import { MenuService } from '../../common/menuService.js';
+import { NullCommandService } from '../../../commands/test/common/nullCommandService.js';
+import { MockContextKeyService, MockKeybindingService } from '../../../keybinding/test/common/mockKeybindingService.js';
+import { InMemoryStorageService } from '../../../storage/common/storage.js';
 
 // --- service instances
 
diff --git a/src/vs/platform/assignment/common/assignment.ts b/src/vs/platform/assignment/common/assignment.ts
index 8a2fe3becf7..9910b4dd370 100644
--- a/src/vs/platform/assignment/common/assignment.ts
+++ b/src/vs/platform/assignment/common/assignment.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as platform from 'vs/base/common/platform';
+import * as platform from '../../../base/common/platform.js';
 import type { IExperimentationFilterProvider } from 'tas-client-umd';
 
 export const ASSIGNMENT_STORAGE_KEY = 'VSCode.ABExp.FeatureData';
diff --git a/src/vs/platform/assignment/common/assignmentService.ts b/src/vs/platform/assignment/common/assignmentService.ts
index c573b727e0b..413bd60f7ff 100644
--- a/src/vs/platform/assignment/common/assignmentService.ts
+++ b/src/vs/platform/assignment/common/assignmentService.ts
@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type { IExperimentationTelemetry, ExperimentationService as TASClient, IKeyValueStorage } from 'tas-client-umd';
-import { TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { getTelemetryLevel } from 'vs/platform/telemetry/common/telemetryUtils';
-import { AssignmentFilterProvider, ASSIGNMENT_REFETCH_INTERVAL, ASSIGNMENT_STORAGE_KEY, IAssignmentService, TargetPopulation } from 'vs/platform/assignment/common/assignment';
-import { importAMDNodeModule } from 'vs/amdX';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { TelemetryLevel } from '../../telemetry/common/telemetry.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { IProductService } from '../../product/common/productService.js';
+import { getTelemetryLevel } from '../../telemetry/common/telemetryUtils.js';
+import { AssignmentFilterProvider, ASSIGNMENT_REFETCH_INTERVAL, ASSIGNMENT_STORAGE_KEY, IAssignmentService, TargetPopulation } from './assignment.js';
+import { importAMDNodeModule } from '../../../amdX.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
 
 export abstract class BaseAssignmentService implements IAssignmentService {
 	_serviceBrand: undefined;
diff --git a/src/vs/platform/auxiliaryWindow/electron-main/auxiliaryWindow.ts b/src/vs/platform/auxiliaryWindow/electron-main/auxiliaryWindow.ts
index 0c49f0ac1e6..698f5c817a6 100644
--- a/src/vs/platform/auxiliaryWindow/electron-main/auxiliaryWindow.ts
+++ b/src/vs/platform/auxiliaryWindow/electron-main/auxiliaryWindow.ts
@@ -4,15 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { BrowserWindow, BrowserWindowConstructorOptions, WebContents } from 'electron';
-import { isLinux, isWindows } from 'vs/base/common/platform';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IEnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
-import { ILifecycleMainService } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IStateService } from 'vs/platform/state/node/state';
-import { hasNativeTitlebar } from 'vs/platform/window/common/window';
-import { IBaseWindow, WindowMode } from 'vs/platform/window/electron-main/window';
-import { BaseWindow } from 'vs/platform/windows/electron-main/windowImpl';
+import { isLinux, isWindows } from '../../../base/common/platform.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { IEnvironmentMainService } from '../../environment/electron-main/environmentMainService.js';
+import { ILifecycleMainService } from '../../lifecycle/electron-main/lifecycleMainService.js';
+import { ILogService } from '../../log/common/log.js';
+import { IStateService } from '../../state/node/state.js';
+import { hasNativeTitlebar, TitlebarStyle } from '../../window/common/window.js';
+import { IBaseWindow, WindowMode } from '../../window/electron-main/window.js';
+import { BaseWindow } from '../../windows/electron-main/windowImpl.js';
 
 export interface IAuxiliaryWindow extends IBaseWindow {
 	readonly parentId: number;
@@ -52,7 +52,7 @@ export class AuxiliaryWindow extends BaseWindow implements IAuxiliaryWindow {
 			return; // already disposed
 		}
 
-		this.doTryClaimWindow();
+		this.doTryClaimWindow(options);
 
 		if (options && !this.stateApplied) {
 			this.stateApplied = true;
@@ -72,7 +72,7 @@ export class AuxiliaryWindow extends BaseWindow implements IAuxiliaryWindow {
 		}
 	}
 
-	private doTryClaimWindow(): void {
+	private doTryClaimWindow(options?: BrowserWindowConstructorOptions): void {
 		if (this._win) {
 			return; // already claimed
 		}
@@ -82,11 +82,11 @@ export class AuxiliaryWindow extends BaseWindow implements IAuxiliaryWindow {
 			this.logService.trace('[aux window] Claimed browser window instance');
 
 			// Remember
-			this.setWin(window);
+			this.setWin(window, options);
 
 			// Disable Menu
 			window.setMenu(null);
-			if ((isWindows || isLinux) && hasNativeTitlebar(this.configurationService)) {
+			if ((isWindows || isLinux) && hasNativeTitlebar(this.configurationService, options?.titleBarStyle === 'hidden' ? TitlebarStyle.CUSTOM : undefined /* unknown */)) {
 				window.setAutoHideMenuBar(true); // Fix for https://github.com/microsoft/vscode/issues/200615
 			}
 
diff --git a/src/vs/platform/auxiliaryWindow/electron-main/auxiliaryWindows.ts b/src/vs/platform/auxiliaryWindow/electron-main/auxiliaryWindows.ts
index f79ec6bcbce..7384c57f4f4 100644
--- a/src/vs/platform/auxiliaryWindow/electron-main/auxiliaryWindows.ts
+++ b/src/vs/platform/auxiliaryWindow/electron-main/auxiliaryWindows.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { BrowserWindowConstructorOptions, HandlerDetails, WebContents } from 'electron';
-import { Event } from 'vs/base/common/event';
-import { IAuxiliaryWindow } from 'vs/platform/auxiliaryWindow/electron-main/auxiliaryWindow';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { Event } from '../../../base/common/event.js';
+import { IAuxiliaryWindow } from './auxiliaryWindow.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 export const IAuxiliaryWindowsMainService = createDecorator<IAuxiliaryWindowsMainService>('auxiliaryWindowsMainService');
 
diff --git a/src/vs/platform/auxiliaryWindow/electron-main/auxiliaryWindowsMainService.ts b/src/vs/platform/auxiliaryWindow/electron-main/auxiliaryWindowsMainService.ts
index a07b5535788..ea7abedf6f0 100644
--- a/src/vs/platform/auxiliaryWindow/electron-main/auxiliaryWindowsMainService.ts
+++ b/src/vs/platform/auxiliaryWindow/electron-main/auxiliaryWindowsMainService.ts
@@ -4,16 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { BrowserWindow, BrowserWindowConstructorOptions, HandlerDetails, WebContents, app } from 'electron';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { FileAccess } from 'vs/base/common/network';
-import { validatedIpcMain } from 'vs/base/parts/ipc/electron-main/ipcMain';
-import { AuxiliaryWindow, IAuxiliaryWindow } from 'vs/platform/auxiliaryWindow/electron-main/auxiliaryWindow';
-import { IAuxiliaryWindowsMainService } from 'vs/platform/auxiliaryWindow/electron-main/auxiliaryWindows';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IWindowState, WindowMode, defaultAuxWindowState } from 'vs/platform/window/electron-main/window';
-import { WindowStateValidator, defaultBrowserWindowOptions, getLastFocused } from 'vs/platform/windows/electron-main/windows';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable, DisposableStore, toDisposable } from '../../../base/common/lifecycle.js';
+import { FileAccess } from '../../../base/common/network.js';
+import { validatedIpcMain } from '../../../base/parts/ipc/electron-main/ipcMain.js';
+import { AuxiliaryWindow, IAuxiliaryWindow } from './auxiliaryWindow.js';
+import { IAuxiliaryWindowsMainService } from './auxiliaryWindows.js';
+import { IInstantiationService } from '../../instantiation/common/instantiation.js';
+import { ILogService } from '../../log/common/log.js';
+import { IWindowState, WindowMode, defaultAuxWindowState } from '../../window/electron-main/window.js';
+import { IDefaultBrowserWindowOptionsOverrides, WindowStateValidator, defaultBrowserWindowOptions, getLastFocused } from '../../windows/electron-main/windows.js';
 
 export class AuxiliaryWindowsMainService extends Disposable implements IAuxiliaryWindowsMainService {
 
@@ -88,13 +88,15 @@ export class AuxiliaryWindowsMainService extends Disposable implements IAuxiliar
 	}
 
 	createWindow(details: HandlerDetails): BrowserWindowConstructorOptions {
-		return this.instantiationService.invokeFunction(defaultBrowserWindowOptions, this.validateWindowState(details), {
+		const { state, overrides } = this.computeWindowStateAndOverrides(details);
+		return this.instantiationService.invokeFunction(defaultBrowserWindowOptions, state, overrides, {
 			preload: FileAccess.asFileUri('vs/base/parts/sandbox/electron-sandbox/preload-aux.js').fsPath
 		});
 	}
 
-	private validateWindowState(details: HandlerDetails): IWindowState {
+	private computeWindowStateAndOverrides(details: HandlerDetails): { readonly state: IWindowState; readonly overrides: IDefaultBrowserWindowOptionsOverrides } {
 		const windowState: IWindowState = {};
+		const overrides: IDefaultBrowserWindowOptionsOverrides = {};
 
 		const features = details.features.split(','); // for example: popup=yes,left=270,top=14.5,width=800,height=600
 		for (const feature of features) {
@@ -118,6 +120,12 @@ export class AuxiliaryWindowsMainService extends Disposable implements IAuxiliar
 				case 'window-fullscreen':
 					windowState.mode = WindowMode.Fullscreen;
 					break;
+				case 'window-disable-fullscreen':
+					overrides.disableFullscreen = true;
+					break;
+				case 'window-native-titlebar':
+					overrides.forceNativeTitlebar = true;
+					break;
 			}
 		}
 
@@ -125,7 +133,7 @@ export class AuxiliaryWindowsMainService extends Disposable implements IAuxiliar
 
 		this.logService.trace('[aux window] using window state', state);
 
-		return state;
+		return { state, overrides };
 	}
 
 	registerWindow(webContents: WebContents): void {
diff --git a/src/vs/platform/backup/common/backup.ts b/src/vs/platform/backup/common/backup.ts
index 8185dee3040..bfae94c8c4b 100644
--- a/src/vs/platform/backup/common/backup.ts
+++ b/src/vs/platform/backup/common/backup.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { IWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
+import { URI } from '../../../base/common/uri.js';
+import { IWorkspaceIdentifier } from '../../workspace/common/workspace.js';
 
 export interface IBaseBackupInfo {
 	remoteAuthority?: string;
diff --git a/src/vs/platform/backup/electron-main/backup.ts b/src/vs/platform/backup/electron-main/backup.ts
index 81ab8756fee..7da3ae1cfb5 100644
--- a/src/vs/platform/backup/electron-main/backup.ts
+++ b/src/vs/platform/backup/electron-main/backup.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IEmptyWindowBackupInfo } from 'vs/platform/backup/node/backup';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IFolderBackupInfo, IWorkspaceBackupInfo } from 'vs/platform/backup/common/backup';
+import { IEmptyWindowBackupInfo } from '../node/backup.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { IFolderBackupInfo, IWorkspaceBackupInfo } from '../common/backup.js';
 
 export const IBackupMainService = createDecorator<IBackupMainService>('backupMainService');
 
diff --git a/src/vs/platform/backup/electron-main/backupMainService.ts b/src/vs/platform/backup/electron-main/backupMainService.ts
index fd7b1ae2350..36287ebc981 100644
--- a/src/vs/platform/backup/electron-main/backupMainService.ts
+++ b/src/vs/platform/backup/electron-main/backupMainService.ts
@@ -4,22 +4,22 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { createHash } from 'crypto';
-import { isEqual } from 'vs/base/common/extpath';
-import { Schemas } from 'vs/base/common/network';
-import { join } from 'vs/base/common/path';
-import { isLinux } from 'vs/base/common/platform';
-import { extUriBiasedIgnorePathCase } from 'vs/base/common/resources';
-import { Promises, RimRafMode } from 'vs/base/node/pfs';
-import { IBackupMainService } from 'vs/platform/backup/electron-main/backup';
-import { ISerializedBackupWorkspaces, IEmptyWindowBackupInfo, isEmptyWindowBackupInfo, deserializeWorkspaceInfos, deserializeFolderInfos, ISerializedWorkspaceBackupInfo, ISerializedFolderBackupInfo, ISerializedEmptyWindowBackupInfo } from 'vs/platform/backup/node/backup';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IEnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
-import { IStateService } from 'vs/platform/state/node/state';
-import { HotExitConfiguration, IFilesConfiguration } from 'vs/platform/files/common/files';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IFolderBackupInfo, isFolderBackupInfo, IWorkspaceBackupInfo } from 'vs/platform/backup/common/backup';
-import { isWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
-import { createEmptyWorkspaceIdentifier } from 'vs/platform/workspaces/node/workspaces';
+import { isEqual } from '../../../base/common/extpath.js';
+import { Schemas } from '../../../base/common/network.js';
+import { join } from '../../../base/common/path.js';
+import { isLinux } from '../../../base/common/platform.js';
+import { extUriBiasedIgnorePathCase } from '../../../base/common/resources.js';
+import { Promises, RimRafMode } from '../../../base/node/pfs.js';
+import { IBackupMainService } from './backup.js';
+import { ISerializedBackupWorkspaces, IEmptyWindowBackupInfo, isEmptyWindowBackupInfo, deserializeWorkspaceInfos, deserializeFolderInfos, ISerializedWorkspaceBackupInfo, ISerializedFolderBackupInfo, ISerializedEmptyWindowBackupInfo } from '../node/backup.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { IEnvironmentMainService } from '../../environment/electron-main/environmentMainService.js';
+import { IStateService } from '../../state/node/state.js';
+import { HotExitConfiguration, IFilesConfiguration } from '../../files/common/files.js';
+import { ILogService } from '../../log/common/log.js';
+import { IFolderBackupInfo, isFolderBackupInfo, IWorkspaceBackupInfo } from '../common/backup.js';
+import { isWorkspaceIdentifier } from '../../workspace/common/workspace.js';
+import { createEmptyWorkspaceIdentifier } from '../../workspaces/node/workspaces.js';
 
 export class BackupMainService implements IBackupMainService {
 
diff --git a/src/vs/platform/backup/node/backup.ts b/src/vs/platform/backup/node/backup.ts
index fbe1952f68d..d26fa480267 100644
--- a/src/vs/platform/backup/node/backup.ts
+++ b/src/vs/platform/backup/node/backup.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { IBaseBackupInfo, IFolderBackupInfo, IWorkspaceBackupInfo } from 'vs/platform/backup/common/backup';
+import { URI } from '../../../base/common/uri.js';
+import { IBaseBackupInfo, IFolderBackupInfo, IWorkspaceBackupInfo } from '../common/backup.js';
 
 export interface IEmptyWindowBackupInfo extends IBaseBackupInfo {
 	readonly backupFolder: string;
diff --git a/src/vs/platform/backup/test/electron-main/backupMainService.test.ts b/src/vs/platform/backup/test/electron-main/backupMainService.test.ts
index 749cfa4e6e6..640f2eb5830 100644
--- a/src/vs/platform/backup/test/electron-main/backupMainService.test.ts
+++ b/src/vs/platform/backup/test/electron-main/backupMainService.test.ts
@@ -7,26 +7,26 @@ import assert from 'assert';
 import { createHash } from 'crypto';
 import * as fs from 'fs';
 import * as os from 'os';
-import { Schemas } from 'vs/base/common/network';
-import * as path from 'vs/base/common/path';
-import * as platform from 'vs/base/common/platform';
-import { isEqual } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { Promises } from 'vs/base/node/pfs';
-import { flakySuite, getRandomTestPath } from 'vs/base/test/node/testUtils';
-import { BackupMainService } from 'vs/platform/backup/electron-main/backupMainService';
-import { ISerializedBackupWorkspaces, ISerializedWorkspaceBackupInfo } from 'vs/platform/backup/node/backup';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { EnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
-import { OPTIONS, parseArgs } from 'vs/platform/environment/node/argv';
-import { HotExitConfiguration } from 'vs/platform/files/common/files';
-import { ConsoleMainLogger } from 'vs/platform/log/common/log';
-import product from 'vs/platform/product/common/product';
-import { IFolderBackupInfo, isFolderBackupInfo, IWorkspaceBackupInfo } from 'vs/platform/backup/common/backup';
-import { IWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
-import { InMemoryTestStateMainService } from 'vs/platform/test/electron-main/workbenchTestServices';
-import { LogService } from 'vs/platform/log/common/logService';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { Schemas } from '../../../../base/common/network.js';
+import * as path from '../../../../base/common/path.js';
+import * as platform from '../../../../base/common/platform.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Promises } from '../../../../base/node/pfs.js';
+import { flakySuite, getRandomTestPath } from '../../../../base/test/node/testUtils.js';
+import { BackupMainService } from '../../electron-main/backupMainService.js';
+import { ISerializedBackupWorkspaces, ISerializedWorkspaceBackupInfo } from '../../node/backup.js';
+import { TestConfigurationService } from '../../../configuration/test/common/testConfigurationService.js';
+import { EnvironmentMainService } from '../../../environment/electron-main/environmentMainService.js';
+import { OPTIONS, parseArgs } from '../../../environment/node/argv.js';
+import { HotExitConfiguration } from '../../../files/common/files.js';
+import { ConsoleMainLogger } from '../../../log/common/log.js';
+import product from '../../../product/common/product.js';
+import { IFolderBackupInfo, isFolderBackupInfo, IWorkspaceBackupInfo } from '../../common/backup.js';
+import { IWorkspaceIdentifier } from '../../../workspace/common/workspace.js';
+import { InMemoryTestStateMainService } from '../../../test/electron-main/workbenchTestServices.js';
+import { LogService } from '../../../log/common/logService.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 
 flakySuite('BackupMainService', () => {
 
@@ -131,7 +131,7 @@ flakySuite('BackupMainService', () => {
 
 		environmentService = new EnvironmentMainService(parseArgs(process.argv, OPTIONS), { _serviceBrand: undefined, ...product });
 
-		await Promises.mkdir(backupHome, { recursive: true });
+		await fs.promises.mkdir(backupHome, { recursive: true });
 
 		configService = new TestConfigurationService();
 		stateMainService = new InMemoryTestStateMainService();
@@ -584,8 +584,8 @@ flakySuite('BackupMainService', () => {
 			assert.strictEqual(((await service.getDirtyWorkspaces()).length), 0);
 
 			try {
-				await Promises.mkdir(path.join(folderBackupPath, Schemas.file), { recursive: true });
-				await Promises.mkdir(path.join(workspaceBackupPath, Schemas.untitled), { recursive: true });
+				await fs.promises.mkdir(path.join(folderBackupPath, Schemas.file), { recursive: true });
+				await fs.promises.mkdir(path.join(workspaceBackupPath, Schemas.untitled), { recursive: true });
 			} catch (error) {
 				// ignore - folder might exist already
 			}
diff --git a/src/vs/platform/checksum/common/checksumService.ts b/src/vs/platform/checksum/common/checksumService.ts
index 8437e9ed2e9..42a1f3e1fb5 100644
--- a/src/vs/platform/checksum/common/checksumService.ts
+++ b/src/vs/platform/checksum/common/checksumService.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { URI } from '../../../base/common/uri.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 export const IChecksumService = createDecorator<IChecksumService>('checksumService');
 
diff --git a/src/vs/platform/checksum/node/checksumService.ts b/src/vs/platform/checksum/node/checksumService.ts
index 707095fde87..afd388ad77b 100644
--- a/src/vs/platform/checksum/node/checksumService.ts
+++ b/src/vs/platform/checksum/node/checksumService.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { createHash } from 'crypto';
-import { listenStream } from 'vs/base/common/stream';
-import { URI } from 'vs/base/common/uri';
-import { IChecksumService } from 'vs/platform/checksum/common/checksumService';
-import { IFileService } from 'vs/platform/files/common/files';
+import { listenStream } from '../../../base/common/stream.js';
+import { URI } from '../../../base/common/uri.js';
+import { IChecksumService } from '../common/checksumService.js';
+import { IFileService } from '../../files/common/files.js';
 
 export class ChecksumService implements IChecksumService {
 
diff --git a/src/vs/platform/checksum/test/node/checksumService.test.ts b/src/vs/platform/checksum/test/node/checksumService.test.ts
index 5e7e71cdd7a..96f54b20dcd 100644
--- a/src/vs/platform/checksum/test/node/checksumService.test.ts
+++ b/src/vs/platform/checksum/test/node/checksumService.test.ts
@@ -4,14 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { FileAccess, Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ChecksumService } from 'vs/platform/checksum/node/checksumService';
-import { IFileService } from 'vs/platform/files/common/files';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
-import { NullLogService } from 'vs/platform/log/common/log';
+import { FileAccess, Schemas } from '../../../../base/common/network.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { ChecksumService } from '../../node/checksumService.js';
+import { IFileService } from '../../../files/common/files.js';
+import { FileService } from '../../../files/common/fileService.js';
+import { DiskFileSystemProvider } from '../../../files/node/diskFileSystemProvider.js';
+import { NullLogService } from '../../../log/common/log.js';
 
 suite('Checksum Service', () => {
 
diff --git a/src/vs/platform/clipboard/browser/clipboardService.ts b/src/vs/platform/clipboard/browser/clipboardService.ts
index d22b7bb5bc0..787d3dac4f8 100644
--- a/src/vs/platform/clipboard/browser/clipboardService.ts
+++ b/src/vs/platform/clipboard/browser/clipboardService.ts
@@ -3,17 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isSafari, isWebkitWebView } from 'vs/base/browser/browser';
-import { $, addDisposableListener, getActiveDocument, getActiveWindow, isHTMLElement, onDidRegisterWindow } from 'vs/base/browser/dom';
-import { mainWindow } from 'vs/base/browser/window';
-import { DeferredPromise } from 'vs/base/common/async';
-import { Event } from 'vs/base/common/event';
-import { hash } from 'vs/base/common/hash';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
-import { ILogService } from 'vs/platform/log/common/log';
+import { isSafari, isWebkitWebView } from '../../../base/browser/browser.js';
+import { $, addDisposableListener, getActiveDocument, getActiveWindow, isHTMLElement, onDidRegisterWindow } from '../../../base/browser/dom.js';
+import { mainWindow } from '../../../base/browser/window.js';
+import { DeferredPromise } from '../../../base/common/async.js';
+import { Event } from '../../../base/common/event.js';
+import { hash } from '../../../base/common/hash.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { URI } from '../../../base/common/uri.js';
+import { IClipboardService } from '../common/clipboardService.js';
+import { ILayoutService } from '../../layout/browser/layoutService.js';
+import { ILogService } from '../../log/common/log.js';
+
+/**
+ * Custom mime type used for storing a list of uris in the clipboard.
+ *
+ * Requires support for custom web clipboards https://github.com/w3c/clipboard-apis/pull/175
+ */
+const vscodeResourcesMime = 'application/vnd.code.resources';
 
 export class BrowserClipboardService extends Disposable implements IClipboardService {
 
@@ -34,10 +41,33 @@ export class BrowserClipboardService extends Disposable implements IClipboardSer
 		// and not in the clipboard, we have to invalidate
 		// that state when the user copies other data.
 		this._register(Event.runAndSubscribe(onDidRegisterWindow, ({ window, disposables }) => {
-			disposables.add(addDisposableListener(window.document, 'copy', () => this.clearResources()));
+			disposables.add(addDisposableListener(window.document, 'copy', () => this.clearResourcesState()));
 		}, { window: mainWindow, disposables: this._store }));
 	}
 
+	async readImage(): Promise<Uint8Array> {
+		try {
+			const clipboardItems = await navigator.clipboard.read();
+			const clipboardItem = clipboardItems[0];
+
+			const supportedImageTypes = ['image/png', 'image/jpeg', 'image/gif', 'image/tiff', 'image/bmp'];
+			const mimeType = supportedImageTypes.find(type => clipboardItem.types.includes(type));
+
+			if (mimeType) {
+				const blob = await clipboardItem.getType(mimeType);
+				const buffer = await blob.arrayBuffer();
+				return new Uint8Array(buffer);
+			} else {
+				console.error('No supported image type found in the clipboard');
+			}
+		} catch (error) {
+			console.error('Error reading image from clipboard:', error);
+		}
+
+		// Return an empty Uint8Array if no image is found or an error occurs
+		return new Uint8Array(0);
+	}
+
 	private webKitPendingClipboardWritePromise: DeferredPromise<string> | undefined;
 
 	// In Safari, it has the following note:
@@ -75,6 +105,7 @@ export class BrowserClipboardService extends Disposable implements IClipboardSer
 			});
 		};
 
+
 		this._register(Event.runAndSubscribe(this.layoutService.onDidAddContainer, ({ container, disposables }) => {
 			disposables.add(addDisposableListener(container, 'click', handler));
 			disposables.add(addDisposableListener(container, 'keydown', handler));
@@ -86,7 +117,7 @@ export class BrowserClipboardService extends Disposable implements IClipboardSer
 	async writeText(text: string, type?: string): Promise<void> {
 
 		// Clear resources given we are writing text
-		this.writeResources([]);
+		this.clearResourcesState();
 
 		// With type: only in-memory is supported
 		if (type) {
@@ -172,8 +203,28 @@ export class BrowserClipboardService extends Disposable implements IClipboardSer
 	private static readonly MAX_RESOURCE_STATE_SOURCE_LENGTH = 1000;
 
 	async writeResources(resources: URI[]): Promise<void> {
+		// Guard access to navigator.clipboard with try/catch
+		// as we have seen DOMExceptions in certain browsers
+		// due to security policies.
+		try {
+			await getActiveWindow().navigator.clipboard.write([
+				new ClipboardItem({
+					[`web ${vscodeResourcesMime}`]: new Blob([
+						JSON.stringify(resources.map(x => x.toJSON()))
+					], {
+						type: vscodeResourcesMime
+					})
+				})
+			]);
+
+			// Continue to write to the in-memory clipboard as well.
+			// This is needed because some browsers allow the paste but then can't read the custom resources.
+		} catch (error) {
+			// Noop
+		}
+
 		if (resources.length === 0) {
-			this.clearResources();
+			this.clearResourcesState();
 		} else {
 			this.resources = resources;
 			this.resourcesStateHash = await this.computeResourcesStateHash();
@@ -181,9 +232,25 @@ export class BrowserClipboardService extends Disposable implements IClipboardSer
 	}
 
 	async readResources(): Promise<URI[]> {
+		// Guard access to navigator.clipboard with try/catch
+		// as we have seen DOMExceptions in certain browsers
+		// due to security policies.
+		try {
+			const items = await getActiveWindow().navigator.clipboard.read();
+			for (const item of items) {
+				if (item.types.includes(`web ${vscodeResourcesMime}`)) {
+					const blob = await item.getType(`web ${vscodeResourcesMime}`);
+					const resources = (JSON.parse(await blob.text()) as URI[]).map(x => URI.from(x));
+					return resources;
+				}
+			}
+		} catch (error) {
+			// Noop
+		}
+
 		const resourcesStateHash = await this.computeResourcesStateHash();
 		if (this.resourcesStateHash !== resourcesStateHash) {
-			this.clearResources(); // state mismatch, resources no longer valid
+			this.clearResourcesState(); // state mismatch, resources no longer valid
 		}
 
 		return this.resources;
@@ -204,10 +271,28 @@ export class BrowserClipboardService extends Disposable implements IClipboardSer
 	}
 
 	async hasResources(): Promise<boolean> {
+		// Guard access to navigator.clipboard with try/catch
+		// as we have seen DOMExceptions in certain browsers
+		// due to security policies.
+		try {
+			const items = await getActiveWindow().navigator.clipboard.read();
+			for (const item of items) {
+				if (item.types.includes(`web ${vscodeResourcesMime}`)) {
+					return true;
+				}
+			}
+		} catch (error) {
+			// Noop
+		}
+
 		return this.resources.length > 0;
 	}
 
-	private clearResources(): void {
+	public clearInternalState(): void {
+		this.clearResourcesState();
+	}
+
+	private clearResourcesState(): void {
 		this.resources = [];
 		this.resourcesStateHash = undefined;
 	}
diff --git a/src/vs/platform/clipboard/common/clipboardService.ts b/src/vs/platform/clipboard/common/clipboardService.ts
index c4aea9f7132..cef3ff82105 100644
--- a/src/vs/platform/clipboard/common/clipboardService.ts
+++ b/src/vs/platform/clipboard/common/clipboardService.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { URI } from '../../../base/common/uri.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 export const IClipboardService = createDecorator<IClipboardService>('clipboardService');
 
@@ -46,4 +46,17 @@ export interface IClipboardService {
 	 * Find out if resources are copied to the clipboard.
 	 */
 	hasResources(): Promise<boolean>;
+
+	/**
+	 * Resets the internal state of the clipboard (if any) without touching the real clipboard.
+	 *
+	 * Used for implementations such as web which do not always support using the real clipboard.
+	 */
+	clearInternalState?(): void;
+
+	/**
+	 * Reads resources from the system clipboard as an image. If the clipboard does not contain an
+	 * image, an empty buffer is returned.
+	 */
+	readImage(): Promise<Uint8Array>;
 }
diff --git a/src/vs/platform/clipboard/test/common/testClipboardService.ts b/src/vs/platform/clipboard/test/common/testClipboardService.ts
index 0ab758a9990..23a20010dd3 100644
--- a/src/vs/platform/clipboard/test/common/testClipboardService.ts
+++ b/src/vs/platform/clipboard/test/common/testClipboardService.ts
@@ -3,10 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
+import { URI } from '../../../../base/common/uri.js';
+import { IClipboardService } from '../../common/clipboardService.js';
 
 export class TestClipboardService implements IClipboardService {
+	readImage(): Promise<Uint8Array> {
+		throw new Error('Method not implemented.');
+	}
 
 	_serviceBrand: undefined;
 
diff --git a/src/vs/platform/commands/common/commands.ts b/src/vs/platform/commands/common/commands.ts
index 8c76735a888..53e32c4842e 100644
--- a/src/vs/platform/commands/common/commands.ts
+++ b/src/vs/platform/commands/common/commands.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Iterable } from 'vs/base/common/iterator';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { LinkedList } from 'vs/base/common/linkedList';
-import { TypeConstraint, validateConstraints } from 'vs/base/common/types';
-import { ILocalizedString } from 'vs/platform/action/common/action';
-import { createDecorator, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Iterable } from '../../../base/common/iterator.js';
+import { IJSONSchema } from '../../../base/common/jsonSchema.js';
+import { IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { LinkedList } from '../../../base/common/linkedList.js';
+import { TypeConstraint, validateConstraints } from '../../../base/common/types.js';
+import { ILocalizedString } from '../../action/common/action.js';
+import { createDecorator, ServicesAccessor } from '../../instantiation/common/instantiation.js';
 
 export const ICommandService = createDecorator<ICommandService>('commandService');
 
diff --git a/src/vs/platform/commands/test/common/commands.test.ts b/src/vs/platform/commands/test/common/commands.test.ts
index f46f8e1a6ae..8a1ca7bd053 100644
--- a/src/vs/platform/commands/test/common/commands.test.ts
+++ b/src/vs/platform/commands/test/common/commands.test.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { combinedDisposable } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
+import { combinedDisposable } from '../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { CommandsRegistry } from '../../common/commands.js';
 
 suite('Command Tests', function () {
 
diff --git a/src/vs/platform/commands/test/common/nullCommandService.ts b/src/vs/platform/commands/test/common/nullCommandService.ts
index 8c90f77362e..52c8e6b9df0 100644
--- a/src/vs/platform/commands/test/common/nullCommandService.ts
+++ b/src/vs/platform/commands/test/common/nullCommandService.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ICommandService } from 'vs/platform/commands/common/commands';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ICommandService } from '../../common/commands.js';
 
 export const NullCommandService: ICommandService = {
 	_serviceBrand: undefined,
diff --git a/src/vs/platform/configuration/common/configuration.ts b/src/vs/platform/configuration/common/configuration.ts
index 55982dda176..770ce0f6426 100644
--- a/src/vs/platform/configuration/common/configuration.ts
+++ b/src/vs/platform/configuration/common/configuration.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import * as types from 'vs/base/common/types';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
+import { Event } from '../../../base/common/event.js';
+import * as types from '../../../base/common/types.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { IWorkspaceFolder } from '../../workspace/common/workspace.js';
 
 export const IConfigurationService = createDecorator<IConfigurationService>('configurationService');
 
diff --git a/src/vs/platform/configuration/common/configurationModels.ts b/src/vs/platform/configuration/common/configurationModels.ts
index 8b862b1c939..400ae1033cb 100644
--- a/src/vs/platform/configuration/common/configurationModels.ts
+++ b/src/vs/platform/configuration/common/configurationModels.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as arrays from 'vs/base/common/arrays';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { Emitter, Event } from 'vs/base/common/event';
-import * as json from 'vs/base/common/json';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { getOrSet, ResourceMap } from 'vs/base/common/map';
-import * as objects from 'vs/base/common/objects';
-import { IExtUri } from 'vs/base/common/resources';
-import * as types from 'vs/base/common/types';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { addToValueTree, ConfigurationTarget, getConfigurationValue, IConfigurationChange, IConfigurationChangeEvent, IConfigurationCompareResult, IConfigurationData, IConfigurationModel, IConfigurationOverrides, IConfigurationUpdateOverrides, IConfigurationValue, IInspectValue, IOverrides, removeFromValueTree, toValuesTree } from 'vs/platform/configuration/common/configuration';
-import { ConfigurationScope, Extensions, IConfigurationPropertySchema, IConfigurationRegistry, overrideIdentifiersFromKey, OVERRIDE_PROPERTY_REGEX } from 'vs/platform/configuration/common/configurationRegistry';
-import { FileOperation, IFileService } from 'vs/platform/files/common/files';
-import { ILogService } from 'vs/platform/log/common/log';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Workspace } from 'vs/platform/workspace/common/workspace';
+import * as arrays from '../../../base/common/arrays.js';
+import { IStringDictionary } from '../../../base/common/collections.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import * as json from '../../../base/common/json.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { getOrSet, ResourceMap } from '../../../base/common/map.js';
+import * as objects from '../../../base/common/objects.js';
+import { IExtUri } from '../../../base/common/resources.js';
+import * as types from '../../../base/common/types.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { addToValueTree, ConfigurationTarget, getConfigurationValue, IConfigurationChange, IConfigurationChangeEvent, IConfigurationCompareResult, IConfigurationData, IConfigurationModel, IConfigurationOverrides, IConfigurationUpdateOverrides, IConfigurationValue, IInspectValue, IOverrides, removeFromValueTree, toValuesTree } from './configuration.js';
+import { ConfigurationScope, Extensions, IConfigurationPropertySchema, IConfigurationRegistry, overrideIdentifiersFromKey, OVERRIDE_PROPERTY_REGEX } from './configurationRegistry.js';
+import { FileOperation, IFileService } from '../../files/common/files.js';
+import { ILogService } from '../../log/common/log.js';
+import { Registry } from '../../registry/common/platform.js';
+import { Workspace } from '../../workspace/common/workspace.js';
 
 function freeze<T>(data: T): T {
 	return Object.isFrozen(data) ? data : objects.deepFreeze(data);
@@ -279,16 +279,24 @@ export class ConfigurationModel implements IConfigurationModel {
 			this.keys.push(key);
 		}
 		if (OVERRIDE_PROPERTY_REGEX.test(key)) {
-			this.overrides.push({
-				identifiers: overrideIdentifiersFromKey(key),
+			const identifiers = overrideIdentifiersFromKey(key);
+			const override = {
+				identifiers,
 				keys: Object.keys(this.contents[key]),
 				contents: toValuesTree(this.contents[key], message => this.logService.error(message)),
-			});
+			};
+			const index = this.overrides.findIndex(o => arrays.equals(o.identifiers, identifiers));
+			if (index !== -1) {
+				this.overrides[index] = override;
+			} else {
+				this.overrides.push(override);
+			}
 		}
 	}
 }
 
 export interface ConfigurationParseOptions {
+	skipUnregistered?: boolean;
 	scopes?: ConfigurationScope[];
 	skipRestricted?: boolean;
 	include?: string[];
@@ -421,14 +429,10 @@ export class ConfigurationModelParser {
 				restricted.push(...result.restricted);
 			} else {
 				const propertySchema = configurationProperties[key];
-				const scope = propertySchema ? typeof propertySchema.scope !== 'undefined' ? propertySchema.scope : ConfigurationScope.WINDOW : undefined;
 				if (propertySchema?.restricted) {
 					restricted.push(key);
 				}
-				if (!options.exclude?.includes(key) /* Check exclude */
-					&& (options.include?.includes(key) /* Check include */
-						|| ((scope === undefined || options.scopes === undefined || options.scopes.includes(scope)) /* Check scopes */
-							&& !(options.skipRestricted && propertySchema?.restricted)))) /* Check restricted */ {
+				if (this.shouldInclude(key, propertySchema, options)) {
 					raw[key] = properties[key];
 				} else {
 					hasExcludedProperties = true;
@@ -438,6 +442,31 @@ export class ConfigurationModelParser {
 		return { raw, restricted, hasExcludedProperties };
 	}
 
+	private shouldInclude(key: string, propertySchema: IConfigurationPropertySchema | undefined, options: ConfigurationParseOptions): boolean {
+		if (options.exclude?.includes(key)) {
+			return false;
+		}
+
+		if (options.include?.includes(key)) {
+			return true;
+		}
+
+		if (options.skipRestricted && propertySchema?.restricted) {
+			return false;
+		}
+
+		if (options.skipUnregistered && !propertySchema) {
+			return false;
+		}
+
+		const scope = propertySchema ? typeof propertySchema.scope !== 'undefined' ? propertySchema.scope : ConfigurationScope.WINDOW : undefined;
+		if (scope === undefined || options.scopes === undefined) {
+			return true;
+		}
+
+		return options.scopes.includes(scope);
+	}
+
 	private toOverrides(raw: any, conflictReporter: (message: string) => void): IOverrides[] {
 		const overrides: IOverrides[] = [];
 		for (const key of Object.keys(raw)) {
diff --git a/src/vs/platform/configuration/common/configurationRegistry.ts b/src/vs/platform/configuration/common/configurationRegistry.ts
index ed8e56d50c5..db9baccf28c 100644
--- a/src/vs/platform/configuration/common/configurationRegistry.ts
+++ b/src/vs/platform/configuration/common/configurationRegistry.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { distinct } from 'vs/base/common/arrays';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import * as types from 'vs/base/common/types';
-import * as nls from 'vs/nls';
-import { getLanguageTagSettingPlainKey } from 'vs/platform/configuration/common/configuration';
-import { Extensions as JSONExtensions, IJSONContributionRegistry } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
-import { PolicyName } from 'vs/platform/policy/common/policy';
-import { Registry } from 'vs/platform/registry/common/platform';
+import { distinct } from '../../../base/common/arrays.js';
+import { IStringDictionary } from '../../../base/common/collections.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { IJSONSchema } from '../../../base/common/jsonSchema.js';
+import * as types from '../../../base/common/types.js';
+import * as nls from '../../../nls.js';
+import { getLanguageTagSettingPlainKey } from './configuration.js';
+import { Extensions as JSONExtensions, IJSONContributionRegistry } from '../../jsonschemas/common/jsonContributionRegistry.js';
+import { PolicyName } from '../../policy/common/policy.js';
+import { Registry } from '../../registry/common/platform.js';
 
 export enum EditPresentationTypes {
 	Multiline = 'multilineText',
@@ -70,10 +70,15 @@ export interface IConfigurationRegistry {
 	 */
 	deltaConfiguration(delta: IConfigurationDelta): void;
 
+	/**
+	 * Return the registered default configurations
+	 */
+	getRegisteredDefaultConfigurations(): IConfigurationDefaults[];
+
 	/**
 	 * Return the registered configuration defaults overrides
 	 */
-	getConfigurationDefaultsOverrides(): Map<string, IConfigurationDefaultOverride>;
+	getConfigurationDefaultsOverrides(): Map<string, IConfigurationDefaultOverrideValue>;
 
 	/**
 	 * Signal that the schema of a configuration setting has changes. It is currently only supported to change enumeration values.
@@ -191,6 +196,11 @@ export interface IConfigurationPropertySchema extends IJSONSchema {
 	 */
 	disallowSyncIgnore?: boolean;
 
+	/**
+	 * Disallow extensions to contribute configuration default value for this setting.
+	 */
+	disallowConfigurationDefault?: boolean;
+
 	/**
 	 * Labels for enumeration items
 	 */
@@ -233,22 +243,28 @@ export interface IConfigurationNode {
 	restrictedProperties?: string[];
 }
 
+export type ConfigurationDefaultValueSource = IExtensionInfo | Map<string, IExtensionInfo>;
+
 export interface IConfigurationDefaults {
 	overrides: IStringDictionary<any>;
-	source?: IExtensionInfo | string;
+	source?: IExtensionInfo;
 }
 
 export type IRegisteredConfigurationPropertySchema = IConfigurationPropertySchema & {
 	defaultDefaultValue?: any;
 	source?: IExtensionInfo; // Source of the Property
-	defaultValueSource?: IExtensionInfo | string; // Source of the Default Value
+	defaultValueSource?: ConfigurationDefaultValueSource; // Source of the Default Value
 };
 
-export type IConfigurationDefaultOverride = {
+export interface IConfigurationDefaultOverride {
 	readonly value: any;
-	readonly source?: IExtensionInfo | string;  // Source of the default override
-	readonly valuesSources?: Map<string, IExtensionInfo | string>; // Source of each value in default language overrides
-};
+	readonly source?: IExtensionInfo;  // Source of the default override
+}
+
+export interface IConfigurationDefaultOverrideValue {
+	readonly value: any;
+	readonly source?: ConfigurationDefaultValueSource;
+}
 
 export const allSettings: { properties: IStringDictionary<IConfigurationPropertySchema>; patternProperties: IStringDictionary<IConfigurationPropertySchema> } = { properties: {}, patternProperties: {} };
 export const applicationSettings: { properties: IStringDictionary<IConfigurationPropertySchema>; patternProperties: IStringDictionary<IConfigurationPropertySchema> } = { properties: {}, patternProperties: {} };
@@ -264,7 +280,8 @@ const contributionRegistry = Registry.as<IJSONContributionRegistry>(JSONExtensio
 
 class ConfigurationRegistry implements IConfigurationRegistry {
 
-	private readonly configurationDefaultsOverrides: Map<string, IConfigurationDefaultOverride>;
+	private readonly registeredConfigurationDefaults: IConfigurationDefaults[] = [];
+	private readonly configurationDefaultsOverrides: Map<string, { configurationDefaultOverrides: IConfigurationDefaultOverride[]; configurationDefaultOverrideValue?: IConfigurationDefaultOverrideValue }>;
 	private readonly defaultLanguageConfigurationOverridesNode: IConfigurationNode;
 	private readonly configurationContributors: IConfigurationNode[];
 	private readonly configurationProperties: IStringDictionary<IRegisteredConfigurationPropertySchema>;
@@ -280,7 +297,7 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 	readonly onDidUpdateConfiguration = this._onDidUpdateConfiguration.event;
 
 	constructor() {
-		this.configurationDefaultsOverrides = new Map<string, IConfigurationDefaultOverride>();
+		this.configurationDefaultsOverrides = new Map();
 		this.defaultLanguageConfigurationOverridesNode = {
 			id: 'defaultOverrides',
 			title: nls.localize('defaultLanguageConfigurationOverrides.title', "Default Language Configuration Overrides"),
@@ -343,43 +360,47 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 
 	private doRegisterDefaultConfigurations(configurationDefaults: IConfigurationDefaults[], bucket: Set<string>) {
 
+		this.registeredConfigurationDefaults.push(...configurationDefaults);
+
 		const overrideIdentifiers: string[] = [];
 
 		for (const { overrides, source } of configurationDefaults) {
 			for (const key in overrides) {
 				bucket.add(key);
 
+				const configurationDefaultOverridesForKey = this.configurationDefaultsOverrides.get(key)
+					?? this.configurationDefaultsOverrides.set(key, { configurationDefaultOverrides: [] }).get(key)!;
+
+				const value = overrides[key];
+				configurationDefaultOverridesForKey.configurationDefaultOverrides.push({ value, source });
+
+				// Configuration defaults for Override Identifiers
 				if (OVERRIDE_PROPERTY_REGEX.test(key)) {
-					const configurationDefaultOverride = this.configurationDefaultsOverrides.get(key);
-					const valuesSources = configurationDefaultOverride?.valuesSources ?? new Map<string, IExtensionInfo | string>();
-					if (source) {
-						for (const configuration of Object.keys(overrides[key])) {
-							valuesSources.set(configuration, source);
-						}
+					const newDefaultOverride = this.mergeDefaultConfigurationsForOverrideIdentifier(key, value, source, configurationDefaultOverridesForKey.configurationDefaultOverrideValue);
+					if (!newDefaultOverride) {
+						continue;
 					}
-					const defaultValue = { ...(configurationDefaultOverride?.value || {}), ...overrides[key] };
-					this.configurationDefaultsOverrides.set(key, { source, value: defaultValue, valuesSources });
-					const plainKey = getLanguageTagSettingPlainKey(key);
-					const property: IRegisteredConfigurationPropertySchema = {
-						type: 'object',
-						default: defaultValue,
-						description: nls.localize('defaultLanguageConfiguration.description', "Configure settings to be overridden for the {0} language.", plainKey),
-						$ref: resourceLanguageSettingsSchemaId,
-						defaultDefaultValue: defaultValue,
-						source: types.isString(source) ? undefined : source,
-						defaultValueSource: source
-					};
+
+					configurationDefaultOverridesForKey.configurationDefaultOverrideValue = newDefaultOverride;
+					this.updateDefaultOverrideProperty(key, newDefaultOverride, source);
 					overrideIdentifiers.push(...overrideIdentifiersFromKey(key));
-					this.configurationProperties[key] = property;
-					this.defaultLanguageConfigurationOverridesNode.properties![key] = property;
-				} else {
-					this.configurationDefaultsOverrides.set(key, { value: overrides[key], source });
+				}
+
+				// Configuration defaults for Configuration Properties
+				else {
+					const newDefaultOverride = this.mergeDefaultConfigurationsForConfigurationProperty(key, value, source, configurationDefaultOverridesForKey.configurationDefaultOverrideValue);
+					if (!newDefaultOverride) {
+						continue;
+					}
+
+					configurationDefaultOverridesForKey.configurationDefaultOverrideValue = newDefaultOverride;
 					const property = this.configurationProperties[key];
 					if (property) {
 						this.updatePropertyDefaultValue(key, property);
 						this.updateSchema(key, property);
 					}
 				}
+
 			}
 		}
 
@@ -394,31 +415,147 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 	}
 
 	private doDeregisterDefaultConfigurations(defaultConfigurations: IConfigurationDefaults[], bucket: Set<string>): void {
+		for (const defaultConfiguration of defaultConfigurations) {
+			const index = this.registeredConfigurationDefaults.indexOf(defaultConfiguration);
+			if (index !== -1) {
+				this.registeredConfigurationDefaults.splice(index, 1);
+			}
+		}
 
 		for (const { overrides, source } of defaultConfigurations) {
 			for (const key in overrides) {
-				const configurationDefaultsOverride = this.configurationDefaultsOverrides.get(key);
-				const id = types.isString(source) ? source : source?.id;
-				const configurationDefaultsOverrideSourceId = types.isString(configurationDefaultsOverride?.source) ? configurationDefaultsOverride?.source : configurationDefaultsOverride?.source?.id;
-				if (id !== configurationDefaultsOverrideSourceId) {
+				const configurationDefaultOverridesForKey = this.configurationDefaultsOverrides.get(key);
+				if (!configurationDefaultOverridesForKey) {
 					continue;
 				}
-				bucket.add(key);
-				this.configurationDefaultsOverrides.delete(key);
+
+				const index = configurationDefaultOverridesForKey.configurationDefaultOverrides
+					.findIndex(configurationDefaultOverride => source ? configurationDefaultOverride.source?.id === source.id : configurationDefaultOverride.value === overrides[key]);
+				if (index === -1) {
+					continue;
+				}
+
+				configurationDefaultOverridesForKey.configurationDefaultOverrides.splice(index, 1);
+				if (configurationDefaultOverridesForKey.configurationDefaultOverrides.length === 0) {
+					this.configurationDefaultsOverrides.delete(key);
+				}
+
 				if (OVERRIDE_PROPERTY_REGEX.test(key)) {
-					delete this.configurationProperties[key];
-					delete this.defaultLanguageConfigurationOverridesNode.properties![key];
+					let configurationDefaultOverrideValue: IConfigurationDefaultOverrideValue | undefined;
+					for (const configurationDefaultOverride of configurationDefaultOverridesForKey.configurationDefaultOverrides) {
+						configurationDefaultOverrideValue = this.mergeDefaultConfigurationsForOverrideIdentifier(key, configurationDefaultOverride.value, configurationDefaultOverride.source, configurationDefaultOverrideValue);
+					}
+					if (configurationDefaultOverrideValue && !types.isEmptyObject(configurationDefaultOverrideValue.value)) {
+						configurationDefaultOverridesForKey.configurationDefaultOverrideValue = configurationDefaultOverrideValue;
+						this.updateDefaultOverrideProperty(key, configurationDefaultOverrideValue, source);
+					} else {
+						this.configurationDefaultsOverrides.delete(key);
+						delete this.configurationProperties[key];
+						delete this.defaultLanguageConfigurationOverridesNode.properties![key];
+					}
 				} else {
+					let configurationDefaultOverrideValue: IConfigurationDefaultOverrideValue | undefined;
+					for (const configurationDefaultOverride of configurationDefaultOverridesForKey.configurationDefaultOverrides) {
+						configurationDefaultOverrideValue = this.mergeDefaultConfigurationsForConfigurationProperty(key, configurationDefaultOverride.value, configurationDefaultOverride.source, configurationDefaultOverrideValue);
+					}
+					configurationDefaultOverridesForKey.configurationDefaultOverrideValue = configurationDefaultOverrideValue;
 					const property = this.configurationProperties[key];
 					if (property) {
 						this.updatePropertyDefaultValue(key, property);
 						this.updateSchema(key, property);
 					}
 				}
+				bucket.add(key);
+			}
+		}
+		this.updateOverridePropertyPatternKey();
+	}
+
+	private updateDefaultOverrideProperty(key: string, newDefaultOverride: IConfigurationDefaultOverrideValue, source: IExtensionInfo | undefined): void {
+		const property: IRegisteredConfigurationPropertySchema = {
+			type: 'object',
+			default: newDefaultOverride.value,
+			description: nls.localize('defaultLanguageConfiguration.description', "Configure settings to be overridden for the {0} language.", getLanguageTagSettingPlainKey(key)),
+			$ref: resourceLanguageSettingsSchemaId,
+			defaultDefaultValue: newDefaultOverride.value,
+			source,
+			defaultValueSource: source
+		};
+		this.configurationProperties[key] = property;
+		this.defaultLanguageConfigurationOverridesNode.properties![key] = property;
+	}
+
+	private mergeDefaultConfigurationsForOverrideIdentifier(overrideIdentifier: string, configurationValueObject: IStringDictionary<any>, valueSource: IExtensionInfo | undefined, existingDefaultOverride: IConfigurationDefaultOverrideValue | undefined): IConfigurationDefaultOverrideValue | undefined {
+		const defaultValue = existingDefaultOverride?.value || {};
+		const source = existingDefaultOverride?.source ?? new Map<string, IExtensionInfo>();
+
+		// This should not happen
+		if (!(source instanceof Map)) {
+			console.error('objectConfigurationSources is not a Map');
+			return undefined;
+		}
+
+		for (const propertyKey of Object.keys(configurationValueObject)) {
+			const propertyDefaultValue = configurationValueObject[propertyKey];
+
+			const isObjectSetting = types.isObject(propertyDefaultValue) &&
+				(types.isUndefined(defaultValue[propertyKey]) || types.isObject(defaultValue[propertyKey]));
+
+			// If the default value is an object, merge the objects and store the source of each keys
+			if (isObjectSetting) {
+				defaultValue[propertyKey] = { ...(defaultValue[propertyKey] ?? {}), ...propertyDefaultValue };
+				// Track the source of each value in the object
+				if (valueSource) {
+					for (const objectKey in propertyDefaultValue) {
+						source.set(`${propertyKey}.${objectKey}`, valueSource);
+					}
+				}
+			}
+
+			// Primitive values are overridden
+			else {
+				defaultValue[propertyKey] = propertyDefaultValue;
+				if (valueSource) {
+					source.set(propertyKey, valueSource);
+				} else {
+					source.delete(propertyKey);
+				}
 			}
 		}
 
-		this.updateOverridePropertyPatternKey();
+		return { value: defaultValue, source };
+	}
+
+	private mergeDefaultConfigurationsForConfigurationProperty(propertyKey: string, value: any, valuesSource: IExtensionInfo | undefined, existingDefaultOverride: IConfigurationDefaultOverrideValue | undefined): IConfigurationDefaultOverrideValue | undefined {
+		const property = this.configurationProperties[propertyKey];
+		const existingDefaultValue = existingDefaultOverride?.value ?? property?.defaultDefaultValue;
+		let source: ConfigurationDefaultValueSource | undefined = valuesSource;
+
+		const isObjectSetting = types.isObject(value) &&
+			(
+				property !== undefined && property.type === 'object' ||
+				property === undefined && (types.isUndefined(existingDefaultValue) || types.isObject(existingDefaultValue))
+			);
+
+		// If the default value is an object, merge the objects and store the source of each keys
+		if (isObjectSetting) {
+			source = existingDefaultOverride?.source ?? new Map<string, IExtensionInfo>();
+
+			// This should not happen
+			if (!(source instanceof Map)) {
+				console.error('defaultValueSource is not a Map');
+				return undefined;
+			}
+
+			for (const objectKey in value) {
+				if (valuesSource) {
+					source.set(`${propertyKey}.${objectKey}`, valuesSource);
+				}
+			}
+			value = { ...(types.isObject(existingDefaultValue) ? existingDefaultValue : {}), ...value };
+		}
+
+		return { value, source };
 	}
 
 	public deltaConfiguration(delta: IConfigurationDelta): void {
@@ -569,8 +706,18 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 		return this.excludedConfigurationProperties;
 	}
 
-	getConfigurationDefaultsOverrides(): Map<string, IConfigurationDefaultOverride> {
-		return this.configurationDefaultsOverrides;
+	getRegisteredDefaultConfigurations(): IConfigurationDefaults[] {
+		return [...this.registeredConfigurationDefaults];
+	}
+
+	getConfigurationDefaultsOverrides(): Map<string, IConfigurationDefaultOverrideValue> {
+		const configurationDefaultsOverrides = new Map<string, IConfigurationDefaultOverrideValue>();
+		for (const [key, value] of this.configurationDefaultsOverrides) {
+			if (value.configurationDefaultOverrideValue) {
+				configurationDefaultsOverrides.set(key, value.configurationDefaultOverrideValue);
+			}
+		}
+		return configurationDefaultsOverrides;
 	}
 
 	private registerJSONConfiguration(configuration: IConfigurationNode) {
@@ -671,9 +818,15 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 	}
 
 	private updatePropertyDefaultValue(key: string, property: IRegisteredConfigurationPropertySchema): void {
-		const configurationdefaultOverride = this.configurationDefaultsOverrides.get(key);
-		let defaultValue = configurationdefaultOverride?.value;
-		let defaultSource = configurationdefaultOverride?.source;
+		const configurationdefaultOverride = this.configurationDefaultsOverrides.get(key)?.configurationDefaultOverrideValue;
+		let defaultValue = undefined;
+		let defaultSource = undefined;
+		if (configurationdefaultOverride
+			&& (!property.disallowConfigurationDefault || !configurationdefaultOverride.source) // Prevent overriding the default value if the property is disallowed to be overridden by configuration defaults from extensions
+		) {
+			defaultValue = configurationdefaultOverride.value;
+			defaultSource = configurationdefaultOverride.source;
+		}
 		if (types.isUndefined(defaultValue)) {
 			defaultValue = property.defaultDefaultValue;
 			defaultSource = undefined;
@@ -710,7 +863,7 @@ export function keyFromOverrideIdentifiers(overrideIdentifiers: string[]): strin
 	return overrideIdentifiers.reduce((result, overrideIdentifier) => `${result}[${overrideIdentifier}]`, '');
 }
 
-export function getDefaultValue(type: string | string[] | undefined): any {
+export function getDefaultValue(type: string | string[] | undefined) {
 	const t = Array.isArray(type) ? (<string[]>type)[0] : <string>type;
 	switch (t) {
 		case 'boolean':
@@ -758,3 +911,36 @@ export function getScopes(): [string, ConfigurationScope | undefined][] {
 	scopes.push(['task', ConfigurationScope.RESOURCE]);
 	return scopes;
 }
+
+export function getAllConfigurationProperties(configurationNode: IConfigurationNode[]): IStringDictionary<IRegisteredConfigurationPropertySchema> {
+	const result: IStringDictionary<IRegisteredConfigurationPropertySchema> = {};
+	for (const configuration of configurationNode) {
+		const properties = configuration.properties;
+		if (types.isObject(properties)) {
+			for (const key in properties) {
+				result[key] = properties[key];
+			}
+		}
+		if (configuration.allOf) {
+			Object.assign(result, getAllConfigurationProperties(configuration.allOf));
+		}
+	}
+	return result;
+}
+
+export function parseScope(scope: string): ConfigurationScope {
+	switch (scope) {
+		case 'application':
+			return ConfigurationScope.APPLICATION;
+		case 'machine':
+			return ConfigurationScope.MACHINE;
+		case 'resource':
+			return ConfigurationScope.RESOURCE;
+		case 'machine-overridable':
+			return ConfigurationScope.MACHINE_OVERRIDABLE;
+		case 'language-overridable':
+			return ConfigurationScope.LANGUAGE_OVERRIDABLE;
+		default:
+			return ConfigurationScope.WINDOW;
+	}
+}
diff --git a/src/vs/platform/configuration/common/configurationService.ts b/src/vs/platform/configuration/common/configurationService.ts
index 9de7cb2d650..59ce69beda6 100644
--- a/src/vs/platform/configuration/common/configurationService.ts
+++ b/src/vs/platform/configuration/common/configurationService.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { distinct, equals as arrayEquals } from 'vs/base/common/arrays';
-import { Queue, RunOnceScheduler } from 'vs/base/common/async';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { Emitter, Event } from 'vs/base/common/event';
-import { JSONPath, ParseError, parse } from 'vs/base/common/json';
-import { applyEdits, setProperty } from 'vs/base/common/jsonEdit';
-import { Edit, FormattingOptions } from 'vs/base/common/jsonFormatter';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { ResourceMap } from 'vs/base/common/map';
-import { equals } from 'vs/base/common/objects';
-import { OS, OperatingSystem } from 'vs/base/common/platform';
-import { extUriBiasedIgnorePathCase } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { ConfigurationTarget, IConfigurationChange, IConfigurationChangeEvent, IConfigurationData, IConfigurationOverrides, IConfigurationService, IConfigurationUpdateOptions, IConfigurationUpdateOverrides, IConfigurationValue, isConfigurationOverrides, isConfigurationUpdateOverrides } from 'vs/platform/configuration/common/configuration';
-import { Configuration, ConfigurationChangeEvent, ConfigurationModel, UserSettings } from 'vs/platform/configuration/common/configurationModels';
-import { keyFromOverrideIdentifiers } from 'vs/platform/configuration/common/configurationRegistry';
-import { DefaultConfiguration, IPolicyConfiguration, NullPolicyConfiguration, PolicyConfiguration } from 'vs/platform/configuration/common/configurations';
-import { FileOperationError, FileOperationResult, IFileService } from 'vs/platform/files/common/files';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IPolicyService, NullPolicyService } from 'vs/platform/policy/common/policy';
+import { distinct, equals as arrayEquals } from '../../../base/common/arrays.js';
+import { Queue, RunOnceScheduler } from '../../../base/common/async.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { JSONPath, ParseError, parse } from '../../../base/common/json.js';
+import { applyEdits, setProperty } from '../../../base/common/jsonEdit.js';
+import { Edit, FormattingOptions } from '../../../base/common/jsonFormatter.js';
+import { Disposable, IDisposable } from '../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../base/common/map.js';
+import { equals } from '../../../base/common/objects.js';
+import { OS, OperatingSystem } from '../../../base/common/platform.js';
+import { extUriBiasedIgnorePathCase } from '../../../base/common/resources.js';
+import { URI } from '../../../base/common/uri.js';
+import { ConfigurationTarget, IConfigurationChange, IConfigurationChangeEvent, IConfigurationData, IConfigurationOverrides, IConfigurationService, IConfigurationUpdateOptions, IConfigurationUpdateOverrides, IConfigurationValue, isConfigurationOverrides, isConfigurationUpdateOverrides } from './configuration.js';
+import { Configuration, ConfigurationChangeEvent, ConfigurationModel, UserSettings } from './configurationModels.js';
+import { keyFromOverrideIdentifiers } from './configurationRegistry.js';
+import { DefaultConfiguration, IPolicyConfiguration, NullPolicyConfiguration, PolicyConfiguration } from './configurations.js';
+import { FileOperationError, FileOperationResult, IFileService } from '../../files/common/files.js';
+import { ILogService } from '../../log/common/log.js';
+import { IPolicyService, NullPolicyService } from '../../policy/common/policy.js';
 
 export class ConfigurationService extends Disposable implements IConfigurationService, IDisposable {
 
diff --git a/src/vs/platform/configuration/common/configurations.ts b/src/vs/platform/configuration/common/configurations.ts
index d6f09a4d176..a2f08f0a4c2 100644
--- a/src/vs/platform/configuration/common/configurations.ts
+++ b/src/vs/platform/configuration/common/configurations.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { coalesce } from 'vs/base/common/arrays';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { equals } from 'vs/base/common/objects';
-import { isEmptyObject } from 'vs/base/common/types';
-import { ConfigurationModel } from 'vs/platform/configuration/common/configurationModels';
-import { Extensions, IConfigurationRegistry, IRegisteredConfigurationPropertySchema } from 'vs/platform/configuration/common/configurationRegistry';
-import { ILogService, NullLogService } from 'vs/platform/log/common/log';
-import { IPolicyService, PolicyDefinition, PolicyName, PolicyValue } from 'vs/platform/policy/common/policy';
-import { Registry } from 'vs/platform/registry/common/platform';
+import { coalesce } from '../../../base/common/arrays.js';
+import { IStringDictionary } from '../../../base/common/collections.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { equals } from '../../../base/common/objects.js';
+import { isEmptyObject } from '../../../base/common/types.js';
+import { ConfigurationModel } from './configurationModels.js';
+import { Extensions, IConfigurationRegistry, IRegisteredConfigurationPropertySchema } from './configurationRegistry.js';
+import { ILogService, NullLogService } from '../../log/common/log.js';
+import { IPolicyService, PolicyDefinition, PolicyName, PolicyValue } from '../../policy/common/policy.js';
+import { Registry } from '../../registry/common/platform.js';
 
 export class DefaultConfiguration extends Disposable {
 
@@ -61,9 +61,9 @@ export class DefaultConfiguration extends Disposable {
 			const defaultOverrideValue = configurationDefaultsOverrides[key];
 			const propertySchema = configurationProperties[key];
 			if (defaultOverrideValue !== undefined) {
-				this._configurationModel.addValue(key, defaultOverrideValue);
+				this._configurationModel.setValue(key, defaultOverrideValue);
 			} else if (propertySchema) {
-				this._configurationModel.addValue(key, propertySchema.default);
+				this._configurationModel.setValue(key, propertySchema.default);
 			} else {
 				this._configurationModel.removeValue(key);
 			}
diff --git a/src/vs/platform/configuration/test/common/configuration.test.ts b/src/vs/platform/configuration/test/common/configuration.test.ts
index 1f709cf2c0f..620e07b20f6 100644
--- a/src/vs/platform/configuration/test/common/configuration.test.ts
+++ b/src/vs/platform/configuration/test/common/configuration.test.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { merge, removeFromValueTree } from 'vs/platform/configuration/common/configuration';
-import { mergeChanges } from 'vs/platform/configuration/common/configurationModels';
+import { merge, removeFromValueTree } from '../../common/configuration.js';
+import { mergeChanges } from '../../common/configurationModels.js';
 
 suite('Configuration', () => {
 
diff --git a/src/vs/platform/configuration/test/common/configurationModels.test.ts b/src/vs/platform/configuration/test/common/configurationModels.test.ts
index ab425c4fd30..9d5ff123bd6 100644
--- a/src/vs/platform/configuration/test/common/configurationModels.test.ts
+++ b/src/vs/platform/configuration/test/common/configurationModels.test.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { ResourceMap } from 'vs/base/common/map';
-import { join } from 'vs/base/common/path';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Configuration, ConfigurationChangeEvent, ConfigurationModel, ConfigurationModelParser, mergeChanges } from 'vs/platform/configuration/common/configurationModels';
-import { IConfigurationRegistry, Extensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { Workspace } from 'vs/platform/workspace/test/common/testWorkspace';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { join } from '../../../../base/common/path.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { Configuration, ConfigurationChangeEvent, ConfigurationModel, ConfigurationModelParser, mergeChanges } from '../../common/configurationModels.js';
+import { IConfigurationRegistry, Extensions, ConfigurationScope } from '../../common/configurationRegistry.js';
+import { NullLogService } from '../../../log/common/log.js';
+import { Registry } from '../../../registry/common/platform.js';
+import { WorkspaceFolder } from '../../../workspace/common/workspace.js';
+import { Workspace } from '../../../workspace/test/common/testWorkspace.js';
 
 suite('ConfigurationModelParser', () => {
 
diff --git a/src/vs/platform/configuration/test/common/configurationRegistry.test.ts b/src/vs/platform/configuration/test/common/configurationRegistry.test.ts
index e2cf8972a2c..4d089e71eb8 100644
--- a/src/vs/platform/configuration/test/common/configurationRegistry.test.ts
+++ b/src/vs/platform/configuration/test/common/configurationRegistry.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { Registry } from 'vs/platform/registry/common/platform';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from '../../common/configurationRegistry.js';
+import { Registry } from '../../../registry/common/platform.js';
 
 suite('ConfigurationRegistry', () => {
 
@@ -14,6 +14,14 @@ suite('ConfigurationRegistry', () => {
 
 	const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
 
+	setup(() => reset());
+	teardown(() => reset());
+
+	function reset() {
+		configurationRegistry.deregisterConfigurations(configurationRegistry.getConfigurations());
+		configurationRegistry.deregisterDefaultConfigurations(configurationRegistry.getRegisteredDefaultConfigurations());
+	}
+
 	test('configuration override', async () => {
 		configurationRegistry.registerConfiguration({
 			'id': '_test_default',
@@ -31,6 +39,24 @@ suite('ConfigurationRegistry', () => {
 		assert.deepStrictEqual(configurationRegistry.getConfigurationProperties()['[lang]'].default, { a: 2, c: 3 });
 	});
 
+	test('configuration override defaults - prevent overriding default value', async () => {
+		configurationRegistry.registerConfiguration({
+			'id': '_test_default',
+			'type': 'object',
+			'properties': {
+				'config.preventDefaultValueOverride': {
+					'type': 'object',
+					default: { a: 0 },
+					'disallowConfigurationDefault': true
+				}
+			}
+		});
+
+		configurationRegistry.registerDefaultConfigurations([{ overrides: { 'config.preventDefaultValueOverride': { a: 1, b: 2 } } }]);
+
+		assert.deepStrictEqual(configurationRegistry.getConfigurationProperties()['config.preventDefaultValueOverride'].default, { a: 0 });
+	});
+
 	test('configuration override defaults - merges defaults', async () => {
 		configurationRegistry.registerDefaultConfigurations([{ overrides: { '[lang]': { a: 1, b: 2 } } }]);
 		configurationRegistry.registerDefaultConfigurations([{ overrides: { '[lang]': { a: 2, c: 3 } } }]);
@@ -38,7 +64,7 @@ suite('ConfigurationRegistry', () => {
 		assert.deepStrictEqual(configurationRegistry.getConfigurationProperties()['[lang]'].default, { a: 2, b: 2, c: 3 });
 	});
 
-	test('configuration defaults - overrides defaults', async () => {
+	test('configuration defaults - merge object default overrides', async () => {
 		configurationRegistry.registerConfiguration({
 			'id': '_test_default',
 			'type': 'object',
@@ -51,7 +77,7 @@ suite('ConfigurationRegistry', () => {
 		configurationRegistry.registerDefaultConfigurations([{ overrides: { 'config': { a: 1, b: 2 } } }]);
 		configurationRegistry.registerDefaultConfigurations([{ overrides: { 'config': { a: 2, c: 3 } } }]);
 
-		assert.deepStrictEqual(configurationRegistry.getConfigurationProperties()['config'].default, { a: 2, c: 3 });
+		assert.deepStrictEqual(configurationRegistry.getConfigurationProperties()['config'].default, { a: 2, b: 2, c: 3 });
 	});
 
 	test('registering multiple settings with same policy', async () => {
@@ -79,4 +105,88 @@ suite('ConfigurationRegistry', () => {
 		assert.ok(actual['policy1'] !== undefined);
 		assert.ok(actual['policy2'] === undefined);
 	});
+
+	test('configuration defaults - deregister merged object default override', async () => {
+		configurationRegistry.registerConfiguration({
+			'id': '_test_default',
+			'type': 'object',
+			'properties': {
+				'config': {
+					'type': 'object',
+				}
+			}
+		});
+
+		const overrides1 = [{ overrides: { 'config': { a: 1, b: 2 } }, source: { id: 'source1', displayName: 'source1' } }];
+		const overrides2 = [{ overrides: { 'config': { a: 2, c: 3 } }, source: { id: 'source2', displayName: 'source2' } }];
+
+		configurationRegistry.registerDefaultConfigurations(overrides1);
+		configurationRegistry.registerDefaultConfigurations(overrides2);
+
+		assert.deepStrictEqual(configurationRegistry.getConfigurationProperties()['config'].default, { a: 2, b: 2, c: 3 });
+
+		configurationRegistry.deregisterDefaultConfigurations(overrides2);
+
+		assert.deepStrictEqual(configurationRegistry.getConfigurationProperties()['config'].default, { a: 1, b: 2 });
+
+		configurationRegistry.deregisterDefaultConfigurations(overrides1);
+
+		assert.deepStrictEqual(configurationRegistry.getConfigurationProperties()['config'].default, {});
+	});
+
+	test('configuration defaults - deregister merged object default override without source', async () => {
+		configurationRegistry.registerConfiguration({
+			'id': '_test_default',
+			'type': 'object',
+			'properties': {
+				'config': {
+					'type': 'object',
+				}
+			}
+		});
+
+		const overrides1 = [{ overrides: { 'config': { a: 1, b: 2 } } }];
+		const overrides2 = [{ overrides: { 'config': { a: 2, c: 3 } } }];
+
+		configurationRegistry.registerDefaultConfigurations(overrides1);
+		configurationRegistry.registerDefaultConfigurations(overrides2);
+
+		assert.deepStrictEqual(configurationRegistry.getConfigurationProperties()['config'].default, { a: 2, b: 2, c: 3 });
+
+		configurationRegistry.deregisterDefaultConfigurations(overrides2);
+
+		assert.deepStrictEqual(configurationRegistry.getConfigurationProperties()['config'].default, { a: 1, b: 2 });
+
+		configurationRegistry.deregisterDefaultConfigurations(overrides1);
+
+		assert.deepStrictEqual(configurationRegistry.getConfigurationProperties()['config'].default, {});
+	});
+
+	test('configuration defaults - deregister merged object default language overrides', async () => {
+		configurationRegistry.registerConfiguration({
+			'id': '_test_default',
+			'type': 'object',
+			'properties': {
+				'config': {
+					'type': 'object',
+				}
+			}
+		});
+
+		const overrides1 = [{ overrides: { '[lang]': { 'config': { a: 1, b: 2 } } }, source: { id: 'source1', displayName: 'source1' } }];
+		const overrides2 = [{ overrides: { '[lang]': { 'config': { a: 2, c: 3 } } }, source: { id: 'source2', displayName: 'source2' } }];
+
+		configurationRegistry.registerDefaultConfigurations(overrides1);
+		configurationRegistry.registerDefaultConfigurations(overrides2);
+
+		assert.deepStrictEqual(configurationRegistry.getConfigurationProperties()['[lang]'].default, { 'config': { a: 2, b: 2, c: 3 } });
+
+		configurationRegistry.deregisterDefaultConfigurations(overrides2);
+
+		assert.deepStrictEqual(configurationRegistry.getConfigurationProperties()['[lang]'].default, { 'config': { a: 1, b: 2 } });
+
+		configurationRegistry.deregisterDefaultConfigurations(overrides1);
+
+		assert.deepStrictEqual(configurationRegistry.getConfigurationProperties()['[lang]'], undefined);
+	});
 });
diff --git a/src/vs/platform/configuration/test/common/configurationService.test.ts b/src/vs/platform/configuration/test/common/configurationService.test.ts
index 0eff504b9bd..4e765d63efe 100644
--- a/src/vs/platform/configuration/test/common/configurationService.test.ts
+++ b/src/vs/platform/configuration/test/common/configurationService.test.ts
@@ -4,22 +4,22 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { Event } from 'vs/base/common/event';
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ConfigurationTarget, isConfigured } from 'vs/platform/configuration/common/configuration';
-import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { ConfigurationService } from 'vs/platform/configuration/common/configurationService';
-import { IFileService } from 'vs/platform/files/common/files';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { FilePolicyService } from 'vs/platform/policy/common/filePolicyService';
-import { NullPolicyService } from 'vs/platform/policy/common/policy';
-import { Registry } from 'vs/platform/registry/common/platform';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { Event } from '../../../../base/common/event.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { URI } from '../../../../base/common/uri.js';
+import { runWithFakedTimers } from '../../../../base/test/common/timeTravelScheduler.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { ConfigurationTarget, isConfigured } from '../../common/configuration.js';
+import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from '../../common/configurationRegistry.js';
+import { ConfigurationService } from '../../common/configurationService.js';
+import { IFileService } from '../../../files/common/files.js';
+import { FileService } from '../../../files/common/fileService.js';
+import { InMemoryFileSystemProvider } from '../../../files/common/inMemoryFilesystemProvider.js';
+import { NullLogService } from '../../../log/common/log.js';
+import { FilePolicyService } from '../../../policy/common/filePolicyService.js';
+import { NullPolicyService } from '../../../policy/common/policy.js';
+import { Registry } from '../../../registry/common/platform.js';
 
 suite('ConfigurationService.test.ts', () => {
 
diff --git a/src/vs/platform/configuration/test/common/configurations.test.ts b/src/vs/platform/configuration/test/common/configurations.test.ts
index f86e6f66249..ce4b25e4620 100644
--- a/src/vs/platform/configuration/test/common/configurations.test.ts
+++ b/src/vs/platform/configuration/test/common/configurations.test.ts
@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Event } from 'vs/base/common/event';
-import { equals } from 'vs/base/common/objects';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Extensions, IConfigurationNode, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { DefaultConfiguration } from 'vs/platform/configuration/common/configurations';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { Registry } from 'vs/platform/registry/common/platform';
+import { Event } from '../../../../base/common/event.js';
+import { equals } from '../../../../base/common/objects.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { Extensions, IConfigurationNode, IConfigurationRegistry } from '../../common/configurationRegistry.js';
+import { DefaultConfiguration } from '../../common/configurations.js';
+import { NullLogService } from '../../../log/common/log.js';
+import { Registry } from '../../../registry/common/platform.js';
 
 suite('DefaultConfiguration', () => {
 
@@ -22,8 +22,7 @@ suite('DefaultConfiguration', () => {
 
 	function reset() {
 		configurationRegistry.deregisterConfigurations(configurationRegistry.getConfigurations());
-		const configurationDefaultsOverrides = configurationRegistry.getConfigurationDefaultsOverrides();
-		configurationRegistry.deregisterDefaultConfigurations([...configurationDefaultsOverrides.keys()].map(key => ({ extensionId: configurationDefaultsOverrides.get(key)?.source, overrides: { [key]: configurationDefaultsOverrides.get(key)?.value } })));
+		configurationRegistry.deregisterDefaultConfigurations(configurationRegistry.getRegisteredDefaultConfigurations());
 	}
 
 	test('Test registering a property before initialize', async () => {
@@ -110,7 +109,7 @@ suite('DefaultConfiguration', () => {
 
 		assert.ok(equals(actual.getValue('a'), { b: { c: '2' } }));
 		assert.ok(equals(actual.contents, { 'a': { b: { c: '2' } } }));
-		assert.deepStrictEqual(actual.keys, ['a.b', 'a.b.c']);
+		assert.deepStrictEqual(actual.keys.sort(), ['a.b', 'a.b.c']);
 	});
 
 	test('Test registering the same property again', async () => {
@@ -158,7 +157,7 @@ suite('DefaultConfiguration', () => {
 		assert.ok(equals(actual.getValue('[a]'), { 'b': true }));
 		assert.ok(equals(actual.contents, { '[a]': { 'b': true } }));
 		assert.ok(equals(actual.overrides, [{ contents: { 'b': true }, identifiers: ['a'], keys: ['b'] }]));
-		assert.deepStrictEqual(actual.keys, ['[a]']);
+		assert.deepStrictEqual(actual.keys.sort(), ['[a]']);
 		assert.strictEqual(actual.getOverrideValue('b', 'a'), true);
 	});
 
@@ -191,7 +190,7 @@ suite('DefaultConfiguration', () => {
 		assert.ok(equals(actual.getValue('[a]'), { 'b': true }));
 		assert.ok(equals(actual.contents, { 'b': false, '[a]': { 'b': true } }));
 		assert.ok(equals(actual.overrides, [{ contents: { 'b': true }, identifiers: ['a'], keys: ['b'] }]));
-		assert.deepStrictEqual(actual.keys, ['b', '[a]']);
+		assert.deepStrictEqual(actual.keys.sort(), ['[a]', 'b']);
 		assert.strictEqual(actual.getOverrideValue('b', 'a'), true);
 	});
 
@@ -227,7 +226,7 @@ suite('DefaultConfiguration', () => {
 		assert.ok(equals(actual.getValue('[a]'), { 'b': true }));
 		assert.ok(equals(actual.contents, { 'b': false, '[a]': { 'b': true } }));
 		assert.ok(equals(actual.overrides, [{ contents: { 'b': true }, identifiers: ['a'], keys: ['b'] }]));
-		assert.deepStrictEqual(actual.keys, ['[a]', 'b']);
+		assert.deepStrictEqual(actual.keys.sort(), ['[a]', 'b']);
 		assert.strictEqual(actual.getOverrideValue('b', 'a'), true);
 		assert.deepStrictEqual(properties, ['b']);
 	});
@@ -263,7 +262,7 @@ suite('DefaultConfiguration', () => {
 		assert.ok(equals(actual.getValue('[a]'), { 'b': true }));
 		assert.ok(equals(actual.contents, { 'b': false, '[a]': { 'b': true } }));
 		assert.ok(equals(actual.overrides, [{ contents: { 'b': true }, identifiers: ['a'], keys: ['b'] }]));
-		assert.deepStrictEqual(actual.keys, ['b', '[a]']);
+		assert.deepStrictEqual(actual.keys.sort(), ['[a]', 'b']);
 		assert.strictEqual(actual.getOverrideValue('b', 'a'), true);
 		assert.deepStrictEqual(properties, ['[a]']);
 	});
@@ -299,7 +298,7 @@ suite('DefaultConfiguration', () => {
 		assert.ok(equals(actual.getValue('[a]'), { 'b': true }));
 		assert.ok(equals(actual.contents, { 'b': false, '[a]': { 'b': true } }));
 		assert.ok(equals(actual.overrides, [{ contents: { 'b': true }, identifiers: ['a'], keys: ['b'] }]));
-		assert.deepStrictEqual(actual.keys, ['b', '[a]']);
+		assert.deepStrictEqual(actual.keys.sort(), ['[a]', 'b']);
 		assert.strictEqual(actual.getOverrideValue('b', 'a'), true);
 	});
 
@@ -361,4 +360,54 @@ suite('DefaultConfiguration', () => {
 		assert.deepStrictEqual(testObject.configurationModel.keys, ['b']);
 		assert.strictEqual(testObject.configurationModel.getOverrideValue('b', 'a'), undefined);
 	});
+
+	test('Test deregistering a merged language object setting', async () => {
+		const testObject = disposables.add(new DefaultConfiguration(new NullLogService()));
+		configurationRegistry.registerConfiguration({
+			'id': 'b',
+			'order': 1,
+			'title': 'b',
+			'type': 'object',
+			'properties': {
+				'b': {
+					'description': 'b',
+					'type': 'object',
+					'default': {},
+				}
+			}
+		});
+		const node1 = {
+			overrides: {
+				'[a]': {
+					'b': {
+						'aa': '1',
+						'bb': '2'
+					}
+				}
+			},
+			source: { id: 'source1', displayName: 'source1' }
+		};
+
+		const node2 = {
+			overrides: {
+				'[a]': {
+					'b': {
+						'bb': '20',
+						'cc': '30'
+					}
+				}
+			},
+			source: { id: 'source2', displayName: 'source2' }
+		};
+		configurationRegistry.registerDefaultConfigurations([node1]);
+		configurationRegistry.registerDefaultConfigurations([node2]);
+		await testObject.initialize();
+
+		configurationRegistry.deregisterDefaultConfigurations([node1]);
+		assert.ok(equals(testObject.configurationModel.getValue('[a]'), { 'b': { 'bb': '20', 'cc': '30' } }));
+		assert.ok(equals(testObject.configurationModel.contents, { '[a]': { 'b': { 'bb': '20', 'cc': '30' } }, 'b': {} }));
+		assert.ok(equals(testObject.configurationModel.overrides, [{ contents: { 'b': { 'bb': '20', 'cc': '30' } }, identifiers: ['a'], keys: ['b'] }]));
+		assert.deepStrictEqual(testObject.configurationModel.keys.sort(), ['[a]', 'b']);
+		assert.ok(equals(testObject.configurationModel.getOverrideValue('b', 'a'), { 'bb': '20', 'cc': '30' }));
+	});
 });
diff --git a/src/vs/platform/configuration/test/common/policyConfiguration.test.ts b/src/vs/platform/configuration/test/common/policyConfiguration.test.ts
index d3e44993618..44ef961ee98 100644
--- a/src/vs/platform/configuration/test/common/policyConfiguration.test.ts
+++ b/src/vs/platform/configuration/test/common/policyConfiguration.test.ts
@@ -4,21 +4,21 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Event } from 'vs/base/common/event';
-import { URI } from 'vs/base/common/uri';
-import { DefaultConfiguration, PolicyConfiguration } from 'vs/platform/configuration/common/configurations';
-import { IFileService } from 'vs/platform/files/common/files';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { Extensions, IConfigurationNode, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { deepClone } from 'vs/base/common/objects';
-import { IPolicyService } from 'vs/platform/policy/common/policy';
-import { FilePolicyService } from 'vs/platform/policy/common/filePolicyService';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { Event } from '../../../../base/common/event.js';
+import { URI } from '../../../../base/common/uri.js';
+import { DefaultConfiguration, PolicyConfiguration } from '../../common/configurations.js';
+import { IFileService } from '../../../files/common/files.js';
+import { FileService } from '../../../files/common/fileService.js';
+import { InMemoryFileSystemProvider } from '../../../files/common/inMemoryFilesystemProvider.js';
+import { NullLogService } from '../../../log/common/log.js';
+import { Extensions, IConfigurationNode, IConfigurationRegistry } from '../../common/configurationRegistry.js';
+import { Registry } from '../../../registry/common/platform.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { deepClone } from '../../../../base/common/objects.js';
+import { IPolicyService } from '../../../policy/common/policy.js';
+import { FilePolicyService } from '../../../policy/common/filePolicyService.js';
+import { runWithFakedTimers } from '../../../../base/test/common/timeTravelScheduler.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 
 suite('PolicyConfiguration', () => {
 
diff --git a/src/vs/platform/configuration/test/common/testConfigurationService.ts b/src/vs/platform/configuration/test/common/testConfigurationService.ts
index 5a826f174b2..c2e63fa4dfb 100644
--- a/src/vs/platform/configuration/test/common/testConfigurationService.ts
+++ b/src/vs/platform/configuration/test/common/testConfigurationService.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { TernarySearchTree } from 'vs/base/common/ternarySearchTree';
-import { URI } from 'vs/base/common/uri';
-import { getConfigurationValue, IConfigurationChangeEvent, IConfigurationOverrides, IConfigurationService, IConfigurationValue, isConfigurationOverrides } from 'vs/platform/configuration/common/configuration';
-import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { Registry } from 'vs/platform/registry/common/platform';
+import { Emitter } from '../../../../base/common/event.js';
+import { TernarySearchTree } from '../../../../base/common/ternarySearchTree.js';
+import { URI } from '../../../../base/common/uri.js';
+import { getConfigurationValue, IConfigurationChangeEvent, IConfigurationOverrides, IConfigurationService, IConfigurationValue, isConfigurationOverrides } from '../../common/configuration.js';
+import { Extensions, IConfigurationRegistry } from '../../common/configurationRegistry.js';
+import { Registry } from '../../../registry/common/platform.js';
 
 export class TestConfigurationService implements IConfigurationService {
 	public _serviceBrand: undefined;
diff --git a/src/vs/platform/contextkey/browser/contextKeyService.ts b/src/vs/platform/contextkey/browser/contextKeyService.ts
index 7329c62098d..f125af404f2 100644
--- a/src/vs/platform/contextkey/browser/contextKeyService.ts
+++ b/src/vs/platform/contextkey/browser/contextKeyService.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event, PauseableEmitter } from 'vs/base/common/event';
-import { Iterable } from 'vs/base/common/iterator';
-import { Disposable, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { MarshalledObject } from 'vs/base/common/marshalling';
-import { MarshalledId } from 'vs/base/common/marshallingIds';
-import { cloneAndChange, distinct } from 'vs/base/common/objects';
-import { TernarySearchTree } from 'vs/base/common/ternarySearchTree';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpression, ContextKeyInfo, ContextKeyValue, IContext, IContextKey, IContextKeyChangeEvent, IContextKeyService, IContextKeyServiceTarget, IReadableSet, IScopedContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { Emitter, Event, PauseableEmitter } from '../../../base/common/event.js';
+import { Iterable } from '../../../base/common/iterator.js';
+import { Disposable, IDisposable, MutableDisposable } from '../../../base/common/lifecycle.js';
+import { MarshalledObject } from '../../../base/common/marshalling.js';
+import { MarshalledId } from '../../../base/common/marshallingIds.js';
+import { cloneAndChange, distinct } from '../../../base/common/objects.js';
+import { TernarySearchTree } from '../../../base/common/ternarySearchTree.js';
+import { URI } from '../../../base/common/uri.js';
+import { localize } from '../../../nls.js';
+import { CommandsRegistry } from '../../commands/common/commands.js';
+import { ConfigurationTarget, IConfigurationService } from '../../configuration/common/configuration.js';
+import { ContextKeyExpression, ContextKeyInfo, ContextKeyValue, IContext, IContextKey, IContextKeyChangeEvent, IContextKeyService, IContextKeyServiceTarget, IReadableSet, IScopedContextKeyService, RawContextKey } from '../common/contextkey.js';
+import { ServicesAccessor } from '../../instantiation/common/instantiation.js';
 
 const KEYBINDING_CONTEXT_ATTR = 'data-keybinding-context';
 
diff --git a/src/vs/platform/contextkey/common/contextkey.ts b/src/vs/platform/contextkey/common/contextkey.ts
index a461dfe4fe7..ef011cc6b2c 100644
--- a/src/vs/platform/contextkey/common/contextkey.ts
+++ b/src/vs/platform/contextkey/common/contextkey.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
-import { Event } from 'vs/base/common/event';
-import { isChrome, isEdge, isFirefox, isLinux, isMacintosh, isSafari, isWeb, isWindows } from 'vs/base/common/platform';
-import { isFalsyOrWhitespace } from 'vs/base/common/strings';
-import { Scanner, LexingError, Token, TokenType } from 'vs/platform/contextkey/common/scanner';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { localize } from 'vs/nls';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { illegalArgument } from 'vs/base/common/errors';
+import { CharCode } from '../../../base/common/charCode.js';
+import { Event } from '../../../base/common/event.js';
+import { isChrome, isEdge, isFirefox, isLinux, isMacintosh, isSafari, isWeb, isWindows } from '../../../base/common/platform.js';
+import { isFalsyOrWhitespace } from '../../../base/common/strings.js';
+import { Scanner, LexingError, Token, TokenType } from './scanner.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { localize } from '../../../nls.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { illegalArgument } from '../../../base/common/errors.js';
 
 const CONSTANT_VALUES = new Map<string, boolean>();
 CONSTANT_VALUES.set('false', false);
diff --git a/src/vs/platform/contextkey/common/contextkeys.ts b/src/vs/platform/contextkey/common/contextkeys.ts
index 296245b4608..c256dba0aa0 100644
--- a/src/vs/platform/contextkey/common/contextkeys.ts
+++ b/src/vs/platform/contextkey/common/contextkeys.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isIOS, isLinux, isMacintosh, isMobile, isWeb, isWindows } from 'vs/base/common/platform';
-import { localize } from 'vs/nls';
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { isIOS, isLinux, isMacintosh, isMobile, isWeb, isWindows } from '../../../base/common/platform.js';
+import { localize } from '../../../nls.js';
+import { RawContextKey } from './contextkey.js';
 
 export const IsMacContext = new RawContextKey<boolean>('isMac', isMacintosh, localize('isMac', "Whether the operating system is macOS"));
 export const IsLinuxContext = new RawContextKey<boolean>('isLinux', isLinux, localize('isLinux', "Whether the operating system is Linux"));
diff --git a/src/vs/platform/contextkey/common/scanner.ts b/src/vs/platform/contextkey/common/scanner.ts
index 95168127c69..64dff3d76fc 100644
--- a/src/vs/platform/contextkey/common/scanner.ts
+++ b/src/vs/platform/contextkey/common/scanner.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
-import { illegalState } from 'vs/base/common/errors';
-import { localize } from 'vs/nls';
+import { CharCode } from '../../../base/common/charCode.js';
+import { illegalState } from '../../../base/common/errors.js';
+import { localize } from '../../../nls.js';
 
 export const enum TokenType {
 	LParen,
diff --git a/src/vs/platform/contextkey/test/browser/contextkey.test.ts b/src/vs/platform/contextkey/test/browser/contextkey.test.ts
index d2301c19147..53c3fc23a8f 100644
--- a/src/vs/platform/contextkey/test/browser/contextkey.test.ts
+++ b/src/vs/platform/contextkey/test/browser/contextkey.test.ts
@@ -4,17 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DeferredPromise } from 'vs/base/common/async';
-import { URI } from 'vs/base/common/uri';
-import { mock } from 'vs/base/test/common/mock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { ContextKeyService, setContext } from 'vs/platform/contextkey/browser/contextKeyService';
-import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { DeferredPromise } from '../../../../base/common/async.js';
+import { URI } from '../../../../base/common/uri.js';
+import { mock } from '../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { IConfigurationService } from '../../../configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../configuration/test/common/testConfigurationService.js';
+import { ContextKeyService, setContext } from '../../browser/contextKeyService.js';
+import { ContextKeyExpr, IContextKeyService } from '../../common/contextkey.js';
+import { ServiceCollection } from '../../../instantiation/common/serviceCollection.js';
+import { TestInstantiationService } from '../../../instantiation/test/common/instantiationServiceMock.js';
+import { ITelemetryService } from '../../../telemetry/common/telemetry.js';
 
 suite('ContextKeyService', () => {
 	const testDisposables = ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/platform/contextkey/test/common/contextkey.test.ts b/src/vs/platform/contextkey/test/common/contextkey.test.ts
index 2555701c1d8..514aa6d35ec 100644
--- a/src/vs/platform/contextkey/test/common/contextkey.test.ts
+++ b/src/vs/platform/contextkey/test/common/contextkey.test.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ContextKeyExpr, ContextKeyExpression, implies } from 'vs/platform/contextkey/common/contextkey';
+import { isLinux, isMacintosh, isWindows } from '../../../../base/common/platform.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { ContextKeyExpr, ContextKeyExpression, implies } from '../../common/contextkey.js';
 
 function createContext(ctx: any) {
 	return {
diff --git a/src/vs/platform/contextkey/test/common/parser.test.ts b/src/vs/platform/contextkey/test/common/parser.test.ts
index 17bfa468ec9..ad06b1f45f7 100644
--- a/src/vs/platform/contextkey/test/common/parser.test.ts
+++ b/src/vs/platform/contextkey/test/common/parser.test.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Parser } from 'vs/platform/contextkey/common/contextkey';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { Parser } from '../../common/contextkey.js';
 
 function parseToStr(input: string): string {
 	const parser = new Parser();
diff --git a/src/vs/platform/contextkey/test/common/scanner.test.ts b/src/vs/platform/contextkey/test/common/scanner.test.ts
index dacbfbebbdd..ba2a42fb630 100644
--- a/src/vs/platform/contextkey/test/common/scanner.test.ts
+++ b/src/vs/platform/contextkey/test/common/scanner.test.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Scanner, Token, TokenType } from 'vs/platform/contextkey/common/scanner';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { Scanner, Token, TokenType } from '../../common/scanner.js';
 
 suite('Context Key Scanner', () => {
 
diff --git a/src/vs/platform/contextview/browser/contextMenuHandler.ts b/src/vs/platform/contextview/browser/contextMenuHandler.ts
index abc08f92252..162360af93a 100644
--- a/src/vs/platform/contextview/browser/contextMenuHandler.ts
+++ b/src/vs/platform/contextview/browser/contextMenuHandler.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IContextMenuDelegate } from 'vs/base/browser/contextmenu';
-import { $, addDisposableListener, EventType, getActiveElement, getWindow, isAncestor, isHTMLElement } from 'vs/base/browser/dom';
-import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { Menu } from 'vs/base/browser/ui/menu/menu';
-import { ActionRunner, IRunEvent, WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from 'vs/base/common/actions';
-import { isCancellationError } from 'vs/base/common/errors';
-import { combinedDisposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { defaultMenuStyles } from 'vs/platform/theme/browser/defaultStyles';
+import { IContextMenuDelegate } from '../../../base/browser/contextmenu.js';
+import { $, addDisposableListener, EventType, getActiveElement, getWindow, isAncestor, isHTMLElement } from '../../../base/browser/dom.js';
+import { StandardMouseEvent } from '../../../base/browser/mouseEvent.js';
+import { Menu } from '../../../base/browser/ui/menu/menu.js';
+import { ActionRunner, IRunEvent, WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from '../../../base/common/actions.js';
+import { isCancellationError } from '../../../base/common/errors.js';
+import { combinedDisposable, DisposableStore, IDisposable } from '../../../base/common/lifecycle.js';
+import { IContextViewService } from './contextView.js';
+import { IKeybindingService } from '../../keybinding/common/keybinding.js';
+import { INotificationService } from '../../notification/common/notification.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
+import { defaultMenuStyles } from '../../theme/browser/defaultStyles.js';
 
 
 export interface IContextMenuHandlerOptions {
diff --git a/src/vs/platform/contextview/browser/contextMenuService.ts b/src/vs/platform/contextview/browser/contextMenuService.ts
index 907cf9449a8..b6b7bea2bac 100644
--- a/src/vs/platform/contextview/browser/contextMenuService.ts
+++ b/src/vs/platform/contextview/browser/contextMenuService.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IContextMenuDelegate } from 'vs/base/browser/contextmenu';
-import { ModifierKeyEmitter } from 'vs/base/browser/dom';
-import { IAction, Separator } from 'vs/base/common/actions';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { createAndFillInContextMenuActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IMenuService, MenuId } from 'vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { ContextMenuHandler, IContextMenuHandlerOptions } from './contextMenuHandler';
-import { IContextMenuMenuDelegate, IContextMenuService, IContextViewService } from './contextView';
+import { IContextMenuDelegate } from '../../../base/browser/contextmenu.js';
+import { ModifierKeyEmitter } from '../../../base/browser/dom.js';
+import { IAction, Separator } from '../../../base/common/actions.js';
+import { Emitter } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { createAndFillInContextMenuActions } from '../../actions/browser/menuEntryActionViewItem.js';
+import { IMenuService, MenuId } from '../../actions/common/actions.js';
+import { IContextKeyService } from '../../contextkey/common/contextkey.js';
+import { IKeybindingService } from '../../keybinding/common/keybinding.js';
+import { INotificationService } from '../../notification/common/notification.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
+import { ContextMenuHandler, IContextMenuHandlerOptions } from './contextMenuHandler.js';
+import { IContextMenuMenuDelegate, IContextMenuService, IContextViewService } from './contextView.js';
 
 export class ContextMenuService extends Disposable implements IContextMenuService {
 
@@ -86,9 +86,8 @@ export namespace ContextMenuMenuDelegate {
 			getActions: () => {
 				const target: IAction[] = [];
 				if (menuId) {
-					const menu = menuService.createMenu(menuId, contextKeyService ?? globalContextKeyService);
-					createAndFillInContextMenuActions(menu, menuActionOptions, target);
-					menu.dispose();
+					const menu = menuService.getMenuActions(menuId, contextKeyService ?? globalContextKeyService, menuActionOptions);
+					createAndFillInContextMenuActions(menu, target);
 				}
 				if (!delegate.getActions) {
 					return target;
diff --git a/src/vs/platform/contextview/browser/contextView.ts b/src/vs/platform/contextview/browser/contextView.ts
index 7bd31c59886..1b3e8b2a808 100644
--- a/src/vs/platform/contextview/browser/contextView.ts
+++ b/src/vs/platform/contextview/browser/contextView.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IContextMenuDelegate } from 'vs/base/browser/contextmenu';
-import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { AnchorAlignment, AnchorAxisAlignment, IAnchor, IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview';
-import { IAction } from 'vs/base/common/actions';
-import { Event } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { IMenuActionOptions, MenuId } from 'vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { IContextMenuDelegate } from '../../../base/browser/contextmenu.js';
+import { StandardMouseEvent } from '../../../base/browser/mouseEvent.js';
+import { AnchorAlignment, AnchorAxisAlignment, IAnchor, IContextViewProvider } from '../../../base/browser/ui/contextview/contextview.js';
+import { IAction } from '../../../base/common/actions.js';
+import { Event } from '../../../base/common/event.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { IMenuActionOptions, MenuId } from '../../actions/common/actions.js';
+import { IContextKeyService } from '../../contextkey/common/contextkey.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 export const IContextViewService = createDecorator<IContextViewService>('contextViewService');
 
diff --git a/src/vs/platform/contextview/browser/contextViewService.ts b/src/vs/platform/contextview/browser/contextViewService.ts
index dee2144251e..4ee1349dcce 100644
--- a/src/vs/platform/contextview/browser/contextViewService.ts
+++ b/src/vs/platform/contextview/browser/contextViewService.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ContextView, ContextViewDOMPosition, IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
-import { IContextViewDelegate, IContextViewService, IOpenContextView } from './contextView';
-import { getWindow } from 'vs/base/browser/dom';
+import { ContextView, ContextViewDOMPosition, IContextViewProvider } from '../../../base/browser/ui/contextview/contextview.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { ILayoutService } from '../../layout/browser/layoutService.js';
+import { IContextViewDelegate, IContextViewService, IOpenContextView } from './contextView.js';
+import { getWindow } from '../../../base/browser/dom.js';
 
 export class ContextViewHandler extends Disposable implements IContextViewProvider {
 
diff --git a/src/vs/platform/cssDev/node/cssDevService.ts b/src/vs/platform/cssDev/node/cssDevService.ts
new file mode 100644
index 00000000000..5aa1efa6e39
--- /dev/null
+++ b/src/vs/platform/cssDev/node/cssDevService.ts
@@ -0,0 +1,72 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { spawn } from 'child_process';
+import { relative } from 'path';
+import { FileAccess } from '../../../base/common/network.js';
+import { StopWatch } from '../../../base/common/stopwatch.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { ILogService } from '../../log/common/log.js';
+
+export const ICSSDevelopmentService = createDecorator<ICSSDevelopmentService>('ICSSDevelopmentService');
+
+export interface ICSSDevelopmentService {
+	_serviceBrand: undefined;
+	isEnabled: boolean;
+	getCssModules(): Promise<string[]>;
+}
+
+export class CSSDevelopmentService implements ICSSDevelopmentService {
+
+	declare _serviceBrand: undefined;
+
+	private _cssModules?: Promise<string[]>;
+
+	constructor(
+		@IEnvironmentService private readonly envService: IEnvironmentService,
+		@ILogService private readonly logService: ILogService
+	) { }
+
+	get isEnabled(): boolean {
+		return !this.envService.isBuilt;
+	}
+
+	getCssModules(): Promise<string[]> {
+		this._cssModules ??= this.computeCssModules();
+		return this._cssModules;
+	}
+
+	private async computeCssModules(): Promise<string[]> {
+		if (!this.isEnabled) {
+			return [];
+		}
+
+		const rg = await import('@vscode/ripgrep');
+		return await new Promise<string[]>((resolve) => {
+
+			const sw = StopWatch.create();
+
+			const chunks: string[][] = [];
+			const decoder = new TextDecoder();
+			const basePath = FileAccess.asFileUri('').fsPath;
+			const process = spawn(rg.rgPath, ['-g', '**/*.css', '--files', '--no-ignore', basePath], {});
+
+			process.stdout.on('data', data => {
+				const chunk = decoder.decode(data, { stream: true });
+				chunks.push(chunk.split('\n').filter(Boolean));
+			});
+			process.on('error', err => {
+				this.logService.error('[CSS_DEV] FAILED to compute CSS data', err);
+				resolve([]);
+			});
+			process.on('close', () => {
+				const result = chunks.flat().map(path => relative(basePath, path).replace(/\\/g, '/')).filter(Boolean).sort();
+				resolve(result);
+				this.logService.info(`[CSS_DEV] DONE, ${result.length} css modules (${Math.round(sw.elapsed())}ms)`);
+			});
+		});
+	}
+}
diff --git a/src/vs/platform/debug/common/extensionHostDebug.ts b/src/vs/platform/debug/common/extensionHostDebug.ts
index a519f90d282..066da9be084 100644
--- a/src/vs/platform/debug/common/extensionHostDebug.ts
+++ b/src/vs/platform/debug/common/extensionHostDebug.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { Event } from '../../../base/common/event.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 export const IExtensionHostDebugService = createDecorator<IExtensionHostDebugService>('extensionHostDebugService');
 
diff --git a/src/vs/platform/debug/common/extensionHostDebugIpc.ts b/src/vs/platform/debug/common/extensionHostDebugIpc.ts
index a2191bc2f07..67b742e76a2 100644
--- a/src/vs/platform/debug/common/extensionHostDebugIpc.ts
+++ b/src/vs/platform/debug/common/extensionHostDebugIpc.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IChannel, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
-import { IAttachSessionEvent, ICloseSessionEvent, IExtensionHostDebugService, IOpenExtensionWindowResult, IReloadSessionEvent, ITerminateSessionEvent } from 'vs/platform/debug/common/extensionHostDebug';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { IChannel, IServerChannel } from '../../../base/parts/ipc/common/ipc.js';
+import { IAttachSessionEvent, ICloseSessionEvent, IExtensionHostDebugService, IOpenExtensionWindowResult, IReloadSessionEvent, ITerminateSessionEvent } from './extensionHostDebug.js';
 
 export class ExtensionHostDebugBroadcastChannel<TContext> implements IServerChannel<TContext> {
 
diff --git a/src/vs/platform/debug/electron-main/extensionHostDebugIpc.ts b/src/vs/platform/debug/electron-main/extensionHostDebugIpc.ts
index 7efb571a48c..97b95032a29 100644
--- a/src/vs/platform/debug/electron-main/extensionHostDebugIpc.ts
+++ b/src/vs/platform/debug/electron-main/extensionHostDebugIpc.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { AddressInfo, createServer } from 'net';
-import { IOpenExtensionWindowResult } from 'vs/platform/debug/common/extensionHostDebug';
-import { ExtensionHostDebugBroadcastChannel } from 'vs/platform/debug/common/extensionHostDebugIpc';
-import { OPTIONS, parseArgs } from 'vs/platform/environment/node/argv';
-import { IWindowsMainService, OpenContext } from 'vs/platform/windows/electron-main/windows';
+import { IOpenExtensionWindowResult } from '../common/extensionHostDebug.js';
+import { ExtensionHostDebugBroadcastChannel } from '../common/extensionHostDebugIpc.js';
+import { OPTIONS, parseArgs } from '../../environment/node/argv.js';
+import { IWindowsMainService, OpenContext } from '../../windows/electron-main/windows.js';
 
 export class ElectronExtensionHostDebugBroadcastChannel<TContext> extends ExtensionHostDebugBroadcastChannel<TContext> {
 
diff --git a/src/vs/platform/diagnostics/common/diagnostics.ts b/src/vs/platform/diagnostics/common/diagnostics.ts
index fb30b762cef..cc8a4cb379b 100644
--- a/src/vs/platform/diagnostics/common/diagnostics.ts
+++ b/src/vs/platform/diagnostics/common/diagnostics.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IStringDictionary } from 'vs/base/common/collections';
-import { ProcessItem } from 'vs/base/common/processes';
-import { UriComponents } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IWorkspace } from 'vs/platform/workspace/common/workspace';
+import { IStringDictionary } from '../../../base/common/collections.js';
+import { ProcessItem } from '../../../base/common/processes.js';
+import { UriComponents } from '../../../base/common/uri.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { IWorkspace } from '../../workspace/common/workspace.js';
 
 export const ID = 'diagnosticsService';
 export const IDiagnosticsService = createDecorator<IDiagnosticsService>(ID);
diff --git a/src/vs/platform/diagnostics/electron-main/diagnosticsMainService.ts b/src/vs/platform/diagnostics/electron-main/diagnosticsMainService.ts
index 69506763bbb..39ef93b4509 100644
--- a/src/vs/platform/diagnostics/electron-main/diagnosticsMainService.ts
+++ b/src/vs/platform/diagnostics/electron-main/diagnosticsMainService.ts
@@ -4,18 +4,18 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { app, BrowserWindow, Event as IpcEvent } from 'electron';
-import { validatedIpcMain } from 'vs/base/parts/ipc/electron-main/ipcMain';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { URI } from 'vs/base/common/uri';
-import { IDiagnosticInfo, IDiagnosticInfoOptions, IMainProcessDiagnostics, IProcessDiagnostics, IRemoteDiagnosticError, IRemoteDiagnosticInfo, IWindowDiagnostics } from 'vs/platform/diagnostics/common/diagnostics';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ICodeWindow } from 'vs/platform/window/electron-main/window';
-import { IWindowsMainService } from 'vs/platform/windows/electron-main/windows';
-import { isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
-import { IWorkspacesManagementMainService } from 'vs/platform/workspaces/electron-main/workspacesManagementMainService';
-import { assertIsDefined } from 'vs/base/common/types';
-import { ILogService } from 'vs/platform/log/common/log';
-import { UtilityProcess } from 'vs/platform/utilityProcess/electron-main/utilityProcess';
+import { validatedIpcMain } from '../../../base/parts/ipc/electron-main/ipcMain.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { URI } from '../../../base/common/uri.js';
+import { IDiagnosticInfo, IDiagnosticInfoOptions, IMainProcessDiagnostics, IProcessDiagnostics, IRemoteDiagnosticError, IRemoteDiagnosticInfo, IWindowDiagnostics } from '../common/diagnostics.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { ICodeWindow } from '../../window/electron-main/window.js';
+import { IWindowsMainService } from '../../windows/electron-main/windows.js';
+import { isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier } from '../../workspace/common/workspace.js';
+import { IWorkspacesManagementMainService } from '../../workspaces/electron-main/workspacesManagementMainService.js';
+import { assertIsDefined } from '../../../base/common/types.js';
+import { ILogService } from '../../log/common/log.js';
+import { UtilityProcess } from '../../utilityProcess/electron-main/utilityProcess.js';
 
 export const ID = 'diagnosticsMainService';
 export const IDiagnosticsMainService = createDecorator<IDiagnosticsMainService>(ID);
diff --git a/src/vs/platform/diagnostics/electron-sandbox/diagnosticsService.ts b/src/vs/platform/diagnostics/electron-sandbox/diagnosticsService.ts
index 4106c0a10df..f984d59c5bc 100644
--- a/src/vs/platform/diagnostics/electron-sandbox/diagnosticsService.ts
+++ b/src/vs/platform/diagnostics/electron-sandbox/diagnosticsService.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDiagnosticsService } from 'vs/platform/diagnostics/common/diagnostics';
-import { registerSharedProcessRemoteService } from 'vs/platform/ipc/electron-sandbox/services';
+import { IDiagnosticsService } from '../common/diagnostics.js';
+import { registerSharedProcessRemoteService } from '../../ipc/electron-sandbox/services.js';
 
 registerSharedProcessRemoteService(IDiagnosticsService, 'diagnostics');
diff --git a/src/vs/platform/diagnostics/node/diagnosticsService.ts b/src/vs/platform/diagnostics/node/diagnosticsService.ts
index 26a715bfc19..5f6efd51dd4 100644
--- a/src/vs/platform/diagnostics/node/diagnosticsService.ts
+++ b/src/vs/platform/diagnostics/node/diagnosticsService.ts
@@ -2,23 +2,25 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+
+import * as fs from 'fs';
 import * as osLib from 'os';
-import { Promises } from 'vs/base/common/async';
-import { getNodeType, parse, ParseError } from 'vs/base/common/json';
-import { Schemas } from 'vs/base/common/network';
-import { basename, join } from 'vs/base/common/path';
-import { isLinux, isWindows } from 'vs/base/common/platform';
-import { ProcessItem } from 'vs/base/common/processes';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { URI } from 'vs/base/common/uri';
-import { virtualMachineHint } from 'vs/base/node/id';
-import { IDirent, Promises as pfs } from 'vs/base/node/pfs';
-import { listProcesses } from 'vs/base/node/ps';
-import { IDiagnosticsService, IMachineInfo, IMainProcessDiagnostics, IRemoteDiagnosticError, IRemoteDiagnosticInfo, isRemoteDiagnosticError, IWorkspaceInformation, PerformanceInfo, SystemInfo, WorkspaceStatItem, WorkspaceStats } from 'vs/platform/diagnostics/common/diagnostics';
-import { ByteSize } from 'vs/platform/files/common/files';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IWorkspace } from 'vs/platform/workspace/common/workspace';
+import { Promises } from '../../../base/common/async.js';
+import { getNodeType, parse, ParseError } from '../../../base/common/json.js';
+import { Schemas } from '../../../base/common/network.js';
+import { basename, join } from '../../../base/common/path.js';
+import { isLinux, isWindows } from '../../../base/common/platform.js';
+import { ProcessItem } from '../../../base/common/processes.js';
+import { StopWatch } from '../../../base/common/stopwatch.js';
+import { URI } from '../../../base/common/uri.js';
+import { virtualMachineHint } from '../../../base/node/id.js';
+import { IDirent, Promises as pfs } from '../../../base/node/pfs.js';
+import { listProcesses } from '../../../base/node/ps.js';
+import { IDiagnosticsService, IMachineInfo, IMainProcessDiagnostics, IRemoteDiagnosticError, IRemoteDiagnosticInfo, isRemoteDiagnosticError, IWorkspaceInformation, PerformanceInfo, SystemInfo, WorkspaceStatItem, WorkspaceStats } from '../common/diagnostics.js';
+import { ByteSize } from '../../files/common/files.js';
+import { IProductService } from '../../product/common/productService.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
+import { IWorkspace } from '../../workspace/common/workspace.js';
 
 interface ConfigFilePatterns {
 	tag: string;
@@ -26,10 +28,10 @@ interface ConfigFilePatterns {
 	relativePathPattern?: RegExp;
 }
 
-const worksapceStatsCache = new Map<string, Promise<WorkspaceStats>>();
+const workspaceStatsCache = new Map<string, Promise<WorkspaceStats>>();
 export async function collectWorkspaceStats(folder: string, filter: string[]): Promise<WorkspaceStats> {
 	const cacheKey = `${folder}::${filter.join(':')}`;
-	const cached = worksapceStatsCache.get(cacheKey);
+	const cached = workspaceStatsCache.get(cacheKey);
 	if (cached) {
 		return cached;
 	}
@@ -53,7 +55,8 @@ export async function collectWorkspaceStats(folder: string, filter: string[]): P
 		{ tag: 'cmake', filePattern: /^.+\.cmake$/i },
 		{ tag: 'github-actions', filePattern: /^.+\.ya?ml$/i, relativePathPattern: /^\.github(?:\/|\\)workflows$/i },
 		{ tag: 'devcontainer.json', filePattern: /^devcontainer\.json$/i },
-		{ tag: 'dockerfile', filePattern: /^(dockerfile|docker\-compose\.ya?ml)$/i }
+		{ tag: 'dockerfile', filePattern: /^(dockerfile|docker\-compose\.ya?ml)$/i },
+		{ tag: 'cursorrules', filePattern: /^\.cursorrules$/i },
 	];
 
 	const fileTypes = new Map<string, number>();
@@ -148,7 +151,7 @@ export async function collectWorkspaceStats(folder: string, filter: string[]): P
 		});
 	});
 
-	worksapceStatsCache.set(cacheKey, statsPromise);
+	workspaceStatsCache.set(cacheKey, statsPromise);
 	return statsPromise;
 }
 
@@ -178,7 +181,7 @@ export async function collectLaunchConfigs(folder: string): Promise<WorkspaceSta
 		const launchConfigs = new Map<string, number>();
 		const launchConfig = join(folder, '.vscode', 'launch.json');
 
-		const contents = await pfs.readFile(launchConfig);
+		const contents = await fs.promises.readFile(launchConfig);
 
 		const errors: ParseError[] = [];
 		const json = parse(contents.toString(), errors);
diff --git a/src/vs/platform/dialogs/common/dialogs.ts b/src/vs/platform/dialogs/common/dialogs.ts
index cc7da713779..dc1c785356e 100644
--- a/src/vs/platform/dialogs/common/dialogs.ts
+++ b/src/vs/platform/dialogs/common/dialogs.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { basename } from 'vs/base/common/resources';
-import Severity from 'vs/base/common/severity';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ITelemetryData } from 'vs/platform/telemetry/common/telemetry';
-import { MessageBoxOptions } from 'vs/base/parts/sandbox/common/electronTypes';
-import { mnemonicButtonLabel } from 'vs/base/common/labels';
-import { isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { deepClone } from 'vs/base/common/objects';
+import { Event } from '../../../base/common/event.js';
+import { ThemeIcon } from '../../../base/common/themables.js';
+import { IMarkdownString } from '../../../base/common/htmlContent.js';
+import { basename } from '../../../base/common/resources.js';
+import Severity from '../../../base/common/severity.js';
+import { URI } from '../../../base/common/uri.js';
+import { localize } from '../../../nls.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { ITelemetryData } from '../../telemetry/common/telemetry.js';
+import { MessageBoxOptions } from '../../../base/parts/sandbox/common/electronTypes.js';
+import { mnemonicButtonLabel } from '../../../base/common/labels.js';
+import { isLinux, isMacintosh, isWindows } from '../../../base/common/platform.js';
+import { IProductService } from '../../product/common/productService.js';
+import { deepClone } from '../../../base/common/objects.js';
 
 export interface IDialogArgs {
 	readonly confirmArgs?: IConfirmDialogArgs;
diff --git a/src/vs/platform/dialogs/electron-main/dialogMainService.ts b/src/vs/platform/dialogs/electron-main/dialogMainService.ts
index bc1230a48ea..102075083af 100644
--- a/src/vs/platform/dialogs/electron-main/dialogMainService.ts
+++ b/src/vs/platform/dialogs/electron-main/dialogMainService.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BrowserWindow, dialog, FileFilter, MessageBoxOptions, MessageBoxReturnValue, OpenDialogOptions, OpenDialogReturnValue, SaveDialogOptions, SaveDialogReturnValue } from 'electron';
-import { Queue } from 'vs/base/common/async';
-import { hash } from 'vs/base/common/hash';
-import { mnemonicButtonLabel } from 'vs/base/common/labels';
-import { Disposable, dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { normalizeNFC } from 'vs/base/common/normalization';
-import { isMacintosh } from 'vs/base/common/platform';
-import { Promises } from 'vs/base/node/pfs';
-import { localize } from 'vs/nls';
-import { INativeOpenDialogOptions, massageMessageBoxOptions } from 'vs/platform/dialogs/common/dialogs';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { WORKSPACE_FILTER } from 'vs/platform/workspace/common/workspace';
+import electron from 'electron';
+import { Queue } from '../../../base/common/async.js';
+import { hash } from '../../../base/common/hash.js';
+import { mnemonicButtonLabel } from '../../../base/common/labels.js';
+import { Disposable, dispose, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { normalizeNFC } from '../../../base/common/normalization.js';
+import { isMacintosh } from '../../../base/common/platform.js';
+import { Promises } from '../../../base/node/pfs.js';
+import { localize } from '../../../nls.js';
+import { INativeOpenDialogOptions, massageMessageBoxOptions } from '../common/dialogs.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { ILogService } from '../../log/common/log.js';
+import { IProductService } from '../../product/common/productService.js';
+import { WORKSPACE_FILTER } from '../../workspace/common/workspace.js';
 
 export const IDialogMainService = createDecorator<IDialogMainService>('dialogMainService');
 
@@ -24,14 +24,14 @@ export interface IDialogMainService {
 
 	readonly _serviceBrand: undefined;
 
-	pickFileFolder(options: INativeOpenDialogOptions, window?: BrowserWindow): Promise<string[] | undefined>;
-	pickFolder(options: INativeOpenDialogOptions, window?: BrowserWindow): Promise<string[] | undefined>;
-	pickFile(options: INativeOpenDialogOptions, window?: BrowserWindow): Promise<string[] | undefined>;
-	pickWorkspace(options: INativeOpenDialogOptions, window?: BrowserWindow): Promise<string[] | undefined>;
+	pickFileFolder(options: INativeOpenDialogOptions, window?: electron.BrowserWindow): Promise<string[] | undefined>;
+	pickFolder(options: INativeOpenDialogOptions, window?: electron.BrowserWindow): Promise<string[] | undefined>;
+	pickFile(options: INativeOpenDialogOptions, window?: electron.BrowserWindow): Promise<string[] | undefined>;
+	pickWorkspace(options: INativeOpenDialogOptions, window?: electron.BrowserWindow): Promise<string[] | undefined>;
 
-	showMessageBox(options: MessageBoxOptions, window?: BrowserWindow): Promise<MessageBoxReturnValue>;
-	showSaveDialog(options: SaveDialogOptions, window?: BrowserWindow): Promise<SaveDialogReturnValue>;
-	showOpenDialog(options: OpenDialogOptions, window?: BrowserWindow): Promise<OpenDialogReturnValue>;
+	showMessageBox(options: electron.MessageBoxOptions, window?: electron.BrowserWindow): Promise<electron.MessageBoxReturnValue>;
+	showSaveDialog(options: electron.SaveDialogOptions, window?: electron.BrowserWindow): Promise<electron.SaveDialogReturnValue>;
+	showOpenDialog(options: electron.OpenDialogOptions, window?: electron.BrowserWindow): Promise<electron.OpenDialogReturnValue>;
 }
 
 interface IInternalNativeOpenDialogOptions extends INativeOpenDialogOptions {
@@ -40,7 +40,7 @@ interface IInternalNativeOpenDialogOptions extends INativeOpenDialogOptions {
 
 	readonly title: string;
 	readonly buttonLabel?: string;
-	readonly filters?: FileFilter[];
+	readonly filters?: electron.FileFilter[];
 }
 
 export class DialogMainService implements IDialogMainService {
@@ -48,8 +48,8 @@ export class DialogMainService implements IDialogMainService {
 	declare readonly _serviceBrand: undefined;
 
 	private readonly windowFileDialogLocks = new Map<number, Set<number>>();
-	private readonly windowDialogQueues = new Map<number, Queue<MessageBoxReturnValue | SaveDialogReturnValue | OpenDialogReturnValue>>();
-	private readonly noWindowDialogueQueue = new Queue<MessageBoxReturnValue | SaveDialogReturnValue | OpenDialogReturnValue>();
+	private readonly windowDialogQueues = new Map<number, Queue<electron.MessageBoxReturnValue | electron.SaveDialogReturnValue | electron.OpenDialogReturnValue>>();
+	private readonly noWindowDialogueQueue = new Queue<electron.MessageBoxReturnValue | electron.SaveDialogReturnValue | electron.OpenDialogReturnValue>();
 
 	constructor(
 		@ILogService private readonly logService: ILogService,
@@ -57,19 +57,19 @@ export class DialogMainService implements IDialogMainService {
 	) {
 	}
 
-	pickFileFolder(options: INativeOpenDialogOptions, window?: BrowserWindow): Promise<string[] | undefined> {
+	pickFileFolder(options: INativeOpenDialogOptions, window?: electron.BrowserWindow): Promise<string[] | undefined> {
 		return this.doPick({ ...options, pickFolders: true, pickFiles: true, title: localize('open', "Open") }, window);
 	}
 
-	pickFolder(options: INativeOpenDialogOptions, window?: BrowserWindow): Promise<string[] | undefined> {
+	pickFolder(options: INativeOpenDialogOptions, window?: electron.BrowserWindow): Promise<string[] | undefined> {
 		return this.doPick({ ...options, pickFolders: true, title: localize('openFolder', "Open Folder") }, window);
 	}
 
-	pickFile(options: INativeOpenDialogOptions, window?: BrowserWindow): Promise<string[] | undefined> {
+	pickFile(options: INativeOpenDialogOptions, window?: electron.BrowserWindow): Promise<string[] | undefined> {
 		return this.doPick({ ...options, pickFiles: true, title: localize('openFile', "Open File") }, window);
 	}
 
-	pickWorkspace(options: INativeOpenDialogOptions, window?: BrowserWindow): Promise<string[] | undefined> {
+	pickWorkspace(options: INativeOpenDialogOptions, window?: electron.BrowserWindow): Promise<string[] | undefined> {
 		const title = localize('openWorkspaceTitle', "Open Workspace from File");
 		const buttonLabel = mnemonicButtonLabel(localize({ key: 'openWorkspace', comment: ['&& denotes a mnemonic'] }, "&&Open"));
 		const filters = WORKSPACE_FILTER;
@@ -77,10 +77,10 @@ export class DialogMainService implements IDialogMainService {
 		return this.doPick({ ...options, pickFiles: true, title, filters, buttonLabel }, window);
 	}
 
-	private async doPick(options: IInternalNativeOpenDialogOptions, window?: BrowserWindow): Promise<string[] | undefined> {
+	private async doPick(options: IInternalNativeOpenDialogOptions, window?: electron.BrowserWindow): Promise<string[] | undefined> {
 
 		// Ensure dialog options
-		const dialogOptions: OpenDialogOptions = {
+		const dialogOptions: electron.OpenDialogOptions = {
 			title: options.title,
 			buttonLabel: options.buttonLabel,
 			filters: options.filters,
@@ -105,7 +105,7 @@ export class DialogMainService implements IDialogMainService {
 		}
 
 		// Show Dialog
-		const result = await this.showOpenDialog(dialogOptions, (window || BrowserWindow.getFocusedWindow()) ?? undefined);
+		const result = await this.showOpenDialog(dialogOptions, (window || electron.BrowserWindow.getFocusedWindow()) ?? undefined);
 		if (result && result.filePaths && result.filePaths.length > 0) {
 			return result.filePaths;
 		}
@@ -113,14 +113,14 @@ export class DialogMainService implements IDialogMainService {
 		return undefined;
 	}
 
-	private getWindowDialogQueue<T extends MessageBoxReturnValue | SaveDialogReturnValue | OpenDialogReturnValue>(window?: BrowserWindow): Queue<T> {
+	private getWindowDialogQueue<T extends electron.MessageBoxReturnValue | electron.SaveDialogReturnValue | electron.OpenDialogReturnValue>(window?: electron.BrowserWindow): Queue<T> {
 
 		// Queue message box requests per window so that one can show
 		// after the other.
 		if (window) {
 			let windowDialogQueue = this.windowDialogQueues.get(window.id);
 			if (!windowDialogQueue) {
-				windowDialogQueue = new Queue<MessageBoxReturnValue | SaveDialogReturnValue | OpenDialogReturnValue>();
+				windowDialogQueue = new Queue<electron.MessageBoxReturnValue | electron.SaveDialogReturnValue | electron.OpenDialogReturnValue>();
 				this.windowDialogQueues.set(window.id, windowDialogQueue);
 			}
 
@@ -130,15 +130,15 @@ export class DialogMainService implements IDialogMainService {
 		}
 	}
 
-	showMessageBox(rawOptions: MessageBoxOptions, window?: BrowserWindow): Promise<MessageBoxReturnValue> {
-		return this.getWindowDialogQueue<MessageBoxReturnValue>(window).queue(async () => {
+	showMessageBox(rawOptions: electron.MessageBoxOptions, window?: electron.BrowserWindow): Promise<electron.MessageBoxReturnValue> {
+		return this.getWindowDialogQueue<electron.MessageBoxReturnValue>(window).queue(async () => {
 			const { options, buttonIndeces } = massageMessageBoxOptions(rawOptions, this.productService);
 
-			let result: MessageBoxReturnValue | undefined = undefined;
+			let result: electron.MessageBoxReturnValue | undefined = undefined;
 			if (window) {
-				result = await dialog.showMessageBox(window, options);
+				result = await electron.dialog.showMessageBox(window, options);
 			} else {
-				result = await dialog.showMessageBox(options);
+				result = await electron.dialog.showMessageBox(options);
 			}
 
 			return {
@@ -148,7 +148,7 @@ export class DialogMainService implements IDialogMainService {
 		});
 	}
 
-	async showSaveDialog(options: SaveDialogOptions, window?: BrowserWindow): Promise<SaveDialogReturnValue> {
+	async showSaveDialog(options: electron.SaveDialogOptions, window?: electron.BrowserWindow): Promise<electron.SaveDialogReturnValue> {
 
 		// Prevent duplicates of the same dialog queueing at the same time
 		const fileDialogLock = this.acquireFileDialogLock(options, window);
@@ -159,12 +159,12 @@ export class DialogMainService implements IDialogMainService {
 		}
 
 		try {
-			return await this.getWindowDialogQueue<SaveDialogReturnValue>(window).queue(async () => {
-				let result: SaveDialogReturnValue;
+			return await this.getWindowDialogQueue<electron.SaveDialogReturnValue>(window).queue(async () => {
+				let result: electron.SaveDialogReturnValue;
 				if (window) {
-					result = await dialog.showSaveDialog(window, options);
+					result = await electron.dialog.showSaveDialog(window, options);
 				} else {
-					result = await dialog.showSaveDialog(options);
+					result = await electron.dialog.showSaveDialog(options);
 				}
 
 				result.filePath = this.normalizePath(result.filePath);
@@ -190,7 +190,7 @@ export class DialogMainService implements IDialogMainService {
 		return paths.map(path => this.normalizePath(path));
 	}
 
-	async showOpenDialog(options: OpenDialogOptions, window?: BrowserWindow): Promise<OpenDialogReturnValue> {
+	async showOpenDialog(options: electron.OpenDialogOptions, window?: electron.BrowserWindow): Promise<electron.OpenDialogReturnValue> {
 
 		// Ensure the path exists (if provided)
 		if (options.defaultPath) {
@@ -209,12 +209,12 @@ export class DialogMainService implements IDialogMainService {
 		}
 
 		try {
-			return await this.getWindowDialogQueue<OpenDialogReturnValue>(window).queue(async () => {
-				let result: OpenDialogReturnValue;
+			return await this.getWindowDialogQueue<electron.OpenDialogReturnValue>(window).queue(async () => {
+				let result: electron.OpenDialogReturnValue;
 				if (window) {
-					result = await dialog.showOpenDialog(window, options);
+					result = await electron.dialog.showOpenDialog(window, options);
 				} else {
-					result = await dialog.showOpenDialog(options);
+					result = await electron.dialog.showOpenDialog(options);
 				}
 
 				result.filePaths = this.normalizePaths(result.filePaths);
@@ -226,7 +226,7 @@ export class DialogMainService implements IDialogMainService {
 		}
 	}
 
-	private acquireFileDialogLock(options: SaveDialogOptions | OpenDialogOptions, window?: BrowserWindow): IDisposable | undefined {
+	private acquireFileDialogLock(options: electron.SaveDialogOptions | electron.OpenDialogOptions, window?: electron.BrowserWindow): IDisposable | undefined {
 
 		// If no window is provided, allow as many dialogs as
 		// needed since we consider them not modal per window
diff --git a/src/vs/platform/dialogs/test/common/dialog.test.ts b/src/vs/platform/dialogs/test/common/dialog.test.ts
index 1c5db7e80b8..aadd0cc9af5 100644
--- a/src/vs/platform/dialogs/test/common/dialog.test.ts
+++ b/src/vs/platform/dialogs/test/common/dialog.test.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { deepEqual } from 'assert';
-import { isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IMassagedMessageBoxOptions, massageMessageBoxOptions } from 'vs/platform/dialogs/common/dialogs';
-import product from 'vs/platform/product/common/product';
-import { IProductService } from 'vs/platform/product/common/productService';
+import { isLinux, isMacintosh, isWindows } from '../../../../base/common/platform.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { IMassagedMessageBoxOptions, massageMessageBoxOptions } from '../../common/dialogs.js';
+import product from '../../../product/common/product.js';
+import { IProductService } from '../../../product/common/productService.js';
 
 suite('Dialog', () => {
 
diff --git a/src/vs/platform/dialogs/test/common/testDialogService.ts b/src/vs/platform/dialogs/test/common/testDialogService.ts
index f63897d47f0..e491fe9c6d4 100644
--- a/src/vs/platform/dialogs/test/common/testDialogService.ts
+++ b/src/vs/platform/dialogs/test/common/testDialogService.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import Severity from 'vs/base/common/severity';
-import { IConfirmation, IConfirmationResult, IDialogService, IInputResult, IPrompt, IPromptBaseButton, IPromptResult, IPromptResultWithCancel, IPromptWithCustomCancel, IPromptWithDefaultCancel } from 'vs/platform/dialogs/common/dialogs';
+import { Event } from '../../../../base/common/event.js';
+import Severity from '../../../../base/common/severity.js';
+import { IConfirmation, IConfirmationResult, IDialogService, IInputResult, IPrompt, IPromptBaseButton, IPromptResult, IPromptResultWithCancel, IPromptWithCustomCancel, IPromptWithDefaultCancel } from '../../common/dialogs.js';
 
 export class TestDialogService implements IDialogService {
 
diff --git a/src/vs/platform/dnd/browser/dnd.ts b/src/vs/platform/dnd/browser/dnd.ts
index b742b3ae448..6db161514a1 100644
--- a/src/vs/platform/dnd/browser/dnd.ts
+++ b/src/vs/platform/dnd/browser/dnd.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DataTransfers } from 'vs/base/browser/dnd';
-import { mainWindow } from 'vs/base/browser/window';
-import { DragMouseEvent } from 'vs/base/browser/mouseEvent';
-import { coalesce } from 'vs/base/common/arrays';
-import { DeferredPromise } from 'vs/base/common/async';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { ResourceMap } from 'vs/base/common/map';
-import { parse } from 'vs/base/common/marshalling';
-import { Schemas } from 'vs/base/common/network';
-import { isWeb } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IBaseTextResourceEditorInput } from 'vs/platform/editor/common/editor';
-import { HTMLFileSystemProvider } from 'vs/platform/files/browser/htmlFileSystemProvider';
-import { WebFileSystemAccess } from 'vs/platform/files/browser/webFileSystemAccess';
-import { ByteSize, IFileService } from 'vs/platform/files/common/files';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { extractSelection } from 'vs/platform/opener/common/opener';
-import { Registry } from 'vs/platform/registry/common/platform';
+import { DataTransfers } from '../../../base/browser/dnd.js';
+import { mainWindow } from '../../../base/browser/window.js';
+import { DragMouseEvent } from '../../../base/browser/mouseEvent.js';
+import { coalesce } from '../../../base/common/arrays.js';
+import { DeferredPromise } from '../../../base/common/async.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { ResourceMap } from '../../../base/common/map.js';
+import { parse } from '../../../base/common/marshalling.js';
+import { Schemas } from '../../../base/common/network.js';
+import { isWeb } from '../../../base/common/platform.js';
+import { URI } from '../../../base/common/uri.js';
+import { localize } from '../../../nls.js';
+import { IDialogService } from '../../dialogs/common/dialogs.js';
+import { IBaseTextResourceEditorInput } from '../../editor/common/editor.js';
+import { HTMLFileSystemProvider } from '../../files/browser/htmlFileSystemProvider.js';
+import { WebFileSystemAccess } from '../../files/browser/webFileSystemAccess.js';
+import { ByteSize, IFileService } from '../../files/common/files.js';
+import { IInstantiationService, ServicesAccessor } from '../../instantiation/common/instantiation.js';
+import { extractSelection } from '../../opener/common/opener.js';
+import { Registry } from '../../registry/common/platform.js';
 
 export interface FileAdditionalNativeProperties {
 	/**
diff --git a/src/vs/platform/download/common/download.ts b/src/vs/platform/download/common/download.ts
index cea2b9882d5..d608e078ecb 100644
--- a/src/vs/platform/download/common/download.ts
+++ b/src/vs/platform/download/common/download.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { URI } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { URI } from '../../../base/common/uri.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 export const IDownloadService = createDecorator<IDownloadService>('downloadService');
 
diff --git a/src/vs/platform/download/common/downloadIpc.ts b/src/vs/platform/download/common/downloadIpc.ts
index 3e88e8f668e..c3ba6d6c249 100644
--- a/src/vs/platform/download/common/downloadIpc.ts
+++ b/src/vs/platform/download/common/downloadIpc.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { URI } from 'vs/base/common/uri';
-import { IURITransformer } from 'vs/base/common/uriIpc';
-import { IChannel, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
-import { IDownloadService } from 'vs/platform/download/common/download';
+import { Event } from '../../../base/common/event.js';
+import { URI } from '../../../base/common/uri.js';
+import { IURITransformer } from '../../../base/common/uriIpc.js';
+import { IChannel, IServerChannel } from '../../../base/parts/ipc/common/ipc.js';
+import { IDownloadService } from './download.js';
 
 export class DownloadServiceChannel implements IServerChannel {
 
diff --git a/src/vs/platform/download/common/downloadService.ts b/src/vs/platform/download/common/downloadService.ts
index 7c8309713cf..79cedcb1668 100644
--- a/src/vs/platform/download/common/downloadService.ts
+++ b/src/vs/platform/download/common/downloadService.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { IDownloadService } from 'vs/platform/download/common/download';
-import { IFileService } from 'vs/platform/files/common/files';
-import { asTextOrError, IRequestService } from 'vs/platform/request/common/request';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Schemas } from '../../../base/common/network.js';
+import { URI } from '../../../base/common/uri.js';
+import { IDownloadService } from './download.js';
+import { IFileService } from '../../files/common/files.js';
+import { asTextOrError, IRequestService } from '../../request/common/request.js';
 
 export class DownloadService implements IDownloadService {
 
diff --git a/src/vs/platform/editor/common/editor.ts b/src/vs/platform/editor/common/editor.ts
index 159bea6fc8e..ae3d50b2570 100644
--- a/src/vs/platform/editor/common/editor.ts
+++ b/src/vs/platform/editor/common/editor.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { URI } from '../../../base/common/uri.js';
 
 export interface IResolvableEditorModel extends IDisposable {
 
diff --git a/src/vs/platform/encryption/common/encryptionService.ts b/src/vs/platform/encryption/common/encryptionService.ts
index b36ef5724a6..94e2bfa5318 100644
--- a/src/vs/platform/encryption/common/encryptionService.ts
+++ b/src/vs/platform/encryption/common/encryptionService.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 export const IEncryptionService = createDecorator<IEncryptionService>('encryptionService');
 export interface IEncryptionService extends ICommonEncryptionService {
diff --git a/src/vs/platform/encryption/electron-main/encryptionMainService.ts b/src/vs/platform/encryption/electron-main/encryptionMainService.ts
index c937778c08d..1b4b1e05f28 100644
--- a/src/vs/platform/encryption/electron-main/encryptionMainService.ts
+++ b/src/vs/platform/encryption/electron-main/encryptionMainService.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { safeStorage as safeStorageElectron, app } from 'electron';
-import { isMacintosh, isWindows } from 'vs/base/common/platform';
-import { KnownStorageProvider, IEncryptionMainService, PasswordStoreCLIOption } from 'vs/platform/encryption/common/encryptionService';
-import { ILogService } from 'vs/platform/log/common/log';
+import { isMacintosh, isWindows } from '../../../base/common/platform.js';
+import { KnownStorageProvider, IEncryptionMainService, PasswordStoreCLIOption } from '../common/encryptionService.js';
+import { ILogService } from '../../log/common/log.js';
 
 // These APIs are currently only supported in our custom build of electron so
 // we need to guard against them not being available.
@@ -25,12 +25,14 @@ export class EncryptionMainService implements IEncryptionMainService {
 	) {
 		// if this commandLine switch is set, the user has opted in to using basic text encryption
 		if (app.commandLine.getSwitchValue('password-store') === PasswordStoreCLIOption.basic) {
+			this.logService.trace('[EncryptionMainService] setting usePlainTextEncryption to true...');
 			safeStorage.setUsePlainTextEncryption?.(true);
+			this.logService.trace('[EncryptionMainService] set usePlainTextEncryption to true');
 		}
 	}
 
 	async encrypt(value: string): Promise<string> {
-		this.logService.trace('[EncryptionMainService] Encrypting value.');
+		this.logService.trace('[EncryptionMainService] Encrypting value...');
 		try {
 			const result = JSON.stringify(safeStorage.encryptString(value));
 			this.logService.trace('[EncryptionMainService] Encrypted value.');
@@ -50,7 +52,7 @@ export class EncryptionMainService implements IEncryptionMainService {
 			}
 			const bufferToDecrypt = Buffer.from(parsedValue.data);
 
-			this.logService.trace('[EncryptionMainService] Decrypting value.');
+			this.logService.trace('[EncryptionMainService] Decrypting value...');
 			const result = safeStorage.decryptString(bufferToDecrypt);
 			this.logService.trace('[EncryptionMainService] Decrypted value.');
 			return result;
@@ -61,7 +63,10 @@ export class EncryptionMainService implements IEncryptionMainService {
 	}
 
 	isEncryptionAvailable(): Promise<boolean> {
-		return Promise.resolve(safeStorage.isEncryptionAvailable());
+		this.logService.trace('[EncryptionMainService] Checking if encryption is available...');
+		const result = safeStorage.isEncryptionAvailable();
+		this.logService.trace('[EncryptionMainService] Encryption is available: ', result);
+		return Promise.resolve(result);
 	}
 
 	getKeyStorageProvider(): Promise<KnownStorageProvider> {
@@ -73,7 +78,9 @@ export class EncryptionMainService implements IEncryptionMainService {
 		}
 		if (safeStorage.getSelectedStorageBackend) {
 			try {
+				this.logService.trace('[EncryptionMainService] Getting selected storage backend...');
 				const result = safeStorage.getSelectedStorageBackend() as KnownStorageProvider;
+				this.logService.trace('[EncryptionMainService] Selected storage backend: ', result);
 				return Promise.resolve(result);
 			} catch (e) {
 				this.logService.error(e);
@@ -95,6 +102,8 @@ export class EncryptionMainService implements IEncryptionMainService {
 			throw new Error('Setting plain text encryption is not supported.');
 		}
 
+		this.logService.trace('[EncryptionMainService] Setting usePlainTextEncryption to true...');
 		safeStorage.setUsePlainTextEncryption(true);
+		this.logService.trace('[EncryptionMainService] Set usePlainTextEncryption to true');
 	}
 }
diff --git a/src/vs/platform/environment/common/environment.ts b/src/vs/platform/environment/common/environment.ts
index 6c2e2b551ee..109b74c0613 100644
--- a/src/vs/platform/environment/common/environment.ts
+++ b/src/vs/platform/environment/common/environment.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
-import { createDecorator, refineServiceDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { URI } from '../../../base/common/uri.js';
+import { NativeParsedArgs } from './argv.js';
+import { createDecorator, refineServiceDecorator } from '../../instantiation/common/instantiation.js';
 
 export const IEnvironmentService = createDecorator<IEnvironmentService>('environmentService');
 export const INativeEnvironmentService = refineServiceDecorator<IEnvironmentService, INativeEnvironmentService>(IEnvironmentService);
diff --git a/src/vs/platform/environment/common/environmentService.ts b/src/vs/platform/environment/common/environmentService.ts
index cd55aa9b259..1984abb76c8 100644
--- a/src/vs/platform/environment/common/environmentService.ts
+++ b/src/vs/platform/environment/common/environmentService.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { toLocalISOString } from 'vs/base/common/date';
-import { memoize } from 'vs/base/common/decorators';
-import { FileAccess, Schemas } from 'vs/base/common/network';
-import { dirname, join, normalize, resolve } from 'vs/base/common/path';
-import { env } from 'vs/base/common/process';
-import { joinPath } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
-import { ExtensionKind, IExtensionHostDebugParams, INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IProductService } from 'vs/platform/product/common/productService';
+import { toLocalISOString } from '../../../base/common/date.js';
+import { memoize } from '../../../base/common/decorators.js';
+import { FileAccess, Schemas } from '../../../base/common/network.js';
+import { dirname, join, normalize, resolve } from '../../../base/common/path.js';
+import { env } from '../../../base/common/process.js';
+import { joinPath } from '../../../base/common/resources.js';
+import { URI } from '../../../base/common/uri.js';
+import { NativeParsedArgs } from './argv.js';
+import { ExtensionKind, IExtensionHostDebugParams, INativeEnvironmentService } from './environment.js';
+import { IProductService } from '../../product/common/productService.js';
 
 export const EXTENSION_IDENTIFIER_WITH_LOG_REGEX = /^([^.]+\..+)[:=](.+)$/;
 
diff --git a/src/vs/platform/environment/electron-main/environmentMainService.ts b/src/vs/platform/environment/electron-main/environmentMainService.ts
index 748ff075783..6fe1e58d11a 100644
--- a/src/vs/platform/environment/electron-main/environmentMainService.ts
+++ b/src/vs/platform/environment/electron-main/environmentMainService.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { memoize } from 'vs/base/common/decorators';
-import { join } from 'vs/base/common/path';
-import { isLinux } from 'vs/base/common/platform';
-import { createStaticIPCHandle } from 'vs/base/parts/ipc/node/ipc.net';
-import { IEnvironmentService, INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-import { NativeEnvironmentService } from 'vs/platform/environment/node/environmentService';
-import { refineServiceDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { memoize } from '../../../base/common/decorators.js';
+import { join } from '../../../base/common/path.js';
+import { isLinux } from '../../../base/common/platform.js';
+import { createStaticIPCHandle } from '../../../base/parts/ipc/node/ipc.net.js';
+import { IEnvironmentService, INativeEnvironmentService } from '../common/environment.js';
+import { NativeEnvironmentService } from '../node/environmentService.js';
+import { refineServiceDecorator } from '../../instantiation/common/instantiation.js';
 
 export const IEnvironmentMainService = refineServiceDecorator<IEnvironmentService, IEnvironmentMainService>(IEnvironmentService);
 
@@ -19,9 +19,6 @@ export const IEnvironmentMainService = refineServiceDecorator<IEnvironmentServic
  */
 export interface IEnvironmentMainService extends INativeEnvironmentService {
 
-	// --- NLS cache path
-	readonly cachedLanguagesPath: string;
-
 	// --- backup paths
 	readonly backupHome: string;
 
@@ -44,9 +41,6 @@ export class EnvironmentMainService extends NativeEnvironmentService implements
 
 	private _snapEnv: Record<string, string> = {};
 
-	@memoize
-	get cachedLanguagesPath(): string { return join(this.userDataPath, 'clp'); }
-
 	@memoize
 	get backupHome(): string { return join(this.userDataPath, 'Backups'); }
 
diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts
index 16a942afe05..f0cec3398a7 100644
--- a/src/vs/platform/environment/node/argv.ts
+++ b/src/vs/platform/environment/node/argv.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import minimist from 'minimist';
-import { isWindows } from 'vs/base/common/platform';
-import { localize } from 'vs/nls';
-import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
+import { isWindows } from '../../../base/common/platform.js';
+import { localize } from '../../../nls.js';
+import { NativeParsedArgs } from '../common/argv.js';
 
 /**
  * This code is also used by standalone cli's. Avoid adding any other dependencies.
diff --git a/src/vs/platform/environment/node/argvHelper.ts b/src/vs/platform/environment/node/argvHelper.ts
index a94fca911ea..eb645fc902f 100644
--- a/src/vs/platform/environment/node/argvHelper.ts
+++ b/src/vs/platform/environment/node/argvHelper.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { IProcessEnvironment } from 'vs/base/common/platform';
-import { localize } from 'vs/nls';
-import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
-import { ErrorReporter, NATIVE_CLI_COMMANDS, OPTIONS, parseArgs } from 'vs/platform/environment/node/argv';
+import { IProcessEnvironment } from '../../../base/common/platform.js';
+import { localize } from '../../../nls.js';
+import { NativeParsedArgs } from '../common/argv.js';
+import { ErrorReporter, NATIVE_CLI_COMMANDS, OPTIONS, parseArgs } from './argv.js';
 
 function parseAndValidate(cmdLineArgs: string[], reportWarnings: boolean): NativeParsedArgs {
 	const onMultipleValues = (id: string, val: string) => {
diff --git a/src/vs/platform/environment/node/environmentService.ts b/src/vs/platform/environment/node/environmentService.ts
index c3812e86b38..ae9e7e1d477 100644
--- a/src/vs/platform/environment/node/environmentService.ts
+++ b/src/vs/platform/environment/node/environmentService.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { homedir, tmpdir } from 'os';
-import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
-import { IDebugParams } from 'vs/platform/environment/common/environment';
-import { AbstractNativeEnvironmentService, parseDebugParams } from 'vs/platform/environment/common/environmentService';
-import { getUserDataPath } from 'vs/platform/environment/node/userDataPath';
-import { IProductService } from 'vs/platform/product/common/productService';
+import { NativeParsedArgs } from '../common/argv.js';
+import { IDebugParams } from '../common/environment.js';
+import { AbstractNativeEnvironmentService, parseDebugParams } from '../common/environmentService.js';
+import { getUserDataPath } from './userDataPath.js';
+import { IProductService } from '../../product/common/productService.js';
 
 export class NativeEnvironmentService extends AbstractNativeEnvironmentService {
 
diff --git a/src/vs/platform/environment/node/stdin.ts b/src/vs/platform/environment/node/stdin.ts
index 56ab151407d..c3ecd62f953 100644
--- a/src/vs/platform/environment/node/stdin.ts
+++ b/src/vs/platform/environment/node/stdin.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as fs from 'fs';
 import { tmpdir } from 'os';
-import { Queue } from 'vs/base/common/async';
-import { randomPath } from 'vs/base/common/extpath';
-import { Promises } from 'vs/base/node/pfs';
-import { resolveTerminalEncoding } from 'vs/base/node/terminalEncoding';
+import { Queue } from '../../../base/common/async.js';
+import { randomPath } from '../../../base/common/extpath.js';
+import { resolveTerminalEncoding } from '../../../base/node/terminalEncoding.js';
 
 export function hasStdinWithoutTty() {
 	try {
@@ -41,12 +41,12 @@ export function getStdinFilePath(): string {
 export async function readFromStdin(targetPath: string, verbose: boolean, onEnd?: Function): Promise<void> {
 
 	let [encoding, iconv] = await Promise.all([
-		resolveTerminalEncoding(verbose),	// respect terminal encoding when piping into file
-		import('@vscode/iconv-lite-umd'),	// lazy load encoding module for usage
-		Promises.appendFile(targetPath, '') // make sure file exists right away (https://github.com/microsoft/vscode/issues/155341)
+		resolveTerminalEncoding(verbose),		// respect terminal encoding when piping into file
+		import('@vscode/iconv-lite-umd'),		// lazy load encoding module for usage
+		fs.promises.appendFile(targetPath, '') 	// make sure file exists right away (https://github.com/microsoft/vscode/issues/155341)
 	]);
 
-	if (!iconv.encodingExists(encoding)) {
+	if (!iconv.default.encodingExists(encoding)) {
 		console.log(`Unsupported terminal encoding: ${encoding}, falling back to UTF-8.`);
 		encoding = 'utf8';
 	}
@@ -59,11 +59,11 @@ export async function readFromStdin(targetPath: string, verbose: boolean, onEnd?
 
 	const appendFileQueue = new Queue();
 
-	const decoder = iconv.getDecoder(encoding);
+	const decoder = iconv.default.getDecoder(encoding);
 
 	process.stdin.on('data', chunk => {
 		const chunkStr = decoder.write(chunk);
-		appendFileQueue.queue(() => Promises.appendFile(targetPath, chunkStr));
+		appendFileQueue.queue(() => fs.promises.appendFile(targetPath, chunkStr));
 	});
 
 	process.stdin.on('end', () => {
@@ -72,7 +72,7 @@ export async function readFromStdin(targetPath: string, verbose: boolean, onEnd?
 		appendFileQueue.queue(async () => {
 			try {
 				if (typeof end === 'string') {
-					await Promises.appendFile(targetPath, end);
+					await fs.promises.appendFile(targetPath, end);
 				}
 			} finally {
 				onEnd?.();
diff --git a/src/vs/platform/environment/node/userDataPath.d.ts b/src/vs/platform/environment/node/userDataPath.d.ts
deleted file mode 100644
index c75b432c59c..00000000000
--- a/src/vs/platform/environment/node/userDataPath.d.ts
+++ /dev/null
@@ -1,14 +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 { NativeParsedArgs } from 'vs/platform/environment/common/argv';
-
-/**
- * Returns the user data path to use with some rules:
- * - respect portable mode
- * - respect VSCODE_APPDATA environment variable
- * - respect --user-data-dir CLI argument
- */
-export function getUserDataPath(args: NativeParsedArgs, productName: string): string;
diff --git a/src/vs/platform/environment/node/userDataPath.js b/src/vs/platform/environment/node/userDataPath.js
deleted file mode 100644
index 92898523ed1..00000000000
--- a/src/vs/platform/environment/node/userDataPath.js
+++ /dev/null
@@ -1,125 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-/// <reference path="../../../../typings/require.d.ts" />
-
-//@ts-check
-(function () {
-	'use strict';
-
-	/**
-	 * @typedef {import('../../environment/common/argv').NativeParsedArgs} NativeParsedArgs
-	 *
-	 * @param {typeof import('path')} path
-	 * @param {typeof import('os')} os
-	 * @param {string} cwd
-	 */
-	function factory(path, os, cwd) {
-
-		/**
-		 * @param {NativeParsedArgs} cliArgs
-		 * @param {string} productName
-		 *
-		 * @returns {string}
-		 */
-		function getUserDataPath(cliArgs, productName) {
-			const userDataPath = doGetUserDataPath(cliArgs, productName);
-			const pathsToResolve = [userDataPath];
-
-			// If the user-data-path is not absolute, make
-			// sure to resolve it against the passed in
-			// current working directory. We cannot use the
-			// node.js `path.resolve()` logic because it will
-			// not pick up our `VSCODE_CWD` environment variable
-			// (https://github.com/microsoft/vscode/issues/120269)
-			if (!path.isAbsolute(userDataPath)) {
-				pathsToResolve.unshift(cwd);
-			}
-
-			return path.resolve(...pathsToResolve);
-		}
-
-		/**
-		 * @param {NativeParsedArgs} cliArgs
-		 * @param {string} productName
-		 *
-		 * @returns {string}
-		 */
-		function doGetUserDataPath(cliArgs, productName) {
-
-			// 0. Running out of sources has a fixed productName
-			if (process.env['VSCODE_DEV']) {
-				productName = 'code-oss-dev';
-			}
-
-			// 1. Support portable mode
-			const portablePath = process.env['VSCODE_PORTABLE'];
-			if (portablePath) {
-				return path.join(portablePath, 'user-data');
-			}
-
-			// 2. Support global VSCODE_APPDATA environment variable
-			let appDataPath = process.env['VSCODE_APPDATA'];
-			if (appDataPath) {
-				return path.join(appDataPath, productName);
-			}
-
-			// With Electron>=13 --user-data-dir switch will be propagated to
-			// all processes https://github.com/electron/electron/blob/1897b14af36a02e9aa7e4d814159303441548251/shell/browser/electron_browser_client.cc#L546-L553
-			// Check VSCODE_PORTABLE and VSCODE_APPDATA before this case to get correct values.
-			// 3. Support explicit --user-data-dir
-			const cliPath = cliArgs['user-data-dir'];
-			if (cliPath) {
-				return cliPath;
-			}
-
-			// 4. Otherwise check per platform
-			switch (process.platform) {
-				case 'win32':
-					appDataPath = process.env['APPDATA'];
-					if (!appDataPath) {
-						const userProfile = process.env['USERPROFILE'];
-						if (typeof userProfile !== 'string') {
-							throw new Error('Windows: Unexpected undefined %USERPROFILE% environment variable');
-						}
-
-						appDataPath = path.join(userProfile, 'AppData', 'Roaming');
-					}
-					break;
-				case 'darwin':
-					appDataPath = path.join(os.homedir(), 'Library', 'Application Support');
-					break;
-				case 'linux':
-					appDataPath = process.env['XDG_CONFIG_HOME'] || path.join(os.homedir(), '.config');
-					break;
-				default:
-					throw new Error('Platform not supported');
-			}
-
-			return path.join(appDataPath, productName);
-		}
-
-		return {
-			getUserDataPath
-		};
-	}
-
-	if (typeof define === 'function') {
-		define(['path', 'os', 'vs/base/common/process'], function (
-			/** @type {typeof import('path')} */ path,
-			/** @type {typeof import('os')} */ os,
-			/** @type {typeof import("../../../base/common/process")} */ process
-		) {
-			return factory(path, os, process.cwd()); // amd
-		});
-	} else if (typeof module === 'object' && typeof module.exports === 'object') {
-		const path = require('path');
-		const os = require('os');
-
-		module.exports = factory(path, os, process.env['VSCODE_CWD'] || process.cwd()); // commonjs
-	} else {
-		throw new Error('Unknown context');
-	}
-}());
diff --git a/src/vs/platform/environment/node/userDataPath.ts b/src/vs/platform/environment/node/userDataPath.ts
new file mode 100644
index 00000000000..27190b2b84b
--- /dev/null
+++ b/src/vs/platform/environment/node/userDataPath.ts
@@ -0,0 +1,87 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as os from 'os';
+import * as path from 'path';
+import { NativeParsedArgs } from '../common/argv.js';
+
+const cwd = process.env['VSCODE_CWD'] || process.cwd();
+
+/**
+ * Returns the user data path to use with some rules:
+ * - respect portable mode
+ * - respect VSCODE_APPDATA environment variable
+ * - respect --user-data-dir CLI argument
+ */
+export function getUserDataPath(cliArgs: NativeParsedArgs, productName: string): string {
+	const userDataPath = doGetUserDataPath(cliArgs, productName);
+	const pathsToResolve = [userDataPath];
+
+	// If the user-data-path is not absolute, make
+	// sure to resolve it against the passed in
+	// current working directory. We cannot use the
+	// node.js `path.resolve()` logic because it will
+	// not pick up our `VSCODE_CWD` environment variable
+	// (https://github.com/microsoft/vscode/issues/120269)
+	if (!path.isAbsolute(userDataPath)) {
+		pathsToResolve.unshift(cwd);
+	}
+
+	return path.resolve(...pathsToResolve);
+}
+
+function doGetUserDataPath(cliArgs: NativeParsedArgs, productName: string): string {
+
+	// 0. Running out of sources has a fixed productName
+	if (process.env['VSCODE_DEV']) {
+		productName = 'code-oss-dev';
+	}
+
+	// 1. Support portable mode
+	const portablePath = process.env['VSCODE_PORTABLE'];
+	if (portablePath) {
+		return path.join(portablePath, 'user-data');
+	}
+
+	// 2. Support global VSCODE_APPDATA environment variable
+	let appDataPath = process.env['VSCODE_APPDATA'];
+	if (appDataPath) {
+		return path.join(appDataPath, productName);
+	}
+
+	// With Electron>=13 --user-data-dir switch will be propagated to
+	// all processes https://github.com/electron/electron/blob/1897b14af36a02e9aa7e4d814159303441548251/shell/browser/electron_browser_client.cc#L546-L553
+	// Check VSCODE_PORTABLE and VSCODE_APPDATA before this case to get correct values.
+	// 3. Support explicit --user-data-dir
+	const cliPath = cliArgs['user-data-dir'];
+	if (cliPath) {
+		return cliPath;
+	}
+
+	// 4. Otherwise check per platform
+	switch (process.platform) {
+		case 'win32':
+			appDataPath = process.env['APPDATA'];
+			if (!appDataPath) {
+				const userProfile = process.env['USERPROFILE'];
+				if (typeof userProfile !== 'string') {
+					throw new Error('Windows: Unexpected undefined %USERPROFILE% environment variable');
+				}
+
+				appDataPath = path.join(userProfile, 'AppData', 'Roaming');
+			}
+			break;
+		case 'darwin':
+			appDataPath = path.join(os.homedir(), 'Library', 'Application Support');
+			break;
+		case 'linux':
+			appDataPath = process.env['XDG_CONFIG_HOME'] || path.join(os.homedir(), '.config');
+			break;
+		default:
+			throw new Error('Platform not supported');
+	}
+
+	return path.join(appDataPath, productName);
+}
diff --git a/src/vs/platform/environment/node/wait.ts b/src/vs/platform/environment/node/wait.ts
index 793d8e0467e..e00acbb9ae5 100644
--- a/src/vs/platform/environment/node/wait.ts
+++ b/src/vs/platform/environment/node/wait.ts
@@ -5,7 +5,7 @@
 
 import { writeFileSync } from 'fs';
 import { tmpdir } from 'os';
-import { randomPath } from 'vs/base/common/extpath';
+import { randomPath } from '../../../base/common/extpath.js';
 
 export function createWaitMarkerFileSync(verbose?: boolean): string | undefined {
 	const randomWaitMarkerPath = randomPath(tmpdir());
diff --git a/src/vs/platform/environment/test/electron-main/environmentMainService.test.ts b/src/vs/platform/environment/test/electron-main/environmentMainService.test.ts
index 268f5ce52bb..55d0cf798bf 100644
--- a/src/vs/platform/environment/test/electron-main/environmentMainService.test.ts
+++ b/src/vs/platform/environment/test/electron-main/environmentMainService.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { EnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
-import product from 'vs/platform/product/common/product';
-import { isLinux } from 'vs/base/common/platform';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { EnvironmentMainService } from '../../electron-main/environmentMainService.js';
+import product from '../../../product/common/product.js';
+import { isLinux } from '../../../../base/common/platform.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 
 suite('EnvironmentMainService', () => {
 
diff --git a/src/vs/platform/environment/test/node/argv.test.ts b/src/vs/platform/environment/test/node/argv.test.ts
index a82be9607d0..f5fd600d20f 100644
--- a/src/vs/platform/environment/test/node/argv.test.ts
+++ b/src/vs/platform/environment/test/node/argv.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { formatOptions, Option, OptionDescriptions, Subcommand, parseArgs, ErrorReporter } from 'vs/platform/environment/node/argv';
-import { addArg } from 'vs/platform/environment/node/argvHelper';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { formatOptions, Option, OptionDescriptions, Subcommand, parseArgs, ErrorReporter } from '../../node/argv.js';
+import { addArg } from '../../node/argvHelper.js';
 
 function o(description: string, type: 'boolean' | 'string' | 'string[]' = 'string'): Option<any> {
 	return {
diff --git a/src/vs/platform/environment/test/node/environmentService.test.ts b/src/vs/platform/environment/test/node/environmentService.test.ts
index 6f256621040..b27a76073f4 100644
--- a/src/vs/platform/environment/test/node/environmentService.test.ts
+++ b/src/vs/platform/environment/test/node/environmentService.test.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { parseExtensionHostDebugPort } from 'vs/platform/environment/common/environmentService';
-import { OPTIONS, parseArgs } from 'vs/platform/environment/node/argv';
-import { NativeEnvironmentService } from 'vs/platform/environment/node/environmentService';
-import product from 'vs/platform/product/common/product';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { parseExtensionHostDebugPort } from '../../common/environmentService.js';
+import { OPTIONS, parseArgs } from '../../node/argv.js';
+import { NativeEnvironmentService } from '../../node/environmentService.js';
+import product from '../../../product/common/product.js';
 
 suite('EnvironmentService', () => {
 
diff --git a/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts b/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
index 81db8b47267..e0b99f38093 100644
--- a/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
+++ b/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { isWindows } from 'vs/base/common/platform';
-import { flakySuite } from 'vs/base/test/common/testUtils';
+import { isMacintosh, isWindows } from '../../../../base/common/platform.js';
+import { flakySuite } from '../../../../base/test/common/testUtils.js';
 
 function testErrorMessage(module: string): string {
 	return `Unable to load "${module}" dependency. It was probably not compiled for the right operating system architecture or had missing build tools.`;
@@ -13,13 +13,28 @@ function testErrorMessage(module: string): string {
 
 flakySuite('Native Modules (all platforms)', () => {
 
-	test('kerberos', async () => {
-		const kerberos = await import('kerberos');
+	(isMacintosh ? test.skip : test)('kerberos', async () => { // Somehow fails on macOS ARM?
+		const { default: kerberos } = await import('kerberos');
 		assert.ok(typeof kerberos.initializeClient === 'function', testErrorMessage('kerberos'));
 	});
 
+	test('yauzl', async () => {
+		const { default: yauzl } = await import('yauzl');
+		assert.ok(typeof yauzl.ZipFile === 'function', testErrorMessage('yauzl'));
+	});
+
+	test('yazl', async () => {
+		const { default: yazl } = await import('yazl');
+		assert.ok(typeof yazl.ZipFile === 'function', testErrorMessage('yazl'));
+	});
+
+	test('v8-inspect-profiler', async () => {
+		const { default: profiler } = await import('v8-inspect-profiler');
+		assert.ok(typeof profiler.startProfiling === 'function', testErrorMessage('v8-inspect-profiler'));
+	});
+
 	test('native-is-elevated', async () => {
-		const isElevated = (await import('native-is-elevated')).default;
+		const { default: isElevated } = await import('native-is-elevated');
 		assert.ok(typeof isElevated === 'function', testErrorMessage('native-is-elevated '));
 
 		const result = isElevated();
@@ -28,6 +43,7 @@ flakySuite('Native Modules (all platforms)', () => {
 
 	test('native-keymap', async () => {
 		const keyMap = await import('native-keymap');
+		assert.ok(typeof keyMap.onDidChangeKeyboardLayout === 'function', testErrorMessage('native-keymap'));
 		assert.ok(typeof keyMap.getCurrentKeyboardLayout === 'function', testErrorMessage('native-keymap'));
 
 		const result = keyMap.getCurrentKeyboardLayout();
@@ -39,12 +55,27 @@ flakySuite('Native Modules (all platforms)', () => {
 		assert.ok(typeof watchDog.start === 'function', testErrorMessage('native-watchdog'));
 	});
 
-	(process.type === 'renderer' ? test.skip /* TODO@electron module is not context aware yet and thus cannot load in Electron renderer used by tests */ : test)('node-pty', async () => {
+	test('@vscode/sudo-prompt', async () => {
+		const prompt = await import('@vscode/sudo-prompt');
+		assert.ok(typeof prompt.exec === 'function', testErrorMessage('@vscode/sudo-prompt'));
+	});
+
+	test('@vscode/policy-watcher', async () => {
+		const watcher = await import('@vscode/policy-watcher');
+		assert.ok(typeof watcher.createWatcher === 'function', testErrorMessage('@vscode/policy-watcher'));
+	});
+
+	test('node-pty', async () => {
 		const nodePty = await import('node-pty');
 		assert.ok(typeof nodePty.spawn === 'function', testErrorMessage('node-pty'));
 	});
 
-	(process.type === 'renderer' ? test.skip /* TODO@electron module is not context aware yet and thus cannot load in Electron renderer used by tests */ : test)('@vscode/spdlog', async () => {
+	test('open', async () => {
+		const { default: open } = await import('open');
+		assert.ok(typeof open === 'function', testErrorMessage('open'));
+	});
+
+	test('@vscode/spdlog', async () => {
 		const spdlog = await import('@vscode/spdlog');
 		assert.ok(typeof spdlog.createRotatingLogger === 'function', testErrorMessage('@vscode/spdlog'));
 		assert.ok(typeof spdlog.version === 'number', testErrorMessage('@vscode/spdlog'));
@@ -55,31 +86,59 @@ flakySuite('Native Modules (all platforms)', () => {
 		assert.ok(typeof parcelWatcher.subscribe === 'function', testErrorMessage('@parcel/watcher'));
 	});
 
+	test('@vscode/deviceid', async () => {
+		const deviceIdPackage = await import('@vscode/deviceid');
+		assert.ok(typeof deviceIdPackage.getDeviceId === 'function', testErrorMessage('@vscode/deviceid'));
+	});
+
+	test('@vscode/ripgrep', async () => {
+		const ripgrep = await import('@vscode/ripgrep');
+		assert.ok(typeof ripgrep.rgPath === 'string', testErrorMessage('@vscode/ripgrep'));
+	});
+
+	test('vscode-regexpp', async () => {
+		const regexpp = await import('vscode-regexpp');
+		assert.ok(typeof regexpp.RegExpParser === 'function', testErrorMessage('vscode-regexpp'));
+	});
+
 	test('@vscode/sqlite3', async () => {
-		const sqlite3 = await import('@vscode/sqlite3');
+		const { default: sqlite3 } = await import('@vscode/sqlite3');
 		assert.ok(typeof sqlite3.Database === 'function', testErrorMessage('@vscode/sqlite3'));
 	});
 
-	test('vsda', async () => {
-		try {
-			const vsda: any = globalThis._VSCODE_NODE_MODULES['vsda'];
-			const signer = new vsda.signer();
-			const signed = await signer.sign('value');
-			assert.ok(typeof signed === 'string', testErrorMessage('vsda'));
-		} catch (error) {
-			if (error.code !== 'MODULE_NOT_FOUND') {
-				throw error;
+	test('http-proxy-agent', async () => {
+		const { default: mod } = await import('http-proxy-agent');
+		assert.ok(typeof mod.HttpProxyAgent === 'function', testErrorMessage('http-proxy-agent'));
+	});
+
+	test('https-proxy-agent', async () => {
+		const { default: mod } = await import('https-proxy-agent');
+		assert.ok(typeof mod.HttpsProxyAgent === 'function', testErrorMessage('https-proxy-agent'));
+	});
+
+	test('@vscode/proxy-agent', async () => {
+		const proxyAgent = await import('@vscode/proxy-agent');
+		// This call will load `@vscode/proxy-agent` which is a native module that we want to test on Windows
+		const windowsCerts = await proxyAgent.loadSystemCertificates({
+			log: {
+				trace: () => { },
+				debug: () => { },
+				info: () => { },
+				warn: () => { },
+				error: () => { }
 			}
-		}
+		});
+		assert.ok(windowsCerts.length > 0, testErrorMessage('@vscode/proxy-agent'));
 	});
 });
 
 (!isWindows ? suite.skip : suite)('Native Modules (Windows)', () => {
 
-	(process.type === 'renderer' ? test.skip /* TODO@electron module is not context aware yet and thus cannot load in Electron renderer used by tests */ : test)('@vscode/windows-mutex', async () => {
+	test('@vscode/windows-mutex', async () => {
 		const mutex = await import('@vscode/windows-mutex');
 		assert.ok(mutex && typeof mutex.isActive === 'function', testErrorMessage('@vscode/windows-mutex'));
 		assert.ok(typeof mutex.isActive === 'function', testErrorMessage('@vscode/windows-mutex'));
+		assert.ok(typeof mutex.Mutex === 'function', testErrorMessage('@vscode/windows-mutex'));
 	});
 
 	test('windows-foreground-love', async () => {
@@ -112,22 +171,4 @@ flakySuite('Native Modules (all platforms)', () => {
 		const result = windowsRegistry.GetStringRegKey('HKEY_LOCAL_MACHINE', 'SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion', 'EditionID');
 		assert.ok(typeof result === 'string' || typeof result === 'undefined', testErrorMessage('@vscode/windows-registry'));
 	});
-
-	test('@vscode/windows-ca-certs', async () => {
-		// @ts-ignore we do not directly depend on this module anymore
-		// but indirectly from our dependency to `@vscode/proxy-agent`
-		// we still want to ensure this module can work properly.
-		const windowsCerts = await import('@vscode/windows-ca-certs');
-		const store = new windowsCerts.Crypt32();
-		assert.ok(windowsCerts, testErrorMessage('@vscode/windows-ca-certs'));
-		let certCount = 0;
-		try {
-			while (store.next()) {
-				certCount++;
-			}
-		} finally {
-			store.done();
-		}
-		assert(certCount > 0);
-	});
 });
diff --git a/src/vs/platform/environment/test/node/userDataPath.test.ts b/src/vs/platform/environment/test/node/userDataPath.test.ts
index 72278e46ac0..6430ac8f19e 100644
--- a/src/vs/platform/environment/test/node/userDataPath.test.ts
+++ b/src/vs/platform/environment/test/node/userDataPath.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { OPTIONS, parseArgs } from 'vs/platform/environment/node/argv';
-import { getUserDataPath } from 'vs/platform/environment/node/userDataPath';
-import product from 'vs/platform/product/common/product';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { OPTIONS, parseArgs } from '../../node/argv.js';
+import { getUserDataPath } from '../../node/userDataPath.js';
+import product from '../../../product/common/product.js';
 
 suite('User data path', () => {
 
diff --git a/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts b/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
index 4d9e5a7a305..85e554a36e6 100644
--- a/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
@@ -3,33 +3,35 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { distinct, isNonEmptyArray } from 'vs/base/common/arrays';
-import { Barrier, CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { CancellationError, getErrorMessage, isCancellationError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { isWeb } from 'vs/base/common/platform';
-import { isDefined } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import * as nls from 'vs/nls';
+import { distinct, isNonEmptyArray } from '../../../base/common/arrays.js';
+import { Barrier, CancelablePromise, createCancelablePromise } from '../../../base/common/async.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { CancellationError, getErrorMessage, isCancellationError } from '../../../base/common/errors.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../base/common/map.js';
+import { isWeb } from '../../../base/common/platform.js';
+import { URI } from '../../../base/common/uri.js';
+import * as nls from '../../../nls.js';
 import {
 	ExtensionManagementError, IExtensionGalleryService, IExtensionIdentifier, IExtensionManagementParticipant, IGalleryExtension, ILocalExtension, InstallOperation,
 	IExtensionsControlManifest, StatisticType, isTargetPlatformCompatible, TargetPlatformToString, ExtensionManagementErrorCode,
 	InstallOptions, UninstallOptions, Metadata, InstallExtensionEvent, DidUninstallExtensionEvent, InstallExtensionResult, UninstallExtensionEvent, IExtensionManagementService, InstallExtensionInfo, EXTENSION_INSTALL_DEP_PACK_CONTEXT, ExtensionGalleryError,
 	IProductVersion, ExtensionGalleryErrorCode,
 	EXTENSION_INSTALL_SOURCE_CONTEXT,
-	DidUpdateExtensionMetadata
-} from 'vs/platform/extensionManagement/common/extensionManagement';
-import { areSameExtensions, ExtensionKey, getGalleryExtensionId, getGalleryExtensionTelemetryData, getLocalExtensionTelemetryData } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { ExtensionType, IExtensionManifest, isApplicationScopedExtension, TargetPlatform } from 'vs/platform/extensions/common/extensions';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
+	DidUpdateExtensionMetadata,
+	UninstallExtensionInfo,
+	ExtensionSignatureVerificationCode
+} from './extensionManagement.js';
+import { areSameExtensions, ExtensionKey, getGalleryExtensionId, getGalleryExtensionTelemetryData, getLocalExtensionTelemetryData } from './extensionManagementUtil.js';
+import { ExtensionType, IExtensionManifest, isApplicationScopedExtension, TargetPlatform } from '../../extensions/common/extensions.js';
+import { areApiProposalsCompatible } from '../../extensions/common/extensionValidator.js';
+import { ILogService } from '../../log/common/log.js';
+import { IProductService } from '../../product/common/productService.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
+import { IUriIdentityService } from '../../uriIdentity/common/uriIdentity.js';
+import { IUserDataProfilesService } from '../../userDataProfile/common/userDataProfile.js';
 
-export type ExtensionVerificationStatus = boolean | string;
 export type InstallableExtension = { readonly manifest: IExtensionManifest; extension: IGalleryExtension | URI; options: InstallOptions };
 
 export type InstallExtensionTaskOptions = InstallOptions & { readonly profileLocation: URI; readonly productVersion: IProductVersion };
@@ -39,7 +41,7 @@ export interface IInstallExtensionTask {
 	readonly source: IGalleryExtension | URI;
 	readonly operation: InstallOperation;
 	readonly options: InstallExtensionTaskOptions;
-	readonly verificationStatus?: ExtensionVerificationStatus;
+	readonly verificationStatus?: ExtensionSignatureVerificationCode;
 	run(): Promise<ILocalExtension>;
 	waitUntilTaskIsFinished(): Promise<ILocalExtension>;
 	cancel(): void;
@@ -47,6 +49,7 @@ export interface IInstallExtensionTask {
 
 export type UninstallExtensionTaskOptions = UninstallOptions & { readonly profileLocation: URI };
 export interface IUninstallExtensionTask {
+	readonly options: UninstallExtensionTaskOptions;
 	readonly extension: ILocalExtension;
 	run(): Promise<void>;
 	waitUntilTaskIsFinished(): Promise<void>;
@@ -141,9 +144,9 @@ export abstract class AbstractExtensionManagementService extends Disposable impl
 		return results;
 	}
 
-	async uninstall(extension: ILocalExtension, options: UninstallOptions = {}): Promise<void> {
+	async uninstall(extension: ILocalExtension, options?: UninstallOptions): Promise<void> {
 		this.logService.trace('ExtensionManagementService#uninstall', extension.identifier.id);
-		return this.uninstallExtension(extension, options);
+		return this.uninstallExtensions([{ extension, options }]);
 	}
 
 	async toggleAppliationScope(extension: ILocalExtension, fromProfileLocation: URI): Promise<ILocalExtension> {
@@ -195,6 +198,24 @@ export abstract class AbstractExtensionManagementService extends Disposable impl
 		this.participants.push(participant);
 	}
 
+	async resetPinnedStateForAllUserExtensions(pinned: boolean): Promise<void> {
+		try {
+			await this.joinAllSettled(this.userDataProfilesService.profiles.map(
+				async profile => {
+					const extensions = await this.getInstalled(ExtensionType.User, profile.extensionsResource);
+					await this.joinAllSettled(extensions.map(
+						async extension => {
+							if (extension.pinned !== pinned) {
+								await this.updateMetadata(extension, { pinned }, profile.extensionsResource);
+							}
+						}));
+				}));
+		} catch (error) {
+			this.logService.error('Error while resetting pinned state for all user extensions', getErrorMessage(error));
+			throw error;
+		}
+	}
+
 	protected async installExtensions(extensions: InstallableExtension[]): Promise<InstallExtensionResult[]> {
 		const installExtensionResultsMap = new Map<string, InstallExtensionResult & { profileLocation: URI }>();
 		const installingExtensionsMap = new Map<string, { task: IInstallExtensionTask; root: IInstallExtensionTask | undefined }>();
@@ -202,11 +223,37 @@ export abstract class AbstractExtensionManagementService extends Disposable impl
 
 		const getInstallExtensionTaskKey = (extension: IGalleryExtension, profileLocation: URI) => `${ExtensionKey.create(extension).toString()}-${profileLocation.toString()}`;
 		const createInstallExtensionTask = (manifest: IExtensionManifest, extension: IGalleryExtension | URI, options: InstallExtensionTaskOptions, root: IInstallExtensionTask | undefined): void => {
+			if (!URI.isUri(extension)) {
+				if (installingExtensionsMap.has(`${extension.identifier.id.toLowerCase()}-${options.profileLocation.toString()}`)) {
+					return;
+				}
+				const existingInstallingExtension = this.installingExtensions.get(getInstallExtensionTaskKey(extension, options.profileLocation));
+				if (existingInstallingExtension) {
+					if (root && this.canWaitForTask(root, existingInstallingExtension.task)) {
+						const identifier = existingInstallingExtension.task.identifier;
+						this.logService.info('Waiting for already requested installing extension', identifier.id, root.identifier.id, options.profileLocation.toString());
+						existingInstallingExtension.waitingTasks.push(root);
+						// add promise that waits until the extension is completely installed, ie., onDidInstallExtensions event is triggered for this extension
+						alreadyRequestedInstallations.push(
+							Event.toPromise(
+								Event.filter(this.onDidInstallExtensions, results => results.some(result => areSameExtensions(result.identifier, identifier)))
+							).then(results => {
+								this.logService.info('Finished waiting for already requested installing extension', identifier.id, root.identifier.id, options.profileLocation.toString());
+								const result = results.find(result => areSameExtensions(result.identifier, identifier));
+								if (!result?.local) {
+									// Extension failed to install
+									throw new Error(`Extension ${identifier.id} is not installed`);
+								}
+							}));
+					}
+					return;
+				}
+			}
 			const installExtensionTask = this.createInstallExtensionTask(manifest, extension, options);
 			const key = `${getGalleryExtensionId(manifest.publisher, manifest.name)}-${options.profileLocation.toString()}`;
 			installingExtensionsMap.set(key, { task: installExtensionTask, root });
 			this._onInstallExtension.fire({ identifier: installExtensionTask.identifier, source: extension, profileLocation: options.profileLocation });
-			this.logService.info('Installing extension:', installExtensionTask.identifier.id, options.profileLocation.toString());
+			this.logService.info('Installing extension:', installExtensionTask.identifier.id, options);
 			// only cache gallery extensions tasks
 			if (!URI.isUri(extension)) {
 				this.installingExtensions.set(getInstallExtensionTaskKey(extension, options.profileLocation), { task: installExtensionTask, waitingTasks: [] });
@@ -244,31 +291,10 @@ export abstract class AbstractExtensionManagementService extends Disposable impl
 						const installed = await this.getInstalled(undefined, task.options.profileLocation, task.options.productVersion);
 						const options: InstallExtensionTaskOptions = { ...task.options, context: { ...task.options.context, [EXTENSION_INSTALL_DEP_PACK_CONTEXT]: true } };
 						for (const { gallery, manifest } of distinct(allDepsAndPackExtensionsToInstall, ({ gallery }) => gallery.identifier.id)) {
-							if (installingExtensionsMap.has(`${gallery.identifier.id.toLowerCase()}-${options.profileLocation.toString()}`)) {
+							if (installed.some(({ identifier }) => areSameExtensions(identifier, gallery.identifier))) {
 								continue;
 							}
-							const existingInstallingExtension = this.installingExtensions.get(getInstallExtensionTaskKey(gallery, options.profileLocation));
-							if (existingInstallingExtension) {
-								if (this.canWaitForTask(task, existingInstallingExtension.task)) {
-									const identifier = existingInstallingExtension.task.identifier;
-									this.logService.info('Waiting for already requested installing extension', identifier.id, task.identifier.id, options.profileLocation.toString());
-									existingInstallingExtension.waitingTasks.push(task);
-									// add promise that waits until the extension is completely installed, ie., onDidInstallExtensions event is triggered for this extension
-									alreadyRequestedInstallations.push(
-										Event.toPromise(
-											Event.filter(this.onDidInstallExtensions, results => results.some(result => areSameExtensions(result.identifier, identifier)))
-										).then(results => {
-											this.logService.info('Finished waiting for already requested installing extension', identifier.id, task.identifier.id, options.profileLocation.toString());
-											const result = results.find(result => areSameExtensions(result.identifier, identifier));
-											if (!result?.local) {
-												// Extension failed to install
-												throw new Error(`Extension ${identifier.id} is not installed`);
-											}
-										}));
-								}
-							} else if (!installed.some(({ identifier }) => areSameExtensions(identifier, gallery.identifier))) {
-								createInstallExtensionTask(manifest, gallery, options, task);
-							}
+							createInstallExtensionTask(manifest, gallery, options, task);
 						}
 					} catch (error) {
 						// Installing through VSIX
@@ -288,6 +314,11 @@ export abstract class AbstractExtensionManagementService extends Disposable impl
 				}
 			}));
 
+			const otherProfilesToUpdate = await this.getOtherProfilesToUpdateExtension([...installingExtensionsMap.values()].map(({ task }) => task));
+			for (const [profileLocation, task] of otherProfilesToUpdate) {
+				createInstallExtensionTask(task.manifest, task.source, { ...task.options, profileLocation }, undefined);
+			}
+
 			// Install extensions in parallel and wait until all extensions are installed / failed
 			await this.joinAllSettled([...installingExtensionsMap.entries()].map(async ([key, { task }]) => {
 				const startTime = new Date().getTime();
@@ -414,6 +445,36 @@ export abstract class AbstractExtensionManagementService extends Disposable impl
 		}
 	}
 
+	private async getOtherProfilesToUpdateExtension(tasks: IInstallExtensionTask[]): Promise<[URI, IInstallExtensionTask][]> {
+		const otherProfilesToUpdate: [URI, IInstallExtensionTask][] = [];
+		const profileExtensionsCache = new ResourceMap<ILocalExtension[]>();
+		for (const task of tasks) {
+			if (task.operation !== InstallOperation.Update
+				|| task.options.isApplicationScoped
+				|| task.options.pinned
+				|| task.options.installGivenVersion
+				|| URI.isUri(task.source)
+			) {
+				continue;
+			}
+			for (const profile of this.userDataProfilesService.profiles) {
+				if (this.uriIdentityService.extUri.isEqual(profile.extensionsResource, task.options.profileLocation)) {
+					continue;
+				}
+				let installedExtensions = profileExtensionsCache.get(profile.extensionsResource);
+				if (!installedExtensions) {
+					installedExtensions = await this.getInstalled(ExtensionType.User, profile.extensionsResource);
+					profileExtensionsCache.set(profile.extensionsResource, installedExtensions);
+				}
+				const installedExtension = installedExtensions.find(e => areSameExtensions(e.identifier, task.identifier));
+				if (installedExtension && !installedExtension.pinned) {
+					otherProfilesToUpdate.push([profile.extensionsResource, task]);
+				}
+			}
+		}
+		return otherProfilesToUpdate;
+	}
+
 	private canWaitForTask(taskToWait: IInstallExtensionTask, taskToWaitFor: IInstallExtensionTask): boolean {
 		for (const [, { task, waitingTasks }] of this.installingExtensions.entries()) {
 			if (task === taskToWait) {
@@ -548,6 +609,10 @@ export abstract class AbstractExtensionManagementService extends Disposable impl
 
 			compatibleExtension = await this.getCompatibleVersion(extension, sameVersion, installPreRelease, productVersion);
 			if (!compatibleExtension) {
+				const incompatibleApiProposalsMessages: string[] = [];
+				if (!areApiProposalsCompatible(extension.properties.enabledApiProposals ?? [], incompatibleApiProposalsMessages)) {
+					throw new ExtensionManagementError(nls.localize('incompatibleAPI', "Can't install '{0}' extension. {1}", extension.displayName ?? extension.identifier.id, incompatibleApiProposalsMessages[0]), ExtensionManagementErrorCode.IncompatibleApi);
+				}
 				/** If no compatible release version is found, check if the extension has a release version or not and throw relevant error */
 				if (!installPreRelease && extension.properties.isPreReleaseVersion && (await this.galleryService.getExtensions([extension.identifier], CancellationToken.None))[0]) {
 					throw new ExtensionManagementError(nls.localize('notFoundReleaseExtension', "Can't install release version of '{0}' extension because it has no release version.", extension.displayName ?? extension.identifier.id), ExtensionManagementErrorCode.ReleaseVersionNotFound);
@@ -592,43 +657,23 @@ export abstract class AbstractExtensionManagementService extends Disposable impl
 		return compatibleExtension;
 	}
 
-	private async uninstallExtension(extension: ILocalExtension, options: UninstallOptions): Promise<void> {
-		const uninstallOptions: UninstallExtensionTaskOptions = {
-			...options,
-			profileLocation: extension.isApplicationScoped ? this.userDataProfilesService.defaultProfile.extensionsResource : options.profileLocation ?? this.getCurrentExtensionsManifestLocation()
-		};
-		const getUninstallExtensionTaskKey = (identifier: IExtensionIdentifier) => `${identifier.id.toLowerCase()}${uninstallOptions.versionOnly ? `-${extension.manifest.version}` : ''}${uninstallOptions.profileLocation ? `@${uninstallOptions.profileLocation.toString()}` : ''}`;
-		const uninstallExtensionTask = this.uninstallingExtensions.get(getUninstallExtensionTaskKey(extension.identifier));
-		if (uninstallExtensionTask) {
-			this.logService.info('Extensions is already requested to uninstall', extension.identifier.id);
-			return uninstallExtensionTask.waitUntilTaskIsFinished();
-		}
+	async uninstallExtensions(extensions: UninstallExtensionInfo[]): Promise<void> {
 
-		const createUninstallExtensionTask = (extension: ILocalExtension): IUninstallExtensionTask => {
+		const getUninstallExtensionTaskKey = (extension: ILocalExtension, uninstallOptions: UninstallExtensionTaskOptions) => `${extension.identifier.id.toLowerCase()}${uninstallOptions.versionOnly ? `-${extension.manifest.version}` : ''}@${uninstallOptions.profileLocation.toString()}`;
+
+		const createUninstallExtensionTask = (extension: ILocalExtension, uninstallOptions: UninstallExtensionTaskOptions): IUninstallExtensionTask => {
 			const uninstallExtensionTask = this.createUninstallExtensionTask(extension, uninstallOptions);
-			this.uninstallingExtensions.set(getUninstallExtensionTaskKey(uninstallExtensionTask.extension.identifier), uninstallExtensionTask);
-			if (uninstallOptions.profileLocation) {
-				this.logService.info('Uninstalling extension from the profile:', `${extension.identifier.id}@${extension.manifest.version}`, uninstallOptions.profileLocation.toString());
-			} else {
-				this.logService.info('Uninstalling extension:', `${extension.identifier.id}@${extension.manifest.version}`);
-			}
+			this.uninstallingExtensions.set(getUninstallExtensionTaskKey(uninstallExtensionTask.extension, uninstallOptions), uninstallExtensionTask);
+			this.logService.info('Uninstalling extension from the profile:', `${extension.identifier.id}@${extension.manifest.version}`, uninstallOptions.profileLocation.toString());
 			this._onUninstallExtension.fire({ identifier: extension.identifier, profileLocation: uninstallOptions.profileLocation, applicationScoped: extension.isApplicationScoped });
 			return uninstallExtensionTask;
 		};
 
-		const postUninstallExtension = (extension: ILocalExtension, error?: ExtensionManagementError): void => {
+		const postUninstallExtension = (extension: ILocalExtension, uninstallOptions: UninstallExtensionTaskOptions, error?: ExtensionManagementError): void => {
 			if (error) {
-				if (uninstallOptions.profileLocation) {
-					this.logService.error('Failed to uninstall extension from the profile:', `${extension.identifier.id}@${extension.manifest.version}`, uninstallOptions.profileLocation.toString(), error.message);
-				} else {
-					this.logService.error('Failed to uninstall extension:', `${extension.identifier.id}@${extension.manifest.version}`, error.message);
-				}
+				this.logService.error('Failed to uninstall extension from the profile:', `${extension.identifier.id}@${extension.manifest.version}`, uninstallOptions.profileLocation.toString(), error.message);
 			} else {
-				if (uninstallOptions.profileLocation) {
-					this.logService.info('Successfully uninstalled extension from the profile', `${extension.identifier.id}@${extension.manifest.version}`, uninstallOptions.profileLocation.toString());
-				} else {
-					this.logService.info('Successfully uninstalled extension:', `${extension.identifier.id}@${extension.manifest.version}`);
-				}
+				this.logService.info('Successfully uninstalled extension from the profile', `${extension.identifier.id}@${extension.manifest.version}`, uninstallOptions.profileLocation.toString());
 			}
 			reportTelemetry(this.telemetryService, 'extensionGallery:uninstall', { extensionData: getLocalExtensionTelemetryData(extension), error });
 			this._onDidUninstallExtension.fire({ identifier: extension.identifier, error: error?.code, profileLocation: uninstallOptions.profileLocation, applicationScoped: extension.isApplicationScoped });
@@ -636,64 +681,91 @@ export abstract class AbstractExtensionManagementService extends Disposable impl
 
 		const allTasks: IUninstallExtensionTask[] = [];
 		const processedTasks: IUninstallExtensionTask[] = [];
+		const alreadyRequestedUninstalls: Promise<any>[] = [];
+
+		const installedExtensionsMap = new ResourceMap<ILocalExtension[]>();
+
+		for (const { extension, options } of extensions) {
+			const uninstallOptions: UninstallExtensionTaskOptions = {
+				...options,
+				profileLocation: extension.isApplicationScoped ? this.userDataProfilesService.defaultProfile.extensionsResource : options?.profileLocation ?? this.getCurrentExtensionsManifestLocation()
+			};
+			const uninstallExtensionTask = this.uninstallingExtensions.get(getUninstallExtensionTaskKey(extension, uninstallOptions));
+			if (uninstallExtensionTask) {
+				this.logService.info('Extensions is already requested to uninstall', extension.identifier.id);
+				alreadyRequestedUninstalls.push(uninstallExtensionTask.waitUntilTaskIsFinished());
+			} else {
+				allTasks.push(createUninstallExtensionTask(extension, uninstallOptions));
+			}
+		}
 
 		try {
-			allTasks.push(createUninstallExtensionTask(extension));
-			const installed = await this.getInstalled(ExtensionType.User, uninstallOptions.profileLocation);
-			if (uninstallOptions.donotIncludePack) {
-				this.logService.info('Uninstalling the extension without including packed extension', `${extension.identifier.id}@${extension.manifest.version}`);
-			} else {
-				const packedExtensions = this.getAllPackExtensionsToUninstall(extension, installed);
-				for (const packedExtension of packedExtensions) {
-					if (this.uninstallingExtensions.has(getUninstallExtensionTaskKey(packedExtension.identifier))) {
-						this.logService.info('Extensions is already requested to uninstall', packedExtension.identifier.id);
-					} else {
-						allTasks.push(createUninstallExtensionTask(packedExtension));
+			for (const task of allTasks.slice(0)) {
+				let installed = installedExtensionsMap.get(task.options.profileLocation);
+				if (!installed) {
+					installedExtensionsMap.set(task.options.profileLocation, installed = await this.getInstalled(ExtensionType.User, task.options.profileLocation));
+				}
+
+				if (task.options.donotIncludePack) {
+					this.logService.info('Uninstalling the extension without including packed extension', `${task.extension.identifier.id}@${task.extension.manifest.version}`);
+				} else {
+					const packedExtensions = this.getAllPackExtensionsToUninstall(task.extension, installed);
+					for (const packedExtension of packedExtensions) {
+						if (this.uninstallingExtensions.has(getUninstallExtensionTaskKey(packedExtension, task.options))) {
+							this.logService.info('Extensions is already requested to uninstall', packedExtension.identifier.id);
+						} else {
+							allTasks.push(createUninstallExtensionTask(packedExtension, task.options));
+						}
 					}
 				}
-			}
-
-			if (uninstallOptions.donotCheckDependents) {
-				this.logService.info('Uninstalling the extension without checking dependents', `${extension.identifier.id}@${extension.manifest.version}`);
-			} else {
-				this.checkForDependents(allTasks.map(task => task.extension), installed, extension);
+				if (task.options.donotCheckDependents) {
+					this.logService.info('Uninstalling the extension without checking dependents', `${task.extension.identifier.id}@${task.extension.manifest.version}`);
+				} else {
+					this.checkForDependents(allTasks.map(task => task.extension), installed, task.extension);
+				}
 			}
 
 			// Uninstall extensions in parallel and wait until all extensions are uninstalled / failed
 			await this.joinAllSettled(allTasks.map(async task => {
 				try {
 					await task.run();
-					await this.joinAllSettled(this.participants.map(participant => participant.postUninstall(task.extension, uninstallOptions, CancellationToken.None)));
+					await this.joinAllSettled(this.participants.map(participant => participant.postUninstall(task.extension, task.options, CancellationToken.None)));
 					// only report if extension has a mapped gallery extension. UUID identifies the gallery extension.
 					if (task.extension.identifier.uuid) {
 						try {
 							await this.galleryService.reportStatistic(task.extension.manifest.publisher, task.extension.manifest.name, task.extension.manifest.version, StatisticType.Uninstall);
 						} catch (error) { /* ignore */ }
 					}
-					postUninstallExtension(task.extension);
 				} catch (e) {
 					const error = toExtensionManagementError(e);
-					postUninstallExtension(task.extension, error);
+					postUninstallExtension(task.extension, task.options, error);
 					throw error;
 				} finally {
 					processedTasks.push(task);
 				}
 			}));
 
+			if (alreadyRequestedUninstalls.length) {
+				await this.joinAllSettled(alreadyRequestedUninstalls);
+			}
+
+			for (const task of allTasks) {
+				postUninstallExtension(task.extension, task.options);
+			}
 		} catch (e) {
 			const error = toExtensionManagementError(e);
 			for (const task of allTasks) {
 				// cancel the tasks
 				try { task.cancel(); } catch (error) { /* ignore */ }
 				if (!processedTasks.includes(task)) {
-					postUninstallExtension(task.extension, error);
+					postUninstallExtension(task.extension, task.options, error);
 				}
 			}
 			throw error;
 		} finally {
 			// Remove tasks from cache
 			for (const task of allTasks) {
-				if (!this.uninstallingExtensions.delete(getUninstallExtensionTaskKey(task.extension.identifier))) {
+				if (!this.uninstallingExtensions.delete(getUninstallExtensionTaskKey(task.extension, task.options))) {
 					this.logService.warn('Uninstallation task is not found in the cache', task.extension.identifier.id);
 				}
 			}
@@ -774,7 +846,6 @@ export abstract class AbstractExtensionManagementService extends Disposable impl
 
 	abstract getTargetPlatform(): Promise<TargetPlatform>;
 	abstract zip(extension: ILocalExtension): Promise<URI>;
-	abstract unzip(zipLocation: URI): Promise<IExtensionIdentifier>;
 	abstract getManifest(vsix: URI): Promise<IExtensionManifest>;
 	abstract install(vsix: URI, options?: InstallOptions): Promise<ILocalExtension>;
 	abstract installFromLocation(location: URI, profileLocation: URI): Promise<ILocalExtension>;
@@ -817,34 +888,12 @@ function reportTelemetry(telemetryService: ITelemetryService, eventName: string,
 		durationSinceUpdate
 	}: {
 		extensionData: any;
-		verificationStatus?:
-		ExtensionVerificationStatus;
+		verificationStatus?: ExtensionSignatureVerificationCode;
 		duration?: number;
 		durationSinceUpdate?: number;
 		source?: string;
 		error?: ExtensionManagementError | ExtensionGalleryError;
 	}): void {
-	let errorcode: string | undefined;
-	let errorcodeDetail: string | undefined;
-
-	if (isDefined(verificationStatus)) {
-		if (verificationStatus === true) {
-			verificationStatus = 'Verified';
-		} else if (verificationStatus === false) {
-			verificationStatus = 'Unverified';
-		} else {
-			errorcode = ExtensionManagementErrorCode.Signature;
-			errorcodeDetail = verificationStatus;
-			verificationStatus = 'Unverified';
-		}
-	}
-
-	if (error) {
-		errorcode = error.code;
-		if (error.code === ExtensionManagementErrorCode.Signature) {
-			errorcodeDetail = error.message;
-		}
-	}
 
 	/* __GDPR__
 		"extensionGallery:install" : {
@@ -853,7 +902,6 @@ function reportTelemetry(telemetryService: ITelemetryService, eventName: string,
 			"duration" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
 			"durationSinceUpdate" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"errorcode": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
-			"errorcodeDetail": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
 			"recommendationReason": { "retiredFromVersion": "1.23.0", "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"verificationStatus" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 			"source": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
@@ -879,7 +927,6 @@ function reportTelemetry(telemetryService: ITelemetryService, eventName: string,
 			"success": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
 			"duration" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
 			"errorcode": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
-			"errorcodeDetail": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
 			"verificationStatus" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 			"source": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 			"${include}": [
@@ -887,7 +934,15 @@ function reportTelemetry(telemetryService: ITelemetryService, eventName: string,
 			]
 		}
 	*/
-	telemetryService.publicLog(eventName, { ...extensionData, verificationStatus, success: !error, duration, errorcode, errorcodeDetail, durationSinceUpdate, source });
+	telemetryService.publicLog(eventName, {
+		...extensionData,
+		source,
+		duration,
+		durationSinceUpdate,
+		success: !error,
+		errorcode: error?.code,
+		verificationStatus: verificationStatus === ExtensionSignatureVerificationCode.Success ? 'Verified' : (verificationStatus ?? 'Unverified')
+	});
 }
 
 export abstract class AbstractExtensionTask<T> {
diff --git a/src/vs/platform/extensionManagement/common/configRemotes.ts b/src/vs/platform/extensionManagement/common/configRemotes.ts
index 4db44fa4abf..3f23738be8a 100644
--- a/src/vs/platform/extensionManagement/common/configRemotes.ts
+++ b/src/vs/platform/extensionManagement/common/configRemotes.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
+import { URI } from '../../../base/common/uri.js';
 
 const SshProtocolMatcher = /^([^@:]+@)?([^:]+):/;
 const SshUrlMatcher = /^([^@:]+@)?([^:]+):(.+)$/;
diff --git a/src/vs/platform/extensionManagement/common/extensionEnablementService.ts b/src/vs/platform/extensionManagement/common/extensionEnablementService.ts
index 61c8816e3aa..0a4e5337800 100644
--- a/src/vs/platform/extensionManagement/common/extensionEnablementService.ts
+++ b/src/vs/platform/extensionManagement/common/extensionEnablementService.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { isUndefinedOrNull } from 'vs/base/common/types';
-import { DISABLED_EXTENSIONS_STORAGE_PATH, IExtensionIdentifier, IExtensionManagementService, IGlobalExtensionEnablementService, InstallOperation } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { IProfileStorageValueChangeEvent, IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable, DisposableStore } from '../../../base/common/lifecycle.js';
+import { isUndefinedOrNull } from '../../../base/common/types.js';
+import { DISABLED_EXTENSIONS_STORAGE_PATH, IExtensionIdentifier, IExtensionManagementService, IGlobalExtensionEnablementService, InstallOperation } from './extensionManagement.js';
+import { areSameExtensions } from './extensionManagementUtil.js';
+import { IProfileStorageValueChangeEvent, IStorageService, StorageScope, StorageTarget } from '../../storage/common/storage.js';
 
 export class GlobalExtensionEnablementService extends Disposable implements IGlobalExtensionEnablementService {
 
@@ -16,15 +16,15 @@ export class GlobalExtensionEnablementService extends Disposable implements IGlo
 
 	private _onDidChangeEnablement = new Emitter<{ readonly extensions: IExtensionIdentifier[]; readonly source?: string }>();
 	readonly onDidChangeEnablement: Event<{ readonly extensions: IExtensionIdentifier[]; readonly source?: string }> = this._onDidChangeEnablement.event;
-	private readonly storageManger: StorageManager;
+	private readonly storageManager: StorageManager;
 
 	constructor(
 		@IStorageService storageService: IStorageService,
 		@IExtensionManagementService extensionManagementService: IExtensionManagementService,
 	) {
 		super();
-		this.storageManger = this._register(new StorageManager(storageService));
-		this._register(this.storageManger.onDidChange(extensions => this._onDidChangeEnablement.fire({ extensions, source: 'storage' })));
+		this.storageManager = this._register(new StorageManager(storageService));
+		this._register(this.storageManager.onDidChange(extensions => this._onDidChangeEnablement.fire({ extensions, source: 'storage' })));
 		this._register(extensionManagementService.onDidInstallExtensions(e => e.forEach(({ local, operation }) => {
 			if (local && operation === InstallOperation.Migrate) {
 				this._removeFromDisabledExtensions(local.identifier); /* Reset migrated extensions */
@@ -84,11 +84,11 @@ export class GlobalExtensionEnablementService extends Disposable implements IGlo
 	}
 
 	private _getExtensions(storageId: string): IExtensionIdentifier[] {
-		return this.storageManger.get(storageId, StorageScope.PROFILE);
+		return this.storageManager.get(storageId, StorageScope.PROFILE);
 	}
 
 	private _setExtensions(storageId: string, extensions: IExtensionIdentifier[]): void {
-		this.storageManger.set(storageId, extensions, StorageScope.PROFILE);
+		this.storageManager.set(storageId, extensions, StorageScope.PROFILE);
 	}
 
 }
diff --git a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
index 5548b8eefb9..1f6ef7a53f1 100644
--- a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
+++ b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
@@ -3,30 +3,30 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { distinct } from 'vs/base/common/arrays';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { CancellationError, getErrorMessage, isCancellationError } from 'vs/base/common/errors';
-import { IPager } from 'vs/base/common/paging';
-import { isWeb, platform } from 'vs/base/common/platform';
-import { arch } from 'vs/base/common/process';
-import { isBoolean } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { IHeaders, IRequestContext, IRequestOptions } from 'vs/base/parts/request/common/request';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { getTargetPlatform, IExtensionGalleryService, IExtensionIdentifier, IExtensionInfo, IGalleryExtension, IGalleryExtensionAsset, IGalleryExtensionAssets, IGalleryExtensionVersion, InstallOperation, IQueryOptions, IExtensionsControlManifest, isNotWebExtensionInWebTargetPlatform, isTargetPlatformCompatible, ITranslation, SortBy, SortOrder, StatisticType, toTargetPlatform, WEB_EXTENSION_TAG, IExtensionQueryOptions, IDeprecationInfo, ISearchPrefferedResults, ExtensionGalleryError, ExtensionGalleryErrorCode, IProductVersion } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { adoptToGalleryExtensionId, areSameExtensions, getGalleryExtensionId, getGalleryExtensionTelemetryData } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { IExtensionManifest, TargetPlatform } from 'vs/platform/extensions/common/extensions';
-import { isEngineValid } from 'vs/platform/extensions/common/extensionValidator';
-import { IFileService } from 'vs/platform/files/common/files';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { asJson, asTextOrError, IRequestService, isSuccess } from 'vs/platform/request/common/request';
-import { resolveMarketplaceHeaders } from 'vs/platform/externalServices/common/marketplace';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { StopWatch } from 'vs/base/common/stopwatch';
+import { distinct } from '../../../base/common/arrays.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { IStringDictionary } from '../../../base/common/collections.js';
+import { CancellationError, getErrorMessage, isCancellationError } from '../../../base/common/errors.js';
+import { IPager } from '../../../base/common/paging.js';
+import { isWeb, platform } from '../../../base/common/platform.js';
+import { arch } from '../../../base/common/process.js';
+import { isBoolean } from '../../../base/common/types.js';
+import { URI } from '../../../base/common/uri.js';
+import { IHeaders, IRequestContext, IRequestOptions, isOfflineError } from '../../../base/parts/request/common/request.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { getTargetPlatform, IExtensionGalleryService, IExtensionIdentifier, IExtensionInfo, IGalleryExtension, IGalleryExtensionAsset, IGalleryExtensionAssets, IGalleryExtensionVersion, InstallOperation, IQueryOptions, IExtensionsControlManifest, isNotWebExtensionInWebTargetPlatform, isTargetPlatformCompatible, ITranslation, SortBy, SortOrder, StatisticType, toTargetPlatform, WEB_EXTENSION_TAG, IExtensionQueryOptions, IDeprecationInfo, ISearchPrefferedResults, ExtensionGalleryError, ExtensionGalleryErrorCode, IProductVersion } from './extensionManagement.js';
+import { adoptToGalleryExtensionId, areSameExtensions, getGalleryExtensionId, getGalleryExtensionTelemetryData } from './extensionManagementUtil.js';
+import { IExtensionManifest, TargetPlatform } from '../../extensions/common/extensions.js';
+import { areApiProposalsCompatible, isEngineValid } from '../../extensions/common/extensionValidator.js';
+import { IFileService } from '../../files/common/files.js';
+import { ILogService } from '../../log/common/log.js';
+import { IProductService } from '../../product/common/productService.js';
+import { asJson, asTextOrError, IRequestService, isSuccess } from '../../request/common/request.js';
+import { resolveMarketplaceHeaders } from '../../externalServices/common/marketplace.js';
+import { IStorageService } from '../../storage/common/storage.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
+import { StopWatch } from '../../../base/common/stopwatch.js';
 
 const CURRENT_TARGET_PLATFORM = isWeb ? TargetPlatform.WEB : getTargetPlatform(platform, arch);
 const ACTIVITY_HEADER_NAME = 'X-Market-Search-Activity-Id';
@@ -209,10 +209,12 @@ const PropertyType = {
 	ExtensionPack: 'Microsoft.VisualStudio.Code.ExtensionPack',
 	Engine: 'Microsoft.VisualStudio.Code.Engine',
 	PreRelease: 'Microsoft.VisualStudio.Code.PreRelease',
+	EnabledApiProposals: 'Microsoft.VisualStudio.Code.EnabledApiProposals',
 	LocalizedLanguages: 'Microsoft.VisualStudio.Code.LocalizedLanguages',
 	WebExtension: 'Microsoft.VisualStudio.Code.WebExtension',
 	SponsorLink: 'Microsoft.VisualStudio.Code.SponsorLink',
 	SupportLink: 'Microsoft.VisualStudio.Services.Links.Support',
+	ExecutesCode: 'Microsoft.VisualStudio.Code.ExecutesCode',
 };
 
 interface ICriterium {
@@ -346,7 +348,7 @@ class Query {
 		return new Query({ ...this.state, source });
 	}
 
-	get raw(): any {
+	get raw() {
 		const { criteria, pageNumber, pageSize, sortBy, sortOrder, flags, assetTypes } = this.state;
 		const filters = [{ criteria, pageNumber, pageSize, sortBy, sortOrder }];
 		return { filters, assetTypes, flags };
@@ -430,6 +432,17 @@ function isPreReleaseVersion(version: IRawGalleryExtensionVersion): boolean {
 	return values.length > 0 && values[0].value === 'true';
 }
 
+function executesCode(version: IRawGalleryExtensionVersion): boolean | undefined {
+	const values = version.properties ? version.properties.filter(p => p.key === PropertyType.ExecutesCode) : [];
+	return values.length > 0 ? values[0].value === 'true' : undefined;
+}
+
+function getEnabledApiProposals(version: IRawGalleryExtensionVersion): string[] {
+	const values = version.properties ? version.properties.filter(p => p.key === PropertyType.EnabledApiProposals) : [];
+	const value = (values.length > 0 && values[0].value) || '';
+	return value ? value.split(',') : [];
+}
+
 function getLocalizedLanguages(version: IRawGalleryExtensionVersion): string[] {
 	const values = version.properties ? version.properties.filter(p => p.key === PropertyType.LocalizedLanguages) : [];
 	const value = (values.length > 0 && values[0].value) || '';
@@ -548,9 +561,11 @@ function toExtension(galleryExtension: IRawGalleryExtension, version: IRawGaller
 			dependencies: getExtensions(version, PropertyType.Dependency),
 			extensionPack: getExtensions(version, PropertyType.ExtensionPack),
 			engine: getEngine(version),
+			enabledApiProposals: getEnabledApiProposals(version),
 			localizedLanguages: getLocalizedLanguages(version),
 			targetPlatform: getTargetPlatformForExtensionVersion(version),
-			isPreReleaseVersion: isPreReleaseVersion(version)
+			isPreReleaseVersion: isPreReleaseVersion(version),
+			executesCode: executesCode(version)
 		},
 		hasPreReleaseVersion: isPreReleaseVersion(latestVersion),
 		hasReleaseVersion: true,
@@ -579,6 +594,7 @@ interface IRawExtensionsControlManifest {
 		additionalInfo?: string;
 	}>;
 	search?: ISearchPrefferedResults[];
+	extensionsEnabledWithPreRelease?: string[];
 }
 
 abstract class AbstractExtensionGalleryService implements IExtensionGalleryService {
@@ -589,7 +605,8 @@ abstract class AbstractExtensionGalleryService implements IExtensionGalleryServi
 	private readonly extensionsGallerySearchUrl: string | undefined;
 	private readonly extensionsControlUrl: string | undefined;
 
-	private readonly commonHeadersPromise: Promise<IStringDictionary<string>>;
+	private readonly commonHeadersPromise: Promise<IHeaders>;
+	private readonly extensionsEnabledWithApiProposalVersion: string[];
 
 	constructor(
 		storageService: IStorageService | undefined,
@@ -606,6 +623,7 @@ abstract class AbstractExtensionGalleryService implements IExtensionGalleryServi
 		this.extensionsGalleryUrl = isPPEEnabled ? config.servicePPEUrl : config?.serviceUrl;
 		this.extensionsGallerySearchUrl = isPPEEnabled ? undefined : config?.searchUrl;
 		this.extensionsControlUrl = config?.controlUrl;
+		this.extensionsEnabledWithApiProposalVersion = productService.extensionsEnabledWithApiProposalVersion?.map(id => id.toLowerCase()) ?? [];
 		this.commonHeadersPromise = resolveMarketplaceHeaders(
 			productService.version,
 			productService,
@@ -629,6 +647,36 @@ abstract class AbstractExtensionGalleryService implements IExtensionGalleryServi
 	async getExtensions(extensionInfos: ReadonlyArray<IExtensionInfo>, arg1: any, arg2?: any): Promise<IGalleryExtension[]> {
 		const options = CancellationToken.isCancellationToken(arg1) ? {} : arg1 as IExtensionQueryOptions;
 		const token = CancellationToken.isCancellationToken(arg1) ? arg1 : arg2 as CancellationToken;
+		const result = await this.doGetExtensions(extensionInfos, options, token);
+
+		const uuids = result.map(r => r.identifier.uuid);
+		const extensionInfosByName: IExtensionInfo[] = [];
+		for (const e of extensionInfos) {
+			if (e.uuid && !uuids.includes(e.uuid)) {
+				extensionInfosByName.push({ ...e, uuid: undefined });
+			}
+		}
+
+		if (extensionInfosByName.length) {
+			// report telemetry data for additional query
+			this.telemetryService.publicLog2<
+				{ count: number },
+				{
+					owner: 'sandy081';
+					comment: 'Report the query to the the Marketplace for fetching extensions by name';
+					readonly count: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Number of extensions to fetch' };
+				}>('galleryService:additionalQueryByName', {
+					count: extensionInfosByName.length
+				});
+
+			const extensions = await this.doGetExtensions(extensionInfosByName, options, token);
+			result.push(...extensions);
+		}
+
+		return result;
+	}
+
+	private async doGetExtensions(extensionInfos: ReadonlyArray<IExtensionInfo>, options: IExtensionQueryOptions, token: CancellationToken): Promise<IGalleryExtension[]> {
 		const names: string[] = []; const ids: string[] = [], includePreReleases: (IExtensionIdentifier & { includePreRelease: boolean })[] = [], versions: (IExtensionIdentifier & { version: string })[] = [];
 		let isQueryForReleaseVersionFromPreReleaseVersion = true;
 		for (const extensionInfo of extensionInfos) {
@@ -704,7 +752,26 @@ abstract class AbstractExtensionGalleryService implements IExtensionGalleryServi
 			}
 			engine = manifest.engines.vscode;
 		}
-		return isEngineValid(engine, productVersion.version, productVersion.date);
+
+		if (!isEngineValid(engine, productVersion.version, productVersion.date)) {
+			return false;
+		}
+
+		if (!this.areApiProposalsCompatible(extension.identifier, extension.properties.enabledApiProposals)) {
+			return false;
+		}
+
+		return true;
+	}
+
+	private areApiProposalsCompatible(extensionIdentifier: IExtensionIdentifier, enabledApiProposals: string[] | undefined): boolean {
+		if (!enabledApiProposals) {
+			return true;
+		}
+		if (!this.extensionsEnabledWithApiProposalVersion.includes(extensionIdentifier.id.toLowerCase())) {
+			return true;
+		}
+		return areApiProposalsCompatible(enabledApiProposals);
 	}
 
 	private async isValidVersion(extension: string, rawGalleryExtensionVersion: IRawGalleryExtensionVersion, versionType: 'release' | 'prerelease' | 'any', compatible: boolean, allTargetPlatforms: TargetPlatform[], targetPlatform: TargetPlatform, productVersion: IProductVersion = { version: this.productService.version, date: this.productService.date }): Promise<boolean> {
@@ -915,7 +982,18 @@ abstract class AbstractExtensionGalleryService implements IExtensionGalleryServi
 				continue;
 			}
 			// Allow any version if includePreRelease flag is set otherwise only release versions are allowed
-			if (await this.isValidVersion(getGalleryExtensionId(rawGalleryExtension.publisher.publisherName, rawGalleryExtension.extensionName), rawGalleryExtensionVersion, includePreRelease ? 'any' : 'release', criteria.compatible, allTargetPlatforms, criteria.targetPlatform, criteria.productVersion)) {
+			if (await this.isValidVersion(
+				extensionIdentifier.id,
+				rawGalleryExtensionVersion,
+				includePreRelease ? 'any' : 'release',
+				criteria.compatible,
+				allTargetPlatforms,
+				criteria.targetPlatform,
+				criteria.productVersion)
+			) {
+				if (criteria.compatible && !this.areApiProposalsCompatible(extensionIdentifier, getEnabledApiProposals(rawGalleryExtensionVersion))) {
+					continue;
+				}
 				return toExtension(rawGalleryExtension, rawGalleryExtensionVersion, allTargetPlatforms, queryContext);
 			}
 			if (version && rawGalleryExtensionVersion.version === version) {
@@ -981,9 +1059,9 @@ abstract class AbstractExtensionGalleryService implements IExtensionGalleryServi
 				return {
 					galleryExtensions,
 					total,
-					context: {
+					context: context.res.headers['activityid'] ? {
 						[ACTIVITY_HEADER_NAME]: context.res.headers['activityid']
-					}
+					} : {}
 				};
 			}
 			return { galleryExtensions: [], total };
@@ -994,7 +1072,11 @@ abstract class AbstractExtensionGalleryService implements IExtensionGalleryServi
 				throw e;
 			} else {
 				const errorMessage = getErrorMessage(e);
-				errorCode = errorMessage.startsWith('XHR timeout') ? ExtensionGalleryErrorCode.Timeout : ExtensionGalleryErrorCode.Failed;
+				errorCode = isOfflineError(e)
+					? ExtensionGalleryErrorCode.Offline
+					: errorMessage.startsWith('XHR timeout')
+						? ExtensionGalleryErrorCode.Timeout
+						: ExtensionGalleryErrorCode.Failed;
 				throw new ExtensionGalleryError(errorMessage, errorCode);
 			}
 		} finally {
@@ -1137,15 +1219,15 @@ abstract class AbstractExtensionGalleryService implements IExtensionGalleryServi
 		return '';
 	}
 
-	async getAllCompatibleVersions(extension: IGalleryExtension, includePreRelease: boolean, targetPlatform: TargetPlatform): Promise<IGalleryExtensionVersion[]> {
+	async getAllCompatibleVersions(extensionIdentifier: IExtensionIdentifier, includePreRelease: boolean, targetPlatform: TargetPlatform): Promise<IGalleryExtensionVersion[]> {
 		let query = new Query()
 			.withFlags(Flags.IncludeVersions, Flags.IncludeCategoryAndTags, Flags.IncludeFiles, Flags.IncludeVersionProperties)
 			.withPage(1, 1);
 
-		if (extension.identifier.uuid) {
-			query = query.withFilter(FilterType.ExtensionId, extension.identifier.uuid);
+		if (extensionIdentifier.uuid) {
+			query = query.withFilter(FilterType.ExtensionId, extensionIdentifier.uuid);
 		} else {
-			query = query.withFilter(FilterType.ExtensionName, extension.identifier.id);
+			query = query.withFilter(FilterType.ExtensionName, extensionIdentifier.id);
 		}
 
 		const { galleryExtensions } = await this.queryRawGalleryExtensions(query, CancellationToken.None);
@@ -1161,7 +1243,15 @@ abstract class AbstractExtensionGalleryService implements IExtensionGalleryServi
 		const validVersions: IRawGalleryExtensionVersion[] = [];
 		await Promise.all(galleryExtensions[0].versions.map(async (version) => {
 			try {
-				if (await this.isValidVersion(extension.identifier.id, version, includePreRelease ? 'any' : 'release', true, allTargetPlatforms, targetPlatform)) {
+				if (
+					(await this.isValidVersion(
+						extensionIdentifier.id,
+						version, includePreRelease ? 'any' : 'release',
+						true,
+						allTargetPlatforms,
+						targetPlatform))
+					&& this.areApiProposalsCompatible(extensionIdentifier, getEnabledApiProposals(version))
+				) {
 					validVersions.push(version);
 				}
 			} catch (error) { /* Ignore error and skip version */ }
@@ -1262,6 +1352,7 @@ abstract class AbstractExtensionGalleryService implements IExtensionGalleryServi
 		const malicious: IExtensionIdentifier[] = [];
 		const deprecated: IStringDictionary<IDeprecationInfo> = {};
 		const search: ISearchPrefferedResults[] = [];
+		const extensionsEnabledWithPreRelease: string[] = [];
 		if (result) {
 			for (const id of result.malicious) {
 				malicious.push({ id });
@@ -1293,9 +1384,14 @@ abstract class AbstractExtensionGalleryService implements IExtensionGalleryServi
 					search.push(s);
 				}
 			}
+			if (Array.isArray(result.extensionsEnabledWithPreRelease)) {
+				for (const id of result.extensionsEnabledWithPreRelease) {
+					extensionsEnabledWithPreRelease.push(id.toLowerCase());
+				}
+			}
 		}
 
-		return { malicious, deprecated, search };
+		return { malicious, deprecated, search, extensionsEnabledWithPreRelease };
 	}
 }
 
diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
index fa3ad5f5595..ea7b30d9422 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { Event } from 'vs/base/common/event';
-import { IPager } from 'vs/base/common/paging';
-import { Platform } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { localize2 } from 'vs/nls';
-import { ExtensionType, IExtension, IExtensionManifest, TargetPlatform } from 'vs/platform/extensions/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { IStringDictionary } from '../../../base/common/collections.js';
+import { Event } from '../../../base/common/event.js';
+import { IPager } from '../../../base/common/paging.js';
+import { Platform } from '../../../base/common/platform.js';
+import { URI } from '../../../base/common/uri.js';
+import { localize2 } from '../../../nls.js';
+import { ExtensionType, IExtension, IExtensionManifest, TargetPlatform } from '../../extensions/common/extensions.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 export const EXTENSION_IDENTIFIER_PATTERN = '^([a-z0-9A-Z][a-z0-9-A-Z]*)\\.([a-z0-9A-Z][a-z0-9-A-Z]*)$';
 export const EXTENSION_IDENTIFIER_REGEX = new RegExp(EXTENSION_IDENTIFIER_PATTERN);
@@ -159,9 +159,11 @@ export interface IGalleryExtensionProperties {
 	dependencies?: string[];
 	extensionPack?: string[];
 	engine?: string;
+	enabledApiProposals?: string[];
 	localizedLanguages?: string[];
 	targetPlatform: TargetPlatform;
 	isPreReleaseVersion: boolean;
+	executesCode?: boolean;
 }
 
 export interface IGalleryExtensionAsset {
@@ -326,6 +328,7 @@ export interface IExtensionsControlManifest {
 	readonly malicious: IExtensionIdentifier[];
 	readonly deprecated: IStringDictionary<IDeprecationInfo>;
 	readonly search: ISearchPrefferedResults[];
+	readonly extensionsEnabledWithPreRelease?: string[];
 }
 
 export const enum InstallOperation {
@@ -367,7 +370,7 @@ export interface IExtensionGalleryService {
 	getExtensions(extensionInfos: ReadonlyArray<IExtensionInfo>, options: IExtensionQueryOptions, token: CancellationToken): Promise<IGalleryExtension[]>;
 	isExtensionCompatible(extension: IGalleryExtension, includePreRelease: boolean, targetPlatform: TargetPlatform, productVersion?: IProductVersion): Promise<boolean>;
 	getCompatibleExtension(extension: IGalleryExtension, includePreRelease: boolean, targetPlatform: TargetPlatform, productVersion?: IProductVersion): Promise<IGalleryExtension | null>;
-	getAllCompatibleVersions(extension: IGalleryExtension, includePreRelease: boolean, targetPlatform: TargetPlatform): Promise<IGalleryExtensionVersion[]>;
+	getAllCompatibleVersions(extensionIdentifier: IExtensionIdentifier, includePreRelease: boolean, targetPlatform: TargetPlatform): Promise<IGalleryExtensionVersion[]>;
 	download(extension: IGalleryExtension, location: URI, operation: InstallOperation): Promise<void>;
 	downloadSignatureArchive(extension: IGalleryExtension, location: URI): Promise<void>;
 	reportStatistic(publisher: string, name: string, version: string, type: StatisticType): Promise<void>;
@@ -423,6 +426,7 @@ export const enum ExtensionGalleryErrorCode {
 	Cancelled = 'Cancelled',
 	Failed = 'Failed',
 	DownloadFailedWriting = 'DownloadFailedWriting',
+	Offline = 'Offline',
 }
 
 export class ExtensionGalleryError extends Error {
@@ -437,6 +441,7 @@ export const enum ExtensionManagementErrorCode {
 	Deprecated = 'Deprecated',
 	Malicious = 'Malicious',
 	Incompatible = 'Incompatible',
+	IncompatibleApi = 'IncompatibleApi',
 	IncompatibleTargetPlatform = 'IncompatibleTargetPlatform',
 	ReleaseVersionNotFound = 'ReleaseVersionNotFound',
 	Invalid = 'Invalid',
@@ -457,7 +462,9 @@ export const enum ExtensionManagementErrorCode {
 	PostInstall = 'PostInstall',
 	CorruptZip = 'CorruptZip',
 	IncompleteZip = 'IncompleteZip',
-	Signature = 'Signature',
+	PackageNotSigned = 'PackageNotSigned',
+	SignatureVerificationInternal = 'SignatureVerificationInternal',
+	SignatureVerificationFailed = 'SignatureVerificationFailed',
 	NotAllowed = 'NotAllowed',
 	Gallery = 'Gallery',
 	Cancelled = 'Cancelled',
@@ -465,6 +472,35 @@ export const enum ExtensionManagementErrorCode {
 	Internal = 'Internal',
 }
 
+export enum ExtensionSignatureVerificationCode {
+	'Success' = 'Success',
+	'RequiredArgumentMissing' = 'RequiredArgumentMissing', // A required argument is missing.
+	'InvalidArgument' = 'InvalidArgument', // An argument is invalid.
+	'PackageIsUnreadable' = 'PackageIsUnreadable', // The extension package is unreadable.
+	'UnhandledException' = 'UnhandledException', // An unhandled exception occurred.
+	'SignatureManifestIsMissing' = 'SignatureManifestIsMissing', // The extension is missing a signature manifest file (.signature.manifest).
+	'SignatureManifestIsUnreadable' = 'SignatureManifestIsUnreadable', // The signature manifest is unreadable.
+	'SignatureIsMissing' = 'SignatureIsMissing', // The extension is missing a signature file (.signature.p7s).
+	'SignatureIsUnreadable' = 'SignatureIsUnreadable', // The signature is unreadable.
+	'CertificateIsUnreadable' = 'CertificateIsUnreadable', // The certificate is unreadable.
+	'SignatureArchiveIsUnreadable' = 'SignatureArchiveIsUnreadable',
+	'FileAlreadyExists' = 'FileAlreadyExists', // The output file already exists.
+	'SignatureArchiveIsInvalidZip' = 'SignatureArchiveIsInvalidZip',
+	'SignatureArchiveHasSameSignatureFile' = 'SignatureArchiveHasSameSignatureFile', // The signature archive has the same signature file.
+	'PackageIntegrityCheckFailed' = 'PackageIntegrityCheckFailed', // The package integrity check failed.
+	'SignatureIsInvalid' = 'SignatureIsInvalid', // The extension has an invalid signature file (.signature.p7s).
+	'SignatureManifestIsInvalid' = 'SignatureManifestIsInvalid', // The extension has an invalid signature manifest file (.signature.manifest).
+	'SignatureIntegrityCheckFailed' = 'SignatureIntegrityCheckFailed', // The extension's signature integrity check failed.  Extension integrity is suspect.
+	'EntryIsMissing' = 'EntryIsMissing', // An entry referenced in the signature manifest was not found in the extension.
+	'EntryIsTampered' = 'EntryIsTampered', // The integrity check for an entry referenced in the signature manifest failed.
+	'Untrusted' = 'Untrusted', // An X.509 certificate in the extension signature is untrusted.
+	'CertificateRevoked' = 'CertificateRevoked', // An X.509 certificate in the extension signature has been revoked.
+	'SignatureIsNotValid' = 'SignatureIsNotValid', // The extension signature is invalid.
+	'UnknownError' = 'UnknownError', // An unknown error occurred.
+	'PackageIsInvalidZip' = 'PackageIsInvalidZip', // The extension package is not valid ZIP format.
+	'SignatureArchiveHasTooManyEntries' = 'SignatureArchiveHasTooManyEntries', // The signature archive has too many entries.
+}
+
 export class ExtensionManagementError extends Error {
 	constructor(message: string, readonly code: ExtensionManagementErrorCode) {
 		super(message);
@@ -487,6 +523,7 @@ export type InstallOptions = {
 	profileLocation?: URI;
 	installOnlyNewlyAddedFromExtensionPack?: boolean;
 	productVersion?: IProductVersion;
+	keepExisting?: boolean;
 	/**
 	 * Context passed through to InstallExtensionResult
 	 */
@@ -507,6 +544,7 @@ export interface IExtensionManagementParticipant {
 }
 
 export type InstallExtensionInfo = { readonly extension: IGalleryExtension; readonly options: InstallOptions };
+export type UninstallExtensionInfo = { readonly extension: ILocalExtension; readonly options?: UninstallOptions };
 
 export const IExtensionManagementService = createDecorator<IExtensionManagementService>('extensionManagementService');
 export interface IExtensionManagementService {
@@ -519,7 +557,6 @@ export interface IExtensionManagementService {
 	onDidUpdateExtensionMetadata: Event<DidUpdateExtensionMetadata>;
 
 	zip(extension: ILocalExtension): Promise<URI>;
-	unzip(zipLocation: URI): Promise<IExtensionIdentifier>;
 	getManifest(vsix: URI): Promise<IExtensionManifest>;
 	install(vsix: URI, options?: InstallOptions): Promise<ILocalExtension>;
 	canInstall(extension: IGalleryExtension): Promise<boolean>;
@@ -528,12 +565,14 @@ export interface IExtensionManagementService {
 	installFromLocation(location: URI, profileLocation: URI): Promise<ILocalExtension>;
 	installExtensionsFromProfile(extensions: IExtensionIdentifier[], fromProfileLocation: URI, toProfileLocation: URI): Promise<ILocalExtension[]>;
 	uninstall(extension: ILocalExtension, options?: UninstallOptions): Promise<void>;
+	uninstallExtensions(extensions: UninstallExtensionInfo[]): Promise<void>;
 	toggleAppliationScope(extension: ILocalExtension, fromProfileLocation: URI): Promise<ILocalExtension>;
 	reinstallFromGallery(extension: ILocalExtension): Promise<ILocalExtension>;
 	getInstalled(type?: ExtensionType, profileLocation?: URI, productVersion?: IProductVersion): Promise<ILocalExtension[]>;
 	getExtensionsControlManifest(): Promise<IExtensionsControlManifest>;
 	copyExtensions(fromProfileLocation: URI, toProfileLocation: URI): Promise<void>;
 	updateMetadata(local: ILocalExtension, metadata: Partial<Metadata>, profileLocation: URI): Promise<ILocalExtension>;
+	resetPinnedStateForAllUserExtensions(pinned: boolean): Promise<void>;
 
 	download(extension: IGalleryExtension, operation: InstallOperation, donotVerifySignature: boolean): Promise<URI>;
 
diff --git a/src/vs/platform/extensionManagement/common/extensionManagementCLI.ts b/src/vs/platform/extensionManagement/common/extensionManagementCLI.ts
index 9241f4170ab..69ba77c8c84 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagementCLI.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagementCLI.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { getErrorMessage, isCancellationError } from 'vs/base/common/errors';
-import { Schemas } from 'vs/base/common/network';
-import { basename } from 'vs/base/common/resources';
-import { gt } from 'vs/base/common/semver/semver';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { EXTENSION_IDENTIFIER_REGEX, IExtensionGalleryService, IExtensionInfo, IExtensionManagementService, IGalleryExtension, ILocalExtension, InstallOptions, InstallExtensionInfo, InstallOperation } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { areSameExtensions, getExtensionId, getGalleryExtensionId, getIdAndVersion } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { ExtensionType, EXTENSION_CATEGORIES, IExtensionManifest } from 'vs/platform/extensions/common/extensions';
-import { ILogger } from 'vs/platform/log/common/log';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { getErrorMessage, isCancellationError } from '../../../base/common/errors.js';
+import { Schemas } from '../../../base/common/network.js';
+import { basename } from '../../../base/common/resources.js';
+import { gt } from '../../../base/common/semver/semver.js';
+import { URI } from '../../../base/common/uri.js';
+import { localize } from '../../../nls.js';
+import { EXTENSION_IDENTIFIER_REGEX, IExtensionGalleryService, IExtensionInfo, IExtensionManagementService, IGalleryExtension, ILocalExtension, InstallOptions, InstallExtensionInfo, InstallOperation } from './extensionManagement.js';
+import { areSameExtensions, getExtensionId, getGalleryExtensionId, getIdAndVersion } from './extensionManagementUtil.js';
+import { ExtensionType, EXTENSION_CATEGORIES, IExtensionManifest } from '../../extensions/common/extensions.js';
+import { ILogger } from '../../log/common/log.js';
 
 
 const notFound = (id: string) => localize('notFound', "Extension '{0}' not found.", id);
@@ -146,7 +146,7 @@ export class ExtensionManagementCLI {
 				if (areSameExtensions(oldVersion.identifier, newVersion.identifier) && gt(newVersion.version, oldVersion.manifest.version)) {
 					extensionsToUpdate.push({
 						extension: newVersion,
-						options: { operation: InstallOperation.Update, installPreReleaseVersion: oldVersion.preRelease, profileLocation }
+						options: { operation: InstallOperation.Update, installPreReleaseVersion: oldVersion.preRelease, profileLocation, isApplicationScoped: oldVersion.isApplicationScoped }
 					});
 				}
 			}
@@ -224,7 +224,7 @@ export class ExtensionManagementCLI {
 			}
 			extensionsToInstall.push({
 				extension: gallery,
-				options: { ...installOptions, installGivenVersion: !!version },
+				options: { ...installOptions, installGivenVersion: !!version, isApplicationScoped: installOptions.isApplicationScoped || installedExtension?.isApplicationScoped },
 			});
 		}));
 
@@ -253,7 +253,7 @@ export class ExtensionManagementCLI {
 		const valid = await this.validateVSIX(manifest, force, installOptions.profileLocation, installedExtensions);
 		if (valid) {
 			try {
-				await this.extensionManagementService.install(vsix, installOptions);
+				await this.extensionManagementService.install(vsix, { ...installOptions, installGivenVersion: true });
 				this.logger.info(localize('successVsixInstall', "Extension '{0}' was successfully installed.", basename(vsix)));
 			} catch (error) {
 				if (isCancellationError(error)) {
diff --git a/src/vs/platform/extensionManagement/common/extensionManagementIpc.ts b/src/vs/platform/extensionManagement/common/extensionManagementIpc.ts
index 75cf3eb91ae..33d368d7397 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagementIpc.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagementIpc.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { cloneAndChange } from 'vs/base/common/objects';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { DefaultURITransformer, IURITransformer, transformAndReviveIncomingURIs } from 'vs/base/common/uriIpc';
-import { IChannel, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
-import { IExtensionIdentifier, IExtensionTipsService, IGalleryExtension, ILocalExtension, IExtensionsControlManifest, isTargetPlatformCompatible, InstallOptions, UninstallOptions, Metadata, IExtensionManagementService, DidUninstallExtensionEvent, InstallExtensionEvent, InstallExtensionResult, UninstallExtensionEvent, InstallOperation, InstallExtensionInfo, IProductVersion, DidUpdateExtensionMetadata } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { ExtensionType, IExtensionManifest, TargetPlatform } from 'vs/platform/extensions/common/extensions';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { cloneAndChange } from '../../../base/common/objects.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { DefaultURITransformer, IURITransformer, transformAndReviveIncomingURIs } from '../../../base/common/uriIpc.js';
+import { IChannel, IServerChannel } from '../../../base/parts/ipc/common/ipc.js';
+import { IExtensionIdentifier, IExtensionTipsService, IGalleryExtension, ILocalExtension, IExtensionsControlManifest, isTargetPlatformCompatible, InstallOptions, UninstallOptions, Metadata, IExtensionManagementService, DidUninstallExtensionEvent, InstallExtensionEvent, InstallExtensionResult, UninstallExtensionEvent, InstallOperation, InstallExtensionInfo, IProductVersion, DidUpdateExtensionMetadata, UninstallExtensionInfo } from './extensionManagement.js';
+import { ExtensionType, IExtensionManifest, TargetPlatform } from '../../extensions/common/extensions.js';
 
 function transformIncomingURI(uri: UriComponents, transformer: IURITransformer | null): URI;
 function transformIncomingURI(uri: UriComponents | undefined, transformer: IURITransformer | null): URI | undefined;
@@ -109,9 +109,6 @@ export class ExtensionManagementChannel implements IServerChannel {
 				const uri = await this.service.zip(extension);
 				return transformOutgoingURI(uri, uriTransformer);
 			}
-			case 'unzip': {
-				return this.service.unzip(transformIncomingURI(args[0], uriTransformer));
-			}
 			case 'install': {
 				return this.service.install(transformIncomingURI(args[0], uriTransformer), transformIncomingOptions(args[1], uriTransformer));
 			}
@@ -140,6 +137,10 @@ export class ExtensionManagementChannel implements IServerChannel {
 			case 'uninstall': {
 				return this.service.uninstall(transformIncomingExtension(args[0], uriTransformer), transformIncomingOptions(args[1], uriTransformer));
 			}
+			case 'uninstallExtensions': {
+				const arg: UninstallExtensionInfo[] = args[0];
+				return this.service.uninstallExtensions(arg.map(({ extension, options }) => ({ extension: transformIncomingExtension(extension, uriTransformer), options: transformIncomingOptions(options, uriTransformer) })));
+			}
 			case 'reinstallFromGallery': {
 				return this.service.reinstallFromGallery(transformIncomingExtension(args[0], uriTransformer));
 			}
@@ -158,6 +159,9 @@ export class ExtensionManagementChannel implements IServerChannel {
 				const e = await this.service.updateMetadata(transformIncomingExtension(args[0], uriTransformer), args[1], transformIncomingURI(args[2], uriTransformer));
 				return transformOutgoingExtension(e, uriTransformer);
 			}
+			case 'resetPinnedStateForAllUserExtensions': {
+				return this.service.resetPinnedStateForAllUserExtensions(args[0]);
+			}
 			case 'getExtensionsControlManifest': {
 				return this.service.getExtensionsControlManifest();
 			}
@@ -183,34 +187,48 @@ export class ExtensionManagementChannelClient extends Disposable implements IExt
 
 	declare readonly _serviceBrand: undefined;
 
-	private readonly _onInstallExtension = this._register(new Emitter<InstallExtensionEvent>());
+	protected readonly _onInstallExtension = this._register(new Emitter<InstallExtensionEvent>());
 	get onInstallExtension() { return this._onInstallExtension.event; }
 
-	private readonly _onDidInstallExtensions = this._register(new Emitter<readonly InstallExtensionResult[]>());
+	protected readonly _onDidInstallExtensions = this._register(new Emitter<readonly InstallExtensionResult[]>());
 	get onDidInstallExtensions() { return this._onDidInstallExtensions.event; }
 
-	private readonly _onUninstallExtension = this._register(new Emitter<UninstallExtensionEvent>());
+	protected readonly _onUninstallExtension = this._register(new Emitter<UninstallExtensionEvent>());
 	get onUninstallExtension() { return this._onUninstallExtension.event; }
 
-	private readonly _onDidUninstallExtension = this._register(new Emitter<DidUninstallExtensionEvent>());
+	protected readonly _onDidUninstallExtension = this._register(new Emitter<DidUninstallExtensionEvent>());
 	get onDidUninstallExtension() { return this._onDidUninstallExtension.event; }
 
-	private readonly _onDidUpdateExtensionMetadata = this._register(new Emitter<DidUpdateExtensionMetadata>());
+	protected readonly _onDidUpdateExtensionMetadata = this._register(new Emitter<DidUpdateExtensionMetadata>());
 	get onDidUpdateExtensionMetadata() { return this._onDidUpdateExtensionMetadata.event; }
 
 	constructor(private readonly channel: IChannel) {
 		super();
-		this._register(this.channel.listen<InstallExtensionEvent>('onInstallExtension')(e => this.fireEvent(this._onInstallExtension, { ...e, source: this.isUriComponents(e.source) ? URI.revive(e.source) : e.source, profileLocation: URI.revive(e.profileLocation) })));
-		this._register(this.channel.listen<readonly InstallExtensionResult[]>('onDidInstallExtensions')(results => this.fireEvent(this._onDidInstallExtensions, results.map(e => ({ ...e, local: e.local ? transformIncomingExtension(e.local, null) : e.local, source: this.isUriComponents(e.source) ? URI.revive(e.source) : e.source, profileLocation: URI.revive(e.profileLocation) })))));
-		this._register(this.channel.listen<UninstallExtensionEvent>('onUninstallExtension')(e => this.fireEvent(this._onUninstallExtension, { ...e, profileLocation: URI.revive(e.profileLocation) })));
-		this._register(this.channel.listen<DidUninstallExtensionEvent>('onDidUninstallExtension')(e => this.fireEvent(this._onDidUninstallExtension, { ...e, profileLocation: URI.revive(e.profileLocation) })));
-		this._register(this.channel.listen<DidUpdateExtensionMetadata>('onDidUpdateExtensionMetadata')(e => this.fireEvent(this._onDidUpdateExtensionMetadata, { profileLocation: URI.revive(e.profileLocation), local: transformIncomingExtension(e.local, null) })));
+		this._register(this.channel.listen<InstallExtensionEvent>('onInstallExtension')(e => this.onInstallExtensionEvent({ ...e, source: this.isUriComponents(e.source) ? URI.revive(e.source) : e.source, profileLocation: URI.revive(e.profileLocation) })));
+		this._register(this.channel.listen<readonly InstallExtensionResult[]>('onDidInstallExtensions')(results => this.onDidInstallExtensionsEvent(results.map(e => ({ ...e, local: e.local ? transformIncomingExtension(e.local, null) : e.local, source: this.isUriComponents(e.source) ? URI.revive(e.source) : e.source, profileLocation: URI.revive(e.profileLocation) })))));
+		this._register(this.channel.listen<UninstallExtensionEvent>('onUninstallExtension')(e => this.onUninstallExtensionEvent({ ...e, profileLocation: URI.revive(e.profileLocation) })));
+		this._register(this.channel.listen<DidUninstallExtensionEvent>('onDidUninstallExtension')(e => this.onDidUninstallExtensionEvent({ ...e, profileLocation: URI.revive(e.profileLocation) })));
+		this._register(this.channel.listen<DidUpdateExtensionMetadata>('onDidUpdateExtensionMetadata')(e => this.onDidUpdateExtensionMetadataEvent({ profileLocation: URI.revive(e.profileLocation), local: transformIncomingExtension(e.local, null) })));
 	}
 
-	protected fireEvent<E extends ExtensionEventResult>(event: Emitter<E>, data: E): void;
-	protected fireEvent<E extends ExtensionEventResult>(event: Emitter<readonly E[]>, data: E[]): void;
-	protected fireEvent<E extends ExtensionEventResult>(event: Emitter<E | E[]>, data: E | E[]): void {
-		event.fire(data);
+	protected onInstallExtensionEvent(event: InstallExtensionEvent): void {
+		this._onInstallExtension.fire(event);
+	}
+
+	protected onDidInstallExtensionsEvent(results: readonly InstallExtensionResult[]): void {
+		this._onDidInstallExtensions.fire(results);
+	}
+
+	protected onUninstallExtensionEvent(event: UninstallExtensionEvent): void {
+		this._onUninstallExtension.fire(event);
+	}
+
+	protected onDidUninstallExtensionEvent(event: DidUninstallExtensionEvent): void {
+		this._onDidUninstallExtension.fire(event);
+	}
+
+	protected onDidUpdateExtensionMetadataEvent(event: DidUpdateExtensionMetadata): void {
+		this._onDidUpdateExtensionMetadata.fire(event);
 	}
 
 	private isUriComponents(thing: unknown): thing is UriComponents {
@@ -238,10 +256,6 @@ export class ExtensionManagementChannelClient extends Disposable implements IExt
 		return Promise.resolve(this.channel.call<UriComponents>('zip', [extension]).then(result => URI.revive(result)));
 	}
 
-	unzip(zipLocation: URI): Promise<IExtensionIdentifier> {
-		return Promise.resolve(this.channel.call<IExtensionIdentifier>('unzip', [zipLocation]));
-	}
-
 	install(vsix: URI, options?: InstallOptions): Promise<ILocalExtension> {
 		return Promise.resolve(this.channel.call<ILocalExtension>('install', [vsix, options])).then(local => transformIncomingExtension(local, null));
 	}
@@ -275,6 +289,14 @@ export class ExtensionManagementChannelClient extends Disposable implements IExt
 		return Promise.resolve(this.channel.call<void>('uninstall', [extension, options]));
 	}
 
+	uninstallExtensions(extensions: UninstallExtensionInfo[]): Promise<void> {
+		if (extensions.some(e => e.extension.isWorkspaceScoped)) {
+			throw new Error('Cannot uninstall a workspace extension');
+		}
+		return Promise.resolve(this.channel.call<void>('uninstallExtensions', [extensions]));
+
+	}
+
 	reinstallFromGallery(extension: ILocalExtension): Promise<ILocalExtension> {
 		return Promise.resolve(this.channel.call<ILocalExtension>('reinstallFromGallery', [extension])).then(local => transformIncomingExtension(local, null));
 	}
@@ -289,6 +311,10 @@ export class ExtensionManagementChannelClient extends Disposable implements IExt
 			.then(extension => transformIncomingExtension(extension, null));
 	}
 
+	resetPinnedStateForAllUserExtensions(pinned: boolean): Promise<void> {
+		return this.channel.call<void>('resetPinnedStateForAllUserExtensions', [pinned]);
+	}
+
 	toggleAppliationScope(local: ILocalExtension, fromProfileLocation: URI): Promise<ILocalExtension> {
 		return this.channel.call<ILocalExtension>('toggleAppliationScope', [local, fromProfileLocation])
 			.then(extension => transformIncomingExtension(extension, null));
diff --git a/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts b/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
index 301c7b18e70..9b0ef7b6ff4 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { compareIgnoreCase } from 'vs/base/common/strings';
-import { IExtensionIdentifier, IGalleryExtension, ILocalExtension, getTargetPlatform } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { ExtensionIdentifier, IExtension, TargetPlatform, UNDEFINED_PUBLISHER } from 'vs/platform/extensions/common/extensions';
-import { IFileService } from 'vs/platform/files/common/files';
-import { isLinux, platform } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { getErrorMessage } from 'vs/base/common/errors';
-import { ILogService } from 'vs/platform/log/common/log';
-import { arch } from 'vs/base/common/process';
-import { TelemetryTrustedValue } from 'vs/platform/telemetry/common/telemetryUtils';
+import { compareIgnoreCase } from '../../../base/common/strings.js';
+import { IExtensionIdentifier, IGalleryExtension, ILocalExtension, getTargetPlatform } from './extensionManagement.js';
+import { ExtensionIdentifier, IExtension, TargetPlatform, UNDEFINED_PUBLISHER } from '../../extensions/common/extensions.js';
+import { IFileService } from '../../files/common/files.js';
+import { isLinux, platform } from '../../../base/common/platform.js';
+import { URI } from '../../../base/common/uri.js';
+import { getErrorMessage } from '../../../base/common/errors.js';
+import { ILogService } from '../../log/common/log.js';
+import { arch } from '../../../base/common/process.js';
+import { TelemetryTrustedValue } from '../../telemetry/common/telemetryUtils.js';
 
 export function areSameExtensions(a: IExtensionIdentifier, b: IExtensionIdentifier): boolean {
 	if (a.uuid && b.uuid) {
@@ -103,7 +103,7 @@ export function groupByExtension<T>(extensions: T[], getExtensionIdentifier: (t:
 	return byExtension;
 }
 
-export function getLocalExtensionTelemetryData(extension: ILocalExtension): any {
+export function getLocalExtensionTelemetryData(extension: ILocalExtension) {
 	return {
 		id: extension.identifier.id,
 		name: extension.manifest.name,
@@ -133,7 +133,7 @@ export function getLocalExtensionTelemetryData(extension: ILocalExtension): any
 		]
 	}
 */
-export function getGalleryExtensionTelemetryData(extension: IGalleryExtension): any {
+export function getGalleryExtensionTelemetryData(extension: IGalleryExtension) {
 	return {
 		id: new TelemetryTrustedValue(extension.identifier.id),
 		name: new TelemetryTrustedValue(extension.name),
diff --git a/src/vs/platform/extensionManagement/common/extensionNls.ts b/src/vs/platform/extensionManagement/common/extensionNls.ts
index 2f196970f3f..f35e866051d 100644
--- a/src/vs/platform/extensionManagement/common/extensionNls.ts
+++ b/src/vs/platform/extensionManagement/common/extensionNls.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isObject, isString } from 'vs/base/common/types';
-import { ILocalizedString } from 'vs/platform/action/common/action';
-import { IExtensionManifest } from 'vs/platform/extensions/common/extensions';
-import { localize } from 'vs/nls';
-import { ILogger } from 'vs/platform/log/common/log';
+import { isObject, isString } from '../../../base/common/types.js';
+import { ILocalizedString } from '../../action/common/action.js';
+import { IExtensionManifest } from '../../extensions/common/extensions.js';
+import { localize } from '../../../nls.js';
+import { ILogger } from '../../log/common/log.js';
 
 export interface ITranslations {
 	[key: string]: string | { message: string; comment: string[] } | undefined;
diff --git a/src/vs/platform/extensionManagement/common/extensionStorage.ts b/src/vs/platform/extensionManagement/common/extensionStorage.ts
index 0af530f2a55..1d50102ede9 100644
--- a/src/vs/platform/extensionManagement/common/extensionStorage.ts
+++ b/src/vs/platform/extensionManagement/common/extensionStorage.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { IProfileStorageValueChangeEvent, IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { adoptToGalleryExtensionId, areSameExtensions, getExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { distinct } from 'vs/base/common/arrays';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IExtension } from 'vs/platform/extensions/common/extensions';
-import { isString } from 'vs/base/common/types';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { IExtensionManagementService, IGalleryExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable, DisposableStore } from '../../../base/common/lifecycle.js';
+import { IProfileStorageValueChangeEvent, IStorageService, StorageScope, StorageTarget } from '../../storage/common/storage.js';
+import { adoptToGalleryExtensionId, areSameExtensions, getExtensionId } from './extensionManagementUtil.js';
+import { IProductService } from '../../product/common/productService.js';
+import { distinct } from '../../../base/common/arrays.js';
+import { ILogService } from '../../log/common/log.js';
+import { IExtension } from '../../extensions/common/extensions.js';
+import { isString } from '../../../base/common/types.js';
+import { IStringDictionary } from '../../../base/common/collections.js';
+import { IExtensionManagementService, IGalleryExtension } from './extensionManagement.js';
 
 export interface IExtensionIdWithVersion {
 	id: string;
diff --git a/src/vs/platform/extensionManagement/common/extensionTipsService.ts b/src/vs/platform/extensionManagement/common/extensionTipsService.ts
index 813064a24e5..f63a4b7b21f 100644
--- a/src/vs/platform/extensionManagement/common/extensionTipsService.ts
+++ b/src/vs/platform/extensionManagement/common/extensionTipsService.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isNonEmptyArray } from 'vs/base/common/arrays';
-import { Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { IConfigBasedExtensionTip as IRawConfigBasedExtensionTip } from 'vs/base/common/product';
-import { joinPath } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { IConfigBasedExtensionTip, IExecutableBasedExtensionTip, IExtensionManagementService, IExtensionTipsService, ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { disposableTimeout } from 'vs/base/common/async';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { Event } from 'vs/base/common/event';
-import { join } from 'vs/base/common/path';
-import { isWindows } from 'vs/base/common/platform';
-import { env } from 'vs/base/common/process';
-import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { IExtensionRecommendationNotificationService, RecommendationsNotificationResult, RecommendationSource } from 'vs/platform/extensionRecommendations/common/extensionRecommendations';
-import { ExtensionType } from 'vs/platform/extensions/common/extensions';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { isNonEmptyArray } from '../../../base/common/arrays.js';
+import { Disposable, MutableDisposable } from '../../../base/common/lifecycle.js';
+import { IConfigBasedExtensionTip as IRawConfigBasedExtensionTip } from '../../../base/common/product.js';
+import { joinPath } from '../../../base/common/resources.js';
+import { URI } from '../../../base/common/uri.js';
+import { IConfigBasedExtensionTip, IExecutableBasedExtensionTip, IExtensionManagementService, IExtensionTipsService, ILocalExtension } from './extensionManagement.js';
+import { IFileService } from '../../files/common/files.js';
+import { IProductService } from '../../product/common/productService.js';
+import { disposableTimeout } from '../../../base/common/async.js';
+import { IStringDictionary } from '../../../base/common/collections.js';
+import { Event } from '../../../base/common/event.js';
+import { join } from '../../../base/common/path.js';
+import { isWindows } from '../../../base/common/platform.js';
+import { env } from '../../../base/common/process.js';
+import { areSameExtensions } from './extensionManagementUtil.js';
+import { IExtensionRecommendationNotificationService, RecommendationsNotificationResult, RecommendationSource } from '../../extensionRecommendations/common/extensionRecommendations.js';
+import { ExtensionType } from '../../extensions/common/extensions.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../storage/common/storage.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
 
 //#region Base Extension Tips Service
 
diff --git a/src/vs/platform/extensionManagement/common/extensionsProfileScannerService.ts b/src/vs/platform/extensionManagement/common/extensionsProfileScannerService.ts
index d3d1816b40b..ced131827be 100644
--- a/src/vs/platform/extensionManagement/common/extensionsProfileScannerService.ts
+++ b/src/vs/platform/extensionManagement/common/extensionsProfileScannerService.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Queue } from 'vs/base/common/async';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Emitter, Event } from 'vs/base/common/event';
-import { ResourceMap } from 'vs/base/common/map';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { Metadata, isIExtensionIdentifier } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { IExtension, IExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { FileOperationResult, IFileService, toFileOperationResult } from 'vs/platform/files/common/files';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { Mutable, isObject, isString, isUndefined } from 'vs/base/common/types';
-import { getErrorMessage } from 'vs/base/common/errors';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { Queue } from '../../../base/common/async.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { ResourceMap } from '../../../base/common/map.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { Metadata, isIExtensionIdentifier } from './extensionManagement.js';
+import { areSameExtensions } from './extensionManagementUtil.js';
+import { IExtension, IExtensionIdentifier } from '../../extensions/common/extensions.js';
+import { FileOperationResult, IFileService, toFileOperationResult } from '../../files/common/files.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { ILogService } from '../../log/common/log.js';
+import { IUserDataProfilesService } from '../../userDataProfile/common/userDataProfile.js';
+import { IUriIdentityService } from '../../uriIdentity/common/uriIdentity.js';
+import { Mutable, isObject, isString, isUndefined } from '../../../base/common/types.js';
+import { getErrorMessage } from '../../../base/common/errors.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
 
 interface IStoredProfileExtension {
 	identifier: IExtensionIdentifier;
diff --git a/src/vs/platform/extensionManagement/common/extensionsScannerService.ts b/src/vs/platform/extensionManagement/common/extensionsScannerService.ts
index e78d87f3c8b..8f238a84029 100644
--- a/src/vs/platform/extensionManagement/common/extensionsScannerService.ts
+++ b/src/vs/platform/extensionManagement/common/extensionsScannerService.ts
@@ -3,39 +3,39 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { coalesce } from 'vs/base/common/arrays';
-import { ThrottledDelayer } from 'vs/base/common/async';
-import * as objects from 'vs/base/common/objects';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { getErrorMessage } from 'vs/base/common/errors';
-import { getNodeType, parse, ParseError } from 'vs/base/common/json';
-import { getParseErrorMessage } from 'vs/base/common/jsonErrorMessages';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { FileAccess, Schemas } from 'vs/base/common/network';
-import * as path from 'vs/base/common/path';
-import * as platform from 'vs/base/common/platform';
-import { basename, isEqual, joinPath } from 'vs/base/common/resources';
-import * as semver from 'vs/base/common/semver/semver';
-import Severity from 'vs/base/common/severity';
-import { isEmptyObject } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IProductVersion, Metadata } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { areSameExtensions, computeTargetPlatform, ExtensionKey, getExtensionId, getGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { ExtensionType, ExtensionIdentifier, IExtensionManifest, TargetPlatform, IExtensionIdentifier, IRelaxedExtensionManifest, UNDEFINED_PUBLISHER, IExtensionDescription, BUILTIN_MANIFEST_CACHE_FILE, USER_MANIFEST_CACHE_FILE, ExtensionIdentifierMap } from 'vs/platform/extensions/common/extensions';
-import { validateExtensionManifest } from 'vs/platform/extensions/common/extensionValidator';
-import { FileOperationResult, IFileService, toFileOperationResult } from 'vs/platform/files/common/files';
-import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { Emitter, Event } from 'vs/base/common/event';
-import { revive } from 'vs/base/common/marshalling';
-import { ExtensionsProfileScanningError, ExtensionsProfileScanningErrorCode, IExtensionsProfileScannerService, IProfileExtensionsScanOptions, IScannedProfileExtension } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService';
-import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { localizeManifest } from 'vs/platform/extensionManagement/common/extensionNls';
+import { coalesce } from '../../../base/common/arrays.js';
+import { ThrottledDelayer } from '../../../base/common/async.js';
+import * as objects from '../../../base/common/objects.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { IStringDictionary } from '../../../base/common/collections.js';
+import { getErrorMessage } from '../../../base/common/errors.js';
+import { getNodeType, parse, ParseError } from '../../../base/common/json.js';
+import { getParseErrorMessage } from '../../../base/common/jsonErrorMessages.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { FileAccess, Schemas } from '../../../base/common/network.js';
+import * as path from '../../../base/common/path.js';
+import * as platform from '../../../base/common/platform.js';
+import { basename, isEqual, joinPath } from '../../../base/common/resources.js';
+import * as semver from '../../../base/common/semver/semver.js';
+import Severity from '../../../base/common/severity.js';
+import { isEmptyObject } from '../../../base/common/types.js';
+import { URI } from '../../../base/common/uri.js';
+import { localize } from '../../../nls.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { IProductVersion, Metadata } from './extensionManagement.js';
+import { areSameExtensions, computeTargetPlatform, ExtensionKey, getExtensionId, getGalleryExtensionId } from './extensionManagementUtil.js';
+import { ExtensionType, ExtensionIdentifier, IExtensionManifest, TargetPlatform, IExtensionIdentifier, IRelaxedExtensionManifest, UNDEFINED_PUBLISHER, IExtensionDescription, BUILTIN_MANIFEST_CACHE_FILE, USER_MANIFEST_CACHE_FILE, ExtensionIdentifierMap, parseEnabledApiProposalNames } from '../../extensions/common/extensions.js';
+import { validateExtensionManifest } from '../../extensions/common/extensionValidator.js';
+import { FileOperationResult, IFileService, toFileOperationResult } from '../../files/common/files.js';
+import { createDecorator, IInstantiationService } from '../../instantiation/common/instantiation.js';
+import { ILogService } from '../../log/common/log.js';
+import { IProductService } from '../../product/common/productService.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { revive } from '../../../base/common/marshalling.js';
+import { ExtensionsProfileScanningError, ExtensionsProfileScanningErrorCode, IExtensionsProfileScannerService, IProfileExtensionsScanOptions, IScannedProfileExtension } from './extensionsProfileScannerService.js';
+import { IUserDataProfile, IUserDataProfilesService } from '../../userDataProfile/common/userDataProfile.js';
+import { IUriIdentityService } from '../../uriIdentity/common/uriIdentity.js';
+import { localizeManifest } from './extensionNls.js';
 
 export type IScannedExtensionManifest = IRelaxedExtensionManifest & { __metadata?: Metadata };
 
@@ -554,14 +554,19 @@ type NlsConfiguration = {
 
 class ExtensionsScanner extends Disposable {
 
+	private readonly extensionsEnabledWithApiProposalVersion: string[];
+
 	constructor(
 		private readonly obsoleteFile: URI,
 		@IExtensionsProfileScannerService protected readonly extensionsProfileScannerService: IExtensionsProfileScannerService,
 		@IUriIdentityService protected readonly uriIdentityService: IUriIdentityService,
 		@IFileService protected readonly fileService: IFileService,
+		@IProductService productService: IProductService,
+		@IEnvironmentService private readonly environmentService: IEnvironmentService,
 		@ILogService protected readonly logService: ILogService
 	) {
 		super();
+		this.extensionsEnabledWithApiProposalVersion = productService.extensionsEnabledWithApiProposalVersion?.map(id => id.toLowerCase()) ?? [];
 	}
 
 	async scanExtensions(input: ExtensionScannerInput): Promise<IRelaxedScannedExtension[]> {
@@ -653,7 +658,7 @@ class ExtensionsScanner extends Disposable {
 				const type = metadata?.isSystem ? ExtensionType.System : input.type;
 				const isBuiltin = type === ExtensionType.System || !!metadata?.isBuiltin;
 				manifest = await this.translateManifest(input.location, manifest, ExtensionScannerInput.createNlsConfiguration(input));
-				const extension: IRelaxedScannedExtension = {
+				let extension: IRelaxedScannedExtension = {
 					type,
 					identifier,
 					manifest,
@@ -665,7 +670,14 @@ class ExtensionsScanner extends Disposable {
 					isValid: true,
 					validations: []
 				};
-				return input.validate ? this.validate(extension, input) : extension;
+				if (input.validate) {
+					extension = this.validate(extension, input);
+				}
+				if (manifest.enabledApiProposals && (!this.environmentService.isBuilt || this.extensionsEnabledWithApiProposalVersion.includes(id.toLowerCase()))) {
+					manifest.originalEnabledApiProposals = manifest.enabledApiProposals;
+					manifest.enabledApiProposals = parseEnabledApiProposalNames([...manifest.enabledApiProposals]);
+				}
+				return extension;
 			}
 		} catch (e) {
 			if (input.type !== ExtensionType.System) {
@@ -677,7 +689,8 @@ class ExtensionsScanner extends Disposable {
 
 	validate(extension: IRelaxedScannedExtension, input: ExtensionScannerInput): IRelaxedScannedExtension {
 		let isValid = true;
-		const validations = validateExtensionManifest(input.productVersion, input.productDate, input.location, extension.manifest, extension.isBuiltin);
+		const validateApiVersion = this.environmentService.isBuilt && this.extensionsEnabledWithApiProposalVersion.includes(extension.identifier.id.toLowerCase());
+		const validations = validateExtensionManifest(input.productVersion, input.productDate, input.location, extension.manifest, extension.isBuiltin, validateApiVersion);
 		for (const [severity, message] of validations) {
 			if (severity === Severity.Error) {
 				isValid = false;
@@ -689,7 +702,7 @@ class ExtensionsScanner extends Disposable {
 		return extension;
 	}
 
-	async scanExtensionManifest(extensionLocation: URI): Promise<IScannedExtensionManifest | null> {
+	private async scanExtensionManifest(extensionLocation: URI): Promise<IScannedExtensionManifest | null> {
 		const manifestLocation = joinPath(extensionLocation, 'package.json');
 		let content;
 		try {
@@ -713,7 +726,7 @@ class ExtensionsScanner extends Disposable {
 			return null;
 		}
 		if (getNodeType(manifest) !== 'object') {
-			this.logService.error(this.formatMessage(extensionLocation, localize('jsonParseInvalidType', "Invalid manifest file {0}: Not an JSON object.", manifestLocation.path)));
+			this.logService.error(this.formatMessage(extensionLocation, localize('jsonParseInvalidType', "Invalid manifest file {0}: Not a JSON object.", manifestLocation.path)));
 			return null;
 		}
 		return manifest;
@@ -878,9 +891,11 @@ class CachedExtensionsScanner extends ExtensionsScanner {
 		@IExtensionsProfileScannerService extensionsProfileScannerService: IExtensionsProfileScannerService,
 		@IUriIdentityService uriIdentityService: IUriIdentityService,
 		@IFileService fileService: IFileService,
+		@IProductService productService: IProductService,
+		@IEnvironmentService environmentService: IEnvironmentService,
 		@ILogService logService: ILogService
 	) {
-		super(obsoleteFile, extensionsProfileScannerService, uriIdentityService, fileService, logService);
+		super(obsoleteFile, extensionsProfileScannerService, uriIdentityService, fileService, productService, environmentService, logService);
 	}
 
 	override async scanExtensions(input: ExtensionScannerInput): Promise<IRelaxedScannedExtension[]> {
diff --git a/src/vs/platform/extensionManagement/common/implicitActivationEvents.ts b/src/vs/platform/extensionManagement/common/implicitActivationEvents.ts
index ecd1c43fb1d..b8a52b5e9aa 100644
--- a/src/vs/platform/extensionManagement/common/implicitActivationEvents.ts
+++ b/src/vs/platform/extensionManagement/common/implicitActivationEvents.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
+import { onUnexpectedError } from '../../../base/common/errors.js';
+import { ExtensionIdentifier, IExtensionDescription } from '../../extensions/common/extensions.js';
 
 export interface IActivationEventsGenerator<T> {
 	(contributions: T[], result: { push(item: string): void }): void;
diff --git a/src/vs/platform/extensionManagement/common/unsupportedExtensionsMigration.ts b/src/vs/platform/extensionManagement/common/unsupportedExtensionsMigration.ts
index 57aadd8fc1d..1fea9a2abf8 100644
--- a/src/vs/platform/extensionManagement/common/unsupportedExtensionsMigration.ts
+++ b/src/vs/platform/extensionManagement/common/unsupportedExtensionsMigration.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IExtensionGalleryService, IExtensionManagementService, IGlobalExtensionEnablementService, InstallOperation } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { areSameExtensions, getExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { IExtensionStorageService } from 'vs/platform/extensionManagement/common/extensionStorage';
-import { ExtensionType } from 'vs/platform/extensions/common/extensions';
-import { ILogService } from 'vs/platform/log/common/log';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { IExtensionGalleryService, IExtensionManagementService, IGlobalExtensionEnablementService, InstallOperation } from './extensionManagement.js';
+import { areSameExtensions, getExtensionId } from './extensionManagementUtil.js';
+import { IExtensionStorageService } from './extensionStorage.js';
+import { ExtensionType } from '../../extensions/common/extensions.js';
+import { ILogService } from '../../log/common/log.js';
 
 /**
  * Migrates the installed unsupported nightly extension to a supported pre-release extension. It includes following:
diff --git a/src/vs/platform/extensionManagement/electron-sandbox/extensionsProfileScannerService.ts b/src/vs/platform/extensionManagement/electron-sandbox/extensionsProfileScannerService.ts
index 98f5a2194f9..2299ce88003 100644
--- a/src/vs/platform/extensionManagement/electron-sandbox/extensionsProfileScannerService.ts
+++ b/src/vs/platform/extensionManagement/electron-sandbox/extensionsProfileScannerService.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ILogService } from 'vs/platform/log/common/log';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { AbstractExtensionsProfileScannerService, IExtensionsProfileScannerService } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService';
-import { IFileService } from 'vs/platform/files/common/files';
-import { INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-import { URI } from 'vs/base/common/uri';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { ILogService } from '../../log/common/log.js';
+import { IUserDataProfilesService } from '../../userDataProfile/common/userDataProfile.js';
+import { IUriIdentityService } from '../../uriIdentity/common/uriIdentity.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
+import { AbstractExtensionsProfileScannerService, IExtensionsProfileScannerService } from '../common/extensionsProfileScannerService.js';
+import { IFileService } from '../../files/common/files.js';
+import { INativeEnvironmentService } from '../../environment/common/environment.js';
+import { URI } from '../../../base/common/uri.js';
+import { InstantiationType, registerSingleton } from '../../instantiation/common/extensions.js';
 
 export class ExtensionsProfileScannerService extends AbstractExtensionsProfileScannerService {
 	constructor(
diff --git a/src/vs/platform/extensionManagement/node/extensionDownloader.ts b/src/vs/platform/extensionManagement/node/extensionDownloader.ts
index 0ddae28ed93..850dba7113d 100644
--- a/src/vs/platform/extensionManagement/node/extensionDownloader.ts
+++ b/src/vs/platform/extensionManagement/node/extensionDownloader.ts
@@ -3,28 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Promises } from 'vs/base/common/async';
-import { getErrorMessage } from 'vs/base/common/errors';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { joinPath } from 'vs/base/common/resources';
-import * as semver from 'vs/base/common/semver/semver';
-import { isBoolean } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { Promises as FSPromises } from 'vs/base/node/pfs';
-import { buffer, CorruptZipMessage } from 'vs/base/node/zip';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-import { ExtensionVerificationStatus, toExtensionManagementError } from 'vs/platform/extensionManagement/common/abstractExtensionManagementService';
-import { ExtensionManagementError, ExtensionManagementErrorCode, IExtensionGalleryService, IGalleryExtension, InstallOperation } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { ExtensionKey, groupByExtension } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { fromExtractError } from 'vs/platform/extensionManagement/node/extensionManagementUtil';
-import { ExtensionSignatureVerificationError, ExtensionSignatureVerificationCode, IExtensionSignatureVerificationService } from 'vs/platform/extensionManagement/node/extensionSignatureVerificationService';
-import { TargetPlatform } from 'vs/platform/extensions/common/extensions';
-import { IFileService, IFileStatWithMetadata } from 'vs/platform/files/common/files';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { Promises } from '../../../base/common/async.js';
+import { getErrorMessage } from '../../../base/common/errors.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { Schemas } from '../../../base/common/network.js';
+import { joinPath } from '../../../base/common/resources.js';
+import * as semver from '../../../base/common/semver/semver.js';
+import { URI } from '../../../base/common/uri.js';
+import { generateUuid } from '../../../base/common/uuid.js';
+import { Promises as FSPromises } from '../../../base/node/pfs.js';
+import { buffer, CorruptZipMessage } from '../../../base/node/zip.js';
+import { INativeEnvironmentService } from '../../environment/common/environment.js';
+import { toExtensionManagementError } from '../common/abstractExtensionManagementService.js';
+import { ExtensionManagementError, ExtensionManagementErrorCode, ExtensionSignatureVerificationCode, IExtensionGalleryService, IGalleryExtension, InstallOperation } from '../common/extensionManagement.js';
+import { ExtensionKey, groupByExtension } from '../common/extensionManagementUtil.js';
+import { fromExtractError } from './extensionManagementUtil.js';
+import { IExtensionSignatureVerificationService } from './extensionSignatureVerificationService.js';
+import { TargetPlatform } from '../../extensions/common/extensions.js';
+import { IFileService, IFileStatWithMetadata } from '../../files/common/files.js';
+import { ILogService } from '../../log/common/log.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
 
 type RetryDownloadClassification = {
 	owner: 'sandy081';
@@ -49,7 +47,6 @@ export class ExtensionsDownloader extends Disposable {
 		@INativeEnvironmentService environmentService: INativeEnvironmentService,
 		@IFileService private readonly fileService: IFileService,
 		@IExtensionGalleryService private readonly extensionGalleryService: IExtensionGalleryService,
-		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IExtensionSignatureVerificationService private readonly extensionSignatureVerificationService: IExtensionSignatureVerificationService,
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@ILogService private readonly logService: ILogService,
@@ -60,42 +57,39 @@ export class ExtensionsDownloader extends Disposable {
 		this.cleanUpPromise = this.cleanUp();
 	}
 
-	async download(extension: IGalleryExtension, operation: InstallOperation, verifySignature: boolean, clientTargetPlatform?: TargetPlatform): Promise<{ readonly location: URI; readonly verificationStatus: ExtensionVerificationStatus }> {
+	async download(extension: IGalleryExtension, operation: InstallOperation, verifySignature: boolean, clientTargetPlatform?: TargetPlatform): Promise<{ readonly location: URI; readonly verificationStatus: ExtensionSignatureVerificationCode | undefined }> {
 		await this.cleanUpPromise;
 
 		const location = await this.downloadVSIX(extension, operation);
 
-		let verificationStatus: ExtensionVerificationStatus = false;
+		if (!verifySignature || !extension.isSigned) {
+			return { location, verificationStatus: undefined };
+		}
 
-		if (verifySignature && this.shouldVerifySignature(extension)) {
-
-			let signatureArchiveLocation;
-			try {
-				signatureArchiveLocation = await this.downloadSignatureArchive(extension);
-			} catch (error) {
+		let signatureArchiveLocation;
+		try {
+			signatureArchiveLocation = await this.downloadSignatureArchive(extension);
+			const verificationStatus = (await this.extensionSignatureVerificationService.verify(extension.identifier.id, extension.version, location.fsPath, signatureArchiveLocation.fsPath, clientTargetPlatform))?.code;
+			if (verificationStatus === ExtensionSignatureVerificationCode.PackageIsInvalidZip || verificationStatus === ExtensionSignatureVerificationCode.SignatureArchiveIsInvalidZip) {
 				try {
-					// Delete the downloaded VSIX if signature archive download fails
+					// Delete the downloaded vsix if VSIX or signature archive is invalid
 					await this.delete(location);
 				} catch (error) {
 					this.logService.error(error);
 				}
-				throw error;
+				throw new ExtensionManagementError(CorruptZipMessage, ExtensionManagementErrorCode.CorruptZip);
 			}
-
+			return { location, verificationStatus };
+		} catch (error) {
 			try {
-				verificationStatus = await this.extensionSignatureVerificationService.verify(extension, location.fsPath, signatureArchiveLocation.fsPath, clientTargetPlatform);
+				// Delete the downloaded VSIX if signature archive download fails
+				await this.delete(location);
 			} catch (error) {
-				verificationStatus = (error as ExtensionSignatureVerificationError).code;
-				if (verificationStatus === ExtensionSignatureVerificationCode.PackageIsInvalidZip || verificationStatus === ExtensionSignatureVerificationCode.SignatureArchiveIsInvalidZip) {
-					try {
-						// Delete the downloaded vsix if VSIX or signature archive is invalid
-						await this.delete(location);
-					} catch (error) {
-						this.logService.error(error);
-					}
-					throw new ExtensionManagementError(CorruptZipMessage, ExtensionManagementErrorCode.CorruptZip);
-				}
-			} finally {
+				this.logService.error(error);
+			}
+			throw error;
+		} finally {
+			if (signatureArchiveLocation) {
 				try {
 					// Delete signature archive always
 					await this.delete(signatureArchiveLocation);
@@ -104,18 +98,6 @@ export class ExtensionsDownloader extends Disposable {
 				}
 			}
 		}
-
-		return { location, verificationStatus };
-	}
-
-	private shouldVerifySignature(extension: IGalleryExtension): boolean {
-		if (!extension.isSigned) {
-			this.logService.info(`Extension is not signed: ${extension.identifier.id}`);
-			return false;
-		}
-
-		const value = this.configurationService.getValue('extensions.verifySignature');
-		return isBoolean(value) ? value : true;
 	}
 
 	private async downloadVSIX(extension: IGalleryExtension, operation: InstallOperation): Promise<URI> {
diff --git a/src/vs/platform/extensionManagement/node/extensionLifecycle.ts b/src/vs/platform/extensionManagement/node/extensionLifecycle.ts
index 8de8416e712..cdc0a4767ff 100644
--- a/src/vs/platform/extensionManagement/node/extensionLifecycle.ts
+++ b/src/vs/platform/extensionManagement/node/extensionLifecycle.ts
@@ -4,16 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ChildProcess, fork } from 'child_process';
-import { Limiter } from 'vs/base/common/async';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { join } from 'vs/base/common/path';
-import { Promises } from 'vs/base/node/pfs';
-import { ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { Limiter } from '../../../base/common/async.js';
+import { toErrorMessage } from '../../../base/common/errorMessage.js';
+import { Event } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { Schemas } from '../../../base/common/network.js';
+import { join } from '../../../base/common/path.js';
+import { Promises } from '../../../base/node/pfs.js';
+import { ILocalExtension } from '../common/extensionManagement.js';
+import { ILogService } from '../../log/common/log.js';
+import { IUserDataProfilesService } from '../../userDataProfile/common/userDataProfile.js';
 
 export class ExtensionsLifecycle extends Disposable {
 
diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
index b5a1d51f900..680e0dd15be 100644
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -3,52 +3,56 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Promises, Queue } from 'vs/base/common/async';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { CancellationError, getErrorMessage } from 'vs/base/common/errors';
-import { Emitter } from 'vs/base/common/event';
-import { hash } from 'vs/base/common/hash';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ResourceSet } from 'vs/base/common/map';
-import { Schemas } from 'vs/base/common/network';
-import * as path from 'vs/base/common/path';
-import { joinPath } from 'vs/base/common/resources';
-import * as semver from 'vs/base/common/semver/semver';
-import { isBoolean } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import * as pfs from 'vs/base/node/pfs';
-import { extract, IFile, zip } from 'vs/base/node/zip';
-import * as nls from 'vs/nls';
-import { IDownloadService } from 'vs/platform/download/common/download';
-import { INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-import { AbstractExtensionManagementService, AbstractExtensionTask, ExtensionVerificationStatus, IInstallExtensionTask, InstallExtensionTaskOptions, IUninstallExtensionTask, toExtensionManagementError, UninstallExtensionTaskOptions } from 'vs/platform/extensionManagement/common/abstractExtensionManagementService';
+import * as fs from 'fs';
+import { Promises, Queue } from '../../../base/common/async.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { IStringDictionary } from '../../../base/common/collections.js';
+import { toErrorMessage } from '../../../base/common/errorMessage.js';
+import { CancellationError, getErrorMessage } from '../../../base/common/errors.js';
+import { Emitter } from '../../../base/common/event.js';
+import { hash } from '../../../base/common/hash.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { ResourceMap, ResourceSet } from '../../../base/common/map.js';
+import { Schemas } from '../../../base/common/network.js';
+import * as path from '../../../base/common/path.js';
+import { joinPath } from '../../../base/common/resources.js';
+import * as semver from '../../../base/common/semver/semver.js';
+import { isBoolean } from '../../../base/common/types.js';
+import { URI } from '../../../base/common/uri.js';
+import { generateUuid } from '../../../base/common/uuid.js';
+import * as pfs from '../../../base/node/pfs.js';
+import { extract, IFile, zip } from '../../../base/node/zip.js';
+import * as nls from '../../../nls.js';
+import { IDownloadService } from '../../download/common/download.js';
+import { INativeEnvironmentService } from '../../environment/common/environment.js';
+import { AbstractExtensionManagementService, AbstractExtensionTask, IInstallExtensionTask, InstallExtensionTaskOptions, IUninstallExtensionTask, toExtensionManagementError, UninstallExtensionTaskOptions } from '../common/abstractExtensionManagementService.js';
 import {
 	ExtensionManagementError, ExtensionManagementErrorCode, IExtensionGalleryService, IExtensionIdentifier, IExtensionManagementService, IGalleryExtension, ILocalExtension, InstallOperation,
 	Metadata, InstallOptions,
 	IProductVersion,
 	EXTENSION_INSTALL_CLIENT_TARGET_PLATFORM_CONTEXT,
-} from 'vs/platform/extensionManagement/common/extensionManagement';
-import { areSameExtensions, computeTargetPlatform, ExtensionKey, getGalleryExtensionId, groupByExtension } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { IExtensionsProfileScannerService, IScannedProfileExtension } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService';
-import { IExtensionsScannerService, IScannedExtension, ScanOptions } from 'vs/platform/extensionManagement/common/extensionsScannerService';
-import { ExtensionsDownloader } from 'vs/platform/extensionManagement/node/extensionDownloader';
-import { ExtensionsLifecycle } from 'vs/platform/extensionManagement/node/extensionLifecycle';
-import { fromExtractError, getManifest } from 'vs/platform/extensionManagement/node/extensionManagementUtil';
-import { ExtensionsManifestCache } from 'vs/platform/extensionManagement/node/extensionsManifestCache';
-import { DidChangeProfileExtensionsEvent, ExtensionsWatcher } from 'vs/platform/extensionManagement/node/extensionsWatcher';
-import { ExtensionType, IExtension, IExtensionManifest, TargetPlatform } from 'vs/platform/extensions/common/extensions';
-import { isEngineValid } from 'vs/platform/extensions/common/extensionValidator';
-import { FileChangesEvent, FileChangeType, FileOperationResult, IFileService, toFileOperationResult } from 'vs/platform/files/common/files';
-import { IInstantiationService, refineServiceDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
+	ExtensionSignatureVerificationCode,
+} from '../common/extensionManagement.js';
+import { areSameExtensions, computeTargetPlatform, ExtensionKey, getGalleryExtensionId, groupByExtension } from '../common/extensionManagementUtil.js';
+import { IExtensionsProfileScannerService, IScannedProfileExtension } from '../common/extensionsProfileScannerService.js';
+import { IExtensionsScannerService, IScannedExtension, ScanOptions } from '../common/extensionsScannerService.js';
+import { ExtensionsDownloader } from './extensionDownloader.js';
+import { ExtensionsLifecycle } from './extensionLifecycle.js';
+import { fromExtractError, getManifest } from './extensionManagementUtil.js';
+import { ExtensionsManifestCache } from './extensionsManifestCache.js';
+import { DidChangeProfileExtensionsEvent, ExtensionsWatcher } from './extensionsWatcher.js';
+import { ExtensionType, IExtension, IExtensionManifest, TargetPlatform } from '../../extensions/common/extensions.js';
+import { isEngineValid } from '../../extensions/common/extensionValidator.js';
+import { FileChangesEvent, FileChangeType, FileOperationResult, IFileService, toFileOperationResult } from '../../files/common/files.js';
+import { IInstantiationService, refineServiceDecorator } from '../../instantiation/common/instantiation.js';
+import { ILogService } from '../../log/common/log.js';
+import { IProductService } from '../../product/common/productService.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
+import { IUriIdentityService } from '../../uriIdentity/common/uriIdentity.js';
+import { IUserDataProfilesService } from '../../userDataProfile/common/userDataProfile.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { isLinux } from '../../../base/common/platform.js';
 
 export const INativeServerExtensionManagementService = refineServiceDecorator<IExtensionManagementService, INativeServerExtensionManagementService>(IExtensionManagementService);
 export interface INativeServerExtensionManagementService extends IExtensionManagementService {
@@ -58,7 +62,7 @@ export interface INativeServerExtensionManagementService extends IExtensionManag
 	markAsUninstalled(...extensions: IExtension[]): Promise<void>;
 }
 
-type ExtractExtensionResult = { readonly local: ILocalExtension; readonly verificationStatus?: ExtensionVerificationStatus };
+type ExtractExtensionResult = { readonly local: ILocalExtension; readonly verificationStatus?: ExtensionSignatureVerificationCode };
 
 const DELETED_FOLDER_POSTFIX = '.vsctmp';
 
@@ -74,12 +78,13 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
 		@IExtensionGalleryService galleryService: IExtensionGalleryService,
 		@ITelemetryService telemetryService: ITelemetryService,
 		@ILogService logService: ILogService,
-		@INativeEnvironmentService environmentService: INativeEnvironmentService,
+		@INativeEnvironmentService private readonly environmentService: INativeEnvironmentService,
 		@IExtensionsScannerService private readonly extensionsScannerService: IExtensionsScannerService,
 		@IExtensionsProfileScannerService private readonly extensionsProfileScannerService: IExtensionsProfileScannerService,
 		@IDownloadService private downloadService: IDownloadService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IFileService private readonly fileService: IFileService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IProductService productService: IProductService,
 		@IUriIdentityService uriIdentityService: IUriIdentityService,
 		@IUserDataProfilesService userDataProfilesService: IUserDataProfilesService
@@ -110,12 +115,6 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
 		return URI.file(location);
 	}
 
-	async unzip(zipLocation: URI): Promise<IExtensionIdentifier> {
-		this.logService.trace('ExtensionManagementService#unzip', zipLocation.toString());
-		const local = await this.install(zipLocation);
-		return local.identifier;
-	}
-
 	async getManifest(vsix: URI): Promise<IExtensionManifest> {
 		const { location, cleanup } = await this.downloadVsix(vsix);
 		const zipPath = path.resolve(location.fsPath);
@@ -251,7 +250,7 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
 	}
 
 	async download(extension: IGalleryExtension, operation: InstallOperation, donotVerifySignature: boolean): Promise<URI> {
-		const { location } = await this.extensionsDownloader.download(extension, operation, !donotVerifySignature);
+		const { location } = await this.downloadExtension(extension, operation, !donotVerifySignature);
 		return location;
 	}
 
@@ -293,11 +292,11 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
 	}
 
 	protected createUninstallExtensionTask(extension: ILocalExtension, options: UninstallExtensionTaskOptions): IUninstallExtensionTask {
-		return new UninstallExtensionInProfileTask(extension, options.profileLocation, this.extensionsProfileScannerService);
+		return new UninstallExtensionInProfileTask(extension, options, this.extensionsProfileScannerService);
 	}
 
 	private async downloadAndExtractGalleryExtension(extensionKey: ExtensionKey, gallery: IGalleryExtension, operation: InstallOperation, options: InstallExtensionTaskOptions, token: CancellationToken): Promise<ExtractExtensionResult> {
-		const { verificationStatus, location } = await this.extensionsDownloader.download(gallery, operation, !options.donotVerifySignature, options.context?.[EXTENSION_INSTALL_CLIENT_TARGET_PLATFORM_CONTEXT]);
+		const { verificationStatus, location } = await this.downloadExtension(gallery, operation, !options.donotVerifySignature, options.context?.[EXTENSION_INSTALL_CLIENT_TARGET_PLATFORM_CONTEXT]);
 		try {
 
 			if (token.isCancellationRequested) {
@@ -305,7 +304,10 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
 			}
 
 			// validate manifest
-			await getManifest(location.fsPath);
+			const manifest = await getManifest(location.fsPath);
+			if (!new ExtensionKey(gallery.identifier, gallery.version).equals(new ExtensionKey({ id: getGalleryExtensionId(manifest.publisher, manifest.name) }, manifest.version))) {
+				throw new ExtensionManagementError(nls.localize('invalidManifest', "Cannot install '{0}' extension because of manifest mismatch with Marketplace", gallery.identifier.id), ExtensionManagementErrorCode.Invalid);
+			}
 
 			const local = await this.extensionsScanner.extractUserExtension(
 				extensionKey,
@@ -341,6 +343,42 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
 		}
 	}
 
+	private async downloadExtension(extension: IGalleryExtension, operation: InstallOperation, verifySignature: boolean, clientTargetPlatform?: TargetPlatform): Promise<{ readonly location: URI; readonly verificationStatus: ExtensionSignatureVerificationCode | undefined }> {
+		if (verifySignature) {
+			const value = this.configurationService.getValue('extensions.verifySignature');
+			verifySignature = isBoolean(value) ? value : true;
+		}
+		const { location, verificationStatus } = await this.extensionsDownloader.download(extension, operation, verifySignature, clientTargetPlatform);
+
+		if (verificationStatus !== ExtensionSignatureVerificationCode.Success && verifySignature && this.environmentService.isBuilt && !isLinux) {
+			if (!extension.isSigned) {
+				throw new ExtensionManagementError(nls.localize('not signed', "Extension is not signed."), ExtensionManagementErrorCode.PackageNotSigned);
+			}
+
+			if (!verificationStatus) {
+				throw new ExtensionManagementError(nls.localize('signature verification not executed', "Signature verification was not executed."), ExtensionManagementErrorCode.SignatureVerificationInternal);
+			}
+
+			switch (verificationStatus) {
+				case ExtensionSignatureVerificationCode.PackageIntegrityCheckFailed:
+				case ExtensionSignatureVerificationCode.SignatureIsInvalid:
+				case ExtensionSignatureVerificationCode.SignatureManifestIsInvalid:
+				case ExtensionSignatureVerificationCode.SignatureIntegrityCheckFailed:
+				case ExtensionSignatureVerificationCode.EntryIsMissing:
+				case ExtensionSignatureVerificationCode.EntryIsTampered:
+				case ExtensionSignatureVerificationCode.Untrusted:
+				case ExtensionSignatureVerificationCode.CertificateRevoked:
+				case ExtensionSignatureVerificationCode.SignatureIsNotValid:
+				case ExtensionSignatureVerificationCode.SignatureArchiveHasTooManyEntries:
+					throw new ExtensionManagementError(nls.localize('signature verification failed', "Signature verification failed with '{0}' error.", verificationStatus), ExtensionManagementErrorCode.SignatureVerificationFailed);
+			}
+
+			throw new ExtensionManagementError(nls.localize('signature verification failed', "Signature verification failed with '{0}' error.", verificationStatus), ExtensionManagementErrorCode.SignatureVerificationInternal);
+		}
+
+		return { location, verificationStatus };
+	}
+
 	private async extractVSIX(extensionKey: ExtensionKey, location: URI, options: InstallExtensionTaskOptions, token: CancellationToken): Promise<ExtractExtensionResult> {
 		const local = await this.extensionsScanner.extractUserExtension(
 			extensionKey,
@@ -353,7 +391,7 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
 				pinned: options.installGivenVersion ? true : !!options.pinned,
 				source: 'vsix',
 			},
-			true,
+			options.keepExisting ?? true,
 			token);
 		return { local };
 	}
@@ -363,7 +401,7 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
 		const collectFilesFromDirectory = async (dir: string): Promise<string[]> => {
 			let entries = await pfs.Promises.readdir(dir);
 			entries = entries.map(e => path.join(dir, e));
-			const stats = await Promise.all(entries.map(e => pfs.Promises.stat(e)));
+			const stats = await Promise.all(entries.map(e => fs.promises.stat(e)));
 			let promise: Promise<string[]> = Promise.resolve([]);
 			stats.forEach((stat, index) => {
 				const entry = entries[index];
@@ -380,7 +418,7 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
 		};
 
 		const files = await collectFilesFromDirectory(extension.location.fsPath);
-		return files.map(f => (<IFile>{ path: `extension/${path.relative(extension.location.fsPath, f)}`, localPath: f }));
+		return files.map(f => ({ path: `extension/${path.relative(extension.location.fsPath, f)}`, localPath: f }));
 	}
 
 	private async onDidChangeExtensionsFromAnotherSource({ added, removed }: DidChangeProfileExtensionsEvent): Promise<void> {
@@ -484,6 +522,19 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
 	}
 }
 
+type UpdateMetadataErrorClassification = {
+	owner: 'sandy081';
+	comment: 'Update metadata error';
+	extensionId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'extension identifier' };
+	code?: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'error code' };
+	isProfile?: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Is writing into profile' };
+};
+type UpdateMetadataErrorEvent = {
+	extensionId: string;
+	code?: string;
+	isProfile?: boolean;
+};
+
 export class ExtensionsScanner extends Disposable {
 
 	private readonly uninstalledResource: URI;
@@ -492,8 +543,8 @@ export class ExtensionsScanner extends Disposable {
 	private readonly _onExtract = this._register(new Emitter<URI>());
 	readonly onExtract = this._onExtract.event;
 
-	private scanAllExtensionPromise: Promise<IScannedExtension[]> | undefined;
-	private scanUserExtensionsPromise: Promise<IScannedExtension[]> | undefined;
+	private scanAllExtensionPromise = new ResourceMap<Promise<IScannedExtension[]>>();
+	private scanUserExtensionsPromise = new ResourceMap<Promise<IScannedExtension[]>>();
 
 	constructor(
 		private readonly beforeRemovingExtension: (e: ILocalExtension) => Promise<void>,
@@ -501,6 +552,7 @@ export class ExtensionsScanner extends Disposable {
 		@IExtensionsScannerService private readonly extensionsScannerService: IExtensionsScannerService,
 		@IExtensionsProfileScannerService private readonly extensionsProfileScannerService: IExtensionsProfileScannerService,
 		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
+		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@ILogService private readonly logService: ILogService,
 	) {
 		super();
@@ -518,15 +570,21 @@ export class ExtensionsScanner extends Disposable {
 			const userScanOptions: ScanOptions = { includeInvalid: true, profileLocation, productVersion };
 			let scannedExtensions: IScannedExtension[] = [];
 			if (type === null || type === ExtensionType.System) {
-				if (!this.scanAllExtensionPromise) {
-					this.scanAllExtensionPromise = this.extensionsScannerService.scanAllExtensions({ includeInvalid: true, useCache: true }, userScanOptions, false).finally(() => this.scanAllExtensionPromise = undefined);
+				let scanAllExtensionsPromise = this.scanAllExtensionPromise.get(profileLocation);
+				if (!scanAllExtensionsPromise) {
+					scanAllExtensionsPromise = this.extensionsScannerService.scanAllExtensions({ includeInvalid: true, useCache: true }, userScanOptions, false)
+						.finally(() => this.scanAllExtensionPromise.delete(profileLocation));
+					this.scanAllExtensionPromise.set(profileLocation, scanAllExtensionsPromise);
 				}
-				scannedExtensions.push(...await this.scanAllExtensionPromise);
+				scannedExtensions.push(...await scanAllExtensionsPromise);
 			} else if (type === ExtensionType.User) {
-				if (!this.scanUserExtensionsPromise) {
-					this.scanUserExtensionsPromise = this.extensionsScannerService.scanUserExtensions(userScanOptions).finally(() => this.scanUserExtensionsPromise = undefined);
+				let scanUserExtensionsPromise = this.scanUserExtensionsPromise.get(profileLocation);
+				if (!scanUserExtensionsPromise) {
+					scanUserExtensionsPromise = this.extensionsScannerService.scanUserExtensions(userScanOptions)
+						.finally(() => this.scanUserExtensionsPromise.delete(profileLocation));
+					this.scanUserExtensionsPromise.set(profileLocation, scanUserExtensionsPromise);
 				}
-				scannedExtensions.push(...await this.scanUserExtensionsPromise);
+				scannedExtensions.push(...await scanUserExtensionsPromise);
 			}
 			scannedExtensions = type !== null ? scannedExtensions.filter(r => r.type === type) : scannedExtensions;
 			return await Promise.all(scannedExtensions.map(extension => this.toLocalExtension(extension)));
@@ -561,69 +619,67 @@ export class ExtensionsScanner extends Disposable {
 		const tempLocation = URI.file(path.join(this.extensionsScannerService.userExtensionsLocation.fsPath, `.${generateUuid()}`));
 		const extensionLocation = URI.file(path.join(this.extensionsScannerService.userExtensionsLocation.fsPath, folderName));
 
-		let exists = await this.fileService.exists(extensionLocation);
+		if (await this.fileService.exists(extensionLocation)) {
+			if (!removeIfExists) {
+				try {
+					return await this.scanLocalExtension(extensionLocation, ExtensionType.User);
+				} catch (error) {
+					this.logService.warn(`Error while scanning the existing extension at ${extensionLocation.path}. Deleting the existing extension and extracting it.`, getErrorMessage(error));
+				}
+			}
 
-		if (exists && removeIfExists) {
 			try {
 				await this.deleteExtensionFromLocation(extensionKey.id, extensionLocation, 'removeExisting');
 			} catch (error) {
 				throw new ExtensionManagementError(nls.localize('errorDeleting', "Unable to delete the existing folder '{0}' while installing the extension '{1}'. Please delete the folder manually and try again", extensionLocation.fsPath, extensionKey.id), ExtensionManagementErrorCode.Delete);
 			}
-			exists = false;
 		}
 
-		if (exists) {
+		try {
+			if (token.isCancellationRequested) {
+				throw new CancellationError();
+			}
+
+			// Extract
 			try {
-				await this.extensionsScannerService.updateMetadata(extensionLocation, metadata);
+				this.logService.trace(`Started extracting the extension from ${zipPath} to ${extensionLocation.fsPath}`);
+				await extract(zipPath, tempLocation.fsPath, { sourcePath: 'extension', overwrite: true }, token);
+				this.logService.info(`Extracted extension to ${extensionLocation}:`, extensionKey.id);
+			} catch (e) {
+				throw fromExtractError(e);
+			}
+
+			try {
+				await this.extensionsScannerService.updateMetadata(tempLocation, metadata);
 			} catch (error) {
+				this.telemetryService.publicLog2<UpdateMetadataErrorEvent, UpdateMetadataErrorClassification>('extension:extract', { extensionId: extensionKey.id, code: `${toFileOperationResult(error)}` });
 				throw toExtensionManagementError(error, ExtensionManagementErrorCode.UpdateMetadata);
 			}
-		} else {
-			try {
-				if (token.isCancellationRequested) {
-					throw new CancellationError();
-				}
 
-				// Extract
-				try {
-					this.logService.trace(`Started extracting the extension from ${zipPath} to ${extensionLocation.fsPath}`);
-					await extract(zipPath, tempLocation.fsPath, { sourcePath: 'extension', overwrite: true }, token);
-					this.logService.info(`Extracted extension to ${extensionLocation}:`, extensionKey.id);
-				} catch (e) {
-					throw fromExtractError(e);
-				}
-
-				try {
-					await this.extensionsScannerService.updateMetadata(tempLocation, metadata);
-				} catch (error) {
-					throw toExtensionManagementError(error, ExtensionManagementErrorCode.UpdateMetadata);
-				}
-
-				if (token.isCancellationRequested) {
-					throw new CancellationError();
-				}
-
-				// Rename
-				try {
-					this.logService.trace(`Started renaming the extension from ${tempLocation.fsPath} to ${extensionLocation.fsPath}`);
-					await this.rename(tempLocation.fsPath, extensionLocation.fsPath);
-					this.logService.info('Renamed to', extensionLocation.fsPath);
-				} catch (error) {
-					if (error.code === 'ENOTEMPTY') {
-						this.logService.info(`Rename failed because extension was installed by another source. So ignoring renaming.`, extensionKey.id);
-						try { await this.fileService.del(tempLocation, { recursive: true }); } catch (e) { /* ignore */ }
-					} else {
-						this.logService.info(`Rename failed because of ${getErrorMessage(error)}. Deleted from extracted location`, tempLocation);
-						throw error;
-					}
-				}
-
-				this._onExtract.fire(extensionLocation);
-
-			} catch (error) {
-				try { await this.fileService.del(tempLocation, { recursive: true }); } catch (e) { /* ignore */ }
-				throw error;
+			if (token.isCancellationRequested) {
+				throw new CancellationError();
 			}
+
+			// Rename
+			try {
+				this.logService.trace(`Started renaming the extension from ${tempLocation.fsPath} to ${extensionLocation.fsPath}`);
+				await this.rename(tempLocation.fsPath, extensionLocation.fsPath);
+				this.logService.info('Renamed to', extensionLocation.fsPath);
+			} catch (error) {
+				if (error.code === 'ENOTEMPTY') {
+					this.logService.info(`Rename failed because extension was installed by another source. So ignoring renaming.`, extensionKey.id);
+					try { await this.fileService.del(tempLocation, { recursive: true }); } catch (e) { /* ignore */ }
+				} else {
+					this.logService.info(`Rename failed because of ${getErrorMessage(error)}. Deleted from extracted location`, tempLocation);
+					throw error;
+				}
+			}
+
+			this._onExtract.fire(extensionLocation);
+
+		} catch (error) {
+			try { await this.fileService.del(tempLocation, { recursive: true }); } catch (e) { /* ignore */ }
+			throw error;
 		}
 
 		return this.scanLocalExtension(extensionLocation, ExtensionType.User);
@@ -651,6 +707,7 @@ export class ExtensionsScanner extends Disposable {
 				await this.extensionsScannerService.updateMetadata(local.location, metadata);
 			}
 		} catch (error) {
+			this.telemetryService.publicLog2<UpdateMetadataErrorEvent, UpdateMetadataErrorClassification>('extension:extract', { extensionId: local.identifier.id, code: `${toFileOperationResult(error)}`, isProfile: !!profileLocation });
 			throw toExtensionManagementError(error, ExtensionManagementErrorCode.UpdateMetadata);
 		}
 		return this.scanLocalExtension(local.location, local.type, profileLocation);
@@ -898,7 +955,7 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask<ILocalExtensio
 	private _operation = InstallOperation.Install;
 	get operation() { return this.options.operation ?? this._operation; }
 
-	private _verificationStatus: ExtensionVerificationStatus | undefined;
+	private _verificationStatus: ExtensionSignatureVerificationCode | undefined;
 	get verificationStatus() { return this._verificationStatus; }
 
 	readonly identifier: IExtensionIdentifier;
@@ -950,16 +1007,15 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask<ILocalExtensio
 						throw new Error(nls.localize('restartCode', "Please restart VS Code before reinstalling {0}.", this.manifest.displayName || this.manifest.name));
 					}
 				}
-			} else {
-				// Remove the extension with same version if it is already uninstalled.
-				// Installing a VSIX extension shall replace the existing extension always.
-				const existingWithSameVersion = await this.unsetIfUninstalled(this.extensionKey);
-				if (existingWithSameVersion) {
-					try {
-						await this.extensionsScanner.removeExtension(existingWithSameVersion, 'existing');
-					} catch (e) {
-						throw new Error(nls.localize('restartCode', "Please restart VS Code before reinstalling {0}.", this.manifest.displayName || this.manifest.name));
-					}
+			}
+			// Remove the extension with same version if it is already uninstalled.
+			// Installing a VSIX extension shall replace the existing extension always.
+			const existingWithSameVersion = await this.unsetIfUninstalled(this.extensionKey);
+			if (existingWithSameVersion) {
+				try {
+					await this.extensionsScanner.removeExtension(existingWithSameVersion, 'existing');
+				} catch (e) {
+					throw new Error(nls.localize('restartCode', "Please restart VS Code before reinstalling {0}.", this.manifest.displayName || this.manifest.name));
 				}
 			}
 
@@ -1068,14 +1124,14 @@ class UninstallExtensionInProfileTask extends AbstractExtensionTask<void> implem
 
 	constructor(
 		readonly extension: ILocalExtension,
-		private readonly profileLocation: URI,
+		readonly options: UninstallExtensionTaskOptions,
 		private readonly extensionsProfileScannerService: IExtensionsProfileScannerService,
 	) {
 		super();
 	}
 
 	protected async doRun(token: CancellationToken): Promise<void> {
-		await this.extensionsProfileScannerService.removeExtensionFromProfile(this.extension, this.profileLocation);
+		await this.extensionsProfileScannerService.removeExtensionFromProfile(this.extension, this.options.profileLocation);
 	}
 
 }
diff --git a/src/vs/platform/extensionManagement/node/extensionManagementUtil.ts b/src/vs/platform/extensionManagement/node/extensionManagementUtil.ts
index 96118542408..08c62100d8b 100644
--- a/src/vs/platform/extensionManagement/node/extensionManagementUtil.ts
+++ b/src/vs/platform/extensionManagement/node/extensionManagementUtil.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { buffer, ExtractError } from 'vs/base/node/zip';
-import { localize } from 'vs/nls';
-import { toExtensionManagementError } from 'vs/platform/extensionManagement/common/abstractExtensionManagementService';
-import { ExtensionManagementError, ExtensionManagementErrorCode } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IExtensionManifest } from 'vs/platform/extensions/common/extensions';
+import { buffer, ExtractError } from '../../../base/node/zip.js';
+import { localize } from '../../../nls.js';
+import { toExtensionManagementError } from '../common/abstractExtensionManagementService.js';
+import { ExtensionManagementError, ExtensionManagementErrorCode } from '../common/extensionManagement.js';
+import { IExtensionManifest } from '../../extensions/common/extensions.js';
 
 export function fromExtractError(e: Error): ExtensionManagementError {
 	let errorCode = ExtensionManagementErrorCode.Extract;
diff --git a/src/vs/platform/extensionManagement/node/extensionSignatureVerificationService.ts b/src/vs/platform/extensionManagement/node/extensionSignatureVerificationService.ts
index cedabb0c126..9af60c96ddc 100644
--- a/src/vs/platform/extensionManagement/node/extensionSignatureVerificationService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionSignatureVerificationService.ts
@@ -3,15 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getErrorMessage } from 'vs/base/common/errors';
-import { IGalleryExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { TargetPlatform } from 'vs/platform/extensions/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService, LogLevel } from 'vs/platform/log/common/log';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { getErrorMessage } from '../../../base/common/errors.js';
+import { TargetPlatform } from '../../extensions/common/extensions.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { ILogService, LogLevel } from '../../log/common/log.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
+import { ExtensionSignatureVerificationCode } from '../common/extensionManagement.js';
 
 export const IExtensionSignatureVerificationService = createDecorator<IExtensionSignatureVerificationService>('IExtensionSignatureVerificationService');
 
+export interface IExtensionSignatureVerificationResult {
+	readonly code: ExtensionSignatureVerificationCode;
+}
+
 /**
  * A service for verifying signed extensions.
  */
@@ -21,50 +25,18 @@ export interface IExtensionSignatureVerificationService {
 	/**
 	 * Verifies an extension file (.vsix) against a signature archive file.
 	 * @param { string } extensionId The extension identifier.
+	 * @param { string } version The extension version.
 	 * @param { string } vsixFilePath The extension file path.
 	 * @param { string } signatureArchiveFilePath The signature archive file path.
-	 * @returns { Promise<boolean> } A promise with `true` if the extension is validly signed and trusted;
-	 * otherwise, `false` because verification is not enabled (e.g.:  in the OSS version of VS Code).
-	 * @throws { ExtensionSignatureVerificationError } An error with a code indicating the validity, integrity, or trust issue
-	 * found during verification or a more fundamental issue (e.g.:  a required dependency was not found).
+	 * @returns { Promise<IExtensionSignatureVerificationResult | undefined> } returns the verification result or undefined if the verification was not executed.
 	 */
-	verify(extension: IGalleryExtension, vsixFilePath: string, signatureArchiveFilePath: string, clientTargetPlatform?: TargetPlatform): Promise<boolean>;
+	verify(extensionId: string, version: string, vsixFilePath: string, signatureArchiveFilePath: string, clientTargetPlatform?: TargetPlatform): Promise<IExtensionSignatureVerificationResult | undefined>;
 }
 
 declare module vsceSign {
 	export function verify(vsixFilePath: string, signatureArchiveFilePath: string, verbose: boolean): Promise<ExtensionSignatureVerificationResult>;
 }
 
-export enum ExtensionSignatureVerificationCode {
-	'Success' = 'Success',
-	'RequiredArgumentMissing' = 'RequiredArgumentMissing',
-	'InvalidArgument' = 'InvalidArgument',
-	'PackageIsUnreadable' = 'PackageIsUnreadable',
-	'UnhandledException' = 'UnhandledException',
-	'SignatureManifestIsMissing' = 'SignatureManifestIsMissing',
-	'SignatureManifestIsUnreadable' = 'SignatureManifestIsUnreadable',
-	'SignatureIsMissing' = 'SignatureIsMissing',
-	'SignatureIsUnreadable' = 'SignatureIsUnreadable',
-	'CertificateIsUnreadable' = 'CertificateIsUnreadable',
-	'SignatureArchiveIsUnreadable' = 'SignatureArchiveIsUnreadable',
-	'FileAlreadyExists' = 'FileAlreadyExists',
-	'SignatureArchiveIsInvalidZip' = 'SignatureArchiveIsInvalidZip',
-	'SignatureArchiveHasSameSignatureFile' = 'SignatureArchiveHasSameSignatureFile',
-
-	'PackageIntegrityCheckFailed' = 'PackageIntegrityCheckFailed',
-	'SignatureIsInvalid' = 'SignatureIsInvalid',
-	'SignatureManifestIsInvalid' = 'SignatureManifestIsInvalid',
-	'SignatureIntegrityCheckFailed' = 'SignatureIntegrityCheckFailed',
-	'EntryIsMissing' = 'EntryIsMissing',
-	'EntryIsTampered' = 'EntryIsTampered',
-	'Untrusted' = 'Untrusted',
-	'CertificateRevoked' = 'CertificateRevoked',
-	'SignatureIsNotValid' = 'SignatureIsNotValid',
-	'UnknownError' = 'UnknownError',
-	'PackageIsInvalidZip' = 'PackageIsInvalidZip',
-	'SignatureArchiveHasTooManyEntries' = 'SignatureArchiveHasTooManyEntries',
-}
-
 /**
  * Extension signature verification result
  */
@@ -75,14 +47,6 @@ export interface ExtensionSignatureVerificationResult {
 	readonly output?: string;
 }
 
-export class ExtensionSignatureVerificationError extends Error {
-	constructor(
-		public readonly code: ExtensionSignatureVerificationCode,
-	) {
-		super(code);
-	}
-}
-
 export class ExtensionSignatureVerificationService implements IExtensionSignatureVerificationService {
 	declare readonly _serviceBrand: undefined;
 
@@ -95,29 +59,26 @@ export class ExtensionSignatureVerificationService implements IExtensionSignatur
 
 	private vsceSign(): Promise<typeof vsceSign> {
 		if (!this.moduleLoadingPromise) {
-			this.moduleLoadingPromise = new Promise(
-				(resolve, reject) => require(
-					['@vscode/vsce-sign'],
-					async (obj) => {
-						const instance = <typeof vsceSign>obj;
-
-						return resolve(instance);
-					}, reject));
+			this.moduleLoadingPromise = this.resolveVsceSign();
 		}
 
 		return this.moduleLoadingPromise;
 	}
 
-	public async verify(extension: IGalleryExtension, vsixFilePath: string, signatureArchiveFilePath: string, clientTargetPlatform?: TargetPlatform): Promise<boolean> {
+	private async resolveVsceSign(): Promise<typeof vsceSign> {
+		const mod = '@vscode/vsce-sign';
+		return import(mod);
+	}
+
+	public async verify(extensionId: string, version: string, vsixFilePath: string, signatureArchiveFilePath: string, clientTargetPlatform?: TargetPlatform): Promise<IExtensionSignatureVerificationResult | undefined> {
 		let module: typeof vsceSign;
-		const extensionId = extension.identifier.id;
 
 		try {
 			module = await this.vsceSign();
 		} catch (error) {
 			this.logService.error('Could not load vsce-sign module', getErrorMessage(error));
 			this.logService.info(`Extension signature verification is not done: ${extensionId}`);
-			return false;
+			return undefined;
 		}
 
 		const startTime = new Date().getTime();
@@ -161,7 +122,7 @@ export class ExtensionSignatureVerificationService implements IExtensionSignatur
 		};
 		this.telemetryService.publicLog2<ExtensionSignatureVerificationEvent, ExtensionSignatureVerificationClassification>('extensionsignature:verification', {
 			extensionId,
-			extensionVersion: extension.version,
+			extensionVersion: version,
 			code: result.code,
 			internalCode: result.internalCode,
 			duration,
@@ -169,10 +130,6 @@ export class ExtensionSignatureVerificationService implements IExtensionSignatur
 			clientTargetPlatform,
 		});
 
-		if (result.code === ExtensionSignatureVerificationCode.Success) {
-			return true;
-		}
-
-		throw new ExtensionSignatureVerificationError(result.code);
+		return { code: result.code };
 	}
 }
diff --git a/src/vs/platform/extensionManagement/node/extensionTipsService.ts b/src/vs/platform/extensionManagement/node/extensionTipsService.ts
index fbdf3153403..40d86085ab6 100644
--- a/src/vs/platform/extensionManagement/node/extensionTipsService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionTipsService.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IExtensionRecommendationNotificationService } from 'vs/platform/extensionRecommendations/common/extensionRecommendations';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { AbstractNativeExtensionTipsService } from 'vs/platform/extensionManagement/common/extensionTipsService';
+import { IExtensionManagementService } from '../common/extensionManagement.js';
+import { IFileService } from '../../files/common/files.js';
+import { IProductService } from '../../product/common/productService.js';
+import { INativeEnvironmentService } from '../../environment/common/environment.js';
+import { IExtensionRecommendationNotificationService } from '../../extensionRecommendations/common/extensionRecommendations.js';
+import { INativeHostService } from '../../native/common/native.js';
+import { IStorageService } from '../../storage/common/storage.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
+import { AbstractNativeExtensionTipsService } from '../common/extensionTipsService.js';
 
 export class ExtensionTipsService extends AbstractNativeExtensionTipsService {
 
diff --git a/src/vs/platform/extensionManagement/node/extensionsManifestCache.ts b/src/vs/platform/extensionManagement/node/extensionsManifestCache.ts
index cc5d48ee4e1..2825bbe0fa1 100644
--- a/src/vs/platform/extensionManagement/node/extensionsManifestCache.ts
+++ b/src/vs/platform/extensionManagement/node/extensionsManifestCache.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { DidUninstallExtensionEvent, IExtensionManagementService, InstallExtensionResult } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { USER_MANIFEST_CACHE_FILE } from 'vs/platform/extensions/common/extensions';
-import { FileOperationResult, IFileService, toFileOperationResult } from 'vs/platform/files/common/files';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { URI } from '../../../base/common/uri.js';
+import { DidUninstallExtensionEvent, IExtensionManagementService, InstallExtensionResult } from '../common/extensionManagement.js';
+import { USER_MANIFEST_CACHE_FILE } from '../../extensions/common/extensions.js';
+import { FileOperationResult, IFileService, toFileOperationResult } from '../../files/common/files.js';
+import { ILogService } from '../../log/common/log.js';
+import { IUriIdentityService } from '../../uriIdentity/common/uriIdentity.js';
+import { IUserDataProfile, IUserDataProfilesService } from '../../userDataProfile/common/userDataProfile.js';
 
 export class ExtensionsManifestCache extends Disposable {
 
diff --git a/src/vs/platform/extensionManagement/node/extensionsProfileScannerService.ts b/src/vs/platform/extensionManagement/node/extensionsProfileScannerService.ts
index 7864019ad83..3f1e919161f 100644
--- a/src/vs/platform/extensionManagement/node/extensionsProfileScannerService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionsProfileScannerService.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ILogService } from 'vs/platform/log/common/log';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { AbstractExtensionsProfileScannerService } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService';
-import { IFileService } from 'vs/platform/files/common/files';
-import { INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-import { URI } from 'vs/base/common/uri';
+import { ILogService } from '../../log/common/log.js';
+import { IUserDataProfilesService } from '../../userDataProfile/common/userDataProfile.js';
+import { IUriIdentityService } from '../../uriIdentity/common/uriIdentity.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
+import { AbstractExtensionsProfileScannerService } from '../common/extensionsProfileScannerService.js';
+import { IFileService } from '../../files/common/files.js';
+import { INativeEnvironmentService } from '../../environment/common/environment.js';
+import { URI } from '../../../base/common/uri.js';
 
 export class ExtensionsProfileScannerService extends AbstractExtensionsProfileScannerService {
 	constructor(
diff --git a/src/vs/platform/extensionManagement/node/extensionsScannerService.ts b/src/vs/platform/extensionManagement/node/extensionsScannerService.ts
index 4f95fb924f2..349dcef361e 100644
--- a/src/vs/platform/extensionManagement/node/extensionsScannerService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionsScannerService.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IExtensionsProfileScannerService } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService';
-import { IExtensionsScannerService, NativeExtensionsScannerService, } from 'vs/platform/extensionManagement/common/extensionsScannerService';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { URI } from '../../../base/common/uri.js';
+import { INativeEnvironmentService } from '../../environment/common/environment.js';
+import { IExtensionsProfileScannerService } from '../common/extensionsProfileScannerService.js';
+import { IExtensionsScannerService, NativeExtensionsScannerService, } from '../common/extensionsScannerService.js';
+import { IFileService } from '../../files/common/files.js';
+import { IInstantiationService } from '../../instantiation/common/instantiation.js';
+import { ILogService } from '../../log/common/log.js';
+import { IProductService } from '../../product/common/productService.js';
+import { IUriIdentityService } from '../../uriIdentity/common/uriIdentity.js';
+import { IUserDataProfilesService } from '../../userDataProfile/common/userDataProfile.js';
 
 export class ExtensionsScannerService extends NativeExtensionsScannerService implements IExtensionsScannerService {
 
diff --git a/src/vs/platform/extensionManagement/node/extensionsWatcher.ts b/src/vs/platform/extensionManagement/node/extensionsWatcher.ts
index ba8e026b893..d2b65eaea55 100644
--- a/src/vs/platform/extensionManagement/node/extensionsWatcher.ts
+++ b/src/vs/platform/extensionManagement/node/extensionsWatcher.ts
@@ -3,19 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { combinedDisposable, Disposable, DisposableMap } from 'vs/base/common/lifecycle';
-import { ResourceSet } from 'vs/base/common/map';
-import { URI } from 'vs/base/common/uri';
-import { getIdAndVersion } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { DidAddProfileExtensionsEvent, DidRemoveProfileExtensionsEvent, IExtensionsProfileScannerService, ProfileExtensionsEvent } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService';
-import { IExtensionsScannerService } from 'vs/platform/extensionManagement/common/extensionsScannerService';
-import { INativeServerExtensionManagementService } from 'vs/platform/extensionManagement/node/extensionManagementService';
-import { ExtensionIdentifier, IExtension, IExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { FileChangesEvent, FileChangeType, IFileService } from 'vs/platform/files/common/files';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { getErrorMessage } from '../../../base/common/errors.js';
+import { Emitter } from '../../../base/common/event.js';
+import { combinedDisposable, Disposable, DisposableMap } from '../../../base/common/lifecycle.js';
+import { ResourceSet } from '../../../base/common/map.js';
+import { URI } from '../../../base/common/uri.js';
+import { getIdAndVersion } from '../common/extensionManagementUtil.js';
+import { DidAddProfileExtensionsEvent, DidRemoveProfileExtensionsEvent, IExtensionsProfileScannerService, ProfileExtensionsEvent } from '../common/extensionsProfileScannerService.js';
+import { IExtensionsScannerService } from '../common/extensionsScannerService.js';
+import { INativeServerExtensionManagementService } from './extensionManagementService.js';
+import { ExtensionIdentifier, IExtension, IExtensionIdentifier } from '../../extensions/common/extensions.js';
+import { FileChangesEvent, FileChangeType, IFileService } from '../../files/common/files.js';
+import { ILogService } from '../../log/common/log.js';
+import { IUriIdentityService } from '../../uriIdentity/common/uriIdentity.js';
+import { IUserDataProfile, IUserDataProfilesService } from '../../userDataProfile/common/userDataProfile.js';
 
 export interface DidChangeProfileExtensionsEvent {
 	readonly added?: { readonly extensions: readonly IExtensionIdentifier[]; readonly profileLocation: URI };
@@ -40,7 +41,7 @@ export class ExtensionsWatcher extends Disposable {
 		private readonly logService: ILogService,
 	) {
 		super();
-		this.initialize().then(null, error => logService.error(error));
+		this.initialize().then(null, error => logService.error('Error while initializing Extensions Watcher', getErrorMessage(error)));
 	}
 
 	private async initialize(): Promise<void> {
diff --git a/src/vs/platform/extensionManagement/test/common/configRemotes.test.ts b/src/vs/platform/extensionManagement/test/common/configRemotes.test.ts
index 178293d8874..57348d9b965 100644
--- a/src/vs/platform/extensionManagement/test/common/configRemotes.test.ts
+++ b/src/vs/platform/extensionManagement/test/common/configRemotes.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { getDomainsOfRemotes, getRemotes } from 'vs/platform/extensionManagement/common/configRemotes';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { getDomainsOfRemotes, getRemotes } from '../../common/configRemotes.js';
 
 suite('Config Remotes', () => {
 
diff --git a/src/vs/platform/extensionManagement/test/common/extensionGalleryService.test.ts b/src/vs/platform/extensionManagement/test/common/extensionGalleryService.test.ts
index a4c9afd9c58..3fa0d8a0f4d 100644
--- a/src/vs/platform/extensionManagement/test/common/extensionGalleryService.test.ts
+++ b/src/vs/platform/extensionManagement/test/common/extensionGalleryService.test.ts
@@ -4,26 +4,26 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { joinPath } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { isUUID } from 'vs/base/common/uuid';
-import { mock } from 'vs/base/test/common/mock';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IRawGalleryExtensionVersion, sortExtensionVersions } from 'vs/platform/extensionManagement/common/extensionGalleryService';
-import { IFileService } from 'vs/platform/files/common/files';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
-import { NullLogService } from 'vs/platform/log/common/log';
-import product from 'vs/platform/product/common/product';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { resolveMarketplaceHeaders } from 'vs/platform/externalServices/common/marketplace';
-import { InMemoryStorageService, IStorageService } from 'vs/platform/storage/common/storage';
-import { TelemetryConfiguration, TELEMETRY_SETTING_ID } from 'vs/platform/telemetry/common/telemetry';
-import { TargetPlatform } from 'vs/platform/extensions/common/extensions';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { joinPath } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { isUUID } from '../../../../base/common/uuid.js';
+import { mock } from '../../../../base/test/common/mock.js';
+import { IConfigurationService } from '../../../configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../configuration/test/common/testConfigurationService.js';
+import { IEnvironmentService } from '../../../environment/common/environment.js';
+import { IRawGalleryExtensionVersion, sortExtensionVersions } from '../../common/extensionGalleryService.js';
+import { IFileService } from '../../../files/common/files.js';
+import { FileService } from '../../../files/common/fileService.js';
+import { InMemoryFileSystemProvider } from '../../../files/common/inMemoryFilesystemProvider.js';
+import { NullLogService } from '../../../log/common/log.js';
+import product from '../../../product/common/product.js';
+import { IProductService } from '../../../product/common/productService.js';
+import { resolveMarketplaceHeaders } from '../../../externalServices/common/marketplace.js';
+import { InMemoryStorageService, IStorageService } from '../../../storage/common/storage.js';
+import { TelemetryConfiguration, TELEMETRY_SETTING_ID } from '../../../telemetry/common/telemetry.js';
+import { TargetPlatform } from '../../../extensions/common/extensions.js';
+import { NullTelemetryService } from '../../../telemetry/common/telemetryUtils.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 
 class EnvironmentServiceMock extends mock<IEnvironmentService>() {
 	override readonly serviceMachineIdResource: URI;
@@ -52,6 +52,7 @@ suite('Extension Gallery Service', () => {
 
 	test('marketplace machine id', async () => {
 		const headers = await resolveMarketplaceHeaders(product.version, productService, environmentService, configurationService, fileService, storageService, NullTelemetryService);
+		assert.ok(headers['X-Market-User-Id']);
 		assert.ok(isUUID(headers['X-Market-User-Id']));
 		const headers2 = await resolveMarketplaceHeaders(product.version, productService, environmentService, configurationService, fileService, storageService, NullTelemetryService);
 		assert.strictEqual(headers['X-Market-User-Id'], headers2['X-Market-User-Id']);
diff --git a/src/vs/platform/extensionManagement/test/common/extensionManagement.test.ts b/src/vs/platform/extensionManagement/test/common/extensionManagement.test.ts
index 1c3d62f7f0b..4c26d81b859 100644
--- a/src/vs/platform/extensionManagement/test/common/extensionManagement.test.ts
+++ b/src/vs/platform/extensionManagement/test/common/extensionManagement.test.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { EXTENSION_IDENTIFIER_PATTERN } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { ExtensionKey } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { TargetPlatform } from 'vs/platform/extensions/common/extensions';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { EXTENSION_IDENTIFIER_PATTERN } from '../../common/extensionManagement.js';
+import { ExtensionKey } from '../../common/extensionManagementUtil.js';
+import { TargetPlatform } from '../../../extensions/common/extensions.js';
 
 suite('Extension Identifier Pattern', () => {
 
diff --git a/src/vs/platform/extensionManagement/test/common/extensionNls.test.ts b/src/vs/platform/extensionManagement/test/common/extensionNls.test.ts
index e23d69b9371..7eb71602c2c 100644
--- a/src/vs/platform/extensionManagement/test/common/extensionNls.test.ts
+++ b/src/vs/platform/extensionManagement/test/common/extensionNls.test.ts
@@ -4,12 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { deepClone } from 'vs/base/common/objects';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ILocalizedString } from 'vs/platform/action/common/action';
-import { localizeManifest } from 'vs/platform/extensionManagement/common/extensionNls';
-import { IExtensionManifest, IConfiguration } from 'vs/platform/extensions/common/extensions';
-import { NullLogger } from 'vs/platform/log/common/log';
+import { deepClone } from '../../../../base/common/objects.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { ILocalizedString } from '../../../action/common/action.js';
+import { IConfigurationNode } from '../../../configuration/common/configurationRegistry.js';
+import { localizeManifest } from '../../common/extensionNls.js';
+import { IExtensionManifest } from '../../../extensions/common/extensions.js';
+import { NullLogger } from '../../../log/common/log.js';
 
 const manifest: IExtensionManifest = {
 	name: 'test',
@@ -62,7 +63,7 @@ suite('Localize Manifest', () => {
 		assert.strictEqual(localizedManifest.contributes?.commands?.[0].title, 'Test Command');
 		assert.strictEqual(localizedManifest.contributes?.commands?.[0].category, 'Test Category');
 		assert.strictEqual(localizedManifest.contributes?.authentication?.[0].label, 'Test Authentication');
-		assert.strictEqual((localizedManifest.contributes?.configuration as IConfiguration).title, 'Test Configuration');
+		assert.strictEqual((localizedManifest.contributes?.configuration as IConfigurationNode).title, 'Test Configuration');
 	});
 
 	test('replaces template strings with fallback if not found in translations', function () {
@@ -81,7 +82,7 @@ suite('Localize Manifest', () => {
 		assert.strictEqual(localizedManifest.contributes?.commands?.[0].title, 'Test Command');
 		assert.strictEqual(localizedManifest.contributes?.commands?.[0].category, 'Test Category');
 		assert.strictEqual(localizedManifest.contributes?.authentication?.[0].label, 'Test Authentication');
-		assert.strictEqual((localizedManifest.contributes?.configuration as IConfiguration).title, 'Test Configuration');
+		assert.strictEqual((localizedManifest.contributes?.configuration as IConfigurationNode).title, 'Test Configuration');
 	});
 
 	test('replaces template strings - command title & categories become ILocalizedString', function () {
@@ -111,7 +112,7 @@ suite('Localize Manifest', () => {
 
 		// Everything else stays as a string.
 		assert.strictEqual(localizedManifest.contributes?.authentication?.[0].label, 'Testauthentifizierung');
-		assert.strictEqual((localizedManifest.contributes?.configuration as IConfiguration).title, 'Testkonfiguration');
+		assert.strictEqual((localizedManifest.contributes?.configuration as IConfigurationNode).title, 'Testkonfiguration');
 	});
 
 	test('replaces template strings - is best effort #164630', function () {
diff --git a/src/vs/platform/extensionManagement/test/common/extensionsProfileScannerService.test.ts b/src/vs/platform/extensionManagement/test/common/extensionsProfileScannerService.test.ts
index d94305a83fc..6c02f4be335 100644
--- a/src/vs/platform/extensionManagement/test/common/extensionsProfileScannerService.test.ts
+++ b/src/vs/platform/extensionManagement/test/common/extensionsProfileScannerService.test.ts
@@ -5,23 +5,23 @@
 
 import assert from 'assert';
 import * as sinon from 'sinon';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { joinPath } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { AbstractExtensionsProfileScannerService, ProfileExtensionsEvent } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService';
-import { ExtensionType, IExtension, IExtensionManifest, TargetPlatform } from 'vs/platform/extensions/common/extensions';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { IFileService } from 'vs/platform/files/common/files';
-import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { ILogService, NullLogService } from 'vs/platform/log/common/log';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { IUserDataProfilesService, UserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { joinPath } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { IEnvironmentService } from '../../../environment/common/environment.js';
+import { AbstractExtensionsProfileScannerService, ProfileExtensionsEvent } from '../../common/extensionsProfileScannerService.js';
+import { ExtensionType, IExtension, IExtensionManifest, TargetPlatform } from '../../../extensions/common/extensions.js';
+import { FileService } from '../../../files/common/fileService.js';
+import { IFileService } from '../../../files/common/files.js';
+import { InMemoryFileSystemProvider } from '../../../files/common/inMemoryFilesystemProvider.js';
+import { TestInstantiationService } from '../../../instantiation/test/common/instantiationServiceMock.js';
+import { ILogService, NullLogService } from '../../../log/common/log.js';
+import { ITelemetryService } from '../../../telemetry/common/telemetry.js';
+import { NullTelemetryService } from '../../../telemetry/common/telemetryUtils.js';
+import { IUriIdentityService } from '../../../uriIdentity/common/uriIdentity.js';
+import { UriIdentityService } from '../../../uriIdentity/common/uriIdentityService.js';
+import { IUserDataProfilesService, UserDataProfilesService } from '../../../userDataProfile/common/userDataProfile.js';
 
 class TestObject extends AbstractExtensionsProfileScannerService { }
 
diff --git a/src/vs/platform/extensionManagement/test/node/extensionDownloader.test.ts b/src/vs/platform/extensionManagement/test/node/extensionDownloader.test.ts
index bae93bde803..aa437e000a6 100644
--- a/src/vs/platform/extensionManagement/test/node/extensionDownloader.test.ts
+++ b/src/vs/platform/extensionManagement/test/node/extensionDownloader.test.ts
@@ -4,27 +4,24 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { platform } from 'vs/base/common/platform';
-import { arch } from 'vs/base/common/process';
-import { joinPath } from 'vs/base/common/resources';
-import { isBoolean } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { mock } from 'vs/base/test/common/mock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-import { getTargetPlatform, IExtensionGalleryService, IGalleryExtension, IGalleryExtensionAssets, InstallOperation } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { getGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { ExtensionsDownloader } from 'vs/platform/extensionManagement/node/extensionDownloader';
-import { IExtensionSignatureVerificationService } from 'vs/platform/extensionManagement/node/extensionSignatureVerificationService';
-import { IFileService } from 'vs/platform/files/common/files';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { ILogService, NullLogService } from 'vs/platform/log/common/log';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { platform } from '../../../../base/common/platform.js';
+import { arch } from '../../../../base/common/process.js';
+import { joinPath } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { mock } from '../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { INativeEnvironmentService } from '../../../environment/common/environment.js';
+import { ExtensionSignatureVerificationCode, getTargetPlatform, IExtensionGalleryService, IGalleryExtension, IGalleryExtensionAssets, InstallOperation } from '../../common/extensionManagement.js';
+import { getGalleryExtensionId } from '../../common/extensionManagementUtil.js';
+import { ExtensionsDownloader } from '../../node/extensionDownloader.js';
+import { IExtensionSignatureVerificationResult, IExtensionSignatureVerificationService } from '../../node/extensionSignatureVerificationService.js';
+import { IFileService } from '../../../files/common/files.js';
+import { FileService } from '../../../files/common/fileService.js';
+import { InMemoryFileSystemProvider } from '../../../files/common/inMemoryFilesystemProvider.js';
+import { TestInstantiationService } from '../../../instantiation/test/common/instantiationServiceMock.js';
+import { ILogService, NullLogService } from '../../../log/common/log.js';
 
 const ROOT = URI.file('tests').with({ scheme: 'vscode-tests' });
 
@@ -35,13 +32,18 @@ class TestExtensionSignatureVerificationService extends mock<IExtensionSignature
 		super();
 	}
 
-	override async verify(): Promise<boolean> {
-		if (isBoolean(this.verificationResult)) {
-			return this.verificationResult;
+	override async verify(): Promise<IExtensionSignatureVerificationResult | undefined> {
+		if (this.verificationResult === true) {
+			return {
+				code: ExtensionSignatureVerificationCode.Success
+			};
 		}
-		const error = Error(this.verificationResult);
-		(error as any).code = this.verificationResult;
-		throw error;
+		if (this.verificationResult === false) {
+			return undefined;
+		}
+		return {
+			code: this.verificationResult as ExtensionSignatureVerificationCode,
+		};
 	}
 }
 
@@ -76,33 +78,25 @@ suite('ExtensionDownloader Tests', () => {
 		});
 	});
 
-	test('download completes successfully if verification is disabled by setting set to false', async () => {
-		const testObject = aTestObject({ isSignatureVerificationEnabled: false, verificationResult: 'error' });
-
-		const actual = await testObject.download(aGalleryExtension('a', { isSigned: true }), InstallOperation.Install, true);
-
-		assert.strictEqual(actual.verificationStatus, false);
-	});
-
 	test('download completes successfully if verification is disabled by options', async () => {
-		const testObject = aTestObject({ isSignatureVerificationEnabled: true, verificationResult: 'error' });
+		const testObject = aTestObject({ verificationResult: 'error' });
 
 		const actual = await testObject.download(aGalleryExtension('a', { isSigned: true }), InstallOperation.Install, false);
 
-		assert.strictEqual(actual.verificationStatus, false);
+		assert.strictEqual(actual.verificationStatus, undefined);
 	});
 
 	test('download completes successfully if verification is disabled because the module is not loaded', async () => {
-		const testObject = aTestObject({ isSignatureVerificationEnabled: true, verificationResult: false });
+		const testObject = aTestObject({ verificationResult: false });
 
 		const actual = await testObject.download(aGalleryExtension('a', { isSigned: true }), InstallOperation.Install, true);
 
-		assert.strictEqual(actual.verificationStatus, false);
+		assert.strictEqual(actual.verificationStatus, undefined);
 	});
 
 	test('download completes successfully if verification fails to execute', async () => {
 		const errorCode = 'ENOENT';
-		const testObject = aTestObject({ isSignatureVerificationEnabled: true, verificationResult: errorCode });
+		const testObject = aTestObject({ verificationResult: errorCode });
 
 		const actual = await testObject.download(aGalleryExtension('a', { isSigned: true }), InstallOperation.Install, true);
 
@@ -111,7 +105,7 @@ suite('ExtensionDownloader Tests', () => {
 
 	test('download completes successfully if verification fails ', async () => {
 		const errorCode = 'IntegrityCheckFailed';
-		const testObject = aTestObject({ isSignatureVerificationEnabled: true, verificationResult: errorCode });
+		const testObject = aTestObject({ verificationResult: errorCode });
 
 		const actual = await testObject.download(aGalleryExtension('a', { isSigned: true }), InstallOperation.Install, true);
 
@@ -119,31 +113,30 @@ suite('ExtensionDownloader Tests', () => {
 	});
 
 	test('download completes successfully if verification succeeds', async () => {
-		const testObject = aTestObject({ isSignatureVerificationEnabled: true, verificationResult: true });
+		const testObject = aTestObject({ verificationResult: true });
 
 		const actual = await testObject.download(aGalleryExtension('a', { isSigned: true }), InstallOperation.Install, true);
 
-		assert.strictEqual(actual.verificationStatus, true);
+		assert.strictEqual(actual.verificationStatus, ExtensionSignatureVerificationCode.Success);
 	});
 
 	test('download completes successfully for unsigned extension', async () => {
-		const testObject = aTestObject({ isSignatureVerificationEnabled: true, verificationResult: true });
+		const testObject = aTestObject({ verificationResult: true });
 
 		const actual = await testObject.download(aGalleryExtension('a', { isSigned: false }), InstallOperation.Install, true);
 
-		assert.strictEqual(actual.verificationStatus, false);
+		assert.strictEqual(actual.verificationStatus, undefined);
 	});
 
 	test('download completes successfully for an unsigned extension even when signature verification throws error', async () => {
-		const testObject = aTestObject({ isSignatureVerificationEnabled: true, verificationResult: 'error' });
+		const testObject = aTestObject({ verificationResult: 'error' });
 
 		const actual = await testObject.download(aGalleryExtension('a', { isSigned: false }), InstallOperation.Install, true);
 
-		assert.strictEqual(actual.verificationStatus, false);
+		assert.strictEqual(actual.verificationStatus, undefined);
 	});
 
-	function aTestObject(options: { isSignatureVerificationEnabled: boolean; verificationResult: boolean | string }): ExtensionsDownloader {
-		instantiationService.stub(IConfigurationService, new TestConfigurationService(isBoolean(options.isSignatureVerificationEnabled) ? { extensions: { verifySignature: options.isSignatureVerificationEnabled } } : undefined));
+	function aTestObject(options: { verificationResult: boolean | string }): ExtensionsDownloader {
 		instantiationService.stub(IExtensionSignatureVerificationService, new TestExtensionSignatureVerificationService(options.verificationResult));
 		return disposables.add(instantiationService.createInstance(TestExtensionDownloader));
 	}
diff --git a/src/vs/platform/extensionManagement/test/node/extensionsScannerService.test.ts b/src/vs/platform/extensionManagement/test/node/extensionsScannerService.test.ts
index 8c0569fe67b..74d3ffcd738 100644
--- a/src/vs/platform/extensionManagement/test/node/extensionsScannerService.test.ts
+++ b/src/vs/platform/extensionManagement/test/node/extensionsScannerService.test.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { dirname, joinPath } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IExtensionsProfileScannerService, IProfileExtensionsScanOptions } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService';
-import { AbstractExtensionsScannerService, ExtensionScannerInput, IExtensionsScannerService, IScannedExtensionManifest, Translations } from 'vs/platform/extensionManagement/common/extensionsScannerService';
-import { ExtensionsProfileScannerService } from 'vs/platform/extensionManagement/node/extensionsProfileScannerService';
-import { ExtensionType, IExtensionManifest, TargetPlatform } from 'vs/platform/extensions/common/extensions';
-import { IFileService } from 'vs/platform/files/common/files';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { ILogService, NullLogService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { IUserDataProfilesService, UserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { dirname, joinPath } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { INativeEnvironmentService } from '../../../environment/common/environment.js';
+import { IExtensionsProfileScannerService, IProfileExtensionsScanOptions } from '../../common/extensionsProfileScannerService.js';
+import { AbstractExtensionsScannerService, ExtensionScannerInput, IExtensionsScannerService, IScannedExtensionManifest, Translations } from '../../common/extensionsScannerService.js';
+import { ExtensionsProfileScannerService } from '../../node/extensionsProfileScannerService.js';
+import { ExtensionType, IExtensionManifest, TargetPlatform } from '../../../extensions/common/extensions.js';
+import { IFileService } from '../../../files/common/files.js';
+import { FileService } from '../../../files/common/fileService.js';
+import { InMemoryFileSystemProvider } from '../../../files/common/inMemoryFilesystemProvider.js';
+import { IInstantiationService } from '../../../instantiation/common/instantiation.js';
+import { TestInstantiationService } from '../../../instantiation/test/common/instantiationServiceMock.js';
+import { ILogService, NullLogService } from '../../../log/common/log.js';
+import { IProductService } from '../../../product/common/productService.js';
+import { NullTelemetryService } from '../../../telemetry/common/telemetryUtils.js';
+import { IUriIdentityService } from '../../../uriIdentity/common/uriIdentity.js';
+import { UriIdentityService } from '../../../uriIdentity/common/uriIdentityService.js';
+import { IUserDataProfilesService, UserDataProfilesService } from '../../../userDataProfile/common/userDataProfile.js';
 
 let translations: Translations = Object.create(null);
 const ROOT = URI.file('/ROOT');
diff --git a/src/vs/platform/extensionRecommendations/common/extensionRecommendations.ts b/src/vs/platform/extensionRecommendations/common/extensionRecommendations.ts
index 07639a7e7b6..fe258ed580c 100644
--- a/src/vs/platform/extensionRecommendations/common/extensionRecommendations.ts
+++ b/src/vs/platform/extensionRecommendations/common/extensionRecommendations.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { URI } from '../../../base/common/uri.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 export const enum RecommendationSource {
 	FILE = 1,
diff --git a/src/vs/platform/extensionRecommendations/common/extensionRecommendationsIpc.ts b/src/vs/platform/extensionRecommendations/common/extensionRecommendationsIpc.ts
index 2298e4c2005..9cda9e8ec0e 100644
--- a/src/vs/platform/extensionRecommendations/common/extensionRecommendationsIpc.ts
+++ b/src/vs/platform/extensionRecommendations/common/extensionRecommendationsIpc.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { IChannel, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
-import { IExtensionRecommendationNotificationService, IExtensionRecommendations, RecommendationsNotificationResult } from 'vs/platform/extensionRecommendations/common/extensionRecommendations';
+import { Event } from '../../../base/common/event.js';
+import { IChannel, IServerChannel } from '../../../base/parts/ipc/common/ipc.js';
+import { IExtensionRecommendationNotificationService, IExtensionRecommendations, RecommendationsNotificationResult } from './extensionRecommendations.js';
 
 export class ExtensionRecommendationNotificationServiceChannelClient implements IExtensionRecommendationNotificationService {
 
diff --git a/src/vs/platform/extensionResourceLoader/browser/extensionResourceLoaderService.ts b/src/vs/platform/extensionResourceLoader/browser/extensionResourceLoaderService.ts
index fdefc170db0..974a3061346 100644
--- a/src/vs/platform/extensionResourceLoader/browser/extensionResourceLoaderService.ts
+++ b/src/vs/platform/extensionResourceLoader/browser/extensionResourceLoaderService.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IFileService } from 'vs/platform/files/common/files';
-import { FileAccess, Schemas } from 'vs/base/common/network';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { AbstractExtensionResourceLoaderService, IExtensionResourceLoaderService } from 'vs/platform/extensionResourceLoader/common/extensionResourceLoader';
+import { URI } from '../../../base/common/uri.js';
+import { InstantiationType, registerSingleton } from '../../instantiation/common/extensions.js';
+import { IFileService } from '../../files/common/files.js';
+import { FileAccess, Schemas } from '../../../base/common/network.js';
+import { IProductService } from '../../product/common/productService.js';
+import { IStorageService } from '../../storage/common/storage.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { ILogService } from '../../log/common/log.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { AbstractExtensionResourceLoaderService, IExtensionResourceLoaderService } from '../common/extensionResourceLoader.js';
 
 class ExtensionResourceLoaderService extends AbstractExtensionResourceLoaderService {
 
diff --git a/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts b/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts
index f1660961c58..e73ec41aba9 100644
--- a/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts
+++ b/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts
@@ -3,21 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isWeb } from 'vs/base/common/platform';
-import { format2 } from 'vs/base/common/strings';
-import { URI } from 'vs/base/common/uri';
-import { IHeaders } from 'vs/base/parts/request/common/request';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IFileService } from 'vs/platform/files/common/files';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { getServiceMachineId } from 'vs/platform/externalServices/common/serviceMachineId';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
-import { getTelemetryLevel, supportsTelemetry } from 'vs/platform/telemetry/common/telemetryUtils';
-import { RemoteAuthorities } from 'vs/base/common/network';
-import { TargetPlatform } from 'vs/platform/extensions/common/extensions';
+import { isWeb } from '../../../base/common/platform.js';
+import { format2 } from '../../../base/common/strings.js';
+import { URI } from '../../../base/common/uri.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { IFileService } from '../../files/common/files.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { IProductService } from '../../product/common/productService.js';
+import { getServiceMachineId } from '../../externalServices/common/serviceMachineId.js';
+import { IStorageService } from '../../storage/common/storage.js';
+import { TelemetryLevel } from '../../telemetry/common/telemetry.js';
+import { getTelemetryLevel, supportsTelemetry } from '../../telemetry/common/telemetryUtils.js';
+import { RemoteAuthorities } from '../../../base/common/network.js';
+import { TargetPlatform } from '../../extensions/common/extensions.js';
 
 const WEB_EXTENSION_RESOURCE_END_POINT_SEGMENT = '/web-extension-resource/';
 
@@ -110,8 +109,8 @@ export abstract class AbstractExtensionResourceLoaderService implements IExtensi
 		return !!this._extensionGalleryAuthority && this._extensionGalleryAuthority === this._getExtensionGalleryAuthority(uri);
 	}
 
-	protected async getExtensionGalleryRequestHeaders(): Promise<IHeaders> {
-		const headers: IHeaders = {
+	protected async getExtensionGalleryRequestHeaders(): Promise<Record<string, string>> {
+		const headers: Record<string, string> = {
 			'X-Client-Name': `${this._productService.applicationName}${isWeb ? '-web' : ''}`,
 			'X-Client-Version': this._productService.version
 		};
diff --git a/src/vs/platform/extensionResourceLoader/common/extensionResourceLoaderService.ts b/src/vs/platform/extensionResourceLoader/common/extensionResourceLoaderService.ts
index c6e63dc3aec..72fccbcc52c 100644
--- a/src/vs/platform/extensionResourceLoader/common/extensionResourceLoaderService.ts
+++ b/src/vs/platform/extensionResourceLoader/common/extensionResourceLoaderService.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { asTextOrError, IRequestService } from 'vs/platform/request/common/request';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { AbstractExtensionResourceLoaderService, IExtensionResourceLoaderService } from 'vs/platform/extensionResourceLoader/common/extensionResourceLoader';
+import { URI } from '../../../base/common/uri.js';
+import { InstantiationType, registerSingleton } from '../../instantiation/common/extensions.js';
+import { IFileService } from '../../files/common/files.js';
+import { IProductService } from '../../product/common/productService.js';
+import { asTextOrError, IRequestService } from '../../request/common/request.js';
+import { IStorageService } from '../../storage/common/storage.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { AbstractExtensionResourceLoaderService, IExtensionResourceLoaderService } from './extensionResourceLoader.js';
 
 export class ExtensionResourceLoaderService extends AbstractExtensionResourceLoaderService {
 
diff --git a/src/vs/platform/extensions/common/extensionHostStarter.ts b/src/vs/platform/extensions/common/extensionHostStarter.ts
index 8a10562398c..1d0d3fe5878 100644
--- a/src/vs/platform/extensions/common/extensionHostStarter.ts
+++ b/src/vs/platform/extensions/common/extensionHostStarter.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { Event } from '../../../base/common/event.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 export const IExtensionHostStarter = createDecorator<IExtensionHostStarter>('extensionHostStarter');
 
diff --git a/src/vs/platform/extensions/common/extensionValidator.ts b/src/vs/platform/extensions/common/extensionValidator.ts
index cee5eaeedef..87923dc1cb0 100644
--- a/src/vs/platform/extensions/common/extensionValidator.ts
+++ b/src/vs/platform/extensions/common/extensionValidator.ts
@@ -3,12 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isEqualOrParent, joinPath } from 'vs/base/common/resources';
-import Severity from 'vs/base/common/severity';
-import { URI } from 'vs/base/common/uri';
-import * as nls from 'vs/nls';
-import * as semver from 'vs/base/common/semver/semver';
-import { IExtensionManifest } from 'vs/platform/extensions/common/extensions';
+import { isEqualOrParent, joinPath } from '../../../base/common/resources.js';
+import Severity from '../../../base/common/severity.js';
+import { URI } from '../../../base/common/uri.js';
+import * as nls from '../../../nls.js';
+import * as semver from '../../../base/common/semver/semver.js';
+import { IExtensionManifest, parseApiProposals } from './extensions.js';
+import { allApiProposals } from './extensionsApiProposals.js';
 
 export interface IParsedVersion {
 	hasCaret: boolean;
@@ -239,7 +240,7 @@ export function isValidVersion(_inputVersion: string | INormalizedVersion, _inpu
 
 type ProductDate = string | Date | undefined;
 
-export function validateExtensionManifest(productVersion: string, productDate: ProductDate, extensionLocation: URI, extensionManifest: IExtensionManifest, extensionIsBuiltin: boolean): readonly [Severity, string][] {
+export function validateExtensionManifest(productVersion: string, productDate: ProductDate, extensionLocation: URI, extensionManifest: IExtensionManifest, extensionIsBuiltin: boolean, validateApiVersion: boolean): readonly [Severity, string][] {
 	const validations: [Severity, string][] = [];
 	if (typeof extensionManifest.publisher !== 'undefined' && typeof extensionManifest.publisher !== 'string') {
 		validations.push([Severity.Error, nls.localize('extensionDescription.publisher', "property publisher must be of type `string`.")]);
@@ -314,12 +315,22 @@ export function validateExtensionManifest(productVersion: string, productDate: P
 	}
 
 	const notices: string[] = [];
-	const isValid = isValidExtensionVersion(productVersion, productDate, extensionManifest, extensionIsBuiltin, notices);
-	if (!isValid) {
+	const validExtensionVersion = isValidExtensionVersion(productVersion, productDate, extensionManifest, extensionIsBuiltin, notices);
+	if (!validExtensionVersion) {
 		for (const notice of notices) {
 			validations.push([Severity.Error, notice]);
 		}
 	}
+
+	if (validateApiVersion && extensionManifest.enabledApiProposals?.length) {
+		const incompatibleNotices: string[] = [];
+		if (!areApiProposalsCompatible([...extensionManifest.enabledApiProposals], incompatibleNotices)) {
+			for (const notice of incompatibleNotices) {
+				validations.push([Severity.Error, notice]);
+			}
+		}
+	}
+
 	return validations;
 }
 
@@ -338,6 +349,44 @@ export function isEngineValid(engine: string, version: string, date: ProductDate
 	return engine === '*' || isVersionValid(version, date, engine);
 }
 
+export function areApiProposalsCompatible(apiProposals: string[]): boolean;
+export function areApiProposalsCompatible(apiProposals: string[], notices: string[]): boolean;
+export function areApiProposalsCompatible(apiProposals: string[], productApiProposals: Readonly<{ [proposalName: string]: Readonly<{ proposal: string; version?: number }> }>): boolean;
+export function areApiProposalsCompatible(apiProposals: string[], arg1?: any): boolean {
+	if (apiProposals.length === 0) {
+		return true;
+	}
+	const notices: string[] | undefined = Array.isArray(arg1) ? arg1 : undefined;
+	const productApiProposals: Readonly<{ [proposalName: string]: Readonly<{ proposal: string; version?: number }> }> = (notices ? undefined : arg1) ?? allApiProposals;
+	const incompatibleProposals: string[] = [];
+	const parsedProposals = parseApiProposals(apiProposals);
+	for (const { proposalName, version } of parsedProposals) {
+		const existingProposal = productApiProposals[proposalName];
+		if (!existingProposal) {
+			continue;
+		}
+		if (!version) {
+			continue;
+		}
+		if (existingProposal.version !== version) {
+			incompatibleProposals.push(proposalName);
+		}
+	}
+	if (incompatibleProposals.length) {
+		if (notices) {
+			if (incompatibleProposals.length === 1) {
+				notices.push(nls.localize('apiProposalMismatch1', "This extension is using the API proposal '{0}' that is not compatible with the current version of VS Code.", incompatibleProposals[0]));
+			} else {
+				notices.push(nls.localize('apiProposalMismatch2', "This extension is using the API proposals {0} and '{1}' that are not compatible with the current version of VS Code.",
+					incompatibleProposals.slice(0, incompatibleProposals.length - 1).map(p => `'${p}'`).join(', '),
+					incompatibleProposals[incompatibleProposals.length - 1]));
+			}
+		}
+		return false;
+	}
+	return true;
+}
+
 function isVersionValid(currentVersion: string, date: ProductDate, requestedVersion: string, notices: string[] = []): boolean {
 
 	const desiredVersion = normalizeVersion(parseVersion(requestedVersion));
diff --git a/src/vs/platform/extensions/common/extensions.ts b/src/vs/platform/extensions/common/extensions.ts
index f4af25dcabb..5973d4dcf12 100644
--- a/src/vs/platform/extensions/common/extensions.ts
+++ b/src/vs/platform/extensions/common/extensions.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import Severity from 'vs/base/common/severity';
-import * as strings from 'vs/base/common/strings';
-import { URI } from 'vs/base/common/uri';
-import { ILocalizedString } from 'vs/platform/action/common/action';
-import { ExtensionKind } from 'vs/platform/environment/common/environment';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { getRemoteName } from 'vs/platform/remote/common/remoteHosts';
+import Severity from '../../../base/common/severity.js';
+import * as strings from '../../../base/common/strings.js';
+import { URI } from '../../../base/common/uri.js';
+import { ILocalizedString } from '../../action/common/action.js';
+import { ExtensionKind } from '../../environment/common/environment.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { getRemoteName } from '../../remote/common/remoteHosts.js';
 
 export const USER_MANIFEST_CACHE_FILE = 'extensions.user.cache';
 export const BUILTIN_MANIFEST_CACHE_FILE = 'extensions.builtin.cache';
@@ -21,19 +21,6 @@ export interface ICommand {
 	category?: string | ILocalizedString;
 }
 
-export interface IConfigurationProperty {
-	description: string;
-	type: string | string[];
-	default?: any;
-}
-
-export interface IConfiguration {
-	id?: string;
-	order?: number;
-	title?: string;
-	properties: { [key: string]: IConfigurationProperty };
-}
-
 export interface IDebugger {
 	label?: string;
 	type: string;
@@ -182,7 +169,7 @@ export interface ILocalizationContribution {
 
 export interface IExtensionContributions {
 	commands?: ICommand[];
-	configuration?: IConfiguration | IConfiguration[];
+	configuration?: any;
 	debuggers?: IDebugger[];
 	grammars?: IGrammar[];
 	jsonValidation?: IJSONValidation[];
@@ -239,7 +226,9 @@ export interface IExtensionIdentifier {
 }
 
 export const EXTENSION_CATEGORIES = [
+	'AI',
 	'Azure',
+	'Chat',
 	'Data Science',
 	'Debuggers',
 	'Extension Packs',
@@ -256,8 +245,6 @@ export const EXTENSION_CATEGORIES = [
 	'Testing',
 	'Themes',
 	'Visualization',
-	'AI',
-	'Chat',
 	'Other',
 ];
 
@@ -284,6 +271,7 @@ export interface IRelaxedExtensionManifest {
 	contributes?: IExtensionContributions;
 	repository?: { url: string };
 	bugs?: { url: string };
+	originalEnabledApiProposals?: readonly string[];
 	enabledApiProposals?: readonly string[];
 	api?: string;
 	scripts?: { [key: string]: string };
@@ -492,6 +480,17 @@ export function isResolverExtension(manifest: IExtensionManifest, remoteAuthorit
 	return false;
 }
 
+export function parseApiProposals(enabledApiProposals: string[]): { proposalName: string; version?: number }[] {
+	return enabledApiProposals.map(proposal => {
+		const [proposalName, version] = proposal.split('@');
+		return { proposalName, version: version ? parseInt(version) : undefined };
+	});
+}
+
+export function parseEnabledApiProposalNames(enabledApiProposals: string[]): string[] {
+	return enabledApiProposals.map(proposal => proposal.split('@')[0]);
+}
+
 export const IBuiltinExtensionsScannerService = createDecorator<IBuiltinExtensionsScannerService>('IBuiltinExtensionsScannerService');
 export interface IBuiltinExtensionsScannerService {
 	readonly _serviceBrand: undefined;
diff --git a/src/vs/platform/extensions/common/extensionsApiProposals.ts b/src/vs/platform/extensions/common/extensionsApiProposals.ts
new file mode 100644
index 00000000000..96a820f5ea4
--- /dev/null
+++ b/src/vs/platform/extensions/common/extensionsApiProposals.ts
@@ -0,0 +1,407 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// THIS IS A GENERATED FILE. DO NOT EDIT DIRECTLY.
+
+const _allApiProposals = {
+	activeComment: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.activeComment.d.ts',
+	},
+	aiRelatedInformation: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.aiRelatedInformation.d.ts',
+	},
+	aiTextSearchProvider: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.aiTextSearchProvider.d.ts',
+	},
+	aiTextSearchProviderNew: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.aiTextSearchProviderNew.d.ts',
+	},
+	attributableCoverage: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.attributableCoverage.d.ts',
+	},
+	authLearnMore: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.authLearnMore.d.ts',
+	},
+	authSession: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.authSession.d.ts',
+	},
+	canonicalUriProvider: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.canonicalUriProvider.d.ts',
+	},
+	chatParticipantAdditions: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatParticipantAdditions.d.ts',
+	},
+	chatParticipantPrivate: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts',
+		version: 2
+	},
+	chatProvider: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatProvider.d.ts',
+	},
+	chatTab: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatTab.d.ts',
+	},
+	chatVariableResolver: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatVariableResolver.d.ts',
+	},
+	codeActionAI: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.codeActionAI.d.ts',
+	},
+	codeActionRanges: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.codeActionRanges.d.ts',
+	},
+	codiconDecoration: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.codiconDecoration.d.ts',
+	},
+	commentReactor: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.commentReactor.d.ts',
+	},
+	commentReveal: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.commentReveal.d.ts',
+	},
+	commentThreadApplicability: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.commentThreadApplicability.d.ts',
+	},
+	commentingRangeHint: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.commentingRangeHint.d.ts',
+	},
+	commentsDraftState: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.commentsDraftState.d.ts',
+	},
+	contribAccessibilityHelpContent: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribAccessibilityHelpContent.d.ts',
+	},
+	contribChatParticipantDetection: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribChatParticipantDetection.d.ts',
+	},
+	contribCommentEditorActionsMenu: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribCommentEditorActionsMenu.d.ts',
+	},
+	contribCommentPeekContext: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribCommentPeekContext.d.ts',
+	},
+	contribCommentThreadAdditionalMenu: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribCommentThreadAdditionalMenu.d.ts',
+	},
+	contribCommentsViewThreadMenus: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribCommentsViewThreadMenus.d.ts',
+	},
+	contribDebugCreateConfiguration: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribDebugCreateConfiguration.d.ts',
+	},
+	contribDiffEditorGutterToolBarMenus: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribDiffEditorGutterToolBarMenus.d.ts',
+	},
+	contribEditSessions: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribEditSessions.d.ts',
+	},
+	contribEditorContentMenu: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribEditorContentMenu.d.ts',
+	},
+	contribIssueReporter: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribIssueReporter.d.ts',
+	},
+	contribLabelFormatterWorkspaceTooltip: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribLabelFormatterWorkspaceTooltip.d.ts',
+	},
+	contribMenuBarHome: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribMenuBarHome.d.ts',
+	},
+	contribMergeEditorMenus: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribMergeEditorMenus.d.ts',
+	},
+	contribMultiDiffEditorMenus: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribMultiDiffEditorMenus.d.ts',
+	},
+	contribNotebookStaticPreloads: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribNotebookStaticPreloads.d.ts',
+	},
+	contribRemoteHelp: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribRemoteHelp.d.ts',
+	},
+	contribShareMenu: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribShareMenu.d.ts',
+	},
+	contribSourceControlHistoryItemMenu: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribSourceControlHistoryItemMenu.d.ts',
+	},
+	contribSourceControlHistoryTitleMenu: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribSourceControlHistoryTitleMenu.d.ts',
+	},
+	contribSourceControlInputBoxMenu: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribSourceControlInputBoxMenu.d.ts',
+	},
+	contribSourceControlTitleMenu: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribSourceControlTitleMenu.d.ts',
+	},
+	contribStatusBarItems: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribStatusBarItems.d.ts',
+	},
+	contribViewContainerTitle: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribViewContainerTitle.d.ts',
+	},
+	contribViewsRemote: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribViewsRemote.d.ts',
+	},
+	contribViewsWelcome: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribViewsWelcome.d.ts',
+	},
+	createFileSystemWatcher: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.createFileSystemWatcher.d.ts',
+	},
+	customEditorMove: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.customEditorMove.d.ts',
+	},
+	debugVisualization: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.debugVisualization.d.ts',
+	},
+	defaultChatParticipant: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.defaultChatParticipant.d.ts',
+		version: 2
+	},
+	diffCommand: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.diffCommand.d.ts',
+	},
+	diffContentOptions: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.diffContentOptions.d.ts',
+	},
+	documentFiltersExclusive: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.documentFiltersExclusive.d.ts',
+	},
+	documentPaste: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.documentPaste.d.ts',
+	},
+	editSessionIdentityProvider: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.editSessionIdentityProvider.d.ts',
+	},
+	editorHoverVerbosityLevel: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.editorHoverVerbosityLevel.d.ts',
+	},
+	editorInsets: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.editorInsets.d.ts',
+	},
+	embeddings: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.embeddings.d.ts',
+	},
+	extensionRuntime: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.extensionRuntime.d.ts',
+	},
+	extensionsAny: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.extensionsAny.d.ts',
+	},
+	externalUriOpener: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.externalUriOpener.d.ts',
+	},
+	fileComments: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.fileComments.d.ts',
+	},
+	fileSearchProvider: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.fileSearchProvider.d.ts',
+	},
+	fileSearchProviderNew: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.fileSearchProviderNew.d.ts',
+	},
+	findFiles2: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.findFiles2.d.ts',
+	},
+	findFiles2New: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.findFiles2New.d.ts',
+	},
+	findTextInFiles: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.findTextInFiles.d.ts',
+	},
+	findTextInFilesNew: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.findTextInFilesNew.d.ts',
+	},
+	fsChunks: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.fsChunks.d.ts',
+	},
+	idToken: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.idToken.d.ts',
+	},
+	inlineCompletionsAdditions: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts',
+	},
+	inlineEdit: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.inlineEdit.d.ts',
+	},
+	interactive: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.interactive.d.ts',
+	},
+	interactiveWindow: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.interactiveWindow.d.ts',
+	},
+	ipc: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.ipc.d.ts',
+	},
+	languageModelSystem: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.languageModelSystem.d.ts',
+	},
+	languageStatusText: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.languageStatusText.d.ts',
+	},
+	lmTools: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.lmTools.d.ts',
+		version: 7
+	},
+	mappedEditsProvider: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.mappedEditsProvider.d.ts',
+	},
+	multiDocumentHighlightProvider: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.multiDocumentHighlightProvider.d.ts',
+	},
+	newSymbolNamesProvider: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.newSymbolNamesProvider.d.ts',
+	},
+	notebookCellExecution: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookCellExecution.d.ts',
+	},
+	notebookCellExecutionState: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookCellExecutionState.d.ts',
+	},
+	notebookControllerAffinityHidden: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookControllerAffinityHidden.d.ts',
+	},
+	notebookDeprecated: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookDeprecated.d.ts',
+	},
+	notebookExecution: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookExecution.d.ts',
+	},
+	notebookKernelSource: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookKernelSource.d.ts',
+	},
+	notebookLiveShare: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookLiveShare.d.ts',
+	},
+	notebookMessaging: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookMessaging.d.ts',
+	},
+	notebookMime: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookMime.d.ts',
+	},
+	notebookReplDocument: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookReplDocument.d.ts',
+	},
+	notebookVariableProvider: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookVariableProvider.d.ts',
+	},
+	portsAttributes: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.portsAttributes.d.ts',
+	},
+	profileContentHandlers: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.profileContentHandlers.d.ts',
+	},
+	quickDiffProvider: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.quickDiffProvider.d.ts',
+	},
+	quickInputButtonLocation: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.quickInputButtonLocation.d.ts',
+	},
+	quickPickItemTooltip: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.quickPickItemTooltip.d.ts',
+	},
+	quickPickSortByLabel: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.quickPickSortByLabel.d.ts',
+	},
+	resolvers: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.resolvers.d.ts',
+	},
+	scmActionButton: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmActionButton.d.ts',
+	},
+	scmHistoryProvider: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmHistoryProvider.d.ts',
+	},
+	scmMultiDiffEditor: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmMultiDiffEditor.d.ts',
+	},
+	scmSelectedProvider: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmSelectedProvider.d.ts',
+	},
+	scmTextDocument: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmTextDocument.d.ts',
+	},
+	scmValidation: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmValidation.d.ts',
+	},
+	shareProvider: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.shareProvider.d.ts',
+	},
+	showLocal: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.showLocal.d.ts',
+	},
+	speech: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.speech.d.ts',
+	},
+	tabInputMultiDiff: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.tabInputMultiDiff.d.ts',
+	},
+	tabInputTextMerge: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.tabInputTextMerge.d.ts',
+	},
+	taskPresentationGroup: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.taskPresentationGroup.d.ts',
+	},
+	telemetry: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.telemetry.d.ts',
+	},
+	terminalDataWriteEvent: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalDataWriteEvent.d.ts',
+	},
+	terminalDimensions: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalDimensions.d.ts',
+	},
+	terminalExecuteCommandEvent: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalExecuteCommandEvent.d.ts',
+	},
+	terminalQuickFixProvider: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalQuickFixProvider.d.ts',
+	},
+	terminalSelection: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalSelection.d.ts',
+	},
+	testObserver: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.testObserver.d.ts',
+	},
+	testRelatedCode: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.testRelatedCode.d.ts',
+	},
+	textSearchCompleteNew: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.textSearchCompleteNew.d.ts',
+	},
+	textSearchProvider: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.textSearchProvider.d.ts',
+	},
+	textSearchProviderNew: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.textSearchProviderNew.d.ts',
+	},
+	timeline: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.timeline.d.ts',
+	},
+	tokenInformation: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.tokenInformation.d.ts',
+	},
+	treeViewActiveItem: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.treeViewActiveItem.d.ts',
+	},
+	treeViewMarkdownMessage: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.treeViewMarkdownMessage.d.ts',
+	},
+	treeViewReveal: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.treeViewReveal.d.ts',
+	},
+	tunnelFactory: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.tunnelFactory.d.ts',
+	},
+	tunnels: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.tunnels.d.ts',
+	},
+	workspaceTrust: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.workspaceTrust.d.ts',
+	}
+};
+export const allApiProposals = Object.freeze<{ [proposalName: string]: Readonly<{ proposal: string; version?: number }> }>(_allApiProposals);
+export type ApiProposalName = keyof typeof _allApiProposals;
diff --git a/src/vs/platform/extensions/electron-main/extensionHostStarter.ts b/src/vs/platform/extensions/electron-main/extensionHostStarter.ts
index 106963ac0b5..fa606b291a3 100644
--- a/src/vs/platform/extensions/electron-main/extensionHostStarter.ts
+++ b/src/vs/platform/extensions/electron-main/extensionHostStarter.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Promises } from 'vs/base/common/async';
-import { canceled } from 'vs/base/common/errors';
-import { Event } from 'vs/base/common/event';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { IExtensionHostProcessOptions, IExtensionHostStarter } from 'vs/platform/extensions/common/extensionHostStarter';
-import { ILifecycleMainService } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { WindowUtilityProcess } from 'vs/platform/utilityProcess/electron-main/utilityProcess';
-import { IWindowsMainService } from 'vs/platform/windows/electron-main/windows';
+import { Promises } from '../../../base/common/async.js';
+import { canceled } from '../../../base/common/errors.js';
+import { Event } from '../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../base/common/lifecycle.js';
+import { IExtensionHostProcessOptions, IExtensionHostStarter } from '../common/extensionHostStarter.js';
+import { ILifecycleMainService } from '../../lifecycle/electron-main/lifecycleMainService.js';
+import { ILogService } from '../../log/common/log.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
+import { WindowUtilityProcess } from '../../utilityProcess/electron-main/utilityProcess.js';
+import { IWindowsMainService } from '../../windows/electron-main/windows.js';
 
 export class ExtensionHostStarter extends Disposable implements IDisposable, IExtensionHostStarter {
 
@@ -112,7 +112,7 @@ export class ExtensionHostStarter extends Disposable implements IDisposable, IEx
 			args: ['--skipWorkspaceStorageLock'],
 			execArgv: opts.execArgv,
 			allowLoadingUnsignedLibraries: true,
-			forceAllocationsToV8Sandbox: true,
+			respondToAuthRequestsFromMainProcess: true,
 			correlationId: id
 		});
 		const pid = await Event.toPromise(extHost.onSpawn);
diff --git a/src/vs/platform/extensions/test/common/extensionValidator.test.ts b/src/vs/platform/extensions/test/common/extensionValidator.test.ts
index a9e95e6dcc7..82c3cf0bf8a 100644
--- a/src/vs/platform/extensions/test/common/extensionValidator.test.ts
+++ b/src/vs/platform/extensions/test/common/extensionValidator.test.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IExtensionManifest } from 'vs/platform/extensions/common/extensions';
-import { INormalizedVersion, IParsedVersion, isValidExtensionVersion, isValidVersion, isValidVersionStr, normalizeVersion, parseVersion } from 'vs/platform/extensions/common/extensionValidator';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { IExtensionManifest } from '../../common/extensions.js';
+import { areApiProposalsCompatible, INormalizedVersion, IParsedVersion, isValidExtensionVersion, isValidVersion, isValidVersionStr, normalizeVersion, parseVersion } from '../../common/extensionValidator.js';
 
 suite('Extension Version Validator', () => {
 
@@ -423,4 +423,21 @@ suite('Extension Version Validator', () => {
 		};
 		assert.strictEqual(isValidExtensionVersion('1.44.0', undefined, manifest, false, []), false);
 	});
+
+	test('areApiProposalsCompatible', () => {
+		assert.strictEqual(areApiProposalsCompatible([]), true);
+		assert.strictEqual(areApiProposalsCompatible([], ['hello']), true);
+		assert.strictEqual(areApiProposalsCompatible([], {}), true);
+		assert.strictEqual(areApiProposalsCompatible(['proposal1'], {}), true);
+		assert.strictEqual(areApiProposalsCompatible(['proposal1'], { 'proposal1': { proposal: '' } }), true);
+		assert.strictEqual(areApiProposalsCompatible(['proposal1'], { 'proposal1': { proposal: '', version: 1 } }), true);
+		assert.strictEqual(areApiProposalsCompatible(['proposal1@1'], { 'proposal1': { proposal: '', version: 1 } }), true);
+		assert.strictEqual(areApiProposalsCompatible(['proposal1'], { 'proposal2': { proposal: '' } }), true);
+		assert.strictEqual(areApiProposalsCompatible(['proposal1', 'proposal2'], {}), true);
+		assert.strictEqual(areApiProposalsCompatible(['proposal1', 'proposal2'], { 'proposal1': { proposal: '' } }), true);
+
+		assert.strictEqual(areApiProposalsCompatible(['proposal1@1'], { 'proposal1': { proposal: '', version: 2 } }), false);
+		assert.strictEqual(areApiProposalsCompatible(['proposal1@1'], { 'proposal1': { proposal: '' } }), false);
+	});
+
 });
diff --git a/src/vs/platform/extensions/test/common/extensions.test.ts b/src/vs/platform/extensions/test/common/extensions.test.ts
new file mode 100644
index 00000000000..7dff0ffb781
--- /dev/null
+++ b/src/vs/platform/extensions/test/common/extensions.test.ts
@@ -0,0 +1,22 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import assert from 'assert';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { parseEnabledApiProposalNames } from '../../common/extensions.js';
+
+suite('Parsing Enabled Api Proposals', () => {
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('parsingEnabledApiProposals', () => {
+		assert.deepStrictEqual(['activeComment', 'commentsDraftState'], parseEnabledApiProposalNames(['activeComment', 'commentsDraftState']));
+		assert.deepStrictEqual(['activeComment', 'commentsDraftState'], parseEnabledApiProposalNames(['activeComment', 'commentsDraftState@1']));
+		assert.deepStrictEqual(['activeComment', 'commentsDraftState'], parseEnabledApiProposalNames(['activeComment', 'commentsDraftState@']));
+		assert.deepStrictEqual(['activeComment', 'commentsDraftState'], parseEnabledApiProposalNames(['activeComment', 'commentsDraftState@randomstring']));
+		assert.deepStrictEqual(['activeComment', 'commentsDraftState'], parseEnabledApiProposalNames(['activeComment', 'commentsDraftState@1234']));
+		assert.deepStrictEqual(['activeComment', 'commentsDraftState'], parseEnabledApiProposalNames(['activeComment', 'commentsDraftState@1234_random']));
+	});
+
+});
diff --git a/src/vs/platform/externalServices/common/marketplace.ts b/src/vs/platform/externalServices/common/marketplace.ts
index abb5e379869..3ffab849d3f 100644
--- a/src/vs/platform/externalServices/common/marketplace.ts
+++ b/src/vs/platform/externalServices/common/marketplace.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IHeaders } from 'vs/base/parts/request/common/request';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { getServiceMachineId } from 'vs/platform/externalServices/common/serviceMachineId';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService, TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
-import { getTelemetryLevel, supportsTelemetry } from 'vs/platform/telemetry/common/telemetryUtils';
+import { IHeaders } from '../../../base/parts/request/common/request.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { getServiceMachineId } from './serviceMachineId.js';
+import { IFileService } from '../../files/common/files.js';
+import { IProductService } from '../../product/common/productService.js';
+import { IStorageService } from '../../storage/common/storage.js';
+import { ITelemetryService, TelemetryLevel } from '../../telemetry/common/telemetry.js';
+import { getTelemetryLevel, supportsTelemetry } from '../../telemetry/common/telemetryUtils.js';
 
 export async function resolveMarketplaceHeaders(version: string,
 	productService: IProductService,
diff --git a/src/vs/platform/externalServices/common/serviceMachineId.ts b/src/vs/platform/externalServices/common/serviceMachineId.ts
index 6767e7d7225..8d564d63fb2 100644
--- a/src/vs/platform/externalServices/common/serviceMachineId.ts
+++ b/src/vs/platform/externalServices/common/serviceMachineId.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { generateUuid, isUUID } from 'vs/base/common/uuid';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { generateUuid, isUUID } from '../../../base/common/uuid.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { IFileService } from '../../files/common/files.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../storage/common/storage.js';
 
 export async function getServiceMachineId(environmentService: IEnvironmentService, fileService: IFileService, storageService: IStorageService | undefined): Promise<string> {
 	let uuid: string | null = storageService ? storageService.get('storage.serviceMachineId', StorageScope.APPLICATION) || null : null;
diff --git a/src/vs/platform/externalTerminal/common/externalTerminal.ts b/src/vs/platform/externalTerminal/common/externalTerminal.ts
index 6d8da336419..3c0e241828d 100644
--- a/src/vs/platform/externalTerminal/common/externalTerminal.ts
+++ b/src/vs/platform/externalTerminal/common/externalTerminal.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ITerminalEnvironment } from 'vs/platform/terminal/common/terminal';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { ITerminalEnvironment } from '../../terminal/common/terminal.js';
 
 export const IExternalTerminalService = createDecorator<IExternalTerminalService>('externalTerminal');
 
diff --git a/src/vs/platform/externalTerminal/electron-main/externalTerminal.ts b/src/vs/platform/externalTerminal/electron-main/externalTerminal.ts
index af6925563c7..f31e4e616a3 100644
--- a/src/vs/platform/externalTerminal/electron-main/externalTerminal.ts
+++ b/src/vs/platform/externalTerminal/electron-main/externalTerminal.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IExternalTerminalService } from 'vs/platform/externalTerminal/common/externalTerminal';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { IExternalTerminalService } from '../common/externalTerminal.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 export const IExternalTerminalMainService = createDecorator<IExternalTerminalMainService>('externalTerminal');
 
diff --git a/src/vs/platform/externalTerminal/electron-sandbox/externalTerminalService.ts b/src/vs/platform/externalTerminal/electron-sandbox/externalTerminalService.ts
index 209c24d072b..ef1fe8b73df 100644
--- a/src/vs/platform/externalTerminal/electron-sandbox/externalTerminalService.ts
+++ b/src/vs/platform/externalTerminal/electron-sandbox/externalTerminalService.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IExternalTerminalService as ICommonExternalTerminalService } from 'vs/platform/externalTerminal/common/externalTerminal';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { registerMainProcessRemoteService } from 'vs/platform/ipc/electron-sandbox/services';
+import { IExternalTerminalService as ICommonExternalTerminalService } from '../common/externalTerminal.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { registerMainProcessRemoteService } from '../../ipc/electron-sandbox/services.js';
 
 export const IExternalTerminalService = createDecorator<IExternalTerminalService>('externalTerminal');
 
diff --git a/src/vs/platform/externalTerminal/node/externalTerminalService.ts b/src/vs/platform/externalTerminal/node/externalTerminalService.ts
index 5086c95a802..47c12711f8c 100644
--- a/src/vs/platform/externalTerminal/node/externalTerminalService.ts
+++ b/src/vs/platform/externalTerminal/node/externalTerminalService.ts
@@ -4,16 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as cp from 'child_process';
-import { memoize } from 'vs/base/common/decorators';
-import { FileAccess } from 'vs/base/common/network';
-import * as path from 'vs/base/common/path';
-import * as env from 'vs/base/common/platform';
-import { sanitizeProcessEnvironment } from 'vs/base/common/processes';
-import * as pfs from 'vs/base/node/pfs';
-import * as processes from 'vs/base/node/processes';
-import * as nls from 'vs/nls';
-import { DEFAULT_TERMINAL_OSX, IExternalTerminalService, IExternalTerminalSettings, ITerminalForPlatform } from 'vs/platform/externalTerminal/common/externalTerminal';
-import { ITerminalEnvironment } from 'vs/platform/terminal/common/terminal';
+import { memoize } from '../../../base/common/decorators.js';
+import { FileAccess } from '../../../base/common/network.js';
+import * as path from '../../../base/common/path.js';
+import * as env from '../../../base/common/platform.js';
+import { sanitizeProcessEnvironment } from '../../../base/common/processes.js';
+import * as pfs from '../../../base/node/pfs.js';
+import * as processes from '../../../base/node/processes.js';
+import * as nls from '../../../nls.js';
+import { DEFAULT_TERMINAL_OSX, IExternalTerminalService, IExternalTerminalSettings, ITerminalForPlatform } from '../common/externalTerminal.js';
+import { ITerminalEnvironment } from '../../terminal/common/terminal.js';
 
 const TERMINAL_TITLE = nls.localize('console.title', "VS Code Console");
 
@@ -56,8 +56,9 @@ export class WindowsExternalTerminalService extends ExternalTerminalService impl
 		const cmdArgs = ['/c', 'start', '/wait'];
 		if (exec.indexOf(' ') >= 0) {
 			// The "" argument is the window title. Without this, exec doesn't work when the path
-			// contains spaces
-			cmdArgs.push('""');
+			// contains spaces. #6590
+			// Title is Execution Path. #220129
+			cmdArgs.push(exec);
 		}
 		cmdArgs.push(exec);
 		// Add starting directory parameter for Windows Terminal (see #90734)
diff --git a/src/vs/platform/externalTerminal/test/electron-main/externalTerminalService.test.ts b/src/vs/platform/externalTerminal/test/electron-main/externalTerminalService.test.ts
index 3a71b5ba69b..601434fd803 100644
--- a/src/vs/platform/externalTerminal/test/electron-main/externalTerminalService.test.ts
+++ b/src/vs/platform/externalTerminal/test/electron-main/externalTerminalService.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { deepStrictEqual, strictEqual } from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { DEFAULT_TERMINAL_OSX, IExternalTerminalConfiguration } from 'vs/platform/externalTerminal/common/externalTerminal';
-import { LinuxExternalTerminalService, MacExternalTerminalService, WindowsExternalTerminalService } from 'vs/platform/externalTerminal/node/externalTerminalService';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { DEFAULT_TERMINAL_OSX, IExternalTerminalConfiguration } from '../../common/externalTerminal.js';
+import { LinuxExternalTerminalService, MacExternalTerminalService, WindowsExternalTerminalService } from '../../node/externalTerminalService.js';
 
 const mockConfig = Object.freeze<IExternalTerminalConfiguration>({
 	terminal: {
diff --git a/src/vs/platform/files/browser/htmlFileSystemProvider.ts b/src/vs/platform/files/browser/htmlFileSystemProvider.ts
index 382bb7a7e6c..9b519a19450 100644
--- a/src/vs/platform/files/browser/htmlFileSystemProvider.ts
+++ b/src/vs/platform/files/browser/htmlFileSystemProvider.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { URI } from 'vs/base/common/uri';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Event } from 'vs/base/common/event';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { basename, extname, normalize } from 'vs/base/common/path';
-import { isLinux } from 'vs/base/common/platform';
-import { extUri, extUriIgnorePathCase } from 'vs/base/common/resources';
-import { newWriteableStream, ReadableStreamEvents } from 'vs/base/common/stream';
-import { createFileSystemProviderError, IFileDeleteOptions, IFileOverwriteOptions, IFileReadStreamOptions, FileSystemProviderCapabilities, FileSystemProviderError, FileSystemProviderErrorCode, FileType, IFileWriteOptions, IFileSystemProviderWithFileReadStreamCapability, IFileSystemProviderWithFileReadWriteCapability, IStat, IWatchOptions } from 'vs/platform/files/common/files';
-import { WebFileSystemAccess } from 'vs/platform/files/browser/webFileSystemAccess';
-import { IndexedDB } from 'vs/base/browser/indexedDB';
-import { ILogService } from 'vs/platform/log/common/log';
+import { localize } from '../../../nls.js';
+import { URI } from '../../../base/common/uri.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Event } from '../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../base/common/lifecycle.js';
+import { Schemas } from '../../../base/common/network.js';
+import { basename, extname, normalize } from '../../../base/common/path.js';
+import { isLinux } from '../../../base/common/platform.js';
+import { extUri, extUriIgnorePathCase } from '../../../base/common/resources.js';
+import { newWriteableStream, ReadableStreamEvents } from '../../../base/common/stream.js';
+import { createFileSystemProviderError, IFileDeleteOptions, IFileOverwriteOptions, IFileReadStreamOptions, FileSystemProviderCapabilities, FileSystemProviderError, FileSystemProviderErrorCode, FileType, IFileWriteOptions, IFileSystemProviderWithFileReadStreamCapability, IFileSystemProviderWithFileReadWriteCapability, IStat, IWatchOptions } from '../common/files.js';
+import { WebFileSystemAccess } from './webFileSystemAccess.js';
+import { IndexedDB } from '../../../base/browser/indexedDB.js';
+import { ILogService } from '../../log/common/log.js';
 
 export class HTMLFileSystemProvider implements IFileSystemProviderWithFileReadWriteCapability, IFileSystemProviderWithFileReadStreamCapability {
 
diff --git a/src/vs/platform/files/browser/indexedDBFileSystemProvider.ts b/src/vs/platform/files/browser/indexedDBFileSystemProvider.ts
index a83c046c715..d2b0da2e857 100644
--- a/src/vs/platform/files/browser/indexedDBFileSystemProvider.ts
+++ b/src/vs/platform/files/browser/indexedDBFileSystemProvider.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Throttler } from 'vs/base/common/async';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { ExtUri } from 'vs/base/common/resources';
-import { isString } from 'vs/base/common/types';
-import { URI, UriDto } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { createFileSystemProviderError, FileChangeType, IFileDeleteOptions, IFileOverwriteOptions, FileSystemProviderCapabilities, FileSystemProviderError, FileSystemProviderErrorCode, FileType, IFileWriteOptions, IFileChange, IFileSystemProviderWithFileReadWriteCapability, IStat, IWatchOptions } from 'vs/platform/files/common/files';
-import { DBClosedError, IndexedDB } from 'vs/base/browser/indexedDB';
-import { BroadcastDataChannel } from 'vs/base/browser/broadcast';
+import { Throttler } from '../../../base/common/async.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../base/common/lifecycle.js';
+import { ExtUri } from '../../../base/common/resources.js';
+import { isString } from '../../../base/common/types.js';
+import { URI, UriDto } from '../../../base/common/uri.js';
+import { localize } from '../../../nls.js';
+import { createFileSystemProviderError, FileChangeType, IFileDeleteOptions, IFileOverwriteOptions, FileSystemProviderCapabilities, FileSystemProviderError, FileSystemProviderErrorCode, FileType, IFileWriteOptions, IFileChange, IFileSystemProviderWithFileReadWriteCapability, IStat, IWatchOptions } from '../common/files.js';
+import { DBClosedError, IndexedDB } from '../../../base/browser/indexedDB.js';
+import { BroadcastDataChannel } from '../../../base/browser/broadcast.js';
 
 export type IndexedDBFileSystemProviderErrorDataClassification = {
 	owner: 'sandy081';
diff --git a/src/vs/platform/files/common/diskFileSystemProvider.ts b/src/vs/platform/files/common/diskFileSystemProvider.ts
index 8e5d9e45e48..ab382fef438 100644
--- a/src/vs/platform/files/common/diskFileSystemProvider.ts
+++ b/src/vs/platform/files/common/diskFileSystemProvider.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { insert } from 'vs/base/common/arrays';
-import { ThrottledDelayer } from 'vs/base/common/async';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Emitter } from 'vs/base/common/event';
-import { removeTrailingPathSeparator } from 'vs/base/common/extpath';
-import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { normalize } from 'vs/base/common/path';
-import { URI } from 'vs/base/common/uri';
-import { IFileChange, IFileSystemProvider, IWatchOptions } from 'vs/platform/files/common/files';
-import { AbstractNonRecursiveWatcherClient, AbstractUniversalWatcherClient, ILogMessage, INonRecursiveWatchRequest, IRecursiveWatcherOptions, isRecursiveWatchRequest, IUniversalWatchRequest, reviveFileChanges } from 'vs/platform/files/common/watcher';
-import { ILogService, LogLevel } from 'vs/platform/log/common/log';
+import { insert } from '../../../base/common/arrays.js';
+import { ThrottledDelayer } from '../../../base/common/async.js';
+import { onUnexpectedError } from '../../../base/common/errors.js';
+import { Emitter } from '../../../base/common/event.js';
+import { removeTrailingPathSeparator } from '../../../base/common/extpath.js';
+import { Disposable, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { normalize } from '../../../base/common/path.js';
+import { URI } from '../../../base/common/uri.js';
+import { IFileChange, IFileSystemProvider, IWatchOptions } from './files.js';
+import { AbstractNonRecursiveWatcherClient, AbstractUniversalWatcherClient, ILogMessage, INonRecursiveWatchRequest, IRecursiveWatcherOptions, isRecursiveWatchRequest, IUniversalWatchRequest, reviveFileChanges } from './watcher.js';
+import { ILogService, LogLevel } from '../../log/common/log.js';
 
 export interface IDiskFileSystemProviderOptions {
 	watcher?: {
@@ -71,16 +71,7 @@ export abstract class AbstractDiskFileSystemProvider extends Disposable implemen
 	private readonly universalWatchRequestDelayer = this._register(new ThrottledDelayer<void>(0));
 
 	private watchUniversal(resource: URI, opts: IWatchOptions): IDisposable {
-
-		// Add to list of paths to watch universally
-		const request: IUniversalWatchRequest = {
-			path: this.toWatchPath(resource),
-			excludes: opts.excludes,
-			includes: opts.includes,
-			recursive: opts.recursive,
-			filter: opts.filter,
-			correlationId: opts.correlationId
-		};
+		const request = this.toWatchRequest(resource, opts);
 		const remove = insert(this.universalWatchRequests, request);
 
 		// Trigger update
@@ -96,6 +87,32 @@ export abstract class AbstractDiskFileSystemProvider extends Disposable implemen
 		});
 	}
 
+	private toWatchRequest(resource: URI, opts: IWatchOptions): IUniversalWatchRequest {
+		const request: IUniversalWatchRequest = {
+			path: this.toWatchPath(resource),
+			excludes: opts.excludes,
+			includes: opts.includes,
+			recursive: opts.recursive,
+			filter: opts.filter,
+			correlationId: opts.correlationId
+		};
+
+		if (isRecursiveWatchRequest(request)) {
+
+			// Adjust for polling
+			const usePolling = this.options?.watcher?.recursive?.usePolling;
+			if (usePolling === true) {
+				request.pollingInterval = this.options?.watcher?.recursive?.pollingInterval ?? 5000;
+			} else if (Array.isArray(usePolling)) {
+				if (usePolling.includes(request.path)) {
+					request.pollingInterval = this.options?.watcher?.recursive?.pollingInterval ?? 5000;
+				}
+			}
+		}
+
+		return request;
+	}
+
 	private refreshUniversalWatchers(): void {
 
 		// Buffer requests for universal watching to decide on right watcher
@@ -121,24 +138,6 @@ export abstract class AbstractDiskFileSystemProvider extends Disposable implemen
 			}));
 		}
 
-		// Adjust for polling
-		const usePolling = this.options?.watcher?.recursive?.usePolling;
-		if (usePolling === true) {
-			for (const request of this.universalWatchRequests) {
-				if (isRecursiveWatchRequest(request)) {
-					request.pollingInterval = this.options?.watcher?.recursive?.pollingInterval ?? 5000;
-				}
-			}
-		} else if (Array.isArray(usePolling)) {
-			for (const request of this.universalWatchRequests) {
-				if (isRecursiveWatchRequest(request)) {
-					if (usePolling.includes(request.path)) {
-						request.pollingInterval = this.options?.watcher?.recursive?.pollingInterval ?? 5000;
-					}
-				}
-			}
-		}
-
 		// Ask to watch the provided paths
 		return this.universalWatcher.watch(this.universalWatchRequests);
 	}
diff --git a/src/vs/platform/files/common/diskFileSystemProviderClient.ts b/src/vs/platform/files/common/diskFileSystemProviderClient.ts
index d7f38517446..9bd3dcb353b 100644
--- a/src/vs/platform/files/common/diskFileSystemProviderClient.ts
+++ b/src/vs/platform/files/common/diskFileSystemProviderClient.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { canceled } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { newWriteableStream, ReadableStreamEventPayload, ReadableStreamEvents } from 'vs/base/common/stream';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { IChannel } from 'vs/base/parts/ipc/common/ipc';
-import { createFileSystemProviderError, IFileAtomicReadOptions, IFileDeleteOptions, IFileOpenOptions, IFileOverwriteOptions, IFileReadStreamOptions, FileSystemProviderCapabilities, FileSystemProviderErrorCode, FileType, IFileWriteOptions, IFileChange, IFileSystemProviderWithFileAtomicReadCapability, IFileSystemProviderWithFileCloneCapability, IFileSystemProviderWithFileFolderCopyCapability, IFileSystemProviderWithFileReadStreamCapability, IFileSystemProviderWithFileReadWriteCapability, IFileSystemProviderWithOpenReadWriteCloseCapability, IStat, IWatchOptions, IFileSystemProviderError } from 'vs/platform/files/common/files';
-import { reviveFileChanges } from 'vs/platform/files/common/watcher';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { toErrorMessage } from '../../../base/common/errorMessage.js';
+import { canceled } from '../../../base/common/errors.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { newWriteableStream, ReadableStreamEventPayload, ReadableStreamEvents } from '../../../base/common/stream.js';
+import { URI } from '../../../base/common/uri.js';
+import { generateUuid } from '../../../base/common/uuid.js';
+import { IChannel } from '../../../base/parts/ipc/common/ipc.js';
+import { createFileSystemProviderError, IFileAtomicReadOptions, IFileDeleteOptions, IFileOpenOptions, IFileOverwriteOptions, IFileReadStreamOptions, FileSystemProviderCapabilities, FileSystemProviderErrorCode, FileType, IFileWriteOptions, IFileChange, IFileSystemProviderWithFileAtomicReadCapability, IFileSystemProviderWithFileCloneCapability, IFileSystemProviderWithFileFolderCopyCapability, IFileSystemProviderWithFileReadStreamCapability, IFileSystemProviderWithFileReadWriteCapability, IFileSystemProviderWithOpenReadWriteCloseCapability, IStat, IWatchOptions, IFileSystemProviderError } from './files.js';
+import { reviveFileChanges } from './watcher.js';
 
 export const LOCAL_FILE_SYSTEM_CHANNEL_NAME = 'localFilesystem';
 
diff --git a/src/vs/platform/files/common/fileService.ts b/src/vs/platform/files/common/fileService.ts
index b353968540e..2c0bfe1369c 100644
--- a/src/vs/platform/files/common/fileService.ts
+++ b/src/vs/platform/files/common/fileService.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { coalesce } from 'vs/base/common/arrays';
-import { Promises, ResourceQueue } from 'vs/base/common/async';
-import { bufferedStreamToBuffer, bufferToReadable, newWriteableBufferStream, readableToBuffer, streamToBuffer, VSBuffer, VSBufferReadable, VSBufferReadableBufferedStream, VSBufferReadableStream } from 'vs/base/common/buffer';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Emitter } from 'vs/base/common/event';
-import { hash } from 'vs/base/common/hash';
-import { Iterable } from 'vs/base/common/iterator';
-import { Disposable, DisposableStore, dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { TernarySearchTree } from 'vs/base/common/ternarySearchTree';
-import { Schemas } from 'vs/base/common/network';
-import { mark } from 'vs/base/common/performance';
-import { extUri, extUriIgnorePathCase, IExtUri, isAbsolutePath } from 'vs/base/common/resources';
-import { consumeStream, isReadableBufferedStream, isReadableStream, listenStream, newWriteableStream, peekReadable, peekStream, transform } from 'vs/base/common/stream';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { ensureFileSystemProviderError, etag, ETAG_DISABLED, FileChangesEvent, IFileDeleteOptions, FileOperation, FileOperationError, FileOperationEvent, FileOperationResult, FilePermission, FileSystemProviderCapabilities, FileSystemProviderErrorCode, FileType, hasFileAtomicReadCapability, hasFileFolderCopyCapability, hasFileReadStreamCapability, hasOpenReadWriteCloseCapability, hasReadWriteCapability, ICreateFileOptions, IFileContent, IFileService, IFileStat, IFileStatWithMetadata, IFileStreamContent, IFileSystemProvider, IFileSystemProviderActivationEvent, IFileSystemProviderCapabilitiesChangeEvent, IFileSystemProviderRegistrationEvent, IFileSystemProviderWithFileAtomicReadCapability, IFileSystemProviderWithFileReadStreamCapability, IFileSystemProviderWithFileReadWriteCapability, IFileSystemProviderWithOpenReadWriteCloseCapability, IReadFileOptions, IReadFileStreamOptions, IResolveFileOptions, IFileStatResult, IFileStatResultWithMetadata, IResolveMetadataFileOptions, IStat, IFileStatWithPartialMetadata, IWatchOptions, IWriteFileOptions, NotModifiedSinceFileOperationError, toFileOperationResult, toFileSystemProviderErrorCode, hasFileCloneCapability, TooLargeFileOperationError, hasFileAtomicDeleteCapability, hasFileAtomicWriteCapability, IWatchOptionsWithCorrelation, IFileSystemWatcher, IWatchOptionsWithoutCorrelation } from 'vs/platform/files/common/files';
-import { readFileIntoStream } from 'vs/platform/files/common/io';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ErrorNoTelemetry } from 'vs/base/common/errors';
+import { coalesce } from '../../../base/common/arrays.js';
+import { Promises, ResourceQueue } from '../../../base/common/async.js';
+import { bufferedStreamToBuffer, bufferToReadable, newWriteableBufferStream, readableToBuffer, streamToBuffer, VSBuffer, VSBufferReadable, VSBufferReadableBufferedStream, VSBufferReadableStream } from '../../../base/common/buffer.js';
+import { CancellationToken, CancellationTokenSource } from '../../../base/common/cancellation.js';
+import { Emitter } from '../../../base/common/event.js';
+import { hash } from '../../../base/common/hash.js';
+import { Iterable } from '../../../base/common/iterator.js';
+import { Disposable, DisposableStore, dispose, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { TernarySearchTree } from '../../../base/common/ternarySearchTree.js';
+import { Schemas } from '../../../base/common/network.js';
+import { mark } from '../../../base/common/performance.js';
+import { extUri, extUriIgnorePathCase, IExtUri, isAbsolutePath } from '../../../base/common/resources.js';
+import { consumeStream, isReadableBufferedStream, isReadableStream, listenStream, newWriteableStream, peekReadable, peekStream, transform } from '../../../base/common/stream.js';
+import { URI } from '../../../base/common/uri.js';
+import { localize } from '../../../nls.js';
+import { ensureFileSystemProviderError, etag, ETAG_DISABLED, FileChangesEvent, IFileDeleteOptions, FileOperation, FileOperationError, FileOperationEvent, FileOperationResult, FilePermission, FileSystemProviderCapabilities, FileSystemProviderErrorCode, FileType, hasFileAtomicReadCapability, hasFileFolderCopyCapability, hasFileReadStreamCapability, hasOpenReadWriteCloseCapability, hasReadWriteCapability, ICreateFileOptions, IFileContent, IFileService, IFileStat, IFileStatWithMetadata, IFileStreamContent, IFileSystemProvider, IFileSystemProviderActivationEvent, IFileSystemProviderCapabilitiesChangeEvent, IFileSystemProviderRegistrationEvent, IFileSystemProviderWithFileAtomicReadCapability, IFileSystemProviderWithFileReadStreamCapability, IFileSystemProviderWithFileReadWriteCapability, IFileSystemProviderWithOpenReadWriteCloseCapability, IReadFileOptions, IReadFileStreamOptions, IResolveFileOptions, IFileStatResult, IFileStatResultWithMetadata, IResolveMetadataFileOptions, IStat, IFileStatWithPartialMetadata, IWatchOptions, IWriteFileOptions, NotModifiedSinceFileOperationError, toFileOperationResult, toFileSystemProviderErrorCode, hasFileCloneCapability, TooLargeFileOperationError, hasFileAtomicDeleteCapability, hasFileAtomicWriteCapability, IWatchOptionsWithCorrelation, IFileSystemWatcher, IWatchOptionsWithoutCorrelation } from './files.js';
+import { readFileIntoStream } from './io.js';
+import { ILogService } from '../../log/common/log.js';
+import { ErrorNoTelemetry } from '../../../base/common/errors.js';
 
 export class FileService extends Disposable implements IFileService {
 
diff --git a/src/vs/platform/files/common/files.ts b/src/vs/platform/files/common/files.ts
index 290a991a35d..b1bc8113abf 100644
--- a/src/vs/platform/files/common/files.ts
+++ b/src/vs/platform/files/common/files.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer, VSBufferReadable, VSBufferReadableStream } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Event } from 'vs/base/common/event';
-import { IExpression, IRelativePattern } from 'vs/base/common/glob';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { TernarySearchTree } from 'vs/base/common/ternarySearchTree';
-import { sep } from 'vs/base/common/path';
-import { ReadableStreamEvents } from 'vs/base/common/stream';
-import { startsWithIgnoreCase } from 'vs/base/common/strings';
-import { isNumber } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { isWeb } from 'vs/base/common/platform';
-import { Schemas } from 'vs/base/common/network';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { Lazy } from 'vs/base/common/lazy';
+import { VSBuffer, VSBufferReadable, VSBufferReadableStream } from '../../../base/common/buffer.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Event } from '../../../base/common/event.js';
+import { IExpression, IRelativePattern } from '../../../base/common/glob.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { TernarySearchTree } from '../../../base/common/ternarySearchTree.js';
+import { sep } from '../../../base/common/path.js';
+import { ReadableStreamEvents } from '../../../base/common/stream.js';
+import { startsWithIgnoreCase } from '../../../base/common/strings.js';
+import { isNumber } from '../../../base/common/types.js';
+import { URI } from '../../../base/common/uri.js';
+import { localize } from '../../../nls.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { isWeb } from '../../../base/common/platform.js';
+import { Schemas } from '../../../base/common/network.js';
+import { IMarkdownString } from '../../../base/common/htmlContent.js';
+import { Lazy } from '../../../base/common/lazy.js';
 
 //#region file service & providers
 
@@ -1460,7 +1460,7 @@ export interface IGlobPatterns {
 }
 
 export interface IFilesConfiguration {
-	files: IFilesConfigurationNode;
+	files?: IFilesConfigurationNode;
 }
 
 export interface IFilesConfigurationNode {
diff --git a/src/vs/platform/files/common/inMemoryFilesystemProvider.ts b/src/vs/platform/files/common/inMemoryFilesystemProvider.ts
index f875c3be628..ecdebd131bc 100644
--- a/src/vs/platform/files/common/inMemoryFilesystemProvider.ts
+++ b/src/vs/platform/files/common/inMemoryFilesystemProvider.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import * as resources from 'vs/base/common/resources';
-import { ReadableStreamEvents, newWriteableStream } from 'vs/base/common/stream';
-import { URI } from 'vs/base/common/uri';
-import { FileChangeType, IFileDeleteOptions, IFileOverwriteOptions, FileSystemProviderCapabilities, FileSystemProviderErrorCode, FileType, IFileWriteOptions, IFileChange, IFileSystemProviderWithFileReadWriteCapability, IStat, IWatchOptions, createFileSystemProviderError, IFileSystemProviderWithOpenReadWriteCloseCapability, IFileOpenOptions, IFileSystemProviderWithFileAtomicDeleteCapability, IFileSystemProviderWithFileAtomicReadCapability, IFileSystemProviderWithFileAtomicWriteCapability, IFileSystemProviderWithFileReadStreamCapability } from 'vs/platform/files/common/files';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../base/common/lifecycle.js';
+import * as resources from '../../../base/common/resources.js';
+import { ReadableStreamEvents, newWriteableStream } from '../../../base/common/stream.js';
+import { URI } from '../../../base/common/uri.js';
+import { FileChangeType, IFileDeleteOptions, IFileOverwriteOptions, FileSystemProviderCapabilities, FileSystemProviderErrorCode, FileType, IFileWriteOptions, IFileChange, IFileSystemProviderWithFileReadWriteCapability, IStat, IWatchOptions, createFileSystemProviderError, IFileSystemProviderWithOpenReadWriteCloseCapability, IFileOpenOptions, IFileSystemProviderWithFileAtomicDeleteCapability, IFileSystemProviderWithFileAtomicReadCapability, IFileSystemProviderWithFileAtomicWriteCapability, IFileSystemProviderWithFileReadStreamCapability } from './files.js';
 
 class File implements IStat {
 
diff --git a/src/vs/platform/files/common/io.ts b/src/vs/platform/files/common/io.ts
index b37b7a91fb5..cb3f3a54b4f 100644
--- a/src/vs/platform/files/common/io.ts
+++ b/src/vs/platform/files/common/io.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { canceled } from 'vs/base/common/errors';
-import { IDataTransformer, IErrorTransformer, WriteableStream } from 'vs/base/common/stream';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { createFileSystemProviderError, ensureFileSystemProviderError, IFileReadStreamOptions, FileSystemProviderErrorCode, IFileSystemProviderWithOpenReadWriteCloseCapability } from 'vs/platform/files/common/files';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { canceled } from '../../../base/common/errors.js';
+import { IDataTransformer, IErrorTransformer, WriteableStream } from '../../../base/common/stream.js';
+import { URI } from '../../../base/common/uri.js';
+import { localize } from '../../../nls.js';
+import { createFileSystemProviderError, ensureFileSystemProviderError, IFileReadStreamOptions, FileSystemProviderErrorCode, IFileSystemProviderWithOpenReadWriteCloseCapability } from './files.js';
 
 export interface ICreateReadStreamOptions extends IFileReadStreamOptions {
 
diff --git a/src/vs/platform/files/common/watcher.ts b/src/vs/platform/files/common/watcher.ts
index 05ff156de89..ff0fd505d18 100644
--- a/src/vs/platform/files/common/watcher.ts
+++ b/src/vs/platform/files/common/watcher.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { GLOBSTAR, IRelativePattern, parse, ParsedPattern } from 'vs/base/common/glob';
-import { Disposable, DisposableStore, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { isAbsolute } from 'vs/base/common/path';
-import { isLinux } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { FileChangeFilter, FileChangeType, IFileChange, isParent } from 'vs/platform/files/common/files';
+import { Event } from '../../../base/common/event.js';
+import { GLOBSTAR, IRelativePattern, parse, ParsedPattern } from '../../../base/common/glob.js';
+import { Disposable, DisposableStore, IDisposable, MutableDisposable } from '../../../base/common/lifecycle.js';
+import { isAbsolute } from '../../../base/common/path.js';
+import { isLinux } from '../../../base/common/platform.js';
+import { URI } from '../../../base/common/uri.js';
+import { FileChangeFilter, FileChangeType, IFileChange, isParent } from './files.js';
 
 interface IWatchRequest {
 
@@ -181,16 +181,14 @@ export interface IUniversalWatcher extends IWatcher {
 
 export abstract class AbstractWatcherClient extends Disposable {
 
-	private static readonly MAX_RESTARTS_PER_REQUEST_ERROR = 3;  // how often we give a request a chance to restart on error
-	private static readonly MAX_RESTARTS_PER_UNKNOWN_ERROR = 10; // how often we give the watcher a chance to restart on unknown errors (like crash)
+	private static readonly MAX_RESTARTS = 5;
 
 	private watcher: IWatcher | undefined;
 	private readonly watcherDisposables = this._register(new MutableDisposable());
 
 	private requests: IWatchRequest[] | undefined = undefined;
 
-	private restartsPerRequestError = new Map<string /* request path */, number /* restarts */>();
-	private restartsPerUnknownError = 0;
+	private restartCounter = 0;
 
 	constructor(
 		private readonly onFileChanges: (changes: IFileChange[]) => void,
@@ -224,41 +222,51 @@ export abstract class AbstractWatcherClient extends Disposable {
 
 	protected onError(error: string, failedRequest?: IUniversalWatchRequest): void {
 
-		// Restart on error (up to N times, if enabled)
-		if (this.options.restartOnError && this.requests?.length) {
-
-			// A request failed
-			if (failedRequest) {
-				const restartsPerRequestError = this.restartsPerRequestError.get(failedRequest.path) ?? 0;
-				if (restartsPerRequestError < AbstractWatcherClient.MAX_RESTARTS_PER_REQUEST_ERROR) {
-					this.error(`restarting watcher from error in watch request (retrying request): ${error} (${JSON.stringify(failedRequest)})`);
-					this.restartsPerRequestError.set(failedRequest.path, restartsPerRequestError + 1);
-					this.restart(this.requests);
-				} else {
-					this.error(`restarting watcher from error in watch request (skipping request): ${error} (${JSON.stringify(failedRequest)})`);
-					this.restart(this.requests.filter(request => request.path !== failedRequest.path));
-				}
-			}
-
-			// Any request failed or process crashed
-			else {
-				if (this.restartsPerUnknownError < AbstractWatcherClient.MAX_RESTARTS_PER_UNKNOWN_ERROR) {
-					this.error(`restarting watcher after unknown global error: ${error}`);
-					this.restartsPerUnknownError++;
-					this.restart(this.requests);
-				} else {
-					this.error(`giving up attempting to restart watcher after error: ${error}`);
-				}
+		// Restart on error (up to N times, if possible)
+		if (this.canRestart(error, failedRequest)) {
+			if (this.restartCounter < AbstractWatcherClient.MAX_RESTARTS && this.requests) {
+				this.error(`restarting watcher after unexpected error: ${error}`);
+				this.restart(this.requests);
+			} else {
+				this.error(`gave up attempting to restart watcher after unexpected error: ${error}`);
 			}
 		}
 
-		// Do not attempt to restart if not enabled
+		// Do not attempt to restart otherwise, report the error
 		else {
 			this.error(error);
 		}
 	}
 
+	private canRestart(error: string, failedRequest?: IUniversalWatchRequest): boolean {
+		if (!this.options.restartOnError) {
+			return false; // disabled by options
+		}
+
+		if (failedRequest) {
+			// do not treat a failing request as a reason to restart the entire
+			// watcher. it is possible that from a large amount of watch requests
+			// some fail and we would constantly restart all requests only because
+			// of that. rather, continue the watcher and leave the failed request
+			return false;
+		}
+
+		if (
+			error.indexOf('No space left on device') !== -1 ||
+			error.indexOf('EMFILE') !== -1
+		) {
+			// do not restart when the error indicates that the system is running
+			// out of handles for file watching. this is not recoverable anyway
+			// and needs changes to the system before continuing
+			return false;
+		}
+
+		return true;
+	}
+
 	private restart(requests: IUniversalWatchRequest[]): void {
+		this.restartCounter++;
+
 		this.init();
 		this.watch(requests);
 	}
diff --git a/src/vs/platform/files/electron-main/diskFileSystemProviderServer.ts b/src/vs/platform/files/electron-main/diskFileSystemProviderServer.ts
index 64cbede2fd1..649a620f7a9 100644
--- a/src/vs/platform/files/electron-main/diskFileSystemProviderServer.ts
+++ b/src/vs/platform/files/electron-main/diskFileSystemProviderServer.ts
@@ -4,19 +4,19 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { shell } from 'electron';
-import { localize } from 'vs/nls';
-import { isWindows } from 'vs/base/common/platform';
-import { Emitter } from 'vs/base/common/event';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { IFileDeleteOptions, IFileChange, IWatchOptions, createFileSystemProviderError, FileSystemProviderErrorCode } from 'vs/platform/files/common/files';
-import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
-import { basename, normalize } from 'vs/base/common/path';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { ILogService } from 'vs/platform/log/common/log';
-import { AbstractDiskFileSystemProviderChannel, AbstractSessionFileWatcher, ISessionFileWatcher } from 'vs/platform/files/node/diskFileSystemProviderServer';
-import { DefaultURITransformer, IURITransformer } from 'vs/base/common/uriIpc';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
+import { localize } from '../../../nls.js';
+import { isWindows } from '../../../base/common/platform.js';
+import { Emitter } from '../../../base/common/event.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { IFileDeleteOptions, IFileChange, IWatchOptions, createFileSystemProviderError, FileSystemProviderErrorCode } from '../common/files.js';
+import { DiskFileSystemProvider } from '../node/diskFileSystemProvider.js';
+import { basename, normalize } from '../../../base/common/path.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { ILogService } from '../../log/common/log.js';
+import { AbstractDiskFileSystemProviderChannel, AbstractSessionFileWatcher, ISessionFileWatcher } from '../node/diskFileSystemProviderServer.js';
+import { DefaultURITransformer, IURITransformer } from '../../../base/common/uriIpc.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { toErrorMessage } from '../../../base/common/errorMessage.js';
 
 export class DiskFileSystemProviderChannel extends AbstractDiskFileSystemProviderChannel<unknown> {
 
diff --git a/src/vs/platform/files/node/diskFileSystemProvider.ts b/src/vs/platform/files/node/diskFileSystemProvider.ts
index 5e923bdfab5..4586709dd2c 100644
--- a/src/vs/platform/files/node/diskFileSystemProvider.ts
+++ b/src/vs/platform/files/node/diskFileSystemProvider.ts
@@ -3,28 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Stats } from 'fs';
-import { Barrier, retry } from 'vs/base/common/async';
-import { ResourceMap } from 'vs/base/common/map';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Event } from 'vs/base/common/event';
-import { isEqual } from 'vs/base/common/extpath';
-import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { basename, dirname, join } from 'vs/base/common/path';
-import { isLinux, isWindows } from 'vs/base/common/platform';
-import { extUriBiasedIgnorePathCase, joinPath, basename as resourcesBasename, dirname as resourcesDirname } from 'vs/base/common/resources';
-import { newWriteableStream, ReadableStreamEvents } from 'vs/base/common/stream';
-import { URI } from 'vs/base/common/uri';
-import { IDirent, Promises, RimRafMode, SymlinkSupport } from 'vs/base/node/pfs';
-import { localize } from 'vs/nls';
-import { createFileSystemProviderError, IFileAtomicReadOptions, IFileDeleteOptions, IFileOpenOptions, IFileOverwriteOptions, IFileReadStreamOptions, FileSystemProviderCapabilities, FileSystemProviderError, FileSystemProviderErrorCode, FileType, IFileWriteOptions, IFileSystemProviderWithFileAtomicReadCapability, IFileSystemProviderWithFileCloneCapability, IFileSystemProviderWithFileFolderCopyCapability, IFileSystemProviderWithFileReadStreamCapability, IFileSystemProviderWithFileReadWriteCapability, IFileSystemProviderWithOpenReadWriteCloseCapability, isFileOpenForWriteOptions, IStat, FilePermission, IFileSystemProviderWithFileAtomicWriteCapability, IFileSystemProviderWithFileAtomicDeleteCapability, IFileChange } from 'vs/platform/files/common/files';
-import { readFileIntoStream } from 'vs/platform/files/common/io';
-import { AbstractNonRecursiveWatcherClient, AbstractUniversalWatcherClient, ILogMessage } from 'vs/platform/files/common/watcher';
-import { ILogService } from 'vs/platform/log/common/log';
-import { AbstractDiskFileSystemProvider, IDiskFileSystemProviderOptions } from 'vs/platform/files/common/diskFileSystemProvider';
-import { UniversalWatcherClient } from 'vs/platform/files/node/watcher/watcherClient';
-import { NodeJSWatcherClient } from 'vs/platform/files/node/watcher/nodejs/nodejsClient';
+import { Stats, promises } from 'fs';
+import { Barrier, retry } from '../../../base/common/async.js';
+import { ResourceMap } from '../../../base/common/map.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Event } from '../../../base/common/event.js';
+import { isEqual } from '../../../base/common/extpath.js';
+import { DisposableStore, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { basename, dirname, join } from '../../../base/common/path.js';
+import { isLinux, isWindows } from '../../../base/common/platform.js';
+import { extUriBiasedIgnorePathCase, joinPath, basename as resourcesBasename, dirname as resourcesDirname } from '../../../base/common/resources.js';
+import { newWriteableStream, ReadableStreamEvents } from '../../../base/common/stream.js';
+import { URI } from '../../../base/common/uri.js';
+import { IDirent, Promises, RimRafMode, SymlinkSupport } from '../../../base/node/pfs.js';
+import { localize } from '../../../nls.js';
+import { createFileSystemProviderError, IFileAtomicReadOptions, IFileDeleteOptions, IFileOpenOptions, IFileOverwriteOptions, IFileReadStreamOptions, FileSystemProviderCapabilities, FileSystemProviderError, FileSystemProviderErrorCode, FileType, IFileWriteOptions, IFileSystemProviderWithFileAtomicReadCapability, IFileSystemProviderWithFileCloneCapability, IFileSystemProviderWithFileFolderCopyCapability, IFileSystemProviderWithFileReadStreamCapability, IFileSystemProviderWithFileReadWriteCapability, IFileSystemProviderWithOpenReadWriteCloseCapability, isFileOpenForWriteOptions, IStat, FilePermission, IFileSystemProviderWithFileAtomicWriteCapability, IFileSystemProviderWithFileAtomicDeleteCapability, IFileChange } from '../common/files.js';
+import { readFileIntoStream } from '../common/io.js';
+import { AbstractNonRecursiveWatcherClient, AbstractUniversalWatcherClient, ILogMessage } from '../common/watcher.js';
+import { ILogService } from '../../log/common/log.js';
+import { AbstractDiskFileSystemProvider, IDiskFileSystemProviderOptions } from '../common/diskFileSystemProvider.js';
+import { UniversalWatcherClient } from './watcher/watcherClient.js';
+import { NodeJSWatcherClient } from './watcher/nodejs/nodejsClient.js';
 
 export class DiskFileSystemProvider extends AbstractDiskFileSystemProvider implements
 	IFileSystemProviderWithFileReadWriteCapability,
@@ -203,7 +203,7 @@ export class DiskFileSystemProvider extends AbstractDiskFileSystemProvider imple
 
 			const filePath = this.toFilePath(resource);
 
-			return await Promises.readFile(filePath);
+			return await promises.readFile(filePath);
 		} catch (error) {
 			throw this.toFileSystemProviderError(error);
 		} finally {
@@ -354,7 +354,7 @@ export class DiskFileSystemProvider extends AbstractDiskFileSystemProvider imple
 				try {
 					const { stat } = await SymlinkSupport.stat(filePath);
 					if (!(stat.mode & 0o200 /* File mode indicating writable by owner */)) {
-						await Promises.chmod(filePath, stat.mode | 0o200);
+						await promises.chmod(filePath, stat.mode | 0o200);
 					}
 				} catch (error) {
 					if (error.code !== 'ENOENT') {
@@ -373,7 +373,7 @@ export class DiskFileSystemProvider extends AbstractDiskFileSystemProvider imple
 						// by first truncating the file and then writing with r+ flag. This helps to save hidden files on Windows
 						// (see https://github.com/microsoft/vscode/issues/931) and prevent removing alternate data streams
 						// (see https://github.com/microsoft/vscode/issues/6363)
-						await Promises.truncate(filePath, 0);
+						await promises.truncate(filePath, 0);
 
 						// After a successful truncate() the flag can be set to 'r+' which will not truncate.
 						flags = 'r+';
@@ -595,7 +595,7 @@ export class DiskFileSystemProvider extends AbstractDiskFileSystemProvider imple
 
 	async mkdir(resource: URI): Promise<void> {
 		try {
-			await Promises.mkdir(this.toFilePath(resource));
+			await promises.mkdir(this.toFilePath(resource));
 		} catch (error) {
 			throw this.toFileSystemProviderError(error);
 		}
@@ -613,7 +613,7 @@ export class DiskFileSystemProvider extends AbstractDiskFileSystemProvider imple
 				await Promises.rm(filePath, RimRafMode.MOVE, rmMoveToPath);
 			} else {
 				try {
-					await Promises.unlink(filePath);
+					await promises.unlink(filePath);
 				} catch (unlinkError) {
 
 					// `fs.unlink` will throw when used on directories
@@ -631,7 +631,7 @@ export class DiskFileSystemProvider extends AbstractDiskFileSystemProvider imple
 						}
 
 						if (isDirectory) {
-							await Promises.rmdir(filePath);
+							await promises.rmdir(filePath);
 						} else {
 							throw unlinkError;
 						}
@@ -778,10 +778,10 @@ export class DiskFileSystemProvider extends AbstractDiskFileSystemProvider imple
 			locks.add(await this.createResourceLock(to));
 
 			if (mkdir) {
-				await Promises.mkdir(dirname(toFilePath), { recursive: true });
+				await promises.mkdir(dirname(toFilePath), { recursive: true });
 			}
 
-			await Promises.copyFile(fromFilePath, toFilePath);
+			await promises.copyFile(fromFilePath, toFilePath);
 		} catch (error) {
 			if (error.code === 'ENOENT' && !mkdir) {
 				return this.doCloneFile(from, to, true);
diff --git a/src/vs/platform/files/node/diskFileSystemProviderServer.ts b/src/vs/platform/files/node/diskFileSystemProviderServer.ts
index a6407715b10..d626904949e 100644
--- a/src/vs/platform/files/node/diskFileSystemProviderServer.ts
+++ b/src/vs/platform/files/node/diskFileSystemProviderServer.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { IServerChannel } from 'vs/base/parts/ipc/common/ipc';
-import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
-import { Disposable, dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IURITransformer } from 'vs/base/common/uriIpc';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { ReadableStreamEventPayload, listenStream } from 'vs/base/common/stream';
-import { IStat, IFileReadStreamOptions, IFileWriteOptions, IFileOpenOptions, IFileDeleteOptions, IFileOverwriteOptions, IFileChange, IWatchOptions, FileType, IFileAtomicReadOptions } from 'vs/platform/files/common/files';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { IRecursiveWatcherOptions } from 'vs/platform/files/common/watcher';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { IServerChannel } from '../../../base/parts/ipc/common/ipc.js';
+import { DiskFileSystemProvider } from './diskFileSystemProvider.js';
+import { Disposable, dispose, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { ILogService } from '../../log/common/log.js';
+import { IURITransformer } from '../../../base/common/uriIpc.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { ReadableStreamEventPayload, listenStream } from '../../../base/common/stream.js';
+import { IStat, IFileReadStreamOptions, IFileWriteOptions, IFileOpenOptions, IFileDeleteOptions, IFileOverwriteOptions, IFileChange, IWatchOptions, FileType, IFileAtomicReadOptions } from '../common/files.js';
+import { CancellationTokenSource } from '../../../base/common/cancellation.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { IRecursiveWatcherOptions } from '../common/watcher.js';
 
 export interface ISessionFileWatcher extends IDisposable {
 	watch(req: number, resource: URI, opts: IWatchOptions): IDisposable;
@@ -272,7 +272,7 @@ export abstract class AbstractSessionFileWatcher extends Disposable implements I
 	// This is important because we want to ensure that we only
 	// forward events from the watched paths for this session and
 	// not other clients that asked to watch other paths.
-	private readonly fileWatcher = this._register(new DiskFileSystemProvider(this.logService, { watcher: { recursive: this.getRecursiveWatcherOptions(this.environmentService) } }));
+	private readonly fileWatcher = this._register(new DiskFileSystemProvider(this.logService));
 
 	constructor(
 		private readonly uriTransformer: IURITransformer,
diff --git a/src/vs/platform/files/node/watcher/baseWatcher.ts b/src/vs/platform/files/node/watcher/baseWatcher.ts
index 3576f20d4f7..b1e83957900 100644
--- a/src/vs/platform/files/node/watcher/baseWatcher.ts
+++ b/src/vs/platform/files/node/watcher/baseWatcher.ts
@@ -4,12 +4,20 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { watchFile, unwatchFile, Stats } from 'fs';
-import { Disposable, DisposableMap, DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { ILogMessage, IRecursiveWatcherWithSubscribe, IUniversalWatchRequest, IWatchRequestWithCorrelation, IWatcher, IWatcherErrorEvent, isWatchRequestWithCorrelation, requestFilterToString } from 'vs/platform/files/common/watcher';
-import { Emitter, Event } from 'vs/base/common/event';
-import { FileChangeType, IFileChange } from 'vs/platform/files/common/files';
-import { URI } from 'vs/base/common/uri';
-import { DeferredPromise } from 'vs/base/common/async';
+import { Disposable, DisposableMap, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { ILogMessage, IRecursiveWatcherWithSubscribe, IUniversalWatchRequest, IWatchRequestWithCorrelation, IWatcher, IWatcherErrorEvent, isWatchRequestWithCorrelation, requestFilterToString } from '../../common/watcher.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { FileChangeType, IFileChange } from '../../common/files.js';
+import { URI } from '../../../../base/common/uri.js';
+import { DeferredPromise, ThrottledDelayer } from '../../../../base/common/async.js';
+import { hash } from '../../../../base/common/hash.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+
+interface ISuspendedWatchRequest {
+	readonly id: number;
+	readonly correlationId: number | undefined;
+	readonly path: string;
+}
 
 export abstract class BaseWatcher extends Disposable implements IWatcher {
 
@@ -22,11 +30,13 @@ export abstract class BaseWatcher extends Disposable implements IWatcher {
 	protected readonly _onDidWatchFail = this._register(new Emitter<IUniversalWatchRequest>());
 	private readonly onDidWatchFail = this._onDidWatchFail.event;
 
-	private readonly allNonCorrelatedWatchRequests = new Set<IUniversalWatchRequest>();
-	private readonly allCorrelatedWatchRequests = new Map<number /* correlation ID */, IWatchRequestWithCorrelation>();
+	private readonly correlatedWatchRequests = new Map<number /* request ID */, IWatchRequestWithCorrelation>();
+	private readonly nonCorrelatedWatchRequests = new Map<number /* request ID */, IUniversalWatchRequest>();
 
-	private readonly suspendedWatchRequests = this._register(new DisposableMap<number /* correlation ID */>());
-	private readonly suspendedWatchRequestsWithPolling = new Set<number /* correlation ID */>();
+	private readonly suspendedWatchRequests = this._register(new DisposableMap<number /* request ID */>());
+	private readonly suspendedWatchRequestsWithPolling = new Set<number /* request ID */>();
+
+	private readonly updateWatchersDelayer = this._register(new ThrottledDelayer<void>(this.getUpdateWatchersDelay()));
 
 	protected readonly suspendedWatchRequestPollingInterval: number = 5007; // node.js default
 
@@ -35,32 +45,28 @@ export abstract class BaseWatcher extends Disposable implements IWatcher {
 	constructor() {
 		super();
 
-		this._register(this.onDidWatchFail(request => this.handleDidWatchFail(request)));
-	}
-
-	private handleDidWatchFail(request: IUniversalWatchRequest): void {
-		if (!this.isCorrelated(request)) {
-
-			// For now, limit failed watch monitoring to requests with a correlationId
-			// to experiment with this feature in a controlled way. Monitoring requests
-			// requires us to install polling watchers (via `fs.watchFile()`) and thus
-			// should be used sparingly.
-			//
-			// TODO@bpasero revisit this in the future to have a more general approach
-			// for suspend/resume and drop the `legacyMonitorRequest` in parcel.
-			// One issue is that we need to be able to uniquely identify a request and
-			// without correlation that is actually harder...
-
-			return;
-		}
-
-		this.suspendWatchRequest(request);
+		this._register(this.onDidWatchFail(request => this.suspendWatchRequest({
+			id: this.computeId(request),
+			correlationId: this.isCorrelated(request) ? request.correlationId : undefined,
+			path: request.path
+		})));
 	}
 
 	protected isCorrelated(request: IUniversalWatchRequest): request is IWatchRequestWithCorrelation {
 		return isWatchRequestWithCorrelation(request);
 	}
 
+	private computeId(request: IUniversalWatchRequest): number {
+		if (this.isCorrelated(request)) {
+			return request.correlationId;
+		} else {
+			// Requests without correlation do not carry any unique identifier, so we have to
+			// come up with one based on the options of the request. This matches what the
+			// file service does (vs/platform/files/common/fileService.ts#L1178).
+			return hash(request);
+		}
+	}
+
 	async watch(requests: IUniversalWatchRequest[]): Promise<void> {
 		if (!this.joinWatch.isSettled) {
 			this.joinWatch.complete();
@@ -68,54 +74,59 @@ export abstract class BaseWatcher extends Disposable implements IWatcher {
 		this.joinWatch = new DeferredPromise<void>();
 
 		try {
-			this.allCorrelatedWatchRequests.clear();
-			this.allNonCorrelatedWatchRequests.clear();
+			this.correlatedWatchRequests.clear();
+			this.nonCorrelatedWatchRequests.clear();
 
 			// Figure out correlated vs. non-correlated requests
 			for (const request of requests) {
 				if (this.isCorrelated(request)) {
-					this.allCorrelatedWatchRequests.set(request.correlationId, request);
+					this.correlatedWatchRequests.set(request.correlationId, request);
 				} else {
-					this.allNonCorrelatedWatchRequests.add(request);
+					this.nonCorrelatedWatchRequests.set(this.computeId(request), request);
 				}
 			}
 
-			// Remove all suspended correlated watch requests that are no longer watched
-			for (const [correlationId] of this.suspendedWatchRequests) {
-				if (!this.allCorrelatedWatchRequests.has(correlationId)) {
-					this.suspendedWatchRequests.deleteAndDispose(correlationId);
-					this.suspendedWatchRequestsWithPolling.delete(correlationId);
+			// Remove all suspended watch requests that are no longer watched
+			for (const [id] of this.suspendedWatchRequests) {
+				if (!this.nonCorrelatedWatchRequests.has(id) && !this.correlatedWatchRequests.has(id)) {
+					this.suspendedWatchRequests.deleteAndDispose(id);
+					this.suspendedWatchRequestsWithPolling.delete(id);
 				}
 			}
 
-			return await this.updateWatchers();
+			return await this.updateWatchers(false /* not delayed */);
 		} finally {
 			this.joinWatch.complete();
 		}
 	}
 
-	private updateWatchers(): Promise<void> {
-		return this.doWatch([
-			...this.allNonCorrelatedWatchRequests,
-			...Array.from(this.allCorrelatedWatchRequests.values()).filter(request => !this.suspendedWatchRequests.has(request.correlationId))
-		]);
+	private updateWatchers(delayed: boolean): Promise<void> {
+		const nonSuspendedRequests: IUniversalWatchRequest[] = [];
+		for (const [id, request] of [...this.nonCorrelatedWatchRequests, ...this.correlatedWatchRequests]) {
+			if (!this.suspendedWatchRequests.has(id)) {
+				nonSuspendedRequests.push(request);
+			}
+		}
+
+		return this.updateWatchersDelayer.trigger(() => this.doWatch(nonSuspendedRequests), delayed ? this.getUpdateWatchersDelay() : 0).catch(error => onUnexpectedError(error));
+	}
+
+	protected getUpdateWatchersDelay(): number {
+		return 800;
 	}
 
 	isSuspended(request: IUniversalWatchRequest): 'polling' | boolean {
-		if (typeof request.correlationId !== 'number') {
-			return false;
-		}
-
-		return this.suspendedWatchRequestsWithPolling.has(request.correlationId) ? 'polling' : this.suspendedWatchRequests.has(request.correlationId);
+		const id = this.computeId(request);
+		return this.suspendedWatchRequestsWithPolling.has(id) ? 'polling' : this.suspendedWatchRequests.has(id);
 	}
 
-	private async suspendWatchRequest(request: IWatchRequestWithCorrelation): Promise<void> {
-		if (this.suspendedWatchRequests.has(request.correlationId)) {
+	private async suspendWatchRequest(request: ISuspendedWatchRequest): Promise<void> {
+		if (this.suspendedWatchRequests.has(request.id)) {
 			return; // already suspended
 		}
 
 		const disposables = new DisposableStore();
-		this.suspendedWatchRequests.set(request.correlationId, disposables);
+		this.suspendedWatchRequests.set(request.id, disposables);
 
 		// It is possible that a watch request fails right during watch()
 		// phase while other requests succeed. To increase the chance of
@@ -130,27 +141,27 @@ export abstract class BaseWatcher extends Disposable implements IWatcher {
 
 		this.monitorSuspendedWatchRequest(request, disposables);
 
-		this.updateWatchers();
+		this.updateWatchers(true /* delay this call as we might accumulate many failing watch requests on startup */);
 	}
 
-	private resumeWatchRequest(request: IWatchRequestWithCorrelation): void {
-		this.suspendedWatchRequests.deleteAndDispose(request.correlationId);
-		this.suspendedWatchRequestsWithPolling.delete(request.correlationId);
+	private resumeWatchRequest(request: ISuspendedWatchRequest): void {
+		this.suspendedWatchRequests.deleteAndDispose(request.id);
+		this.suspendedWatchRequestsWithPolling.delete(request.id);
 
-		this.updateWatchers();
+		this.updateWatchers(false);
 	}
 
-	private monitorSuspendedWatchRequest(request: IWatchRequestWithCorrelation, disposables: DisposableStore): void {
+	private monitorSuspendedWatchRequest(request: ISuspendedWatchRequest, disposables: DisposableStore): void {
 		if (this.doMonitorWithExistingWatcher(request, disposables)) {
 			this.trace(`reusing an existing recursive watcher to monitor ${request.path}`);
-			this.suspendedWatchRequestsWithPolling.delete(request.correlationId);
+			this.suspendedWatchRequestsWithPolling.delete(request.id);
 		} else {
 			this.doMonitorWithNodeJS(request, disposables);
-			this.suspendedWatchRequestsWithPolling.add(request.correlationId);
+			this.suspendedWatchRequestsWithPolling.add(request.id);
 		}
 	}
 
-	private doMonitorWithExistingWatcher(request: IWatchRequestWithCorrelation, disposables: DisposableStore): boolean {
+	private doMonitorWithExistingWatcher(request: ISuspendedWatchRequest, disposables: DisposableStore): boolean {
 		const subscription = this.recursiveWatcher?.subscribe(request.path, (error, change) => {
 			if (disposables.isDisposed) {
 				return; // return early if already disposed
@@ -172,7 +183,7 @@ export abstract class BaseWatcher extends Disposable implements IWatcher {
 		return false;
 	}
 
-	private doMonitorWithNodeJS(request: IWatchRequestWithCorrelation, disposables: DisposableStore): void {
+	private doMonitorWithNodeJS(request: ISuspendedWatchRequest, disposables: DisposableStore): void {
 		let pathNotFound = false;
 
 		const watchFileCallback: (curr: Stats, prev: Stats) => void = (curr, prev) => {
@@ -209,7 +220,7 @@ export abstract class BaseWatcher extends Disposable implements IWatcher {
 		}));
 	}
 
-	private onMonitoredPathAdded(request: IWatchRequestWithCorrelation) {
+	private onMonitoredPathAdded(request: ISuspendedWatchRequest): void {
 		this.trace(`detected ${request.path} exists again, resuming watcher (correlationId: ${request.correlationId})`);
 
 		// Emit as event
@@ -230,14 +241,14 @@ export abstract class BaseWatcher extends Disposable implements IWatcher {
 		this.suspendedWatchRequestsWithPolling.clear();
 	}
 
-	protected traceEvent(event: IFileChange, request: IUniversalWatchRequest): void {
+	protected traceEvent(event: IFileChange, request: IUniversalWatchRequest | ISuspendedWatchRequest): void {
 		if (this.verboseLogging) {
 			const traceMsg = ` >> normalized ${event.type === FileChangeType.ADDED ? '[ADDED]' : event.type === FileChangeType.DELETED ? '[DELETED]' : '[CHANGED]'} ${event.resource.fsPath}`;
 			this.traceWithCorrelation(traceMsg, request);
 		}
 	}
 
-	protected traceWithCorrelation(message: string, request: IUniversalWatchRequest): void {
+	protected traceWithCorrelation(message: string, request: IUniversalWatchRequest | ISuspendedWatchRequest): void {
 		if (this.verboseLogging) {
 			this.trace(`${message}${typeof request.correlationId === 'number' ? ` <${request.correlationId}> ` : ``}`);
 		}
diff --git a/src/vs/platform/files/node/watcher/nodejs/nodejsClient.ts b/src/vs/platform/files/node/watcher/nodejs/nodejsClient.ts
index 3a2f6446996..a10792b1dbf 100644
--- a/src/vs/platform/files/node/watcher/nodejs/nodejsClient.ts
+++ b/src/vs/platform/files/node/watcher/nodejs/nodejsClient.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { IFileChange } from 'vs/platform/files/common/files';
-import { ILogMessage, AbstractNonRecursiveWatcherClient, INonRecursiveWatcher } from 'vs/platform/files/common/watcher';
-import { NodeJSWatcher } from 'vs/platform/files/node/watcher/nodejs/nodejsWatcher';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { IFileChange } from '../../../common/files.js';
+import { ILogMessage, AbstractNonRecursiveWatcherClient, INonRecursiveWatcher } from '../../../common/watcher.js';
+import { NodeJSWatcher } from './nodejsWatcher.js';
 
 export class NodeJSWatcherClient extends AbstractNonRecursiveWatcherClient {
 
diff --git a/src/vs/platform/files/node/watcher/nodejs/nodejsWatcher.ts b/src/vs/platform/files/node/watcher/nodejs/nodejsWatcher.ts
index 16f861668ac..0c60edd91a9 100644
--- a/src/vs/platform/files/node/watcher/nodejs/nodejsWatcher.ts
+++ b/src/vs/platform/files/node/watcher/nodejs/nodejsWatcher.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { patternsEquals } from 'vs/base/common/glob';
-import { BaseWatcher } from 'vs/platform/files/node/watcher/baseWatcher';
-import { isLinux } from 'vs/base/common/platform';
-import { INonRecursiveWatchRequest, INonRecursiveWatcher, IRecursiveWatcherWithSubscribe } from 'vs/platform/files/common/watcher';
-import { NodeJSFileWatcherLibrary } from 'vs/platform/files/node/watcher/nodejs/nodejsWatcherLib';
-import { isEqual } from 'vs/base/common/extpath';
+import { Event } from '../../../../../base/common/event.js';
+import { patternsEquals } from '../../../../../base/common/glob.js';
+import { BaseWatcher } from '../baseWatcher.js';
+import { isLinux } from '../../../../../base/common/platform.js';
+import { INonRecursiveWatchRequest, INonRecursiveWatcher, IRecursiveWatcherWithSubscribe } from '../../../common/watcher.js';
+import { NodeJSFileWatcherLibrary } from './nodejsWatcherLib.js';
+import { isEqual } from '../../../../../base/common/extpath.js';
 
 export interface INodeJSWatcherInstance {
 
diff --git a/src/vs/platform/files/node/watcher/nodejs/nodejsWatcherLib.ts b/src/vs/platform/files/node/watcher/nodejs/nodejsWatcherLib.ts
index c71f1581cf6..69792c99623 100644
--- a/src/vs/platform/files/node/watcher/nodejs/nodejsWatcherLib.ts
+++ b/src/vs/platform/files/node/watcher/nodejs/nodejsWatcherLib.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { watch } from 'fs';
-import { RunOnceWorker, ThrottledWorker } from 'vs/base/common/async';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { isEqualOrParent } from 'vs/base/common/extpath';
-import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { normalizeNFC } from 'vs/base/common/normalization';
-import { basename, dirname, join } from 'vs/base/common/path';
-import { isLinux, isMacintosh } from 'vs/base/common/platform';
-import { joinPath } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { realcase } from 'vs/base/node/extpath';
-import { Promises } from 'vs/base/node/pfs';
-import { FileChangeType, IFileChange } from 'vs/platform/files/common/files';
-import { ILogMessage, coalesceEvents, INonRecursiveWatchRequest, parseWatcherPatterns, IRecursiveWatcherWithSubscribe, isFiltered, isWatchRequestWithCorrelation } from 'vs/platform/files/common/watcher';
+import { watch, promises } from 'fs';
+import { RunOnceWorker, ThrottledWorker } from '../../../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { isEqualOrParent } from '../../../../../base/common/extpath.js';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { normalizeNFC } from '../../../../../base/common/normalization.js';
+import { basename, dirname, join } from '../../../../../base/common/path.js';
+import { isLinux, isMacintosh } from '../../../../../base/common/platform.js';
+import { joinPath } from '../../../../../base/common/resources.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { realcase } from '../../../../../base/node/extpath.js';
+import { Promises } from '../../../../../base/node/pfs.js';
+import { FileChangeType, IFileChange } from '../../../common/files.js';
+import { ILogMessage, coalesceEvents, INonRecursiveWatchRequest, parseWatcherPatterns, IRecursiveWatcherWithSubscribe, isFiltered, isWatchRequestWithCorrelation } from '../../../common/watcher.js';
 
 export class NodeJSFileWatcherLibrary extends Disposable {
 
@@ -51,7 +51,7 @@ export class NodeJSFileWatcherLibrary extends Disposable {
 
 	private readonly excludes = parseWatcherPatterns(this.request.path, this.request.excludes);
 	private readonly includes = this.request.includes ? parseWatcherPatterns(this.request.path, this.request.includes) : undefined;
-	private readonly filter = isWatchRequestWithCorrelation(this.request) ? this.request.filter : undefined; // TODO@bpasero filtering for now is only enabled when correlating because watchers are otherwise potentially reused
+	private readonly filter = isWatchRequestWithCorrelation(this.request) ? this.request.filter : undefined; // filtering is only enabled when correlating because watchers are otherwise potentially reused
 
 	private readonly cts = new CancellationTokenSource();
 
@@ -82,7 +82,7 @@ export class NodeJSFileWatcherLibrary extends Disposable {
 				return;
 			}
 
-			const stat = await Promises.stat(realPath);
+			const stat = await promises.stat(realPath);
 
 			if (this.cts.token.isCancellationRequested) {
 				return;
diff --git a/src/vs/platform/files/node/watcher/parcel/parcelWatcher.ts b/src/vs/platform/files/node/watcher/parcel/parcelWatcher.ts
index afabd7aed12..3b47a55d691 100644
--- a/src/vs/platform/files/node/watcher/parcel/parcelWatcher.ts
+++ b/src/vs/platform/files/node/watcher/parcel/parcelWatcher.ts
@@ -4,25 +4,24 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as parcelWatcher from '@parcel/watcher';
-import { existsSync, statSync, unlinkSync } from 'fs';
-import { tmpdir } from 'os';
-import { URI } from 'vs/base/common/uri';
-import { DeferredPromise, RunOnceScheduler, RunOnceWorker, ThrottledWorker } from 'vs/base/common/async';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { Emitter, Event } from 'vs/base/common/event';
-import { randomPath, isEqual, isEqualOrParent } from 'vs/base/common/extpath';
-import { GLOBSTAR, patternsEquals } from 'vs/base/common/glob';
-import { BaseWatcher } from 'vs/platform/files/node/watcher/baseWatcher';
-import { TernarySearchTree } from 'vs/base/common/ternarySearchTree';
-import { normalizeNFC } from 'vs/base/common/normalization';
-import { dirname, normalize } from 'vs/base/common/path';
-import { isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
-import { realcaseSync, realpathSync } from 'vs/base/node/extpath';
-import { NodeJSFileWatcherLibrary } from 'vs/platform/files/node/watcher/nodejs/nodejsWatcherLib';
-import { FileChangeType, IFileChange } from 'vs/platform/files/common/files';
-import { coalesceEvents, IRecursiveWatchRequest, parseWatcherPatterns, IRecursiveWatcherWithSubscribe, isFiltered, IWatcherErrorEvent } from 'vs/platform/files/common/watcher';
-import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { statSync, unlinkSync } from 'fs';
+import { tmpdir, homedir } from 'os';
+import { URI } from '../../../../../base/common/uri.js';
+import { DeferredPromise, RunOnceScheduler, RunOnceWorker, ThrottledWorker } from '../../../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { toErrorMessage } from '../../../../../base/common/errorMessage.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { randomPath, isEqual, isEqualOrParent } from '../../../../../base/common/extpath.js';
+import { GLOBSTAR, patternsEquals } from '../../../../../base/common/glob.js';
+import { BaseWatcher } from '../baseWatcher.js';
+import { TernarySearchTree } from '../../../../../base/common/ternarySearchTree.js';
+import { normalizeNFC } from '../../../../../base/common/normalization.js';
+import { normalize, join } from '../../../../../base/common/path.js';
+import { isLinux, isMacintosh, isWindows } from '../../../../../base/common/platform.js';
+import { realcaseSync, realpathSync } from '../../../../../base/node/extpath.js';
+import { FileChangeType, IFileChange } from '../../../common/files.js';
+import { coalesceEvents, IRecursiveWatchRequest, parseWatcherPatterns, IRecursiveWatcherWithSubscribe, isFiltered, IWatcherErrorEvent } from '../../../common/watcher.js';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
 
 export class ParcelWatcherInstance extends Disposable {
 
@@ -145,6 +144,14 @@ export class ParcelWatcher extends BaseWatcher implements IRecursiveWatcherWithS
 		]
 	);
 
+	private static readonly PREDEFINED_EXCLUDES: { [platform: string]: string[] } = {
+		'win32': [],
+		'darwin': [
+			join(homedir(), 'Library', 'Containers') // Triggers access dialog from macOS 14 (https://github.com/microsoft/vscode/issues/208105)
+		],
+		'linux': []
+	};
+
 	private static readonly PARCEL_WATCHER_BACKEND = isWindows ? 'windows' : isLinux ? 'inotify' : 'fs-events';
 
 	private readonly _onDidError = this._register(new Emitter<IWatcherErrorEvent>());
@@ -226,7 +233,7 @@ export class ParcelWatcher extends BaseWatcher implements IRecursiveWatcherWithS
 			if (request.pollingInterval) {
 				this.startPolling(request, request.pollingInterval);
 			} else {
-				this.startWatching(request);
+				await this.startWatching(request);
 			}
 		}
 	}
@@ -293,8 +300,9 @@ export class ParcelWatcher extends BaseWatcher implements IRecursiveWatcherWithS
 			}
 
 			// We already ran before, check for events since
+			const parcelWatcherLib = parcelWatcher;
 			if (counter > 1) {
-				const parcelEvents = await parcelWatcher.getEventsSince(realPath, snapshotFile, { ignore: request.excludes, backend: ParcelWatcher.PARCEL_WATCHER_BACKEND });
+				const parcelEvents = await parcelWatcherLib.getEventsSince(realPath, snapshotFile, { ignore: this.addPredefinedExcludes(request.excludes), backend: ParcelWatcher.PARCEL_WATCHER_BACKEND });
 
 				if (cts.token.isCancellationRequested) {
 					return;
@@ -305,7 +313,7 @@ export class ParcelWatcher extends BaseWatcher implements IRecursiveWatcherWithS
 			}
 
 			// Store a snapshot of files to the snapshot file
-			await parcelWatcher.writeSnapshot(realPath, snapshotFile, { ignore: request.excludes, backend: ParcelWatcher.PARCEL_WATCHER_BACKEND });
+			await parcelWatcherLib.writeSnapshot(realPath, snapshotFile, { ignore: this.addPredefinedExcludes(request.excludes), backend: ParcelWatcher.PARCEL_WATCHER_BACKEND });
 
 			// Signal we are ready now when the first snapshot was written
 			if (counter === 1) {
@@ -322,7 +330,7 @@ export class ParcelWatcher extends BaseWatcher implements IRecursiveWatcherWithS
 		pollingWatcher.schedule(0);
 	}
 
-	private startWatching(request: IRecursiveWatchRequest, restarts = 0): void {
+	private async startWatching(request: IRecursiveWatchRequest, restarts = 0): Promise<void> {
 		const cts = new CancellationTokenSource();
 
 		const instance = new DeferredPromise<parcelWatcher.AsyncSubscription | undefined>();
@@ -349,36 +357,54 @@ export class ParcelWatcher extends BaseWatcher implements IRecursiveWatcherWithS
 		// Path checks for symbolic links / wrong casing
 		const { realPath, realPathDiffers, realPathLength } = this.normalizePath(request);
 
-		parcelWatcher.subscribe(realPath, (error, parcelEvents) => {
-			if (watcher.token.isCancellationRequested) {
-				return; // return early when disposed
-			}
+		try {
+			const parcelWatcherLib = parcelWatcher;
+			const parcelWatcherInstance = await parcelWatcherLib.subscribe(realPath, (error, parcelEvents) => {
+				if (watcher.token.isCancellationRequested) {
+					return; // return early when disposed
+				}
 
-			// In any case of an error, treat this like a unhandled exception
-			// that might require the watcher to restart. We do not really know
-			// the state of parcel at this point and as such will try to restart
-			// up to our maximum of restarts.
-			if (error) {
-				this.onUnexpectedError(error, request);
-			}
+				// In any case of an error, treat this like a unhandled exception
+				// that might require the watcher to restart. We do not really know
+				// the state of parcel at this point and as such will try to restart
+				// up to our maximum of restarts.
+				if (error) {
+					this.onUnexpectedError(error, request);
+				}
+
+				// Handle & emit events
+				this.onParcelEvents(parcelEvents, watcher, realPathDiffers, realPathLength);
+			}, {
+				backend: ParcelWatcher.PARCEL_WATCHER_BACKEND,
+				ignore: this.addPredefinedExcludes(watcher.request.excludes)
+			});
 
-			// Handle & emit events
-			this.onParcelEvents(parcelEvents, watcher, realPathDiffers, realPathLength);
-		}, {
-			backend: ParcelWatcher.PARCEL_WATCHER_BACKEND,
-			ignore: watcher.request.excludes
-		}).then(parcelWatcher => {
 			this.trace(`Started watching: '${realPath}' with backend '${ParcelWatcher.PARCEL_WATCHER_BACKEND}'`);
 
-			instance.complete(parcelWatcher);
-		}).catch(error => {
+			instance.complete(parcelWatcherInstance);
+		} catch (error) {
 			this.onUnexpectedError(error, request);
 
 			instance.complete(undefined);
 
 			watcher.notifyWatchFailed();
 			this._onDidWatchFail.fire(request);
-		});
+		}
+	}
+
+	private addPredefinedExcludes(initialExcludes: string[]): string[] {
+		const excludes = [...initialExcludes];
+
+		const predefinedExcludes = ParcelWatcher.PREDEFINED_EXCLUDES[process.platform];
+		if (Array.isArray(predefinedExcludes)) {
+			for (const exclude of predefinedExcludes) {
+				if (!excludes.includes(exclude)) {
+					excludes.push(exclude);
+				}
+			}
+		}
+
+		return excludes;
 	}
 
 	private onParcelEvents(parcelEvents: parcelWatcher.Event[], watcher: ParcelWatcherInstance, realPathDiffers: boolean, realPathLength: number): void {
@@ -514,7 +540,7 @@ export class ParcelWatcher extends BaseWatcher implements IRecursiveWatcherWithS
 		const filteredEvents: IFileChange[] = [];
 		let rootDeleted = false;
 
-		const filter = this.isCorrelated(watcher.request) ? watcher.request.filter : undefined; // TODO@bpasero filtering for now is only enabled when correlating because watchers are otherwise potentially reused
+		const filter = this.isCorrelated(watcher.request) ? watcher.request.filter : undefined; // filtering is only enabled when correlating because watchers are otherwise potentially reused
 		for (const event of events) {
 
 			// Emit to instance subscriptions if any before filtering
@@ -524,20 +550,7 @@ export class ParcelWatcher extends BaseWatcher implements IRecursiveWatcherWithS
 
 			// Filtering
 			rootDeleted = event.type === FileChangeType.DELETED && isEqual(event.resource.fsPath, watcher.request.path, !isLinux);
-			if (
-				isFiltered(event, filter) ||
-				// Explicitly exclude changes to root if we have any
-				// to avoid VS Code closing all opened editors which
-				// can happen e.g. in case of network connectivity
-				// issues
-				// (https://github.com/microsoft/vscode/issues/136673)
-				//
-				// Update 2024: with the new correlated events, we
-				// really do not want to skip over file events any
-				// more, so we only ignore this event for non-correlated
-				// watch requests.
-				(rootDeleted && !this.isCorrelated(watcher.request))
-			) {
+			if (isFiltered(event, filter)) {
 				if (this.verboseLogging) {
 					this.traceWithCorrelation(` >> ignored (filtered) ${event.resource.fsPath}`, watcher.request);
 				}
@@ -557,54 +570,8 @@ export class ParcelWatcher extends BaseWatcher implements IRecursiveWatcherWithS
 	private onWatchedPathDeleted(watcher: ParcelWatcherInstance): void {
 		this.warn('Watcher shutdown because watched path got deleted', watcher);
 
-		let legacyMonitored = false;
-		if (!this.isCorrelated(watcher.request)) {
-			// Do monitoring of the request path parent unless this request
-			// can be handled via suspend/resume in the super class
-			legacyMonitored = this.legacyMonitorRequest(watcher);
-		}
-
-		if (!legacyMonitored) {
-			watcher.notifyWatchFailed();
-			this._onDidWatchFail.fire(watcher.request);
-		}
-	}
-
-	private legacyMonitorRequest(watcher: ParcelWatcherInstance): boolean {
-		const parentPath = dirname(watcher.request.path);
-		if (existsSync(parentPath)) {
-			this.trace('Trying to watch on the parent path to restart the watcher...', watcher);
-
-			const nodeWatcher = new NodeJSFileWatcherLibrary({ path: parentPath, excludes: [], recursive: false, correlationId: watcher.request.correlationId }, undefined, changes => {
-				if (watcher.token.isCancellationRequested) {
-					return; // return early when disposed
-				}
-
-				// Watcher path came back! Restart watching...
-				for (const { resource, type } of changes) {
-					if (isEqual(resource.fsPath, watcher.request.path, !isLinux) && (type === FileChangeType.ADDED || type === FileChangeType.UPDATED)) {
-						if (this.isPathValid(watcher.request.path)) {
-							this.warn('Watcher restarts because watched path got created again', watcher);
-
-							// Stop watching that parent folder
-							nodeWatcher.dispose();
-
-							// Restart the file watching
-							this.restartWatching(watcher);
-
-							break;
-						}
-					}
-				}
-			}, undefined, msg => this._onDidLogMessage.fire(msg), this.verboseLogging);
-
-			// Make sure to stop watching when the watcher is disposed
-			watcher.token.onCancellationRequested(() => nodeWatcher.dispose());
-
-			return true;
-		}
-
-		return false;
+		watcher.notifyWatchFailed();
+		this._onDidWatchFail.fire(watcher.request);
 	}
 
 	private onUnexpectedError(error: unknown, request?: IRecursiveWatchRequest): void {
@@ -662,7 +629,7 @@ export class ParcelWatcher extends BaseWatcher implements IRecursiveWatcherWithS
 				if (watcher.request.pollingInterval) {
 					this.startPolling(watcher.request, watcher.request.pollingInterval, watcher.restarts + 1);
 				} else {
-					this.startWatching(watcher.request, watcher.restarts + 1);
+					await this.startWatching(watcher.request, watcher.restarts + 1);
 				}
 			} finally {
 				restartPromise.complete();
@@ -833,7 +800,7 @@ export class ParcelWatcher extends BaseWatcher implements IRecursiveWatcherWithS
 	}
 
 	private toMessage(message: string, request?: IRecursiveWatchRequest): string {
-		return request ? `[File Watcher (parcel)] ${message} (path: ${request.path})` : `[File Watcher (parcel)] ${message}`;
+		return request ? `[File Watcher] ${message} (path: ${request.path})` : `[File Watcher ('parcel')] ${message}`;
 	}
 
 	protected get recursiveWatcher() { return this; }
diff --git a/src/vs/platform/files/node/watcher/watcher.ts b/src/vs/platform/files/node/watcher/watcher.ts
index 3ea9fc61213..9ceab54f800 100644
--- a/src/vs/platform/files/node/watcher/watcher.ts
+++ b/src/vs/platform/files/node/watcher/watcher.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ILogMessage, IUniversalWatcher, IUniversalWatchRequest } from 'vs/platform/files/common/watcher';
-import { Emitter, Event } from 'vs/base/common/event';
-import { ParcelWatcher } from 'vs/platform/files/node/watcher/parcel/parcelWatcher';
-import { NodeJSWatcher } from 'vs/platform/files/node/watcher/nodejs/nodejsWatcher';
-import { Promises } from 'vs/base/common/async';
-import { computeStats } from 'vs/platform/files/node/watcher/watcherStats';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ILogMessage, isRecursiveWatchRequest, IUniversalWatcher, IUniversalWatchRequest } from '../../common/watcher.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { ParcelWatcher } from './parcel/parcelWatcher.js';
+import { NodeJSWatcher } from './nodejs/nodejsWatcher.js';
+import { Promises } from '../../../../base/common/async.js';
+import { computeStats } from './watcherStats.js';
 
 export class UniversalWatcher extends Disposable implements IUniversalWatcher {
 
@@ -23,9 +23,21 @@ export class UniversalWatcher extends Disposable implements IUniversalWatcher {
 	readonly onDidLogMessage = Event.any(this._onDidLogMessage.event, this.recursiveWatcher.onDidLogMessage, this.nonRecursiveWatcher.onDidLogMessage);
 
 	private requests: IUniversalWatchRequest[] = [];
+	private failedRecursiveRequests = 0;
+
+	constructor() {
+		super();
+
+		this._register(this.recursiveWatcher.onDidError(e => {
+			if (e.request) {
+				this.failedRecursiveRequests++;
+			}
+		}));
+	}
 
 	async watch(requests: IUniversalWatchRequest[]): Promise<void> {
 		this.requests = requests;
+		this.failedRecursiveRequests = 0;
 
 		// Watch recursively first to give recursive watchers a chance
 		// to step in for non-recursive watch requests, thus reducing
@@ -33,13 +45,13 @@ export class UniversalWatcher extends Disposable implements IUniversalWatcher {
 
 		let error: Error | undefined;
 		try {
-			await this.recursiveWatcher.watch(requests.filter(request => request.recursive));
+			await this.recursiveWatcher.watch(requests.filter(request => isRecursiveWatchRequest(request)));
 		} catch (e) {
 			error = e;
 		}
 
 		try {
-			await this.nonRecursiveWatcher.watch(requests.filter(request => !request.recursive));
+			await this.nonRecursiveWatcher.watch(requests.filter(request => !isRecursiveWatchRequest(request)));
 		} catch (e) {
 			if (!error) {
 				error = e;
@@ -55,7 +67,7 @@ export class UniversalWatcher extends Disposable implements IUniversalWatcher {
 
 		// Log stats
 		if (enabled && this.requests.length > 0) {
-			this._onDidLogMessage.fire({ type: 'trace', message: computeStats(this.requests, this.recursiveWatcher, this.nonRecursiveWatcher) });
+			this._onDidLogMessage.fire({ type: 'trace', message: computeStats(this.requests, this.failedRecursiveRequests, this.recursiveWatcher, this.nonRecursiveWatcher) });
 		}
 
 		// Forward to watchers
diff --git a/src/vs/platform/files/node/watcher/watcherClient.ts b/src/vs/platform/files/node/watcher/watcherClient.ts
index f7b39b5f3a1..b88b7f32004 100644
--- a/src/vs/platform/files/node/watcher/watcherClient.ts
+++ b/src/vs/platform/files/node/watcher/watcherClient.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { FileAccess } from 'vs/base/common/network';
-import { getNextTickChannel, ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
-import { Client } from 'vs/base/parts/ipc/node/ipc.cp';
-import { IFileChange } from 'vs/platform/files/common/files';
-import { AbstractUniversalWatcherClient, ILogMessage, IUniversalWatcher } from 'vs/platform/files/common/watcher';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { FileAccess } from '../../../../base/common/network.js';
+import { getNextTickChannel, ProxyChannel } from '../../../../base/parts/ipc/common/ipc.js';
+import { Client } from '../../../../base/parts/ipc/node/ipc.cp.js';
+import { IFileChange } from '../../common/files.js';
+import { AbstractUniversalWatcherClient, ILogMessage, IUniversalWatcher } from '../../common/watcher.js';
 
 export class UniversalWatcherClient extends AbstractUniversalWatcherClient {
 
@@ -32,7 +32,7 @@ export class UniversalWatcherClient extends AbstractUniversalWatcherClient {
 				serverName: 'File Watcher',
 				args: ['--type=fileWatcher'],
 				env: {
-					VSCODE_AMD_ENTRYPOINT: 'vs/platform/files/node/watcher/watcherMain',
+					VSCODE_ESM_ENTRYPOINT: 'vs/platform/files/node/watcher/watcherMain',
 					VSCODE_PIPE_LOGGING: 'true',
 					VSCODE_VERBOSE_LOGGING: 'true' // transmit console logs from server to client
 				}
diff --git a/src/vs/platform/files/node/watcher/watcherMain.ts b/src/vs/platform/files/node/watcher/watcherMain.ts
index 09f952c4f4a..82f77152dcd 100644
--- a/src/vs/platform/files/node/watcher/watcherMain.ts
+++ b/src/vs/platform/files/node/watcher/watcherMain.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
-import { Server as ChildProcessServer } from 'vs/base/parts/ipc/node/ipc.cp';
-import { Server as UtilityProcessServer } from 'vs/base/parts/ipc/node/ipc.mp';
-import { isUtilityProcess } from 'vs/base/parts/sandbox/node/electronTypes';
-import { UniversalWatcher } from 'vs/platform/files/node/watcher/watcher';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { ProxyChannel } from '../../../../base/parts/ipc/common/ipc.js';
+import { Server as ChildProcessServer } from '../../../../base/parts/ipc/node/ipc.cp.js';
+import { Server as UtilityProcessServer } from '../../../../base/parts/ipc/node/ipc.mp.js';
+import { isUtilityProcess } from '../../../../base/parts/sandbox/node/electronTypes.js';
+import { UniversalWatcher } from './watcher.js';
 
 let server: ChildProcessServer<string> | UtilityProcessServer;
 if (isUtilityProcess(process)) {
diff --git a/src/vs/platform/files/node/watcher/watcherStats.ts b/src/vs/platform/files/node/watcher/watcherStats.ts
index 861e6d24bf8..b13a2187fb4 100644
--- a/src/vs/platform/files/node/watcher/watcherStats.ts
+++ b/src/vs/platform/files/node/watcher/watcherStats.ts
@@ -3,18 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IUniversalWatchRequest, requestFilterToString } from 'vs/platform/files/common/watcher';
-import { INodeJSWatcherInstance, NodeJSWatcher } from 'vs/platform/files/node/watcher/nodejs/nodejsWatcher';
-import { ParcelWatcher, ParcelWatcherInstance } from 'vs/platform/files/node/watcher/parcel/parcelWatcher';
+import { INonRecursiveWatchRequest, IRecursiveWatchRequest, isRecursiveWatchRequest, IUniversalWatchRequest, requestFilterToString } from '../../common/watcher.js';
+import { INodeJSWatcherInstance, NodeJSWatcher } from './nodejs/nodejsWatcher.js';
+import { ParcelWatcher, ParcelWatcherInstance } from './parcel/parcelWatcher.js';
 
 export function computeStats(
 	requests: IUniversalWatchRequest[],
+	failedRecursiveRequests: number,
 	recursiveWatcher: ParcelWatcher,
 	nonRecursiveWatcher: NodeJSWatcher
 ): string {
 	const lines: string[] = [];
 
-	const allRecursiveRequests = sortByPathPrefix(requests.filter(request => request.recursive));
+	const allRecursiveRequests = sortByPathPrefix(requests.filter(request => isRecursiveWatchRequest(request)));
 	const nonSuspendedRecursiveRequests = allRecursiveRequests.filter(request => recursiveWatcher.isSuspended(request) === false);
 	const suspendedPollingRecursiveRequests = allRecursiveRequests.filter(request => recursiveWatcher.isSuspended(request) === 'polling');
 	const suspendedNonPollingRecursiveRequests = allRecursiveRequests.filter(request => recursiveWatcher.isSuspended(request) === true);
@@ -22,7 +23,7 @@ export function computeStats(
 	const recursiveRequestsStatus = computeRequestStatus(allRecursiveRequests, recursiveWatcher);
 	const recursiveWatcherStatus = computeRecursiveWatchStatus(recursiveWatcher);
 
-	const allNonRecursiveRequests = sortByPathPrefix(requests.filter(request => !request.recursive));
+	const allNonRecursiveRequests = sortByPathPrefix(requests.filter(request => !isRecursiveWatchRequest(request)));
 	const nonSuspendedNonRecursiveRequests = allNonRecursiveRequests.filter(request => nonRecursiveWatcher.isSuspended(request) === false);
 	const suspendedPollingNonRecursiveRequests = allNonRecursiveRequests.filter(request => nonRecursiveWatcher.isSuspended(request) === 'polling');
 	const suspendedNonPollingNonRecursiveRequests = allNonRecursiveRequests.filter(request => nonRecursiveWatcher.isSuspended(request) === true);
@@ -31,7 +32,7 @@ export function computeStats(
 	const nonRecursiveWatcherStatus = computeNonRecursiveWatchStatus(nonRecursiveWatcher);
 
 	lines.push('[Summary]');
-	lines.push(`- Recursive Requests:     total: ${allRecursiveRequests.length}, suspended: ${recursiveRequestsStatus.suspended}, polling: ${recursiveRequestsStatus.polling}`);
+	lines.push(`- Recursive Requests:     total: ${allRecursiveRequests.length}, suspended: ${recursiveRequestsStatus.suspended}, polling: ${recursiveRequestsStatus.polling}, failed: ${failedRecursiveRequests}`);
 	lines.push(`- Non-Recursive Requests: total: ${allNonRecursiveRequests.length}, suspended: ${nonRecursiveRequestsStatus.suspended}, polling: ${nonRecursiveRequestsStatus.polling}`);
 	lines.push(`- Recursive Watchers:     total: ${recursiveWatcher.watchers.size}, active: ${recursiveWatcherStatus.active}, failed: ${recursiveWatcherStatus.failed}, stopped: ${recursiveWatcherStatus.stopped}`);
 	lines.push(`- Non-Recursive Watchers: total: ${nonRecursiveWatcher.watchers.size}, active: ${nonRecursiveWatcherStatus.active}, failed: ${nonRecursiveWatcherStatus.failed}, reusing: ${nonRecursiveWatcherStatus.reusing}`);
@@ -140,6 +141,8 @@ function computeNonRecursiveWatchStatus(nonRecursiveWatcher: NodeJSWatcher): { a
 	return { active, failed, reusing };
 }
 
+function sortByPathPrefix(requests: IRecursiveWatchRequest[]): IRecursiveWatchRequest[];
+function sortByPathPrefix(requests: INonRecursiveWatchRequest[]): INonRecursiveWatchRequest[];
 function sortByPathPrefix(requests: IUniversalWatchRequest[]): IUniversalWatchRequest[];
 function sortByPathPrefix(requests: INodeJSWatcherInstance[]): INodeJSWatcherInstance[];
 function sortByPathPrefix(requests: ParcelWatcherInstance[]): ParcelWatcherInstance[];
diff --git a/src/vs/platform/files/test/browser/fileService.test.ts b/src/vs/platform/files/test/browser/fileService.test.ts
index 166cf549688..0f7e6055026 100644
--- a/src/vs/platform/files/test/browser/fileService.test.ts
+++ b/src/vs/platform/files/test/browser/fileService.test.ts
@@ -4,19 +4,19 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DeferredPromise, timeout } from 'vs/base/common/async';
-import { bufferToReadable, bufferToStream, VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { isEqual } from 'vs/base/common/resources';
-import { consumeStream, newWriteableStream, ReadableStreamEvents } from 'vs/base/common/stream';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IFileOpenOptions, IFileReadStreamOptions, FileSystemProviderCapabilities, FileType, IFileSystemProviderCapabilitiesChangeEvent, IFileSystemProviderRegistrationEvent, IStat, IFileAtomicReadOptions, IFileAtomicWriteOptions, IFileAtomicDeleteOptions, IFileSystemProviderWithFileAtomicReadCapability, IFileSystemProviderWithFileAtomicDeleteCapability, IFileSystemProviderWithFileAtomicWriteCapability, IFileAtomicOptions, IFileChange, isFileSystemWatcher, FileChangesEvent, FileChangeType } from 'vs/platform/files/common/files';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { NullFileSystemProvider } from 'vs/platform/files/test/common/nullFileSystemProvider';
-import { NullLogService } from 'vs/platform/log/common/log';
+import { DeferredPromise, timeout } from '../../../../base/common/async.js';
+import { bufferToReadable, bufferToStream, VSBuffer } from '../../../../base/common/buffer.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { consumeStream, newWriteableStream, ReadableStreamEvents } from '../../../../base/common/stream.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { IFileOpenOptions, IFileReadStreamOptions, FileSystemProviderCapabilities, FileType, IFileSystemProviderCapabilitiesChangeEvent, IFileSystemProviderRegistrationEvent, IStat, IFileAtomicReadOptions, IFileAtomicWriteOptions, IFileAtomicDeleteOptions, IFileSystemProviderWithFileAtomicReadCapability, IFileSystemProviderWithFileAtomicDeleteCapability, IFileSystemProviderWithFileAtomicWriteCapability, IFileAtomicOptions, IFileChange, isFileSystemWatcher, FileChangesEvent, FileChangeType } from '../../common/files.js';
+import { FileService } from '../../common/fileService.js';
+import { NullFileSystemProvider } from '../common/nullFileSystemProvider.js';
+import { NullLogService } from '../../../log/common/log.js';
 
 suite('File Service', () => {
 
diff --git a/src/vs/platform/files/test/browser/indexedDBFileService.integrationTest.ts b/src/vs/platform/files/test/browser/indexedDBFileService.integrationTest.ts
index c5f542918ba..fe30a71f5df 100644
--- a/src/vs/platform/files/test/browser/indexedDBFileService.integrationTest.ts
+++ b/src/vs/platform/files/test/browser/indexedDBFileService.integrationTest.ts
@@ -4,17 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { IndexedDB } from 'vs/base/browser/indexedDB';
-import { bufferToReadable, bufferToStream, VSBuffer, VSBufferReadable, VSBufferReadableStream } from 'vs/base/common/buffer';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { basename, joinPath } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { flakySuite } from 'vs/base/test/common/testUtils';
-import { IndexedDBFileSystemProvider } from 'vs/platform/files/browser/indexedDBFileSystemProvider';
-import { FileOperation, FileOperationError, FileOperationEvent, FileOperationResult, FileSystemProviderError, FileSystemProviderErrorCode, FileType } from 'vs/platform/files/common/files';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { NullLogService } from 'vs/platform/log/common/log';
+import { IndexedDB } from '../../../../base/browser/indexedDB.js';
+import { bufferToReadable, bufferToStream, VSBuffer, VSBufferReadable, VSBufferReadableStream } from '../../../../base/common/buffer.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { basename, joinPath } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { flakySuite } from '../../../../base/test/common/testUtils.js';
+import { IndexedDBFileSystemProvider } from '../../browser/indexedDBFileSystemProvider.js';
+import { FileOperation, FileOperationError, FileOperationEvent, FileOperationResult, FileSystemProviderError, FileSystemProviderErrorCode, FileType } from '../../common/files.js';
+import { FileService } from '../../common/fileService.js';
+import { NullLogService } from '../../../log/common/log.js';
 
 flakySuite('IndexedDBFileSystemProvider', function () {
 
@@ -189,7 +189,7 @@ flakySuite('IndexedDBFileSystemProvider', function () {
 				assert.strictEqual(value.mtime, undefined);
 				assert.strictEqual(value.ctime, undefined);
 			} else {
-				assert.ok(!'Unexpected value ' + basename(value.resource));
+				assert.fail('Unexpected value ' + basename(value.resource));
 			}
 		});
 	});
diff --git a/src/vs/platform/files/test/common/files.test.ts b/src/vs/platform/files/test/common/files.test.ts
index 245d2222b9d..b057324b217 100644
--- a/src/vs/platform/files/test/common/files.test.ts
+++ b/src/vs/platform/files/test/common/files.test.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { isEqual, isEqualOrParent } from 'vs/base/common/extpath';
-import { isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from 'vs/base/test/common/utils';
-import { FileChangesEvent, FileChangeType, IFileChange, isParent } from 'vs/platform/files/common/files';
+import { isEqual, isEqualOrParent } from '../../../../base/common/extpath.js';
+import { isLinux, isMacintosh, isWindows } from '../../../../base/common/platform.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from '../../../../base/test/common/utils.js';
+import { FileChangesEvent, FileChangeType, IFileChange, isParent } from '../../common/files.js';
 
 suite('Files', () => {
 
diff --git a/src/vs/platform/files/test/common/nullFileSystemProvider.ts b/src/vs/platform/files/test/common/nullFileSystemProvider.ts
index 59862eaf63f..a0cbe43ae64 100644
--- a/src/vs/platform/files/test/common/nullFileSystemProvider.ts
+++ b/src/vs/platform/files/test/common/nullFileSystemProvider.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { ReadableStreamEvents } from 'vs/base/common/stream';
-import { URI } from 'vs/base/common/uri';
-import { IFileDeleteOptions, IFileOpenOptions, IFileOverwriteOptions, FileSystemProviderCapabilities, FileType, IFileWriteOptions, IFileChange, IFileSystemProvider, IStat, IWatchOptions, IFileReadStreamOptions } from 'vs/platform/files/common/files';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
+import { ReadableStreamEvents } from '../../../../base/common/stream.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IFileDeleteOptions, IFileOpenOptions, IFileOverwriteOptions, FileSystemProviderCapabilities, FileType, IFileWriteOptions, IFileChange, IFileSystemProvider, IStat, IWatchOptions, IFileReadStreamOptions } from '../../common/files.js';
 
 export class NullFileSystemProvider implements IFileSystemProvider {
 
diff --git a/src/vs/platform/files/test/common/watcher.test.ts b/src/vs/platform/files/test/common/watcher.test.ts
index 6d7bb7f3b83..f526d150463 100644
--- a/src/vs/platform/files/test/common/watcher.test.ts
+++ b/src/vs/platform/files/test/common/watcher.test.ts
@@ -4,14 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { isLinux, isWindows } from 'vs/base/common/platform';
-import { isEqual } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { FileChangeFilter, FileChangesEvent, FileChangeType, IFileChange } from 'vs/platform/files/common/files';
-import { coalesceEvents, reviveFileChanges, parseWatcherPatterns, isFiltered } from 'vs/platform/files/common/watcher';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { isLinux, isWindows } from '../../../../base/common/platform.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { FileChangeFilter, FileChangesEvent, FileChangeType, IFileChange } from '../../common/files.js';
+import { coalesceEvents, reviveFileChanges, parseWatcherPatterns, isFiltered } from '../../common/watcher.js';
 
 class TestFileWatcher extends Disposable {
 	private readonly _onDidFilesChange: Emitter<{ raw: IFileChange[]; event: FileChangesEvent }>;
diff --git a/src/vs/platform/files/test/node/diskFileService.integrationTest.ts b/src/vs/platform/files/test/node/diskFileService.integrationTest.ts
index fc2f28ffa97..38d1af9be8f 100644
--- a/src/vs/platform/files/test/node/diskFileService.integrationTest.ts
+++ b/src/vs/platform/files/test/node/diskFileService.integrationTest.ts
@@ -4,22 +4,22 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { createReadStream, existsSync, readdirSync, readFileSync, statSync, writeFileSync } from 'fs';
+import { createReadStream, existsSync, readdirSync, readFileSync, statSync, writeFileSync, promises } from 'fs';
 import { tmpdir } from 'os';
-import { timeout } from 'vs/base/common/async';
-import { bufferToReadable, bufferToStream, streamToBuffer, streamToBufferReadableStream, VSBuffer, VSBufferReadable, VSBufferReadableStream } from 'vs/base/common/buffer';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { FileAccess, Schemas } from 'vs/base/common/network';
-import { basename, dirname, join, posix } from 'vs/base/common/path';
-import { isLinux, isWindows } from 'vs/base/common/platform';
-import { joinPath } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { Promises } from 'vs/base/node/pfs';
-import { flakySuite, getRandomTestPath } from 'vs/base/test/node/testUtils';
-import { etag, IFileAtomicReadOptions, FileOperation, FileOperationError, FileOperationEvent, FileOperationResult, FilePermission, FileSystemProviderCapabilities, hasFileAtomicReadCapability, hasOpenReadWriteCloseCapability, IFileStat, IFileStatWithMetadata, IReadFileOptions, IStat, NotModifiedSinceFileOperationError, TooLargeFileOperationError, IFileAtomicOptions } from 'vs/platform/files/common/files';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
-import { NullLogService } from 'vs/platform/log/common/log';
+import { timeout } from '../../../../base/common/async.js';
+import { bufferToReadable, bufferToStream, streamToBuffer, streamToBufferReadableStream, VSBuffer, VSBufferReadable, VSBufferReadableStream } from '../../../../base/common/buffer.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { FileAccess, Schemas } from '../../../../base/common/network.js';
+import { basename, dirname, join, posix } from '../../../../base/common/path.js';
+import { isLinux, isWindows } from '../../../../base/common/platform.js';
+import { joinPath } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Promises } from '../../../../base/node/pfs.js';
+import { flakySuite, getRandomTestPath } from '../../../../base/test/node/testUtils.js';
+import { etag, IFileAtomicReadOptions, FileOperation, FileOperationError, FileOperationEvent, FileOperationResult, FilePermission, FileSystemProviderCapabilities, hasFileAtomicReadCapability, hasOpenReadWriteCloseCapability, IFileStat, IFileStatWithMetadata, IReadFileOptions, IStat, NotModifiedSinceFileOperationError, TooLargeFileOperationError, IFileAtomicOptions } from '../../common/files.js';
+import { FileService } from '../../common/fileService.js';
+import { DiskFileSystemProvider } from '../../node/diskFileSystemProvider.js';
+import { NullLogService } from '../../../log/common/log.js';
 
 function getByName(root: IFileStat, name: string): IFileStat | undefined {
 	if (root.children === undefined) {
@@ -273,7 +273,7 @@ flakySuite('Disk File Service', function () {
 				assert.strictEqual(value.mtime, undefined);
 				assert.strictEqual(value.ctime, undefined);
 			} else {
-				assert.ok(!'Unexpected value ' + basename(value.resource.fsPath));
+				assert.fail('Unexpected value ' + basename(value.resource.fsPath));
 			}
 		});
 	});
@@ -317,7 +317,7 @@ flakySuite('Disk File Service', function () {
 				assert.ok(value.mtime > 0);
 				assert.ok(value.ctime > 0);
 			} else {
-				assert.ok(!'Unexpected value ' + basename(value.resource.fsPath));
+				assert.fail('Unexpected value ' + basename(value.resource.fsPath));
 			}
 		});
 	});
@@ -429,7 +429,7 @@ flakySuite('Disk File Service', function () {
 
 	test('resolve - folder symbolic link', async () => {
 		const link = URI.file(join(testDir, 'deep-link'));
-		await Promises.symlink(join(testDir, 'deep'), link.fsPath, 'junction');
+		await promises.symlink(join(testDir, 'deep'), link.fsPath, 'junction');
 
 		const resolved = await service.resolve(link);
 		assert.strictEqual(resolved.children!.length, 4);
@@ -439,7 +439,7 @@ flakySuite('Disk File Service', function () {
 
 	(isWindows ? test.skip /* windows: cannot create file symbolic link without elevated context */ : test)('resolve - file symbolic link', async () => {
 		const link = URI.file(join(testDir, 'lorem.txt-linked'));
-		await Promises.symlink(join(testDir, 'lorem.txt'), link.fsPath);
+		await promises.symlink(join(testDir, 'lorem.txt'), link.fsPath);
 
 		const resolved = await service.resolve(link);
 		assert.strictEqual(resolved.isDirectory, false);
@@ -447,7 +447,7 @@ flakySuite('Disk File Service', function () {
 	});
 
 	test('resolve - symbolic link pointing to nonexistent file does not break', async () => {
-		await Promises.symlink(join(testDir, 'foo'), join(testDir, 'bar'), 'junction');
+		await promises.symlink(join(testDir, 'foo'), join(testDir, 'bar'), 'junction');
 
 		const resolved = await service.resolve(URI.file(testDir));
 		assert.strictEqual(resolved.isDirectory, true);
@@ -530,7 +530,7 @@ flakySuite('Disk File Service', function () {
 	(isWindows ? test.skip /* windows: cannot create file symbolic link without elevated context */ : test)('deleteFile - symbolic link (exists)', async () => {
 		const target = URI.file(join(testDir, 'lorem.txt'));
 		const link = URI.file(join(testDir, 'lorem.txt-linked'));
-		await Promises.symlink(target.fsPath, link.fsPath);
+		await promises.symlink(target.fsPath, link.fsPath);
 
 		const source = await service.resolve(link);
 
@@ -552,7 +552,7 @@ flakySuite('Disk File Service', function () {
 	(isWindows ? test.skip /* windows: cannot create file symbolic link without elevated context */ : test)('deleteFile - symbolic link (pointing to nonexistent file)', async () => {
 		const target = URI.file(join(testDir, 'foo'));
 		const link = URI.file(join(testDir, 'bar'));
-		await Promises.symlink(target.fsPath, link.fsPath);
+		await promises.symlink(target.fsPath, link.fsPath);
 
 		let event: FileOperationEvent;
 		disposables.add(service.onDidRunOperation(e => event = e));
@@ -1692,7 +1692,7 @@ flakySuite('Disk File Service', function () {
 
 	(isWindows ? test.skip /* windows: cannot create file symbolic link without elevated context */ : test)('readFile - dangling symbolic link - https://github.com/microsoft/vscode/issues/116049', async () => {
 		const link = URI.file(join(testDir, 'small.js-link'));
-		await Promises.symlink(join(testDir, 'small.js'), link.fsPath);
+		await promises.symlink(join(testDir, 'small.js'), link.fsPath);
 
 		let error: FileOperationError | undefined = undefined;
 		try {
@@ -1833,7 +1833,7 @@ flakySuite('Disk File Service', function () {
 
 	(isWindows ? test.skip /* windows: cannot create file symbolic link without elevated context */ : test)('writeFile - atomic writing does not break symlinks', async () => {
 		const link = URI.file(join(testDir, 'lorem.txt-linked'));
-		await Promises.symlink(join(testDir, 'lorem.txt'), link.fsPath);
+		await promises.symlink(join(testDir, 'lorem.txt'), link.fsPath);
 
 		const content = 'Updates to the lorem file';
 		await service.writeFile(link, VSBuffer.fromString(content), { atomic: { postfix: '.vsctmp' } });
@@ -2006,7 +2006,7 @@ flakySuite('Disk File Service', function () {
 				// Here since `close` is not called, all other writes are
 				// waiting on the barrier to release, so doing a readFile
 				// should give us a consistent view of the file contents
-				assert.strictEqual((await Promises.readFile(resource.fsPath)).toString(), content);
+				assert.strictEqual((await promises.readFile(resource.fsPath)).toString(), content);
 			} finally {
 				await provider.close(fd);
 			}
@@ -2030,10 +2030,10 @@ flakySuite('Disk File Service', function () {
 
 		try {
 			await provider.write(fd1, 0, VSBuffer.fromString(newContent).buffer, 0, VSBuffer.fromString(newContent).buffer.byteLength);
-			assert.strictEqual((await Promises.readFile(resource1.fsPath)).toString(), newContent);
+			assert.strictEqual((await promises.readFile(resource1.fsPath)).toString(), newContent);
 
 			await provider.write(fd2, 0, VSBuffer.fromString(newContent).buffer, 0, VSBuffer.fromString(newContent).buffer.byteLength);
-			assert.strictEqual((await Promises.readFile(resource2.fsPath)).toString(), newContent);
+			assert.strictEqual((await promises.readFile(resource2.fsPath)).toString(), newContent);
 		} finally {
 			await Promise.allSettled([
 				await provider.close(fd1),
@@ -2059,7 +2059,7 @@ flakySuite('Disk File Service', function () {
 
 		assert.ok(error); // expected because `new-folder` does not exist
 
-		await Promises.mkdir(newFolder);
+		await promises.mkdir(newFolder);
 
 		const content = readFileSync(URI.file(join(testDir, 'lorem.txt')).fsPath);
 		const newContent = content.toString() + content.toString();
@@ -2069,7 +2069,7 @@ flakySuite('Disk File Service', function () {
 		try {
 			await provider.write(fd, 0, newContentBuffer, 0, newContentBuffer.byteLength);
 
-			assert.strictEqual((await Promises.readFile(newResource.fsPath)).toString(), newContent);
+			assert.strictEqual((await promises.readFile(newResource.fsPath)).toString(), newContent);
 		} finally {
 			await provider.close(fd);
 		}
@@ -2291,8 +2291,8 @@ flakySuite('Disk File Service', function () {
 		const content = await service.writeFile(lockedFile, VSBuffer.fromString('Locked File'));
 		assert.strictEqual(content.locked, false);
 
-		const stats = await Promises.stat(lockedFile.fsPath);
-		await Promises.chmod(lockedFile.fsPath, stats.mode & ~0o200);
+		const stats = await promises.stat(lockedFile.fsPath);
+		await promises.chmod(lockedFile.fsPath, stats.mode & ~0o200);
 
 		let stat = await service.stat(lockedFile);
 		assert.strictEqual(stat.locked, true);
diff --git a/src/vs/platform/files/test/node/nodejsWatcher.integrationTest.ts b/src/vs/platform/files/test/node/nodejsWatcher.test.ts
similarity index 88%
rename from src/vs/platform/files/test/node/nodejsWatcher.integrationTest.ts
rename to src/vs/platform/files/test/node/nodejsWatcher.test.ts
index f4eaa0f2aac..4b42b0b0900 100644
--- a/src/vs/platform/files/test/node/nodejsWatcher.integrationTest.ts
+++ b/src/vs/platform/files/test/node/nodejsWatcher.test.ts
@@ -3,33 +3,38 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as fs from 'fs';
 import assert from 'assert';
 import { tmpdir } from 'os';
-import { basename, dirname, join } from 'vs/base/common/path';
-import { Promises, RimRafMode } from 'vs/base/node/pfs';
-import { flakySuite, getRandomTestPath } from 'vs/base/test/node/testUtils';
-import { FileChangeFilter, FileChangeType } from 'vs/platform/files/common/files';
-import { INonRecursiveWatchRequest, IRecursiveWatcherWithSubscribe } from 'vs/platform/files/common/watcher';
-import { watchFileContents } from 'vs/platform/files/node/watcher/nodejs/nodejsWatcherLib';
-import { isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
-import { getDriveLetter } from 'vs/base/common/extpath';
-import { ltrim } from 'vs/base/common/strings';
-import { DeferredPromise, timeout } from 'vs/base/common/async';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { NodeJSWatcher } from 'vs/platform/files/node/watcher/nodejs/nodejsWatcher';
-import { FileAccess } from 'vs/base/common/network';
-import { extUriBiasedIgnorePathCase } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { addUNCHostToAllowlist } from 'vs/base/node/unc';
-import { Emitter, Event } from 'vs/base/common/event';
-import { TestParcelWatcher } from 'vs/platform/files/test/node/parcelWatcher.integrationTest';
+import { basename, dirname, join } from '../../../../base/common/path.js';
+import { Promises, RimRafMode } from '../../../../base/node/pfs.js';
+import { getRandomTestPath } from '../../../../base/test/node/testUtils.js';
+import { FileChangeFilter, FileChangeType } from '../../common/files.js';
+import { INonRecursiveWatchRequest, IRecursiveWatcherWithSubscribe } from '../../common/watcher.js';
+import { watchFileContents } from '../../node/watcher/nodejs/nodejsWatcherLib.js';
+import { isLinux, isMacintosh, isWindows } from '../../../../base/common/platform.js';
+import { getDriveLetter } from '../../../../base/common/extpath.js';
+import { ltrim } from '../../../../base/common/strings.js';
+import { DeferredPromise, timeout } from '../../../../base/common/async.js';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { NodeJSWatcher } from '../../node/watcher/nodejs/nodejsWatcher.js';
+import { FileAccess } from '../../../../base/common/network.js';
+import { extUriBiasedIgnorePathCase } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { addUNCHostToAllowlist } from '../../../../base/node/unc.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { TestParcelWatcher } from './parcelWatcher.test.js';
 
 // this suite has shown flaky runs in Azure pipelines where
 // tasks would just hang and timeout after a while (not in
 // mocha but generally). as such they will run only on demand
 // whenever we update the watcher library.
 
-((process.env['BUILD_SOURCEVERSION'] || process.env['CI']) ? suite.skip : flakySuite)('File Watcher (node.js)', () => {
+/* eslint-disable local/code-ensure-no-disposables-leak-in-test */
+
+suite.skip('File Watcher (node.js)', function () {
+
+	this.timeout(10000);
 
 	class TestNodeJSWatcher extends NodeJSWatcher {
 
@@ -40,6 +45,10 @@ import { TestParcelWatcher } from 'vs/platform/files/test/node/parcelWatcher.int
 
 		readonly onWatchFail = this._onDidWatchFail.event;
 
+		protected override getUpdateWatchersDelay(): number {
+			return 0;
+		}
+
 		protected override async doWatch(requests: INonRecursiveWatchRequest[]): Promise<void> {
 			await super.doWatch(requests);
 			for (const watcher of this.watchers) {
@@ -60,7 +69,7 @@ import { TestParcelWatcher } from 'vs/platform/files/test/node/parcelWatcher.int
 		watcher?.setVerboseLogging(enable);
 	}
 
-	enableLogging(false);
+	enableLogging(loggingEnabled);
 
 	setup(async () => {
 		await createWatcher(undefined);
@@ -154,7 +163,7 @@ import { TestParcelWatcher } from 'vs/platform/files/test/node/parcelWatcher.int
 		// New folder
 		const newFolderPath = join(testDir, 'New Folder');
 		changeFuture = awaitEvent(watcher, newFolderPath, FileChangeType.ADDED);
-		await Promises.mkdir(newFolderPath);
+		await fs.promises.mkdir(newFolderPath);
 		await changeFuture;
 
 		// Rename file
@@ -216,7 +225,7 @@ import { TestParcelWatcher } from 'vs/platform/files/test/node/parcelWatcher.int
 		// Copy file
 		const copiedFilepath = join(testDir, 'copiedFile.txt');
 		changeFuture = awaitEvent(watcher, copiedFilepath, FileChangeType.ADDED);
-		await Promises.copyFile(movedFilepath, copiedFilepath);
+		await fs.promises.copyFile(movedFilepath, copiedFilepath);
 		await changeFuture;
 
 		// Copy folder
@@ -238,12 +247,12 @@ import { TestParcelWatcher } from 'vs/platform/files/test/node/parcelWatcher.int
 
 		// Delete file
 		changeFuture = awaitEvent(watcher, copiedFilepath, FileChangeType.DELETED);
-		await Promises.unlink(copiedFilepath);
+		await fs.promises.unlink(copiedFilepath);
 		await changeFuture;
 
 		// Delete folder
 		changeFuture = awaitEvent(watcher, copiedFolderpath, FileChangeType.DELETED);
-		await Promises.rmdir(copiedFolderpath);
+		await fs.promises.rmdir(copiedFolderpath);
 		await changeFuture;
 
 		watcher.dispose();
@@ -266,7 +275,7 @@ import { TestParcelWatcher } from 'vs/platform/files/test/node/parcelWatcher.int
 
 		// Delete file
 		changeFuture = awaitEvent(watcher, filePath, FileChangeType.DELETED);
-		await Promises.unlink(filePath);
+		await fs.promises.unlink(filePath);
 		await changeFuture;
 
 		// Recreate watcher
@@ -286,7 +295,7 @@ import { TestParcelWatcher } from 'vs/platform/files/test/node/parcelWatcher.int
 		// Delete + Recreate file
 		const newFilePath = join(testDir, 'lorem.txt');
 		const changeFuture: Promise<unknown> = awaitEvent(watcher, newFilePath, FileChangeType.UPDATED);
-		await Promises.unlink(newFilePath);
+		await fs.promises.unlink(newFilePath);
 		Promises.writeFile(newFilePath, 'Hello Atomic World');
 		await changeFuture;
 	});
@@ -298,7 +307,7 @@ import { TestParcelWatcher } from 'vs/platform/files/test/node/parcelWatcher.int
 		// Delete + Recreate file
 		const newFilePath = join(filePath);
 		const changeFuture: Promise<unknown> = awaitEvent(watcher, newFilePath, FileChangeType.UPDATED);
-		await Promises.unlink(newFilePath);
+		await fs.promises.unlink(newFilePath);
 		Promises.writeFile(newFilePath, 'Hello Atomic World');
 		await changeFuture;
 	});
@@ -359,9 +368,9 @@ import { TestParcelWatcher } from 'vs/platform/files/test/node/parcelWatcher.int
 		const deleteFuture3: Promise<unknown> = awaitEvent(watcher, newFilePath3, FileChangeType.DELETED);
 
 		await Promise.all([
-			await Promises.unlink(newFilePath1),
-			await Promises.unlink(newFilePath2),
-			await Promises.unlink(newFilePath3)
+			await fs.promises.unlink(newFilePath1),
+			await fs.promises.unlink(newFilePath2),
+			await fs.promises.unlink(newFilePath3)
 		]);
 
 		await Promise.all([deleteFuture1, deleteFuture2, deleteFuture3]);
@@ -440,7 +449,7 @@ import { TestParcelWatcher } from 'vs/platform/files/test/node/parcelWatcher.int
 	(isWindows /* windows: cannot create file symbolic link without elevated context */ ? test.skip : test)('symlink support (folder watch)', async function () {
 		const link = join(testDir, 'deep-linked');
 		const linkTarget = join(testDir, 'deep');
-		await Promises.symlink(linkTarget, link);
+		await fs.promises.symlink(linkTarget, link);
 
 		await watcher.watch([{ path: link, excludes: [], recursive: false }]);
 
@@ -467,14 +476,14 @@ import { TestParcelWatcher } from 'vs/platform/files/test/node/parcelWatcher.int
 
 		// Delete file
 		changeFuture = awaitEvent(watcher, filePath, FileChangeType.DELETED, correlationId, expectedCount);
-		await Promises.unlink(await Promises.realpath(filePath)); // support symlinks
+		await fs.promises.unlink(await Promises.realpath(filePath)); // support symlinks
 		await changeFuture;
 	}
 
 	(isWindows /* windows: cannot create file symbolic link without elevated context */ ? test.skip : test)('symlink support (file watch)', async function () {
 		const link = join(testDir, 'lorem.txt-linked');
 		const linkTarget = join(testDir, 'lorem.txt');
-		await Promises.symlink(linkTarget, link);
+		await fs.promises.symlink(linkTarget, link);
 
 		await watcher.watch([{ path: link, excludes: [], recursive: false }]);
 
@@ -579,7 +588,7 @@ import { TestParcelWatcher } from 'vs/platform/files/test/node/parcelWatcher.int
 
 		const onDidWatchFail = Event.toPromise(watcher.onWatchFail);
 		const changeFuture = awaitEvent(watcher, filePath, FileChangeType.DELETED, 1);
-		Promises.unlink(filePath);
+		fs.promises.unlink(filePath);
 		await onDidWatchFail;
 		await changeFuture;
 		assert.strictEqual(instance.failed, true);
@@ -597,89 +606,89 @@ import { TestParcelWatcher } from 'vs/platform/files/test/node/parcelWatcher.int
 		await changeFuture;
 	});
 
-	test('correlated watch requests support suspend/resume (file, does not exist in beginning)', async function () {
+	test('watch requests support suspend/resume (file, does not exist in beginning)', async function () {
 		const filePath = join(testDir, 'not-found.txt');
 
 		const onDidWatchFail = Event.toPromise(watcher.onWatchFail);
-		const request = { path: filePath, excludes: [], recursive: false, correlationId: 1 };
+		const request = { path: filePath, excludes: [], recursive: false };
 		await watcher.watch([request]);
 		await onDidWatchFail;
 		assert.strictEqual(watcher.isSuspended(request), 'polling');
 
-		await basicCrudTest(filePath, undefined, 1, undefined, true);
-		await basicCrudTest(filePath, undefined, 1, undefined, true);
+		await basicCrudTest(filePath, undefined, null, undefined, true);
+		await basicCrudTest(filePath, undefined, null, undefined, true);
 	});
 
-	test('correlated watch requests support suspend/resume (file, exists in beginning)', async function () {
+	test('watch requests support suspend/resume (file, exists in beginning)', async function () {
 		const filePath = join(testDir, 'lorem.txt');
-		const request = { path: filePath, excludes: [], recursive: false, correlationId: 1 };
+		const request = { path: filePath, excludes: [], recursive: false };
 		await watcher.watch([request]);
 
 		const onDidWatchFail = Event.toPromise(watcher.onWatchFail);
-		await basicCrudTest(filePath, true, 1);
+		await basicCrudTest(filePath, true);
 		await onDidWatchFail;
 		assert.strictEqual(watcher.isSuspended(request), 'polling');
 
-		await basicCrudTest(filePath, undefined, 1, undefined, true);
+		await basicCrudTest(filePath, undefined, null, undefined, true);
 	});
 
-	test('correlated watch requests support suspend/resume (folder, does not exist in beginning)', async function () {
+	test('watch requests support suspend/resume (folder, does not exist in beginning)', async function () {
 		let onDidWatchFail = Event.toPromise(watcher.onWatchFail);
 
 		const folderPath = join(testDir, 'not-found');
-		const request = { path: folderPath, excludes: [], recursive: false, correlationId: 1 };
+		const request = { path: folderPath, excludes: [], recursive: false };
 		await watcher.watch([request]);
 		await onDidWatchFail;
 		assert.strictEqual(watcher.isSuspended(request), 'polling');
 
-		let changeFuture = awaitEvent(watcher, folderPath, FileChangeType.ADDED, 1);
+		let changeFuture = awaitEvent(watcher, folderPath, FileChangeType.ADDED);
 		let onDidWatch = Event.toPromise(watcher.onDidWatch);
-		await Promises.mkdir(folderPath);
+		await fs.promises.mkdir(folderPath);
 		await changeFuture;
 		await onDidWatch;
 
 		assert.strictEqual(watcher.isSuspended(request), false);
 
-		const filePath = join(folderPath, 'newFile.txt');
-		await basicCrudTest(filePath, undefined, 1);
+		if (isWindows) { // somehow failing on macOS/Linux
+			const filePath = join(folderPath, 'newFile.txt');
+			await basicCrudTest(filePath);
 
-		if (!isMacintosh) { // macOS does not report DELETE events for folders
 			onDidWatchFail = Event.toPromise(watcher.onWatchFail);
-			await Promises.rmdir(folderPath);
+			await fs.promises.rmdir(folderPath);
 			await onDidWatchFail;
 
-			changeFuture = awaitEvent(watcher, folderPath, FileChangeType.ADDED, 1);
+			changeFuture = awaitEvent(watcher, folderPath, FileChangeType.ADDED);
 			onDidWatch = Event.toPromise(watcher.onDidWatch);
-			await Promises.mkdir(folderPath);
+			await fs.promises.mkdir(folderPath);
 			await changeFuture;
 			await onDidWatch;
 
 			await timeout(500); // somehow needed on Linux
 
-			await basicCrudTest(filePath, undefined, 1);
+			await basicCrudTest(filePath);
 		}
 	});
 
-	(isMacintosh /* macOS: does not seem to report this */ ? test.skip : test)('correlated watch requests support suspend/resume (folder, exists in beginning)', async function () {
+	(isMacintosh /* macOS: does not seem to report this */ ? test.skip : test)('watch requests support suspend/resume (folder, exists in beginning)', async function () {
 		const folderPath = join(testDir, 'deep');
-		await watcher.watch([{ path: folderPath, excludes: [], recursive: false, correlationId: 1 }]);
+		await watcher.watch([{ path: folderPath, excludes: [], recursive: false }]);
 
 		const filePath = join(folderPath, 'newFile.txt');
-		await basicCrudTest(filePath, undefined, 1);
+		await basicCrudTest(filePath);
 
 		const onDidWatchFail = Event.toPromise(watcher.onWatchFail);
 		await Promises.rm(folderPath);
 		await onDidWatchFail;
 
-		const changeFuture = awaitEvent(watcher, folderPath, FileChangeType.ADDED, 1);
+		const changeFuture = awaitEvent(watcher, folderPath, FileChangeType.ADDED);
 		const onDidWatch = Event.toPromise(watcher.onDidWatch);
-		await Promises.mkdir(folderPath);
+		await fs.promises.mkdir(folderPath);
 		await changeFuture;
 		await onDidWatch;
 
 		await timeout(500); // somehow needed on Linux
 
-		await basicCrudTest(filePath, undefined, 1);
+		await basicCrudTest(filePath);
 	});
 
 	test('parcel watcher reused when present for non-recursive file watching (uncorrelated)', function () {
@@ -740,7 +749,7 @@ import { TestParcelWatcher } from 'vs/platform/files/test/node/parcelWatcher.int
 		assert.strictEqual(instance.isReusingRecursiveWatcher, false);
 	}
 
-	test('correlated watch requests support suspend/resume (file, does not exist in beginning, parcel watcher reused)', async function () {
+	test('watch requests support suspend/resume (file, does not exist in beginning, parcel watcher reused)', async function () {
 		const recursiveWatcher = createParcelWatcher();
 		await recursiveWatcher.watch([{ path: testDir, excludes: [], recursive: true }]);
 
@@ -749,12 +758,12 @@ import { TestParcelWatcher } from 'vs/platform/files/test/node/parcelWatcher.int
 		const filePath = join(testDir, 'not-found-2.txt');
 
 		const onDidWatchFail = Event.toPromise(watcher.onWatchFail);
-		const request = { path: filePath, excludes: [], recursive: false, correlationId: 1 };
+		const request = { path: filePath, excludes: [], recursive: false };
 		await watcher.watch([request]);
 		await onDidWatchFail;
 		assert.strictEqual(watcher.isSuspended(request), true);
 
-		const changeFuture = awaitEvent(watcher, filePath, FileChangeType.ADDED, 1);
+		const changeFuture = awaitEvent(watcher, filePath, FileChangeType.ADDED);
 		await Promises.writeFile(filePath, 'Hello World');
 		await changeFuture;
 
@@ -773,7 +782,7 @@ import { TestParcelWatcher } from 'vs/platform/files/test/node/parcelWatcher.int
 
 		// Delete file
 		changeFuture = awaitEvent(watcher, filePath, FileChangeType.DELETED, 1);
-		await Promises.unlink(filePath);
+		await fs.promises.unlink(filePath);
 		await changeFuture;
 	});
 
@@ -789,7 +798,7 @@ import { TestParcelWatcher } from 'vs/platform/files/test/node/parcelWatcher.int
 
 		// Delete file
 		changeFuture = awaitEvent(watcher, filePath, FileChangeType.DELETED, 1);
-		await Promises.unlink(filePath);
+		await fs.promises.unlink(filePath);
 		await changeFuture;
 	});
 });
diff --git a/src/vs/platform/files/test/node/parcelWatcher.integrationTest.ts b/src/vs/platform/files/test/node/parcelWatcher.test.ts
similarity index 90%
rename from src/vs/platform/files/test/node/parcelWatcher.integrationTest.ts
rename to src/vs/platform/files/test/node/parcelWatcher.test.ts
index 5bbeefc9036..c25c061fbed 100644
--- a/src/vs/platform/files/test/node/parcelWatcher.integrationTest.ts
+++ b/src/vs/platform/files/test/node/parcelWatcher.test.ts
@@ -4,24 +4,24 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { realpathSync } from 'fs';
+import { realpathSync, promises } from 'fs';
 import { tmpdir } from 'os';
-import { timeout } from 'vs/base/common/async';
-import { dirname, join } from 'vs/base/common/path';
-import { isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
-import { Promises, RimRafMode } from 'vs/base/node/pfs';
-import { flakySuite, getRandomTestPath } from 'vs/base/test/node/testUtils';
-import { FileChangeFilter, FileChangeType, IFileChange } from 'vs/platform/files/common/files';
-import { ParcelWatcher } from 'vs/platform/files/node/watcher/parcel/parcelWatcher';
-import { IRecursiveWatchRequest } from 'vs/platform/files/common/watcher';
-import { getDriveLetter } from 'vs/base/common/extpath';
-import { ltrim } from 'vs/base/common/strings';
-import { FileAccess } from 'vs/base/common/network';
-import { extUriBiasedIgnorePathCase } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { addUNCHostToAllowlist } from 'vs/base/node/unc';
-import { Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import { timeout } from '../../../../base/common/async.js';
+import { dirname, join } from '../../../../base/common/path.js';
+import { isLinux, isMacintosh, isWindows } from '../../../../base/common/platform.js';
+import { Promises, RimRafMode } from '../../../../base/node/pfs.js';
+import { getRandomTestPath } from '../../../../base/test/node/testUtils.js';
+import { FileChangeFilter, FileChangeType, IFileChange } from '../../common/files.js';
+import { ParcelWatcher } from '../../node/watcher/parcel/parcelWatcher.js';
+import { IRecursiveWatchRequest } from '../../common/watcher.js';
+import { getDriveLetter } from '../../../../base/common/extpath.js';
+import { ltrim } from '../../../../base/common/strings.js';
+import { FileAccess } from '../../../../base/common/network.js';
+import { extUriBiasedIgnorePathCase } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { addUNCHostToAllowlist } from '../../../../base/node/unc.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
 
 export class TestParcelWatcher extends ParcelWatcher {
 
@@ -42,6 +42,10 @@ export class TestParcelWatcher extends ParcelWatcher {
 		return this.removeDuplicateRequests(requests, false /* validate paths skipped for tests */).map(request => request.path);
 	}
 
+	protected override getUpdateWatchersDelay(): number {
+		return 0;
+	}
+
 	protected override async doWatch(requests: IRecursiveWatchRequest[]): Promise<void> {
 		await super.doWatch(requests);
 		await this.whenReady();
@@ -61,7 +65,11 @@ export class TestParcelWatcher extends ParcelWatcher {
 // mocha but generally). as such they will run only on demand
 // whenever we update the watcher library.
 
-((process.env['BUILD_SOURCEVERSION'] || process.env['CI']) ? suite.skip : flakySuite)('File Watcher (parcel)', () => {
+/* eslint-disable local/code-ensure-no-disposables-leak-in-test */
+
+suite.skip('File Watcher (parcel)', function () {
+
+	this.timeout(10000);
 
 	let testDir: string;
 	let watcher: TestParcelWatcher;
@@ -73,7 +81,7 @@ export class TestParcelWatcher extends ParcelWatcher {
 		watcher?.setVerboseLogging(enable);
 	}
 
-	enableLogging(false);
+	enableLogging(loggingEnabled);
 
 	setup(async () => {
 		watcher = new TestParcelWatcher();
@@ -216,7 +224,7 @@ export class TestParcelWatcher extends ParcelWatcher {
 		assert.strictEqual(instance.include(newFolderPath), true);
 		assert.strictEqual(instance.exclude(newFolderPath), false);
 		changeFuture = awaitEvent(watcher, newFolderPath, FileChangeType.ADDED);
-		await Promises.mkdir(newFolderPath);
+		await promises.mkdir(newFolderPath);
 		await changeFuture;
 		assert.strictEqual(subscriptions1.get(newFolderPath), FileChangeType.ADDED);
 		assert.strictEqual(subscriptions2.has(newFolderPath), false /* subscription was disposed before the event */);
@@ -286,7 +294,7 @@ export class TestParcelWatcher extends ParcelWatcher {
 		// Copy file
 		const copiedFilepath = join(testDir, 'deep', 'copiedFile.txt');
 		changeFuture = awaitEvent(watcher, copiedFilepath, FileChangeType.ADDED);
-		await Promises.copyFile(movedFilepath, copiedFilepath);
+		await promises.copyFile(movedFilepath, copiedFilepath);
 		await changeFuture;
 
 		// Copy folder
@@ -308,30 +316,30 @@ export class TestParcelWatcher extends ParcelWatcher {
 
 		// Read file does not emit event
 		changeFuture = awaitEvent(watcher, anotherNewFilePath, FileChangeType.UPDATED, 'unexpected-event-from-read-file');
-		await Promises.readFile(anotherNewFilePath);
+		await promises.readFile(anotherNewFilePath);
 		await Promise.race([timeout(100), changeFuture]);
 
 		// Stat file does not emit event
 		changeFuture = awaitEvent(watcher, anotherNewFilePath, FileChangeType.UPDATED, 'unexpected-event-from-stat');
-		await Promises.stat(anotherNewFilePath);
+		await promises.stat(anotherNewFilePath);
 		await Promise.race([timeout(100), changeFuture]);
 
 		// Stat folder does not emit event
 		changeFuture = awaitEvent(watcher, copiedFolderpath, FileChangeType.UPDATED, 'unexpected-event-from-stat');
-		await Promises.stat(copiedFolderpath);
+		await promises.stat(copiedFolderpath);
 		await Promise.race([timeout(100), changeFuture]);
 
 		// Delete file
 		changeFuture = awaitEvent(watcher, copiedFilepath, FileChangeType.DELETED);
 		disposables.add(instance.subscribe(copiedFilepath, change => subscriptions1.set(change.resource.fsPath, change.type)));
-		await Promises.unlink(copiedFilepath);
+		await promises.unlink(copiedFilepath);
 		await changeFuture;
 		assert.strictEqual(subscriptions1.get(copiedFilepath), FileChangeType.DELETED);
 
 		// Delete folder
 		changeFuture = awaitEvent(watcher, copiedFolderpath, FileChangeType.DELETED);
 		disposables.add(instance.subscribe(copiedFolderpath, change => subscriptions1.set(change.resource.fsPath, change.type)));
-		await Promises.rmdir(copiedFolderpath);
+		await promises.rmdir(copiedFolderpath);
 		await changeFuture;
 		assert.strictEqual(subscriptions1.get(copiedFolderpath), FileChangeType.DELETED);
 
@@ -344,7 +352,7 @@ export class TestParcelWatcher extends ParcelWatcher {
 		// Delete + Recreate file
 		const newFilePath = join(testDir, 'deep', 'conway.js');
 		const changeFuture = awaitEvent(watcher, newFilePath, FileChangeType.UPDATED);
-		await Promises.unlink(newFilePath);
+		await promises.unlink(newFilePath);
 		Promises.writeFile(newFilePath, 'Hello Atomic World');
 		await changeFuture;
 	});
@@ -369,13 +377,13 @@ export class TestParcelWatcher extends ParcelWatcher {
 
 		// Delete file
 		changeFuture = awaitEvent(watcher, filePath, FileChangeType.DELETED, undefined, correlationId, expectedCount);
-		await Promises.unlink(filePath);
+		await promises.unlink(filePath);
 		await changeFuture;
 	}
 
 	test('multiple events', async function () {
 		await watcher.watch([{ path: testDir, excludes: [], recursive: true }]);
-		await Promises.mkdir(join(testDir, 'deep-multiple'));
+		await promises.mkdir(join(testDir, 'deep-multiple'));
 
 		// multiple add
 
@@ -445,12 +453,12 @@ export class TestParcelWatcher extends ParcelWatcher {
 		const deleteFuture6 = awaitEvent(watcher, newFilePath6, FileChangeType.DELETED);
 
 		await Promise.all([
-			await Promises.unlink(newFilePath1),
-			await Promises.unlink(newFilePath2),
-			await Promises.unlink(newFilePath3),
-			await Promises.unlink(newFilePath4),
-			await Promises.unlink(newFilePath5),
-			await Promises.unlink(newFilePath6)
+			await promises.unlink(newFilePath1),
+			await promises.unlink(newFilePath2),
+			await promises.unlink(newFilePath3),
+			await promises.unlink(newFilePath4),
+			await promises.unlink(newFilePath5),
+			await promises.unlink(newFilePath6)
 		]);
 
 		await Promise.all([deleteFuture1, deleteFuture2, deleteFuture3, deleteFuture4, deleteFuture5, deleteFuture6]);
@@ -559,7 +567,7 @@ export class TestParcelWatcher extends ParcelWatcher {
 	(isWindows /* windows: cannot create file symbolic link without elevated context */ ? test.skip : test)('symlink support (root)', async function () {
 		const link = join(testDir, 'deep-linked');
 		const linkTarget = join(testDir, 'deep');
-		await Promises.symlink(linkTarget, link);
+		await promises.symlink(linkTarget, link);
 
 		await watcher.watch([{ path: link, excludes: [], recursive: true }]);
 
@@ -569,7 +577,7 @@ export class TestParcelWatcher extends ParcelWatcher {
 	(isWindows /* windows: cannot create file symbolic link without elevated context */ ? test.skip : test)('symlink support (via extra watch)', async function () {
 		const link = join(testDir, 'deep-linked');
 		const linkTarget = join(testDir, 'deep');
-		await Promises.symlink(linkTarget, link);
+		await promises.symlink(linkTarget, link);
 
 		await watcher.watch([{ path: testDir, excludes: [], recursive: true }, { path: link, excludes: [], recursive: true }]);
 
@@ -613,7 +621,7 @@ export class TestParcelWatcher extends ParcelWatcher {
 
 		// Restore watched path
 		await timeout(1500); // node.js watcher used for monitoring folder restore is async
-		await Promises.mkdir(watchedPath);
+		await promises.mkdir(watchedPath);
 		await timeout(1500); // restart is delayed
 		await watcher.whenReady();
 
@@ -739,15 +747,15 @@ export class TestParcelWatcher extends ParcelWatcher {
 		assert.strictEqual(instance.failed, true);
 	});
 
-	test('correlated watch requests support suspend/resume (folder, does not exist in beginning, not reusing watcher)', async () => {
-		await testCorrelatedWatchFolderDoesNotExist(false);
+	test('watch requests support suspend/resume (folder, does not exist in beginning, not reusing watcher)', async () => {
+		await testWatchFolderDoesNotExist(false);
 	});
 
-	(!isMacintosh /* Linux/Windows: times out for some reason */ ? test.skip : test)('correlated watch requests support suspend/resume (folder, does not exist in beginning, reusing watcher)', async () => {
-		await testCorrelatedWatchFolderDoesNotExist(true);
+	(!isMacintosh /* Linux/Windows: times out for some reason */ ? test.skip : test)('watch requests support suspend/resume (folder, does not exist in beginning, reusing watcher)', async () => {
+		await testWatchFolderDoesNotExist(true);
 	});
 
-	async function testCorrelatedWatchFolderDoesNotExist(reuseExistingWatcher: boolean) {
+	async function testWatchFolderDoesNotExist(reuseExistingWatcher: boolean) {
 		let onDidWatchFail = Event.toPromise(watcher.onWatchFail);
 
 		const folderPath = join(testDir, 'not-found');
@@ -758,7 +766,7 @@ export class TestParcelWatcher extends ParcelWatcher {
 			await watcher.watch(requests);
 		}
 
-		const request: IRecursiveWatchRequest = { path: folderPath, excludes: [], recursive: true, correlationId: 1 };
+		const request: IRecursiveWatchRequest = { path: folderPath, excludes: [], recursive: true };
 		requests.push(request);
 
 		await watcher.watch(requests);
@@ -770,42 +778,42 @@ export class TestParcelWatcher extends ParcelWatcher {
 			assert.strictEqual(watcher.isSuspended(request), 'polling');
 		}
 
-		let changeFuture = awaitEvent(watcher, folderPath, FileChangeType.ADDED, undefined, 1);
+		let changeFuture = awaitEvent(watcher, folderPath, FileChangeType.ADDED);
 		let onDidWatch = Event.toPromise(watcher.onDidWatch);
-		await Promises.mkdir(folderPath);
+		await promises.mkdir(folderPath);
 		await changeFuture;
 		await onDidWatch;
 
 		assert.strictEqual(watcher.isSuspended(request), false);
 
 		const filePath = join(folderPath, 'newFile.txt');
-		await basicCrudTest(filePath, 1);
+		await basicCrudTest(filePath);
 
 		onDidWatchFail = Event.toPromise(watcher.onWatchFail);
 		await Promises.rm(folderPath);
 		await onDidWatchFail;
 
-		changeFuture = awaitEvent(watcher, folderPath, FileChangeType.ADDED, undefined, 1);
+		changeFuture = awaitEvent(watcher, folderPath, FileChangeType.ADDED);
 		onDidWatch = Event.toPromise(watcher.onDidWatch);
-		await Promises.mkdir(folderPath);
+		await promises.mkdir(folderPath);
 		await changeFuture;
 		await onDidWatch;
 
-		await basicCrudTest(filePath, 1);
+		await basicCrudTest(filePath);
 	}
 
-	test('correlated watch requests support suspend/resume (folder, exist in beginning, not reusing watcher)', async () => {
-		await testCorrelatedWatchFolderExists(false);
+	test('watch requests support suspend/resume (folder, exist in beginning, not reusing watcher)', async () => {
+		await testWatchFolderExists(false);
 	});
 
-	(!isMacintosh /* Linux/Windows: times out for some reason */ ? test.skip : test)('correlated watch requests support suspend/resume (folder, exist in beginning, reusing watcher)', async () => {
-		await testCorrelatedWatchFolderExists(true);
+	(!isMacintosh /* Linux/Windows: times out for some reason */ ? test.skip : test)('watch requests support suspend/resume (folder, exist in beginning, reusing watcher)', async () => {
+		await testWatchFolderExists(true);
 	});
 
-	async function testCorrelatedWatchFolderExists(reuseExistingWatcher: boolean) {
+	async function testWatchFolderExists(reuseExistingWatcher: boolean) {
 		const folderPath = join(testDir, 'deep');
 
-		const requests: IRecursiveWatchRequest[] = [{ path: folderPath, excludes: [], recursive: true, correlationId: 1 }];
+		const requests: IRecursiveWatchRequest[] = [{ path: folderPath, excludes: [], recursive: true }];
 		if (reuseExistingWatcher) {
 			requests.push({ path: testDir, excludes: [], recursive: true });
 		}
@@ -813,19 +821,19 @@ export class TestParcelWatcher extends ParcelWatcher {
 		await watcher.watch(requests);
 
 		const filePath = join(folderPath, 'newFile.txt');
-		await basicCrudTest(filePath, 1);
+		await basicCrudTest(filePath);
 
 		const onDidWatchFail = Event.toPromise(watcher.onWatchFail);
 		await Promises.rm(folderPath);
 		await onDidWatchFail;
 
-		const changeFuture = awaitEvent(watcher, folderPath, FileChangeType.ADDED, undefined, 1);
+		const changeFuture = awaitEvent(watcher, folderPath, FileChangeType.ADDED);
 		const onDidWatch = Event.toPromise(watcher.onDidWatch);
-		await Promises.mkdir(folderPath);
+		await promises.mkdir(folderPath);
 		await changeFuture;
 		await onDidWatch;
 
-		await basicCrudTest(filePath, 1);
+		await basicCrudTest(filePath);
 	}
 
 	test('watch request reuses another recursive watcher even when requests are coming in at the same time', async function () {
@@ -860,7 +868,7 @@ export class TestParcelWatcher extends ParcelWatcher {
 
 		// Delete file
 		changeFuture = awaitEvent(watcher, filePath, FileChangeType.DELETED, undefined, 1);
-		await Promises.unlink(filePath);
+		await promises.unlink(filePath);
 		await changeFuture;
 	});
 });
diff --git a/src/vs/platform/history/browser/contextScopedHistoryWidget.ts b/src/vs/platform/history/browser/contextScopedHistoryWidget.ts
index a1ba7444f2e..4c401062680 100644
--- a/src/vs/platform/history/browser/contextScopedHistoryWidget.ts
+++ b/src/vs/platform/history/browser/contextScopedHistoryWidget.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IHistoryNavigationWidget } from 'vs/base/browser/history';
-import { IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview';
-import { FindInput, IFindInputOptions } from 'vs/base/browser/ui/findinput/findInput';
-import { IReplaceInputOptions, ReplaceInput } from 'vs/base/browser/ui/findinput/replaceInput';
-import { HistoryInputBox, IHistoryInputOptions } from 'vs/base/browser/ui/inputbox/inputBox';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { localize } from 'vs/nls';
-import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { isActiveElement } from 'vs/base/browser/dom';
+import { IHistoryNavigationWidget } from '../../../base/browser/history.js';
+import { IContextViewProvider } from '../../../base/browser/ui/contextview/contextview.js';
+import { FindInput, IFindInputOptions } from '../../../base/browser/ui/findinput/findInput.js';
+import { IReplaceInputOptions, ReplaceInput } from '../../../base/browser/ui/findinput/replaceInput.js';
+import { HistoryInputBox, IHistoryInputOptions } from '../../../base/browser/ui/inputbox/inputBox.js';
+import { KeyCode, KeyMod } from '../../../base/common/keyCodes.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from '../../contextkey/common/contextkey.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../keybinding/common/keybindingsRegistry.js';
+import { localize } from '../../../nls.js';
+import { DisposableStore, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { isActiveElement } from '../../../base/browser/dom.js';
 
 export const historyNavigationVisible = new RawContextKey<boolean>('suggestWidgetVisible', false, localize('suggestWidgetVisible', "Whether suggestion are visible"));
 
diff --git a/src/vs/platform/history/browser/historyWidgetKeybindingHint.ts b/src/vs/platform/history/browser/historyWidgetKeybindingHint.ts
index bef0f5efec8..ab56b565780 100644
--- a/src/vs/platform/history/browser/historyWidgetKeybindingHint.ts
+++ b/src/vs/platform/history/browser/historyWidgetKeybindingHint.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { IKeybindingService } from '../../keybinding/common/keybinding.js';
 
 export function showHistoryKeybindingHint(keybindingService: IKeybindingService): boolean {
 	return keybindingService.lookupKeybinding('history.showPrevious')?.getElectronAccelerator() === 'Up' && keybindingService.lookupKeybinding('history.showNext')?.getElectronAccelerator() === 'Down';
diff --git a/src/vs/platform/hover/browser/hover.ts b/src/vs/platform/hover/browser/hover.ts
index 51ead712fcb..779a4598fbc 100644
--- a/src/vs/platform/hover/browser/hover.ts
+++ b/src/vs/platform/hover/browser/hover.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { IHoverDelegate, IHoverDelegateOptions } from 'vs/base/browser/ui/hover/hoverDelegate';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { addStandardDisposableListener, isHTMLElement } from 'vs/base/browser/dom';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import type { IHoverDelegate2, IHoverOptions, IHoverWidget } from 'vs/base/browser/ui/hover/hover';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { Disposable, DisposableStore } from '../../../base/common/lifecycle.js';
+import { IHoverDelegate, IHoverDelegateOptions } from '../../../base/browser/ui/hover/hoverDelegate.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { addStandardDisposableListener, isHTMLElement } from '../../../base/browser/dom.js';
+import { KeyCode } from '../../../base/common/keyCodes.js';
+import type { IHoverDelegate2, IHoverOptions, IHoverWidget } from '../../../base/browser/ui/hover/hover.js';
 
 export const IHoverService = createDecorator<IHoverService>('hoverService');
 
diff --git a/src/vs/platform/hover/test/browser/nullHoverService.ts b/src/vs/platform/hover/test/browser/nullHoverService.ts
index 44c73f8a0a6..a4266ef7c93 100644
--- a/src/vs/platform/hover/test/browser/nullHoverService.ts
+++ b/src/vs/platform/hover/test/browser/nullHoverService.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import type { IHoverService } from 'vs/platform/hover/browser/hover';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import type { IHoverService } from '../../browser/hover.js';
 
 export const NullHoverService: IHoverService = {
 	_serviceBrand: undefined,
diff --git a/src/vs/platform/instantiation/common/extensions.ts b/src/vs/platform/instantiation/common/extensions.ts
index fd60abf4011..517a8cc2a3a 100644
--- a/src/vs/platform/instantiation/common/extensions.ts
+++ b/src/vs/platform/instantiation/common/extensions.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SyncDescriptor } from './descriptors';
-import { BrandedService, ServiceIdentifier } from './instantiation';
+import { SyncDescriptor } from './descriptors.js';
+import { BrandedService, ServiceIdentifier } from './instantiation.js';
 
 const _registry: [ServiceIdentifier<any>, SyncDescriptor<any>][] = [];
 
diff --git a/src/vs/platform/instantiation/common/instantiation.ts b/src/vs/platform/instantiation/common/instantiation.ts
index c1ce6565271..04e6e316649 100644
--- a/src/vs/platform/instantiation/common/instantiation.ts
+++ b/src/vs/platform/instantiation/common/instantiation.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import * as descriptors from './descriptors';
-import { ServiceCollection } from './serviceCollection';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import * as descriptors from './descriptors.js';
+import { ServiceCollection } from './serviceCollection.js';
 
 // ------ internal util
 
@@ -52,7 +52,7 @@ export interface IInstantiationService {
 	 * Synchronously creates an instance that is denoted by the descriptor
 	 */
 	createInstance<T>(descriptor: descriptors.SyncDescriptor0<T>): T;
-	createInstance<Ctor extends new (...args: any[]) => any, R extends InstanceType<Ctor>>(ctor: Ctor, ...args: GetLeadingNonServiceArgs<ConstructorParameters<Ctor>>): R;
+	createInstance<Ctor extends new (...args: any[]) => unknown, R extends InstanceType<Ctor>>(ctor: Ctor, ...args: GetLeadingNonServiceArgs<ConstructorParameters<Ctor>>): R;
 
 	/**
 	 * Calls a function with a service accessor.
@@ -106,7 +106,7 @@ export function createDecorator<T>(serviceId: string): ServiceIdentifier<T> {
 		return _util.serviceIds.get(serviceId)!;
 	}
 
-	const id = <any>function (target: Function, key: string, index: number): any {
+	const id = <any>function (target: Function, key: string, index: number) {
 		if (arguments.length !== 3) {
 			throw new Error('@IServiceName-decorator can only be used to decorate a parameter');
 		}
diff --git a/src/vs/platform/instantiation/common/instantiationService.ts b/src/vs/platform/instantiation/common/instantiationService.ts
index 4b313ed32eb..86099cc8b66 100644
--- a/src/vs/platform/instantiation/common/instantiationService.ts
+++ b/src/vs/platform/instantiation/common/instantiationService.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { GlobalIdleValue } from 'vs/base/common/async';
-import { Event } from 'vs/base/common/event';
-import { illegalState } from 'vs/base/common/errors';
-import { DisposableStore, dispose, IDisposable, isDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { SyncDescriptor, SyncDescriptor0 } from 'vs/platform/instantiation/common/descriptors';
-import { Graph } from 'vs/platform/instantiation/common/graph';
-import { GetLeadingNonServiceArgs, IInstantiationService, ServiceIdentifier, ServicesAccessor, _util } from 'vs/platform/instantiation/common/instantiation';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { LinkedList } from 'vs/base/common/linkedList';
+import { GlobalIdleValue } from '../../../base/common/async.js';
+import { Event } from '../../../base/common/event.js';
+import { illegalState } from '../../../base/common/errors.js';
+import { DisposableStore, dispose, IDisposable, isDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { SyncDescriptor, SyncDescriptor0 } from './descriptors.js';
+import { Graph } from './graph.js';
+import { GetLeadingNonServiceArgs, IInstantiationService, ServiceIdentifier, ServicesAccessor, _util } from './instantiation.js';
+import { ServiceCollection } from './serviceCollection.js';
+import { LinkedList } from '../../../base/common/linkedList.js';
 
 // TRACING
 const _enableAllTracing = false
@@ -114,8 +114,8 @@ export class InstantiationService implements IInstantiationService {
 	}
 
 	createInstance<T>(descriptor: SyncDescriptor0<T>): T;
-	createInstance<Ctor extends new (...args: any[]) => any, R extends InstanceType<Ctor>>(ctor: Ctor, ...args: GetLeadingNonServiceArgs<ConstructorParameters<Ctor>>): R;
-	createInstance(ctorOrDescriptor: any | SyncDescriptor<any>, ...rest: any[]): any {
+	createInstance<Ctor extends new (...args: any[]) => unknown, R extends InstanceType<Ctor>>(ctor: Ctor, ...args: GetLeadingNonServiceArgs<ConstructorParameters<Ctor>>): R;
+	createInstance(ctorOrDescriptor: any | SyncDescriptor<any>, ...rest: any[]): unknown {
 		this._throwIfDisposed();
 
 		let _trace: Trace;
@@ -216,8 +216,15 @@ export class InstantiationService implements IInstantiationService {
 
 		let cycleCount = 0;
 		const stack = [{ id, desc, _trace }];
+		const seen = new Set<string>();
 		while (stack.length) {
 			const item = stack.pop()!;
+
+			if (seen.has(String(item.id))) {
+				continue;
+			}
+			seen.add(String(item.id));
+
 			graph.lookupOrInsertNode(item);
 
 			// a weak but working heuristic for cycle checks
@@ -323,7 +330,7 @@ export class InstantiationService implements IInstantiationService {
 				return result;
 			});
 			return <T>new Proxy(Object.create(null), {
-				get(target: any, key: PropertyKey): any {
+				get(target: any, key: PropertyKey): unknown {
 
 					if (!idle.isInitialized) {
 						// looks like an event
diff --git a/src/vs/platform/instantiation/common/serviceCollection.ts b/src/vs/platform/instantiation/common/serviceCollection.ts
index 4f33e7e75e5..13c489e8325 100644
--- a/src/vs/platform/instantiation/common/serviceCollection.ts
+++ b/src/vs/platform/instantiation/common/serviceCollection.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
-import { SyncDescriptor } from './descriptors';
+import { ServiceIdentifier } from './instantiation.js';
+import { SyncDescriptor } from './descriptors.js';
 
 export class ServiceCollection {
 
diff --git a/src/vs/platform/instantiation/test/common/graph.test.ts b/src/vs/platform/instantiation/test/common/graph.test.ts
index 99e8e0e75a0..36777f910b6 100644
--- a/src/vs/platform/instantiation/test/common/graph.test.ts
+++ b/src/vs/platform/instantiation/test/common/graph.test.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Graph } from 'vs/platform/instantiation/common/graph';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { Graph } from '../../common/graph.js';
 
 suite('Graph', () => {
 
diff --git a/src/vs/platform/instantiation/test/common/instantiationService.test.ts b/src/vs/platform/instantiation/test/common/instantiationService.test.ts
index 70718ba712d..a4d07c1b2b6 100644
--- a/src/vs/platform/instantiation/test/common/instantiationService.test.ts
+++ b/src/vs/platform/instantiation/test/common/instantiationService.test.ts
@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Emitter, Event } from 'vs/base/common/event';
-import { dispose } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { createDecorator, IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { dispose } from '../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { SyncDescriptor } from '../../common/descriptors.js';
+import { createDecorator, IInstantiationService, ServicesAccessor } from '../../common/instantiation.js';
+import { InstantiationService } from '../../common/instantiationService.js';
+import { ServiceCollection } from '../../common/serviceCollection.js';
 
 const IService1 = createDecorator<IService1>('service1');
 
diff --git a/src/vs/platform/instantiation/test/common/instantiationServiceMock.ts b/src/vs/platform/instantiation/test/common/instantiationServiceMock.ts
index a7c52175e9d..0e90a07d1ca 100644
--- a/src/vs/platform/instantiation/test/common/instantiationServiceMock.ts
+++ b/src/vs/platform/instantiation/test/common/instantiationServiceMock.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as sinon from 'sinon';
-import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
-import { InstantiationService, Trace } from 'vs/platform/instantiation/common/instantiationService';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
+import { DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { SyncDescriptor } from '../../common/descriptors.js';
+import { ServiceIdentifier } from '../../common/instantiation.js';
+import { InstantiationService, Trace } from '../../common/instantiationService.js';
+import { ServiceCollection } from '../../common/serviceCollection.js';
 
 interface IServiceMock<T> {
 	id: ServiceIdentifier<T>;
diff --git a/src/vs/platform/ipc/common/mainProcessService.ts b/src/vs/platform/ipc/common/mainProcessService.ts
index a9e67cbd5a6..3caec1ebd45 100644
--- a/src/vs/platform/ipc/common/mainProcessService.ts
+++ b/src/vs/platform/ipc/common/mainProcessService.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IChannel, IPCServer, IServerChannel, StaticRouter } from 'vs/base/parts/ipc/common/ipc';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IRemoteService } from 'vs/platform/ipc/common/services';
+import { IChannel, IPCServer, IServerChannel, StaticRouter } from '../../../base/parts/ipc/common/ipc.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { IRemoteService } from './services.js';
 
 export const IMainProcessService = createDecorator<IMainProcessService>('mainProcessService');
 
diff --git a/src/vs/platform/ipc/common/services.ts b/src/vs/platform/ipc/common/services.ts
index 08a1ffea09d..ae6de92a98f 100644
--- a/src/vs/platform/ipc/common/services.ts
+++ b/src/vs/platform/ipc/common/services.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IChannel, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
+import { IChannel, IServerChannel } from '../../../base/parts/ipc/common/ipc.js';
 
 export interface IRemoteService {
 
diff --git a/src/vs/platform/ipc/electron-sandbox/mainProcessService.ts b/src/vs/platform/ipc/electron-sandbox/mainProcessService.ts
index 423919570cd..8707d26a237 100644
--- a/src/vs/platform/ipc/electron-sandbox/mainProcessService.ts
+++ b/src/vs/platform/ipc/electron-sandbox/mainProcessService.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IChannel, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
-import { Client as IPCElectronClient } from 'vs/base/parts/ipc/electron-sandbox/ipc.electron';
-import { IMainProcessService } from 'vs/platform/ipc/common/mainProcessService';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { IChannel, IServerChannel } from '../../../base/parts/ipc/common/ipc.js';
+import { Client as IPCElectronClient } from '../../../base/parts/ipc/electron-sandbox/ipc.electron.js';
+import { IMainProcessService } from '../common/mainProcessService.js';
 
 /**
  * An implementation of `IMainProcessService` that leverages Electron's IPC.
diff --git a/src/vs/platform/ipc/electron-sandbox/services.ts b/src/vs/platform/ipc/electron-sandbox/services.ts
index 060ef30d96d..b03e23621d9 100644
--- a/src/vs/platform/ipc/electron-sandbox/services.ts
+++ b/src/vs/platform/ipc/electron-sandbox/services.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IChannel, ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { createDecorator, IInstantiationService, ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
-import { IMainProcessService } from 'vs/platform/ipc/common/mainProcessService';
-import { IRemoteService } from 'vs/platform/ipc/common/services';
+import { IChannel, ProxyChannel } from '../../../base/parts/ipc/common/ipc.js';
+import { SyncDescriptor } from '../../instantiation/common/descriptors.js';
+import { registerSingleton } from '../../instantiation/common/extensions.js';
+import { createDecorator, IInstantiationService, ServiceIdentifier } from '../../instantiation/common/instantiation.js';
+import { IMainProcessService } from '../common/mainProcessService.js';
+import { IRemoteService } from '../common/services.js';
 
 type ChannelClientCtor<T> = { new(channel: IChannel, ...args: any[]): T };
 type Remote = { getChannel(channelName: string): IChannel };
diff --git a/src/vs/platform/issue/common/issue.ts b/src/vs/platform/issue/common/issue.ts
index 81f3a8083ca..3fc9e76e852 100644
--- a/src/vs/platform/issue/common/issue.ts
+++ b/src/vs/platform/issue/common/issue.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { UriComponents } from 'vs/base/common/uri';
-import { ISandboxConfiguration } from 'vs/base/parts/sandbox/common/sandboxTypes';
-import { PerformanceInfo, SystemInfo } from 'vs/platform/diagnostics/common/diagnostics';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { UriComponents } from '../../../base/common/uri.js';
+import { ISandboxConfiguration } from '../../../base/parts/sandbox/common/sandboxTypes.js';
+import { PerformanceInfo, SystemInfo } from '../../diagnostics/common/diagnostics.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 // Since data sent through the service is serialized to JSON, functions will be lost, so Color objects
 // should not be sent as their 'toString' method will be stripped. Instead convert to strings before sending.
@@ -19,7 +19,7 @@ export interface WindowData {
 	zoomLevel: number;
 }
 
-export const enum IssueType {
+export const enum OldIssueType {
 	Bug,
 	PerformanceIssue,
 	FeatureRequest
@@ -31,7 +31,7 @@ export enum IssueSource {
 	Marketplace = 'marketplace'
 }
 
-export interface IssueReporterStyles extends WindowStyles {
+export interface OldIssueReporterStyles extends WindowStyles {
 	textLinkColor?: string;
 	textLinkActiveForeground?: string;
 	inputBackground?: string;
@@ -49,7 +49,7 @@ export interface IssueReporterStyles extends WindowStyles {
 	sliderActiveColor?: string;
 }
 
-export interface IssueReporterExtensionData {
+export interface OldIssueReporterExtensionData {
 	name: string;
 	publisher: string | undefined;
 	version: string;
@@ -65,10 +65,10 @@ export interface IssueReporterExtensionData {
 	uri?: UriComponents;
 }
 
-export interface IssueReporterData extends WindowData {
-	styles: IssueReporterStyles;
-	enabledExtensions: IssueReporterExtensionData[];
-	issueType?: IssueType;
+export interface OldIssueReporterData extends WindowData {
+	styles: OldIssueReporterStyles;
+	enabledExtensions: OldIssueReporterExtensionData[];
+	issueType?: OldIssueType;
 	issueSource?: IssueSource;
 	extensionId?: string;
 	experiments?: string;
@@ -109,9 +109,9 @@ export interface ProcessExplorerData extends WindowData {
 	applicationName: string;
 }
 
-export interface IssueReporterWindowConfiguration extends ISandboxConfiguration {
+export interface OldIssueReporterWindowConfiguration extends ISandboxConfiguration {
 	disableExtensions: boolean;
-	data: IssueReporterData;
+	data: OldIssueReporterData;
 	os: {
 		type: string;
 		arch: string;
@@ -127,18 +127,24 @@ export const IIssueMainService = createDecorator<IIssueMainService>('issueServic
 
 export interface IIssueMainService {
 	readonly _serviceBrand: undefined;
-	stopTracing(): Promise<void>;
-	openReporter(data: IssueReporterData): Promise<void>;
-	openProcessExplorer(data: ProcessExplorerData): Promise<void>;
-	getSystemStatus(): Promise<string>;
-
 	// Used by the issue reporter
-
-	$getSystemInfo(): Promise<SystemInfo>;
-	$getPerformanceInfo(): Promise<PerformanceInfo>;
+	openReporter(data: OldIssueReporterData): Promise<void>;
 	$reloadWithExtensionsDisabled(): Promise<void>;
 	$showConfirmCloseDialog(): Promise<void>;
 	$showClipboardDialog(): Promise<boolean>;
-	$sendReporterMenu(extensionId: string, extensionName: string): Promise<IssueReporterData | undefined>;
+	$sendReporterMenu(extensionId: string, extensionName: string): Promise<OldIssueReporterData | undefined>;
 	$closeReporter(): Promise<void>;
 }
+
+export const IProcessMainService = createDecorator<IProcessMainService>('processService');
+
+export interface IProcessMainService {
+	readonly _serviceBrand: undefined;
+	getSystemStatus(): Promise<string>;
+	stopTracing(): Promise<void>;
+	openProcessExplorer(data: ProcessExplorerData): Promise<void>;
+
+	// Used by the process explorer
+	$getSystemInfo(): Promise<SystemInfo>;
+	$getPerformanceInfo(): Promise<PerformanceInfo>;
+}
diff --git a/src/vs/platform/issue/common/issueReporterUtil.ts b/src/vs/platform/issue/common/issueReporterUtil.ts
index da2b397ba94..3a2266e308e 100644
--- a/src/vs/platform/issue/common/issueReporterUtil.ts
+++ b/src/vs/platform/issue/common/issueReporterUtil.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { rtrim } from 'vs/base/common/strings';
+import { rtrim } from '../../../base/common/strings.js';
 
 export function normalizeGitHubUrl(url: string): string {
 	// If the url has a .git suffix, remove it
diff --git a/src/vs/platform/issue/electron-main/issueMainService.ts b/src/vs/platform/issue/electron-main/issueMainService.ts
index 62e2d9ff341..5be83d34d22 100644
--- a/src/vs/platform/issue/electron-main/issueMainService.ts
+++ b/src/vs/platform/issue/electron-main/issueMainService.ts
@@ -3,34 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BrowserWindow, BrowserWindowConstructorOptions, contentTracing, Display, IpcMainEvent, screen } from 'electron';
+import { BrowserWindow, BrowserWindowConstructorOptions, Display, screen } from 'electron';
 import { arch, release, type } from 'os';
-import { raceTimeout } from 'vs/base/common/async';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { randomPath } from 'vs/base/common/extpath';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { FileAccess } from 'vs/base/common/network';
-import { IProcessEnvironment, isMacintosh } from 'vs/base/common/platform';
-import { listProcesses } from 'vs/base/node/ps';
-import { validatedIpcMain } from 'vs/base/parts/ipc/electron-main/ipcMain';
-import { localize } from 'vs/nls';
-import { IDiagnosticsService, isRemoteDiagnosticError, PerformanceInfo, SystemInfo } from 'vs/platform/diagnostics/common/diagnostics';
-import { IDiagnosticsMainService } from 'vs/platform/diagnostics/electron-main/diagnosticsMainService';
-import { IDialogMainService } from 'vs/platform/dialogs/electron-main/dialogMainService';
-import { IEnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
-import { IIssueMainService, IssueReporterData, IssueReporterWindowConfiguration, ProcessExplorerData, ProcessExplorerWindowConfiguration } from 'vs/platform/issue/common/issue';
-import { ILogService } from 'vs/platform/log/common/log';
-import { INativeHostMainService } from 'vs/platform/native/electron-main/nativeHostMainService';
-import product from 'vs/platform/product/common/product';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IIPCObjectUrl, IProtocolMainService } from 'vs/platform/protocol/electron-main/protocol';
-import { IStateService } from 'vs/platform/state/node/state';
-import { UtilityProcess } from 'vs/platform/utilityProcess/electron-main/utilityProcess';
-import { zoomLevelToZoomFactor } from 'vs/platform/window/common/window';
-import { ICodeWindow, IWindowState } from 'vs/platform/window/electron-main/window';
-import { IWindowsMainService } from 'vs/platform/windows/electron-main/windows';
-
-const processExplorerWindowState = 'issue.processExplorerWindowState';
+import { raceTimeout } from '../../../base/common/async.js';
+import { CancellationTokenSource } from '../../../base/common/cancellation.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { FileAccess } from '../../../base/common/network.js';
+import { IProcessEnvironment, isMacintosh } from '../../../base/common/platform.js';
+import { validatedIpcMain } from '../../../base/parts/ipc/electron-main/ipcMain.js';
+import { getNLSLanguage, getNLSMessages, localize } from '../../../nls.js';
+import { IDialogMainService } from '../../dialogs/electron-main/dialogMainService.js';
+import { IEnvironmentMainService } from '../../environment/electron-main/environmentMainService.js';
+import { IIssueMainService, OldIssueReporterData, OldIssueReporterWindowConfiguration } from '../common/issue.js';
+import { ILogService } from '../../log/common/log.js';
+import { INativeHostMainService } from '../../native/electron-main/nativeHostMainService.js';
+import product from '../../product/common/product.js';
+import { IIPCObjectUrl, IProtocolMainService } from '../../protocol/electron-main/protocol.js';
+import { zoomLevelToZoomFactor } from '../../window/common/window.js';
+import { ICodeWindow, IWindowState } from '../../window/electron-main/window.js';
+import { IWindowsMainService } from '../../windows/electron-main/windows.js';
+import { ICSSDevelopmentService } from '../../cssDev/node/cssDevService.js';
 
 interface IBrowserWindowOptions {
 	backgroundColor: string | undefined;
@@ -50,104 +42,26 @@ export class IssueMainService implements IIssueMainService {
 	private issueReporterWindow: BrowserWindow | null = null;
 	private issueReporterParentWindow: BrowserWindow | null = null;
 
-	private processExplorerWindow: BrowserWindow | null = null;
-	private processExplorerParentWindow: BrowserWindow | null = null;
-
 	constructor(
 		private userEnv: IProcessEnvironment,
 		@IEnvironmentMainService private readonly environmentMainService: IEnvironmentMainService,
 		@ILogService private readonly logService: ILogService,
-		@IDiagnosticsService private readonly diagnosticsService: IDiagnosticsService,
-		@IDiagnosticsMainService private readonly diagnosticsMainService: IDiagnosticsMainService,
 		@IDialogMainService private readonly dialogMainService: IDialogMainService,
 		@INativeHostMainService private readonly nativeHostMainService: INativeHostMainService,
 		@IProtocolMainService private readonly protocolMainService: IProtocolMainService,
-		@IProductService private readonly productService: IProductService,
-		@IStateService private readonly stateService: IStateService,
 		@IWindowsMainService private readonly windowsMainService: IWindowsMainService,
-	) {
-		this.registerListeners();
-	}
-
-	//#region Register Listeners
-
-	private registerListeners(): void {
-		validatedIpcMain.on('vscode:listProcesses', async event => {
-			const processes = [];
-
-			try {
-				processes.push({ name: localize('local', "Local"), rootProcess: await listProcesses(process.pid) });
-
-				const remoteDiagnostics = await this.diagnosticsMainService.getRemoteDiagnostics({ includeProcesses: true });
-				remoteDiagnostics.forEach(data => {
-					if (isRemoteDiagnosticError(data)) {
-						processes.push({
-							name: data.hostName,
-							rootProcess: data
-						});
-					} else {
-						if (data.processes) {
-							processes.push({
-								name: data.hostName,
-								rootProcess: data.processes
-							});
-						}
-					}
-				});
-			} catch (e) {
-				this.logService.error(`Listing processes failed: ${e}`);
-			}
-
-			this.safeSend(event, 'vscode:listProcessesResponse', processes);
-		});
-
-		validatedIpcMain.on('vscode:workbenchCommand', (_: unknown, commandInfo: { id: any; from: any; args: any }) => {
-			const { id, from, args } = commandInfo;
-
-			let parentWindow: BrowserWindow | null;
-			switch (from) {
-				case 'processExplorer':
-					parentWindow = this.processExplorerParentWindow;
-					break;
-				default:
-					// The issue reporter does not use this anymore.
-					throw new Error(`Unexpected command source: ${from}`);
-			}
-
-			parentWindow?.webContents.send('vscode:runAction', { id, from, args });
-		});
-
-		validatedIpcMain.on('vscode:closeProcessExplorer', event => {
-			this.processExplorerWindow?.close();
-		});
-
-		validatedIpcMain.on('vscode:pidToNameRequest', async event => {
-			const mainProcessInfo = await this.diagnosticsMainService.getMainDiagnostics();
-
-			const pidToNames: [number, string][] = [];
-			for (const window of mainProcessInfo.windows) {
-				pidToNames.push([window.pid, `window [${window.id}] (${window.title})`]);
-			}
-
-			for (const { pid, name } of UtilityProcess.getAll()) {
-				pidToNames.push([pid, name]);
-			}
-
-			this.safeSend(event, 'vscode:pidToNameResponse', pidToNames);
-		});
-	}
-
-	//#endregion
+		@ICSSDevelopmentService private readonly cssDevelopmentService: ICSSDevelopmentService,
+	) { }
 
 	//#region Used by renderer
 
-	async openReporter(data: IssueReporterData): Promise<void> {
+	async openReporter(data: OldIssueReporterData): Promise<void> {
 		if (!this.issueReporterWindow) {
 			this.issueReporterParentWindow = BrowserWindow.getFocusedWindow();
 			if (this.issueReporterParentWindow) {
 				const issueReporterDisposables = new DisposableStore();
 
-				const issueReporterWindowConfigUrl = issueReporterDisposables.add(this.protocolMainService.createIPCObjectUrl<IssueReporterWindowConfiguration>());
+				const issueReporterWindowConfigUrl = issueReporterDisposables.add(this.protocolMainService.createIPCObjectUrl<OldIssueReporterWindowConfiguration>());
 				const position = this.getWindowPosition(this.issueReporterParentWindow, 700, 800);
 
 				this.issueReporterWindow = this.createBrowserWindow(position, issueReporterWindowConfigUrl, {
@@ -169,7 +83,12 @@ export class IssueMainService implements IIssueMainService {
 						arch: arch(),
 						release: release(),
 					},
-					product
+					product,
+					nls: {
+						messages: getNLSMessages(),
+						language: getNLSLanguage()
+					},
+					cssModules: this.cssDevelopmentService.isEnabled ? await this.cssDevelopmentService.getCssModules() : undefined
 				});
 
 				this.issueReporterWindow.loadURL(
@@ -196,125 +115,9 @@ export class IssueMainService implements IIssueMainService {
 		}
 	}
 
-	async openProcessExplorer(data: ProcessExplorerData): Promise<void> {
-		if (!this.processExplorerWindow) {
-			this.processExplorerParentWindow = BrowserWindow.getFocusedWindow();
-			if (this.processExplorerParentWindow) {
-				const processExplorerDisposables = new DisposableStore();
-
-				const processExplorerWindowConfigUrl = processExplorerDisposables.add(this.protocolMainService.createIPCObjectUrl<ProcessExplorerWindowConfiguration>());
-
-				const savedPosition = this.stateService.getItem<IWindowState>(processExplorerWindowState, undefined);
-				const position = isStrictWindowState(savedPosition) ? savedPosition : this.getWindowPosition(this.processExplorerParentWindow, 800, 500);
-
-				this.processExplorerWindow = this.createBrowserWindow(position, processExplorerWindowConfigUrl, {
-					backgroundColor: data.styles.backgroundColor,
-					title: localize('processExplorer', "Process Explorer"),
-					zoomLevel: data.zoomLevel,
-					alwaysOnTop: true
-				}, 'process-explorer');
-
-				// Store into config object URL
-				processExplorerWindowConfigUrl.update({
-					appRoot: this.environmentMainService.appRoot,
-					windowId: this.processExplorerWindow.id,
-					userEnv: this.userEnv,
-					data,
-					product
-				});
-
-				this.processExplorerWindow.loadURL(
-					FileAccess.asBrowserUri(`vs/code/electron-sandbox/processExplorer/processExplorer${this.environmentMainService.isBuilt ? '' : '-dev'}.html`).toString(true)
-				);
-
-				this.processExplorerWindow.on('close', () => {
-					this.processExplorerWindow = null;
-					processExplorerDisposables.dispose();
-				});
-
-				this.processExplorerParentWindow.on('close', () => {
-					if (this.processExplorerWindow) {
-						this.processExplorerWindow.close();
-						this.processExplorerWindow = null;
-
-						processExplorerDisposables.dispose();
-					}
-				});
-
-				const storeState = () => {
-					if (!this.processExplorerWindow) {
-						return;
-					}
-					const size = this.processExplorerWindow.getSize();
-					const position = this.processExplorerWindow.getPosition();
-					if (!size || !position) {
-						return;
-					}
-					const state: IWindowState = {
-						width: size[0],
-						height: size[1],
-						x: position[0],
-						y: position[1]
-					};
-					this.stateService.setItem(processExplorerWindowState, state);
-				};
-
-				this.processExplorerWindow.on('moved', storeState);
-				this.processExplorerWindow.on('resized', storeState);
-			}
-		}
-
-		if (this.processExplorerWindow) {
-			this.focusWindow(this.processExplorerWindow);
-		}
-	}
-
-	async stopTracing(): Promise<void> {
-		if (!this.environmentMainService.args.trace) {
-			return; // requires tracing to be on
-		}
-
-		const path = await contentTracing.stopRecording(`${randomPath(this.environmentMainService.userHome.fsPath, this.productService.applicationName)}.trace.txt`);
-
-		// Inform user to report an issue
-		await this.dialogMainService.showMessageBox({
-			type: 'info',
-			message: localize('trace.message', "Successfully created the trace file"),
-			detail: localize('trace.detail', "Please create an issue and manually attach the following file:\n{0}", path),
-			buttons: [localize({ key: 'trace.ok', comment: ['&& denotes a mnemonic'] }, "&&OK")],
-		}, BrowserWindow.getFocusedWindow() ?? undefined);
-
-		// Show item in explorer
-		this.nativeHostMainService.showItemInFolder(undefined, path);
-	}
-
-	async getSystemStatus(): Promise<string> {
-		const [info, remoteData] = await Promise.all([this.diagnosticsMainService.getMainDiagnostics(), this.diagnosticsMainService.getRemoteDiagnostics({ includeProcesses: false, includeWorkspaceMetadata: false })]);
-
-		return this.diagnosticsService.getDiagnostics(info, remoteData);
-	}
-
 	//#endregion
 
 	//#region used by issue reporter window
-
-	async $getSystemInfo(): Promise<SystemInfo> {
-		const [info, remoteData] = await Promise.all([this.diagnosticsMainService.getMainDiagnostics(), this.diagnosticsMainService.getRemoteDiagnostics({ includeProcesses: false, includeWorkspaceMetadata: false })]);
-		const msg = await this.diagnosticsService.getSystemInfo(info, remoteData);
-		return msg;
-	}
-
-	async $getPerformanceInfo(): Promise<PerformanceInfo> {
-		try {
-			const [info, remoteData] = await Promise.all([this.diagnosticsMainService.getMainDiagnostics(), this.diagnosticsMainService.getRemoteDiagnostics({ includeProcesses: true, includeWorkspaceMetadata: true })]);
-			return await this.diagnosticsService.getPerformanceInfo(info, remoteData);
-		} catch (error) {
-			this.logService.warn('issueService#getPerformanceInfo ', error.message);
-
-			throw error;
-		}
-	}
-
 	async $reloadWithExtensionsDisabled(): Promise<void> {
 		if (this.issueReporterParentWindow) {
 			try {
@@ -373,26 +176,22 @@ export class IssueMainService implements IIssueMainService {
 		return window;
 	}
 
-	async $sendReporterMenu(extensionId: string, extensionName: string): Promise<IssueReporterData | undefined> {
+	async $sendReporterMenu(extensionId: string, extensionName: string): Promise<OldIssueReporterData | undefined> {
 		const window = this.issueReporterWindowCheck();
 		const replyChannel = `vscode:triggerReporterMenu`;
 		const cts = new CancellationTokenSource();
 		window.sendWhenReady(replyChannel, cts.token, { replyChannel, extensionId, extensionName });
-		const result = await raceTimeout(new Promise(resolve => validatedIpcMain.once(`vscode:triggerReporterMenuResponse:${extensionId}`, (_: unknown, data: IssueReporterData | undefined) => resolve(data))), 5000, () => {
+		const result = await raceTimeout(new Promise(resolve => validatedIpcMain.once(`vscode:triggerReporterMenuResponse:${extensionId}`, (_: unknown, data: OldIssueReporterData | undefined) => resolve(data))), 5000, () => {
 			this.logService.error(`Error: Extension ${extensionId} timed out waiting for menu response`);
 			cts.cancel();
 		});
-		return result as IssueReporterData | undefined;
+		return result as OldIssueReporterData | undefined;
 	}
 
 	async $closeReporter(): Promise<void> {
 		this.issueReporterWindow?.close();
 	}
 
-	async closeProcessExplorer(): Promise<void> {
-		this.processExplorerWindow?.close();
-	}
-
 	//#endregion
 
 	private focusWindow(window: BrowserWindow): void {
@@ -403,14 +202,8 @@ export class IssueMainService implements IIssueMainService {
 		window.focus();
 	}
 
-	private safeSend(event: IpcMainEvent, channel: string, ...args: unknown[]): void {
-		if (!event.sender.isDestroyed()) {
-			event.sender.send(channel, ...args);
-		}
-	}
-
 	private createBrowserWindow<T>(position: IWindowState, ipcObjectUrl: IIPCObjectUrl<T>, options: IBrowserWindowOptions, windowKind: string): BrowserWindow {
-		const window = new BrowserWindow({
+		const windowOptions: BrowserWindowConstructorOptions & { experimentalDarkMode: boolean } = {
 			fullscreen: false,
 			skipTaskbar: false,
 			resizable: true,
@@ -433,7 +226,8 @@ export class IssueMainService implements IIssueMainService {
 			},
 			alwaysOnTop: options.alwaysOnTop,
 			experimentalDarkMode: true
-		} as BrowserWindowConstructorOptions & { experimentalDarkMode: boolean });
+		};
+		const window = new BrowserWindow(windowOptions);
 
 		window.setMenuBarVisibility(false);
 
@@ -509,15 +303,3 @@ export class IssueMainService implements IIssueMainService {
 		return state;
 	}
 }
-
-function isStrictWindowState(obj: unknown): obj is IStrictWindowState {
-	if (typeof obj !== 'object' || obj === null) {
-		return false;
-	}
-	return (
-		'x' in obj &&
-		'y' in obj &&
-		'width' in obj &&
-		'height' in obj
-	);
-}
diff --git a/src/vs/platform/issue/electron-main/processMainService.ts b/src/vs/platform/issue/electron-main/processMainService.ts
new file mode 100644
index 00000000000..bbf187a92b4
--- /dev/null
+++ b/src/vs/platform/issue/electron-main/processMainService.ts
@@ -0,0 +1,383 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { BrowserWindow, BrowserWindowConstructorOptions, contentTracing, Display, IpcMainEvent, screen } from 'electron';
+import { randomPath } from '../../../base/common/extpath.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { FileAccess } from '../../../base/common/network.js';
+import { IProcessEnvironment, isMacintosh } from '../../../base/common/platform.js';
+import { listProcesses } from '../../../base/node/ps.js';
+import { validatedIpcMain } from '../../../base/parts/ipc/electron-main/ipcMain.js';
+import { getNLSLanguage, getNLSMessages, localize } from '../../../nls.js';
+import { IDiagnosticsService, isRemoteDiagnosticError, PerformanceInfo, SystemInfo } from '../../diagnostics/common/diagnostics.js';
+import { IDiagnosticsMainService } from '../../diagnostics/electron-main/diagnosticsMainService.js';
+import { IDialogMainService } from '../../dialogs/electron-main/dialogMainService.js';
+import { IEnvironmentMainService } from '../../environment/electron-main/environmentMainService.js';
+import { ICSSDevelopmentService } from '../../cssDev/node/cssDevService.js';
+import { IProcessMainService, ProcessExplorerData, ProcessExplorerWindowConfiguration } from '../common/issue.js';
+import { ILogService } from '../../log/common/log.js';
+import { INativeHostMainService } from '../../native/electron-main/nativeHostMainService.js';
+import product from '../../product/common/product.js';
+import { IProductService } from '../../product/common/productService.js';
+import { IIPCObjectUrl, IProtocolMainService } from '../../protocol/electron-main/protocol.js';
+import { IStateService } from '../../state/node/state.js';
+import { UtilityProcess } from '../../utilityProcess/electron-main/utilityProcess.js';
+import { zoomLevelToZoomFactor } from '../../window/common/window.js';
+import { IWindowState } from '../../window/electron-main/window.js';
+
+const processExplorerWindowState = 'issue.processExplorerWindowState';
+
+interface IBrowserWindowOptions {
+	backgroundColor: string | undefined;
+	title: string;
+	zoomLevel: number;
+	alwaysOnTop: boolean;
+}
+
+type IStrictWindowState = Required<Pick<IWindowState, 'x' | 'y' | 'width' | 'height'>>;
+
+export class ProcessMainService implements IProcessMainService {
+
+	declare readonly _serviceBrand: undefined;
+
+	private static readonly DEFAULT_BACKGROUND_COLOR = '#1E1E1E';
+
+	private processExplorerWindow: BrowserWindow | null = null;
+	private processExplorerParentWindow: BrowserWindow | null = null;
+
+	constructor(
+		private userEnv: IProcessEnvironment,
+		@IEnvironmentMainService private readonly environmentMainService: IEnvironmentMainService,
+		@ILogService private readonly logService: ILogService,
+		@IDiagnosticsService private readonly diagnosticsService: IDiagnosticsService,
+		@IDiagnosticsMainService private readonly diagnosticsMainService: IDiagnosticsMainService,
+		@IDialogMainService private readonly dialogMainService: IDialogMainService,
+		@INativeHostMainService private readonly nativeHostMainService: INativeHostMainService,
+		@IProtocolMainService private readonly protocolMainService: IProtocolMainService,
+		@IProductService private readonly productService: IProductService,
+		@IStateService private readonly stateService: IStateService,
+		@ICSSDevelopmentService private readonly cssDevelopmentService: ICSSDevelopmentService
+	) {
+		this.registerListeners();
+	}
+
+	//#region Register Listeners
+
+	private registerListeners(): void {
+		validatedIpcMain.on('vscode:listProcesses', async event => {
+			const processes = [];
+
+			try {
+				processes.push({ name: localize('local', "Local"), rootProcess: await listProcesses(process.pid) });
+
+				const remoteDiagnostics = await this.diagnosticsMainService.getRemoteDiagnostics({ includeProcesses: true });
+				remoteDiagnostics.forEach(data => {
+					if (isRemoteDiagnosticError(data)) {
+						processes.push({
+							name: data.hostName,
+							rootProcess: data
+						});
+					} else {
+						if (data.processes) {
+							processes.push({
+								name: data.hostName,
+								rootProcess: data.processes
+							});
+						}
+					}
+				});
+			} catch (e) {
+				this.logService.error(`Listing processes failed: ${e}`);
+			}
+
+			this.safeSend(event, 'vscode:listProcessesResponse', processes);
+		});
+
+		validatedIpcMain.on('vscode:workbenchCommand', (_: unknown, commandInfo: { id: any; from: any; args: any }) => {
+			const { id, from, args } = commandInfo;
+
+			let parentWindow: BrowserWindow | null;
+			switch (from) {
+				case 'processExplorer':
+					parentWindow = this.processExplorerParentWindow;
+					break;
+				default:
+					// The issue reporter does not use this anymore.
+					throw new Error(`Unexpected command source: ${from}`);
+			}
+
+			parentWindow?.webContents.send('vscode:runAction', { id, from, args });
+		});
+
+		validatedIpcMain.on('vscode:closeProcessExplorer', event => {
+			this.processExplorerWindow?.close();
+		});
+
+		validatedIpcMain.on('vscode:pidToNameRequest', async event => {
+			const mainProcessInfo = await this.diagnosticsMainService.getMainDiagnostics();
+
+			const pidToNames: [number, string][] = [];
+			for (const window of mainProcessInfo.windows) {
+				pidToNames.push([window.pid, `window [${window.id}] (${window.title})`]);
+			}
+
+			for (const { pid, name } of UtilityProcess.getAll()) {
+				pidToNames.push([pid, name]);
+			}
+
+			this.safeSend(event, 'vscode:pidToNameResponse', pidToNames);
+		});
+	}
+
+	async openProcessExplorer(data: ProcessExplorerData): Promise<void> {
+		if (!this.processExplorerWindow) {
+			this.processExplorerParentWindow = BrowserWindow.getFocusedWindow();
+			if (this.processExplorerParentWindow) {
+				const processExplorerDisposables = new DisposableStore();
+
+				const processExplorerWindowConfigUrl = processExplorerDisposables.add(this.protocolMainService.createIPCObjectUrl<ProcessExplorerWindowConfiguration>());
+
+				const savedPosition = this.stateService.getItem<IWindowState>(processExplorerWindowState, undefined);
+				const position = isStrictWindowState(savedPosition) ? savedPosition : this.getWindowPosition(this.processExplorerParentWindow, 800, 500);
+
+				this.processExplorerWindow = this.createBrowserWindow(position, processExplorerWindowConfigUrl, {
+					backgroundColor: data.styles.backgroundColor,
+					title: localize('processExplorer', "Process Explorer"),
+					zoomLevel: data.zoomLevel,
+					alwaysOnTop: true
+				}, 'process-explorer');
+
+				// Store into config object URL
+				processExplorerWindowConfigUrl.update({
+					appRoot: this.environmentMainService.appRoot,
+					windowId: this.processExplorerWindow.id,
+					userEnv: this.userEnv,
+					data,
+					product,
+					nls: {
+						messages: getNLSMessages(),
+						language: getNLSLanguage()
+					},
+					cssModules: this.cssDevelopmentService.isEnabled ? await this.cssDevelopmentService.getCssModules() : undefined
+				});
+
+				this.processExplorerWindow.loadURL(
+					FileAccess.asBrowserUri(`vs/code/electron-sandbox/processExplorer/processExplorer${this.environmentMainService.isBuilt ? '' : '-dev'}.html`).toString(true)
+				);
+
+				this.processExplorerWindow.on('close', () => {
+					this.processExplorerWindow = null;
+					processExplorerDisposables.dispose();
+				});
+
+				this.processExplorerParentWindow.on('close', () => {
+					if (this.processExplorerWindow) {
+						this.processExplorerWindow.close();
+						this.processExplorerWindow = null;
+
+						processExplorerDisposables.dispose();
+					}
+				});
+
+				const storeState = () => {
+					if (!this.processExplorerWindow) {
+						return;
+					}
+					const size = this.processExplorerWindow.getSize();
+					const position = this.processExplorerWindow.getPosition();
+					if (!size || !position) {
+						return;
+					}
+					const state: IWindowState = {
+						width: size[0],
+						height: size[1],
+						x: position[0],
+						y: position[1]
+					};
+					this.stateService.setItem(processExplorerWindowState, state);
+				};
+
+				this.processExplorerWindow.on('moved', storeState);
+				this.processExplorerWindow.on('resized', storeState);
+			}
+		}
+
+		if (this.processExplorerWindow) {
+			this.focusWindow(this.processExplorerWindow);
+		}
+	}
+
+	private focusWindow(window: BrowserWindow): void {
+		if (window.isMinimized()) {
+			window.restore();
+		}
+
+		window.focus();
+	}
+
+	private getWindowPosition(parentWindow: BrowserWindow, defaultWidth: number, defaultHeight: number): IStrictWindowState {
+
+		// We want the new window to open on the same display that the parent is in
+		let displayToUse: Display | undefined;
+		const displays = screen.getAllDisplays();
+
+		// Single Display
+		if (displays.length === 1) {
+			displayToUse = displays[0];
+		}
+
+		// Multi Display
+		else {
+
+			// on mac there is 1 menu per window so we need to use the monitor where the cursor currently is
+			if (isMacintosh) {
+				const cursorPoint = screen.getCursorScreenPoint();
+				displayToUse = screen.getDisplayNearestPoint(cursorPoint);
+			}
+
+			// if we have a last active window, use that display for the new window
+			if (!displayToUse && parentWindow) {
+				displayToUse = screen.getDisplayMatching(parentWindow.getBounds());
+			}
+
+			// fallback to primary display or first display
+			if (!displayToUse) {
+				displayToUse = screen.getPrimaryDisplay() || displays[0];
+			}
+		}
+
+		const displayBounds = displayToUse.bounds;
+
+		const state: IStrictWindowState = {
+			width: defaultWidth,
+			height: defaultHeight,
+			x: displayBounds.x + (displayBounds.width / 2) - (defaultWidth / 2),
+			y: displayBounds.y + (displayBounds.height / 2) - (defaultHeight / 2)
+		};
+
+		if (displayBounds.width > 0 && displayBounds.height > 0 /* Linux X11 sessions sometimes report wrong display bounds */) {
+			if (state.x < displayBounds.x) {
+				state.x = displayBounds.x; // prevent window from falling out of the screen to the left
+			}
+
+			if (state.y < displayBounds.y) {
+				state.y = displayBounds.y; // prevent window from falling out of the screen to the top
+			}
+
+			if (state.x > (displayBounds.x + displayBounds.width)) {
+				state.x = displayBounds.x; // prevent window from falling out of the screen to the right
+			}
+
+			if (state.y > (displayBounds.y + displayBounds.height)) {
+				state.y = displayBounds.y; // prevent window from falling out of the screen to the bottom
+			}
+
+			if (state.width > displayBounds.width) {
+				state.width = displayBounds.width; // prevent window from exceeding display bounds width
+			}
+
+			if (state.height > displayBounds.height) {
+				state.height = displayBounds.height; // prevent window from exceeding display bounds height
+			}
+		}
+
+		return state;
+	}
+
+	async stopTracing(): Promise<void> {
+		if (!this.environmentMainService.args.trace) {
+			return; // requires tracing to be on
+		}
+
+		const path = await contentTracing.stopRecording(`${randomPath(this.environmentMainService.userHome.fsPath, this.productService.applicationName)}.trace.txt`);
+
+		// Inform user to report an issue
+		await this.dialogMainService.showMessageBox({
+			type: 'info',
+			message: localize('trace.message', "Successfully created the trace file"),
+			detail: localize('trace.detail', "Please create an issue and manually attach the following file:\n{0}", path),
+			buttons: [localize({ key: 'trace.ok', comment: ['&& denotes a mnemonic'] }, "&&OK")],
+		}, BrowserWindow.getFocusedWindow() ?? undefined);
+
+		// Show item in explorer
+		this.nativeHostMainService.showItemInFolder(undefined, path);
+	}
+
+	async getSystemStatus(): Promise<string> {
+		const [info, remoteData] = await Promise.all([this.diagnosticsMainService.getMainDiagnostics(), this.diagnosticsMainService.getRemoteDiagnostics({ includeProcesses: false, includeWorkspaceMetadata: false })]);
+		return this.diagnosticsService.getDiagnostics(info, remoteData);
+	}
+
+	async $getSystemInfo(): Promise<SystemInfo> {
+		const [info, remoteData] = await Promise.all([this.diagnosticsMainService.getMainDiagnostics(), this.diagnosticsMainService.getRemoteDiagnostics({ includeProcesses: false, includeWorkspaceMetadata: false })]);
+		const msg = await this.diagnosticsService.getSystemInfo(info, remoteData);
+		return msg;
+	}
+
+	async $getPerformanceInfo(): Promise<PerformanceInfo> {
+		try {
+			const [info, remoteData] = await Promise.all([this.diagnosticsMainService.getMainDiagnostics(), this.diagnosticsMainService.getRemoteDiagnostics({ includeProcesses: true, includeWorkspaceMetadata: true })]);
+			return await this.diagnosticsService.getPerformanceInfo(info, remoteData);
+		} catch (error) {
+			this.logService.warn('issueService#getPerformanceInfo ', error.message);
+
+			throw error;
+		}
+	}
+
+	private createBrowserWindow<T>(position: IWindowState, ipcObjectUrl: IIPCObjectUrl<T>, options: IBrowserWindowOptions, windowKind: string): BrowserWindow {
+		const browserWindowOptions: BrowserWindowConstructorOptions & { experimentalDarkMode: boolean } = {
+			fullscreen: false,
+			skipTaskbar: false,
+			resizable: true,
+			width: position.width,
+			height: position.height,
+			minWidth: 300,
+			minHeight: 200,
+			x: position.x,
+			y: position.y,
+			title: options.title,
+			backgroundColor: options.backgroundColor || ProcessMainService.DEFAULT_BACKGROUND_COLOR,
+			webPreferences: {
+				preload: FileAccess.asFileUri('vs/base/parts/sandbox/electron-sandbox/preload.js').fsPath,
+				additionalArguments: [`--vscode-window-config=${ipcObjectUrl.resource.toString()}`],
+				v8CacheOptions: this.environmentMainService.useCodeCache ? 'bypassHeatCheck' : 'none',
+				enableWebSQL: false,
+				spellcheck: false,
+				zoomFactor: zoomLevelToZoomFactor(options.zoomLevel),
+				sandbox: true
+			},
+			alwaysOnTop: options.alwaysOnTop,
+			experimentalDarkMode: true
+		};
+		const window = new BrowserWindow(browserWindowOptions);
+
+		window.setMenuBarVisibility(false);
+
+		return window;
+	}
+
+	private safeSend(event: IpcMainEvent, channel: string, ...args: unknown[]): void {
+		if (!event.sender.isDestroyed()) {
+			event.sender.send(channel, ...args);
+		}
+	}
+
+	async closeProcessExplorer(): Promise<void> {
+		this.processExplorerWindow?.close();
+	}
+}
+
+function isStrictWindowState(obj: unknown): obj is IStrictWindowState {
+	if (typeof obj !== 'object' || obj === null) {
+		return false;
+	}
+	return (
+		'x' in obj &&
+		'y' in obj &&
+		'width' in obj &&
+		'height' in obj
+	);
+}
diff --git a/src/vs/platform/jsonschemas/common/jsonContributionRegistry.ts b/src/vs/platform/jsonschemas/common/jsonContributionRegistry.ts
index 08322db2bb6..72b231f4e03 100644
--- a/src/vs/platform/jsonschemas/common/jsonContributionRegistry.ts
+++ b/src/vs/platform/jsonschemas/common/jsonContributionRegistry.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import * as platform from 'vs/platform/registry/common/platform';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { getCompressedContent, IJSONSchema } from '../../../base/common/jsonSchema.js';
+import * as platform from '../../registry/common/platform.js';
 
 export const Extensions = {
 	JSONContribution: 'base.contributions.json'
@@ -35,6 +35,18 @@ export interface IJSONContributionRegistry {
 	 * Get all schemas
 	 */
 	getSchemaContributions(): ISchemaContributions;
+
+	/**
+	 * Gets the (compressed) content of the schema with the given schema ID (if any)
+	 * @param uri The id of the schema
+	 */
+	getSchemaContent(uri: string): string | undefined;
+
+	/**
+	 * Returns true if there's a schema that matches the given schema ID
+	 * @param uri The id of the schema
+	 */
+	hasSchemaContent(uri: string): boolean;
 }
 
 
@@ -74,6 +86,15 @@ class JSONContributionRegistry implements IJSONContributionRegistry {
 		};
 	}
 
+	public getSchemaContent(uri: string): string | undefined {
+		const schema = this.schemasById[uri];
+		return schema ? getCompressedContent(schema) : undefined;
+	}
+
+	public hasSchemaContent(uri: string): boolean {
+		return !!this.schemasById[uri];
+	}
+
 }
 
 const jsonContributionRegistry = new JSONContributionRegistry();
diff --git a/src/vs/platform/keybinding/common/abstractKeybindingService.ts b/src/vs/platform/keybinding/common/abstractKeybindingService.ts
index 40e5567ab00..22f1d343790 100644
--- a/src/vs/platform/keybinding/common/abstractKeybindingService.ts
+++ b/src/vs/platform/keybinding/common/abstractKeybindingService.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from 'vs/base/common/actions';
-import * as arrays from 'vs/base/common/arrays';
-import { IntervalTimer, TimeoutTimer } from 'vs/base/common/async';
-import { illegalState } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IME } from 'vs/base/common/ime';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { Keybinding, ResolvedChord, ResolvedKeybinding, SingleModifierChord } from 'vs/base/common/keybindings';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import * as nls from 'vs/nls';
+import { WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from '../../../base/common/actions.js';
+import * as arrays from '../../../base/common/arrays.js';
+import { IntervalTimer, TimeoutTimer } from '../../../base/common/async.js';
+import { illegalState } from '../../../base/common/errors.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { IME } from '../../../base/common/ime.js';
+import { KeyCode } from '../../../base/common/keyCodes.js';
+import { Keybinding, ResolvedChord, ResolvedKeybinding, SingleModifierChord } from '../../../base/common/keybindings.js';
+import { Disposable, IDisposable } from '../../../base/common/lifecycle.js';
+import * as nls from '../../../nls.js';
 
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IContextKeyService, IContextKeyServiceTarget } from 'vs/platform/contextkey/common/contextkey';
-import { IKeybindingService, IKeyboardEvent, KeybindingsSchemaContribution } from 'vs/platform/keybinding/common/keybinding';
-import { ResolutionResult, KeybindingResolver, ResultKind, NoMatchingKb } from 'vs/platform/keybinding/common/keybindingResolver';
-import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
-import { ILogService } from 'vs/platform/log/common/log';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { ICommandService } from '../../commands/common/commands.js';
+import { IContextKeyService, IContextKeyServiceTarget } from '../../contextkey/common/contextkey.js';
+import { IKeybindingService, IKeyboardEvent, KeybindingsSchemaContribution } from './keybinding.js';
+import { ResolutionResult, KeybindingResolver, ResultKind, NoMatchingKb } from './keybindingResolver.js';
+import { ResolvedKeybindingItem } from './resolvedKeybindingItem.js';
+import { ILogService } from '../../log/common/log.js';
+import { INotificationService } from '../../notification/common/notification.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
 
 interface CurrentChord {
 	keypress: string;
diff --git a/src/vs/platform/keybinding/common/baseResolvedKeybinding.ts b/src/vs/platform/keybinding/common/baseResolvedKeybinding.ts
index 4584188d98e..96b56234d7f 100644
--- a/src/vs/platform/keybinding/common/baseResolvedKeybinding.ts
+++ b/src/vs/platform/keybinding/common/baseResolvedKeybinding.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { illegalArgument } from 'vs/base/common/errors';
-import { AriaLabelProvider, ElectronAcceleratorLabelProvider, UILabelProvider, UserSettingsLabelProvider } from 'vs/base/common/keybindingLabels';
-import { Chord, SingleModifierChord, ResolvedKeybinding, ResolvedChord } from 'vs/base/common/keybindings';
-import { OperatingSystem } from 'vs/base/common/platform';
+import { illegalArgument } from '../../../base/common/errors.js';
+import { AriaLabelProvider, ElectronAcceleratorLabelProvider, UILabelProvider, UserSettingsLabelProvider } from '../../../base/common/keybindingLabels.js';
+import { Chord, SingleModifierChord, ResolvedKeybinding, ResolvedChord } from '../../../base/common/keybindings.js';
+import { OperatingSystem } from '../../../base/common/platform.js';
 
 export abstract class BaseResolvedKeybinding<T extends Chord> extends ResolvedKeybinding {
 
diff --git a/src/vs/platform/keybinding/common/keybinding.ts b/src/vs/platform/keybinding/common/keybinding.ts
index 5a8c2b5dcec..f41ac90b7c6 100644
--- a/src/vs/platform/keybinding/common/keybinding.ts
+++ b/src/vs/platform/keybinding/common/keybinding.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { ResolvedKeybinding, Keybinding } from 'vs/base/common/keybindings';
-import { IContextKeyService, IContextKeyServiceTarget } from 'vs/platform/contextkey/common/contextkey';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ResolutionResult } from 'vs/platform/keybinding/common/keybindingResolver';
-import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
+import { Event } from '../../../base/common/event.js';
+import { IJSONSchema } from '../../../base/common/jsonSchema.js';
+import { KeyCode } from '../../../base/common/keyCodes.js';
+import { ResolvedKeybinding, Keybinding } from '../../../base/common/keybindings.js';
+import { IContextKeyService, IContextKeyServiceTarget } from '../../contextkey/common/contextkey.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { ResolutionResult } from './keybindingResolver.js';
+import { ResolvedKeybindingItem } from './resolvedKeybindingItem.js';
 
 export interface IUserFriendlyKeybinding {
 	key: string;
diff --git a/src/vs/platform/keybinding/common/keybindingResolver.ts b/src/vs/platform/keybinding/common/keybindingResolver.ts
index f337eea0157..eeace6fa5b8 100644
--- a/src/vs/platform/keybinding/common/keybindingResolver.ts
+++ b/src/vs/platform/keybinding/common/keybindingResolver.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { implies, ContextKeyExpression, ContextKeyExprType, IContext, IContextKeyService, expressionsAreEqualWithConstantSubstitution } from 'vs/platform/contextkey/common/contextkey';
-import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
+import { implies, ContextKeyExpression, ContextKeyExprType, IContext, IContextKeyService, expressionsAreEqualWithConstantSubstitution } from '../../contextkey/common/contextkey.js';
+import { ResolvedKeybindingItem } from './resolvedKeybindingItem.js';
 
 //#region resolution-result
 
diff --git a/src/vs/platform/keybinding/common/keybindingsRegistry.ts b/src/vs/platform/keybinding/common/keybindingsRegistry.ts
index 6c88451dff6..eeabcc5578c 100644
--- a/src/vs/platform/keybinding/common/keybindingsRegistry.ts
+++ b/src/vs/platform/keybinding/common/keybindingsRegistry.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { decodeKeybinding, Keybinding } from 'vs/base/common/keybindings';
-import { OperatingSystem, OS } from 'vs/base/common/platform';
-import { CommandsRegistry, ICommandHandler, ICommandMetadata } from 'vs/platform/commands/common/commands';
-import { ContextKeyExpression } from 'vs/platform/contextkey/common/contextkey';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { combinedDisposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { LinkedList } from 'vs/base/common/linkedList';
+import { decodeKeybinding, Keybinding } from '../../../base/common/keybindings.js';
+import { OperatingSystem, OS } from '../../../base/common/platform.js';
+import { CommandsRegistry, ICommandHandler, ICommandMetadata } from '../../commands/common/commands.js';
+import { ContextKeyExpression } from '../../contextkey/common/contextkey.js';
+import { Registry } from '../../registry/common/platform.js';
+import { combinedDisposable, DisposableStore, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { LinkedList } from '../../../base/common/linkedList.js';
 
 export interface IKeybindingItem {
 	keybinding: Keybinding | null;
diff --git a/src/vs/platform/keybinding/common/resolvedKeybindingItem.ts b/src/vs/platform/keybinding/common/resolvedKeybindingItem.ts
index c12893f4098..76a5e8ccb64 100644
--- a/src/vs/platform/keybinding/common/resolvedKeybindingItem.ts
+++ b/src/vs/platform/keybinding/common/resolvedKeybindingItem.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
-import { ResolvedKeybinding } from 'vs/base/common/keybindings';
-import { ContextKeyExpression } from 'vs/platform/contextkey/common/contextkey';
+import { CharCode } from '../../../base/common/charCode.js';
+import { ResolvedKeybinding } from '../../../base/common/keybindings.js';
+import { ContextKeyExpression } from '../../contextkey/common/contextkey.js';
 
 export class ResolvedKeybindingItem {
 	_resolvedKeybindingItemBrand: void = undefined;
diff --git a/src/vs/platform/keybinding/common/usLayoutResolvedKeybinding.ts b/src/vs/platform/keybinding/common/usLayoutResolvedKeybinding.ts
index de345edf238..5ea9a5ba515 100644
--- a/src/vs/platform/keybinding/common/usLayoutResolvedKeybinding.ts
+++ b/src/vs/platform/keybinding/common/usLayoutResolvedKeybinding.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyCode, KeyCodeUtils, IMMUTABLE_CODE_TO_KEY_CODE, ScanCode } from 'vs/base/common/keyCodes';
-import { SingleModifierChord, Chord, KeyCodeChord, Keybinding } from 'vs/base/common/keybindings';
-import { OperatingSystem } from 'vs/base/common/platform';
-import { BaseResolvedKeybinding } from 'vs/platform/keybinding/common/baseResolvedKeybinding';
-import { toEmptyArrayIfContainsNull } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
+import { KeyCode, KeyCodeUtils, IMMUTABLE_CODE_TO_KEY_CODE, ScanCode } from '../../../base/common/keyCodes.js';
+import { SingleModifierChord, Chord, KeyCodeChord, Keybinding } from '../../../base/common/keybindings.js';
+import { OperatingSystem } from '../../../base/common/platform.js';
+import { BaseResolvedKeybinding } from './baseResolvedKeybinding.js';
+import { toEmptyArrayIfContainsNull } from './resolvedKeybindingItem.js';
 
 /**
  * Do not instantiate. Use KeybindingService to get a ResolvedKeybinding seeded with information about the current kb layout.
diff --git a/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts b/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts
index 88aa86a05d3..4a5f4c83407 100644
--- a/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts
+++ b/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { createSimpleKeybinding, ResolvedKeybinding, KeyCodeChord, Keybinding } from 'vs/base/common/keybindings';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { OS } from 'vs/base/common/platform';
-import Severity from 'vs/base/common/severity';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { ContextKeyExpr, ContextKeyExpression, IContext, IContextKeyService, IContextKeyServiceTarget } from 'vs/platform/contextkey/common/contextkey';
-import { AbstractKeybindingService } from 'vs/platform/keybinding/common/abstractKeybindingService';
-import { IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding';
-import { KeybindingResolver } from 'vs/platform/keybinding/common/keybindingResolver';
-import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
-import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayoutResolvedKeybinding';
-import { createUSLayoutResolvedKeybinding } from 'vs/platform/keybinding/test/common/keybindingsTestUtils';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { INotification, INotificationService, IPromptChoice, IPromptOptions, IStatusMessageOptions, NoOpNotification } from 'vs/platform/notification/common/notification';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
+import { KeyChord, KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { createSimpleKeybinding, ResolvedKeybinding, KeyCodeChord, Keybinding } from '../../../../base/common/keybindings.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { OS } from '../../../../base/common/platform.js';
+import Severity from '../../../../base/common/severity.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { ICommandService } from '../../../commands/common/commands.js';
+import { ContextKeyExpr, ContextKeyExpression, IContext, IContextKeyService, IContextKeyServiceTarget } from '../../../contextkey/common/contextkey.js';
+import { AbstractKeybindingService } from '../../common/abstractKeybindingService.js';
+import { IKeyboardEvent } from '../../common/keybinding.js';
+import { KeybindingResolver } from '../../common/keybindingResolver.js';
+import { ResolvedKeybindingItem } from '../../common/resolvedKeybindingItem.js';
+import { USLayoutResolvedKeybinding } from '../../common/usLayoutResolvedKeybinding.js';
+import { createUSLayoutResolvedKeybinding } from './keybindingsTestUtils.js';
+import { NullLogService } from '../../../log/common/log.js';
+import { INotification, INotificationService, IPromptChoice, IPromptOptions, IStatusMessageOptions, NoOpNotification } from '../../../notification/common/notification.js';
+import { NullTelemetryService } from '../../../telemetry/common/telemetryUtils.js';
 
 function createContext(ctx: any) {
 	return {
diff --git a/src/vs/platform/keybinding/test/common/keybindingLabels.test.ts b/src/vs/platform/keybinding/test/common/keybindingLabels.test.ts
index b88a747e454..3d1e238d896 100644
--- a/src/vs/platform/keybinding/test/common/keybindingLabels.test.ts
+++ b/src/vs/platform/keybinding/test/common/keybindingLabels.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { OperatingSystem } from 'vs/base/common/platform';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { createUSLayoutResolvedKeybinding } from 'vs/platform/keybinding/test/common/keybindingsTestUtils';
+import { KeyChord, KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { OperatingSystem } from '../../../../base/common/platform.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { createUSLayoutResolvedKeybinding } from './keybindingsTestUtils.js';
 
 suite('KeybindingLabels', () => {
 
diff --git a/src/vs/platform/keybinding/test/common/keybindingResolver.test.ts b/src/vs/platform/keybinding/test/common/keybindingResolver.test.ts
index 3fccf387540..ccd5b6dff59 100644
--- a/src/vs/platform/keybinding/test/common/keybindingResolver.test.ts
+++ b/src/vs/platform/keybinding/test/common/keybindingResolver.test.ts
@@ -4,15 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { decodeKeybinding, createSimpleKeybinding, KeyCodeChord } from 'vs/base/common/keybindings';
-import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { OS } from 'vs/base/common/platform';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ContextKeyExpr, ContextKeyExpression, IContext } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingResolver, ResultKind } from 'vs/platform/keybinding/common/keybindingResolver';
-import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
-import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayoutResolvedKeybinding';
-import { createUSLayoutResolvedKeybinding } from 'vs/platform/keybinding/test/common/keybindingsTestUtils';
+import { decodeKeybinding, createSimpleKeybinding, KeyCodeChord } from '../../../../base/common/keybindings.js';
+import { KeyChord, KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { OS } from '../../../../base/common/platform.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { ContextKeyExpr, ContextKeyExpression, IContext } from '../../../contextkey/common/contextkey.js';
+import { KeybindingResolver, ResultKind } from '../../common/keybindingResolver.js';
+import { ResolvedKeybindingItem } from '../../common/resolvedKeybindingItem.js';
+import { USLayoutResolvedKeybinding } from '../../common/usLayoutResolvedKeybinding.js';
+import { createUSLayoutResolvedKeybinding } from './keybindingsTestUtils.js';
 
 function createContext(ctx: any) {
 	return {
diff --git a/src/vs/platform/keybinding/test/common/keybindingsTestUtils.ts b/src/vs/platform/keybinding/test/common/keybindingsTestUtils.ts
index d0b338d9691..e9c700e4b5f 100644
--- a/src/vs/platform/keybinding/test/common/keybindingsTestUtils.ts
+++ b/src/vs/platform/keybinding/test/common/keybindingsTestUtils.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { decodeKeybinding, ResolvedKeybinding } from 'vs/base/common/keybindings';
-import { OperatingSystem } from 'vs/base/common/platform';
-import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayoutResolvedKeybinding';
+import { decodeKeybinding, ResolvedKeybinding } from '../../../../base/common/keybindings.js';
+import { OperatingSystem } from '../../../../base/common/platform.js';
+import { USLayoutResolvedKeybinding } from '../../common/usLayoutResolvedKeybinding.js';
 
 export function createUSLayoutResolvedKeybinding(encodedKeybinding: number | number[], OS: OperatingSystem): ResolvedKeybinding | undefined {
 	if (encodedKeybinding === 0) {
diff --git a/src/vs/platform/keybinding/test/common/mockKeybindingService.ts b/src/vs/platform/keybinding/test/common/mockKeybindingService.ts
index 9991b85f24b..477ccb95290 100644
--- a/src/vs/platform/keybinding/test/common/mockKeybindingService.ts
+++ b/src/vs/platform/keybinding/test/common/mockKeybindingService.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { ResolvedKeybinding, KeyCodeChord, Keybinding } from 'vs/base/common/keybindings';
-import { OS } from 'vs/base/common/platform';
-import { ContextKeyExpression, ContextKeyValue, IContextKey, IContextKeyChangeEvent, IContextKeyService, IContextKeyServiceTarget, IScopedContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IKeybindingService, IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding';
-import { NoMatchingKb, ResolutionResult } from 'vs/platform/keybinding/common/keybindingResolver';
-import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
-import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayoutResolvedKeybinding';
+import { Event } from '../../../../base/common/event.js';
+import { ResolvedKeybinding, KeyCodeChord, Keybinding } from '../../../../base/common/keybindings.js';
+import { OS } from '../../../../base/common/platform.js';
+import { ContextKeyExpression, ContextKeyValue, IContextKey, IContextKeyChangeEvent, IContextKeyService, IContextKeyServiceTarget, IScopedContextKeyService } from '../../../contextkey/common/contextkey.js';
+import { IKeybindingService, IKeyboardEvent } from '../../common/keybinding.js';
+import { NoMatchingKb, ResolutionResult } from '../../common/keybindingResolver.js';
+import { ResolvedKeybindingItem } from '../../common/resolvedKeybindingItem.js';
+import { USLayoutResolvedKeybinding } from '../../common/usLayoutResolvedKeybinding.js';
 
 class MockKeybindingContextKey<T extends ContextKeyValue = ContextKeyValue> implements IContextKey<T> {
 	private _defaultValue: T | undefined;
diff --git a/src/vs/platform/keyboardLayout/common/keyboardConfig.ts b/src/vs/platform/keyboardLayout/common/keyboardConfig.ts
index e9e83dcd70f..67be262ced3 100644
--- a/src/vs/platform/keyboardLayout/common/keyboardConfig.ts
+++ b/src/vs/platform/keyboardLayout/common/keyboardConfig.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { OS, OperatingSystem } from 'vs/base/common/platform';
-import { ConfigurationScope, Extensions as ConfigExtensions, IConfigurationNode, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { Registry } from 'vs/platform/registry/common/platform';
+import * as nls from '../../../nls.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { OS, OperatingSystem } from '../../../base/common/platform.js';
+import { ConfigurationScope, Extensions as ConfigExtensions, IConfigurationNode, IConfigurationRegistry } from '../../configuration/common/configurationRegistry.js';
+import { Registry } from '../../registry/common/platform.js';
 
 export const enum DispatchConfig {
 	Code,
diff --git a/src/vs/platform/keyboardLayout/common/keyboardLayout.ts b/src/vs/platform/keyboardLayout/common/keyboardLayout.ts
index ee6c1d89461..a1db5be9f32 100644
--- a/src/vs/platform/keyboardLayout/common/keyboardLayout.ts
+++ b/src/vs/platform/keyboardLayout/common/keyboardLayout.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { ScanCode, ScanCodeUtils } from 'vs/base/common/keyCodes';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding';
-import { IKeyboardMapper } from 'vs/platform/keyboardLayout/common/keyboardMapper';
+import { Event } from '../../../base/common/event.js';
+import { ScanCode, ScanCodeUtils } from '../../../base/common/keyCodes.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { IKeyboardEvent } from '../../keybinding/common/keybinding.js';
+import { IKeyboardMapper } from './keyboardMapper.js';
 
 export const IKeyboardLayoutService = createDecorator<IKeyboardLayoutService>('keyboardLayoutService');
 
diff --git a/src/vs/platform/keyboardLayout/common/keyboardLayoutService.ts b/src/vs/platform/keyboardLayout/common/keyboardLayoutService.ts
index 640cc960c71..e72c088769a 100644
--- a/src/vs/platform/keyboardLayout/common/keyboardLayoutService.ts
+++ b/src/vs/platform/keyboardLayout/common/keyboardLayoutService.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { IKeyboardLayoutInfo, IKeyboardMapping } from 'vs/platform/keyboardLayout/common/keyboardLayout';
+import { Event } from '../../../base/common/event.js';
+import { IKeyboardLayoutInfo, IKeyboardMapping } from './keyboardLayout.js';
 
 export interface IKeyboardLayoutData {
 	keyboardLayoutInfo: IKeyboardLayoutInfo;
diff --git a/src/vs/platform/keyboardLayout/common/keyboardMapper.ts b/src/vs/platform/keyboardLayout/common/keyboardMapper.ts
index 71528e16e8a..c9478927b76 100644
--- a/src/vs/platform/keyboardLayout/common/keyboardMapper.ts
+++ b/src/vs/platform/keyboardLayout/common/keyboardMapper.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ResolvedKeybinding, Keybinding } from 'vs/base/common/keybindings';
-import { IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding';
+import { ResolvedKeybinding, Keybinding } from '../../../base/common/keybindings.js';
+import { IKeyboardEvent } from '../../keybinding/common/keybinding.js';
 
 export interface IKeyboardMapper {
 	dumpDebugInfo(): string;
diff --git a/src/vs/platform/keyboardLayout/electron-main/keyboardLayoutMainService.ts b/src/vs/platform/keyboardLayout/electron-main/keyboardLayoutMainService.ts
index 1d17e4c709e..8950ce2184a 100644
--- a/src/vs/platform/keyboardLayout/electron-main/keyboardLayoutMainService.ts
+++ b/src/vs/platform/keyboardLayout/electron-main/keyboardLayoutMainService.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type * as nativeKeymap from 'native-keymap';
-import * as platform from 'vs/base/common/platform';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IKeyboardLayoutData, INativeKeyboardLayoutService } from 'vs/platform/keyboardLayout/common/keyboardLayoutService';
-import { ILifecycleMainService, LifecycleMainPhase } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
+import * as platform from '../../../base/common/platform.js';
+import { Emitter } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { IKeyboardLayoutData, INativeKeyboardLayoutService } from '../common/keyboardLayoutService.js';
+import { ILifecycleMainService, LifecycleMainPhase } from '../../lifecycle/electron-main/lifecycleMainService.js';
 
 export const IKeyboardLayoutMainService = createDecorator<IKeyboardLayoutMainService>('keyboardLayoutMainService');
 
diff --git a/src/vs/platform/label/common/label.ts b/src/vs/platform/label/common/label.ts
index 60d6acb858a..e920d9a1c21 100644
--- a/src/vs/platform/label/common/label.ts
+++ b/src/vs/platform/label/common/label.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IWorkspace, ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
+import { Event } from '../../../base/common/event.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { URI } from '../../../base/common/uri.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { IWorkspace, ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from '../../workspace/common/workspace.js';
 
 export const ILabelService = createDecorator<ILabelService>('labelService');
 
diff --git a/src/vs/platform/languagePacks/browser/languagePacks.ts b/src/vs/platform/languagePacks/browser/languagePacks.ts
index 62dedb2242a..af82787b888 100644
--- a/src/vs/platform/languagePacks/browser/languagePacks.ts
+++ b/src/vs/platform/languagePacks/browser/languagePacks.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { URI } from 'vs/base/common/uri';
-import { IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IExtensionResourceLoaderService } from 'vs/platform/extensionResourceLoader/common/extensionResourceLoader';
-import { ILanguagePackItem, LanguagePackBaseService } from 'vs/platform/languagePacks/common/languagePacks';
-import { ILogService } from 'vs/platform/log/common/log';
+import { CancellationTokenSource } from '../../../base/common/cancellation.js';
+import { URI } from '../../../base/common/uri.js';
+import { IExtensionGalleryService } from '../../extensionManagement/common/extensionManagement.js';
+import { IExtensionResourceLoaderService } from '../../extensionResourceLoader/common/extensionResourceLoader.js';
+import { ILanguagePackItem, LanguagePackBaseService } from '../common/languagePacks.js';
+import { ILogService } from '../../log/common/log.js';
 
 export class WebLanguagePacksService extends LanguagePackBaseService {
 	constructor(
diff --git a/src/vs/platform/languagePacks/common/languagePacks.ts b/src/vs/platform/languagePacks/common/languagePacks.ts
index f682e997d8c..28fa2ccd356 100644
--- a/src/vs/platform/languagePacks/common/languagePacks.ts
+++ b/src/vs/platform/languagePacks/common/languagePacks.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { language } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { localize } from 'vs/nls';
-import { IExtensionGalleryService, IGalleryExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { CancellationTokenSource } from '../../../base/common/cancellation.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { language } from '../../../base/common/platform.js';
+import { URI } from '../../../base/common/uri.js';
+import { IQuickPickItem } from '../../quickinput/common/quickInput.js';
+import { localize } from '../../../nls.js';
+import { IExtensionGalleryService, IGalleryExtension } from '../../extensionManagement/common/extensionManagement.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 export function getLocale(extension: IGalleryExtension): string | undefined {
 	return extension.tags.find(t => t.startsWith('lp-'))?.split('lp-')[1];
diff --git a/src/vs/platform/languagePacks/common/localizedStrings.ts b/src/vs/platform/languagePacks/common/localizedStrings.ts
index 5432fbcb609..614b0dfb0f7 100644
--- a/src/vs/platform/languagePacks/common/localizedStrings.ts
+++ b/src/vs/platform/languagePacks/common/localizedStrings.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
+import * as nls from '../../../nls.js';
 
 /**
  * These are some predefined strings that we test during smoke testing that they are localized
diff --git a/src/vs/platform/languagePacks/node/languagePacks.ts b/src/vs/platform/languagePacks/node/languagePacks.ts
index 3a7df771bc2..9527de9f2c3 100644
--- a/src/vs/platform/languagePacks/node/languagePacks.ts
+++ b/src/vs/platform/languagePacks/node/languagePacks.ts
@@ -3,20 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as fs from 'fs';
 import { createHash } from 'crypto';
-import { equals } from 'vs/base/common/arrays';
-import { Queue } from 'vs/base/common/async';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { join } from 'vs/base/common/path';
-import { Promises } from 'vs/base/node/pfs';
-import { INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IExtensionGalleryService, IExtensionIdentifier, IExtensionManagementService, ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ILocalizationContribution } from 'vs/platform/extensions/common/extensions';
-import { ILanguagePackItem, LanguagePackBaseService } from 'vs/platform/languagePacks/common/languagePacks';
-import { URI } from 'vs/base/common/uri';
+import { equals } from '../../../base/common/arrays.js';
+import { Queue } from '../../../base/common/async.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { Schemas } from '../../../base/common/network.js';
+import { join } from '../../../base/common/path.js';
+import { Promises } from '../../../base/node/pfs.js';
+import { INativeEnvironmentService } from '../../environment/common/environment.js';
+import { IExtensionGalleryService, IExtensionIdentifier, IExtensionManagementService, ILocalExtension } from '../../extensionManagement/common/extensionManagement.js';
+import { areSameExtensions } from '../../extensionManagement/common/extensionManagementUtil.js';
+import { ILogService } from '../../log/common/log.js';
+import { ILocalizationContribution } from '../../extensions/common/extensions.js';
+import { ILanguagePackItem, LanguagePackBaseService } from '../common/languagePacks.js';
+import { URI } from '../../../base/common/uri.js';
 
 interface ILanguagePack {
 	hash: string;
@@ -180,7 +181,7 @@ class LanguagePacksCache extends Disposable {
 	private withLanguagePacks<T>(fn: (languagePacks: { [language: string]: ILanguagePack }) => T | null = () => null): Promise<T> {
 		return this.languagePacksFileLimiter.queue(() => {
 			let result: T | null = null;
-			return Promises.readFile(this.languagePacksFilePath, 'utf8')
+			return fs.promises.readFile(this.languagePacksFilePath, 'utf8')
 				.then(undefined, err => err.code === 'ENOENT' ? Promise.resolve('{}') : Promise.reject(err))
 				.then<{ [language: string]: ILanguagePack }>(raw => { try { return JSON.parse(raw); } catch (e) { return {}; } })
 				.then(languagePacks => { result = fn(languagePacks); return languagePacks; })
diff --git a/src/vs/platform/launch/electron-main/launchMainService.ts b/src/vs/platform/launch/electron-main/launchMainService.ts
index 1fcb947305d..36020f52cfc 100644
--- a/src/vs/platform/launch/electron-main/launchMainService.ts
+++ b/src/vs/platform/launch/electron-main/launchMainService.ts
@@ -4,20 +4,20 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { app } from 'electron';
-import { coalesce, firstOrDefault } from 'vs/base/common/arrays';
-import { IProcessEnvironment, isMacintosh } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { whenDeleted } from 'vs/base/node/pfs';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
-import { isLaunchedFromCli } from 'vs/platform/environment/node/argvHelper';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IURLService } from 'vs/platform/url/common/url';
-import { ICodeWindow } from 'vs/platform/window/electron-main/window';
-import { IWindowSettings } from 'vs/platform/window/common/window';
-import { IOpenConfiguration, IWindowsMainService, OpenContext } from 'vs/platform/windows/electron-main/windows';
-import { IProtocolUrl } from 'vs/platform/url/electron-main/url';
+import { coalesce } from '../../../base/common/arrays.js';
+import { IProcessEnvironment, isMacintosh } from '../../../base/common/platform.js';
+import { URI } from '../../../base/common/uri.js';
+import { whenDeleted } from '../../../base/node/pfs.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { NativeParsedArgs } from '../../environment/common/argv.js';
+import { isLaunchedFromCli } from '../../environment/node/argvHelper.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { ILogService } from '../../log/common/log.js';
+import { IURLService } from '../../url/common/url.js';
+import { ICodeWindow } from '../../window/electron-main/window.js';
+import { IWindowSettings } from '../../window/common/window.js';
+import { IOpenConfiguration, IWindowsMainService, OpenContext } from '../../windows/electron-main/windows.js';
+import { IProtocolUrl } from '../../url/electron-main/url.js';
 
 export const ID = 'launchMainService';
 export const ILaunchMainService = createDecorator<ILaunchMainService>(ID);
@@ -70,7 +70,7 @@ export class LaunchMainService implements ILaunchMainService {
 
 			// Create a window if there is none
 			if (this.windowsMainService.getWindowCount() === 0) {
-				const window = firstOrDefault(await this.windowsMainService.openEmptyWindow({ context: OpenContext.DESKTOP }));
+				const window = (await this.windowsMainService.openEmptyWindow({ context: OpenContext.DESKTOP })).at(0);
 				if (window) {
 					whenWindowReady = window.ready();
 				}
diff --git a/src/vs/platform/layout/browser/layoutService.ts b/src/vs/platform/layout/browser/layoutService.ts
index 65de0312451..8f5ecfb47ce 100644
--- a/src/vs/platform/layout/browser/layoutService.ts
+++ b/src/vs/platform/layout/browser/layoutService.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDimension } from 'vs/base/browser/dom';
-import { Event } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { IDimension } from '../../../base/browser/dom.js';
+import { Event } from '../../../base/common/event.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 export const ILayoutService = createDecorator<ILayoutService>('layoutService');
 
diff --git a/src/vs/platform/layout/browser/zIndexRegistry.ts b/src/vs/platform/layout/browser/zIndexRegistry.ts
index c8e4e9cf837..671eb7754ec 100644
--- a/src/vs/platform/layout/browser/zIndexRegistry.ts
+++ b/src/vs/platform/layout/browser/zIndexRegistry.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { clearNode, createCSSRule, createStyleSheet } from 'vs/base/browser/dom';
-import { RunOnceScheduler } from 'vs/base/common/async';
+import { clearNode, createCSSRule, createStyleSheet } from '../../../base/browser/dom.js';
+import { RunOnceScheduler } from '../../../base/common/async.js';
 
 export enum ZIndex {
 	Base = 0,
diff --git a/src/vs/platform/lifecycle/common/lifecycle.ts b/src/vs/platform/lifecycle/common/lifecycle.ts
index d79ae9d5063..0a27c275eac 100644
--- a/src/vs/platform/lifecycle/common/lifecycle.ts
+++ b/src/vs/platform/lifecycle/common/lifecycle.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isThenable, Promises } from 'vs/base/common/async';
+import { isThenable, Promises } from '../../../base/common/async.js';
 
 // Shared veto handling across main and renderer
 export function handleVetos(vetos: (boolean | Promise<boolean>)[], onError: (error: Error) => void): Promise<boolean /* veto */> {
diff --git a/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts b/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts
index 7dfc46d0a3b..0016baac80f 100644
--- a/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts
+++ b/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { app, BrowserWindow, Event as ElectronEvent } from 'electron';
-import { validatedIpcMain } from 'vs/base/parts/ipc/electron-main/ipcMain';
-import { Barrier, Promises, timeout } from 'vs/base/common/async';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { isMacintosh, isWindows } from 'vs/base/common/platform';
-import { cwd } from 'vs/base/common/process';
-import { assertIsDefined } from 'vs/base/common/types';
-import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IStateService } from 'vs/platform/state/node/state';
-import { ICodeWindow, LoadReason, UnloadReason } from 'vs/platform/window/electron-main/window';
-import { ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
-import { IEnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
-import { IAuxiliaryWindow } from 'vs/platform/auxiliaryWindow/electron-main/auxiliaryWindow';
+import electron from 'electron';
+import { validatedIpcMain } from '../../../base/parts/ipc/electron-main/ipcMain.js';
+import { Barrier, Promises, timeout } from '../../../base/common/async.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable, DisposableStore } from '../../../base/common/lifecycle.js';
+import { isMacintosh, isWindows } from '../../../base/common/platform.js';
+import { cwd } from '../../../base/common/process.js';
+import { assertIsDefined } from '../../../base/common/types.js';
+import { NativeParsedArgs } from '../../environment/common/argv.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { ILogService } from '../../log/common/log.js';
+import { IStateService } from '../../state/node/state.js';
+import { ICodeWindow, LoadReason, UnloadReason } from '../../window/electron-main/window.js';
+import { ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from '../../workspace/common/workspace.js';
+import { IEnvironmentMainService } from '../../environment/electron-main/environmentMainService.js';
+import { IAuxiliaryWindow } from '../../auxiliaryWindow/electron-main/auxiliaryWindow.js';
 
 export const ILifecycleMainService = createDecorator<ILifecycleMainService>('lifecycleMainService');
 
@@ -294,7 +294,7 @@ export class LifecycleMainService extends Disposable implements ILifecycleMainSe
 				this.fireOnWillShutdown(ShutdownReason.QUIT);
 			}
 		};
-		app.addListener('before-quit', beforeQuitListener);
+		electron.app.addListener('before-quit', beforeQuitListener);
 
 		// window-all-closed: an event that only fires when the last window
 		// was closed. We override this event to be in charge if app.quit()
@@ -305,14 +305,14 @@ export class LifecycleMainService extends Disposable implements ILifecycleMainSe
 			// Windows/Linux: we quit when all windows have closed
 			// Mac: we only quit when quit was requested
 			if (this._quitRequested || !isMacintosh) {
-				app.quit();
+				electron.app.quit();
 			}
 		};
-		app.addListener('window-all-closed', windowAllClosedListener);
+		electron.app.addListener('window-all-closed', windowAllClosedListener);
 
 		// will-quit: an event that is fired after all windows have been
 		// closed, but before actually quitting.
-		app.once('will-quit', e => {
+		electron.app.once('will-quit', e => {
 			this.trace('Lifecycle#app.on(will-quit) - begin');
 
 			// Prevent the quit until the shutdown promise was resolved
@@ -332,12 +332,12 @@ export class LifecycleMainService extends Disposable implements ILifecycleMainSe
 				// will-quit listener is only installed "once". Also
 				// remove any listener we have that is no longer needed
 
-				app.removeListener('before-quit', beforeQuitListener);
-				app.removeListener('window-all-closed', windowAllClosedListener);
+				electron.app.removeListener('before-quit', beforeQuitListener);
+				electron.app.removeListener('window-all-closed', windowAllClosedListener);
 
 				this.trace('Lifecycle#app.on(will-quit) - calling app.quit()');
 
-				app.quit();
+				electron.app.quit();
 			});
 		});
 	}
@@ -428,7 +428,7 @@ export class LifecycleMainService extends Disposable implements ILifecycleMainSe
 
 		// Window Before Closing: Main -> Renderer
 		const win = assertIsDefined(window.win);
-		windowListeners.add(Event.fromNodeEventEmitter<ElectronEvent>(win, 'close')(e => {
+		windowListeners.add(Event.fromNodeEventEmitter<electron.Event>(win, 'close')(e => {
 
 			// The window already acknowledged to be closed
 			const windowId = window.id;
@@ -458,7 +458,7 @@ export class LifecycleMainService extends Disposable implements ILifecycleMainSe
 				window.close();
 			});
 		}));
-		windowListeners.add(Event.fromNodeEventEmitter<ElectronEvent>(win, 'closed')(() => {
+		windowListeners.add(Event.fromNodeEventEmitter<electron.Event>(win, 'closed')(() => {
 			this.trace(`Lifecycle#window.on('closed') - window ID ${window.id}`);
 
 			// update window count
@@ -480,7 +480,7 @@ export class LifecycleMainService extends Disposable implements ILifecycleMainSe
 		const win = assertIsDefined(auxWindow.win);
 
 		const windowListeners = new DisposableStore();
-		windowListeners.add(Event.fromNodeEventEmitter<ElectronEvent>(win, 'close')(e => {
+		windowListeners.add(Event.fromNodeEventEmitter<electron.Event>(win, 'close')(e => {
 			this.trace(`Lifecycle#auxWindow.on('close') - window ID ${auxWindow.id}`);
 
 			if (this._quitRequested) {
@@ -499,7 +499,7 @@ export class LifecycleMainService extends Disposable implements ILifecycleMainSe
 				e.preventDefault();
 			}
 		}));
-		windowListeners.add(Event.fromNodeEventEmitter<ElectronEvent>(win, 'closed')(() => {
+		windowListeners.add(Event.fromNodeEventEmitter<electron.Event>(win, 'closed')(() => {
 			this.trace(`Lifecycle#auxWindow.on('closed') - window ID ${auxWindow.id}`);
 
 			windowListeners.dispose();
@@ -652,7 +652,7 @@ export class LifecycleMainService extends Disposable implements ILifecycleMainSe
 			// Calling app.quit() will trigger the close handlers of each opened window
 			// and only if no window vetoed the shutdown, we will get the will-quit event
 			this.trace('Lifecycle#quit() - calling app.quit()');
-			app.quit();
+			electron.app.quit();
 		});
 
 		return this.pendingQuitPromise;
@@ -690,16 +690,16 @@ export class LifecycleMainService extends Disposable implements ILifecycleMainSe
 		const quitListener = () => {
 			if (!this.relaunchHandler?.handleRelaunch(options)) {
 				this.trace('Lifecycle#relaunch() - calling app.relaunch()');
-				app.relaunch({ args });
+				electron.app.relaunch({ args });
 			}
 		};
-		app.once('quit', quitListener);
+		electron.app.once('quit', quitListener);
 
 		// `app.relaunch()` does not quit automatically, so we quit first,
 		// check for vetoes and then relaunch from the `app.on('quit')` event
 		const veto = await this.quit(true /* will restart */);
 		if (veto) {
-			app.removeListener('quit', quitListener);
+			electron.app.removeListener('quit', quitListener);
 		}
 	}
 
@@ -727,7 +727,7 @@ export class LifecycleMainService extends Disposable implements ILifecycleMainSe
 			// to a participant within the window. this is not wanted when we
 			// are asked to kill the application.
 			(async () => {
-				for (const window of BrowserWindow.getAllWindows()) {
+				for (const window of electron.BrowserWindow.getAllWindows()) {
 					if (window && !window.isDestroyed()) {
 						let whenWindowClosed: Promise<void>;
 						if (window.webContents && !window.webContents.isDestroyed()) {
@@ -744,6 +744,6 @@ export class LifecycleMainService extends Disposable implements ILifecycleMainSe
 		]);
 
 		// Now exit either after 1s or all windows destroyed
-		app.exit(code);
+		electron.app.exit(code);
 	}
 }
diff --git a/src/vs/platform/lifecycle/node/sharedProcessLifecycleService.ts b/src/vs/platform/lifecycle/node/sharedProcessLifecycleService.ts
index f3c6d0d4021..3c033c77097 100644
--- a/src/vs/platform/lifecycle/node/sharedProcessLifecycleService.ts
+++ b/src/vs/platform/lifecycle/node/sharedProcessLifecycleService.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { ILogService } from '../../log/common/log.js';
 
 export const ISharedProcessLifecycleService = createDecorator<ISharedProcessLifecycleService>('sharedProcessLifecycleService');
 
diff --git a/src/vs/platform/list/browser/listService.ts b/src/vs/platform/list/browser/listService.ts
index 6857531cb66..7a03fcb4bab 100644
--- a/src/vs/platform/list/browser/listService.ts
+++ b/src/vs/platform/list/browser/listService.ts
@@ -3,32 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createStyleSheet, isActiveElement, isKeyboardEvent } from 'vs/base/browser/dom';
-import { IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview';
-import { IListMouseEvent, IListRenderer, IListTouchEvent, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { IPagedListOptions, IPagedRenderer, PagedList } from 'vs/base/browser/ui/list/listPaging';
-import { DefaultStyleController, IKeyboardNavigationEventFilter, IListAccessibilityProvider, IListOptions, IListOptionsUpdate, IListStyles, IMultipleSelectionController, isSelectionRangeChangeEvent, isSelectionSingleChangeEvent, List, TypeNavigationMode } from 'vs/base/browser/ui/list/listWidget';
-import { ITableColumn, ITableRenderer, ITableVirtualDelegate } from 'vs/base/browser/ui/table/table';
-import { ITableOptions, ITableOptionsUpdate, ITableStyles, Table } from 'vs/base/browser/ui/table/tableWidget';
-import { TreeFindMode, IAbstractTreeOptions, IAbstractTreeOptionsUpdate, RenderIndentGuides, TreeFindMatchType } from 'vs/base/browser/ui/tree/abstractTree';
-import { AsyncDataTree, CompressibleAsyncDataTree, IAsyncDataTreeOptions, IAsyncDataTreeOptionsUpdate, ICompressibleAsyncDataTreeOptions, ICompressibleAsyncDataTreeOptionsUpdate, ITreeCompressionDelegate } from 'vs/base/browser/ui/tree/asyncDataTree';
-import { DataTree, IDataTreeOptions } from 'vs/base/browser/ui/tree/dataTree';
-import { CompressibleObjectTree, ICompressibleObjectTreeOptions, ICompressibleObjectTreeOptionsUpdate, ICompressibleTreeRenderer, IObjectTreeOptions, ObjectTree } from 'vs/base/browser/ui/tree/objectTree';
-import { IAsyncDataSource, IDataSource, ITreeEvent, ITreeRenderer } from 'vs/base/browser/ui/tree/tree';
-import { Emitter, Event } from 'vs/base/common/event';
-import { combinedDisposable, Disposable, DisposableStore, dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { localize } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { ContextKeyExpr, IContextKey, IContextKeyService, IScopedContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { InputFocusedContextKey } from 'vs/platform/contextkey/common/contextkeys';
-import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IEditorOptions } from 'vs/platform/editor/common/editor';
-import { createDecorator, IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ResultKind } from 'vs/platform/keybinding/common/keybindingResolver';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IStyleOverride, defaultFindWidgetStyles, defaultListStyles, getListStyles } from 'vs/platform/theme/browser/defaultStyles';
+import { isActiveElement, isKeyboardEvent } from '../../../base/browser/dom.js';
+import { IContextViewProvider } from '../../../base/browser/ui/contextview/contextview.js';
+import { IListMouseEvent, IListRenderer, IListTouchEvent, IListVirtualDelegate } from '../../../base/browser/ui/list/list.js';
+import { IPagedListOptions, IPagedRenderer, PagedList } from '../../../base/browser/ui/list/listPaging.js';
+import { IKeyboardNavigationEventFilter, IListAccessibilityProvider, IListOptions, IListOptionsUpdate, IListStyles, IMultipleSelectionController, isSelectionRangeChangeEvent, isSelectionSingleChangeEvent, List, TypeNavigationMode } from '../../../base/browser/ui/list/listWidget.js';
+import { ITableColumn, ITableRenderer, ITableVirtualDelegate } from '../../../base/browser/ui/table/table.js';
+import { ITableOptions, ITableOptionsUpdate, ITableStyles, Table } from '../../../base/browser/ui/table/tableWidget.js';
+import { IAbstractTreeOptions, IAbstractTreeOptionsUpdate, RenderIndentGuides, TreeFindMatchType, TreeFindMode } from '../../../base/browser/ui/tree/abstractTree.js';
+import { AsyncDataTree, CompressibleAsyncDataTree, IAsyncDataTreeOptions, IAsyncDataTreeOptionsUpdate, ICompressibleAsyncDataTreeOptions, ICompressibleAsyncDataTreeOptionsUpdate, ITreeCompressionDelegate } from '../../../base/browser/ui/tree/asyncDataTree.js';
+import { DataTree, IDataTreeOptions } from '../../../base/browser/ui/tree/dataTree.js';
+import { CompressibleObjectTree, ICompressibleObjectTreeOptions, ICompressibleObjectTreeOptionsUpdate, ICompressibleTreeRenderer, IObjectTreeOptions, ObjectTree } from '../../../base/browser/ui/tree/objectTree.js';
+import { IAsyncDataSource, IDataSource, ITreeEvent, ITreeRenderer } from '../../../base/browser/ui/tree/tree.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { combinedDisposable, Disposable, DisposableStore, dispose, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { localize } from '../../../nls.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from '../../configuration/common/configurationRegistry.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService, IScopedContextKeyService, RawContextKey } from '../../contextkey/common/contextkey.js';
+import { InputFocusedContextKey } from '../../contextkey/common/contextkeys.js';
+import { IContextViewService } from '../../contextview/browser/contextView.js';
+import { IEditorOptions } from '../../editor/common/editor.js';
+import { createDecorator, IInstantiationService, ServicesAccessor } from '../../instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../keybinding/common/keybinding.js';
+import { ResultKind } from '../../keybinding/common/keybindingResolver.js';
+import { Registry } from '../../registry/common/platform.js';
+import { defaultFindWidgetStyles, defaultListStyles, getListStyles, IStyleOverride } from '../../theme/browser/defaultStyles.js';
 
 export type ListWidget = List<any> | PagedList<any> | ObjectTree<any, any> | DataTree<any, any, any> | AsyncDataTree<any, any, any> | Table<any>;
 export type WorkbenchListWidget = WorkbenchList<any> | WorkbenchPagedList<any> | WorkbenchObjectTree<any, any> | WorkbenchCompressibleObjectTree<any, any> | WorkbenchDataTree<any, any, any> | WorkbenchAsyncDataTree<any, any, any> | WorkbenchCompressibleAsyncDataTree<any, any, any> | WorkbenchTable<any>;
@@ -57,7 +57,6 @@ export class ListService implements IListService {
 	private readonly disposables = new DisposableStore();
 	private lists: IRegisteredList[] = [];
 	private _lastFocusedWidget: WorkbenchListWidget | undefined = undefined;
-	private _hasCreatedStyleController: boolean = false;
 
 	get lastFocusedList(): WorkbenchListWidget | undefined {
 		return this._lastFocusedWidget;
@@ -76,13 +75,6 @@ export class ListService implements IListService {
 	}
 
 	register(widget: WorkbenchListWidget, extraContextKeys?: (IContextKey<boolean>)[]): IDisposable {
-		if (!this._hasCreatedStyleController) {
-			this._hasCreatedStyleController = true;
-			// create a shared default tree style sheet for performance reasons
-			const styleController = new DefaultStyleController(createStyleSheet(), '');
-			styleController.style(defaultListStyles);
-		}
-
 		if (this.lists.some(l => l.widget === widget)) {
 			throw new Error('Cannot register the same widget multiple times');
 		}
@@ -1490,7 +1482,7 @@ configurationRegistry.registerConfiguration({
 			type: 'number',
 			minimum: 1,
 			default: 7,
-			markdownDescription: localize('sticky scroll maximum items', "Controls the number of sticky elements displayed in the tree when `#workbench.tree.enableStickyScroll#` is enabled."),
+			markdownDescription: localize('sticky scroll maximum items', "Controls the number of sticky elements displayed in the tree when {0} is enabled.", '`#workbench.tree.enableStickyScroll#`'),
 		},
 		[typeNavigationModeSettingKey]: {
 			type: 'string',
diff --git a/src/vs/platform/log/browser/log.ts b/src/vs/platform/log/browser/log.ts
index 0abfdaa677b..d7fcff9149b 100644
--- a/src/vs/platform/log/browser/log.ts
+++ b/src/vs/platform/log/browser/log.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { mainWindow } from 'vs/base/browser/window';
-import { relativePath } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IFileService } from 'vs/platform/files/common/files';
-import { AdapterLogger, DEFAULT_LOG_LEVEL, ILogger, LogLevel } from 'vs/platform/log/common/log';
+import { mainWindow } from '../../../base/browser/window.js';
+import { relativePath } from '../../../base/common/resources.js';
+import { URI } from '../../../base/common/uri.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { IFileService } from '../../files/common/files.js';
+import { AdapterLogger, DEFAULT_LOG_LEVEL, ILogger, LogLevel } from '../common/log.js';
 
 export interface IAutomatedWindow {
 	codeAutomationLog(type: string, args: any[]): void;
diff --git a/src/vs/platform/log/common/bufferLog.ts b/src/vs/platform/log/common/bufferLog.ts
index 0eb3660744e..d0db55ec56b 100644
--- a/src/vs/platform/log/common/bufferLog.ts
+++ b/src/vs/platform/log/common/bufferLog.ts
@@ -3,7 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { AbstractMessageLogger, DEFAULT_LOG_LEVEL, ILogger, log, LogLevel } from 'vs/platform/log/common/log';
+import { MutableDisposable } from '../../../base/common/lifecycle.js';
+import { AbstractMessageLogger, DEFAULT_LOG_LEVEL, ILogger, log, LogLevel } from './log.js';
 
 interface ILog {
 	level: LogLevel;
@@ -15,17 +16,17 @@ export class BufferLogger extends AbstractMessageLogger {
 	declare readonly _serviceBrand: undefined;
 	private buffer: ILog[] = [];
 	private _logger: ILogger | undefined = undefined;
+	private readonly _logLevelDisposable = this._register(new MutableDisposable());
 
 	constructor(logLevel: LogLevel = DEFAULT_LOG_LEVEL) {
 		super();
 		this.setLevel(logLevel);
-		this._register(this.onDidChangeLogLevel(level => {
-			this._logger?.setLevel(level);
-		}));
 	}
 
 	set logger(logger: ILogger) {
 		this._logger = logger;
+		this.setLevel(logger.getLevel());
+		this._logLevelDisposable.value = logger.onDidChangeLogLevel(this.setLevel, this);
 
 		for (const { level, message } of this.buffer) {
 			log(logger, level, message);
diff --git a/src/vs/platform/log/common/fileLog.ts b/src/vs/platform/log/common/fileLog.ts
index 05d6579338d..a0d97a36c86 100644
--- a/src/vs/platform/log/common/fileLog.ts
+++ b/src/vs/platform/log/common/fileLog.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ThrottledDelayer } from 'vs/base/common/async';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { basename, dirname, joinPath } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { ByteSize, FileOperationError, FileOperationResult, IFileService, whenProviderRegistered } from 'vs/platform/files/common/files';
-import { BufferLogger } from 'vs/platform/log/common/bufferLog';
-import { AbstractLoggerService, AbstractMessageLogger, ILogger, ILoggerOptions, ILoggerService, LogLevel } from 'vs/platform/log/common/log';
+import { ThrottledDelayer } from '../../../base/common/async.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { basename, dirname, joinPath } from '../../../base/common/resources.js';
+import { URI } from '../../../base/common/uri.js';
+import { ByteSize, FileOperationError, FileOperationResult, IFileService, whenProviderRegistered } from '../../files/common/files.js';
+import { BufferLogger } from './bufferLog.js';
+import { AbstractLoggerService, AbstractMessageLogger, ILogger, ILoggerOptions, ILoggerService, LogLevel } from './log.js';
 
 const MAX_FILE_SIZE = 5 * ByteSize.MB;
 
diff --git a/src/vs/platform/log/common/log.ts b/src/vs/platform/log/common/log.ts
index 28fc419bbaf..2471e0573d8 100644
--- a/src/vs/platform/log/common/log.ts
+++ b/src/vs/platform/log/common/log.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { Emitter, Event } from 'vs/base/common/event';
-import { hash } from 'vs/base/common/hash';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { ResourceMap } from 'vs/base/common/map';
-import { isWindows } from 'vs/base/common/platform';
-import { joinPath } from 'vs/base/common/resources';
-import { Mutable, isNumber, isString } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { ILocalizedString } from 'vs/platform/action/common/action';
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import * as nls from '../../../nls.js';
+import { toErrorMessage } from '../../../base/common/errorMessage.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { hash } from '../../../base/common/hash.js';
+import { Disposable, IDisposable } from '../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../base/common/map.js';
+import { isWindows } from '../../../base/common/platform.js';
+import { joinPath } from '../../../base/common/resources.js';
+import { Mutable, isNumber, isString } from '../../../base/common/types.js';
+import { URI } from '../../../base/common/uri.js';
+import { ILocalizedString } from '../../action/common/action.js';
+import { RawContextKey } from '../../contextkey/common/contextkey.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 export const ILogService = createDecorator<ILogService>('logService');
 export const ILoggerService = createDecorator<ILoggerService>('loggerService');
diff --git a/src/vs/platform/log/common/logIpc.ts b/src/vs/platform/log/common/logIpc.ts
index 996d680b241..4a767070d98 100644
--- a/src/vs/platform/log/common/logIpc.ts
+++ b/src/vs/platform/log/common/logIpc.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { Event } from 'vs/base/common/event';
-import { IChannel, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
-import { AbstractLoggerService, AbstractMessageLogger, AdapterLogger, DidChangeLoggersEvent, ILogger, ILoggerOptions, ILoggerResource, ILoggerService, isLogLevel, LogLevel } from 'vs/platform/log/common/log';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IURITransformer } from 'vs/base/common/uriIpc';
+import { URI } from '../../../base/common/uri.js';
+import { Event } from '../../../base/common/event.js';
+import { IChannel, IServerChannel } from '../../../base/parts/ipc/common/ipc.js';
+import { AbstractLoggerService, AbstractMessageLogger, AdapterLogger, DidChangeLoggersEvent, ILogger, ILoggerOptions, ILoggerResource, ILoggerService, isLogLevel, LogLevel } from './log.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { IURITransformer } from '../../../base/common/uriIpc.js';
 
 export class LoggerChannelClient extends AbstractLoggerService implements ILoggerService {
 
diff --git a/src/vs/platform/log/common/logService.ts b/src/vs/platform/log/common/logService.ts
index 095d8b931e3..e76c4c30d7a 100644
--- a/src/vs/platform/log/common/logService.ts
+++ b/src/vs/platform/log/common/logService.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Event } from 'vs/base/common/event';
-import { ILogger, ILogService, LogLevel, MultiplexLogger } from 'vs/platform/log/common/log';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { Event } from '../../../base/common/event.js';
+import { ILogger, ILogService, LogLevel, MultiplexLogger } from './log.js';
 
 export class LogService extends Disposable implements ILogService {
 
diff --git a/src/vs/platform/log/electron-main/logIpc.ts b/src/vs/platform/log/electron-main/logIpc.ts
index 6ff3362ee91..2caf2b72d7a 100644
--- a/src/vs/platform/log/electron-main/logIpc.ts
+++ b/src/vs/platform/log/electron-main/logIpc.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { ResourceMap } from 'vs/base/common/map';
-import { URI } from 'vs/base/common/uri';
-import { IServerChannel } from 'vs/base/parts/ipc/common/ipc';
-import { ILogger, ILoggerOptions, isLogLevel, log, LogLevel } from 'vs/platform/log/common/log';
-import { ILoggerMainService } from 'vs/platform/log/electron-main/loggerService';
+import { Event } from '../../../base/common/event.js';
+import { ResourceMap } from '../../../base/common/map.js';
+import { URI } from '../../../base/common/uri.js';
+import { IServerChannel } from '../../../base/parts/ipc/common/ipc.js';
+import { ILogger, ILoggerOptions, isLogLevel, log, LogLevel } from '../common/log.js';
+import { ILoggerMainService } from './loggerService.js';
 
 export class LoggerChannel implements IServerChannel {
 
diff --git a/src/vs/platform/log/electron-main/loggerService.ts b/src/vs/platform/log/electron-main/loggerService.ts
index c191d7e7c17..5d569519f79 100644
--- a/src/vs/platform/log/electron-main/loggerService.ts
+++ b/src/vs/platform/log/electron-main/loggerService.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ResourceMap } from 'vs/base/common/map';
-import { URI } from 'vs/base/common/uri';
-import { Event } from 'vs/base/common/event';
-import { refineServiceDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { DidChangeLoggersEvent, ILogger, ILoggerOptions, ILoggerResource, ILoggerService, LogLevel, isLogLevel } from 'vs/platform/log/common/log';
-import { LoggerService } from 'vs/platform/log/node/loggerService';
+import { ResourceMap } from '../../../base/common/map.js';
+import { URI } from '../../../base/common/uri.js';
+import { Event } from '../../../base/common/event.js';
+import { refineServiceDecorator } from '../../instantiation/common/instantiation.js';
+import { DidChangeLoggersEvent, ILogger, ILoggerOptions, ILoggerResource, ILoggerService, LogLevel, isLogLevel } from '../common/log.js';
+import { LoggerService } from '../node/loggerService.js';
 
 export const ILoggerMainService = refineServiceDecorator<ILoggerService, ILoggerMainService>(ILoggerService);
 
diff --git a/src/vs/platform/log/node/loggerService.ts b/src/vs/platform/log/node/loggerService.ts
index 9624ac363e6..ab034fdaf55 100644
--- a/src/vs/platform/log/node/loggerService.ts
+++ b/src/vs/platform/log/node/loggerService.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { AbstractLoggerService, ILogger, ILoggerOptions, ILoggerService, LogLevel } from 'vs/platform/log/common/log';
-import { SpdLogLogger } from 'vs/platform/log/node/spdlogLog';
+import { URI } from '../../../base/common/uri.js';
+import { generateUuid } from '../../../base/common/uuid.js';
+import { AbstractLoggerService, ILogger, ILoggerOptions, ILoggerService, LogLevel } from '../common/log.js';
+import { SpdLogLogger } from './spdlogLog.js';
 
 export class LoggerService extends AbstractLoggerService implements ILoggerService {
 
diff --git a/src/vs/platform/log/node/spdlogLog.ts b/src/vs/platform/log/node/spdlogLog.ts
index 5c38b748e1c..ef99c32831a 100644
--- a/src/vs/platform/log/node/spdlogLog.ts
+++ b/src/vs/platform/log/node/spdlogLog.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type * as spdlog from '@vscode/spdlog';
-import { ByteSize } from 'vs/platform/files/common/files';
-import { AbstractMessageLogger, ILogger, LogLevel } from 'vs/platform/log/common/log';
+import { ByteSize } from '../../files/common/files.js';
+import { AbstractMessageLogger, ILogger, LogLevel } from '../common/log.js';
 
 enum SpdLogLevel {
 	Trace,
diff --git a/src/vs/platform/markers/common/markerService.ts b/src/vs/platform/markers/common/markerService.ts
index 692f6ba5cb7..8e9968a94c9 100644
--- a/src/vs/platform/markers/common/markerService.ts
+++ b/src/vs/platform/markers/common/markerService.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isFalsyOrEmpty, isNonEmptyArray } from 'vs/base/common/arrays';
-import { DebounceEmitter } from 'vs/base/common/event';
-import { Iterable } from 'vs/base/common/iterator';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { ResourceMap } from 'vs/base/common/map';
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { IMarker, IMarkerData, IMarkerService, IResourceMarker, MarkerSeverity, MarkerStatistics } from './markers';
+import { isFalsyOrEmpty, isNonEmptyArray } from '../../../base/common/arrays.js';
+import { DebounceEmitter } from '../../../base/common/event.js';
+import { Iterable } from '../../../base/common/iterator.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../base/common/map.js';
+import { Schemas } from '../../../base/common/network.js';
+import { URI } from '../../../base/common/uri.js';
+import { IMarker, IMarkerData, IMarkerService, IResourceMarker, MarkerSeverity, MarkerStatistics } from './markers.js';
 
 export const unsupportedSchemas = new Set([
 	Schemas.inMemory,
@@ -18,7 +18,6 @@ export const unsupportedSchemas = new Set([
 	Schemas.walkThrough,
 	Schemas.walkThroughSnippet,
 	Schemas.vscodeChatCodeBlock,
-	Schemas.vscodeCopilotBackingChatCodeBlock,
 ]);
 
 class DoubleResourceMap<V> {
diff --git a/src/vs/platform/markers/common/markers.ts b/src/vs/platform/markers/common/markers.ts
index 8b68c4f80f3..73cb120869a 100644
--- a/src/vs/platform/markers/common/markers.ts
+++ b/src/vs/platform/markers/common/markers.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import Severity from 'vs/base/common/severity';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { Event } from '../../../base/common/event.js';
+import Severity from '../../../base/common/severity.js';
+import { URI } from '../../../base/common/uri.js';
+import { localize } from '../../../nls.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 export interface IMarkerService {
 	readonly _serviceBrand: undefined;
diff --git a/src/vs/platform/markers/test/common/markerService.test.ts b/src/vs/platform/markers/test/common/markerService.test.ts
index 1b9916a8adf..b3d1ff9a2ad 100644
--- a/src/vs/platform/markers/test/common/markerService.test.ts
+++ b/src/vs/platform/markers/test/common/markerService.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IMarkerData, MarkerSeverity } from 'vs/platform/markers/common/markers';
-import * as markerService from 'vs/platform/markers/common/markerService';
+import { URI } from '../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { IMarkerData, MarkerSeverity } from '../../common/markers.js';
+import * as markerService from '../../common/markerService.js';
 
 function randomMarkerData(severity = MarkerSeverity.Error): IMarkerData {
 	return {
diff --git a/src/vs/platform/menubar/common/menubar.ts b/src/vs/platform/menubar/common/menubar.ts
index 6f8d45d8c40..581f4e48171 100644
--- a/src/vs/platform/menubar/common/menubar.ts
+++ b/src/vs/platform/menubar/common/menubar.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
+import { URI } from '../../../base/common/uri.js';
 
 export interface ICommonMenubarService {
 	updateMenubar(windowId: number, menuData: IMenubarData): Promise<void>;
diff --git a/src/vs/platform/menubar/electron-main/menubar.ts b/src/vs/platform/menubar/electron-main/menubar.ts
index d7449e94541..3ff82f22991 100644
--- a/src/vs/platform/menubar/electron-main/menubar.ts
+++ b/src/vs/platform/menubar/electron-main/menubar.ts
@@ -4,28 +4,28 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { app, BrowserWindow, KeyboardEvent, Menu, MenuItem, MenuItemConstructorOptions, WebContents } from 'electron';
-import { WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from 'vs/base/common/actions';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { mnemonicMenuLabel } from 'vs/base/common/labels';
-import { isMacintosh, language } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import * as nls from 'vs/nls';
-import { IAuxiliaryWindowsMainService } from 'vs/platform/auxiliaryWindow/electron-main/auxiliaryWindows';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IEnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
-import { ILifecycleMainService } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IMenubarData, IMenubarKeybinding, IMenubarMenu, IMenubarMenuRecentItemAction, isMenubarMenuItemAction, isMenubarMenuItemRecentAction, isMenubarMenuItemSeparator, isMenubarMenuItemSubmenu, MenubarMenuItem } from 'vs/platform/menubar/common/menubar';
-import { INativeHostMainService } from 'vs/platform/native/electron-main/nativeHostMainService';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IStateService } from 'vs/platform/state/node/state';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IUpdateService, StateType } from 'vs/platform/update/common/update';
-import { INativeRunActionInWindowRequest, INativeRunKeybindingInWindowRequest, IWindowOpenable, hasNativeTitlebar } from 'vs/platform/window/common/window';
-import { IWindowsCountChangedEvent, IWindowsMainService, OpenContext } from 'vs/platform/windows/electron-main/windows';
-import { IWorkspacesHistoryMainService } from 'vs/platform/workspaces/electron-main/workspacesHistoryMainService';
-import { Disposable } from 'vs/base/common/lifecycle';
+import { WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from '../../../base/common/actions.js';
+import { RunOnceScheduler } from '../../../base/common/async.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { mnemonicMenuLabel } from '../../../base/common/labels.js';
+import { isMacintosh, language } from '../../../base/common/platform.js';
+import { URI } from '../../../base/common/uri.js';
+import * as nls from '../../../nls.js';
+import { IAuxiliaryWindowsMainService } from '../../auxiliaryWindow/electron-main/auxiliaryWindows.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { IEnvironmentMainService } from '../../environment/electron-main/environmentMainService.js';
+import { ILifecycleMainService } from '../../lifecycle/electron-main/lifecycleMainService.js';
+import { ILogService } from '../../log/common/log.js';
+import { IMenubarData, IMenubarKeybinding, IMenubarMenu, IMenubarMenuRecentItemAction, isMenubarMenuItemAction, isMenubarMenuItemRecentAction, isMenubarMenuItemSeparator, isMenubarMenuItemSubmenu, MenubarMenuItem } from '../common/menubar.js';
+import { INativeHostMainService } from '../../native/electron-main/nativeHostMainService.js';
+import { IProductService } from '../../product/common/productService.js';
+import { IStateService } from '../../state/node/state.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
+import { IUpdateService, StateType } from '../../update/common/update.js';
+import { INativeRunActionInWindowRequest, INativeRunKeybindingInWindowRequest, IWindowOpenable, hasNativeTitlebar } from '../../window/common/window.js';
+import { IWindowsCountChangedEvent, IWindowsMainService, OpenContext } from '../../windows/electron-main/windows.js';
+import { IWorkspacesHistoryMainService } from '../../workspaces/electron-main/workspacesHistoryMainService.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
 
 const telemetryFrom = 'menu';
 
diff --git a/src/vs/platform/menubar/electron-main/menubarMainService.ts b/src/vs/platform/menubar/electron-main/menubarMainService.ts
index 731070e4f50..a80966d417a 100644
--- a/src/vs/platform/menubar/electron-main/menubarMainService.ts
+++ b/src/vs/platform/menubar/electron-main/menubarMainService.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILifecycleMainService, LifecycleMainPhase } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ICommonMenubarService, IMenubarData } from 'vs/platform/menubar/common/menubar';
-import { Menubar } from 'vs/platform/menubar/electron-main/menubar';
-import { Disposable } from 'vs/base/common/lifecycle';
+import { createDecorator, IInstantiationService } from '../../instantiation/common/instantiation.js';
+import { ILifecycleMainService, LifecycleMainPhase } from '../../lifecycle/electron-main/lifecycleMainService.js';
+import { ILogService } from '../../log/common/log.js';
+import { ICommonMenubarService, IMenubarData } from '../common/menubar.js';
+import { Menubar } from './menubar.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
 
 export const IMenubarMainService = createDecorator<IMenubarMainService>('menubarMainService');
 
diff --git a/src/vs/platform/menubar/electron-sandbox/menubar.ts b/src/vs/platform/menubar/electron-sandbox/menubar.ts
index 77f60e85e9a..93ae4885778 100644
--- a/src/vs/platform/menubar/electron-sandbox/menubar.ts
+++ b/src/vs/platform/menubar/electron-sandbox/menubar.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ICommonMenubarService } from 'vs/platform/menubar/common/menubar';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { ICommonMenubarService } from '../common/menubar.js';
 
 export const IMenubarService = createDecorator<IMenubarService>('menubarService');
 
diff --git a/src/vs/platform/native/common/native.ts b/src/vs/platform/native/common/native.ts
index 4c035680fb7..f2c1930b017 100644
--- a/src/vs/platform/native/common/native.ts
+++ b/src/vs/platform/native/common/native.ts
@@ -3,16 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { Event } from 'vs/base/common/event';
-import { URI } from 'vs/base/common/uri';
-import { MessageBoxOptions, MessageBoxReturnValue, OpenDevToolsOptions, OpenDialogOptions, OpenDialogReturnValue, SaveDialogOptions, SaveDialogReturnValue } from 'vs/base/parts/sandbox/common/electronTypes';
-import { ISerializableCommandAction } from 'vs/platform/action/common/action';
-import { INativeOpenDialogOptions } from 'vs/platform/dialogs/common/dialogs';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IV8Profile } from 'vs/platform/profiling/common/profiling';
-import { IPartsSplash } from 'vs/platform/theme/common/themeService';
-import { IColorScheme, IOpenedAuxiliaryWindow, IOpenedMainWindow, IOpenEmptyWindowOptions, IOpenWindowOptions, IPoint, IRectangle, IWindowOpenable } from 'vs/platform/window/common/window';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { Event } from '../../../base/common/event.js';
+import { URI } from '../../../base/common/uri.js';
+import { MessageBoxOptions, MessageBoxReturnValue, OpenDialogOptions, OpenDialogReturnValue, SaveDialogOptions, SaveDialogReturnValue } from '../../../base/parts/sandbox/common/electronTypes.js';
+import { ISerializableCommandAction } from '../../action/common/action.js';
+import { INativeOpenDialogOptions } from '../../dialogs/common/dialogs.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { IV8Profile } from '../../profiling/common/profiling.js';
+import { AuthInfo, Credentials } from '../../request/common/request.js';
+import { IPartsSplash } from '../../theme/common/themeService.js';
+import { IColorScheme, IOpenedAuxiliaryWindow, IOpenedMainWindow, IOpenEmptyWindowOptions, IOpenWindowOptions, IPoint, IRectangle, IWindowOpenable } from '../../window/common/window.js';
 
 export interface ICPUProperties {
 	model: string;
@@ -73,6 +74,7 @@ export interface ICommonNativeHostService {
 	getWindows(options: { includeAuxiliaryWindows: false }): Promise<Array<IOpenedMainWindow>>;
 	getWindowCount(): Promise<number>;
 	getActiveWindowId(): Promise<number | undefined>;
+	getActiveWindowPosition(): Promise<IRectangle | undefined>;
 
 	openWindow(options?: IOpenEmptyWindowOptions): Promise<void>;
 	openWindow(toOpen: IWindowOpenable[], options?: IOpenWindowOptions): Promise<void>;
@@ -126,7 +128,7 @@ export interface ICommonNativeHostService {
 	showItemInFolder(path: string): Promise<void>;
 	setRepresentedFilename(path: string, options?: INativeHostOptions): Promise<void>;
 	setDocumentEdited(edited: boolean, options?: INativeHostOptions): Promise<void>;
-	openExternal(url: string): Promise<boolean>;
+	openExternal(url: string, defaultApplication?: string): Promise<boolean>;
 	moveItemToTrash(fullPath: string): Promise<void>;
 
 	isAdmin(): Promise<boolean>;
@@ -153,6 +155,7 @@ export interface ICommonNativeHostService {
 	writeClipboardBuffer(format: string, buffer: VSBuffer, type?: 'selection' | 'clipboard'): Promise<void>;
 	readClipboardBuffer(format: string): Promise<VSBuffer>;
 	hasClipboard(format: string, type?: 'selection' | 'clipboard'): Promise<boolean>;
+	readImage(): Promise<Uint8Array>;
 
 	// macOS Touchbar
 	newWindowTab(): Promise<void>;
@@ -176,7 +179,7 @@ export interface ICommonNativeHostService {
 	exit(code: number): Promise<void>;
 
 	// Development
-	openDevTools(options?: Partial<OpenDevToolsOptions> & INativeHostOptions): Promise<void>;
+	openDevTools(options?: INativeHostOptions): Promise<void>;
 	toggleDevTools(options?: INativeHostOptions): Promise<void>;
 
 	// Perf Introspection
@@ -184,6 +187,8 @@ export interface ICommonNativeHostService {
 
 	// Connectivity
 	resolveProxy(url: string): Promise<string | undefined>;
+	lookupAuthorization(authInfo: AuthInfo): Promise<Credentials | undefined>;
+	lookupKerberosAuthorization(url: string): Promise<string | undefined>;
 	loadCertificates(): Promise<string[]>;
 	findFreePort(startPort: number, giveUpAfter: number, timeout: number, stride?: number): Promise<number>;
 
diff --git a/src/vs/platform/native/common/nativeHostService.ts b/src/vs/platform/native/common/nativeHostService.ts
index c99768ed82a..7d16cba7c66 100644
--- a/src/vs/platform/native/common/nativeHostService.ts
+++ b/src/vs/platform/native/common/nativeHostService.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
-import { IMainProcessService } from 'vs/platform/ipc/common/mainProcessService';
-import { INativeHostService } from 'vs/platform/native/common/native';
+import { ProxyChannel } from '../../../base/parts/ipc/common/ipc.js';
+import { IMainProcessService } from '../../ipc/common/mainProcessService.js';
+import { INativeHostService } from './native.js';
 
 // @ts-ignore: interface is implemented via proxy
 export class NativeHostService implements INativeHostService {
diff --git a/src/vs/platform/native/electron-main/auth.ts b/src/vs/platform/native/electron-main/auth.ts
new file mode 100644
index 00000000000..34adcc69f69
--- /dev/null
+++ b/src/vs/platform/native/electron-main/auth.ts
@@ -0,0 +1,316 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { app, AuthenticationResponseDetails, AuthInfo as ElectronAuthInfo, Event as ElectronEvent, WebContents } from 'electron';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Event } from '../../../base/common/event.js';
+import { hash } from '../../../base/common/hash.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { URI } from '../../../base/common/uri.js';
+import { generateUuid } from '../../../base/common/uuid.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { IEncryptionMainService } from '../../encryption/common/encryptionService.js';
+import { IEnvironmentMainService } from '../../environment/electron-main/environmentMainService.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { ILogService } from '../../log/common/log.js';
+import { AuthInfo, Credentials } from '../../request/common/request.js';
+import { StorageScope, StorageTarget } from '../../storage/common/storage.js';
+import { IApplicationStorageMainService } from '../../storage/electron-main/storageMainService.js';
+import { IWindowsMainService } from '../../windows/electron-main/windows.js';
+
+interface ElectronAuthenticationResponseDetails extends AuthenticationResponseDetails {
+	firstAuthAttempt?: boolean; // https://github.com/electron/electron/blob/84a42a050e7d45225e69df5bd2d2bf9f1037ea41/shell/browser/login_handler.cc#L70
+}
+
+type LoginEvent = {
+	event?: ElectronEvent;
+	authInfo: AuthInfo;
+	callback?: (username?: string, password?: string) => void;
+};
+
+export const IProxyAuthService = createDecorator<IProxyAuthService>('proxyAuthService');
+
+export interface IProxyAuthService {
+	lookupAuthorization(authInfo: AuthInfo): Promise<Credentials | undefined>;
+}
+
+export class ProxyAuthService extends Disposable implements IProxyAuthService {
+
+	declare readonly _serviceBrand: undefined;
+
+	private readonly PROXY_CREDENTIALS_SERVICE_KEY = 'proxy-credentials://';
+
+	private pendingProxyResolves = new Map<string, Promise<Credentials | undefined>>();
+	private currentDialog: Promise<Credentials | undefined> | undefined = undefined;
+
+	private cancelledAuthInfoHashes = new Set<string>();
+
+	private sessionCredentials = new Map<string, Credentials | undefined>();
+
+	constructor(
+		@ILogService private readonly logService: ILogService,
+		@IWindowsMainService private readonly windowsMainService: IWindowsMainService,
+		@IEncryptionMainService private readonly encryptionMainService: IEncryptionMainService,
+		@IApplicationStorageMainService private readonly applicationStorageMainService: IApplicationStorageMainService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IEnvironmentMainService private readonly environmentMainService: IEnvironmentMainService,
+	) {
+		super();
+
+		this.registerListeners();
+	}
+
+	private registerListeners(): void {
+		const onLogin = Event.fromNodeEventEmitter<LoginEvent>(app, 'login', (event: ElectronEvent, _webContents: WebContents, req: ElectronAuthenticationResponseDetails, authInfo: ElectronAuthInfo, callback) => ({ event, authInfo: { ...authInfo, attempt: req.firstAuthAttempt ? 1 : 2 }, callback } satisfies LoginEvent));
+		this._register(onLogin(this.onLogin, this));
+	}
+
+	async lookupAuthorization(authInfo: AuthInfo): Promise<Credentials | undefined> {
+		return this.onLogin({ authInfo });
+	}
+
+	private async onLogin({ event, authInfo, callback }: LoginEvent): Promise<Credentials | undefined> {
+		if (!authInfo.isProxy) {
+			return; // only for proxy
+		}
+
+		// Signal we handle this event on our own, otherwise
+		// Electron will ignore our provided credentials.
+		event?.preventDefault();
+
+		// Compute a hash over the authentication info to be used
+		// with the credentials store to return the right credentials
+		// given the properties of the auth request
+		// (see https://github.com/microsoft/vscode/issues/109497)
+		const authInfoHash = String(hash({ scheme: authInfo.scheme, host: authInfo.host, port: authInfo.port }));
+
+		let credentials: Credentials | undefined = undefined;
+		let pendingProxyResolve = this.pendingProxyResolves.get(authInfoHash);
+		if (!pendingProxyResolve) {
+			this.logService.trace('auth#onLogin (proxy) - no pending proxy handling found, starting new');
+
+			pendingProxyResolve = this.resolveProxyCredentials(authInfo, authInfoHash);
+			this.pendingProxyResolves.set(authInfoHash, pendingProxyResolve);
+			try {
+				credentials = await pendingProxyResolve;
+			} finally {
+				this.pendingProxyResolves.delete(authInfoHash);
+			}
+		} else {
+			this.logService.trace('auth#onLogin (proxy) - pending proxy handling found');
+
+			credentials = await pendingProxyResolve;
+		}
+
+		// According to Electron docs, it is fine to call back without
+		// username or password to signal that the authentication was handled
+		// by us, even though without having credentials received:
+		//
+		// > If `callback` is called without a username or password, the authentication
+		// > request will be cancelled and the authentication error will be returned to the
+		// > page.
+		callback?.(credentials?.username, credentials?.password);
+		return credentials;
+	}
+
+	private async resolveProxyCredentials(authInfo: AuthInfo, authInfoHash: string): Promise<Credentials | undefined> {
+		this.logService.trace('auth#resolveProxyCredentials (proxy) - enter');
+
+		try {
+			const credentials = await this.doResolveProxyCredentials(authInfo, authInfoHash);
+			if (credentials) {
+				this.logService.trace('auth#resolveProxyCredentials (proxy) - got credentials');
+
+				return credentials;
+			} else {
+				this.logService.trace('auth#resolveProxyCredentials (proxy) - did not get credentials');
+			}
+		} finally {
+			this.logService.trace('auth#resolveProxyCredentials (proxy) - exit');
+		}
+
+		return undefined;
+	}
+
+	private async doResolveProxyCredentials(authInfo: AuthInfo, authInfoHash: string): Promise<Credentials | undefined> {
+		this.logService.trace('auth#doResolveProxyCredentials - enter', authInfo);
+
+		// For testing.
+		if (this.environmentMainService.extensionTestsLocationURI) {
+			const credentials = this.configurationService.getValue<string>('integration-test.http.proxyAuth');
+			if (credentials) {
+				const j = credentials.indexOf(':');
+				if (j !== -1) {
+					return {
+						username: credentials.substring(0, j),
+						password: credentials.substring(j + 1)
+					};
+				} else {
+					return {
+						username: credentials,
+						password: ''
+					};
+				}
+			}
+			return undefined;
+		}
+
+		// Reply with manually supplied credentials. Fail if they are wrong.
+		const newHttpProxy = (this.configurationService.getValue<string>('http.proxy') || '').trim()
+			|| (process.env['https_proxy'] || process.env['HTTPS_PROXY'] || process.env['http_proxy'] || process.env['HTTP_PROXY'] || '').trim()
+			|| undefined;
+
+		if (newHttpProxy?.indexOf('@') !== -1) {
+			const uri = URI.parse(newHttpProxy!);
+			const i = uri.authority.indexOf('@');
+			if (i !== -1) {
+				if (authInfo.attempt > 1) {
+					this.logService.trace('auth#doResolveProxyCredentials (proxy) - exit - ignoring previously used config/envvar credentials');
+					return undefined; // We tried already, let the user handle it.
+				}
+				this.logService.trace('auth#doResolveProxyCredentials (proxy) - exit - found config/envvar credentials to use');
+				const credentials = uri.authority.substring(0, i);
+				const j = credentials.indexOf(':');
+				if (j !== -1) {
+					return {
+						username: credentials.substring(0, j),
+						password: credentials.substring(j + 1)
+					};
+				} else {
+					return {
+						username: credentials,
+						password: ''
+					};
+				}
+			}
+		}
+
+		// Reply with session credentials unless we used them already.
+		// In that case we need to show a login dialog again because
+		// they seem invalid.
+		const sessionCredentials = authInfo.attempt === 1 && this.sessionCredentials.get(authInfoHash);
+		if (sessionCredentials) {
+			this.logService.trace('auth#doResolveProxyCredentials (proxy) - exit - found session credentials to use');
+
+			const { username, password } = sessionCredentials;
+			return { username, password };
+		}
+
+		let storedUsername: string | undefined;
+		let storedPassword: string | undefined;
+		try {
+			// Try to find stored credentials for the given auth info
+			const encryptedValue = this.applicationStorageMainService.get(this.PROXY_CREDENTIALS_SERVICE_KEY + authInfoHash, StorageScope.APPLICATION);
+			if (encryptedValue) {
+				const credentials: Credentials = JSON.parse(await this.encryptionMainService.decrypt(encryptedValue));
+				storedUsername = credentials.username;
+				storedPassword = credentials.password;
+			}
+		} catch (error) {
+			this.logService.error(error); // handle errors by asking user for login via dialog
+		}
+
+		// Reply with stored credentials unless we used them already.
+		// In that case we need to show a login dialog again because
+		// they seem invalid.
+		if (authInfo.attempt === 1 && typeof storedUsername === 'string' && typeof storedPassword === 'string') {
+			this.logService.trace('auth#doResolveProxyCredentials (proxy) - exit - found stored credentials to use');
+
+			this.sessionCredentials.set(authInfoHash, { username: storedUsername, password: storedPassword });
+			return { username: storedUsername, password: storedPassword };
+		}
+
+		const previousDialog = this.currentDialog;
+		const currentDialog = this.currentDialog = (async () => {
+			await previousDialog;
+			const credentials = await this.showProxyCredentialsDialog(authInfo, authInfoHash, storedUsername, storedPassword);
+			if (this.currentDialog === currentDialog!) {
+				this.currentDialog = undefined;
+			}
+			return credentials;
+		})();
+		return currentDialog;
+	}
+
+	private async showProxyCredentialsDialog(authInfo: AuthInfo, authInfoHash: string, storedUsername: string | undefined, storedPassword: string | undefined): Promise<Credentials | undefined> {
+		if (this.cancelledAuthInfoHashes.has(authInfoHash)) {
+			this.logService.trace('auth#doResolveProxyCredentials (proxy) - exit - login dialog was cancelled before, not showing again');
+
+			return undefined;
+		}
+
+		// Find suitable window to show dialog: prefer to show it in the
+		// active window because any other network request will wait on
+		// the credentials and we want the user to present the dialog.
+		const window = this.windowsMainService.getFocusedWindow() || this.windowsMainService.getLastActiveWindow();
+		if (!window) {
+			this.logService.trace('auth#doResolveProxyCredentials (proxy) - exit - no opened window found to show dialog in');
+
+			return undefined; // unexpected
+		}
+
+		this.logService.trace(`auth#doResolveProxyCredentials (proxy) - asking window ${window.id} to handle proxy login`);
+
+		// Open proxy dialog
+		const sessionCredentials = this.sessionCredentials.get(authInfoHash);
+		const payload = {
+			authInfo,
+			username: sessionCredentials?.username ?? storedUsername, // prefer to show already used username (if any) over stored
+			password: sessionCredentials?.password ?? storedPassword, // prefer to show already used password (if any) over stored
+			replyChannel: `vscode:proxyAuthResponse:${generateUuid()}`
+		};
+		window.sendWhenReady('vscode:openProxyAuthenticationDialog', CancellationToken.None, payload);
+
+		// Handle reply
+		const loginDialogCredentials = await new Promise<Credentials | undefined>(resolve => {
+			const proxyAuthResponseHandler = async (event: ElectronEvent, channel: string, reply: Credentials & { remember: boolean } | undefined /* canceled */) => {
+				if (channel === payload.replyChannel) {
+					this.logService.trace(`auth#doResolveProxyCredentials - exit - received credentials from window ${window.id}`);
+					window.win?.webContents.off('ipc-message', proxyAuthResponseHandler);
+
+					// We got credentials from the window
+					if (reply) {
+						const credentials: Credentials = { username: reply.username, password: reply.password };
+
+						// Update stored credentials based on `remember` flag
+						try {
+							if (reply.remember) {
+								const encryptedSerializedCredentials = await this.encryptionMainService.encrypt(JSON.stringify(credentials));
+								this.applicationStorageMainService.store(
+									this.PROXY_CREDENTIALS_SERVICE_KEY + authInfoHash,
+									encryptedSerializedCredentials,
+									StorageScope.APPLICATION,
+									// Always store in machine scope because we do not want these values to be synced
+									StorageTarget.MACHINE
+								);
+							} else {
+								this.applicationStorageMainService.remove(this.PROXY_CREDENTIALS_SERVICE_KEY + authInfoHash, StorageScope.APPLICATION);
+							}
+						} catch (error) {
+							this.logService.error(error); // handle gracefully
+						}
+
+						resolve({ username: credentials.username, password: credentials.password });
+					}
+
+					// We did not get any credentials from the window (e.g. cancelled)
+					else {
+						this.cancelledAuthInfoHashes.add(authInfoHash);
+						resolve(undefined);
+					}
+				}
+			};
+
+			window.win?.webContents.on('ipc-message', proxyAuthResponseHandler);
+		});
+
+		// Remember credentials for the session in case
+		// the credentials are wrong and we show the dialog
+		// again
+		this.sessionCredentials.set(authInfoHash, loginDialogCredentials);
+
+		return loginDialogCredentials;
+	}
+}
diff --git a/src/vs/platform/native/electron-main/nativeHostMainService.ts b/src/vs/platform/native/electron-main/nativeHostMainService.ts
index c7c6cf552ae..6f57b9a7b44 100644
--- a/src/vs/platform/native/electron-main/nativeHostMainService.ts
+++ b/src/vs/platform/native/electron-main/nativeHostMainService.ts
@@ -3,46 +3,50 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as fs from 'fs';
 import { exec } from 'child_process';
-import { app, BrowserWindow, clipboard, Display, Menu, MessageBoxOptions, MessageBoxReturnValue, OpenDevToolsOptions, OpenDialogOptions, OpenDialogReturnValue, powerMonitor, SaveDialogOptions, SaveDialogReturnValue, screen, shell, webContents } from 'electron';
+import { app, BrowserWindow, clipboard, Display, Menu, MessageBoxOptions, MessageBoxReturnValue, OpenDialogOptions, OpenDialogReturnValue, powerMonitor, SaveDialogOptions, SaveDialogReturnValue, screen, shell, webContents } from 'electron';
 import { arch, cpus, freemem, loadavg, platform, release, totalmem, type } from 'os';
 import { promisify } from 'util';
-import { memoize } from 'vs/base/common/decorators';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { dirname, join, resolve } from 'vs/base/common/path';
-import { isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
-import { AddFirstParameterToFunctions } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { realpath } from 'vs/base/node/extpath';
-import { virtualMachineHint } from 'vs/base/node/id';
-import { Promises, SymlinkSupport } from 'vs/base/node/pfs';
-import { findFreePort } from 'vs/base/node/ports';
-import { localize } from 'vs/nls';
-import { ISerializableCommandAction } from 'vs/platform/action/common/action';
-import { INativeOpenDialogOptions } from 'vs/platform/dialogs/common/dialogs';
-import { IDialogMainService } from 'vs/platform/dialogs/electron-main/dialogMainService';
-import { IEnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ILifecycleMainService, IRelaunchOptions } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ICommonNativeHostService, INativeHostOptions, IOSProperties, IOSStatistics } from 'vs/platform/native/common/native';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IPartsSplash } from 'vs/platform/theme/common/themeService';
-import { IThemeMainService } from 'vs/platform/theme/electron-main/themeMainService';
-import { ICodeWindow } from 'vs/platform/window/electron-main/window';
-import { IColorScheme, IOpenedAuxiliaryWindow, IOpenedMainWindow, IOpenEmptyWindowOptions, IOpenWindowOptions, IPoint, IRectangle, IWindowOpenable } from 'vs/platform/window/common/window';
-import { IWindowsMainService, OpenContext } from 'vs/platform/windows/electron-main/windows';
-import { isWorkspaceIdentifier, toWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
-import { IWorkspacesManagementMainService } from 'vs/platform/workspaces/electron-main/workspacesManagementMainService';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { hasWSLFeatureInstalled } from 'vs/platform/remote/node/wsl';
-import { WindowProfiler } from 'vs/platform/profiling/electron-main/windowProfiling';
-import { IV8Profile } from 'vs/platform/profiling/common/profiling';
-import { IAuxiliaryWindowsMainService } from 'vs/platform/auxiliaryWindow/electron-main/auxiliaryWindows';
-import { IAuxiliaryWindow } from 'vs/platform/auxiliaryWindow/electron-main/auxiliaryWindow';
-import { CancellationError } from 'vs/base/common/errors';
+import { memoize } from '../../../base/common/decorators.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { matchesSomeScheme, Schemas } from '../../../base/common/network.js';
+import { dirname, join, posix, resolve, win32 } from '../../../base/common/path.js';
+import { isLinux, isMacintosh, isWindows } from '../../../base/common/platform.js';
+import { AddFirstParameterToFunctions } from '../../../base/common/types.js';
+import { URI } from '../../../base/common/uri.js';
+import { realpath } from '../../../base/node/extpath.js';
+import { virtualMachineHint } from '../../../base/node/id.js';
+import { Promises, SymlinkSupport } from '../../../base/node/pfs.js';
+import { findFreePort } from '../../../base/node/ports.js';
+import { localize } from '../../../nls.js';
+import { ISerializableCommandAction } from '../../action/common/action.js';
+import { INativeOpenDialogOptions } from '../../dialogs/common/dialogs.js';
+import { IDialogMainService } from '../../dialogs/electron-main/dialogMainService.js';
+import { IEnvironmentMainService } from '../../environment/electron-main/environmentMainService.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { ILifecycleMainService, IRelaunchOptions } from '../../lifecycle/electron-main/lifecycleMainService.js';
+import { ILogService } from '../../log/common/log.js';
+import { ICommonNativeHostService, INativeHostOptions, IOSProperties, IOSStatistics } from '../common/native.js';
+import { IProductService } from '../../product/common/productService.js';
+import { IPartsSplash } from '../../theme/common/themeService.js';
+import { IThemeMainService } from '../../theme/electron-main/themeMainService.js';
+import { ICodeWindow } from '../../window/electron-main/window.js';
+import { IColorScheme, IOpenedAuxiliaryWindow, IOpenedMainWindow, IOpenEmptyWindowOptions, IOpenWindowOptions, IPoint, IRectangle, IWindowOpenable, useWindowControlsOverlay } from '../../window/common/window.js';
+import { IWindowsMainService, OpenContext } from '../../windows/electron-main/windows.js';
+import { isWorkspaceIdentifier, toWorkspaceIdentifier } from '../../workspace/common/workspace.js';
+import { IWorkspacesManagementMainService } from '../../workspaces/electron-main/workspacesManagementMainService.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { hasWSLFeatureInstalled } from '../../remote/node/wsl.js';
+import { WindowProfiler } from '../../profiling/electron-main/windowProfiling.js';
+import { IV8Profile } from '../../profiling/common/profiling.js';
+import { IAuxiliaryWindowsMainService } from '../../auxiliaryWindow/electron-main/auxiliaryWindows.js';
+import { IAuxiliaryWindow } from '../../auxiliaryWindow/electron-main/auxiliaryWindow.js';
+import { CancellationError } from '../../../base/common/errors.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { IProxyAuthService } from './auth.js';
+import { AuthInfo, Credentials, IRequestService } from '../../request/common/request.js';
 
 export interface INativeHostMainService extends AddFirstParameterToFunctions<ICommonNativeHostService, Promise<unknown> /* only methods, not events */, number | undefined /* window ID */> { }
 
@@ -61,7 +65,10 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 		@ILogService private readonly logService: ILogService,
 		@IProductService private readonly productService: IProductService,
 		@IThemeMainService private readonly themeMainService: IThemeMainService,
-		@IWorkspacesManagementMainService private readonly workspacesManagementMainService: IWorkspacesManagementMainService
+		@IWorkspacesManagementMainService private readonly workspacesManagementMainService: IWorkspacesManagementMainService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IRequestService private readonly requestService: IRequestService,
+		@IProxyAuthService private readonly proxyAuthService: IProxyAuthService
 	) {
 		super();
 	}
@@ -172,6 +179,14 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 		return undefined;
 	}
 
+	async getActiveWindowPosition(): Promise<IRectangle | undefined> {
+		const activeWindow = this.windowsMainService.getFocusedWindow() || this.windowsMainService.getLastActiveWindow();
+		if (activeWindow) {
+			return activeWindow.getBounds();
+		}
+		return undefined;
+	}
+
 	openWindow(windowId: number | undefined, options?: IOpenEmptyWindowOptions): Promise<void>;
 	openWindow(windowId: number | undefined, toOpen: IWindowOpenable[], options?: IOpenWindowOptions): Promise<void>;
 	openWindow(windowId: number | undefined, arg1?: IOpenEmptyWindowOptions | IWindowOpenable[], arg2?: IOpenWindowOptions): Promise<void> {
@@ -322,7 +337,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 			}
 
 			// Different source, delete it first
-			await Promises.unlink(source);
+			await fs.promises.unlink(source);
 		} catch (error) {
 			if (error.code !== 'ENOENT') {
 				throw error; // throw on any error but file not found
@@ -330,7 +345,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 		}
 
 		try {
-			await Promises.symlink(target, source);
+			await fs.promises.symlink(target, source);
 		} catch (error) {
 			if (error.code !== 'EACCES' && error.code !== 'ENOENT') {
 				throw error;
@@ -362,7 +377,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 		const { source } = await this.getShellCommandLink();
 
 		try {
-			await Promises.unlink(source);
+			await fs.promises.unlink(source);
 		} catch (error) {
 			switch (error.code) {
 				case 'EACCES': {
@@ -485,14 +500,56 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 		window?.setDocumentEdited(edited);
 	}
 
-	async openExternal(windowId: number | undefined, url: string): Promise<boolean> {
+	async openExternal(windowId: number | undefined, url: string, defaultApplication?: string): Promise<boolean> {
 		this.environmentMainService.unsetSnapExportedVariables();
-		shell.openExternal(url);
-		this.environmentMainService.restoreSnapExportedVariables();
+		try {
+			if (matchesSomeScheme(url, Schemas.http, Schemas.https)) {
+				this.openExternalBrowser(url, defaultApplication);
+			} else {
+				shell.openExternal(url);
+			}
+		} finally {
+			this.environmentMainService.restoreSnapExportedVariables();
+		}
 
 		return true;
 	}
 
+	private async openExternalBrowser(url: string, defaultApplication?: string): Promise<void> {
+		const configuredBrowser = defaultApplication ?? this.configurationService.getValue<string>('workbench.externalBrowser');
+		if (!configuredBrowser) {
+			return shell.openExternal(url);
+		}
+
+		if (configuredBrowser.includes(posix.sep) || configuredBrowser.includes(win32.sep)) {
+			const browserPathExists = await Promises.exists(configuredBrowser);
+			if (!browserPathExists) {
+				this.logService.error(`Configured external browser path does not exist: ${configuredBrowser}`);
+				return shell.openExternal(url);
+			}
+		}
+
+		try {
+			const { default: open } = await import('open');
+			const res = await open(url, {
+				app: {
+					// Use `open.apps` helper to allow cross-platform browser
+					// aliases to be looked up properly. Fallback to the
+					// configured value if not found.
+					name: Object.hasOwn(open.apps, configuredBrowser) ? open.apps[(configuredBrowser as keyof typeof open['apps'])] : configuredBrowser
+				}
+			});
+
+			res.stderr?.once('data', (data: Buffer) => {
+				this.logService.error(`Error openening external URL '${url}' using browser '${configuredBrowser}': ${data.toString()}`);
+				return shell.openExternal(url);
+			});
+		} catch (error) {
+			this.logService.error(`Unable to open external URL '${url}' using browser '${configuredBrowser}' due to ${error}.`);
+			return shell.openExternal(url);
+		}
+	}
+
 	moveItemToTrash(windowId: number | undefined, fullPath: string): Promise<void> {
 		return shell.trashItem(fullPath);
 	}
@@ -633,6 +690,10 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 		return clipboard.readText(type);
 	}
 
+	async readImage(): Promise<Uint8Array> {
+		return clipboard.readImage().toPNG();
+	}
+
 	async writeClipboardText(windowId: number | undefined, text: string, type?: 'selection' | 'clipboard'): Promise<void> {
 		return clipboard.writeText(text, type);
 	}
@@ -765,15 +826,28 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 	//#region Connectivity
 
 	async resolveProxy(windowId: number | undefined, url: string): Promise<string | undefined> {
+		if (this.environmentMainService.extensionTestsLocationURI) {
+			const testProxy = this.configurationService.getValue<string>('integration-test.http.proxy');
+			if (testProxy) {
+				return testProxy;
+			}
+		}
 		const window = this.codeWindowById(windowId);
 		const session = window?.win?.webContents?.session;
 
 		return session?.resolveProxy(url);
 	}
 
+	async lookupAuthorization(_windowId: number | undefined, authInfo: AuthInfo): Promise<Credentials | undefined> {
+		return this.proxyAuthService.lookupAuthorization(authInfo);
+	}
+
+	async lookupKerberosAuthorization(_windowId: number | undefined, url: string): Promise<string | undefined> {
+		return this.requestService.lookupKerberosAuthorization(url);
+	}
+
 	async loadCertificates(_windowId: number | undefined): Promise<string[]> {
-		const proxyAgent = await import('@vscode/proxy-agent');
-		return proxyAgent.loadSystemCertificates({ log: this.logService });
+		return this.requestService.loadCertificates();
 	}
 
 	findFreePort(windowId: number | undefined, startPort: number, giveUpAfter: number, timeout: number, stride = 1): Promise<number> {
@@ -785,14 +859,28 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 
 	//#region Development
 
-	async openDevTools(windowId: number | undefined, options?: Partial<OpenDevToolsOptions> & INativeHostOptions): Promise<void> {
+	async openDevTools(windowId: number | undefined, options?: INativeHostOptions): Promise<void> {
 		const window = this.windowById(options?.targetWindowId, windowId);
-		window?.win?.webContents.openDevTools(options?.mode ? { mode: options.mode, activate: options.activate } : undefined);
+
+		let mode: 'bottom' | undefined = undefined;
+		if (isLinux && useWindowControlsOverlay(this.configurationService)) {
+			mode = 'bottom'; // TODO@bpasero WCO and devtools collide with default option 'right'
+		}
+		window?.win?.webContents.openDevTools(mode ? { mode } : undefined);
 	}
 
 	async toggleDevTools(windowId: number | undefined, options?: INativeHostOptions): Promise<void> {
 		const window = this.windowById(options?.targetWindowId, windowId);
-		window?.win?.webContents.toggleDevTools();
+		const webContents = window?.win?.webContents;
+		if (!webContents) {
+			return;
+		}
+
+		if (isLinux && useWindowControlsOverlay(this.configurationService) && !webContents.isDevToolsOpened()) {
+			webContents.openDevTools({ mode: 'bottom' }); // TODO@bpasero WCO and devtools collide with default option 'right'
+		} else {
+			webContents.toggleDevTools();
+		}
 	}
 
 	//#endregion
diff --git a/src/vs/platform/notification/common/notification.ts b/src/vs/platform/notification/common/notification.ts
index 8506385b01c..f573e788fb3 100644
--- a/src/vs/platform/notification/common/notification.ts
+++ b/src/vs/platform/notification/common/notification.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IAction } from 'vs/base/common/actions';
-import { Event } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import BaseSeverity from 'vs/base/common/severity';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { IAction } from '../../../base/common/actions.js';
+import { Event } from '../../../base/common/event.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import BaseSeverity from '../../../base/common/severity.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 export import Severity = BaseSeverity;
 
diff --git a/src/vs/platform/notification/test/common/testNotificationService.ts b/src/vs/platform/notification/test/common/testNotificationService.ts
index 7868f3d4072..f016e186cf5 100644
--- a/src/vs/platform/notification/test/common/testNotificationService.ts
+++ b/src/vs/platform/notification/test/common/testNotificationService.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { INotification, INotificationHandle, INotificationService, INotificationSource, INotificationSourceFilter, IPromptChoice, IPromptOptions, IStatusMessageOptions, NoOpNotification, NotificationsFilter, Severity } from 'vs/platform/notification/common/notification';
+import { Event } from '../../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
+import { INotification, INotificationHandle, INotificationService, INotificationSource, INotificationSourceFilter, IPromptChoice, IPromptOptions, IStatusMessageOptions, NoOpNotification, NotificationsFilter, Severity } from '../../common/notification.js';
 
 export class TestNotificationService implements INotificationService {
 
diff --git a/src/vs/platform/observable/common/platformObservableUtils.ts b/src/vs/platform/observable/common/platformObservableUtils.ts
index 096993beb80..225357badc9 100644
--- a/src/vs/platform/observable/common/platformObservableUtils.ts
+++ b/src/vs/platform/observable/common/platformObservableUtils.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { autorunOpts, IObservable, IReader, observableFromEvent } from 'vs/base/common/observable';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyValue, RawContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { autorunOpts, IObservable, IReader, observableFromEventOpts } from '../../../base/common/observable.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { ContextKeyValue, IContextKeyService, RawContextKey } from '../../contextkey/common/contextkey.js';
 
 /** Creates an observable update when a configuration key updates. */
 export function observableConfigValue<T>(key: string, defaultValue: T, configurationService: IConfigurationService): IObservable<T> {
-	return observableFromEvent(
+	return observableFromEventOpts({ debugName: () => `Configuration Key "${key}"`, },
 		(handleChange) => configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration(key)) {
 				handleChange(e);
diff --git a/src/vs/platform/observable/common/wrapInHotClass.ts b/src/vs/platform/observable/common/wrapInHotClass.ts
new file mode 100644
index 00000000000..75e706ed1b0
--- /dev/null
+++ b/src/vs/platform/observable/common/wrapInHotClass.ts
@@ -0,0 +1,70 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import { isHotReloadEnabled } from '../../../base/common/hotReload.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { autorunWithStore, IObservable } from '../../../base/common/observable.js';
+import { BrandedService, GetLeadingNonServiceArgs, IInstantiationService } from '../../instantiation/common/instantiation.js';
+
+export function hotClassGetOriginalInstance<T>(value: T): T {
+	if (value instanceof BaseClass) {
+		return value._instance as any;
+	}
+	return value;
+}
+
+/**
+ * Wrap a class in a reloadable wrapper.
+ * When the wrapper is created, the original class is created.
+ * When the original class changes, the instance is re-created.
+*/
+export function wrapInHotClass0<TArgs extends BrandedService[]>(clazz: IObservable<Result<TArgs>>): Result<GetLeadingNonServiceArgs<TArgs>> {
+	return !isHotReloadEnabled() ? clazz.get() : createWrapper(clazz, BaseClass0);
+}
+
+type Result<TArgs extends any[]> = new (...args: TArgs) => IDisposable;
+
+class BaseClass {
+	public _instance: unknown;
+
+	constructor(
+		public readonly instantiationService: IInstantiationService,
+	) { }
+
+	public init(...params: any[]): void { }
+}
+
+function createWrapper<T extends any[]>(clazz: IObservable<any>, B: new (...args: T) => BaseClass) {
+	return (class ReloadableWrapper extends B {
+		private _autorun: IDisposable | undefined = undefined;
+
+		override init(...params: any[]) {
+			this._autorun = autorunWithStore((reader, store) => {
+				const clazz_ = clazz.read(reader);
+				this._instance = store.add(this.instantiationService.createInstance(clazz_, ...params) as IDisposable);
+			});
+		}
+
+		dispose(): void {
+			this._autorun?.dispose();
+		}
+	}) as any;
+}
+
+class BaseClass0 extends BaseClass {
+	constructor(@IInstantiationService i: IInstantiationService) { super(i); this.init(); }
+}
+
+/**
+ * Wrap a class in a reloadable wrapper.
+ * When the wrapper is created, the original class is created.
+ * When the original class changes, the instance is re-created.
+*/
+export function wrapInHotClass1<TArgs extends [any, ...BrandedService[]]>(clazz: IObservable<Result<TArgs>>): Result<GetLeadingNonServiceArgs<TArgs>> {
+	return !isHotReloadEnabled() ? clazz.get() : createWrapper(clazz, BaseClass1);
+}
+
+class BaseClass1 extends BaseClass {
+	constructor(param1: any, @IInstantiationService i: IInstantiationService,) { super(i); this.init(param1); }
+}
diff --git a/src/vs/platform/observable/common/wrapInReloadableClass.ts b/src/vs/platform/observable/common/wrapInReloadableClass.ts
new file mode 100644
index 00000000000..2bb37d1f401
--- /dev/null
+++ b/src/vs/platform/observable/common/wrapInReloadableClass.ts
@@ -0,0 +1,62 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import { isHotReloadEnabled } from '../../../base/common/hotReload.js';
+import { readHotReloadableExport } from '../../../base/common/hotReloadHelpers.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { autorunWithStore } from '../../../base/common/observable.js';
+import { BrandedService, GetLeadingNonServiceArgs, IInstantiationService } from '../../instantiation/common/instantiation.js';
+
+/**
+ * Wrap a class in a reloadable wrapper.
+ * When the wrapper is created, the original class is created.
+ * When the original class changes, the instance is re-created.
+*/
+export function wrapInReloadableClass0<TArgs extends BrandedService[]>(getClass: () => Result<TArgs>): Result<GetLeadingNonServiceArgs<TArgs>> {
+	return !isHotReloadEnabled() ? getClass() : createWrapper(getClass, BaseClass0);
+}
+
+type Result<TArgs extends any[]> = new (...args: TArgs) => IDisposable;
+
+class BaseClass {
+	constructor(
+		public readonly instantiationService: IInstantiationService,
+	) { }
+
+	public init(...params: any[]): void { }
+}
+
+function createWrapper<T extends any[]>(getClass: () => any, B: new (...args: T) => BaseClass) {
+	return (class ReloadableWrapper extends B {
+		private _autorun: IDisposable | undefined = undefined;
+
+		override init(...params: any[]) {
+			this._autorun = autorunWithStore((reader, store) => {
+				const clazz = readHotReloadableExport(getClass(), reader);
+				store.add(this.instantiationService.createInstance(clazz as any, ...params) as IDisposable);
+			});
+		}
+
+		dispose(): void {
+			this._autorun?.dispose();
+		}
+	}) as any;
+}
+
+class BaseClass0 extends BaseClass {
+	constructor(@IInstantiationService i: IInstantiationService) { super(i); this.init(); }
+}
+
+/**
+ * Wrap a class in a reloadable wrapper.
+ * When the wrapper is created, the original class is created.
+ * When the original class changes, the instance is re-created.
+*/
+export function wrapInReloadableClass1<TArgs extends [any, ...BrandedService[]]>(getClass: () => Result<TArgs>): Result<GetLeadingNonServiceArgs<TArgs>> {
+	return !isHotReloadEnabled() ? getClass() as any : createWrapper(getClass, BaseClass1);
+}
+
+class BaseClass1 extends BaseClass {
+	constructor(param1: any, @IInstantiationService i: IInstantiationService,) { super(i); this.init(param1); }
+}
diff --git a/src/vs/platform/opener/browser/link.ts b/src/vs/platform/opener/browser/link.ts
index eb93b66a122..ff830dc05f2 100644
--- a/src/vs/platform/opener/browser/link.ts
+++ b/src/vs/platform/opener/browser/link.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { $, append, EventHelper, EventLike, clearNode } from 'vs/base/browser/dom';
-import { DomEmitter } from 'vs/base/browser/event';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { EventType as TouchEventType, Gesture } from 'vs/base/browser/touch';
-import { Event } from 'vs/base/common/event';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import 'vs/css!./link';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { IHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate';
-import type { IManagedHover } from 'vs/base/browser/ui/hover/hover';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import { $, append, EventHelper, EventLike, clearNode } from '../../../base/browser/dom.js';
+import { DomEmitter } from '../../../base/browser/event.js';
+import { StandardKeyboardEvent } from '../../../base/browser/keyboardEvent.js';
+import { EventType as TouchEventType, Gesture } from '../../../base/browser/touch.js';
+import { Event } from '../../../base/common/event.js';
+import { KeyCode } from '../../../base/common/keyCodes.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { IOpenerService } from '../common/opener.js';
+import './link.css';
+import { getDefaultHoverDelegate } from '../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { IHoverDelegate } from '../../../base/browser/ui/hover/hoverDelegate.js';
+import type { IManagedHover } from '../../../base/browser/ui/hover/hover.js';
+import { IHoverService } from '../../hover/browser/hover.js';
 
 export interface ILinkDescriptor {
 	readonly label: string | HTMLElement;
diff --git a/src/vs/platform/opener/common/opener.ts b/src/vs/platform/opener/common/opener.ts
index 1f4d1d96b13..eb8074255a6 100644
--- a/src/vs/platform/opener/common/opener.ts
+++ b/src/vs/platform/opener/common/opener.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { IEditorOptions, ITextEditorSelection } from 'vs/platform/editor/common/editor';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { URI } from '../../../base/common/uri.js';
+import { IEditorOptions, ITextEditorSelection } from '../../editor/common/editor.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 export const IOpenerService = createDecorator<IOpenerService>('openerService');
 
diff --git a/src/vs/platform/opener/test/common/nullOpenerService.ts b/src/vs/platform/opener/test/common/nullOpenerService.ts
index e5d5a3a0540..f5c0473d7c4 100644
--- a/src/vs/platform/opener/test/common/nullOpenerService.ts
+++ b/src/vs/platform/opener/test/common/nullOpenerService.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { IOpenerService } from '../../common/opener';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IOpenerService } from '../../common/opener.js';
 
 export const NullOpenerService = Object.freeze<IOpenerService>({
 	_serviceBrand: undefined,
diff --git a/src/vs/platform/opener/test/common/opener.test.ts b/src/vs/platform/opener/test/common/opener.test.ts
index 93ee50f9901..b75a268ecb7 100644
--- a/src/vs/platform/opener/test/common/opener.test.ts
+++ b/src/vs/platform/opener/test/common/opener.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { extractSelection, withSelection } from 'vs/platform/opener/common/opener';
+import { URI } from '../../../../base/common/uri.js';
+import { extractSelection, withSelection } from '../../common/opener.js';
 
 suite('extractSelection', () => {
 
diff --git a/src/vs/platform/policy/common/filePolicyService.ts b/src/vs/platform/policy/common/filePolicyService.ts
index 3d3a1531e92..40d13159b9a 100644
--- a/src/vs/platform/policy/common/filePolicyService.ts
+++ b/src/vs/platform/policy/common/filePolicyService.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ThrottledDelayer } from 'vs/base/common/async';
-import { Event } from 'vs/base/common/event';
-import { Iterable } from 'vs/base/common/iterator';
-import { isObject } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { FileOperationError, FileOperationResult, IFileService } from 'vs/platform/files/common/files';
-import { ILogService } from 'vs/platform/log/common/log';
-import { AbstractPolicyService, IPolicyService, PolicyName, PolicyValue } from 'vs/platform/policy/common/policy';
+import { ThrottledDelayer } from '../../../base/common/async.js';
+import { Event } from '../../../base/common/event.js';
+import { Iterable } from '../../../base/common/iterator.js';
+import { isObject } from '../../../base/common/types.js';
+import { URI } from '../../../base/common/uri.js';
+import { FileOperationError, FileOperationResult, IFileService } from '../../files/common/files.js';
+import { ILogService } from '../../log/common/log.js';
+import { AbstractPolicyService, IPolicyService, PolicyName, PolicyValue } from './policy.js';
 
 function keysDiff<T>(a: Map<string, T>, b: Map<string, T>): string[] {
 	const result: string[] = [];
diff --git a/src/vs/platform/policy/common/policy.ts b/src/vs/platform/policy/common/policy.ts
index 74b3a0dc35e..5da12a2a56a 100644
--- a/src/vs/platform/policy/common/policy.ts
+++ b/src/vs/platform/policy/common/policy.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IStringDictionary } from 'vs/base/common/collections';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Iterable } from 'vs/base/common/iterator';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { IStringDictionary } from '../../../base/common/collections.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Iterable } from '../../../base/common/iterator.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 export type PolicyName = string;
 export type PolicyValue = string | number;
diff --git a/src/vs/platform/policy/common/policyIpc.ts b/src/vs/platform/policy/common/policyIpc.ts
index 33a0ddf1cc4..c95719592bc 100644
--- a/src/vs/platform/policy/common/policyIpc.ts
+++ b/src/vs/platform/policy/common/policyIpc.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IStringDictionary } from 'vs/base/common/collections';
-import { Event } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { IChannel, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
-import { AbstractPolicyService, IPolicyService, PolicyDefinition, PolicyName, PolicyValue } from 'vs/platform/policy/common/policy';
+import { IStringDictionary } from '../../../base/common/collections.js';
+import { Event } from '../../../base/common/event.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { IChannel, IServerChannel } from '../../../base/parts/ipc/common/ipc.js';
+import { AbstractPolicyService, IPolicyService, PolicyDefinition, PolicyName, PolicyValue } from './policy.js';
 
 export class PolicyChannel implements IServerChannel {
 
diff --git a/src/vs/platform/policy/node/nativePolicyService.ts b/src/vs/platform/policy/node/nativePolicyService.ts
index 747177ae7e9..67f7892e72f 100644
--- a/src/vs/platform/policy/node/nativePolicyService.ts
+++ b/src/vs/platform/policy/node/nativePolicyService.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { AbstractPolicyService, IPolicyService, PolicyDefinition } from 'vs/platform/policy/common/policy';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { Throttler } from 'vs/base/common/async';
+import { AbstractPolicyService, IPolicyService, PolicyDefinition } from '../common/policy.js';
+import { IStringDictionary } from '../../../base/common/collections.js';
+import { Throttler } from '../../../base/common/async.js';
 import type { PolicyUpdate, Watcher } from '@vscode/policy-watcher';
-import { MutableDisposable } from 'vs/base/common/lifecycle';
-import { ILogService } from 'vs/platform/log/common/log';
+import { MutableDisposable } from '../../../base/common/lifecycle.js';
+import { ILogService } from '../../log/common/log.js';
 
 export class NativePolicyService extends AbstractPolicyService implements IPolicyService {
 
diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
index 9d3f34e443d..1a2a6192ec8 100644
--- a/src/vs/platform/product/common/product.ts
+++ b/src/vs/platform/product/common/product.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { env } from 'vs/base/common/process';
-import { IProductConfiguration } from 'vs/base/common/product';
-import { ISandboxConfiguration } from 'vs/base/parts/sandbox/common/sandboxTypes';
+import { env } from '../../../base/common/process.js';
+import { IProductConfiguration } from '../../../base/common/product.js';
+import { ISandboxConfiguration } from '../../../base/parts/sandbox/common/sandboxTypes.js';
 
 /**
  * @deprecated You MUST use `IProductService` if possible.
@@ -53,12 +53,12 @@ else if (globalThis._VSCODE_PRODUCT_JSON && globalThis._VSCODE_PACKAGE_JSON) {
 else {
 
 	// Built time configuration (do NOT modify)
-	product = { /*BUILD->INSERT_PRODUCT_CONFIGURATION*/ } as IProductConfiguration;
+	product = { /*BUILD->INSERT_PRODUCT_CONFIGURATION*/ } as any;
 
 	// Running out of sources
 	if (Object.keys(product).length === 0) {
 		Object.assign(product, {
-			version: '1.91.0-dev',
+			version: '1.95.0-dev',
 			nameShort: 'Code - OSS Dev',
 			nameLong: 'Code - OSS Dev',
 			applicationName: 'code-oss',
diff --git a/src/vs/platform/product/common/productService.ts b/src/vs/platform/product/common/productService.ts
index 4e8561e3b2e..fbcccb4f00f 100644
--- a/src/vs/platform/product/common/productService.ts
+++ b/src/vs/platform/product/common/productService.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IProductConfiguration } from 'vs/base/common/product';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { IProductConfiguration } from '../../../base/common/product.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 export const IProductService = createDecorator<IProductService>('productService');
 
diff --git a/src/vs/platform/profiling/common/profiling.ts b/src/vs/platform/profiling/common/profiling.ts
index f4b4a302750..79f9612d4d1 100644
--- a/src/vs/platform/profiling/common/profiling.ts
+++ b/src/vs/platform/profiling/common/profiling.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { basename, isAbsolute, join } from 'vs/base/common/path';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { basename, isAbsolute, join } from '../../../base/common/path.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 export interface IV8Profile {
 	nodes: IV8ProfileNode[];
diff --git a/src/vs/platform/profiling/common/profilingModel.ts b/src/vs/platform/profiling/common/profilingModel.ts
index 82202203388..a1c491c509c 100644
--- a/src/vs/platform/profiling/common/profilingModel.ts
+++ b/src/vs/platform/profiling/common/profilingModel.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import type { IV8Profile, IV8ProfileNode } from 'vs/platform/profiling/common/profiling';
+import type { IV8Profile, IV8ProfileNode } from './profiling.js';
 
 // #region
 // https://github.com/microsoft/vscode-js-profile-visualizer/blob/6e7401128ee860be113a916f80fcfe20ac99418e/packages/vscode-js-profile-core/src/cpu/model.ts#L4
diff --git a/src/vs/platform/profiling/common/profilingTelemetrySpec.ts b/src/vs/platform/profiling/common/profilingTelemetrySpec.ts
index 316b6321f34..d6f8fd92b77 100644
--- a/src/vs/platform/profiling/common/profilingTelemetrySpec.ts
+++ b/src/vs/platform/profiling/common/profilingTelemetrySpec.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ILogService } from 'vs/platform/log/common/log';
-import { BottomUpSample } from 'vs/platform/profiling/common/profilingModel';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { errorHandler } from 'vs/base/common/errors';
+import { ILogService } from '../../log/common/log.js';
+import { BottomUpSample } from './profilingModel.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
+import { errorHandler } from '../../../base/common/errors.js';
 
 type TelemetrySampleData = {
 	selfTime: number;
diff --git a/src/vs/platform/profiling/electron-main/windowProfiling.ts b/src/vs/platform/profiling/electron-main/windowProfiling.ts
index c9ac6756b3d..222fe9c0f75 100644
--- a/src/vs/platform/profiling/electron-main/windowProfiling.ts
+++ b/src/vs/platform/profiling/electron-main/windowProfiling.ts
@@ -5,9 +5,9 @@
 
 import type { ProfileResult } from 'v8-inspect-profiler';
 import { BrowserWindow } from 'electron';
-import { timeout } from 'vs/base/common/async';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IV8Profile } from 'vs/platform/profiling/common/profiling';
+import { timeout } from '../../../base/common/async.js';
+import { ILogService } from '../../log/common/log.js';
+import { IV8Profile } from '../common/profiling.js';
 
 export class WindowProfiler {
 
diff --git a/src/vs/platform/profiling/electron-sandbox/profileAnalysisWorker.ts b/src/vs/platform/profiling/electron-sandbox/profileAnalysisWorker.ts
index 14d6a473c09..50acc3353a5 100644
--- a/src/vs/platform/profiling/electron-sandbox/profileAnalysisWorker.ts
+++ b/src/vs/platform/profiling/electron-sandbox/profileAnalysisWorker.ts
@@ -3,15 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { basename } from 'vs/base/common/path';
-import { TernarySearchTree } from 'vs/base/common/ternarySearchTree';
-import { URI } from 'vs/base/common/uri';
-import { IRequestHandler } from 'vs/base/common/worker/simpleWorker';
-import { IV8Profile, Utils } from 'vs/platform/profiling/common/profiling';
-import { IProfileModel, BottomUpSample, buildModel, BottomUpNode, processNode, CdpCallFrame } from 'vs/platform/profiling/common/profilingModel';
-import { BottomUpAnalysis, IProfileAnalysisWorker, ProfilingOutput } from 'vs/platform/profiling/electron-sandbox/profileAnalysisWorkerService';
+import { basename } from '../../../base/common/path.js';
+import { TernarySearchTree } from '../../../base/common/ternarySearchTree.js';
+import { URI } from '../../../base/common/uri.js';
+import { IRequestHandler, IWorkerServer } from '../../../base/common/worker/simpleWorker.js';
+import { IV8Profile, Utils } from '../common/profiling.js';
+import { IProfileModel, BottomUpSample, buildModel, BottomUpNode, processNode, CdpCallFrame } from '../common/profilingModel.js';
+import { BottomUpAnalysis, IProfileAnalysisWorker, ProfilingOutput } from './profileAnalysisWorkerService.js';
 
-export function create(): IRequestHandler {
+/**
+ * Defines the worker entry point. Must be exported and named `create`.
+ * @skipMangle
+ */
+export function create(workerServer: IWorkerServer): IRequestHandler {
 	return new ProfileAnalysisWorker();
 }
 
@@ -19,7 +23,7 @@ class ProfileAnalysisWorker implements IRequestHandler, IProfileAnalysisWorker {
 
 	_requestHandlerBrand: any;
 
-	analyseBottomUp(profile: IV8Profile): BottomUpAnalysis {
+	$analyseBottomUp(profile: IV8Profile): BottomUpAnalysis {
 		if (!Utils.isValidProfile(profile)) {
 			return { kind: ProfilingOutput.Irrelevant, samples: [] };
 		}
@@ -37,7 +41,7 @@ class ProfileAnalysisWorker implements IRequestHandler, IProfileAnalysisWorker {
 		return { kind: ProfilingOutput.Interesting, samples };
 	}
 
-	analyseByUrlCategory(profile: IV8Profile, categories: [url: URI, category: string][]): [category: string, aggregated: number][] {
+	$analyseByUrlCategory(profile: IV8Profile, categories: [url: URI, category: string][]): [category: string, aggregated: number][] {
 
 		// build search tree
 		const searchTree = TernarySearchTree.forUris<string>();
diff --git a/src/vs/platform/profiling/electron-sandbox/profileAnalysisWorkerMain.ts b/src/vs/platform/profiling/electron-sandbox/profileAnalysisWorkerMain.ts
new file mode 100644
index 00000000000..bab4ec0dc5d
--- /dev/null
+++ b/src/vs/platform/profiling/electron-sandbox/profileAnalysisWorkerMain.ts
@@ -0,0 +1,9 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { create } from './profileAnalysisWorker.js';
+import { bootstrapSimpleWorker } from '../../../base/common/worker/simpleWorkerBootstrap.js';
+
+bootstrapSimpleWorker(create);
diff --git a/src/vs/platform/profiling/electron-sandbox/profileAnalysisWorkerService.ts b/src/vs/platform/profiling/electron-sandbox/profileAnalysisWorkerService.ts
index ad6a25cd679..164bafa0242 100644
--- a/src/vs/platform/profiling/electron-sandbox/profileAnalysisWorkerService.ts
+++ b/src/vs/platform/profiling/electron-sandbox/profileAnalysisWorkerService.ts
@@ -4,17 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 
-import { DefaultWorkerFactory } from 'vs/base/browser/defaultWorkerFactory';
-import { URI } from 'vs/base/common/uri';
-import { SimpleWorkerClient } from 'vs/base/common/worker/simpleWorker';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IV8Profile } from 'vs/platform/profiling/common/profiling';
-import { BottomUpSample } from 'vs/platform/profiling/common/profilingModel';
-import { reportSample } from 'vs/platform/profiling/common/profilingTelemetrySpec';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-
+import { createWebWorker } from '../../../base/browser/defaultWorkerFactory.js';
+import { URI } from '../../../base/common/uri.js';
+import { Proxied } from '../../../base/common/worker/simpleWorker.js';
+import { InstantiationType, registerSingleton } from '../../instantiation/common/extensions.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { ILogService } from '../../log/common/log.js';
+import { IV8Profile } from '../common/profiling.js';
+import { BottomUpSample } from '../common/profilingModel.js';
+import { reportSample } from '../common/profilingTelemetrySpec.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
 
 export const enum ProfilingOutput {
 	Failure,
@@ -41,8 +40,6 @@ class ProfileAnalysisWorkerService implements IProfileAnalysisWorkerService {
 
 	declare _serviceBrand: undefined;
 
-	private readonly _workerFactory = new DefaultWorkerFactory('CpuProfileAnalysis');
-
 	constructor(
 		@ITelemetryService private readonly _telemetryService: ITelemetryService,
 		@ILogService private readonly _logService: ILogService,
@@ -50,14 +47,13 @@ class ProfileAnalysisWorkerService implements IProfileAnalysisWorkerService {
 
 	private async _withWorker<R>(callback: (worker: Proxied<IProfileAnalysisWorker>) => Promise<R>): Promise<R> {
 
-		const worker = new SimpleWorkerClient<Proxied<IProfileAnalysisWorker>, {}>(
-			this._workerFactory,
+		const worker = createWebWorker<IProfileAnalysisWorker>(
 			'vs/platform/profiling/electron-sandbox/profileAnalysisWorker',
-			{ /* host */ }
+			'CpuProfileAnalysisWorker'
 		);
 
 		try {
-			const r = await callback(await worker.getProxyObject());
+			const r = await callback(worker.proxy);
 			return r;
 		} finally {
 			worker.dispose();
@@ -66,7 +62,7 @@ class ProfileAnalysisWorkerService implements IProfileAnalysisWorkerService {
 
 	async analyseBottomUp(profile: IV8Profile, callFrameClassifier: IScriptUrlClassifier, perfBaseline: number, sendAsErrorTelemtry: boolean): Promise<ProfilingOutput> {
 		return this._withWorker(async worker => {
-			const result = await worker.analyseBottomUp(profile);
+			const result = await worker.$analyseBottomUp(profile);
 			if (result.kind === ProfilingOutput.Interesting) {
 				for (const sample of result.samples) {
 					reportSample({
@@ -82,7 +78,7 @@ class ProfileAnalysisWorkerService implements IProfileAnalysisWorkerService {
 
 	async analyseByLocation(profile: IV8Profile, locations: [location: URI, id: string][]): Promise<[category: string, aggregated: number][]> {
 		return this._withWorker(async worker => {
-			const result = await worker.analyseByUrlCategory(profile, locations);
+			const result = await worker.$analyseByUrlCategory(profile, locations);
 			return result;
 		});
 	}
@@ -103,15 +99,8 @@ export interface CategoryAnalysis {
 }
 
 export interface IProfileAnalysisWorker {
-	analyseBottomUp(profile: IV8Profile): BottomUpAnalysis;
-	analyseByUrlCategory(profile: IV8Profile, categories: [url: URI, category: string][]): [category: string, aggregated: number][];
+	$analyseBottomUp(profile: IV8Profile): BottomUpAnalysis;
+	$analyseByUrlCategory(profile: IV8Profile, categories: [url: URI, category: string][]): [category: string, aggregated: number][];
 }
 
-// TODO@jrieken move into worker logic
-type Proxied<T> = { [K in keyof T]: T[K] extends (...args: infer A) => infer R
-	? (...args: A) => Promise<Awaited<R>>
-	: never
-};
-
-
 registerSingleton(IProfileAnalysisWorkerService, ProfileAnalysisWorkerService, InstantiationType.Delayed);
diff --git a/src/vs/platform/profiling/electron-sandbox/profilingService.ts b/src/vs/platform/profiling/electron-sandbox/profilingService.ts
index 7e26d8a5ec7..ffb1e47edf1 100644
--- a/src/vs/platform/profiling/electron-sandbox/profilingService.ts
+++ b/src/vs/platform/profiling/electron-sandbox/profilingService.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { registerSharedProcessRemoteService } from 'vs/platform/ipc/electron-sandbox/services';
-import { IV8InspectProfilingService } from 'vs/platform/profiling/common/profiling';
+import { registerSharedProcessRemoteService } from '../../ipc/electron-sandbox/services.js';
+import { IV8InspectProfilingService } from '../common/profiling.js';
 
 registerSharedProcessRemoteService(IV8InspectProfilingService, 'v8InspectProfiling');
diff --git a/src/vs/platform/profiling/node/profilingService.ts b/src/vs/platform/profiling/node/profilingService.ts
index c3f218d047c..e1b199d3856 100644
--- a/src/vs/platform/profiling/node/profilingService.ts
+++ b/src/vs/platform/profiling/node/profilingService.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type { ProfilingSession } from 'v8-inspect-profiler';
-import { generateUuid } from 'vs/base/common/uuid';
-import { IV8InspectProfilingService, IV8Profile } from 'vs/platform/profiling/common/profiling';
+import { generateUuid } from '../../../base/common/uuid.js';
+import { IV8InspectProfilingService, IV8Profile } from '../common/profiling.js';
 
 export class InspectProfilingService implements IV8InspectProfilingService {
 
diff --git a/src/vs/platform/progress/common/progress.ts b/src/vs/platform/progress/common/progress.ts
index 2a1c7349aae..a2bdb893ff3 100644
--- a/src/vs/platform/progress/common/progress.ts
+++ b/src/vs/platform/progress/common/progress.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IAction } from 'vs/base/common/actions';
-import { DeferredPromise } from 'vs/base/common/async';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Disposable, DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { INotificationSource, NotificationPriority } from 'vs/platform/notification/common/notification';
+import { IAction } from '../../../base/common/actions.js';
+import { DeferredPromise } from '../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../base/common/cancellation.js';
+import { Disposable, DisposableStore, toDisposable } from '../../../base/common/lifecycle.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { INotificationSource, NotificationPriority } from '../../notification/common/notification.js';
 
 export const IProgressService = createDecorator<IProgressService>('progressService');
 
diff --git a/src/vs/platform/progress/test/common/progress.test.ts b/src/vs/platform/progress/test/common/progress.test.ts
index 24c2ddb78de..b3be8cf8064 100644
--- a/src/vs/platform/progress/test/common/progress.test.ts
+++ b/src/vs/platform/progress/test/common/progress.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { AsyncProgress } from 'vs/platform/progress/common/progress';
+import { runWithFakedTimers } from '../../../../base/test/common/timeTravelScheduler.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { AsyncProgress } from '../../common/progress.js';
 
 suite('Progress', () => {
 
diff --git a/src/vs/platform/protocol/electron-main/protocol.ts b/src/vs/platform/protocol/electron-main/protocol.ts
index eaf83cbdfff..e180f1b1a19 100644
--- a/src/vs/platform/protocol/electron-main/protocol.ts
+++ b/src/vs/platform/protocol/electron-main/protocol.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { URI } from '../../../base/common/uri.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 export const IProtocolMainService = createDecorator<IProtocolMainService>('protocolMainService');
 
diff --git a/src/vs/platform/protocol/electron-main/protocolMainService.ts b/src/vs/platform/protocol/electron-main/protocolMainService.ts
index 8b6fd7b5868..5f666fe4f73 100644
--- a/src/vs/platform/protocol/electron-main/protocolMainService.ts
+++ b/src/vs/platform/protocol/electron-main/protocolMainService.ts
@@ -4,18 +4,18 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { session } from 'electron';
-import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { COI, FileAccess, Schemas } from 'vs/base/common/network';
-import { basename, extname, normalize } from 'vs/base/common/path';
-import { isLinux } from 'vs/base/common/platform';
-import { TernarySearchTree } from 'vs/base/common/ternarySearchTree';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { validatedIpcMain } from 'vs/base/parts/ipc/electron-main/ipcMain';
-import { INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IIPCObjectUrl, IProtocolMainService } from 'vs/platform/protocol/electron-main/protocol';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { Disposable, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { COI, FileAccess, Schemas } from '../../../base/common/network.js';
+import { basename, extname, normalize } from '../../../base/common/path.js';
+import { isLinux } from '../../../base/common/platform.js';
+import { TernarySearchTree } from '../../../base/common/ternarySearchTree.js';
+import { URI } from '../../../base/common/uri.js';
+import { generateUuid } from '../../../base/common/uuid.js';
+import { validatedIpcMain } from '../../../base/parts/ipc/electron-main/ipcMain.js';
+import { INativeEnvironmentService } from '../../environment/common/environment.js';
+import { ILogService } from '../../log/common/log.js';
+import { IIPCObjectUrl, IProtocolMainService } from './protocol.js';
+import { IUserDataProfilesService } from '../../userDataProfile/common/userDataProfile.js';
 
 type ProtocolCallback = { (result: string | Electron.FilePathWithHeaders | { error: number }): void };
 
@@ -96,7 +96,8 @@ export class ProtocolMainService extends Disposable implements IProtocolMainServ
 
 		let headers: Record<string, string> | undefined;
 		if (this.environmentService.crossOriginIsolated) {
-			if (basename(path) === 'workbench.html' || basename(path) === 'workbench-dev.html') {
+			const pathBasename = basename(path);
+			if (pathBasename === 'workbench.html' || pathBasename === 'workbench-dev.html') {
 				headers = COI.CoopAndCoep;
 			} else {
 				headers = COI.getHeadersFromQuery(request.url);
diff --git a/src/vs/platform/quickinput/browser/commandsQuickAccess.ts b/src/vs/platform/quickinput/browser/commandsQuickAccess.ts
index feb47bd2f62..513641b4da5 100644
--- a/src/vs/platform/quickinput/browser/commandsQuickAccess.ts
+++ b/src/vs/platform/quickinput/browser/commandsQuickAccess.ts
@@ -3,28 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from 'vs/base/common/actions';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { isCancellationError } from 'vs/base/common/errors';
-import { matchesContiguousSubString, matchesPrefix, matchesWords, or } from 'vs/base/common/filters';
-import { createSingleCallFunction } from 'vs/base/common/functional';
-import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { LRUCache } from 'vs/base/common/map';
-import { TfIdfCalculator, normalizeTfIdfScores } from 'vs/base/common/tfIdf';
-import { localize } from 'vs/nls';
-import { ILocalizedString } from 'vs/platform/action/common/action';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationChangeEvent, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ILogService } from 'vs/platform/log/common/log';
-import { FastAndSlowPicks, IPickerQuickAccessItem, IPickerQuickAccessProviderOptions, PickerQuickAccessProvider, Picks } from 'vs/platform/quickinput/browser/pickerQuickAccess';
-import { IQuickAccessProviderRunOptions } from 'vs/platform/quickinput/common/quickAccess';
-import { IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
-import { IStorageService, StorageScope, StorageTarget, WillSaveStateReason } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from '../../../base/common/actions.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { toErrorMessage } from '../../../base/common/errorMessage.js';
+import { isCancellationError } from '../../../base/common/errors.js';
+import { matchesContiguousSubString, matchesPrefix, matchesWords, or } from '../../../base/common/filters.js';
+import { createSingleCallFunction } from '../../../base/common/functional.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../base/common/lifecycle.js';
+import { LRUCache } from '../../../base/common/map.js';
+import { TfIdfCalculator, normalizeTfIdfScores } from '../../../base/common/tfIdf.js';
+import { localize } from '../../../nls.js';
+import { ILocalizedString } from '../../action/common/action.js';
+import { ICommandService } from '../../commands/common/commands.js';
+import { IConfigurationChangeEvent, IConfigurationService } from '../../configuration/common/configuration.js';
+import { IDialogService } from '../../dialogs/common/dialogs.js';
+import { IInstantiationService } from '../../instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../keybinding/common/keybinding.js';
+import { ILogService } from '../../log/common/log.js';
+import { FastAndSlowPicks, IPickerQuickAccessItem, IPickerQuickAccessProviderOptions, PickerQuickAccessProvider, Picks } from './pickerQuickAccess.js';
+import { IQuickAccessProviderRunOptions } from '../common/quickAccess.js';
+import { IQuickPickSeparator } from '../common/quickInput.js';
+import { IStorageService, StorageScope, StorageTarget, WillSaveStateReason } from '../../storage/common/storage.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
 
 export interface ICommandQuickPick extends IPickerQuickAccessItem {
 	readonly commandId: string;
diff --git a/src/vs/platform/quickinput/browser/helpQuickAccess.ts b/src/vs/platform/quickinput/browser/helpQuickAccess.ts
index 0346fc0b856..6cb51c86933 100644
--- a/src/vs/platform/quickinput/browser/helpQuickAccess.ts
+++ b/src/vs/platform/quickinput/browser/helpQuickAccess.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { Extensions, IQuickAccessProvider, IQuickAccessProviderDescriptor, IQuickAccessRegistry } from 'vs/platform/quickinput/common/quickAccess';
-import { IQuickInputService, IQuickPick, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
+import { localize } from '../../../nls.js';
+import { Registry } from '../../registry/common/platform.js';
+import { DisposableStore, IDisposable } from '../../../base/common/lifecycle.js';
+import { IKeybindingService } from '../../keybinding/common/keybinding.js';
+import { Extensions, IQuickAccessProvider, IQuickAccessProviderDescriptor, IQuickAccessRegistry } from '../common/quickAccess.js';
+import { IQuickInputService, IQuickPick, IQuickPickItem } from '../common/quickInput.js';
 
 interface IHelpQuickAccessPickItem extends IQuickPickItem {
 	readonly prefix: string;
@@ -25,7 +25,7 @@ export class HelpQuickAccessProvider implements IQuickAccessProvider {
 		@IKeybindingService private readonly keybindingService: IKeybindingService
 	) { }
 
-	provide(picker: IQuickPick<IHelpQuickAccessPickItem>): IDisposable {
+	provide(picker: IQuickPick<IHelpQuickAccessPickItem, { useSeparators: true }>): IDisposable {
 		const disposables = new DisposableStore();
 
 		// Open a picker with the selected value if picked
diff --git a/src/vs/platform/quickinput/browser/media/quickInput.css b/src/vs/platform/quickinput/browser/media/quickInput.css
index 3afa06e5888..9108ee9ae80 100644
--- a/src/vs/platform/quickinput/browser/media/quickInput.css
+++ b/src/vs/platform/quickinput/browser/media/quickInput.css
@@ -16,7 +16,8 @@
 .quick-input-titlebar {
 	display: flex;
 	align-items: center;
-	border-radius: inherit;
+	border-top-right-radius: 5px;
+	border-top-left-radius: 5px;
 }
 
 .quick-input-left-action-bar {
@@ -25,6 +26,10 @@
 	flex: 1;
 }
 
+.quick-input-inline-action-bar {
+	margin: 2px 0 0 5px;
+}
+
 .quick-input-title {
 	padding: 3px 0px;
 	text-align: center;
@@ -172,7 +177,6 @@
 	box-sizing: border-box;
 	overflow: hidden;
 	display: flex;
-	height: 100%;
 	padding: 0 6px;
 }
 
@@ -295,7 +299,7 @@
 
 .quick-input-list .quick-input-list-entry-action-bar .action-label.codicon {
 	margin-right: 4px;
-	padding: 0px 2px 2px 2px;
+	padding: 2px;
 }
 
 .quick-input-list .quick-input-list-entry-action-bar {
diff --git a/src/vs/platform/quickinput/browser/pickerQuickAccess.ts b/src/vs/platform/quickinput/browser/pickerQuickAccess.ts
index 0613c557abc..b356304dab2 100644
--- a/src/vs/platform/quickinput/browser/pickerQuickAccess.ts
+++ b/src/vs/platform/quickinput/browser/pickerQuickAccess.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { timeout } from 'vs/base/common/async';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Disposable, DisposableStore, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { IKeyMods, IQuickPickDidAcceptEvent, IQuickPickSeparator, IQuickPick, IQuickPickItem, IQuickInputButton } from 'vs/platform/quickinput/common/quickInput';
-import { IQuickAccessProvider, IQuickAccessProviderRunOptions } from 'vs/platform/quickinput/common/quickAccess';
-import { isFunction } from 'vs/base/common/types';
+import { timeout } from '../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../base/common/cancellation.js';
+import { Disposable, DisposableStore, IDisposable, MutableDisposable } from '../../../base/common/lifecycle.js';
+import { IKeyMods, IQuickPickDidAcceptEvent, IQuickPickSeparator, IQuickPick, IQuickPickItem, IQuickInputButton } from '../common/quickInput.js';
+import { IQuickAccessProvider, IQuickAccessProviderRunOptions } from '../common/quickAccess.js';
+import { isFunction } from '../../../base/common/types.js';
 
 export enum TriggerAction {
 
@@ -133,7 +133,7 @@ export abstract class PickerQuickAccessProvider<T extends IPickerQuickAccessItem
 		super();
 	}
 
-	provide(picker: IQuickPick<T>, token: CancellationToken, runOptions?: IQuickAccessProviderRunOptions): IDisposable {
+	provide(picker: IQuickPick<T, { useSeparators: true }>, token: CancellationToken, runOptions?: IQuickAccessProviderRunOptions): IDisposable {
 		const disposables = new DisposableStore();
 
 		// Apply options if any
diff --git a/src/vs/platform/quickinput/browser/quickAccess.ts b/src/vs/platform/quickinput/browser/quickAccess.ts
index 7cccc352393..0ab3fd4614d 100644
--- a/src/vs/platform/quickinput/browser/quickAccess.ts
+++ b/src/vs/platform/quickinput/browser/quickAccess.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DeferredPromise } from 'vs/base/common/async';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { DefaultQuickAccessFilterValue, Extensions, IQuickAccessController, IQuickAccessOptions, IQuickAccessProvider, IQuickAccessProviderDescriptor, IQuickAccessRegistry } from 'vs/platform/quickinput/common/quickAccess';
-import { IQuickInputService, IQuickPick, IQuickPickItem, ItemActivation } from 'vs/platform/quickinput/common/quickInput';
-import { Registry } from 'vs/platform/registry/common/platform';
+import { DeferredPromise } from '../../../base/common/async.js';
+import { CancellationTokenSource } from '../../../base/common/cancellation.js';
+import { Event } from '../../../base/common/event.js';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { IInstantiationService } from '../../instantiation/common/instantiation.js';
+import { DefaultQuickAccessFilterValue, Extensions, IQuickAccessController, IQuickAccessOptions, IQuickAccessProvider, IQuickAccessProviderDescriptor, IQuickAccessRegistry } from '../common/quickAccess.js';
+import { IQuickInputService, IQuickPick, IQuickPickItem, ItemActivation } from '../common/quickInput.js';
+import { Registry } from '../../registry/common/platform.js';
 
 export class QuickAccessController extends Disposable implements IQuickAccessController {
 
@@ -20,7 +20,7 @@ export class QuickAccessController extends Disposable implements IQuickAccessCon
 	private readonly lastAcceptedPickerValues = new Map<IQuickAccessProviderDescriptor, string>();
 
 	private visibleQuickAccess: {
-		readonly picker: IQuickPick<IQuickPickItem>;
+		readonly picker: IQuickPick<IQuickPickItem, { useSeparators: true }>;
 		readonly descriptor: IQuickAccessProviderDescriptor | undefined;
 		readonly value: string;
 	} | undefined = undefined;
@@ -99,7 +99,7 @@ export class QuickAccessController extends Disposable implements IQuickAccessCon
 		// Create a picker for the provider to use with the initial value
 		// and adjust the filtering to exclude the prefix from filtering
 		const disposables = new DisposableStore();
-		const picker = disposables.add(this.quickInputService.createQuickPick());
+		const picker = disposables.add(this.quickInputService.createQuickPick({ useSeparators: true }));
 		picker.value = value;
 		this.adjustValueSelection(picker, descriptor, options);
 		picker.placeholder = options?.placeholder ?? descriptor?.placeholder;
@@ -163,7 +163,7 @@ export class QuickAccessController extends Disposable implements IQuickAccessCon
 		}
 	}
 
-	private adjustValueSelection(picker: IQuickPick<IQuickPickItem>, descriptor?: IQuickAccessProviderDescriptor, options?: IQuickAccessOptions): void {
+	private adjustValueSelection(picker: IQuickPick<IQuickPickItem, { useSeparators: true }>, descriptor?: IQuickAccessProviderDescriptor, options?: IQuickAccessOptions): void {
 		let valueSelection: [number, number];
 
 		// Preserve: just always put the cursor at the end
@@ -180,7 +180,7 @@ export class QuickAccessController extends Disposable implements IQuickAccessCon
 	}
 
 	private registerPickerListeners(
-		picker: IQuickPick<IQuickPickItem>,
+		picker: IQuickPick<IQuickPickItem, { useSeparators: true }>,
 		provider: IQuickAccessProvider | undefined,
 		descriptor: IQuickAccessProviderDescriptor | undefined,
 		value: string,
diff --git a/src/vs/platform/quickinput/browser/quickInput.ts b/src/vs/platform/quickinput/browser/quickInput.ts
index 4c6dfbe6b7d..6d7096e85ea 100644
--- a/src/vs/platform/quickinput/browser/quickInput.ts
+++ b/src/vs/platform/quickinput/browser/quickInput.ts
@@ -3,37 +3,36 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { Button, IButtonStyles } from 'vs/base/browser/ui/button/button';
-import { CountBadge, ICountBadgeStyles } from 'vs/base/browser/ui/countBadge/countBadge';
-import { IHoverDelegate, IHoverDelegateOptions } from 'vs/base/browser/ui/hover/hoverDelegate';
-import { IInputBoxStyles } from 'vs/base/browser/ui/inputbox/inputBox';
-import { IKeybindingLabelStyles } from 'vs/base/browser/ui/keybindingLabel/keybindingLabel';
-import { IListStyles } from 'vs/base/browser/ui/list/listWidget';
-import { IProgressBarStyles, ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
-import { IToggleStyles, Toggle } from 'vs/base/browser/ui/toggle/toggle';
-import { equals } from 'vs/base/common/arrays';
-import { TimeoutTimer } from 'vs/base/common/async';
-import { Codicon } from 'vs/base/common/codicons';
-import { Emitter, Event, EventBufferer } from 'vs/base/common/event';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { isIOS } from 'vs/base/common/platform';
-import Severity from 'vs/base/common/severity';
-import { ThemeIcon } from 'vs/base/common/themables';
-import 'vs/css!./media/quickInput';
-import { localize } from 'vs/nls';
-import { IInputBox, IKeyMods, IQuickInput, IQuickInputButton, IQuickInputHideEvent, IQuickInputToggle, IQuickNavigateConfiguration, IQuickPick, IQuickPickDidAcceptEvent, IQuickPickItem, IQuickPickItemButtonEvent, IQuickPickSeparator, IQuickPickSeparatorButtonEvent, IQuickPickWillAcceptEvent, IQuickWidget, ItemActivation, NO_KEY_MODS, QuickInputHideReason, QuickInputType } from 'vs/platform/quickinput/common/quickInput';
-import { QuickInputBox } from './quickInputBox';
-import { quickInputButtonToAction, renderQuickInputDescription } from './quickInputUtils';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IHoverService, WorkbenchHoverDelegate } from 'vs/platform/hover/browser/hover';
-import { QuickInputTree } from 'vs/platform/quickinput/browser/quickInputTree';
-import { QuickPickFocus } from '../common/quickInput';
-import type { IHoverOptions } from 'vs/base/browser/ui/hover/hover';
-import { ContextKeyExpr, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import * as dom from '../../../base/browser/dom.js';
+import { StandardKeyboardEvent } from '../../../base/browser/keyboardEvent.js';
+import { ActionBar } from '../../../base/browser/ui/actionbar/actionbar.js';
+import { Button, IButtonStyles } from '../../../base/browser/ui/button/button.js';
+import { CountBadge, ICountBadgeStyles } from '../../../base/browser/ui/countBadge/countBadge.js';
+import { IHoverDelegate, IHoverDelegateOptions } from '../../../base/browser/ui/hover/hoverDelegate.js';
+import { IInputBoxStyles } from '../../../base/browser/ui/inputbox/inputBox.js';
+import { IKeybindingLabelStyles } from '../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
+import { IListStyles } from '../../../base/browser/ui/list/listWidget.js';
+import { IProgressBarStyles, ProgressBar } from '../../../base/browser/ui/progressbar/progressbar.js';
+import { IToggleStyles, Toggle } from '../../../base/browser/ui/toggle/toggle.js';
+import { equals } from '../../../base/common/arrays.js';
+import { TimeoutTimer } from '../../../base/common/async.js';
+import { Codicon } from '../../../base/common/codicons.js';
+import { Emitter, Event, EventBufferer } from '../../../base/common/event.js';
+import { KeyCode } from '../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore } from '../../../base/common/lifecycle.js';
+import { isIOS } from '../../../base/common/platform.js';
+import Severity from '../../../base/common/severity.js';
+import { ThemeIcon } from '../../../base/common/themables.js';
+import './media/quickInput.css';
+import { localize } from '../../../nls.js';
+import { IInputBox, IKeyMods, IQuickInput, IQuickInputButton, IQuickInputHideEvent, IQuickInputToggle, IQuickNavigateConfiguration, IQuickPick, IQuickPickDidAcceptEvent, IQuickPickItem, IQuickPickItemButtonEvent, IQuickPickSeparator, IQuickPickSeparatorButtonEvent, IQuickPickWillAcceptEvent, IQuickWidget, ItemActivation, NO_KEY_MODS, QuickInputButtonLocation, QuickInputHideReason, QuickInputType, QuickPickFocus } from '../common/quickInput.js';
+import { QuickInputBox } from './quickInputBox.js';
+import { quickInputButtonToAction, renderQuickInputDescription } from './quickInputUtils.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { IHoverService, WorkbenchHoverDelegate } from '../../hover/browser/hover.js';
+import { QuickInputTree } from './quickInputTree.js';
+import type { IHoverOptions } from '../../../base/browser/ui/hover/hover.js';
+import { ContextKeyExpr, RawContextKey } from '../../contextkey/common/contextkey.js';
 
 export const inQuickInputContextKeyValue = 'inQuickInput';
 export const InQuickInputContextKey = new RawContextKey<boolean>(inQuickInputContextKeyValue, false, localize('inQuickInput', "Whether keyboard focus is inside the quick input control"));
@@ -100,6 +99,7 @@ export interface QuickInputUI {
 	description2: HTMLElement;
 	widget: HTMLElement;
 	rightActionBar: ActionBar;
+	inlineActionBar: ActionBar;
 	checkAll: HTMLInputElement;
 	inputContainer: HTMLElement;
 	filterContainer: HTMLElement;
@@ -157,7 +157,9 @@ abstract class QuickInput extends Disposable implements IQuickInput {
 	private _contextKey: string | undefined;
 	private _busy = false;
 	private _ignoreFocusOut = false;
-	private _buttons: IQuickInputButton[] = [];
+	private _leftButtons: IQuickInputButton[] = [];
+	private _rightButtons: IQuickInputButton[] = [];
+	private _inlineButtons: IQuickInputButton[] = [];
 	private buttonsUpdated = false;
 	private _toggles: IQuickInputToggle[] = [];
 	private togglesUpdated = false;
@@ -273,12 +275,24 @@ abstract class QuickInput extends Disposable implements IQuickInput {
 		}
 	}
 
+	protected get titleButtons() {
+		return this._leftButtons.length
+			? [...this._leftButtons, this._rightButtons]
+			: this._rightButtons;
+	}
+
 	get buttons() {
-		return this._buttons;
+		return [
+			...this._leftButtons,
+			...this._rightButtons,
+			...this._inlineButtons
+		];
 	}
 
 	set buttons(buttons: IQuickInputButton[]) {
-		this._buttons = buttons;
+		this._leftButtons = buttons.filter(b => b === backButton);
+		this._rightButtons = buttons.filter(b => b !== backButton && b.location !== QuickInputButtonLocation.Inline);
+		this._inlineButtons = buttons.filter(b => b.location === QuickInputButtonLocation.Inline);
 		this.buttonsUpdated = true;
 		this.update();
 	}
@@ -407,8 +421,7 @@ abstract class QuickInput extends Disposable implements IQuickInput {
 		if (this.buttonsUpdated) {
 			this.buttonsUpdated = false;
 			this.ui.leftActionBar.clear();
-			const leftButtons = this.buttons
-				.filter(button => button === backButton)
+			const leftButtons = this._leftButtons
 				.map((button, index) => quickInputButtonToAction(
 					button,
 					`id-${index}`,
@@ -416,14 +429,21 @@ abstract class QuickInput extends Disposable implements IQuickInput {
 				));
 			this.ui.leftActionBar.push(leftButtons, { icon: true, label: false });
 			this.ui.rightActionBar.clear();
-			const rightButtons = this.buttons
-				.filter(button => button !== backButton)
+			const rightButtons = this._rightButtons
 				.map((button, index) => quickInputButtonToAction(
 					button,
 					`id-${index}`,
 					async () => this.onDidTriggerButtonEmitter.fire(button)
 				));
 			this.ui.rightActionBar.push(rightButtons, { icon: true, label: false });
+			this.ui.inlineActionBar.clear();
+			const inlineButtons = this._inlineButtons
+				.map((button, index) => quickInputButtonToAction(
+					button,
+					`id-${index}`,
+					async () => this.onDidTriggerButtonEmitter.fire(button)
+				));
+			this.ui.inlineActionBar.push(inlineButtons, { icon: true, label: false });
 		}
 		if (this.togglesUpdated) {
 			this.togglesUpdated = false;
@@ -507,7 +527,7 @@ abstract class QuickInput extends Disposable implements IQuickInput {
 	}
 }
 
-export class QuickPick<T extends IQuickPickItem> extends QuickInput implements IQuickPick<T> {
+export class QuickPick<T extends IQuickPickItem, O extends { useSeparators: boolean } = { useSeparators: false }> extends QuickInput implements IQuickPick<T, O> {
 
 	private static readonly DEFAULT_ARIA_LABEL = localize('quickInputBox.ariaLabel', "Type to narrow down results.");
 
@@ -518,7 +538,7 @@ export class QuickPick<T extends IQuickPickItem> extends QuickInput implements I
 	private readonly onWillAcceptEmitter = this._register(new Emitter<IQuickPickWillAcceptEvent>());
 	private readonly onDidAcceptEmitter = this._register(new Emitter<IQuickPickDidAcceptEvent>());
 	private readonly onDidCustomEmitter = this._register(new Emitter<void>());
-	private _items: Array<T | IQuickPickSeparator> = [];
+	private _items: O extends { useSeparators: true } ? Array<T | IQuickPickSeparator> : Array<T> = [];
 	private itemsUpdated = false;
 	private _canSelectMany = false;
 	private _canAcceptInBackground = false;
@@ -625,7 +645,7 @@ export class QuickPick<T extends IQuickPickItem> extends QuickInput implements I
 		this.ui.list.scrollTop = scrollTop;
 	}
 
-	set items(items: Array<T | IQuickPickSeparator>) {
+	set items(items: O extends { useSeparators: true } ? Array<T | IQuickPickSeparator> : Array<T>) {
 		this._items = items;
 		this.itemsUpdated = true;
 		this.update();
@@ -895,7 +915,7 @@ export class QuickPick<T extends IQuickPickItem> extends QuickInput implements I
 				}
 			}));
 			this.visibleDisposables.add(this.ui.list.onChangedCheckedElements(checkedItems => {
-				if (!this.canSelectMany) {
+				if (!this.canSelectMany || !this.visible) {
 					return;
 				}
 				if (this.selectedItemsToConfirm !== this._selectedItems && equals(checkedItems, this._selectedItems, (a, b) => a === b)) {
@@ -986,7 +1006,7 @@ export class QuickPick<T extends IQuickPickItem> extends QuickInput implements I
 		const scrollTopBefore = this.keepScrollPosition ? this.scrollTop : 0;
 		const hasDescription = !!this.description;
 		const visibilities: Visibilities = {
-			title: !!this.title || !!this.step || !!this.buttons.length,
+			title: !!this.title || !!this.step || !!this.titleButtons.length,
 			description: hasDescription,
 			checkAll: this.canSelectMany && !this._hideCheckAll,
 			checkBox: this.canSelectMany,
@@ -1036,9 +1056,6 @@ export class QuickPick<T extends IQuickPickItem> extends QuickInput implements I
 				// We want focus to exist in the list if there are items so that space can be used to toggle
 				this.ui.list.shouldLoop = !this.canSelectMany;
 				this.ui.list.filter(this.filterValue(this.ui.inputBox.value));
-				this.ui.checkAll.checked = this.ui.list.getAllVisibleChecked();
-				this.ui.visibleCount.setCount(this.ui.list.getVisibleCount());
-				this.ui.count.setCount(this.ui.list.getCheckedCount());
 				switch (this._itemActivation) {
 					case ItemActivation.NONE:
 						this._itemActivation = ItemActivation.FIRST; // only valid once, then unset
@@ -1216,7 +1233,7 @@ export class InputBox extends QuickInput implements IInputBox {
 
 		this.ui.container.classList.remove('hidden-input');
 		const visibilities: Visibilities = {
-			title: !!this.title || !!this.step || !!this.buttons.length,
+			title: !!this.title || !!this.step || !!this.titleButtons.length,
 			description: !!this.description || !!this.step,
 			inputBox: true,
 			message: true,
@@ -1250,7 +1267,7 @@ export class QuickWidget extends QuickInput implements IQuickWidget {
 		}
 
 		const visibilities: Visibilities = {
-			title: !!this.title || !!this.step || !!this.buttons.length,
+			title: !!this.title || !!this.step || !!this.titleButtons.length,
 			description: !!this.description || !!this.step
 		};
 
diff --git a/src/vs/platform/quickinput/browser/quickInputActions.ts b/src/vs/platform/quickinput/browser/quickInputActions.ts
index 5efaf793645..bf6ca7c731b 100644
--- a/src/vs/platform/quickinput/browser/quickInputActions.ts
+++ b/src/vs/platform/quickinput/browser/quickInputActions.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { isMacintosh } from 'vs/base/common/platform';
-import { PartialExcept } from 'vs/base/common/types';
-import { localize } from 'vs/nls';
-import { ICommandHandler } from 'vs/platform/commands/common/commands';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { InputFocusedContext } from 'vs/platform/contextkey/common/contextkeys';
-import { ICommandAndKeybindingRule, KeybindingWeight, KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { endOfQuickInputBoxContext, inQuickInputContext, quickInputTypeContextKeyValue } from 'vs/platform/quickinput/browser/quickInput';
-import { IQuickInputService, IQuickPick, QuickInputType, QuickPickFocus } from 'vs/platform/quickinput/common/quickInput';
+import { KeyCode, KeyMod } from '../../../base/common/keyCodes.js';
+import { isMacintosh } from '../../../base/common/platform.js';
+import { PartialExcept } from '../../../base/common/types.js';
+import { localize } from '../../../nls.js';
+import { ICommandHandler } from '../../commands/common/commands.js';
+import { ContextKeyExpr } from '../../contextkey/common/contextkey.js';
+import { InputFocusedContext } from '../../contextkey/common/contextkeys.js';
+import { ICommandAndKeybindingRule, KeybindingWeight, KeybindingsRegistry } from '../../keybinding/common/keybindingsRegistry.js';
+import { endOfQuickInputBoxContext, inQuickInputContext, quickInputTypeContextKeyValue } from './quickInput.js';
+import { IQuickInputService, IQuickPick, QuickInputType, QuickPickFocus } from '../common/quickInput.js';
 
 const defaultCommandAndKeybindingRule = {
 	weight: KeybindingWeight.WorkbenchContrib,
diff --git a/src/vs/platform/quickinput/browser/quickInputBox.ts b/src/vs/platform/quickinput/browser/quickInputBox.ts
index 9ee1440a91a..e7868b89316 100644
--- a/src/vs/platform/quickinput/browser/quickInputBox.ts
+++ b/src/vs/platform/quickinput/browser/quickInputBox.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { FindInput } from 'vs/base/browser/ui/findinput/findInput';
-import { IInputBoxStyles, IRange, MessageType } from 'vs/base/browser/ui/inputbox/inputBox';
-import { IToggleStyles, Toggle } from 'vs/base/browser/ui/toggle/toggle';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import Severity from 'vs/base/common/severity';
-import 'vs/css!./media/quickInput';
+import * as dom from '../../../base/browser/dom.js';
+import { StandardKeyboardEvent } from '../../../base/browser/keyboardEvent.js';
+import { StandardMouseEvent } from '../../../base/browser/mouseEvent.js';
+import { FindInput } from '../../../base/browser/ui/findinput/findInput.js';
+import { IInputBoxStyles, IRange, MessageType } from '../../../base/browser/ui/inputbox/inputBox.js';
+import { IToggleStyles, Toggle } from '../../../base/browser/ui/toggle/toggle.js';
+import { Disposable, IDisposable } from '../../../base/common/lifecycle.js';
+import Severity from '../../../base/common/severity.js';
+import './media/quickInput.css';
 
 const $ = dom.$;
 
diff --git a/src/vs/platform/quickinput/browser/quickInputController.ts b/src/vs/platform/quickinput/browser/quickInputController.ts
index 626b74e8fa5..93ca64256be 100644
--- a/src/vs/platform/quickinput/browser/quickInputController.ts
+++ b/src/vs/platform/quickinput/browser/quickInputController.ts
@@ -3,29 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { ActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { Button } from 'vs/base/browser/ui/button/button';
-import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge';
-import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { Disposable, DisposableStore, dispose } from 'vs/base/common/lifecycle';
-import Severity from 'vs/base/common/severity';
-import { isString } from 'vs/base/common/types';
-import { localize } from 'vs/nls';
-import { IInputBox, IInputOptions, IKeyMods, IPickOptions, IQuickInput, IQuickInputButton, IQuickNavigateConfiguration, IQuickPick, IQuickPickItem, IQuickWidget, QuickInputHideReason, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
-import { QuickInputBox } from 'vs/platform/quickinput/browser/quickInputBox';
-import { QuickInputUI, Writeable, IQuickInputStyles, IQuickInputOptions, QuickPick, backButton, InputBox, Visibilities, QuickWidget, InQuickInputContextKey, QuickInputTypeContextKey, EndOfQuickInputBoxContextKey } from 'vs/platform/quickinput/browser/quickInput';
-import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
-import { mainWindow } from 'vs/base/browser/window';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { QuickInputTree } from 'vs/platform/quickinput/browser/quickInputTree';
-import { QuickPickFocus } from '../common/quickInput';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import 'vs/platform/quickinput/browser/quickInputActions';
+import * as dom from '../../../base/browser/dom.js';
+import { ActionBar } from '../../../base/browser/ui/actionbar/actionbar.js';
+import { ActionViewItem } from '../../../base/browser/ui/actionbar/actionViewItems.js';
+import { Button } from '../../../base/browser/ui/button/button.js';
+import { CountBadge } from '../../../base/browser/ui/countBadge/countBadge.js';
+import { ProgressBar } from '../../../base/browser/ui/progressbar/progressbar.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { KeyCode } from '../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore, dispose } from '../../../base/common/lifecycle.js';
+import Severity from '../../../base/common/severity.js';
+import { isString } from '../../../base/common/types.js';
+import { localize } from '../../../nls.js';
+import { IInputBox, IInputOptions, IKeyMods, IPickOptions, IQuickInput, IQuickInputButton, IQuickNavigateConfiguration, IQuickPick, IQuickPickItem, IQuickWidget, QuickInputHideReason, QuickPickInput, QuickPickFocus } from '../common/quickInput.js';
+import { QuickInputBox } from './quickInputBox.js';
+import { QuickInputUI, Writeable, IQuickInputStyles, IQuickInputOptions, QuickPick, backButton, InputBox, Visibilities, QuickWidget, InQuickInputContextKey, QuickInputTypeContextKey, EndOfQuickInputBoxContextKey } from './quickInput.js';
+import { ILayoutService } from '../../layout/browser/layoutService.js';
+import { mainWindow } from '../../../base/browser/window.js';
+import { IInstantiationService } from '../../instantiation/common/instantiation.js';
+import { QuickInputTree } from './quickInputTree.js';
+import { IContextKeyService } from '../../contextkey/common/contextkey.js';
+import './quickInputActions.js';
 
 const $ = dom.$;
 
@@ -157,6 +156,9 @@ export class QuickInputController extends Disposable {
 		countContainer.setAttribute('aria-live', 'polite');
 		const count = new CountBadge(countContainer, { countFormat: localize({ key: 'quickInput.countSelected', comment: ['This tells the user how many items are selected in a list of items to select from. The items can be anything.'] }, "{0} Selected") }, this.styles.countBadge);
 
+		const inlineActionBar = this._register(new ActionBar(headerContainer, { hoverDelegate: this.options.hoverDelegate }));
+		inlineActionBar.domNode.classList.add('quick-input-inline-action-bar');
+
 		const okContainer = dom.append(headerContainer, $('.quick-input-action'));
 		const ok = this._register(new Button(okContainer, this.styles.button));
 		ok.label = localize('ok', "OK");
@@ -275,7 +277,7 @@ export class QuickInputController extends Disposable {
 						} else {
 							selectors.push('input[type=text]');
 						}
-						if (this.getUI().list.isDisplayed()) {
+						if (this.getUI().list.displayed) {
 							selectors.push('.monaco-list');
 						}
 						// focus links if there are any
@@ -321,6 +323,7 @@ export class QuickInputController extends Disposable {
 			description2,
 			widget,
 			rightActionBar,
+			inlineActionBar,
 			checkAll,
 			inputContainer,
 			filterContainer,
@@ -359,7 +362,7 @@ export class QuickInputController extends Disposable {
 		}
 	}
 
-	pick<T extends IQuickPickItem, O extends IPickOptions<T>>(picks: Promise<QuickPickInput<T>[]> | QuickPickInput<T>[], options: O = <O>{}, token: CancellationToken = CancellationToken.None): Promise<(O extends { canPickMany: true } ? T[] : T) | undefined> {
+	pick<T extends IQuickPickItem, O extends IPickOptions<T>>(picks: Promise<QuickPickInput<T>[]> | QuickPickInput<T>[], options: IPickOptions<T> = {}, token: CancellationToken = CancellationToken.None): Promise<(O extends { canPickMany: true } ? T[] : T) | undefined> {
 		type R = (O extends { canPickMany: true } ? T[] : T) | undefined;
 		return new Promise<R>((doResolve, reject) => {
 			let resolve = (result: R) => {
@@ -371,7 +374,7 @@ export class QuickInputController extends Disposable {
 				resolve(undefined);
 				return;
 			}
-			const input = this.createQuickPick<T>();
+			const input = this.createQuickPick<T>({ useSeparators: true });
 			let activeItem: T | undefined;
 			const disposables = [
 				input,
@@ -435,6 +438,9 @@ export class QuickInputController extends Disposable {
 				}),
 			];
 			input.title = options.title;
+			if (options.value) {
+				input.value = options.value;
+			}
 			input.canSelectMany = !!options.canPickMany;
 			input.placeholder = options.placeHolder;
 			input.ignoreFocusOut = !!options.ignoreFocusLost;
@@ -542,9 +548,11 @@ export class QuickInputController extends Disposable {
 
 	backButton = backButton;
 
-	createQuickPick<T extends IQuickPickItem>(): IQuickPick<T> {
+	createQuickPick<T extends IQuickPickItem>(options: { useSeparators: true }): IQuickPick<T, { useSeparators: true }>;
+	createQuickPick<T extends IQuickPickItem>(options?: { useSeparators: boolean }): IQuickPick<T, { useSeparators: false }>;
+	createQuickPick<T extends IQuickPickItem>(options: { useSeparators: boolean } = { useSeparators: false }): IQuickPick<T, { useSeparators: boolean }> {
 		const ui = this.getUI(true);
-		return new QuickPick<T>(ui);
+		return new QuickPick<T, typeof options>(ui);
 	}
 
 	createInputBox(): IInputBox {
@@ -571,6 +579,7 @@ export class QuickInputController extends Disposable {
 		ui.description2.textContent = '';
 		dom.reset(ui.widget);
 		ui.rightActionBar.clear();
+		ui.inlineActionBar.clear();
 		ui.checkAll.checked = false;
 		// ui.inputBox.value = ''; Avoid triggering an event.
 		ui.inputBox.placeholder = '';
@@ -615,7 +624,7 @@ export class QuickInputController extends Disposable {
 		ui.customButtonContainer.style.display = visibilities.customButton ? '' : 'none';
 		ui.message.style.display = visibilities.message ? '' : 'none';
 		ui.progressBar.getContainer().style.display = visibilities.progressBar ? '' : 'none';
-		ui.list.display(!!visibilities.list);
+		ui.list.displayed = !!visibilities.list;
 		ui.container.classList.toggle('show-checkboxes', !!visibilities.checkBox);
 		ui.container.classList.toggle('hidden-input', !visibilities.inputBox && !visibilities.description);
 		this.updateLayout(); // TODO
@@ -684,7 +693,7 @@ export class QuickInputController extends Disposable {
 	}
 
 	navigate(next: boolean, quickNavigate?: IQuickNavigateConfiguration) {
-		if (this.isVisible() && this.getUI().list.isDisplayed()) {
+		if (this.isVisible() && this.getUI().list.displayed) {
 			this.getUI().list.focus(next ? QuickPickFocus.Next : QuickPickFocus.Previous);
 			if (quickNavigate && this.controller instanceof QuickPick) {
 				this.controller.quickNavigate = quickNavigate;
diff --git a/src/vs/platform/quickinput/browser/quickInputService.ts b/src/vs/platform/quickinput/browser/quickInputService.ts
index 4727a3f9b52..ccdb6965563 100644
--- a/src/vs/platform/quickinput/browser/quickInputService.ts
+++ b/src/vs/platform/quickinput/browser/quickInputService.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Emitter } from 'vs/base/common/event';
-import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { QuickAccessController } from 'vs/platform/quickinput/browser/quickAccess';
-import { IQuickAccessController } from 'vs/platform/quickinput/common/quickAccess';
-import { IInputBox, IInputOptions, IKeyMods, IPickOptions, IQuickInputButton, IQuickInputService, IQuickNavigateConfiguration, IQuickPick, IQuickPickItem, IQuickWidget, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
-import { defaultButtonStyles, defaultCountBadgeStyles, defaultInputBoxStyles, defaultKeybindingLabelStyles, defaultProgressBarStyles, defaultToggleStyles, getListStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { activeContrastBorder, asCssVariable, pickerGroupBorder, pickerGroupForeground, quickInputBackground, quickInputForeground, quickInputListFocusBackground, quickInputListFocusForeground, quickInputListFocusIconForeground, quickInputTitleBackground, widgetBorder, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
-import { IThemeService, Themable } from 'vs/platform/theme/common/themeService';
-import { IQuickInputOptions, IQuickInputStyles, QuickInputHoverDelegate } from './quickInput';
-import { QuickInputController, IQuickInputControllerHost } from 'vs/platform/quickinput/browser/quickInputController';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { getWindow } from 'vs/base/browser/dom';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Emitter } from '../../../base/common/event.js';
+import { IContextKey, IContextKeyService, RawContextKey } from '../../contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../instantiation/common/instantiation.js';
+import { ILayoutService } from '../../layout/browser/layoutService.js';
+import { IOpenerService } from '../../opener/common/opener.js';
+import { QuickAccessController } from './quickAccess.js';
+import { IQuickAccessController } from '../common/quickAccess.js';
+import { IInputBox, IInputOptions, IKeyMods, IPickOptions, IQuickInputButton, IQuickInputService, IQuickNavigateConfiguration, IQuickPick, IQuickPickItem, IQuickWidget, QuickPickInput } from '../common/quickInput.js';
+import { defaultButtonStyles, defaultCountBadgeStyles, defaultInputBoxStyles, defaultKeybindingLabelStyles, defaultProgressBarStyles, defaultToggleStyles, getListStyles } from '../../theme/browser/defaultStyles.js';
+import { activeContrastBorder, asCssVariable, pickerGroupBorder, pickerGroupForeground, quickInputBackground, quickInputForeground, quickInputListFocusBackground, quickInputListFocusForeground, quickInputListFocusIconForeground, quickInputTitleBackground, widgetBorder, widgetShadow } from '../../theme/common/colorRegistry.js';
+import { IThemeService, Themable } from '../../theme/common/themeService.js';
+import { IQuickInputOptions, IQuickInputStyles, QuickInputHoverDelegate } from './quickInput.js';
+import { QuickInputController, IQuickInputControllerHost } from './quickInputController.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { getWindow } from '../../../base/browser/dom.js';
 
 export class QuickInputService extends Themable implements IQuickInputService {
 
@@ -149,7 +149,7 @@ export class QuickInputService extends Themable implements IQuickInputService {
 		});
 	}
 
-	pick<T extends IQuickPickItem, O extends IPickOptions<T>>(picks: Promise<QuickPickInput<T>[]> | QuickPickInput<T>[], options: O = <O>{}, token: CancellationToken = CancellationToken.None): Promise<(O extends { canPickMany: true } ? T[] : T) | undefined> {
+	pick<T extends IQuickPickItem, O extends IPickOptions<T>>(picks: Promise<QuickPickInput<T>[]> | QuickPickInput<T>[], options?: O, token: CancellationToken = CancellationToken.None): Promise<(O extends { canPickMany: true } ? T[] : T) | undefined> {
 		return this.controller.pick(picks, options, token);
 	}
 
@@ -157,8 +157,10 @@ export class QuickInputService extends Themable implements IQuickInputService {
 		return this.controller.input(options, token);
 	}
 
-	createQuickPick<T extends IQuickPickItem>(): IQuickPick<T> {
-		return this.controller.createQuickPick();
+	createQuickPick<T extends IQuickPickItem>(options: { useSeparators: true }): IQuickPick<T, { useSeparators: true }>;
+	createQuickPick<T extends IQuickPickItem>(options?: { useSeparators: boolean }): IQuickPick<T, { useSeparators: false }>;
+	createQuickPick<T extends IQuickPickItem>(options: { useSeparators: boolean } = { useSeparators: false }): IQuickPick<T, { useSeparators: boolean }> {
+		return this.controller.createQuickPick(options);
 	}
 
 	createInputBox(): IInputBox {
diff --git a/src/vs/platform/quickinput/browser/quickInputTree.ts b/src/vs/platform/quickinput/browser/quickInputTree.ts
index c65ad7ef4d7..a4641a71831 100644
--- a/src/vs/platform/quickinput/browser/quickInputTree.ts
+++ b/src/vs/platform/quickinput/browser/quickInputTree.ts
@@ -3,42 +3,43 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { Emitter, Event, IValueWithChangeEvent } from 'vs/base/common/event';
-import { IHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate';
-import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { IObjectTreeElement, ITreeNode, ITreeRenderer } from 'vs/base/browser/ui/tree/tree';
-import { localize } from 'vs/nls';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { WorkbenchObjectTree } from 'vs/platform/list/browser/listService';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { IQuickPickItem, IQuickPickItemButtonEvent, IQuickPickSeparator, IQuickPickSeparatorButtonEvent, QuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { IMatch } from 'vs/base/common/filters';
-import { IListAccessibilityProvider, IListStyles } from 'vs/base/browser/ui/list/listWidget';
-import { AriaRole } from 'vs/base/browser/ui/aria/aria';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { OS } from 'vs/base/common/platform';
-import { memoize } from 'vs/base/common/decorators';
-import { IIconLabelValueOptions, IconLabel } from 'vs/base/browser/ui/iconLabel/iconLabel';
-import { KeybindingLabel } from 'vs/base/browser/ui/keybindingLabel/keybindingLabel';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { isDark } from 'vs/platform/theme/common/theme';
-import { URI } from 'vs/base/common/uri';
-import { quickInputButtonToAction } from 'vs/platform/quickinput/browser/quickInputUtils';
-import { Lazy } from 'vs/base/common/lazy';
-import { IParsedLabelWithIcons, getCodiconAriaLabel, matchesFuzzyIconAware, parseLabelWithIcons } from 'vs/base/common/iconLabels';
-import { HoverPosition } from 'vs/base/browser/ui/hover/hoverWidget';
-import { compareAnything } from 'vs/base/common/comparers';
-import { ltrim } from 'vs/base/common/strings';
-import { RenderIndentGuides } from 'vs/base/browser/ui/tree/abstractTree';
-import { ThrottledDelayer } from 'vs/base/common/async';
-import { isCancellationError } from 'vs/base/common/errors';
-import type { IHoverWidget, IManagedHoverTooltipMarkdownString } from 'vs/base/browser/ui/hover/hover';
-import { QuickPickFocus } from '../common/quickInput';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
+import * as dom from '../../../base/browser/dom.js';
+import { Emitter, Event, EventBufferer, IValueWithChangeEvent } from '../../../base/common/event.js';
+import { IHoverDelegate } from '../../../base/browser/ui/hover/hoverDelegate.js';
+import { IListVirtualDelegate } from '../../../base/browser/ui/list/list.js';
+import { IObjectTreeElement, ITreeNode, ITreeRenderer, TreeVisibility } from '../../../base/browser/ui/tree/tree.js';
+import { localize } from '../../../nls.js';
+import { IInstantiationService } from '../../instantiation/common/instantiation.js';
+import { WorkbenchObjectTree } from '../../list/browser/listService.js';
+import { IThemeService } from '../../theme/common/themeService.js';
+import { Disposable, DisposableStore } from '../../../base/common/lifecycle.js';
+import { IQuickPickItem, IQuickPickItemButtonEvent, IQuickPickSeparator, IQuickPickSeparatorButtonEvent, QuickPickItem, QuickPickFocus } from '../common/quickInput.js';
+import { IMarkdownString } from '../../../base/common/htmlContent.js';
+import { IMatch } from '../../../base/common/filters.js';
+import { IListAccessibilityProvider, IListStyles } from '../../../base/browser/ui/list/listWidget.js';
+import { AriaRole } from '../../../base/browser/ui/aria/aria.js';
+import { StandardKeyboardEvent } from '../../../base/browser/keyboardEvent.js';
+import { KeyCode } from '../../../base/common/keyCodes.js';
+import { OS } from '../../../base/common/platform.js';
+import { memoize } from '../../../base/common/decorators.js';
+import { IIconLabelValueOptions, IconLabel } from '../../../base/browser/ui/iconLabel/iconLabel.js';
+import { KeybindingLabel } from '../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
+import { ActionBar } from '../../../base/browser/ui/actionbar/actionbar.js';
+import { isDark } from '../../theme/common/theme.js';
+import { URI } from '../../../base/common/uri.js';
+import { quickInputButtonToAction } from './quickInputUtils.js';
+import { Lazy } from '../../../base/common/lazy.js';
+import { IParsedLabelWithIcons, getCodiconAriaLabel, matchesFuzzyIconAware, parseLabelWithIcons } from '../../../base/common/iconLabels.js';
+import { HoverPosition } from '../../../base/browser/ui/hover/hoverWidget.js';
+import { compareAnything } from '../../../base/common/comparers.js';
+import { ltrim } from '../../../base/common/strings.js';
+import { RenderIndentGuides } from '../../../base/browser/ui/tree/abstractTree.js';
+import { ThrottledDelayer } from '../../../base/common/async.js';
+import { isCancellationError } from '../../../base/common/errors.js';
+import type { IHoverWidget, IManagedHoverTooltipMarkdownString } from '../../../base/browser/ui/hover/hover.js';
+import { IAccessibilityService } from '../../accessibility/common/accessibility.js';
+import { observableValue, observableValueOpts, transaction } from '../../../base/common/observable.js';
+import { equals } from '../../../base/common/arrays.js';
 
 const $ = dom.$;
 
@@ -552,6 +553,12 @@ class QuickPickSeparatorElementRenderer extends BaseQuickInputListRenderer<Quick
 		return this._visibleSeparatorsFrequency.has(separator);
 	}
 
+	override renderTemplate(container: HTMLElement): IQuickInputItemTemplateData {
+		const data = super.renderTemplate(container);
+		data.checkbox.style.display = 'none';
+		return data;
+	}
+
 	override renderElement(node: ITreeNode<QuickPickSeparatorElement, void>, index: number, data: IQuickInputItemTemplateData): void {
 		const element = node.element;
 		data.element = element;
@@ -656,6 +663,8 @@ class QuickPickSeparatorElementRenderer extends BaseQuickInputListRenderer<Quick
 
 export class QuickInputTree extends Disposable {
 
+	//#region QuickInputTree Events
+
 	private readonly _onKeyDown = new Emitter<StandardKeyboardEvent>();
 	/**
 	 * Event that is fired when the tree receives a keydown.
@@ -668,17 +677,17 @@ export class QuickInputTree extends Disposable {
 	*/
 	readonly onLeave: Event<void> = this._onLeave.event;
 
-	private readonly _onChangedAllVisibleChecked = new Emitter<boolean>();
-	onChangedAllVisibleChecked: Event<boolean> = this._onChangedAllVisibleChecked.event;
+	private readonly _visibleCountObservable = observableValue('VisibleCount', 0);
+	onChangedVisibleCount: Event<number> = Event.fromObservable(this._visibleCountObservable, this._store);
 
-	private readonly _onChangedCheckedCount = new Emitter<number>();
-	onChangedCheckedCount: Event<number> = this._onChangedCheckedCount.event;
+	private readonly _allVisibleCheckedObservable = observableValue('AllVisibleChecked', false);
+	onChangedAllVisibleChecked: Event<boolean> = Event.fromObservable(this._allVisibleCheckedObservable, this._store);
 
-	private readonly _onChangedVisibleCount = new Emitter<number>();
-	onChangedVisibleCount: Event<number> = this._onChangedVisibleCount.event;
+	private readonly _checkedCountObservable = observableValue('CheckedCount', 0);
+	onChangedCheckedCount: Event<number> = Event.fromObservable(this._checkedCountObservable, this._store);
 
-	private readonly _onChangedCheckedElements = new Emitter<IQuickPickItem[]>();
-	onChangedCheckedElements: Event<IQuickPickItem[]> = this._onChangedCheckedElements.event;
+	private readonly _checkedElementsObservable = observableValueOpts({ equalsFn: equals }, new Array<IQuickPickItem>());
+	onChangedCheckedElements: Event<IQuickPickItem[]> = Event.fromObservable(this._checkedElementsObservable, this._store);
 
 	private readonly _onButtonTriggered = new Emitter<IQuickPickItemButtonEvent<IQuickPickItem>>();
 	onButtonTriggered = this._onButtonTriggered.event;
@@ -686,21 +695,24 @@ export class QuickInputTree extends Disposable {
 	private readonly _onSeparatorButtonTriggered = new Emitter<IQuickPickSeparatorButtonEvent>();
 	onSeparatorButtonTriggered = this._onSeparatorButtonTriggered.event;
 
+	private readonly _elementChecked = new Emitter<{ element: IQuickPickElement; checked: boolean }>();
+	private readonly _elementCheckedEventBufferer = new EventBufferer();
+
+	//#endregion
+
+	private _hasCheckboxes = false;
+
 	private readonly _container: HTMLElement;
 	private readonly _tree: WorkbenchObjectTree<IQuickPickElement, void>;
 	private readonly _separatorRenderer: QuickPickSeparatorElementRenderer;
 	private readonly _itemRenderer: QuickPickItemElementRenderer;
-	private readonly _elementChecked = new Emitter<{ element: IQuickPickElement; checked: boolean }>();
 	private _inputElements = new Array<QuickPickItem>();
 	private _elementTree = new Array<IQuickPickElement>();
 	private _itemElements = new Array<QuickPickItemElement>();
 	// Elements that apply to the current set of elements
 	private readonly _elementDisposable = this._register(new DisposableStore());
 	private _lastHover: IHoverWidget | undefined;
-	// This is used to prevent setting the checked state of a single element from firing the checked events
-	// so that we can batch them together. This can probably be improved by handling events differently,
-	// but this works for now. An observable would probably be ideal for this.
-	private _shouldFireCheckedEvents = true;
+	private _lastQueryString: string | undefined;
 
 	constructor(
 		private parent: HTMLElement,
@@ -721,6 +733,24 @@ export class QuickInputTree extends Disposable {
 			new QuickInputItemDelegate(),
 			[this._itemRenderer, this._separatorRenderer],
 			{
+				filter: {
+					filter(element) {
+						return element.hidden
+							? TreeVisibility.Hidden
+							: element instanceof QuickPickSeparatorElement
+								? TreeVisibility.Recurse
+								: TreeVisibility.Visible;
+					},
+				},
+				sorter: {
+					compare: (element, otherElement) => {
+						if (!this.sortByLabel || !this._lastQueryString) {
+							return 0;
+						}
+						const normalizedSearchValue = this._lastQueryString.toLowerCase();
+						return compareEntries(element, otherElement, normalizedSearchValue);
+					},
+				},
 				accessibilityProvider: new QuickInputAccessibilityProvider(),
 				setRowLineHeight: false,
 				multipleSelectionSupport: false,
@@ -743,7 +773,8 @@ export class QuickInputTree extends Disposable {
 	get onDidChangeFocus() {
 		return Event.map(
 			this._tree.onDidChangeFocus,
-			e => e.elements.filter((e): e is QuickPickItemElement => e instanceof QuickPickItemElement).map(e => e.item)
+			e => e.elements.filter((e): e is QuickPickItemElement => e instanceof QuickPickItemElement).map(e => e.item),
+			this._store
 		);
 	}
 
@@ -754,10 +785,19 @@ export class QuickInputTree extends Disposable {
 			e => ({
 				items: e.elements.filter((e): e is QuickPickItemElement => e instanceof QuickPickItemElement).map(e => e.item),
 				event: e.browserEvent
-			})
+			}),
+			this._store
 		);
 	}
 
+	get displayed() {
+		return this._container.style.display !== 'none';
+	}
+
+	set displayed(value: boolean) {
+		this._container.style.display = value ? '' : 'none';
+	}
+
 	get scrollTop() {
 		return this._tree.scrollTop;
 	}
@@ -842,6 +882,7 @@ export class QuickInputTree extends Disposable {
 		this._registerOnKeyDown();
 		this._registerOnContainerClick();
 		this._registerOnMouseMiddleClick();
+		this._registerOnTreeModelChanged();
 		this._registerOnElementChecked();
 		this._registerOnContextMenu();
 		this._registerHoverListeners();
@@ -879,8 +920,19 @@ export class QuickInputTree extends Disposable {
 		}));
 	}
 
+	private _registerOnTreeModelChanged() {
+		this._register(this._tree.onDidChangeModel(() => {
+			const visibleCount = this._itemElements.filter(e => !e.hidden).length;
+			this._visibleCountObservable.set(visibleCount, undefined);
+			if (this._hasCheckboxes) {
+				this._updateCheckedObservables();
+			}
+		}));
+	}
+
 	private _registerOnElementChecked() {
-		this._register(this._elementChecked.event(_ => this._fireCheckedEvents()));
+		// Only fire the last event when buffered
+		this._register(this._elementCheckedEventBufferer.wrapEvent(this._elementChecked.event, (_, e) => e)(_ => this._updateCheckedObservables()));
 	}
 
 	private _registerOnContextMenu() {
@@ -1015,37 +1067,22 @@ export class QuickInputTree extends Disposable {
 
 	//#region public methods
 
-	getAllVisibleChecked() {
-		return this._allVisibleChecked(this._itemElements, false);
-	}
-
-	getCheckedCount() {
-		return this._itemElements.filter(element => element.checked).length;
-	}
-
-	getVisibleCount() {
-		return this._itemElements.filter(e => !e.hidden).length;
-	}
-
 	setAllVisibleChecked(checked: boolean) {
-		try {
-			this._shouldFireCheckedEvents = false;
+		this._elementCheckedEventBufferer.bufferEvents(() => {
 			this._itemElements.forEach(element => {
 				if (!element.hidden && !element.checkboxDisabled) {
-					// Would fire an event if we didn't have the flag set
+					// Would fire an event if we didn't beffer the events
 					element.checked = checked;
 				}
 			});
-		} finally {
-			this._shouldFireCheckedEvents = true;
-			this._fireCheckedEvents();
-		}
+		});
 	}
 
 	setElements(inputElements: QuickPickItem[]): void {
 		this._elementDisposable.clear();
+		this._lastQueryString = undefined;
 		this._inputElements = inputElements;
-		const hasCheckbox = this.parent.classList.contains('show-checkboxes');
+		this._hasCheckboxes = this.parent.classList.contains('show-checkboxes');
 		let currentSeparatorElement: QuickPickSeparatorElement | undefined;
 		this._itemElements = new Array<QuickPickItemElement>();
 		this._elementTree = inputElements.reduce((result, item, index) => {
@@ -1057,7 +1094,7 @@ export class QuickInputTree extends Disposable {
 				}
 				currentSeparatorElement = new QuickPickSeparatorElement(
 					index,
-					(event: IQuickPickSeparatorButtonEvent) => this.fireSeparatorButtonTriggered(event),
+					e => this._onSeparatorButtonTriggered.fire(e),
 					item
 				);
 				element = currentSeparatorElement;
@@ -1071,8 +1108,8 @@ export class QuickInputTree extends Disposable {
 				}
 				const qpi = new QuickPickItemElement(
 					index,
-					hasCheckbox,
-					(event: IQuickPickItemButtonEvent<IQuickPickItem>) => this.fireButtonTriggered(event),
+					this._hasCheckboxes,
+					e => this._onButtonTriggered.fire(e),
 					this._elementChecked,
 					item,
 					separator,
@@ -1090,32 +1127,7 @@ export class QuickInputTree extends Disposable {
 			return result;
 		}, new Array<IQuickPickElement>());
 
-		const elements = new Array<IObjectTreeElement<IQuickPickElement>>();
-		let visibleCount = 0;
-		for (const element of this._elementTree) {
-			if (element instanceof QuickPickSeparatorElement) {
-				elements.push({
-					element,
-					collapsible: false,
-					collapsed: false,
-					children: element.children.map(e => ({
-						element: e,
-						collapsible: false,
-						collapsed: false,
-					})),
-				});
-				visibleCount += element.children.length + 1; // +1 for the separator itself;
-			} else {
-				elements.push({
-					element,
-					collapsible: false,
-					collapsed: false,
-				});
-				visibleCount++;
-			}
-		}
-		this._tree.setChildren(null, elements);
-		this._onChangedVisibleCount.fire(visibleCount);
+		this._setElementsToTree(this._elementTree);
 
 		// Accessibility hack, unfortunately on next tick
 		// https://github.com/microsoft/vscode/issues/211976
@@ -1132,20 +1144,10 @@ export class QuickInputTree extends Disposable {
 		}
 	}
 
-	getElementsCount(): number {
-		return this._inputElements.length;
-	}
-
-	getFocusedElements() {
-		return this._tree.getFocus()
-			.filter((e): e is IQuickPickElement => !!e)
-			.map(e => e.item)
-			.filter((e): e is IQuickPickItem => !!e);
-	}
-
 	setFocusedElements(items: IQuickPickItem[]) {
 		const elements = items.map(item => this._itemElements.find(e => e.item === item))
-			.filter((e): e is QuickPickItemElement => !!e);
+			.filter((e): e is QuickPickItemElement => !!e)
+			.filter(e => !e.hidden);
 		this._tree.setFocus(elements);
 		if (items.length > 0) {
 			const focused = this._tree.getFocus()[0];
@@ -1159,12 +1161,6 @@ export class QuickInputTree extends Disposable {
 		return this._tree.getHTMLElement().getAttribute('aria-activedescendant');
 	}
 
-	getSelectedElements() {
-		return this._tree.getSelection()
-			.filter((e): e is IQuickPickElement => !!e && !!(e as QuickPickItemElement).item)
-			.map(e => e.item);
-	}
-
 	setSelectedElements(items: IQuickPickItem[]) {
 		const elements = items.map(item => this._itemElements.find(e => e.item === item))
 			.filter((e): e is QuickPickItemElement => !!e);
@@ -1177,20 +1173,16 @@ export class QuickInputTree extends Disposable {
 	}
 
 	setCheckedElements(items: IQuickPickItem[]) {
-		try {
-			this._shouldFireCheckedEvents = false;
+		this._elementCheckedEventBufferer.bufferEvents(() => {
 			const checked = new Set();
 			for (const item of items) {
 				checked.add(item);
 			}
 			for (const element of this._itemElements) {
-				// Would fire an event if we didn't have the flag set
+				// Would fire an event if we didn't beffer the events
 				element.checked = checked.has(element.item);
 			}
-		} finally {
-			this._shouldFireCheckedEvents = true;
-			this._fireCheckedEvents();
-		}
+		});
 	}
 
 	focus(what: QuickPickFocus): void {
@@ -1207,13 +1199,24 @@ export class QuickInputTree extends Disposable {
 				this._tree.scrollTop = 0;
 				this._tree.focusFirst(undefined, (e) => e.element instanceof QuickPickItemElement);
 				break;
-			case QuickPickFocus.Second:
+			case QuickPickFocus.Second: {
 				this._tree.scrollTop = 0;
-				this._tree.setFocus([this._itemElements[1]]);
+				let isSecondItem = false;
+				this._tree.focusFirst(undefined, (e) => {
+					if (!(e.element instanceof QuickPickItemElement)) {
+						return false;
+					}
+					if (isSecondItem) {
+						return true;
+					}
+					isSecondItem = !isSecondItem;
+					return false;
+				});
 				break;
+			}
 			case QuickPickFocus.Last:
 				this._tree.scrollTop = this._tree.scrollHeight;
-				this._tree.setFocus([this._itemElements[this._itemElements.length - 1]]);
+				this._tree.focusLast(undefined, (e) => e.element instanceof QuickPickItemElement);
 				break;
 			case QuickPickFocus.Next: {
 				const prevFocus = this._tree.getFocus();
@@ -1315,7 +1318,7 @@ export class QuickInputTree extends Disposable {
 					// If we didn't move, then we should just move to the end
 					// of the list.
 					this._tree.scrollTop = this._tree.scrollHeight;
-					this._tree.setFocus([this._itemElements[this._itemElements.length - 1]]);
+					this._tree.focusLast(undefined, (e) => e.element instanceof QuickPickItemElement);
 				}
 				break;
 			}
@@ -1385,6 +1388,7 @@ export class QuickInputTree extends Disposable {
 	}
 
 	filter(query: string): boolean {
+		this._lastQueryString = query;
 		if (!(this._sortByLabel || this._matchOnLabel || this._matchOnDescription || this._matchOnDetail)) {
 			this._tree.layout();
 			return false;
@@ -1410,7 +1414,7 @@ export class QuickInputTree extends Disposable {
 		// Filter by value (since we support icons in labels, use $(..) aware fuzzy matching)
 		else {
 			let currentSeparator: IQuickPickSeparator | undefined;
-			this._elementTree.forEach(element => {
+			this._itemElements.forEach(element => {
 				let labelHighlights: IMatch[] | undefined;
 				if (this.matchOnLabelMode === 'fuzzy') {
 					labelHighlights = this.matchOnLabel ? matchesFuzzyIconAware(query, parseLabelWithIcons(element.saneLabel)) ?? undefined : undefined;
@@ -1441,8 +1445,10 @@ export class QuickInputTree extends Disposable {
 
 				// we can show the separator unless the list gets sorted by match
 				if (!this.sortByLabel) {
-					const previous = element.index && this._inputElements[element.index - 1];
-					currentSeparator = previous && previous.type === 'separator' ? previous : currentSeparator;
+					const previous = element.index && this._inputElements[element.index - 1] || undefined;
+					if (previous?.type === 'separator' && !previous.buttons) {
+						currentSeparator = previous;
+					}
 					if (currentSeparator && !element.hidden) {
 						element.separator = currentSeparator;
 						currentSeparator = undefined;
@@ -1451,65 +1457,18 @@ export class QuickInputTree extends Disposable {
 			});
 		}
 
-		const shownElements = this._elementTree.filter(element => !element.hidden);
-
-		// Sort by value
-		if (this.sortByLabel && query) {
-			const normalizedSearchValue = query.toLowerCase();
-			shownElements.sort((a, b) => {
-				return compareEntries(a, b, normalizedSearchValue);
-			});
-		}
-
-		let currentSeparator: QuickPickSeparatorElement | undefined;
-		const finalElements = shownElements.reduce((result, element, index) => {
-			if (element instanceof QuickPickItemElement) {
-				if (currentSeparator) {
-					currentSeparator.children.push(element);
-				} else {
-					result.push(element);
-				}
-			} else if (element instanceof QuickPickSeparatorElement) {
-				element.children = [];
-				currentSeparator = element;
-				result.push(element);
-			}
-			return result;
-		}, new Array<IQuickPickElement>());
-
-		const elements = new Array<IObjectTreeElement<IQuickPickElement>>();
-		for (const element of finalElements) {
-			if (element instanceof QuickPickSeparatorElement) {
-				elements.push({
-					element,
-					collapsible: false,
-					collapsed: false,
-					children: element.children.map(e => ({
-						element: e,
-						collapsible: false,
-						collapsed: false,
-					})),
-				});
-			} else {
-				elements.push({
-					element,
-					collapsible: false,
-					collapsed: false,
-				});
-			}
-		}
-		this._tree.setChildren(null, elements);
+		this._setElementsToTree(this._sortByLabel && query
+			// We don't render any separators if we're sorting so just render the elements
+			? this._itemElements
+			// Render the full tree
+			: this._elementTree
+		);
 		this._tree.layout();
-
-		this._onChangedAllVisibleChecked.fire(this.getAllVisibleChecked());
-		this._onChangedVisibleCount.fire(shownElements.length);
-
 		return true;
 	}
 
 	toggleCheckbox() {
-		try {
-			this._shouldFireCheckedEvents = false;
+		this._elementCheckedEventBufferer.bufferEvents(() => {
 			const elements = this._tree.getFocus().filter((e): e is QuickPickItemElement => e instanceof QuickPickItemElement);
 			const allChecked = this._allVisibleChecked(elements);
 			for (const element of elements) {
@@ -1518,18 +1477,7 @@ export class QuickInputTree extends Disposable {
 					element.checked = !allChecked;
 				}
 			}
-		} finally {
-			this._shouldFireCheckedEvents = true;
-			this._fireCheckedEvents();
-		}
-	}
-
-	display(display: boolean) {
-		this._container.style.display = display ? '' : 'none';
-	}
-
-	isDisplayed() {
-		return this._container.style.display !== 'none';
+		});
 	}
 
 	style(styles: IListStyles) {
@@ -1566,6 +1514,31 @@ export class QuickInputTree extends Disposable {
 
 	//#region private methods
 
+	private _setElementsToTree(elements: IQuickPickElement[]) {
+		const treeElements = new Array<IObjectTreeElement<IQuickPickElement>>();
+		for (const element of elements) {
+			if (element instanceof QuickPickSeparatorElement) {
+				treeElements.push({
+					element,
+					collapsible: false,
+					collapsed: false,
+					children: element.children.map(e => ({
+						element: e,
+						collapsible: false,
+						collapsed: false,
+					})),
+				});
+			} else {
+				treeElements.push({
+					element,
+					collapsible: false,
+					collapsed: false,
+				});
+			}
+		}
+		this._tree.setChildren(null, treeElements);
+	}
+
 	private _allVisibleChecked(elements: QuickPickItemElement[], whenNoneVisible = true) {
 		for (let i = 0, n = elements.length; i < n; i++) {
 			const element = elements[i];
@@ -1580,21 +1553,13 @@ export class QuickInputTree extends Disposable {
 		return whenNoneVisible;
 	}
 
-	private _fireCheckedEvents() {
-		if (!this._shouldFireCheckedEvents) {
-			return;
-		}
-		this._onChangedAllVisibleChecked.fire(this.getAllVisibleChecked());
-		this._onChangedCheckedCount.fire(this.getCheckedCount());
-		this._onChangedCheckedElements.fire(this.getCheckedElements());
-	}
-
-	private fireButtonTriggered(event: IQuickPickItemButtonEvent<IQuickPickItem>) {
-		this._onButtonTriggered.fire(event);
-	}
-
-	private fireSeparatorButtonTriggered(event: IQuickPickSeparatorButtonEvent) {
-		this._onSeparatorButtonTriggered.fire(event);
+	private _updateCheckedObservables() {
+		transaction((tx) => {
+			this._allVisibleCheckedObservable.set(this._allVisibleChecked(this._itemElements, false), tx);
+			const checkedCount = this._itemElements.filter(element => element.checked).length;
+			this._checkedCountObservable.set(checkedCount, tx);
+			this._checkedElementsObservable.set(this.getCheckedElements(), tx);
+		});
 	}
 
 	/**
diff --git a/src/vs/platform/quickinput/browser/quickInputUtils.ts b/src/vs/platform/quickinput/browser/quickInputUtils.ts
index cfa7e231a23..cbb78a52873 100644
--- a/src/vs/platform/quickinput/browser/quickInputUtils.ts
+++ b/src/vs/platform/quickinput/browser/quickInputUtils.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { DomEmitter } from 'vs/base/browser/event';
-import { Event } from 'vs/base/common/event';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { Gesture, EventType as GestureEventType } from 'vs/base/browser/touch';
-import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
-import { IdGenerator } from 'vs/base/common/idGenerator';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { parseLinkedText } from 'vs/base/common/linkedText';
-import { URI } from 'vs/base/common/uri';
-import 'vs/css!./media/quickInput';
-import { localize } from 'vs/nls';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { IQuickInputButton } from 'vs/platform/quickinput/common/quickInput';
-import { IAction } from 'vs/base/common/actions';
+import * as dom from '../../../base/browser/dom.js';
+import { DomEmitter } from '../../../base/browser/event.js';
+import { Event } from '../../../base/common/event.js';
+import { StandardKeyboardEvent } from '../../../base/browser/keyboardEvent.js';
+import { Gesture, EventType as GestureEventType } from '../../../base/browser/touch.js';
+import { renderLabelWithIcons } from '../../../base/browser/ui/iconLabel/iconLabels.js';
+import { IdGenerator } from '../../../base/common/idGenerator.js';
+import { KeyCode } from '../../../base/common/keyCodes.js';
+import { parseLinkedText } from '../../../base/common/linkedText.js';
+import { URI } from '../../../base/common/uri.js';
+import './media/quickInput.css';
+import { localize } from '../../../nls.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { IQuickInputButton } from '../common/quickInput.js';
+import { IAction } from '../../../base/common/actions.js';
 
 const iconPathToClass: Record<string, string> = {};
 const iconClassGenerator = new IdGenerator('quick-input-button-icon-');
diff --git a/src/vs/platform/quickinput/browser/quickPickPin.ts b/src/vs/platform/quickinput/browser/quickPickPin.ts
index 51c8b25d467..3d5b87e6e65 100644
--- a/src/vs/platform/quickinput/browser/quickPickPin.ts
+++ b/src/vs/platform/quickinput/browser/quickPickPin.ts
@@ -3,11 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from 'vs/base/common/codicons';
-import { localize } from 'vs/nls';
-import { IQuickPick, IQuickPickItem, QuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ThemeIcon } from 'vs/base/common/themables';
+import { Codicon } from '../../../base/common/codicons.js';
+import { localize } from '../../../nls.js';
+import { IQuickPick, IQuickPickItem, QuickPickItem } from '../common/quickInput.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../storage/common/storage.js';
+import { ThemeIcon } from '../../../base/common/themables.js';
+import { DisposableStore, IDisposable } from '../../../base/common/lifecycle.js';
 
 const pinButtonClass = ThemeIcon.asClassName(Codicon.pin);
 const pinnedButtonClass = ThemeIcon.asClassName(Codicon.pinned);
@@ -18,30 +19,32 @@ const buttonClasses = [pinButtonClass, pinnedButtonClass];
  * be removed if @param filterDupliates has been provided. Pin and pinned button events trigger updates to the underlying storage.
  * Shows the quickpick once formatted.
  */
-export async function showWithPinnedItems(storageService: IStorageService, storageKey: string, quickPick: IQuickPick<IQuickPickItem>, filterDuplicates?: boolean): Promise<void> {
+export function showWithPinnedItems(storageService: IStorageService, storageKey: string, quickPick: IQuickPick<IQuickPickItem, { useSeparators: true }>, filterDuplicates?: boolean): IDisposable {
 	const itemsWithoutPinned = quickPick.items;
 	let itemsWithPinned = _formatPinnedItems(storageKey, quickPick, storageService, undefined, filterDuplicates);
-	quickPick.onDidTriggerItemButton(async buttonEvent => {
+	const disposables = new DisposableStore();
+	disposables.add(quickPick.onDidTriggerItemButton(async buttonEvent => {
 		const expectedButton = buttonEvent.button.iconClass && buttonClasses.includes(buttonEvent.button.iconClass);
 		if (expectedButton) {
 			quickPick.items = itemsWithoutPinned;
 			itemsWithPinned = _formatPinnedItems(storageKey, quickPick, storageService, buttonEvent.item, filterDuplicates);
 			quickPick.items = quickPick.value ? itemsWithoutPinned : itemsWithPinned;
 		}
-	});
-	quickPick.onDidChangeValue(async value => {
+	}));
+	disposables.add(quickPick.onDidChangeValue(async value => {
 		if (quickPick.items === itemsWithPinned && value) {
 			quickPick.items = itemsWithoutPinned;
 		} else if (quickPick.items === itemsWithoutPinned && !value) {
 			quickPick.items = itemsWithPinned;
 		}
-	});
+	}));
 
 	quickPick.items = quickPick.value ? itemsWithoutPinned : itemsWithPinned;
 	quickPick.show();
+	return disposables;
 }
 
-function _formatPinnedItems(storageKey: string, quickPick: IQuickPick<IQuickPickItem>, storageService: IStorageService, changedItem?: IQuickPickItem, filterDuplicates?: boolean): QuickPickItem[] {
+function _formatPinnedItems(storageKey: string, quickPick: IQuickPick<IQuickPickItem, { useSeparators: true }>, storageService: IStorageService, changedItem?: IQuickPickItem, filterDuplicates?: boolean): QuickPickItem[] {
 	const formattedItems: QuickPickItem[] = [];
 	let pinnedItems;
 	if (changedItem) {
@@ -57,7 +60,7 @@ function _formatPinnedItems(storageKey: string, quickPick: IQuickPick<IQuickPick
 		const itemToPin = quickPick.items.find(item => itemsMatch(item, itemToFind));
 		if (itemToPin) {
 			const pinnedItemId = getItemIdentifier(itemToPin);
-			const pinnedItem: IQuickPickItem = Object.assign({} as IQuickPickItem, itemToPin);
+			const pinnedItem: IQuickPickItem = { ...(itemToPin as IQuickPickItem) };
 			if (!filterDuplicates || !pinnedIds.has(pinnedItemId)) {
 				pinnedIds.add(pinnedItemId);
 				updateButtons(pinnedItem, false);
diff --git a/src/vs/platform/quickinput/common/quickAccess.ts b/src/vs/platform/quickinput/common/quickAccess.ts
index 12b7afa785e..02801eac797 100644
--- a/src/vs/platform/quickinput/common/quickAccess.ts
+++ b/src/vs/platform/quickinput/common/quickAccess.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { coalesce } from 'vs/base/common/arrays';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { ItemActivation, IQuickNavigateConfiguration, IQuickPick, IQuickPickItem, QuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { Registry } from 'vs/platform/registry/common/platform';
+import { coalesce } from '../../../base/common/arrays.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { ItemActivation, IQuickNavigateConfiguration, IQuickPick, IQuickPickItem, QuickPickItem, IQuickPickSeparator } from './quickInput.js';
+import { Registry } from '../../registry/common/platform.js';
 
 /**
  * Provider specific options for this particular showing of the
@@ -29,7 +29,7 @@ export interface IQuickAccessProviderRunOptions {
  */
 export interface AnythingQuickAccessProviderRunOptions extends IQuickAccessProviderRunOptions {
 	readonly includeHelp?: boolean;
-	readonly filter?: (item: unknown) => boolean;
+	readonly filter?: (item: IQuickPickItem | IQuickPickSeparator) => boolean;
 	/**
 	 * @deprecated - temporary for Dynamic Chat Variables (see usage) until it has built-in UX for file picking
 	 * Useful for adding items to the top of the list that might contain actions.
@@ -129,7 +129,7 @@ export interface IQuickAccessProvider {
 	 * @return a disposable that will automatically be disposed when the picker
 	 * closes or is replaced by another picker.
 	 */
-	provide(picker: IQuickPick<IQuickPickItem>, token: CancellationToken, options?: IQuickAccessProviderRunOptions): IDisposable;
+	provide(picker: IQuickPick<IQuickPickItem, { useSeparators: true }>, token: CancellationToken, options?: IQuickAccessProviderRunOptions): IDisposable;
 }
 
 export interface IQuickAccessProviderHelp {
diff --git a/src/vs/platform/quickinput/common/quickInput.ts b/src/vs/platform/quickinput/common/quickInput.ts
index f893e58fbe6..8f2e1c0ac9b 100644
--- a/src/vs/platform/quickinput/common/quickInput.ts
+++ b/src/vs/platform/quickinput/common/quickInput.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Event } from 'vs/base/common/event';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IQuickAccessController } from 'vs/platform/quickinput/common/quickAccess';
-import { IMatch } from 'vs/base/common/filters';
-import { IItemAccessor } from 'vs/base/common/fuzzyScorer';
-import { ResolvedKeybinding } from 'vs/base/common/keybindings';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import Severity from 'vs/base/common/severity';
-import { URI } from 'vs/base/common/uri';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Event } from '../../../base/common/event.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { IQuickAccessController } from './quickAccess.js';
+import { IMatch } from '../../../base/common/filters.js';
+import { IItemAccessor } from '../../../base/common/fuzzyScorer.js';
+import { ResolvedKeybinding } from '../../../base/common/keybindings.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { Schemas } from '../../../base/common/network.js';
+import Severity from '../../../base/common/severity.js';
+import { URI } from '../../../base/common/uri.js';
+import { IMarkdownString } from '../../../base/common/htmlContent.js';
 
 export interface IQuickPickItemHighlights {
 	label?: IMatch[];
@@ -81,6 +81,11 @@ export interface IPickOptions<T extends IQuickPickItem> {
 	 */
 	title?: string;
 
+	/**
+	 * the value to prefill in the input box
+	 */
+	value?: string;
+
 	/**
 	 * an optional string to show as placeholder in the input box to guide the user what she picks on
 	 */
@@ -418,7 +423,7 @@ export enum QuickPickFocus {
 /**
  * Represents a quick pick control that allows the user to select an item from a list of options.
  */
-export interface IQuickPick<T extends IQuickPickItem> extends IQuickInput {
+export interface IQuickPick<T extends IQuickPickItem, O extends { useSeparators: boolean } = { useSeparators: false }> extends IQuickInput {
 
 	/**
 	 * The type of the quick input.
@@ -505,7 +510,7 @@ export interface IQuickPick<T extends IQuickPickItem> extends IQuickInput {
 	/**
 	 * The items to be displayed in the quick pick.
 	 */
-	items: ReadonlyArray<T | IQuickPickSeparator>;
+	items: O extends { useSeparators: true } ? ReadonlyArray<T | IQuickPickSeparator> : ReadonlyArray<T>;
 
 	/**
 	 * Whether multiple items can be selected. If so, checkboxes will be rendered.
@@ -705,6 +710,18 @@ export interface IInputBox extends IQuickInput {
 	severity: Severity;
 }
 
+export enum QuickInputButtonLocation {
+	/**
+	 * In the title bar.
+	 */
+	Title = 1,
+
+	/**
+	 * To the right of the input box.
+	 */
+	Inline = 2
+}
+
 /**
  * Represents a button in the quick input UI.
  */
@@ -728,6 +745,11 @@ export interface IQuickInputButton {
 	 * By default, buttons are only visible when hovering over them with the mouse.
 	 */
 	alwaysVisible?: boolean;
+	/**
+	 * Where the button should be rendered. The default is {@link QuickInputButtonLocation.Title}.
+	 * @note This property is ignored if the button was added to a QuickPickItem.
+	 */
+	location?: QuickInputButtonLocation;
 }
 
 /**
@@ -854,7 +876,8 @@ export interface IQuickInputService {
 	/**
 	 * Provides raw access to the quick pick controller.
 	 */
-	createQuickPick<T extends IQuickPickItem>(): IQuickPick<T>;
+	createQuickPick<T extends IQuickPickItem>(options: { useSeparators: true }): IQuickPick<T, { useSeparators: true }>;
+	createQuickPick<T extends IQuickPickItem>(options?: { useSeparators: boolean }): IQuickPick<T, { useSeparators: false }>;
 
 	/**
 	 * Provides raw access to the input box controller.
diff --git a/src/vs/platform/quickinput/test/browser/quickinput.test.ts b/src/vs/platform/quickinput/test/browser/quickinput.test.ts
index 328c43d72fb..f33759e20e3 100644
--- a/src/vs/platform/quickinput/test/browser/quickinput.test.ts
+++ b/src/vs/platform/quickinput/test/browser/quickinput.test.ts
@@ -4,36 +4,36 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { unthemedInboxStyles } from 'vs/base/browser/ui/inputbox/inputBox';
-import { unthemedButtonStyles } from 'vs/base/browser/ui/button/button';
-import { unthemedListStyles } from 'vs/base/browser/ui/list/listWidget';
-import { unthemedToggleStyles } from 'vs/base/browser/ui/toggle/toggle';
-import { Event } from 'vs/base/common/event';
-import { raceTimeout } from 'vs/base/common/async';
-import { unthemedCountStyles } from 'vs/base/browser/ui/countBadge/countBadge';
-import { unthemedKeybindingLabelOptions } from 'vs/base/browser/ui/keybindingLabel/keybindingLabel';
-import { unthemedProgressBarOptions } from 'vs/base/browser/ui/progressbar/progressbar';
-import { QuickInputController } from 'vs/platform/quickinput/browser/quickInputController';
-import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { toDisposable } from 'vs/base/common/lifecycle';
-import { mainWindow } from 'vs/base/browser/window';
-import { QuickPick } from 'vs/platform/quickinput/browser/quickInput';
-import { IQuickPickItem, ItemActivation } from 'vs/platform/quickinput/common/quickInput';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
-import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IListService, ListService } from 'vs/platform/list/browser/listService';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ContextKeyService } from 'vs/platform/contextkey/browser/contextKeyService';
-import { NoMatchingKb } from 'vs/platform/keybinding/common/keybindingResolver';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ContextViewService } from 'vs/platform/contextview/browser/contextViewService';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { TestAccessibilityService } from 'vs/platform/accessibility/test/common/testAccessibilityService';
+import { unthemedInboxStyles } from '../../../../base/browser/ui/inputbox/inputBox.js';
+import { unthemedButtonStyles } from '../../../../base/browser/ui/button/button.js';
+import { unthemedListStyles } from '../../../../base/browser/ui/list/listWidget.js';
+import { unthemedToggleStyles } from '../../../../base/browser/ui/toggle/toggle.js';
+import { Event } from '../../../../base/common/event.js';
+import { raceTimeout } from '../../../../base/common/async.js';
+import { unthemedCountStyles } from '../../../../base/browser/ui/countBadge/countBadge.js';
+import { unthemedKeybindingLabelOptions } from '../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
+import { unthemedProgressBarOptions } from '../../../../base/browser/ui/progressbar/progressbar.js';
+import { QuickInputController } from '../../browser/quickInputController.js';
+import { TestThemeService } from '../../../theme/test/common/testThemeService.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { toDisposable } from '../../../../base/common/lifecycle.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { QuickPick } from '../../browser/quickInput.js';
+import { IQuickPickItem, ItemActivation } from '../../common/quickInput.js';
+import { TestInstantiationService } from '../../../instantiation/test/common/instantiationServiceMock.js';
+import { IThemeService } from '../../../theme/common/themeService.js';
+import { IConfigurationService } from '../../../configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../configuration/test/common/testConfigurationService.js';
+import { ILayoutService } from '../../../layout/browser/layoutService.js';
+import { IContextViewService } from '../../../contextview/browser/contextView.js';
+import { IListService, ListService } from '../../../list/browser/listService.js';
+import { IContextKeyService } from '../../../contextkey/common/contextkey.js';
+import { ContextKeyService } from '../../../contextkey/browser/contextKeyService.js';
+import { NoMatchingKb } from '../../../keybinding/common/keybindingResolver.js';
+import { IKeybindingService } from '../../../keybinding/common/keybinding.js';
+import { ContextViewService } from '../../../contextview/browser/contextViewService.js';
+import { IAccessibilityService } from '../../../accessibility/common/accessibility.js';
+import { TestAccessibilityService } from '../../../accessibility/test/common/testAccessibilityService.js';
 
 // Sets up an `onShow` listener to allow us to wait until the quick pick is shown (useful when triggering an `accept()` right after launching a quick pick)
 // kick this off before you launch the picker and then await the promise returned after you launch the picker.
diff --git a/src/vs/platform/registry/common/platform.ts b/src/vs/platform/registry/common/platform.ts
index 99ef2e35a37..b4a9bdd775e 100644
--- a/src/vs/platform/registry/common/platform.ts
+++ b/src/vs/platform/registry/common/platform.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as Assert from 'vs/base/common/assert';
-import * as Types from 'vs/base/common/types';
+import * as Assert from '../../../base/common/assert.js';
+import * as Types from '../../../base/common/types.js';
 
 export interface IRegistry {
 
diff --git a/src/vs/platform/registry/test/common/platform.test.ts b/src/vs/platform/registry/test/common/platform.test.ts
index 8ec965d503b..8724f574906 100644
--- a/src/vs/platform/registry/test/common/platform.test.ts
+++ b/src/vs/platform/registry/test/common/platform.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { isFunction } from 'vs/base/common/types';
-import { Registry } from 'vs/platform/registry/common/platform';
+import { isFunction } from '../../../../base/common/types.js';
+import { Registry } from '../../common/platform.js';
 
 suite('Platform / Registry', () => {
 
diff --git a/src/vs/platform/remote/browser/browserSocketFactory.ts b/src/vs/platform/remote/browser/browserSocketFactory.ts
index e8d40cb8ecc..7aea766301a 100644
--- a/src/vs/platform/remote/browser/browserSocketFactory.ts
+++ b/src/vs/platform/remote/browser/browserSocketFactory.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { ISocket, SocketCloseEvent, SocketCloseEventType, SocketDiagnostics, SocketDiagnosticsEventType } from 'vs/base/parts/ipc/common/ipc.net';
-import { ISocketFactory } from 'vs/platform/remote/common/remoteSocketFactoryService';
-import { RemoteAuthorityResolverError, RemoteAuthorityResolverErrorCode, RemoteConnectionType, WebSocketRemoteConnection } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { mainWindow } from 'vs/base/browser/window';
+import * as dom from '../../../base/browser/dom.js';
+import { RunOnceScheduler } from '../../../base/common/async.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../base/common/lifecycle.js';
+import { ISocket, SocketCloseEvent, SocketCloseEventType, SocketDiagnostics, SocketDiagnosticsEventType } from '../../../base/parts/ipc/common/ipc.net.js';
+import { ISocketFactory } from '../common/remoteSocketFactoryService.js';
+import { RemoteAuthorityResolverError, RemoteAuthorityResolverErrorCode, RemoteConnectionType, WebSocketRemoteConnection } from '../common/remoteAuthorityResolver.js';
+import { mainWindow } from '../../../base/browser/window.js';
 
 export interface IWebSocketFactory {
 	create(url: string, debugLabel: string): IWebSocket;
diff --git a/src/vs/platform/remote/browser/remoteAuthorityResolverService.ts b/src/vs/platform/remote/browser/remoteAuthorityResolverService.ts
index 8b85c237151..ca6361ffa60 100644
--- a/src/vs/platform/remote/browser/remoteAuthorityResolverService.ts
+++ b/src/vs/platform/remote/browser/remoteAuthorityResolverService.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { mainWindow } from 'vs/base/browser/window';
-import { DeferredPromise } from 'vs/base/common/async';
-import * as errors from 'vs/base/common/errors';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { RemoteAuthorities } from 'vs/base/common/network';
-import * as performance from 'vs/base/common/performance';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { URI } from 'vs/base/common/uri';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IRemoteAuthorityResolverService, IRemoteConnectionData, RemoteConnectionType, ResolvedAuthority, ResolvedOptions, ResolverResult, WebSocketRemoteConnection, getRemoteAuthorityPrefix } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { parseAuthorityWithOptionalPort } from 'vs/platform/remote/common/remoteHosts';
+import { mainWindow } from '../../../base/browser/window.js';
+import { DeferredPromise } from '../../../base/common/async.js';
+import * as errors from '../../../base/common/errors.js';
+import { Emitter } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { RemoteAuthorities } from '../../../base/common/network.js';
+import * as performance from '../../../base/common/performance.js';
+import { StopWatch } from '../../../base/common/stopwatch.js';
+import { URI } from '../../../base/common/uri.js';
+import { ILogService } from '../../log/common/log.js';
+import { IProductService } from '../../product/common/productService.js';
+import { IRemoteAuthorityResolverService, IRemoteConnectionData, RemoteConnectionType, ResolvedAuthority, ResolvedOptions, ResolverResult, WebSocketRemoteConnection, getRemoteAuthorityPrefix } from '../common/remoteAuthorityResolver.js';
+import { parseAuthorityWithOptionalPort } from '../common/remoteHosts.js';
 
 export class RemoteAuthorityResolverService extends Disposable implements IRemoteAuthorityResolverService {
 
diff --git a/src/vs/platform/remote/common/electronRemoteResources.ts b/src/vs/platform/remote/common/electronRemoteResources.ts
index a5d2f372251..e8e0fa86892 100644
--- a/src/vs/platform/remote/common/electronRemoteResources.ts
+++ b/src/vs/platform/remote/common/electronRemoteResources.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { UriComponents } from 'vs/base/common/uri';
-import { Client, IClientRouter, IConnectionHub } from 'vs/base/parts/ipc/common/ipc';
+import { UriComponents } from '../../../base/common/uri.js';
+import { Client, IClientRouter, IConnectionHub } from '../../../base/parts/ipc/common/ipc.js';
 
 export const NODE_REMOTE_RESOURCE_IPC_METHOD_NAME = 'request';
 
diff --git a/src/vs/platform/remote/common/managedSocket.ts b/src/vs/platform/remote/common/managedSocket.ts
index 0f55617264d..d5d6ba7516d 100644
--- a/src/vs/platform/remote/common/managedSocket.ts
+++ b/src/vs/platform/remote/common/managedSocket.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer, encodeBase64 } from 'vs/base/common/buffer';
-import { Emitter, Event, PauseableEmitter } from 'vs/base/common/event';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { ISocket, SocketCloseEvent, SocketDiagnostics, SocketDiagnosticsEventType } from 'vs/base/parts/ipc/common/ipc.net';
+import { VSBuffer, encodeBase64 } from '../../../base/common/buffer.js';
+import { Emitter, Event, PauseableEmitter } from '../../../base/common/event.js';
+import { Disposable, DisposableStore } from '../../../base/common/lifecycle.js';
+import { ISocket, SocketCloseEvent, SocketDiagnostics, SocketDiagnosticsEventType } from '../../../base/parts/ipc/common/ipc.net.js';
 
 export const makeRawSocketHeaders = (path: string, query: string, deubgLabel: string) => {
 	// https://tools.ietf.org/html/rfc6455#section-4
diff --git a/src/vs/platform/remote/common/remoteAgentConnection.ts b/src/vs/platform/remote/common/remoteAgentConnection.ts
index 45ebbe8df04..e89c0076878 100644
--- a/src/vs/platform/remote/common/remoteAgentConnection.ts
+++ b/src/vs/platform/remote/common/remoteAgentConnection.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancelablePromise, createCancelablePromise, promiseWithResolvers } from 'vs/base/common/async';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { isCancellationError, onUnexpectedError } from 'vs/base/common/errors';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { RemoteAuthorities } from 'vs/base/common/network';
-import * as performance from 'vs/base/common/performance';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { generateUuid } from 'vs/base/common/uuid';
-import { IIPCLogger } from 'vs/base/parts/ipc/common/ipc';
-import { Client, ISocket, PersistentProtocol, SocketCloseEventType } from 'vs/base/parts/ipc/common/ipc.net';
-import { ILogService } from 'vs/platform/log/common/log';
-import { RemoteAgentConnectionContext } from 'vs/platform/remote/common/remoteAgentEnvironment';
-import { RemoteAuthorityResolverError, RemoteConnection } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { IRemoteSocketFactoryService } from 'vs/platform/remote/common/remoteSocketFactoryService';
-import { ISignService } from 'vs/platform/sign/common/sign';
+import { CancelablePromise, createCancelablePromise, promiseWithResolvers } from '../../../base/common/async.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { CancellationToken, CancellationTokenSource } from '../../../base/common/cancellation.js';
+import { isCancellationError, onUnexpectedError } from '../../../base/common/errors.js';
+import { Emitter } from '../../../base/common/event.js';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { RemoteAuthorities } from '../../../base/common/network.js';
+import * as performance from '../../../base/common/performance.js';
+import { StopWatch } from '../../../base/common/stopwatch.js';
+import { generateUuid } from '../../../base/common/uuid.js';
+import { IIPCLogger } from '../../../base/parts/ipc/common/ipc.js';
+import { Client, ISocket, PersistentProtocol, SocketCloseEventType } from '../../../base/parts/ipc/common/ipc.net.js';
+import { ILogService } from '../../log/common/log.js';
+import { RemoteAgentConnectionContext } from './remoteAgentEnvironment.js';
+import { RemoteAuthorityResolverError, RemoteConnection } from './remoteAuthorityResolver.js';
+import { IRemoteSocketFactoryService } from './remoteSocketFactoryService.js';
+import { ISignService } from '../../sign/common/sign.js';
 
 const RECONNECT_TIMEOUT = 30 * 1000 /* 30s */;
 
diff --git a/src/vs/platform/remote/common/remoteAgentEnvironment.ts b/src/vs/platform/remote/common/remoteAgentEnvironment.ts
index de9a7559ad1..e56ea739e64 100644
--- a/src/vs/platform/remote/common/remoteAgentEnvironment.ts
+++ b/src/vs/platform/remote/common/remoteAgentEnvironment.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as performance from 'vs/base/common/performance';
-import { OperatingSystem } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { IUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
+import * as performance from '../../../base/common/performance.js';
+import { OperatingSystem } from '../../../base/common/platform.js';
+import { URI } from '../../../base/common/uri.js';
+import { IUserDataProfile } from '../../userDataProfile/common/userDataProfile.js';
 
 export interface IRemoteAgentEnvironment {
 	pid: number;
diff --git a/src/vs/platform/remote/common/remoteAuthorityResolver.ts b/src/vs/platform/remote/common/remoteAuthorityResolver.ts
index 14aa2b1a256..938bbd80c48 100644
--- a/src/vs/platform/remote/common/remoteAuthorityResolver.ts
+++ b/src/vs/platform/remote/common/remoteAuthorityResolver.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ErrorNoTelemetry } from 'vs/base/common/errors';
-import { Event } from 'vs/base/common/event';
-import { URI } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { ErrorNoTelemetry } from '../../../base/common/errors.js';
+import { Event } from '../../../base/common/event.js';
+import { URI } from '../../../base/common/uri.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 export const IRemoteAuthorityResolverService = createDecorator<IRemoteAuthorityResolverService>('remoteAuthorityResolverService');
 
diff --git a/src/vs/platform/remote/common/remoteExtensionsScanner.ts b/src/vs/platform/remote/common/remoteExtensionsScanner.ts
index a26de9d171b..10959aad509 100644
--- a/src/vs/platform/remote/common/remoteExtensionsScanner.ts
+++ b/src/vs/platform/remote/common/remoteExtensionsScanner.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { IExtensionDescription } from '../../extensions/common/extensions.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 export const IRemoteExtensionsScannerService = createDecorator<IRemoteExtensionsScannerService>('IRemoteExtensionsScannerService');
 
diff --git a/src/vs/platform/remote/common/remoteHosts.ts b/src/vs/platform/remote/common/remoteHosts.ts
index ccf58f9accb..9583e30f1f0 100644
--- a/src/vs/platform/remote/common/remoteHosts.ts
+++ b/src/vs/platform/remote/common/remoteHosts.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
+import { Schemas } from '../../../base/common/network.js';
+import { URI } from '../../../base/common/uri.js';
 
 export function getRemoteAuthority(uri: URI): string | undefined {
 	return uri.scheme === Schemas.vscodeRemote ? uri.authority : undefined;
diff --git a/src/vs/platform/remote/common/remoteSocketFactoryService.ts b/src/vs/platform/remote/common/remoteSocketFactoryService.ts
index 6d6eacfc854..4c07701d623 100644
--- a/src/vs/platform/remote/common/remoteSocketFactoryService.ts
+++ b/src/vs/platform/remote/common/remoteSocketFactoryService.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { ISocket } from 'vs/base/parts/ipc/common/ipc.net';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { RemoteConnectionOfType, RemoteConnectionType, RemoteConnection } from 'vs/platform/remote/common/remoteAuthorityResolver';
+import { IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { ISocket } from '../../../base/parts/ipc/common/ipc.net.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { RemoteConnectionOfType, RemoteConnectionType, RemoteConnection } from './remoteAuthorityResolver.js';
 
 export const IRemoteSocketFactoryService = createDecorator<IRemoteSocketFactoryService>('remoteSocketFactoryService');
 
diff --git a/src/vs/platform/remote/common/sharedProcessTunnelService.ts b/src/vs/platform/remote/common/sharedProcessTunnelService.ts
index 2062f774c8a..3b676c9ccf8 100644
--- a/src/vs/platform/remote/common/sharedProcessTunnelService.ts
+++ b/src/vs/platform/remote/common/sharedProcessTunnelService.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IAddress } from 'vs/platform/remote/common/remoteAgentConnection';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { IAddress } from './remoteAgentConnection.js';
 
 export const ISharedProcessTunnelService = createDecorator<ISharedProcessTunnelService>('sharedProcessTunnelService');
 
diff --git a/src/vs/platform/remote/electron-sandbox/electronRemoteResourceLoader.ts b/src/vs/platform/remote/electron-sandbox/electronRemoteResourceLoader.ts
index 3462f2a0017..e57d0122a52 100644
--- a/src/vs/platform/remote/electron-sandbox/electronRemoteResourceLoader.ts
+++ b/src/vs/platform/remote/electron-sandbox/electronRemoteResourceLoader.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer, encodeBase64 } from 'vs/base/common/buffer';
-import { Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { getMediaOrTextMime } from 'vs/base/common/mime';
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { IServerChannel } from 'vs/base/parts/ipc/common/ipc';
-import { FileOperationError, FileOperationResult, IFileContent, IFileService } from 'vs/platform/files/common/files';
-import { IMainProcessService } from 'vs/platform/ipc/common/mainProcessService';
-import { NODE_REMOTE_RESOURCE_CHANNEL_NAME, NODE_REMOTE_RESOURCE_IPC_METHOD_NAME, NodeRemoteResourceResponse } from 'vs/platform/remote/common/electronRemoteResources';
+import { VSBuffer, encodeBase64 } from '../../../base/common/buffer.js';
+import { Event } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { getMediaOrTextMime } from '../../../base/common/mime.js';
+import { Schemas } from '../../../base/common/network.js';
+import { URI } from '../../../base/common/uri.js';
+import { IServerChannel } from '../../../base/parts/ipc/common/ipc.js';
+import { FileOperationError, FileOperationResult, IFileContent, IFileService } from '../../files/common/files.js';
+import { IMainProcessService } from '../../ipc/common/mainProcessService.js';
+import { NODE_REMOTE_RESOURCE_CHANNEL_NAME, NODE_REMOTE_RESOURCE_IPC_METHOD_NAME, NodeRemoteResourceResponse } from '../common/electronRemoteResources.js';
 
 export class ElectronRemoteResourceLoader extends Disposable {
 	constructor(
diff --git a/src/vs/platform/remote/electron-sandbox/remoteAuthorityResolverService.ts b/src/vs/platform/remote/electron-sandbox/remoteAuthorityResolverService.ts
index 9948495f898..99157f24fa6 100644
--- a/src/vs/platform/remote/electron-sandbox/remoteAuthorityResolverService.ts
+++ b/src/vs/platform/remote/electron-sandbox/remoteAuthorityResolverService.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 //
-import { DeferredPromise } from 'vs/base/common/async';
-import * as errors from 'vs/base/common/errors';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { RemoteAuthorities } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IRemoteAuthorityResolverService, IRemoteConnectionData, RemoteConnectionType, ResolvedAuthority, ResolvedOptions, ResolverResult } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { ElectronRemoteResourceLoader } from 'vs/platform/remote/electron-sandbox/electronRemoteResourceLoader';
+import { DeferredPromise } from '../../../base/common/async.js';
+import * as errors from '../../../base/common/errors.js';
+import { Emitter } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { RemoteAuthorities } from '../../../base/common/network.js';
+import { URI } from '../../../base/common/uri.js';
+import { IProductService } from '../../product/common/productService.js';
+import { IRemoteAuthorityResolverService, IRemoteConnectionData, RemoteConnectionType, ResolvedAuthority, ResolvedOptions, ResolverResult } from '../common/remoteAuthorityResolver.js';
+import { ElectronRemoteResourceLoader } from './electronRemoteResourceLoader.js';
 
 export class RemoteAuthorityResolverService extends Disposable implements IRemoteAuthorityResolverService {
 
diff --git a/src/vs/platform/remote/electron-sandbox/sharedProcessTunnelService.ts b/src/vs/platform/remote/electron-sandbox/sharedProcessTunnelService.ts
index 725b03005c9..81c04b34fcb 100644
--- a/src/vs/platform/remote/electron-sandbox/sharedProcessTunnelService.ts
+++ b/src/vs/platform/remote/electron-sandbox/sharedProcessTunnelService.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { registerSharedProcessRemoteService } from 'vs/platform/ipc/electron-sandbox/services';
-import { ISharedProcessTunnelService, ipcSharedProcessTunnelChannelName } from 'vs/platform/remote/common/sharedProcessTunnelService';
+import { registerSharedProcessRemoteService } from '../../ipc/electron-sandbox/services.js';
+import { ISharedProcessTunnelService, ipcSharedProcessTunnelChannelName } from '../common/sharedProcessTunnelService.js';
 
 registerSharedProcessRemoteService(ISharedProcessTunnelService, ipcSharedProcessTunnelChannelName);
diff --git a/src/vs/platform/remote/node/nodeSocketFactory.ts b/src/vs/platform/remote/node/nodeSocketFactory.ts
index 4641791946a..4ed634e3d96 100644
--- a/src/vs/platform/remote/node/nodeSocketFactory.ts
+++ b/src/vs/platform/remote/node/nodeSocketFactory.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as net from 'net';
-import { ISocket } from 'vs/base/parts/ipc/common/ipc.net';
-import { NodeSocket } from 'vs/base/parts/ipc/node/ipc.net';
-import { makeRawSocketHeaders } from 'vs/platform/remote/common/managedSocket';
-import { RemoteConnectionType, WebSocketRemoteConnection } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { ISocketFactory } from 'vs/platform/remote/common/remoteSocketFactoryService';
+import { ISocket } from '../../../base/parts/ipc/common/ipc.net.js';
+import { NodeSocket } from '../../../base/parts/ipc/node/ipc.net.js';
+import { makeRawSocketHeaders } from '../common/managedSocket.js';
+import { RemoteConnectionType, WebSocketRemoteConnection } from '../common/remoteAuthorityResolver.js';
+import { ISocketFactory } from '../common/remoteSocketFactoryService.js';
 
 export const nodeSocketFactory = new class implements ISocketFactory<RemoteConnectionType.WebSocket> {
 
diff --git a/src/vs/platform/remote/node/wsl.ts b/src/vs/platform/remote/node/wsl.ts
index 3ba33f74b96..637ccff4fb0 100644
--- a/src/vs/platform/remote/node/wsl.ts
+++ b/src/vs/platform/remote/node/wsl.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as fs from 'fs';
 import * as os from 'os';
 import * as cp from 'child_process';
-import { Promises } from 'vs/base/node/pfs';
 import * as path from 'path';
 
 let hasWSLFeaturePromise: Promise<boolean> | undefined;
@@ -26,14 +26,18 @@ async function testWSLFeatureInstalled(): Promise<boolean> {
 		const wslExePath = getWSLExecutablePath();
 		if (wslExePath) {
 			return new Promise<boolean>(s => {
-				cp.execFile(wslExePath, ['--status'], err => s(!err));
+				try {
+					cp.execFile(wslExePath, ['--status'], err => s(!err));
+				} catch (e) {
+					s(false);
+				}
 			});
 		}
 	} else {
 		const dllPath = getLxssManagerDllPath();
 		if (dllPath) {
 			try {
-				if ((await Promises.stat(dllPath)).isFile()) {
+				if ((await fs.promises.stat(dllPath)).isFile()) {
 					return true;
 				}
 			} catch (e) {
diff --git a/src/vs/platform/remote/test/common/remoteHosts.test.ts b/src/vs/platform/remote/test/common/remoteHosts.test.ts
index ed564551df9..4fe2f34e7b8 100644
--- a/src/vs/platform/remote/test/common/remoteHosts.test.ts
+++ b/src/vs/platform/remote/test/common/remoteHosts.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { parseAuthorityWithOptionalPort, parseAuthorityWithPort } from 'vs/platform/remote/common/remoteHosts';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { parseAuthorityWithOptionalPort, parseAuthorityWithPort } from '../../common/remoteHosts.js';
 
 suite('remoteHosts', () => {
 
diff --git a/src/vs/platform/remote/test/electron-sandbox/remoteAuthorityResolverService.test.ts b/src/vs/platform/remote/test/electron-sandbox/remoteAuthorityResolverService.test.ts
index 67790a807c6..ebf023ac49c 100644
--- a/src/vs/platform/remote/test/electron-sandbox/remoteAuthorityResolverService.test.ts
+++ b/src/vs/platform/remote/test/electron-sandbox/remoteAuthorityResolverService.test.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import product from 'vs/platform/product/common/product';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { RemoteAuthorityResolverError, RemoteAuthorityResolverErrorCode } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { RemoteAuthorityResolverService } from 'vs/platform/remote/electron-sandbox/remoteAuthorityResolverService';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import product from '../../../product/common/product.js';
+import { IProductService } from '../../../product/common/productService.js';
+import { RemoteAuthorityResolverError, RemoteAuthorityResolverErrorCode } from '../../common/remoteAuthorityResolver.js';
+import { RemoteAuthorityResolverService } from '../../electron-sandbox/remoteAuthorityResolverService.js';
 
 suite('RemoteAuthorityResolverService', () => {
 
diff --git a/src/vs/platform/remoteTunnel/common/remoteTunnel.ts b/src/vs/platform/remoteTunnel/common/remoteTunnel.ts
index d50077ee508..1d25eccd524 100644
--- a/src/vs/platform/remoteTunnel/common/remoteTunnel.ts
+++ b/src/vs/platform/remoteTunnel/common/remoteTunnel.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { Event } from 'vs/base/common/event';
-import { localize } from 'vs/nls';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { Event } from '../../../base/common/event.js';
+import { localize } from '../../../nls.js';
 
 export interface IRemoteTunnelSession {
 	readonly providerId: string;
diff --git a/src/vs/platform/remoteTunnel/electron-sandbox/remoteTunnelService.ts b/src/vs/platform/remoteTunnel/electron-sandbox/remoteTunnelService.ts
index 4d626c9de47..7aa3657e2a5 100644
--- a/src/vs/platform/remoteTunnel/electron-sandbox/remoteTunnelService.ts
+++ b/src/vs/platform/remoteTunnel/electron-sandbox/remoteTunnelService.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { registerSharedProcessRemoteService } from 'vs/platform/ipc/electron-sandbox/services';
-import { IRemoteTunnelService } from 'vs/platform/remoteTunnel/common/remoteTunnel';
+import { registerSharedProcessRemoteService } from '../../ipc/electron-sandbox/services.js';
+import { IRemoteTunnelService } from '../common/remoteTunnel.js';
 
 registerSharedProcessRemoteService(IRemoteTunnelService, 'remoteTunnel');
diff --git a/src/vs/platform/remoteTunnel/node/remoteTunnelService.ts b/src/vs/platform/remoteTunnel/node/remoteTunnelService.ts
index d0d433a33e6..6c3306c010f 100644
--- a/src/vs/platform/remoteTunnel/node/remoteTunnelService.ts
+++ b/src/vs/platform/remoteTunnel/node/remoteTunnelService.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CONFIGURATION_KEY_HOST_NAME, CONFIGURATION_KEY_PREVENT_SLEEP, ConnectionInfo, IRemoteTunnelSession, IRemoteTunnelService, LOGGER_NAME, LOG_ID, TunnelStates, TunnelStatus, TunnelMode, INACTIVE_TUNNEL_MODE, ActiveTunnelMode } from 'vs/platform/remoteTunnel/common/remoteTunnel';
-import { Emitter } from 'vs/base/common/event';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ILogger, ILoggerService, LogLevelToString } from 'vs/platform/log/common/log';
-import { dirname, join } from 'vs/base/common/path';
+import { CONFIGURATION_KEY_HOST_NAME, CONFIGURATION_KEY_PREVENT_SLEEP, ConnectionInfo, IRemoteTunnelSession, IRemoteTunnelService, LOGGER_NAME, LOG_ID, TunnelStates, TunnelStatus, TunnelMode, INACTIVE_TUNNEL_MODE, ActiveTunnelMode } from '../common/remoteTunnel.js';
+import { Emitter } from '../../../base/common/event.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
+import { INativeEnvironmentService } from '../../environment/common/environment.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { ILogger, ILoggerService, LogLevelToString } from '../../log/common/log.js';
+import { dirname, join } from '../../../base/common/path.js';
 import { ChildProcess, StdioOptions, spawn } from 'child_process';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { isMacintosh, isWindows } from 'vs/base/common/platform';
-import { CancelablePromise, createCancelablePromise, Delayer } from 'vs/base/common/async';
-import { ISharedProcessLifecycleService } from 'vs/platform/lifecycle/node/sharedProcessLifecycleService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { localize } from 'vs/nls';
+import { IProductService } from '../../product/common/productService.js';
+import { isMacintosh, isWindows } from '../../../base/common/platform.js';
+import { CancelablePromise, createCancelablePromise, Delayer } from '../../../base/common/async.js';
+import { ISharedProcessLifecycleService } from '../../lifecycle/node/sharedProcessLifecycleService.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { localize } from '../../../nls.js';
 import { hostname, homedir } from 'os';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { isString } from 'vs/base/common/types';
-import { StreamSplitter } from 'vs/base/node/nodeStreams';
-import { joinPath } from 'vs/base/common/resources';
+import { IStorageService, StorageScope, StorageTarget } from '../../storage/common/storage.js';
+import { isString } from '../../../base/common/types.js';
+import { StreamSplitter } from '../../../base/node/nodeStreams.js';
+import { joinPath } from '../../../base/common/resources.js';
 
 type RemoteTunnelEnablementClassification = {
 	owner: 'aeschli';
diff --git a/src/vs/platform/request/browser/requestService.ts b/src/vs/platform/request/browser/requestService.ts
deleted file mode 100644
index f0fc3d68790..00000000000
--- a/src/vs/platform/request/browser/requestService.ts
+++ /dev/null
@@ -1,42 +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 { CancellationToken } from 'vs/base/common/cancellation';
-import { request } from 'vs/base/parts/request/browser/request';
-import { IRequestContext, IRequestOptions } from 'vs/base/parts/request/common/request';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ILoggerService } from 'vs/platform/log/common/log';
-import { AbstractRequestService, IRequestService } from 'vs/platform/request/common/request';
-
-/**
- * This service exposes the `request` API, while using the global
- * or configured proxy settings.
- */
-export class RequestService extends AbstractRequestService implements IRequestService {
-
-	declare readonly _serviceBrand: undefined;
-
-	constructor(
-		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@ILoggerService loggerService: ILoggerService
-	) {
-		super(loggerService);
-	}
-
-	async request(options: IRequestOptions, token: CancellationToken): Promise<IRequestContext> {
-		if (!options.proxyAuthorization) {
-			options.proxyAuthorization = this.configurationService.getValue<string>('http.proxyAuthorization');
-		}
-		return this.logAndRequest('browser', options, () => request(options, token));
-	}
-
-	async resolveProxy(url: string): Promise<string | undefined> {
-		return undefined; // not implemented in the web
-	}
-
-	async loadCertificates(): Promise<string[]> {
-		return []; // not implemented in the web
-	}
-}
diff --git a/src/vs/platform/request/common/request.ts b/src/vs/platform/request/common/request.ts
index 289ad6740e0..d012d8ed0cb 100644
--- a/src/vs/platform/request/common/request.ts
+++ b/src/vs/platform/request/common/request.ts
@@ -3,25 +3,41 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { streamToBuffer } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { getErrorMessage } from 'vs/base/common/errors';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IHeaders, IRequestContext, IRequestOptions } from 'vs/base/parts/request/common/request';
-import { localize } from 'vs/nls';
-import { ConfigurationScope, Extensions, IConfigurationNode, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { CONTEXT_LOG_LEVEL, ILogger, ILoggerService, LogLevel, LogLevelToString } from 'vs/platform/log/common/log';
-import { Registry } from 'vs/platform/registry/common/platform';
+import { streamToBuffer } from '../../../base/common/buffer.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { getErrorMessage } from '../../../base/common/errors.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { IHeaders, IRequestContext, IRequestOptions } from '../../../base/parts/request/common/request.js';
+import { localize } from '../../../nls.js';
+import { ConfigurationScope, Extensions, IConfigurationNode, IConfigurationRegistry } from '../../configuration/common/configurationRegistry.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { ILogService } from '../../log/common/log.js';
+import { Registry } from '../../registry/common/platform.js';
 
 export const IRequestService = createDecorator<IRequestService>('requestService');
 
+export interface AuthInfo {
+	isProxy: boolean;
+	scheme: string;
+	host: string;
+	port: number;
+	realm: string;
+	attempt: number;
+}
+
+export interface Credentials {
+	username: string;
+	password: string;
+}
+
 export interface IRequestService {
 	readonly _serviceBrand: undefined;
 
 	request(options: IRequestOptions, token: CancellationToken): Promise<IRequestContext>;
 
 	resolveProxy(url: string): Promise<string | undefined>;
+	lookupAuthorization(authInfo: AuthInfo): Promise<Credentials | undefined>;
+	lookupKerberosAuthorization(url: string): Promise<string | undefined>;
 	loadCertificates(): Promise<string[]>;
 }
 
@@ -52,34 +68,29 @@ export abstract class AbstractRequestService extends Disposable implements IRequ
 
 	declare readonly _serviceBrand: undefined;
 
-	protected readonly logger: ILogger;
 	private counter = 0;
 
-	constructor(
-		loggerService: ILoggerService
-	) {
+	constructor(protected readonly logService: ILogService) {
 		super();
-		this.logger = loggerService.createLogger('network', {
-			name: localize('request', "Network Requests"),
-			when: CONTEXT_LOG_LEVEL.isEqualTo(LogLevelToString(LogLevel.Trace)).serialize()
-		});
 	}
 
-	protected async logAndRequest(stack: string, options: IRequestOptions, request: () => Promise<IRequestContext>): Promise<IRequestContext> {
-		const prefix = `${stack} #${++this.counter}: ${options.url}`;
-		this.logger.trace(`${prefix} - begin`, options.type, new LoggableHeaders(options.headers ?? {}));
+	protected async logAndRequest(options: IRequestOptions, request: () => Promise<IRequestContext>): Promise<IRequestContext> {
+		const prefix = `[network] #${++this.counter}: ${options.url}`;
+		this.logService.trace(`${prefix} - begin`, options.type, new LoggableHeaders(options.headers ?? {}));
 		try {
 			const result = await request();
-			this.logger.trace(`${prefix} - end`, options.type, result.res.statusCode, result.res.headers);
+			this.logService.trace(`${prefix} - end`, options.type, result.res.statusCode, result.res.headers);
 			return result;
 		} catch (error) {
-			this.logger.error(`${prefix} - error`, options.type, getErrorMessage(error));
+			this.logService.error(`${prefix} - error`, options.type, getErrorMessage(error));
 			throw error;
 		}
 	}
 
 	abstract request(options: IRequestOptions, token: CancellationToken): Promise<IRequestContext>;
 	abstract resolveProxy(url: string): Promise<string | undefined>;
+	abstract lookupAuthorization(authInfo: AuthInfo): Promise<Credentials | undefined>;
+	abstract lookupKerberosAuthorization(url: string): Promise<string | undefined>;
 	abstract loadCertificates(): Promise<string[]>;
 }
 
@@ -155,6 +166,12 @@ function registerProxyConfigurations(scope: ConfigurationScope): void {
 				markdownDescription: localize('proxyKerberosServicePrincipal', "Overrides the principal service name for Kerberos authentication with the HTTP proxy. A default based on the proxy hostname is used when this is not set."),
 				restricted: true
 			},
+			'http.noProxy': {
+				type: 'array',
+				items: { type: 'string' },
+				markdownDescription: localize('noProxy', "Specifies domain names for which proxy settings should be ignored for HTTP/HTTPS requests."),
+				restricted: true
+			},
 			'http.proxyAuthorization': {
 				type: ['null', 'string'],
 				default: null,
@@ -186,6 +203,12 @@ function registerProxyConfigurations(scope: ConfigurationScope): void {
 				default: false,
 				description: localize('systemCertificatesV2', "Controls whether experimental loading of CA certificates from the OS should be enabled. This uses a more general approach than the default implemenation."),
 				restricted: true
+			},
+			'http.electronFetch': {
+				type: 'boolean',
+				default: false,
+				description: localize('electronFetch', "Controls whether use of Electron's fetch implementation instead of Node.js' should be enabled. All local extensions will get Electron's fetch implementation for the global fetch API."),
+				restricted: true
 			}
 		}
 	};
diff --git a/src/vs/platform/request/common/requestIpc.ts b/src/vs/platform/request/common/requestIpc.ts
index 421106ebff6..0b3aff1a886 100644
--- a/src/vs/platform/request/common/requestIpc.ts
+++ b/src/vs/platform/request/common/requestIpc.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { bufferToStream, streamToBuffer, VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Event } from 'vs/base/common/event';
-import { IChannel, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
-import { IHeaders, IRequestContext, IRequestOptions } from 'vs/base/parts/request/common/request';
-import { IRequestService } from 'vs/platform/request/common/request';
+import { bufferToStream, streamToBuffer, VSBuffer } from '../../../base/common/buffer.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Event } from '../../../base/common/event.js';
+import { IChannel, IServerChannel } from '../../../base/parts/ipc/common/ipc.js';
+import { IHeaders, IRequestContext, IRequestOptions } from '../../../base/parts/request/common/request.js';
+import { AuthInfo, Credentials, IRequestService } from './request.js';
 
 type RequestResponse = [
 	{
@@ -34,6 +34,8 @@ export class RequestChannel implements IServerChannel {
 					return <RequestResponse>[{ statusCode: res.statusCode, headers: res.headers }, buffer];
 				});
 			case 'resolveProxy': return this.service.resolveProxy(args[0]);
+			case 'lookupAuthorization': return this.service.lookupAuthorization(args[0]);
+			case 'lookupKerberosAuthorization': return this.service.lookupKerberosAuthorization(args[0]);
 			case 'loadCertificates': return this.service.loadCertificates();
 		}
 		throw new Error('Invalid call');
@@ -55,6 +57,14 @@ export class RequestChannelClient implements IRequestService {
 		return this.channel.call<string | undefined>('resolveProxy', [url]);
 	}
 
+	async lookupAuthorization(authInfo: AuthInfo): Promise<Credentials | undefined> {
+		return this.channel.call<{ username: string; password: string } | undefined>('lookupAuthorization', [authInfo]);
+	}
+
+	async lookupKerberosAuthorization(url: string): Promise<string | undefined> {
+		return this.channel.call<string | undefined>('lookupKerberosAuthorization', [url]);
+	}
+
 	async loadCertificates(): Promise<string[]> {
 		return this.channel.call<string[]>('loadCertificates');
 	}
diff --git a/src/vs/platform/request/electron-main/requestMainService.ts b/src/vs/platform/request/electron-utility/requestService.ts
similarity index 74%
rename from src/vs/platform/request/electron-main/requestMainService.ts
rename to src/vs/platform/request/electron-utility/requestService.ts
index 7589efa675f..f92a2450c3e 100644
--- a/src/vs/platform/request/electron-main/requestMainService.ts
+++ b/src/vs/platform/request/electron-utility/requestService.ts
@@ -4,15 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { net } from 'electron';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IRequestContext, IRequestOptions } from 'vs/base/parts/request/common/request';
-import { IRawRequestFunction, RequestService as NodeRequestService } from 'vs/platform/request/node/requestService';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { IRequestContext, IRequestOptions } from '../../../base/parts/request/common/request.js';
+import { IRawRequestFunction, RequestService as NodeRequestService } from '../node/requestService.js';
 
 function getRawRequest(options: IRequestOptions): IRawRequestFunction {
 	return net.request as any as IRawRequestFunction;
 }
 
-export class RequestMainService extends NodeRequestService {
+export class RequestService extends NodeRequestService {
 
 	override request(options: IRequestOptions, token: CancellationToken): Promise<IRequestContext> {
 		return super.request({ ...(options || {}), getRawRequest, isChromiumNetwork: true }, token);
diff --git a/src/vs/platform/request/node/proxy.ts b/src/vs/platform/request/node/proxy.ts
index db448e06cc1..a87fb31a938 100644
--- a/src/vs/platform/request/node/proxy.ts
+++ b/src/vs/platform/request/node/proxy.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { parse as parseUrl, Url } from 'url';
-import { isBoolean } from 'vs/base/common/types';
+import { isBoolean } from '../../../base/common/types.js';
 
 export type Agent = any;
 
@@ -44,7 +44,11 @@ export async function getProxyAgent(rawRequestURL: string, env: typeof process.e
 		rejectUnauthorized: isBoolean(options.strictSSL) ? options.strictSSL : true,
 	};
 
-	return requestURL.protocol === 'http:'
-		? new (await import('http-proxy-agent')).HttpProxyAgent(proxyURL, opts)
-		: new (await import('https-proxy-agent')).HttpsProxyAgent(proxyURL, opts);
+	if (requestURL.protocol === 'http:') {
+		const { default: mod } = await import('http-proxy-agent');
+		return new mod.HttpProxyAgent(proxyURL, opts);
+	} else {
+		const { default: mod } = await import('https-proxy-agent');
+		return new mod.HttpsProxyAgent(proxyURL, opts);
+	}
 }
diff --git a/src/vs/platform/request/node/requestService.ts b/src/vs/platform/request/node/requestService.ts
index 23f8f0d44c8..010acda0546 100644
--- a/src/vs/platform/request/node/requestService.ts
+++ b/src/vs/platform/request/node/requestService.ts
@@ -6,19 +6,19 @@
 import * as http from 'http';
 import * as https from 'https';
 import { parse as parseUrl } from 'url';
-import { Promises } from 'vs/base/common/async';
-import { streamToBufferReadableStream } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { CancellationError, getErrorMessage } from 'vs/base/common/errors';
-import * as streams from 'vs/base/common/stream';
-import { isBoolean, isNumber } from 'vs/base/common/types';
-import { IRequestContext, IRequestOptions } from 'vs/base/parts/request/common/request';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-import { getResolvedShellEnv } from 'vs/platform/shell/node/shellEnv';
-import { ILogService, ILoggerService } from 'vs/platform/log/common/log';
-import { AbstractRequestService, IRequestService } from 'vs/platform/request/common/request';
-import { Agent, getProxyAgent } from 'vs/platform/request/node/proxy';
+import { Promises } from '../../../base/common/async.js';
+import { streamToBufferReadableStream } from '../../../base/common/buffer.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { CancellationError, getErrorMessage } from '../../../base/common/errors.js';
+import * as streams from '../../../base/common/stream.js';
+import { isBoolean, isNumber } from '../../../base/common/types.js';
+import { IRequestContext, IRequestOptions } from '../../../base/parts/request/common/request.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { INativeEnvironmentService } from '../../environment/common/environment.js';
+import { getResolvedShellEnv } from '../../shell/node/shellEnv.js';
+import { ILogService } from '../../log/common/log.js';
+import { AbstractRequestService, AuthInfo, Credentials, IRequestService } from '../common/request.js';
+import { Agent, getProxyAgent } from './proxy.js';
 import { createGunzip } from 'zlib';
 
 interface IHTTPConfiguration {
@@ -54,10 +54,9 @@ export class RequestService extends AbstractRequestService implements IRequestSe
 	constructor(
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@INativeEnvironmentService private readonly environmentService: INativeEnvironmentService,
-		@ILogService private readonly logService: ILogService,
-		@ILoggerService loggerService: ILoggerService
+		@ILogService logService: ILogService,
 	) {
-		super(loggerService);
+		super(logService);
 		this.configure();
 		this._register(configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration('http')) {
@@ -103,13 +102,33 @@ export class RequestService extends AbstractRequestService implements IRequestSe
 			};
 		}
 
-		return this.logAndRequest(options.isChromiumNetwork ? 'electron' : 'node', options, () => nodeRequest(options, token));
+		return this.logAndRequest(options, () => nodeRequest(options, token));
 	}
 
 	async resolveProxy(url: string): Promise<string | undefined> {
 		return undefined; // currently not implemented in node
 	}
 
+	async lookupAuthorization(authInfo: AuthInfo): Promise<Credentials | undefined> {
+		return undefined; // currently not implemented in node
+	}
+
+	async lookupKerberosAuthorization(urlStr: string): Promise<string | undefined> {
+		try {
+			const kerberos = await import('kerberos');
+			const url = new URL(urlStr);
+			const spn = this.configurationService.getValue<string>('http.proxyKerberosServicePrincipal')
+				|| (process.platform === 'win32' ? `HTTP/${url.hostname}` : `HTTP@${url.hostname}`);
+			this.logService.debug('RequestService#lookupKerberosAuthorization Kerberos authentication lookup', `proxyURL:${url}`, `spn:${spn}`);
+			const client = await kerberos.initializeClient(spn);
+			const response = await client.step('');
+			return 'Negotiate ' + response;
+		} catch (err) {
+			this.logService.debug('RequestService#lookupKerberosAuthorization Kerberos authentication failed', err);
+			return undefined;
+		}
+	}
+
 	async loadCertificates(): Promise<string[]> {
 		const proxyAgent = await import('@vscode/proxy-agent');
 		return proxyAgent.loadSystemCertificates({ log: this.logService });
@@ -165,7 +184,7 @@ export async function nodeRequest(options: NodeRequestOptions, token: Cancellati
 					stream = res.pipe(createGunzip());
 				}
 
-				resolve({ res, stream: streamToBufferReadableStream(stream) } as IRequestContext);
+				resolve({ res, stream: streamToBufferReadableStream(stream) } satisfies IRequestContext);
 			}
 		});
 
diff --git a/src/vs/platform/secrets/common/secrets.ts b/src/vs/platform/secrets/common/secrets.ts
index 7bba894a909..c13e030eeed 100644
--- a/src/vs/platform/secrets/common/secrets.ts
+++ b/src/vs/platform/secrets/common/secrets.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SequencerByKey } from 'vs/base/common/async';
-import { IEncryptionService } from 'vs/platform/encryption/common/encryptionService';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IStorageService, InMemoryStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { Emitter, Event } from 'vs/base/common/event';
-import { ILogService } from 'vs/platform/log/common/log';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { Lazy } from 'vs/base/common/lazy';
+import { SequencerByKey } from '../../../base/common/async.js';
+import { IEncryptionService } from '../../encryption/common/encryptionService.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { IStorageService, InMemoryStorageService, StorageScope, StorageTarget } from '../../storage/common/storage.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { ILogService } from '../../log/common/log.js';
+import { Disposable, DisposableStore } from '../../../base/common/lifecycle.js';
+import { Lazy } from '../../../base/common/lazy.js';
 
 export const ISecretStorageService = createDecorator<ISecretStorageService>('secretStorageService');
 
diff --git a/src/vs/platform/secrets/test/common/secrets.test.ts b/src/vs/platform/secrets/test/common/secrets.test.ts
index 50def3a9a92..e1603df791f 100644
--- a/src/vs/platform/secrets/test/common/secrets.test.ts
+++ b/src/vs/platform/secrets/test/common/secrets.test.ts
@@ -5,11 +5,11 @@
 
 import assert from 'assert';
 import * as sinon from 'sinon';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IEncryptionService, KnownStorageProvider } from 'vs/platform/encryption/common/encryptionService';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { BaseSecretStorageService } from 'vs/platform/secrets/common/secrets';
-import { InMemoryStorageService } from 'vs/platform/storage/common/storage';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { IEncryptionService, KnownStorageProvider } from '../../../encryption/common/encryptionService.js';
+import { NullLogService } from '../../../log/common/log.js';
+import { BaseSecretStorageService } from '../../common/secrets.js';
+import { InMemoryStorageService } from '../../../storage/common/storage.js';
 
 class TestEncryptionService implements IEncryptionService {
 	_serviceBrand: undefined;
diff --git a/src/vs/platform/severityIcon/browser/severityIcon.ts b/src/vs/platform/severityIcon/browser/severityIcon.ts
index 2ecb17404fb..73bfe9c2da1 100644
--- a/src/vs/platform/severityIcon/browser/severityIcon.ts
+++ b/src/vs/platform/severityIcon/browser/severityIcon.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/severityIcon';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import Severity from 'vs/base/common/severity';
+import './media/severityIcon.css';
+import { Codicon } from '../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../base/common/themables.js';
+import Severity from '../../../base/common/severity.js';
 
 export namespace SeverityIcon {
 
diff --git a/src/vs/platform/sharedProcess/electron-main/sharedProcess.ts b/src/vs/platform/sharedProcess/electron-main/sharedProcess.ts
index 5cb80e342cc..054f3b7419d 100644
--- a/src/vs/platform/sharedProcess/electron-main/sharedProcess.ts
+++ b/src/vs/platform/sharedProcess/electron-main/sharedProcess.ts
@@ -4,22 +4,22 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IpcMainEvent, MessagePortMain } from 'electron';
-import { validatedIpcMain } from 'vs/base/parts/ipc/electron-main/ipcMain';
-import { Barrier, DeferredPromise } from 'vs/base/common/async';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { IEnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
-import { ILifecycleMainService } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ISharedProcessConfiguration } from 'vs/platform/sharedProcess/node/sharedProcess';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IPolicyService } from 'vs/platform/policy/common/policy';
-import { ILoggerMainService } from 'vs/platform/log/electron-main/loggerService';
-import { UtilityProcess } from 'vs/platform/utilityProcess/electron-main/utilityProcess';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
-import { parseSharedProcessDebugPort } from 'vs/platform/environment/node/environmentService';
-import { assertIsDefined } from 'vs/base/common/types';
-import { SharedProcessChannelConnection, SharedProcessRawConnection, SharedProcessLifecycle } from 'vs/platform/sharedProcess/common/sharedProcess';
-import { Emitter } from 'vs/base/common/event';
+import { validatedIpcMain } from '../../../base/parts/ipc/electron-main/ipcMain.js';
+import { Barrier, DeferredPromise } from '../../../base/common/async.js';
+import { Disposable, IDisposable } from '../../../base/common/lifecycle.js';
+import { IEnvironmentMainService } from '../../environment/electron-main/environmentMainService.js';
+import { ILifecycleMainService } from '../../lifecycle/electron-main/lifecycleMainService.js';
+import { ILogService } from '../../log/common/log.js';
+import { ISharedProcessConfiguration } from '../node/sharedProcess.js';
+import { IUserDataProfilesService } from '../../userDataProfile/common/userDataProfile.js';
+import { IPolicyService } from '../../policy/common/policy.js';
+import { ILoggerMainService } from '../../log/electron-main/loggerService.js';
+import { UtilityProcess } from '../../utilityProcess/electron-main/utilityProcess.js';
+import { NullTelemetryService } from '../../telemetry/common/telemetryUtils.js';
+import { parseSharedProcessDebugPort } from '../../environment/node/environmentService.js';
+import { assertIsDefined } from '../../../base/common/types.js';
+import { SharedProcessChannelConnection, SharedProcessRawConnection, SharedProcessLifecycle } from '../common/sharedProcess.js';
+import { Emitter } from '../../../base/common/event.js';
 
 export class SharedProcess extends Disposable {
 
@@ -169,8 +169,9 @@ export class SharedProcess extends Disposable {
 
 		this.utilityProcess.start({
 			type: 'shared-process',
-			entryPoint: 'vs/code/node/sharedProcess/sharedProcessMain',
+			entryPoint: 'vs/code/electron-utility/sharedProcess/sharedProcessMain',
 			payload: this.createSharedProcessConfiguration(),
+			respondToAuthRequestsFromMainProcess: true,
 			execArgv
 		});
 
diff --git a/src/vs/platform/sharedProcess/node/sharedProcess.ts b/src/vs/platform/sharedProcess/node/sharedProcess.ts
index 0c0e49c3a0b..d7ce3f00f7d 100644
--- a/src/vs/platform/sharedProcess/node/sharedProcess.ts
+++ b/src/vs/platform/sharedProcess/node/sharedProcess.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IStringDictionary } from 'vs/base/common/collections';
-import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
-import { ILoggerResource, LogLevel } from 'vs/platform/log/common/log';
-import { IUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { PolicyDefinition, PolicyValue } from 'vs/platform/policy/common/policy';
-import { UriComponents, UriDto } from 'vs/base/common/uri';
+import { IStringDictionary } from '../../../base/common/collections.js';
+import { NativeParsedArgs } from '../../environment/common/argv.js';
+import { ILoggerResource, LogLevel } from '../../log/common/log.js';
+import { IUserDataProfile } from '../../userDataProfile/common/userDataProfile.js';
+import { PolicyDefinition, PolicyValue } from '../../policy/common/policy.js';
+import { UriComponents, UriDto } from '../../../base/common/uri.js';
 
 export interface ISharedProcessConfiguration {
 	readonly machineId: string;
diff --git a/src/vs/platform/shell/node/shellEnv.ts b/src/vs/platform/shell/node/shellEnv.ts
index b956c37aa2a..2d3ef3ead0d 100644
--- a/src/vs/platform/shell/node/shellEnv.ts
+++ b/src/vs/platform/shell/node/shellEnv.ts
@@ -4,20 +4,20 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { spawn } from 'child_process';
-import { basename } from 'vs/base/common/path';
-import { localize } from 'vs/nls';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { CancellationError, isCancellationError } from 'vs/base/common/errors';
-import { IProcessEnvironment, isWindows, OS } from 'vs/base/common/platform';
-import { generateUuid } from 'vs/base/common/uuid';
-import { getSystemShell } from 'vs/base/node/shell';
-import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
-import { isLaunchedFromCli } from 'vs/platform/environment/node/argvHelper';
-import { ILogService } from 'vs/platform/log/common/log';
-import { Promises } from 'vs/base/common/async';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { clamp } from 'vs/base/common/numbers';
+import { basename } from '../../../base/common/path.js';
+import { localize } from '../../../nls.js';
+import { CancellationToken, CancellationTokenSource } from '../../../base/common/cancellation.js';
+import { toErrorMessage } from '../../../base/common/errorMessage.js';
+import { CancellationError, isCancellationError } from '../../../base/common/errors.js';
+import { IProcessEnvironment, isWindows, OS } from '../../../base/common/platform.js';
+import { generateUuid } from '../../../base/common/uuid.js';
+import { getSystemShell } from '../../../base/node/shell.js';
+import { NativeParsedArgs } from '../../environment/common/argv.js';
+import { isLaunchedFromCli } from '../../environment/node/argvHelper.js';
+import { ILogService } from '../../log/common/log.js';
+import { Promises } from '../../../base/common/async.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { clamp } from '../../../base/common/numbers.js';
 
 let unixShellEnvPromise: Promise<typeof process.env> | undefined = undefined;
 
diff --git a/src/vs/platform/sign/browser/signService.ts b/src/vs/platform/sign/browser/signService.ts
index a9d699bf3b2..ec1e11bdd94 100644
--- a/src/vs/platform/sign/browser/signService.ts
+++ b/src/vs/platform/sign/browser/signService.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { WindowIntervalTimer } from 'vs/base/browser/dom';
-import { mainWindow } from 'vs/base/browser/window';
-import { memoize } from 'vs/base/common/decorators';
-import { FileAccess } from 'vs/base/common/network';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { AbstractSignService, IVsdaValidator } from 'vs/platform/sign/common/abstractSignService';
-import { ISignService } from 'vs/platform/sign/common/sign';
+import { importAMDNodeModule, resolveAmdNodeModulePath } from '../../../amdX.js';
+import { WindowIntervalTimer } from '../../../base/browser/dom.js';
+import { mainWindow } from '../../../base/browser/window.js';
+import { memoize } from '../../../base/common/decorators.js';
+import { IProductService } from '../../product/common/productService.js';
+import { AbstractSignService, IVsdaValidator } from '../common/abstractSignService.js';
+import { ISignService } from '../common/sign.js';
 
 declare module vsdaWeb {
 	export function sign(salted_message: string): string;
@@ -62,7 +62,7 @@ export class SignService extends AbstractSignService implements ISignService {
 		let [wasm] = await Promise.all([
 			this.getWasmBytes(),
 			new Promise<void>((resolve, reject) => {
-				require(['vsda'], resolve, reject);
+				importAMDNodeModule('vsda', 'rust/web/vsda.js').then(() => resolve(), reject);
 
 				// todo@connor4312: there seems to be a bug(?) in vscode-loader with
 				// require() not resolving in web once the script loads, so check manually
@@ -74,7 +74,6 @@ export class SignService extends AbstractSignService implements ISignService {
 			}).finally(() => checkInterval.dispose()),
 		]);
 
-
 		const keyBytes = new TextEncoder().encode(this.productService.serverLicense?.join('\n') || '');
 		for (let i = 0; i + STEP_SIZE < keyBytes.length; i += STEP_SIZE) {
 			const key = await crypto.subtle.importKey('raw', keyBytes.slice(i + IV_SIZE, i + IV_SIZE + KEY_SIZE), { name: 'AES-CBC' }, false, ['decrypt']);
@@ -87,7 +86,8 @@ export class SignService extends AbstractSignService implements ISignService {
 	}
 
 	private async getWasmBytes(): Promise<ArrayBuffer> {
-		const response = await fetch(FileAccess.asBrowserUri('vsda/../vsda_bg.wasm').toString(true));
+		const url = resolveAmdNodeModulePath('vsda', 'rust/web/vsda_bg.wasm');
+		const response = await fetch(url);
 		if (!response.ok) {
 			throw new Error('error loading vsda');
 		}
diff --git a/src/vs/platform/sign/common/abstractSignService.ts b/src/vs/platform/sign/common/abstractSignService.ts
index 6f7c91ba958..b49a8ea7bea 100644
--- a/src/vs/platform/sign/common/abstractSignService.ts
+++ b/src/vs/platform/sign/common/abstractSignService.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IMessage, ISignService } from 'vs/platform/sign/common/sign';
+import { IMessage, ISignService } from './sign.js';
 
 export interface IVsdaSigner {
 	sign(arg: string): string;
diff --git a/src/vs/platform/sign/common/sign.ts b/src/vs/platform/sign/common/sign.ts
index e760b314fc8..c26ffad73af 100644
--- a/src/vs/platform/sign/common/sign.ts
+++ b/src/vs/platform/sign/common/sign.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 export const SIGN_SERVICE_ID = 'signService';
 export const ISignService = createDecorator<ISignService>(SIGN_SERVICE_ID);
diff --git a/src/vs/platform/sign/node/signService.ts b/src/vs/platform/sign/node/signService.ts
index d07ba9cfbe9..654ac856a20 100644
--- a/src/vs/platform/sign/node/signService.ts
+++ b/src/vs/platform/sign/node/signService.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { AbstractSignService, IVsdaValidator } from 'vs/platform/sign/common/abstractSignService';
-import { ISignService } from 'vs/platform/sign/common/sign';
+import { AbstractSignService, IVsdaValidator } from '../common/abstractSignService.js';
+import { ISignService } from '../common/sign.js';
 
 declare module vsda {
 	// the signer is a native module that for historical reasons uses a lower case class name
@@ -28,7 +28,9 @@ export class SignService extends AbstractSignService implements ISignService {
 		return this.vsda().then(vsda => new vsda.signer().sign(arg));
 	}
 
-	private vsda(): Promise<typeof vsda> {
-		return new Promise((resolve, reject) => require(['vsda'], resolve, reject));
+	private async vsda(): Promise<typeof vsda> {
+		const mod = 'vsda';
+		const { default: vsda } = await import(mod);
+		return vsda;
 	}
 }
diff --git a/src/vs/platform/state/node/state.ts b/src/vs/platform/state/node/state.ts
index a125c9955b9..d409432cf50 100644
--- a/src/vs/platform/state/node/state.ts
+++ b/src/vs/platform/state/node/state.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 export const IStateReadService = createDecorator<IStateReadService>('stateReadService');
 export interface IStateReadService {
diff --git a/src/vs/platform/state/node/stateService.ts b/src/vs/platform/state/node/stateService.ts
index 46dd2baa43e..77f7c45bc11 100644
--- a/src/vs/platform/state/node/stateService.ts
+++ b/src/vs/platform/state/node/stateService.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ThrottledDelayer } from 'vs/base/common/async';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { isUndefined, isUndefinedOrNull } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { FileOperationError, FileOperationResult, IFileService } from 'vs/platform/files/common/files';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IStateReadService, IStateService } from 'vs/platform/state/node/state';
+import { ThrottledDelayer } from '../../../base/common/async.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { isUndefined, isUndefinedOrNull } from '../../../base/common/types.js';
+import { URI } from '../../../base/common/uri.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { FileOperationError, FileOperationResult, IFileService } from '../../files/common/files.js';
+import { ILogService } from '../../log/common/log.js';
+import { IStateReadService, IStateService } from './state.js';
 
 type StorageDatabase = { [key: string]: unknown };
 
diff --git a/src/vs/platform/state/test/node/state.test.ts b/src/vs/platform/state/test/node/state.test.ts
index acce49d3e9c..d9971ee560e 100644
--- a/src/vs/platform/state/test/node/state.test.ts
+++ b/src/vs/platform/state/test/node/state.test.ts
@@ -4,20 +4,20 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { readFileSync } from 'fs';
+import { readFileSync, promises } from 'fs';
 import { tmpdir } from 'os';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { join } from 'vs/base/common/path';
-import { URI } from 'vs/base/common/uri';
-import { Promises, writeFileSync } from 'vs/base/node/pfs';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { flakySuite, getRandomTestPath } from 'vs/base/test/node/testUtils';
-import { IFileService } from 'vs/platform/files/common/files';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
-import { ILogService, NullLogService } from 'vs/platform/log/common/log';
-import { FileStorage, SaveStrategy } from 'vs/platform/state/node/stateService';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { join } from '../../../../base/common/path.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Promises, writeFileSync } from '../../../../base/node/pfs.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { flakySuite, getRandomTestPath } from '../../../../base/test/node/testUtils.js';
+import { IFileService } from '../../../files/common/files.js';
+import { FileService } from '../../../files/common/fileService.js';
+import { DiskFileSystemProvider } from '../../../files/node/diskFileSystemProvider.js';
+import { ILogService, NullLogService } from '../../../log/common/log.js';
+import { FileStorage, SaveStrategy } from '../../node/stateService.js';
 
 flakySuite('StateService', () => {
 
@@ -37,7 +37,7 @@ flakySuite('StateService', () => {
 		diskFileSystemProvider = disposables.add(new DiskFileSystemProvider(logService));
 		disposables.add(fileService.registerProvider(Schemas.file, diskFileSystemProvider));
 
-		return Promises.mkdir(testDir, { recursive: true });
+		return promises.mkdir(testDir, { recursive: true });
 	});
 
 	teardown(() => {
diff --git a/src/vs/platform/storage/common/storage.ts b/src/vs/platform/storage/common/storage.ts
index fe730ff5cda..b120f38a296 100644
--- a/src/vs/platform/storage/common/storage.ts
+++ b/src/vs/platform/storage/common/storage.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Promises, RunOnceScheduler, runWhenGlobalIdle } from 'vs/base/common/async';
-import { Emitter, Event, PauseableEmitter } from 'vs/base/common/event';
-import { Disposable, DisposableStore, dispose, MutableDisposable } from 'vs/base/common/lifecycle';
-import { mark } from 'vs/base/common/performance';
-import { isUndefinedOrNull } from 'vs/base/common/types';
-import { InMemoryStorageDatabase, IStorage, IStorageChangeEvent, Storage, StorageHint, StorageValue } from 'vs/base/parts/storage/common/storage';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { isUserDataProfile, IUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IAnyWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
+import { Promises, RunOnceScheduler, runWhenGlobalIdle } from '../../../base/common/async.js';
+import { Emitter, Event, PauseableEmitter } from '../../../base/common/event.js';
+import { Disposable, DisposableStore, dispose, MutableDisposable } from '../../../base/common/lifecycle.js';
+import { mark } from '../../../base/common/performance.js';
+import { isUndefinedOrNull } from '../../../base/common/types.js';
+import { InMemoryStorageDatabase, IStorage, IStorageChangeEvent, Storage, StorageHint, StorageValue } from '../../../base/parts/storage/common/storage.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { isUserDataProfile, IUserDataProfile } from '../../userDataProfile/common/userDataProfile.js';
+import { IAnyWorkspaceIdentifier } from '../../workspace/common/workspace.js';
 
 export const IS_NEW_KEY = '__$__isNewStorageMarker';
 export const TARGET_KEY = '__$__targetStorageMarker';
diff --git a/src/vs/platform/storage/common/storageIpc.ts b/src/vs/platform/storage/common/storageIpc.ts
index 7abbec236c6..117052ea26c 100644
--- a/src/vs/platform/storage/common/storageIpc.ts
+++ b/src/vs/platform/storage/common/storageIpc.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { UriDto } from 'vs/base/common/uri';
-import { IChannel } from 'vs/base/parts/ipc/common/ipc';
-import { IStorageDatabase, IStorageItemsChangeEvent, IUpdateRequest } from 'vs/base/parts/storage/common/storage';
-import { IUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { ISerializedSingleFolderWorkspaceIdentifier, ISerializedWorkspaceIdentifier, IEmptyWorkspaceIdentifier, IAnyWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { UriDto } from '../../../base/common/uri.js';
+import { IChannel } from '../../../base/parts/ipc/common/ipc.js';
+import { IStorageDatabase, IStorageItemsChangeEvent, IUpdateRequest } from '../../../base/parts/storage/common/storage.js';
+import { IUserDataProfile } from '../../userDataProfile/common/userDataProfile.js';
+import { ISerializedSingleFolderWorkspaceIdentifier, ISerializedWorkspaceIdentifier, IEmptyWorkspaceIdentifier, IAnyWorkspaceIdentifier } from '../../workspace/common/workspace.js';
 
 export type Key = string;
 export type Value = string;
diff --git a/src/vs/platform/storage/common/storageService.ts b/src/vs/platform/storage/common/storageService.ts
index 4cfe09ec6d4..c7181a89705 100644
--- a/src/vs/platform/storage/common/storageService.ts
+++ b/src/vs/platform/storage/common/storageService.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Promises } from 'vs/base/common/async';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { joinPath } from 'vs/base/common/resources';
-import { IStorage, Storage } from 'vs/base/parts/storage/common/storage';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IRemoteService } from 'vs/platform/ipc/common/services';
-import { AbstractStorageService, isProfileUsingDefaultStorage, StorageScope, WillSaveStateReason } from 'vs/platform/storage/common/storage';
-import { ApplicationStorageDatabaseClient, ProfileStorageDatabaseClient, WorkspaceStorageDatabaseClient } from 'vs/platform/storage/common/storageIpc';
-import { isUserDataProfile, IUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IAnyWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
+import { Promises } from '../../../base/common/async.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { Schemas } from '../../../base/common/network.js';
+import { joinPath } from '../../../base/common/resources.js';
+import { IStorage, Storage } from '../../../base/parts/storage/common/storage.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { IRemoteService } from '../../ipc/common/services.js';
+import { AbstractStorageService, isProfileUsingDefaultStorage, StorageScope, WillSaveStateReason } from './storage.js';
+import { ApplicationStorageDatabaseClient, ProfileStorageDatabaseClient, WorkspaceStorageDatabaseClient } from './storageIpc.js';
+import { isUserDataProfile, IUserDataProfile } from '../../userDataProfile/common/userDataProfile.js';
+import { IAnyWorkspaceIdentifier } from '../../workspace/common/workspace.js';
 
 export class RemoteStorageService extends AbstractStorageService {
 
diff --git a/src/vs/platform/storage/electron-main/storageIpc.ts b/src/vs/platform/storage/electron-main/storageIpc.ts
index 95c1d083aca..153856a170c 100644
--- a/src/vs/platform/storage/electron-main/storageIpc.ts
+++ b/src/vs/platform/storage/electron-main/storageIpc.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { revive } from 'vs/base/common/marshalling';
-import { IServerChannel } from 'vs/base/parts/ipc/common/ipc';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IBaseSerializableStorageRequest, ISerializableItemsChangeEvent, ISerializableUpdateRequest, Key, Value } from 'vs/platform/storage/common/storageIpc';
-import { IStorageChangeEvent, IStorageMain } from 'vs/platform/storage/electron-main/storageMain';
-import { IStorageMainService } from 'vs/platform/storage/electron-main/storageMainService';
-import { IUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { reviveIdentifier, IAnyWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { revive } from '../../../base/common/marshalling.js';
+import { IServerChannel } from '../../../base/parts/ipc/common/ipc.js';
+import { ILogService } from '../../log/common/log.js';
+import { IBaseSerializableStorageRequest, ISerializableItemsChangeEvent, ISerializableUpdateRequest, Key, Value } from '../common/storageIpc.js';
+import { IStorageChangeEvent, IStorageMain } from './storageMain.js';
+import { IStorageMainService } from './storageMainService.js';
+import { IUserDataProfile } from '../../userDataProfile/common/userDataProfile.js';
+import { reviveIdentifier, IAnyWorkspaceIdentifier } from '../../workspace/common/workspace.js';
 
 export class StorageDatabaseChannel extends Disposable implements IServerChannel {
 
diff --git a/src/vs/platform/storage/electron-main/storageMain.ts b/src/vs/platform/storage/electron-main/storageMain.ts
index c110f28015b..8c945fe6019 100644
--- a/src/vs/platform/storage/electron-main/storageMain.ts
+++ b/src/vs/platform/storage/electron-main/storageMain.ts
@@ -3,24 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { top } from 'vs/base/common/arrays';
-import { DeferredPromise } from 'vs/base/common/async';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { join } from 'vs/base/common/path';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { URI } from 'vs/base/common/uri';
-import { Promises } from 'vs/base/node/pfs';
-import { InMemoryStorageDatabase, IStorage, Storage, StorageHint, StorageState } from 'vs/base/parts/storage/common/storage';
-import { ISQLiteStorageDatabaseLoggingOptions, SQLiteStorageDatabase } from 'vs/base/parts/storage/node/storage';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IFileService } from 'vs/platform/files/common/files';
-import { ILogService, LogLevel } from 'vs/platform/log/common/log';
-import { IS_NEW_KEY } from 'vs/platform/storage/common/storage';
-import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { currentSessionDateStorageKey, firstSessionDateStorageKey, lastSessionDateStorageKey } from 'vs/platform/telemetry/common/telemetry';
-import { isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, IAnyWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
-import { Schemas } from 'vs/base/common/network';
+import * as fs from 'fs';
+import { top } from '../../../base/common/arrays.js';
+import { DeferredPromise } from '../../../base/common/async.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../base/common/lifecycle.js';
+import { join } from '../../../base/common/path.js';
+import { StopWatch } from '../../../base/common/stopwatch.js';
+import { URI } from '../../../base/common/uri.js';
+import { Promises } from '../../../base/node/pfs.js';
+import { InMemoryStorageDatabase, IStorage, Storage, StorageHint, StorageState } from '../../../base/parts/storage/common/storage.js';
+import { ISQLiteStorageDatabaseLoggingOptions, SQLiteStorageDatabase } from '../../../base/parts/storage/node/storage.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { IFileService } from '../../files/common/files.js';
+import { ILogService, LogLevel } from '../../log/common/log.js';
+import { IS_NEW_KEY } from '../common/storage.js';
+import { IUserDataProfile, IUserDataProfilesService } from '../../userDataProfile/common/userDataProfile.js';
+import { currentSessionDateStorageKey, firstSessionDateStorageKey, lastSessionDateStorageKey } from '../../telemetry/common/telemetry.js';
+import { isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, IAnyWorkspaceIdentifier } from '../../workspace/common/workspace.js';
+import { Schemas } from '../../../base/common/network.js';
 
 export interface IStorageMainOptions {
 
@@ -403,7 +404,7 @@ export class WorkspaceStorageMain extends BaseStorageMain {
 		}
 
 		// Ensure storage folder exists
-		await Promises.mkdir(workspaceStorageFolderPath, { recursive: true });
+		await fs.promises.mkdir(workspaceStorageFolderPath, { recursive: true });
 
 		// Write metadata into folder (but do not await)
 		this.ensureWorkspaceStorageFolderMeta(workspaceStorageFolderPath);
diff --git a/src/vs/platform/storage/electron-main/storageMainService.ts b/src/vs/platform/storage/electron-main/storageMainService.ts
index 569327c095d..94664c7eaef 100644
--- a/src/vs/platform/storage/electron-main/storageMainService.ts
+++ b/src/vs/platform/storage/electron-main/storageMainService.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IStorage } from 'vs/base/parts/storage/common/storage';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IFileService } from 'vs/platform/files/common/files';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ILifecycleMainService, LifecycleMainPhase, ShutdownReason } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { AbstractStorageService, isProfileUsingDefaultStorage, IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ApplicationStorageMain, ProfileStorageMain, InMemoryStorageMain, IStorageMain, IStorageMainOptions, WorkspaceStorageMain, IStorageChangeEvent } from 'vs/platform/storage/electron-main/storageMain';
-import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IUserDataProfilesMainService } from 'vs/platform/userDataProfile/electron-main/userDataProfile';
-import { IAnyWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { Schemas } from 'vs/base/common/network';
+import { URI } from '../../../base/common/uri.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { IStorage } from '../../../base/parts/storage/common/storage.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { IFileService } from '../../files/common/files.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { ILifecycleMainService, LifecycleMainPhase, ShutdownReason } from '../../lifecycle/electron-main/lifecycleMainService.js';
+import { ILogService } from '../../log/common/log.js';
+import { AbstractStorageService, isProfileUsingDefaultStorage, IStorageService, StorageScope, StorageTarget } from '../common/storage.js';
+import { ApplicationStorageMain, ProfileStorageMain, InMemoryStorageMain, IStorageMain, IStorageMainOptions, WorkspaceStorageMain, IStorageChangeEvent } from './storageMain.js';
+import { IUserDataProfile, IUserDataProfilesService } from '../../userDataProfile/common/userDataProfile.js';
+import { IUserDataProfilesMainService } from '../../userDataProfile/electron-main/userDataProfile.js';
+import { IAnyWorkspaceIdentifier } from '../../workspace/common/workspace.js';
+import { IUriIdentityService } from '../../uriIdentity/common/uriIdentity.js';
+import { Schemas } from '../../../base/common/network.js';
 
 //#region Storage Main Service (intent: make application, profile and workspace storage accessible to windows from main process)
 
diff --git a/src/vs/platform/storage/test/common/storageService.test.ts b/src/vs/platform/storage/test/common/storageService.test.ts
index d781cf027e6..f3cb3e5c999 100644
--- a/src/vs/platform/storage/test/common/storageService.test.ts
+++ b/src/vs/platform/storage/test/common/storageService.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { deepStrictEqual, ok, strictEqual } from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { InMemoryStorageService, IStorageService, IStorageTargetChangeEvent, IStorageValueChangeEvent, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { InMemoryStorageService, IStorageService, IStorageTargetChangeEvent, IStorageValueChangeEvent, StorageScope, StorageTarget } from '../../common/storage.js';
 
 export function createSuite<T extends IStorageService>(params: { setup: () => Promise<T>; teardown: (service: T) => Promise<void> }): void {
 
diff --git a/src/vs/platform/storage/test/electron-main/storageMainService.test.ts b/src/vs/platform/storage/test/electron-main/storageMainService.test.ts
index 1455f234f7b..caac031d74b 100644
--- a/src/vs/platform/storage/test/electron-main/storageMainService.test.ts
+++ b/src/vs/platform/storage/test/electron-main/storageMainService.test.ts
@@ -4,28 +4,28 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { notStrictEqual, strictEqual } from 'assert';
-import { Schemas } from 'vs/base/common/network';
-import { joinPath } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { OPTIONS, parseArgs } from 'vs/platform/environment/node/argv';
-import { NativeEnvironmentService } from 'vs/platform/environment/node/environmentService';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { ILifecycleMainService } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
-import { NullLogService } from 'vs/platform/log/common/log';
-import product from 'vs/platform/product/common/product';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { SaveStrategy, StateService } from 'vs/platform/state/node/stateService';
-import { IS_NEW_KEY, StorageScope } from 'vs/platform/storage/common/storage';
-import { IStorageChangeEvent, IStorageMain, IStorageMainOptions } from 'vs/platform/storage/electron-main/storageMain';
-import { StorageMainService } from 'vs/platform/storage/electron-main/storageMainService';
-import { currentSessionDateStorageKey, firstSessionDateStorageKey } from 'vs/platform/telemetry/common/telemetry';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { IUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { UserDataProfilesMainService } from 'vs/platform/userDataProfile/electron-main/userDataProfile';
-import { TestLifecycleMainService } from 'vs/platform/test/electron-main/workbenchTestServices';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import { Schemas } from '../../../../base/common/network.js';
+import { joinPath } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { OPTIONS, parseArgs } from '../../../environment/node/argv.js';
+import { NativeEnvironmentService } from '../../../environment/node/environmentService.js';
+import { FileService } from '../../../files/common/fileService.js';
+import { ILifecycleMainService } from '../../../lifecycle/electron-main/lifecycleMainService.js';
+import { NullLogService } from '../../../log/common/log.js';
+import product from '../../../product/common/product.js';
+import { IProductService } from '../../../product/common/productService.js';
+import { SaveStrategy, StateService } from '../../../state/node/stateService.js';
+import { IS_NEW_KEY, StorageScope } from '../../common/storage.js';
+import { IStorageChangeEvent, IStorageMain, IStorageMainOptions } from '../../electron-main/storageMain.js';
+import { StorageMainService } from '../../electron-main/storageMainService.js';
+import { currentSessionDateStorageKey, firstSessionDateStorageKey } from '../../../telemetry/common/telemetry.js';
+import { UriIdentityService } from '../../../uriIdentity/common/uriIdentityService.js';
+import { IUserDataProfile } from '../../../userDataProfile/common/userDataProfile.js';
+import { UserDataProfilesMainService } from '../../../userDataProfile/electron-main/userDataProfile.js';
+import { TestLifecycleMainService } from '../../../test/electron-main/workbenchTestServices.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
 
 suite('StorageMainService', function () {
 
diff --git a/src/vs/platform/telemetry/browser/1dsAppender.ts b/src/vs/platform/telemetry/browser/1dsAppender.ts
index 2857c030813..99792303d01 100644
--- a/src/vs/platform/telemetry/browser/1dsAppender.ts
+++ b/src/vs/platform/telemetry/browser/1dsAppender.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { AbstractOneDataSystemAppender, IAppInsightsCore } from 'vs/platform/telemetry/common/1dsAppender';
+import { AbstractOneDataSystemAppender, IAppInsightsCore } from '../common/1dsAppender.js';
 
 
 export class OneDataSystemWebAppender extends AbstractOneDataSystemAppender {
diff --git a/src/vs/platform/telemetry/browser/errorTelemetry.ts b/src/vs/platform/telemetry/browser/errorTelemetry.ts
index 61e5836f539..964ef588d5d 100644
--- a/src/vs/platform/telemetry/browser/errorTelemetry.ts
+++ b/src/vs/platform/telemetry/browser/errorTelemetry.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { mainWindow } from 'vs/base/browser/window';
-import { ErrorNoTelemetry } from 'vs/base/common/errors';
-import { toDisposable } from 'vs/base/common/lifecycle';
-import BaseErrorTelemetry, { ErrorEvent } from 'vs/platform/telemetry/common/errorTelemetry';
+import { mainWindow } from '../../../base/browser/window.js';
+import { ErrorNoTelemetry } from '../../../base/common/errors.js';
+import { toDisposable } from '../../../base/common/lifecycle.js';
+import BaseErrorTelemetry, { ErrorEvent } from '../common/errorTelemetry.js';
 
 export default class ErrorTelemetry extends BaseErrorTelemetry {
 	protected override installErrorListeners(): void {
diff --git a/src/vs/platform/telemetry/common/1dsAppender.ts b/src/vs/platform/telemetry/common/1dsAppender.ts
index c54187f89c9..7efb786c763 100644
--- a/src/vs/platform/telemetry/common/1dsAppender.ts
+++ b/src/vs/platform/telemetry/common/1dsAppender.ts
@@ -5,10 +5,11 @@
 
 import type { IExtendedConfiguration, IExtendedTelemetryItem, ITelemetryItem, ITelemetryUnloadState } from '@microsoft/1ds-core-js';
 import type { IChannelConfiguration, IXHROverride, PostChannel } from '@microsoft/1ds-post-js';
-import { importAMDNodeModule } from 'vs/amdX';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { mixin } from 'vs/base/common/objects';
-import { ITelemetryAppender, validateTelemetryData } from 'vs/platform/telemetry/common/telemetryUtils';
+import { importAMDNodeModule } from '../../../amdX.js';
+import { onUnexpectedError } from '../../../base/common/errors.js';
+import { mixin } from '../../../base/common/objects.js';
+import { isWeb } from '../../../base/common/platform.js';
+import { ITelemetryAppender, validateTelemetryData } from './telemetryUtils.js';
 
 // Interface type which is a subset of @microsoft/1ds-core-js AppInsightsCore.
 // Allows us to more easily build mock objects for testing as the interface is quite large and we only need a few properties.
@@ -22,8 +23,11 @@ const endpointUrl = 'https://mobile.events.data.microsoft.com/OneCollector/1.0';
 const endpointHealthUrl = 'https://mobile.events.data.microsoft.com/ping';
 
 async function getClient(instrumentationKey: string, addInternalFlag?: boolean, xhrOverride?: IXHROverride): Promise<IAppInsightsCore> {
-	const oneDs = await importAMDNodeModule<typeof import('@microsoft/1ds-core-js')>('@microsoft/1ds-core-js', 'dist/ms.core.js');
-	const postPlugin = await importAMDNodeModule<typeof import('@microsoft/1ds-post-js')>('@microsoft/1ds-post-js', 'dist/ms.post.js');
+	// eslint-disable-next-line local/code-amd-node-module
+	const oneDs = isWeb ? await importAMDNodeModule<typeof import('@microsoft/1ds-core-js')>('@microsoft/1ds-core-js', 'bundle/ms.core.min.js') : await import('@microsoft/1ds-core-js');
+	// eslint-disable-next-line local/code-amd-node-module
+	const postPlugin = isWeb ? await importAMDNodeModule<typeof import('@microsoft/1ds-post-js')>('@microsoft/1ds-post-js', 'bundle/ms.post.min.js') : await import('@microsoft/1ds-post-js');
+
 	const appInsightsCore = new oneDs.AppInsightsCore();
 	const collectorChannelPlugin: PostChannel = new postPlugin.PostChannel();
 	// Configure the app insights core to send to collector++ and disable logging of debug info
@@ -140,7 +144,7 @@ export abstract class AbstractOneDataSystemAppender implements ITelemetryAppende
 		} catch { }
 	}
 
-	flush(): Promise<any> {
+	flush(): Promise<void> {
 		if (this._aiCoreOrKey) {
 			return new Promise(resolve => {
 				this._withAIClient((aiClient) => {
diff --git a/src/vs/platform/telemetry/common/commonProperties.ts b/src/vs/platform/telemetry/common/commonProperties.ts
index b649cb80775..4ec0cf87037 100644
--- a/src/vs/platform/telemetry/common/commonProperties.ts
+++ b/src/vs/platform/telemetry/common/commonProperties.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isLinuxSnap, platform, Platform, PlatformToString } from 'vs/base/common/platform';
-import { env, platform as nodePlatform } from 'vs/base/common/process';
-import { generateUuid } from 'vs/base/common/uuid';
-import { ICommonProperties } from 'vs/platform/telemetry/common/telemetry';
+import { isLinuxSnap, platform, Platform, PlatformToString } from '../../../base/common/platform.js';
+import { env, platform as nodePlatform } from '../../../base/common/process.js';
+import { generateUuid } from '../../../base/common/uuid.js';
+import { ICommonProperties } from './telemetry.js';
 
 function getPlatformDetail(hostname: string): string | undefined {
 	if (platform === Platform.Linux && /^penguin(\.|$)/i.test(hostname)) {
diff --git a/src/vs/platform/telemetry/common/errorTelemetry.ts b/src/vs/platform/telemetry/common/errorTelemetry.ts
index a872cbb4dee..93216349c14 100644
--- a/src/vs/platform/telemetry/common/errorTelemetry.ts
+++ b/src/vs/platform/telemetry/common/errorTelemetry.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { binarySearch } from 'vs/base/common/arrays';
-import { errorHandler, ErrorNoTelemetry } from 'vs/base/common/errors';
-import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { safeStringify } from 'vs/base/common/objects';
-import { FileOperationError } from 'vs/platform/files/common/files';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { binarySearch } from '../../../base/common/arrays.js';
+import { errorHandler, ErrorNoTelemetry } from '../../../base/common/errors.js';
+import { DisposableStore, toDisposable } from '../../../base/common/lifecycle.js';
+import { safeStringify } from '../../../base/common/objects.js';
+import { FileOperationError } from '../../files/common/files.js';
+import { ITelemetryService } from './telemetry.js';
 
 type ErrorEventFragment = {
 	owner: 'lramos15, sbatten';
diff --git a/src/vs/platform/telemetry/common/remoteTelemetryChannel.ts b/src/vs/platform/telemetry/common/remoteTelemetryChannel.ts
index 97fb3ec4989..8f6e27e28a8 100644
--- a/src/vs/platform/telemetry/common/remoteTelemetryChannel.ts
+++ b/src/vs/platform/telemetry/common/remoteTelemetryChannel.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IServerChannel } from 'vs/base/parts/ipc/common/ipc';
-import { TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
-import { ITelemetryAppender } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IServerTelemetryService } from 'vs/platform/telemetry/common/serverTelemetryService';
+import { Event } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { IServerChannel } from '../../../base/parts/ipc/common/ipc.js';
+import { TelemetryLevel } from './telemetry.js';
+import { ITelemetryAppender } from './telemetryUtils.js';
+import { IServerTelemetryService } from './serverTelemetryService.js';
 
 export class ServerTelemetryChannel extends Disposable implements IServerChannel {
 	constructor(
diff --git a/src/vs/platform/telemetry/common/serverTelemetryService.ts b/src/vs/platform/telemetry/common/serverTelemetryService.ts
index 9581af7e0f9..f6fc225ab84 100644
--- a/src/vs/platform/telemetry/common/serverTelemetryService.ts
+++ b/src/vs/platform/telemetry/common/serverTelemetryService.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { refineServiceDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ClassifiedEvent, IGDPRProperty, OmitMetadata, StrictPropertyCheck } from 'vs/platform/telemetry/common/gdprTypings';
-import { ITelemetryData, ITelemetryService, TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
-import { ITelemetryServiceConfig, TelemetryService } from 'vs/platform/telemetry/common/telemetryService';
-import { NullTelemetryServiceShape } from 'vs/platform/telemetry/common/telemetryUtils';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { refineServiceDecorator } from '../../instantiation/common/instantiation.js';
+import { IProductService } from '../../product/common/productService.js';
+import { ClassifiedEvent, IGDPRProperty, OmitMetadata, StrictPropertyCheck } from './gdprTypings.js';
+import { ITelemetryData, ITelemetryService, TelemetryLevel } from './telemetry.js';
+import { ITelemetryServiceConfig, TelemetryService } from './telemetryService.js';
+import { NullTelemetryServiceShape } from './telemetryUtils.js';
 
 export interface IServerTelemetryService extends ITelemetryService {
 	updateInjectedTelemetryLevel(telemetryLevel: TelemetryLevel): Promise<void>;
diff --git a/src/vs/platform/telemetry/common/telemetry.ts b/src/vs/platform/telemetry/common/telemetry.ts
index d6b4179b71f..6bfcb9159cd 100644
--- a/src/vs/platform/telemetry/common/telemetry.ts
+++ b/src/vs/platform/telemetry/common/telemetry.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ClassifiedEvent, IGDPRProperty, OmitMetadata, StrictPropertyCheck } from 'vs/platform/telemetry/common/gdprTypings';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { ClassifiedEvent, IGDPRProperty, OmitMetadata, StrictPropertyCheck } from './gdprTypings.js';
 
 export const ITelemetryService = createDecorator<ITelemetryService>('telemetryService');
 
diff --git a/src/vs/platform/telemetry/common/telemetryIpc.ts b/src/vs/platform/telemetry/common/telemetryIpc.ts
index 2c4b9b87569..64eaed7d289 100644
--- a/src/vs/platform/telemetry/common/telemetryIpc.ts
+++ b/src/vs/platform/telemetry/common/telemetryIpc.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { IChannel, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
-import { ITelemetryAppender } from 'vs/platform/telemetry/common/telemetryUtils';
+import { Event } from '../../../base/common/event.js';
+import { IChannel, IServerChannel } from '../../../base/parts/ipc/common/ipc.js';
+import { ITelemetryAppender } from './telemetryUtils.js';
 
 export interface ITelemetryLog {
 	eventName: string;
diff --git a/src/vs/platform/telemetry/common/telemetryLogAppender.ts b/src/vs/platform/telemetry/common/telemetryLogAppender.ts
index ba49e5a64e4..f4a19472604 100644
--- a/src/vs/platform/telemetry/common/telemetryLogAppender.ts
+++ b/src/vs/platform/telemetry/common/telemetryLogAppender.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { localize } from 'vs/nls';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { ILogService, ILogger, ILoggerService, LogLevel } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ITelemetryAppender, isLoggingOnly, supportsTelemetry, telemetryLogId, validateTelemetryData } from 'vs/platform/telemetry/common/telemetryUtils';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { localize } from '../../../nls.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { ILogService, ILogger, ILoggerService, LogLevel } from '../../log/common/log.js';
+import { IProductService } from '../../product/common/productService.js';
+import { ITelemetryAppender, isLoggingOnly, supportsTelemetry, telemetryLogId, validateTelemetryData } from './telemetryUtils.js';
 
 export class TelemetryLogAppender extends Disposable implements ITelemetryAppender {
 
@@ -38,8 +38,8 @@ export class TelemetryLogAppender extends Disposable implements ITelemetryAppend
 		}
 	}
 
-	flush(): Promise<any> {
-		return Promise.resolve(undefined);
+	flush(): Promise<void> {
+		return Promise.resolve();
 	}
 
 	log(eventName: string, data: any): void {
diff --git a/src/vs/platform/telemetry/common/telemetryService.ts b/src/vs/platform/telemetry/common/telemetryService.ts
index 245bb41b5d8..51fbb8fa753 100644
--- a/src/vs/platform/telemetry/common/telemetryService.ts
+++ b/src/vs/platform/telemetry/common/telemetryService.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { mixin } from 'vs/base/common/objects';
-import { isWeb } from 'vs/base/common/platform';
-import { escapeRegExpCharacters } from 'vs/base/common/strings';
-import { localize } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ConfigurationScope, Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import product from 'vs/platform/product/common/product';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { ClassifiedEvent, IGDPRProperty, OmitMetadata, StrictPropertyCheck } from 'vs/platform/telemetry/common/gdprTypings';
-import { ITelemetryData, ITelemetryService, TelemetryConfiguration, TelemetryLevel, TELEMETRY_CRASH_REPORTER_SETTING_ID, TELEMETRY_OLD_SETTING_ID, TELEMETRY_SECTION_ID, TELEMETRY_SETTING_ID, ICommonProperties } from 'vs/platform/telemetry/common/telemetry';
-import { cleanData, getTelemetryLevel, ITelemetryAppender } from 'vs/platform/telemetry/common/telemetryUtils';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { mixin } from '../../../base/common/objects.js';
+import { isWeb } from '../../../base/common/platform.js';
+import { escapeRegExpCharacters } from '../../../base/common/strings.js';
+import { localize } from '../../../nls.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { ConfigurationScope, Extensions, IConfigurationRegistry } from '../../configuration/common/configurationRegistry.js';
+import product from '../../product/common/product.js';
+import { IProductService } from '../../product/common/productService.js';
+import { Registry } from '../../registry/common/platform.js';
+import { ClassifiedEvent, IGDPRProperty, OmitMetadata, StrictPropertyCheck } from './gdprTypings.js';
+import { ITelemetryData, ITelemetryService, TelemetryConfiguration, TelemetryLevel, TELEMETRY_CRASH_REPORTER_SETTING_ID, TELEMETRY_OLD_SETTING_ID, TELEMETRY_SECTION_ID, TELEMETRY_SETTING_ID, ICommonProperties } from './telemetry.js';
+import { cleanData, getTelemetryLevel, ITelemetryAppender } from './telemetryUtils.js';
 
 export interface ITelemetryServiceConfig {
 	appenders: ITelemetryAppender[];
diff --git a/src/vs/platform/telemetry/common/telemetryUtils.ts b/src/vs/platform/telemetry/common/telemetryUtils.ts
index ec72e1a0829..05ca34c0834 100644
--- a/src/vs/platform/telemetry/common/telemetryUtils.ts
+++ b/src/vs/platform/telemetry/common/telemetryUtils.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { cloneAndChange, safeStringify } from 'vs/base/common/objects';
-import { isObject } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { getRemoteName } from 'vs/platform/remote/common/remoteHosts';
-import { verifyMicrosoftInternalDomain } from 'vs/platform/telemetry/common/commonProperties';
-import { ICustomEndpointTelemetryService, ITelemetryData, ITelemetryEndpoint, ITelemetryService, TelemetryConfiguration, TelemetryLevel, TELEMETRY_CRASH_REPORTER_SETTING_ID, TELEMETRY_OLD_SETTING_ID, TELEMETRY_SETTING_ID } from 'vs/platform/telemetry/common/telemetry';
+import { cloneAndChange, safeStringify } from '../../../base/common/objects.js';
+import { isObject } from '../../../base/common/types.js';
+import { URI } from '../../../base/common/uri.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { IProductService } from '../../product/common/productService.js';
+import { getRemoteName } from '../../remote/common/remoteHosts.js';
+import { verifyMicrosoftInternalDomain } from './commonProperties.js';
+import { ICustomEndpointTelemetryService, ITelemetryData, ITelemetryEndpoint, ITelemetryService, TelemetryConfiguration, TelemetryLevel, TELEMETRY_CRASH_REPORTER_SETTING_ID, TELEMETRY_OLD_SETTING_ID, TELEMETRY_SETTING_ID } from './telemetry.js';
 
 /**
  * A special class used to denoting a telemetry value which should not be clean.
@@ -59,10 +59,10 @@ export const extensionTelemetryLogChannelId = 'extensionTelemetryLog';
 
 export interface ITelemetryAppender {
 	log(eventName: string, data: any): void;
-	flush(): Promise<any>;
+	flush(): Promise<void>;
 }
 
-export const NullAppender: ITelemetryAppender = { log: () => null, flush: () => Promise.resolve(null) };
+export const NullAppender: ITelemetryAppender = { log: () => null, flush: () => Promise.resolve(undefined) };
 
 
 /* __GDPR__FRAGMENT__
diff --git a/src/vs/platform/telemetry/electron-main/telemetryUtils.ts b/src/vs/platform/telemetry/electron-main/telemetryUtils.ts
index 95e993f8462..bf16f18b9a7 100644
--- a/src/vs/platform/telemetry/electron-main/telemetryUtils.ts
+++ b/src/vs/platform/telemetry/electron-main/telemetryUtils.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ILogService } from 'vs/platform/log/common/log';
-import { IStateService } from 'vs/platform/state/node/state';
-import { machineIdKey, sqmIdKey, devDeviceIdKey } from 'vs/platform/telemetry/common/telemetry';
-import { resolveMachineId as resolveNodeMachineId, resolveSqmId as resolveNodeSqmId, resolvedevDeviceId as resolveNodedevDeviceId } from 'vs/platform/telemetry/node/telemetryUtils';
+import { ILogService } from '../../log/common/log.js';
+import { IStateService } from '../../state/node/state.js';
+import { machineIdKey, sqmIdKey, devDeviceIdKey } from '../common/telemetry.js';
+import { resolveMachineId as resolveNodeMachineId, resolveSqmId as resolveNodeSqmId, resolvedevDeviceId as resolveNodedevDeviceId } from '../node/telemetryUtils.js';
 
 export async function resolveMachineId(stateService: IStateService, logService: ILogService): Promise<string> {
 	// Call the node layers implementation to avoid code duplication
diff --git a/src/vs/platform/telemetry/electron-sandbox/customEndpointTelemetryService.ts b/src/vs/platform/telemetry/electron-sandbox/customEndpointTelemetryService.ts
index a54bbdf6901..97a41b21d5b 100644
--- a/src/vs/platform/telemetry/electron-sandbox/customEndpointTelemetryService.ts
+++ b/src/vs/platform/telemetry/electron-sandbox/customEndpointTelemetryService.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { registerSharedProcessRemoteService } from 'vs/platform/ipc/electron-sandbox/services';
-import { ICustomEndpointTelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { registerSharedProcessRemoteService } from '../../ipc/electron-sandbox/services.js';
+import { ICustomEndpointTelemetryService } from '../common/telemetry.js';
 
 registerSharedProcessRemoteService(ICustomEndpointTelemetryService, 'customEndpointTelemetry');
diff --git a/src/vs/platform/telemetry/node/1dsAppender.ts b/src/vs/platform/telemetry/node/1dsAppender.ts
index 63805143d49..08be57db219 100644
--- a/src/vs/platform/telemetry/node/1dsAppender.ts
+++ b/src/vs/platform/telemetry/node/1dsAppender.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type { IPayloadData, IXHROverride } from '@microsoft/1ds-post-js';
-import { streamToBuffer } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IRequestOptions } from 'vs/base/parts/request/common/request';
-import { IRequestService } from 'vs/platform/request/common/request';
+import { streamToBuffer } from '../../../base/common/buffer.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { IRequestOptions } from '../../../base/parts/request/common/request.js';
+import { IRequestService } from '../../request/common/request.js';
 import * as https from 'https';
-import { AbstractOneDataSystemAppender, IAppInsightsCore } from 'vs/platform/telemetry/common/1dsAppender';
+import { AbstractOneDataSystemAppender, IAppInsightsCore } from '../common/1dsAppender.js';
 
 type OnCompleteFunc = (status: number, headers: { [headerName: string]: string }, response?: string) => void;
 
diff --git a/src/vs/platform/telemetry/node/customEndpointTelemetryService.ts b/src/vs/platform/telemetry/node/customEndpointTelemetryService.ts
index d697c46cbf3..233b79f96b1 100644
--- a/src/vs/platform/telemetry/node/customEndpointTelemetryService.ts
+++ b/src/vs/platform/telemetry/node/customEndpointTelemetryService.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { FileAccess } from 'vs/base/common/network';
-import { Client as TelemetryClient } from 'vs/base/parts/ipc/node/ipc.cp';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { ILogService, ILoggerService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ICustomEndpointTelemetryService, ITelemetryData, ITelemetryEndpoint, ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { TelemetryAppenderClient } from 'vs/platform/telemetry/common/telemetryIpc';
-import { TelemetryLogAppender } from 'vs/platform/telemetry/common/telemetryLogAppender';
-import { TelemetryService } from 'vs/platform/telemetry/common/telemetryService';
+import { FileAccess } from '../../../base/common/network.js';
+import { Client as TelemetryClient } from '../../../base/parts/ipc/node/ipc.cp.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { ILogService, ILoggerService } from '../../log/common/log.js';
+import { IProductService } from '../../product/common/productService.js';
+import { ICustomEndpointTelemetryService, ITelemetryData, ITelemetryEndpoint, ITelemetryService } from '../common/telemetry.js';
+import { TelemetryAppenderClient } from '../common/telemetryIpc.js';
+import { TelemetryLogAppender } from '../common/telemetryLogAppender.js';
+import { TelemetryService } from '../common/telemetryService.js';
 
 export class CustomEndpointTelemetryService implements ICustomEndpointTelemetryService {
 	declare readonly _serviceBrand: undefined;
@@ -43,7 +43,7 @@ export class CustomEndpointTelemetryService implements ICustomEndpointTelemetryS
 					env: {
 						ELECTRON_RUN_AS_NODE: 1,
 						VSCODE_PIPE_LOGGING: 'true',
-						VSCODE_AMD_ENTRYPOINT: 'vs/workbench/contrib/debug/node/telemetryApp'
+						VSCODE_ESM_ENTRYPOINT: 'vs/workbench/contrib/debug/node/telemetryApp'
 					}
 				}
 			);
diff --git a/src/vs/platform/telemetry/node/errorTelemetry.ts b/src/vs/platform/telemetry/node/errorTelemetry.ts
index 7564814317c..933182f0dfb 100644
--- a/src/vs/platform/telemetry/node/errorTelemetry.ts
+++ b/src/vs/platform/telemetry/node/errorTelemetry.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isCancellationError, isSigPipeError, onUnexpectedError, setUnexpectedErrorHandler } from 'vs/base/common/errors';
-import BaseErrorTelemetry from 'vs/platform/telemetry/common/errorTelemetry';
+import { isCancellationError, isSigPipeError, onUnexpectedError, setUnexpectedErrorHandler } from '../../../base/common/errors.js';
+import BaseErrorTelemetry from '../common/errorTelemetry.js';
 
 export default class ErrorTelemetry extends BaseErrorTelemetry {
 	protected override installErrorListeners(): void {
diff --git a/src/vs/platform/telemetry/node/telemetry.ts b/src/vs/platform/telemetry/node/telemetry.ts
index 72f87dddf35..21fc5856d79 100644
--- a/src/vs/platform/telemetry/node/telemetry.ts
+++ b/src/vs/platform/telemetry/node/telemetry.ts
@@ -3,8 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { join } from 'vs/base/common/path';
-import { Promises } from 'vs/base/node/pfs';
+import * as fs from 'fs';
+import { join } from '../../../base/common/path.js';
+import { Promises } from '../../../base/node/pfs.js';
 
 export async function buildTelemetryMessage(appRoot: string, extensionsPath?: string): Promise<string> {
 	const mergedTelemetry = Object.create(null);
@@ -21,7 +22,7 @@ export async function buildTelemetryMessage(appRoot: string, extensionsPath?: st
 		const files = await Promises.readdir(extensionsPath);
 		for (const file of files) {
 			try {
-				const fileStat = await Promises.stat(join(extensionsPath, file));
+				const fileStat = await fs.promises.stat(join(extensionsPath, file));
 				if (fileStat.isDirectory()) {
 					dirs.push(file);
 				}
@@ -39,15 +40,15 @@ export async function buildTelemetryMessage(appRoot: string, extensionsPath?: st
 		}
 
 		for (const folder of telemetryJsonFolders) {
-			const contents = (await Promises.readFile(join(extensionsPath, folder, 'telemetry.json'))).toString();
+			const contents = (await fs.promises.readFile(join(extensionsPath, folder, 'telemetry.json'))).toString();
 			mergeTelemetry(contents, folder);
 		}
 	}
 
-	let contents = (await Promises.readFile(join(appRoot, 'telemetry-core.json'))).toString();
+	let contents = (await fs.promises.readFile(join(appRoot, 'telemetry-core.json'))).toString();
 	mergeTelemetry(contents, 'vscode-core');
 
-	contents = (await Promises.readFile(join(appRoot, 'telemetry-extensions.json'))).toString();
+	contents = (await fs.promises.readFile(join(appRoot, 'telemetry-extensions.json'))).toString();
 	mergeTelemetry(contents, 'vscode-extensions');
 
 	return JSON.stringify(mergedTelemetry, null, 4);
diff --git a/src/vs/platform/telemetry/node/telemetryUtils.ts b/src/vs/platform/telemetry/node/telemetryUtils.ts
index 4f8fa8c8a5b..faca66149bc 100644
--- a/src/vs/platform/telemetry/node/telemetryUtils.ts
+++ b/src/vs/platform/telemetry/node/telemetryUtils.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isMacintosh } from 'vs/base/common/platform';
-import { getMachineId, getSqmMachineId, getdevDeviceId } from 'vs/base/node/id';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IStateReadService } from 'vs/platform/state/node/state';
-import { machineIdKey, sqmIdKey, devDeviceIdKey } from 'vs/platform/telemetry/common/telemetry';
+import { isMacintosh } from '../../../base/common/platform.js';
+import { getMachineId, getSqmMachineId, getdevDeviceId } from '../../../base/node/id.js';
+import { ILogService } from '../../log/common/log.js';
+import { IStateReadService } from '../../state/node/state.js';
+import { machineIdKey, sqmIdKey, devDeviceIdKey } from '../common/telemetry.js';
 
 
 export async function resolveMachineId(stateService: IStateReadService, logService: ILogService): Promise<string> {
diff --git a/src/vs/platform/telemetry/test/browser/1dsAppender.test.ts b/src/vs/platform/telemetry/test/browser/1dsAppender.test.ts
index 33a22c391b2..29acc962b7f 100644
--- a/src/vs/platform/telemetry/test/browser/1dsAppender.test.ts
+++ b/src/vs/platform/telemetry/test/browser/1dsAppender.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 import type { ITelemetryItem, ITelemetryUnloadState } from '@microsoft/1ds-core-js';
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { OneDataSystemWebAppender } from 'vs/platform/telemetry/browser/1dsAppender';
-import { IAppInsightsCore } from 'vs/platform/telemetry/common/1dsAppender';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { OneDataSystemWebAppender } from '../../browser/1dsAppender.js';
+import { IAppInsightsCore } from '../../common/1dsAppender.js';
 
 class AppInsightsCoreMock implements IAppInsightsCore {
 	pluginVersionString: string = 'Test Runner';
diff --git a/src/vs/platform/telemetry/test/browser/telemetryService.test.ts b/src/vs/platform/telemetry/test/browser/telemetryService.test.ts
index bc75667e949..08c430e020c 100644
--- a/src/vs/platform/telemetry/test/browser/telemetryService.test.ts
+++ b/src/vs/platform/telemetry/test/browser/telemetryService.test.ts
@@ -5,17 +5,17 @@
 import assert from 'assert';
 import * as sinon from 'sinon';
 import sinonTest from 'sinon-test';
-import { mainWindow } from 'vs/base/browser/window';
-import * as Errors from 'vs/base/common/errors';
-import { Emitter } from 'vs/base/common/event';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import product from 'vs/platform/product/common/product';
-import { IProductService } from 'vs/platform/product/common/productService';
-import ErrorTelemetry from 'vs/platform/telemetry/browser/errorTelemetry';
-import { TelemetryConfiguration, TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
-import { ITelemetryServiceConfig, TelemetryService } from 'vs/platform/telemetry/common/telemetryService';
-import { ITelemetryAppender, NullAppender } from 'vs/platform/telemetry/common/telemetryUtils';
+import { mainWindow } from '../../../../base/browser/window.js';
+import * as Errors from '../../../../base/common/errors.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { TestConfigurationService } from '../../../configuration/test/common/testConfigurationService.js';
+import product from '../../../product/common/product.js';
+import { IProductService } from '../../../product/common/productService.js';
+import ErrorTelemetry from '../../browser/errorTelemetry.js';
+import { TelemetryConfiguration, TelemetryLevel } from '../../common/telemetry.js';
+import { ITelemetryServiceConfig, TelemetryService } from '../../common/telemetryService.js';
+import { ITelemetryAppender, NullAppender } from '../../common/telemetryUtils.js';
 
 const sinonTestFn = sinonTest(sinon);
 
diff --git a/src/vs/platform/telemetry/test/common/telemetryLogAppender.test.ts b/src/vs/platform/telemetry/test/common/telemetryLogAppender.test.ts
index 2fe9b7a6477..91721dc7bd5 100644
--- a/src/vs/platform/telemetry/test/common/telemetryLogAppender.test.ts
+++ b/src/vs/platform/telemetry/test/common/telemetryLogAppender.test.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { Event } from 'vs/base/common/event';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { AbstractLogger, DEFAULT_LOG_LEVEL, ILogger, ILoggerService, LogLevel, NullLogService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { TelemetryLogAppender } from 'vs/platform/telemetry/common/telemetryLogAppender';
+import { Event } from '../../../../base/common/event.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { IEnvironmentService } from '../../../environment/common/environment.js';
+import { TestInstantiationService } from '../../../instantiation/test/common/instantiationServiceMock.js';
+import { AbstractLogger, DEFAULT_LOG_LEVEL, ILogger, ILoggerService, LogLevel, NullLogService } from '../../../log/common/log.js';
+import { IProductService } from '../../../product/common/productService.js';
+import { TelemetryLogAppender } from '../../common/telemetryLogAppender.js';
 
 class TestTelemetryLogger extends AbstractLogger implements ILogger {
 
diff --git a/src/vs/platform/terminal/common/capabilities/bufferMarkCapability.ts b/src/vs/platform/terminal/common/capabilities/bufferMarkCapability.ts
index 64399227a90..dc2c8819170 100644
--- a/src/vs/platform/terminal/common/capabilities/bufferMarkCapability.ts
+++ b/src/vs/platform/terminal/common/capabilities/bufferMarkCapability.ts
@@ -3,11 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IBufferMarkCapability, TerminalCapability, IMarkProperties } from 'vs/platform/terminal/common/capabilities/capabilities';
-// Importing types is safe in any layer
-// eslint-disable-next-line local/code-import-patterns
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IBufferMarkCapability, TerminalCapability, IMarkProperties } from './capabilities.js';
 import type { IMarker, Terminal } from '@xterm/headless';
 
 /**
diff --git a/src/vs/platform/terminal/common/capabilities/capabilities.ts b/src/vs/platform/terminal/common/capabilities/capabilities.ts
index 1ffe6ff109a..b6d91be1408 100644
--- a/src/vs/platform/terminal/common/capabilities/capabilities.ts
+++ b/src/vs/platform/terminal/common/capabilities/capabilities.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import type { IPromptInputModel } from 'vs/platform/terminal/common/capabilities/commandDetection/promptInputModel';
-import { ICurrentPartialCommand } from 'vs/platform/terminal/common/capabilities/commandDetection/terminalCommand';
-import { ITerminalOutputMatch, ITerminalOutputMatcher } from 'vs/platform/terminal/common/terminal';
-import { ReplayEntry } from 'vs/platform/terminal/common/terminalProcess';
+import { Event } from '../../../../base/common/event.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import type { IPromptInputModel, ISerializedPromptInputModel } from './commandDetection/promptInputModel.js';
+import { ICurrentPartialCommand } from './commandDetection/terminalCommand.js';
+import { ITerminalOutputMatch, ITerminalOutputMatcher } from '../terminal.js';
+import { ReplayEntry } from '../terminalProcess.js';
 
 interface IEvent<T, U = void> {
 	(listener: (arg1: T, arg2: U) => any): IDisposable;
@@ -301,6 +301,7 @@ export interface IMarkProperties {
 export interface ISerializedCommandDetectionCapability {
 	isWindowsPty: boolean;
 	commands: ISerializedTerminalCommand[];
+	promptInputModel: ISerializedPromptInputModel | undefined;
 }
 export interface IPtyHostProcessReplayEvent {
 	events: ReplayEntry[];
diff --git a/src/vs/platform/terminal/common/capabilities/commandDetection/promptInputModel.ts b/src/vs/platform/terminal/common/capabilities/commandDetection/promptInputModel.ts
index 0f1c53efded..50ff706be7f 100644
--- a/src/vs/platform/terminal/common/capabilities/commandDetection/promptInputModel.ts
+++ b/src/vs/platform/terminal/common/capabilities/commandDetection/promptInputModel.ts
@@ -3,14 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ILogService, LogLevel } from 'vs/platform/log/common/log';
-import type { ITerminalCommand } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { throttle } from 'vs/base/common/decorators';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { ILogService, LogLevel } from '../../../../log/common/log.js';
+import type { ITerminalCommand } from '../capabilities.js';
+import { throttle } from '../../../../../base/common/decorators.js';
 
-// Importing types is safe in any layer
-// eslint-disable-next-line local/code-import-patterns
 import type { Terminal, IMarker, IBufferCell, IBufferLine, IBuffer } from '@xterm/headless';
 
 const enum PromptInputState {
@@ -23,7 +21,7 @@ const enum PromptInputState {
  * A model of the prompt input state using shell integration and analyzing the terminal buffer. This
  * may not be 100% accurate but provides a best guess.
  */
-export interface IPromptInputModel {
+export interface IPromptInputModel extends IPromptInputModelState {
 	readonly onDidStartInput: Event<IPromptInputModelState>;
 	readonly onDidChangeInput: Event<IPromptInputModelState>;
 	readonly onDidFinishInput: Event<IPromptInputModelState>;
@@ -32,10 +30,6 @@ export interface IPromptInputModel {
 	 */
 	readonly onDidInterrupt: Event<IPromptInputModelState>;
 
-	readonly value: string;
-	readonly cursorIndex: number;
-	readonly ghostTextIndex: number;
-
 	/**
 	 * Gets the prompt input as a user-friendly string where `|` is the cursor position and `[` and
 	 * `]` wrap any ghost text.
@@ -44,11 +38,37 @@ export interface IPromptInputModel {
 }
 
 export interface IPromptInputModelState {
+	/**
+	 * The full prompt input include ghost text.
+	 */
 	readonly value: string;
+	/**
+	 * The prompt input up to the cursor index, this will always exclude the ghost text.
+	 */
+	readonly prefix: string;
+	/**
+	 * The prompt input from the cursor to the end, this _does not_ include ghost text.
+	 */
+	readonly suffix: string;
+	/**
+	 * The index of the cursor in {@link value}.
+	 */
 	readonly cursorIndex: number;
+	/**
+	 * The index of the start of ghost text in {@link value}. This is -1 when there is no ghost
+	 * text.
+	 */
 	readonly ghostTextIndex: number;
 }
 
+export interface ISerializedPromptInputModel {
+	readonly modelState: IPromptInputModelState;
+	readonly commandStartX: number;
+	readonly lastPromptLine: string | undefined;
+	readonly continuationPrompt: string | undefined;
+	readonly lastUserInput: string;
+}
+
 export class PromptInputModel extends Disposable implements IPromptInputModel {
 	private _state: PromptInputState = PromptInputState.Unknown;
 
@@ -61,6 +81,8 @@ export class PromptInputModel extends Disposable implements IPromptInputModel {
 
 	private _value: string = '';
 	get value() { return this._value; }
+	get prefix() { return this._value.substring(0, this._cursorIndex); }
+	get suffix() { return this._value.substring(this._cursorIndex, this._ghostTextIndex === -1 ? undefined : this._ghostTextIndex); }
 
 	private _cursorIndex: number = 0;
 	get cursorIndex() { return this._cursorIndex; }
@@ -142,6 +164,26 @@ export class PromptInputModel extends Disposable implements IPromptInputModel {
 		return result;
 	}
 
+	serialize(): ISerializedPromptInputModel {
+		return {
+			modelState: this._createStateObject(),
+			commandStartX: this._commandStartX,
+			lastPromptLine: this._lastPromptLine,
+			continuationPrompt: this._continuationPrompt,
+			lastUserInput: this._lastUserInput
+		};
+	}
+
+	deserialize(serialized: ISerializedPromptInputModel): void {
+		this._value = serialized.modelState.value;
+		this._cursorIndex = serialized.modelState.cursorIndex;
+		this._ghostTextIndex = serialized.modelState.ghostTextIndex;
+		this._commandStartX = serialized.commandStartX;
+		this._lastPromptLine = serialized.lastPromptLine;
+		this._continuationPrompt = serialized.continuationPrompt;
+		this._lastUserInput = serialized.lastUserInput;
+	}
+
 	private _handleCommandStart(command: { marker: IMarker }) {
 		if (this._state === PromptInputState.Input) {
 			return;
@@ -220,8 +262,13 @@ export class PromptInputModel extends Disposable implements IPromptInputModel {
 
 		const absoluteCursorY = buffer.baseY + buffer.cursorY;
 		let value = commandLine;
-		let cursorIndex = absoluteCursorY === commandStartY ? this._getRelativeCursorIndex(this._commandStartX, buffer, line) : commandLine.trimEnd().length + 1;
 		let ghostTextIndex = -1;
+		let cursorIndex: number;
+		if (absoluteCursorY === commandStartY) {
+			cursorIndex = this._getRelativeCursorIndex(this._commandStartX, buffer, line);
+		} else {
+			cursorIndex = commandLine.trimEnd().length;
+		}
 
 		// Detect ghost text by looking for italic or dim text in or after the cursor and
 		// non-italic/dim text in the cell closest non-whitespace cell before the cursor
@@ -235,15 +282,25 @@ export class PromptInputModel extends Disposable implements IPromptInputModel {
 			line = buffer.getLine(y);
 			const lineText = line?.translateToString(true);
 			if (lineText && line) {
+				// Check if the line wrapped without a new line (continuation)
+				if (line.isWrapped) {
+					value += lineText;
+					const relativeCursorIndex = this._getRelativeCursorIndex(0, buffer, line);
+					if (absoluteCursorY === y) {
+						cursorIndex += relativeCursorIndex;
+					} else {
+						cursorIndex += lineText.length;
+					}
+				}
 				// Verify continuation prompt if we have it, if this line doesn't have it then the
-				// user likely just pressed enter
-				if (this._continuationPrompt === undefined || this._lineContainsContinuationPrompt(lineText)) {
+				// user likely just pressed enter.
+				else if (this._continuationPrompt === undefined || this._lineContainsContinuationPrompt(lineText)) {
 					const trimmedLineText = this._trimContinuationPrompt(lineText);
 					value += `\n${trimmedLineText}`;
 					if (absoluteCursorY === y) {
 						const continuationCellWidth = this._getContinuationPromptCellWidth(line, lineText);
 						const relativeCursorIndex = this._getRelativeCursorIndex(continuationCellWidth, buffer, line);
-						cursorIndex += relativeCursorIndex;
+						cursorIndex += relativeCursorIndex + 1;
 					} else {
 						cursorIndex += trimmedLineText.length + 1;
 					}
@@ -419,6 +476,8 @@ export class PromptInputModel extends Disposable implements IPromptInputModel {
 	private _createStateObject(): IPromptInputModelState {
 		return Object.freeze({
 			value: this._value,
+			prefix: this.prefix,
+			suffix: this.suffix,
 			cursorIndex: this._cursorIndex,
 			ghostTextIndex: this._ghostTextIndex
 		});
diff --git a/src/vs/platform/terminal/common/capabilities/commandDetection/terminalCommand.ts b/src/vs/platform/terminal/common/capabilities/commandDetection/terminalCommand.ts
index b0ecb408155..fc8c7655d5e 100644
--- a/src/vs/platform/terminal/common/capabilities/commandDetection/terminalCommand.ts
+++ b/src/vs/platform/terminal/common/capabilities/commandDetection/terminalCommand.ts
@@ -3,11 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IMarkProperties, IMarker, ISerializedTerminalCommand, ITerminalCommand, IXtermMarker } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { ITerminalOutputMatcher, ITerminalOutputMatch } from 'vs/platform/terminal/common/terminal';
-
-// Importing types is safe in any layer
-// eslint-disable-next-line local/code-import-patterns
+import { IMarkProperties, IMarker, ISerializedTerminalCommand, ITerminalCommand, IXtermMarker } from '../capabilities.js';
+import { ITerminalOutputMatcher, ITerminalOutputMatch } from '../../terminal.js';
 import type { IBuffer, IBufferLine, Terminal } from '@xterm/headless';
 
 export interface ITerminalCommandProperties {
diff --git a/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts b/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts
index 024c79d5c66..fa4f13707ec 100644
--- a/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts
+++ b/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts
@@ -3,18 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { debounce } from 'vs/base/common/decorators';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable, MandatoryMutableDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { ILogService } from 'vs/platform/log/common/log';
-import { CommandInvalidationReason, ICommandDetectionCapability, ICommandInvalidationRequest, IHandleCommandOptions, ISerializedCommandDetectionCapability, ISerializedTerminalCommand, ITerminalCommand, IXtermMarker, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { ITerminalOutputMatcher } from 'vs/platform/terminal/common/terminal';
-import { ICurrentPartialCommand, PartialTerminalCommand, TerminalCommand } from 'vs/platform/terminal/common/capabilities/commandDetection/terminalCommand';
-import { PromptInputModel, type IPromptInputModel } from 'vs/platform/terminal/common/capabilities/commandDetection/promptInputModel';
-
-// Importing types is safe in any layer
-// eslint-disable-next-line local/code-import-patterns
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { debounce } from '../../../../base/common/decorators.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable, MandatoryMutableDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { ILogService } from '../../../log/common/log.js';
+import { CommandInvalidationReason, ICommandDetectionCapability, ICommandInvalidationRequest, IHandleCommandOptions, ISerializedCommandDetectionCapability, ISerializedTerminalCommand, ITerminalCommand, IXtermMarker, TerminalCapability } from './capabilities.js';
+import { ITerminalOutputMatcher } from '../terminal.js';
+import { ICurrentPartialCommand, PartialTerminalCommand, TerminalCommand } from './commandDetection/terminalCommand.js';
+import { PromptInputModel, type IPromptInputModel } from './commandDetection/promptInputModel.js';
 import type { IBuffer, IDisposable, IMarker, Terminal } from '@xterm/headless';
 
 interface ITerminalDimensions {
@@ -149,6 +146,9 @@ export class CommandDetectionCapability extends Disposable implements ICommandDe
 
 	@debounce(500)
 	private _handleCursorMove() {
+		if (this._store.isDisposed) {
+			return;
+		}
 		// Early versions of conpty do not have real support for an alt buffer, in addition certain
 		// commands such as tsc watch will write to the top of the normal buffer. The following
 		// checks when the cursor has moved while the normal buffer is empty and if it is above the
@@ -408,7 +408,8 @@ export class CommandDetectionCapability extends Disposable implements ICommandDe
 		}
 		return {
 			isWindowsPty: this._ptyHeuristics.value instanceof WindowsPtyHeuristics,
-			commands
+			commands,
+			promptInputModel: this._promptInputModel.serialize(),
 		};
 	}
 
@@ -443,6 +444,9 @@ export class CommandDetectionCapability extends Disposable implements ICommandDe
 			this._logService.debug('CommandDetectionCapability#onCommandFinished', newCommand);
 			this._onCommandFinished.fire(newCommand);
 		}
+		if (serialized.promptInputModel) {
+			this._promptInputModel.deserialize(serialized.promptInputModel);
+		}
 	}
 }
 
diff --git a/src/vs/platform/terminal/common/capabilities/cwdDetectionCapability.ts b/src/vs/platform/terminal/common/capabilities/cwdDetectionCapability.ts
index 96417aca6fc..56f52a43072 100644
--- a/src/vs/platform/terminal/common/capabilities/cwdDetectionCapability.ts
+++ b/src/vs/platform/terminal/common/capabilities/cwdDetectionCapability.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ICwdDetectionCapability, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ICwdDetectionCapability, TerminalCapability } from './capabilities.js';
 
 export class CwdDetectionCapability extends Disposable implements ICwdDetectionCapability {
 	readonly type = TerminalCapability.CwdDetection;
diff --git a/src/vs/platform/terminal/common/capabilities/naiveCwdDetectionCapability.ts b/src/vs/platform/terminal/common/capabilities/naiveCwdDetectionCapability.ts
index daab3687d42..1bb91995c39 100644
--- a/src/vs/platform/terminal/common/capabilities/naiveCwdDetectionCapability.ts
+++ b/src/vs/platform/terminal/common/capabilities/naiveCwdDetectionCapability.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { ITerminalChildProcess } from 'vs/platform/terminal/common/terminal';
-import { TerminalCapability, INaiveCwdDetectionCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
+import { Emitter } from '../../../../base/common/event.js';
+import { ITerminalChildProcess } from '../terminal.js';
+import { TerminalCapability, INaiveCwdDetectionCapability } from './capabilities.js';
 
 export class NaiveCwdDetectionCapability implements INaiveCwdDetectionCapability {
 	constructor(private readonly _process: ITerminalChildProcess) { }
diff --git a/src/vs/platform/terminal/common/capabilities/partialCommandDetectionCapability.ts b/src/vs/platform/terminal/common/capabilities/partialCommandDetectionCapability.ts
index 07e2ad6b20f..6c5399225b5 100644
--- a/src/vs/platform/terminal/common/capabilities/partialCommandDetectionCapability.ts
+++ b/src/vs/platform/terminal/common/capabilities/partialCommandDetectionCapability.ts
@@ -3,11 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { IPartialCommandDetectionCapability, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
-// Importing types is safe in any layer
-// eslint-disable-next-line local/code-import-patterns
+import { Emitter } from '../../../../base/common/event.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { IPartialCommandDetectionCapability, TerminalCapability } from './capabilities.js';
 import type { IMarker, Terminal } from '@xterm/headless';
 
 const enum Constants {
diff --git a/src/vs/platform/terminal/common/capabilities/terminalCapabilityStore.ts b/src/vs/platform/terminal/common/capabilities/terminalCapabilityStore.ts
index 501ce1a78f3..dfa008c0653 100644
--- a/src/vs/platform/terminal/common/capabilities/terminalCapabilityStore.ts
+++ b/src/vs/platform/terminal/common/capabilities/terminalCapabilityStore.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ITerminalCapabilityImplMap, ITerminalCapabilityStore, TerminalCapability, TerminalCapabilityChangeEvent } from 'vs/platform/terminal/common/capabilities/capabilities';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ITerminalCapabilityImplMap, ITerminalCapabilityStore, TerminalCapability, TerminalCapabilityChangeEvent } from './capabilities.js';
 
 export class TerminalCapabilityStore extends Disposable implements ITerminalCapabilityStore {
 	private _map: Map<TerminalCapability, { type: TerminalCapability }> = new Map();
diff --git a/src/vs/platform/terminal/common/environmentVariable.ts b/src/vs/platform/terminal/common/environmentVariable.ts
index 919c5c7b07d..7db558bc488 100644
--- a/src/vs/platform/terminal/common/environmentVariable.ts
+++ b/src/vs/platform/terminal/common/environmentVariable.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IProcessEnvironment } from 'vs/base/common/platform';
-import { IWorkspaceFolderData } from 'vs/platform/workspace/common/workspace';
+import { IProcessEnvironment } from '../../../base/common/platform.js';
+import { IWorkspaceFolderData } from '../../workspace/common/workspace.js';
 
 export enum EnvironmentVariableMutatorType {
 	Replace = 1,
diff --git a/src/vs/platform/terminal/common/environmentVariableCollection.ts b/src/vs/platform/terminal/common/environmentVariableCollection.ts
index c9dcd52c172..66115b56923 100644
--- a/src/vs/platform/terminal/common/environmentVariableCollection.ts
+++ b/src/vs/platform/terminal/common/environmentVariableCollection.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IProcessEnvironment, isWindows } from 'vs/base/common/platform';
-import { EnvironmentVariableMutatorType, EnvironmentVariableScope, IEnvironmentVariableCollection, IExtensionOwnedEnvironmentDescriptionMutator, IExtensionOwnedEnvironmentVariableMutator, IMergedEnvironmentVariableCollection, IMergedEnvironmentVariableCollectionDiff } from 'vs/platform/terminal/common/environmentVariable';
+import { IProcessEnvironment, isWindows } from '../../../base/common/platform.js';
+import { EnvironmentVariableMutatorType, EnvironmentVariableScope, IEnvironmentVariableCollection, IExtensionOwnedEnvironmentDescriptionMutator, IExtensionOwnedEnvironmentVariableMutator, IMergedEnvironmentVariableCollection, IMergedEnvironmentVariableCollectionDiff } from './environmentVariable.js';
 
 type VariableResolver = (str: string) => Promise<string>;
 
diff --git a/src/vs/platform/terminal/common/environmentVariableShared.ts b/src/vs/platform/terminal/common/environmentVariableShared.ts
index 8d9ea66fe57..d782d50f3b0 100644
--- a/src/vs/platform/terminal/common/environmentVariableShared.ts
+++ b/src/vs/platform/terminal/common/environmentVariableShared.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IEnvironmentVariableCollectionDescription, IEnvironmentVariableCollection, IEnvironmentVariableMutator, ISerializableEnvironmentDescriptionMap as ISerializableEnvironmentDescriptionMap, ISerializableEnvironmentVariableCollection, ISerializableEnvironmentVariableCollections } from 'vs/platform/terminal/common/environmentVariable';
+import { IEnvironmentVariableCollectionDescription, IEnvironmentVariableCollection, IEnvironmentVariableMutator, ISerializableEnvironmentDescriptionMap as ISerializableEnvironmentDescriptionMap, ISerializableEnvironmentVariableCollection, ISerializableEnvironmentVariableCollections } from './environmentVariable.js';
 
 // This file is shared between the renderer and extension host
 
diff --git a/src/vs/platform/terminal/common/requestStore.ts b/src/vs/platform/terminal/common/requestStore.ts
index 62ad1c641e8..d3ad4f6b68a 100644
--- a/src/vs/platform/terminal/common/requestStore.ts
+++ b/src/vs/platform/terminal/common/requestStore.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { timeout } from 'vs/base/common/async';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable, dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { ILogService } from 'vs/platform/log/common/log';
+import { timeout } from '../../../base/common/async.js';
+import { CancellationTokenSource } from '../../../base/common/cancellation.js';
+import { Emitter } from '../../../base/common/event.js';
+import { Disposable, dispose, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { ILogService } from '../../log/common/log.js';
 
 /**
  * A helper class to track requests that have replies. Using this it's easy to implement an event
diff --git a/src/vs/platform/terminal/common/terminal.ts b/src/vs/platform/terminal/common/terminal.ts
index f8e502eb908..34195bc820d 100644
--- a/src/vs/platform/terminal/common/terminal.ts
+++ b/src/vs/platform/terminal/common/terminal.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { IProcessEnvironment, OperatingSystem } from 'vs/base/common/platform';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IPtyHostProcessReplayEvent, ISerializedCommandDetectionCapability, ITerminalCapabilityStore } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { IGetTerminalLayoutInfoArgs, IProcessDetails, ISetTerminalLayoutInfoArgs } from 'vs/platform/terminal/common/terminalProcess';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { ISerializableEnvironmentVariableCollections } from 'vs/platform/terminal/common/environmentVariable';
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { Registry } from 'vs/platform/registry/common/platform';
-import type * as performance from 'vs/base/common/performance';
-import { ILogService } from 'vs/platform/log/common/log';
+import { Event } from '../../../base/common/event.js';
+import { IProcessEnvironment, OperatingSystem } from '../../../base/common/platform.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { IPtyHostProcessReplayEvent, ISerializedCommandDetectionCapability, ITerminalCapabilityStore } from './capabilities/capabilities.js';
+import { IGetTerminalLayoutInfoArgs, IProcessDetails, ISetTerminalLayoutInfoArgs } from './terminalProcess.js';
+import { ThemeIcon } from '../../../base/common/themables.js';
+import { ISerializableEnvironmentVariableCollections } from './environmentVariable.js';
+import { RawContextKey } from '../../contextkey/common/contextkey.js';
+import { IWorkspaceFolder } from '../../workspace/common/workspace.js';
+import { Registry } from '../../registry/common/platform.js';
+import type * as performance from '../../../base/common/performance.js';
+import { ILogService } from '../../log/common/log.js';
 
 export const terminalTabFocusModeContextKey = new RawContextKey<boolean>('terminalTabFocusMode', false, true);
 
@@ -90,6 +90,7 @@ export const enum TerminalSettingId {
 	EnvWindows = 'terminal.integrated.env.windows',
 	EnvironmentChangesIndicator = 'terminal.integrated.environmentChangesIndicator',
 	EnvironmentChangesRelaunch = 'terminal.integrated.environmentChangesRelaunch',
+	ExperimentalWindowsUseConptyDll = 'terminal.integrated.experimental.windowsUseConptyDll',
 	ShowExitAlert = 'terminal.integrated.showExitAlert',
 	SplitCwd = 'terminal.integrated.splitCwd',
 	WindowsEnableConpty = 'terminal.integrated.windowsEnableConpty',
@@ -106,11 +107,9 @@ export const enum TerminalSettingId {
 	InheritEnv = 'terminal.integrated.inheritEnv',
 	ShowLinkHover = 'terminal.integrated.showLinkHover',
 	IgnoreProcessNames = 'terminal.integrated.ignoreProcessNames',
-	AutoReplies = 'terminal.integrated.autoReplies',
 	ShellIntegrationEnabled = 'terminal.integrated.shellIntegration.enabled',
 	ShellIntegrationShowWelcome = 'terminal.integrated.shellIntegration.showWelcome',
 	ShellIntegrationDecorationsEnabled = 'terminal.integrated.shellIntegration.decorationsEnabled',
-	ShellIntegrationCommandHistory = 'terminal.integrated.shellIntegration.history',
 	EnableImages = 'terminal.integrated.enableImages',
 	SmoothScrolling = 'terminal.integrated.smoothScrolling',
 	IgnoreBracketedPasteMode = 'terminal.integrated.ignoreBracketedPasteMode',
@@ -127,23 +126,27 @@ export const enum TerminalSettingId {
 }
 
 export const enum PosixShellType {
-	PowerShell = 'pwsh',
 	Bash = 'bash',
 	Fish = 'fish',
 	Sh = 'sh',
 	Csh = 'csh',
 	Ksh = 'ksh',
 	Zsh = 'zsh',
-	Python = 'python'
+
 }
 export const enum WindowsShellType {
 	CommandPrompt = 'cmd',
-	PowerShell = 'pwsh',
 	Wsl = 'wsl',
 	GitBash = 'gitbash',
-	Python = 'python'
 }
-export type TerminalShellType = PosixShellType | WindowsShellType;
+
+export const enum GeneralShellType {
+	PowerShell = 'pwsh',
+	Python = 'python',
+	Julia = 'julia',
+	NuShell = 'nu'
+}
+export type TerminalShellType = PosixShellType | WindowsShellType | GeneralShellType;
 
 export interface IRawTerminalInstanceLayoutInfo<T> {
 	relativeSize: number;
@@ -328,9 +331,6 @@ export interface IPtyService {
 	updateTitle(id: number, title: string, titleSource: TitleEventSource): Promise<void>;
 	updateIcon(id: number, userInitiated: boolean, icon: TerminalIcon, color?: string): Promise<void>;
 
-	installAutoReply(match: string, reply: string): Promise<void>;
-	uninstallAllAutoReplies(): Promise<void>;
-	uninstallAutoReply(match: string): Promise<void>;
 	getDefaultSystemShell(osOverride?: OperatingSystem): Promise<string>;
 	getEnvironment(): Promise<IProcessEnvironment>;
 	getWslPath(original: string, direction: 'unix-to-win' | 'win-to-unix'): Promise<string>;
@@ -356,9 +356,23 @@ export interface IPtyService {
 
 	// TODO: Make mandatory and remove impl from pty host service
 	refreshIgnoreProcessNames?(names: string[]): Promise<void>;
+
+	// #region Pty service contribution RPC calls
+
+	installAutoReply(match: string, reply: string): Promise<void>;
+	uninstallAllAutoReplies(): Promise<void>;
+
+	// #endregion
 }
 export const IPtyService = createDecorator<IPtyService>('ptyService');
 
+export interface IPtyServiceContribution {
+	handleProcessReady(persistentProcessId: number, process: ITerminalChildProcess): void;
+	handleProcessDispose(persistentProcessId: number): void;
+	handleProcessInput(persistentProcessId: number, data: string): void;
+	handleProcessResize(persistentProcessId: number, cols: number, rows: number): void;
+}
+
 export interface IPtyHostController {
 	readonly onPtyHostExit: Event<number>;
 	readonly onPtyHostStart: Event<void>;
@@ -661,6 +675,7 @@ export interface ITerminalProcessOptions {
 		nonce: string;
 	};
 	windowsEnableConpty: boolean;
+	windowsUseConptyDll: boolean;
 	environmentVariableCollections: ISerializableEnvironmentVariableCollections | undefined;
 	workspaceFolder: IWorkspaceFolder | undefined;
 }
@@ -979,7 +994,7 @@ export interface ITerminalCommandSelector {
 	kind?: 'fix' | 'explain';
 }
 
-export interface ITerminalBackend {
+export interface ITerminalBackend extends ITerminalBackendPtyServiceContributions {
 	readonly remoteAuthority: string | undefined;
 
 	readonly isResponsive: boolean;
@@ -989,6 +1004,7 @@ export interface ITerminalBackend {
 	 * has been actioned.
 	 */
 	readonly whenReady: Promise<void>;
+
 	/**
 	 * Signal to the backend that persistence has been actioned and is ready for use.
 	 */
@@ -1045,6 +1061,11 @@ export interface ITerminalBackend {
 	restartPtyHost(): void;
 }
 
+export interface ITerminalBackendPtyServiceContributions {
+	installAutoReply(match: string, reply: string): Promise<void>;
+	uninstallAllAutoReplies(): Promise<void>;
+}
+
 export const TerminalExtensions = {
 	Backend: 'workbench.contributions.terminal.processBackend'
 };
diff --git a/src/vs/platform/terminal/common/terminalDataBuffering.ts b/src/vs/platform/terminal/common/terminalDataBuffering.ts
index 276b01c5467..980edce5d7e 100644
--- a/src/vs/platform/terminal/common/terminalDataBuffering.ts
+++ b/src/vs/platform/terminal/common/terminalDataBuffering.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { IProcessDataEvent } from 'vs/platform/terminal/common/terminal';
+import { Event } from '../../../base/common/event.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { IProcessDataEvent } from './terminal.js';
 
 interface TerminalDataBuffer extends IDisposable {
 	data: string[];
diff --git a/src/vs/platform/terminal/common/terminalEnvironment.ts b/src/vs/platform/terminal/common/terminalEnvironment.ts
index 5ddf2aa71d6..dbc6de1d0a5 100644
--- a/src/vs/platform/terminal/common/terminalEnvironment.ts
+++ b/src/vs/platform/terminal/common/terminalEnvironment.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { OperatingSystem, OS } from 'vs/base/common/platform';
-import type { IShellLaunchConfig } from 'vs/platform/terminal/common/terminal';
+import { OperatingSystem, OS } from '../../../base/common/platform.js';
+import type { IShellLaunchConfig } from './terminal.js';
 
 /**
  * Aggressively escape non-windows paths to prepare for being sent to a shell. This will do some
diff --git a/src/vs/platform/terminal/common/terminalLogService.ts b/src/vs/platform/terminal/common/terminalLogService.ts
index fe5e621ff89..c536b084517 100644
--- a/src/vs/platform/terminal/common/terminalLogService.ts
+++ b/src/vs/platform/terminal/common/terminalLogService.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Event } from 'vs/base/common/event';
-import { localize } from 'vs/nls';
-import { ILogger, ILoggerService, LogLevel } from 'vs/platform/log/common/log';
-import { ITerminalLogService } from 'vs/platform/terminal/common/terminal';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { joinPath } from 'vs/base/common/resources';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { Event } from '../../../base/common/event.js';
+import { localize } from '../../../nls.js';
+import { ILogger, ILoggerService, LogLevel } from '../../log/common/log.js';
+import { ITerminalLogService } from './terminal.js';
+import { IWorkspaceContextService } from '../../workspace/common/workspace.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { joinPath } from '../../../base/common/resources.js';
 
 export class TerminalLogService extends Disposable implements ITerminalLogService {
 	declare _serviceBrand: undefined;
diff --git a/src/vs/platform/terminal/common/terminalPlatformConfiguration.ts b/src/vs/platform/terminal/common/terminalPlatformConfiguration.ts
index 2c15a096423..7d8d78ba4fe 100644
--- a/src/vs/platform/terminal/common/terminalPlatformConfiguration.ts
+++ b/src/vs/platform/terminal/common/terminalPlatformConfiguration.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getAllCodicons } from 'vs/base/common/codicons';
-import { IJSONSchema, IJSONSchemaMap } from 'vs/base/common/jsonSchema';
-import { OperatingSystem, Platform, PlatformToString } from 'vs/base/common/platform';
-import { localize } from 'vs/nls';
-import { ConfigurationScope, Extensions, IConfigurationNode, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IExtensionTerminalProfile, ITerminalProfile, TerminalSettingId } from 'vs/platform/terminal/common/terminal';
-import { createProfileSchemaEnums } from 'vs/platform/terminal/common/terminalProfiles';
+import { getAllCodicons } from '../../../base/common/codicons.js';
+import { IJSONSchema, IJSONSchemaMap } from '../../../base/common/jsonSchema.js';
+import { OperatingSystem, Platform, PlatformToString } from '../../../base/common/platform.js';
+import { localize } from '../../../nls.js';
+import { ConfigurationScope, Extensions, IConfigurationNode, IConfigurationRegistry } from '../../configuration/common/configurationRegistry.js';
+import { Registry } from '../../registry/common/platform.js';
+import { IExtensionTerminalProfile, ITerminalProfile, TerminalSettingId } from './terminal.js';
+import { createProfileSchemaEnums } from './terminalProfiles.js';
 
 export const terminalColorSchema: IJSONSchema = {
 	type: ['string', 'null'],
diff --git a/src/vs/platform/terminal/common/terminalProcess.ts b/src/vs/platform/terminal/common/terminalProcess.ts
index a56d78ee9cc..cb8f03bc286 100644
--- a/src/vs/platform/terminal/common/terminalProcess.ts
+++ b/src/vs/platform/terminal/common/terminalProcess.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { UriComponents } from 'vs/base/common/uri';
-import { ISerializableEnvironmentVariableCollection, ISerializableEnvironmentVariableCollections } from 'vs/platform/terminal/common/environmentVariable';
-import { IFixedTerminalDimensions, IRawTerminalTabLayoutInfo, IReconnectionProperties, ITerminalEnvironment, ITerminalTabLayoutInfoById, TerminalIcon, TerminalType, TitleEventSource, WaitOnExitValue } from 'vs/platform/terminal/common/terminal';
+import { UriComponents } from '../../../base/common/uri.js';
+import { ISerializableEnvironmentVariableCollection, ISerializableEnvironmentVariableCollections } from './environmentVariable.js';
+import { IFixedTerminalDimensions, IRawTerminalTabLayoutInfo, IReconnectionProperties, ITerminalEnvironment, ITerminalTabLayoutInfoById, TerminalIcon, TerminalType, TitleEventSource, WaitOnExitValue } from './terminal.js';
 
 export interface ISingleTerminalConfiguration<T> {
 	userValue: T | undefined;
diff --git a/src/vs/platform/terminal/common/terminalProfiles.ts b/src/vs/platform/terminal/common/terminalProfiles.ts
index 45e838f3543..a41257542b0 100644
--- a/src/vs/platform/terminal/common/terminalProfiles.ts
+++ b/src/vs/platform/terminal/common/terminalProfiles.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from 'vs/base/common/codicons';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { IExtensionTerminalProfile, ITerminalProfile, TerminalIcon } from 'vs/platform/terminal/common/terminal';
-import { ThemeIcon } from 'vs/base/common/themables';
+import { Codicon } from '../../../base/common/codicons.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { localize } from '../../../nls.js';
+import { IExtensionTerminalProfile, ITerminalProfile, TerminalIcon } from './terminal.js';
+import { ThemeIcon } from '../../../base/common/themables.js';
 
 export function createProfileSchemaEnums(detectedProfiles: ITerminalProfile[], extensionProfiles?: readonly IExtensionTerminalProfile[]): {
 	values: (string | null)[] | undefined;
diff --git a/src/vs/platform/terminal/common/terminalRecorder.ts b/src/vs/platform/terminal/common/terminalRecorder.ts
index 79a828cc220..18026ca1ad7 100644
--- a/src/vs/platform/terminal/common/terminalRecorder.ts
+++ b/src/vs/platform/terminal/common/terminalRecorder.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IPtyHostProcessReplayEvent } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { ReplayEntry } from 'vs/platform/terminal/common/terminalProcess';
+import { IPtyHostProcessReplayEvent } from './capabilities/capabilities.js';
+import { ReplayEntry } from './terminalProcess.js';
 
 const enum Constants {
 	MaxRecorderDataSize = 10 * 1024 * 1024 // 10MB
@@ -91,7 +91,8 @@ export class TerminalRecorder {
 			// No command restoration is needed when relaunching terminals
 			commands: {
 				isWindowsPty: false,
-				commands: []
+				commands: [],
+				promptInputModel: undefined,
 			}
 		};
 	}
diff --git a/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts b/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts
index cacc170e5cd..8221ad5c282 100644
--- a/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts
+++ b/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts
@@ -3,25 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IShellIntegration, ShellIntegrationStatus } from 'vs/platform/terminal/common/terminal';
-import { Disposable, dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { TerminalCapabilityStore } from 'vs/platform/terminal/common/capabilities/terminalCapabilityStore';
-import { CommandDetectionCapability } from 'vs/platform/terminal/common/capabilities/commandDetectionCapability';
-import { CwdDetectionCapability } from 'vs/platform/terminal/common/capabilities/cwdDetectionCapability';
-import { IBufferMarkCapability, ICommandDetectionCapability, ICwdDetectionCapability, ISerializedCommandDetectionCapability, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { PartialCommandDetectionCapability } from 'vs/platform/terminal/common/capabilities/partialCommandDetectionCapability';
-import { ILogService } from 'vs/platform/log/common/log';
-// Importing types is safe in any layer
-// eslint-disable-next-line local/code-import-patterns
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { Emitter } from 'vs/base/common/event';
-import { BufferMarkCapability } from 'vs/platform/terminal/common/capabilities/bufferMarkCapability';
-// Importing types is safe in any layer
-// eslint-disable-next-line local/code-import-patterns
+import { IShellIntegration, ShellIntegrationStatus } from '../terminal.js';
+import { Disposable, dispose, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { TerminalCapabilityStore } from '../capabilities/terminalCapabilityStore.js';
+import { CommandDetectionCapability } from '../capabilities/commandDetectionCapability.js';
+import { CwdDetectionCapability } from '../capabilities/cwdDetectionCapability.js';
+import { IBufferMarkCapability, ICommandDetectionCapability, ICwdDetectionCapability, ISerializedCommandDetectionCapability, TerminalCapability } from '../capabilities/capabilities.js';
+import { PartialCommandDetectionCapability } from '../capabilities/partialCommandDetectionCapability.js';
+import { ILogService } from '../../../log/common/log.js';
+import { ITelemetryService } from '../../../telemetry/common/telemetry.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { BufferMarkCapability } from '../capabilities/bufferMarkCapability.js';
 import type { ITerminalAddon, Terminal } from '@xterm/headless';
-import { URI } from 'vs/base/common/uri';
-import { sanitizeCwd } from 'vs/platform/terminal/common/terminalEnvironment';
-import { removeAnsiEscapeCodesFromPrompt } from 'vs/base/common/strings';
+import { URI } from '../../../../base/common/uri.js';
+import { sanitizeCwd } from '../terminalEnvironment.js';
+import { removeAnsiEscapeCodesFromPrompt } from '../../../../base/common/strings.js';
 
 
 /**
@@ -577,7 +573,8 @@ export class ShellIntegrationAddon extends Disposable implements IShellIntegrati
 		if (!this._terminal || !this.capabilities.has(TerminalCapability.CommandDetection)) {
 			return {
 				isWindowsPty: false,
-				commands: []
+				commands: [],
+				promptInputModel: undefined,
 			};
 		}
 		const result = this._createOrGetCommandDetection(this._terminal).serialize();
diff --git a/src/vs/platform/terminal/electron-main/electronPtyHostStarter.ts b/src/vs/platform/terminal/electron-main/electronPtyHostStarter.ts
index ebd0331692e..d4835c5879f 100644
--- a/src/vs/platform/terminal/electron-main/electronPtyHostStarter.ts
+++ b/src/vs/platform/terminal/electron-main/electronPtyHostStarter.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IEnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
-import { parsePtyHostDebugPort } from 'vs/platform/environment/node/environmentService';
-import { ILifecycleMainService } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IReconnectConstants, TerminalSettingId } from 'vs/platform/terminal/common/terminal';
-import { IPtyHostConnection, IPtyHostStarter } from 'vs/platform/terminal/node/ptyHost';
-import { UtilityProcess } from 'vs/platform/utilityProcess/electron-main/utilityProcess';
-import { Client as MessagePortClient } from 'vs/base/parts/ipc/electron-main/ipc.mp';
+import { IEnvironmentMainService } from '../../environment/electron-main/environmentMainService.js';
+import { parsePtyHostDebugPort } from '../../environment/node/environmentService.js';
+import { ILifecycleMainService } from '../../lifecycle/electron-main/lifecycleMainService.js';
+import { ILogService } from '../../log/common/log.js';
+import { NullTelemetryService } from '../../telemetry/common/telemetryUtils.js';
+import { IReconnectConstants, TerminalSettingId } from '../common/terminal.js';
+import { IPtyHostConnection, IPtyHostStarter } from '../node/ptyHost.js';
+import { UtilityProcess } from '../../utilityProcess/electron-main/utilityProcess.js';
+import { Client as MessagePortClient } from '../../../base/parts/ipc/electron-main/ipc.mp.js';
 import { IpcMainEvent } from 'electron';
-import { validatedIpcMain } from 'vs/base/parts/ipc/electron-main/ipcMain';
-import { Disposable, DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { Emitter } from 'vs/base/common/event';
-import { deepClone } from 'vs/base/common/objects';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { Schemas } from 'vs/base/common/network';
+import { validatedIpcMain } from '../../../base/parts/ipc/electron-main/ipcMain.js';
+import { Disposable, DisposableStore, toDisposable } from '../../../base/common/lifecycle.js';
+import { Emitter } from '../../../base/common/event.js';
+import { deepClone } from '../../../base/common/objects.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { Schemas } from '../../../base/common/network.js';
 
 export class ElectronPtyHostStarter extends Disposable implements IPtyHostStarter {
 
@@ -85,7 +85,7 @@ export class ElectronPtyHostStarter extends Disposable implements IPtyHostStarte
 		this._environmentMainService.unsetSnapExportedVariables();
 		const config: { [key: string]: string } = {
 			...deepClone(process.env),
-			VSCODE_AMD_ENTRYPOINT: 'vs/platform/terminal/node/ptyHostMain',
+			VSCODE_ESM_ENTRYPOINT: 'vs/platform/terminal/node/ptyHostMain',
 			VSCODE_PIPE_LOGGING: 'true',
 			VSCODE_VERBOSE_LOGGING: 'true', // transmit console logs from server to client,
 			VSCODE_RECONNECT_GRACE_TIME: String(this._reconnectConstants.graceTime),
diff --git a/src/vs/platform/terminal/node/childProcessMonitor.ts b/src/vs/platform/terminal/node/childProcessMonitor.ts
index 9586353a96a..40ac2d23050 100644
--- a/src/vs/platform/terminal/node/childProcessMonitor.ts
+++ b/src/vs/platform/terminal/node/childProcessMonitor.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { parse } from 'vs/base/common/path';
-import { debounce, throttle } from 'vs/base/common/decorators';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ProcessItem } from 'vs/base/common/processes';
-import { listProcesses } from 'vs/base/node/ps';
-import { ILogService } from 'vs/platform/log/common/log';
+import { parse } from '../../../base/common/path.js';
+import { debounce, throttle } from '../../../base/common/decorators.js';
+import { Emitter } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { ProcessItem } from '../../../base/common/processes.js';
+import { listProcesses } from '../../../base/node/ps.js';
+import { ILogService } from '../../log/common/log.js';
 
 const enum Constants {
 	/**
diff --git a/src/vs/platform/terminal/node/heartbeatService.ts b/src/vs/platform/terminal/node/heartbeatService.ts
index 3a414958afd..0aa17838c89 100644
--- a/src/vs/platform/terminal/node/heartbeatService.ts
+++ b/src/vs/platform/terminal/node/heartbeatService.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { HeartbeatConstants, IHeartbeatService } from 'vs/platform/terminal/common/terminal';
+import { Emitter } from '../../../base/common/event.js';
+import { Disposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { HeartbeatConstants, IHeartbeatService } from '../common/terminal.js';
 
 export class HeartbeatService extends Disposable implements IHeartbeatService {
 	private readonly _onBeat = this._register(new Emitter<void>());
diff --git a/src/vs/platform/terminal/node/nodePtyHostStarter.ts b/src/vs/platform/terminal/node/nodePtyHostStarter.ts
index d5a1a43724a..707f1ca887b 100644
--- a/src/vs/platform/terminal/node/nodePtyHostStarter.ts
+++ b/src/vs/platform/terminal/node/nodePtyHostStarter.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { FileAccess, Schemas } from 'vs/base/common/network';
-import { Client, IIPCOptions } from 'vs/base/parts/ipc/node/ipc.cp';
-import { IEnvironmentService, INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-import { parsePtyHostDebugPort } from 'vs/platform/environment/node/environmentService';
-import { IReconnectConstants } from 'vs/platform/terminal/common/terminal';
-import { IPtyHostConnection, IPtyHostStarter } from 'vs/platform/terminal/node/ptyHost';
+import { Disposable, DisposableStore } from '../../../base/common/lifecycle.js';
+import { FileAccess, Schemas } from '../../../base/common/network.js';
+import { Client, IIPCOptions } from '../../../base/parts/ipc/node/ipc.cp.js';
+import { IEnvironmentService, INativeEnvironmentService } from '../../environment/common/environment.js';
+import { parsePtyHostDebugPort } from '../../environment/node/environmentService.js';
+import { IReconnectConstants } from '../common/terminal.js';
+import { IPtyHostConnection, IPtyHostStarter } from './ptyHost.js';
 
 export class NodePtyHostStarter extends Disposable implements IPtyHostStarter {
 	constructor(
@@ -24,7 +24,7 @@ export class NodePtyHostStarter extends Disposable implements IPtyHostStarter {
 			serverName: 'Pty Host',
 			args: ['--type=ptyHost', '--logsPath', this._environmentService.logsHome.with({ scheme: Schemas.file }).fsPath],
 			env: {
-				VSCODE_AMD_ENTRYPOINT: 'vs/platform/terminal/node/ptyHostMain',
+				VSCODE_ESM_ENTRYPOINT: 'vs/platform/terminal/node/ptyHostMain',
 				VSCODE_PIPE_LOGGING: 'true',
 				VSCODE_VERBOSE_LOGGING: 'true', // transmit console logs from server to client,
 				VSCODE_RECONNECT_GRACE_TIME: this._reconnectConstants.graceTime,
diff --git a/src/vs/platform/terminal/node/ptyHost.ts b/src/vs/platform/terminal/node/ptyHost.ts
index 7c8b7318a67..7900f8c8ec4 100644
--- a/src/vs/platform/terminal/node/ptyHost.ts
+++ b/src/vs/platform/terminal/node/ptyHost.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { IChannelClient } from 'vs/base/parts/ipc/common/ipc';
+import { Event } from '../../../base/common/event.js';
+import { DisposableStore, IDisposable } from '../../../base/common/lifecycle.js';
+import { IChannelClient } from '../../../base/parts/ipc/common/ipc.js';
 
 export interface IPtyHostConnection {
 	readonly client: IChannelClient;
diff --git a/src/vs/platform/terminal/node/ptyHostMain.ts b/src/vs/platform/terminal/node/ptyHostMain.ts
index f3693acbda3..0a1d14ea076 100644
--- a/src/vs/platform/terminal/node/ptyHostMain.ts
+++ b/src/vs/platform/terminal/node/ptyHostMain.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DefaultURITransformer } from 'vs/base/common/uriIpc';
-import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
-import { Server as ChildProcessServer } from 'vs/base/parts/ipc/node/ipc.cp';
-import { Server as UtilityProcessServer } from 'vs/base/parts/ipc/node/ipc.mp';
-import { localize } from 'vs/nls';
-import { OPTIONS, parseArgs } from 'vs/platform/environment/node/argv';
-import { NativeEnvironmentService } from 'vs/platform/environment/node/environmentService';
-import { getLogLevel } from 'vs/platform/log/common/log';
-import { LoggerChannel } from 'vs/platform/log/common/logIpc';
-import { LogService } from 'vs/platform/log/common/logService';
-import { LoggerService } from 'vs/platform/log/node/loggerService';
-import product from 'vs/platform/product/common/product';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IReconnectConstants, TerminalIpcChannels } from 'vs/platform/terminal/common/terminal';
-import { HeartbeatService } from 'vs/platform/terminal/node/heartbeatService';
-import { PtyService } from 'vs/platform/terminal/node/ptyService';
-import { isUtilityProcess } from 'vs/base/parts/sandbox/node/electronTypes';
-import { timeout } from 'vs/base/common/async';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import { DefaultURITransformer } from '../../../base/common/uriIpc.js';
+import { ProxyChannel } from '../../../base/parts/ipc/common/ipc.js';
+import { Server as ChildProcessServer } from '../../../base/parts/ipc/node/ipc.cp.js';
+import { Server as UtilityProcessServer } from '../../../base/parts/ipc/node/ipc.mp.js';
+import { localize } from '../../../nls.js';
+import { OPTIONS, parseArgs } from '../../environment/node/argv.js';
+import { NativeEnvironmentService } from '../../environment/node/environmentService.js';
+import { getLogLevel } from '../../log/common/log.js';
+import { LoggerChannel } from '../../log/common/logIpc.js';
+import { LogService } from '../../log/common/logService.js';
+import { LoggerService } from '../../log/node/loggerService.js';
+import product from '../../product/common/product.js';
+import { IProductService } from '../../product/common/productService.js';
+import { IReconnectConstants, TerminalIpcChannels } from '../common/terminal.js';
+import { HeartbeatService } from './heartbeatService.js';
+import { PtyService } from './ptyService.js';
+import { isUtilityProcess } from '../../../base/parts/sandbox/node/electronTypes.js';
+import { timeout } from '../../../base/common/async.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
 
 startPtyHost();
 
diff --git a/src/vs/platform/terminal/node/ptyHostService.ts b/src/vs/platform/terminal/node/ptyHostService.ts
index 402dcc7b723..13be98c26e5 100644
--- a/src/vs/platform/terminal/node/ptyHostService.ts
+++ b/src/vs/platform/terminal/node/ptyHostService.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IProcessEnvironment, OS, OperatingSystem, isWindows } from 'vs/base/common/platform';
-import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ILogService, ILoggerService, LogLevel } from 'vs/platform/log/common/log';
-import { RemoteLoggerChannelClient } from 'vs/platform/log/common/logIpc';
-import { getResolvedShellEnv } from 'vs/platform/shell/node/shellEnv';
-import { IPtyHostProcessReplayEvent } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { RequestStore } from 'vs/platform/terminal/common/requestStore';
-import { HeartbeatConstants, IHeartbeatService, IProcessDataEvent, IProcessProperty, IProcessPropertyMap, IProcessReadyEvent, IPtyHostLatencyMeasurement, IPtyHostService, IPtyService, IRequestResolveVariablesEvent, ISerializedTerminalState, IShellLaunchConfig, ITerminalLaunchError, ITerminalProcessOptions, ITerminalProfile, ITerminalsLayoutInfo, ProcessPropertyType, TerminalIcon, TerminalIpcChannels, TerminalSettingId, TitleEventSource } from 'vs/platform/terminal/common/terminal';
-import { registerTerminalPlatformConfiguration } from 'vs/platform/terminal/common/terminalPlatformConfiguration';
-import { IGetTerminalLayoutInfoArgs, IProcessDetails, ISetTerminalLayoutInfoArgs } from 'vs/platform/terminal/common/terminalProcess';
-import { IPtyHostConnection, IPtyHostStarter } from 'vs/platform/terminal/node/ptyHost';
-import { detectAvailableProfiles } from 'vs/platform/terminal/node/terminalProfiles';
-import * as performance from 'vs/base/common/performance';
-import { getSystemShell } from 'vs/base/node/shell';
-import { StopWatch } from 'vs/base/common/stopwatch';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { IProcessEnvironment, OS, OperatingSystem, isWindows } from '../../../base/common/platform.js';
+import { ProxyChannel } from '../../../base/parts/ipc/common/ipc.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { ILogService, ILoggerService, LogLevel } from '../../log/common/log.js';
+import { RemoteLoggerChannelClient } from '../../log/common/logIpc.js';
+import { getResolvedShellEnv } from '../../shell/node/shellEnv.js';
+import { IPtyHostProcessReplayEvent } from '../common/capabilities/capabilities.js';
+import { RequestStore } from '../common/requestStore.js';
+import { HeartbeatConstants, IHeartbeatService, IProcessDataEvent, IProcessProperty, IProcessPropertyMap, IProcessReadyEvent, IPtyHostLatencyMeasurement, IPtyHostService, IPtyService, IRequestResolveVariablesEvent, ISerializedTerminalState, IShellLaunchConfig, ITerminalLaunchError, ITerminalProcessOptions, ITerminalProfile, ITerminalsLayoutInfo, ProcessPropertyType, TerminalIcon, TerminalIpcChannels, TerminalSettingId, TitleEventSource } from '../common/terminal.js';
+import { registerTerminalPlatformConfiguration } from '../common/terminalPlatformConfiguration.js';
+import { IGetTerminalLayoutInfoArgs, IProcessDetails, ISetTerminalLayoutInfoArgs } from '../common/terminalProcess.js';
+import { IPtyHostConnection, IPtyHostStarter } from './ptyHost.js';
+import { detectAvailableProfiles } from './terminalProfiles.js';
+import * as performance from '../../../base/common/performance.js';
+import { getSystemShell } from '../../../base/node/shell.js';
+import { StopWatch } from '../../../base/common/stopwatch.js';
 
 enum Constants {
 	MaxRestarts = 5
@@ -291,9 +291,6 @@ export class PtyHostService extends Disposable implements IPtyHostService {
 	uninstallAllAutoReplies(): Promise<void> {
 		return this._proxy.uninstallAllAutoReplies();
 	}
-	uninstallAutoReply(match: string): Promise<void> {
-		return this._proxy.uninstallAutoReply(match);
-	}
 
 	getDefaultSystemShell(osOverride?: OperatingSystem): Promise<string> {
 		return this._optionalProxy?.getDefaultSystemShell(osOverride) ?? getSystemShell(osOverride ?? OS, process.env);
diff --git a/src/vs/platform/terminal/node/ptyService.ts b/src/vs/platform/terminal/node/ptyService.ts
index ec8182b3c1d..4655b3ee79a 100644
--- a/src/vs/platform/terminal/node/ptyService.ts
+++ b/src/vs/platform/terminal/node/ptyService.ts
@@ -4,34 +4,37 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { execFile, exec } from 'child_process';
-import { AutoOpenBarrier, ProcessTimeRunOnceScheduler, Promises, Queue, timeout } from 'vs/base/common/async';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IProcessEnvironment, isWindows, OperatingSystem, OS } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { getSystemShell } from 'vs/base/node/shell';
-import { ILogService, LogLevel } from 'vs/platform/log/common/log';
-import { RequestStore } from 'vs/platform/terminal/common/requestStore';
-import { IProcessDataEvent, IProcessReadyEvent, IPtyService, IRawTerminalInstanceLayoutInfo, IReconnectConstants, IShellLaunchConfig, ITerminalInstanceLayoutInfoById, ITerminalLaunchError, ITerminalsLayoutInfo, ITerminalTabLayoutInfoById, TerminalIcon, IProcessProperty, TitleEventSource, ProcessPropertyType, IProcessPropertyMap, IFixedTerminalDimensions, IPersistentTerminalProcessLaunchConfig, ICrossVersionSerializedTerminalState, ISerializedTerminalState, ITerminalProcessOptions, IPtyHostLatencyMeasurement } from 'vs/platform/terminal/common/terminal';
-import { TerminalDataBufferer } from 'vs/platform/terminal/common/terminalDataBuffering';
-import { escapeNonWindowsPath } from 'vs/platform/terminal/common/terminalEnvironment';
-import { Terminal as XtermTerminal } from '@xterm/headless';
+import { AutoOpenBarrier, ProcessTimeRunOnceScheduler, Promises, Queue, timeout } from '../../../base/common/async.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { IProcessEnvironment, isWindows, OperatingSystem, OS } from '../../../base/common/platform.js';
+import { URI } from '../../../base/common/uri.js';
+import { getSystemShell } from '../../../base/node/shell.js';
+import { ILogService, LogLevel } from '../../log/common/log.js';
+import { RequestStore } from '../common/requestStore.js';
+import { IProcessDataEvent, IProcessReadyEvent, IPtyService, IRawTerminalInstanceLayoutInfo, IReconnectConstants, IShellLaunchConfig, ITerminalInstanceLayoutInfoById, ITerminalLaunchError, ITerminalsLayoutInfo, ITerminalTabLayoutInfoById, TerminalIcon, IProcessProperty, TitleEventSource, ProcessPropertyType, IProcessPropertyMap, IFixedTerminalDimensions, IPersistentTerminalProcessLaunchConfig, ICrossVersionSerializedTerminalState, ISerializedTerminalState, ITerminalProcessOptions, IPtyHostLatencyMeasurement, type IPtyServiceContribution } from '../common/terminal.js';
+import { TerminalDataBufferer } from '../common/terminalDataBuffering.js';
+import { escapeNonWindowsPath } from '../common/terminalEnvironment.js';
 import type { ISerializeOptions, SerializeAddon as XtermSerializeAddon } from '@xterm/addon-serialize';
 import type { Unicode11Addon as XtermUnicode11Addon } from '@xterm/addon-unicode11';
-import { IGetTerminalLayoutInfoArgs, IProcessDetails, ISetTerminalLayoutInfoArgs, ITerminalTabLayoutInfoDto } from 'vs/platform/terminal/common/terminalProcess';
-import { getWindowsBuildNumber } from 'vs/platform/terminal/node/terminalEnvironment';
-import { TerminalProcess } from 'vs/platform/terminal/node/terminalProcess';
-import { localize } from 'vs/nls';
-import { ignoreProcessNames } from 'vs/platform/terminal/node/childProcessMonitor';
-import { TerminalAutoResponder } from 'vs/platform/terminal/common/terminalAutoResponder';
-import { ErrorNoTelemetry } from 'vs/base/common/errors';
-import { ShellIntegrationAddon } from 'vs/platform/terminal/common/xterm/shellIntegrationAddon';
-import { formatMessageForTerminal } from 'vs/platform/terminal/common/terminalStrings';
-import { IPtyHostProcessReplayEvent } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { IProductService } from 'vs/platform/product/common/productService';
+import { IGetTerminalLayoutInfoArgs, IProcessDetails, ISetTerminalLayoutInfoArgs, ITerminalTabLayoutInfoDto } from '../common/terminalProcess.js';
+import { getWindowsBuildNumber } from './terminalEnvironment.js';
+import { TerminalProcess } from './terminalProcess.js';
+import { localize } from '../../../nls.js';
+import { ignoreProcessNames } from './childProcessMonitor.js';
+import { ErrorNoTelemetry } from '../../../base/common/errors.js';
+import { ShellIntegrationAddon } from '../common/xterm/shellIntegrationAddon.js';
+import { formatMessageForTerminal } from '../common/terminalStrings.js';
+import { IPtyHostProcessReplayEvent } from '../common/capabilities/capabilities.js';
+import { IProductService } from '../../product/common/productService.js';
 import { join } from 'path';
-import { memoize } from 'vs/base/common/decorators';
-import * as performance from 'vs/base/common/performance';
+import { memoize } from '../../../base/common/decorators.js';
+import * as performance from '../../../base/common/performance.js';
+import pkg from '@xterm/headless';
+import { AutoRepliesPtyServiceContribution } from './terminalContrib/autoReplies/autoRepliesContribController.js';
+
+type XtermTerminal = pkg.Terminal;
+const { Terminal: XtermTerminal } = pkg;
 
 export function traceRpc(_target: any, key: string, descriptor: any) {
 	if (typeof descriptor.value !== 'function') {
@@ -72,7 +75,24 @@ export class PtyService extends Disposable implements IPtyService {
 	private readonly _workspaceLayoutInfos = new Map<WorkspaceId, ISetTerminalLayoutInfoArgs>();
 	private readonly _detachInstanceRequestStore: RequestStore<IProcessDetails | undefined, { workspaceId: string; instanceId: number }>;
 	private readonly _revivedPtyIdMap: Map<string, { newId: number; state: ISerializedTerminalState }> = new Map();
-	private readonly _autoReplies: Map<string, string> = new Map();
+
+	// #region Pty service contribution RPC calls
+
+	private readonly _autoRepliesContribution = new AutoRepliesPtyServiceContribution(this._logService);
+	@traceRpc
+	async installAutoReply(match: string, reply: string) {
+		await this._autoRepliesContribution.installAutoReply(match, reply);
+	}
+	@traceRpc
+	async uninstallAllAutoReplies() {
+		await this._autoRepliesContribution.uninstallAllAutoReplies();
+	}
+
+	// #endregion
+
+	private readonly _contributions: IPtyServiceContribution[] = [
+		this._autoRepliesContribution
+	];
 
 	private _lastPtyId: number = 0;
 
@@ -278,6 +298,9 @@ export class PtyService extends Disposable implements IPtyService {
 		};
 		const persistentProcess = new PersistentTerminalProcess(id, process, workspaceId, workspaceName, shouldPersist, cols, rows, processLaunchOptions, unicodeVersion, this._reconnectConstants, this._logService, isReviving && typeof shellLaunchConfig.initialText === 'string' ? shellLaunchConfig.initialText : undefined, rawReviveBuffer, shellLaunchConfig.icon, shellLaunchConfig.color, shellLaunchConfig.name, shellLaunchConfig.fixedDimensions);
 		process.onProcessExit(event => {
+			for (const contrib of this._contributions) {
+				contrib.handleProcessDispose(id);
+			}
 			persistentProcess.dispose();
 			this._ptys.delete(id);
 			this._onProcessExit.fire({ id, event });
@@ -288,8 +311,8 @@ export class PtyService extends Disposable implements IPtyService {
 		persistentProcess.onProcessOrphanQuestion(() => this._onProcessOrphanQuestion.fire({ id }));
 		persistentProcess.onDidChangeProperty(property => this._onDidChangeProperty.fire({ id, property }));
 		persistentProcess.onPersistentProcessReady(() => {
-			for (const e of this._autoReplies.entries()) {
-				persistentProcess.installAutoReply(e[0], e[1]);
+			for (const contrib of this._contributions) {
+				contrib.handleProcessReady(id, process);
 			}
 		});
 		this._ptys.set(id, persistentProcess);
@@ -372,7 +395,13 @@ export class PtyService extends Disposable implements IPtyService {
 	}
 	@traceRpc
 	async input(id: number, data: string): Promise<void> {
-		return this._throwIfNoPty(id).input(data);
+		const pty = this._throwIfNoPty(id);
+		if (pty) {
+			for (const contrib of this._contributions) {
+				contrib.handleProcessInput(id, data);
+			}
+			pty.input(data);
+		}
 	}
 	@traceRpc
 	async processBinary(id: number, data: string): Promise<void> {
@@ -380,7 +409,13 @@ export class PtyService extends Disposable implements IPtyService {
 	}
 	@traceRpc
 	async resize(id: number, cols: number, rows: number): Promise<void> {
-		return this._throwIfNoPty(id).resize(cols, rows);
+		const pty = this._throwIfNoPty(id);
+		if (pty) {
+			for (const contrib of this._contributions) {
+				contrib.handleProcessResize(id, cols, rows);
+			}
+			pty.resize(cols, rows);
+		}
 	}
 	@traceRpc
 	async getInitialCwd(id: number): Promise<string> {
@@ -407,29 +442,6 @@ export class PtyService extends Disposable implements IPtyService {
 		return this._throwIfNoPty(id).orphanQuestionReply();
 	}
 
-	@traceRpc
-	async installAutoReply(match: string, reply: string) {
-		this._autoReplies.set(match, reply);
-		// If the auto reply exists on any existing terminals it will be overridden
-		for (const p of this._ptys.values()) {
-			p.installAutoReply(match, reply);
-		}
-	}
-	@traceRpc
-	async uninstallAllAutoReplies() {
-		for (const match of this._autoReplies.keys()) {
-			for (const p of this._ptys.values()) {
-				p.uninstallAutoReply(match);
-			}
-		}
-	}
-	@traceRpc
-	async uninstallAutoReply(match: string) {
-		for (const p of this._ptys.values()) {
-			p.uninstallAutoReply(match);
-		}
-	}
-
 	@traceRpc
 	async getDefaultSystemShell(osOverride: OperatingSystem = OS): Promise<string> {
 		return getSystemShell(osOverride, process.env);
@@ -600,7 +612,7 @@ export class PtyService extends Disposable implements IPtyService {
 	private _throwIfNoPty(id: number): PersistentTerminalProcess {
 		const pty = this._ptys.get(id);
 		if (!pty) {
-			throw new ErrorNoTelemetry(`Could not find pty on pty host`);
+			throw new ErrorNoTelemetry(`Could not find pty ${id} on pty host`);
 		}
 		return pty;
 	}
@@ -618,7 +630,6 @@ const enum InteractionState {
 class PersistentTerminalProcess extends Disposable {
 
 	private readonly _bufferer: TerminalDataBufferer;
-	private readonly _autoReplies: Map<string, TerminalAutoResponder> = new Map();
 
 	private readonly _pendingCommands = new Map<number, { resolve: (data: any) => void; reject: (err: any) => void }>();
 
@@ -753,14 +764,6 @@ class PersistentTerminalProcess extends Disposable {
 
 		// Data recording for reconnect
 		this._register(this.onProcessData(e => this._serializer.handleData(e)));
-
-		// Clean up other disposables
-		this._register(toDisposable(() => {
-			for (const e of this._autoReplies.values()) {
-				e.dispose();
-			}
-			this._autoReplies.clear();
-		}));
 	}
 
 	async attach(): Promise<void> {
@@ -832,9 +835,6 @@ class PersistentTerminalProcess extends Disposable {
 		if (this._inReplay) {
 			return;
 		}
-		for (const listener of this._autoReplies.values()) {
-			listener.handleInput();
-		}
 		return this._terminalProcess.input(data);
 	}
 	writeBinary(data: string): Promise<void> {
@@ -849,9 +849,6 @@ class PersistentTerminalProcess extends Disposable {
 		// Buffered events should flush when a resize occurs
 		this._bufferer.flushBuffer(this._persistentProcessId);
 
-		for (const listener of this._autoReplies.values()) {
-			listener.handleResize();
-		}
 		return this._terminalProcess.resize(cols, rows);
 	}
 	async clearBuffer(): Promise<void> {
@@ -891,17 +888,6 @@ class PersistentTerminalProcess extends Disposable {
 		this._onPersistentProcessReady.fire();
 	}
 
-	installAutoReply(match: string, reply: string) {
-		this._autoReplies.get(match)?.dispose();
-		this._autoReplies.set(match, new TerminalAutoResponder(this._terminalProcess, match, reply, this._logService));
-	}
-
-	uninstallAutoReply(match: string) {
-		const autoReply = this._autoReplies.get(match);
-		autoReply?.dispose();
-		this._autoReplies.delete(match);
-	}
-
 	sendCommandResult(reqId: number, isError: boolean, serializedPayload: any): void {
 		const data = this._pendingCommands.get(reqId);
 		if (!data) {
diff --git a/src/vs/platform/terminal/node/terminalContrib/autoReplies/autoRepliesContribController.ts b/src/vs/platform/terminal/node/terminalContrib/autoReplies/autoRepliesContribController.ts
new file mode 100644
index 00000000000..bf75ded3d6f
--- /dev/null
+++ b/src/vs/platform/terminal/node/terminalContrib/autoReplies/autoRepliesContribController.ts
@@ -0,0 +1,85 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ILogService } from '../../../../log/common/log.js';
+import type { IPtyServiceContribution, ITerminalChildProcess } from '../../../common/terminal.js';
+import { TerminalAutoResponder } from './terminalAutoResponder.js';
+
+export class AutoRepliesPtyServiceContribution implements IPtyServiceContribution {
+	private readonly _autoReplies: Map<string, string> = new Map();
+	private readonly _terminalProcesses: Map<number, ITerminalChildProcess> = new Map();
+	private readonly _autoResponders: Map<number, Map<string, TerminalAutoResponder>> = new Map();
+
+	constructor(
+		@ILogService private readonly _logService: ILogService
+	) {
+	}
+
+	async installAutoReply(match: string, reply: string) {
+		this._autoReplies.set(match, reply);
+		// If the auto reply exists on any existing terminals it will be overridden
+		for (const persistentProcessId of this._autoResponders.keys()) {
+			const process = this._terminalProcesses.get(persistentProcessId);
+			if (!process) {
+				this._logService.error('Could not find terminal process to install auto reply');
+				continue;
+			}
+			this._processInstallAutoReply(persistentProcessId, process, match, reply);
+		}
+	}
+
+	async uninstallAllAutoReplies() {
+		for (const match of this._autoReplies.keys()) {
+			for (const processAutoResponders of this._autoResponders.values()) {
+				processAutoResponders.get(match)?.dispose();
+				processAutoResponders.delete(match);
+			}
+		}
+	}
+
+	handleProcessReady(persistentProcessId: number, process: ITerminalChildProcess): void {
+		this._terminalProcesses.set(persistentProcessId, process);
+		this._autoResponders.set(persistentProcessId, new Map());
+		for (const [match, reply] of this._autoReplies.entries()) {
+			this._processInstallAutoReply(persistentProcessId, process, match, reply);
+		}
+	}
+
+	handleProcessDispose(persistentProcessId: number): void {
+		const processAutoResponders = this._autoResponders.get(persistentProcessId);
+		if (processAutoResponders) {
+			for (const e of processAutoResponders.values()) {
+				e.dispose();
+			}
+			processAutoResponders.clear();
+		}
+	}
+
+	handleProcessInput(persistentProcessId: number, data: string) {
+		const processAutoResponders = this._autoResponders.get(persistentProcessId);
+		if (processAutoResponders) {
+			for (const listener of processAutoResponders.values()) {
+				listener.handleInput();
+			}
+		}
+	}
+
+	handleProcessResize(persistentProcessId: number, cols: number, rows: number) {
+		const processAutoResponders = this._autoResponders.get(persistentProcessId);
+		if (processAutoResponders) {
+			for (const listener of processAutoResponders.values()) {
+				listener.handleResize();
+			}
+		}
+	}
+
+	private _processInstallAutoReply(persistentProcessId: number, terminalProcess: ITerminalChildProcess, match: string, reply: string) {
+		const processAutoResponders = this._autoResponders.get(persistentProcessId);
+		if (processAutoResponders) {
+			processAutoResponders.get(match)?.dispose();
+			processAutoResponders.set(match, new TerminalAutoResponder(terminalProcess, match, reply, this._logService));
+		}
+	}
+}
diff --git a/src/vs/platform/terminal/common/terminalAutoResponder.ts b/src/vs/platform/terminal/node/terminalContrib/autoReplies/terminalAutoResponder.ts
similarity index 85%
rename from src/vs/platform/terminal/common/terminalAutoResponder.ts
rename to src/vs/platform/terminal/node/terminalContrib/autoReplies/terminalAutoResponder.ts
index 51c801d9693..da9004702bb 100644
--- a/src/vs/platform/terminal/common/terminalAutoResponder.ts
+++ b/src/vs/platform/terminal/node/terminalContrib/autoReplies/terminalAutoResponder.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { timeout } from 'vs/base/common/async';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { isWindows } from 'vs/base/common/platform';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ITerminalChildProcess } from 'vs/platform/terminal/common/terminal';
+import { timeout } from '../../../../../base/common/async.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { isWindows } from '../../../../../base/common/platform.js';
+import { ILogService } from '../../../../log/common/log.js';
+import { ITerminalChildProcess } from '../../../common/terminal.js';
 
 /**
  * Tracks a terminal process's data stream and responds immediately when a matching string is
diff --git a/src/vs/platform/terminal/node/terminalEnvironment.ts b/src/vs/platform/terminal/node/terminalEnvironment.ts
index 813fbe5c432..500d527006c 100644
--- a/src/vs/platform/terminal/node/terminalEnvironment.ts
+++ b/src/vs/platform/terminal/node/terminalEnvironment.ts
@@ -4,20 +4,20 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as os from 'os';
-import { FileAccess } from 'vs/base/common/network';
-import { getCaseInsensitive } from 'vs/base/common/objects';
-import * as path from 'vs/base/common/path';
-import { IProcessEnvironment, isMacintosh, isWindows } from 'vs/base/common/platform';
-import * as process from 'vs/base/common/process';
-import { format } from 'vs/base/common/strings';
-import { isString } from 'vs/base/common/types';
-import * as pfs from 'vs/base/node/pfs';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IShellLaunchConfig, ITerminalEnvironment, ITerminalProcessOptions } from 'vs/platform/terminal/common/terminal';
-import { EnvironmentVariableMutatorType } from 'vs/platform/terminal/common/environmentVariable';
-import { deserializeEnvironmentVariableCollections } from 'vs/platform/terminal/common/environmentVariableShared';
-import { MergedEnvironmentVariableCollection } from 'vs/platform/terminal/common/environmentVariableCollection';
+import { FileAccess } from '../../../base/common/network.js';
+import { getCaseInsensitive } from '../../../base/common/objects.js';
+import * as path from '../../../base/common/path.js';
+import { IProcessEnvironment, isMacintosh, isWindows } from '../../../base/common/platform.js';
+import * as process from '../../../base/common/process.js';
+import { format } from '../../../base/common/strings.js';
+import { isString } from '../../../base/common/types.js';
+import * as pfs from '../../../base/node/pfs.js';
+import { ILogService } from '../../log/common/log.js';
+import { IProductService } from '../../product/common/productService.js';
+import { IShellLaunchConfig, ITerminalEnvironment, ITerminalProcessOptions } from '../common/terminal.js';
+import { EnvironmentVariableMutatorType } from '../common/environmentVariable.js';
+import { deserializeEnvironmentVariableCollections } from '../common/environmentVariableShared.js';
+import { MergedEnvironmentVariableCollection } from '../common/environmentVariableCollection.js';
 
 export function getWindowsBuildNumber(): number {
 	const osVersion = (/(\d+)\.(\d+)\.(\d+)/g).exec(os.release());
@@ -157,6 +157,7 @@ export function getShellIntegrationInjection(
 			}
 			newArgs = [...newArgs]; // Shallow clone the array to avoid setting the default array
 			newArgs[newArgs.length - 1] = format(newArgs[newArgs.length - 1], appRoot, '');
+			envMixin['VSCODE_STABLE'] = productService.quality === 'stable' ? '1' : '0';
 			if (options.shellIntegration.suggestEnabled) {
 				envMixin['VSCODE_SUGGEST'] = '1';
 			}
@@ -174,6 +175,7 @@ export function getShellIntegrationInjection(
 			}
 			newArgs = [...newArgs]; // Shallow clone the array to avoid setting the default array
 			newArgs[newArgs.length - 1] = format(newArgs[newArgs.length - 1], appRoot);
+			envMixin['VSCODE_STABLE'] = productService.quality === 'stable' ? '1' : '0';
 			return { newArgs, envMixin };
 		}
 		logService.warn(`Shell integration cannot be enabled for executable "${shellLaunchConfig.executable}" and args`, shellLaunchConfig.args);
@@ -195,13 +197,14 @@ export function getShellIntegrationInjection(
 			}
 			newArgs = [...newArgs]; // Shallow clone the array to avoid setting the default array
 			newArgs[newArgs.length - 1] = format(newArgs[newArgs.length - 1], appRoot);
+			envMixin['VSCODE_STABLE'] = productService.quality === 'stable' ? '1' : '0';
 			return { newArgs, envMixin };
 		}
 		case 'fish': {
 			// The injection mechanism used for fish is to add a custom dir to $XDG_DATA_DIRS which
 			// is similar to $ZDOTDIR in zsh but contains a list of directories to run from.
 			const oldDataDirs = env?.XDG_DATA_DIRS ?? '/usr/local/share:/usr/share';
-			const newDataDir = path.join(appRoot, 'out/vs/workbench/contrib/terminal/browser/media/fish_xdg_data');
+			const newDataDir = path.join(appRoot, 'out/vs/workbench/contrib/terminal/common/scripts/fish_xdg_data');
 			envMixin['XDG_DATA_DIRS'] = `${oldDataDirs}:${newDataDir}`;
 			addEnvMixinPathPrefix(options, envMixin);
 			return { newArgs: undefined, envMixin };
@@ -220,6 +223,7 @@ export function getShellIntegrationInjection(
 			}
 			newArgs = [...newArgs]; // Shallow clone the array to avoid setting the default array
 			newArgs[newArgs.length - 1] = format(newArgs[newArgs.length - 1], appRoot, '');
+			envMixin['VSCODE_STABLE'] = productService.quality === 'stable' ? '1' : '0';
 			return { newArgs, envMixin };
 		}
 		case 'zsh': {
@@ -250,19 +254,19 @@ export function getShellIntegrationInjection(
 			envMixin['USER_ZDOTDIR'] = userZdotdir;
 			const filesToCopy: IShellIntegrationConfigInjection['filesToCopy'] = [];
 			filesToCopy.push({
-				source: path.join(appRoot, 'out/vs/workbench/contrib/terminal/browser/media/shellIntegration-rc.zsh'),
+				source: path.join(appRoot, 'out/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh'),
 				dest: path.join(zdotdir, '.zshrc')
 			});
 			filesToCopy.push({
-				source: path.join(appRoot, 'out/vs/workbench/contrib/terminal/browser/media/shellIntegration-profile.zsh'),
+				source: path.join(appRoot, 'out/vs/workbench/contrib/terminal/common/scripts/shellIntegration-profile.zsh'),
 				dest: path.join(zdotdir, '.zprofile')
 			});
 			filesToCopy.push({
-				source: path.join(appRoot, 'out/vs/workbench/contrib/terminal/browser/media/shellIntegration-env.zsh'),
+				source: path.join(appRoot, 'out/vs/workbench/contrib/terminal/common/scripts/shellIntegration-env.zsh'),
 				dest: path.join(zdotdir, '.zshenv')
 			});
 			filesToCopy.push({
-				source: path.join(appRoot, 'out/vs/workbench/contrib/terminal/browser/media/shellIntegration-login.zsh'),
+				source: path.join(appRoot, 'out/vs/workbench/contrib/terminal/common/scripts/shellIntegration-login.zsh'),
 				dest: path.join(zdotdir, '.zlogin')
 			});
 			return { newArgs, envMixin, filesToCopy };
@@ -317,13 +321,13 @@ enum ShellIntegrationExecutable {
 
 const shellIntegrationArgs: Map<ShellIntegrationExecutable, string[]> = new Map();
 // The try catch swallows execution policy errors in the case of the archive distributable
-shellIntegrationArgs.set(ShellIntegrationExecutable.WindowsPwsh, ['-noexit', '-command', 'try { . \"{0}\\out\\vs\\workbench\\contrib\\terminal\\browser\\media\\shellIntegration.ps1\" } catch {}{1}']);
-shellIntegrationArgs.set(ShellIntegrationExecutable.WindowsPwshLogin, ['-l', '-noexit', '-command', 'try { . \"{0}\\out\\vs\\workbench\\contrib\\terminal\\browser\\media\\shellIntegration.ps1\" } catch {}{1}']);
-shellIntegrationArgs.set(ShellIntegrationExecutable.Pwsh, ['-noexit', '-command', '. "{0}/out/vs/workbench/contrib/terminal/browser/media/shellIntegration.ps1"{1}']);
-shellIntegrationArgs.set(ShellIntegrationExecutable.PwshLogin, ['-l', '-noexit', '-command', '. "{0}/out/vs/workbench/contrib/terminal/browser/media/shellIntegration.ps1"']);
+shellIntegrationArgs.set(ShellIntegrationExecutable.WindowsPwsh, ['-noexit', '-command', 'try { . \"{0}\\out\\vs\\workbench\\contrib\\terminal\\common\\scripts\\shellIntegration.ps1\" } catch {}{1}']);
+shellIntegrationArgs.set(ShellIntegrationExecutable.WindowsPwshLogin, ['-l', '-noexit', '-command', 'try { . \"{0}\\out\\vs\\workbench\\contrib\\terminal\\common\\scripts\\shellIntegration.ps1\" } catch {}{1}']);
+shellIntegrationArgs.set(ShellIntegrationExecutable.Pwsh, ['-noexit', '-command', '. "{0}/out/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1"{1}']);
+shellIntegrationArgs.set(ShellIntegrationExecutable.PwshLogin, ['-l', '-noexit', '-command', '. "{0}/out/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1"']);
 shellIntegrationArgs.set(ShellIntegrationExecutable.Zsh, ['-i']);
 shellIntegrationArgs.set(ShellIntegrationExecutable.ZshLogin, ['-il']);
-shellIntegrationArgs.set(ShellIntegrationExecutable.Bash, ['--init-file', '{0}/out/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh']);
+shellIntegrationArgs.set(ShellIntegrationExecutable.Bash, ['--init-file', '{0}/out/vs/workbench/contrib/terminal/common/scripts/shellIntegration-bash.sh']);
 const pwshLoginArgs = ['-login', '-l'];
 const shLoginArgs = ['--login', '-l'];
 const shInteractiveArgs = ['-i', '--interactive'];
diff --git a/src/vs/platform/terminal/node/terminalProcess.ts b/src/vs/platform/terminal/node/terminalProcess.ts
index a799870b548..d7a470d5bf6 100644
--- a/src/vs/platform/terminal/node/terminalProcess.ts
+++ b/src/vs/platform/terminal/node/terminalProcess.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as fs from 'fs';
 import { exec } from 'child_process';
-import { timeout } from 'vs/base/common/async';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import * as path from 'vs/base/common/path';
-import { IProcessEnvironment, isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { Promises } from 'vs/base/node/pfs';
-import { localize } from 'vs/nls';
-import { ILogService, LogLevel } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { FlowControlConstants, IShellLaunchConfig, ITerminalChildProcess, ITerminalLaunchError, IProcessProperty, IProcessPropertyMap as IProcessPropertyMap, ProcessPropertyType, TerminalShellType, IProcessReadyEvent, ITerminalProcessOptions, PosixShellType, IProcessReadyWindowsPty } from 'vs/platform/terminal/common/terminal';
-import { ChildProcessMonitor } from 'vs/platform/terminal/node/childProcessMonitor';
-import { findExecutable, getShellIntegrationInjection, getWindowsBuildNumber, IShellIntegrationConfigInjection } from 'vs/platform/terminal/node/terminalEnvironment';
-import { WindowsShellHelper } from 'vs/platform/terminal/node/windowsShellHelper';
+import { timeout } from '../../../base/common/async.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable, toDisposable } from '../../../base/common/lifecycle.js';
+import * as path from '../../../base/common/path.js';
+import { IProcessEnvironment, isLinux, isMacintosh, isWindows } from '../../../base/common/platform.js';
+import { URI } from '../../../base/common/uri.js';
+import { localize } from '../../../nls.js';
+import { ILogService, LogLevel } from '../../log/common/log.js';
+import { IProductService } from '../../product/common/productService.js';
+import { FlowControlConstants, IShellLaunchConfig, ITerminalChildProcess, ITerminalLaunchError, IProcessProperty, IProcessPropertyMap as IProcessPropertyMap, ProcessPropertyType, TerminalShellType, IProcessReadyEvent, ITerminalProcessOptions, PosixShellType, IProcessReadyWindowsPty, GeneralShellType } from '../common/terminal.js';
+import { ChildProcessMonitor } from './childProcessMonitor.js';
+import { findExecutable, getShellIntegrationInjection, getWindowsBuildNumber, IShellIntegrationConfigInjection } from './terminalEnvironment.js';
+import { WindowsShellHelper } from './windowsShellHelper.js';
 import { IPty, IPtyForkOptions, IWindowsPtyForkOptions, spawn } from 'node-pty';
-import { chunkInput } from 'vs/platform/terminal/common/terminalProcess';
+import { chunkInput } from '../common/terminalProcess.js';
 
 const enum ShutdownConstants {
 	/**
@@ -50,7 +50,7 @@ const enum Constants {
 	 */
 	KillSpawnThrottleInterval = 250,
 	/**
-	 * The amount of time to wait when a call is throttles beyond the exact amount, this is used to
+	 * The amount of time to wait when a call is throttled beyond the exact amount, this is used to
 	 * try prevent early timeouts causing a kill/spawn call to happen at double the regular
 	 * interval.
 	 */
@@ -72,11 +72,16 @@ const posixShellTypeMap = new Map<string, PosixShellType>([
 	['fish', PosixShellType.Fish],
 	['ksh', PosixShellType.Ksh],
 	['sh', PosixShellType.Sh],
-	['pwsh', PosixShellType.PowerShell],
-	['python', PosixShellType.Python],
 	['zsh', PosixShellType.Zsh]
 ]);
 
+const generalShellTypeMap = new Map<string, GeneralShellType>([
+	['pwsh', GeneralShellType.PowerShell],
+	['python', GeneralShellType.Python],
+	['julia', GeneralShellType.Julia],
+	['nu', GeneralShellType.NuShell],
+
+]);
 export class TerminalProcess extends Disposable implements ITerminalChildProcess {
 	readonly id = 0;
 	readonly shouldPersist = false;
@@ -114,7 +119,7 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 	get exitMessage(): string | undefined { return this._exitMessage; }
 
 	get currentTitle(): string { return this._windowsShellHelper?.shellTitle || this._currentTitle; }
-	get shellType(): TerminalShellType | undefined { return isWindows ? this._windowsShellHelper?.shellType : posixShellTypeMap.get(this._currentTitle); }
+	get shellType(): TerminalShellType | undefined { return isWindows ? this._windowsShellHelper?.shellType : posixShellTypeMap.get(this._currentTitle) || generalShellTypeMap.get(this._currentTitle); }
 	get hasChildProcesses(): boolean { return this._childProcessMonitor?.hasChildProcesses || false; }
 
 	private readonly _onProcessData = this._register(new Emitter<string>());
@@ -153,6 +158,7 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 		this._properties[ProcessPropertyType.InitialCwd] = this._initialCwd;
 		this._properties[ProcessPropertyType.Cwd] = this._initialCwd;
 		const useConpty = this._options.windowsEnableConpty && process.platform === 'win32' && getWindowsBuildNumber() >= 18309;
+		const useConptyDll = useConpty && this._options.windowsUseConptyDll;
 		this._ptyOptions = {
 			name,
 			cwd,
@@ -161,6 +167,7 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 			cols,
 			rows,
 			useConpty,
+			useConptyDll,
 			// This option will force conpty to not redraw the whole viewport on launch
 			conptyInheritCursor: useConpty && !!shellLaunchConfig.initialText
 		};
@@ -211,9 +218,9 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 				}
 				if (injection.filesToCopy) {
 					for (const f of injection.filesToCopy) {
-						await Promises.mkdir(path.dirname(f.dest), { recursive: true });
 						try {
-							await Promises.copyFile(f.source, f.dest);
+							await fs.promises.mkdir(path.dirname(f.dest), { recursive: true });
+							await fs.promises.copyFile(f.source, f.dest);
 						} catch {
 							// Swallow error, this should only happen when multiple users are on the same
 							// machine. Since the shell integration scripts rarely change, plus the other user
@@ -241,7 +248,7 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 
 	private async _validateCwd(): Promise<undefined | ITerminalLaunchError> {
 		try {
-			const result = await Promises.stat(this._initialCwd);
+			const result = await fs.promises.stat(this._initialCwd);
 			if (!result.isDirectory()) {
 				return { message: localize('launchFail.cwdNotDirectory', "Starting directory (cwd) \"{0}\" is not a directory", this._initialCwd.toString()) };
 			}
@@ -268,7 +275,7 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 		}
 
 		try {
-			const result = await Promises.stat(executable);
+			const result = await fs.promises.stat(executable);
 			if (!result.isFile() && !result.isSymbolicLink()) {
 				return { message: localize('launchFail.executableIsNotFileOrSymlink', "Path to shell executable \"{0}\" is not a file or a symlink", slc.executable) };
 			}
@@ -381,6 +388,10 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 		if (!isWindows || !('useConpty' in this._ptyOptions) || !this._ptyOptions.useConpty) {
 			return;
 		}
+		// Don't throttle when using conpty.dll as it seems to have been fixed in later versions
+		if (this._ptyOptions.useConptyDll) {
+			return;
+		}
 		// Use a loop to ensure multiple calls in a single interval space out
 		while (Date.now() - TerminalProcess._lastKillOrStart < Constants.KillSpawnThrottleInterval) {
 			this._logService.trace('Throttling kill/spawn call');
@@ -401,15 +412,19 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 		if (this._store.isDisposed) {
 			return;
 		}
-		this._currentTitle = ptyProcess.process;
+		// HACK: The node-pty API can return undefined somehow https://github.com/microsoft/vscode/issues/222323
+		this._currentTitle = (ptyProcess.process ?? '');
 		this._onDidChangeProperty.fire({ type: ProcessPropertyType.Title, value: this._currentTitle });
 		// If fig is installed it may change the title of the process
 		const sanitizedTitle = this.currentTitle.replace(/ \(figterm\)$/g, '');
 
 		if (sanitizedTitle.toLowerCase().startsWith('python')) {
-			this._onDidChangeProperty.fire({ type: ProcessPropertyType.ShellType, value: PosixShellType.Python });
+			this._onDidChangeProperty.fire({ type: ProcessPropertyType.ShellType, value: GeneralShellType.Python });
+		} else if (sanitizedTitle.toLowerCase().startsWith('julia')) {
+			this._onDidChangeProperty.fire({ type: ProcessPropertyType.ShellType, value: GeneralShellType.Julia });
 		} else {
-			this._onDidChangeProperty.fire({ type: ProcessPropertyType.ShellType, value: posixShellTypeMap.get(sanitizedTitle) });
+			const shellTypeValue = posixShellTypeMap.get(sanitizedTitle) || generalShellTypeMap.get(sanitizedTitle);
+			this._onDidChangeProperty.fire({ type: ProcessPropertyType.ShellType, value: shellTypeValue });
 		}
 	}
 
@@ -608,7 +623,7 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 			}
 			this._logService.trace('node-pty.IPty#pid');
 			try {
-				return await Promises.readlink(`/proc/${this._ptyProcess.pid}/cwd`);
+				return await fs.promises.readlink(`/proc/${this._ptyProcess.pid}/cwd`);
 			} catch (error) {
 				return this._initialCwd;
 			}
diff --git a/src/vs/platform/terminal/node/terminalProfiles.ts b/src/vs/platform/terminal/node/terminalProfiles.ts
index e289fbc34fc..76e77d9174c 100644
--- a/src/vs/platform/terminal/node/terminalProfiles.ts
+++ b/src/vs/platform/terminal/node/terminalProfiles.ts
@@ -3,19 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as fs from 'fs';
 import * as cp from 'child_process';
-import { Codicon } from 'vs/base/common/codicons';
-import { basename, delimiter, normalize } from 'vs/base/common/path';
-import { isLinux, isWindows } from 'vs/base/common/platform';
-import { isString } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import * as pfs from 'vs/base/node/pfs';
-import { enumeratePowerShellInstallations } from 'vs/base/node/powershell';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ITerminalEnvironment, ITerminalExecutable, ITerminalProfile, ITerminalProfileSource, ITerminalUnsafePath, ProfileSource, TerminalIcon, TerminalSettingId } from 'vs/platform/terminal/common/terminal';
-import { findExecutable, getWindowsBuildNumber } from 'vs/platform/terminal/node/terminalEnvironment';
-import { ThemeIcon } from 'vs/base/common/themables';
+import { Codicon } from '../../../base/common/codicons.js';
+import { basename, delimiter, normalize } from '../../../base/common/path.js';
+import { isLinux, isWindows } from '../../../base/common/platform.js';
+import { isString } from '../../../base/common/types.js';
+import { URI } from '../../../base/common/uri.js';
+import * as pfs from '../../../base/node/pfs.js';
+import { enumeratePowerShellInstallations } from '../../../base/node/powershell.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { ILogService } from '../../log/common/log.js';
+import { ITerminalEnvironment, ITerminalExecutable, ITerminalProfile, ITerminalProfileSource, ITerminalUnsafePath, ProfileSource, TerminalIcon, TerminalSettingId } from '../common/terminal.js';
+import { findExecutable, getWindowsBuildNumber } from './terminalEnvironment.js';
+import { ThemeIcon } from '../../../base/common/themables.js';
 import { dirname, resolve } from 'path';
 
 const enum Constants {
@@ -38,7 +39,7 @@ export function detectAvailableProfiles(
 ): Promise<ITerminalProfile[]> {
 	fsProvider = fsProvider || {
 		existsFile: pfs.SymlinkSupport.existsFile,
-		readFile: pfs.Promises.readFile
+		readFile: fs.promises.readFile
 	};
 	if (isWindows) {
 		return detectAvailableWindowsProfiles(
diff --git a/src/vs/platform/terminal/node/windowsShellHelper.ts b/src/vs/platform/terminal/node/windowsShellHelper.ts
index e9fcb6f8130..2d63433bbdc 100644
--- a/src/vs/platform/terminal/node/windowsShellHelper.ts
+++ b/src/vs/platform/terminal/node/windowsShellHelper.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { timeout } from 'vs/base/common/async';
-import { debounce } from 'vs/base/common/decorators';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { isWindows, platform } from 'vs/base/common/platform';
-import { TerminalShellType, WindowsShellType } from 'vs/platform/terminal/common/terminal';
+import { timeout } from '../../../base/common/async.js';
+import { debounce } from '../../../base/common/decorators.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../base/common/lifecycle.js';
+import { isWindows, platform } from '../../../base/common/platform.js';
+import { GeneralShellType, TerminalShellType, WindowsShellType } from '../common/terminal.js';
 import type * as WindowsProcessTreeType from '@vscode/windows-process-tree';
 
 export interface IWindowsShellHelper extends IDisposable {
@@ -139,10 +139,14 @@ export class WindowsShellHelper extends Disposable implements IWindowsShellHelpe
 				return WindowsShellType.CommandPrompt;
 			case 'powershell.exe':
 			case 'pwsh.exe':
-				return WindowsShellType.PowerShell;
+				return GeneralShellType.PowerShell;
 			case 'bash.exe':
 			case 'git-cmd.exe':
 				return WindowsShellType.GitBash;
+			case 'julialauncher.exe':
+				return GeneralShellType.Julia;
+			case 'nu.exe':
+				return GeneralShellType.NuShell;
 			case 'wsl.exe':
 			case 'ubuntu.exe':
 			case 'ubuntu1804.exe':
@@ -153,7 +157,7 @@ export class WindowsShellHelper extends Disposable implements IWindowsShellHelpe
 				return WindowsShellType.Wsl;
 			default:
 				if (executable.match(/python(\d(\.\d{0,2})?)?\.exe/)) {
-					return WindowsShellType.Python;
+					return GeneralShellType.Python;
 				}
 				return undefined;
 		}
diff --git a/src/vs/platform/terminal/test/common/capabilities/commandDetection/promptInputModel.test.ts b/src/vs/platform/terminal/test/common/capabilities/commandDetection/promptInputModel.test.ts
index 4566eb4b008..4b7b06f41fe 100644
--- a/src/vs/platform/terminal/test/common/capabilities/commandDetection/promptInputModel.test.ts
+++ b/src/vs/platform/terminal/test/common/capabilities/commandDetection/promptInputModel.test.ts
@@ -2,17 +2,17 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+/* eslint-disable local/code-import-patterns */
 
-// eslint-disable-next-line local/code-import-patterns, local/code-amd-node-module
-import { Terminal } from '@xterm/headless';
-
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { PromptInputModel, type IPromptInputModelState } from 'vs/platform/terminal/common/capabilities/commandDetection/promptInputModel';
-import { Emitter } from 'vs/base/common/event';
-import type { ITerminalCommand } from 'vs/platform/terminal/common/capabilities/capabilities';
+import type { Terminal } from '@xterm/xterm';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { NullLogService } from '../../../../../log/common/log.js';
+import { PromptInputModel, type IPromptInputModelState } from '../../../../common/capabilities/commandDetection/promptInputModel.js';
+import { Emitter } from '../../../../../../base/common/event.js';
+import type { ITerminalCommand } from '../../../../common/capabilities/capabilities.js';
 import { notDeepStrictEqual, strictEqual } from 'assert';
-import { timeout } from 'vs/base/common/async';
+import { timeout } from '../../../../../../base/common/async.js';
+import { importAMDNodeModule } from '../../../../../../amdX.js';
 
 suite('PromptInputModel', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
@@ -58,8 +58,9 @@ suite('PromptInputModel', () => {
 		strictEqual(promptInputModel.cursorIndex, cursorIndex, `value=${promptInputModel.value}`);
 	}
 
-	setup(() => {
-		xterm = store.add(new Terminal({ allowProposedApi: true }));
+	setup(async () => {
+		const TerminalCtor = (await importAMDNodeModule<typeof import('@xterm/xterm')>('@xterm/xterm', 'lib/xterm.js')).Terminal;
+		xterm = store.add(new TerminalCtor({ allowProposedApi: true }));
 		onCommandStart = store.add(new Emitter());
 		onCommandExecuted = store.add(new Emitter());
 		promptInputModel = store.add(new PromptInputModel(xterm, onCommandStart.event, onCommandExecuted.event, new NullLogService));
@@ -469,6 +470,26 @@ suite('PromptInputModel', () => {
 		});
 	});
 
+	suite('wrapped line (non-continuation)', () => {
+		test('basic wrapped line', async () => {
+			xterm.resize(5, 10);
+
+			await writePromise('$ ');
+			fireCommandStart();
+			await assertPromptInput('|');
+
+			await writePromise('ech');
+			await assertPromptInput(`ech|`);
+
+			await writePromise('o ');
+			await assertPromptInput(`echo |`);
+
+			await writePromise('"a"');
+			// HACK: Trailing whitespace is due to flaky detection in wrapped lines (but it doesn't matter much)
+			await assertPromptInput(`echo "a"| `);
+		});
+	});
+
 	// To "record a session" for these tests:
 	// - Enable debug logging
 	// - Open and clear Terminal output channel
diff --git a/src/vs/platform/terminal/test/common/requestStore.test.ts b/src/vs/platform/terminal/test/common/requestStore.test.ts
index 7488c32cd8c..2431a6285eb 100644
--- a/src/vs/platform/terminal/test/common/requestStore.test.ts
+++ b/src/vs/platform/terminal/test/common/requestStore.test.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { fail, strictEqual } from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { ConsoleLogger, ILogService } from 'vs/platform/log/common/log';
-import { LogService } from 'vs/platform/log/common/logService';
-import { RequestStore } from 'vs/platform/terminal/common/requestStore';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { TestInstantiationService } from '../../../instantiation/test/common/instantiationServiceMock.js';
+import { ConsoleLogger, ILogService } from '../../../log/common/log.js';
+import { LogService } from '../../../log/common/logService.js';
+import { RequestStore } from '../../common/requestStore.js';
 
 suite('RequestStore', () => {
 	let instantiationService: TestInstantiationService;
diff --git a/src/vs/platform/terminal/test/common/terminalEnvironment.test.ts b/src/vs/platform/terminal/test/common/terminalEnvironment.test.ts
index a6e8eb4f95a..7effc77a25d 100644
--- a/src/vs/platform/terminal/test/common/terminalEnvironment.test.ts
+++ b/src/vs/platform/terminal/test/common/terminalEnvironment.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { strictEqual } from 'assert';
-import { OperatingSystem, OS } from 'vs/base/common/platform';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { collapseTildePath, sanitizeCwd } from 'vs/platform/terminal/common/terminalEnvironment';
+import { OperatingSystem, OS } from '../../../../base/common/platform.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { collapseTildePath, sanitizeCwd } from '../../common/terminalEnvironment.js';
 
 suite('terminalEnvironment', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/platform/terminal/test/common/terminalProcess.test.ts b/src/vs/platform/terminal/test/common/terminalProcess.test.ts
index e408d1a0d67..4d4ef97709c 100644
--- a/src/vs/platform/terminal/test/common/terminalProcess.test.ts
+++ b/src/vs/platform/terminal/test/common/terminalProcess.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { deepStrictEqual } from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { chunkInput } from 'vs/platform/terminal/common/terminalProcess';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { chunkInput } from '../../common/terminalProcess.js';
 
 suite('platform - terminalProcess', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/platform/terminal/test/common/terminalProfiles.test.ts b/src/vs/platform/terminal/test/common/terminalProfiles.test.ts
index 789fe9821bb..036f9fe4b35 100644
--- a/src/vs/platform/terminal/test/common/terminalProfiles.test.ts
+++ b/src/vs/platform/terminal/test/common/terminalProfiles.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { deepStrictEqual } from 'assert';
-import { Codicon } from 'vs/base/common/codicons';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ITerminalProfile } from 'vs/platform/terminal/common/terminal';
-import { createProfileSchemaEnums } from 'vs/platform/terminal/common/terminalProfiles';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { ITerminalProfile } from '../../common/terminal.js';
+import { createProfileSchemaEnums } from '../../common/terminalProfiles.js';
 
 suite('terminalProfiles', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/platform/terminal/test/common/terminalRecorder.test.ts b/src/vs/platform/terminal/test/common/terminalRecorder.test.ts
index 66b317c468b..b8aa1203f0b 100644
--- a/src/vs/platform/terminal/test/common/terminalRecorder.test.ts
+++ b/src/vs/platform/terminal/test/common/terminalRecorder.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ReplayEntry } from 'vs/platform/terminal/common/terminalProcess';
-import { TerminalRecorder } from 'vs/platform/terminal/common/terminalRecorder';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { ReplayEntry } from '../../common/terminalProcess.js';
+import { TerminalRecorder } from '../../common/terminalRecorder.js';
 
 async function eventsEqual(recorder: TerminalRecorder, expected: ReplayEntry[]) {
 	const actual = (await recorder.generateReplayEvent()).events;
diff --git a/src/vs/platform/terminal/test/node/terminalEnvironment.test.ts b/src/vs/platform/terminal/test/node/terminalEnvironment.test.ts
index 2f68a7be2df..6248f83003d 100644
--- a/src/vs/platform/terminal/test/node/terminalEnvironment.test.ts
+++ b/src/vs/platform/terminal/test/node/terminalEnvironment.test.ts
@@ -5,22 +5,29 @@
 
 import { deepStrictEqual, ok, strictEqual } from 'assert';
 import { homedir, userInfo } from 'os';
-import { isWindows } from 'vs/base/common/platform';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ITerminalProcessOptions } from 'vs/platform/terminal/common/terminal';
-import { getShellIntegrationInjection, getWindowsBuildNumber, IShellIntegrationConfigInjection } from 'vs/platform/terminal/node/terminalEnvironment';
+import { isWindows } from '../../../../base/common/platform.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { NullLogService } from '../../../log/common/log.js';
+import { IProductService } from '../../../product/common/productService.js';
+import { ITerminalProcessOptions } from '../../common/terminal.js';
+import { getShellIntegrationInjection, getWindowsBuildNumber, IShellIntegrationConfigInjection } from '../../node/terminalEnvironment.js';
 
-const enabledProcessOptions: ITerminalProcessOptions = { shellIntegration: { enabled: true, suggestEnabled: false, nonce: '' }, windowsEnableConpty: true, environmentVariableCollections: undefined, workspaceFolder: undefined };
-const disabledProcessOptions: ITerminalProcessOptions = { shellIntegration: { enabled: false, suggestEnabled: false, nonce: '' }, windowsEnableConpty: true, environmentVariableCollections: undefined, workspaceFolder: undefined };
-const winptyProcessOptions: ITerminalProcessOptions = { shellIntegration: { enabled: true, suggestEnabled: false, nonce: '' }, windowsEnableConpty: false, environmentVariableCollections: undefined, workspaceFolder: undefined };
+const enabledProcessOptions: ITerminalProcessOptions = { shellIntegration: { enabled: true, suggestEnabled: false, nonce: '' }, windowsEnableConpty: true, windowsUseConptyDll: false, environmentVariableCollections: undefined, workspaceFolder: undefined };
+const disabledProcessOptions: ITerminalProcessOptions = { shellIntegration: { enabled: false, suggestEnabled: false, nonce: '' }, windowsEnableConpty: true, windowsUseConptyDll: false, environmentVariableCollections: undefined, workspaceFolder: undefined };
+const winptyProcessOptions: ITerminalProcessOptions = { shellIntegration: { enabled: true, suggestEnabled: false, nonce: '' }, windowsEnableConpty: false, windowsUseConptyDll: false, environmentVariableCollections: undefined, workspaceFolder: undefined };
 const pwshExe = process.platform === 'win32' ? 'pwsh.exe' : 'pwsh';
 const repoRoot = process.platform === 'win32' ? process.cwd()[0].toLowerCase() + process.cwd().substring(1) : process.cwd();
 const logService = new NullLogService();
 const productService = { applicationName: 'vscode' } as IProductService;
 const defaultEnvironment = {};
 
+function deepStrictEqualIgnoreStableVar(actual: IShellIntegrationConfigInjection | undefined, expected: IShellIntegrationConfigInjection) {
+	if (actual?.envMixin) {
+		delete actual.envMixin['VSCODE_STABLE'];
+	}
+	deepStrictEqual(actual, expected);
+}
+
 suite('platform - terminalEnvironment', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
 	suite('getShellIntegrationInjection', () => {
@@ -40,8 +47,8 @@ suite('platform - terminalEnvironment', () => {
 		// These tests are only expected to work on Windows 10 build 18309 and above
 		(getWindowsBuildNumber() < 18309 ? suite.skip : suite)('pwsh', () => {
 			const expectedPs1 = process.platform === 'win32'
-				? `try { . "${repoRoot}\\out\\vs\\workbench\\contrib\\terminal\\browser\\media\\shellIntegration.ps1" } catch {}`
-				: `. "${repoRoot}/out/vs/workbench/contrib/terminal/browser/media/shellIntegration.ps1"`;
+				? `try { . "${repoRoot}\\out\\vs\\workbench\\contrib\\terminal\\common\\scripts\\shellIntegration.ps1" } catch {}`
+				: `. "${repoRoot}/out/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1"`;
 			suite('should override args', () => {
 				const enabledExpectedResult = Object.freeze<IShellIntegrationConfigInjection>({
 					newArgs: [
@@ -54,21 +61,21 @@ suite('platform - terminalEnvironment', () => {
 					}
 				});
 				test('when undefined, []', () => {
-					deepStrictEqual(getShellIntegrationInjection({ executable: pwshExe, args: [] }, enabledProcessOptions, defaultEnvironment, logService, productService), enabledExpectedResult);
-					deepStrictEqual(getShellIntegrationInjection({ executable: pwshExe, args: undefined }, enabledProcessOptions, defaultEnvironment, logService, productService), enabledExpectedResult);
+					deepStrictEqualIgnoreStableVar(getShellIntegrationInjection({ executable: pwshExe, args: [] }, enabledProcessOptions, defaultEnvironment, logService, productService), enabledExpectedResult);
+					deepStrictEqualIgnoreStableVar(getShellIntegrationInjection({ executable: pwshExe, args: undefined }, enabledProcessOptions, defaultEnvironment, logService, productService), enabledExpectedResult);
 				});
 				suite('when no logo', () => {
 					test('array - case insensitive', () => {
-						deepStrictEqual(getShellIntegrationInjection({ executable: pwshExe, args: ['-NoLogo'] }, enabledProcessOptions, defaultEnvironment, logService, productService), enabledExpectedResult);
-						deepStrictEqual(getShellIntegrationInjection({ executable: pwshExe, args: ['-NOLOGO'] }, enabledProcessOptions, defaultEnvironment, logService, productService), enabledExpectedResult);
-						deepStrictEqual(getShellIntegrationInjection({ executable: pwshExe, args: ['-nol'] }, enabledProcessOptions, defaultEnvironment, logService, productService), enabledExpectedResult);
-						deepStrictEqual(getShellIntegrationInjection({ executable: pwshExe, args: ['-NOL'] }, enabledProcessOptions, defaultEnvironment, logService, productService), enabledExpectedResult);
+						deepStrictEqualIgnoreStableVar(getShellIntegrationInjection({ executable: pwshExe, args: ['-NoLogo'] }, enabledProcessOptions, defaultEnvironment, logService, productService), enabledExpectedResult);
+						deepStrictEqualIgnoreStableVar(getShellIntegrationInjection({ executable: pwshExe, args: ['-NOLOGO'] }, enabledProcessOptions, defaultEnvironment, logService, productService), enabledExpectedResult);
+						deepStrictEqualIgnoreStableVar(getShellIntegrationInjection({ executable: pwshExe, args: ['-nol'] }, enabledProcessOptions, defaultEnvironment, logService, productService), enabledExpectedResult);
+						deepStrictEqualIgnoreStableVar(getShellIntegrationInjection({ executable: pwshExe, args: ['-NOL'] }, enabledProcessOptions, defaultEnvironment, logService, productService), enabledExpectedResult);
 					});
 					test('string - case insensitive', () => {
-						deepStrictEqual(getShellIntegrationInjection({ executable: pwshExe, args: '-NoLogo' }, enabledProcessOptions, defaultEnvironment, logService, productService), enabledExpectedResult);
-						deepStrictEqual(getShellIntegrationInjection({ executable: pwshExe, args: '-NOLOGO' }, enabledProcessOptions, defaultEnvironment, logService, productService), enabledExpectedResult);
-						deepStrictEqual(getShellIntegrationInjection({ executable: pwshExe, args: '-nol' }, enabledProcessOptions, defaultEnvironment, logService, productService), enabledExpectedResult);
-						deepStrictEqual(getShellIntegrationInjection({ executable: pwshExe, args: '-NOL' }, enabledProcessOptions, defaultEnvironment, logService, productService), enabledExpectedResult);
+						deepStrictEqualIgnoreStableVar(getShellIntegrationInjection({ executable: pwshExe, args: '-NoLogo' }, enabledProcessOptions, defaultEnvironment, logService, productService), enabledExpectedResult);
+						deepStrictEqualIgnoreStableVar(getShellIntegrationInjection({ executable: pwshExe, args: '-NOLOGO' }, enabledProcessOptions, defaultEnvironment, logService, productService), enabledExpectedResult);
+						deepStrictEqualIgnoreStableVar(getShellIntegrationInjection({ executable: pwshExe, args: '-nol' }, enabledProcessOptions, defaultEnvironment, logService, productService), enabledExpectedResult);
+						deepStrictEqualIgnoreStableVar(getShellIntegrationInjection({ executable: pwshExe, args: '-NOL' }, enabledProcessOptions, defaultEnvironment, logService, productService), enabledExpectedResult);
 					});
 				});
 			});
@@ -85,10 +92,10 @@ suite('platform - terminalEnvironment', () => {
 					}
 				});
 				test('when array contains no logo and login', () => {
-					deepStrictEqual(getShellIntegrationInjection({ executable: pwshExe, args: ['-l', '-NoLogo'] }, enabledProcessOptions, defaultEnvironment, logService, productService), enabledExpectedResult);
+					deepStrictEqualIgnoreStableVar(getShellIntegrationInjection({ executable: pwshExe, args: ['-l', '-NoLogo'] }, enabledProcessOptions, defaultEnvironment, logService, productService), enabledExpectedResult);
 				});
 				test('when string', () => {
-					deepStrictEqual(getShellIntegrationInjection({ executable: pwshExe, args: '-l' }, enabledProcessOptions, defaultEnvironment, logService, productService), enabledExpectedResult);
+					deepStrictEqualIgnoreStableVar(getShellIntegrationInjection({ executable: pwshExe, args: '-l' }, enabledProcessOptions, defaultEnvironment, logService, productService), enabledExpectedResult);
 				});
 			});
 			suite('should not modify args', () => {
@@ -119,10 +126,10 @@ suite('platform - terminalEnvironment', () => {
 						new RegExp(`.+\\/${username}-vscode-zsh\\/\\.zlogin`)
 					];
 					const expectedSources = [
-						/.+\/out\/vs\/workbench\/contrib\/terminal\/browser\/media\/shellIntegration-rc.zsh/,
-						/.+\/out\/vs\/workbench\/contrib\/terminal\/browser\/media\/shellIntegration-profile.zsh/,
-						/.+\/out\/vs\/workbench\/contrib\/terminal\/browser\/media\/shellIntegration-env.zsh/,
-						/.+\/out\/vs\/workbench\/contrib\/terminal\/browser\/media\/shellIntegration-login.zsh/
+						/.+\/out\/vs\/workbench\/contrib\/terminal\/common\/scripts\/shellIntegration-rc.zsh/,
+						/.+\/out\/vs\/workbench\/contrib\/terminal\/common\/scripts\/shellIntegration-profile.zsh/,
+						/.+\/out\/vs\/workbench\/contrib\/terminal\/common\/scripts\/shellIntegration-env.zsh/,
+						/.+\/out\/vs\/workbench\/contrib\/terminal\/common\/scripts\/shellIntegration-login.zsh/
 					];
 					function assertIsEnabled(result: IShellIntegrationConfigInjection, globalZdotdir = homedir()) {
 						strictEqual(Object.keys(result.envMixin!).length, 3);
@@ -183,21 +190,21 @@ suite('platform - terminalEnvironment', () => {
 						const enabledExpectedResult = Object.freeze<IShellIntegrationConfigInjection>({
 							newArgs: [
 								'--init-file',
-								`${repoRoot}/out/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh`
+								`${repoRoot}/out/vs/workbench/contrib/terminal/common/scripts/shellIntegration-bash.sh`
 							],
 							envMixin: {
 								VSCODE_INJECTION: '1'
 							}
 						});
-						deepStrictEqual(getShellIntegrationInjection({ executable: 'bash', args: [] }, enabledProcessOptions, defaultEnvironment, logService, productService), enabledExpectedResult);
-						deepStrictEqual(getShellIntegrationInjection({ executable: 'bash', args: '' }, enabledProcessOptions, defaultEnvironment, logService, productService), enabledExpectedResult);
-						deepStrictEqual(getShellIntegrationInjection({ executable: 'bash', args: undefined }, enabledProcessOptions, defaultEnvironment, logService, productService), enabledExpectedResult);
+						deepStrictEqualIgnoreStableVar(getShellIntegrationInjection({ executable: 'bash', args: [] }, enabledProcessOptions, defaultEnvironment, logService, productService), enabledExpectedResult);
+						deepStrictEqualIgnoreStableVar(getShellIntegrationInjection({ executable: 'bash', args: '' }, enabledProcessOptions, defaultEnvironment, logService, productService), enabledExpectedResult);
+						deepStrictEqualIgnoreStableVar(getShellIntegrationInjection({ executable: 'bash', args: undefined }, enabledProcessOptions, defaultEnvironment, logService, productService), enabledExpectedResult);
 					});
 					suite('should set login env variable and not modify args', () => {
 						const enabledExpectedResult = Object.freeze<IShellIntegrationConfigInjection>({
 							newArgs: [
 								'--init-file',
-								`${repoRoot}/out/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh`
+								`${repoRoot}/out/vs/workbench/contrib/terminal/common/scripts/shellIntegration-bash.sh`
 							],
 							envMixin: {
 								VSCODE_INJECTION: '1',
@@ -205,7 +212,7 @@ suite('platform - terminalEnvironment', () => {
 							}
 						});
 						test('when array', () => {
-							deepStrictEqual(getShellIntegrationInjection({ executable: 'bash', args: ['-l'] }, enabledProcessOptions, defaultEnvironment, logService, productService), enabledExpectedResult);
+							deepStrictEqualIgnoreStableVar(getShellIntegrationInjection({ executable: 'bash', args: ['-l'] }, enabledProcessOptions, defaultEnvironment, logService, productService), enabledExpectedResult);
 						});
 					});
 					suite('should not modify args', () => {
diff --git a/src/vs/platform/test/electron-main/workbenchTestServices.ts b/src/vs/platform/test/electron-main/workbenchTestServices.ts
index 65beabd3b2a..1a56d22f06c 100644
--- a/src/vs/platform/test/electron-main/workbenchTestServices.ts
+++ b/src/vs/platform/test/electron-main/workbenchTestServices.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Promises } from 'vs/base/common/async';
-import { Event, Emitter } from 'vs/base/common/event';
-import { IAuxiliaryWindow } from 'vs/platform/auxiliaryWindow/electron-main/auxiliaryWindow';
-import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
-import { ILifecycleMainService, IRelaunchHandler, LifecycleMainPhase, ShutdownEvent, ShutdownReason } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
-import { IStateService } from 'vs/platform/state/node/state';
-import { ICodeWindow, UnloadReason } from 'vs/platform/window/electron-main/window';
+import { Promises } from '../../../base/common/async.js';
+import { Event, Emitter } from '../../../base/common/event.js';
+import { IAuxiliaryWindow } from '../../auxiliaryWindow/electron-main/auxiliaryWindow.js';
+import { NativeParsedArgs } from '../../environment/common/argv.js';
+import { ILifecycleMainService, IRelaunchHandler, LifecycleMainPhase, ShutdownEvent, ShutdownReason } from '../../lifecycle/electron-main/lifecycleMainService.js';
+import { IStateService } from '../../state/node/state.js';
+import { ICodeWindow, UnloadReason } from '../../window/electron-main/window.js';
 
 export class TestLifecycleMainService implements ILifecycleMainService {
 
diff --git a/src/vs/platform/theme/browser/defaultStyles.ts b/src/vs/platform/theme/browser/defaultStyles.ts
index 871178faf38..33ee6b363cd 100644
--- a/src/vs/platform/theme/browser/defaultStyles.ts
+++ b/src/vs/platform/theme/browser/defaultStyles.ts
@@ -2,26 +2,27 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { IButtonStyles } from 'vs/base/browser/ui/button/button';
-import { IKeybindingLabelStyles } from 'vs/base/browser/ui/keybindingLabel/keybindingLabel';
-import { ColorIdentifier, keybindingLabelBackground, keybindingLabelBorder, keybindingLabelBottomBorder, keybindingLabelForeground, asCssVariable, widgetShadow, buttonForeground, buttonSeparator, buttonBackground, buttonHoverBackground, buttonSecondaryForeground, buttonSecondaryBackground, buttonSecondaryHoverBackground, buttonBorder, progressBarBackground, inputActiveOptionBorder, inputActiveOptionForeground, inputActiveOptionBackground, editorWidgetBackground, editorWidgetForeground, contrastBorder, checkboxBorder, checkboxBackground, checkboxForeground, problemsErrorIconForeground, problemsWarningIconForeground, problemsInfoIconForeground, inputBackground, inputForeground, inputBorder, textLinkForeground, inputValidationInfoBorder, inputValidationInfoBackground, inputValidationInfoForeground, inputValidationWarningBorder, inputValidationWarningBackground, inputValidationWarningForeground, inputValidationErrorBorder, inputValidationErrorBackground, inputValidationErrorForeground, listFilterWidgetBackground, listFilterWidgetNoMatchesOutline, listFilterWidgetOutline, listFilterWidgetShadow, badgeBackground, badgeForeground, breadcrumbsBackground, breadcrumbsForeground, breadcrumbsFocusForeground, breadcrumbsActiveSelectionForeground, activeContrastBorder, listActiveSelectionBackground, listActiveSelectionForeground, listActiveSelectionIconForeground, listDropOverBackground, listFocusAndSelectionOutline, listFocusBackground, listFocusForeground, listFocusOutline, listHoverBackground, listHoverForeground, listInactiveFocusBackground, listInactiveFocusOutline, listInactiveSelectionBackground, listInactiveSelectionForeground, listInactiveSelectionIconForeground, tableColumnsBorder, tableOddRowsBackgroundColor, treeIndentGuidesStroke, asCssVariableWithDefault, editorWidgetBorder, focusBorder, pickerGroupForeground, quickInputListFocusBackground, quickInputListFocusForeground, quickInputListFocusIconForeground, selectBackground, selectBorder, selectForeground, selectListBackground, treeInactiveIndentGuidesStroke, menuBorder, menuForeground, menuBackground, menuSelectionForeground, menuSelectionBackground, menuSelectionBorder, menuSeparatorBackground, scrollbarShadow, scrollbarSliderActiveBackground, scrollbarSliderBackground, scrollbarSliderHoverBackground, listDropBetweenBackground } from 'vs/platform/theme/common/colorRegistry';
-import { IProgressBarStyles } from 'vs/base/browser/ui/progressbar/progressbar';
-import { ICheckboxStyles, IToggleStyles } from 'vs/base/browser/ui/toggle/toggle';
-import { IDialogStyles } from 'vs/base/browser/ui/dialog/dialog';
-import { IInputBoxStyles } from 'vs/base/browser/ui/inputbox/inputBox';
-import { IFindWidgetStyles } from 'vs/base/browser/ui/tree/abstractTree';
-import { ICountBadgeStyles } from 'vs/base/browser/ui/countBadge/countBadge';
-import { IBreadcrumbsWidgetStyles } from 'vs/base/browser/ui/breadcrumbs/breadcrumbsWidget';
-import { IListStyles } from 'vs/base/browser/ui/list/listWidget';
-import { ISelectBoxStyles } from 'vs/base/browser/ui/selectBox/selectBox';
-import { Color } from 'vs/base/common/color';
-import { IMenuStyles } from 'vs/base/browser/ui/menu/menu';
+import { IButtonStyles } from '../../../base/browser/ui/button/button.js';
+import { IKeybindingLabelStyles } from '../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
+import { ColorIdentifier, keybindingLabelBackground, keybindingLabelBorder, keybindingLabelBottomBorder, keybindingLabelForeground, asCssVariable, widgetShadow, buttonForeground, buttonSeparator, buttonBackground, buttonHoverBackground, buttonSecondaryForeground, buttonSecondaryBackground, buttonSecondaryHoverBackground, buttonBorder, progressBarBackground, inputActiveOptionBorder, inputActiveOptionForeground, inputActiveOptionBackground, editorWidgetBackground, editorWidgetForeground, contrastBorder, checkboxBorder, checkboxBackground, checkboxForeground, problemsErrorIconForeground, problemsWarningIconForeground, problemsInfoIconForeground, inputBackground, inputForeground, inputBorder, textLinkForeground, inputValidationInfoBorder, inputValidationInfoBackground, inputValidationInfoForeground, inputValidationWarningBorder, inputValidationWarningBackground, inputValidationWarningForeground, inputValidationErrorBorder, inputValidationErrorBackground, inputValidationErrorForeground, listFilterWidgetBackground, listFilterWidgetNoMatchesOutline, listFilterWidgetOutline, listFilterWidgetShadow, badgeBackground, badgeForeground, breadcrumbsBackground, breadcrumbsForeground, breadcrumbsFocusForeground, breadcrumbsActiveSelectionForeground, activeContrastBorder, listActiveSelectionBackground, listActiveSelectionForeground, listActiveSelectionIconForeground, listDropOverBackground, listFocusAndSelectionOutline, listFocusBackground, listFocusForeground, listFocusOutline, listHoverBackground, listHoverForeground, listInactiveFocusBackground, listInactiveFocusOutline, listInactiveSelectionBackground, listInactiveSelectionForeground, listInactiveSelectionIconForeground, tableColumnsBorder, tableOddRowsBackgroundColor, treeIndentGuidesStroke, asCssVariableWithDefault, editorWidgetBorder, focusBorder, pickerGroupForeground, quickInputListFocusBackground, quickInputListFocusForeground, quickInputListFocusIconForeground, selectBackground, selectBorder, selectForeground, selectListBackground, treeInactiveIndentGuidesStroke, menuBorder, menuForeground, menuBackground, menuSelectionForeground, menuSelectionBackground, menuSelectionBorder, menuSeparatorBackground, scrollbarShadow, scrollbarSliderActiveBackground, scrollbarSliderBackground, scrollbarSliderHoverBackground, listDropBetweenBackground, radioActiveBackground, radioActiveForeground, radioInactiveBackground, radioInactiveForeground, radioInactiveBorder, radioInactiveHoverBackground, radioActiveBorder } from '../common/colorRegistry.js';
+import { IProgressBarStyles } from '../../../base/browser/ui/progressbar/progressbar.js';
+import { ICheckboxStyles, IToggleStyles } from '../../../base/browser/ui/toggle/toggle.js';
+import { IDialogStyles } from '../../../base/browser/ui/dialog/dialog.js';
+import { IInputBoxStyles } from '../../../base/browser/ui/inputbox/inputBox.js';
+import { IFindWidgetStyles } from '../../../base/browser/ui/tree/abstractTree.js';
+import { ICountBadgeStyles } from '../../../base/browser/ui/countBadge/countBadge.js';
+import { IBreadcrumbsWidgetStyles } from '../../../base/browser/ui/breadcrumbs/breadcrumbsWidget.js';
+import { IListStyles } from '../../../base/browser/ui/list/listWidget.js';
+import { ISelectBoxStyles } from '../../../base/browser/ui/selectBox/selectBox.js';
+import { Color } from '../../../base/common/color.js';
+import { IMenuStyles } from '../../../base/browser/ui/menu/menu.js';
+import { IRadioStyles } from '../../../base/browser/ui/radio/radio.js';
 
 export type IStyleOverride<T> = {
 	[P in keyof T]?: ColorIdentifier | undefined;
 };
 
-function overrideStyles<T extends { [P in keyof T]: string | undefined }>(override: IStyleOverride<T>, styles: T): any {
+function overrideStyles<T extends { [P in keyof T]: string | undefined }>(override: IStyleOverride<T>, styles: T) {
 	const result: { [P in keyof T]: string | undefined } = { ...styles };
 	for (const key in override) {
 		const val = override[key];
@@ -41,6 +42,7 @@ export const defaultKeybindingLabelStyles: IKeybindingLabelStyles = {
 export function getKeybindingLabelStyles(override: IStyleOverride<IKeybindingLabelStyles>): IKeybindingLabelStyles {
 	return overrideStyles(override, defaultKeybindingLabelStyles);
 }
+
 export const defaultButtonStyles: IButtonStyles = {
 	buttonForeground: asCssVariable(buttonForeground),
 	buttonSeparator: asCssVariable(buttonSeparator),
@@ -70,6 +72,16 @@ export const defaultToggleStyles: IToggleStyles = {
 	inputActiveOptionBackground: asCssVariable(inputActiveOptionBackground)
 };
 
+export const defaultRadioStyles: IRadioStyles = {
+	activeForeground: asCssVariable(radioActiveForeground),
+	activeBackground: asCssVariable(radioActiveBackground),
+	activeBorder: asCssVariable(radioActiveBorder),
+	inactiveForeground: asCssVariable(radioInactiveForeground),
+	inactiveBackground: asCssVariable(radioInactiveBackground),
+	inactiveBorder: asCssVariable(radioInactiveBorder),
+	inactiveHoverBackground: asCssVariable(radioInactiveHoverBackground),
+};
+
 export function getToggleStyles(override: IStyleOverride<IToggleStyles>): IToggleStyles {
 	return overrideStyles(override, defaultToggleStyles);
 }
@@ -176,7 +188,7 @@ export const defaultListStyles: IListStyles = {
 	treeInactiveIndentGuidesStroke: asCssVariable(treeInactiveIndentGuidesStroke),
 	treeStickyScrollBackground: undefined,
 	treeStickyScrollBorder: undefined,
-	treeStickyScrollShadow: undefined,
+	treeStickyScrollShadow: asCssVariable(scrollbarShadow),
 	tableColumnsBorder: asCssVariable(tableColumnsBorder),
 	tableOddRowsBackgroundColor: asCssVariable(tableOddRowsBackgroundColor),
 };
diff --git a/src/vs/platform/theme/browser/iconsStyleSheet.ts b/src/vs/platform/theme/browser/iconsStyleSheet.ts
index 96ec62103aa..6cc55b3b192 100644
--- a/src/vs/platform/theme/browser/iconsStyleSheet.ts
+++ b/src/vs/platform/theme/browser/iconsStyleSheet.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { asCSSPropertyValue, asCSSUrl } from 'vs/base/browser/dom';
-import { Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { getIconRegistry, IconContribution, IconFontDefinition } from 'vs/platform/theme/common/iconRegistry';
-import { IProductIconTheme, IThemeService } from 'vs/platform/theme/common/themeService';
+import { asCSSPropertyValue, asCSSUrl } from '../../../base/browser/dom.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { DisposableStore, IDisposable } from '../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../base/common/themables.js';
+import { getIconRegistry, IconContribution, IconFontDefinition } from '../common/iconRegistry.js';
+import { IProductIconTheme, IThemeService } from '../common/themeService.js';
 
 export interface IIconsStyleSheet extends IDisposable {
 	getCSS(): string;
diff --git a/src/vs/platform/theme/common/colorRegistry.ts b/src/vs/platform/theme/common/colorRegistry.ts
index 82b65f7a795..bc0b044b534 100644
--- a/src/vs/platform/theme/common/colorRegistry.ts
+++ b/src/vs/platform/theme/common/colorRegistry.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-export * from 'vs/platform/theme/common/colorUtils';
+export * from './colorUtils.js';
 
 // Make sure all color files are exported
-export * from 'vs/platform/theme/common/colors/baseColors';
-export * from 'vs/platform/theme/common/colors/chartsColors';
-export * from 'vs/platform/theme/common/colors/editorColors';
-export * from 'vs/platform/theme/common/colors/inputColors';
-export * from 'vs/platform/theme/common/colors/listColors';
-export * from 'vs/platform/theme/common/colors/menuColors';
-export * from 'vs/platform/theme/common/colors/minimapColors';
-export * from 'vs/platform/theme/common/colors/miscColors';
-export * from 'vs/platform/theme/common/colors/quickpickColors';
-export * from 'vs/platform/theme/common/colors/searchColors';
+export * from './colors/baseColors.js';
+export * from './colors/chartsColors.js';
+export * from './colors/editorColors.js';
+export * from './colors/inputColors.js';
+export * from './colors/listColors.js';
+export * from './colors/menuColors.js';
+export * from './colors/minimapColors.js';
+export * from './colors/miscColors.js';
+export * from './colors/quickpickColors.js';
+export * from './colors/searchColors.js';
diff --git a/src/vs/platform/theme/common/colorUtils.ts b/src/vs/platform/theme/common/colorUtils.ts
index 0f21708a437..684be5f3d6b 100644
--- a/src/vs/platform/theme/common/colorUtils.ts
+++ b/src/vs/platform/theme/common/colorUtils.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { assertNever } from 'vs/base/common/assert';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { Color } from 'vs/base/common/color';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IJSONSchema, IJSONSchemaSnippet } from 'vs/base/common/jsonSchema';
-import { IJSONContributionRegistry, Extensions as JSONExtensions } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
-import * as platform from 'vs/platform/registry/common/platform';
-import { IColorTheme } from 'vs/platform/theme/common/themeService';
-import * as nls from 'vs/nls';
+import { assertNever } from '../../../base/common/assert.js';
+import { RunOnceScheduler } from '../../../base/common/async.js';
+import { Color } from '../../../base/common/color.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { IJSONSchema, IJSONSchemaSnippet } from '../../../base/common/jsonSchema.js';
+import { IJSONContributionRegistry, Extensions as JSONExtensions } from '../../jsonschemas/common/jsonContributionRegistry.js';
+import * as platform from '../../registry/common/platform.js';
+import { IColorTheme } from './themeService.js';
+import * as nls from '../../../nls.js';
 
 //  ------ API types
 
@@ -20,7 +20,7 @@ export type ColorIdentifier = string;
 export interface ColorContribution {
 	readonly id: ColorIdentifier;
 	readonly description: string;
-	readonly defaults: ColorDefaults | null;
+	readonly defaults: ColorDefaults | ColorValue | null;
 	readonly needsTransparency: boolean;
 	readonly deprecationMessage: string | undefined;
 }
@@ -62,10 +62,6 @@ export type ColorTransform =
 	| { op: ColorTransformType.LessProminent; value: ColorValue; background: ColorValue; factor: number; transparency: number }
 	| { op: ColorTransformType.IfDefinedThenElse; if: ColorIdentifier; then: ColorValue; else: ColorValue };
 
-export function isColorTransform(value: unknown): value is ColorTransform {
-	return typeof value === 'object' && !!value && 'op' in value && typeof value.op === 'number';
-}
-
 export interface ColorDefaults {
 	light: ColorValue | null;
 	dark: ColorValue | null;
@@ -73,16 +69,15 @@ export interface ColorDefaults {
 	hcLight: ColorValue | null;
 }
 
+export function isColorDefaults(value: unknown): value is ColorDefaults {
+	return value !== null && typeof value === 'object' && 'light' in value && 'dark' in value;
+}
 
 /**
  * A Color Value is either a color literal, a reference to an other color or a derived color
  */
 export type ColorValue = Color | string | ColorIdentifier | ColorTransform;
 
-export function isColorValue(value: unknown): value is ColorValue {
-	return typeof value === 'string' || value instanceof Color || isColorTransform(value);
-}
-
 // color registry
 export const Extensions = {
 	ColorContribution: 'base.contributions.colors'
@@ -161,10 +156,10 @@ class ColorRegistry implements IColorRegistry {
 		this._onDidChangeSchema.fire();
 	}
 
-	public registerColor(id: string, defaults: ColorDefaults | null, description: string, needsTransparency = false, deprecationMessage?: string): ColorIdentifier {
+	public registerColor(id: string, defaults: ColorDefaults | ColorValue | null, description: string, needsTransparency = false, deprecationMessage?: string): ColorIdentifier {
 		const colorContribution: ColorContribution = { id, description, defaults, needsTransparency, deprecationMessage };
 		this.colorsById[id] = colorContribution;
-		const propertySchema: IJSONSchemaWithSnippets = { type: 'string', description, format: 'color-hex', defaultSnippets: [{ body: '${1:#ff0000}' }] };
+		const propertySchema: IJSONSchemaWithSnippets = { type: 'string', format: 'color-hex', defaultSnippets: [{ body: '${1:#ff0000}' }] };
 		if (deprecationMessage) {
 			propertySchema.deprecationMessage = deprecationMessage;
 		}
@@ -173,6 +168,7 @@ class ColorRegistry implements IColorRegistry {
 			propertySchema.patternErrorMessage = nls.localize('transparecyRequired', 'This color must be transparent or it will obscure content');
 		}
 		this.colorSchema.properties[id] = {
+			description,
 			oneOf: [
 				propertySchema,
 				{ type: 'string', const: DEFAULT_COLOR_CONFIG_VALUE, description: nls.localize('useDefault', 'Use the default color.') }
@@ -203,8 +199,8 @@ class ColorRegistry implements IColorRegistry {
 
 	public resolveDefaultColor(id: ColorIdentifier, theme: IColorTheme): Color | undefined {
 		const colorDesc = this.colorsById[id];
-		if (colorDesc && colorDesc.defaults) {
-			const colorValue = colorDesc.defaults[theme.type];
+		if (colorDesc?.defaults) {
+			const colorValue = isColorDefaults(colorDesc.defaults) ? colorDesc.defaults[theme.type] : colorDesc.defaults;
 			return resolveColorValue(colorValue, theme);
 		}
 		return undefined;
@@ -238,14 +234,6 @@ platform.Registry.add(Extensions.ColorContribution, colorRegistry);
 
 
 export function registerColor(id: string, defaults: ColorDefaults | ColorValue | null, description: string, needsTransparency?: boolean, deprecationMessage?: string): ColorIdentifier {
-	if (isColorValue(defaults)) {
-		defaults = {
-			dark: defaults,
-			light: defaults,
-			hcDark: defaults,
-			hcLight: defaults
-		} satisfies ColorDefaults;
-	}
 	return colorRegistry.registerColor(id, defaults, description, needsTransparency, deprecationMessage);
 }
 
diff --git a/src/vs/platform/theme/common/colors/baseColors.ts b/src/vs/platform/theme/common/colors/baseColors.ts
index 1d19b3adc1f..514fdc8a4e9 100644
--- a/src/vs/platform/theme/common/colors/baseColors.ts
+++ b/src/vs/platform/theme/common/colors/baseColors.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
+import * as nls from '../../../../nls.js';
 
 // Import the effects we need
-import { Color } from 'vs/base/common/color';
-import { registerColor, transparent } from 'vs/platform/theme/common/colorUtils';
+import { Color } from '../../../../base/common/color.js';
+import { registerColor, transparent } from '../colorUtils.js';
 
 
 export const foreground = registerColor('foreground',
@@ -43,7 +43,7 @@ export const activeContrastBorder = registerColor('contrastActiveBorder',
 	nls.localize('activeContrastBorder', "An extra border around active elements to separate them from others for greater contrast."));
 
 export const selectionBackground = registerColor('selection.background',
-	{ light: null, dark: null, hcDark: null, hcLight: null },
+	null,
 	nls.localize('selectionBackground', "The background color of text selections in the workbench (e.g. for input fields or text areas). Note that this does not apply to selections within the editor."));
 
 
diff --git a/src/vs/platform/theme/common/colors/chartsColors.ts b/src/vs/platform/theme/common/colors/chartsColors.ts
index eb63b602234..c12b947e755 100644
--- a/src/vs/platform/theme/common/colors/chartsColors.ts
+++ b/src/vs/platform/theme/common/colors/chartsColors.ts
@@ -3,36 +3,36 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { registerColor, transparent } from 'vs/platform/theme/common/colorUtils';
+import * as nls from '../../../../nls.js';
+import { registerColor, transparent } from '../colorUtils.js';
 
-import { foreground } from 'vs/platform/theme/common/colors/baseColors';
-import { editorErrorForeground, editorInfoForeground, editorWarningForeground } from 'vs/platform/theme/common/colors/editorColors';
-import { minimapFindMatch } from 'vs/platform/theme/common/colors/minimapColors';
+import { foreground } from './baseColors.js';
+import { editorErrorForeground, editorInfoForeground, editorWarningForeground } from './editorColors.js';
+import { minimapFindMatch } from './minimapColors.js';
 
 
 export const chartsForeground = registerColor('charts.foreground',
-	{ dark: foreground, light: foreground, hcDark: foreground, hcLight: foreground },
+	foreground,
 	nls.localize('chartsForeground', "The foreground color used in charts."));
 
 export const chartsLines = registerColor('charts.lines',
-	{ dark: transparent(foreground, .5), light: transparent(foreground, .5), hcDark: transparent(foreground, .5), hcLight: transparent(foreground, .5) },
+	transparent(foreground, .5),
 	nls.localize('chartsLines', "The color used for horizontal lines in charts."));
 
 export const chartsRed = registerColor('charts.red',
-	{ dark: editorErrorForeground, light: editorErrorForeground, hcDark: editorErrorForeground, hcLight: editorErrorForeground },
+	editorErrorForeground,
 	nls.localize('chartsRed', "The red color used in chart visualizations."));
 
 export const chartsBlue = registerColor('charts.blue',
-	{ dark: editorInfoForeground, light: editorInfoForeground, hcDark: editorInfoForeground, hcLight: editorInfoForeground },
+	editorInfoForeground,
 	nls.localize('chartsBlue', "The blue color used in chart visualizations."));
 
 export const chartsYellow = registerColor('charts.yellow',
-	{ dark: editorWarningForeground, light: editorWarningForeground, hcDark: editorWarningForeground, hcLight: editorWarningForeground },
+	editorWarningForeground,
 	nls.localize('chartsYellow', "The yellow color used in chart visualizations."));
 
 export const chartsOrange = registerColor('charts.orange',
-	{ dark: minimapFindMatch, light: minimapFindMatch, hcDark: minimapFindMatch, hcLight: minimapFindMatch },
+	minimapFindMatch,
 	nls.localize('chartsOrange', "The orange color used in chart visualizations."));
 
 export const chartsGreen = registerColor('charts.green',
diff --git a/src/vs/platform/theme/common/colors/editorColors.ts b/src/vs/platform/theme/common/colors/editorColors.ts
index a57b85e2c29..662fc637dc8 100644
--- a/src/vs/platform/theme/common/colors/editorColors.ts
+++ b/src/vs/platform/theme/common/colors/editorColors.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
+import * as nls from '../../../../nls.js';
 
 // Import the effects we need
-import { Color, RGBA } from 'vs/base/common/color';
-import { registerColor, transparent, lessProminent, darken, lighten } from 'vs/platform/theme/common/colorUtils';
+import { Color, RGBA } from '../../../../base/common/color.js';
+import { registerColor, transparent, lessProminent, darken, lighten } from '../colorUtils.js';
 
 // Import the colors we need
-import { foreground, contrastBorder, activeContrastBorder } from 'vs/platform/theme/common/colors/baseColors';
-import { scrollbarShadow, badgeBackground } from 'vs/platform/theme/common/colors/miscColors';
+import { foreground, contrastBorder, activeContrastBorder } from './baseColors.js';
+import { scrollbarShadow, badgeBackground } from './miscColors.js';
 
 
 // ----- editor
@@ -26,7 +26,7 @@ export const editorForeground = registerColor('editor.foreground',
 
 
 export const editorStickyScrollBackground = registerColor('editorStickyScroll.background',
-	{ light: editorBackground, dark: editorBackground, hcDark: editorBackground, hcLight: editorBackground },
+	editorBackground,
 	nls.localize('editorStickyScrollBackground', "Background color of sticky scroll in the editor"));
 
 export const editorStickyScrollHoverBackground = registerColor('editorStickyScrollHover.background',
@@ -38,7 +38,7 @@ export const editorStickyScrollBorder = registerColor('editorStickyScroll.border
 	nls.localize('editorStickyScrollBorder', "Border color of sticky scroll in the editor"));
 
 export const editorStickyScrollShadow = registerColor('editorStickyScroll.shadow',
-	{ dark: scrollbarShadow, light: scrollbarShadow, hcDark: scrollbarShadow, hcLight: scrollbarShadow },
+	scrollbarShadow,
 	nls.localize('editorStickyScrollShadow', " Shadow color of sticky scroll in the editor"));
 
 
@@ -47,7 +47,7 @@ export const editorWidgetBackground = registerColor('editorWidget.background',
 	nls.localize('editorWidgetBackground', 'Background color of editor widgets, such as find/replace.'));
 
 export const editorWidgetForeground = registerColor('editorWidget.foreground',
-	{ dark: foreground, light: foreground, hcDark: foreground, hcLight: foreground },
+	foreground,
 	nls.localize('editorWidgetForeground', 'Foreground color of editor widgets, such as find/replace.'));
 
 export const editorWidgetBorder = registerColor('editorWidget.border',
@@ -55,12 +55,12 @@ export const editorWidgetBorder = registerColor('editorWidget.border',
 	nls.localize('editorWidgetBorder', 'Border color of editor widgets. The color is only used if the widget chooses to have a border and if the color is not overridden by a widget.'));
 
 export const editorWidgetResizeBorder = registerColor('editorWidget.resizeBorder',
-	{ light: null, dark: null, hcDark: null, hcLight: null },
+	null,
 	nls.localize('editorWidgetResizeBorder', "Border color of the resize bar of editor widgets. The color is only used if the widget chooses to have a resize border and if the color is not overridden by a widget."));
 
 
 export const editorErrorBackground = registerColor('editorError.background',
-	{ dark: null, light: null, hcDark: null, hcLight: null },
+	null,
 	nls.localize('editorError.background', 'Background color of error text in the editor. The color must not be opaque so as not to hide underlying decorations.'), true);
 
 export const editorErrorForeground = registerColor('editorError.foreground',
@@ -73,7 +73,7 @@ export const editorErrorBorder = registerColor('editorError.border',
 
 
 export const editorWarningBackground = registerColor('editorWarning.background',
-	{ dark: null, light: null, hcDark: null, hcLight: null },
+	null,
 	nls.localize('editorWarning.background', 'Background color of warning text in the editor. The color must not be opaque so as not to hide underlying decorations.'), true);
 
 export const editorWarningForeground = registerColor('editorWarning.foreground',
@@ -86,7 +86,7 @@ export const editorWarningBorder = registerColor('editorWarning.border',
 
 
 export const editorInfoBackground = registerColor('editorInfo.background',
-	{ dark: null, light: null, hcDark: null, hcLight: null },
+	null,
 	nls.localize('editorInfo.background', 'Background color of info text in the editor. The color must not be opaque so as not to hide underlying decorations.'), true);
 
 export const editorInfoForeground = registerColor('editorInfo.foreground',
@@ -134,6 +134,10 @@ export const editorSelectionHighlightBorder = registerColor('editor.selectionHig
 	{ light: null, dark: null, hcDark: activeContrastBorder, hcLight: activeContrastBorder },
 	nls.localize('editorSelectionHighlightBorder', "Border color for regions with the same content as the selection."));
 
+export const editorCompositionBorder = registerColor('editor.compositionBorder',
+	{ light: '#000000', dark: '#ffffff', hcLight: '#000000', hcDark: '#ffffff' },
+	nls.localize('editorCompositionBorder', "The border color for an IME composition."));
+
 
 // ----- editor find
 
@@ -142,7 +146,7 @@ export const editorFindMatch = registerColor('editor.findMatchBackground',
 	nls.localize('editorFindMatch', "Color of the current search match."));
 
 export const editorFindMatchForeground = registerColor('editor.findMatchForeground',
-	{ light: null, dark: null, hcDark: null, hcLight: null },
+	null,
 	nls.localize('editorFindMatchForeground', "Text color of the current search match."));
 
 export const editorFindMatchHighlight = registerColor('editor.findMatchHighlightBackground',
@@ -150,7 +154,7 @@ export const editorFindMatchHighlight = registerColor('editor.findMatchHighlight
 	nls.localize('findMatchHighlight', "Color of the other search matches. The color must not be opaque so as not to hide underlying decorations."), true);
 
 export const editorFindMatchHighlightForeground = registerColor('editor.findMatchHighlightForeground',
-	{ light: null, dark: null, hcDark: null, hcLight: null },
+	null,
 	nls.localize('findMatchHighlightForeground', "Foreground color of the other search matches."), true);
 
 export const editorFindRangeHighlight = registerColor('editor.findRangeHighlightBackground',
@@ -177,15 +181,15 @@ export const editorHoverHighlight = registerColor('editor.hoverHighlightBackgrou
 	nls.localize('hoverHighlight', 'Highlight below the word for which a hover is shown. The color must not be opaque so as not to hide underlying decorations.'), true);
 
 export const editorHoverBackground = registerColor('editorHoverWidget.background',
-	{ light: editorWidgetBackground, dark: editorWidgetBackground, hcDark: editorWidgetBackground, hcLight: editorWidgetBackground },
+	editorWidgetBackground,
 	nls.localize('hoverBackground', 'Background color of the editor hover.'));
 
 export const editorHoverForeground = registerColor('editorHoverWidget.foreground',
-	{ light: editorWidgetForeground, dark: editorWidgetForeground, hcDark: editorWidgetForeground, hcLight: editorWidgetForeground },
+	editorWidgetForeground,
 	nls.localize('hoverForeground', 'Foreground color of the editor hover.'));
 
 export const editorHoverBorder = registerColor('editorHoverWidget.border',
-	{ light: editorWidgetBorder, dark: editorWidgetBorder, hcDark: editorWidgetBorder, hcLight: editorWidgetBorder },
+	editorWidgetBorder,
 	nls.localize('hoverBorder', 'Border color of the editor hover.'));
 
 export const editorHoverStatusBarBackground = registerColor('editorHoverWidget.statusBarBackground',
@@ -204,19 +208,19 @@ export const editorInlayHintBackground = registerColor('editorInlayHint.backgrou
 	nls.localize('editorInlayHintBackground', 'Background color of inline hints'));
 
 export const editorInlayHintTypeForeground = registerColor('editorInlayHint.typeForeground',
-	{ dark: editorInlayHintForeground, light: editorInlayHintForeground, hcDark: editorInlayHintForeground, hcLight: editorInlayHintForeground },
+	editorInlayHintForeground,
 	nls.localize('editorInlayHintForegroundTypes', 'Foreground color of inline hints for types'));
 
 export const editorInlayHintTypeBackground = registerColor('editorInlayHint.typeBackground',
-	{ dark: editorInlayHintBackground, light: editorInlayHintBackground, hcDark: editorInlayHintBackground, hcLight: editorInlayHintBackground },
+	editorInlayHintBackground,
 	nls.localize('editorInlayHintBackgroundTypes', 'Background color of inline hints for types'));
 
 export const editorInlayHintParameterForeground = registerColor('editorInlayHint.parameterForeground',
-	{ dark: editorInlayHintForeground, light: editorInlayHintForeground, hcDark: editorInlayHintForeground, hcLight: editorInlayHintForeground },
+	editorInlayHintForeground,
 	nls.localize('editorInlayHintForegroundParameter', 'Foreground color of inline hints for parameters'));
 
 export const editorInlayHintParameterBackground = registerColor('editorInlayHint.parameterBackground',
-	{ dark: editorInlayHintBackground, light: editorInlayHintBackground, hcDark: editorInlayHintBackground, hcLight: editorInlayHintBackground },
+	editorInlayHintBackground,
 	nls.localize('editorInlayHintBackgroundParameter', 'Background color of inline hints for parameters'));
 
 
@@ -231,7 +235,7 @@ export const editorLightBulbAutoFixForeground = registerColor('editorLightBulbAu
 	nls.localize('editorLightBulbAutoFixForeground', "The color used for the lightbulb auto fix actions icon."));
 
 export const editorLightBulbAiForeground = registerColor('editorLightBulbAi.foreground',
-	{ dark: editorLightBulbForeground, light: editorLightBulbForeground, hcDark: editorLightBulbForeground, hcLight: editorLightBulbForeground },
+	editorLightBulbForeground,
 	nls.localize('editorLightBulbAiForeground', "The color used for the lightbulb AI icon."));
 
 
@@ -242,11 +246,11 @@ export const snippetTabstopHighlightBackground = registerColor('editor.snippetTa
 	nls.localize('snippetTabstopHighlightBackground', "Highlight background color of a snippet tabstop."));
 
 export const snippetTabstopHighlightBorder = registerColor('editor.snippetTabstopHighlightBorder',
-	{ dark: null, light: null, hcDark: null, hcLight: null },
+	null,
 	nls.localize('snippetTabstopHighlightBorder', "Highlight border color of a snippet tabstop."));
 
 export const snippetFinalTabstopHighlightBackground = registerColor('editor.snippetFinalTabstopHighlightBackground',
-	{ dark: null, light: null, hcDark: null, hcLight: null },
+	null,
 	nls.localize('snippetFinalTabstopHighlightBackground', "Highlight background color of the final tabstop of a snippet."));
 
 export const snippetFinalTabstopHighlightBorder = registerColor('editor.snippetFinalTabstopHighlightBorder',
@@ -278,20 +282,20 @@ export const diffRemovedLine = registerColor('diffEditor.removedLineBackground',
 
 
 export const diffInsertedLineGutter = registerColor('diffEditorGutter.insertedLineBackground',
-	{ dark: null, light: null, hcDark: null, hcLight: null },
+	null,
 	nls.localize('diffEditorInsertedLineGutter', 'Background color for the margin where lines got inserted.'));
 
 export const diffRemovedLineGutter = registerColor('diffEditorGutter.removedLineBackground',
-	{ dark: null, light: null, hcDark: null, hcLight: null },
+	null,
 	nls.localize('diffEditorRemovedLineGutter', 'Background color for the margin where lines got removed.'));
 
 
 export const diffOverviewRulerInserted = registerColor('diffEditorOverview.insertedForeground',
-	{ dark: null, light: null, hcDark: null, hcLight: null },
+	null,
 	nls.localize('diffEditorOverviewInserted', 'Diff overview ruler foreground for inserted content.'));
 
 export const diffOverviewRulerRemoved = registerColor('diffEditorOverview.removedForeground',
-	{ dark: null, light: null, hcDark: null, hcLight: null },
+	null,
 	nls.localize('diffEditorOverviewRemoved', 'Diff overview ruler foreground for removed content.'));
 
 
@@ -314,11 +318,11 @@ export const diffDiagonalFill = registerColor('diffEditor.diagonalFill',
 
 
 export const diffUnchangedRegionBackground = registerColor('diffEditor.unchangedRegionBackground',
-	{ dark: 'sideBar.background', light: 'sideBar.background', hcDark: 'sideBar.background', hcLight: 'sideBar.background' },
+	'sideBar.background',
 	nls.localize('diffEditor.unchangedRegionBackground', "The background color of unchanged blocks in the diff editor."));
 
 export const diffUnchangedRegionForeground = registerColor('diffEditor.unchangedRegionForeground',
-	{ dark: 'foreground', light: 'foreground', hcDark: 'foreground', hcLight: 'foreground' },
+	'foreground',
 	nls.localize('diffEditor.unchangedRegionForeground', "The foreground color of unchanged blocks in the diff editor."));
 
 export const diffUnchangedTextBackground = registerColor('diffEditor.unchangedCodeBackground',
@@ -355,11 +359,11 @@ export const toolbarActiveBackground = registerColor('toolbar.activeBackground',
 // ----- breadcumbs
 
 export const breadcrumbsForeground = registerColor('breadcrumb.foreground',
-	{ light: transparent(foreground, 0.8), dark: transparent(foreground, 0.8), hcDark: transparent(foreground, 0.8), hcLight: transparent(foreground, 0.8) },
+	transparent(foreground, 0.8),
 	nls.localize('breadcrumbsFocusForeground', "Color of focused breadcrumb items."));
 
 export const breadcrumbsBackground = registerColor('breadcrumb.background',
-	{ light: editorBackground, dark: editorBackground, hcDark: editorBackground, hcLight: editorBackground },
+	editorBackground,
 	nls.localize('breadcrumbsBackground', "Background color of breadcrumb items."));
 
 export const breadcrumbsFocusForeground = registerColor('breadcrumb.focusForeground',
@@ -371,7 +375,7 @@ export const breadcrumbsActiveSelectionForeground = registerColor('breadcrumb.ac
 	nls.localize('breadcrumbsSelectedForeground', "Color of selected breadcrumb items."));
 
 export const breadcrumbsPickerBackground = registerColor('breadcrumbPicker.background',
-	{ light: editorWidgetBackground, dark: editorWidgetBackground, hcDark: editorWidgetBackground, hcLight: editorWidgetBackground },
+	editorWidgetBackground,
 	nls.localize('breadcrumbsSelectedBackground', "Background color of breadcrumb item picker."));
 
 
@@ -389,7 +393,7 @@ export const mergeCurrentHeaderBackground = registerColor('merge.currentHeaderBa
 	nls.localize('mergeCurrentHeaderBackground', 'Current header background in inline merge-conflicts. The color must not be opaque so as not to hide underlying decorations.'), true);
 
 export const mergeCurrentContentBackground = registerColor('merge.currentContentBackground',
-	{ dark: transparent(mergeCurrentHeaderBackground, contentTransparency), light: transparent(mergeCurrentHeaderBackground, contentTransparency), hcDark: transparent(mergeCurrentHeaderBackground, contentTransparency), hcLight: transparent(mergeCurrentHeaderBackground, contentTransparency) },
+	transparent(mergeCurrentHeaderBackground, contentTransparency),
 	nls.localize('mergeCurrentContentBackground', 'Current content background in inline merge-conflicts. The color must not be opaque so as not to hide underlying decorations.'), true);
 
 export const mergeIncomingHeaderBackground = registerColor('merge.incomingHeaderBackground',
@@ -397,7 +401,7 @@ export const mergeIncomingHeaderBackground = registerColor('merge.incomingHeader
 	nls.localize('mergeIncomingHeaderBackground', 'Incoming header background in inline merge-conflicts. The color must not be opaque so as not to hide underlying decorations.'), true);
 
 export const mergeIncomingContentBackground = registerColor('merge.incomingContentBackground',
-	{ dark: transparent(mergeIncomingHeaderBackground, contentTransparency), light: transparent(mergeIncomingHeaderBackground, contentTransparency), hcDark: transparent(mergeIncomingHeaderBackground, contentTransparency), hcLight: transparent(mergeIncomingHeaderBackground, contentTransparency) },
+	transparent(mergeIncomingHeaderBackground, contentTransparency),
 	nls.localize('mergeIncomingContentBackground', 'Incoming content background in inline merge-conflicts. The color must not be opaque so as not to hide underlying decorations.'), true);
 
 export const mergeCommonHeaderBackground = registerColor('merge.commonHeaderBackground',
@@ -405,7 +409,7 @@ export const mergeCommonHeaderBackground = registerColor('merge.commonHeaderBack
 	nls.localize('mergeCommonHeaderBackground', 'Common ancestor header background in inline merge-conflicts. The color must not be opaque so as not to hide underlying decorations.'), true);
 
 export const mergeCommonContentBackground = registerColor('merge.commonContentBackground',
-	{ dark: transparent(mergeCommonHeaderBackground, contentTransparency), light: transparent(mergeCommonHeaderBackground, contentTransparency), hcDark: transparent(mergeCommonHeaderBackground, contentTransparency), hcLight: transparent(mergeCommonHeaderBackground, contentTransparency) },
+	transparent(mergeCommonHeaderBackground, contentTransparency),
 	nls.localize('mergeCommonContentBackground', 'Common ancestor content background in inline merge-conflicts. The color must not be opaque so as not to hide underlying decorations.'), true);
 
 export const mergeBorder = registerColor('merge.border',
@@ -426,24 +430,24 @@ export const overviewRulerCommonContentForeground = registerColor('editorOvervie
 	nls.localize('overviewRulerCommonContentForeground', 'Common ancestor overview ruler foreground for inline merge-conflicts.'));
 
 export const overviewRulerFindMatchForeground = registerColor('editorOverviewRuler.findMatchForeground',
-	{ dark: '#d186167e', light: '#d186167e', hcDark: '#AB5A00', hcLight: '' },
+	{ dark: '#d186167e', light: '#d186167e', hcDark: '#AB5A00', hcLight: '#AB5A00' },
 	nls.localize('overviewRulerFindMatchForeground', 'Overview ruler marker color for find matches. The color must not be opaque so as not to hide underlying decorations.'), true);
 
 export const overviewRulerSelectionHighlightForeground = registerColor('editorOverviewRuler.selectionHighlightForeground',
-	{ dark: '#A0A0A0CC', light: '#A0A0A0CC', hcDark: '#A0A0A0CC', hcLight: '#A0A0A0CC' },
+	'#A0A0A0CC',
 	nls.localize('overviewRulerSelectionHighlightForeground', 'Overview ruler marker color for selection highlights. The color must not be opaque so as not to hide underlying decorations.'), true);
 
 
 // ----- problems
 
 export const problemsErrorIconForeground = registerColor('problemsErrorIcon.foreground',
-	{ dark: editorErrorForeground, light: editorErrorForeground, hcDark: editorErrorForeground, hcLight: editorErrorForeground },
+	editorErrorForeground,
 	nls.localize('problemsErrorIconForeground', "The color used for the problems error icon."));
 
 export const problemsWarningIconForeground = registerColor('problemsWarningIcon.foreground',
-	{ dark: editorWarningForeground, light: editorWarningForeground, hcDark: editorWarningForeground, hcLight: editorWarningForeground },
+	editorWarningForeground,
 	nls.localize('problemsWarningIconForeground', "The color used for the problems warning icon."));
 
 export const problemsInfoIconForeground = registerColor('problemsInfoIcon.foreground',
-	{ dark: editorInfoForeground, light: editorInfoForeground, hcDark: editorInfoForeground, hcLight: editorInfoForeground },
+	editorInfoForeground,
 	nls.localize('problemsInfoIconForeground', "The color used for the problems info icon."));
diff --git a/src/vs/platform/theme/common/colors/inputColors.ts b/src/vs/platform/theme/common/colors/inputColors.ts
index dc38222d402..1cf5a83e85a 100644
--- a/src/vs/platform/theme/common/colors/inputColors.ts
+++ b/src/vs/platform/theme/common/colors/inputColors.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
+import * as nls from '../../../../nls.js';
 
 // Import the effects we need
-import { Color, RGBA } from 'vs/base/common/color';
-import { registerColor, transparent, lighten, darken } from 'vs/platform/theme/common/colorUtils';
+import { Color, RGBA } from '../../../../base/common/color.js';
+import { registerColor, transparent, lighten, darken } from '../colorUtils.js';
 
 // Import the colors we need
-import { foreground, contrastBorder, focusBorder, iconForeground } from 'vs/platform/theme/common/colors/baseColors';
-import { editorWidgetBackground } from 'vs/platform/theme/common/colors/editorColors';
+import { foreground, contrastBorder, focusBorder, iconForeground } from './baseColors.js';
+import { editorWidgetBackground } from './editorColors.js';
 
 
 // ----- input
@@ -21,7 +21,7 @@ export const inputBackground = registerColor('input.background',
 	nls.localize('inputBoxBackground', "Input box background."));
 
 export const inputForeground = registerColor('input.foreground',
-	{ dark: foreground, light: foreground, hcDark: foreground, hcLight: foreground },
+	foreground,
 	nls.localize('inputBoxForeground', "Input box foreground."));
 
 export const inputBorder = registerColor('input.border',
@@ -110,11 +110,11 @@ export const selectBorder = registerColor('dropdown.border',
 // ------ button
 
 export const buttonForeground = registerColor('button.foreground',
-	{ dark: Color.white, light: Color.white, hcDark: Color.white, hcLight: Color.white },
+	Color.white,
 	nls.localize('buttonForeground', "Button foreground color."));
 
 export const buttonSeparator = registerColor('button.separator',
-	{ dark: transparent(buttonForeground, .4), light: transparent(buttonForeground, .4), hcDark: transparent(buttonForeground, .4), hcLight: transparent(buttonForeground, .4) },
+	transparent(buttonForeground, .4),
 	nls.localize('buttonSeparator', "Button separator color."));
 
 export const buttonBackground = registerColor('button.background',
@@ -126,7 +126,7 @@ export const buttonHoverBackground = registerColor('button.hoverBackground',
 	nls.localize('buttonHoverBackground', "Button background color when hovering."));
 
 export const buttonBorder = registerColor('button.border',
-	{ dark: contrastBorder, light: contrastBorder, hcDark: contrastBorder, hcLight: contrastBorder },
+	contrastBorder,
 	nls.localize('buttonBorder', "Button border color."));
 
 export const buttonSecondaryForeground = registerColor('button.secondaryForeground',
@@ -141,27 +141,56 @@ export const buttonSecondaryHoverBackground = registerColor('button.secondaryHov
 	{ dark: lighten(buttonSecondaryBackground, 0.2), light: darken(buttonSecondaryBackground, 0.2), hcDark: null, hcLight: null },
 	nls.localize('buttonSecondaryHoverBackground', "Secondary button background color when hovering."));
 
+// ------ radio
+
+export const radioActiveForeground = registerColor('radio.activeForeground',
+	inputActiveOptionForeground,
+	nls.localize('radioActiveForeground', "Foreground color of active radio option."));
+
+export const radioActiveBackground = registerColor('radio.activeBackground',
+	inputActiveOptionBackground,
+	nls.localize('radioBackground', "Background color of active radio option."));
+
+export const radioActiveBorder = registerColor('radio.activeBorder',
+	inputActiveOptionBorder,
+	nls.localize('radioActiveBorder', "Border color of the active radio option."));
+
+export const radioInactiveForeground = registerColor('radio.inactiveForeground',
+	null,
+	nls.localize('radioInactiveForeground', "Foreground color of inactive radio option."));
+
+export const radioInactiveBackground = registerColor('radio.inactiveBackground',
+	null,
+	nls.localize('radioInactiveBackground', "Background color of inactive radio option."));
+
+export const radioInactiveBorder = registerColor('radio.inactiveBorder',
+	{ light: transparent(radioActiveForeground, .2), dark: transparent(radioActiveForeground, .2), hcDark: transparent(radioActiveForeground, .4), hcLight: transparent(radioActiveForeground, .2) },
+	nls.localize('radioInactiveBorder', "Border color of the inactive radio option."));
+
+export const radioInactiveHoverBackground = registerColor('radio.inactiveHoverBackground',
+	inputActiveOptionHoverBackground,
+	nls.localize('radioHoverBackground', "Background color of inactive active radio option when hovering."));
 
 // ------ checkbox
 
 export const checkboxBackground = registerColor('checkbox.background',
-	{ dark: selectBackground, light: selectBackground, hcDark: selectBackground, hcLight: selectBackground },
+	selectBackground,
 	nls.localize('checkbox.background', "Background color of checkbox widget."));
 
 export const checkboxSelectBackground = registerColor('checkbox.selectBackground',
-	{ dark: editorWidgetBackground, light: editorWidgetBackground, hcDark: editorWidgetBackground, hcLight: editorWidgetBackground },
+	editorWidgetBackground,
 	nls.localize('checkbox.select.background', "Background color of checkbox widget when the element it's in is selected."));
 
 export const checkboxForeground = registerColor('checkbox.foreground',
-	{ dark: selectForeground, light: selectForeground, hcDark: selectForeground, hcLight: selectForeground },
+	selectForeground,
 	nls.localize('checkbox.foreground', "Foreground color of checkbox widget."));
 
 export const checkboxBorder = registerColor('checkbox.border',
-	{ dark: selectBorder, light: selectBorder, hcDark: selectBorder, hcLight: selectBorder },
+	selectBorder,
 	nls.localize('checkbox.border', "Border color of checkbox widget."));
 
 export const checkboxSelectBorder = registerColor('checkbox.selectBorder',
-	{ dark: iconForeground, light: iconForeground, hcDark: iconForeground, hcLight: iconForeground },
+	iconForeground,
 	nls.localize('checkbox.select.border', "Border color of checkbox widget when the element it's in is selected."));
 
 
diff --git a/src/vs/platform/theme/common/colors/listColors.ts b/src/vs/platform/theme/common/colors/listColors.ts
index b6f51e3696b..8e345ded0db 100644
--- a/src/vs/platform/theme/common/colors/listColors.ts
+++ b/src/vs/platform/theme/common/colors/listColors.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
+import * as nls from '../../../../nls.js';
 
 // Import the effects we need
-import { Color } from 'vs/base/common/color';
-import { registerColor, darken, lighten, transparent, ifDefinedThenElse } from 'vs/platform/theme/common/colorUtils';
+import { Color } from '../../../../base/common/color.js';
+import { registerColor, darken, lighten, transparent, ifDefinedThenElse } from '../colorUtils.js';
 
 // Import the colors we need
-import { foreground, contrastBorder, activeContrastBorder, focusBorder, iconForeground } from 'vs/platform/theme/common/colors/baseColors';
-import { editorWidgetBackground, editorFindMatchHighlightBorder, editorFindMatchHighlight, widgetShadow } from 'vs/platform/theme/common/colors/editorColors';
+import { foreground, contrastBorder, activeContrastBorder, focusBorder, iconForeground } from './baseColors.js';
+import { editorWidgetBackground, editorFindMatchHighlightBorder, editorFindMatchHighlight, widgetShadow, editorWidgetForeground } from './editorColors.js';
 
 
 export const listFocusBackground = registerColor('list.focusBackground',
-	{ dark: null, light: null, hcDark: null, hcLight: null },
+	null,
 	nls.localize('listFocusBackground', "List/Tree background color for the focused item when the list/tree is active. An active list/tree has keyboard focus, an inactive does not."));
 
 export const listFocusForeground = registerColor('list.focusForeground',
-	{ dark: null, light: null, hcDark: null, hcLight: null },
+	null,
 	nls.localize('listFocusForeground', "List/Tree foreground color for the focused item when the list/tree is active. An active list/tree has keyboard focus, an inactive does not."));
 
 export const listFocusOutline = registerColor('list.focusOutline',
@@ -27,7 +27,7 @@ export const listFocusOutline = registerColor('list.focusOutline',
 	nls.localize('listFocusOutline', "List/Tree outline color for the focused item when the list/tree is active. An active list/tree has keyboard focus, an inactive does not."));
 
 export const listFocusAndSelectionOutline = registerColor('list.focusAndSelectionOutline',
-	{ dark: null, light: null, hcDark: null, hcLight: null },
+	null,
 	nls.localize('listFocusAndSelectionOutline', "List/Tree outline color for the focused item when the list/tree is active and selected. An active list/tree has keyboard focus, an inactive does not."));
 
 export const listActiveSelectionBackground = registerColor('list.activeSelectionBackground',
@@ -39,7 +39,7 @@ export const listActiveSelectionForeground = registerColor('list.activeSelection
 	nls.localize('listActiveSelectionForeground', "List/Tree foreground color for the selected item when the list/tree is active. An active list/tree has keyboard focus, an inactive does not."));
 
 export const listActiveSelectionIconForeground = registerColor('list.activeSelectionIconForeground',
-	{ dark: null, light: null, hcDark: null, hcLight: null },
+	null,
 	nls.localize('listActiveSelectionIconForeground', "List/Tree icon foreground color for the selected item when the list/tree is active. An active list/tree has keyboard focus, an inactive does not."));
 
 export const listInactiveSelectionBackground = registerColor('list.inactiveSelectionBackground',
@@ -47,19 +47,19 @@ export const listInactiveSelectionBackground = registerColor('list.inactiveSelec
 	nls.localize('listInactiveSelectionBackground', "List/Tree background color for the selected item when the list/tree is inactive. An active list/tree has keyboard focus, an inactive does not."));
 
 export const listInactiveSelectionForeground = registerColor('list.inactiveSelectionForeground',
-	{ dark: null, light: null, hcDark: null, hcLight: null },
+	null,
 	nls.localize('listInactiveSelectionForeground', "List/Tree foreground color for the selected item when the list/tree is inactive. An active list/tree has keyboard focus, an inactive does not."));
 
 export const listInactiveSelectionIconForeground = registerColor('list.inactiveSelectionIconForeground',
-	{ dark: null, light: null, hcDark: null, hcLight: null },
+	null,
 	nls.localize('listInactiveSelectionIconForeground', "List/Tree icon foreground color for the selected item when the list/tree is inactive. An active list/tree has keyboard focus, an inactive does not."));
 
 export const listInactiveFocusBackground = registerColor('list.inactiveFocusBackground',
-	{ dark: null, light: null, hcDark: null, hcLight: null },
+	null,
 	nls.localize('listInactiveFocusBackground', "List/Tree background color for the focused item when the list/tree is inactive. An active list/tree has keyboard focus, an inactive does not."));
 
 export const listInactiveFocusOutline = registerColor('list.inactiveFocusOutline',
-	{ dark: null, light: null, hcDark: null, hcLight: null },
+	null,
 	nls.localize('listInactiveFocusOutline', "List/Tree outline color for the focused item when the list/tree is inactive. An active list/tree has keyboard focus, an inactive does not."));
 
 export const listHoverBackground = registerColor('list.hoverBackground',
@@ -67,7 +67,7 @@ export const listHoverBackground = registerColor('list.hoverBackground',
 	nls.localize('listHoverBackground', "List/Tree background when hovering over items using the mouse."));
 
 export const listHoverForeground = registerColor('list.hoverForeground',
-	{ dark: null, light: null, hcDark: null, hcLight: null },
+	null,
 	nls.localize('listHoverForeground', "List/Tree foreground when hovering over items using the mouse."));
 
 export const listDropOverBackground = registerColor('list.dropBackground',
@@ -109,7 +109,7 @@ export const listFilterWidgetNoMatchesOutline = registerColor('listFilterWidget.
 	nls.localize('listFilterWidgetNoMatchesOutline', 'Outline color of the type filter widget in lists and trees, when there are no matches.'));
 
 export const listFilterWidgetShadow = registerColor('listFilterWidget.shadow',
-	{ dark: widgetShadow, light: widgetShadow, hcDark: widgetShadow, hcLight: widgetShadow },
+	widgetShadow,
 	nls.localize('listFilterWidgetShadow', 'Shadow color of the type filter widget in lists and trees.'));
 
 export const listFilterMatchHighlight = registerColor('list.filterMatchBackground',
@@ -132,7 +132,7 @@ export const treeIndentGuidesStroke = registerColor('tree.indentGuidesStroke',
 	nls.localize('treeIndentGuidesStroke', "Tree stroke color for the indentation guides."));
 
 export const treeInactiveIndentGuidesStroke = registerColor('tree.inactiveIndentGuidesStroke',
-	{ dark: transparent(treeIndentGuidesStroke, 0.4), light: transparent(treeIndentGuidesStroke, 0.4), hcDark: transparent(treeIndentGuidesStroke, 0.4), hcLight: transparent(treeIndentGuidesStroke, 0.4) },
+	transparent(treeIndentGuidesStroke, 0.4),
 	nls.localize('treeInactiveIndentGuidesStroke', "Tree stroke color for the indentation guides that are not active."));
 
 
@@ -145,3 +145,21 @@ export const tableColumnsBorder = registerColor('tree.tableColumnsBorder',
 export const tableOddRowsBackgroundColor = registerColor('tree.tableOddRowsBackground',
 	{ dark: transparent(foreground, 0.04), light: transparent(foreground, 0.04), hcDark: null, hcLight: null },
 	nls.localize('tableOddRowsBackgroundColor', "Background color for odd table rows."));
+
+// ------ action list
+
+export const editorActionListBackground = registerColor('editorActionList.background',
+	editorWidgetBackground,
+	nls.localize('editorActionListBackground', "Action List background color."));
+
+export const editorActionListForeground = registerColor('editorActionList.foreground',
+	editorWidgetForeground,
+	nls.localize('editorActionListForeground', "Action List foreground color."));
+
+export const editorActionListFocusForeground = registerColor('editorActionList.focusForeground',
+	listActiveSelectionForeground,
+	nls.localize('editorActionListFocusForeground', "Action List foreground color for the focused item."));
+
+export const editorActionListFocusBackground = registerColor('editorActionList.focusBackground',
+	listActiveSelectionBackground,
+	nls.localize('editorActionListFocusBackground', "Action List background color for the focused item."));
diff --git a/src/vs/platform/theme/common/colors/menuColors.ts b/src/vs/platform/theme/common/colors/menuColors.ts
index 6fa9a0ec326..116a293aa07 100644
--- a/src/vs/platform/theme/common/colors/menuColors.ts
+++ b/src/vs/platform/theme/common/colors/menuColors.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
+import * as nls from '../../../../nls.js';
 
 // Import the effects we need
-import { registerColor } from 'vs/platform/theme/common/colorUtils';
+import { registerColor } from '../colorUtils.js';
 
 // Import the colors we need
-import { contrastBorder, activeContrastBorder } from 'vs/platform/theme/common/colors/baseColors';
-import { selectForeground, selectBackground } from 'vs/platform/theme/common/colors/inputColors';
-import { listActiveSelectionBackground, listActiveSelectionForeground } from 'vs/platform/theme/common/colors/listColors';
+import { contrastBorder, activeContrastBorder } from './baseColors.js';
+import { selectForeground, selectBackground } from './inputColors.js';
+import { listActiveSelectionBackground, listActiveSelectionForeground } from './listColors.js';
 
 
 export const menuBorder = registerColor('menu.border',
@@ -19,19 +19,19 @@ export const menuBorder = registerColor('menu.border',
 	nls.localize('menuBorder', "Border color of menus."));
 
 export const menuForeground = registerColor('menu.foreground',
-	{ dark: selectForeground, light: selectForeground, hcDark: selectForeground, hcLight: selectForeground },
+	selectForeground,
 	nls.localize('menuForeground', "Foreground color of menu items."));
 
 export const menuBackground = registerColor('menu.background',
-	{ dark: selectBackground, light: selectBackground, hcDark: selectBackground, hcLight: selectBackground },
+	selectBackground,
 	nls.localize('menuBackground', "Background color of menu items."));
 
 export const menuSelectionForeground = registerColor('menu.selectionForeground',
-	{ dark: listActiveSelectionForeground, light: listActiveSelectionForeground, hcDark: listActiveSelectionForeground, hcLight: listActiveSelectionForeground },
+	listActiveSelectionForeground,
 	nls.localize('menuSelectionForeground', "Foreground color of the selected menu item in menus."));
 
 export const menuSelectionBackground = registerColor('menu.selectionBackground',
-	{ dark: listActiveSelectionBackground, light: listActiveSelectionBackground, hcDark: listActiveSelectionBackground, hcLight: listActiveSelectionBackground },
+	listActiveSelectionBackground,
 	nls.localize('menuSelectionBackground', "Background color of the selected menu item in menus."));
 
 export const menuSelectionBorder = registerColor('menu.selectionBorder',
diff --git a/src/vs/platform/theme/common/colors/minimapColors.ts b/src/vs/platform/theme/common/colors/minimapColors.ts
index 0b051994d09..3ac33997731 100644
--- a/src/vs/platform/theme/common/colors/minimapColors.ts
+++ b/src/vs/platform/theme/common/colors/minimapColors.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
+import * as nls from '../../../../nls.js';
 
 // Import the effects we need
-import { Color, RGBA } from 'vs/base/common/color';
-import { registerColor, transparent } from 'vs/platform/theme/common/colorUtils';
+import { Color, RGBA } from '../../../../base/common/color.js';
+import { registerColor, transparent } from '../colorUtils.js';
 
 // Import the colors we need
-import { editorInfoForeground, editorWarningForeground, editorWarningBorder, editorInfoBorder } from 'vs/platform/theme/common/colors/editorColors';
-import { scrollbarSliderBackground, scrollbarSliderHoverBackground, scrollbarSliderActiveBackground } from 'vs/platform/theme/common/colors/miscColors';
+import { editorInfoForeground, editorWarningForeground, editorWarningBorder, editorInfoBorder } from './editorColors.js';
+import { scrollbarSliderBackground, scrollbarSliderHoverBackground, scrollbarSliderActiveBackground } from './miscColors.js';
 
 
 export const minimapFindMatch = registerColor('minimap.findMatchHighlight',
@@ -39,21 +39,21 @@ export const minimapError = registerColor('minimap.errorHighlight',
 	nls.localize('minimapError', 'Minimap marker color for errors.'));
 
 export const minimapBackground = registerColor('minimap.background',
-	{ dark: null, light: null, hcDark: null, hcLight: null },
+	null,
 	nls.localize('minimapBackground', "Minimap background color."));
 
 export const minimapForegroundOpacity = registerColor('minimap.foregroundOpacity',
-	{ dark: Color.fromHex('#000f'), light: Color.fromHex('#000f'), hcDark: Color.fromHex('#000f'), hcLight: Color.fromHex('#000f') },
+	Color.fromHex('#000f'),
 	nls.localize('minimapForegroundOpacity', 'Opacity of foreground elements rendered in the minimap. For example, "#000000c0" will render the elements with 75% opacity.'));
 
 export const minimapSliderBackground = registerColor('minimapSlider.background',
-	{ light: transparent(scrollbarSliderBackground, 0.5), dark: transparent(scrollbarSliderBackground, 0.5), hcDark: transparent(scrollbarSliderBackground, 0.5), hcLight: transparent(scrollbarSliderBackground, 0.5) },
+	transparent(scrollbarSliderBackground, 0.5),
 	nls.localize('minimapSliderBackground', "Minimap slider background color."));
 
 export const minimapSliderHoverBackground = registerColor('minimapSlider.hoverBackground',
-	{ light: transparent(scrollbarSliderHoverBackground, 0.5), dark: transparent(scrollbarSliderHoverBackground, 0.5), hcDark: transparent(scrollbarSliderHoverBackground, 0.5), hcLight: transparent(scrollbarSliderHoverBackground, 0.5) },
+	transparent(scrollbarSliderHoverBackground, 0.5),
 	nls.localize('minimapSliderHoverBackground', "Minimap slider background color when hovering."));
 
 export const minimapSliderActiveBackground = registerColor('minimapSlider.activeBackground',
-	{ light: transparent(scrollbarSliderActiveBackground, 0.5), dark: transparent(scrollbarSliderActiveBackground, 0.5), hcDark: transparent(scrollbarSliderActiveBackground, 0.5), hcLight: transparent(scrollbarSliderActiveBackground, 0.5) },
+	transparent(scrollbarSliderActiveBackground, 0.5),
 	nls.localize('minimapSliderActiveBackground', "Minimap slider background color when clicked on."));
diff --git a/src/vs/platform/theme/common/colors/miscColors.ts b/src/vs/platform/theme/common/colors/miscColors.ts
index 5a2ea49b702..7be17f5c44e 100644
--- a/src/vs/platform/theme/common/colors/miscColors.ts
+++ b/src/vs/platform/theme/common/colors/miscColors.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
+import * as nls from '../../../../nls.js';
 
 // Import the effects we need
-import { Color } from 'vs/base/common/color';
-import { registerColor, transparent } from 'vs/platform/theme/common/colorUtils';
+import { Color } from '../../../../base/common/color.js';
+import { registerColor, transparent } from '../colorUtils.js';
 
 // Import the colors we need
-import { contrastBorder, focusBorder } from 'vs/platform/theme/common/colors/baseColors';
+import { contrastBorder, focusBorder } from './baseColors.js';
 
 
 // ----- sash
 
 export const sashHoverBorder = registerColor('sash.hoverBorder',
-	{ dark: focusBorder, light: focusBorder, hcDark: focusBorder, hcLight: focusBorder },
+	focusBorder,
 	nls.localize('sashActiveBorder', "Border color of active sashes."));
 
 
diff --git a/src/vs/platform/theme/common/colors/quickpickColors.ts b/src/vs/platform/theme/common/colors/quickpickColors.ts
index 7f8fc271a6e..96e9b2a1f2c 100644
--- a/src/vs/platform/theme/common/colors/quickpickColors.ts
+++ b/src/vs/platform/theme/common/colors/quickpickColors.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
+import * as nls from '../../../../nls.js';
 
 // Import the effects we need
-import { Color, RGBA } from 'vs/base/common/color';
-import { registerColor, oneOf } from 'vs/platform/theme/common/colorUtils';
+import { Color, RGBA } from '../../../../base/common/color.js';
+import { registerColor, oneOf } from '../colorUtils.js';
 
 // Import the colors we need
-import { editorWidgetBackground, editorWidgetForeground } from 'vs/platform/theme/common/colors/editorColors';
-import { listActiveSelectionBackground, listActiveSelectionForeground, listActiveSelectionIconForeground } from 'vs/platform/theme/common/colors/listColors';
+import { editorWidgetBackground, editorWidgetForeground } from './editorColors.js';
+import { listActiveSelectionBackground, listActiveSelectionForeground, listActiveSelectionIconForeground } from './listColors.js';
 
 
 export const quickInputBackground = registerColor('quickInput.background',
-	{ dark: editorWidgetBackground, light: editorWidgetBackground, hcDark: editorWidgetBackground, hcLight: editorWidgetBackground },
+	editorWidgetBackground,
 	nls.localize('pickerBackground', "Quick picker background color. The quick picker widget is the container for pickers like the command palette."));
 
 export const quickInputForeground = registerColor('quickInput.foreground',
-	{ dark: editorWidgetForeground, light: editorWidgetForeground, hcDark: editorWidgetForeground, hcLight: editorWidgetForeground },
+	editorWidgetForeground,
 	nls.localize('pickerForeground', "Quick picker foreground color. The quick picker widget is the container for pickers like the command palette."));
 
 export const quickInputTitleBackground = registerColor('quickInputTitle.background',
@@ -35,15 +35,15 @@ export const pickerGroupBorder = registerColor('pickerGroup.border',
 	nls.localize('pickerGroupBorder', "Quick picker color for grouping borders."));
 
 export const _deprecatedQuickInputListFocusBackground = registerColor('quickInput.list.focusBackground',
-	{ dark: null, light: null, hcDark: null, hcLight: null }, '', undefined,
+	null, '', undefined,
 	nls.localize('quickInput.list.focusBackground deprecation', "Please use quickInputList.focusBackground instead"));
 
 export const quickInputListFocusForeground = registerColor('quickInputList.focusForeground',
-	{ dark: listActiveSelectionForeground, light: listActiveSelectionForeground, hcDark: listActiveSelectionForeground, hcLight: listActiveSelectionForeground },
+	listActiveSelectionForeground,
 	nls.localize('quickInput.listFocusForeground', "Quick picker foreground color for the focused item."));
 
 export const quickInputListFocusIconForeground = registerColor('quickInputList.focusIconForeground',
-	{ dark: listActiveSelectionIconForeground, light: listActiveSelectionIconForeground, hcDark: listActiveSelectionIconForeground, hcLight: listActiveSelectionIconForeground },
+	listActiveSelectionIconForeground,
 	nls.localize('quickInput.listFocusIconForeground', "Quick picker icon foreground color for the focused item."));
 
 export const quickInputListFocusBackground = registerColor('quickInputList.focusBackground',
diff --git a/src/vs/platform/theme/common/colors/searchColors.ts b/src/vs/platform/theme/common/colors/searchColors.ts
index 8f10c53ab0e..7937f76d080 100644
--- a/src/vs/platform/theme/common/colors/searchColors.ts
+++ b/src/vs/platform/theme/common/colors/searchColors.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
+import * as nls from '../../../../nls.js';
 
 // Import the effects we need
-import { registerColor, transparent } from 'vs/platform/theme/common/colorUtils';
+import { registerColor, transparent } from '../colorUtils.js';
 
 // Import the colors we need
-import { foreground } from 'vs/platform/theme/common/colors/baseColors';
-import { editorFindMatchHighlight, editorFindMatchHighlightBorder } from 'vs/platform/theme/common/colors/editorColors';
+import { foreground } from './baseColors.js';
+import { editorFindMatchHighlight, editorFindMatchHighlightBorder } from './editorColors.js';
 
 
 export const searchResultsInfoForeground = registerColor('search.resultsInfoForeground',
diff --git a/src/vs/platform/theme/common/iconRegistry.ts b/src/vs/platform/theme/common/iconRegistry.ts
index 214f4846dcc..279b30ba113 100644
--- a/src/vs/platform/theme/common/iconRegistry.ts
+++ b/src/vs/platform/theme/common/iconRegistry.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { Codicon } from 'vs/base/common/codicons';
-import { getCodiconFontCharacters } from 'vs/base/common/codiconsUtil';
-import { ThemeIcon, IconIdentifier } from 'vs/base/common/themables';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IJSONSchema, IJSONSchemaMap } from 'vs/base/common/jsonSchema';
-import { isString } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { Extensions as JSONExtensions, IJSONContributionRegistry } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
-import * as platform from 'vs/platform/registry/common/platform';
+import { RunOnceScheduler } from '../../../base/common/async.js';
+import { Codicon } from '../../../base/common/codicons.js';
+import { getCodiconFontCharacters } from '../../../base/common/codiconsUtil.js';
+import { ThemeIcon, IconIdentifier } from '../../../base/common/themables.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { IJSONSchema, IJSONSchemaMap } from '../../../base/common/jsonSchema.js';
+import { isString } from '../../../base/common/types.js';
+import { URI } from '../../../base/common/uri.js';
+import { localize } from '../../../nls.js';
+import { Extensions as JSONExtensions, IJSONContributionRegistry } from '../../jsonschemas/common/jsonContributionRegistry.js';
+import * as platform from '../../registry/common/platform.js';
 
 //  ------ API types
 
diff --git a/src/vs/platform/theme/common/themeService.ts b/src/vs/platform/theme/common/themeService.ts
index f89940c9f1e..cf850e7726e 100644
--- a/src/vs/platform/theme/common/themeService.ts
+++ b/src/vs/platform/theme/common/themeService.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from 'vs/base/common/codicons';
-import { Color } from 'vs/base/common/color';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import * as platform from 'vs/platform/registry/common/platform';
-import { ColorIdentifier } from 'vs/platform/theme/common/colorRegistry';
-import { IconContribution, IconDefinition } from 'vs/platform/theme/common/iconRegistry';
-import { ColorScheme } from 'vs/platform/theme/common/theme';
+import { Codicon } from '../../../base/common/codicons.js';
+import { Color } from '../../../base/common/color.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import * as platform from '../../registry/common/platform.js';
+import { ColorIdentifier } from './colorRegistry.js';
+import { IconContribution, IconDefinition } from './iconRegistry.js';
+import { ColorScheme } from './theme.js';
 
 export const IThemeService = createDecorator<IThemeService>('themeService');
 
@@ -214,9 +214,13 @@ export interface IPartsSplash {
 		foreground: string | undefined;
 		editorBackground: string | undefined;
 		titleBarBackground: string | undefined;
+		titleBarBorder: string | undefined;
 		activityBarBackground: string | undefined;
+		activityBarBorder: string | undefined;
 		sideBarBackground: string | undefined;
+		sideBarBorder: string | undefined;
 		statusBarBackground: string | undefined;
+		statusBarBorder: string | undefined;
 		statusBarNoFolderBackground: string | undefined;
 		windowBorder: string | undefined;
 	};
diff --git a/src/vs/platform/theme/common/tokenClassificationRegistry.ts b/src/vs/platform/theme/common/tokenClassificationRegistry.ts
index b95a89a1435..6b7e07ce8f3 100644
--- a/src/vs/platform/theme/common/tokenClassificationRegistry.ts
+++ b/src/vs/platform/theme/common/tokenClassificationRegistry.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { Color } from 'vs/base/common/color';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IJSONSchema, IJSONSchemaMap } from 'vs/base/common/jsonSchema';
-import * as nls from 'vs/nls';
-import { Extensions as JSONExtensions, IJSONContributionRegistry } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
-import * as platform from 'vs/platform/registry/common/platform';
-import { IColorTheme } from 'vs/platform/theme/common/themeService';
+import { RunOnceScheduler } from '../../../base/common/async.js';
+import { Color } from '../../../base/common/color.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { IJSONSchema, IJSONSchemaMap } from '../../../base/common/jsonSchema.js';
+import * as nls from '../../../nls.js';
+import { Extensions as JSONExtensions, IJSONContributionRegistry } from '../../jsonschemas/common/jsonContributionRegistry.js';
+import * as platform from '../../registry/common/platform.js';
+import { IColorTheme } from './themeService.js';
 
 const TOKEN_TYPE_WILDCARD = '*';
 const TOKEN_CLASSIFIER_LANGUAGE_SEPARATOR = ':';
diff --git a/src/vs/platform/theme/electron-main/themeMainService.ts b/src/vs/platform/theme/electron-main/themeMainService.ts
index caef715f2da..aea7ebbb82b 100644
--- a/src/vs/platform/theme/electron-main/themeMainService.ts
+++ b/src/vs/platform/theme/electron-main/themeMainService.ts
@@ -3,18 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BrowserWindow, nativeTheme } from 'electron';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IStateService } from 'vs/platform/state/node/state';
-import { IPartsSplash } from 'vs/platform/theme/common/themeService';
-import { IColorScheme } from 'vs/platform/window/common/window';
+import electron from 'electron';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { isLinux, isMacintosh, isWindows } from '../../../base/common/platform.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { IStateService } from '../../state/node/state.js';
+import { IPartsSplash } from '../common/themeService.js';
+import { IColorScheme } from '../../window/common/window.js';
 
+// These default colors match our default themes
+// editor background color ("Dark Modern", etc...)
 const DEFAULT_BG_LIGHT = '#FFFFFF';
-const DEFAULT_BG_DARK = '#1E1E1E';
+const DEFAULT_BG_DARK = '#1F1F1F';
 const DEFAULT_BG_HC_BLACK = '#000000';
 const DEFAULT_BG_HC_LIGHT = '#FFFFFF';
 
@@ -64,30 +66,30 @@ export class ThemeMainService extends Disposable implements IThemeMainService {
 		this.updateSystemColorTheme();
 
 		// Color Scheme changes
-		this._register(Event.fromNodeEventEmitter(nativeTheme, 'updated')(() => this._onDidChangeColorScheme.fire(this.getColorScheme())));
+		this._register(Event.fromNodeEventEmitter(electron.nativeTheme, 'updated')(() => this._onDidChangeColorScheme.fire(this.getColorScheme())));
 	}
 
 	private updateSystemColorTheme(): void {
 		if (isLinux || this.configurationService.getValue(ThemeSettings.DETECT_COLOR_SCHEME)) {
 			// only with `system` we can detect the system color scheme
-			nativeTheme.themeSource = 'system';
+			electron.nativeTheme.themeSource = 'system';
 		} else {
 			switch (this.configurationService.getValue<'default' | 'auto' | 'light' | 'dark'>(ThemeSettings.SYSTEM_COLOR_THEME)) {
 				case 'dark':
-					nativeTheme.themeSource = 'dark';
+					electron.nativeTheme.themeSource = 'dark';
 					break;
 				case 'light':
-					nativeTheme.themeSource = 'light';
+					electron.nativeTheme.themeSource = 'light';
 					break;
 				case 'auto':
 					switch (this.getBaseTheme()) {
-						case 'vs': nativeTheme.themeSource = 'light'; break;
-						case 'vs-dark': nativeTheme.themeSource = 'dark'; break;
-						default: nativeTheme.themeSource = 'system';
+						case 'vs': electron.nativeTheme.themeSource = 'light'; break;
+						case 'vs-dark': electron.nativeTheme.themeSource = 'dark'; break;
+						default: electron.nativeTheme.themeSource = 'system';
 					}
 					break;
 				default:
-					nativeTheme.themeSource = 'system';
+					electron.nativeTheme.themeSource = 'system';
 					break;
 			}
 
@@ -97,23 +99,23 @@ export class ThemeMainService extends Disposable implements IThemeMainService {
 	getColorScheme(): IColorScheme {
 		if (isWindows) {
 			// high contrast is refelected by the shouldUseInvertedColorScheme property
-			if (nativeTheme.shouldUseHighContrastColors) {
+			if (electron.nativeTheme.shouldUseHighContrastColors) {
 				// shouldUseInvertedColorScheme is dark, !shouldUseInvertedColorScheme is light
-				return { dark: nativeTheme.shouldUseInvertedColorScheme, highContrast: true };
+				return { dark: electron.nativeTheme.shouldUseInvertedColorScheme, highContrast: true };
 			}
 		} else if (isMacintosh) {
 			// high contrast is set if one of shouldUseInvertedColorScheme or shouldUseHighContrastColors is set, reflecting the 'Invert colours' and `Increase contrast` settings in MacOS
-			if (nativeTheme.shouldUseInvertedColorScheme || nativeTheme.shouldUseHighContrastColors) {
-				return { dark: nativeTheme.shouldUseDarkColors, highContrast: true };
+			if (electron.nativeTheme.shouldUseInvertedColorScheme || electron.nativeTheme.shouldUseHighContrastColors) {
+				return { dark: electron.nativeTheme.shouldUseDarkColors, highContrast: true };
 			}
 		} else if (isLinux) {
 			// ubuntu gnome seems to have 3 states, light dark and high contrast
-			if (nativeTheme.shouldUseHighContrastColors) {
+			if (electron.nativeTheme.shouldUseHighContrastColors) {
 				return { dark: true, highContrast: true };
 			}
 		}
 		return {
-			dark: nativeTheme.shouldUseDarkColors,
+			dark: electron.nativeTheme.shouldUseDarkColors,
 			highContrast: false
 		};
 	}
@@ -134,10 +136,6 @@ export class ThemeMainService extends Disposable implements IThemeMainService {
 			}
 		}
 
-		if (isMacintosh && background.toUpperCase() === DEFAULT_BG_DARK) {
-			background = '#171717'; // https://github.com/electron/electron/issues/5150
-		}
-
 		return background;
 	}
 
@@ -170,7 +168,7 @@ export class ThemeMainService extends Disposable implements IThemeMainService {
 	}
 
 	private updateBackgroundColor(windowId: number, splash: IPartsSplash): void {
-		for (const window of BrowserWindow.getAllWindows()) {
+		for (const window of electron.BrowserWindow.getAllWindows()) {
 			if (window.id === windowId) {
 				window.setBackgroundColor(splash.colorInfo.background);
 				break;
diff --git a/src/vs/platform/theme/test/common/testThemeService.ts b/src/vs/platform/theme/test/common/testThemeService.ts
index 5109b055e4c..8ee388d4dbd 100644
--- a/src/vs/platform/theme/test/common/testThemeService.ts
+++ b/src/vs/platform/theme/test/common/testThemeService.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Color } from 'vs/base/common/color';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IconContribution } from 'vs/platform/theme/common/iconRegistry';
-import { ColorScheme } from 'vs/platform/theme/common/theme';
-import { IColorTheme, IFileIconTheme, IProductIconTheme, IThemeService, ITokenStyle } from 'vs/platform/theme/common/themeService';
+import { Color } from '../../../../base/common/color.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { IconContribution } from '../../common/iconRegistry.js';
+import { ColorScheme } from '../../common/theme.js';
+import { IColorTheme, IFileIconTheme, IProductIconTheme, IThemeService, ITokenStyle } from '../../common/themeService.js';
 
 export class TestColorTheme implements IColorTheme {
 
diff --git a/src/vs/platform/tunnel/common/tunnel.ts b/src/vs/platform/tunnel/common/tunnel.ts
index b1433f2e745..1b0592103ac 100644
--- a/src/vs/platform/tunnel/common/tunnel.ts
+++ b/src/vs/platform/tunnel/common/tunnel.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
-import { OperatingSystem } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IAddressProvider } from 'vs/platform/remote/common/remoteAgentConnection';
-import { TunnelPrivacy } from 'vs/platform/remote/common/remoteAuthorityResolver';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { IDisposable, Disposable } from '../../../base/common/lifecycle.js';
+import { OperatingSystem } from '../../../base/common/platform.js';
+import { URI } from '../../../base/common/uri.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { ILogService } from '../../log/common/log.js';
+import { IAddressProvider } from '../../remote/common/remoteAgentConnection.js';
+import { TunnelPrivacy } from '../../remote/common/remoteAuthorityResolver.js';
 
 export const ITunnelService = createDecorator<ITunnelService>('tunnelService');
 export const ISharedTunnelsService = createDecorator<ISharedTunnelsService>('sharedTunnelsService');
diff --git a/src/vs/platform/tunnel/node/sharedProcessTunnelService.ts b/src/vs/platform/tunnel/node/sharedProcessTunnelService.ts
index 4dbb881b3c1..46500cf661b 100644
--- a/src/vs/platform/tunnel/node/sharedProcessTunnelService.ts
+++ b/src/vs/platform/tunnel/node/sharedProcessTunnelService.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ILogService } from 'vs/platform/log/common/log';
-import { ISharedProcessTunnel, ISharedProcessTunnelService } from 'vs/platform/remote/common/sharedProcessTunnelService';
-import { ISharedTunnelsService, RemoteTunnel } from 'vs/platform/tunnel/common/tunnel';
-import { IAddress, IAddressProvider } from 'vs/platform/remote/common/remoteAgentConnection';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { canceled } from 'vs/base/common/errors';
-import { DeferredPromise } from 'vs/base/common/async';
+import { ILogService } from '../../log/common/log.js';
+import { ISharedProcessTunnel, ISharedProcessTunnelService } from '../../remote/common/sharedProcessTunnelService.js';
+import { ISharedTunnelsService, RemoteTunnel } from '../common/tunnel.js';
+import { IAddress, IAddressProvider } from '../../remote/common/remoteAgentConnection.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { canceled } from '../../../base/common/errors.js';
+import { DeferredPromise } from '../../../base/common/async.js';
 
 class TunnelData extends Disposable implements IAddressProvider {
 
diff --git a/src/vs/platform/tunnel/node/tunnelService.ts b/src/vs/platform/tunnel/node/tunnelService.ts
index f28dc9e2271..3554ea785d7 100644
--- a/src/vs/platform/tunnel/node/tunnelService.ts
+++ b/src/vs/platform/tunnel/node/tunnelService.ts
@@ -5,21 +5,21 @@
 
 import * as net from 'net';
 import * as os from 'os';
-import { BROWSER_RESTRICTED_PORTS, findFreePortFaster } from 'vs/base/node/ports';
-import { NodeSocket } from 'vs/base/parts/ipc/node/ipc.net';
+import { BROWSER_RESTRICTED_PORTS, findFreePortFaster } from '../../../base/node/ports.js';
+import { NodeSocket } from '../../../base/parts/ipc/node/ipc.net.js';
 
-import { Barrier } from 'vs/base/common/async';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { OS } from 'vs/base/common/platform';
-import { ISocket } from 'vs/base/parts/ipc/common/ipc.net';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IAddressProvider, IConnectionOptions, connectRemoteAgentTunnel } from 'vs/platform/remote/common/remoteAgentConnection';
-import { IRemoteSocketFactoryService } from 'vs/platform/remote/common/remoteSocketFactoryService';
-import { ISignService } from 'vs/platform/sign/common/sign';
-import { AbstractTunnelService, ISharedTunnelsService, ITunnelProvider, ITunnelService, RemoteTunnel, TunnelPrivacyId, isAllInterfaces, isLocalhost, isPortPrivileged, isTunnelProvider } from 'vs/platform/tunnel/common/tunnel';
-import { VSBuffer } from 'vs/base/common/buffer';
+import { Barrier } from '../../../base/common/async.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { OS } from '../../../base/common/platform.js';
+import { ISocket } from '../../../base/parts/ipc/common/ipc.net.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { ILogService } from '../../log/common/log.js';
+import { IProductService } from '../../product/common/productService.js';
+import { IAddressProvider, IConnectionOptions, connectRemoteAgentTunnel } from '../../remote/common/remoteAgentConnection.js';
+import { IRemoteSocketFactoryService } from '../../remote/common/remoteSocketFactoryService.js';
+import { ISignService } from '../../sign/common/sign.js';
+import { AbstractTunnelService, ISharedTunnelsService, ITunnelProvider, ITunnelService, RemoteTunnel, TunnelPrivacyId, isAllInterfaces, isLocalhost, isPortPrivileged, isTunnelProvider } from '../common/tunnel.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
 
 async function createRemoteTunnel(options: IConnectionOptions, defaultTunnelHost: string, tunnelRemoteHost: string, tunnelRemotePort: number, tunnelLocalPort?: number): Promise<RemoteTunnel> {
 	let readyTunnel: NodeRemoteTunnel | undefined;
diff --git a/src/vs/platform/tunnel/test/common/tunnel.test.ts b/src/vs/platform/tunnel/test/common/tunnel.test.ts
index ae32707eb30..2a243f48e05 100644
--- a/src/vs/platform/tunnel/test/common/tunnel.test.ts
+++ b/src/vs/platform/tunnel/test/common/tunnel.test.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
+import { URI } from '../../../../base/common/uri.js';
 import {
 	extractLocalHostUriMetaDataForPortMapping,
 	extractQueryLocalHostUriMetaDataForPortMapping
-} from 'vs/platform/tunnel/common/tunnel';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+} from '../../common/tunnel.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 
 
 suite('Tunnel', () => {
diff --git a/src/vs/platform/undoRedo/common/undoRedo.ts b/src/vs/platform/undoRedo/common/undoRedo.ts
index a667ae9f8f9..bff14d68aee 100644
--- a/src/vs/platform/undoRedo/common/undoRedo.ts
+++ b/src/vs/platform/undoRedo/common/undoRedo.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { URI } from '../../../base/common/uri.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 export const IUndoRedoService = createDecorator<IUndoRedoService>('undoRedoService');
 
diff --git a/src/vs/platform/undoRedo/common/undoRedoService.ts b/src/vs/platform/undoRedo/common/undoRedoService.ts
index 2fc97616747..52be006cc5a 100644
--- a/src/vs/platform/undoRedo/common/undoRedoService.ts
+++ b/src/vs/platform/undoRedo/common/undoRedoService.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Disposable, IDisposable, isDisposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import Severity from 'vs/base/common/severity';
-import { URI } from 'vs/base/common/uri';
-import * as nls from 'vs/nls';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IPastFutureElements, IResourceUndoRedoElement, IUndoRedoElement, IUndoRedoService, IWorkspaceUndoRedoElement, ResourceEditStackSnapshot, UndoRedoElementType, UndoRedoGroup, UndoRedoSource, UriComparisonKeyComputer } from 'vs/platform/undoRedo/common/undoRedo';
+import { onUnexpectedError } from '../../../base/common/errors.js';
+import { Disposable, IDisposable, isDisposable } from '../../../base/common/lifecycle.js';
+import { Schemas } from '../../../base/common/network.js';
+import Severity from '../../../base/common/severity.js';
+import { URI } from '../../../base/common/uri.js';
+import * as nls from '../../../nls.js';
+import { IDialogService } from '../../dialogs/common/dialogs.js';
+import { InstantiationType, registerSingleton } from '../../instantiation/common/extensions.js';
+import { INotificationService } from '../../notification/common/notification.js';
+import { IPastFutureElements, IResourceUndoRedoElement, IUndoRedoElement, IUndoRedoService, IWorkspaceUndoRedoElement, ResourceEditStackSnapshot, UndoRedoElementType, UndoRedoGroup, UndoRedoSource, UriComparisonKeyComputer } from './undoRedo.js';
 
 const DEBUG = false;
 
diff --git a/src/vs/platform/undoRedo/test/common/undoRedoService.test.ts b/src/vs/platform/undoRedo/test/common/undoRedoService.test.ts
index 32d33a7d23c..5348387272f 100644
--- a/src/vs/platform/undoRedo/test/common/undoRedoService.test.ts
+++ b/src/vs/platform/undoRedo/test/common/undoRedoService.test.ts
@@ -4,14 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { mock } from 'vs/base/test/common/mock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IDialogService, IPrompt } from 'vs/platform/dialogs/common/dialogs';
-import { TestDialogService } from 'vs/platform/dialogs/test/common/testDialogService';
-import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
-import { IUndoRedoElement, UndoRedoElementType, UndoRedoGroup } from 'vs/platform/undoRedo/common/undoRedo';
-import { UndoRedoService } from 'vs/platform/undoRedo/common/undoRedoService';
+import { URI } from '../../../../base/common/uri.js';
+import { mock } from '../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { IDialogService, IPrompt } from '../../../dialogs/common/dialogs.js';
+import { TestDialogService } from '../../../dialogs/test/common/testDialogService.js';
+import { TestNotificationService } from '../../../notification/test/common/testNotificationService.js';
+import { IUndoRedoElement, UndoRedoElementType, UndoRedoGroup } from '../../common/undoRedo.js';
+import { UndoRedoService } from '../../common/undoRedoService.js';
 
 suite('UndoRedoService', () => {
 
diff --git a/src/vs/platform/update/common/update.config.contribution.ts b/src/vs/platform/update/common/update.config.contribution.ts
index 4134233def6..d96926b5578 100644
--- a/src/vs/platform/update/common/update.config.contribution.ts
+++ b/src/vs/platform/update/common/update.config.contribution.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isWeb, isWindows } from 'vs/base/common/platform';
-import { localize } from 'vs/nls';
-import { ConfigurationScope, Extensions as ConfigurationExtensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { Registry } from 'vs/platform/registry/common/platform';
+import { isWeb, isWindows } from '../../../base/common/platform.js';
+import { localize } from '../../../nls.js';
+import { ConfigurationScope, Extensions as ConfigurationExtensions, IConfigurationRegistry } from '../../configuration/common/configurationRegistry.js';
+import { Registry } from '../../registry/common/platform.js';
 
 const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
 configurationRegistry.registerConfiguration({
diff --git a/src/vs/platform/update/common/update.ts b/src/vs/platform/update/common/update.ts
index 18cafc9196d..2b0253285aa 100644
--- a/src/vs/platform/update/common/update.ts
+++ b/src/vs/platform/update/common/update.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { Event } from '../../../base/common/event.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 export interface IUpdate {
 	// Windows and Linux: 9a19815253d91900be5ec1016e0ecc7cc9a6950 (Commit Hash). Mac: 1.54.0 (Product Version)
diff --git a/src/vs/platform/update/common/updateIpc.ts b/src/vs/platform/update/common/updateIpc.ts
index 735ea9526dd..1c9490312fe 100644
--- a/src/vs/platform/update/common/updateIpc.ts
+++ b/src/vs/platform/update/common/updateIpc.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { IChannel, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
-import { IUpdateService, State } from 'vs/platform/update/common/update';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { IChannel, IServerChannel } from '../../../base/parts/ipc/common/ipc.js';
+import { IUpdateService, State } from './update.js';
 
 export class UpdateChannel implements IServerChannel {
 
diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts
index ea18f4ab5a6..48638aa12f7 100644
--- a/src/vs/platform/update/electron-main/abstractUpdateService.ts
+++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { timeout } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IEnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
-import { ILifecycleMainService, LifecycleMainPhase } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IRequestService } from 'vs/platform/request/common/request';
-import { AvailableForDownload, DisablementReason, IUpdateService, State, StateType, UpdateType } from 'vs/platform/update/common/update';
+import { timeout } from '../../../base/common/async.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { IEnvironmentMainService } from '../../environment/electron-main/environmentMainService.js';
+import { ILifecycleMainService, LifecycleMainPhase } from '../../lifecycle/electron-main/lifecycleMainService.js';
+import { ILogService } from '../../log/common/log.js';
+import { IProductService } from '../../product/common/productService.js';
+import { IRequestService } from '../../request/common/request.js';
+import { AvailableForDownload, DisablementReason, IUpdateService, State, StateType, UpdateType } from '../common/update.js';
 
 export function createUpdateURL(platform: string, quality: string, productService: IProductService): string {
 	return `${productService.updateUrl}/api/update/${platform}/${quality}/${productService.commit}`;
diff --git a/src/vs/platform/update/electron-main/updateService.darwin.ts b/src/vs/platform/update/electron-main/updateService.darwin.ts
index 183c69da906..d3f27d3711e 100644
--- a/src/vs/platform/update/electron-main/updateService.darwin.ts
+++ b/src/vs/platform/update/electron-main/updateService.darwin.ts
@@ -4,19 +4,19 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as electron from 'electron';
-import { memoize } from 'vs/base/common/decorators';
-import { Event } from 'vs/base/common/event';
-import { hash } from 'vs/base/common/hash';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IEnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
-import { ILifecycleMainService, IRelaunchHandler, IRelaunchOptions } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IRequestService } from 'vs/platform/request/common/request';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IUpdate, State, StateType, UpdateType } from 'vs/platform/update/common/update';
-import { AbstractUpdateService, createUpdateURL, UpdateErrorClassification, UpdateNotAvailableClassification } from 'vs/platform/update/electron-main/abstractUpdateService';
+import { memoize } from '../../../base/common/decorators.js';
+import { Event } from '../../../base/common/event.js';
+import { hash } from '../../../base/common/hash.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { IEnvironmentMainService } from '../../environment/electron-main/environmentMainService.js';
+import { ILifecycleMainService, IRelaunchHandler, IRelaunchOptions } from '../../lifecycle/electron-main/lifecycleMainService.js';
+import { ILogService } from '../../log/common/log.js';
+import { IProductService } from '../../product/common/productService.js';
+import { IRequestService } from '../../request/common/request.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
+import { IUpdate, State, StateType, UpdateType } from '../common/update.js';
+import { AbstractUpdateService, createUpdateURL, UpdateErrorClassification, UpdateNotAvailableClassification } from './abstractUpdateService.js';
 
 export class DarwinUpdateService extends AbstractUpdateService implements IRelaunchHandler {
 
diff --git a/src/vs/platform/update/electron-main/updateService.linux.ts b/src/vs/platform/update/electron-main/updateService.linux.ts
index c0f18ba9a8c..6e076c72ed8 100644
--- a/src/vs/platform/update/electron-main/updateService.linux.ts
+++ b/src/vs/platform/update/electron-main/updateService.linux.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IEnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
-import { ILifecycleMainService } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { INativeHostMainService } from 'vs/platform/native/electron-main/nativeHostMainService';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { asJson, IRequestService } from 'vs/platform/request/common/request';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { AvailableForDownload, IUpdate, State, UpdateType } from 'vs/platform/update/common/update';
-import { AbstractUpdateService, createUpdateURL, UpdateNotAvailableClassification } from 'vs/platform/update/electron-main/abstractUpdateService';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { IEnvironmentMainService } from '../../environment/electron-main/environmentMainService.js';
+import { ILifecycleMainService } from '../../lifecycle/electron-main/lifecycleMainService.js';
+import { ILogService } from '../../log/common/log.js';
+import { INativeHostMainService } from '../../native/electron-main/nativeHostMainService.js';
+import { IProductService } from '../../product/common/productService.js';
+import { asJson, IRequestService } from '../../request/common/request.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
+import { AvailableForDownload, IUpdate, State, UpdateType } from '../common/update.js';
+import { AbstractUpdateService, createUpdateURL, UpdateNotAvailableClassification } from './abstractUpdateService.js';
 
 export class LinuxUpdateService extends AbstractUpdateService {
 
diff --git a/src/vs/platform/update/electron-main/updateService.snap.ts b/src/vs/platform/update/electron-main/updateService.snap.ts
index c20ce198e0c..78bcf9d7a45 100644
--- a/src/vs/platform/update/electron-main/updateService.snap.ts
+++ b/src/vs/platform/update/electron-main/updateService.snap.ts
@@ -5,15 +5,15 @@
 
 import { spawn } from 'child_process';
 import { realpath, watch } from 'fs';
-import { timeout } from 'vs/base/common/async';
-import { Emitter, Event } from 'vs/base/common/event';
-import * as path from 'vs/base/common/path';
-import { IEnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
-import { ILifecycleMainService } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { AvailableForDownload, IUpdateService, State, StateType, UpdateType } from 'vs/platform/update/common/update';
-import { UpdateNotAvailableClassification } from 'vs/platform/update/electron-main/abstractUpdateService';
+import { timeout } from '../../../base/common/async.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import * as path from '../../../base/common/path.js';
+import { IEnvironmentMainService } from '../../environment/electron-main/environmentMainService.js';
+import { ILifecycleMainService } from '../../lifecycle/electron-main/lifecycleMainService.js';
+import { ILogService } from '../../log/common/log.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
+import { AvailableForDownload, IUpdateService, State, StateType, UpdateType } from '../common/update.js';
+import { UpdateNotAvailableClassification } from './abstractUpdateService.js';
 
 abstract class AbstractUpdateService implements IUpdateService {
 
diff --git a/src/vs/platform/update/electron-main/updateService.win32.ts b/src/vs/platform/update/electron-main/updateService.win32.ts
index 4c49a758185..61109e54741 100644
--- a/src/vs/platform/update/electron-main/updateService.win32.ts
+++ b/src/vs/platform/update/electron-main/updateService.win32.ts
@@ -6,25 +6,25 @@
 import { spawn } from 'child_process';
 import * as fs from 'fs';
 import { tmpdir } from 'os';
-import { timeout } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { memoize } from 'vs/base/common/decorators';
-import { hash } from 'vs/base/common/hash';
-import * as path from 'vs/base/common/path';
-import { URI } from 'vs/base/common/uri';
-import { checksum } from 'vs/base/node/crypto';
-import * as pfs from 'vs/base/node/pfs';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IEnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
-import { IFileService } from 'vs/platform/files/common/files';
-import { ILifecycleMainService, IRelaunchHandler, IRelaunchOptions } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { INativeHostMainService } from 'vs/platform/native/electron-main/nativeHostMainService';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { asJson, IRequestService } from 'vs/platform/request/common/request';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { AvailableForDownload, DisablementReason, IUpdate, State, StateType, UpdateType } from 'vs/platform/update/common/update';
-import { AbstractUpdateService, createUpdateURL, UpdateErrorClassification, UpdateNotAvailableClassification } from 'vs/platform/update/electron-main/abstractUpdateService';
+import { timeout } from '../../../base/common/async.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { memoize } from '../../../base/common/decorators.js';
+import { hash } from '../../../base/common/hash.js';
+import * as path from '../../../base/common/path.js';
+import { URI } from '../../../base/common/uri.js';
+import { checksum } from '../../../base/node/crypto.js';
+import * as pfs from '../../../base/node/pfs.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { IEnvironmentMainService } from '../../environment/electron-main/environmentMainService.js';
+import { IFileService } from '../../files/common/files.js';
+import { ILifecycleMainService, IRelaunchHandler, IRelaunchOptions } from '../../lifecycle/electron-main/lifecycleMainService.js';
+import { ILogService } from '../../log/common/log.js';
+import { INativeHostMainService } from '../../native/electron-main/nativeHostMainService.js';
+import { IProductService } from '../../product/common/productService.js';
+import { asJson, IRequestService } from '../../request/common/request.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
+import { AvailableForDownload, DisablementReason, IUpdate, State, StateType, UpdateType } from '../common/update.js';
+import { AbstractUpdateService, createUpdateURL, UpdateErrorClassification, UpdateNotAvailableClassification } from './abstractUpdateService.js';
 
 async function pollUntil(fn: () => boolean, millis = 1000): Promise<void> {
 	while (!fn()) {
@@ -55,7 +55,7 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
 	@memoize
 	get cachePath(): Promise<string> {
 		const result = path.join(tmpdir(), `vscode-${this.productService.quality}-${this.productService.target}-${process.arch}`);
-		return pfs.Promises.mkdir(result, { recursive: true }).then(() => result);
+		return fs.promises.mkdir(result, { recursive: true }).then(() => result);
 	}
 
 	constructor(
@@ -189,7 +189,7 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
 		return path.join(cachePath, `CodeSetup-${this.productService.quality}-${version}.exe`);
 	}
 
-	private async cleanup(exceptVersion: string | null = null): Promise<any> {
+	private async cleanup(exceptVersion: string | null = null): Promise<void> {
 		const filter = exceptVersion ? (one: string) => !(new RegExp(`${this.productService.quality}-${exceptVersion}\\.exe$`).test(one)) : () => true;
 
 		const cachePath = await this.cachePath;
@@ -197,7 +197,7 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
 
 		const promises = versions.filter(filter).map(async one => {
 			try {
-				await pfs.Promises.unlink(path.join(cachePath, one));
+				await fs.promises.unlink(path.join(cachePath, one));
 			} catch (err) {
 				// ignore
 			}
diff --git a/src/vs/platform/uriIdentity/common/uriIdentity.ts b/src/vs/platform/uriIdentity/common/uriIdentity.ts
index f01d6ccf0f4..8bd6be7dfed 100644
--- a/src/vs/platform/uriIdentity/common/uriIdentity.ts
+++ b/src/vs/platform/uriIdentity/common/uriIdentity.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IExtUri } from 'vs/base/common/resources';
+import { URI } from '../../../base/common/uri.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { IExtUri } from '../../../base/common/resources.js';
 
 
 export const IUriIdentityService = createDecorator<IUriIdentityService>('IUriIdentityService');
diff --git a/src/vs/platform/uriIdentity/common/uriIdentityService.ts b/src/vs/platform/uriIdentity/common/uriIdentityService.ts
index c9ffebe311c..ba9ca5b7ae8 100644
--- a/src/vs/platform/uriIdentity/common/uriIdentityService.ts
+++ b/src/vs/platform/uriIdentity/common/uriIdentityService.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { URI } from 'vs/base/common/uri';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IFileService, FileSystemProviderCapabilities, IFileSystemProviderCapabilitiesChangeEvent, IFileSystemProviderRegistrationEvent } from 'vs/platform/files/common/files';
-import { ExtUri, IExtUri, normalizePath } from 'vs/base/common/resources';
-import { SkipList } from 'vs/base/common/skipList';
-import { Event } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import { IUriIdentityService } from './uriIdentity.js';
+import { URI } from '../../../base/common/uri.js';
+import { InstantiationType, registerSingleton } from '../../instantiation/common/extensions.js';
+import { IFileService, FileSystemProviderCapabilities, IFileSystemProviderCapabilitiesChangeEvent, IFileSystemProviderRegistrationEvent } from '../../files/common/files.js';
+import { ExtUri, IExtUri, normalizePath } from '../../../base/common/resources.js';
+import { SkipList } from '../../../base/common/skipList.js';
+import { Event } from '../../../base/common/event.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
 
 class Entry {
 	static _clock = 0;
diff --git a/src/vs/platform/uriIdentity/test/common/uriIdentityService.test.ts b/src/vs/platform/uriIdentity/test/common/uriIdentityService.test.ts
index 339e86bf938..bb0a791f378 100644
--- a/src/vs/platform/uriIdentity/test/common/uriIdentityService.test.ts
+++ b/src/vs/platform/uriIdentity/test/common/uriIdentityService.test.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { mock } from 'vs/base/test/common/mock';
-import { IFileService, FileSystemProviderCapabilities } from 'vs/platform/files/common/files';
-import { URI } from 'vs/base/common/uri';
-import { Event } from 'vs/base/common/event';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { UriIdentityService } from '../../common/uriIdentityService.js';
+import { mock } from '../../../../base/test/common/mock.js';
+import { IFileService, FileSystemProviderCapabilities } from '../../../files/common/files.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Event } from '../../../../base/common/event.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 
 suite('URI Identity', function () {
 
diff --git a/src/vs/platform/url/common/url.ts b/src/vs/platform/url/common/url.ts
index b5079b04ce2..e5e95a109f7 100644
--- a/src/vs/platform/url/common/url.ts
+++ b/src/vs/platform/url/common/url.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 export const IURLService = createDecorator<IURLService>('urlService');
 
diff --git a/src/vs/platform/url/common/urlIpc.ts b/src/vs/platform/url/common/urlIpc.ts
index aac9e632468..8121918852f 100644
--- a/src/vs/platform/url/common/urlIpc.ts
+++ b/src/vs/platform/url/common/urlIpc.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Event } from 'vs/base/common/event';
-import { URI } from 'vs/base/common/uri';
-import { Client, IChannel, IClientRouter, IConnectionHub, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IOpenURLOptions, IURLHandler } from 'vs/platform/url/common/url';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Event } from '../../../base/common/event.js';
+import { URI } from '../../../base/common/uri.js';
+import { Client, IChannel, IClientRouter, IConnectionHub, IServerChannel } from '../../../base/parts/ipc/common/ipc.js';
+import { ILogService } from '../../log/common/log.js';
+import { IOpenURLOptions, IURLHandler } from './url.js';
 
 export class URLHandlerChannel implements IServerChannel {
 
diff --git a/src/vs/platform/url/common/urlService.ts b/src/vs/platform/url/common/urlService.ts
index fcc833bf00b..12d980e2287 100644
--- a/src/vs/platform/url/common/urlService.ts
+++ b/src/vs/platform/url/common/urlService.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { first } from 'vs/base/common/async';
-import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IOpenURLOptions, IURLHandler, IURLService } from 'vs/platform/url/common/url';
+import { first } from '../../../base/common/async.js';
+import { Disposable, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { IProductService } from '../../product/common/productService.js';
+import { IOpenURLOptions, IURLHandler, IURLService } from './url.js';
 
 export abstract class AbstractURLService extends Disposable implements IURLService {
 
diff --git a/src/vs/platform/url/electron-main/electronUrlListener.ts b/src/vs/platform/url/electron-main/electronUrlListener.ts
index ffe2f5bb188..ece5401ddf7 100644
--- a/src/vs/platform/url/electron-main/electronUrlListener.ts
+++ b/src/vs/platform/url/electron-main/electronUrlListener.ts
@@ -4,17 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { app, Event as ElectronEvent } from 'electron';
-import { disposableTimeout } from 'vs/base/common/async';
-import { Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { isWindows } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { IEnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IURLService } from 'vs/platform/url/common/url';
-import { IProtocolUrl } from 'vs/platform/url/electron-main/url';
-import { IWindowsMainService } from 'vs/platform/windows/electron-main/windows';
+import { disposableTimeout } from '../../../base/common/async.js';
+import { Event } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { isWindows } from '../../../base/common/platform.js';
+import { URI } from '../../../base/common/uri.js';
+import { IEnvironmentMainService } from '../../environment/electron-main/environmentMainService.js';
+import { ILogService } from '../../log/common/log.js';
+import { IProductService } from '../../product/common/productService.js';
+import { IURLService } from '../common/url.js';
+import { IProtocolUrl } from './url.js';
+import { IWindowsMainService } from '../../windows/electron-main/windows.js';
 
 /**
  * A listener for URLs that are opened from the OS and handled by VSCode.
diff --git a/src/vs/platform/url/electron-main/url.ts b/src/vs/platform/url/electron-main/url.ts
index 56ac7aa644b..e287787b6aa 100644
--- a/src/vs/platform/url/electron-main/url.ts
+++ b/src/vs/platform/url/electron-main/url.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { IWindowOpenable } from 'vs/platform/window/common/window';
+import { URI } from '../../../base/common/uri.js';
+import { IWindowOpenable } from '../../window/common/window.js';
 
 export interface IProtocolUrl {
 
diff --git a/src/vs/platform/userData/common/fileUserDataProvider.ts b/src/vs/platform/userData/common/fileUserDataProvider.ts
index eaded2a0938..1cfd07ec02b 100644
--- a/src/vs/platform/userData/common/fileUserDataProvider.ts
+++ b/src/vs/platform/userData/common/fileUserDataProvider.ts
@@ -2,17 +2,17 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { Emitter } from 'vs/base/common/event';
-import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IFileSystemProviderWithFileReadWriteCapability, IFileChange, IWatchOptions, IStat, IFileOverwriteOptions, FileType, IFileWriteOptions, IFileDeleteOptions, FileSystemProviderCapabilities, IFileSystemProviderWithFileReadStreamCapability, IFileReadStreamOptions, IFileSystemProviderWithFileAtomicReadCapability, hasFileFolderCopyCapability, IFileSystemProviderWithOpenReadWriteCloseCapability, IFileOpenOptions, IFileSystemProviderWithFileAtomicWriteCapability, IFileSystemProviderWithFileAtomicDeleteCapability, IFileSystemProviderWithFileFolderCopyCapability, IFileSystemProviderWithFileCloneCapability, hasFileCloneCapability, IFileAtomicReadOptions, IFileAtomicOptions } from 'vs/platform/files/common/files';
-import { URI } from 'vs/base/common/uri';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { ReadableStreamEvents } from 'vs/base/common/stream';
-import { ILogService } from 'vs/platform/log/common/log';
-import { TernarySearchTree } from 'vs/base/common/ternarySearchTree';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { ResourceSet } from 'vs/base/common/map';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
+import { Emitter } from '../../../base/common/event.js';
+import { Disposable, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { IFileSystemProviderWithFileReadWriteCapability, IFileChange, IWatchOptions, IStat, IFileOverwriteOptions, FileType, IFileWriteOptions, IFileDeleteOptions, FileSystemProviderCapabilities, IFileSystemProviderWithFileReadStreamCapability, IFileReadStreamOptions, IFileSystemProviderWithFileAtomicReadCapability, hasFileFolderCopyCapability, IFileSystemProviderWithOpenReadWriteCloseCapability, IFileOpenOptions, IFileSystemProviderWithFileAtomicWriteCapability, IFileSystemProviderWithFileAtomicDeleteCapability, IFileSystemProviderWithFileFolderCopyCapability, IFileSystemProviderWithFileCloneCapability, hasFileCloneCapability, IFileAtomicReadOptions, IFileAtomicOptions } from '../../files/common/files.js';
+import { URI } from '../../../base/common/uri.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { ReadableStreamEvents } from '../../../base/common/stream.js';
+import { ILogService } from '../../log/common/log.js';
+import { TernarySearchTree } from '../../../base/common/ternarySearchTree.js';
+import { IUserDataProfilesService } from '../../userDataProfile/common/userDataProfile.js';
+import { ResourceSet } from '../../../base/common/map.js';
+import { IUriIdentityService } from '../../uriIdentity/common/uriIdentity.js';
 
 /**
  * This is a wrapper on top of the local filesystem provider which will
diff --git a/src/vs/platform/userData/test/browser/fileUserDataProvider.test.ts b/src/vs/platform/userData/test/browser/fileUserDataProvider.test.ts
index 8f0c5641d9f..44877acd46e 100644
--- a/src/vs/platform/userData/test/browser/fileUserDataProvider.test.ts
+++ b/src/vs/platform/userData/test/browser/fileUserDataProvider.test.ts
@@ -4,25 +4,25 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { dirname, isEqual, joinPath } from 'vs/base/common/resources';
-import { ReadableStreamEvents } from 'vs/base/common/stream';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { AbstractNativeEnvironmentService } from 'vs/platform/environment/common/environmentService';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { FileChangeType, FileSystemProviderCapabilities, FileType, IFileChange, IFileOpenOptions, IFileReadStreamOptions, IFileService, IFileSystemProviderWithFileReadStreamCapability, IFileSystemProviderWithFileReadWriteCapability, IFileSystemProviderWithOpenReadWriteCloseCapability, IStat } from 'vs/platform/files/common/files';
-import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
-import { NullLogService } from 'vs/platform/log/common/log';
-import product from 'vs/platform/product/common/product';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { FileUserDataProvider } from 'vs/platform/userData/common/fileUserDataProvider';
-import { IUserDataProfilesService, UserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { dirname, isEqual, joinPath } from '../../../../base/common/resources.js';
+import { ReadableStreamEvents } from '../../../../base/common/stream.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { IEnvironmentService } from '../../../environment/common/environment.js';
+import { AbstractNativeEnvironmentService } from '../../../environment/common/environmentService.js';
+import { FileService } from '../../../files/common/fileService.js';
+import { FileChangeType, FileSystemProviderCapabilities, FileType, IFileChange, IFileOpenOptions, IFileReadStreamOptions, IFileService, IFileSystemProviderWithFileReadStreamCapability, IFileSystemProviderWithFileReadWriteCapability, IFileSystemProviderWithOpenReadWriteCloseCapability, IStat } from '../../../files/common/files.js';
+import { InMemoryFileSystemProvider } from '../../../files/common/inMemoryFilesystemProvider.js';
+import { NullLogService } from '../../../log/common/log.js';
+import product from '../../../product/common/product.js';
+import { UriIdentityService } from '../../../uriIdentity/common/uriIdentityService.js';
+import { FileUserDataProvider } from '../../common/fileUserDataProvider.js';
+import { IUserDataProfilesService, UserDataProfilesService } from '../../../userDataProfile/common/userDataProfile.js';
 
 const ROOT = URI.file('tests').with({ scheme: 'vscode-tests' });
 
diff --git a/src/vs/platform/userDataProfile/browser/userDataProfile.ts b/src/vs/platform/userDataProfile/browser/userDataProfile.ts
index 7af957185d2..f5da3f21f6f 100644
--- a/src/vs/platform/userDataProfile/browser/userDataProfile.ts
+++ b/src/vs/platform/userDataProfile/browser/userDataProfile.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BroadcastDataChannel } from 'vs/base/browser/broadcast';
-import { revive } from 'vs/base/common/marshalling';
-import { UriDto } from 'vs/base/common/uri';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IFileService } from 'vs/platform/files/common/files';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { DidChangeProfilesEvent, IUserDataProfile, IUserDataProfilesService, reviveProfile, StoredProfileAssociations, StoredUserDataProfile, UserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { BroadcastDataChannel } from '../../../base/browser/broadcast.js';
+import { revive } from '../../../base/common/marshalling.js';
+import { UriDto } from '../../../base/common/uri.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { IFileService } from '../../files/common/files.js';
+import { ILogService } from '../../log/common/log.js';
+import { IUriIdentityService } from '../../uriIdentity/common/uriIdentity.js';
+import { DidChangeProfilesEvent, IUserDataProfile, IUserDataProfilesService, reviveProfile, StoredProfileAssociations, StoredUserDataProfile, UserDataProfilesService } from '../common/userDataProfile.js';
 
 type BroadcastedProfileChanges = UriDto<Omit<DidChangeProfilesEvent, 'all'>>;
 
diff --git a/src/vs/platform/userDataProfile/common/userDataProfile.ts b/src/vs/platform/userDataProfile/common/userDataProfile.ts
index f18ae097050..61cec7bcf08 100644
--- a/src/vs/platform/userDataProfile/common/userDataProfile.ts
+++ b/src/vs/platform/userDataProfile/common/userDataProfile.ts
@@ -3,24 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { hash } from 'vs/base/common/hash';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { basename, joinPath } from 'vs/base/common/resources';
-import { URI, UriDto } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { FileOperationResult, IFileService, toFileOperationResult } from 'vs/platform/files/common/files';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IAnyWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
-import { ResourceMap } from 'vs/base/common/map';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { Promises } from 'vs/base/common/async';
-import { generateUuid } from 'vs/base/common/uuid';
-import { escapeRegExpCharacters } from 'vs/base/common/strings';
-import { isString } from 'vs/base/common/types';
+import { hash } from '../../../base/common/hash.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { basename, joinPath } from '../../../base/common/resources.js';
+import { URI, UriDto } from '../../../base/common/uri.js';
+import { localize } from '../../../nls.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { FileOperationResult, IFileService, toFileOperationResult } from '../../files/common/files.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { ILogService } from '../../log/common/log.js';
+import { IAnyWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier } from '../../workspace/common/workspace.js';
+import { IStringDictionary } from '../../../base/common/collections.js';
+import { IUriIdentityService } from '../../uriIdentity/common/uriIdentity.js';
+import { Promises } from '../../../base/common/async.js';
+import { generateUuid } from '../../../base/common/uuid.js';
+import { escapeRegExpCharacters } from '../../../base/common/strings.js';
+import { isString, Mutable } from '../../../base/common/types.js';
 
 export const enum ProfileResourceType {
 	Settings = 'settings',
@@ -53,6 +52,7 @@ export interface IUserDataProfile {
 	readonly cacheHome: URI;
 	readonly useDefaultFlags?: UseDefaultProfileFlags;
 	readonly isTransient?: boolean;
+	readonly workspaces?: readonly URI[];
 }
 
 export function isUserDataProfile(thing: unknown): thing is IUserDataProfile {
@@ -89,6 +89,7 @@ export interface IUserDataProfileOptions {
 	readonly icon?: string;
 	readonly useDefaultFlags?: UseDefaultProfileFlags;
 	readonly transient?: boolean;
+	readonly workspaces?: readonly URI[];
 }
 
 export interface IUserDataProfileUpdateOptions extends Omit<IUserDataProfileOptions, 'icon'> {
@@ -139,6 +140,7 @@ export function reviveProfile(profile: UriDto<IUserDataProfile>, scheme: string)
 		cacheHome: URI.revive(profile.cacheHome).with({ scheme }),
 		useDefaultFlags: profile.useDefaultFlags,
 		isTransient: profile.isTransient,
+		workspaces: profile.workspaces?.map(w => URI.revive(w)),
 	};
 }
 
@@ -158,20 +160,16 @@ export function toUserDataProfile(id: string, name: string, location: URI, profi
 		extensionsResource: defaultProfile && options?.useDefaultFlags?.extensions ? defaultProfile.extensionsResource : joinPath(location, 'extensions.json'),
 		cacheHome: joinPath(profilesCacheHome, id),
 		useDefaultFlags: options?.useDefaultFlags,
-		isTransient: options?.transient
+		isTransient: options?.transient,
+		workspaces: options?.workspaces,
 	};
 }
 
 export type UserDataProfilesObject = {
 	profiles: IUserDataProfile[];
-	workspaces: ResourceMap<IUserDataProfile>;
 	emptyWindows: Map<string, IUserDataProfile>;
 };
 
-type TransientUserDataProfilesObject = UserDataProfilesObject & {
-	folders: ResourceMap<IUserDataProfile>;
-};
-
 export type StoredUserDataProfile = {
 	name: string;
 	location: URI;
@@ -213,10 +211,8 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
 
 	private profileCreationPromises = new Map<string, Promise<IUserDataProfile>>();
 
-	protected readonly transientProfilesObject: TransientUserDataProfilesObject = {
+	protected readonly transientProfilesObject: UserDataProfilesObject = {
 		profiles: [],
-		folders: new ResourceMap(),
-		workspaces: new ResourceMap(),
 		emptyWindows: new Map()
 	};
 
@@ -250,7 +246,7 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
 	protected get profilesObject(): UserDataProfilesObject {
 		if (!this._profilesObject) {
 			const defaultProfile = this.createDefaultProfile();
-			const profiles = [defaultProfile];
+			const profiles: Array<Mutable<IUserDataProfile>> = [defaultProfile];
 			if (this.enabled) {
 				try {
 					for (const storedProfile of this.getStoredProfiles()) {
@@ -264,7 +260,6 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
 					this.logService.error(error);
 				}
 			}
-			const workspaces = new ResourceMap<IUserDataProfile>();
 			const emptyWindows = new Map<string, IUserDataProfile>();
 			if (profiles.length) {
 				try {
@@ -274,7 +269,9 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
 							const workspace = URI.parse(workspacePath);
 							const profile = profiles.find(p => p.id === profileId);
 							if (profile) {
-								workspaces.set(workspace, profile);
+								const workspaces = profile.workspaces ? profile.workspaces.slice(0) : [];
+								workspaces.push(workspace);
+								profile.workspaces = workspaces;
 							}
 						}
 					}
@@ -290,7 +287,7 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
 					this.logService.error(error);
 				}
 			}
-			this._profilesObject = { profiles, workspaces, emptyWindows };
+			this._profilesObject = { profiles, emptyWindows };
 		}
 		return this._profilesObject;
 	}
@@ -322,28 +319,29 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
 			throw new Error(`Profiles are disabled in the current environment.`);
 		}
 
-		const profile = await this.doCreateProfile(id, name, options);
-
-		if (workspaceIdentifier) {
-			await this.setProfileForWorkspace(workspaceIdentifier, profile);
-		}
+		const profile = await this.doCreateProfile(id, name, options, workspaceIdentifier);
 
 		return profile;
 	}
 
-	private async doCreateProfile(id: string, name: string, options?: IUserDataProfileOptions): Promise<IUserDataProfile> {
+	private async doCreateProfile(id: string, name: string, options?: IUserDataProfileOptions, workspaceIdentifier?: IAnyWorkspaceIdentifier): Promise<IUserDataProfile> {
 		if (!isString(name) || !name) {
 			throw new Error('Name of the profile is mandatory and must be of type `string`');
 		}
+
 		let profileCreationPromise = this.profileCreationPromises.get(name);
 		if (!profileCreationPromise) {
 			profileCreationPromise = (async () => {
 				try {
-					const existing = this.profiles.find(p => p.name === name || p.id === id);
+					const existing = this.profiles.find(p => p.id === id || (!p.isTransient && !options?.transient && p.name === name));
 					if (existing) {
 						throw new Error(`Profile with ${name} name already exists`);
 					}
 
+					const workspace = workspaceIdentifier ? this.getWorkspace(workspaceIdentifier) : undefined;
+					if (URI.isUri(workspace)) {
+						options = { ...options, workspaces: [workspace] };
+					}
 					const profile = toUserDataProfile(id, name, joinPath(this.profilesHome, id), this.profilesCacheHome, options, this.defaultProfile);
 					await this.fileService.createFolder(profile.location);
 
@@ -356,6 +354,9 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
 					});
 					await Promises.settled(joiners);
 
+					if (workspace && !URI.isUri(workspace)) {
+						this.updateEmptyWindowAssociation(workspace, profile, !!profile.isTransient);
+					}
 					this.updateProfiles([profile], [], []);
 					return profile;
 				} finally {
@@ -367,25 +368,58 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
 		return profileCreationPromise;
 	}
 
-	async updateProfile(profileToUpdate: IUserDataProfile, options: IUserDataProfileUpdateOptions): Promise<IUserDataProfile> {
+	async updateProfile(profile: IUserDataProfile, options: IUserDataProfileUpdateOptions): Promise<IUserDataProfile> {
 		if (!this.enabled) {
 			throw new Error(`Profiles are disabled in the current environment.`);
 		}
 
-		let profile = this.profiles.find(p => p.id === profileToUpdate.id);
-		if (!profile) {
-			throw new Error(`Profile '${profileToUpdate.name}' does not exist`);
+		const profilesToUpdate: IUserDataProfile[] = [];
+		for (const existing of this.profiles) {
+			let profileToUpdate: Mutable<IUserDataProfile> | undefined;
+
+			if (profile.id === existing.id) {
+				if (!existing.isDefault) {
+					profileToUpdate = toUserDataProfile(existing.id, options.name ?? existing.name, existing.location, this.profilesCacheHome, {
+						shortName: options.shortName ?? existing.shortName,
+						icon: options.icon === null ? undefined : options.icon ?? existing.icon,
+						transient: options.transient ?? existing.isTransient,
+						useDefaultFlags: options.useDefaultFlags ?? existing.useDefaultFlags,
+						workspaces: options.workspaces ?? existing.workspaces,
+					}, this.defaultProfile);
+				} else if (options.workspaces) {
+					profileToUpdate = existing;
+					profileToUpdate.workspaces = options.workspaces;
+				}
+			}
+
+			else if (options.workspaces) {
+				const workspaces = existing.workspaces?.filter(w1 => !options.workspaces?.some(w2 => this.uriIdentityService.extUri.isEqual(w1, w2)));
+				if (existing.workspaces?.length !== workspaces?.length) {
+					profileToUpdate = existing;
+					profileToUpdate.workspaces = workspaces;
+				}
+			}
+
+			if (profileToUpdate) {
+				profilesToUpdate.push(profileToUpdate);
+			}
 		}
 
-		profile = toUserDataProfile(profile.id, options.name ?? profile.name, profile.location, this.profilesCacheHome, {
-			shortName: options.shortName ?? profile.shortName,
-			icon: options.icon === null ? undefined : options.icon ?? profile.icon,
-			transient: options.transient ?? profile.isTransient,
-			useDefaultFlags: options.useDefaultFlags ?? profile.useDefaultFlags
-		}, this.defaultProfile);
-		this.updateProfiles([], [], [profile]);
+		if (!profilesToUpdate.length) {
+			if (profile.isDefault) {
+				throw new Error('Cannot update default profile');
+			}
+			throw new Error(`Profile '${profile.name}' does not exist`);
+		}
 
-		return profile;
+		this.updateProfiles([], [], profilesToUpdate);
+
+		const updatedProfile = this.profiles.find(p => p.id === profile.id);
+		if (!updatedProfile) {
+			throw new Error(`Profile '${profile.name}' was not updated`);
+		}
+
+		return updatedProfile;
 	}
 
 	async removeProfile(profileToRemove: IUserDataProfile): Promise<void> {
@@ -414,18 +448,6 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
 			this.logService.error(error);
 		}
 
-		for (const windowId of [...this.profilesObject.emptyWindows.keys()]) {
-			if (profile.id === this.profilesObject.emptyWindows.get(windowId)?.id) {
-				this.profilesObject.emptyWindows.delete(windowId);
-			}
-		}
-		for (const workspace of [...this.profilesObject.workspaces.keys()]) {
-			if (profile.id === this.profilesObject.workspaces.get(workspace)?.id) {
-				this.profilesObject.workspaces.delete(workspace);
-			}
-		}
-		this.updateStoredProfileAssociations();
-
 		this.updateProfiles([], [profile], []);
 
 		try {
@@ -447,24 +469,43 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
 			throw new Error(`Profile '${profileToSet.name}' does not exist`);
 		}
 
-		this.updateWorkspaceAssociation(workspaceIdentifier, profile);
+		const workspace = this.getWorkspace(workspaceIdentifier);
+		if (URI.isUri(workspace)) {
+			const workspaces = profile.workspaces ? [...profile.workspaces] : [];
+			if (!workspaces.some(w => this.uriIdentityService.extUri.isEqual(w, workspace))) {
+				workspaces.push(workspace);
+				await this.updateProfile(profile, { workspaces });
+			}
+		} else {
+			this.updateEmptyWindowAssociation(workspace, profile, false);
+			this.updateStoredProfiles(this.profiles);
+		}
 	}
 
-	unsetWorkspace(workspaceIdentifier: IAnyWorkspaceIdentifier, transient?: boolean): void {
+	unsetWorkspace(workspaceIdentifier: IAnyWorkspaceIdentifier, transient: boolean = false): void {
 		if (!this.enabled) {
 			throw new Error(`Profiles are disabled in the current environment.`);
 		}
 
-		this.updateWorkspaceAssociation(workspaceIdentifier, undefined, transient);
+		const workspace = this.getWorkspace(workspaceIdentifier);
+		if (URI.isUri(workspace)) {
+			const currentlyAssociatedProfile = this.getProfileForWorkspace(workspaceIdentifier);
+			if (currentlyAssociatedProfile) {
+				this.updateProfile(currentlyAssociatedProfile, { workspaces: currentlyAssociatedProfile.workspaces?.filter(w => !this.uriIdentityService.extUri.isEqual(w, workspace)) });
+			}
+		} else {
+			this.updateEmptyWindowAssociation(workspace, undefined, transient);
+			this.updateStoredProfiles(this.profiles);
+		}
 	}
 
 	async resetWorkspaces(): Promise<void> {
-		this.transientProfilesObject.folders.clear();
-		this.transientProfilesObject.workspaces.clear();
 		this.transientProfilesObject.emptyWindows.clear();
-		this.profilesObject.workspaces.clear();
 		this.profilesObject.emptyWindows.clear();
-		this.updateStoredProfileAssociations();
+		for (const profile of this.profiles) {
+			(<Mutable<IUserDataProfile>>profile).workspaces = undefined;
+		}
+		this.updateProfiles([], [], this.profiles);
 		this._onDidResetWorkspaces.fire();
 	}
 
@@ -490,17 +531,9 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
 
 	getProfileForWorkspace(workspaceIdentifier: IAnyWorkspaceIdentifier): IUserDataProfile | undefined {
 		const workspace = this.getWorkspace(workspaceIdentifier);
-		const profile = URI.isUri(workspace) ? this.profilesObject.workspaces.get(workspace) : this.profilesObject.emptyWindows.get(workspace);
-		if (profile) {
-			return profile;
-		}
-		if (isSingleFolderWorkspaceIdentifier(workspaceIdentifier)) {
-			return this.transientProfilesObject.folders.get(workspaceIdentifier.uri);
-		}
-		if (isWorkspaceIdentifier(workspaceIdentifier)) {
-			return this.transientProfilesObject.workspaces.get(workspaceIdentifier.configPath);
-		}
-		return this.transientProfilesObject.emptyWindows.get(workspaceIdentifier.id);
+		return URI.isUri(workspace)
+			? this.profiles.find(p => p.workspaces?.some(w => this.uriIdentityService.extUri.isEqual(w, workspace)))
+			: (this.profilesObject.emptyWindows.get(workspace) ?? this.transientProfilesObject.emptyWindows.get(workspace));
 	}
 
 	protected getWorkspace(workspaceIdentifier: IAnyWorkspaceIdentifier): URI | string {
@@ -514,66 +547,64 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
 	}
 
 	private isProfileAssociatedToWorkspace(profile: IUserDataProfile): boolean {
+		if (profile.workspaces?.length) {
+			return true;
+		}
 		if ([...this.profilesObject.emptyWindows.values()].some(windowProfile => this.uriIdentityService.extUri.isEqual(windowProfile.location, profile.location))) {
 			return true;
 		}
-		if ([...this.profilesObject.workspaces.values()].some(workspaceProfile => this.uriIdentityService.extUri.isEqual(workspaceProfile.location, profile.location))) {
-			return true;
-		}
 		if ([...this.transientProfilesObject.emptyWindows.values()].some(windowProfile => this.uriIdentityService.extUri.isEqual(windowProfile.location, profile.location))) {
 			return true;
 		}
-		if ([...this.transientProfilesObject.workspaces.values()].some(workspaceProfile => this.uriIdentityService.extUri.isEqual(workspaceProfile.location, profile.location))) {
-			return true;
-		}
-		if ([...this.transientProfilesObject.folders.values()].some(workspaceProfile => this.uriIdentityService.extUri.isEqual(workspaceProfile.location, profile.location))) {
-			return true;
-		}
 		return false;
 	}
 
 	private updateProfiles(added: IUserDataProfile[], removed: IUserDataProfile[], updated: IUserDataProfile[]): void {
-		const allProfiles = [...this.profiles, ...added];
-		const storedProfiles: StoredUserDataProfile[] = [];
+		const allProfiles: Mutable<IUserDataProfile>[] = [...this.profiles, ...added];
+
 		const transientProfiles = this.transientProfilesObject.profiles;
 		this.transientProfilesObject.profiles = [];
+
+		const profiles: IUserDataProfile[] = [];
+
 		for (let profile of allProfiles) {
-			if (profile.isDefault) {
-				continue;
-			}
+			// removed
 			if (removed.some(p => profile.id === p.id)) {
+				for (const windowId of [...this.profilesObject.emptyWindows.keys()]) {
+					if (profile.id === this.profilesObject.emptyWindows.get(windowId)?.id) {
+						this.profilesObject.emptyWindows.delete(windowId);
+					}
+				}
 				continue;
 			}
-			profile = updated.find(p => profile.id === p.id) ?? profile;
-			const transientProfile = transientProfiles.find(p => profile.id === p.id);
-			if (profile.isTransient) {
-				this.transientProfilesObject.profiles.push(profile);
-			} else {
-				if (transientProfile) {
-					for (const [windowId, p] of this.transientProfilesObject.emptyWindows.entries()) {
-						if (profile.id === p.id) {
-							this.updateWorkspaceAssociation({ id: windowId }, profile);
-							break;
-						}
-					}
-					for (const [workspace, p] of this.transientProfilesObject.workspaces.entries()) {
-						if (profile.id === p.id) {
-							this.updateWorkspaceAssociation({ id: '', configPath: workspace }, profile);
-							break;
-						}
-					}
-					for (const [folder, p] of this.transientProfilesObject.folders.entries()) {
-						if (profile.id === p.id) {
-							this.updateWorkspaceAssociation({ id: '', uri: folder }, profile);
-							break;
+
+			if (!profile.isDefault) {
+				profile = updated.find(p => profile.id === p.id) ?? profile;
+				const transientProfile = transientProfiles.find(p => profile.id === p.id);
+				if (profile.isTransient) {
+					this.transientProfilesObject.profiles.push(profile);
+				} else {
+					if (transientProfile) {
+						// Move the empty window associations from the transient profile to the persisted profile
+						for (const [windowId, p] of this.transientProfilesObject.emptyWindows.entries()) {
+							if (profile.id === p.id) {
+								this.transientProfilesObject.emptyWindows.delete(windowId);
+								this.profilesObject.emptyWindows.set(windowId, profile);
+								break;
+							}
 						}
 					}
 				}
-				storedProfiles.push({ location: profile.location, name: profile.name, shortName: profile.shortName, icon: profile.icon, useDefaultFlags: profile.useDefaultFlags });
 			}
+
+			if (profile.workspaces?.length === 0) {
+				profile.workspaces = undefined;
+			}
+
+			profiles.push(profile);
 		}
-		this.saveStoredProfiles(storedProfiles);
-		this._profilesObject = undefined;
+
+		this.updateStoredProfiles(profiles);
 		this.triggerProfilesChanges(added, removed, updated);
 	}
 
@@ -581,66 +612,54 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
 		this._onDidChangeProfiles.fire({ added, removed, updated, all: this.profiles });
 	}
 
-	private updateWorkspaceAssociation(workspaceIdentifier: IAnyWorkspaceIdentifier, newProfile?: IUserDataProfile, transient?: boolean): void {
+	private updateEmptyWindowAssociation(windowId: string, newProfile: IUserDataProfile | undefined, transient: boolean): void {
 		// Force transient if the new profile to associate is transient
 		transient = newProfile?.isTransient ? true : transient;
 
 		if (transient) {
-			if (isSingleFolderWorkspaceIdentifier(workspaceIdentifier)) {
-				this.transientProfilesObject.folders.delete(workspaceIdentifier.uri);
-				if (newProfile) {
-					this.transientProfilesObject.folders.set(workspaceIdentifier.uri, newProfile);
-				}
-			}
-
-			else if (isWorkspaceIdentifier(workspaceIdentifier)) {
-				this.transientProfilesObject.workspaces.delete(workspaceIdentifier.configPath);
-				if (newProfile) {
-					this.transientProfilesObject.workspaces.set(workspaceIdentifier.configPath, newProfile);
-				}
-			}
-
-			else {
-				this.transientProfilesObject.emptyWindows.delete(workspaceIdentifier.id);
-				if (newProfile) {
-					this.transientProfilesObject.emptyWindows.set(workspaceIdentifier.id, newProfile);
-				}
+			if (newProfile) {
+				this.transientProfilesObject.emptyWindows.set(windowId, newProfile);
+			} else {
+				this.transientProfilesObject.emptyWindows.delete(windowId);
 			}
 		}
 
 		else {
-			// Unset the transiet workspace association if any
-			this.updateWorkspaceAssociation(workspaceIdentifier, undefined, true);
-			const workspace = this.getWorkspace(workspaceIdentifier);
-
-			// Folder or Multiroot workspace
-			if (URI.isUri(workspace)) {
-				this.profilesObject.workspaces.delete(workspace);
-				if (newProfile) {
-					this.profilesObject.workspaces.set(workspace, newProfile);
-				}
+			// Unset the transiet association if any
+			this.transientProfilesObject.emptyWindows.delete(windowId);
+			if (newProfile) {
+				this.profilesObject.emptyWindows.set(windowId, newProfile);
+			} else {
+				this.profilesObject.emptyWindows.delete(windowId);
 			}
-			// Empty Window
-			else {
-				this.profilesObject.emptyWindows.delete(workspace);
-				if (newProfile) {
-					this.profilesObject.emptyWindows.set(workspace, newProfile);
-				}
-			}
-			this.updateStoredProfileAssociations();
 		}
 	}
 
-	private updateStoredProfileAssociations() {
+	private updateStoredProfiles(profiles: IUserDataProfile[]): void {
+		const storedProfiles: StoredUserDataProfile[] = [];
 		const workspaces: IStringDictionary<string> = {};
-		for (const [workspace, profile] of this.profilesObject.workspaces.entries()) {
-			workspaces[workspace.toString()] = profile.id;
-		}
 		const emptyWindows: IStringDictionary<string> = {};
+
+		for (const profile of profiles) {
+			if (profile.isTransient) {
+				continue;
+			}
+			if (!profile.isDefault) {
+				storedProfiles.push({ location: profile.location, name: profile.name, shortName: profile.shortName, icon: profile.icon, useDefaultFlags: profile.useDefaultFlags });
+			}
+			if (profile.workspaces) {
+				for (const workspace of profile.workspaces) {
+					workspaces[workspace.toString()] = profile.id;
+				}
+			}
+		}
+
 		for (const [windowId, profile] of this.profilesObject.emptyWindows.entries()) {
 			emptyWindows[windowId.toString()] = profile.id;
 		}
+
 		this.saveStoredProfileAssociations({ workspaces, emptyWindows });
+		this.saveStoredProfiles(storedProfiles);
 		this._profilesObject = undefined;
 	}
 
diff --git a/src/vs/platform/userDataProfile/common/userDataProfileIpc.ts b/src/vs/platform/userDataProfile/common/userDataProfileIpc.ts
index ceaa5ec8fc8..642aa857322 100644
--- a/src/vs/platform/userDataProfile/common/userDataProfileIpc.ts
+++ b/src/vs/platform/userDataProfile/common/userDataProfileIpc.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IChannel, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
-import { URI, UriDto } from 'vs/base/common/uri';
-import { DidChangeProfilesEvent, IUserDataProfile, IUserDataProfileOptions, IUserDataProfilesService, IUserDataProfileUpdateOptions, reviveProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IAnyWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
-import { IURITransformer, transformIncomingURIs, transformOutgoingURIs } from 'vs/base/common/uriIpc';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { IChannel, IServerChannel } from '../../../base/parts/ipc/common/ipc.js';
+import { URI, UriDto } from '../../../base/common/uri.js';
+import { DidChangeProfilesEvent, IUserDataProfile, IUserDataProfileOptions, IUserDataProfilesService, IUserDataProfileUpdateOptions, reviveProfile } from './userDataProfile.js';
+import { IAnyWorkspaceIdentifier } from '../../workspace/common/workspace.js';
+import { IURITransformer, transformIncomingURIs, transformOutgoingURIs } from '../../../base/common/uriIpc.js';
 
 export class RemoteUserDataProfilesServiceChannel implements IServerChannel {
 
diff --git a/src/vs/platform/userDataProfile/common/userDataProfileStorageService.ts b/src/vs/platform/userDataProfile/common/userDataProfileStorageService.ts
index a04c44f96ef..14af8ede3c0 100644
--- a/src/vs/platform/userDataProfile/common/userDataProfileStorageService.ts
+++ b/src/vs/platform/userDataProfile/common/userDataProfileStorageService.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, MutableDisposable, isDisposable } from 'vs/base/common/lifecycle';
-import { IStorage, IStorageDatabase, Storage } from 'vs/base/parts/storage/common/storage';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { AbstractStorageService, IStorageService, IStorageValueChangeEvent, StorageScope, StorageTarget, isProfileUsingDefaultStorage } from 'vs/platform/storage/common/storage';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IRemoteService } from 'vs/platform/ipc/common/services';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ApplicationStorageDatabaseClient, ProfileStorageDatabaseClient } from 'vs/platform/storage/common/storageIpc';
-import { IUserDataProfile, IUserDataProfilesService, reviveProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { Disposable, DisposableMap, MutableDisposable, isDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { IStorage, IStorageDatabase, Storage } from '../../../base/parts/storage/common/storage.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { AbstractStorageService, IStorageService, IStorageValueChangeEvent, StorageScope, StorageTarget, isProfileUsingDefaultStorage } from '../../storage/common/storage.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { IRemoteService } from '../../ipc/common/services.js';
+import { ILogService } from '../../log/common/log.js';
+import { ApplicationStorageDatabaseClient, ProfileStorageDatabaseClient } from '../../storage/common/storageIpc.js';
+import { IUserDataProfile, IUserDataProfilesService, reviveProfile } from './userDataProfile.js';
 
 export interface IProfileStorageValueChanges {
 	readonly profile: IUserDataProfile;
@@ -63,10 +63,16 @@ export abstract class AbstractUserDataProfileStorageService extends Disposable i
 
 	readonly abstract onDidChange: Event<IProfileStorageChanges>;
 
+	private readonly storageServicesMap: DisposableMap<string, StorageService> | undefined;
+
 	constructor(
+		persistStorages: boolean,
 		@IStorageService protected readonly storageService: IStorageService
 	) {
 		super();
+		if (persistStorages) {
+			this.storageServicesMap = this._register(new DisposableMap<string, StorageService>());
+		}
 	}
 
 	async readStorageData(profile: IUserDataProfile): Promise<Map<string, IStorageValue>> {
@@ -82,16 +88,30 @@ export abstract class AbstractUserDataProfileStorageService extends Disposable i
 			return fn(this.storageService);
 		}
 
-		const storageDatabase = await this.createStorageDatabase(profile);
-		const storageService = new StorageService(storageDatabase);
+		let storageService = this.storageServicesMap?.get(profile.id);
+		if (!storageService) {
+			storageService = new StorageService(this.createStorageDatabase(profile));
+			this.storageServicesMap?.set(profile.id, storageService);
+
+			try {
+				await storageService.initialize();
+			} catch (error) {
+				if (this.storageServicesMap?.has(profile.id)) {
+					this.storageServicesMap.deleteAndDispose(profile.id);
+				} else {
+					storageService.dispose();
+				}
+				throw error;
+			}
+		}
 		try {
-			await storageService.initialize();
 			const result = await fn(storageService);
 			await storageService.flush();
 			return result;
 		} finally {
-			storageService.dispose();
-			await this.closeAndDispose(storageDatabase);
+			if (!this.storageServicesMap?.has(profile.id)) {
+				storageService.dispose();
+			}
 		}
 	}
 
@@ -111,16 +131,6 @@ export abstract class AbstractUserDataProfileStorageService extends Disposable i
 		storageService.storeAll(Array.from(items.entries()).map(([key, value]) => ({ key, value, scope: StorageScope.PROFILE, target })), true);
 	}
 
-	protected async closeAndDispose(storageDatabase: IStorageDatabase): Promise<void> {
-		try {
-			await storageDatabase.close();
-		} finally {
-			if (isDisposable(storageDatabase)) {
-				storageDatabase.dispose();
-			}
-		}
-	}
-
 	protected abstract createStorageDatabase(profile: IUserDataProfile): Promise<IStorageDatabase>;
 }
 
@@ -130,12 +140,13 @@ export class RemoteUserDataProfileStorageService extends AbstractUserDataProfile
 	readonly onDidChange: Event<IProfileStorageChanges>;
 
 	constructor(
+		persistStorages: boolean,
 		private readonly remoteService: IRemoteService,
 		userDataProfilesService: IUserDataProfilesService,
 		storageService: IStorageService,
 		logService: ILogService,
 	) {
-		super(storageService);
+		super(persistStorages, storageService);
 
 		const channel = remoteService.getChannel('profileStorageListener');
 		const disposable = this._register(new MutableDisposable());
@@ -164,14 +175,26 @@ export class RemoteUserDataProfileStorageService extends AbstractUserDataProfile
 
 class StorageService extends AbstractStorageService {
 
-	private readonly profileStorage: IStorage;
+	private profileStorage: IStorage | undefined;
 
-	constructor(profileStorageDatabase: IStorageDatabase) {
+	constructor(private readonly profileStorageDatabase: Promise<IStorageDatabase>) {
 		super({ flushInterval: 100 });
-		this.profileStorage = this._register(new Storage(profileStorageDatabase));
 	}
 
-	protected doInitialize(): Promise<void> {
+	protected async doInitialize(): Promise<void> {
+		const profileStorageDatabase = await this.profileStorageDatabase;
+		const profileStorage = new Storage(profileStorageDatabase);
+		this._register(profileStorage.onDidChangeStorage(e => {
+			this.emitDidChangeValue(StorageScope.PROFILE, e);
+		}));
+		this._register(toDisposable(() => {
+			profileStorage.close();
+			profileStorage.dispose();
+			if (isDisposable(profileStorageDatabase)) {
+				profileStorageDatabase.dispose();
+			}
+		}));
+		this.profileStorage = profileStorage;
 		return this.profileStorage.init();
 	}
 
diff --git a/src/vs/platform/userDataProfile/electron-main/userDataProfile.ts b/src/vs/platform/userDataProfile/electron-main/userDataProfile.ts
index 95348d22d24..84d81036dd1 100644
--- a/src/vs/platform/userDataProfile/electron-main/userDataProfile.ts
+++ b/src/vs/platform/userDataProfile/electron-main/userDataProfile.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IFileService } from 'vs/platform/files/common/files';
-import { refineServiceDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IUserDataProfilesService, WillCreateProfileEvent, WillRemoveProfileEvent, IUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { UserDataProfilesService } from 'vs/platform/userDataProfile/node/userDataProfile';
-import { IAnyWorkspaceIdentifier, IEmptyWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
-import { IStateService } from 'vs/platform/state/node/state';
+import { Event } from '../../../base/common/event.js';
+import { INativeEnvironmentService } from '../../environment/common/environment.js';
+import { IFileService } from '../../files/common/files.js';
+import { refineServiceDecorator } from '../../instantiation/common/instantiation.js';
+import { ILogService } from '../../log/common/log.js';
+import { IUriIdentityService } from '../../uriIdentity/common/uriIdentity.js';
+import { IUserDataProfilesService, WillCreateProfileEvent, WillRemoveProfileEvent, IUserDataProfile } from '../common/userDataProfile.js';
+import { UserDataProfilesService } from '../node/userDataProfile.js';
+import { IAnyWorkspaceIdentifier, IEmptyWorkspaceIdentifier } from '../../workspace/common/workspace.js';
+import { IStateService } from '../../state/node/state.js';
 
 export const IUserDataProfilesMainService = refineServiceDecorator<IUserDataProfilesService, IUserDataProfilesMainService>(IUserDataProfilesService);
 export interface IUserDataProfilesMainService extends IUserDataProfilesService {
diff --git a/src/vs/platform/userDataProfile/electron-main/userDataProfileStorageIpc.ts b/src/vs/platform/userDataProfile/electron-main/userDataProfileStorageIpc.ts
index 457dac8e1d4..fb6c7e258fc 100644
--- a/src/vs/platform/userDataProfile/electron-main/userDataProfileStorageIpc.ts
+++ b/src/vs/platform/userDataProfile/electron-main/userDataProfileStorageIpc.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { IServerChannel } from 'vs/base/parts/ipc/common/ipc';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProfileStorageChanges, IProfileStorageValueChanges } from 'vs/platform/userDataProfile/common/userDataProfileStorageService';
-import { loadKeyTargets, StorageScope, TARGET_KEY } from 'vs/platform/storage/common/storage';
-import { IBaseSerializableStorageRequest } from 'vs/platform/storage/common/storageIpc';
-import { IStorageMain } from 'vs/platform/storage/electron-main/storageMain';
-import { IStorageMainService } from 'vs/platform/storage/electron-main/storageMainService';
-import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable, DisposableStore, IDisposable, MutableDisposable } from '../../../base/common/lifecycle.js';
+import { IServerChannel } from '../../../base/parts/ipc/common/ipc.js';
+import { ILogService } from '../../log/common/log.js';
+import { IProfileStorageChanges, IProfileStorageValueChanges } from '../common/userDataProfileStorageService.js';
+import { loadKeyTargets, StorageScope, TARGET_KEY } from '../../storage/common/storage.js';
+import { IBaseSerializableStorageRequest } from '../../storage/common/storageIpc.js';
+import { IStorageMain } from '../../storage/electron-main/storageMain.js';
+import { IStorageMainService } from '../../storage/electron-main/storageMainService.js';
+import { IUserDataProfile, IUserDataProfilesService } from '../common/userDataProfile.js';
 
 export class ProfileStorageChangesListenerChannel extends Disposable implements IServerChannel {
 
diff --git a/src/vs/platform/userDataProfile/electron-main/userDataProfilesHandler.ts b/src/vs/platform/userDataProfile/electron-main/userDataProfilesHandler.ts
index ce4d4446438..4531f380e84 100644
--- a/src/vs/platform/userDataProfile/electron-main/userDataProfilesHandler.ts
+++ b/src/vs/platform/userDataProfile/electron-main/userDataProfilesHandler.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ILifecycleMainService, } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
-import { ICodeWindow, LoadReason } from 'vs/platform/window/electron-main/window';
-import { IUserDataProfilesMainService } from 'vs/platform/userDataProfile/electron-main/userDataProfile';
-import { IAnyWorkspaceIdentifier, toWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { IWindowsMainService } from 'vs/platform/windows/electron-main/windows';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { ILifecycleMainService, } from '../../lifecycle/electron-main/lifecycleMainService.js';
+import { ICodeWindow, LoadReason } from '../../window/electron-main/window.js';
+import { IUserDataProfilesMainService } from './userDataProfile.js';
+import { IAnyWorkspaceIdentifier, toWorkspaceIdentifier } from '../../workspace/common/workspace.js';
+import { RunOnceScheduler } from '../../../base/common/async.js';
+import { IWindowsMainService } from '../../windows/electron-main/windows.js';
 
 export class UserDataProfilesHandler extends Disposable {
 
diff --git a/src/vs/platform/userDataProfile/electron-sandbox/userDataProfileStorageService.ts b/src/vs/platform/userDataProfile/electron-sandbox/userDataProfileStorageService.ts
index 0679efcc742..4eb4318c71e 100644
--- a/src/vs/platform/userDataProfile/electron-sandbox/userDataProfileStorageService.ts
+++ b/src/vs/platform/userDataProfile/electron-sandbox/userDataProfileStorageService.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IUserDataProfileStorageService, RemoteUserDataProfileStorageService } from 'vs/platform/userDataProfile/common/userDataProfileStorageService';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IMainProcessService } from 'vs/platform/ipc/common/mainProcessService';
+import { IUserDataProfileStorageService, RemoteUserDataProfileStorageService } from '../common/userDataProfileStorageService.js';
+import { InstantiationType, registerSingleton } from '../../instantiation/common/extensions.js';
+import { IStorageService } from '../../storage/common/storage.js';
+import { ILogService } from '../../log/common/log.js';
+import { IUserDataProfilesService } from '../common/userDataProfile.js';
+import { IMainProcessService } from '../../ipc/common/mainProcessService.js';
 
 export class NativeUserDataProfileStorageService extends RemoteUserDataProfileStorageService {
 
@@ -18,7 +18,7 @@ export class NativeUserDataProfileStorageService extends RemoteUserDataProfileSt
 		@IStorageService storageService: IStorageService,
 		@ILogService logService: ILogService,
 	) {
-		super(mainProcessService, userDataProfilesService, storageService, logService);
+		super(false, mainProcessService, userDataProfilesService, storageService, logService);
 	}
 }
 
diff --git a/src/vs/platform/userDataProfile/node/userDataProfile.ts b/src/vs/platform/userDataProfile/node/userDataProfile.ts
index b5fc85922e9..24165365965 100644
--- a/src/vs/platform/userDataProfile/node/userDataProfile.ts
+++ b/src/vs/platform/userDataProfile/node/userDataProfile.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI, UriComponents, UriDto } from 'vs/base/common/uri';
-import { INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IFileService } from 'vs/platform/files/common/files';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IStateReadService, IStateService } from 'vs/platform/state/node/state';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IUserDataProfilesService, UserDataProfilesService as BaseUserDataProfilesService, StoredUserDataProfile, StoredProfileAssociations } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { isString } from 'vs/base/common/types';
-import { SaveStrategy, StateService } from 'vs/platform/state/node/stateService';
+import { URI, UriComponents, UriDto } from '../../../base/common/uri.js';
+import { INativeEnvironmentService } from '../../environment/common/environment.js';
+import { IFileService } from '../../files/common/files.js';
+import { ILogService } from '../../log/common/log.js';
+import { IStateReadService, IStateService } from '../../state/node/state.js';
+import { IUriIdentityService } from '../../uriIdentity/common/uriIdentity.js';
+import { IUserDataProfilesService, UserDataProfilesService as BaseUserDataProfilesService, StoredUserDataProfile, StoredProfileAssociations } from '../common/userDataProfile.js';
+import { IStringDictionary } from '../../../base/common/collections.js';
+import { isString } from '../../../base/common/types.js';
+import { SaveStrategy, StateService } from '../../state/node/stateService.js';
 
 type StoredUserDataProfileState = StoredUserDataProfile & { location: URI | string };
 
@@ -93,7 +93,7 @@ export class UserDataProfilesService extends UserDataProfilesReadonlyService imp
 				result[URI.revive(workspace).toString()] = URI.revive(profile).toString();
 				return result;
 			}, {});
-			this.stateService.setItem(UserDataProfilesService.PROFILE_ASSOCIATIONS_KEY, <StoredProfileAssociations>{ workspaces });
+			this.stateService.setItem(UserDataProfilesService.PROFILE_ASSOCIATIONS_KEY, { workspaces } satisfies StoredProfileAssociations);
 		}
 		const associations = super.getStoredProfileAssociations();
 		if (!this.stateService.getItem<boolean>(UserDataProfilesService.PROFILE_ASSOCIATIONS_MIGRATION_KEY, false)) {
diff --git a/src/vs/platform/userDataProfile/node/userDataProfileStorageService.ts b/src/vs/platform/userDataProfile/node/userDataProfileStorageService.ts
index 3b37d056aae..233360af85e 100644
--- a/src/vs/platform/userDataProfile/node/userDataProfileStorageService.ts
+++ b/src/vs/platform/userDataProfile/node/userDataProfileStorageService.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IMainProcessService } from 'vs/platform/ipc/common/mainProcessService';
-import { RemoteUserDataProfileStorageService } from 'vs/platform/userDataProfile/common/userDataProfileStorageService';
+import { IStorageService } from '../../storage/common/storage.js';
+import { ILogService } from '../../log/common/log.js';
+import { IUserDataProfilesService } from '../common/userDataProfile.js';
+import { IMainProcessService } from '../../ipc/common/mainProcessService.js';
+import { RemoteUserDataProfileStorageService } from '../common/userDataProfileStorageService.js';
 
-export class NativeUserDataProfileStorageService extends RemoteUserDataProfileStorageService {
+export class SharedProcessUserDataProfileStorageService extends RemoteUserDataProfileStorageService {
 
 	constructor(
 		@IMainProcessService mainProcessService: IMainProcessService,
@@ -17,6 +17,6 @@ export class NativeUserDataProfileStorageService extends RemoteUserDataProfileSt
 		@IStorageService storageService: IStorageService,
 		@ILogService logService: ILogService,
 	) {
-		super(mainProcessService, userDataProfilesService, storageService, logService);
+		super(true, mainProcessService, userDataProfilesService, storageService, logService);
 	}
 }
diff --git a/src/vs/platform/userDataProfile/test/common/userDataProfileService.test.ts b/src/vs/platform/userDataProfile/test/common/userDataProfileService.test.ts
index a7e2da87458..31d0de50c8b 100644
--- a/src/vs/platform/userDataProfile/test/common/userDataProfileService.test.ts
+++ b/src/vs/platform/userDataProfile/test/common/userDataProfileService.test.ts
@@ -4,17 +4,18 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { joinPath } from 'vs/base/common/resources';
-import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
-import { AbstractNativeEnvironmentService } from 'vs/platform/environment/common/environmentService';
-import product from 'vs/platform/product/common/product';
-import { InMemoryUserDataProfilesService, UserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { FileService } from '../../../files/common/fileService.js';
+import { NullLogService } from '../../../log/common/log.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { URI } from '../../../../base/common/uri.js';
+import { joinPath } from '../../../../base/common/resources.js';
+import { InMemoryFileSystemProvider } from '../../../files/common/inMemoryFilesystemProvider.js';
+import { AbstractNativeEnvironmentService } from '../../../environment/common/environmentService.js';
+import product from '../../../product/common/product.js';
+import { InMemoryUserDataProfilesService, UserDataProfilesService } from '../../common/userDataProfile.js';
+import { UriIdentityService } from '../../../uriIdentity/common/uriIdentityService.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { Event } from '../../../../base/common/event.js';
 
 const ROOT = URI.file('tests').with({ scheme: 'vscode-tests' });
 
@@ -234,4 +235,132 @@ suite('UserDataProfileService (Common)', () => {
 		assert.strictEqual(profile.keybindingsResource.toString(), testObject.defaultProfile.keybindingsResource.toString());
 	});
 
+	test('create profile with a workspace associates it to the profile', async () => {
+		const workspace = URI.file('/workspace1');
+		const profile = await testObject.createProfile('id', 'name', {}, { id: workspace.path, uri: workspace });
+		assert.deepStrictEqual(profile.workspaces?.length, 1);
+		assert.deepStrictEqual(profile.workspaces?.[0].toString(), workspace.toString());
+	});
+
+	test('associate workspace to a profile should update workspaces', async () => {
+		const profile = await testObject.createProfile('id', 'name', {});
+		const workspace = URI.file('/workspace1');
+
+		const promise = Event.toPromise(testObject.onDidChangeProfiles);
+		await testObject.setProfileForWorkspace({ id: workspace.path, uri: workspace }, profile);
+
+		const actual = await promise;
+		assert.deepStrictEqual(actual.added.length, 0);
+		assert.deepStrictEqual(actual.removed.length, 0);
+		assert.deepStrictEqual(actual.updated.length, 1);
+
+		assert.deepStrictEqual(actual.updated[0].id, profile.id);
+		assert.deepStrictEqual(actual.updated[0].workspaces?.length, 1);
+		assert.deepStrictEqual(actual.updated[0].workspaces[0].toString(), workspace.toString());
+	});
+
+	test('associate same workspace to a profile should not duplicate', async () => {
+		const workspace = URI.file('/workspace1');
+		const profile = await testObject.createProfile('id', 'name', { workspaces: [workspace] });
+
+		await testObject.setProfileForWorkspace({ id: workspace.path, uri: workspace }, profile);
+
+		assert.deepStrictEqual(testObject.profiles[1].workspaces?.length, 1);
+		assert.deepStrictEqual(testObject.profiles[1].workspaces[0].toString(), workspace.toString());
+	});
+
+	test('associate workspace to another profile should update workspaces', async () => {
+		const workspace = URI.file('/workspace1');
+		const profile1 = await testObject.createProfile('id', 'name', {}, { id: workspace.path, uri: workspace });
+		const profile2 = await testObject.createProfile('id1', 'name1');
+
+		const promise = Event.toPromise(testObject.onDidChangeProfiles);
+		await testObject.setProfileForWorkspace({ id: workspace.path, uri: workspace }, profile2);
+
+		const actual = await promise;
+		assert.deepStrictEqual(actual.added.length, 0);
+		assert.deepStrictEqual(actual.removed.length, 0);
+		assert.deepStrictEqual(actual.updated.length, 2);
+
+		assert.deepStrictEqual(actual.updated[0].id, profile1.id);
+		assert.deepStrictEqual(actual.updated[0].workspaces, undefined);
+
+		assert.deepStrictEqual(actual.updated[1].id, profile2.id);
+		assert.deepStrictEqual(actual.updated[1].workspaces?.length, 1);
+		assert.deepStrictEqual(actual.updated[1].workspaces[0].toString(), workspace.toString());
+	});
+
+	test('unassociate workspace to a profile should update workspaces', async () => {
+		const workspace = URI.file('/workspace1');
+		const profile = await testObject.createProfile('id', 'name', {}, { id: workspace.path, uri: workspace });
+
+		const promise = Event.toPromise(testObject.onDidChangeProfiles);
+		testObject.unsetWorkspace({ id: workspace.path, uri: workspace });
+
+		const actual = await promise;
+		assert.deepStrictEqual(actual.added.length, 0);
+		assert.deepStrictEqual(actual.removed.length, 0);
+		assert.deepStrictEqual(actual.updated.length, 1);
+
+		assert.deepStrictEqual(actual.updated[0].id, profile.id);
+		assert.deepStrictEqual(actual.updated[0].workspaces, undefined);
+	});
+
+	test('update profile workspaces - add workspace', async () => {
+		let profile = await testObject.createNamedProfile('name');
+		const workspace = URI.file('/workspace1');
+		profile = await testObject.updateProfile(profile, { workspaces: [workspace] });
+
+		assert.deepStrictEqual(profile.workspaces?.length, 1);
+		assert.deepStrictEqual(profile.workspaces[0].toString(), workspace.toString());
+	});
+
+	test('update profile workspaces - remove workspace', async () => {
+		let profile = await testObject.createNamedProfile('name');
+		const workspace = URI.file('/workspace1');
+		profile = await testObject.updateProfile(profile, { workspaces: [workspace] });
+		profile = await testObject.updateProfile(profile, { workspaces: [] });
+
+		assert.deepStrictEqual(profile.workspaces, undefined);
+	});
+
+	test('update profile workspaces - replace workspace', async () => {
+		let profile = await testObject.createNamedProfile('name');
+		profile = await testObject.updateProfile(profile, { workspaces: [URI.file('/workspace1')] });
+
+		const workspace = URI.file('/workspace2');
+		profile = await testObject.updateProfile(profile, { workspaces: [workspace] });
+
+		assert.deepStrictEqual(profile.workspaces?.length, 1);
+		assert.deepStrictEqual(profile.workspaces[0].toString(), workspace.toString());
+	});
+
+	test('update default profile workspaces - add workspace', async () => {
+		const workspace = URI.file('/workspace1');
+		await testObject.updateProfile(testObject.defaultProfile, { workspaces: [workspace] });
+
+		assert.deepStrictEqual(testObject.profiles.length, 1);
+		assert.deepStrictEqual(testObject.profiles[0], testObject.defaultProfile);
+		assert.deepStrictEqual(testObject.defaultProfile.isDefault, true);
+		assert.deepStrictEqual(testObject.defaultProfile.workspaces?.length, 1);
+		assert.deepStrictEqual(testObject.defaultProfile.workspaces[0].toString(), workspace.toString());
+	});
+
+	test('can create transient and persistent profiles with same name', async () => {
+		const profile1 = await testObject.createNamedProfile('name', { transient: true });
+		const profile2 = await testObject.createNamedProfile('name', { transient: true });
+		const profile3 = await testObject.createNamedProfile('name');
+
+		assert.deepStrictEqual(profile1.name, 'name');
+		assert.deepStrictEqual(!!profile1.isTransient, true);
+		assert.deepStrictEqual(profile2.name, 'name');
+		assert.deepStrictEqual(!!profile2.isTransient, true);
+		assert.deepStrictEqual(profile3.name, 'name');
+		assert.deepStrictEqual(!!profile3.isTransient, false);
+		assert.deepStrictEqual(testObject.profiles.length, 4);
+		assert.deepStrictEqual(testObject.profiles[1].id, profile3.id);
+		assert.deepStrictEqual(testObject.profiles[2].id, profile1.id);
+		assert.deepStrictEqual(testObject.profiles[3].id, profile2.id);
+	});
+
 });
diff --git a/src/vs/platform/userDataProfile/test/common/userDataProfileStorageService.test.ts b/src/vs/platform/userDataProfile/test/common/userDataProfileStorageService.test.ts
index 3302b56ea6b..3e17c72ba91 100644
--- a/src/vs/platform/userDataProfile/test/common/userDataProfileStorageService.test.ts
+++ b/src/vs/platform/userDataProfile/test/common/userDataProfileStorageService.test.ts
@@ -4,14 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Emitter, Event } from 'vs/base/common/event';
-import { URI } from 'vs/base/common/uri';
-import { InMemoryStorageDatabase, IStorageItemsChangeEvent, IUpdateRequest, Storage } from 'vs/base/parts/storage/common/storage';
-import { AbstractUserDataProfileStorageService, IUserDataProfileStorageService } from 'vs/platform/userDataProfile/common/userDataProfileStorageService';
-import { InMemoryStorageService, loadKeyTargets, StorageTarget, TARGET_KEY } from 'vs/platform/storage/common/storage';
-import { IUserDataProfile, toUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { URI } from '../../../../base/common/uri.js';
+import { InMemoryStorageDatabase, IStorageItemsChangeEvent, IUpdateRequest, Storage } from '../../../../base/parts/storage/common/storage.js';
+import { AbstractUserDataProfileStorageService, IUserDataProfileStorageService } from '../../common/userDataProfileStorageService.js';
+import { InMemoryStorageService, loadKeyTargets, StorageTarget, TARGET_KEY } from '../../../storage/common/storage.js';
+import { IUserDataProfile, toUserDataProfile } from '../../common/userDataProfile.js';
+import { runWithFakedTimers } from '../../../../base/test/common/timeTravelScheduler.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 
 class TestStorageDatabase extends InMemoryStorageDatabase {
 
@@ -43,7 +43,6 @@ export class TestUserDataProfileStorageService extends AbstractUserDataProfileSt
 		return this.createStorageDatabase(profile);
 	}
 
-	protected override async closeAndDispose(): Promise<void> { }
 }
 
 suite('ProfileStorageService', () => {
@@ -54,7 +53,7 @@ suite('ProfileStorageService', () => {
 	let storage: Storage;
 
 	setup(async () => {
-		testObject = disposables.add(new TestUserDataProfileStorageService(disposables.add(new InMemoryStorageService())));
+		testObject = disposables.add(new TestUserDataProfileStorageService(false, disposables.add(new InMemoryStorageService())));
 		storage = disposables.add(new Storage(await testObject.setupStorageDatabase(profile)));
 		await storage.init();
 	});
diff --git a/src/vs/platform/userDataProfile/test/electron-main/userDataProfileMainService.test.ts b/src/vs/platform/userDataProfile/test/electron-main/userDataProfileMainService.test.ts
index 8797fafc6c4..ce4bf693483 100644
--- a/src/vs/platform/userDataProfile/test/electron-main/userDataProfileMainService.test.ts
+++ b/src/vs/platform/userDataProfile/test/electron-main/userDataProfileMainService.test.ts
@@ -4,18 +4,18 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { joinPath } from 'vs/base/common/resources';
-import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
-import { AbstractNativeEnvironmentService } from 'vs/platform/environment/common/environmentService';
-import product from 'vs/platform/product/common/product';
-import { UserDataProfilesMainService } from 'vs/platform/userDataProfile/electron-main/userDataProfile';
-import { SaveStrategy, StateService } from 'vs/platform/state/node/stateService';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { FileService } from '../../../files/common/fileService.js';
+import { NullLogService } from '../../../log/common/log.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { URI } from '../../../../base/common/uri.js';
+import { joinPath } from '../../../../base/common/resources.js';
+import { InMemoryFileSystemProvider } from '../../../files/common/inMemoryFilesystemProvider.js';
+import { AbstractNativeEnvironmentService } from '../../../environment/common/environmentService.js';
+import product from '../../../product/common/product.js';
+import { UserDataProfilesMainService } from '../../electron-main/userDataProfile.js';
+import { SaveStrategy, StateService } from '../../../state/node/stateService.js';
+import { UriIdentityService } from '../../../uriIdentity/common/uriIdentityService.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 
 const ROOT = URI.file('tests').with({ scheme: 'vscode-tests' });
 
diff --git a/src/vs/platform/userDataSync/common/abstractSynchronizer.ts b/src/vs/platform/userDataSync/common/abstractSynchronizer.ts
index 9f52f0fd29e..5f40daba148 100644
--- a/src/vs/platform/userDataSync/common/abstractSynchronizer.ts
+++ b/src/vs/platform/userDataSync/common/abstractSynchronizer.ts
@@ -3,31 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { equals } from 'vs/base/common/arrays';
-import { CancelablePromise, createCancelablePromise, ThrottledDelayer } from 'vs/base/common/async';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { Emitter, Event } from 'vs/base/common/event';
-import { parse, ParseError } from 'vs/base/common/json';
-import { FormattingOptions } from 'vs/base/common/jsonFormatter';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IExtUri } from 'vs/base/common/resources';
-import { uppercaseFirstLetter } from 'vs/base/common/strings';
-import { isUndefined } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { IHeaders } from 'vs/base/parts/request/common/request';
-import { localize } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { FileChangesEvent, FileOperationError, FileOperationResult, IFileContent, IFileService, toFileOperationResult } from 'vs/platform/files/common/files';
-import { ILogService } from 'vs/platform/log/common/log';
-import { getServiceMachineId } from 'vs/platform/externalServices/common/serviceMachineId';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { Change, getLastSyncResourceUri, IRemoteUserData, IResourcePreview as IBaseResourcePreview, ISyncData, IUserDataSyncResourcePreview as IBaseSyncResourcePreview, IUserData, IUserDataSyncResourceInitializer, IUserDataSyncLocalStoreService, IUserDataSyncConfiguration, IUserDataSynchroniser, IUserDataSyncLogService, IUserDataSyncEnablementService, IUserDataSyncStoreService, IUserDataSyncUtilService, MergeState, PREVIEW_DIR_NAME, SyncResource, SyncStatus, UserDataSyncError, UserDataSyncErrorCode, USER_DATA_SYNC_CONFIGURATION_SCOPE, USER_DATA_SYNC_SCHEME, IUserDataResourceManifest, getPathSegments, IUserDataSyncResourceConflicts, IUserDataSyncResource } from 'vs/platform/userDataSync/common/userDataSync';
-import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { equals } from '../../../base/common/arrays.js';
+import { CancelablePromise, createCancelablePromise, ThrottledDelayer } from '../../../base/common/async.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { IStringDictionary } from '../../../base/common/collections.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { parse, ParseError } from '../../../base/common/json.js';
+import { FormattingOptions } from '../../../base/common/jsonFormatter.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { IExtUri } from '../../../base/common/resources.js';
+import { uppercaseFirstLetter } from '../../../base/common/strings.js';
+import { isUndefined } from '../../../base/common/types.js';
+import { URI } from '../../../base/common/uri.js';
+import { IHeaders } from '../../../base/parts/request/common/request.js';
+import { localize } from '../../../nls.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { FileChangesEvent, FileOperationError, FileOperationResult, IFileContent, IFileService, toFileOperationResult } from '../../files/common/files.js';
+import { ILogService } from '../../log/common/log.js';
+import { getServiceMachineId } from '../../externalServices/common/serviceMachineId.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../storage/common/storage.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
+import { IUriIdentityService } from '../../uriIdentity/common/uriIdentity.js';
+import { Change, getLastSyncResourceUri, IRemoteUserData, IResourcePreview as IBaseResourcePreview, ISyncData, IUserDataSyncResourcePreview as IBaseSyncResourcePreview, IUserData, IUserDataSyncResourceInitializer, IUserDataSyncLocalStoreService, IUserDataSyncConfiguration, IUserDataSynchroniser, IUserDataSyncLogService, IUserDataSyncEnablementService, IUserDataSyncStoreService, IUserDataSyncUtilService, MergeState, PREVIEW_DIR_NAME, SyncResource, SyncStatus, UserDataSyncError, UserDataSyncErrorCode, USER_DATA_SYNC_CONFIGURATION_SCOPE, USER_DATA_SYNC_SCHEME, IUserDataResourceManifest, getPathSegments, IUserDataSyncResourceConflicts, IUserDataSyncResource } from './userDataSync.js';
+import { IUserDataProfile, IUserDataProfilesService } from '../../userDataProfile/common/userDataProfile.js';
 
 type IncompatibleSyncSourceClassification = {
 	owner: 'sandy081';
@@ -592,7 +592,7 @@ export abstract class AbstractSynchroniser extends Disposable implements IUserDa
 		return { syncResource: this.resource, profile: this.syncResource.profile, remoteUserData, lastSyncUserData, resourcePreviews, isLastSyncFromCurrentMachine: isRemoteDataFromCurrentMachine };
 	}
 
-	async getLastSyncUserData<T = IRemoteUserData & { [key: string]: any }>(): Promise<T | null> {
+	async getLastSyncUserData(): Promise<IRemoteUserData | null> {
 		let storedLastSyncUserDataStateContent = this.getStoredLastSyncUserDataStateContent();
 		if (!storedLastSyncUserDataStateContent) {
 			storedLastSyncUserDataStateContent = await this.migrateLastSyncUserData();
@@ -664,7 +664,7 @@ export abstract class AbstractSynchroniser extends Disposable implements IUserDa
 		return {
 			...lastSyncUserDataState,
 			syncData,
-		} as T;
+		};
 	}
 
 	protected async updateLastSyncUserData(lastSyncRemoteUserData: IRemoteUserData, additionalProps: IStringDictionary<any> = {}): Promise<void> {
diff --git a/src/vs/platform/userDataSync/common/content.ts b/src/vs/platform/userDataSync/common/content.ts
index 5dd3d97a427..77a6f04dffa 100644
--- a/src/vs/platform/userDataSync/common/content.ts
+++ b/src/vs/platform/userDataSync/common/content.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { JSONPath } from 'vs/base/common/json';
-import { setProperty } from 'vs/base/common/jsonEdit';
-import { FormattingOptions } from 'vs/base/common/jsonFormatter';
+import { JSONPath } from '../../../base/common/json.js';
+import { setProperty } from '../../../base/common/jsonEdit.js';
+import { FormattingOptions } from '../../../base/common/jsonFormatter.js';
 
 
 export function edit(content: string, originalPath: JSONPath, value: any, formattingOptions: FormattingOptions): string {
diff --git a/src/vs/platform/userDataSync/common/extensionsMerge.ts b/src/vs/platform/userDataSync/common/extensionsMerge.ts
index 98204d9b488..f3eeaba274c 100644
--- a/src/vs/platform/userDataSync/common/extensionsMerge.ts
+++ b/src/vs/platform/userDataSync/common/extensionsMerge.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IStringDictionary } from 'vs/base/common/collections';
-import { deepClone, equals } from 'vs/base/common/objects';
-import * as semver from 'vs/base/common/semver/semver';
-import { assertIsDefined } from 'vs/base/common/types';
-import { IExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { ILocalSyncExtension, IRemoteSyncExtension, ISyncExtension } from 'vs/platform/userDataSync/common/userDataSync';
+import { IStringDictionary } from '../../../base/common/collections.js';
+import { deepClone, equals } from '../../../base/common/objects.js';
+import * as semver from '../../../base/common/semver/semver.js';
+import { assertIsDefined } from '../../../base/common/types.js';
+import { IExtensionIdentifier } from '../../extensions/common/extensions.js';
+import { ILocalSyncExtension, IRemoteSyncExtension, ISyncExtension } from './userDataSync.js';
 
 export interface IMergeResult {
 	readonly local: { added: ISyncExtension[]; removed: IExtensionIdentifier[]; updated: ISyncExtension[] };
diff --git a/src/vs/platform/userDataSync/common/extensionsSync.ts b/src/vs/platform/userDataSync/common/extensionsSync.ts
index 53561e249db..c917d7ac871 100644
--- a/src/vs/platform/userDataSync/common/extensionsSync.ts
+++ b/src/vs/platform/userDataSync/common/extensionsSync.ts
@@ -3,35 +3,35 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Promises } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { getErrorMessage } from 'vs/base/common/errors';
-import { Event } from 'vs/base/common/event';
-import { toFormattedString } from 'vs/base/common/jsonFormatter';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { compare } from 'vs/base/common/strings';
-import { URI } from 'vs/base/common/uri';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { GlobalExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionEnablementService';
-import { IExtensionGalleryService, IExtensionManagementService, IGlobalExtensionEnablementService, ILocalExtension, ExtensionManagementError, ExtensionManagementErrorCode, IGalleryExtension, DISABLED_EXTENSIONS_STORAGE_PATH, EXTENSION_INSTALL_SKIP_WALKTHROUGH_CONTEXT, EXTENSION_INSTALL_SOURCE_CONTEXT, InstallExtensionInfo, ExtensionInstallSource } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { ExtensionStorageService, IExtensionStorageService } from 'vs/platform/extensionManagement/common/extensionStorage';
-import { ExtensionType, IExtensionIdentifier, isApplicationScopedExtension } from 'vs/platform/extensions/common/extensions';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { AbstractInitializer, AbstractSynchroniser, getSyncResourceLogLabel, IAcceptResult, IMergeResult, IResourcePreview } from 'vs/platform/userDataSync/common/abstractSynchronizer';
-import { IMergeResult as IExtensionMergeResult, merge } from 'vs/platform/userDataSync/common/extensionsMerge';
-import { IIgnoredExtensionsManagementService } from 'vs/platform/userDataSync/common/ignoredExtensions';
-import { Change, IRemoteUserData, ISyncData, ISyncExtension, IUserDataSyncLocalStoreService, IUserDataSynchroniser, IUserDataSyncLogService, IUserDataSyncEnablementService, IUserDataSyncStoreService, SyncResource, USER_DATA_SYNC_SCHEME, ILocalSyncExtension } from 'vs/platform/userDataSync/common/userDataSync';
-import { IUserDataProfileStorageService } from 'vs/platform/userDataProfile/common/userDataProfileStorageService';
+import { Promises } from '../../../base/common/async.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { IStringDictionary } from '../../../base/common/collections.js';
+import { getErrorMessage } from '../../../base/common/errors.js';
+import { Event } from '../../../base/common/event.js';
+import { toFormattedString } from '../../../base/common/jsonFormatter.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { compare } from '../../../base/common/strings.js';
+import { URI } from '../../../base/common/uri.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { GlobalExtensionEnablementService } from '../../extensionManagement/common/extensionEnablementService.js';
+import { IExtensionGalleryService, IExtensionManagementService, IGlobalExtensionEnablementService, ILocalExtension, ExtensionManagementError, ExtensionManagementErrorCode, IGalleryExtension, DISABLED_EXTENSIONS_STORAGE_PATH, EXTENSION_INSTALL_SKIP_WALKTHROUGH_CONTEXT, EXTENSION_INSTALL_SOURCE_CONTEXT, InstallExtensionInfo, ExtensionInstallSource } from '../../extensionManagement/common/extensionManagement.js';
+import { areSameExtensions } from '../../extensionManagement/common/extensionManagementUtil.js';
+import { ExtensionStorageService, IExtensionStorageService } from '../../extensionManagement/common/extensionStorage.js';
+import { ExtensionType, IExtensionIdentifier, isApplicationScopedExtension } from '../../extensions/common/extensions.js';
+import { IFileService } from '../../files/common/files.js';
+import { IInstantiationService } from '../../instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../instantiation/common/serviceCollection.js';
+import { ILogService } from '../../log/common/log.js';
+import { IStorageService } from '../../storage/common/storage.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
+import { IUriIdentityService } from '../../uriIdentity/common/uriIdentity.js';
+import { IUserDataProfile, IUserDataProfilesService } from '../../userDataProfile/common/userDataProfile.js';
+import { AbstractInitializer, AbstractSynchroniser, getSyncResourceLogLabel, IAcceptResult, IMergeResult, IResourcePreview } from './abstractSynchronizer.js';
+import { IMergeResult as IExtensionMergeResult, merge } from './extensionsMerge.js';
+import { IIgnoredExtensionsManagementService } from './ignoredExtensions.js';
+import { Change, IRemoteUserData, ISyncData, ISyncExtension, IUserDataSyncLocalStoreService, IUserDataSynchroniser, IUserDataSyncLogService, IUserDataSyncEnablementService, IUserDataSyncStoreService, SyncResource, USER_DATA_SYNC_SCHEME, ILocalSyncExtension } from './userDataSync.js';
+import { IUserDataProfileStorageService } from '../../userDataProfile/common/userDataProfileStorageService.js';
 
 type IExtensionResourceMergeResult = IAcceptResult & IExtensionMergeResult;
 
@@ -533,7 +533,7 @@ export class LocalExtensionsProvider {
 					addToSkipped.push(e);
 					this.logService.info(`${syncResourceLogLabel}: Skipped synchronizing extension`, gallery.displayName || gallery.identifier.id);
 				}
-				if (error instanceof ExtensionManagementError && [ExtensionManagementErrorCode.Incompatible, ExtensionManagementErrorCode.IncompatibleTargetPlatform].includes(error.code)) {
+				if (error instanceof ExtensionManagementError && [ExtensionManagementErrorCode.Incompatible, ExtensionManagementErrorCode.IncompatibleApi, ExtensionManagementErrorCode.IncompatibleTargetPlatform].includes(error.code)) {
 					this.logService.info(`${syncResourceLogLabel}: Skipped synchronizing extension because the compatible extension is not found.`, gallery.displayName || gallery.identifier.id);
 				} else if (error) {
 					this.logService.error(error);
diff --git a/src/vs/platform/userDataSync/common/globalStateMerge.ts b/src/vs/platform/userDataSync/common/globalStateMerge.ts
index 527ec93660f..4e53698147d 100644
--- a/src/vs/platform/userDataSync/common/globalStateMerge.ts
+++ b/src/vs/platform/userDataSync/common/globalStateMerge.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IStringDictionary } from 'vs/base/common/collections';
-import * as objects from 'vs/base/common/objects';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IStorageValue, SYNC_SERVICE_URL_TYPE } from 'vs/platform/userDataSync/common/userDataSync';
+import { IStringDictionary } from '../../../base/common/collections.js';
+import * as objects from '../../../base/common/objects.js';
+import { ILogService } from '../../log/common/log.js';
+import { IStorageValue, SYNC_SERVICE_URL_TYPE } from './userDataSync.js';
 
 export interface IMergeResult {
 	local: { added: IStringDictionary<IStorageValue>; removed: string[]; updated: IStringDictionary<IStorageValue> };
diff --git a/src/vs/platform/userDataSync/common/globalStateSync.ts b/src/vs/platform/userDataSync/common/globalStateSync.ts
index 4c698553970..75ea2446438 100644
--- a/src/vs/platform/userDataSync/common/globalStateSync.ts
+++ b/src/vs/platform/userDataSync/common/globalStateSync.ts
@@ -3,33 +3,33 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { getErrorMessage } from 'vs/base/common/errors';
-import { Event } from 'vs/base/common/event';
-import { parse } from 'vs/base/common/json';
-import { toFormattedString } from 'vs/base/common/jsonFormatter';
-import { isWeb } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { IHeaders } from 'vs/base/parts/request/common/request';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IFileService } from 'vs/platform/files/common/files';
-import { ILogService } from 'vs/platform/log/common/log';
-import { getServiceMachineId } from 'vs/platform/externalServices/common/serviceMachineId';
-import { IStorageEntry, IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { AbstractInitializer, AbstractSynchroniser, getSyncResourceLogLabel, IAcceptResult, IMergeResult, IResourcePreview, isSyncData } from 'vs/platform/userDataSync/common/abstractSynchronizer';
-import { edit } from 'vs/platform/userDataSync/common/content';
-import { merge } from 'vs/platform/userDataSync/common/globalStateMerge';
-import { ALL_SYNC_RESOURCES, Change, createSyncHeaders, getEnablementKey, IGlobalState, IRemoteUserData, IStorageValue, ISyncData, IUserData, IUserDataSyncLocalStoreService, IUserDataSynchroniser, IUserDataSyncLogService, IUserDataSyncEnablementService, IUserDataSyncStoreService, SyncResource, SYNC_SERVICE_URL_TYPE, UserDataSyncError, UserDataSyncErrorCode, UserDataSyncStoreType, USER_DATA_SYNC_SCHEME } from 'vs/platform/userDataSync/common/userDataSync';
-import { UserDataSyncStoreClient } from 'vs/platform/userDataSync/common/userDataSyncStoreService';
-import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IUserDataProfileStorageService } from 'vs/platform/userDataProfile/common/userDataProfileStorageService';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { IStringDictionary } from '../../../base/common/collections.js';
+import { getErrorMessage } from '../../../base/common/errors.js';
+import { Event } from '../../../base/common/event.js';
+import { parse } from '../../../base/common/json.js';
+import { toFormattedString } from '../../../base/common/jsonFormatter.js';
+import { isWeb } from '../../../base/common/platform.js';
+import { URI } from '../../../base/common/uri.js';
+import { generateUuid } from '../../../base/common/uuid.js';
+import { IHeaders } from '../../../base/parts/request/common/request.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { IFileService } from '../../files/common/files.js';
+import { ILogService } from '../../log/common/log.js';
+import { getServiceMachineId } from '../../externalServices/common/serviceMachineId.js';
+import { IStorageEntry, IStorageService, StorageScope, StorageTarget } from '../../storage/common/storage.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
+import { IUriIdentityService } from '../../uriIdentity/common/uriIdentity.js';
+import { AbstractInitializer, AbstractSynchroniser, getSyncResourceLogLabel, IAcceptResult, IMergeResult, IResourcePreview, isSyncData } from './abstractSynchronizer.js';
+import { edit } from './content.js';
+import { merge } from './globalStateMerge.js';
+import { ALL_SYNC_RESOURCES, Change, createSyncHeaders, getEnablementKey, IGlobalState, IRemoteUserData, IStorageValue, ISyncData, IUserData, IUserDataSyncLocalStoreService, IUserDataSynchroniser, IUserDataSyncLogService, IUserDataSyncEnablementService, IUserDataSyncStoreService, SyncResource, SYNC_SERVICE_URL_TYPE, UserDataSyncError, UserDataSyncErrorCode, UserDataSyncStoreType, USER_DATA_SYNC_SCHEME } from './userDataSync.js';
+import { UserDataSyncStoreClient } from './userDataSyncStoreService.js';
+import { IUserDataProfile, IUserDataProfilesService } from '../../userDataProfile/common/userDataProfile.js';
+import { IUserDataProfileStorageService } from '../../userDataProfile/common/userDataProfileStorageService.js';
+import { IInstantiationService } from '../../instantiation/common/instantiation.js';
 
 const argvStoragePrefx = 'globalState.argv.';
 const argvProperties: string[] = ['locale'];
@@ -244,7 +244,7 @@ export class GlobalStateSynchroniser extends AbstractSynchroniser implements IUs
 		if (remoteChange !== Change.None) {
 			// update remote
 			this.logService.trace(`${this.syncResourceLogLabel}: Updating remote ui state...`);
-			const content = JSON.stringify(<IGlobalState>{ storage: remote.all });
+			const content = JSON.stringify({ storage: remote.all });
 			remoteUserData = await this.updateRemoteUserData(content, force ? null : remoteUserData.ref);
 			this.logService.info(`${this.syncResourceLogLabel}: Updated remote ui state.${remote.added.length ? ` Added: ${remote.added}.` : ''}${remote.updated.length ? ` Updated: ${remote.updated}.` : ''}${remote.removed.length ? ` Removed: ${remote.removed}.` : ''}`);
 		}
diff --git a/src/vs/platform/userDataSync/common/ignoredExtensions.ts b/src/vs/platform/userDataSync/common/ignoredExtensions.ts
index d0e9c6c9871..309cb745382 100644
--- a/src/vs/platform/userDataSync/common/ignoredExtensions.ts
+++ b/src/vs/platform/userDataSync/common/ignoredExtensions.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { distinct } from 'vs/base/common/arrays';
-import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { distinct } from '../../../base/common/arrays.js';
+import { ConfigurationTarget, IConfigurationService } from '../../configuration/common/configuration.js';
+import { ILocalExtension } from '../../extensionManagement/common/extensionManagement.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 export const IIgnoredExtensionsManagementService = createDecorator<IIgnoredExtensionsManagementService>('IIgnoredExtensionsManagementService');
 export interface IIgnoredExtensionsManagementService {
diff --git a/src/vs/platform/userDataSync/common/keybindingsMerge.ts b/src/vs/platform/userDataSync/common/keybindingsMerge.ts
index fc1b93f5551..054e4e74787 100644
--- a/src/vs/platform/userDataSync/common/keybindingsMerge.ts
+++ b/src/vs/platform/userDataSync/common/keybindingsMerge.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { equals } from 'vs/base/common/arrays';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { parse } from 'vs/base/common/json';
-import { FormattingOptions } from 'vs/base/common/jsonFormatter';
-import * as objects from 'vs/base/common/objects';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IUserFriendlyKeybinding } from 'vs/platform/keybinding/common/keybinding';
-import * as contentUtil from 'vs/platform/userDataSync/common/content';
-import { IUserDataSyncUtilService } from 'vs/platform/userDataSync/common/userDataSync';
+import { equals } from '../../../base/common/arrays.js';
+import { IStringDictionary } from '../../../base/common/collections.js';
+import { parse } from '../../../base/common/json.js';
+import { FormattingOptions } from '../../../base/common/jsonFormatter.js';
+import * as objects from '../../../base/common/objects.js';
+import { ContextKeyExpr } from '../../contextkey/common/contextkey.js';
+import { IUserFriendlyKeybinding } from '../../keybinding/common/keybinding.js';
+import * as contentUtil from './content.js';
+import { IUserDataSyncUtilService } from './userDataSync.js';
 
 interface ICompareResult {
 	added: Set<string>;
diff --git a/src/vs/platform/userDataSync/common/keybindingsSync.ts b/src/vs/platform/userDataSync/common/keybindingsSync.ts
index 715707a19cc..08eedc3ba2b 100644
--- a/src/vs/platform/userDataSync/common/keybindingsSync.ts
+++ b/src/vs/platform/userDataSync/common/keybindingsSync.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isNonEmptyArray } from 'vs/base/common/arrays';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Event } from 'vs/base/common/event';
-import { parse } from 'vs/base/common/json';
-import { OperatingSystem, OS } from 'vs/base/common/platform';
-import { isUndefined } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { FileOperationError, FileOperationResult, IFileService } from 'vs/platform/files/common/files';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { AbstractInitializer, AbstractJsonFileSynchroniser, IAcceptResult, IFileResourcePreview, IMergeResult } from 'vs/platform/userDataSync/common/abstractSynchronizer';
-import { merge } from 'vs/platform/userDataSync/common/keybindingsMerge';
-import { Change, IRemoteUserData, IUserDataSyncLocalStoreService, IUserDataSyncConfiguration, IUserDataSynchroniser, IUserDataSyncLogService, IUserDataSyncEnablementService, IUserDataSyncStoreService, IUserDataSyncUtilService, SyncResource, UserDataSyncError, UserDataSyncErrorCode, USER_DATA_SYNC_SCHEME, CONFIG_SYNC_KEYBINDINGS_PER_PLATFORM } from 'vs/platform/userDataSync/common/userDataSync';
+import { isNonEmptyArray } from '../../../base/common/arrays.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Event } from '../../../base/common/event.js';
+import { parse } from '../../../base/common/json.js';
+import { OperatingSystem, OS } from '../../../base/common/platform.js';
+import { isUndefined } from '../../../base/common/types.js';
+import { URI } from '../../../base/common/uri.js';
+import { localize } from '../../../nls.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { FileOperationError, FileOperationResult, IFileService } from '../../files/common/files.js';
+import { ILogService } from '../../log/common/log.js';
+import { IStorageService } from '../../storage/common/storage.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
+import { IUriIdentityService } from '../../uriIdentity/common/uriIdentity.js';
+import { IUserDataProfile, IUserDataProfilesService } from '../../userDataProfile/common/userDataProfile.js';
+import { AbstractInitializer, AbstractJsonFileSynchroniser, IAcceptResult, IFileResourcePreview, IMergeResult } from './abstractSynchronizer.js';
+import { merge } from './keybindingsMerge.js';
+import { Change, IRemoteUserData, IUserDataSyncLocalStoreService, IUserDataSyncConfiguration, IUserDataSynchroniser, IUserDataSyncLogService, IUserDataSyncEnablementService, IUserDataSyncStoreService, IUserDataSyncUtilService, SyncResource, UserDataSyncError, UserDataSyncErrorCode, USER_DATA_SYNC_SCHEME, CONFIG_SYNC_KEYBINDINGS_PER_PLATFORM } from './userDataSync.js';
 
 interface ISyncContent {
 	mac?: string;
diff --git a/src/vs/platform/userDataSync/common/settingsMerge.ts b/src/vs/platform/userDataSync/common/settingsMerge.ts
index fdda70dfc8c..a05ae53ff86 100644
--- a/src/vs/platform/userDataSync/common/settingsMerge.ts
+++ b/src/vs/platform/userDataSync/common/settingsMerge.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { distinct } from 'vs/base/common/arrays';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { JSONVisitor, parse, visit } from 'vs/base/common/json';
-import { applyEdits, setProperty, withFormatting } from 'vs/base/common/jsonEdit';
-import { Edit, FormattingOptions, getEOL } from 'vs/base/common/jsonFormatter';
-import * as objects from 'vs/base/common/objects';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import * as contentUtil from 'vs/platform/userDataSync/common/content';
-import { getDisallowedIgnoredSettings, IConflictSetting } from 'vs/platform/userDataSync/common/userDataSync';
+import { distinct } from '../../../base/common/arrays.js';
+import { IStringDictionary } from '../../../base/common/collections.js';
+import { JSONVisitor, parse, visit } from '../../../base/common/json.js';
+import { applyEdits, setProperty, withFormatting } from '../../../base/common/jsonEdit.js';
+import { Edit, FormattingOptions, getEOL } from '../../../base/common/jsonFormatter.js';
+import * as objects from '../../../base/common/objects.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import * as contentUtil from './content.js';
+import { getDisallowedIgnoredSettings, IConflictSetting } from './userDataSync.js';
 
 export interface IMergeResult {
 	localContent: string | null;
diff --git a/src/vs/platform/userDataSync/common/settingsSync.ts b/src/vs/platform/userDataSync/common/settingsSync.ts
index b1c7523e8ef..9819dd97d4b 100644
--- a/src/vs/platform/userDataSync/common/settingsSync.ts
+++ b/src/vs/platform/userDataSync/common/settingsSync.ts
@@ -3,23 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Event } from 'vs/base/common/event';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ConfigurationModelParser } from 'vs/platform/configuration/common/configurationModels';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { FileOperationError, FileOperationResult, IFileService } from 'vs/platform/files/common/files';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { AbstractInitializer, AbstractJsonFileSynchroniser, IAcceptResult, IFileResourcePreview, IMergeResult } from 'vs/platform/userDataSync/common/abstractSynchronizer';
-import { getIgnoredSettings, isEmpty, merge, updateIgnoredSettings } from 'vs/platform/userDataSync/common/settingsMerge';
-import { Change, IRemoteUserData, IUserDataSyncLocalStoreService, IUserDataSyncConfiguration, IUserDataSynchroniser, IUserDataSyncLogService, IUserDataSyncEnablementService, IUserDataSyncStoreService, IUserDataSyncUtilService, SyncResource, UserDataSyncError, UserDataSyncErrorCode, USER_DATA_SYNC_CONFIGURATION_SCOPE, USER_DATA_SYNC_SCHEME, IUserDataResourceManifest } from 'vs/platform/userDataSync/common/userDataSync';
+import { distinct } from '../../../base/common/arrays.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Event } from '../../../base/common/event.js';
+import { URI } from '../../../base/common/uri.js';
+import { localize } from '../../../nls.js';
+import { ConfigurationTarget, IConfigurationService } from '../../configuration/common/configuration.js';
+import { ConfigurationModelParser } from '../../configuration/common/configurationModels.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { IExtensionManagementService } from '../../extensionManagement/common/extensionManagement.js';
+import { ExtensionType } from '../../extensions/common/extensions.js';
+import { FileOperationError, FileOperationResult, IFileService } from '../../files/common/files.js';
+import { IStorageService } from '../../storage/common/storage.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
+import { IUriIdentityService } from '../../uriIdentity/common/uriIdentity.js';
+import { IUserDataProfile, IUserDataProfilesService } from '../../userDataProfile/common/userDataProfile.js';
+import { AbstractInitializer, AbstractJsonFileSynchroniser, IAcceptResult, IFileResourcePreview, IMergeResult } from './abstractSynchronizer.js';
+import { getIgnoredSettings, isEmpty, merge, updateIgnoredSettings } from './settingsMerge.js';
+import { Change, IRemoteUserData, IUserDataSyncLocalStoreService, IUserDataSyncConfiguration, IUserDataSynchroniser, IUserDataSyncLogService, IUserDataSyncEnablementService, IUserDataSyncStoreService, IUserDataSyncUtilService, SyncResource, UserDataSyncError, UserDataSyncErrorCode, USER_DATA_SYNC_CONFIGURATION_SCOPE, USER_DATA_SYNC_SCHEME, IUserDataResourceManifest, getIgnoredSettingsForExtension } from './userDataSync.js';
 
 interface ISettingsResourcePreview extends IFileResourcePreview {
 	previewResult: IMergeResult;
@@ -51,7 +53,7 @@ export class SettingsSynchroniser extends AbstractJsonFileSynchroniser implement
 	readonly acceptedResource: URI = this.previewResource.with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'accepted' });
 
 	constructor(
-		profile: IUserDataProfile,
+		private readonly profile: IUserDataProfile,
 		collection: string | undefined,
 		@IFileService fileService: IFileService,
 		@IEnvironmentService environmentService: IEnvironmentService,
@@ -315,21 +317,39 @@ export class SettingsSynchroniser extends AbstractJsonFileSynchroniser implement
 		return { settings };
 	}
 
-	private _defaultIgnoredSettings: Promise<string[]> | undefined = undefined;
+	private coreIgnoredSettings: Promise<string[]> | undefined = undefined;
+	private systemExtensionsIgnoredSettings: Promise<string[]> | undefined = undefined;
+	private userExtensionsIgnoredSettings: Promise<string[]> | undefined = undefined;
 	private async getIgnoredSettings(content?: string): Promise<string[]> {
-		if (!this._defaultIgnoredSettings) {
-			this._defaultIgnoredSettings = this.userDataSyncUtilService.resolveDefaultIgnoredSettings();
+		if (!this.coreIgnoredSettings) {
+			this.coreIgnoredSettings = this.userDataSyncUtilService.resolveDefaultCoreIgnoredSettings();
+		}
+		if (!this.systemExtensionsIgnoredSettings) {
+			this.systemExtensionsIgnoredSettings = this.getIgnoredSettingForSystemExtensions();
+		}
+		if (!this.userExtensionsIgnoredSettings) {
+			this.userExtensionsIgnoredSettings = this.getIgnoredSettingForUserExtensions();
 			const disposable = this._register(Event.any<any>(
 				Event.filter(this.extensionManagementService.onDidInstallExtensions, (e => e.some(({ local }) => !!local))),
 				Event.filter(this.extensionManagementService.onDidUninstallExtension, (e => !e.error)))(() => {
 					disposable.dispose();
-					this._defaultIgnoredSettings = undefined;
+					this.userExtensionsIgnoredSettings = undefined;
 				}));
 		}
-		const defaultIgnoredSettings = await this._defaultIgnoredSettings;
+		const defaultIgnoredSettings = (await Promise.all([this.coreIgnoredSettings, this.systemExtensionsIgnoredSettings, this.userExtensionsIgnoredSettings])).flat();
 		return getIgnoredSettings(defaultIgnoredSettings, this.configurationService, content);
 	}
 
+	private async getIgnoredSettingForSystemExtensions(): Promise<string[]> {
+		const systemExtensions = await this.extensionManagementService.getInstalled(ExtensionType.System);
+		return distinct(systemExtensions.map(e => getIgnoredSettingsForExtension(e.manifest)).flat());
+	}
+
+	private async getIgnoredSettingForUserExtensions(): Promise<string[]> {
+		const userExtensions = await this.extensionManagementService.getInstalled(ExtensionType.User, this.profile.extensionsResource);
+		return distinct(userExtensions.map(e => getIgnoredSettingsForExtension(e.manifest)).flat());
+	}
+
 	private validateContent(content: string): void {
 		if (this.hasErrors(content, false)) {
 			throw new UserDataSyncError(localize('errorInvalidSettings', "Unable to sync settings as there are errors/warning in settings file."), UserDataSyncErrorCode.LocalInvalidContent, this.resource);
diff --git a/src/vs/platform/userDataSync/common/snippetsMerge.ts b/src/vs/platform/userDataSync/common/snippetsMerge.ts
index 4dd6a879757..92666590450 100644
--- a/src/vs/platform/userDataSync/common/snippetsMerge.ts
+++ b/src/vs/platform/userDataSync/common/snippetsMerge.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IStringDictionary } from 'vs/base/common/collections';
+import { IStringDictionary } from '../../../base/common/collections.js';
 
 export interface IMergeResult {
 	local: {
diff --git a/src/vs/platform/userDataSync/common/snippetsSync.ts b/src/vs/platform/userDataSync/common/snippetsSync.ts
index a538e9e7af4..abf3eb63207 100644
--- a/src/vs/platform/userDataSync/common/snippetsSync.ts
+++ b/src/vs/platform/userDataSync/common/snippetsSync.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { Event } from 'vs/base/common/event';
-import { deepClone } from 'vs/base/common/objects';
-import { URI } from 'vs/base/common/uri';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { FileOperationError, FileOperationResult, IFileContent, IFileService, IFileStat } from 'vs/platform/files/common/files';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { AbstractInitializer, AbstractSynchroniser, IAcceptResult, IFileResourcePreview, IMergeResult } from 'vs/platform/userDataSync/common/abstractSynchronizer';
-import { areSame, IMergeResult as ISnippetsMergeResult, merge } from 'vs/platform/userDataSync/common/snippetsMerge';
-import { Change, IRemoteUserData, ISyncData, IUserDataSyncLocalStoreService, IUserDataSynchroniser, IUserDataSyncLogService, IUserDataSyncEnablementService, IUserDataSyncStoreService, SyncResource, USER_DATA_SYNC_SCHEME } from 'vs/platform/userDataSync/common/userDataSync';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { IStringDictionary } from '../../../base/common/collections.js';
+import { Event } from '../../../base/common/event.js';
+import { deepClone } from '../../../base/common/objects.js';
+import { URI } from '../../../base/common/uri.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { FileOperationError, FileOperationResult, IFileContent, IFileService, IFileStat } from '../../files/common/files.js';
+import { IStorageService } from '../../storage/common/storage.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
+import { IUriIdentityService } from '../../uriIdentity/common/uriIdentity.js';
+import { IUserDataProfile, IUserDataProfilesService } from '../../userDataProfile/common/userDataProfile.js';
+import { AbstractInitializer, AbstractSynchroniser, IAcceptResult, IFileResourcePreview, IMergeResult } from './abstractSynchronizer.js';
+import { areSame, IMergeResult as ISnippetsMergeResult, merge } from './snippetsMerge.js';
+import { Change, IRemoteUserData, ISyncData, IUserDataSyncLocalStoreService, IUserDataSynchroniser, IUserDataSyncLogService, IUserDataSyncEnablementService, IUserDataSyncStoreService, SyncResource, USER_DATA_SYNC_SCHEME } from './userDataSync.js';
 
 interface ISnippetsResourcePreview extends IFileResourcePreview {
 	previewResult: IMergeResult;
diff --git a/src/vs/platform/userDataSync/common/tasksSync.ts b/src/vs/platform/userDataSync/common/tasksSync.ts
index 3c764f33bdd..088c29044ac 100644
--- a/src/vs/platform/userDataSync/common/tasksSync.ts
+++ b/src/vs/platform/userDataSync/common/tasksSync.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { URI } from 'vs/base/common/uri';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IFileService } from 'vs/platform/files/common/files';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { AbstractFileSynchroniser, AbstractInitializer, IAcceptResult, IFileResourcePreview, IMergeResult } from 'vs/platform/userDataSync/common/abstractSynchronizer';
-import { Change, IRemoteUserData, IUserDataSyncLocalStoreService, IUserDataSyncConfiguration, IUserDataSynchroniser, IUserDataSyncLogService, IUserDataSyncEnablementService, IUserDataSyncStoreService, SyncResource, USER_DATA_SYNC_SCHEME } from 'vs/platform/userDataSync/common/userDataSync';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { URI } from '../../../base/common/uri.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { IFileService } from '../../files/common/files.js';
+import { ILogService } from '../../log/common/log.js';
+import { IStorageService } from '../../storage/common/storage.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
+import { IUriIdentityService } from '../../uriIdentity/common/uriIdentity.js';
+import { IUserDataProfile, IUserDataProfilesService } from '../../userDataProfile/common/userDataProfile.js';
+import { AbstractFileSynchroniser, AbstractInitializer, IAcceptResult, IFileResourcePreview, IMergeResult } from './abstractSynchronizer.js';
+import { Change, IRemoteUserData, IUserDataSyncLocalStoreService, IUserDataSyncConfiguration, IUserDataSynchroniser, IUserDataSyncLogService, IUserDataSyncEnablementService, IUserDataSyncStoreService, SyncResource, USER_DATA_SYNC_SCHEME } from './userDataSync.js';
 
 interface ITasksSyncContent {
 	tasks?: string;
diff --git a/src/vs/platform/userDataSync/common/userDataAutoSyncService.ts b/src/vs/platform/userDataSync/common/userDataAutoSyncService.ts
index f6ebd219402..f868cccd7e3 100644
--- a/src/vs/platform/userDataSync/common/userDataAutoSyncService.ts
+++ b/src/vs/platform/userDataSync/common/userDataAutoSyncService.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancelablePromise, createCancelablePromise, disposableTimeout, ThrottledDelayer, timeout } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { toLocalISOString } from 'vs/base/common/date';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { isCancellationError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, IDisposable, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { isWeb } from 'vs/base/common/platform';
-import { isEqual } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IUserDataSyncTask, IUserDataAutoSyncService, IUserDataManifest, IUserDataSyncLogService, IUserDataSyncEnablementService, IUserDataSyncService, IUserDataSyncStoreManagementService, IUserDataSyncStoreService, UserDataAutoSyncError, UserDataSyncError, UserDataSyncErrorCode } from 'vs/platform/userDataSync/common/userDataSync';
-import { IUserDataSyncAccountService } from 'vs/platform/userDataSync/common/userDataSyncAccount';
-import { IUserDataSyncMachinesService } from 'vs/platform/userDataSync/common/userDataSyncMachines';
+import { CancelablePromise, createCancelablePromise, disposableTimeout, ThrottledDelayer, timeout } from '../../../base/common/async.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { toLocalISOString } from '../../../base/common/date.js';
+import { toErrorMessage } from '../../../base/common/errorMessage.js';
+import { isCancellationError } from '../../../base/common/errors.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable, IDisposable, MutableDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { isWeb } from '../../../base/common/platform.js';
+import { isEqual } from '../../../base/common/resources.js';
+import { URI } from '../../../base/common/uri.js';
+import { localize } from '../../../nls.js';
+import { IProductService } from '../../product/common/productService.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../storage/common/storage.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
+import { IUserDataSyncTask, IUserDataAutoSyncService, IUserDataManifest, IUserDataSyncLogService, IUserDataSyncEnablementService, IUserDataSyncService, IUserDataSyncStoreManagementService, IUserDataSyncStoreService, UserDataAutoSyncError, UserDataSyncError, UserDataSyncErrorCode } from './userDataSync.js';
+import { IUserDataSyncAccountService } from './userDataSyncAccount.js';
+import { IUserDataSyncMachinesService } from './userDataSyncMachines.js';
 
 type AutoSyncClassification = {
 	owner: 'sandy081';
diff --git a/src/vs/platform/userDataSync/common/userDataProfilesManifestMerge.ts b/src/vs/platform/userDataSync/common/userDataProfilesManifestMerge.ts
index a6957351fc5..6e5b0108065 100644
--- a/src/vs/platform/userDataSync/common/userDataProfilesManifestMerge.ts
+++ b/src/vs/platform/userDataSync/common/userDataProfilesManifestMerge.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { equals } from 'vs/base/common/objects';
-import { IUserDataProfile, UseDefaultProfileFlags } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { ISyncUserDataProfile } from 'vs/platform/userDataSync/common/userDataSync';
+import { equals } from '../../../base/common/objects.js';
+import { IUserDataProfile, UseDefaultProfileFlags } from '../../userDataProfile/common/userDataProfile.js';
+import { ISyncUserDataProfile } from './userDataSync.js';
 
 interface IRelaxedMergeResult {
 	local: { added: ISyncUserDataProfile[]; removed: IUserDataProfile[]; updated: ISyncUserDataProfile[] };
diff --git a/src/vs/platform/userDataSync/common/userDataProfilesManifestSync.ts b/src/vs/platform/userDataSync/common/userDataProfilesManifestSync.ts
index 13b099ee13e..2f72b653ba6 100644
--- a/src/vs/platform/userDataSync/common/userDataProfilesManifestSync.ts
+++ b/src/vs/platform/userDataSync/common/userDataProfilesManifestSync.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { toFormattedString } from 'vs/base/common/jsonFormatter';
-import { URI } from 'vs/base/common/uri';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { AbstractSynchroniser, IAcceptResult, IMergeResult, IResourcePreview } from 'vs/platform/userDataSync/common/abstractSynchronizer';
-import { merge } from 'vs/platform/userDataSync/common/userDataProfilesManifestMerge';
-import { Change, IRemoteUserData, IUserDataSyncLocalStoreService, IUserDataSynchroniser, IUserDataSyncLogService, IUserDataSyncEnablementService, IUserDataSyncStoreService, SyncResource, USER_DATA_SYNC_SCHEME, ISyncUserDataProfile, ISyncData, IUserDataResourceManifest, UserDataSyncError, UserDataSyncErrorCode } from 'vs/platform/userDataSync/common/userDataSync';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { toFormattedString } from '../../../base/common/jsonFormatter.js';
+import { URI } from '../../../base/common/uri.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { IFileService } from '../../files/common/files.js';
+import { IStorageService } from '../../storage/common/storage.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
+import { IUriIdentityService } from '../../uriIdentity/common/uriIdentity.js';
+import { IUserDataProfile, IUserDataProfilesService } from '../../userDataProfile/common/userDataProfile.js';
+import { AbstractSynchroniser, IAcceptResult, IMergeResult, IResourcePreview } from './abstractSynchronizer.js';
+import { merge } from './userDataProfilesManifestMerge.js';
+import { Change, IRemoteUserData, IUserDataSyncLocalStoreService, IUserDataSynchroniser, IUserDataSyncLogService, IUserDataSyncEnablementService, IUserDataSyncStoreService, SyncResource, USER_DATA_SYNC_SCHEME, ISyncUserDataProfile, ISyncData, IUserDataResourceManifest, UserDataSyncError, UserDataSyncErrorCode } from './userDataSync.js';
 
 interface IUserDataProfileManifestResourceMergeResult extends IAcceptResult {
 	readonly local: { added: ISyncUserDataProfile[]; removed: IUserDataProfile[]; updated: ISyncUserDataProfile[] };
diff --git a/src/vs/platform/userDataSync/common/userDataSync.ts b/src/vs/platform/userDataSync/common/userDataSync.ts
index 084755420cb..05a93efd69b 100644
--- a/src/vs/platform/userDataSync/common/userDataSync.ts
+++ b/src/vs/platform/userDataSync/common/userDataSync.ts
@@ -3,39 +3,68 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { distinct } from 'vs/base/common/arrays';
-import { VSBufferReadableStream } from 'vs/base/common/buffer';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { Event } from 'vs/base/common/event';
-import { FormattingOptions } from 'vs/base/common/jsonFormatter';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { IExtUri } from 'vs/base/common/resources';
-import { isObject, isString } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { IHeaders } from 'vs/base/parts/request/common/request';
-import { localize } from 'vs/nls';
-import { allSettings, ConfigurationScope, Extensions as ConfigurationExtensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { EXTENSION_IDENTIFIER_PATTERN, IExtensionIdentifier } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { Extensions as JSONExtensions, IJSONContributionRegistry } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
-import { ILogService } from 'vs/platform/log/common/log';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IUserDataProfile, UseDefaultProfileFlags } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IUserDataSyncMachine } from 'vs/platform/userDataSync/common/userDataSyncMachines';
+import { distinct } from '../../../base/common/arrays.js';
+import { VSBufferReadableStream } from '../../../base/common/buffer.js';
+import { IStringDictionary } from '../../../base/common/collections.js';
+import { Event } from '../../../base/common/event.js';
+import { FormattingOptions } from '../../../base/common/jsonFormatter.js';
+import { IJSONSchema } from '../../../base/common/jsonSchema.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { IExtUri } from '../../../base/common/resources.js';
+import { isObject, isString } from '../../../base/common/types.js';
+import { URI } from '../../../base/common/uri.js';
+import { IHeaders } from '../../../base/parts/request/common/request.js';
+import { localize } from '../../../nls.js';
+import { allSettings, ConfigurationScope, Extensions as ConfigurationExtensions, IConfigurationRegistry, IRegisteredConfigurationPropertySchema, getAllConfigurationProperties, parseScope } from '../../configuration/common/configurationRegistry.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { EXTENSION_IDENTIFIER_PATTERN, IExtensionIdentifier } from '../../extensionManagement/common/extensionManagement.js';
+import { IExtensionManifest } from '../../extensions/common/extensions.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { Extensions as JSONExtensions, IJSONContributionRegistry } from '../../jsonschemas/common/jsonContributionRegistry.js';
+import { ILogService } from '../../log/common/log.js';
+import { Registry } from '../../registry/common/platform.js';
+import { IUserDataProfile, UseDefaultProfileFlags } from '../../userDataProfile/common/userDataProfile.js';
+import { IUserDataSyncMachine } from './userDataSyncMachines.js';
 
 export function getDisallowedIgnoredSettings(): string[] {
 	const allSettings = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).getConfigurationProperties();
 	return Object.keys(allSettings).filter(setting => !!allSettings[setting].disallowSyncIgnore);
 }
 
-export function getDefaultIgnoredSettings(): string[] {
+export function getDefaultIgnoredSettings(excludeExtensions: boolean = false): string[] {
 	const allSettings = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).getConfigurationProperties();
-	const ignoreSyncSettings = Object.keys(allSettings).filter(setting => !!allSettings[setting].ignoreSync);
-	const machineSettings = Object.keys(allSettings).filter(setting => allSettings[setting].scope === ConfigurationScope.MACHINE || allSettings[setting].scope === ConfigurationScope.MACHINE_OVERRIDABLE);
+	const ignoredSettings = getIgnoredSettings(allSettings, excludeExtensions);
 	const disallowedSettings = getDisallowedIgnoredSettings();
-	return distinct([...ignoreSyncSettings, ...machineSettings, ...disallowedSettings]);
+	return distinct([...ignoredSettings, ...disallowedSettings]);
+}
+
+export function getIgnoredSettingsForExtension(manifest: IExtensionManifest): string[] {
+	if (!manifest.contributes?.configuration) {
+		return [];
+	}
+	const configurations = Array.isArray(manifest.contributes.configuration) ? manifest.contributes.configuration : [manifest.contributes.configuration];
+	if (!configurations.length) {
+		return [];
+	}
+	const properties = getAllConfigurationProperties(configurations);
+	return getIgnoredSettings(properties, false);
+}
+
+function getIgnoredSettings(properties: IStringDictionary<IRegisteredConfigurationPropertySchema>, excludeExtensions: boolean): string[] {
+	const ignoredSettings = new Set<string>();
+	for (const key in properties) {
+		if (excludeExtensions && !!properties[key].source) {
+			continue;
+		}
+		const scope = isString(properties[key].scope) ? parseScope(properties[key].scope) : properties[key].scope;
+		if (properties[key].ignoreSync
+			|| scope === ConfigurationScope.MACHINE
+			|| scope === ConfigurationScope.MACHINE_OVERRIDABLE
+		) {
+			ignoredSettings.add(key);
+		}
+	}
+	return [...ignoredSettings.values()];
 }
 
 export const USER_DATA_SYNC_CONFIGURATION_SCOPE = 'settingsSync';
@@ -591,7 +620,7 @@ export interface IUserDataSyncUtilService {
 	readonly _serviceBrand: undefined;
 	resolveUserBindings(userbindings: string[]): Promise<IStringDictionary<string>>;
 	resolveFormattingOptions(resource: URI): Promise<FormattingOptions>;
-	resolveDefaultIgnoredSettings(): Promise<string[]>;
+	resolveDefaultCoreIgnoredSettings(): Promise<string[]>;
 }
 
 export const IUserDataSyncLogService = createDecorator<IUserDataSyncLogService>('IUserDataSyncLogService');
diff --git a/src/vs/platform/userDataSync/common/userDataSyncAccount.ts b/src/vs/platform/userDataSync/common/userDataSyncAccount.ts
index eace7baea36..1de4b5a9220 100644
--- a/src/vs/platform/userDataSync/common/userDataSyncAccount.ts
+++ b/src/vs/platform/userDataSync/common/userDataSyncAccount.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IUserDataSyncLogService, IUserDataSyncStoreService, UserDataSyncErrorCode } from 'vs/platform/userDataSync/common/userDataSync';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { IUserDataSyncLogService, IUserDataSyncStoreService, UserDataSyncErrorCode } from './userDataSync.js';
 
 export interface IUserDataSyncAccount {
 	readonly authenticationProviderId: string;
diff --git a/src/vs/platform/userDataSync/common/userDataSyncEnablementService.ts b/src/vs/platform/userDataSync/common/userDataSyncEnablementService.ts
index e1606de959c..c23c49aa8ea 100644
--- a/src/vs/platform/userDataSync/common/userDataSyncEnablementService.ts
+++ b/src/vs/platform/userDataSync/common/userDataSyncEnablementService.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { isWeb } from 'vs/base/common/platform';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IApplicationStorageValueChangeEvent, IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { ALL_SYNC_RESOURCES, getEnablementKey, IUserDataSyncEnablementService, IUserDataSyncStoreManagementService, SyncResource } from 'vs/platform/userDataSync/common/userDataSync';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable, DisposableStore } from '../../../base/common/lifecycle.js';
+import { isWeb } from '../../../base/common/platform.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { IApplicationStorageValueChangeEvent, IStorageService, StorageScope, StorageTarget } from '../../storage/common/storage.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
+import { ALL_SYNC_RESOURCES, getEnablementKey, IUserDataSyncEnablementService, IUserDataSyncStoreManagementService, SyncResource } from './userDataSync.js';
 
 type SyncEnablementClassification = {
 	owner: 'sandy081';
diff --git a/src/vs/platform/userDataSync/common/userDataSyncIpc.ts b/src/vs/platform/userDataSync/common/userDataSyncIpc.ts
index ede978060d9..9bd2359a9c0 100644
--- a/src/vs/platform/userDataSync/common/userDataSyncIpc.ts
+++ b/src/vs/platform/userDataSync/common/userDataSyncIpc.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { IChannel, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { IUserDataSyncStore, IUserDataSyncStoreManagementService, UserDataSyncStoreType } from 'vs/platform/userDataSync/common/userDataSync';
-import { IUserDataSyncAccount, IUserDataSyncAccountService } from 'vs/platform/userDataSync/common/userDataSyncAccount';
-import { AbstractUserDataSyncStoreManagementService } from 'vs/platform/userDataSync/common/userDataSyncStoreService';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { URI } from '../../../base/common/uri.js';
+import { IChannel, IServerChannel } from '../../../base/parts/ipc/common/ipc.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { IProductService } from '../../product/common/productService.js';
+import { IStorageService } from '../../storage/common/storage.js';
+import { IUserDataSyncStore, IUserDataSyncStoreManagementService, UserDataSyncStoreType } from './userDataSync.js';
+import { IUserDataSyncAccount, IUserDataSyncAccountService } from './userDataSyncAccount.js';
+import { AbstractUserDataSyncStoreManagementService } from './userDataSyncStoreService.js';
 
 export class UserDataSyncAccountServiceChannel implements IServerChannel {
 	constructor(private readonly service: IUserDataSyncAccountService) { }
diff --git a/src/vs/platform/userDataSync/common/userDataSyncLocalStoreService.ts b/src/vs/platform/userDataSync/common/userDataSyncLocalStoreService.ts
index 28d2400cfee..53acee377e0 100644
--- a/src/vs/platform/userDataSync/common/userDataSyncLocalStoreService.ts
+++ b/src/vs/platform/userDataSync/common/userDataSyncLocalStoreService.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Promises } from 'vs/base/common/async';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { toLocalISOString } from 'vs/base/common/date';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { joinPath } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { FileOperationResult, IFileService, IFileStat, toFileOperationResult } from 'vs/platform/files/common/files';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { ALL_SYNC_RESOURCES, IResourceRefHandle, IUserDataSyncLocalStoreService, IUserDataSyncLogService, SyncResource } from 'vs/platform/userDataSync/common/userDataSync';
+import { Promises } from '../../../base/common/async.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { toLocalISOString } from '../../../base/common/date.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { joinPath } from '../../../base/common/resources.js';
+import { URI } from '../../../base/common/uri.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { FileOperationResult, IFileService, IFileStat, toFileOperationResult } from '../../files/common/files.js';
+import { IUserDataProfilesService } from '../../userDataProfile/common/userDataProfile.js';
+import { ALL_SYNC_RESOURCES, IResourceRefHandle, IUserDataSyncLocalStoreService, IUserDataSyncLogService, SyncResource } from './userDataSync.js';
 
 export class UserDataSyncLocalStoreService extends Disposable implements IUserDataSyncLocalStoreService {
 
@@ -53,7 +53,7 @@ export class UserDataSyncLocalStoreService extends Disposable implements IUserDa
 
 		if (stat.children) {
 			for (const child of stat.children) {
-				if (child.isDirectory && !this.userDataProfilesService.profiles.some(profile => profile.id === child.name)) {
+				if (child.isDirectory && !ALL_SYNC_RESOURCES.includes(<SyncResource>child.name) && !this.userDataProfilesService.profiles.some(profile => profile.id === child.name)) {
 					try {
 						this.logService.info('Deleting non existing profile from backup', child.resource.path);
 						await this.fileService.del(child.resource, { recursive: true });
diff --git a/src/vs/platform/userDataSync/common/userDataSyncLog.ts b/src/vs/platform/userDataSync/common/userDataSyncLog.ts
index 4dffdbc947e..464be1fa944 100644
--- a/src/vs/platform/userDataSync/common/userDataSyncLog.ts
+++ b/src/vs/platform/userDataSync/common/userDataSyncLog.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { joinPath } from 'vs/base/common/resources';
-import { localize } from 'vs/nls';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { AbstractLogger, ILogger, ILoggerService } from 'vs/platform/log/common/log';
-import { IUserDataSyncLogService, USER_DATA_SYNC_LOG_ID } from 'vs/platform/userDataSync/common/userDataSync';
+import { joinPath } from '../../../base/common/resources.js';
+import { localize } from '../../../nls.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { AbstractLogger, ILogger, ILoggerService } from '../../log/common/log.js';
+import { IUserDataSyncLogService, USER_DATA_SYNC_LOG_ID } from './userDataSync.js';
 
 export class UserDataSyncLogService extends AbstractLogger implements IUserDataSyncLogService {
 
diff --git a/src/vs/platform/userDataSync/common/userDataSyncMachines.ts b/src/vs/platform/userDataSync/common/userDataSyncMachines.ts
index ad3f8f63a1c..1c36206421a 100644
--- a/src/vs/platform/userDataSync/common/userDataSyncMachines.ts
+++ b/src/vs/platform/userDataSync/common/userDataSyncMachines.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { isAndroid, isChrome, isEdge, isFirefox, isSafari, isWeb, Platform, platform, PlatformToString } from 'vs/base/common/platform';
-import { escapeRegExpCharacters } from 'vs/base/common/strings';
-import { localize } from 'vs/nls';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IFileService } from 'vs/platform/files/common/files';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { getServiceMachineId } from 'vs/platform/externalServices/common/serviceMachineId';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IUserData, IUserDataManifest, IUserDataSyncLogService, IUserDataSyncStoreService } from 'vs/platform/userDataSync/common/userDataSync';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { isAndroid, isChrome, isEdge, isFirefox, isSafari, isWeb, Platform, platform, PlatformToString } from '../../../base/common/platform.js';
+import { escapeRegExpCharacters } from '../../../base/common/strings.js';
+import { localize } from '../../../nls.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { IFileService } from '../../files/common/files.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { IProductService } from '../../product/common/productService.js';
+import { getServiceMachineId } from '../../externalServices/common/serviceMachineId.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../storage/common/storage.js';
+import { IUserData, IUserDataManifest, IUserDataSyncLogService, IUserDataSyncStoreService } from './userDataSync.js';
 
 export interface IMachineData {
 	id: string;
diff --git a/src/vs/platform/userDataSync/common/userDataSyncResourceProvider.ts b/src/vs/platform/userDataSync/common/userDataSyncResourceProvider.ts
index d68b3ee4103..6fc54bd137a 100644
--- a/src/vs/platform/userDataSync/common/userDataSyncResourceProvider.ts
+++ b/src/vs/platform/userDataSync/common/userDataSyncResourceProvider.ts
@@ -3,29 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IExtUri } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IFileService } from 'vs/platform/files/common/files';
-import { getServiceMachineId } from 'vs/platform/externalServices/common/serviceMachineId';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { ISyncData, ISyncResourceHandle, IUserData, IUserDataSyncLocalStoreService, IUserDataSyncLogService, IUserDataSyncStoreService, SyncResource, UserDataSyncError, UserDataSyncErrorCode, USER_DATA_SYNC_SCHEME, IUserDataSyncResourceProviderService, ISyncUserDataProfile, CONFIG_SYNC_KEYBINDINGS_PER_PLATFORM, IUserDataSyncResource } from 'vs/platform/userDataSync/common/userDataSync';
-import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { isSyncData } from 'vs/platform/userDataSync/common/abstractSynchronizer';
-import { parseSnippets } from 'vs/platform/userDataSync/common/snippetsSync';
-import { parseSettingsSyncContent } from 'vs/platform/userDataSync/common/settingsSync';
-import { getKeybindingsContentFromSyncContent } from 'vs/platform/userDataSync/common/keybindingsSync';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { getTasksContentFromSyncContent } from 'vs/platform/userDataSync/common/tasksSync';
-import { LocalExtensionsProvider, parseExtensions, stringify as stringifyExtensions } from 'vs/platform/userDataSync/common/extensionsSync';
-import { LocalGlobalStateProvider, stringify as stringifyGlobalState } from 'vs/platform/userDataSync/common/globalStateSync';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { parseUserDataProfilesManifest, stringifyLocalProfiles } from 'vs/platform/userDataSync/common/userDataProfilesManifestSync';
-import { toFormattedString } from 'vs/base/common/jsonFormatter';
-import { trim } from 'vs/base/common/strings';
-import { IMachinesData, IUserDataSyncMachine } from 'vs/platform/userDataSync/common/userDataSyncMachines';
+import { IExtUri } from '../../../base/common/resources.js';
+import { URI } from '../../../base/common/uri.js';
+import { localize } from '../../../nls.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { IFileService } from '../../files/common/files.js';
+import { getServiceMachineId } from '../../externalServices/common/serviceMachineId.js';
+import { IStorageService } from '../../storage/common/storage.js';
+import { IUriIdentityService } from '../../uriIdentity/common/uriIdentity.js';
+import { ISyncData, ISyncResourceHandle, IUserData, IUserDataSyncLocalStoreService, IUserDataSyncLogService, IUserDataSyncStoreService, SyncResource, UserDataSyncError, UserDataSyncErrorCode, USER_DATA_SYNC_SCHEME, IUserDataSyncResourceProviderService, ISyncUserDataProfile, CONFIG_SYNC_KEYBINDINGS_PER_PLATFORM, IUserDataSyncResource } from './userDataSync.js';
+import { IUserDataProfile, IUserDataProfilesService } from '../../userDataProfile/common/userDataProfile.js';
+import { isSyncData } from './abstractSynchronizer.js';
+import { parseSnippets } from './snippetsSync.js';
+import { parseSettingsSyncContent } from './settingsSync.js';
+import { getKeybindingsContentFromSyncContent } from './keybindingsSync.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { getTasksContentFromSyncContent } from './tasksSync.js';
+import { LocalExtensionsProvider, parseExtensions, stringify as stringifyExtensions } from './extensionsSync.js';
+import { LocalGlobalStateProvider, stringify as stringifyGlobalState } from './globalStateSync.js';
+import { IInstantiationService } from '../../instantiation/common/instantiation.js';
+import { parseUserDataProfilesManifest, stringifyLocalProfiles } from './userDataProfilesManifestSync.js';
+import { toFormattedString } from '../../../base/common/jsonFormatter.js';
+import { trim } from '../../../base/common/strings.js';
+import { IMachinesData, IUserDataSyncMachine } from './userDataSyncMachines.js';
 
 interface ISyncResourceUriInfo {
 	readonly remote: boolean;
diff --git a/src/vs/platform/userDataSync/common/userDataSyncService.ts b/src/vs/platform/userDataSync/common/userDataSyncService.ts
index 856003580d0..400e1d9582c 100644
--- a/src/vs/platform/userDataSync/common/userDataSyncService.ts
+++ b/src/vs/platform/userDataSync/common/userDataSyncService.ts
@@ -3,36 +3,36 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { equals } from 'vs/base/common/arrays';
-import { CancelablePromise, createCancelablePromise, RunOnceScheduler } from 'vs/base/common/async';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { isEqual } from 'vs/base/common/resources';
-import { isBoolean, isUndefined } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { ExtensionsSynchroniser } from 'vs/platform/userDataSync/common/extensionsSync';
-import { GlobalStateSynchroniser } from 'vs/platform/userDataSync/common/globalStateSync';
-import { KeybindingsSynchroniser } from 'vs/platform/userDataSync/common/keybindingsSync';
-import { SettingsSynchroniser } from 'vs/platform/userDataSync/common/settingsSync';
-import { SnippetsSynchroniser } from 'vs/platform/userDataSync/common/snippetsSync';
-import { TasksSynchroniser } from 'vs/platform/userDataSync/common/tasksSync';
-import { UserDataProfilesManifestSynchroniser } from 'vs/platform/userDataSync/common/userDataProfilesManifestSync';
+import { equals } from '../../../base/common/arrays.js';
+import { CancelablePromise, createCancelablePromise, RunOnceScheduler } from '../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../base/common/cancellation.js';
+import { toErrorMessage } from '../../../base/common/errorMessage.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { isEqual } from '../../../base/common/resources.js';
+import { isBoolean, isUndefined } from '../../../base/common/types.js';
+import { URI } from '../../../base/common/uri.js';
+import { generateUuid } from '../../../base/common/uuid.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { IExtensionGalleryService } from '../../extensionManagement/common/extensionManagement.js';
+import { IFileService } from '../../files/common/files.js';
+import { IInstantiationService } from '../../instantiation/common/instantiation.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../storage/common/storage.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
+import { IUserDataProfile, IUserDataProfilesService } from '../../userDataProfile/common/userDataProfile.js';
+import { ExtensionsSynchroniser } from './extensionsSync.js';
+import { GlobalStateSynchroniser } from './globalStateSync.js';
+import { KeybindingsSynchroniser } from './keybindingsSync.js';
+import { SettingsSynchroniser } from './settingsSync.js';
+import { SnippetsSynchroniser } from './snippetsSync.js';
+import { TasksSynchroniser } from './tasksSync.js';
+import { UserDataProfilesManifestSynchroniser } from './userDataProfilesManifestSync.js';
 import {
 	ALL_SYNC_RESOURCES, Change, createSyncHeaders, IUserDataManualSyncTask, IUserDataSyncResourceConflicts, IUserDataSyncResourceError,
 	IUserDataSyncResource, ISyncResourceHandle, IUserDataSyncTask, ISyncUserDataProfile, IUserDataManifest, IUserDataResourceManifest, IUserDataSyncConfiguration,
 	IUserDataSyncEnablementService, IUserDataSynchroniser, IUserDataSyncLogService, IUserDataSyncService, IUserDataSyncStoreManagementService, IUserDataSyncStoreService,
 	MergeState, SyncResource, SyncStatus, UserDataSyncError, UserDataSyncErrorCode, UserDataSyncStoreError, USER_DATA_SYNC_CONFIGURATION_SCOPE, IUserDataSyncResourceProviderService, IUserDataActivityData, IUserDataSyncLocalStoreService
-} from 'vs/platform/userDataSync/common/userDataSync';
+} from './userDataSync.js';
 
 type SyncErrorClassification = {
 	owner: 'sandy081';
@@ -254,29 +254,34 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
 	}
 
 	private async applyManualSync(manifest: IUserDataManifest | null, executionId: string, token: CancellationToken): Promise<void> {
-		const profileSynchronizers = this.getActiveProfileSynchronizers();
-		for (const profileSynchronizer of profileSynchronizers) {
-			if (token.isCancellationRequested) {
+		try {
+			this.setStatus(SyncStatus.Syncing);
+			const profileSynchronizers = this.getActiveProfileSynchronizers();
+			for (const profileSynchronizer of profileSynchronizers) {
+				if (token.isCancellationRequested) {
+					return;
+				}
+				await profileSynchronizer.apply(executionId, token);
+			}
+
+			const defaultProfileSynchronizer = profileSynchronizers.find(s => s.profile.isDefault);
+			if (!defaultProfileSynchronizer) {
 				return;
 			}
-			await profileSynchronizer.apply(executionId, token);
-		}
 
-		const defaultProfileSynchronizer = profileSynchronizers.find(s => s.profile.isDefault);
-		if (!defaultProfileSynchronizer) {
-			return;
-		}
+			const userDataProfileManifestSynchronizer = defaultProfileSynchronizer.enabled.find(s => s.resource === SyncResource.Profiles);
+			if (!userDataProfileManifestSynchronizer) {
+				return;
+			}
 
-		const userDataProfileManifestSynchronizer = defaultProfileSynchronizer.enabled.find(s => s.resource === SyncResource.Profiles);
-		if (!userDataProfileManifestSynchronizer) {
-			return;
-		}
-
-		// Sync remote profiles which are not synced locally
-		const remoteProfiles = (await (userDataProfileManifestSynchronizer as UserDataProfilesManifestSynchroniser).getRemoteSyncedProfiles(manifest?.latest ?? null)) || [];
-		const remoteProfilesToSync = remoteProfiles.filter(remoteProfile => profileSynchronizers.every(s => s.profile.id !== remoteProfile.id));
-		if (remoteProfilesToSync.length) {
-			await this.syncRemoteProfiles(remoteProfilesToSync, manifest, false, executionId, token);
+			// Sync remote profiles which are not synced locally
+			const remoteProfiles = (await (userDataProfileManifestSynchronizer as UserDataProfilesManifestSynchroniser).getRemoteSyncedProfiles(manifest?.latest ?? null)) || [];
+			const remoteProfilesToSync = remoteProfiles.filter(remoteProfile => profileSynchronizers.every(s => s.profile.id !== remoteProfile.id));
+			if (remoteProfilesToSync.length) {
+				await this.syncRemoteProfiles(remoteProfilesToSync, manifest, false, executionId, token);
+			}
+		} finally {
+			this.setStatus(SyncStatus.Idle);
 		}
 	}
 
@@ -702,8 +707,7 @@ class ProfileSynchronizer extends Disposable {
 			const [[synchronizer, , disposable]] = this._enabled.splice(index, 1);
 			disposable.dispose();
 			this.updateStatus();
-			Promise.allSettled([synchronizer.stop(), synchronizer.resetLocal()])
-				.then(null, error => this.logService.error(error));
+			synchronizer.stop().then(null, error => this.logService.error(error));
 		}
 	}
 
diff --git a/src/vs/platform/userDataSync/common/userDataSyncServiceIpc.ts b/src/vs/platform/userDataSync/common/userDataSyncServiceIpc.ts
index b052fe458c5..9516beebcf0 100644
--- a/src/vs/platform/userDataSync/common/userDataSyncServiceIpc.ts
+++ b/src/vs/platform/userDataSync/common/userDataSyncServiceIpc.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { IChannel, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IUserDataProfilesService, reviveProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { URI } from '../../../base/common/uri.js';
+import { IChannel, IServerChannel } from '../../../base/parts/ipc/common/ipc.js';
+import { ILogService } from '../../log/common/log.js';
+import { IUserDataProfilesService, reviveProfile } from '../../userDataProfile/common/userDataProfile.js';
 import {
 	IUserDataManualSyncTask, IUserDataSyncResourceConflicts, IUserDataSyncResourceError, IUserDataSyncResource, ISyncResourceHandle, IUserDataSyncTask, IUserDataSyncService,
 	SyncResource, SyncStatus, UserDataSyncError
-} from 'vs/platform/userDataSync/common/userDataSync';
+} from './userDataSync.js';
 
 type ManualSyncTaskEvent<T> = { manualSyncTaskId: string; data: T };
 
diff --git a/src/vs/platform/userDataSync/common/userDataSyncStoreService.ts b/src/vs/platform/userDataSync/common/userDataSyncStoreService.ts
index 32c4086b550..905148bab3f 100644
--- a/src/vs/platform/userDataSync/common/userDataSyncStoreService.ts
+++ b/src/vs/platform/userDataSync/common/userDataSyncStoreService.ts
@@ -3,28 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancelablePromise, createCancelablePromise, timeout } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { getErrorMessage, isCancellationError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { Mimes } from 'vs/base/common/mime';
-import { isWeb } from 'vs/base/common/platform';
-import { ConfigurationSyncStore } from 'vs/base/common/product';
-import { joinPath, relativePath } from 'vs/base/common/resources';
-import { isObject, isString } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { IHeaders, IRequestContext, IRequestOptions } from 'vs/base/parts/request/common/request';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { asJson, asText, asTextOrError, hasNoContent, IRequestService, isSuccess, isSuccess as isSuccessContext } from 'vs/platform/request/common/request';
-import { getServiceMachineId } from 'vs/platform/externalServices/common/serviceMachineId';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { HEADER_EXECUTION_ID, HEADER_OPERATION_ID, IAuthenticationProvider, IResourceRefHandle, IUserData, IUserDataManifest, IUserDataSyncLogService, IUserDataSyncStore, IUserDataSyncStoreManagementService, IUserDataSyncStoreService, ServerResource, SYNC_SERVICE_URL_TYPE, UserDataSyncErrorCode, UserDataSyncStoreError, UserDataSyncStoreType } from 'vs/platform/userDataSync/common/userDataSync';
-import { VSBufferReadableStream } from 'vs/base/common/buffer';
+import { CancelablePromise, createCancelablePromise, timeout } from '../../../base/common/async.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { getErrorMessage, isCancellationError } from '../../../base/common/errors.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable, DisposableStore, toDisposable } from '../../../base/common/lifecycle.js';
+import { Mimes } from '../../../base/common/mime.js';
+import { isWeb } from '../../../base/common/platform.js';
+import { ConfigurationSyncStore } from '../../../base/common/product.js';
+import { joinPath, relativePath } from '../../../base/common/resources.js';
+import { isObject, isString } from '../../../base/common/types.js';
+import { URI } from '../../../base/common/uri.js';
+import { generateUuid } from '../../../base/common/uuid.js';
+import { IHeaders, IRequestContext, IRequestOptions } from '../../../base/parts/request/common/request.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { IFileService } from '../../files/common/files.js';
+import { IProductService } from '../../product/common/productService.js';
+import { asJson, asText, asTextOrError, hasNoContent, IRequestService, isSuccess, isSuccess as isSuccessContext } from '../../request/common/request.js';
+import { getServiceMachineId } from '../../externalServices/common/serviceMachineId.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../storage/common/storage.js';
+import { HEADER_EXECUTION_ID, HEADER_OPERATION_ID, IAuthenticationProvider, IResourceRefHandle, IUserData, IUserDataManifest, IUserDataSyncLogService, IUserDataSyncStore, IUserDataSyncStoreManagementService, IUserDataSyncStoreService, ServerResource, SYNC_SERVICE_URL_TYPE, UserDataSyncErrorCode, UserDataSyncStoreError, UserDataSyncStoreType } from './userDataSync.js';
+import { VSBufferReadableStream } from '../../../base/common/buffer.js';
 
 const CONFIGURATION_SYNC_STORE_KEY = 'configurationSync.store';
 const SYNC_PREVIOUS_STORE = 'sync.previous.store';
@@ -148,7 +148,7 @@ export class UserDataSyncStoreClient extends Disposable {
 	private userDataSyncStoreUrl: URI | undefined;
 
 	private authToken: { token: string; type: string } | undefined;
-	private readonly commonHeadersPromise: Promise<{ [key: string]: string }>;
+	private readonly commonHeadersPromise: Promise<IHeaders>;
 	private readonly session: RequestsSession;
 
 	private _onTokenFailed = this._register(new Emitter<UserDataSyncErrorCode>());
diff --git a/src/vs/platform/userDataSync/node/userDataAutoSyncService.ts b/src/vs/platform/userDataSync/node/userDataAutoSyncService.ts
index 2bdbeea386e..f8642d424a4 100644
--- a/src/vs/platform/userDataSync/node/userDataAutoSyncService.ts
+++ b/src/vs/platform/userDataSync/node/userDataAutoSyncService.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 //
-import { Event } from 'vs/base/common/event';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { UserDataAutoSyncService as BaseUserDataAutoSyncService } from 'vs/platform/userDataSync/common/userDataAutoSyncService';
-import { IUserDataSyncEnablementService, IUserDataSyncLogService, IUserDataSyncService, IUserDataSyncStoreManagementService, IUserDataSyncStoreService } from 'vs/platform/userDataSync/common/userDataSync';
-import { IUserDataSyncAccountService } from 'vs/platform/userDataSync/common/userDataSyncAccount';
-import { IUserDataSyncMachinesService } from 'vs/platform/userDataSync/common/userDataSyncMachines';
+import { Event } from '../../../base/common/event.js';
+import { INativeHostService } from '../../native/common/native.js';
+import { IProductService } from '../../product/common/productService.js';
+import { IStorageService } from '../../storage/common/storage.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
+import { UserDataAutoSyncService as BaseUserDataAutoSyncService } from '../common/userDataAutoSyncService.js';
+import { IUserDataSyncEnablementService, IUserDataSyncLogService, IUserDataSyncService, IUserDataSyncStoreManagementService, IUserDataSyncStoreService } from '../common/userDataSync.js';
+import { IUserDataSyncAccountService } from '../common/userDataSyncAccount.js';
+import { IUserDataSyncMachinesService } from '../common/userDataSyncMachines.js';
 
 export class UserDataAutoSyncService extends BaseUserDataAutoSyncService {
 
diff --git a/src/vs/platform/userDataSync/test/common/extensionsMerge.test.ts b/src/vs/platform/userDataSync/test/common/extensionsMerge.test.ts
index 1ecc7b900a4..4a1c7540363 100644
--- a/src/vs/platform/userDataSync/test/common/extensionsMerge.test.ts
+++ b/src/vs/platform/userDataSync/test/common/extensionsMerge.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { merge } from 'vs/platform/userDataSync/common/extensionsMerge';
-import { ILocalSyncExtension, ISyncExtension } from 'vs/platform/userDataSync/common/userDataSync';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { merge } from '../../common/extensionsMerge.js';
+import { ILocalSyncExtension, ISyncExtension } from '../../common/userDataSync.js';
 
 suite('ExtensionsMerge', () => {
 
diff --git a/src/vs/platform/userDataSync/test/common/globalStateMerge.test.ts b/src/vs/platform/userDataSync/test/common/globalStateMerge.test.ts
index 7a17fac286d..88c15d78a78 100644
--- a/src/vs/platform/userDataSync/test/common/globalStateMerge.test.ts
+++ b/src/vs/platform/userDataSync/test/common/globalStateMerge.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { merge } from 'vs/platform/userDataSync/common/globalStateMerge';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { NullLogService } from '../../../log/common/log.js';
+import { merge } from '../../common/globalStateMerge.js';
 
 suite('GlobalStateMerge', () => {
 
diff --git a/src/vs/platform/userDataSync/test/common/globalStateSync.test.ts b/src/vs/platform/userDataSync/test/common/globalStateSync.test.ts
index 7d3ecaca732..a179f8e02d0 100644
--- a/src/vs/platform/userDataSync/test/common/globalStateSync.test.ts
+++ b/src/vs/platform/userDataSync/test/common/globalStateSync.test.ts
@@ -4,17 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { GlobalStateSynchroniser } from 'vs/platform/userDataSync/common/globalStateSync';
-import { IGlobalState, ISyncData, IUserDataSyncStoreService, SyncResource, SyncStatus } from 'vs/platform/userDataSync/common/userDataSync';
-import { IUserDataProfileStorageService } from 'vs/platform/userDataProfile/common/userDataProfileStorageService';
-import { UserDataSyncClient, UserDataSyncTestServer } from 'vs/platform/userDataSync/test/common/userDataSyncClient';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { runWithFakedTimers } from '../../../../base/test/common/timeTravelScheduler.js';
+import { IEnvironmentService } from '../../../environment/common/environment.js';
+import { IFileService } from '../../../files/common/files.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../storage/common/storage.js';
+import { IUserDataProfile, IUserDataProfilesService } from '../../../userDataProfile/common/userDataProfile.js';
+import { GlobalStateSynchroniser } from '../../common/globalStateSync.js';
+import { IGlobalState, ISyncData, IUserDataSyncStoreService, SyncResource, SyncStatus } from '../../common/userDataSync.js';
+import { IUserDataProfileStorageService } from '../../../userDataProfile/common/userDataProfileStorageService.js';
+import { UserDataSyncClient, UserDataSyncTestServer } from './userDataSyncClient.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 
 
 suite('GlobalStateSync', () => {
diff --git a/src/vs/platform/userDataSync/test/common/keybindingsMerge.test.ts b/src/vs/platform/userDataSync/test/common/keybindingsMerge.test.ts
index c7a1f8675e7..4b713816e10 100644
--- a/src/vs/platform/userDataSync/test/common/keybindingsMerge.test.ts
+++ b/src/vs/platform/userDataSync/test/common/keybindingsMerge.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { merge } from 'vs/platform/userDataSync/common/keybindingsMerge';
-import { TestUserDataSyncUtilService } from 'vs/platform/userDataSync/test/common/userDataSyncClient';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { merge } from '../../common/keybindingsMerge.js';
+import { TestUserDataSyncUtilService } from './userDataSyncClient.js';
 
 suite('KeybindingsMerge - No Conflicts', () => {
 
diff --git a/src/vs/platform/userDataSync/test/common/keybindingsSync.test.ts b/src/vs/platform/userDataSync/test/common/keybindingsSync.test.ts
index 660185fd8fd..00841916bbe 100644
--- a/src/vs/platform/userDataSync/test/common/keybindingsSync.test.ts
+++ b/src/vs/platform/userDataSync/test/common/keybindingsSync.test.ts
@@ -4,14 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IFileService } from 'vs/platform/files/common/files';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { getKeybindingsContentFromSyncContent, KeybindingsSynchroniser } from 'vs/platform/userDataSync/common/keybindingsSync';
-import { IUserDataSyncStoreService, SyncResource, UserDataSyncError, UserDataSyncErrorCode } from 'vs/platform/userDataSync/common/userDataSync';
-import { UserDataSyncClient, UserDataSyncTestServer } from 'vs/platform/userDataSync/test/common/userDataSyncClient';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { IFileService } from '../../../files/common/files.js';
+import { ILogService } from '../../../log/common/log.js';
+import { IUserDataProfilesService } from '../../../userDataProfile/common/userDataProfile.js';
+import { getKeybindingsContentFromSyncContent, KeybindingsSynchroniser } from '../../common/keybindingsSync.js';
+import { IUserDataSyncStoreService, SyncResource, UserDataSyncError, UserDataSyncErrorCode } from '../../common/userDataSync.js';
+import { UserDataSyncClient, UserDataSyncTestServer } from './userDataSyncClient.js';
 
 suite('KeybindingsSync', () => {
 
diff --git a/src/vs/platform/userDataSync/test/common/settingsMerge.test.ts b/src/vs/platform/userDataSync/test/common/settingsMerge.test.ts
index 625df21215c..0d6055ed1ce 100644
--- a/src/vs/platform/userDataSync/test/common/settingsMerge.test.ts
+++ b/src/vs/platform/userDataSync/test/common/settingsMerge.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { addSetting, merge, updateIgnoredSettings } from 'vs/platform/userDataSync/common/settingsMerge';
-import type { IConflictSetting } from 'vs/platform/userDataSync/common/userDataSync';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { addSetting, merge, updateIgnoredSettings } from '../../common/settingsMerge.js';
+import type { IConflictSetting } from '../../common/userDataSync.js';
 
 const formattingOptions = { eol: '\n', insertSpaces: false, tabSize: 4 };
 
diff --git a/src/vs/platform/userDataSync/test/common/settingsSync.test.ts b/src/vs/platform/userDataSync/test/common/settingsSync.test.ts
index 39246f25ce1..914ae83a5d4 100644
--- a/src/vs/platform/userDataSync/test/common/settingsSync.test.ts
+++ b/src/vs/platform/userDataSync/test/common/settingsSync.test.ts
@@ -4,18 +4,18 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { Event } from 'vs/base/common/event';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ConfigurationScope, Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { IFileService } from 'vs/platform/files/common/files';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { ISettingsSyncContent, parseSettingsSyncContent, SettingsSynchroniser } from 'vs/platform/userDataSync/common/settingsSync';
-import { ISyncData, IUserDataSyncStoreService, SyncResource, SyncStatus, UserDataSyncError, UserDataSyncErrorCode } from 'vs/platform/userDataSync/common/userDataSync';
-import { UserDataSyncClient, UserDataSyncTestServer } from 'vs/platform/userDataSync/test/common/userDataSyncClient';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { Event } from '../../../../base/common/event.js';
+import { runWithFakedTimers } from '../../../../base/test/common/timeTravelScheduler.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { IConfigurationService } from '../../../configuration/common/configuration.js';
+import { ConfigurationScope, Extensions, IConfigurationRegistry } from '../../../configuration/common/configurationRegistry.js';
+import { IFileService } from '../../../files/common/files.js';
+import { Registry } from '../../../registry/common/platform.js';
+import { IUserDataProfile, IUserDataProfilesService } from '../../../userDataProfile/common/userDataProfile.js';
+import { ISettingsSyncContent, parseSettingsSyncContent, SettingsSynchroniser } from '../../common/settingsSync.js';
+import { ISyncData, IUserDataSyncStoreService, SyncResource, SyncStatus, UserDataSyncError, UserDataSyncErrorCode } from '../../common/userDataSync.js';
+import { UserDataSyncClient, UserDataSyncTestServer } from './userDataSyncClient.js';
 
 suite('SettingsSync - Auto', () => {
 
diff --git a/src/vs/platform/userDataSync/test/common/snippetsMerge.test.ts b/src/vs/platform/userDataSync/test/common/snippetsMerge.test.ts
index 50e5caa545f..bfd9b973fae 100644
--- a/src/vs/platform/userDataSync/test/common/snippetsMerge.test.ts
+++ b/src/vs/platform/userDataSync/test/common/snippetsMerge.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { merge } from 'vs/platform/userDataSync/common/snippetsMerge';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { merge } from '../../common/snippetsMerge.js';
 
 const tsSnippet1 = `{
 
diff --git a/src/vs/platform/userDataSync/test/common/snippetsSync.test.ts b/src/vs/platform/userDataSync/test/common/snippetsSync.test.ts
index 97f4ab83f13..89e9c59c48b 100644
--- a/src/vs/platform/userDataSync/test/common/snippetsSync.test.ts
+++ b/src/vs/platform/userDataSync/test/common/snippetsSync.test.ts
@@ -4,17 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { dirname, joinPath } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { SnippetsSynchroniser } from 'vs/platform/userDataSync/common/snippetsSync';
-import { IResourcePreview, ISyncData, IUserDataSyncStoreService, PREVIEW_DIR_NAME, SyncResource, SyncStatus } from 'vs/platform/userDataSync/common/userDataSync';
-import { UserDataSyncClient, UserDataSyncTestServer } from 'vs/platform/userDataSync/test/common/userDataSyncClient';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { IStringDictionary } from '../../../../base/common/collections.js';
+import { dirname, joinPath } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { IEnvironmentService } from '../../../environment/common/environment.js';
+import { IFileService } from '../../../files/common/files.js';
+import { IUserDataProfile, IUserDataProfilesService } from '../../../userDataProfile/common/userDataProfile.js';
+import { SnippetsSynchroniser } from '../../common/snippetsSync.js';
+import { IResourcePreview, ISyncData, IUserDataSyncStoreService, PREVIEW_DIR_NAME, SyncResource, SyncStatus } from '../../common/userDataSync.js';
+import { UserDataSyncClient, UserDataSyncTestServer } from './userDataSyncClient.js';
 
 const tsSnippet1 = `{
 
diff --git a/src/vs/platform/userDataSync/test/common/synchronizer.test.ts b/src/vs/platform/userDataSync/test/common/synchronizer.test.ts
index a336ca32411..cbc65e458b1 100644
--- a/src/vs/platform/userDataSync/test/common/synchronizer.test.ts
+++ b/src/vs/platform/userDataSync/test/common/synchronizer.test.ts
@@ -4,20 +4,20 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Barrier } from 'vs/base/common/async';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { isEqual, joinPath } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { AbstractSynchroniser, IAcceptResult, IMergeResult, IResourcePreview } from 'vs/platform/userDataSync/common/abstractSynchronizer';
-import { Change, IRemoteUserData, IResourcePreview as IBaseResourcePreview, IUserDataResourceManifest, IUserDataSyncConfiguration, IUserDataSyncStoreService, MergeState, SyncResource, SyncStatus, USER_DATA_SYNC_SCHEME } from 'vs/platform/userDataSync/common/userDataSync';
-import { UserDataSyncClient, UserDataSyncTestServer } from 'vs/platform/userDataSync/test/common/userDataSyncClient';
+import { Barrier } from '../../../../base/common/async.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { isEqual, joinPath } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { runWithFakedTimers } from '../../../../base/test/common/timeTravelScheduler.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { IFileService } from '../../../files/common/files.js';
+import { IStorageService, StorageScope } from '../../../storage/common/storage.js';
+import { IUserDataProfilesService } from '../../../userDataProfile/common/userDataProfile.js';
+import { AbstractSynchroniser, IAcceptResult, IMergeResult, IResourcePreview } from '../../common/abstractSynchronizer.js';
+import { Change, IRemoteUserData, IResourcePreview as IBaseResourcePreview, IUserDataResourceManifest, IUserDataSyncConfiguration, IUserDataSyncStoreService, MergeState, SyncResource, SyncStatus, USER_DATA_SYNC_SCHEME } from '../../common/userDataSync.js';
+import { UserDataSyncClient, UserDataSyncTestServer } from './userDataSyncClient.js';
 
 interface ITestResourcePreview extends IResourcePreview {
 	ref: string;
diff --git a/src/vs/platform/userDataSync/test/common/tasksSync.test.ts b/src/vs/platform/userDataSync/test/common/tasksSync.test.ts
index c6cfd18a44b..26fa39aeeb2 100644
--- a/src/vs/platform/userDataSync/test/common/tasksSync.test.ts
+++ b/src/vs/platform/userDataSync/test/common/tasksSync.test.ts
@@ -4,15 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IFileService } from 'vs/platform/files/common/files';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { getTasksContentFromSyncContent, TasksSynchroniser } from 'vs/platform/userDataSync/common/tasksSync';
-import { Change, IUserDataSyncStoreService, MergeState, SyncResource, SyncStatus } from 'vs/platform/userDataSync/common/userDataSync';
-import { UserDataSyncClient, UserDataSyncTestServer } from 'vs/platform/userDataSync/test/common/userDataSyncClient';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { runWithFakedTimers } from '../../../../base/test/common/timeTravelScheduler.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { IFileService } from '../../../files/common/files.js';
+import { ILogService } from '../../../log/common/log.js';
+import { IUserDataProfilesService } from '../../../userDataProfile/common/userDataProfile.js';
+import { getTasksContentFromSyncContent, TasksSynchroniser } from '../../common/tasksSync.js';
+import { Change, IUserDataSyncStoreService, MergeState, SyncResource, SyncStatus } from '../../common/userDataSync.js';
+import { UserDataSyncClient, UserDataSyncTestServer } from './userDataSyncClient.js';
 
 suite('TasksSync', () => {
 
diff --git a/src/vs/platform/userDataSync/test/common/userDataAutoSyncService.test.ts b/src/vs/platform/userDataSync/test/common/userDataAutoSyncService.test.ts
index e9c86afd301..9c3164a97b7 100644
--- a/src/vs/platform/userDataSync/test/common/userDataAutoSyncService.test.ts
+++ b/src/vs/platform/userDataSync/test/common/userDataAutoSyncService.test.ts
@@ -4,18 +4,18 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { Event } from 'vs/base/common/event';
-import { joinPath } from 'vs/base/common/resources';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { UserDataAutoSyncService } from 'vs/platform/userDataSync/common/userDataAutoSyncService';
-import { IUserDataSyncService, SyncResource, UserDataAutoSyncError, UserDataSyncErrorCode, UserDataSyncStoreError } from 'vs/platform/userDataSync/common/userDataSync';
-import { IUserDataSyncMachinesService } from 'vs/platform/userDataSync/common/userDataSyncMachines';
-import { UserDataSyncClient, UserDataSyncTestServer } from 'vs/platform/userDataSync/test/common/userDataSyncClient';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { Event } from '../../../../base/common/event.js';
+import { joinPath } from '../../../../base/common/resources.js';
+import { runWithFakedTimers } from '../../../../base/test/common/timeTravelScheduler.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { IEnvironmentService } from '../../../environment/common/environment.js';
+import { IFileService } from '../../../files/common/files.js';
+import { IUserDataProfilesService } from '../../../userDataProfile/common/userDataProfile.js';
+import { UserDataAutoSyncService } from '../../common/userDataAutoSyncService.js';
+import { IUserDataSyncService, SyncResource, UserDataAutoSyncError, UserDataSyncErrorCode, UserDataSyncStoreError } from '../../common/userDataSync.js';
+import { IUserDataSyncMachinesService } from '../../common/userDataSyncMachines.js';
+import { UserDataSyncClient, UserDataSyncTestServer } from './userDataSyncClient.js';
 
 class TestUserDataAutoSyncService extends UserDataAutoSyncService {
 	protected override startAutoSync(): boolean { return false; }
diff --git a/src/vs/platform/userDataSync/test/common/userDataProfilesManifestMerge.test.ts b/src/vs/platform/userDataSync/test/common/userDataProfilesManifestMerge.test.ts
index e60f5314799..c40b4781ee8 100644
--- a/src/vs/platform/userDataSync/test/common/userDataProfilesManifestMerge.test.ts
+++ b/src/vs/platform/userDataSync/test/common/userDataProfilesManifestMerge.test.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IUserDataProfile, toUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { merge } from 'vs/platform/userDataSync/common/userDataProfilesManifestMerge';
-import { ISyncUserDataProfile } from 'vs/platform/userDataSync/common/userDataSync';
+import { URI } from '../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { IUserDataProfile, toUserDataProfile } from '../../../userDataProfile/common/userDataProfile.js';
+import { merge } from '../../common/userDataProfilesManifestMerge.js';
+import { ISyncUserDataProfile } from '../../common/userDataSync.js';
 
 suite('UserDataProfilesManifestMerge', () => {
 
diff --git a/src/vs/platform/userDataSync/test/common/userDataProfilesManifestSync.test.ts b/src/vs/platform/userDataSync/test/common/userDataProfilesManifestSync.test.ts
index 2227e3d1182..d52b6a0db19 100644
--- a/src/vs/platform/userDataSync/test/common/userDataProfilesManifestSync.test.ts
+++ b/src/vs/platform/userDataSync/test/common/userDataProfilesManifestSync.test.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { UserDataProfilesManifestSynchroniser } from 'vs/platform/userDataSync/common/userDataProfilesManifestSync';
-import { ISyncData, ISyncUserDataProfile, IUserDataSyncStoreService, SyncResource, SyncStatus } from 'vs/platform/userDataSync/common/userDataSync';
-import { UserDataSyncClient, UserDataSyncTestServer } from 'vs/platform/userDataSync/test/common/userDataSyncClient';
+import { runWithFakedTimers } from '../../../../base/test/common/timeTravelScheduler.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { IUserDataProfilesService } from '../../../userDataProfile/common/userDataProfile.js';
+import { UserDataProfilesManifestSynchroniser } from '../../common/userDataProfilesManifestSync.js';
+import { ISyncData, ISyncUserDataProfile, IUserDataSyncStoreService, SyncResource, SyncStatus } from '../../common/userDataSync.js';
+import { UserDataSyncClient, UserDataSyncTestServer } from './userDataSyncClient.js';
 
 suite('UserDataProfilesManifestSync', () => {
 
diff --git a/src/vs/platform/userDataSync/test/common/userDataSyncClient.ts b/src/vs/platform/userDataSync/test/common/userDataSyncClient.ts
index b622a3efe44..a6a2af7461d 100644
--- a/src/vs/platform/userDataSync/test/common/userDataSyncClient.ts
+++ b/src/vs/platform/userDataSync/test/common/userDataSyncClient.ts
@@ -3,48 +3,48 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { bufferToStream, VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { Emitter } from 'vs/base/common/event';
-import { FormattingOptions } from 'vs/base/common/jsonFormatter';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { joinPath } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { IHeaders, IRequestContext, IRequestOptions } from 'vs/base/parts/request/common/request';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ConfigurationService } from 'vs/platform/configuration/common/configurationService';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { GlobalExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionEnablementService';
-import { DidUninstallExtensionEvent, IExtensionGalleryService, IExtensionManagementService, IGlobalExtensionEnablementService, InstallExtensionResult } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IFileService } from 'vs/platform/files/common/files';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { ILogService, NullLogService } from 'vs/platform/log/common/log';
-import product from 'vs/platform/product/common/product';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IRequestService } from 'vs/platform/request/common/request';
-import { InMemoryStorageService, IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { ExtensionStorageService, IExtensionStorageService } from 'vs/platform/extensionManagement/common/extensionStorage';
-import { IgnoredExtensionsManagementService, IIgnoredExtensionsManagementService } from 'vs/platform/userDataSync/common/ignoredExtensions';
-import { ALL_SYNC_RESOURCES, getDefaultIgnoredSettings, IUserData, IUserDataSyncLocalStoreService, IUserDataSyncLogService, IUserDataSyncEnablementService, IUserDataSyncService, IUserDataSyncStoreManagementService, IUserDataSyncStoreService, IUserDataSyncUtilService, registerConfiguration, ServerResource, SyncResource, IUserDataSynchroniser, IUserDataResourceManifest, IUserDataCollectionManifest, USER_DATA_SYNC_SCHEME } from 'vs/platform/userDataSync/common/userDataSync';
-import { IUserDataSyncAccountService, UserDataSyncAccountService } from 'vs/platform/userDataSync/common/userDataSyncAccount';
-import { UserDataSyncLocalStoreService } from 'vs/platform/userDataSync/common/userDataSyncLocalStoreService';
-import { IUserDataSyncMachinesService, UserDataSyncMachinesService } from 'vs/platform/userDataSync/common/userDataSyncMachines';
-import { UserDataSyncEnablementService } from 'vs/platform/userDataSync/common/userDataSyncEnablementService';
-import { UserDataSyncService } from 'vs/platform/userDataSync/common/userDataSyncService';
-import { UserDataSyncStoreManagementService, UserDataSyncStoreService } from 'vs/platform/userDataSync/common/userDataSyncStoreService';
-import { InMemoryUserDataProfilesService, IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { NullPolicyService } from 'vs/platform/policy/common/policy';
-import { IUserDataProfileStorageService } from 'vs/platform/userDataProfile/common/userDataProfileStorageService';
-import { TestUserDataProfileStorageService } from 'vs/platform/userDataProfile/test/common/userDataProfileStorageService.test';
+import { bufferToStream, VSBuffer } from '../../../../base/common/buffer.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IStringDictionary } from '../../../../base/common/collections.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { FormattingOptions } from '../../../../base/common/jsonFormatter.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { joinPath } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { IHeaders, IRequestContext, IRequestOptions } from '../../../../base/parts/request/common/request.js';
+import { IConfigurationService } from '../../../configuration/common/configuration.js';
+import { ConfigurationService } from '../../../configuration/common/configurationService.js';
+import { IEnvironmentService } from '../../../environment/common/environment.js';
+import { GlobalExtensionEnablementService } from '../../../extensionManagement/common/extensionEnablementService.js';
+import { DidUninstallExtensionEvent, IExtensionGalleryService, IExtensionManagementService, IGlobalExtensionEnablementService, InstallExtensionResult } from '../../../extensionManagement/common/extensionManagement.js';
+import { IFileService } from '../../../files/common/files.js';
+import { FileService } from '../../../files/common/fileService.js';
+import { InMemoryFileSystemProvider } from '../../../files/common/inMemoryFilesystemProvider.js';
+import { TestInstantiationService } from '../../../instantiation/test/common/instantiationServiceMock.js';
+import { ILogService, NullLogService } from '../../../log/common/log.js';
+import product from '../../../product/common/product.js';
+import { IProductService } from '../../../product/common/productService.js';
+import { AuthInfo, Credentials, IRequestService } from '../../../request/common/request.js';
+import { InMemoryStorageService, IStorageService } from '../../../storage/common/storage.js';
+import { ITelemetryService } from '../../../telemetry/common/telemetry.js';
+import { NullTelemetryService } from '../../../telemetry/common/telemetryUtils.js';
+import { IUriIdentityService } from '../../../uriIdentity/common/uriIdentity.js';
+import { UriIdentityService } from '../../../uriIdentity/common/uriIdentityService.js';
+import { ExtensionStorageService, IExtensionStorageService } from '../../../extensionManagement/common/extensionStorage.js';
+import { IgnoredExtensionsManagementService, IIgnoredExtensionsManagementService } from '../../common/ignoredExtensions.js';
+import { ALL_SYNC_RESOURCES, getDefaultIgnoredSettings, IUserData, IUserDataSyncLocalStoreService, IUserDataSyncLogService, IUserDataSyncEnablementService, IUserDataSyncService, IUserDataSyncStoreManagementService, IUserDataSyncStoreService, IUserDataSyncUtilService, registerConfiguration, ServerResource, SyncResource, IUserDataSynchroniser, IUserDataResourceManifest, IUserDataCollectionManifest, USER_DATA_SYNC_SCHEME } from '../../common/userDataSync.js';
+import { IUserDataSyncAccountService, UserDataSyncAccountService } from '../../common/userDataSyncAccount.js';
+import { UserDataSyncLocalStoreService } from '../../common/userDataSyncLocalStoreService.js';
+import { IUserDataSyncMachinesService, UserDataSyncMachinesService } from '../../common/userDataSyncMachines.js';
+import { UserDataSyncEnablementService } from '../../common/userDataSyncEnablementService.js';
+import { UserDataSyncService } from '../../common/userDataSyncService.js';
+import { UserDataSyncStoreManagementService, UserDataSyncStoreService } from '../../common/userDataSyncStoreService.js';
+import { InMemoryUserDataProfilesService, IUserDataProfile, IUserDataProfilesService } from '../../../userDataProfile/common/userDataProfile.js';
+import { NullPolicyService } from '../../../policy/common/policy.js';
+import { IUserDataProfileStorageService } from '../../../userDataProfile/common/userDataProfileStorageService.js';
+import { TestUserDataProfileStorageService } from '../../../userDataProfile/test/common/userDataProfileStorageService.test.js';
 
 export class UserDataSyncClient extends Disposable {
 
@@ -95,7 +95,7 @@ export class UserDataSyncClient extends Disposable {
 
 		const storageService = this._register(new TestStorageService(userDataProfilesService.defaultProfile));
 		this.instantiationService.stub(IStorageService, this._register(storageService));
-		this.instantiationService.stub(IUserDataProfileStorageService, this._register(new TestUserDataProfileStorageService(storageService)));
+		this.instantiationService.stub(IUserDataProfileStorageService, this._register(new TestUserDataProfileStorageService(false, storageService)));
 
 		const configurationService = this._register(new ConfigurationService(userDataProfilesService.defaultProfile.settingsResource, fileService, new NullPolicyService(), logService));
 		await configurationService.initialize();
@@ -188,6 +188,8 @@ export class UserDataSyncTestServer implements IRequestService {
 	constructor(private readonly rateLimit = Number.MAX_SAFE_INTEGER, private readonly retryAfter?: number) { }
 
 	async resolveProxy(url: string): Promise<string | undefined> { return url; }
+	async lookupAuthorization(authInfo: AuthInfo): Promise<Credentials | undefined> { return undefined; }
+	async lookupKerberosAuthorization(url: string): Promise<string | undefined> { return undefined; }
 	async loadCertificates(): Promise<string[]> { return []; }
 
 	async request(options: IRequestOptions, token: CancellationToken): Promise<IRequestContext> {
@@ -355,7 +357,7 @@ export class TestUserDataSyncUtilService implements IUserDataSyncUtilService {
 
 	_serviceBrand: any;
 
-	async resolveDefaultIgnoredSettings(): Promise<string[]> {
+	async resolveDefaultCoreIgnoredSettings(): Promise<string[]> {
 		return getDefaultIgnoredSettings();
 	}
 
diff --git a/src/vs/platform/userDataSync/test/common/userDataSyncService.test.ts b/src/vs/platform/userDataSync/test/common/userDataSyncService.test.ts
index a06d711277e..1c41d4884c7 100644
--- a/src/vs/platform/userDataSync/test/common/userDataSyncService.test.ts
+++ b/src/vs/platform/userDataSync/test/common/userDataSyncService.test.ts
@@ -4,14 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { dirname, joinPath } from 'vs/base/common/resources';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IUserDataSyncEnablementService, IUserDataSyncService, SyncResource, SyncStatus } from 'vs/platform/userDataSync/common/userDataSync';
-import { UserDataSyncClient, UserDataSyncTestServer } from 'vs/platform/userDataSync/test/common/userDataSyncClient';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { dirname, joinPath } from '../../../../base/common/resources.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { IEnvironmentService } from '../../../environment/common/environment.js';
+import { IFileService } from '../../../files/common/files.js';
+import { IUserDataProfilesService } from '../../../userDataProfile/common/userDataProfile.js';
+import { IUserDataSyncEnablementService, IUserDataSyncService, SyncResource, SyncStatus } from '../../common/userDataSync.js';
+import { UserDataSyncClient, UserDataSyncTestServer } from './userDataSyncClient.js';
 
 suite('UserDataSyncService', () => {
 
diff --git a/src/vs/platform/userDataSync/test/common/userDataSyncStoreService.test.ts b/src/vs/platform/userDataSync/test/common/userDataSyncStoreService.test.ts
index 2a69d9d3ebf..4f720f7d231 100644
--- a/src/vs/platform/userDataSync/test/common/userDataSyncStoreService.test.ts
+++ b/src/vs/platform/userDataSync/test/common/userDataSyncStoreService.test.ts
@@ -4,19 +4,19 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { timeout } from 'vs/base/common/async';
-import { newWriteableBufferStream } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Event } from 'vs/base/common/event';
-import { isWeb } from 'vs/base/common/platform';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IRequestService } from 'vs/platform/request/common/request';
-import { IUserDataSyncStoreService, SyncResource, UserDataSyncErrorCode, UserDataSyncStoreError } from 'vs/platform/userDataSync/common/userDataSync';
-import { RequestsSession, UserDataSyncStoreService } from 'vs/platform/userDataSync/common/userDataSyncStoreService';
-import { UserDataSyncClient, UserDataSyncTestServer } from 'vs/platform/userDataSync/test/common/userDataSyncClient';
+import { timeout } from '../../../../base/common/async.js';
+import { newWriteableBufferStream } from '../../../../base/common/buffer.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Event } from '../../../../base/common/event.js';
+import { isWeb } from '../../../../base/common/platform.js';
+import { runWithFakedTimers } from '../../../../base/test/common/timeTravelScheduler.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { NullLogService } from '../../../log/common/log.js';
+import { IProductService } from '../../../product/common/productService.js';
+import { IRequestService } from '../../../request/common/request.js';
+import { IUserDataSyncStoreService, SyncResource, UserDataSyncErrorCode, UserDataSyncStoreError } from '../../common/userDataSync.js';
+import { RequestsSession, UserDataSyncStoreService } from '../../common/userDataSyncStoreService.js';
+import { UserDataSyncClient, UserDataSyncTestServer } from './userDataSyncClient.js';
 
 suite('UserDataSyncStoreService', () => {
 
@@ -414,6 +414,8 @@ suite('UserDataSyncRequestsSession', () => {
 		_serviceBrand: undefined,
 		async request() { return { res: { headers: {} }, stream: newWriteableBufferStream() }; },
 		async resolveProxy() { return undefined; },
+		async lookupAuthorization() { return undefined; },
+		async lookupKerberosAuthorization() { return undefined; },
 		async loadCertificates() { return []; }
 	};
 
diff --git a/src/vs/platform/utilityProcess/electron-main/utilityProcess.ts b/src/vs/platform/utilityProcess/electron-main/utilityProcess.ts
index bfa2c0cb42f..199813a3b8c 100644
--- a/src/vs/platform/utilityProcess/electron-main/utilityProcess.ts
+++ b/src/vs/platform/utilityProcess/electron-main/utilityProcess.ts
@@ -4,20 +4,21 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { BrowserWindow, Details, MessageChannelMain, app, utilityProcess, UtilityProcess as ElectronUtilityProcess, ForkOptions } from 'electron';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Emitter, Event } from 'vs/base/common/event';
-import { ILogService } from 'vs/platform/log/common/log';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { ILogService } from '../../log/common/log.js';
 import { StringDecoder } from 'string_decoder';
-import { timeout } from 'vs/base/common/async';
-import { FileAccess } from 'vs/base/common/network';
-import { IWindowsMainService } from 'vs/platform/windows/electron-main/windows';
-import Severity from 'vs/base/common/severity';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { ILifecycleMainService } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
-import { removeDangerousEnvVariables } from 'vs/base/common/processes';
-import { deepClone } from 'vs/base/common/objects';
-import { isWindows } from 'vs/base/common/platform';
-import { isUNCAccessRestrictionsDisabled, getUNCHostAllowlist } from 'vs/base/node/unc';
+import { timeout } from '../../../base/common/async.js';
+import { FileAccess } from '../../../base/common/network.js';
+import { IWindowsMainService } from '../../windows/electron-main/windows.js';
+import Severity from '../../../base/common/severity.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
+import { ILifecycleMainService } from '../../lifecycle/electron-main/lifecycleMainService.js';
+import { removeDangerousEnvVariables } from '../../../base/common/processes.js';
+import { deepClone } from '../../../base/common/objects.js';
+import { isWindows } from '../../../base/common/platform.js';
+import { isUNCAccessRestrictionsDisabled, getUNCHostAllowlist } from '../../../base/node/unc.js';
+import { upcast } from '../../../base/common/types.js';
 
 export interface IUtilityProcessConfiguration {
 
@@ -72,10 +73,11 @@ export interface IUtilityProcessConfiguration {
 	readonly parentLifecycleBound?: number;
 
 	/**
-	 * Allow the utility process to force heap allocations inside
-	 * the V8 sandbox.
+	 * HTTP 401 and 407 requests created via electron:net module
+	 * will be redirected to the main process and can be handled
+	 * via the app#login event.
 	 */
-	readonly forceAllocationsToV8Sandbox?: boolean;
+	readonly respondToAuthRequestsFromMainProcess?: boolean;
 }
 
 export interface IWindowUtilityProcessConfiguration extends IUtilityProcessConfiguration {
@@ -234,21 +236,23 @@ export class UtilityProcess extends Disposable {
 		const args = this.configuration.args ?? [];
 		const execArgv = this.configuration.execArgv ?? [];
 		const allowLoadingUnsignedLibraries = this.configuration.allowLoadingUnsignedLibraries;
-		const forceAllocationsToV8Sandbox = this.configuration.forceAllocationsToV8Sandbox;
+		const respondToAuthRequestsFromMainProcess = this.configuration.respondToAuthRequestsFromMainProcess;
 		const stdio = 'pipe';
 		const env = this.createEnv(configuration);
 
 		this.log('creating new...', Severity.Info);
 
 		// Fork utility process
-		this.process = utilityProcess.fork(modulePath, args, {
+		this.process = utilityProcess.fork(modulePath, args, upcast<ForkOptions, ForkOptions & {
+			respondToAuthRequestsFromMainProcess?: boolean;
+		}>({
 			serviceName,
 			env,
 			execArgv,
 			allowLoadingUnsignedLibraries,
-			forceAllocationsToV8Sandbox,
+			respondToAuthRequestsFromMainProcess,
 			stdio
-		} as ForkOptions & { forceAllocationsToV8Sandbox?: Boolean });
+		}));
 
 		// Register to events
 		this.registerListeners(this.process, this.configuration, serviceName);
@@ -260,7 +264,7 @@ export class UtilityProcess extends Disposable {
 		const env: { [key: string]: any } = configuration.env ? { ...configuration.env } : { ...deepClone(process.env) };
 
 		// Apply supported environment variables from config
-		env['VSCODE_AMD_ENTRYPOINT'] = configuration.entryPoint;
+		env['VSCODE_ESM_ENTRYPOINT'] = configuration.entryPoint;
 		if (typeof configuration.parentLifecycleBound === 'number') {
 			env['VSCODE_PARENT_PID'] = String(configuration.parentLifecycleBound);
 		}
@@ -325,6 +329,46 @@ export class UtilityProcess extends Disposable {
 			this.onDidExitOrCrashOrKill();
 		}));
 
+		// V8 Error
+		this._register(Event.fromNodeEventEmitter(process, 'error', (type, location, report) => ({ type, location, report }))(({ type, location, report }) => {
+			this.log(`crashed due to ${type} from V8 at ${location}`, Severity.Info);
+
+			let addons: string[] = [];
+			try {
+				const reportJSON = JSON.parse(report);
+				addons = reportJSON.sharedObjects
+					.filter((sharedObject: string) => sharedObject.endsWith('.node'))
+					.map((addon: string) => {
+						const index = addon.indexOf('extensions') === -1 ? addon.indexOf('node_modules') : addon.indexOf('extensions');
+						return addon.substring(index);
+					});
+			} catch (e) {
+				// ignore
+			}
+
+			// Telemetry
+			type UtilityProcessV8ErrorClassification = {
+				processtype: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'The type of utility process to understand the origin of the crash better.' };
+				error: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'The type of error from the utility process to understand the nature of the crash better.' };
+				location: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'The source location that triggered the crash to understand the nature of the crash better.' };
+				addons: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'The list of addons loaded in the utility process to understand the nature of the crash better' };
+				owner: 'deepak1556';
+				comment: 'Provides insight into V8 sandbox FATAL error caused by native addons.';
+			};
+			type UtilityProcessV8ErrorEvent = {
+				processtype: string;
+				error: string;
+				location: string;
+				addons: string[];
+			};
+			this.telemetryService.publicLog2<UtilityProcessV8ErrorEvent, UtilityProcessV8ErrorClassification>('utilityprocessv8error', {
+				processtype: configuration.type,
+				error: type,
+				location,
+				addons
+			});
+		}));
+
 		// Child process gone
 		this._register(Event.fromNodeEventEmitter<{ details: Details }>(app, 'child-process-gone', (event, details) => ({ event, details }))(({ details }) => {
 			if (details.type === 'Utility' && details.name === serviceName && !this.isNormalExit(details.exitCode)) {
diff --git a/src/vs/platform/utilityProcess/electron-main/utilityProcessWorkerMainService.ts b/src/vs/platform/utilityProcess/electron-main/utilityProcessWorkerMainService.ts
index 4888e76a2fe..9ab01b9be15 100644
--- a/src/vs/platform/utilityProcess/electron-main/utilityProcessWorkerMainService.ts
+++ b/src/vs/platform/utilityProcess/electron-main/utilityProcessWorkerMainService.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IUtilityProcessWorkerCreateConfiguration, IOnDidTerminateUtilityrocessWorkerProcess, IUtilityProcessWorkerConfiguration, IUtilityProcessWorkerProcessExit, IUtilityProcessWorkerService } from 'vs/platform/utilityProcess/common/utilityProcessWorkerService';
-import { IWindowsMainService } from 'vs/platform/windows/electron-main/windows';
-import { WindowUtilityProcess } from 'vs/platform/utilityProcess/electron-main/utilityProcess';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { hash } from 'vs/base/common/hash';
-import { Event, Emitter } from 'vs/base/common/event';
-import { DeferredPromise } from 'vs/base/common/async';
-import { ILifecycleMainService } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { ILogService } from '../../log/common/log.js';
+import { IUtilityProcessWorkerCreateConfiguration, IOnDidTerminateUtilityrocessWorkerProcess, IUtilityProcessWorkerConfiguration, IUtilityProcessWorkerProcessExit, IUtilityProcessWorkerService } from '../common/utilityProcessWorkerService.js';
+import { IWindowsMainService } from '../../windows/electron-main/windows.js';
+import { WindowUtilityProcess } from './utilityProcess.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
+import { hash } from '../../../base/common/hash.js';
+import { Event, Emitter } from '../../../base/common/event.js';
+import { DeferredPromise } from '../../../base/common/async.js';
+import { ILifecycleMainService } from '../../lifecycle/electron-main/lifecycleMainService.js';
 
 export const IUtilityProcessWorkerMainService = createDecorator<IUtilityProcessWorkerMainService>('utilityProcessWorker');
 
diff --git a/src/vs/platform/webview/common/mimeTypes.ts b/src/vs/platform/webview/common/mimeTypes.ts
index 848cc441919..36c950c5d54 100644
--- a/src/vs/platform/webview/common/mimeTypes.ts
+++ b/src/vs/platform/webview/common/mimeTypes.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getMediaMime, Mimes } from 'vs/base/common/mime';
-import { extname } from 'vs/base/common/path';
-import { URI } from 'vs/base/common/uri';
+import { getMediaMime, Mimes } from '../../../base/common/mime.js';
+import { extname } from '../../../base/common/path.js';
+import { URI } from '../../../base/common/uri.js';
 
 const webviewMimeTypes = new Map([
 	['.svg', 'image/svg+xml'],
diff --git a/src/vs/platform/webview/common/webviewManagerService.ts b/src/vs/platform/webview/common/webviewManagerService.ts
index 78f44d0e814..ae380e0591c 100644
--- a/src/vs/platform/webview/common/webviewManagerService.ts
+++ b/src/vs/platform/webview/common/webviewManagerService.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { Event } from '../../../base/common/event.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 export const IWebviewManagerService = createDecorator<IWebviewManagerService>('webviewManagerService');
 
diff --git a/src/vs/platform/webview/common/webviewPortMapping.ts b/src/vs/platform/webview/common/webviewPortMapping.ts
index b47339d28fa..7820092be18 100644
--- a/src/vs/platform/webview/common/webviewPortMapping.ts
+++ b/src/vs/platform/webview/common/webviewPortMapping.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { IAddress } from 'vs/platform/remote/common/remoteAgentConnection';
-import { extractLocalHostUriMetaDataForPortMapping, ITunnelService, RemoteTunnel } from 'vs/platform/tunnel/common/tunnel';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { Schemas } from '../../../base/common/network.js';
+import { URI } from '../../../base/common/uri.js';
+import { IAddress } from '../../remote/common/remoteAgentConnection.js';
+import { extractLocalHostUriMetaDataForPortMapping, ITunnelService, RemoteTunnel } from '../../tunnel/common/tunnel.js';
 
 export interface IWebviewPortMapping {
 	readonly webviewPort: number;
diff --git a/src/vs/platform/webview/electron-main/webviewMainService.ts b/src/vs/platform/webview/electron-main/webviewMainService.ts
index 9b51a3a8b37..b7c1a341ed4 100644
--- a/src/vs/platform/webview/electron-main/webviewMainService.ts
+++ b/src/vs/platform/webview/electron-main/webviewMainService.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { WebContents, webContents, WebFrameMain } from 'electron';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { FindInFrameOptions, FoundInFrameResult, IWebviewManagerService, WebviewWebContentsId, WebviewWindowId } from 'vs/platform/webview/common/webviewManagerService';
-import { WebviewProtocolProvider } from 'vs/platform/webview/electron-main/webviewProtocolProvider';
-import { IWindowsMainService } from 'vs/platform/windows/electron-main/windows';
+import { Emitter } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { FindInFrameOptions, FoundInFrameResult, IWebviewManagerService, WebviewWebContentsId, WebviewWindowId } from '../common/webviewManagerService.js';
+import { WebviewProtocolProvider } from './webviewProtocolProvider.js';
+import { IWindowsMainService } from '../../windows/electron-main/windows.js';
 
 export class WebviewMainService extends Disposable implements IWebviewManagerService {
 
diff --git a/src/vs/platform/webview/electron-main/webviewProtocolProvider.ts b/src/vs/platform/webview/electron-main/webviewProtocolProvider.ts
index fcce77faba4..493bd1b348d 100644
--- a/src/vs/platform/webview/electron-main/webviewProtocolProvider.ts
+++ b/src/vs/platform/webview/electron-main/webviewProtocolProvider.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { protocol } from 'electron';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { AppResourcePath, COI, FileAccess, Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { AppResourcePath, COI, FileAccess, Schemas } from '../../../base/common/network.js';
+import { URI } from '../../../base/common/uri.js';
 
 
 export class WebviewProtocolProvider extends Disposable {
diff --git a/src/vs/platform/window/common/window.ts b/src/vs/platform/window/common/window.ts
index 2b7ffc4651f..a3c02dba449 100644
--- a/src/vs/platform/window/common/window.ts
+++ b/src/vs/platform/window/common/window.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IStringDictionary } from 'vs/base/common/collections';
-import { PerformanceMark } from 'vs/base/common/performance';
-import { isLinux, isMacintosh, isNative, isWeb, isWindows } from 'vs/base/common/platform';
-import { URI, UriComponents, UriDto } from 'vs/base/common/uri';
-import { ISandboxConfiguration } from 'vs/base/parts/sandbox/common/sandboxTypes';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IEditorOptions } from 'vs/platform/editor/common/editor';
-import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
-import { FileType } from 'vs/platform/files/common/files';
-import { ILoggerResource, LogLevel } from 'vs/platform/log/common/log';
-import { PolicyDefinition, PolicyValue } from 'vs/platform/policy/common/policy';
-import { IPartsSplash } from 'vs/platform/theme/common/themeService';
-import { IUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IAnyWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
+import { IStringDictionary } from '../../../base/common/collections.js';
+import { PerformanceMark } from '../../../base/common/performance.js';
+import { isLinux, isMacintosh, isNative, isWeb } from '../../../base/common/platform.js';
+import { URI, UriComponents, UriDto } from '../../../base/common/uri.js';
+import { ISandboxConfiguration } from '../../../base/parts/sandbox/common/sandboxTypes.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { IEditorOptions } from '../../editor/common/editor.js';
+import { NativeParsedArgs } from '../../environment/common/argv.js';
+import { FileType } from '../../files/common/files.js';
+import { ILoggerResource, LogLevel } from '../../log/common/log.js';
+import { PolicyDefinition, PolicyValue } from '../../policy/common/policy.js';
+import { IPartsSplash } from '../../theme/common/themeService.js';
+import { IUserDataProfile } from '../../userDataProfile/common/userDataProfile.js';
+import { IAnyWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from '../../workspace/common/workspace.js';
 
 export const WindowMinimumSize = {
 	WIDTH: 400,
@@ -160,6 +160,7 @@ export interface IWindowSettings {
 	readonly clickThroughInactive: boolean;
 	readonly newWindowProfile: string;
 	readonly density: IDensitySettings;
+	readonly experimentalControlOverlay?: boolean;
 }
 
 export interface IDensitySettings {
@@ -225,14 +226,21 @@ export function getTitleBarStyle(configurationService: IConfigurationService): T
 export const DEFAULT_CUSTOM_TITLEBAR_HEIGHT = 35; // includes space for command center
 
 export function useWindowControlsOverlay(configurationService: IConfigurationService): boolean {
-	if (!isWindows || isWeb) {
-		return false; // only supported on a desktop Windows instance
+	if (isMacintosh || isWeb) {
+		return false; // only supported on a Windows/Linux desktop instances
 	}
 
 	if (hasNativeTitlebar(configurationService)) {
 		return false; // only supported when title bar is custom
 	}
 
+	if (isLinux) {
+		const setting = configurationService.getValue('window.experimentalControlOverlay');
+		if (typeof setting === 'boolean') {
+			return setting;
+		}
+	}
+
 	// Default to true.
 	return true;
 }
diff --git a/src/vs/platform/window/electron-main/window.ts b/src/vs/platform/window/electron-main/window.ts
index b63a6117514..8a861e7f176 100644
--- a/src/vs/platform/window/electron-main/window.ts
+++ b/src/vs/platform/window/electron-main/window.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BrowserWindow, Rectangle, screen, WebContents } from 'electron';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Event } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { ISerializableCommandAction } from 'vs/platform/action/common/action';
-import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
-import { IUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { INativeWindowConfiguration } from 'vs/platform/window/common/window';
-import { ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
+import electron from 'electron';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Event } from '../../../base/common/event.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { ISerializableCommandAction } from '../../action/common/action.js';
+import { NativeParsedArgs } from '../../environment/common/argv.js';
+import { IUserDataProfile } from '../../userDataProfile/common/userDataProfile.js';
+import { INativeWindowConfiguration } from '../common/window.js';
+import { ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from '../../workspace/common/workspace.js';
 
 export interface IBaseWindow extends IDisposable {
 
@@ -23,7 +23,7 @@ export interface IBaseWindow extends IDisposable {
 	readonly onDidClose: Event<void>;
 
 	readonly id: number;
-	readonly win: BrowserWindow | null;
+	readonly win: electron.BrowserWindow | null;
 
 	readonly lastFocusTime: number;
 	focus(options?: { force: boolean }): void;
@@ -41,7 +41,7 @@ export interface IBaseWindow extends IDisposable {
 
 	updateWindowControls(options: { height?: number; backgroundColor?: string; foregroundColor?: string }): void;
 
-	matches(webContents: WebContents): boolean;
+	matches(webContents: electron.WebContents): boolean;
 }
 
 export interface ICodeWindow extends IBaseWindow {
@@ -76,7 +76,7 @@ export interface ICodeWindow extends IBaseWindow {
 
 	close(): void;
 
-	getBounds(): Rectangle;
+	getBounds(): electron.Rectangle;
 
 	send(channel: string, ...args: any[]): void;
 	sendWhenReady(channel: string, token: CancellationToken, ...args: any[]): void;
@@ -158,7 +158,7 @@ export const defaultAuxWindowState = function (): IWindowState {
 
 	const width = 800;
 	const height = 600;
-	const workArea = screen.getPrimaryDisplay().workArea;
+	const workArea = electron.screen.getPrimaryDisplay().workArea;
 	const x = Math.max(workArea.x + (workArea.width / 2) - (width / 2), 0);
 	const y = Math.max(workArea.y + (workArea.height / 2) - (height / 2), 0);
 
diff --git a/src/vs/platform/window/electron-sandbox/window.ts b/src/vs/platform/window/electron-sandbox/window.ts
index ab0e479d1a3..c9914e2117e 100644
--- a/src/vs/platform/window/electron-sandbox/window.ts
+++ b/src/vs/platform/window/electron-sandbox/window.ts
@@ -3,11 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getZoomLevel, setZoomFactor, setZoomLevel } from 'vs/base/browser/browser';
-import { getActiveWindow, getWindows } from 'vs/base/browser/dom';
-import { mainWindow } from 'vs/base/browser/window';
-import { ISandboxGlobals, ipcRenderer, webFrame } from 'vs/base/parts/sandbox/electron-sandbox/globals';
-import { zoomLevelToZoomFactor } from 'vs/platform/window/common/window';
+import { getZoomLevel, setZoomFactor, setZoomLevel } from '../../../base/browser/browser.js';
+import { getActiveWindow, getWindows } from '../../../base/browser/dom.js';
+import { mainWindow } from '../../../base/browser/window.js';
+import { ISandboxConfiguration } from '../../../base/parts/sandbox/common/sandboxTypes.js';
+import { ISandboxGlobals, ipcRenderer, webFrame } from '../../../base/parts/sandbox/electron-sandbox/globals.js';
+import { zoomLevelToZoomFactor } from '../common/window.js';
 
 export enum ApplyZoomTarget {
 	ACTIVE_WINDOW = 1,
@@ -62,3 +63,29 @@ export function zoomIn(target: ApplyZoomTarget | Window): void {
 export function zoomOut(target: ApplyZoomTarget | Window): void {
 	applyZoom(getZoomLevel(typeof target === 'number' ? getActiveWindow() : target) - 1, target);
 }
+
+//#region Bootstrap Window
+
+export interface ILoadOptions<T extends ISandboxConfiguration = ISandboxConfiguration> {
+	configureDeveloperSettings?: (config: T) => {
+		forceDisableShowDevtoolsOnError?: boolean;
+		forceEnableDeveloperKeybindings?: boolean;
+		disallowReloadKeybinding?: boolean;
+		removeDeveloperKeybindingsAfterLoad?: boolean;
+	};
+	beforeImport?: (config: T) => void;
+}
+
+export interface ILoadResult<M, T> {
+	readonly result: M;
+	readonly configuration: T;
+}
+
+export interface IBootstrapWindow {
+	load<M, T extends ISandboxConfiguration = ISandboxConfiguration>(
+		esModule: string,
+		options: ILoadOptions<T>
+	): Promise<ILoadResult<M, T>>;
+}
+
+//#endregion
diff --git a/src/vs/platform/windows/electron-main/windowImpl.ts b/src/vs/platform/windows/electron-main/windowImpl.ts
index dcb3a1776ec..f0540656eed 100644
--- a/src/vs/platform/windows/electron-main/windowImpl.ts
+++ b/src/vs/platform/windows/electron-main/windowImpl.ts
@@ -3,47 +3,46 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { app, BrowserWindow, Display, nativeImage, NativeImage, Rectangle, screen, SegmentedControlSegment, systemPreferences, TouchBar, TouchBarSegmentedControl, WebContents, Event as ElectronEvent } from 'electron';
-import { DeferredPromise, RunOnceScheduler, timeout } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { FileAccess, Schemas } from 'vs/base/common/network';
-import { getMarks, mark } from 'vs/base/common/performance';
-import { isBigSurOrNewer, isMacintosh, isWindows } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
+import electron, { BrowserWindowConstructorOptions } from 'electron';
+import { DeferredPromise, RunOnceScheduler, timeout } from '../../../base/common/async.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { toErrorMessage } from '../../../base/common/errorMessage.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { FileAccess, Schemas } from '../../../base/common/network.js';
+import { getMarks, mark } from '../../../base/common/performance.js';
+import { isBigSurOrNewer, isMacintosh, isWindows } from '../../../base/common/platform.js';
+import { URI } from '../../../base/common/uri.js';
+import { localize } from '../../../nls.js';
 import { release } from 'os';
-import { ISerializableCommandAction } from 'vs/platform/action/common/action';
-import { IBackupMainService } from 'vs/platform/backup/electron-main/backup';
-import { IConfigurationChangeEvent, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IDialogMainService } from 'vs/platform/dialogs/electron-main/dialogMainService';
-import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
-import { IEnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
-import { isLaunchedFromCli } from 'vs/platform/environment/node/argvHelper';
-import { IFileService } from 'vs/platform/files/common/files';
-import { ILifecycleMainService } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IProtocolMainService } from 'vs/platform/protocol/electron-main/protocol';
-import { resolveMarketplaceHeaders } from 'vs/platform/externalServices/common/marketplace';
-import { IApplicationStorageMainService, IStorageMainService } from 'vs/platform/storage/electron-main/storageMainService';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IThemeMainService } from 'vs/platform/theme/electron-main/themeMainService';
-import { getMenuBarVisibility, IFolderToOpen, INativeWindowConfiguration, IWindowSettings, IWorkspaceToOpen, MenuBarVisibility, hasNativeTitlebar, useNativeFullScreen, useWindowControlsOverlay, DEFAULT_CUSTOM_TITLEBAR_HEIGHT } from 'vs/platform/window/common/window';
-import { defaultBrowserWindowOptions, IWindowsMainService, OpenContext, WindowStateValidator } from 'vs/platform/windows/electron-main/windows';
-import { ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, toWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
-import { IWorkspacesManagementMainService } from 'vs/platform/workspaces/electron-main/workspacesManagementMainService';
-import { IWindowState, ICodeWindow, ILoadEvent, WindowMode, WindowError, LoadReason, defaultWindowState, IBaseWindow } from 'vs/platform/window/electron-main/window';
-import { IPolicyService } from 'vs/platform/policy/common/policy';
-import { IUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IStateService } from 'vs/platform/state/node/state';
-import { IUserDataProfilesMainService } from 'vs/platform/userDataProfile/electron-main/userDataProfile';
-import { ILoggerMainService } from 'vs/platform/log/electron-main/loggerService';
-import { firstOrDefault } from 'vs/base/common/arrays';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { ISerializableCommandAction } from '../../action/common/action.js';
+import { IBackupMainService } from '../../backup/electron-main/backup.js';
+import { IConfigurationChangeEvent, IConfigurationService } from '../../configuration/common/configuration.js';
+import { IDialogMainService } from '../../dialogs/electron-main/dialogMainService.js';
+import { NativeParsedArgs } from '../../environment/common/argv.js';
+import { IEnvironmentMainService } from '../../environment/electron-main/environmentMainService.js';
+import { isLaunchedFromCli } from '../../environment/node/argvHelper.js';
+import { IFileService } from '../../files/common/files.js';
+import { ILifecycleMainService } from '../../lifecycle/electron-main/lifecycleMainService.js';
+import { ILogService } from '../../log/common/log.js';
+import { IProductService } from '../../product/common/productService.js';
+import { IProtocolMainService } from '../../protocol/electron-main/protocol.js';
+import { resolveMarketplaceHeaders } from '../../externalServices/common/marketplace.js';
+import { IApplicationStorageMainService, IStorageMainService } from '../../storage/electron-main/storageMainService.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
+import { ThemeIcon } from '../../../base/common/themables.js';
+import { IThemeMainService } from '../../theme/electron-main/themeMainService.js';
+import { getMenuBarVisibility, IFolderToOpen, INativeWindowConfiguration, IWindowSettings, IWorkspaceToOpen, MenuBarVisibility, hasNativeTitlebar, useNativeFullScreen, useWindowControlsOverlay, DEFAULT_CUSTOM_TITLEBAR_HEIGHT, TitlebarStyle } from '../../window/common/window.js';
+import { defaultBrowserWindowOptions, IWindowsMainService, OpenContext, WindowStateValidator } from './windows.js';
+import { ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, toWorkspaceIdentifier } from '../../workspace/common/workspace.js';
+import { IWorkspacesManagementMainService } from '../../workspaces/electron-main/workspacesManagementMainService.js';
+import { IWindowState, ICodeWindow, ILoadEvent, WindowMode, WindowError, LoadReason, defaultWindowState, IBaseWindow } from '../../window/electron-main/window.js';
+import { IPolicyService } from '../../policy/common/policy.js';
+import { IUserDataProfile } from '../../userDataProfile/common/userDataProfile.js';
+import { IStateService } from '../../state/node/state.js';
+import { IUserDataProfilesMainService } from '../../userDataProfile/electron-main/userDataProfile.js';
+import { ILoggerMainService } from '../../log/electron-main/loggerService.js';
+import { IInstantiationService } from '../../instantiation/common/instantiation.js';
 
 export interface IWindowCreationOptions {
 	readonly state: IWindowState;
@@ -51,7 +50,7 @@ export interface IWindowCreationOptions {
 	readonly isExtensionTestHost?: boolean;
 }
 
-interface ITouchBarSegment extends SegmentedControlSegment {
+interface ITouchBarSegment extends electron.SegmentedControlSegment {
 	readonly id: string;
 }
 
@@ -111,9 +110,9 @@ export abstract class BaseWindow extends Disposable implements IBaseWindow {
 	protected _lastFocusTime = Date.now(); // window is shown on creation so take current time
 	get lastFocusTime(): number { return this._lastFocusTime; }
 
-	protected _win: BrowserWindow | null = null;
+	protected _win: electron.BrowserWindow | null = null;
 	get win() { return this._win; }
-	protected setWin(win: BrowserWindow): void {
+	protected setWin(win: electron.BrowserWindow, options?: BrowserWindowConstructorOptions): void {
 		this._win = win;
 
 		// Window Events
@@ -131,13 +130,13 @@ export abstract class BaseWindow extends Disposable implements IBaseWindow {
 		this._register(Event.fromNodeEventEmitter(this._win, 'leave-full-screen')(() => this._onDidLeaveFullScreen.fire()));
 
 		// Sheet Offsets
-		const useCustomTitleStyle = !hasNativeTitlebar(this.configurationService);
+		const useCustomTitleStyle = !hasNativeTitlebar(this.configurationService, options?.titleBarStyle === 'hidden' ? TitlebarStyle.CUSTOM : undefined /* unknown */);
 		if (isMacintosh && useCustomTitleStyle) {
 			win.setSheetOffset(isBigSurOrNewer(release()) ? 28 : 22); // offset dialogs by the height of the custom title bar if we have any
 		}
 
 		// Update the window controls immediately based on cached or default values
-		if (useCustomTitleStyle && ((isWindows && useWindowControlsOverlay(this.configurationService)) || isMacintosh)) {
+		if (useCustomTitleStyle && (useWindowControlsOverlay(this.configurationService) || isMacintosh)) {
 			const cachedWindowControlHeight = this.stateService.getItem<number>((BaseWindow.windowControlHeightStateStorageKey));
 			if (cachedWindowControlHeight) {
 				this.updateWindowControls({ height: cachedWindowControlHeight });
@@ -160,7 +159,7 @@ export abstract class BaseWindow extends Disposable implements IBaseWindow {
 			// This sets up a listener for the window hook. This is a Windows-only API provided by electron.
 			win.hookWindowMessage(WM_INITMENU, () => {
 				const [x, y] = win.getPosition();
-				const cursorPos = screen.getCursorScreenPoint();
+				const cursorPos = electron.screen.getCursorScreenPoint();
 				const cx = cursorPos.x - x;
 				const cy = cursorPos.y - y;
 
@@ -218,7 +217,7 @@ export abstract class BaseWindow extends Disposable implements IBaseWindow {
 		super();
 	}
 
-	protected applyState(state: IWindowState, hasMultipleDisplays = screen.getAllDisplays().length > 0): void {
+	protected applyState(state: IWindowState, hasMultipleDisplays = electron.screen.getAllDisplays().length > 0): void {
 
 		// TODO@electron (Electron 4 regression): when running on multiple displays where the target display
 		// to open the window has a larger resolution than the primary display, the window will not size
@@ -232,7 +231,7 @@ export abstract class BaseWindow extends Disposable implements IBaseWindow {
 
 		const windowSettings = this.configurationService.getValue<IWindowSettings | undefined>('window');
 		const useNativeTabs = isMacintosh && windowSettings?.nativeTabs === true;
-		if ((isMacintosh || isWindows) && hasMultipleDisplays && (!useNativeTabs || BrowserWindow.getAllWindows().length === 1)) {
+		if ((isMacintosh || isWindows) && hasMultipleDisplays && (!useNativeTabs || electron.BrowserWindow.getAllWindows().length === 1)) {
 			if ([state.width, state.height, state.x, state.y].every(value => typeof value === 'number')) {
 				this._win?.setBounds({
 					width: state.width,
@@ -299,7 +298,7 @@ export abstract class BaseWindow extends Disposable implements IBaseWindow {
 
 	focus(options?: { force: boolean }): void {
 		if (isMacintosh && options?.force) {
-			app.focus({ steal: true });
+			electron.app.focus({ steal: true });
 		}
 
 		const win = this.win;
@@ -322,7 +321,7 @@ export abstract class BaseWindow extends Disposable implements IBaseWindow {
 
 		// Respect system settings on mac with regards to title click on windows title
 		if (isMacintosh) {
-			const action = systemPreferences.getUserDefault('AppleActionOnDoubleClick', 'string');
+			const action = electron.systemPreferences.getUserDefault('AppleActionOnDoubleClick', 'string');
 			switch (action) {
 				case 'Minimize':
 					win.minimize();
@@ -366,8 +365,8 @@ export abstract class BaseWindow extends Disposable implements IBaseWindow {
 			this.stateService.setItem((CodeWindow.windowControlHeightStateStorageKey), options.height);
 		}
 
-		// Windows: window control overlay (WCO)
-		if (isWindows && this.hasWindowControlOverlay) {
+		// Windows/Linux: window control overlay (WCO)
+		if (this.hasWindowControlOverlay) {
 			win.setTitleBarOverlay({
 				color: options.backgroundColor?.trim() === '' ? undefined : options.backgroundColor,
 				symbolColor: options.foregroundColor?.trim() === '' ? undefined : options.foregroundColor,
@@ -494,7 +493,7 @@ export abstract class BaseWindow extends Disposable implements IBaseWindow {
 
 	//#endregion
 
-	abstract matches(webContents: WebContents): boolean;
+	abstract matches(webContents: electron.WebContents): boolean;
 
 	override dispose(): void {
 		super.dispose();
@@ -524,7 +523,7 @@ export class CodeWindow extends BaseWindow implements ICodeWindow {
 	private _id: number;
 	get id(): number { return this._id; }
 
-	protected override _win: BrowserWindow;
+	protected override _win: electron.BrowserWindow;
 
 	get backupPath(): string | undefined { return this._config?.backupPath; }
 
@@ -561,7 +560,7 @@ export class CodeWindow extends BaseWindow implements ICodeWindow {
 
 	private readonly whenReadyCallbacks: { (window: ICodeWindow): void }[] = [];
 
-	private readonly touchBarGroups: TouchBarSegmentedControl[] = [];
+	private readonly touchBarGroups: electron.TouchBarSegmentedControl[] = [];
 
 	private currentHttpProxy: string | undefined = undefined;
 	private currentNoProxy: string | undefined = undefined;
@@ -604,7 +603,7 @@ export class CodeWindow extends BaseWindow implements ICodeWindow {
 			this.windowState = state;
 			this.logService.trace('window#ctor: using window state', state);
 
-			const options = instantiationService.invokeFunction(defaultBrowserWindowOptions, this.windowState, {
+			const options = instantiationService.invokeFunction(defaultBrowserWindowOptions, this.windowState, undefined, {
 				preload: FileAccess.asFileUri('vs/base/parts/sandbox/electron-sandbox/preload.js').fsPath,
 				additionalArguments: [`--vscode-window-config=${this.configObjectUrl.resource.toString()}`],
 				v8CacheOptions: this.environmentMainService.useCodeCache ? 'bypassHeatCheck' : 'none',
@@ -612,11 +611,11 @@ export class CodeWindow extends BaseWindow implements ICodeWindow {
 
 			// Create the browser window
 			mark('code/willCreateCodeBrowserWindow');
-			this._win = new BrowserWindow(options);
+			this._win = new electron.BrowserWindow(options);
 			mark('code/didCreateCodeBrowserWindow');
 
 			this._id = this._win.id;
-			this.setWin(this._win);
+			this.setWin(this._win, options);
 
 			// Apply some state after window creation
 			this.applyState(this.windowState, hasMultipleDisplays);
@@ -693,7 +692,7 @@ export class CodeWindow extends BaseWindow implements ICodeWindow {
 		// unloading a window that should not be confused
 		// with the DOM way.
 		// (https://github.com/microsoft/vscode/issues/122736)
-		this._register(Event.fromNodeEventEmitter<ElectronEvent>(this._win.webContents, 'will-prevent-unload')(event => event.preventDefault()));
+		this._register(Event.fromNodeEventEmitter<electron.Event>(this._win.webContents, 'will-prevent-unload')(event => event.preventDefault()));
 
 		// Remember that we loaded
 		this._register(Event.fromNodeEventEmitter(this._win.webContents, 'did-finish-load')(() => {
@@ -914,7 +913,7 @@ export class CodeWindow extends BaseWindow implements ICodeWindow {
 				}
 
 				// Delegate to windows service
-				const window = firstOrDefault(await this.windowsMainService.open({
+				const window = (await this.windowsMainService.open({
 					context: OpenContext.API,
 					userEnv: this._config.userEnv,
 					cli: {
@@ -925,7 +924,7 @@ export class CodeWindow extends BaseWindow implements ICodeWindow {
 					forceEmpty,
 					forceNewWindow: true,
 					remoteAuthority: this.remoteAuthority
-				}));
+				})).at(0);
 				window?.focus();
 			}
 		} finally {
@@ -957,16 +956,25 @@ export class CodeWindow extends BaseWindow implements ICodeWindow {
 		}
 
 		// Proxy
-		if (!e || e.affectsConfiguration('http.proxy')) {
+		if (!e || e.affectsConfiguration('http.proxy') || e.affectsConfiguration('http.noProxy')) {
 			let newHttpProxy = (this.configurationService.getValue<string>('http.proxy') || '').trim()
 				|| (process.env['https_proxy'] || process.env['HTTPS_PROXY'] || process.env['http_proxy'] || process.env['HTTP_PROXY'] || '').trim() // Not standardized.
 				|| undefined;
 
+			if (newHttpProxy?.indexOf('@') !== -1) {
+				const uri = URI.parse(newHttpProxy!);
+				const i = uri.authority.indexOf('@');
+				if (i !== -1) {
+					newHttpProxy = uri.with({ authority: uri.authority.substring(i + 1) })
+						.toString();
+				}
+			}
 			if (newHttpProxy?.endsWith('/')) {
 				newHttpProxy = newHttpProxy.substr(0, newHttpProxy.length - 1);
 			}
 
-			const newNoProxy = (process.env['no_proxy'] || process.env['NO_PROXY'] || '').trim() || undefined; // Not standardized.
+			const newNoProxy = (this.configurationService.getValue<string[]>('http.noProxy') || []).map((item) => item.trim()).join(',')
+				|| (process.env['no_proxy'] || process.env['NO_PROXY'] || '').trim() || undefined; // Not standardized.
 			if ((newHttpProxy || '').indexOf('@') === -1 && (newHttpProxy !== this.currentHttpProxy || newNoProxy !== this.currentNoProxy)) {
 				this.currentHttpProxy = newHttpProxy;
 				this.currentNoProxy = newNoProxy;
@@ -975,13 +983,7 @@ export class CodeWindow extends BaseWindow implements ICodeWindow {
 				const proxyBypassRules = newNoProxy ? `${newNoProxy},<local>` : '<local>';
 				this.logService.trace(`Setting proxy to '${proxyRules}', bypassing '${proxyBypassRules}'`);
 				this._win.webContents.session.setProxy({ proxyRules, proxyBypassRules, pacScript: '' });
-				type appWithProxySupport = Electron.App & {
-					setProxy(config: Electron.Config): Promise<void>;
-					resolveProxy(url: string): Promise<string>;
-				};
-				if (typeof (app as appWithProxySupport).setProxy === 'function') {
-					(app as appWithProxySupport).setProxy({ proxyRules, proxyBypassRules, pacScript: '' });
-				}
+				electron.app.setProxy({ proxyRules, proxyBypassRules, pacScript: '' });
 			}
 		}
 	}
@@ -1132,7 +1134,7 @@ export class CodeWindow extends BaseWindow implements ICodeWindow {
 			configuration['extensions-dir'] = cli['extensions-dir'];
 		}
 
-		configuration.accessibilitySupport = app.isAccessibilitySupportEnabled();
+		configuration.accessibilitySupport = electron.app.isAccessibilitySupportEnabled();
 		configuration.isInitialStartup = false; // since this is a reload
 		configuration.policiesData = this.policyService.serialize(); // set policies data again
 		configuration.continueOn = this.environmentMainService.continueOn;
@@ -1186,9 +1188,9 @@ export class CodeWindow extends BaseWindow implements ICodeWindow {
 
 		// fullscreen gets special treatment
 		if (this.isFullScreen) {
-			let display: Display | undefined;
+			let display: electron.Display | undefined;
 			try {
-				display = screen.getDisplayMatching(this.getBounds());
+				display = electron.screen.getDisplayMatching(this.getBounds());
 			} catch (error) {
 				// Electron has weird conditions under which it throws errors
 				// e.g. https://github.com/microsoft/vscode/issues/100334 when
@@ -1233,7 +1235,7 @@ export class CodeWindow extends BaseWindow implements ICodeWindow {
 
 		// only consider non-minimized window states
 		if (mode === WindowMode.Normal || mode === WindowMode.Maximized) {
-			let bounds: Rectangle;
+			let bounds: electron.Rectangle;
 			if (mode === WindowMode.Normal) {
 				bounds = this.getBounds();
 			} else {
@@ -1262,7 +1264,7 @@ export class CodeWindow extends BaseWindow implements ICodeWindow {
 
 			// Window dimensions
 			try {
-				const displays = screen.getAllDisplays();
+				const displays = electron.screen.getAllDisplays();
 				hasMultipleDisplays = displays.length > 1;
 
 				state = WindowStateValidator.validateWindowState(this.logService, state, displays);
@@ -1276,7 +1278,7 @@ export class CodeWindow extends BaseWindow implements ICodeWindow {
 		return [state || defaultWindowState(), hasMultipleDisplays];
 	}
 
-	getBounds(): Rectangle {
+	getBounds(): electron.Rectangle {
 		const [x, y] = this._win.getPosition();
 		const [width, height] = this._win.getSize();
 
@@ -1425,16 +1427,16 @@ export class CodeWindow extends BaseWindow implements ICodeWindow {
 			this.touchBarGroups.push(groupTouchBar);
 		}
 
-		this._win.setTouchBar(new TouchBar({ items: this.touchBarGroups }));
+		this._win.setTouchBar(new electron.TouchBar({ items: this.touchBarGroups }));
 	}
 
-	private createTouchBarGroup(items: ISerializableCommandAction[] = []): TouchBarSegmentedControl {
+	private createTouchBarGroup(items: ISerializableCommandAction[] = []): electron.TouchBarSegmentedControl {
 
 		// Group Segments
 		const segments = this.createTouchBarGroupSegments(items);
 
 		// Group Control
-		const control = new TouchBar.TouchBarSegmentedControl({
+		const control = new electron.TouchBar.TouchBarSegmentedControl({
 			segments,
 			mode: 'buttons',
 			segmentStyle: 'automatic',
@@ -1448,9 +1450,9 @@ export class CodeWindow extends BaseWindow implements ICodeWindow {
 
 	private createTouchBarGroupSegments(items: ISerializableCommandAction[] = []): ITouchBarSegment[] {
 		const segments: ITouchBarSegment[] = items.map(item => {
-			let icon: NativeImage | undefined;
+			let icon: electron.NativeImage | undefined;
 			if (item.icon && !ThemeIcon.isThemeIcon(item.icon) && item.icon?.dark?.scheme === Schemas.file) {
-				icon = nativeImage.createFromPath(URI.revive(item.icon.dark).fsPath);
+				icon = electron.nativeImage.createFromPath(URI.revive(item.icon.dark).fsPath);
 				if (icon.isEmpty()) {
 					icon = undefined;
 				}
@@ -1473,7 +1475,7 @@ export class CodeWindow extends BaseWindow implements ICodeWindow {
 		return segments;
 	}
 
-	matches(webContents: WebContents): boolean {
+	matches(webContents: electron.WebContents): boolean {
 		return this._win?.webContents.id === webContents.id;
 	}
 
diff --git a/src/vs/platform/windows/electron-main/windows.ts b/src/vs/platform/windows/electron-main/windows.ts
index abfc98bc2a3..dd5148103bd 100644
--- a/src/vs/platform/windows/electron-main/windows.ts
+++ b/src/vs/platform/windows/electron-main/windows.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BrowserWindowConstructorOptions, Display, Rectangle, WebContents, WebPreferences, screen } from 'electron';
-import { Event } from 'vs/base/common/event';
-import { IProcessEnvironment, isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
-import { ServicesAccessor, createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ICodeWindow, IWindowState, WindowMode, defaultWindowState } from 'vs/platform/window/electron-main/window';
-import { IOpenEmptyWindowOptions, IWindowOpenable, IWindowSettings, WindowMinimumSize, hasNativeTitlebar, useNativeFullScreen, useWindowControlsOverlay, zoomLevelToZoomFactor } from 'vs/platform/window/common/window';
-import { IThemeMainService } from 'vs/platform/theme/electron-main/themeMainService';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IEnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
-import { join } from 'vs/base/common/path';
-import { IAuxiliaryWindow } from 'vs/platform/auxiliaryWindow/electron-main/auxiliaryWindow';
-import { Color } from 'vs/base/common/color';
-import { ILogService } from 'vs/platform/log/common/log';
+import electron from 'electron';
+import { Color } from '../../../base/common/color.js';
+import { Event } from '../../../base/common/event.js';
+import { join } from '../../../base/common/path.js';
+import { IProcessEnvironment, isLinux, isMacintosh, isWindows } from '../../../base/common/platform.js';
+import { URI } from '../../../base/common/uri.js';
+import { IAuxiliaryWindow } from '../../auxiliaryWindow/electron-main/auxiliaryWindow.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { NativeParsedArgs } from '../../environment/common/argv.js';
+import { IEnvironmentMainService } from '../../environment/electron-main/environmentMainService.js';
+import { ServicesAccessor, createDecorator } from '../../instantiation/common/instantiation.js';
+import { ILogService } from '../../log/common/log.js';
+import { IProductService } from '../../product/common/productService.js';
+import { IThemeMainService } from '../../theme/electron-main/themeMainService.js';
+import { IOpenEmptyWindowOptions, IWindowOpenable, IWindowSettings, TitlebarStyle, WindowMinimumSize, hasNativeTitlebar, useNativeFullScreen, useWindowControlsOverlay, zoomLevelToZoomFactor } from '../../window/common/window.js';
+import { ICodeWindow, IWindowState, WindowMode, defaultWindowState } from '../../window/electron-main/window.js';
 
 export const IWindowsMainService = createDecorator<IWindowsMainService>('windowsMainService');
 
@@ -53,7 +53,7 @@ export interface IWindowsMainService {
 	getLastActiveWindow(): ICodeWindow | undefined;
 
 	getWindowById(windowId: number): ICodeWindow | undefined;
-	getWindowByWebContents(webContents: WebContents): ICodeWindow | undefined;
+	getWindowByWebContents(webContents: electron.WebContents): ICodeWindow | undefined;
 }
 
 export interface IWindowsCountChangedEvent {
@@ -79,7 +79,10 @@ export const enum OpenContext {
 	DESKTOP,
 
 	// opening through the API
-	API
+	API,
+
+	// opening from a protocol link
+	LINK
 }
 
 export interface IBaseOpenConfiguration {
@@ -115,7 +118,12 @@ export interface IOpenConfiguration extends IBaseOpenConfiguration {
 
 export interface IOpenEmptyConfiguration extends IBaseOpenConfiguration { }
 
-export function defaultBrowserWindowOptions(accessor: ServicesAccessor, windowState: IWindowState, webPreferences?: WebPreferences): BrowserWindowConstructorOptions & { experimentalDarkMode: boolean } {
+export interface IDefaultBrowserWindowOptionsOverrides {
+	forceNativeTitlebar?: boolean;
+	disableFullscreen?: boolean;
+}
+
+export function defaultBrowserWindowOptions(accessor: ServicesAccessor, windowState: IWindowState, overrides?: IDefaultBrowserWindowOptionsOverrides, webPreferences?: electron.WebPreferences): electron.BrowserWindowConstructorOptions & { experimentalDarkMode: boolean } {
 	const themeMainService = accessor.get(IThemeMainService);
 	const productService = accessor.get(IProductService);
 	const configurationService = accessor.get(IConfigurationService);
@@ -123,7 +131,7 @@ export function defaultBrowserWindowOptions(accessor: ServicesAccessor, windowSt
 
 	const windowSettings = configurationService.getValue<IWindowSettings | undefined>('window');
 
-	const options: BrowserWindowConstructorOptions & { experimentalDarkMode: boolean } = {
+	const options: electron.BrowserWindowConstructorOptions & { experimentalDarkMode: boolean } = {
 		backgroundColor: themeMainService.getBackgroundColor(),
 		minWidth: WindowMinimumSize.WIDTH,
 		minHeight: WindowMinimumSize.HEIGHT,
@@ -161,7 +169,9 @@ export function defaultBrowserWindowOptions(accessor: ServicesAccessor, windowSt
 		}
 	}
 
-	if (isMacintosh && !useNativeFullScreen(configurationService)) {
+	if (overrides?.disableFullscreen) {
+		options.fullscreen = false;
+	} else if (isMacintosh && !useNativeFullScreen(configurationService)) {
 		options.fullscreenable = false; // enables simple fullscreen mode
 	}
 
@@ -170,7 +180,7 @@ export function defaultBrowserWindowOptions(accessor: ServicesAccessor, windowSt
 		options.tabbingIdentifier = productService.nameShort; // this opts in to sierra tabs
 	}
 
-	const hideNativeTitleBar = !hasNativeTitlebar(configurationService);
+	const hideNativeTitleBar = !hasNativeTitlebar(configurationService, overrides?.forceNativeTitlebar ? TitlebarStyle.NATIVE : undefined);
 	if (hideNativeTitleBar) {
 		options.titleBarStyle = 'hidden';
 		if (!isMacintosh) {
@@ -215,7 +225,7 @@ export function getLastFocused(windows: ICodeWindow[] | IAuxiliaryWindow[]): ICo
 
 export namespace WindowStateValidator {
 
-	export function validateWindowState(logService: ILogService, state: IWindowState, displays = screen.getAllDisplays()): IWindowState | undefined {
+	export function validateWindowState(logService: ILogService, state: IWindowState, displays = electron.screen.getAllDisplays()): IWindowState | undefined {
 		logService.trace(`window#validateWindowState: validating window state on ${displays.length} display(s)`, state);
 
 		if (
@@ -313,10 +323,10 @@ export namespace WindowStateValidator {
 		}
 
 		// Multi Monitor (non-fullscreen): ensure window is within display bounds
-		let display: Display | undefined;
-		let displayWorkingArea: Rectangle | undefined;
+		let display: electron.Display | undefined;
+		let displayWorkingArea: electron.Rectangle | undefined;
 		try {
-			display = screen.getDisplayMatching({ x: state.x, y: state.y, width: state.width, height: state.height });
+			display = electron.screen.getDisplayMatching({ x: state.x, y: state.y, width: state.width, height: state.height });
 			displayWorkingArea = getWorkingArea(display);
 
 			logService.trace('window#validateWindowState: multi-monitor working area', displayWorkingArea);
@@ -343,7 +353,7 @@ export namespace WindowStateValidator {
 		return undefined;
 	}
 
-	function getWorkingArea(display: Display): Rectangle | undefined {
+	function getWorkingArea(display: electron.Display): electron.Rectangle | undefined {
 
 		// Prefer the working area of the display to account for taskbars on the
 		// desktop being positioned somewhere (https://github.com/microsoft/vscode/issues/50830).
diff --git a/src/vs/platform/windows/electron-main/windowsFinder.ts b/src/vs/platform/windows/electron-main/windowsFinder.ts
index c8d34be7505..1fc60b13554 100644
--- a/src/vs/platform/windows/electron-main/windowsFinder.ts
+++ b/src/vs/platform/windows/electron-main/windowsFinder.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { extUriBiasedIgnorePathCase } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { ICodeWindow } from 'vs/platform/window/electron-main/window';
-import { IResolvedWorkspace, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, IWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
+import { extUriBiasedIgnorePathCase } from '../../../base/common/resources.js';
+import { URI } from '../../../base/common/uri.js';
+import { ICodeWindow } from '../../window/electron-main/window.js';
+import { IResolvedWorkspace, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, IWorkspaceIdentifier } from '../../workspace/common/workspace.js';
 
 export async function findWindowOnFile(windows: ICodeWindow[], fileUri: URI, localWorkspaceResolver: (workspace: IWorkspaceIdentifier) => Promise<IResolvedWorkspace | undefined>): Promise<ICodeWindow | undefined> {
 
diff --git a/src/vs/platform/windows/electron-main/windowsMainService.ts b/src/vs/platform/windows/electron-main/windowsMainService.ts
index fd704a5cfe6..425cd45499e 100644
--- a/src/vs/platform/windows/electron-main/windowsMainService.ts
+++ b/src/vs/platform/windows/electron-main/windowsMainService.ts
@@ -3,59 +3,60 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as fs from 'fs';
 import { app, BrowserWindow, WebContents, shell } from 'electron';
-import { Promises } from 'vs/base/node/pfs';
-import { addUNCHostToAllowlist } from 'vs/base/node/unc';
+import { addUNCHostToAllowlist } from '../../../base/node/unc.js';
 import { hostname, release, arch } from 'os';
-import { coalesce, distinct } from 'vs/base/common/arrays';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { CharCode } from 'vs/base/common/charCode';
-import { Emitter, Event } from 'vs/base/common/event';
-import { isWindowsDriveLetter, parseLineAndColumnAware, sanitizeFilePath, toSlashes } from 'vs/base/common/extpath';
-import { getPathLabel } from 'vs/base/common/labels';
-import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { basename, join, normalize, posix } from 'vs/base/common/path';
-import { getMarks, mark } from 'vs/base/common/performance';
-import { IProcessEnvironment, isMacintosh, isWindows, OS } from 'vs/base/common/platform';
-import { cwd } from 'vs/base/common/process';
-import { extUriBiasedIgnorePathCase, isEqualAuthority, normalizePath, originalFSPath, removeTrailingPathSeparator } from 'vs/base/common/resources';
-import { assertIsDefined } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { IBackupMainService } from 'vs/platform/backup/electron-main/backup';
-import { IEmptyWindowBackupInfo } from 'vs/platform/backup/node/backup';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IDialogMainService } from 'vs/platform/dialogs/electron-main/dialogMainService';
-import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
-import { IEnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
-import { FileType, IFileService } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILifecycleMainService } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
-import { ILogService } from 'vs/platform/log/common/log';
-import product from 'vs/platform/product/common/product';
-import { IProtocolMainService } from 'vs/platform/protocol/electron-main/protocol';
-import { getRemoteAuthority } from 'vs/platform/remote/common/remoteHosts';
-import { IStateService } from 'vs/platform/state/node/state';
-import { IAddFoldersRequest, INativeOpenFileRequest, INativeWindowConfiguration, IOpenEmptyWindowOptions, IPath, IPathsToWaitFor, isFileToOpen, isFolderToOpen, isWorkspaceToOpen, IWindowOpenable, IWindowSettings } from 'vs/platform/window/common/window';
-import { CodeWindow } from 'vs/platform/windows/electron-main/windowImpl';
-import { IOpenConfiguration, IOpenEmptyConfiguration, IWindowsCountChangedEvent, IWindowsMainService, OpenContext, getLastFocused } from 'vs/platform/windows/electron-main/windows';
-import { findWindowOnExtensionDevelopmentPath, findWindowOnFile, findWindowOnWorkspaceOrFolder } from 'vs/platform/windows/electron-main/windowsFinder';
-import { IWindowState, WindowsStateHandler } from 'vs/platform/windows/electron-main/windowsStateHandler';
-import { IRecent } from 'vs/platform/workspaces/common/workspaces';
-import { hasWorkspaceFileExtension, IAnyWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, IWorkspaceIdentifier, toWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
-import { createEmptyWorkspaceIdentifier, getSingleFolderWorkspaceIdentifier, getWorkspaceIdentifier } from 'vs/platform/workspaces/node/workspaces';
-import { IWorkspacesHistoryMainService } from 'vs/platform/workspaces/electron-main/workspacesHistoryMainService';
-import { IWorkspacesManagementMainService } from 'vs/platform/workspaces/electron-main/workspacesManagementMainService';
-import { ICodeWindow, UnloadReason } from 'vs/platform/window/electron-main/window';
-import { IThemeMainService } from 'vs/platform/theme/electron-main/themeMainService';
-import { IEditorOptions, ITextEditorOptions } from 'vs/platform/editor/common/editor';
-import { IUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IPolicyService } from 'vs/platform/policy/common/policy';
-import { IUserDataProfilesMainService } from 'vs/platform/userDataProfile/electron-main/userDataProfile';
-import { ILoggerMainService } from 'vs/platform/log/electron-main/loggerService';
-import { IAuxiliaryWindowsMainService } from 'vs/platform/auxiliaryWindow/electron-main/auxiliaryWindows';
-import { IAuxiliaryWindow } from 'vs/platform/auxiliaryWindow/electron-main/auxiliaryWindow';
+import { coalesce, distinct } from '../../../base/common/arrays.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { CharCode } from '../../../base/common/charCode.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { isWindowsDriveLetter, parseLineAndColumnAware, sanitizeFilePath, toSlashes } from '../../../base/common/extpath.js';
+import { getPathLabel } from '../../../base/common/labels.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../base/common/lifecycle.js';
+import { Schemas } from '../../../base/common/network.js';
+import { basename, join, normalize, posix } from '../../../base/common/path.js';
+import { getMarks, mark } from '../../../base/common/performance.js';
+import { IProcessEnvironment, isMacintosh, isWindows, OS } from '../../../base/common/platform.js';
+import { cwd } from '../../../base/common/process.js';
+import { extUriBiasedIgnorePathCase, isEqualAuthority, normalizePath, originalFSPath, removeTrailingPathSeparator } from '../../../base/common/resources.js';
+import { assertIsDefined } from '../../../base/common/types.js';
+import { URI } from '../../../base/common/uri.js';
+import { getNLSLanguage, getNLSMessages, localize } from '../../../nls.js';
+import { IBackupMainService } from '../../backup/electron-main/backup.js';
+import { IEmptyWindowBackupInfo } from '../../backup/node/backup.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { IDialogMainService } from '../../dialogs/electron-main/dialogMainService.js';
+import { NativeParsedArgs } from '../../environment/common/argv.js';
+import { IEnvironmentMainService } from '../../environment/electron-main/environmentMainService.js';
+import { FileType, IFileService } from '../../files/common/files.js';
+import { IInstantiationService } from '../../instantiation/common/instantiation.js';
+import { ILifecycleMainService } from '../../lifecycle/electron-main/lifecycleMainService.js';
+import { ILogService } from '../../log/common/log.js';
+import product from '../../product/common/product.js';
+import { IProtocolMainService } from '../../protocol/electron-main/protocol.js';
+import { getRemoteAuthority } from '../../remote/common/remoteHosts.js';
+import { IStateService } from '../../state/node/state.js';
+import { IAddFoldersRequest, INativeOpenFileRequest, INativeWindowConfiguration, IOpenEmptyWindowOptions, IPath, IPathsToWaitFor, isFileToOpen, isFolderToOpen, isWorkspaceToOpen, IWindowOpenable, IWindowSettings } from '../../window/common/window.js';
+import { CodeWindow } from './windowImpl.js';
+import { IOpenConfiguration, IOpenEmptyConfiguration, IWindowsCountChangedEvent, IWindowsMainService, OpenContext, getLastFocused } from './windows.js';
+import { findWindowOnExtensionDevelopmentPath, findWindowOnFile, findWindowOnWorkspaceOrFolder } from './windowsFinder.js';
+import { IWindowState, WindowsStateHandler } from './windowsStateHandler.js';
+import { IRecent } from '../../workspaces/common/workspaces.js';
+import { hasWorkspaceFileExtension, IAnyWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, IWorkspaceIdentifier, toWorkspaceIdentifier } from '../../workspace/common/workspace.js';
+import { createEmptyWorkspaceIdentifier, getSingleFolderWorkspaceIdentifier, getWorkspaceIdentifier } from '../../workspaces/node/workspaces.js';
+import { IWorkspacesHistoryMainService } from '../../workspaces/electron-main/workspacesHistoryMainService.js';
+import { IWorkspacesManagementMainService } from '../../workspaces/electron-main/workspacesManagementMainService.js';
+import { ICodeWindow, UnloadReason } from '../../window/electron-main/window.js';
+import { IThemeMainService } from '../../theme/electron-main/themeMainService.js';
+import { IEditorOptions, ITextEditorOptions } from '../../editor/common/editor.js';
+import { IUserDataProfile } from '../../userDataProfile/common/userDataProfile.js';
+import { IPolicyService } from '../../policy/common/policy.js';
+import { IUserDataProfilesMainService } from '../../userDataProfile/electron-main/userDataProfile.js';
+import { ILoggerMainService } from '../../log/electron-main/loggerService.js';
+import { IAuxiliaryWindowsMainService } from '../../auxiliaryWindow/electron-main/auxiliaryWindows.js';
+import { IAuxiliaryWindow } from '../../auxiliaryWindow/electron-main/auxiliaryWindow.js';
+import { ICSSDevelopmentService } from '../../cssDev/node/cssDevService.js';
 
 //#region Helper Interfaces
 
@@ -229,7 +230,8 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 		@IFileService private readonly fileService: IFileService,
 		@IProtocolMainService private readonly protocolMainService: IProtocolMainService,
 		@IThemeMainService private readonly themeMainService: IThemeMainService,
-		@IAuxiliaryWindowsMainService private readonly auxiliaryWindowsMainService: IAuxiliaryWindowsMainService
+		@IAuxiliaryWindowsMainService private readonly auxiliaryWindowsMainService: IAuxiliaryWindowsMainService,
+		@ICSSDevelopmentService private readonly cssDevelopmentService: ICSSDevelopmentService
 	) {
 		super();
 
@@ -297,7 +299,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 		const emptyWindowsWithBackupsToRestore: IEmptyWindowBackupInfo[] = [];
 
 		let filesToOpen: IFilesToOpen | undefined;
-		let emptyToOpen = 0;
+		let openOneEmptyWindow = false;
 
 		// Identify things to open from open config
 		const pathsToOpen = await this.getPathsToOpen(openConfig);
@@ -321,7 +323,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 			} else if (path.backupPath) {
 				emptyWindowsWithBackupsToRestore.push({ backupFolder: basename(path.backupPath), remoteAuthority: path.remoteAuthority });
 			} else {
-				emptyToOpen++;
+				openOneEmptyWindow = true;
 			}
 		}
 
@@ -357,9 +359,9 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 		}
 
 		// Open based on config
-		const { windows: usedWindows, filesOpenedInWindow } = await this.doOpen(openConfig, workspacesToOpen, foldersToOpen, emptyWindowsWithBackupsToRestore, emptyToOpen, filesToOpen, foldersToAdd);
+		const { windows: usedWindows, filesOpenedInWindow } = await this.doOpen(openConfig, workspacesToOpen, foldersToOpen, emptyWindowsWithBackupsToRestore, openOneEmptyWindow, filesToOpen, foldersToAdd);
 
-		this.logService.trace(`windowsManager#open used window count ${usedWindows.length} (workspacesToOpen: ${workspacesToOpen.length}, foldersToOpen: ${foldersToOpen.length}, emptyToRestore: ${emptyWindowsWithBackupsToRestore.length}, emptyToOpen: ${emptyToOpen})`);
+		this.logService.trace(`windowsManager#open used window count ${usedWindows.length} (workspacesToOpen: ${workspacesToOpen.length}, foldersToOpen: ${foldersToOpen.length}, emptyToRestore: ${emptyWindowsWithBackupsToRestore.length}, openOneEmptyWindow: ${openOneEmptyWindow})`);
 
 		// Make sure to pass focus to the most relevant of the windows if we open multiple
 		if (usedWindows.length > 1) {
@@ -458,7 +460,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 		workspacesToOpen: IWorkspacePathToOpen[],
 		foldersToOpen: ISingleFolderWorkspacePathToOpen[],
 		emptyToRestore: IEmptyWindowBackupInfo[],
-		emptyToOpen: number,
+		openOneEmptyWindow: boolean,
 		filesToOpen: IFilesToOpen | undefined,
 		foldersToAdd: ISingleFolderWorkspacePathToOpen[]
 	): Promise<{ windows: ICodeWindow[]; filesOpenedInWindow: ICodeWindow | undefined }> {
@@ -506,7 +508,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 			// this step.
 			let windowToUseForFiles: ICodeWindow | undefined = undefined;
 			if (fileToCheck?.fileUri && !openFilesInNewWindow) {
-				if (openConfig.context === OpenContext.DESKTOP || openConfig.context === OpenContext.CLI || openConfig.context === OpenContext.DOCK) {
+				if (openConfig.context === OpenContext.DESKTOP || openConfig.context === OpenContext.CLI || openConfig.context === OpenContext.DOCK || openConfig.context === OpenContext.LINK) {
 					windowToUseForFiles = await findWindowOnFile(windows, fileToCheck.fileUri, async workspace => workspace.configPath.scheme === Schemas.file ? this.workspacesManagementMainService.resolveLocalWorkspace(workspace.configPath) : undefined);
 				}
 
@@ -627,20 +629,11 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 			}
 		}
 
-		// Handle empty to open (only if no other window opened)
-		if (usedWindows.length === 0 || filesToOpen) {
-			if (filesToOpen && !emptyToOpen) {
-				emptyToOpen++;
-			}
-
+		// Open empty window either if enforced or when files still have to open
+		if (filesToOpen || openOneEmptyWindow) {
 			const remoteAuthority = filesToOpen ? filesToOpen.remoteAuthority : openConfig.remoteAuthority;
 
-			for (let i = 0; i < emptyToOpen; i++) {
-				addUsedWindow(await this.doOpenEmpty(openConfig, openFolderInNewWindow, remoteAuthority, filesToOpen), !!filesToOpen);
-
-				// any other window to open must open in new window then
-				openFolderInNewWindow = true;
-			}
+			addUsedWindow(await this.doOpenEmpty(openConfig, openFolderInNewWindow, remoteAuthority, filesToOpen), !!filesToOpen);
 		}
 
 		return { windows: distinct(usedWindows), filesOpenedInWindow };
@@ -1057,7 +1050,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 		path = sanitizeFilePath(normalize(path), cwd());
 
 		try {
-			const pathStat = await Promises.stat(path);
+			const pathStat = await fs.promises.stat(path);
 
 			// File
 			if (pathStat.isFile()) {
@@ -1444,6 +1437,11 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 			workspace: options.workspace,
 			userEnv: { ...this.initialUserEnv, ...options.userEnv },
 
+			nls: {
+				messages: getNLSMessages(),
+				language: getNLSLanguage()
+			},
+
 			filesToOpenOrCreate: options.filesToOpen?.filesToOpenOrCreate,
 			filesToDiff: options.filesToOpen?.filesToDiff,
 			filesToMerge: options.filesToOpen?.filesToMerge,
@@ -1466,7 +1464,9 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 			accessibilitySupport: app.accessibilitySupportEnabled,
 			colorScheme: this.themeMainService.getColorScheme(),
 			policiesData: this.policyService.serialize(),
-			continueOn: this.environmentMainService.continueOn
+			continueOn: this.environmentMainService.continueOn,
+
+			cssModules: this.cssDevelopmentService.isEnabled ? await this.cssDevelopmentService.getCssModules() : undefined
 		};
 
 		// New window
diff --git a/src/vs/platform/windows/electron-main/windowsStateHandler.ts b/src/vs/platform/windows/electron-main/windowsStateHandler.ts
index dcbec3407c4..bd14cdbe3f4 100644
--- a/src/vs/platform/windows/electron-main/windowsStateHandler.ts
+++ b/src/vs/platform/windows/electron-main/windowsStateHandler.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { app, Display, screen } from 'electron';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { isMacintosh } from 'vs/base/common/platform';
-import { extUriBiasedIgnorePathCase } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ILifecycleMainService } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IStateService } from 'vs/platform/state/node/state';
-import { INativeWindowConfiguration, IWindowSettings } from 'vs/platform/window/common/window';
-import { IWindowsMainService } from 'vs/platform/windows/electron-main/windows';
-import { defaultWindowState, ICodeWindow, IWindowState as IWindowUIState, WindowMode } from 'vs/platform/window/electron-main/window';
-import { isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, IWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
+import electron from 'electron';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { isMacintosh } from '../../../base/common/platform.js';
+import { extUriBiasedIgnorePathCase } from '../../../base/common/resources.js';
+import { URI } from '../../../base/common/uri.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { ILifecycleMainService } from '../../lifecycle/electron-main/lifecycleMainService.js';
+import { ILogService } from '../../log/common/log.js';
+import { IStateService } from '../../state/node/state.js';
+import { INativeWindowConfiguration, IWindowSettings } from '../../window/common/window.js';
+import { IWindowsMainService } from './windows.js';
+import { defaultWindowState, ICodeWindow, IWindowState as IWindowUIState, WindowMode } from '../../window/electron-main/window.js';
+import { isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, IWorkspaceIdentifier } from '../../workspace/common/workspace.js';
 
 export interface IWindowState {
 	readonly windowId?: number;
@@ -78,7 +78,7 @@ export class WindowsStateHandler extends Disposable {
 		// When a window looses focus, save all windows state. This allows to
 		// prevent loss of window-state data when OS is restarted without properly
 		// shutting down the application (https://github.com/microsoft/vscode/issues/87171)
-		app.on('browser-window-blur', () => {
+		electron.app.on('browser-window-blur', () => {
 			if (!this.shuttingDown) {
 				this.saveWindowsState();
 			}
@@ -339,8 +339,8 @@ export class WindowsStateHandler extends Disposable {
 		//
 
 		// We want the new window to open on the same display that the last active one is in
-		let displayToUse: Display | undefined;
-		const displays = screen.getAllDisplays();
+		let displayToUse: electron.Display | undefined;
+		const displays = electron.screen.getAllDisplays();
 
 		// Single Display
 		if (displays.length === 1) {
@@ -352,18 +352,18 @@ export class WindowsStateHandler extends Disposable {
 
 			// on mac there is 1 menu per window so we need to use the monitor where the cursor currently is
 			if (isMacintosh) {
-				const cursorPoint = screen.getCursorScreenPoint();
-				displayToUse = screen.getDisplayNearestPoint(cursorPoint);
+				const cursorPoint = electron.screen.getCursorScreenPoint();
+				displayToUse = electron.screen.getDisplayNearestPoint(cursorPoint);
 			}
 
 			// if we have a last active window, use that display for the new window
 			if (!displayToUse && lastActive) {
-				displayToUse = screen.getDisplayMatching(lastActive.getBounds());
+				displayToUse = electron.screen.getDisplayMatching(lastActive.getBounds());
 			}
 
 			// fallback to primary display or first display
 			if (!displayToUse) {
-				displayToUse = screen.getPrimaryDisplay() || displays[0];
+				displayToUse = electron.screen.getPrimaryDisplay() || displays[0];
 			}
 		}
 
diff --git a/src/vs/platform/windows/node/windowTracker.ts b/src/vs/platform/windows/node/windowTracker.ts
index cc0abcbd24f..6c2306a4280 100644
--- a/src/vs/platform/windows/node/windowTracker.ts
+++ b/src/vs/platform/windows/node/windowTracker.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
-import { Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
+import { CancelablePromise, createCancelablePromise } from '../../../base/common/async.js';
+import { Event } from '../../../base/common/event.js';
+import { Disposable, DisposableStore } from '../../../base/common/lifecycle.js';
 
 export class ActiveWindowManager extends Disposable {
 
diff --git a/src/vs/platform/windows/test/electron-main/windowsFinder.test.ts b/src/vs/platform/windows/test/electron-main/windowsFinder.test.ts
index f3ce84f9c7a..98973497b19 100644
--- a/src/vs/platform/windows/test/electron-main/windowsFinder.test.ts
+++ b/src/vs/platform/windows/test/electron-main/windowsFinder.test.ts
@@ -4,20 +4,20 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Event } from 'vs/base/common/event';
-import { join } from 'vs/base/common/path';
-import { extUriBiasedIgnorePathCase } from 'vs/base/common/resources';
-import { URI, UriDto } from 'vs/base/common/uri';
-import { ICommandAction } from 'vs/platform/action/common/action';
-import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
-import { INativeWindowConfiguration } from 'vs/platform/window/common/window';
-import { ICodeWindow, ILoadEvent, IWindowState } from 'vs/platform/window/electron-main/window';
-import { findWindowOnFile } from 'vs/platform/windows/electron-main/windowsFinder';
-import { toWorkspaceFolders } from 'vs/platform/workspaces/common/workspaces';
-import { IWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
-import { FileAccess } from 'vs/base/common/network';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Event } from '../../../../base/common/event.js';
+import { join } from '../../../../base/common/path.js';
+import { extUriBiasedIgnorePathCase } from '../../../../base/common/resources.js';
+import { URI, UriDto } from '../../../../base/common/uri.js';
+import { ICommandAction } from '../../../action/common/action.js';
+import { NativeParsedArgs } from '../../../environment/common/argv.js';
+import { INativeWindowConfiguration } from '../../../window/common/window.js';
+import { ICodeWindow, ILoadEvent, IWindowState } from '../../../window/electron-main/window.js';
+import { findWindowOnFile } from '../../electron-main/windowsFinder.js';
+import { toWorkspaceFolders } from '../../../workspaces/common/workspaces.js';
+import { IWorkspaceIdentifier } from '../../../workspace/common/workspace.js';
+import { FileAccess } from '../../../../base/common/network.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 
 suite('WindowsFinder', () => {
 
diff --git a/src/vs/platform/windows/test/electron-main/windowsStateHandler.test.ts b/src/vs/platform/windows/test/electron-main/windowsStateHandler.test.ts
index 65d1a9937f9..a1ed6bd2794 100644
--- a/src/vs/platform/windows/test/electron-main/windowsStateHandler.test.ts
+++ b/src/vs/platform/windows/test/electron-main/windowsStateHandler.test.ts
@@ -5,12 +5,12 @@
 
 import assert from 'assert';
 import { tmpdir } from 'os';
-import { join } from 'vs/base/common/path';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IWindowState as IWindowUIState, WindowMode } from 'vs/platform/window/electron-main/window';
-import { getWindowsStateStoreData, IWindowsState, IWindowState, restoreWindowsState } from 'vs/platform/windows/electron-main/windowsStateHandler';
-import { IWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
+import { join } from '../../../../base/common/path.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { IWindowState as IWindowUIState, WindowMode } from '../../../window/electron-main/window.js';
+import { getWindowsStateStoreData, IWindowsState, IWindowState, restoreWindowsState } from '../../electron-main/windowsStateHandler.js';
+import { IWorkspaceIdentifier } from '../../../workspace/common/workspace.js';
 
 suite('Windows State Storing', () => {
 
diff --git a/src/vs/platform/workspace/common/canonicalUri.ts b/src/vs/platform/workspace/common/canonicalUri.ts
index 11196429b0b..f34a1478539 100644
--- a/src/vs/platform/workspace/common/canonicalUri.ts
+++ b/src/vs/platform/workspace/common/canonicalUri.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 export interface ICanonicalUriProvider {
 	readonly scheme: string;
diff --git a/src/vs/platform/workspace/common/editSessions.ts b/src/vs/platform/workspace/common/editSessions.ts
index 1eb989cda89..a80e6d095aa 100644
--- a/src/vs/platform/workspace/common/editSessions.ts
+++ b/src/vs/platform/workspace/common/editSessions.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { IWorkspaceFolder } from './workspace.js';
 
 export interface IEditSessionIdentityProvider {
 	readonly scheme: string;
diff --git a/src/vs/platform/workspace/common/virtualWorkspace.ts b/src/vs/platform/workspace/common/virtualWorkspace.ts
index 6161b9215cb..e4321bf56fb 100644
--- a/src/vs/platform/workspace/common/virtualWorkspace.ts
+++ b/src/vs/platform/workspace/common/virtualWorkspace.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { IWorkspace } from 'vs/platform/workspace/common/workspace';
+import { Schemas } from '../../../base/common/network.js';
+import { URI } from '../../../base/common/uri.js';
+import { IWorkspace } from './workspace.js';
 
 export function isVirtualResource(resource: URI) {
 	return resource.scheme !== Schemas.file && resource.scheme !== Schemas.vscodeRemote;
diff --git a/src/vs/platform/workspace/common/workspace.ts b/src/vs/platform/workspace/common/workspace.ts
index 4ad55ee58fc..c6e7245ba7f 100644
--- a/src/vs/platform/workspace/common/workspace.ts
+++ b/src/vs/platform/workspace/common/workspace.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { Event } from 'vs/base/common/event';
-import { basename, extname } from 'vs/base/common/path';
-import { TernarySearchTree } from 'vs/base/common/ternarySearchTree';
-import { extname as resourceExtname, basenameOrAuthority, joinPath, extUriBiasedIgnorePathCase } from 'vs/base/common/resources';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { Schemas } from 'vs/base/common/network';
+import { localize } from '../../../nls.js';
+import { Event } from '../../../base/common/event.js';
+import { basename, extname } from '../../../base/common/path.js';
+import { TernarySearchTree } from '../../../base/common/ternarySearchTree.js';
+import { extname as resourceExtname, basenameOrAuthority, joinPath, extUriBiasedIgnorePathCase } from '../../../base/common/resources.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { IEnvironmentService } from '../../environment/common/environment.js';
+import { Schemas } from '../../../base/common/network.js';
 
 export const IWorkspaceContextService = createDecorator<IWorkspaceContextService>('contextService');
 
diff --git a/src/vs/platform/workspace/common/workspaceTrust.ts b/src/vs/platform/workspace/common/workspaceTrust.ts
index 7988f9a930f..2d3ea5d1e37 100644
--- a/src/vs/platform/workspace/common/workspaceTrust.ts
+++ b/src/vs/platform/workspace/common/workspaceTrust.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { Event } from '../../../base/common/event.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { URI } from '../../../base/common/uri.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 export enum WorkspaceTrustScope {
 	Local = 0,
diff --git a/src/vs/platform/workspace/test/common/testWorkspace.ts b/src/vs/platform/workspace/test/common/testWorkspace.ts
index c5c2fb62d9f..81fee382320 100644
--- a/src/vs/platform/workspace/test/common/testWorkspace.ts
+++ b/src/vs/platform/workspace/test/common/testWorkspace.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isLinux, isWindows } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { toWorkspaceFolder, Workspace as BaseWorkspace, WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
+import { isLinux, isWindows } from '../../../../base/common/platform.js';
+import { URI } from '../../../../base/common/uri.js';
+import { toWorkspaceFolder, Workspace as BaseWorkspace, WorkspaceFolder } from '../../common/workspace.js';
 
 export class Workspace extends BaseWorkspace {
 	constructor(
diff --git a/src/vs/platform/workspace/test/common/workspace.test.ts b/src/vs/platform/workspace/test/common/workspace.test.ts
index fb8c1cf18e6..0c20623a992 100644
--- a/src/vs/platform/workspace/test/common/workspace.test.ts
+++ b/src/vs/platform/workspace/test/common/workspace.test.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { join } from 'vs/base/common/path';
-import { isLinux, isWindows } from 'vs/base/common/platform';
-import { extUriBiasedIgnorePathCase } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { IRawFileWorkspaceFolder, Workspace, WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { toWorkspaceFolders } from 'vs/platform/workspaces/common/workspaces';
+import { join } from '../../../../base/common/path.js';
+import { isLinux, isWindows } from '../../../../base/common/platform.js';
+import { extUriBiasedIgnorePathCase } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IRawFileWorkspaceFolder, Workspace, WorkspaceFolder } from '../../common/workspace.js';
+import { toWorkspaceFolders } from '../../../workspaces/common/workspaces.js';
 
 suite('Workspace', () => {
 
diff --git a/src/vs/platform/workspaces/common/workspaces.ts b/src/vs/platform/workspaces/common/workspaces.ts
index 71e4a623f65..6097076c43f 100644
--- a/src/vs/platform/workspaces/common/workspaces.ts
+++ b/src/vs/platform/workspaces/common/workspaces.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { isUNC, toSlashes } from 'vs/base/common/extpath';
-import * as json from 'vs/base/common/json';
-import * as jsonEdit from 'vs/base/common/jsonEdit';
-import { FormattingOptions } from 'vs/base/common/jsonFormatter';
-import { normalizeDriveLetter } from 'vs/base/common/labels';
-import { Schemas } from 'vs/base/common/network';
-import { isAbsolute, posix } from 'vs/base/common/path';
-import { isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
-import { IExtUri, isEqualAuthority } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { IWorkspaceBackupInfo, IFolderBackupInfo } from 'vs/platform/backup/common/backup';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { getRemoteAuthority } from 'vs/platform/remote/common/remoteHosts';
-import { IBaseWorkspace, IRawFileWorkspaceFolder, IRawUriWorkspaceFolder, IWorkspaceIdentifier, WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
+import { Event } from '../../../base/common/event.js';
+import { isUNC, toSlashes } from '../../../base/common/extpath.js';
+import * as json from '../../../base/common/json.js';
+import * as jsonEdit from '../../../base/common/jsonEdit.js';
+import { FormattingOptions } from '../../../base/common/jsonFormatter.js';
+import { normalizeDriveLetter } from '../../../base/common/labels.js';
+import { Schemas } from '../../../base/common/network.js';
+import { isAbsolute, posix } from '../../../base/common/path.js';
+import { isLinux, isMacintosh, isWindows } from '../../../base/common/platform.js';
+import { IExtUri, isEqualAuthority } from '../../../base/common/resources.js';
+import { URI } from '../../../base/common/uri.js';
+import { IWorkspaceBackupInfo, IFolderBackupInfo } from '../../backup/common/backup.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { ILogService } from '../../log/common/log.js';
+import { getRemoteAuthority } from '../../remote/common/remoteHosts.js';
+import { IBaseWorkspace, IRawFileWorkspaceFolder, IRawUriWorkspaceFolder, IWorkspaceIdentifier, WorkspaceFolder } from '../../workspace/common/workspace.js';
 
 export const IWorkspacesService = createDecorator<IWorkspacesService>('workspacesService');
 
diff --git a/src/vs/platform/workspaces/electron-main/workspacesHistoryMainService.ts b/src/vs/platform/workspaces/electron-main/workspacesHistoryMainService.ts
index a6f7fc430bc..0ee2bec4960 100644
--- a/src/vs/platform/workspaces/electron-main/workspacesHistoryMainService.ts
+++ b/src/vs/platform/workspaces/electron-main/workspacesHistoryMainService.ts
@@ -4,27 +4,27 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { app, JumpListCategory, JumpListItem } from 'electron';
-import { coalesce } from 'vs/base/common/arrays';
-import { ThrottledDelayer } from 'vs/base/common/async';
-import { Emitter, Event as CommonEvent } from 'vs/base/common/event';
-import { normalizeDriveLetter, splitRecentLabel } from 'vs/base/common/labels';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { isMacintosh, isWindows } from 'vs/base/common/platform';
-import { basename, extUriBiasedIgnorePathCase, originalFSPath } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { Promises } from 'vs/base/node/pfs';
-import { localize } from 'vs/nls';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ILifecycleMainService, LifecycleMainPhase } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IApplicationStorageMainService } from 'vs/platform/storage/electron-main/storageMainService';
-import { IRecent, IRecentFile, IRecentFolder, IRecentlyOpened, IRecentWorkspace, isRecentFile, isRecentFolder, isRecentWorkspace, restoreRecentlyOpened, toStoreData } from 'vs/platform/workspaces/common/workspaces';
-import { IWorkspaceIdentifier, WORKSPACE_EXTENSION } from 'vs/platform/workspace/common/workspace';
-import { IWorkspacesManagementMainService } from 'vs/platform/workspaces/electron-main/workspacesManagementMainService';
-import { ResourceMap } from 'vs/base/common/map';
-import { IDialogMainService } from 'vs/platform/dialogs/electron-main/dialogMainService';
+import { coalesce } from '../../../base/common/arrays.js';
+import { ThrottledDelayer } from '../../../base/common/async.js';
+import { Emitter, Event as CommonEvent } from '../../../base/common/event.js';
+import { normalizeDriveLetter, splitRecentLabel } from '../../../base/common/labels.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { Schemas } from '../../../base/common/network.js';
+import { isMacintosh, isWindows } from '../../../base/common/platform.js';
+import { basename, extUriBiasedIgnorePathCase, originalFSPath } from '../../../base/common/resources.js';
+import { URI } from '../../../base/common/uri.js';
+import { Promises } from '../../../base/node/pfs.js';
+import { localize } from '../../../nls.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { ILifecycleMainService, LifecycleMainPhase } from '../../lifecycle/electron-main/lifecycleMainService.js';
+import { ILogService } from '../../log/common/log.js';
+import { StorageScope, StorageTarget } from '../../storage/common/storage.js';
+import { IApplicationStorageMainService } from '../../storage/electron-main/storageMainService.js';
+import { IRecent, IRecentFile, IRecentFolder, IRecentlyOpened, IRecentWorkspace, isRecentFile, isRecentFolder, isRecentWorkspace, restoreRecentlyOpened, toStoreData } from '../common/workspaces.js';
+import { IWorkspaceIdentifier, WORKSPACE_EXTENSION } from '../../workspace/common/workspace.js';
+import { IWorkspacesManagementMainService } from './workspacesManagementMainService.js';
+import { ResourceMap } from '../../../base/common/map.js';
+import { IDialogMainService } from '../../dialogs/electron-main/dialogMainService.js';
 
 export const IWorkspacesHistoryMainService = createDecorator<IWorkspacesHistoryMainService>('workspacesHistoryMainService');
 
diff --git a/src/vs/platform/workspaces/electron-main/workspacesMainService.ts b/src/vs/platform/workspaces/electron-main/workspacesMainService.ts
index de17f98befb..b42bd3ad679 100644
--- a/src/vs/platform/workspaces/electron-main/workspacesMainService.ts
+++ b/src/vs/platform/workspaces/electron-main/workspacesMainService.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { AddFirstParameterToFunctions } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { IBackupMainService } from 'vs/platform/backup/electron-main/backup';
-import { IWindowsMainService } from 'vs/platform/windows/electron-main/windows';
-import { IEnterWorkspaceResult, IRecent, IRecentlyOpened, IWorkspaceFolderCreationData, IWorkspacesService } from 'vs/platform/workspaces/common/workspaces';
-import { IWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
-import { IWorkspacesHistoryMainService } from 'vs/platform/workspaces/electron-main/workspacesHistoryMainService';
-import { IWorkspacesManagementMainService } from 'vs/platform/workspaces/electron-main/workspacesManagementMainService';
-import { IWorkspaceBackupInfo, IFolderBackupInfo } from 'vs/platform/backup/common/backup';
+import { AddFirstParameterToFunctions } from '../../../base/common/types.js';
+import { URI } from '../../../base/common/uri.js';
+import { IBackupMainService } from '../../backup/electron-main/backup.js';
+import { IWindowsMainService } from '../../windows/electron-main/windows.js';
+import { IEnterWorkspaceResult, IRecent, IRecentlyOpened, IWorkspaceFolderCreationData, IWorkspacesService } from '../common/workspaces.js';
+import { IWorkspaceIdentifier } from '../../workspace/common/workspace.js';
+import { IWorkspacesHistoryMainService } from './workspacesHistoryMainService.js';
+import { IWorkspacesManagementMainService } from './workspacesManagementMainService.js';
+import { IWorkspaceBackupInfo, IFolderBackupInfo } from '../../backup/common/backup.js';
 
 export class WorkspacesMainService implements AddFirstParameterToFunctions<IWorkspacesService, Promise<unknown> /* only methods, not events */, number /* window ID */> {
 
diff --git a/src/vs/platform/workspaces/electron-main/workspacesManagementMainService.ts b/src/vs/platform/workspaces/electron-main/workspacesManagementMainService.ts
index 236f6d6fc32..904aea65df3 100644
--- a/src/vs/platform/workspaces/electron-main/workspacesManagementMainService.ts
+++ b/src/vs/platform/workspaces/electron-main/workspacesManagementMainService.ts
@@ -3,27 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BrowserWindow } from 'electron';
-import { Emitter, Event } from 'vs/base/common/event';
-import { parse } from 'vs/base/common/json';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { dirname, join } from 'vs/base/common/path';
-import { basename, extUriBiasedIgnorePathCase, joinPath, originalFSPath } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { Promises } from 'vs/base/node/pfs';
-import { localize } from 'vs/nls';
-import { IBackupMainService } from 'vs/platform/backup/electron-main/backup';
-import { IDialogMainService } from 'vs/platform/dialogs/electron-main/dialogMainService';
-import { IEnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IUserDataProfilesMainService } from 'vs/platform/userDataProfile/electron-main/userDataProfile';
-import { ICodeWindow } from 'vs/platform/window/electron-main/window';
-import { findWindowOnWorkspaceOrFolder } from 'vs/platform/windows/electron-main/windowsFinder';
-import { isWorkspaceIdentifier, IWorkspaceIdentifier, IResolvedWorkspace, hasWorkspaceFileExtension, UNTITLED_WORKSPACE_NAME, isUntitledWorkspace } from 'vs/platform/workspace/common/workspace';
-import { getStoredWorkspaceFolder, IEnterWorkspaceResult, isStoredWorkspaceFolder, IStoredWorkspace, IStoredWorkspaceFolder, IUntitledWorkspaceInfo, IWorkspaceFolderCreationData, toWorkspaceFolders } from 'vs/platform/workspaces/common/workspaces';
-import { getWorkspaceIdentifier } from 'vs/platform/workspaces/node/workspaces';
+import * as fs from 'fs';
+import electron from 'electron';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { parse } from '../../../base/common/json.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { Schemas } from '../../../base/common/network.js';
+import { dirname, join } from '../../../base/common/path.js';
+import { basename, extUriBiasedIgnorePathCase, joinPath, originalFSPath } from '../../../base/common/resources.js';
+import { URI } from '../../../base/common/uri.js';
+import { Promises } from '../../../base/node/pfs.js';
+import { localize } from '../../../nls.js';
+import { IBackupMainService } from '../../backup/electron-main/backup.js';
+import { IDialogMainService } from '../../dialogs/electron-main/dialogMainService.js';
+import { IEnvironmentMainService } from '../../environment/electron-main/environmentMainService.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { ILogService } from '../../log/common/log.js';
+import { IUserDataProfilesMainService } from '../../userDataProfile/electron-main/userDataProfile.js';
+import { ICodeWindow } from '../../window/electron-main/window.js';
+import { findWindowOnWorkspaceOrFolder } from '../../windows/electron-main/windowsFinder.js';
+import { isWorkspaceIdentifier, IWorkspaceIdentifier, IResolvedWorkspace, hasWorkspaceFileExtension, UNTITLED_WORKSPACE_NAME, isUntitledWorkspace } from '../../workspace/common/workspace.js';
+import { getStoredWorkspaceFolder, IEnterWorkspaceResult, isStoredWorkspaceFolder, IStoredWorkspace, IStoredWorkspaceFolder, IUntitledWorkspaceInfo, IWorkspaceFolderCreationData, toWorkspaceFolders } from '../common/workspaces.js';
+import { getWorkspaceIdentifier } from '../node/workspaces.js';
 
 export const IWorkspacesManagementMainService = createDecorator<IWorkspacesManagementMainService>('workspacesManagementMainService');
 
@@ -102,7 +103,7 @@ export class WorkspacesManagementMainService extends Disposable implements IWork
 	}
 
 	resolveLocalWorkspace(uri: URI): Promise<IResolvedWorkspace | undefined> {
-		return this.doResolveLocalWorkspace(uri, path => Promises.readFile(path, 'utf8'));
+		return this.doResolveLocalWorkspace(uri, path => fs.promises.readFile(path, 'utf8'));
 	}
 
 	private doResolveLocalWorkspace(uri: URI, contentsFn: (path: string) => string): IResolvedWorkspace | undefined;
@@ -169,7 +170,7 @@ export class WorkspacesManagementMainService extends Disposable implements IWork
 		const { workspace, storedWorkspace } = this.newUntitledWorkspace(folders, remoteAuthority);
 		const configPath = workspace.configPath.fsPath;
 
-		await Promises.mkdir(dirname(configPath), { recursive: true });
+		await fs.promises.mkdir(dirname(configPath), { recursive: true });
 		await Promises.writeFile(configPath, JSON.stringify(storedWorkspace, null, '\t'));
 
 		this.untitledWorkspaces.push({ workspace, remoteAuthority });
@@ -280,7 +281,7 @@ export class WorkspacesManagementMainService extends Disposable implements IWork
 				buttons: [localize({ key: 'ok', comment: ['&& denotes a mnemonic'] }, "&&OK")],
 				message: localize('workspaceOpenedMessage', "Unable to save workspace '{0}'", basename(workspacePath)),
 				detail: localize('workspaceOpenedDetail', "The workspace is already opened in another window. Please close that window first and then try again.")
-			}, BrowserWindow.getFocusedWindow() ?? undefined);
+			}, electron.BrowserWindow.getFocusedWindow() ?? undefined);
 
 			return false;
 		}
diff --git a/src/vs/platform/workspaces/node/workspaces.ts b/src/vs/platform/workspaces/node/workspaces.ts
index 86e7f3ebeee..1189358ed30 100644
--- a/src/vs/platform/workspaces/node/workspaces.ts
+++ b/src/vs/platform/workspaces/node/workspaces.ts
@@ -5,11 +5,11 @@
 
 import { createHash } from 'crypto';
 import { Stats } from 'fs';
-import { Schemas } from 'vs/base/common/network';
-import { isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
-import { originalFSPath } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { IEmptyWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
+import { Schemas } from '../../../base/common/network.js';
+import { isLinux, isMacintosh, isWindows } from '../../../base/common/platform.js';
+import { originalFSPath } from '../../../base/common/resources.js';
+import { URI } from '../../../base/common/uri.js';
+import { IEmptyWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from '../../workspace/common/workspace.js';
 
 /**
  * Length of workspace identifiers that are not empty. Those are
diff --git a/src/vs/platform/workspaces/test/common/workspaces.test.ts b/src/vs/platform/workspaces/test/common/workspaces.test.ts
index a08f1035ce1..12589a491c3 100644
--- a/src/vs/platform/workspaces/test/common/workspaces.test.ts
+++ b/src/vs/platform/workspaces/test/common/workspaces.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ISerializedSingleFolderWorkspaceIdentifier, ISerializedWorkspaceIdentifier, reviveIdentifier, hasWorkspaceFileExtension, isWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, IEmptyWorkspaceIdentifier, toWorkspaceIdentifier, isEmptyWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
+import { URI } from '../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { ISerializedSingleFolderWorkspaceIdentifier, ISerializedWorkspaceIdentifier, reviveIdentifier, hasWorkspaceFileExtension, isWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, IEmptyWorkspaceIdentifier, toWorkspaceIdentifier, isEmptyWorkspaceIdentifier } from '../../../workspace/common/workspace.js';
 
 suite('Workspaces', () => {
 
diff --git a/src/vs/platform/workspaces/test/electron-main/workspaces.test.ts b/src/vs/platform/workspaces/test/electron-main/workspaces.test.ts
index 42fd463b9bf..0bfb4dedd40 100644
--- a/src/vs/platform/workspaces/test/electron-main/workspaces.test.ts
+++ b/src/vs/platform/workspaces/test/electron-main/workspaces.test.ts
@@ -6,13 +6,13 @@
 import assert from 'assert';
 import * as fs from 'fs';
 import * as os from 'os';
-import * as path from 'vs/base/common/path';
-import { isWindows } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import * as pfs from 'vs/base/node/pfs';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { flakySuite, getRandomTestPath } from 'vs/base/test/node/testUtils';
-import { getSingleFolderWorkspaceIdentifier, getWorkspaceIdentifier } from 'vs/platform/workspaces/node/workspaces';
+import * as path from '../../../../base/common/path.js';
+import { isWindows } from '../../../../base/common/platform.js';
+import { URI } from '../../../../base/common/uri.js';
+import * as pfs from '../../../../base/node/pfs.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { flakySuite, getRandomTestPath } from '../../../../base/test/node/testUtils.js';
+import { getSingleFolderWorkspaceIdentifier, getWorkspaceIdentifier } from '../../node/workspaces.js';
 
 flakySuite('Workspaces', () => {
 
@@ -23,7 +23,7 @@ flakySuite('Workspaces', () => {
 	setup(async () => {
 		testDir = getRandomTestPath(tmpDir, 'vsctests', 'workspacesmanagementmainservice');
 
-		return pfs.Promises.mkdir(testDir, { recursive: true });
+		return fs.promises.mkdir(testDir, { recursive: true });
 	});
 
 	teardown(() => {
diff --git a/src/vs/platform/workspaces/test/electron-main/workspacesHistoryStorage.test.ts b/src/vs/platform/workspaces/test/electron-main/workspacesHistoryStorage.test.ts
index f2102c3b098..1c86fda9442 100644
--- a/src/vs/platform/workspaces/test/electron-main/workspacesHistoryStorage.test.ts
+++ b/src/vs/platform/workspaces/test/electron-main/workspacesHistoryStorage.test.ts
@@ -5,12 +5,12 @@
 
 import assert from 'assert';
 import { tmpdir } from 'os';
-import { join } from 'vs/base/common/path';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { IWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
-import { IRecentFolder, IRecentlyOpened, IRecentWorkspace, isRecentFolder, restoreRecentlyOpened, toStoreData } from 'vs/platform/workspaces/common/workspaces';
+import { join } from '../../../../base/common/path.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { NullLogService } from '../../../log/common/log.js';
+import { IWorkspaceIdentifier } from '../../../workspace/common/workspace.js';
+import { IRecentFolder, IRecentlyOpened, IRecentWorkspace, isRecentFolder, restoreRecentlyOpened, toStoreData } from '../../common/workspaces.js';
 
 suite('History Storage', () => {
 
diff --git a/src/vs/platform/workspaces/test/electron-main/workspacesManagementMainService.test.ts b/src/vs/platform/workspaces/test/electron-main/workspacesManagementMainService.test.ts
index fe5bd2994c8..8b870f33a27 100644
--- a/src/vs/platform/workspaces/test/electron-main/workspacesManagementMainService.test.ts
+++ b/src/vs/platform/workspaces/test/electron-main/workspacesManagementMainService.test.ts
@@ -6,32 +6,32 @@
 import assert from 'assert';
 import * as fs from 'fs';
 import * as os from 'os';
-import { isUNC, toSlashes } from 'vs/base/common/extpath';
-import { normalizeDriveLetter } from 'vs/base/common/labels';
-import * as path from 'vs/base/common/path';
-import { isWindows } from 'vs/base/common/platform';
-import { extUriBiasedIgnorePathCase } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import * as pfs from 'vs/base/node/pfs';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { flakySuite, getRandomTestPath } from 'vs/base/test/node/testUtils';
-import { IWorkspaceBackupInfo, IFolderBackupInfo } from 'vs/platform/backup/common/backup';
-import { IBackupMainService } from 'vs/platform/backup/electron-main/backup';
-import { IEmptyWindowBackupInfo } from 'vs/platform/backup/node/backup';
-import { INativeOpenDialogOptions } from 'vs/platform/dialogs/common/dialogs';
-import { IDialogMainService } from 'vs/platform/dialogs/electron-main/dialogMainService';
-import { EnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
-import { OPTIONS, parseArgs } from 'vs/platform/environment/node/argv';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { NullLogService } from 'vs/platform/log/common/log';
-import product from 'vs/platform/product/common/product';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { SaveStrategy, StateService } from 'vs/platform/state/node/stateService';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { UserDataProfilesMainService } from 'vs/platform/userDataProfile/electron-main/userDataProfile';
-import { IRawFileWorkspaceFolder, IRawUriWorkspaceFolder, WORKSPACE_EXTENSION } from 'vs/platform/workspace/common/workspace';
-import { IStoredWorkspace, IStoredWorkspaceFolder, IWorkspaceFolderCreationData, rewriteWorkspaceFileForNewLocation } from 'vs/platform/workspaces/common/workspaces';
-import { WorkspacesManagementMainService } from 'vs/platform/workspaces/electron-main/workspacesManagementMainService';
+import { isUNC, toSlashes } from '../../../../base/common/extpath.js';
+import { normalizeDriveLetter } from '../../../../base/common/labels.js';
+import * as path from '../../../../base/common/path.js';
+import { isWindows } from '../../../../base/common/platform.js';
+import { extUriBiasedIgnorePathCase } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import * as pfs from '../../../../base/node/pfs.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { flakySuite, getRandomTestPath } from '../../../../base/test/node/testUtils.js';
+import { IWorkspaceBackupInfo, IFolderBackupInfo } from '../../../backup/common/backup.js';
+import { IBackupMainService } from '../../../backup/electron-main/backup.js';
+import { IEmptyWindowBackupInfo } from '../../../backup/node/backup.js';
+import { INativeOpenDialogOptions } from '../../../dialogs/common/dialogs.js';
+import { IDialogMainService } from '../../../dialogs/electron-main/dialogMainService.js';
+import { EnvironmentMainService } from '../../../environment/electron-main/environmentMainService.js';
+import { OPTIONS, parseArgs } from '../../../environment/node/argv.js';
+import { FileService } from '../../../files/common/fileService.js';
+import { NullLogService } from '../../../log/common/log.js';
+import product from '../../../product/common/product.js';
+import { IProductService } from '../../../product/common/productService.js';
+import { SaveStrategy, StateService } from '../../../state/node/stateService.js';
+import { UriIdentityService } from '../../../uriIdentity/common/uriIdentityService.js';
+import { UserDataProfilesMainService } from '../../../userDataProfile/electron-main/userDataProfile.js';
+import { IRawFileWorkspaceFolder, IRawUriWorkspaceFolder, WORKSPACE_EXTENSION } from '../../../workspace/common/workspace.js';
+import { IStoredWorkspace, IStoredWorkspaceFolder, IWorkspaceFolderCreationData, rewriteWorkspaceFileForNewLocation } from '../../common/workspaces.js';
+import { WorkspacesManagementMainService } from '../../electron-main/workspacesManagementMainService.js';
 
 flakySuite('WorkspacesManagementMainService', () => {
 
@@ -112,7 +112,7 @@ flakySuite('WorkspacesManagementMainService', () => {
 		const fileService = new FileService(logService);
 		service = new WorkspacesManagementMainService(environmentMainService, logService, new UserDataProfilesMainService(new StateService(SaveStrategy.DELAYED, environmentMainService, logService, fileService), new UriIdentityService(fileService), environmentMainService, fileService, logService), new TestBackupMainService(), new TestDialogMainService());
 
-		return pfs.Promises.mkdir(untitledWorkspacesHomePath, { recursive: true });
+		return fs.promises.mkdir(untitledWorkspacesHomePath, { recursive: true });
 	});
 
 	teardown(() => {
diff --git a/src/vs/server/node/extensionHostConnection.ts b/src/vs/server/node/extensionHostConnection.ts
index 9fbb33d3ece..a3584893505 100644
--- a/src/vs/server/node/extensionHostConnection.ts
+++ b/src/vs/server/node/extensionHostConnection.ts
@@ -5,23 +5,23 @@
 
 import * as cp from 'child_process';
 import * as net from 'net';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { FileAccess } from 'vs/base/common/network';
-import { delimiter, join } from 'vs/base/common/path';
-import { IProcessEnvironment, isWindows } from 'vs/base/common/platform';
-import { removeDangerousEnvVariables } from 'vs/base/common/processes';
-import { createRandomIPCHandle, NodeSocket, WebSocketNodeSocket } from 'vs/base/parts/ipc/node/ipc.net';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IRemoteExtensionHostStartParams } from 'vs/platform/remote/common/remoteAgentConnection';
-import { getResolvedShellEnv } from 'vs/platform/shell/node/shellEnv';
-import { IExtensionHostStatusService } from 'vs/server/node/extensionHostStatusService';
-import { getNLSConfiguration } from 'vs/server/node/remoteLanguagePacks';
-import { IServerEnvironmentService } from 'vs/server/node/serverEnvironmentService';
-import { IPCExtHostConnection, SocketExtHostConnection, writeExtHostConnection } from 'vs/workbench/services/extensions/common/extensionHostEnv';
-import { IExtHostReadyMessage, IExtHostReduceGraceTimeMessage, IExtHostSocketMessage } from 'vs/workbench/services/extensions/common/extensionHostProtocol';
+import { VSBuffer } from '../../base/common/buffer.js';
+import { Emitter, Event } from '../../base/common/event.js';
+import { Disposable, DisposableStore, toDisposable } from '../../base/common/lifecycle.js';
+import { FileAccess } from '../../base/common/network.js';
+import { delimiter, join } from '../../base/common/path.js';
+import { IProcessEnvironment, isWindows } from '../../base/common/platform.js';
+import { removeDangerousEnvVariables } from '../../base/common/processes.js';
+import { createRandomIPCHandle, NodeSocket, WebSocketNodeSocket } from '../../base/parts/ipc/node/ipc.net.js';
+import { IConfigurationService } from '../../platform/configuration/common/configuration.js';
+import { ILogService } from '../../platform/log/common/log.js';
+import { IRemoteExtensionHostStartParams } from '../../platform/remote/common/remoteAgentConnection.js';
+import { getResolvedShellEnv } from '../../platform/shell/node/shellEnv.js';
+import { IExtensionHostStatusService } from './extensionHostStatusService.js';
+import { getNLSConfiguration } from './remoteLanguagePacks.js';
+import { IServerEnvironmentService } from './serverEnvironmentService.js';
+import { IPCExtHostConnection, SocketExtHostConnection, writeExtHostConnection } from '../../workbench/services/extensions/common/extensionHostEnv.js';
+import { IExtHostReadyMessage, IExtHostReduceGraceTimeMessage, IExtHostSocketMessage } from '../../workbench/services/extensions/common/extensionHostProtocol.js';
 
 export async function buildUserEnvironment(startParamsEnv: { [key: string]: string | null } = {}, withUserShellEnvironment: boolean, language: string, environmentService: IServerEnvironmentService, logService: ILogService, configurationService: IConfigurationService): Promise<IProcessEnvironment> {
 	const nlsConfig = await getNLSConfiguration(language, environmentService.userDataPath);
@@ -41,9 +41,9 @@ export async function buildUserEnvironment(startParamsEnv: { [key: string]: stri
 		...processEnv,
 		...userShellEnv,
 		...{
-			VSCODE_AMD_ENTRYPOINT: 'vs/workbench/api/node/extensionHostProcess',
+			VSCODE_ESM_ENTRYPOINT: 'vs/workbench/api/node/extensionHostProcess',
 			VSCODE_HANDLES_UNCAUGHT_ERRORS: 'true',
-			VSCODE_NLS_CONFIG: JSON.stringify(nlsConfig, undefined, 0)
+			VSCODE_NLS_CONFIG: JSON.stringify(nlsConfig)
 		},
 		...startParamsEnv
 	};
diff --git a/src/vs/server/node/extensionHostStatusService.ts b/src/vs/server/node/extensionHostStatusService.ts
index d6f7c9e1beb..79426739b7f 100644
--- a/src/vs/server/node/extensionHostStatusService.ts
+++ b/src/vs/server/node/extensionHostStatusService.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IExtensionHostExitInfo } from 'vs/workbench/services/remote/common/remoteAgentService';
+import { createDecorator } from '../../platform/instantiation/common/instantiation.js';
+import { IExtensionHostExitInfo } from '../../workbench/services/remote/common/remoteAgentService.js';
 
 export const IExtensionHostStatusService = createDecorator<IExtensionHostStatusService>('extensionHostStatusService');
 
diff --git a/src/vs/server/node/extensionsScannerService.ts b/src/vs/server/node/extensionsScannerService.ts
index 5430ae19162..5a191557cc2 100644
--- a/src/vs/server/node/extensionsScannerService.ts
+++ b/src/vs/server/node/extensionsScannerService.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { joinPath } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IExtensionsProfileScannerService } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService';
-import { AbstractExtensionsScannerService, IExtensionsScannerService, Translations } from 'vs/platform/extensionManagement/common/extensionsScannerService';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { getNLSConfiguration, InternalNLSConfiguration } from 'vs/server/node/remoteLanguagePacks';
+import { joinPath } from '../../base/common/resources.js';
+import { URI } from '../../base/common/uri.js';
+import { INativeEnvironmentService } from '../../platform/environment/common/environment.js';
+import { IExtensionsProfileScannerService } from '../../platform/extensionManagement/common/extensionsProfileScannerService.js';
+import { AbstractExtensionsScannerService, IExtensionsScannerService, Translations } from '../../platform/extensionManagement/common/extensionsScannerService.js';
+import { IFileService } from '../../platform/files/common/files.js';
+import { IInstantiationService } from '../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../platform/log/common/log.js';
+import { IProductService } from '../../platform/product/common/productService.js';
+import { IUriIdentityService } from '../../platform/uriIdentity/common/uriIdentity.js';
+import { IUserDataProfilesService } from '../../platform/userDataProfile/common/userDataProfile.js';
+import { getNLSConfiguration } from './remoteLanguagePacks.js';
 
 export class ExtensionsScannerService extends AbstractExtensionsScannerService implements IExtensionsScannerService {
 
@@ -38,9 +38,9 @@ export class ExtensionsScannerService extends AbstractExtensionsScannerService i
 
 	protected async getTranslations(language: string): Promise<Translations> {
 		const config = await getNLSConfiguration(language, this.nativeEnvironmentService.userDataPath);
-		if (InternalNLSConfiguration.is(config)) {
+		if (config.languagePack) {
 			try {
-				const content = await this.fileService.readFile(URI.file(config._translationsConfigFile));
+				const content = await this.fileService.readFile(URI.file(config.languagePack.translationsConfigFile));
 				return JSON.parse(content.value.toString());
 			} catch (err) { /* Ignore error */ }
 		}
diff --git a/src/vs/server/node/remoteAgentEnvironmentImpl.ts b/src/vs/server/node/remoteAgentEnvironmentImpl.ts
index b9861444caf..e050ae1f4f5 100644
--- a/src/vs/server/node/remoteAgentEnvironmentImpl.ts
+++ b/src/vs/server/node/remoteAgentEnvironmentImpl.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import * as platform from 'vs/base/common/platform';
-import * as performance from 'vs/base/common/performance';
-import { URI } from 'vs/base/common/uri';
-import { createURITransformer } from 'vs/workbench/api/node/uriTransformer';
-import { IRemoteAgentEnvironmentDTO, IGetEnvironmentDataArguments, IGetExtensionHostExitInfoArguments } from 'vs/workbench/services/remote/common/remoteAgentEnvironmentChannel';
-import { IServerEnvironmentService } from 'vs/server/node/serverEnvironmentService';
-import { IServerChannel } from 'vs/base/parts/ipc/common/ipc';
-import { transformOutgoingURIs } from 'vs/base/common/uriIpc';
-import { listProcesses } from 'vs/base/node/ps';
-import { getMachineInfo, collectWorkspaceStats } from 'vs/platform/diagnostics/node/diagnosticsService';
-import { IDiagnosticInfoOptions, IDiagnosticInfo } from 'vs/platform/diagnostics/common/diagnostics';
-import { basename } from 'vs/base/common/path';
-import { ProcessItem } from 'vs/base/common/processes';
-import { ServerConnectionToken, ServerConnectionTokenType } from 'vs/server/node/serverConnectionToken';
-import { IExtensionHostStatusService } from 'vs/server/node/extensionHostStatusService';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { joinPath } from 'vs/base/common/resources';
+import { Event } from '../../base/common/event.js';
+import * as platform from '../../base/common/platform.js';
+import * as performance from '../../base/common/performance.js';
+import { URI } from '../../base/common/uri.js';
+import { createURITransformer } from '../../workbench/api/node/uriTransformer.js';
+import { IRemoteAgentEnvironmentDTO, IGetEnvironmentDataArguments, IGetExtensionHostExitInfoArguments } from '../../workbench/services/remote/common/remoteAgentEnvironmentChannel.js';
+import { IServerEnvironmentService } from './serverEnvironmentService.js';
+import { IServerChannel } from '../../base/parts/ipc/common/ipc.js';
+import { transformOutgoingURIs } from '../../base/common/uriIpc.js';
+import { listProcesses } from '../../base/node/ps.js';
+import { getMachineInfo, collectWorkspaceStats } from '../../platform/diagnostics/node/diagnosticsService.js';
+import { IDiagnosticInfoOptions, IDiagnosticInfo } from '../../platform/diagnostics/common/diagnostics.js';
+import { basename } from '../../base/common/path.js';
+import { ProcessItem } from '../../base/common/processes.js';
+import { ServerConnectionToken, ServerConnectionTokenType } from './serverConnectionToken.js';
+import { IExtensionHostStatusService } from './extensionHostStatusService.js';
+import { IUserDataProfilesService } from '../../platform/userDataProfile/common/userDataProfile.js';
+import { joinPath } from '../../base/common/resources.js';
 
 export class RemoteAgentEnvironmentChannel implements IServerChannel {
 
diff --git a/src/vs/server/node/remoteExtensionHostAgentCli.ts b/src/vs/server/node/remoteExtensionHostAgentCli.ts
index b489ca72bcb..7e30e9af688 100644
--- a/src/vs/server/node/remoteExtensionHostAgentCli.ts
+++ b/src/vs/server/node/remoteExtensionHostAgentCli.ts
@@ -3,53 +3,53 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { ConsoleLogger, getLogLevel, ILoggerService, ILogService } from 'vs/platform/log/common/log';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { ConfigurationService } from 'vs/platform/configuration/common/configurationService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IRequestService } from 'vs/platform/request/common/request';
-import { RequestService } from 'vs/platform/request/node/requestService';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IExtensionGalleryService, InstallOptions } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { ExtensionGalleryServiceWithNoStorageService } from 'vs/platform/extensionManagement/common/extensionGalleryService';
-import { ExtensionManagementService, INativeServerExtensionManagementService } from 'vs/platform/extensionManagement/node/extensionManagementService';
-import { ExtensionSignatureVerificationService, IExtensionSignatureVerificationService } from 'vs/platform/extensionManagement/node/extensionSignatureVerificationService';
-import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import product from 'vs/platform/product/common/product';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
-import { Schemas } from 'vs/base/common/network';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IServerEnvironmentService, ServerEnvironmentService, ServerParsedArgs } from 'vs/server/node/serverEnvironmentService';
-import { ExtensionManagementCLI } from 'vs/platform/extensionManagement/common/extensionManagementCLI';
-import { ILanguagePackService } from 'vs/platform/languagePacks/common/languagePacks';
-import { NativeLanguagePackService } from 'vs/platform/languagePacks/node/languagePacks';
-import { getErrorMessage } from 'vs/base/common/errors';
-import { URI } from 'vs/base/common/uri';
-import { isAbsolute, join } from 'vs/base/common/path';
-import { cwd } from 'vs/base/common/process';
-import { DownloadService } from 'vs/platform/download/common/downloadService';
-import { IDownloadService } from 'vs/platform/download/common/download';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { buildHelpMessage, buildVersionMessage, OptionDescriptions } from 'vs/platform/environment/node/argv';
-import { isWindows } from 'vs/base/common/platform';
-import { IExtensionsScannerService } from 'vs/platform/extensionManagement/common/extensionsScannerService';
-import { ExtensionsScannerService } from 'vs/server/node/extensionsScannerService';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IExtensionsProfileScannerService } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService';
-import { NullPolicyService } from 'vs/platform/policy/common/policy';
-import { ServerUserDataProfilesService } from 'vs/platform/userDataProfile/node/userDataProfile';
-import { ExtensionsProfileScannerService } from 'vs/platform/extensionManagement/node/extensionsProfileScannerService';
-import { LogService } from 'vs/platform/log/common/logService';
-import { LoggerService } from 'vs/platform/log/node/loggerService';
-import { localize } from 'vs/nls';
-import { addUNCHostToAllowlist, disableUNCAccessRestrictions } from 'vs/base/node/unc';
+import { ServiceCollection } from '../../platform/instantiation/common/serviceCollection.js';
+import { ConsoleLogger, getLogLevel, ILoggerService, ILogService } from '../../platform/log/common/log.js';
+import { SyncDescriptor } from '../../platform/instantiation/common/descriptors.js';
+import { ConfigurationService } from '../../platform/configuration/common/configurationService.js';
+import { IConfigurationService } from '../../platform/configuration/common/configuration.js';
+import { IRequestService } from '../../platform/request/common/request.js';
+import { RequestService } from '../../platform/request/node/requestService.js';
+import { NullTelemetryService } from '../../platform/telemetry/common/telemetryUtils.js';
+import { ITelemetryService } from '../../platform/telemetry/common/telemetry.js';
+import { IExtensionGalleryService, InstallOptions } from '../../platform/extensionManagement/common/extensionManagement.js';
+import { ExtensionGalleryServiceWithNoStorageService } from '../../platform/extensionManagement/common/extensionGalleryService.js';
+import { ExtensionManagementService, INativeServerExtensionManagementService } from '../../platform/extensionManagement/node/extensionManagementService.js';
+import { ExtensionSignatureVerificationService, IExtensionSignatureVerificationService } from '../../platform/extensionManagement/node/extensionSignatureVerificationService.js';
+import { InstantiationService } from '../../platform/instantiation/common/instantiationService.js';
+import { IInstantiationService } from '../../platform/instantiation/common/instantiation.js';
+import product from '../../platform/product/common/product.js';
+import { Disposable } from '../../base/common/lifecycle.js';
+import { FileService } from '../../platform/files/common/fileService.js';
+import { DiskFileSystemProvider } from '../../platform/files/node/diskFileSystemProvider.js';
+import { Schemas } from '../../base/common/network.js';
+import { IFileService } from '../../platform/files/common/files.js';
+import { IProductService } from '../../platform/product/common/productService.js';
+import { IServerEnvironmentService, ServerEnvironmentService, ServerParsedArgs } from './serverEnvironmentService.js';
+import { ExtensionManagementCLI } from '../../platform/extensionManagement/common/extensionManagementCLI.js';
+import { ILanguagePackService } from '../../platform/languagePacks/common/languagePacks.js';
+import { NativeLanguagePackService } from '../../platform/languagePacks/node/languagePacks.js';
+import { getErrorMessage } from '../../base/common/errors.js';
+import { URI } from '../../base/common/uri.js';
+import { isAbsolute, join } from '../../base/common/path.js';
+import { cwd } from '../../base/common/process.js';
+import { DownloadService } from '../../platform/download/common/downloadService.js';
+import { IDownloadService } from '../../platform/download/common/download.js';
+import { IUriIdentityService } from '../../platform/uriIdentity/common/uriIdentity.js';
+import { UriIdentityService } from '../../platform/uriIdentity/common/uriIdentityService.js';
+import { buildHelpMessage, buildVersionMessage, OptionDescriptions } from '../../platform/environment/node/argv.js';
+import { isWindows } from '../../base/common/platform.js';
+import { IExtensionsScannerService } from '../../platform/extensionManagement/common/extensionsScannerService.js';
+import { ExtensionsScannerService } from './extensionsScannerService.js';
+import { IUserDataProfilesService } from '../../platform/userDataProfile/common/userDataProfile.js';
+import { IExtensionsProfileScannerService } from '../../platform/extensionManagement/common/extensionsProfileScannerService.js';
+import { NullPolicyService } from '../../platform/policy/common/policy.js';
+import { ServerUserDataProfilesService } from '../../platform/userDataProfile/node/userDataProfile.js';
+import { ExtensionsProfileScannerService } from '../../platform/extensionManagement/node/extensionsProfileScannerService.js';
+import { LogService } from '../../platform/log/common/logService.js';
+import { LoggerService } from '../../platform/log/node/loggerService.js';
+import { localize } from '../../nls.js';
+import { addUNCHostToAllowlist, disableUNCAccessRestrictions } from '../../base/node/unc.js';
 
 class CliMain extends Disposable {
 
diff --git a/src/vs/server/node/remoteExtensionHostAgentServer.ts b/src/vs/server/node/remoteExtensionHostAgentServer.ts
index 29aa95e5683..77b124f9700 100644
--- a/src/vs/server/node/remoteExtensionHostAgentServer.ts
+++ b/src/vs/server/node/remoteExtensionHostAgentServer.ts
@@ -9,37 +9,38 @@ import * as http from 'http';
 import * as net from 'net';
 import { performance } from 'perf_hooks';
 import * as url from 'url';
-import { LoaderStats } from 'vs/base/common/amd';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CharCode } from 'vs/base/common/charCode';
-import { isSigPipeError, onUnexpectedError, setUnexpectedErrorHandler } from 'vs/base/common/errors';
-import { isEqualOrParent } from 'vs/base/common/extpath';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { connectionTokenQueryName, FileAccess, getServerRootPath, Schemas } from 'vs/base/common/network';
-import { dirname, join } from 'vs/base/common/path';
-import * as perf from 'vs/base/common/performance';
-import * as platform from 'vs/base/common/platform';
-import { createRegExp, escapeRegExpCharacters } from 'vs/base/common/strings';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { getOSReleaseInfo } from 'vs/base/node/osReleaseInfo';
-import { findFreePort } from 'vs/base/node/ports';
-import { addUNCHostToAllowlist, disableUNCAccessRestrictions } from 'vs/base/node/unc';
-import { PersistentProtocol } from 'vs/base/parts/ipc/common/ipc.net';
-import { NodeSocket, WebSocketNodeSocket } from 'vs/base/parts/ipc/node/ipc.net';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ConnectionType, ConnectionTypeRequest, ErrorMessage, HandshakeMessage, IRemoteExtensionHostStartParams, ITunnelConnectionStartParams, SignRequest } from 'vs/platform/remote/common/remoteAgentConnection';
-import { RemoteAgentConnectionContext } from 'vs/platform/remote/common/remoteAgentEnvironment';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { ExtensionHostConnection } from 'vs/server/node/extensionHostConnection';
-import { ManagementConnection } from 'vs/server/node/remoteExtensionManagement';
-import { determineServerConnectionToken, requestHasValidConnectionToken as httpRequestHasValidConnectionToken, ServerConnectionToken, ServerConnectionTokenParseError, ServerConnectionTokenType } from 'vs/server/node/serverConnectionToken';
-import { IServerEnvironmentService, ServerParsedArgs } from 'vs/server/node/serverEnvironmentService';
-import { setupServerServices, SocketServer } from 'vs/server/node/serverServices';
-import { CacheControl, serveError, serveFile, WebClientServer } from 'vs/server/node/webClientServer';
+import { VSBuffer } from '../../base/common/buffer.js';
+import { CharCode } from '../../base/common/charCode.js';
+import { isSigPipeError, onUnexpectedError, setUnexpectedErrorHandler } from '../../base/common/errors.js';
+import { isEqualOrParent } from '../../base/common/extpath.js';
+import { Disposable, DisposableStore } from '../../base/common/lifecycle.js';
+import { connectionTokenQueryName, FileAccess, getServerRootPath, Schemas } from '../../base/common/network.js';
+import { dirname, join } from '../../base/common/path.js';
+import * as perf from '../../base/common/performance.js';
+import * as platform from '../../base/common/platform.js';
+import { createRegExp, escapeRegExpCharacters } from '../../base/common/strings.js';
+import { URI } from '../../base/common/uri.js';
+import { generateUuid } from '../../base/common/uuid.js';
+import { getOSReleaseInfo } from '../../base/node/osReleaseInfo.js';
+import { findFreePort } from '../../base/node/ports.js';
+import { addUNCHostToAllowlist, disableUNCAccessRestrictions } from '../../base/node/unc.js';
+import { PersistentProtocol } from '../../base/parts/ipc/common/ipc.net.js';
+import { NodeSocket, WebSocketNodeSocket } from '../../base/parts/ipc/node/ipc.net.js';
+import { IConfigurationService } from '../../platform/configuration/common/configuration.js';
+import { IInstantiationService } from '../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../platform/log/common/log.js';
+import { IProductService } from '../../platform/product/common/productService.js';
+import { ConnectionType, ConnectionTypeRequest, ErrorMessage, HandshakeMessage, IRemoteExtensionHostStartParams, ITunnelConnectionStartParams, SignRequest } from '../../platform/remote/common/remoteAgentConnection.js';
+import { RemoteAgentConnectionContext } from '../../platform/remote/common/remoteAgentEnvironment.js';
+import { ITelemetryService } from '../../platform/telemetry/common/telemetry.js';
+import { ExtensionHostConnection } from './extensionHostConnection.js';
+import { ManagementConnection } from './remoteExtensionManagement.js';
+import { determineServerConnectionToken, requestHasValidConnectionToken as httpRequestHasValidConnectionToken, ServerConnectionToken, ServerConnectionTokenParseError, ServerConnectionTokenType } from './serverConnectionToken.js';
+import { IServerEnvironmentService, ServerParsedArgs } from './serverEnvironmentService.js';
+import { setupServerServices, SocketServer } from './serverServices.js';
+import { CacheControl, serveError, serveFile, WebClientServer } from './webClientServer.js';
+import { createRequire } from 'node:module';
+const require = createRequire(import.meta.url);
 
 const SHUTDOWN_TIMEOUT = 5 * 60 * 1000;
 
@@ -696,7 +697,7 @@ export async function createServer(address: string | net.AddressInfo | null, arg
 	let didLogAboutSIGPIPE = false;
 	process.on('SIGPIPE', () => {
 		// See https://github.com/microsoft/vscode-remote-release/issues/6543
-		// We would normally install a SIGPIPE listener in bootstrap.js
+		// We would normally install a SIGPIPE listener in bootstrap-node.js
 		// But in certain situations, the console itself can be in a broken pipe state
 		// so logging SIGPIPE to the console will cause an infinite async loop
 		if (!didLogAboutSIGPIPE) {
@@ -768,7 +769,7 @@ export async function createServer(address: string | net.AddressInfo | null, arg
 		const hasVSDA = fs.existsSync(join(FileAccess.asFileUri('').fsPath, '../node_modules/vsda'));
 		if (hasVSDA) {
 			try {
-				return <typeof vsda>globalThis._VSCODE_NODE_MODULES['vsda'];
+				return require('vsda');
 			} catch (err) {
 				logService.error(err);
 			}
@@ -781,7 +782,7 @@ export async function createServer(address: string | net.AddressInfo | null, arg
 		serverBasePath = `/${serverBasePath}`;
 	}
 
-	const hasWebClient = fs.existsSync(FileAccess.asFileUri('vs/code/browser/workbench/workbench.html').fsPath);
+	const hasWebClient = fs.existsSync(FileAccess.asFileUri(`vs/code/browser/workbench/workbench.html`).fsPath);
 
 	if (hasWebClient && address && typeof address !== 'string') {
 		// ships the web ui!
@@ -847,16 +848,7 @@ export async function createServer(address: string | net.AddressInfo | null, arg
 	});
 
 	if (args['print-startup-performance']) {
-		const stats = LoaderStats.get();
 		let output = '';
-		output += '\n\n### Load AMD-module\n';
-		output += LoaderStats.toMarkdownTable(['Module', 'Duration'], stats.amdLoad);
-		output += '\n\n### Load commonjs-module\n';
-		output += LoaderStats.toMarkdownTable(['Module', 'Duration'], stats.nodeRequire);
-		output += '\n\n### Invoke AMD-module factory\n';
-		output += LoaderStats.toMarkdownTable(['Module', 'Duration'], stats.amdInvoke);
-		output += '\n\n### Invoke commonjs-module\n';
-		output += LoaderStats.toMarkdownTable(['Module', 'Duration'], stats.nodeEval);
 		output += `Start-up time: ${vscodeServerListenTime - vscodeServerStartTime}\n`;
 		output += `Code loading time: ${vscodeServerCodeLoadedTime - vscodeServerStartTime}\n`;
 		output += `Initialized time: ${currentTime - vscodeServerStartTime}\n`;
diff --git a/src/vs/server/node/remoteExtensionManagement.ts b/src/vs/server/node/remoteExtensionManagement.ts
index 8c19086588a..d9179e2b2d0 100644
--- a/src/vs/server/node/remoteExtensionManagement.ts
+++ b/src/vs/server/node/remoteExtensionManagement.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { PersistentProtocol, ProtocolConstants, ISocket } from 'vs/base/parts/ipc/common/ipc.net';
-import { ILogService } from 'vs/platform/log/common/log';
-import { Emitter, Event } from 'vs/base/common/event';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { ProcessTimeRunOnceScheduler } from 'vs/base/common/async';
+import { PersistentProtocol, ProtocolConstants, ISocket } from '../../base/parts/ipc/common/ipc.net.js';
+import { ILogService } from '../../platform/log/common/log.js';
+import { Emitter, Event } from '../../base/common/event.js';
+import { VSBuffer } from '../../base/common/buffer.js';
+import { ProcessTimeRunOnceScheduler } from '../../base/common/async.js';
 
 function printTime(ms: number): string {
 	let h = 0;
diff --git a/src/vs/server/node/remoteExtensionsScanner.ts b/src/vs/server/node/remoteExtensionsScanner.ts
index 7b58140ea1b..ee94de1090d 100644
--- a/src/vs/server/node/remoteExtensionsScanner.ts
+++ b/src/vs/server/node/remoteExtensionsScanner.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isAbsolute, join, resolve } from 'vs/base/common/path';
-import * as platform from 'vs/base/common/platform';
-import { cwd } from 'vs/base/common/process';
-import { URI } from 'vs/base/common/uri';
-import * as performance from 'vs/base/common/performance';
-import { Event } from 'vs/base/common/event';
-import { IURITransformer, transformOutgoingURIs } from 'vs/base/common/uriIpc';
-import { IServerChannel } from 'vs/base/parts/ipc/common/ipc';
-import { ContextKeyDefinedExpr, ContextKeyEqualsExpr, ContextKeyExpr, ContextKeyExpression, ContextKeyGreaterEqualsExpr, ContextKeyGreaterExpr, ContextKeyInExpr, ContextKeyNotEqualsExpr, ContextKeyNotExpr, ContextKeyNotInExpr, ContextKeyRegexExpr, ContextKeySmallerEqualsExpr, ContextKeySmallerExpr, IContextKeyExprMapper } from 'vs/platform/contextkey/common/contextkey';
-import { IExtensionGalleryService, InstallOptions } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { ExtensionManagementCLI } from 'vs/platform/extensionManagement/common/extensionManagementCLI';
-import { IExtensionsScannerService, toExtensionDescription } from 'vs/platform/extensionManagement/common/extensionsScannerService';
-import { ExtensionType, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IServerEnvironmentService } from 'vs/server/node/serverEnvironmentService';
-import { dedupExtensions } from 'vs/workbench/services/extensions/common/extensionsUtil';
-import { Schemas } from 'vs/base/common/network';
-import { IRemoteExtensionsScannerService } from 'vs/platform/remote/common/remoteExtensionsScanner';
-import { ILanguagePackService } from 'vs/platform/languagePacks/common/languagePacks';
+import { isAbsolute, join, resolve } from '../../base/common/path.js';
+import * as platform from '../../base/common/platform.js';
+import { cwd } from '../../base/common/process.js';
+import { URI } from '../../base/common/uri.js';
+import * as performance from '../../base/common/performance.js';
+import { Event } from '../../base/common/event.js';
+import { IURITransformer, transformOutgoingURIs } from '../../base/common/uriIpc.js';
+import { IServerChannel } from '../../base/parts/ipc/common/ipc.js';
+import { ContextKeyDefinedExpr, ContextKeyEqualsExpr, ContextKeyExpr, ContextKeyExpression, ContextKeyGreaterEqualsExpr, ContextKeyGreaterExpr, ContextKeyInExpr, ContextKeyNotEqualsExpr, ContextKeyNotExpr, ContextKeyNotInExpr, ContextKeyRegexExpr, ContextKeySmallerEqualsExpr, ContextKeySmallerExpr, IContextKeyExprMapper } from '../../platform/contextkey/common/contextkey.js';
+import { IExtensionGalleryService, InstallOptions } from '../../platform/extensionManagement/common/extensionManagement.js';
+import { ExtensionManagementCLI } from '../../platform/extensionManagement/common/extensionManagementCLI.js';
+import { IExtensionsScannerService, toExtensionDescription } from '../../platform/extensionManagement/common/extensionsScannerService.js';
+import { ExtensionType, IExtensionDescription } from '../../platform/extensions/common/extensions.js';
+import { ILogService } from '../../platform/log/common/log.js';
+import { IUserDataProfilesService } from '../../platform/userDataProfile/common/userDataProfile.js';
+import { IServerEnvironmentService } from './serverEnvironmentService.js';
+import { dedupExtensions } from '../../workbench/services/extensions/common/extensionsUtil.js';
+import { Schemas } from '../../base/common/network.js';
+import { IRemoteExtensionsScannerService } from '../../platform/remote/common/remoteExtensionsScanner.js';
+import { ILanguagePackService } from '../../platform/languagePacks/common/languagePacks.js';
 
 export class RemoteExtensionsScannerService implements IRemoteExtensionsScannerService {
 
diff --git a/src/vs/server/node/remoteFileSystemProviderServer.ts b/src/vs/server/node/remoteFileSystemProviderServer.ts
index 9a4c62a6aff..3ab5969e576 100644
--- a/src/vs/server/node/remoteFileSystemProviderServer.ts
+++ b/src/vs/server/node/remoteFileSystemProviderServer.ts
@@ -3,18 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { IURITransformer } from 'vs/base/common/uriIpc';
-import { IFileChange } from 'vs/platform/files/common/files';
-import { ILogService } from 'vs/platform/log/common/log';
-import { createURITransformer } from 'vs/workbench/api/node/uriTransformer';
-import { RemoteAgentConnectionContext } from 'vs/platform/remote/common/remoteAgentEnvironment';
-import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
-import { posix, delimiter } from 'vs/base/common/path';
-import { IServerEnvironmentService } from 'vs/server/node/serverEnvironmentService';
-import { AbstractDiskFileSystemProviderChannel, AbstractSessionFileWatcher, ISessionFileWatcher } from 'vs/platform/files/node/diskFileSystemProviderServer';
-import { IRecursiveWatcherOptions } from 'vs/platform/files/common/watcher';
+import { Emitter } from '../../base/common/event.js';
+import { URI, UriComponents } from '../../base/common/uri.js';
+import { IURITransformer } from '../../base/common/uriIpc.js';
+import { IFileChange } from '../../platform/files/common/files.js';
+import { ILogService } from '../../platform/log/common/log.js';
+import { createURITransformer } from '../../workbench/api/node/uriTransformer.js';
+import { RemoteAgentConnectionContext } from '../../platform/remote/common/remoteAgentEnvironment.js';
+import { DiskFileSystemProvider } from '../../platform/files/node/diskFileSystemProvider.js';
+import { posix, delimiter } from '../../base/common/path.js';
+import { IServerEnvironmentService } from './serverEnvironmentService.js';
+import { AbstractDiskFileSystemProviderChannel, AbstractSessionFileWatcher, ISessionFileWatcher } from '../../platform/files/node/diskFileSystemProviderServer.js';
+import { IRecursiveWatcherOptions } from '../../platform/files/common/watcher.js';
+import { IConfigurationService } from '../../platform/configuration/common/configuration.js';
 
 export class RemoteAgentFileSystemProviderChannel extends AbstractDiskFileSystemProviderChannel<RemoteAgentConnectionContext> {
 
@@ -22,7 +23,8 @@ export class RemoteAgentFileSystemProviderChannel extends AbstractDiskFileSystem
 
 	constructor(
 		logService: ILogService,
-		private readonly environmentService: IServerEnvironmentService
+		private readonly environmentService: IServerEnvironmentService,
+		private readonly configurationService: IConfigurationService
 	) {
 		super(new DiskFileSystemProvider(logService), logService);
 
@@ -52,7 +54,7 @@ export class RemoteAgentFileSystemProviderChannel extends AbstractDiskFileSystem
 	//#region File Watching
 
 	protected createSessionFileWatcher(uriTransformer: IURITransformer, emitter: Emitter<IFileChange[] | string>): ISessionFileWatcher {
-		return new SessionFileWatcher(uriTransformer, emitter, this.logService, this.environmentService);
+		return new SessionFileWatcher(uriTransformer, emitter, this.logService, this.environmentService, this.configurationService);
 	}
 
 	//#endregion
@@ -64,7 +66,8 @@ class SessionFileWatcher extends AbstractSessionFileWatcher {
 		uriTransformer: IURITransformer,
 		sessionEmitter: Emitter<IFileChange[] | string>,
 		logService: ILogService,
-		environmentService: IServerEnvironmentService
+		environmentService: IServerEnvironmentService,
+		configurationService: IConfigurationService
 	) {
 		super(uriTransformer, sessionEmitter, logService, environmentService);
 	}
diff --git a/src/vs/server/node/remoteLanguagePacks.ts b/src/vs/server/node/remoteLanguagePacks.ts
index 682b6f2b088..1e6db87fb53 100644
--- a/src/vs/server/node/remoteLanguagePacks.ts
+++ b/src/vs/server/node/remoteLanguagePacks.ts
@@ -3,46 +3,37 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as fs from 'fs';
-import { FileAccess } from 'vs/base/common/network';
-import * as path from 'vs/base/common/path';
+import { FileAccess } from '../../base/common/network.js';
+import { join } from '../../base/common/path.js';
+import type { INLSConfiguration } from '../../nls.js';
+import { resolveNLSConfiguration } from '../../base/node/nls.js';
+import { Promises } from '../../base/node/pfs.js';
+import product from '../../platform/product/common/product.js';
 
-import * as lp from 'vs/base/node/languagePacks';
-import product from 'vs/platform/product/common/product';
+const nlsMetadataPath = join(FileAccess.asFileUri('').fsPath);
+const defaultMessagesFile = join(nlsMetadataPath, 'nls.messages.json');
+const nlsConfigurationCache = new Map<string, Promise<INLSConfiguration>>();
 
-const metaData = path.join(FileAccess.asFileUri('').fsPath, 'nls.metadata.json');
-const _cache: Map<string, Promise<lp.NLSConfiguration>> = new Map();
+export async function getNLSConfiguration(language: string, userDataPath: string): Promise<INLSConfiguration> {
+	if (!product.commit || !(await Promises.exists(defaultMessagesFile))) {
+		return {
+			userLocale: 'en',
+			osLocale: 'en',
+			resolvedLanguage: 'en',
+			defaultMessagesFile,
 
-function exists(file: string) {
-	return new Promise(c => fs.exists(file, c));
-}
-
-export function getNLSConfiguration(language: string, userDataPath: string): Promise<lp.NLSConfiguration> {
-	return exists(metaData).then((fileExists) => {
-		if (!fileExists || !product.commit) {
-			// console.log(`==> MetaData or commit unknown. Using default language.`);
-			// The OS Locale on the remote side really doesn't matter, so we return the default locale
-			return Promise.resolve({ locale: 'en', osLocale: 'en', availableLanguages: {} });
-		}
-		const key = `${language}||${userDataPath}`;
-		let result = _cache.get(key);
-		if (!result) {
-			// The OS Locale on the remote side really doesn't matter, so we pass in the same language
-			result = lp.getNLSConfiguration(product.commit, userDataPath, metaData, language, language).then(value => {
-				if (InternalNLSConfiguration.is(value)) {
-					value._languagePackSupport = true;
-				}
-				return value;
-			});
-			_cache.set(key, result);
-		}
-		return result;
-	});
-}
-
-export namespace InternalNLSConfiguration {
-	export function is(value: lp.NLSConfiguration): value is lp.InternalNLSConfiguration {
-		const candidate: lp.InternalNLSConfiguration = value as lp.InternalNLSConfiguration;
-		return candidate && typeof candidate._languagePackId === 'string';
+			// NLS: below 2 are a relic from old times only used by vscode-nls and deprecated
+			locale: 'en',
+			availableLanguages: {}
+		};
 	}
+
+	const cacheKey = `${language}||${userDataPath}`;
+	let result = nlsConfigurationCache.get(cacheKey);
+	if (!result) {
+		result = resolveNLSConfiguration({ userLocale: language, osLocale: language, commit: product.commit, userDataPath, nlsMetadataPath });
+		nlsConfigurationCache.set(cacheKey, result);
+	}
+
+	return result;
 }
diff --git a/src/vs/server/node/remoteTerminalChannel.ts b/src/vs/server/node/remoteTerminalChannel.ts
index 657d3e8238a..399c8d8f8e6 100644
--- a/src/vs/server/node/remoteTerminalChannel.ts
+++ b/src/vs/server/node/remoteTerminalChannel.ts
@@ -4,35 +4,35 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as os from 'os';
-import { Emitter, Event } from 'vs/base/common/event';
-import { cloneAndChange } from 'vs/base/common/objects';
-import { Disposable } from 'vs/base/common/lifecycle';
-import * as path from 'vs/base/common/path';
-import * as platform from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { IURITransformer } from 'vs/base/common/uriIpc';
-import { IServerChannel } from 'vs/base/parts/ipc/common/ipc';
-import { createRandomIPCHandle } from 'vs/base/parts/ipc/node/ipc.net';
-import { RemoteAgentConnectionContext } from 'vs/platform/remote/common/remoteAgentEnvironment';
-import { IPtyHostService, IShellLaunchConfig, ITerminalProfile } from 'vs/platform/terminal/common/terminal';
-import { IGetTerminalLayoutInfoArgs, ISetTerminalLayoutInfoArgs } from 'vs/platform/terminal/common/terminalProcess';
-import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { createURITransformer } from 'vs/workbench/api/node/uriTransformer';
-import { CLIServerBase, ICommandsExecuter } from 'vs/workbench/api/node/extHostCLIServer';
-import { IEnvironmentVariableCollection } from 'vs/platform/terminal/common/environmentVariable';
-import { MergedEnvironmentVariableCollection } from 'vs/platform/terminal/common/environmentVariableCollection';
-import { deserializeEnvironmentDescriptionMap, deserializeEnvironmentVariableCollection } from 'vs/platform/terminal/common/environmentVariableShared';
-import { ICreateTerminalProcessArguments, ICreateTerminalProcessResult, IWorkspaceFolderData, RemoteTerminalChannelEvent, RemoteTerminalChannelRequest } from 'vs/workbench/contrib/terminal/common/remote/terminal';
-import * as terminalEnvironment from 'vs/workbench/contrib/terminal/common/terminalEnvironment';
-import { AbstractVariableResolverService } from 'vs/workbench/services/configurationResolver/common/variableResolver';
-import { buildUserEnvironment } from 'vs/server/node/extensionHostConnection';
-import { IServerEnvironmentService } from 'vs/server/node/serverEnvironmentService';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ILogService } from 'vs/platform/log/common/log';
-import { promiseWithResolvers } from 'vs/base/common/async';
-import { shouldUseEnvironmentVariableCollection } from 'vs/platform/terminal/common/terminalEnvironment';
+import { Emitter, Event } from '../../base/common/event.js';
+import { cloneAndChange } from '../../base/common/objects.js';
+import { Disposable } from '../../base/common/lifecycle.js';
+import * as path from '../../base/common/path.js';
+import * as platform from '../../base/common/platform.js';
+import { URI } from '../../base/common/uri.js';
+import { IURITransformer } from '../../base/common/uriIpc.js';
+import { IServerChannel } from '../../base/parts/ipc/common/ipc.js';
+import { createRandomIPCHandle } from '../../base/parts/ipc/node/ipc.net.js';
+import { RemoteAgentConnectionContext } from '../../platform/remote/common/remoteAgentEnvironment.js';
+import { IPtyHostService, IShellLaunchConfig, ITerminalProfile } from '../../platform/terminal/common/terminal.js';
+import { IGetTerminalLayoutInfoArgs, ISetTerminalLayoutInfoArgs } from '../../platform/terminal/common/terminalProcess.js';
+import { IWorkspaceFolder } from '../../platform/workspace/common/workspace.js';
+import { createURITransformer } from '../../workbench/api/node/uriTransformer.js';
+import { CLIServerBase, ICommandsExecuter } from '../../workbench/api/node/extHostCLIServer.js';
+import { IEnvironmentVariableCollection } from '../../platform/terminal/common/environmentVariable.js';
+import { MergedEnvironmentVariableCollection } from '../../platform/terminal/common/environmentVariableCollection.js';
+import { deserializeEnvironmentDescriptionMap, deserializeEnvironmentVariableCollection } from '../../platform/terminal/common/environmentVariableShared.js';
+import { ICreateTerminalProcessArguments, ICreateTerminalProcessResult, IWorkspaceFolderData, RemoteTerminalChannelEvent, RemoteTerminalChannelRequest } from '../../workbench/contrib/terminal/common/remote/terminal.js';
+import * as terminalEnvironment from '../../workbench/contrib/terminal/common/terminalEnvironment.js';
+import { AbstractVariableResolverService } from '../../workbench/services/configurationResolver/common/variableResolver.js';
+import { buildUserEnvironment } from './extensionHostConnection.js';
+import { IServerEnvironmentService } from './serverEnvironmentService.js';
+import { IProductService } from '../../platform/product/common/productService.js';
+import { IExtensionManagementService } from '../../platform/extensionManagement/common/extensionManagement.js';
+import { IConfigurationService } from '../../platform/configuration/common/configuration.js';
+import { ILogService } from '../../platform/log/common/log.js';
+import { promiseWithResolvers } from '../../base/common/async.js';
+import { shouldUseEnvironmentVariableCollection } from '../../platform/terminal/common/terminalEnvironment.js';
 
 class CustomVariableResolver extends AbstractVariableResolverService {
 	constructor(
diff --git a/src/vs/server/node/server.cli.ts b/src/vs/server/node/server.cli.ts
index 2eed66f7ee0..9314c9d94ed 100644
--- a/src/vs/server/node/server.cli.ts
+++ b/src/vs/server/node/server.cli.ts
@@ -3,19 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as _fs from 'fs';
-import * as _url from 'url';
-import * as _cp from 'child_process';
-import * as _http from 'http';
-import * as _os from 'os';
-import { cwd } from 'vs/base/common/process';
-import { dirname, extname, resolve, join } from 'vs/base/common/path';
-import { parseArgs, buildHelpMessage, buildVersionMessage, OPTIONS, OptionDescriptions, ErrorReporter } from 'vs/platform/environment/node/argv';
-import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
-import { createWaitMarkerFileSync } from 'vs/platform/environment/node/wait';
-import { PipeCommand } from 'vs/workbench/api/node/extHostCLIServer';
-import { hasStdinWithoutTty, getStdinFilePath, readFromStdin } from 'vs/platform/environment/node/stdin';
-import { DeferredPromise } from 'vs/base/common/async';
+import * as fs from 'fs';
+import * as url from 'url';
+import * as cp from 'child_process';
+import * as http from 'http';
+import { cwd } from '../../base/common/process.js';
+import { dirname, extname, resolve, join } from '../../base/common/path.js';
+import { parseArgs, buildHelpMessage, buildVersionMessage, OPTIONS, OptionDescriptions, ErrorReporter } from '../../platform/environment/node/argv.js';
+import { NativeParsedArgs } from '../../platform/environment/common/argv.js';
+import { createWaitMarkerFileSync } from '../../platform/environment/node/wait.js';
+import { PipeCommand } from '../../workbench/api/node/extHostCLIServer.js';
+import { hasStdinWithoutTty, getStdinFilePath, readFromStdin } from '../../platform/environment/node/stdin.js';
+import { DeferredPromise } from '../../base/common/async.js';
 
 /*
  * Implements a standalone CLI app that opens VS Code from a remote terminal.
@@ -240,8 +239,8 @@ export async function main(desc: ProductDescription, args: string[]): Promise<vo
 				cmdLine.push('--update-extensions');
 			}
 
-			const cp = _cp.fork(join(__dirname, '../../../server-main.js'), cmdLine, { stdio: 'inherit' });
-			cp.on('error', err => console.log(err));
+			const childProcess = cp.fork(join(__dirname, '../../../server-main.js'), cmdLine, { stdio: 'inherit' });
+			childProcess.on('error', err => console.log(err));
 			return;
 		}
 
@@ -270,7 +269,7 @@ export async function main(desc: ProductDescription, args: string[]): Promise<vo
 			if (verbose) {
 				console.log(`Invoking: cmd.exe /C ${cliCommand} ${newCommandline.join(' ')} in ${processCwd}`);
 			}
-			_cp.spawn('cmd.exe', ['/C', cliCommand, ...newCommandline], {
+			cp.spawn('cmd.exe', ['/C', cliCommand, ...newCommandline], {
 				stdio: 'inherit',
 				cwd: processCwd
 			});
@@ -285,11 +284,11 @@ export async function main(desc: ProductDescription, args: string[]): Promise<vo
 				if (verbose) {
 					console.log(`Using pipes for output.`);
 				}
-				const cp = _cp.spawn(cliCommand, newCommandline, { cwd: cliCwd, env, stdio: ['inherit', 'pipe', 'pipe'] });
-				cp.stdout.on('data', data => process.stdout.write(data));
-				cp.stderr.on('data', data => process.stderr.write(data));
+				const childProcess = cp.spawn(cliCommand, newCommandline, { cwd: cliCwd, env, stdio: ['inherit', 'pipe', 'pipe'] });
+				childProcess.stdout.on('data', data => process.stdout.write(data));
+				childProcess.stderr.on('data', data => process.stderr.write(data));
 			} else {
-				_cp.spawn(cliCommand, newCommandline, { cwd: cliCwd, env, stdio: 'inherit' });
+				cp.spawn(cliCommand, newCommandline, { cwd: cliCwd, env, stdio: 'inherit' });
 			}
 		}
 	} else {
@@ -357,7 +356,7 @@ export async function main(desc: ProductDescription, args: string[]): Promise<vo
 function runningInWSL2(): boolean {
 	if (!!process.env['WSL_DISTRO_NAME']) {
 		try {
-			return _cp.execSync('uname -r', { encoding: 'utf8' }).includes('-microsoft-');
+			return cp.execSync('uname -r', { encoding: 'utf8' }).includes('-microsoft-');
 		} catch (_e) {
 			// Ignore
 		}
@@ -366,7 +365,7 @@ function runningInWSL2(): boolean {
 }
 
 async function waitForFileDeleted(path: string) {
-	while (_fs.existsSync(path)) {
+	while (fs.existsSync(path)) {
 		await new Promise(res => setTimeout(res, 1000));
 	}
 }
@@ -376,7 +375,7 @@ function openInBrowser(args: string[], verbose: boolean) {
 	for (const location of args) {
 		try {
 			if (/^(http|https|file):\/\//.test(location)) {
-				uris.push(_url.parse(location).href);
+				uris.push(url.parse(location).href);
 			} else {
 				uris.push(pathToURI(location).href);
 			}
@@ -394,7 +393,7 @@ function openInBrowser(args: string[], verbose: boolean) {
 	}
 }
 
-function sendToPipe(args: PipeCommand, verbose: boolean): Promise<any> {
+function sendToPipe(args: PipeCommand, verbose: boolean): Promise<string> {
 	if (verbose) {
 		console.log(JSON.stringify(args, null, '  '));
 	}
@@ -406,7 +405,7 @@ function sendToPipe(args: PipeCommand, verbose: boolean): Promise<any> {
 			return;
 		}
 
-		const opts: _http.RequestOptions = {
+		const opts: http.RequestOptions = {
 			socketPath: cliPipe,
 			path: '/',
 			method: 'POST',
@@ -416,7 +415,7 @@ function sendToPipe(args: PipeCommand, verbose: boolean): Promise<any> {
 			}
 		};
 
-		const req = _http.request(opts, res => {
+		const req = http.request(opts, res => {
 			if (res.headers['content-type'] !== 'application/json') {
 				reject('Error in response: Invalid content type: Expected \'application/json\', is: ' + res.headers['content-type']);
 				return;
@@ -461,18 +460,18 @@ function fatal(message: string, err: any): void {
 
 const preferredCwd = process.env.PWD || cwd(); // prefer process.env.PWD as it does not follow symlinks
 
-function pathToURI(input: string): _url.URL {
+function pathToURI(input: string): url.URL {
 	input = input.trim();
 	input = resolve(preferredCwd, input);
 
-	return _url.pathToFileURL(input);
+	return url.pathToFileURL(input);
 }
 
 function translatePath(input: string, mapFileUri: (input: string) => string, folderURIS: string[], fileURIS: string[]) {
 	const url = pathToURI(input);
 	const mappedUri = mapFileUri(url.href);
 	try {
-		const stat = _fs.lstatSync(_fs.realpathSync(input));
+		const stat = fs.lstatSync(fs.realpathSync(input));
 
 		if (stat.isFile()) {
 			fileURIS.push(mappedUri);
diff --git a/src/vs/server/node/server.main.ts b/src/vs/server/node/server.main.ts
index 469671e5745..f53f9eefcf6 100644
--- a/src/vs/server/node/server.main.ts
+++ b/src/vs/server/node/server.main.ts
@@ -6,15 +6,15 @@
 import * as os from 'os';
 import * as fs from 'fs';
 import * as net from 'net';
-import { FileAccess } from 'vs/base/common/network';
-import { run as runCli } from 'vs/server/node/remoteExtensionHostAgentCli';
-import { createServer as doCreateServer, IServerAPI } from 'vs/server/node/remoteExtensionHostAgentServer';
-import { parseArgs, ErrorReporter } from 'vs/platform/environment/node/argv';
-import { join, dirname } from 'vs/base/common/path';
+import { FileAccess } from '../../base/common/network.js';
+import { run as runCli } from './remoteExtensionHostAgentCli.js';
+import { createServer as doCreateServer, IServerAPI } from './remoteExtensionHostAgentServer.js';
+import { parseArgs, ErrorReporter } from '../../platform/environment/node/argv.js';
+import { join, dirname } from '../../base/common/path.js';
 import { performance } from 'perf_hooks';
-import { serverOptions } from 'vs/server/node/serverEnvironmentService';
-import product from 'vs/platform/product/common/product';
-import * as perf from 'vs/base/common/performance';
+import { serverOptions } from './serverEnvironmentService.js';
+import product from '../../platform/product/common/product.js';
+import * as perf from '../../base/common/performance.js';
 
 perf.mark('code/server/codeLoaded');
 (<any>global).vscodeServerCodeLoadedTime = performance.now();
diff --git a/src/vs/server/node/serverConnectionToken.ts b/src/vs/server/node/serverConnectionToken.ts
index f976d0e379a..b2036788008 100644
--- a/src/vs/server/node/serverConnectionToken.ts
+++ b/src/vs/server/node/serverConnectionToken.ts
@@ -7,11 +7,11 @@ import * as cookie from 'cookie';
 import * as fs from 'fs';
 import * as http from 'http';
 import * as url from 'url';
-import * as path from 'vs/base/common/path';
-import { generateUuid } from 'vs/base/common/uuid';
-import { connectionTokenCookieName, connectionTokenQueryName } from 'vs/base/common/network';
-import { ServerParsedArgs } from 'vs/server/node/serverEnvironmentService';
-import { Promises } from 'vs/base/node/pfs';
+import * as path from '../../base/common/path.js';
+import { generateUuid } from '../../base/common/uuid.js';
+import { connectionTokenCookieName, connectionTokenQueryName } from '../../base/common/network.js';
+import { ServerParsedArgs } from './serverEnvironmentService.js';
+import { Promises } from '../../base/node/pfs.js';
 
 const connectionTokenRegex = /^[0-9A-Za-z_-]+$/;
 
@@ -100,7 +100,7 @@ export async function determineServerConnectionToken(args: ServerParsedArgs): Pr
 
 		// First try to find a connection token
 		try {
-			const fileContents = await Promises.readFile(storageLocation);
+			const fileContents = await fs.promises.readFile(storageLocation);
 			const connectionToken = fileContents.toString().replace(/\r?\n$/, '');
 			if (connectionTokenRegex.test(connectionToken)) {
 				return connectionToken;
diff --git a/src/vs/server/node/serverEnvironmentService.ts b/src/vs/server/node/serverEnvironmentService.ts
index fce1842f1bd..2770df603e5 100644
--- a/src/vs/server/node/serverEnvironmentService.ts
+++ b/src/vs/server/node/serverEnvironmentService.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
+import * as nls from '../../nls.js';
 
-import { NativeEnvironmentService } from 'vs/platform/environment/node/environmentService';
-import { OPTIONS, OptionDescriptions } from 'vs/platform/environment/node/argv';
-import { refineServiceDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IEnvironmentService, INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-import { memoize } from 'vs/base/common/decorators';
-import { URI } from 'vs/base/common/uri';
+import { NativeEnvironmentService } from '../../platform/environment/node/environmentService.js';
+import { OPTIONS, OptionDescriptions } from '../../platform/environment/node/argv.js';
+import { refineServiceDecorator } from '../../platform/instantiation/common/instantiation.js';
+import { IEnvironmentService, INativeEnvironmentService } from '../../platform/environment/common/environment.js';
+import { memoize } from '../../base/common/decorators.js';
+import { URI } from '../../base/common/uri.js';
 
 export const serverOptions: OptionDescriptions<Required<ServerParsedArgs>> = {
 
diff --git a/src/vs/server/node/serverServices.ts b/src/vs/server/node/serverServices.ts
index 46f2f004655..cd1091150db 100644
--- a/src/vs/server/node/serverServices.ts
+++ b/src/vs/server/node/serverServices.ts
@@ -4,79 +4,80 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { hostname, release } from 'os';
-import { Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import * as path from 'vs/base/common/path';
-import { IURITransformer } from 'vs/base/common/uriIpc';
-import { getMachineId, getSqmMachineId, getdevDeviceId } from 'vs/base/node/id';
-import { Promises } from 'vs/base/node/pfs';
-import { ClientConnectionEvent, IMessagePassingProtocol, IPCServer, StaticRouter } from 'vs/base/parts/ipc/common/ipc';
-import { ProtocolConstants } from 'vs/base/parts/ipc/common/ipc.net';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ConfigurationService } from 'vs/platform/configuration/common/configurationService';
-import { ExtensionHostDebugBroadcastChannel } from 'vs/platform/debug/common/extensionHostDebugIpc';
-import { IDownloadService } from 'vs/platform/download/common/download';
-import { DownloadServiceChannelClient } from 'vs/platform/download/common/downloadIpc';
-import { IEnvironmentService, INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-import { ExtensionGalleryServiceWithNoStorageService } from 'vs/platform/extensionManagement/common/extensionGalleryService';
-import { IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { ExtensionSignatureVerificationService, IExtensionSignatureVerificationService } from 'vs/platform/extensionManagement/node/extensionSignatureVerificationService';
-import { ExtensionManagementCLI } from 'vs/platform/extensionManagement/common/extensionManagementCLI';
-import { ExtensionManagementChannel } from 'vs/platform/extensionManagement/common/extensionManagementIpc';
-import { ExtensionManagementService, INativeServerExtensionManagementService } from 'vs/platform/extensionManagement/node/extensionManagementService';
-import { IFileService } from 'vs/platform/files/common/files';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { ILanguagePackService } from 'vs/platform/languagePacks/common/languagePacks';
-import { NativeLanguagePackService } from 'vs/platform/languagePacks/node/languagePacks';
-import { AbstractLogger, DEFAULT_LOG_LEVEL, getLogLevel, ILoggerService, ILogService, log, LogLevel, LogLevelToString } from 'vs/platform/log/common/log';
-import product from 'vs/platform/product/common/product';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { RemoteAgentConnectionContext } from 'vs/platform/remote/common/remoteAgentEnvironment';
-import { IRequestService } from 'vs/platform/request/common/request';
-import { RequestChannel } from 'vs/platform/request/common/requestIpc';
-import { RequestService } from 'vs/platform/request/node/requestService';
-import { resolveCommonProperties } from 'vs/platform/telemetry/common/commonProperties';
-import { ITelemetryService, TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
-import { ITelemetryServiceConfig } from 'vs/platform/telemetry/common/telemetryService';
-import { getPiiPathsFromEnvironment, isInternalTelemetry, isLoggingOnly, ITelemetryAppender, NullAppender, supportsTelemetry } from 'vs/platform/telemetry/common/telemetryUtils';
-import ErrorTelemetry from 'vs/platform/telemetry/node/errorTelemetry';
-import { IPtyService, TerminalSettingId } from 'vs/platform/terminal/common/terminal';
-import { PtyHostService } from 'vs/platform/terminal/node/ptyHostService';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { RemoteAgentEnvironmentChannel } from 'vs/server/node/remoteAgentEnvironmentImpl';
-import { RemoteAgentFileSystemProviderChannel } from 'vs/server/node/remoteFileSystemProviderServer';
-import { ServerTelemetryChannel } from 'vs/platform/telemetry/common/remoteTelemetryChannel';
-import { IServerTelemetryService, ServerNullTelemetryService, ServerTelemetryService } from 'vs/platform/telemetry/common/serverTelemetryService';
-import { RemoteTerminalChannel } from 'vs/server/node/remoteTerminalChannel';
-import { createURITransformer } from 'vs/workbench/api/node/uriTransformer';
-import { ServerConnectionToken } from 'vs/server/node/serverConnectionToken';
-import { ServerEnvironmentService, ServerParsedArgs } from 'vs/server/node/serverEnvironmentService';
-import { REMOTE_TERMINAL_CHANNEL_NAME } from 'vs/workbench/contrib/terminal/common/remote/remoteTerminalChannel';
-import { REMOTE_FILE_SYSTEM_CHANNEL_NAME } from 'vs/workbench/services/remote/common/remoteFileSystemProviderClient';
-import { ExtensionHostStatusService, IExtensionHostStatusService } from 'vs/server/node/extensionHostStatusService';
-import { IExtensionsScannerService } from 'vs/platform/extensionManagement/common/extensionsScannerService';
-import { ExtensionsScannerService } from 'vs/server/node/extensionsScannerService';
-import { IExtensionsProfileScannerService } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { NullPolicyService } from 'vs/platform/policy/common/policy';
-import { OneDataSystemAppender } from 'vs/platform/telemetry/node/1dsAppender';
-import { LoggerService } from 'vs/platform/log/node/loggerService';
-import { ServerUserDataProfilesService } from 'vs/platform/userDataProfile/node/userDataProfile';
-import { ExtensionsProfileScannerService } from 'vs/platform/extensionManagement/node/extensionsProfileScannerService';
-import { LogService } from 'vs/platform/log/common/logService';
-import { LoggerChannel } from 'vs/platform/log/common/logIpc';
-import { localize } from 'vs/nls';
-import { RemoteExtensionsScannerChannel, RemoteExtensionsScannerService } from 'vs/server/node/remoteExtensionsScanner';
-import { RemoteExtensionsScannerChannelName } from 'vs/platform/remote/common/remoteExtensionsScanner';
-import { RemoteUserDataProfilesServiceChannel } from 'vs/platform/userDataProfile/common/userDataProfileIpc';
-import { NodePtyHostStarter } from 'vs/platform/terminal/node/nodePtyHostStarter';
+import { Emitter, Event } from '../../base/common/event.js';
+import { DisposableStore, toDisposable } from '../../base/common/lifecycle.js';
+import { Schemas } from '../../base/common/network.js';
+import * as path from '../../base/common/path.js';
+import { IURITransformer } from '../../base/common/uriIpc.js';
+import { getMachineId, getSqmMachineId, getdevDeviceId } from '../../base/node/id.js';
+import { Promises } from '../../base/node/pfs.js';
+import { ClientConnectionEvent, IMessagePassingProtocol, IPCServer, StaticRouter } from '../../base/parts/ipc/common/ipc.js';
+import { ProtocolConstants } from '../../base/parts/ipc/common/ipc.net.js';
+import { IConfigurationService } from '../../platform/configuration/common/configuration.js';
+import { ConfigurationService } from '../../platform/configuration/common/configurationService.js';
+import { ExtensionHostDebugBroadcastChannel } from '../../platform/debug/common/extensionHostDebugIpc.js';
+import { IDownloadService } from '../../platform/download/common/download.js';
+import { DownloadServiceChannelClient } from '../../platform/download/common/downloadIpc.js';
+import { IEnvironmentService, INativeEnvironmentService } from '../../platform/environment/common/environment.js';
+import { ExtensionGalleryServiceWithNoStorageService } from '../../platform/extensionManagement/common/extensionGalleryService.js';
+import { IExtensionGalleryService } from '../../platform/extensionManagement/common/extensionManagement.js';
+import { ExtensionSignatureVerificationService, IExtensionSignatureVerificationService } from '../../platform/extensionManagement/node/extensionSignatureVerificationService.js';
+import { ExtensionManagementCLI } from '../../platform/extensionManagement/common/extensionManagementCLI.js';
+import { ExtensionManagementChannel } from '../../platform/extensionManagement/common/extensionManagementIpc.js';
+import { ExtensionManagementService, INativeServerExtensionManagementService } from '../../platform/extensionManagement/node/extensionManagementService.js';
+import { IFileService } from '../../platform/files/common/files.js';
+import { FileService } from '../../platform/files/common/fileService.js';
+import { DiskFileSystemProvider } from '../../platform/files/node/diskFileSystemProvider.js';
+import { SyncDescriptor } from '../../platform/instantiation/common/descriptors.js';
+import { IInstantiationService } from '../../platform/instantiation/common/instantiation.js';
+import { InstantiationService } from '../../platform/instantiation/common/instantiationService.js';
+import { ServiceCollection } from '../../platform/instantiation/common/serviceCollection.js';
+import { ILanguagePackService } from '../../platform/languagePacks/common/languagePacks.js';
+import { NativeLanguagePackService } from '../../platform/languagePacks/node/languagePacks.js';
+import { AbstractLogger, DEFAULT_LOG_LEVEL, getLogLevel, ILoggerService, ILogService, log, LogLevel, LogLevelToString } from '../../platform/log/common/log.js';
+import product from '../../platform/product/common/product.js';
+import { IProductService } from '../../platform/product/common/productService.js';
+import { RemoteAgentConnectionContext } from '../../platform/remote/common/remoteAgentEnvironment.js';
+import { IRequestService } from '../../platform/request/common/request.js';
+import { RequestChannel } from '../../platform/request/common/requestIpc.js';
+import { RequestService } from '../../platform/request/node/requestService.js';
+import { resolveCommonProperties } from '../../platform/telemetry/common/commonProperties.js';
+import { ITelemetryService, TelemetryLevel } from '../../platform/telemetry/common/telemetry.js';
+import { ITelemetryServiceConfig } from '../../platform/telemetry/common/telemetryService.js';
+import { getPiiPathsFromEnvironment, isInternalTelemetry, isLoggingOnly, ITelemetryAppender, NullAppender, supportsTelemetry } from '../../platform/telemetry/common/telemetryUtils.js';
+import ErrorTelemetry from '../../platform/telemetry/node/errorTelemetry.js';
+import { IPtyService, TerminalSettingId } from '../../platform/terminal/common/terminal.js';
+import { PtyHostService } from '../../platform/terminal/node/ptyHostService.js';
+import { IUriIdentityService } from '../../platform/uriIdentity/common/uriIdentity.js';
+import { UriIdentityService } from '../../platform/uriIdentity/common/uriIdentityService.js';
+import { RemoteAgentEnvironmentChannel } from './remoteAgentEnvironmentImpl.js';
+import { RemoteAgentFileSystemProviderChannel } from './remoteFileSystemProviderServer.js';
+import { ServerTelemetryChannel } from '../../platform/telemetry/common/remoteTelemetryChannel.js';
+import { IServerTelemetryService, ServerNullTelemetryService, ServerTelemetryService } from '../../platform/telemetry/common/serverTelemetryService.js';
+import { RemoteTerminalChannel } from './remoteTerminalChannel.js';
+import { createURITransformer } from '../../workbench/api/node/uriTransformer.js';
+import { ServerConnectionToken } from './serverConnectionToken.js';
+import { ServerEnvironmentService, ServerParsedArgs } from './serverEnvironmentService.js';
+import { REMOTE_TERMINAL_CHANNEL_NAME } from '../../workbench/contrib/terminal/common/remote/remoteTerminalChannel.js';
+import { REMOTE_FILE_SYSTEM_CHANNEL_NAME } from '../../workbench/services/remote/common/remoteFileSystemProviderClient.js';
+import { ExtensionHostStatusService, IExtensionHostStatusService } from './extensionHostStatusService.js';
+import { IExtensionsScannerService } from '../../platform/extensionManagement/common/extensionsScannerService.js';
+import { ExtensionsScannerService } from './extensionsScannerService.js';
+import { IExtensionsProfileScannerService } from '../../platform/extensionManagement/common/extensionsProfileScannerService.js';
+import { IUserDataProfilesService } from '../../platform/userDataProfile/common/userDataProfile.js';
+import { NullPolicyService } from '../../platform/policy/common/policy.js';
+import { OneDataSystemAppender } from '../../platform/telemetry/node/1dsAppender.js';
+import { LoggerService } from '../../platform/log/node/loggerService.js';
+import { ServerUserDataProfilesService } from '../../platform/userDataProfile/node/userDataProfile.js';
+import { ExtensionsProfileScannerService } from '../../platform/extensionManagement/node/extensionsProfileScannerService.js';
+import { LogService } from '../../platform/log/common/logService.js';
+import { LoggerChannel } from '../../platform/log/common/logIpc.js';
+import { localize } from '../../nls.js';
+import { RemoteExtensionsScannerChannel, RemoteExtensionsScannerService } from './remoteExtensionsScanner.js';
+import { RemoteExtensionsScannerChannelName } from '../../platform/remote/common/remoteExtensionsScanner.js';
+import { RemoteUserDataProfilesServiceChannel } from '../../platform/userDataProfile/common/userDataProfileIpc.js';
+import { NodePtyHostStarter } from '../../platform/terminal/node/nodePtyHostStarter.js';
+import { CSSDevelopmentService, ICSSDevelopmentService } from '../../platform/cssDev/node/cssDevService.js';
 
 const eventPrefix = 'monacoworkbench';
 
@@ -131,6 +132,9 @@ export async function setupServerServices(connectionToken: ServerConnectionToken
 	services.set(IUserDataProfilesService, userDataProfilesService);
 	socketServer.registerChannel('userDataProfiles', new RemoteUserDataProfilesServiceChannel(userDataProfilesService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority)));
 
+	// Dev Only: CSS service (for ESM)
+	services.set(ICSSDevelopmentService, new SyncDescriptor(CSSDevelopmentService, undefined, true));
+
 	// Initialize
 	const [, , machineId, sqmId, devDeviceId] = await Promise.all([
 		configurationService.initialize(),
@@ -144,7 +148,7 @@ export async function setupServerServices(connectionToken: ServerConnectionToken
 	services.set(IExtensionHostStatusService, extensionHostStatusService);
 
 	// Request
-	const requestService = new RequestService(configurationService, environmentService, logService, loggerService);
+	const requestService = new RequestService(configurationService, environmentService, logService);
 	services.set(IRequestService, requestService);
 
 	let oneDsAppender: ITelemetryAppender = NullAppender;
@@ -217,7 +221,7 @@ export async function setupServerServices(connectionToken: ServerConnectionToken
 		const remoteExtensionsScanner = new RemoteExtensionsScannerService(instantiationService.createInstance(ExtensionManagementCLI, logService), environmentService, userDataProfilesService, extensionsScannerService, logService, extensionGalleryService, languagePackService);
 		socketServer.registerChannel(RemoteExtensionsScannerChannelName, new RemoteExtensionsScannerChannel(remoteExtensionsScanner, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority)));
 
-		const remoteFileSystemChannel = disposables.add(new RemoteAgentFileSystemProviderChannel(logService, environmentService));
+		const remoteFileSystemChannel = disposables.add(new RemoteAgentFileSystemProviderChannel(logService, environmentService, configurationService));
 		socketServer.registerChannel(REMOTE_FILE_SYSTEM_CHANNEL_NAME, remoteFileSystemChannel);
 
 		socketServer.registerChannel('request', new RequestChannel(accessor.get(IRequestService)));
diff --git a/src/vs/server/node/webClientServer.ts b/src/vs/server/node/webClientServer.ts
index 6dc550b6cf0..7c6430e2380 100644
--- a/src/vs/server/node/webClientServer.ts
+++ b/src/vs/server/node/webClientServer.ts
@@ -3,32 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createReadStream } from 'fs';
-import { Promises } from 'vs/base/node/pfs';
+import { createReadStream, promises } from 'fs';
 import * as path from 'path';
 import * as http from 'http';
 import * as url from 'url';
 import * as cookie from 'cookie';
 import * as crypto from 'crypto';
-import { isEqualOrParent } from 'vs/base/common/extpath';
-import { getMediaMime } from 'vs/base/common/mime';
-import { isLinux } from 'vs/base/common/platform';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IServerEnvironmentService } from 'vs/server/node/serverEnvironmentService';
-import { extname, dirname, join, normalize } from 'vs/base/common/path';
-import { FileAccess, connectionTokenCookieName, connectionTokenQueryName, Schemas, builtinExtensionsPath } from 'vs/base/common/network';
-import { generateUuid } from 'vs/base/common/uuid';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ServerConnectionToken, ServerConnectionTokenType } from 'vs/server/node/serverConnectionToken';
-import { asTextOrError, IRequestService } from 'vs/platform/request/common/request';
-import { IHeaders } from 'vs/base/parts/request/common/request';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { URI } from 'vs/base/common/uri';
-import { streamToBuffer } from 'vs/base/common/buffer';
-import { IProductConfiguration } from 'vs/base/common/product';
-import { isString } from 'vs/base/common/types';
-import { CharCode } from 'vs/base/common/charCode';
-import { IExtensionManifest } from 'vs/platform/extensions/common/extensions';
+import { isEqualOrParent } from '../../base/common/extpath.js';
+import { getMediaMime } from '../../base/common/mime.js';
+import { isLinux } from '../../base/common/platform.js';
+import { ILogService } from '../../platform/log/common/log.js';
+import { IServerEnvironmentService } from './serverEnvironmentService.js';
+import { extname, dirname, join, normalize } from '../../base/common/path.js';
+import { FileAccess, connectionTokenCookieName, connectionTokenQueryName, Schemas, builtinExtensionsPath } from '../../base/common/network.js';
+import { generateUuid } from '../../base/common/uuid.js';
+import { IProductService } from '../../platform/product/common/productService.js';
+import { ServerConnectionToken, ServerConnectionTokenType } from './serverConnectionToken.js';
+import { asTextOrError, IRequestService } from '../../platform/request/common/request.js';
+import { IHeaders } from '../../base/parts/request/common/request.js';
+import { CancellationToken } from '../../base/common/cancellation.js';
+import { URI } from '../../base/common/uri.js';
+import { streamToBuffer } from '../../base/common/buffer.js';
+import { IProductConfiguration } from '../../base/common/product.js';
+import { isString } from '../../base/common/types.js';
+import { CharCode } from '../../base/common/charCode.js';
+import { IExtensionManifest } from '../../platform/extensions/common/extensions.js';
+import { ICSSDevelopmentService } from '../../platform/cssDev/node/cssDevService.js';
 
 const textMimeType: { [ext: string]: string | undefined } = {
 	'.html': 'text/html',
@@ -55,7 +55,7 @@ export const enum CacheControl {
  */
 export async function serveFile(filePath: string, cacheControl: CacheControl, logService: ILogService, req: http.IncomingMessage, res: http.ServerResponse, responseHeaders: Record<string, string>): Promise<void> {
 	try {
-		const stat = await Promises.stat(filePath); // throws an error if file doesn't exist
+		const stat = await promises.stat(filePath); // throws an error if file doesn't exist
 		if (cacheControl === CacheControl.ETAG) {
 
 			// Check if file modified since
@@ -109,6 +109,7 @@ export class WebClientServer {
 		@ILogService private readonly _logService: ILogService,
 		@IRequestService private readonly _requestService: IRequestService,
 		@IProductService private readonly _productService: IProductService,
+		@ICSSDevelopmentService private readonly _cssDevService: ICSSDevelopmentService
 	) {
 		this._webExtensionResourceUrlTemplate = this._productService.extensionsGallery?.resourceUrlTemplate ? URI.parse(this._productService.extensionsGallery.resourceUrlTemplate) : undefined;
 
@@ -222,7 +223,7 @@ export class WebClientServer {
 			return serveError(req, res, status, text || `Request failed with status ${status}`);
 		}
 
-		const responseHeaders: Record<string, string> = Object.create(null);
+		const responseHeaders: Record<string, string | string[]> = Object.create(null);
 		const setResponseHeader = (header: string) => {
 			const value = context.res.headers[header];
 			if (value) {
@@ -298,7 +299,7 @@ export class WebClientServer {
 
 		const resolveWorkspaceURI = (defaultLocation?: string) => defaultLocation && URI.file(path.resolve(defaultLocation)).with({ scheme: Schemas.vscodeRemote, authority: remoteAuthority });
 
-		const filePath = FileAccess.asFileUri(this._environmentService.isBuilt ? 'vs/code/browser/workbench/workbench.html' : 'vs/code/browser/workbench/workbench-dev.html').fsPath;
+		const filePath = FileAccess.asFileUri(`vs/code/browser/workbench/workbench${this._environmentService.isBuilt ? '' : '-dev'}.html`).fsPath;
 		const authSessionInfo = !this._environmentService.isBuilt && this._environmentService.args['github-auth'] ? {
 			id: generateUuid(),
 			providerId: 'github',
@@ -320,7 +321,7 @@ export class WebClientServer {
 
 		if (!this._environmentService.isBuilt) {
 			try {
-				const productOverrides = JSON.parse((await Promises.readFile(join(APP_ROOT, 'product.overrides.json'))).toString());
+				const productOverrides = JSON.parse((await promises.readFile(join(APP_ROOT, 'product.overrides.json'))).toString());
 				Object.assign(productConfiguration, productOverrides);
 			} catch (err) {/* Ignore Error */ }
 		}
@@ -338,18 +339,39 @@ export class WebClientServer {
 			callbackRoute: this._callbackRoute
 		};
 
-		const nlsBaseUrl = this._productService.extensionsGallery?.nlsBaseUrl;
+		const cookies = cookie.parse(req.headers.cookie || '');
+		const locale = cookies['vscode.nls.locale'] || req.headers['accept-language']?.split(',')[0]?.toLowerCase() || 'en';
+		let WORKBENCH_NLS_BASE_URL: string | undefined;
+		let WORKBENCH_NLS_URL: string;
+		if (!locale.startsWith('en') && this._productService.nlsCoreBaseUrl) {
+			WORKBENCH_NLS_BASE_URL = this._productService.nlsCoreBaseUrl;
+			WORKBENCH_NLS_URL = `${WORKBENCH_NLS_BASE_URL}${this._productService.commit}/${this._productService.version}/${locale}/nls.messages.js`;
+		} else {
+			WORKBENCH_NLS_URL = ''; // fallback will apply
+		}
+
 		const values: { [key: string]: string } = {
 			WORKBENCH_WEB_CONFIGURATION: asJSON(workbenchWebConfiguration),
 			WORKBENCH_AUTH_SESSION: authSessionInfo ? asJSON(authSessionInfo) : '',
 			WORKBENCH_WEB_BASE_URL: this._staticRoute,
-			WORKBENCH_NLS_BASE_URL: nlsBaseUrl ? `${nlsBaseUrl}${!nlsBaseUrl.endsWith('/') ? '/' : ''}${this._productService.commit}/${this._productService.version}/` : '',
+			WORKBENCH_NLS_URL,
+			WORKBENCH_NLS_FALLBACK_URL: `${this._staticRoute}/out/nls.messages.js`
 		};
 
+		// DEV ---------------------------------------------------------------------------------------
+		// DEV: This is for development and enables loading CSS via import-statements via import-maps.
+		// DEV: The server needs to send along all CSS modules so that the client can construct the
+		// DEV: import-map.
+		// DEV ---------------------------------------------------------------------------------------
+		if (this._cssDevService.isEnabled) {
+			const cssModules = await this._cssDevService.getCssModules();
+			values['WORKBENCH_DEV_CSS_MODULES'] = JSON.stringify(cssModules);
+		}
+
 		if (useTestResolver) {
 			const bundledExtensions: { extensionPath: string; packageJSON: IExtensionManifest }[] = [];
 			for (const extensionPath of ['vscode-test-resolver', 'github-authentication']) {
-				const packageJSON = JSON.parse((await Promises.readFile(FileAccess.asFileUri(`${builtinExtensionsPath}/${extensionPath}/package.json`).fsPath)).toString());
+				const packageJSON = JSON.parse((await promises.readFile(FileAccess.asFileUri(`${builtinExtensionsPath}/${extensionPath}/package.json`).fsPath)).toString());
 				bundledExtensions.push({ extensionPath, packageJSON });
 			}
 			values['WORKBENCH_BUILTIN_EXTENSIONS'] = asJSON(bundledExtensions);
@@ -357,20 +379,20 @@ export class WebClientServer {
 
 		let data;
 		try {
-			const workbenchTemplate = (await Promises.readFile(filePath)).toString();
+			const workbenchTemplate = (await promises.readFile(filePath)).toString();
 			data = workbenchTemplate.replace(/\{\{([^}]+)\}\}/g, (_, key) => values[key] ?? 'undefined');
 		} catch (e) {
 			res.writeHead(404, { 'Content-Type': 'text/plain' });
 			return void res.end('Not found');
 		}
 
-		const webWorkerExtensionHostIframeScriptSHA = 'sha256-75NYUUvf+5++1WbfCZOV3PSWxBhONpaxwx+mkOFRv/Y=';
+		const webWorkerExtensionHostIframeScriptSHA = 'sha256-2Q+j4hfT09+1+imS46J2YlkCtHWQt0/BE79PXjJ0ZJ8=';
 
 		const cspDirectives = [
 			'default-src \'self\';',
 			'img-src \'self\' https: data: blob:;',
 			'media-src \'self\';',
-			`script-src 'self' 'unsafe-eval' ${this._getScriptCspHashes(data).join(' ')} '${webWorkerExtensionHostIframeScriptSHA}' ${useTestResolver ? '' : `http://${remoteAuthority}`};`, // the sha is the same as in src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
+			`script-src 'self' 'unsafe-eval' ${WORKBENCH_NLS_BASE_URL ?? ''} blob: 'nonce-1nline-m4p' ${this._getScriptCspHashes(data).join(' ')} '${webWorkerExtensionHostIframeScriptSHA}' 'sha256-/r7rqQ+yrxt57sxLuQ6AMYcy/lUpvAIzHjIJt/OeLWU=' ${useTestResolver ? '' : `http://${remoteAuthority}`};`,  // the sha is the same as in src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
 			'child-src \'self\';',
 			`frame-src 'self' https://*.vscode-cdn.net data:;`,
 			'worker-src \'self\' data: blob:;',
@@ -426,7 +448,7 @@ export class WebClientServer {
 	 */
 	private async _handleCallback(res: http.ServerResponse): Promise<void> {
 		const filePath = FileAccess.asFileUri('vs/code/browser/workbench/callback.html').fsPath;
-		const data = (await Promises.readFile(filePath)).toString();
+		const data = (await promises.readFile(filePath)).toString();
 		const cspDirectives = [
 			'default-src \'self\';',
 			'img-src \'self\' https: data: blob:;',
diff --git a/src/vs/server/test/node/serverConnectionToken.test.ts b/src/vs/server/test/node/serverConnectionToken.test.ts
index b04dab4d308..67756065062 100644
--- a/src/vs/server/test/node/serverConnectionToken.test.ts
+++ b/src/vs/server/test/node/serverConnectionToken.test.ts
@@ -7,10 +7,10 @@ import assert from 'assert';
 import * as fs from 'fs';
 import * as os from 'os';
 import * as path from 'path';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { getRandomTestPath } from 'vs/base/test/node/testUtils';
-import { parseServerConnectionToken, ServerConnectionToken, ServerConnectionTokenParseError, ServerConnectionTokenType } from 'vs/server/node/serverConnectionToken';
-import { ServerParsedArgs } from 'vs/server/node/serverEnvironmentService';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../base/test/common/utils.js';
+import { getRandomTestPath } from '../../../base/test/node/testUtils.js';
+import { parseServerConnectionToken, ServerConnectionToken, ServerConnectionTokenParseError, ServerConnectionTokenType } from '../../node/serverConnectionToken.js';
+import { ServerParsedArgs } from '../../node/serverEnvironmentService.js';
 
 suite('parseServerConnectionToken', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/api/browser/extensionHost.contribution.ts b/src/vs/workbench/api/browser/extensionHost.contribution.ts
index 9fdc4b30306..2764905f82f 100644
--- a/src/vs/workbench/api/browser/extensionHost.contribution.ts
+++ b/src/vs/workbench/api/browser/extensionHost.contribution.ts
@@ -3,90 +3,92 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from '../../common/contributions.js';
+import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
 
 // --- other interested parties
-import { JSONValidationExtensionPoint } from 'vs/workbench/api/common/jsonValidationExtensionPoint';
-import { ColorExtensionPoint } from 'vs/workbench/services/themes/common/colorExtensionPoint';
-import { IconExtensionPoint } from 'vs/workbench/services/themes/common/iconExtensionPoint';
-import { TokenClassificationExtensionPoints } from 'vs/workbench/services/themes/common/tokenClassificationExtensionPoint';
-import { LanguageConfigurationFileHandler } from 'vs/workbench/contrib/codeEditor/common/languageConfigurationExtensionPoint';
-import { StatusBarItemsExtensionPoint } from 'vs/workbench/api/browser/statusBarExtensionPoint';
+import { JSONValidationExtensionPoint } from '../common/jsonValidationExtensionPoint.js';
+import { ColorExtensionPoint } from '../../services/themes/common/colorExtensionPoint.js';
+import { IconExtensionPoint } from '../../services/themes/common/iconExtensionPoint.js';
+import { TokenClassificationExtensionPoints } from '../../services/themes/common/tokenClassificationExtensionPoint.js';
+import { LanguageConfigurationFileHandler } from '../../contrib/codeEditor/common/languageConfigurationExtensionPoint.js';
+import { StatusBarItemsExtensionPoint } from './statusBarExtensionPoint.js';
 
 // --- mainThread participants
-import './mainThreadLocalization';
-import './mainThreadBulkEdits';
-import './mainThreadLanguageModels';
-import './mainThreadChatAgents2';
-import './mainThreadChatVariables';
-import './mainThreadEmbeddings';
-import './mainThreadCodeInsets';
-import './mainThreadCLICommands';
-import './mainThreadClipboard';
-import './mainThreadCommands';
-import './mainThreadConfiguration';
-import './mainThreadConsole';
-import './mainThreadDebugService';
-import './mainThreadDecorations';
-import './mainThreadDiagnostics';
-import './mainThreadDialogs';
-import './mainThreadDocumentContentProviders';
-import './mainThreadDocuments';
-import './mainThreadDocumentsAndEditors';
-import './mainThreadEditor';
-import './mainThreadEditors';
-import './mainThreadEditorTabs';
-import './mainThreadErrors';
-import './mainThreadExtensionService';
-import './mainThreadFileSystem';
-import './mainThreadFileSystemEventService';
-import './mainThreadLanguageFeatures';
-import './mainThreadLanguages';
-import './mainThreadLogService';
-import './mainThreadMessageService';
-import './mainThreadManagedSockets';
-import './mainThreadOutputService';
-import './mainThreadProgress';
-import './mainThreadQuickDiff';
-import './mainThreadQuickOpen';
-import './mainThreadRemoteConnectionData';
-import './mainThreadSaveParticipant';
-import './mainThreadSpeech';
-import './mainThreadEditSessionIdentityParticipant';
-import './mainThreadSCM';
-import './mainThreadSearch';
-import './mainThreadStatusBar';
-import './mainThreadStorage';
-import './mainThreadTelemetry';
-import './mainThreadTerminalService';
-import './mainThreadTerminalShellIntegration';
-import './mainThreadTheming';
-import './mainThreadTreeViews';
-import './mainThreadDownloadService';
-import './mainThreadUrls';
-import './mainThreadUriOpeners';
-import './mainThreadWindow';
-import './mainThreadWebviewManager';
-import './mainThreadWorkspace';
-import './mainThreadComments';
-import './mainThreadNotebook';
-import './mainThreadNotebookKernels';
-import './mainThreadNotebookDocumentsAndEditors';
-import './mainThreadNotebookRenderers';
-import './mainThreadNotebookSaveParticipant';
-import './mainThreadInteractive';
-import './mainThreadTask';
-import './mainThreadLabelService';
-import './mainThreadTunnelService';
-import './mainThreadAuthentication';
-import './mainThreadTimeline';
-import './mainThreadTesting';
-import './mainThreadSecretState';
-import './mainThreadShare';
-import './mainThreadProfileContentHandlers';
-import './mainThreadAiRelatedInformation';
-import './mainThreadAiEmbeddingVector';
+import './mainThreadLocalization.js';
+import './mainThreadBulkEdits.js';
+import './mainThreadLanguageModels.js';
+import './mainThreadChatAgents2.js';
+import './mainThreadChatVariables.js';
+import './mainThreadChatCodeMapper.js';
+import './mainThreadLanguageModelTools.js';
+import './mainThreadEmbeddings.js';
+import './mainThreadCodeInsets.js';
+import './mainThreadCLICommands.js';
+import './mainThreadClipboard.js';
+import './mainThreadCommands.js';
+import './mainThreadConfiguration.js';
+import './mainThreadConsole.js';
+import './mainThreadDebugService.js';
+import './mainThreadDecorations.js';
+import './mainThreadDiagnostics.js';
+import './mainThreadDialogs.js';
+import './mainThreadDocumentContentProviders.js';
+import './mainThreadDocuments.js';
+import './mainThreadDocumentsAndEditors.js';
+import './mainThreadEditor.js';
+import './mainThreadEditors.js';
+import './mainThreadEditorTabs.js';
+import './mainThreadErrors.js';
+import './mainThreadExtensionService.js';
+import './mainThreadFileSystem.js';
+import './mainThreadFileSystemEventService.js';
+import './mainThreadLanguageFeatures.js';
+import './mainThreadLanguages.js';
+import './mainThreadLogService.js';
+import './mainThreadMessageService.js';
+import './mainThreadManagedSockets.js';
+import './mainThreadOutputService.js';
+import './mainThreadProgress.js';
+import './mainThreadQuickDiff.js';
+import './mainThreadQuickOpen.js';
+import './mainThreadRemoteConnectionData.js';
+import './mainThreadSaveParticipant.js';
+import './mainThreadSpeech.js';
+import './mainThreadEditSessionIdentityParticipant.js';
+import './mainThreadSCM.js';
+import './mainThreadSearch.js';
+import './mainThreadStatusBar.js';
+import './mainThreadStorage.js';
+import './mainThreadTelemetry.js';
+import './mainThreadTerminalService.js';
+import './mainThreadTerminalShellIntegration.js';
+import './mainThreadTheming.js';
+import './mainThreadTreeViews.js';
+import './mainThreadDownloadService.js';
+import './mainThreadUrls.js';
+import './mainThreadUriOpeners.js';
+import './mainThreadWindow.js';
+import './mainThreadWebviewManager.js';
+import './mainThreadWorkspace.js';
+import './mainThreadComments.js';
+import './mainThreadNotebook.js';
+import './mainThreadNotebookKernels.js';
+import './mainThreadNotebookDocumentsAndEditors.js';
+import './mainThreadNotebookRenderers.js';
+import './mainThreadNotebookSaveParticipant.js';
+import './mainThreadInteractive.js';
+import './mainThreadTask.js';
+import './mainThreadLabelService.js';
+import './mainThreadTunnelService.js';
+import './mainThreadAuthentication.js';
+import './mainThreadTimeline.js';
+import './mainThreadTesting.js';
+import './mainThreadSecretState.js';
+import './mainThreadShare.js';
+import './mainThreadProfileContentHandlers.js';
+import './mainThreadAiRelatedInformation.js';
+import './mainThreadAiEmbeddingVector.js';
 
 export class ExtensionPoints implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/api/browser/mainThreadAiEmbeddingVector.ts b/src/vs/workbench/api/browser/mainThreadAiEmbeddingVector.ts
index 954679e2c52..68906b6ce3a 100644
--- a/src/vs/workbench/api/browser/mainThreadAiEmbeddingVector.ts
+++ b/src/vs/workbench/api/browser/mainThreadAiEmbeddingVector.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Disposable, DisposableMap } from 'vs/base/common/lifecycle';
-import { ExtHostAiEmbeddingVectorShape, ExtHostContext, MainContext, MainThreadAiEmbeddingVectorShape } from 'vs/workbench/api/common/extHost.protocol';
-import { IAiEmbeddingVectorProvider, IAiEmbeddingVectorService } from 'vs/workbench/services/aiEmbeddingVector/common/aiEmbeddingVectorService';
-import { IExtHostContext, extHostNamedCustomer } from 'vs/workbench/services/extensions/common/extHostCustomers';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Disposable, DisposableMap } from '../../../base/common/lifecycle.js';
+import { ExtHostAiEmbeddingVectorShape, ExtHostContext, MainContext, MainThreadAiEmbeddingVectorShape } from '../common/extHost.protocol.js';
+import { IAiEmbeddingVectorProvider, IAiEmbeddingVectorService } from '../../services/aiEmbeddingVector/common/aiEmbeddingVectorService.js';
+import { IExtHostContext, extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 
 @extHostNamedCustomer(MainContext.MainThreadAiEmbeddingVector)
 export class MainThreadAiEmbeddingVector extends Disposable implements MainThreadAiEmbeddingVectorShape {
diff --git a/src/vs/workbench/api/browser/mainThreadAiRelatedInformation.ts b/src/vs/workbench/api/browser/mainThreadAiRelatedInformation.ts
index e254b5f4149..722866e7154 100644
--- a/src/vs/workbench/api/browser/mainThreadAiRelatedInformation.ts
+++ b/src/vs/workbench/api/browser/mainThreadAiRelatedInformation.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Disposable, DisposableMap } from 'vs/base/common/lifecycle';
-import { ExtHostAiRelatedInformationShape, ExtHostContext, MainContext, MainThreadAiRelatedInformationShape } from 'vs/workbench/api/common/extHost.protocol';
-import { RelatedInformationType } from 'vs/workbench/api/common/extHostTypes';
-import { IAiRelatedInformationProvider, IAiRelatedInformationService, RelatedInformationResult } from 'vs/workbench/services/aiRelatedInformation/common/aiRelatedInformation';
-import { IExtHostContext, extHostNamedCustomer } from 'vs/workbench/services/extensions/common/extHostCustomers';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Disposable, DisposableMap } from '../../../base/common/lifecycle.js';
+import { ExtHostAiRelatedInformationShape, ExtHostContext, MainContext, MainThreadAiRelatedInformationShape } from '../common/extHost.protocol.js';
+import { RelatedInformationType } from '../common/extHostTypes.js';
+import { IAiRelatedInformationProvider, IAiRelatedInformationService, RelatedInformationResult } from '../../services/aiRelatedInformation/common/aiRelatedInformation.js';
+import { IExtHostContext, extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 
 @extHostNamedCustomer(MainContext.MainThreadAiRelatedInformation)
 export class MainThreadAiRelatedInformation extends Disposable implements MainThreadAiRelatedInformationShape {
diff --git a/src/vs/workbench/api/browser/mainThreadAuthentication.ts b/src/vs/workbench/api/browser/mainThreadAuthentication.ts
index 3719825841a..18d3c2ffced 100644
--- a/src/vs/workbench/api/browser/mainThreadAuthentication.ts
+++ b/src/vs/workbench/api/browser/mainThreadAuthentication.ts
@@ -3,22 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, DisposableMap } from 'vs/base/common/lifecycle';
-import * as nls from 'vs/nls';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { IAuthenticationCreateSessionOptions, AuthenticationSession, AuthenticationSessionsChangeEvent, IAuthenticationProvider, IAuthenticationService, IAuthenticationExtensionsService, INTERNAL_AUTH_PROVIDER_PREFIX as INTERNAL_MODEL_AUTH_PROVIDER_PREFIX } from 'vs/workbench/services/authentication/common/authentication';
-import { ExtHostAuthenticationShape, ExtHostContext, MainContext, MainThreadAuthenticationShape } from '../common/extHost.protocol';
-import { IDialogService, IPromptButton } from 'vs/platform/dialogs/common/dialogs';
-import Severity from 'vs/base/common/severity';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { ActivationKind, IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IAuthenticationAccessService } from 'vs/workbench/services/authentication/browser/authenticationAccessService';
-import { IAuthenticationUsageService } from 'vs/workbench/services/authentication/browser/authenticationUsageService';
-import { getAuthenticationProviderActivationEvent } from 'vs/workbench/services/authentication/browser/authenticationService';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
+import { Disposable, DisposableMap } from '../../../base/common/lifecycle.js';
+import * as nls from '../../../nls.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { IAuthenticationCreateSessionOptions, AuthenticationSession, AuthenticationSessionsChangeEvent, IAuthenticationProvider, IAuthenticationService, IAuthenticationExtensionsService, INTERNAL_AUTH_PROVIDER_PREFIX as INTERNAL_MODEL_AUTH_PROVIDER_PREFIX, AuthenticationSessionAccount, IAuthenticationProviderSessionOptions } from '../../services/authentication/common/authentication.js';
+import { ExtHostAuthenticationShape, ExtHostContext, MainContext, MainThreadAuthenticationShape } from '../common/extHost.protocol.js';
+import { IDialogService, IPromptButton } from '../../../platform/dialogs/common/dialogs.js';
+import Severity from '../../../base/common/severity.js';
+import { INotificationService } from '../../../platform/notification/common/notification.js';
+import { ActivationKind, IExtensionService } from '../../services/extensions/common/extensions.js';
+import { ITelemetryService } from '../../../platform/telemetry/common/telemetry.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { IAuthenticationAccessService } from '../../services/authentication/browser/authenticationAccessService.js';
+import { IAuthenticationUsageService } from '../../services/authentication/browser/authenticationUsageService.js';
+import { getAuthenticationProviderActivationEvent } from '../../services/authentication/browser/authenticationService.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { IOpenerService } from '../../../platform/opener/common/opener.js';
+import { CancellationError } from '../../../base/common/errors.js';
 
 interface AuthenticationForceNewSessionOptions {
 	detail?: string;
@@ -31,6 +32,7 @@ interface AuthenticationGetSessionOptions {
 	createIfNone?: boolean;
 	forceNewSession?: boolean | AuthenticationForceNewSessionOptions;
 	silent?: boolean;
+	account?: AuthenticationSessionAccount;
 }
 
 export class MainThreadAuthenticationProvider extends Disposable implements IAuthenticationProvider {
@@ -49,8 +51,8 @@ export class MainThreadAuthenticationProvider extends Disposable implements IAut
 		this.onDidChangeSessions = onDidChangeSessionsEmitter.event;
 	}
 
-	async getSessions(scopes?: string[]) {
-		return this._proxy.$getSessions(this.id, scopes);
+	async getSessions(scopes: string[] | undefined, options: IAuthenticationProviderSessionOptions) {
+		return this._proxy.$getSessions(this.id, scopes, options);
 	}
 
 	createSession(scopes: string[], options: IAuthenticationCreateSessionOptions): Promise<AuthenticationSession> {
@@ -87,6 +89,10 @@ export class MainThreadAuthentication extends Disposable implements MainThreadAu
 		this._register(this.authenticationService.onDidChangeSessions(e => {
 			this._proxy.$onDidChangeAuthenticationSessions(e.providerId, e.label);
 		}));
+		this._register(this.authenticationExtensionsService.onDidChangeAccountPreference(e => {
+			const providerInfo = this.authenticationService.getProvider(e.providerId);
+			this._proxy.$onDidChangeAuthenticationSessions(providerInfo.id, providerInfo.label, e.extensionIds);
+		}));
 	}
 
 	async $registerAuthenticationProvider(id: string, label: string, supportsMultipleAccounts: boolean): Promise<void> {
@@ -158,8 +164,33 @@ export class MainThreadAuthentication extends Disposable implements MainThreadAu
 		return result ?? false;
 	}
 
+	private async continueWithIncorrectAccountPrompt(chosenAccountLabel: string, requestedAccountLabel: string): Promise<boolean> {
+		const result = await this.dialogService.prompt({
+			message: nls.localize('incorrectAccount', "Incorrect account detected"),
+			detail: nls.localize('incorrectAccountDetail', "The chosen account, {0}, does not match the requested account, {1}.", chosenAccountLabel, requestedAccountLabel),
+			type: Severity.Warning,
+			cancelButton: true,
+			buttons: [
+				{
+					label: nls.localize('keep', 'Keep {0}', chosenAccountLabel),
+					run: () => chosenAccountLabel
+				},
+				{
+					label: nls.localize('loginWith', 'Login with {0}', requestedAccountLabel),
+					run: () => requestedAccountLabel
+				}
+			],
+		});
+
+		if (!result.result) {
+			throw new CancellationError();
+		}
+
+		return result.result === chosenAccountLabel;
+	}
+
 	private async doGetSession(providerId: string, scopes: string[], extensionId: string, extensionName: string, options: AuthenticationGetSessionOptions): Promise<AuthenticationSession | undefined> {
-		const sessions = await this.authenticationService.getSessions(providerId, scopes, true);
+		const sessions = await this.authenticationService.getSessions(providerId, scopes, options.account, true);
 		const provider = this.authenticationService.getProvider(providerId);
 
 		// Error cases
@@ -173,24 +204,22 @@ export class MainThreadAuthentication extends Disposable implements MainThreadAu
 			throw new Error('Invalid combination of options. Please remove one of the following: createIfNone, silent');
 		}
 
+		if (options.clearSessionPreference) {
+			// Clearing the session preference is usually paired with createIfNone, so just remove the preference and
+			// defer to the rest of the logic in this function to choose the session.
+			this._removeAccountPreference(extensionId, providerId, scopes);
+		}
+
+		const matchingAccountPreferenceSession = this._getAccountPreference(extensionId, providerId, scopes, sessions);
+
 		// Check if the sessions we have are valid
 		if (!options.forceNewSession && sessions.length) {
-			if (provider.supportsMultipleAccounts) {
-				if (options.clearSessionPreference) {
-					// Clearing the session preference is usually paired with createIfNone, so just remove the preference and
-					// defer to the rest of the logic in this function to choose the session.
-					this.authenticationExtensionsService.removeSessionPreference(providerId, extensionId, scopes);
-				} else {
-					// If we have an existing session preference, use that. If not, we'll return any valid session at the end of this function.
-					const existingSessionPreference = this.authenticationExtensionsService.getSessionPreference(providerId, extensionId, scopes);
-					if (existingSessionPreference) {
-						const matchingSession = sessions.find(session => session.id === existingSessionPreference);
-						if (matchingSession && this.authenticationAccessService.isAccessAllowed(providerId, matchingSession.account.label, extensionId)) {
-							return matchingSession;
-						}
-					}
-				}
-			} else if (this.authenticationAccessService.isAccessAllowed(providerId, sessions[0].account.label, extensionId)) {
+			// If we have an existing session preference, use that. If not, we'll return any valid session at the end of this function.
+			if (matchingAccountPreferenceSession && this.authenticationAccessService.isAccessAllowed(providerId, matchingAccountPreferenceSession.account.label, extensionId)) {
+				return matchingAccountPreferenceSession;
+			}
+			// If we only have one account for a single auth provider, lets just check if it's allowed and return it if it is.
+			if (!provider.supportsMultipleAccounts && this.authenticationAccessService.isAccessAllowed(providerId, sessions[0].account.label, extensionId)) {
 				return sessions[0];
 			}
 		}
@@ -211,32 +240,33 @@ export class MainThreadAuthentication extends Disposable implements MainThreadAu
 				throw new Error('User did not consent to login.');
 			}
 
-			let session;
+			let session: AuthenticationSession;
 			if (sessions?.length && !options.forceNewSession) {
-				session = provider.supportsMultipleAccounts
+				session = provider.supportsMultipleAccounts && !options.account
 					? await this.authenticationExtensionsService.selectSession(providerId, extensionId, extensionName, scopes, sessions)
 					: sessions[0];
 			} else {
-				let sessionToRecreate: AuthenticationSession | undefined;
-				if (typeof options.forceNewSession === 'object' && options.forceNewSession.sessionToRecreate) {
-					sessionToRecreate = options.forceNewSession.sessionToRecreate as AuthenticationSession;
-				} else {
-					const sessionIdToRecreate = this.authenticationExtensionsService.getSessionPreference(providerId, extensionId, scopes);
-					sessionToRecreate = sessionIdToRecreate ? sessions.find(session => session.id === sessionIdToRecreate) : undefined;
-				}
-				session = await this.authenticationService.createSession(providerId, scopes, { activateImmediate: true, sessionToRecreate });
+				const accountToCreate: AuthenticationSessionAccount | undefined = options.account ?? matchingAccountPreferenceSession?.account;
+				do {
+					session = await this.authenticationService.createSession(providerId, scopes, { activateImmediate: true, account: accountToCreate });
+				} while (
+					accountToCreate
+					&& accountToCreate.label !== session.account.label
+					&& !await this.continueWithIncorrectAccountPrompt(session.account.label, accountToCreate.label)
+				);
 			}
 
 			this.authenticationAccessService.updateAllowedExtensions(providerId, session.account.label, [{ id: extensionId, name: extensionName, allowed: true }]);
-			this.authenticationExtensionsService.updateSessionPreference(providerId, extensionId, session);
+			this._updateAccountPreference(extensionId, providerId, session);
 			return session;
 		}
 
-		// For the silent flows, if we have a session, even though it may not be the user's preference, we'll return it anyway because it might be for a specific
-		// set of scopes.
-		const validSession = sessions.find(session => this.authenticationAccessService.isAccessAllowed(providerId, session.account.label, extensionId));
-		if (validSession) {
-			return validSession;
+		// For the silent flows, if we have a session but we don't have a session preference, we'll return the first one that is valid.
+		if (!matchingAccountPreferenceSession && !this.authenticationExtensionsService.getAccountPreference(extensionId, providerId)) {
+			const validSession = sessions.find(session => this.authenticationAccessService.isAccessAllowed(providerId, session.account.label, extensionId));
+			if (validSession) {
+				return validSession;
+			}
 		}
 
 		// passive flows (silent or default)
@@ -261,16 +291,9 @@ export class MainThreadAuthentication extends Disposable implements MainThreadAu
 		return session;
 	}
 
-	async $getSessions(providerId: string, scopes: readonly string[], extensionId: string, extensionName: string): Promise<AuthenticationSession[]> {
-		const sessions = await this.authenticationService.getSessions(providerId, [...scopes], true);
-		const accessibleSessions = sessions.filter(s => this.authenticationAccessService.isAccessAllowed(providerId, s.account.label, extensionId));
-		if (accessibleSessions.length) {
-			this.sendProviderUsageTelemetry(extensionId, providerId);
-			for (const session of accessibleSessions) {
-				this.authenticationUsageService.addAccountUsage(providerId, session.account.label, extensionId, extensionName);
-			}
-		}
-		return accessibleSessions;
+	async $getAccounts(providerId: string): Promise<ReadonlyArray<AuthenticationSessionAccount>> {
+		const accounts = await this.authenticationService.getAccounts(providerId);
+		return accounts;
 	}
 
 	private sendProviderUsageTelemetry(extensionId: string, providerId: string): void {
@@ -282,4 +305,41 @@ export class MainThreadAuthentication extends Disposable implements MainThreadAu
 		};
 		this.telemetryService.publicLog2<{ extensionId: string; providerId: string }, AuthProviderUsageClassification>('authentication.providerUsage', { providerId, extensionId });
 	}
+
+	//#region Account Preferences
+	// TODO@TylerLeonhardt: Update this after a few iterations to no longer fallback to the session preference
+
+	private _getAccountPreference(extensionId: string, providerId: string, scopes: string[], sessions: ReadonlyArray<AuthenticationSession>): AuthenticationSession | undefined {
+		if (sessions.length === 0) {
+			return undefined;
+		}
+		const accountNamePreference = this.authenticationExtensionsService.getAccountPreference(extensionId, providerId);
+		if (accountNamePreference) {
+			const session = sessions.find(session => session.account.label === accountNamePreference);
+			return session;
+		}
+
+		const sessionIdPreference = this.authenticationExtensionsService.getSessionPreference(providerId, extensionId, scopes);
+		if (sessionIdPreference) {
+			const session = sessions.find(session => session.id === sessionIdPreference);
+			if (session) {
+				// Migrate the session preference to the account preference
+				this.authenticationExtensionsService.updateAccountPreference(extensionId, providerId, session.account);
+				return session;
+			}
+		}
+		return undefined;
+	}
+
+	private _updateAccountPreference(extensionId: string, providerId: string, session: AuthenticationSession): void {
+		this.authenticationExtensionsService.updateAccountPreference(extensionId, providerId, session.account);
+		this.authenticationExtensionsService.updateSessionPreference(providerId, extensionId, session);
+	}
+
+	private _removeAccountPreference(extensionId: string, providerId: string, scopes: string[]): void {
+		this.authenticationExtensionsService.removeAccountPreference(extensionId, providerId);
+		this.authenticationExtensionsService.removeSessionPreference(providerId, extensionId, scopes);
+	}
+
+	//#endregion
 }
diff --git a/src/vs/workbench/api/browser/mainThreadBulkEdits.ts b/src/vs/workbench/api/browser/mainThreadBulkEdits.ts
index dfd425729a3..a82377228dc 100644
--- a/src/vs/workbench/api/browser/mainThreadBulkEdits.ts
+++ b/src/vs/workbench/api/browser/mainThreadBulkEdits.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer, decodeBase64 } from 'vs/base/common/buffer';
-import { revive } from 'vs/base/common/marshalling';
-import { IBulkEditService, ResourceFileEdit, ResourceTextEdit } from 'vs/editor/browser/services/bulkEditService';
-import { WorkspaceEdit } from 'vs/editor/common/languages';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IWorkspaceCellEditDto, IWorkspaceEditDto, IWorkspaceFileEditDto, MainContext, MainThreadBulkEditsShape } from 'vs/workbench/api/common/extHost.protocol';
-import { ResourceNotebookCellEdit } from 'vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
-import { CellEditType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { IExtHostContext, extHostNamedCustomer } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { SerializableObjectWithBuffers } from 'vs/workbench/services/extensions/common/proxyIdentifier';
+import { VSBuffer, decodeBase64 } from '../../../base/common/buffer.js';
+import { revive } from '../../../base/common/marshalling.js';
+import { IBulkEditService, ResourceFileEdit, ResourceTextEdit } from '../../../editor/browser/services/bulkEditService.js';
+import { WorkspaceEdit } from '../../../editor/common/languages.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { IUriIdentityService } from '../../../platform/uriIdentity/common/uriIdentity.js';
+import { IWorkspaceCellEditDto, IWorkspaceEditDto, IWorkspaceFileEditDto, MainContext, MainThreadBulkEditsShape } from '../common/extHost.protocol.js';
+import { ResourceNotebookCellEdit } from '../../contrib/bulkEdit/browser/bulkCellEdits.js';
+import { CellEditType } from '../../contrib/notebook/common/notebookCommon.js';
+import { IExtHostContext, extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';
 
 
 @extHostNamedCustomer(MainContext.MainThreadBulkEdits)
diff --git a/src/vs/workbench/api/browser/mainThreadCLICommands.ts b/src/vs/workbench/api/browser/mainThreadCLICommands.ts
index 03a03f9c2a4..c8aed8587cd 100644
--- a/src/vs/workbench/api/browser/mainThreadCLICommands.ts
+++ b/src/vs/workbench/api/browser/mainThreadCLICommands.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Schemas } from 'vs/base/common/network';
-import { isWeb } from 'vs/base/common/platform';
-import { isString } from 'vs/base/common/types';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
-import { IExtensionGalleryService, IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { ExtensionManagementCLI } from 'vs/platform/extensionManagement/common/extensionManagementCLI';
-import { getExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { IExtensionManifest } from 'vs/platform/extensions/common/extensions';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { AbstractMessageLogger, ILogger, LogLevel } from 'vs/platform/log/common/log';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IOpenWindowOptions, IWindowOpenable } from 'vs/platform/window/common/window';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IExtensionManagementServerService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { IExtensionManifestPropertiesService } from 'vs/workbench/services/extensions/common/extensionManifestPropertiesService';
+import { Schemas } from '../../../base/common/network.js';
+import { isWeb } from '../../../base/common/platform.js';
+import { isString } from '../../../base/common/types.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { localize } from '../../../nls.js';
+import { CommandsRegistry, ICommandService } from '../../../platform/commands/common/commands.js';
+import { IExtensionGalleryService, IExtensionManagementService } from '../../../platform/extensionManagement/common/extensionManagement.js';
+import { ExtensionManagementCLI } from '../../../platform/extensionManagement/common/extensionManagementCLI.js';
+import { getExtensionId } from '../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { IExtensionManifest } from '../../../platform/extensions/common/extensions.js';
+import { IInstantiationService, ServicesAccessor } from '../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../platform/instantiation/common/serviceCollection.js';
+import { ILabelService } from '../../../platform/label/common/label.js';
+import { AbstractMessageLogger, ILogger, LogLevel } from '../../../platform/log/common/log.js';
+import { IOpenerService } from '../../../platform/opener/common/opener.js';
+import { IOpenWindowOptions, IWindowOpenable } from '../../../platform/window/common/window.js';
+import { IWorkbenchEnvironmentService } from '../../services/environment/common/environmentService.js';
+import { IExtensionManagementServerService } from '../../services/extensionManagement/common/extensionManagement.js';
+import { IExtensionManifestPropertiesService } from '../../services/extensions/common/extensionManifestPropertiesService.js';
 
 
 // this class contains the commands that the CLI server is reying on
diff --git a/src/vs/workbench/api/browser/mainThreadChatAgents2.ts b/src/vs/workbench/api/browser/mainThreadChatAgents2.ts
index 0d63847dae5..a61d91c78e1 100644
--- a/src/vs/workbench/api/browser/mainThreadChatAgents2.ts
+++ b/src/vs/workbench/api/browser/mainThreadChatAgents2.ts
@@ -3,34 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DeferredPromise } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { Disposable, DisposableMap, IDisposable } from 'vs/base/common/lifecycle';
-import { revive } from 'vs/base/common/marshalling';
-import { escapeRegExpCharacters } from 'vs/base/common/strings';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { getWordAtText } from 'vs/editor/common/core/wordHelper';
-import { CompletionContext, CompletionItem, CompletionItemKind, CompletionList } from 'vs/editor/common/languages';
-import { ITextModel } from 'vs/editor/common/model';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ExtHostChatAgentsShape2, ExtHostContext, IChatProgressDto, IDynamicChatAgentProps, IExtensionChatAgentMetadata, MainContext, MainThreadChatAgentsShape2 } from 'vs/workbench/api/common/extHost.protocol';
-import { IChatWidgetService } from 'vs/workbench/contrib/chat/browser/chat';
-import { ChatInputPart } from 'vs/workbench/contrib/chat/browser/chatInputPart';
-import { AddDynamicVariableAction, IAddDynamicVariableContext } from 'vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
-import { ChatAgentLocation, IChatAgentImplementation, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { ChatRequestAgentPart } from 'vs/workbench/contrib/chat/common/chatParserTypes';
-import { ChatRequestParser } from 'vs/workbench/contrib/chat/common/chatRequestParser';
-import { IChatContentReference, IChatFollowup, IChatProgress, IChatService, IChatTask, IChatWarningMessage } from 'vs/workbench/contrib/chat/common/chatService';
-import { IExtHostContext, extHostNamedCustomer } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { DeferredPromise } from '../../../base/common/async.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { IMarkdownString } from '../../../base/common/htmlContent.js';
+import { Disposable, DisposableMap, IDisposable } from '../../../base/common/lifecycle.js';
+import { revive } from '../../../base/common/marshalling.js';
+import { escapeRegExpCharacters } from '../../../base/common/strings.js';
+import { ThemeIcon } from '../../../base/common/themables.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { Position } from '../../../editor/common/core/position.js';
+import { Range } from '../../../editor/common/core/range.js';
+import { getWordAtText } from '../../../editor/common/core/wordHelper.js';
+import { CompletionContext, CompletionItem, CompletionItemKind, CompletionList } from '../../../editor/common/languages.js';
+import { ITextModel } from '../../../editor/common/model.js';
+import { ILanguageFeaturesService } from '../../../editor/common/services/languageFeatures.js';
+import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
+import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { ExtHostChatAgentsShape2, ExtHostContext, IChatParticipantMetadata, IChatProgressDto, IDynamicChatAgentProps, IExtensionChatAgentMetadata, MainContext, MainThreadChatAgentsShape2 } from '../common/extHost.protocol.js';
+import { IChatWidgetService } from '../../contrib/chat/browser/chat.js';
+import { ChatInputPart } from '../../contrib/chat/browser/chatInputPart.js';
+import { AddDynamicVariableAction, IAddDynamicVariableContext } from '../../contrib/chat/browser/contrib/chatDynamicVariables.js';
+import { ChatAgentLocation, IChatAgentHistoryEntry, IChatAgentImplementation, IChatAgentRequest, IChatAgentService } from '../../contrib/chat/common/chatAgents.js';
+import { ChatRequestAgentPart } from '../../contrib/chat/common/chatParserTypes.js';
+import { ChatRequestParser } from '../../contrib/chat/common/chatRequestParser.js';
+import { IChatContentReference, IChatFollowup, IChatProgress, IChatService, IChatTask, IChatWarningMessage } from '../../contrib/chat/common/chatService.js';
+import { IExtHostContext, extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { IExtensionService } from '../../services/extensions/common/extensions.js';
 
 interface AgentData {
 	dispose: () => void;
@@ -39,7 +39,7 @@ interface AgentData {
 	hasFollowups?: boolean;
 }
 
-class MainThreadChatTask implements IChatTask {
+export class MainThreadChatTask implements IChatTask {
 	public readonly kind = 'progressTask';
 
 	public readonly deferred = new DeferredPromise<string | void>();
@@ -76,6 +76,8 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA
 	private readonly _agentCompletionProviders = this._register(new DisposableMap<number, IDisposable>());
 	private readonly _agentIdsToCompletionProviders = this._register(new DisposableMap<string, IDisposable>);
 
+	private readonly _chatParticipantDetectionProviders = this._register(new DisposableMap<number, IDisposable>());
+
 	private readonly _pendingProgress = new Map<string, (part: IChatProgress) => void>();
 	private readonly _proxy: ExtHostChatAgentsShape2;
 
@@ -103,7 +105,7 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA
 				for (const [handle, agent] of this._agents) {
 					if (agent.id === e.agentId) {
 						if (e.action.kind === 'vote') {
-							this._proxy.$acceptFeedback(handle, e.result ?? {}, e.action.direction);
+							this._proxy.$acceptFeedback(handle, e.result ?? {}, e.action);
 						} else {
 							this._proxy.$acceptAction(handle, e.result || {}, e);
 						}
@@ -158,8 +160,11 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA
 
 				return this._proxy.$provideFollowups(request, handle, result, { history }, token);
 			},
-			provideWelcomeMessage: (location: ChatAgentLocation, token: CancellationToken) => {
-				return this._proxy.$provideWelcomeMessage(handle, location, token);
+			provideWelcomeMessage: (token: CancellationToken) => {
+				return this._proxy.$provideWelcomeMessage(handle, token);
+			},
+			provideChatTitle: (history, token) => {
+				return this._proxy.$provideChatTitle(handle, history, token);
 			},
 			provideSampleQuestions: (location: ChatAgentLocation, token: CancellationToken) => {
 				return this._proxy.$provideSampleQuestions(handle, location, token);
@@ -172,7 +177,7 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA
 			disposable = this._chatAgentService.registerDynamicAgent(
 				{
 					id,
-					name: dynamicProps.name ?? '', // This case is for an API change and can be removed tomorrow
+					name: dynamicProps.name,
 					description: dynamicProps.description,
 					extensionId: extension,
 					extensionDisplayName: extensionDescription?.displayName ?? extension.value,
@@ -181,6 +186,7 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA
 					fullName: dynamicProps.fullName,
 					metadata: revive(metadata),
 					slashCommands: [],
+					disambiguation: [],
 					locations: [ChatAgentLocation.Panel] // TODO all dynamic participants are panel only?
 				},
 				impl);
@@ -199,7 +205,8 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA
 	$updateAgent(handle: number, metadataUpdate: IExtensionChatAgentMetadata): void {
 		const data = this._agents.get(handle);
 		if (!data) {
-			throw new Error(`No agent with handle ${handle} registered`);
+			this._logService.error(`MainThreadChatAgents2#$updateAgent: No agent with handle ${handle} registered`);
+			return;
 		}
 		data.hasFollowups = metadataUpdate.hasFollowups;
 		this._chatAgentService.updateAgent(data.id, revive(metadataUpdate));
@@ -297,6 +304,20 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA
 		this._agentCompletionProviders.deleteAndDispose(handle);
 		this._agentIdsToCompletionProviders.deleteAndDispose(id);
 	}
+
+	$registerChatParticipantDetectionProvider(handle: number): void {
+		this._chatParticipantDetectionProviders.set(handle, this._chatAgentService.registerChatParticipantDetectionProvider(handle,
+			{
+				provideParticipantDetection: async (request: IChatAgentRequest, history: IChatAgentHistoryEntry[], options: { location: ChatAgentLocation; participants: IChatParticipantMetadata[] }, token: CancellationToken) => {
+					return await this._proxy.$detectChatParticipant(handle, request, { history }, options, token);
+				}
+			}
+		));
+	}
+
+	$unregisterChatParticipantDetectionProvider(handle: number): void {
+		this._chatParticipantDetectionProviders.deleteAndDispose(handle);
+	}
 }
 
 
diff --git a/src/vs/workbench/api/browser/mainThreadChatCodeMapper.ts b/src/vs/workbench/api/browser/mainThreadChatCodeMapper.ts
new file mode 100644
index 00000000000..abacb824c24
--- /dev/null
+++ b/src/vs/workbench/api/browser/mainThreadChatCodeMapper.ts
@@ -0,0 +1,62 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Disposable, DisposableMap, IDisposable } from '../../../base/common/lifecycle.js';
+import { URI } from '../../../base/common/uri.js';
+import { ICodeMapperProvider, ICodeMapperRequest, ICodeMapperResponse, ICodeMapperService } from '../../contrib/chat/common/chatCodeMapperService.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { ExtHostCodeMapperShape, ExtHostContext, ICodeMapperProgressDto, ICodeMapperRequestDto, MainContext, MainThreadCodeMapperShape } from '../common/extHost.protocol.js';
+
+@extHostNamedCustomer(MainContext.MainThreadCodeMapper)
+export class MainThreadChatCodemapper extends Disposable implements MainThreadCodeMapperShape {
+
+	private providers = this._register(new DisposableMap<number, IDisposable>());
+	private readonly _proxy: ExtHostCodeMapperShape;
+	private static _requestHandlePool: number = 0;
+	private _responseMap = new Map<string, ICodeMapperResponse>();
+
+	constructor(
+		extHostContext: IExtHostContext,
+		@ICodeMapperService private readonly codeMapperService: ICodeMapperService
+	) {
+		super();
+		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostCodeMapper);
+	}
+
+	$registerCodeMapperProvider(handle: number): void {
+		const impl: ICodeMapperProvider = {
+			mapCode: async (uiRequest: ICodeMapperRequest, response: ICodeMapperResponse, token: CancellationToken) => {
+				const requestId = String(MainThreadChatCodemapper._requestHandlePool++);
+				this._responseMap.set(requestId, response);
+				const extHostRequest: ICodeMapperRequestDto = {
+					requestId,
+					codeBlocks: uiRequest.codeBlocks,
+					conversation: uiRequest.conversation
+				};
+				try {
+					return await this._proxy.$mapCode(handle, extHostRequest, token).then((result) => result ?? undefined);
+				} finally {
+					this._responseMap.delete(requestId);
+				}
+			}
+		};
+
+		const disposable = this.codeMapperService.registerCodeMapperProvider(handle, impl);
+		this.providers.set(handle, disposable);
+	}
+
+	$unregisterCodeMapperProvider(handle: number): void {
+		this.providers.deleteAndDispose(handle);
+	}
+
+	$handleProgress(requestId: string, data: ICodeMapperProgressDto): Promise<void> {
+		const response = this._responseMap.get(requestId);
+		if (response) {
+			const resource = URI.revive(data.uri);
+			response.textEdit(resource, data.edits);
+		}
+		return Promise.resolve();
+	}
+}
diff --git a/src/vs/workbench/api/browser/mainThreadChatVariables.ts b/src/vs/workbench/api/browser/mainThreadChatVariables.ts
index 9e08e5d1423..9897a5e8f85 100644
--- a/src/vs/workbench/api/browser/mainThreadChatVariables.ts
+++ b/src/vs/workbench/api/browser/mainThreadChatVariables.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DisposableMap } from 'vs/base/common/lifecycle';
-import { revive } from 'vs/base/common/marshalling';
-import { ExtHostChatVariablesShape, ExtHostContext, IChatVariableResolverProgressDto, MainContext, MainThreadChatVariablesShape } from 'vs/workbench/api/common/extHost.protocol';
-import { IChatRequestVariableValue, IChatVariableData, IChatVariableResolverProgress, IChatVariablesService } from 'vs/workbench/contrib/chat/common/chatVariables';
-import { IExtHostContext, extHostNamedCustomer } from 'vs/workbench/services/extensions/common/extHostCustomers';
+import { DisposableMap } from '../../../base/common/lifecycle.js';
+import { revive } from '../../../base/common/marshalling.js';
+import { ExtHostChatVariablesShape, ExtHostContext, IChatVariableResolverProgressDto, MainContext, MainThreadChatVariablesShape } from '../common/extHost.protocol.js';
+import { IChatRequestVariableValue, IChatVariableData, IChatVariableResolverProgress, IChatVariablesService } from '../../contrib/chat/common/chatVariables.js';
+import { IExtHostContext, extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 
 @extHostNamedCustomer(MainContext.MainThreadChatVariables)
 export class MainThreadChatVariables implements MainThreadChatVariablesShape {
diff --git a/src/vs/workbench/api/browser/mainThreadClipboard.ts b/src/vs/workbench/api/browser/mainThreadClipboard.ts
index 11be3e647dc..911c72cc8e9 100644
--- a/src/vs/workbench/api/browser/mainThreadClipboard.ts
+++ b/src/vs/workbench/api/browser/mainThreadClipboard.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { extHostNamedCustomer } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { MainContext, MainThreadClipboardShape } from '../common/extHost.protocol';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
+import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { MainContext, MainThreadClipboardShape } from '../common/extHost.protocol.js';
+import { IClipboardService } from '../../../platform/clipboard/common/clipboardService.js';
 
 @extHostNamedCustomer(MainContext.MainThreadClipboard)
 export class MainThreadClipboard implements MainThreadClipboardShape {
diff --git a/src/vs/workbench/api/browser/mainThreadCodeInsets.ts b/src/vs/workbench/api/browser/mainThreadCodeInsets.ts
index 3fa0eef969f..efc220d3c31 100644
--- a/src/vs/workbench/api/browser/mainThreadCodeInsets.ts
+++ b/src/vs/workbench/api/browser/mainThreadCodeInsets.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getWindow } from 'vs/base/browser/dom';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { isEqual } from 'vs/base/common/resources';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { IActiveCodeEditor, IViewZone } from 'vs/editor/browser/editorBrowser';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { reviveWebviewContentOptions } from 'vs/workbench/api/browser/mainThreadWebviews';
-import { ExtHostContext, ExtHostEditorInsetsShape, IWebviewContentOptions, MainContext, MainThreadEditorInsetsShape } from 'vs/workbench/api/common/extHost.protocol';
-import { IWebviewService, IWebviewElement } from 'vs/workbench/contrib/webview/browser/webview';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
+import { getWindow } from '../../../base/browser/dom.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { isEqual } from '../../../base/common/resources.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { IActiveCodeEditor, IViewZone } from '../../../editor/browser/editorBrowser.js';
+import { ICodeEditorService } from '../../../editor/browser/services/codeEditorService.js';
+import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
+import { reviveWebviewContentOptions } from './mainThreadWebviews.js';
+import { ExtHostContext, ExtHostEditorInsetsShape, IWebviewContentOptions, MainContext, MainThreadEditorInsetsShape } from '../common/extHost.protocol.js';
+import { IWebviewService, IWebviewElement } from '../../contrib/webview/browser/webview.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
 
 // todo@jrieken move these things back into something like contrib/insets
 class EditorWebviewZone implements IViewZone {
diff --git a/src/vs/workbench/api/browser/mainThreadCommands.ts b/src/vs/workbench/api/browser/mainThreadCommands.ts
index 47e8acbbf81..9e92c453fc2 100644
--- a/src/vs/workbench/api/browser/mainThreadCommands.ts
+++ b/src/vs/workbench/api/browser/mainThreadCommands.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DisposableMap, IDisposable } from 'vs/base/common/lifecycle';
-import { revive } from 'vs/base/common/marshalling';
-import { CommandsRegistry, ICommandMetadata, ICommandService } from 'vs/platform/commands/common/commands';
-import { IExtHostContext, extHostNamedCustomer } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { Dto, SerializableObjectWithBuffers } from 'vs/workbench/services/extensions/common/proxyIdentifier';
-import { ExtHostCommandsShape, ExtHostContext, MainContext, MainThreadCommandsShape } from '../common/extHost.protocol';
-import { isString } from 'vs/base/common/types';
+import { DisposableMap, IDisposable } from '../../../base/common/lifecycle.js';
+import { revive } from '../../../base/common/marshalling.js';
+import { CommandsRegistry, ICommandMetadata, ICommandService } from '../../../platform/commands/common/commands.js';
+import { IExtHostContext, extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { IExtensionService } from '../../services/extensions/common/extensions.js';
+import { Dto, SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';
+import { ExtHostCommandsShape, ExtHostContext, MainContext, MainThreadCommandsShape } from '../common/extHost.protocol.js';
+import { isString } from '../../../base/common/types.js';
 
 
 @extHostNamedCustomer(MainContext.MainThreadCommands)
diff --git a/src/vs/workbench/api/browser/mainThreadComments.ts b/src/vs/workbench/api/browser/mainThreadComments.ts
index 2e342290e96..c68f3c251c3 100644
--- a/src/vs/workbench/api/browser/mainThreadComments.ts
+++ b/src/vs/workbench/api/browser/mainThreadComments.ts
@@ -3,34 +3,33 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import * as languages from 'vs/editor/common/languages';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { ICommentController, ICommentService } from 'vs/workbench/contrib/comments/browser/commentService';
-import { CommentsPanel } from 'vs/workbench/contrib/comments/browser/commentsView';
-import { CommentProviderFeatures, ExtHostCommentsShape, ExtHostContext, MainContext, MainThreadCommentsShape, CommentThreadChanges } from '../common/extHost.protocol';
-import { COMMENTS_VIEW_ID, COMMENTS_VIEW_STORAGE_ID, COMMENTS_VIEW_TITLE } from 'vs/workbench/contrib/comments/browser/commentsTreeViewer';
-import { ViewContainer, IViewContainersRegistry, Extensions as ViewExtensions, ViewContainerLocation, IViewsRegistry, IViewDescriptorService } from 'vs/workbench/common/views';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
-import { Codicon } from 'vs/base/common/codicons';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { localize } from 'vs/nls';
-import { MarshalledId } from 'vs/base/common/marshallingIds';
-import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
-import { Schemas } from 'vs/base/common/network';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { MarshalledCommentThread } from 'vs/workbench/common/comments';
-import { revealCommentThread } from 'vs/workbench/contrib/comments/browser/commentsController';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { CommentThreadRevealOptions } from 'vs/editor/common/languages';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../base/common/lifecycle.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { IRange, Range } from '../../../editor/common/core/range.js';
+import * as languages from '../../../editor/common/languages.js';
+import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
+import { Registry } from '../../../platform/registry/common/platform.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { ICommentController, ICommentService } from '../../contrib/comments/browser/commentService.js';
+import { CommentsPanel } from '../../contrib/comments/browser/commentsView.js';
+import { CommentProviderFeatures, ExtHostCommentsShape, ExtHostContext, MainContext, MainThreadCommentsShape, CommentThreadChanges } from '../common/extHost.protocol.js';
+import { COMMENTS_VIEW_ID, COMMENTS_VIEW_STORAGE_ID, COMMENTS_VIEW_TITLE } from '../../contrib/comments/browser/commentsTreeViewer.js';
+import { ViewContainer, IViewContainersRegistry, Extensions as ViewExtensions, ViewContainerLocation, IViewsRegistry, IViewDescriptorService } from '../../common/views.js';
+import { SyncDescriptor } from '../../../platform/instantiation/common/descriptors.js';
+import { ViewPaneContainer } from '../../browser/parts/views/viewPaneContainer.js';
+import { Codicon } from '../../../base/common/codicons.js';
+import { registerIcon } from '../../../platform/theme/common/iconRegistry.js';
+import { localize } from '../../../nls.js';
+import { MarshalledId } from '../../../base/common/marshallingIds.js';
+import { ICellRange } from '../../contrib/notebook/common/notebookRange.js';
+import { Schemas } from '../../../base/common/network.js';
+import { IViewsService } from '../../services/views/common/viewsService.js';
+import { MarshalledCommentThread } from '../../common/comments.js';
+import { revealCommentThread } from '../../contrib/comments/browser/commentsController.js';
+import { IEditorService } from '../../services/editor/common/editorService.js';
+import { IUriIdentityService } from '../../../platform/uriIdentity/common/uriIdentity.js';
 
 export class MainThreadCommentThread<T> implements languages.CommentThread<T> {
 	private _input?: languages.CommentInput;
@@ -70,13 +69,13 @@ export class MainThreadCommentThread<T> implements languages.CommentThread<T> {
 	private readonly _onDidChangeLabel = new Emitter<string | undefined>();
 	readonly onDidChangeLabel: Event<string | undefined> = this._onDidChangeLabel.event;
 
-	private _comments: languages.Comment[] | undefined;
+	private _comments: ReadonlyArray<languages.Comment> | undefined;
 
-	public get comments(): languages.Comment[] | undefined {
+	public get comments(): ReadonlyArray<languages.Comment> | undefined {
 		return this._comments;
 	}
 
-	public set comments(newComments: languages.Comment[] | undefined) {
+	public set comments(newComments: ReadonlyArray<languages.Comment> | undefined) {
 		this._comments = newComments;
 		this._onDidChangeComments.fire(this._comments);
 	}
@@ -86,7 +85,6 @@ export class MainThreadCommentThread<T> implements languages.CommentThread<T> {
 
 	set range(range: T | undefined) {
 		this._range = range;
-		this._onDidChangeRange.fire(this._range);
 	}
 
 	get range(): T | undefined {
@@ -104,9 +102,6 @@ export class MainThreadCommentThread<T> implements languages.CommentThread<T> {
 		return this._canReply;
 	}
 
-	private readonly _onDidChangeRange = new Emitter<T | undefined>();
-	public onDidChangeRange = this._onDidChangeRange.event;
-
 	private _collapsibleState: languages.CommentThreadCollapsibleState | undefined;
 	get collapsibleState() {
 		return this._collapsibleState;
@@ -185,6 +180,7 @@ export class MainThreadCommentThread<T> implements languages.CommentThread<T> {
 		public threadId: string,
 		public resource: string,
 		private _range: T | undefined,
+		comments: languages.Comment[] | undefined,
 		private _canReply: boolean,
 		private _isTemplate: boolean,
 		public editorId?: string
@@ -192,6 +188,8 @@ export class MainThreadCommentThread<T> implements languages.CommentThread<T> {
 		this._isDisposed = false;
 		if (_isTemplate) {
 			this.comments = [];
+		} else if (comments) {
+			this._comments = comments;
 		}
 	}
 
@@ -202,7 +200,7 @@ export class MainThreadCommentThread<T> implements languages.CommentThread<T> {
 		if (modified('range')) { this._range = changes.range!; }
 		if (modified('label')) { this._label = changes.label; }
 		if (modified('contextValue')) { this._contextValue = changes.contextValue === null ? undefined : changes.contextValue; }
-		if (modified('comments')) { this._comments = changes.comments; }
+		if (modified('comments')) { this.comments = changes.comments; }
 		if (modified('collapseState')) { this.initialCollapsibleState = changes.collapseState; }
 		if (modified('canReply')) { this.canReply = changes.canReply!; }
 		if (modified('state')) { this.state = changes.state!; }
@@ -210,13 +208,16 @@ export class MainThreadCommentThread<T> implements languages.CommentThread<T> {
 		if (modified('isTemplate')) { this._isTemplate = changes.isTemplate!; }
 	}
 
+	hasComments(): boolean {
+		return !!this.comments && this.comments.length > 0;
+	}
+
 	dispose() {
 		this._isDisposed = true;
 		this._onDidChangeCollapsibleState.dispose();
 		this._onDidChangeComments.dispose();
 		this._onDidChangeInput.dispose();
 		this._onDidChangeLabel.dispose();
-		this._onDidChangeRange.dispose();
 		this._onDidChangeState.dispose();
 	}
 
@@ -285,7 +286,13 @@ export class MainThreadCommentController implements ICommentController {
 		private _features: CommentProviderFeatures
 	) { }
 
+	get activeComment() {
+		return this._activeComment;
+	}
+
+	private _activeComment: { thread: languages.CommentThread; comment?: languages.Comment } | undefined;
 	async setActiveCommentAndThread(commentInfo: { thread: languages.CommentThread; comment?: languages.Comment } | undefined) {
+		this._activeComment = commentInfo;
 		return this._proxy.$setActiveComment(this._handle, commentInfo ? { commentThreadHandle: commentInfo.thread.commentThreadHandle, uniqueIdInThread: commentInfo.comment?.uniqueIdInThread } : undefined);
 	}
 
@@ -298,6 +305,7 @@ export class MainThreadCommentController implements ICommentController {
 		threadId: string,
 		resource: UriComponents,
 		range: IRange | ICellRange | undefined,
+		comments: languages.Comment[],
 		isTemplate: boolean,
 		editorId?: string
 	): languages.CommentThread<IRange | ICellRange> {
@@ -308,6 +316,7 @@ export class MainThreadCommentController implements ICommentController {
 			threadId,
 			URI.revive(resource).toString(),
 			range,
+			comments,
 			true,
 			isTemplate,
 			editorId
@@ -590,6 +599,7 @@ export class MainThreadComments extends Disposable implements MainThreadComments
 		threadId: string,
 		resource: UriComponents,
 		range: IRange | ICellRange | undefined,
+		comments: languages.Comment[],
 		extensionId: ExtensionIdentifier,
 		isTemplate: boolean,
 		editorId?: string
@@ -600,7 +610,7 @@ export class MainThreadComments extends Disposable implements MainThreadComments
 			return undefined;
 		}
 
-		return provider.createCommentThread(extensionId.value, commentThreadHandle, threadId, resource, range, isTemplate, editorId);
+		return provider.createCommentThread(extensionId.value, commentThreadHandle, threadId, resource, range, comments, isTemplate, editorId);
 	}
 
 	$updateCommentThread(handle: number,
@@ -637,7 +647,7 @@ export class MainThreadComments extends Disposable implements MainThreadComments
 		provider.updateCommentingRanges(resourceHints);
 	}
 
-	async $revealCommentThread(handle: number, commentThreadHandle: number, options: CommentThreadRevealOptions): Promise<void> {
+	async $revealCommentThread(handle: number, commentThreadHandle: number, commentUniqueIdInThread: number, options: languages.CommentThreadRevealOptions): Promise<void> {
 		const provider = this._commentControllers.get(handle);
 
 		if (!provider) {
@@ -649,7 +659,24 @@ export class MainThreadComments extends Disposable implements MainThreadComments
 			return Promise.resolve();
 		}
 
-		revealCommentThread(this._commentService, this._editorService, this._uriIdentityService, thread, undefined, options.focusReply, undefined, options.preserveFocus);
+		const comment = thread.comments?.find(comment => comment.uniqueIdInThread === commentUniqueIdInThread);
+
+		revealCommentThread(this._commentService, this._editorService, this._uriIdentityService, thread, comment, options.focusReply, undefined, options.preserveFocus);
+	}
+
+	async $hideCommentThread(handle: number, commentThreadHandle: number): Promise<void> {
+		const provider = this._commentControllers.get(handle);
+
+		if (!provider) {
+			return Promise.resolve();
+		}
+
+		const thread = provider.getAllComments().find(thread => thread.commentThreadHandle === commentThreadHandle);
+		if (!thread || !thread.isDocumentCommentThread()) {
+			return Promise.resolve();
+		}
+
+		thread.collapsibleState = languages.CommentThreadCollapsibleState.Collapsed;
 	}
 
 	private registerView(commentsViewAlreadyRegistered: boolean) {
diff --git a/src/vs/workbench/api/browser/mainThreadConfiguration.ts b/src/vs/workbench/api/browser/mainThreadConfiguration.ts
index deb82c81365..86891475af3 100644
--- a/src/vs/workbench/api/browser/mainThreadConfiguration.ts
+++ b/src/vs/workbench/api/browser/mainThreadConfiguration.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope, getScopes } from 'vs/platform/configuration/common/configurationRegistry';
-import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { MainThreadConfigurationShape, MainContext, ExtHostContext, IConfigurationInitData } from '../common/extHost.protocol';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { ConfigurationTarget, IConfigurationService, IConfigurationOverrides } from 'vs/platform/configuration/common/configuration';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { URI } from '../../../base/common/uri.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { Registry } from '../../../platform/registry/common/platform.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope, getScopes } from '../../../platform/configuration/common/configurationRegistry.js';
+import { IWorkspaceContextService, WorkbenchState } from '../../../platform/workspace/common/workspace.js';
+import { MainThreadConfigurationShape, MainContext, ExtHostContext, IConfigurationInitData } from '../common/extHost.protocol.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { ConfigurationTarget, IConfigurationService, IConfigurationOverrides } from '../../../platform/configuration/common/configuration.js';
+import { IEnvironmentService } from '../../../platform/environment/common/environment.js';
 
 @extHostNamedCustomer(MainContext.MainThreadConfiguration)
 export class MainThreadConfiguration implements MainThreadConfigurationShape {
diff --git a/src/vs/workbench/api/browser/mainThreadConsole.ts b/src/vs/workbench/api/browser/mainThreadConsole.ts
index c942d609405..d81a9a787a1 100644
--- a/src/vs/workbench/api/browser/mainThreadConsole.ts
+++ b/src/vs/workbench/api/browser/mainThreadConsole.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { MainContext, MainThreadConsoleShape } from 'vs/workbench/api/common/extHost.protocol';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IRemoteConsoleLog, log } from 'vs/base/common/console';
-import { logRemoteEntry, logRemoteEntryIfError } from 'vs/workbench/services/extensions/common/remoteConsoleUtil';
-import { parseExtensionDevOptions } from 'vs/workbench/services/extensions/common/extensionDevOptions';
-import { ILogService } from 'vs/platform/log/common/log';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { MainContext, MainThreadConsoleShape } from '../common/extHost.protocol.js';
+import { IEnvironmentService } from '../../../platform/environment/common/environment.js';
+import { IRemoteConsoleLog, log } from '../../../base/common/console.js';
+import { logRemoteEntry, logRemoteEntryIfError } from '../../services/extensions/common/remoteConsoleUtil.js';
+import { parseExtensionDevOptions } from '../../services/extensions/common/extensionDevOptions.js';
+import { ILogService } from '../../../platform/log/common/log.js';
 
 @extHostNamedCustomer(MainContext.MainThreadConsole)
 export class MainThreadConsole implements MainThreadConsoleShape {
diff --git a/src/vs/workbench/api/browser/mainThreadCustomEditors.ts b/src/vs/workbench/api/browser/mainThreadCustomEditors.ts
index 3f992a4cfad..4fb33a99f16 100644
--- a/src/vs/workbench/api/browser/mainThreadCustomEditors.ts
+++ b/src/vs/workbench/api/browser/mainThreadCustomEditors.ts
@@ -3,47 +3,47 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { multibyteAwareBtoa } from 'vs/base/browser/dom';
-import { CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { isCancellationError, onUnexpectedError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableMap, DisposableStore, IReference } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { basename } from 'vs/base/common/path';
-import { isEqual, isEqualOrParent, toLocalResource } from 'vs/base/common/resources';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { localize } from 'vs/nls';
-import { IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { FileOperation, IFileService } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { IUndoRedoService, UndoRedoElementType } from 'vs/platform/undoRedo/common/undoRedo';
-import { MainThreadWebviewPanels } from 'vs/workbench/api/browser/mainThreadWebviewPanels';
-import { MainThreadWebviews, reviveWebviewExtension } from 'vs/workbench/api/browser/mainThreadWebviews';
-import * as extHostProtocol from 'vs/workbench/api/common/extHost.protocol';
-import { IRevertOptions, ISaveOptions } from 'vs/workbench/common/editor';
-import { CustomEditorInput } from 'vs/workbench/contrib/customEditor/browser/customEditorInput';
-import { CustomDocumentBackupData } from 'vs/workbench/contrib/customEditor/browser/customEditorInputFactory';
-import { ICustomEditorModel, ICustomEditorService } from 'vs/workbench/contrib/customEditor/common/customEditor';
-import { CustomTextEditorModel } from 'vs/workbench/contrib/customEditor/common/customTextEditorModel';
-import { ExtensionKeyedWebviewOriginStore, WebviewExtensionDescription } from 'vs/workbench/contrib/webview/browser/webview';
-import { WebviewInput } from 'vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
-import { IWebviewWorkbenchService } from 'vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService';
-import { editorGroupToColumn } from 'vs/workbench/services/editor/common/editorGroupColumn';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { ResourceWorkingCopy } from 'vs/workbench/services/workingCopy/common/resourceWorkingCopy';
-import { IWorkingCopy, IWorkingCopyBackup, IWorkingCopySaveEvent, NO_TYPE_ID, WorkingCopyCapabilities } from 'vs/workbench/services/workingCopy/common/workingCopy';
-import { IWorkingCopyFileService, WorkingCopyFileEvent } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
-import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
+import { multibyteAwareBtoa } from '../../../base/browser/dom.js';
+import { CancelablePromise, createCancelablePromise } from '../../../base/common/async.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { isCancellationError, onUnexpectedError } from '../../../base/common/errors.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable, DisposableMap, DisposableStore, IReference } from '../../../base/common/lifecycle.js';
+import { Schemas } from '../../../base/common/network.js';
+import { basename } from '../../../base/common/path.js';
+import { isEqual, isEqualOrParent, toLocalResource } from '../../../base/common/resources.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { generateUuid } from '../../../base/common/uuid.js';
+import { localize } from '../../../nls.js';
+import { IFileDialogService } from '../../../platform/dialogs/common/dialogs.js';
+import { FileOperation, IFileService } from '../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
+import { ILabelService } from '../../../platform/label/common/label.js';
+import { IStorageService } from '../../../platform/storage/common/storage.js';
+import { IUndoRedoService, UndoRedoElementType } from '../../../platform/undoRedo/common/undoRedo.js';
+import { MainThreadWebviewPanels } from './mainThreadWebviewPanels.js';
+import { MainThreadWebviews, reviveWebviewExtension } from './mainThreadWebviews.js';
+import * as extHostProtocol from '../common/extHost.protocol.js';
+import { IRevertOptions, ISaveOptions } from '../../common/editor.js';
+import { CustomEditorInput } from '../../contrib/customEditor/browser/customEditorInput.js';
+import { CustomDocumentBackupData } from '../../contrib/customEditor/browser/customEditorInputFactory.js';
+import { ICustomEditorModel, ICustomEditorService } from '../../contrib/customEditor/common/customEditor.js';
+import { CustomTextEditorModel } from '../../contrib/customEditor/common/customTextEditorModel.js';
+import { ExtensionKeyedWebviewOriginStore, WebviewExtensionDescription } from '../../contrib/webview/browser/webview.js';
+import { WebviewInput } from '../../contrib/webviewPanel/browser/webviewEditorInput.js';
+import { IWebviewWorkbenchService } from '../../contrib/webviewPanel/browser/webviewWorkbenchService.js';
+import { editorGroupToColumn } from '../../services/editor/common/editorGroupColumn.js';
+import { IEditorGroupsService } from '../../services/editor/common/editorGroupsService.js';
+import { IEditorService } from '../../services/editor/common/editorService.js';
+import { IWorkbenchEnvironmentService } from '../../services/environment/common/environmentService.js';
+import { IExtensionService } from '../../services/extensions/common/extensions.js';
+import { IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { IPathService } from '../../services/path/common/pathService.js';
+import { ResourceWorkingCopy } from '../../services/workingCopy/common/resourceWorkingCopy.js';
+import { IWorkingCopy, IWorkingCopyBackup, IWorkingCopySaveEvent, NO_TYPE_ID, WorkingCopyCapabilities } from '../../services/workingCopy/common/workingCopy.js';
+import { IWorkingCopyFileService, WorkingCopyFileEvent } from '../../services/workingCopy/common/workingCopyFileService.js';
+import { IWorkingCopyService } from '../../services/workingCopy/common/workingCopyService.js';
 
 const enum CustomEditorModelType {
 	Custom,
@@ -389,18 +389,7 @@ class MainThreadCustomEditorModel extends ResourceWorkingCopy implements ICustom
 			this._register(workingCopyService.registerWorkingCopy(this));
 
 			this._register(extensionService.onWillStop(e => {
-				if (!this.isDirty()) {
-					return;
-				}
-
-				e.veto((async () => {
-					const didSave = await this.save();
-					if (!didSave) {
-						// Veto
-						return true;
-					}
-					return false; // Don't veto
-				})(), localize('vetoExtHostRestart', "Custom editor '{0}' could not be saved.", this.name));
+				e.veto(true, localize('vetoExtHostRestart', "A custom editor for '{0}' is open.", this.name));
 			}));
 		}
 
diff --git a/src/vs/workbench/api/browser/mainThreadDebugService.ts b/src/vs/workbench/api/browser/mainThreadDebugService.ts
index 36b5a4df0ae..cccdce7eb4c 100644
--- a/src/vs/workbench/api/browser/mainThreadDebugService.ts
+++ b/src/vs/workbench/api/browser/mainThreadDebugService.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DisposableMap, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { URI as uri, UriComponents } from 'vs/base/common/uri';
-import { IDebugService, IConfig, IDebugConfigurationProvider, IBreakpoint, IFunctionBreakpoint, IBreakpointData, IDebugAdapter, IDebugAdapterDescriptorFactory, IDebugSession, IDebugAdapterFactory, IDataBreakpoint, IDebugSessionOptions, IInstructionBreakpoint, DebugConfigurationProviderTriggerKind, IDebugVisualization, DataBreakpointSetType } from 'vs/workbench/contrib/debug/common/debug';
+import { DisposableMap, DisposableStore, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { URI as uri, UriComponents } from '../../../base/common/uri.js';
+import { IDebugService, IConfig, IDebugConfigurationProvider, IBreakpoint, IFunctionBreakpoint, IBreakpointData, IDebugAdapter, IDebugAdapterDescriptorFactory, IDebugSession, IDebugAdapterFactory, IDataBreakpoint, IDebugSessionOptions, IInstructionBreakpoint, DebugConfigurationProviderTriggerKind, IDebugVisualization, DataBreakpointSetType } from '../../contrib/debug/common/debug.js';
 import {
 	ExtHostContext, ExtHostDebugServiceShape, MainThreadDebugServiceShape, DebugSessionUUID, MainContext,
 	IBreakpointsDeltaDto, ISourceMultiBreakpointDto, ISourceBreakpointDto, IFunctionBreakpointDto, IDebugSessionDto, IDataBreakpointDto, IStartDebuggingOptions, IDebugConfiguration, IThreadFocusDto, IStackFrameFocusDto
-} from 'vs/workbench/api/common/extHost.protocol';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import severity from 'vs/base/common/severity';
-import { AbstractDebugAdapter } from 'vs/workbench/contrib/debug/common/abstractDebugAdapter';
-import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { convertToVSCPaths, convertToDAPaths, isSessionAttach } from 'vs/workbench/contrib/debug/common/debugUtils';
-import { ErrorNoTelemetry } from 'vs/base/common/errors';
-import { IDebugVisualizerService } from 'vs/workbench/contrib/debug/common/debugVisualizers';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { Event } from 'vs/base/common/event';
-import { isDefined } from 'vs/base/common/types';
+} from '../common/extHost.protocol.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import severity from '../../../base/common/severity.js';
+import { AbstractDebugAdapter } from '../../contrib/debug/common/abstractDebugAdapter.js';
+import { IWorkspaceFolder } from '../../../platform/workspace/common/workspace.js';
+import { convertToVSCPaths, convertToDAPaths, isSessionAttach } from '../../contrib/debug/common/debugUtils.js';
+import { ErrorNoTelemetry } from '../../../base/common/errors.js';
+import { IDebugVisualizerService } from '../../contrib/debug/common/debugVisualizers.js';
+import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
+import { Event } from '../../../base/common/event.js';
+import { isDefined } from '../../../base/common/types.js';
 
 @extHostNamedCustomer(MainContext.MainThreadDebugService)
 export class MainThreadDebugService implements MainThreadDebugServiceShape, IDebugAdapterFactory {
@@ -46,7 +46,7 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape, IDeb
 		this._toDispose.add(debugService.onDidNewSession(session => {
 			this._proxy.$acceptDebugSessionStarted(this.getSessionDto(session));
 			const store = sessionListeners.get(session);
-			store!.add(session.onDidChangeName(name => {
+			store?.add(session.onDidChangeName(name => {
 				this._proxy.$acceptDebugSessionNameChanged(this.getSessionDto(session), name);
 			}));
 		}));
diff --git a/src/vs/workbench/api/browser/mainThreadDecorations.ts b/src/vs/workbench/api/browser/mainThreadDecorations.ts
index 46ae4275baa..9363c8bb9a4 100644
--- a/src/vs/workbench/api/browser/mainThreadDecorations.ts
+++ b/src/vs/workbench/api/browser/mainThreadDecorations.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { Emitter } from 'vs/base/common/event';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { ExtHostContext, MainContext, MainThreadDecorationsShape, ExtHostDecorationsShape, DecorationData, DecorationRequest } from '../common/extHost.protocol';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { IDecorationsService, IDecorationData } from 'vs/workbench/services/decorations/common/decorations';
-import { CancellationToken } from 'vs/base/common/cancellation';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { Emitter } from '../../../base/common/event.js';
+import { IDisposable, dispose } from '../../../base/common/lifecycle.js';
+import { ExtHostContext, MainContext, MainThreadDecorationsShape, ExtHostDecorationsShape, DecorationData, DecorationRequest } from '../common/extHost.protocol.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { IDecorationsService, IDecorationData } from '../../services/decorations/common/decorations.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
 
 class DecorationRequestsQueue {
 
diff --git a/src/vs/workbench/api/browser/mainThreadDiagnostics.ts b/src/vs/workbench/api/browser/mainThreadDiagnostics.ts
index 0fcc79603cc..df4491d4e86 100644
--- a/src/vs/workbench/api/browser/mainThreadDiagnostics.ts
+++ b/src/vs/workbench/api/browser/mainThreadDiagnostics.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IMarkerService, IMarkerData } from 'vs/platform/markers/common/markers';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { MainThreadDiagnosticsShape, MainContext, ExtHostDiagnosticsShape, ExtHostContext } from '../common/extHost.protocol';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
+import { IMarkerService, IMarkerData } from '../../../platform/markers/common/markers.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { MainThreadDiagnosticsShape, MainContext, ExtHostDiagnosticsShape, ExtHostContext } from '../common/extHost.protocol.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { IUriIdentityService } from '../../../platform/uriIdentity/common/uriIdentity.js';
 
 @extHostNamedCustomer(MainContext.MainThreadDiagnostics)
 export class MainThreadDiagnostics implements MainThreadDiagnosticsShape {
diff --git a/src/vs/workbench/api/browser/mainThreadDialogs.ts b/src/vs/workbench/api/browser/mainThreadDialogs.ts
index 424b70bcc78..4ab41cf2663 100644
--- a/src/vs/workbench/api/browser/mainThreadDialogs.ts
+++ b/src/vs/workbench/api/browser/mainThreadDialogs.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { MainThreadDiaglogsShape, MainContext, MainThreadDialogOpenOptions, MainThreadDialogSaveOptions } from '../common/extHost.protocol';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { IFileDialogService, IOpenDialogOptions, ISaveDialogOptions } from 'vs/platform/dialogs/common/dialogs';
-import { Schemas } from 'vs/base/common/network';
+import { URI } from '../../../base/common/uri.js';
+import { MainThreadDiaglogsShape, MainContext, MainThreadDialogOpenOptions, MainThreadDialogSaveOptions } from '../common/extHost.protocol.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { IFileDialogService, IOpenDialogOptions, ISaveDialogOptions } from '../../../platform/dialogs/common/dialogs.js';
+import { Schemas } from '../../../base/common/network.js';
 
 @extHostNamedCustomer(MainContext.MainThreadDialogs)
 export class MainThreadDialogs implements MainThreadDiaglogsShape {
diff --git a/src/vs/workbench/api/browser/mainThreadDocumentContentProviders.ts b/src/vs/workbench/api/browser/mainThreadDocumentContentProviders.ts
index 1acbcf23d03..7ff4687fdf2 100644
--- a/src/vs/workbench/api/browser/mainThreadDocumentContentProviders.ts
+++ b/src/vs/workbench/api/browser/mainThreadDocumentContentProviders.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { dispose, DisposableMap } from 'vs/base/common/lifecycle';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { EditOperation } from 'vs/editor/common/core/editOperation';
-import { Range } from 'vs/editor/common/core/range';
-import { ITextModel } from 'vs/editor/common/model';
-import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { ExtHostContext, ExtHostDocumentContentProvidersShape, MainContext, MainThreadDocumentContentProvidersShape } from '../common/extHost.protocol';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
+import { onUnexpectedError } from '../../../base/common/errors.js';
+import { dispose, DisposableMap } from '../../../base/common/lifecycle.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { EditOperation } from '../../../editor/common/core/editOperation.js';
+import { Range } from '../../../editor/common/core/range.js';
+import { ITextModel } from '../../../editor/common/model.js';
+import { IEditorWorkerService } from '../../../editor/common/services/editorWorker.js';
+import { IModelService } from '../../../editor/common/services/model.js';
+import { ILanguageService } from '../../../editor/common/languages/language.js';
+import { ITextModelService } from '../../../editor/common/services/resolverService.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { ExtHostContext, ExtHostDocumentContentProvidersShape, MainContext, MainThreadDocumentContentProvidersShape } from '../common/extHost.protocol.js';
+import { CancellationTokenSource } from '../../../base/common/cancellation.js';
 
 @extHostNamedCustomer(MainContext.MainThreadDocumentContentProviders)
 export class MainThreadDocumentContentProviders implements MainThreadDocumentContentProvidersShape {
diff --git a/src/vs/workbench/api/browser/mainThreadDocuments.ts b/src/vs/workbench/api/browser/mainThreadDocuments.ts
index 02d36af3856..6ded63e34be 100644
--- a/src/vs/workbench/api/browser/mainThreadDocuments.ts
+++ b/src/vs/workbench/api/browser/mainThreadDocuments.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { IReference, dispose, Disposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { ITextModel, shouldSynchronizeModel } from 'vs/editor/common/model';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { IFileService, FileOperation } from 'vs/platform/files/common/files';
-import { ExtHostContext, ExtHostDocumentsShape, MainThreadDocumentsShape } from 'vs/workbench/api/common/extHost.protocol';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { toLocalResource, extUri, IExtUri } from 'vs/base/common/resources';
-import { IWorkingCopyFileService } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { ResourceMap } from 'vs/base/common/map';
-import { IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { ErrorNoTelemetry } from 'vs/base/common/errors';
+import { toErrorMessage } from '../../../base/common/errorMessage.js';
+import { IReference, dispose, Disposable } from '../../../base/common/lifecycle.js';
+import { Schemas } from '../../../base/common/network.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { ITextModel, shouldSynchronizeModel } from '../../../editor/common/model.js';
+import { IModelService } from '../../../editor/common/services/model.js';
+import { ITextModelService } from '../../../editor/common/services/resolverService.js';
+import { IFileService, FileOperation } from '../../../platform/files/common/files.js';
+import { ExtHostContext, ExtHostDocumentsShape, MainThreadDocumentsShape } from '../common/extHost.protocol.js';
+import { ITextFileService } from '../../services/textfile/common/textfiles.js';
+import { IWorkbenchEnvironmentService } from '../../services/environment/common/environmentService.js';
+import { toLocalResource, extUri, IExtUri } from '../../../base/common/resources.js';
+import { IWorkingCopyFileService } from '../../services/workingCopy/common/workingCopyFileService.js';
+import { IUriIdentityService } from '../../../platform/uriIdentity/common/uriIdentity.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { IPathService } from '../../services/path/common/pathService.js';
+import { ResourceMap } from '../../../base/common/map.js';
+import { IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { ErrorNoTelemetry } from '../../../base/common/errors.js';
 
 export class BoundModelReferenceCollection {
 
diff --git a/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.ts b/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.ts
index dc20f23f976..c7a3dcea721 100644
--- a/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.ts
+++ b/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.ts
@@ -3,35 +3,35 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { combinedDisposable, DisposableStore, DisposableMap } from 'vs/base/common/lifecycle';
-import { ICodeEditor, isCodeEditor, isDiffEditor, IActiveCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { IEditor } from 'vs/editor/common/editorCommon';
-import { ITextModel, shouldSynchronizeModel } from 'vs/editor/common/model';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { IFileService } from 'vs/platform/files/common/files';
-import { extHostCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { MainThreadDocuments } from 'vs/workbench/api/browser/mainThreadDocuments';
-import { MainThreadTextEditor } from 'vs/workbench/api/browser/mainThreadEditor';
-import { MainThreadTextEditors } from 'vs/workbench/api/browser/mainThreadEditors';
-import { ExtHostContext, ExtHostDocumentsAndEditorsShape, IDocumentsAndEditorsDelta, IModelAddedData, ITextEditorAddData, MainContext } from 'vs/workbench/api/common/extHost.protocol';
-import { AbstractTextEditor } from 'vs/workbench/browser/parts/editor/textEditor';
-import { IEditorPane } from 'vs/workbench/common/editor';
-import { EditorGroupColumn, editorGroupToColumn } from 'vs/workbench/services/editor/common/editorGroupColumn';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IWorkingCopyFileService } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { diffSets, diffMaps } from 'vs/base/common/collections';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { ViewContainerLocation } from 'vs/workbench/common/views';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { Event } from '../../../base/common/event.js';
+import { combinedDisposable, DisposableStore, DisposableMap } from '../../../base/common/lifecycle.js';
+import { ICodeEditor, isCodeEditor, isDiffEditor, IActiveCodeEditor } from '../../../editor/browser/editorBrowser.js';
+import { ICodeEditorService } from '../../../editor/browser/services/codeEditorService.js';
+import { IEditor } from '../../../editor/common/editorCommon.js';
+import { ITextModel, shouldSynchronizeModel } from '../../../editor/common/model.js';
+import { IModelService } from '../../../editor/common/services/model.js';
+import { ITextModelService } from '../../../editor/common/services/resolverService.js';
+import { IFileService } from '../../../platform/files/common/files.js';
+import { extHostCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { MainThreadDocuments } from './mainThreadDocuments.js';
+import { MainThreadTextEditor } from './mainThreadEditor.js';
+import { MainThreadTextEditors } from './mainThreadEditors.js';
+import { ExtHostContext, ExtHostDocumentsAndEditorsShape, IDocumentsAndEditorsDelta, IModelAddedData, ITextEditorAddData, MainContext } from '../common/extHost.protocol.js';
+import { AbstractTextEditor } from '../../browser/parts/editor/textEditor.js';
+import { IEditorPane } from '../../common/editor.js';
+import { EditorGroupColumn, editorGroupToColumn } from '../../services/editor/common/editorGroupColumn.js';
+import { IEditorService } from '../../services/editor/common/editorService.js';
+import { IEditorGroupsService } from '../../services/editor/common/editorGroupsService.js';
+import { ITextFileService } from '../../services/textfile/common/textfiles.js';
+import { IWorkbenchEnvironmentService } from '../../services/environment/common/environmentService.js';
+import { IWorkingCopyFileService } from '../../services/workingCopy/common/workingCopyFileService.js';
+import { IUriIdentityService } from '../../../platform/uriIdentity/common/uriIdentity.js';
+import { IClipboardService } from '../../../platform/clipboard/common/clipboardService.js';
+import { IPathService } from '../../services/path/common/pathService.js';
+import { diffSets, diffMaps } from '../../../base/common/collections.js';
+import { IPaneCompositePartService } from '../../services/panecomposite/browser/panecomposite.js';
+import { ViewContainerLocation } from '../../common/views.js';
+import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
 
 
 class TextEditorSnapshot {
diff --git a/src/vs/workbench/api/browser/mainThreadDownloadService.ts b/src/vs/workbench/api/browser/mainThreadDownloadService.ts
index d8c25cadd72..33d4e7989ae 100644
--- a/src/vs/workbench/api/browser/mainThreadDownloadService.ts
+++ b/src/vs/workbench/api/browser/mainThreadDownloadService.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { MainContext, MainThreadDownloadServiceShape } from 'vs/workbench/api/common/extHost.protocol';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { IDownloadService } from 'vs/platform/download/common/download';
-import { UriComponents, URI } from 'vs/base/common/uri';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { MainContext, MainThreadDownloadServiceShape } from '../common/extHost.protocol.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { IDownloadService } from '../../../platform/download/common/download.js';
+import { UriComponents, URI } from '../../../base/common/uri.js';
 
 @extHostNamedCustomer(MainContext.MainThreadDownloadService)
 export class MainThreadDownloadService extends Disposable implements MainThreadDownloadServiceShape {
diff --git a/src/vs/workbench/api/browser/mainThreadEditSessionIdentityParticipant.ts b/src/vs/workbench/api/browser/mainThreadEditSessionIdentityParticipant.ts
index c3dc1150084..db70e241abc 100644
--- a/src/vs/workbench/api/browser/mainThreadEditSessionIdentityParticipant.ts
+++ b/src/vs/workbench/api/browser/mainThreadEditSessionIdentityParticipant.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { localize } from 'vs/nls';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { extHostCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { raceCancellationError } from 'vs/base/common/async';
-import { IEditSessionIdentityCreateParticipant, IEditSessionIdentityService } from 'vs/platform/workspace/common/editSessions';
-import { ExtHostContext, ExtHostWorkspaceShape } from 'vs/workbench/api/common/extHost.protocol';
-import { WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { localize } from '../../../nls.js';
+import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
+import { extHostCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { raceCancellationError } from '../../../base/common/async.js';
+import { IEditSessionIdentityCreateParticipant, IEditSessionIdentityService } from '../../../platform/workspace/common/editSessions.js';
+import { ExtHostContext, ExtHostWorkspaceShape } from '../common/extHost.protocol.js';
+import { WorkspaceFolder } from '../../../platform/workspace/common/workspace.js';
 
 class ExtHostEditSessionIdentityCreateParticipant implements IEditSessionIdentityCreateParticipant {
 
diff --git a/src/vs/workbench/api/browser/mainThreadEditor.ts b/src/vs/workbench/api/browser/mainThreadEditor.ts
index 575c4033787..7dd21444995 100644
--- a/src/vs/workbench/api/browser/mainThreadEditor.ts
+++ b/src/vs/workbench/api/browser/mainThreadEditor.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { RenderLineNumbersType, TextEditorCursorStyle, cursorStyleToString, EditorOption } from 'vs/editor/common/config/editorOptions';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { ISelection, Selection } from 'vs/editor/common/core/selection';
-import { IDecorationOptions, ScrollType } from 'vs/editor/common/editorCommon';
-import { ITextModel, ITextModelUpdateOptions } from 'vs/editor/common/model';
-import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { IModelService } from 'vs/editor/common/services/model';
-import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2';
-import { IApplyEditsOptions, IEditorPropertiesChangeData, IResolvedTextEditorConfiguration, ITextEditorConfigurationUpdate, IUndoStopOptions, TextEditorRevealType } from 'vs/workbench/api/common/extHost.protocol';
-import { IEditorPane } from 'vs/workbench/common/editor';
-import { equals } from 'vs/base/common/arrays';
-import { CodeEditorStateFlag, EditorState } from 'vs/editor/contrib/editorState/browser/editorState';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { SnippetParser } from 'vs/editor/contrib/snippet/browser/snippetParser';
-import { MainThreadDocuments } from 'vs/workbench/api/browser/mainThreadDocuments';
-import { ISnippetEdit } from 'vs/editor/contrib/snippet/browser/snippetSession';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { ICodeEditor } from '../../../editor/browser/editorBrowser.js';
+import { RenderLineNumbersType, TextEditorCursorStyle, cursorStyleToString, EditorOption } from '../../../editor/common/config/editorOptions.js';
+import { IRange, Range } from '../../../editor/common/core/range.js';
+import { ISelection, Selection } from '../../../editor/common/core/selection.js';
+import { IDecorationOptions, ScrollType } from '../../../editor/common/editorCommon.js';
+import { ITextModel, ITextModelUpdateOptions } from '../../../editor/common/model.js';
+import { ISingleEditOperation } from '../../../editor/common/core/editOperation.js';
+import { IModelService } from '../../../editor/common/services/model.js';
+import { SnippetController2 } from '../../../editor/contrib/snippet/browser/snippetController2.js';
+import { IApplyEditsOptions, IEditorPropertiesChangeData, IResolvedTextEditorConfiguration, ITextEditorConfigurationUpdate, IUndoStopOptions, TextEditorRevealType } from '../common/extHost.protocol.js';
+import { IEditorPane } from '../../common/editor.js';
+import { equals } from '../../../base/common/arrays.js';
+import { CodeEditorStateFlag, EditorState } from '../../../editor/contrib/editorState/browser/editorState.js';
+import { IClipboardService } from '../../../platform/clipboard/common/clipboardService.js';
+import { SnippetParser } from '../../../editor/contrib/snippet/browser/snippetParser.js';
+import { MainThreadDocuments } from './mainThreadDocuments.js';
+import { ISnippetEdit } from '../../../editor/contrib/snippet/browser/snippetSession.js';
 
 export interface IFocusTracker {
 	onGainedFocus(): void;
diff --git a/src/vs/workbench/api/browser/mainThreadEditorTabs.ts b/src/vs/workbench/api/browser/mainThreadEditorTabs.ts
index 48888b0ddcb..9d0d3555b66 100644
--- a/src/vs/workbench/api/browser/mainThreadEditorTabs.ts
+++ b/src/vs/workbench/api/browser/mainThreadEditorTabs.ts
@@ -3,31 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { DisposableMap, DisposableStore } from 'vs/base/common/lifecycle';
-import { isEqual } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ILogService } from 'vs/platform/log/common/log';
-import { AnyInputDto, ExtHostContext, IEditorTabDto, IEditorTabGroupDto, IExtHostEditorTabsShape, MainContext, MainThreadEditorTabsShape, TabInputKind, TabModelOperationKind, TextDiffInputDto } from 'vs/workbench/api/common/extHost.protocol';
-import { EditorResourceAccessor, GroupModelChangeKind, SideBySideEditor } from 'vs/workbench/common/editor';
-import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
-import { isGroupEditorMoveEvent } from 'vs/workbench/common/editor/editorGroupModel';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditorInput';
-import { AbstractTextResourceEditorInput } from 'vs/workbench/common/editor/textResourceEditorInput';
-import { ChatEditorInput } from 'vs/workbench/contrib/chat/browser/chatEditorInput';
-import { CustomEditorInput } from 'vs/workbench/contrib/customEditor/browser/customEditorInput';
-import { InteractiveEditorInput } from 'vs/workbench/contrib/interactive/browser/interactiveEditorInput';
-import { MergeEditorInput } from 'vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
-import { MultiDiffEditorInput } from 'vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
-import { NotebookEditorInput } from 'vs/workbench/contrib/notebook/common/notebookEditorInput';
-import { TerminalEditorInput } from 'vs/workbench/contrib/terminal/browser/terminalEditorInput';
-import { WebviewInput } from 'vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
-import { columnToEditorGroup, EditorGroupColumn, editorGroupToColumn } from 'vs/workbench/services/editor/common/editorGroupColumn';
-import { GroupDirection, IEditorGroup, IEditorGroupsService, preferredSideBySideGroupDirection } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorsChangeEvent, IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
+import { Event } from '../../../base/common/event.js';
+import { DisposableMap, DisposableStore } from '../../../base/common/lifecycle.js';
+import { isEqual } from '../../../base/common/resources.js';
+import { URI } from '../../../base/common/uri.js';
+import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { AnyInputDto, ExtHostContext, IEditorTabDto, IEditorTabGroupDto, IExtHostEditorTabsShape, MainContext, MainThreadEditorTabsShape, TabInputKind, TabModelOperationKind, TextDiffInputDto } from '../common/extHost.protocol.js';
+import { EditorResourceAccessor, GroupModelChangeKind, SideBySideEditor } from '../../common/editor.js';
+import { DiffEditorInput } from '../../common/editor/diffEditorInput.js';
+import { isGroupEditorMoveEvent } from '../../common/editor/editorGroupModel.js';
+import { EditorInput } from '../../common/editor/editorInput.js';
+import { SideBySideEditorInput } from '../../common/editor/sideBySideEditorInput.js';
+import { AbstractTextResourceEditorInput } from '../../common/editor/textResourceEditorInput.js';
+import { ChatEditorInput } from '../../contrib/chat/browser/chatEditorInput.js';
+import { CustomEditorInput } from '../../contrib/customEditor/browser/customEditorInput.js';
+import { InteractiveEditorInput } from '../../contrib/interactive/browser/interactiveEditorInput.js';
+import { MergeEditorInput } from '../../contrib/mergeEditor/browser/mergeEditorInput.js';
+import { MultiDiffEditorInput } from '../../contrib/multiDiffEditor/browser/multiDiffEditorInput.js';
+import { NotebookEditorInput } from '../../contrib/notebook/common/notebookEditorInput.js';
+import { TerminalEditorInput } from '../../contrib/terminal/browser/terminalEditorInput.js';
+import { WebviewInput } from '../../contrib/webviewPanel/browser/webviewEditorInput.js';
+import { columnToEditorGroup, EditorGroupColumn, editorGroupToColumn } from '../../services/editor/common/editorGroupColumn.js';
+import { GroupDirection, IEditorGroup, IEditorGroupsService, preferredSideBySideGroupDirection } from '../../services/editor/common/editorGroupsService.js';
+import { IEditorsChangeEvent, IEditorService, SIDE_GROUP } from '../../services/editor/common/editorService.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
 
 interface TabInfo {
 	tab: IEditorTabDto;
@@ -207,11 +207,11 @@ export class MainThreadEditorTabs implements MainThreadEditorTabsShape {
 		if (editor instanceof MultiDiffEditorInput) {
 			const diffEditors: TextDiffInputDto[] = [];
 			for (const resource of (editor?.resources.get() ?? [])) {
-				if (resource.original && resource.modified) {
+				if (resource.originalUri && resource.modifiedUri) {
 					diffEditors.push({
 						kind: TabInputKind.TextDiffInput,
-						original: resource.original,
-						modified: resource.modified
+						original: resource.originalUri,
+						modified: resource.modifiedUri
 					});
 				}
 			}
diff --git a/src/vs/workbench/api/browser/mainThreadEditors.ts b/src/vs/workbench/api/browser/mainThreadEditors.ts
index 84bc6f34f1e..a51ada95deb 100644
--- a/src/vs/workbench/api/browser/mainThreadEditors.ts
+++ b/src/vs/workbench/api/browser/mainThreadEditors.ts
@@ -3,32 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { illegalArgument } from 'vs/base/common/errors';
-import { IDisposable, dispose, DisposableStore } from 'vs/base/common/lifecycle';
-import { equals as objectEquals } from 'vs/base/common/objects';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { IRange } from 'vs/editor/common/core/range';
-import { ISelection } from 'vs/editor/common/core/selection';
-import { IDecorationOptions, IDecorationRenderOptions } from 'vs/editor/common/editorCommon';
-import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { ITextEditorOptions, IResourceEditorInput, EditorActivation, EditorResolution } from 'vs/platform/editor/common/editor';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { MainThreadTextEditor } from 'vs/workbench/api/browser/mainThreadEditor';
-import { ExtHostContext, ExtHostEditorsShape, IApplyEditsOptions, ITextDocumentShowOptions, ITextEditorConfigurationUpdate, ITextEditorPositionData, IUndoStopOptions, MainThreadTextEditorsShape, TextEditorRevealType } from 'vs/workbench/api/common/extHost.protocol';
-import { editorGroupToColumn, columnToEditorGroup, EditorGroupColumn } from 'vs/workbench/services/editor/common/editorGroupColumn';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { IChange } from 'vs/editor/common/diff/legacyLinesDiffComputer';
-import { IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { IEditorControl } from 'vs/workbench/common/editor';
-import { getCodeEditor, ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { DirtyDiffContribution } from 'vs/workbench/contrib/scm/browser/dirtydiffDecorator';
+import { illegalArgument } from '../../../base/common/errors.js';
+import { IDisposable, dispose, DisposableStore } from '../../../base/common/lifecycle.js';
+import { equals as objectEquals } from '../../../base/common/objects.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { ICodeEditorService } from '../../../editor/browser/services/codeEditorService.js';
+import { IRange } from '../../../editor/common/core/range.js';
+import { ISelection } from '../../../editor/common/core/selection.js';
+import { IDecorationOptions, IDecorationRenderOptions } from '../../../editor/common/editorCommon.js';
+import { ISingleEditOperation } from '../../../editor/common/core/editOperation.js';
+import { CommandsRegistry } from '../../../platform/commands/common/commands.js';
+import { ITextEditorOptions, IResourceEditorInput, EditorActivation, EditorResolution } from '../../../platform/editor/common/editor.js';
+import { ServicesAccessor } from '../../../platform/instantiation/common/instantiation.js';
+import { MainThreadTextEditor } from './mainThreadEditor.js';
+import { ExtHostContext, ExtHostEditorsShape, IApplyEditsOptions, ITextDocumentShowOptions, ITextEditorConfigurationUpdate, ITextEditorPositionData, IUndoStopOptions, MainThreadTextEditorsShape, TextEditorRevealType } from '../common/extHost.protocol.js';
+import { editorGroupToColumn, columnToEditorGroup, EditorGroupColumn } from '../../services/editor/common/editorGroupColumn.js';
+import { IEditorService } from '../../services/editor/common/editorService.js';
+import { IEditorGroupsService } from '../../services/editor/common/editorGroupsService.js';
+import { IEnvironmentService } from '../../../platform/environment/common/environment.js';
+import { IWorkingCopyService } from '../../services/workingCopy/common/workingCopyService.js';
+import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
+import { IChange } from '../../../editor/common/diff/legacyLinesDiffComputer.js';
+import { IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { IEditorControl } from '../../common/editor.js';
+import { getCodeEditor, ICodeEditor } from '../../../editor/browser/editorBrowser.js';
+import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
+import { DirtyDiffContribution } from '../../contrib/scm/browser/dirtydiffDecorator.js';
 
 export interface IMainThreadEditorLocator {
 	getEditor(id: string): MainThreadTextEditor | undefined;
diff --git a/src/vs/workbench/api/browser/mainThreadEmbeddings.ts b/src/vs/workbench/api/browser/mainThreadEmbeddings.ts
index 776c471e15f..de8c19a2226 100644
--- a/src/vs/workbench/api/browser/mainThreadEmbeddings.ts
+++ b/src/vs/workbench/api/browser/mainThreadEmbeddings.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { DisposableMap, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ExtHostContext, ExtHostEmbeddingsShape, MainContext, MainThreadEmbeddingsShape } from 'vs/workbench/api/common/extHost.protocol';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { DisposableMap, DisposableStore, IDisposable } from '../../../base/common/lifecycle.js';
+import { InstantiationType, registerSingleton } from '../../../platform/instantiation/common/extensions.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { ExtHostContext, ExtHostEmbeddingsShape, MainContext, MainThreadEmbeddingsShape } from '../common/extHost.protocol.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
 
 
 interface IEmbeddingsProvider {
diff --git a/src/vs/workbench/api/browser/mainThreadErrors.ts b/src/vs/workbench/api/browser/mainThreadErrors.ts
index 2d05a6a0e44..becba7680c6 100644
--- a/src/vs/workbench/api/browser/mainThreadErrors.ts
+++ b/src/vs/workbench/api/browser/mainThreadErrors.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SerializedError, onUnexpectedError, ErrorNoTelemetry } from 'vs/base/common/errors';
-import { extHostNamedCustomer } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { MainContext, MainThreadErrorsShape } from 'vs/workbench/api/common/extHost.protocol';
+import { SerializedError, onUnexpectedError, transformErrorFromSerialization } from '../../../base/common/errors.js';
+import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { MainContext, MainThreadErrorsShape } from '../common/extHost.protocol.js';
 
 @extHostNamedCustomer(MainContext.MainThreadErrors)
 export class MainThreadErrors implements MainThreadErrorsShape {
@@ -16,11 +16,7 @@ export class MainThreadErrors implements MainThreadErrorsShape {
 
 	$onUnexpectedError(err: any | SerializedError): void {
 		if (err && err.$isError) {
-			const { name, message, stack } = err;
-			err = err.noTelemetry ? new ErrorNoTelemetry() : new Error();
-			err.message = message;
-			err.name = name;
-			err.stack = stack;
+			err = transformErrorFromSerialization(err);
 		}
 		onUnexpectedError(err);
 	}
diff --git a/src/vs/workbench/api/browser/mainThreadExtensionService.ts b/src/vs/workbench/api/browser/mainThreadExtensionService.ts
index 6732d38f5e6..faf19a0dce2 100644
--- a/src/vs/workbench/api/browser/mainThreadExtensionService.ts
+++ b/src/vs/workbench/api/browser/mainThreadExtensionService.ts
@@ -3,32 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Action } from 'vs/base/common/actions';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { SerializedError } from 'vs/base/common/errors';
-import { FileAccess } from 'vs/base/common/network';
-import Severity from 'vs/base/common/severity';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IRemoteConnectionData, ManagedRemoteConnection, RemoteConnection, RemoteConnectionType, ResolvedAuthority, WebSocketRemoteConnection } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { ExtHostContext, ExtHostExtensionServiceShape, MainContext, MainThreadExtensionServiceShape } from 'vs/workbench/api/common/extHost.protocol';
-import { IExtension, IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { EnablementState, IWorkbenchExtensionEnablementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { ExtensionHostKind } from 'vs/workbench/services/extensions/common/extensionHostKind';
-import { IExtensionDescriptionDelta } from 'vs/workbench/services/extensions/common/extensionHostProtocol';
-import { IExtensionHostProxy, IResolveAuthorityResult } from 'vs/workbench/services/extensions/common/extensionHostProxy';
-import { ActivationKind, ExtensionActivationReason, IExtensionService, IInternalExtensionService, MissingExtensionDependency } from 'vs/workbench/services/extensions/common/extensions';
-import { extHostNamedCustomer, IExtHostContext, IInternalExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { Dto } from 'vs/workbench/services/extensions/common/proxyIdentifier';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { ITimerService } from 'vs/workbench/services/timer/browser/timerService';
+import { Action } from '../../../base/common/actions.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { SerializedError, transformErrorFromSerialization } from '../../../base/common/errors.js';
+import { FileAccess } from '../../../base/common/network.js';
+import Severity from '../../../base/common/severity.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { localize } from '../../../nls.js';
+import { ICommandService } from '../../../platform/commands/common/commands.js';
+import { ILocalExtension } from '../../../platform/extensionManagement/common/extensionManagement.js';
+import { areSameExtensions } from '../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { ExtensionIdentifier, IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { INotificationService } from '../../../platform/notification/common/notification.js';
+import { IRemoteConnectionData, ManagedRemoteConnection, RemoteConnection, RemoteConnectionType, ResolvedAuthority, WebSocketRemoteConnection } from '../../../platform/remote/common/remoteAuthorityResolver.js';
+import { ExtHostContext, ExtHostExtensionServiceShape, MainContext, MainThreadExtensionServiceShape } from '../common/extHost.protocol.js';
+import { IExtension, IExtensionsWorkbenchService } from '../../contrib/extensions/common/extensions.js';
+import { IWorkbenchEnvironmentService } from '../../services/environment/common/environmentService.js';
+import { EnablementState, IWorkbenchExtensionEnablementService } from '../../services/extensionManagement/common/extensionManagement.js';
+import { ExtensionHostKind } from '../../services/extensions/common/extensionHostKind.js';
+import { IExtensionDescriptionDelta } from '../../services/extensions/common/extensionHostProtocol.js';
+import { IExtensionHostProxy, IResolveAuthorityResult } from '../../services/extensions/common/extensionHostProxy.js';
+import { ActivationKind, ExtensionActivationReason, IExtensionService, IInternalExtensionService, MissingExtensionDependency } from '../../services/extensions/common/extensions.js';
+import { extHostNamedCustomer, IExtHostContext, IInternalExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { Dto } from '../../services/extensions/common/proxyIdentifier.js';
+import { IHostService } from '../../services/host/browser/host.js';
+import { ITimerService } from '../../services/timer/browser/timerService.js';
 
 @extHostNamedCustomer(MainContext.MainThreadExtensionService)
 export class MainThreadExtensionService implements MainThreadExtensionServiceShape {
@@ -73,19 +73,13 @@ export class MainThreadExtensionService implements MainThreadExtensionServiceSha
 		this._internalExtensionService._onDidActivateExtension(extensionId, codeLoadingTime, activateCallTime, activateResolvedTime, activationReason);
 	}
 	$onExtensionRuntimeError(extensionId: ExtensionIdentifier, data: SerializedError): void {
-		const error = new Error();
-		error.name = data.name;
-		error.message = data.message;
-		error.stack = data.stack;
+		const error = transformErrorFromSerialization(data);
 		this._internalExtensionService._onExtensionRuntimeError(extensionId, error);
 		console.error(`[${extensionId.value}]${error.message}`);
 		console.error(error.stack);
 	}
 	async $onExtensionActivationError(extensionId: ExtensionIdentifier, data: SerializedError, missingExtensionDependency: MissingExtensionDependency | null): Promise<void> {
-		const error = new Error();
-		error.name = data.name;
-		error.message = data.message;
-		error.stack = data.stack;
+		const error = transformErrorFromSerialization(data);
 
 		this._internalExtensionService._onDidActivateExtensionError(extensionId, error);
 
diff --git a/src/vs/workbench/api/browser/mainThreadFileSystem.ts b/src/vs/workbench/api/browser/mainThreadFileSystem.ts
index e0f9359f0e9..295fb754349 100644
--- a/src/vs/workbench/api/browser/mainThreadFileSystem.ts
+++ b/src/vs/workbench/api/browser/mainThreadFileSystem.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { IDisposable, toDisposable, DisposableStore, DisposableMap } from 'vs/base/common/lifecycle';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { IFileWriteOptions, FileSystemProviderCapabilities, IFileChange, IFileService, IStat, IWatchOptions, FileType, IFileOverwriteOptions, IFileDeleteOptions, IFileOpenOptions, FileOperationError, FileOperationResult, FileSystemProviderErrorCode, IFileSystemProviderWithOpenReadWriteCloseCapability, IFileSystemProviderWithFileReadWriteCapability, IFileSystemProviderWithFileFolderCopyCapability, FilePermission, toFileSystemProviderErrorCode, IFileStatWithPartialMetadata, IFileStat } from 'vs/platform/files/common/files';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { ExtHostContext, ExtHostFileSystemShape, IFileChangeDto, MainContext, MainThreadFileSystemShape } from '../common/extHost.protocol';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { IDisposable, toDisposable, DisposableStore, DisposableMap } from '../../../base/common/lifecycle.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { IFileWriteOptions, FileSystemProviderCapabilities, IFileChange, IFileService, IStat, IWatchOptions, FileType, IFileOverwriteOptions, IFileDeleteOptions, IFileOpenOptions, FileOperationError, FileOperationResult, FileSystemProviderErrorCode, IFileSystemProviderWithOpenReadWriteCloseCapability, IFileSystemProviderWithFileReadWriteCapability, IFileSystemProviderWithFileFolderCopyCapability, FilePermission, toFileSystemProviderErrorCode, IFileStatWithPartialMetadata, IFileStat } from '../../../platform/files/common/files.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { ExtHostContext, ExtHostFileSystemShape, IFileChangeDto, MainContext, MainThreadFileSystemShape } from '../common/extHost.protocol.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { IMarkdownString } from '../../../base/common/htmlContent.js';
 
 @extHostNamedCustomer(MainContext.MainThreadFileSystem)
 export class MainThreadFileSystem implements MainThreadFileSystemShape {
diff --git a/src/vs/workbench/api/browser/mainThreadFileSystemEventService.ts b/src/vs/workbench/api/browser/mainThreadFileSystemEventService.ts
index 22976049d5a..572acf83917 100644
--- a/src/vs/workbench/api/browser/mainThreadFileSystemEventService.ts
+++ b/src/vs/workbench/api/browser/mainThreadFileSystemEventService.ts
@@ -3,31 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DisposableMap, DisposableStore } from 'vs/base/common/lifecycle';
-import { FileOperation, IFileService, IFilesConfiguration, IWatchOptions } from 'vs/platform/files/common/files';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { ExtHostContext, ExtHostFileSystemEventServiceShape, MainContext, MainThreadFileSystemEventServiceShape } from '../common/extHost.protocol';
-import { localize } from 'vs/nls';
-import { IWorkingCopyFileOperationParticipant, IWorkingCopyFileService, SourceTargetPair, IFileOperationUndoRedoInfo } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
-import { IBulkEditService } from 'vs/editor/browser/services/bulkEditService';
-import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
-import { raceCancellation } from 'vs/base/common/async';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import Severity from 'vs/base/common/severity';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { reviveWorkspaceEditDto } from 'vs/workbench/api/browser/mainThreadBulkEdits';
-import { GLOBSTAR } from 'vs/base/common/glob';
-import { rtrim } from 'vs/base/common/strings';
-import { UriComponents, URI } from 'vs/base/common/uri';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { normalizeWatcherPattern } from 'vs/platform/files/common/watcher';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { DisposableMap, DisposableStore } from '../../../base/common/lifecycle.js';
+import { FileOperation, IFileService, IWatchOptions } from '../../../platform/files/common/files.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { ExtHostContext, ExtHostFileSystemEventServiceShape, MainContext, MainThreadFileSystemEventServiceShape } from '../common/extHost.protocol.js';
+import { localize } from '../../../nls.js';
+import { IWorkingCopyFileOperationParticipant, IWorkingCopyFileService, SourceTargetPair, IFileOperationUndoRedoInfo } from '../../services/workingCopy/common/workingCopyFileService.js';
+import { IBulkEditService } from '../../../editor/browser/services/bulkEditService.js';
+import { IProgressService, ProgressLocation } from '../../../platform/progress/common/progress.js';
+import { raceCancellation } from '../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../base/common/cancellation.js';
+import { IDialogService } from '../../../platform/dialogs/common/dialogs.js';
+import Severity from '../../../base/common/severity.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../platform/storage/common/storage.js';
+import { Action2, registerAction2 } from '../../../platform/actions/common/actions.js';
+import { ServicesAccessor } from '../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { IEnvironmentService } from '../../../platform/environment/common/environment.js';
+import { IUriIdentityService } from '../../../platform/uriIdentity/common/uriIdentity.js';
+import { reviveWorkspaceEditDto } from './mainThreadBulkEdits.js';
+import { UriComponents, URI } from '../../../base/common/uri.js';
 
 @extHostNamedCustomer(MainContext.MainThreadFileSystemEventService)
 export class MainThreadFileSystemEventService implements MainThreadFileSystemEventServiceShape {
@@ -50,9 +45,7 @@ export class MainThreadFileSystemEventService implements MainThreadFileSystemEve
 		@ILogService logService: ILogService,
 		@IEnvironmentService envService: IEnvironmentService,
 		@IUriIdentityService uriIdentService: IUriIdentityService,
-		@IWorkspaceContextService private readonly _contextService: IWorkspaceContextService,
 		@ILogService private readonly _logService: ILogService,
-		@IConfigurationService private readonly _configurationService: IConfigurationService
 	) {
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostFileSystemEventService);
 
@@ -234,9 +227,9 @@ export class MainThreadFileSystemEventService implements MainThreadFileSystemEve
 			}
 		}
 
-		// Correlated file watching is taken as is
+		// Correlated file watching: use an exclusive `createWatcher()`
 		if (correlate) {
-			this._logService.trace(`MainThreadFileSystemEventService#$watch(): request to start watching correlated (extension: ${extensionId}, path: ${uri.toString(true)}, recursive: ${opts.recursive}, session: ${session})`);
+			this._logService.trace(`MainThreadFileSystemEventService#$watch(): request to start watching correlated (extension: ${extensionId}, path: ${uri.toString(true)}, recursive: ${opts.recursive}, session: ${session}, excludes: ${JSON.stringify(opts.excludes)}, includes: ${JSON.stringify(opts.includes)})`);
 
 			const watcherDisposables = new DisposableStore();
 			const subscription = watcherDisposables.add(this._fileService.createWatcher(uri, opts));
@@ -252,60 +245,9 @@ export class MainThreadFileSystemEventService implements MainThreadFileSystemEve
 			this._watches.set(session, watcherDisposables);
 		}
 
-		// Uncorrelated file watching gets special treatment
+		// Uncorrelated file watching: via shared `watch()`
 		else {
-			this._logService.trace(`MainThreadFileSystemEventService#$watch(): request to start watching uncorrelated (extension: ${extensionId}, path: ${uri.toString(true)}, recursive: ${opts.recursive}, session: ${session})`);
-
-			const workspaceFolder = this._contextService.getWorkspaceFolder(uri);
-
-			// Automatically add `files.watcherExclude` patterns when watching
-			// recursively to give users a chance to configure exclude rules
-			// for reducing the overhead of watching recursively
-			if (opts.recursive && opts.excludes.length === 0) {
-				const config = this._configurationService.getValue<IFilesConfiguration>();
-				if (config.files?.watcherExclude) {
-					for (const key in config.files.watcherExclude) {
-						if (key && config.files.watcherExclude[key] === true) {
-							opts.excludes.push(key);
-						}
-					}
-				}
-			}
-
-			// Non-recursive watching inside the workspace will overlap with
-			// our standard workspace watchers. To prevent duplicate events,
-			// we only want to include events for files that are otherwise
-			// excluded via `files.watcherExclude`. As such, we configure
-			// to include each configured exclude pattern so that only those
-			// events are reported that are otherwise excluded.
-			// However, we cannot just use the pattern as is, because a pattern
-			// such as `bar` for a exclude, will work to exclude any of
-			// `<workspace path>/bar` but will not work as include for files within
-			// `bar` unless a suffix of `/**` if added.
-			// (https://github.com/microsoft/vscode/issues/148245)
-			else if (!opts.recursive && workspaceFolder) {
-				const config = this._configurationService.getValue<IFilesConfiguration>();
-				if (config.files?.watcherExclude) {
-					for (const key in config.files.watcherExclude) {
-						if (key && config.files.watcherExclude[key] === true) {
-							if (!opts.includes) {
-								opts.includes = [];
-							}
-
-							const includePattern = `${rtrim(key, '/')}/${GLOBSTAR}`;
-							opts.includes.push(normalizeWatcherPattern(workspaceFolder.uri.fsPath, includePattern));
-						}
-					}
-				}
-
-				// Still ignore watch request if there are actually no configured
-				// exclude rules, because in that case our default recursive watcher
-				// should be able to take care of all events.
-				if (!opts.includes || opts.includes.length === 0) {
-					this._logService.trace(`MainThreadFileSystemEventService#$watch(): ignoring request to start watching because path is inside workspace and no excludes are configured (extension: ${extensionId}, path: ${uri.toString(true)}, recursive: ${opts.recursive}, session: ${session})`);
-					return;
-				}
-			}
+			this._logService.trace(`MainThreadFileSystemEventService#$watch(): request to start watching uncorrelated (extension: ${extensionId}, path: ${uri.toString(true)}, recursive: ${opts.recursive}, session: ${session}, excludes: ${JSON.stringify(opts.excludes)}, includes: ${JSON.stringify(opts.includes)})`);
 
 			const subscription = this._fileService.watch(uri, opts);
 			this._watches.set(session, subscription);
diff --git a/src/vs/workbench/api/browser/mainThreadInteractive.ts b/src/vs/workbench/api/browser/mainThreadInteractive.ts
index 36b227a69de..abcc61ff9c2 100644
--- a/src/vs/workbench/api/browser/mainThreadInteractive.ts
+++ b/src/vs/workbench/api/browser/mainThreadInteractive.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { ExtHostContext, ExtHostInteractiveShape, MainContext, MainThreadInteractiveShape } from 'vs/workbench/api/common/extHost.protocol';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { IInteractiveDocumentService } from 'vs/workbench/contrib/interactive/browser/interactiveDocumentService';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../../../editor/common/languages/modesRegistry.js';
+import { ExtHostContext, ExtHostInteractiveShape, MainContext, MainThreadInteractiveShape } from '../common/extHost.protocol.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { IInteractiveDocumentService } from '../../contrib/interactive/browser/interactiveDocumentService.js';
 
 @extHostNamedCustomer(MainContext.MainThreadInteractive)
 export class MainThreadInteractive implements MainThreadInteractiveShape {
diff --git a/src/vs/workbench/api/browser/mainThreadLabelService.ts b/src/vs/workbench/api/browser/mainThreadLabelService.ts
index 8ade55d44e5..4b3db1a430b 100644
--- a/src/vs/workbench/api/browser/mainThreadLabelService.ts
+++ b/src/vs/workbench/api/browser/mainThreadLabelService.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, DisposableMap } from 'vs/base/common/lifecycle';
-import { ILabelService, ResourceLabelFormatter } from 'vs/platform/label/common/label';
-import { MainContext, MainThreadLabelServiceShape } from 'vs/workbench/api/common/extHost.protocol';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
+import { Disposable, DisposableMap } from '../../../base/common/lifecycle.js';
+import { ILabelService, ResourceLabelFormatter } from '../../../platform/label/common/label.js';
+import { MainContext, MainThreadLabelServiceShape } from '../common/extHost.protocol.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
 
 @extHostNamedCustomer(MainContext.MainThreadLabelService)
 export class MainThreadLabelService extends Disposable implements MainThreadLabelServiceShape {
diff --git a/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts b/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts
index 1781e73af7a..c591ed677f1 100644
--- a/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts
+++ b/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts
@@ -3,39 +3,38 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isFalsyOrEmpty } from 'vs/base/common/arrays';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { createStringDataTransferItem, IReadonlyVSDataTransfer, VSDataTransfer } from 'vs/base/common/dataTransfer';
-import { CancellationError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { HierarchicalKind } from 'vs/base/common/hierarchicalKind';
-import { combinedDisposable, Disposable, DisposableMap, toDisposable } from 'vs/base/common/lifecycle';
-import { ResourceMap } from 'vs/base/common/map';
-import { revive } from 'vs/base/common/marshalling';
-import { mixin } from 'vs/base/common/objects';
-import { URI } from 'vs/base/common/uri';
-import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { Position as EditorPosition, IPosition } from 'vs/editor/common/core/position';
-import { Range as EditorRange, IRange } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import * as languages from 'vs/editor/common/languages';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IndentationRule, LanguageConfiguration, OnEnterRule } from 'vs/editor/common/languages/languageConfiguration';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { ITextModel } from 'vs/editor/common/model';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { decodeSemanticTokensDto } from 'vs/editor/common/services/semanticTokensDto';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { reviveWorkspaceEditDto } from 'vs/workbench/api/browser/mainThreadBulkEdits';
-import * as typeConvert from 'vs/workbench/api/common/extHostTypeConverters';
-import { DataTransferFileCache } from 'vs/workbench/api/common/shared/dataTransferCache';
-import * as callh from 'vs/workbench/contrib/callHierarchy/common/callHierarchy';
-import * as search from 'vs/workbench/contrib/search/common/search';
-import * as typeh from 'vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { ExtHostContext, ExtHostLanguageFeaturesShape, HoverWithId, ICallHierarchyItemDto, ICodeActionDto, ICodeActionProviderMetadataDto, IdentifiableInlineCompletion, IdentifiableInlineCompletions, IdentifiableInlineEdit, IDocumentDropEditDto, IDocumentDropEditProviderMetadata, IDocumentFilterDto, IIndentationRuleDto, IInlayHintDto, ILanguageConfigurationDto, ILanguageWordDefinitionDto, ILinkDto, ILocationDto, ILocationLinkDto, IOnEnterRuleDto, IPasteEditDto, IPasteEditProviderMetadataDto, IRegExpDto, ISignatureHelpProviderMetadataDto, ISuggestDataDto, ISuggestDataDtoField, ISuggestResultDtoField, ITypeHierarchyItemDto, IWorkspaceSymbolDto, MainContext, MainThreadLanguageFeaturesShape } from '../common/extHost.protocol';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { createStringDataTransferItem, IReadonlyVSDataTransfer, VSDataTransfer } from '../../../base/common/dataTransfer.js';
+import { CancellationError } from '../../../base/common/errors.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { HierarchicalKind } from '../../../base/common/hierarchicalKind.js';
+import { combinedDisposable, Disposable, DisposableMap, toDisposable } from '../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../base/common/map.js';
+import { revive } from '../../../base/common/marshalling.js';
+import { mixin } from '../../../base/common/objects.js';
+import { URI } from '../../../base/common/uri.js';
+import { ISingleEditOperation } from '../../../editor/common/core/editOperation.js';
+import { Position as EditorPosition, IPosition } from '../../../editor/common/core/position.js';
+import { Range as EditorRange, IRange } from '../../../editor/common/core/range.js';
+import { Selection } from '../../../editor/common/core/selection.js';
+import * as languages from '../../../editor/common/languages.js';
+import { ILanguageService } from '../../../editor/common/languages/language.js';
+import { IndentationRule, LanguageConfiguration, OnEnterRule } from '../../../editor/common/languages/languageConfiguration.js';
+import { ILanguageConfigurationService } from '../../../editor/common/languages/languageConfigurationRegistry.js';
+import { ITextModel } from '../../../editor/common/model.js';
+import { ILanguageFeaturesService } from '../../../editor/common/services/languageFeatures.js';
+import { decodeSemanticTokensDto } from '../../../editor/common/services/semanticTokensDto.js';
+import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
+import { IUriIdentityService } from '../../../platform/uriIdentity/common/uriIdentity.js';
+import { reviveWorkspaceEditDto } from './mainThreadBulkEdits.js';
+import * as typeConvert from '../common/extHostTypeConverters.js';
+import { DataTransferFileCache } from '../common/shared/dataTransferCache.js';
+import * as callh from '../../contrib/callHierarchy/common/callHierarchy.js';
+import * as search from '../../contrib/search/common/search.js';
+import * as typeh from '../../contrib/typeHierarchy/common/typeHierarchy.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { ExtHostContext, ExtHostLanguageFeaturesShape, HoverWithId, ICallHierarchyItemDto, ICodeActionDto, ICodeActionProviderMetadataDto, IdentifiableInlineCompletion, IdentifiableInlineCompletions, IdentifiableInlineEdit, IDocumentDropEditDto, IDocumentDropEditProviderMetadata, IDocumentFilterDto, IIndentationRuleDto, IInlayHintDto, ILanguageConfigurationDto, ILanguageWordDefinitionDto, ILinkDto, ILocationDto, ILocationLinkDto, IOnEnterRuleDto, IPasteEditDto, IPasteEditProviderMetadataDto, IRegExpDto, ISignatureHelpProviderMetadataDto, ISuggestDataDto, ISuggestDataDtoField, ISuggestResultDtoField, ITypeHierarchyItemDto, IWorkspaceSymbolDto, MainContext, MainThreadLanguageFeaturesShape } from '../common/extHost.protocol.js';
 
 @extHostNamedCustomer(MainContext.MainThreadLanguageFeatures)
 export class MainThreadLanguageFeatures extends Disposable implements MainThreadLanguageFeaturesShape {
@@ -321,7 +320,9 @@ export class MainThreadLanguageFeatures extends Disposable implements MainThread
 			selector: selector,
 			provideMultiDocumentHighlights: (model: ITextModel, position: EditorPosition, otherModels: ITextModel[], token: CancellationToken): Promise<Map<URI, languages.DocumentHighlight[]> | undefined> => {
 				return this._proxy.$provideMultiDocumentHighlights(handle, model.uri, position, otherModels.map(model => model.uri), token).then(dto => {
-					if (isFalsyOrEmpty(dto)) {
+					// dto should be non-null + non-undefined
+					// dto length of 0 is valid, just no highlights, pass this through.
+					if (dto === undefined || dto === null) {
 						return undefined;
 					}
 					const result = new ResourceMap<languages.DocumentHighlight[]>();
@@ -612,6 +613,9 @@ export class MainThreadLanguageFeatures extends Disposable implements MainThread
 			provideInlineCompletions: async (model: ITextModel, position: EditorPosition, context: languages.InlineCompletionContext, token: CancellationToken): Promise<IdentifiableInlineCompletions | undefined> => {
 				return this._proxy.$provideInlineCompletions(handle, model.uri, position, context, token);
 			},
+			provideInlineEditsForRange: async (model: ITextModel, range: EditorRange, context: languages.InlineCompletionContext, token: CancellationToken): Promise<IdentifiableInlineCompletions | undefined> => {
+				return this._proxy.$provideInlineEditsForRange(handle, model.uri, range, context, token);
+			},
 			handleItemDidShow: async (completions: IdentifiableInlineCompletions, item: IdentifiableInlineCompletion, updatedInsertText: string): Promise<void> => {
 				if (supportsHandleEvents) {
 					await this._proxy.$handleInlineCompletionDidShow(handle, completions.pid, item.idx, updatedInsertText);
@@ -998,8 +1002,8 @@ export class MainThreadLanguageFeatures extends Disposable implements MainThread
 
 	// --- mapped edits
 
-	$registerMappedEditsProvider(handle: number, selector: IDocumentFilterDto[]): void {
-		const provider = new MainThreadMappedEditsProvider(handle, this._proxy, this._uriIdentService);
+	$registerMappedEditsProvider(handle: number, selector: IDocumentFilterDto[], displayName: string): void {
+		const provider = new MainThreadMappedEditsProvider(displayName, handle, this._proxy, this._uriIdentService);
 		this._registrations.set(handle, this._languageFeaturesService.mappedEditsProvider.register(selector, provider));
 	}
 }
@@ -1124,7 +1128,7 @@ class MainThreadDocumentOnDropEditProvider implements languages.DocumentDropEdit
 		}
 	}
 
-	async provideDocumentDropEdits(model: ITextModel, position: IPosition, dataTransfer: IReadonlyVSDataTransfer, token: CancellationToken): Promise<languages.DocumentDropEdit[] | undefined> {
+	async provideDocumentDropEdits(model: ITextModel, position: IPosition, dataTransfer: IReadonlyVSDataTransfer, token: CancellationToken): Promise<languages.DocumentDropEditsSession | undefined> {
 		const request = this.dataTransfers.add(dataTransfer);
 		try {
 			const dataTransferDto = await typeConvert.DataTransfer.from(dataTransfer);
@@ -1137,14 +1141,19 @@ class MainThreadDocumentOnDropEditProvider implements languages.DocumentDropEdit
 				return;
 			}
 
-			return edits.map(edit => {
-				return {
-					...edit,
-					yieldTo: edit.yieldTo?.map(x => ({ kind: new HierarchicalKind(x) })),
-					kind: edit.kind ? new HierarchicalKind(edit.kind) : undefined,
-					additionalEdit: reviveWorkspaceEditDto(edit.additionalEdit, this._uriIdentService, dataId => this.resolveDocumentOnDropFileData(request.id, dataId)),
-				};
-			});
+			return {
+				edits: edits.map(edit => {
+					return {
+						...edit,
+						yieldTo: edit.yieldTo?.map(x => ({ kind: new HierarchicalKind(x) })),
+						kind: edit.kind ? new HierarchicalKind(edit.kind) : undefined,
+						additionalEdit: reviveWorkspaceEditDto(edit.additionalEdit, this._uriIdentService, dataId => this.resolveDocumentOnDropFileData(request.id, dataId)),
+					};
+				}),
+				dispose: () => {
+					this._proxy.$releaseDocumentOnDropEdits(this._handle, request.id);
+				},
+			};
 		} finally {
 			request.dispose();
 		}
@@ -1233,6 +1242,7 @@ export class MainThreadDocumentRangeSemanticTokensProvider implements languages.
 export class MainThreadMappedEditsProvider implements languages.MappedEditsProvider {
 
 	constructor(
+		public readonly displayName: string,
 		private readonly _handle: number,
 		private readonly _proxy: ExtHostLanguageFeaturesShape,
 		private readonly _uriService: IUriIdentityService,
diff --git a/src/vs/workbench/api/browser/mainThreadLanguageModelTools.ts b/src/vs/workbench/api/browser/mainThreadLanguageModelTools.ts
new file mode 100644
index 00000000000..de592ed2c5a
--- /dev/null
+++ b/src/vs/workbench/api/browser/mainThreadLanguageModelTools.ts
@@ -0,0 +1,71 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Disposable, DisposableMap } from '../../../base/common/lifecycle.js';
+import { CountTokensCallback, ILanguageModelToolsService, IToolData, IToolInvocation, IToolResult } from '../../contrib/chat/common/languageModelToolsService.js';
+import { IExtHostContext, extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { ExtHostContext, ExtHostLanguageModelToolsShape, MainContext, MainThreadLanguageModelToolsShape } from '../common/extHost.protocol.js';
+
+@extHostNamedCustomer(MainContext.MainThreadLanguageModelTools)
+export class MainThreadLanguageModelTools extends Disposable implements MainThreadLanguageModelToolsShape {
+
+	private readonly _proxy: ExtHostLanguageModelToolsShape;
+	private readonly _tools = this._register(new DisposableMap<string>());
+	private readonly _countTokenCallbacks = new Map</* call ID */string, CountTokensCallback>();
+
+	constructor(
+		extHostContext: IExtHostContext,
+		@ILanguageModelToolsService private readonly _languageModelToolsService: ILanguageModelToolsService,
+	) {
+		super();
+		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostLanguageModelTools);
+
+		this._register(this._languageModelToolsService.onDidChangeTools(e => this._proxy.$onDidChangeTools([...this._languageModelToolsService.getTools()])));
+	}
+
+	async $getTools(): Promise<IToolData[]> {
+		return Array.from(this._languageModelToolsService.getTools());
+	}
+
+	async $invokeTool(dto: IToolInvocation, token: CancellationToken): Promise<IToolResult> {
+		return await this._languageModelToolsService.invokeTool(
+			dto,
+			(input, token) => this._proxy.$countTokensForInvocation(dto.callId, input, token),
+			token,
+		);
+	}
+
+	$countTokensForInvocation(callId: string, input: string, token: CancellationToken): Promise<number> {
+		const fn = this._countTokenCallbacks.get(callId);
+		if (!fn) {
+			throw new Error(`Tool invocation call ${callId} not found`);
+		}
+
+		return fn(input, token);
+	}
+
+	$registerTool(id: string): void {
+		const disposable = this._languageModelToolsService.registerToolImplementation(
+			id,
+			{
+				invoke: async (dto, countTokens, token) => {
+					try {
+						this._countTokenCallbacks.set(dto.callId, countTokens);
+						return await this._proxy.$invokeTool(dto, token);
+					} finally {
+						this._countTokenCallbacks.delete(dto.callId);
+					}
+				},
+				provideToolConfirmationMessages: (participantName, parameters, token) => this._proxy.$provideToolConfirmationMessages(id, participantName, parameters, token),
+				provideToolInvocationMessage: (parameters, token) => this._proxy.$provideToolInvocationMessage(id, parameters, token),
+			});
+		this._tools.set(id, disposable);
+	}
+
+	$unregisterTool(name: string): void {
+		this._tools.deleteAndDispose(name);
+	}
+}
diff --git a/src/vs/workbench/api/browser/mainThreadLanguageModels.ts b/src/vs/workbench/api/browser/mainThreadLanguageModels.ts
index 9b14928a514..6e1ee3afee7 100644
--- a/src/vs/workbench/api/browser/mainThreadLanguageModels.ts
+++ b/src/vs/workbench/api/browser/mainThreadLanguageModels.ts
@@ -3,20 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableMap, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { localize } from 'vs/nls';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProgress, Progress } from 'vs/platform/progress/common/progress';
-import { ExtHostLanguageModelsShape, ExtHostContext, MainContext, MainThreadLanguageModelsShape } from 'vs/workbench/api/common/extHost.protocol';
-import { ILanguageModelStatsService } from 'vs/workbench/contrib/chat/common/languageModelStats';
-import { ILanguageModelChatMetadata, IChatResponseFragment, ILanguageModelsService, IChatMessage, ILanguageModelChatSelector } from 'vs/workbench/contrib/chat/common/languageModels';
-import { IAuthenticationAccessService } from 'vs/workbench/services/authentication/browser/authenticationAccessService';
-import { AuthenticationSession, AuthenticationSessionsChangeEvent, IAuthenticationProvider, IAuthenticationProviderCreateSessionOptions, IAuthenticationService, INTERNAL_AUTH_PROVIDER_PREFIX } from 'vs/workbench/services/authentication/common/authentication';
-import { IExtHostContext, extHostNamedCustomer } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { AsyncIterableSource, DeferredPromise } from '../../../base/common/async.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { SerializedError, transformErrorForSerialization, transformErrorFromSerialization } from '../../../base/common/errors.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable, DisposableMap, DisposableStore, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { localize } from '../../../nls.js';
+import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { ExtHostLanguageModelsShape, ExtHostContext, MainContext, MainThreadLanguageModelsShape } from '../common/extHost.protocol.js';
+import { ILanguageModelStatsService } from '../../contrib/chat/common/languageModelStats.js';
+import { ILanguageModelChatMetadata, IChatResponseFragment, ILanguageModelsService, IChatMessage, ILanguageModelChatSelector, ILanguageModelChatResponse } from '../../contrib/chat/common/languageModels.js';
+import { IAuthenticationAccessService } from '../../services/authentication/browser/authenticationAccessService.js';
+import { AuthenticationSession, AuthenticationSessionsChangeEvent, IAuthenticationProvider, IAuthenticationService, INTERNAL_AUTH_PROVIDER_PREFIX } from '../../services/authentication/common/authentication.js';
+import { IExtHostContext, extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { IExtensionService } from '../../services/extensions/common/extensions.js';
 
 @extHostNamedCustomer(MainContext.MainThreadLanguageModels)
 export class MainThreadLanguageModels implements MainThreadLanguageModelsShape {
@@ -24,7 +25,7 @@ export class MainThreadLanguageModels implements MainThreadLanguageModelsShape {
 	private readonly _proxy: ExtHostLanguageModelsShape;
 	private readonly _store = new DisposableStore();
 	private readonly _providerRegistrations = new DisposableMap<number>();
-	private readonly _pendingProgress = new Map<number, IProgress<IChatResponseFragment>>();
+	private readonly _pendingProgress = new Map<number, { defer: DeferredPromise<any>; stream: AsyncIterableSource<IChatResponseFragment> }>();
 
 	constructor(
 		extHostContext: IExtHostContext,
@@ -49,14 +50,23 @@ export class MainThreadLanguageModels implements MainThreadLanguageModelsShape {
 		const dipsosables = new DisposableStore();
 		dipsosables.add(this._chatProviderService.registerLanguageModelChat(identifier, {
 			metadata,
-			provideChatResponse: async (messages, from, options, progress, token) => {
+			sendChatRequest: async (messages, from, options, token) => {
 				const requestId = (Math.random() * 1e6) | 0;
-				this._pendingProgress.set(requestId, progress);
+				const defer = new DeferredPromise<any>();
+				const stream = new AsyncIterableSource<IChatResponseFragment>();
+
 				try {
-					await this._proxy.$provideLanguageModelResponse(handle, requestId, from, messages, options, token);
-				} finally {
+					this._pendingProgress.set(requestId, { defer, stream });
+					await this._proxy.$startChatRequest(handle, requestId, from, messages, options, token);
+				} catch (err) {
 					this._pendingProgress.delete(requestId);
+					throw err;
 				}
+
+				return {
+					result: defer.p,
+					stream: stream.asyncIterable
+				} satisfies ILanguageModelChatResponse;
 			},
 			provideTokenCount: (str, token) => {
 				return this._proxy.$provideTokenLength(handle, str, token);
@@ -68,8 +78,28 @@ export class MainThreadLanguageModels implements MainThreadLanguageModelsShape {
 		this._providerRegistrations.set(handle, dipsosables);
 	}
 
-	async $handleProgressChunk(requestId: number, chunk: IChatResponseFragment): Promise<void> {
-		this._pendingProgress.get(requestId)?.report(chunk);
+	async $reportResponsePart(requestId: number, chunk: IChatResponseFragment): Promise<void> {
+		const data = this._pendingProgress.get(requestId);
+		this._logService.trace('[LM] report response PART', Boolean(data), requestId, chunk);
+		if (data) {
+			data.stream.emitOne(chunk);
+		}
+	}
+
+	async $reportResponseDone(requestId: number, err: SerializedError | undefined): Promise<void> {
+		const data = this._pendingProgress.get(requestId);
+		this._logService.trace('[LM] report response DONE', Boolean(data), requestId, err);
+		if (data) {
+			this._pendingProgress.delete(requestId);
+			if (err) {
+				const error = transformErrorFromSerialization(err);
+				data.stream.reject(error);
+				data.defer.error(error);
+			} else {
+				data.stream.resolve();
+				data.defer.complete(undefined);
+			}
+		}
 	}
 
 	$unregisterProvider(handle: number): void {
@@ -84,21 +114,36 @@ export class MainThreadLanguageModels implements MainThreadLanguageModelsShape {
 		this._languageModelStatsService.update(identifier, extensionId, participant, tokenCount);
 	}
 
-	async $fetchResponse(extension: ExtensionIdentifier, providerId: string, requestId: number, messages: IChatMessage[], options: {}, token: CancellationToken): Promise<any> {
-		this._logService.debug('[CHAT] extension request STARTED', extension.value, requestId);
+	async $tryStartChatRequest(extension: ExtensionIdentifier, providerId: string, requestId: number, messages: IChatMessage[], options: {}, token: CancellationToken): Promise<any> {
+		this._logService.trace('[CHAT] request STARTED', extension.value, requestId);
 
-		const task = this._chatProviderService.makeLanguageModelChatRequest(providerId, extension, messages, options, new Progress(value => {
-			this._proxy.$handleResponseFragment(requestId, value);
-		}), token);
+		const response = await this._chatProviderService.sendChatRequest(providerId, extension, messages, options, token);
 
-		task.catch(err => {
-			this._logService.error('[CHAT] extension request ERRORED', err, extension.value, requestId);
-			throw err;
-		}).finally(() => {
+		// !!! IMPORTANT !!!
+		// This method must return before the response is done (has streamed all parts)
+		// and because of that we consume the stream without awaiting
+		// !!! IMPORTANT !!!
+		const streaming = (async () => {
+			try {
+				for await (const part of response.stream) {
+					this._logService.trace('[CHAT] request PART', extension.value, requestId, part);
+					await this._proxy.$acceptResponsePart(requestId, part);
+				}
+				this._logService.trace('[CHAT] request DONE', extension.value, requestId);
+			} catch (err) {
+				this._logService.error('[CHAT] extension request ERRORED in STREAM', err, extension.value, requestId);
+				this._proxy.$acceptResponseDone(requestId, transformErrorForSerialization(err));
+			}
+		})();
+
+		// When the response is done (signaled via its result) we tell the EH
+		Promise.allSettled([response.result, streaming]).then(() => {
 			this._logService.debug('[CHAT] extension request DONE', extension.value, requestId);
+			this._proxy.$acceptResponseDone(requestId, undefined);
+		}, err => {
+			this._logService.error('[CHAT] extension request ERRORED', err, extension.value, requestId);
+			this._proxy.$acceptResponseDone(requestId, transformErrorForSerialization(err));
 		});
-
-		return task;
 	}
 
 
@@ -161,9 +206,9 @@ class LanguageModelAccessAuthProvider implements IAuthenticationProvider {
 		if (this._session) {
 			return [this._session];
 		}
-		return [await this.createSession(scopes || [], {})];
+		return [await this.createSession(scopes || [])];
 	}
-	async createSession(scopes: string[], options: IAuthenticationProviderCreateSessionOptions): Promise<AuthenticationSession> {
+	async createSession(scopes: string[]): Promise<AuthenticationSession> {
 		this._session = this._createFakeSession(scopes);
 		this._onDidChangeSessions.fire({ added: [this._session], changed: [], removed: [] });
 		return this._session;
diff --git a/src/vs/workbench/api/browser/mainThreadLanguages.ts b/src/vs/workbench/api/browser/mainThreadLanguages.ts
index 7ec1932f4b0..05e8176ed1f 100644
--- a/src/vs/workbench/api/browser/mainThreadLanguages.ts
+++ b/src/vs/workbench/api/browser/mainThreadLanguages.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IModelService } from 'vs/editor/common/services/model';
-import { MainThreadLanguagesShape, MainContext, ExtHostContext, ExtHostLanguagesShape } from '../common/extHost.protocol';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { IPosition } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { StandardTokenType } from 'vs/editor/common/encodedTokenAttributes';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { ILanguageStatus, ILanguageStatusService } from 'vs/workbench/services/languageStatus/common/languageStatusService';
-import { DisposableMap, DisposableStore } from 'vs/base/common/lifecycle';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { ILanguageService } from '../../../editor/common/languages/language.js';
+import { IModelService } from '../../../editor/common/services/model.js';
+import { MainThreadLanguagesShape, MainContext, ExtHostContext, ExtHostLanguagesShape } from '../common/extHost.protocol.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { IPosition } from '../../../editor/common/core/position.js';
+import { IRange, Range } from '../../../editor/common/core/range.js';
+import { StandardTokenType } from '../../../editor/common/encodedTokenAttributes.js';
+import { ITextModelService } from '../../../editor/common/services/resolverService.js';
+import { ILanguageStatus, ILanguageStatusService } from '../../services/languageStatus/common/languageStatusService.js';
+import { DisposableMap, DisposableStore } from '../../../base/common/lifecycle.js';
 
 @extHostNamedCustomer(MainContext.MainThreadLanguages)
 export class MainThreadLanguages implements MainThreadLanguagesShape {
diff --git a/src/vs/workbench/api/browser/mainThreadLocalization.ts b/src/vs/workbench/api/browser/mainThreadLocalization.ts
index af85618a64c..43b5887430e 100644
--- a/src/vs/workbench/api/browser/mainThreadLocalization.ts
+++ b/src/vs/workbench/api/browser/mainThreadLocalization.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { MainContext, MainThreadLocalizationShape } from 'vs/workbench/api/common/extHost.protocol';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { IFileService } from 'vs/platform/files/common/files';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ILanguagePackService } from 'vs/platform/languagePacks/common/languagePacks';
+import { MainContext, MainThreadLocalizationShape } from '../common/extHost.protocol.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { IFileService } from '../../../platform/files/common/files.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { ILanguagePackService } from '../../../platform/languagePacks/common/languagePacks.js';
 
 @extHostNamedCustomer(MainContext.MainThreadLocalization)
 export class MainThreadLocalization extends Disposable implements MainThreadLocalizationShape {
diff --git a/src/vs/workbench/api/browser/mainThreadLogService.ts b/src/vs/workbench/api/browser/mainThreadLogService.ts
index da8ac21f4fb..5e1271bc19a 100644
--- a/src/vs/workbench/api/browser/mainThreadLogService.ts
+++ b/src/vs/workbench/api/browser/mainThreadLogService.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { ILoggerOptions, ILoggerResource, ILoggerService, ILogService, isLogLevel, log, LogLevel, LogLevelToString, parseLogLevel } from 'vs/platform/log/common/log';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ExtHostContext, MainThreadLoggerShape, MainContext } from 'vs/workbench/api/common/extHost.protocol';
-import { UriComponents, URI, UriDto } from 'vs/base/common/uri';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { ILoggerOptions, ILoggerResource, ILoggerService, ILogService, isLogLevel, log, LogLevel, LogLevelToString, parseLogLevel } from '../../../platform/log/common/log.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { ExtHostContext, MainThreadLoggerShape, MainContext } from '../common/extHost.protocol.js';
+import { UriComponents, URI, UriDto } from '../../../base/common/uri.js';
+import { ServicesAccessor } from '../../../platform/instantiation/common/instantiation.js';
+import { CommandsRegistry } from '../../../platform/commands/common/commands.js';
+import { IEnvironmentService } from '../../../platform/environment/common/environment.js';
 
 @extHostNamedCustomer(MainContext.MainThreadLogger)
 export class MainThreadLoggerService implements MainThreadLoggerShape {
diff --git a/src/vs/workbench/api/browser/mainThreadManagedSockets.ts b/src/vs/workbench/api/browser/mainThreadManagedSockets.ts
index 5cae557028c..8bd8f02136a 100644
--- a/src/vs/workbench/api/browser/mainThreadManagedSockets.ts
+++ b/src/vs/workbench/api/browser/mainThreadManagedSockets.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { ISocket, SocketCloseEventType } from 'vs/base/parts/ipc/common/ipc.net';
-import { ManagedSocket, RemoteSocketHalf, connectManagedSocket } from 'vs/platform/remote/common/managedSocket';
-import { ManagedRemoteConnection, RemoteConnectionType } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { IRemoteSocketFactoryService, ISocketFactory } from 'vs/platform/remote/common/remoteSocketFactoryService';
-import { ExtHostContext, ExtHostManagedSocketsShape, MainContext, MainThreadManagedSocketsShape } from 'vs/workbench/api/common/extHost.protocol';
-import { IExtHostContext, extHostNamedCustomer } from 'vs/workbench/services/extensions/common/extHostCustomers';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { Emitter } from '../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../base/common/lifecycle.js';
+import { ISocket, SocketCloseEventType } from '../../../base/parts/ipc/common/ipc.net.js';
+import { ManagedSocket, RemoteSocketHalf, connectManagedSocket } from '../../../platform/remote/common/managedSocket.js';
+import { ManagedRemoteConnection, RemoteConnectionType } from '../../../platform/remote/common/remoteAuthorityResolver.js';
+import { IRemoteSocketFactoryService, ISocketFactory } from '../../../platform/remote/common/remoteSocketFactoryService.js';
+import { ExtHostContext, ExtHostManagedSocketsShape, MainContext, MainThreadManagedSocketsShape } from '../common/extHost.protocol.js';
+import { IExtHostContext, extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 
 @extHostNamedCustomer(MainContext.MainThreadManagedSockets)
 export class MainThreadManagedSockets extends Disposable implements MainThreadManagedSocketsShape {
diff --git a/src/vs/workbench/api/browser/mainThreadMessageService.ts b/src/vs/workbench/api/browser/mainThreadMessageService.ts
index 5cf20960f3f..0cb41146947 100644
--- a/src/vs/workbench/api/browser/mainThreadMessageService.ts
+++ b/src/vs/workbench/api/browser/mainThreadMessageService.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import Severity from 'vs/base/common/severity';
-import { IAction, toAction } from 'vs/base/common/actions';
-import { MainThreadMessageServiceShape, MainContext, MainThreadMessageOptions } from '../common/extHost.protocol';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { IDialogService, IPromptButton } from 'vs/platform/dialogs/common/dialogs';
-import { INotificationService, INotificationSource } from 'vs/platform/notification/common/notification';
-import { Event } from 'vs/base/common/event';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IDisposable } from 'vs/base/common/lifecycle';
+import * as nls from '../../../nls.js';
+import Severity from '../../../base/common/severity.js';
+import { IAction, toAction } from '../../../base/common/actions.js';
+import { MainThreadMessageServiceShape, MainContext, MainThreadMessageOptions } from '../common/extHost.protocol.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { IDialogService, IPromptButton } from '../../../platform/dialogs/common/dialogs.js';
+import { INotificationService, INotificationSource } from '../../../platform/notification/common/notification.js';
+import { Event } from '../../../base/common/event.js';
+import { ICommandService } from '../../../platform/commands/common/commands.js';
+import { IExtensionService } from '../../services/extensions/common/extensions.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
 
 @extHostNamedCustomer(MainContext.MainThreadMessageService)
 export class MainThreadMessageService implements MainThreadMessageServiceShape {
diff --git a/src/vs/workbench/api/browser/mainThreadNotebook.ts b/src/vs/workbench/api/browser/mainThreadNotebook.ts
index c036901f907..927151c9eef 100644
--- a/src/vs/workbench/api/browser/mainThreadNotebook.ts
+++ b/src/vs/workbench/api/browser/mainThreadNotebook.ts
@@ -3,27 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Emitter } from 'vs/base/common/event';
-import { DisposableStore, dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { assertType } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { ILogService } from 'vs/platform/log/common/log';
-import { NotebookDto } from 'vs/workbench/api/browser/mainThreadNotebookDto';
-import { INotebookCellStatusBarService } from 'vs/workbench/contrib/notebook/common/notebookCellStatusBarService';
-import { INotebookCellStatusBarItemProvider, INotebookContributionData, INotebookExclusiveDocumentFilter, NotebookData, NotebookExtensionDescription, TransientOptions } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotebookService, SimpleNotebookProviderInfo } from 'vs/workbench/contrib/notebook/common/notebookService';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { SerializableObjectWithBuffers } from 'vs/workbench/services/extensions/common/proxyIdentifier';
-import { ExtHostContext, ExtHostNotebookShape, MainContext, MainThreadNotebookShape } from '../common/extHost.protocol';
-import { IRelativePattern } from 'vs/base/common/glob';
-import { revive } from 'vs/base/common/marshalling';
-import { INotebookFileMatchNoModel } from 'vs/workbench/contrib/search/common/searchNotebookHelpers';
-import { NotebookPriorityInfo } from 'vs/workbench/contrib/search/common/search';
-import { coalesce } from 'vs/base/common/arrays';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Emitter } from '../../../base/common/event.js';
+import { DisposableStore, dispose, IDisposable } from '../../../base/common/lifecycle.js';
+import { StopWatch } from '../../../base/common/stopwatch.js';
+import { assertType } from '../../../base/common/types.js';
+import { URI } from '../../../base/common/uri.js';
+import { CommandsRegistry } from '../../../platform/commands/common/commands.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { NotebookDto } from './mainThreadNotebookDto.js';
+import { INotebookCellStatusBarService } from '../../contrib/notebook/common/notebookCellStatusBarService.js';
+import { INotebookCellStatusBarItemProvider, INotebookContributionData, INotebookExclusiveDocumentFilter, NotebookData, NotebookExtensionDescription, TransientOptions } from '../../contrib/notebook/common/notebookCommon.js';
+import { INotebookService, SimpleNotebookProviderInfo } from '../../contrib/notebook/common/notebookService.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';
+import { ExtHostContext, ExtHostNotebookShape, MainContext, MainThreadNotebookShape } from '../common/extHost.protocol.js';
+import { IRelativePattern } from '../../../base/common/glob.js';
+import { revive } from '../../../base/common/marshalling.js';
+import { INotebookFileMatchNoModel } from '../../contrib/search/common/searchNotebookHelpers.js';
+import { NotebookPriorityInfo } from '../../contrib/search/common/search.js';
+import { coalesce } from '../../../base/common/arrays.js';
 
 @extHostNamedCustomer(MainContext.MainThreadNotebook)
 export class MainThreadNotebooks implements MainThreadNotebookShape {
@@ -104,7 +104,7 @@ export class MainThreadNotebooks implements MainThreadNotebookShape {
 					};
 				}
 
-				const thisPriorityInfo = coalesce([<NotebookPriorityInfo>{ isFromSettings: false, filenamePatterns: includes }, ...allPriorityInfo.get(viewType) ?? []]);
+				const thisPriorityInfo = coalesce<NotebookPriorityInfo>([{ isFromSettings: false, filenamePatterns: includes }, ...allPriorityInfo.get(viewType) ?? []]);
 				const otherEditorsPriorityInfo = Array.from(allPriorityInfo.keys())
 					.flatMap(key => {
 						if (key !== viewType) {
diff --git a/src/vs/workbench/api/browser/mainThreadNotebookDocuments.ts b/src/vs/workbench/api/browser/mainThreadNotebookDocuments.ts
index c18d0ac258a..c2d1234aa83 100644
--- a/src/vs/workbench/api/browser/mainThreadNotebookDocuments.ts
+++ b/src/vs/workbench/api/browser/mainThreadNotebookDocuments.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DisposableStore, dispose } from 'vs/base/common/lifecycle';
-import { ResourceMap } from 'vs/base/common/map';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { BoundModelReferenceCollection } from 'vs/workbench/api/browser/mainThreadDocuments';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { NotebookCellsChangeType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotebookEditorModelResolverService } from 'vs/workbench/contrib/notebook/common/notebookEditorModelResolverService';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { ExtHostContext, ExtHostNotebookDocumentsShape, MainThreadNotebookDocumentsShape, NotebookCellDto, NotebookCellsChangedEventDto, NotebookDataDto } from '../common/extHost.protocol';
-import { NotebookDto } from 'vs/workbench/api/browser/mainThreadNotebookDto';
-import { SerializableObjectWithBuffers } from 'vs/workbench/services/extensions/common/proxyIdentifier';
-import { IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
+import { DisposableStore, dispose } from '../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../base/common/map.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { BoundModelReferenceCollection } from './mainThreadDocuments.js';
+import { NotebookTextModel } from '../../contrib/notebook/common/model/notebookTextModel.js';
+import { NotebookCellsChangeType } from '../../contrib/notebook/common/notebookCommon.js';
+import { INotebookEditorModelResolverService } from '../../contrib/notebook/common/notebookEditorModelResolverService.js';
+import { IUriIdentityService } from '../../../platform/uriIdentity/common/uriIdentity.js';
+import { ExtHostContext, ExtHostNotebookDocumentsShape, MainThreadNotebookDocumentsShape, NotebookCellDto, NotebookCellsChangedEventDto, NotebookDataDto } from '../common/extHost.protocol.js';
+import { NotebookDto } from './mainThreadNotebookDto.js';
+import { SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';
+import { IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
 
 export class MainThreadNotebookDocuments implements MainThreadNotebookDocumentsShape {
 
@@ -125,30 +125,45 @@ export class MainThreadNotebookDocuments implements MainThreadNotebookDocumentsS
 		}
 	}
 
-
 	async $tryCreateNotebook(options: { viewType: string; content?: NotebookDataDto }): Promise<UriComponents> {
-		const ref = await this._notebookEditorModelResolverService.resolve({ untitledResource: undefined }, options.viewType);
-
-		// untitled notebooks are disposed when they get saved. we should not hold a reference
-		// to such a disposed notebook and therefore dispose the reference as well
-		ref.object.notebook.onWillDispose(() => {
-			ref.dispose();
-		});
-
-		// untitled notebooks are dirty by default
-		this._proxy.$acceptDirtyStateChanged(ref.object.resource, true);
-
-		// apply content changes... slightly HACKY -> this triggers a change event
 		if (options.content) {
-			const data = NotebookDto.fromNotebookDataDto(options.content);
-			ref.object.notebook.reset(data.cells, data.metadata, ref.object.notebook.transientOptions);
+			const ref = await this._notebookEditorModelResolverService.resolve({ untitledResource: undefined }, options.viewType);
+
+			// untitled notebooks are disposed when they get saved. we should not hold a reference
+			// to such a disposed notebook and therefore dispose the reference as well
+			ref.object.notebook.onWillDispose(() => {
+				ref.dispose();
+			});
+
+			// untitled notebooks with content are dirty by default
+			this._proxy.$acceptDirtyStateChanged(ref.object.resource, true);
+
+			// apply content changes... slightly HACKY -> this triggers a change event
+			if (options.content) {
+				const data = NotebookDto.fromNotebookDataDto(options.content);
+				ref.object.notebook.reset(data.cells, data.metadata, ref.object.notebook.transientOptions);
+			}
+			return ref.object.notebook.uri;
+		} else {
+			// If we aren't adding content, we don't need to resolve the full editor model yet.
+			// This will allow us to adjust settings when the editor is opened, e.g. scratchpad
+			const notebook = await this._notebookEditorModelResolverService.createUntitledNotebookTextModel(options.viewType);
+			return notebook.uri;
 		}
-		return ref.object.resource;
 	}
 
 	async $tryOpenNotebook(uriComponents: UriComponents): Promise<URI> {
 		const uri = URI.revive(uriComponents);
 		const ref = await this._notebookEditorModelResolverService.resolve(uri, undefined);
+
+		if (uriComponents.scheme === 'untitled') {
+			// untitled notebooks are disposed when they get saved. we should not hold a reference
+			// to such a disposed notebook and therefore dispose the reference as well
+			ref.object.notebook.onWillDispose(() => {
+				ref.dispose();
+			});
+		}
+
 		this._modelReferenceCollection.add(uri, ref);
 		return uri;
 	}
diff --git a/src/vs/workbench/api/browser/mainThreadNotebookDocumentsAndEditors.ts b/src/vs/workbench/api/browser/mainThreadNotebookDocumentsAndEditors.ts
index b13e8fb2d25..89c8975eb7e 100644
--- a/src/vs/workbench/api/browser/mainThreadNotebookDocumentsAndEditors.ts
+++ b/src/vs/workbench/api/browser/mainThreadNotebookDocumentsAndEditors.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { diffMaps, diffSets } from 'vs/base/common/collections';
-import { combinedDisposable, DisposableStore, DisposableMap } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { MainThreadNotebookDocuments } from 'vs/workbench/api/browser/mainThreadNotebookDocuments';
-import { NotebookDto } from 'vs/workbench/api/browser/mainThreadNotebookDto';
-import { MainThreadNotebookEditors } from 'vs/workbench/api/browser/mainThreadNotebookEditors';
-import { extHostCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { editorGroupToColumn } from 'vs/workbench/services/editor/common/editorGroupColumn';
-import { getNotebookEditorFromEditorPane, IActiveNotebookEditor, INotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { INotebookEditorService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorService';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ExtHostContext, ExtHostNotebookShape, INotebookDocumentsAndEditorsDelta, INotebookEditorAddData, INotebookModelAddedData, MainContext } from '../common/extHost.protocol';
-import { SerializableObjectWithBuffers } from 'vs/workbench/services/extensions/common/proxyIdentifier';
+import { diffMaps, diffSets } from '../../../base/common/collections.js';
+import { combinedDisposable, DisposableStore, DisposableMap } from '../../../base/common/lifecycle.js';
+import { URI } from '../../../base/common/uri.js';
+import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { MainThreadNotebookDocuments } from './mainThreadNotebookDocuments.js';
+import { NotebookDto } from './mainThreadNotebookDto.js';
+import { MainThreadNotebookEditors } from './mainThreadNotebookEditors.js';
+import { extHostCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { editorGroupToColumn } from '../../services/editor/common/editorGroupColumn.js';
+import { getNotebookEditorFromEditorPane, IActiveNotebookEditor, INotebookEditor } from '../../contrib/notebook/browser/notebookBrowser.js';
+import { INotebookEditorService } from '../../contrib/notebook/browser/services/notebookEditorService.js';
+import { NotebookTextModel } from '../../contrib/notebook/common/model/notebookTextModel.js';
+import { INotebookService } from '../../contrib/notebook/common/notebookService.js';
+import { IEditorGroupsService } from '../../services/editor/common/editorGroupsService.js';
+import { IEditorService } from '../../services/editor/common/editorService.js';
+import { ExtHostContext, ExtHostNotebookShape, INotebookDocumentsAndEditorsDelta, INotebookEditorAddData, INotebookModelAddedData, MainContext } from '../common/extHost.protocol.js';
+import { SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';
 
 interface INotebookAndEditorDelta {
 	removedDocuments: URI[];
@@ -239,7 +239,8 @@ export class MainThreadNotebooksAndEditors {
 			documentUri: add.textModel.uri,
 			selections: add.getSelections(),
 			visibleRanges: add.visibleRanges,
-			viewColumn: pane && editorGroupToColumn(this._editorGroupService, pane.group)
+			viewColumn: pane && editorGroupToColumn(this._editorGroupService, pane.group),
+			viewType: add.getViewModel().viewType
 		};
 	}
 }
diff --git a/src/vs/workbench/api/browser/mainThreadNotebookDto.ts b/src/vs/workbench/api/browser/mainThreadNotebookDto.ts
index 9c7f5d67f0d..5ba3a3b3f68 100644
--- a/src/vs/workbench/api/browser/mainThreadNotebookDto.ts
+++ b/src/vs/workbench/api/browser/mainThreadNotebookDto.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as extHostProtocol from 'vs/workbench/api/common/extHost.protocol';
-import * as notebookCommon from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { CellExecutionUpdateType } from 'vs/workbench/contrib/notebook/common/notebookExecutionService';
-import { ICellExecuteUpdate, ICellExecutionComplete } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
+import * as extHostProtocol from '../common/extHost.protocol.js';
+import * as notebookCommon from '../../contrib/notebook/common/notebookCommon.js';
+import { CellExecutionUpdateType } from '../../contrib/notebook/common/notebookExecutionService.js';
+import { ICellExecuteUpdate, ICellExecutionComplete } from '../../contrib/notebook/common/notebookExecutionStateService.js';
 
 export namespace NotebookDto {
 
diff --git a/src/vs/workbench/api/browser/mainThreadNotebookEditors.ts b/src/vs/workbench/api/browser/mainThreadNotebookEditors.ts
index 0db9edac4d4..79449f391cf 100644
--- a/src/vs/workbench/api/browser/mainThreadNotebookEditors.ts
+++ b/src/vs/workbench/api/browser/mainThreadNotebookEditors.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DisposableStore, dispose } from 'vs/base/common/lifecycle';
-import { equals } from 'vs/base/common/objects';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { EditorActivation } from 'vs/platform/editor/common/editor';
-import { getNotebookEditorFromEditorPane, INotebookEditor, INotebookEditorOptions } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { INotebookEditorService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorService';
-import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
-import { columnToEditorGroup, editorGroupToColumn } from 'vs/workbench/services/editor/common/editorGroupColumn';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { ExtHostContext, ExtHostNotebookEditorsShape, INotebookDocumentShowOptions, INotebookEditorViewColumnInfo, MainThreadNotebookEditorsShape, NotebookEditorRevealType } from '../common/extHost.protocol';
+import { DisposableStore, dispose } from '../../../base/common/lifecycle.js';
+import { equals } from '../../../base/common/objects.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
+import { EditorActivation } from '../../../platform/editor/common/editor.js';
+import { getNotebookEditorFromEditorPane, INotebookEditor, INotebookEditorOptions } from '../../contrib/notebook/browser/notebookBrowser.js';
+import { INotebookEditorService } from '../../contrib/notebook/browser/services/notebookEditorService.js';
+import { ICellRange } from '../../contrib/notebook/common/notebookRange.js';
+import { columnToEditorGroup, editorGroupToColumn } from '../../services/editor/common/editorGroupColumn.js';
+import { IEditorGroupsService } from '../../services/editor/common/editorGroupsService.js';
+import { IEditorService } from '../../services/editor/common/editorService.js';
+import { IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { ExtHostContext, ExtHostNotebookEditorsShape, INotebookDocumentShowOptions, INotebookEditorViewColumnInfo, MainThreadNotebookEditorsShape, NotebookEditorRevealType } from '../common/extHost.protocol.js';
 
 class MainThreadNotebook {
 
@@ -105,6 +105,7 @@ export class MainThreadNotebookEditors implements MainThreadNotebookEditorsShape
 			// preserve pre 1.38 behaviour to not make group active when preserveFocus: true
 			// but make sure to restore the editor to fix https://github.com/microsoft/vscode/issues/79633
 			activation: options.preserveFocus ? EditorActivation.RESTORE : undefined,
+			label: options.label,
 			override: viewType
 		};
 
diff --git a/src/vs/workbench/api/browser/mainThreadNotebookKernels.ts b/src/vs/workbench/api/browser/mainThreadNotebookKernels.ts
index 678825ac6a5..8c38e14647e 100644
--- a/src/vs/workbench/api/browser/mainThreadNotebookKernels.ts
+++ b/src/vs/workbench/api/browser/mainThreadNotebookKernels.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isNonEmptyArray } from 'vs/base/common/arrays';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { combinedDisposable, DisposableMap, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { NotebookDto } from 'vs/workbench/api/browser/mainThreadNotebookDto';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { INotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { INotebookEditorService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorService';
-import { INotebookCellExecution, INotebookExecution, INotebookExecutionStateService, NotebookExecutionType } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
-import { IKernelSourceActionProvider, INotebookKernel, INotebookKernelChangeEvent, INotebookKernelDetectionTask, INotebookKernelService, VariablesResult } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
-import { SerializableObjectWithBuffers } from 'vs/workbench/services/extensions/common/proxyIdentifier';
-import { ExtHostContext, ExtHostNotebookKernelsShape, ICellExecuteUpdateDto, ICellExecutionCompleteDto, INotebookKernelDto2, MainContext, MainThreadNotebookKernelsShape } from '../common/extHost.protocol';
-import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
-import { AsyncIterableObject, AsyncIterableSource } from 'vs/base/common/async';
+import { isNonEmptyArray } from '../../../base/common/arrays.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { onUnexpectedError } from '../../../base/common/errors.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { DisposableMap, DisposableStore, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { ILanguageService } from '../../../editor/common/languages/language.js';
+import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
+import { NotebookDto } from './mainThreadNotebookDto.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { INotebookEditor } from '../../contrib/notebook/browser/notebookBrowser.js';
+import { INotebookEditorService } from '../../contrib/notebook/browser/services/notebookEditorService.js';
+import { INotebookCellExecution, INotebookExecution, INotebookExecutionStateService, NotebookExecutionType } from '../../contrib/notebook/common/notebookExecutionStateService.js';
+import { IKernelSourceActionProvider, INotebookKernel, INotebookKernelChangeEvent, INotebookKernelDetectionTask, INotebookKernelService, VariablesResult } from '../../contrib/notebook/common/notebookKernelService.js';
+import { SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';
+import { ExtHostContext, ExtHostNotebookKernelsShape, ICellExecuteUpdateDto, ICellExecutionCompleteDto, INotebookKernelDto2, MainContext, MainThreadNotebookKernelsShape } from '../common/extHost.protocol.js';
+import { INotebookService } from '../../contrib/notebook/common/notebookService.js';
+import { AsyncIterableObject, AsyncIterableSource } from '../../../base/common/async.js';
 
 abstract class MainThreadKernel implements INotebookKernel {
 	private readonly _onDidChange = new Emitter<INotebookKernelChangeEvent>();
@@ -151,6 +151,16 @@ export class MainThreadNotebookKernels implements MainThreadNotebookKernelsShape
 				this._proxy.$cellExecutionChanged(e.notebook, e.cellHandle, e.changed?.state);
 			}
 		}));
+
+		this._disposables.add(this._notebookKernelService.onDidChangeSelectedNotebooks(e => {
+			for (const [handle, [kernel,]] of this._kernels) {
+				if (e.oldKernel === kernel.id) {
+					this._proxy.$acceptNotebookAssociation(handle, e.notebook, false);
+				} else if (e.newKernel === kernel.id) {
+					this._proxy.$acceptNotebookAssociation(handle, e.notebook, true);
+				}
+			}
+		}));
 	}
 
 	dispose(): void {
@@ -262,16 +272,10 @@ export class MainThreadNotebookKernels implements MainThreadNotebookKernelsShape
 			}
 		}(data, this._languageService);
 
-		const listener = this._notebookKernelService.onDidChangeSelectedNotebooks(e => {
-			if (e.oldKernel === kernel.id) {
-				this._proxy.$acceptNotebookAssociation(handle, e.notebook, false);
-			} else if (e.newKernel === kernel.id) {
-				this._proxy.$acceptNotebookAssociation(handle, e.notebook, true);
-			}
-		});
-
-		const registration = this._notebookKernelService.registerKernel(kernel);
-		this._kernels.set(handle, [kernel, combinedDisposable(listener, registration)]);
+		const disposables = this._disposables.add(new DisposableStore());
+		// Ensure _kernels is up to date before we register a kernel.
+		this._kernels.set(handle, [kernel, disposables]);
+		disposables.add(this._notebookKernelService.registerKernel(kernel));
 	}
 
 	$updateKernel(handle: number, data: Partial<INotebookKernelDto2>): void {
diff --git a/src/vs/workbench/api/browser/mainThreadNotebookRenderers.ts b/src/vs/workbench/api/browser/mainThreadNotebookRenderers.ts
index b7c9bb85dc7..c0c9aef4e37 100644
--- a/src/vs/workbench/api/browser/mainThreadNotebookRenderers.ts
+++ b/src/vs/workbench/api/browser/mainThreadNotebookRenderers.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ExtHostContext, ExtHostNotebookRenderersShape, MainContext, MainThreadNotebookRenderersShape } from 'vs/workbench/api/common/extHost.protocol';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { INotebookRendererMessagingService } from 'vs/workbench/contrib/notebook/common/notebookRendererMessagingService';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { ExtHostContext, ExtHostNotebookRenderersShape, MainContext, MainThreadNotebookRenderersShape } from '../common/extHost.protocol.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { INotebookRendererMessagingService } from '../../contrib/notebook/common/notebookRendererMessagingService.js';
 
 @extHostNamedCustomer(MainContext.MainThreadNotebookRenderers)
 export class MainThreadNotebookRenderers extends Disposable implements MainThreadNotebookRenderersShape {
diff --git a/src/vs/workbench/api/browser/mainThreadNotebookSaveParticipant.ts b/src/vs/workbench/api/browser/mainThreadNotebookSaveParticipant.ts
index dd17844187d..13711b2a979 100644
--- a/src/vs/workbench/api/browser/mainThreadNotebookSaveParticipant.ts
+++ b/src/vs/workbench/api/browser/mainThreadNotebookSaveParticipant.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { localize } from 'vs/nls';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IProgressStep, IProgress } from 'vs/platform/progress/common/progress';
-import { extHostCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { ExtHostContext, ExtHostNotebookDocumentSaveParticipantShape } from '../common/extHost.protocol';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { raceCancellationError } from 'vs/base/common/async';
-import { IStoredFileWorkingCopySaveParticipant, IStoredFileWorkingCopySaveParticipantContext, IWorkingCopyFileService } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
-import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel } from 'vs/workbench/services/workingCopy/common/storedFileWorkingCopy';
-import { NotebookFileWorkingCopyModel } from 'vs/workbench/contrib/notebook/common/notebookEditorModel';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { localize } from '../../../nls.js';
+import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
+import { IProgressStep, IProgress } from '../../../platform/progress/common/progress.js';
+import { extHostCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { ExtHostContext, ExtHostNotebookDocumentSaveParticipantShape } from '../common/extHost.protocol.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { raceCancellationError } from '../../../base/common/async.js';
+import { IStoredFileWorkingCopySaveParticipant, IStoredFileWorkingCopySaveParticipantContext, IWorkingCopyFileService } from '../../services/workingCopy/common/workingCopyFileService.js';
+import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel } from '../../services/workingCopy/common/storedFileWorkingCopy.js';
+import { NotebookFileWorkingCopyModel } from '../../contrib/notebook/common/notebookEditorModel.js';
 
 class ExtHostNotebookDocumentSaveParticipant implements IStoredFileWorkingCopySaveParticipant {
 
diff --git a/src/vs/workbench/api/browser/mainThreadOutputService.ts b/src/vs/workbench/api/browser/mainThreadOutputService.ts
index 077f0958325..2fa6443b374 100644
--- a/src/vs/workbench/api/browser/mainThreadOutputService.ts
+++ b/src/vs/workbench/api/browser/mainThreadOutputService.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Extensions, IOutputChannelRegistry, IOutputService, IOutputChannel, OUTPUT_VIEW_ID, OutputChannelUpdateMode } from 'vs/workbench/services/output/common/output';
-import { MainThreadOutputServiceShape, MainContext, ExtHostOutputServiceShape, ExtHostContext } from '../common/extHost.protocol';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { UriComponents, URI } from 'vs/base/common/uri';
-import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { Event } from 'vs/base/common/event';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { isNumber } from 'vs/base/common/types';
+import { Registry } from '../../../platform/registry/common/platform.js';
+import { Extensions, IOutputChannelRegistry, IOutputService, IOutputChannel, OUTPUT_VIEW_ID, OutputChannelUpdateMode } from '../../services/output/common/output.js';
+import { MainThreadOutputServiceShape, MainContext, ExtHostOutputServiceShape, ExtHostContext } from '../common/extHost.protocol.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { UriComponents, URI } from '../../../base/common/uri.js';
+import { Disposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { Event } from '../../../base/common/event.js';
+import { IViewsService } from '../../services/views/common/viewsService.js';
+import { isNumber } from '../../../base/common/types.js';
 
 @extHostNamedCustomer(MainContext.MainThreadOutputService)
 export class MainThreadOutputService extends Disposable implements MainThreadOutputServiceShape {
diff --git a/src/vs/workbench/api/browser/mainThreadProfileContentHandlers.ts b/src/vs/workbench/api/browser/mainThreadProfileContentHandlers.ts
index 357f1a2c315..ed7d917bb7c 100644
--- a/src/vs/workbench/api/browser/mainThreadProfileContentHandlers.ts
+++ b/src/vs/workbench/api/browser/mainThreadProfileContentHandlers.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Disposable, DisposableMap, IDisposable } from 'vs/base/common/lifecycle';
-import { revive } from 'vs/base/common/marshalling';
-import { URI } from 'vs/base/common/uri';
-import { ExtHostContext, ExtHostProfileContentHandlersShape, MainContext, MainThreadProfileContentHandlersShape } from 'vs/workbench/api/common/extHost.protocol';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { ISaveProfileResult, IUserDataProfileImportExportService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Disposable, DisposableMap, IDisposable } from '../../../base/common/lifecycle.js';
+import { revive } from '../../../base/common/marshalling.js';
+import { URI } from '../../../base/common/uri.js';
+import { ExtHostContext, ExtHostProfileContentHandlersShape, MainContext, MainThreadProfileContentHandlersShape } from '../common/extHost.protocol.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { ISaveProfileResult, IUserDataProfileImportExportService } from '../../services/userDataProfile/common/userDataProfile.js';
 
 @extHostNamedCustomer(MainContext.MainThreadProfileContentHandlers)
 export class MainThreadProfileContentHandlers extends Disposable implements MainThreadProfileContentHandlersShape {
diff --git a/src/vs/workbench/api/browser/mainThreadProgress.ts b/src/vs/workbench/api/browser/mainThreadProgress.ts
index beec4789ac9..6606b0d64bd 100644
--- a/src/vs/workbench/api/browser/mainThreadProgress.ts
+++ b/src/vs/workbench/api/browser/mainThreadProgress.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IProgress, IProgressService, IProgressStep, ProgressLocation, IProgressOptions, IProgressNotificationOptions } from 'vs/platform/progress/common/progress';
-import { MainThreadProgressShape, MainContext, ExtHostProgressShape, ExtHostContext } from '../common/extHost.protocol';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { Action } from 'vs/base/common/actions';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { localize } from 'vs/nls';
+import { IProgress, IProgressService, IProgressStep, ProgressLocation, IProgressOptions, IProgressNotificationOptions } from '../../../platform/progress/common/progress.js';
+import { MainThreadProgressShape, MainContext, ExtHostProgressShape, ExtHostContext } from '../common/extHost.protocol.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { Action } from '../../../base/common/actions.js';
+import { ICommandService } from '../../../platform/commands/common/commands.js';
+import { localize } from '../../../nls.js';
 
 class ManageExtensionAction extends Action {
 	constructor(extensionId: string, label: string, commandService: ICommandService) {
diff --git a/src/vs/workbench/api/browser/mainThreadQuickDiff.ts b/src/vs/workbench/api/browser/mainThreadQuickDiff.ts
index d5312097ee9..541de6b2b5d 100644
--- a/src/vs/workbench/api/browser/mainThreadQuickDiff.ts
+++ b/src/vs/workbench/api/browser/mainThreadQuickDiff.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { DisposableMap, IDisposable } from 'vs/base/common/lifecycle';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { ExtHostContext, ExtHostQuickDiffShape, IDocumentFilterDto, MainContext, MainThreadQuickDiffShape } from 'vs/workbench/api/common/extHost.protocol';
-import { IQuickDiffService, QuickDiffProvider } from 'vs/workbench/contrib/scm/common/quickDiff';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { DisposableMap, IDisposable } from '../../../base/common/lifecycle.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { ExtHostContext, ExtHostQuickDiffShape, IDocumentFilterDto, MainContext, MainThreadQuickDiffShape } from '../common/extHost.protocol.js';
+import { IQuickDiffService, QuickDiffProvider } from '../../contrib/scm/common/quickDiff.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
 
 @extHostNamedCustomer(MainContext.MainThreadQuickDiff)
 export class MainThreadQuickDiff implements MainThreadQuickDiffShape {
diff --git a/src/vs/workbench/api/browser/mainThreadQuickOpen.ts b/src/vs/workbench/api/browser/mainThreadQuickOpen.ts
index 001745bf29a..eefc335a079 100644
--- a/src/vs/workbench/api/browser/mainThreadQuickOpen.ts
+++ b/src/vs/workbench/api/browser/mainThreadQuickOpen.ts
@@ -3,15 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IPickOptions, IInputOptions, IQuickInputService, IQuickInput, IQuickPick, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { ExtHostContext, MainThreadQuickOpenShape, ExtHostQuickOpenShape, TransferQuickPickItem, MainContext, TransferQuickInput, TransferQuickInputButton, IInputBoxOptions, TransferQuickPickItemOrSeparator } from 'vs/workbench/api/common/extHost.protocol';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { URI } from 'vs/base/common/uri';
-import { CancellationToken } from 'vs/base/common/cancellation';
+import { IPickOptions, IInputOptions, IQuickInputService, IQuickInput, IQuickPick, IQuickPickItem } from '../../../platform/quickinput/common/quickInput.js';
+import { ExtHostContext, MainThreadQuickOpenShape, ExtHostQuickOpenShape, TransferQuickPickItem, MainContext, TransferQuickInput, TransferQuickInputButton, IInputBoxOptions, TransferQuickPickItemOrSeparator } from '../common/extHost.protocol.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { URI } from '../../../base/common/uri.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
 
 interface QuickInputSession {
 	input: IQuickInput;
 	handlesToItems: Map<number, TransferQuickPickItem>;
+	store: DisposableStore;
 }
 
 function reviveIconPathUris(iconPath: { dark: URI; light?: URI | undefined }) {
@@ -40,6 +42,9 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
 	}
 
 	public dispose(): void {
+		for (const [_id, session] of this.sessions) {
+			session.store.dispose();
+		}
 	}
 
 	$show(instance: number, options: IPickOptions<TransferQuickPickItem>, token: CancellationToken): Promise<number | number[] | undefined> {
@@ -121,38 +126,40 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
 		const sessionId = params.id;
 		let session = this.sessions.get(sessionId);
 		if (!session) {
-
+			const store = new DisposableStore();
 			const input = params.type === 'quickPick' ? this._quickInputService.createQuickPick() : this._quickInputService.createInputBox();
-			input.onDidAccept(() => {
+			store.add(input);
+			store.add(input.onDidAccept(() => {
 				this._proxy.$onDidAccept(sessionId);
-			});
-			input.onDidTriggerButton(button => {
+			}));
+			store.add(input.onDidTriggerButton(button => {
 				this._proxy.$onDidTriggerButton(sessionId, (button as TransferQuickInputButton).handle);
-			});
-			input.onDidChangeValue(value => {
+			}));
+			store.add(input.onDidChangeValue(value => {
 				this._proxy.$onDidChangeValue(sessionId, value);
-			});
-			input.onDidHide(() => {
+			}));
+			store.add(input.onDidHide(() => {
 				this._proxy.$onDidHide(sessionId);
-			});
+			}));
 
 			if (params.type === 'quickPick') {
 				// Add extra events specific for quickpick
 				const quickpick = input as IQuickPick<IQuickPickItem>;
-				quickpick.onDidChangeActive(items => {
+				store.add(quickpick.onDidChangeActive(items => {
 					this._proxy.$onDidChangeActive(sessionId, items.map(item => (item as TransferQuickPickItem).handle));
-				});
-				quickpick.onDidChangeSelection(items => {
+				}));
+				store.add(quickpick.onDidChangeSelection(items => {
 					this._proxy.$onDidChangeSelection(sessionId, items.map(item => (item as TransferQuickPickItem).handle));
-				});
-				quickpick.onDidTriggerItemButton((e) => {
+				}));
+				store.add(quickpick.onDidTriggerItemButton((e) => {
 					this._proxy.$onDidTriggerItemButton(sessionId, (e.item as TransferQuickPickItem).handle, (e.button as TransferQuickInputButton).handle);
-				});
+				}));
 			}
 
 			session = {
 				input,
-				handlesToItems: new Map()
+				handlesToItems: new Map(),
+				store
 			};
 			this.sessions.set(sessionId, session);
 		}
@@ -212,7 +219,7 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
 	$dispose(sessionId: number): Promise<void> {
 		const session = this.sessions.get(sessionId);
 		if (session) {
-			session.input.dispose();
+			session.store.dispose();
 			this.sessions.delete(sessionId);
 		}
 		return Promise.resolve(undefined);
diff --git a/src/vs/workbench/api/browser/mainThreadRemoteConnectionData.ts b/src/vs/workbench/api/browser/mainThreadRemoteConnectionData.ts
index abcaa4cc720..6d3fdb8228f 100644
--- a/src/vs/workbench/api/browser/mainThreadRemoteConnectionData.ts
+++ b/src/vs/workbench/api/browser/mainThreadRemoteConnectionData.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { extHostCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { ExtHostContext, ExtHostExtensionServiceShape } from '../common/extHost.protocol';
-import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
+import { extHostCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { ExtHostContext, ExtHostExtensionServiceShape } from '../common/extHost.protocol.js';
+import { IRemoteAuthorityResolverService } from '../../../platform/remote/common/remoteAuthorityResolver.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { IWorkbenchEnvironmentService } from '../../services/environment/common/environmentService.js';
 
 @extHostCustomer
 export class MainThreadRemoteConnectionData extends Disposable {
diff --git a/src/vs/workbench/api/browser/mainThreadSCM.ts b/src/vs/workbench/api/browser/mainThreadSCM.ts
index adb9238b8a1..fbb4340c5ec 100644
--- a/src/vs/workbench/api/browser/mainThreadSCM.ts
+++ b/src/vs/workbench/api/browser/mainThreadSCM.ts
@@ -3,30 +3,33 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Barrier } from 'vs/base/common/async';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { Event, Emitter } from 'vs/base/common/event';
-import { observableValue } from 'vs/base/common/observable';
-import { IDisposable, DisposableStore, combinedDisposable, dispose, Disposable } from 'vs/base/common/lifecycle';
-import { ISCMService, ISCMRepository, ISCMProvider, ISCMResource, ISCMResourceGroup, ISCMResourceDecorations, IInputValidation, ISCMViewService, InputValidationType, ISCMActionButtonDescriptor } from 'vs/workbench/contrib/scm/common/scm';
-import { ExtHostContext, MainThreadSCMShape, ExtHostSCMShape, SCMProviderFeatures, SCMRawResourceSplices, SCMGroupFeatures, MainContext, SCMHistoryItemGroupDto } from '../common/extHost.protocol';
-import { Command } from 'vs/editor/common/languages';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { MarshalledId } from 'vs/base/common/marshallingIds';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { IQuickDiffService, QuickDiffProvider } from 'vs/workbench/contrib/scm/common/quickDiff';
-import { ISCMHistoryItem, ISCMHistoryItemChange, ISCMHistoryItemGroup, ISCMHistoryOptions, ISCMHistoryProvider } from 'vs/workbench/contrib/scm/common/history';
-import { ResourceTree } from 'vs/base/common/resourceTree';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { basename } from 'vs/base/common/resources';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ITextModelContentProvider, ITextModelService } from 'vs/editor/common/services/resolverService';
-import { Schemas } from 'vs/base/common/network';
-import { ITextModel } from 'vs/editor/common/model';
+import { Barrier } from '../../../base/common/async.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { Event, Emitter } from '../../../base/common/event.js';
+import { IObservable, observableValue, observableValueOpts, transaction } from '../../../base/common/observable.js';
+import { IDisposable, DisposableStore, combinedDisposable, dispose, Disposable } from '../../../base/common/lifecycle.js';
+import { ISCMService, ISCMRepository, ISCMProvider, ISCMResource, ISCMResourceGroup, ISCMResourceDecorations, IInputValidation, ISCMViewService, InputValidationType, ISCMActionButtonDescriptor } from '../../contrib/scm/common/scm.js';
+import { ExtHostContext, MainThreadSCMShape, ExtHostSCMShape, SCMProviderFeatures, SCMRawResourceSplices, SCMGroupFeatures, MainContext, SCMHistoryItemDto, SCMHistoryItemRefsChangeEventDto, SCMHistoryItemRefDto } from '../common/extHost.protocol.js';
+import { Command } from '../../../editor/common/languages.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { MarshalledId } from '../../../base/common/marshallingIds.js';
+import { ThemeIcon } from '../../../base/common/themables.js';
+import { IMarkdownString } from '../../../base/common/htmlContent.js';
+import { IQuickDiffService, QuickDiffProvider } from '../../contrib/scm/common/quickDiff.js';
+import { ISCMHistoryItem, ISCMHistoryItemChange, ISCMHistoryItemRef, ISCMHistoryItemRefsChangeEvent, ISCMHistoryOptions, ISCMHistoryProvider } from '../../contrib/scm/common/history.js';
+import { ResourceTree } from '../../../base/common/resourceTree.js';
+import { IUriIdentityService } from '../../../platform/uriIdentity/common/uriIdentity.js';
+import { IWorkspaceContextService } from '../../../platform/workspace/common/workspace.js';
+import { basename } from '../../../base/common/resources.js';
+import { ILanguageService } from '../../../editor/common/languages/language.js';
+import { IModelService } from '../../../editor/common/services/model.js';
+import { ITextModelContentProvider, ITextModelService } from '../../../editor/common/services/resolverService.js';
+import { Schemas } from '../../../base/common/network.js';
+import { ITextModel } from '../../../editor/common/model.js';
+import { structuralEquals } from '../../../base/common/equals.js';
+import { historyItemBaseRefColor, historyItemRefColor, historyItemRemoteRefColor } from '../../contrib/scm/browser/scmHistory.js';
+import { ColorIdentifier } from '../../../platform/theme/common/colorUtils.js';
 
 function getIconFromIconDto(iconDto?: UriComponents | { light: UriComponents; dark: UriComponents } | ThemeIcon): URI | { light: URI; dark: URI } | ThemeIcon | undefined {
 	if (iconDto === undefined) {
@@ -41,6 +44,22 @@ function getIconFromIconDto(iconDto?: UriComponents | { light: UriComponents; da
 	}
 }
 
+function toISCMHistoryItem(historyItemDto: SCMHistoryItemDto): ISCMHistoryItem {
+	const references = historyItemDto.references?.map(r => ({
+		...r, icon: getIconFromIconDto(r.icon)
+	}));
+
+	const newLineIndex = historyItemDto.message.indexOf('\n');
+	const subject = newLineIndex === -1 ?
+		historyItemDto.message : `${historyItemDto.message.substring(0, newLineIndex)}\u2026`;
+
+	return { ...historyItemDto, subject, references };
+}
+
+function toISCMHistoryItemRef(historyItemRefDto?: SCMHistoryItemRefDto, color?: ColorIdentifier): ISCMHistoryItemRef | undefined {
+	return historyItemRefDto ? { ...historyItemRefDto, icon: getIconFromIconDto(historyItemRefDto.icon), color: color } : undefined;
+}
+
 class SCMInputBoxContentProvider extends Disposable implements ITextModelContentProvider {
 	constructor(
 		textModelService: ITextModelService,
@@ -153,31 +172,41 @@ class MainThreadSCMResource implements ISCMResource {
 }
 
 class MainThreadSCMHistoryProvider implements ISCMHistoryProvider {
+	private readonly _historyItemRef = observableValueOpts<ISCMHistoryItemRef | undefined>({
+		owner: this,
+		equalsFn: structuralEquals
+	}, undefined);
+	get historyItemRef(): IObservable<ISCMHistoryItemRef | undefined> { return this._historyItemRef; }
 
-	private _onDidChangeCurrentHistoryItemGroup = new Emitter<void>();
-	readonly onDidChangeCurrentHistoryItemGroup = this._onDidChangeCurrentHistoryItemGroup.event;
+	private readonly _historyItemRemoteRef = observableValueOpts<ISCMHistoryItemRef | undefined>({
+		owner: this,
+		equalsFn: structuralEquals
+	}, undefined);
+	get historyItemRemoteRef(): IObservable<ISCMHistoryItemRef | undefined> { return this._historyItemRemoteRef; }
 
-	private _currentHistoryItemGroup: ISCMHistoryItemGroup | undefined;
-	get currentHistoryItemGroup(): ISCMHistoryItemGroup | undefined { return this._currentHistoryItemGroup; }
-	set currentHistoryItemGroup(historyItemGroup: ISCMHistoryItemGroup | undefined) {
-		this._currentHistoryItemGroup = historyItemGroup;
-		this._onDidChangeCurrentHistoryItemGroup.fire();
-	}
+	private readonly _historyItemBaseRef = observableValueOpts<ISCMHistoryItemRef | undefined>({
+		owner: this,
+		equalsFn: structuralEquals
+	}, undefined);
+	get historyItemBaseRef(): IObservable<ISCMHistoryItemRef | undefined> { return this._historyItemBaseRef; }
+
+	private readonly _historyItemRefChanges = observableValue<ISCMHistoryItemRefsChangeEvent>(this, { added: [], modified: [], removed: [], silent: false });
+	get historyItemRefChanges(): IObservable<ISCMHistoryItemRefsChangeEvent> { return this._historyItemRefChanges; }
 
 	constructor(private readonly proxy: ExtHostSCMShape, private readonly handle: number) { }
 
-	async resolveHistoryItemGroupCommonAncestor(historyItemGroupId1: string, historyItemGroupId2: string | undefined): Promise<{ id: string; ahead: number; behind: number } | undefined> {
-		return this.proxy.$resolveHistoryItemGroupCommonAncestor(this.handle, historyItemGroupId1, historyItemGroupId2, CancellationToken.None);
+	async resolveHistoryItemRefsCommonAncestor(historyItemRefs: string[]): Promise<string | undefined> {
+		return this.proxy.$resolveHistoryItemRefsCommonAncestor(this.handle, historyItemRefs, CancellationToken.None);
 	}
 
-	async provideHistoryItems(historyItemGroupId: string, options: ISCMHistoryOptions): Promise<ISCMHistoryItem[] | undefined> {
-		const historyItems = await this.proxy.$provideHistoryItems(this.handle, historyItemGroupId, options, CancellationToken.None);
-		return historyItems?.map(historyItem => ({ ...historyItem, icon: getIconFromIconDto(historyItem.icon) }));
+	async provideHistoryItemRefs(historyItemsRefs?: string[]): Promise<ISCMHistoryItemRef[] | undefined> {
+		const historyItemRefs = await this.proxy.$provideHistoryItemRefs(this.handle, historyItemsRefs, CancellationToken.None);
+		return historyItemRefs?.map(ref => ({ ...ref, icon: getIconFromIconDto(ref.icon) }));
 	}
 
-	async provideHistoryItemSummary(historyItemId: string, historyItemParentId: string | undefined): Promise<ISCMHistoryItem | undefined> {
-		const historyItem = await this.proxy.$provideHistoryItemSummary(this.handle, historyItemId, historyItemParentId, CancellationToken.None);
-		return historyItem ? { ...historyItem, icon: getIconFromIconDto(historyItem.icon) } : undefined;
+	async provideHistoryItems(options: ISCMHistoryOptions): Promise<ISCMHistoryItem[] | undefined> {
+		const historyItems = await this.proxy.$provideHistoryItems(this.handle, options, CancellationToken.None);
+		return historyItems?.map(historyItem => toISCMHistoryItem(historyItem));
 	}
 
 	async provideHistoryItemChanges(historyItemId: string, historyItemParentId: string | undefined): Promise<ISCMHistoryItemChange[] | undefined> {
@@ -190,6 +219,21 @@ class MainThreadSCMHistoryProvider implements ISCMHistoryProvider {
 		}));
 	}
 
+	$onDidChangeCurrentHistoryItemRefs(historyItemRef?: SCMHistoryItemRefDto, historyItemRemoteRef?: SCMHistoryItemRefDto, historyItemBaseRef?: SCMHistoryItemRefDto): void {
+		transaction(tx => {
+			this._historyItemRef.set(toISCMHistoryItemRef(historyItemRef, historyItemRefColor), tx);
+			this._historyItemRemoteRef.set(toISCMHistoryItemRef(historyItemRemoteRef, historyItemRemoteRefColor), tx);
+			this._historyItemBaseRef.set(toISCMHistoryItemRef(historyItemBaseRef, historyItemBaseRefColor), tx);
+		});
+	}
+
+	$onDidChangeHistoryItemRefs(historyItemRefs: SCMHistoryItemRefsChangeEventDto): void {
+		const added = historyItemRefs.added.map(ref => toISCMHistoryItemRef(ref)!);
+		const modified = historyItemRefs.modified.map(ref => toISCMHistoryItemRef(ref)!);
+		const removed = historyItemRefs.removed.map(ref => toISCMHistoryItemRef(ref)!);
+
+		this._historyItemRefChanges.set({ added, modified, removed, silent: historyItemRefs.silent }, undefined);
+	}
 }
 
 class MainThreadSCMProvider implements ISCMProvider, QuickDiffProvider {
@@ -226,16 +270,13 @@ class MainThreadSCMProvider implements ISCMProvider, QuickDiffProvider {
 	get inputBoxTextModel(): ITextModel { return this._inputBoxTextModel; }
 	get contextValue(): string { return this._providerId; }
 
-	get historyProvider(): ISCMHistoryProvider | undefined { return this._historyProvider; }
 	get acceptInputCommand(): Command | undefined { return this.features.acceptInputCommand; }
-	get actionButton(): ISCMActionButtonDescriptor | undefined { return this.features.actionButton ?? undefined; }
-	get statusBarCommands(): Command[] | undefined { return this.features.statusBarCommands; }
 
 	private readonly _count = observableValue<number | undefined>(this, undefined);
 	get count() { return this._count; }
 
-	private readonly _statusBarCommandsObs = observableValue<readonly Command[] | undefined>(this, undefined);
-	get statusBarCommandsObs() { return this._statusBarCommandsObs; }
+	private readonly _statusBarCommands = observableValue<readonly Command[] | undefined>(this, undefined);
+	get statusBarCommands() { return this._statusBarCommands; }
 
 	private readonly _name: string | undefined;
 	get name(): string { return this._name ?? this._label; }
@@ -243,19 +284,14 @@ class MainThreadSCMProvider implements ISCMProvider, QuickDiffProvider {
 	private readonly _commitTemplate = observableValue<string>(this, '');
 	get commitTemplate() { return this._commitTemplate; }
 
-	private readonly _onDidChangeStatusBarCommands = new Emitter<readonly Command[]>();
-	get onDidChangeStatusBarCommands(): Event<readonly Command[]> { return this._onDidChangeStatusBarCommands.event; }
-
-	private readonly _onDidChangeHistoryProvider = new Emitter<void>();
-	readonly onDidChangeHistoryProvider: Event<void> = this._onDidChangeHistoryProvider.event;
-
-	private readonly _onDidChange = new Emitter<void>();
-	readonly onDidChange: Event<void> = this._onDidChange.event;
+	private readonly _actionButton = observableValue<ISCMActionButtonDescriptor | undefined>(this, undefined);
+	get actionButton(): IObservable<ISCMActionButtonDescriptor | undefined> { return this._actionButton; }
 
 	private _quickDiff: IDisposable | undefined;
 	public readonly isSCM: boolean = true;
 
-	private _historyProvider: ISCMHistoryProvider | undefined;
+	private readonly _historyProvider = observableValue<MainThreadSCMHistoryProvider | undefined>(this, undefined);
+	get historyProvider() { return this._historyProvider; }
 
 	constructor(
 		private readonly proxy: ExtHostSCMShape,
@@ -280,19 +316,21 @@ class MainThreadSCMProvider implements ISCMProvider, QuickDiffProvider {
 
 	$updateSourceControl(features: SCMProviderFeatures): void {
 		this.features = { ...this.features, ...features };
-		this._onDidChange.fire();
 
 		if (typeof features.commitTemplate !== 'undefined') {
 			this._commitTemplate.set(features.commitTemplate, undefined);
 		}
 
+		if (typeof features.actionButton !== 'undefined') {
+			this._actionButton.set(features.actionButton, undefined);
+		}
+
 		if (typeof features.count !== 'undefined') {
 			this._count.set(features.count, undefined);
 		}
 
 		if (typeof features.statusBarCommands !== 'undefined') {
-			this._statusBarCommandsObs.set(features.statusBarCommands, undefined);
-			this._onDidChangeStatusBarCommands.fire(this.statusBarCommands!);
+			this._statusBarCommands.set(features.statusBarCommands, undefined);
 		}
 
 		if (features.hasQuickDiffProvider && !this._quickDiff) {
@@ -307,12 +345,11 @@ class MainThreadSCMProvider implements ISCMProvider, QuickDiffProvider {
 			this._quickDiff = undefined;
 		}
 
-		if (features.hasHistoryProvider && !this._historyProvider) {
-			this._historyProvider = new MainThreadSCMHistoryProvider(this.proxy, this.handle);
-			this._onDidChangeHistoryProvider.fire();
-		} else if (features.hasHistoryProvider === false && this._historyProvider) {
-			this._historyProvider = undefined;
-			this._onDidChangeHistoryProvider.fire();
+		if (features.hasHistoryProvider && !this.historyProvider.get()) {
+			const historyProvider = new MainThreadSCMHistoryProvider(this.proxy, this.handle);
+			this._historyProvider.set(historyProvider, undefined);
+		} else if (features.hasHistoryProvider === false && this.historyProvider.get()) {
+			this._historyProvider.set(undefined, undefined);
 		}
 	}
 
@@ -428,12 +465,20 @@ class MainThreadSCMProvider implements ISCMProvider, QuickDiffProvider {
 		return result && URI.revive(result);
 	}
 
-	$onDidChangeHistoryProviderCurrentHistoryItemGroup(currentHistoryItemGroup?: SCMHistoryItemGroupDto): void {
-		if (!this._historyProvider) {
+	$onDidChangeHistoryProviderCurrentHistoryItemRefs(historyItemRef?: SCMHistoryItemRefDto, historyItemRemoteRef?: SCMHistoryItemRefDto, historyItemBaseRef?: SCMHistoryItemRefDto): void {
+		if (!this.historyProvider.get()) {
 			return;
 		}
 
-		this._historyProvider.currentHistoryItemGroup = currentHistoryItemGroup ?? undefined;
+		this._historyProvider.get()?.$onDidChangeCurrentHistoryItemRefs(historyItemRef, historyItemRemoteRef, historyItemBaseRef);
+	}
+
+	$onDidChangeHistoryProviderHistoryItemRefs(historyItemRefs: SCMHistoryItemRefsChangeEventDto): void {
+		if (!this.historyProvider.get()) {
+			return;
+		}
+
+		this._historyProvider.get()?.$onDidChangeHistoryItemRefs(historyItemRefs);
 	}
 
 	toJSON(): any {
@@ -669,7 +714,7 @@ export class MainThreadSCM implements MainThreadSCMShape {
 		}
 	}
 
-	async $onDidChangeHistoryProviderCurrentHistoryItemGroup(sourceControlHandle: number, historyItemGroup: SCMHistoryItemGroupDto | undefined): Promise<void> {
+	async $onDidChangeHistoryProviderCurrentHistoryItemRefs(sourceControlHandle: number, historyItemRef?: SCMHistoryItemRefDto, historyItemRemoteRef?: SCMHistoryItemRefDto, historyItemBaseRef?: SCMHistoryItemRefDto): Promise<void> {
 		await this._repositoryBarriers.get(sourceControlHandle)?.wait();
 		const repository = this._repositories.get(sourceControlHandle);
 
@@ -678,6 +723,18 @@ export class MainThreadSCM implements MainThreadSCMShape {
 		}
 
 		const provider = repository.provider as MainThreadSCMProvider;
-		provider.$onDidChangeHistoryProviderCurrentHistoryItemGroup(historyItemGroup);
+		provider.$onDidChangeHistoryProviderCurrentHistoryItemRefs(historyItemRef, historyItemRemoteRef, historyItemBaseRef);
+	}
+
+	async $onDidChangeHistoryProviderHistoryItemRefs(sourceControlHandle: number, historyItemRefs: SCMHistoryItemRefsChangeEventDto): Promise<void> {
+		await this._repositoryBarriers.get(sourceControlHandle)?.wait();
+		const repository = this._repositories.get(sourceControlHandle);
+
+		if (!repository) {
+			return;
+		}
+
+		const provider = repository.provider as MainThreadSCMProvider;
+		provider.$onDidChangeHistoryProviderHistoryItemRefs(historyItemRefs);
 	}
 }
diff --git a/src/vs/workbench/api/browser/mainThreadSaveParticipant.ts b/src/vs/workbench/api/browser/mainThreadSaveParticipant.ts
index a8c110c2ed4..9070caa10dd 100644
--- a/src/vs/workbench/api/browser/mainThreadSaveParticipant.ts
+++ b/src/vs/workbench/api/browser/mainThreadSaveParticipant.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { shouldSynchronizeModel } from 'vs/editor/common/model';
-import { localize } from 'vs/nls';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IProgressStep, IProgress } from 'vs/platform/progress/common/progress';
-import { extHostCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { ITextFileSaveParticipant, ITextFileService, ITextFileEditorModel, ITextFileSaveParticipantContext } from 'vs/workbench/services/textfile/common/textfiles';
-import { ExtHostContext, ExtHostDocumentSaveParticipantShape } from '../common/extHost.protocol';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { raceCancellationError } from 'vs/base/common/async';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { shouldSynchronizeModel } from '../../../editor/common/model.js';
+import { localize } from '../../../nls.js';
+import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
+import { IProgressStep, IProgress } from '../../../platform/progress/common/progress.js';
+import { extHostCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { ITextFileSaveParticipant, ITextFileService, ITextFileEditorModel, ITextFileSaveParticipantContext } from '../../services/textfile/common/textfiles.js';
+import { ExtHostContext, ExtHostDocumentSaveParticipantShape } from '../common/extHost.protocol.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { raceCancellationError } from '../../../base/common/async.js';
 
 class ExtHostSaveParticipant implements ITextFileSaveParticipant {
 
diff --git a/src/vs/workbench/api/browser/mainThreadSearch.ts b/src/vs/workbench/api/browser/mainThreadSearch.ts
index 9b1af87b574..9f7772a2ffd 100644
--- a/src/vs/workbench/api/browser/mainThreadSearch.ts
+++ b/src/vs/workbench/api/browser/mainThreadSearch.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { DisposableStore, dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { IFileMatch, IFileQuery, IRawFileMatch2, ISearchComplete, ISearchCompleteStats, ISearchProgressItem, ISearchQuery, ISearchResultProvider, ISearchService, ITextQuery, QueryType, SearchProviderType } from 'vs/workbench/services/search/common/search';
-import { ExtHostContext, ExtHostSearchShape, MainContext, MainThreadSearchShape } from '../common/extHost.protocol';
-import { revive } from 'vs/base/common/marshalling';
-import * as Constants from 'vs/workbench/contrib/search/common/constants';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { DisposableStore, dispose, IDisposable } from '../../../base/common/lifecycle.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
+import { ITelemetryService } from '../../../platform/telemetry/common/telemetry.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { IFileMatch, IFileQuery, IRawFileMatch2, ISearchComplete, ISearchCompleteStats, ISearchProgressItem, ISearchQuery, ISearchResultProvider, ISearchService, ITextQuery, QueryType, SearchProviderType } from '../../services/search/common/search.js';
+import { ExtHostContext, ExtHostSearchShape, MainContext, MainThreadSearchShape } from '../common/extHost.protocol.js';
+import { revive } from '../../../base/common/marshalling.js';
+import * as Constants from '../../contrib/search/common/constants.js';
+import { IContextKeyService } from '../../../platform/contextkey/common/contextkey.js';
 
 @extHostNamedCustomer(MainContext.MainThreadSearch)
 export class MainThreadSearch implements MainThreadSearchShape {
@@ -110,6 +110,7 @@ class RemoteSearchProvider implements ISearchResultProvider, IDisposable {
 
 	private readonly _registrations = new DisposableStore();
 	private readonly _searches = new Map<number, SearchOperation>();
+	private cachedAIName: string | undefined;
 
 	constructor(
 		searchService: ISearchService,
@@ -121,6 +122,13 @@ class RemoteSearchProvider implements ISearchResultProvider, IDisposable {
 		this._registrations.add(searchService.registerSearchResultProvider(this._scheme, type, this));
 	}
 
+	async getAIName(): Promise<string | undefined> {
+		if (this.cachedAIName === undefined) {
+			this.cachedAIName = await this._proxy.$getAIName(this._handle);
+		}
+		return this.cachedAIName;
+	}
+
 	dispose(): void {
 		this._registrations.dispose();
 	}
diff --git a/src/vs/workbench/api/browser/mainThreadSecretState.ts b/src/vs/workbench/api/browser/mainThreadSecretState.ts
index 2c70d06f1ac..4fe8ac9c74d 100644
--- a/src/vs/workbench/api/browser/mainThreadSecretState.ts
+++ b/src/vs/workbench/api/browser/mainThreadSecretState.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { ExtHostContext, ExtHostSecretStateShape, MainContext, MainThreadSecretStateShape } from '../common/extHost.protocol';
-import { ILogService } from 'vs/platform/log/common/log';
-import { SequencerByKey } from 'vs/base/common/async';
-import { ISecretStorageService } from 'vs/platform/secrets/common/secrets';
-import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { ExtHostContext, ExtHostSecretStateShape, MainContext, MainThreadSecretStateShape } from '../common/extHost.protocol.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { SequencerByKey } from '../../../base/common/async.js';
+import { ISecretStorageService } from '../../../platform/secrets/common/secrets.js';
+import { IBrowserWorkbenchEnvironmentService } from '../../services/environment/browser/environmentService.js';
 
 @extHostNamedCustomer(MainContext.MainThreadSecretState)
 export class MainThreadSecretState extends Disposable implements MainThreadSecretStateShape {
diff --git a/src/vs/workbench/api/browser/mainThreadShare.ts b/src/vs/workbench/api/browser/mainThreadShare.ts
index d517c23c906..cb63bb3fd03 100644
--- a/src/vs/workbench/api/browser/mainThreadShare.ts
+++ b/src/vs/workbench/api/browser/mainThreadShare.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { ExtHostContext, ExtHostShareShape, IDocumentFilterDto, MainContext, MainThreadShareShape } from 'vs/workbench/api/common/extHost.protocol';
-import { IShareProvider, IShareService, IShareableItem } from 'vs/workbench/contrib/share/common/share';
-import { IExtHostContext, extHostNamedCustomer } from 'vs/workbench/services/extensions/common/extHostCustomers';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { IDisposable, dispose } from '../../../base/common/lifecycle.js';
+import { URI } from '../../../base/common/uri.js';
+import { ExtHostContext, ExtHostShareShape, IDocumentFilterDto, MainContext, MainThreadShareShape } from '../common/extHost.protocol.js';
+import { IShareProvider, IShareService, IShareableItem } from '../../contrib/share/common/share.js';
+import { IExtHostContext, extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 
 @extHostNamedCustomer(MainContext.MainThreadShare)
 export class MainThreadShare implements MainThreadShareShape {
diff --git a/src/vs/workbench/api/browser/mainThreadSpeech.ts b/src/vs/workbench/api/browser/mainThreadSpeech.ts
index 6dbb9033772..e2e0ad577a5 100644
--- a/src/vs/workbench/api/browser/mainThreadSpeech.ts
+++ b/src/vs/workbench/api/browser/mainThreadSpeech.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { raceCancellation } from 'vs/base/common/async';
-import { Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ExtHostContext, ExtHostSpeechShape, MainContext, MainThreadSpeechShape } from 'vs/workbench/api/common/extHost.protocol';
-import { IKeywordRecognitionEvent, ISpeechProviderMetadata, ISpeechService, ISpeechToTextEvent, ITextToSpeechEvent, TextToSpeechStatus } from 'vs/workbench/contrib/speech/common/speechService';
-import { IExtHostContext, extHostNamedCustomer } from 'vs/workbench/services/extensions/common/extHostCustomers';
+import { raceCancellation } from '../../../base/common/async.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { DisposableStore, IDisposable } from '../../../base/common/lifecycle.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { ExtHostContext, ExtHostSpeechShape, MainContext, MainThreadSpeechShape } from '../common/extHost.protocol.js';
+import { IKeywordRecognitionEvent, ISpeechProviderMetadata, ISpeechService, ISpeechToTextEvent, ITextToSpeechEvent, TextToSpeechStatus } from '../../contrib/speech/common/speechService.js';
+import { IExtHostContext, extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 
 type SpeechToTextSession = {
 	readonly onDidChange: Emitter<ISpeechToTextEvent>;
diff --git a/src/vs/workbench/api/browser/mainThreadStatusBar.ts b/src/vs/workbench/api/browser/mainThreadStatusBar.ts
index 00eb17f4982..4988e519f39 100644
--- a/src/vs/workbench/api/browser/mainThreadStatusBar.ts
+++ b/src/vs/workbench/api/browser/mainThreadStatusBar.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { MainThreadStatusBarShape, MainContext, ExtHostContext, StatusBarItemDto } from '../common/extHost.protocol';
-import { ThemeColor } from 'vs/base/common/themables';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { Command } from 'vs/editor/common/languages';
-import { IAccessibilityInformation } from 'vs/platform/accessibility/common/accessibility';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { IExtensionStatusBarItemService, StatusBarUpdateKind } from 'vs/workbench/api/browser/statusBarExtensionPoint';
-import { IStatusbarEntry, StatusbarAlignment } from 'vs/workbench/services/statusbar/browser/statusbar';
+import { MainThreadStatusBarShape, MainContext, ExtHostContext, StatusBarItemDto } from '../common/extHost.protocol.js';
+import { ThemeColor } from '../../../base/common/themables.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { DisposableStore, toDisposable } from '../../../base/common/lifecycle.js';
+import { Command } from '../../../editor/common/languages.js';
+import { IAccessibilityInformation } from '../../../platform/accessibility/common/accessibility.js';
+import { IMarkdownString } from '../../../base/common/htmlContent.js';
+import { IExtensionStatusBarItemService, StatusBarUpdateKind } from './statusBarExtensionPoint.js';
+import { IStatusbarEntry, StatusbarAlignment } from '../../services/statusbar/browser/statusbar.js';
 
 @extHostNamedCustomer(MainContext.MainThreadStatusBar)
 export class MainThreadStatusBar implements MainThreadStatusBarShape {
diff --git a/src/vs/workbench/api/browser/mainThreadStorage.ts b/src/vs/workbench/api/browser/mainThreadStorage.ts
index 1d2fa2d8074..a801e971391 100644
--- a/src/vs/workbench/api/browser/mainThreadStorage.ts
+++ b/src/vs/workbench/api/browser/mainThreadStorage.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
-import { MainThreadStorageShape, MainContext, ExtHostStorageShape, ExtHostContext } from '../common/extHost.protocol';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { isWeb } from 'vs/base/common/platform';
-import { IExtensionIdWithVersion, IExtensionStorageService } from 'vs/platform/extensionManagement/common/extensionStorage';
-import { migrateExtensionStorage } from 'vs/workbench/services/extensions/common/extensionStorageMigration';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
+import { IStorageService, StorageScope } from '../../../platform/storage/common/storage.js';
+import { MainThreadStorageShape, MainContext, ExtHostStorageShape, ExtHostContext } from '../common/extHost.protocol.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { isWeb } from '../../../base/common/platform.js';
+import { IExtensionIdWithVersion, IExtensionStorageService } from '../../../platform/extensionManagement/common/extensionStorage.js';
+import { migrateExtensionStorage } from '../../services/extensions/common/extensionStorageMigration.js';
+import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../platform/log/common/log.js';
 
 @extHostNamedCustomer(MainContext.MainThreadStorage)
 export class MainThreadStorage implements MainThreadStorageShape {
diff --git a/src/vs/workbench/api/browser/mainThreadTask.ts b/src/vs/workbench/api/browser/mainThreadTask.ts
index 9c37c597978..52e977fe25d 100644
--- a/src/vs/workbench/api/browser/mainThreadTask.ts
+++ b/src/vs/workbench/api/browser/mainThreadTask.ts
@@ -3,37 +3,38 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
+import * as nls from '../../../nls.js';
 
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import * as Types from 'vs/base/common/types';
-import * as Platform from 'vs/base/common/platform';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { generateUuid } from '../../../base/common/uuid.js';
+import * as Types from '../../../base/common/types.js';
+import * as Platform from '../../../base/common/platform.js';
+import { IStringDictionary } from '../../../base/common/collections.js';
+import { Disposable, IDisposable } from '../../../base/common/lifecycle.js';
 
-import { IWorkspace, IWorkspaceContextService, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
+import { IWorkspace, IWorkspaceContextService, IWorkspaceFolder } from '../../../platform/workspace/common/workspace.js';
 
 import {
 	ContributedTask, ConfiguringTask, KeyedTaskIdentifier, ITaskExecution, Task, ITaskEvent, TaskEventKind,
 	IPresentationOptions, CommandOptions, ICommandConfiguration, RuntimeType, CustomTask, TaskScope, TaskSource,
 	TaskSourceKind, IExtensionTaskSource, IRunOptions, ITaskSet, TaskGroup, TaskDefinition, PresentationOptions, RunOptions
-} from 'vs/workbench/contrib/tasks/common/tasks';
+} from '../../contrib/tasks/common/tasks.js';
 
 
-import { IResolveSet, IResolvedVariables } from 'vs/workbench/contrib/tasks/common/taskSystem';
-import { ITaskService, ITaskFilter, ITaskProvider } from 'vs/workbench/contrib/tasks/common/taskService';
+import { IResolveSet, IResolvedVariables } from '../../contrib/tasks/common/taskSystem.js';
+import { ITaskService, ITaskFilter, ITaskProvider } from '../../contrib/tasks/common/taskService.js';
 
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { ExtHostContext, MainThreadTaskShape, ExtHostTaskShape, MainContext } from 'vs/workbench/api/common/extHost.protocol';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { ExtHostContext, MainThreadTaskShape, ExtHostTaskShape, MainContext } from '../common/extHost.protocol.js';
 import {
 	ITaskDefinitionDTO, ITaskExecutionDTO, IProcessExecutionOptionsDTO, ITaskPresentationOptionsDTO,
 	IProcessExecutionDTO, IShellExecutionDTO, IShellExecutionOptionsDTO, ICustomExecutionDTO, ITaskDTO, ITaskSourceDTO, ITaskHandleDTO, ITaskFilterDTO, ITaskProcessStartedDTO, ITaskProcessEndedDTO, ITaskSystemInfoDTO,
 	IRunOptionsDTO, ITaskGroupDTO
-} from 'vs/workbench/api/common/shared/tasks';
-import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
-import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
-import { ErrorNoTelemetry } from 'vs/base/common/errors';
+} from '../common/shared/tasks.js';
+import { IConfigurationResolverService } from '../../services/configurationResolver/common/configurationResolver.js';
+import { ConfigurationTarget } from '../../../platform/configuration/common/configuration.js';
+import { ErrorNoTelemetry } from '../../../base/common/errors.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
 
 namespace TaskExecutionDTO {
 	export function from(value: ITaskExecution): ITaskExecutionDTO {
@@ -489,10 +490,14 @@ export class MainThreadTask extends Disposable implements MainThreadTaskShape {
 							console.error(`Task System: can not convert task: ${JSON.stringify(dto.definition, undefined, 0)}. Task will be dropped`);
 						}
 					}
+					const processedExtension: IExtensionDescription = {
+						...value.extension,
+						extensionLocation: URI.revive(value.extension.extensionLocation)
+					};
 					return {
 						tasks,
-						extension: value.extension
-					} as ITaskSet;
+						extension: processedExtension
+					} satisfies ITaskSet;
 				});
 			},
 			resolveTask: (task: ConfiguringTask) => {
diff --git a/src/vs/workbench/api/browser/mainThreadTelemetry.ts b/src/vs/workbench/api/browser/mainThreadTelemetry.ts
index 1728a106f61..ab72a2abdf8 100644
--- a/src/vs/workbench/api/browser/mainThreadTelemetry.ts
+++ b/src/vs/workbench/api/browser/mainThreadTelemetry.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ClassifiedEvent, IGDPRProperty, OmitMetadata, StrictPropertyCheck } from 'vs/platform/telemetry/common/gdprTypings';
-import { ITelemetryService, TelemetryLevel, TELEMETRY_OLD_SETTING_ID, TELEMETRY_SETTING_ID } from 'vs/platform/telemetry/common/telemetry';
-import { supportsTelemetry } from 'vs/platform/telemetry/common/telemetryUtils';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { ExtHostContext, ExtHostTelemetryShape, MainContext, MainThreadTelemetryShape } from '../common/extHost.protocol';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
+import { IEnvironmentService } from '../../../platform/environment/common/environment.js';
+import { IProductService } from '../../../platform/product/common/productService.js';
+import { ClassifiedEvent, IGDPRProperty, OmitMetadata, StrictPropertyCheck } from '../../../platform/telemetry/common/gdprTypings.js';
+import { ITelemetryService, TelemetryLevel, TELEMETRY_OLD_SETTING_ID, TELEMETRY_SETTING_ID } from '../../../platform/telemetry/common/telemetry.js';
+import { supportsTelemetry } from '../../../platform/telemetry/common/telemetryUtils.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { ExtHostContext, ExtHostTelemetryShape, MainContext, MainThreadTelemetryShape } from '../common/extHost.protocol.js';
 
 @extHostNamedCustomer(MainContext.MainThreadTelemetry)
 export class MainThreadTelemetry extends Disposable implements MainThreadTelemetryShape {
diff --git a/src/vs/workbench/api/browser/mainThreadTerminalService.ts b/src/vs/workbench/api/browser/mainThreadTerminalService.ts
index 663c3fa5728..b184d49085b 100644
--- a/src/vs/workbench/api/browser/mainThreadTerminalService.ts
+++ b/src/vs/workbench/api/browser/mainThreadTerminalService.ts
@@ -3,27 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DisposableStore, Disposable, IDisposable, MutableDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
-import { ExtHostContext, ExtHostTerminalServiceShape, MainThreadTerminalServiceShape, MainContext, TerminalLaunchConfig, ITerminalDimensionsDto, ExtHostTerminalIdentifier, TerminalQuickFix, ITerminalCommandDto } from 'vs/workbench/api/common/extHost.protocol';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { URI } from 'vs/base/common/uri';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProcessProperty, IProcessReadyWindowsPty, IShellLaunchConfig, IShellLaunchConfigDto, ITerminalOutputMatch, ITerminalOutputMatcher, ProcessPropertyType, TerminalExitReason, TerminalLocation } from 'vs/platform/terminal/common/terminal';
-import { TerminalDataBufferer } from 'vs/platform/terminal/common/terminalDataBuffering';
-import { ITerminalEditorService, ITerminalExternalLinkProvider, ITerminalGroupService, ITerminalInstance, ITerminalLink, ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { TerminalProcessExtHostProxy } from 'vs/workbench/contrib/terminal/browser/terminalProcessExtHostProxy';
-import { IEnvironmentVariableService } from 'vs/workbench/contrib/terminal/common/environmentVariable';
-import { deserializeEnvironmentDescriptionMap, deserializeEnvironmentVariableCollection, serializeEnvironmentVariableCollection } from 'vs/platform/terminal/common/environmentVariableShared';
-import { IStartExtensionTerminalRequest, ITerminalProcessExtHostProxy, ITerminalProfileResolverService, ITerminalProfileService } from 'vs/workbench/contrib/terminal/common/terminal';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { OperatingSystem, OS } from 'vs/base/common/platform';
+import { DisposableStore, Disposable, IDisposable, MutableDisposable, combinedDisposable } from '../../../base/common/lifecycle.js';
+import { ExtHostContext, ExtHostTerminalServiceShape, MainThreadTerminalServiceShape, MainContext, TerminalLaunchConfig, ITerminalDimensionsDto, ExtHostTerminalIdentifier, TerminalQuickFix, ITerminalCommandDto } from '../common/extHost.protocol.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { URI } from '../../../base/common/uri.js';
+import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { IProcessProperty, IProcessReadyWindowsPty, IShellLaunchConfig, IShellLaunchConfigDto, ITerminalOutputMatch, ITerminalOutputMatcher, ProcessPropertyType, TerminalExitReason, TerminalLocation } from '../../../platform/terminal/common/terminal.js';
+import { TerminalDataBufferer } from '../../../platform/terminal/common/terminalDataBuffering.js';
+import { ITerminalEditorService, ITerminalExternalLinkProvider, ITerminalGroupService, ITerminalInstance, ITerminalLink, ITerminalService } from '../../contrib/terminal/browser/terminal.js';
+import { TerminalProcessExtHostProxy } from '../../contrib/terminal/browser/terminalProcessExtHostProxy.js';
+import { IEnvironmentVariableService } from '../../contrib/terminal/common/environmentVariable.js';
+import { deserializeEnvironmentDescriptionMap, deserializeEnvironmentVariableCollection, serializeEnvironmentVariableCollection } from '../../../platform/terminal/common/environmentVariableShared.js';
+import { IStartExtensionTerminalRequest, ITerminalProcessExtHostProxy, ITerminalProfileResolverService, ITerminalProfileService } from '../../contrib/terminal/common/terminal.js';
+import { IRemoteAgentService } from '../../services/remote/common/remoteAgentService.js';
+import { OperatingSystem, OS } from '../../../base/common/platform.js';
 import { TerminalEditorLocationOptions } from 'vscode';
-import { Promises } from 'vs/base/common/async';
-import { ISerializableEnvironmentDescriptionMap, ISerializableEnvironmentVariableCollection } from 'vs/platform/terminal/common/environmentVariable';
-import { ITerminalLinkProviderService } from 'vs/workbench/contrib/terminalContrib/links/browser/links';
-import { ITerminalQuickFixService, ITerminalQuickFix, TerminalQuickFixType } from 'vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix';
-import { TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
+import { Promises } from '../../../base/common/async.js';
+import { ISerializableEnvironmentDescriptionMap, ISerializableEnvironmentVariableCollection } from '../../../platform/terminal/common/environmentVariable.js';
+import { ITerminalLinkProviderService } from '../../contrib/terminalContrib/links/browser/links.js';
+import { ITerminalQuickFixService, ITerminalQuickFix, TerminalQuickFixType } from '../../contrib/terminalContrib/quickFix/browser/quickFix.js';
+import { TerminalCapability } from '../../../platform/terminal/common/capabilities/capabilities.js';
 
 @extHostNamedCustomer(MainContext.MainThreadTerminalService)
 export class MainThreadTerminalService implements MainThreadTerminalServiceShape {
diff --git a/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts b/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts
index 21092bb8bfe..de804627baf 100644
--- a/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts
+++ b/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { Disposable, toDisposable, type IDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { TerminalCapability, type ITerminalCommand } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { ExtHostContext, MainContext, type ExtHostTerminalShellIntegrationShape, type MainThreadTerminalShellIntegrationShape } from 'vs/workbench/api/common/extHost.protocol';
-import { ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { extHostNamedCustomer, type IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { TerminalShellExecutionCommandLineConfidence } from 'vs/workbench/api/common/extHostTypes';
+import { Event } from '../../../base/common/event.js';
+import { Disposable, toDisposable, type IDisposable } from '../../../base/common/lifecycle.js';
+import { URI } from '../../../base/common/uri.js';
+import { TerminalCapability, type ITerminalCommand } from '../../../platform/terminal/common/capabilities/capabilities.js';
+import { ExtHostContext, MainContext, type ExtHostTerminalShellIntegrationShape, type MainThreadTerminalShellIntegrationShape } from '../common/extHost.protocol.js';
+import { ITerminalService } from '../../contrib/terminal/browser/terminal.js';
+import { IWorkbenchEnvironmentService } from '../../services/environment/common/environmentService.js';
+import { extHostNamedCustomer, type IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { TerminalShellExecutionCommandLineConfidence } from '../common/extHostTypes.js';
 
 @extHostNamedCustomer(MainContext.MainThreadTerminalShellIntegration)
 export class MainThreadTerminalShellIntegration extends Disposable implements MainThreadTerminalShellIntegrationShape {
@@ -60,7 +60,7 @@ export class MainThreadTerminalShellIntegration extends Disposable implements Ma
 			// TerminalShellExecution.createDataStream
 			// Debounce events to reduce the message count - when this listener is disposed the events will be flushed
 			instanceDataListeners.get(instanceId)?.dispose();
-			instanceDataListeners.set(instanceId, Event.accumulate(e.instance.onData, 50, this._store)(events => this._proxy.$shellExecutionData(instanceId, events.join())));
+			instanceDataListeners.set(instanceId, Event.accumulate(e.instance.onData, 50, this._store)(events => this._proxy.$shellExecutionData(instanceId, events.join(''))));
 		}));
 
 		// onDidEndTerminalShellExecution
diff --git a/src/vs/workbench/api/browser/mainThreadTesting.ts b/src/vs/workbench/api/browser/mainThreadTesting.ts
index a3641b6687a..b2369b89fad 100644
--- a/src/vs/workbench/api/browser/mainThreadTesting.ts
+++ b/src/vs/workbench/api/browser/mainThreadTesting.ts
@@ -3,25 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore, IDisposable, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { ISettableObservable, transaction } from 'vs/base/common/observable';
-import { WellDefinedPrefixTree } from 'vs/base/common/prefixTree';
-import { URI } from 'vs/base/common/uri';
-import { Range } from 'vs/editor/common/core/range';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { MutableObservableValue } from 'vs/workbench/contrib/testing/common/observableValue';
-import { TestCoverage } from 'vs/workbench/contrib/testing/common/testCoverage';
-import { TestId } from 'vs/workbench/contrib/testing/common/testId';
-import { ITestProfileService } from 'vs/workbench/contrib/testing/common/testProfileService';
-import { LiveTestResult } from 'vs/workbench/contrib/testing/common/testResult';
-import { ITestResultService } from 'vs/workbench/contrib/testing/common/testResultService';
-import { IMainThreadTestController, ITestService } from 'vs/workbench/contrib/testing/common/testService';
-import { CoverageDetails, ExtensionRunTestsRequest, IFileCoverage, ITestItem, ITestMessage, ITestRunProfile, ITestRunTask, ResolvedTestRunRequest, TestResultState, TestRunProfileBitset, TestsDiffOp } from 'vs/workbench/contrib/testing/common/testTypes';
-import { IExtHostContext, extHostNamedCustomer } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { ExtHostContext, ExtHostTestingShape, ILocationDto, ITestControllerPatch, MainContext, MainThreadTestingShape } from '../common/extHost.protocol';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Event } from '../../../base/common/event.js';
+import { Disposable, DisposableStore, IDisposable, MutableDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { ISettableObservable, observableValue, transaction } from '../../../base/common/observable.js';
+import { WellDefinedPrefixTree } from '../../../base/common/prefixTree.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { Range } from '../../../editor/common/core/range.js';
+import { IUriIdentityService } from '../../../platform/uriIdentity/common/uriIdentity.js';
+import { TestCoverage } from '../../contrib/testing/common/testCoverage.js';
+import { TestId } from '../../contrib/testing/common/testId.js';
+import { ITestProfileService } from '../../contrib/testing/common/testProfileService.js';
+import { LiveTestResult } from '../../contrib/testing/common/testResult.js';
+import { ITestResultService } from '../../contrib/testing/common/testResultService.js';
+import { IMainThreadTestController, ITestService } from '../../contrib/testing/common/testService.js';
+import { CoverageDetails, ExtensionRunTestsRequest, IFileCoverage, ITestItem, ITestMessage, ITestRunProfile, ITestRunTask, ResolvedTestRunRequest, TestControllerCapability, TestResultState, TestRunProfileBitset, TestsDiffOp } from '../../contrib/testing/common/testTypes.js';
+import { IExtHostContext, extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { ExtHostContext, ExtHostTestingShape, ILocationDto, ITestControllerPatch, MainContext, MainThreadTestingShape } from '../common/extHost.protocol.js';
 
 @extHostNamedCustomer(MainContext.MainThreadTesting)
 export class MainThreadTesting extends Disposable implements MainThreadTestingShape {
@@ -29,8 +28,8 @@ export class MainThreadTesting extends Disposable implements MainThreadTestingSh
 	private readonly diffListener = this._register(new MutableDisposable());
 	private readonly testProviderRegistrations = new Map<string, {
 		instance: IMainThreadTestController;
-		label: MutableObservableValue<string>;
-		canRefresh: MutableObservableValue<boolean>;
+		label: ISettableObservable<string>;
+		capabilities: ISettableObservable<TestControllerCapability>;
 		disposable: IDisposable;
 	}>();
 
@@ -48,10 +47,11 @@ export class MainThreadTesting extends Disposable implements MainThreadTestingSh
 			provideTestFollowups: (req, token) => this.proxy.$provideTestFollowups(req, token),
 			executeTestFollowup: id => this.proxy.$executeTestFollowup(id),
 			disposeTestFollowups: ids => this.proxy.$disposeTestFollowups(ids),
+			getTestsRelatedToCode: (uri, position, token) => this.proxy.$getTestsRelatedToCode(uri, position, token),
 		}));
 
-		this._register(this.testService.onDidCancelTestRun(({ runId }) => {
-			this.proxy.$cancelExtensionTestRun(runId);
+		this._register(this.testService.onDidCancelTestRun(({ runId, taskId }) => {
+			this.proxy.$cancelExtensionTestRun(runId, taskId);
 		}));
 
 		this._register(Event.debounce(testProfiles.onDidChange, (_last, e) => e)(() => {
@@ -150,7 +150,7 @@ export class MainThreadTesting extends Disposable implements MainThreadTestingSh
 				let value = task.coverage.read(undefined);
 				if (!value) {
 					value = new TestCoverage(run, taskId, this.uriIdentityService, {
-						getCoverageDetails: (id, token) => this.proxy.$getCoverageDetails(id, token)
+						getCoverageDetails: (id, testId, token) => this.proxy.$getCoverageDetails(id, testId, token)
 							.then(r => r.map(CoverageDetails.deserialize)),
 					});
 					value.append(deserialized, tx);
@@ -225,20 +225,26 @@ export class MainThreadTesting extends Disposable implements MainThreadTestingSh
 	/**
 	 * @inheritdoc
 	 */
-	public $registerTestController(controllerId: string, labelStr: string, canRefreshValue: boolean) {
+	public $registerTestController(controllerId: string, _label: string, _capabilities: TestControllerCapability) {
 		const disposable = new DisposableStore();
-		const label = disposable.add(new MutableObservableValue(labelStr));
-		const canRefresh = disposable.add(new MutableObservableValue(canRefreshValue));
+		const label = observableValue(`${controllerId}.label`, _label);
+		const capabilities = observableValue(`${controllerId}.cap`, _capabilities);
 		const controller: IMainThreadTestController = {
 			id: controllerId,
 			label,
-			canRefresh,
+			capabilities,
 			syncTests: () => this.proxy.$syncTests(),
 			refreshTests: token => this.proxy.$refreshTests(controllerId, token),
 			configureRunProfile: id => this.proxy.$configureRunProfile(controllerId, id),
 			runTests: (reqs, token) => this.proxy.$runControllerTests(reqs, token),
 			startContinuousRun: (reqs, token) => this.proxy.$startContinuousRun(reqs, token),
 			expandTest: (testId, levels) => this.proxy.$expandTest(testId, isFinite(levels) ? levels : -1),
+			getRelatedCode: (testId, token) => this.proxy.$getCodeRelatedToTest(testId, token).then(locations =>
+				locations.map(l => ({
+					uri: URI.revive(l.uri),
+					range: Range.lift(l.range)
+				})),
+			),
 		};
 
 		disposable.add(toDisposable(() => this.testProfiles.removeProfile(controllerId)));
@@ -247,7 +253,7 @@ export class MainThreadTesting extends Disposable implements MainThreadTestingSh
 		this.testProviderRegistrations.set(controllerId, {
 			instance: controller,
 			label,
-			canRefresh,
+			capabilities,
 			disposable
 		});
 	}
@@ -261,13 +267,16 @@ export class MainThreadTesting extends Disposable implements MainThreadTestingSh
 			return;
 		}
 
-		if (patch.label !== undefined) {
-			controller.label.value = patch.label;
-		}
+		transaction(tx => {
+			if (patch.label !== undefined) {
+				controller.label.set(patch.label, tx);
+			}
+
+			if (patch.capabilities !== undefined) {
+				controller.capabilities.set(patch.capabilities, tx);
+			}
+		});
 
-		if (patch.canRefresh !== undefined) {
-			controller.canRefresh.value = patch.canRefresh;
-		}
 	}
 
 	/**
@@ -301,11 +310,29 @@ export class MainThreadTesting extends Disposable implements MainThreadTestingSh
 			diff.map(d => TestsDiffOp.deserialize(this.uriIdentityService, d)));
 	}
 
+	/**
+	 * @inheritdoc
+	 */
 	public async $runTests(req: ResolvedTestRunRequest, token: CancellationToken): Promise<string> {
 		const result = await this.testService.runResolvedTests(req, token);
 		return result.id;
 	}
 
+	/**
+	 * @inheritdoc
+	 */
+	public async $getCoverageDetails(resultId: string, taskIndex: number, uri: UriComponents, token: CancellationToken): Promise<CoverageDetails.Serialized[]> {
+		const details = await this.resultService.getResult(resultId)
+			?.tasks[taskIndex]
+			?.coverage.get()
+			?.getUri(URI.from(uri))
+			?.details(token);
+
+		// Return empty if nothing. Some failure is always possible here because
+		// results might be cleared in the meantime.
+		return details || [];
+	}
+
 	public override dispose() {
 		super.dispose();
 		for (const subscription of this.testProviderRegistrations.values()) {
diff --git a/src/vs/workbench/api/browser/mainThreadTheming.ts b/src/vs/workbench/api/browser/mainThreadTheming.ts
index 083da270ba3..9b5bd6eeeda 100644
--- a/src/vs/workbench/api/browser/mainThreadTheming.ts
+++ b/src/vs/workbench/api/browser/mainThreadTheming.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { MainContext, ExtHostThemingShape, ExtHostContext, MainThreadThemingShape } from '../common/extHost.protocol';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { MainContext, ExtHostThemingShape, ExtHostContext, MainThreadThemingShape } from '../common/extHost.protocol.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { IThemeService } from '../../../platform/theme/common/themeService.js';
 
 @extHostNamedCustomer(MainContext.MainThreadTheming)
 export class MainThreadTheming implements MainThreadThemingShape {
diff --git a/src/vs/workbench/api/browser/mainThreadTimeline.ts b/src/vs/workbench/api/browser/mainThreadTimeline.ts
index 1cffecdef90..a7c61df1f39 100644
--- a/src/vs/workbench/api/browser/mainThreadTimeline.ts
+++ b/src/vs/workbench/api/browser/mainThreadTimeline.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { URI } from 'vs/base/common/uri';
-import { ILogService } from 'vs/platform/log/common/log';
-import { MainContext, MainThreadTimelineShape, ExtHostTimelineShape, ExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { TimelineChangeEvent, TimelineOptions, TimelineProviderDescriptor, ITimelineService, Timeline } from 'vs/workbench/contrib/timeline/common/timeline';
-import { revive } from 'vs/base/common/marshalling';
+import { Emitter } from '../../../base/common/event.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { URI } from '../../../base/common/uri.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { MainContext, MainThreadTimelineShape, ExtHostTimelineShape, ExtHostContext } from '../common/extHost.protocol.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { TimelineChangeEvent, TimelineOptions, TimelineProviderDescriptor, ITimelineService, Timeline } from '../../contrib/timeline/common/timeline.js';
+import { revive } from '../../../base/common/marshalling.js';
 
 @extHostNamedCustomer(MainContext.MainThreadTimeline)
 export class MainThreadTimeline implements MainThreadTimelineShape {
diff --git a/src/vs/workbench/api/browser/mainThreadTreeViews.ts b/src/vs/workbench/api/browser/mainThreadTreeViews.ts
index eefa3c78a7f..2671f5b3880 100644
--- a/src/vs/workbench/api/browser/mainThreadTreeViews.ts
+++ b/src/vs/workbench/api/browser/mainThreadTreeViews.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, DisposableMap, DisposableStore } from 'vs/base/common/lifecycle';
-import { ExtHostContext, MainThreadTreeViewsShape, ExtHostTreeViewsShape, MainContext, CheckboxUpdate } from 'vs/workbench/api/common/extHost.protocol';
-import { ITreeViewDataProvider, ITreeItem, ITreeView, IViewsRegistry, ITreeViewDescriptor, IRevealOptions, Extensions, ResolvableTreeItem, ITreeViewDragAndDropController, IViewBadge, NoTreeViewError } from 'vs/workbench/common/views';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { distinct } from 'vs/base/common/arrays';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { isUndefinedOrNull, isNumber } from 'vs/base/common/types';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { ILogService } from 'vs/platform/log/common/log';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { createStringDataTransferItem, VSDataTransfer } from 'vs/base/common/dataTransfer';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { DataTransferFileCache } from 'vs/workbench/api/common/shared/dataTransferCache';
-import * as typeConvert from 'vs/workbench/api/common/extHostTypeConverters';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
+import { Disposable, DisposableMap, DisposableStore } from '../../../base/common/lifecycle.js';
+import { ExtHostContext, MainThreadTreeViewsShape, ExtHostTreeViewsShape, MainContext, CheckboxUpdate } from '../common/extHost.protocol.js';
+import { ITreeViewDataProvider, ITreeItem, ITreeView, IViewsRegistry, ITreeViewDescriptor, IRevealOptions, Extensions, ResolvableTreeItem, ITreeViewDragAndDropController, IViewBadge, NoTreeViewError } from '../../common/views.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { distinct } from '../../../base/common/arrays.js';
+import { INotificationService } from '../../../platform/notification/common/notification.js';
+import { isUndefinedOrNull, isNumber } from '../../../base/common/types.js';
+import { Registry } from '../../../platform/registry/common/platform.js';
+import { IExtensionService } from '../../services/extensions/common/extensions.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { createStringDataTransferItem, VSDataTransfer } from '../../../base/common/dataTransfer.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { DataTransferFileCache } from '../common/shared/dataTransferCache.js';
+import * as typeConvert from '../common/extHostTypeConverters.js';
+import { IMarkdownString } from '../../../base/common/htmlContent.js';
+import { IViewsService } from '../../services/views/common/viewsService.js';
 
 @extHostNamedCustomer(MainContext.MainThreadTreeViews)
 export class MainThreadTreeViews extends Disposable implements MainThreadTreeViewsShape {
diff --git a/src/vs/workbench/api/browser/mainThreadTunnelService.ts b/src/vs/workbench/api/browser/mainThreadTunnelService.ts
index 5b8cf2637fc..4aa5a7c1d48 100644
--- a/src/vs/workbench/api/browser/mainThreadTunnelService.ts
+++ b/src/vs/workbench/api/browser/mainThreadTunnelService.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { MainThreadTunnelServiceShape, MainContext, ExtHostContext, ExtHostTunnelServiceShape, CandidatePortSource, PortAttributesSelector, TunnelDto } from 'vs/workbench/api/common/extHost.protocol';
-import { TunnelDtoConverter } from 'vs/workbench/api/common/extHostTunnelService';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { IRemoteExplorerService, PORT_AUTO_FORWARD_SETTING, PORT_AUTO_SOURCE_SETTING, PORT_AUTO_SOURCE_SETTING_HYBRID, PORT_AUTO_SOURCE_SETTING_OUTPUT } from 'vs/workbench/services/remote/common/remoteExplorerService';
-import { ITunnelProvider, ITunnelService, TunnelCreationOptions, TunnelProviderFeatures, TunnelOptions, RemoteTunnel, ProvidedPortAttributes, PortAttributesProvider, TunnelProtocol } from 'vs/platform/tunnel/common/tunnel';
-import { Disposable } from 'vs/base/common/lifecycle';
-import type { TunnelDescription } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { CandidatePort, TunnelCloseReason, TunnelSource, forwardedPortsViewEnabled, makeAddress } from 'vs/workbench/services/remote/common/tunnelModel';
+import * as nls from '../../../nls.js';
+import { MainThreadTunnelServiceShape, MainContext, ExtHostContext, ExtHostTunnelServiceShape, CandidatePortSource, PortAttributesSelector, TunnelDto } from '../common/extHost.protocol.js';
+import { TunnelDtoConverter } from '../common/extHostTunnelService.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { IRemoteExplorerService, PORT_AUTO_FORWARD_SETTING, PORT_AUTO_SOURCE_SETTING, PORT_AUTO_SOURCE_SETTING_HYBRID, PORT_AUTO_SOURCE_SETTING_OUTPUT, PortsEnablement } from '../../services/remote/common/remoteExplorerService.js';
+import { ITunnelProvider, ITunnelService, TunnelCreationOptions, TunnelProviderFeatures, TunnelOptions, RemoteTunnel, ProvidedPortAttributes, PortAttributesProvider, TunnelProtocol } from '../../../platform/tunnel/common/tunnel.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import type { TunnelDescription } from '../../../platform/remote/common/remoteAuthorityResolver.js';
+import { INotificationService, Severity } from '../../../platform/notification/common/notification.js';
+import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { IRemoteAgentService } from '../../services/remote/common/remoteAgentService.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Registry } from '../../../platform/registry/common/platform.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from '../../../platform/configuration/common/configurationRegistry.js';
+import { IContextKeyService } from '../../../platform/contextkey/common/contextkey.js';
+import { CandidatePort, TunnelCloseReason, TunnelSource, forwardedPortsFeaturesEnabled, makeAddress } from '../../services/remote/common/tunnelModel.js';
 
 @extHostNamedCustomer(MainContext.MainThreadTunnelService)
 export class MainThreadTunnelService extends Disposable implements MainThreadTunnelServiceShape, PortAttributesProvider {
@@ -50,18 +50,20 @@ export class MainThreadTunnelService extends Disposable implements MainThreadTun
 
 	async $setRemoteTunnelService(processId: number): Promise<void> {
 		this.remoteExplorerService.namedProcesses.set(processId, 'Code Extension Host');
-		if (this.remoteExplorerService.portsFeaturesEnabled) {
+		if (this.remoteExplorerService.portsFeaturesEnabled === PortsEnablement.AdditionalFeatures) {
 			this._proxy.$registerCandidateFinder(this.processFindingEnabled());
 		} else {
 			this._register(this.remoteExplorerService.onEnabledPortsFeatures(() => this._proxy.$registerCandidateFinder(this.processFindingEnabled())));
 		}
 		this._register(this.configurationService.onDidChangeConfiguration(async (e) => {
-			if (e.affectsConfiguration(PORT_AUTO_FORWARD_SETTING) || e.affectsConfiguration(PORT_AUTO_SOURCE_SETTING)) {
+			if ((this.remoteExplorerService.portsFeaturesEnabled === PortsEnablement.AdditionalFeatures) && (e.affectsConfiguration(PORT_AUTO_FORWARD_SETTING) || e.affectsConfiguration(PORT_AUTO_SOURCE_SETTING))) {
 				return this._proxy.$registerCandidateFinder(this.processFindingEnabled());
 			}
 		}));
-		this._register(this.tunnelService.onAddedTunnelProvider(() => {
-			return this._proxy.$registerCandidateFinder(this.processFindingEnabled());
+		this._register(this.tunnelService.onAddedTunnelProvider(async () => {
+			if (this.remoteExplorerService.portsFeaturesEnabled === PortsEnablement.AdditionalFeatures) {
+				return this._proxy.$registerCandidateFinder(this.processFindingEnabled());
+			}
 		}));
 	}
 
@@ -166,7 +168,7 @@ export class MainThreadTunnelService extends Disposable implements MainThreadTun
 		this.remoteExplorerService.onFoundNewCandidates(candidates);
 	}
 
-	async $setTunnelProvider(features?: TunnelProviderFeatures): Promise<void> {
+	async $setTunnelProvider(features: TunnelProviderFeatures | undefined, isResolver: boolean): Promise<void> {
 		const tunnelProvider: ITunnelProvider = {
 			forwardPort: (tunnelOptions: TunnelOptions, tunnelCreationOptions: TunnelCreationOptions) => {
 				const forward = this._proxy.$forwardPort(tunnelOptions, tunnelCreationOptions);
@@ -200,7 +202,9 @@ export class MainThreadTunnelService extends Disposable implements MainThreadTun
 		}
 		this.tunnelService.setTunnelProvider(tunnelProvider);
 		// At this point we clearly want the ports view/features since we have a tunnel factory
-		this.contextKeyService.createKey(forwardedPortsViewEnabled.key, true);
+		if (isResolver) {
+			this.contextKeyService.createKey(forwardedPortsFeaturesEnabled.key, true);
+		}
 	}
 
 	async $setCandidateFilter(): Promise<void> {
diff --git a/src/vs/workbench/api/browser/mainThreadUriOpeners.ts b/src/vs/workbench/api/browser/mainThreadUriOpeners.ts
index d44d17d5e32..39fc994eb63 100644
--- a/src/vs/workbench/api/browser/mainThreadUriOpeners.ts
+++ b/src/vs/workbench/api/browser/mainThreadUriOpeners.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Action } from 'vs/base/common/actions';
-import { isCancellationError } from 'vs/base/common/errors';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ExtHostContext, ExtHostUriOpenersShape, MainContext, MainThreadUriOpenersShape } from 'vs/workbench/api/common/extHost.protocol';
-import { defaultExternalUriOpenerId } from 'vs/workbench/contrib/externalUriOpener/common/configuration';
-import { ContributedExternalUriOpenersStore } from 'vs/workbench/contrib/externalUriOpener/common/contributedOpeners';
-import { IExternalOpenerProvider, IExternalUriOpener, IExternalUriOpenerService } from 'vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers';
+import { Action } from '../../../base/common/actions.js';
+import { isCancellationError } from '../../../base/common/errors.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { Schemas } from '../../../base/common/network.js';
+import { URI } from '../../../base/common/uri.js';
+import { localize } from '../../../nls.js';
+import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
+import { INotificationService, Severity } from '../../../platform/notification/common/notification.js';
+import { IOpenerService } from '../../../platform/opener/common/opener.js';
+import { IStorageService } from '../../../platform/storage/common/storage.js';
+import { ExtHostContext, ExtHostUriOpenersShape, MainContext, MainThreadUriOpenersShape } from '../common/extHost.protocol.js';
+import { defaultExternalUriOpenerId } from '../../contrib/externalUriOpener/common/configuration.js';
+import { ContributedExternalUriOpenersStore } from '../../contrib/externalUriOpener/common/contributedOpeners.js';
+import { IExternalOpenerProvider, IExternalUriOpener, IExternalUriOpenerService } from '../../contrib/externalUriOpener/common/externalUriOpenerService.js';
+import { IExtensionService } from '../../services/extensions/common/extensions.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
 
 interface RegisteredOpenerMetadata {
 	readonly schemes: ReadonlySet<string>;
diff --git a/src/vs/workbench/api/browser/mainThreadUrls.ts b/src/vs/workbench/api/browser/mainThreadUrls.ts
index 27ea552497c..bb0fa287aeb 100644
--- a/src/vs/workbench/api/browser/mainThreadUrls.ts
+++ b/src/vs/workbench/api/browser/mainThreadUrls.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ExtHostContext, MainContext, MainThreadUrlsShape, ExtHostUrlsShape } from 'vs/workbench/api/common/extHost.protocol';
-import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers';
-import { IURLService, IOpenURLOptions } from 'vs/platform/url/common/url';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { IExtensionContributedURLHandler, IExtensionUrlHandler } from 'vs/workbench/services/extensions/browser/extensionUrlHandler';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
+import { ExtHostContext, MainContext, MainThreadUrlsShape, ExtHostUrlsShape } from '../common/extHost.protocol.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { IURLService, IOpenURLOptions } from '../../../platform/url/common/url.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { IExtensionContributedURLHandler, IExtensionUrlHandler } from '../../services/extensions/browser/extensionUrlHandler.js';
+import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
 
 class ExtensionUrlHandler implements IExtensionContributedURLHandler {
 
diff --git a/src/vs/workbench/api/browser/mainThreadWebviewManager.ts b/src/vs/workbench/api/browser/mainThreadWebviewManager.ts
index eed33b05ed9..406b222a739 100644
--- a/src/vs/workbench/api/browser/mainThreadWebviewManager.ts
+++ b/src/vs/workbench/api/browser/mainThreadWebviewManager.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { MainThreadCustomEditors } from 'vs/workbench/api/browser/mainThreadCustomEditors';
-import { MainThreadWebviewPanels } from 'vs/workbench/api/browser/mainThreadWebviewPanels';
-import { MainThreadWebviews } from 'vs/workbench/api/browser/mainThreadWebviews';
-import { MainThreadWebviewsViews } from 'vs/workbench/api/browser/mainThreadWebviewViews';
-import * as extHostProtocol from 'vs/workbench/api/common/extHost.protocol';
-import { extHostCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
+import { MainThreadCustomEditors } from './mainThreadCustomEditors.js';
+import { MainThreadWebviewPanels } from './mainThreadWebviewPanels.js';
+import { MainThreadWebviews } from './mainThreadWebviews.js';
+import { MainThreadWebviewsViews } from './mainThreadWebviewViews.js';
+import * as extHostProtocol from '../common/extHost.protocol.js';
+import { extHostCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
 
 @extHostCustomer
 export class MainThreadWebviewManager extends Disposable {
diff --git a/src/vs/workbench/api/browser/mainThreadWebviewPanels.ts b/src/vs/workbench/api/browser/mainThreadWebviewPanels.ts
index 996a8a2e657..3a7ddf961e8 100644
--- a/src/vs/workbench/api/browser/mainThreadWebviewPanels.ts
+++ b/src/vs/workbench/api/browser/mainThreadWebviewPanels.ts
@@ -3,27 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Event } from 'vs/base/common/event';
-import { Disposable, DisposableMap } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { MainThreadWebviews, reviveWebviewContentOptions, reviveWebviewExtension } from 'vs/workbench/api/browser/mainThreadWebviews';
-import * as extHostProtocol from 'vs/workbench/api/common/extHost.protocol';
-import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { ExtensionKeyedWebviewOriginStore, WebviewOptions } from 'vs/workbench/contrib/webview/browser/webview';
-import { WebviewInput } from 'vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
-import { WebviewIcons } from 'vs/workbench/contrib/webviewPanel/browser/webviewIconManager';
-import { IWebViewShowOptions, IWebviewWorkbenchService } from 'vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService';
-import { editorGroupToColumn } from 'vs/workbench/services/editor/common/editorGroupColumn';
-import { GroupLocation, GroupsOrder, IEditorGroup, IEditorGroupsService, preferredSideBySideGroupDirection } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { ACTIVE_GROUP, IEditorService, PreferredGroup, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
+import { onUnexpectedError } from '../../../base/common/errors.js';
+import { Event } from '../../../base/common/event.js';
+import { Disposable, DisposableMap } from '../../../base/common/lifecycle.js';
+import { URI } from '../../../base/common/uri.js';
+import { generateUuid } from '../../../base/common/uuid.js';
+import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
+import { IStorageService } from '../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../platform/telemetry/common/telemetry.js';
+import { MainThreadWebviews, reviveWebviewContentOptions, reviveWebviewExtension } from './mainThreadWebviews.js';
+import * as extHostProtocol from '../common/extHost.protocol.js';
+import { DiffEditorInput } from '../../common/editor/diffEditorInput.js';
+import { EditorInput } from '../../common/editor/editorInput.js';
+import { ExtensionKeyedWebviewOriginStore, WebviewOptions } from '../../contrib/webview/browser/webview.js';
+import { WebviewInput } from '../../contrib/webviewPanel/browser/webviewEditorInput.js';
+import { WebviewIcons } from '../../contrib/webviewPanel/browser/webviewIconManager.js';
+import { IWebViewShowOptions, IWebviewWorkbenchService } from '../../contrib/webviewPanel/browser/webviewWorkbenchService.js';
+import { editorGroupToColumn } from '../../services/editor/common/editorGroupColumn.js';
+import { GroupLocation, GroupsOrder, IEditorGroup, IEditorGroupsService, preferredSideBySideGroupDirection } from '../../services/editor/common/editorGroupsService.js';
+import { ACTIVE_GROUP, IEditorService, PreferredGroup, SIDE_GROUP } from '../../services/editor/common/editorService.js';
+import { IExtensionService } from '../../services/extensions/common/extensions.js';
+import { IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
 
 /**
  * Bi-directional map between webview handles and inputs.
diff --git a/src/vs/workbench/api/browser/mainThreadWebviewViews.ts b/src/vs/workbench/api/browser/mainThreadWebviewViews.ts
index e6854c860cf..2ce367773d7 100644
--- a/src/vs/workbench/api/browser/mainThreadWebviewViews.ts
+++ b/src/vs/workbench/api/browser/mainThreadWebviewViews.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Disposable, DisposableMap } from 'vs/base/common/lifecycle';
-import { generateUuid } from 'vs/base/common/uuid';
-import { MainThreadWebviews, reviveWebviewExtension } from 'vs/workbench/api/browser/mainThreadWebviews';
-import * as extHostProtocol from 'vs/workbench/api/common/extHost.protocol';
-import { IViewBadge } from 'vs/workbench/common/views';
-import { IWebviewViewService, WebviewView } from 'vs/workbench/contrib/webviewView/browser/webviewViewService';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { onUnexpectedError } from '../../../base/common/errors.js';
+import { Disposable, DisposableMap } from '../../../base/common/lifecycle.js';
+import { generateUuid } from '../../../base/common/uuid.js';
+import { MainThreadWebviews, reviveWebviewExtension } from './mainThreadWebviews.js';
+import * as extHostProtocol from '../common/extHost.protocol.js';
+import { IViewBadge } from '../../common/views.js';
+import { IWebviewViewService, WebviewView } from '../../contrib/webviewView/browser/webviewViewService.js';
+import { ITelemetryService } from '../../../platform/telemetry/common/telemetry.js';
+import { IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
 
 
 export class MainThreadWebviewsViews extends Disposable implements extHostProtocol.MainThreadWebviewViewsShape {
diff --git a/src/vs/workbench/api/browser/mainThreadWebviews.ts b/src/vs/workbench/api/browser/mainThreadWebviews.ts
index f537e94d64b..ed37c0b468a 100644
--- a/src/vs/workbench/api/browser/mainThreadWebviews.ts
+++ b/src/vs/workbench/api/browser/mainThreadWebviews.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { isWeb } from 'vs/base/common/platform';
-import { escape } from 'vs/base/common/strings';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IProductService } from 'vs/platform/product/common/productService';
-import * as extHostProtocol from 'vs/workbench/api/common/extHost.protocol';
-import { deserializeWebviewMessage, serializeWebviewMessage } from 'vs/workbench/api/common/extHostWebviewMessaging';
-import { IOverlayWebview, IWebview, WebviewContentOptions, WebviewExtensionDescription } from 'vs/workbench/contrib/webview/browser/webview';
-import { IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { SerializableObjectWithBuffers } from 'vs/workbench/services/extensions/common/proxyIdentifier';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { Disposable, DisposableStore } from '../../../base/common/lifecycle.js';
+import { Schemas } from '../../../base/common/network.js';
+import { isWeb } from '../../../base/common/platform.js';
+import { escape } from '../../../base/common/strings.js';
+import { URI } from '../../../base/common/uri.js';
+import { localize } from '../../../nls.js';
+import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
+import { IOpenerService } from '../../../platform/opener/common/opener.js';
+import { IProductService } from '../../../platform/product/common/productService.js';
+import * as extHostProtocol from '../common/extHost.protocol.js';
+import { deserializeWebviewMessage, serializeWebviewMessage } from '../common/extHostWebviewMessaging.js';
+import { IOverlayWebview, IWebview, WebviewContentOptions, WebviewExtensionDescription } from '../../contrib/webview/browser/webview.js';
+import { IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';
 
 export class MainThreadWebviews extends Disposable implements extHostProtocol.MainThreadWebviewsShape {
 
diff --git a/src/vs/workbench/api/browser/mainThreadWindow.ts b/src/vs/workbench/api/browser/mainThreadWindow.ts
index f77f0b257a6..29760af2182 100644
--- a/src/vs/workbench/api/browser/mainThreadWindow.ts
+++ b/src/vs/workbench/api/browser/mainThreadWindow.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { ExtHostContext, ExtHostWindowShape, IOpenUriOptions, MainContext, MainThreadWindowShape } from '../common/extHost.protocol';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IUserActivityService } from 'vs/workbench/services/userActivity/common/userActivityService';
+import { Event } from '../../../base/common/event.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { IOpenerService } from '../../../platform/opener/common/opener.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { ExtHostContext, ExtHostWindowShape, IOpenUriOptions, MainContext, MainThreadWindowShape } from '../common/extHost.protocol.js';
+import { IHostService } from '../../services/host/browser/host.js';
+import { IUserActivityService } from '../../services/userActivity/common/userActivityService.js';
 
 @extHostNamedCustomer(MainContext.MainThreadWindow)
 export class MainThreadWindow implements MainThreadWindowShape {
diff --git a/src/vs/workbench/api/browser/mainThreadWorkspace.ts b/src/vs/workbench/api/browser/mainThreadWorkspace.ts
index 180932b6d6d..1f2e2807b7a 100644
--- a/src/vs/workbench/api/browser/mainThreadWorkspace.ts
+++ b/src/vs/workbench/api/browser/mainThreadWorkspace.ts
@@ -3,31 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { isCancellationError } from 'vs/base/common/errors';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { isNative } from 'vs/base/common/platform';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IRequestService } from 'vs/platform/request/common/request';
-import { WorkspaceTrustRequestOptions, IWorkspaceTrustManagementService, IWorkspaceTrustRequestService } from 'vs/platform/workspace/common/workspaceTrust';
-import { IWorkspace, IWorkspaceContextService, WorkbenchState, isUntitledWorkspace, WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { checkGlobFileExists } from 'vs/workbench/services/extensions/common/workspaceContains';
-import { IFileQueryBuilderOptions, ITextQueryBuilderOptions, QueryBuilder } from 'vs/workbench/services/search/common/queryBuilder';
-import { IEditorService, ISaveEditorsResult } from 'vs/workbench/services/editor/common/editorService';
-import { IFileMatch, IPatternInfo, ISearchProgressItem, ISearchService } from 'vs/workbench/services/search/common/search';
-import { IWorkspaceEditingService } from 'vs/workbench/services/workspaces/common/workspaceEditing';
-import { ExtHostContext, ExtHostWorkspaceShape, ITextSearchComplete, IWorkspaceData, MainContext, MainThreadWorkspaceShape } from '../common/extHost.protocol';
-import { IEditSessionIdentityService } from 'vs/platform/workspace/common/editSessions';
-import { EditorResourceAccessor, SaveReason, SideBySideEditor } from 'vs/workbench/common/editor';
-import { coalesce, firstOrDefault } from 'vs/base/common/arrays';
-import { ICanonicalUriService } from 'vs/platform/workspace/common/canonicalUri';
+import { CancellationToken, CancellationTokenSource } from '../../../base/common/cancellation.js';
+import { isCancellationError } from '../../../base/common/errors.js';
+import { DisposableStore, IDisposable } from '../../../base/common/lifecycle.js';
+import { isNative } from '../../../base/common/platform.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { localize } from '../../../nls.js';
+import { IEnvironmentService } from '../../../platform/environment/common/environment.js';
+import { IFileService } from '../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
+import { ILabelService } from '../../../platform/label/common/label.js';
+import { INotificationService } from '../../../platform/notification/common/notification.js';
+import { AuthInfo, Credentials, IRequestService } from '../../../platform/request/common/request.js';
+import { WorkspaceTrustRequestOptions, IWorkspaceTrustManagementService, IWorkspaceTrustRequestService } from '../../../platform/workspace/common/workspaceTrust.js';
+import { IWorkspace, IWorkspaceContextService, WorkbenchState, isUntitledWorkspace, WorkspaceFolder } from '../../../platform/workspace/common/workspace.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import { checkGlobFileExists } from '../../services/extensions/common/workspaceContains.js';
+import { IFileQueryBuilderOptions, ITextQueryBuilderOptions, QueryBuilder } from '../../services/search/common/queryBuilder.js';
+import { IEditorService, ISaveEditorsResult } from '../../services/editor/common/editorService.js';
+import { IFileMatch, IPatternInfo, ISearchProgressItem, ISearchService } from '../../services/search/common/search.js';
+import { IWorkspaceEditingService } from '../../services/workspaces/common/workspaceEditing.js';
+import { ExtHostContext, ExtHostWorkspaceShape, ITextSearchComplete, IWorkspaceData, MainContext, MainThreadWorkspaceShape } from '../common/extHost.protocol.js';
+import { IEditSessionIdentityService } from '../../../platform/workspace/common/editSessions.js';
+import { EditorResourceAccessor, SaveReason, SideBySideEditor } from '../../common/editor.js';
+import { coalesce } from '../../../base/common/arrays.js';
+import { ICanonicalUriService } from '../../../platform/workspace/common/canonicalUri.js';
+import { revive } from '../../../base/common/marshalling.js';
 
 @extHostNamedCustomer(MainContext.MainThreadWorkspace)
 export class MainThreadWorkspace implements MainThreadWorkspaceShape {
@@ -140,13 +141,13 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 
 	// --- search ---
 
-	$startFileSearch(_includeFolder: UriComponents | null, options: IFileQueryBuilderOptions, token: CancellationToken): Promise<UriComponents[] | null> {
+	$startFileSearch(_includeFolder: UriComponents | null, options: IFileQueryBuilderOptions<UriComponents>, token: CancellationToken): Promise<UriComponents[] | null> {
 		const includeFolder = URI.revive(_includeFolder);
 		const workspace = this._contextService.getWorkspace();
 
 		const query = this._queryBuilder.file(
 			includeFolder ? [includeFolder] : workspace.folders,
-			options
+			revive(options)
 		);
 
 		return this._searchService.fileSearch(query, token).then(result => {
@@ -159,12 +160,12 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 		});
 	}
 
-	$startTextSearch(pattern: IPatternInfo, _folder: UriComponents | null, options: ITextQueryBuilderOptions, requestId: number, token: CancellationToken): Promise<ITextSearchComplete | null> {
+	$startTextSearch(pattern: IPatternInfo, _folder: UriComponents | null, options: ITextQueryBuilderOptions<UriComponents>, requestId: number, token: CancellationToken): Promise<ITextSearchComplete | null> {
 		const folder = URI.revive(_folder);
 		const workspace = this._contextService.getWorkspace();
 		const folders = folder ? [folder] : workspace.folders.map(folder => folder.uri);
 
-		const query = this._queryBuilder.text(pattern, folders, options);
+		const query = this._queryBuilder.text(pattern, folders, revive(options));
 		query._reason = 'startTextSearch';
 
 		const onProgress = (p: ISearchProgressItem) => {
@@ -204,7 +205,7 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 			force: !options.saveAs
 		});
 
-		return firstOrDefault(this._saveResultToUris(result));
+		return this._saveResultToUris(result).at(0);
 	}
 
 	private _saveResultToUris(result: ISaveEditorsResult): URI[] {
@@ -223,6 +224,14 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 		return this._requestService.resolveProxy(url);
 	}
 
+	$lookupAuthorization(authInfo: AuthInfo): Promise<Credentials | undefined> {
+		return this._requestService.lookupAuthorization(authInfo);
+	}
+
+	$lookupKerberosAuthorization(url: string): Promise<string | undefined> {
+		return this._requestService.lookupKerberosAuthorization(url);
+	}
+
 	$loadCertificates(): Promise<string[]> {
 		return this._requestService.loadCertificates();
 	}
diff --git a/src/vs/workbench/api/browser/statusBarExtensionPoint.ts b/src/vs/workbench/api/browser/statusBarExtensionPoint.ts
index 99dd3279fe8..bae2812c5f3 100644
--- a/src/vs/workbench/api/browser/statusBarExtensionPoint.ts
+++ b/src/vs/workbench/api/browser/statusBarExtensionPoint.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { localize } from 'vs/nls';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { isProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
-import { ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { IStatusbarService, StatusbarAlignment as MainThreadStatusBarAlignment, IStatusbarEntryAccessor, IStatusbarEntry, StatusbarAlignment, IStatusbarEntryPriority, StatusbarEntryKind } from 'vs/workbench/services/statusbar/browser/statusbar';
-import { ThemeColor } from 'vs/base/common/themables';
-import { Command } from 'vs/editor/common/languages';
-import { IAccessibilityInformation, isAccessibilityInformation } from 'vs/platform/accessibility/common/accessibility';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { getCodiconAriaLabel } from 'vs/base/common/iconLabels';
-import { hash } from 'vs/base/common/hash';
-import { Event, Emitter } from 'vs/base/common/event';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { Iterable } from 'vs/base/common/iterator';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { asStatusBarItemIdentifier } from 'vs/workbench/api/common/extHostTypes';
-import { STATUS_BAR_ERROR_ITEM_BACKGROUND, STATUS_BAR_WARNING_ITEM_BACKGROUND } from 'vs/workbench/common/theme';
+import { IJSONSchema } from '../../../base/common/jsonSchema.js';
+import { DisposableStore, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { localize } from '../../../nls.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
+import { ExtensionsRegistry } from '../../services/extensions/common/extensionsRegistry.js';
+import { IStatusbarService, StatusbarAlignment as MainThreadStatusBarAlignment, IStatusbarEntryAccessor, IStatusbarEntry, StatusbarAlignment, IStatusbarEntryPriority, StatusbarEntryKind } from '../../services/statusbar/browser/statusbar.js';
+import { ThemeColor } from '../../../base/common/themables.js';
+import { Command } from '../../../editor/common/languages.js';
+import { IAccessibilityInformation, isAccessibilityInformation } from '../../../platform/accessibility/common/accessibility.js';
+import { IMarkdownString } from '../../../base/common/htmlContent.js';
+import { getCodiconAriaLabel } from '../../../base/common/iconLabels.js';
+import { hash } from '../../../base/common/hash.js';
+import { Event, Emitter } from '../../../base/common/event.js';
+import { InstantiationType, registerSingleton } from '../../../platform/instantiation/common/extensions.js';
+import { Iterable } from '../../../base/common/iterator.js';
+import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
+import { asStatusBarItemIdentifier } from '../common/extHostTypes.js';
+import { STATUS_BAR_ERROR_ITEM_BACKGROUND, STATUS_BAR_WARNING_ITEM_BACKGROUND } from '../../common/theme.js';
 
 
 // --- service
diff --git a/src/vs/workbench/api/browser/viewsExtensionPoint.ts b/src/vs/workbench/api/browser/viewsExtensionPoint.ts
index b28bd289ca6..f5a0648d5d1 100644
--- a/src/vs/workbench/api/browser/viewsExtensionPoint.ts
+++ b/src/vs/workbench/api/browser/viewsExtensionPoint.ts
@@ -3,33 +3,33 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import * as resources from 'vs/base/common/resources';
-import { isFalsyOrWhitespace } from 'vs/base/common/strings';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { ExtensionIdentifier, ExtensionIdentifierSet, IExtensionDescription, IExtensionManifest } from 'vs/platform/extensions/common/extensions';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { Extensions as ViewletExtensions, PaneCompositeRegistry } from 'vs/workbench/browser/panecomposite';
-import { CustomTreeView, TreeViewPane } from 'vs/workbench/browser/parts/views/treeView';
-import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
-import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { Extensions as ViewContainerExtensions, ICustomViewDescriptor, IViewContainersRegistry, IViewDescriptor, IViewsRegistry, ViewContainer, ViewContainerLocation } from 'vs/workbench/common/views';
-import { VIEWLET_ID as DEBUG } from 'vs/workbench/contrib/debug/common/debug';
-import { VIEWLET_ID as EXPLORER } from 'vs/workbench/contrib/files/common/files';
-import { VIEWLET_ID as REMOTE } from 'vs/workbench/contrib/remote/browser/remoteExplorer';
-import { VIEWLET_ID as SCM } from 'vs/workbench/contrib/scm/common/scm';
-import { WebviewViewPane } from 'vs/workbench/contrib/webviewView/browser/webviewViewPane';
-import { isProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
-import { ExtensionMessageCollector, ExtensionsRegistry, IExtensionPoint, IExtensionPointUser } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IExtensionFeatureTableRenderer, IRenderedData, ITableData, IRowData, IExtensionFeaturesRegistry, Extensions as ExtensionFeaturesRegistryExtensions } from 'vs/workbench/services/extensionManagement/common/extensionFeatures';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { MarkdownString } from 'vs/base/common/htmlContent';
+import { IJSONSchema } from '../../../base/common/jsonSchema.js';
+import * as resources from '../../../base/common/resources.js';
+import { isFalsyOrWhitespace } from '../../../base/common/strings.js';
+import { URI } from '../../../base/common/uri.js';
+import { localize } from '../../../nls.js';
+import { ContextKeyExpr } from '../../../platform/contextkey/common/contextkey.js';
+import { ExtensionIdentifier, ExtensionIdentifierSet, IExtensionDescription, IExtensionManifest } from '../../../platform/extensions/common/extensions.js';
+import { SyncDescriptor } from '../../../platform/instantiation/common/descriptors.js';
+import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
+import { Registry } from '../../../platform/registry/common/platform.js';
+import { ThemeIcon } from '../../../base/common/themables.js';
+import { Extensions as ViewletExtensions, PaneCompositeRegistry } from '../../browser/panecomposite.js';
+import { CustomTreeView, TreeViewPane } from '../../browser/parts/views/treeView.js';
+import { ViewPaneContainer } from '../../browser/parts/views/viewPaneContainer.js';
+import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from '../../common/contributions.js';
+import { Extensions as ViewContainerExtensions, ICustomViewDescriptor, IViewContainersRegistry, IViewDescriptor, IViewsRegistry, ViewContainer, ViewContainerLocation } from '../../common/views.js';
+import { VIEWLET_ID as DEBUG } from '../../contrib/debug/common/debug.js';
+import { VIEWLET_ID as EXPLORER } from '../../contrib/files/common/files.js';
+import { VIEWLET_ID as REMOTE } from '../../contrib/remote/browser/remoteExplorer.js';
+import { VIEWLET_ID as SCM } from '../../contrib/scm/common/scm.js';
+import { WebviewViewPane } from '../../contrib/webviewView/browser/webviewViewPane.js';
+import { isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
+import { ExtensionMessageCollector, ExtensionsRegistry, IExtensionPoint, IExtensionPointUser } from '../../services/extensions/common/extensionsRegistry.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { IExtensionFeatureTableRenderer, IRenderedData, ITableData, IRowData, IExtensionFeaturesRegistry, Extensions as ExtensionFeaturesRegistryExtensions } from '../../services/extensionManagement/common/extensionFeatures.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { MarkdownString } from '../../../base/common/htmlContent.js';
 
 export interface IUserFriendlyViewsContainerDescriptor {
 	id: string;
diff --git a/src/vs/workbench/api/common/configurationExtensionPoint.ts b/src/vs/workbench/api/common/configurationExtensionPoint.ts
index 496651fe769..e45e567775c 100644
--- a/src/vs/workbench/api/common/configurationExtensionPoint.ts
+++ b/src/vs/workbench/api/common/configurationExtensionPoint.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import * as objects from 'vs/base/common/objects';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import { ExtensionsRegistry, IExtensionPointUser } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { IConfigurationNode, IConfigurationRegistry, Extensions, validateProperty, ConfigurationScope, OVERRIDE_PROPERTY_REGEX, IConfigurationDefaults, configurationDefaultsSchemaId, IConfigurationDelta, getDefaultValue } from 'vs/platform/configuration/common/configurationRegistry';
-import { IJSONContributionRegistry, Extensions as JSONExtensions } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
-import { workspaceSettingsSchemaId, launchSchemaId, tasksSchemaId } from 'vs/workbench/services/configuration/common/configuration';
-import { isObject, isUndefined } from 'vs/base/common/types';
-import { ExtensionIdentifierMap, IExtensionManifest } from 'vs/platform/extensions/common/extensions';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { Extensions as ExtensionFeaturesExtensions, IExtensionFeatureTableRenderer, IExtensionFeaturesRegistry, IRenderedData, IRowData, ITableData } from 'vs/workbench/services/extensionManagement/common/extensionFeatures';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { MarkdownString } from 'vs/base/common/htmlContent';
+import * as nls from '../../../nls.js';
+import * as objects from '../../../base/common/objects.js';
+import { Registry } from '../../../platform/registry/common/platform.js';
+import { IJSONSchema } from '../../../base/common/jsonSchema.js';
+import { ExtensionsRegistry, IExtensionPointUser } from '../../services/extensions/common/extensionsRegistry.js';
+import { IConfigurationNode, IConfigurationRegistry, Extensions, validateProperty, ConfigurationScope, OVERRIDE_PROPERTY_REGEX, IConfigurationDefaults, configurationDefaultsSchemaId, IConfigurationDelta, getDefaultValue, getAllConfigurationProperties, parseScope } from '../../../platform/configuration/common/configurationRegistry.js';
+import { IJSONContributionRegistry, Extensions as JSONExtensions } from '../../../platform/jsonschemas/common/jsonContributionRegistry.js';
+import { workspaceSettingsSchemaId, launchSchemaId, tasksSchemaId } from '../../services/configuration/common/configuration.js';
+import { isObject, isUndefined } from '../../../base/common/types.js';
+import { ExtensionIdentifierMap, IExtensionManifest } from '../../../platform/extensions/common/extensions.js';
+import { IStringDictionary } from '../../../base/common/collections.js';
+import { Extensions as ExtensionFeaturesExtensions, IExtensionFeatureTableRenderer, IExtensionFeaturesRegistry, IRenderedData, IRowData, ITableData } from '../../services/extensionManagement/common/extensionFeatures.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { SyncDescriptor } from '../../../platform/instantiation/common/descriptors.js';
+import { MarkdownString } from '../../../base/common/htmlContent.js';
 
 const jsonRegistry = Registry.as<IJSONContributionRegistry>(JSONExtensions.JSONContribution);
 const configurationRegistry = Registry.as<IConfigurationRegistry>(Extensions.Configuration);
@@ -160,11 +160,17 @@ defaultConfigurationExtPoint.setHandler((extensions, { added, removed }) => {
 		const addedDefaultConfigurations = added.map<IConfigurationDefaults>(extension => {
 			const overrides: IStringDictionary<any> = objects.deepClone(extension.value);
 			for (const key of Object.keys(overrides)) {
+				const registeredPropertyScheme = registeredProperties[key];
+				if (registeredPropertyScheme?.disallowConfigurationDefault) {
+					extension.collector.warn(nls.localize('config.property.preventDefaultConfiguration.warning', "Cannot register configuration defaults for '{0}'. This setting does not allow contributing configuration defaults.", key));
+					delete overrides[key];
+					continue;
+				}
 				if (!OVERRIDE_PROPERTY_REGEX.test(key)) {
-					const registeredPropertyScheme = registeredProperties[key];
 					if (registeredPropertyScheme?.scope && !allowedScopes.includes(registeredPropertyScheme.scope)) {
 						extension.collector.warn(nls.localize('config.property.defaultConfiguration.warning', "Cannot register configuration defaults for '{0}'. Only defaults for machine-overridable, window, resource and language overridable scoped settings are supported.", key));
 						delete overrides[key];
+						continue;
 					}
 				}
 			}
@@ -210,8 +216,7 @@ configurationExtPoint.setHandler((extensions, { added, removed }) => {
 
 	const seenProperties = new Set<string>();
 
-	function handleConfiguration(node: IConfigurationNode, extension: IExtensionPointUser<any>): IConfigurationNode[] {
-		const configurations: IConfigurationNode[] = [];
+	function handleConfiguration(node: IConfigurationNode, extension: IExtensionPointUser<any>): IConfigurationNode {
 		const configuration = objects.deepClone(node);
 
 		if (configuration.title && (typeof configuration.title !== 'string')) {
@@ -224,8 +229,7 @@ configurationExtPoint.setHandler((extensions, { added, removed }) => {
 		configuration.extensionInfo = { id: extension.description.identifier.value, displayName: extension.description.displayName };
 		configuration.restrictedProperties = extension.description.capabilities?.untrustedWorkspaces?.supported === 'limited' ? extension.description.capabilities?.untrustedWorkspaces.restrictedConfigurations : undefined;
 		configuration.title = configuration.title || extension.description.displayName || extension.description.identifier.value;
-		configurations.push(configuration);
-		return configurations;
+		return configuration;
 	}
 
 	function validateProperties(configuration: IConfigurationNode, extension: IExtensionPointUser<any>): void {
@@ -254,23 +258,7 @@ configurationExtPoint.setHandler((extensions, { added, removed }) => {
 					continue;
 				}
 				seenProperties.add(key);
-				if (propertyConfiguration.scope) {
-					if (propertyConfiguration.scope.toString() === 'application') {
-						propertyConfiguration.scope = ConfigurationScope.APPLICATION;
-					} else if (propertyConfiguration.scope.toString() === 'machine') {
-						propertyConfiguration.scope = ConfigurationScope.MACHINE;
-					} else if (propertyConfiguration.scope.toString() === 'resource') {
-						propertyConfiguration.scope = ConfigurationScope.RESOURCE;
-					} else if (propertyConfiguration.scope.toString() === 'machine-overridable') {
-						propertyConfiguration.scope = ConfigurationScope.MACHINE_OVERRIDABLE;
-					} else if (propertyConfiguration.scope.toString() === 'language-overridable') {
-						propertyConfiguration.scope = ConfigurationScope.LANGUAGE_OVERRIDABLE;
-					} else {
-						propertyConfiguration.scope = ConfigurationScope.WINDOW;
-					}
-				} else {
-					propertyConfiguration.scope = ConfigurationScope.WINDOW;
-				}
+				propertyConfiguration.scope = propertyConfiguration.scope ? parseScope(propertyConfiguration.scope.toString()) : ConfigurationScope.WINDOW;
 			}
 		}
 		const subNodes = configuration.allOf;
@@ -288,9 +276,9 @@ configurationExtPoint.setHandler((extensions, { added, removed }) => {
 			const configurations: IConfigurationNode[] = [];
 			const value = <IConfigurationNode | IConfigurationNode[]>extension.value;
 			if (Array.isArray(value)) {
-				value.forEach(v => configurations.push(...handleConfiguration(v, extension)));
+				value.forEach(v => configurations.push(handleConfiguration(v, extension)));
 			} else {
-				configurations.push(...handleConfiguration(value, extension));
+				configurations.push(handleConfiguration(value, extension));
 			}
 			extensionConfigurations.set(extension.description.identifier, configurations);
 			addedConfigurations.push(...configurations);
@@ -400,15 +388,11 @@ class SettingsTableRenderer extends Disposable implements IExtensionFeatureTable
 	}
 
 	render(manifest: IExtensionManifest): IRenderedData<ITableData> {
-		const configuration = manifest.contributes?.configuration;
-		let properties: any = {};
-		if (Array.isArray(configuration)) {
-			configuration.forEach(config => {
-				properties = { ...properties, ...config.properties };
-			});
-		} else if (configuration) {
-			properties = configuration.properties;
-		}
+		const configuration: IConfigurationNode[] = manifest.contributes?.configuration
+			? Array.isArray(manifest.contributes.configuration) ? manifest.contributes.configuration : [manifest.contributes.configuration]
+			: [];
+
+		const properties = getAllConfigurationProperties(configuration);
 
 		const contrib = properties ? Object.keys(properties) : [];
 		const headers = [nls.localize('setting name', "ID"), nls.localize('description', "Description"), nls.localize('default', "Default")];
diff --git a/src/vs/workbench/api/common/extHost.api.impl.ts b/src/vs/workbench/api/common/extHost.api.impl.ts
index 68c6b305eab..3a110d486a8 100644
--- a/src/vs/workbench/api/common/extHost.api.impl.ts
+++ b/src/vs/workbench/api/common/extHost.api.impl.ts
@@ -3,110 +3,112 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import * as errors from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { combinedDisposable } from 'vs/base/common/lifecycle';
-import { Schemas, matchesScheme } from 'vs/base/common/network';
-import Severity from 'vs/base/common/severity';
-import { URI } from 'vs/base/common/uri';
-import { TextEditorCursorStyle } from 'vs/editor/common/config/editorOptions';
-import { score, targetsNotebooks } from 'vs/editor/common/languageSelector';
-import * as languageConfiguration from 'vs/editor/common/languages/languageConfiguration';
-import { OverviewRulerLane } from 'vs/editor/common/model';
-import { ExtensionIdentifier, ExtensionIdentifierSet, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import * as files from 'vs/platform/files/common/files';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService, ILoggerService, LogLevel } from 'vs/platform/log/common/log';
-import { getRemoteName } from 'vs/platform/remote/common/remoteHosts';
-import { TelemetryTrustedValue } from 'vs/platform/telemetry/common/telemetryUtils';
-import { EditSessionIdentityMatch } from 'vs/platform/workspace/common/editSessions';
-import { CandidatePortSource, ExtHostContext, ExtHostLogLevelServiceShape, MainContext } from 'vs/workbench/api/common/extHost.protocol';
-import { ExtHostRelatedInformation } from 'vs/workbench/api/common/extHostAiRelatedInformation';
-import { ExtHostApiCommands } from 'vs/workbench/api/common/extHostApiCommands';
-import { IExtHostApiDeprecationService } from 'vs/workbench/api/common/extHostApiDeprecationService';
-import { IExtHostAuthentication } from 'vs/workbench/api/common/extHostAuthentication';
-import { ExtHostBulkEdits } from 'vs/workbench/api/common/extHostBulkEdits';
-import { ExtHostChatAgents2 } from 'vs/workbench/api/common/extHostChatAgents2';
-import { ExtHostChatVariables } from 'vs/workbench/api/common/extHostChatVariables';
-import { ExtHostClipboard } from 'vs/workbench/api/common/extHostClipboard';
-import { ExtHostEditorInsets } from 'vs/workbench/api/common/extHostCodeInsets';
-import { IExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
-import { createExtHostComments } from 'vs/workbench/api/common/extHostComments';
-import { ExtHostConfigProvider, IExtHostConfiguration } from 'vs/workbench/api/common/extHostConfiguration';
-import { ExtHostCustomEditors } from 'vs/workbench/api/common/extHostCustomEditors';
-import { IExtHostDebugService } from 'vs/workbench/api/common/extHostDebugService';
-import { IExtHostDecorations } from 'vs/workbench/api/common/extHostDecorations';
-import { ExtHostDiagnostics } from 'vs/workbench/api/common/extHostDiagnostics';
-import { ExtHostDialogs } from 'vs/workbench/api/common/extHostDialogs';
-import { ExtHostDocumentContentProvider } from 'vs/workbench/api/common/extHostDocumentContentProviders';
-import { ExtHostDocumentSaveParticipant } from 'vs/workbench/api/common/extHostDocumentSaveParticipant';
-import { ExtHostDocuments } from 'vs/workbench/api/common/extHostDocuments';
-import { IExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
-import { IExtHostEditorTabs } from 'vs/workbench/api/common/extHostEditorTabs';
-import { ExtHostEmbeddings } from 'vs/workbench/api/common/extHostEmbedding';
-import { ExtHostAiEmbeddingVector } from 'vs/workbench/api/common/extHostEmbeddingVector';
-import { Extension, IExtHostExtensionService } from 'vs/workbench/api/common/extHostExtensionService';
-import { ExtHostFileSystem } from 'vs/workbench/api/common/extHostFileSystem';
-import { IExtHostConsumerFileSystem } from 'vs/workbench/api/common/extHostFileSystemConsumer';
-import { ExtHostFileSystemEventService, FileSystemWatcherCreateOptions } from 'vs/workbench/api/common/extHostFileSystemEventService';
-import { IExtHostFileSystemInfo } from 'vs/workbench/api/common/extHostFileSystemInfo';
-import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService';
-import { ExtHostInteractive } from 'vs/workbench/api/common/extHostInteractive';
-import { ExtHostLabelService } from 'vs/workbench/api/common/extHostLabelService';
-import { ExtHostLanguageFeatures } from 'vs/workbench/api/common/extHostLanguageFeatures';
-import { IExtHostLanguageModels } from 'vs/workbench/api/common/extHostLanguageModels';
-import { ExtHostLanguages } from 'vs/workbench/api/common/extHostLanguages';
-import { IExtHostLocalizationService } from 'vs/workbench/api/common/extHostLocalizationService';
-import { IExtHostManagedSockets } from 'vs/workbench/api/common/extHostManagedSockets';
-import { ExtHostMessageService } from 'vs/workbench/api/common/extHostMessageService';
-import { ExtHostNotebookController } from 'vs/workbench/api/common/extHostNotebook';
-import { ExtHostNotebookDocumentSaveParticipant } from 'vs/workbench/api/common/extHostNotebookDocumentSaveParticipant';
-import { ExtHostNotebookDocuments } from 'vs/workbench/api/common/extHostNotebookDocuments';
-import { ExtHostNotebookEditors } from 'vs/workbench/api/common/extHostNotebookEditors';
-import { ExtHostNotebookKernels } from 'vs/workbench/api/common/extHostNotebookKernels';
-import { ExtHostNotebookRenderers } from 'vs/workbench/api/common/extHostNotebookRenderers';
-import { IExtHostOutputService } from 'vs/workbench/api/common/extHostOutput';
-import { ExtHostProfileContentHandlers } from 'vs/workbench/api/common/extHostProfileContentHandler';
-import { ExtHostProgress } from 'vs/workbench/api/common/extHostProgress';
-import { ExtHostQuickDiff } from 'vs/workbench/api/common/extHostQuickDiff';
-import { createExtHostQuickOpen } from 'vs/workbench/api/common/extHostQuickOpen';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import { ExtHostSCM } from 'vs/workbench/api/common/extHostSCM';
-import { IExtHostSearch } from 'vs/workbench/api/common/extHostSearch';
-import { IExtHostSecretState } from 'vs/workbench/api/common/extHostSecretState';
-import { ExtHostShare } from 'vs/workbench/api/common/extHostShare';
-import { ExtHostSpeech } from 'vs/workbench/api/common/extHostSpeech';
-import { ExtHostStatusBar } from 'vs/workbench/api/common/extHostStatusBar';
-import { IExtHostStorage } from 'vs/workbench/api/common/extHostStorage';
-import { IExtensionStoragePaths } from 'vs/workbench/api/common/extHostStoragePaths';
-import { IExtHostTask } from 'vs/workbench/api/common/extHostTask';
-import { ExtHostTelemetryLogger, IExtHostTelemetry, isNewAppInstall } from 'vs/workbench/api/common/extHostTelemetry';
-import { IExtHostTerminalService } from 'vs/workbench/api/common/extHostTerminalService';
-import { IExtHostTerminalShellIntegration } from 'vs/workbench/api/common/extHostTerminalShellIntegration';
-import { IExtHostTesting } from 'vs/workbench/api/common/extHostTesting';
-import { ExtHostEditors } from 'vs/workbench/api/common/extHostTextEditors';
-import { ExtHostTheming } from 'vs/workbench/api/common/extHostTheming';
-import { ExtHostTimeline } from 'vs/workbench/api/common/extHostTimeline';
-import { ExtHostTreeViews } from 'vs/workbench/api/common/extHostTreeViews';
-import { IExtHostTunnelService } from 'vs/workbench/api/common/extHostTunnelService';
-import * as typeConverters from 'vs/workbench/api/common/extHostTypeConverters';
-import * as extHostTypes from 'vs/workbench/api/common/extHostTypes';
-import { ExtHostUriOpeners } from 'vs/workbench/api/common/extHostUriOpener';
-import { IURITransformerService } from 'vs/workbench/api/common/extHostUriTransformerService';
-import { ExtHostUrls } from 'vs/workbench/api/common/extHostUrls';
-import { ExtHostWebviews } from 'vs/workbench/api/common/extHostWebview';
-import { ExtHostWebviewPanels } from 'vs/workbench/api/common/extHostWebviewPanels';
-import { ExtHostWebviewViews } from 'vs/workbench/api/common/extHostWebviewView';
-import { IExtHostWindow } from 'vs/workbench/api/common/extHostWindow';
-import { IExtHostWorkspace } from 'vs/workbench/api/common/extHostWorkspace';
-import { DebugConfigurationProviderTriggerKind } from 'vs/workbench/contrib/debug/common/debug';
-import { ExtensionDescriptionRegistry } from 'vs/workbench/services/extensions/common/extensionDescriptionRegistry';
-import { UIKind } from 'vs/workbench/services/extensions/common/extensionHostProtocol';
-import { checkProposedApiEnabled, isProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
-import { ProxyIdentifier } from 'vs/workbench/services/extensions/common/proxyIdentifier';
-import { TextSearchCompleteMessageType } from 'vs/workbench/services/search/common/searchExtTypes';
+import { CancellationTokenSource } from '../../../base/common/cancellation.js';
+import * as errors from '../../../base/common/errors.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { combinedDisposable } from '../../../base/common/lifecycle.js';
+import { Schemas, matchesScheme } from '../../../base/common/network.js';
+import Severity from '../../../base/common/severity.js';
+import { URI } from '../../../base/common/uri.js';
+import { TextEditorCursorStyle } from '../../../editor/common/config/editorOptions.js';
+import { score, targetsNotebooks } from '../../../editor/common/languageSelector.js';
+import * as languageConfiguration from '../../../editor/common/languages/languageConfiguration.js';
+import { OverviewRulerLane } from '../../../editor/common/model.js';
+import { ExtensionIdentifierSet, IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import * as files from '../../../platform/files/common/files.js';
+import { ServicesAccessor } from '../../../platform/instantiation/common/instantiation.js';
+import { ILogService, ILoggerService, LogLevel } from '../../../platform/log/common/log.js';
+import { getRemoteName } from '../../../platform/remote/common/remoteHosts.js';
+import { TelemetryTrustedValue } from '../../../platform/telemetry/common/telemetryUtils.js';
+import { EditSessionIdentityMatch } from '../../../platform/workspace/common/editSessions.js';
+import { CandidatePortSource, ExtHostContext, ExtHostLogLevelServiceShape, MainContext } from './extHost.protocol.js';
+import { ExtHostRelatedInformation } from './extHostAiRelatedInformation.js';
+import { ExtHostApiCommands } from './extHostApiCommands.js';
+import { IExtHostApiDeprecationService } from './extHostApiDeprecationService.js';
+import { IExtHostAuthentication } from './extHostAuthentication.js';
+import { ExtHostBulkEdits } from './extHostBulkEdits.js';
+import { ExtHostChatAgents2 } from './extHostChatAgents2.js';
+import { ExtHostChatVariables } from './extHostChatVariables.js';
+import { ExtHostClipboard } from './extHostClipboard.js';
+import { ExtHostEditorInsets } from './extHostCodeInsets.js';
+import { IExtHostCommands } from './extHostCommands.js';
+import { createExtHostComments } from './extHostComments.js';
+import { ExtHostConfigProvider, IExtHostConfiguration } from './extHostConfiguration.js';
+import { ExtHostCustomEditors } from './extHostCustomEditors.js';
+import { IExtHostDebugService } from './extHostDebugService.js';
+import { IExtHostDecorations } from './extHostDecorations.js';
+import { ExtHostDiagnostics } from './extHostDiagnostics.js';
+import { ExtHostDialogs } from './extHostDialogs.js';
+import { ExtHostDocumentContentProvider } from './extHostDocumentContentProviders.js';
+import { ExtHostDocumentSaveParticipant } from './extHostDocumentSaveParticipant.js';
+import { ExtHostDocuments } from './extHostDocuments.js';
+import { IExtHostDocumentsAndEditors } from './extHostDocumentsAndEditors.js';
+import { IExtHostEditorTabs } from './extHostEditorTabs.js';
+import { ExtHostEmbeddings } from './extHostEmbedding.js';
+import { ExtHostAiEmbeddingVector } from './extHostEmbeddingVector.js';
+import { Extension, IExtHostExtensionService } from './extHostExtensionService.js';
+import { ExtHostFileSystem } from './extHostFileSystem.js';
+import { IExtHostConsumerFileSystem } from './extHostFileSystemConsumer.js';
+import { ExtHostFileSystemEventService, FileSystemWatcherCreateOptions } from './extHostFileSystemEventService.js';
+import { IExtHostFileSystemInfo } from './extHostFileSystemInfo.js';
+import { IExtHostInitDataService } from './extHostInitDataService.js';
+import { ExtHostInteractive } from './extHostInteractive.js';
+import { ExtHostLabelService } from './extHostLabelService.js';
+import { ExtHostLanguageFeatures } from './extHostLanguageFeatures.js';
+import { ExtHostLanguageModelTools } from './extHostLanguageModelTools.js';
+import { IExtHostLanguageModels } from './extHostLanguageModels.js';
+import { ExtHostLanguages } from './extHostLanguages.js';
+import { IExtHostLocalizationService } from './extHostLocalizationService.js';
+import { IExtHostManagedSockets } from './extHostManagedSockets.js';
+import { ExtHostMessageService } from './extHostMessageService.js';
+import { ExtHostNotebookController } from './extHostNotebook.js';
+import { ExtHostNotebookDocumentSaveParticipant } from './extHostNotebookDocumentSaveParticipant.js';
+import { ExtHostNotebookDocuments } from './extHostNotebookDocuments.js';
+import { ExtHostNotebookEditors } from './extHostNotebookEditors.js';
+import { ExtHostNotebookKernels } from './extHostNotebookKernels.js';
+import { ExtHostNotebookRenderers } from './extHostNotebookRenderers.js';
+import { IExtHostOutputService } from './extHostOutput.js';
+import { ExtHostProfileContentHandlers } from './extHostProfileContentHandler.js';
+import { ExtHostProgress } from './extHostProgress.js';
+import { ExtHostQuickDiff } from './extHostQuickDiff.js';
+import { createExtHostQuickOpen } from './extHostQuickOpen.js';
+import { IExtHostRpcService } from './extHostRpcService.js';
+import { ExtHostSCM } from './extHostSCM.js';
+import { IExtHostSearch } from './extHostSearch.js';
+import { IExtHostSecretState } from './extHostSecretState.js';
+import { ExtHostShare } from './extHostShare.js';
+import { ExtHostSpeech } from './extHostSpeech.js';
+import { ExtHostStatusBar } from './extHostStatusBar.js';
+import { IExtHostStorage } from './extHostStorage.js';
+import { IExtensionStoragePaths } from './extHostStoragePaths.js';
+import { IExtHostTask } from './extHostTask.js';
+import { ExtHostTelemetryLogger, IExtHostTelemetry, isNewAppInstall } from './extHostTelemetry.js';
+import { IExtHostTerminalService } from './extHostTerminalService.js';
+import { IExtHostTerminalShellIntegration } from './extHostTerminalShellIntegration.js';
+import { IExtHostTesting } from './extHostTesting.js';
+import { ExtHostEditors } from './extHostTextEditors.js';
+import { ExtHostTheming } from './extHostTheming.js';
+import { ExtHostTimeline } from './extHostTimeline.js';
+import { ExtHostTreeViews } from './extHostTreeViews.js';
+import { IExtHostTunnelService } from './extHostTunnelService.js';
+import * as typeConverters from './extHostTypeConverters.js';
+import * as extHostTypes from './extHostTypes.js';
+import { ExtHostUriOpeners } from './extHostUriOpener.js';
+import { IURITransformerService } from './extHostUriTransformerService.js';
+import { ExtHostUrls } from './extHostUrls.js';
+import { ExtHostWebviews } from './extHostWebview.js';
+import { ExtHostWebviewPanels } from './extHostWebviewPanels.js';
+import { ExtHostWebviewViews } from './extHostWebviewView.js';
+import { IExtHostWindow } from './extHostWindow.js';
+import { IExtHostWorkspace } from './extHostWorkspace.js';
+import { DebugConfigurationProviderTriggerKind } from '../../contrib/debug/common/debug.js';
+import { ExtensionDescriptionRegistry } from '../../services/extensions/common/extensionDescriptionRegistry.js';
+import { UIKind } from '../../services/extensions/common/extensionHostProtocol.js';
+import { checkProposedApiEnabled, isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
+import { ProxyIdentifier } from '../../services/extensions/common/proxyIdentifier.js';
+import { ExcludeSettingOptions, TextSearchCompleteMessageType, TextSearchContextNew, TextSearchMatchNew } from '../../services/search/common/searchExtTypes.js';
 import type * as vscode from 'vscode';
+import { ExtHostCodeMapper } from './extHostCodeMapper.js';
 
 export interface IExtensionRegistries {
 	mine: ExtensionDescriptionRegistry;
@@ -190,6 +192,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 	const extHostDiagnostics = rpcProtocol.set(ExtHostContext.ExtHostDiagnostics, new ExtHostDiagnostics(rpcProtocol, extHostLogService, extHostFileSystemInfo, extHostDocumentsAndEditors));
 	const extHostLanguages = rpcProtocol.set(ExtHostContext.ExtHostLanguages, new ExtHostLanguages(rpcProtocol, extHostDocuments, extHostCommands.converter, uriTransformer));
 	const extHostLanguageFeatures = rpcProtocol.set(ExtHostContext.ExtHostLanguageFeatures, new ExtHostLanguageFeatures(rpcProtocol, uriTransformer, extHostDocuments, extHostCommands, extHostDiagnostics, extHostLogService, extHostApiDeprecation, extHostTelemetry));
+	const extHostCodeMapper = rpcProtocol.set(ExtHostContext.ExtHostCodeMapper, new ExtHostCodeMapper(rpcProtocol));
 	const extHostFileSystem = rpcProtocol.set(ExtHostContext.ExtHostFileSystem, new ExtHostFileSystem(rpcProtocol, extHostLanguageFeatures));
 	const extHostFileSystemEvent = rpcProtocol.set(ExtHostContext.ExtHostFileSystemEventService, new ExtHostFileSystemEventService(rpcProtocol, extHostLogService, extHostDocumentsAndEditors));
 	const extHostQuickOpen = rpcProtocol.set(ExtHostContext.ExtHostQuickOpen, createExtHostQuickOpen(rpcProtocol, extHostWorkspace, extHostCommands));
@@ -209,8 +212,9 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 	const extHostUriOpeners = rpcProtocol.set(ExtHostContext.ExtHostUriOpeners, new ExtHostUriOpeners(rpcProtocol));
 	const extHostProfileContentHandlers = rpcProtocol.set(ExtHostContext.ExtHostProfileContentHandlers, new ExtHostProfileContentHandlers(rpcProtocol));
 	rpcProtocol.set(ExtHostContext.ExtHostInteractive, new ExtHostInteractive(rpcProtocol, extHostNotebook, extHostDocumentsAndEditors, extHostCommands, extHostLogService));
-	const extHostChatAgents2 = rpcProtocol.set(ExtHostContext.ExtHostChatAgents2, new ExtHostChatAgents2(rpcProtocol, extHostLogService, extHostCommands, initData.quality));
+	const extHostChatAgents2 = rpcProtocol.set(ExtHostContext.ExtHostChatAgents2, new ExtHostChatAgents2(rpcProtocol, extHostLogService, extHostCommands, extHostDocuments, extHostLanguageModels));
 	const extHostChatVariables = rpcProtocol.set(ExtHostContext.ExtHostChatVariables, new ExtHostChatVariables(rpcProtocol));
+	const extHostLanguageModelTools = rpcProtocol.set(ExtHostContext.ExtHostLanguageModelTools, new ExtHostLanguageModelTools(rpcProtocol));
 	const extHostAiRelatedInformation = rpcProtocol.set(ExtHostContext.ExtHostAiRelatedInformation, new ExtHostRelatedInformation(rpcProtocol));
 	const extHostAiEmbeddingVector = rpcProtocol.set(ExtHostContext.ExtHostAiEmbeddingVector, new ExtHostAiEmbeddingVector(rpcProtocol));
 	const extHostStatusBar = rpcProtocol.set(ExtHostContext.ExtHostStatusBar, new ExtHostStatusBar(rpcProtocol, extHostCommands.converter));
@@ -289,9 +293,8 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 				}
 				return extHostAuthentication.getSession(extension, providerId, scopes, options as any);
 			},
-			getSessions(providerId: string, scopes: readonly string[]) {
-				checkProposedApiEnabled(extension, 'authGetSessions');
-				return extHostAuthentication.getSessions(extension, providerId, scopes);
+			getAccounts(providerId: string) {
+				return extHostAuthentication.getAccounts(providerId);
 			},
 			// TODO: remove this after GHPR and Codespaces move off of it
 			async hasSession(providerId: string, scopes: readonly string[]) {
@@ -299,7 +302,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 				return !!(await extHostAuthentication.getSession(extension, providerId, scopes, { silent: true } as any));
 			},
 			get onDidChangeSessions(): vscode.Event<vscode.AuthenticationSessionsChangeEvent> {
-				return _asExtensionEvent(extHostAuthentication.onDidChangeSessions);
+				return _asExtensionEvent(extHostAuthentication.getExtensionScopedSessionsEvent(extension.identifier.value));
 			},
 			registerAuthenticationProvider(id: string, label: string, provider: vscode.AuthenticationProvider, options?: vscode.AuthenticationProviderOptions): vscode.Disposable {
 				return extHostAuthentication.registerAuthenticationProvider(id, label, provider, options);
@@ -741,15 +744,12 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 				return _asExtensionEvent(extHostTerminalService.onDidExecuteTerminalCommand)(listener, thisArg, disposables);
 			},
 			onDidChangeTerminalShellIntegration(listener, thisArg?, disposables?) {
-				checkProposedApiEnabled(extension, 'terminalShellIntegration');
 				return _asExtensionEvent(extHostTerminalShellIntegration.onDidChangeTerminalShellIntegration)(listener, thisArg, disposables);
 			},
 			onDidStartTerminalShellExecution(listener, thisArg?, disposables?) {
-				checkProposedApiEnabled(extension, 'terminalShellIntegration');
 				return _asExtensionEvent(extHostTerminalShellIntegration.onDidStartTerminalShellExecution)(listener, thisArg, disposables);
 			},
 			onDidEndTerminalShellExecution(listener, thisArg?, disposables?) {
-				checkProposedApiEnabled(extension, 'terminalShellIntegration');
 				return _asExtensionEvent(extHostTerminalShellIntegration.onDidEndTerminalShellExecution)(listener, thisArg, disposables);
 			},
 			get state() {
@@ -961,10 +961,14 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 				// Note, undefined/null have different meanings on "exclude"
 				return extHostWorkspace.findFiles(include, exclude, maxResults, extension.identifier, token);
 			},
-			findFiles2: (filePattern, options?, token?) => {
+			findFiles2: (filePattern: vscode.GlobPattern, options?: vscode.FindFiles2Options, token?: vscode.CancellationToken): Thenable<vscode.Uri[]> => {
 				checkProposedApiEnabled(extension, 'findFiles2');
 				return extHostWorkspace.findFiles2(filePattern, options, extension.identifier, token);
 			},
+			findFiles2New: (filePattern: vscode.GlobPattern[], options?: vscode.FindFiles2OptionsNew, token?: vscode.CancellationToken): Thenable<vscode.Uri[]> => {
+				checkProposedApiEnabled(extension, 'findFiles2New');
+				return extHostWorkspace.findFiles2New(filePattern, options, extension.identifier, token);
+			},
 			findTextInFiles: (query: vscode.TextSearchQuery, optionsOrCallback: vscode.FindTextInFilesOptions | ((result: vscode.TextSearchResult) => void), callbackOrToken?: vscode.CancellationToken | ((result: vscode.TextSearchResult) => void), token?: vscode.CancellationToken) => {
 				checkProposedApiEnabled(extension, 'findTextInFiles');
 				let options: vscode.FindTextInFilesOptions;
@@ -981,6 +985,11 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 
 				return extHostWorkspace.findTextInFiles(query, options || {}, callback, extension.identifier, token);
 			},
+			findTextInFilesNew: (query: vscode.TextSearchQueryNew, options?: vscode.FindTextInFilesOptionsNew, token?: vscode.CancellationToken): vscode.FindTextInFilesResponse => {
+				checkProposedApiEnabled(extension, 'findTextInFilesNew');
+				checkProposedApiEnabled(extension, 'textSearchProviderNew');
+				return extHostWorkspace.findTextInFilesNew(query, options, extension.identifier, token);
+			},
 			save: (uri) => {
 				return extHostWorkspace.save(uri);
 			},
@@ -996,22 +1005,22 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			createFileSystemWatcher: (pattern, optionsOrIgnoreCreate, ignoreChange?, ignoreDelete?): vscode.FileSystemWatcher => {
 				let options: FileSystemWatcherCreateOptions | undefined = undefined;
 
-				if (typeof optionsOrIgnoreCreate === 'boolean') {
+				if (optionsOrIgnoreCreate && typeof optionsOrIgnoreCreate !== 'boolean') {
+					checkProposedApiEnabled(extension, 'createFileSystemWatcher');
+					options = {
+						...optionsOrIgnoreCreate,
+						correlate: true
+					};
+				} else {
 					options = {
 						ignoreCreateEvents: Boolean(optionsOrIgnoreCreate),
 						ignoreChangeEvents: Boolean(ignoreChange),
 						ignoreDeleteEvents: Boolean(ignoreDelete),
 						correlate: false
 					};
-				} else if (optionsOrIgnoreCreate) {
-					checkProposedApiEnabled(extension, 'createFileSystemWatcher');
-					options = {
-						...optionsOrIgnoreCreate,
-						correlate: true
-					};
 				}
 
-				return extHostFileSystemEvent.createFileSystemWatcher(extHostWorkspace, extension, pattern, options);
+				return extHostFileSystemEvent.createFileSystemWatcher(extHostWorkspace, configProvider, extension, pattern, options);
 			},
 			get textDocuments() {
 				return extHostDocuments.getAllDocumentData().map(data => data.document);
@@ -1034,6 +1043,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 				}
 
 				return uriPromise.then(uri => {
+					extHostLogService.trace(`openTextDocument from ${extension.identifier}`);
 					if (uri.scheme === Schemas.vscodeRemote && !uri.authority) {
 						extHostApiDeprecation.report('workspace.openTextDocument', extension, `A URI of 'vscode-remote' scheme requires an authority.`);
 					}
@@ -1117,16 +1127,30 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			},
 			registerFileSearchProvider: (scheme: string, provider: vscode.FileSearchProvider) => {
 				checkProposedApiEnabled(extension, 'fileSearchProvider');
-				return extHostSearch.registerFileSearchProvider(scheme, provider);
+				return extHostSearch.registerFileSearchProviderOld(scheme, provider);
 			},
 			registerTextSearchProvider: (scheme: string, provider: vscode.TextSearchProvider) => {
 				checkProposedApiEnabled(extension, 'textSearchProvider');
-				return extHostSearch.registerTextSearchProvider(scheme, provider);
+				return extHostSearch.registerTextSearchProviderOld(scheme, provider);
 			},
 			registerAITextSearchProvider: (scheme: string, provider: vscode.AITextSearchProvider) => {
 				// there are some dependencies on textSearchProvider, so we need to check for both
 				checkProposedApiEnabled(extension, 'aiTextSearchProvider');
 				checkProposedApiEnabled(extension, 'textSearchProvider');
+				return extHostSearch.registerAITextSearchProviderOld(scheme, provider);
+			},
+			registerFileSearchProviderNew: (scheme: string, provider: vscode.FileSearchProviderNew) => {
+				checkProposedApiEnabled(extension, 'fileSearchProviderNew');
+				return extHostSearch.registerFileSearchProvider(scheme, provider);
+			},
+			registerTextSearchProviderNew: (scheme: string, provider: vscode.TextSearchProviderNew) => {
+				checkProposedApiEnabled(extension, 'textSearchProviderNew');
+				return extHostSearch.registerTextSearchProvider(scheme, provider);
+			},
+			registerAITextSearchProviderNew: (scheme: string, provider: vscode.AITextSearchProviderNew) => {
+				// there are some dependencies on textSearchProvider, so we need to check for both
+				checkProposedApiEnabled(extension, 'aiTextSearchProviderNew');
+				checkProposedApiEnabled(extension, 'textSearchProviderNew');
 				return extHostSearch.registerAITextSearchProvider(scheme, provider);
 			},
 			registerRemoteAuthorityResolver: (authorityPrefix: string, resolver: vscode.RemoteAuthorityResolver) => {
@@ -1381,8 +1405,6 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 
 		// namespace: interactive
 		const interactive: typeof vscode.interactive = {
-			// TODO Can be deleted after another Insiders
-			_version: 1,
 			transferActiveChat(toWorkspace: vscode.Uri) {
 				checkProposedApiEnabled(extension, 'interactive');
 				return extHostChatAgents2.transferActiveChat(toWorkspace);
@@ -1407,10 +1429,6 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 
 		// namespace: chat
 		const chat: typeof vscode.chat = {
-			// IMPORTANT
-			// this needs to be updated whenever the API proposal changes and breaks backwards compatibility
-			_version: 1,
-
 			registerChatResponseProvider(id: string, provider: vscode.ChatResponseProvider, metadata: vscode.ChatResponseProviderMetadata) {
 				checkProposedApiEnabled(extension, 'chatProvider');
 				return extHostLanguageModels.registerLanguageModel(extension, id, provider, metadata);
@@ -1423,29 +1441,29 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 				checkProposedApiEnabled(extension, 'mappedEditsProvider');
 				return extHostLanguageFeatures.registerMappedEditsProvider(extension, selector, provider);
 			},
+			registerMappedEditsProvider2(provider: vscode.MappedEditsProvider2) {
+				checkProposedApiEnabled(extension, 'mappedEditsProvider');
+				return extHostCodeMapper.registerMappedEditsProvider(extension, provider);
+			},
 			createChatParticipant(id: string, handler: vscode.ChatExtendedRequestHandler) {
 				return extHostChatAgents2.createChatAgent(extension, id, handler);
 			},
 			createDynamicChatParticipant(id: string, dynamicProps: vscode.DynamicChatParticipantProps, handler: vscode.ChatExtendedRequestHandler): vscode.ChatParticipant {
 				checkProposedApiEnabled(extension, 'chatParticipantPrivate');
 				return extHostChatAgents2.createDynamicChatAgent(extension, id, dynamicProps, handler);
-			}
+			},
+			registerChatParticipantDetectionProvider(provider: vscode.ChatParticipantDetectionProvider) {
+				checkProposedApiEnabled(extension, 'chatParticipantAdditions');
+				return extHostChatAgents2.registerChatParticipantDetectionProvider(extension, provider);
+			},
 		};
 
 		// namespace: lm
 		const lm: typeof vscode.lm = {
 			selectChatModels: (selector) => {
-				if (initData.quality === 'stable') {
-					console.warn(`[${ExtensionIdentifier.toKey(extension.identifier)}] This API is disabled in '${initData.environment.appName}'-stable.`);
-					return Promise.resolve([]);
-				}
 				return extHostLanguageModels.selectLanguageModels(extension, selector ?? {});
 			},
 			onDidChangeChatModels: (listener, thisArgs?, disposables?) => {
-				if (initData.quality === 'stable') {
-					console.warn(`[${ExtensionIdentifier.toKey(extension.identifier)}] This API is disabled in '${initData.environment.appName}'-stable.`);
-					return Event.None(listener, thisArgs, disposables);
-				}
 				return extHostLanguageModels.onDidChangeProviders(listener, thisArgs, disposables);
 			},
 			registerChatModelProvider: (id, provider, metadata) => {
@@ -1472,7 +1490,19 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 				} else {
 					return extHostEmbeddings.computeEmbeddings(embeddingsModel, input, token);
 				}
-			}
+			},
+			registerTool(toolId: string, tool: vscode.LanguageModelTool) {
+				checkProposedApiEnabled(extension, 'lmTools');
+				return extHostLanguageModelTools.registerTool(extension, toolId, tool);
+			},
+			invokeTool(toolId: string, parameters: vscode.LanguageModelToolInvocationOptions, token: vscode.CancellationToken) {
+				checkProposedApiEnabled(extension, 'lmTools');
+				return extHostLanguageModelTools.invokeTool(toolId, parameters, token);
+			},
+			get tools() {
+				checkProposedApiEnabled(extension, 'lmTools');
+				return extHostLanguageModelTools.tools;
+			},
 		};
 
 		// namespace: speech
@@ -1483,6 +1513,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			}
 		};
 
+		// eslint-disable-next-line local/code-no-dangerous-type-assertions
 		return <typeof vscode>{
 			version: initData.version,
 			// namespaces
@@ -1530,6 +1561,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			CommentThreadCollapsibleState: extHostTypes.CommentThreadCollapsibleState,
 			CommentThreadState: extHostTypes.CommentThreadState,
 			CommentThreadApplicability: extHostTypes.CommentThreadApplicability,
+			CommentThreadFocus: extHostTypes.CommentThreadFocus,
 			CompletionItem: extHostTypes.CompletionItem,
 			CompletionItemKind: extHostTypes.CompletionItemKind,
 			CompletionItemTag: extHostTypes.CompletionItemTag,
@@ -1589,6 +1621,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			Position: extHostTypes.Position,
 			ProcessExecution: extHostTypes.ProcessExecution,
 			ProgressLocation: extHostTypes.ProgressLocation,
+			QuickInputButtonLocation: extHostTypes.QuickInputButtonLocation,
 			QuickInputButtons: extHostTypes.QuickInputButtons,
 			Range: extHostTypes.Range,
 			RelativePattern: extHostTypes.RelativePattern,
@@ -1677,6 +1710,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			TestResultState: extHostTypes.TestResultState,
 			TestRunRequest: extHostTypes.TestRunRequest,
 			TestMessage: extHostTypes.TestMessage,
+			TestMessageStackFrame: extHostTypes.TestMessageStackFrame,
 			TestTag: extHostTypes.TestTag,
 			TestRunProfileKind: extHostTypes.TestRunProfileKind,
 			TextSearchCompleteMessageType: TextSearchCompleteMessageType,
@@ -1722,30 +1756,37 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			ChatResponseProgressPart: extHostTypes.ChatResponseProgressPart,
 			ChatResponseProgressPart2: extHostTypes.ChatResponseProgressPart2,
 			ChatResponseReferencePart: extHostTypes.ChatResponseReferencePart,
+			ChatResponseReferencePart2: extHostTypes.ChatResponseReferencePart,
+			ChatResponseCodeCitationPart: extHostTypes.ChatResponseCodeCitationPart,
+			ChatResponseCodeblockUriPart: extHostTypes.ChatResponseCodeblockUriPart,
 			ChatResponseWarningPart: extHostTypes.ChatResponseWarningPart,
 			ChatResponseTextEditPart: extHostTypes.ChatResponseTextEditPart,
 			ChatResponseMarkdownWithVulnerabilitiesPart: extHostTypes.ChatResponseMarkdownWithVulnerabilitiesPart,
 			ChatResponseCommandButtonPart: extHostTypes.ChatResponseCommandButtonPart,
 			ChatResponseDetectedParticipantPart: extHostTypes.ChatResponseDetectedParticipantPart,
 			ChatResponseConfirmationPart: extHostTypes.ChatResponseConfirmationPart,
+			ChatResponseMovePart: extHostTypes.ChatResponseMovePart,
+			ChatResponseReferencePartStatusKind: extHostTypes.ChatResponseReferencePartStatusKind,
 			ChatRequestTurn: extHostTypes.ChatRequestTurn,
 			ChatResponseTurn: extHostTypes.ChatResponseTurn,
 			ChatLocation: extHostTypes.ChatLocation,
+			ChatRequestEditorData: extHostTypes.ChatRequestEditorData,
+			ChatRequestNotebookData: extHostTypes.ChatRequestNotebookData,
 			LanguageModelChatMessageRole: extHostTypes.LanguageModelChatMessageRole,
 			LanguageModelChatMessage: extHostTypes.LanguageModelChatMessage,
-			LanguageModelChatMessageFunctionResultPart: extHostTypes.LanguageModelFunctionResultPart,
+			LanguageModelChatMessageToolResultPart: extHostTypes.LanguageModelToolResultPart,
 			LanguageModelChatResponseTextPart: extHostTypes.LanguageModelTextPart,
-			LanguageModelChatResponseFunctionUsePart: extHostTypes.LanguageModelFunctionUsePart,
-			LanguageModelChatMessage2: extHostTypes.LanguageModelChatMessage, // TODO@jrieken REMOVE
-			LanguageModelChatSystemMessage: extHostTypes.LanguageModelChatSystemMessage,// TODO@jrieken REMOVE
-			LanguageModelChatUserMessage: extHostTypes.LanguageModelChatUserMessage,// TODO@jrieken REMOVE
-			LanguageModelChatAssistantMessage: extHostTypes.LanguageModelChatAssistantMessage,// TODO@jrieken REMOVE
+			LanguageModelChatResponseToolCallPart: extHostTypes.LanguageModelToolCallPart,
 			LanguageModelError: extHostTypes.LanguageModelError,
 			NewSymbolName: extHostTypes.NewSymbolName,
 			NewSymbolNameTag: extHostTypes.NewSymbolNameTag,
 			NewSymbolNameTriggerKind: extHostTypes.NewSymbolNameTriggerKind,
 			InlineEdit: extHostTypes.InlineEdit,
 			InlineEditTriggerKind: extHostTypes.InlineEditTriggerKind,
+			ExcludeSettingOptions: ExcludeSettingOptions,
+			TextSearchContextNew: TextSearchContextNew,
+			TextSearchMatchNew: TextSearchMatchNew,
+			TextSearchCompleteMessageTypeNew: TextSearchCompleteMessageType,
 		};
 	};
 }
diff --git a/src/vs/workbench/api/common/extHost.common.services.ts b/src/vs/workbench/api/common/extHost.common.services.ts
index 0427ebe7b17..76bff401577 100644
--- a/src/vs/workbench/api/common/extHost.common.services.ts
+++ b/src/vs/workbench/api/common/extHost.common.services.ts
@@ -3,35 +3,35 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IExtHostOutputService, ExtHostOutputService } from 'vs/workbench/api/common/extHostOutput';
-import { IExtHostWorkspace, ExtHostWorkspace } from 'vs/workbench/api/common/extHostWorkspace';
-import { IExtHostDecorations, ExtHostDecorations } from 'vs/workbench/api/common/extHostDecorations';
-import { IExtHostConfiguration, ExtHostConfiguration } from 'vs/workbench/api/common/extHostConfiguration';
-import { IExtHostCommands, ExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
-import { IExtHostDocumentsAndEditors, ExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
-import { IExtHostTerminalService, WorkerExtHostTerminalService } from 'vs/workbench/api/common/extHostTerminalService';
-import { IExtHostTask, WorkerExtHostTask } from 'vs/workbench/api/common/extHostTask';
-import { IExtHostDebugService, WorkerExtHostDebugService } from 'vs/workbench/api/common/extHostDebugService';
-import { IExtHostSearch, ExtHostSearch } from 'vs/workbench/api/common/extHostSearch';
-import { IExtHostStorage, ExtHostStorage } from 'vs/workbench/api/common/extHostStorage';
-import { IExtHostTunnelService, ExtHostTunnelService } from 'vs/workbench/api/common/extHostTunnelService';
-import { IExtHostApiDeprecationService, ExtHostApiDeprecationService, } from 'vs/workbench/api/common/extHostApiDeprecationService';
-import { IExtHostWindow, ExtHostWindow } from 'vs/workbench/api/common/extHostWindow';
-import { IExtHostConsumerFileSystem, ExtHostConsumerFileSystem } from 'vs/workbench/api/common/extHostFileSystemConsumer';
-import { IExtHostFileSystemInfo, ExtHostFileSystemInfo } from 'vs/workbench/api/common/extHostFileSystemInfo';
-import { IExtHostSecretState, ExtHostSecretState } from 'vs/workbench/api/common/extHostSecretState';
-import { ExtHostTelemetry, IExtHostTelemetry } from 'vs/workbench/api/common/extHostTelemetry';
-import { ExtHostEditorTabs, IExtHostEditorTabs } from 'vs/workbench/api/common/extHostEditorTabs';
-import { ExtHostLoggerService } from 'vs/workbench/api/common/extHostLoggerService';
-import { ILoggerService } from 'vs/platform/log/common/log';
-import { ExtHostVariableResolverProviderService, IExtHostVariableResolverProvider } from 'vs/workbench/api/common/extHostVariableResolverService';
-import { ExtHostLocalizationService, IExtHostLocalizationService } from 'vs/workbench/api/common/extHostLocalizationService';
-import { ExtHostManagedSockets, IExtHostManagedSockets } from 'vs/workbench/api/common/extHostManagedSockets';
-import { ExtHostAuthentication, IExtHostAuthentication } from 'vs/workbench/api/common/extHostAuthentication';
-import { ExtHostLanguageModels, IExtHostLanguageModels } from 'vs/workbench/api/common/extHostLanguageModels';
-import { IExtHostTerminalShellIntegration, ExtHostTerminalShellIntegration } from 'vs/workbench/api/common/extHostTerminalShellIntegration';
-import { ExtHostTesting, IExtHostTesting } from 'vs/workbench/api/common/extHostTesting';
+import { InstantiationType, registerSingleton } from '../../../platform/instantiation/common/extensions.js';
+import { IExtHostOutputService, ExtHostOutputService } from './extHostOutput.js';
+import { IExtHostWorkspace, ExtHostWorkspace } from './extHostWorkspace.js';
+import { IExtHostDecorations, ExtHostDecorations } from './extHostDecorations.js';
+import { IExtHostConfiguration, ExtHostConfiguration } from './extHostConfiguration.js';
+import { IExtHostCommands, ExtHostCommands } from './extHostCommands.js';
+import { IExtHostDocumentsAndEditors, ExtHostDocumentsAndEditors } from './extHostDocumentsAndEditors.js';
+import { IExtHostTerminalService, WorkerExtHostTerminalService } from './extHostTerminalService.js';
+import { IExtHostTask, WorkerExtHostTask } from './extHostTask.js';
+import { IExtHostDebugService, WorkerExtHostDebugService } from './extHostDebugService.js';
+import { IExtHostSearch, ExtHostSearch } from './extHostSearch.js';
+import { IExtHostStorage, ExtHostStorage } from './extHostStorage.js';
+import { IExtHostTunnelService, ExtHostTunnelService } from './extHostTunnelService.js';
+import { IExtHostApiDeprecationService, ExtHostApiDeprecationService, } from './extHostApiDeprecationService.js';
+import { IExtHostWindow, ExtHostWindow } from './extHostWindow.js';
+import { IExtHostConsumerFileSystem, ExtHostConsumerFileSystem } from './extHostFileSystemConsumer.js';
+import { IExtHostFileSystemInfo, ExtHostFileSystemInfo } from './extHostFileSystemInfo.js';
+import { IExtHostSecretState, ExtHostSecretState } from './extHostSecretState.js';
+import { ExtHostTelemetry, IExtHostTelemetry } from './extHostTelemetry.js';
+import { ExtHostEditorTabs, IExtHostEditorTabs } from './extHostEditorTabs.js';
+import { ExtHostLoggerService } from './extHostLoggerService.js';
+import { ILoggerService } from '../../../platform/log/common/log.js';
+import { ExtHostVariableResolverProviderService, IExtHostVariableResolverProvider } from './extHostVariableResolverService.js';
+import { ExtHostLocalizationService, IExtHostLocalizationService } from './extHostLocalizationService.js';
+import { ExtHostManagedSockets, IExtHostManagedSockets } from './extHostManagedSockets.js';
+import { ExtHostAuthentication, IExtHostAuthentication } from './extHostAuthentication.js';
+import { ExtHostLanguageModels, IExtHostLanguageModels } from './extHostLanguageModels.js';
+import { IExtHostTerminalShellIntegration, ExtHostTerminalShellIntegration } from './extHostTerminalShellIntegration.js';
+import { ExtHostTesting, IExtHostTesting } from './extHostTesting.js';
 
 registerSingleton(IExtHostLocalizationService, ExtHostLocalizationService, InstantiationType.Delayed);
 registerSingleton(ILoggerService, ExtHostLoggerService, InstantiationType.Delayed);
diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts
index 4af2855cca3..26b584ef5f7 100644
--- a/src/vs/workbench/api/common/extHost.protocol.ts
+++ b/src/vs/workbench/api/common/extHost.protocol.ts
@@ -3,84 +3,88 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IRemoteConsoleLog } from 'vs/base/common/console';
-import { SerializedError } from 'vs/base/common/errors';
-import { IRelativePattern } from 'vs/base/common/glob';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import * as performance from 'vs/base/common/performance';
-import Severity from 'vs/base/common/severity';
-import { ThemeColor, ThemeIcon } from 'vs/base/common/themables';
-import { URI, UriComponents, UriDto } from 'vs/base/common/uri';
-import { RenderLineNumbersType, TextEditorCursorStyle } from 'vs/editor/common/config/editorOptions';
-import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { IPosition } from 'vs/editor/common/core/position';
-import { IRange } from 'vs/editor/common/core/range';
-import { ISelection, Selection } from 'vs/editor/common/core/selection';
-import { IChange } from 'vs/editor/common/diff/legacyLinesDiffComputer';
-import * as editorCommon from 'vs/editor/common/editorCommon';
-import { StandardTokenType } from 'vs/editor/common/encodedTokenAttributes';
-import * as languages from 'vs/editor/common/languages';
-import { CharacterPair, CommentRule, EnterAction } from 'vs/editor/common/languages/languageConfiguration';
-import { EndOfLineSequence } from 'vs/editor/common/model';
-import { IModelChangedEvent } from 'vs/editor/common/model/mirrorTextModel';
-import { IAccessibilityInformation } from 'vs/platform/accessibility/common/accessibility';
-import { ILocalizedString } from 'vs/platform/action/common/action';
-import { ConfigurationTarget, IConfigurationChange, IConfigurationData, IConfigurationOverrides } from 'vs/platform/configuration/common/configuration';
-import { ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
-import { IExtensionIdWithVersion } from 'vs/platform/extensionManagement/common/extensionStorage';
-import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import * as files from 'vs/platform/files/common/files';
-import { ResourceLabelFormatter } from 'vs/platform/label/common/label';
-import { ILoggerOptions, ILoggerResource, LogLevel } from 'vs/platform/log/common/log';
-import { IMarkerData } from 'vs/platform/markers/common/markers';
-import { IProgressOptions, IProgressStep } from 'vs/platform/progress/common/progress';
-import * as quickInput from 'vs/platform/quickinput/common/quickInput';
-import { IRemoteConnectionData, TunnelDescription } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { ClassifiedEvent, IGDPRProperty, OmitMetadata, StrictPropertyCheck } from 'vs/platform/telemetry/common/gdprTypings';
-import { TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
-import { ISerializableEnvironmentDescriptionMap, ISerializableEnvironmentVariableCollection } from 'vs/platform/terminal/common/environmentVariable';
-import { ICreateContributedTerminalProfileOptions, IProcessProperty, IProcessReadyWindowsPty, IShellLaunchConfigDto, ITerminalEnvironment, ITerminalLaunchError, ITerminalProfile, TerminalExitReason, TerminalLocation } from 'vs/platform/terminal/common/terminal';
-import { ProvidedPortAttributes, TunnelCreationOptions, TunnelOptions, TunnelPrivacyId, TunnelProviderFeatures } from 'vs/platform/tunnel/common/tunnel';
-import { EditSessionIdentityMatch } from 'vs/platform/workspace/common/editSessions';
-import { WorkspaceTrustRequestOptions } from 'vs/platform/workspace/common/workspaceTrust';
-import * as tasks from 'vs/workbench/api/common/shared/tasks';
-import { SaveReason } from 'vs/workbench/common/editor';
-import { IRevealOptions, ITreeItem, IViewBadge } from 'vs/workbench/common/views';
-import { CallHierarchyItem } from 'vs/workbench/contrib/callHierarchy/common/callHierarchy';
-import { ChatAgentLocation, IChatAgentMetadata, IChatAgentRequest, IChatAgentResult } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { IChatProgressResponseContent } from 'vs/workbench/contrib/chat/common/chatModel';
-import { IChatFollowup, IChatProgress, IChatResponseErrorDetails, IChatTask, IChatTaskDto, IChatUserActionEvent, ChatAgentVoteDirection } from 'vs/workbench/contrib/chat/common/chatService';
-import { IChatRequestVariableValue, IChatVariableData, IChatVariableResolverProgress } from 'vs/workbench/contrib/chat/common/chatVariables';
-import { IChatMessage, IChatResponseFragment, ILanguageModelChatMetadata, ILanguageModelChatSelector, ILanguageModelsChangeEvent } from 'vs/workbench/contrib/chat/common/languageModels';
-import { DebugConfigurationProviderTriggerKind, IAdapterDescriptor, IConfig, IDebugSessionReplMode, IDebugTestRunReference, IDebugVisualization, IDebugVisualizationContext, IDebugVisualizationTreeItem, MainThreadDebugVisualization } from 'vs/workbench/contrib/debug/common/debug';
-import * as notebookCommon from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { CellExecutionUpdateType } from 'vs/workbench/contrib/notebook/common/notebookExecutionService';
-import { ICellExecutionComplete, ICellExecutionStateUpdate } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
-import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
-import { InputValidationType } from 'vs/workbench/contrib/scm/common/scm';
-import { IWorkspaceSymbol, NotebookPriorityInfo } from 'vs/workbench/contrib/search/common/search';
-import { IRawClosedNotebookFileMatch } from 'vs/workbench/contrib/search/common/searchNotebookHelpers';
-import { IKeywordRecognitionEvent, ISpeechProviderMetadata, ISpeechToTextEvent, ITextToSpeechEvent } from 'vs/workbench/contrib/speech/common/speechService';
-import { CoverageDetails, ExtensionRunTestsRequest, ICallProfileRunHandler, IFileCoverage, ISerializedTestResults, IStartControllerTests, ITestItem, ITestMessage, ITestRunProfile, ITestRunTask, ResolvedTestRunRequest, TestMessageFollowupRequest, TestMessageFollowupResponse, TestResultState, TestsDiffOp } from 'vs/workbench/contrib/testing/common/testTypes';
-import { Timeline, TimelineChangeEvent, TimelineOptions, TimelineProviderDescriptor } from 'vs/workbench/contrib/timeline/common/timeline';
-import { TypeHierarchyItem } from 'vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
-import { RelatedInformationResult, RelatedInformationType } from 'vs/workbench/services/aiRelatedInformation/common/aiRelatedInformation';
-import { AuthenticationSession, AuthenticationSessionsChangeEvent, IAuthenticationCreateSessionOptions } from 'vs/workbench/services/authentication/common/authentication';
-import { EditorGroupColumn } from 'vs/workbench/services/editor/common/editorGroupColumn';
-import { IExtensionDescriptionDelta, IStaticWorkspaceData } from 'vs/workbench/services/extensions/common/extensionHostProtocol';
-import { IResolveAuthorityResult } from 'vs/workbench/services/extensions/common/extensionHostProxy';
-import { ActivationKind, ExtensionActivationReason, MissingExtensionDependency } from 'vs/workbench/services/extensions/common/extensions';
-import { Dto, IRPCProtocol, SerializableObjectWithBuffers, createProxyIdentifier } from 'vs/workbench/services/extensions/common/proxyIdentifier';
-import { ILanguageStatus } from 'vs/workbench/services/languageStatus/common/languageStatusService';
-import { OutputChannelUpdateMode } from 'vs/workbench/services/output/common/output';
-import { CandidatePort } from 'vs/workbench/services/remote/common/tunnelModel';
-import { IFileQueryBuilderOptions, ITextQueryBuilderOptions } from 'vs/workbench/services/search/common/queryBuilder';
-import * as search from 'vs/workbench/services/search/common/search';
-import { ISaveProfileResult } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import type { TerminalShellExecutionCommandLineConfidence } from 'vscode';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { IRemoteConsoleLog } from '../../../base/common/console.js';
+import { SerializedError } from '../../../base/common/errors.js';
+import { IRelativePattern } from '../../../base/common/glob.js';
+import { IMarkdownString } from '../../../base/common/htmlContent.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import * as performance from '../../../base/common/performance.js';
+import Severity from '../../../base/common/severity.js';
+import { ThemeColor, ThemeIcon } from '../../../base/common/themables.js';
+import { URI, UriComponents, UriDto } from '../../../base/common/uri.js';
+import { RenderLineNumbersType, TextEditorCursorStyle } from '../../../editor/common/config/editorOptions.js';
+import { ISingleEditOperation } from '../../../editor/common/core/editOperation.js';
+import { IPosition } from '../../../editor/common/core/position.js';
+import { IRange } from '../../../editor/common/core/range.js';
+import { ISelection, Selection } from '../../../editor/common/core/selection.js';
+import { IChange } from '../../../editor/common/diff/legacyLinesDiffComputer.js';
+import * as editorCommon from '../../../editor/common/editorCommon.js';
+import { StandardTokenType } from '../../../editor/common/encodedTokenAttributes.js';
+import * as languages from '../../../editor/common/languages.js';
+import { CharacterPair, CommentRule, EnterAction } from '../../../editor/common/languages/languageConfiguration.js';
+import { EndOfLineSequence } from '../../../editor/common/model.js';
+import { IModelChangedEvent } from '../../../editor/common/model/mirrorTextModel.js';
+import { IAccessibilityInformation } from '../../../platform/accessibility/common/accessibility.js';
+import { ILocalizedString } from '../../../platform/action/common/action.js';
+import { ConfigurationTarget, IConfigurationChange, IConfigurationData, IConfigurationOverrides } from '../../../platform/configuration/common/configuration.js';
+import { ConfigurationScope } from '../../../platform/configuration/common/configurationRegistry.js';
+import { IExtensionIdWithVersion } from '../../../platform/extensionManagement/common/extensionStorage.js';
+import { ExtensionIdentifier, IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import * as files from '../../../platform/files/common/files.js';
+import { ResourceLabelFormatter } from '../../../platform/label/common/label.js';
+import { ILoggerOptions, ILoggerResource, LogLevel } from '../../../platform/log/common/log.js';
+import { IMarkerData } from '../../../platform/markers/common/markers.js';
+import { IProgressOptions, IProgressStep } from '../../../platform/progress/common/progress.js';
+import * as quickInput from '../../../platform/quickinput/common/quickInput.js';
+import { IRemoteConnectionData, TunnelDescription } from '../../../platform/remote/common/remoteAuthorityResolver.js';
+import { AuthInfo, Credentials } from '../../../platform/request/common/request.js';
+import { ClassifiedEvent, IGDPRProperty, OmitMetadata, StrictPropertyCheck } from '../../../platform/telemetry/common/gdprTypings.js';
+import { TelemetryLevel } from '../../../platform/telemetry/common/telemetry.js';
+import { ISerializableEnvironmentDescriptionMap, ISerializableEnvironmentVariableCollection } from '../../../platform/terminal/common/environmentVariable.js';
+import { ICreateContributedTerminalProfileOptions, IProcessProperty, IProcessReadyWindowsPty, IShellLaunchConfigDto, ITerminalEnvironment, ITerminalLaunchError, ITerminalProfile, TerminalExitReason, TerminalLocation } from '../../../platform/terminal/common/terminal.js';
+import { ProvidedPortAttributes, TunnelCreationOptions, TunnelOptions, TunnelPrivacyId, TunnelProviderFeatures } from '../../../platform/tunnel/common/tunnel.js';
+import { EditSessionIdentityMatch } from '../../../platform/workspace/common/editSessions.js';
+import { WorkspaceTrustRequestOptions } from '../../../platform/workspace/common/workspaceTrust.js';
+import { SaveReason } from '../../common/editor.js';
+import { IRevealOptions, ITreeItem, IViewBadge } from '../../common/views.js';
+import { CallHierarchyItem } from '../../contrib/callHierarchy/common/callHierarchy.js';
+import { ChatAgentLocation, IChatAgentMetadata, IChatAgentRequest, IChatAgentResult, IChatWelcomeMessageContent } from '../../contrib/chat/common/chatAgents.js';
+import { ICodeMapperRequest, ICodeMapperResult } from '../../contrib/chat/common/chatCodeMapperService.js';
+import { IChatProgressHistoryResponseContent } from '../../contrib/chat/common/chatModel.js';
+import { IChatFollowup, IChatProgress, IChatResponseErrorDetails, IChatTask, IChatTaskDto, IChatUserActionEvent, IChatVoteAction } from '../../contrib/chat/common/chatService.js';
+import { IChatRequestVariableValue, IChatVariableData, IChatVariableResolverProgress } from '../../contrib/chat/common/chatVariables.js';
+import { IChatMessage, IChatResponseFragment, ILanguageModelChatMetadata, ILanguageModelChatSelector, ILanguageModelsChangeEvent } from '../../contrib/chat/common/languageModels.js';
+import { IToolConfirmationMessages, IToolData, IToolInvocation, IToolResult } from '../../contrib/chat/common/languageModelToolsService.js';
+import { DebugConfigurationProviderTriggerKind, IAdapterDescriptor, IConfig, IDebugSessionReplMode, IDebugTestRunReference, IDebugVisualization, IDebugVisualizationContext, IDebugVisualizationTreeItem, MainThreadDebugVisualization } from '../../contrib/debug/common/debug.js';
+import * as notebookCommon from '../../contrib/notebook/common/notebookCommon.js';
+import { CellExecutionUpdateType } from '../../contrib/notebook/common/notebookExecutionService.js';
+import { ICellExecutionComplete, ICellExecutionStateUpdate } from '../../contrib/notebook/common/notebookExecutionStateService.js';
+import { ICellRange } from '../../contrib/notebook/common/notebookRange.js';
+import { InputValidationType } from '../../contrib/scm/common/scm.js';
+import { IWorkspaceSymbol, NotebookPriorityInfo } from '../../contrib/search/common/search.js';
+import { IRawClosedNotebookFileMatch } from '../../contrib/search/common/searchNotebookHelpers.js';
+import { IKeywordRecognitionEvent, ISpeechProviderMetadata, ISpeechToTextEvent, ITextToSpeechEvent } from '../../contrib/speech/common/speechService.js';
+import { CoverageDetails, ExtensionRunTestsRequest, ICallProfileRunHandler, IFileCoverage, ISerializedTestResults, IStartControllerTests, ITestItem, ITestMessage, ITestRunProfile, ITestRunTask, ResolvedTestRunRequest, TestControllerCapability, TestMessageFollowupRequest, TestMessageFollowupResponse, TestResultState, TestsDiffOp } from '../../contrib/testing/common/testTypes.js';
+import { Timeline, TimelineChangeEvent, TimelineOptions, TimelineProviderDescriptor } from '../../contrib/timeline/common/timeline.js';
+import { TypeHierarchyItem } from '../../contrib/typeHierarchy/common/typeHierarchy.js';
+import { RelatedInformationResult, RelatedInformationType } from '../../services/aiRelatedInformation/common/aiRelatedInformation.js';
+import { AuthenticationSession, AuthenticationSessionAccount, AuthenticationSessionsChangeEvent, IAuthenticationCreateSessionOptions, IAuthenticationProviderSessionOptions } from '../../services/authentication/common/authentication.js';
+import { EditorGroupColumn } from '../../services/editor/common/editorGroupColumn.js';
+import { IExtensionDescriptionDelta, IStaticWorkspaceData } from '../../services/extensions/common/extensionHostProtocol.js';
+import { IResolveAuthorityResult } from '../../services/extensions/common/extensionHostProxy.js';
+import { ActivationKind, ExtensionActivationReason, MissingExtensionDependency } from '../../services/extensions/common/extensions.js';
+import { Dto, IRPCProtocol, SerializableObjectWithBuffers, createProxyIdentifier } from '../../services/extensions/common/proxyIdentifier.js';
+import { ILanguageStatus } from '../../services/languageStatus/common/languageStatusService.js';
+import { OutputChannelUpdateMode } from '../../services/output/common/output.js';
+import { CandidatePort } from '../../services/remote/common/tunnelModel.js';
+import { IFileQueryBuilderOptions, ITextQueryBuilderOptions } from '../../services/search/common/queryBuilder.js';
+import * as search from '../../services/search/common/search.js';
+import { TextSearchCompleteMessage } from '../../services/search/common/searchExtTypes.js';
+import { ISaveProfileResult } from '../../services/userDataProfile/common/userDataProfile.js';
+import { TerminalShellExecutionCommandLineConfidence } from './extHostTypes.js';
+import * as tasks from './shared/tasks.js';
 
 export interface IWorkspaceData extends IStaticWorkspaceData {
 	folders: { uri: UriComponents; name: string; index: number }[];
@@ -143,11 +147,12 @@ export interface MainThreadCommentsShape extends IDisposable {
 	$registerCommentController(handle: number, id: string, label: string, extensionId: string): void;
 	$unregisterCommentController(handle: number): void;
 	$updateCommentControllerFeatures(handle: number, features: CommentProviderFeatures): void;
-	$createCommentThread(handle: number, commentThreadHandle: number, threadId: string, resource: UriComponents, range: IRange | ICellRange | undefined, extensionId: ExtensionIdentifier, isTemplate: boolean, editorId?: string): languages.CommentThread<IRange | ICellRange> | undefined;
+	$createCommentThread(handle: number, commentThreadHandle: number, threadId: string, resource: UriComponents, range: IRange | ICellRange | undefined, comments: languages.Comment[], extensionId: ExtensionIdentifier, isTemplate: boolean, editorId?: string): languages.CommentThread<IRange | ICellRange> | undefined;
 	$updateCommentThread(handle: number, commentThreadHandle: number, threadId: string, resource: UriComponents, changes: CommentThreadChanges): void;
 	$deleteCommentThread(handle: number, commentThreadHandle: number): void;
 	$updateCommentingRanges(handle: number, resourceHints?: languages.CommentingRangeResourceHint): void;
-	$revealCommentThread(handle: number, commentThreadHandle: number, options: languages.CommentThreadRevealOptions): Promise<void>;
+	$revealCommentThread(handle: number, commentThreadHandle: number, commentUniqueIdInThread: number, options: languages.CommentThreadRevealOptions): Promise<void>;
+	$hideCommentThread(handle: number, commentThreadHandle: number): void;
 }
 
 export interface AuthenticationForceNewSessionOptions {
@@ -161,7 +166,7 @@ export interface MainThreadAuthenticationShape extends IDisposable {
 	$ensureProvider(id: string): Promise<void>;
 	$sendDidChangeSessions(providerId: string, event: AuthenticationSessionsChangeEvent): void;
 	$getSession(providerId: string, scopes: readonly string[], extensionId: string, extensionName: string, options: { createIfNone?: boolean; forceNewSession?: boolean | AuthenticationForceNewSessionOptions; clearSessionPreference?: boolean }): Promise<AuthenticationSession | undefined>;
-	$getSessions(providerId: string, scopes: readonly string[], extensionId: string, extensionName: string): Promise<AuthenticationSession[]>;
+	$getAccounts(providerId: string): Promise<ReadonlyArray<AuthenticationSessionAccount>>;
 	$removeSession(providerId: string, sessionId: string): Promise<void>;
 }
 
@@ -377,8 +382,29 @@ export interface IDocumentContextItemDto {
 	readonly ranges: IRange[];
 }
 
+export interface IConversationItemDto {
+	readonly type: 'request' | 'response';
+	readonly message: string;
+	readonly references?: IDocumentContextItemDto[];
+}
+
 export interface IMappedEditsContextDto {
 	documents: IDocumentContextItemDto[][];
+	conversation?: IConversationItemDto[];
+}
+
+export interface ICodeBlockDto {
+	code: string;
+	resource: UriComponents;
+}
+
+export interface IMappedEditsRequestDto {
+	readonly codeBlocks: ICodeBlockDto[];
+	readonly conversation?: IConversationItemDto[];
+}
+
+export interface IMappedEditsResultDto {
+	readonly errorMessage?: string;
 }
 
 export interface ISignatureHelpProviderMetadataDto {
@@ -443,7 +469,7 @@ export interface MainThreadLanguageFeaturesShape extends IDisposable {
 	$resolvePasteFileData(handle: number, requestId: number, dataId: string): Promise<VSBuffer>;
 	$resolveDocumentOnDropFileData(handle: number, requestId: number, dataId: string): Promise<VSBuffer>;
 	$setLanguageConfiguration(handle: number, languageId: string, configuration: ILanguageConfigurationDto): void;
-	$registerMappedEditsProvider(handle: number, selector: IDocumentFilterDto[]): void;
+	$registerMappedEditsProvider(handle: number, selector: IDocumentFilterDto[], displayName: string): void;
 }
 
 export interface MainThreadLanguagesShape extends IDisposable {
@@ -1054,6 +1080,7 @@ export interface INotebookDocumentShowOptions {
 	preserveFocus?: boolean;
 	pinned?: boolean;
 	selections?: ICellRange[];
+	label?: string;
 }
 
 export type INotebookCellStatusBarEntryDto = Dto<notebookCommon.INotebookCellStatusBarItem>;
@@ -1200,12 +1227,10 @@ export interface ExtHostSpeechShape {
 export interface MainThreadLanguageModelsShape extends IDisposable {
 	$registerLanguageModelProvider(handle: number, identifier: string, metadata: ILanguageModelChatMetadata): void;
 	$unregisterProvider(handle: number): void;
-	$handleProgressChunk(requestId: number, chunk: IChatResponseFragment): Promise<void>;
-
+	$tryStartChatRequest(extension: ExtensionIdentifier, provider: string, requestId: number, messages: IChatMessage[], options: {}, token: CancellationToken): Promise<void>;
+	$reportResponsePart(requestId: number, chunk: IChatResponseFragment): Promise<void>;
+	$reportResponseDone(requestId: number, error: SerializedError | undefined): Promise<void>;
 	$selectChatModels(selector: ILanguageModelChatSelector): Promise<string[]>;
-
-	$fetchResponse(extension: ExtensionIdentifier, provider: string, requestId: number, messages: IChatMessage[], options: {}, token: CancellationToken): Promise<any>;
-
 	$whenLanguageModelChatRequestMade(identifier: string, extension: ExtensionIdentifier, participant?: string, tokenCount?: number): void;
 	$countTokens(provider: string, value: string | IChatMessage, token: CancellationToken): Promise<number>;
 }
@@ -1213,8 +1238,9 @@ export interface MainThreadLanguageModelsShape extends IDisposable {
 export interface ExtHostLanguageModelsShape {
 	$acceptChatModelMetadata(data: ILanguageModelsChangeEvent): void;
 	$updateModelAccesslist(data: { from: ExtensionIdentifier; to: ExtensionIdentifier; enabled: boolean }[]): void;
-	$provideLanguageModelResponse(handle: number, requestId: number, from: ExtensionIdentifier, messages: IChatMessage[], options: { [name: string]: any }, token: CancellationToken): Promise<any>;
-	$handleResponseFragment(requestId: number, chunk: IChatResponseFragment): Promise<void>;
+	$startChatRequest(handle: number, requestId: number, from: ExtensionIdentifier, messages: IChatMessage[], options: { [name: string]: any }, token: CancellationToken): Promise<void>;
+	$acceptResponsePart(requestId: number, chunk: IChatResponseFragment): Promise<void>;
+	$acceptResponseDone(requestId: number, error: SerializedError | undefined): Promise<void>;
 	$provideTokenLength(handle: number, value: string | IChatMessage, token: CancellationToken): Promise<number>;
 }
 
@@ -1242,6 +1268,8 @@ export interface IDynamicChatAgentProps {
 
 export interface MainThreadChatAgentsShape2 extends IDisposable {
 	$registerAgent(handle: number, extension: ExtensionIdentifier, id: string, metadata: IExtensionChatAgentMetadata, dynamicProps: IDynamicChatAgentProps | undefined): void;
+	$registerChatParticipantDetectionProvider(handle: number): void;
+	$unregisterChatParticipantDetectionProvider(handle: number): void;
 	$registerAgentCompletionsProvider(handle: number, id: string, triggerCharacters: string[]): void;
 	$unregisterAgentCompletionsProvider(handle: number, id: string): void;
 	$updateAgent(handle: number, metadataUpdate: IExtensionChatAgentMetadata): void;
@@ -1251,6 +1279,19 @@ export interface MainThreadChatAgentsShape2 extends IDisposable {
 	$transferActiveChatSession(toWorkspace: UriComponents): void;
 }
 
+export interface ICodeMapperTextEdit {
+	uri: URI;
+	edits: languages.TextEdit[];
+}
+
+export type ICodeMapperProgressDto = Dto<ICodeMapperTextEdit>;
+
+export interface MainThreadCodeMapperShape extends IDisposable {
+	$registerCodeMapperProvider(handle: number): void;
+	$unregisterCodeMapperProvider(handle: number): void;
+	$handleProgress(requestId: string, data: ICodeMapperProgressDto): Promise<void>;
+}
+
 export interface IChatAgentCompletionItem {
 	id: string;
 	fullName?: string;
@@ -1264,7 +1305,7 @@ export interface IChatAgentCompletionItem {
 }
 
 export type IChatContentProgressDto =
-	| Dto<Exclude<IChatProgressResponseContent, IChatTask>>
+	| Dto<Exclude<IChatProgressHistoryResponseContent, IChatTask>>
 	| IChatTaskDto;
 
 export type IChatAgentHistoryEntryDto = {
@@ -1274,14 +1315,26 @@ export type IChatAgentHistoryEntryDto = {
 };
 
 export interface ExtHostChatAgentsShape2 {
-	$invokeAgent(handle: number, request: IChatAgentRequest, context: { history: IChatAgentHistoryEntryDto[] }, token: CancellationToken): Promise<IChatAgentResult | undefined>;
-	$provideFollowups(request: IChatAgentRequest, handle: number, result: IChatAgentResult, context: { history: IChatAgentHistoryEntryDto[] }, token: CancellationToken): Promise<IChatFollowup[]>;
-	$acceptFeedback(handle: number, result: IChatAgentResult, vote: ChatAgentVoteDirection, reportIssue?: boolean): void;
+	$invokeAgent(handle: number, request: Dto<IChatAgentRequest>, context: { history: IChatAgentHistoryEntryDto[] }, token: CancellationToken): Promise<IChatAgentResult | undefined>;
+	$provideFollowups(request: Dto<IChatAgentRequest>, handle: number, result: IChatAgentResult, context: { history: IChatAgentHistoryEntryDto[] }, token: CancellationToken): Promise<IChatFollowup[]>;
+	$acceptFeedback(handle: number, result: IChatAgentResult, voteAction: IChatVoteAction): void;
 	$acceptAction(handle: number, result: IChatAgentResult, action: IChatUserActionEvent): void;
 	$invokeCompletionProvider(handle: number, query: string, token: CancellationToken): Promise<IChatAgentCompletionItem[]>;
-	$provideWelcomeMessage(handle: number, location: ChatAgentLocation, token: CancellationToken): Promise<(string | IMarkdownString)[] | undefined>;
+	$provideWelcomeMessage(handle: number, token: CancellationToken): Promise<IChatWelcomeMessageContent | undefined>;
+	$provideChatTitle(handle: number, context: IChatAgentHistoryEntryDto[], token: CancellationToken): Promise<string | undefined>;
 	$provideSampleQuestions(handle: number, location: ChatAgentLocation, token: CancellationToken): Promise<IChatFollowup[] | undefined>;
 	$releaseSession(sessionId: string): void;
+	$detectChatParticipant(handle: number, request: Dto<IChatAgentRequest>, context: { history: IChatAgentHistoryEntryDto[] }, options: { participants: IChatParticipantMetadata[]; location: ChatAgentLocation }, token: CancellationToken): Promise<IChatParticipantDetectionResult | null | undefined>;
+}
+export interface IChatParticipantMetadata {
+	participant: string;
+	command?: string;
+	disambiguation: { category: string; description: string; examples: string[] }[];
+}
+
+export interface IChatParticipantDetectionResult {
+	participant: string;
+	command?: string;
 }
 
 export type IChatVariableResolverProgressDto =
@@ -1293,12 +1346,31 @@ export interface MainThreadChatVariablesShape extends IDisposable {
 	$unregisterVariable(handle: number): void;
 }
 
+export type IToolDataDto = Omit<IToolData, 'when'>;
+
+export interface MainThreadLanguageModelToolsShape extends IDisposable {
+	$getTools(): Promise<Dto<IToolDataDto>[]>;
+	$invokeTool(dto: IToolInvocation, token: CancellationToken): Promise<IToolResult>;
+	$countTokensForInvocation(callId: string, input: string, token: CancellationToken): Promise<number>;
+	$registerTool(id: string): void;
+	$unregisterTool(name: string): void;
+}
+
 export type IChatRequestVariableValueDto = Dto<IChatRequestVariableValue>;
 
 export interface ExtHostChatVariablesShape {
 	$resolveVariable(handle: number, requestId: string, messageText: string, token: CancellationToken): Promise<IChatRequestVariableValueDto | undefined>;
 }
 
+export interface ExtHostLanguageModelToolsShape {
+	$onDidChangeTools(tools: IToolDataDto[]): void;
+	$invokeTool(dto: IToolInvocation, token: CancellationToken): Promise<IToolResult>;
+	$countTokensForInvocation(callId: string, input: string, token: CancellationToken): Promise<number>;
+
+	$provideToolConfirmationMessages(toolId: string, participantName: string, parameters: any, token: CancellationToken): Promise<IToolConfirmationMessages | undefined>;
+	$provideToolInvocationMessage(toolId: string, parameters: any, token: CancellationToken): Promise<string | undefined>;
+}
+
 export interface MainThreadUrlsShape extends IDisposable {
 	$registerUriHandler(handle: number, extensionId: ExtensionIdentifier, extensionDisplayName: string): Promise<void>;
 	$unregisterUriHandler(handle: number): Promise<void>;
@@ -1363,6 +1435,7 @@ export interface ExtHostProfileContentHandlersShape {
 
 export interface ITextSearchComplete {
 	limitHit?: boolean;
+	message?: TextSearchCompleteMessage | TextSearchCompleteMessage[];
 }
 
 export interface MainThreadWorkspaceShape extends IDisposable {
@@ -1373,6 +1446,8 @@ export interface MainThreadWorkspaceShape extends IDisposable {
 	$saveAll(includeUntitled?: boolean): Promise<boolean>;
 	$updateWorkspaceFolders(extensionName: string, index: number, deleteCount: number, workspaceFoldersToAdd: { uri: UriComponents; name?: string }[]): Promise<void>;
 	$resolveProxy(url: string): Promise<string | undefined>;
+	$lookupAuthorization(authInfo: AuthInfo): Promise<Credentials | undefined>;
+	$lookupKerberosAuthorization(url: string): Promise<string | undefined>;
 	$loadCertificates(): Promise<string[]>;
 	$requestWorkspaceTrust(options?: WorkspaceTrustRequestOptions): Promise<boolean | undefined>;
 	$registerEditSessionIdentityProvider(handle: number, scheme: string): void;
@@ -1459,14 +1534,13 @@ export interface SCMProviderFeatures {
 	count?: number;
 	commitTemplate?: string;
 	acceptInputCommand?: languages.Command;
-	actionButton?: SCMActionButtonDto | null;
+	actionButton?: SCMActionButtonDto;
 	statusBarCommands?: ICommandDto[];
 }
 
 export interface SCMActionButtonDto {
-	command: ICommandDto;
+	command: ICommandDto & { shortTitle?: string };
 	secondaryCommands?: ICommandDto[][];
-	description?: string;
 	enabled: boolean;
 }
 
@@ -1498,19 +1572,35 @@ export type SCMRawResourceSplices = [
 	SCMRawResourceSplice[]
 ];
 
-export interface SCMHistoryItemGroupDto {
+export interface SCMHistoryItemRefDto {
 	readonly id: string;
 	readonly name: string;
-	readonly base?: Omit<SCMHistoryItemGroupDto, 'base'>;
+	readonly revision?: string;
+	readonly category?: string;
+	readonly description?: string;
+	readonly icon?: UriComponents | { light: UriComponents; dark: UriComponents } | ThemeIcon;
+}
+
+export interface SCMHistoryItemRefsChangeEventDto {
+	readonly added: readonly SCMHistoryItemRefDto[];
+	readonly modified: readonly SCMHistoryItemRefDto[];
+	readonly removed: readonly SCMHistoryItemRefDto[];
+	readonly silent: boolean;
 }
 
 export interface SCMHistoryItemDto {
 	readonly id: string;
 	readonly parentIds: string[];
 	readonly message: string;
+	readonly displayId?: string;
 	readonly author?: string;
-	readonly icon?: UriComponents | { light: UriComponents; dark: UriComponents } | ThemeIcon;
 	readonly timestamp?: number;
+	readonly statistics?: {
+		readonly files: number;
+		readonly insertions: number;
+		readonly deletions: number;
+	};
+	readonly references?: SCMHistoryItemRefDto[];
 }
 
 export interface SCMHistoryItemChangeDto {
@@ -1539,7 +1629,8 @@ export interface MainThreadSCMShape extends IDisposable {
 	$showValidationMessage(sourceControlHandle: number, message: string | IMarkdownString, type: InputValidationType): Promise<void>;
 	$setValidationProviderIsEnabled(sourceControlHandle: number, enabled: boolean): Promise<void>;
 
-	$onDidChangeHistoryProviderCurrentHistoryItemGroup(sourceControlHandle: number, historyItemGroup: SCMHistoryItemGroupDto | undefined): Promise<void>;
+	$onDidChangeHistoryProviderCurrentHistoryItemRefs(sourceControlHandle: number, historyItemRef?: SCMHistoryItemRefDto, historyItemRemoteRef?: SCMHistoryItemRefDto, historyItemBaseRef?: SCMHistoryItemRefDto): Promise<void>;
+	$onDidChangeHistoryProviderHistoryItemRefs(sourceControlHandle: number, historyItemRefs: SCMHistoryItemRefsChangeEventDto): Promise<void>;
 }
 
 export interface MainThreadQuickDiffShape extends IDisposable {
@@ -1620,7 +1711,7 @@ export interface MainThreadTunnelServiceShape extends IDisposable {
 	$openTunnel(tunnelOptions: TunnelOptions, source: string | undefined): Promise<TunnelDto | undefined>;
 	$closeTunnel(remote: { host: string; port: number }): Promise<void>;
 	$getTunnels(): Promise<TunnelDescription[]>;
-	$setTunnelProvider(features?: TunnelProviderFeatures): Promise<void>;
+	$setTunnelProvider(features: TunnelProviderFeatures | undefined, enablePortsView: boolean): Promise<void>;
 	$setRemoteTunnelService(processId: number): Promise<void>;
 	$setCandidateFilter(): Promise<void>;
 	$onFoundNewCandidates(candidates: CandidatePort[]): Promise<void>;
@@ -1661,6 +1752,14 @@ export interface ICommandMetadataDto {
 	readonly returns?: string;
 }
 
+export interface ICodeMapperRequestDto extends Dto<ICodeMapperRequest> {
+	requestId: string;
+}
+
+export interface ExtHostCodeMapperShape {
+	$mapCode(handle: number, request: ICodeMapperRequestDto, token: CancellationToken): Promise<ICodeMapperResult | null | undefined>;
+}
+
 export interface ExtHostCommandsShape {
 	$executeContributedCommand(id: string, ...args: any[]): Promise<unknown>;
 	$getContributedCommandMetadata(): Promise<{ [id: string]: string | ICommandMetadataDto }>;
@@ -1806,10 +1905,10 @@ export interface ExtHostLabelServiceShape {
 }
 
 export interface ExtHostAuthenticationShape {
-	$getSessions(id: string, scopes?: string[]): Promise<ReadonlyArray<AuthenticationSession>>;
+	$getSessions(id: string, scopes: string[] | undefined, options: IAuthenticationProviderSessionOptions): Promise<ReadonlyArray<AuthenticationSession>>;
 	$createSession(id: string, scopes: string[], options: IAuthenticationCreateSessionOptions): Promise<AuthenticationSession>;
 	$removeSession(id: string, sessionId: string): Promise<void>;
-	$onDidChangeAuthenticationSessions(id: string, label: string): Promise<void>;
+	$onDidChangeAuthenticationSessions(id: string, label: string, extensionIdFilter?: string[]): Promise<void>;
 }
 
 export interface ExtHostAiRelatedInformationShape {
@@ -1837,6 +1936,7 @@ export interface ExtHostSecretStateShape {
 
 export interface ExtHostSearchShape {
 	$enableExtensionHostSearch(): void;
+	$getAIName(handle: number): Promise<string | undefined>;
 	$provideFileSearchResults(handle: number, session: number, query: search.IRawQuery, token: CancellationToken): Promise<search.ISearchCompleteStats>;
 	$provideAITextSearchResults(handle: number, session: number, query: search.IRawAITextQuery, token: CancellationToken): Promise<search.ISearchCompleteStats>;
 	$provideTextSearchResults(handle: number, session: number, query: search.IRawTextQuery, token: CancellationToken): Promise<search.ISearchCompleteStats>;
@@ -2166,6 +2266,7 @@ export interface ExtHostLanguageFeaturesShape {
 	$resolveCompletionItem(handle: number, id: ChainedCacheId, token: CancellationToken): Promise<ISuggestDataDto | undefined>;
 	$releaseCompletionItems(handle: number, id: number): void;
 	$provideInlineCompletions(handle: number, resource: UriComponents, position: IPosition, context: languages.InlineCompletionContext, token: CancellationToken): Promise<IdentifiableInlineCompletions | undefined>;
+	$provideInlineEditsForRange(handle: number, resource: UriComponents, range: IRange, context: languages.InlineCompletionContext, token: CancellationToken): Promise<IdentifiableInlineCompletions | undefined>;
 	$handleInlineCompletionDidShow(handle: number, pid: number, idx: number, updatedInsertText: string): void;
 	$handleInlineCompletionPartialAccept(handle: number, pid: number, idx: number, acceptedCharacters: number, info: languages.PartialAcceptInfo): void;
 	$freeInlineCompletionsList(handle: number, pid: number): void;
@@ -2191,6 +2292,7 @@ export interface ExtHostLanguageFeaturesShape {
 	$provideTypeHierarchySubtypes(handle: number, sessionId: string, itemId: string, token: CancellationToken): Promise<ITypeHierarchyItemDto[] | undefined>;
 	$releaseTypeHierarchy(handle: number, sessionId: string): void;
 	$provideDocumentOnDropEdits(handle: number, requestId: number, resource: UriComponents, position: IPosition, dataTransferDto: DataTransferDTO, token: CancellationToken): Promise<IDocumentDropEditDto[] | undefined>;
+	$releaseDocumentOnDropEdits(handle: number, cacheId: number): void;
 	$provideMappedEdits(handle: number, document: UriComponents, codeBlocks: string[], context: IMappedEditsContextDto, token: CancellationToken): Promise<IWorkspaceEditDto | null>;
 	$provideInlineEdit(handle: number, document: UriComponents, context: languages.IInlineEditContext, token: CancellationToken): Promise<IdentifiableInlineEdit | undefined>;
 	$freeInlineEdit(handle: number, pid: number): void;
@@ -2301,10 +2403,10 @@ export interface ExtHostSCMShape {
 	$executeResourceCommand(sourceControlHandle: number, groupHandle: number, handle: number, preserveFocus: boolean): Promise<void>;
 	$validateInput(sourceControlHandle: number, value: string, cursorPosition: number): Promise<[string | IMarkdownString, number] | undefined>;
 	$setSelectedSourceControl(selectedSourceControlHandle: number | undefined): Promise<void>;
-	$provideHistoryItems(sourceControlHandle: number, historyItemGroupId: string, options: any, token: CancellationToken): Promise<SCMHistoryItemDto[] | undefined>;
-	$provideHistoryItemSummary(sourceControlHandle: number, historyItemId: string, historyItemParentId: string | undefined, token: CancellationToken): Promise<SCMHistoryItemDto | undefined>;
+	$provideHistoryItemRefs(sourceControlHandle: number, historyItemRefs: string[] | undefined, token: CancellationToken): Promise<SCMHistoryItemRefDto[] | undefined>;
+	$provideHistoryItems(sourceControlHandle: number, options: any, token: CancellationToken): Promise<SCMHistoryItemDto[] | undefined>;
 	$provideHistoryItemChanges(sourceControlHandle: number, historyItemId: string, historyItemParentId: string | undefined, token: CancellationToken): Promise<SCMHistoryItemChangeDto[] | undefined>;
-	$resolveHistoryItemGroupCommonAncestor(sourceControlHandle: number, historyItemGroupId1: string, historyItemGroupId2: string | undefined, token: CancellationToken): Promise<{ id: string; ahead: number; behind: number } | undefined>;
+	$resolveHistoryItemRefsCommonAncestor(sourceControlHandle: number, historyItemRefs: string[], token: CancellationToken): Promise<string | undefined>;
 }
 
 export interface ExtHostQuickDiffShape {
@@ -2512,6 +2614,7 @@ export interface INotebookEditorAddData {
 	selections: ICellRange[];
 	visibleRanges: ICellRange[];
 	viewColumn?: number;
+	viewType: string;
 }
 
 export interface INotebookDocumentsAndEditorsDelta {
@@ -2700,13 +2803,13 @@ export const enum ExtHostTestingResource {
 export interface ExtHostTestingShape {
 	$runControllerTests(req: IStartControllerTests[], token: CancellationToken): Promise<{ error?: string }[]>;
 	$startContinuousRun(req: ICallProfileRunHandler[], token: CancellationToken): Promise<{ error?: string }[]>;
-	$cancelExtensionTestRun(runId: string | undefined): void;
+	$cancelExtensionTestRun(runId: string | undefined, taskId: string | undefined): void;
 	/** Handles a diff of tests, as a result of a subscribeToDiffs() call */
 	$acceptDiff(diff: TestsDiffOp.Serialized[]): void;
 	/** Expands a test item's children, by the given number of levels. */
 	$expandTest(testId: string, levels: number): Promise<void>;
 	/** Requests coverage details for a test run. Errors if not available. */
-	$getCoverageDetails(coverageId: string, token: CancellationToken): Promise<CoverageDetails.Serialized[]>;
+	$getCoverageDetails(coverageId: string, testId: string | undefined, token: CancellationToken): Promise<CoverageDetails.Serialized[]>;
 	/** Disposes resources associated with a test run. */
 	$disposeRun(runId: string): void;
 	/** Configures a test run config. */
@@ -2717,6 +2820,8 @@ export interface ExtHostTestingShape {
 	$syncTests(): Promise<void>;
 	/** Sets the active test run profiles */
 	$setDefaultRunProfiles(profiles: Record</* controller id */string, /* profile id */ number[]>): void;
+	$getTestsRelatedToCode(uri: UriComponents, position: IPosition, token: CancellationToken): Promise<string[]>;
+	$getCodeRelatedToTest(testId: string, token: CancellationToken): Promise<ILocationDto[]>;
 
 	// --- test results:
 
@@ -2745,14 +2850,14 @@ export interface IStringDetails {
 
 export interface ITestControllerPatch {
 	label?: string;
-	canRefresh?: boolean;
+	capabilities?: TestControllerCapability;
 }
 
 export interface MainThreadTestingShape {
 	// --- test lifecycle:
 
 	/** Registers that there's a test controller with the given ID */
-	$registerTestController(controllerId: string, label: string, canRefresh: boolean): void;
+	$registerTestController(controllerId: string, label: string, capability: TestControllerCapability): void;
 	/** Updates the label of an existing test controller. */
 	$updateController(controllerId: string, patch: ITestControllerPatch): void;
 	/** Diposes of the test controller with the given ID */
@@ -2763,6 +2868,8 @@ export interface MainThreadTestingShape {
 	$unsubscribeFromDiffs(): void;
 	/** Publishes that new tests were available on the given source. */
 	$publishDiff(controllerId: string, diff: TestsDiffOp.Serialized[]): void;
+	/** Gets coverage details from a test result. */
+	$getCoverageDetails(resultId: string, taskIndex: number, uri: UriComponents, token: CancellationToken): Promise<CoverageDetails.Serialized[]>;
 
 	// --- test run configurations:
 
@@ -2811,7 +2918,9 @@ export const MainContext = {
 	MainThreadLanguageModels: createProxyIdentifier<MainThreadLanguageModelsShape>('MainThreadLanguageModels'),
 	MainThreadEmbeddings: createProxyIdentifier<MainThreadEmbeddingsShape>('MainThreadEmbeddings'),
 	MainThreadChatAgents2: createProxyIdentifier<MainThreadChatAgentsShape2>('MainThreadChatAgents2'),
+	MainThreadCodeMapper: createProxyIdentifier<MainThreadCodeMapperShape>('MainThreadCodeMapper'),
 	MainThreadChatVariables: createProxyIdentifier<MainThreadChatVariablesShape>('MainThreadChatVariables'),
+	MainThreadLanguageModelTools: createProxyIdentifier<MainThreadLanguageModelToolsShape>('MainThreadChatSkills'),
 	MainThreadClipboard: createProxyIdentifier<MainThreadClipboardShape>('MainThreadClipboard'),
 	MainThreadCommands: createProxyIdentifier<MainThreadCommandsShape>('MainThreadCommands'),
 	MainThreadComments: createProxyIdentifier<MainThreadCommentsShape>('MainThreadComments'),
@@ -2878,6 +2987,7 @@ export const MainContext = {
 };
 
 export const ExtHostContext = {
+	ExtHostCodeMapper: createProxyIdentifier<ExtHostCodeMapperShape>('ExtHostCodeMapper'),
 	ExtHostCommands: createProxyIdentifier<ExtHostCommandsShape>('ExtHostCommands'),
 	ExtHostConfiguration: createProxyIdentifier<ExtHostConfigurationShape>('ExtHostConfiguration'),
 	ExtHostDiagnostics: createProxyIdentifier<ExtHostDiagnosticsShape>('ExtHostDiagnostics'),
@@ -2931,6 +3041,7 @@ export const ExtHostContext = {
 	ExtHostInteractive: createProxyIdentifier<ExtHostInteractiveShape>('ExtHostInteractive'),
 	ExtHostChatAgents2: createProxyIdentifier<ExtHostChatAgentsShape2>('ExtHostChatAgents'),
 	ExtHostChatVariables: createProxyIdentifier<ExtHostChatVariablesShape>('ExtHostChatVariables'),
+	ExtHostLanguageModelTools: createProxyIdentifier<ExtHostLanguageModelToolsShape>('ExtHostChatSkills'),
 	ExtHostChatProvider: createProxyIdentifier<ExtHostLanguageModelsShape>('ExtHostChatProvider'),
 	ExtHostSpeech: createProxyIdentifier<ExtHostSpeechShape>('ExtHostSpeech'),
 	ExtHostEmbeddings: createProxyIdentifier<ExtHostEmbeddingsShape>('ExtHostEmbeddings'),
diff --git a/src/vs/workbench/api/common/extHostAiRelatedInformation.ts b/src/vs/workbench/api/common/extHostAiRelatedInformation.ts
index 5594a8adf4c..c0b1994ba1a 100644
--- a/src/vs/workbench/api/common/extHostAiRelatedInformation.ts
+++ b/src/vs/workbench/api/common/extHostAiRelatedInformation.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { ExtHostAiRelatedInformationShape, IMainContext, MainContext, MainThreadAiRelatedInformationShape } from 'vs/workbench/api/common/extHost.protocol';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { ExtHostAiRelatedInformationShape, IMainContext, MainContext, MainThreadAiRelatedInformationShape } from './extHost.protocol.js';
 import type { CancellationToken, RelatedInformationProvider, RelatedInformationType, RelatedInformationResult } from 'vscode';
-import { Disposable } from 'vs/workbench/api/common/extHostTypes';
+import { Disposable } from './extHostTypes.js';
 
 export class ExtHostRelatedInformation implements ExtHostAiRelatedInformationShape {
 	private _relatedInformationProviders: Map<number, RelatedInformationProvider> = new Map();
diff --git a/src/vs/workbench/api/common/extHostApiCommands.ts b/src/vs/workbench/api/common/extHostApiCommands.ts
index 5535cec0536..b43b330bfe2 100644
--- a/src/vs/workbench/api/common/extHostApiCommands.ts
+++ b/src/vs/workbench/api/common/extHostApiCommands.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isFalsyOrEmpty } from 'vs/base/common/arrays';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { Schemas, matchesSomeScheme } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { IPosition } from 'vs/editor/common/core/position';
-import { IRange } from 'vs/editor/common/core/range';
-import { ISelection } from 'vs/editor/common/core/selection';
-import * as languages from 'vs/editor/common/languages';
-import { decodeSemanticTokensDto } from 'vs/editor/common/services/semanticTokensDto';
-import { validateWhenClauses } from 'vs/platform/contextkey/common/contextkey';
-import { ITextEditorOptions } from 'vs/platform/editor/common/editor';
-import { ICallHierarchyItemDto, IIncomingCallDto, IInlineValueContextDto, IOutgoingCallDto, IRawColorInfo, ITypeHierarchyItemDto, IWorkspaceEditDto } from 'vs/workbench/api/common/extHost.protocol';
-import { ApiCommand, ApiCommandArgument, ApiCommandResult, ExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
-import { CustomCodeAction } from 'vs/workbench/api/common/extHostLanguageFeatures';
-import * as typeConverters from 'vs/workbench/api/common/extHostTypeConverters';
-import * as types from 'vs/workbench/api/common/extHostTypes';
-import { TransientCellMetadata, TransientDocumentMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import * as search from 'vs/workbench/contrib/search/common/search';
+import { isFalsyOrEmpty } from '../../../base/common/arrays.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { Schemas, matchesSomeScheme } from '../../../base/common/network.js';
+import { URI } from '../../../base/common/uri.js';
+import { IPosition } from '../../../editor/common/core/position.js';
+import { IRange } from '../../../editor/common/core/range.js';
+import { ISelection } from '../../../editor/common/core/selection.js';
+import * as languages from '../../../editor/common/languages.js';
+import { decodeSemanticTokensDto } from '../../../editor/common/services/semanticTokensDto.js';
+import { validateWhenClauses } from '../../../platform/contextkey/common/contextkey.js';
+import { ITextEditorOptions } from '../../../platform/editor/common/editor.js';
+import { ICallHierarchyItemDto, IIncomingCallDto, IInlineValueContextDto, IOutgoingCallDto, IRawColorInfo, ITypeHierarchyItemDto, IWorkspaceEditDto } from './extHost.protocol.js';
+import { ApiCommand, ApiCommandArgument, ApiCommandResult, ExtHostCommands } from './extHostCommands.js';
+import { CustomCodeAction } from './extHostLanguageFeatures.js';
+import * as typeConverters from './extHostTypeConverters.js';
+import * as types from './extHostTypes.js';
+import { TransientCellMetadata, TransientDocumentMetadata } from '../../contrib/notebook/common/notebookCommon.js';
+import * as search from '../../contrib/search/common/search.js';
 import type * as vscode from 'vscode';
 
 //#region --- NEW world
@@ -88,32 +88,62 @@ const newCommands: ApiCommand[] = [
 		[ApiCommandArgument.Uri, ApiCommandArgument.Position],
 		new ApiCommandResult<(languages.Location | languages.LocationLink)[], (types.Location | vscode.LocationLink)[] | undefined>('A promise that resolves to an array of Location or LocationLink instances.', mapLocationOrLocationLink)
 	),
+	new ApiCommand(
+		'vscode.experimental.executeDefinitionProvider_recursive', '_executeDefinitionProvider_recursive', 'Execute all definition providers.',
+		[ApiCommandArgument.Uri, ApiCommandArgument.Position],
+		new ApiCommandResult<(languages.Location | languages.LocationLink)[], (types.Location | vscode.LocationLink)[] | undefined>('A promise that resolves to an array of Location or LocationLink instances.', mapLocationOrLocationLink)
+	),
 	new ApiCommand(
 		'vscode.executeTypeDefinitionProvider', '_executeTypeDefinitionProvider', 'Execute all type definition providers.',
 		[ApiCommandArgument.Uri, ApiCommandArgument.Position],
 		new ApiCommandResult<(languages.Location | languages.LocationLink)[], (types.Location | vscode.LocationLink)[] | undefined>('A promise that resolves to an array of Location or LocationLink instances.', mapLocationOrLocationLink)
 	),
+	new ApiCommand(
+		'vscode.experimental.executeTypeDefinitionProvider_recursive', '_executeTypeDefinitionProvider_recursive', 'Execute all type definition providers.',
+		[ApiCommandArgument.Uri, ApiCommandArgument.Position],
+		new ApiCommandResult<(languages.Location | languages.LocationLink)[], (types.Location | vscode.LocationLink)[] | undefined>('A promise that resolves to an array of Location or LocationLink instances.', mapLocationOrLocationLink)
+	),
 	new ApiCommand(
 		'vscode.executeDeclarationProvider', '_executeDeclarationProvider', 'Execute all declaration providers.',
 		[ApiCommandArgument.Uri, ApiCommandArgument.Position],
 		new ApiCommandResult<(languages.Location | languages.LocationLink)[], (types.Location | vscode.LocationLink)[] | undefined>('A promise that resolves to an array of Location or LocationLink instances.', mapLocationOrLocationLink)
 	),
+	new ApiCommand(
+		'vscode.experimental.executeDeclarationProvider_recursive', '_executeDeclarationProvider_recursive', 'Execute all declaration providers.',
+		[ApiCommandArgument.Uri, ApiCommandArgument.Position],
+		new ApiCommandResult<(languages.Location | languages.LocationLink)[], (types.Location | vscode.LocationLink)[] | undefined>('A promise that resolves to an array of Location or LocationLink instances.', mapLocationOrLocationLink)
+	),
 	new ApiCommand(
 		'vscode.executeImplementationProvider', '_executeImplementationProvider', 'Execute all implementation providers.',
 		[ApiCommandArgument.Uri, ApiCommandArgument.Position],
 		new ApiCommandResult<(languages.Location | languages.LocationLink)[], (types.Location | vscode.LocationLink)[] | undefined>('A promise that resolves to an array of Location or LocationLink instances.', mapLocationOrLocationLink)
 	),
+	new ApiCommand(
+		'vscode.experimental.executeImplementationProvider_recursive', '_executeImplementationProvider_recursive', 'Execute all implementation providers.',
+		[ApiCommandArgument.Uri, ApiCommandArgument.Position],
+		new ApiCommandResult<(languages.Location | languages.LocationLink)[], (types.Location | vscode.LocationLink)[] | undefined>('A promise that resolves to an array of Location or LocationLink instances.', mapLocationOrLocationLink)
+	),
 	new ApiCommand(
 		'vscode.executeReferenceProvider', '_executeReferenceProvider', 'Execute all reference providers.',
 		[ApiCommandArgument.Uri, ApiCommandArgument.Position],
 		new ApiCommandResult<languages.Location[], types.Location[] | undefined>('A promise that resolves to an array of Location-instances.', tryMapWith(typeConverters.location.to))
 	),
+	new ApiCommand(
+		'vscode.experimental.executeReferenceProvider', '_executeReferenceProvider_recursive', 'Execute all reference providers.',
+		[ApiCommandArgument.Uri, ApiCommandArgument.Position],
+		new ApiCommandResult<languages.Location[], types.Location[] | undefined>('A promise that resolves to an array of Location-instances.', tryMapWith(typeConverters.location.to))
+	),
 	// -- hover
 	new ApiCommand(
 		'vscode.executeHoverProvider', '_executeHoverProvider', 'Execute all hover providers.',
 		[ApiCommandArgument.Uri, ApiCommandArgument.Position],
 		new ApiCommandResult<languages.Hover[], types.Hover[] | undefined>('A promise that resolves to an array of Hover-instances.', tryMapWith(typeConverters.Hover.to))
 	),
+	new ApiCommand(
+		'vscode.experimental.executeHoverProvider_recursive', '_executeHoverProvider_recursive', 'Execute all hover providers.',
+		[ApiCommandArgument.Uri, ApiCommandArgument.Position],
+		new ApiCommandResult<languages.Hover[], types.Hover[] | undefined>('A promise that resolves to an array of Hover-instances.', tryMapWith(typeConverters.Hover.to))
+	),
 	// -- selection range
 	new ApiCommand(
 		'vscode.executeSelectionRangeProvider', '_executeSelectionRangeProvider', 'Execute selection range provider.',
diff --git a/src/vs/workbench/api/common/extHostApiDeprecationService.ts b/src/vs/workbench/api/common/extHostApiDeprecationService.ts
index 59841770307..9a72ce444c0 100644
--- a/src/vs/workbench/api/common/extHostApiDeprecationService.ts
+++ b/src/vs/workbench/api/common/extHostApiDeprecationService.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import * as extHostProtocol from 'vs/workbench/api/common/extHost.protocol';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import * as extHostProtocol from './extHost.protocol.js';
+import { IExtHostRpcService } from './extHostRpcService.js';
 
 export interface IExtHostApiDeprecationService {
 	readonly _serviceBrand: undefined;
diff --git a/src/vs/workbench/api/common/extHostAuthentication.ts b/src/vs/workbench/api/common/extHostAuthentication.ts
index 16b1d4a405b..2400f8ecae6 100644
--- a/src/vs/workbench/api/common/extHostAuthentication.ts
+++ b/src/vs/workbench/api/common/extHostAuthentication.ts
@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type * as vscode from 'vscode';
-import { Emitter, Event } from 'vs/base/common/event';
-import { MainContext, MainThreadAuthenticationShape, ExtHostAuthenticationShape } from 'vs/workbench/api/common/extHost.protocol';
-import { Disposable } from 'vs/workbench/api/common/extHostTypes';
-import { IExtensionDescription, ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { INTERNAL_AUTH_PROVIDER_PREFIX } from 'vs/workbench/services/authentication/common/authentication';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { MainContext, MainThreadAuthenticationShape, ExtHostAuthenticationShape } from './extHost.protocol.js';
+import { Disposable } from './extHostTypes.js';
+import { IExtensionDescription, ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
+import { INTERNAL_AUTH_PROVIDER_PREFIX } from '../../services/authentication/common/authentication.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { IExtHostRpcService } from './extHostRpcService.js';
 
 export interface IExtHostAuthentication extends ExtHostAuthentication { }
 export const IExtHostAuthentication = createDecorator<IExtHostAuthentication>('IExtHostAuthentication');
@@ -28,11 +28,8 @@ export class ExtHostAuthentication implements ExtHostAuthenticationShape {
 	private _proxy: MainThreadAuthenticationShape;
 	private _authenticationProviders: Map<string, ProviderWithMetadata> = new Map<string, ProviderWithMetadata>();
 
-	private _onDidChangeSessions = new Emitter<vscode.AuthenticationSessionsChangeEvent>();
-	readonly onDidChangeSessions: Event<vscode.AuthenticationSessionsChangeEvent> = this._onDidChangeSessions.event;
-
+	private _onDidChangeSessions = new Emitter<vscode.AuthenticationSessionsChangeEvent & { extensionIdFilter?: string[] }>();
 	private _getSessionTaskSingler = new TaskSingler<vscode.AuthenticationSession | undefined>();
-	private _getSessionsTaskSingler = new TaskSingler<ReadonlyArray<vscode.AuthenticationSession>>();
 
 	constructor(
 		@IExtHostRpcService extHostRpc: IExtHostRpcService
@@ -40,6 +37,20 @@ export class ExtHostAuthentication implements ExtHostAuthenticationShape {
 		this._proxy = extHostRpc.getProxy(MainContext.MainThreadAuthentication);
 	}
 
+	/**
+	 * This sets up an event that will fire when the auth sessions change with a built-in filter for the extensionId
+	 * if a session change only affects a specific extension.
+	 * @param extensionId The extension that is interested in the event.
+	 * @returns An event with a built-in filter for the extensionId
+	 */
+	getExtensionScopedSessionsEvent(extensionId: string): Event<vscode.AuthenticationSessionsChangeEvent> {
+		const normalizedExtensionId = extensionId.toLowerCase();
+		return Event.chain(this._onDidChangeSessions.event, ($) => $
+			.filter(e => !e.extensionIdFilter || e.extensionIdFilter.includes(normalizedExtensionId))
+			.map(e => ({ provider: e.provider }))
+		);
+	}
+
 	async getSession(requestingExtension: IExtensionDescription, providerId: string, scopes: readonly string[], options: vscode.AuthenticationGetSessionOptions & ({ createIfNone: true } | { forceNewSession: true } | { forceNewSession: vscode.AuthenticationForceNewSessionOptions })): Promise<vscode.AuthenticationSession>;
 	async getSession(requestingExtension: IExtensionDescription, providerId: string, scopes: readonly string[], options: vscode.AuthenticationGetSessionOptions & { forceNewSession: true }): Promise<vscode.AuthenticationSession>;
 	async getSession(requestingExtension: IExtensionDescription, providerId: string, scopes: readonly string[], options: vscode.AuthenticationGetSessionOptions & { forceNewSession: vscode.AuthenticationForceNewSessionOptions }): Promise<vscode.AuthenticationSession>;
@@ -54,14 +65,9 @@ export class ExtHostAuthentication implements ExtHostAuthenticationShape {
 		});
 	}
 
-	async getSessions(requestingExtension: IExtensionDescription, providerId: string, scopes: readonly string[]): Promise<ReadonlyArray<vscode.AuthenticationSession>> {
-		const extensionId = ExtensionIdentifier.toKey(requestingExtension.identifier);
-		const sortedScopes = [...scopes].sort().join(' ');
-		return await this._getSessionsTaskSingler.getOrCreate(`${extensionId} ${sortedScopes}`, async () => {
-			await this._proxy.$ensureProvider(providerId);
-			const extensionName = requestingExtension.displayName || requestingExtension.name;
-			return this._proxy.$getSessions(providerId, scopes, extensionId, extensionName);
-		});
+	async getAccounts(providerId: string) {
+		await this._proxy.$ensureProvider(providerId);
+		return await this._proxy.$getAccounts(providerId);
 	}
 
 	async removeSession(providerId: string, sessionId: string): Promise<void> {
@@ -89,7 +95,7 @@ export class ExtHostAuthentication implements ExtHostAuthenticationShape {
 		});
 	}
 
-	async $createSession(providerId: string, scopes: string[], options: vscode.AuthenticationProviderCreateSessionOptions): Promise<vscode.AuthenticationSession> {
+	async $createSession(providerId: string, scopes: string[], options: vscode.AuthenticationProviderSessionOptions): Promise<vscode.AuthenticationSession> {
 		const providerData = this._authenticationProviders.get(providerId);
 		if (providerData) {
 			return await providerData.provider.createSession(scopes, options);
@@ -107,19 +113,19 @@ export class ExtHostAuthentication implements ExtHostAuthenticationShape {
 		throw new Error(`Unable to find authentication provider with handle: ${providerId}`);
 	}
 
-	async $getSessions(providerId: string, scopes?: string[]): Promise<ReadonlyArray<vscode.AuthenticationSession>> {
+	async $getSessions(providerId: string, scopes: ReadonlyArray<string> | undefined, options: vscode.AuthenticationProviderSessionOptions): Promise<ReadonlyArray<vscode.AuthenticationSession>> {
 		const providerData = this._authenticationProviders.get(providerId);
 		if (providerData) {
-			return await providerData.provider.getSessions(scopes);
+			return await providerData.provider.getSessions(scopes, options);
 		}
 
 		throw new Error(`Unable to find authentication provider with handle: ${providerId}`);
 	}
 
-	$onDidChangeAuthenticationSessions(id: string, label: string) {
+	$onDidChangeAuthenticationSessions(id: string, label: string, extensionIdFilter?: string[]) {
 		// Don't fire events for the internal auth providers
 		if (!id.startsWith(INTERNAL_AUTH_PROVIDER_PREFIX)) {
-			this._onDidChangeSessions.fire({ provider: { id, label } });
+			this._onDidChangeSessions.fire({ provider: { id, label }, extensionIdFilter });
 		}
 		return Promise.resolve();
 	}
diff --git a/src/vs/workbench/api/common/extHostBulkEdits.ts b/src/vs/workbench/api/common/extHostBulkEdits.ts
index 281a003c40c..a1284739dc1 100644
--- a/src/vs/workbench/api/common/extHostBulkEdits.ts
+++ b/src/vs/workbench/api/common/extHostBulkEdits.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { MainContext, MainThreadBulkEditsShape } from 'vs/workbench/api/common/extHost.protocol';
-import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import { WorkspaceEdit } from 'vs/workbench/api/common/extHostTypeConverters';
-import { SerializableObjectWithBuffers } from 'vs/workbench/services/extensions/common/proxyIdentifier';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { MainContext, MainThreadBulkEditsShape } from './extHost.protocol.js';
+import { ExtHostDocumentsAndEditors } from './extHostDocumentsAndEditors.js';
+import { IExtHostRpcService } from './extHostRpcService.js';
+import { WorkspaceEdit } from './extHostTypeConverters.js';
+import { SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';
 import type * as vscode from 'vscode';
 
 export class ExtHostBulkEdits {
diff --git a/src/vs/workbench/api/common/extHostChatAgents2.ts b/src/vs/workbench/api/common/extHostChatAgents2.ts
index 9e8bd3e587c..c31f91957d7 100644
--- a/src/vs/workbench/api/common/extHostChatAgents2.ts
+++ b/src/vs/workbench/api/common/extHostChatAgents2.ts
@@ -3,29 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { coalesce } from 'vs/base/common/arrays';
-import { raceCancellation } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { Emitter } from 'vs/base/common/event';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { Iterable } from 'vs/base/common/iterator';
-import { Disposable, DisposableMap, DisposableStore } from 'vs/base/common/lifecycle';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { assertType } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { Location } from 'vs/editor/common/languages';
-import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ExtHostChatAgentsShape2, IChatAgentCompletionItem, IChatAgentHistoryEntryDto, IChatProgressDto, IExtensionChatAgentMetadata, IMainContext, MainContext, MainThreadChatAgentsShape2 } from 'vs/workbench/api/common/extHost.protocol';
-import { CommandsConverter, ExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
-import * as typeConvert from 'vs/workbench/api/common/extHostTypeConverters';
-import * as extHostTypes from 'vs/workbench/api/common/extHostTypes';
-import { ChatAgentLocation, IChatAgentRequest, IChatAgentResult } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { IChatContentReference, IChatFollowup, IChatUserActionEvent, ChatAgentVoteDirection, IChatResponseErrorDetails } from 'vs/workbench/contrib/chat/common/chatService';
-import { checkProposedApiEnabled, isProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
-import { Dto } from 'vs/workbench/services/extensions/common/proxyIdentifier';
 import type * as vscode from 'vscode';
+import { coalesce } from '../../../base/common/arrays.js';
+import { raceCancellation } from '../../../base/common/async.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { toErrorMessage } from '../../../base/common/errorMessage.js';
+import { Emitter } from '../../../base/common/event.js';
+import { Iterable } from '../../../base/common/iterator.js';
+import { Disposable, DisposableMap, DisposableStore, toDisposable } from '../../../base/common/lifecycle.js';
+import { revive } from '../../../base/common/marshalling.js';
+import { StopWatch } from '../../../base/common/stopwatch.js';
+import { ThemeIcon } from '../../../base/common/themables.js';
+import { assertType } from '../../../base/common/types.js';
+import { URI } from '../../../base/common/uri.js';
+import { Location } from '../../../editor/common/languages.js';
+import { ExtensionIdentifier, IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { ChatAgentLocation, IChatAgentRequest, IChatAgentResult, IChatAgentResultTimings, IChatWelcomeMessageContent } from '../../contrib/chat/common/chatAgents.js';
+import { ChatAgentVoteDirection, IChatContentReference, IChatFollowup, IChatResponseErrorDetails, IChatUserActionEvent, IChatVoteAction } from '../../contrib/chat/common/chatService.js';
+import { checkProposedApiEnabled, isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
+import { Dto } from '../../services/extensions/common/proxyIdentifier.js';
+import { ExtHostChatAgentsShape2, IChatAgentCompletionItem, IChatAgentHistoryEntryDto, IChatProgressDto, IExtensionChatAgentMetadata, IMainContext, MainContext, MainThreadChatAgentsShape2 } from './extHost.protocol.js';
+import { CommandsConverter, ExtHostCommands } from './extHostCommands.js';
+import { ExtHostDocuments } from './extHostDocuments.js';
+import { ExtHostLanguageModels } from './extHostLanguageModels.js';
+import * as typeConvert from './extHostTypeConverters.js';
+import * as extHostTypes from './extHostTypes.js';
 
 class ChatAgentResponseStream {
 
@@ -46,7 +49,7 @@ class ChatAgentResponseStream {
 		this._isClosed = true;
 	}
 
-	get timings() {
+	get timings(): IChatAgentResultTimings {
 		return {
 			firstProgress: this._firstProgress,
 			totalElapsed: this._stopWatch.elapsed()
@@ -70,7 +73,7 @@ class ChatAgentResponseStream {
 
 			const _report = (progress: IChatProgressDto, task?: (progress: vscode.Progress<vscode.ChatResponseWarningPart | vscode.ChatResponseReferencePart>) => Thenable<string | void>) => {
 				// Measure the time to the first progress update with real markdown content
-				if (typeof this._firstProgress === 'undefined' && 'content' in progress) {
+				if (typeof this._firstProgress === 'undefined' && (progress.kind === 'markdownContent' || progress.kind === 'markdownVuln')) {
 					this._firstProgress = this._stopWatch.elapsed();
 				}
 
@@ -91,7 +94,7 @@ class ChatAgentResponseStream {
 					};
 
 					Promise.all([progressReporterPromise, task?.(progressReporter)]).then(([handle, res]) => {
-						if (handle !== undefined && res !== undefined) {
+						if (handle !== undefined) {
 							this._proxy.$handleProgressChunk(this._request.requestId, typeConvert.ChatTaskResult.from(res), handle);
 						}
 					});
@@ -119,6 +122,14 @@ class ChatAgentResponseStream {
 					_report(dto);
 					return this;
 				},
+				codeblockUri(value) {
+					throwIfDone(this.codeblockUri);
+					checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
+					const part = new extHostTypes.ChatResponseCodeblockUriPart(value);
+					const dto = typeConvert.ChatResponseCodeblockUriPart.from(part);
+					_report(dto);
+					return this;
+				},
 				filetree(value, baseUri) {
 					throwIfDone(this.filetree);
 					const part = new extHostTypes.ChatResponseFileTreePart(value, baseUri);
@@ -156,13 +167,16 @@ class ChatAgentResponseStream {
 					return this;
 				},
 				reference(value, iconPath) {
+					return this.reference2(value, iconPath);
+				},
+				reference2(value, iconPath, options) {
 					throwIfDone(this.reference);
 
-					if ('variableName' in value) {
+					if (typeof value === 'object' && 'variableName' in value) {
 						checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
 					}
 
-					if ('variableName' in value && !value.value) {
+					if (typeof value === 'object' && 'variableName' in value && !value.value) {
 						// The participant used this variable. Does that variable have any references to pull in?
 						const matchingVarData = that._request.variables.variables.find(v => v.name === value.variableName);
 						if (matchingVarData) {
@@ -174,7 +188,7 @@ class ChatAgentResponseStream {
 								} satisfies IChatContentReference));
 							} else {
 								// Participant sent a variableName reference but the variable produced no references. Show variable reference with no value
-								const part = new extHostTypes.ChatResponseReferencePart(value, iconPath);
+								const part = new extHostTypes.ChatResponseReferencePart(value, iconPath, options);
 								const dto = typeConvert.ChatResponseReferencePart.from(part);
 								references = [dto];
 							}
@@ -185,13 +199,21 @@ class ChatAgentResponseStream {
 							// Something went wrong- that variable doesn't actually exist
 						}
 					} else {
-						const part = new extHostTypes.ChatResponseReferencePart(value, iconPath);
+						const part = new extHostTypes.ChatResponseReferencePart(value, iconPath, options);
 						const dto = typeConvert.ChatResponseReferencePart.from(part);
 						_report(dto);
 					}
 
 					return this;
 				},
+				codeCitation(value: vscode.Uri, license: string, snippet: string): void {
+					throwIfDone(this.codeCitation);
+					checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
+
+					const part = new extHostTypes.ChatResponseCodeCitationPart(value, license, snippet);
+					const dto = typeConvert.ChatResponseCodeCitationPart.from(part);
+					_report(dto);
+				},
 				textEdit(target, edits) {
 					throwIfDone(this.textEdit);
 					checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
@@ -210,11 +232,11 @@ class ChatAgentResponseStream {
 					_report(dto);
 					return this;
 				},
-				confirmation(title, message, data) {
+				confirmation(title, message, data, buttons) {
 					throwIfDone(this.confirmation);
 					checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
 
-					const part = new extHostTypes.ChatResponseConfirmationPart(title, message, data);
+					const part = new extHostTypes.ChatResponseConfirmationPart(title, message, data, buttons);
 					const dto = typeConvert.ChatResponseConfirmationPart.from(part);
 					_report(dto);
 					return this;
@@ -227,14 +249,20 @@ class ChatAgentResponseStream {
 						part instanceof extHostTypes.ChatResponseMarkdownWithVulnerabilitiesPart ||
 						part instanceof extHostTypes.ChatResponseDetectedParticipantPart ||
 						part instanceof extHostTypes.ChatResponseWarningPart ||
-						part instanceof extHostTypes.ChatResponseConfirmationPart
+						part instanceof extHostTypes.ChatResponseConfirmationPart ||
+						part instanceof extHostTypes.ChatResponseCodeCitationPart ||
+						part instanceof extHostTypes.ChatResponseMovePart ||
+						part instanceof extHostTypes.ChatResponseProgressPart2
 					) {
 						checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
 					}
 
 					if (part instanceof extHostTypes.ChatResponseReferencePart) {
 						// Ensure variable reference values get fixed up
-						this.reference(part.value, part.iconPath);
+						this.reference2(part.value, part.iconPath, part.options);
+					} else if (part instanceof extHostTypes.ChatResponseProgressPart2) {
+						const dto = part.task ? typeConvert.ChatTask.from(part) : typeConvert.ChatResponseProgressPart.from(part);
+						_report(dto, part.task);
 					} else {
 						const dto = typeConvert.ChatResponsePart.from(part, that._commandsConverter, that._sessionDisposables);
 						_report(dto);
@@ -256,14 +284,18 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 	private readonly _agents = new Map<number, ExtHostChatAgent>();
 	private readonly _proxy: MainThreadChatAgentsShape2;
 
+	private static _participantDetectionProviderIdPool = 0;
+	private readonly _participantDetectionProviders = new Map<number, ExtHostParticipantDetector>();
+
 	private readonly _sessionDisposables: DisposableMap<string, DisposableStore> = this._register(new DisposableMap());
 	private readonly _completionDisposables: DisposableMap<number, DisposableStore> = this._register(new DisposableMap());
 
 	constructor(
 		mainContext: IMainContext,
 		private readonly _logService: ILogService,
-		private readonly commands: ExtHostCommands,
-		private readonly quality: string | undefined
+		private readonly _commands: ExtHostCommands,
+		private readonly _documents: ExtHostDocuments,
+		private readonly _languageModels: ExtHostLanguageModels
 	) {
 		super();
 		this._proxy = mainContext.getProxy(MainContext.MainThreadChatAgents2);
@@ -275,44 +307,104 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 
 	createChatAgent(extension: IExtensionDescription, id: string, handler: vscode.ChatExtendedRequestHandler): vscode.ChatParticipant {
 		const handle = ExtHostChatAgents2._idPool++;
-		const agent = new ExtHostChatAgent(extension, this.quality, id, this._proxy, handle, handler);
+		const agent = new ExtHostChatAgent(extension, id, this._proxy, handle, handler);
 		this._agents.set(handle, agent);
 
-		if (agent.isAgentEnabled()) {
-			this._proxy.$registerAgent(handle, extension.identifier, id, {}, undefined);
-		}
-
+		this._proxy.$registerAgent(handle, extension.identifier, id, {}, undefined);
 		return agent.apiAgent;
 	}
 
 	createDynamicChatAgent(extension: IExtensionDescription, id: string, dynamicProps: vscode.DynamicChatParticipantProps, handler: vscode.ChatExtendedRequestHandler): vscode.ChatParticipant {
 		const handle = ExtHostChatAgents2._idPool++;
-		const agent = new ExtHostChatAgent(extension, this.quality, id, this._proxy, handle, handler);
+		const agent = new ExtHostChatAgent(extension, id, this._proxy, handle, handler);
 		this._agents.set(handle, agent);
 
 		this._proxy.$registerAgent(handle, extension.identifier, id, { isSticky: true } satisfies IExtensionChatAgentMetadata, dynamicProps);
 		return agent.apiAgent;
 	}
 
-	async $invokeAgent(handle: number, request: IChatAgentRequest, context: { history: IChatAgentHistoryEntryDto[] }, token: CancellationToken): Promise<IChatAgentResult | undefined> {
+	registerChatParticipantDetectionProvider(extension: IExtensionDescription, provider: vscode.ChatParticipantDetectionProvider): vscode.Disposable {
+		const handle = ExtHostChatAgents2._participantDetectionProviderIdPool++;
+		this._participantDetectionProviders.set(handle, new ExtHostParticipantDetector(extension, provider));
+		this._proxy.$registerChatParticipantDetectionProvider(handle);
+		return toDisposable(() => {
+			this._participantDetectionProviders.delete(handle);
+			this._proxy.$unregisterChatParticipantDetectionProvider(handle);
+		});
+	}
+
+	async $detectChatParticipant(handle: number, requestDto: Dto<IChatAgentRequest>, context: { history: IChatAgentHistoryEntryDto[] }, options: { location: ChatAgentLocation; participants?: vscode.ChatParticipantMetadata[] }, token: CancellationToken): Promise<vscode.ChatParticipantDetectionResult | null | undefined> {
+		const { request, location, history } = await this._createRequest(requestDto, context);
+
+		const detector = this._participantDetectionProviders.get(handle);
+		if (!detector) {
+			return undefined;
+		}
+
+		const extRequest = typeConvert.ChatAgentRequest.to(request, location);
+		if (request.userSelectedModelId && isProposedApiEnabled(detector.extension, 'chatParticipantAdditions')) {
+			extRequest.userSelectedModel = await this._languageModels.getLanguageModelByIdentifier(detector.extension, request.userSelectedModelId);
+		}
+
+		return detector.provider.provideParticipantDetection(
+			extRequest,
+			{ history },
+			{ participants: options.participants, location: typeConvert.ChatLocation.to(options.location) },
+			token
+		);
+	}
+
+	private async _createRequest(requestDto: Dto<IChatAgentRequest>, context: { history: IChatAgentHistoryEntryDto[] }) {
+		const request = revive<IChatAgentRequest>(requestDto);
+		const convertedHistory = await this.prepareHistoryTurns(request.agentId, context);
+
+		// in-place converting for location-data
+		let location: vscode.ChatRequestEditorData | vscode.ChatRequestNotebookData | undefined;
+		if (request.locationData?.type === ChatAgentLocation.Editor) {
+			// editor data
+			const document = this._documents.getDocument(request.locationData.document);
+			location = new extHostTypes.ChatRequestEditorData(document, typeConvert.Selection.to(request.locationData.selection), typeConvert.Range.to(request.locationData.wholeRange));
+
+		} else if (request.locationData?.type === ChatAgentLocation.Notebook) {
+			// notebook data
+			const cell = this._documents.getDocument(request.locationData.sessionInputUri);
+			location = new extHostTypes.ChatRequestNotebookData(cell);
+
+		} else if (request.locationData?.type === ChatAgentLocation.Terminal) {
+			// TBD
+		}
+
+		return { request, location, history: convertedHistory };
+	}
+
+	async $invokeAgent(handle: number, requestDto: Dto<IChatAgentRequest>, context: { history: IChatAgentHistoryEntryDto[] }, token: CancellationToken): Promise<IChatAgentResult | undefined> {
 		const agent = this._agents.get(handle);
 		if (!agent) {
 			throw new Error(`[CHAT](${handle}) CANNOT invoke agent because the agent is not registered`);
 		}
 
-		// Init session disposables
-		let sessionDisposables = this._sessionDisposables.get(request.sessionId);
-		if (!sessionDisposables) {
-			sessionDisposables = new DisposableStore();
-			this._sessionDisposables.set(request.sessionId, sessionDisposables);
-		}
+		let stream: ChatAgentResponseStream | undefined;
 
-		const stream = new ChatAgentResponseStream(agent.extension, request, this._proxy, this.commands.converter, sessionDisposables);
 		try {
-			const convertedHistory = await this.prepareHistoryTurns(request.agentId, context);
+			const { request, location, history } = await this._createRequest(requestDto, context);
+
+			// Init session disposables
+			let sessionDisposables = this._sessionDisposables.get(request.sessionId);
+			if (!sessionDisposables) {
+				sessionDisposables = new DisposableStore();
+				this._sessionDisposables.set(request.sessionId, sessionDisposables);
+			}
+
+			stream = new ChatAgentResponseStream(agent.extension, request, this._proxy, this._commands.converter, sessionDisposables);
+
+			const extRequest = typeConvert.ChatAgentRequest.to(request, location);
+			if (request.userSelectedModelId && isProposedApiEnabled(agent.extension, 'chatParticipantAdditions')) {
+				extRequest.userSelectedModel = await this._languageModels.getLanguageModelByIdentifier(agent.extension, request.userSelectedModelId);
+			}
+
 			const task = agent.invoke(
-				typeConvert.ChatAgentRequest.to(request),
-				{ history: convertedHistory },
+				extRequest,
+				{ history },
 				stream.apiObject,
 				token
 			);
@@ -324,7 +416,7 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 					} catch (err) {
 						const msg = `result.metadata MUST be JSON.stringify-able. Got error: ${err.message}`;
 						this._logService.error(`[${agent.extension.identifier.value}] [@${agent.id}] ${msg}`, agent.extension);
-						return { errorDetails: { message: msg }, timings: stream.timings };
+						return { errorDetails: { message: msg }, timings: stream?.timings, nextQuestion: result.nextQuestion };
 					}
 				}
 				let errorDetails: IChatResponseErrorDetails | undefined;
@@ -338,7 +430,7 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 					checkProposedApiEnabled(agent.extension, 'chatParticipantPrivate');
 				}
 
-				return { errorDetails, timings: stream.timings, metadata: result?.metadata } satisfies IChatAgentResult;
+				return { errorDetails, timings: stream?.timings, metadata: result?.metadata, nextQuestion: result?.nextQuestion } satisfies IChatAgentResult;
 			}), token);
 		} catch (e) {
 			this._logService.error(e, agent.extension);
@@ -350,12 +442,11 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 			return { errorDetails: { message: toErrorMessage(e), responseIsIncomplete: true } };
 
 		} finally {
-			stream.close();
+			stream?.close();
 		}
 	}
 
 	private async prepareHistoryTurns(agentId: string, context: { history: IChatAgentHistoryEntryDto[] }): Promise<(vscode.ChatRequestTurn | vscode.ChatResponseTurn)[]> {
-
 		const res: (vscode.ChatRequestTurn | vscode.ChatResponseTurn)[] = [];
 
 		for (const h of context.history) {
@@ -365,10 +456,18 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 				{ ...ehResult, metadata: undefined };
 
 			// REQUEST turn
-			res.push(new extHostTypes.ChatRequestTurn(h.request.message, h.request.command, h.request.variables.variables.map(typeConvert.ChatAgentValueReference.to), h.request.agentId));
+			const varsWithoutTools = h.request.variables.variables
+				.filter(v => !v.isTool)
+				.map(typeConvert.ChatPromptReference.to);
+			const toolReferences = h.request.variables.variables
+				.filter(v => v.isTool)
+				.map(typeConvert.ChatLanguageModelToolReference.to);
+			const turn = new extHostTypes.ChatRequestTurn(h.request.message, h.request.command, varsWithoutTools, h.request.agentId);
+			turn.toolReferences = toolReferences;
+			res.push(turn);
 
 			// RESPONSE turn
-			const parts = coalesce(h.response.map(r => typeConvert.ChatResponsePart.toContent(r, this.commands.converter)));
+			const parts = coalesce(h.response.map(r => typeConvert.ChatResponsePart.toContent(r, this._commands.converter)));
 			res.push(new extHostTypes.ChatResponseTurn(parts, result, h.request.agentId, h.request.command));
 		}
 
@@ -379,12 +478,13 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 		this._sessionDisposables.deleteAndDispose(sessionId);
 	}
 
-	async $provideFollowups(request: IChatAgentRequest, handle: number, result: IChatAgentResult, context: { history: IChatAgentHistoryEntryDto[] }, token: CancellationToken): Promise<IChatFollowup[]> {
+	async $provideFollowups(requestDto: Dto<IChatAgentRequest>, handle: number, result: IChatAgentResult, context: { history: IChatAgentHistoryEntryDto[] }, token: CancellationToken): Promise<IChatFollowup[]> {
 		const agent = this._agents.get(handle);
 		if (!agent) {
 			return Promise.resolve([]);
 		}
 
+		const request = revive<IChatAgentRequest>(requestDto);
 		const convertedHistory = await this.prepareHistoryTurns(agent.id, context);
 
 		const ehResult = typeConvert.ChatAgentResult.to(result);
@@ -402,7 +502,7 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 			.map(f => typeConvert.ChatFollowup.from(f, request));
 	}
 
-	$acceptFeedback(handle: number, result: IChatAgentResult, vote: ChatAgentVoteDirection, reportIssue?: boolean): void {
+	$acceptFeedback(handle: number, result: IChatAgentResult, voteAction: IChatVoteAction): void {
 		const agent = this._agents.get(handle);
 		if (!agent) {
 			return;
@@ -410,7 +510,7 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 
 		const ehResult = typeConvert.ChatAgentResult.to(result);
 		let kind: extHostTypes.ChatResultFeedbackKind;
-		switch (vote) {
+		switch (voteAction.direction) {
 			case ChatAgentVoteDirection.Down:
 				kind = extHostTypes.ChatResultFeedbackKind.Unhelpful;
 				break;
@@ -418,9 +518,13 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 				kind = extHostTypes.ChatResultFeedbackKind.Helpful;
 				break;
 		}
-		agent.acceptFeedback(reportIssue ?
-			Object.freeze({ result: ehResult, kind, reportIssue }) :
-			Object.freeze({ result: ehResult, kind }));
+
+		const feedback: vscode.ChatResultFeedback = {
+			result: ehResult,
+			kind,
+			unhelpfulReason: isProposedApiEnabled(agent.extension, 'chatParticipantAdditions') ? voteAction.reason : undefined,
+		};
+		agent.acceptFeedback(Object.freeze(feedback));
 	}
 
 	$acceptAction(handle: number, result: IChatAgentResult, event: IChatUserActionEvent): void {
@@ -433,7 +537,7 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 			return;
 		}
 
-		const ehAction = typeConvert.ChatAgentUserActionEvent.to(result, event, this.commands.converter);
+		const ehAction = typeConvert.ChatAgentUserActionEvent.to(result, event, this._commands.converter);
 		if (ehAction) {
 			agent.acceptAction(Object.freeze(ehAction));
 		}
@@ -456,16 +560,26 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 
 		const items = await agent.invokeCompletionProvider(query, token);
 
-		return items.map((i) => typeConvert.ChatAgentCompletionItem.from(i, this.commands.converter, disposables));
+		return items.map((i) => typeConvert.ChatAgentCompletionItem.from(i, this._commands.converter, disposables));
 	}
 
-	async $provideWelcomeMessage(handle: number, location: ChatAgentLocation, token: CancellationToken): Promise<(string | IMarkdownString)[] | undefined> {
+	async $provideWelcomeMessage(handle: number, token: CancellationToken): Promise<IChatWelcomeMessageContent | undefined> {
 		const agent = this._agents.get(handle);
 		if (!agent) {
 			return;
 		}
 
-		return await agent.provideWelcomeMessage(typeConvert.ChatLocation.to(location), token);
+		return await agent.provideWelcomeMessage(token);
+	}
+
+	async $provideChatTitle(handle: number, context: IChatAgentHistoryEntryDto[], token: CancellationToken): Promise<string | undefined> {
+		const agent = this._agents.get(handle);
+		if (!agent) {
+			return;
+		}
+
+		const history = await this.prepareHistoryTurns(agent.id, { history: context });
+		return await agent.provideTitle({ history }, token);
 	}
 
 	async $provideSampleQuestions(handle: number, location: ChatAgentLocation, token: CancellationToken): Promise<IChatFollowup[] | undefined> {
@@ -479,11 +593,17 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 	}
 }
 
+class ExtHostParticipantDetector {
+	constructor(
+		public readonly extension: IExtensionDescription,
+		public readonly provider: vscode.ChatParticipantDetectionProvider,
+	) { }
+}
+
 class ExtHostChatAgent {
 
 	private _followupProvider: vscode.ChatFollowupProvider | undefined;
 	private _iconPath: vscode.Uri | { light: vscode.Uri; dark: vscode.Uri } | vscode.ThemeIcon | undefined;
-	private _isDefault: boolean | undefined;
 	private _helpTextPrefix: string | vscode.MarkdownString | undefined;
 	private _helpTextVariablesPrefix: string | vscode.MarkdownString | undefined;
 	private _helpTextPostfix: string | vscode.MarkdownString | undefined;
@@ -493,12 +613,12 @@ class ExtHostChatAgent {
 	private _supportIssueReporting: boolean | undefined;
 	private _agentVariableProvider?: { provider: vscode.ChatParticipantCompletionItemProvider; triggerCharacters: string[] };
 	private _welcomeMessageProvider?: vscode.ChatWelcomeMessageProvider | undefined;
+	private _titleProvider?: vscode.ChatTitleProvider | undefined;
 	private _requester: vscode.ChatRequesterInformation | undefined;
 	private _supportsSlowReferences: boolean | undefined;
 
 	constructor(
 		public readonly extension: IExtensionDescription,
-		private readonly quality: string | undefined,
 		public readonly id: string,
 		private readonly _proxy: MainThreadChatAgentsShape2,
 		private readonly _handle: number,
@@ -521,11 +641,6 @@ class ExtHostChatAgent {
 		return await this._agentVariableProvider.provider.provideCompletionItems(query, token) ?? [];
 	}
 
-	public isAgentEnabled() {
-		// If in stable and this extension doesn't have the right proposed API, then don't register the agent
-		return !(this.quality === 'stable' && !isProposedApiEnabled(this.extension, 'chatParticipantPrivate'));
-	}
-
 	async provideFollowups(result: vscode.ChatResult, context: vscode.ChatContext, token: CancellationToken): Promise<vscode.ChatFollowup[]> {
 		if (!this._followupProvider) {
 			return [];
@@ -542,21 +657,30 @@ class ExtHostChatAgent {
 			.filter(f => !(f && 'message' in f));
 	}
 
-	async provideWelcomeMessage(location: vscode.ChatLocation, token: CancellationToken): Promise<(string | IMarkdownString)[] | undefined> {
-		if (!this._welcomeMessageProvider) {
-			return [];
+	async provideWelcomeMessage(token: CancellationToken): Promise<IChatWelcomeMessageContent | undefined> {
+		if (!this._welcomeMessageProvider?.provideWelcomeMessage) {
+			return undefined;
 		}
-		const content = await this._welcomeMessageProvider.provideWelcomeMessage(location, token);
-		if (!content) {
-			return [];
+
+		const content = await this._welcomeMessageProvider.provideWelcomeMessage(token);
+		const icon = content?.icon; // typescript
+		if (!content || !ThemeIcon.isThemeIcon(icon)) {
+			return undefined;
 		}
-		return content.map(item => {
-			if (typeof item === 'string') {
-				return item;
-			} else {
-				return typeConvert.MarkdownString.from(item);
-			}
-		});
+
+		return {
+			...content,
+			icon,
+			message: typeConvert.MarkdownString.from(content.message),
+		};
+	}
+
+	async provideTitle(context: vscode.ChatContext, token: CancellationToken): Promise<string | undefined> {
+		if (!this._titleProvider) {
+			return;
+		}
+
+		return await this._titleProvider.provideChatTitle(context, token) ?? undefined;
 	}
 
 	async provideSampleQuestions(location: vscode.ChatLocation, token: CancellationToken): Promise<vscode.ChatFollowup[]> {
@@ -583,10 +707,6 @@ class ExtHostChatAgent {
 			}
 			updateScheduled = true;
 			queueMicrotask(() => {
-				if (!that.isAgentEnabled()) {
-					return;
-				}
-
 				this._proxy.$updateAgent(this._handle, {
 					icon: !this._iconPath ? undefined :
 						this._iconPath instanceof URI ? this._iconPath :
@@ -635,15 +755,6 @@ class ExtHostChatAgent {
 				that._followupProvider = v;
 				updateMetadataSoon();
 			},
-			get isDefault() {
-				checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
-				return that._isDefault;
-			},
-			set isDefault(v) {
-				checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
-				that._isDefault = v;
-				updateMetadataSoon();
-			},
 			get helpTextPrefix() {
 				checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
 				return that._helpTextPrefix;
@@ -718,6 +829,15 @@ class ExtHostChatAgent {
 				checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
 				return that._welcomeMessageProvider;
 			},
+			set titleProvider(v) {
+				checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
+				that._titleProvider = v;
+				updateMetadataSoon();
+			},
+			get titleProvider() {
+				checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
+				return that._titleProvider;
+			},
 			onDidPerformAction: !isProposedApiEnabled(this.extension, 'chatParticipantAdditions')
 				? undefined!
 				: this._onDidPerformAction.event
diff --git a/src/vs/workbench/api/common/extHostChatVariables.ts b/src/vs/workbench/api/common/extHostChatVariables.ts
index dfc37201bd4..ce8d4eb6d61 100644
--- a/src/vs/workbench/api/common/extHostChatVariables.ts
+++ b/src/vs/workbench/api/common/extHostChatVariables.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { onUnexpectedExternalError } from 'vs/base/common/errors';
-import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { ExtHostChatVariablesShape, IChatVariableResolverProgressDto, IMainContext, MainContext, MainThreadChatVariablesShape } from 'vs/workbench/api/common/extHost.protocol';
-import * as typeConvert from 'vs/workbench/api/common/extHostTypeConverters';
-import * as extHostTypes from 'vs/workbench/api/common/extHostTypes';
-import { IChatRequestVariableValue, IChatVariableData } from 'vs/workbench/contrib/chat/common/chatVariables';
-import { checkProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { onUnexpectedExternalError } from '../../../base/common/errors.js';
+import { IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../base/common/themables.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { ExtHostChatVariablesShape, IChatVariableResolverProgressDto, IMainContext, MainContext, MainThreadChatVariablesShape } from './extHost.protocol.js';
+import * as typeConvert from './extHostTypeConverters.js';
+import * as extHostTypes from './extHostTypes.js';
+import { IChatRequestVariableValue, IChatVariableData } from '../../contrib/chat/common/chatVariables.js';
+import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 import type * as vscode from 'vscode';
 
 export class ExtHostChatVariables implements ExtHostChatVariablesShape {
diff --git a/src/vs/workbench/api/common/extHostClipboard.ts b/src/vs/workbench/api/common/extHostClipboard.ts
index f8665dacbed..2907f47050e 100644
--- a/src/vs/workbench/api/common/extHostClipboard.ts
+++ b/src/vs/workbench/api/common/extHostClipboard.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IMainContext, MainContext } from 'vs/workbench/api/common/extHost.protocol';
+import { IMainContext, MainContext } from './extHost.protocol.js';
 import type * as vscode from 'vscode';
 
 export class ExtHostClipboard {
diff --git a/src/vs/workbench/api/common/extHostCodeInsets.ts b/src/vs/workbench/api/common/extHostCodeInsets.ts
index bf6758e93ae..01cc0023b1d 100644
--- a/src/vs/workbench/api/common/extHostCodeInsets.ts
+++ b/src/vs/workbench/api/common/extHostCodeInsets.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { ExtHostTextEditor } from 'vs/workbench/api/common/extHostTextEditor';
-import { ExtHostEditors } from 'vs/workbench/api/common/extHostTextEditors';
-import { asWebviewUri, webviewGenericCspSource, WebviewRemoteInfo } from 'vs/workbench/contrib/webview/common/webview';
+import { Emitter } from '../../../base/common/event.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { ExtHostTextEditor } from './extHostTextEditor.js';
+import { ExtHostEditors } from './extHostTextEditors.js';
+import { asWebviewUri, webviewGenericCspSource, WebviewRemoteInfo } from '../../contrib/webview/common/webview.js';
 import type * as vscode from 'vscode';
-import { ExtHostEditorInsetsShape, MainThreadEditorInsetsShape } from './extHost.protocol';
+import { ExtHostEditorInsetsShape, MainThreadEditorInsetsShape } from './extHost.protocol.js';
 
 export class ExtHostEditorInsets implements ExtHostEditorInsetsShape {
 
diff --git a/src/vs/workbench/api/common/extHostCodeMapper.ts b/src/vs/workbench/api/common/extHostCodeMapper.ts
new file mode 100644
index 00000000000..0f6b9d12922
--- /dev/null
+++ b/src/vs/workbench/api/common/extHostCodeMapper.ts
@@ -0,0 +1,83 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import type * as vscode from 'vscode';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { ICodeMapperResult } from '../../contrib/chat/common/chatCodeMapperService.js';
+import * as extHostProtocol from './extHost.protocol.js';
+import { ChatAgentResult, DocumentContextItem, TextEdit } from './extHostTypeConverters.js';
+import { URI } from '../../../base/common/uri.js';
+
+export class ExtHostCodeMapper implements extHostProtocol.ExtHostCodeMapperShape {
+
+	private static _providerHandlePool: number = 0;
+	private readonly _proxy: extHostProtocol.MainThreadCodeMapperShape;
+	private readonly providers = new Map<number, vscode.MappedEditsProvider2>();
+
+	constructor(
+		mainContext: extHostProtocol.IMainContext
+	) {
+		this._proxy = mainContext.getProxy(extHostProtocol.MainContext.MainThreadCodeMapper);
+	}
+
+	async $mapCode(handle: number, internalRequest: extHostProtocol.ICodeMapperRequestDto, token: CancellationToken): Promise<ICodeMapperResult | null> {
+		// Received request to map code from the main thread
+		const provider = this.providers.get(handle);
+		if (!provider) {
+			throw new Error(`Received request to map code for unknown provider handle ${handle}`);
+		}
+
+		// Construct a response object to pass to the provider
+		const stream: vscode.MappedEditsResponseStream = {
+			textEdit: (target: vscode.Uri, edits: vscode.TextEdit | vscode.TextEdit[]) => {
+				edits = (Array.isArray(edits) ? edits : [edits]);
+				this._proxy.$handleProgress(internalRequest.requestId, {
+					uri: target,
+					edits: edits.map(TextEdit.from)
+				});
+			}
+		};
+
+		const request: vscode.MappedEditsRequest = {
+			codeBlocks: internalRequest.codeBlocks.map(block => {
+				return {
+					code: block.code,
+					resource: URI.revive(block.resource),
+					markdownBeforeBlock: block.markdownBeforeBlock
+				};
+			}),
+			conversation: internalRequest.conversation.map(item => {
+				if (item.type === 'request') {
+					return {
+						type: 'request',
+						message: item.message
+					} satisfies vscode.ConversationRequest;
+				} else {
+					return {
+						type: 'response',
+						message: item.message,
+						result: item.result ? ChatAgentResult.to(item.result) : undefined,
+						references: item.references?.map(DocumentContextItem.to)
+					} satisfies vscode.ConversationResponse;
+				}
+			})
+		};
+
+		const result = await provider.provideMappedEdits(request, stream, token);
+		return result ?? null;
+	}
+
+	registerMappedEditsProvider(extension: IExtensionDescription, provider: vscode.MappedEditsProvider2): vscode.Disposable {
+		const handle = ExtHostCodeMapper._providerHandlePool++;
+		this._proxy.$registerCodeMapperProvider(handle);
+		this.providers.set(handle, provider);
+		return {
+			dispose: () => {
+				return this._proxy.$unregisterCodeMapperProvider(handle);
+			}
+		};
+	}
+}
diff --git a/src/vs/workbench/api/common/extHostCommands.ts b/src/vs/workbench/api/common/extHostCommands.ts
index 15730c390b9..c40a1942e36 100644
--- a/src/vs/workbench/api/common/extHostCommands.ts
+++ b/src/vs/workbench/api/common/extHostCommands.ts
@@ -5,33 +5,33 @@
 
 /* eslint-disable local/code-no-native-private */
 
-import { validateConstraint } from 'vs/base/common/types';
-import { ICommandMetadata } from 'vs/platform/commands/common/commands';
-import * as extHostTypes from 'vs/workbench/api/common/extHostTypes';
-import * as extHostTypeConverter from 'vs/workbench/api/common/extHostTypeConverters';
-import { cloneAndChange } from 'vs/base/common/objects';
-import { MainContext, MainThreadCommandsShape, ExtHostCommandsShape, ICommandDto, ICommandMetadataDto, MainThreadTelemetryShape } from './extHost.protocol';
-import { isNonEmptyArray } from 'vs/base/common/arrays';
-import * as languages from 'vs/editor/common/languages';
+import { validateConstraint } from '../../../base/common/types.js';
+import { ICommandMetadata } from '../../../platform/commands/common/commands.js';
+import * as extHostTypes from './extHostTypes.js';
+import * as extHostTypeConverter from './extHostTypeConverters.js';
+import { cloneAndChange } from '../../../base/common/objects.js';
+import { MainContext, MainThreadCommandsShape, ExtHostCommandsShape, ICommandDto, ICommandMetadataDto, MainThreadTelemetryShape } from './extHost.protocol.js';
+import { isNonEmptyArray } from '../../../base/common/arrays.js';
+import * as languages from '../../../editor/common/languages.js';
 import type * as vscode from 'vscode';
-import { ILogService } from 'vs/platform/log/common/log';
-import { revive } from 'vs/base/common/marshalling';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { URI } from 'vs/base/common/uri';
-import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import { ISelection } from 'vs/editor/common/core/selection';
-import { TestItemImpl } from 'vs/workbench/api/common/extHostTestItem';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { SerializableObjectWithBuffers } from 'vs/workbench/services/extensions/common/proxyIdentifier';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { TelemetryTrustedValue } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IExtHostTelemetry } from 'vs/workbench/api/common/extHostTelemetry';
-import { generateUuid } from 'vs/base/common/uuid';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { revive } from '../../../base/common/marshalling.js';
+import { IRange, Range } from '../../../editor/common/core/range.js';
+import { IPosition, Position } from '../../../editor/common/core/position.js';
+import { URI } from '../../../base/common/uri.js';
+import { DisposableStore, toDisposable } from '../../../base/common/lifecycle.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { IExtHostRpcService } from './extHostRpcService.js';
+import { ISelection } from '../../../editor/common/core/selection.js';
+import { TestItemImpl } from './extHostTestItem.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';
+import { toErrorMessage } from '../../../base/common/errorMessage.js';
+import { StopWatch } from '../../../base/common/stopwatch.js';
+import { ExtensionIdentifier, IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { TelemetryTrustedValue } from '../../../platform/telemetry/common/telemetryUtils.js';
+import { IExtHostTelemetry } from './extHostTelemetry.js';
+import { generateUuid } from '../../../base/common/uuid.js';
 
 interface CommandHandler {
 	callback: Function;
diff --git a/src/vs/workbench/api/common/extHostComments.ts b/src/vs/workbench/api/common/extHostComments.ts
index fea27272925..70bd44d3001 100644
--- a/src/vs/workbench/api/common/extHostComments.ts
+++ b/src/vs/workbench/api/common/extHostComments.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { asPromise } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { debounce } from 'vs/base/common/decorators';
-import { Emitter } from 'vs/base/common/event';
-import { DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
-import { MarshalledId } from 'vs/base/common/marshallingIds';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { IRange } from 'vs/editor/common/core/range';
-import * as languages from 'vs/editor/common/languages';
-import { ExtensionIdentifierMap, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { ExtHostDocuments } from 'vs/workbench/api/common/extHostDocuments';
-import * as extHostTypeConverter from 'vs/workbench/api/common/extHostTypeConverters';
-import * as types from 'vs/workbench/api/common/extHostTypes';
+import { asPromise } from '../../../base/common/async.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { debounce } from '../../../base/common/decorators.js';
+import { Emitter } from '../../../base/common/event.js';
+import { DisposableStore, MutableDisposable } from '../../../base/common/lifecycle.js';
+import { MarshalledId } from '../../../base/common/marshallingIds.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { IRange } from '../../../editor/common/core/range.js';
+import * as languages from '../../../editor/common/languages.js';
+import { ExtensionIdentifierMap, IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { ExtHostDocuments } from './extHostDocuments.js';
+import * as extHostTypeConverter from './extHostTypeConverters.js';
+import * as types from './extHostTypes.js';
 import type * as vscode from 'vscode';
-import { ExtHostCommentsShape, IMainContext, MainContext, CommentThreadChanges, CommentChanges } from './extHost.protocol';
-import { ExtHostCommands } from './extHostCommands';
-import { checkProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
-import { MarshalledCommentThread } from 'vs/workbench/common/comments';
+import { ExtHostCommentsShape, IMainContext, MainContext, CommentThreadChanges, CommentChanges } from './extHost.protocol.js';
+import { ExtHostCommands } from './extHostCommands.js';
+import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
+import { MarshalledCommentThread } from '../../common/comments.js';
 
 type ProviderHandle = number;
 
@@ -215,7 +215,7 @@ export function createExtHostComments(mainContext: IMainContext, commands: ExtHo
 				} else if (rangesResult) {
 					ranges = {
 						ranges: rangesResult.ranges || [],
-						fileComments: rangesResult.fileComments || false
+						fileComments: rangesResult.enableFileComments || false
 					};
 				} else {
 					ranges = rangesResult ?? undefined;
@@ -424,6 +424,7 @@ export function createExtHostComments(mainContext: IMainContext, commands: ExtHo
 				this._id,
 				this._uri,
 				extHostTypeConverter.Range.from(this._range),
+				this._comments.map(cmt => convertToDTOComment(this, cmt, this._commentsMap, this.extensionDescription)),
 				extensionDescription.identifier,
 				this._isTemplate,
 				editorId
@@ -436,9 +437,6 @@ export function createExtHostComments(mainContext: IMainContext, commands: ExtHo
 				this.eventuallyUpdateCommentThread();
 			}));
 
-			// set up comments after ctor to batch update events.
-			this.comments = _comments;
-
 			this._localDisposables.push({
 				dispose: () => {
 					proxy.$deleteCommentThread(
@@ -465,7 +463,8 @@ export function createExtHostComments(mainContext: IMainContext, commands: ExtHo
 				set label(value: string | undefined) { that.label = value; },
 				get state(): vscode.CommentThreadState | { resolved?: vscode.CommentThreadState; applicability?: vscode.CommentThreadApplicability } | undefined { return that.state; },
 				set state(value: vscode.CommentThreadState | { resolved?: vscode.CommentThreadState; applicability?: vscode.CommentThreadApplicability }) { that.state = value; },
-				reveal: (options?: vscode.CommentThreadRevealOptions) => that.reveal(options),
+				reveal: (comment?: vscode.Comment | vscode.CommentThreadRevealOptions, options?: vscode.CommentThreadRevealOptions) => that.reveal(comment, options),
+				hide: () => that.hide(),
 				dispose: () => {
 					that.dispose();
 				}
@@ -549,9 +548,29 @@ export function createExtHostComments(mainContext: IMainContext, commands: ExtHo
 			return;
 		}
 
-		async reveal(options?: vscode.CommentThreadRevealOptions): Promise<void> {
+		async reveal(commentOrOptions?: vscode.Comment | vscode.CommentThreadRevealOptions, options?: vscode.CommentThreadRevealOptions): Promise<void> {
 			checkProposedApiEnabled(this.extensionDescription, 'commentReveal');
-			return proxy.$revealCommentThread(this._commentControllerHandle, this.handle, { preserveFocus: false, focusReply: false, ...options });
+			let comment: vscode.Comment | undefined;
+			if (commentOrOptions && (commentOrOptions as vscode.Comment).body !== undefined) {
+				comment = commentOrOptions as vscode.Comment;
+			} else {
+				options = options ?? commentOrOptions as vscode.CommentThreadRevealOptions;
+			}
+			let commentToReveal = comment ? this._commentsMap.get(comment) : undefined;
+			commentToReveal ??= this._commentsMap.get(this._comments[0])!;
+			let preserveFocus: boolean = true;
+			let focusReply: boolean = false;
+			if (options?.focus === types.CommentThreadFocus.Reply) {
+				focusReply = true;
+				preserveFocus = false;
+			} else if (options?.focus === types.CommentThreadFocus.Comment) {
+				preserveFocus = false;
+			}
+			return proxy.$revealCommentThread(this._commentControllerHandle, this.handle, commentToReveal, { preserveFocus, focusReply });
+		}
+
+		async hide(): Promise<void> {
+			return proxy.$hideCommentThread(this._commentControllerHandle, this.handle);
 		}
 
 		dispose() {
@@ -622,11 +641,11 @@ export function createExtHostComments(mainContext: IMainContext, commands: ExtHo
 			return this._activeComment;
 		}
 
-		private _activeThread: vscode.CommentThread2 | undefined;
+		private _activeThread: ExtHostCommentThread | undefined;
 
 		get activeCommentThread(): vscode.CommentThread2 | undefined {
 			checkProposedApiEnabled(this._extension, 'activeComment');
-			return this._activeThread;
+			return this._activeThread?.value;
 		}
 
 		private _localDisposables: types.Disposable[];
diff --git a/src/vs/workbench/api/common/extHostConfiguration.ts b/src/vs/workbench/api/common/extHostConfiguration.ts
index 2808a4eb0b1..5a474e8aa92 100644
--- a/src/vs/workbench/api/common/extHostConfiguration.ts
+++ b/src/vs/workbench/api/common/extHostConfiguration.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { mixin, deepClone } from 'vs/base/common/objects';
-import { Event, Emitter } from 'vs/base/common/event';
+import { mixin, deepClone } from '../../../base/common/objects.js';
+import { Event, Emitter } from '../../../base/common/event.js';
 import type * as vscode from 'vscode';
-import { ExtHostWorkspace, IExtHostWorkspace } from 'vs/workbench/api/common/extHostWorkspace';
-import { ExtHostConfigurationShape, MainThreadConfigurationShape, IConfigurationInitData, MainContext } from './extHost.protocol';
-import { ConfigurationTarget as ExtHostConfigurationTarget } from './extHostTypes';
-import { ConfigurationTarget, IConfigurationChange, IConfigurationData, IConfigurationOverrides } from 'vs/platform/configuration/common/configuration';
-import { Configuration, ConfigurationChangeEvent } from 'vs/platform/configuration/common/configurationModels';
-import { ConfigurationScope, OVERRIDE_PROPERTY_REGEX } from 'vs/platform/configuration/common/configurationRegistry';
-import { isObject } from 'vs/base/common/types';
-import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { Barrier } from 'vs/base/common/async';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { Workspace } from 'vs/platform/workspace/common/workspace';
-import { URI } from 'vs/base/common/uri';
+import { ExtHostWorkspace, IExtHostWorkspace } from './extHostWorkspace.js';
+import { ExtHostConfigurationShape, MainThreadConfigurationShape, IConfigurationInitData, MainContext } from './extHost.protocol.js';
+import { ConfigurationTarget as ExtHostConfigurationTarget } from './extHostTypes.js';
+import { ConfigurationTarget, IConfigurationChange, IConfigurationData, IConfigurationOverrides } from '../../../platform/configuration/common/configuration.js';
+import { Configuration, ConfigurationChangeEvent } from '../../../platform/configuration/common/configurationModels.js';
+import { ConfigurationScope, OVERRIDE_PROPERTY_REGEX } from '../../../platform/configuration/common/configurationRegistry.js';
+import { isObject } from '../../../base/common/types.js';
+import { ExtensionIdentifier, IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { Barrier } from '../../../base/common/async.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { IExtHostRpcService } from './extHostRpcService.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { Workspace } from '../../../platform/workspace/common/workspace.js';
+import { URI } from '../../../base/common/uri.js';
 
 function lookUp(tree: any, key: string) {
 	if (key) {
diff --git a/src/vs/workbench/api/common/extHostConsoleForwarder.ts b/src/vs/workbench/api/common/extHostConsoleForwarder.ts
index 663841771e7..02559149900 100644
--- a/src/vs/workbench/api/common/extHostConsoleForwarder.ts
+++ b/src/vs/workbench/api/common/extHostConsoleForwarder.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IStackArgument } from 'vs/base/common/console';
-import { safeStringify } from 'vs/base/common/objects';
-import { MainContext, MainThreadConsoleShape } from 'vs/workbench/api/common/extHost.protocol';
-import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
+import { IStackArgument } from '../../../base/common/console.js';
+import { safeStringify } from '../../../base/common/objects.js';
+import { MainContext, MainThreadConsoleShape } from './extHost.protocol.js';
+import { IExtHostInitDataService } from './extHostInitDataService.js';
+import { IExtHostRpcService } from './extHostRpcService.js';
 
 export abstract class AbstractExtHostConsoleForwarder {
 
diff --git a/src/vs/workbench/api/common/extHostCustomEditors.ts b/src/vs/workbench/api/common/extHostCustomEditors.ts
index 99eef8fbc8b..458795180b0 100644
--- a/src/vs/workbench/api/common/extHostCustomEditors.ts
+++ b/src/vs/workbench/api/common/extHostCustomEditors.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { hash } from 'vs/base/common/hash';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { joinPath } from 'vs/base/common/resources';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { ExtHostDocuments } from 'vs/workbench/api/common/extHostDocuments';
-import { IExtensionStoragePaths } from 'vs/workbench/api/common/extHostStoragePaths';
-import * as typeConverters from 'vs/workbench/api/common/extHostTypeConverters';
-import { ExtHostWebviews, shouldSerializeBuffersForPostMessage, toExtensionData } from 'vs/workbench/api/common/extHostWebview';
-import { ExtHostWebviewPanels } from 'vs/workbench/api/common/extHostWebviewPanels';
-import { EditorGroupColumn } from 'vs/workbench/services/editor/common/editorGroupColumn';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { hash } from '../../../base/common/hash.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { Schemas } from '../../../base/common/network.js';
+import { joinPath } from '../../../base/common/resources.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { ExtHostDocuments } from './extHostDocuments.js';
+import { IExtensionStoragePaths } from './extHostStoragePaths.js';
+import * as typeConverters from './extHostTypeConverters.js';
+import { ExtHostWebviews, shouldSerializeBuffersForPostMessage, toExtensionData } from './extHostWebview.js';
+import { ExtHostWebviewPanels } from './extHostWebviewPanels.js';
+import { EditorGroupColumn } from '../../services/editor/common/editorGroupColumn.js';
 import type * as vscode from 'vscode';
-import { Cache } from './cache';
-import * as extHostProtocol from './extHost.protocol';
-import * as extHostTypes from './extHostTypes';
+import { Cache } from './cache.js';
+import * as extHostProtocol from './extHost.protocol.js';
+import * as extHostTypes from './extHostTypes.js';
 
 
 class CustomDocumentStoreEntry {
diff --git a/src/vs/workbench/api/common/extHostDebugService.ts b/src/vs/workbench/api/common/extHostDebugService.ts
index bcd436663cc..fe33d966e66 100644
--- a/src/vs/workbench/api/common/extHostDebugService.ts
+++ b/src/vs/workbench/api/common/extHostDebugService.ts
@@ -3,34 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { asPromise } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { Disposable as DisposableCls, toDisposable } from 'vs/base/common/lifecycle';
-import { ExtensionIdentifier, IExtensionDescription, IRelaxedExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ISignService } from 'vs/platform/sign/common/sign';
-import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { DebugSessionUUID, ExtHostDebugServiceShape, IBreakpointsDeltaDto, IThreadFocusDto, IStackFrameFocusDto, IDebugSessionDto, IFunctionBreakpointDto, ISourceMultiBreakpointDto, MainContext, MainThreadDebugServiceShape } from 'vs/workbench/api/common/extHost.protocol';
-import { IExtHostEditorTabs } from 'vs/workbench/api/common/extHostEditorTabs';
-import { IExtHostExtensionService } from 'vs/workbench/api/common/extHostExtensionService';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import { Breakpoint, DataBreakpoint, DebugAdapterExecutable, DebugAdapterInlineImplementation, DebugAdapterNamedPipeServer, DebugAdapterServer, DebugConsoleMode, Disposable, FunctionBreakpoint, Location, Position, setBreakpointId, SourceBreakpoint, DebugThread, DebugStackFrame, ThemeIcon } from 'vs/workbench/api/common/extHostTypes';
-import { IExtHostWorkspace } from 'vs/workbench/api/common/extHostWorkspace';
-import { AbstractDebugAdapter } from 'vs/workbench/contrib/debug/common/abstractDebugAdapter';
-import { MainThreadDebugVisualization, IAdapterDescriptor, IConfig, IDebugAdapter, IDebugAdapterExecutable, IDebugAdapterNamedPipeServer, IDebugAdapterServer, IDebugVisualization, IDebugVisualizationContext, IDebuggerContribution, DebugVisualizationType, IDebugVisualizationTreeItem } from 'vs/workbench/contrib/debug/common/debug';
-import { convertToDAPaths, convertToVSCPaths, isDebuggerMainContribution } from 'vs/workbench/contrib/debug/common/debugUtils';
-import { ExtensionDescriptionRegistry } from 'vs/workbench/services/extensions/common/extensionDescriptionRegistry';
-import { Dto } from 'vs/workbench/services/extensions/common/proxyIdentifier';
 import type * as vscode from 'vscode';
-import { IExtHostConfiguration } from '../common/extHostConfiguration';
-import { IExtHostVariableResolverProvider } from './extHostVariableResolverService';
-import { ThemeIcon as ThemeIconUtils } from 'vs/base/common/themables';
-import { IExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
-import * as Convert from 'vs/workbench/api/common/extHostTypeConverters';
-import { coalesce } from 'vs/base/common/arrays';
-import { IExtHostTesting } from 'vs/workbench/api/common/extHostTesting';
+import { coalesce } from '../../../base/common/arrays.js';
+import { asPromise } from '../../../base/common/async.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable as DisposableCls, toDisposable } from '../../../base/common/lifecycle.js';
+import { ThemeIcon as ThemeIconUtils } from '../../../base/common/themables.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { ExtensionIdentifier, IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { ISignService } from '../../../platform/sign/common/sign.js';
+import { IWorkspaceFolder } from '../../../platform/workspace/common/workspace.js';
+import { AbstractDebugAdapter } from '../../contrib/debug/common/abstractDebugAdapter.js';
+import { DebugVisualizationType, IAdapterDescriptor, IConfig, IDebugAdapter, IDebugAdapterExecutable, IDebugAdapterImpl, IDebugAdapterNamedPipeServer, IDebugAdapterServer, IDebuggerContribution, IDebugVisualization, IDebugVisualizationContext, IDebugVisualizationTreeItem, MainThreadDebugVisualization } from '../../contrib/debug/common/debug.js';
+import { convertToDAPaths, convertToVSCPaths, isDebuggerMainContribution } from '../../contrib/debug/common/debugUtils.js';
+import { ExtensionDescriptionRegistry } from '../../services/extensions/common/extensionDescriptionRegistry.js';
+import { Dto } from '../../services/extensions/common/proxyIdentifier.js';
+import { DebugSessionUUID, ExtHostDebugServiceShape, IBreakpointsDeltaDto, IDebugSessionDto, IFunctionBreakpointDto, ISourceMultiBreakpointDto, IStackFrameFocusDto, IThreadFocusDto, MainContext, MainThreadDebugServiceShape } from './extHost.protocol.js';
+import { IExtHostCommands } from './extHostCommands.js';
+import { IExtHostConfiguration } from './extHostConfiguration.js';
+import { IExtHostEditorTabs } from './extHostEditorTabs.js';
+import { IExtHostExtensionService } from './extHostExtensionService.js';
+import { IExtHostRpcService } from './extHostRpcService.js';
+import { IExtHostTesting } from './extHostTesting.js';
+import * as Convert from './extHostTypeConverters.js';
+import { Breakpoint, DataBreakpoint, DebugAdapterExecutable, DebugAdapterInlineImplementation, DebugAdapterNamedPipeServer, DebugAdapterServer, DebugConsoleMode, DebugStackFrame, DebugThread, Disposable, FunctionBreakpoint, Location, Position, setBreakpointId, SourceBreakpoint, ThemeIcon } from './extHostTypes.js';
+import { IExtHostVariableResolverProvider } from './extHostVariableResolverService.js';
+import { IExtHostWorkspace } from './extHostWorkspace.js';
 
 export const IExtHostDebugService = createDecorator<IExtHostDebugService>('IExtHostDebugService');
 
@@ -173,7 +173,7 @@ export abstract class ExtHostDebugServiceBase extends DisposableCls implements I
 		return item ? this.convertVisualizerTreeItem(treeId, item) : undefined;
 	}
 
-	public registerDebugVisualizationTree<T extends vscode.DebugTreeItem>(manifest: Readonly<IRelaxedExtensionDescription>, id: string, provider: vscode.DebugVisualizationTree<T>): vscode.Disposable {
+	public registerDebugVisualizationTree<T extends vscode.DebugTreeItem>(manifest: IExtensionDescription, id: string, provider: vscode.DebugVisualizationTree<T>): vscode.Disposable {
 		const extensionId = ExtensionIdentifier.toKey(manifest.identifier);
 		const key = this.extensionVisKey(extensionId, id);
 		if (this._debugVisualizationProviders.has(key)) {
@@ -578,8 +578,8 @@ export abstract class ExtHostDebugServiceBase extends DisposableCls implements I
 		return variableResolver.resolveAnyAsync(ws, config);
 	}
 
-	protected createDebugAdapter(adapter: IAdapterDescriptor, session: ExtHostDebugSession): AbstractDebugAdapter | undefined {
-		if (adapter.type === 'implementation') {
+	protected createDebugAdapter(adapter: vscode.DebugAdapterDescriptor, session: ExtHostDebugSession): AbstractDebugAdapter | undefined {
+		if (adapter instanceof DebugAdapterInlineImplementation) {
 			return new DirectDebugAdapter(adapter.implementation);
 		}
 		return undefined;
@@ -600,9 +600,7 @@ export abstract class ExtHostDebugServiceBase extends DisposableCls implements I
 				throw new Error(`Couldn't find a debug adapter descriptor for debug type '${session.type}' (extension might have failed to activate)`);
 			}
 
-			const adapterDescriptor = this.convertToDto(daDescriptor);
-
-			const da = this.createDebugAdapter(adapterDescriptor, session);
+			const da = this.createDebugAdapter(daDescriptor, session);
 			if (!da) {
 				throw new Error(`Couldn't create a debug adapter for type '${session.type}'.`);
 			}
@@ -891,35 +889,49 @@ export abstract class ExtHostDebugServiceBase extends DisposableCls implements I
 	// private & dto helpers
 
 	private convertToDto(x: vscode.DebugAdapterDescriptor): Dto<IAdapterDescriptor> {
-
 		if (x instanceof DebugAdapterExecutable) {
-			return {
-				type: 'executable',
-				command: x.command,
-				args: x.args,
-				options: x.options
-			} satisfies IDebugAdapterExecutable;
+			return this.convertExecutableToDto(x);
 		} else if (x instanceof DebugAdapterServer) {
-			return {
-				type: 'server',
-				port: x.port,
-				host: x.host
-			} satisfies IDebugAdapterServer;
+			return this.convertServerToDto(x);
 		} else if (x instanceof DebugAdapterNamedPipeServer) {
-			return {
-				type: 'pipeServer',
-				path: x.path
-			} satisfies IDebugAdapterNamedPipeServer;
+			return this.convertPipeServerToDto(x);
 		} else if (x instanceof DebugAdapterInlineImplementation) {
-			return {
-				type: 'implementation',
-				implementation: x.implementation
-			} as Dto<IAdapterDescriptor>;
+			return this.convertImplementationToDto(x);
 		} else {
 			throw new Error('convertToDto unexpected type');
 		}
 	}
 
+	protected convertExecutableToDto(x: DebugAdapterExecutable): IDebugAdapterExecutable {
+		return {
+			type: 'executable',
+			command: x.command,
+			args: x.args,
+			options: x.options
+		};
+	}
+
+	protected convertServerToDto(x: DebugAdapterServer): IDebugAdapterServer {
+		return {
+			type: 'server',
+			port: x.port,
+			host: x.host
+		};
+	}
+
+	protected convertPipeServerToDto(x: DebugAdapterNamedPipeServer): IDebugAdapterNamedPipeServer {
+		return {
+			type: 'pipeServer',
+			path: x.path
+		};
+	}
+
+	protected convertImplementationToDto(x: DebugAdapterInlineImplementation): IDebugAdapterImpl {
+		return {
+			type: 'implementation',
+		};
+	}
+
 	private getAdapterDescriptorFactoryByType(type: string): vscode.DebugAdapterDescriptorFactory | undefined {
 		const results = this._adapterFactories.filter(p => p.type === type);
 		if (results.length > 0) {
diff --git a/src/vs/workbench/api/common/extHostDecorations.ts b/src/vs/workbench/api/common/extHostDecorations.ts
index 7633574f065..4da84a110fd 100644
--- a/src/vs/workbench/api/common/extHostDecorations.ts
+++ b/src/vs/workbench/api/common/extHostDecorations.ts
@@ -4,18 +4,18 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type * as vscode from 'vscode';
-import { URI } from 'vs/base/common/uri';
-import { MainContext, ExtHostDecorationsShape, MainThreadDecorationsShape, DecorationData, DecorationRequest, DecorationReply } from 'vs/workbench/api/common/extHost.protocol';
-import { Disposable, FileDecoration } from 'vs/workbench/api/common/extHostTypes';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { asArray, groupBy } from 'vs/base/common/arrays';
-import { compare, count } from 'vs/base/common/strings';
-import { dirname } from 'vs/base/common/path';
-import { checkProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
+import { URI } from '../../../base/common/uri.js';
+import { MainContext, ExtHostDecorationsShape, MainThreadDecorationsShape, DecorationData, DecorationRequest, DecorationReply } from './extHost.protocol.js';
+import { Disposable, FileDecoration } from './extHostTypes.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { IExtHostRpcService } from './extHostRpcService.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { asArray, groupBy } from '../../../base/common/arrays.js';
+import { compare, count } from '../../../base/common/strings.js';
+import { dirname } from '../../../base/common/path.js';
+import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 
 interface ProviderData {
 	provider: vscode.FileDecorationProvider;
diff --git a/src/vs/workbench/api/common/extHostDiagnostics.ts b/src/vs/workbench/api/common/extHostDiagnostics.ts
index e23ce395cc8..d2ca87f90d3 100644
--- a/src/vs/workbench/api/common/extHostDiagnostics.ts
+++ b/src/vs/workbench/api/common/extHostDiagnostics.ts
@@ -5,20 +5,20 @@
 
 /* eslint-disable local/code-no-native-private */
 
-import { localize } from 'vs/nls';
-import { IMarkerData, MarkerSeverity } from 'vs/platform/markers/common/markers';
-import { URI, UriComponents } from 'vs/base/common/uri';
+import { localize } from '../../../nls.js';
+import { IMarkerData, MarkerSeverity } from '../../../platform/markers/common/markers.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
 import type * as vscode from 'vscode';
-import { MainContext, MainThreadDiagnosticsShape, ExtHostDiagnosticsShape, IMainContext } from './extHost.protocol';
-import { DiagnosticSeverity } from './extHostTypes';
-import * as converter from './extHostTypeConverters';
-import { Event, Emitter, DebounceEmitter } from 'vs/base/common/event';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ResourceMap } from 'vs/base/common/map';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { IExtHostFileSystemInfo } from 'vs/workbench/api/common/extHostFileSystemInfo';
-import { IExtUri } from 'vs/base/common/resources';
-import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
+import { MainContext, MainThreadDiagnosticsShape, ExtHostDiagnosticsShape, IMainContext } from './extHost.protocol.js';
+import { DiagnosticSeverity } from './extHostTypes.js';
+import * as converter from './extHostTypeConverters.js';
+import { Event, Emitter, DebounceEmitter } from '../../../base/common/event.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { ResourceMap } from '../../../base/common/map.js';
+import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
+import { IExtHostFileSystemInfo } from './extHostFileSystemInfo.js';
+import { IExtUri } from '../../../base/common/resources.js';
+import { ExtHostDocumentsAndEditors } from './extHostDocumentsAndEditors.js';
 
 export class DiagnosticCollection implements vscode.DiagnosticCollection {
 
@@ -234,7 +234,7 @@ export class ExtHostDiagnostics implements ExtHostDiagnosticsShape {
 
 	private static _idPool: number = 0;
 	private static readonly _maxDiagnosticsPerFile: number = 1000;
-	private static readonly _maxDiagnosticsTotal: number = 1.1 * ExtHostDiagnostics._maxDiagnosticsPerFile;
+	private static readonly _maxDiagnosticsTotal: number = 1.1 * this._maxDiagnosticsPerFile;
 
 	private readonly _proxy: MainThreadDiagnosticsShape;
 	private readonly _collections = new Map<string, DiagnosticCollection>();
diff --git a/src/vs/workbench/api/common/extHostDialogs.ts b/src/vs/workbench/api/common/extHostDialogs.ts
index c33cb0704dd..8e98769e19c 100644
--- a/src/vs/workbench/api/common/extHostDialogs.ts
+++ b/src/vs/workbench/api/common/extHostDialogs.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type * as vscode from 'vscode';
-import { URI } from 'vs/base/common/uri';
-import { MainContext, MainThreadDiaglogsShape, IMainContext } from 'vs/workbench/api/common/extHost.protocol';
-import { checkProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
-import { IRelaxedExtensionDescription } from 'vs/platform/extensions/common/extensions';
+import { URI } from '../../../base/common/uri.js';
+import { MainContext, MainThreadDiaglogsShape, IMainContext } from './extHost.protocol.js';
+import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
 
 export class ExtHostDialogs {
 
@@ -17,7 +17,7 @@ export class ExtHostDialogs {
 		this._proxy = mainContext.getProxy(MainContext.MainThreadDialogs);
 	}
 
-	showOpenDialog(extension: IRelaxedExtensionDescription, options?: vscode.OpenDialogOptions): Promise<URI[] | undefined> {
+	showOpenDialog(extension: IExtensionDescription, options?: vscode.OpenDialogOptions): Promise<URI[] | undefined> {
 		if (options?.allowUIResources) {
 			checkProposedApiEnabled(extension, 'showLocal');
 		}
diff --git a/src/vs/workbench/api/common/extHostDocumentContentProviders.ts b/src/vs/workbench/api/common/extHostDocumentContentProviders.ts
index daca96f1913..cf67e3e1747 100644
--- a/src/vs/workbench/api/common/extHostDocumentContentProviders.ts
+++ b/src/vs/workbench/api/common/extHostDocumentContentProviders.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { Disposable } from 'vs/workbench/api/common/extHostTypes';
+import { onUnexpectedError } from '../../../base/common/errors.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { Disposable } from './extHostTypes.js';
 import type * as vscode from 'vscode';
-import { MainContext, ExtHostDocumentContentProvidersShape, MainThreadDocumentContentProvidersShape, IMainContext } from './extHost.protocol';
-import { ExtHostDocumentsAndEditors } from './extHostDocumentsAndEditors';
-import { Schemas } from 'vs/base/common/network';
-import { ILogService } from 'vs/platform/log/common/log';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { splitLines } from 'vs/base/common/strings';
+import { MainContext, ExtHostDocumentContentProvidersShape, MainThreadDocumentContentProvidersShape, IMainContext } from './extHost.protocol.js';
+import { ExtHostDocumentsAndEditors } from './extHostDocumentsAndEditors.js';
+import { Schemas } from '../../../base/common/network.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { splitLines } from '../../../base/common/strings.js';
 
 export class ExtHostDocumentContentProvider implements ExtHostDocumentContentProvidersShape {
 
diff --git a/src/vs/workbench/api/common/extHostDocumentData.ts b/src/vs/workbench/api/common/extHostDocumentData.ts
index ee321b2575a..c69c38d80ce 100644
--- a/src/vs/workbench/api/common/extHostDocumentData.ts
+++ b/src/vs/workbench/api/common/extHostDocumentData.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ok } from 'vs/base/common/assert';
-import { Schemas } from 'vs/base/common/network';
-import { regExpLeadsToEndlessLoop } from 'vs/base/common/strings';
-import { URI } from 'vs/base/common/uri';
-import { MirrorTextModel } from 'vs/editor/common/model/mirrorTextModel';
-import { ensureValidWordDefinition, getWordAtText } from 'vs/editor/common/core/wordHelper';
-import { MainThreadDocumentsShape } from 'vs/workbench/api/common/extHost.protocol';
-import { EndOfLine, Position, Range } from 'vs/workbench/api/common/extHostTypes';
+import { ok } from '../../../base/common/assert.js';
+import { Schemas } from '../../../base/common/network.js';
+import { regExpLeadsToEndlessLoop } from '../../../base/common/strings.js';
+import { URI } from '../../../base/common/uri.js';
+import { MirrorTextModel } from '../../../editor/common/model/mirrorTextModel.js';
+import { ensureValidWordDefinition, getWordAtText } from '../../../editor/common/core/wordHelper.js';
+import { MainThreadDocumentsShape } from './extHost.protocol.js';
+import { EndOfLine, Position, Range } from './extHostTypes.js';
 import type * as vscode from 'vscode';
-import { equals } from 'vs/base/common/arrays';
+import { equals } from '../../../base/common/arrays.js';
 
 const _languageId2WordDefinition = new Map<string, RegExp>();
 export function setWordDefinitionFor(languageId: string, wordDefinition: RegExp | undefined): void {
@@ -76,6 +76,9 @@ export class ExtHostDocumentData extends MirrorTextModel {
 				validateRange(ran) { return that._validateRange(ran); },
 				validatePosition(pos) { return that._validatePosition(pos); },
 				getWordRangeAtPosition(pos, regexp?) { return that._getWordRangeAtPosition(pos, regexp); },
+				[Symbol.for('debug.description')]() {
+					return `TextDocument(${that._uri.toString()})`;
+				}
 			};
 		}
 		return Object.freeze(this._document);
diff --git a/src/vs/workbench/api/common/extHostDocumentSaveParticipant.ts b/src/vs/workbench/api/common/extHostDocumentSaveParticipant.ts
index de3123da9de..69787c4ade6 100644
--- a/src/vs/workbench/api/common/extHostDocumentSaveParticipant.ts
+++ b/src/vs/workbench/api/common/extHostDocumentSaveParticipant.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { illegalState } from 'vs/base/common/errors';
-import { ExtHostDocumentSaveParticipantShape, IWorkspaceEditDto, MainThreadBulkEditsShape } from 'vs/workbench/api/common/extHost.protocol';
-import { TextEdit } from 'vs/workbench/api/common/extHostTypes';
-import { Range, TextDocumentSaveReason, EndOfLine } from 'vs/workbench/api/common/extHostTypeConverters';
-import { ExtHostDocuments } from 'vs/workbench/api/common/extHostDocuments';
-import { SaveReason } from 'vs/workbench/common/editor';
+import { Event } from '../../../base/common/event.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { illegalState } from '../../../base/common/errors.js';
+import { ExtHostDocumentSaveParticipantShape, IWorkspaceEditDto, MainThreadBulkEditsShape } from './extHost.protocol.js';
+import { TextEdit } from './extHostTypes.js';
+import { Range, TextDocumentSaveReason, EndOfLine } from './extHostTypeConverters.js';
+import { ExtHostDocuments } from './extHostDocuments.js';
+import { SaveReason } from '../../common/editor.js';
 import type * as vscode from 'vscode';
-import { LinkedList } from 'vs/base/common/linkedList';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { SerializableObjectWithBuffers } from 'vs/workbench/services/extensions/common/proxyIdentifier';
+import { LinkedList } from '../../../base/common/linkedList.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';
 
 type Listener = [Function, any, IExtensionDescription];
 
diff --git a/src/vs/workbench/api/common/extHostDocuments.ts b/src/vs/workbench/api/common/extHostDocuments.ts
index c9e1dad81b0..c26baab4a67 100644
--- a/src/vs/workbench/api/common/extHostDocuments.ts
+++ b/src/vs/workbench/api/common/extHostDocuments.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { IModelChangedEvent } from 'vs/editor/common/model/mirrorTextModel';
-import { ExtHostDocumentsShape, IMainContext, MainContext, MainThreadDocumentsShape } from 'vs/workbench/api/common/extHost.protocol';
-import { ExtHostDocumentData, setWordDefinitionFor } from 'vs/workbench/api/common/extHostDocumentData';
-import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
-import * as TypeConverters from 'vs/workbench/api/common/extHostTypeConverters';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { IModelChangedEvent } from '../../../editor/common/model/mirrorTextModel.js';
+import { ExtHostDocumentsShape, IMainContext, MainContext, MainThreadDocumentsShape } from './extHost.protocol.js';
+import { ExtHostDocumentData, setWordDefinitionFor } from './extHostDocumentData.js';
+import { ExtHostDocumentsAndEditors } from './extHostDocumentsAndEditors.js';
+import * as TypeConverters from './extHostTypeConverters.js';
 import type * as vscode from 'vscode';
-import { assertIsDefined } from 'vs/base/common/types';
-import { deepFreeze } from 'vs/base/common/objects';
-import { TextDocumentChangeReason } from 'vs/workbench/api/common/extHostTypes';
+import { assertIsDefined } from '../../../base/common/types.js';
+import { deepFreeze } from '../../../base/common/objects.js';
+import { TextDocumentChangeReason } from './extHostTypes.js';
 
 export class ExtHostDocuments implements ExtHostDocumentsShape {
 
diff --git a/src/vs/workbench/api/common/extHostDocumentsAndEditors.ts b/src/vs/workbench/api/common/extHostDocumentsAndEditors.ts
index 224d9d55371..5fe4b192750 100644
--- a/src/vs/workbench/api/common/extHostDocumentsAndEditors.ts
+++ b/src/vs/workbench/api/common/extHostDocumentsAndEditors.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as assert from 'vs/base/common/assert';
+import * as assert from '../../../base/common/assert.js';
 import * as vscode from 'vscode';
-import { Emitter, Event } from 'vs/base/common/event';
-import { dispose } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ExtHostDocumentsAndEditorsShape, IDocumentsAndEditorsDelta, MainContext } from 'vs/workbench/api/common/extHost.protocol';
-import { ExtHostDocumentData } from 'vs/workbench/api/common/extHostDocumentData';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import { ExtHostTextEditor } from 'vs/workbench/api/common/extHostTextEditor';
-import * as typeConverters from 'vs/workbench/api/common/extHostTypeConverters';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ResourceMap } from 'vs/base/common/map';
-import { Schemas } from 'vs/base/common/network';
-import { Iterable } from 'vs/base/common/iterator';
-import { Lazy } from 'vs/base/common/lazy';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { dispose } from '../../../base/common/lifecycle.js';
+import { URI } from '../../../base/common/uri.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { ExtHostDocumentsAndEditorsShape, IDocumentsAndEditorsDelta, MainContext } from './extHost.protocol.js';
+import { ExtHostDocumentData } from './extHostDocumentData.js';
+import { IExtHostRpcService } from './extHostRpcService.js';
+import { ExtHostTextEditor } from './extHostTextEditor.js';
+import * as typeConverters from './extHostTypeConverters.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { ResourceMap } from '../../../base/common/map.js';
+import { Schemas } from '../../../base/common/network.js';
+import { Iterable } from '../../../base/common/iterator.js';
+import { Lazy } from '../../../base/common/lazy.js';
 
 class Reference<T> {
 	private _count = 0;
diff --git a/src/vs/workbench/api/common/extHostEditorTabs.ts b/src/vs/workbench/api/common/extHostEditorTabs.ts
index 3f89c17b81f..592c75c4bae 100644
--- a/src/vs/workbench/api/common/extHostEditorTabs.ts
+++ b/src/vs/workbench/api/common/extHostEditorTabs.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { diffSets } from 'vs/base/common/collections';
-import { Emitter } from 'vs/base/common/event';
-import { assertIsDefined } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IEditorTabDto, IEditorTabGroupDto, IExtHostEditorTabsShape, MainContext, MainThreadEditorTabsShape, TabInputKind, TabModelOperationKind, TabOperation } from 'vs/workbench/api/common/extHost.protocol';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import * as typeConverters from 'vs/workbench/api/common/extHostTypeConverters';
-import { ChatEditorTabInput, CustomEditorTabInput, InteractiveWindowInput, NotebookDiffEditorTabInput, NotebookEditorTabInput, TerminalEditorTabInput, TextDiffTabInput, TextMergeTabInput, TextTabInput, WebviewEditorTabInput, TextMultiDiffTabInput } from 'vs/workbench/api/common/extHostTypes';
+import { diffSets } from '../../../base/common/collections.js';
+import { Emitter } from '../../../base/common/event.js';
+import { assertIsDefined } from '../../../base/common/types.js';
+import { URI } from '../../../base/common/uri.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { IEditorTabDto, IEditorTabGroupDto, IExtHostEditorTabsShape, MainContext, MainThreadEditorTabsShape, TabInputKind, TabModelOperationKind, TabOperation } from './extHost.protocol.js';
+import { IExtHostRpcService } from './extHostRpcService.js';
+import * as typeConverters from './extHostTypeConverters.js';
+import { ChatEditorTabInput, CustomEditorTabInput, InteractiveWindowInput, NotebookDiffEditorTabInput, NotebookEditorTabInput, TerminalEditorTabInput, TextDiffTabInput, TextMergeTabInput, TextTabInput, WebviewEditorTabInput, TextMultiDiffTabInput } from './extHostTypes.js';
 import type * as vscode from 'vscode';
 
 export interface IExtHostEditorTabs extends IExtHostEditorTabsShape {
diff --git a/src/vs/workbench/api/common/extHostEmbedding.ts b/src/vs/workbench/api/common/extHostEmbedding.ts
index f99cd387c62..afc42930343 100644
--- a/src/vs/workbench/api/common/extHostEmbedding.ts
+++ b/src/vs/workbench/api/common/extHostEmbedding.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { ExtHostEmbeddingsShape, IMainContext, MainContext, MainThreadEmbeddingsShape } from 'vs/workbench/api/common/extHost.protocol';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { ExtHostEmbeddingsShape, IMainContext, MainContext, MainThreadEmbeddingsShape } from './extHost.protocol.js';
 import type * as vscode from 'vscode';
 
 
@@ -39,6 +39,7 @@ export class ExtHostEmbeddings implements ExtHostEmbeddingsShape {
 		this._provider.set(handle, { id: embeddingsModel, provider });
 
 		return toDisposable(() => {
+			this._allKnownModels.delete(embeddingsModel);
 			this._proxy.$unregisterEmbeddingProvider(handle);
 			this._provider.delete(handle);
 		});
diff --git a/src/vs/workbench/api/common/extHostEmbeddingVector.ts b/src/vs/workbench/api/common/extHostEmbeddingVector.ts
index 20b3bcb266b..9f97d789b44 100644
--- a/src/vs/workbench/api/common/extHostEmbeddingVector.ts
+++ b/src/vs/workbench/api/common/extHostEmbeddingVector.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { ExtHostAiEmbeddingVectorShape, IMainContext, MainContext, MainThreadAiEmbeddingVectorShape } from 'vs/workbench/api/common/extHost.protocol';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { ExtHostAiEmbeddingVectorShape, IMainContext, MainContext, MainThreadAiEmbeddingVectorShape } from './extHost.protocol.js';
 import type { CancellationToken, EmbeddingVectorProvider } from 'vscode';
-import { Disposable } from 'vs/workbench/api/common/extHostTypes';
+import { Disposable } from './extHostTypes.js';
 
 export class ExtHostAiEmbeddingVector implements ExtHostAiEmbeddingVectorShape {
 	private _AiEmbeddingVectorProviders: Map<number, EmbeddingVectorProvider> = new Map();
diff --git a/src/vs/workbench/api/common/extHostExtensionActivator.ts b/src/vs/workbench/api/common/extHostExtensionActivator.ts
index 2c51f37aed2..20f8efbfdbd 100644
--- a/src/vs/workbench/api/common/extHostExtensionActivator.ts
+++ b/src/vs/workbench/api/common/extHostExtensionActivator.ts
@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type * as vscode from 'vscode';
-import * as errors from 'vs/base/common/errors';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { ExtensionDescriptionRegistry } from 'vs/workbench/services/extensions/common/extensionDescriptionRegistry';
-import { ExtensionIdentifier, ExtensionIdentifierMap } from 'vs/platform/extensions/common/extensions';
-import { ExtensionActivationReason, MissingExtensionDependency } from 'vs/workbench/services/extensions/common/extensions';
-import { ILogService } from 'vs/platform/log/common/log';
-import { Barrier } from 'vs/base/common/async';
+import * as errors from '../../../base/common/errors.js';
+import { Disposable, IDisposable } from '../../../base/common/lifecycle.js';
+import { ExtensionDescriptionRegistry } from '../../services/extensions/common/extensionDescriptionRegistry.js';
+import { ExtensionIdentifier, ExtensionIdentifierMap } from '../../../platform/extensions/common/extensions.js';
+import { ExtensionActivationReason, MissingExtensionDependency } from '../../services/extensions/common/extensions.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { Barrier } from '../../../base/common/async.js';
 
 /**
  * Represents the source code (module) of an extension.
@@ -119,7 +119,7 @@ export class ActivatedExtension {
 	public readonly activationTimes: ExtensionActivationTimes;
 	public readonly module: IExtensionModule;
 	public readonly exports: IExtensionAPI | undefined;
-	public readonly subscriptions: IDisposable[];
+	public readonly disposable: IDisposable;
 
 	constructor(
 		activationFailed: boolean,
@@ -127,32 +127,32 @@ export class ActivatedExtension {
 		activationTimes: ExtensionActivationTimes,
 		module: IExtensionModule,
 		exports: IExtensionAPI | undefined,
-		subscriptions: IDisposable[]
+		disposable: IDisposable
 	) {
 		this.activationFailed = activationFailed;
 		this.activationFailedError = activationFailedError;
 		this.activationTimes = activationTimes;
 		this.module = module;
 		this.exports = exports;
-		this.subscriptions = subscriptions;
+		this.disposable = disposable;
 	}
 }
 
 export class EmptyExtension extends ActivatedExtension {
 	constructor(activationTimes: ExtensionActivationTimes) {
-		super(false, null, activationTimes, { activate: undefined, deactivate: undefined }, undefined, []);
+		super(false, null, activationTimes, { activate: undefined, deactivate: undefined }, undefined, Disposable.None);
 	}
 }
 
 export class HostExtension extends ActivatedExtension {
 	constructor() {
-		super(false, null, ExtensionActivationTimes.NONE, { activate: undefined, deactivate: undefined }, undefined, []);
+		super(false, null, ExtensionActivationTimes.NONE, { activate: undefined, deactivate: undefined }, undefined, Disposable.None);
 	}
 }
 
 class FailedExtension extends ActivatedExtension {
 	constructor(activationError: Error) {
-		super(true, activationError, ExtensionActivationTimes.NONE, { activate: undefined, deactivate: undefined }, undefined, []);
+		super(true, activationError, ExtensionActivationTimes.NONE, { activate: undefined, deactivate: undefined }, undefined, Disposable.None);
 	}
 }
 
diff --git a/src/vs/workbench/api/common/extHostExtensionService.ts b/src/vs/workbench/api/common/extHostExtensionService.ts
index 4ea250c3bf8..e6af1f781be 100644
--- a/src/vs/workbench/api/common/extHostExtensionService.ts
+++ b/src/vs/workbench/api/common/extHostExtensionService.ts
@@ -5,49 +5,49 @@
 
 /* eslint-disable local/code-no-native-private */
 
-import * as nls from 'vs/nls';
-import * as path from 'vs/base/common/path';
-import * as performance from 'vs/base/common/performance';
-import { originalFSPath, joinPath, extUriBiasedIgnorePathCase } from 'vs/base/common/resources';
-import { asPromise, Barrier, IntervalTimer, timeout } from 'vs/base/common/async';
-import { dispose, toDisposable, Disposable } from 'vs/base/common/lifecycle';
-import { TernarySearchTree } from 'vs/base/common/ternarySearchTree';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ExtHostExtensionServiceShape, MainContext, MainThreadExtensionServiceShape, MainThreadTelemetryShape, MainThreadWorkspaceShape } from 'vs/workbench/api/common/extHost.protocol';
-import { IExtensionDescriptionDelta, IExtensionHostInitData } from 'vs/workbench/services/extensions/common/extensionHostProtocol';
-import { ExtHostConfiguration, IExtHostConfiguration } from 'vs/workbench/api/common/extHostConfiguration';
-import { ActivatedExtension, EmptyExtension, ExtensionActivationTimes, ExtensionActivationTimesBuilder, ExtensionsActivator, IExtensionAPI, IExtensionModule, HostExtension, ExtensionActivationTimesFragment } from 'vs/workbench/api/common/extHostExtensionActivator';
-import { ExtHostStorage, IExtHostStorage } from 'vs/workbench/api/common/extHostStorage';
-import { ExtHostWorkspace, IExtHostWorkspace } from 'vs/workbench/api/common/extHostWorkspace';
-import { MissingExtensionDependency, ActivationKind, checkProposedApiEnabled, isProposedApiEnabled, ExtensionActivationReason } from 'vs/workbench/services/extensions/common/extensions';
-import { ExtensionDescriptionRegistry, IActivationEventsReader } from 'vs/workbench/services/extensions/common/extensionDescriptionRegistry';
-import * as errors from 'vs/base/common/errors';
+import * as nls from '../../../nls.js';
+import * as path from '../../../base/common/path.js';
+import * as performance from '../../../base/common/performance.js';
+import { originalFSPath, joinPath, extUriBiasedIgnorePathCase } from '../../../base/common/resources.js';
+import { asPromise, Barrier, IntervalTimer, timeout } from '../../../base/common/async.js';
+import { dispose, toDisposable, Disposable, DisposableStore, IDisposable } from '../../../base/common/lifecycle.js';
+import { TernarySearchTree } from '../../../base/common/ternarySearchTree.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { ExtHostExtensionServiceShape, MainContext, MainThreadExtensionServiceShape, MainThreadTelemetryShape, MainThreadWorkspaceShape } from './extHost.protocol.js';
+import { IExtensionDescriptionDelta, IExtensionHostInitData } from '../../services/extensions/common/extensionHostProtocol.js';
+import { ExtHostConfiguration, IExtHostConfiguration } from './extHostConfiguration.js';
+import { ActivatedExtension, EmptyExtension, ExtensionActivationTimes, ExtensionActivationTimesBuilder, ExtensionsActivator, IExtensionAPI, IExtensionModule, HostExtension, ExtensionActivationTimesFragment } from './extHostExtensionActivator.js';
+import { ExtHostStorage, IExtHostStorage } from './extHostStorage.js';
+import { ExtHostWorkspace, IExtHostWorkspace } from './extHostWorkspace.js';
+import { MissingExtensionDependency, ActivationKind, checkProposedApiEnabled, isProposedApiEnabled, ExtensionActivationReason } from '../../services/extensions/common/extensions.js';
+import { ExtensionDescriptionRegistry, IActivationEventsReader } from '../../services/extensions/common/extensionDescriptionRegistry.js';
+import * as errors from '../../../base/common/errors.js';
 import type * as vscode from 'vscode';
-import { ExtensionIdentifier, ExtensionIdentifierMap, ExtensionIdentifierSet, IExtensionDescription, IRelaxedExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { ExtensionGlobalMemento, ExtensionMemento } from 'vs/workbench/api/common/extHostMemento';
-import { RemoteAuthorityResolverError, ExtensionKind, ExtensionMode, ExtensionRuntime, ManagedResolvedAuthority as ExtHostManagedResolvedAuthority } from 'vs/workbench/api/common/extHostTypes';
-import { ResolvedAuthority, ResolvedOptions, RemoteAuthorityResolverErrorCode, IRemoteConnectionData, getRemoteAuthorityPrefix, TunnelInformation, ManagedRemoteConnection, WebSocketRemoteConnection } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { IInstantiationService, createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService';
-import { IExtensionStoragePaths } from 'vs/workbench/api/common/extHostStoragePaths';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IExtHostTunnelService } from 'vs/workbench/api/common/extHostTunnelService';
-import { IExtHostTerminalService } from 'vs/workbench/api/common/extHostTerminalService';
-import { IExtHostLanguageModels } from 'vs/workbench/api/common/extHostLanguageModels';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IExtensionActivationHost, checkActivateWorkspaceContainsExtension } from 'vs/workbench/services/extensions/common/workspaceContains';
-import { ExtHostSecretState, IExtHostSecretState } from 'vs/workbench/api/common/extHostSecretState';
-import { ExtensionSecrets } from 'vs/workbench/api/common/extHostSecrets';
-import { Schemas } from 'vs/base/common/network';
-import { IResolveAuthorityResult } from 'vs/workbench/services/extensions/common/extensionHostProxy';
-import { IExtHostLocalizationService } from 'vs/workbench/api/common/extHostLocalizationService';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { isCI, setTimeout0 } from 'vs/base/common/platform';
-import { IExtHostManagedSockets } from 'vs/workbench/api/common/extHostManagedSockets';
-import { Dto } from 'vs/workbench/services/extensions/common/proxyIdentifier';
+import { ExtensionIdentifier, ExtensionIdentifierMap, ExtensionIdentifierSet, IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { ExtensionGlobalMemento, ExtensionMemento } from './extHostMemento.js';
+import { RemoteAuthorityResolverError, ExtensionKind, ExtensionMode, ExtensionRuntime, ManagedResolvedAuthority as ExtHostManagedResolvedAuthority } from './extHostTypes.js';
+import { ResolvedAuthority, ResolvedOptions, RemoteAuthorityResolverErrorCode, IRemoteConnectionData, getRemoteAuthorityPrefix, TunnelInformation, ManagedRemoteConnection, WebSocketRemoteConnection } from '../../../platform/remote/common/remoteAuthorityResolver.js';
+import { IInstantiationService, createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { IExtHostInitDataService } from './extHostInitDataService.js';
+import { IExtensionStoragePaths } from './extHostStoragePaths.js';
+import { IExtHostRpcService } from './extHostRpcService.js';
+import { ServiceCollection } from '../../../platform/instantiation/common/serviceCollection.js';
+import { IExtHostTunnelService } from './extHostTunnelService.js';
+import { IExtHostTerminalService } from './extHostTerminalService.js';
+import { IExtHostLanguageModels } from './extHostLanguageModels.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { IExtensionActivationHost, checkActivateWorkspaceContainsExtension } from '../../services/extensions/common/workspaceContains.js';
+import { ExtHostSecretState, IExtHostSecretState } from './extHostSecretState.js';
+import { ExtensionSecrets } from './extHostSecrets.js';
+import { Schemas } from '../../../base/common/network.js';
+import { IResolveAuthorityResult } from '../../services/extensions/common/extensionHostProxy.js';
+import { IExtHostLocalizationService } from './extHostLocalizationService.js';
+import { StopWatch } from '../../../base/common/stopwatch.js';
+import { isCI, setTimeout0 } from '../../../base/common/platform.js';
+import { IExtHostManagedSockets } from './extHostManagedSockets.js';
+import { Dto } from '../../services/extensions/common/proxyIdentifier.js';
 
 interface ITestRunner {
 	/** Old test runner API, as exported from `vscode/lib/testrunner` */
@@ -177,10 +177,10 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
 		this._secretState = new ExtHostSecretState(this._extHostContext);
 		this._storagePath = storagePath;
 
-		this._instaService = instaService.createChild(new ServiceCollection(
+		this._instaService = this._store.add(instaService.createChild(new ServiceCollection(
 			[IExtHostStorage, this._storage],
 			[IExtHostSecretState, this._secretState]
-		));
+		)));
 
 		this._activator = this._register(new ExtensionsActivator(
 			this._myRegistry,
@@ -409,9 +409,9 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
 
 		// clean up subscriptions
 		try {
-			dispose(extension.subscriptions);
+			extension.disposable.dispose();
 		} catch (err) {
-			this._logService.error(`An error occurred when deactivating the subscriptions for extension '${extensionId.value}':`);
+			this._logService.error(`An error occurred when disposing the subscriptions for extension '${extensionId.value}':`);
 			this._logService.error(err);
 		}
 
@@ -482,25 +482,26 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
 		this._logService.info(`ExtensionService#_doActivateExtension ${extensionDescription.identifier.value}, startup: ${reason.startup}, activationEvent: '${reason.activationEvent}'${extensionDescription.identifier.value !== reason.extensionId.value ? `, root cause: ${reason.extensionId.value}` : ``}`);
 		this._logService.flush();
 
+		const extensionInternalStore = new DisposableStore(); // disposables that follow the extension lifecycle
 		const activationTimesBuilder = new ExtensionActivationTimesBuilder(reason.startup);
 		return Promise.all([
 			this._loadCommonJSModule<IExtensionModule>(extensionDescription, joinPath(extensionDescription.extensionLocation, entryPoint), activationTimesBuilder),
-			this._loadExtensionContext(extensionDescription)
+			this._loadExtensionContext(extensionDescription, extensionInternalStore)
 		]).then(values => {
 			performance.mark(`code/extHost/willActivateExtension/${extensionDescription.identifier.value}`);
-			return AbstractExtHostExtensionService._callActivate(this._logService, extensionDescription.identifier, values[0], values[1], activationTimesBuilder);
+			return AbstractExtHostExtensionService._callActivate(this._logService, extensionDescription.identifier, values[0], values[1], extensionInternalStore, activationTimesBuilder);
 		}).then((activatedExtension) => {
 			performance.mark(`code/extHost/didActivateExtension/${extensionDescription.identifier.value}`);
 			return activatedExtension;
 		});
 	}
 
-	private _loadExtensionContext(extensionDescription: IExtensionDescription): Promise<vscode.ExtensionContext> {
+	private _loadExtensionContext(extensionDescription: IExtensionDescription, extensionInternalStore: DisposableStore): Promise<vscode.ExtensionContext> {
 
-		const lanuageModelAccessInformation = this._extHostLanguageModels.createLanguageModelAccessInformation(extensionDescription);
-		const globalState = new ExtensionGlobalMemento(extensionDescription, this._storage);
-		const workspaceState = new ExtensionMemento(extensionDescription.identifier.value, false, this._storage);
-		const secrets = new ExtensionSecrets(extensionDescription, this._secretState);
+		const languageModelAccessInformation = this._extHostLanguageModels.createLanguageModelAccessInformation(extensionDescription);
+		const globalState = extensionInternalStore.add(new ExtensionGlobalMemento(extensionDescription, this._storage));
+		const workspaceState = extensionInternalStore.add(new ExtensionMemento(extensionDescription.identifier.value, false, this._storage));
+		const secrets = extensionInternalStore.add(new ExtensionSecrets(extensionDescription, this._secretState));
 		const extensionMode = extensionDescription.isUnderDevelopment
 			? (this._initData.environment.extensionTestsLocationURI ? ExtensionMode.Test : ExtensionMode.Development)
 			: ExtensionMode.Production;
@@ -526,7 +527,7 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
 				workspaceState,
 				secrets,
 				subscriptions: [],
-				get languageModelAccessInformation() { return lanuageModelAccessInformation; },
+				get languageModelAccessInformation() { return languageModelAccessInformation; },
 				get extensionUri() { return extensionDescription.extensionLocation; },
 				get extensionPath() { return extensionDescription.extensionLocation.fsPath; },
 				asAbsolutePath(relativePath: string) { return path.join(extensionDescription.extensionLocation.fsPath, relativePath); },
@@ -568,7 +569,7 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
 		});
 	}
 
-	private static _callActivate(logService: ILogService, extensionId: ExtensionIdentifier, extensionModule: IExtensionModule, context: vscode.ExtensionContext, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<ActivatedExtension> {
+	private static _callActivate(logService: ILogService, extensionId: ExtensionIdentifier, extensionModule: IExtensionModule, context: vscode.ExtensionContext, extensionInternalStore: IDisposable, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<ActivatedExtension> {
 		// Make sure the extension's surface is not undefined
 		extensionModule = extensionModule || {
 			activate: undefined,
@@ -576,7 +577,10 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
 		};
 
 		return this._callActivateOptional(logService, extensionId, extensionModule, context, activationTimesBuilder).then((extensionExports) => {
-			return new ActivatedExtension(false, null, activationTimesBuilder.build(), extensionModule, extensionExports, context.subscriptions);
+			return new ActivatedExtension(false, null, activationTimesBuilder.build(), extensionModule, extensionExports, toDisposable(() => {
+				extensionInternalStore.dispose();
+				dispose(context.subscriptions);
+			}));
 		});
 	}
 
@@ -615,7 +619,7 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
 		});
 	}
 
-	private _activateAllStartupFinishedDeferred(extensions: Readonly<IRelaxedExtensionDescription>[], start: number = 0): void {
+	private _activateAllStartupFinishedDeferred(extensions: IExtensionDescription[], start: number = 0): void {
 		const timeBudget = 50; // 50 milliseconds
 		const startTime = Date.now();
 
@@ -1230,7 +1234,7 @@ class SyncedActivationEventsReader implements IActivationEventsReader {
 		this.addActivationEvents(activationEvents);
 	}
 
-	public readActivationEvents(extensionDescription: Readonly<IRelaxedExtensionDescription>): string[] {
+	public readActivationEvents(extensionDescription: IExtensionDescription): string[] {
 		return this._map.get(extensionDescription.identifier) ?? [];
 	}
 
diff --git a/src/vs/workbench/api/common/extHostFileSystem.ts b/src/vs/workbench/api/common/extHostFileSystem.ts
index dc740ddf397..f4aa9827938 100644
--- a/src/vs/workbench/api/common/extHostFileSystem.ts
+++ b/src/vs/workbench/api/common/extHostFileSystem.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { MainContext, IMainContext, ExtHostFileSystemShape, MainThreadFileSystemShape, IFileChangeDto } from './extHost.protocol';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { MainContext, IMainContext, ExtHostFileSystemShape, MainThreadFileSystemShape, IFileChangeDto } from './extHost.protocol.js';
 import type * as vscode from 'vscode';
-import * as files from 'vs/platform/files/common/files';
-import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { FileChangeType } from 'vs/workbench/api/common/extHostTypes';
-import * as typeConverter from 'vs/workbench/api/common/extHostTypeConverters';
-import { ExtHostLanguageFeatures } from 'vs/workbench/api/common/extHostLanguageFeatures';
-import { State, StateMachine, LinkComputer, Edge } from 'vs/editor/common/languages/linkComputer';
-import { commonPrefixLength } from 'vs/base/common/strings';
-import { CharCode } from 'vs/base/common/charCode';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { checkProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
-import { IMarkdownString, isMarkdownString } from 'vs/base/common/htmlContent';
+import * as files from '../../../platform/files/common/files.js';
+import { IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { FileChangeType } from './extHostTypes.js';
+import * as typeConverter from './extHostTypeConverters.js';
+import { ExtHostLanguageFeatures } from './extHostLanguageFeatures.js';
+import { State, StateMachine, LinkComputer, Edge } from '../../../editor/common/languages/linkComputer.js';
+import { commonPrefixLength } from '../../../base/common/strings.js';
+import { CharCode } from '../../../base/common/charCode.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
+import { IMarkdownString, isMarkdownString } from '../../../base/common/htmlContent.js';
 
 class FsLinkProvider {
 
diff --git a/src/vs/workbench/api/common/extHostFileSystemConsumer.ts b/src/vs/workbench/api/common/extHostFileSystemConsumer.ts
index fb325813d25..b44f22574ad 100644
--- a/src/vs/workbench/api/common/extHostFileSystemConsumer.ts
+++ b/src/vs/workbench/api/common/extHostFileSystemConsumer.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { MainContext, MainThreadFileSystemShape } from './extHost.protocol';
+import { MainContext, MainThreadFileSystemShape } from './extHost.protocol.js';
 import type * as vscode from 'vscode';
-import * as files from 'vs/platform/files/common/files';
-import { FileSystemError } from 'vs/workbench/api/common/extHostTypes';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import { IExtHostFileSystemInfo } from 'vs/workbench/api/common/extHostFileSystemInfo';
-import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { ResourceQueue } from 'vs/base/common/async';
-import { IExtUri, extUri, extUriIgnorePathCase } from 'vs/base/common/resources';
-import { Schemas } from 'vs/base/common/network';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
+import * as files from '../../../platform/files/common/files.js';
+import { FileSystemError } from './extHostTypes.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { IExtHostRpcService } from './extHostRpcService.js';
+import { IExtHostFileSystemInfo } from './extHostFileSystemInfo.js';
+import { IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { ResourceQueue } from '../../../base/common/async.js';
+import { IExtUri, extUri, extUriIgnorePathCase } from '../../../base/common/resources.js';
+import { Schemas } from '../../../base/common/network.js';
+import { IMarkdownString } from '../../../base/common/htmlContent.js';
 
 export class ExtHostConsumerFileSystem {
 
diff --git a/src/vs/workbench/api/common/extHostFileSystemEventService.ts b/src/vs/workbench/api/common/extHostFileSystemEventService.ts
index 5ad160530c9..ff4892239e9 100644
--- a/src/vs/workbench/api/common/extHostFileSystemEventService.ts
+++ b/src/vs/workbench/api/common/extHostFileSystemEventService.ts
@@ -3,20 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event, AsyncEmitter, IWaitUntil, IWaitUntilData } from 'vs/base/common/event';
-import { GLOBSTAR, GLOB_SPLIT, parse } from 'vs/base/common/glob';
-import { URI } from 'vs/base/common/uri';
-import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
+import { Emitter, Event, AsyncEmitter, IWaitUntil, IWaitUntilData } from '../../../base/common/event.js';
+import { GLOBSTAR, GLOB_SPLIT, IRelativePattern, parse } from '../../../base/common/glob.js';
+import { URI } from '../../../base/common/uri.js';
+import { ExtHostDocumentsAndEditors } from './extHostDocumentsAndEditors.js';
 import type * as vscode from 'vscode';
-import { ExtHostFileSystemEventServiceShape, FileSystemEvents, IMainContext, SourceTargetPair, IWorkspaceEditDto, IWillRunFileOperationParticipation, MainContext, IRelativePatternDto } from './extHost.protocol';
-import * as typeConverter from './extHostTypeConverters';
-import { Disposable, WorkspaceEdit } from './extHostTypes';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { FileChangeFilter, FileOperation } from 'vs/platform/files/common/files';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IExtHostWorkspace } from 'vs/workbench/api/common/extHostWorkspace';
-import { Lazy } from 'vs/base/common/lazy';
+import { ExtHostFileSystemEventServiceShape, FileSystemEvents, IMainContext, SourceTargetPair, IWorkspaceEditDto, IWillRunFileOperationParticipation, MainContext, IRelativePatternDto } from './extHost.protocol.js';
+import * as typeConverter from './extHostTypeConverters.js';
+import { Disposable, WorkspaceEdit } from './extHostTypes.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { FileChangeFilter, FileOperation, IGlobPatterns } from '../../../platform/files/common/files.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { IExtHostWorkspace } from './extHostWorkspace.js';
+import { Lazy } from '../../../base/common/lazy.js';
+import { ExtHostConfigProvider } from './extHostConfiguration.js';
+import { rtrim } from '../../../base/common/strings.js';
+import { normalizeWatcherPattern } from '../../../platform/files/common/watcher.js';
 
 export interface FileSystemWatcherCreateOptions {
 	readonly correlate: boolean;
@@ -51,15 +54,15 @@ class FileSystemWatcher implements vscode.FileSystemWatcher {
 		return Boolean(this._config & 0b100);
 	}
 
-	constructor(mainContext: IMainContext, workspace: IExtHostWorkspace, extension: IExtensionDescription, dispatcher: Event<FileSystemEvents>, globPattern: string | IRelativePatternDto, options?: FileSystemWatcherCreateOptions) {
+	constructor(mainContext: IMainContext, configuration: ExtHostConfigProvider, workspace: IExtHostWorkspace, extension: IExtensionDescription, dispatcher: Event<FileSystemEvents>, globPattern: string | IRelativePatternDto, options: FileSystemWatcherCreateOptions) {
 		this._config = 0;
-		if (options?.ignoreCreateEvents) {
+		if (options.ignoreCreateEvents) {
 			this._config += 0b001;
 		}
-		if (options?.ignoreChangeEvents) {
+		if (options.ignoreChangeEvents) {
 			this._config += 0b010;
 		}
-		if (options?.ignoreDeleteEvents) {
+		if (options.ignoreDeleteEvents) {
 			this._config += 0b100;
 		}
 
@@ -75,7 +78,7 @@ class FileSystemWatcher implements vscode.FileSystemWatcher {
 		// 1.84.x introduces new proposed API for a watcher to set exclude
 		// rules. In these cases, we turn the file watcher into correlation
 		// mode and ignore any event that does not match the correlation ID.
-		const excludeUncorrelatedEvents = options?.correlate;
+		const excludeUncorrelatedEvents = options.correlate;
 
 		const subscription = dispatcher(events => {
 			if (typeof events.session === 'number' && events.session !== this.session) {
@@ -86,7 +89,7 @@ class FileSystemWatcher implements vscode.FileSystemWatcher {
 				return; // ignore events from other non-correlating file watcher when we are in correlation mode
 			}
 
-			if (!options?.ignoreCreateEvents) {
+			if (!options.ignoreCreateEvents) {
 				for (const created of events.created) {
 					const uri = URI.revive(created);
 					if (parsedPattern(uri.fsPath) && (!excludeOutOfWorkspaceEvents || workspace.getWorkspaceFolder(uri))) {
@@ -94,7 +97,7 @@ class FileSystemWatcher implements vscode.FileSystemWatcher {
 					}
 				}
 			}
-			if (!options?.ignoreChangeEvents) {
+			if (!options.ignoreChangeEvents) {
 				for (const changed of events.changed) {
 					const uri = URI.revive(changed);
 					if (parsedPattern(uri.fsPath) && (!excludeOutOfWorkspaceEvents || workspace.getWorkspaceFolder(uri))) {
@@ -102,7 +105,7 @@ class FileSystemWatcher implements vscode.FileSystemWatcher {
 					}
 				}
 			}
-			if (!options?.ignoreDeleteEvents) {
+			if (!options.ignoreDeleteEvents) {
 				for (const deleted of events.deleted) {
 					const uri = URI.revive(deleted);
 					if (parsedPattern(uri.fsPath) && (!excludeOutOfWorkspaceEvents || workspace.getWorkspaceFolder(uri))) {
@@ -112,17 +115,17 @@ class FileSystemWatcher implements vscode.FileSystemWatcher {
 			}
 		});
 
-		this._disposable = Disposable.from(this.ensureWatching(mainContext, extension, globPattern, options, options?.correlate), this._onDidCreate, this._onDidChange, this._onDidDelete, subscription);
+		this._disposable = Disposable.from(this.ensureWatching(mainContext, workspace, configuration, extension, globPattern, options, options.correlate), this._onDidCreate, this._onDidChange, this._onDidDelete, subscription);
 	}
 
-	private ensureWatching(mainContext: IMainContext, extension: IExtensionDescription, globPattern: string | IRelativePatternDto, options: FileSystemWatcherCreateOptions | undefined, correlate: boolean | undefined): Disposable {
+	private ensureWatching(mainContext: IMainContext, workspace: IExtHostWorkspace, configuration: ExtHostConfigProvider, extension: IExtensionDescription, globPattern: string | IRelativePatternDto, options: FileSystemWatcherCreateOptions, correlate: boolean | undefined): Disposable {
 		const disposable = Disposable.from();
 
 		if (typeof globPattern === 'string') {
 			return disposable; // workspace is already watched by default, no need to watch again!
 		}
 
-		if (options?.ignoreChangeEvents && options?.ignoreCreateEvents && options?.ignoreDeleteEvents) {
+		if (options.ignoreChangeEvents && options.ignoreCreateEvents && options.ignoreDeleteEvents) {
 			return disposable; // no need to watch if we ignore all events
 		}
 
@@ -133,26 +136,86 @@ class FileSystemWatcher implements vscode.FileSystemWatcher {
 			recursive = true; // only watch recursively if pattern indicates the need for it
 		}
 
+		const excludes = options.excludes ?? [];
+		let includes: Array<string | IRelativePattern> | undefined = undefined;
 		let filter: FileChangeFilter | undefined;
+
+		// Correlated: adjust filter based on arguments
 		if (correlate) {
-			if (options?.ignoreChangeEvents || options?.ignoreCreateEvents || options?.ignoreDeleteEvents) {
+			if (options.ignoreChangeEvents || options.ignoreCreateEvents || options.ignoreDeleteEvents) {
 				filter = FileChangeFilter.UPDATED | FileChangeFilter.ADDED | FileChangeFilter.DELETED;
 
-				if (options?.ignoreChangeEvents) {
+				if (options.ignoreChangeEvents) {
 					filter &= ~FileChangeFilter.UPDATED;
 				}
 
-				if (options?.ignoreCreateEvents) {
+				if (options.ignoreCreateEvents) {
 					filter &= ~FileChangeFilter.ADDED;
 				}
 
-				if (options?.ignoreDeleteEvents) {
+				if (options.ignoreDeleteEvents) {
 					filter &= ~FileChangeFilter.DELETED;
 				}
 			}
 		}
 
-		proxy.$watch(extension.identifier.value, this.session, globPattern.baseUri, { recursive, excludes: options?.excludes ?? [], filter }, Boolean(correlate));
+		// Uncorrelated: adjust includes and excludes based on settings
+		else {
+
+			// Automatically add `files.watcherExclude` patterns when watching
+			// recursively to give users a chance to configure exclude rules
+			// for reducing the overhead of watching recursively
+			if (recursive && excludes.length === 0) {
+				const workspaceFolder = workspace.getWorkspaceFolder(URI.revive(globPattern.baseUri));
+				const watcherExcludes = configuration.getConfiguration('files', workspaceFolder).get<IGlobPatterns>('watcherExclude');
+				if (watcherExcludes) {
+					for (const key in watcherExcludes) {
+						if (key && watcherExcludes[key] === true) {
+							excludes.push(key);
+						}
+					}
+				}
+			}
+
+			// Non-recursive watching inside the workspace will overlap with
+			// our standard workspace watchers. To prevent duplicate events,
+			// we only want to include events for files that are otherwise
+			// excluded via `files.watcherExclude`. As such, we configure
+			// to include each configured exclude pattern so that only those
+			// events are reported that are otherwise excluded.
+			// However, we cannot just use the pattern as is, because a pattern
+			// such as `bar` for a exclude, will work to exclude any of
+			// `<workspace path>/bar` but will not work as include for files within
+			// `bar` unless a suffix of `/**` if added.
+			// (https://github.com/microsoft/vscode/issues/148245)
+			else if (!recursive) {
+				const workspaceFolder = workspace.getWorkspaceFolder(URI.revive(globPattern.baseUri));
+				if (workspaceFolder) {
+					const watcherExcludes = configuration.getConfiguration('files', workspaceFolder).get<IGlobPatterns>('watcherExclude');
+					if (watcherExcludes) {
+						for (const key in watcherExcludes) {
+							if (key && watcherExcludes[key] === true) {
+								const includePattern = `${rtrim(key, '/')}/${GLOBSTAR}`;
+								if (!includes) {
+									includes = [];
+								}
+
+								includes.push(normalizeWatcherPattern(workspaceFolder.uri.fsPath, includePattern));
+							}
+						}
+					}
+
+					// Still ignore watch request if there are actually no configured
+					// exclude rules, because in that case our default recursive watcher
+					// should be able to take care of all events.
+					if (!includes || includes.length === 0) {
+						return disposable;
+					}
+				}
+			}
+		}
+
+		proxy.$watch(extension.identifier.value, this.session, globPattern.baseUri, { recursive, excludes, includes, filter }, Boolean(correlate));
 
 		return Disposable.from({ dispose: () => proxy.$unwatch(this.session) });
 	}
@@ -220,8 +283,8 @@ export class ExtHostFileSystemEventService implements ExtHostFileSystemEventServ
 
 	//--- file events
 
-	createFileSystemWatcher(workspace: IExtHostWorkspace, extension: IExtensionDescription, globPattern: vscode.GlobPattern, options?: FileSystemWatcherCreateOptions): vscode.FileSystemWatcher {
-		return new FileSystemWatcher(this._mainContext, workspace, extension, this._onFileSystemEvent.event, typeConverter.GlobPattern.from(globPattern), options);
+	createFileSystemWatcher(workspace: IExtHostWorkspace, configProvider: ExtHostConfigProvider, extension: IExtensionDescription, globPattern: vscode.GlobPattern, options: FileSystemWatcherCreateOptions): vscode.FileSystemWatcher {
+		return new FileSystemWatcher(this._mainContext, configProvider, workspace, extension, this._onFileSystemEvent.event, typeConverter.GlobPattern.from(globPattern), options);
 	}
 
 	$onFileEvent(events: FileSystemEvents) {
diff --git a/src/vs/workbench/api/common/extHostFileSystemInfo.ts b/src/vs/workbench/api/common/extHostFileSystemInfo.ts
index 2fa583c672e..5aeabdd9d50 100644
--- a/src/vs/workbench/api/common/extHostFileSystemInfo.ts
+++ b/src/vs/workbench/api/common/extHostFileSystemInfo.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Schemas } from 'vs/base/common/network';
-import { ExtUri, IExtUri } from 'vs/base/common/resources';
-import { UriComponents } from 'vs/base/common/uri';
-import { FileSystemProviderCapabilities } from 'vs/platform/files/common/files';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ExtHostFileSystemInfoShape } from 'vs/workbench/api/common/extHost.protocol';
+import { Schemas } from '../../../base/common/network.js';
+import { ExtUri, IExtUri } from '../../../base/common/resources.js';
+import { UriComponents } from '../../../base/common/uri.js';
+import { FileSystemProviderCapabilities } from '../../../platform/files/common/files.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { ExtHostFileSystemInfoShape } from './extHost.protocol.js';
 
 export class ExtHostFileSystemInfo implements ExtHostFileSystemInfoShape {
 
diff --git a/src/vs/workbench/api/common/extHostInitDataService.ts b/src/vs/workbench/api/common/extHostInitDataService.ts
index 5b7f1ebfa03..49a45f019fa 100644
--- a/src/vs/workbench/api/common/extHostInitDataService.ts
+++ b/src/vs/workbench/api/common/extHostInitDataService.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IExtensionHostInitData } from 'vs/workbench/services/extensions/common/extensionHostProtocol';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { IExtensionHostInitData } from '../../services/extensions/common/extensionHostProtocol.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
 
 export const IExtHostInitDataService = createDecorator<IExtHostInitDataService>('IExtHostInitDataService');
 
diff --git a/src/vs/workbench/api/common/extHostInteractive.ts b/src/vs/workbench/api/common/extHostInteractive.ts
index 63296ab1030..0debcfa5b6c 100644
--- a/src/vs/workbench/api/common/extHostInteractive.ts
+++ b/src/vs/workbench/api/common/extHostInteractive.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ExtHostInteractiveShape, IMainContext } from 'vs/workbench/api/common/extHost.protocol';
-import { ApiCommand, ApiCommandArgument, ApiCommandResult, ExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
-import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
-import { ExtHostNotebookController } from 'vs/workbench/api/common/extHostNotebook';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { ExtHostInteractiveShape, IMainContext } from './extHost.protocol.js';
+import { ApiCommand, ApiCommandArgument, ApiCommandResult, ExtHostCommands } from './extHostCommands.js';
+import { ExtHostDocumentsAndEditors } from './extHostDocumentsAndEditors.js';
+import { ExtHostNotebookController } from './extHostNotebook.js';
 import { NotebookEditor } from 'vscode';
 
 export class ExtHostInteractive implements ExtHostInteractiveShape {
diff --git a/src/vs/workbench/api/common/extHostLabelService.ts b/src/vs/workbench/api/common/extHostLabelService.ts
index 3a7eec9b5a1..66b0e088802 100644
--- a/src/vs/workbench/api/common/extHostLabelService.ts
+++ b/src/vs/workbench/api/common/extHostLabelService.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ResourceLabelFormatter } from 'vs/platform/label/common/label';
-import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { MainThreadLabelServiceShape, ExtHostLabelServiceShape, MainContext, IMainContext } from 'vs/workbench/api/common/extHost.protocol';
+import { ResourceLabelFormatter } from '../../../platform/label/common/label.js';
+import { IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { MainThreadLabelServiceShape, ExtHostLabelServiceShape, MainContext, IMainContext } from './extHost.protocol.js';
 
 export class ExtHostLabelService implements ExtHostLabelServiceShape {
 
diff --git a/src/vs/workbench/api/common/extHostLanguageFeatures.ts b/src/vs/workbench/api/common/extHostLanguageFeatures.ts
index 215ff5fda37..4391adf08a9 100644
--- a/src/vs/workbench/api/common/extHostLanguageFeatures.ts
+++ b/src/vs/workbench/api/common/extHostLanguageFeatures.ts
@@ -3,40 +3,40 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { asArray, coalesce, isFalsyOrEmpty, isNonEmptyArray } from 'vs/base/common/arrays';
-import { raceCancellationError } from 'vs/base/common/async';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { NotImplementedError, isCancellationError } from 'vs/base/common/errors';
-import { IdGenerator } from 'vs/base/common/idGenerator';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { equals, mixin } from 'vs/base/common/objects';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { regExpLeadsToEndlessLoop } from 'vs/base/common/strings';
-import { assertType, isObject } from 'vs/base/common/types';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { IURITransformer } from 'vs/base/common/uriIpc';
-import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { IPosition } from 'vs/editor/common/core/position';
-import { Range as EditorRange, IRange } from 'vs/editor/common/core/range';
-import { ISelection, Selection } from 'vs/editor/common/core/selection';
-import * as languages from 'vs/editor/common/languages';
-import { IAutoClosingPairConditional } from 'vs/editor/common/languages/languageConfiguration';
-import { encodeSemanticTokensDto } from 'vs/editor/common/services/semanticTokensDto';
-import { localize } from 'vs/nls';
-import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IExtHostApiDeprecationService } from 'vs/workbench/api/common/extHostApiDeprecationService';
-import { CommandsConverter, ExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
-import { ExtHostDiagnostics } from 'vs/workbench/api/common/extHostDiagnostics';
-import { ExtHostDocuments } from 'vs/workbench/api/common/extHostDocuments';
-import { ExtHostTelemetry, IExtHostTelemetry } from 'vs/workbench/api/common/extHostTelemetry';
-import * as typeConvert from 'vs/workbench/api/common/extHostTypeConverters';
-import { CodeActionKind, CompletionList, Disposable, DocumentDropOrPasteEditKind, DocumentSymbol, InlineCompletionTriggerKind, InlineEditTriggerKind, InternalDataTransferItem, Location, NewSymbolNameTriggerKind, Range, SemanticTokens, SemanticTokensEdit, SemanticTokensEdits, SnippetString, SymbolInformation, SyntaxTokenType } from 'vs/workbench/api/common/extHostTypes';
-import { isProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
+import { asArray, coalesce, isFalsyOrEmpty, isNonEmptyArray } from '../../../base/common/arrays.js';
+import { raceCancellationError } from '../../../base/common/async.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { NotImplementedError, isCancellationError } from '../../../base/common/errors.js';
+import { IdGenerator } from '../../../base/common/idGenerator.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { equals, mixin } from '../../../base/common/objects.js';
+import { StopWatch } from '../../../base/common/stopwatch.js';
+import { regExpLeadsToEndlessLoop } from '../../../base/common/strings.js';
+import { assertType, isObject } from '../../../base/common/types.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { IURITransformer } from '../../../base/common/uriIpc.js';
+import { ISingleEditOperation } from '../../../editor/common/core/editOperation.js';
+import { IPosition } from '../../../editor/common/core/position.js';
+import { Range as EditorRange, IRange } from '../../../editor/common/core/range.js';
+import { ISelection, Selection } from '../../../editor/common/core/selection.js';
+import * as languages from '../../../editor/common/languages.js';
+import { IAutoClosingPairConditional } from '../../../editor/common/languages/languageConfiguration.js';
+import { encodeSemanticTokensDto } from '../../../editor/common/services/semanticTokensDto.js';
+import { localize } from '../../../nls.js';
+import { ExtensionIdentifier, IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { IExtHostApiDeprecationService } from './extHostApiDeprecationService.js';
+import { CommandsConverter, ExtHostCommands } from './extHostCommands.js';
+import { ExtHostDiagnostics } from './extHostDiagnostics.js';
+import { ExtHostDocuments } from './extHostDocuments.js';
+import { ExtHostTelemetry, IExtHostTelemetry } from './extHostTelemetry.js';
+import * as typeConvert from './extHostTypeConverters.js';
+import { CodeActionKind, CompletionList, Disposable, DocumentDropOrPasteEditKind, DocumentSymbol, InlineCompletionTriggerKind, InlineEditTriggerKind, InternalDataTransferItem, Location, NewSymbolNameTriggerKind, Range, SemanticTokens, SemanticTokensEdit, SemanticTokensEdits, SnippetString, SymbolInformation, SyntaxTokenType } from './extHostTypes.js';
+import { checkProposedApiEnabled, isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 import type * as vscode from 'vscode';
-import { Cache } from './cache';
-import * as extHostProtocol from './extHost.protocol';
+import { Cache } from './cache.js';
+import * as extHostProtocol from './extHost.protocol.js';
 
 // --- adapter
 
@@ -373,13 +373,21 @@ class MultiDocumentHighlightAdapter {
 
 	constructor(
 		private readonly _documents: ExtHostDocuments,
-		private readonly _provider: vscode.MultiDocumentHighlightProvider
+		private readonly _provider: vscode.MultiDocumentHighlightProvider,
+		private readonly _logService: ILogService,
 	) { }
 
 	async provideMultiDocumentHighlights(resource: URI, position: IPosition, otherResources: URI[], token: CancellationToken): Promise<languages.MultiDocumentHighlight[] | undefined> {
-
 		const doc = this._documents.getDocument(resource);
-		const otherDocuments = otherResources.map(r => this._documents.getDocument(r));
+		const otherDocuments = otherResources.map(r => {
+			try {
+				return this._documents.getDocument(r);
+			} catch (err) {
+				this._logService.error('Error: Unable to retrieve document from URI: ' + r + '. Error message: ' + err);
+				return undefined;
+			}
+		}).filter(doc => doc !== undefined);
+
 		const pos = typeConvert.Position.to(position);
 
 		const value = await this._provider.provideMultiDocumentHighlights(doc, pos, otherDocuments, token);
@@ -501,9 +509,9 @@ class CodeActionAdapter {
 			} else {
 				if (codeActionContext.only) {
 					if (!candidate.kind) {
-						this._logService.warn(`${this._extension.identifier.value} - Code actions of kind '${codeActionContext.only.value} 'requested but returned code action does not have a 'kind'. Code action will be dropped. Please set 'CodeAction.kind'.`);
+						this._logService.warn(`${this._extension.identifier.value} - Code actions of kind '${codeActionContext.only.value}' requested but returned code action does not have a 'kind'. Code action will be dropped. Please set 'CodeAction.kind'.`);
 					} else if (!codeActionContext.only.contains(candidate.kind)) {
-						this._logService.warn(`${this._extension.identifier.value} - Code actions of kind '${codeActionContext.only.value} 'requested but returned code action is of kind '${candidate.kind.value}'. Code action will be dropped. Please check 'CodeActionContext.only' to only return requested code actions.`);
+						this._logService.warn(`${this._extension.identifier.value} - Code actions of kind '${codeActionContext.only.value}' requested but returned code action is of kind '${candidate.kind.value}'. Code action will be dropped. Please check 'CodeActionContext.only' to only return requested code actions.`);
 					}
 				}
 
@@ -1287,6 +1295,10 @@ class InlineCompletionAdapterBase {
 		return undefined;
 	}
 
+	async provideInlineEditsForRange(resource: URI, range: IRange, context: languages.InlineCompletionContext, token: CancellationToken): Promise<extHostProtocol.IdentifiableInlineCompletions | undefined> {
+		return undefined;
+	}
+
 	disposeCompletions(pid: number): void { }
 
 	handleDidShowCompletionItem(pid: number, idx: number, updatedInsertText: string): void { }
@@ -1392,6 +1404,82 @@ class InlineCompletionAdapter extends InlineCompletionAdapterBase {
 		};
 	}
 
+	override async provideInlineEditsForRange(resource: URI, range: IRange, context: languages.InlineCompletionContext, token: CancellationToken): Promise<extHostProtocol.IdentifiableInlineCompletions | undefined> {
+		if (!this._provider.provideInlineEditsForRange) {
+			return undefined;
+		}
+		checkProposedApiEnabled(this._extension, 'inlineCompletionsAdditions');
+
+		const doc = this._documents.getDocument(resource);
+		const r = typeConvert.Range.to(range);
+
+		const result = await this._provider.provideInlineEditsForRange(doc, r, {
+			selectedCompletionInfo:
+				context.selectedSuggestionInfo
+					? {
+						range: typeConvert.Range.to(context.selectedSuggestionInfo.range),
+						text: context.selectedSuggestionInfo.text
+					}
+					: undefined,
+			triggerKind: this.languageTriggerKindToVSCodeTriggerKind[context.triggerKind],
+			userPrompt: context.userPrompt,
+		}, token);
+
+		if (!result) {
+			// undefined and null are valid results
+			return undefined;
+		}
+
+		if (token.isCancellationRequested) {
+			// cancelled -> return without further ado, esp no caching
+			// of results as they will leak
+			return undefined;
+		}
+
+		const normalizedResult = Array.isArray(result) ? result : result.items;
+		const commands = this._isAdditionsProposedApiEnabled ? Array.isArray(result) ? [] : result.commands || [] : [];
+		const enableForwardStability = this._isAdditionsProposedApiEnabled && !Array.isArray(result) ? result.enableForwardStability : undefined;
+
+		let disposableStore: DisposableStore | undefined = undefined;
+		const pid = this._references.createReferenceId({
+			dispose() {
+				disposableStore?.dispose();
+			},
+			items: normalizedResult
+		});
+
+		return {
+			pid,
+			items: normalizedResult.map<extHostProtocol.IdentifiableInlineCompletion>((item, idx) => {
+				let command: languages.Command | undefined = undefined;
+				if (item.command) {
+					if (!disposableStore) {
+						disposableStore = new DisposableStore();
+					}
+					command = this._commands.toInternal(item.command, disposableStore);
+				}
+
+				const insertText = item.insertText;
+				return ({
+					insertText: typeof insertText === 'string' ? insertText : { snippet: insertText.value },
+					filterText: item.filterText,
+					range: item.range ? typeConvert.Range.from(item.range) : undefined,
+					command,
+					idx: idx,
+					completeBracketPairs: this._isAdditionsProposedApiEnabled ? item.completeBracketPairs : false,
+				});
+			}),
+			commands: commands.map(c => {
+				if (!disposableStore) {
+					disposableStore = new DisposableStore();
+				}
+				return this._commands.toInternal(c, disposableStore);
+			}),
+			suppressSuggestions: false,
+			enableForwardStability,
+		};
+	}
+
 	override disposeCompletions(pid: number) {
 		const data = this._references.disposeReferenceId(pid);
 		data?.dispose();
@@ -2070,19 +2158,32 @@ class MappedEditsAdapter {
 		const uri = URI.revive(resource);
 		const doc = this._documents.getDocument(uri);
 
-		const usedContext = context.documents.map((docSubArray) =>
-			docSubArray.map((r) => {
-				return {
-					uri: URI.revive(r.uri),
-					version: r.version,
-					ranges: r.ranges.map((range) => typeConvert.Range.to(range)),
-				};
-			})
-		);
+		const reviveContextItem = (item: extHostProtocol.IDocumentContextItemDto) => ({
+			uri: URI.revive(item.uri),
+			version: item.version,
+			ranges: item.ranges.map(r => typeConvert.Range.to(r)),
+		} satisfies vscode.DocumentContextItem);
+
+
+		const usedContext = context.documents.map(docSubArray => docSubArray.map(reviveContextItem));
 
 		const ctx = {
 			documents: usedContext,
-			selections: usedContext[0]?.[0]?.ranges ?? [] // @ulugbekna: this is a hack for backward compatibility
+			selections: usedContext[0]?.[0]?.ranges ?? [], // @ulugbekna: this is a hack for backward compatibility
+			conversation: context.conversation?.map(c => {
+				if (c.type === 'response') {
+					return {
+						type: 'response',
+						message: c.message,
+						references: c.references?.map(reviveContextItem)
+					} satisfies vscode.ConversationResponse;
+				} else {
+					return {
+						type: 'request',
+						message: c.message,
+					} satisfies vscode.ConversationRequest;
+				}
+			})
 		};
 
 		const mappedEdits = await this._provider.provideMappedEdits(doc, codeBlocks, ctx, token);
@@ -2232,15 +2333,15 @@ export class ExtHostLanguageFeatures implements extHostProtocol.ExtHostLanguageF
 	}
 
 	$provideCodeLenses(handle: number, resource: UriComponents, token: CancellationToken): Promise<extHostProtocol.ICodeLensListDto | undefined> {
-		return this._withAdapter(handle, CodeLensAdapter, adapter => adapter.provideCodeLenses(URI.revive(resource), token), undefined, token);
+		return this._withAdapter(handle, CodeLensAdapter, adapter => adapter.provideCodeLenses(URI.revive(resource), token), undefined, token, resource.scheme === 'output');
 	}
 
 	$resolveCodeLens(handle: number, symbol: extHostProtocol.ICodeLensDto, token: CancellationToken): Promise<extHostProtocol.ICodeLensDto | undefined> {
-		return this._withAdapter(handle, CodeLensAdapter, adapter => adapter.resolveCodeLens(symbol, token), undefined, undefined);
+		return this._withAdapter(handle, CodeLensAdapter, adapter => adapter.resolveCodeLens(symbol, token), undefined, undefined, true);
 	}
 
 	$releaseCodeLenses(handle: number, cacheId: number): void {
-		this._withAdapter(handle, CodeLensAdapter, adapter => Promise.resolve(adapter.releaseCodeLenses(cacheId)), undefined, undefined);
+		this._withAdapter(handle, CodeLensAdapter, adapter => Promise.resolve(adapter.releaseCodeLenses(cacheId)), undefined, undefined, true);
 	}
 
 	// --- declaration
@@ -2343,7 +2444,7 @@ export class ExtHostLanguageFeatures implements extHostProtocol.ExtHostLanguageF
 	}
 
 	registerMultiDocumentHighlightProvider(extension: IExtensionDescription, selector: vscode.DocumentSelector, provider: vscode.MultiDocumentHighlightProvider): vscode.Disposable {
-		const handle = this._addNewAdapter(new MultiDocumentHighlightAdapter(this._documents, provider), extension);
+		const handle = this._addNewAdapter(new MultiDocumentHighlightAdapter(this._documents, provider, this._logService), extension);
 		this._proxy.$registerMultiDocumentHighlightProvider(handle, this._transformDocumentSelector(selector, extension));
 		return this._createDisposable(handle);
 	}
@@ -2581,6 +2682,10 @@ export class ExtHostLanguageFeatures implements extHostProtocol.ExtHostLanguageF
 		return this._withAdapter(handle, InlineCompletionAdapterBase, adapter => adapter.provideInlineCompletions(URI.revive(resource), position, context, token), undefined, token);
 	}
 
+	$provideInlineEditsForRange(handle: number, resource: UriComponents, range: IRange, context: languages.InlineCompletionContext, token: CancellationToken): Promise<extHostProtocol.IdentifiableInlineCompletions | undefined> {
+		return this._withAdapter(handle, InlineCompletionAdapterBase, adapter => adapter.provideInlineEditsForRange(URI.revive(resource), range, context, token), undefined, token);
+	}
+
 	$handleInlineCompletionDidShow(handle: number, pid: number, idx: number, updatedInsertText: string): void {
 		this._withAdapter(handle, InlineCompletionAdapterBase, async adapter => {
 			adapter.handleDidShowCompletionItem(pid, idx, updatedInsertText);
@@ -2806,7 +2911,7 @@ export class ExtHostLanguageFeatures implements extHostProtocol.ExtHostLanguageF
 		return this._withAdapter(handle, DocumentDropEditAdapter, adapter => adapter.resolveDropEdit(id, token), {}, undefined);
 	}
 
-	$releaseDropEdits(handle: number, cacheId: number): void {
+	$releaseDocumentOnDropEdits(handle: number, cacheId: number): void {
 		this._withAdapter(handle, DocumentDropEditAdapter, adapter => Promise.resolve(adapter.releaseDropEdits(cacheId)), undefined, undefined);
 	}
 
@@ -2814,7 +2919,7 @@ export class ExtHostLanguageFeatures implements extHostProtocol.ExtHostLanguageF
 
 	registerMappedEditsProvider(extension: IExtensionDescription, selector: vscode.DocumentSelector, provider: vscode.MappedEditsProvider): vscode.Disposable {
 		const handle = this._addNewAdapter(new MappedEditsAdapter(this._documents, provider), extension);
-		this._proxy.$registerMappedEditsProvider(handle, this._transformDocumentSelector(selector, extension));
+		this._proxy.$registerMappedEditsProvider(handle, this._transformDocumentSelector(selector, extension), extension.displayName ?? extension.name);
 		return this._createDisposable(handle);
 	}
 
diff --git a/src/vs/workbench/api/common/extHostLanguageModelTools.ts b/src/vs/workbench/api/common/extHostLanguageModelTools.ts
new file mode 100644
index 00000000000..dd9cb929933
--- /dev/null
+++ b/src/vs/workbench/api/common/extHostLanguageModelTools.ts
@@ -0,0 +1,167 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { raceCancellation } from '../../../base/common/async.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { CancellationError } from '../../../base/common/errors.js';
+import { IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { revive } from '../../../base/common/marshalling.js';
+import { generateUuid } from '../../../base/common/uuid.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { ExtHostLanguageModelToolsShape, IMainContext, IToolDataDto, MainContext, MainThreadLanguageModelToolsShape } from './extHost.protocol.js';
+import * as typeConvert from './extHostTypeConverters.js';
+import { IToolConfirmationMessages, IToolInvocation, IToolInvocationContext, IToolResult } from '../../contrib/chat/common/languageModelToolsService.js';
+import type * as vscode from 'vscode';
+
+export class ExtHostLanguageModelTools implements ExtHostLanguageModelToolsShape {
+	/** A map of tools that were registered in this EH */
+	private readonly _registeredTools = new Map<string, { extension: IExtensionDescription; tool: vscode.LanguageModelTool }>();
+	private readonly _proxy: MainThreadLanguageModelToolsShape;
+	private readonly _tokenCountFuncs = new Map</* call ID */string, (text: string, token?: vscode.CancellationToken) => Thenable<number>>();
+
+	/** A map of all known tools, from other EHs or registered in vscode core */
+	private readonly _allTools = new Map<string, IToolDataDto>();
+
+	constructor(mainContext: IMainContext) {
+		this._proxy = mainContext.getProxy(MainContext.MainThreadLanguageModelTools);
+
+		this._proxy.$getTools().then(tools => {
+			for (const tool of tools) {
+				this._allTools.set(tool.id, revive(tool));
+			}
+		});
+	}
+
+	async $countTokensForInvocation(callId: string, input: string, token: CancellationToken): Promise<number> {
+		const fn = this._tokenCountFuncs.get(callId);
+		if (!fn) {
+			throw new Error(`Tool invocation call ${callId} not found`);
+		}
+
+		return await fn(input, token);
+	}
+
+	async invokeTool(toolId: string, options: vscode.LanguageModelToolInvocationOptions, token: CancellationToken): Promise<vscode.LanguageModelToolResult> {
+		if (!options.requestedContentTypes?.length) {
+			throw new Error('LanguageModelToolInvocationOptions.requestedContentTypes is required to be set');
+		}
+
+		const callId = generateUuid();
+		if (options.tokenOptions) {
+			this._tokenCountFuncs.set(callId, options.tokenOptions.countTokens);
+		}
+		try {
+			// Making the round trip here because not all tools were necessarily registered in this EH
+			const result = await this._proxy.$invokeTool({
+				toolId,
+				callId,
+				parameters: options.parameters,
+				tokenBudget: options.tokenOptions?.tokenBudget,
+				context: options.toolInvocationToken as IToolInvocationContext | undefined,
+				requestedContentTypes: options.requestedContentTypes,
+			}, token);
+			return result;
+		} finally {
+			this._tokenCountFuncs.delete(callId);
+		}
+	}
+
+	$onDidChangeTools(tools: IToolDataDto[]): void {
+		this._allTools.clear();
+		for (const tool of tools) {
+			this._allTools.set(tool.id, tool);
+		}
+	}
+
+	get tools(): vscode.LanguageModelToolDescription[] {
+		return Array.from(this._allTools.values())
+			.map(tool => typeConvert.LanguageModelToolDescription.to(tool));
+	}
+
+	async $invokeTool(dto: IToolInvocation, token: CancellationToken): Promise<IToolResult> {
+		const item = this._registeredTools.get(dto.toolId);
+		if (!item) {
+			throw new Error(`Unknown tool ${dto.toolId}`);
+		}
+
+		const options: vscode.LanguageModelToolInvocationOptions = { parameters: dto.parameters, toolInvocationToken: dto.context, requestedContentTypes: dto.requestedContentTypes };
+		if (dto.tokenBudget !== undefined) {
+			options.tokenOptions = {
+				tokenBudget: dto.tokenBudget,
+				countTokens: this._tokenCountFuncs.get(dto.callId) || ((value, token = CancellationToken.None) =>
+					this._proxy.$countTokensForInvocation(dto.callId, value, token))
+			};
+		}
+
+		// Some participant in extHostChatAgents calls invokeTool, goes to extHostLMTools
+		// mainThreadLMTools invokes the tool, which calls back to extHostLMTools
+		// The tool requests permission
+		// The tool in extHostLMTools calls for permission back to mainThreadLMTools
+		// And back to extHostLMTools, and back to the participant in extHostChatAgents
+		// Is there a tool call ID to identify the call?
+		const extensionResult = await raceCancellation(Promise.resolve(item.tool.invoke(options, token)), token);
+		if (!extensionResult) {
+			throw new CancellationError();
+		}
+
+		for (const key of Object.keys(extensionResult)) {
+			const value = extensionResult[key];
+			if (value instanceof Promise) {
+				throw new Error(`Tool result for '${key}' cannot be a Promise`);
+			} else if (!options.requestedContentTypes.includes(key) && key !== 'toString') {
+				// This could help the scenario where a tool updated the prompt-tsx library, but did not update the contentType in package.json.
+				// Or, where a tool author didn't declare supportedContentTypes and isn't checking the list of requestedContentTypes.
+				// toString check can be temp, just to help with tools that are already published.
+				throw new Error(`Tool result for '${key}' was not requested from ${dto.toolId}.`);
+			}
+		}
+
+		return extensionResult;
+	}
+
+	async $provideToolConfirmationMessages(toolId: string, participantName: string, parameters: any, token: CancellationToken): Promise<IToolConfirmationMessages | undefined> {
+		const item = this._registeredTools.get(toolId);
+		if (!item) {
+			throw new Error(`Unknown tool ${toolId}`);
+		}
+
+		if (!item.tool.provideToolConfirmationMessages) {
+			return undefined;
+		}
+
+		const result = await item.tool.provideToolConfirmationMessages({ participantName, parameters }, token);
+		if (!result) {
+			return undefined;
+		}
+
+		return {
+			title: result.title,
+			message: typeof result.message === 'string' ? result.message : typeConvert.MarkdownString.from(result.message),
+		};
+	}
+
+	async $provideToolInvocationMessage(toolId: string, parameters: any, token: CancellationToken): Promise<string | undefined> {
+		const item = this._registeredTools.get(toolId);
+		if (!item) {
+			throw new Error(`Unknown tool ${toolId}`);
+		}
+
+		if (!item.tool.provideToolInvocationMessage) {
+			return undefined;
+		}
+
+		return await item.tool.provideToolInvocationMessage(parameters, token);
+	}
+
+	registerTool(extension: IExtensionDescription, id: string, tool: vscode.LanguageModelTool): IDisposable {
+		this._registeredTools.set(id, { extension, tool });
+		this._proxy.$registerTool(id);
+
+		return toDisposable(() => {
+			this._registeredTools.delete(id);
+			this._proxy.$unregisterTool(id);
+		});
+	}
+}
diff --git a/src/vs/workbench/api/common/extHostLanguageModels.ts b/src/vs/workbench/api/common/extHostLanguageModels.ts
index 908bfff357d..95a9f2d1a80 100644
--- a/src/vs/workbench/api/common/extHostLanguageModels.ts
+++ b/src/vs/workbench/api/common/extHostLanguageModels.ts
@@ -3,25 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { AsyncIterableObject, AsyncIterableSource, Barrier } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { CancellationError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Iterable } from 'vs/base/common/iterator';
-import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { localize } from 'vs/nls';
-import { ExtensionIdentifier, ExtensionIdentifierMap, ExtensionIdentifierSet, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { Progress } from 'vs/platform/progress/common/progress';
-import { ExtHostLanguageModelsShape, MainContext, MainThreadLanguageModelsShape } from 'vs/workbench/api/common/extHost.protocol';
-import { IExtHostAuthentication } from 'vs/workbench/api/common/extHostAuthentication';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import * as typeConvert from 'vs/workbench/api/common/extHostTypeConverters';
-import * as extHostTypes from 'vs/workbench/api/common/extHostTypes';
-import { IChatMessage, IChatResponseFragment, IChatResponsePart, ILanguageModelChatMetadata } from 'vs/workbench/contrib/chat/common/languageModels';
-import { INTERNAL_AUTH_PROVIDER_PREFIX } from 'vs/workbench/services/authentication/common/authentication';
-import { checkProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
+import { AsyncIterableObject, AsyncIterableSource } from '../../../base/common/async.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { toErrorMessage } from '../../../base/common/errorMessage.js';
+import { CancellationError, SerializedError, transformErrorForSerialization, transformErrorFromSerialization } from '../../../base/common/errors.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Iterable } from '../../../base/common/iterator.js';
+import { IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { localize } from '../../../nls.js';
+import { ExtensionIdentifier, ExtensionIdentifierMap, ExtensionIdentifierSet, IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { Progress } from '../../../platform/progress/common/progress.js';
+import { ExtHostLanguageModelsShape, MainContext, MainThreadLanguageModelsShape } from './extHost.protocol.js';
+import { IExtHostAuthentication } from './extHostAuthentication.js';
+import { IExtHostRpcService } from './extHostRpcService.js';
+import * as typeConvert from './extHostTypeConverters.js';
+import * as extHostTypes from './extHostTypes.js';
+import { IChatMessage, IChatResponseFragment, IChatResponsePart, ILanguageModelChatMetadata } from '../../contrib/chat/common/languageModels.js';
+import { INTERNAL_AUTH_PROVIDER_PREFIX } from '../../services/authentication/common/authentication.js';
+import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 import type * as vscode from 'vscode';
 
 export interface IExtHostLanguageModels extends ExtHostLanguageModels { }
@@ -36,13 +37,13 @@ type LanguageModelData = {
 
 class LanguageModelResponseStream {
 
-	readonly stream = new AsyncIterableSource<vscode.LanguageModelChatResponseTextPart | vscode.LanguageModelChatResponseFunctionUsePart>();
+	readonly stream = new AsyncIterableSource<vscode.LanguageModelChatResponseTextPart | vscode.LanguageModelChatResponseToolCallPart>();
 
 	constructor(
 		readonly option: number,
-		stream?: AsyncIterableSource<vscode.LanguageModelChatResponseTextPart | vscode.LanguageModelChatResponseFunctionUsePart>
+		stream?: AsyncIterableSource<vscode.LanguageModelChatResponseTextPart | vscode.LanguageModelChatResponseToolCallPart>
 	) {
-		this.stream = stream ?? new AsyncIterableSource<vscode.LanguageModelChatResponseTextPart | vscode.LanguageModelChatResponseFunctionUsePart>();
+		this.stream = stream ?? new AsyncIterableSource<vscode.LanguageModelChatResponseTextPart | vscode.LanguageModelChatResponseToolCallPart>();
 	}
 }
 
@@ -51,23 +52,26 @@ class LanguageModelResponse {
 	readonly apiObject: vscode.LanguageModelChatResponse;
 
 	private readonly _responseStreams = new Map<number, LanguageModelResponseStream>();
-	private readonly _defaultStream = new AsyncIterableSource<vscode.LanguageModelChatResponseTextPart | vscode.LanguageModelChatResponseFunctionUsePart>();
+	private readonly _defaultStream = new AsyncIterableSource<vscode.LanguageModelChatResponseTextPart | vscode.LanguageModelChatResponseToolCallPart>();
 	private _isDone: boolean = false;
-	private _isStreaming: boolean = false;
 
 	constructor() {
 
 		const that = this;
 		this.apiObject = {
 			// result: promise,
-			stream: that._defaultStream.asyncIterable,
-			text: AsyncIterableObject.map(that._defaultStream.asyncIterable, part => {
-				if (part instanceof extHostTypes.LanguageModelTextPart) {
-					return part.value;
-				} else {
-					return undefined;
-				}
-			}).coalesce(),
+			get stream() {
+				return that._defaultStream.asyncIterable;
+			},
+			get text() {
+				return AsyncIterableObject.map(that._defaultStream.asyncIterable, part => {
+					if (part instanceof extHostTypes.LanguageModelTextPart) {
+						return part.value;
+					} else {
+						return undefined;
+					}
+				}).coalesce();
+			},
 		};
 	}
 
@@ -85,7 +89,6 @@ class LanguageModelResponse {
 		if (this._isDone) {
 			return;
 		}
-		this._isStreaming = true;
 		let res = this._responseStreams.get(fragment.index);
 		if (!res) {
 			if (this._responseStreams.size === 0) {
@@ -97,18 +100,15 @@ class LanguageModelResponse {
 			this._responseStreams.set(fragment.index, res);
 		}
 
-		let out: vscode.LanguageModelChatResponseTextPart | vscode.LanguageModelChatResponseFunctionUsePart;
+		let out: vscode.LanguageModelChatResponseTextPart | vscode.LanguageModelChatResponseToolCallPart;
 		if (fragment.part.type === 'text') {
 			out = new extHostTypes.LanguageModelTextPart(fragment.part.value);
 		} else {
-			out = new extHostTypes.LanguageModelFunctionUsePart(fragment.part.name, fragment.part.parameters);
+			out = new extHostTypes.LanguageModelToolCallPart(fragment.part.name, fragment.part.toolCallId, fragment.part.parameters);
 		}
 		res.stream.emitOne(out);
 	}
 
-	get isStreaming(): boolean {
-		return this._isStreaming;
-	}
 
 	reject(err: Error): void {
 		this._isDone = true;
@@ -165,7 +165,7 @@ export class ExtHostLanguageModels implements ExtHostLanguageModelsShape {
 				accountLabel: typeof metadata.auth === 'object' ? metadata.auth.label : undefined
 			};
 		}
-		this._proxy.$registerLanguageModelProvider(handle, `${ExtensionIdentifier.toKey(extension.identifier)}/${handle}/${identifier}`, {
+		this._proxy.$registerLanguageModelProvider(handle, `${ExtensionIdentifier.toKey(extension.identifier)}/${identifier}`, {
 			extension: extension.identifier,
 			id: identifier,
 			vendor: metadata.vendor ?? ExtensionIdentifier.toKey(extension.identifier),
@@ -175,7 +175,9 @@ export class ExtHostLanguageModels implements ExtHostLanguageModelsShape {
 			maxInputTokens: metadata.maxInputTokens,
 			maxOutputTokens: metadata.maxOutputTokens,
 			auth,
-			targetExtensions: metadata.extensions
+			targetExtensions: metadata.extensions,
+			isDefault: metadata.isDefault,
+			isUserSelectable: metadata.isUserSelectable,
 		});
 
 		const responseReceivedListener = provider.onDidReceiveLanguageModelResponse2?.(({ extensionId, participant, tokenCount }) => {
@@ -189,10 +191,10 @@ export class ExtHostLanguageModels implements ExtHostLanguageModelsShape {
 		});
 	}
 
-	async $provideLanguageModelResponse(handle: number, requestId: number, from: ExtensionIdentifier, messages: IChatMessage[], options: vscode.LanguageModelChatRequestOptions, token: CancellationToken): Promise<any> {
+	async $startChatRequest(handle: number, requestId: number, from: ExtensionIdentifier, messages: IChatMessage[], options: vscode.LanguageModelChatRequestOptions, token: CancellationToken): Promise<void> {
 		const data = this._languageModels.get(handle);
 		if (!data) {
-			return;
+			throw new Error('Provider not found');
 		}
 		const progress = new Progress<vscode.ChatResponseFragment2>(async fragment => {
 			if (token.isCancellationRequested) {
@@ -201,8 +203,8 @@ export class ExtHostLanguageModels implements ExtHostLanguageModelsShape {
 			}
 
 			let part: IChatResponsePart | undefined;
-			if (fragment.part instanceof extHostTypes.LanguageModelFunctionUsePart) {
-				part = { type: 'function_use', name: fragment.part.name, parameters: fragment.part.parameters };
+			if (fragment.part instanceof extHostTypes.LanguageModelToolCallPart) {
+				part = { type: 'tool_use', name: fragment.part.name, parameters: fragment.part.parameters, toolCallId: fragment.part.toolCallId };
 			} else if (fragment.part instanceof extHostTypes.LanguageModelTextPart) {
 				part = { type: 'text', value: fragment.part.value };
 			}
@@ -212,18 +214,20 @@ export class ExtHostLanguageModels implements ExtHostLanguageModelsShape {
 				return;
 			}
 
-			this._proxy.$handleProgressChunk(requestId, { index: fragment.index, part });
+			this._proxy.$reportResponsePart(requestId, { index: fragment.index, part });
 		});
 
+		let p: Promise<any>;
+
 		if (data.provider.provideLanguageModelResponse2) {
 
-			return data.provider.provideLanguageModelResponse2(
+			p = Promise.resolve(data.provider.provideLanguageModelResponse2(
 				messages.map(typeConvert.LanguageModelChatMessage.to),
 				options,
 				ExtensionIdentifier.toKey(from),
 				progress,
 				token
-			);
+			));
 
 		} else {
 
@@ -231,16 +235,21 @@ export class ExtHostLanguageModels implements ExtHostLanguageModelsShape {
 				progress.report({ index: fragment.index, part: new extHostTypes.LanguageModelTextPart(fragment.part) });
 			});
 
-			return data.provider.provideLanguageModelResponse(
+			p = Promise.resolve(data.provider.provideLanguageModelResponse(
 				messages.map(typeConvert.LanguageModelChatMessage.to),
 				options?.modelOptions ?? {},
 				ExtensionIdentifier.toKey(from),
 				progress2,
 				token
-			);
+			));
 		}
-	}
 
+		p.then(() => {
+			this._proxy.$reportResponseDone(requestId, undefined);
+		}, err => {
+			this._proxy.$reportResponseDone(requestId, transformErrorForSerialization(err));
+		});
+	}
 
 	//#region --- token counting
 
@@ -282,54 +291,62 @@ export class ExtHostLanguageModels implements ExtHostLanguageModelsShape {
 		this._onDidChangeProviders.fire(undefined);
 	}
 
+	async getLanguageModelByIdentifier(extension: IExtensionDescription, identifier: string): Promise<vscode.LanguageModelChat | undefined> {
+
+		const data = this._allLanguageModelData.get(identifier);
+		if (!data) {
+			// model gone? is this an error on us?
+			return;
+		}
+
+		// make sure auth information is correct
+		if (this._isUsingAuth(extension.identifier, data.metadata)) {
+			await this._fakeAuthPopulate(data.metadata);
+		}
+
+		let apiObject = data.apiObjects.get(extension.identifier);
+		if (!apiObject) {
+			const that = this;
+			apiObject = {
+				id: data.metadata.id,
+				vendor: data.metadata.vendor,
+				family: data.metadata.family,
+				version: data.metadata.version,
+				name: data.metadata.name,
+				maxInputTokens: data.metadata.maxInputTokens,
+				countTokens(text, token) {
+					if (!that._allLanguageModelData.has(identifier)) {
+						throw extHostTypes.LanguageModelError.NotFound(identifier);
+					}
+					return that._computeTokenLength(identifier, text, token ?? CancellationToken.None);
+				},
+				sendRequest(messages, options, token) {
+					if (!that._allLanguageModelData.has(identifier)) {
+						throw extHostTypes.LanguageModelError.NotFound(identifier);
+					}
+					return that._sendChatRequest(extension, identifier, messages, options ?? {}, token ?? CancellationToken.None);
+				}
+			};
+
+			Object.freeze(apiObject);
+			data.apiObjects.set(extension.identifier, apiObject);
+		}
+
+		return apiObject;
+	}
+
 	async selectLanguageModels(extension: IExtensionDescription, selector: vscode.LanguageModelChatSelector) {
 
 		// this triggers extension activation
 		const models = await this._proxy.$selectChatModels({ ...selector, extension: extension.identifier });
 
 		const result: vscode.LanguageModelChat[] = [];
-		const that = this;
+
 		for (const identifier of models) {
-			const data = this._allLanguageModelData.get(identifier);
-			if (!data) {
-				// model gone? is this an error on us?
-				continue;
+			const model = await this.getLanguageModelByIdentifier(extension, identifier);
+			if (model) {
+				result.push(model);
 			}
-
-			// make sure auth information is correct
-			if (this._isUsingAuth(extension.identifier, data.metadata)) {
-				await this._fakeAuthPopulate(data.metadata);
-			}
-
-			let apiObject = data.apiObjects.get(extension.identifier);
-
-			if (!apiObject) {
-				apiObject = {
-					id: identifier,
-					vendor: data.metadata.vendor,
-					family: data.metadata.family,
-					version: data.metadata.version,
-					name: data.metadata.name,
-					maxInputTokens: data.metadata.maxInputTokens,
-					countTokens(text, token) {
-						if (!that._allLanguageModelData.has(identifier)) {
-							throw extHostTypes.LanguageModelError.NotFound(identifier);
-						}
-						return that._computeTokenLength(identifier, text, token ?? CancellationToken.None);
-					},
-					sendRequest(messages, options, token) {
-						if (!that._allLanguageModelData.has(identifier)) {
-							throw extHostTypes.LanguageModelError.NotFound(identifier);
-						}
-						return that._sendChatRequest(extension, identifier, messages, options ?? {}, token ?? CancellationToken.None);
-					}
-				};
-
-				Object.freeze(apiObject);
-				data.apiObjects.set(extension.identifier, apiObject);
-			}
-
-			result.push(apiObject);
 		}
 
 		return result;
@@ -354,45 +371,33 @@ export class ExtHostLanguageModels implements ExtHostLanguageModelsShape {
 			}
 		}
 
-		const requestId = (Math.random() * 1e6) | 0;
-		const requestPromise = this._proxy.$fetchResponse(from, languageModelId, requestId, internalMessages, options, token);
+		try {
+			const requestId = (Math.random() * 1e6) | 0;
+			const res = new LanguageModelResponse();
+			this._pendingRequest.set(requestId, { languageModelId, res });
 
-		const barrier = new Barrier();
+			try {
+				await this._proxy.$tryStartChatRequest(from, languageModelId, requestId, internalMessages, options, token);
 
-		const res = new LanguageModelResponse();
-		this._pendingRequest.set(requestId, { languageModelId, res });
-
-		let error: Error | undefined;
-
-		requestPromise.catch(err => {
-			if (barrier.isOpen()) {
-				// we received an error while streaming. this means we need to reject the "stream"
-				// because we have already returned the request object
-				res.reject(err);
-			} else {
-				error = err;
-			}
-		}).finally(() => {
-			this._pendingRequest.delete(requestId);
-			res.resolve();
-			barrier.open();
-		});
-
-		await barrier.wait();
-
-		if (error) {
-			if (error.name === extHostTypes.LanguageModelError.name) {
+			} catch (error) {
+				// error'ing here means that the request could NOT be started/made, e.g. wrong model, no access, etc, but
+				// later the response can fail as well. Those failures are communicated via the stream-object
+				this._pendingRequest.delete(requestId);
 				throw error;
 			}
 
+			return res.apiObject;
+
+		} catch (error) {
+			if (error.name === extHostTypes.LanguageModelError.name) {
+				throw error;
+			}
 			throw new extHostTypes.LanguageModelError(
-				`Language model '${languageModelId}' errored, check cause for more details`,
+				`Language model '${languageModelId}' errored: ${toErrorMessage(error)}`,
 				'Unknown',
 				error
 			);
 		}
-
-		return res.apiObject;
 	}
 
 	private _convertMessages(extension: IExtensionDescription, messages: vscode.LanguageModelChatMessage[]) {
@@ -401,7 +406,7 @@ export class ExtHostLanguageModels implements ExtHostLanguageModelsShape {
 			if (message.role as number === extHostTypes.LanguageModelChatMessageRole.System) {
 				checkProposedApiEnabled(extension, 'languageModelSystem');
 			}
-			if (message.content2 instanceof extHostTypes.LanguageModelFunctionResultPart) {
+			if (message.content2.some(part => part instanceof extHostTypes.LanguageModelToolResultPart)) {
 				checkProposedApiEnabled(extension, 'lmTools');
 			}
 			internalMessages.push(typeConvert.LanguageModelChatMessage.from(message));
@@ -409,13 +414,28 @@ export class ExtHostLanguageModels implements ExtHostLanguageModelsShape {
 		return internalMessages;
 	}
 
-	async $handleResponseFragment(requestId: number, chunk: IChatResponseFragment): Promise<void> {
+	async $acceptResponsePart(requestId: number, chunk: IChatResponseFragment): Promise<void> {
 		const data = this._pendingRequest.get(requestId);
 		if (data) {
 			data.res.handleFragment(chunk);
 		}
 	}
 
+	async $acceptResponseDone(requestId: number, error: SerializedError | undefined): Promise<void> {
+		const data = this._pendingRequest.get(requestId);
+		if (!data) {
+			return;
+		}
+		this._pendingRequest.delete(requestId);
+		if (error) {
+			// we error the stream because that's the only way to signal
+			// that the request has failed
+			data.res.reject(transformErrorFromSerialization(error));
+		} else {
+			data.res.resolve();
+		}
+	}
+
 	// BIG HACK: Using AuthenticationProviders to check access to Language Models
 	private async _getAuthAccess(from: IExtensionDescription, to: { identifier: ExtensionIdentifier; displayName: string }, justification: string | undefined, silent: boolean | undefined): Promise<boolean> {
 		// This needs to be done in both MainThread & ExtHost ChatProvider
diff --git a/src/vs/workbench/api/common/extHostLanguages.ts b/src/vs/workbench/api/common/extHostLanguages.ts
index 78c5be8415e..c8dadb3f883 100644
--- a/src/vs/workbench/api/common/extHostLanguages.ts
+++ b/src/vs/workbench/api/common/extHostLanguages.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { MainContext, MainThreadLanguagesShape, IMainContext, ExtHostLanguagesShape } from './extHost.protocol';
+import { MainContext, MainThreadLanguagesShape, IMainContext, ExtHostLanguagesShape } from './extHost.protocol.js';
 import type * as vscode from 'vscode';
-import { ExtHostDocuments } from 'vs/workbench/api/common/extHostDocuments';
-import * as typeConvert from 'vs/workbench/api/common/extHostTypeConverters';
-import { StandardTokenType, Range, Position, LanguageStatusSeverity } from 'vs/workbench/api/common/extHostTypes';
-import Severity from 'vs/base/common/severity';
-import { disposableTimeout } from 'vs/base/common/async';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { CommandsConverter } from 'vs/workbench/api/common/extHostCommands';
-import { IURITransformer } from 'vs/base/common/uriIpc';
-import { checkProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
+import { ExtHostDocuments } from './extHostDocuments.js';
+import * as typeConvert from './extHostTypeConverters.js';
+import { StandardTokenType, Range, Position, LanguageStatusSeverity } from './extHostTypes.js';
+import Severity from '../../../base/common/severity.js';
+import { disposableTimeout } from '../../../base/common/async.js';
+import { DisposableStore, IDisposable } from '../../../base/common/lifecycle.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { CommandsConverter } from './extHostCommands.js';
+import { IURITransformer } from '../../../base/common/uriIpc.js';
+import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 
 export class ExtHostLanguages implements ExtHostLanguagesShape {
 
diff --git a/src/vs/workbench/api/common/extHostLocalizationService.ts b/src/vs/workbench/api/common/extHostLocalizationService.ts
index 6ed204b58dd..754a6e713a4 100644
--- a/src/vs/workbench/api/common/extHostLocalizationService.ts
+++ b/src/vs/workbench/api/common/extHostLocalizationService.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { LANGUAGE_DEFAULT } from 'vs/base/common/platform';
-import { format2 } from 'vs/base/common/strings';
-import { URI } from 'vs/base/common/uri';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ExtHostLocalizationShape, IStringDetails, MainContext, MainThreadLocalizationShape } from 'vs/workbench/api/common/extHost.protocol';
-import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
+import { LANGUAGE_DEFAULT } from '../../../base/common/platform.js';
+import { format2 } from '../../../base/common/strings.js';
+import { URI } from '../../../base/common/uri.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { ExtHostLocalizationShape, IStringDetails, MainContext, MainThreadLocalizationShape } from './extHost.protocol.js';
+import { IExtHostInitDataService } from './extHostInitDataService.js';
+import { IExtHostRpcService } from './extHostRpcService.js';
 
 export class ExtHostLocalizationService implements ExtHostLocalizationShape {
 	readonly _serviceBrand: undefined;
diff --git a/src/vs/workbench/api/common/extHostLogService.ts b/src/vs/workbench/api/common/extHostLogService.ts
index d4baa5ae864..54a6c3d0d93 100644
--- a/src/vs/workbench/api/common/extHostLogService.ts
+++ b/src/vs/workbench/api/common/extHostLogService.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { ILoggerService } from 'vs/platform/log/common/log';
-import { LogService } from 'vs/platform/log/common/logService';
-import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService';
+import { localize } from '../../../nls.js';
+import { ILoggerService } from '../../../platform/log/common/log.js';
+import { LogService } from '../../../platform/log/common/logService.js';
+import { IExtHostInitDataService } from './extHostInitDataService.js';
 
 export class ExtHostLogService extends LogService {
 
diff --git a/src/vs/workbench/api/common/extHostLoggerService.ts b/src/vs/workbench/api/common/extHostLoggerService.ts
index 1d7b4288378..87ee751612a 100644
--- a/src/vs/workbench/api/common/extHostLoggerService.ts
+++ b/src/vs/workbench/api/common/extHostLoggerService.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ILogger, ILoggerOptions, AbstractMessageLogger, LogLevel, AbstractLoggerService } from 'vs/platform/log/common/log';
-import { MainThreadLoggerShape, MainContext, ExtHostLogLevelServiceShape as ExtHostLogLevelServiceShape } from 'vs/workbench/api/common/extHost.protocol';
-import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { revive } from 'vs/base/common/marshalling';
+import { ILogger, ILoggerOptions, AbstractMessageLogger, LogLevel, AbstractLoggerService } from '../../../platform/log/common/log.js';
+import { MainThreadLoggerShape, MainContext, ExtHostLogLevelServiceShape as ExtHostLogLevelServiceShape } from './extHost.protocol.js';
+import { IExtHostInitDataService } from './extHostInitDataService.js';
+import { IExtHostRpcService } from './extHostRpcService.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { revive } from '../../../base/common/marshalling.js';
 
 export class ExtHostLoggerService extends AbstractLoggerService implements ExtHostLogLevelServiceShape {
 
diff --git a/src/vs/workbench/api/common/extHostManagedSockets.ts b/src/vs/workbench/api/common/extHostManagedSockets.ts
index d2f028df19e..6b020bca21d 100644
--- a/src/vs/workbench/api/common/extHostManagedSockets.ts
+++ b/src/vs/workbench/api/common/extHostManagedSockets.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ExtHostManagedSocketsShape, MainContext, MainThreadManagedSocketsShape } from 'vs/workbench/api/common/extHost.protocol';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { ExtHostManagedSocketsShape, MainContext, MainThreadManagedSocketsShape } from './extHost.protocol.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
 import * as vscode from 'vscode';
-import { Disposable, DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import { VSBuffer } from 'vs/base/common/buffer';
+import { Disposable, DisposableStore, toDisposable } from '../../../base/common/lifecycle.js';
+import { IExtHostRpcService } from './extHostRpcService.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
 
 export interface IExtHostManagedSockets extends ExtHostManagedSocketsShape {
 	setFactory(socketFactoryId: number, makeConnection: () => Thenable<vscode.ManagedMessagePassing>): void;
diff --git a/src/vs/workbench/api/common/extHostMemento.ts b/src/vs/workbench/api/common/extHostMemento.ts
index c309007bc30..e1dc4f27947 100644
--- a/src/vs/workbench/api/common/extHostMemento.ts
+++ b/src/vs/workbench/api/common/extHostMemento.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type * as vscode from 'vscode';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { ExtHostStorage } from 'vs/workbench/api/common/extHostStorage';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { DeferredPromise, RunOnceScheduler } from 'vs/base/common/async';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { ExtHostStorage } from './extHostStorage.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { DeferredPromise, RunOnceScheduler } from '../../../base/common/async.js';
 
 export class ExtensionMemento implements vscode.Memento {
 
diff --git a/src/vs/workbench/api/common/extHostMessageService.ts b/src/vs/workbench/api/common/extHostMessageService.ts
index 2503a53197a..eb84156fb74 100644
--- a/src/vs/workbench/api/common/extHostMessageService.ts
+++ b/src/vs/workbench/api/common/extHostMessageService.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import Severity from 'vs/base/common/severity';
+import Severity from '../../../base/common/severity.js';
 import type * as vscode from 'vscode';
-import { MainContext, MainThreadMessageServiceShape, MainThreadMessageOptions, IMainContext } from './extHost.protocol';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { ILogService } from 'vs/platform/log/common/log';
-import { checkProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
+import { MainContext, MainThreadMessageServiceShape, MainThreadMessageOptions, IMainContext } from './extHost.protocol.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 
 function isMessageItem(item: any): item is vscode.MessageItem {
 	return item && item.title;
diff --git a/src/vs/workbench/api/common/extHostNotebook.ts b/src/vs/workbench/api/common/extHostNotebook.ts
index 3a7e105c843..75b64857223 100644
--- a/src/vs/workbench/api/common/extHostNotebook.ts
+++ b/src/vs/workbench/api/common/extHostNotebook.ts
@@ -3,41 +3,41 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IRelativePattern } from 'vs/base/common/glob';
-import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { ResourceMap, ResourceSet } from 'vs/base/common/map';
-import { MarshalledId } from 'vs/base/common/marshallingIds';
-import { isFalsyOrWhitespace } from 'vs/base/common/strings';
-import { assertIsDefined } from 'vs/base/common/types';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import * as files from 'vs/platform/files/common/files';
-import { Cache } from 'vs/workbench/api/common/cache';
-import { ExtHostNotebookShape, IMainContext, IModelAddedData, INotebookCellStatusBarListDto, INotebookDocumentsAndEditorsDelta, INotebookDocumentShowOptions, INotebookEditorAddData, INotebookPartialFileStatsWithMetadata, MainContext, MainThreadNotebookDocumentsShape, MainThreadNotebookEditorsShape, MainThreadNotebookShape, NotebookDataDto } from 'vs/workbench/api/common/extHost.protocol';
-import { ApiCommand, ApiCommandArgument, ApiCommandResult, CommandsConverter, ExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
-import { ExtHostDocuments } from 'vs/workbench/api/common/extHostDocuments';
-import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
-import * as typeConverters from 'vs/workbench/api/common/extHostTypeConverters';
-import * as extHostTypes from 'vs/workbench/api/common/extHostTypes';
-import { INotebookExclusiveDocumentFilter, INotebookContributionData } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { SerializableObjectWithBuffers } from 'vs/workbench/services/extensions/common/proxyIdentifier';
+import { localize } from '../../../nls.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { IRelativePattern } from '../../../base/common/glob.js';
+import { DisposableStore, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { ResourceMap, ResourceSet } from '../../../base/common/map.js';
+import { MarshalledId } from '../../../base/common/marshallingIds.js';
+import { isFalsyOrWhitespace } from '../../../base/common/strings.js';
+import { assertIsDefined } from '../../../base/common/types.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import * as files from '../../../platform/files/common/files.js';
+import { Cache } from './cache.js';
+import { ExtHostNotebookShape, IMainContext, IModelAddedData, INotebookCellStatusBarListDto, INotebookDocumentsAndEditorsDelta, INotebookDocumentShowOptions, INotebookEditorAddData, INotebookPartialFileStatsWithMetadata, MainContext, MainThreadNotebookDocumentsShape, MainThreadNotebookEditorsShape, MainThreadNotebookShape, NotebookDataDto } from './extHost.protocol.js';
+import { ApiCommand, ApiCommandArgument, ApiCommandResult, CommandsConverter, ExtHostCommands } from './extHostCommands.js';
+import { ExtHostDocuments } from './extHostDocuments.js';
+import { ExtHostDocumentsAndEditors } from './extHostDocumentsAndEditors.js';
+import * as typeConverters from './extHostTypeConverters.js';
+import * as extHostTypes from './extHostTypes.js';
+import { INotebookExclusiveDocumentFilter, INotebookContributionData } from '../../contrib/notebook/common/notebookCommon.js';
+import { SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';
 import type * as vscode from 'vscode';
-import { ExtHostCell, ExtHostNotebookDocument } from './extHostNotebookDocument';
-import { ExtHostNotebookEditor } from './extHostNotebookEditor';
-import { IExtHostConsumerFileSystem } from 'vs/workbench/api/common/extHostFileSystemConsumer';
-import { filter } from 'vs/base/common/objects';
-import { Schemas } from 'vs/base/common/network';
-import { IFileQuery, ITextQuery, QueryType } from 'vs/workbench/services/search/common/search';
-import { IExtHostSearch } from 'vs/workbench/api/common/extHostSearch';
-import { CellSearchModel } from 'vs/workbench/contrib/search/common/cellSearchModel';
-import { INotebookCellMatchNoModel, INotebookFileMatchNoModel, IRawClosedNotebookFileMatch, genericCellMatchesToTextSearchMatches } from 'vs/workbench/contrib/search/common/searchNotebookHelpers';
-import { NotebookPriorityInfo } from 'vs/workbench/contrib/search/common/search';
-import { globMatchesResource } from 'vs/workbench/services/editor/common/editorResolverService';
-import { ILogService } from 'vs/platform/log/common/log';
+import { ExtHostCell, ExtHostNotebookDocument } from './extHostNotebookDocument.js';
+import { ExtHostNotebookEditor } from './extHostNotebookEditor.js';
+import { IExtHostConsumerFileSystem } from './extHostFileSystemConsumer.js';
+import { filter } from '../../../base/common/objects.js';
+import { Schemas } from '../../../base/common/network.js';
+import { IFileQuery, ITextQuery, QueryType } from '../../services/search/common/search.js';
+import { IExtHostSearch } from './extHostSearch.js';
+import { CellSearchModel } from '../../contrib/search/common/cellSearchModel.js';
+import { INotebookCellMatchNoModel, INotebookFileMatchNoModel, IRawClosedNotebookFileMatch, genericCellMatchesToTextSearchMatches } from '../../contrib/search/common/searchNotebookHelpers.js';
+import { NotebookPriorityInfo } from '../../contrib/search/common/search.js';
+import { globMatchesResource, RegisteredEditorPriority } from '../../services/editor/common/editorResolverService.js';
+import { ILogService } from '../../../platform/log/common/log.js';
 
 export class ExtHostNotebookController implements ExtHostNotebookShape {
 	private static _notebookStatusBarItemProviderHandlePool: number = 0;
@@ -145,8 +145,6 @@ export class ExtHostNotebookController implements ExtHostNotebookShape {
 		return result;
 	}
 
-
-
 	private static _convertNotebookRegistrationData(extension: IExtensionDescription, registration: vscode.NotebookRegistrationData | undefined): INotebookContributionData | undefined {
 		if (!registration) {
 			return;
@@ -163,7 +161,7 @@ export class ExtHostNotebookController implements ExtHostNotebookShape {
 			providerDisplayName: extension.displayName || extension.name,
 			displayName: registration.displayName,
 			filenamePattern: viewOptionsFilenamePattern,
-			exclusive: registration.exclusive || false
+			priority: registration.exclusive ? RegisteredEditorPriority.exclusive : undefined
 		};
 	}
 
@@ -205,28 +203,29 @@ export class ExtHostNotebookController implements ExtHostNotebookShape {
 		return assertIsDefined(document?.apiNotebook);
 	}
 
-
-	async showNotebookDocument(notebookOrUri: vscode.NotebookDocument | URI, options?: vscode.NotebookDocumentShowOptions): Promise<vscode.NotebookEditor> {
-
-		if (URI.isUri(notebookOrUri)) {
-			notebookOrUri = await this.openNotebookDocument(notebookOrUri);
-		}
-
+	async showNotebookDocument(notebook: vscode.NotebookDocument, options?: vscode.NotebookDocumentShowOptions): Promise<vscode.NotebookEditor> {
 		let resolvedOptions: INotebookDocumentShowOptions;
 		if (typeof options === 'object') {
 			resolvedOptions = {
 				position: typeConverters.ViewColumn.from(options.viewColumn),
 				preserveFocus: options.preserveFocus,
 				selections: options.selections && options.selections.map(typeConverters.NotebookRange.from),
-				pinned: typeof options.preview === 'boolean' ? !options.preview : undefined
+				pinned: typeof options.preview === 'boolean' ? !options.preview : undefined,
+				label: typeof options.asRepl === 'string' ?
+					options.asRepl :
+					typeof options.asRepl === 'object' ?
+						options.asRepl.label :
+						undefined,
 			};
 		} else {
 			resolvedOptions = {
-				preserveFocus: false
+				preserveFocus: false,
+				pinned: true
 			};
 		}
 
-		const editorId = await this._notebookEditorsProxy.$tryShowNotebookDocument(notebookOrUri.uri, notebookOrUri.notebookType, resolvedOptions);
+		const viewType = !!options?.asRepl ? 'repl' : notebook.notebookType;
+		const editorId = await this._notebookEditorsProxy.$tryShowNotebookDocument(notebook.uri, viewType, resolvedOptions);
 		const editor = editorId && this._editors.get(editorId)?.apiEditor;
 
 		if (editor) {
@@ -234,9 +233,9 @@ export class ExtHostNotebookController implements ExtHostNotebookShape {
 		}
 
 		if (editorId) {
-			throw new Error(`Could NOT open editor for "${notebookOrUri.uri.toString()}" because another editor opened in the meantime.`);
+			throw new Error(`Could NOT open editor for "${notebook.uri.toString()}" because another editor opened in the meantime.`);
 		} else {
-			throw new Error(`Could NOT open editor for "${notebookOrUri.uri.toString()}".`);
+			throw new Error(`Could NOT open editor for "${notebook.uri.toString()}".`);
 		}
 	}
 
@@ -593,7 +592,8 @@ export class ExtHostNotebookController implements ExtHostNotebookShape {
 			document,
 			data.visibleRanges.map(typeConverters.NotebookRange.to),
 			data.selections.map(typeConverters.NotebookRange.to),
-			typeof data.viewColumn === 'number' ? typeConverters.ViewColumn.to(data.viewColumn) : undefined
+			typeof data.viewColumn === 'number' ? typeConverters.ViewColumn.to(data.viewColumn) : undefined,
+			data.viewType
 		);
 
 		this._editors.set(editorId, editor);
diff --git a/src/vs/workbench/api/common/extHostNotebookDocument.ts b/src/vs/workbench/api/common/extHostNotebookDocument.ts
index 8f74a0a4b69..205a899854c 100644
--- a/src/vs/workbench/api/common/extHostNotebookDocument.ts
+++ b/src/vs/workbench/api/common/extHostNotebookDocument.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import * as extHostProtocol from 'vs/workbench/api/common/extHost.protocol';
-import { ExtHostDocuments } from 'vs/workbench/api/common/extHostDocuments';
-import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
-import * as extHostTypeConverters from 'vs/workbench/api/common/extHostTypeConverters';
-import { NotebookRange } from 'vs/workbench/api/common/extHostTypes';
-import * as notebookCommon from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { Schemas } from '../../../base/common/network.js';
+import { URI } from '../../../base/common/uri.js';
+import * as extHostProtocol from './extHost.protocol.js';
+import { ExtHostDocuments } from './extHostDocuments.js';
+import { ExtHostDocumentsAndEditors } from './extHostDocumentsAndEditors.js';
+import * as extHostTypeConverters from './extHostTypeConverters.js';
+import { NotebookRange } from './extHostTypes.js';
+import * as notebookCommon from '../../contrib/notebook/common/notebookCommon.js';
 import * as vscode from 'vscode';
 
 class RawContentChangeEvent {
@@ -211,6 +211,9 @@ export class ExtHostNotebookDocument {
 				},
 				save() {
 					return that._save();
+				},
+				[Symbol.for('debug.description')]() {
+					return `NotebookDocument(${this.uri.toString()})`;
 				}
 			};
 			this._notebook = Object.freeze(apiObject);
diff --git a/src/vs/workbench/api/common/extHostNotebookDocumentSaveParticipant.ts b/src/vs/workbench/api/common/extHostNotebookDocumentSaveParticipant.ts
index 0f031e2f76b..b86e6a7a90f 100644
--- a/src/vs/workbench/api/common/extHostNotebookDocumentSaveParticipant.ts
+++ b/src/vs/workbench/api/common/extHostNotebookDocumentSaveParticipant.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { AsyncEmitter, Event } from 'vs/base/common/event';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ExtHostNotebookDocumentSaveParticipantShape, IWorkspaceEditDto, MainThreadBulkEditsShape } from 'vs/workbench/api/common/extHost.protocol';
-import { ExtHostNotebookController } from 'vs/workbench/api/common/extHostNotebook';
-import { TextDocumentSaveReason, WorkspaceEdit as WorksapceEditConverter } from 'vs/workbench/api/common/extHostTypeConverters';
-import { WorkspaceEdit } from 'vs/workbench/api/common/extHostTypes';
-import { SaveReason } from 'vs/workbench/common/editor';
-import { SerializableObjectWithBuffers } from 'vs/workbench/services/extensions/common/proxyIdentifier';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { AsyncEmitter, Event } from '../../../base/common/event.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { ExtHostNotebookDocumentSaveParticipantShape, IWorkspaceEditDto, MainThreadBulkEditsShape } from './extHost.protocol.js';
+import { ExtHostNotebookController } from './extHostNotebook.js';
+import { TextDocumentSaveReason, WorkspaceEdit as WorksapceEditConverter } from './extHostTypeConverters.js';
+import { WorkspaceEdit } from './extHostTypes.js';
+import { SaveReason } from '../../common/editor.js';
+import { SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';
 import { NotebookDocumentWillSaveEvent } from 'vscode';
 
 interface IExtensionListener<E> {
diff --git a/src/vs/workbench/api/common/extHostNotebookDocuments.ts b/src/vs/workbench/api/common/extHostNotebookDocuments.ts
index b89b9cd1f55..359eb94686a 100644
--- a/src/vs/workbench/api/common/extHostNotebookDocuments.ts
+++ b/src/vs/workbench/api/common/extHostNotebookDocuments.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import * as extHostProtocol from 'vs/workbench/api/common/extHost.protocol';
-import { ExtHostNotebookController } from 'vs/workbench/api/common/extHostNotebook';
-import { NotebookDocumentMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { SerializableObjectWithBuffers } from 'vs/workbench/services/extensions/common/proxyIdentifier';
+import { Emitter } from '../../../base/common/event.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import * as extHostProtocol from './extHost.protocol.js';
+import { ExtHostNotebookController } from './extHostNotebook.js';
+import { NotebookDocumentMetadata } from '../../contrib/notebook/common/notebookCommon.js';
+import { SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';
 import type * as vscode from 'vscode';
 
 export class ExtHostNotebookDocuments implements extHostProtocol.ExtHostNotebookDocumentsShape {
diff --git a/src/vs/workbench/api/common/extHostNotebookEditor.ts b/src/vs/workbench/api/common/extHostNotebookEditor.ts
index 8472fc1006d..c4c357d14c6 100644
--- a/src/vs/workbench/api/common/extHostNotebookEditor.ts
+++ b/src/vs/workbench/api/common/extHostNotebookEditor.ts
@@ -3,21 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { illegalArgument } from 'vs/base/common/errors';
-import { MainThreadNotebookEditorsShape } from 'vs/workbench/api/common/extHost.protocol';
-import * as extHostConverter from 'vs/workbench/api/common/extHostTypeConverters';
-import * as extHostTypes from 'vs/workbench/api/common/extHostTypes';
+import { illegalArgument } from '../../../base/common/errors.js';
+import { MainThreadNotebookEditorsShape } from './extHost.protocol.js';
+import * as extHostConverter from './extHostTypeConverters.js';
+import * as extHostTypes from './extHostTypes.js';
 import * as vscode from 'vscode';
-import { ExtHostNotebookDocument } from './extHostNotebookDocument';
+import { ExtHostNotebookDocument } from './extHostNotebookDocument.js';
 
 export class ExtHostNotebookEditor {
 
 	public static readonly apiEditorsToExtHost = new WeakMap<vscode.NotebookEditor, ExtHostNotebookEditor>();
 
-	private _selections: vscode.NotebookRange[] = [];
-	private _visibleRanges: vscode.NotebookRange[] = [];
-	private _viewColumn?: vscode.ViewColumn;
-
 	private _visible: boolean = false;
 
 	private _editor?: vscode.NotebookEditor;
@@ -26,14 +22,11 @@ export class ExtHostNotebookEditor {
 		readonly id: string,
 		private readonly _proxy: MainThreadNotebookEditorsShape,
 		readonly notebookData: ExtHostNotebookDocument,
-		visibleRanges: vscode.NotebookRange[],
-		selections: vscode.NotebookRange[],
-		viewColumn: vscode.ViewColumn | undefined
-	) {
-		this._selections = selections;
-		this._visibleRanges = visibleRanges;
-		this._viewColumn = viewColumn;
-	}
+		private _visibleRanges: vscode.NotebookRange[],
+		private _selections: vscode.NotebookRange[],
+		private _viewColumn: vscode.ViewColumn | undefined,
+		private readonly viewType: string
+	) { }
 
 	get apiEditor(): vscode.NotebookEditor {
 		if (!this._editor) {
@@ -71,6 +64,15 @@ export class ExtHostNotebookEditor {
 				get viewColumn() {
 					return that._viewColumn;
 				},
+				get replOptions() {
+					if (that.viewType === 'repl') {
+						return { appendIndex: this.notebook.cellCount - 1 };
+					}
+					return undefined;
+				},
+				[Symbol.for('debug.description')]() {
+					return `NotebookEditor(${this.notebook.uri.toString()})`;
+				}
 			};
 
 			ExtHostNotebookEditor.apiEditorsToExtHost.set(this._editor, this);
diff --git a/src/vs/workbench/api/common/extHostNotebookEditors.ts b/src/vs/workbench/api/common/extHostNotebookEditors.ts
index 5073d92c5e0..519f6921900 100644
--- a/src/vs/workbench/api/common/extHostNotebookEditors.ts
+++ b/src/vs/workbench/api/common/extHostNotebookEditors.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ExtHostNotebookEditorsShape, INotebookEditorPropertiesChangeData, INotebookEditorViewColumnInfo } from 'vs/workbench/api/common/extHost.protocol';
-import { ExtHostNotebookController } from 'vs/workbench/api/common/extHostNotebook';
-import * as typeConverters from 'vs/workbench/api/common/extHostTypeConverters';
+import { Emitter } from '../../../base/common/event.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { ExtHostNotebookEditorsShape, INotebookEditorPropertiesChangeData, INotebookEditorViewColumnInfo } from './extHost.protocol.js';
+import { ExtHostNotebookController } from './extHostNotebook.js';
+import * as typeConverters from './extHostTypeConverters.js';
 import type * as vscode from 'vscode';
 
 
diff --git a/src/vs/workbench/api/common/extHostNotebookKernels.ts b/src/vs/workbench/api/common/extHostNotebookKernels.ts
index ecb6b4a7db3..584a4508003 100644
--- a/src/vs/workbench/api/common/extHostNotebookKernels.ts
+++ b/src/vs/workbench/api/common/extHostNotebookKernels.ts
@@ -3,29 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { asArray } from 'vs/base/common/arrays';
-import { DeferredPromise, timeout } from 'vs/base/common/async';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { ResourceMap } from 'vs/base/common/map';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ExtHostNotebookKernelsShape, ICellExecuteUpdateDto, IMainContext, INotebookKernelDto2, MainContext, MainThreadNotebookKernelsShape, NotebookOutputDto, VariablesResult } from 'vs/workbench/api/common/extHost.protocol';
-import { ApiCommand, ApiCommandArgument, ApiCommandResult, ExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
-import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService';
-import { ExtHostNotebookController } from 'vs/workbench/api/common/extHostNotebook';
-import { ExtHostCell, ExtHostNotebookDocument } from 'vs/workbench/api/common/extHostNotebookDocument';
-import * as extHostTypeConverters from 'vs/workbench/api/common/extHostTypeConverters';
-import { NotebookCellExecutionState as ExtHostNotebookCellExecutionState, NotebookCellOutput, NotebookControllerAffinity2, NotebookVariablesRequestKind } from 'vs/workbench/api/common/extHostTypes';
-import { asWebviewUri } from 'vs/workbench/contrib/webview/common/webview';
-import { INotebookKernelSourceAction, NotebookCellExecutionState } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { CellExecutionUpdateType } from 'vs/workbench/contrib/notebook/common/notebookExecutionService';
-import { checkProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
-import { SerializableObjectWithBuffers } from 'vs/workbench/services/extensions/common/proxyIdentifier';
+import { asArray } from '../../../base/common/arrays.js';
+import { DeferredPromise, timeout } from '../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../base/common/cancellation.js';
+import { Emitter } from '../../../base/common/event.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../base/common/map.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { ExtensionIdentifier, IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { ExtHostNotebookKernelsShape, ICellExecuteUpdateDto, IMainContext, INotebookKernelDto2, MainContext, MainThreadNotebookKernelsShape, NotebookOutputDto, VariablesResult } from './extHost.protocol.js';
+import { ApiCommand, ApiCommandArgument, ApiCommandResult, ExtHostCommands } from './extHostCommands.js';
+import { IExtHostInitDataService } from './extHostInitDataService.js';
+import { ExtHostNotebookController } from './extHostNotebook.js';
+import { ExtHostCell, ExtHostNotebookDocument } from './extHostNotebookDocument.js';
+import * as extHostTypeConverters from './extHostTypeConverters.js';
+import { NotebookCellExecutionState as ExtHostNotebookCellExecutionState, NotebookCellOutput, NotebookControllerAffinity2, NotebookVariablesRequestKind } from './extHostTypes.js';
+import { asWebviewUri } from '../../contrib/webview/common/webview.js';
+import { INotebookKernelSourceAction, NotebookCellExecutionState } from '../../contrib/notebook/common/notebookCommon.js';
+import { CellExecutionUpdateType } from '../../contrib/notebook/common/notebookExecutionService.js';
+import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
+import { SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';
 import * as vscode from 'vscode';
-import { variablePageSize } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
+import { variablePageSize } from '../../contrib/notebook/common/notebookKernelService.js';
 
 interface IKernelData {
 	extensionId: ExtensionIdentifier;
diff --git a/src/vs/workbench/api/common/extHostNotebookRenderers.ts b/src/vs/workbench/api/common/extHostNotebookRenderers.ts
index e63bbffccb9..56c273a7b0d 100644
--- a/src/vs/workbench/api/common/extHostNotebookRenderers.ts
+++ b/src/vs/workbench/api/common/extHostNotebookRenderers.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { ExtHostNotebookRenderersShape, IMainContext, MainContext, MainThreadNotebookRenderersShape } from 'vs/workbench/api/common/extHost.protocol';
-import { ExtHostNotebookController } from 'vs/workbench/api/common/extHostNotebook';
-import { ExtHostNotebookEditor } from 'vs/workbench/api/common/extHostNotebookEditor';
+import { Emitter } from '../../../base/common/event.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { ExtHostNotebookRenderersShape, IMainContext, MainContext, MainThreadNotebookRenderersShape } from './extHost.protocol.js';
+import { ExtHostNotebookController } from './extHostNotebook.js';
+import { ExtHostNotebookEditor } from './extHostNotebookEditor.js';
 import * as vscode from 'vscode';
 
 
diff --git a/src/vs/workbench/api/common/extHostOutput.ts b/src/vs/workbench/api/common/extHostOutput.ts
index 502dd47fd47..6b8ba4c1595 100644
--- a/src/vs/workbench/api/common/extHostOutput.ts
+++ b/src/vs/workbench/api/common/extHostOutput.ts
@@ -3,35 +3,33 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { MainContext, MainThreadOutputServiceShape, ExtHostOutputServiceShape } from './extHost.protocol';
+import { MainContext, MainThreadOutputServiceShape, ExtHostOutputServiceShape } from './extHost.protocol.js';
 import type * as vscode from 'vscode';
-import { URI } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { AbstractMessageLogger, ILogger, ILoggerService, ILogService, log, LogLevel, parseLogLevel } from 'vs/platform/log/common/log';
-import { OutputChannelUpdateMode } from 'vs/workbench/services/output/common/output';
-import { IExtHostConsumerFileSystem } from 'vs/workbench/api/common/extHostFileSystemConsumer';
-import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService';
-import { IExtHostFileSystemInfo } from 'vs/workbench/api/common/extHostFileSystemInfo';
-import { toLocalISOString } from 'vs/base/common/date';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { isString } from 'vs/base/common/types';
-import { FileSystemProviderErrorCode, toFileSystemProviderErrorCode } from 'vs/platform/files/common/files';
-import { Emitter } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import { URI } from '../../../base/common/uri.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { IExtHostRpcService } from './extHostRpcService.js';
+import { ExtensionIdentifier, IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { AbstractMessageLogger, ILogger, ILoggerService, ILogService, log, LogLevel, parseLogLevel } from '../../../platform/log/common/log.js';
+import { OutputChannelUpdateMode } from '../../services/output/common/output.js';
+import { IExtHostConsumerFileSystem } from './extHostFileSystemConsumer.js';
+import { IExtHostInitDataService } from './extHostInitDataService.js';
+import { IExtHostFileSystemInfo } from './extHostFileSystemInfo.js';
+import { toLocalISOString } from '../../../base/common/date.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { isString } from '../../../base/common/types.js';
+import { FileSystemProviderErrorCode, toFileSystemProviderErrorCode } from '../../../platform/files/common/files.js';
+import { Emitter } from '../../../base/common/event.js';
+import { DisposableStore, toDisposable } from '../../../base/common/lifecycle.js';
 
 class ExtHostOutputChannel extends AbstractMessageLogger implements vscode.LogOutputChannel {
 
 	private offset: number = 0;
 
-	private _disposed: boolean = false;
-	get disposed(): boolean { return this._disposed; }
-
 	public visible: boolean = false;
 
 	constructor(
-		readonly id: string, readonly name: string,
+		readonly id: string,
+		readonly name: string,
 		protected readonly logger: ILogger,
 		protected readonly proxy: MainThreadOutputServiceShape,
 		readonly extension: IExtensionDescription,
@@ -39,6 +37,7 @@ class ExtHostOutputChannel extends AbstractMessageLogger implements vscode.LogOu
 		super();
 		this.setLevel(logger.getLevel());
 		this._register(logger.onDidChangeLogLevel(level => this.setLevel(level)));
+		this._register(toDisposable(() => this.proxy.$dispose(this.id)));
 	}
 
 	get logLevel(): LogLevel {
@@ -86,15 +85,6 @@ class ExtHostOutputChannel extends AbstractMessageLogger implements vscode.LogOu
 		}
 	}
 
-	override dispose(): void {
-		super.dispose();
-
-		if (!this._disposed) {
-			this.proxy.$dispose(this.id);
-			this._disposed = true;
-		}
-	}
-
 }
 
 class ExtHostLogOutputChannel extends ExtHostOutputChannel {
@@ -153,31 +143,39 @@ export class ExtHostOutputService implements ExtHostOutputServiceShape {
 		if (logLevelValue) {
 			logLevel = parseLogLevel(logLevelValue);
 		}
-		const extHostOutputChannel = log ? this.doCreateLogOutputChannel(name, logLevel, extension) : this.doCreateOutputChannel(name, languageId, extension);
+		const channelDisposables = new DisposableStore();
+		const extHostOutputChannel = log
+			? this.doCreateLogOutputChannel(name, logLevel, extension, channelDisposables)
+			: this.doCreateOutputChannel(name, languageId, extension, channelDisposables);
 		extHostOutputChannel.then(channel => {
 			this.channels.set(channel.id, channel);
 			channel.visible = channel.id === this.visibleChannelId;
+			channelDisposables.add(toDisposable(() => this.channels.delete(channel.id)));
 		});
-		return log ? this.createExtHostLogOutputChannel(name, logLevel ?? this.logService.getLevel(), <Promise<ExtHostOutputChannel>>extHostOutputChannel) : this.createExtHostOutputChannel(name, <Promise<ExtHostOutputChannel>>extHostOutputChannel);
+		return log
+			? this.createExtHostLogOutputChannel(name, logLevel ?? this.logService.getLevel(), <Promise<ExtHostOutputChannel>>extHostOutputChannel, channelDisposables)
+			: this.createExtHostOutputChannel(name, <Promise<ExtHostOutputChannel>>extHostOutputChannel, channelDisposables);
 	}
 
-	private async doCreateOutputChannel(name: string, languageId: string | undefined, extension: IExtensionDescription): Promise<ExtHostOutputChannel> {
+	private async doCreateOutputChannel(name: string, languageId: string | undefined, extension: IExtensionDescription, channelDisposables: DisposableStore): Promise<ExtHostOutputChannel> {
 		if (!this.outputDirectoryPromise) {
 			this.outputDirectoryPromise = this.extHostFileSystem.value.createDirectory(this.outputsLocation).then(() => this.outputsLocation);
 		}
 		const outputDir = await this.outputDirectoryPromise;
 		const file = this.extHostFileSystemInfo.extUri.joinPath(outputDir, `${this.namePool++}-${name.replace(/[\\/:\*\?"<>\|]/g, '')}.log`);
-		const logger = this.loggerService.createLogger(file, { logLevel: 'always', donotRotate: true, donotUseFormatters: true, hidden: true });
+		const logger = channelDisposables.add(this.loggerService.createLogger(file, { logLevel: 'always', donotRotate: true, donotUseFormatters: true, hidden: true }));
 		const id = await this.proxy.$register(name, file, languageId, extension.identifier.value);
+		channelDisposables.add(toDisposable(() => this.loggerService.deregisterLogger(file)));
 		return new ExtHostOutputChannel(id, name, logger, this.proxy, extension);
 	}
 
-	private async doCreateLogOutputChannel(name: string, logLevel: LogLevel | undefined, extension: IExtensionDescription): Promise<ExtHostLogOutputChannel> {
+	private async doCreateLogOutputChannel(name: string, logLevel: LogLevel | undefined, extension: IExtensionDescription, channelDisposables: DisposableStore): Promise<ExtHostLogOutputChannel> {
 		const extensionLogDir = await this.createExtensionLogDirectory(extension);
 		const fileName = name.replace(/[\\/:\*\?"<>\|]/g, '');
 		const file = this.extHostFileSystemInfo.extUri.joinPath(extensionLogDir, `${fileName}.log`);
 		const id = `${extension.identifier.value}.${fileName}`;
-		const logger = this.loggerService.createLogger(file, { id, name, logLevel, extensionId: extension.identifier.value });
+		const logger = channelDisposables.add(this.loggerService.createLogger(file, { id, name, logLevel, extensionId: extension.identifier.value }));
+		channelDisposables.add(toDisposable(() => this.loggerService.deregisterLogger(file)));
 		return new ExtHostLogOutputChannel(id, name, logger, this.proxy, extension);
 	}
 
@@ -199,13 +197,13 @@ export class ExtHostOutputService implements ExtHostOutputServiceShape {
 		return extensionLogDirectoryPromise;
 	}
 
-	private createExtHostOutputChannel(name: string, channelPromise: Promise<ExtHostOutputChannel>): vscode.OutputChannel {
-		let disposed = false;
+	private createExtHostOutputChannel(name: string, channelPromise: Promise<ExtHostOutputChannel>, channelDisposables: DisposableStore): vscode.OutputChannel {
 		const validate = () => {
-			if (disposed) {
+			if (channelDisposables.isDisposed) {
 				throw new Error('Channel has been closed');
 			}
 		};
+		channelPromise.then(channel => channelDisposables.add(channel));
 		return {
 			get name(): string { return name; },
 			append(value: string): void {
@@ -233,33 +231,30 @@ export class ExtHostOutputService implements ExtHostOutputServiceShape {
 				channelPromise.then(channel => channel.hide());
 			},
 			dispose(): void {
-				disposed = true;
-				channelPromise.then(channel => channel.dispose());
+				channelDisposables.dispose();
 			}
 		};
 	}
 
-	private createExtHostLogOutputChannel(name: string, logLevel: LogLevel, channelPromise: Promise<ExtHostOutputChannel>): vscode.LogOutputChannel {
-		const disposables = new DisposableStore();
+	private createExtHostLogOutputChannel(name: string, logLevel: LogLevel, channelPromise: Promise<ExtHostOutputChannel>, channelDisposables: DisposableStore): vscode.LogOutputChannel {
 		const validate = () => {
-			if (disposables.isDisposed) {
+			if (channelDisposables.isDisposed) {
 				throw new Error('Channel has been closed');
 			}
 		};
-		const onDidChangeLogLevel = disposables.add(new Emitter<LogLevel>());
+		const onDidChangeLogLevel = channelDisposables.add(new Emitter<LogLevel>());
 		function setLogLevel(newLogLevel: LogLevel): void {
 			logLevel = newLogLevel;
 			onDidChangeLogLevel.fire(newLogLevel);
 		}
 		channelPromise.then(channel => {
-			disposables.add(channel);
 			if (channel.logLevel !== logLevel) {
 				setLogLevel(channel.logLevel);
 			}
-			disposables.add(channel.onDidChangeLogLevel(e => setLogLevel(e)));
+			channelDisposables.add(channel.onDidChangeLogLevel(e => setLogLevel(e)));
 		});
 		return {
-			...this.createExtHostOutputChannel(name, channelPromise),
+			...this.createExtHostOutputChannel(name, channelPromise, channelDisposables),
 			get logLevel() { return logLevel; },
 			onDidChangeLogLevel: onDidChangeLogLevel.event,
 			trace(value: string, ...args: any[]): void {
@@ -281,9 +276,6 @@ export class ExtHostOutputService implements ExtHostOutputServiceShape {
 			error(value: Error | string, ...args: any[]): void {
 				validate();
 				channelPromise.then(channel => channel.error(value, ...args));
-			},
-			dispose(): void {
-				disposables.dispose();
 			}
 		};
 	}
diff --git a/src/vs/workbench/api/common/extHostProfileContentHandler.ts b/src/vs/workbench/api/common/extHostProfileContentHandler.ts
index 19c2fb0d9b3..fbe8de654e3 100644
--- a/src/vs/workbench/api/common/extHostProfileContentHandler.ts
+++ b/src/vs/workbench/api/common/extHostProfileContentHandler.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { toDisposable } from 'vs/base/common/lifecycle';
-import { isString } from 'vs/base/common/types';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { checkProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
-import { ISaveProfileResult } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { toDisposable } from '../../../base/common/lifecycle.js';
+import { isString } from '../../../base/common/types.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
+import { ISaveProfileResult } from '../../services/userDataProfile/common/userDataProfile.js';
 import type * as vscode from 'vscode';
-import { ExtHostProfileContentHandlersShape, IMainContext, MainContext, MainThreadProfileContentHandlersShape } from './extHost.protocol';
+import { ExtHostProfileContentHandlersShape, IMainContext, MainContext, MainThreadProfileContentHandlersShape } from './extHost.protocol.js';
 
 
 export class ExtHostProfileContentHandlers implements ExtHostProfileContentHandlersShape {
diff --git a/src/vs/workbench/api/common/extHostProgress.ts b/src/vs/workbench/api/common/extHostProgress.ts
index 42d8484a691..0914c2e7916 100644
--- a/src/vs/workbench/api/common/extHostProgress.ts
+++ b/src/vs/workbench/api/common/extHostProgress.ts
@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ProgressOptions } from 'vscode';
-import { MainThreadProgressShape, ExtHostProgressShape } from './extHost.protocol';
-import { ProgressLocation } from './extHostTypeConverters';
-import { Progress, IProgressStep } from 'vs/platform/progress/common/progress';
-import { CancellationTokenSource, CancellationToken } from 'vs/base/common/cancellation';
-import { throttle } from 'vs/base/common/decorators';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { onUnexpectedExternalError } from 'vs/base/common/errors';
+import { MainThreadProgressShape, ExtHostProgressShape } from './extHost.protocol.js';
+import { ProgressLocation } from './extHostTypeConverters.js';
+import { Progress, IProgressStep } from '../../../platform/progress/common/progress.js';
+import { CancellationTokenSource, CancellationToken } from '../../../base/common/cancellation.js';
+import { throttle } from '../../../base/common/decorators.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { onUnexpectedExternalError } from '../../../base/common/errors.js';
 
 export class ExtHostProgress implements ExtHostProgressShape {
 
diff --git a/src/vs/workbench/api/common/extHostQuickDiff.ts b/src/vs/workbench/api/common/extHostQuickDiff.ts
index 04e7c04a16c..f959ebf9d92 100644
--- a/src/vs/workbench/api/common/extHostQuickDiff.ts
+++ b/src/vs/workbench/api/common/extHostQuickDiff.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type * as vscode from 'vscode';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { ExtHostQuickDiffShape, IMainContext, MainContext, MainThreadQuickDiffShape } from 'vs/workbench/api/common/extHost.protocol';
-import { asPromise } from 'vs/base/common/async';
-import { DocumentSelector } from 'vs/workbench/api/common/extHostTypeConverters';
-import { IURITransformer } from 'vs/base/common/uriIpc';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { ExtHostQuickDiffShape, IMainContext, MainContext, MainThreadQuickDiffShape } from './extHost.protocol.js';
+import { asPromise } from '../../../base/common/async.js';
+import { DocumentSelector } from './extHostTypeConverters.js';
+import { IURITransformer } from '../../../base/common/uriIpc.js';
 
 export class ExtHostQuickDiff implements ExtHostQuickDiffShape {
 	private static handlePool: number = 0;
diff --git a/src/vs/workbench/api/common/extHostQuickOpen.ts b/src/vs/workbench/api/common/extHostQuickOpen.ts
index b850be83f86..a5194dce8ef 100644
--- a/src/vs/workbench/api/common/extHostQuickOpen.ts
+++ b/src/vs/workbench/api/common/extHostQuickOpen.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Emitter } from 'vs/base/common/event';
-import { dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { ExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
-import { IExtHostWorkspaceProvider } from 'vs/workbench/api/common/extHostWorkspace';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Emitter } from '../../../base/common/event.js';
+import { dispose, IDisposable } from '../../../base/common/lifecycle.js';
+import { ExtHostCommands } from './extHostCommands.js';
+import { IExtHostWorkspaceProvider } from './extHostWorkspace.js';
 import { InputBox, InputBoxOptions, InputBoxValidationMessage, QuickInput, QuickInputButton, QuickPick, QuickPickItem, QuickPickItemButtonEvent, QuickPickOptions, WorkspaceFolder, WorkspaceFolderPickOptions } from 'vscode';
-import { ExtHostQuickOpenShape, IMainContext, MainContext, TransferQuickInput, TransferQuickInputButton, TransferQuickPickItemOrSeparator } from './extHost.protocol';
-import { URI } from 'vs/base/common/uri';
-import { ThemeIcon, QuickInputButtons, QuickPickItemKind, InputBoxValidationSeverity } from 'vs/workbench/api/common/extHostTypes';
-import { isCancellationError } from 'vs/base/common/errors';
-import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { coalesce } from 'vs/base/common/arrays';
-import Severity from 'vs/base/common/severity';
-import { ThemeIcon as ThemeIconUtils } from 'vs/base/common/themables';
-import { isProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
-import { MarkdownString } from 'vs/workbench/api/common/extHostTypeConverters';
+import { ExtHostQuickOpenShape, IMainContext, MainContext, TransferQuickInput, TransferQuickInputButton, TransferQuickPickItemOrSeparator } from './extHost.protocol.js';
+import { URI } from '../../../base/common/uri.js';
+import { ThemeIcon, QuickInputButtons, QuickPickItemKind, InputBoxValidationSeverity } from './extHostTypes.js';
+import { isCancellationError } from '../../../base/common/errors.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { coalesce } from '../../../base/common/arrays.js';
+import Severity from '../../../base/common/severity.js';
+import { ThemeIcon as ThemeIconUtils } from '../../../base/common/themables.js';
+import { isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
+import { MarkdownString } from './extHostTypeConverters.js';
 
 export type Item = string | QuickPickItem;
 
@@ -301,7 +301,7 @@ export function createExtHostQuickOpen(mainContext: IMainContext, workspace: IEx
 			this._onDidChangeValueEmitter
 		];
 
-		constructor(protected _extensionId: ExtensionIdentifier, private _onDidDispose: () => void) {
+		constructor(protected _extension: IExtensionDescription, private _onDidDispose: () => void) {
 		}
 
 		get title() {
@@ -385,6 +385,10 @@ export function createExtHostQuickOpen(mainContext: IMainContext, workspace: IEx
 		}
 
 		set buttons(buttons: QuickInputButton[]) {
+			const allowedButtonLocation = isProposedApiEnabled(this._extension, 'quickInputButtonLocation');
+			if (!allowedButtonLocation && buttons.some(button => button.location)) {
+				console.warn(`Extension '${this._extension.identifier.value}' uses a button location which is proposed API that is only available when running out of dev or with the following command line switch: --enable-proposed-api ${this._extension.identifier.value}`);
+			}
 			this._buttons = buttons.slice();
 			this._handlesToButtons.clear();
 			buttons.forEach((button, i) => {
@@ -397,6 +401,7 @@ export function createExtHostQuickOpen(mainContext: IMainContext, workspace: IEx
 						...getIconPathOrClass(button.iconPath),
 						tooltip: button.tooltip,
 						handle: button === QuickInputButtons.Back ? -1 : i,
+						location: allowedButtonLocation ? button.location : undefined
 					};
 				})
 			});
@@ -546,8 +551,8 @@ export function createExtHostQuickOpen(mainContext: IMainContext, workspace: IEx
 		private readonly _onDidChangeSelectionEmitter = new Emitter<T[]>();
 		private readonly _onDidTriggerItemButtonEmitter = new Emitter<QuickPickItemButtonEvent<T>>();
 
-		constructor(private extension: IExtensionDescription, onDispose: () => void) {
-			super(extension.identifier, onDispose);
+		constructor(extension: IExtensionDescription, onDispose: () => void) {
+			super(extension, onDispose);
 			this._disposables.push(
 				this._onDidChangeActiveEmitter,
 				this._onDidChangeSelectionEmitter,
@@ -569,7 +574,7 @@ export function createExtHostQuickOpen(mainContext: IMainContext, workspace: IEx
 				this._itemsToHandles.set(item, i);
 			});
 
-			const allowedTooltips = isProposedApiEnabled(this.extension, 'quickPickItemTooltip');
+			const allowedTooltips = isProposedApiEnabled(this._extension, 'quickPickItemTooltip');
 
 			const pickItems: TransferQuickPickItemOrSeparator[] = [];
 			for (let handle = 0; handle < items.length; handle++) {
@@ -578,7 +583,7 @@ export function createExtHostQuickOpen(mainContext: IMainContext, workspace: IEx
 					pickItems.push({ type: 'separator', label: item.label });
 				} else {
 					if (item.tooltip && !allowedTooltips) {
-						console.warn(`Extension '${this.extension.identifier.value}' uses a tooltip which is proposed API that is only available when running out of dev or with the following command line switch: --enable-proposed-api ${this.extension.identifier.value}`);
+						console.warn(`Extension '${this._extension.identifier.value}' uses a tooltip which is proposed API that is only available when running out of dev or with the following command line switch: --enable-proposed-api ${this._extension.identifier.value}`);
 					}
 
 					const icon = (item.iconPath) ? getIconPathOrClass(item.iconPath) : undefined;
@@ -712,7 +717,7 @@ export function createExtHostQuickOpen(mainContext: IMainContext, workspace: IEx
 		private _validationMessage: string | InputBoxValidationMessage | undefined;
 
 		constructor(extension: IExtensionDescription, onDispose: () => void) {
-			super(extension.identifier, onDispose);
+			super(extension, onDispose);
 			this.update({ type: 'inputBox' });
 		}
 
diff --git a/src/vs/workbench/api/common/extHostRequireInterceptor.ts b/src/vs/workbench/api/common/extHostRequireInterceptor.ts
index bcf03a6a02a..f01e80dd53e 100644
--- a/src/vs/workbench/api/common/extHostRequireInterceptor.ts
+++ b/src/vs/workbench/api/common/extHostRequireInterceptor.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as performance from 'vs/base/common/performance';
-import { URI } from 'vs/base/common/uri';
-import { MainThreadTelemetryShape, MainContext } from 'vs/workbench/api/common/extHost.protocol';
-import { ExtHostConfigProvider, IExtHostConfiguration } from 'vs/workbench/api/common/extHostConfiguration';
-import { nullExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
+import * as performance from '../../../base/common/performance.js';
+import { URI } from '../../../base/common/uri.js';
+import { MainThreadTelemetryShape, MainContext } from './extHost.protocol.js';
+import { ExtHostConfigProvider, IExtHostConfiguration } from './extHostConfiguration.js';
+import { nullExtensionDescription } from '../../services/extensions/common/extensions.js';
 import * as vscode from 'vscode';
-import { ExtensionIdentifierMap } from 'vs/platform/extensions/common/extensions';
-import { IExtensionApiFactory, IExtensionRegistries } from 'vs/workbench/api/common/extHost.api.impl';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ExtensionPaths, IExtHostExtensionService } from 'vs/workbench/api/common/extHostExtensionService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { escapeRegExpCharacters } from 'vs/base/common/strings';
+import { ExtensionIdentifierMap } from '../../../platform/extensions/common/extensions.js';
+import { IExtensionApiFactory, IExtensionRegistries } from './extHost.api.impl.js';
+import { IExtHostRpcService } from './extHostRpcService.js';
+import { IExtHostInitDataService } from './extHostInitDataService.js';
+import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
+import { ExtensionPaths, IExtHostExtensionService } from './extHostExtensionService.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { escapeRegExpCharacters } from '../../../base/common/strings.js';
 
 
 interface LoadFunction {
diff --git a/src/vs/workbench/api/common/extHostRpcService.ts b/src/vs/workbench/api/common/extHostRpcService.ts
index c6df14903e4..7886259ae94 100644
--- a/src/vs/workbench/api/common/extHostRpcService.ts
+++ b/src/vs/workbench/api/common/extHostRpcService.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ProxyIdentifier, IRPCProtocol, Proxied } from 'vs/workbench/services/extensions/common/proxyIdentifier';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { ProxyIdentifier, IRPCProtocol, Proxied } from '../../services/extensions/common/proxyIdentifier.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
 
 export const IExtHostRpcService = createDecorator<IExtHostRpcService>('IExtHostRpcService');
 
diff --git a/src/vs/workbench/api/common/extHostSCM.ts b/src/vs/workbench/api/common/extHostSCM.ts
index c746b79ed35..85e5cba5394 100644
--- a/src/vs/workbench/api/common/extHostSCM.ts
+++ b/src/vs/workbench/api/common/extHostSCM.ts
@@ -5,28 +5,29 @@
 
 /* eslint-disable local/code-no-native-private */
 
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { Event, Emitter } from 'vs/base/common/event';
-import { debounce } from 'vs/base/common/decorators';
-import { DisposableStore, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { asPromise } from 'vs/base/common/async';
-import { ExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
-import { MainContext, MainThreadSCMShape, SCMRawResource, SCMRawResourceSplice, SCMRawResourceSplices, IMainContext, ExtHostSCMShape, ICommandDto, MainThreadTelemetryShape, SCMGroupFeatures, SCMHistoryItemDto, SCMHistoryItemChangeDto } from './extHost.protocol';
-import { sortedDiff, equals } from 'vs/base/common/arrays';
-import { comparePaths } from 'vs/base/common/comparers';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { Event, Emitter } from '../../../base/common/event.js';
+import { debounce } from '../../../base/common/decorators.js';
+import { DisposableStore, IDisposable, MutableDisposable } from '../../../base/common/lifecycle.js';
+import { asPromise } from '../../../base/common/async.js';
+import { ExtHostCommands } from './extHostCommands.js';
+import { MainContext, MainThreadSCMShape, SCMRawResource, SCMRawResourceSplice, SCMRawResourceSplices, IMainContext, ExtHostSCMShape, ICommandDto, MainThreadTelemetryShape, SCMGroupFeatures, SCMHistoryItemDto, SCMHistoryItemChangeDto, SCMHistoryItemRefDto, SCMActionButtonDto } from './extHost.protocol.js';
+import { sortedDiff, equals } from '../../../base/common/arrays.js';
+import { comparePaths } from '../../../base/common/comparers.js';
 import type * as vscode from 'vscode';
-import { ISplice } from 'vs/base/common/sequence';
-import { ILogService } from 'vs/platform/log/common/log';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { ExtensionIdentifierMap, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { MarshalledId } from 'vs/base/common/marshallingIds';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { MarkdownString } from 'vs/workbench/api/common/extHostTypeConverters';
-import { checkProposedApiEnabled, isProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
-import { ExtHostDocuments } from 'vs/workbench/api/common/extHostDocuments';
-import { Schemas } from 'vs/base/common/network';
-import { isLinux } from 'vs/base/common/platform';
+import { ISplice } from '../../../base/common/sequence.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { ExtensionIdentifierMap, IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { MarshalledId } from '../../../base/common/marshallingIds.js';
+import { ThemeIcon } from '../../../base/common/themables.js';
+import { IMarkdownString } from '../../../base/common/htmlContent.js';
+import { MarkdownString } from './extHostTypeConverters.js';
+import { checkProposedApiEnabled, isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
+import { ExtHostDocuments } from './extHostDocuments.js';
+import { Schemas } from '../../../base/common/network.js';
+import { isLinux } from '../../../base/common/platform.js';
+import { structuralEquals } from '../../../base/common/equals.js';
 
 type ProviderHandle = number;
 type GroupHandle = number;
@@ -58,19 +59,31 @@ function getIconResource(decorations?: vscode.SourceControlResourceThemableDecor
 	}
 }
 
-function getHistoryItemIconDto(historyItem: vscode.SourceControlHistoryItem): UriComponents | { light: UriComponents; dark: UriComponents } | ThemeIcon | undefined {
-	if (!historyItem.icon) {
+function getHistoryItemIconDto(icon: vscode.Uri | { light: vscode.Uri; dark: vscode.Uri } | vscode.ThemeIcon | undefined): UriComponents | { light: UriComponents; dark: UriComponents } | ThemeIcon | undefined {
+	if (!icon) {
 		return undefined;
-	} else if (URI.isUri(historyItem.icon)) {
-		return historyItem.icon;
-	} else if (ThemeIcon.isThemeIcon(historyItem.icon)) {
-		return historyItem.icon;
+	} else if (URI.isUri(icon)) {
+		return icon;
+	} else if (ThemeIcon.isThemeIcon(icon)) {
+		return icon;
 	} else {
-		const icon = historyItem.icon as { light: URI; dark: URI };
-		return { light: icon.light, dark: icon.dark };
+		const iconDto = icon as { light: URI; dark: URI };
+		return { light: iconDto.light, dark: iconDto.dark };
 	}
 }
 
+function toSCMHistoryItemDto(historyItem: vscode.SourceControlHistoryItem): SCMHistoryItemDto {
+	const references = historyItem.references?.map(r => ({
+		...r, icon: getHistoryItemIconDto(r.icon)
+	}));
+
+	return { ...historyItem, references };
+}
+
+function toSCMHistoryItemRefDto(historyItemRef?: vscode.SourceControlHistoryItemRef): SCMHistoryItemRefDto | undefined {
+	return historyItemRef ? { ...historyItemRef, icon: getHistoryItemIconDto(historyItemRef.icon) } : undefined;
+}
+
 function compareResourceThemableDecorations(a: vscode.SourceControlResourceThemableDecorations, b: vscode.SourceControlResourceThemableDecorations): number {
 	if (!a.iconPath && !b.iconPath) {
 		return 0;
@@ -203,6 +216,10 @@ function compareResourceStates(a: vscode.SourceControlResourceState, b: vscode.S
 		return -1;
 	}
 
+	if (result !== 0) {
+		return result;
+	}
+
 	if (a.multiFileDiffEditorModifiedUri && b.multiFileDiffEditorModifiedUri) {
 		result = comparePaths(a.multiFileDiffEditorModifiedUri.fsPath, b.multiFileDiffEditorModifiedUri.fsPath, true);
 	} else if (a.multiFileDiffEditorModifiedUri) {
@@ -210,6 +227,11 @@ function compareResourceStates(a: vscode.SourceControlResourceState, b: vscode.S
 	} else if (b.multiFileDiffEditorModifiedUri) {
 		return -1;
 	}
+
+	if (result !== 0) {
+		return result;
+	}
+
 	if (a.multiDiffEditorOriginalUri && b.multiDiffEditorOriginalUri) {
 		result = comparePaths(a.multiDiffEditorOriginalUri.fsPath, b.multiDiffEditorOriginalUri.fsPath, true);
 	} else if (a.multiDiffEditorOriginalUri) {
@@ -560,7 +582,6 @@ class ExtHostSourceControl implements vscode.SourceControl {
 
 	private _historyProvider: vscode.SourceControlHistoryProvider | undefined;
 	private readonly _historyProviderDisposable = new MutableDisposable<DisposableStore>();
-	private _historyProviderCurrentHistoryItemGroup: vscode.SourceControlHistoryItemGroup | undefined;
 
 	get historyProvider(): vscode.SourceControlHistoryProvider | undefined {
 		checkProposedApiEnabled(this._extension, 'scmHistoryProvider');
@@ -576,9 +597,23 @@ class ExtHostSourceControl implements vscode.SourceControl {
 		this.#proxy.$updateSourceControl(this.handle, { hasHistoryProvider: !!historyProvider });
 
 		if (historyProvider) {
-			this._historyProviderDisposable.value.add(historyProvider.onDidChangeCurrentHistoryItemGroup(() => {
-				this._historyProviderCurrentHistoryItemGroup = historyProvider?.currentHistoryItemGroup;
-				this.#proxy.$onDidChangeHistoryProviderCurrentHistoryItemGroup(this.handle, this._historyProviderCurrentHistoryItemGroup);
+			this._historyProviderDisposable.value.add(historyProvider.onDidChangeCurrentHistoryItemRefs(() => {
+				const historyItemRef = toSCMHistoryItemRefDto(historyProvider?.currentHistoryItemRef);
+				const historyItemRemoteRef = toSCMHistoryItemRefDto(historyProvider?.currentHistoryItemRemoteRef);
+				const historyItemBaseRef = toSCMHistoryItemRefDto(historyProvider?.currentHistoryItemBaseRef);
+
+				this.#proxy.$onDidChangeHistoryProviderCurrentHistoryItemRefs(this.handle, historyItemRef, historyItemRemoteRef, historyItemBaseRef);
+			}));
+			this._historyProviderDisposable.value.add(historyProvider.onDidChangeHistoryItemRefs((e) => {
+				if (e.added.length === 0 && e.modified.length === 0 && e.removed.length === 0) {
+					return;
+				}
+
+				const added = e.added.map(ref => ({ ...ref, icon: getHistoryItemIconDto(ref.icon) }));
+				const modified = e.modified.map(ref => ({ ...ref, icon: getHistoryItemIconDto(ref.icon) }));
+				const removed = e.removed.map(ref => ({ ...ref, icon: getHistoryItemIconDto(ref.icon) }));
+
+				this.#proxy.$onDidChangeHistoryProviderHistoryItemRefs(this.handle, { added, modified, removed, silent: e.silent });
 			}));
 		}
 	}
@@ -620,22 +655,33 @@ class ExtHostSourceControl implements vscode.SourceControl {
 		checkProposedApiEnabled(this._extension, 'scmActionButton');
 		return this._actionButton;
 	}
+
 	set actionButton(actionButton: vscode.SourceControlActionButton | undefined) {
 		checkProposedApiEnabled(this._extension, 'scmActionButton');
-		this._actionButtonDisposables.value = new DisposableStore();
+
+		// We have to do this check before converting the command to it's internal
+		// representation since that would always create a command with a unique
+		// identifier
+		if (structuralEquals(this._actionButton, actionButton)) {
+			return;
+		}
 
 		this._actionButton = actionButton;
+		this._actionButtonDisposables.value = new DisposableStore();
 
-		const internal = actionButton !== undefined ?
+		const actionButtonDto = actionButton !== undefined ?
 			{
-				command: this._commands.converter.toInternal(actionButton.command, this._actionButtonDisposables.value),
+				command: {
+					...this._commands.converter.toInternal(actionButton.command, this._actionButtonDisposables.value),
+					shortTitle: actionButton.command.shortTitle
+				},
 				secondaryCommands: actionButton.secondaryCommands?.map(commandGroup => {
 					return commandGroup.map(command => this._commands.converter.toInternal(command, this._actionButtonDisposables.value!));
 				}),
-				description: actionButton.description,
 				enabled: actionButton.enabled
-			} : undefined;
-		this.#proxy.$updateSourceControl(this.handle, { actionButton: internal ?? null });
+			} satisfies SCMActionButtonDto : undefined;
+
+		this.#proxy.$updateSourceControl(this.handle, { actionButton: actionButtonDto });
 	}
 
 
@@ -960,30 +1006,55 @@ export class ExtHostSCM implements ExtHostSCMShape {
 		return Promise.resolve(undefined);
 	}
 
-	async $resolveHistoryItemGroupCommonAncestor(sourceControlHandle: number, historyItemGroupId1: string, historyItemGroupId2: string | undefined, token: CancellationToken): Promise<{ id: string; ahead: number; behind: number } | undefined> {
-		const historyProvider = this._sourceControls.get(sourceControlHandle)?.historyProvider;
-		return await historyProvider?.resolveHistoryItemGroupCommonAncestor(historyItemGroupId1, historyItemGroupId2, token) ?? undefined;
-	}
+	async $resolveHistoryItemRefsCommonAncestor(sourceControlHandle: number, historyItemRefs: string[], token: CancellationToken): Promise<string | undefined> {
+		try {
+			const historyProvider = this._sourceControls.get(sourceControlHandle)?.historyProvider;
+			const ancestor = await historyProvider?.resolveHistoryItemRefsCommonAncestor(historyItemRefs, token);
 
-	async $provideHistoryItems(sourceControlHandle: number, historyItemGroupId: string, options: any, token: CancellationToken): Promise<SCMHistoryItemDto[] | undefined> {
-		const historyProvider = this._sourceControls.get(sourceControlHandle)?.historyProvider;
-		const historyItems = await historyProvider?.provideHistoryItems(historyItemGroupId, options, token);
-
-		return historyItems?.map(item => ({ ...item, icon: getHistoryItemIconDto(item) })) ?? undefined;
-	}
-
-	async $provideHistoryItemSummary(sourceControlHandle: number, historyItemId: string, historyItemParentId: string | undefined, token: CancellationToken): Promise<SCMHistoryItemDto | undefined> {
-		const historyProvider = this._sourceControls.get(sourceControlHandle)?.historyProvider;
-		if (typeof historyProvider?.provideHistoryItemSummary !== 'function') {
+			return ancestor ?? undefined;
+		}
+		catch (err) {
+			this.logService.error('ExtHostSCM#$resolveHistoryItemRefsCommonAncestor', err);
 			return undefined;
 		}
+	}
 
-		const historyItem = await historyProvider.provideHistoryItemSummary(historyItemId, historyItemParentId, token);
-		return historyItem ? { ...historyItem, icon: getHistoryItemIconDto(historyItem) } : undefined;
+	async $provideHistoryItemRefs(sourceControlHandle: number, historyItemRefs: string[] | undefined, token: CancellationToken): Promise<SCMHistoryItemRefDto[] | undefined> {
+		try {
+			const historyProvider = this._sourceControls.get(sourceControlHandle)?.historyProvider;
+			const refs = await historyProvider?.provideHistoryItemRefs(historyItemRefs, token);
+
+			return refs?.map(ref => ({ ...ref, icon: getHistoryItemIconDto(ref.icon) })) ?? undefined;
+		}
+		catch (err) {
+			this.logService.error('ExtHostSCM#$provideHistoryItemRefs', err);
+			return undefined;
+		}
+	}
+
+	async $provideHistoryItems(sourceControlHandle: number, options: any, token: CancellationToken): Promise<SCMHistoryItemDto[] | undefined> {
+		try {
+			const historyProvider = this._sourceControls.get(sourceControlHandle)?.historyProvider;
+			const historyItems = await historyProvider?.provideHistoryItems(options, token);
+
+			return historyItems?.map(item => toSCMHistoryItemDto(item)) ?? undefined;
+		}
+		catch (err) {
+			this.logService.error('ExtHostSCM#$provideHistoryItems', err);
+			return undefined;
+		}
 	}
 
 	async $provideHistoryItemChanges(sourceControlHandle: number, historyItemId: string, historyItemParentId: string | undefined, token: CancellationToken): Promise<SCMHistoryItemChangeDto[] | undefined> {
-		const historyProvider = this._sourceControls.get(sourceControlHandle)?.historyProvider;
-		return await historyProvider?.provideHistoryItemChanges(historyItemId, historyItemParentId, token) ?? undefined;
+		try {
+			const historyProvider = this._sourceControls.get(sourceControlHandle)?.historyProvider;
+			const changes = await historyProvider?.provideHistoryItemChanges(historyItemId, historyItemParentId, token);
+
+			return changes ?? undefined;
+		}
+		catch (err) {
+			this.logService.error('ExtHostSCM#$provideHistoryItemChanges', err);
+			return undefined;
+		}
 	}
 }
diff --git a/src/vs/workbench/api/common/extHostSearch.ts b/src/vs/workbench/api/common/extHostSearch.ts
index f7da534aab8..fbb111a79d1 100644
--- a/src/vs/workbench/api/common/extHostSearch.ts
+++ b/src/vs/workbench/api/common/extHostSearch.ts
@@ -3,23 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
 import type * as vscode from 'vscode';
-import { ExtHostSearchShape, MainThreadSearchShape, MainContext } from '../common/extHost.protocol';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { FileSearchManager } from 'vs/workbench/services/search/common/fileSearchManager';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import { IURITransformerService } from 'vs/workbench/api/common/extHostUriTransformerService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IRawFileQuery, ISearchCompleteStats, IFileQuery, IRawTextQuery, IRawQuery, ITextQuery, IFolderQuery, IRawAITextQuery, IAITextQuery } from 'vs/workbench/services/search/common/search';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { TextSearchManager } from 'vs/workbench/services/search/common/textSearchManager';
-import { CancellationToken } from 'vs/base/common/cancellation';
+import { ExtHostSearchShape, MainThreadSearchShape, MainContext } from './extHost.protocol.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { FileSearchManager } from '../../services/search/common/fileSearchManager.js';
+import { IExtHostRpcService } from './extHostRpcService.js';
+import { IURITransformerService } from './extHostUriTransformerService.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { IRawFileQuery, ISearchCompleteStats, IFileQuery, IRawTextQuery, IRawQuery, ITextQuery, IFolderQuery, IRawAITextQuery, IAITextQuery } from '../../services/search/common/search.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { TextSearchManager } from '../../services/search/common/textSearchManager.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { revive } from '../../../base/common/marshalling.js';
+import { OldAITextSearchProviderConverter, OldFileSearchProviderConverter, OldTextSearchProviderConverter } from '../../services/search/common/searchExtConversionTypes.js';
 
 export interface IExtHostSearch extends ExtHostSearchShape {
-	registerTextSearchProvider(scheme: string, provider: vscode.TextSearchProvider): IDisposable;
-	registerAITextSearchProvider(scheme: string, provider: vscode.AITextSearchProvider): IDisposable;
-	registerFileSearchProvider(scheme: string, provider: vscode.FileSearchProvider): IDisposable;
+	registerTextSearchProviderOld(scheme: string, provider: vscode.TextSearchProvider): IDisposable;
+	registerAITextSearchProviderOld(scheme: string, provider: vscode.AITextSearchProvider): IDisposable;
+	registerFileSearchProviderOld(scheme: string, provider: vscode.FileSearchProvider): IDisposable;
+	registerTextSearchProvider(scheme: string, provider: vscode.TextSearchProviderNew): IDisposable;
+	registerAITextSearchProvider(scheme: string, provider: vscode.AITextSearchProviderNew): IDisposable;
+	registerFileSearchProvider(scheme: string, provider: vscode.FileSearchProviderNew): IDisposable;
 	doInternalFileSearchWithCustomCallback(query: IFileQuery, token: CancellationToken, handleFileMatch: (data: URI[]) => void): Promise<ISearchCompleteStats>;
 }
 
@@ -30,13 +35,13 @@ export class ExtHostSearch implements IExtHostSearch {
 	protected readonly _proxy: MainThreadSearchShape = this.extHostRpc.getProxy(MainContext.MainThreadSearch);
 	protected _handlePool: number = 0;
 
-	private readonly _textSearchProvider = new Map<number, vscode.TextSearchProvider>();
+	private readonly _textSearchProvider = new Map<number, vscode.TextSearchProviderNew>();
 	private readonly _textSearchUsedSchemes = new Set<string>();
 
-	private readonly _aiTextSearchProvider = new Map<number, vscode.AITextSearchProvider>();
+	private readonly _aiTextSearchProvider = new Map<number, vscode.AITextSearchProviderNew>();
 	private readonly _aiTextSearchUsedSchemes = new Set<string>();
 
-	private readonly _fileSearchProvider = new Map<number, vscode.FileSearchProvider>();
+	private readonly _fileSearchProvider = new Map<number, vscode.FileSearchProviderNew>();
 	private readonly _fileSearchUsedSchemes = new Set<string>();
 
 	private readonly _fileSearchManager = new FileSearchManager();
@@ -44,14 +49,30 @@ export class ExtHostSearch implements IExtHostSearch {
 	constructor(
 		@IExtHostRpcService private extHostRpc: IExtHostRpcService,
 		@IURITransformerService protected _uriTransformer: IURITransformerService,
-		@ILogService protected _logService: ILogService
+		@ILogService protected _logService: ILogService,
 	) { }
 
 	protected _transformScheme(scheme: string): string {
 		return this._uriTransformer.transformOutgoingScheme(scheme);
 	}
 
-	registerTextSearchProvider(scheme: string, provider: vscode.TextSearchProvider): IDisposable {
+	registerTextSearchProviderOld(scheme: string, provider: vscode.TextSearchProvider): IDisposable {
+		if (this._textSearchUsedSchemes.has(scheme)) {
+			throw new Error(`a text search provider for the scheme '${scheme}' is already registered`);
+		}
+
+		this._textSearchUsedSchemes.add(scheme);
+		const handle = this._handlePool++;
+		this._textSearchProvider.set(handle, new OldTextSearchProviderConverter(provider));
+		this._proxy.$registerTextSearchProvider(handle, this._transformScheme(scheme));
+		return toDisposable(() => {
+			this._textSearchUsedSchemes.delete(scheme);
+			this._textSearchProvider.delete(handle);
+			this._proxy.$unregisterProvider(handle);
+		});
+	}
+
+	registerTextSearchProvider(scheme: string, provider: vscode.TextSearchProviderNew): IDisposable {
 		if (this._textSearchUsedSchemes.has(scheme)) {
 			throw new Error(`a text search provider for the scheme '${scheme}' is already registered`);
 		}
@@ -67,7 +88,23 @@ export class ExtHostSearch implements IExtHostSearch {
 		});
 	}
 
-	registerAITextSearchProvider(scheme: string, provider: vscode.AITextSearchProvider): IDisposable {
+	registerAITextSearchProviderOld(scheme: string, provider: vscode.AITextSearchProvider): IDisposable {
+		if (this._aiTextSearchUsedSchemes.has(scheme)) {
+			throw new Error(`an AI text search provider for the scheme '${scheme}'is already registered`);
+		}
+
+		this._aiTextSearchUsedSchemes.add(scheme);
+		const handle = this._handlePool++;
+		this._aiTextSearchProvider.set(handle, new OldAITextSearchProviderConverter(provider));
+		this._proxy.$registerAITextSearchProvider(handle, this._transformScheme(scheme));
+		return toDisposable(() => {
+			this._aiTextSearchUsedSchemes.delete(scheme);
+			this._aiTextSearchProvider.delete(handle);
+			this._proxy.$unregisterProvider(handle);
+		});
+	}
+
+	registerAITextSearchProvider(scheme: string, provider: vscode.AITextSearchProviderNew): IDisposable {
 		if (this._aiTextSearchUsedSchemes.has(scheme)) {
 			throw new Error(`an AI text search provider for the scheme '${scheme}'is already registered`);
 		}
@@ -83,7 +120,23 @@ export class ExtHostSearch implements IExtHostSearch {
 		});
 	}
 
-	registerFileSearchProvider(scheme: string, provider: vscode.FileSearchProvider): IDisposable {
+	registerFileSearchProviderOld(scheme: string, provider: vscode.FileSearchProvider): IDisposable {
+		if (this._fileSearchUsedSchemes.has(scheme)) {
+			throw new Error(`a file search provider for the scheme '${scheme}' is already registered`);
+		}
+
+		this._fileSearchUsedSchemes.add(scheme);
+		const handle = this._handlePool++;
+		this._fileSearchProvider.set(handle, new OldFileSearchProviderConverter(provider));
+		this._proxy.$registerFileSearchProvider(handle, this._transformScheme(scheme));
+		return toDisposable(() => {
+			this._fileSearchUsedSchemes.delete(scheme);
+			this._fileSearchProvider.delete(handle);
+			this._proxy.$unregisterProvider(handle);
+		});
+	}
+
+	registerFileSearchProvider(scheme: string, provider: vscode.FileSearchProviderNew): IDisposable {
 		if (this._fileSearchUsedSchemes.has(scheme)) {
 			throw new Error(`a file search provider for the scheme '${scheme}' is already registered`);
 		}
@@ -107,7 +160,7 @@ export class ExtHostSearch implements IExtHostSearch {
 				this._proxy.$handleFileMatch(handle, session, batch.map(p => p.resource));
 			}, token);
 		} else {
-			throw new Error('3 unknown provider: ' + handle);
+			throw new Error('unknown provider: ' + handle);
 		}
 	}
 
@@ -145,14 +198,24 @@ export class ExtHostSearch implements IExtHostSearch {
 
 	$enableExtensionHostSearch(): void { }
 
-	protected createTextSearchManager(query: ITextQuery, provider: vscode.TextSearchProvider): TextSearchManager {
+	async $getAIName(handle: number): Promise<string | undefined> {
+		const provider = this._aiTextSearchProvider.get(handle);
+		if (!provider || !provider.provideAITextSearchResults) {
+			return undefined;
+		}
+
+		// if the provider is defined, but has no name, use default name
+		return provider.name ?? 'AI';
+	}
+
+	protected createTextSearchManager(query: ITextQuery, provider: vscode.TextSearchProviderNew): TextSearchManager {
 		return new TextSearchManager({ query, provider }, {
 			readdir: resource => Promise.resolve([]),
 			toCanonicalName: encoding => encoding
 		}, 'textSearchProvider');
 	}
 
-	protected createAITextSearchManager(query: IAITextQuery, provider: vscode.AITextSearchProvider): TextSearchManager {
+	protected createAITextSearchManager(query: IAITextQuery, provider: vscode.AITextSearchProviderNew): TextSearchManager {
 		return new TextSearchManager({ query, provider }, {
 			readdir: resource => Promise.resolve([]),
 			toCanonicalName: encoding => encoding
@@ -171,8 +234,6 @@ export function reviveQuery<U extends IRawQuery>(rawQuery: U): U extends IRawTex
 }
 
 function reviveFolderQuery(rawFolderQuery: IFolderQuery<UriComponents>): IFolderQuery<URI> {
-	return {
-		...rawFolderQuery,
-		folder: URI.revive(rawFolderQuery.folder)
-	};
+	return revive(rawFolderQuery);
 }
+
diff --git a/src/vs/workbench/api/common/extHostSecretState.ts b/src/vs/workbench/api/common/extHostSecretState.ts
index 1e906df3f01..314a158fef0 100644
--- a/src/vs/workbench/api/common/extHostSecretState.ts
+++ b/src/vs/workbench/api/common/extHostSecretState.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ExtHostSecretStateShape, MainContext, MainThreadSecretStateShape } from 'vs/workbench/api/common/extHost.protocol';
-import { Emitter } from 'vs/base/common/event';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { ExtHostSecretStateShape, MainContext, MainThreadSecretStateShape } from './extHost.protocol.js';
+import { Emitter } from '../../../base/common/event.js';
+import { IExtHostRpcService } from './extHostRpcService.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
 
 export class ExtHostSecretState implements ExtHostSecretStateShape {
 	private _proxy: MainThreadSecretStateShape;
diff --git a/src/vs/workbench/api/common/extHostSecrets.ts b/src/vs/workbench/api/common/extHostSecrets.ts
index d1af02ed1a2..f183b889ff8 100644
--- a/src/vs/workbench/api/common/extHostSecrets.ts
+++ b/src/vs/workbench/api/common/extHostSecrets.ts
@@ -7,28 +7,32 @@
 
 import type * as vscode from 'vscode';
 
-import { ExtHostSecretState } from 'vs/workbench/api/common/extHostSecretState';
-import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { Emitter, Event } from 'vs/base/common/event';
+import { ExtHostSecretState } from './extHostSecretState.js';
+import { ExtensionIdentifier, IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { Event } from '../../../base/common/event.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
 
 export class ExtensionSecrets implements vscode.SecretStorage {
 
 	protected readonly _id: string;
 	readonly #secretState: ExtHostSecretState;
 
-	private _onDidChange = new Emitter<vscode.SecretStorageChangeEvent>();
-	readonly onDidChange: Event<vscode.SecretStorageChangeEvent> = this._onDidChange.event;
-
+	readonly onDidChange: Event<vscode.SecretStorageChangeEvent>;
+	readonly disposables = new DisposableStore();
 
 	constructor(extensionDescription: IExtensionDescription, secretState: ExtHostSecretState) {
 		this._id = ExtensionIdentifier.toKey(extensionDescription.identifier);
 		this.#secretState = secretState;
 
-		this.#secretState.onDidChangePassword(e => {
-			if (e.extensionId === this._id) {
-				this._onDidChange.fire({ key: e.key });
-			}
-		});
+		this.onDidChange = Event.map(
+			Event.filter(this.#secretState.onDidChangePassword, e => e.extensionId === this._id),
+			e => ({ key: e.key }),
+			this.disposables
+		);
+	}
+
+	dispose() {
+		this.disposables.dispose();
 	}
 
 	get(key: string): Promise<string | undefined> {
diff --git a/src/vs/workbench/api/common/extHostShare.ts b/src/vs/workbench/api/common/extHostShare.ts
index 56cd94f38df..d10bda0888e 100644
--- a/src/vs/workbench/api/common/extHostShare.ts
+++ b/src/vs/workbench/api/common/extHostShare.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type * as vscode from 'vscode';
-import { ExtHostShareShape, IMainContext, IShareableItemDto, MainContext, MainThreadShareShape } from 'vs/workbench/api/common/extHost.protocol';
-import { DocumentSelector, Range } from 'vs/workbench/api/common/extHostTypeConverters';
-import { IURITransformer } from 'vs/base/common/uriIpc';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { URI, UriComponents } from 'vs/base/common/uri';
+import { ExtHostShareShape, IMainContext, IShareableItemDto, MainContext, MainThreadShareShape } from './extHost.protocol.js';
+import { DocumentSelector, Range } from './extHostTypeConverters.js';
+import { IURITransformer } from '../../../base/common/uriIpc.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
 
 export class ExtHostShare implements ExtHostShareShape {
 	private static handlePool: number = 0;
diff --git a/src/vs/workbench/api/common/extHostSpeech.ts b/src/vs/workbench/api/common/extHostSpeech.ts
index 198eaee26ad..0900b33bda6 100644
--- a/src/vs/workbench/api/common/extHostSpeech.ts
+++ b/src/vs/workbench/api/common/extHostSpeech.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { ExtHostSpeechShape, IMainContext, MainContext, MainThreadSpeechShape } from 'vs/workbench/api/common/extHost.protocol';
+import { CancellationTokenSource } from '../../../base/common/cancellation.js';
+import { DisposableStore, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { ExtHostSpeechShape, IMainContext, MainContext, MainThreadSpeechShape } from './extHost.protocol.js';
 import type * as vscode from 'vscode';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
+import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
 
 export class ExtHostSpeech implements ExtHostSpeechShape {
 
diff --git a/src/vs/workbench/api/common/extHostStatusBar.ts b/src/vs/workbench/api/common/extHostStatusBar.ts
index 982cdc28c20..327d53c5c92 100644
--- a/src/vs/workbench/api/common/extHostStatusBar.ts
+++ b/src/vs/workbench/api/common/extHostStatusBar.ts
@@ -5,15 +5,15 @@
 
 /* eslint-disable local/code-no-native-private */
 
-import { StatusBarAlignment as ExtHostStatusBarAlignment, Disposable, ThemeColor, asStatusBarItemIdentifier } from './extHostTypes';
+import { StatusBarAlignment as ExtHostStatusBarAlignment, Disposable, ThemeColor, asStatusBarItemIdentifier } from './extHostTypes.js';
 import type * as vscode from 'vscode';
-import { MainContext, MainThreadStatusBarShape, IMainContext, ICommandDto, ExtHostStatusBarShape, StatusBarItemDto } from './extHost.protocol';
-import { localize } from 'vs/nls';
-import { CommandsConverter } from 'vs/workbench/api/common/extHostCommands';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { MarkdownString } from 'vs/workbench/api/common/extHostTypeConverters';
-import { isNumber } from 'vs/base/common/types';
+import { MainContext, MainThreadStatusBarShape, IMainContext, ICommandDto, ExtHostStatusBarShape, StatusBarItemDto } from './extHost.protocol.js';
+import { localize } from '../../../nls.js';
+import { CommandsConverter } from './extHostCommands.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { MarkdownString } from './extHostTypeConverters.js';
+import { isNumber } from '../../../base/common/types.js';
 
 
 export class ExtHostStatusBarEntry implements vscode.StatusBarItem {
diff --git a/src/vs/workbench/api/common/extHostStorage.ts b/src/vs/workbench/api/common/extHostStorage.ts
index f5ea20880fb..f4cc16fc026 100644
--- a/src/vs/workbench/api/common/extHostStorage.ts
+++ b/src/vs/workbench/api/common/extHostStorage.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { MainContext, MainThreadStorageShape, ExtHostStorageShape } from './extHost.protocol';
-import { Emitter } from 'vs/base/common/event';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IExtensionIdWithVersion } from 'vs/platform/extensionManagement/common/extensionStorage';
-import { ILogService } from 'vs/platform/log/common/log';
+import { MainContext, MainThreadStorageShape, ExtHostStorageShape } from './extHost.protocol.js';
+import { Emitter } from '../../../base/common/event.js';
+import { IExtHostRpcService } from './extHostRpcService.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { IExtensionIdWithVersion } from '../../../platform/extensionManagement/common/extensionStorage.js';
+import { ILogService } from '../../../platform/log/common/log.js';
 
 export interface IStorageChangeEvent {
 	shared: boolean;
diff --git a/src/vs/workbench/api/common/extHostStoragePaths.ts b/src/vs/workbench/api/common/extHostStoragePaths.ts
index 71342224211..b12bb7255ab 100644
--- a/src/vs/workbench/api/common/extHostStoragePaths.ts
+++ b/src/vs/workbench/api/common/extHostStoragePaths.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IEnvironment, IStaticWorkspaceData } from 'vs/workbench/services/extensions/common/extensionHostProtocol';
-import { IExtHostConsumerFileSystem } from 'vs/workbench/api/common/extHostFileSystemConsumer';
-import { URI } from 'vs/base/common/uri';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { IExtHostInitDataService } from './extHostInitDataService.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { IEnvironment, IStaticWorkspaceData } from '../../services/extensions/common/extensionHostProtocol.js';
+import { IExtHostConsumerFileSystem } from './extHostFileSystemConsumer.js';
+import { URI } from '../../../base/common/uri.js';
 
 export const IExtensionStoragePaths = createDecorator<IExtensionStoragePaths>('IExtensionStoragePaths');
 
diff --git a/src/vs/workbench/api/common/extHostTask.ts b/src/vs/workbench/api/common/extHostTask.ts
index b5829c09af7..e0774e293a0 100644
--- a/src/vs/workbench/api/common/extHostTask.ts
+++ b/src/vs/workbench/api/common/extHostTask.ts
@@ -5,29 +5,30 @@
 
 /* eslint-disable local/code-no-native-private */
 
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { asPromise } from 'vs/base/common/async';
-import { Event, Emitter } from 'vs/base/common/event';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { asPromise } from '../../../base/common/async.js';
+import { Event, Emitter } from '../../../base/common/event.js';
 
-import { MainContext, MainThreadTaskShape, ExtHostTaskShape } from 'vs/workbench/api/common/extHost.protocol';
-import * as types from 'vs/workbench/api/common/extHostTypes';
-import { IExtHostWorkspaceProvider, IExtHostWorkspace } from 'vs/workbench/api/common/extHostWorkspace';
+import { MainContext, MainThreadTaskShape, ExtHostTaskShape } from './extHost.protocol.js';
+import * as types from './extHostTypes.js';
+import { IExtHostWorkspaceProvider, IExtHostWorkspace } from './extHostWorkspace.js';
 import type * as vscode from 'vscode';
-import * as tasks from '../common/shared/tasks';
-import { IExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
-import { IExtHostConfiguration } from 'vs/workbench/api/common/extHostConfiguration';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { IExtHostTerminalService } from 'vs/workbench/api/common/extHostTerminalService';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { Schemas } from 'vs/base/common/network';
-import * as Platform from 'vs/base/common/platform';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IExtHostApiDeprecationService } from 'vs/workbench/api/common/extHostApiDeprecationService';
-import { USER_TASKS_GROUP_KEY } from 'vs/workbench/contrib/tasks/common/tasks';
-import { ErrorNoTelemetry, NotSupportedError } from 'vs/base/common/errors';
+import * as tasks from './shared/tasks.js';
+import { IExtHostDocumentsAndEditors } from './extHostDocumentsAndEditors.js';
+import { IExtHostConfiguration } from './extHostConfiguration.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { IExtHostTerminalService } from './extHostTerminalService.js';
+import { IExtHostRpcService } from './extHostRpcService.js';
+import { IExtHostInitDataService } from './extHostInitDataService.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { Schemas } from '../../../base/common/network.js';
+import * as Platform from '../../../base/common/platform.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { IExtHostApiDeprecationService } from './extHostApiDeprecationService.js';
+import { USER_TASKS_GROUP_KEY } from '../../contrib/tasks/common/tasks.js';
+import { ErrorNoTelemetry, NotSupportedError } from '../../../base/common/errors.js';
+import { asArray } from '../../../base/common/arrays.js';
 
 export interface IExtHostTask extends ExtHostTaskShape {
 
@@ -279,7 +280,7 @@ export namespace TaskDTO {
 			isBackground: value.isBackground,
 			group: TaskGroupDTO.from(value.group as vscode.TaskGroup),
 			presentationOptions: TaskPresentationOptionsDTO.from(value.presentationOptions),
-			problemMatchers: value.problemMatchers,
+			problemMatchers: asArray(value.problemMatchers),
 			hasDefinedMatchers: (value as types.Task).hasDefinedMatchers,
 			runOptions: value.runOptions ? value.runOptions : { reevaluateOnRerun: true },
 			detail: value.detail
diff --git a/src/vs/workbench/api/common/extHostTelemetry.ts b/src/vs/workbench/api/common/extHostTelemetry.ts
index 64a12869610..ffef0eeb5d8 100644
--- a/src/vs/workbench/api/common/extHostTelemetry.ts
+++ b/src/vs/workbench/api/common/extHostTelemetry.ts
@@ -4,20 +4,20 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type * as vscode from 'vscode';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { Event, Emitter } from 'vs/base/common/event';
-import { ExtHostTelemetryShape } from 'vs/workbench/api/common/extHost.protocol';
-import { ICommonProperties, TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
-import { ILogger, ILoggerService, LogLevel, isLogLevel } from 'vs/platform/log/common/log';
-import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService';
-import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { UIKind } from 'vs/workbench/services/extensions/common/extensionHostProtocol';
-import { getRemoteName } from 'vs/platform/remote/common/remoteHosts';
-import { cleanData, cleanRemoteAuthority, extensionTelemetryLogChannelId } from 'vs/platform/telemetry/common/telemetryUtils';
-import { mixin } from 'vs/base/common/objects';
-import { URI } from 'vs/base/common/uri';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { localize } from 'vs/nls';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { Event, Emitter } from '../../../base/common/event.js';
+import { ExtHostTelemetryShape } from './extHost.protocol.js';
+import { ICommonProperties, TelemetryLevel } from '../../../platform/telemetry/common/telemetry.js';
+import { ILogger, ILoggerService, LogLevel, isLogLevel } from '../../../platform/log/common/log.js';
+import { IExtHostInitDataService } from './extHostInitDataService.js';
+import { ExtensionIdentifier, IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { UIKind } from '../../services/extensions/common/extensionHostProtocol.js';
+import { getRemoteName } from '../../../platform/remote/common/remoteHosts.js';
+import { cleanData, cleanRemoteAuthority, extensionTelemetryLogChannelId } from '../../../platform/telemetry/common/telemetryUtils.js';
+import { mixin } from '../../../base/common/objects.js';
+import { URI } from '../../../base/common/uri.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { localize } from '../../../nls.js';
 
 export class ExtHostTelemetry extends Disposable implements ExtHostTelemetryShape {
 
diff --git a/src/vs/workbench/api/common/extHostTerminalService.ts b/src/vs/workbench/api/common/extHostTerminalService.ts
index 9ce31e7147c..39ce969617b 100644
--- a/src/vs/workbench/api/common/extHostTerminalService.ts
+++ b/src/vs/workbench/api/common/extHostTerminalService.ts
@@ -4,29 +4,29 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type * as vscode from 'vscode';
-import { Event, Emitter } from 'vs/base/common/event';
-import { ExtHostTerminalServiceShape, MainContext, MainThreadTerminalServiceShape, ITerminalDimensionsDto, ITerminalLinkDto, ExtHostTerminalIdentifier, ICommandDto, ITerminalQuickFixOpenerDto, ITerminalQuickFixTerminalCommandDto, TerminalCommandMatchResultDto, ITerminalCommandDto } from 'vs/workbench/api/common/extHost.protocol';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { URI } from 'vs/base/common/uri';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import { IDisposable, DisposableStore, Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { Disposable as VSCodeDisposable, EnvironmentVariableMutatorType, TerminalExitReason } from './extHostTypes';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { localize } from 'vs/nls';
-import { NotSupportedError } from 'vs/base/common/errors';
-import { serializeEnvironmentDescriptionMap, serializeEnvironmentVariableCollection } from 'vs/platform/terminal/common/environmentVariableShared';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { generateUuid } from 'vs/base/common/uuid';
-import { IEnvironmentVariableCollectionDescription, IEnvironmentVariableMutator, ISerializableEnvironmentVariableCollection } from 'vs/platform/terminal/common/environmentVariable';
-import { ICreateContributedTerminalProfileOptions, IProcessReadyEvent, IShellLaunchConfigDto, ITerminalChildProcess, ITerminalLaunchError, ITerminalProfile, TerminalIcon, TerminalLocation, IProcessProperty, ProcessPropertyType, IProcessPropertyMap } from 'vs/platform/terminal/common/terminal';
-import { TerminalDataBufferer } from 'vs/platform/terminal/common/terminalDataBuffering';
-import { ThemeColor } from 'vs/base/common/themables';
-import { Promises } from 'vs/base/common/async';
-import { EditorGroupColumn } from 'vs/workbench/services/editor/common/editorGroupColumn';
-import { TerminalQuickFix, ViewColumn } from 'vs/workbench/api/common/extHostTypeConverters';
-import { IExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
-import { MarshalledId } from 'vs/base/common/marshallingIds';
-import { ISerializedTerminalInstanceContext } from 'vs/workbench/contrib/terminal/common/terminal';
+import { Event, Emitter } from '../../../base/common/event.js';
+import { ExtHostTerminalServiceShape, MainContext, MainThreadTerminalServiceShape, ITerminalDimensionsDto, ITerminalLinkDto, ExtHostTerminalIdentifier, ICommandDto, ITerminalQuickFixOpenerDto, ITerminalQuickFixTerminalCommandDto, TerminalCommandMatchResultDto, ITerminalCommandDto } from './extHost.protocol.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { URI } from '../../../base/common/uri.js';
+import { IExtHostRpcService } from './extHostRpcService.js';
+import { IDisposable, DisposableStore, Disposable, MutableDisposable } from '../../../base/common/lifecycle.js';
+import { Disposable as VSCodeDisposable, EnvironmentVariableMutatorType, TerminalExitReason } from './extHostTypes.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { localize } from '../../../nls.js';
+import { NotSupportedError } from '../../../base/common/errors.js';
+import { serializeEnvironmentDescriptionMap, serializeEnvironmentVariableCollection } from '../../../platform/terminal/common/environmentVariableShared.js';
+import { CancellationTokenSource } from '../../../base/common/cancellation.js';
+import { generateUuid } from '../../../base/common/uuid.js';
+import { IEnvironmentVariableCollectionDescription, IEnvironmentVariableMutator, ISerializableEnvironmentVariableCollection } from '../../../platform/terminal/common/environmentVariable.js';
+import { ICreateContributedTerminalProfileOptions, IProcessReadyEvent, IShellLaunchConfigDto, ITerminalChildProcess, ITerminalLaunchError, ITerminalProfile, TerminalIcon, TerminalLocation, IProcessProperty, ProcessPropertyType, IProcessPropertyMap } from '../../../platform/terminal/common/terminal.js';
+import { TerminalDataBufferer } from '../../../platform/terminal/common/terminalDataBuffering.js';
+import { ThemeColor } from '../../../base/common/themables.js';
+import { Promises } from '../../../base/common/async.js';
+import { EditorGroupColumn } from '../../services/editor/common/editorGroupColumn.js';
+import { TerminalQuickFix, ViewColumn } from './extHostTypeConverters.js';
+import { IExtHostCommands } from './extHostCommands.js';
+import { MarshalledId } from '../../../base/common/marshallingIds.js';
+import { ISerializedTerminalInstanceContext } from '../../contrib/terminal/common/terminal.js';
 
 export interface IExtHostTerminalService extends ExtHostTerminalServiceShape, IDisposable {
 
diff --git a/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts b/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
index 59f391f8b50..8acc68b0dd9 100644
--- a/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
+++ b/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
@@ -4,15 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type * as vscode from 'vscode';
-import { TerminalShellExecutionCommandLineConfidence } from './extHostTypes';
-import { Disposable, DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { MainContext, type ExtHostTerminalShellIntegrationShape, type MainThreadTerminalShellIntegrationShape } from 'vs/workbench/api/common/extHost.protocol';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import { IExtHostTerminalService } from 'vs/workbench/api/common/extHostTerminalService';
-import { Emitter, type Event } from 'vs/base/common/event';
-import { isUriComponents, URI } from 'vs/base/common/uri';
-import { AsyncIterableObject, Barrier, type AsyncIterableEmitter } from 'vs/base/common/async';
+import { TerminalShellExecutionCommandLineConfidence } from './extHostTypes.js';
+import { Disposable, DisposableStore, toDisposable } from '../../../base/common/lifecycle.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { MainContext, type ExtHostTerminalShellIntegrationShape, type MainThreadTerminalShellIntegrationShape } from './extHost.protocol.js';
+import { IExtHostRpcService } from './extHostRpcService.js';
+import { IExtHostTerminalService } from './extHostTerminalService.js';
+import { Emitter, type Event } from '../../../base/common/event.js';
+import { URI, type UriComponents } from '../../../base/common/uri.js';
+import { AsyncIterableObject, Barrier, type AsyncIterableEmitter } from '../../../base/common/async.js';
 
 export interface IExtHostTerminalShellIntegration extends ExtHostTerminalShellIntegrationShape {
 	readonly _serviceBrand: undefined;
@@ -104,7 +104,7 @@ export class ExtHostTerminalShellIntegration extends Disposable implements IExtH
 		});
 	}
 
-	public $shellExecutionStart(instanceId: number, commandLineValue: string, commandLineConfidence: TerminalShellExecutionCommandLineConfidence, isTrusted: boolean, cwd: URI | undefined): void {
+	public $shellExecutionStart(instanceId: number, commandLineValue: string, commandLineConfidence: TerminalShellExecutionCommandLineConfidence, isTrusted: boolean, cwd: UriComponents | undefined): void {
 		// Force shellIntegration creation if it hasn't been created yet, this could when events
 		// don't come through on startup
 		if (!this._activeShellIntegrations.has(instanceId)) {
@@ -115,7 +115,7 @@ export class ExtHostTerminalShellIntegration extends Disposable implements IExtH
 			confidence: commandLineConfidence,
 			isTrusted
 		};
-		this._activeShellIntegrations.get(instanceId)?.startShellExecution(commandLine, cwd);
+		this._activeShellIntegrations.get(instanceId)?.startShellExecution(commandLine, URI.revive(cwd));
 	}
 
 	public $shellExecutionEnd(instanceId: number, commandLineValue: string, commandLineConfidence: TerminalShellExecutionCommandLineConfidence, isTrusted: boolean, exitCode: number | undefined): void {
@@ -131,8 +131,8 @@ export class ExtHostTerminalShellIntegration extends Disposable implements IExtH
 		this._activeShellIntegrations.get(instanceId)?.emitData(data);
 	}
 
-	public $cwdChange(instanceId: number, cwd: URI | undefined): void {
-		this._activeShellIntegrations.get(instanceId)?.setCwd(isUriComponents(cwd) ? URI.revive(cwd) : cwd);
+	public $cwdChange(instanceId: number, cwd: UriComponents | undefined): void {
+		this._activeShellIntegrations.get(instanceId)?.setCwd(URI.revive(cwd));
 	}
 
 	public $closeTerminal(instanceId: number): void {
@@ -202,7 +202,8 @@ class InternalTerminalShellIntegration extends Disposable {
 				this._currentExecution.endExecution(undefined);
 				this._onDidRequestEndExecution.fire({ terminal: this._terminal, shellIntegration: this.value, execution: this._currentExecution.value, exitCode: undefined });
 			}
-			const currentExecution = this._currentExecution = new InternalTerminalShellExecution(commandLine, cwd);
+			// Fallback to the shell integration's cwd as the cwd may not have been restored after a reload
+			const currentExecution = this._currentExecution = new InternalTerminalShellExecution(commandLine, cwd ?? this._cwd);
 			if (fireEventInMicrotask) {
 				queueMicrotask(() => this._onDidStartTerminalShellExecution.fire({ terminal: this._terminal, shellIntegration: this.value, execution: currentExecution.value }));
 			} else {
diff --git a/src/vs/workbench/api/common/extHostTestItem.ts b/src/vs/workbench/api/common/extHostTestItem.ts
index 496cc12a035..7c4bfe2cd97 100644
--- a/src/vs/workbench/api/common/extHostTestItem.ts
+++ b/src/vs/workbench/api/common/extHostTestItem.ts
@@ -2,15 +2,15 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import * as editorRange from 'vs/editor/common/core/range';
-import { createPrivateApiFor, getPrivateApiFor, IExtHostTestItemApi } from 'vs/workbench/api/common/extHostTestingPrivateApi';
-import { TestId, TestIdPathParts } from 'vs/workbench/contrib/testing/common/testId';
-import { createTestItemChildren, ExtHostTestItemEvent, ITestChildrenLike, ITestItemApi, ITestItemChildren, TestItemCollection, TestItemEventOp } from 'vs/workbench/contrib/testing/common/testItemCollection';
-import { denamespaceTestTag, ITestItem, ITestItemContext } from 'vs/workbench/contrib/testing/common/testTypes';
+import * as editorRange from '../../../editor/common/core/range.js';
+import { createPrivateApiFor, getPrivateApiFor, IExtHostTestItemApi } from './extHostTestingPrivateApi.js';
+import { TestId, TestIdPathParts } from '../../contrib/testing/common/testId.js';
+import { createTestItemChildren, ExtHostTestItemEvent, ITestChildrenLike, ITestItemApi, ITestItemChildren, TestItemCollection, TestItemEventOp } from '../../contrib/testing/common/testItemCollection.js';
+import { denamespaceTestTag, ITestItem, ITestItemContext } from '../../contrib/testing/common/testTypes.js';
 import type * as vscode from 'vscode';
-import * as Convert from 'vs/workbench/api/common/extHostTypeConverters';
-import { URI } from 'vs/base/common/uri';
-import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
+import * as Convert from './extHostTypeConverters.js';
+import { URI } from '../../../base/common/uri.js';
+import { ExtHostDocumentsAndEditors } from './extHostDocumentsAndEditors.js';
 
 const testItemPropAccessor = <K extends keyof vscode.TestItem>(
 	api: IExtHostTestItemApi,
diff --git a/src/vs/workbench/api/common/extHostTesting.ts b/src/vs/workbench/api/common/extHostTesting.ts
index 7334180c629..e3ae92ae4c8 100644
--- a/src/vs/workbench/api/common/extHostTesting.ts
+++ b/src/vs/workbench/api/common/extHostTesting.ts
@@ -5,38 +5,41 @@
 
 /* eslint-disable local/code-no-native-private */
 
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { createSingleCallFunction } from 'vs/base/common/functional';
-import { hash } from 'vs/base/common/hash';
-import { Disposable, DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { MarshalledId } from 'vs/base/common/marshallingIds';
-import { isDefined } from 'vs/base/common/types';
-import { generateUuid } from 'vs/base/common/uuid';
-import { IExtensionDescription, IRelaxedExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ExtHostTestingShape, ILocationDto, MainContext, MainThreadTestingShape } from 'vs/workbench/api/common/extHost.protocol';
-import { IExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
-import { IExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import { ExtHostTestItemCollection, TestItemImpl, TestItemRootImpl, toItemFromContext } from 'vs/workbench/api/common/extHostTestItem';
-import * as Convert from 'vs/workbench/api/common/extHostTypeConverters';
-import { FileCoverage, TestRunProfileKind, TestRunRequest } from 'vs/workbench/api/common/extHostTypes';
-import { TestCommandId } from 'vs/workbench/contrib/testing/common/constants';
-import { TestId, TestPosition } from 'vs/workbench/contrib/testing/common/testId';
-import { InvalidTestItemError } from 'vs/workbench/contrib/testing/common/testItemCollection';
-import { AbstractIncrementalTestCollection, CoverageDetails, ICallProfileRunHandler, ISerializedTestResults, IStartControllerTests, IStartControllerTestsResult, ITestErrorMessage, ITestItem, ITestItemContext, ITestMessageMenuArgs, ITestRunProfile, IncrementalChangeCollector, IncrementalTestCollectionItem, InternalTestItem, TestMessageFollowupRequest, TestMessageFollowupResponse, TestResultState, TestRunProfileBitset, TestsDiff, TestsDiffOp, isStartControllerTests } from 'vs/workbench/contrib/testing/common/testTypes';
-import { checkProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
+import { RunOnceScheduler } from '../../../base/common/async.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { CancellationToken, CancellationTokenSource } from '../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { createSingleCallFunction } from '../../../base/common/functional.js';
+import { hash } from '../../../base/common/hash.js';
+import { Disposable, DisposableStore, toDisposable } from '../../../base/common/lifecycle.js';
+import { MarshalledId } from '../../../base/common/marshallingIds.js';
+import { isDefined } from '../../../base/common/types.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { generateUuid } from '../../../base/common/uuid.js';
+import { IPosition } from '../../../editor/common/core/position.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { ExtHostTestingShape, ILocationDto, MainContext, MainThreadTestingShape } from './extHost.protocol.js';
+import { IExtHostCommands } from './extHostCommands.js';
+import { IExtHostDocumentsAndEditors } from './extHostDocumentsAndEditors.js';
+import { IExtHostRpcService } from './extHostRpcService.js';
+import { ExtHostTestItemCollection, TestItemImpl, TestItemRootImpl, toItemFromContext } from './extHostTestItem.js';
+import * as Convert from './extHostTypeConverters.js';
+import { FileCoverage, TestRunProfileKind, TestRunRequest } from './extHostTypes.js';
+import { TestCommandId } from '../../contrib/testing/common/constants.js';
+import { TestId, TestPosition } from '../../contrib/testing/common/testId.js';
+import { InvalidTestItemError } from '../../contrib/testing/common/testItemCollection.js';
+import { AbstractIncrementalTestCollection, CoverageDetails, ICallProfileRunHandler, ISerializedTestResults, IStartControllerTests, IStartControllerTestsResult, ITestErrorMessage, ITestItem, ITestItemContext, ITestMessageMenuArgs, ITestRunProfile, IncrementalChangeCollector, IncrementalTestCollectionItem, InternalTestItem, TestControllerCapability, TestMessageFollowupRequest, TestMessageFollowupResponse, TestResultState, TestRunProfileBitset, TestsDiff, TestsDiffOp, isStartControllerTests } from '../../contrib/testing/common/testTypes.js';
+import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 import type * as vscode from 'vscode';
 
 interface ControllerInfo {
 	controller: vscode.TestController;
 	profiles: Map<number, vscode.TestRunProfile>;
 	collection: ExtHostTestItemCollection;
-	extension: Readonly<IRelaxedExtensionDescription>;
+	extension: IExtensionDescription;
+	relatedCodeProvider?: vscode.TestRelatedCodeProvider;
 	activeProfiles: Set<number>;
 }
 
@@ -137,6 +140,23 @@ export class ExtHostTesting extends Disposable implements ExtHostTestingShape {
 		const activeProfiles = new Set<number>();
 		const proxy = this.proxy;
 
+		const getCapability = () => {
+			let cap = 0;
+			if (refreshHandler) {
+				cap |= TestControllerCapability.Refresh;
+			}
+			const rcp = info.relatedCodeProvider;
+			if (rcp) {
+				if (rcp?.provideRelatedTests) {
+					cap |= TestControllerCapability.TestRelatedToCode;
+				}
+				if (rcp?.provideRelatedCode) {
+					cap |= TestControllerCapability.CodeRelatedToTest;
+				}
+			}
+			return cap as TestControllerCapability;
+		};
+
 		const controller: vscode.TestController = {
 			items: collection.root.children,
 			get label() {
@@ -152,11 +172,19 @@ export class ExtHostTesting extends Disposable implements ExtHostTestingShape {
 			},
 			set refreshHandler(value: ((token: CancellationToken) => Thenable<void> | void) | undefined) {
 				refreshHandler = value;
-				proxy.$updateController(controllerId, { canRefresh: !!value });
+				proxy.$updateController(controllerId, { capabilities: getCapability() });
 			},
 			get id() {
 				return controllerId;
 			},
+			get relatedCodeProvider() {
+				return info.relatedCodeProvider;
+			},
+			set relatedCodeProvider(value: vscode.TestRelatedCodeProvider | undefined) {
+				checkProposedApiEnabled(extension, 'testRelatedCode');
+				info.relatedCodeProvider = value;
+				proxy.$updateController(controllerId, { capabilities: getCapability() });
+			},
 			createRunProfile: (label, group, runHandler, isDefault, tag?: vscode.TestTag | undefined, supportsContinuousRun?: boolean) => {
 				// Derive the profile ID from a hash so that the same profile will tend
 				// to have the same hashes, allowing re-run requests to work across reloads.
@@ -192,10 +220,10 @@ export class ExtHostTesting extends Disposable implements ExtHostTestingShape {
 			},
 		};
 
-		proxy.$registerTestController(controllerId, label, !!refreshHandler);
+		const info: ControllerInfo = { controller, collection, profiles, extension, activeProfiles };
+		proxy.$registerTestController(controllerId, label, getCapability());
 		disposable.add(toDisposable(() => proxy.$unregisterTestController(controllerId)));
 
-		const info: ControllerInfo = { controller, collection, profiles, extension, activeProfiles };
 		this.controllers.set(controllerId, info);
 		disposable.add(toDisposable(() => this.controllers.delete(controllerId)));
 
@@ -249,6 +277,56 @@ export class ExtHostTesting extends Disposable implements ExtHostTestingShape {
 	//#endregion
 
 	//#region RPC methods
+	/**
+	 * @inheritdoc
+	 */
+	async $getTestsRelatedToCode(uri: UriComponents, _position: IPosition, token: CancellationToken): Promise<string[]> {
+		const doc = this.editors.getDocument(URI.revive(uri));
+		if (!doc) {
+			return [];
+		}
+
+		const position = Convert.Position.to(_position);
+		const related: string[] = [];
+		await Promise.all([...this.controllers.values()].map(async (c) => {
+			let tests: vscode.TestItem[] | undefined | null;
+			try {
+				tests = await c.relatedCodeProvider?.provideRelatedTests?.(doc.document, position, token);
+			} catch (e) {
+				if (!token.isCancellationRequested) {
+					this.logService.warn(`Error thrown while providing related tests for ${c.controller.label}`, e);
+				}
+			}
+
+			if (tests) {
+				for (const test of tests) {
+					related.push(TestId.fromExtHostTestItem(test, c.controller.id).toString());
+				}
+				c.collection.flushDiff();
+			}
+		}));
+
+		return related;
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	async $getCodeRelatedToTest(testId: string, token: CancellationToken): Promise<ILocationDto[]> {
+		const controller = this.controllers.get(TestId.root(testId));
+		if (!controller) {
+			return [];
+		}
+
+		const test = controller.collection.tree.get(testId);
+		if (!test) {
+			return [];
+		}
+
+		const locations = await controller.relatedCodeProvider?.provideRelatedCode?.(test.actual, token);
+		return locations?.map(Convert.location.from) ?? [];
+	}
+
 	/**
 	 * @inheritdoc
 	 */
@@ -263,8 +341,8 @@ export class ExtHostTesting extends Disposable implements ExtHostTestingShape {
 	/**
 	 * @inheritdoc
 	 */
-	async $getCoverageDetails(coverageId: string, token: CancellationToken): Promise<CoverageDetails.Serialized[]> {
-		const details = await this.runTracker.getCoverageDetails(coverageId, token);
+	async $getCoverageDetails(coverageId: string, testId: string | undefined, token: CancellationToken): Promise<CoverageDetails.Serialized[]> {
+		const details = await this.runTracker.getCoverageDetails(coverageId, testId, token);
 		return details?.map(Convert.TestCoverage.fromDetails);
 	}
 
@@ -321,6 +399,12 @@ export class ExtHostTesting extends Disposable implements ExtHostTestingShape {
 			results
 				.map(r => {
 					const o = Convert.TestResults.to(r);
+					const taskWithCoverage = r.tasks.findIndex(t => t.hasCoverage);
+					if (taskWithCoverage !== -1) {
+						o.getDetailedCoverage = (uri, token = CancellationToken.None) =>
+							this.proxy.$getCoverageDetails(r.id, taskWithCoverage, uri, token).then(r => r.map(Convert.TestCoverage.to));
+					}
+
 					testResultInternalIDs.set(o, r.id);
 					return o;
 				})
@@ -428,11 +512,11 @@ export class ExtHostTesting extends Disposable implements ExtHostTestingShape {
 	/**
 	 * Cancels an ongoing test run.
 	 */
-	public $cancelExtensionTestRun(runId: string | undefined) {
+	public $cancelExtensionTestRun(runId: string | undefined, taskId: string | undefined) {
 		if (runId === undefined) {
 			this.runTracker.cancelAllRuns();
 		} else {
-			this.runTracker.cancelRunById(runId);
+			this.runTracker.cancelRunById(runId, taskId);
 		}
 	}
 
@@ -441,11 +525,9 @@ export class ExtHostTesting extends Disposable implements ExtHostTestingShape {
 	public getMetadataForRun(run: vscode.TestRun) {
 		for (const tracker of this.runTracker.trackers) {
 			const taskId = tracker.getTaskIdForRun(run);
-			if (!taskId) {
-				return undefined;
+			if (taskId) {
+				return { taskId, runId: tracker.id };
 			}
-
-			return { taskId, runId: tracker.id };
 		}
 
 		return undefined;
@@ -523,12 +605,12 @@ const enum TestRunTrackerState {
 class TestRunTracker extends Disposable {
 	private state = TestRunTrackerState.Running;
 	private running = 0;
-	private readonly tasks = new Map</* task ID */string, { run: vscode.TestRun }>();
+	private readonly tasks = new Map</* task ID */string, { cts: CancellationTokenSource; run: vscode.TestRun }>();
 	private readonly sharedTestIds = new Set<string>();
 	private readonly cts: CancellationTokenSource;
 	private readonly endEmitter = this._register(new Emitter<void>());
 	private readonly onDidDispose: Event<void>;
-	private readonly publishedCoverage = new Map<string, vscode.FileCoverage>();
+	private readonly publishedCoverage = new Map<string, { report: vscode.FileCoverage; extIds: string[] }>();
 
 	/**
 	 * Fires when a test ends, and no more tests are left running.
@@ -554,7 +636,7 @@ class TestRunTracker extends Disposable {
 		private readonly proxy: MainThreadTestingShape,
 		private readonly logService: ILogService,
 		private readonly profile: vscode.TestRunProfile | undefined,
-		private readonly extension: IRelaxedExtensionDescription,
+		private readonly extension: IExtensionDescription,
 		parentToken?: CancellationToken,
 	) {
 		super();
@@ -583,8 +665,10 @@ class TestRunTracker extends Disposable {
 	}
 
 	/** Requests cancellation of the run. On the second call, forces cancellation. */
-	public cancel() {
-		if (this.state === TestRunTrackerState.Running) {
+	public cancel(taskId?: string) {
+		if (taskId) {
+			this.tasks.get(taskId)?.cts.cancel();
+		} else if (this.state === TestRunTrackerState.Running) {
 			this.cts.cancel();
 			this.state = TestRunTrackerState.Cancelling;
 		} else if (this.state === TestRunTrackerState.Cancelling) {
@@ -593,19 +677,33 @@ class TestRunTracker extends Disposable {
 	}
 
 	/** Gets details for a previously-emitted coverage object. */
-	public getCoverageDetails(id: string, token: CancellationToken) {
+	public async getCoverageDetails(id: string, testId: string | undefined, token: CancellationToken): Promise<vscode.FileCoverageDetail[]> {
 		const [, taskId] = TestId.fromString(id).path; /** runId, taskId, URI */
 		const coverage = this.publishedCoverage.get(id);
 		if (!coverage) {
 			return [];
 		}
 
+		const { report, extIds } = coverage;
 		const task = this.tasks.get(taskId);
 		if (!task) {
 			throw new Error('unreachable: run task was not found');
 		}
 
-		return this.profile?.loadDetailedCoverage?.(task.run, coverage, token) ?? [];
+		let testItem: vscode.TestItem | undefined;
+		if (testId && report instanceof FileCoverage) {
+			const index = extIds.indexOf(testId);
+			if (index === -1) {
+				return []; // ??
+			}
+			testItem = report.fromTests[index];
+		}
+
+		const details = testItem
+			? this.profile?.loadDetailedCoverageForTest?.(task.run, report, testItem, token)
+			: this.profile?.loadDetailedCoverage?.(task.run, report, token);
+
+		return (await details) ?? [];
 	}
 
 	/** Creates the public test run interface to give to extensions. */
@@ -641,14 +739,15 @@ class TestRunTracker extends Disposable {
 		};
 
 		let ended = false;
+		// tasks are alive for as long as the tracker is alive, so simple this._register is fine:
+		const cts = this._register(new CancellationTokenSource(this.cts.token));
 
 		// one-off map used to associate test items with incrementing IDs in `addCoverage`.
 		// There's no need to include their entire ID, we just want to make sure they're
 		// stable and unique. Normal map is okay since TestRun lifetimes are limited.
-		const testItemCoverageId = new Map<vscode.TestItem, number>();
 		const run: vscode.TestRun = {
 			isPersisted: this.dto.isPersisted,
-			token: this.cts.token,
+			token: cts.token,
 			name,
 			onDidDispose: this.onDidDispose,
 			addCoverage: (coverage) => {
@@ -656,24 +755,21 @@ class TestRunTracker extends Disposable {
 					return;
 				}
 
-				const testItem = coverage instanceof FileCoverage ? coverage.testItem : undefined;
-				let testItemIdPart: undefined | number;
-				if (testItem) {
+				const fromTests = coverage instanceof FileCoverage ? coverage.fromTests : [];
+				if (fromTests.length) {
 					checkProposedApiEnabled(this.extension, 'attributableCoverage');
-					this.ensureTestIsKnown(testItem);
-					testItemIdPart = testItemCoverageId.get(testItem);
-					if (testItemIdPart === undefined) {
-						testItemIdPart = testItemCoverageId.size;
-						testItemCoverageId.set(testItem, testItemIdPart);
+					for (const test of fromTests) {
+						this.ensureTestIsKnown(test);
 					}
 				}
 
 				const uriStr = coverage.uri.toString();
-				const id = new TestId(testItemIdPart !== undefined
-					? [runId, taskId, uriStr, String(testItemIdPart)]
-					: [runId, taskId, uriStr],
-				).toString();
-				this.publishedCoverage.set(id, coverage);
+				const id = new TestId([runId, taskId, uriStr]).toString();
+				// it's a lil funky, but it's possible for a test item's ID to change after
+				// it's been reported if it's rehomed under a different parent. Record its
+				// ID at the time when the coverage report is generated so we can reference
+				// it later if needeed.
+				this.publishedCoverage.set(id, { report: coverage, extIds: fromTests.map(t => TestId.fromExtHostTestItem(t, ctrlId).toString()) });
 				this.proxy.$appendCoverage(runId, taskId, Convert.TestCoverage.fromFile(ctrlId, id, coverage));
 			},
 			//#region state mutation
@@ -721,7 +817,6 @@ class TestRunTracker extends Disposable {
 				}
 
 				ended = true;
-				testItemCoverageId.clear();
 				this.proxy.$finishedTestRunTask(runId, taskId);
 				if (!--this.running) {
 					this.markEnded();
@@ -730,8 +825,13 @@ class TestRunTracker extends Disposable {
 		};
 
 		this.running++;
-		this.tasks.set(taskId, { run });
-		this.proxy.$startedTestRunTask(runId, { id: taskId, name, running: true });
+		this.tasks.set(taskId, { run, cts });
+		this.proxy.$startedTestRunTask(runId, {
+			id: taskId,
+			ctrlId: this.dto.controllerId,
+			name: name || this.extension.displayName || this.extension.identifier.value,
+			running: true,
+		});
 
 		return run;
 	}
@@ -805,9 +905,9 @@ export class TestRunCoordinator {
 	/**
 	 * Gets a coverage report for a given run and task ID.
 	 */
-	public getCoverageDetails(id: string, token: vscode.CancellationToken) {
+	public getCoverageDetails(id: string, testId: string | undefined, token: vscode.CancellationToken) {
 		const runId = TestId.root(id);
-		return this.trackedById.get(runId)?.getCoverageDetails(id, token) || [];
+		return this.trackedById.get(runId)?.getCoverageDetails(id, testId, token) || [];
 	}
 
 	/**
@@ -829,15 +929,15 @@ export class TestRunCoordinator {
 	 * `$startedExtensionTestRun` is not invoked. The run must eventually
 	 * be cancelled manually.
 	 */
-	public prepareForMainThreadTestRun(extension: IRelaxedExtensionDescription, req: vscode.TestRunRequest, dto: TestRunDto, profile: vscode.TestRunProfile, token: CancellationToken) {
+	public prepareForMainThreadTestRun(extension: IExtensionDescription, req: vscode.TestRunRequest, dto: TestRunDto, profile: vscode.TestRunProfile, token: CancellationToken) {
 		return this.getTracker(req, dto, profile, extension, token);
 	}
 
 	/**
 	 * Cancels an existing test run via its cancellation token.
 	 */
-	public cancelRunById(runId: string) {
-		this.trackedById.get(runId)?.cancel();
+	public cancelRunById(runId: string, taskId?: string) {
+		this.trackedById.get(runId)?.cancel(taskId);
 	}
 
 	/**
@@ -852,7 +952,7 @@ export class TestRunCoordinator {
 	/**
 	 * Implements the public `createTestRun` API.
 	 */
-	public createTestRun(extension: IRelaxedExtensionDescription, controllerId: string, collection: ExtHostTestItemCollection, request: vscode.TestRunRequest, name: string | undefined, persist: boolean): vscode.TestRun {
+	public createTestRun(extension: IExtensionDescription, controllerId: string, collection: ExtHostTestItemCollection, request: vscode.TestRunRequest, name: string | undefined, persist: boolean): vscode.TestRun {
 		const existing = this.tracked.get(request);
 		if (existing) {
 			return existing.createRun(name);
@@ -881,7 +981,7 @@ export class TestRunCoordinator {
 		return tracker.createRun(name);
 	}
 
-	private getTracker(req: vscode.TestRunRequest, dto: TestRunDto, profile: vscode.TestRunProfile | undefined, extension: IRelaxedExtensionDescription, token?: CancellationToken) {
+	private getTracker(req: vscode.TestRunRequest, dto: TestRunDto, profile: vscode.TestRunProfile | undefined, extension: IExtensionDescription, token?: CancellationToken) {
 		const tracker = new TestRunTracker(dto, this.proxy, this.logService, profile, extension, token);
 		this.tracked.set(req, tracker);
 		this.trackedById.set(tracker.id, tracker);
diff --git a/src/vs/workbench/api/common/extHostTestingPrivateApi.ts b/src/vs/workbench/api/common/extHostTestingPrivateApi.ts
index f0870fd5a00..ea320c2a863 100644
--- a/src/vs/workbench/api/common/extHostTestingPrivateApi.ts
+++ b/src/vs/workbench/api/common/extHostTestingPrivateApi.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ExtHostTestItemEvent, InvalidTestItemError } from 'vs/workbench/contrib/testing/common/testItemCollection';
+import { ExtHostTestItemEvent, InvalidTestItemError } from '../../contrib/testing/common/testItemCollection.js';
 import * as vscode from 'vscode';
 
 export interface IExtHostTestItemApi {
diff --git a/src/vs/workbench/api/common/extHostTextEditor.ts b/src/vs/workbench/api/common/extHostTextEditor.ts
index 44ed8f3804f..cba39eb86b5 100644
--- a/src/vs/workbench/api/common/extHostTextEditor.ts
+++ b/src/vs/workbench/api/common/extHostTextEditor.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ok } from 'vs/base/common/assert';
-import { ReadonlyError, illegalArgument } from 'vs/base/common/errors';
-import { IdGenerator } from 'vs/base/common/idGenerator';
-import { TextEditorCursorStyle } from 'vs/editor/common/config/editorOptions';
-import { IRange } from 'vs/editor/common/core/range';
-import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { IResolvedTextEditorConfiguration, ITextEditorConfigurationUpdate, MainThreadTextEditorsShape } from 'vs/workbench/api/common/extHost.protocol';
-import * as TypeConverters from 'vs/workbench/api/common/extHostTypeConverters';
-import { EndOfLine, Position, Range, Selection, SnippetString, TextEditorLineNumbersStyle, TextEditorRevealType } from 'vs/workbench/api/common/extHostTypes';
+import { ok } from '../../../base/common/assert.js';
+import { ReadonlyError, illegalArgument } from '../../../base/common/errors.js';
+import { IdGenerator } from '../../../base/common/idGenerator.js';
+import { TextEditorCursorStyle } from '../../../editor/common/config/editorOptions.js';
+import { IRange } from '../../../editor/common/core/range.js';
+import { ISingleEditOperation } from '../../../editor/common/core/editOperation.js';
+import { IResolvedTextEditorConfiguration, ITextEditorConfigurationUpdate, MainThreadTextEditorsShape } from './extHost.protocol.js';
+import * as TypeConverters from './extHostTypeConverters.js';
+import { EndOfLine, Position, Range, Selection, SnippetString, TextEditorLineNumbersStyle, TextEditorRevealType } from './extHostTypes.js';
 import type * as vscode from 'vscode';
-import { ILogService } from 'vs/platform/log/common/log';
-import { Lazy } from 'vs/base/common/lazy';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { Lazy } from '../../../base/common/lazy.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
 
 export class TextEditorDecorationType {
 
@@ -566,6 +566,9 @@ export class ExtHostTextEditor {
 			},
 			hide() {
 				_proxy.$tryHideEditor(id);
+			},
+			[Symbol.for('debug.description')]() {
+				return `TextEditor(${this.document.uri.toString()})`;
 			}
 		});
 	}
diff --git a/src/vs/workbench/api/common/extHostTextEditors.ts b/src/vs/workbench/api/common/extHostTextEditors.ts
index 277422f9acb..178c6c5bea9 100644
--- a/src/vs/workbench/api/common/extHostTextEditors.ts
+++ b/src/vs/workbench/api/common/extHostTextEditors.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as arrays from 'vs/base/common/arrays';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { ExtHostEditorsShape, IEditorPropertiesChangeData, IMainContext, ITextDocumentShowOptions, ITextEditorPositionData, MainContext, MainThreadTextEditorsShape } from 'vs/workbench/api/common/extHost.protocol';
-import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
-import { ExtHostTextEditor, TextEditorDecorationType } from 'vs/workbench/api/common/extHostTextEditor';
-import * as TypeConverters from 'vs/workbench/api/common/extHostTypeConverters';
-import { TextEditorSelectionChangeKind } from 'vs/workbench/api/common/extHostTypes';
+import * as arrays from '../../../base/common/arrays.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { ExtHostEditorsShape, IEditorPropertiesChangeData, IMainContext, ITextDocumentShowOptions, ITextEditorPositionData, MainContext, MainThreadTextEditorsShape } from './extHost.protocol.js';
+import { ExtHostDocumentsAndEditors } from './extHostDocumentsAndEditors.js';
+import { ExtHostTextEditor, TextEditorDecorationType } from './extHostTextEditor.js';
+import * as TypeConverters from './extHostTypeConverters.js';
+import { TextEditorSelectionChangeKind } from './extHostTypes.js';
 import * as vscode from 'vscode';
 
 export class ExtHostEditors extends Disposable implements ExtHostEditorsShape {
diff --git a/src/vs/workbench/api/common/extHostTheming.ts b/src/vs/workbench/api/common/extHostTheming.ts
index 1bcb3cad0b7..0f512fcf0e7 100644
--- a/src/vs/workbench/api/common/extHostTheming.ts
+++ b/src/vs/workbench/api/common/extHostTheming.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ColorTheme, ColorThemeKind } from './extHostTypes';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import { ExtHostThemingShape } from 'vs/workbench/api/common/extHost.protocol';
-import { Emitter, Event } from 'vs/base/common/event';
+import { ColorTheme, ColorThemeKind } from './extHostTypes.js';
+import { IExtHostRpcService } from './extHostRpcService.js';
+import { ExtHostThemingShape } from './extHost.protocol.js';
+import { Emitter, Event } from '../../../base/common/event.js';
 
 export class ExtHostTheming implements ExtHostThemingShape {
 
diff --git a/src/vs/workbench/api/common/extHostTimeline.ts b/src/vs/workbench/api/common/extHostTimeline.ts
index f769766f5e4..4bfa096c1ce 100644
--- a/src/vs/workbench/api/common/extHostTimeline.ts
+++ b/src/vs/workbench/api/common/extHostTimeline.ts
@@ -4,18 +4,18 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { UriComponents, URI } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ExtHostTimelineShape, MainThreadTimelineShape, IMainContext, MainContext } from 'vs/workbench/api/common/extHost.protocol';
-import { Timeline, TimelineItem, TimelineOptions, TimelineProvider } from 'vs/workbench/contrib/timeline/common/timeline';
-import { IDisposable, toDisposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { CommandsConverter, ExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
-import { ThemeIcon, MarkdownString as MarkdownStringType } from 'vs/workbench/api/common/extHostTypes';
-import { MarkdownString } from 'vs/workbench/api/common/extHostTypeConverters';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { MarshalledId } from 'vs/base/common/marshallingIds';
-import { isString } from 'vs/base/common/types';
+import { UriComponents, URI } from '../../../base/common/uri.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { ExtHostTimelineShape, MainThreadTimelineShape, IMainContext, MainContext } from './extHost.protocol.js';
+import { Timeline, TimelineItem, TimelineOptions, TimelineProvider } from '../../contrib/timeline/common/timeline.js';
+import { IDisposable, toDisposable, DisposableStore } from '../../../base/common/lifecycle.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { CommandsConverter, ExtHostCommands } from './extHostCommands.js';
+import { ThemeIcon, MarkdownString as MarkdownStringType } from './extHostTypes.js';
+import { MarkdownString } from './extHostTypeConverters.js';
+import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
+import { MarshalledId } from '../../../base/common/marshallingIds.js';
+import { isString } from '../../../base/common/types.js';
 
 export interface IExtHostTimeline extends ExtHostTimelineShape {
 	readonly _serviceBrand: undefined;
diff --git a/src/vs/workbench/api/common/extHostTreeViews.ts b/src/vs/workbench/api/common/extHostTreeViews.ts
index ba5e9aa7c50..d3c2aae3c12 100644
--- a/src/vs/workbench/api/common/extHostTreeViews.ts
+++ b/src/vs/workbench/api/common/extHostTreeViews.ts
@@ -3,27 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
+import { localize } from '../../../nls.js';
 import type * as vscode from 'vscode';
-import { basename } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { CheckboxUpdate, DataTransferDTO, ExtHostTreeViewsShape, MainThreadTreeViewsShape } from './extHost.protocol';
-import { ITreeItem, TreeViewItemHandleArg, ITreeItemLabel, IRevealOptions, TreeCommand, TreeViewPaneHandleArg, ITreeItemCheckboxState, NoTreeViewError } from 'vs/workbench/common/views';
-import { ExtHostCommands, CommandsConverter } from 'vs/workbench/api/common/extHostCommands';
-import { asPromise } from 'vs/base/common/async';
-import * as extHostTypes from 'vs/workbench/api/common/extHostTypes';
-import { isUndefinedOrNull, isString } from 'vs/base/common/types';
-import { equals, coalesce } from 'vs/base/common/arrays';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { MarkdownString, ViewBadge, DataTransfer } from 'vs/workbench/api/common/extHostTypeConverters';
-import { IMarkdownString, isMarkdownString } from 'vs/base/common/htmlContent';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { ITreeViewsDnDService, TreeViewsDnDService } from 'vs/editor/common/services/treeViewsDnd';
-import { IAccessibilityInformation } from 'vs/platform/accessibility/common/accessibility';
-import { checkProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
+import { basename } from '../../../base/common/resources.js';
+import { URI } from '../../../base/common/uri.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../base/common/lifecycle.js';
+import { CheckboxUpdate, DataTransferDTO, ExtHostTreeViewsShape, MainThreadTreeViewsShape } from './extHost.protocol.js';
+import { ITreeItem, TreeViewItemHandleArg, ITreeItemLabel, IRevealOptions, TreeCommand, TreeViewPaneHandleArg, ITreeItemCheckboxState, NoTreeViewError } from '../../common/views.js';
+import { ExtHostCommands, CommandsConverter } from './extHostCommands.js';
+import { asPromise } from '../../../base/common/async.js';
+import * as extHostTypes from './extHostTypes.js';
+import { isUndefinedOrNull, isString } from '../../../base/common/types.js';
+import { equals, coalesce } from '../../../base/common/arrays.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { MarkdownString, ViewBadge, DataTransfer } from './extHostTypeConverters.js';
+import { IMarkdownString, isMarkdownString } from '../../../base/common/htmlContent.js';
+import { CancellationToken, CancellationTokenSource } from '../../../base/common/cancellation.js';
+import { ITreeViewsDnDService, TreeViewsDnDService } from '../../../editor/common/services/treeViewsDnd.js';
+import { IAccessibilityInformation } from '../../../platform/accessibility/common/accessibility.js';
+import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 
 type TreeItemHandle = string;
 
diff --git a/src/vs/workbench/api/common/extHostTunnelService.ts b/src/vs/workbench/api/common/extHostTunnelService.ts
index 650b852e1e4..17d8417ea55 100644
--- a/src/vs/workbench/api/common/extHostTunnelService.ts
+++ b/src/vs/workbench/api/common/extHostTunnelService.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import * as nls from 'vs/nls';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { DisposableTunnel, ProvidedOnAutoForward, ProvidedPortAttributes, RemoteTunnel, TunnelCreationOptions, TunnelOptions, TunnelPrivacyId } from 'vs/platform/tunnel/common/tunnel';
-import { ExtHostTunnelServiceShape, MainContext, MainThreadTunnelServiceShape, PortAttributesSelector, TunnelDto } from 'vs/workbench/api/common/extHost.protocol';
-import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import * as types from 'vs/workbench/api/common/extHostTypes';
-import { CandidatePort } from 'vs/workbench/services/remote/common/tunnelModel';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Emitter } from '../../../base/common/event.js';
+import { Disposable, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import * as nls from '../../../nls.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { DisposableTunnel, ProvidedOnAutoForward, ProvidedPortAttributes, RemoteTunnel, TunnelCreationOptions, TunnelOptions, TunnelPrivacyId } from '../../../platform/tunnel/common/tunnel.js';
+import { ExtHostTunnelServiceShape, MainContext, MainThreadTunnelServiceShape, PortAttributesSelector, TunnelDto } from './extHost.protocol.js';
+import { IExtHostInitDataService } from './extHostInitDataService.js';
+import { IExtHostRpcService } from './extHostRpcService.js';
+import * as types from './extHostTypes.js';
+import { CandidatePort } from '../../services/remote/common/tunnelModel.js';
 import * as vscode from 'vscode';
 
 class ExtensionTunnel extends DisposableTunnel implements vscode.Tunnel { }
@@ -162,10 +162,10 @@ export class ExtHostTunnelService extends Disposable implements IExtHostTunnelSe
 			protocol: information.tunnelFeatures.protocol === undefined ? true : information.tunnelFeatures.protocol,
 		} : undefined;
 
-		this._proxy.$setTunnelProvider(tunnelFeatures);
+		this._proxy.$setTunnelProvider(tunnelFeatures, true);
 		return Promise.resolve(toDisposable(() => {
 			this._forwardPortProvider = undefined;
-			this._proxy.$setTunnelProvider(undefined);
+			this._proxy.$setTunnelProvider(undefined, false);
 		}));
 	}
 
@@ -214,7 +214,7 @@ export class ExtHostTunnelService extends Disposable implements IExtHostTunnelSe
 					protocol: true
 				} : undefined;
 
-				this._proxy.$setTunnelProvider(tunnelFeatures);
+				this._proxy.$setTunnelProvider(tunnelFeatures, !!provider.tunnelFactory);
 			}
 		} else {
 			this._forwardPortProvider = undefined;
diff --git a/src/vs/workbench/api/common/extHostTypeConverters.ts b/src/vs/workbench/api/common/extHostTypeConverters.ts
index 8ab0c30c428..14f182efbe1 100644
--- a/src/vs/workbench/api/common/extHostTypeConverters.ts
+++ b/src/vs/workbench/api/common/extHostTypeConverters.ts
@@ -3,56 +3,57 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { asArray, coalesce, isNonEmptyArray } from 'vs/base/common/arrays';
-import { VSBuffer, encodeBase64 } from 'vs/base/common/buffer';
-import { IDataTransferFile, IDataTransferItem, UriList } from 'vs/base/common/dataTransfer';
-import { createSingleCallFunction } from 'vs/base/common/functional';
-import * as htmlContent from 'vs/base/common/htmlContent';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ResourceMap, ResourceSet } from 'vs/base/common/map';
-import { marked } from 'vs/base/common/marked/marked';
-import { parse, revive } from 'vs/base/common/marshalling';
-import { Mimes } from 'vs/base/common/mime';
-import { cloneAndChange } from 'vs/base/common/objects';
-import { IPrefixTreeNode, WellDefinedPrefixTree } from 'vs/base/common/prefixTree';
-import { basename } from 'vs/base/common/resources';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { isDefined, isEmptyObject, isNumber, isString, isUndefinedOrNull } from 'vs/base/common/types';
-import { URI, UriComponents, isUriComponents } from 'vs/base/common/uri';
-import { IURITransformer } from 'vs/base/common/uriIpc';
-import { RenderLineNumbersType } from 'vs/editor/common/config/editorOptions';
-import { IPosition } from 'vs/editor/common/core/position';
-import * as editorRange from 'vs/editor/common/core/range';
-import { ISelection } from 'vs/editor/common/core/selection';
-import { IContentDecorationRenderOptions, IDecorationOptions, IDecorationRenderOptions, IThemeDecorationRenderOptions } from 'vs/editor/common/editorCommon';
-import * as encodedTokenAttributes from 'vs/editor/common/encodedTokenAttributes';
-import * as languageSelector from 'vs/editor/common/languageSelector';
-import * as languages from 'vs/editor/common/languages';
-import { EndOfLineSequence, TrackedRangeStickiness } from 'vs/editor/common/model';
-import { ITextEditorOptions } from 'vs/platform/editor/common/editor';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { IMarkerData, IRelatedInformation, MarkerSeverity, MarkerTag } from 'vs/platform/markers/common/markers';
-import { ProgressLocation as MainProgressLocation } from 'vs/platform/progress/common/progress';
-import * as extHostProtocol from 'vs/workbench/api/common/extHost.protocol';
-import { CommandsConverter } from 'vs/workbench/api/common/extHostCommands';
-import { getPrivateApiFor } from 'vs/workbench/api/common/extHostTestingPrivateApi';
-import { DEFAULT_EDITOR_ASSOCIATION, SaveReason } from 'vs/workbench/common/editor';
-import { IViewBadge } from 'vs/workbench/common/views';
-import { ChatAgentLocation, IChatAgentRequest, IChatAgentResult } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { IChatRequestVariableEntry } from 'vs/workbench/contrib/chat/common/chatModel';
-import { IChatAgentDetection, IChatAgentMarkdownContentWithVulnerability, IChatCommandButton, IChatConfirmation, IChatContentInlineReference, IChatContentReference, IChatFollowup, IChatMarkdownContent, IChatProgressMessage, IChatTaskDto, IChatTaskResult, IChatTextEdit, IChatTreeData, IChatUserActionEvent, IChatWarningMessage } from 'vs/workbench/contrib/chat/common/chatService';
-import * as chatProvider from 'vs/workbench/contrib/chat/common/languageModels';
-import { DebugTreeItemCollapsibleState, IDebugVisualizationTreeItem } from 'vs/workbench/contrib/debug/common/debug';
-import * as notebooks from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
-import * as search from 'vs/workbench/contrib/search/common/search';
-import { TestId } from 'vs/workbench/contrib/testing/common/testId';
-import { CoverageDetails, DetailType, ICoverageCount, IFileCoverage, ISerializedTestResults, ITestErrorMessage, ITestItem, ITestTag, TestMessageType, TestResultItem, denamespaceTestTag, namespaceTestTag } from 'vs/workbench/contrib/testing/common/testTypes';
-import { EditorGroupColumn } from 'vs/workbench/services/editor/common/editorGroupColumn';
-import { ACTIVE_GROUP, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { Dto } from 'vs/workbench/services/extensions/common/proxyIdentifier';
 import type * as vscode from 'vscode';
-import * as types from './extHostTypes';
+import { asArray, coalesce, isNonEmptyArray } from '../../../base/common/arrays.js';
+import { VSBuffer, encodeBase64 } from '../../../base/common/buffer.js';
+import { IDataTransferFile, IDataTransferItem, UriList } from '../../../base/common/dataTransfer.js';
+import { createSingleCallFunction } from '../../../base/common/functional.js';
+import * as htmlContent from '../../../base/common/htmlContent.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { ResourceMap, ResourceSet } from '../../../base/common/map.js';
+import * as marked from '../../../base/common/marked/marked.js';
+import { parse, revive } from '../../../base/common/marshalling.js';
+import { Mimes } from '../../../base/common/mime.js';
+import { cloneAndChange } from '../../../base/common/objects.js';
+import { IPrefixTreeNode, WellDefinedPrefixTree } from '../../../base/common/prefixTree.js';
+import { basename } from '../../../base/common/resources.js';
+import { ThemeIcon } from '../../../base/common/themables.js';
+import { isDefined, isEmptyObject, isNumber, isString, isUndefinedOrNull } from '../../../base/common/types.js';
+import { URI, UriComponents, isUriComponents } from '../../../base/common/uri.js';
+import { IURITransformer } from '../../../base/common/uriIpc.js';
+import { RenderLineNumbersType } from '../../../editor/common/config/editorOptions.js';
+import { IPosition } from '../../../editor/common/core/position.js';
+import * as editorRange from '../../../editor/common/core/range.js';
+import { ISelection } from '../../../editor/common/core/selection.js';
+import { IContentDecorationRenderOptions, IDecorationOptions, IDecorationRenderOptions, IThemeDecorationRenderOptions } from '../../../editor/common/editorCommon.js';
+import * as encodedTokenAttributes from '../../../editor/common/encodedTokenAttributes.js';
+import * as languageSelector from '../../../editor/common/languageSelector.js';
+import * as languages from '../../../editor/common/languages.js';
+import { EndOfLineSequence, TrackedRangeStickiness } from '../../../editor/common/model.js';
+import { ITextEditorOptions } from '../../../platform/editor/common/editor.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { IMarkerData, IRelatedInformation, MarkerSeverity, MarkerTag } from '../../../platform/markers/common/markers.js';
+import { ProgressLocation as MainProgressLocation } from '../../../platform/progress/common/progress.js';
+import { DEFAULT_EDITOR_ASSOCIATION, SaveReason } from '../../common/editor.js';
+import { IViewBadge } from '../../common/views.js';
+import { ChatAgentLocation, IChatAgentRequest, IChatAgentResult } from '../../contrib/chat/common/chatAgents.js';
+import { IChatRequestVariableEntry } from '../../contrib/chat/common/chatModel.js';
+import { IChatAgentDetection, IChatAgentMarkdownContentWithVulnerability, IChatCodeCitation, IChatCommandButton, IChatConfirmation, IChatContentInlineReference, IChatContentReference, IChatFollowup, IChatMarkdownContent, IChatMoveMessage, IChatProgressMessage, IChatResponseCodeblockUriPart, IChatTaskDto, IChatTaskResult, IChatTextEdit, IChatTreeData, IChatUserActionEvent, IChatWarningMessage } from '../../contrib/chat/common/chatService.js';
+import { IToolData } from '../../contrib/chat/common/languageModelToolsService.js';
+import * as chatProvider from '../../contrib/chat/common/languageModels.js';
+import { DebugTreeItemCollapsibleState, IDebugVisualizationTreeItem } from '../../contrib/debug/common/debug.js';
+import * as notebooks from '../../contrib/notebook/common/notebookCommon.js';
+import { ICellRange } from '../../contrib/notebook/common/notebookRange.js';
+import * as search from '../../contrib/search/common/search.js';
+import { TestId } from '../../contrib/testing/common/testId.js';
+import { CoverageDetails, DetailType, ICoverageCount, IFileCoverage, ISerializedTestResults, ITestErrorMessage, ITestItem, ITestTag, TestMessageType, TestResultItem, denamespaceTestTag, namespaceTestTag } from '../../contrib/testing/common/testTypes.js';
+import { EditorGroupColumn } from '../../services/editor/common/editorGroupColumn.js';
+import { ACTIVE_GROUP, SIDE_GROUP } from '../../services/editor/common/editorService.js';
+import { Dto } from '../../services/extensions/common/proxyIdentifier.js';
+import * as extHostProtocol from './extHost.protocol.js';
+import { CommandsConverter } from './extHostCommands.js';
+import { getPrivateApiFor } from './extHostTestingPrivateApi.js';
+import * as types from './extHostTypes.js';
 
 export namespace Command {
 
@@ -366,7 +367,7 @@ export namespace MarkdownString {
 		const resUris: { [href: string]: UriComponents } = Object.create(null);
 		res.uris = resUris;
 
-		const collectUri = (href: string): string => {
+		const collectUri = ({ href }: { href: string }): string => {
 			try {
 				let uri = URI.parse(href, true);
 				uri = uri.with({ query: _uriMassage(uri.query, resUris) });
@@ -376,11 +377,16 @@ export namespace MarkdownString {
 			}
 			return '';
 		};
-		const renderer = new marked.Renderer();
-		renderer.link = collectUri;
-		renderer.image = href => typeof href === 'string' ? collectUri(htmlContent.parseHrefAndDimensions(href).href) : '';
 
-		marked(res.value, { renderer });
+		marked.marked.walkTokens(marked.marked.lexer(res.value), token => {
+			if (token.type === 'link') {
+				collectUri({ href: token.href });
+			} else if (token.type === 'image') {
+				if (typeof token.href === 'string') {
+					collectUri(htmlContent.parseHrefAndDimensions(token.href));
+				}
+			}
+		});
 
 		return res;
 	}
@@ -786,7 +792,7 @@ export namespace SymbolTag {
 
 export namespace WorkspaceSymbol {
 	export function from(info: vscode.SymbolInformation): search.IWorkspaceSymbol {
-		return <search.IWorkspaceSymbol>{
+		return {
 			name: info.name,
 			kind: SymbolKind.from(info.kind),
 			tags: info.tags && info.tags.map(SymbolTag.from),
@@ -965,7 +971,7 @@ export namespace Hover {
 
 export namespace EvaluatableExpression {
 	export function from(expression: vscode.EvaluatableExpression): languages.EvaluatableExpression {
-		return <languages.EvaluatableExpression>{
+		return {
 			range: Range.from(expression.range),
 			expression: expression.expression
 		};
@@ -979,24 +985,24 @@ export namespace EvaluatableExpression {
 export namespace InlineValue {
 	export function from(inlineValue: vscode.InlineValue): languages.InlineValue {
 		if (inlineValue instanceof types.InlineValueText) {
-			return <languages.InlineValueText>{
+			return {
 				type: 'text',
 				range: Range.from(inlineValue.range),
 				text: inlineValue.text
-			};
+			} satisfies languages.InlineValueText;
 		} else if (inlineValue instanceof types.InlineValueVariableLookup) {
-			return <languages.InlineValueVariableLookup>{
+			return {
 				type: 'variable',
 				range: Range.from(inlineValue.range),
 				variableName: inlineValue.variableName,
 				caseSensitiveLookup: inlineValue.caseSensitiveLookup
-			};
+			} satisfies languages.InlineValueVariableLookup;
 		} else if (inlineValue instanceof types.InlineValueEvaluatableExpression) {
-			return <languages.InlineValueExpression>{
+			return {
 				type: 'expression',
 				range: Range.from(inlineValue.range),
 				expression: inlineValue.expression
-			};
+			} satisfies languages.InlineValueExpression;
 		} else {
 			throw new Error(`Unknown 'InlineValue' type`);
 		}
@@ -1005,28 +1011,28 @@ export namespace InlineValue {
 	export function to(inlineValue: languages.InlineValue): vscode.InlineValue {
 		switch (inlineValue.type) {
 			case 'text':
-				return <vscode.InlineValueText>{
+				return {
 					range: Range.to(inlineValue.range),
 					text: inlineValue.text
-				};
+				} satisfies vscode.InlineValueText;
 			case 'variable':
-				return <vscode.InlineValueVariableLookup>{
+				return {
 					range: Range.to(inlineValue.range),
 					variableName: inlineValue.variableName,
 					caseSensitiveLookup: inlineValue.caseSensitiveLookup
-				};
+				} satisfies vscode.InlineValueVariableLookup;
 			case 'expression':
-				return <vscode.InlineValueEvaluatableExpression>{
+				return {
 					range: Range.to(inlineValue.range),
 					expression: inlineValue.expression
-				};
+				} satisfies vscode.InlineValueEvaluatableExpression;
 		}
 	}
 }
 
 export namespace InlineValueContext {
 	export function from(inlineValueContext: vscode.InlineValueContext): extHostProtocol.IInlineValueContextDto {
-		return <extHostProtocol.IInlineValueContextDto>{
+		return {
 			frameId: inlineValueContext.frameId,
 			stoppedLocation: Range.from(inlineValueContext.stoppedLocation)
 		};
@@ -1617,27 +1623,60 @@ export namespace MappedEditsContext {
 			!!v && typeof v === 'object' &&
 			'documents' in v &&
 			Array.isArray(v.documents) &&
-			v.documents.every(subArr =>
-				Array.isArray(subArr) &&
-				subArr.every(docRef =>
-					docRef && typeof docRef === 'object' &&
-					'uri' in docRef && URI.isUri(docRef.uri) &&
-					'version' in docRef && typeof docRef.version === 'number' &&
-					'ranges' in docRef && Array.isArray(docRef.ranges) && docRef.ranges.every((r: unknown) => r instanceof types.Range)
-				)
-			)
+			v.documents.every(
+				subArr => Array.isArray(subArr) &&
+					subArr.every(DocumentContextItem.is))
 		);
 	}
 
-	export function from(extContext: vscode.MappedEditsContext): languages.MappedEditsContext {
+	export function from(extContext: vscode.MappedEditsContext): Dto<languages.MappedEditsContext> {
 		return {
 			documents: extContext.documents.map((subArray) =>
-				subArray.map((r) => ({
-					uri: URI.from(r.uri),
-					version: r.version,
-					ranges: r.ranges.map((r) => Range.from(r)),
-				}))
+				subArray.map(DocumentContextItem.from)
 			),
+			conversation: extContext.conversation?.map(item => (
+				(item.type === 'request') ?
+					{
+						type: 'request',
+						message: item.message,
+					} :
+					{
+						type: 'response',
+						message: item.message,
+						result: item.result ? ChatAgentResult.from(item.result) : undefined,
+						references: item.references?.map(DocumentContextItem.from)
+					}
+			))
+		};
+
+	}
+}
+
+export namespace DocumentContextItem {
+
+	export function is(item: unknown): item is vscode.DocumentContextItem {
+		return (
+			typeof item === 'object' &&
+			item !== null &&
+			'uri' in item && URI.isUri(item.uri) &&
+			'version' in item && typeof item.version === 'number' &&
+			'ranges' in item && Array.isArray(item.ranges) && item.ranges.every((r: unknown) => r instanceof types.Range)
+		);
+	}
+
+	export function from(item: vscode.DocumentContextItem): Dto<languages.DocumentContextItem> {
+		return {
+			uri: item.uri,
+			version: item.version,
+			ranges: item.ranges.map(r => Range.from(r)),
+		};
+	}
+
+	export function to(item: Dto<languages.DocumentContextItem>): vscode.DocumentContextItem {
+		return {
+			uri: URI.revive(item.uri),
+			version: item.version,
+			ranges: item.ranges.map(r => Range.to(r)),
 		};
 	}
 }
@@ -1887,6 +1926,11 @@ export namespace TestMessage {
 			actual: message.actualOutput,
 			contextValue: message.contextValue,
 			location: message.location && ({ range: Range.from(message.location.range), uri: message.location.uri }),
+			stackTrace: message.stackTrace?.map(s => ({
+				label: s.label,
+				position: s.position && Position.from(s.position),
+				uri: s.uri && URI.revive(s.uri).toJSON(),
+			})),
 		};
 	}
 
@@ -2030,6 +2074,43 @@ export namespace TestCoverage {
 		return 'line' in location ? Position.from(location) : Range.from(location);
 	}
 
+	function toLocation(location: IPosition | editorRange.IRange): types.Position | types.Range;
+	function toLocation(location: IPosition | editorRange.IRange | undefined): types.Position | types.Range | undefined;
+	function toLocation(location: IPosition | editorRange.IRange | undefined): types.Position | types.Range | undefined {
+		if (!location) { return undefined; }
+		return 'endLineNumber' in location ? Range.to(location) : Position.to(location);
+	}
+
+	export function to(serialized: CoverageDetails.Serialized): vscode.FileCoverageDetail {
+		if (serialized.type === DetailType.Statement) {
+			const branches: vscode.BranchCoverage[] = [];
+			if (serialized.branches) {
+				for (const branch of serialized.branches) {
+					branches.push({
+						executed: branch.count,
+						location: toLocation(branch.location),
+						label: branch.label
+					});
+				}
+			}
+			return new types.StatementCoverage(
+				serialized.count,
+				toLocation(serialized.location),
+				serialized.branches?.map(b => new types.BranchCoverage(
+					b.count,
+					toLocation(b.location)!,
+					b.label,
+				))
+			);
+		} else {
+			return new types.DeclarationCoverage(
+				serialized.name,
+				serialized.count,
+				toLocation(serialized.location),
+			);
+		}
+	}
+
 	export function fromDetails(coverage: vscode.FileCoverageDetail): CoverageDetails.Serialized {
 		if (typeof coverage.executed === 'number' && coverage.executed < 0) {
 			throw new Error(`Invalid coverage count ${coverage.executed}`);
@@ -2065,8 +2146,8 @@ export namespace TestCoverage {
 			statement: fromCoverageCount(coverage.statementCoverage),
 			branch: coverage.branchCoverage && fromCoverageCount(coverage.branchCoverage),
 			declaration: coverage.declarationCoverage && fromCoverageCount(coverage.declarationCoverage),
-			testId: coverage instanceof types.FileCoverage && coverage.testItem ?
-				TestId.fromExtHostTestItem(coverage.testItem, controllerId).toString() : undefined,
+			testIds: coverage instanceof types.FileCoverage && coverage.fromTests.length ?
+				coverage.fromTests.map(t => TestId.fromExtHostTestItem(t, controllerId).toString()) : undefined,
 		};
 	}
 }
@@ -2265,18 +2346,19 @@ export namespace LanguageModelChatMessageRole {
 export namespace LanguageModelChatMessage {
 
 	export function to(message: chatProvider.IChatMessage): vscode.LanguageModelChatMessage {
-		let content: string = '';
-		let content2: vscode.LanguageModelChatMessageFunctionResultPart | undefined;
-		if (message.content.type === 'text') {
-			content = message.content.value;
-		} else {
-			content2 = new types.LanguageModelFunctionResultPart(message.content.name, message.content.value, message.content.isError);
-		}
+		const content2 = message.content.map(c => {
+			if (c.type === 'text') {
+				return c.value;
+			} else if (c.type === 'tool_result') {
+				return new types.LanguageModelToolResultPart(c.toolCallId, c.value, c.isError);
+			} else {
+				return new types.LanguageModelToolCallPart(c.name, c.toolCallId, c.parameters);
+			}
+		});
+		const content = content2.find(c => typeof c === 'string') ?? '';
 		const role = LanguageModelChatMessageRole.to(message.role);
 		const result = new types.LanguageModelChatMessage(role, content, message.name);
-		if (content2 !== undefined) {
-			result.content2 = content2;
-		}
+		result.content2 = content2;
 		return result;
 	}
 
@@ -2285,21 +2367,32 @@ export namespace LanguageModelChatMessage {
 		const role = LanguageModelChatMessageRole.from(message.role);
 		const name = message.name;
 
-		let content: chatProvider.IChatMessagePart;
+		const content = message.content2.map((c): chatProvider.IChatMessagePart => {
+			if (c instanceof types.LanguageModelToolResultPart) {
+				return {
+					type: 'tool_result',
+					toolCallId: c.toolCallId,
+					value: c.content,
+					isError: c.isError
+				};
+			} else if (c instanceof types.LanguageModelToolCallPart) {
+				return {
+					type: 'tool_use',
+					toolCallId: c.toolCallId,
+					name: c.name,
+					parameters: c.parameters
+				};
+			} else {
+				if (typeof c !== 'string') {
+					throw new Error('Unexpected chat message content type');
+				}
 
-		if (message.content2 instanceof types.LanguageModelFunctionResultPart) {
-			content = {
-				type: 'function_result',
-				name: message.content2.name,
-				value: message.content2.content,
-				isError: message.content2.isError
-			};
-		} else {
-			content = {
-				type: 'text',
-				value: message.content
-			};
-		}
+				return {
+					type: 'text',
+					value: c
+				};
+			}
+		});
 
 		return {
 			role,
@@ -2321,6 +2414,18 @@ export namespace ChatResponseMarkdownPart {
 	}
 }
 
+export namespace ChatResponseCodeblockUriPart {
+	export function from(part: vscode.ChatResponseCodeblockUriPart): Dto<IChatResponseCodeblockUriPart> {
+		return {
+			kind: 'codeblockUri',
+			uri: part.value,
+		};
+	}
+	export function to(part: Dto<IChatResponseCodeblockUriPart>): vscode.ChatResponseCodeblockUriPart {
+		return new types.ChatResponseCodeblockUriPart(URI.revive(part.uri));
+	}
+}
+
 export namespace ChatResponseMarkdownWithVulnerabilitiesPart {
 	export function from(part: vscode.ChatResponseMarkdownWithVulnerabilitiesPart): Dto<IChatAgentMarkdownContentWithVulnerability> {
 		return {
@@ -2353,7 +2458,8 @@ export namespace ChatResponseConfirmationPart {
 			kind: 'confirmation',
 			title: part.title,
 			message: part.message,
-			data: part.data
+			data: part.data,
+			buttons: part.buttons
 		};
 	}
 }
@@ -2401,18 +2507,27 @@ export namespace ChatResponseAnchorPart {
 	export function from(part: vscode.ChatResponseAnchorPart): Dto<IChatContentInlineReference> {
 		// Work around type-narrowing confusion between vscode.Uri and URI
 		const isUri = (thing: unknown): thing is vscode.Uri => URI.isUri(thing);
+		const isSymbolInformation = (x: any): x is vscode.SymbolInformation => x instanceof types.SymbolInformation;
 
 		return {
 			kind: 'inlineReference',
 			name: part.title,
-			inlineReference: isUri(part.value) ? part.value : Location.from(part.value)
+			inlineReference: isUri(part.value)
+				? part.value
+				: isSymbolInformation(part.value)
+					? WorkspaceSymbol.from(part.value)
+					: Location.from(part.value)
 		};
 	}
 
 	export function to(part: Dto<IChatContentInlineReference>): vscode.ChatResponseAnchorPart {
 		const value = revive<IChatContentInlineReference>(part);
 		return new types.ChatResponseAnchorPart(
-			URI.isUri(value.inlineReference) ? value.inlineReference : Location.to(value.inlineReference),
+			URI.isUri(value.inlineReference)
+				? value.inlineReference
+				: 'location' in value.inlineReference
+					? WorkspaceSymbol.to(value.inlineReference) as vscode.SymbolInformation
+					: Location.to(value.inlineReference),
 			part.name
 		);
 	}
@@ -2442,6 +2557,19 @@ export namespace ChatResponseWarningPart {
 	}
 }
 
+export namespace ChatResponseMovePart {
+	export function from(part: vscode.ChatResponseMovePart): Dto<IChatMoveMessage> {
+		return {
+			kind: 'move',
+			uri: part.uri,
+			range: Range.from(part.range),
+		};
+	}
+	export function to(part: Dto<IChatMoveMessage>): vscode.ChatResponseMovePart {
+		return new types.ChatResponseMovePart(URI.revive(part.uri), Range.to(part.range));
+	}
+}
+
 export namespace ChatTask {
 	export function from(part: vscode.ChatResponseProgressPart2): IChatTaskDto {
 		return {
@@ -2495,7 +2623,8 @@ export namespace ChatResponseReferencePart {
 			: URI.isUri(part.iconPath) ? { light: URI.revive(part.iconPath) }
 				: (part.iconPath && 'light' in part.iconPath && 'dark' in part.iconPath && URI.isUri(part.iconPath.light) && URI.isUri(part.iconPath.dark) ? { light: URI.revive(part.iconPath.light), dark: URI.revive(part.iconPath.dark) }
 					: undefined);
-		if ('variableName' in part.value) {
+
+		if (typeof part.value === 'object' && 'variableName' in part.value) {
 			return {
 				kind: 'reference',
 				reference: {
@@ -2504,16 +2633,18 @@ export namespace ChatResponseReferencePart {
 						part.value.value :
 						Location.from(part.value.value as vscode.Location)
 				},
-				iconPath
+				iconPath,
+				options: part.options
 			};
 		}
 
 		return {
 			kind: 'reference',
-			reference: URI.isUri(part.value) ?
+			reference: URI.isUri(part.value) || typeof part.value === 'string' ?
 				part.value :
 				Location.from(<vscode.Location>part.value),
-			iconPath
+			iconPath,
+			options: part.options
 		};
 	}
 	export function to(part: Dto<IChatContentReference>): vscode.ChatResponseReferencePart {
@@ -2524,7 +2655,7 @@ export namespace ChatResponseReferencePart {
 			Location.to(value);
 
 		return new types.ChatResponseReferencePart(
-			'variableName' in value.reference ? {
+			typeof value.reference === 'string' ? value.reference : 'variableName' in value.reference ? {
 				variableName: value.reference.variableName,
 				value: value.reference.value && mapValue(value.reference.value)
 			} :
@@ -2533,9 +2664,20 @@ export namespace ChatResponseReferencePart {
 	}
 }
 
+export namespace ChatResponseCodeCitationPart {
+	export function from(part: vscode.ChatResponseCodeCitationPart): Dto<IChatCodeCitation> {
+		return {
+			kind: 'codeCitation',
+			value: part.value,
+			license: part.license,
+			snippet: part.snippet
+		};
+	}
+}
+
 export namespace ChatResponsePart {
 
-	export function from(part: vscode.ChatResponsePart | vscode.ChatResponseTextEditPart | vscode.ChatResponseMarkdownWithVulnerabilitiesPart | vscode.ChatResponseDetectedParticipantPart | vscode.ChatResponseWarningPart | vscode.ChatResponseConfirmationPart | vscode.ChatResponseWarningPart, commandsConverter: CommandsConverter, commandDisposables: DisposableStore): extHostProtocol.IChatProgressDto {
+	export function from(part: vscode.ChatResponsePart | vscode.ChatResponseTextEditPart | vscode.ChatResponseMarkdownWithVulnerabilitiesPart | vscode.ChatResponseDetectedParticipantPart | vscode.ChatResponseWarningPart | vscode.ChatResponseConfirmationPart | vscode.ChatResponseReferencePart2 | vscode.ChatResponseMovePart, commandsConverter: CommandsConverter, commandDisposables: DisposableStore): extHostProtocol.IChatProgressDto {
 		if (part instanceof types.ChatResponseMarkdownPart) {
 			return ChatResponseMarkdownPart.from(part);
 		} else if (part instanceof types.ChatResponseAnchorPart) {
@@ -2552,10 +2694,18 @@ export namespace ChatResponsePart {
 			return ChatResponseTextEditPart.from(part);
 		} else if (part instanceof types.ChatResponseMarkdownWithVulnerabilitiesPart) {
 			return ChatResponseMarkdownWithVulnerabilitiesPart.from(part);
+		} else if (part instanceof types.ChatResponseCodeblockUriPart) {
+			return ChatResponseCodeblockUriPart.from(part);
 		} else if (part instanceof types.ChatResponseDetectedParticipantPart) {
 			return ChatResponseDetectedParticipantPart.from(part);
 		} else if (part instanceof types.ChatResponseWarningPart) {
 			return ChatResponseWarningPart.from(part);
+		} else if (part instanceof types.ChatResponseConfirmationPart) {
+			return ChatResponseConfirmationPart.from(part);
+		} else if (part instanceof types.ChatResponseCodeCitationPart) {
+			return ChatResponseCodeCitationPart.from(part);
+		} else if (part instanceof types.ChatResponseMovePart) {
+			return ChatResponseMovePart.from(part);
 		}
 
 		return {
@@ -2591,16 +2741,22 @@ export namespace ChatResponsePart {
 }
 
 export namespace ChatAgentRequest {
-	export function to(request: IChatAgentRequest): vscode.ChatRequest {
+	export function to(request: IChatAgentRequest, location2: vscode.ChatRequestEditorData | vscode.ChatRequestNotebookData | undefined): vscode.ChatRequest {
+		const toolReferences = request.variables.variables.filter(v => v.isTool);
+		const variableReferences = request.variables.variables.filter(v => !v.isTool);
 		return {
 			prompt: request.message,
 			command: request.command,
 			attempt: request.attempt ?? 0,
 			enableCommandDetection: request.enableCommandDetection ?? true,
-			references: request.variables.variables.map(ChatAgentValueReference.to),
+			isParticipantDetected: request.isParticipantDetected ?? false,
+			references: variableReferences.map(ChatPromptReference.to),
+			toolReferences: toolReferences.map(ChatLanguageModelToolReference.to),
 			location: ChatLocation.to(request.location),
 			acceptedConfirmationData: request.acceptedConfirmationData,
-			rejectedConfirmationData: request.rejectedConfirmationData
+			rejectedConfirmationData: request.rejectedConfirmationData,
+			location2,
+			toolInvocationToken: Object.freeze({ sessionId: request.sessionId })
 		};
 	}
 }
@@ -2612,6 +2768,7 @@ export namespace ChatLocation {
 			case ChatAgentLocation.Terminal: return types.ChatLocation.Terminal;
 			case ChatAgentLocation.Panel: return types.ChatLocation.Panel;
 			case ChatAgentLocation.Editor: return types.ChatLocation.Editor;
+			case ChatAgentLocation.EditingSession: return types.ChatLocation.EditingSession;
 		}
 	}
 
@@ -2621,11 +2778,12 @@ export namespace ChatLocation {
 			case types.ChatLocation.Terminal: return ChatAgentLocation.Terminal;
 			case types.ChatLocation.Panel: return ChatAgentLocation.Panel;
 			case types.ChatLocation.Editor: return ChatAgentLocation.Editor;
+			case types.ChatLocation.EditingSession: return ChatAgentLocation.EditingSession;
 		}
 	}
 }
 
-export namespace ChatAgentValueReference {
+export namespace ChatPromptReference {
 	export function to(variable: IChatRequestVariableEntry): vscode.ChatPromptReference {
 		const value = variable.value;
 		if (!value) {
@@ -2644,6 +2802,20 @@ export namespace ChatAgentValueReference {
 	}
 }
 
+export namespace ChatLanguageModelToolReference {
+	export function to(variable: IChatRequestVariableEntry): vscode.ChatLanguageModelToolReference {
+		const value = variable.value;
+		if (value) {
+			throw new Error('Invalid tool reference');
+		}
+
+		return {
+			id: variable.id,
+			range: variable.range && [variable.range.start, variable.range.endExclusive],
+		};
+	}
+}
+
 export namespace ChatAgentCompletionItem {
 	export function from(item: vscode.ChatCompletionItem, commandsConverter: CommandsConverter, disposables: DisposableStore): extHostProtocol.IChatAgentCompletionItem {
 		return {
@@ -2665,6 +2837,14 @@ export namespace ChatAgentResult {
 		return {
 			errorDetails: result.errorDetails,
 			metadata: result.metadata,
+			nextQuestion: result.nextQuestion,
+		};
+	}
+	export function from(result: vscode.ChatResult): Dto<IChatAgentResult> {
+		return {
+			errorDetails: result.errorDetails,
+			metadata: result.metadata,
+			nextQuestion: result.nextQuestion,
 		};
 	}
 }
@@ -2695,7 +2875,6 @@ export namespace ChatAgentUserActionEvent {
 	}
 }
 
-
 export namespace TerminalQuickFix {
 	export function from(quickFix: vscode.TerminalQuickFixTerminalCommand | vscode.TerminalQuickFixOpener | vscode.Command, converter: Command.ICommandsConverter, disposables: DisposableStore): extHostProtocol.ITerminalQuickFixTerminalCommandDto | extHostProtocol.ITerminalQuickFixOpenerDto | extHostProtocol.ICommandDto | undefined {
 		if ('terminalCommand' in quickFix) {
@@ -2743,3 +2922,15 @@ export namespace DebugTreeItem {
 		};
 	}
 }
+
+export namespace LanguageModelToolDescription {
+	export function to(item: IToolData): vscode.LanguageModelToolDescription {
+		return {
+			id: item.id,
+			modelDescription: item.modelDescription,
+			parametersSchema: item.parametersSchema,
+			displayName: item.displayName,
+			supportedContentTypes: item.supportedContentTypes,
+		};
+	}
+}
diff --git a/src/vs/workbench/api/common/extHostTypes.ts b/src/vs/workbench/api/common/extHostTypes.ts
index a96c5570a1b..d7c85bd8b37 100644
--- a/src/vs/workbench/api/common/extHostTypes.ts
+++ b/src/vs/workbench/api/common/extHostTypes.ts
@@ -5,21 +5,21 @@
 
 /* eslint-disable local/code-no-native-private */
 
-import { asArray, coalesceInPlace, equals } from 'vs/base/common/arrays';
-import { illegalArgument } from 'vs/base/common/errors';
-import { IRelativePattern } from 'vs/base/common/glob';
-import { MarkdownString as BaseMarkdownString, MarkdownStringTrustedOptions } from 'vs/base/common/htmlContent';
-import { ResourceMap } from 'vs/base/common/map';
-import { Mimes, normalizeMimeType } from 'vs/base/common/mime';
-import { nextCharLength } from 'vs/base/common/strings';
-import { isNumber, isObject, isString, isStringArray } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { FileSystemProviderErrorCode, markAsFileSystemProviderError } from 'vs/platform/files/common/files';
-import { RemoteAuthorityResolverErrorCode } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { IRelativePatternDto } from 'vs/workbench/api/common/extHost.protocol';
-import { CellEditType, ICellMetadataEdit, IDocumentMetadataEdit, isTextStreamMime } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { asArray, coalesceInPlace, equals } from '../../../base/common/arrays.js';
+import { illegalArgument } from '../../../base/common/errors.js';
+import { IRelativePattern } from '../../../base/common/glob.js';
+import { MarkdownString as BaseMarkdownString, MarkdownStringTrustedOptions } from '../../../base/common/htmlContent.js';
+import { ResourceMap } from '../../../base/common/map.js';
+import { Mimes, normalizeMimeType } from '../../../base/common/mime.js';
+import { nextCharLength } from '../../../base/common/strings.js';
+import { isNumber, isObject, isString, isStringArray } from '../../../base/common/types.js';
+import { URI } from '../../../base/common/uri.js';
+import { generateUuid } from '../../../base/common/uuid.js';
+import { ExtensionIdentifier, IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { FileSystemProviderErrorCode, markAsFileSystemProviderError } from '../../../platform/files/common/files.js';
+import { RemoteAuthorityResolverErrorCode } from '../../../platform/remote/common/remoteAuthorityResolver.js';
+import { IRelativePatternDto } from './extHost.protocol.js';
+import { CellEditType, ICellMetadataEdit, IDocumentMetadataEdit, isTextStreamMime } from '../../contrib/notebook/common/notebookCommon.js';
 import type * as vscode from 'vscode';
 
 /**
@@ -271,6 +271,10 @@ export class Position {
 	toJSON(): any {
 		return { line: this.line, character: this.character };
 	}
+
+	[Symbol.for('debug.description')]() {
+		return `(${this.line}:${this.character})`;
+	}
 }
 
 @es5ClassCompat
@@ -417,6 +421,10 @@ export class Range {
 	toJSON(): any {
 		return [this.start, this.end];
 	}
+
+	[Symbol.for('debug.description')]() {
+		return getDebugDescriptionOfRange(this);
+	}
 }
 
 @es5ClassCompat
@@ -483,6 +491,29 @@ export class Selection extends Range {
 			anchor: this.anchor
 		};
 	}
+
+
+	[Symbol.for('debug.description')]() {
+		return getDebugDescriptionOfSelection(this);
+	}
+}
+
+export function getDebugDescriptionOfRange(range: vscode.Range): string {
+	return range.isEmpty
+		? `[${range.start.line}:${range.start.character})`
+		: `[${range.start.line}:${range.start.character} -> ${range.end.line}:${range.end.character})`;
+}
+
+export function getDebugDescriptionOfSelection(selection: vscode.Selection): string {
+	let rangeStr = getDebugDescriptionOfRange(selection);
+	if (!selection.isEmpty) {
+		if (selection.active.isEqual(selection.start)) {
+			rangeStr = `|${rangeStr}`;
+		} else {
+			rangeStr = `${rangeStr}|`;
+		}
+	}
+	return rangeStr;
 }
 
 const validateConnectionToken = (connectionToken: string) => {
@@ -1205,18 +1236,18 @@ export class Hover {
 @es5ClassCompat
 export class VerboseHover extends Hover {
 
-	public canIncreaseHover: boolean | undefined;
-	public canDecreaseHover: boolean | undefined;
+	public canIncreaseVerbosity: boolean | undefined;
+	public canDecreaseVerbosity: boolean | undefined;
 
 	constructor(
 		contents: vscode.MarkdownString | vscode.MarkedString | (vscode.MarkdownString | vscode.MarkedString)[],
 		range?: Range,
-		canIncreaseHover?: boolean,
-		canDecreaseHover?: boolean,
+		canIncreaseVerbosity?: boolean,
+		canDecreaseVerbosity?: boolean,
 	) {
 		super(contents, range);
-		this.canIncreaseHover = canIncreaseHover;
-		this.canDecreaseHover = canDecreaseHover;
+		this.canIncreaseVerbosity = canIncreaseVerbosity;
+		this.canDecreaseVerbosity = canDecreaseVerbosity;
 	}
 }
 
@@ -3310,6 +3341,11 @@ export enum CommentThreadApplicability {
 	Outdated = 1
 }
 
+export enum CommentThreadFocus {
+	Reply = 1,
+	Comment = 2
+}
+
 //#endregion
 
 //#region Semantic Coloring
@@ -3561,6 +3597,11 @@ export class DebugVisualization {
 
 //#endregion
 
+export enum QuickInputButtonLocation {
+	Title = 1,
+	Inline = 2
+}
+
 @es5ClassCompat
 export class QuickInputButtons {
 
@@ -4038,9 +4079,11 @@ export class TestMessage implements vscode.TestMessage {
 	public expectedOutput?: string;
 	public actualOutput?: string;
 	public location?: vscode.Location;
-	/** proposed: */
 	public contextValue?: string;
 
+	/** proposed: */
+	public stackTrace?: TestMessageStackFrame[];
+
 	public static diff(message: string | vscode.MarkdownString, expected: string, actual: string) {
 		const msg = new TestMessage(message);
 		msg.expectedOutput = expected;
@@ -4056,6 +4099,19 @@ export class TestTag implements vscode.TestTag {
 	constructor(public readonly id: string) { }
 }
 
+export class TestMessageStackFrame {
+	/**
+	 * @param label The name of the stack frame
+	 * @param file The file URI of the stack frame
+	 * @param position The position of the stack frame within the file
+	 */
+	constructor(
+		public label: string,
+		public uri?: vscode.Uri,
+		public position?: Position,
+	) { }
+}
+
 //#endregion
 
 //#region Test Coverage
@@ -4119,7 +4175,7 @@ export class FileCoverage implements vscode.FileCoverage {
 		public statementCoverage: vscode.TestCoverageCount,
 		public branchCoverage?: vscode.TestCoverageCount,
 		public declarationCoverage?: vscode.TestCoverageCount,
-		public testItem?: vscode.TestItem,
+		public fromTests: vscode.TestItem[] = [],
 	) {
 	}
 }
@@ -4346,10 +4402,13 @@ export class ChatResponseConfirmationPart {
 	title: string;
 	message: string;
 	data: any;
-	constructor(title: string, message: string, data: any) {
+	buttons?: string[];
+
+	constructor(title: string, message: string, data: any, buttons?: string[]) {
 		this.title = title;
 		this.message = message;
 		this.data = data;
+		this.buttons = buttons;
 	}
 }
 
@@ -4364,9 +4423,11 @@ export class ChatResponseFileTreePart {
 
 export class ChatResponseAnchorPart {
 	value: vscode.Uri | vscode.Location;
+	value2: vscode.Uri | vscode.Location | vscode.SymbolInformation;
 	title?: string;
-	constructor(value: vscode.Uri | vscode.Location, title?: string) {
-		this.value = value;
+	constructor(value: vscode.Uri | vscode.Location | vscode.SymbolInformation, title?: string) {
+		this.value = value as any;
+		this.value2 = value;
 		this.title = title;
 	}
 }
@@ -4406,11 +4467,39 @@ export class ChatResponseCommandButtonPart {
 }
 
 export class ChatResponseReferencePart {
-	value: vscode.Uri | vscode.Location | { variableName: string; value?: vscode.Uri | vscode.Location };
+	value: vscode.Uri | vscode.Location | { variableName: string; value?: vscode.Uri | vscode.Location } | string;
 	iconPath?: vscode.Uri | vscode.ThemeIcon | { light: vscode.Uri; dark: vscode.Uri };
-	constructor(value: vscode.Uri | vscode.Location | { variableName: string; value?: vscode.Uri | vscode.Location }, iconPath?: vscode.Uri | vscode.ThemeIcon | { light: vscode.Uri; dark: vscode.Uri }) {
+	options?: { status?: { description: string; kind: vscode.ChatResponseReferencePartStatusKind } };
+	constructor(value: vscode.Uri | vscode.Location | { variableName: string; value?: vscode.Uri | vscode.Location } | string, iconPath?: vscode.Uri | vscode.ThemeIcon | { light: vscode.Uri; dark: vscode.Uri }, options?: { status?: { description: string; kind: vscode.ChatResponseReferencePartStatusKind } }) {
 		this.value = value;
 		this.iconPath = iconPath;
+		this.options = options;
+	}
+}
+
+export class ChatResponseCodeblockUriPart {
+	value: vscode.Uri;
+	constructor(value: vscode.Uri) {
+		this.value = value;
+	}
+}
+
+export class ChatResponseCodeCitationPart {
+	value: vscode.Uri;
+	license: string;
+	snippet: string;
+	constructor(value: vscode.Uri, license: string, snippet: string) {
+		this.value = value;
+		this.license = license;
+		this.snippet = snippet;
+	}
+}
+
+export class ChatResponseMovePart {
+	constructor(
+		public readonly uri: vscode.Uri,
+		public readonly range: vscode.Range,
+	) {
 	}
 }
 
@@ -4424,6 +4513,8 @@ export class ChatResponseTextEditPart {
 }
 
 export class ChatRequestTurn implements vscode.ChatRequestTurn {
+	toolReferences?: vscode.ChatLanguageModelToolReference[];
+
 	constructor(
 		readonly prompt: string,
 		readonly command: string | undefined,
@@ -4447,6 +4538,27 @@ export enum ChatLocation {
 	Terminal = 2,
 	Notebook = 3,
 	Editor = 4,
+	EditingSession = 5,
+}
+
+export enum ChatResponseReferencePartStatusKind {
+	Complete = 1,
+	Partial = 2,
+	Omitted = 3
+}
+
+export class ChatRequestEditorData implements vscode.ChatRequestEditorData {
+	constructor(
+		readonly document: vscode.TextDocument,
+		readonly selection: vscode.Selection,
+		readonly wholeRange: vscode.Range,
+	) { }
+}
+
+export class ChatRequestNotebookData implements vscode.ChatRequestNotebookData {
+	constructor(
+		readonly cell: vscode.TextDocument
+	) { }
 }
 
 export enum LanguageModelChatMessageRole {
@@ -4455,14 +4567,14 @@ export enum LanguageModelChatMessageRole {
 	System = 3
 }
 
-export class LanguageModelFunctionResultPart implements vscode.LanguageModelChatMessageFunctionResultPart {
+export class LanguageModelToolResultPart implements vscode.LanguageModelChatMessageToolResultPart {
 
-	name: string;
+	toolCallId: string;
 	content: string;
 	isError: boolean;
 
-	constructor(name: string, content: string, isError?: boolean) {
-		this.name = name;
+	constructor(toolCallId: string, content: string, isError?: boolean) {
+		this.toolCallId = toolCallId;
 		this.content = content;
 		this.isError = isError ?? false;
 	}
@@ -4470,9 +4582,9 @@ export class LanguageModelFunctionResultPart implements vscode.LanguageModelChat
 
 export class LanguageModelChatMessage implements vscode.LanguageModelChatMessage {
 
-	static User(content: string | LanguageModelFunctionResultPart, name?: string): LanguageModelChatMessage {
+	static User(content: string | LanguageModelToolResultPart, name?: string): LanguageModelChatMessage {
 		const value = new LanguageModelChatMessage(LanguageModelChatMessageRole.User, typeof content === 'string' ? content : '', name);
-		value.content2 = content;
+		value.content2 = [content];
 		return value;
 	}
 
@@ -4482,23 +4594,25 @@ export class LanguageModelChatMessage implements vscode.LanguageModelChatMessage
 
 	role: vscode.LanguageModelChatMessageRole;
 	content: string;
-	content2: string | vscode.LanguageModelChatMessageFunctionResultPart;
+	content2: (string | vscode.LanguageModelChatMessageToolResultPart | vscode.LanguageModelChatResponseToolCallPart)[];
 	name: string | undefined;
 
 	constructor(role: vscode.LanguageModelChatMessageRole, content: string, name?: string) {
 		this.role = role;
 		this.content = content;
-		this.content2 = content;
+		this.content2 = [content];
 		this.name = name;
 	}
 }
 
-export class LanguageModelFunctionUsePart implements vscode.LanguageModelChatResponseFunctionUsePart {
+export class LanguageModelToolCallPart implements vscode.LanguageModelChatResponseToolCallPart {
 	name: string;
+	toolCallId: string;
 	parameters: any;
 
-	constructor(name: string, parameters: any) {
+	constructor(name: string, toolCallId: string, parameters: any) {
 		this.name = name;
+		this.toolCallId = toolCallId;
 		this.parameters = parameters;
 	}
 }
diff --git a/src/vs/workbench/api/common/extHostUriOpener.ts b/src/vs/workbench/api/common/extHostUriOpener.ts
index 4e3577ec1f7..7e97bb4fba0 100644
--- a/src/vs/workbench/api/common/extHostUriOpener.ts
+++ b/src/vs/workbench/api/common/extHostUriOpener.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { toDisposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import * as languages from 'vs/editor/common/languages';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { toDisposable } from '../../../base/common/lifecycle.js';
+import { Schemas } from '../../../base/common/network.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import * as languages from '../../../editor/common/languages.js';
+import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
 import type * as vscode from 'vscode';
-import { ExtHostUriOpenersShape, IMainContext, MainContext, MainThreadUriOpenersShape } from './extHost.protocol';
+import { ExtHostUriOpenersShape, IMainContext, MainContext, MainThreadUriOpenersShape } from './extHost.protocol.js';
 
 
 export class ExtHostUriOpeners implements ExtHostUriOpenersShape {
diff --git a/src/vs/workbench/api/common/extHostUriTransformerService.ts b/src/vs/workbench/api/common/extHostUriTransformerService.ts
index 4d86037b020..58f7ab6a6fc 100644
--- a/src/vs/workbench/api/common/extHostUriTransformerService.ts
+++ b/src/vs/workbench/api/common/extHostUriTransformerService.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IURITransformer } from 'vs/base/common/uriIpc';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { URI, UriComponents } from 'vs/base/common/uri';
+import { IURITransformer } from '../../../base/common/uriIpc.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
 
 export interface IURITransformerService extends IURITransformer {
 	readonly _serviceBrand: undefined;
diff --git a/src/vs/workbench/api/common/extHostUrls.ts b/src/vs/workbench/api/common/extHostUrls.ts
index 2450fd6de0e..c75ce2d4ca1 100644
--- a/src/vs/workbench/api/common/extHostUrls.ts
+++ b/src/vs/workbench/api/common/extHostUrls.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type * as vscode from 'vscode';
-import { MainContext, IMainContext, ExtHostUrlsShape, MainThreadUrlsShape } from './extHost.protocol';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { toDisposable } from 'vs/base/common/lifecycle';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { ExtensionIdentifierSet, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
+import { MainContext, IMainContext, ExtHostUrlsShape, MainThreadUrlsShape } from './extHost.protocol.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { toDisposable } from '../../../base/common/lifecycle.js';
+import { onUnexpectedError } from '../../../base/common/errors.js';
+import { ExtensionIdentifierSet, IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
 
 export class ExtHostUrls implements ExtHostUrlsShape {
 
diff --git a/src/vs/workbench/api/common/extHostVariableResolverService.ts b/src/vs/workbench/api/common/extHostVariableResolverService.ts
index be13e517797..d5c19b162fa 100644
--- a/src/vs/workbench/api/common/extHostVariableResolverService.ts
+++ b/src/vs/workbench/api/common/extHostVariableResolverService.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Lazy } from 'vs/base/common/lazy';
-import { Disposable } from 'vs/base/common/lifecycle';
-import * as path from 'vs/base/common/path';
-import * as process from 'vs/base/common/process';
-import { URI } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
-import { IExtHostEditorTabs } from 'vs/workbench/api/common/extHostEditorTabs';
-import { IExtHostExtensionService } from 'vs/workbench/api/common/extHostExtensionService';
-import { CustomEditorTabInput, NotebookDiffEditorTabInput, NotebookEditorTabInput, TextDiffTabInput, TextTabInput } from 'vs/workbench/api/common/extHostTypes';
-import { IExtHostWorkspace } from 'vs/workbench/api/common/extHostWorkspace';
-import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
-import { AbstractVariableResolverService } from 'vs/workbench/services/configurationResolver/common/variableResolver';
+import { Lazy } from '../../../base/common/lazy.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import * as path from '../../../base/common/path.js';
+import * as process from '../../../base/common/process.js';
+import { URI } from '../../../base/common/uri.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { IExtHostDocumentsAndEditors } from './extHostDocumentsAndEditors.js';
+import { IExtHostEditorTabs } from './extHostEditorTabs.js';
+import { IExtHostExtensionService } from './extHostExtensionService.js';
+import { CustomEditorTabInput, NotebookDiffEditorTabInput, NotebookEditorTabInput, TextDiffTabInput, TextTabInput } from './extHostTypes.js';
+import { IExtHostWorkspace } from './extHostWorkspace.js';
+import { IConfigurationResolverService } from '../../services/configurationResolver/common/configurationResolver.js';
+import { AbstractVariableResolverService } from '../../services/configurationResolver/common/variableResolver.js';
 import * as vscode from 'vscode';
-import { ExtHostConfigProvider, IExtHostConfiguration } from './extHostConfiguration';
+import { ExtHostConfigProvider, IExtHostConfiguration } from './extHostConfiguration.js';
 
 export interface IExtHostVariableResolverProvider {
 	readonly _serviceBrand: undefined;
diff --git a/src/vs/workbench/api/common/extHostWebview.ts b/src/vs/workbench/api/common/extHostWebview.ts
index 367d4efbac2..435df4b03fc 100644
--- a/src/vs/workbench/api/common/extHostWebview.ts
+++ b/src/vs/workbench/api/common/extHostWebview.ts
@@ -5,22 +5,22 @@
 
 /* eslint-disable local/code-no-native-private */
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import * as objects from 'vs/base/common/objects';
-import { URI } from 'vs/base/common/uri';
-import { normalizeVersion, parseVersion } from 'vs/platform/extensions/common/extensionValidator';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IExtHostApiDeprecationService } from 'vs/workbench/api/common/extHostApiDeprecationService';
-import { deserializeWebviewMessage, serializeWebviewMessage } from 'vs/workbench/api/common/extHostWebviewMessaging';
-import { IExtHostWorkspace } from 'vs/workbench/api/common/extHostWorkspace';
-import { WebviewRemoteInfo, asWebviewUri, webviewGenericCspSource } from 'vs/workbench/contrib/webview/common/webview';
-import { SerializableObjectWithBuffers } from 'vs/workbench/services/extensions/common/proxyIdentifier';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { Schemas } from '../../../base/common/network.js';
+import * as objects from '../../../base/common/objects.js';
+import { URI } from '../../../base/common/uri.js';
+import { normalizeVersion, parseVersion } from '../../../platform/extensions/common/extensionValidator.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { IExtHostApiDeprecationService } from './extHostApiDeprecationService.js';
+import { deserializeWebviewMessage, serializeWebviewMessage } from './extHostWebviewMessaging.js';
+import { IExtHostWorkspace } from './extHostWorkspace.js';
+import { WebviewRemoteInfo, asWebviewUri, webviewGenericCspSource } from '../../contrib/webview/common/webview.js';
+import { SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';
 import type * as vscode from 'vscode';
-import * as extHostProtocol from './extHost.protocol';
+import * as extHostProtocol from './extHost.protocol.js';
 
 export class ExtHostWebview implements vscode.Webview {
 
diff --git a/src/vs/workbench/api/common/extHostWebviewMessaging.ts b/src/vs/workbench/api/common/extHostWebviewMessaging.ts
index 88c477baab5..faf3d228656 100644
--- a/src/vs/workbench/api/common/extHostWebviewMessaging.ts
+++ b/src/vs/workbench/api/common/extHostWebviewMessaging.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import * as extHostProtocol from './extHost.protocol';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import * as extHostProtocol from './extHost.protocol.js';
 
 class ArrayBufferSet {
 	public readonly buffers: ArrayBuffer[] = [];
diff --git a/src/vs/workbench/api/common/extHostWebviewPanels.ts b/src/vs/workbench/api/common/extHostWebviewPanels.ts
index 6018c3718de..872c1fbe3dd 100644
--- a/src/vs/workbench/api/common/extHostWebviewPanels.ts
+++ b/src/vs/workbench/api/common/extHostWebviewPanels.ts
@@ -5,18 +5,18 @@
 
 /* eslint-disable local/code-no-native-private */
 
-import { Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import * as typeConverters from 'vs/workbench/api/common/extHostTypeConverters';
-import { serializeWebviewOptions, ExtHostWebview, ExtHostWebviews, toExtensionData, shouldSerializeBuffersForPostMessage } from 'vs/workbench/api/common/extHostWebview';
-import { IExtHostWorkspace } from 'vs/workbench/api/common/extHostWorkspace';
-import { EditorGroupColumn } from 'vs/workbench/services/editor/common/editorGroupColumn';
+import { Emitter } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { URI } from '../../../base/common/uri.js';
+import { generateUuid } from '../../../base/common/uuid.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import * as typeConverters from './extHostTypeConverters.js';
+import { serializeWebviewOptions, ExtHostWebview, ExtHostWebviews, toExtensionData, shouldSerializeBuffersForPostMessage } from './extHostWebview.js';
+import { IExtHostWorkspace } from './extHostWorkspace.js';
+import { EditorGroupColumn } from '../../services/editor/common/editorGroupColumn.js';
 import type * as vscode from 'vscode';
-import * as extHostProtocol from './extHost.protocol';
-import * as extHostTypes from './extHostTypes';
+import * as extHostProtocol from './extHost.protocol.js';
+import * as extHostTypes from './extHostTypes.js';
 
 
 type IconPath = URI | { readonly light: URI; readonly dark: URI };
diff --git a/src/vs/workbench/api/common/extHostWebviewView.ts b/src/vs/workbench/api/common/extHostWebviewView.ts
index 89ae50c50cf..4696f33c5fa 100644
--- a/src/vs/workbench/api/common/extHostWebviewView.ts
+++ b/src/vs/workbench/api/common/extHostWebviewView.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { ExtHostWebview, ExtHostWebviews, toExtensionData, shouldSerializeBuffersForPostMessage } from 'vs/workbench/api/common/extHostWebview';
-import { ViewBadge } from 'vs/workbench/api/common/extHostTypeConverters';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Emitter } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { ExtHostWebview, ExtHostWebviews, toExtensionData, shouldSerializeBuffersForPostMessage } from './extHostWebview.js';
+import { ViewBadge } from './extHostTypeConverters.js';
 import type * as vscode from 'vscode';
-import * as extHostProtocol from './extHost.protocol';
-import * as extHostTypes from './extHostTypes';
+import * as extHostProtocol from './extHost.protocol.js';
+import * as extHostTypes from './extHostTypes.js';
 
 /* eslint-disable local/code-no-native-private */
 
diff --git a/src/vs/workbench/api/common/extHostWindow.ts b/src/vs/workbench/api/common/extHostWindow.ts
index 82b721fe489..6f74b721b8a 100644
--- a/src/vs/workbench/api/common/extHostWindow.ts
+++ b/src/vs/workbench/api/common/extHostWindow.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Schemas } from 'vs/base/common/network';
-import { isFalsyOrWhitespace } from 'vs/base/common/strings';
-import { URI } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Schemas } from '../../../base/common/network.js';
+import { isFalsyOrWhitespace } from '../../../base/common/strings.js';
+import { URI } from '../../../base/common/uri.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { IExtHostRpcService } from './extHostRpcService.js';
 import { WindowState } from 'vscode';
-import { ExtHostWindowShape, IOpenUriOptions, MainContext, MainThreadWindowShape } from './extHost.protocol';
+import { ExtHostWindowShape, IOpenUriOptions, MainContext, MainThreadWindowShape } from './extHost.protocol.js';
 
 export class ExtHostWindow implements ExtHostWindowShape {
 
diff --git a/src/vs/workbench/api/common/extHostWorkspace.ts b/src/vs/workbench/api/common/extHostWorkspace.ts
index 08b842e84fb..abb49a3cc27 100644
--- a/src/vs/workbench/api/common/extHostWorkspace.ts
+++ b/src/vs/workbench/api/common/extHostWorkspace.ts
@@ -3,42 +3,46 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { delta as arrayDelta, mapArrayOrNot } from 'vs/base/common/arrays';
-import { Barrier } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { AsyncEmitter, Emitter, Event } from 'vs/base/common/event';
-import { toDisposable } from 'vs/base/common/lifecycle';
-import { TernarySearchTree } from 'vs/base/common/ternarySearchTree';
-import { Schemas } from 'vs/base/common/network';
-import { Counter } from 'vs/base/common/numbers';
-import { basename, basenameOrAuthority, dirname, ExtUri, relativePath } from 'vs/base/common/resources';
-import { compare } from 'vs/base/common/strings';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { FileSystemProviderCapabilities } from 'vs/platform/files/common/files';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { Severity } from 'vs/platform/notification/common/notification';
-import { EditSessionIdentityMatch } from 'vs/platform/workspace/common/editSessions';
-import { Workspace, WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { IExtHostFileSystemInfo } from 'vs/workbench/api/common/extHostFileSystemInfo';
-import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import { GlobPattern } from 'vs/workbench/api/common/extHostTypeConverters';
-import { Range } from 'vs/workbench/api/common/extHostTypes';
-import { IURITransformerService } from 'vs/workbench/api/common/extHostUriTransformerService';
-import { IFileQueryBuilderOptions, ITextQueryBuilderOptions } from 'vs/workbench/services/search/common/queryBuilder';
-import { IRawFileMatch2, ITextSearchResult, resultIsMatch } from 'vs/workbench/services/search/common/search';
-import * as vscode from 'vscode';
-import { ExtHostWorkspaceShape, IRelativePatternDto, IWorkspaceData, MainContext, MainThreadMessageOptions, MainThreadMessageServiceShape, MainThreadWorkspaceShape } from './extHost.protocol';
-import { revive } from 'vs/base/common/marshalling';
+import { delta as arrayDelta, mapArrayOrNot } from '../../../base/common/arrays.js';
+import { AsyncIterableObject, Barrier } from '../../../base/common/async.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { AsyncEmitter, Emitter, Event } from '../../../base/common/event.js';
+import { DisposableStore, toDisposable } from '../../../base/common/lifecycle.js';
+import { TernarySearchTree } from '../../../base/common/ternarySearchTree.js';
+import { Schemas } from '../../../base/common/network.js';
+import { Counter } from '../../../base/common/numbers.js';
+import { basename, basenameOrAuthority, dirname, ExtUri, relativePath } from '../../../base/common/resources.js';
+import { compare } from '../../../base/common/strings.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { localize } from '../../../nls.js';
+import { ExtensionIdentifier, IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { FileSystemProviderCapabilities } from '../../../platform/files/common/files.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { Severity } from '../../../platform/notification/common/notification.js';
+import { EditSessionIdentityMatch } from '../../../platform/workspace/common/editSessions.js';
+import { Workspace, WorkspaceFolder } from '../../../platform/workspace/common/workspace.js';
+import { IExtHostFileSystemInfo } from './extHostFileSystemInfo.js';
+import { IExtHostInitDataService } from './extHostInitDataService.js';
+import { IExtHostRpcService } from './extHostRpcService.js';
+import { GlobPattern } from './extHostTypeConverters.js';
+import { Range } from './extHostTypes.js';
+import { IURITransformerService } from './extHostUriTransformerService.js';
+import { IFileQueryBuilderOptions, ISearchPatternBuilder, ITextQueryBuilderOptions } from '../../services/search/common/queryBuilder.js';
+import { IRawFileMatch2, ITextSearchResult, resultIsMatch } from '../../services/search/common/search.js';
+import type * as vscode from 'vscode';
+import { ExtHostWorkspaceShape, IRelativePatternDto, IWorkspaceData, MainContext, MainThreadMessageOptions, MainThreadMessageServiceShape, MainThreadWorkspaceShape } from './extHost.protocol.js';
+import { revive } from '../../../base/common/marshalling.js';
+import { AuthInfo, Credentials } from '../../../platform/request/common/request.js';
+import { ExcludeSettingOptions, TextSearchContextNew, TextSearchMatchNew } from '../../services/search/common/searchExtTypes.js';
 
 export interface IExtHostWorkspaceProvider {
 	getWorkspaceFolder2(uri: vscode.Uri, resolveParent?: boolean): Promise<vscode.WorkspaceFolder | undefined>;
 	resolveWorkspaceFolder(uri: vscode.Uri): Promise<vscode.WorkspaceFolder | undefined>;
 	getWorkspaceFolders2(): Promise<vscode.WorkspaceFolder[] | undefined>;
 	resolveProxy(url: string): Promise<string | undefined>;
+	lookupAuthorization(authInfo: AuthInfo): Promise<Credentials | undefined>;
+	lookupKerberosAuthorization(url: string): Promise<string | undefined>;
 	loadCertificates(): Promise<string[]>;
 }
 
@@ -75,6 +79,11 @@ interface MutableWorkspaceFolder extends vscode.WorkspaceFolder {
 	index: number;
 }
 
+interface QueryOptions<T> {
+	options: T;
+	folder: URI | undefined;
+}
+
 class ExtHostWorkspaceImpl extends Workspace {
 
 	static toExtHostWorkspace(data: IWorkspaceData | null, previousConfirmedWorkspace: ExtHostWorkspaceImpl | undefined, previousUnconfirmedWorkspace: ExtHostWorkspaceImpl | undefined, extHostFileSystemInfo: IExtHostFileSystemInfo): { workspace: ExtHostWorkspaceImpl | null; added: vscode.WorkspaceFolder[]; removed: vscode.WorkspaceFolder[] } {
@@ -132,7 +141,7 @@ class ExtHostWorkspaceImpl extends Workspace {
 
 	constructor(id: string, private _name: string, folders: vscode.WorkspaceFolder[], transient: boolean, configuration: URI | null, private _isUntitled: boolean, ignorePathCasing: (key: URI) => boolean) {
 		super(id, folders.map(f => new WorkspaceFolder(f)), transient, configuration, ignorePathCasing);
-		this._structure = TernarySearchTree.forUris<vscode.WorkspaceFolder>(ignorePathCasing);
+		this._structure = TernarySearchTree.forUris<vscode.WorkspaceFolder>(ignorePathCasing, () => true);
 
 		// setup the workspace folder data structure
 		folders.forEach(folder => {
@@ -457,12 +466,15 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac
 				excludeString = exclude.pattern;
 			}
 		}
+
+		// todo: consider exclude baseURI if available
 		return this._findFilesImpl(include, undefined, {
-			exclude: excludeString,
+			exclude: [excludeString],
 			maxResults,
-			useDefaultExcludes: useFileExcludes,
-			useDefaultSearchExcludes: false,
-			useIgnoreFiles: false
+			useExcludeSettings: useFileExcludes ? ExcludeSettingOptions.FilesExclude : ExcludeSettingOptions.None,
+			useIgnoreFiles: {
+				local: false
+			}
 		}, token);
 	}
 
@@ -471,86 +483,191 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac
 		extensionId: ExtensionIdentifier,
 		token: vscode.CancellationToken = CancellationToken.None): Promise<vscode.Uri[]> {
 		this._logService.trace(`extHostWorkspace#findFiles2: fileSearch, extension: ${extensionId.value}, entryPoint: findFiles2`);
-		return this._findFilesImpl(undefined, filePattern, options, token);
+
+
+		const useDefaultExcludes = options.useDefaultExcludes ?? true;
+		const useDefaultSearchExcludes = options.useDefaultSearchExcludes ?? true;
+		const excludeSetting = useDefaultExcludes ?
+			(useDefaultSearchExcludes ? ExcludeSettingOptions.SearchAndFilesExclude : ExcludeSettingOptions.FilesExclude) :
+			ExcludeSettingOptions.None;
+		const newOptions: vscode.FindFiles2OptionsNew = {
+			exclude: options.exclude ? [options.exclude] : undefined,
+			useIgnoreFiles: {
+				local: options.useIgnoreFiles,
+				global: options.useGlobalIgnoreFiles,
+				parent: options.useParentIgnoreFiles
+			},
+			useExcludeSettings: excludeSetting,
+			followSymlinks: options.followSymlinks,
+			maxResults: options.maxResults,
+		};
+		return this._findFilesImpl(undefined, filePattern !== undefined ? [filePattern] : [], newOptions, token);
+	}
+
+	findFiles2New(filePatterns: vscode.GlobPattern[],
+		options: vscode.FindFiles2OptionsNew = {},
+		extensionId: ExtensionIdentifier,
+		token: vscode.CancellationToken = CancellationToken.None): Promise<vscode.Uri[]> {
+		this._logService.trace(`extHostWorkspace#findFiles2New: fileSearch, extension: ${extensionId.value}, entryPoint: findFiles2New`);
+		return this._findFilesImpl(undefined, filePatterns, options, token);
 	}
 
 	private async _findFilesImpl(
 		// the old `findFiles` used `include` to query, but the new `findFiles2` uses `filePattern` to query.
 		// `filePattern` is the proper way to handle this, since it takes less precedence than the ignore files.
 		include: vscode.GlobPattern | undefined,
-		filePattern: vscode.GlobPattern | undefined,
-		options: vscode.FindFiles2Options,
+		filePatterns: vscode.GlobPattern[] | undefined,
+		options: vscode.FindFiles2OptionsNew,
 		token: vscode.CancellationToken = CancellationToken.None): Promise<vscode.Uri[]> {
 		if (token && token.isCancellationRequested) {
 			return Promise.resolve([]);
 		}
 
-		const excludePattern = (typeof options.exclude === 'string') ? options.exclude :
-			options.exclude ? options.exclude.pattern : undefined;
 
-		const fileQueries: IFileQueryBuilderOptions = {
-			ignoreSymlinks: typeof options.followSymlinks === 'boolean' ? !options.followSymlinks : undefined,
-			disregardIgnoreFiles: typeof options.useIgnoreFiles === 'boolean' ? !options.useIgnoreFiles : undefined,
-			disregardGlobalIgnoreFiles: typeof options.useGlobalIgnoreFiles === 'boolean' ? !options.useGlobalIgnoreFiles : undefined,
-			disregardParentIgnoreFiles: typeof options.useParentIgnoreFiles === 'boolean' ? !options.useParentIgnoreFiles : undefined,
-			disregardExcludeSettings: typeof options.useDefaultExcludes === 'boolean' ? !options.useDefaultExcludes : false,
-			disregardSearchExcludeSettings: typeof options.useDefaultSearchExcludes === 'boolean' ? !options.useDefaultSearchExcludes : false,
-			maxResults: options.maxResults,
-			excludePattern: excludePattern,
-			shouldGlobSearch: typeof options.fuzzy === 'boolean' ? !options.fuzzy : true,
-			_reason: 'startFileSearch'
-		};
-		let folderToUse: URI | undefined;
-		if (include) {
-			const { includePattern, folder } = parseSearchInclude(GlobPattern.from(include));
-			folderToUse = folder;
-			fileQueries.includePattern = includePattern;
-		} else {
-			const { includePattern, folder } = parseSearchInclude(GlobPattern.from(filePattern));
-			folderToUse = folder;
-			fileQueries.filePattern = includePattern;
-		}
+		const filePatternsToUse = include !== undefined ? [include] : filePatterns;
+		const queryOptions: QueryOptions<IFileQueryBuilderOptions>[] = filePatternsToUse?.map(filePattern => {
 
-		return this._proxy.$startFileSearch(
-			folderToUse ?? null,
-			fileQueries,
-			token
-		)
-			.then(data => Array.isArray(data) ? data.map(d => URI.revive(d)) : []);
+			const excludePatterns = globsToISearchPatternBuilder(options.exclude);
+
+			const fileQueries: IFileQueryBuilderOptions = {
+				ignoreSymlinks: typeof options.followSymlinks === 'boolean' ? !options.followSymlinks : undefined,
+				disregardIgnoreFiles: typeof options.useIgnoreFiles?.local === 'boolean' ? !options.useIgnoreFiles.local : undefined,
+				disregardGlobalIgnoreFiles: typeof options.useIgnoreFiles?.global === 'boolean' ? !options.useIgnoreFiles.global : undefined,
+				disregardParentIgnoreFiles: typeof options.useIgnoreFiles?.parent === 'boolean' ? !options.useIgnoreFiles.parent : undefined,
+				disregardExcludeSettings: options.useExcludeSettings !== undefined && options.useExcludeSettings === ExcludeSettingOptions.None,
+				disregardSearchExcludeSettings: options.useExcludeSettings !== undefined && (options.useExcludeSettings !== ExcludeSettingOptions.SearchAndFilesExclude),
+				maxResults: options.maxResults,
+				excludePattern: excludePatterns.length > 0 ? excludePatterns : undefined,
+				_reason: 'startFileSearch',
+				shouldGlobSearch: include ? undefined : true,
+			};
+
+			const parseInclude = parseSearchExcludeInclude(GlobPattern.from(filePattern));
+			const folderToUse = parseInclude?.folder;
+			if (include) {
+				fileQueries.includePattern = parseInclude?.pattern;
+			} else {
+				fileQueries.filePattern = parseInclude?.pattern;
+			}
+			return {
+				folder: folderToUse,
+				options: fileQueries
+			};
+		}) ?? [];
+
+		return this._findFilesBase(queryOptions, token);
 	}
 
-	async findTextInFiles(query: vscode.TextSearchQuery, options: vscode.FindTextInFilesOptions, callback: (result: vscode.TextSearchResult) => void, extensionId: ExtensionIdentifier, token: vscode.CancellationToken = CancellationToken.None): Promise<vscode.TextSearchComplete> {
-		this._logService.trace(`extHostWorkspace#findTextInFiles: textSearch, extension: ${extensionId.value}, entryPoint: findTextInFiles`);
+	private async _findFilesBase(
+		queryOptions: QueryOptions<IFileQueryBuilderOptions>[] | undefined,
+		token: CancellationToken
+	): Promise<vscode.Uri[]> {
+		const result = await Promise.all(queryOptions?.map(option => this._proxy.$startFileSearch(
+			option.folder ?? null,
+			option.options,
+			token).then(data => Array.isArray(data) ? data.map(d => URI.revive(d)) : [])
+		) ?? []);
 
-		const requestId = this._requestIdProvider.getNext();
+		return result.flat();
+	}
 
-		const previewOptions: vscode.TextSearchPreviewOptions = typeof options.previewOptions === 'undefined' ?
-			{
-				matchLines: 100,
-				charsPerLine: 10000
-			} :
-			options.previewOptions;
+	findTextInFilesNew(query: vscode.TextSearchQueryNew, options: vscode.FindTextInFilesOptionsNew | undefined, extensionId: ExtensionIdentifier, token: vscode.CancellationToken = CancellationToken.None): vscode.FindTextInFilesResponse {
+		this._logService.trace(`extHostWorkspace#findTextInFilesNew: textSearch, extension: ${extensionId.value}, entryPoint: findTextInFilesNew`);
 
-		const { includePattern, folder } = parseSearchInclude(GlobPattern.from(options.include));
-		const excludePattern = (typeof options.exclude === 'string') ? options.exclude :
-			options.exclude ? options.exclude.pattern : undefined;
-		const queryOptions: ITextQueryBuilderOptions = {
-			ignoreSymlinks: typeof options.followSymlinks === 'boolean' ? !options.followSymlinks : undefined,
-			disregardIgnoreFiles: typeof options.useIgnoreFiles === 'boolean' ? !options.useIgnoreFiles : undefined,
-			disregardGlobalIgnoreFiles: typeof options.useGlobalIgnoreFiles === 'boolean' ? !options.useGlobalIgnoreFiles : undefined,
-			disregardParentIgnoreFiles: typeof options.useParentIgnoreFiles === 'boolean' ? !options.useParentIgnoreFiles : undefined,
-			disregardExcludeSettings: typeof options.useDefaultExcludes === 'boolean' ? !options.useDefaultExcludes : true,
-			fileEncoding: options.encoding,
-			maxResults: options.maxResults,
-			previewOptions,
-			afterContext: options.afterContext,
-			beforeContext: options.beforeContext,
 
-			includePattern: includePattern,
-			excludePattern: excludePattern
+		const getOptions = (include: vscode.GlobPattern | undefined): QueryOptions<ITextQueryBuilderOptions> => {
+			if (!options) {
+				return {
+					folder: undefined,
+					options: {}
+				};
+			}
+			const parsedInclude = include ? parseSearchExcludeInclude(GlobPattern.from(include)) : undefined;
+
+			const excludePatterns = options.exclude ? globsToISearchPatternBuilder(options.exclude) : undefined;
+
+			return {
+				options: {
+
+					ignoreSymlinks: typeof options.followSymlinks === 'boolean' ? !options.followSymlinks : undefined,
+					disregardIgnoreFiles: typeof options.useIgnoreFiles === 'boolean' ? !options.useIgnoreFiles : undefined,
+					disregardGlobalIgnoreFiles: typeof options.useIgnoreFiles?.global === 'boolean' ? !options.useIgnoreFiles?.global : undefined,
+					disregardParentIgnoreFiles: typeof options.useIgnoreFiles?.parent === 'boolean' ? !options.useIgnoreFiles?.parent : undefined,
+					disregardExcludeSettings: options.useExcludeSettings !== undefined && options.useExcludeSettings === ExcludeSettingOptions.None,
+					disregardSearchExcludeSettings: options.useExcludeSettings !== undefined && (options.useExcludeSettings !== ExcludeSettingOptions.SearchAndFilesExclude),
+					fileEncoding: options.encoding,
+					maxResults: options.maxResults,
+					previewOptions: options.previewOptions ? {
+						matchLines: options.previewOptions?.numMatchLines ?? 100,
+						charsPerLine: options.previewOptions?.charsPerLine ?? 10000,
+					} : undefined,
+					surroundingContext: options.surroundingContext,
+
+					includePattern: parsedInclude?.pattern,
+					excludePattern: excludePatterns
+				} satisfies ITextQueryBuilderOptions,
+				folder: parsedInclude?.folder
+			} satisfies QueryOptions<ITextQueryBuilderOptions>;
 		};
 
-		const isCanceled = false;
+		const queryOptionsRaw: (QueryOptions<ITextQueryBuilderOptions> | undefined)[] = ((options?.include?.map((include) =>
+			getOptions(include)))) ?? [getOptions(undefined)];
+
+		const queryOptions = queryOptionsRaw.filter((queryOps): queryOps is QueryOptions<ITextQueryBuilderOptions> => !!queryOps);
+
+		const disposables = new DisposableStore();
+		const progressEmitter = disposables.add(new Emitter<{ result: ITextSearchResult<URI>; uri: URI }>());
+		const complete = this.findTextInFilesBase(
+			query,
+			queryOptions,
+			(result, uri) => progressEmitter.fire({ result, uri }),
+			token
+		);
+		const asyncIterable = new AsyncIterableObject<vscode.TextSearchResultNew>(async emitter => {
+			disposables.add(progressEmitter.event(e => {
+				const result = e.result;
+				const uri = e.uri;
+				if (resultIsMatch(result)) {
+					emitter.emitOne(new TextSearchMatchNew(
+						uri,
+						result.rangeLocations.map((range) => ({
+							previewRange: new Range(range.preview.startLineNumber, range.preview.startColumn, range.preview.endLineNumber, range.preview.endColumn),
+							sourceRange: new Range(range.source.startLineNumber, range.source.startColumn, range.source.endLineNumber, range.source.endColumn)
+						})),
+						result.previewText
+
+					));
+				} else {
+					emitter.emitOne(new TextSearchContextNew(
+						uri,
+						result.text,
+						result.lineNumber
+					));
+
+				}
+			}));
+			await complete;
+		});
+
+		return {
+			results: asyncIterable,
+			complete: complete.then((e) => {
+				disposables.dispose();
+				return {
+					limitHit: e?.limitHit ?? false
+				};
+			}),
+		};
+	}
+
+
+	async findTextInFilesBase(query: vscode.TextSearchQuery, queryOptions: QueryOptions<ITextQueryBuilderOptions>[] | undefined, callback: (result: ITextSearchResult<URI>, uri: URI) => void, token: vscode.CancellationToken = CancellationToken.None): Promise<vscode.TextSearchComplete> {
+		const requestId = this._requestIdProvider.getNext();
+
+		let isCanceled = false;
+		token.onCancellationRequested(_ => {
+			isCanceled = true;
+		});
 
 		this._activeSearchCallbacks[requestId] = p => {
 			if (isCanceled) {
@@ -560,26 +677,7 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac
 			const uri = URI.revive(p.resource);
 			p.results!.forEach(rawResult => {
 				const result: ITextSearchResult<URI> = revive(rawResult);
-				if (resultIsMatch(result)) {
-					callback({
-						uri,
-						preview: {
-							text: result.preview.text,
-							matches: mapArrayOrNot(
-								result.preview.matches,
-								m => new Range(m.startLineNumber, m.startColumn, m.endLineNumber, m.endColumn))
-						},
-						ranges: mapArrayOrNot(
-							result.ranges,
-							r => new Range(r.startLineNumber, r.startColumn, r.endLineNumber, r.endColumn))
-					} satisfies vscode.TextSearchMatch);
-				} else {
-					callback({
-						uri,
-						text: result.text,
-						lineNumber: result.lineNumber
-					} satisfies vscode.TextSearchContext);
-				}
+				callback(result, uri);
 			});
 		};
 
@@ -588,20 +686,83 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac
 		}
 
 		try {
-			const result = await this._proxy.$startTextSearch(
+			const result = await Promise.all(queryOptions?.map(option => this._proxy.$startTextSearch(
 				query,
-				folder ?? null,
-				queryOptions,
+				option.folder ?? null,
+				option.options,
 				requestId,
-				token);
+				token) || {}
+			) ?? []);
 			delete this._activeSearchCallbacks[requestId];
-			return result || {};
+			return result.reduce((acc, val) => {
+				return {
+					limitHit: acc?.limitHit || (val?.limitHit ?? false),
+					message: [acc?.message ?? [], val?.message ?? []].flat(),
+				};
+			}, {}) ?? { limitHit: false };
+
 		} catch (err) {
 			delete this._activeSearchCallbacks[requestId];
 			throw err;
 		}
 	}
 
+	async findTextInFiles(query: vscode.TextSearchQuery, options: vscode.FindTextInFilesOptions & { useSearchExclude?: boolean }, callback: (result: vscode.TextSearchResult) => void, extensionId: ExtensionIdentifier, token: vscode.CancellationToken = CancellationToken.None): Promise<vscode.TextSearchComplete> {
+		this._logService.trace(`extHostWorkspace#findTextInFiles: textSearch, extension: ${extensionId.value}, entryPoint: findTextInFiles`);
+
+		const previewOptions: vscode.TextSearchPreviewOptions = typeof options.previewOptions === 'undefined' ?
+			{
+				matchLines: 100,
+				charsPerLine: 10000
+			} :
+			options.previewOptions;
+
+		const parsedInclude = parseSearchExcludeInclude(GlobPattern.from(options.include));
+
+		const excludePattern = (typeof options.exclude === 'string') ? options.exclude :
+			options.exclude ? options.exclude.pattern : undefined;
+		const queryOptions: ITextQueryBuilderOptions = {
+			ignoreSymlinks: typeof options.followSymlinks === 'boolean' ? !options.followSymlinks : undefined,
+			disregardIgnoreFiles: typeof options.useIgnoreFiles === 'boolean' ? !options.useIgnoreFiles : undefined,
+			disregardGlobalIgnoreFiles: typeof options.useGlobalIgnoreFiles === 'boolean' ? !options.useGlobalIgnoreFiles : undefined,
+			disregardParentIgnoreFiles: typeof options.useParentIgnoreFiles === 'boolean' ? !options.useParentIgnoreFiles : undefined,
+			disregardExcludeSettings: typeof options.useDefaultExcludes === 'boolean' ? !options.useDefaultExcludes : true,
+			disregardSearchExcludeSettings: typeof options.useSearchExclude === 'boolean' ? !options.useSearchExclude : true,
+			fileEncoding: options.encoding,
+			maxResults: options.maxResults,
+			previewOptions,
+			surroundingContext: options.afterContext, // TODO: remove ability to have before/after context separately
+
+			includePattern: parsedInclude?.pattern,
+			excludePattern: excludePattern ? [{ pattern: excludePattern }] : undefined,
+		};
+
+		const progress = (result: ITextSearchResult<URI>, uri: URI) => {
+			if (resultIsMatch(result)) {
+				callback({
+					uri,
+					preview: {
+						text: result.previewText,
+						matches: mapArrayOrNot(
+							result.rangeLocations,
+							m => new Range(m.preview.startLineNumber, m.preview.startColumn, m.preview.endLineNumber, m.preview.endColumn))
+					},
+					ranges: mapArrayOrNot(
+						result.rangeLocations,
+						r => new Range(r.source.startLineNumber, r.source.startColumn, r.source.endLineNumber, r.source.endColumn))
+				} satisfies vscode.TextSearchMatch);
+			} else {
+				callback({
+					uri,
+					text: result.text,
+					lineNumber: result.lineNumber
+				} satisfies vscode.TextSearchContext);
+			}
+		};
+
+		return this.findTextInFilesBase(query, [{ options: queryOptions, folder: parsedInclude?.folder }], progress, token);
+	}
+
 	$handleTextSearchResult(result: IRawFileMatch2, requestId: number): void {
 		this._activeSearchCallbacks[requestId]?.(result);
 	}
@@ -626,6 +787,14 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac
 		return this._proxy.$resolveProxy(url);
 	}
 
+	lookupAuthorization(authInfo: AuthInfo): Promise<Credentials | undefined> {
+		return this._proxy.$lookupAuthorization(authInfo);
+	}
+
+	lookupKerberosAuthorization(url: string): Promise<string | undefined> {
+		return this._proxy.$lookupKerberosAuthorization(url);
+	}
+
 	loadCertificates(): Promise<string[]> {
 		return this._proxy.$loadCertificates();
 	}
@@ -794,22 +963,23 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac
 export const IExtHostWorkspace = createDecorator<IExtHostWorkspace>('IExtHostWorkspace');
 export interface IExtHostWorkspace extends ExtHostWorkspace, ExtHostWorkspaceShape, IExtHostWorkspaceProvider { }
 
-function parseSearchInclude(include: string | IRelativePatternDto | undefined | null): { includePattern?: string; folder?: URI } {
-	let includePattern: string | undefined;
+function parseSearchExcludeInclude(include: string | IRelativePatternDto | undefined | null): { pattern: string; folder?: URI } | undefined {
+	let pattern: string | undefined;
 	let includeFolder: URI | undefined;
 	if (include) {
 		if (typeof include === 'string') {
-			includePattern = include;
+			pattern = include;
 		} else {
-			includePattern = include.pattern;
+			pattern = include.pattern;
 			includeFolder = URI.revive(include.baseUri);
 		}
-	}
 
-	return {
-		includePattern,
-		folder: includeFolder
-	};
+		return {
+			pattern,
+			folder: includeFolder
+		};
+	}
+	return undefined;
 }
 
 interface IExtensionListener<E> {
@@ -817,3 +987,27 @@ interface IExtensionListener<E> {
 	(e: E): any;
 }
 
+function globsToISearchPatternBuilder(excludes: vscode.GlobPattern[] | undefined): ISearchPatternBuilder<URI>[] {
+	return (
+		excludes?.map((exclude): ISearchPatternBuilder<URI> | undefined => {
+			if (typeof exclude === 'string') {
+				if (exclude === '') {
+					return undefined;
+				}
+				return {
+					pattern: exclude,
+					uri: undefined
+				} satisfies ISearchPatternBuilder<URI>;
+			} else {
+				const parsedExclude = parseSearchExcludeInclude(exclude);
+				if (!parsedExclude) {
+					return undefined;
+				}
+				return {
+					pattern: parsedExclude.pattern,
+					uri: parsedExclude.folder
+				} satisfies ISearchPatternBuilder<URI>;
+			}
+		}) ?? []
+	).filter((e): e is ISearchPatternBuilder<URI> => !!e);
+}
diff --git a/src/vs/workbench/api/common/extensionHostMain.ts b/src/vs/workbench/api/common/extensionHostMain.ts
index 2bd275cbc21..6c93b88e428 100644
--- a/src/vs/workbench/api/common/extensionHostMain.ts
+++ b/src/vs/workbench/api/common/extensionHostMain.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as errors from 'vs/base/common/errors';
-import * as performance from 'vs/base/common/performance';
-import { URI } from 'vs/base/common/uri';
-import { IURITransformer } from 'vs/base/common/uriIpc';
-import { IMessagePassingProtocol } from 'vs/base/parts/ipc/common/ipc';
-import { MainContext, MainThreadConsoleShape } from 'vs/workbench/api/common/extHost.protocol';
-import { IExtensionHostInitData } from 'vs/workbench/services/extensions/common/extensionHostProtocol';
-import { RPCProtocol } from 'vs/workbench/services/extensions/common/rpcProtocol';
-import { ExtensionIdentifier, IExtensionDescription, IRelaxedExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { ILogService } from 'vs/platform/log/common/log';
-import { getSingletonServiceDescriptors } from 'vs/platform/instantiation/common/extensions';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService';
-import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IExtHostRpcService, ExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import { IURITransformerService, URITransformerService } from 'vs/workbench/api/common/extHostUriTransformerService';
-import { IExtHostExtensionService, IHostUtils } from 'vs/workbench/api/common/extHostExtensionService';
-import { IExtHostTelemetry } from 'vs/workbench/api/common/extHostTelemetry';
-import { Mutable } from 'vs/base/common/types';
+import * as errors from '../../../base/common/errors.js';
+import * as performance from '../../../base/common/performance.js';
+import { URI } from '../../../base/common/uri.js';
+import { IURITransformer } from '../../../base/common/uriIpc.js';
+import { IMessagePassingProtocol } from '../../../base/parts/ipc/common/ipc.js';
+import { MainContext, MainThreadConsoleShape } from './extHost.protocol.js';
+import { IExtensionHostInitData } from '../../services/extensions/common/extensionHostProtocol.js';
+import { RPCProtocol } from '../../services/extensions/common/rpcProtocol.js';
+import { ExtensionIdentifier, IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { getSingletonServiceDescriptors } from '../../../platform/instantiation/common/extensions.js';
+import { ServiceCollection } from '../../../platform/instantiation/common/serviceCollection.js';
+import { IExtHostInitDataService } from './extHostInitDataService.js';
+import { InstantiationService } from '../../../platform/instantiation/common/instantiationService.js';
+import { IInstantiationService, ServicesAccessor } from '../../../platform/instantiation/common/instantiation.js';
+import { IExtHostRpcService, ExtHostRpcService } from './extHostRpcService.js';
+import { IURITransformerService, URITransformerService } from './extHostUriTransformerService.js';
+import { IExtHostExtensionService, IHostUtils } from './extHostExtensionService.js';
+import { IExtHostTelemetry } from './extHostTelemetry.js';
+import { Mutable } from '../../../base/common/types.js';
 
 export interface IExitFn {
 	(code?: number): any;
@@ -195,7 +195,7 @@ export class ExtensionHostMain {
 
 	private static _transform(initData: IExtensionHostInitData, rpcProtocol: RPCProtocol): IExtensionHostInitData {
 		initData.extensions.allExtensions.forEach((ext) => {
-			(<Mutable<IRelaxedExtensionDescription>>ext).extensionLocation = URI.revive(rpcProtocol.transformIncomingURIs(ext.extensionLocation));
+			(<Mutable<IExtensionDescription>>ext).extensionLocation = URI.revive(rpcProtocol.transformIncomingURIs(ext.extensionLocation));
 		});
 		initData.environment.appRoot = URI.revive(rpcProtocol.transformIncomingURIs(initData.environment.appRoot));
 		const extDevLocs = initData.environment.extensionDevelopmentLocationURI;
diff --git a/src/vs/workbench/api/common/jsonValidationExtensionPoint.ts b/src/vs/workbench/api/common/jsonValidationExtensionPoint.ts
index 1b82d305f19..24559bee3f8 100644
--- a/src/vs/workbench/api/common/jsonValidationExtensionPoint.ts
+++ b/src/vs/workbench/api/common/jsonValidationExtensionPoint.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import * as resources from 'vs/base/common/resources';
-import { isString } from 'vs/base/common/types';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Extensions, IExtensionFeatureTableRenderer, IExtensionFeaturesRegistry, IRenderedData, IRowData, ITableData } from 'vs/workbench/services/extensionManagement/common/extensionFeatures';
-import { IExtensionManifest } from 'vs/platform/extensions/common/extensions';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { MarkdownString } from 'vs/base/common/htmlContent';
+import * as nls from '../../../nls.js';
+import { ExtensionsRegistry } from '../../services/extensions/common/extensionsRegistry.js';
+import * as resources from '../../../base/common/resources.js';
+import { isString } from '../../../base/common/types.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { Extensions, IExtensionFeatureTableRenderer, IExtensionFeaturesRegistry, IRenderedData, IRowData, ITableData } from '../../services/extensionManagement/common/extensionFeatures.js';
+import { IExtensionManifest } from '../../../platform/extensions/common/extensions.js';
+import { Registry } from '../../../platform/registry/common/platform.js';
+import { SyncDescriptor } from '../../../platform/instantiation/common/descriptors.js';
+import { MarkdownString } from '../../../base/common/htmlContent.js';
 
 interface IJSONValidationExtensionPoint {
 	fileMatch: string | string[];
diff --git a/src/vs/workbench/api/common/shared/dataTransferCache.ts b/src/vs/workbench/api/common/shared/dataTransferCache.ts
index 49ff0735c5c..229407d21be 100644
--- a/src/vs/workbench/api/common/shared/dataTransferCache.ts
+++ b/src/vs/workbench/api/common/shared/dataTransferCache.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { coalesce } from 'vs/base/common/arrays';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { IDataTransferFile, IReadonlyVSDataTransfer } from 'vs/base/common/dataTransfer';
+import { coalesce } from '../../../../base/common/arrays.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { IDataTransferFile, IReadonlyVSDataTransfer } from '../../../../base/common/dataTransfer.js';
 
 export class DataTransferFileCache {
 
diff --git a/src/vs/workbench/api/common/shared/tasks.ts b/src/vs/workbench/api/common/shared/tasks.ts
index 6f0445ab393..67a3fe9e05d 100644
--- a/src/vs/workbench/api/common/shared/tasks.ts
+++ b/src/vs/workbench/api/common/shared/tasks.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { UriComponents } from 'vs/base/common/uri';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import type { Dto } from 'vs/workbench/services/extensions/common/proxyIdentifier';
+import { UriComponents } from '../../../../base/common/uri.js';
+import { IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
+import type { Dto } from '../../../services/extensions/common/proxyIdentifier.js';
 
 export interface ITaskDefinitionDTO {
 	type: string;
diff --git a/src/vs/workbench/api/node/extHost.node.services.ts b/src/vs/workbench/api/node/extHost.node.services.ts
index 582cea087ee..17d845a2ce6 100644
--- a/src/vs/workbench/api/node/extHost.node.services.ts
+++ b/src/vs/workbench/api/node/extHost.node.services.ts
@@ -3,29 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ExtHostTerminalService } from 'vs/workbench/api/node/extHostTerminalService';
-import { ExtHostTask } from 'vs/workbench/api/node/extHostTask';
-import { ExtHostDebugService } from 'vs/workbench/api/node/extHostDebugService';
-import { NativeExtHostSearch } from 'vs/workbench/api/node/extHostSearch';
-import { ExtHostExtensionService } from 'vs/workbench/api/node/extHostExtensionService';
-import { NodeExtHostTunnelService } from 'vs/workbench/api/node/extHostTunnelService';
-import { IExtHostDebugService } from 'vs/workbench/api/common/extHostDebugService';
-import { IExtHostExtensionService } from 'vs/workbench/api/common/extHostExtensionService';
-import { IExtHostSearch } from 'vs/workbench/api/common/extHostSearch';
-import { IExtHostTask } from 'vs/workbench/api/common/extHostTask';
-import { IExtHostTerminalService } from 'vs/workbench/api/common/extHostTerminalService';
-import { IExtHostTunnelService } from 'vs/workbench/api/common/extHostTunnelService';
-import { IExtensionStoragePaths } from 'vs/workbench/api/common/extHostStoragePaths';
-import { ExtensionStoragePaths } from 'vs/workbench/api/node/extHostStoragePaths';
-import { ExtHostLoggerService } from 'vs/workbench/api/node/extHostLoggerService';
-import { ILogService, ILoggerService } from 'vs/platform/log/common/log';
-import { NodeExtHostVariableResolverProviderService } from 'vs/workbench/api/node/extHostVariableResolverService';
-import { IExtHostVariableResolverProvider } from 'vs/workbench/api/common/extHostVariableResolverService';
-import { ExtHostLogService } from 'vs/workbench/api/common/extHostLogService';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { ISignService } from 'vs/platform/sign/common/sign';
-import { SignService } from 'vs/platform/sign/node/signService';
+import { InstantiationType, registerSingleton } from '../../../platform/instantiation/common/extensions.js';
+import { ExtHostTerminalService } from './extHostTerminalService.js';
+import { ExtHostTask } from './extHostTask.js';
+import { ExtHostDebugService } from './extHostDebugService.js';
+import { NativeExtHostSearch } from './extHostSearch.js';
+import { ExtHostExtensionService } from './extHostExtensionService.js';
+import { NodeExtHostTunnelService } from './extHostTunnelService.js';
+import { IExtHostDebugService } from '../common/extHostDebugService.js';
+import { IExtHostExtensionService } from '../common/extHostExtensionService.js';
+import { IExtHostSearch } from '../common/extHostSearch.js';
+import { IExtHostTask } from '../common/extHostTask.js';
+import { IExtHostTerminalService } from '../common/extHostTerminalService.js';
+import { IExtHostTunnelService } from '../common/extHostTunnelService.js';
+import { IExtensionStoragePaths } from '../common/extHostStoragePaths.js';
+import { ExtensionStoragePaths } from './extHostStoragePaths.js';
+import { ExtHostLoggerService } from './extHostLoggerService.js';
+import { ILogService, ILoggerService } from '../../../platform/log/common/log.js';
+import { NodeExtHostVariableResolverProviderService } from './extHostVariableResolverService.js';
+import { IExtHostVariableResolverProvider } from '../common/extHostVariableResolverService.js';
+import { ExtHostLogService } from '../common/extHostLogService.js';
+import { SyncDescriptor } from '../../../platform/instantiation/common/descriptors.js';
+import { ISignService } from '../../../platform/sign/common/sign.js';
+import { SignService } from '../../../platform/sign/node/signService.js';
 
 // #########################################################################
 // ###                                                                   ###
diff --git a/src/vs/workbench/api/node/extHostCLIServer.ts b/src/vs/workbench/api/node/extHostCLIServer.ts
index d9bb87accf8..e6261fb0b0c 100644
--- a/src/vs/workbench/api/node/extHostCLIServer.ts
+++ b/src/vs/workbench/api/node/extHostCLIServer.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createRandomIPCHandle } from 'vs/base/parts/ipc/node/ipc.net';
+import { createRandomIPCHandle } from '../../../base/parts/ipc/node/ipc.net.js';
 import * as http from 'http';
 import * as fs from 'fs';
-import { IExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
-import { IWindowOpenable, IOpenWindowOptions } from 'vs/platform/window/common/window';
-import { URI } from 'vs/base/common/uri';
-import { ILogService } from 'vs/platform/log/common/log';
-import { hasWorkspaceFileExtension } from 'vs/platform/workspace/common/workspace';
+import { IExtHostCommands } from '../common/extHostCommands.js';
+import { IWindowOpenable, IOpenWindowOptions } from '../../../platform/window/common/window.js';
+import { URI } from '../../../base/common/uri.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { hasWorkspaceFileExtension } from '../../../platform/workspace/common/workspace.js';
 
 export interface OpenCommandPipeArgs {
 	type: 'open';
diff --git a/src/vs/workbench/api/node/extHostConsoleForwarder.ts b/src/vs/workbench/api/node/extHostConsoleForwarder.ts
index 9069b9d041d..aa2dbca286c 100644
--- a/src/vs/workbench/api/node/extHostConsoleForwarder.ts
+++ b/src/vs/workbench/api/node/extHostConsoleForwarder.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { AbstractExtHostConsoleForwarder } from 'vs/workbench/api/common/extHostConsoleForwarder';
-import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import { NativeLogMarkers } from 'vs/workbench/services/extensions/common/extensionHostProtocol';
+import { AbstractExtHostConsoleForwarder } from '../common/extHostConsoleForwarder.js';
+import { IExtHostInitDataService } from '../common/extHostInitDataService.js';
+import { IExtHostRpcService } from '../common/extHostRpcService.js';
+import { NativeLogMarkers } from '../../services/extensions/common/extensionHostProtocol.js';
 
 const MAX_STREAM_BUFFER_LENGTH = 1024 * 1024;
 
diff --git a/src/vs/workbench/api/node/extHostDebugService.ts b/src/vs/workbench/api/node/extHostDebugService.ts
index dc48354e372..e28cee046b1 100644
--- a/src/vs/workbench/api/node/extHostDebugService.ts
+++ b/src/vs/workbench/api/node/extHostDebugService.ts
@@ -3,31 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createCancelablePromise, firstParallel, timeout } from 'vs/base/common/async';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import * as platform from 'vs/base/common/platform';
-import * as nls from 'vs/nls';
-import { IExternalTerminalService } from 'vs/platform/externalTerminal/common/externalTerminal';
-import { LinuxExternalTerminalService, MacExternalTerminalService, WindowsExternalTerminalService } from 'vs/platform/externalTerminal/node/externalTerminalService';
-import { ISignService } from 'vs/platform/sign/common/sign';
-import { SignService } from 'vs/platform/sign/node/signService';
-import { ExtHostDebugServiceBase, ExtHostDebugSession } from 'vs/workbench/api/common/extHostDebugService';
-import { IExtHostEditorTabs } from 'vs/workbench/api/common/extHostEditorTabs';
-import { IExtHostExtensionService } from 'vs/workbench/api/common/extHostExtensionService';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import { IExtHostTerminalService } from 'vs/workbench/api/common/extHostTerminalService';
-import { DebugAdapterExecutable, ThemeIcon } from 'vs/workbench/api/common/extHostTypes';
-import { IExtHostVariableResolverProvider } from 'vs/workbench/api/common/extHostVariableResolverService';
-import { IExtHostWorkspace } from 'vs/workbench/api/common/extHostWorkspace';
-import { AbstractDebugAdapter } from 'vs/workbench/contrib/debug/common/abstractDebugAdapter';
-import { IAdapterDescriptor } from 'vs/workbench/contrib/debug/common/debug';
-import { ExecutableDebugAdapter, NamedPipeDebugAdapter, SocketDebugAdapter } from 'vs/workbench/contrib/debug/node/debugAdapter';
-import { hasChildProcesses, prepareCommand } from 'vs/workbench/contrib/debug/node/terminals';
-import { ExtensionDescriptionRegistry } from 'vs/workbench/services/extensions/common/extensionDescriptionRegistry';
-import type * as vscode from 'vscode';
-import { ExtHostConfigProvider, IExtHostConfiguration } from '../common/extHostConfiguration';
-import { IExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
-import { IExtHostTesting } from 'vs/workbench/api/common/extHostTesting';
+import * as vscode from 'vscode';
+import { createCancelablePromise, disposableTimeout, firstParallel, RunOnceScheduler, timeout } from '../../../base/common/async.js';
+import { DisposableStore, IDisposable } from '../../../base/common/lifecycle.js';
+import * as platform from '../../../base/common/platform.js';
+import * as nls from '../../../nls.js';
+import { IExternalTerminalService } from '../../../platform/externalTerminal/common/externalTerminal.js';
+import { LinuxExternalTerminalService, MacExternalTerminalService, WindowsExternalTerminalService } from '../../../platform/externalTerminal/node/externalTerminalService.js';
+import { ISignService } from '../../../platform/sign/common/sign.js';
+import { SignService } from '../../../platform/sign/node/signService.js';
+import { AbstractDebugAdapter } from '../../contrib/debug/common/abstractDebugAdapter.js';
+import { ExecutableDebugAdapter, NamedPipeDebugAdapter, SocketDebugAdapter } from '../../contrib/debug/node/debugAdapter.js';
+import { hasChildProcesses, prepareCommand } from '../../contrib/debug/node/terminals.js';
+import { ExtensionDescriptionRegistry } from '../../services/extensions/common/extensionDescriptionRegistry.js';
+import { IExtHostCommands } from '../common/extHostCommands.js';
+import { ExtHostConfigProvider, IExtHostConfiguration } from '../common/extHostConfiguration.js';
+import { ExtHostDebugServiceBase, ExtHostDebugSession } from '../common/extHostDebugService.js';
+import { IExtHostEditorTabs } from '../common/extHostEditorTabs.js';
+import { IExtHostExtensionService } from '../common/extHostExtensionService.js';
+import { IExtHostRpcService } from '../common/extHostRpcService.js';
+import { IExtHostTerminalService } from '../common/extHostTerminalService.js';
+import { IExtHostTesting } from '../common/extHostTesting.js';
+import { DebugAdapterExecutable, DebugAdapterNamedPipeServer, DebugAdapterServer, ThemeIcon } from '../common/extHostTypes.js';
+import { IExtHostVariableResolverProvider } from '../common/extHostVariableResolverService.js';
+import { IExtHostWorkspace } from '../common/extHostWorkspace.js';
+import { IExtHostTerminalShellIntegration } from '../common/extHostTerminalShellIntegration.js';
 
 export class ExtHostDebugService extends ExtHostDebugServiceBase {
 
@@ -42,6 +42,7 @@ export class ExtHostDebugService extends ExtHostDebugServiceBase {
 		@IExtHostExtensionService extensionService: IExtHostExtensionService,
 		@IExtHostConfiguration configurationService: IExtHostConfiguration,
 		@IExtHostTerminalService private _terminalService: IExtHostTerminalService,
+		@IExtHostTerminalShellIntegration private _terminalShellIntegrationService: IExtHostTerminalShellIntegration,
 		@IExtHostEditorTabs editorTabs: IExtHostEditorTabs,
 		@IExtHostVariableResolverProvider variableResolver: IExtHostVariableResolverProvider,
 		@IExtHostCommands commands: IExtHostCommands,
@@ -50,16 +51,16 @@ export class ExtHostDebugService extends ExtHostDebugServiceBase {
 		super(extHostRpcService, workspaceService, extensionService, configurationService, editorTabs, variableResolver, commands, testing);
 	}
 
-	protected override createDebugAdapter(adapter: IAdapterDescriptor, session: ExtHostDebugSession): AbstractDebugAdapter | undefined {
-		switch (adapter.type) {
-			case 'server':
-				return new SocketDebugAdapter(adapter);
-			case 'pipeServer':
-				return new NamedPipeDebugAdapter(adapter);
-			case 'executable':
-				return new ExecutableDebugAdapter(adapter, session.type);
+	protected override createDebugAdapter(adapter: vscode.DebugAdapterDescriptor, session: ExtHostDebugSession): AbstractDebugAdapter | undefined {
+		if (adapter instanceof DebugAdapterExecutable) {
+			return new ExecutableDebugAdapter(this.convertExecutableToDto(adapter), session.type);
+		} else if (adapter instanceof DebugAdapterServer) {
+			return new SocketDebugAdapter(this.convertServerToDto(adapter));
+		} else if (adapter instanceof DebugAdapterNamedPipeServer) {
+			return new NamedPipeDebugAdapter(this.convertPipeServerToDto(adapter));
+		} else {
+			return super.createDebugAdapter(adapter, session);
 		}
-		return super.createDebugAdapter(adapter, session);
 	}
 
 	protected override daExecutableFromPackage(session: ExtHostDebugSession, extensionRegistry: ExtensionDescriptionRegistry): DebugAdapterExecutable | undefined {
@@ -124,10 +125,34 @@ export class ExtHostDebugService extends ExtHostDebugServiceBase {
 			const shellProcessId = await terminal.processId;
 
 			if (giveShellTimeToInitialize) {
-				// give a new terminal some time to initialize the shell
-				await new Promise(resolve => setTimeout(resolve, 1000));
+				// give a new terminal some time to initialize the shell (most recently, #228191)
+				// - If shell integration is available, use that as a deterministic signal
+				// - Debounce content being written to known when the prompt is available
+				// - Give a longer timeout otherwise
+				const enum Timing {
+					DataDebounce = 500,
+					MaxDelay = 5000,
+				}
+
+				const ds = new DisposableStore();
+				await new Promise<void>(resolve => {
+					const scheduler = ds.add(new RunOnceScheduler(resolve, Timing.DataDebounce));
+					ds.add(this._terminalService.onDidWriteTerminalData(e => {
+						if (e.terminal === terminal) {
+							scheduler.schedule();
+						}
+					}));
+					ds.add(this._terminalShellIntegrationService.onDidChangeTerminalShellIntegration(e => {
+						if (e.terminal === terminal) {
+							resolve();
+						}
+					}));
+					ds.add(disposableTimeout(resolve, Timing.MaxDelay));
+				});
+
+				ds.dispose();
 			} else {
-				if (terminal.state.isInteractedWith) {
+				if (terminal.state.isInteractedWith && !terminal.shellIntegration) {
 					terminal.sendText('\u0003'); // Ctrl+C for #106743. Not part of the same command for #107969
 					await timeout(200); // mirroring https://github.com/microsoft/vscode/blob/c67ccc70ece5f472ec25464d3eeb874cfccee9f1/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts#L852-L857
 				}
@@ -147,7 +172,12 @@ export class ExtHostDebugService extends ExtHostDebugServiceBase {
 			}
 
 			const command = prepareCommand(shell, args.args, !!args.argsCanBeInterpretedByShell, cwdForPrepareCommand, args.env);
-			terminal.sendText(command);
+
+			if (terminal.shellIntegration) {
+				terminal.shellIntegration.executeCommand(command);
+			} else {
+				terminal.sendText(command);
+			}
 
 			// Mark terminal as unused when its session ends, see #112055
 			const sessionListener = this.onDidTerminateDebugSession(s => {
diff --git a/src/vs/workbench/api/node/extHostDiskFileSystemProvider.ts b/src/vs/workbench/api/node/extHostDiskFileSystemProvider.ts
index c4a5e1d2b05..2be6ba4652f 100644
--- a/src/vs/workbench/api/node/extHostDiskFileSystemProvider.ts
+++ b/src/vs/workbench/api/node/extHostDiskFileSystemProvider.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type * as vscode from 'vscode';
-import { IExtHostConsumerFileSystem } from 'vs/workbench/api/common/extHostFileSystemConsumer';
-import { Schemas } from 'vs/base/common/network';
-import { ILogService } from 'vs/platform/log/common/log';
-import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
-import { FilePermission } from 'vs/platform/files/common/files';
-import { isLinux } from 'vs/base/common/platform';
+import { IExtHostConsumerFileSystem } from '../common/extHostFileSystemConsumer.js';
+import { Schemas } from '../../../base/common/network.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { DiskFileSystemProvider } from '../../../platform/files/node/diskFileSystemProvider.js';
+import { FilePermission } from '../../../platform/files/common/files.js';
+import { isLinux } from '../../../base/common/platform.js';
 
 export class ExtHostDiskFileSystemProvider {
 
diff --git a/src/vs/workbench/api/node/extHostDownloadService.ts b/src/vs/workbench/api/node/extHostDownloadService.ts
index 9d81fe712ed..671dc268b51 100644
--- a/src/vs/workbench/api/node/extHostDownloadService.ts
+++ b/src/vs/workbench/api/node/extHostDownloadService.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { join } from 'vs/base/common/path';
+import { join } from '../../../base/common/path.js';
 import { tmpdir } from 'os';
-import { generateUuid } from 'vs/base/common/uuid';
-import { IExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { MainContext } from 'vs/workbench/api/common/extHost.protocol';
-import { URI } from 'vs/base/common/uri';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
+import { generateUuid } from '../../../base/common/uuid.js';
+import { IExtHostCommands } from '../common/extHostCommands.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { MainContext } from '../common/extHost.protocol.js';
+import { URI } from '../../../base/common/uri.js';
+import { IExtHostRpcService } from '../common/extHostRpcService.js';
 
 export class ExtHostDownloadService extends Disposable {
 
diff --git a/src/vs/workbench/api/node/extHostExtensionService.ts b/src/vs/workbench/api/node/extHostExtensionService.ts
index 5ac0ddc7ec9..7fae836bf43 100644
--- a/src/vs/workbench/api/node/extHostExtensionService.ts
+++ b/src/vs/workbench/api/node/extHostExtensionService.ts
@@ -3,27 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as performance from 'vs/base/common/performance';
-import { createApiFactoryAndRegisterActors } from 'vs/workbench/api/common/extHost.api.impl';
-import { RequireInterceptor } from 'vs/workbench/api/common/extHostRequireInterceptor';
-import { ExtensionActivationTimesBuilder } from 'vs/workbench/api/common/extHostExtensionActivator';
-import { connectProxyResolver } from 'vs/workbench/api/node/proxyResolver';
-import { AbstractExtHostExtensionService } from 'vs/workbench/api/common/extHostExtensionService';
-import { ExtHostDownloadService } from 'vs/workbench/api/node/extHostDownloadService';
-import { URI } from 'vs/base/common/uri';
-import { Schemas } from 'vs/base/common/network';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { ExtensionRuntime } from 'vs/workbench/api/common/extHostTypes';
-import { CLIServer } from 'vs/workbench/api/node/extHostCLIServer';
-import { realpathSync } from 'vs/base/node/extpath';
-import { ExtHostConsoleForwarder } from 'vs/workbench/api/node/extHostConsoleForwarder';
-import { ExtHostDiskFileSystemProvider } from 'vs/workbench/api/node/extHostDiskFileSystemProvider';
+import * as performance from '../../../base/common/performance.js';
+import { createApiFactoryAndRegisterActors } from '../common/extHost.api.impl.js';
+import { RequireInterceptor } from '../common/extHostRequireInterceptor.js';
+import { ExtensionActivationTimesBuilder } from '../common/extHostExtensionActivator.js';
+import { connectProxyResolver } from './proxyResolver.js';
+import { AbstractExtHostExtensionService } from '../common/extHostExtensionService.js';
+import { ExtHostDownloadService } from './extHostDownloadService.js';
+import { URI } from '../../../base/common/uri.js';
+import { Schemas } from '../../../base/common/network.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { ExtensionRuntime } from '../common/extHostTypes.js';
+import { CLIServer } from './extHostCLIServer.js';
+import { realpathSync } from '../../../base/node/extpath.js';
+import { ExtHostConsoleForwarder } from './extHostConsoleForwarder.js';
+import { ExtHostDiskFileSystemProvider } from './extHostDiskFileSystemProvider.js';
+import { createRequire } from 'node:module';
+const require = createRequire(import.meta.url);
 
 class NodeModuleRequireInterceptor extends RequireInterceptor {
 
 	protected _installInterceptor(): void {
 		const that = this;
-		const node_module = <any>globalThis._VSCODE_NODE_MODULES.module;
+		const node_module = require('module');
 		const originalLoad = node_module._load;
 		node_module._load = function load(request: string, parent: { filename: string }, isMain: boolean) {
 			request = applyAlternatives(request);
@@ -42,6 +44,18 @@ class NodeModuleRequireInterceptor extends RequireInterceptor {
 			return originalLookup.call(this, applyAlternatives(request), parent);
 		};
 
+		const originalResolveFilename = node_module._resolveFilename;
+		node_module._resolveFilename = function resolveFilename(request: string, parent: unknown, isMain: boolean, options?: { paths?: string[] }) {
+			if (request === 'vsda' && Array.isArray(options?.paths) && options.paths.length === 0) {
+				// ESM: ever since we moved to ESM, `require.main` will be `undefined` for extensions
+				// Some extensions have been using `require.resolve('vsda', { paths: require.main.paths })`
+				// to find the `vsda` module in our app root. To be backwards compatible with this pattern,
+				// we help by filling in the `paths` array with the node modules paths of the current module.
+				options.paths = node_module._nodeModulePaths(import.meta.dirname);
+			}
+			return originalResolveFilename.call(this, request, parent, isMain, options);
+		};
+
 		const applyAlternatives = (request: string) => {
 			for (const alternativeModuleName of that._alternatives) {
 				const alternative = alternativeModuleName(request);
@@ -85,7 +99,7 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService {
 
 		// Do this when extension service exists, but extensions are not being activated yet.
 		const configProvider = await this._extHostConfiguration.getConfigProvider();
-		await connectProxyResolver(this._extHostWorkspace, configProvider, this, this._logService, this._mainThreadTelemetryProxy, this._initData);
+		await connectProxyResolver(this._extHostWorkspace, configProvider, this, this._logService, this._mainThreadTelemetryProxy, this._initData, this._store);
 		performance.mark('code/extHost/didInitProxyResolver');
 	}
 
@@ -109,7 +123,7 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService {
 			if (extensionId) {
 				performance.mark(`code/extHost/willLoadExtensionCode/${extensionId}`);
 			}
-			r = require.__$__nodeRequire<T>(module.fsPath);
+			r = <T>(require)(module.fsPath);
 		} finally {
 			if (extensionId) {
 				performance.mark(`code/extHost/didLoadExtensionCode/${extensionId}`);
diff --git a/src/vs/workbench/api/node/extHostLoggerService.ts b/src/vs/workbench/api/node/extHostLoggerService.ts
index 37bd422fbbe..8d7d79c9867 100644
--- a/src/vs/workbench/api/node/extHostLoggerService.ts
+++ b/src/vs/workbench/api/node/extHostLoggerService.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ILogger, ILoggerOptions, ILoggerResource, LogLevel } from 'vs/platform/log/common/log';
-import { URI } from 'vs/base/common/uri';
-import { ExtHostLoggerService as BaseExtHostLoggerService } from 'vs/workbench/api/common/extHostLoggerService';
-import { Schemas } from 'vs/base/common/network';
-import { SpdLogLogger } from 'vs/platform/log/node/spdlogLog';
-import { generateUuid } from 'vs/base/common/uuid';
+import { ILogger, ILoggerOptions, ILoggerResource, LogLevel } from '../../../platform/log/common/log.js';
+import { URI } from '../../../base/common/uri.js';
+import { ExtHostLoggerService as BaseExtHostLoggerService } from '../common/extHostLoggerService.js';
+import { Schemas } from '../../../base/common/network.js';
+import { SpdLogLogger } from '../../../platform/log/node/spdlogLog.js';
+import { generateUuid } from '../../../base/common/uuid.js';
 
 export class ExtHostLoggerService extends BaseExtHostLoggerService {
 
diff --git a/src/vs/workbench/api/node/extHostSearch.ts b/src/vs/workbench/api/node/extHostSearch.ts
index d10dbbb7d99..c91dd904607 100644
--- a/src/vs/workbench/api/node/extHostSearch.ts
+++ b/src/vs/workbench/api/node/extHostSearch.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import * as pfs from 'vs/base/node/pfs';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IExtHostConfiguration } from 'vs/workbench/api/common/extHostConfiguration';
-import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import { ExtHostSearch, reviveQuery } from 'vs/workbench/api/common/extHostSearch';
-import { IURITransformerService } from 'vs/workbench/api/common/extHostUriTransformerService';
-import { IFileQuery, IRawFileQuery, ISearchCompleteStats, ISerializedSearchProgressItem, isSerializedFileMatch, ITextQuery } from 'vs/workbench/services/search/common/search';
-import { TextSearchManager } from 'vs/workbench/services/search/common/textSearchManager';
-import { SearchService } from 'vs/workbench/services/search/node/rawSearchService';
-import { RipgrepSearchProvider } from 'vs/workbench/services/search/node/ripgrepSearchProvider';
-import { OutputChannel } from 'vs/workbench/services/search/node/ripgrepSearchUtils';
-import { NativeTextSearchManager } from 'vs/workbench/services/search/node/textSearchManager';
+import { DisposableStore, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { Schemas } from '../../../base/common/network.js';
+import { URI } from '../../../base/common/uri.js';
+import * as pfs from '../../../base/node/pfs.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { IExtHostConfiguration } from '../common/extHostConfiguration.js';
+import { IExtHostInitDataService } from '../common/extHostInitDataService.js';
+import { IExtHostRpcService } from '../common/extHostRpcService.js';
+import { ExtHostSearch, reviveQuery } from '../common/extHostSearch.js';
+import { IURITransformerService } from '../common/extHostUriTransformerService.js';
+import { IFileQuery, IRawFileQuery, ISearchCompleteStats, ISerializedSearchProgressItem, isSerializedFileMatch, ITextQuery } from '../../services/search/common/search.js';
+import { TextSearchManager } from '../../services/search/common/textSearchManager.js';
+import { SearchService } from '../../services/search/node/rawSearchService.js';
+import { RipgrepSearchProvider } from '../../services/search/node/ripgrepSearchProvider.js';
+import { OutputChannel } from '../../services/search/node/ripgrepSearchUtils.js';
+import { NativeTextSearchManager } from '../../services/search/node/textSearchManager.js';
 import type * as vscode from 'vscode';
 
 export class NativeExtHostSearch extends ExtHostSearch implements IDisposable {
@@ -161,7 +161,7 @@ export class NativeExtHostSearch extends ExtHostSearch implements IDisposable {
 		return super.$clearCache(cacheKey);
 	}
 
-	protected override createTextSearchManager(query: ITextQuery, provider: vscode.TextSearchProvider): TextSearchManager {
+	protected override createTextSearchManager(query: ITextQuery, provider: vscode.TextSearchProviderNew): TextSearchManager {
 		return new NativeTextSearchManager(query, provider, undefined, 'textSearchProvider');
 	}
 }
diff --git a/src/vs/workbench/api/node/extHostStoragePaths.ts b/src/vs/workbench/api/node/extHostStoragePaths.ts
index 8348d9490b2..4ec23a27e5a 100644
--- a/src/vs/workbench/api/node/extHostStoragePaths.ts
+++ b/src/vs/workbench/api/node/extHostStoragePaths.ts
@@ -4,14 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as fs from 'fs';
-import * as path from 'vs/base/common/path';
-import { URI } from 'vs/base/common/uri';
-import { ExtensionStoragePaths as CommonExtensionStoragePaths } from 'vs/workbench/api/common/extHostStoragePaths';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { IntervalTimer, timeout } from 'vs/base/common/async';
-import { ILogService } from 'vs/platform/log/common/log';
-import { Promises } from 'vs/base/node/pfs';
+import * as path from '../../../base/common/path.js';
+import { URI } from '../../../base/common/uri.js';
+import { ExtensionStoragePaths as CommonExtensionStoragePaths } from '../common/extHostStoragePaths.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { Schemas } from '../../../base/common/network.js';
+import { IntervalTimer, timeout } from '../../../base/common/async.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { Promises } from '../../../base/node/pfs.js';
 
 export class ExtensionStoragePaths extends CommonExtensionStoragePaths {
 
@@ -69,14 +69,14 @@ export class ExtensionStoragePaths extends CommonExtensionStoragePaths {
 
 async function mkdir(dir: string): Promise<void> {
 	try {
-		await Promises.stat(dir);
+		await fs.promises.stat(dir);
 		return;
 	} catch {
 		// doesn't exist, that's OK
 	}
 
 	try {
-		await Promises.mkdir(dir, { recursive: true });
+		await fs.promises.mkdir(dir, { recursive: true });
 	} catch {
 	}
 }
@@ -103,7 +103,7 @@ class Lock extends Disposable {
 				this._timer.cancel();
 			}
 			try {
-				await Promises.utimes(filename, new Date(), new Date());
+				await fs.promises.utimes(filename, new Date(), new Date());
 			} catch (err) {
 				logService.error(err);
 				logService.info(`Lock '${filename}': Could not update mtime.`);
@@ -174,7 +174,7 @@ interface ILockfileContents {
 async function readLockfileContents(logService: ILogService, filename: string): Promise<ILockfileContents | null> {
 	let contents: Buffer;
 	try {
-		contents = await Promises.readFile(filename);
+		contents = await fs.promises.readFile(filename);
 	} catch (err) {
 		// cannot read the file
 		logService.error(err);
@@ -196,7 +196,7 @@ async function readLockfileContents(logService: ILogService, filename: string):
 async function readmtime(logService: ILogService, filename: string): Promise<number> {
 	let stats: fs.Stats;
 	try {
-		stats = await Promises.stat(filename);
+		stats = await fs.promises.stat(filename);
 	} catch (err) {
 		// cannot read the file stats to check if it is stale or not
 		logService.error(err);
@@ -279,7 +279,7 @@ async function checkStaleAndTryAcquireLock(logService: ILogService, filename: st
 async function tryDeleteAndAcquireLock(logService: ILogService, filename: string): Promise<Lock | null> {
 	logService.info(`Lock '${filename}': Deleting a stale lock.`);
 	try {
-		await Promises.unlink(filename);
+		await fs.promises.unlink(filename);
 	} catch (err) {
 		// cannot delete the file
 		// maybe the file is already deleted
diff --git a/src/vs/workbench/api/node/extHostTask.ts b/src/vs/workbench/api/node/extHostTask.ts
index b5fac17cde7..1e1f0637a26 100644
--- a/src/vs/workbench/api/node/extHostTask.ts
+++ b/src/vs/workbench/api/node/extHostTask.ts
@@ -3,28 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as path from 'vs/base/common/path';
+import * as path from '../../../base/common/path.js';
 
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { win32 } from 'vs/base/node/processes';
-import * as types from 'vs/workbench/api/common/extHostTypes';
-import { IExtHostWorkspace } from 'vs/workbench/api/common/extHostWorkspace';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { win32 } from '../../../base/node/processes.js';
+import * as types from '../common/extHostTypes.js';
+import { IExtHostWorkspace } from '../common/extHostWorkspace.js';
 import type * as vscode from 'vscode';
-import * as tasks from '../common/shared/tasks';
-import { IExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
-import { IExtHostConfiguration } from 'vs/workbench/api/common/extHostConfiguration';
-import { IWorkspaceFolder, WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { IExtHostTerminalService } from 'vs/workbench/api/common/extHostTerminalService';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService';
-import { ExtHostTaskBase, TaskHandleDTO, TaskDTO, CustomExecutionDTO, HandlerData } from 'vs/workbench/api/common/extHostTask';
-import { Schemas } from 'vs/base/common/network';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IExtHostApiDeprecationService } from 'vs/workbench/api/common/extHostApiDeprecationService';
-import * as resources from 'vs/base/common/resources';
+import * as tasks from '../common/shared/tasks.js';
+import { IExtHostDocumentsAndEditors } from '../common/extHostDocumentsAndEditors.js';
+import { IExtHostConfiguration } from '../common/extHostConfiguration.js';
+import { IWorkspaceFolder, WorkspaceFolder } from '../../../platform/workspace/common/workspace.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { IExtHostTerminalService } from '../common/extHostTerminalService.js';
+import { IExtHostRpcService } from '../common/extHostRpcService.js';
+import { IExtHostInitDataService } from '../common/extHostInitDataService.js';
+import { ExtHostTaskBase, TaskHandleDTO, TaskDTO, CustomExecutionDTO, HandlerData } from '../common/extHostTask.js';
+import { Schemas } from '../../../base/common/network.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { IExtHostApiDeprecationService } from '../common/extHostApiDeprecationService.js';
+import * as resources from '../../../base/common/resources.js';
 import { homedir } from 'os';
-import { IExtHostVariableResolverProvider } from 'vs/workbench/api/common/extHostVariableResolverService';
+import { IExtHostVariableResolverProvider } from '../common/extHostVariableResolverService.js';
 
 export class ExtHostTask extends ExtHostTaskBase {
 	constructor(
diff --git a/src/vs/workbench/api/node/extHostTerminalService.ts b/src/vs/workbench/api/node/extHostTerminalService.ts
index fd5ec81368c..299f6d6d447 100644
--- a/src/vs/workbench/api/node/extHostTerminalService.ts
+++ b/src/vs/workbench/api/node/extHostTerminalService.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { generateUuid } from 'vs/base/common/uuid';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import { BaseExtHostTerminalService, ExtHostTerminal, ITerminalInternalOptions } from 'vs/workbench/api/common/extHostTerminalService';
+import { generateUuid } from '../../../base/common/uuid.js';
+import { IExtHostRpcService } from '../common/extHostRpcService.js';
+import { BaseExtHostTerminalService, ExtHostTerminal, ITerminalInternalOptions } from '../common/extHostTerminalService.js';
 import type * as vscode from 'vscode';
-import { IExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
+import { IExtHostCommands } from '../common/extHostCommands.js';
 
 export class ExtHostTerminalService extends BaseExtHostTerminalService {
 
diff --git a/src/vs/workbench/api/node/extHostTunnelService.ts b/src/vs/workbench/api/node/extHostTunnelService.ts
index 13498806104..5e0e5cafa32 100644
--- a/src/vs/workbench/api/node/extHostTunnelService.ts
+++ b/src/vs/workbench/api/node/extHostTunnelService.ts
@@ -3,26 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as fs from 'fs';
 import { exec } from 'child_process';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { Emitter } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { MovingAverage } from 'vs/base/common/numbers';
-import { isLinux } from 'vs/base/common/platform';
-import * as resources from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import * as pfs from 'vs/base/node/pfs';
-import { ISocket, SocketCloseEventType } from 'vs/base/parts/ipc/common/ipc.net';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ManagedSocket, RemoteSocketHalf, connectManagedSocket } from 'vs/platform/remote/common/managedSocket';
-import { ManagedRemoteConnection } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { ISignService } from 'vs/platform/sign/common/sign';
-import { isAllInterfaces, isLocalhost } from 'vs/platform/tunnel/common/tunnel';
-import { NodeRemoteTunnel } from 'vs/platform/tunnel/node/tunnelService';
-import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import { ExtHostTunnelService } from 'vs/workbench/api/common/extHostTunnelService';
-import { CandidatePort, parseAddress } from 'vs/workbench/services/remote/common/tunnelModel';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { Emitter } from '../../../base/common/event.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { MovingAverage } from '../../../base/common/numbers.js';
+import { isLinux } from '../../../base/common/platform.js';
+import * as resources from '../../../base/common/resources.js';
+import { URI } from '../../../base/common/uri.js';
+import * as pfs from '../../../base/node/pfs.js';
+import { ISocket, SocketCloseEventType } from '../../../base/parts/ipc/common/ipc.net.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { ManagedSocket, RemoteSocketHalf, connectManagedSocket } from '../../../platform/remote/common/managedSocket.js';
+import { ManagedRemoteConnection } from '../../../platform/remote/common/remoteAuthorityResolver.js';
+import { ISignService } from '../../../platform/sign/common/sign.js';
+import { isAllInterfaces, isLocalhost } from '../../../platform/tunnel/common/tunnel.js';
+import { NodeRemoteTunnel } from '../../../platform/tunnel/node/tunnelService.js';
+import { IExtHostInitDataService } from '../common/extHostInitDataService.js';
+import { IExtHostRpcService } from '../common/extHostRpcService.js';
+import { ExtHostTunnelService } from '../common/extHostTunnelService.js';
+import { CandidatePort, parseAddress } from '../../services/remote/common/tunnelModel.js';
 import * as vscode from 'vscode';
 
 export function getSockets(stdout: string): Record<string, { pid: number; socket: number }> {
@@ -243,8 +244,8 @@ export class NodeExtHostTunnelService extends ExtHostTunnelService {
 		let tcp: string = '';
 		let tcp6: string = '';
 		try {
-			tcp = await pfs.Promises.readFile('/proc/net/tcp', 'utf8');
-			tcp6 = await pfs.Promises.readFile('/proc/net/tcp6', 'utf8');
+			tcp = await fs.promises.readFile('/proc/net/tcp', 'utf8');
+			tcp6 = await fs.promises.readFile('/proc/net/tcp6', 'utf8');
 		} catch (e) {
 			// File reading error. No additional handling needed.
 		}
@@ -265,10 +266,10 @@ export class NodeExtHostTunnelService extends ExtHostTunnelService {
 			try {
 				const pid: number = Number(childName);
 				const childUri = resources.joinPath(URI.file('/proc'), childName);
-				const childStat = await pfs.Promises.stat(childUri.fsPath);
+				const childStat = await fs.promises.stat(childUri.fsPath);
 				if (childStat.isDirectory() && !isNaN(pid)) {
-					const cwd = await pfs.Promises.readlink(resources.joinPath(childUri, 'cwd').fsPath);
-					const cmd = await pfs.Promises.readFile(resources.joinPath(childUri, 'cmdline').fsPath, 'utf8');
+					const cwd = await fs.promises.readlink(resources.joinPath(childUri, 'cwd').fsPath);
+					const cmd = await fs.promises.readFile(resources.joinPath(childUri, 'cmdline').fsPath, 'utf8');
 					processes.push({ pid, cwd, cmd });
 				}
 			} catch (e) {
diff --git a/src/vs/workbench/api/node/extHostVariableResolverService.ts b/src/vs/workbench/api/node/extHostVariableResolverService.ts
index c6439fd4e03..e506a58ef40 100644
--- a/src/vs/workbench/api/node/extHostVariableResolverService.ts
+++ b/src/vs/workbench/api/node/extHostVariableResolverService.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { homedir } from 'os';
-import { ExtHostVariableResolverProviderService } from 'vs/workbench/api/common/extHostVariableResolverService';
+import { ExtHostVariableResolverProviderService } from '../common/extHostVariableResolverService.js';
 
 export class NodeExtHostVariableResolverProviderService extends ExtHostVariableResolverProviderService {
 	protected override homeDir(): string | undefined {
diff --git a/src/vs/workbench/api/node/extensionHostProcess.ts b/src/vs/workbench/api/node/extensionHostProcess.ts
index 80a60c1d4c1..feaece95534 100644
--- a/src/vs/workbench/api/node/extensionHostProcess.ts
+++ b/src/vs/workbench/api/node/extensionHostProcess.ts
@@ -6,29 +6,30 @@
 import minimist from 'minimist';
 import * as nativeWatchdog from 'native-watchdog';
 import * as net from 'net';
-import { ProcessTimeRunOnceScheduler } from 'vs/base/common/async';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { isCancellationError, isSigPipeError, onUnexpectedError } from 'vs/base/common/errors';
-import { Event } from 'vs/base/common/event';
-import * as performance from 'vs/base/common/performance';
-import { IURITransformer } from 'vs/base/common/uriIpc';
-import { realpath } from 'vs/base/node/extpath';
-import { Promises } from 'vs/base/node/pfs';
-import { IMessagePassingProtocol } from 'vs/base/parts/ipc/common/ipc';
-import { BufferedEmitter, PersistentProtocol, ProtocolConstants } from 'vs/base/parts/ipc/common/ipc.net';
-import { NodeSocket, WebSocketNodeSocket } from 'vs/base/parts/ipc/node/ipc.net';
-import type { MessagePortMain } from 'vs/base/parts/sandbox/node/electronTypes';
-import { boolean } from 'vs/editor/common/config/editorOptions';
-import product from 'vs/platform/product/common/product';
-import { ExtensionHostMain, IExitFn } from 'vs/workbench/api/common/extensionHostMain';
-import { IHostUtils } from 'vs/workbench/api/common/extHostExtensionService';
-import { createURITransformer } from 'vs/workbench/api/node/uriTransformer';
-import { ExtHostConnectionType, readExtHostConnection } from 'vs/workbench/services/extensions/common/extensionHostEnv';
-import { ExtensionHostExitCode, IExtHostReadyMessage, IExtHostReduceGraceTimeMessage, IExtHostSocketMessage, IExtensionHostInitData, MessageType, createMessageOfType, isMessageOfType } from 'vs/workbench/services/extensions/common/extensionHostProtocol';
-
-import { IDisposable } from 'vs/base/common/lifecycle';
-import 'vs/workbench/api/common/extHost.common.services';
-import 'vs/workbench/api/node/extHost.node.services';
+import { ProcessTimeRunOnceScheduler } from '../../../base/common/async.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { isCancellationError, isSigPipeError, onUnexpectedError } from '../../../base/common/errors.js';
+import { Event } from '../../../base/common/event.js';
+import * as performance from '../../../base/common/performance.js';
+import { IURITransformer } from '../../../base/common/uriIpc.js';
+import { realpath } from '../../../base/node/extpath.js';
+import { Promises } from '../../../base/node/pfs.js';
+import { IMessagePassingProtocol } from '../../../base/parts/ipc/common/ipc.js';
+import { BufferedEmitter, PersistentProtocol, ProtocolConstants } from '../../../base/parts/ipc/common/ipc.net.js';
+import { NodeSocket, WebSocketNodeSocket } from '../../../base/parts/ipc/node/ipc.net.js';
+import type { MessagePortMain } from '../../../base/parts/sandbox/node/electronTypes.js';
+import { boolean } from '../../../editor/common/config/editorOptions.js';
+import product from '../../../platform/product/common/product.js';
+import { ExtensionHostMain, IExitFn } from '../common/extensionHostMain.js';
+import { IHostUtils } from '../common/extHostExtensionService.js';
+import { createURITransformer } from './uriTransformer.js';
+import { ExtHostConnectionType, readExtHostConnection } from '../../services/extensions/common/extensionHostEnv.js';
+import { ExtensionHostExitCode, IExtHostReadyMessage, IExtHostReduceGraceTimeMessage, IExtHostSocketMessage, IExtensionHostInitData, MessageType, createMessageOfType, isMessageOfType } from '../../services/extensions/common/extensionHostProtocol.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import '../common/extHost.common.services.js';
+import './extHost.node.services.js';
+import { createRequire } from 'node:module';
+const require = createRequire(import.meta.url);
 
 interface ParsedExtHostArgs {
 	transformURIs?: boolean;
@@ -63,7 +64,7 @@ const args = minimist(process.argv.slice(2), {
 // happening we essentially blocklist this module from getting loaded in any
 // extension by patching the node require() function.
 (function () {
-	const Module = globalThis._VSCODE_NODE_MODULES.module as any;
+	const Module = require('module');
 	const originalLoad = Module._load;
 
 	Module._load = function (request: string) {
@@ -327,7 +328,7 @@ function connectToRenderer(protocol: IMessagePassingProtocol): Promise<IRenderer
 				// So also use the native node module to do it from a separate thread
 				let watchdog: typeof nativeWatchdog;
 				try {
-					watchdog = globalThis._VSCODE_NODE_MODULES['native-watchdog'];
+					watchdog = require('native-watchdog');
 					watchdog.start(initData.parentPid);
 				} catch (err) {
 					// no problem...
diff --git a/src/vs/workbench/api/node/proxyResolver.ts b/src/vs/workbench/api/node/proxyResolver.ts
index ddeddfe8945..e23039e6c6b 100644
--- a/src/vs/workbench/api/node/proxyResolver.ts
+++ b/src/vs/workbench/api/node/proxyResolver.ts
@@ -3,22 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as http from 'http';
-import * as https from 'https';
-import * as tls from 'tls';
-import * as net from 'net';
-
-import { IExtHostWorkspaceProvider } from 'vs/workbench/api/common/extHostWorkspace';
-import { ExtHostConfigProvider } from 'vs/workbench/api/common/extHostConfiguration';
-import { MainThreadTelemetryShape } from 'vs/workbench/api/common/extHost.protocol';
-import { IExtensionHostInitData } from 'vs/workbench/services/extensions/common/extensionHostProtocol';
-import { ExtHostExtensionService } from 'vs/workbench/api/node/extHostExtensionService';
-import { URI } from 'vs/base/common/uri';
-import { ILogService, LogLevel as LogServiceLevel } from 'vs/platform/log/common/log';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
+import { IExtHostWorkspaceProvider } from '../common/extHostWorkspace.js';
+import { ExtHostConfigProvider } from '../common/extHostConfiguration.js';
+import { MainThreadTelemetryShape } from '../common/extHost.protocol.js';
+import { IExtensionHostInitData } from '../../services/extensions/common/extensionHostProtocol.js';
+import { ExtHostExtensionService } from './extHostExtensionService.js';
+import { URI } from '../../../base/common/uri.js';
+import { ILogService, LogLevel as LogServiceLevel } from '../../../platform/log/common/log.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
 import { LogLevel, createHttpPatch, createProxyResolver, createTlsPatch, ProxySupportSetting, ProxyAgentParams, createNetPatch, loadSystemCertificates } from '@vscode/proxy-agent';
+import { AuthInfo } from '../../../platform/request/common/request.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { createRequire } from 'node:module';
+
+const require = createRequire(import.meta.url);
+const http = require('http');
+const https = require('https');
+const tls = require('tls');
+const net = require('net');
 
 const systemCertificatesV2Default = false;
+const useElectronFetchDefault = false;
 
 export function connectProxyResolver(
 	extHostWorkspace: IExtHostWorkspaceProvider,
@@ -27,14 +32,19 @@ export function connectProxyResolver(
 	extHostLogService: ILogService,
 	mainThreadTelemetry: MainThreadTelemetryShape,
 	initData: IExtensionHostInitData,
+	disposables: DisposableStore,
 ) {
+
+	patchGlobalFetch(configProvider, mainThreadTelemetry, initData, disposables);
+
 	const useHostProxy = initData.environment.useHostProxy;
 	const doUseHostProxy = typeof useHostProxy === 'boolean' ? useHostProxy : !initData.remote.isRemote;
 	const params: ProxyAgentParams = {
 		resolveProxy: url => extHostWorkspace.resolveProxy(url),
-		lookupProxyAuthorization: lookupProxyAuthorization.bind(undefined, extHostLogService, mainThreadTelemetry, configProvider, {}, initData.remote.isRemote),
+		lookupProxyAuthorization: lookupProxyAuthorization.bind(undefined, extHostWorkspace, extHostLogService, mainThreadTelemetry, configProvider, {}, {}, initData.remote.isRemote, doUseHostProxy),
 		getProxyURL: () => configProvider.getConfiguration('http').get('proxy'),
 		getProxySupport: () => configProvider.getConfiguration('http').get<ProxySupportSetting>('proxySupport') || 'off',
+		getNoProxyConfig: () => configProvider.getConfiguration('http').get<string[]>('noProxy') || [],
 		addCertificatesV1: () => certSettingV1(configProvider),
 		addCertificatesV2: () => certSettingV2(configProvider),
 		log: extHostLogService,
@@ -67,6 +77,11 @@ export function connectProxyResolver(
 				certs.then(certs => extHostLogService.trace('ProxyResolver#loadAdditionalCertificates: Loaded certificates from main process', certs.length));
 				promises.push(certs);
 			}
+			// Using https.globalAgent because it is shared with proxy.test.ts and mutable.
+			if (initData.environment.extensionTestsLocationURI && (https.globalAgent as any).testCertificates?.length) {
+				extHostLogService.trace('ProxyResolver#loadAdditionalCertificates: Loading test certificates');
+				promises.push(Promise.resolve((https.globalAgent as any).testCertificates as string[]));
+			}
 			return (await Promise.all(promises)).flat();
 		},
 		env: process.env,
@@ -76,21 +91,146 @@ export function connectProxyResolver(
 	return configureModuleLoading(extensionService, lookup);
 }
 
+const unsafeHeaders = [
+	'content-length',
+	'host',
+	'trailer',
+	'te',
+	'upgrade',
+	'cookie2',
+	'keep-alive',
+	'transfer-encoding',
+	'set-cookie',
+];
+
+function patchGlobalFetch(configProvider: ExtHostConfigProvider, mainThreadTelemetry: MainThreadTelemetryShape, initData: IExtensionHostInitData, disposables: DisposableStore) {
+	if (!initData.remote.isRemote && !(globalThis as any).__originalFetch) {
+		const originalFetch = globalThis.fetch;
+		(globalThis as any).__originalFetch = originalFetch;
+		let useElectronFetch = configProvider.getConfiguration('http').get<boolean>('electronFetch', useElectronFetchDefault);
+		disposables.add(configProvider.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration('http.electronFetch')) {
+				useElectronFetch = configProvider.getConfiguration('http').get<boolean>('electronFetch', useElectronFetchDefault);
+			}
+		}));
+		const electron = require('electron');
+		// https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API
+		globalThis.fetch = async function fetch(input: any /* RequestInfo */ | URL, init?: RequestInit) {
+			function getRequestProperty(name: keyof any /* Request */ & keyof RequestInit) {
+				return init && name in init ? init[name] : typeof input === 'object' && 'cache' in input ? input[name] : undefined;
+			}
+			// Limitations: https://github.com/electron/electron/pull/36733#issuecomment-1405615494
+			// net.fetch fails on manual redirect: https://github.com/electron/electron/issues/43715
+			const urlString = typeof input === 'string' ? input : 'cache' in input ? input.url : input.toString();
+			const isDataUrl = urlString.startsWith('data:');
+			if (isDataUrl) {
+				recordFetchFeatureUse(mainThreadTelemetry, 'data');
+			}
+			const isBlobUrl = urlString.startsWith('blob:');
+			if (isBlobUrl) {
+				recordFetchFeatureUse(mainThreadTelemetry, 'blob');
+			}
+			const isManualRedirect = getRequestProperty('redirect') === 'manual';
+			if (isManualRedirect) {
+				recordFetchFeatureUse(mainThreadTelemetry, 'manualRedirect');
+			}
+			const integrity = getRequestProperty('integrity');
+			if (integrity) {
+				recordFetchFeatureUse(mainThreadTelemetry, 'integrity');
+			}
+			if (!useElectronFetch || isDataUrl || isBlobUrl || isManualRedirect || integrity) {
+				const response = await originalFetch(input, init);
+				monitorResponseProperties(mainThreadTelemetry, response, urlString);
+				return response;
+			}
+			// Unsupported headers: https://source.chromium.org/chromium/chromium/src/+/main:services/network/public/cpp/header_util.cc;l=32;drc=ee7299f8961a1b05a3554efcc496b6daa0d7f6e1
+			if (init?.headers) {
+				const headers = new Headers(init.headers);
+				for (const header of unsafeHeaders) {
+					headers.delete(header);
+				}
+				init = { ...init, headers };
+			}
+			// Support for URL: https://github.com/electron/electron/issues/43712
+			const electronInput = input instanceof URL ? input.toString() : input;
+			const response = await electron.net.fetch(electronInput, init);
+			monitorResponseProperties(mainThreadTelemetry, response, urlString);
+			return response;
+		};
+	}
+}
+
+function monitorResponseProperties(mainThreadTelemetry: MainThreadTelemetryShape, response: Response, urlString: string) {
+	const originalUrl = response.url;
+	Object.defineProperty(response, 'url', {
+		get() {
+			recordFetchFeatureUse(mainThreadTelemetry, 'url');
+			return originalUrl || urlString;
+		}
+	});
+	const originalType = response.type;
+	Object.defineProperty(response, 'type', {
+		get() {
+			recordFetchFeatureUse(mainThreadTelemetry, 'typeProperty');
+			return originalType !== 'default' ? originalType : 'basic';
+		}
+	});
+}
+
+type FetchFeatureUseClassification = {
+	owner: 'chrmarti';
+	comment: 'Data about fetch API use';
+	url: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the url property was used.' };
+	typeProperty: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the type property was used.' };
+	data: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether a data URL was used.' };
+	blob: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether a blob URL was used.' };
+	integrity: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the integrity property was used.' };
+	manualRedirect: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether a manual redirect was used.' };
+};
+
+type FetchFeatureUseEvent = {
+	url: number;
+	typeProperty: number;
+	data: number;
+	blob: number;
+	integrity: number;
+	manualRedirect: number;
+};
+
+const fetchFeatureUse: FetchFeatureUseEvent = {
+	url: 0,
+	typeProperty: 0,
+	data: 0,
+	blob: 0,
+	integrity: 0,
+	manualRedirect: 0,
+};
+
+let timer: NodeJS.Timeout | undefined;
+
+function recordFetchFeatureUse(mainThreadTelemetry: MainThreadTelemetryShape, feature: keyof typeof fetchFeatureUse) {
+	if (!fetchFeatureUse[feature]++) {
+		if (timer) {
+			clearTimeout(timer);
+		}
+		timer = setTimeout(() => {
+			mainThreadTelemetry.$publicLog2<FetchFeatureUseEvent, FetchFeatureUseClassification>('fetchFeatureUse', fetchFeatureUse);
+		}, 10000); // collect additional features for 10 seconds
+		timer.unref();
+	}
+}
+
 function createPatchedModules(params: ProxyAgentParams, resolveProxy: ReturnType<typeof createProxyResolver>) {
 
-	function proxyAssign(module: any, patch: any) {
-		return new Proxy(module, {
-			get(target, prop) {
-				return prop in patch ? patch[prop] : target[prop];
-			}
-		});
+	function mergeModules(module: any, patch: any) {
+		return Object.assign(module.default || module, patch);
 	}
 
 	return {
-		http: proxyAssign(http, createHttpPatch(params, http, resolveProxy)),
-		https: proxyAssign(https, createHttpPatch(params, https, resolveProxy)),
-		net: proxyAssign(net, createNetPatch(params, net)),
-		tls: proxyAssign(tls, createTlsPatch(params, tls))
+		http: mergeModules(http, createHttpPatch(params, http, resolveProxy)),
+		https: mergeModules(https, createHttpPatch(params, https, resolveProxy)),
+		net: mergeModules(net, createNetPatch(params, net)),
+		tls: mergeModules(tls, createTlsPatch(params, tls))
 	};
 }
 
@@ -108,7 +248,7 @@ const modulesCache = new Map<IExtensionDescription | undefined, { http?: typeof
 function configureModuleLoading(extensionService: ExtHostExtensionService, lookup: ReturnType<typeof createPatchedModules>): Promise<void> {
 	return extensionService.getExtensionPathIndex()
 		.then(extensionPaths => {
-			const node_module = <any>globalThis._VSCODE_NODE_MODULES.module;
+			const node_module = require('module');
 			const original = node_module._load;
 			node_module._load = function load(request: string, parent: { filename: string }, isMain: boolean) {
 				if (request === 'net') {
@@ -138,14 +278,17 @@ function configureModuleLoading(extensionService: ExtHostExtensionService, looku
 }
 
 async function lookupProxyAuthorization(
+	extHostWorkspace: IExtHostWorkspaceProvider,
 	extHostLogService: ILogService,
 	mainThreadTelemetry: MainThreadTelemetryShape,
 	configProvider: ExtHostConfigProvider,
 	proxyAuthenticateCache: Record<string, string | string[] | undefined>,
+	basicAuthCache: Record<string, string | undefined>,
 	isRemote: boolean,
+	useHostProxy: boolean,
 	proxyURL: string,
 	proxyAuthenticate: string | string[] | undefined,
-	state: { kerberosRequested?: boolean }
+	state: { kerberosRequested?: boolean; basicAuthCacheUsed?: boolean; basicAuthAttempt?: number }
 ): Promise<string | undefined> {
 	const cached = proxyAuthenticateCache[proxyURL];
 	if (proxyAuthenticate) {
@@ -156,8 +299,9 @@ async function lookupProxyAuthorization(
 	const authenticate = Array.isArray(header) ? header : typeof header === 'string' ? [header] : [];
 	sendTelemetry(mainThreadTelemetry, authenticate, isRemote);
 	if (authenticate.some(a => /^(Negotiate|Kerberos)( |$)/i.test(a)) && !state.kerberosRequested) {
+		state.kerberosRequested = true;
+
 		try {
-			state.kerberosRequested = true;
 			const kerberos = await import('kerberos');
 			const url = new URL(proxyURL);
 			const spn = configProvider.getConfiguration('http').get<string>('proxyKerberosServicePrincipal')
@@ -167,7 +311,54 @@ async function lookupProxyAuthorization(
 			const response = await client.step('');
 			return 'Negotiate ' + response;
 		} catch (err) {
-			extHostLogService.error('ProxyResolver#lookupProxyAuthorization Kerberos authentication failed', err);
+			extHostLogService.debug('ProxyResolver#lookupProxyAuthorization Kerberos authentication failed', err);
+		}
+
+		if (isRemote && useHostProxy) {
+			extHostLogService.debug('ProxyResolver#lookupProxyAuthorization Kerberos authentication lookup on host', `proxyURL:${proxyURL}`);
+			const auth = await extHostWorkspace.lookupKerberosAuthorization(proxyURL);
+			if (auth) {
+				return 'Negotiate ' + auth;
+			}
+		}
+	}
+	const basicAuthHeader = authenticate.find(a => /^Basic( |$)/i.test(a));
+	if (basicAuthHeader) {
+		try {
+			const cachedAuth = basicAuthCache[proxyURL];
+			if (cachedAuth) {
+				if (state.basicAuthCacheUsed) {
+					extHostLogService.debug('ProxyResolver#lookupProxyAuthorization Basic authentication deleting cached credentials', `proxyURL:${proxyURL}`);
+					delete basicAuthCache[proxyURL];
+				} else {
+					extHostLogService.debug('ProxyResolver#lookupProxyAuthorization Basic authentication using cached credentials', `proxyURL:${proxyURL}`);
+					state.basicAuthCacheUsed = true;
+					return cachedAuth;
+				}
+			}
+			state.basicAuthAttempt = (state.basicAuthAttempt || 0) + 1;
+			const realm = / realm="([^"]+)"/i.exec(basicAuthHeader)?.[1];
+			extHostLogService.debug('ProxyResolver#lookupProxyAuthorization Basic authentication lookup', `proxyURL:${proxyURL}`, `realm:${realm}`);
+			const url = new URL(proxyURL);
+			const authInfo: AuthInfo = {
+				scheme: 'basic',
+				host: url.hostname,
+				port: Number(url.port),
+				realm: realm || '',
+				isProxy: true,
+				attempt: state.basicAuthAttempt,
+			};
+			const credentials = await extHostWorkspace.lookupAuthorization(authInfo);
+			if (credentials) {
+				extHostLogService.debug('ProxyResolver#lookupProxyAuthorization Basic authentication received credentials', `proxyURL:${proxyURL}`, `realm:${realm}`);
+				const auth = 'Basic ' + Buffer.from(`${credentials.username}:${credentials.password}`).toString('base64');
+				basicAuthCache[proxyURL] = auth;
+				return auth;
+			} else {
+				extHostLogService.debug('ProxyResolver#lookupProxyAuthorization Basic authentication received no credentials', `proxyURL:${proxyURL}`, `realm:${realm}`);
+			}
+		} catch (err) {
+			extHostLogService.error('ProxyResolver#lookupProxyAuthorization Basic authentication failed', err);
 		}
 	}
 	return undefined;
diff --git a/src/vs/workbench/api/node/uriTransformer.ts b/src/vs/workbench/api/node/uriTransformer.ts
index c02ea46d00b..00bf30130df 100644
--- a/src/vs/workbench/api/node/uriTransformer.ts
+++ b/src/vs/workbench/api/node/uriTransformer.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { UriParts, IRawURITransformer, URITransformer, IURITransformer } from 'vs/base/common/uriIpc';
+import { UriParts, IRawURITransformer, URITransformer, IURITransformer } from '../../../base/common/uriIpc.js';
 
 /**
  * ```
diff --git a/src/vs/workbench/api/test/browser/extHost.api.impl.test.ts b/src/vs/workbench/api/test/browser/extHost.api.impl.test.ts
index d5db3ca4683..28e325233b2 100644
--- a/src/vs/workbench/api/test/browser/extHost.api.impl.test.ts
+++ b/src/vs/workbench/api/test/browser/extHost.api.impl.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { originalFSPath } from 'vs/base/common/resources';
-import { isWindows } from 'vs/base/common/platform';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { URI } from '../../../../base/common/uri.js';
+import { originalFSPath } from '../../../../base/common/resources.js';
+import { isWindows } from '../../../../base/common/platform.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 
 suite('ExtHost API', function () {
 	test('issue #51387: originalFSPath', function () {
diff --git a/src/vs/workbench/api/test/browser/extHostApiCommands.test.ts b/src/vs/workbench/api/test/browser/extHostApiCommands.test.ts
index da5e8bb9e6f..2597ac759e5 100644
--- a/src/vs/workbench/api/test/browser/extHostApiCommands.test.ts
+++ b/src/vs/workbench/api/test/browser/extHostApiCommands.test.ts
@@ -3,68 +3,68 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/editor/contrib/codeAction/browser/codeAction';
-import 'vs/editor/contrib/codelens/browser/codelens';
-import 'vs/editor/contrib/colorPicker/browser/color';
-import 'vs/editor/contrib/format/browser/format';
-import 'vs/editor/contrib/gotoSymbol/browser/goToCommands';
-import 'vs/editor/contrib/documentSymbols/browser/documentSymbols';
-import 'vs/editor/contrib/hover/browser/getHover';
-import 'vs/editor/contrib/links/browser/getLinks';
-import 'vs/editor/contrib/parameterHints/browser/provideSignatureHelp';
-import 'vs/editor/contrib/smartSelect/browser/smartSelect';
-import 'vs/editor/contrib/suggest/browser/suggest';
-import 'vs/editor/contrib/rename/browser/rename';
-import 'vs/editor/contrib/inlayHints/browser/inlayHintsController';
+import '../../../../editor/contrib/codeAction/browser/codeAction.js';
+import '../../../../editor/contrib/codelens/browser/codelens.js';
+import '../../../../editor/contrib/colorPicker/browser/colorPickerContribution.js';
+import '../../../../editor/contrib/format/browser/format.js';
+import '../../../../editor/contrib/gotoSymbol/browser/goToCommands.js';
+import '../../../../editor/contrib/documentSymbols/browser/documentSymbols.js';
+import '../../../../editor/contrib/hover/browser/getHover.js';
+import '../../../../editor/contrib/links/browser/getLinks.js';
+import '../../../../editor/contrib/parameterHints/browser/provideSignatureHelp.js';
+import '../../../../editor/contrib/smartSelect/browser/smartSelect.js';
+import '../../../../editor/contrib/suggest/browser/suggest.js';
+import '../../../../editor/contrib/rename/browser/rename.js';
+import '../../../../editor/contrib/inlayHints/browser/inlayHintsController.js';
 
 import assert from 'assert';
-import { setUnexpectedErrorHandler, errorHandler } from 'vs/base/common/errors';
-import { URI } from 'vs/base/common/uri';
-import { Event } from 'vs/base/common/event';
-import * as types from 'vs/workbench/api/common/extHostTypes';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
-import { TestRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol';
-import { MarkerService } from 'vs/platform/markers/common/markerService';
-import { IMarkerService } from 'vs/platform/markers/common/markers';
-import { ICommandService, CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ExtHostLanguageFeatures } from 'vs/workbench/api/common/extHostLanguageFeatures';
-import { MainThreadLanguageFeatures } from 'vs/workbench/api/browser/mainThreadLanguageFeatures';
-import { ExtHostApiCommands } from 'vs/workbench/api/common/extHostApiCommands';
-import { ExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
-import { MainThreadCommands } from 'vs/workbench/api/browser/mainThreadCommands';
-import { ExtHostDocuments } from 'vs/workbench/api/common/extHostDocuments';
-import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
-import { MainContext, ExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
-import { ExtHostDiagnostics } from 'vs/workbench/api/common/extHostDiagnostics';
+import { setUnexpectedErrorHandler, errorHandler } from '../../../../base/common/errors.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Event } from '../../../../base/common/event.js';
+import * as types from '../../common/extHostTypes.js';
+import { createTextModel } from '../../../../editor/test/common/testTextModel.js';
+import { TestRPCProtocol } from '../common/testRPCProtocol.js';
+import { MarkerService } from '../../../../platform/markers/common/markerService.js';
+import { IMarkerService } from '../../../../platform/markers/common/markers.js';
+import { ICommandService, CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ExtHostLanguageFeatures } from '../../common/extHostLanguageFeatures.js';
+import { MainThreadLanguageFeatures } from '../../browser/mainThreadLanguageFeatures.js';
+import { ExtHostApiCommands } from '../../common/extHostApiCommands.js';
+import { ExtHostCommands } from '../../common/extHostCommands.js';
+import { MainThreadCommands } from '../../browser/mainThreadCommands.js';
+import { ExtHostDocuments } from '../../common/extHostDocuments.js';
+import { ExtHostDocumentsAndEditors } from '../../common/extHostDocumentsAndEditors.js';
+import { MainContext, ExtHostContext } from '../../common/extHost.protocol.js';
+import { ExtHostDiagnostics } from '../../common/extHostDiagnostics.js';
 import type * as vscode from 'vscode';
-import 'vs/workbench/contrib/search/browser/search.contribution';
-import { ILogService, NullLogService } from 'vs/platform/log/common/log';
-import { ITextModel } from 'vs/editor/common/model';
-import { nullExtensionDescription, IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { dispose, ImmortalReference } from 'vs/base/common/lifecycle';
-import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { mock } from 'vs/base/test/common/mock';
-import { NullApiDeprecationService } from 'vs/workbench/api/common/extHostApiDeprecationService';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { IResolvedTextEditorModel, ITextModelService } from 'vs/editor/common/services/resolverService';
-import { IExtHostFileSystemInfo } from 'vs/workbench/api/common/extHostFileSystemInfo';
-import { URITransformerService } from 'vs/workbench/api/common/extHostUriTransformerService';
-import { IOutlineModelService, OutlineModelService } from 'vs/editor/contrib/documentSymbols/browser/outlineModel';
-import { ILanguageFeatureDebounceService, LanguageFeatureDebounceService } from 'vs/editor/common/services/languageFeatureDebounce';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { LanguageFeaturesService } from 'vs/editor/common/services/languageFeaturesService';
-import { assertType } from 'vs/base/common/types';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IExtHostTelemetry } from 'vs/workbench/api/common/extHostTelemetry';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { timeout } from 'vs/base/common/async';
+import '../../../contrib/search/browser/search.contribution.js';
+import { ILogService, NullLogService } from '../../../../platform/log/common/log.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { nullExtensionDescription, IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { dispose, ImmortalReference } from '../../../../base/common/lifecycle.js';
+import { IEditorWorkerService } from '../../../../editor/common/services/editorWorker.js';
+import { mock } from '../../../../base/test/common/mock.js';
+import { NullApiDeprecationService } from '../../common/extHostApiDeprecationService.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { IResolvedTextEditorModel, ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { IExtHostFileSystemInfo } from '../../common/extHostFileSystemInfo.js';
+import { URITransformerService } from '../../common/extHostUriTransformerService.js';
+import { IOutlineModelService, OutlineModelService } from '../../../../editor/contrib/documentSymbols/browser/outlineModel.js';
+import { ILanguageFeatureDebounceService, LanguageFeatureDebounceService } from '../../../../editor/common/services/languageFeatureDebounce.js';
+import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
+import { LanguageFeaturesService } from '../../../../editor/common/services/languageFeaturesService.js';
+import { assertType } from '../../../../base/common/types.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IExtHostTelemetry } from '../../common/extHostTelemetry.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../platform/configuration/test/common/testConfigurationService.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { TestInstantiationService } from '../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { runWithFakedTimers } from '../../../../base/test/common/timeTravelScheduler.js';
+import { timeout } from '../../../../base/common/async.js';
 
 function assertRejects(fn: () => Promise<any>, message: string = 'Expected rejection') {
 	return fn().then(() => assert.ok(false, message), _err => assert.ok(true));
diff --git a/src/vs/workbench/api/test/browser/extHostAuthentication.integrationTest.ts b/src/vs/workbench/api/test/browser/extHostAuthentication.integrationTest.ts
index de02ffff745..ec42932dfa2 100644
--- a/src/vs/workbench/api/test/browser/extHostAuthentication.integrationTest.ts
+++ b/src/vs/workbench/api/test/browser/extHostAuthentication.integrationTest.ts
@@ -4,33 +4,33 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { TestDialogService } from 'vs/platform/dialogs/test/common/testDialogService';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
-import { IQuickInputHideEvent, IQuickInputService, IQuickPickDidAcceptEvent } from 'vs/platform/quickinput/common/quickInput';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
-import { MainThreadAuthentication } from 'vs/workbench/api/browser/mainThreadAuthentication';
-import { ExtHostContext, MainContext } from 'vs/workbench/api/common/extHost.protocol';
-import { ExtHostAuthentication } from 'vs/workbench/api/common/extHostAuthentication';
-import { IActivityService } from 'vs/workbench/services/activity/common/activity';
-import { AuthenticationService } from 'vs/workbench/services/authentication/browser/authenticationService';
-import { IAuthenticationExtensionsService, IAuthenticationService } from 'vs/workbench/services/authentication/common/authentication';
-import { IExtensionService, nullExtensionDescription as extensionDescription } from 'vs/workbench/services/extensions/common/extensions';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { TestRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol';
-import { TestEnvironmentService, TestQuickInputService, TestRemoteAgentService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { TestActivityService, TestExtensionService, TestProductService, TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { TestDialogService } from '../../../../platform/dialogs/test/common/testDialogService.js';
+import { TestInstantiationService } from '../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { TestNotificationService } from '../../../../platform/notification/test/common/testNotificationService.js';
+import { IQuickInputHideEvent, IQuickInputService, IQuickPickDidAcceptEvent } from '../../../../platform/quickinput/common/quickInput.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { NullTelemetryService } from '../../../../platform/telemetry/common/telemetryUtils.js';
+import { MainThreadAuthentication } from '../../browser/mainThreadAuthentication.js';
+import { ExtHostContext, MainContext } from '../../common/extHost.protocol.js';
+import { ExtHostAuthentication } from '../../common/extHostAuthentication.js';
+import { IActivityService } from '../../../services/activity/common/activity.js';
+import { AuthenticationService } from '../../../services/authentication/browser/authenticationService.js';
+import { IAuthenticationExtensionsService, IAuthenticationService } from '../../../services/authentication/common/authentication.js';
+import { IExtensionService, nullExtensionDescription as extensionDescription } from '../../../services/extensions/common/extensions.js';
+import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';
+import { TestRPCProtocol } from '../common/testRPCProtocol.js';
+import { TestEnvironmentService, TestQuickInputService, TestRemoteAgentService } from '../../../test/browser/workbenchTestServices.js';
+import { TestActivityService, TestExtensionService, TestProductService, TestStorageService } from '../../../test/common/workbenchTestServices.js';
 import type { AuthenticationProvider, AuthenticationSession } from 'vscode';
-import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { AuthenticationAccessService, IAuthenticationAccessService } from 'vs/workbench/services/authentication/browser/authenticationAccessService';
-import { AuthenticationUsageService, IAuthenticationUsageService } from 'vs/workbench/services/authentication/browser/authenticationUsageService';
-import { AuthenticationExtensionsService } from 'vs/workbench/services/authentication/browser/authenticationExtensionsService';
+import { IBrowserWorkbenchEnvironmentService } from '../../../services/environment/browser/environmentService.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { AuthenticationAccessService, IAuthenticationAccessService } from '../../../services/authentication/browser/authenticationAccessService.js';
+import { AuthenticationUsageService, IAuthenticationUsageService } from '../../../services/authentication/browser/authenticationUsageService.js';
+import { AuthenticationExtensionsService } from '../../../services/authentication/browser/authenticationExtensionsService.js';
 
 class AuthQuickPick {
 	private listener: ((e: IQuickPickDidAcceptEvent) => any) | undefined;
@@ -117,10 +117,10 @@ suite('ExtHostAuthentication', () => {
 		instantiationService.stub(IBrowserWorkbenchEnvironmentService, TestEnvironmentService);
 		instantiationService.stub(IProductService, TestProductService);
 		instantiationService.stub(IAuthenticationAccessService, instantiationService.createInstance(AuthenticationAccessService));
+		instantiationService.stub(IAuthenticationService, instantiationService.createInstance(AuthenticationService));
 		instantiationService.stub(IAuthenticationUsageService, instantiationService.createInstance(AuthenticationUsageService));
 		const rpcProtocol = new TestRPCProtocol();
 
-		instantiationService.stub(IAuthenticationService, instantiationService.createInstance(AuthenticationService));
 		instantiationService.stub(IAuthenticationExtensionsService, instantiationService.createInstance(AuthenticationExtensionsService));
 		rpcProtocol.set(MainContext.MainThreadAuthentication, instantiationService.createInstance(MainThreadAuthentication, rpcProtocol));
 		extHostAuthentication = new ExtHostAuthentication(rpcProtocol);
diff --git a/src/vs/workbench/api/test/browser/extHostBulkEdits.test.ts b/src/vs/workbench/api/test/browser/extHostBulkEdits.test.ts
index be11d3a7353..582a5e7c954 100644
--- a/src/vs/workbench/api/test/browser/extHostBulkEdits.test.ts
+++ b/src/vs/workbench/api/test/browser/extHostBulkEdits.test.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import * as extHostTypes from 'vs/workbench/api/common/extHostTypes';
-import { MainContext, IWorkspaceEditDto, MainThreadBulkEditsShape, IWorkspaceTextEditDto } from 'vs/workbench/api/common/extHost.protocol';
-import { URI } from 'vs/base/common/uri';
-import { mock } from 'vs/base/test/common/mock';
-import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
-import { SingleProxyRPCProtocol, TestRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { ExtHostBulkEdits } from 'vs/workbench/api/common/extHostBulkEdits';
-import { nullExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { SerializableObjectWithBuffers } from 'vs/workbench/services/extensions/common/proxyIdentifier';
+import * as extHostTypes from '../../common/extHostTypes.js';
+import { MainContext, IWorkspaceEditDto, MainThreadBulkEditsShape, IWorkspaceTextEditDto } from '../../common/extHost.protocol.js';
+import { URI } from '../../../../base/common/uri.js';
+import { mock } from '../../../../base/test/common/mock.js';
+import { ExtHostDocumentsAndEditors } from '../../common/extHostDocumentsAndEditors.js';
+import { SingleProxyRPCProtocol, TestRPCProtocol } from '../common/testRPCProtocol.js';
+import { NullLogService } from '../../../../platform/log/common/log.js';
+import { ExtHostBulkEdits } from '../../common/extHostBulkEdits.js';
+import { nullExtensionDescription } from '../../../services/extensions/common/extensions.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { SerializableObjectWithBuffers } from '../../../services/extensions/common/proxyIdentifier.js';
 
 suite('ExtHostBulkEdits.applyWorkspaceEdit', () => {
 
diff --git a/src/vs/workbench/api/test/browser/extHostCommands.test.ts b/src/vs/workbench/api/test/browser/extHostCommands.test.ts
index 5353ca9c069..66e78d37251 100644
--- a/src/vs/workbench/api/test/browser/extHostCommands.test.ts
+++ b/src/vs/workbench/api/test/browser/extHostCommands.test.ts
@@ -4,14 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
-import { MainThreadCommandsShape } from 'vs/workbench/api/common/extHost.protocol';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { SingleProxyRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol';
-import { mock } from 'vs/base/test/common/mock';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { IExtHostTelemetry } from 'vs/workbench/api/common/extHostTelemetry';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { ExtHostCommands } from '../../common/extHostCommands.js';
+import { MainThreadCommandsShape } from '../../common/extHost.protocol.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { SingleProxyRPCProtocol } from '../common/testRPCProtocol.js';
+import { mock } from '../../../../base/test/common/mock.js';
+import { NullLogService } from '../../../../platform/log/common/log.js';
+import { IExtHostTelemetry } from '../../common/extHostTelemetry.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 
 suite('ExtHostCommands', function () {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/api/test/browser/extHostConfiguration.test.ts b/src/vs/workbench/api/test/browser/extHostConfiguration.test.ts
index 298299b3e56..00c9af61938 100644
--- a/src/vs/workbench/api/test/browser/extHostConfiguration.test.ts
+++ b/src/vs/workbench/api/test/browser/extHostConfiguration.test.ts
@@ -4,22 +4,22 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { ExtHostWorkspace } from 'vs/workbench/api/common/extHostWorkspace';
-import { ExtHostConfigProvider } from 'vs/workbench/api/common/extHostConfiguration';
-import { MainThreadConfigurationShape, IConfigurationInitData } from 'vs/workbench/api/common/extHost.protocol';
-import { ConfigurationModel, ConfigurationModelParser } from 'vs/platform/configuration/common/configurationModels';
-import { TestRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol';
-import { mock } from 'vs/base/test/common/mock';
-import { IWorkspaceFolder, WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { ConfigurationTarget, IConfigurationModel, IConfigurationChange } from 'vs/platform/configuration/common/configuration';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService';
-import { IExtHostFileSystemInfo } from 'vs/workbench/api/common/extHostFileSystemInfo';
-import { FileSystemProviderCapabilities } from 'vs/platform/files/common/files';
-import { isLinux } from 'vs/base/common/platform';
-import { IURITransformerService } from 'vs/workbench/api/common/extHostUriTransformerService';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
+import { ExtHostWorkspace } from '../../common/extHostWorkspace.js';
+import { ExtHostConfigProvider } from '../../common/extHostConfiguration.js';
+import { MainThreadConfigurationShape, IConfigurationInitData } from '../../common/extHost.protocol.js';
+import { ConfigurationModel, ConfigurationModelParser } from '../../../../platform/configuration/common/configurationModels.js';
+import { TestRPCProtocol } from '../common/testRPCProtocol.js';
+import { mock } from '../../../../base/test/common/mock.js';
+import { IWorkspaceFolder, WorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
+import { ConfigurationTarget, IConfigurationModel, IConfigurationChange } from '../../../../platform/configuration/common/configuration.js';
+import { NullLogService } from '../../../../platform/log/common/log.js';
+import { IExtHostInitDataService } from '../../common/extHostInitDataService.js';
+import { IExtHostFileSystemInfo } from '../../common/extHostFileSystemInfo.js';
+import { FileSystemProviderCapabilities } from '../../../../platform/files/common/files.js';
+import { isLinux } from '../../../../base/common/platform.js';
+import { IURITransformerService } from '../../common/extHostUriTransformerService.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 
 suite('ExtHostConfiguration', function () {
 
diff --git a/src/vs/workbench/api/test/browser/extHostDecorations.test.ts b/src/vs/workbench/api/test/browser/extHostDecorations.test.ts
index 8dca84bc5c1..78832d2d984 100644
--- a/src/vs/workbench/api/test/browser/extHostDecorations.test.ts
+++ b/src/vs/workbench/api/test/browser/extHostDecorations.test.ts
@@ -4,16 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { timeout } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { URI } from 'vs/base/common/uri';
-import { mock } from 'vs/base/test/common/mock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { MainThreadDecorationsShape } from 'vs/workbench/api/common/extHost.protocol';
-import { ExtHostDecorations } from 'vs/workbench/api/common/extHostDecorations';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import { nullExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
+import { timeout } from '../../../../base/common/async.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { URI } from '../../../../base/common/uri.js';
+import { mock } from '../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { NullLogService } from '../../../../platform/log/common/log.js';
+import { MainThreadDecorationsShape } from '../../common/extHost.protocol.js';
+import { ExtHostDecorations } from '../../common/extHostDecorations.js';
+import { IExtHostRpcService } from '../../common/extHostRpcService.js';
+import { nullExtensionDescription } from '../../../services/extensions/common/extensions.js';
 
 suite('ExtHostDecorations', function () {
 
diff --git a/src/vs/workbench/api/test/browser/extHostDiagnostics.test.ts b/src/vs/workbench/api/test/browser/extHostDiagnostics.test.ts
index 2c866daee54..8f63ccc30d1 100644
--- a/src/vs/workbench/api/test/browser/extHostDiagnostics.test.ts
+++ b/src/vs/workbench/api/test/browser/extHostDiagnostics.test.ts
@@ -4,21 +4,21 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { DiagnosticCollection, ExtHostDiagnostics } from 'vs/workbench/api/common/extHostDiagnostics';
-import { Diagnostic, DiagnosticSeverity, Range, DiagnosticRelatedInformation, Location } from 'vs/workbench/api/common/extHostTypes';
-import { MainThreadDiagnosticsShape, IMainContext } from 'vs/workbench/api/common/extHost.protocol';
-import { IMarkerData, MarkerSeverity } from 'vs/platform/markers/common/markers';
-import { mock } from 'vs/base/test/common/mock';
-import { Emitter, Event } from 'vs/base/common/event';
-import { NullLogService } from 'vs/platform/log/common/log';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
+import { DiagnosticCollection, ExtHostDiagnostics } from '../../common/extHostDiagnostics.js';
+import { Diagnostic, DiagnosticSeverity, Range, DiagnosticRelatedInformation, Location } from '../../common/extHostTypes.js';
+import { MainThreadDiagnosticsShape, IMainContext } from '../../common/extHost.protocol.js';
+import { IMarkerData, MarkerSeverity } from '../../../../platform/markers/common/markers.js';
+import { mock } from '../../../../base/test/common/mock.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { NullLogService } from '../../../../platform/log/common/log.js';
 import type * as vscode from 'vscode';
-import { nullExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
-import { ExtUri, extUri } from 'vs/base/common/resources';
-import { IExtHostFileSystemInfo } from 'vs/workbench/api/common/extHostFileSystemInfo';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { IExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { nullExtensionDescription } from '../../../services/extensions/common/extensions.js';
+import { ExtUri, extUri } from '../../../../base/common/resources.js';
+import { IExtHostFileSystemInfo } from '../../common/extHostFileSystemInfo.js';
+import { runWithFakedTimers } from '../../../../base/test/common/timeTravelScheduler.js';
+import { IExtHostDocumentsAndEditors } from '../../common/extHostDocumentsAndEditors.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 
 suite('ExtHostDiagnostics', () => {
 
diff --git a/src/vs/workbench/api/test/browser/extHostDocumentContentProvider.test.ts b/src/vs/workbench/api/test/browser/extHostDocumentContentProvider.test.ts
index f4795adebb4..5a128d5f781 100644
--- a/src/vs/workbench/api/test/browser/extHostDocumentContentProvider.test.ts
+++ b/src/vs/workbench/api/test/browser/extHostDocumentContentProvider.test.ts
@@ -4,16 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
-import { SingleProxyRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ExtHostDocumentContentProvider } from 'vs/workbench/api/common/extHostDocumentContentProviders';
-import { Emitter } from 'vs/base/common/event';
-import { MainThreadDocumentContentProvidersShape } from 'vs/workbench/api/common/extHost.protocol';
-import { timeout } from 'vs/base/common/async';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
+import { ExtHostDocumentsAndEditors } from '../../common/extHostDocumentsAndEditors.js';
+import { SingleProxyRPCProtocol } from '../common/testRPCProtocol.js';
+import { NullLogService } from '../../../../platform/log/common/log.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { ExtHostDocumentContentProvider } from '../../common/extHostDocumentContentProviders.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { MainThreadDocumentContentProvidersShape } from '../../common/extHost.protocol.js';
+import { timeout } from '../../../../base/common/async.js';
+import { runWithFakedTimers } from '../../../../base/test/common/timeTravelScheduler.js';
 
 suite('ExtHostDocumentContentProvider', () => {
 
diff --git a/src/vs/workbench/api/test/browser/extHostDocumentData.test.ts b/src/vs/workbench/api/test/browser/extHostDocumentData.test.ts
index 298a2811954..926b8fdc6d2 100644
--- a/src/vs/workbench/api/test/browser/extHostDocumentData.test.ts
+++ b/src/vs/workbench/api/test/browser/extHostDocumentData.test.ts
@@ -4,16 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { ExtHostDocumentData } from 'vs/workbench/api/common/extHostDocumentData';
-import { Position } from 'vs/workbench/api/common/extHostTypes';
-import { Range } from 'vs/editor/common/core/range';
-import { MainThreadDocumentsShape } from 'vs/workbench/api/common/extHost.protocol';
-import { IModelChangedEvent } from 'vs/editor/common/model/mirrorTextModel';
-import { mock } from 'vs/base/test/common/mock';
-import * as perfData from './extHostDocumentData.test.perf-data';
-import { setDefaultGetWordAtTextConfig } from 'vs/editor/common/core/wordHelper';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { URI } from '../../../../base/common/uri.js';
+import { ExtHostDocumentData } from '../../common/extHostDocumentData.js';
+import { Position } from '../../common/extHostTypes.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { MainThreadDocumentsShape } from '../../common/extHost.protocol.js';
+import { IModelChangedEvent } from '../../../../editor/common/model/mirrorTextModel.js';
+import { mock } from '../../../../base/test/common/mock.js';
+import * as perfData from './extHostDocumentData.test.perf-data.js';
+import { setDefaultGetWordAtTextConfig } from '../../../../editor/common/core/wordHelper.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 
 suite('ExtHostDocumentData', () => {
 
diff --git a/src/vs/workbench/api/test/browser/extHostDocumentSaveParticipant.test.ts b/src/vs/workbench/api/test/browser/extHostDocumentSaveParticipant.test.ts
index 9f0a28ec02a..965bb16223e 100644
--- a/src/vs/workbench/api/test/browser/extHostDocumentSaveParticipant.test.ts
+++ b/src/vs/workbench/api/test/browser/extHostDocumentSaveParticipant.test.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { ExtHostDocuments } from 'vs/workbench/api/common/extHostDocuments';
-import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
-import { TextDocumentSaveReason, TextEdit, Position, EndOfLine } from 'vs/workbench/api/common/extHostTypes';
-import { MainThreadTextEditorsShape, IWorkspaceEditDto, IWorkspaceTextEditDto, MainThreadBulkEditsShape } from 'vs/workbench/api/common/extHost.protocol';
-import { ExtHostDocumentSaveParticipant } from 'vs/workbench/api/common/extHostDocumentSaveParticipant';
-import { SingleProxyRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol';
-import { SaveReason } from 'vs/workbench/common/editor';
+import { URI } from '../../../../base/common/uri.js';
+import { ExtHostDocuments } from '../../common/extHostDocuments.js';
+import { ExtHostDocumentsAndEditors } from '../../common/extHostDocumentsAndEditors.js';
+import { TextDocumentSaveReason, TextEdit, Position, EndOfLine } from '../../common/extHostTypes.js';
+import { MainThreadTextEditorsShape, IWorkspaceEditDto, IWorkspaceTextEditDto, MainThreadBulkEditsShape } from '../../common/extHost.protocol.js';
+import { ExtHostDocumentSaveParticipant } from '../../common/extHostDocumentSaveParticipant.js';
+import { SingleProxyRPCProtocol } from '../common/testRPCProtocol.js';
+import { SaveReason } from '../../../common/editor.js';
 import type * as vscode from 'vscode';
-import { mock } from 'vs/base/test/common/mock';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { nullExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { SerializableObjectWithBuffers } from 'vs/workbench/services/extensions/common/proxyIdentifier';
+import { mock } from '../../../../base/test/common/mock.js';
+import { NullLogService } from '../../../../platform/log/common/log.js';
+import { nullExtensionDescription } from '../../../services/extensions/common/extensions.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { SerializableObjectWithBuffers } from '../../../services/extensions/common/proxyIdentifier.js';
 
 function timeout(n: number) {
 	return new Promise(resolve => setTimeout(resolve, n));
diff --git a/src/vs/workbench/api/test/browser/extHostDocumentsAndEditors.test.ts b/src/vs/workbench/api/test/browser/extHostDocumentsAndEditors.test.ts
index eda97538749..a0b9f1f7bef 100644
--- a/src/vs/workbench/api/test/browser/extHostDocumentsAndEditors.test.ts
+++ b/src/vs/workbench/api/test/browser/extHostDocumentsAndEditors.test.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
-import { TestRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { URI } from '../../../../base/common/uri.js';
+import { ExtHostDocumentsAndEditors } from '../../common/extHostDocumentsAndEditors.js';
+import { TestRPCProtocol } from '../common/testRPCProtocol.js';
+import { NullLogService } from '../../../../platform/log/common/log.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 
 suite('ExtHostDocumentsAndEditors', () => {
 
diff --git a/src/vs/workbench/api/test/browser/extHostEditorTabs.test.ts b/src/vs/workbench/api/test/browser/extHostEditorTabs.test.ts
index 75f2ccce2d7..63bf82bdb66 100644
--- a/src/vs/workbench/api/test/browser/extHostEditorTabs.test.ts
+++ b/src/vs/workbench/api/test/browser/extHostEditorTabs.test.ts
@@ -5,13 +5,13 @@
 
 import type * as vscode from 'vscode';
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { mock } from 'vs/base/test/common/mock';
-import { IEditorTabDto, IEditorTabGroupDto, MainThreadEditorTabsShape, TabInputKind, TabModelOperationKind, TextInputDto } from 'vs/workbench/api/common/extHost.protocol';
-import { ExtHostEditorTabs } from 'vs/workbench/api/common/extHostEditorTabs';
-import { SingleProxyRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol';
-import { TextMergeTabInput, TextTabInput } from 'vs/workbench/api/common/extHostTypes';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { URI } from '../../../../base/common/uri.js';
+import { mock } from '../../../../base/test/common/mock.js';
+import { IEditorTabDto, IEditorTabGroupDto, MainThreadEditorTabsShape, TabInputKind, TabModelOperationKind, TextInputDto } from '../../common/extHost.protocol.js';
+import { ExtHostEditorTabs } from '../../common/extHostEditorTabs.js';
+import { SingleProxyRPCProtocol } from '../common/testRPCProtocol.js';
+import { TextMergeTabInput, TextTabInput } from '../../common/extHostTypes.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 
 suite('ExtHostEditorTabs', function () {
 
diff --git a/src/vs/workbench/api/test/browser/extHostFileSystemEventService.test.ts b/src/vs/workbench/api/test/browser/extHostFileSystemEventService.test.ts
index 953aff7ea0c..6ffae58bc79 100644
--- a/src/vs/workbench/api/test/browser/extHostFileSystemEventService.test.ts
+++ b/src/vs/workbench/api/test/browser/extHostFileSystemEventService.test.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { ExtHostFileSystemEventService } from 'vs/workbench/api/common/extHostFileSystemEventService';
-import { IMainContext } from 'vs/workbench/api/common/extHost.protocol';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { ExtHostFileSystemEventService } from '../../common/extHostFileSystemEventService.js';
+import { IMainContext } from '../../common/extHost.protocol.js';
+import { NullLogService } from '../../../../platform/log/common/log.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 
 suite('ExtHostFileSystemEventService', () => {
 
@@ -22,13 +22,13 @@ suite('ExtHostFileSystemEventService', () => {
 			drain: undefined!
 		};
 
-		const watcher1 = new ExtHostFileSystemEventService(protocol, new NullLogService(), undefined!).createFileSystemWatcher(undefined!, undefined!, '**/somethingInteresting', { correlate: false });
+		const watcher1 = new ExtHostFileSystemEventService(protocol, new NullLogService(), undefined!).createFileSystemWatcher(undefined!, undefined!, undefined!, '**/somethingInteresting', { correlate: false });
 		assert.strictEqual(watcher1.ignoreChangeEvents, false);
 		assert.strictEqual(watcher1.ignoreCreateEvents, false);
 		assert.strictEqual(watcher1.ignoreDeleteEvents, false);
 		watcher1.dispose();
 
-		const watcher2 = new ExtHostFileSystemEventService(protocol, new NullLogService(), undefined!).createFileSystemWatcher(undefined!, undefined!, '**/somethingBoring', { ignoreCreateEvents: true, ignoreChangeEvents: true, ignoreDeleteEvents: true, correlate: false });
+		const watcher2 = new ExtHostFileSystemEventService(protocol, new NullLogService(), undefined!).createFileSystemWatcher(undefined!, undefined!, undefined!, '**/somethingBoring', { ignoreCreateEvents: true, ignoreChangeEvents: true, ignoreDeleteEvents: true, correlate: false });
 		assert.strictEqual(watcher2.ignoreChangeEvents, true);
 		assert.strictEqual(watcher2.ignoreCreateEvents, true);
 		assert.strictEqual(watcher2.ignoreDeleteEvents, true);
diff --git a/src/vs/workbench/api/test/browser/extHostLanguageFeatures.test.ts b/src/vs/workbench/api/test/browser/extHostLanguageFeatures.test.ts
index 6b7de3ca716..e26fa6617e0 100644
--- a/src/vs/workbench/api/test/browser/extHostLanguageFeatures.test.ts
+++ b/src/vs/workbench/api/test/browser/extHostLanguageFeatures.test.ts
@@ -4,58 +4,58 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { setUnexpectedErrorHandler, errorHandler } from 'vs/base/common/errors';
-import { URI } from 'vs/base/common/uri';
-import * as types from 'vs/workbench/api/common/extHostTypes';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
-import { Position as EditorPosition, Position } from 'vs/editor/common/core/position';
-import { Range as EditorRange } from 'vs/editor/common/core/range';
-import { TestRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol';
-import { IMarkerService } from 'vs/platform/markers/common/markers';
-import { MarkerService } from 'vs/platform/markers/common/markerService';
-import { ExtHostLanguageFeatures } from 'vs/workbench/api/common/extHostLanguageFeatures';
-import { MainThreadLanguageFeatures } from 'vs/workbench/api/browser/mainThreadLanguageFeatures';
-import { ExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
-import { MainThreadCommands } from 'vs/workbench/api/browser/mainThreadCommands';
-import { ExtHostDocuments } from 'vs/workbench/api/common/extHostDocuments';
-import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
-import * as languages from 'vs/editor/common/languages';
-import { getCodeLensModel } from 'vs/editor/contrib/codelens/browser/codelens';
-import { getDefinitionsAtPosition, getImplementationsAtPosition, getTypeDefinitionsAtPosition, getDeclarationsAtPosition, getReferencesAtPosition } from 'vs/editor/contrib/gotoSymbol/browser/goToSymbol';
-import { getHoversPromise } from 'vs/editor/contrib/hover/browser/getHover';
-import { getOccurrencesAtPosition } from 'vs/editor/contrib/wordHighlighter/browser/wordHighlighter';
-import { getCodeActions } from 'vs/editor/contrib/codeAction/browser/codeAction';
-import { getWorkspaceSymbols } from 'vs/workbench/contrib/search/common/search';
-import { rename } from 'vs/editor/contrib/rename/browser/rename';
-import { provideSignatureHelp } from 'vs/editor/contrib/parameterHints/browser/provideSignatureHelp';
-import { provideSuggestionItems, CompletionOptions } from 'vs/editor/contrib/suggest/browser/suggest';
-import { getDocumentFormattingEditsUntilResult, getDocumentRangeFormattingEditsUntilResult, getOnTypeFormattingEdits } from 'vs/editor/contrib/format/browser/format';
-import { getLinks } from 'vs/editor/contrib/links/browser/getLinks';
-import { MainContext, ExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
-import { ExtHostDiagnostics } from 'vs/workbench/api/common/extHostDiagnostics';
+import { TestInstantiationService } from '../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { setUnexpectedErrorHandler, errorHandler } from '../../../../base/common/errors.js';
+import { URI } from '../../../../base/common/uri.js';
+import * as types from '../../common/extHostTypes.js';
+import { createTextModel } from '../../../../editor/test/common/testTextModel.js';
+import { Position as EditorPosition, Position } from '../../../../editor/common/core/position.js';
+import { Range as EditorRange } from '../../../../editor/common/core/range.js';
+import { TestRPCProtocol } from '../common/testRPCProtocol.js';
+import { IMarkerService } from '../../../../platform/markers/common/markers.js';
+import { MarkerService } from '../../../../platform/markers/common/markerService.js';
+import { ExtHostLanguageFeatures } from '../../common/extHostLanguageFeatures.js';
+import { MainThreadLanguageFeatures } from '../../browser/mainThreadLanguageFeatures.js';
+import { ExtHostCommands } from '../../common/extHostCommands.js';
+import { MainThreadCommands } from '../../browser/mainThreadCommands.js';
+import { ExtHostDocuments } from '../../common/extHostDocuments.js';
+import { ExtHostDocumentsAndEditors } from '../../common/extHostDocumentsAndEditors.js';
+import * as languages from '../../../../editor/common/languages.js';
+import { getCodeLensModel } from '../../../../editor/contrib/codelens/browser/codelens.js';
+import { getDefinitionsAtPosition, getImplementationsAtPosition, getTypeDefinitionsAtPosition, getDeclarationsAtPosition, getReferencesAtPosition } from '../../../../editor/contrib/gotoSymbol/browser/goToSymbol.js';
+import { getHoversPromise } from '../../../../editor/contrib/hover/browser/getHover.js';
+import { getOccurrencesAtPosition } from '../../../../editor/contrib/wordHighlighter/browser/wordHighlighter.js';
+import { getCodeActions } from '../../../../editor/contrib/codeAction/browser/codeAction.js';
+import { getWorkspaceSymbols } from '../../../contrib/search/common/search.js';
+import { rename } from '../../../../editor/contrib/rename/browser/rename.js';
+import { provideSignatureHelp } from '../../../../editor/contrib/parameterHints/browser/provideSignatureHelp.js';
+import { provideSuggestionItems, CompletionOptions } from '../../../../editor/contrib/suggest/browser/suggest.js';
+import { getDocumentFormattingEditsUntilResult, getDocumentRangeFormattingEditsUntilResult, getOnTypeFormattingEdits } from '../../../../editor/contrib/format/browser/format.js';
+import { getLinks } from '../../../../editor/contrib/links/browser/getLinks.js';
+import { MainContext, ExtHostContext } from '../../common/extHost.protocol.js';
+import { ExtHostDiagnostics } from '../../common/extHostDiagnostics.js';
 import type * as vscode from 'vscode';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { ITextModel, EndOfLineSequence } from 'vs/editor/common/model';
-import { getColors } from 'vs/editor/contrib/colorPicker/browser/color';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { nullExtensionDescription as defaultExtension } from 'vs/workbench/services/extensions/common/extensions';
-import { provideSelectionRanges } from 'vs/editor/contrib/smartSelect/browser/smartSelect';
-import { mock } from 'vs/base/test/common/mock';
-import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { NullApiDeprecationService } from 'vs/workbench/api/common/extHostApiDeprecationService';
-import { Progress } from 'vs/platform/progress/common/progress';
-import { IExtHostFileSystemInfo } from 'vs/workbench/api/common/extHostFileSystemInfo';
-import { URITransformerService } from 'vs/workbench/api/common/extHostUriTransformerService';
-import { OutlineModel } from 'vs/editor/contrib/documentSymbols/browser/outlineModel';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { LanguageFeaturesService } from 'vs/editor/common/services/languageFeaturesService';
-import { CodeActionTriggerSource } from 'vs/editor/contrib/codeAction/common/types';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IExtHostTelemetry } from 'vs/workbench/api/common/extHostTelemetry';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { NullLogService } from '../../../../platform/log/common/log.js';
+import { ITextModel, EndOfLineSequence } from '../../../../editor/common/model.js';
+import { getColors } from '../../../../editor/contrib/colorPicker/browser/color.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { nullExtensionDescription as defaultExtension } from '../../../services/extensions/common/extensions.js';
+import { provideSelectionRanges } from '../../../../editor/contrib/smartSelect/browser/smartSelect.js';
+import { mock } from '../../../../base/test/common/mock.js';
+import { IEditorWorkerService } from '../../../../editor/common/services/editorWorker.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { NullApiDeprecationService } from '../../common/extHostApiDeprecationService.js';
+import { Progress } from '../../../../platform/progress/common/progress.js';
+import { IExtHostFileSystemInfo } from '../../common/extHostFileSystemInfo.js';
+import { URITransformerService } from '../../common/extHostUriTransformerService.js';
+import { OutlineModel } from '../../../../editor/contrib/documentSymbols/browser/outlineModel.js';
+import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
+import { LanguageFeaturesService } from '../../../../editor/common/services/languageFeaturesService.js';
+import { CodeActionTriggerSource } from '../../../../editor/contrib/codeAction/common/types.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IExtHostTelemetry } from '../../common/extHostTelemetry.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 
 suite('ExtHostLanguageFeatures', function () {
 
@@ -301,7 +301,7 @@ suite('ExtHostLanguageFeatures', function () {
 		}));
 
 		await rpcProtocol.sync();
-		const value = await getDefinitionsAtPosition(languageFeaturesService.definitionProvider, model, new EditorPosition(1, 1), CancellationToken.None);
+		const value = await getDefinitionsAtPosition(languageFeaturesService.definitionProvider, model, new EditorPosition(1, 1), false, CancellationToken.None);
 		assert.strictEqual(value.length, 1);
 		const [entry] = value;
 		assert.deepStrictEqual(entry.range, { startLineNumber: 2, startColumn: 3, endLineNumber: 4, endColumn: 5 });
@@ -322,7 +322,7 @@ suite('ExtHostLanguageFeatures', function () {
 		}));
 
 		await rpcProtocol.sync();
-		const value = await getDefinitionsAtPosition(languageFeaturesService.definitionProvider, model, new EditorPosition(1, 1), CancellationToken.None);
+		const value = await getDefinitionsAtPosition(languageFeaturesService.definitionProvider, model, new EditorPosition(1, 1), false, CancellationToken.None);
 		assert.strictEqual(value.length, 2);
 	});
 
@@ -341,7 +341,7 @@ suite('ExtHostLanguageFeatures', function () {
 		}));
 
 		await rpcProtocol.sync();
-		const value = await getDefinitionsAtPosition(languageFeaturesService.definitionProvider, model, new EditorPosition(1, 1), CancellationToken.None);
+		const value = await getDefinitionsAtPosition(languageFeaturesService.definitionProvider, model, new EditorPosition(1, 1), false, CancellationToken.None);
 		assert.strictEqual(value.length, 2);
 		// let [first, second] = value;
 		assert.strictEqual(value[0].uri.authority, 'second');
@@ -362,7 +362,7 @@ suite('ExtHostLanguageFeatures', function () {
 		}));
 
 		await rpcProtocol.sync();
-		const value = await getDefinitionsAtPosition(languageFeaturesService.definitionProvider, model, new EditorPosition(1, 1), CancellationToken.None);
+		const value = await getDefinitionsAtPosition(languageFeaturesService.definitionProvider, model, new EditorPosition(1, 1), false, CancellationToken.None);
 		assert.strictEqual(value.length, 1);
 	});
 
@@ -377,7 +377,7 @@ suite('ExtHostLanguageFeatures', function () {
 		}));
 
 		await rpcProtocol.sync();
-		const value = await getDeclarationsAtPosition(languageFeaturesService.declarationProvider, model, new EditorPosition(1, 1), CancellationToken.None);
+		const value = await getDeclarationsAtPosition(languageFeaturesService.declarationProvider, model, new EditorPosition(1, 1), false, CancellationToken.None);
 		assert.strictEqual(value.length, 1);
 		const [entry] = value;
 		assert.deepStrictEqual(entry.range, { startLineNumber: 2, startColumn: 3, endLineNumber: 4, endColumn: 5 });
@@ -395,7 +395,7 @@ suite('ExtHostLanguageFeatures', function () {
 		}));
 
 		await rpcProtocol.sync();
-		const value = await getImplementationsAtPosition(languageFeaturesService.implementationProvider, model, new EditorPosition(1, 1), CancellationToken.None);
+		const value = await getImplementationsAtPosition(languageFeaturesService.implementationProvider, model, new EditorPosition(1, 1), false, CancellationToken.None);
 		assert.strictEqual(value.length, 1);
 		const [entry] = value;
 		assert.deepStrictEqual(entry.range, { startLineNumber: 2, startColumn: 3, endLineNumber: 4, endColumn: 5 });
@@ -413,7 +413,7 @@ suite('ExtHostLanguageFeatures', function () {
 		}));
 
 		await rpcProtocol.sync();
-		const value = await getTypeDefinitionsAtPosition(languageFeaturesService.typeDefinitionProvider, model, new EditorPosition(1, 1), CancellationToken.None);
+		const value = await getTypeDefinitionsAtPosition(languageFeaturesService.typeDefinitionProvider, model, new EditorPosition(1, 1), false, CancellationToken.None);
 		assert.strictEqual(value.length, 1);
 		const [entry] = value;
 		assert.deepStrictEqual(entry.range, { startLineNumber: 2, startColumn: 3, endLineNumber: 4, endColumn: 5 });
@@ -517,7 +517,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		disposables.add(extHost.registerDocumentHighlightProvider(defaultExtension, defaultSelector, new class implements vscode.DocumentHighlightProvider {
 			provideDocumentHighlights(): any {
-				return [];
+				return undefined;
 			}
 		}));
 		disposables.add(extHost.registerDocumentHighlightProvider(defaultExtension, '*', new class implements vscode.DocumentHighlightProvider {
@@ -591,7 +591,7 @@ suite('ExtHostLanguageFeatures', function () {
 		}));
 
 		await rpcProtocol.sync();
-		const value = await getReferencesAtPosition(languageFeaturesService.referenceProvider, model, new EditorPosition(1, 2), false, CancellationToken.None);
+		const value = await getReferencesAtPosition(languageFeaturesService.referenceProvider, model, new EditorPosition(1, 2), false, false, CancellationToken.None);
 		assert.strictEqual(value.length, 2);
 		const [first, second] = value;
 		assert.strictEqual(first.uri.path, '/second');
@@ -607,7 +607,7 @@ suite('ExtHostLanguageFeatures', function () {
 		}));
 
 		await rpcProtocol.sync();
-		const value = await getReferencesAtPosition(languageFeaturesService.referenceProvider, model, new EditorPosition(1, 2), false, CancellationToken.None);
+		const value = await getReferencesAtPosition(languageFeaturesService.referenceProvider, model, new EditorPosition(1, 2), false, false, CancellationToken.None);
 		assert.strictEqual(value.length, 1);
 		const [item] = value;
 		assert.deepStrictEqual(item.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 1 });
@@ -628,7 +628,7 @@ suite('ExtHostLanguageFeatures', function () {
 		}));
 
 		await rpcProtocol.sync();
-		const value = await getReferencesAtPosition(languageFeaturesService.referenceProvider, model, new EditorPosition(1, 2), false, CancellationToken.None);
+		const value = await getReferencesAtPosition(languageFeaturesService.referenceProvider, model, new EditorPosition(1, 2), false, false, CancellationToken.None);
 		assert.strictEqual(value.length, 1);
 	});
 
diff --git a/src/vs/workbench/api/test/browser/extHostMessagerService.test.ts b/src/vs/workbench/api/test/browser/extHostMessagerService.test.ts
index a88e5a79bb9..d5fc283aeb6 100644
--- a/src/vs/workbench/api/test/browser/extHostMessagerService.test.ts
+++ b/src/vs/workbench/api/test/browser/extHostMessagerService.test.ts
@@ -4,16 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { MainThreadMessageService } from 'vs/workbench/api/browser/mainThreadMessageService';
-import { IDialogService, IPrompt, IPromptButton } from 'vs/platform/dialogs/common/dialogs';
-import { INotificationService, INotification, NoOpNotification, INotificationHandle, Severity, IPromptChoice, IPromptOptions, IStatusMessageOptions, INotificationSource, INotificationSourceFilter, NotificationsFilter } from 'vs/platform/notification/common/notification';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { mock } from 'vs/base/test/common/mock';
-import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
-import { Event } from 'vs/base/common/event';
-import { TestDialogService } from 'vs/platform/dialogs/test/common/testDialogService';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { TestExtensionService } from 'vs/workbench/test/common/workbenchTestServices';
+import { MainThreadMessageService } from '../../browser/mainThreadMessageService.js';
+import { IDialogService, IPrompt, IPromptButton } from '../../../../platform/dialogs/common/dialogs.js';
+import { INotificationService, INotification, NoOpNotification, INotificationHandle, Severity, IPromptChoice, IPromptOptions, IStatusMessageOptions, INotificationSource, INotificationSourceFilter, NotificationsFilter } from '../../../../platform/notification/common/notification.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { mock } from '../../../../base/test/common/mock.js';
+import { IDisposable, Disposable } from '../../../../base/common/lifecycle.js';
+import { Event } from '../../../../base/common/event.js';
+import { TestDialogService } from '../../../../platform/dialogs/test/common/testDialogService.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { TestExtensionService } from '../../../test/common/workbenchTestServices.js';
 
 const emptyCommandService: ICommandService = {
 	_serviceBrand: undefined,
diff --git a/src/vs/workbench/api/test/browser/extHostNotebook.test.ts b/src/vs/workbench/api/test/browser/extHostNotebook.test.ts
index 49a2f011645..54b14a349b4 100644
--- a/src/vs/workbench/api/test/browser/extHostNotebook.test.ts
+++ b/src/vs/workbench/api/test/browser/extHostNotebook.test.ts
@@ -5,30 +5,30 @@
 
 import assert from 'assert';
 import * as vscode from 'vscode';
-import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
-import { TestRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { mock } from 'vs/base/test/common/mock';
-import { IModelAddedData, MainContext, MainThreadCommandsShape, MainThreadNotebookShape, NotebookCellsChangedEventDto, NotebookOutputItemDto } from 'vs/workbench/api/common/extHost.protocol';
-import { ExtHostNotebookController } from 'vs/workbench/api/common/extHostNotebook';
-import { ExtHostNotebookDocument } from 'vs/workbench/api/common/extHostNotebookDocument';
-import { CellKind, CellUri, NotebookCellsChangeType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { URI } from 'vs/base/common/uri';
-import { ExtHostDocuments } from 'vs/workbench/api/common/extHostDocuments';
-import { ExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
-import { nullExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
-import { isEqual } from 'vs/base/common/resources';
-import { Event } from 'vs/base/common/event';
-import { ExtHostNotebookDocuments } from 'vs/workbench/api/common/extHostNotebookDocuments';
-import { SerializableObjectWithBuffers } from 'vs/workbench/services/extensions/common/proxyIdentifier';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { IExtHostTelemetry } from 'vs/workbench/api/common/extHostTelemetry';
-import { ExtHostConsumerFileSystem } from 'vs/workbench/api/common/extHostFileSystemConsumer';
-import { ExtHostFileSystemInfo } from 'vs/workbench/api/common/extHostFileSystemInfo';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ExtHostSearch } from 'vs/workbench/api/common/extHostSearch';
-import { URITransformerService } from 'vs/workbench/api/common/extHostUriTransformerService';
+import { ExtHostDocumentsAndEditors } from '../../common/extHostDocumentsAndEditors.js';
+import { TestRPCProtocol } from '../common/testRPCProtocol.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { NullLogService } from '../../../../platform/log/common/log.js';
+import { mock } from '../../../../base/test/common/mock.js';
+import { IModelAddedData, MainContext, MainThreadCommandsShape, MainThreadNotebookShape, NotebookCellsChangedEventDto, NotebookOutputItemDto } from '../../common/extHost.protocol.js';
+import { ExtHostNotebookController } from '../../common/extHostNotebook.js';
+import { ExtHostNotebookDocument } from '../../common/extHostNotebookDocument.js';
+import { CellKind, CellUri, NotebookCellsChangeType } from '../../../contrib/notebook/common/notebookCommon.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ExtHostDocuments } from '../../common/extHostDocuments.js';
+import { ExtHostCommands } from '../../common/extHostCommands.js';
+import { nullExtensionDescription } from '../../../services/extensions/common/extensions.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { Event } from '../../../../base/common/event.js';
+import { ExtHostNotebookDocuments } from '../../common/extHostNotebookDocuments.js';
+import { SerializableObjectWithBuffers } from '../../../services/extensions/common/proxyIdentifier.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { IExtHostTelemetry } from '../../common/extHostTelemetry.js';
+import { ExtHostConsumerFileSystem } from '../../common/extHostFileSystemConsumer.js';
+import { ExtHostFileSystemInfo } from '../../common/extHostFileSystemInfo.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { ExtHostSearch } from '../../common/extHostSearch.js';
+import { URITransformerService } from '../../common/extHostUriTransformerService.js';
 
 suite('NotebookCell#Document', function () {
 	let rpcProtocol: TestRPCProtocol;
@@ -97,7 +97,8 @@ suite('NotebookCell#Document', function () {
 				documentUri: notebookUri,
 				id: '_notebook_editor_0',
 				selections: [{ start: 0, end: 1 }],
-				visibleRanges: []
+				visibleRanges: [],
+				viewType: 'test'
 			}]
 		}));
 		extHostNotebooks.$acceptDocumentAndEditorsDelta(new SerializableObjectWithBuffers({ newActiveEditor: '_notebook_editor_0' }));
@@ -369,7 +370,8 @@ suite('NotebookCell#Document', function () {
 				documentUri: notebookUri,
 				id: '_notebook_editor_2',
 				selections: [{ start: 0, end: 1 }],
-				visibleRanges: []
+				visibleRanges: [],
+				viewType: 'test'
 			}]
 		}));
 
diff --git a/src/vs/workbench/api/test/browser/extHostNotebookKernel.test.ts b/src/vs/workbench/api/test/browser/extHostNotebookKernel.test.ts
index a1341bad58c..e025bb78bd0 100644
--- a/src/vs/workbench/api/test/browser/extHostNotebookKernel.test.ts
+++ b/src/vs/workbench/api/test/browser/extHostNotebookKernel.test.ts
@@ -4,33 +4,33 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Barrier } from 'vs/base/common/async';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { ICellExecuteUpdateDto, ICellExecutionCompleteDto, INotebookKernelDto2, MainContext, MainThreadCommandsShape, MainThreadNotebookDocumentsShape, MainThreadNotebookKernelsShape, MainThreadNotebookShape } from 'vs/workbench/api/common/extHost.protocol';
-import { ExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
-import { ExtHostDocuments } from 'vs/workbench/api/common/extHostDocuments';
-import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
-import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService';
-import { ExtHostNotebookController } from 'vs/workbench/api/common/extHostNotebook';
-import { ExtHostNotebookDocument } from 'vs/workbench/api/common/extHostNotebookDocument';
-import { ExtHostNotebookDocuments } from 'vs/workbench/api/common/extHostNotebookDocuments';
-import { ExtHostNotebookKernels } from 'vs/workbench/api/common/extHostNotebookKernels';
-import { NotebookCellOutput, NotebookCellOutputItem } from 'vs/workbench/api/common/extHostTypes';
-import { CellKind, CellUri, NotebookCellsChangeType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { CellExecutionUpdateType } from 'vs/workbench/contrib/notebook/common/notebookExecutionService';
-import { nullExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
-import { SerializableObjectWithBuffers } from 'vs/workbench/services/extensions/common/proxyIdentifier';
-import { TestRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol';
-import { mock } from 'vs/workbench/test/common/workbenchTestServices';
-import { IExtHostTelemetry } from 'vs/workbench/api/common/extHostTelemetry';
-import { ExtHostConsumerFileSystem } from 'vs/workbench/api/common/extHostFileSystemConsumer';
-import { ExtHostFileSystemInfo } from 'vs/workbench/api/common/extHostFileSystemInfo';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ExtHostSearch } from 'vs/workbench/api/common/extHostSearch';
-import { URITransformerService } from 'vs/workbench/api/common/extHostUriTransformerService';
+import { Barrier } from '../../../../base/common/async.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { NullLogService } from '../../../../platform/log/common/log.js';
+import { ICellExecuteUpdateDto, ICellExecutionCompleteDto, INotebookKernelDto2, MainContext, MainThreadCommandsShape, MainThreadNotebookDocumentsShape, MainThreadNotebookKernelsShape, MainThreadNotebookShape } from '../../common/extHost.protocol.js';
+import { ExtHostCommands } from '../../common/extHostCommands.js';
+import { ExtHostDocuments } from '../../common/extHostDocuments.js';
+import { ExtHostDocumentsAndEditors } from '../../common/extHostDocumentsAndEditors.js';
+import { IExtHostInitDataService } from '../../common/extHostInitDataService.js';
+import { ExtHostNotebookController } from '../../common/extHostNotebook.js';
+import { ExtHostNotebookDocument } from '../../common/extHostNotebookDocument.js';
+import { ExtHostNotebookDocuments } from '../../common/extHostNotebookDocuments.js';
+import { ExtHostNotebookKernels } from '../../common/extHostNotebookKernels.js';
+import { NotebookCellOutput, NotebookCellOutputItem } from '../../common/extHostTypes.js';
+import { CellKind, CellUri, NotebookCellsChangeType } from '../../../contrib/notebook/common/notebookCommon.js';
+import { CellExecutionUpdateType } from '../../../contrib/notebook/common/notebookExecutionService.js';
+import { nullExtensionDescription } from '../../../services/extensions/common/extensions.js';
+import { SerializableObjectWithBuffers } from '../../../services/extensions/common/proxyIdentifier.js';
+import { TestRPCProtocol } from '../common/testRPCProtocol.js';
+import { mock } from '../../../test/common/workbenchTestServices.js';
+import { IExtHostTelemetry } from '../../common/extHostTelemetry.js';
+import { ExtHostConsumerFileSystem } from '../../common/extHostFileSystemConsumer.js';
+import { ExtHostFileSystemInfo } from '../../common/extHostFileSystemInfo.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { ExtHostSearch } from '../../common/extHostSearch.js';
+import { URITransformerService } from '../../common/extHostUriTransformerService.js';
 
 suite('NotebookKernel', function () {
 	let rpcProtocol: TestRPCProtocol;
@@ -136,7 +136,8 @@ suite('NotebookKernel', function () {
 				documentUri: notebookUri,
 				id: '_notebook_editor_0',
 				selections: [{ start: 0, end: 1 }],
-				visibleRanges: []
+				visibleRanges: [],
+				viewType: 'test',
 			}]
 		}));
 		extHostNotebooks.$acceptDocumentAndEditorsDelta(new SerializableObjectWithBuffers({ newActiveEditor: '_notebook_editor_0' }));
diff --git a/src/vs/workbench/api/test/browser/extHostTelemetry.test.ts b/src/vs/workbench/api/test/browser/extHostTelemetry.test.ts
index 789ffcd0bf4..7be5b9554c5 100644
--- a/src/vs/workbench/api/test/browser/extHostTelemetry.test.ts
+++ b/src/vs/workbench/api/test/browser/extHostTelemetry.test.ts
@@ -4,16 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ExtensionIdentifier, IExtensionDescription, TargetPlatform } from 'vs/platform/extensions/common/extensions';
-import { DEFAULT_LOG_LEVEL, LogLevel } from 'vs/platform/log/common/log';
-import { TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
-import { TestTelemetryLoggerService } from 'vs/platform/telemetry/test/common/telemetryLogAppender.test';
-import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService';
-import { ExtHostTelemetry, ExtHostTelemetryLogger } from 'vs/workbench/api/common/extHostTelemetry';
-import { IEnvironment } from 'vs/workbench/services/extensions/common/extensionHostProtocol';
-import { mock } from 'vs/workbench/test/common/workbenchTestServices';
+import { URI } from '../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { ExtensionIdentifier, IExtensionDescription, TargetPlatform } from '../../../../platform/extensions/common/extensions.js';
+import { DEFAULT_LOG_LEVEL, LogLevel } from '../../../../platform/log/common/log.js';
+import { TelemetryLevel } from '../../../../platform/telemetry/common/telemetry.js';
+import { TestTelemetryLoggerService } from '../../../../platform/telemetry/test/common/telemetryLogAppender.test.js';
+import { IExtHostInitDataService } from '../../common/extHostInitDataService.js';
+import { ExtHostTelemetry, ExtHostTelemetryLogger } from '../../common/extHostTelemetry.js';
+import { IEnvironment } from '../../../services/extensions/common/extensionHostProtocol.js';
+import { mock } from '../../../test/common/workbenchTestServices.js';
 import type { TelemetryLoggerOptions, TelemetrySender } from 'vscode';
 
 interface TelemetryLoggerSpy {
@@ -64,7 +64,8 @@ suite('ExtHostTelemetry', function () {
 		publisher: 'vscode',
 		version: '1.0.0',
 		engines: { vscode: '*' },
-		extensionLocation: URI.parse('fake')
+		extensionLocation: URI.parse('fake'),
+		enabledApiProposals: undefined,
 	};
 
 	const createExtHostTelemetry = () => {
diff --git a/src/vs/workbench/api/test/browser/extHostTesting.test.ts b/src/vs/workbench/api/test/browser/extHostTesting.test.ts
index 251ead7ac94..3b45e1073b7 100644
--- a/src/vs/workbench/api/test/browser/extHostTesting.test.ts
+++ b/src/vs/workbench/api/test/browser/extHostTesting.test.ts
@@ -5,29 +5,29 @@
 
 import assert from 'assert';
 import * as sinon from 'sinon';
-import { timeout } from 'vs/base/common/async';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Event } from 'vs/base/common/event';
-import { Iterable } from 'vs/base/common/iterator';
-import { URI } from 'vs/base/common/uri';
-import { mock, mockObject, MockObject } from 'vs/base/test/common/mock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import * as editorRange from 'vs/editor/common/core/range';
-import { ExtensionIdentifier, IRelaxedExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { MainThreadTestingShape } from 'vs/workbench/api/common/extHost.protocol';
-import { ExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
-import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
-import { IExtHostTelemetry } from 'vs/workbench/api/common/extHostTelemetry';
-import { ExtHostTesting, TestRunCoordinator, TestRunDto, TestRunProfileImpl } from 'vs/workbench/api/common/extHostTesting';
-import { ExtHostTestItemCollection, TestItemImpl } from 'vs/workbench/api/common/extHostTestItem';
-import * as convert from 'vs/workbench/api/common/extHostTypeConverters';
-import { Location, Position, Range, TestMessage, TestRunProfileKind, TestRunRequest as TestRunRequestImpl, TestTag } from 'vs/workbench/api/common/extHostTypes';
-import { AnyCallRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol';
-import { TestId } from 'vs/workbench/contrib/testing/common/testId';
-import { TestDiffOpType, TestItemExpandState, TestMessageType, TestsDiff } from 'vs/workbench/contrib/testing/common/testTypes';
-import { nullExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
+import { timeout } from '../../../../base/common/async.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { Event } from '../../../../base/common/event.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { URI } from '../../../../base/common/uri.js';
+import { mock, mockObject, MockObject } from '../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import * as editorRange from '../../../../editor/common/core/range.js';
+import { ExtensionIdentifier, IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
+import { NullLogService } from '../../../../platform/log/common/log.js';
+import { MainThreadTestingShape } from '../../common/extHost.protocol.js';
+import { ExtHostCommands } from '../../common/extHostCommands.js';
+import { ExtHostDocumentsAndEditors } from '../../common/extHostDocumentsAndEditors.js';
+import { IExtHostTelemetry } from '../../common/extHostTelemetry.js';
+import { ExtHostTesting, TestRunCoordinator, TestRunDto, TestRunProfileImpl } from '../../common/extHostTesting.js';
+import { ExtHostTestItemCollection, TestItemImpl } from '../../common/extHostTestItem.js';
+import * as convert from '../../common/extHostTypeConverters.js';
+import { Location, Position, Range, TestMessage, TestRunProfileKind, TestRunRequest as TestRunRequestImpl, TestTag } from '../../common/extHostTypes.js';
+import { AnyCallRPCProtocol } from '../common/testRPCProtocol.js';
+import { TestId } from '../../../contrib/testing/common/testId.js';
+import { TestDiffOpType, TestItemExpandState, TestMessageType, TestsDiff } from '../../../contrib/testing/common/testTypes.js';
+import { nullExtensionDescription } from '../../../services/extensions/common/extensions.js';
 import type { TestController, TestItem, TestRunProfile, TestRunRequest } from 'vscode';
 
 const simplify = (item: TestItem) => ({
@@ -637,7 +637,7 @@ suite('ExtHost Testing', () => {
 		let req: TestRunRequest;
 
 		let dto: TestRunDto;
-		const ext: IRelaxedExtensionDescription = {} as any;
+		const ext: IExtensionDescription = {} as any;
 
 		teardown(() => {
 			for (const { id } of c.trackers) {
@@ -829,7 +829,8 @@ suite('ExtHost Testing', () => {
 					expected: undefined,
 					contextValue: undefined,
 					actual: undefined,
-					location: convert.location.from(message1.location)
+					location: convert.location.from(message1.location),
+					stackTrace: undefined,
 				}]
 			]);
 
@@ -846,6 +847,7 @@ suite('ExtHost Testing', () => {
 					expected: undefined,
 					actual: undefined,
 					location: convert.location.from({ uri: test2.uri!, range: test2.range }),
+					stackTrace: undefined,
 				}]
 			]);
 
diff --git a/src/vs/workbench/api/test/browser/extHostTextEditor.test.ts b/src/vs/workbench/api/test/browser/extHostTextEditor.test.ts
index 98bc7766151..b76b9048aaa 100644
--- a/src/vs/workbench/api/test/browser/extHostTextEditor.test.ts
+++ b/src/vs/workbench/api/test/browser/extHostTextEditor.test.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { Lazy } from 'vs/base/common/lazy';
-import { URI } from 'vs/base/common/uri';
-import { mock } from 'vs/base/test/common/mock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { RenderLineNumbersType, TextEditorCursorStyle } from 'vs/editor/common/config/editorOptions';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { IResolvedTextEditorConfiguration, ITextEditorConfigurationUpdate, MainThreadTextEditorsShape } from 'vs/workbench/api/common/extHost.protocol';
-import { ExtHostDocumentData } from 'vs/workbench/api/common/extHostDocumentData';
-import { ExtHostTextEditor, ExtHostTextEditorOptions } from 'vs/workbench/api/common/extHostTextEditor';
-import { Range, TextEditorLineNumbersStyle } from 'vs/workbench/api/common/extHostTypes';
+import { Lazy } from '../../../../base/common/lazy.js';
+import { URI } from '../../../../base/common/uri.js';
+import { mock } from '../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { RenderLineNumbersType, TextEditorCursorStyle } from '../../../../editor/common/config/editorOptions.js';
+import { NullLogService } from '../../../../platform/log/common/log.js';
+import { IResolvedTextEditorConfiguration, ITextEditorConfigurationUpdate, MainThreadTextEditorsShape } from '../../common/extHost.protocol.js';
+import { ExtHostDocumentData } from '../../common/extHostDocumentData.js';
+import { ExtHostTextEditor, ExtHostTextEditorOptions } from '../../common/extHostTextEditor.js';
+import { Range, TextEditorLineNumbersStyle } from '../../common/extHostTypes.js';
 
 suite('ExtHostTextEditor', () => {
 
diff --git a/src/vs/workbench/api/test/browser/extHostTreeViews.test.ts b/src/vs/workbench/api/test/browser/extHostTreeViews.test.ts
index 1e442c1ed88..d00b0f7c988 100644
--- a/src/vs/workbench/api/test/browser/extHostTreeViews.test.ts
+++ b/src/vs/workbench/api/test/browser/extHostTreeViews.test.ts
@@ -5,20 +5,20 @@
 
 import assert from 'assert';
 import * as sinon from 'sinon';
-import { Emitter } from 'vs/base/common/event';
-import { ExtHostTreeViews } from 'vs/workbench/api/common/extHostTreeViews';
-import { ExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
-import { MainThreadTreeViewsShape, MainContext, MainThreadCommandsShape } from 'vs/workbench/api/common/extHost.protocol';
+import { Emitter } from '../../../../base/common/event.js';
+import { ExtHostTreeViews } from '../../common/extHostTreeViews.js';
+import { ExtHostCommands } from '../../common/extHostCommands.js';
+import { MainThreadTreeViewsShape, MainContext, MainThreadCommandsShape } from '../../common/extHost.protocol.js';
 import { TreeDataProvider, TreeItem } from 'vscode';
-import { TestRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol';
-import { mock } from 'vs/base/test/common/mock';
-import { TreeItemCollapsibleState, ITreeItem, IRevealOptions } from 'vs/workbench/common/views';
-import { NullLogService } from 'vs/platform/log/common/log';
-import type { IDisposable } from 'vs/base/common/lifecycle';
-import { nullExtensionDescription as extensionsDescription } from 'vs/workbench/services/extensions/common/extensions';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { IExtHostTelemetry } from 'vs/workbench/api/common/extHostTelemetry';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { TestRPCProtocol } from '../common/testRPCProtocol.js';
+import { mock } from '../../../../base/test/common/mock.js';
+import { TreeItemCollapsibleState, ITreeItem, IRevealOptions } from '../../../common/views.js';
+import { NullLogService } from '../../../../platform/log/common/log.js';
+import type { IDisposable } from '../../../../base/common/lifecycle.js';
+import { nullExtensionDescription as extensionsDescription } from '../../../services/extensions/common/extensions.js';
+import { runWithFakedTimers } from '../../../../base/test/common/timeTravelScheduler.js';
+import { IExtHostTelemetry } from '../../common/extHostTelemetry.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 
 suite('ExtHostTreeView', function () {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/api/test/browser/extHostTypeConverter.test.ts b/src/vs/workbench/api/test/browser/extHostTypeConverter.test.ts
index 40a148042ff..c4296afa836 100644
--- a/src/vs/workbench/api/test/browser/extHostTypeConverter.test.ts
+++ b/src/vs/workbench/api/test/browser/extHostTypeConverter.test.ts
@@ -5,12 +5,12 @@
 
 
 import assert from 'assert';
-import * as extHostTypes from 'vs/workbench/api/common/extHostTypes';
-import { MarkdownString, NotebookCellOutputItem, NotebookData, LanguageSelector, WorkspaceEdit } from 'vs/workbench/api/common/extHostTypeConverters';
-import { isEmptyObject } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { IWorkspaceTextEditDto } from 'vs/workbench/api/common/extHost.protocol';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import * as extHostTypes from '../../common/extHostTypes.js';
+import { MarkdownString, NotebookCellOutputItem, NotebookData, LanguageSelector, WorkspaceEdit } from '../../common/extHostTypeConverters.js';
+import { isEmptyObject } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IWorkspaceTextEditDto } from '../../common/extHost.protocol.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 
 suite('ExtHostTypeConverter', function () {
 
diff --git a/src/vs/workbench/api/test/browser/extHostTypes.test.ts b/src/vs/workbench/api/test/browser/extHostTypes.test.ts
index 3d1ff69b232..0ed70be8207 100644
--- a/src/vs/workbench/api/test/browser/extHostTypes.test.ts
+++ b/src/vs/workbench/api/test/browser/extHostTypes.test.ts
@@ -4,14 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import * as types from 'vs/workbench/api/common/extHostTypes';
-import { isWindows } from 'vs/base/common/platform';
-import { assertType } from 'vs/base/common/types';
-import { Mimes } from 'vs/base/common/mime';
-import { MarshalledId } from 'vs/base/common/marshallingIds';
-import { CancellationError } from 'vs/base/common/errors';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { URI } from '../../../../base/common/uri.js';
+import * as types from '../../common/extHostTypes.js';
+import { isWindows } from '../../../../base/common/platform.js';
+import { assertType } from '../../../../base/common/types.js';
+import { Mimes } from '../../../../base/common/mime.js';
+import { MarshalledId } from '../../../../base/common/marshallingIds.js';
+import { CancellationError } from '../../../../base/common/errors.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 
 function assertToJSON(a: any, expected: any) {
 	const raw = JSON.stringify(a);
diff --git a/src/vs/workbench/api/test/browser/extHostWebview.test.ts b/src/vs/workbench/api/test/browser/extHostWebview.test.ts
index e87300aeb05..9bbf074c7c6 100644
--- a/src/vs/workbench/api/test/browser/extHostWebview.test.ts
+++ b/src/vs/workbench/api/test/browser/extHostWebview.test.ts
@@ -4,22 +4,22 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { mock } from 'vs/base/test/common/mock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { MainThreadWebviewManager } from 'vs/workbench/api/browser/mainThreadWebviewManager';
-import { NullApiDeprecationService } from 'vs/workbench/api/common/extHostApiDeprecationService';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import { ExtHostWebviews } from 'vs/workbench/api/common/extHostWebview';
-import { ExtHostWebviewPanels } from 'vs/workbench/api/common/extHostWebviewPanels';
-import { SingleProxyRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol';
-import { decodeAuthority, webviewResourceBaseHost } from 'vs/workbench/contrib/webview/common/webview';
-import { EditorGroupColumn } from 'vs/workbench/services/editor/common/editorGroupColumn';
-import { IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { URI } from '../../../../base/common/uri.js';
+import { mock } from '../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
+import { NullLogService } from '../../../../platform/log/common/log.js';
+import { MainThreadWebviewManager } from '../../browser/mainThreadWebviewManager.js';
+import { NullApiDeprecationService } from '../../common/extHostApiDeprecationService.js';
+import { IExtHostRpcService } from '../../common/extHostRpcService.js';
+import { ExtHostWebviews } from '../../common/extHostWebview.js';
+import { ExtHostWebviewPanels } from '../../common/extHostWebviewPanels.js';
+import { SingleProxyRPCProtocol } from '../common/testRPCProtocol.js';
+import { decodeAuthority, webviewResourceBaseHost } from '../../../contrib/webview/common/webview.js';
+import { EditorGroupColumn } from '../../../services/editor/common/editorGroupColumn.js';
+import { IExtHostContext } from '../../../services/extensions/common/extHostCustomers.js';
 import type * as vscode from 'vscode';
 
 suite('ExtHostWebview', () => {
diff --git a/src/vs/workbench/api/test/browser/extHostWorkspace.test.ts b/src/vs/workbench/api/test/browser/extHostWorkspace.test.ts
index 5b9dd312c74..0c019f59b2c 100644
--- a/src/vs/workbench/api/test/browser/extHostWorkspace.test.ts
+++ b/src/vs/workbench/api/test/browser/extHostWorkspace.test.ts
@@ -4,28 +4,29 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { basename } from 'vs/base/common/path';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { ILogService, NullLogService } from 'vs/platform/log/common/log';
-import { IWorkspaceFolderData } from 'vs/platform/workspace/common/workspace';
-import { MainThreadWorkspace } from 'vs/workbench/api/browser/mainThreadWorkspace';
-import { IMainContext, IWorkspaceData, MainContext, ITextSearchComplete } from 'vs/workbench/api/common/extHost.protocol';
-import { RelativePattern } from 'vs/workbench/api/common/extHostTypes';
-import { ExtHostWorkspace } from 'vs/workbench/api/common/extHostWorkspace';
-import { mock } from 'vs/base/test/common/mock';
-import { TestRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol';
-import { ExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService';
-import { IFileQueryBuilderOptions, ITextQueryBuilderOptions } from 'vs/workbench/services/search/common/queryBuilder';
-import { IPatternInfo } from 'vs/workbench/services/search/common/search';
-import { isLinux, isWindows } from 'vs/base/common/platform';
-import { IExtHostFileSystemInfo } from 'vs/workbench/api/common/extHostFileSystemInfo';
-import { FileSystemProviderCapabilities } from 'vs/platform/files/common/files';
-import { nullExtensionDescription as extensionDescriptor } from 'vs/workbench/services/extensions/common/extensions';
-import { IURITransformerService } from 'vs/workbench/api/common/extHostUriTransformerService';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { basename } from '../../../../base/common/path.js';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { ILogService, NullLogService } from '../../../../platform/log/common/log.js';
+import { IWorkspaceFolderData } from '../../../../platform/workspace/common/workspace.js';
+import { MainThreadWorkspace } from '../../browser/mainThreadWorkspace.js';
+import { IMainContext, IWorkspaceData, MainContext, ITextSearchComplete } from '../../common/extHost.protocol.js';
+import { RelativePattern } from '../../common/extHostTypes.js';
+import { ExtHostWorkspace } from '../../common/extHostWorkspace.js';
+import { mock } from '../../../../base/test/common/mock.js';
+import { TestRPCProtocol } from '../common/testRPCProtocol.js';
+import { ExtHostRpcService } from '../../common/extHostRpcService.js';
+import { IExtHostInitDataService } from '../../common/extHostInitDataService.js';
+import { IFileQueryBuilderOptions, ITextQueryBuilderOptions } from '../../../services/search/common/queryBuilder.js';
+import { IPatternInfo } from '../../../services/search/common/search.js';
+import { isLinux, isWindows } from '../../../../base/common/platform.js';
+import { IExtHostFileSystemInfo } from '../../common/extHostFileSystemInfo.js';
+import { FileSystemProviderCapabilities } from '../../../../platform/files/common/files.js';
+import { nullExtensionDescription as extensionDescriptor } from '../../../services/extensions/common/extensions.js';
+import { IURITransformerService } from '../../common/extHostUriTransformerService.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { ExcludeSettingOptions } from '../../../services/search/common/searchExtTypes.js';
 
 function createExtHostWorkspace(mainContext: IMainContext, data: IWorkspaceData, logService: ILogService): ExtHostWorkspace {
 	const result = new ExtHostWorkspace(
@@ -577,377 +578,658 @@ suite('ExtHostWorkspace', function () {
 		return { uri, name };
 	}
 
-	test('findFiles - string include', () => {
-		const root = '/project/foo';
-		const rpcProtocol = new TestRPCProtocol();
+	suite('findFiles -', function () {
+		test('string include', () => {
+			const root = '/project/foo';
+			const rpcProtocol = new TestRPCProtocol();
 
-		let mainThreadCalled = false;
-		rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
-			override $startFileSearch(_includeFolder: UriComponents | null, options: IFileQueryBuilderOptions, token: CancellationToken): Promise<URI[] | null> {
-				mainThreadCalled = true;
-				assert.strictEqual(options.includePattern, 'foo');
-				assert.strictEqual(_includeFolder, null);
-				assert.strictEqual(options.excludePattern, '');
-				assert.strictEqual(options.disregardExcludeSettings, false);
-				assert.strictEqual(options.maxResults, 10);
-				return Promise.resolve(null);
-			}
+			let mainThreadCalled = false;
+			rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
+				override $startFileSearch(_includeFolder: UriComponents | null, options: IFileQueryBuilderOptions, token: CancellationToken): Promise<URI[] | null> {
+					mainThreadCalled = true;
+					assert.strictEqual(options.includePattern, 'foo');
+					assert.strictEqual(_includeFolder, null);
+					assert.strictEqual(options.excludePattern, undefined);
+					assert.strictEqual(options.disregardExcludeSettings, false);
+					assert.strictEqual(options.maxResults, 10);
+					return Promise.resolve(null);
+				}
+			});
+
+			const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
+			return ws.findFiles('foo', undefined, 10, new ExtensionIdentifier('test')).then(() => {
+				assert(mainThreadCalled, 'mainThreadCalled');
+			});
 		});
 
-		const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
-		return ws.findFiles('foo', undefined, 10, new ExtensionIdentifier('test')).then(() => {
+		function testFindFilesInclude(pattern: RelativePattern) {
+			const root = '/project/foo';
+			const rpcProtocol = new TestRPCProtocol();
+
+			let mainThreadCalled = false;
+			rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
+				override $startFileSearch(_includeFolder: UriComponents | null, options: IFileQueryBuilderOptions, token: CancellationToken): Promise<URI[] | null> {
+					mainThreadCalled = true;
+					assert.strictEqual(options.includePattern, 'glob/**');
+					assert.deepStrictEqual(_includeFolder ? URI.from(_includeFolder).toJSON() : null, URI.file('/other/folder').toJSON());
+					assert.strictEqual(options.excludePattern, undefined);
+					assert.strictEqual(options.disregardExcludeSettings, false);
+					return Promise.resolve(null);
+				}
+			});
+
+			const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
+			return ws.findFiles(pattern, undefined, 10, new ExtensionIdentifier('test')).then(() => {
+				assert(mainThreadCalled, 'mainThreadCalled');
+			});
+		}
+
+		test('RelativePattern include (string)', () => {
+			return testFindFilesInclude(new RelativePattern('/other/folder', 'glob/**'));
+		});
+
+		test('RelativePattern include (URI)', () => {
+			return testFindFilesInclude(new RelativePattern(URI.file('/other/folder'), 'glob/**'));
+		});
+
+		test('no excludes', () => {
+			const root = '/project/foo';
+			const rpcProtocol = new TestRPCProtocol();
+
+			let mainThreadCalled = false;
+			rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
+				override $startFileSearch(_includeFolder: UriComponents | null, options: IFileQueryBuilderOptions, token: CancellationToken): Promise<URI[] | null> {
+					mainThreadCalled = true;
+					assert.strictEqual(options.includePattern, 'glob/**');
+					assert.deepStrictEqual(URI.revive(_includeFolder!).toString(), URI.file('/other/folder').toString());
+					assert.strictEqual(options.excludePattern, undefined);
+					assert.strictEqual(options.disregardExcludeSettings, true);
+					return Promise.resolve(null);
+				}
+			});
+
+			const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
+			return ws.findFiles(new RelativePattern('/other/folder', 'glob/**'), null, 10, new ExtensionIdentifier('test')).then(() => {
+				assert(mainThreadCalled, 'mainThreadCalled');
+			});
+		});
+
+		test('with cancelled token', () => {
+			const root = '/project/foo';
+			const rpcProtocol = new TestRPCProtocol();
+
+			let mainThreadCalled = false;
+			rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
+				override $startFileSearch(_includeFolder: UriComponents | null, options: IFileQueryBuilderOptions, token: CancellationToken): Promise<URI[] | null> {
+					mainThreadCalled = true;
+					return Promise.resolve(null);
+				}
+			});
+
+			const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
+
+			const token = CancellationToken.Cancelled;
+			return ws.findFiles(new RelativePattern('/other/folder', 'glob/**'), null, 10, new ExtensionIdentifier('test'), token).then(() => {
+				assert(!mainThreadCalled, '!mainThreadCalled');
+			});
+		});
+
+		test('RelativePattern exclude', () => {
+			const root = '/project/foo';
+			const rpcProtocol = new TestRPCProtocol();
+
+			let mainThreadCalled = false;
+			rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
+				override $startFileSearch(_includeFolder: UriComponents | null, options: IFileQueryBuilderOptions, token: CancellationToken): Promise<URI[] | null> {
+					mainThreadCalled = true;
+					assert.strictEqual(options.disregardExcludeSettings, false);
+					assert.strictEqual(options.excludePattern?.length, 1);
+					assert.strictEqual(options.excludePattern[0].pattern, 'glob/**'); // Note that the base portion is ignored, see #52651
+					return Promise.resolve(null);
+				}
+			});
+
+			const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
+			return ws.findFiles('', new RelativePattern(root, 'glob/**'), 10, new ExtensionIdentifier('test')).then(() => {
+				assert(mainThreadCalled, 'mainThreadCalled');
+			});
+		});
+	});
+
+	suite('findFiles2 -', function () {
+		test('string include', () => {
+			const root = '/project/foo';
+			const rpcProtocol = new TestRPCProtocol();
+
+			let mainThreadCalled = false;
+			rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
+				override $startFileSearch(_includeFolder: UriComponents | null, options: IFileQueryBuilderOptions, token: CancellationToken): Promise<URI[] | null> {
+					mainThreadCalled = true;
+					assert.strictEqual(options.filePattern, 'foo');
+					assert.strictEqual(options.includePattern, undefined);
+					assert.strictEqual(_includeFolder, null);
+					assert.strictEqual(options.excludePattern, undefined);
+					assert.strictEqual(options.disregardExcludeSettings, false);
+					assert.strictEqual(options.maxResults, 10);
+					return Promise.resolve(null);
+				}
+			});
+
+			const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
+			return ws.findFiles2('foo', { maxResults: 10, useDefaultExcludes: true }, new ExtensionIdentifier('test')).then(() => {
+				assert(mainThreadCalled, 'mainThreadCalled');
+			});
+		});
+
+		function testFindFiles2Include(pattern: RelativePattern) {
+			const root = '/project/foo';
+			const rpcProtocol = new TestRPCProtocol();
+
+			let mainThreadCalled = false;
+			rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
+				override $startFileSearch(_includeFolder: UriComponents | null, options: IFileQueryBuilderOptions, token: CancellationToken): Promise<URI[] | null> {
+					mainThreadCalled = true;
+					assert.strictEqual(options.filePattern, 'glob/**');
+					assert.strictEqual(options.includePattern, undefined);
+					assert.deepStrictEqual(_includeFolder ? URI.from(_includeFolder).toJSON() : null, URI.file('/other/folder').toJSON());
+					assert.strictEqual(options.excludePattern, undefined);
+					assert.strictEqual(options.disregardExcludeSettings, false);
+					return Promise.resolve(null);
+				}
+			});
+
+			const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
+			return ws.findFiles2(pattern, { maxResults: 10 }, new ExtensionIdentifier('test')).then(() => {
+				assert(mainThreadCalled, 'mainThreadCalled');
+			});
+		}
+
+		test('RelativePattern include (string)', () => {
+			return testFindFiles2Include(new RelativePattern('/other/folder', 'glob/**'));
+		});
+
+		test('RelativePattern include (URI)', () => {
+			return testFindFiles2Include(new RelativePattern(URI.file('/other/folder'), 'glob/**'));
+		});
+
+		test('no excludes', () => {
+			const root = '/project/foo';
+			const rpcProtocol = new TestRPCProtocol();
+
+			let mainThreadCalled = false;
+			rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
+				override $startFileSearch(_includeFolder: UriComponents | null, options: IFileQueryBuilderOptions, token: CancellationToken): Promise<URI[] | null> {
+					mainThreadCalled = true;
+					assert.strictEqual(options.filePattern, 'glob/**');
+					assert.strictEqual(options.includePattern, undefined);
+					assert.deepStrictEqual(URI.revive(_includeFolder!).toString(), URI.file('/other/folder').toString());
+					assert.strictEqual(options.excludePattern, undefined);
+					assert.strictEqual(options.disregardExcludeSettings, false);
+					return Promise.resolve(null);
+				}
+			});
+
+			const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
+			return ws.findFiles2(new RelativePattern('/other/folder', 'glob/**'), {}, new ExtensionIdentifier('test')).then(() => {
+				assert(mainThreadCalled, 'mainThreadCalled');
+			});
+		});
+
+		test('with cancelled token', () => {
+			const root = '/project/foo';
+			const rpcProtocol = new TestRPCProtocol();
+
+			let mainThreadCalled = false;
+			rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
+				override $startFileSearch(_includeFolder: UriComponents | null, options: IFileQueryBuilderOptions, token: CancellationToken): Promise<URI[] | null> {
+					mainThreadCalled = true;
+					return Promise.resolve(null);
+				}
+			});
+
+			const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
+
+			const token = CancellationToken.Cancelled;
+			return ws.findFiles2(new RelativePattern('/other/folder', 'glob/**'), {}, new ExtensionIdentifier('test'), token).then(() => {
+				assert(!mainThreadCalled, '!mainThreadCalled');
+			});
+		});
+
+		test('RelativePattern exclude', () => {
+			const root = '/project/foo';
+			const rpcProtocol = new TestRPCProtocol();
+
+			let mainThreadCalled = false;
+			rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
+				override $startFileSearch(_includeFolder: UriComponents | null, options: IFileQueryBuilderOptions, token: CancellationToken): Promise<URI[] | null> {
+					mainThreadCalled = true;
+					assert.strictEqual(options.disregardExcludeSettings, false);
+					assert.strictEqual(options.excludePattern?.length, 1);
+					assert.strictEqual(options.excludePattern[0].pattern, 'glob/**'); // Note that the base portion is ignored, see #52651
+					return Promise.resolve(null);
+				}
+			});
+
+			const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
+			return ws.findFiles2('', { exclude: new RelativePattern(root, 'glob/**') }, new ExtensionIdentifier('test')).then(() => {
+				assert(mainThreadCalled, 'mainThreadCalled');
+			});
+		});
+		test('useIgnoreFiles', () => {
+			const root = '/project/foo';
+			const rpcProtocol = new TestRPCProtocol();
+
+			let mainThreadCalled = false;
+			rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
+				override $startFileSearch(_includeFolder: UriComponents | null, options: IFileQueryBuilderOptions, token: CancellationToken): Promise<URI[] | null> {
+					mainThreadCalled = true;
+					assert.strictEqual(options.disregardExcludeSettings, false);
+					assert.strictEqual(options.disregardIgnoreFiles, false);
+					assert.strictEqual(options.disregardGlobalIgnoreFiles, false);
+					assert.strictEqual(options.disregardParentIgnoreFiles, false);
+					return Promise.resolve(null);
+				}
+			});
+
+			const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
+			return ws.findFiles2('', { useIgnoreFiles: true, useParentIgnoreFiles: true, useGlobalIgnoreFiles: true }, new ExtensionIdentifier('test')).then(() => {
+				assert(mainThreadCalled, 'mainThreadCalled');
+			});
+		});
+
+		test('use symlinks', () => {
+			const root = '/project/foo';
+			const rpcProtocol = new TestRPCProtocol();
+
+			let mainThreadCalled = false;
+			rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
+				override $startFileSearch(_includeFolder: UriComponents | null, options: IFileQueryBuilderOptions, token: CancellationToken): Promise<URI[] | null> {
+					mainThreadCalled = true;
+					assert.strictEqual(options.ignoreSymlinks, false);
+					return Promise.resolve(null);
+				}
+			});
+
+			const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
+			return ws.findFiles2('', { followSymlinks: true }, new ExtensionIdentifier('test')).then(() => {
+				assert(mainThreadCalled, 'mainThreadCalled');
+			});
+		});
+	});
+
+	suite('findFiles2New -', function () {
+		test('string include', () => {
+			const root = '/project/foo';
+			const rpcProtocol = new TestRPCProtocol();
+
+			let mainThreadCalled = false;
+			rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
+				override $startFileSearch(_includeFolder: UriComponents | null, options: IFileQueryBuilderOptions, token: CancellationToken): Promise<URI[] | null> {
+					mainThreadCalled = true;
+					assert.strictEqual(options.filePattern, 'foo');
+					assert.strictEqual(options.includePattern, undefined);
+					assert.strictEqual(_includeFolder, null);
+					assert.strictEqual(options.excludePattern, undefined);
+					assert.strictEqual(options.disregardExcludeSettings, false);
+					assert.strictEqual(options.maxResults, 10);
+					return Promise.resolve(null);
+				}
+			});
+
+			const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
+			return ws.findFiles2New(['foo'], { maxResults: 10, useExcludeSettings: ExcludeSettingOptions.FilesExclude }, new ExtensionIdentifier('test')).then(() => {
+				assert(mainThreadCalled, 'mainThreadCalled');
+			});
+		});
+
+		function testFindFiles2NewInclude(pattern: RelativePattern[]) {
+			const root = '/project/foo';
+			const rpcProtocol = new TestRPCProtocol();
+
+			let mainThreadCalled = false;
+			rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
+				override $startFileSearch(_includeFolder: UriComponents | null, options: IFileQueryBuilderOptions, token: CancellationToken): Promise<URI[] | null> {
+					mainThreadCalled = true;
+					assert.strictEqual(options.filePattern, 'glob/**');
+					assert.strictEqual(options.includePattern, undefined);
+					assert.deepStrictEqual(_includeFolder ? URI.from(_includeFolder).toJSON() : null, URI.file('/other/folder').toJSON());
+					assert.strictEqual(options.excludePattern, undefined);
+					assert.strictEqual(options.disregardExcludeSettings, false);
+					return Promise.resolve(null);
+				}
+			});
+
+			const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
+			return ws.findFiles2New(pattern, { maxResults: 10 }, new ExtensionIdentifier('test')).then(() => {
+				assert(mainThreadCalled, 'mainThreadCalled');
+			});
+		}
+
+		test('RelativePattern include (string)', () => {
+			return testFindFiles2NewInclude([new RelativePattern('/other/folder', 'glob/**')]);
+		});
+
+		test('RelativePattern include (URI)', () => {
+			return testFindFiles2NewInclude([new RelativePattern(URI.file('/other/folder'), 'glob/**')]);
+		});
+
+		test('no excludes', () => {
+			const root = '/project/foo';
+			const rpcProtocol = new TestRPCProtocol();
+
+			let mainThreadCalled = false;
+			rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
+				override $startFileSearch(_includeFolder: UriComponents | null, options: IFileQueryBuilderOptions, token: CancellationToken): Promise<URI[] | null> {
+					mainThreadCalled = true;
+					assert.strictEqual(options.filePattern, 'glob/**');
+					assert.strictEqual(options.includePattern, undefined);
+					assert.deepStrictEqual(URI.revive(_includeFolder!).toString(), URI.file('/other/folder').toString());
+					assert.strictEqual(options.excludePattern, undefined);
+					assert.strictEqual(options.disregardExcludeSettings, false);
+					return Promise.resolve(null);
+				}
+			});
+
+			const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
+			return ws.findFiles2New([new RelativePattern('/other/folder', 'glob/**')], {}, new ExtensionIdentifier('test')).then(() => {
+				assert(mainThreadCalled, 'mainThreadCalled');
+			});
+		});
+
+		test('with cancelled token', () => {
+			const root = '/project/foo';
+			const rpcProtocol = new TestRPCProtocol();
+
+			let mainThreadCalled = false;
+			rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
+				override $startFileSearch(_includeFolder: UriComponents | null, options: IFileQueryBuilderOptions, token: CancellationToken): Promise<URI[] | null> {
+					mainThreadCalled = true;
+					return Promise.resolve(null);
+				}
+			});
+
+			const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
+
+			const token = CancellationToken.Cancelled;
+			return ws.findFiles2New([new RelativePattern('/other/folder', 'glob/**')], {}, new ExtensionIdentifier('test'), token).then(() => {
+				assert(!mainThreadCalled, '!mainThreadCalled');
+			});
+		});
+
+		test('RelativePattern exclude', () => {
+			const root = '/project/foo';
+			const rpcProtocol = new TestRPCProtocol();
+
+			let mainThreadCalled = false;
+			rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
+				override $startFileSearch(_includeFolder: UriComponents | null, options: IFileQueryBuilderOptions, token: CancellationToken): Promise<URI[] | null> {
+					mainThreadCalled = true;
+					assert.strictEqual(options.disregardExcludeSettings, false);
+					assert.strictEqual(options.excludePattern?.length, 1);
+					assert.strictEqual(options.excludePattern[0].pattern, 'glob/**'); // Note that the base portion is ignored, see #52651
+					return Promise.resolve(null);
+				}
+			});
+
+			const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
+			return ws.findFiles2New([''], { exclude: [new RelativePattern(root, 'glob/**')] }, new ExtensionIdentifier('test')).then(() => {
+				assert(mainThreadCalled, 'mainThreadCalled');
+			});
+		});
+		test('useIgnoreFiles', () => {
+			const root = '/project/foo';
+			const rpcProtocol = new TestRPCProtocol();
+
+			let mainThreadCalled = false;
+			rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
+				override $startFileSearch(_includeFolder: UriComponents | null, options: IFileQueryBuilderOptions, token: CancellationToken): Promise<URI[] | null> {
+					mainThreadCalled = true;
+					assert.strictEqual(options.disregardExcludeSettings, false);
+					assert.strictEqual(options.disregardIgnoreFiles, false);
+					assert.strictEqual(options.disregardGlobalIgnoreFiles, false);
+					assert.strictEqual(options.disregardParentIgnoreFiles, false);
+					return Promise.resolve(null);
+				}
+			});
+
+			const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
+			return ws.findFiles2New([''], { useIgnoreFiles: { local: true, parent: true, global: true } }, new ExtensionIdentifier('test')).then(() => {
+				assert(mainThreadCalled, 'mainThreadCalled');
+			});
+		});
+
+		test('use symlinks', () => {
+			const root = '/project/foo';
+			const rpcProtocol = new TestRPCProtocol();
+
+			let mainThreadCalled = false;
+			rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
+				override $startFileSearch(_includeFolder: UriComponents | null, options: IFileQueryBuilderOptions, token: CancellationToken): Promise<URI[] | null> {
+					mainThreadCalled = true;
+					assert.strictEqual(options.ignoreSymlinks, false);
+					return Promise.resolve(null);
+				}
+			});
+
+			const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
+			return ws.findFiles2New([''], { followSymlinks: true }, new ExtensionIdentifier('test')).then(() => {
+				assert(mainThreadCalled, 'mainThreadCalled');
+			});
+		});
+
+		// todo: add tests with multiple filePatterns and excludes
+
+	});
+
+	suite('findTextInFiles -', function () {
+		test('no include', async () => {
+			const root = '/project/foo';
+			const rpcProtocol = new TestRPCProtocol();
+
+			let mainThreadCalled = false;
+			rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
+				override async $startTextSearch(query: IPatternInfo, folder: UriComponents | null, options: ITextQueryBuilderOptions, requestId: number, token: CancellationToken): Promise<ITextSearchComplete | null> {
+					mainThreadCalled = true;
+					assert.strictEqual(query.pattern, 'foo');
+					assert.strictEqual(folder, null);
+					assert.strictEqual(options.includePattern, undefined);
+					assert.strictEqual(options.excludePattern, undefined);
+					return null;
+				}
+			});
+
+			const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
+			await ws.findTextInFiles({ pattern: 'foo' }, {}, () => { }, new ExtensionIdentifier('test'));
 			assert(mainThreadCalled, 'mainThreadCalled');
 		});
-	});
 
-	function testFindFilesInclude(pattern: RelativePattern) {
-		const root = '/project/foo';
-		const rpcProtocol = new TestRPCProtocol();
+		test('string include', async () => {
+			const root = '/project/foo';
+			const rpcProtocol = new TestRPCProtocol();
 
-		let mainThreadCalled = false;
-		rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
-			override $startFileSearch(_includeFolder: UriComponents | null, options: IFileQueryBuilderOptions, token: CancellationToken): Promise<URI[] | null> {
-				mainThreadCalled = true;
-				assert.strictEqual(options.includePattern, 'glob/**');
-				assert.deepStrictEqual(_includeFolder ? URI.from(_includeFolder).toJSON() : null, URI.file('/other/folder').toJSON());
-				assert.strictEqual(options.excludePattern, '');
-				assert.strictEqual(options.disregardExcludeSettings, false);
-				return Promise.resolve(null);
-			}
-		});
+			let mainThreadCalled = false;
+			rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
+				override async $startTextSearch(query: IPatternInfo, folder: UriComponents | null, options: ITextQueryBuilderOptions, requestId: number, token: CancellationToken): Promise<ITextSearchComplete | null> {
+					mainThreadCalled = true;
+					assert.strictEqual(query.pattern, 'foo');
+					assert.strictEqual(folder, null);
+					assert.strictEqual(options.includePattern, '**/files');
+					assert.strictEqual(options.excludePattern, undefined);
+					return null;
+				}
+			});
 
-		const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
-		return ws.findFiles(pattern, undefined, 10, new ExtensionIdentifier('test')).then(() => {
+			const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
+			await ws.findTextInFiles({ pattern: 'foo' }, { include: '**/files' }, () => { }, new ExtensionIdentifier('test'));
 			assert(mainThreadCalled, 'mainThreadCalled');
 		});
-	}
 
-	test('findFiles - RelativePattern include (string)', () => {
-		return testFindFilesInclude(new RelativePattern('/other/folder', 'glob/**'));
-	});
+		test('RelativePattern include', async () => {
+			const root = '/project/foo';
+			const rpcProtocol = new TestRPCProtocol();
 
-	test('findFiles - RelativePattern include (URI)', () => {
-		return testFindFilesInclude(new RelativePattern(URI.file('/other/folder'), 'glob/**'));
-	});
+			let mainThreadCalled = false;
+			rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
+				override async $startTextSearch(query: IPatternInfo, folder: UriComponents | null, options: ITextQueryBuilderOptions, requestId: number, token: CancellationToken): Promise<ITextSearchComplete | null> {
+					mainThreadCalled = true;
+					assert.strictEqual(query.pattern, 'foo');
+					assert.deepStrictEqual(URI.revive(folder!).toString(), URI.file('/other/folder').toString());
+					assert.strictEqual(options.includePattern, 'glob/**');
+					assert.strictEqual(options.excludePattern, undefined);
+					return null;
+				}
+			});
 
-	test('findFiles - no excludes', () => {
-		const root = '/project/foo';
-		const rpcProtocol = new TestRPCProtocol();
-
-		let mainThreadCalled = false;
-		rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
-			override $startFileSearch(_includeFolder: UriComponents | null, options: IFileQueryBuilderOptions, token: CancellationToken): Promise<URI[] | null> {
-				mainThreadCalled = true;
-				assert.strictEqual(options.includePattern, 'glob/**');
-				assert.deepStrictEqual(URI.revive(_includeFolder!).toString(), URI.file('/other/folder').toString());
-				assert.strictEqual(options.excludePattern, '');
-				assert.strictEqual(options.disregardExcludeSettings, true);
-				return Promise.resolve(null);
-			}
-		});
-
-		const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
-		return ws.findFiles(new RelativePattern('/other/folder', 'glob/**'), null, 10, new ExtensionIdentifier('test')).then(() => {
+			const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
+			await ws.findTextInFiles({ pattern: 'foo' }, { include: new RelativePattern('/other/folder', 'glob/**') }, () => { }, new ExtensionIdentifier('test'));
 			assert(mainThreadCalled, 'mainThreadCalled');
 		});
-	});
 
-	test('findFiles - with cancelled token', () => {
-		const root = '/project/foo';
-		const rpcProtocol = new TestRPCProtocol();
+		test('with cancelled token', async () => {
+			const root = '/project/foo';
+			const rpcProtocol = new TestRPCProtocol();
 
-		let mainThreadCalled = false;
-		rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
-			override $startFileSearch(_includeFolder: UriComponents | null, options: IFileQueryBuilderOptions, token: CancellationToken): Promise<URI[] | null> {
-				mainThreadCalled = true;
-				return Promise.resolve(null);
-			}
-		});
+			let mainThreadCalled = false;
+			rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
+				override async $startTextSearch(query: IPatternInfo, folder: UriComponents | null, options: ITextQueryBuilderOptions, requestId: number, token: CancellationToken): Promise<ITextSearchComplete | null> {
+					mainThreadCalled = true;
+					return null;
+				}
+			});
 
-		const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
-
-		const token = CancellationToken.Cancelled;
-		return ws.findFiles(new RelativePattern('/other/folder', 'glob/**'), null, 10, new ExtensionIdentifier('test'), token).then(() => {
+			const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
+			const token = CancellationToken.Cancelled;
+			await ws.findTextInFiles({ pattern: 'foo' }, {}, () => { }, new ExtensionIdentifier('test'), token);
 			assert(!mainThreadCalled, '!mainThreadCalled');
 		});
-	});
 
-	test('findFiles - RelativePattern exclude', () => {
-		const root = '/project/foo';
-		const rpcProtocol = new TestRPCProtocol();
+		test('RelativePattern exclude', async () => {
+			const root = '/project/foo';
+			const rpcProtocol = new TestRPCProtocol();
 
-		let mainThreadCalled = false;
-		rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
-			override $startFileSearch(_includeFolder: UriComponents | null, options: IFileQueryBuilderOptions, token: CancellationToken): Promise<URI[] | null> {
-				mainThreadCalled = true;
-				assert.strictEqual(options.disregardExcludeSettings, false);
-				assert.strictEqual(options.excludePattern, 'glob/**'); // Note that the base portion is ignored, see #52651
-				return Promise.resolve(null);
-			}
-		});
+			let mainThreadCalled = false;
+			rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
+				override async $startTextSearch(query: IPatternInfo, folder: UriComponents | null, options: ITextQueryBuilderOptions, requestId: number, token: CancellationToken): Promise<ITextSearchComplete | null> {
+					mainThreadCalled = true;
+					assert.strictEqual(query.pattern, 'foo');
+					assert.deepStrictEqual(folder, null);
+					assert.strictEqual(options.includePattern, undefined);
+					assert.strictEqual(options.excludePattern?.length, 1);
+					assert.strictEqual(options.excludePattern[0].pattern, 'glob/**'); // exclude folder is ignored...
+					return null;
+				}
+			});
 
-		const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
-		return ws.findFiles('', new RelativePattern(root, 'glob/**'), 10, new ExtensionIdentifier('test')).then(() => {
-			assert(mainThreadCalled, 'mainThreadCalled');
-		});
-	});
-	test('findFiles2 - string include', () => {
-		const root = '/project/foo';
-		const rpcProtocol = new TestRPCProtocol();
-
-		let mainThreadCalled = false;
-		rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
-			override $startFileSearch(_includeFolder: UriComponents | null, options: IFileQueryBuilderOptions, token: CancellationToken): Promise<URI[] | null> {
-				mainThreadCalled = true;
-				assert.strictEqual(options.filePattern, 'foo');
-				assert.strictEqual(options.includePattern, undefined);
-				assert.strictEqual(_includeFolder, null);
-				assert.strictEqual(options.excludePattern, undefined);
-				assert.strictEqual(options.disregardExcludeSettings, false);
-				assert.strictEqual(options.maxResults, 10);
-				return Promise.resolve(null);
-			}
-		});
-
-		const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
-		return ws.findFiles2('foo', { maxResults: 10, useDefaultExcludes: true }, new ExtensionIdentifier('test')).then(() => {
+			const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
+			await ws.findTextInFiles({ pattern: 'foo' }, { exclude: new RelativePattern('/other/folder', 'glob/**') }, () => { }, new ExtensionIdentifier('test'));
 			assert(mainThreadCalled, 'mainThreadCalled');
 		});
 	});
 
-	function testFindFiles2Include(pattern: RelativePattern) {
-		const root = '/project/foo';
-		const rpcProtocol = new TestRPCProtocol();
+	suite('findTextInFilesNew -', function () {
+		test('no include', async () => {
+			const root = '/project/foo';
+			const rpcProtocol = new TestRPCProtocol();
 
-		let mainThreadCalled = false;
-		rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
-			override $startFileSearch(_includeFolder: UriComponents | null, options: IFileQueryBuilderOptions, token: CancellationToken): Promise<URI[] | null> {
-				mainThreadCalled = true;
-				assert.strictEqual(options.filePattern, 'glob/**');
-				assert.strictEqual(options.includePattern, undefined);
-				assert.deepStrictEqual(_includeFolder ? URI.from(_includeFolder).toJSON() : null, URI.file('/other/folder').toJSON());
-				assert.strictEqual(options.excludePattern, undefined);
-				assert.strictEqual(options.disregardExcludeSettings, false);
-				return Promise.resolve(null);
-			}
-		});
+			let mainThreadCalled = false;
+			rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
+				override async $startTextSearch(query: IPatternInfo, folder: UriComponents | null, options: ITextQueryBuilderOptions, requestId: number, token: CancellationToken): Promise<ITextSearchComplete | null> {
+					mainThreadCalled = true;
+					assert.strictEqual(query.pattern, 'foo');
+					assert.strictEqual(folder, null);
+					assert.strictEqual(options.includePattern, undefined);
+					assert.strictEqual(options.excludePattern, undefined);
+					return null;
+				}
+			});
 
-		const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
-		return ws.findFiles2(pattern, { maxResults: 10 }, new ExtensionIdentifier('test')).then(() => {
+			const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
+			await (ws.findTextInFilesNew({ pattern: 'foo' }, {}, new ExtensionIdentifier('test'))).complete;
 			assert(mainThreadCalled, 'mainThreadCalled');
 		});
-	}
 
-	test('findFiles2 - RelativePattern include (string)', () => {
-		return testFindFiles2Include(new RelativePattern('/other/folder', 'glob/**'));
-	});
+		test('string include', async () => {
+			const root = '/project/foo';
+			const rpcProtocol = new TestRPCProtocol();
 
-	test('findFiles2 - RelativePattern include (URI)', () => {
-		return testFindFiles2Include(new RelativePattern(URI.file('/other/folder'), 'glob/**'));
-	});
+			let mainThreadCalled = false;
+			rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
+				override async $startTextSearch(query: IPatternInfo, folder: UriComponents | null, options: ITextQueryBuilderOptions, requestId: number, token: CancellationToken): Promise<ITextSearchComplete | null> {
+					mainThreadCalled = true;
+					assert.strictEqual(query.pattern, 'foo');
+					assert.strictEqual(folder, null);
+					assert.strictEqual(options.includePattern, '**/files');
+					assert.strictEqual(options.excludePattern, undefined);
+					return null;
+				}
+			});
 
-	test('findFiles2 - no excludes', () => {
-		const root = '/project/foo';
-		const rpcProtocol = new TestRPCProtocol();
-
-		let mainThreadCalled = false;
-		rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
-			override $startFileSearch(_includeFolder: UriComponents | null, options: IFileQueryBuilderOptions, token: CancellationToken): Promise<URI[] | null> {
-				mainThreadCalled = true;
-				assert.strictEqual(options.filePattern, 'glob/**');
-				assert.strictEqual(options.includePattern, undefined);
-				assert.deepStrictEqual(URI.revive(_includeFolder!).toString(), URI.file('/other/folder').toString());
-				assert.strictEqual(options.excludePattern, undefined);
-				assert.strictEqual(options.disregardExcludeSettings, false);
-				return Promise.resolve(null);
-			}
-		});
-
-		const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
-		return ws.findFiles2(new RelativePattern('/other/folder', 'glob/**'), {}, new ExtensionIdentifier('test')).then(() => {
+			const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
+			await (ws.findTextInFilesNew({ pattern: 'foo' }, { include: ['**/files'] }, new ExtensionIdentifier('test'))).complete;
 			assert(mainThreadCalled, 'mainThreadCalled');
 		});
-	});
 
-	test('findFiles2 - with cancelled token', () => {
-		const root = '/project/foo';
-		const rpcProtocol = new TestRPCProtocol();
+		test('RelativePattern include', async () => {
+			const root = '/project/foo';
+			const rpcProtocol = new TestRPCProtocol();
 
-		let mainThreadCalled = false;
-		rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
-			override $startFileSearch(_includeFolder: UriComponents | null, options: IFileQueryBuilderOptions, token: CancellationToken): Promise<URI[] | null> {
-				mainThreadCalled = true;
-				return Promise.resolve(null);
-			}
+			let mainThreadCalled = false;
+			rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
+				override async $startTextSearch(query: IPatternInfo, folder: UriComponents | null, options: ITextQueryBuilderOptions, requestId: number, token: CancellationToken): Promise<ITextSearchComplete | null> {
+					mainThreadCalled = true;
+					assert.strictEqual(query.pattern, 'foo');
+					assert.deepStrictEqual(URI.revive(folder!).toString(), URI.file('/other/folder').toString());
+					assert.strictEqual(options.includePattern, 'glob/**');
+					assert.strictEqual(options.excludePattern, undefined);
+					return null;
+				}
+			});
+
+			const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
+			await (ws.findTextInFilesNew({ pattern: 'foo' }, { include: [new RelativePattern('/other/folder', 'glob/**')] }, new ExtensionIdentifier('test'))).complete;
+			assert(mainThreadCalled, 'mainThreadCalled');
 		});
 
-		const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
+		test('with cancelled token', async () => {
+			const root = '/project/foo';
+			const rpcProtocol = new TestRPCProtocol();
 
-		const token = CancellationToken.Cancelled;
-		return ws.findFiles2(new RelativePattern('/other/folder', 'glob/**'), {}, new ExtensionIdentifier('test'), token).then(() => {
+			let mainThreadCalled = false;
+			rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
+				override async $startTextSearch(query: IPatternInfo, folder: UriComponents | null, options: ITextQueryBuilderOptions, requestId: number, token: CancellationToken): Promise<ITextSearchComplete | null> {
+					mainThreadCalled = true;
+					return null;
+				}
+			});
+
+			const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
+			const token = CancellationToken.Cancelled;
+			await (ws.findTextInFilesNew({ pattern: 'foo' }, undefined, new ExtensionIdentifier('test'), token)).complete;
 			assert(!mainThreadCalled, '!mainThreadCalled');
 		});
-	});
 
-	test('findFiles2 - RelativePattern exclude', () => {
-		const root = '/project/foo';
-		const rpcProtocol = new TestRPCProtocol();
+		test('RelativePattern exclude', async () => {
+			const root = '/project/foo';
+			const rpcProtocol = new TestRPCProtocol();
 
-		let mainThreadCalled = false;
-		rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
-			override $startFileSearch(_includeFolder: UriComponents | null, options: IFileQueryBuilderOptions, token: CancellationToken): Promise<URI[] | null> {
-				mainThreadCalled = true;
-				assert.strictEqual(options.disregardExcludeSettings, false);
-				assert.strictEqual(options.excludePattern, 'glob/**'); // Note that the base portion is ignored, see #52651
-				return Promise.resolve(null);
-			}
-		});
+			let mainThreadCalled = false;
+			rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
+				override async $startTextSearch(query: IPatternInfo, folder: UriComponents | null, options: ITextQueryBuilderOptions, requestId: number, token: CancellationToken): Promise<ITextSearchComplete | null> {
+					mainThreadCalled = true;
+					assert.strictEqual(query.pattern, 'foo');
+					assert.deepStrictEqual(folder, null);
+					assert.strictEqual(options.includePattern, undefined);
+					assert.strictEqual(options.excludePattern?.length, 1);
+					assert.strictEqual(options.excludePattern[0].pattern, 'glob/**'); // exclude folder is ignored...
+					return null;
+				}
+			});
 
-		const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
-		return ws.findFiles2('', { exclude: new RelativePattern(root, 'glob/**') }, new ExtensionIdentifier('test')).then(() => {
+			const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
+			await (ws.findTextInFilesNew({ pattern: 'foo' }, { exclude: [new RelativePattern('/other/folder', 'glob/**')] }, new ExtensionIdentifier('test'))).complete;
 			assert(mainThreadCalled, 'mainThreadCalled');
 		});
-	});
-	test('findFiles2 - useIgnoreFiles', () => {
-		const root = '/project/foo';
-		const rpcProtocol = new TestRPCProtocol();
 
-		let mainThreadCalled = false;
-		rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
-			override $startFileSearch(_includeFolder: UriComponents | null, options: IFileQueryBuilderOptions, token: CancellationToken): Promise<URI[] | null> {
-				mainThreadCalled = true;
-				assert.strictEqual(options.disregardExcludeSettings, false);
-				assert.strictEqual(options.disregardIgnoreFiles, false);
-				assert.strictEqual(options.disregardGlobalIgnoreFiles, false);
-				assert.strictEqual(options.disregardParentIgnoreFiles, false);
-				return Promise.resolve(null);
-			}
-		});
-
-		const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
-		return ws.findFiles2('', { useIgnoreFiles: true, useParentIgnoreFiles: true, useGlobalIgnoreFiles: true }, new ExtensionIdentifier('test')).then(() => {
-			assert(mainThreadCalled, 'mainThreadCalled');
-		});
-	});
-
-	test('findFiles2 - use symlinks', () => {
-		const root = '/project/foo';
-		const rpcProtocol = new TestRPCProtocol();
-
-		let mainThreadCalled = false;
-		rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
-			override $startFileSearch(_includeFolder: UriComponents | null, options: IFileQueryBuilderOptions, token: CancellationToken): Promise<URI[] | null> {
-				mainThreadCalled = true;
-				assert.strictEqual(options.ignoreSymlinks, false);
-				return Promise.resolve(null);
-			}
-		});
-
-		const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
-		return ws.findFiles2('', { followSymlinks: true }, new ExtensionIdentifier('test')).then(() => {
-			assert(mainThreadCalled, 'mainThreadCalled');
-		});
-	});
-
-	test('findTextInFiles - no include', async () => {
-		const root = '/project/foo';
-		const rpcProtocol = new TestRPCProtocol();
-
-		let mainThreadCalled = false;
-		rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
-			override async $startTextSearch(query: IPatternInfo, folder: UriComponents | null, options: ITextQueryBuilderOptions, requestId: number, token: CancellationToken): Promise<ITextSearchComplete | null> {
-				mainThreadCalled = true;
-				assert.strictEqual(query.pattern, 'foo');
-				assert.strictEqual(folder, null);
-				assert.strictEqual(options.includePattern, undefined);
-				assert.strictEqual(options.excludePattern, undefined);
-				return null;
-			}
-		});
-
-		const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
-		await ws.findTextInFiles({ pattern: 'foo' }, {}, () => { }, new ExtensionIdentifier('test'));
-		assert(mainThreadCalled, 'mainThreadCalled');
-	});
-
-	test('findTextInFiles - string include', async () => {
-		const root = '/project/foo';
-		const rpcProtocol = new TestRPCProtocol();
-
-		let mainThreadCalled = false;
-		rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
-			override async $startTextSearch(query: IPatternInfo, folder: UriComponents | null, options: ITextQueryBuilderOptions, requestId: number, token: CancellationToken): Promise<ITextSearchComplete | null> {
-				mainThreadCalled = true;
-				assert.strictEqual(query.pattern, 'foo');
-				assert.strictEqual(folder, null);
-				assert.strictEqual(options.includePattern, '**/files');
-				assert.strictEqual(options.excludePattern, undefined);
-				return null;
-			}
-		});
-
-		const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
-		await ws.findTextInFiles({ pattern: 'foo' }, { include: '**/files' }, () => { }, new ExtensionIdentifier('test'));
-		assert(mainThreadCalled, 'mainThreadCalled');
-	});
-
-	test('findTextInFiles - RelativePattern include', async () => {
-		const root = '/project/foo';
-		const rpcProtocol = new TestRPCProtocol();
-
-		let mainThreadCalled = false;
-		rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
-			override async $startTextSearch(query: IPatternInfo, folder: UriComponents | null, options: ITextQueryBuilderOptions, requestId: number, token: CancellationToken): Promise<ITextSearchComplete | null> {
-				mainThreadCalled = true;
-				assert.strictEqual(query.pattern, 'foo');
-				assert.deepStrictEqual(URI.revive(folder!).toString(), URI.file('/other/folder').toString());
-				assert.strictEqual(options.includePattern, 'glob/**');
-				assert.strictEqual(options.excludePattern, undefined);
-				return null;
-			}
-		});
-
-		const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
-		await ws.findTextInFiles({ pattern: 'foo' }, { include: new RelativePattern('/other/folder', 'glob/**') }, () => { }, new ExtensionIdentifier('test'));
-		assert(mainThreadCalled, 'mainThreadCalled');
-	});
-
-	test('findTextInFiles - with cancelled token', async () => {
-		const root = '/project/foo';
-		const rpcProtocol = new TestRPCProtocol();
-
-		let mainThreadCalled = false;
-		rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
-			override async $startTextSearch(query: IPatternInfo, folder: UriComponents | null, options: ITextQueryBuilderOptions, requestId: number, token: CancellationToken): Promise<ITextSearchComplete | null> {
-				mainThreadCalled = true;
-				return null;
-			}
-		});
-
-		const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
-		const token = CancellationToken.Cancelled;
-		await ws.findTextInFiles({ pattern: 'foo' }, {}, () => { }, new ExtensionIdentifier('test'), token);
-		assert(!mainThreadCalled, '!mainThreadCalled');
-	});
-
-	test('findTextInFiles - RelativePattern exclude', async () => {
-		const root = '/project/foo';
-		const rpcProtocol = new TestRPCProtocol();
-
-		let mainThreadCalled = false;
-		rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
-			override async $startTextSearch(query: IPatternInfo, folder: UriComponents | null, options: ITextQueryBuilderOptions, requestId: number, token: CancellationToken): Promise<ITextSearchComplete | null> {
-				mainThreadCalled = true;
-				assert.strictEqual(query.pattern, 'foo');
-				assert.deepStrictEqual(folder, null);
-				assert.strictEqual(options.includePattern, undefined);
-				assert.strictEqual(options.excludePattern, 'glob/**'); // exclude folder is ignored...
-				return null;
-			}
-		});
-
-		const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
-		await ws.findTextInFiles({ pattern: 'foo' }, { exclude: new RelativePattern('/other/folder', 'glob/**') }, () => { }, new ExtensionIdentifier('test'));
-		assert(mainThreadCalled, 'mainThreadCalled');
+		// TODO: test multiple includes/excludess
 	});
 });
diff --git a/src/vs/workbench/api/test/browser/mainThreadBulkEdits.test.ts b/src/vs/workbench/api/test/browser/mainThreadBulkEdits.test.ts
index c6ef6939bfe..9ee4d3316ee 100644
--- a/src/vs/workbench/api/test/browser/mainThreadBulkEdits.test.ts
+++ b/src/vs/workbench/api/test/browser/mainThreadBulkEdits.test.ts
@@ -4,15 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { IWorkspaceTextEditDto } from 'vs/workbench/api/common/extHost.protocol';
-import { mock } from 'vs/base/test/common/mock';
-import { Event } from 'vs/base/common/event';
-import { URI } from 'vs/base/common/uri';
-import { FileSystemProviderCapabilities, IFileService } from 'vs/platform/files/common/files';
-import { reviveWorkspaceEditDto } from 'vs/workbench/api/browser/mainThreadBulkEdits';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { IWorkspaceTextEdit } from 'vs/editor/common/languages';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { IWorkspaceTextEditDto } from '../../common/extHost.protocol.js';
+import { mock } from '../../../../base/test/common/mock.js';
+import { Event } from '../../../../base/common/event.js';
+import { URI } from '../../../../base/common/uri.js';
+import { FileSystemProviderCapabilities, IFileService } from '../../../../platform/files/common/files.js';
+import { reviveWorkspaceEditDto } from '../../browser/mainThreadBulkEdits.js';
+import { UriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentityService.js';
+import { IWorkspaceTextEdit } from '../../../../editor/common/languages.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 
 suite('MainThreadBulkEdits', function () {
 
diff --git a/src/vs/workbench/api/test/browser/mainThreadCommands.test.ts b/src/vs/workbench/api/test/browser/mainThreadCommands.test.ts
index d7503ca0d50..78cabfcf801 100644
--- a/src/vs/workbench/api/test/browser/mainThreadCommands.test.ts
+++ b/src/vs/workbench/api/test/browser/mainThreadCommands.test.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { MainThreadCommands } from 'vs/workbench/api/browser/mainThreadCommands';
-import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
-import { SingleProxyRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { mock } from 'vs/base/test/common/mock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { MainThreadCommands } from '../../browser/mainThreadCommands.js';
+import { CommandsRegistry, ICommandService } from '../../../../platform/commands/common/commands.js';
+import { SingleProxyRPCProtocol } from '../common/testRPCProtocol.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { mock } from '../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 
 suite('MainThreadCommands', function () {
 
diff --git a/src/vs/workbench/api/test/browser/mainThreadConfiguration.test.ts b/src/vs/workbench/api/test/browser/mainThreadConfiguration.test.ts
index 0c5a02f6606..a616447bbcc 100644
--- a/src/vs/workbench/api/test/browser/mainThreadConfiguration.test.ts
+++ b/src/vs/workbench/api/test/browser/mainThreadConfiguration.test.ts
@@ -5,16 +5,16 @@
 
 import assert from 'assert';
 import * as sinon from 'sinon';
-import { URI } from 'vs/base/common/uri';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Extensions, IConfigurationRegistry, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
-import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { MainThreadConfiguration } from 'vs/workbench/api/browser/mainThreadConfiguration';
-import { SingleProxyRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol';
-import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
-import { WorkspaceService } from 'vs/workbench/services/configuration/browser/configurationService';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { URI } from '../../../../base/common/uri.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Extensions, IConfigurationRegistry, ConfigurationScope } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { IWorkspaceContextService, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { TestInstantiationService } from '../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { MainThreadConfiguration } from '../../browser/mainThreadConfiguration.js';
+import { SingleProxyRPCProtocol } from '../common/testRPCProtocol.js';
+import { IConfigurationService, ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
+import { WorkspaceService } from '../../../services/configuration/browser/configurationService.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
 
 suite('MainThreadConfiguration', function () {
 
diff --git a/src/vs/workbench/api/test/browser/mainThreadDiagnostics.test.ts b/src/vs/workbench/api/test/browser/mainThreadDiagnostics.test.ts
index 2f89e98e358..9a7e458b41f 100644
--- a/src/vs/workbench/api/test/browser/mainThreadDiagnostics.test.ts
+++ b/src/vs/workbench/api/test/browser/mainThreadDiagnostics.test.ts
@@ -4,17 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { timeout } from 'vs/base/common/async';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { MarkerService } from 'vs/platform/markers/common/markerService';
-import { IMarkerData } from 'vs/platform/markers/common/markers';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { MainThreadDiagnostics } from 'vs/workbench/api/browser/mainThreadDiagnostics';
-import { IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { ExtensionHostKind } from 'vs/workbench/services/extensions/common/extensionHostKind';
-import { mock } from 'vs/workbench/test/common/workbenchTestServices';
+import { timeout } from '../../../../base/common/async.js';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
+import { runWithFakedTimers } from '../../../../base/test/common/timeTravelScheduler.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { MarkerService } from '../../../../platform/markers/common/markerService.js';
+import { IMarkerData } from '../../../../platform/markers/common/markers.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { MainThreadDiagnostics } from '../../browser/mainThreadDiagnostics.js';
+import { IExtHostContext } from '../../../services/extensions/common/extHostCustomers.js';
+import { ExtensionHostKind } from '../../../services/extensions/common/extensionHostKind.js';
+import { mock } from '../../../test/common/workbenchTestServices.js';
 
 
 suite('MainThreadDiagnostics', function () {
diff --git a/src/vs/workbench/api/test/browser/mainThreadDocumentContentProviders.test.ts b/src/vs/workbench/api/test/browser/mainThreadDocumentContentProviders.test.ts
index 949c2a78ffa..c999d333938 100644
--- a/src/vs/workbench/api/test/browser/mainThreadDocumentContentProviders.test.ts
+++ b/src/vs/workbench/api/test/browser/mainThreadDocumentContentProviders.test.ts
@@ -4,15 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { MainThreadDocumentContentProviders } from 'vs/workbench/api/browser/mainThreadDocumentContentProviders';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
-import { mock } from 'vs/base/test/common/mock';
-import { IModelService } from 'vs/editor/common/services/model';
-import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { TestRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol';
-import { TextEdit } from 'vs/editor/common/languages';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { URI } from '../../../../base/common/uri.js';
+import { MainThreadDocumentContentProviders } from '../../browser/mainThreadDocumentContentProviders.js';
+import { createTextModel } from '../../../../editor/test/common/testTextModel.js';
+import { mock } from '../../../../base/test/common/mock.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { IEditorWorkerService } from '../../../../editor/common/services/editorWorker.js';
+import { TestRPCProtocol } from '../common/testRPCProtocol.js';
+import { TextEdit } from '../../../../editor/common/languages.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 
 suite('MainThreadDocumentContentProviders', function () {
 
diff --git a/src/vs/workbench/api/test/browser/mainThreadDocuments.test.ts b/src/vs/workbench/api/test/browser/mainThreadDocuments.test.ts
index fee65f21119..d9d8a76fb52 100644
--- a/src/vs/workbench/api/test/browser/mainThreadDocuments.test.ts
+++ b/src/vs/workbench/api/test/browser/mainThreadDocuments.test.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { BoundModelReferenceCollection } from 'vs/workbench/api/browser/mainThreadDocuments';
-import { timeout } from 'vs/base/common/async';
-import { URI } from 'vs/base/common/uri';
-import { extUri } from 'vs/base/common/resources';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { BoundModelReferenceCollection } from '../../browser/mainThreadDocuments.js';
+import { timeout } from '../../../../base/common/async.js';
+import { URI } from '../../../../base/common/uri.js';
+import { extUri } from '../../../../base/common/resources.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 
 suite('BoundModelReferenceCollection', function () {
 
diff --git a/src/vs/workbench/api/test/browser/mainThreadDocumentsAndEditors.test.ts b/src/vs/workbench/api/test/browser/mainThreadDocumentsAndEditors.test.ts
index f0d0538ce22..08a5f0682c6 100644
--- a/src/vs/workbench/api/test/browser/mainThreadDocumentsAndEditors.test.ts
+++ b/src/vs/workbench/api/test/browser/mainThreadDocumentsAndEditors.test.ts
@@ -4,34 +4,38 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { MainThreadDocumentsAndEditors } from 'vs/workbench/api/browser/mainThreadDocumentsAndEditors';
-import { SingleProxyRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { ModelService } from 'vs/editor/common/services/modelService';
-import { TestCodeEditorService } from 'vs/editor/test/browser/editorTestServices';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { ExtHostDocumentsAndEditorsShape, IDocumentsAndEditorsDelta } from 'vs/workbench/api/common/extHost.protocol';
-import { createTestCodeEditor, ITestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
-import { mock } from 'vs/base/test/common/mock';
-import { TestEditorService, TestEditorGroupsService, TestEnvironmentService, TestPathService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { Event } from 'vs/base/common/event';
-import { ITextModel } from 'vs/editor/common/model';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { IFileService } from 'vs/platform/files/common/files';
-import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
-import { UndoRedoService } from 'vs/platform/undoRedo/common/undoRedoService';
-import { TestDialogService } from 'vs/platform/dialogs/test/common/testDialogService';
-import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
-import { TestTextResourcePropertiesService, TestWorkingCopyFileService } from 'vs/workbench/test/common/workbenchTestServices';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { TestLanguageConfigurationService } from 'vs/editor/test/common/modes/testLanguageConfigurationService';
-import { TextModel } from 'vs/editor/common/model/textModel';
-import { LanguageService } from 'vs/editor/common/services/languageService';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { MainThreadDocumentsAndEditors } from '../../browser/mainThreadDocumentsAndEditors.js';
+import { SingleProxyRPCProtocol } from '../common/testRPCProtocol.js';
+import { TestConfigurationService } from '../../../../platform/configuration/test/common/testConfigurationService.js';
+import { ModelService } from '../../../../editor/common/services/modelService.js';
+import { TestCodeEditorService } from '../../../../editor/test/browser/editorTestServices.js';
+import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
+import { ExtHostDocumentsAndEditorsShape, IDocumentsAndEditorsDelta } from '../../common/extHost.protocol.js';
+import { createTestCodeEditor, ITestCodeEditor } from '../../../../editor/test/browser/testCodeEditor.js';
+import { mock } from '../../../../base/test/common/mock.js';
+import { TestEditorService, TestEditorGroupsService, TestEnvironmentService, TestPathService } from '../../../test/browser/workbenchTestServices.js';
+import { Event } from '../../../../base/common/event.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { TestThemeService } from '../../../../platform/theme/test/common/testThemeService.js';
+import { UndoRedoService } from '../../../../platform/undoRedo/common/undoRedoService.js';
+import { TestDialogService } from '../../../../platform/dialogs/test/common/testDialogService.js';
+import { TestNotificationService } from '../../../../platform/notification/test/common/testNotificationService.js';
+import { TestTextResourcePropertiesService, TestWorkingCopyFileService } from '../../../test/common/workbenchTestServices.js';
+import { UriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentityService.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.js';
+import { TextModel } from '../../../../editor/common/model/textModel.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { TestInstantiationService } from '../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { LanguageService } from '../../../../editor/common/services/languageService.js';
+import { ILanguageConfigurationService } from '../../../../editor/common/languages/languageConfigurationRegistry.js';
+import { TestLanguageConfigurationService } from '../../../../editor/test/common/modes/testLanguageConfigurationService.js';
+import { IUndoRedoService } from '../../../../platform/undoRedo/common/undoRedo.js';
 
 suite('MainThreadDocumentsAndEditors', () => {
 
@@ -61,12 +65,15 @@ suite('MainThreadDocumentsAndEditors', () => {
 		const notificationService = new TestNotificationService();
 		const undoRedoService = new UndoRedoService(dialogService, notificationService);
 		const themeService = new TestThemeService();
+		const instantiationService = new TestInstantiationService();
+		instantiationService.set(ILanguageService, disposables.add(new LanguageService()));
+		instantiationService.set(ILanguageConfigurationService, new TestLanguageConfigurationService());
+		instantiationService.set(IUndoRedoService, undoRedoService);
 		modelService = new ModelService(
 			configService,
 			new TestTextResourcePropertiesService(configService),
 			undoRedoService,
-			disposables.add(new LanguageService()),
-			new TestLanguageConfigurationService(),
+			instantiationService
 		);
 		codeEditorService = new TestCodeEditorService(themeService);
 		textFileService = new class extends mock<ITextFileService>() {
diff --git a/src/vs/workbench/api/test/browser/mainThreadEditors.test.ts b/src/vs/workbench/api/test/browser/mainThreadEditors.test.ts
index 1ca165c1b5f..552b0df1f32 100644
--- a/src/vs/workbench/api/test/browser/mainThreadEditors.test.ts
+++ b/src/vs/workbench/api/test/browser/mainThreadEditors.test.ts
@@ -4,59 +4,61 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Event } from 'vs/base/common/event';
-import { DisposableStore, IReference, ImmortalReference } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { mock } from 'vs/base/test/common/mock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IBulkEditService } from 'vs/editor/browser/services/bulkEditService';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { EditOperation } from 'vs/editor/common/core/editOperation';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { ITextSnapshot } from 'vs/editor/common/model';
-import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { LanguageService } from 'vs/editor/common/services/languageService';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ModelService } from 'vs/editor/common/services/modelService';
-import { IResolvedTextEditorModel, ITextModelService } from 'vs/editor/common/services/resolverService';
-import { TestCodeEditorService } from 'vs/editor/test/browser/editorTestServices';
-import { TestLanguageConfigurationService } from 'vs/editor/test/common/modes/testLanguageConfigurationService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { TestDialogService } from 'vs/platform/dialogs/test/common/testDialogService';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IFileService } from 'vs/platform/files/common/files';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { ILogService, NullLogService } from 'vs/platform/log/common/log';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
-import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
-import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
-import { UndoRedoService } from 'vs/platform/undoRedo/common/undoRedoService';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { MainThreadBulkEdits } from 'vs/workbench/api/browser/mainThreadBulkEdits';
-import { IWorkspaceTextEditDto } from 'vs/workbench/api/common/extHost.protocol';
-import { SingleProxyRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol';
-import { BulkEditService } from 'vs/workbench/contrib/bulkEdit/browser/bulkEditService';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { SerializableObjectWithBuffers } from 'vs/workbench/services/extensions/common/proxyIdentifier';
-import { LabelService } from 'vs/workbench/services/label/common/labelService';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { ICopyOperation, ICreateFileOperation, ICreateOperation, IDeleteOperation, IMoveOperation, IWorkingCopyFileService } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
-import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
-import { TestEditorGroupsService, TestEditorService, TestEnvironmentService, TestFileService, TestLifecycleService, TestWorkingCopyService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { TestContextService, TestTextResourcePropertiesService } from 'vs/workbench/test/common/workbenchTestServices';
+import { Event } from '../../../../base/common/event.js';
+import { DisposableStore, IReference, ImmortalReference } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { mock } from '../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { IBulkEditService } from '../../../../editor/browser/services/bulkEditService.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { EditOperation } from '../../../../editor/common/core/editOperation.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { ITextSnapshot } from '../../../../editor/common/model.js';
+import { IEditorWorkerService } from '../../../../editor/common/services/editorWorker.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ModelService } from '../../../../editor/common/services/modelService.js';
+import { IResolvedTextEditorModel, ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { TestCodeEditorService } from '../../../../editor/test/browser/editorTestServices.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../platform/configuration/test/common/testConfigurationService.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { TestDialogService } from '../../../../platform/dialogs/test/common/testDialogService.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { InstantiationService } from '../../../../platform/instantiation/common/instantiationService.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { ILogService, NullLogService } from '../../../../platform/log/common/log.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { TestNotificationService } from '../../../../platform/notification/test/common/testNotificationService.js';
+import { TestThemeService } from '../../../../platform/theme/test/common/testThemeService.js';
+import { IUndoRedoService } from '../../../../platform/undoRedo/common/undoRedo.js';
+import { UndoRedoService } from '../../../../platform/undoRedo/common/undoRedoService.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { UriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentityService.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { MainThreadBulkEdits } from '../../browser/mainThreadBulkEdits.js';
+import { IWorkspaceTextEditDto } from '../../common/extHost.protocol.js';
+import { SingleProxyRPCProtocol } from '../common/testRPCProtocol.js';
+import { BulkEditService } from '../../../contrib/bulkEdit/browser/bulkEditService.js';
+import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { SerializableObjectWithBuffers } from '../../../services/extensions/common/proxyIdentifier.js';
+import { LabelService } from '../../../services/label/common/labelService.js';
+import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.js';
+import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.js';
+import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
+import { ICopyOperation, ICreateFileOperation, ICreateOperation, IDeleteOperation, IMoveOperation, IWorkingCopyFileService } from '../../../services/workingCopy/common/workingCopyFileService.js';
+import { IWorkingCopyService } from '../../../services/workingCopy/common/workingCopyService.js';
+import { TestEditorGroupsService, TestEditorService, TestEnvironmentService, TestFileService, TestLifecycleService, TestWorkingCopyService } from '../../../test/browser/workbenchTestServices.js';
+import { TestContextService, TestTextResourcePropertiesService } from '../../../test/common/workbenchTestServices.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { LanguageService } from '../../../../editor/common/services/languageService.js';
+import { ILanguageConfigurationService } from '../../../../editor/common/languages/languageConfigurationRegistry.js';
+import { TestLanguageConfigurationService } from '../../../../editor/test/common/modes/testLanguageConfigurationService.js';
 
 suite('MainThreadEditors', () => {
 
@@ -80,19 +82,11 @@ suite('MainThreadEditors', () => {
 		createdResources.clear();
 		deletedResources.clear();
 
-
 		const configService = new TestConfigurationService();
 		const dialogService = new TestDialogService();
 		const notificationService = new TestNotificationService();
 		const undoRedoService = new UndoRedoService(dialogService, notificationService);
 		const themeService = new TestThemeService();
-		modelService = new ModelService(
-			configService,
-			new TestTextResourcePropertiesService(configService),
-			undoRedoService,
-			disposables.add(new LanguageService()),
-			new TestLanguageConfigurationService(),
-		);
 
 		const services = new ServiceCollection();
 		services.set(IBulkEditService, new SyncDescriptor(BulkEditService));
@@ -178,8 +172,18 @@ suite('MainThreadEditors', () => {
 			}
 		});
 
+		services.set(ILanguageService, disposables.add(new LanguageService()));
+		services.set(ILanguageConfigurationService, new TestLanguageConfigurationService());
+
 		const instaService = new InstantiationService(services);
 
+		modelService = new ModelService(
+			configService,
+			new TestTextResourcePropertiesService(configService),
+			undoRedoService,
+			instaService
+		);
+
 		bulkEdits = instaService.createInstance(MainThreadBulkEdits, SingleProxyRPCProtocol(null));
 	});
 
diff --git a/src/vs/workbench/api/test/browser/mainThreadManagedSockets.test.ts b/src/vs/workbench/api/test/browser/mainThreadManagedSockets.test.ts
index dd20e3cd70c..ddb4b947a5d 100644
--- a/src/vs/workbench/api/test/browser/mainThreadManagedSockets.test.ts
+++ b/src/vs/workbench/api/test/browser/mainThreadManagedSockets.test.ts
@@ -4,16 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { disposableTimeout, timeout } from 'vs/base/common/async';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { Emitter } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { SocketCloseEvent } from 'vs/base/parts/ipc/common/ipc.net';
-import { mock } from 'vs/base/test/common/mock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { RemoteSocketHalf } from 'vs/platform/remote/common/managedSocket';
-import { MainThreadManagedSocket } from 'vs/workbench/api/browser/mainThreadManagedSockets';
-import { ExtHostManagedSocketsShape } from 'vs/workbench/api/common/extHost.protocol';
+import { disposableTimeout, timeout } from '../../../../base/common/async.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { SocketCloseEvent } from '../../../../base/parts/ipc/common/ipc.net.js';
+import { mock } from '../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { RemoteSocketHalf } from '../../../../platform/remote/common/managedSocket.js';
+import { MainThreadManagedSocket } from '../../browser/mainThreadManagedSockets.js';
+import { ExtHostManagedSocketsShape } from '../../common/extHost.protocol.js';
 
 suite('MainThreadManagedSockets', () => {
 
diff --git a/src/vs/workbench/api/test/browser/mainThreadTreeViews.test.ts b/src/vs/workbench/api/test/browser/mainThreadTreeViews.test.ts
index f4ead1836b2..ee16dbe37d7 100644
--- a/src/vs/workbench/api/test/browser/mainThreadTreeViews.test.ts
+++ b/src/vs/workbench/api/test/browser/mainThreadTreeViews.test.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
+import * as nls from '../../../../nls.js';
 import assert from 'assert';
-import { mock } from 'vs/base/test/common/mock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { MainThreadTreeViews } from 'vs/workbench/api/browser/mainThreadTreeViews';
-import { ExtHostTreeViewsShape } from 'vs/workbench/api/common/extHost.protocol';
-import { CustomTreeView } from 'vs/workbench/browser/parts/views/treeView';
-import { Extensions, ITreeItem, ITreeView, ITreeViewDescriptor, IViewContainersRegistry, IViewDescriptorService, IViewsRegistry, TreeItemCollapsibleState, ViewContainer, ViewContainerLocation } from 'vs/workbench/common/views';
-import { IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { ExtensionHostKind } from 'vs/workbench/services/extensions/common/extensionHostKind';
-import { ViewDescriptorService } from 'vs/workbench/services/views/browser/viewDescriptorService';
-import { TestViewsService, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { TestExtensionService } from 'vs/workbench/test/common/workbenchTestServices';
+import { mock } from '../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { TestInstantiationService } from '../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { NullLogService } from '../../../../platform/log/common/log.js';
+import { TestNotificationService } from '../../../../platform/notification/test/common/testNotificationService.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { MainThreadTreeViews } from '../../browser/mainThreadTreeViews.js';
+import { ExtHostTreeViewsShape } from '../../common/extHost.protocol.js';
+import { CustomTreeView } from '../../../browser/parts/views/treeView.js';
+import { Extensions, ITreeItem, ITreeView, ITreeViewDescriptor, IViewContainersRegistry, IViewDescriptorService, IViewsRegistry, TreeItemCollapsibleState, ViewContainer, ViewContainerLocation } from '../../../common/views.js';
+import { IExtHostContext } from '../../../services/extensions/common/extHostCustomers.js';
+import { ExtensionHostKind } from '../../../services/extensions/common/extensionHostKind.js';
+import { ViewDescriptorService } from '../../../services/views/browser/viewDescriptorService.js';
+import { TestViewsService, workbenchInstantiationService } from '../../../test/browser/workbenchTestServices.js';
+import { TestExtensionService } from '../../../test/common/workbenchTestServices.js';
 
 suite('MainThreadHostTreeView', function () {
 	const testTreeViewId = 'testTreeView';
diff --git a/src/vs/workbench/api/test/browser/mainThreadWorkspace.test.ts b/src/vs/workbench/api/test/browser/mainThreadWorkspace.test.ts
index c784f418950..2199a99d557 100644
--- a/src/vs/workbench/api/test/browser/mainThreadWorkspace.test.ts
+++ b/src/vs/workbench/api/test/browser/mainThreadWorkspace.test.ts
@@ -4,15 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { MainThreadWorkspace } from 'vs/workbench/api/browser/mainThreadWorkspace';
-import { SingleProxyRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol';
-import { IFileQuery, ISearchService } from 'vs/workbench/services/search/common/search';
-import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../platform/configuration/test/common/testConfigurationService.js';
+import { TestInstantiationService } from '../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { MainThreadWorkspace } from '../../browser/mainThreadWorkspace.js';
+import { SingleProxyRPCProtocol } from '../common/testRPCProtocol.js';
+import { IFileQuery, ISearchService } from '../../../services/search/common/search.js';
+import { workbenchInstantiationService } from '../../../test/browser/workbenchTestServices.js';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
 
 suite('MainThreadWorkspace', () => {
 	const disposables = ensureNoDisposablesAreLeakedInTestSuite();
@@ -56,7 +57,8 @@ suite('MainThreadWorkspace', () => {
 			fileSearch(query: IFileQuery) {
 				assert.strictEqual(query.folderQueries.length, 1);
 				assert.strictEqual(query.folderQueries[0].disregardIgnoreFiles, true);
-				assert.deepStrictEqual(query.folderQueries[0].excludePattern, { 'filesExclude': true });
+				assert.strictEqual(query.folderQueries[0].excludePattern?.length, 1);
+				assert.deepStrictEqual(query.folderQueries[0].excludePattern[0].pattern, { 'filesExclude': true });
 
 				return Promise.resolve({ results: [], messages: [] });
 			}
@@ -76,7 +78,7 @@ suite('MainThreadWorkspace', () => {
 
 		instantiationService.stub(ISearchService, {
 			fileSearch(query: IFileQuery) {
-				assert.deepStrictEqual(query.folderQueries[0].excludePattern, undefined);
+				assert.deepStrictEqual(query.folderQueries[0].excludePattern, []);
 				assert.deepStrictEqual(query.excludePattern, undefined);
 
 				return Promise.resolve({ results: [], messages: [] });
@@ -99,7 +101,7 @@ suite('MainThreadWorkspace', () => {
 			fileSearch(query: IFileQuery) {
 				assert.strictEqual(query.folderQueries.length, 1);
 				assert.strictEqual(query.folderQueries[0].disregardIgnoreFiles, true);
-				assert.deepStrictEqual(query.folderQueries[0].excludePattern, undefined);
+				assert.deepStrictEqual(query.folderQueries[0].excludePattern, []);
 
 				return Promise.resolve({ results: [], messages: [] });
 			}
@@ -112,7 +114,7 @@ suite('MainThreadWorkspace', () => {
 	test('exclude string', () => {
 		instantiationService.stub(ISearchService, {
 			fileSearch(query: IFileQuery) {
-				assert.strictEqual(query.folderQueries[0].excludePattern, undefined);
+				assert.deepStrictEqual(query.folderQueries[0].excludePattern, []);
 				assert.deepStrictEqual({ ...query.excludePattern }, { 'exclude/**': true });
 
 				return Promise.resolve({ results: [], messages: [] });
@@ -120,6 +122,25 @@ suite('MainThreadWorkspace', () => {
 		});
 
 		const mtw = disposables.add(instantiationService.createInstance(MainThreadWorkspace, SingleProxyRPCProtocol({ $initializeWorkspace: () => { } })));
-		return mtw.$startFileSearch(null, { maxResults: 10, includePattern: '', excludePattern: 'exclude/**', disregardSearchExcludeSettings: true }, CancellationToken.None);
+		return mtw.$startFileSearch(null, { maxResults: 10, includePattern: '', excludePattern: [{ pattern: 'exclude/**' }], disregardSearchExcludeSettings: true }, CancellationToken.None);
+	});
+	test('Valid revived URI after moving to EH', () => {
+		const uriComponents: UriComponents = {
+			scheme: 'test',
+			path: '/Users/username/Downloads',
+		};
+		instantiationService.stub(ISearchService, {
+			fileSearch(query: IFileQuery) {
+				assert.strictEqual(query.folderQueries?.length, 1);
+				assert.ok(URI.isUri(query.folderQueries[0].folder));
+				assert.strictEqual(query.folderQueries[0].folder.path, '/Users/username/Downloads');
+				assert.strictEqual(query.folderQueries[0].folder.scheme, 'test');
+
+				return Promise.resolve({ results: [], messages: [] });
+			}
+		});
+
+		const mtw = disposables.add(instantiationService.createInstance(MainThreadWorkspace, SingleProxyRPCProtocol({ $initializeWorkspace: () => { } })));
+		return mtw.$startFileSearch(uriComponents, { filePattern: '*.md' }, CancellationToken.None);
 	});
 });
diff --git a/src/vs/workbench/api/test/common/extHostExtensionActivator.test.ts b/src/vs/workbench/api/test/common/extHostExtensionActivator.test.ts
index 04b5fc7847e..f5c64b4444d 100644
--- a/src/vs/workbench/api/test/common/extHostExtensionActivator.test.ts
+++ b/src/vs/workbench/api/test/common/extHostExtensionActivator.test.ts
@@ -4,14 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { promiseWithResolvers, timeout } from 'vs/base/common/async';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ExtensionIdentifier, IExtensionDescription, IRelaxedExtensionDescription, TargetPlatform } from 'vs/platform/extensions/common/extensions';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { ActivatedExtension, EmptyExtension, ExtensionActivationTimes, ExtensionsActivator, IExtensionsActivatorHost } from 'vs/workbench/api/common/extHostExtensionActivator';
-import { ExtensionDescriptionRegistry, IActivationEventsReader } from 'vs/workbench/services/extensions/common/extensionDescriptionRegistry';
-import { ExtensionActivationReason, MissingExtensionDependency } from 'vs/workbench/services/extensions/common/extensions';
+import { promiseWithResolvers, timeout } from '../../../../base/common/async.js';
+import { Mutable } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { ExtensionIdentifier, IExtensionDescription, TargetPlatform } from '../../../../platform/extensions/common/extensions.js';
+import { NullLogService } from '../../../../platform/log/common/log.js';
+import { ActivatedExtension, EmptyExtension, ExtensionActivationTimes, ExtensionsActivator, IExtensionsActivatorHost } from '../../common/extHostExtensionActivator.js';
+import { ExtensionDescriptionRegistry, IActivationEventsReader } from '../../../services/extensions/common/extensionDescriptionRegistry.js';
+import { ExtensionActivationReason, MissingExtensionDependency } from '../../../services/extensions/common/extensions.js';
 
 suite('ExtensionsActivator', () => {
 
@@ -85,8 +86,8 @@ suite('ExtensionsActivator', () => {
 	test('Supports having resolved extensions', async () => {
 		const host = new SimpleExtensionsActivatorHost();
 		const bExt = desc(idB);
-		delete (<IRelaxedExtensionDescription>bExt).main;
-		delete (<IRelaxedExtensionDescription>bExt).browser;
+		delete (<Mutable<IExtensionDescription>>bExt).main;
+		delete (<Mutable<IExtensionDescription>>bExt).browser;
 		const activator = createActivator(host, [
 			desc(idA, [idB])
 		], [bExt]);
@@ -103,7 +104,7 @@ suite('ExtensionsActivator', () => {
 			[idB, extActivationB]
 		]);
 		const bExt = desc(idB);
-		(<IRelaxedExtensionDescription>bExt).api = 'none';
+		(<Mutable<IExtensionDescription>>bExt).api = 'none';
 		const activator = createActivator(host, [
 			desc(idA, [idB])
 		], [bExt]);
@@ -274,7 +275,8 @@ suite('ExtensionsActivator', () => {
 			activationEvents,
 			main: 'index.js',
 			targetPlatform: TargetPlatform.UNDEFINED,
-			extensionDependencies: deps.map(d => d.value)
+			extensionDependencies: deps.map(d => d.value),
+			enabledApiProposals: undefined,
 		};
 	}
 
diff --git a/src/vs/workbench/api/test/common/extensionHostMain.test.ts b/src/vs/workbench/api/test/common/extensionHostMain.test.ts
index 1c5acf0e888..cda646f07cf 100644
--- a/src/vs/workbench/api/test/common/extensionHostMain.test.ts
+++ b/src/vs/workbench/api/test/common/extensionHostMain.test.ts
@@ -4,23 +4,23 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { SerializedError, errorHandler, onUnexpectedError } from 'vs/base/common/errors';
-import { isFirefox, isSafari } from 'vs/base/common/platform';
-import { TernarySearchTree } from 'vs/base/common/ternarySearchTree';
-import { URI } from 'vs/base/common/uri';
-import { mock } from 'vs/base/test/common/mock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ExtensionIdentifier, IExtensionDescription, IRelaxedExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { ILogService, NullLogService } from 'vs/platform/log/common/log';
-import { MainThreadExtensionServiceShape } from 'vs/workbench/api/common/extHost.protocol';
-import { ExtensionPaths, IExtHostExtensionService } from 'vs/workbench/api/common/extHostExtensionService';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import { IExtHostTelemetry } from 'vs/workbench/api/common/extHostTelemetry';
-import { ErrorHandler } from 'vs/workbench/api/common/extensionHostMain';
-import { nullExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
-import { ProxyIdentifier, Proxied } from 'vs/workbench/services/extensions/common/proxyIdentifier';
+import { SerializedError, errorHandler, onUnexpectedError } from '../../../../base/common/errors.js';
+import { isFirefox, isSafari } from '../../../../base/common/platform.js';
+import { TernarySearchTree } from '../../../../base/common/ternarySearchTree.js';
+import { URI } from '../../../../base/common/uri.js';
+import { mock } from '../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { ExtensionIdentifier, IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
+import { InstantiationService } from '../../../../platform/instantiation/common/instantiationService.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { ILogService, NullLogService } from '../../../../platform/log/common/log.js';
+import { MainThreadExtensionServiceShape } from '../../common/extHost.protocol.js';
+import { ExtensionPaths, IExtHostExtensionService } from '../../common/extHostExtensionService.js';
+import { IExtHostRpcService } from '../../common/extHostRpcService.js';
+import { IExtHostTelemetry } from '../../common/extHostTelemetry.js';
+import { ErrorHandler } from '../../common/extensionHostMain.js';
+import { nullExtensionDescription } from '../../../services/extensions/common/extensions.js';
+import { ProxyIdentifier, Proxied } from '../../../services/extensions/common/proxyIdentifier.js';
 
 
 suite('ExtensionHostMain#ErrorHandler - Wrapping prepareStackTrace can cause slowdown and eventual stack overflow #184926 ', function () {
@@ -48,7 +48,7 @@ suite('ExtensionHostMain#ErrorHandler - Wrapping prepareStackTrace can cause slo
 			declare readonly _serviceBrand: undefined;
 			getExtensionPathIndex() {
 				return new class extends ExtensionPaths {
-					override findSubstr(key: URI): Readonly<IRelaxedExtensionDescription> | undefined {
+					override findSubstr(key: URI): IExtensionDescription | undefined {
 						findSubstrCount++;
 						return nullExtensionDescription;
 					}
diff --git a/src/vs/workbench/api/test/common/testRPCProtocol.ts b/src/vs/workbench/api/test/common/testRPCProtocol.ts
index abf854afa06..16a9af44f91 100644
--- a/src/vs/workbench/api/test/common/testRPCProtocol.ts
+++ b/src/vs/workbench/api/test/common/testRPCProtocol.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isThenable } from 'vs/base/common/async';
-import { CharCode } from 'vs/base/common/charCode';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import { IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { ExtensionHostKind } from 'vs/workbench/services/extensions/common/extensionHostKind';
-import { Proxied, ProxyIdentifier, SerializableObjectWithBuffers } from 'vs/workbench/services/extensions/common/proxyIdentifier';
-import { parseJsonAndRestoreBufferRefs, stringifyJsonWithBufferRefs } from 'vs/workbench/services/extensions/common/rpcProtocol';
+import { isThenable } from '../../../../base/common/async.js';
+import { CharCode } from '../../../../base/common/charCode.js';
+import { IExtHostRpcService } from '../../common/extHostRpcService.js';
+import { IExtHostContext } from '../../../services/extensions/common/extHostCustomers.js';
+import { ExtensionHostKind } from '../../../services/extensions/common/extensionHostKind.js';
+import { Proxied, ProxyIdentifier, SerializableObjectWithBuffers } from '../../../services/extensions/common/proxyIdentifier.js';
+import { parseJsonAndRestoreBufferRefs, stringifyJsonWithBufferRefs } from '../../../services/extensions/common/rpcProtocol.js';
 
 export function SingleProxyRPCProtocol(thing: any): IExtHostContext & IExtHostRpcService {
 	return {
diff --git a/src/vs/workbench/api/test/node/extHostSearch.test.ts b/src/vs/workbench/api/test/node/extHostSearch.test.ts
index af20a5e455b..75e6b2f34c6 100644
--- a/src/vs/workbench/api/test/node/extHostSearch.test.ts
+++ b/src/vs/workbench/api/test/node/extHostSearch.test.ts
@@ -4,27 +4,27 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { mapArrayOrNot } from 'vs/base/common/arrays';
-import { timeout } from 'vs/base/common/async';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { isCancellationError } from 'vs/base/common/errors';
-import { revive } from 'vs/base/common/marshalling';
-import { joinPath } from 'vs/base/common/resources';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import * as pfs from 'vs/base/node/pfs';
-import { mock } from 'vs/base/test/common/mock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { MainContext, MainThreadSearchShape } from 'vs/workbench/api/common/extHost.protocol';
-import { ExtHostConfigProvider, IExtHostConfiguration } from 'vs/workbench/api/common/extHostConfiguration.js';
-import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService';
-import { Range } from 'vs/workbench/api/common/extHostTypes';
-import { URITransformerService } from 'vs/workbench/api/common/extHostUriTransformerService';
-import { NativeExtHostSearch } from 'vs/workbench/api/node/extHostSearch';
-import { TestRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol';
-import { IFileMatch, IFileQuery, IPatternInfo, IRawFileMatch2, ISearchCompleteStats, ISearchQuery, ITextQuery, QueryType, resultIsMatch } from 'vs/workbench/services/search/common/search';
-import { TextSearchManager } from 'vs/workbench/services/search/common/textSearchManager';
-import { NativeTextSearchManager } from 'vs/workbench/services/search/node/textSearchManager';
+import { mapArrayOrNot } from '../../../../base/common/arrays.js';
+import { timeout } from '../../../../base/common/async.js';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { isCancellationError } from '../../../../base/common/errors.js';
+import { revive } from '../../../../base/common/marshalling.js';
+import { joinPath } from '../../../../base/common/resources.js';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
+import * as pfs from '../../../../base/node/pfs.js';
+import { mock } from '../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { NullLogService } from '../../../../platform/log/common/log.js';
+import { MainContext, MainThreadSearchShape } from '../../common/extHost.protocol.js';
+import { ExtHostConfigProvider, IExtHostConfiguration } from '../../common/extHostConfiguration.js';
+import { IExtHostInitDataService } from '../../common/extHostInitDataService.js';
+import { Range } from '../../common/extHostTypes.js';
+import { URITransformerService } from '../../common/extHostUriTransformerService.js';
+import { NativeExtHostSearch } from '../../node/extHostSearch.js';
+import { TestRPCProtocol } from '../common/testRPCProtocol.js';
+import { IFileMatch, IFileQuery, IPatternInfo, IRawFileMatch2, ISearchCompleteStats, ISearchQuery, ITextQuery, QueryType, resultIsMatch } from '../../../services/search/common/search.js';
+import { TextSearchManager } from '../../../services/search/common/textSearchManager.js';
+import { NativeTextSearchManager } from '../../../services/search/node/textSearchManager.js';
 import type * as vscode from 'vscode';
 
 let rpcProtocol: TestRPCProtocol;
@@ -76,12 +76,12 @@ suite('ExtHostSearch', () => {
 	const disposables = ensureNoDisposablesAreLeakedInTestSuite();
 
 	async function registerTestTextSearchProvider(provider: vscode.TextSearchProvider, scheme = 'file'): Promise<void> {
-		disposables.add(extHostSearch.registerTextSearchProvider(scheme, provider));
+		disposables.add(extHostSearch.registerTextSearchProviderOld(scheme, provider));
 		await rpcProtocol.sync();
 	}
 
 	async function registerTestFileSearchProvider(provider: vscode.FileSearchProvider, scheme = 'file'): Promise<void> {
-		disposables.add(extHostSearch.registerFileSearchProvider(scheme, provider));
+		disposables.add(extHostSearch.registerFileSearchProviderOld(scheme, provider));
 		await rpcProtocol.sync();
 	}
 
@@ -170,7 +170,7 @@ suite('ExtHostSearch', () => {
 				this._pfs = mockPFS as any;
 			}
 
-			protected override createTextSearchManager(query: ITextQuery, provider: vscode.TextSearchProvider): TextSearchManager {
+			protected override createTextSearchManager(query: ITextQuery, provider: vscode.TextSearchProviderNew): TextSearchManager {
 				return new NativeTextSearchManager(query, provider, this._pfs);
 			}
 		});
@@ -263,6 +263,28 @@ suite('ExtHostSearch', () => {
 			assert(!results.length);
 		});
 
+		test('session cancellation should work', async () => {
+			let numSessionCancelled = 0;
+			const disposables: (vscode.Disposable | undefined)[] = [];
+			await registerTestFileSearchProvider({
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Promise<URI[]> {
+
+					disposables.push(options.session?.onCancellationRequested(() => {
+						numSessionCancelled++;
+					}));
+
+					return Promise.resolve([]);
+				}
+			});
+
+
+			await runFileSearch({ ...getSimpleQuery(), cacheKey: '1' }, true);
+			await runFileSearch({ ...getSimpleQuery(), cacheKey: '2' }, true);
+			extHostSearch.$clearCache('1');
+			assert.strictEqual(numSessionCancelled, 1);
+			disposables.forEach(d => d?.dispose());
+		});
+
 		test('provider returns null', async () => {
 			await registerTestFileSearchProvider({
 				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Promise<URI[]> {
@@ -338,9 +360,11 @@ suite('ExtHostSearch', () => {
 						includePattern: {
 							'foo': true
 						},
-						excludePattern: {
-							'bar': true
-						}
+						excludePattern: [{
+							pattern: {
+								'bar': true
+							}
+						}]
 					},
 					{ folder: rootFolderB }
 				]
@@ -377,9 +401,11 @@ suite('ExtHostSearch', () => {
 						includePattern: {
 							'*.jsx': true
 						},
-						excludePattern: {
-							'*.js': false
-						}
+						excludePattern: [{
+							pattern: {
+								'*.js': false
+							}
+						}]
 					}
 				]
 			};
@@ -495,17 +521,21 @@ suite('ExtHostSearch', () => {
 				folderQueries: [
 					{
 						folder: rootFolderA,
-						excludePattern: {
-							'folder/*.css': {
-								when: '$(basename).scss'
+						excludePattern: [{
+							pattern: {
+								'folder/*.css': {
+									when: '$(basename).scss'
+								}
 							}
-						}
+						}]
 					},
 					{
 						folder: rootFolderB,
-						excludePattern: {
-							'*.js': false
-						}
+						excludePattern: [{
+							pattern: {
+								'*.js': false
+							}
+						}]
 					}
 				]
 			};
@@ -694,6 +724,24 @@ suite('ExtHostSearch', () => {
 			const { results } = await runFileSearch(query);
 			compareURIs(results, reportedResults);
 		});
+		test('if onlyFileScheme is set, do not call custom schemes', async () => {
+			let fancySchemeCalled = false;
+			await registerTestFileSearchProvider({
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Promise<URI[]> {
+					fancySchemeCalled = true;
+					return Promise.resolve([]);
+				}
+			}, fancyScheme);
+
+			const query: ISearchQuery = {
+				type: QueryType.File,
+				filePattern: '',
+				folderQueries: []
+			};
+
+			await runFileSearch(query);
+			assert(!fancySchemeCalled);
+		});
 	});
 
 	suite('Text:', () => {
@@ -738,13 +786,13 @@ suite('ExtHostSearch', () => {
 					if (resultIsMatch(lineResult)) {
 						actualTextSearchResults.push({
 							preview: {
-								text: lineResult.preview.text,
+								text: lineResult.previewText,
 								matches: mapArrayOrNot(
-									lineResult.preview.matches,
+									lineResult.rangeLocations.map(r => r.preview),
 									m => new Range(m.startLineNumber, m.startColumn, m.endLineNumber, m.endColumn))
 							},
 							ranges: mapArrayOrNot(
-								lineResult.ranges,
+								lineResult.rangeLocations.map(r => r.source),
 								r => new Range(r.startLineNumber, r.startColumn, r.endLineNumber, r.endColumn),
 							),
 							uri: fileMatch.resource
@@ -876,9 +924,11 @@ suite('ExtHostSearch', () => {
 						includePattern: {
 							'foo': true
 						},
-						excludePattern: {
-							'bar': true
-						}
+						excludePattern: [{
+							pattern: {
+								'bar': true
+							}
+						}]
 					},
 					{ folder: rootFolderB }
 				]
@@ -915,9 +965,11 @@ suite('ExtHostSearch', () => {
 						includePattern: {
 							'*.jsx': true
 						},
-						excludePattern: {
-							'*.js': false
-						}
+						excludePattern: [{
+							pattern: {
+								'*.js': false
+							}
+						}]
 					}
 				]
 			};
@@ -1041,17 +1093,21 @@ suite('ExtHostSearch', () => {
 				folderQueries: [
 					{
 						folder: rootFolderA,
-						excludePattern: {
-							'folder/*.css': {
-								when: '$(basename).scss'
+						excludePattern: [{
+							pattern: {
+								'folder/*.css': {
+									when: '$(basename).scss'
+								}
 							}
-						}
+						}]
 					},
 					{
 						folder: rootFolderB,
-						excludePattern: {
-							'*.js': false
-						}
+						excludePattern: [{
+							pattern: {
+								'*.js': false
+							}
+						}]
 					}
 				]
 			};
diff --git a/src/vs/workbench/api/test/node/extHostTunnelService.test.ts b/src/vs/workbench/api/test/node/extHostTunnelService.test.ts
index 57fe15e52b4..d260fbe726e 100644
--- a/src/vs/workbench/api/test/node/extHostTunnelService.test.ts
+++ b/src/vs/workbench/api/test/node/extHostTunnelService.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { findPorts, getRootProcesses, getSockets, loadConnectionTable, loadListeningPorts, parseIpAddress, tryFindRootPorts } from 'vs/workbench/api/node/extHostTunnelService';
+import { findPorts, getRootProcesses, getSockets, loadConnectionTable, loadListeningPorts, parseIpAddress, tryFindRootPorts } from '../../node/extHostTunnelService.js';
 
 const tcp =
 	`  sl  local_address rem_address   st tx_queue rx_queue tr tm->when retrnsmt   uid  timeout inode
diff --git a/src/vs/workbench/api/worker/extHost.worker.services.ts b/src/vs/workbench/api/worker/extHost.worker.services.ts
index 20ec7e138a6..85c1a96bb94 100644
--- a/src/vs/workbench/api/worker/extHost.worker.services.ts
+++ b/src/vs/workbench/api/worker/extHost.worker.services.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IExtHostExtensionService } from 'vs/workbench/api/common/extHostExtensionService';
-import { ExtHostLogService } from 'vs/workbench/api/common/extHostLogService';
-import { ExtensionStoragePaths, IExtensionStoragePaths } from 'vs/workbench/api/common/extHostStoragePaths';
-import { ExtHostExtensionService } from 'vs/workbench/api/worker/extHostExtensionService';
+import { SyncDescriptor } from '../../../platform/instantiation/common/descriptors.js';
+import { InstantiationType, registerSingleton } from '../../../platform/instantiation/common/extensions.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { IExtHostExtensionService } from '../common/extHostExtensionService.js';
+import { ExtHostLogService } from '../common/extHostLogService.js';
+import { ExtensionStoragePaths, IExtensionStoragePaths } from '../common/extHostStoragePaths.js';
+import { ExtHostExtensionService } from './extHostExtensionService.js';
 
 // #########################################################################
 // ###                                                                   ###
diff --git a/src/vs/workbench/api/worker/extHostConsoleForwarder.ts b/src/vs/workbench/api/worker/extHostConsoleForwarder.ts
index ea266a94a81..8cfde44fad7 100644
--- a/src/vs/workbench/api/worker/extHostConsoleForwarder.ts
+++ b/src/vs/workbench/api/worker/extHostConsoleForwarder.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { AbstractExtHostConsoleForwarder } from 'vs/workbench/api/common/extHostConsoleForwarder';
-import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService';
-import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
+import { AbstractExtHostConsoleForwarder } from '../common/extHostConsoleForwarder.js';
+import { IExtHostInitDataService } from '../common/extHostInitDataService.js';
+import { IExtHostRpcService } from '../common/extHostRpcService.js';
 
 export class ExtHostConsoleForwarder extends AbstractExtHostConsoleForwarder {
 
diff --git a/src/vs/workbench/api/worker/extHostExtensionService.ts b/src/vs/workbench/api/worker/extHostExtensionService.ts
index b83a462131d..6f3384ab89c 100644
--- a/src/vs/workbench/api/worker/extHostExtensionService.ts
+++ b/src/vs/workbench/api/worker/extHostExtensionService.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createApiFactoryAndRegisterActors } from 'vs/workbench/api/common/extHost.api.impl';
-import { ExtensionActivationTimesBuilder } from 'vs/workbench/api/common/extHostExtensionActivator';
-import { AbstractExtHostExtensionService } from 'vs/workbench/api/common/extHostExtensionService';
-import { URI } from 'vs/base/common/uri';
-import { RequireInterceptor } from 'vs/workbench/api/common/extHostRequireInterceptor';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { ExtensionRuntime } from 'vs/workbench/api/common/extHostTypes';
-import { timeout } from 'vs/base/common/async';
-import { ExtHostConsoleForwarder } from 'vs/workbench/api/worker/extHostConsoleForwarder';
+import { createApiFactoryAndRegisterActors } from '../common/extHost.api.impl.js';
+import { ExtensionActivationTimesBuilder } from '../common/extHostExtensionActivator.js';
+import { AbstractExtHostExtensionService } from '../common/extHostExtensionService.js';
+import { URI } from '../../../base/common/uri.js';
+import { RequireInterceptor } from '../common/extHostRequireInterceptor.js';
+import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { ExtensionRuntime } from '../common/extHostTypes.js';
+import { timeout } from '../../../base/common/async.js';
+import { ExtHostConsoleForwarder } from './extHostConsoleForwarder.js';
 
 class WorkerRequireInterceptor extends RequireInterceptor {
 
diff --git a/src/vs/workbench/api/worker/extensionHostWorker.ts b/src/vs/workbench/api/worker/extensionHostWorker.ts
index 86136a080e6..d9953269acb 100644
--- a/src/vs/workbench/api/worker/extensionHostWorker.ts
+++ b/src/vs/workbench/api/worker/extensionHostWorker.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IMessagePassingProtocol } from 'vs/base/parts/ipc/common/ipc';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { Emitter } from 'vs/base/common/event';
-import { isMessageOfType, MessageType, createMessageOfType, IExtensionHostInitData } from 'vs/workbench/services/extensions/common/extensionHostProtocol';
-import { ExtensionHostMain } from 'vs/workbench/api/common/extensionHostMain';
-import { IHostUtils } from 'vs/workbench/api/common/extHostExtensionService';
-import { NestedWorker } from 'vs/workbench/services/extensions/worker/polyfillNestedWorker';
-import * as path from 'vs/base/common/path';
-import * as performance from 'vs/base/common/performance';
+import { IMessagePassingProtocol } from '../../../base/parts/ipc/common/ipc.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { Emitter } from '../../../base/common/event.js';
+import { isMessageOfType, MessageType, createMessageOfType, IExtensionHostInitData } from '../../services/extensions/common/extensionHostProtocol.js';
+import { ExtensionHostMain } from '../common/extensionHostMain.js';
+import { IHostUtils } from '../common/extHostExtensionService.js';
+import { NestedWorker } from '../../services/extensions/worker/polyfillNestedWorker.js';
+import * as path from '../../../base/common/path.js';
+import * as performance from '../../../base/common/performance.js';
 
-import 'vs/workbench/api/common/extHost.common.services';
-import 'vs/workbench/api/worker/extHost.worker.services';
-import { FileAccess } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
+import '../common/extHost.common.services.js';
+import './extHost.worker.services.js';
+import { FileAccess } from '../../../base/common/network.js';
+import { URI } from '../../../base/common/uri.js';
 
 //#region --- Define, capture, and override some globals
 
@@ -234,6 +234,10 @@ function isInitMessage(a: any): a is IInitMessage {
 	return !!a && typeof a === 'object' && a.type === 'vscode.init' && a.data instanceof Map;
 }
 
+/**
+ * Defines the worker entry point. Must be exported and named `create`.
+ * @skipMangle
+ */
 export function create(): { onmessage: (message: any) => void } {
 	performance.mark(`code/extHost/willConnectToRenderer`);
 	const res = new ExtensionWorker();
diff --git a/extensions/microsoft-authentication/src/node/crypto.ts b/src/vs/workbench/api/worker/extensionHostWorkerMain.ts
similarity index 74%
rename from extensions/microsoft-authentication/src/node/crypto.ts
rename to src/vs/workbench/api/worker/extensionHostWorkerMain.ts
index 1b45ad993c3..f7eaf7cfeca 100644
--- a/extensions/microsoft-authentication/src/node/crypto.ts
+++ b/src/vs/workbench/api/worker/extensionHostWorkerMain.ts
@@ -2,6 +2,8 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import * as nodeCrypto from 'crypto';
 
-export const crypto: Crypto = nodeCrypto.webcrypto as any;
+import { create } from './extensionHostWorker.js';
+
+const data = create();
+self.onmessage = (e) => data.onmessage(e.data);
diff --git a/src/vs/workbench/browser/actions.ts b/src/vs/workbench/browser/actions.ts
index 1e166016ed3..83f4cf4a455 100644
--- a/src/vs/workbench/browser/actions.ts
+++ b/src/vs/workbench/browser/actions.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IAction } from 'vs/base/common/actions';
-import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { Emitter, Event } from 'vs/base/common/event';
-import { MenuId, IMenuService, IMenu, SubmenuItemAction, IMenuActionOptions } from 'vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
+import { IAction } from '../../base/common/actions.js';
+import { Disposable, DisposableStore, IDisposable } from '../../base/common/lifecycle.js';
+import { Emitter, Event } from '../../base/common/event.js';
+import { MenuId, IMenuService, IMenu, SubmenuItemAction, IMenuActionOptions } from '../../platform/actions/common/actions.js';
+import { IContextKeyService } from '../../platform/contextkey/common/contextkey.js';
+import { createAndFillInActionBarActions } from '../../platform/actions/browser/menuEntryActionViewItem.js';
 
 class MenuActions extends Disposable {
 
@@ -96,9 +96,8 @@ export class CompositeMenuActions extends Disposable {
 		const actions: IAction[] = [];
 
 		if (this.contextMenuId) {
-			const menu = this.menuService.createMenu(this.contextMenuId, this.contextKeyService);
-			createAndFillInActionBarActions(menu, this.options, { primary: [], secondary: actions });
-			menu.dispose();
+			const menu = this.menuService.getMenuActions(this.contextMenuId, this.contextKeyService, this.options);
+			createAndFillInActionBarActions(menu, { primary: [], secondary: actions });
 		}
 
 		return actions;
diff --git a/src/vs/workbench/browser/actions/developerActions.ts b/src/vs/workbench/browser/actions/developerActions.ts
index 7823fa988c0..bf0ca0f7b2d 100644
--- a/src/vs/workbench/browser/actions/developerActions.ts
+++ b/src/vs/workbench/browser/actions/developerActions.ts
@@ -3,43 +3,43 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/actions';
+import './media/actions.css';
 
-import { localize, localize2 } from 'vs/nls';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { DomEmitter } from 'vs/base/browser/event';
-import { Color } from 'vs/base/common/color';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IDisposable, toDisposable, dispose, DisposableStore, setDisposableTracker, DisposableTracker, DisposableInfo } from 'vs/base/common/lifecycle';
-import { getDomNodePagePosition, createStyleSheet, createCSSRule, append, $, getActiveDocument, onDidRegisterWindow, getWindows } from 'vs/base/browser/dom';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { Context } from 'vs/platform/contextkey/browser/contextKeyService';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { registerAction2, Action2, MenuRegistry } from 'vs/platform/actions/common/actions';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { clamp } from 'vs/base/common/numbers';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { IWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackup';
-import { ResolutionResult, ResultKind } from 'vs/platform/keybinding/common/keybindingResolver';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IOutputService } from 'vs/workbench/services/output/common/output';
-import { windowLogId } from 'vs/workbench/services/log/common/logConstants';
-import { ByteSize } from 'vs/platform/files/common/files';
-import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import product from 'vs/platform/product/common/product';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { localize, localize2 } from '../../../nls.js';
+import { IKeybindingService } from '../../../platform/keybinding/common/keybinding.js';
+import { DomEmitter } from '../../../base/browser/event.js';
+import { Color } from '../../../base/common/color.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { IDisposable, toDisposable, dispose, DisposableStore, setDisposableTracker, DisposableTracker, DisposableInfo } from '../../../base/common/lifecycle.js';
+import { getDomNodePagePosition, createStyleSheet, createCSSRule, append, $, getActiveDocument, onDidRegisterWindow, getWindows } from '../../../base/browser/dom.js';
+import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr, IContextKeyService, RawContextKey } from '../../../platform/contextkey/common/contextkey.js';
+import { Context } from '../../../platform/contextkey/browser/contextKeyService.js';
+import { StandardKeyboardEvent } from '../../../base/browser/keyboardEvent.js';
+import { RunOnceScheduler } from '../../../base/common/async.js';
+import { ILayoutService } from '../../../platform/layout/browser/layoutService.js';
+import { Registry } from '../../../platform/registry/common/platform.js';
+import { registerAction2, Action2, MenuRegistry } from '../../../platform/actions/common/actions.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../platform/storage/common/storage.js';
+import { clamp } from '../../../base/common/numbers.js';
+import { KeyCode } from '../../../base/common/keyCodes.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from '../../../platform/configuration/common/configurationRegistry.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { IWorkingCopyService } from '../../services/workingCopy/common/workingCopyService.js';
+import { ServicesAccessor } from '../../../platform/instantiation/common/instantiation.js';
+import { Categories } from '../../../platform/action/common/actionCommonCategories.js';
+import { IWorkingCopyBackupService } from '../../services/workingCopy/common/workingCopyBackup.js';
+import { ResolutionResult, ResultKind } from '../../../platform/keybinding/common/keybindingResolver.js';
+import { IDialogService } from '../../../platform/dialogs/common/dialogs.js';
+import { IOutputService } from '../../services/output/common/output.js';
+import { windowLogId } from '../../services/log/common/logConstants.js';
+import { ByteSize } from '../../../platform/files/common/files.js';
+import { IQuickInputService, IQuickPickItem } from '../../../platform/quickinput/common/quickInput.js';
+import { IUserDataProfileService } from '../../services/userDataProfile/common/userDataProfile.js';
+import { IEditorService } from '../../services/editor/common/editorService.js';
+import product from '../../../platform/product/common/product.js';
+import { CommandsRegistry } from '../../../platform/commands/common/commands.js';
+import { IEnvironmentService } from '../../../platform/environment/common/environment.js';
 
 class InspectContextKeysAction extends Action2 {
 
diff --git a/src/vs/workbench/browser/actions/helpActions.ts b/src/vs/workbench/browser/actions/helpActions.ts
index fd55b27b185..3a366903e8a 100644
--- a/src/vs/workbench/browser/actions/helpActions.ts
+++ b/src/vs/workbench/browser/actions/helpActions.ts
@@ -3,18 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize, localize2 } from 'vs/nls';
-import product from 'vs/platform/product/common/product';
-import { isMacintosh, isLinux, language, isWeb } from 'vs/base/common/platform';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { URI } from 'vs/base/common/uri';
-import { MenuId, Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { KeyChord, KeyMod, KeyCode } from 'vs/base/common/keyCodes';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
+import { localize, localize2 } from '../../../nls.js';
+import product from '../../../platform/product/common/product.js';
+import { isMacintosh, isLinux, language, isWeb } from '../../../base/common/platform.js';
+import { ITelemetryService } from '../../../platform/telemetry/common/telemetry.js';
+import { IOpenerService } from '../../../platform/opener/common/opener.js';
+import { URI } from '../../../base/common/uri.js';
+import { MenuId, Action2, registerAction2 } from '../../../platform/actions/common/actions.js';
+import { KeyChord, KeyMod, KeyCode } from '../../../base/common/keyCodes.js';
+import { IProductService } from '../../../platform/product/common/productService.js';
+import { ServicesAccessor } from '../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../platform/keybinding/common/keybindingsRegistry.js';
+import { Categories } from '../../../platform/action/common/actionCommonCategories.js';
+import { ICommandService } from '../../../platform/commands/common/commands.js';
 
 class KeybindingsReferenceAction extends Action2 {
 
@@ -307,6 +308,27 @@ class OpenPrivacyStatementUrlAction extends Action2 {
 	}
 }
 
+class GetStartedWithAccessibilityFeatures extends Action2 {
+	static readonly ID = 'workbench.action.getStartedWithAccessibilityFeatures';
+	constructor() {
+		super({
+			id: GetStartedWithAccessibilityFeatures.ID,
+			title: localize2('getStartedWithAccessibilityFeatures', 'Get Started with Accessibility Features'),
+			category: Categories.Help,
+			f1: true,
+			menu: {
+				id: MenuId.MenubarHelpMenu,
+				group: '1_welcome',
+				order: 6
+			}
+		});
+	}
+	run(accessor: ServicesAccessor): void {
+		const commandService = accessor.get(ICommandService);
+		commandService.executeCommand('workbench.action.openWalkthrough', 'SetupAccessibility');
+	}
+}
+
 // --- Actions Registration
 
 if (KeybindingsReferenceAction.AVAILABLE) {
@@ -344,3 +366,5 @@ if (OpenLicenseUrlAction.AVAILABLE) {
 if (OpenPrivacyStatementUrlAction.AVAILABE) {
 	registerAction2(OpenPrivacyStatementUrlAction);
 }
+
+registerAction2(GetStartedWithAccessibilityFeatures);
diff --git a/src/vs/workbench/browser/actions/layoutActions.ts b/src/vs/workbench/browser/actions/layoutActions.ts
index 77574a6338d..5d7b93cfd86 100644
--- a/src/vs/workbench/browser/actions/layoutActions.ts
+++ b/src/vs/workbench/browser/actions/layoutActions.ts
@@ -3,34 +3,35 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ILocalizedString, localize, localize2 } from 'vs/nls';
-import { MenuId, MenuRegistry, registerAction2, Action2 } from 'vs/platform/actions/common/actions';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { EditorActionsLocation, EditorTabsMode, IWorkbenchLayoutService, LayoutSettings, Parts, Position, ZenModeSettings, positionToString } from 'vs/workbench/services/layout/browser/layoutService';
-import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { KeyMod, KeyCode, KeyChord } from 'vs/base/common/keyCodes';
-import { isWindows, isLinux, isWeb, isMacintosh, isNative } from 'vs/base/common/platform';
-import { IsMacNativeContext } from 'vs/platform/contextkey/common/contextkeys';
-import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ContextKeyExpr, ContextKeyExpression, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IViewDescriptorService, ViewContainerLocation, IViewDescriptor, ViewContainerLocationToString } from 'vs/workbench/common/views';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { QuickPickItem, IQuickInputService, IQuickPickItem, IQuickPickSeparator, IQuickPick } from 'vs/platform/quickinput/common/quickInput';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { ToggleAuxiliaryBarAction } from 'vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions';
-import { TogglePanelAction } from 'vs/workbench/browser/parts/panel/panelActions';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { AuxiliaryBarVisibleContext, PanelAlignmentContext, PanelVisibleContext, SideBarVisibleContext, FocusedViewContext, InEditorZenModeContext, IsMainEditorCenteredLayoutContext, MainEditorAreaVisibleContext, IsMainWindowFullscreenContext, PanelPositionContext, IsAuxiliaryWindowFocusedContext, TitleBarStyleContext } from 'vs/workbench/common/contextkeys';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { ICommandActionTitle } from 'vs/platform/action/common/action';
-import { mainWindow } from 'vs/base/browser/window';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { TitlebarStyle } from 'vs/platform/window/common/window';
+import { ILocalizedString, localize, localize2 } from '../../../nls.js';
+import { MenuId, MenuRegistry, registerAction2, Action2 } from '../../../platform/actions/common/actions.js';
+import { Categories } from '../../../platform/action/common/actionCommonCategories.js';
+import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
+import { EditorActionsLocation, EditorTabsMode, IWorkbenchLayoutService, LayoutSettings, Parts, Position, ZenModeSettings, positionToString } from '../../services/layout/browser/layoutService.js';
+import { ServicesAccessor, IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
+import { KeyMod, KeyCode, KeyChord } from '../../../base/common/keyCodes.js';
+import { isWindows, isLinux, isWeb, isMacintosh, isNative } from '../../../base/common/platform.js';
+import { IsMacNativeContext } from '../../../platform/contextkey/common/contextkeys.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ContextKeyExpr, ContextKeyExpression, IContextKeyService } from '../../../platform/contextkey/common/contextkey.js';
+import { IViewDescriptorService, ViewContainerLocation, IViewDescriptor, ViewContainerLocationToString } from '../../common/views.js';
+import { IViewsService } from '../../services/views/common/viewsService.js';
+import { QuickPickItem, IQuickInputService, IQuickPickItem, IQuickPickSeparator, IQuickPick } from '../../../platform/quickinput/common/quickInput.js';
+import { IDialogService } from '../../../platform/dialogs/common/dialogs.js';
+import { IPaneCompositePartService } from '../../services/panecomposite/browser/panecomposite.js';
+import { ToggleAuxiliaryBarAction } from '../parts/auxiliarybar/auxiliaryBarActions.js';
+import { TogglePanelAction } from '../parts/panel/panelActions.js';
+import { ICommandService } from '../../../platform/commands/common/commands.js';
+import { AuxiliaryBarVisibleContext, PanelAlignmentContext, PanelVisibleContext, SideBarVisibleContext, FocusedViewContext, InEditorZenModeContext, IsMainEditorCenteredLayoutContext, MainEditorAreaVisibleContext, IsMainWindowFullscreenContext, PanelPositionContext, IsAuxiliaryWindowFocusedContext, TitleBarStyleContext } from '../../common/contextkeys.js';
+import { Codicon } from '../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../base/common/themables.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { registerIcon } from '../../../platform/theme/common/iconRegistry.js';
+import { ICommandActionTitle } from '../../../platform/action/common/action.js';
+import { mainWindow } from '../../../base/browser/window.js';
+import { IKeybindingService } from '../../../platform/keybinding/common/keybinding.js';
+import { TitlebarStyle } from '../../../platform/window/common/window.js';
+import { IPreferencesService } from '../../services/preferences/common/preferences.js';
 
 // Register Icons
 const menubarIcon = registerIcon('menuBar', Codicon.layoutMenubar, localize('menuBarIcon', "Represents the menu bar"));
@@ -673,6 +674,48 @@ MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
 	order: 11
 });
 
+// --- Configure Tabs Layout
+
+export class ConfigureEditorTabsAction extends Action2 {
+
+	static readonly ID = 'workbench.action.configureEditorTabs';
+
+	constructor() {
+		super({
+			id: ConfigureEditorTabsAction.ID,
+			title: localize2('configureTabs', "Configure Tabs"),
+			category: Categories.View,
+		});
+	}
+
+	run(accessor: ServicesAccessor) {
+		const preferencesService = accessor.get(IPreferencesService);
+		preferencesService.openSettings({ jsonEditor: false, query: 'workbench.editor tab' });
+	}
+}
+registerAction2(ConfigureEditorTabsAction);
+
+// --- Configure Editor
+
+export class ConfigureEditorAction extends Action2 {
+
+	static readonly ID = 'workbench.action.configureEditor';
+
+	constructor() {
+		super({
+			id: ConfigureEditorAction.ID,
+			title: localize2('configureEditors', "Configure Editors"),
+			category: Categories.View,
+		});
+	}
+
+	run(accessor: ServicesAccessor) {
+		const preferencesService = accessor.get(IPreferencesService);
+		preferencesService.openSettings({ jsonEditor: false, query: 'workbench.editor' });
+	}
+}
+registerAction2(ConfigureEditorAction);
+
 // --- Toggle Pinned Tabs On Separate Row
 
 registerAction2(class extends Action2 {
@@ -923,13 +966,14 @@ registerAction2(class extends Action2 {
 	}
 
 	private async getView(quickInputService: IQuickInputService, viewDescriptorService: IViewDescriptorService, paneCompositePartService: IPaneCompositePartService, viewId?: string): Promise<string> {
-		const quickPick = quickInputService.createQuickPick();
+		const disposables = new DisposableStore();
+		const quickPick = disposables.add(quickInputService.createQuickPick({ useSeparators: true }));
 		quickPick.placeholder = localize('moveFocusedView.selectView', "Select a View to Move");
 		quickPick.items = this.getViewItems(viewDescriptorService, paneCompositePartService);
 		quickPick.selectedItems = quickPick.items.filter(item => (item as IQuickPickItem).id === viewId) as IQuickPickItem[];
 
 		return new Promise((resolve, reject) => {
-			quickPick.onDidAccept(() => {
+			disposables.add(quickPick.onDidAccept(() => {
 				const viewId = quickPick.selectedItems[0];
 				if (viewId.id) {
 					resolve(viewId.id);
@@ -938,9 +982,12 @@ registerAction2(class extends Action2 {
 				}
 
 				quickPick.hide();
-			});
+			}));
 
-			quickPick.onDidHide(() => reject());
+			disposables.add(quickPick.onDidHide(() => {
+				disposables.dispose();
+				reject();
+			}));
 
 			quickPick.show();
 		});
@@ -982,7 +1029,8 @@ class MoveFocusedViewAction extends Action2 {
 			return;
 		}
 
-		const quickPick = quickInputService.createQuickPick();
+		const disposables = new DisposableStore();
+		const quickPick = disposables.add(quickInputService.createQuickPick({ useSeparators: true }));
 		quickPick.placeholder = localize('moveFocusedView.selectDestination', "Select a Destination for the View");
 		quickPick.title = localize({ key: 'moveFocusedView.title', comment: ['{0} indicates the title of the view the user has selected to move.'] }, "View: Move {0}", viewDescriptor.name.value);
 
@@ -1077,7 +1125,7 @@ class MoveFocusedViewAction extends Action2 {
 
 		quickPick.items = items;
 
-		quickPick.onDidAccept(() => {
+		disposables.add(quickPick.onDidAccept(() => {
 			const destination = quickPick.selectedItems[0];
 
 			if (destination.id === '_.panel.newcontainer') {
@@ -1095,7 +1143,9 @@ class MoveFocusedViewAction extends Action2 {
 			}
 
 			quickPick.hide();
-		});
+		}));
+
+		disposables.add(quickPick.onDidHide(() => disposables.dispose()));
 
 		quickPick.show();
 	}
@@ -1368,7 +1418,7 @@ for (const { active } of [...ToggleVisibilityActions, ...MoveSideBarActions, ...
 
 registerAction2(class CustomizeLayoutAction extends Action2 {
 
-	private _currentQuickPick?: IQuickPick<IQuickPickItem>;
+	private _currentQuickPick?: IQuickPick<IQuickPickItem, { useSeparators: true }>;
 
 	constructor() {
 		super({
@@ -1461,7 +1511,10 @@ registerAction2(class CustomizeLayoutAction extends Action2 {
 		const commandService = accessor.get(ICommandService);
 		const quickInputService = accessor.get(IQuickInputService);
 		const keybindingService = accessor.get(IKeybindingService);
-		const quickPick = quickInputService.createQuickPick();
+
+		const disposables = new DisposableStore();
+
+		const quickPick = disposables.add(quickInputService.createQuickPick({ useSeparators: true }));
 
 		this._currentQuickPick = quickPick;
 		quickPick.items = this.getItems(contextKeyService, keybindingService);
@@ -1486,7 +1539,6 @@ registerAction2(class CustomizeLayoutAction extends Action2 {
 			closeButton
 		];
 
-		const disposables = new DisposableStore();
 		let selectedItem: CustomizeLayoutItem | undefined = undefined;
 		disposables.add(contextKeyService.onDidChangeContext(changeEvent => {
 			if (changeEvent.affectsSome(LayoutContextKeySet)) {
@@ -1499,21 +1551,21 @@ registerAction2(class CustomizeLayoutAction extends Action2 {
 			}
 		}));
 
-		quickPick.onDidAccept(event => {
+		disposables.add(quickPick.onDidAccept(event => {
 			if (quickPick.selectedItems.length) {
 				selectedItem = quickPick.selectedItems[0] as CustomizeLayoutItem;
 				commandService.executeCommand(selectedItem.id);
 			}
-		});
+		}));
 
-		quickPick.onDidTriggerItemButton(event => {
+		disposables.add(quickPick.onDidTriggerItemButton(event => {
 			if (event.item) {
 				selectedItem = event.item as CustomizeLayoutItem;
 				commandService.executeCommand(selectedItem.id);
 			}
-		});
+		}));
 
-		quickPick.onDidTriggerButton((button) => {
+		disposables.add(quickPick.onDidTriggerButton((button) => {
 			if (button === closeButton) {
 				quickPick.hide();
 			} else if (button === resetButton) {
@@ -1535,16 +1587,16 @@ registerAction2(class CustomizeLayoutAction extends Action2 {
 
 				commandService.executeCommand('workbench.action.alignPanelCenter');
 			}
-		});
+		}));
 
-		quickPick.onDidHide(() => {
+		disposables.add(quickPick.onDidHide(() => {
 			quickPick.dispose();
-		});
+		}));
 
-		quickPick.onDispose(() => {
+		disposables.add(quickPick.onDispose(() => {
 			this._currentQuickPick = undefined;
 			disposables.dispose();
-		});
+		}));
 
 		quickPick.show();
 	}
diff --git a/src/vs/workbench/browser/actions/listCommands.ts b/src/vs/workbench/browser/actions/listCommands.ts
index 188a94e1f51..e87163b7476 100644
--- a/src/vs/workbench/browser/actions/listCommands.ts
+++ b/src/vs/workbench/browser/actions/listCommands.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyMod, KeyCode, KeyChord } from 'vs/base/common/keyCodes';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { List } from 'vs/base/browser/ui/list/listWidget';
-import { WorkbenchListFocusContextKey, IListService, WorkbenchListSupportsMultiSelectContextKey, ListWidget, WorkbenchListHasSelectionOrFocus, getSelectionKeyboardEvent, WorkbenchListWidget, WorkbenchListSelectionNavigation, WorkbenchTreeElementCanCollapse, WorkbenchTreeElementHasParent, WorkbenchTreeElementHasChild, WorkbenchTreeElementCanExpand, RawWorkbenchListFocusContextKey, WorkbenchTreeFindOpen, WorkbenchListSupportsFind, WorkbenchListScrollAtBottomContextKey, WorkbenchListScrollAtTopContextKey, WorkbenchTreeStickyScrollFocused } from 'vs/platform/list/browser/listService';
-import { PagedList } from 'vs/base/browser/ui/list/listPaging';
-import { equals, range } from 'vs/base/common/arrays';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { ObjectTree } from 'vs/base/browser/ui/tree/objectTree';
-import { AsyncDataTree } from 'vs/base/browser/ui/tree/asyncDataTree';
-import { DataTree } from 'vs/base/browser/ui/tree/dataTree';
-import { ITreeNode } from 'vs/base/browser/ui/tree/tree';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { Table } from 'vs/base/browser/ui/table/tableWidget';
-import { AbstractTree, TreeFindMatchType, TreeFindMode } from 'vs/base/browser/ui/tree/abstractTree';
-import { isActiveElement } from 'vs/base/browser/dom';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { localize, localize2 } from 'vs/nls';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import { KeyMod, KeyCode, KeyChord } from '../../../base/common/keyCodes.js';
+import { ServicesAccessor } from '../../../platform/instantiation/common/instantiation.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../platform/keybinding/common/keybindingsRegistry.js';
+import { List } from '../../../base/browser/ui/list/listWidget.js';
+import { WorkbenchListFocusContextKey, IListService, WorkbenchListSupportsMultiSelectContextKey, ListWidget, WorkbenchListHasSelectionOrFocus, getSelectionKeyboardEvent, WorkbenchListWidget, WorkbenchListSelectionNavigation, WorkbenchTreeElementCanCollapse, WorkbenchTreeElementHasParent, WorkbenchTreeElementHasChild, WorkbenchTreeElementCanExpand, RawWorkbenchListFocusContextKey, WorkbenchTreeFindOpen, WorkbenchListSupportsFind, WorkbenchListScrollAtBottomContextKey, WorkbenchListScrollAtTopContextKey, WorkbenchTreeStickyScrollFocused } from '../../../platform/list/browser/listService.js';
+import { PagedList } from '../../../base/browser/ui/list/listPaging.js';
+import { equals, range } from '../../../base/common/arrays.js';
+import { ContextKeyExpr } from '../../../platform/contextkey/common/contextkey.js';
+import { ObjectTree } from '../../../base/browser/ui/tree/objectTree.js';
+import { AsyncDataTree } from '../../../base/browser/ui/tree/asyncDataTree.js';
+import { DataTree } from '../../../base/browser/ui/tree/dataTree.js';
+import { ITreeNode } from '../../../base/browser/ui/tree/tree.js';
+import { CommandsRegistry } from '../../../platform/commands/common/commands.js';
+import { Table } from '../../../base/browser/ui/table/tableWidget.js';
+import { AbstractTree, TreeFindMatchType, TreeFindMode } from '../../../base/browser/ui/tree/abstractTree.js';
+import { isActiveElement } from '../../../base/browser/dom.js';
+import { Action2, registerAction2 } from '../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
+import { localize, localize2 } from '../../../nls.js';
+import { IHoverService } from '../../../platform/hover/browser/hover.js';
 
 function ensureDOMFocus(widget: ListWidget | undefined): void {
 	// it can happen that one of the commands is executed while
diff --git a/src/vs/workbench/browser/actions/navigationActions.ts b/src/vs/workbench/browser/actions/navigationActions.ts
index 56b88fe52d6..08713b71755 100644
--- a/src/vs/workbench/browser/actions/navigationActions.ts
+++ b/src/vs/workbench/browser/actions/navigationActions.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize2 } from 'vs/nls';
-import { IEditorGroupsService, GroupDirection, GroupLocation, IFindGroupScope } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/browser/layoutService';
-import { Action2, IAction2Options, registerAction2 } from 'vs/platform/actions/common/actions';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { Direction } from 'vs/base/browser/ui/grid/grid';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IPaneComposite } from 'vs/workbench/common/panecomposite';
-import { IComposite } from 'vs/workbench/common/composite';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { ViewContainerLocation } from 'vs/workbench/common/views';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { getActiveWindow } from 'vs/base/browser/dom';
-import { isAuxiliaryWindow } from 'vs/base/browser/window';
+import { localize2 } from '../../../nls.js';
+import { IEditorGroupsService, GroupDirection, GroupLocation, IFindGroupScope } from '../../services/editor/common/editorGroupsService.js';
+import { IWorkbenchLayoutService, Parts } from '../../services/layout/browser/layoutService.js';
+import { Action2, IAction2Options, registerAction2 } from '../../../platform/actions/common/actions.js';
+import { Categories } from '../../../platform/action/common/actionCommonCategories.js';
+import { Direction } from '../../../base/browser/ui/grid/grid.js';
+import { KeyCode, KeyMod } from '../../../base/common/keyCodes.js';
+import { IEditorService } from '../../services/editor/common/editorService.js';
+import { IPaneComposite } from '../../common/panecomposite.js';
+import { IComposite } from '../../common/composite.js';
+import { IPaneCompositePartService } from '../../services/panecomposite/browser/panecomposite.js';
+import { ViewContainerLocation } from '../../common/views.js';
+import { KeybindingWeight } from '../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ServicesAccessor } from '../../../platform/instantiation/common/instantiation.js';
+import { getActiveWindow } from '../../../base/browser/dom.js';
+import { isAuxiliaryWindow } from '../../../base/browser/window.js';
 
 abstract class BaseNavigationAction extends Action2 {
 
diff --git a/src/vs/workbench/browser/actions/quickAccessActions.ts b/src/vs/workbench/browser/actions/quickAccessActions.ts
index 9890994cfdf..40bfbae3bdb 100644
--- a/src/vs/workbench/browser/actions/quickAccessActions.ts
+++ b/src/vs/workbench/browser/actions/quickAccessActions.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize, localize2 } from 'vs/nls';
-import { MenuId, Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
-import { KeybindingsRegistry, KeybindingWeight, IKeybindingRule } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { IQuickInputService, ItemActivation } from 'vs/platform/quickinput/common/quickInput';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { inQuickPickContext, defaultQuickAccessContext, getQuickNavigateHandler } from 'vs/workbench/browser/quickaccess';
-import { ILocalizedString } from 'vs/platform/action/common/action';
-import { AnythingQuickAccessProviderRunOptions } from 'vs/platform/quickinput/common/quickAccess';
-import { Codicon } from 'vs/base/common/codicons';
+import { localize, localize2 } from '../../../nls.js';
+import { MenuId, Action2, registerAction2 } from '../../../platform/actions/common/actions.js';
+import { KeyMod, KeyCode } from '../../../base/common/keyCodes.js';
+import { KeybindingsRegistry, KeybindingWeight, IKeybindingRule } from '../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IQuickInputService, ItemActivation } from '../../../platform/quickinput/common/quickInput.js';
+import { IKeybindingService } from '../../../platform/keybinding/common/keybinding.js';
+import { CommandsRegistry } from '../../../platform/commands/common/commands.js';
+import { ServicesAccessor } from '../../../platform/instantiation/common/instantiation.js';
+import { inQuickPickContext, defaultQuickAccessContext, getQuickNavigateHandler } from '../quickaccess.js';
+import { ILocalizedString } from '../../../platform/action/common/action.js';
+import { AnythingQuickAccessProviderRunOptions } from '../../../platform/quickinput/common/quickAccess.js';
+import { Codicon } from '../../../base/common/codicons.js';
 
 //#region Quick access management commands and keys
 
@@ -163,12 +163,13 @@ registerAction2(class QuickAccessAction extends Action2 {
 
 	run(accessor: ServicesAccessor): void {
 		const quickInputService = accessor.get(IQuickInputService);
+		const providerOptions: AnythingQuickAccessProviderRunOptions = {
+			includeHelp: true,
+			from: 'commandCenter',
+		};
 		quickInputService.quickAccess.show(undefined, {
 			preserveValue: true,
-			providerOptions: {
-				includeHelp: true,
-				from: 'commandCenter',
-			} as AnythingQuickAccessProviderRunOptions
+			providerOptions
 		});
 	}
 });
diff --git a/src/vs/workbench/browser/actions/textInputActions.ts b/src/vs/workbench/browser/actions/textInputActions.ts
index c06fb52ca30..20b277dee3c 100644
--- a/src/vs/workbench/browser/actions/textInputActions.ts
+++ b/src/vs/workbench/browser/actions/textInputActions.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IAction, Action, Separator } from 'vs/base/common/actions';
-import { localize } from 'vs/nls';
-import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { EventHelper, addDisposableListener, getActiveDocument, getWindow, isHTMLElement, isHTMLInputElement, isHTMLTextAreaElement } from 'vs/base/browser/dom';
-import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { isNative } from 'vs/base/common/platform';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { Event as BaseEvent } from 'vs/base/common/event';
-import { Lazy } from 'vs/base/common/lazy';
+import { IAction, Action, Separator } from '../../../base/common/actions.js';
+import { localize } from '../../../nls.js';
+import { IWorkbenchLayoutService } from '../../services/layout/browser/layoutService.js';
+import { IContextMenuService } from '../../../platform/contextview/browser/contextView.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { EventHelper, addDisposableListener, getActiveDocument, getWindow, isHTMLElement, isHTMLInputElement, isHTMLTextAreaElement } from '../../../base/browser/dom.js';
+import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from '../../common/contributions.js';
+import { isNative } from '../../../base/common/platform.js';
+import { IClipboardService } from '../../../platform/clipboard/common/clipboardService.js';
+import { StandardMouseEvent } from '../../../base/browser/mouseEvent.js';
+import { Event as BaseEvent } from '../../../base/common/event.js';
+import { Lazy } from '../../../base/common/lazy.js';
 
 export class TextInputActionsProvider extends Disposable implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/browser/actions/widgetNavigationCommands.ts b/src/vs/workbench/browser/actions/widgetNavigationCommands.ts
index 1657bf72263..3ce130c2c32 100644
--- a/src/vs/workbench/browser/actions/widgetNavigationCommands.ts
+++ b/src/vs/workbench/browser/actions/widgetNavigationCommands.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
-import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingWeight, KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { WorkbenchListFocusContextKey, WorkbenchListScrollAtBottomContextKey, WorkbenchListScrollAtTopContextKey } from 'vs/platform/list/browser/listService';
-import { Event } from 'vs/base/common/event';
-import { combinedDisposable, toDisposable, IDisposable, Disposable } from 'vs/base/common/lifecycle';
-import { WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { KeyMod, KeyCode } from '../../../base/common/keyCodes.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from '../../../platform/contextkey/common/contextkey.js';
+import { KeybindingWeight, KeybindingsRegistry } from '../../../platform/keybinding/common/keybindingsRegistry.js';
+import { WorkbenchListFocusContextKey, WorkbenchListScrollAtBottomContextKey, WorkbenchListScrollAtTopContextKey } from '../../../platform/list/browser/listService.js';
+import { Event } from '../../../base/common/event.js';
+import { combinedDisposable, toDisposable, IDisposable, Disposable } from '../../../base/common/lifecycle.js';
+import { WorkbenchPhase, registerWorkbenchContribution2 } from '../../common/contributions.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
 
 /** INavigableContainer represents a logical container composed of widgets that can
 	be navigated back and forth with key shortcuts */
diff --git a/src/vs/workbench/browser/actions/windowActions.ts b/src/vs/workbench/browser/actions/windowActions.ts
index 26c0b61d3d1..e2248c750fb 100644
--- a/src/vs/workbench/browser/actions/windowActions.ts
+++ b/src/vs/workbench/browser/actions/windowActions.ts
@@ -3,38 +3,38 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize, localize2 } from 'vs/nls';
-import { IWindowOpenable } from 'vs/platform/window/common/window';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { MenuRegistry, MenuId, Action2, registerAction2, IAction2Options } from 'vs/platform/actions/common/actions';
-import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { IsMainWindowFullscreenContext } from 'vs/workbench/common/contextkeys';
-import { IsMacNativeContext, IsDevelopmentContext, IsWebContext, IsIOSContext } from 'vs/platform/contextkey/common/contextkeys';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { IQuickInputButton, IQuickInputService, IQuickPickSeparator, IKeyMods, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { IWorkspaceContextService, IWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
-import { ILabelService, Verbosity } from 'vs/platform/label/common/label';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IRecent, isRecentFolder, isRecentWorkspace, IWorkspacesService } from 'vs/platform/workspaces/common/workspaces';
-import { URI } from 'vs/base/common/uri';
-import { getIconClasses } from 'vs/editor/common/services/getIconClasses';
-import { FileKind } from 'vs/platform/files/common/files';
-import { splitRecentLabel } from 'vs/base/common/labels';
-import { isMacintosh, isWeb, isWindows } from 'vs/base/common/platform';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { inQuickPickContext, getQuickNavigateHandler } from 'vs/workbench/browser/quickaccess';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { ResourceMap } from 'vs/base/common/map';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { isFolderBackupInfo, isWorkspaceBackupInfo } from 'vs/platform/backup/common/backup';
-import { getActiveElement, getActiveWindow, isHTMLElement } from 'vs/base/browser/dom';
+import { localize, localize2 } from '../../../nls.js';
+import { IWindowOpenable } from '../../../platform/window/common/window.js';
+import { IDialogService } from '../../../platform/dialogs/common/dialogs.js';
+import { MenuRegistry, MenuId, Action2, registerAction2, IAction2Options } from '../../../platform/actions/common/actions.js';
+import { KeyChord, KeyCode, KeyMod } from '../../../base/common/keyCodes.js';
+import { IsMainWindowFullscreenContext } from '../../common/contextkeys.js';
+import { IsMacNativeContext, IsDevelopmentContext, IsWebContext, IsIOSContext } from '../../../platform/contextkey/common/contextkeys.js';
+import { Categories } from '../../../platform/action/common/actionCommonCategories.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IQuickInputButton, IQuickInputService, IQuickPickSeparator, IKeyMods, IQuickPickItem } from '../../../platform/quickinput/common/quickInput.js';
+import { IWorkspaceContextService, IWorkspaceIdentifier } from '../../../platform/workspace/common/workspace.js';
+import { ILabelService, Verbosity } from '../../../platform/label/common/label.js';
+import { IKeybindingService } from '../../../platform/keybinding/common/keybinding.js';
+import { IModelService } from '../../../editor/common/services/model.js';
+import { ILanguageService } from '../../../editor/common/languages/language.js';
+import { IRecent, isRecentFolder, isRecentWorkspace, IWorkspacesService } from '../../../platform/workspaces/common/workspaces.js';
+import { URI } from '../../../base/common/uri.js';
+import { getIconClasses } from '../../../editor/common/services/getIconClasses.js';
+import { FileKind } from '../../../platform/files/common/files.js';
+import { splitRecentLabel } from '../../../base/common/labels.js';
+import { isMacintosh, isWeb, isWindows } from '../../../base/common/platform.js';
+import { ContextKeyExpr } from '../../../platform/contextkey/common/contextkey.js';
+import { inQuickPickContext, getQuickNavigateHandler } from '../quickaccess.js';
+import { IHostService } from '../../services/host/browser/host.js';
+import { ResourceMap } from '../../../base/common/map.js';
+import { Codicon } from '../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../base/common/themables.js';
+import { CommandsRegistry } from '../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
+import { ServicesAccessor } from '../../../platform/instantiation/common/instantiation.js';
+import { isFolderBackupInfo, isWorkspaceBackupInfo } from '../../../platform/backup/common/backup.js';
+import { getActiveElement, getActiveWindow, isHTMLElement } from '../../../base/browser/dom.js';
 
 export const inRecentFilesPickerContextKey = 'inRecentFilesPicker';
 
diff --git a/src/vs/workbench/browser/actions/workspaceActions.ts b/src/vs/workbench/browser/actions/workspaceActions.ts
index d3bb8546062..96861a697c1 100644
--- a/src/vs/workbench/browser/actions/workspaceActions.ts
+++ b/src/vs/workbench/browser/actions/workspaceActions.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize, localize2 } from 'vs/nls';
-import { ITelemetryData } from 'vs/platform/telemetry/common/telemetry';
-import { IWorkspaceContextService, WorkbenchState, IWorkspaceFolder, hasWorkspaceFileExtension } from 'vs/platform/workspace/common/workspace';
-import { IWorkspaceEditingService } from 'vs/workbench/services/workspaces/common/workspaceEditing';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { ADD_ROOT_FOLDER_COMMAND_ID, ADD_ROOT_FOLDER_LABEL, PICK_WORKSPACE_FOLDER_COMMAND_ID, SET_ROOT_FOLDER_COMMAND_ID } from 'vs/workbench/browser/actions/workspaceCommands';
-import { IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { MenuRegistry, MenuId, Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, OpenFolderWorkspaceSupportContext, WorkbenchStateContext, WorkspaceFolderCountContext } from 'vs/workbench/common/contextkeys';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IWorkspacesService } from 'vs/platform/workspaces/common/workspaces';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { IsMacNativeContext } from 'vs/platform/contextkey/common/contextkeys';
-import { ILocalizedString } from 'vs/platform/action/common/action';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
+import { localize, localize2 } from '../../../nls.js';
+import { ITelemetryData } from '../../../platform/telemetry/common/telemetry.js';
+import { IWorkspaceContextService, WorkbenchState, IWorkspaceFolder, hasWorkspaceFileExtension } from '../../../platform/workspace/common/workspace.js';
+import { IWorkspaceEditingService } from '../../services/workspaces/common/workspaceEditing.js';
+import { IEditorService } from '../../services/editor/common/editorService.js';
+import { ICommandService } from '../../../platform/commands/common/commands.js';
+import { ADD_ROOT_FOLDER_COMMAND_ID, ADD_ROOT_FOLDER_LABEL, PICK_WORKSPACE_FOLDER_COMMAND_ID, SET_ROOT_FOLDER_COMMAND_ID } from './workspaceCommands.js';
+import { IFileDialogService } from '../../../platform/dialogs/common/dialogs.js';
+import { MenuRegistry, MenuId, Action2, registerAction2 } from '../../../platform/actions/common/actions.js';
+import { EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, OpenFolderWorkspaceSupportContext, WorkbenchStateContext, WorkspaceFolderCountContext } from '../../common/contextkeys.js';
+import { ServicesAccessor } from '../../../platform/instantiation/common/instantiation.js';
+import { IHostService } from '../../services/host/browser/host.js';
+import { KeyChord, KeyCode, KeyMod } from '../../../base/common/keyCodes.js';
+import { ContextKeyExpr } from '../../../platform/contextkey/common/contextkey.js';
+import { IWorkbenchEnvironmentService } from '../../services/environment/common/environmentService.js';
+import { IWorkspacesService } from '../../../platform/workspaces/common/workspaces.js';
+import { KeybindingWeight } from '../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IsMacNativeContext } from '../../../platform/contextkey/common/contextkeys.js';
+import { ILocalizedString } from '../../../platform/action/common/action.js';
+import { Categories } from '../../../platform/action/common/actionCommonCategories.js';
 
 const workspacesCategory: ILocalizedString = localize2('workspaces', 'Workspaces');
 
diff --git a/src/vs/workbench/browser/actions/workspaceCommands.ts b/src/vs/workbench/browser/actions/workspaceCommands.ts
index 2ce4f6003b9..5d45d2f2cfa 100644
--- a/src/vs/workbench/browser/actions/workspaceCommands.ts
+++ b/src/vs/workbench/browser/actions/workspaceCommands.ts
@@ -3,27 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize, localize2 } from 'vs/nls';
-import { hasWorkspaceFileExtension, IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IWorkspaceEditingService } from 'vs/workbench/services/workspaces/common/workspaceEditing';
-import { dirname } from 'vs/base/common/resources';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { mnemonicButtonLabel } from 'vs/base/common/labels';
-import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
-import { FileKind } from 'vs/platform/files/common/files';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { IQuickInputService, IPickOptions, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { getIconClasses } from 'vs/editor/common/services/getIconClasses';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IFileDialogService, IPickAndOpenOptions } from 'vs/platform/dialogs/common/dialogs';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { Schemas } from 'vs/base/common/network';
-import { IOpenEmptyWindowOptions, IOpenWindowOptions, IWindowOpenable } from 'vs/platform/window/common/window';
-import { IRecent, IWorkspacesService } from 'vs/platform/workspaces/common/workspaces';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { ILocalizedString } from 'vs/platform/action/common/action';
+import { localize, localize2 } from '../../../nls.js';
+import { hasWorkspaceFileExtension, IWorkspaceContextService } from '../../../platform/workspace/common/workspace.js';
+import { IWorkspaceEditingService } from '../../services/workspaces/common/workspaceEditing.js';
+import { dirname } from '../../../base/common/resources.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { mnemonicButtonLabel } from '../../../base/common/labels.js';
+import { CommandsRegistry, ICommandService } from '../../../platform/commands/common/commands.js';
+import { FileKind } from '../../../platform/files/common/files.js';
+import { ServicesAccessor } from '../../../platform/instantiation/common/instantiation.js';
+import { ILabelService } from '../../../platform/label/common/label.js';
+import { IQuickInputService, IPickOptions, IQuickPickItem } from '../../../platform/quickinput/common/quickInput.js';
+import { getIconClasses } from '../../../editor/common/services/getIconClasses.js';
+import { IModelService } from '../../../editor/common/services/model.js';
+import { ILanguageService } from '../../../editor/common/languages/language.js';
+import { IFileDialogService, IPickAndOpenOptions } from '../../../platform/dialogs/common/dialogs.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { Schemas } from '../../../base/common/network.js';
+import { IOpenEmptyWindowOptions, IOpenWindowOptions, IWindowOpenable } from '../../../platform/window/common/window.js';
+import { IRecent, IWorkspacesService } from '../../../platform/workspaces/common/workspaces.js';
+import { IPathService } from '../../services/path/common/pathService.js';
+import { ILocalizedString } from '../../../platform/action/common/action.js';
 
 export const ADD_ROOT_FOLDER_COMMAND_ID = 'addRootFolder';
 export const ADD_ROOT_FOLDER_LABEL: ILocalizedString = localize2('addFolderToWorkspace', 'Add Folder to Workspace...');
@@ -263,7 +263,7 @@ CommandsRegistry.registerCommand('_workbench.removeFromRecentlyOpened', function
 
 CommandsRegistry.registerCommand({
 	id: 'vscode.removeFromRecentlyOpened',
-	handler: (accessor: ServicesAccessor, path: string | URI): Promise<any> => {
+	handler: (accessor: ServicesAccessor, path: string | URI): Promise<void> => {
 		const workspacesService = accessor.get(IWorkspacesService);
 
 		if (typeof path === 'string') {
diff --git a/src/vs/workbench/browser/codeeditor.ts b/src/vs/workbench/browser/codeeditor.ts
index dcce3224ba9..437e01b37a6 100644
--- a/src/vs/workbench/browser/codeeditor.ts
+++ b/src/vs/workbench/browser/codeeditor.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IAction } from 'vs/base/common/actions';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { isEqual } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, OverlayWidgetPositionPreference, isCodeEditor, isCompositeEditor } from 'vs/editor/browser/editorBrowser';
-import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { IRange } from 'vs/editor/common/core/range';
-import { CursorChangeReason, ICursorPositionChangedEvent } from 'vs/editor/common/cursorEvents';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { IModelDecorationsChangeAccessor, TrackedRangeStickiness } from 'vs/editor/common/model';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { AbstractFloatingClickMenu, FloatingClickWidget } from 'vs/platform/actions/browser/floatingMenu';
-import { IMenuService, MenuId } from 'vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IAction } from '../../base/common/actions.js';
+import { Emitter } from '../../base/common/event.js';
+import { Disposable, DisposableStore } from '../../base/common/lifecycle.js';
+import { isEqual } from '../../base/common/resources.js';
+import { URI } from '../../base/common/uri.js';
+import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, OverlayWidgetPositionPreference, isCodeEditor, isCompositeEditor } from '../../editor/browser/editorBrowser.js';
+import { EmbeddedCodeEditorWidget } from '../../editor/browser/widget/codeEditor/embeddedCodeEditorWidget.js';
+import { EditorOption } from '../../editor/common/config/editorOptions.js';
+import { IRange } from '../../editor/common/core/range.js';
+import { CursorChangeReason, ICursorPositionChangedEvent } from '../../editor/common/cursorEvents.js';
+import { IEditorContribution } from '../../editor/common/editorCommon.js';
+import { IModelDecorationsChangeAccessor, TrackedRangeStickiness } from '../../editor/common/model.js';
+import { ModelDecorationOptions } from '../../editor/common/model/textModel.js';
+import { AbstractFloatingClickMenu, FloatingClickWidget } from '../../platform/actions/browser/floatingMenu.js';
+import { IMenuService, MenuId } from '../../platform/actions/common/actions.js';
+import { IContextKeyService } from '../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../platform/keybinding/common/keybinding.js';
+import { IEditorService } from '../services/editor/common/editorService.js';
 
 export interface IRangeHighlightDecoration {
 	resource: URI;
diff --git a/src/vs/workbench/browser/composite.ts b/src/vs/workbench/browser/composite.ts
index d56a31212ed..8be1325c257 100644
--- a/src/vs/workbench/browser/composite.ts
+++ b/src/vs/workbench/browser/composite.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IAction, IActionRunner, ActionRunner } from 'vs/base/common/actions';
-import { Component } from 'vs/workbench/common/component';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IComposite, ICompositeControl } from 'vs/workbench/common/composite';
-import { Event, Emitter } from 'vs/base/common/event';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IConstructorSignature, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { trackFocus, Dimension, IDomPosition } from 'vs/base/browser/dom';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { assertIsDefined } from 'vs/base/common/types';
-import { IActionViewItem } from 'vs/base/browser/ui/actionbar/actionbar';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { IBoundarySashes } from 'vs/base/browser/ui/sash/sash';
-import { IBaseActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
+import { IAction, IActionRunner, ActionRunner } from '../../base/common/actions.js';
+import { Component } from '../common/component.js';
+import { ITelemetryService } from '../../platform/telemetry/common/telemetry.js';
+import { IComposite, ICompositeControl } from '../common/composite.js';
+import { Event, Emitter } from '../../base/common/event.js';
+import { IThemeService } from '../../platform/theme/common/themeService.js';
+import { IConstructorSignature, IInstantiationService } from '../../platform/instantiation/common/instantiation.js';
+import { trackFocus, Dimension, IDomPosition } from '../../base/browser/dom.js';
+import { IStorageService } from '../../platform/storage/common/storage.js';
+import { Disposable } from '../../base/common/lifecycle.js';
+import { assertIsDefined } from '../../base/common/types.js';
+import { IActionViewItem } from '../../base/browser/ui/actionbar/actionbar.js';
+import { MenuId } from '../../platform/actions/common/actions.js';
+import { IBoundarySashes } from '../../base/browser/ui/sash/sash.js';
+import { IBaseActionViewItemOptions } from '../../base/browser/ui/actionbar/actionViewItems.js';
 
 /**
  * Composites are layed out in the sidebar and panel part of the workbench. At a time only one composite
diff --git a/src/vs/workbench/browser/contextkeys.ts b/src/vs/workbench/browser/contextkeys.ts
index c22caa967b3..e5192e1dd69 100644
--- a/src/vs/workbench/browser/contextkeys.ts
+++ b/src/vs/workbench/browser/contextkeys.ts
@@ -3,28 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IContextKeyService, IContextKey, setConstant as setConstantContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { InputFocusedContext, IsMacContext, IsLinuxContext, IsWindowsContext, IsWebContext, IsMacNativeContext, IsDevelopmentContext, IsIOSContext, ProductQualityContext, IsMobileContext } from 'vs/platform/contextkey/common/contextkeys';
-import { SplitEditorsVertically, InEditorZenModeContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsMainEditorCenteredLayoutContext, MainEditorAreaVisibleContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, TitleBarVisibleContext, TitleBarStyleContext, IsAuxiliaryWindowFocusedContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, MultipleEditorGroupsContext, EditorsVisibleContext } from 'vs/workbench/common/contextkeys';
-import { trackFocus, addDisposableListener, EventType, onDidRegisterWindow, getActiveWindow } from 'vs/base/browser/dom';
-import { preferredSideBySideGroupDirection, GroupDirection, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { WorkbenchState, IWorkspaceContextService, isTemporaryWorkspace } from 'vs/platform/workspace/common/workspace';
-import { IWorkbenchLayoutService, Parts, positionToString } from 'vs/workbench/services/layout/browser/layoutService';
-import { getRemoteName } from 'vs/platform/remote/common/remoteHosts';
-import { getVirtualWorkspaceScheme } from 'vs/platform/workspace/common/virtualWorkspace';
-import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
-import { isNative } from 'vs/base/common/platform';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { WebFileSystemAccess } from 'vs/platform/files/browser/webFileSystemAccess';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { getTitleBarStyle } from 'vs/platform/window/common/window';
-import { mainWindow } from 'vs/base/browser/window';
-import { isFullscreen, onDidChangeFullscreen } from 'vs/base/browser/browser';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { Event } from '../../base/common/event.js';
+import { Disposable } from '../../base/common/lifecycle.js';
+import { IContextKeyService, IContextKey, setConstant as setConstantContextKey } from '../../platform/contextkey/common/contextkey.js';
+import { InputFocusedContext, IsMacContext, IsLinuxContext, IsWindowsContext, IsWebContext, IsMacNativeContext, IsDevelopmentContext, IsIOSContext, ProductQualityContext, IsMobileContext } from '../../platform/contextkey/common/contextkeys.js';
+import { SplitEditorsVertically, InEditorZenModeContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsMainEditorCenteredLayoutContext, MainEditorAreaVisibleContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, TitleBarVisibleContext, TitleBarStyleContext, IsAuxiliaryWindowFocusedContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, MultipleEditorGroupsContext, EditorsVisibleContext } from '../common/contextkeys.js';
+import { trackFocus, addDisposableListener, EventType, onDidRegisterWindow, getActiveWindow, isEditableElement } from '../../base/browser/dom.js';
+import { preferredSideBySideGroupDirection, GroupDirection, IEditorGroupsService } from '../services/editor/common/editorGroupsService.js';
+import { IConfigurationService } from '../../platform/configuration/common/configuration.js';
+import { IWorkbenchEnvironmentService } from '../services/environment/common/environmentService.js';
+import { WorkbenchState, IWorkspaceContextService, isTemporaryWorkspace } from '../../platform/workspace/common/workspace.js';
+import { IWorkbenchLayoutService, Parts, positionToString } from '../services/layout/browser/layoutService.js';
+import { getRemoteName } from '../../platform/remote/common/remoteHosts.js';
+import { getVirtualWorkspaceScheme } from '../../platform/workspace/common/virtualWorkspace.js';
+import { IWorkingCopyService } from '../services/workingCopy/common/workingCopyService.js';
+import { isNative } from '../../base/common/platform.js';
+import { IPaneCompositePartService } from '../services/panecomposite/browser/panecomposite.js';
+import { WebFileSystemAccess } from '../../platform/files/browser/webFileSystemAccess.js';
+import { IProductService } from '../../platform/product/common/productService.js';
+import { getTitleBarStyle } from '../../platform/window/common/window.js';
+import { mainWindow } from '../../base/browser/window.js';
+import { isFullscreen, onDidChangeFullscreen } from '../../base/browser/browser.js';
+import { IEditorService } from '../services/editor/common/editorService.js';
 
 export class WorkbenchContextKeysHandler extends Disposable {
 	private inputFocusedContext: IContextKey<boolean>;
@@ -203,17 +203,16 @@ export class WorkbenchContextKeysHandler extends Disposable {
 	private registerListeners(): void {
 		this.editorGroupService.whenReady.then(() => {
 			this.updateEditorAreaContextKeys();
-			this.updateEditorGroupContextKeys();
+			this.updateActiveEditorGroupContextKeys();
 			this.updateVisiblePanesContextKeys();
 		});
 
-		this._register(this.editorService.onDidActiveEditorChange(() => this.updateEditorGroupContextKeys()));
+		this._register(this.editorService.onDidActiveEditorChange(() => this.updateActiveEditorGroupContextKeys()));
 		this._register(this.editorService.onDidVisibleEditorsChange(() => this.updateVisiblePanesContextKeys()));
-		this._register(this.editorGroupService.onDidAddGroup(() => this.updateEditorGroupContextKeys()));
-		this._register(this.editorGroupService.onDidRemoveGroup(() => this.updateEditorGroupContextKeys()));
-		this._register(this.editorGroupService.onDidChangeGroupIndex(() => this.updateEditorGroupContextKeys()));
-		this._register(this.editorGroupService.onDidChangeActiveGroup(() => this.updateEditorGroupsContextKeys()));
-		this._register(this.editorGroupService.onDidChangeGroupLocked(() => this.updateEditorGroupsContextKeys()));
+		this._register(this.editorGroupService.onDidAddGroup(() => this.updateEditorGroupsContextKeys()));
+		this._register(this.editorGroupService.onDidRemoveGroup(() => this.updateEditorGroupsContextKeys()));
+		this._register(this.editorGroupService.onDidChangeGroupIndex(() => this.updateActiveEditorGroupContextKeys()));
+		this._register(this.editorGroupService.onDidChangeGroupLocked(() => this.updateActiveEditorGroupContextKeys()));
 
 		this._register(this.editorGroupService.onDidChangeEditorPartOptions(() => this.updateEditorAreaContextKeys()));
 
@@ -266,15 +265,22 @@ export class WorkbenchContextKeysHandler extends Disposable {
 		}
 	}
 
-	private updateEditorGroupContextKeys(): void {
+	// Context keys depending on the state of the editor group itself
+	private updateActiveEditorGroupContextKeys(): void {
 		if (!this.editorService.activeEditor) {
 			this.activeEditorGroupEmpty.set(true);
 		} else {
 			this.activeEditorGroupEmpty.reset();
 		}
+
+		const activeGroup = this.editorGroupService.activeGroup;
+		this.activeEditorGroupIndex.set(activeGroup.index + 1); // not zero-indexed
+		this.activeEditorGroupLocked.set(activeGroup.isLocked);
+
 		this.updateEditorGroupsContextKeys();
 	}
 
+	// Context keys depending on the state of other editor groups
 	private updateEditorGroupsContextKeys(): void {
 		const groupCount = this.editorGroupService.count;
 		if (groupCount > 1) {
@@ -284,9 +290,7 @@ export class WorkbenchContextKeysHandler extends Disposable {
 		}
 
 		const activeGroup = this.editorGroupService.activeGroup;
-		this.activeEditorGroupIndex.set(activeGroup.index + 1); // not zero-indexed
 		this.activeEditorGroupLast.set(activeGroup.index === groupCount - 1);
-		this.activeEditorGroupLocked.set(activeGroup.isLocked);
 	}
 
 	private updateEditorAreaContextKeys(): void {
@@ -296,7 +300,7 @@ export class WorkbenchContextKeysHandler extends Disposable {
 	private updateInputContextKeys(ownerDocument: Document): void {
 
 		function activeElementIsInput(): boolean {
-			return !!ownerDocument.activeElement && (ownerDocument.activeElement.tagName === 'INPUT' || ownerDocument.activeElement.tagName === 'TEXTAREA');
+			return !!ownerDocument.activeElement && isEditableElement(ownerDocument.activeElement);
 		}
 
 		const isInputFocused = activeElementIsInput();
diff --git a/src/vs/workbench/browser/dnd.ts b/src/vs/workbench/browser/dnd.ts
index 3fa36301d9c..21db5428096 100644
--- a/src/vs/workbench/browser/dnd.ts
+++ b/src/vs/workbench/browser/dnd.ts
@@ -3,40 +3,40 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DataTransfers, IDragAndDropData } from 'vs/base/browser/dnd';
-import { DragAndDropObserver, EventType, addDisposableListener, onDidRegisterWindow } from 'vs/base/browser/dom';
-import { DragMouseEvent } from 'vs/base/browser/mouseEvent';
-import { IListDragAndDrop } from 'vs/base/browser/ui/list/list';
-import { ElementsDragAndDropData, ListViewTargetSector } from 'vs/base/browser/ui/list/listView';
-import { ITreeDragOverReaction } from 'vs/base/browser/ui/tree/tree';
-import { coalesce } from 'vs/base/common/arrays';
-import { UriList, VSDataTransfer } from 'vs/base/common/dataTransfer';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore, IDisposable, markAsSingleton } from 'vs/base/common/lifecycle';
-import { stringify } from 'vs/base/common/marshalling';
-import { Mimes } from 'vs/base/common/mime';
-import { FileAccess, Schemas } from 'vs/base/common/network';
-import { isWindows } from 'vs/base/common/platform';
-import { basename, isEqual } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { CodeDataTransfers, Extensions, IDragAndDropContributionRegistry, IDraggedResourceEditorInput, IResourceStat, LocalSelectionTransfer, createDraggedEditorInputFromRawResourcesData, extractEditorsAndFilesDropData } from 'vs/platform/dnd/browser/dnd';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { extractSelection } from 'vs/platform/opener/common/opener';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IWindowOpenable } from 'vs/platform/window/common/window';
-import { IWorkspaceContextService, hasWorkspaceFileExtension, isTemporaryWorkspace } from 'vs/platform/workspace/common/workspace';
-import { IWorkspaceFolderCreationData, IWorkspacesService } from 'vs/platform/workspaces/common/workspaces';
-import { EditorResourceAccessor, GroupIdentifier, IEditorIdentifier, isEditorIdentifier, isResourceDiffEditorInput, isResourceMergeEditorInput, isResourceSideBySideEditorInput } from 'vs/workbench/common/editor';
-import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { IWorkspaceEditingService } from 'vs/workbench/services/workspaces/common/workspaceEditing';
-import { IEditorOptions } from 'vs/platform/editor/common/editor';
-import { mainWindow } from 'vs/base/browser/window';
-import { BroadcastDataChannel } from 'vs/base/browser/broadcast';
+import { DataTransfers, IDragAndDropData } from '../../base/browser/dnd.js';
+import { DragAndDropObserver, EventType, addDisposableListener, onDidRegisterWindow } from '../../base/browser/dom.js';
+import { DragMouseEvent } from '../../base/browser/mouseEvent.js';
+import { IListDragAndDrop } from '../../base/browser/ui/list/list.js';
+import { ElementsDragAndDropData, ListViewTargetSector } from '../../base/browser/ui/list/listView.js';
+import { ITreeDragOverReaction } from '../../base/browser/ui/tree/tree.js';
+import { coalesce } from '../../base/common/arrays.js';
+import { UriList, VSDataTransfer } from '../../base/common/dataTransfer.js';
+import { Emitter, Event } from '../../base/common/event.js';
+import { Disposable, DisposableStore, IDisposable, markAsSingleton } from '../../base/common/lifecycle.js';
+import { stringify } from '../../base/common/marshalling.js';
+import { Mimes } from '../../base/common/mime.js';
+import { FileAccess, Schemas } from '../../base/common/network.js';
+import { isWindows } from '../../base/common/platform.js';
+import { basename, isEqual } from '../../base/common/resources.js';
+import { URI } from '../../base/common/uri.js';
+import { CodeDataTransfers, Extensions, IDragAndDropContributionRegistry, IDraggedResourceEditorInput, IResourceStat, LocalSelectionTransfer, createDraggedEditorInputFromRawResourcesData, extractEditorsAndFilesDropData } from '../../platform/dnd/browser/dnd.js';
+import { IFileService } from '../../platform/files/common/files.js';
+import { IInstantiationService, ServicesAccessor } from '../../platform/instantiation/common/instantiation.js';
+import { ILabelService } from '../../platform/label/common/label.js';
+import { extractSelection } from '../../platform/opener/common/opener.js';
+import { Registry } from '../../platform/registry/common/platform.js';
+import { IWindowOpenable } from '../../platform/window/common/window.js';
+import { IWorkspaceContextService, hasWorkspaceFileExtension, isTemporaryWorkspace } from '../../platform/workspace/common/workspace.js';
+import { IWorkspaceFolderCreationData, IWorkspacesService } from '../../platform/workspaces/common/workspaces.js';
+import { EditorResourceAccessor, GroupIdentifier, IEditorIdentifier, isEditorIdentifier, isResourceDiffEditorInput, isResourceMergeEditorInput, isResourceSideBySideEditorInput } from '../common/editor.js';
+import { IEditorGroup } from '../services/editor/common/editorGroupsService.js';
+import { IEditorService } from '../services/editor/common/editorService.js';
+import { IHostService } from '../services/host/browser/host.js';
+import { ITextFileService } from '../services/textfile/common/textfiles.js';
+import { IWorkspaceEditingService } from '../services/workspaces/common/workspaceEditing.js';
+import { IEditorOptions } from '../../platform/editor/common/editor.js';
+import { mainWindow } from '../../base/browser/window.js';
+import { BroadcastDataChannel } from '../../base/browser/broadcast.js';
 
 //#region Editor / Resources DND
 
diff --git a/src/vs/workbench/browser/editor.ts b/src/vs/workbench/browser/editor.ts
index d5e1a7f3391..0bfa0e3285d 100644
--- a/src/vs/workbench/browser/editor.ts
+++ b/src/vs/workbench/browser/editor.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { EditorResourceAccessor, EditorExtensions, SideBySideEditor, IEditorDescriptor as ICommonEditorDescriptor, EditorCloseContext, IWillInstantiateEditorPaneEvent } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
-import { IConstructorSignature, IInstantiationService, BrandedService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { Promises } from 'vs/base/common/async';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
-import { URI } from 'vs/base/common/uri';
-import { Schemas } from 'vs/base/common/network';
-import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { Iterable } from 'vs/base/common/iterator';
-import { Emitter } from 'vs/base/common/event';
+import { localize } from '../../nls.js';
+import { EditorResourceAccessor, EditorExtensions, SideBySideEditor, IEditorDescriptor as ICommonEditorDescriptor, EditorCloseContext, IWillInstantiateEditorPaneEvent } from '../common/editor.js';
+import { EditorInput } from '../common/editor/editorInput.js';
+import { SyncDescriptor } from '../../platform/instantiation/common/descriptors.js';
+import { Registry } from '../../platform/registry/common/platform.js';
+import { EditorPane } from './parts/editor/editorPane.js';
+import { IConstructorSignature, IInstantiationService, BrandedService, ServicesAccessor } from '../../platform/instantiation/common/instantiation.js';
+import { IDisposable, toDisposable } from '../../base/common/lifecycle.js';
+import { Promises } from '../../base/common/async.js';
+import { IEditorService } from '../services/editor/common/editorService.js';
+import { IUriIdentityService } from '../../platform/uriIdentity/common/uriIdentity.js';
+import { IWorkingCopyService } from '../services/workingCopy/common/workingCopyService.js';
+import { URI } from '../../base/common/uri.js';
+import { Schemas } from '../../base/common/network.js';
+import { IEditorGroup } from '../services/editor/common/editorGroupsService.js';
+import { Iterable } from '../../base/common/iterator.js';
+import { Emitter } from '../../base/common/event.js';
 
 //#region Editor Pane Registry
 
diff --git a/src/vs/workbench/browser/labels.ts b/src/vs/workbench/browser/labels.ts
index 0c9fc4e9e54..f83bdc050b8 100644
--- a/src/vs/workbench/browser/labels.ts
+++ b/src/vs/workbench/browser/labels.ts
@@ -3,29 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { URI } from 'vs/base/common/uri';
-import { dirname, isEqual, basenameOrAuthority } from 'vs/base/common/resources';
-import { IconLabel, IIconLabelValueOptions, IIconLabelCreationOptions } from 'vs/base/browser/ui/iconLabel/iconLabel';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { IDecoration, IDecorationsService, IResourceDecorationChangeEvent } from 'vs/workbench/services/decorations/common/decorations';
-import { Schemas } from 'vs/base/common/network';
-import { FileKind, FILES_ASSOCIATIONS_CONFIG } from 'vs/platform/files/common/files';
-import { ITextModel } from 'vs/editor/common/model';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { Event, Emitter } from 'vs/base/common/event';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { getIconClasses } from 'vs/editor/common/services/getIconClasses';
-import { Disposable, dispose, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { normalizeDriveLetter } from 'vs/base/common/labels';
-import { IRange } from 'vs/editor/common/core/range';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { INotebookDocumentService } from 'vs/workbench/services/notebook/common/notebookDocumentService';
+import { localize } from '../../nls.js';
+import { URI } from '../../base/common/uri.js';
+import { dirname, isEqual, basenameOrAuthority } from '../../base/common/resources.js';
+import { IconLabel, IIconLabelValueOptions, IIconLabelCreationOptions } from '../../base/browser/ui/iconLabel/iconLabel.js';
+import { ILanguageService } from '../../editor/common/languages/language.js';
+import { IWorkspaceContextService } from '../../platform/workspace/common/workspace.js';
+import { IConfigurationService } from '../../platform/configuration/common/configuration.js';
+import { IModelService } from '../../editor/common/services/model.js';
+import { ITextFileService } from '../services/textfile/common/textfiles.js';
+import { IDecoration, IDecorationsService, IResourceDecorationChangeEvent } from '../services/decorations/common/decorations.js';
+import { Schemas } from '../../base/common/network.js';
+import { FileKind, FILES_ASSOCIATIONS_CONFIG } from '../../platform/files/common/files.js';
+import { ITextModel } from '../../editor/common/model.js';
+import { IThemeService } from '../../platform/theme/common/themeService.js';
+import { Event, Emitter } from '../../base/common/event.js';
+import { ILabelService } from '../../platform/label/common/label.js';
+import { getIconClasses } from '../../editor/common/services/getIconClasses.js';
+import { Disposable, dispose, IDisposable, MutableDisposable } from '../../base/common/lifecycle.js';
+import { IInstantiationService } from '../../platform/instantiation/common/instantiation.js';
+import { normalizeDriveLetter } from '../../base/common/labels.js';
+import { IRange } from '../../editor/common/core/range.js';
+import { ThemeIcon } from '../../base/common/themables.js';
+import { INotebookDocumentService } from '../services/notebook/common/notebookDocumentService.js';
 
 export interface IResourceLabelProps {
 	resource?: URI | { primary?: URI; secondary?: URI };
diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts
index 19488429dc7..7290a2f7076 100644
--- a/src/vs/workbench/browser/layout.ts
+++ b/src/vs/workbench/browser/layout.ts
@@ -3,52 +3,51 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, DisposableMap, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { Event, Emitter } from 'vs/base/common/event';
-import { EventType, addDisposableListener, getClientArea, position, size, IDimension, isAncestorUsingFlowTo, computeScreenAwareSize, getActiveDocument, getWindows, getActiveWindow, isActiveDocument, getWindow, getWindowId, getActiveElement } from 'vs/base/browser/dom';
-import { onDidChangeFullscreen, isFullscreen, isWCOEnabled } from 'vs/base/browser/browser';
-import { IWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackup';
-import { isWindows, isLinux, isMacintosh, isWeb, isIOS } from 'vs/base/common/platform';
-import { EditorInputCapabilities, GroupIdentifier, isResourceEditorInput, IUntypedEditorInput, pathsToEditors } from 'vs/workbench/common/editor';
-import { SidebarPart } from 'vs/workbench/browser/parts/sidebar/sidebarPart';
-import { PanelPart } from 'vs/workbench/browser/parts/panel/panelPart';
-import { Position, Parts, PanelOpensMaximizedOptions, IWorkbenchLayoutService, positionFromString, positionToString, panelOpensMaximizedFromString, PanelAlignment, ActivityBarPosition, LayoutSettings, MULTI_WINDOW_PARTS, SINGLE_WINDOW_PARTS, ZenModeSettings, EditorTabsMode, EditorActionsLocation, shouldShowCustomTitleBar } from 'vs/workbench/services/layout/browser/layoutService';
-import { isTemporaryWorkspace, IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IConfigurationChangeEvent, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ITitleService } from 'vs/workbench/services/title/browser/titleService';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { StartupKind, ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { getMenuBarVisibility, IPath, hasNativeTitlebar, hasCustomTitlebar, TitleBarSetting } from 'vs/platform/window/common/window';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { EditorGroupLayout, GroupsOrder, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { SerializableGrid, ISerializableView, ISerializedGrid, Orientation, ISerializedNode, ISerializedLeafNode, Direction, IViewSize, Sizing } from 'vs/base/browser/ui/grid/grid';
-import { Part } from 'vs/workbench/browser/part';
-import { IStatusbarService } from 'vs/workbench/services/statusbar/browser/statusbar';
-import { IFileService } from 'vs/platform/files/common/files';
-import { isCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { coalesce } from 'vs/base/common/arrays';
-import { assertIsDefined } from 'vs/base/common/types';
-import { INotificationService, NotificationsFilter } from 'vs/platform/notification/common/notification';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { WINDOW_ACTIVE_BORDER, WINDOW_INACTIVE_BORDER } from 'vs/workbench/common/theme';
-import { LineNumbersType } from 'vs/editor/common/config/editorOptions';
-import { URI } from 'vs/base/common/uri';
-import { IViewDescriptorService, ViewContainerLocation } from 'vs/workbench/common/views';
-import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
-import { mark } from 'vs/base/common/performance';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { ILogService } from 'vs/platform/log/common/log';
-import { DeferredPromise, Promises } from 'vs/base/common/async';
-import { IBannerService } from 'vs/workbench/services/banner/browser/bannerService';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { AuxiliaryBarPart } from 'vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IAuxiliaryWindowService } from 'vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService';
-import { CodeWindow, mainWindow } from 'vs/base/browser/window';
-import { CustomTitleBarVisibility } from '../../platform/window/common/window';
+import { Disposable, DisposableMap, DisposableStore, IDisposable, toDisposable } from '../../base/common/lifecycle.js';
+import { Event, Emitter } from '../../base/common/event.js';
+import { EventType, addDisposableListener, getClientArea, position, size, IDimension, isAncestorUsingFlowTo, computeScreenAwareSize, getActiveDocument, getWindows, getActiveWindow, isActiveDocument, getWindow, getWindowId, getActiveElement } from '../../base/browser/dom.js';
+import { onDidChangeFullscreen, isFullscreen, isWCOEnabled } from '../../base/browser/browser.js';
+import { IWorkingCopyBackupService } from '../services/workingCopy/common/workingCopyBackup.js';
+import { isWindows, isLinux, isMacintosh, isWeb, isIOS } from '../../base/common/platform.js';
+import { EditorInputCapabilities, GroupIdentifier, isResourceEditorInput, IUntypedEditorInput, pathsToEditors } from '../common/editor.js';
+import { SidebarPart } from './parts/sidebar/sidebarPart.js';
+import { PanelPart } from './parts/panel/panelPart.js';
+import { Position, Parts, PanelOpensMaximizedOptions, IWorkbenchLayoutService, positionFromString, positionToString, panelOpensMaximizedFromString, PanelAlignment, ActivityBarPosition, LayoutSettings, MULTI_WINDOW_PARTS, SINGLE_WINDOW_PARTS, ZenModeSettings, EditorTabsMode, EditorActionsLocation, shouldShowCustomTitleBar, isHorizontal } from '../services/layout/browser/layoutService.js';
+import { isTemporaryWorkspace, IWorkspaceContextService, WorkbenchState } from '../../platform/workspace/common/workspace.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../platform/storage/common/storage.js';
+import { IConfigurationChangeEvent, IConfigurationService } from '../../platform/configuration/common/configuration.js';
+import { ITitleService } from '../services/title/browser/titleService.js';
+import { ServicesAccessor } from '../../platform/instantiation/common/instantiation.js';
+import { StartupKind, ILifecycleService } from '../services/lifecycle/common/lifecycle.js';
+import { getMenuBarVisibility, IPath, hasNativeTitlebar, hasCustomTitlebar, TitleBarSetting, CustomTitleBarVisibility, useWindowControlsOverlay } from '../../platform/window/common/window.js';
+import { IHostService } from '../services/host/browser/host.js';
+import { IBrowserWorkbenchEnvironmentService } from '../services/environment/browser/environmentService.js';
+import { IEditorService } from '../services/editor/common/editorService.js';
+import { EditorGroupLayout, GroupsOrder, IEditorGroupsService } from '../services/editor/common/editorGroupsService.js';
+import { SerializableGrid, ISerializableView, ISerializedGrid, Orientation, ISerializedNode, ISerializedLeafNode, Direction, IViewSize, Sizing } from '../../base/browser/ui/grid/grid.js';
+import { Part } from './part.js';
+import { IStatusbarService } from '../services/statusbar/browser/statusbar.js';
+import { IFileService } from '../../platform/files/common/files.js';
+import { isCodeEditor } from '../../editor/browser/editorBrowser.js';
+import { coalesce } from '../../base/common/arrays.js';
+import { assertIsDefined } from '../../base/common/types.js';
+import { INotificationService, NotificationsFilter } from '../../platform/notification/common/notification.js';
+import { IThemeService } from '../../platform/theme/common/themeService.js';
+import { WINDOW_ACTIVE_BORDER, WINDOW_INACTIVE_BORDER } from '../common/theme.js';
+import { LineNumbersType } from '../../editor/common/config/editorOptions.js';
+import { URI } from '../../base/common/uri.js';
+import { IViewDescriptorService, ViewContainerLocation } from '../common/views.js';
+import { DiffEditorInput } from '../common/editor/diffEditorInput.js';
+import { mark } from '../../base/common/performance.js';
+import { IExtensionService } from '../services/extensions/common/extensions.js';
+import { ILogService } from '../../platform/log/common/log.js';
+import { DeferredPromise, Promises } from '../../base/common/async.js';
+import { IBannerService } from '../services/banner/browser/bannerService.js';
+import { IPaneCompositePartService } from '../services/panecomposite/browser/panecomposite.js';
+import { AuxiliaryBarPart } from './parts/auxiliarybar/auxiliaryBarPart.js';
+import { ITelemetryService } from '../../platform/telemetry/common/telemetry.js';
+import { IAuxiliaryWindowService } from '../services/auxiliaryWindow/browser/auxiliaryWindowService.js';
+import { CodeWindow, mainWindow } from '../../base/browser/window.js';
 
 //#region Layout Implementation
 
@@ -560,7 +559,8 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 	private updateWindowsBorder(skipLayout = false) {
 		if (
 			isWeb ||
-			isWindows || // not working well with zooming and window control overlays
+			isWindows || 											// not working well with zooming (border often not visible)
+			useWindowControlsOverlay(this.configurationService) || 	// not working with WCO (border cannot draw over the overlay)
 			hasNativeTitlebar(this.configurationService)
 		) {
 			return;
@@ -635,7 +635,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 		// Layout Initialization State
 		const initialEditorsState = this.getInitialEditorsState();
 		if (initialEditorsState) {
-			this.logService.info('Initial editor state', initialEditorsState);
+			this.logService.trace('Initial editor state', initialEditorsState);
 		}
 		const initialLayoutState: ILayoutInitializationState = {
 			layout: {
@@ -671,12 +671,19 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 			runtime: layoutRuntimeState,
 		};
 
+		const isNewWindow = lifecycleService.startupKind === StartupKind.NewWindow;
+		const activityBarNotDefault = this.configurationService.getValue<ActivityBarPosition>(LayoutSettings.ACTIVITY_BAR_LOCATION) !== ActivityBarPosition.DEFAULT;
+
 		// Sidebar View Container To Restore
 		if (this.isVisible(Parts.SIDEBAR_PART)) {
 
 			// Only restore last viewlet if window was reloaded or we are in development mode
 			let viewContainerToRestore: string | undefined;
-			if (!this.environmentService.isBuilt || lifecycleService.startupKind === StartupKind.ReloadedWindow) {
+			if (
+				!this.environmentService.isBuilt ||
+				lifecycleService.startupKind === StartupKind.ReloadedWindow ||
+				this.environmentService.isExtensionDevelopment && !this.environmentService.extensionTestsLocationURI
+			) {
 				viewContainerToRestore = this.storageService.get(SidebarPart.activeViewletSettingsKey, StorageScope.WORKSPACE, this.viewDescriptorService.getDefaultViewContainer(ViewContainerLocation.Sidebar)?.id);
 			} else {
 				viewContainerToRestore = this.viewDescriptorService.getDefaultViewContainer(ViewContainerLocation.Sidebar)?.id;
@@ -688,6 +695,15 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 				this.stateModel.setRuntimeValue(LayoutStateKeys.SIDEBAR_HIDDEN, true);
 			}
 		}
+		// Side bar is hidden and a new window is opened with activity bar not visible (not default)
+		else if (isNewWindow && activityBarNotDefault) {
+			// Open side bar if there is a view container to restore
+			const viewContainerToRestore = this.storageService.get(SidebarPart.activeViewletSettingsKey, StorageScope.WORKSPACE, this.viewDescriptorService.getDefaultViewContainer(ViewContainerLocation.Sidebar)?.id);
+			if (viewContainerToRestore) {
+				this.state.initialization.views.containerToRestore.sideBar = viewContainerToRestore;
+				this.stateModel.setRuntimeValue(LayoutStateKeys.SIDEBAR_HIDDEN, false);
+			}
+		}
 
 		// Panel View Container To Restore
 		if (this.isVisible(Parts.PANEL_PART)) {
@@ -1262,18 +1278,17 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 		const containerDimension = this.getContainerDimension(container);
 
 		if (container === this.mainContainer) {
-			const panelPosition = this.getPanelPosition();
-			const isColumn = panelPosition === Position.RIGHT || panelPosition === Position.LEFT;
+			const isPanelHorizontal = isHorizontal(this.getPanelPosition());
 			const takenWidth =
 				(this.isVisible(Parts.ACTIVITYBAR_PART) ? this.activityBarPartView.minimumWidth : 0) +
 				(this.isVisible(Parts.SIDEBAR_PART) ? this.sideBarPartView.minimumWidth : 0) +
-				(this.isVisible(Parts.PANEL_PART) && isColumn ? this.panelPartView.minimumWidth : 0) +
+				(this.isVisible(Parts.PANEL_PART) && !isPanelHorizontal ? this.panelPartView.minimumWidth : 0) +
 				(this.isVisible(Parts.AUXILIARYBAR_PART) ? this.auxiliaryBarPartView.minimumWidth : 0);
 
 			const takenHeight =
 				(this.isVisible(Parts.TITLEBAR_PART, targetWindow) ? this.titleBarPartView.minimumHeight : 0) +
 				(this.isVisible(Parts.STATUSBAR_PART, targetWindow) ? this.statusBarPartView.minimumHeight : 0) +
-				(this.isVisible(Parts.PANEL_PART) && !isColumn ? this.panelPartView.minimumHeight : 0);
+				(this.isVisible(Parts.PANEL_PART) && isPanelHorizontal ? this.panelPartView.minimumHeight : 0);
 
 			const availableWidth = containerDimension.width - takenWidth;
 			const availableHeight = containerDimension.height - takenHeight;
@@ -1542,7 +1557,9 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 			// Panel Size
 			const panelSize = this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_HIDDEN)
 				? this.workbenchGrid.getViewCachedVisibleSize(this.panelPartView)
-				: (this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_POSITION) === Position.BOTTOM ? this.workbenchGrid.getViewSize(this.panelPartView).height : this.workbenchGrid.getViewSize(this.panelPartView).width);
+				: isHorizontal(this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_POSITION))
+					? this.workbenchGrid.getViewSize(this.panelPartView).height
+					: this.workbenchGrid.getViewSize(this.panelPartView).width;
 			this.stateModel.setInitializationValue(LayoutStateKeys.PANEL_SIZE, panelSize as number);
 
 			// Auxiliary Bar Size
@@ -1631,8 +1648,8 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 
 				this.workbenchGrid.resizeView(this.panelPartView,
 					{
-						width: viewSize.width + (this.getPanelPosition() !== Position.BOTTOM ? sizeChangePxWidth : 0),
-						height: viewSize.height + (this.getPanelPosition() !== Position.BOTTOM ? 0 : sizeChangePxHeight)
+						width: viewSize.width + (isHorizontal(this.getPanelPosition()) ? 0 : sizeChangePxWidth),
+						height: viewSize.height + (isHorizontal(this.getPanelPosition()) ? sizeChangePxHeight : 0)
 					});
 
 				break;
@@ -1766,8 +1783,9 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 	private adjustPartPositions(sideBarPosition: Position, panelAlignment: PanelAlignment, panelPosition: Position): void {
 
 		// Move activity bar and side bars
-		const sideBarSiblingToEditor = panelPosition !== Position.BOTTOM || !(panelAlignment === 'center' || (sideBarPosition === Position.LEFT && panelAlignment === 'right') || (sideBarPosition === Position.RIGHT && panelAlignment === 'left'));
-		const auxiliaryBarSiblingToEditor = panelPosition !== Position.BOTTOM || !(panelAlignment === 'center' || (sideBarPosition === Position.RIGHT && panelAlignment === 'right') || (sideBarPosition === Position.LEFT && panelAlignment === 'left'));
+		const isPanelVertical = !isHorizontal(panelPosition);
+		const sideBarSiblingToEditor = isPanelVertical || !(panelAlignment === 'center' || (sideBarPosition === Position.LEFT && panelAlignment === 'right') || (sideBarPosition === Position.RIGHT && panelAlignment === 'left'));
+		const auxiliaryBarSiblingToEditor = isPanelVertical || !(panelAlignment === 'center' || (sideBarPosition === Position.RIGHT && panelAlignment === 'right') || (sideBarPosition === Position.LEFT && panelAlignment === 'left'));
 		const preMovePanelWidth = !this.isVisible(Parts.PANEL_PART) ? Sizing.Invisible(this.workbenchGrid.getViewCachedVisibleSize(this.panelPartView) ?? this.panelPartView.minimumWidth) : this.workbenchGrid.getViewSize(this.panelPartView).width;
 		const preMovePanelHeight = !this.isVisible(Parts.PANEL_PART) ? Sizing.Invisible(this.workbenchGrid.getViewCachedVisibleSize(this.panelPartView) ?? this.panelPartView.minimumHeight) : this.workbenchGrid.getViewSize(this.panelPartView).height;
 		const preMoveSideBarSize = !this.isVisible(Parts.SIDEBAR_PART) ? Sizing.Invisible(this.workbenchGrid.getViewCachedVisibleSize(this.sideBarPartView) ?? this.sideBarPartView.minimumWidth) : this.workbenchGrid.getViewSize(this.sideBarPartView).width;
@@ -1793,7 +1811,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 
 		// We moved all the side parts based on the editor and ignored the panel
 		// Now, we need to put the panel back in the right position when it is next to the editor
-		if (panelPosition !== Position.BOTTOM) {
+		if (isPanelVertical) {
 			this.workbenchGrid.moveView(this.panelPartView, preMovePanelWidth, this.editorPartView, panelPosition === Position.LEFT ? Direction.Left : Direction.Right);
 			this.workbenchGrid.resizeView(this.panelPartView, {
 				height: preMovePanelHeight as number,
@@ -1820,8 +1838,8 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 
 	setPanelAlignment(alignment: PanelAlignment, skipLayout?: boolean): void {
 
-		// Panel alignment only applies to a panel in the bottom position
-		if (this.getPanelPosition() !== Position.BOTTOM) {
+		// Panel alignment only applies to a panel in the top/bottom position
+		if (!isHorizontal(this.getPanelPosition())) {
 			this.setPanelPosition(Position.BOTTOM);
 		}
 
@@ -1917,7 +1935,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 		const isMaximized = this.isPanelMaximized();
 		if (!isMaximized) {
 			if (this.isVisible(Parts.PANEL_PART)) {
-				if (panelPosition === Position.BOTTOM) {
+				if (isHorizontal(panelPosition)) {
 					this.stateModel.setRuntimeValue(LayoutStateKeys.PANEL_LAST_NON_MAXIMIZED_HEIGHT, size.height);
 				} else {
 					this.stateModel.setRuntimeValue(LayoutStateKeys.PANEL_LAST_NON_MAXIMIZED_WIDTH, size.width);
@@ -1928,8 +1946,8 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 		} else {
 			this.setEditorHidden(false);
 			this.workbenchGrid.resizeView(this.panelPartView, {
-				width: panelPosition === Position.BOTTOM ? size.width : this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_LAST_NON_MAXIMIZED_WIDTH),
-				height: panelPosition === Position.BOTTOM ? this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_LAST_NON_MAXIMIZED_HEIGHT) : size.height
+				width: isHorizontal(panelPosition) ? size.width : this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_LAST_NON_MAXIMIZED_WIDTH),
+				height: isHorizontal(panelPosition) ? this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_LAST_NON_MAXIMIZED_HEIGHT) : size.height
 			});
 		}
 
@@ -1939,7 +1957,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 	private panelOpensMaximized(): boolean {
 
 		// The workbench grid currently prevents us from supporting panel maximization with non-center panel alignment
-		if (this.getPanelAlignment() !== 'center' && this.getPanelPosition() === Position.BOTTOM) {
+		if (this.getPanelAlignment() !== 'center' && isHorizontal(this.getPanelPosition())) {
 			return false;
 		}
 
@@ -2017,7 +2035,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 	isPanelMaximized(): boolean {
 
 		// the workbench grid currently prevents us from supporting panel maximization with non-center panel alignment
-		return (this.getPanelAlignment() === 'center' || this.getPanelPosition() !== Position.BOTTOM) && !this.isVisible(Parts.EDITOR_PART, mainWindow);
+		return (this.getPanelAlignment() === 'center' || !isHorizontal(this.getPanelPosition())) && !this.isVisible(Parts.EDITOR_PART, mainWindow);
 	}
 
 	getSideBarPosition(): Position {
@@ -2093,14 +2111,14 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 			// Save the current size of the panel for the new orthogonal direction
 			// If moving down, save the width of the panel
 			// Otherwise, save the height of the panel
-			if (position === Position.BOTTOM) {
+			if (isHorizontal(position)) {
 				this.stateModel.setRuntimeValue(LayoutStateKeys.PANEL_LAST_NON_MAXIMIZED_WIDTH, size.width);
-			} else if (positionFromString(oldPositionValue) === Position.BOTTOM) {
+			} else if (isHorizontal(positionFromString(oldPositionValue))) {
 				this.stateModel.setRuntimeValue(LayoutStateKeys.PANEL_LAST_NON_MAXIMIZED_HEIGHT, size.height);
 			}
 		}
 
-		if (position === Position.BOTTOM && this.getPanelAlignment() !== 'center' && editorHidden) {
+		if (isHorizontal(position) && this.getPanelAlignment() !== 'center' && editorHidden) {
 			this.toggleMaximizedPanel();
 			editorHidden = false;
 		}
@@ -2112,6 +2130,8 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 
 		if (position === Position.BOTTOM) {
 			this.workbenchGrid.moveView(this.panelPartView, editorHidden ? size.height : this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_LAST_NON_MAXIMIZED_HEIGHT), this.editorPartView, Direction.Down);
+		} else if (position === Position.TOP) {
+			this.workbenchGrid.moveView(this.panelPartView, editorHidden ? size.height : this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_LAST_NON_MAXIMIZED_HEIGHT), this.editorPartView, Direction.Up);
 		} else if (position === Position.RIGHT) {
 			this.workbenchGrid.moveView(this.panelPartView, editorHidden ? size.width : this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_LAST_NON_MAXIMIZED_WIDTH), this.editorPartView, Direction.Right);
 		} else {
@@ -2129,7 +2149,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 			this.setAuxiliaryBarHidden(true);
 		}
 
-		if (position === Position.BOTTOM) {
+		if (isHorizontal(position)) {
 			this.adjustPartPositions(this.getSideBarPosition(), this.getPanelAlignment(), position);
 		}
 
@@ -2238,17 +2258,20 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 		const auxiliaryBarSize = this.stateModel.getRuntimeValue(LayoutStateKeys.AUXILIARYBAR_HIDDEN) ? 0 : nodes.auxiliaryBar.size;
 		const panelSize = this.stateModel.getInitializationValue(LayoutStateKeys.PANEL_SIZE) ? 0 : nodes.panel.size;
 
+		const panelPostion = this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_POSITION);
+		const sideBarPosition = this.stateModel.getRuntimeValue(LayoutStateKeys.SIDEBAR_POSITON);
+
 		const result = [] as ISerializedNode[];
-		if (this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_POSITION) !== Position.BOTTOM) {
+		if (!isHorizontal(panelPostion)) {
 			result.push(nodes.editor);
 			nodes.editor.size = availableWidth - activityBarSize - sideBarSize - panelSize - auxiliaryBarSize;
-			if (this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_POSITION) === Position.RIGHT) {
+			if (panelPostion === Position.RIGHT) {
 				result.push(nodes.panel);
 			} else {
 				result.splice(0, 0, nodes.panel);
 			}
 
-			if (this.stateModel.getRuntimeValue(LayoutStateKeys.SIDEBAR_POSITON) === Position.LEFT) {
+			if (sideBarPosition === Position.LEFT) {
 				result.push(nodes.auxiliaryBar);
 				result.splice(0, 0, nodes.sideBar);
 				result.splice(0, 0, nodes.activityBar);
@@ -2259,18 +2282,20 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 			}
 		} else {
 			const panelAlignment = this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_ALIGNMENT);
-			const sideBarPosition = this.stateModel.getRuntimeValue(LayoutStateKeys.SIDEBAR_POSITON);
 			const sideBarNextToEditor = !(panelAlignment === 'center' || (sideBarPosition === Position.LEFT && panelAlignment === 'right') || (sideBarPosition === Position.RIGHT && panelAlignment === 'left'));
 			const auxiliaryBarNextToEditor = !(panelAlignment === 'center' || (sideBarPosition === Position.RIGHT && panelAlignment === 'right') || (sideBarPosition === Position.LEFT && panelAlignment === 'left'));
 
 			const editorSectionWidth = availableWidth - activityBarSize - (sideBarNextToEditor ? 0 : sideBarSize) - (auxiliaryBarNextToEditor ? 0 : auxiliaryBarSize);
+
+			const editorNodes = this.arrangeEditorNodes({
+				editor: nodes.editor,
+				sideBar: sideBarNextToEditor ? nodes.sideBar : undefined,
+				auxiliaryBar: auxiliaryBarNextToEditor ? nodes.auxiliaryBar : undefined
+			}, availableHeight - panelSize, editorSectionWidth);
+
 			result.push({
 				type: 'branch',
-				data: [this.arrangeEditorNodes({
-					editor: nodes.editor,
-					sideBar: sideBarNextToEditor ? nodes.sideBar : undefined,
-					auxiliaryBar: auxiliaryBarNextToEditor ? nodes.auxiliaryBar : undefined
-				}, availableHeight - panelSize, editorSectionWidth), nodes.panel],
+				data: panelPostion === Position.BOTTOM ? [editorNodes, nodes.panel] : [nodes.panel, editorNodes],
 				size: editorSectionWidth
 			});
 
@@ -2413,7 +2438,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 			panelVisible: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether or the not the panel is visible' };
 			statusbarVisible: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether or the not the status bar is visible' };
 			sideBarPosition: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the primary side bar is on the left or right' };
-			panelPosition: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the panel is on the bottom, left, or right' };
+			panelPosition: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the panel is on the top, bottom, left, or right' };
 		};
 
 		const layoutDescriptor: StartupLayoutEvent = {
@@ -2621,7 +2646,7 @@ class LayoutStateModel extends Disposable {
 		LayoutStateKeys.GRID_SIZE.defaultValue = { height: workbenchDimensions.height, width: workbenchDimensions.width };
 		LayoutStateKeys.SIDEBAR_SIZE.defaultValue = Math.min(300, workbenchDimensions.width / 4);
 		LayoutStateKeys.AUXILIARYBAR_SIZE.defaultValue = Math.min(300, workbenchDimensions.width / 4);
-		LayoutStateKeys.PANEL_SIZE.defaultValue = (this.stateCache.get(LayoutStateKeys.PANEL_POSITION.name) ?? LayoutStateKeys.PANEL_POSITION.defaultValue) === Position.BOTTOM ? workbenchDimensions.height / 3 : workbenchDimensions.width / 4;
+		LayoutStateKeys.PANEL_SIZE.defaultValue = (this.stateCache.get(LayoutStateKeys.PANEL_POSITION.name) ?? isHorizontal(LayoutStateKeys.PANEL_POSITION.defaultValue)) ? workbenchDimensions.height / 3 : workbenchDimensions.width / 4;
 		LayoutStateKeys.SIDEBAR_HIDDEN.defaultValue = this.contextService.getWorkbenchState() === WorkbenchState.EMPTY;
 
 		// Apply all defaults
diff --git a/src/vs/workbench/browser/media/style.css b/src/vs/workbench/browser/media/style.css
index 35f856b931a..6c9dbb9a0c9 100644
--- a/src/vs/workbench/browser/media/style.css
+++ b/src/vs/workbench/browser/media/style.css
@@ -87,6 +87,15 @@ body.web {
 	text-decoration: none;
 }
 
+
+.monaco-workbench p > a {
+	text-decoration: var(--text-link-decoration);
+}
+
+.monaco-workbench.underline-links {
+	--text-link-decoration: underline;
+}
+
 .monaco-workbench.hc-black p > a,
 .monaco-workbench.hc-light p > a {
 	text-decoration: underline !important;
diff --git a/src/vs/workbench/browser/panecomposite.ts b/src/vs/workbench/browser/panecomposite.ts
index 89e701e2d0b..86dbfe14fd9 100644
--- a/src/vs/workbench/browser/panecomposite.ts
+++ b/src/vs/workbench/browser/panecomposite.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Composite, CompositeDescriptor, CompositeRegistry } from 'vs/workbench/browser/composite';
-import { IConstructorSignature, BrandedService, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { URI } from 'vs/base/common/uri';
-import { Dimension } from 'vs/base/browser/dom';
-import { IActionViewItem } from 'vs/base/browser/ui/actionbar/actionbar';
-import { IAction, Separator } from 'vs/base/common/actions';
-import { MenuId, SubmenuItemAction } from 'vs/platform/actions/common/actions';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { ViewPaneContainer, ViewsSubMenu } from 'vs/workbench/browser/parts/views/viewPaneContainer';
-import { IPaneComposite } from 'vs/workbench/common/panecomposite';
-import { IView } from 'vs/workbench/common/views';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { VIEWPANE_FILTER_ACTION } from 'vs/workbench/browser/parts/views/viewPane';
-import { IBoundarySashes } from 'vs/base/browser/ui/sash/sash';
-import { IBaseActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
+import { Registry } from '../../platform/registry/common/platform.js';
+import { Composite, CompositeDescriptor, CompositeRegistry } from './composite.js';
+import { IConstructorSignature, BrandedService, IInstantiationService } from '../../platform/instantiation/common/instantiation.js';
+import { URI } from '../../base/common/uri.js';
+import { Dimension } from '../../base/browser/dom.js';
+import { IActionViewItem } from '../../base/browser/ui/actionbar/actionbar.js';
+import { IAction, Separator } from '../../base/common/actions.js';
+import { MenuId, SubmenuItemAction } from '../../platform/actions/common/actions.js';
+import { IContextMenuService } from '../../platform/contextview/browser/contextView.js';
+import { IStorageService } from '../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../platform/telemetry/common/telemetry.js';
+import { IThemeService } from '../../platform/theme/common/themeService.js';
+import { IWorkspaceContextService } from '../../platform/workspace/common/workspace.js';
+import { ViewPaneContainer, ViewsSubMenu } from './parts/views/viewPaneContainer.js';
+import { IPaneComposite } from '../common/panecomposite.js';
+import { IView } from '../common/views.js';
+import { IExtensionService } from '../services/extensions/common/extensions.js';
+import { VIEWPANE_FILTER_ACTION } from './parts/views/viewPane.js';
+import { IBoundarySashes } from '../../base/browser/ui/sash/sash.js';
+import { IBaseActionViewItemOptions } from '../../base/browser/ui/actionbar/actionViewItems.js';
 
 export abstract class PaneComposite extends Composite implements IPaneComposite {
 
diff --git a/src/vs/workbench/browser/part.ts b/src/vs/workbench/browser/part.ts
index 086dcb51b2c..e85aac5c3cf 100644
--- a/src/vs/workbench/browser/part.ts
+++ b/src/vs/workbench/browser/part.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/part';
-import { Component } from 'vs/workbench/common/component';
-import { IThemeService, IColorTheme } from 'vs/platform/theme/common/themeService';
-import { Dimension, size, IDimension, getActiveDocument, prepend, IDomPosition } from 'vs/base/browser/dom';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ISerializableView, IViewSize } from 'vs/base/browser/ui/grid/grid';
-import { Event, Emitter } from 'vs/base/common/event';
-import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
-import { assertIsDefined } from 'vs/base/common/types';
-import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import './media/part.css';
+import { Component } from '../common/component.js';
+import { IThemeService, IColorTheme } from '../../platform/theme/common/themeService.js';
+import { Dimension, size, IDimension, getActiveDocument, prepend, IDomPosition } from '../../base/browser/dom.js';
+import { IStorageService } from '../../platform/storage/common/storage.js';
+import { ISerializableView, IViewSize } from '../../base/browser/ui/grid/grid.js';
+import { Event, Emitter } from '../../base/common/event.js';
+import { IWorkbenchLayoutService } from '../services/layout/browser/layoutService.js';
+import { assertIsDefined } from '../../base/common/types.js';
+import { IDisposable, toDisposable } from '../../base/common/lifecycle.js';
 
 export interface IPartOptions {
 	readonly hasTitle?: boolean;
diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
index 4610ddff2c3..ce7ed066b93 100644
--- a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
+++ b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
@@ -3,40 +3,41 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/activitybarpart';
-import 'vs/css!./media/activityaction';
-import { localize, localize2 } from 'vs/nls';
-import { ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
-import { Part } from 'vs/workbench/browser/part';
-import { ActivityBarPosition, IWorkbenchLayoutService, LayoutSettings, Parts, Position } from 'vs/workbench/services/layout/browser/layoutService';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
-import { ToggleSidebarPositionAction } from 'vs/workbench/browser/actions/layoutActions';
-import { IThemeService, IColorTheme, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { ACTIVITY_BAR_BACKGROUND, ACTIVITY_BAR_BORDER, ACTIVITY_BAR_FOREGROUND, ACTIVITY_BAR_ACTIVE_BORDER, ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND, ACTIVITY_BAR_INACTIVE_FOREGROUND, ACTIVITY_BAR_ACTIVE_BACKGROUND, ACTIVITY_BAR_DRAG_AND_DROP_BORDER, ACTIVITY_BAR_ACTIVE_FOCUS_BORDER } from 'vs/workbench/common/theme';
-import { activeContrastBorder, contrastBorder, focusBorder } from 'vs/platform/theme/common/colorRegistry';
-import { addDisposableListener, append, EventType, isAncestor, $, clearNode } from 'vs/base/browser/dom';
-import { assertIsDefined } from 'vs/base/common/types';
-import { CustomMenubarControl } from 'vs/workbench/browser/parts/titlebar/menubarControl';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { getMenuBarVisibility } from 'vs/platform/window/common/window';
-import { IAction, Separator, SubmenuAction, toAction } from 'vs/base/common/actions';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { HoverPosition } from 'vs/base/browser/ui/hover/hoverWidget';
-import { GestureEvent } from 'vs/base/browser/touch';
-import { IPaneCompositePart } from 'vs/workbench/browser/parts/paneCompositePart';
-import { IPaneCompositeBarOptions, PaneCompositeBar } from 'vs/workbench/browser/parts/paneCompositeBar';
-import { GlobalCompositeBar } from 'vs/workbench/browser/parts/globalCompositeBar';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { Action2, IAction2Options, IMenuService, MenuId, MenuRegistry, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { createAndFillInContextMenuActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IViewDescriptorService, ViewContainerLocation, ViewContainerLocationToString } from 'vs/workbench/common/views';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
+import './media/activitybarpart.css';
+import './media/activityaction.css';
+import { localize, localize2 } from '../../../../nls.js';
+import { ActionsOrientation } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { Part } from '../../part.js';
+import { ActivityBarPosition, IWorkbenchLayoutService, LayoutSettings, Parts, Position } from '../../../services/layout/browser/layoutService.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { ToggleSidebarPositionAction } from '../../actions/layoutActions.js';
+import { IThemeService, IColorTheme, registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
+import { ACTIVITY_BAR_BACKGROUND, ACTIVITY_BAR_BORDER, ACTIVITY_BAR_FOREGROUND, ACTIVITY_BAR_ACTIVE_BORDER, ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND, ACTIVITY_BAR_INACTIVE_FOREGROUND, ACTIVITY_BAR_ACTIVE_BACKGROUND, ACTIVITY_BAR_DRAG_AND_DROP_BORDER, ACTIVITY_BAR_ACTIVE_FOCUS_BORDER } from '../../../common/theme.js';
+import { activeContrastBorder, contrastBorder, focusBorder } from '../../../../platform/theme/common/colorRegistry.js';
+import { addDisposableListener, append, EventType, isAncestor, $, clearNode } from '../../../../base/browser/dom.js';
+import { assertIsDefined } from '../../../../base/common/types.js';
+import { CustomMenubarControl } from '../titlebar/menubarControl.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { getMenuBarVisibility } from '../../../../platform/window/common/window.js';
+import { IAction, Separator, SubmenuAction, toAction } from '../../../../base/common/actions.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { HoverPosition } from '../../../../base/browser/ui/hover/hoverWidget.js';
+import { GestureEvent } from '../../../../base/browser/touch.js';
+import { IPaneCompositePart } from '../paneCompositePart.js';
+import { IPaneCompositeBarOptions, PaneCompositeBar } from '../paneCompositeBar.js';
+import { GlobalCompositeBar } from '../globalCompositeBar.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { Action2, IAction2Options, IMenuService, MenuId, MenuRegistry, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { createAndFillInContextMenuActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IViewDescriptorService, ViewContainerLocation, ViewContainerLocationToString } from '../../../common/views.js';
+import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
 
 export class ActivitybarPart extends Part {
 
@@ -205,6 +206,7 @@ export class ActivityBarCompositeBar extends PaneCompositeBar {
 		@IStorageService storageService: IStorageService,
 		@IExtensionService extensionService: IExtensionService,
 		@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
+		@IViewsService viewService: IViewsService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IWorkbenchEnvironmentService environmentService: IWorkbenchEnvironmentService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
@@ -217,7 +219,7 @@ export class ActivityBarCompositeBar extends PaneCompositeBar {
 				options.fillExtraContextMenuActions(actions, e);
 				this.fillContextMenuActions(actions, e);
 			}
-		}, part, paneCompositePart, instantiationService, storageService, extensionService, viewDescriptorService, contextKeyService, environmentService, layoutService);
+		}, part, paneCompositePart, instantiationService, storageService, extensionService, viewDescriptorService, viewService, contextKeyService, environmentService, layoutService);
 
 		if (showGlobalActivities) {
 			this.globalCompositeBar = this._register(instantiationService.createInstance(GlobalCompositeBar, () => this.getContextMenuActions(), (theme: IColorTheme) => this.options.colors(theme), this.options.activityHoverOptions));
@@ -363,10 +365,9 @@ export class ActivityBarCompositeBar extends PaneCompositeBar {
 	}
 
 	getActivityBarContextMenuActions(): IAction[] {
-		const activityBarPositionMenu = this.menuService.createMenu(MenuId.ActivityBarPositionMenu, this.contextKeyService);
+		const activityBarPositionMenu = this.menuService.getMenuActions(MenuId.ActivityBarPositionMenu, this.contextKeyService, { shouldForwardArgs: true, renderShortTitle: true });
 		const positionActions: IAction[] = [];
-		createAndFillInContextMenuActions(activityBarPositionMenu, { shouldForwardArgs: true, renderShortTitle: true }, { primary: [], secondary: positionActions });
-		activityBarPositionMenu.dispose();
+		createAndFillInContextMenuActions(activityBarPositionMenu, { primary: [], secondary: positionActions });
 		return [
 			new SubmenuAction('workbench.action.panel.position', localize('activity bar position', "Activity Bar Position"), positionActions),
 			toAction({ id: ToggleSidebarPositionAction.ID, label: ToggleSidebarPositionAction.getLabel(this.layoutService), run: () => this.instantiationService.invokeFunction(accessor => new ToggleSidebarPositionAction().run(accessor)) })
diff --git a/src/vs/workbench/browser/parts/activitybar/media/activityaction.css b/src/vs/workbench/browser/parts/activitybar/media/activityaction.css
index f42d3307fb7..22cd4083df3 100644
--- a/src/vs/workbench/browser/parts/activitybar/media/activityaction.css
+++ b/src/vs/workbench/browser/parts/activitybar/media/activityaction.css
@@ -104,7 +104,8 @@
 	display: none;
 }
 
-.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item.clicked:focus:before {
+.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item.clicked:focus:before,
+.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item.clicked:focus .active-item-indicator::before {
 	border-left: none !important; /* no focus feedback when using mouse */
 }
 
@@ -168,23 +169,6 @@
 	text-align: center;
 }
 
-.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .profile-badge .profile-icon-overlay {
-	position: absolute;
-	top: 27px;
-	right: 6px;
-	background-color: var(--vscode-activityBar-background);
-}
-
-.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .profile-badge .profile-icon-overlay .codicon {
-	color: var(--vscode-activityBar-inactiveForeground);
-}
-
-.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item.active .profile-badge .profile-icon-overlay .codicon,
-.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus .profile-badge .profile-icon-overlay .codicon,
-.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item:hover .profile-badge .profile-icon-overlay .codicon {
-	color: var(--vscode-activityBar-foreground) !important;
-}
-
 .monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .profile-badge .profile-text-overlay {
 	position: absolute;
 	font-weight: 600;
diff --git a/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.ts b/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.ts
index 3de5a2cc2d7..b2c7e5f01c7 100644
--- a/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.ts
+++ b/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from 'vs/base/common/codicons';
-import { localize, localize2 } from 'vs/nls';
-import { Action2, MenuId, MenuRegistry, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { AuxiliaryBarVisibleContext } from 'vs/workbench/common/contextkeys';
-import { ViewContainerLocation, ViewContainerLocationToString } from 'vs/workbench/common/views';
-import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/browser/layoutService';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { Action2, MenuId, MenuRegistry, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { AuxiliaryBarVisibleContext } from '../../../common/contextkeys.js';
+import { ViewContainerLocation, ViewContainerLocationToString } from '../../../common/views.js';
+import { IWorkbenchLayoutService, Parts } from '../../../services/layout/browser/layoutService.js';
+import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
 
 
 const auxiliaryBarRightIcon = registerIcon('auxiliarybar-right-layout-icon', Codicon.layoutSidebarRight, localize('toggleAuxiliaryIconRight', 'Icon to toggle the auxiliary bar off in its right position.'));
diff --git a/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.ts b/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.ts
index 16c40e836f2..264794c1592 100644
--- a/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.ts
+++ b/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.ts
@@ -3,39 +3,39 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/auxiliaryBarPart';
-import { localize } from 'vs/nls';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { contrastBorder } from 'vs/platform/theme/common/colorRegistry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ActiveAuxiliaryContext, AuxiliaryBarFocusContext } from 'vs/workbench/common/contextkeys';
-import { ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND, ACTIVITY_BAR_TOP_ACTIVE_BORDER, ACTIVITY_BAR_TOP_DRAG_AND_DROP_BORDER, ACTIVITY_BAR_TOP_FOREGROUND, ACTIVITY_BAR_TOP_INACTIVE_FOREGROUND, PANEL_ACTIVE_TITLE_BORDER, PANEL_ACTIVE_TITLE_FOREGROUND, PANEL_DRAG_AND_DROP_BORDER, PANEL_INACTIVE_TITLE_FOREGROUND, SIDE_BAR_BACKGROUND, SIDE_BAR_BORDER, SIDE_BAR_FOREGROUND } from 'vs/workbench/common/theme';
-import { IViewDescriptorService } from 'vs/workbench/common/views';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { ActivityBarPosition, IWorkbenchLayoutService, LayoutSettings, Parts, Position } from 'vs/workbench/services/layout/browser/layoutService';
-import { HoverPosition } from 'vs/base/browser/ui/hover/hoverWidget';
-import { IAction, Separator, SubmenuAction, toAction } from 'vs/base/common/actions';
-import { ToggleAuxiliaryBarAction } from 'vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions';
-import { assertIsDefined } from 'vs/base/common/types';
-import { LayoutPriority } from 'vs/base/browser/ui/splitview/splitview';
-import { ToggleSidebarPositionAction } from 'vs/workbench/browser/actions/layoutActions';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { AbstractPaneCompositePart, CompositeBarPosition } from 'vs/workbench/browser/parts/paneCompositePart';
-import { ActionsOrientation, IActionViewItem, prepareActions } from 'vs/base/browser/ui/actionbar/actionbar';
-import { IPaneCompositeBarOptions } from 'vs/workbench/browser/parts/paneCompositeBar';
-import { IMenuService, MenuId } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { createAndFillInContextMenuActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { $ } from 'vs/base/browser/dom';
-import { HiddenItemStrategy, WorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
-import { ActionViewItem, IActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { CompositeMenuActions } from 'vs/workbench/browser/actions';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import './media/auxiliaryBarPart.css';
+import { localize } from '../../../../nls.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { contrastBorder } from '../../../../platform/theme/common/colorRegistry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ActiveAuxiliaryContext, AuxiliaryBarFocusContext } from '../../../common/contextkeys.js';
+import { ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND, ACTIVITY_BAR_TOP_ACTIVE_BORDER, ACTIVITY_BAR_TOP_DRAG_AND_DROP_BORDER, ACTIVITY_BAR_TOP_FOREGROUND, ACTIVITY_BAR_TOP_INACTIVE_FOREGROUND, PANEL_ACTIVE_TITLE_BORDER, PANEL_ACTIVE_TITLE_FOREGROUND, PANEL_DRAG_AND_DROP_BORDER, PANEL_INACTIVE_TITLE_FOREGROUND, SIDE_BAR_BACKGROUND, SIDE_BAR_BORDER, SIDE_BAR_FOREGROUND } from '../../../common/theme.js';
+import { IViewDescriptorService } from '../../../common/views.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { ActivityBarPosition, IWorkbenchLayoutService, LayoutSettings, Parts, Position } from '../../../services/layout/browser/layoutService.js';
+import { HoverPosition } from '../../../../base/browser/ui/hover/hoverWidget.js';
+import { IAction, Separator, SubmenuAction, toAction } from '../../../../base/common/actions.js';
+import { ToggleAuxiliaryBarAction } from './auxiliaryBarActions.js';
+import { assertIsDefined } from '../../../../base/common/types.js';
+import { LayoutPriority } from '../../../../base/browser/ui/splitview/splitview.js';
+import { ToggleSidebarPositionAction } from '../../actions/layoutActions.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { AbstractPaneCompositePart, CompositeBarPosition } from '../paneCompositePart.js';
+import { ActionsOrientation, IActionViewItem, prepareActions } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { IPaneCompositeBarOptions } from '../paneCompositeBar.js';
+import { IMenuService, MenuId } from '../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { createAndFillInContextMenuActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { $ } from '../../../../base/browser/dom.js';
+import { HiddenItemStrategy, WorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
+import { ActionViewItem, IActionViewItemOptions } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { CompositeMenuActions } from '../../actions.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 
 export class AuxiliaryBarPart extends AbstractPaneCompositePart {
 
@@ -191,10 +191,9 @@ export class AuxiliaryBarPart extends AbstractPaneCompositePart {
 			actions.push(viewsSubmenuAction);
 		}
 
-		const activityBarPositionMenu = this.menuService.createMenu(MenuId.ActivityBarPositionMenu, this.contextKeyService);
+		const activityBarPositionMenu = this.menuService.getMenuActions(MenuId.ActivityBarPositionMenu, this.contextKeyService, { shouldForwardArgs: true, renderShortTitle: true });
 		const positionActions: IAction[] = [];
-		createAndFillInContextMenuActions(activityBarPositionMenu, { shouldForwardArgs: true, renderShortTitle: true }, { primary: [], secondary: positionActions });
-		activityBarPositionMenu.dispose();
+		createAndFillInContextMenuActions(activityBarPositionMenu, { primary: [], secondary: positionActions });
 
 		actions.push(...[
 			new Separator(),
@@ -241,14 +240,6 @@ export class AuxiliaryBarPart extends AbstractPaneCompositePart {
 		return headerArea;
 	}
 
-	protected override getToolbarWidth(): number {
-		if (this.getCompositeBarPosition() === CompositeBarPosition.TOP) {
-			return 22;
-		}
-
-		return super.getToolbarWidth();
-	}
-
 	private headerActionViewItemProvider(action: IAction, options: IActionViewItemOptions): IActionViewItem | undefined {
 		if (action.id === ToggleAuxiliaryBarAction.ID) {
 			return this.instantiationService.createInstance(ActionViewItem, undefined, action, options);
diff --git a/src/vs/workbench/browser/parts/auxiliarybar/media/auxiliaryBarPart.css b/src/vs/workbench/browser/parts/auxiliarybar/media/auxiliaryBarPart.css
index b1e39af1e58..781c090fbe5 100644
--- a/src/vs/workbench/browser/parts/auxiliarybar/media/auxiliaryBarPart.css
+++ b/src/vs/workbench/browser/parts/auxiliarybar/media/auxiliaryBarPart.css
@@ -52,7 +52,7 @@
 .monaco-workbench .part.auxiliarybar > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item .action-label::before,
 .monaco-workbench .part.auxiliarybar > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item .action-label::before {
 	position: absolute;
-	left: 6px; /* place icon in center */
+	left: 5px; /* place icon in center */
 }
 
 .monaco-workbench .part.auxiliarybar > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator:before,
diff --git a/src/vs/workbench/browser/parts/banner/bannerPart.ts b/src/vs/workbench/browser/parts/banner/bannerPart.ts
index e8957eae627..1f329c4c764 100644
--- a/src/vs/workbench/browser/parts/banner/bannerPart.ts
+++ b/src/vs/workbench/browser/parts/banner/bannerPart.ts
@@ -3,31 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/bannerpart';
-import { localize2 } from 'vs/nls';
-import { $, addDisposableListener, append, asCSSUrl, clearNode, EventType, isHTMLElement } from 'vs/base/browser/dom';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { Part } from 'vs/workbench/browser/part';
-import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/browser/layoutService';
-import { Action } from 'vs/base/common/actions';
-import { Link } from 'vs/platform/opener/browser/link';
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { Emitter } from 'vs/base/common/event';
-import { IBannerItem, IBannerService } from 'vs/workbench/services/banner/browser/bannerService';
-import { MarkdownRenderer } from 'vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { URI } from 'vs/base/common/uri';
-import { widgetClose } from 'vs/platform/theme/common/iconRegistry';
-import { BannerFocused } from 'vs/workbench/common/contextkeys';
+import './media/bannerpart.css';
+import { localize2 } from '../../../../nls.js';
+import { $, addDisposableListener, append, asCSSUrl, clearNode, EventType, isHTMLElement } from '../../../../base/browser/dom.js';
+import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { Part } from '../../part.js';
+import { IWorkbenchLayoutService, Parts } from '../../../services/layout/browser/layoutService.js';
+import { Action } from '../../../../base/common/actions.js';
+import { Link } from '../../../../platform/opener/browser/link.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { IBannerItem, IBannerService } from '../../../services/banner/browser/bannerService.js';
+import { MarkdownRenderer } from '../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { URI } from '../../../../base/common/uri.js';
+import { widgetClose } from '../../../../platform/theme/common/iconRegistry.js';
+import { BannerFocused } from '../../../common/contextkeys.js';
 
 // Banner Part
 
diff --git a/src/vs/workbench/browser/parts/compositeBar.ts b/src/vs/workbench/browser/parts/compositeBar.ts
index a9fc39c84ed..11577775c8e 100644
--- a/src/vs/workbench/browser/parts/compositeBar.ts
+++ b/src/vs/workbench/browser/parts/compositeBar.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { IAction, toAction } from 'vs/base/common/actions';
-import { IActivity } from 'vs/workbench/services/activity/common/activity';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ActionBar, ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
-import { CompositeActionViewItem, CompositeOverflowActivityAction, CompositeOverflowActivityActionViewItem, CompositeBarAction, ICompositeBar, ICompositeBarColors, IActivityHoverOptions } from 'vs/workbench/browser/parts/compositeBarActions';
-import { Dimension, $, addDisposableListener, EventType, EventHelper, isAncestor, getWindow } from 'vs/base/browser/dom';
-import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { Widget } from 'vs/base/browser/ui/widget';
-import { isUndefinedOrNull } from 'vs/base/common/types';
-import { IColorTheme } from 'vs/platform/theme/common/themeService';
-import { Emitter } from 'vs/base/common/event';
-import { ViewContainerLocation, IViewDescriptorService } from 'vs/workbench/common/views';
-import { IPaneComposite } from 'vs/workbench/common/panecomposite';
-import { IComposite } from 'vs/workbench/common/composite';
-import { CompositeDragAndDropData, CompositeDragAndDropObserver, IDraggedCompositeData, ICompositeDragAndDrop, Before2D, toggleDropEffect } from 'vs/workbench/browser/dnd';
-import { Gesture, EventType as TouchEventType, GestureEvent } from 'vs/base/browser/touch';
+import { localize } from '../../../nls.js';
+import { IAction, toAction } from '../../../base/common/actions.js';
+import { IActivity } from '../../services/activity/common/activity.js';
+import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
+import { ActionBar, ActionsOrientation } from '../../../base/browser/ui/actionbar/actionbar.js';
+import { CompositeActionViewItem, CompositeOverflowActivityAction, CompositeOverflowActivityActionViewItem, CompositeBarAction, ICompositeBar, ICompositeBarColors, IActivityHoverOptions } from './compositeBarActions.js';
+import { Dimension, $, addDisposableListener, EventType, EventHelper, isAncestor, getWindow } from '../../../base/browser/dom.js';
+import { StandardMouseEvent } from '../../../base/browser/mouseEvent.js';
+import { IContextMenuService } from '../../../platform/contextview/browser/contextView.js';
+import { Widget } from '../../../base/browser/ui/widget.js';
+import { isUndefinedOrNull } from '../../../base/common/types.js';
+import { IColorTheme } from '../../../platform/theme/common/themeService.js';
+import { Emitter } from '../../../base/common/event.js';
+import { ViewContainerLocation, IViewDescriptorService } from '../../common/views.js';
+import { IPaneComposite } from '../../common/panecomposite.js';
+import { IComposite } from '../../common/composite.js';
+import { CompositeDragAndDropData, CompositeDragAndDropObserver, IDraggedCompositeData, ICompositeDragAndDrop, Before2D, toggleDropEffect, ICompositeDragAndDropObserverCallbacks } from '../dnd.js';
+import { Gesture, EventType as TouchEventType, GestureEvent } from '../../../base/browser/touch.js';
 
 export interface ICompositeBarItem {
 
@@ -152,6 +152,78 @@ export interface ICompositeBarOptions {
 	readonly getDefaultCompositeId: () => string | undefined;
 }
 
+class CompositeBarDndCallbacks implements ICompositeDragAndDropObserverCallbacks {
+
+	private insertDropBefore: Before2D | undefined = undefined;
+
+	constructor(
+		private readonly compositeBarContainer: HTMLElement,
+		private readonly actionBarContainer: HTMLElement,
+		private readonly compositeBarModel: CompositeBarModel,
+		private readonly dndHandler: ICompositeDragAndDrop,
+		private readonly orientation: ActionsOrientation,
+	) { }
+
+	onDragOver(e: IDraggedCompositeData) {
+
+		// don't add feedback if this is over the composite bar actions or there are no actions
+		const visibleItems = this.compositeBarModel.visibleItems;
+		if (!visibleItems.length || (e.eventData.target && isAncestor(e.eventData.target as HTMLElement, this.actionBarContainer))) {
+			this.insertDropBefore = this.updateFromDragging(this.compositeBarContainer, false, false, true);
+			return;
+		}
+
+		const insertAtFront = this.insertAtFront(this.actionBarContainer, e.eventData);
+		const target = insertAtFront ? visibleItems[0] : visibleItems[visibleItems.length - 1];
+		const validDropTarget = this.dndHandler.onDragOver(e.dragAndDropData, target.id, e.eventData);
+		toggleDropEffect(e.eventData.dataTransfer, 'move', validDropTarget);
+		this.insertDropBefore = this.updateFromDragging(this.compositeBarContainer, validDropTarget, insertAtFront, true);
+	}
+
+	onDragLeave(e: IDraggedCompositeData) {
+		this.insertDropBefore = this.updateFromDragging(this.compositeBarContainer, false, false, false);
+	}
+
+	onDragEnd(e: IDraggedCompositeData) {
+		this.insertDropBefore = this.updateFromDragging(this.compositeBarContainer, false, false, false);
+	}
+
+	onDrop(e: IDraggedCompositeData) {
+		const visibleItems = this.compositeBarModel.visibleItems;
+		let targetId = undefined;
+		if (visibleItems.length) {
+			targetId = this.insertAtFront(this.actionBarContainer, e.eventData) ? visibleItems[0].id : visibleItems[visibleItems.length - 1].id;
+		}
+		this.dndHandler.drop(e.dragAndDropData, targetId, e.eventData, this.insertDropBefore);
+		this.insertDropBefore = this.updateFromDragging(this.compositeBarContainer, false, false, false);
+	}
+
+	private insertAtFront(element: HTMLElement, event: DragEvent): boolean {
+		const rect = element.getBoundingClientRect();
+		const posX = event.clientX;
+		const posY = event.clientY;
+
+		switch (this.orientation) {
+			case ActionsOrientation.HORIZONTAL:
+				return posX < rect.left;
+			case ActionsOrientation.VERTICAL:
+				return posY < rect.top;
+		}
+	}
+
+	private updateFromDragging(element: HTMLElement, showFeedback: boolean, front: boolean, isDragging: boolean): Before2D | undefined {
+		element.classList.toggle('dragged-over', isDragging);
+		element.classList.toggle('dragged-over-head', showFeedback && front);
+		element.classList.toggle('dragged-over-tail', showFeedback && !front);
+
+		if (!showFeedback) {
+			return undefined;
+		}
+
+		return { verticallyBefore: front, horizontallyBefore: front };
+	}
+}
+
 export class CompositeBar extends Widget implements ICompositeBar {
 
 	private readonly _onDidChange = this._register(new Emitter<void>());
@@ -188,13 +260,17 @@ export class CompositeBar extends Widget implements ICompositeBar {
 
 	setCompositeBarItems(items: ICompositeBarItem[]): void {
 		this.model.setItems(items);
-		this.updateCompositeSwitcher();
+		this.updateCompositeSwitcher(true);
 	}
 
 	getPinnedComposites(): ICompositeBarItem[] {
 		return this.model.pinnedItems;
 	}
 
+	getPinnedCompositeIds(): string[] {
+		return this.getPinnedComposites().map(c => c.id);
+	}
+
 	getVisibleComposites(): ICompositeBarItem[] {
 		return this.model.visibleItems;
 	}
@@ -232,67 +308,12 @@ export class CompositeBar extends Widget implements ICompositeBar {
 		this._register(addDisposableListener(parent, TouchEventType.Contextmenu, e => this.showContextMenu(getWindow(parent), e)));
 
 		// Register a drop target on the whole bar to prevent forbidden feedback
-		let insertDropBefore: Before2D | undefined = undefined;
-		this._register(CompositeDragAndDropObserver.INSTANCE.registerTarget(parent, {
-			onDragOver: (e: IDraggedCompositeData) => {
-
-				// don't add feedback if this is over the composite bar actions or there are no actions
-				const visibleItems = this.getVisibleComposites();
-				if (!visibleItems.length || (e.eventData.target && isAncestor(e.eventData.target as HTMLElement, actionBarDiv))) {
-					insertDropBefore = this.updateFromDragging(parent, false, false, true);
-					return;
-				}
-
-				const insertAtFront = this.insertAtFront(actionBarDiv, e.eventData);
-				const target = insertAtFront ? visibleItems[0] : visibleItems[visibleItems.length - 1];
-				const validDropTarget = this.options.dndHandler.onDragOver(e.dragAndDropData, target.id, e.eventData);
-				toggleDropEffect(e.eventData.dataTransfer, 'move', validDropTarget);
-				insertDropBefore = this.updateFromDragging(parent, validDropTarget, insertAtFront, true);
-			},
-			onDragLeave: (e: IDraggedCompositeData) => {
-				insertDropBefore = this.updateFromDragging(parent, false, false, false);
-			},
-			onDragEnd: (e: IDraggedCompositeData) => {
-				insertDropBefore = this.updateFromDragging(parent, false, false, false);
-			},
-			onDrop: (e: IDraggedCompositeData) => {
-				const visibleItems = this.getVisibleComposites();
-				if (visibleItems.length) {
-					const target = this.insertAtFront(actionBarDiv, e.eventData) ? visibleItems[0] : visibleItems[visibleItems.length - 1];
-					this.options.dndHandler.drop(e.dragAndDropData, target.id, e.eventData, insertDropBefore);
-				}
-				insertDropBefore = this.updateFromDragging(parent, false, false, false);
-			}
-		}));
+		const dndCallback = new CompositeBarDndCallbacks(parent, actionBarDiv, this.model, this.options.dndHandler, this.options.orientation);
+		this._register(CompositeDragAndDropObserver.INSTANCE.registerTarget(parent, dndCallback));
 
 		return actionBarDiv;
 	}
 
-	private insertAtFront(element: HTMLElement, event: DragEvent): boolean {
-		const rect = element.getBoundingClientRect();
-		const posX = event.clientX;
-		const posY = event.clientY;
-
-		switch (this.options.orientation) {
-			case ActionsOrientation.HORIZONTAL:
-				return posX < rect.left;
-			case ActionsOrientation.VERTICAL:
-				return posY < rect.top;
-		}
-	}
-
-	private updateFromDragging(element: HTMLElement, showFeedback: boolean, front: boolean, isDragging: boolean): Before2D | undefined {
-		element.classList.toggle('dragged-over', isDragging);
-		element.classList.toggle('dragged-over-head', showFeedback && front);
-		element.classList.toggle('dragged-over-tail', showFeedback && !front);
-
-		if (!showFeedback) {
-			return undefined;
-		}
-
-		return { verticallyBefore: front, horizontallyBefore: front };
-	}
-
 	focus(index?: number): void {
 		this.compositeSwitcherBar?.focus(index);
 	}
@@ -486,7 +507,7 @@ export class CompositeBar extends Widget implements ICompositeBar {
 		}
 	}
 
-	private updateCompositeSwitcher(): void {
+	private updateCompositeSwitcher(donotTrigger?: boolean): void {
 		const compositeSwitcherBar = this.compositeSwitcherBar;
 		if (!compositeSwitcherBar || !this.dimension) {
 			return; // We have not been rendered yet so there is nothing to update.
@@ -605,7 +626,9 @@ export class CompositeBar extends Widget implements ICompositeBar {
 			compositeSwitcherBar.push(this.compositeOverflowAction, { label: false, icon: true });
 		}
 
-		this._onDidChange.fire();
+		if (!donotTrigger) {
+			this._onDidChange.fire();
+		}
 	}
 
 	private getOverflowingComposites(): { id: string; name?: string }[] {
@@ -632,19 +655,22 @@ export class CompositeBar extends Widget implements ICompositeBar {
 
 	getContextMenuActions(e?: MouseEvent | GestureEvent): IAction[] {
 		const actions: IAction[] = this.model.visibleItems
-			.map(({ id, name, activityAction }) => (toAction({
-				id,
-				label: this.getAction(id).label || name || id,
-				checked: this.isPinned(id),
-				enabled: activityAction.enabled,
-				run: () => {
-					if (this.isPinned(id)) {
-						this.unpin(id);
-					} else {
-						this.pin(id, true);
+			.map(({ id, name, activityAction }) => {
+				const isPinned = this.isPinned(id);
+				return toAction({
+					id,
+					label: this.getAction(id).label || name || id,
+					checked: isPinned,
+					enabled: activityAction.enabled && (!isPinned || this.getPinnedCompositeIds().length > 1),
+					run: () => {
+						if (this.isPinned(id)) {
+							this.unpin(id);
+						} else {
+							this.pin(id, true);
+						}
 					}
-				}
-			})));
+				});
+			});
 
 		this.options.fillExtraContextMenuActions(actions, e);
 
diff --git a/src/vs/workbench/browser/parts/compositeBarActions.ts b/src/vs/workbench/browser/parts/compositeBarActions.ts
index de10721d07c..89876b6dffc 100644
--- a/src/vs/workbench/browser/parts/compositeBarActions.ts
+++ b/src/vs/workbench/browser/parts/compositeBarActions.ts
@@ -3,30 +3,30 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { Action, IAction, Separator } from 'vs/base/common/actions';
-import { $, addDisposableListener, append, clearNode, EventHelper, EventType, getDomNodePagePosition, hide, show } from 'vs/base/browser/dom';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { toDisposable, DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IThemeService, IColorTheme } from 'vs/platform/theme/common/themeService';
-import { NumberBadge, IBadge, IActivity, ProgressBadge } from 'vs/workbench/services/activity/common/activity';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { DelayedDragHandler } from 'vs/base/browser/dnd';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { Emitter, Event } from 'vs/base/common/event';
-import { CompositeDragAndDropObserver, ICompositeDragAndDrop, Before2D, toggleDropEffect } from 'vs/workbench/browser/dnd';
-import { Color } from 'vs/base/common/color';
-import { BaseActionViewItem, IActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { HoverPosition } from 'vs/base/browser/ui/hover/hoverWidget';
-import { URI } from 'vs/base/common/uri';
-import { badgeBackground, badgeForeground, contrastBorder } from 'vs/platform/theme/common/colorRegistry';
-import type { IHoverWidget } from 'vs/base/browser/ui/hover/hover';
+import { localize } from '../../../nls.js';
+import { Action, IAction, Separator } from '../../../base/common/actions.js';
+import { $, addDisposableListener, append, clearNode, EventHelper, EventType, getDomNodePagePosition, hide, show } from '../../../base/browser/dom.js';
+import { ICommandService } from '../../../platform/commands/common/commands.js';
+import { toDisposable, DisposableStore, MutableDisposable } from '../../../base/common/lifecycle.js';
+import { IContextMenuService } from '../../../platform/contextview/browser/contextView.js';
+import { IThemeService, IColorTheme } from '../../../platform/theme/common/themeService.js';
+import { NumberBadge, IBadge, IActivity, ProgressBadge, IconBadge } from '../../services/activity/common/activity.js';
+import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
+import { DelayedDragHandler } from '../../../base/browser/dnd.js';
+import { IKeybindingService } from '../../../platform/keybinding/common/keybinding.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { CompositeDragAndDropObserver, ICompositeDragAndDrop, Before2D, toggleDropEffect } from '../dnd.js';
+import { Color } from '../../../base/common/color.js';
+import { BaseActionViewItem, IActionViewItemOptions } from '../../../base/browser/ui/actionbar/actionViewItems.js';
+import { Codicon } from '../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../base/common/themables.js';
+import { IHoverService } from '../../../platform/hover/browser/hover.js';
+import { RunOnceScheduler } from '../../../base/common/async.js';
+import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
+import { HoverPosition } from '../../../base/browser/ui/hover/hoverWidget.js';
+import { URI } from '../../../base/common/uri.js';
+import { badgeBackground, badgeForeground, contrastBorder } from '../../../platform/theme/common/colorRegistry.js';
+import type { IHoverWidget } from '../../../base/browser/ui/hover/hover.js';
 
 export interface ICompositeBar {
 
@@ -45,6 +45,11 @@ export interface ICompositeBar {
 	 */
 	isPinned(compositeId: string): boolean;
 
+	/**
+	 * Get pinned composite ids in the composite bar.
+	 */
+	getPinnedCompositeIds(): string[];
+
 	/**
 	 * Returns if badges are enabled for that specified composite.
 	 * @param compositeId The id of the composite to check
@@ -154,7 +159,7 @@ export class CompositeBarActionViewItem extends BaseActionViewItem {
 	protected override readonly options: ICompositeBarActionViewItemOptions;
 
 	private badgeContent: HTMLElement | undefined;
-	private readonly badgeDisposable = this._register(new MutableDisposable());
+	private readonly badgeDisposable = this._register(new MutableDisposable<DisposableStore>());
 	private mouseUpTimeout: any;
 	private keybindingLabel: string | undefined | null;
 
@@ -214,9 +219,10 @@ export class CompositeBarActionViewItem extends BaseActionViewItem {
 
 		// Badge
 		if (this.badgeContent) {
-			const badgeFg = colors.badgeForeground ?? theme.getColor(badgeForeground);
-			const badgeBg = colors.badgeBackground ?? theme.getColor(badgeBackground);
-			const contrastBorderColor = theme.getColor(contrastBorder);
+			const badgeStyles = this.getActivity()?.badge.getColors(theme);
+			const badgeFg = badgeStyles?.badgeForeground ?? colors.badgeForeground ?? theme.getColor(badgeForeground);
+			const badgeBg = badgeStyles?.badgeBackground ?? colors.badgeBackground ?? theme.getColor(badgeBackground);
+			const contrastBorderColor = badgeStyles?.badgeBorder ?? theme.getColor(contrastBorder);
 
 			this.badgeContent.style.color = badgeFg ? badgeFg.toString() : '';
 			this.badgeContent.style.backgroundColor = badgeBg ? badgeBg.toString() : '';
@@ -285,15 +291,21 @@ export class CompositeBarActionViewItem extends BaseActionViewItem {
 		this.updateStyles();
 	}
 
+	private getActivity(): IActivity | undefined {
+		if (this._action instanceof CompositeBarAction) {
+			return this._action.activity;
+		}
+		return undefined;
+	}
+
 	protected updateActivity(): void {
-		const action = this.action;
-		if (!this.badge || !this.badgeContent || !(action instanceof CompositeBarAction)) {
+		if (!this.badge || !this.badgeContent || !(this._action instanceof CompositeBarAction)) {
 			return;
 		}
 
-		const activity = action.activity;
+		const activity = this.getActivity();
 
-		this.badgeDisposable.clear();
+		this.badgeDisposable.value = new DisposableStore();
 
 		clearNode(this.badgeContent);
 		hide(this.badge);
@@ -319,11 +331,7 @@ export class CompositeBarActionViewItem extends BaseActionViewItem {
 			else if (badge instanceof NumberBadge) {
 				if (badge.number) {
 					let number = badge.number.toString();
-					if (this.options.compact) {
-						if (badge.number > 99) {
-							number = '';
-						}
-					} else if (badge.number > 999) {
+					if (badge.number > 999) {
 						const noOfThousands = badge.number / 1000;
 						const floor = Math.floor(noOfThousands);
 						if (noOfThousands > floor) {
@@ -332,19 +340,32 @@ export class CompositeBarActionViewItem extends BaseActionViewItem {
 							number = `${noOfThousands}K`;
 						}
 					}
+					if (this.options.compact && number.length >= 3) {
+						classes.push('compact-content');
+					}
 					this.badgeContent.textContent = number;
 					show(this.badge);
 				}
 			}
 
+			// Icon
+			else if (badge instanceof IconBadge) {
+				classes.push('icon-badge');
+				const badgeContentClassess = ['icon-overlay', ...ThemeIcon.asClassNameArray(badge.icon)];
+				this.badgeContent.classList.add(...badgeContentClassess);
+				this.badgeDisposable.value.add(toDisposable(() => this.badgeContent?.classList.remove(...badgeContentClassess)));
+				show(this.badge);
+			}
+
 			if (classes.length) {
 				this.badge.classList.add(...classes);
-				this.badgeDisposable.value = toDisposable(() => this.badge.classList.remove(...classes));
+				this.badgeDisposable.value.add(toDisposable(() => this.badge.classList.remove(...classes)));
 			}
 
 		}
 
 		this.updateTitle();
+		this.updateStyles();
 	}
 
 	protected override updateLabel(): void {
@@ -673,8 +694,10 @@ export class CompositeActionViewItem extends CompositeBarActionViewItem {
 		if (isPinned) {
 			this.toggleCompositePinnedAction.label = localize('hide', "Hide '{0}'", this.compositeBarActionItem.name);
 			this.toggleCompositePinnedAction.checked = false;
+			this.toggleCompositePinnedAction.enabled = this.compositeBar.getPinnedCompositeIds().length > 1;
 		} else {
 			this.toggleCompositePinnedAction.label = localize('keep', "Keep '{0}'", this.compositeBarActionItem.name);
+			this.toggleCompositePinnedAction.enabled = true;
 		}
 
 		const isBadgeEnabled = this.compositeBar.areBadgesEnabled(this.compositeBarActionItem.id);
diff --git a/src/vs/workbench/browser/parts/compositePart.ts b/src/vs/workbench/browser/parts/compositePart.ts
index cbc4783066e..fc483b4d326 100644
--- a/src/vs/workbench/browser/parts/compositePart.ts
+++ b/src/vs/workbench/browser/parts/compositePart.ts
@@ -3,39 +3,39 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/compositepart';
-import { localize } from 'vs/nls';
-import { defaultGenerator } from 'vs/base/common/idGenerator';
-import { IDisposable, dispose, DisposableStore, MutableDisposable, } from 'vs/base/common/lifecycle';
-import { Emitter } from 'vs/base/common/event';
-import { isCancellationError } from 'vs/base/common/errors';
-import { ActionsOrientation, IActionViewItem, prepareActions } from 'vs/base/browser/ui/actionbar/actionbar';
-import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
-import { IAction } from 'vs/base/common/actions';
-import { Part, IPartOptions } from 'vs/workbench/browser/part';
-import { Composite, CompositeRegistry } from 'vs/workbench/browser/composite';
-import { IComposite } from 'vs/workbench/common/composite';
-import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IProgressIndicator, IEditorProgressService } from 'vs/platform/progress/common/progress';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { Dimension, append, $, hide, show } from 'vs/base/browser/dom';
-import { AnchorAlignment } from 'vs/base/browser/ui/contextview/contextview';
-import { assertIsDefined } from 'vs/base/common/types';
-import { createActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { AbstractProgressScope, ScopedProgressIndicator } from 'vs/workbench/services/progress/browser/progressIndicator';
-import { WorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
-import { defaultProgressBarStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { IBoundarySashes } from 'vs/base/browser/ui/sash/sash';
-import { IBaseActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { IHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate';
-import { createInstantHoverDelegate, getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import type { IHoverService } from 'vs/platform/hover/browser/hover';
+import './media/compositepart.css';
+import { localize } from '../../../nls.js';
+import { defaultGenerator } from '../../../base/common/idGenerator.js';
+import { IDisposable, dispose, DisposableStore, MutableDisposable, } from '../../../base/common/lifecycle.js';
+import { Emitter } from '../../../base/common/event.js';
+import { isCancellationError } from '../../../base/common/errors.js';
+import { ActionsOrientation, IActionViewItem, prepareActions } from '../../../base/browser/ui/actionbar/actionbar.js';
+import { ProgressBar } from '../../../base/browser/ui/progressbar/progressbar.js';
+import { IAction } from '../../../base/common/actions.js';
+import { Part, IPartOptions } from '../part.js';
+import { Composite, CompositeRegistry } from '../composite.js';
+import { IComposite } from '../../common/composite.js';
+import { IWorkbenchLayoutService } from '../../services/layout/browser/layoutService.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../platform/storage/common/storage.js';
+import { IContextMenuService } from '../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../platform/instantiation/common/serviceCollection.js';
+import { IProgressIndicator, IEditorProgressService } from '../../../platform/progress/common/progress.js';
+import { IKeybindingService } from '../../../platform/keybinding/common/keybinding.js';
+import { IThemeService } from '../../../platform/theme/common/themeService.js';
+import { INotificationService } from '../../../platform/notification/common/notification.js';
+import { Dimension, append, $, hide, show } from '../../../base/browser/dom.js';
+import { AnchorAlignment } from '../../../base/browser/ui/contextview/contextview.js';
+import { assertIsDefined } from '../../../base/common/types.js';
+import { createActionViewItem } from '../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { AbstractProgressScope, ScopedProgressIndicator } from '../../services/progress/browser/progressIndicator.js';
+import { WorkbenchToolBar } from '../../../platform/actions/browser/toolbar.js';
+import { defaultProgressBarStyles } from '../../../platform/theme/browser/defaultStyles.js';
+import { IBoundarySashes } from '../../../base/browser/ui/sash/sash.js';
+import { IBaseActionViewItemOptions } from '../../../base/browser/ui/actionbar/actionViewItems.js';
+import { IHoverDelegate } from '../../../base/browser/ui/hover/hoverDelegate.js';
+import { createInstantHoverDelegate, getDefaultHoverDelegate } from '../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import type { IHoverService } from '../../../platform/hover/browser/hover.js';
 
 export interface ICompositeTitleLabel {
 
diff --git a/src/vs/workbench/browser/parts/dialogs/dialog.web.contribution.ts b/src/vs/workbench/browser/parts/dialogs/dialog.web.contribution.ts
index a97e57d2cbe..b4806127adf 100644
--- a/src/vs/workbench/browser/parts/dialogs/dialog.web.contribution.ts
+++ b/src/vs/workbench/browser/parts/dialogs/dialog.web.contribution.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { IDialogHandler, IDialogResult, IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { IDialogsModel, IDialogViewItem } from 'vs/workbench/common/dialogs';
-import { BrowserDialogHandler } from 'vs/workbench/browser/parts/dialogs/dialogHandler';
-import { DialogService } from 'vs/workbench/services/dialogs/common/dialogService';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { Lazy } from 'vs/base/common/lazy';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { IDialogHandler, IDialogResult, IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { ILayoutService } from '../../../../platform/layout/browser/layoutService.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { IDialogsModel, IDialogViewItem } from '../../../common/dialogs.js';
+import { BrowserDialogHandler } from './dialogHandler.js';
+import { DialogService } from '../../../services/dialogs/common/dialogService.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { Lazy } from '../../../../base/common/lazy.js';
 
 export class DialogHandlerContribution extends Disposable implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
index c064ebced0c..21f62b646c2 100644
--- a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
+++ b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { IConfirmation, IConfirmationResult, IInputResult, ICheckbox, IInputElement, ICustomDialogOptions, IInput, AbstractDialogHandler, DialogType, IPrompt, IAsyncPromptResult } from 'vs/platform/dialogs/common/dialogs';
-import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
-import { ILogService } from 'vs/platform/log/common/log';
-import Severity from 'vs/base/common/severity';
-import { Dialog, IDialogResult } from 'vs/base/browser/ui/dialog/dialog';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { EventHelper } from 'vs/base/browser/dom';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { fromNow } from 'vs/base/common/date';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { MarkdownRenderer } from 'vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
-import { defaultButtonStyles, defaultCheckboxStyles, defaultDialogStyles, defaultInputBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { ResultKind } from 'vs/platform/keybinding/common/keybindingResolver';
+import { localize } from '../../../../nls.js';
+import { IConfirmation, IConfirmationResult, IInputResult, ICheckbox, IInputElement, ICustomDialogOptions, IInput, AbstractDialogHandler, DialogType, IPrompt, IAsyncPromptResult } from '../../../../platform/dialogs/common/dialogs.js';
+import { ILayoutService } from '../../../../platform/layout/browser/layoutService.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import Severity from '../../../../base/common/severity.js';
+import { Dialog, IDialogResult } from '../../../../base/browser/ui/dialog/dialog.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { EventHelper } from '../../../../base/browser/dom.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { fromNow } from '../../../../base/common/date.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { MarkdownRenderer } from '../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import { defaultButtonStyles, defaultCheckboxStyles, defaultDialogStyles, defaultInputBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { ResultKind } from '../../../../platform/keybinding/common/keybindingResolver.js';
 
 export class BrowserDialogHandler extends AbstractDialogHandler {
 
diff --git a/src/vs/workbench/browser/parts/editor/auxiliaryEditorPart.ts b/src/vs/workbench/browser/parts/editor/auxiliaryEditorPart.ts
index 279fc5713c4..7122370c7df 100644
--- a/src/vs/workbench/browser/parts/editor/auxiliaryEditorPart.ts
+++ b/src/vs/workbench/browser/parts/editor/auxiliaryEditorPart.ts
@@ -3,30 +3,30 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { onDidChangeFullscreen } from 'vs/base/browser/browser';
-import { hide, show } from 'vs/base/browser/dom';
-import { Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { isNative } from 'vs/base/common/platform';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { hasCustomTitlebar } from 'vs/platform/window/common/window';
-import { IEditorGroupView, IEditorPartsView } from 'vs/workbench/browser/parts/editor/editor';
-import { EditorPart, IEditorPartUIState } from 'vs/workbench/browser/parts/editor/editorPart';
-import { IAuxiliaryTitlebarPart } from 'vs/workbench/browser/parts/titlebar/titlebarPart';
-import { WindowTitle } from 'vs/workbench/browser/parts/titlebar/windowTitle';
-import { IAuxiliaryWindowOpenOptions, IAuxiliaryWindowService } from 'vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService';
-import { GroupDirection, GroupsOrder, IAuxiliaryEditorPart } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IWorkbenchLayoutService, shouldShowCustomTitleBar } from 'vs/workbench/services/layout/browser/layoutService';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IStatusbarService } from 'vs/workbench/services/statusbar/browser/statusbar';
-import { ITitleService } from 'vs/workbench/services/title/browser/titleService';
+import { onDidChangeFullscreen } from '../../../../base/browser/browser.js';
+import { hide, show } from '../../../../base/browser/dom.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { isNative } from '../../../../base/common/platform.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { hasCustomTitlebar } from '../../../../platform/window/common/window.js';
+import { IEditorGroupView, IEditorPartsView } from './editor.js';
+import { EditorPart, IEditorPartUIState } from './editorPart.js';
+import { IAuxiliaryTitlebarPart } from '../titlebar/titlebarPart.js';
+import { WindowTitle } from '../titlebar/windowTitle.js';
+import { IAuxiliaryWindowOpenOptions, IAuxiliaryWindowService } from '../../../services/auxiliaryWindow/browser/auxiliaryWindowService.js';
+import { GroupDirection, GroupsOrder, IAuxiliaryEditorPart } from '../../../services/editor/common/editorGroupsService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { IWorkbenchLayoutService, shouldShowCustomTitleBar } from '../../../services/layout/browser/layoutService.js';
+import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.js';
+import { IStatusbarService } from '../../../services/statusbar/browser/statusbar.js';
+import { ITitleService } from '../../../services/title/browser/titleService.js';
 
 export interface IAuxiliaryEditorPartOpenOptions extends IAuxiliaryWindowOpenOptions {
 	readonly state?: IEditorPartUIState;
diff --git a/src/vs/workbench/browser/parts/editor/binaryDiffEditor.ts b/src/vs/workbench/browser/parts/editor/binaryDiffEditor.ts
index f4314ae0dbb..894e4b51e22 100644
--- a/src/vs/workbench/browser/parts/editor/binaryDiffEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/binaryDiffEditor.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { BINARY_DIFF_EDITOR_ID } from 'vs/workbench/common/editor';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { SideBySideEditor } from 'vs/workbench/browser/parts/editor/sideBySideEditor';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { BaseBinaryResourceEditor } from 'vs/workbench/browser/parts/editor/binaryEditor';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { localize } from '../../../../nls.js';
+import { BINARY_DIFF_EDITOR_ID } from '../../../common/editor.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { SideBySideEditor } from './sideBySideEditor.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { BaseBinaryResourceEditor } from './binaryEditor.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { IEditorGroup, IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
 
 /**
  * An implementation of editor for diffing binary files like images or videos.
diff --git a/src/vs/workbench/browser/parts/editor/binaryEditor.ts b/src/vs/workbench/browser/parts/editor/binaryEditor.ts
index 52a01908818..a1205e7aa6d 100644
--- a/src/vs/workbench/browser/parts/editor/binaryEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/binaryEditor.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { Emitter } from 'vs/base/common/event';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { BinaryEditorModel } from 'vs/workbench/common/editor/binaryEditorModel';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ByteSize } from 'vs/platform/files/common/files';
-import { IEditorOptions } from 'vs/platform/editor/common/editor';
-import { EditorPlaceholder, IEditorPlaceholderContents } from 'vs/workbench/browser/parts/editor/editorPlaceholder';
-import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
+import { localize } from '../../../../nls.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { BinaryEditorModel } from '../../../common/editor/binaryEditorModel.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { ByteSize } from '../../../../platform/files/common/files.js';
+import { IEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { EditorPlaceholder, IEditorPlaceholderContents } from './editorPlaceholder.js';
+import { IEditorGroup } from '../../../services/editor/common/editorGroupsService.js';
 
 export interface IOpenCallbacks {
 	openInternal: (input: EditorInput, options: IEditorOptions | undefined) => Promise<void>;
diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbs.ts b/src/vs/workbench/browser/parts/editor/breadcrumbs.ts
index 10046b04a13..4e650d81e83 100644
--- a/src/vs/workbench/browser/parts/editor/breadcrumbs.ts
+++ b/src/vs/workbench/browser/parts/editor/breadcrumbs.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BreadcrumbsWidget } from 'vs/base/browser/ui/breadcrumbs/breadcrumbsWidget';
-import { Emitter, Event } from 'vs/base/common/event';
-import * as glob from 'vs/base/common/glob';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { localize } from 'vs/nls';
-import { IConfigurationOverrides, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { Extensions, IConfigurationRegistry, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { GroupIdentifier, IEditorPartOptions } from 'vs/workbench/common/editor';
+import { BreadcrumbsWidget } from '../../../../base/browser/ui/breadcrumbs/breadcrumbsWidget.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import * as glob from '../../../../base/common/glob.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { localize } from '../../../../nls.js';
+import { IConfigurationOverrides, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { Extensions, IConfigurationRegistry, ConfigurationScope } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { GroupIdentifier, IEditorPartOptions } from '../../../common/editor.js';
 
 export const IBreadcrumbsService = createDecorator<IBreadcrumbsService>('IEditorBreadcrumbsService');
 
diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts b/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts
index e2fefb174e6..8fa44fe2e1b 100644
--- a/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts
+++ b/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts
@@ -3,45 +3,44 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { BreadcrumbsItem, BreadcrumbsWidget, IBreadcrumbsItemEvent, IBreadcrumbsWidgetStyles } from 'vs/base/browser/ui/breadcrumbs/breadcrumbsWidget';
-import { tail } from 'vs/base/common/arrays';
-import { timeout } from 'vs/base/common/async';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { combinedDisposable, DisposableStore, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { extUri } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import 'vs/css!./media/breadcrumbscontrol';
-import { localize, localize2 } from 'vs/nls';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { FileKind, IFileService, IFileStat } from 'vs/platform/files/common/files';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { IListService, WorkbenchAsyncDataTree, WorkbenchDataTree, WorkbenchListFocusContextKey } from 'vs/platform/list/browser/listService';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { DEFAULT_LABELS_CONTAINER, ResourceLabels } from 'vs/workbench/browser/labels';
-import { BreadcrumbsConfig, IBreadcrumbsService } from 'vs/workbench/browser/parts/editor/breadcrumbs';
-import { BreadcrumbsModel, FileElement, OutlineElement2 } from 'vs/workbench/browser/parts/editor/breadcrumbsModel';
-import { BreadcrumbsFilePicker, BreadcrumbsOutlinePicker, BreadcrumbsPicker } from 'vs/workbench/browser/parts/editor/breadcrumbsPicker';
-import { IEditorPartOptions, EditorResourceAccessor, SideBySideEditor } from 'vs/workbench/common/editor';
-import { ACTIVE_GROUP, ACTIVE_GROUP_TYPE, IEditorService, SIDE_GROUP, SIDE_GROUP_TYPE } from 'vs/workbench/services/editor/common/editorService';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorGroupView } from 'vs/workbench/browser/parts/editor/editor';
-import { PixelRatio } from 'vs/base/browser/pixelRatio';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { ITreeNode } from 'vs/base/browser/ui/tree/tree';
-import { IOutline } from 'vs/workbench/services/outline/browser/outline';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { Codicon } from 'vs/base/common/codicons';
-import { defaultBreadcrumbsWidgetStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { Emitter } from 'vs/base/common/event';
-import { IHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
+import * as dom from '../../../../base/browser/dom.js';
+import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
+import { BreadcrumbsItem, BreadcrumbsWidget, IBreadcrumbsItemEvent, IBreadcrumbsWidgetStyles } from '../../../../base/browser/ui/breadcrumbs/breadcrumbsWidget.js';
+import { tail } from '../../../../base/common/arrays.js';
+import { timeout } from '../../../../base/common/async.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { combinedDisposable, DisposableStore, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { extUri } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import './media/breadcrumbscontrol.css';
+import { localize, localize2 } from '../../../../nls.js';
+import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { FileKind, IFileService, IFileStat } from '../../../../platform/files/common/files.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IListService, WorkbenchAsyncDataTree, WorkbenchDataTree, WorkbenchListFocusContextKey } from '../../../../platform/list/browser/listService.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { DEFAULT_LABELS_CONTAINER, ResourceLabels } from '../../labels.js';
+import { BreadcrumbsConfig, IBreadcrumbsService } from './breadcrumbs.js';
+import { BreadcrumbsModel, FileElement, OutlineElement2 } from './breadcrumbsModel.js';
+import { BreadcrumbsFilePicker, BreadcrumbsOutlinePicker, BreadcrumbsPicker } from './breadcrumbsPicker.js';
+import { IEditorPartOptions, EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
+import { ACTIVE_GROUP, ACTIVE_GROUP_TYPE, IEditorService, SIDE_GROUP, SIDE_GROUP_TYPE } from '../../../services/editor/common/editorService.js';
+import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { IEditorGroupView } from './editor.js';
+import { PixelRatio } from '../../../../base/browser/pixelRatio.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { IOutline } from '../../../services/outline/browser/outline.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { defaultBreadcrumbsWidgetStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { IHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegate.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 
 class OutlineItem extends BreadcrumbsItem {
 
@@ -85,7 +84,7 @@ class OutlineItem extends BreadcrumbsItem {
 		}
 
 		const template = renderer.renderTemplate(container);
-		renderer.renderElement(<ITreeNode<any, any>>{
+		renderer.renderElement({
 			element,
 			children: [],
 			depth: 0,
diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbsModel.ts b/src/vs/workbench/browser/parts/editor/breadcrumbsModel.ts
index 22f155f85c7..f49b2301ea5 100644
--- a/src/vs/workbench/browser/parts/editor/breadcrumbsModel.ts
+++ b/src/vs/workbench/browser/parts/editor/breadcrumbsModel.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { Schemas, matchesSomeScheme } from 'vs/base/common/network';
-import { dirname, isEqual } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { FileKind } from 'vs/platform/files/common/files';
-import { IWorkspaceContextService, IWorkspaceFolder, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { BreadcrumbsConfig } from 'vs/workbench/browser/parts/editor/breadcrumbs';
-import { IEditorPane } from 'vs/workbench/common/editor';
-import { IOutline, IOutlineService, OutlineTarget } from 'vs/workbench/services/outline/browser/outline';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { DisposableStore, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { Schemas, matchesSomeScheme } from '../../../../base/common/network.js';
+import { dirname, isEqual } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { FileKind } from '../../../../platform/files/common/files.js';
+import { IWorkspaceContextService, IWorkspaceFolder, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { BreadcrumbsConfig } from './breadcrumbs.js';
+import { IEditorPane } from '../../../common/editor.js';
+import { IOutline, IOutlineService, OutlineTarget } from '../../../services/outline/browser/outline.js';
 
 export class FileElement {
 	constructor(
diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts b/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts
index 13c2df31119..6fd6bb2a076 100644
--- a/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts
+++ b/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts
@@ -3,34 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { compareFileNames } from 'vs/base/common/comparers';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { createMatches, FuzzyScore } from 'vs/base/common/filters';
-import * as glob from 'vs/base/common/glob';
-import { IDisposable, DisposableStore, MutableDisposable, Disposable } from 'vs/base/common/lifecycle';
-import { posix, relative } from 'vs/base/common/path';
-import { basename, dirname, isEqual } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import 'vs/css!./media/breadcrumbscontrol';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { FileKind, IFileService, IFileStat } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { WorkbenchDataTree, WorkbenchAsyncDataTree } from 'vs/platform/list/browser/listService';
-import { breadcrumbsPickerBackground, widgetBorder, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
-import { isWorkspace, isWorkspaceFolder, IWorkspace, IWorkspaceContextService, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { ResourceLabels, IResourceLabel, DEFAULT_LABELS_CONTAINER } from 'vs/workbench/browser/labels';
-import { BreadcrumbsConfig } from 'vs/workbench/browser/parts/editor/breadcrumbs';
-import { OutlineElement2, FileElement } from 'vs/workbench/browser/parts/editor/breadcrumbsModel';
-import { IAsyncDataSource, ITreeRenderer, ITreeNode, ITreeFilter, TreeVisibility, ITreeSorter } from 'vs/base/browser/ui/tree/tree';
-import { IIdentityProvider, IListVirtualDelegate, IKeyboardNavigationLabelProvider } from 'vs/base/browser/ui/list/list';
-import { IFileIconTheme, IThemeService } from 'vs/platform/theme/common/themeService';
-import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
-import { localize } from 'vs/nls';
-import { IOutline, IOutlineComparator } from 'vs/workbench/services/outline/browser/outline';
-import { IEditorOptions } from 'vs/platform/editor/common/editor';
-import { IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
+import { compareFileNames } from '../../../../base/common/comparers.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { createMatches, FuzzyScore } from '../../../../base/common/filters.js';
+import * as glob from '../../../../base/common/glob.js';
+import { IDisposable, DisposableStore, MutableDisposable, Disposable } from '../../../../base/common/lifecycle.js';
+import { posix, relative } from '../../../../base/common/path.js';
+import { basename, dirname, isEqual } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import './media/breadcrumbscontrol.css';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { FileKind, IFileService, IFileStat } from '../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { WorkbenchDataTree, WorkbenchAsyncDataTree } from '../../../../platform/list/browser/listService.js';
+import { breadcrumbsPickerBackground, widgetBorder, widgetShadow } from '../../../../platform/theme/common/colorRegistry.js';
+import { isWorkspace, isWorkspaceFolder, IWorkspace, IWorkspaceContextService, IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
+import { ResourceLabels, IResourceLabel, DEFAULT_LABELS_CONTAINER } from '../../labels.js';
+import { BreadcrumbsConfig } from './breadcrumbs.js';
+import { OutlineElement2, FileElement } from './breadcrumbsModel.js';
+import { IAsyncDataSource, ITreeRenderer, ITreeNode, ITreeFilter, TreeVisibility, ITreeSorter } from '../../../../base/browser/ui/tree/tree.js';
+import { IIdentityProvider, IListVirtualDelegate, IKeyboardNavigationLabelProvider } from '../../../../base/browser/ui/list/list.js';
+import { IFileIconTheme, IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IListAccessibilityProvider } from '../../../../base/browser/ui/list/listWidget.js';
+import { localize } from '../../../../nls.js';
+import { IOutline, IOutlineComparator } from '../../../services/outline/browser/outline.js';
+import { IEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { IEditorService, SIDE_GROUP } from '../../../services/editor/common/editorService.js';
+import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
 
 interface ILayoutInfo {
 	maxHeight: number;
diff --git a/src/vs/workbench/browser/parts/editor/diffEditorCommands.ts b/src/vs/workbench/browser/parts/editor/diffEditorCommands.ts
index 378552f35e0..dc3f83afe6c 100644
--- a/src/vs/workbench/browser/parts/editor/diffEditorCommands.ts
+++ b/src/vs/workbench/browser/parts/editor/diffEditorCommands.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { isEqual } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { localize, localize2 } from 'vs/nls';
-import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { TextDiffEditor } from 'vs/workbench/browser/parts/editor/textDiffEditor';
-import { ActiveCompareEditorCanSwapContext, TextCompareEditorActiveContext, TextCompareEditorVisibleContext } from 'vs/workbench/common/contextkeys';
-import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { MenuId, MenuRegistry } from '../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { TextDiffEditor } from './textDiffEditor.js';
+import { ActiveCompareEditorCanSwapContext, TextCompareEditorActiveContext, TextCompareEditorVisibleContext } from '../../../common/contextkeys.js';
+import { DiffEditorInput } from '../../../common/editor/diffEditorInput.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
 
 export const TOGGLE_DIFF_SIDE_BY_SIDE = 'toggle.diff.renderSideBySide';
 export const GOTO_NEXT_CHANGE = 'workbench.action.compareEditor.nextChange';
diff --git a/src/vs/workbench/browser/parts/editor/editor.contribution.ts b/src/vs/workbench/browser/parts/editor/editor.contribution.ts
index 3181aa0034c..ed56c364950 100644
--- a/src/vs/workbench/browser/parts/editor/editor.contribution.ts
+++ b/src/vs/workbench/browser/parts/editor/editor.contribution.ts
@@ -3,29 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Registry } from 'vs/platform/registry/common/platform';
-import { localize, localize2 } from 'vs/nls';
-import { IEditorPaneRegistry, EditorPaneDescriptor } from 'vs/workbench/browser/editor';
-import { IEditorFactoryRegistry, EditorExtensions } from 'vs/workbench/common/editor';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { IEditorPaneRegistry, EditorPaneDescriptor } from '../../editor.js';
+import { IEditorFactoryRegistry, EditorExtensions } from '../../../common/editor.js';
 import {
 	TextCompareEditorActiveContext, ActiveEditorPinnedContext, EditorGroupEditorsCountContext, ActiveEditorStickyContext, ActiveEditorAvailableEditorIdsContext,
 	EditorPartMultipleEditorGroupsContext, ActiveEditorDirtyContext, ActiveEditorGroupLockedContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext,
 	EditorTabsVisibleContext, ActiveEditorLastInGroupContext, EditorPartMaximizedEditorGroupContext, MultipleEditorGroupsContext, InEditorZenModeContext,
 	IsAuxiliaryEditorPartContext, ActiveCompareEditorCanSwapContext, MultipleEditorsSelectedInGroupContext
-} from 'vs/workbench/common/contextkeys';
-import { SideBySideEditorInput, SideBySideEditorInputSerializer } from 'vs/workbench/common/editor/sideBySideEditorInput';
-import { TextResourceEditor } from 'vs/workbench/browser/parts/editor/textResourceEditor';
-import { SideBySideEditor } from 'vs/workbench/browser/parts/editor/sideBySideEditor';
-import { DiffEditorInput, DiffEditorInputSerializer } from 'vs/workbench/common/editor/diffEditorInput';
-import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
-import { TextResourceEditorInput } from 'vs/workbench/common/editor/textResourceEditorInput';
-import { TextDiffEditor } from 'vs/workbench/browser/parts/editor/textDiffEditor';
-import { BinaryResourceDiffEditor } from 'vs/workbench/browser/parts/editor/binaryDiffEditor';
-import { ChangeEncodingAction, ChangeEOLAction, ChangeLanguageAction, EditorStatusContribution } from 'vs/workbench/browser/parts/editor/editorStatus';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { MenuRegistry, MenuId, IMenuItem, registerAction2 } from 'vs/platform/actions/common/actions';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
+} from '../../../common/contextkeys.js';
+import { SideBySideEditorInput, SideBySideEditorInputSerializer } from '../../../common/editor/sideBySideEditorInput.js';
+import { TextResourceEditor } from './textResourceEditor.js';
+import { SideBySideEditor } from './sideBySideEditor.js';
+import { DiffEditorInput, DiffEditorInputSerializer } from '../../../common/editor/diffEditorInput.js';
+import { UntitledTextEditorInput } from '../../../services/untitled/common/untitledTextEditorInput.js';
+import { TextResourceEditorInput } from '../../../common/editor/textResourceEditorInput.js';
+import { TextDiffEditor } from './textDiffEditor.js';
+import { BinaryResourceDiffEditor } from './binaryDiffEditor.js';
+import { ChangeEncodingAction, ChangeEOLAction, ChangeLanguageAction, EditorStatusContribution } from './editorStatus.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { MenuRegistry, MenuId, IMenuItem, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { KeyMod, KeyCode } from '../../../../base/common/keyCodes.js';
 import {
 	CloseEditorsInOtherGroupsAction, CloseAllEditorsAction, MoveGroupLeftAction, MoveGroupRightAction, SplitEditorAction, JoinTwoGroupsAction, RevertAndCloseEditorAction,
 	NavigateBetweenGroupsAction, FocusActiveGroupAction, FocusFirstGroupAction, ResetGroupSizesAction, MinimizeOtherGroupsAction, FocusPreviousGroup, FocusNextGroup,
@@ -44,7 +44,7 @@ import {
 	NavigateBackwardsInEditsAction, NavigateForwardInNavigationsAction, NavigateBackwardsInNavigationsAction, NavigatePreviousInNavigationsAction, NavigatePreviousInEditsAction, NavigateToLastNavigationLocationAction,
 	MaximizeGroupHideSidebarAction, MoveEditorToNewWindowAction, CopyEditorToNewindowAction, RestoreEditorsToMainWindowAction, ToggleMaximizeEditorGroupAction, MinimizeOtherGroupsHideSidebarAction, CopyEditorGroupToNewWindowAction,
 	MoveEditorGroupToNewWindowAction, NewEmptyEditorWindowAction
-} from 'vs/workbench/browser/parts/editor/editorActions';
+} from './editorActions.js';
 import {
 	CLOSE_EDITORS_AND_GROUP_COMMAND_ID, CLOSE_EDITORS_IN_GROUP_COMMAND_ID, CLOSE_EDITORS_TO_THE_RIGHT_COMMAND_ID, CLOSE_EDITOR_COMMAND_ID, CLOSE_EDITOR_GROUP_COMMAND_ID, CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID,
 	CLOSE_PINNED_EDITOR_COMMAND_ID, CLOSE_SAVED_EDITORS_COMMAND_ID, KEEP_EDITOR_COMMAND_ID, PIN_EDITOR_COMMAND_ID, SHOW_EDITORS_IN_GROUP, SPLIT_EDITOR_DOWN, SPLIT_EDITOR_LEFT,
@@ -52,26 +52,26 @@ import {
 	TOGGLE_LOCK_GROUP_COMMAND_ID, UNLOCK_GROUP_COMMAND_ID, SPLIT_EDITOR_IN_GROUP, JOIN_EDITOR_IN_GROUP, FOCUS_FIRST_SIDE_EDITOR, FOCUS_SECOND_SIDE_EDITOR, TOGGLE_SPLIT_EDITOR_IN_GROUP_LAYOUT, LOCK_GROUP_COMMAND_ID,
 	SPLIT_EDITOR, TOGGLE_MAXIMIZE_EDITOR_GROUP, MOVE_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, COPY_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, MOVE_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, COPY_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID,
 	NEW_EMPTY_EDITOR_WINDOW_COMMAND_ID
-} from 'vs/workbench/browser/parts/editor/editorCommands';
-import { GOTO_NEXT_CHANGE, GOTO_PREVIOUS_CHANGE, TOGGLE_DIFF_IGNORE_TRIM_WHITESPACE, TOGGLE_DIFF_SIDE_BY_SIDE, DIFF_SWAP_SIDES } from './diffEditorCommands';
-import { inQuickPickContext, getQuickNavigateHandler } from 'vs/workbench/browser/quickaccess';
-import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ContextKeyExpr, ContextKeyExpression } from 'vs/platform/contextkey/common/contextkey';
-import { isMacintosh } from 'vs/base/common/platform';
-import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { FloatingEditorClickMenu } from 'vs/workbench/browser/codeeditor';
-import { WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { EditorAutoSave } from 'vs/workbench/browser/parts/editor/editorAutoSave';
-import { IQuickAccessRegistry, Extensions as QuickAccessExtensions } from 'vs/platform/quickinput/common/quickAccess';
-import { ActiveGroupEditorsByMostRecentlyUsedQuickAccess, AllEditorsByAppearanceQuickAccess, AllEditorsByMostRecentlyUsedQuickAccess } from 'vs/workbench/browser/parts/editor/editorQuickAccess';
-import { FileAccess } from 'vs/base/common/network';
-import { Codicon } from 'vs/base/common/codicons';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { UntitledTextEditorInputSerializer, UntitledTextEditorWorkingCopyEditorHandler } from 'vs/workbench/services/untitled/common/untitledTextEditorHandler';
-import { DynamicEditorConfigurations } from 'vs/workbench/browser/parts/editor/editorConfiguration';
-import { EditorActionsDefaultAction, EditorActionsTitleBarAction, HideEditorActionsAction, HideEditorTabsAction, ShowMultipleEditorTabsAction, ShowSingleEditorTabAction, ZenHideEditorTabsAction, ZenShowMultipleEditorTabsAction, ZenShowSingleEditorTabAction } from 'vs/workbench/browser/actions/layoutActions';
-import { ICommandAction } from 'vs/platform/action/common/action';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
+} from './editorCommands.js';
+import { GOTO_NEXT_CHANGE, GOTO_PREVIOUS_CHANGE, TOGGLE_DIFF_IGNORE_TRIM_WHITESPACE, TOGGLE_DIFF_SIDE_BY_SIDE, DIFF_SWAP_SIDES } from './diffEditorCommands.js';
+import { inQuickPickContext, getQuickNavigateHandler } from '../../quickaccess.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ContextKeyExpr, ContextKeyExpression } from '../../../../platform/contextkey/common/contextkey.js';
+import { isMacintosh } from '../../../../base/common/platform.js';
+import { EditorContributionInstantiation, registerEditorContribution } from '../../../../editor/browser/editorExtensions.js';
+import { FloatingEditorClickMenu } from '../../codeeditor.js';
+import { WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { EditorAutoSave } from './editorAutoSave.js';
+import { IQuickAccessRegistry, Extensions as QuickAccessExtensions } from '../../../../platform/quickinput/common/quickAccess.js';
+import { ActiveGroupEditorsByMostRecentlyUsedQuickAccess, AllEditorsByAppearanceQuickAccess, AllEditorsByMostRecentlyUsedQuickAccess } from './editorQuickAccess.js';
+import { FileAccess } from '../../../../base/common/network.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { UntitledTextEditorInputSerializer, UntitledTextEditorWorkingCopyEditorHandler } from '../../../services/untitled/common/untitledTextEditorHandler.js';
+import { DynamicEditorConfigurations } from './editorConfiguration.js';
+import { ConfigureEditorAction, ConfigureEditorTabsAction, EditorActionsDefaultAction, EditorActionsTitleBarAction, HideEditorActionsAction, HideEditorTabsAction, ShowMultipleEditorTabsAction, ShowSingleEditorTabAction, ZenHideEditorTabsAction, ZenShowMultipleEditorTabsAction, ZenShowSingleEditorTabAction } from '../../actions/layoutActions.js';
+import { ICommandAction } from '../../../../platform/action/common/action.js';
+import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
 import { getFontSnippets } from 'vs/base/browser/fonts';
 import { registerEditorFontConfigurations } from 'vs/editor/common/config/editorConfigurationSchema';
 
@@ -387,6 +387,8 @@ MenuRegistry.appendMenuItem(MenuId.EditorActionsPositionSubmenu, { command: { id
 MenuRegistry.appendMenuItem(MenuId.EditorActionsPositionSubmenu, { command: { id: EditorActionsTitleBarAction.ID, title: localize('titleBar', "Title Bar"), toggled: ContextKeyExpr.or(ContextKeyExpr.equals('config.workbench.editor.editorActionsLocation', 'titleBar'), ContextKeyExpr.and(ContextKeyExpr.equals('config.workbench.editor.showTabs', 'none'), ContextKeyExpr.equals('config.workbench.editor.editorActionsLocation', 'default'))) }, group: '1_config', order: 20 });
 MenuRegistry.appendMenuItem(MenuId.EditorActionsPositionSubmenu, { command: { id: HideEditorActionsAction.ID, title: localize('hidden', "Hidden"), toggled: ContextKeyExpr.equals('config.workbench.editor.editorActionsLocation', 'hidden') }, group: '1_config', order: 30 });
 
+MenuRegistry.appendMenuItem(MenuId.EditorTabsBarContext, { command: { id: ConfigureEditorTabsAction.ID, title: localize('configureTabs', "Configure Tabs") }, group: '9_configure', order: 10 });
+
 // Editor Title Context Menu
 MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: CLOSE_EDITOR_COMMAND_ID, title: localize('close', "Close") }, group: '1_close', order: 10 });
 MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID, title: localize('closeOthers', "Close Others"), precondition: EditorGroupEditorsCountContext.notEqualsTo('1') }, group: '1_close', order: 20 });
@@ -416,6 +418,7 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, { command: { id: TOGGLE_KEEP_EDI
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, { command: { id: TOGGLE_MAXIMIZE_EDITOR_GROUP, title: localize('maximizeGroup', "Maximize Group") }, group: '8_group_operations', order: 5, when: ContextKeyExpr.and(EditorPartMaximizedEditorGroupContext.negate(), EditorPartMultipleEditorGroupsContext) });
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, { command: { id: TOGGLE_MAXIMIZE_EDITOR_GROUP, title: localize('unmaximizeGroup', "Unmaximize Group") }, group: '8_group_operations', order: 5, when: EditorPartMaximizedEditorGroupContext });
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, { command: { id: TOGGLE_LOCK_GROUP_COMMAND_ID, title: localize('lockGroup', "Lock Group"), toggled: ActiveEditorGroupLockedContext }, group: '8_group_operations', order: 10, when: IsAuxiliaryEditorPartContext.toNegated() /* already a primary action for aux windows */ });
+MenuRegistry.appendMenuItem(MenuId.EditorTitle, { command: { id: ConfigureEditorAction.ID, title: localize('configureEditors', "Configure Editors") }, group: '9_configure', order: 10 });
 
 function appendEditorToolItem(primary: ICommandAction, when: ContextKeyExpression | undefined, order: number, alternative?: ICommandAction, precondition?: ContextKeyExpression | undefined): void {
 	const item: IMenuItem = {
diff --git a/src/vs/workbench/browser/parts/editor/editor.ts b/src/vs/workbench/browser/parts/editor/editor.ts
index 066385368f8..d6f477d64f0 100644
--- a/src/vs/workbench/browser/parts/editor/editor.ts
+++ b/src/vs/workbench/browser/parts/editor/editor.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { GroupIdentifier, IWorkbenchEditorConfiguration, IEditorIdentifier, IEditorCloseEvent, IEditorPartOptions, IEditorPartOptionsChangeEvent, SideBySideEditor, EditorCloseContext, IEditorPane, IEditorPartLimitOptions, IEditorPartDecorationOptions, IEditorWillOpenEvent } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { IEditorGroup, GroupDirection, IMergeGroupOptions, GroupsOrder, GroupsArrangement, IAuxiliaryEditorPart, IEditorPart } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { Dimension } from 'vs/base/browser/dom';
-import { Event } from 'vs/base/common/event';
-import { IConfigurationChangeEvent, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ISerializableView } from 'vs/base/browser/ui/grid/grid';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { isObject } from 'vs/base/common/types';
-import { IEditorOptions } from 'vs/platform/editor/common/editor';
-import { IWindowsConfiguration } from 'vs/platform/window/common/window';
-import { BooleanVerifier, EnumVerifier, NumberVerifier, ObjectVerifier, SetVerifier, verifyObject } from 'vs/base/common/verifier';
-import { IAuxiliaryWindowOpenOptions } from 'vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService';
-import { ContextKeyValue, IContextKey, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { GroupIdentifier, IWorkbenchEditorConfiguration, IEditorIdentifier, IEditorCloseEvent, IEditorPartOptions, IEditorPartOptionsChangeEvent, SideBySideEditor, EditorCloseContext, IEditorPane, IEditorPartLimitOptions, IEditorPartDecorationOptions, IEditorWillOpenEvent } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { IEditorGroup, GroupDirection, IMergeGroupOptions, GroupsOrder, GroupsArrangement, IAuxiliaryEditorPart, IEditorPart } from '../../../services/editor/common/editorGroupsService.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { Dimension } from '../../../../base/browser/dom.js';
+import { Event } from '../../../../base/common/event.js';
+import { IConfigurationChangeEvent, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ISerializableView } from '../../../../base/browser/ui/grid/grid.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { isObject } from '../../../../base/common/types.js';
+import { IEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { IWindowsConfiguration } from '../../../../platform/window/common/window.js';
+import { BooleanVerifier, EnumVerifier, NumberVerifier, ObjectVerifier, SetVerifier, verifyObject } from '../../../../base/common/verifier.js';
+import { IAuxiliaryWindowOpenOptions } from '../../../services/auxiliaryWindow/browser/auxiliaryWindowService.js';
+import { ContextKeyValue, IContextKey, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 
 export interface IEditorPartCreationOptions {
 	readonly restorePreviousState: boolean;
diff --git a/src/vs/workbench/browser/parts/editor/editorActions.ts b/src/vs/workbench/browser/parts/editor/editorActions.ts
index 67d4b7173d4..1b1a39b30ca 100644
--- a/src/vs/workbench/browser/parts/editor/editorActions.ts
+++ b/src/vs/workbench/browser/parts/editor/editorActions.ts
@@ -3,40 +3,41 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize, localize2 } from 'vs/nls';
-import { Action } from 'vs/base/common/actions';
-import { firstOrDefault } from 'vs/base/common/arrays';
-import { IEditorIdentifier, IEditorCommandsContext, CloseDirection, SaveReason, EditorsOrder, EditorInputCapabilities, DEFAULT_EDITOR_ASSOCIATION, GroupIdentifier, EditorResourceAccessor } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditorInput';
-import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/browser/layoutService';
-import { GoFilter, IHistoryService } from 'vs/workbench/services/history/common/history';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { CLOSE_EDITOR_COMMAND_ID, MOVE_ACTIVE_EDITOR_COMMAND_ID, ActiveEditorMoveCopyArguments, SPLIT_EDITOR_LEFT, SPLIT_EDITOR_RIGHT, SPLIT_EDITOR_UP, SPLIT_EDITOR_DOWN, splitEditor, LAYOUT_EDITOR_GROUPS_COMMAND_ID, UNPIN_EDITOR_COMMAND_ID, COPY_ACTIVE_EDITOR_COMMAND_ID, SPLIT_EDITOR, resolveCommandsContext, getCommandsContext, TOGGLE_MAXIMIZE_EDITOR_GROUP, MOVE_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, COPY_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, MOVE_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, COPY_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, NEW_EMPTY_EDITOR_WINDOW_COMMAND_ID as NEW_EMPTY_EDITOR_WINDOW_COMMAND_ID, resolveEditorsContext, getEditorsContext } from 'vs/workbench/browser/parts/editor/editorCommands';
-import { IEditorGroupsService, IEditorGroup, GroupsArrangement, GroupLocation, GroupDirection, preferredSideBySideGroupDirection, IFindGroupScope, GroupOrientation, EditorGroupLayout, GroupsOrder, MergeGroupMode } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IWorkspacesService } from 'vs/platform/workspaces/common/workspaces';
-import { IFileDialogService, ConfirmResult, IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { ItemActivation, IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { AllEditorsByMostRecentlyUsedQuickAccess, ActiveGroupEditorsByMostRecentlyUsedQuickAccess, AllEditorsByAppearanceQuickAccess } from 'vs/workbench/browser/parts/editor/editorQuickAccess';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IFilesConfigurationService, AutoSaveMode } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { IEditorResolverService } from 'vs/workbench/services/editor/common/editorResolverService';
-import { isLinux, isNative, isWindows } from 'vs/base/common/platform';
-import { Action2, IAction2Options, MenuId } from 'vs/platform/actions/common/actions';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { IKeybindingRule, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ILogService } from 'vs/platform/log/common/log';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { ActiveEditorAvailableEditorIdsContext, ActiveEditorContext, ActiveEditorGroupEmptyContext, AuxiliaryBarVisibleContext, EditorPartMaximizedEditorGroupContext, EditorPartMultipleEditorGroupsContext, IsAuxiliaryWindowFocusedContext, MultipleEditorGroupsContext, SideBarVisibleContext } from 'vs/workbench/common/contextkeys';
-import { URI } from 'vs/base/common/uri';
-import { getActiveDocument } from 'vs/base/browser/dom';
-import { ICommandActionTitle } from 'vs/platform/action/common/action';
+import { localize, localize2 } from '../../../../nls.js';
+import { Action } from '../../../../base/common/actions.js';
+import { IEditorIdentifier, IEditorCommandsContext, CloseDirection, SaveReason, EditorsOrder, EditorInputCapabilities, DEFAULT_EDITOR_ASSOCIATION, GroupIdentifier, EditorResourceAccessor } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
+import { IWorkbenchLayoutService, Parts } from '../../../services/layout/browser/layoutService.js';
+import { GoFilter, IHistoryService } from '../../../services/history/common/history.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { CLOSE_EDITOR_COMMAND_ID, MOVE_ACTIVE_EDITOR_COMMAND_ID, ActiveEditorMoveCopyArguments, SPLIT_EDITOR_LEFT, SPLIT_EDITOR_RIGHT, SPLIT_EDITOR_UP, SPLIT_EDITOR_DOWN, splitEditor, LAYOUT_EDITOR_GROUPS_COMMAND_ID, UNPIN_EDITOR_COMMAND_ID, COPY_ACTIVE_EDITOR_COMMAND_ID, SPLIT_EDITOR, TOGGLE_MAXIMIZE_EDITOR_GROUP, MOVE_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, COPY_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, MOVE_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, COPY_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, NEW_EMPTY_EDITOR_WINDOW_COMMAND_ID as NEW_EMPTY_EDITOR_WINDOW_COMMAND_ID } from './editorCommands.js';
+import { IEditorGroupsService, IEditorGroup, GroupsArrangement, GroupLocation, GroupDirection, preferredSideBySideGroupDirection, IFindGroupScope, GroupOrientation, EditorGroupLayout, GroupsOrder, MergeGroupMode } from '../../../services/editor/common/editorGroupsService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IWorkspacesService } from '../../../../platform/workspaces/common/workspaces.js';
+import { IFileDialogService, ConfirmResult, IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { ItemActivation, IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { AllEditorsByMostRecentlyUsedQuickAccess, ActiveGroupEditorsByMostRecentlyUsedQuickAccess, AllEditorsByAppearanceQuickAccess } from './editorQuickAccess.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { IFilesConfigurationService, AutoSaveMode } from '../../../services/filesConfiguration/common/filesConfigurationService.js';
+import { IEditorResolverService } from '../../../services/editor/common/editorResolverService.js';
+import { isLinux, isNative, isWindows } from '../../../../base/common/platform.js';
+import { Action2, IAction2Options, MenuId } from '../../../../platform/actions/common/actions.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { KeyChord, KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { IKeybindingRule, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { ActiveEditorAvailableEditorIdsContext, ActiveEditorContext, ActiveEditorGroupEmptyContext, AuxiliaryBarVisibleContext, EditorPartMaximizedEditorGroupContext, EditorPartMultipleEditorGroupsContext, IsAuxiliaryWindowFocusedContext, MultipleEditorGroupsContext, SideBarVisibleContext } from '../../../common/contextkeys.js';
+import { getActiveDocument } from '../../../../base/browser/dom.js';
+import { ICommandActionTitle } from '../../../../platform/action/common/action.js';
+import { IProgressService, ProgressLocation } from '../../../../platform/progress/common/progress.js';
+import { resolveCommandsContext } from './editorCommandsContext.js';
+import { IListService } from '../../../../platform/list/browser/listService.js';
 
 class ExecuteCommandAction extends Action2 {
 
@@ -61,12 +62,14 @@ abstract class AbstractSplitEditorAction extends Action2 {
 		return preferredSideBySideGroupDirection(configurationService);
 	}
 
-	override async run(accessor: ServicesAccessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext): Promise<void> {
-		const editorGroupService = accessor.get(IEditorGroupsService);
+	override async run(accessor: ServicesAccessor, ...args: unknown[]): Promise<void> {
+		const editorGroupsService = accessor.get(IEditorGroupsService);
 		const configurationService = accessor.get(IConfigurationService);
 
-		const commandContext = getCommandsContext(accessor, resourceOrContext, context);
-		splitEditor(editorGroupService, this.getDirection(configurationService), commandContext ? [commandContext] : undefined);
+		const direction = this.getDirection(configurationService);
+		const commandContext = resolveCommandsContext(args, accessor.get(IEditorService), editorGroupsService, accessor.get(IListService));
+
+		splitEditor(editorGroupsService, direction, commandContext);
 	}
 }
 
@@ -564,6 +567,8 @@ abstract class AbstractCloseAllAction extends Action2 {
 
 	override async run(accessor: ServicesAccessor): Promise<void> {
 		const editorService = accessor.get(IEditorService);
+		const logService = accessor.get(ILogService);
+		const progressService = accessor.get(IProgressService);
 		const editorGroupService = accessor.get(IEditorGroupsService);
 		const filesConfigurationService = accessor.get(IFilesConfigurationService);
 		const fileDialogService = accessor.get(IFileDialogService);
@@ -636,7 +641,7 @@ abstract class AbstractCloseAllAction extends Action2 {
 				case ConfirmResult.CANCEL:
 					return;
 				case ConfirmResult.DONT_SAVE:
-					await editorService.revert(editors, { soft: true });
+					await this.revertEditors(editorService, logService, progressService, editors);
 					break;
 				case ConfirmResult.SAVE:
 					await editorService.save(editors, { reason: SaveReason.EXPLICIT });
@@ -650,13 +655,13 @@ abstract class AbstractCloseAllAction extends Action2 {
 
 			await this.revealEditorsToConfirm(editors, editorGroupService); // help user make a decision by revealing editors
 
-			const confirmation = await firstOrDefault(editors)?.editor.closeHandler?.confirm?.(editors);
+			const confirmation = await editors.at(0)?.editor.closeHandler?.confirm?.(editors);
 			if (typeof confirmation === 'number') {
 				switch (confirmation) {
 					case ConfirmResult.CANCEL:
 						return;
 					case ConfirmResult.DONT_SAVE:
-						await editorService.revert(editors, { soft: true });
+						await this.revertEditors(editorService, logService, progressService, editors);
 						break;
 					case ConfirmResult.SAVE:
 						await editorService.save(editors, { reason: SaveReason.EXPLICIT });
@@ -686,6 +691,33 @@ abstract class AbstractCloseAllAction extends Action2 {
 		return this.doCloseAll(editorGroupService);
 	}
 
+	private revertEditors(editorService: IEditorService, logService: ILogService, progressService: IProgressService, editors: IEditorIdentifier[]): Promise<void> {
+		return progressService.withProgress({
+			location: ProgressLocation.Window, 	// use window progress to not be too annoying about this operation
+			delay: 800,							// delay so that it only appears when operation takes a long time
+			title: localize('reverting', "Reverting Editors..."),
+		}, () => this.doRevertEditors(editorService, logService, editors));
+	}
+
+	private async doRevertEditors(editorService: IEditorService, logService: ILogService, editors: IEditorIdentifier[]): Promise<void> {
+		try {
+			// We first attempt to revert all editors with `soft: false`, to ensure that
+			// working copies revert to their state on disk. Even though we close editors,
+			// it is possible that other parties hold a reference to the working copy
+			// and expect it to be in a certain state after the editor is closed without
+			// saving.
+			await editorService.revert(editors);
+		} catch (error) {
+			logService.error(error);
+
+			// if that fails, since we are about to close the editor, we accept that
+			// the editor cannot be reverted and instead do a soft revert that just
+			// enables us to close the editor. With this, a user can always close a
+			// dirty editor even when reverting fails.
+			await editorService.revert(editors, { soft: true });
+		}
+	}
+
 	private async revealEditorsToConfirm(editors: ReadonlyArray<IEditorIdentifier>, editorGroupService: IEditorGroupsService): Promise<void> {
 		try {
 			const handledGroups = new Set<GroupIdentifier>();
@@ -1139,11 +1171,13 @@ export class ToggleMaximizeEditorGroupAction extends Action2 {
 		});
 	}
 
-	override async run(accessor: ServicesAccessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext): Promise<void> {
+	override async run(accessor: ServicesAccessor, ...args: unknown[]): Promise<void> {
 		const editorGroupsService = accessor.get(IEditorGroupsService);
 
-		const { group } = resolveCommandsContext(editorGroupsService, getCommandsContext(accessor, resourceOrContext, context));
-		editorGroupsService.toggleMaximizeGroup(group);
+		const resolvedContext = resolveCommandsContext(args, accessor.get(IEditorService), editorGroupsService, accessor.get(IListService));
+		if (resolvedContext.groupedEditors.length) {
+			editorGroupsService.toggleMaximizeGroup(resolvedContext.groupedEditors[0].group);
+		}
 	}
 }
 
@@ -2508,21 +2542,24 @@ abstract class BaseMoveCopyEditorToNewWindowAction extends Action2 {
 		});
 	}
 
-	override async run(accessor: ServicesAccessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext) {
+	override async run(accessor: ServicesAccessor, ...args: unknown[]) {
 		const editorGroupService = accessor.get(IEditorGroupsService);
-		const editorsContext = resolveEditorsContext(getEditorsContext(accessor, resourceOrContext, context));
-		if (editorsContext.length === 0) {
+		const resolvedContext = resolveCommandsContext(args, accessor.get(IEditorService), editorGroupService, accessor.get(IListService));
+		if (!resolvedContext.groupedEditors.length) {
 			return;
 		}
 
 		const auxiliaryEditorPart = await editorGroupService.createAuxiliaryEditorPart();
 
-		const sourceGroup = editorsContext[0].group; // only single group supported for move/copy for now
-		const sourceEditors = editorsContext.filter(({ group }) => group === sourceGroup);
+		// only single group supported for move/copy for now
+		const { group, editors } = resolvedContext.groupedEditors[0];
+		const options = { preserveFocus: resolvedContext.preserveFocus };
+		const editorsWithOptions = editors.map(editor => ({ editor, options }));
+
 		if (this.move) {
-			sourceGroup.moveEditors(sourceEditors, auxiliaryEditorPart.activeGroup);
+			group.moveEditors(editorsWithOptions, auxiliaryEditorPart.activeGroup);
 		} else {
-			sourceGroup.copyEditors(sourceEditors, auxiliaryEditorPart.activeGroup);
+			group.copyEditors(editorsWithOptions, auxiliaryEditorPart.activeGroup);
 		}
 
 		auxiliaryEditorPart.activeGroup.focus();
diff --git a/src/vs/workbench/browser/parts/editor/editorAutoSave.ts b/src/vs/workbench/browser/parts/editor/editorAutoSave.ts
index 2b3de674cb9..a7698154133 100644
--- a/src/vs/workbench/browser/parts/editor/editorAutoSave.ts
+++ b/src/vs/workbench/browser/parts/editor/editorAutoSave.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { Disposable, DisposableStore, IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
-import { IFilesConfigurationService, AutoSaveMode, AutoSaveDisabledReason } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { SaveReason, IEditorIdentifier, GroupIdentifier, EditorInputCapabilities } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
-import { IWorkingCopy, WorkingCopyCapabilities } from 'vs/workbench/services/workingCopy/common/workingCopy';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IMarkerService } from 'vs/platform/markers/common/markers';
-import { URI } from 'vs/base/common/uri';
-import { ResourceMap } from 'vs/base/common/map';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { Disposable, DisposableStore, IDisposable, dispose, toDisposable } from '../../../../base/common/lifecycle.js';
+import { IFilesConfigurationService, AutoSaveMode, AutoSaveDisabledReason } from '../../../services/filesConfiguration/common/filesConfigurationService.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { SaveReason, IEditorIdentifier, GroupIdentifier, EditorInputCapabilities } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { IWorkingCopyService } from '../../../services/workingCopy/common/workingCopyService.js';
+import { IWorkingCopy, WorkingCopyCapabilities } from '../../../services/workingCopy/common/workingCopy.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IMarkerService } from '../../../../platform/markers/common/markers.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
 
 export class EditorAutoSave extends Disposable implements IWorkbenchContribution {
 
@@ -84,7 +84,7 @@ export class EditorAutoSave extends Disposable implements IWorkbenchContribution
 				) {
 					this.discardAutoSave(workingCopyResult.workingCopy);
 
-					this.logService.info(`[editor auto save] running auto save from condition change event`, workingCopyResult.workingCopy.resource.toString(), workingCopyResult.workingCopy.typeId);
+					this.logService.trace(`[editor auto save] running auto save from condition change event`, workingCopyResult.workingCopy.resource.toString(), workingCopyResult.workingCopy.typeId);
 					workingCopyResult.workingCopy.save({ reason: workingCopyResult.reason });
 				}
 			}
@@ -100,7 +100,7 @@ export class EditorAutoSave extends Disposable implements IWorkbenchContribution
 				) {
 					this.waitingOnConditionAutoSaveEditors.delete(resource);
 
-					this.logService.info(`[editor auto save] running auto save from condition change event with reason ${editorResult.reason}`);
+					this.logService.trace(`[editor auto save] running auto save from condition change event with reason ${editorResult.reason}`);
 					this.editorService.save(editorResult.editor, { reason: editorResult.reason });
 				}
 			}
diff --git a/src/vs/workbench/browser/parts/editor/editorCommands.ts b/src/vs/workbench/browser/parts/editor/editorCommands.ts
index c8670de6fb0..6dda6ad5348 100644
--- a/src/vs/workbench/browser/parts/editor/editorCommands.ts
+++ b/src/vs/workbench/browser/parts/editor/editorCommands.ts
@@ -3,45 +3,43 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getActiveElement } from 'vs/base/browser/dom';
-import { List } from 'vs/base/browser/ui/list/listWidget';
-import { coalesce, distinct } from 'vs/base/common/arrays';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Schemas, matchesScheme } from 'vs/base/common/network';
-import { extname, isEqual } from 'vs/base/common/resources';
-import { isNumber, isObject, isString, isUndefined } from 'vs/base/common/types';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { isDiffEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { localize, localize2 } from 'vs/nls';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { CommandsRegistry, ICommandHandler, ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { EditorResolution, IEditorOptions, IResourceEditorInput, ITextEditorOptions } from 'vs/platform/editor/common/editor';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight, KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { IListService, IOpenEvent } from 'vs/platform/list/browser/listService';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { ActiveGroupEditorsByMostRecentlyUsedQuickAccess } from 'vs/workbench/browser/parts/editor/editorQuickAccess';
-import { SideBySideEditor } from 'vs/workbench/browser/parts/editor/sideBySideEditor';
-import { TextDiffEditor } from 'vs/workbench/browser/parts/editor/textDiffEditor';
-import { ActiveEditorCanSplitInGroupContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupLockedContext, ActiveEditorStickyContext, MultipleEditorGroupsContext, SideBySideEditorActiveContext, TextCompareEditorActiveContext } from 'vs/workbench/common/contextkeys';
-import { CloseDirection, EditorInputCapabilities, EditorsOrder, IEditorCommandsContext, IEditorIdentifier, IResourceDiffEditorInput, IUntitledTextResourceEditorInput, IVisibleEditorPane, isEditorIdentifier, isEditorInputWithOptionsAndGroup } from 'vs/workbench/common/editor';
-import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditorInput';
-import { EditorGroupColumn, columnToEditorGroup } from 'vs/workbench/services/editor/common/editorGroupColumn';
-import { EditorGroupLayout, GroupDirection, GroupLocation, GroupsOrder, IEditorGroup, IEditorGroupsService, IEditorReplacement, isEditorGroup, preferredSideBySideGroupDirection } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorResolverService } from 'vs/workbench/services/editor/common/editorResolverService';
-import { IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { IUntitledTextEditorService } from 'vs/workbench/services/untitled/common/untitledTextEditorService';
-import { DIFF_FOCUS_OTHER_SIDE, DIFF_FOCUS_PRIMARY_SIDE, DIFF_FOCUS_SECONDARY_SIDE, DIFF_OPEN_SIDE, registerDiffEditorCommands } from './diffEditorCommands';
+import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
+import { KeyChord, KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { Schemas, matchesScheme } from '../../../../base/common/network.js';
+import { extname } from '../../../../base/common/resources.js';
+import { isNumber, isObject, isString, isUndefined } from '../../../../base/common/types.js';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
+import { isDiffEditor } from '../../../../editor/browser/editorBrowser.js';
+import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { CommandsRegistry, ICommandHandler, ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { EditorResolution, IEditorOptions, IResourceEditorInput, ITextEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight, KeybindingsRegistry } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IListService, IOpenEvent } from '../../../../platform/list/browser/listService.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { ActiveGroupEditorsByMostRecentlyUsedQuickAccess } from './editorQuickAccess.js';
+import { SideBySideEditor } from './sideBySideEditor.js';
+import { TextDiffEditor } from './textDiffEditor.js';
+import { ActiveEditorCanSplitInGroupContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupLockedContext, ActiveEditorStickyContext, MultipleEditorGroupsContext, SideBySideEditorActiveContext, TextCompareEditorActiveContext } from '../../../common/contextkeys.js';
+import { CloseDirection, EditorInputCapabilities, EditorsOrder, IResourceDiffEditorInput, IUntitledTextResourceEditorInput, IVisibleEditorPane, isEditorInputWithOptionsAndGroup } from '../../../common/editor.js';
+import { DiffEditorInput } from '../../../common/editor/diffEditorInput.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
+import { EditorGroupColumn, columnToEditorGroup } from '../../../services/editor/common/editorGroupColumn.js';
+import { EditorGroupLayout, GroupDirection, GroupLocation, GroupsOrder, IEditorGroup, IEditorGroupsService, IEditorReplacement, preferredSideBySideGroupDirection } from '../../../services/editor/common/editorGroupsService.js';
+import { IEditorResolverService } from '../../../services/editor/common/editorResolverService.js';
+import { IEditorService, SIDE_GROUP } from '../../../services/editor/common/editorService.js';
+import { IPathService } from '../../../services/path/common/pathService.js';
+import { IUntitledTextEditorService } from '../../../services/untitled/common/untitledTextEditorService.js';
+import { DIFF_FOCUS_OTHER_SIDE, DIFF_FOCUS_PRIMARY_SIDE, DIFF_FOCUS_SECONDARY_SIDE, DIFF_OPEN_SIDE, registerDiffEditorCommands } from './diffEditorCommands.js';
+import { IResolvedEditorCommandsContext, resolveCommandsContext } from './editorCommandsContext.js';
 
 export const CLOSE_SAVED_EDITORS_COMMAND_ID = 'workbench.action.closeUnmodifiedEditors';
 export const CLOSE_EDITORS_IN_GROUP_COMMAND_ID = 'workbench.action.closeEditorsInGroup';
@@ -242,7 +240,7 @@ function registerActiveEditorMoveCopyCommand(): void {
 	}
 
 	function moveCopyActiveEditorToGroup(isMove: boolean, args: ActiveEditorMoveCopyArguments, control: IVisibleEditorPane, accessor: ServicesAccessor): void {
-		const editorGroupService = accessor.get(IEditorGroupsService);
+		const editorGroupsService = accessor.get(IEditorGroupsService);
 		const configurationService = accessor.get(IConfigurationService);
 
 		const sourceGroup = control.group;
@@ -250,49 +248,49 @@ function registerActiveEditorMoveCopyCommand(): void {
 
 		switch (args.to) {
 			case 'left':
-				targetGroup = editorGroupService.findGroup({ direction: GroupDirection.LEFT }, sourceGroup);
+				targetGroup = editorGroupsService.findGroup({ direction: GroupDirection.LEFT }, sourceGroup);
 				if (!targetGroup) {
-					targetGroup = editorGroupService.addGroup(sourceGroup, GroupDirection.LEFT);
+					targetGroup = editorGroupsService.addGroup(sourceGroup, GroupDirection.LEFT);
 				}
 				break;
 			case 'right':
-				targetGroup = editorGroupService.findGroup({ direction: GroupDirection.RIGHT }, sourceGroup);
+				targetGroup = editorGroupsService.findGroup({ direction: GroupDirection.RIGHT }, sourceGroup);
 				if (!targetGroup) {
-					targetGroup = editorGroupService.addGroup(sourceGroup, GroupDirection.RIGHT);
+					targetGroup = editorGroupsService.addGroup(sourceGroup, GroupDirection.RIGHT);
 				}
 				break;
 			case 'up':
-				targetGroup = editorGroupService.findGroup({ direction: GroupDirection.UP }, sourceGroup);
+				targetGroup = editorGroupsService.findGroup({ direction: GroupDirection.UP }, sourceGroup);
 				if (!targetGroup) {
-					targetGroup = editorGroupService.addGroup(sourceGroup, GroupDirection.UP);
+					targetGroup = editorGroupsService.addGroup(sourceGroup, GroupDirection.UP);
 				}
 				break;
 			case 'down':
-				targetGroup = editorGroupService.findGroup({ direction: GroupDirection.DOWN }, sourceGroup);
+				targetGroup = editorGroupsService.findGroup({ direction: GroupDirection.DOWN }, sourceGroup);
 				if (!targetGroup) {
-					targetGroup = editorGroupService.addGroup(sourceGroup, GroupDirection.DOWN);
+					targetGroup = editorGroupsService.addGroup(sourceGroup, GroupDirection.DOWN);
 				}
 				break;
 			case 'first':
-				targetGroup = editorGroupService.findGroup({ location: GroupLocation.FIRST }, sourceGroup);
+				targetGroup = editorGroupsService.findGroup({ location: GroupLocation.FIRST }, sourceGroup);
 				break;
 			case 'last':
-				targetGroup = editorGroupService.findGroup({ location: GroupLocation.LAST }, sourceGroup);
+				targetGroup = editorGroupsService.findGroup({ location: GroupLocation.LAST }, sourceGroup);
 				break;
 			case 'previous':
-				targetGroup = editorGroupService.findGroup({ location: GroupLocation.PREVIOUS }, sourceGroup);
+				targetGroup = editorGroupsService.findGroup({ location: GroupLocation.PREVIOUS }, sourceGroup);
 				break;
 			case 'next':
-				targetGroup = editorGroupService.findGroup({ location: GroupLocation.NEXT }, sourceGroup);
+				targetGroup = editorGroupsService.findGroup({ location: GroupLocation.NEXT }, sourceGroup);
 				if (!targetGroup) {
-					targetGroup = editorGroupService.addGroup(sourceGroup, preferredSideBySideGroupDirection(configurationService));
+					targetGroup = editorGroupsService.addGroup(sourceGroup, preferredSideBySideGroupDirection(configurationService));
 				}
 				break;
 			case 'center':
-				targetGroup = editorGroupService.getGroups(GroupsOrder.GRID_APPEARANCE)[(editorGroupService.count / 2) - 1];
+				targetGroup = editorGroupsService.getGroups(GroupsOrder.GRID_APPEARANCE)[(editorGroupsService.count / 2) - 1];
 				break;
 			case 'position':
-				targetGroup = editorGroupService.getGroups(GroupsOrder.GRID_APPEARANCE)[(args.value ?? 1) - 1];
+				targetGroup = editorGroupsService.getGroups(GroupsOrder.GRID_APPEARANCE)[(args.value ?? 1) - 1];
 				break;
 		}
 
@@ -314,8 +312,8 @@ function registerEditorGroupsLayoutCommands(): void {
 			return;
 		}
 
-		const editorGroupService = accessor.get(IEditorGroupsService);
-		editorGroupService.applyLayout(layout);
+		const editorGroupsService = accessor.get(IEditorGroupsService);
+		editorGroupsService.applyLayout(layout);
 	}
 
 	CommandsRegistry.registerCommand(LAYOUT_EDITOR_GROUPS_COMMAND_ID, (accessor: ServicesAccessor, args: EditorGroupLayout) => {
@@ -352,9 +350,9 @@ function registerEditorGroupsLayoutCommands(): void {
 	CommandsRegistry.registerCommand({
 		id: 'vscode.getEditorLayout',
 		handler: (accessor: ServicesAccessor) => {
-			const editorGroupService = accessor.get(IEditorGroupsService);
+			const editorGroupsService = accessor.get(IEditorGroupsService);
 
-			return editorGroupService.getLayout();
+			return editorGroupsService.getLayout();
 		},
 		metadata: {
 			description: 'Get Editor Layout',
@@ -392,7 +390,7 @@ function registerOpenEditorAPICommands(): void {
 
 	CommandsRegistry.registerCommand(API_OPEN_EDITOR_COMMAND_ID, async function (accessor: ServicesAccessor, resourceArg: UriComponents | string, columnAndOptions?: [EditorGroupColumn?, ITextEditorOptions?], label?: string, context?: IOpenEvent<unknown>) {
 		const editorService = accessor.get(IEditorService);
-		const editorGroupService = accessor.get(IEditorGroupsService);
+		const editorGroupsService = accessor.get(IEditorGroupsService);
 		const openerService = accessor.get(IOpenerService);
 		const pathService = accessor.get(IPathService);
 		const configurationService = accessor.get(IConfigurationService);
@@ -421,7 +419,7 @@ function registerOpenEditorAPICommands(): void {
 				input = { resource, options, label };
 			}
 
-			await editorService.openEditor(input, columnToEditorGroup(editorGroupService, configurationService, column));
+			await editorService.openEditor(input, columnToEditorGroup(editorGroupsService, configurationService, column));
 		}
 
 		// do not allow to execute commands from here
@@ -454,7 +452,7 @@ function registerOpenEditorAPICommands(): void {
 
 	CommandsRegistry.registerCommand(API_OPEN_DIFF_EDITOR_COMMAND_ID, async function (accessor: ServicesAccessor, originalResource: UriComponents, modifiedResource: UriComponents, labelAndOrDescription?: string | { label: string; description: string }, columnAndOptions?: [EditorGroupColumn?, ITextEditorOptions?], context?: IOpenEvent<unknown>) {
 		const editorService = accessor.get(IEditorService);
-		const editorGroupService = accessor.get(IEditorGroupsService);
+		const editorGroupsService = accessor.get(IEditorGroupsService);
 		const configurationService = accessor.get(IConfigurationService);
 
 		const [columnArg, optionsArg] = columnAndOptions ?? [];
@@ -475,7 +473,7 @@ function registerOpenEditorAPICommands(): void {
 			label,
 			description,
 			options
-		}, columnToEditorGroup(editorGroupService, configurationService, column));
+		}, columnToEditorGroup(editorGroupsService, configurationService, column));
 	});
 
 	CommandsRegistry.registerCommand(API_OPEN_WITH_EDITOR_COMMAND_ID, async (accessor: ServicesAccessor, resource: UriComponents, id: string, columnAndOptions?: [EditorGroupColumn?, ITextEditorOptions?]) => {
@@ -596,30 +594,30 @@ function registerFocusEditorGroupAtIndexCommands(): void {
 			when: undefined,
 			primary: KeyMod.CtrlCmd | toKeyCode(groupIndex),
 			handler: accessor => {
-				const editorGroupService = accessor.get(IEditorGroupsService);
+				const editorGroupsService = accessor.get(IEditorGroupsService);
 				const configurationService = accessor.get(IConfigurationService);
 
 				// To keep backwards compatibility (pre-grid), allow to focus a group
 				// that does not exist as long as it is the next group after the last
 				// opened group. Otherwise we return.
-				if (groupIndex > editorGroupService.count) {
+				if (groupIndex > editorGroupsService.count) {
 					return;
 				}
 
 				// Group exists: just focus
-				const groups = editorGroupService.getGroups(GroupsOrder.GRID_APPEARANCE);
+				const groups = editorGroupsService.getGroups(GroupsOrder.GRID_APPEARANCE);
 				if (groups[groupIndex]) {
 					return groups[groupIndex].focus();
 				}
 
 				// Group does not exist: create new by splitting the active one of the last group
 				const direction = preferredSideBySideGroupDirection(configurationService);
-				const lastGroup = editorGroupService.findGroup({ location: GroupLocation.LAST });
+				const lastGroup = editorGroupsService.findGroup({ location: GroupLocation.LAST });
 				if (!lastGroup) {
 					return;
 				}
 
-				const newGroup = editorGroupService.addGroup(lastGroup, direction);
+				const newGroup = editorGroupsService.addGroup(lastGroup, direction);
 
 				// Focus
 				newGroup.focus();
@@ -656,50 +654,25 @@ function registerFocusEditorGroupAtIndexCommands(): void {
 	}
 }
 
-export function splitEditor(editorGroupService: IEditorGroupsService, direction: GroupDirection, contexts?: IEditorCommandsContext[]): void {
-	let newGroup: IEditorGroup | undefined;
-	let sourceGroup: IEditorGroup | undefined;
+export function splitEditor(editorGroupsService: IEditorGroupsService, direction: GroupDirection, resolvedContext: IResolvedEditorCommandsContext): void {
+	if (!resolvedContext.groupedEditors.length) {
+		return;
+	}
 
-	for (const context of contexts ?? [undefined]) {
-		let currentGroup: IEditorGroup | undefined;
-
-		if (context) {
-			currentGroup = editorGroupService.getGroup(context.groupId);
-		} else {
-			currentGroup = editorGroupService.activeGroup;
-		}
-
-		if (!currentGroup) {
-			continue;
-		}
-
-		if (!sourceGroup) {
-			sourceGroup = currentGroup;
-		} else if (sourceGroup.id !== currentGroup.id) {
-			continue; // Only support splitting from the same group
-		}
-
-		// Add group
-		if (!newGroup) {
-			newGroup = editorGroupService.addGroup(currentGroup, direction);
-		}
+	// Only support splitting from one source group
+	const { group, editors } = resolvedContext.groupedEditors[0];
+	const preserveFocus = resolvedContext.preserveFocus;
+	const newGroup = editorGroupsService.addGroup(group, direction);
 
+	for (const editorToCopy of editors) {
 		// Split editor (if it can be split)
-		let editorToCopy: EditorInput | undefined;
-		if (context && typeof context.editorIndex === 'number') {
-			editorToCopy = currentGroup.getEditorByIndex(context.editorIndex);
-		} else {
-			editorToCopy = currentGroup.activeEditor ?? undefined;
-		}
-
-		// Copy the editor to the new group, else create an empty group
 		if (editorToCopy && !editorToCopy.hasCapability(EditorInputCapabilities.Singleton)) {
-			currentGroup.copyEditor(editorToCopy, newGroup, { preserveFocus: context?.preserveFocus });
+			group.copyEditor(editorToCopy, newGroup, { preserveFocus });
 		}
 	}
 
 	// Focus
-	newGroup?.focus();
+	newGroup.focus();
 }
 
 function registerSplitEditorCommands() {
@@ -709,9 +682,9 @@ function registerSplitEditorCommands() {
 		{ id: SPLIT_EDITOR_LEFT, direction: GroupDirection.LEFT },
 		{ id: SPLIT_EDITOR_RIGHT, direction: GroupDirection.RIGHT }
 	].forEach(({ id, direction }) => {
-		CommandsRegistry.registerCommand(id, function (accessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext) {
-			const { editors } = getEditorsContext(accessor, resourceOrContext, context);
-			splitEditor(accessor.get(IEditorGroupsService), direction, editors);
+		CommandsRegistry.registerCommand(id, function (accessor, ...args) {
+			const resolvedContext = resolveCommandsContext(args, accessor.get(IEditorService), accessor.get(IEditorGroupsService), accessor.get(IListService));
+			splitEditor(accessor.get(IEditorGroupsService), direction, resolvedContext);
 		});
 	});
 }
@@ -721,14 +694,14 @@ function registerCloseEditorCommands() {
 	// A special handler for "Close Editor" depending on context
 	// - keybindining: do not close sticky editors, rather open the next non-sticky editor
 	// - menu: always close editor, even sticky ones
-	function closeEditorHandler(accessor: ServicesAccessor, forceCloseStickyEditors: boolean, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext): Promise<unknown> {
+	function closeEditorHandler(accessor: ServicesAccessor, forceCloseStickyEditors: boolean, ...args: unknown[]): Promise<unknown> {
 		const editorGroupsService = accessor.get(IEditorGroupsService);
 		const editorService = accessor.get(IEditorService);
 
 		let keepStickyEditors: boolean | undefined = undefined;
 		if (forceCloseStickyEditors) {
 			keepStickyEditors = false; // explicitly close sticky editors
-		} else if (resourceOrContext || context) {
+		} else if (args.length) {
 			keepStickyEditors = false; // we have a context, as such this command was used e.g. from the tab context menu
 		} else {
 			keepStickyEditors = editorGroupsService.partOptions.preventPinnedEditorClose === 'keyboard' || editorGroupsService.partOptions.preventPinnedEditorClose === 'keyboardAndMouse'; // respect setting otherwise
@@ -756,17 +729,12 @@ function registerCloseEditorCommands() {
 		}
 
 		// With context: proceed to close editors as instructed
-		const { editors, groups } = getEditorsContext(accessor, resourceOrContext, context);
+		const resolvedContext = resolveCommandsContext(args, accessor.get(IEditorService), accessor.get(IEditorGroupsService), accessor.get(IListService));
+		const preserveFocus = resolvedContext.preserveFocus;
 
-		return Promise.all(groups.map(async group => {
-			if (group) {
-				const editorsToClose = coalesce(editors
-					.filter(editor => editor.groupId === group.id)
-					.map(editor => typeof editor.editorIndex === 'number' ? group.getEditorByIndex(editor.editorIndex) : group.activeEditor))
-					.filter(editor => !keepStickyEditors || !group.isSticky(editor));
-
-				await group.closeEditors(editorsToClose, { preserveFocus: context?.preserveFocus });
-			}
+		return Promise.all(resolvedContext.groupedEditors.map(async ({ group, editors }) => {
+			const editorsToClose = editors.filter(editor => !keepStickyEditors || !group.isSticky(editor));
+			await group.closeEditors(editorsToClose, { preserveFocus });
 		}));
 	}
 
@@ -776,13 +744,13 @@ function registerCloseEditorCommands() {
 		when: undefined,
 		primary: KeyMod.CtrlCmd | KeyCode.KeyW,
 		win: { primary: KeyMod.CtrlCmd | KeyCode.F4, secondary: [KeyMod.CtrlCmd | KeyCode.KeyW] },
-		handler: (accessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext) => {
-			return closeEditorHandler(accessor, false, resourceOrContext, context);
+		handler: (accessor, ...args: unknown[]) => {
+			return closeEditorHandler(accessor, false, ...args);
 		}
 	});
 
-	CommandsRegistry.registerCommand(CLOSE_PINNED_EDITOR_COMMAND_ID, (accessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext) => {
-		return closeEditorHandler(accessor, true /* force close pinned editors */, resourceOrContext, context);
+	CommandsRegistry.registerCommand(CLOSE_PINNED_EDITOR_COMMAND_ID, (accessor, ...args: unknown[]) => {
+		return closeEditorHandler(accessor, true /* force close pinned editors */, ...args);
 	});
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
@@ -790,12 +758,10 @@ function registerCloseEditorCommands() {
 		weight: KeybindingWeight.WorkbenchContrib,
 		when: undefined,
 		primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.KeyW),
-		handler: (accessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext) => {
-			return Promise.all(getEditorsContext(accessor, resourceOrContext, context).groups.map(async group => {
-				if (group) {
-					await group.closeAllEditors({ excludeSticky: true });
-					return;
-				}
+		handler: (accessor, ...args: unknown[]) => {
+			const resolvedContext = resolveCommandsContext(args, accessor.get(IEditorService), accessor.get(IEditorGroupsService), accessor.get(IListService));
+			return Promise.all(resolvedContext.groupedEditors.map(async ({ group }) => {
+				await group.closeAllEditors({ excludeSticky: true });
 			}));
 		}
 	});
@@ -806,19 +772,12 @@ function registerCloseEditorCommands() {
 		when: ContextKeyExpr.and(ActiveEditorGroupEmptyContext, MultipleEditorGroupsContext),
 		primary: KeyMod.CtrlCmd | KeyCode.KeyW,
 		win: { primary: KeyMod.CtrlCmd | KeyCode.F4, secondary: [KeyMod.CtrlCmd | KeyCode.KeyW] },
-		handler: (accessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext) => {
-			const editorGroupService = accessor.get(IEditorGroupsService);
-			const commandsContext = getCommandsContext(accessor, resourceOrContext, context);
+		handler: (accessor, ...args: unknown[]) => {
+			const editorGroupsService = accessor.get(IEditorGroupsService);
+			const commandsContext = resolveCommandsContext(args, accessor.get(IEditorService), editorGroupsService, accessor.get(IListService));
 
-			let group: IEditorGroup | undefined;
-			if (commandsContext && typeof commandsContext.groupId === 'number') {
-				group = editorGroupService.getGroup(commandsContext.groupId);
-			} else {
-				group = editorGroupService.activeGroup;
-			}
-
-			if (group) {
-				editorGroupService.removeGroup(group);
+			if (commandsContext.groupedEditors.length) {
+				editorGroupsService.removeGroup(commandsContext.groupedEditors[0].group);
 			}
 		}
 	});
@@ -828,11 +787,10 @@ function registerCloseEditorCommands() {
 		weight: KeybindingWeight.WorkbenchContrib,
 		when: undefined,
 		primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.KeyU),
-		handler: (accessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext) => {
-			return Promise.all(getEditorsContext(accessor, resourceOrContext, context).groups.map(async group => {
-				if (group) {
-					await group.closeEditors({ savedOnly: true, excludeSticky: true }, { preserveFocus: context?.preserveFocus });
-				}
+		handler: (accessor, ...args: unknown[]) => {
+			const resolvedContext = resolveCommandsContext(args, accessor.get(IEditorService), accessor.get(IEditorGroupsService), accessor.get(IListService));
+			return Promise.all(resolvedContext.groupedEditors.map(async ({ group }) => {
+				await group.closeEditors({ savedOnly: true, excludeSticky: true }, { preserveFocus: resolvedContext.preserveFocus });
 			}));
 		}
 	});
@@ -843,24 +801,19 @@ function registerCloseEditorCommands() {
 		when: undefined,
 		primary: undefined,
 		mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyT },
-		handler: (accessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext) => {
-			const { editors, groups } = getEditorsContext(accessor, resourceOrContext, context);
-			return Promise.all(groups.map(async group => {
-				if (group) {
-					const editorsToKeep = editors
-						.filter(editor => editor.groupId === group.id)
-						.map(editor => typeof editor.editorIndex === 'number' ? group.getEditorByIndex(editor.editorIndex) : group.activeEditor);
+		handler: (accessor, ...args: unknown[]) => {
+			const resolvedContext = resolveCommandsContext(args, accessor.get(IEditorService), accessor.get(IEditorGroupsService), accessor.get(IListService));
 
-					const editorsToClose = group.getEditors(EditorsOrder.SEQUENTIAL, { excludeSticky: true }).filter(editor => !editorsToKeep.includes(editor));
+			return Promise.all(resolvedContext.groupedEditors.map(async ({ group, editors }) => {
+				const editorsToClose = group.getEditors(EditorsOrder.SEQUENTIAL, { excludeSticky: true }).filter(editor => !editors.includes(editor));
 
-					for (const editorToKeep of editorsToKeep) {
-						if (editorToKeep) {
-							group.pinEditor(editorToKeep);
-						}
+				for (const editorToKeep of editors) {
+					if (editorToKeep) {
+						group.pinEditor(editorToKeep);
 					}
-
-					await group.closeEditors(editorsToClose, { preserveFocus: context?.preserveFocus });
 				}
+
+				await group.closeEditors(editorsToClose, { preserveFocus: resolvedContext.preserveFocus });
 			}));
 		}
 	});
@@ -870,16 +823,15 @@ function registerCloseEditorCommands() {
 		weight: KeybindingWeight.WorkbenchContrib,
 		when: undefined,
 		primary: undefined,
-		handler: async (accessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext) => {
-			const editorGroupService = accessor.get(IEditorGroupsService);
-
-			const { group, editor } = resolveCommandsContext(editorGroupService, getCommandsContext(accessor, resourceOrContext, context));
-			if (group && editor) {
+		handler: async (accessor, ...args: unknown[]) => {
+			const resolvedContext = resolveCommandsContext(args, accessor.get(IEditorService), accessor.get(IEditorGroupsService), accessor.get(IListService));
+			if (resolvedContext.groupedEditors.length) {
+				const { group, editors } = resolvedContext.groupedEditors[0];
 				if (group.activeEditor) {
 					group.pinEditor(group.activeEditor);
 				}
 
-				await group.closeEditors({ direction: CloseDirection.RIGHT, except: editor, excludeSticky: true }, { preserveFocus: context?.preserveFocus });
+				await group.closeEditors({ direction: CloseDirection.RIGHT, except: editors[0], excludeSticky: true }, { preserveFocus: resolvedContext.preserveFocus });
 			}
 		}
 	});
@@ -889,62 +841,64 @@ function registerCloseEditorCommands() {
 		weight: KeybindingWeight.WorkbenchContrib,
 		when: undefined,
 		primary: undefined,
-		handler: async (accessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext) => {
+		handler: async (accessor, ...args: unknown[]) => {
 			const editorService = accessor.get(IEditorService);
 			const editorResolverService = accessor.get(IEditorResolverService);
 			const telemetryService = accessor.get(ITelemetryService);
 
-			const editorsAndGroup = resolveEditorsContext(getEditorsContext(accessor, resourceOrContext, context));
+			const resolvedContext = resolveCommandsContext(args, editorService, accessor.get(IEditorGroupsService), accessor.get(IListService));
 			const editorReplacements = new Map<IEditorGroup, IEditorReplacement[]>();
 
-			for (const { editor, group } of editorsAndGroup) {
-				const untypedEditor = editor.toUntyped();
-				if (!untypedEditor) {
-					return; // Resolver can only resolve untyped editors
+			for (const { group, editors } of resolvedContext.groupedEditors) {
+				for (const editor of editors) {
+					const untypedEditor = editor.toUntyped();
+					if (!untypedEditor) {
+						return; // Resolver can only resolve untyped editors
+					}
+
+					untypedEditor.options = { ...editorService.activeEditorPane?.options, override: EditorResolution.PICK };
+					const resolvedEditor = await editorResolverService.resolveEditor(untypedEditor, group);
+					if (!isEditorInputWithOptionsAndGroup(resolvedEditor)) {
+						return;
+					}
+
+					let editorReplacementsInGroup = editorReplacements.get(group);
+					if (!editorReplacementsInGroup) {
+						editorReplacementsInGroup = [];
+						editorReplacements.set(group, editorReplacementsInGroup);
+					}
+
+					editorReplacementsInGroup.push({
+						editor: editor,
+						replacement: resolvedEditor.editor,
+						forceReplaceDirty: editor.resource?.scheme === Schemas.untitled,
+						options: resolvedEditor.options
+					});
+
+					// Telemetry
+					type WorkbenchEditorReopenClassification = {
+						owner: 'rebornix';
+						comment: 'Identify how a document is reopened';
+						scheme: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'File system provider scheme for the resource' };
+						ext: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'File extension for the resource' };
+						from: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The editor view type the resource is switched from' };
+						to: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The editor view type the resource is switched to' };
+					};
+
+					type WorkbenchEditorReopenEvent = {
+						scheme: string;
+						ext: string;
+						from: string;
+						to: string;
+					};
+
+					telemetryService.publicLog2<WorkbenchEditorReopenEvent, WorkbenchEditorReopenClassification>('workbenchEditorReopen', {
+						scheme: editor.resource?.scheme ?? '',
+						ext: editor.resource ? extname(editor.resource) : '',
+						from: editor.editorId ?? '',
+						to: resolvedEditor.editor.editorId ?? ''
+					});
 				}
-
-				untypedEditor.options = { ...editorService.activeEditorPane?.options, override: EditorResolution.PICK };
-				const resolvedEditor = await editorResolverService.resolveEditor(untypedEditor, group);
-				if (!isEditorInputWithOptionsAndGroup(resolvedEditor)) {
-					return;
-				}
-
-				let editorReplacementsInGroup = editorReplacements.get(group);
-				if (!editorReplacementsInGroup) {
-					editorReplacementsInGroup = [];
-					editorReplacements.set(group, editorReplacementsInGroup);
-				}
-
-				editorReplacementsInGroup.push({
-					editor: editor,
-					replacement: resolvedEditor.editor,
-					forceReplaceDirty: editor.resource?.scheme === Schemas.untitled,
-					options: resolvedEditor.options
-				});
-
-				// Telemetry
-				type WorkbenchEditorReopenClassification = {
-					owner: 'rebornix';
-					comment: 'Identify how a document is reopened';
-					scheme: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'File system provider scheme for the resource' };
-					ext: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'File extension for the resource' };
-					from: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The editor view type the resource is switched from' };
-					to: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The editor view type the resource is switched to' };
-				};
-
-				type WorkbenchEditorReopenEvent = {
-					scheme: string;
-					ext: string;
-					from: string;
-					to: string;
-				};
-
-				telemetryService.publicLog2<WorkbenchEditorReopenEvent, WorkbenchEditorReopenClassification>('workbenchEditorReopen', {
-					scheme: editor.resource?.scheme ?? '',
-					ext: editor.resource ? extname(editor.resource) : '',
-					from: editor.editorId ?? '',
-					to: resolvedEditor.editor.editorId ?? ''
-				});
 			}
 
 			// Replace editor with resolved one and make active
@@ -955,15 +909,16 @@ function registerCloseEditorCommands() {
 		}
 	});
 
-	CommandsRegistry.registerCommand(CLOSE_EDITORS_AND_GROUP_COMMAND_ID, async (accessor: ServicesAccessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext) => {
-		const editorGroupService = accessor.get(IEditorGroupsService);
+	CommandsRegistry.registerCommand(CLOSE_EDITORS_AND_GROUP_COMMAND_ID, async (accessor: ServicesAccessor, ...args: unknown[]) => {
+		const editorGroupsService = accessor.get(IEditorGroupsService);
 
-		const { group } = resolveCommandsContext(editorGroupService, getCommandsContext(accessor, resourceOrContext, context));
-		if (group) {
+		const resolvedContext = resolveCommandsContext(args, accessor.get(IEditorService), editorGroupsService, accessor.get(IListService));
+		if (resolvedContext.groupedEditors.length) {
+			const { group } = resolvedContext.groupedEditors[0];
 			await group.closeAllEditors();
 
-			if (group.count === 0 && editorGroupService.getGroup(group.id) /* could be gone by now */) {
-				editorGroupService.removeGroup(group); // only remove group if it is now empty
+			if (group.count === 0 && editorGroupsService.getGroup(group.id) /* could be gone by now */) {
+				editorGroupsService.removeGroup(group); // only remove group if it is now empty
 			}
 		}
 	});
@@ -992,9 +947,9 @@ function registerFocusEditorGroupWihoutWrapCommands(): void {
 
 	for (const command of commands) {
 		CommandsRegistry.registerCommand(command.id, async (accessor: ServicesAccessor) => {
-			const editorGroupService = accessor.get(IEditorGroupsService);
+			const editorGroupsService = accessor.get(IEditorGroupsService);
 
-			const group = editorGroupService.findGroup({ direction: command.direction }, editorGroupService.activeGroup, false);
+			const group = editorGroupsService.findGroup({ direction: command.direction }, editorGroupsService.activeGroup, false);
 			group?.focus();
 		});
 	}
@@ -1002,11 +957,15 @@ function registerFocusEditorGroupWihoutWrapCommands(): void {
 
 function registerSplitEditorInGroupCommands(): void {
 
-	async function splitEditorInGroup(accessor: ServicesAccessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext): Promise<void> {
-		const editorGroupService = accessor.get(IEditorGroupsService);
+	async function splitEditorInGroup(accessor: ServicesAccessor, resolvedContext: IResolvedEditorCommandsContext): Promise<void> {
 		const instantiationService = accessor.get(IInstantiationService);
 
-		const { group, editor } = resolveCommandsContext(editorGroupService, getCommandsContext(accessor, resourceOrContext, context));
+		if (!resolvedContext.groupedEditors.length) {
+			return;
+		}
+
+		const { group, editors } = resolvedContext.groupedEditors[0];
+		const editor = editors[0];
 		if (!editor) {
 			return;
 		}
@@ -1033,15 +992,22 @@ function registerSplitEditorInGroupCommands(): void {
 				}
 			});
 		}
-		run(accessor: ServicesAccessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext): Promise<void> {
-			return splitEditorInGroup(accessor, resourceOrContext, context);
+		run(accessor: ServicesAccessor, ...args: unknown[]): Promise<void> {
+			return splitEditorInGroup(accessor, resolveCommandsContext(args, accessor.get(IEditorService), accessor.get(IEditorGroupsService), accessor.get(IListService)));
 		}
 	});
 
-	async function joinEditorInGroup(accessor: ServicesAccessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext): Promise<void> {
-		const editorGroupService = accessor.get(IEditorGroupsService);
+	async function joinEditorInGroup(resolvedContext: IResolvedEditorCommandsContext): Promise<void> {
+		if (!resolvedContext.groupedEditors.length) {
+			return;
+		}
+
+		const { group, editors } = resolvedContext.groupedEditors[0];
+		const editor = editors[0];
+		if (!editor) {
+			return;
+		}
 
-		const { group, editor } = resolveCommandsContext(editorGroupService, getCommandsContext(accessor, resourceOrContext, context));
 		if (!(editor instanceof SideBySideEditorInput)) {
 			return;
 		}
@@ -1079,8 +1045,8 @@ function registerSplitEditorInGroupCommands(): void {
 				}
 			});
 		}
-		run(accessor: ServicesAccessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext): Promise<void> {
-			return joinEditorInGroup(accessor, resourceOrContext, context);
+		run(accessor: ServicesAccessor, ...args: unknown[]): Promise<void> {
+			return joinEditorInGroup(resolveCommandsContext(args, accessor.get(IEditorService), accessor.get(IEditorGroupsService), accessor.get(IListService)));
 		}
 	});
 
@@ -1094,14 +1060,18 @@ function registerSplitEditorInGroupCommands(): void {
 				f1: true
 			});
 		}
-		async run(accessor: ServicesAccessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext): Promise<void> {
-			const editorGroupService = accessor.get(IEditorGroupsService);
+		async run(accessor: ServicesAccessor, ...args: unknown[]): Promise<void> {
+			const resolvedContext = resolveCommandsContext(args, accessor.get(IEditorService), accessor.get(IEditorGroupsService), accessor.get(IListService));
+			if (!resolvedContext.groupedEditors.length) {
+				return;
+			}
 
-			const { editor } = resolveCommandsContext(editorGroupService, getCommandsContext(accessor, resourceOrContext, context));
-			if (editor instanceof SideBySideEditorInput) {
-				await joinEditorInGroup(accessor, resourceOrContext, context);
-			} else if (editor) {
-				await splitEditorInGroup(accessor, resourceOrContext, context);
+			const { editors } = resolvedContext.groupedEditors[0];
+
+			if (editors[0] instanceof SideBySideEditorInput) {
+				await joinEditorInGroup(resolvedContext);
+			} else if (editors[0]) {
+				await splitEditorInGroup(accessor, resolvedContext);
 			}
 		}
 	});
@@ -1215,12 +1185,12 @@ function registerOtherEditorCommands(): void {
 		weight: KeybindingWeight.WorkbenchContrib,
 		when: undefined,
 		primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.Enter),
-		handler: async (accessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext) => {
-			const editorGroupService = accessor.get(IEditorGroupsService);
-
-			const { group, editor } = resolveCommandsContext(editorGroupService, getCommandsContext(accessor, resourceOrContext, context));
-			if (group && editor) {
-				return group.pinEditor(editor);
+		handler: async (accessor, ...args: unknown[]) => {
+			const resolvedContext = resolveCommandsContext(args, accessor.get(IEditorService), accessor.get(IEditorGroupsService), accessor.get(IListService));
+			for (const { group, editors } of resolvedContext.groupedEditors) {
+				for (const editor of editors) {
+					group.pinEditor(editor);
+				}
 			}
 		}
 	});
@@ -1236,10 +1206,9 @@ function registerOtherEditorCommands(): void {
 		}
 	});
 
-	function setEditorGroupLock(accessor: ServicesAccessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext, locked?: boolean): void {
-		const editorGroupService = accessor.get(IEditorGroupsService);
-
-		const { group } = resolveCommandsContext(editorGroupService, getCommandsContext(accessor, resourceOrContext, context));
+	function setEditorGroupLock(accessor: ServicesAccessor, locked: boolean | undefined, ...args: unknown[]): void {
+		const resolvedContext = resolveCommandsContext(args, accessor.get(IEditorService), accessor.get(IEditorGroupsService), accessor.get(IListService));
+		const group = resolvedContext.groupedEditors[0]?.group;
 		group?.lock(locked ?? !group.isLocked);
 	}
 
@@ -1252,8 +1221,8 @@ function registerOtherEditorCommands(): void {
 				f1: true
 			});
 		}
-		async run(accessor: ServicesAccessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext): Promise<void> {
-			setEditorGroupLock(accessor, resourceOrContext, context);
+		async run(accessor: ServicesAccessor, ...args: unknown[]): Promise<void> {
+			setEditorGroupLock(accessor, undefined, ...args);
 		}
 	});
 
@@ -1267,8 +1236,8 @@ function registerOtherEditorCommands(): void {
 				f1: true
 			});
 		}
-		async run(accessor: ServicesAccessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext): Promise<void> {
-			setEditorGroupLock(accessor, resourceOrContext, context, true);
+		async run(accessor: ServicesAccessor, ...args: unknown[]): Promise<void> {
+			setEditorGroupLock(accessor, true, ...args);
 		}
 	});
 
@@ -1282,8 +1251,8 @@ function registerOtherEditorCommands(): void {
 				f1: true
 			});
 		}
-		async run(accessor: ServicesAccessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext): Promise<void> {
-			setEditorGroupLock(accessor, resourceOrContext, context, false);
+		async run(accessor: ServicesAccessor, ...args: unknown[]): Promise<void> {
+			setEditorGroupLock(accessor, false, ...args);
 		}
 	});
 
@@ -1292,9 +1261,12 @@ function registerOtherEditorCommands(): void {
 		weight: KeybindingWeight.WorkbenchContrib,
 		when: ActiveEditorStickyContext.toNegated(),
 		primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.Shift | KeyCode.Enter),
-		handler: async (accessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext) => {
-			for (const { editor, group } of resolveEditorsContext(getEditorsContext(accessor, resourceOrContext, context))) {
-				group.stickEditor(editor);
+		handler: async (accessor, ...args: unknown[]) => {
+			const resolvedContext = resolveCommandsContext(args, accessor.get(IEditorService), accessor.get(IEditorGroupsService), accessor.get(IListService));
+			for (const { group, editors } of resolvedContext.groupedEditors) {
+				for (const editor of editors) {
+					group.stickEditor(editor);
+				}
 			}
 		}
 	});
@@ -1306,7 +1278,7 @@ function registerOtherEditorCommands(): void {
 		primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.Shift | KeyCode.KeyO),
 		handler: async accessor => {
 			const editorService = accessor.get(IEditorService);
-			const editorGroupService = accessor.get(IEditorGroupsService);
+			const editorGroupsService = accessor.get(IEditorGroupsService);
 
 			const activeEditor = editorService.activeEditor;
 			const activeTextEditorControl = editorService.activeTextEditorControl;
@@ -1322,7 +1294,7 @@ function registerOtherEditorCommands(): void {
 				editor = activeEditor.modified;
 			}
 
-			return editorGroupService.activeGroup.openEditor(editor);
+			return editorGroupsService.activeGroup.openEditor(editor);
 		}
 	});
 
@@ -1331,9 +1303,12 @@ function registerOtherEditorCommands(): void {
 		weight: KeybindingWeight.WorkbenchContrib,
 		when: ActiveEditorStickyContext,
 		primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.Shift | KeyCode.Enter),
-		handler: async (accessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext) => {
-			for (const { editor, group } of resolveEditorsContext(getEditorsContext(accessor, resourceOrContext, context))) {
-				group.unstickEditor(editor);
+		handler: async (accessor, ...args: unknown[]) => {
+			const resolvedContext = resolveCommandsContext(args, accessor.get(IEditorService), accessor.get(IEditorGroupsService), accessor.get(IListService));
+			for (const { group, editors } of resolvedContext.groupedEditors) {
+				for (const editor of editors) {
+					group.unstickEditor(editor);
+				}
 			}
 		}
 	});
@@ -1343,16 +1318,14 @@ function registerOtherEditorCommands(): void {
 		weight: KeybindingWeight.WorkbenchContrib,
 		when: undefined,
 		primary: undefined,
-		handler: (accessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext) => {
-			const editorGroupService = accessor.get(IEditorGroupsService);
+		handler: (accessor, ...args: unknown[]) => {
+			const editorGroupsService = accessor.get(IEditorGroupsService);
 			const quickInputService = accessor.get(IQuickInputService);
 
-			const commandsContext = getCommandsContext(accessor, resourceOrContext, context);
-			if (commandsContext && typeof commandsContext.groupId === 'number') {
-				const group = editorGroupService.getGroup(commandsContext.groupId);
-				if (group) {
-					editorGroupService.activateGroup(group); // we need the group to be active
-				}
+			const commandsContext = resolveCommandsContext(args, accessor.get(IEditorService), editorGroupsService, accessor.get(IListService));
+			const group = commandsContext.groupedEditors[0]?.group;
+			if (group) {
+				editorGroupsService.activateGroup(group); // we need the group to be active
 			}
 
 			return quickInputService.quickAccess.show(ActiveGroupEditorsByMostRecentlyUsedQuickAccess.PREFIX);
@@ -1360,130 +1333,6 @@ function registerOtherEditorCommands(): void {
 	});
 }
 
-type EditorsContext = { editors: IEditorCommandsContext[]; groups: Array<IEditorGroup | undefined> };
-export function getEditorsContext(accessor: ServicesAccessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext): EditorsContext {
-	const editorGroupService = accessor.get(IEditorGroupsService);
-	const listService = accessor.get(IListService);
-
-	const editorContext = getMultiSelectedEditorContexts(getCommandsContext(accessor, resourceOrContext, context), listService, editorGroupService);
-
-	const activeGroup = editorGroupService.activeGroup;
-	if (editorContext.length === 0 && activeGroup.activeEditor) {
-		// add the active editor as fallback
-		editorContext.push({
-			groupId: activeGroup.id,
-			editorIndex: activeGroup.getIndexOfEditor(activeGroup.activeEditor)
-		});
-	}
-
-	return {
-		editors: editorContext,
-		groups: distinct(editorContext.map(context => context.groupId)).map(groupId => editorGroupService.getGroup(groupId))
-	};
-}
-
-export function resolveEditorsContext(context: EditorsContext): { editor: EditorInput; group: IEditorGroup }[] {
-	const { editors, groups } = context;
-
-	const editorsAndGroup = editors.map(e => {
-		if (e.editorIndex === undefined) {
-			return undefined;
-		}
-		const group = groups.find(group => group && group.id === e.groupId);
-		const editor = group?.getEditorByIndex(e.editorIndex);
-		if (!editor || !group) {
-			return undefined;
-		}
-		return { editor, group };
-	});
-
-	return coalesce(editorsAndGroup);
-}
-
-export function getCommandsContext(accessor: ServicesAccessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext): IEditorCommandsContext | undefined {
-	const isUri = URI.isUri(resourceOrContext);
-
-	const editorCommandsContext = isUri ? context : resourceOrContext ? resourceOrContext : context;
-	if (editorCommandsContext) {
-		return editorCommandsContext;
-	}
-
-	if (isUri) {
-		const editorGroupService = accessor.get(IEditorGroupsService);
-		const editorGroup = editorGroupService.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE).find(group => isEqual(group.activeEditor?.resource, resourceOrContext));
-		if (editorGroup) {
-			return { groupId: editorGroup.index, editorIndex: editorGroup.getIndexOfEditor(editorGroup.activeEditor!) };
-		}
-	}
-
-	return undefined;
-}
-
-export function resolveCommandsContext(editorGroupService: IEditorGroupsService, context?: IEditorCommandsContext): { group: IEditorGroup; editor?: EditorInput } {
-
-	// Resolve from context
-	let group = context && typeof context.groupId === 'number' ? editorGroupService.getGroup(context.groupId) : undefined;
-	let editor = group && context && typeof context.editorIndex === 'number' ? group.getEditorByIndex(context.editorIndex) ?? undefined : undefined;
-
-	// Fallback to active group as needed
-	if (!group) {
-		group = editorGroupService.activeGroup;
-	}
-
-	// Fallback to active editor as needed
-	if (!editor) {
-		editor = group.activeEditor ?? undefined;
-	}
-
-	return { group, editor };
-}
-
-export function getMultiSelectedEditorContexts(editorContext: IEditorCommandsContext | undefined, listService: IListService, editorGroupService: IEditorGroupsService): IEditorCommandsContext[] {
-
-	// First check for a focused list to return the selected items from
-	const list = listService.lastFocusedList;
-	if (list instanceof List && list.getHTMLElement() === getActiveElement()) {
-		const elementToContext = (element: IEditorIdentifier | IEditorGroup) => {
-			if (isEditorGroup(element)) {
-				return { groupId: element.id, editorIndex: undefined };
-			}
-
-			const group = editorGroupService.getGroup(element.groupId);
-
-			return { groupId: element.groupId, editorIndex: group ? group.getIndexOfEditor(element.editor) : -1 };
-		};
-
-		const onlyEditorGroupAndEditor = (e: IEditorIdentifier | IEditorGroup) => isEditorGroup(e) || isEditorIdentifier(e);
-
-		const focusedElements: Array<IEditorIdentifier | IEditorGroup> = list.getFocusedElements().filter(onlyEditorGroupAndEditor);
-		const focus = editorContext ? editorContext : focusedElements.length ? focusedElements.map(elementToContext)[0] : undefined; // need to take into account when editor context is { group: group }
-
-		if (focus) {
-			const selection: Array<IEditorIdentifier | IEditorGroup> = list.getSelectedElements().filter(onlyEditorGroupAndEditor);
-
-			if (selection.length > 1) {
-				return selection.map(elementToContext);
-			}
-
-			return [focus];
-		}
-	}
-	// Check editors selected in the group (tabs)
-	else {
-		const group = editorContext ? editorGroupService.getGroup(editorContext.groupId) : editorGroupService.activeGroup;
-		const editor = editorContext && editorContext.editorIndex !== undefined ? group?.getEditorByIndex(editorContext.editorIndex) : group?.activeEditor;
-		// If the editor is selected, return all selected editors otherwise only use the editors context
-		if (group && editor) {
-			if (group.isSelected(editor)) {
-				return group.selectedEditors.map(se => ({ groupId: group.id, editorIndex: group.getIndexOfEditor(se) }));
-			}
-		}
-	}
-
-	// Otherwise go with passed in context
-	return !!editorContext ? [editorContext] : [];
-}
-
 export function setup(): void {
 	registerActiveEditorMoveCopyCommand();
 	registerEditorGroupsLayoutCommands();
diff --git a/src/vs/workbench/browser/parts/editor/editorCommandsContext.ts b/src/vs/workbench/browser/parts/editor/editorCommandsContext.ts
new file mode 100644
index 00000000000..1fec47d1cf6
--- /dev/null
+++ b/src/vs/workbench/browser/parts/editor/editorCommandsContext.ts
@@ -0,0 +1,200 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { getActiveElement } from '../../../../base/browser/dom.js';
+import { List } from '../../../../base/browser/ui/list/listWidget.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IListService } from '../../../../platform/list/browser/listService.js';
+import { IEditorCommandsContext, isEditorCommandsContext, IEditorIdentifier, isEditorIdentifier } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { IEditorGroup, IEditorGroupsService, isEditorGroup } from '../../../services/editor/common/editorGroupsService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+
+export interface IResolvedEditorCommandsContext {
+	readonly groupedEditors: {
+		readonly group: IEditorGroup;
+		readonly editors: EditorInput[];
+	}[];
+	readonly preserveFocus: boolean;
+}
+
+export function resolveCommandsContext(commandArgs: unknown[], editorService: IEditorService, editorGroupsService: IEditorGroupsService, listService: IListService): IResolvedEditorCommandsContext {
+
+	const commandContext = getCommandsContext(commandArgs, editorService, editorGroupsService, listService);
+	const preserveFocus = commandContext.length ? commandContext[0].preserveFocus || false : false;
+	const resolvedContext: IResolvedEditorCommandsContext = { groupedEditors: [], preserveFocus };
+
+	for (const editorContext of commandContext) {
+		const groupAndEditor = getEditorAndGroupFromContext(editorContext, editorGroupsService);
+		if (!groupAndEditor) {
+			continue;
+		}
+
+		const { group, editor } = groupAndEditor;
+
+		// Find group context if already added
+		let groupContext = undefined;
+		for (const targetGroupContext of resolvedContext.groupedEditors) {
+			if (targetGroupContext.group.id === group.id) {
+				groupContext = targetGroupContext;
+				break;
+			}
+		}
+
+		// Otherwise add new group context
+		if (!groupContext) {
+			groupContext = { group, editors: [] };
+			resolvedContext.groupedEditors.push(groupContext);
+		}
+
+		// Add editor to group context
+		if (editor) {
+			groupContext.editors.push(editor);
+		}
+	}
+
+	return resolvedContext;
+}
+
+function getCommandsContext(commandArgs: unknown[], editorService: IEditorService, editorGroupsService: IEditorGroupsService, listService: IListService): IEditorCommandsContext[] {
+	// Figure out if command is executed from a list
+	const list = listService.lastFocusedList;
+	let isListAction = list instanceof List && list.getHTMLElement() === getActiveElement();
+
+	// Get editor context for which the command was triggered
+	let editorContext = getEditorContextFromCommandArgs(commandArgs, isListAction, editorService, editorGroupsService, listService);
+
+	// If the editor context can not be determind use the active editor
+	if (!editorContext) {
+		const activeGroup = editorGroupsService.activeGroup;
+		const activeEditor = activeGroup.activeEditor;
+		editorContext = { groupId: activeGroup.id, editorIndex: activeEditor ? activeGroup.getIndexOfEditor(activeEditor) : undefined };
+		isListAction = false;
+	}
+
+	const multiEditorContext = getMultiSelectContext(editorContext, isListAction, editorService, editorGroupsService, listService);
+
+	// Make sure the command context is the first one in the list
+	return moveCurrentEditorContextToFront(editorContext, multiEditorContext);
+}
+
+function moveCurrentEditorContextToFront(editorContext: IEditorCommandsContext, multiEditorContext: IEditorCommandsContext[]): IEditorCommandsContext[] {
+	if (multiEditorContext.length <= 1) {
+		return multiEditorContext;
+	}
+
+	const editorContextIndex = multiEditorContext.findIndex(context =>
+		context.groupId === editorContext.groupId &&
+		context.editorIndex === editorContext.editorIndex
+	);
+
+	if (editorContextIndex !== -1) {
+		multiEditorContext.splice(editorContextIndex, 1);
+		multiEditorContext.unshift(editorContext);
+	} else if (editorContext.editorIndex === undefined) {
+		multiEditorContext.unshift(editorContext);
+	} else {
+		throw new Error('Editor context not found in multi editor context');
+	}
+
+	return multiEditorContext;
+}
+
+function getEditorContextFromCommandArgs(commandArgs: unknown[], isListAction: boolean, editorService: IEditorService, editorGroupsService: IEditorGroupsService, listService: IListService): IEditorCommandsContext | undefined {
+	// We only know how to extraxt the command context from URI and IEditorCommandsContext arguments
+	const filteredArgs = commandArgs.filter(arg => isEditorCommandsContext(arg) || URI.isUri(arg));
+
+	// If the command arguments contain an editor context, use it
+	for (const arg of filteredArgs) {
+		if (isEditorCommandsContext(arg)) {
+			return arg;
+		}
+	}
+
+	// Otherwise, try to find the editor group by the URI of the resource
+	for (const uri of filteredArgs as URI[]) {
+		const editorIdentifiers = editorService.findEditors(uri);
+		if (editorIdentifiers.length) {
+			const editorIdentifier = editorIdentifiers[0];
+			const group = editorGroupsService.getGroup(editorIdentifier.groupId);
+			return { groupId: editorIdentifier.groupId, editorIndex: group?.getIndexOfEditor(editorIdentifier.editor) };
+		}
+	}
+
+	// If there is no context in the arguments, try to find the context from the focused list
+	// if the action was executed from a list
+	if (isListAction) {
+		const list = listService.lastFocusedList as List<unknown>;
+		for (const focusedElement of list.getFocusedElements()) {
+			if (isGroupOrEditor(focusedElement)) {
+				return groupOrEditorToEditorContext(focusedElement, undefined, editorGroupsService);
+			}
+		}
+	}
+
+	return undefined;
+}
+
+function getMultiSelectContext(editorContext: IEditorCommandsContext, isListAction: boolean, editorService: IEditorService, editorGroupsService: IEditorGroupsService, listService: IListService): IEditorCommandsContext[] {
+
+	// If the action was executed from a list, return all selected editors
+	if (isListAction) {
+		const list = listService.lastFocusedList as List<unknown>;
+		const selection = list.getSelectedElements().filter(isGroupOrEditor);
+
+		if (selection.length > 1) {
+			return selection.map(e => groupOrEditorToEditorContext(e, editorContext.preserveFocus, editorGroupsService));
+		}
+
+		if (selection.length === 0) {
+			// TODO@benibenj workaround for https://github.com/microsoft/vscode/issues/224050
+			// Explainer: the `isListAction` flag can be a false positive in certain cases because
+			// it will be `true` if the active element is a `List` even if it is part of the editor
+			// area. The workaround here is to fallback to `isListAction: false` if the list is not
+			// having any editor or group selected.
+			return getMultiSelectContext(editorContext, false, editorService, editorGroupsService, listService);
+		}
+	}
+	// Check editors selected in the group (tabs)
+	else {
+		const group = editorGroupsService.getGroup(editorContext.groupId);
+		const editor = editorContext.editorIndex !== undefined ? group?.getEditorByIndex(editorContext.editorIndex) : group?.activeEditor;
+		// If the editor is selected, return all selected editors otherwise only use the editors context
+		if (group && editor && group.isSelected(editor)) {
+			return group.selectedEditors.map(editor => groupOrEditorToEditorContext({ editor, groupId: group.id }, editorContext.preserveFocus, editorGroupsService));
+		}
+	}
+
+	// Otherwise go with passed in context
+	return [editorContext];
+}
+
+function groupOrEditorToEditorContext(element: IEditorIdentifier | IEditorGroup, preserveFocus: boolean | undefined, editorGroupsService: IEditorGroupsService): IEditorCommandsContext {
+	if (isEditorGroup(element)) {
+		return { groupId: element.id, editorIndex: undefined, preserveFocus };
+	}
+
+	const group = editorGroupsService.getGroup(element.groupId);
+
+	return { groupId: element.groupId, editorIndex: group ? group.getIndexOfEditor(element.editor) : -1, preserveFocus };
+}
+
+function isGroupOrEditor(element: unknown): element is IEditorIdentifier | IEditorGroup {
+	return isEditorGroup(element) || isEditorIdentifier(element);
+}
+
+function getEditorAndGroupFromContext(commandContext: IEditorCommandsContext, editorGroupsService: IEditorGroupsService): { group: IEditorGroup; editor: EditorInput | undefined } | undefined {
+	const group = editorGroupsService.getGroup(commandContext.groupId);
+	if (!group) {
+		return undefined;
+	}
+
+	if (commandContext.editorIndex === undefined) {
+		return { group, editor: undefined };
+	}
+
+	const editor = group.getEditorByIndex(commandContext.editorIndex);
+	return { group, editor };
+}
diff --git a/src/vs/workbench/browser/parts/editor/editorConfiguration.ts b/src/vs/workbench/browser/parts/editor/editorConfiguration.ts
index 0df198dd6de..c235e44adcd 100644
--- a/src/vs/workbench/browser/parts/editor/editorConfiguration.ts
+++ b/src/vs/workbench/browser/parts/editor/editorConfiguration.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions, IConfigurationNode, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
-import { workbenchConfigurationNodeBase } from 'vs/workbench/common/configuration';
-import { IEditorResolverService, RegisteredEditorInfo, RegisteredEditorPriority } from 'vs/workbench/services/editor/common/editorResolverService';
-import { IJSONSchemaMap } from 'vs/base/common/jsonSchema';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { coalesce } from 'vs/base/common/arrays';
-import { Event } from 'vs/base/common/event';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { ByteSize, getLargeFileConfirmationLimit } from 'vs/platform/files/common/files';
+import { localize } from '../../../../nls.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions, IConfigurationNode, ConfigurationScope } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { workbenchConfigurationNodeBase } from '../../../common/configuration.js';
+import { IEditorResolverService, RegisteredEditorInfo, RegisteredEditorPriority } from '../../../services/editor/common/editorResolverService.js';
+import { IJSONSchemaMap } from '../../../../base/common/jsonSchema.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { coalesce } from '../../../../base/common/arrays.js';
+import { Event } from '../../../../base/common/event.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { ByteSize, getLargeFileConfirmationLimit } from '../../../../platform/files/common/files.js';
 
 export class DynamicEditorConfigurations extends Disposable implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/browser/parts/editor/editorDropTarget.ts b/src/vs/workbench/browser/parts/editor/editorDropTarget.ts
index b11c66e6057..ed286ff7f17 100644
--- a/src/vs/workbench/browser/parts/editor/editorDropTarget.ts
+++ b/src/vs/workbench/browser/parts/editor/editorDropTarget.ts
@@ -3,30 +3,30 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/editordroptarget';
-import { DataTransfers } from 'vs/base/browser/dnd';
-import { addDisposableListener, DragAndDropObserver, EventHelper, EventType, getWindow, isAncestor } from 'vs/base/browser/dom';
-import { renderFormattedText } from 'vs/base/browser/formattedTextRenderer';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { toDisposable } from 'vs/base/common/lifecycle';
-import { isMacintosh, isWeb } from 'vs/base/common/platform';
-import { assertAllDefined, assertIsDefined } from 'vs/base/common/types';
-import { localize } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { activeContrastBorder } from 'vs/platform/theme/common/colorRegistry';
-import { IThemeService, Themable } from 'vs/platform/theme/common/themeService';
-import { isTemporaryWorkspace, IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { CodeDataTransfers, containsDragType, Extensions as DragAndDropExtensions, IDragAndDropContributionRegistry, LocalSelectionTransfer } from 'vs/platform/dnd/browser/dnd';
-import { DraggedEditorGroupIdentifier, DraggedEditorIdentifier, extractTreeDropData, ResourcesDropHandler } from 'vs/workbench/browser/dnd';
-import { fillActiveEditorViewState, IEditorGroupView } from 'vs/workbench/browser/parts/editor/editor';
-import { EditorInputCapabilities, IEditorIdentifier, IUntypedEditorInput } from 'vs/workbench/common/editor';
-import { EDITOR_DRAG_AND_DROP_BACKGROUND, EDITOR_DROP_INTO_PROMPT_BACKGROUND, EDITOR_DROP_INTO_PROMPT_BORDER, EDITOR_DROP_INTO_PROMPT_FOREGROUND } from 'vs/workbench/common/theme';
-import { GroupDirection, IEditorDropTargetDelegate, IEditorGroup, IEditorGroupsService, IMergeGroupOptions, MergeGroupMode } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ITreeViewsDnDService } from 'vs/editor/common/services/treeViewsDndService';
-import { DraggedTreeItemsIdentifier } from 'vs/editor/common/services/treeViewsDnd';
+import './media/editordroptarget.css';
+import { DataTransfers } from '../../../../base/browser/dnd.js';
+import { addDisposableListener, DragAndDropObserver, EventHelper, EventType, getWindow, isAncestor } from '../../../../base/browser/dom.js';
+import { renderFormattedText } from '../../../../base/browser/formattedTextRenderer.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { toDisposable } from '../../../../base/common/lifecycle.js';
+import { isMacintosh, isWeb } from '../../../../base/common/platform.js';
+import { assertAllDefined, assertIsDefined } from '../../../../base/common/types.js';
+import { localize } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { activeContrastBorder } from '../../../../platform/theme/common/colorRegistry.js';
+import { IThemeService, Themable } from '../../../../platform/theme/common/themeService.js';
+import { isTemporaryWorkspace, IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { CodeDataTransfers, containsDragType, Extensions as DragAndDropExtensions, IDragAndDropContributionRegistry, LocalSelectionTransfer } from '../../../../platform/dnd/browser/dnd.js';
+import { DraggedEditorGroupIdentifier, DraggedEditorIdentifier, extractTreeDropData, ResourcesDropHandler } from '../../dnd.js';
+import { fillActiveEditorViewState, IEditorGroupView } from './editor.js';
+import { EditorInputCapabilities, IEditorIdentifier, IUntypedEditorInput } from '../../../common/editor.js';
+import { EDITOR_DRAG_AND_DROP_BACKGROUND, EDITOR_DROP_INTO_PROMPT_BACKGROUND, EDITOR_DROP_INTO_PROMPT_BORDER, EDITOR_DROP_INTO_PROMPT_FOREGROUND } from '../../../common/theme.js';
+import { GroupDirection, IEditorDropTargetDelegate, IEditorGroup, IEditorGroupsService, IMergeGroupOptions, MergeGroupMode } from '../../../services/editor/common/editorGroupsService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { ITreeViewsDnDService } from '../../../../editor/common/services/treeViewsDndService.js';
+import { DraggedTreeItemsIdentifier } from '../../../../editor/common/services/treeViewsDnd.js';
 
 interface IDropOperation {
 	splitDirection?: GroupDirection;
diff --git a/src/vs/workbench/browser/parts/editor/editorGroupView.ts b/src/vs/workbench/browser/parts/editor/editorGroupView.ts
index 6c8c42ec330..8e9756045fb 100644
--- a/src/vs/workbench/browser/parts/editor/editorGroupView.ts
+++ b/src/vs/workbench/browser/parts/editor/editorGroupView.ts
@@ -3,61 +3,61 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/editorgroupview';
-import { EditorGroupModel, IEditorOpenOptions, IGroupModelChangeEvent, ISerializedEditorGroupModel, isGroupEditorCloseEvent, isGroupEditorOpenEvent, isSerializedEditorGroupModel } from 'vs/workbench/common/editor/editorGroupModel';
-import { GroupIdentifier, CloseDirection, IEditorCloseEvent, IEditorPane, SaveReason, IEditorPartOptionsChangeEvent, EditorsOrder, IVisibleEditorPane, EditorResourceAccessor, EditorInputCapabilities, IUntypedEditorInput, DEFAULT_EDITOR_ASSOCIATION, SideBySideEditor, EditorCloseContext, IEditorWillMoveEvent, IEditorWillOpenEvent, IMatchEditorOptions, GroupModelChangeKind, IActiveEditorChangeEvent, IFindEditorOptions, IToolbarActions, TEXT_DIFF_EDITOR_ID } from 'vs/workbench/common/editor';
-import { ActiveEditorGroupLockedContext, ActiveEditorDirtyContext, EditorGroupEditorsCountContext, ActiveEditorStickyContext, ActiveEditorPinnedContext, ActiveEditorLastInGroupContext, ActiveEditorFirstInGroupContext, ResourceContextKey, applyAvailableEditorIds, ActiveEditorAvailableEditorIdsContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, TextCompareEditorVisibleContext, TextCompareEditorActiveContext, ActiveEditorContext, ActiveEditorReadonlyContext, ActiveEditorCanRevertContext, ActiveEditorCanToggleReadonlyContext, ActiveCompareEditorCanSwapContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext } from 'vs/workbench/common/contextkeys';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditorInput';
-import { Emitter, Relay } from 'vs/base/common/event';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { Dimension, trackFocus, addDisposableListener, EventType, EventHelper, findParentWithClass, isAncestor, IDomNodePagePosition, isMouseEvent, isActiveElement, getWindow, getActiveElement } from 'vs/base/browser/dom';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
-import { IThemeService, Themable } from 'vs/platform/theme/common/themeService';
-import { editorBackground, contrastBorder } from 'vs/platform/theme/common/colorRegistry';
-import { EDITOR_GROUP_HEADER_TABS_BACKGROUND, EDITOR_GROUP_HEADER_NO_TABS_BACKGROUND, EDITOR_GROUP_EMPTY_BACKGROUND, EDITOR_GROUP_HEADER_BORDER } from 'vs/workbench/common/theme';
-import { ICloseEditorsFilter, GroupsOrder, ICloseEditorOptions, ICloseAllEditorsOptions, IEditorReplacement, IActiveEditorActions } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { EditorPanes } from 'vs/workbench/browser/parts/editor/editorPanes';
-import { IEditorProgressService } from 'vs/platform/progress/common/progress';
-import { EditorProgressIndicator } from 'vs/workbench/services/progress/browser/progressIndicator';
-import { localize } from 'vs/nls';
-import { coalesce, firstOrDefault } from 'vs/base/common/arrays';
-import { DisposableStore, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { DeferredPromise, Promises, RunOnceWorker } from 'vs/base/common/async';
-import { EventType as TouchEventType, GestureEvent } from 'vs/base/browser/touch';
-import { IEditorGroupsView, IEditorGroupView, fillActiveEditorViewState, EditorServiceImpl, IEditorGroupTitleHeight, IInternalEditorOpenOptions, IInternalMoveCopyOptions, IInternalEditorCloseOptions, IInternalEditorTitleControlOptions, IEditorPartsView, IEditorGroupViewOptions } from 'vs/workbench/browser/parts/editor/editor';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IAction, SubmenuAction } from 'vs/base/common/actions';
-import { IMenuService, MenuId } from 'vs/platform/actions/common/actions';
-import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { hash } from 'vs/base/common/hash';
-import { getMimeTypes } from 'vs/editor/common/services/languagesAssociations';
-import { extname, isEqual } from 'vs/base/common/resources';
-import { Schemas } from 'vs/base/common/network';
-import { EditorActivation, IEditorOptions } from 'vs/platform/editor/common/editor';
-import { IFileDialogService, ConfirmResult, IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IFilesConfigurationService, AutoSaveMode } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { URI } from 'vs/base/common/uri';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { isLinux, isMacintosh, isNative, isWindows } from 'vs/base/common/platform';
-import { ILogService } from 'vs/platform/log/common/log';
-import { TelemetryTrustedValue } from 'vs/platform/telemetry/common/telemetryUtils';
-import { defaultProgressBarStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { IBoundarySashes } from 'vs/base/browser/ui/sash/sash';
-import { EditorGroupWatermark } from 'vs/workbench/browser/parts/editor/editorGroupWatermark';
-import { EditorTitleControl } from 'vs/workbench/browser/parts/editor/editorTitleControl';
-import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
-import { IEditorResolverService } from 'vs/workbench/services/editor/common/editorResolverService';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
-import { FileSystemProviderCapabilities, IFileService } from 'vs/platform/files/common/files';
+import './media/editorgroupview.css';
+import { EditorGroupModel, IEditorOpenOptions, IGroupModelChangeEvent, ISerializedEditorGroupModel, isGroupEditorCloseEvent, isGroupEditorOpenEvent, isSerializedEditorGroupModel } from '../../../common/editor/editorGroupModel.js';
+import { GroupIdentifier, CloseDirection, IEditorCloseEvent, IEditorPane, SaveReason, IEditorPartOptionsChangeEvent, EditorsOrder, IVisibleEditorPane, EditorResourceAccessor, EditorInputCapabilities, IUntypedEditorInput, DEFAULT_EDITOR_ASSOCIATION, SideBySideEditor, EditorCloseContext, IEditorWillMoveEvent, IEditorWillOpenEvent, IMatchEditorOptions, GroupModelChangeKind, IActiveEditorChangeEvent, IFindEditorOptions, IToolbarActions, TEXT_DIFF_EDITOR_ID } from '../../../common/editor.js';
+import { ActiveEditorGroupLockedContext, ActiveEditorDirtyContext, EditorGroupEditorsCountContext, ActiveEditorStickyContext, ActiveEditorPinnedContext, ActiveEditorLastInGroupContext, ActiveEditorFirstInGroupContext, ResourceContextKey, applyAvailableEditorIds, ActiveEditorAvailableEditorIdsContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, TextCompareEditorVisibleContext, TextCompareEditorActiveContext, ActiveEditorContext, ActiveEditorReadonlyContext, ActiveEditorCanRevertContext, ActiveEditorCanToggleReadonlyContext, ActiveCompareEditorCanSwapContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, SelectedEditorsInGroupFileOrUntitledResourceContextKey } from '../../../common/contextkeys.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
+import { Emitter, Relay } from '../../../../base/common/event.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { Dimension, trackFocus, addDisposableListener, EventType, EventHelper, findParentWithClass, isAncestor, IDomNodePagePosition, isMouseEvent, isActiveElement, getWindow, getActiveElement } from '../../../../base/browser/dom.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { ProgressBar } from '../../../../base/browser/ui/progressbar/progressbar.js';
+import { IThemeService, Themable } from '../../../../platform/theme/common/themeService.js';
+import { editorBackground, contrastBorder } from '../../../../platform/theme/common/colorRegistry.js';
+import { EDITOR_GROUP_HEADER_TABS_BACKGROUND, EDITOR_GROUP_HEADER_NO_TABS_BACKGROUND, EDITOR_GROUP_EMPTY_BACKGROUND, EDITOR_GROUP_HEADER_BORDER } from '../../../common/theme.js';
+import { ICloseEditorsFilter, GroupsOrder, ICloseEditorOptions, ICloseAllEditorsOptions, IEditorReplacement, IActiveEditorActions } from '../../../services/editor/common/editorGroupsService.js';
+import { EditorPanes } from './editorPanes.js';
+import { IEditorProgressService } from '../../../../platform/progress/common/progress.js';
+import { EditorProgressIndicator } from '../../../services/progress/browser/progressIndicator.js';
+import { localize } from '../../../../nls.js';
+import { coalesce } from '../../../../base/common/arrays.js';
+import { DisposableStore, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { DeferredPromise, Promises, RunOnceWorker } from '../../../../base/common/async.js';
+import { EventType as TouchEventType, GestureEvent } from '../../../../base/browser/touch.js';
+import { IEditorGroupsView, IEditorGroupView, fillActiveEditorViewState, EditorServiceImpl, IEditorGroupTitleHeight, IInternalEditorOpenOptions, IInternalMoveCopyOptions, IInternalEditorCloseOptions, IInternalEditorTitleControlOptions, IEditorPartsView, IEditorGroupViewOptions } from './editor.js';
+import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IAction, SubmenuAction } from '../../../../base/common/actions.js';
+import { IMenuService, MenuId } from '../../../../platform/actions/common/actions.js';
+import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
+import { createAndFillInActionBarActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { hash } from '../../../../base/common/hash.js';
+import { getMimeTypes } from '../../../../editor/common/services/languagesAssociations.js';
+import { extname, isEqual } from '../../../../base/common/resources.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { EditorActivation, IEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { IFileDialogService, ConfirmResult, IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IFilesConfigurationService, AutoSaveMode } from '../../../services/filesConfiguration/common/filesConfigurationService.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { isLinux, isMacintosh, isNative, isWindows } from '../../../../base/common/platform.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { TelemetryTrustedValue } from '../../../../platform/telemetry/common/telemetryUtils.js';
+import { defaultProgressBarStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { IBoundarySashes } from '../../../../base/browser/ui/sash/sash.js';
+import { EditorGroupWatermark } from './editorGroupWatermark.js';
+import { EditorTitleControl } from './editorTitleControl.js';
+import { EditorPane } from './editorPane.js';
+import { IEditorResolverService } from '../../../services/editor/common/editorResolverService.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { DiffEditorInput } from '../../../common/editor/diffEditorInput.js';
+import { FileSystemProviderCapabilities, IFileService } from '../../../../platform/files/common/files.js';
 
 export class EditorGroupView extends Themable implements IEditorGroupView {
 
@@ -259,6 +259,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 
 		const multipleEditorsSelectedContext = MultipleEditorsSelectedInGroupContext.bindTo(this.scopedContextKeyService);
 		const twoEditorsSelectedContext = TwoEditorsSelectedInGroupContext.bindTo(this.scopedContextKeyService);
+		const selectedEditorsHaveFileOrUntitledResourceContext = SelectedEditorsInGroupFileOrUntitledResourceContextKey.bindTo(this.scopedContextKeyService);
 
 		const groupActiveEditorContext = this.editorPartsView.bind(ActiveEditorContext, this);
 		const groupActiveEditorIsReadonly = this.editorPartsView.bind(ActiveEditorReadonlyContext, this);
@@ -355,6 +356,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 				case GroupModelChangeKind.EDITORS_SELECTION:
 					multipleEditorsSelectedContext.set(this.model.selectedEditors.length > 1);
 					twoEditorsSelectedContext.set(this.model.selectedEditors.length === 2);
+					selectedEditorsHaveFileOrUntitledResourceContext.set(this.model.selectedEditors.every(e => e.resource && (this.fileService.hasProvider(e.resource) || e.resource.scheme === Schemas.untitled)));
 					break;
 			}
 
@@ -558,14 +560,15 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 		options.preserveFocus = true;						// handle focus after editor is restored
 
 		const internalOptions: IInternalEditorOpenOptions = {
-			preserveWindowOrder: true						// handle window order after editor is restored
+			preserveWindowOrder: true,						// handle window order after editor is restored
+			skipTitleUpdate: true,							// update the title later for all editors at once
 		};
 
 		const activeElement = getActiveElement();
 
 		// Show active editor (intentionally not using async to keep
 		// `restoreEditors` from executing in same stack)
-		return this.doShowEditor(activeEditor, { active: true, isNew: false /* restored */ }, options, internalOptions).then(() => {
+		const result = this.doShowEditor(activeEditor, { active: true, isNew: false /* restored */ }, options, internalOptions).then(() => {
 
 			// Set focused now if this is the active group and focus has
 			// not changed meanwhile. This prevents focus from being
@@ -576,6 +579,11 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 				this.focus();
 			}
 		});
+
+		// Restore editors in title control
+		this.titleControl.openEditors(this.editors);
+
+		return result;
 	}
 
 	//#region event handling
@@ -827,7 +835,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 
 			// Ensure to show active editor if any
 			if (this.model.activeEditor) {
-				this.titleControl.openEditor(this.model.activeEditor);
+				this.titleControl.openEditors(this.model.getEditors(EditorsOrder.SEQUENTIAL));
 			}
 		}
 
@@ -1316,7 +1324,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 		const editorsToOpen = coalesce(editors).filter(({ editor }) => !editor.isDisposed());
 
 		// Use the first editor as active editor
-		const firstEditor = firstOrDefault(editorsToOpen);
+		const firstEditor = editorsToOpen.at(0);
 		if (!firstEditor) {
 			return;
 		}
diff --git a/src/vs/workbench/browser/parts/editor/editorGroupWatermark.ts b/src/vs/workbench/browser/parts/editor/editorGroupWatermark.ts
index c9ac110bc23..db8ede5ffa8 100644
--- a/src/vs/workbench/browser/parts/editor/editorGroupWatermark.ts
+++ b/src/vs/workbench/browser/parts/editor/editorGroupWatermark.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { isMacintosh, isWeb, OS } from 'vs/base/common/platform';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { append, clearNode, $, h } from 'vs/base/browser/dom';
-import { KeybindingLabel } from 'vs/base/browser/ui/keybindingLabel/keybindingLabel';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { ContextKeyExpr, ContextKeyExpression, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { defaultKeybindingLabelStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { editorForeground, registerColor, transparent } from 'vs/platform/theme/common/colorRegistry';
+import { localize } from '../../../../nls.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { isMacintosh, isWeb, OS } from '../../../../base/common/platform.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IWorkspaceContextService, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { append, clearNode, $, h } from '../../../../base/browser/dom.js';
+import { KeybindingLabel } from '../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { ContextKeyExpr, ContextKeyExpression, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { defaultKeybindingLabelStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { editorForeground, registerColor, transparent } from '../../../../platform/theme/common/colorRegistry.js';
 
 registerColor('editorWatermark.foreground', { dark: transparent(editorForeground, 0.6), light: transparent(editorForeground, 0.68), hcDark: editorForeground, hcLight: editorForeground }, localize('editorLineHighlight', 'Foreground color for the labels in the editor watermark.'));
 
diff --git a/src/vs/workbench/browser/parts/editor/editorPane.ts b/src/vs/workbench/browser/parts/editor/editorPane.ts
index 7a73fe46fc5..bb868efd2f1 100644
--- a/src/vs/workbench/browser/parts/editor/editorPane.ts
+++ b/src/vs/workbench/browser/parts/editor/editorPane.ts
@@ -3,28 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Composite } from 'vs/workbench/browser/composite';
-import { IEditorPane, GroupIdentifier, IEditorMemento, IEditorOpenContext, isEditorInput } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { LRUCache, Touch } from 'vs/base/common/map';
-import { URI } from 'vs/base/common/uri';
-import { Emitter, Event } from 'vs/base/common/event';
-import { isEmptyObject } from 'vs/base/common/types';
-import { DEFAULT_EDITOR_MIN_DIMENSIONS, DEFAULT_EDITOR_MAX_DIMENSIONS } from 'vs/workbench/browser/parts/editor/editor';
-import { MementoObject } from 'vs/workbench/common/memento';
-import { joinPath, IExtUri, isEqual } from 'vs/base/common/resources';
-import { indexOfPath } from 'vs/base/common/extpath';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IEditorOptions } from 'vs/platform/editor/common/editor';
-import { ITextResourceConfigurationChangeEvent, ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { IBoundarySashes } from 'vs/base/browser/ui/sash/sash';
-import { getWindowById } from 'vs/base/browser/dom';
+import { Composite } from '../../composite.js';
+import { IEditorPane, GroupIdentifier, IEditorMemento, IEditorOpenContext, isEditorInput } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IEditorGroup, IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { LRUCache, Touch } from '../../../../base/common/map.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { isEmptyObject } from '../../../../base/common/types.js';
+import { DEFAULT_EDITOR_MIN_DIMENSIONS, DEFAULT_EDITOR_MAX_DIMENSIONS } from './editor.js';
+import { MementoObject } from '../../../common/memento.js';
+import { joinPath, IExtUri, isEqual } from '../../../../base/common/resources.js';
+import { indexOfPath } from '../../../../base/common/extpath.js';
+import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { ITextResourceConfigurationChangeEvent, ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { IBoundarySashes } from '../../../../base/browser/ui/sash/sash.js';
+import { getWindowById } from '../../../../base/browser/dom.js';
 
 /**
  * The base class of editors in the workbench. Editors register themselves for specific editor inputs.
diff --git a/src/vs/workbench/browser/parts/editor/editorPanes.ts b/src/vs/workbench/browser/parts/editor/editorPanes.ts
index ef1b25dd681..68b73d9a588 100644
--- a/src/vs/workbench/browser/parts/editor/editorPanes.ts
+++ b/src/vs/workbench/browser/parts/editor/editorPanes.ts
@@ -3,31 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { IAction } from 'vs/base/common/actions';
-import { Emitter } from 'vs/base/common/event';
-import Severity from 'vs/base/common/severity';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { EditorExtensions, EditorInputCapabilities, IEditorOpenContext, IVisibleEditorPane, isEditorOpenError } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { Dimension, show, hide, IDomNodePagePosition, isAncestor, getActiveElement, getWindowById } from 'vs/base/browser/dom';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IEditorPaneRegistry, IEditorPaneDescriptor } from 'vs/workbench/browser/editor';
-import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
-import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IEditorProgressService, LongRunningOperation } from 'vs/platform/progress/common/progress';
-import { IEditorGroupView, DEFAULT_EDITOR_MIN_DIMENSIONS, DEFAULT_EDITOR_MAX_DIMENSIONS, IInternalEditorOpenOptions } from 'vs/workbench/browser/parts/editor/editor';
-import { assertIsDefined } from 'vs/base/common/types';
-import { IWorkspaceTrustManagementService } from 'vs/platform/workspace/common/workspaceTrust';
-import { ErrorPlaceholderEditor, IErrorEditorPlaceholderOptions, WorkspaceTrustRequiredPlaceholderEditor } from 'vs/workbench/browser/parts/editor/editorPlaceholder';
-import { EditorOpenSource, IEditorOptions } from 'vs/platform/editor/common/editor';
-import { isCancellationError } from 'vs/base/common/errors';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IDialogService, IPromptButton, IPromptCancelButton } from 'vs/platform/dialogs/common/dialogs';
-import { IBoundarySashes } from 'vs/base/browser/ui/sash/sash';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
+import { localize } from '../../../../nls.js';
+import { IAction } from '../../../../base/common/actions.js';
+import { Emitter } from '../../../../base/common/event.js';
+import Severity from '../../../../base/common/severity.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { EditorExtensions, EditorInputCapabilities, IEditorOpenContext, IVisibleEditorPane, isEditorOpenError } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { Dimension, show, hide, IDomNodePagePosition, isAncestor, getActiveElement, getWindowById, isEditableElement } from '../../../../base/browser/dom.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IEditorPaneRegistry, IEditorPaneDescriptor } from '../../editor.js';
+import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
+import { EditorPane } from './editorPane.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IEditorProgressService, LongRunningOperation } from '../../../../platform/progress/common/progress.js';
+import { IEditorGroupView, DEFAULT_EDITOR_MIN_DIMENSIONS, DEFAULT_EDITOR_MAX_DIMENSIONS, IInternalEditorOpenOptions } from './editor.js';
+import { assertIsDefined } from '../../../../base/common/types.js';
+import { IWorkspaceTrustManagementService } from '../../../../platform/workspace/common/workspaceTrust.js';
+import { ErrorPlaceholderEditor, IErrorEditorPlaceholderOptions, WorkspaceTrustRequiredPlaceholderEditor } from './editorPlaceholder.js';
+import { EditorOpenSource, IEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { isCancellationError } from '../../../../base/common/errors.js';
+import { toErrorMessage } from '../../../../base/common/errorMessage.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IDialogService, IPromptButton, IPromptCancelButton } from '../../../../platform/dialogs/common/dialogs.js';
+import { IBoundarySashes } from '../../../../base/browser/ui/sash/sash.js';
+import { IHostService } from '../../../services/host/browser/host.js';
 
 export interface IOpenEditorResult {
 
@@ -84,6 +84,7 @@ export class EditorPanes extends Disposable {
 	get activeEditorPane(): IVisibleEditorPane | null { return this._activeEditorPane as IVisibleEditorPane | null; }
 
 	private readonly editorPanes: EditorPane[] = [];
+	private readonly mapEditorPaneToPendingSetInput = new Map<EditorPane, Promise<void>>();
 
 	private readonly activeEditorPaneDisposables = this._register(new DisposableStore());
 	private pagePosition: IDomNodePagePosition | undefined;
@@ -287,7 +288,7 @@ export class EditorPanes extends Disposable {
 			return true; // restore focus if same element is still active
 		}
 
-		if (activeElement.tagName !== 'INPUT' && activeElement.tagName !== 'TEXTAREA') {
+		if (!isEditableElement(activeElement)) {
 
 			// This is to avoid regressions from not restoring focus as we used to:
 			// Only allow a different input element (or textarea) to remain focused
@@ -409,11 +410,23 @@ export class EditorPanes extends Disposable {
 		// If the input did not change, return early and only
 		// apply the options unless the options instruct us to
 		// force open it even if it is the same
-		const inputMatches = editorPane.input?.matches(editor);
+		let inputMatches = editorPane.input?.matches(editor);
 		if (inputMatches && !options?.forceReload) {
-			editorPane.setOptions(options);
 
-			return { changed: false, cancelled: false };
+			// We have to await a pending `setInput()` call for this
+			// pane before we can call into `setOptions()`, otherwise
+			// we risk calling when the input is not yet fully applied.
+			if (this.mapEditorPaneToPendingSetInput.has(editorPane)) {
+				await this.mapEditorPaneToPendingSetInput.get(editorPane);
+			}
+
+			// At this point, the input might have changed, so we check again
+			inputMatches = editorPane.input?.matches(editor);
+			if (inputMatches) {
+				editorPane.setOptions(options);
+			}
+
+			return { changed: false, cancelled: !inputMatches };
 		}
 
 		// Start a new editor input operation to report progress
@@ -430,8 +443,10 @@ export class EditorPanes extends Disposable {
 			// load (https://github.com/microsoft/vscode/issues/34697)
 			editorPane.clearInput();
 
-			// Set the input to the editor pane
-			await editorPane.setInput(editor, options, context, operation.token);
+			// Set the input to the editor pane and keep track of it
+			const pendingSetInput = editorPane.setInput(editor, options, context, operation.token);
+			this.mapEditorPaneToPendingSetInput.set(editorPane, pendingSetInput);
+			await pendingSetInput;
 
 			if (!operation.isCurrent()) {
 				cancelled = true;
@@ -443,6 +458,9 @@ export class EditorPanes extends Disposable {
 				throw error;
 			}
 		} finally {
+			if (operation.isCurrent()) {
+				this.mapEditorPaneToPendingSetInput.delete(editorPane);
+			}
 			operation.stop();
 		}
 
@@ -463,6 +481,9 @@ export class EditorPanes extends Disposable {
 		this.safeRun(() => this._activeEditorPane?.clearInput());
 		this.safeRun(() => this._activeEditorPane?.setVisible(false));
 
+		// Clear any pending setInput promise
+		this.mapEditorPaneToPendingSetInput.delete(this._activeEditorPane);
+
 		// Remove editor pane from parent
 		const editorPaneContainer = this._activeEditorPane.getContainer();
 		if (editorPaneContainer) {
diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts
index d785a513798..5aeb5e50be4 100644
--- a/src/vs/workbench/browser/parts/editor/editorPart.ts
+++ b/src/vs/workbench/browser/parts/editor/editorPart.ts
@@ -3,39 +3,39 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { Part } from 'vs/workbench/browser/part';
-import { Dimension, $, EventHelper, addDisposableGenericMouseDownListener, getWindow, isAncestorOfActiveElement, getActiveElement, isHTMLElement } from 'vs/base/browser/dom';
-import { Event, Emitter, Relay, PauseableEmitter } from 'vs/base/common/event';
-import { contrastBorder, editorBackground } from 'vs/platform/theme/common/colorRegistry';
-import { GroupDirection, GroupsArrangement, GroupOrientation, IMergeGroupOptions, MergeGroupMode, GroupsOrder, GroupLocation, IFindGroupScope, EditorGroupLayout, GroupLayoutArgument, IEditorSideGroup, IEditorDropTargetDelegate, IEditorPart } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IView, orthogonal, LayoutPriority, IViewSize, Direction, SerializableGrid, Sizing, ISerializedGrid, ISerializedNode, Orientation, GridBranchNode, isGridBranchNode, GridNode, createSerializedGrid, Grid } from 'vs/base/browser/ui/grid/grid';
-import { GroupIdentifier, EditorInputWithOptions, IEditorPartOptions, IEditorPartOptionsChangeEvent, GroupModelChangeKind } from 'vs/workbench/common/editor';
-import { EDITOR_GROUP_BORDER, EDITOR_PANE_BACKGROUND } from 'vs/workbench/common/theme';
-import { distinct, coalesce } from 'vs/base/common/arrays';
-import { IEditorGroupView, getEditorPartOptions, impactsEditorPartOptions, IEditorPartCreationOptions, IEditorPartsView, IEditorGroupsView, IEditorGroupViewOptions } from 'vs/workbench/browser/parts/editor/editor';
-import { EditorGroupView } from 'vs/workbench/browser/parts/editor/editorGroupView';
-import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
-import { IDisposable, dispose, toDisposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { IStorageService, IStorageValueChangeEvent, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ISerializedEditorGroupModel, isSerializedEditorGroupModel } from 'vs/workbench/common/editor/editorGroupModel';
-import { EditorDropTarget } from 'vs/workbench/browser/parts/editor/editorDropTarget';
-import { Color } from 'vs/base/common/color';
-import { CenteredViewLayout } from 'vs/base/browser/ui/centered/centeredViewLayout';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Parts, IWorkbenchLayoutService, Position } from 'vs/workbench/services/layout/browser/layoutService';
-import { DeepPartial, assertIsDefined, assertType } from 'vs/base/common/types';
-import { CompositeDragAndDropObserver } from 'vs/workbench/browser/dnd';
-import { DeferredPromise, Promises } from 'vs/base/common/async';
-import { findGroup } from 'vs/workbench/services/editor/common/editorGroupFinder';
-import { SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { IBoundarySashes } from 'vs/base/browser/ui/sash/sash';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { EditorPartMaximizedEditorGroupContext, EditorPartMultipleEditorGroupsContext, IsAuxiliaryEditorPartContext } from 'vs/workbench/common/contextkeys';
-import { mainWindow } from 'vs/base/browser/window';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { Part } from '../../part.js';
+import { Dimension, $, EventHelper, addDisposableGenericMouseDownListener, getWindow, isAncestorOfActiveElement, getActiveElement, isHTMLElement } from '../../../../base/browser/dom.js';
+import { Event, Emitter, Relay, PauseableEmitter } from '../../../../base/common/event.js';
+import { contrastBorder, editorBackground } from '../../../../platform/theme/common/colorRegistry.js';
+import { GroupDirection, GroupsArrangement, GroupOrientation, IMergeGroupOptions, MergeGroupMode, GroupsOrder, GroupLocation, IFindGroupScope, EditorGroupLayout, GroupLayoutArgument, IEditorSideGroup, IEditorDropTargetDelegate, IEditorPart } from '../../../services/editor/common/editorGroupsService.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IView, orthogonal, LayoutPriority, IViewSize, Direction, SerializableGrid, Sizing, ISerializedGrid, ISerializedNode, Orientation, GridBranchNode, isGridBranchNode, GridNode, createSerializedGrid, Grid } from '../../../../base/browser/ui/grid/grid.js';
+import { GroupIdentifier, EditorInputWithOptions, IEditorPartOptions, IEditorPartOptionsChangeEvent, GroupModelChangeKind } from '../../../common/editor.js';
+import { EDITOR_GROUP_BORDER, EDITOR_PANE_BACKGROUND } from '../../../common/theme.js';
+import { distinct, coalesce } from '../../../../base/common/arrays.js';
+import { IEditorGroupView, getEditorPartOptions, impactsEditorPartOptions, IEditorPartCreationOptions, IEditorPartsView, IEditorGroupsView, IEditorGroupViewOptions } from './editor.js';
+import { EditorGroupView } from './editorGroupView.js';
+import { IConfigurationService, IConfigurationChangeEvent } from '../../../../platform/configuration/common/configuration.js';
+import { IDisposable, dispose, toDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { IStorageService, IStorageValueChangeEvent, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { ISerializedEditorGroupModel, isSerializedEditorGroupModel } from '../../../common/editor/editorGroupModel.js';
+import { EditorDropTarget } from './editorDropTarget.js';
+import { Color } from '../../../../base/common/color.js';
+import { CenteredViewLayout } from '../../../../base/browser/ui/centered/centeredViewLayout.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { Parts, IWorkbenchLayoutService, Position } from '../../../services/layout/browser/layoutService.js';
+import { DeepPartial, assertIsDefined, assertType } from '../../../../base/common/types.js';
+import { CompositeDragAndDropObserver } from '../../dnd.js';
+import { DeferredPromise, Promises } from '../../../../base/common/async.js';
+import { findGroup } from '../../../services/editor/common/editorGroupFinder.js';
+import { SIDE_GROUP } from '../../../services/editor/common/editorService.js';
+import { IBoundarySashes } from '../../../../base/browser/ui/sash/sash.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { EditorPartMaximizedEditorGroupContext, EditorPartMultipleEditorGroupsContext, IsAuxiliaryEditorPartContext } from '../../../common/contextkeys.js';
+import { mainWindow } from '../../../../base/browser/window.js';
 
 export interface IEditorPartUIState {
 	readonly serializedGrid: ISerializedGrid;
@@ -114,7 +114,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupsView {
 	private readonly _onDidActivateGroup = this._register(new Emitter<IEditorGroupView>());
 	readonly onDidActivateGroup = this._onDidActivateGroup.event;
 
-	private readonly _onDidAddGroup = this._register(new Emitter<IEditorGroupView>());
+	private readonly _onDidAddGroup = this._register(new PauseableEmitter<IEditorGroupView>());
 	readonly onDidAddGroup = this._onDidAddGroup.event;
 
 	private readonly _onDidRemoveGroup = this._register(new PauseableEmitter<IEditorGroupView>());
@@ -134,6 +134,9 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupsView {
 	private readonly _onDidChangeEditorPartOptions = this._register(new Emitter<IEditorPartOptionsChangeEvent>());
 	readonly onDidChangeEditorPartOptions = this._onDidChangeEditorPartOptions.event;
 
+	private readonly _onWillDispose = this._register(new Emitter<void>());
+	readonly onWillDispose = this._onWillDispose.event;
+
 	//#endregion
 
 	private readonly workspaceMemento = this.getMemento(StorageScope.WORKSPACE, StorageTarget.USER);
@@ -1103,6 +1106,10 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupsView {
 					openVerticalPosition = Position.BOTTOM;
 				}
 
+				if (e.eventData.clientY < boundingRect.top + proximity) {
+					openVerticalPosition = Position.TOP;
+				}
+
 				if (horizontalOpenerTimeout && openHorizontalPosition !== lastOpenHorizontalPosition) {
 					clearTimeout(horizontalOpenerTimeout);
 					horizontalOpenerTimeout = undefined;
@@ -1352,7 +1359,17 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupsView {
 
 	private async doApplyState(state: IEditorPartUIState, options?: IEditorGroupViewOptions): Promise<void> {
 		const groups = await this.doPrepareApplyState();
-		const resumeEvents = this.disposeGroups(true /* suspress events for the duration of applying state */);
+
+		// Pause add/remove events for groups during the duration of applying the state
+		// This ensures that we can do this transition atomically with the new state
+		// being ready when the events are fired. This is important because usually there
+		// is never the state where no groups are present, but for this transition we
+		// need to temporarily dispose all groups to restore the new set.
+
+		this._onDidAddGroup.pause();
+		this._onDidRemoveGroup.pause();
+
+		this.disposeGroups();
 
 		// MRU
 		this.mostRecentActiveGroups = state.mostRecentActiveGroups;
@@ -1361,7 +1378,12 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupsView {
 		try {
 			this.doApplyGridState(state.serializedGrid, state.activeGroup, undefined, options);
 		} finally {
-			resumeEvents();
+			// It is very important to keep this order: first resume the events for
+			// removed groups and then for added groups. Many listeners may store
+			// groups in sets by their identifier and groups can have the same
+			// identifier before and after.
+			this._onDidRemoveGroup.resume();
+			this._onDidAddGroup.resume();
 		}
 
 		// Restore editors that were not closed before and are now opened now
@@ -1435,13 +1457,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupsView {
 		};
 	}
 
-	private disposeGroups(): void;
-	private disposeGroups(surpressEvents: boolean): Function;
-	private disposeGroups(surpressEvents?: boolean): Function | void {
-		if (surpressEvents) {
-			this._onDidRemoveGroup.pause();
-		}
-
+	private disposeGroups(): void {
 		for (const group of this.groups) {
 			group.dispose();
 
@@ -1450,14 +1466,13 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupsView {
 
 		this.groupViews.clear();
 		this.mostRecentActiveGroups = [];
-
-		if (surpressEvents) {
-			return () => this._onDidRemoveGroup.resume();
-		}
 	}
 
 	override dispose(): void {
 
+		// Event
+		this._onWillDispose.fire();
+
 		// Forward to all groups
 		this.disposeGroups();
 
diff --git a/src/vs/workbench/browser/parts/editor/editorParts.ts b/src/vs/workbench/browser/parts/editor/editorParts.ts
index e505a3fd466..3684686bdf2 100644
--- a/src/vs/workbench/browser/parts/editor/editorParts.ts
+++ b/src/vs/workbench/browser/parts/editor/editorParts.ts
@@ -3,25 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { EditorGroupLayout, GroupDirection, GroupLocation, GroupOrientation, GroupsArrangement, GroupsOrder, IAuxiliaryEditorPart, IAuxiliaryEditorPartCreateEvent, IEditorGroupContextKeyProvider, IEditorDropTargetDelegate, IEditorGroupsService, IEditorSideGroup, IEditorWorkingSet, IFindGroupScope, IMergeGroupOptions, IEditorWorkingSetOptions } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { Emitter } from 'vs/base/common/event';
-import { DisposableMap, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { GroupIdentifier } from 'vs/workbench/common/editor';
-import { EditorPart, IEditorPartUIState, MainEditorPart } from 'vs/workbench/browser/parts/editor/editorPart';
-import { IEditorGroupView, IEditorPartsView } from 'vs/workbench/browser/parts/editor/editor';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { distinct, firstOrDefault } from 'vs/base/common/arrays';
-import { AuxiliaryEditorPart, IAuxiliaryEditorPartOpenOptions } from 'vs/workbench/browser/parts/editor/auxiliaryEditorPart';
-import { MultiWindowParts } from 'vs/workbench/browser/part';
-import { DeferredPromise } from 'vs/base/common/async';
-import { IStorageService, IStorageValueChangeEvent, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IAuxiliaryWindowOpenOptions, IAuxiliaryWindowService } from 'vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService';
-import { generateUuid } from 'vs/base/common/uuid';
-import { ContextKeyValue, IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { isHTMLElement } from 'vs/base/browser/dom';
+import { localize } from '../../../../nls.js';
+import { EditorGroupLayout, GroupDirection, GroupLocation, GroupOrientation, GroupsArrangement, GroupsOrder, IAuxiliaryEditorPart, IEditorGroupContextKeyProvider, IEditorDropTargetDelegate, IEditorGroupsService, IEditorSideGroup, IEditorWorkingSet, IFindGroupScope, IMergeGroupOptions, IEditorWorkingSetOptions, IEditorPart } from '../../../services/editor/common/editorGroupsService.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { DisposableMap, DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { GroupIdentifier } from '../../../common/editor.js';
+import { EditorPart, IEditorPartUIState, MainEditorPart } from './editorPart.js';
+import { IEditorGroupView, IEditorPartsView } from './editor.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { distinct } from '../../../../base/common/arrays.js';
+import { AuxiliaryEditorPart, IAuxiliaryEditorPartOpenOptions } from './auxiliaryEditorPart.js';
+import { MultiWindowParts } from '../../part.js';
+import { DeferredPromise } from '../../../../base/common/async.js';
+import { IStorageService, IStorageValueChangeEvent, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IAuxiliaryWindowOpenOptions, IAuxiliaryWindowService } from '../../../services/auxiliaryWindow/browser/auxiliaryWindowService.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { ContextKeyValue, IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { isHTMLElement } from '../../../../base/browser/dom.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
 
 interface IEditorPartsUIState {
 	readonly auxiliary: IAuxiliaryEditorPartState[];
@@ -70,19 +72,44 @@ export class EditorParts extends MultiWindowParts<EditorPart> implements IEditor
 		return this.instantiationService.createInstance(MainEditorPart, this);
 	}
 
+	//#region Scoped Instantiation Services
+
+	private readonly mapPartToInstantiationService = new Map<number /* window ID */, IInstantiationService>();
+
+	getScopedInstantiationService(part: IEditorPart): IInstantiationService {
+		if (part === this.mainPart) {
+			if (!this.mapPartToInstantiationService.has(part.windowId)) {
+				this.instantiationService.invokeFunction(accessor => {
+					const editorService = accessor.get(IEditorService); // using `invokeFunction` to get hold of `IEditorService` lazily
+
+					this.mapPartToInstantiationService.set(part.windowId, this._register(this.instantiationService.createChild(new ServiceCollection(
+						[IEditorService, editorService.createScoped('main', this._store)]
+					))));
+				});
+			}
+		}
+
+		return this.mapPartToInstantiationService.get(part.windowId) ?? this.instantiationService;
+	}
+
+	//#endregion
+
 	//#region Auxiliary Editor Parts
 
-	private readonly _onDidCreateAuxiliaryEditorPart = this._register(new Emitter<IAuxiliaryEditorPartCreateEvent>());
+	private readonly _onDidCreateAuxiliaryEditorPart = this._register(new Emitter<IAuxiliaryEditorPart>());
 	readonly onDidCreateAuxiliaryEditorPart = this._onDidCreateAuxiliaryEditorPart.event;
 
 	async createAuxiliaryEditorPart(options?: IAuxiliaryEditorPartOpenOptions): Promise<IAuxiliaryEditorPart> {
 		const { part, instantiationService, disposables } = await this.instantiationService.createInstance(AuxiliaryEditorPart, this).create(this.getGroupsLabel(this._parts.size), options);
 
+		// Keep instantiation service
+		this.mapPartToInstantiationService.set(part.windowId, instantiationService);
+		disposables.add(toDisposable(() => this.mapPartToInstantiationService.delete(part.windowId)));
+
 		// Events
 		this._onDidAddGroup.fire(part.activeGroup);
 
-		const eventDisposables = disposables.add(new DisposableStore());
-		this._onDidCreateAuxiliaryEditorPart.fire({ part, instantiationService, disposables: eventDisposables });
+		this._onDidCreateAuxiliaryEditorPart.fire(part);
 
 		return part;
 	}
@@ -223,7 +250,7 @@ export class EditorParts extends MultiWindowParts<EditorPart> implements IEditor
 			}
 		}
 
-		const mostRecentActivePart = firstOrDefault(this.mostRecentActiveParts);
+		const mostRecentActivePart = this.mostRecentActiveParts.at(0);
 		mostRecentActivePart?.activeGroup.focus();
 
 		this._isReady = true;
@@ -400,7 +427,7 @@ export class EditorParts extends MultiWindowParts<EditorPart> implements IEditor
 
 		// Restore Focus unless instructed otherwise
 		if (!options?.preserveFocus) {
-			const mostRecentActivePart = firstOrDefault(this.mostRecentActiveParts);
+			const mostRecentActivePart = this.mostRecentActiveParts.at(0);
 			if (mostRecentActivePart) {
 				await mostRecentActivePart.whenReady;
 				mostRecentActivePart.activeGroup.focus();
@@ -761,7 +788,7 @@ export class EditorParts extends MultiWindowParts<EditorPart> implements IEditor
 		let groupRegisteredContextKeys = this.registeredContextKeys.get(group.id);
 		if (!groupRegisteredContextKeys) {
 			groupRegisteredContextKeys = new Map<string, IContextKey>();
-			this.scopedContextKeys.set(group.id, groupRegisteredContextKeys);
+			this.registeredContextKeys.set(group.id, groupRegisteredContextKeys);
 		}
 
 		let scopedRegisteredContextKey = groupRegisteredContextKeys.get(provider.contextKey.key);
diff --git a/src/vs/workbench/browser/parts/editor/editorPlaceholder.ts b/src/vs/workbench/browser/parts/editor/editorPlaceholder.ts
index def52c5b61e..6c100075472 100644
--- a/src/vs/workbench/browser/parts/editor/editorPlaceholder.ts
+++ b/src/vs/workbench/browser/parts/editor/editorPlaceholder.ts
@@ -3,33 +3,33 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/editorplaceholder';
-import { localize } from 'vs/nls';
-import { truncate, truncateMiddle } from 'vs/base/common/strings';
-import Severity from 'vs/base/common/severity';
-import { IEditorOpenContext, isEditorOpenError } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
-import { ScrollbarVisibility } from 'vs/base/common/scrollable';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { Dimension, size, clearNode, $, EventHelper } from 'vs/base/browser/dom';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { DisposableStore, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { assertAllDefined } from 'vs/base/common/types';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IWorkspaceContextService, isSingleFolderWorkspaceIdentifier, toWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
-import { EditorOpenSource, IEditorOptions } from 'vs/platform/editor/common/editor';
-import { computeEditorAriaLabel, EditorPaneDescriptor } from 'vs/workbench/browser/editor';
-import { ButtonBar } from 'vs/base/browser/ui/button/button';
-import { defaultButtonStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { SimpleIconLabel } from 'vs/base/browser/ui/iconLabel/simpleIconLabel';
-import { FileChangeType, FileOperationError, FileOperationResult, IFileService } from 'vs/platform/files/common/files';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
+import './media/editorplaceholder.css';
+import { localize } from '../../../../nls.js';
+import { truncate, truncateMiddle } from '../../../../base/common/strings.js';
+import Severity from '../../../../base/common/severity.js';
+import { IEditorOpenContext, isEditorOpenError } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { EditorPane } from './editorPane.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { DomScrollableElement } from '../../../../base/browser/ui/scrollbar/scrollableElement.js';
+import { ScrollbarVisibility } from '../../../../base/common/scrollable.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { Dimension, size, clearNode, $, EventHelper } from '../../../../base/browser/dom.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { DisposableStore, IDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { assertAllDefined } from '../../../../base/common/types.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IWorkspaceContextService, isSingleFolderWorkspaceIdentifier, toWorkspaceIdentifier } from '../../../../platform/workspace/common/workspace.js';
+import { EditorOpenSource, IEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { computeEditorAriaLabel, EditorPaneDescriptor } from '../../editor.js';
+import { ButtonBar } from '../../../../base/browser/ui/button/button.js';
+import { defaultButtonStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { SimpleIconLabel } from '../../../../base/browser/ui/iconLabel/simpleIconLabel.js';
+import { FileChangeType, FileOperationError, FileOperationResult, IFileService } from '../../../../platform/files/common/files.js';
+import { toErrorMessage } from '../../../../base/common/errorMessage.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IEditorGroup } from '../../../services/editor/common/editorGroupsService.js';
 
 export interface IEditorPlaceholderContents {
 	icon: string;
@@ -185,7 +185,7 @@ export class WorkspaceTrustRequiredPlaceholderEditor extends EditorPlaceholder {
 	static readonly ID = 'workbench.editors.workspaceTrustRequiredEditor';
 	private static readonly LABEL = localize('trustRequiredEditor', "Workspace Trust Required");
 
-	static readonly DESCRIPTOR = EditorPaneDescriptor.create(WorkspaceTrustRequiredPlaceholderEditor, WorkspaceTrustRequiredPlaceholderEditor.ID, WorkspaceTrustRequiredPlaceholderEditor.LABEL);
+	static readonly DESCRIPTOR = EditorPaneDescriptor.create(WorkspaceTrustRequiredPlaceholderEditor, this.ID, this.LABEL);
 
 	constructor(
 		group: IEditorGroup,
@@ -223,7 +223,7 @@ export class ErrorPlaceholderEditor extends EditorPlaceholder {
 	private static readonly ID = 'workbench.editors.errorEditor';
 	private static readonly LABEL = localize('errorEditor', "Error Editor");
 
-	static readonly DESCRIPTOR = EditorPaneDescriptor.create(ErrorPlaceholderEditor, ErrorPlaceholderEditor.ID, ErrorPlaceholderEditor.LABEL);
+	static readonly DESCRIPTOR = EditorPaneDescriptor.create(ErrorPlaceholderEditor, this.ID, this.LABEL);
 
 	constructor(
 		group: IEditorGroup,
diff --git a/src/vs/workbench/browser/parts/editor/editorQuickAccess.ts b/src/vs/workbench/browser/parts/editor/editorQuickAccess.ts
index 225330438f6..bbab2a62d6e 100644
--- a/src/vs/workbench/browser/parts/editor/editorQuickAccess.ts
+++ b/src/vs/workbench/browser/parts/editor/editorQuickAccess.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/editorquickaccess';
-import { localize } from 'vs/nls';
-import { IQuickPickSeparator, quickPickItemScorerAccessor, IQuickPickItemWithResource, IQuickPick } from 'vs/platform/quickinput/common/quickInput';
-import { PickerQuickAccessProvider, IPickerQuickAccessItem, TriggerAction } from 'vs/platform/quickinput/browser/pickerQuickAccess';
-import { IEditorGroupsService, GroupsOrder } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { EditorsOrder, IEditorIdentifier, EditorResourceAccessor, SideBySideEditor, GroupIdentifier } from 'vs/workbench/common/editor';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { getIconClasses } from 'vs/editor/common/services/getIconClasses';
-import { prepareQuery, scoreItemFuzzy, compareItemsByFuzzyScore, FuzzyScorerCache } from 'vs/base/common/fuzzyScorer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
+import './media/editorquickaccess.css';
+import { localize } from '../../../../nls.js';
+import { IQuickPickSeparator, quickPickItemScorerAccessor, IQuickPickItemWithResource, IQuickPick } from '../../../../platform/quickinput/common/quickInput.js';
+import { PickerQuickAccessProvider, IPickerQuickAccessItem, TriggerAction } from '../../../../platform/quickinput/browser/pickerQuickAccess.js';
+import { IEditorGroupsService, GroupsOrder } from '../../../services/editor/common/editorGroupsService.js';
+import { EditorsOrder, IEditorIdentifier, EditorResourceAccessor, SideBySideEditor, GroupIdentifier } from '../../../common/editor.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { getIconClasses } from '../../../../editor/common/services/getIconClasses.js';
+import { prepareQuery, scoreItemFuzzy, compareItemsByFuzzyScore, FuzzyScorerCache } from '../../../../base/common/fuzzyScorer.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
 
 interface IEditorQuickPickItem extends IQuickPickItemWithResource, IPickerQuickAccessItem {
 	groupId: GroupIdentifier;
@@ -60,7 +60,7 @@ export abstract class BaseEditorQuickAccessProvider extends PickerQuickAccessPro
 		);
 	}
 
-	override provide(picker: IQuickPick<IEditorQuickPickItem>, token: CancellationToken): IDisposable {
+	override provide(picker: IQuickPick<IEditorQuickPickItem, { useSeparators: true }>, token: CancellationToken): IDisposable {
 
 		// Reset the pick state for this run
 		this.pickState.reset(!!picker.quickNavigate);
diff --git a/src/vs/workbench/browser/parts/editor/editorStatus.ts b/src/vs/workbench/browser/parts/editor/editorStatus.ts
index 845160784b1..acc013522c5 100644
--- a/src/vs/workbench/browser/parts/editor/editorStatus.ts
+++ b/src/vs/workbench/browser/parts/editor/editorStatus.ts
@@ -3,61 +3,59 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/editorstatus';
-import { localize, localize2 } from 'vs/nls';
-import { getWindowById, runAtThisOrScheduleAtNextAnimationFrame } from 'vs/base/browser/dom';
-import { format, compare, splitLines } from 'vs/base/common/strings';
-import { extname, basename, isEqual } from 'vs/base/common/resources';
-import { areFunctions, assertIsDefined } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { Action } from 'vs/base/common/actions';
-import { Language } from 'vs/base/common/platform';
-import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
-import { IFileEditorInput, EditorResourceAccessor, IEditorPane, SideBySideEditor } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { Disposable, MutableDisposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { IEditorAction } from 'vs/editor/common/editorCommon';
-import { EndOfLineSequence } from 'vs/editor/common/model';
-import { TrimTrailingWhitespaceAction } from 'vs/editor/contrib/linesOperations/browser/linesOperations';
-import { IndentUsingSpaces, IndentUsingTabs, ChangeTabDisplaySize, DetectIndentation, IndentationToSpacesAction, IndentationToTabsAction } from 'vs/editor/contrib/indentation/browser/indentation';
-import { BaseBinaryResourceEditor } from 'vs/workbench/browser/parts/editor/binaryEditor';
-import { BinaryResourceDiffEditor } from 'vs/workbench/browser/parts/editor/binaryDiffEditor';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IFileService, FILES_ASSOCIATIONS_CONFIG } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILanguageService, ILanguageSelection } from 'vs/editor/common/languages/language';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ICommandService, CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { EncodingMode, IEncodingSupport, ILanguageSupport, ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { SUPPORTED_ENCODINGS } from 'vs/workbench/services/textfile/common/encoding';
-import { ConfigurationChangedEvent, EditorOption } from 'vs/editor/common/config/editorOptions';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { deepClone } from 'vs/base/common/objects';
-import { ICodeEditor, getCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { Schemas } from 'vs/base/common/network';
-import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
-import { IQuickInputService, IQuickPickItem, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
-import { getIconClassesForLanguageId } from 'vs/editor/common/services/getIconClasses';
-import { Promises, timeout } from 'vs/base/common/async';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment, IStatusbarEntry } from 'vs/workbench/services/statusbar/browser/statusbar';
-import { IMarker, IMarkerService, MarkerSeverity, IMarkerData } from 'vs/platform/markers/common/markers';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditorInput';
-import { AutomaticLanguageDetectionLikelyWrongClassification, AutomaticLanguageDetectionLikelyWrongId, IAutomaticLanguageDetectionLikelyWrongData, ILanguageDetectionService } from 'vs/workbench/services/languageDetection/common/languageDetectionWorkerService';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { Action2 } from 'vs/platform/actions/common/actions';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { TabFocus } from 'vs/editor/browser/config/tabFocus';
-import { mainWindow } from 'vs/base/browser/window';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
+import './media/editorstatus.css';
+import { localize, localize2 } from '../../../../nls.js';
+import { getWindowById, runAtThisOrScheduleAtNextAnimationFrame } from '../../../../base/browser/dom.js';
+import { format, compare, splitLines } from '../../../../base/common/strings.js';
+import { extname, basename, isEqual } from '../../../../base/common/resources.js';
+import { areFunctions, assertIsDefined } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Action } from '../../../../base/common/actions.js';
+import { Language } from '../../../../base/common/platform.js';
+import { UntitledTextEditorInput } from '../../../services/untitled/common/untitledTextEditorInput.js';
+import { IFileEditorInput, EditorResourceAccessor, IEditorPane, SideBySideEditor } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { Disposable, MutableDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { IEditorAction } from '../../../../editor/common/editorCommon.js';
+import { EndOfLineSequence } from '../../../../editor/common/model.js';
+import { TrimTrailingWhitespaceAction } from '../../../../editor/contrib/linesOperations/browser/linesOperations.js';
+import { IndentUsingSpaces, IndentUsingTabs, ChangeTabDisplaySize, DetectIndentation, IndentationToSpacesAction, IndentationToTabsAction } from '../../../../editor/contrib/indentation/browser/indentation.js';
+import { BaseBinaryResourceEditor } from './binaryEditor.js';
+import { BinaryResourceDiffEditor } from './binaryDiffEditor.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IFileService, FILES_ASSOCIATIONS_CONFIG } from '../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILanguageService, ILanguageSelection } from '../../../../editor/common/languages/language.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { Selection } from '../../../../editor/common/core/selection.js';
+import { ICommandService, CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { IExtensionGalleryService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { EncodingMode, IEncodingSupport, ILanguageSupport, ITextFileService } from '../../../services/textfile/common/textfiles.js';
+import { SUPPORTED_ENCODINGS } from '../../../services/textfile/common/encoding.js';
+import { ConfigurationChangedEvent, EditorOption } from '../../../../editor/common/config/editorOptions.js';
+import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { ConfigurationTarget, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { deepClone } from '../../../../base/common/objects.js';
+import { ICodeEditor, getCodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
+import { IQuickInputService, IQuickPickItem, QuickPickInput } from '../../../../platform/quickinput/common/quickInput.js';
+import { getIconClassesForLanguageId } from '../../../../editor/common/services/getIconClasses.js';
+import { Promises, timeout } from '../../../../base/common/async.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment, IStatusbarEntry } from '../../../services/statusbar/browser/statusbar.js';
+import { IMarker, IMarkerService, MarkerSeverity, IMarkerData } from '../../../../platform/markers/common/markers.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
+import { AutomaticLanguageDetectionLikelyWrongClassification, AutomaticLanguageDetectionLikelyWrongId, IAutomaticLanguageDetectionLikelyWrongData, ILanguageDetectionService } from '../../../services/languageDetection/common/languageDetectionWorkerService.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { Action2 } from '../../../../platform/actions/common/actions.js';
+import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeyChord, KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { TabFocus } from '../../../../editor/browser/config/tabFocus.js';
+import { IEditorGroupsService, IEditorPart } from '../../../services/editor/common/editorGroupsService.js';
 
 class SideBySideEditorEncodingSupport implements IEncodingSupport {
 	constructor(private primary: IEncodingSupport, private secondary: IEncodingSupport) { }
@@ -886,22 +884,23 @@ export class EditorStatusContribution extends Disposable implements IWorkbenchCo
 	static readonly ID = 'workbench.contrib.editorStatus';
 
 	constructor(
-		@IInstantiationService instantiationService: IInstantiationService,
-		@IEditorGroupsService editorGroupService: IEditorGroupsService,
-		@IEditorService editorService: IEditorService
+		@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService,
 	) {
 		super();
 
-		// Main Editor Status
-		const mainInstantiationService = this._register(instantiationService.createChild(new ServiceCollection(
-			[IEditorService, editorService.createScoped('main', this._store)]
-		)));
-		this._register(mainInstantiationService.createInstance(EditorStatus, mainWindow.vscodeWindowId));
+		for (const part of editorGroupService.parts) {
+			this.createEditorStatus(part);
+		}
 
-		// Auxiliary Editor Status
-		this._register(editorGroupService.onDidCreateAuxiliaryEditorPart(({ part, instantiationService, disposables }) => {
-			disposables.add(instantiationService.createInstance(EditorStatus, part.windowId));
-		}));
+		this._register(editorGroupService.onDidCreateAuxiliaryEditorPart(part => this.createEditorStatus(part)));
+	}
+
+	private createEditorStatus(part: IEditorPart): void {
+		const disposables = new DisposableStore();
+		Event.once(part.onWillDispose)(() => disposables.dispose());
+
+		const scopedInstantiationService = this.editorGroupService.getScopedInstantiationService(part);
+		disposables.add(scopedInstantiationService.createInstance(EditorStatus, part.windowId));
 	}
 }
 
diff --git a/src/vs/workbench/browser/parts/editor/editorTabsControl.ts b/src/vs/workbench/browser/parts/editor/editorTabsControl.ts
index e5e4f7774de..ed619532801 100644
--- a/src/vs/workbench/browser/parts/editor/editorTabsControl.ts
+++ b/src/vs/workbench/browser/parts/editor/editorTabsControl.ts
@@ -3,50 +3,52 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/editortabscontrol';
-import { localize } from 'vs/nls';
-import { applyDragImage, DataTransfers } from 'vs/base/browser/dnd';
-import { Dimension, getActiveWindow, getWindow, isMouseEvent } from 'vs/base/browser/dom';
-import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { ActionsOrientation, IActionViewItem, prepareActions } from 'vs/base/browser/ui/actionbar/actionbar';
-import { IAction, ActionRunner } from 'vs/base/common/actions';
-import { ResolvedKeybinding } from 'vs/base/common/keybindings';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { createActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { listActiveSelectionBackground, listActiveSelectionForeground } from 'vs/platform/theme/common/colorRegistry';
-import { IThemeService, Themable } from 'vs/platform/theme/common/themeService';
-import { DraggedEditorGroupIdentifier, DraggedEditorIdentifier, fillEditorsDragData, isWindowDraggedOver } from 'vs/workbench/browser/dnd';
-import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
-import { IEditorGroupsView, IEditorGroupView, IEditorPartsView, IInternalEditorOpenOptions } from 'vs/workbench/browser/parts/editor/editor';
-import { IEditorCommandsContext, EditorResourceAccessor, IEditorPartOptions, SideBySideEditor, EditorsOrder, EditorInputCapabilities, IToolbarActions, GroupIdentifier, Verbosity } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { ResourceContextKey, ActiveEditorPinnedContext, ActiveEditorStickyContext, ActiveEditorGroupLockedContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, ActiveEditorFirstInGroupContext, ActiveEditorAvailableEditorIdsContext, applyAvailableEditorIds, ActiveEditorLastInGroupContext } from 'vs/workbench/common/contextkeys';
-import { AnchorAlignment } from 'vs/base/browser/ui/contextview/contextview';
-import { assertIsDefined } from 'vs/base/common/types';
-import { isFirefox } from 'vs/base/browser/browser';
-import { isCancellationError } from 'vs/base/common/errors';
-import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditorInput';
-import { WorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
-import { LocalSelectionTransfer } from 'vs/platform/dnd/browser/dnd';
-import { DraggedTreeItemsIdentifier } from 'vs/editor/common/services/treeViewsDnd';
-import { IEditorResolverService } from 'vs/workbench/services/editor/common/editorResolverService';
-import { IEditorTitleControlDimensions } from 'vs/workbench/browser/parts/editor/editorTitleControl';
-import { IReadonlyEditorGroupModel } from 'vs/workbench/common/editor/editorGroupModel';
-import { EDITOR_CORE_NAVIGATION_COMMANDS } from 'vs/workbench/browser/parts/editor/editorCommands';
-import { IAuxiliaryEditorPart, MergeGroupMode } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { isMacintosh } from 'vs/base/common/platform';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { IBaseActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
+import './media/editortabscontrol.css';
+import { localize } from '../../../../nls.js';
+import { applyDragImage, DataTransfers } from '../../../../base/browser/dnd.js';
+import { Dimension, getActiveWindow, getWindow, isMouseEvent } from '../../../../base/browser/dom.js';
+import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
+import { ActionsOrientation, IActionViewItem, prepareActions } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { IAction, ActionRunner } from '../../../../base/common/actions.js';
+import { ResolvedKeybinding } from '../../../../base/common/keybindings.js';
+import { DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import { createActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { IContextKeyService, IContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { listActiveSelectionBackground, listActiveSelectionForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import { IThemeService, Themable } from '../../../../platform/theme/common/themeService.js';
+import { DraggedEditorGroupIdentifier, DraggedEditorIdentifier, fillEditorsDragData, isWindowDraggedOver } from '../../dnd.js';
+import { EditorPane } from './editorPane.js';
+import { IEditorGroupsView, IEditorGroupView, IEditorPartsView, IInternalEditorOpenOptions } from './editor.js';
+import { IEditorCommandsContext, EditorResourceAccessor, IEditorPartOptions, SideBySideEditor, EditorsOrder, EditorInputCapabilities, IToolbarActions, GroupIdentifier, Verbosity } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { ResourceContextKey, ActiveEditorPinnedContext, ActiveEditorStickyContext, ActiveEditorGroupLockedContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, ActiveEditorFirstInGroupContext, ActiveEditorAvailableEditorIdsContext, applyAvailableEditorIds, ActiveEditorLastInGroupContext } from '../../../common/contextkeys.js';
+import { AnchorAlignment } from '../../../../base/browser/ui/contextview/contextview.js';
+import { assertIsDefined } from '../../../../base/common/types.js';
+import { isFirefox } from '../../../../base/browser/browser.js';
+import { isCancellationError } from '../../../../base/common/errors.js';
+import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
+import { WorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
+import { LocalSelectionTransfer } from '../../../../platform/dnd/browser/dnd.js';
+import { DraggedTreeItemsIdentifier } from '../../../../editor/common/services/treeViewsDnd.js';
+import { IEditorResolverService } from '../../../services/editor/common/editorResolverService.js';
+import { IEditorTitleControlDimensions } from './editorTitleControl.js';
+import { IReadonlyEditorGroupModel } from '../../../common/editor/editorGroupModel.js';
+import { EDITOR_CORE_NAVIGATION_COMMANDS } from './editorCommands.js';
+import { IAuxiliaryEditorPart, MergeGroupMode } from '../../../services/editor/common/editorGroupsService.js';
+import { isMacintosh } from '../../../../base/common/platform.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { IHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegate.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { IBaseActionViewItemOptions } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { IManagedHoverTooltipMarkdownString } from '../../../../base/browser/ui/hover/hover.js';
 
 export class EditorCommandsContextActionRunner extends ActionRunner {
 
@@ -145,7 +147,14 @@ export abstract class EditorTabsControl extends Themable implements IEditorTabsC
 	) {
 		super(themeService);
 
-		this.contextMenuContextKeyService = this._register(this.contextKeyService.createScoped(parent));
+		this.renderDropdownAsChildElement = false;
+
+		this.tabsHoverDelegate = getDefaultHoverDelegate('mouse');
+
+		const container = this.create(parent);
+
+		// Context Keys
+		this.contextMenuContextKeyService = this._register(this.contextKeyService.createScoped(container));
 		const scopedInstantiationService = this._register(this.instantiationService.createChild(new ServiceCollection(
 			[IContextKeyService, this.contextMenuContextKeyService],
 		)));
@@ -162,16 +171,11 @@ export abstract class EditorTabsControl extends Themable implements IEditorTabsC
 		this.sideBySideEditorContext = SideBySideEditorActiveContext.bindTo(this.contextMenuContextKeyService);
 
 		this.groupLockedContext = ActiveEditorGroupLockedContext.bindTo(this.contextMenuContextKeyService);
-
-		this.renderDropdownAsChildElement = false;
-
-		this.tabsHoverDelegate = getDefaultHoverDelegate('mouse');
-
-		this.create(parent);
 	}
 
-	protected create(parent: HTMLElement): void {
+	protected create(parent: HTMLElement): HTMLElement {
 		this.updateTabHeight();
+		return parent;
 	}
 
 	private get editorActionsEnabled(): boolean {
@@ -452,8 +456,17 @@ export abstract class EditorTabsControl extends Themable implements IEditorTabsC
 		return this.groupsView.partOptions.tabHeight !== 'compact' ? EditorTabsControl.EDITOR_TAB_HEIGHT.normal : EditorTabsControl.EDITOR_TAB_HEIGHT.compact;
 	}
 
-	protected getHoverTitle(editor: EditorInput): string {
-		return editor.getTitle(Verbosity.LONG);
+	protected getHoverTitle(editor: EditorInput): string | IManagedHoverTooltipMarkdownString {
+		const title = editor.getTitle(Verbosity.LONG);
+		if (!this.tabsModel.isPinned(editor)) {
+			return {
+				markdown: new MarkdownString('', { supportThemeIcons: true, isTrusted: true }).
+					appendText(title).
+					appendMarkdown(' (_preview_ [$(gear)](command:workbench.action.openSettings?%5B%22workbench.editor.enablePreview%22%5D "Configure Preview Mode"))'),
+				markdownNotSupportedFallback: title + ' (preview)'
+			};
+		}
+		return title;
 	}
 
 	protected getHoverDelegate(): IHoverDelegate {
diff --git a/src/vs/workbench/browser/parts/editor/editorTitleControl.ts b/src/vs/workbench/browser/parts/editor/editorTitleControl.ts
index d134e9b6175..ac74f9b7728 100644
--- a/src/vs/workbench/browser/parts/editor/editorTitleControl.ts
+++ b/src/vs/workbench/browser/parts/editor/editorTitleControl.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/editortitlecontrol';
-import { Dimension, clearNode } from 'vs/base/browser/dom';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IThemeService, Themable } from 'vs/platform/theme/common/themeService';
-import { BreadcrumbsControl, BreadcrumbsControlFactory } from 'vs/workbench/browser/parts/editor/breadcrumbsControl';
-import { IEditorGroupsView, IEditorGroupTitleHeight, IEditorGroupView, IEditorPartsView, IInternalEditorOpenOptions } from 'vs/workbench/browser/parts/editor/editor';
-import { IEditorTabsControl } from 'vs/workbench/browser/parts/editor/editorTabsControl';
-import { MultiEditorTabsControl } from 'vs/workbench/browser/parts/editor/multiEditorTabsControl';
-import { SingleEditorTabsControl } from 'vs/workbench/browser/parts/editor/singleEditorTabsControl';
-import { IEditorPartOptions } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { MultiRowEditorControl } from 'vs/workbench/browser/parts/editor/multiRowEditorTabsControl';
-import { IReadonlyEditorGroupModel } from 'vs/workbench/common/editor/editorGroupModel';
-import { NoEditorTabsControl } from 'vs/workbench/browser/parts/editor/noEditorTabsControl';
+import './media/editortitlecontrol.css';
+import { Dimension, clearNode } from '../../../../base/browser/dom.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IThemeService, Themable } from '../../../../platform/theme/common/themeService.js';
+import { BreadcrumbsControl, BreadcrumbsControlFactory } from './breadcrumbsControl.js';
+import { IEditorGroupsView, IEditorGroupTitleHeight, IEditorGroupView, IEditorPartsView, IInternalEditorOpenOptions } from './editor.js';
+import { IEditorTabsControl } from './editorTabsControl.js';
+import { MultiEditorTabsControl } from './multiEditorTabsControl.js';
+import { SingleEditorTabsControl } from './singleEditorTabsControl.js';
+import { IEditorPartOptions } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { MultiRowEditorControl } from './multiRowEditorTabsControl.js';
+import { IReadonlyEditorGroupModel } from '../../../common/editor/editorGroupModel.js';
+import { NoEditorTabsControl } from './noEditorTabsControl.js';
 
 export interface IEditorTitleControlDimensions {
 
diff --git a/src/vs/workbench/browser/parts/editor/editorWithViewState.ts b/src/vs/workbench/browser/parts/editor/editorWithViewState.ts
index e31756007e9..8cfd84b64c1 100644
--- a/src/vs/workbench/browser/parts/editor/editorWithViewState.ts
+++ b/src/vs/workbench/browser/parts/editor/editorWithViewState.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { Event } from 'vs/base/common/event';
-import { IEditorMemento, IEditorCloseEvent, IEditorOpenContext, EditorResourceAccessor, SideBySideEditor } from 'vs/workbench/common/editor';
-import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { IEditorGroupsService, IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IExtUri } from 'vs/base/common/resources';
-import { IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
+import { URI } from '../../../../base/common/uri.js';
+import { Event } from '../../../../base/common/event.js';
+import { IEditorMemento, IEditorCloseEvent, IEditorOpenContext, EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
+import { EditorPane } from './editorPane.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { IEditorGroupsService, IEditorGroup } from '../../../services/editor/common/editorGroupsService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IExtUri } from '../../../../base/common/resources.js';
+import { IDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
 
 /**
  * Base class of editors that want to store and restore view state.
diff --git a/src/vs/workbench/browser/parts/editor/editorsObserver.ts b/src/vs/workbench/browser/parts/editor/editorsObserver.ts
index ac30da415d2..19dd4c3b511 100644
--- a/src/vs/workbench/browser/parts/editor/editorsObserver.ts
+++ b/src/vs/workbench/browser/parts/editor/editorsObserver.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IEditorFactoryRegistry, IEditorIdentifier, GroupIdentifier, EditorExtensions, IEditorPartOptionsChangeEvent, EditorsOrder, GroupModelChangeKind, EditorInputCapabilities } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditorInput';
-import { dispose, Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Event, Emitter } from 'vs/base/common/event';
-import { IEditorGroupsService, IEditorGroup, GroupsOrder, IEditorGroupsContainer } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { coalesce } from 'vs/base/common/arrays';
-import { LinkedMap, Touch, ResourceMap } from 'vs/base/common/map';
-import { equals } from 'vs/base/common/objects';
-import { IResourceEditorInputIdentifier } from 'vs/platform/editor/common/editor';
-import { URI } from 'vs/base/common/uri';
+import { IEditorFactoryRegistry, IEditorIdentifier, GroupIdentifier, EditorExtensions, IEditorPartOptionsChangeEvent, EditorsOrder, GroupModelChangeKind, EditorInputCapabilities } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
+import { dispose, Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { IEditorGroupsService, IEditorGroup, GroupsOrder, IEditorGroupsContainer } from '../../../services/editor/common/editorGroupsService.js';
+import { coalesce } from '../../../../base/common/arrays.js';
+import { LinkedMap, Touch, ResourceMap } from '../../../../base/common/map.js';
+import { equals } from '../../../../base/common/objects.js';
+import { IResourceEditorInputIdentifier } from '../../../../platform/editor/common/editor.js';
+import { URI } from '../../../../base/common/uri.js';
 
 interface ISerializedEditorsList {
 	entries: ISerializedEditorIdentifier[];
diff --git a/src/vs/workbench/browser/parts/editor/media/editorplaceholder.css b/src/vs/workbench/browser/parts/editor/media/editorplaceholder.css
index d4db8eaff00..4861d184353 100644
--- a/src/vs/workbench/browser/parts/editor/media/editorplaceholder.css
+++ b/src/vs/workbench/browser/parts/editor/media/editorplaceholder.css
@@ -18,7 +18,7 @@
 }
 
 .monaco-editor-pane-placeholder .editor-placeholder-icon-container .codicon {
-	font-size: 48px;
+	font-size: 48px !important;
 }
 
 .monaco-editor-pane-placeholder .editor-placeholder-icon-container .codicon.codicon-error {
diff --git a/src/vs/workbench/browser/parts/editor/media/editortabscontrol.css b/src/vs/workbench/browser/parts/editor/media/editortabscontrol.css
index 24de0a1f384..eb4033f6095 100644
--- a/src/vs/workbench/browser/parts/editor/media/editortabscontrol.css
+++ b/src/vs/workbench/browser/parts/editor/media/editortabscontrol.css
@@ -11,10 +11,14 @@
 
 .monaco-workbench .part.editor > .content .editor-group-container > .title .title-label,
 .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab .tab-label {
-	white-space: nowrap;
 	flex: 1;
 }
 
+.monaco-workbench .part.editor > .content .editor-group-container > .title .title-label .label-name,
+.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab .tab-label .label-name {
+	white-space: nowrap;
+}
+
 .monaco-workbench .part.editor > .content .editor-group-container > .title .title-label a,
 .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab .tab-label a {
 	font-size: 13px;
diff --git a/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.ts b/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.ts
index 588c334451a..9fa9e909485 100644
--- a/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.ts
+++ b/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.ts
@@ -3,61 +3,61 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/multieditortabscontrol';
-import { isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
-import { shorten } from 'vs/base/common/labels';
-import { EditorResourceAccessor, Verbosity, IEditorPartOptions, SideBySideEditor, DEFAULT_EDITOR_ASSOCIATION, EditorInputCapabilities, IUntypedEditorInput, preventEditorClose, EditorCloseMethod, EditorsOrder, IToolbarActions } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { computeEditorAriaLabel } from 'vs/workbench/browser/editor';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { EventType as TouchEventType, GestureEvent, Gesture } from 'vs/base/browser/touch';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { ResourceLabels, IResourceLabel, DEFAULT_LABELS_CONTAINER } from 'vs/workbench/browser/labels';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { EditorCommandsContextActionRunner, EditorTabsControl } from 'vs/workbench/browser/parts/editor/editorTabsControl';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { IDisposable, dispose, DisposableStore, combinedDisposable, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { ScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
-import { ScrollbarVisibility } from 'vs/base/common/scrollable';
-import { getOrSet } from 'vs/base/common/map';
-import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { TAB_INACTIVE_BACKGROUND, TAB_ACTIVE_BACKGROUND, TAB_BORDER, EDITOR_DRAG_AND_DROP_BACKGROUND, TAB_UNFOCUSED_ACTIVE_BACKGROUND, TAB_UNFOCUSED_ACTIVE_BORDER, TAB_ACTIVE_BORDER, TAB_HOVER_BACKGROUND, TAB_HOVER_BORDER, TAB_UNFOCUSED_HOVER_BACKGROUND, TAB_UNFOCUSED_HOVER_BORDER, EDITOR_GROUP_HEADER_TABS_BACKGROUND, WORKBENCH_BACKGROUND, TAB_ACTIVE_BORDER_TOP, TAB_UNFOCUSED_ACTIVE_BORDER_TOP, TAB_ACTIVE_MODIFIED_BORDER, TAB_INACTIVE_MODIFIED_BORDER, TAB_UNFOCUSED_ACTIVE_MODIFIED_BORDER, TAB_UNFOCUSED_INACTIVE_MODIFIED_BORDER, TAB_UNFOCUSED_INACTIVE_BACKGROUND, TAB_HOVER_FOREGROUND, TAB_UNFOCUSED_HOVER_FOREGROUND, EDITOR_GROUP_HEADER_TABS_BORDER, TAB_LAST_PINNED_BORDER, TAB_SELECTED_BORDER_TOP } from 'vs/workbench/common/theme';
-import { activeContrastBorder, contrastBorder, editorBackground, listActiveSelectionBackground, listActiveSelectionForeground } from 'vs/platform/theme/common/colorRegistry';
-import { ResourcesDropHandler, DraggedEditorIdentifier, DraggedEditorGroupIdentifier, extractTreeDropData, isWindowDraggedOver } from 'vs/workbench/browser/dnd';
-import { Color } from 'vs/base/common/color';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { MergeGroupMode, IMergeGroupOptions } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { addDisposableListener, EventType, EventHelper, Dimension, scheduleAtNextAnimationFrame, findParentWithClass, clearNode, DragAndDropObserver, isMouseEvent, getWindow } from 'vs/base/browser/dom';
-import { localize } from 'vs/nls';
-import { IEditorGroupsView, EditorServiceImpl, IEditorGroupView, IInternalEditorOpenOptions, IEditorPartsView } from 'vs/workbench/browser/parts/editor/editor';
-import { CloseEditorTabAction, UnpinEditorAction } from 'vs/workbench/browser/parts/editor/editorActions';
-import { assertAllDefined, assertIsDefined } from 'vs/base/common/types';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { basenameOrAuthority } from 'vs/base/common/resources';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { IPath, win32, posix } from 'vs/base/common/path';
-import { coalesce, insert } from 'vs/base/common/arrays';
-import { isHighContrast } from 'vs/platform/theme/common/theme';
-import { isSafari } from 'vs/base/browser/browser';
-import { equals } from 'vs/base/common/objects';
-import { EditorActivation, IEditorOptions } from 'vs/platform/editor/common/editor';
-import { UNLOCK_GROUP_COMMAND_ID } from 'vs/workbench/browser/parts/editor/editorCommands';
-import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { ITreeViewsDnDService } from 'vs/editor/common/services/treeViewsDndService';
-import { DraggedTreeItemsIdentifier } from 'vs/editor/common/services/treeViewsDnd';
-import { IEditorResolverService } from 'vs/workbench/services/editor/common/editorResolverService';
-import { IEditorTitleControlDimensions } from 'vs/workbench/browser/parts/editor/editorTitleControl';
-import { StickyEditorGroupModel, UnstickyEditorGroupModel } from 'vs/workbench/common/editor/filteredEditorGroupModel';
-import { IReadonlyEditorGroupModel } from 'vs/workbench/common/editor/editorGroupModel';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { BugIndicatingError } from 'vs/base/common/errors';
-import { applyDragImage } from 'vs/base/browser/dnd';
+import './media/multieditortabscontrol.css';
+import { isLinux, isMacintosh, isWindows } from '../../../../base/common/platform.js';
+import { shorten } from '../../../../base/common/labels.js';
+import { EditorResourceAccessor, Verbosity, IEditorPartOptions, SideBySideEditor, DEFAULT_EDITOR_ASSOCIATION, EditorInputCapabilities, IUntypedEditorInput, preventEditorClose, EditorCloseMethod, EditorsOrder, IToolbarActions } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { computeEditorAriaLabel } from '../../editor.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { EventType as TouchEventType, GestureEvent, Gesture } from '../../../../base/browser/touch.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { ResourceLabels, IResourceLabel, DEFAULT_LABELS_CONTAINER } from '../../labels.js';
+import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { EditorCommandsContextActionRunner, EditorTabsControl } from './editorTabsControl.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { IDisposable, dispose, DisposableStore, combinedDisposable, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { ScrollableElement } from '../../../../base/browser/ui/scrollbar/scrollableElement.js';
+import { ScrollbarVisibility } from '../../../../base/common/scrollable.js';
+import { getOrSet } from '../../../../base/common/map.js';
+import { IThemeService, registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
+import { TAB_INACTIVE_BACKGROUND, TAB_ACTIVE_BACKGROUND, TAB_BORDER, EDITOR_DRAG_AND_DROP_BACKGROUND, TAB_UNFOCUSED_ACTIVE_BACKGROUND, TAB_UNFOCUSED_ACTIVE_BORDER, TAB_ACTIVE_BORDER, TAB_HOVER_BACKGROUND, TAB_HOVER_BORDER, TAB_UNFOCUSED_HOVER_BACKGROUND, TAB_UNFOCUSED_HOVER_BORDER, EDITOR_GROUP_HEADER_TABS_BACKGROUND, WORKBENCH_BACKGROUND, TAB_ACTIVE_BORDER_TOP, TAB_UNFOCUSED_ACTIVE_BORDER_TOP, TAB_ACTIVE_MODIFIED_BORDER, TAB_INACTIVE_MODIFIED_BORDER, TAB_UNFOCUSED_ACTIVE_MODIFIED_BORDER, TAB_UNFOCUSED_INACTIVE_MODIFIED_BORDER, TAB_UNFOCUSED_INACTIVE_BACKGROUND, TAB_HOVER_FOREGROUND, TAB_UNFOCUSED_HOVER_FOREGROUND, EDITOR_GROUP_HEADER_TABS_BORDER, TAB_LAST_PINNED_BORDER, TAB_SELECTED_BORDER_TOP } from '../../../common/theme.js';
+import { activeContrastBorder, contrastBorder, editorBackground, listActiveSelectionBackground, listActiveSelectionForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import { ResourcesDropHandler, DraggedEditorIdentifier, DraggedEditorGroupIdentifier, extractTreeDropData, isWindowDraggedOver } from '../../dnd.js';
+import { Color } from '../../../../base/common/color.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { MergeGroupMode, IMergeGroupOptions } from '../../../services/editor/common/editorGroupsService.js';
+import { addDisposableListener, EventType, EventHelper, Dimension, scheduleAtNextAnimationFrame, findParentWithClass, clearNode, DragAndDropObserver, isMouseEvent, getWindow } from '../../../../base/browser/dom.js';
+import { localize } from '../../../../nls.js';
+import { IEditorGroupsView, EditorServiceImpl, IEditorGroupView, IInternalEditorOpenOptions, IEditorPartsView } from './editor.js';
+import { CloseEditorTabAction, UnpinEditorAction } from './editorActions.js';
+import { assertAllDefined, assertIsDefined } from '../../../../base/common/types.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { basenameOrAuthority } from '../../../../base/common/resources.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { IPathService } from '../../../services/path/common/pathService.js';
+import { IPath, win32, posix } from '../../../../base/common/path.js';
+import { coalesce, insert } from '../../../../base/common/arrays.js';
+import { isHighContrast } from '../../../../platform/theme/common/theme.js';
+import { isSafari } from '../../../../base/browser/browser.js';
+import { equals } from '../../../../base/common/objects.js';
+import { EditorActivation, IEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { UNLOCK_GROUP_COMMAND_ID } from './editorCommands.js';
+import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
+import { ITreeViewsDnDService } from '../../../../editor/common/services/treeViewsDndService.js';
+import { DraggedTreeItemsIdentifier } from '../../../../editor/common/services/treeViewsDnd.js';
+import { IEditorResolverService } from '../../../services/editor/common/editorResolverService.js';
+import { IEditorTitleControlDimensions } from './editorTitleControl.js';
+import { StickyEditorGroupModel, UnstickyEditorGroupModel } from '../../../common/editor/filteredEditorGroupModel.js';
+import { IReadonlyEditorGroupModel } from '../../../common/editor/editorGroupModel.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { BugIndicatingError } from '../../../../base/common/errors.js';
+import { applyDragImage } from '../../../../base/browser/dnd.js';
 
 interface IEditorInputLabel {
 	readonly editor: EditorInput;
@@ -164,7 +164,7 @@ export class MultiEditorTabsControl extends EditorTabsControl {
 		this._register(this.tabResourceLabels.onDidChangeDecorations(() => this.doHandleDecorationsChange()));
 	}
 
-	protected override create(parent: HTMLElement): void {
+	protected override create(parent: HTMLElement): HTMLElement {
 		super.create(parent);
 
 		this.titleContainer = parent;
@@ -196,6 +196,8 @@ export class MultiEditorTabsControl extends EditorTabsControl {
 
 		// Set tabs control visibility
 		this.updateTabsControlVisibility();
+
+		return this.tabsAndActionsContainer;
 	}
 
 	private createTabsScrollbar(scrollable: HTMLElement): ScrollableElement {
@@ -1093,7 +1095,7 @@ export class MultiEditorTabsControl extends EditorTabsControl {
 				}
 
 				// Apply some datatransfer types to allow for dragging the element outside of the application
-				this.doFillResourceDataTransfers([editor], e, isNewWindowOperation);
+				this.doFillResourceDataTransfers(selectedEditors, e, isNewWindowOperation);
 
 				scheduleAtNextAnimationFrame(getWindow(this.parent), () => this.updateDropFeedback(tab, false, e, tabIndex));
 			},
@@ -1288,24 +1290,24 @@ export class MultiEditorTabsControl extends EditorTabsControl {
 			throw new BugIndicatingError();
 		}
 
-		const anchorIndex = this.groupView.getIndexOfEditor(anchor);
-		if (anchorIndex === -1) {
+		const anchorEditorIndex = this.groupView.getIndexOfEditor(anchor);
+		if (anchorEditorIndex === -1) {
 			throw new BugIndicatingError();
 		}
 
 		let selection = this.groupView.selectedEditors;
 
 		// Unselect editors on other side of anchor in relation to the target
-		let currentIndex = anchorIndex;
-		while (currentIndex >= 0 && currentIndex <= this.groupView.count - 1) {
-			currentIndex = anchorIndex < editorIndex ? currentIndex - 1 : currentIndex + 1;
+		let currentEditorIndex = anchorEditorIndex;
+		while (currentEditorIndex >= 0 && currentEditorIndex <= this.groupView.count - 1) {
+			currentEditorIndex = anchorEditorIndex < editorIndex ? currentEditorIndex - 1 : currentEditorIndex + 1;
 
-			if (!this.tabsModel.isSelected(currentIndex)) {
+			const currentEditor = this.groupView.getEditorByIndex(currentEditorIndex);
+			if (!currentEditor) {
 				break;
 			}
 
-			const currentEditor = this.groupView.getEditorByIndex(currentIndex);
-			if (!currentEditor) {
+			if (!this.groupView.isSelected(currentEditor)) {
 				break;
 			}
 
@@ -1313,12 +1315,12 @@ export class MultiEditorTabsControl extends EditorTabsControl {
 		}
 
 		// Select editors between anchor and target
-		const fromIndex = anchorIndex < editorIndex ? anchorIndex : editorIndex;
-		const toIndex = anchorIndex < editorIndex ? editorIndex : anchorIndex;
+		const fromEditorIndex = anchorEditorIndex < editorIndex ? anchorEditorIndex : editorIndex;
+		const toEditorIndex = anchorEditorIndex < editorIndex ? editorIndex : anchorEditorIndex;
 
-		const editorsToSelect = this.groupView.getEditors(EditorsOrder.SEQUENTIAL).slice(fromIndex, toIndex + 1);
+		const editorsToSelect = this.groupView.getEditors(EditorsOrder.SEQUENTIAL).slice(fromEditorIndex, toEditorIndex + 1);
 		for (const editor of editorsToSelect) {
-			if (!this.tabsModel.isSelected(editor)) {
+			if (!this.groupView.isSelected(editor)) {
 				selection.push(editor);
 			}
 		}
@@ -1343,7 +1345,7 @@ export class MultiEditorTabsControl extends EditorTabsControl {
 			const recentEditors = this.groupView.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE);
 			for (let i = 1; i < recentEditors.length; i++) { // First one is the active editor
 				const recentEditor = recentEditors[i];
-				if (this.tabsModel.isSelected(recentEditor)) {
+				if (this.groupView.isSelected(recentEditor)) {
 					newActiveEditor = recentEditor;
 					break;
 				}
diff --git a/src/vs/workbench/browser/parts/editor/multiRowEditorTabsControl.ts b/src/vs/workbench/browser/parts/editor/multiRowEditorTabsControl.ts
index 83823d3ec8f..d4d58f1ef55 100644
--- a/src/vs/workbench/browser/parts/editor/multiRowEditorTabsControl.ts
+++ b/src/vs/workbench/browser/parts/editor/multiRowEditorTabsControl.ts
@@ -3,23 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Dimension } from 'vs/base/browser/dom';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IEditorGroupsView, IEditorGroupView, IEditorPartsView, IInternalEditorOpenOptions } from 'vs/workbench/browser/parts/editor/editor';
-import { IEditorTabsControl } from 'vs/workbench/browser/parts/editor/editorTabsControl';
-import { MultiEditorTabsControl } from 'vs/workbench/browser/parts/editor/multiEditorTabsControl';
-import { IEditorPartOptions } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { StickyEditorGroupModel, UnstickyEditorGroupModel } from 'vs/workbench/common/editor/filteredEditorGroupModel';
-import { IEditorTitleControlDimensions } from 'vs/workbench/browser/parts/editor/editorTitleControl';
-import { IReadonlyEditorGroupModel } from 'vs/workbench/common/editor/editorGroupModel';
+import { Dimension } from '../../../../base/browser/dom.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IEditorGroupsView, IEditorGroupView, IEditorPartsView, IInternalEditorOpenOptions } from './editor.js';
+import { IEditorTabsControl } from './editorTabsControl.js';
+import { MultiEditorTabsControl } from './multiEditorTabsControl.js';
+import { IEditorPartOptions } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { StickyEditorGroupModel, UnstickyEditorGroupModel } from '../../../common/editor/filteredEditorGroupModel.js';
+import { IEditorTitleControlDimensions } from './editorTitleControl.js';
+import { IReadonlyEditorGroupModel } from '../../../common/editor/editorGroupModel.js';
 
 export class MultiRowEditorControl extends Disposable implements IEditorTabsControl {
 
 	private readonly stickyEditorTabsControl: IEditorTabsControl;
 	private readonly unstickyEditorTabsControl: IEditorTabsControl;
 
+	private activeControl: IEditorTabsControl | undefined;
+
 	constructor(
 		private readonly parent: HTMLElement,
 		editorPartsView: IEditorPartsView,
@@ -36,10 +38,15 @@ export class MultiRowEditorControl extends Disposable implements IEditorTabsCont
 		this.stickyEditorTabsControl = this._register(this.instantiationService.createInstance(MultiEditorTabsControl, this.parent, editorPartsView, this.groupsView, this.groupView, stickyModel));
 		this.unstickyEditorTabsControl = this._register(this.instantiationService.createInstance(MultiEditorTabsControl, this.parent, editorPartsView, this.groupsView, this.groupView, unstickyModel));
 
-		this.handlePinnedTabsLayoutChange();
+		this.handleTabBarsStateChange();
 	}
 
-	private handlePinnedTabsLayoutChange(): void {
+	private handleTabBarsStateChange(): void {
+		this.activeControl = this.model.activeEditor ? this.getEditorTabsController(this.model.activeEditor) : undefined;
+		this.handleTabBarsLayoutChange();
+	}
+
+	private handleTabBarsLayoutChange(): void {
 		if (this.groupView.count === 0) {
 			// Do nothing as no tab bar is visible
 			return;
@@ -56,17 +63,20 @@ export class MultiRowEditorControl extends Disposable implements IEditorTabsCont
 		}
 	}
 
+	private didActiveControlChange() {
+		return this.activeControl !== (this.model.activeEditor ? this.getEditorTabsController(this.model.activeEditor) : undefined);
+	}
+
 	private getEditorTabsController(editor: EditorInput): IEditorTabsControl {
 		return this.model.isSticky(editor) ? this.stickyEditorTabsControl : this.unstickyEditorTabsControl;
 	}
 
 	openEditor(editor: EditorInput, options: IInternalEditorOpenOptions): boolean {
-		const [editorTabController, otherTabController] = this.model.isSticky(editor) ? [this.stickyEditorTabsControl, this.unstickyEditorTabsControl] : [this.unstickyEditorTabsControl, this.stickyEditorTabsControl];
-		const didChange = editorTabController.openEditor(editor, options);
-		if (didChange) {
-			// HACK: To render all editor tabs on startup, otherwise only one row gets rendered
-			otherTabController.openEditors([]);
+		const didActiveControlChange = this.didActiveControlChange();
+		const didOpenEditorChange = this.getEditorTabsController(editor).openEditor(editor, options);
 
+		const didChange = didOpenEditorChange || didActiveControlChange;
+		if (didChange) {
 			this.handleOpenedEditors();
 		}
 		return didChange;
@@ -76,11 +86,11 @@ export class MultiRowEditorControl extends Disposable implements IEditorTabsCont
 		const stickyEditors = editors.filter(e => this.model.isSticky(e));
 		const unstickyEditors = editors.filter(e => !this.model.isSticky(e));
 
+		const didActiveControlChange = this.didActiveControlChange();
 		const didChangeOpenEditorsSticky = this.stickyEditorTabsControl.openEditors(stickyEditors);
 		const didChangeOpenEditorsUnSticky = this.unstickyEditorTabsControl.openEditors(unstickyEditors);
 
-		const didChange = didChangeOpenEditorsSticky || didChangeOpenEditorsUnSticky;
-
+		const didChange = didChangeOpenEditorsSticky || didChangeOpenEditorsUnSticky || didActiveControlChange;
 		if (didChange) {
 			this.handleOpenedEditors();
 		}
@@ -89,7 +99,7 @@ export class MultiRowEditorControl extends Disposable implements IEditorTabsCont
 	}
 
 	private handleOpenedEditors(): void {
-		this.handlePinnedTabsLayoutChange();
+		this.handleTabBarsStateChange();
 	}
 
 	beforeCloseEditor(editor: EditorInput): void {
@@ -115,7 +125,7 @@ export class MultiRowEditorControl extends Disposable implements IEditorTabsCont
 	}
 
 	private handleClosedEditors(): void {
-		this.handlePinnedTabsLayoutChange();
+		this.handleTabBarsStateChange();
 	}
 
 	moveEditor(editor: EditorInput, fromIndex: number, targetIndex: number, stickyStateChange: boolean): void {
@@ -129,7 +139,7 @@ export class MultiRowEditorControl extends Disposable implements IEditorTabsCont
 				this.unstickyEditorTabsControl.openEditor(editor);
 			}
 
-			this.handlePinnedTabsLayoutChange();
+			this.handleTabBarsStateChange();
 
 		} else {
 			if (this.model.isSticky(editor)) {
@@ -148,14 +158,14 @@ export class MultiRowEditorControl extends Disposable implements IEditorTabsCont
 		this.unstickyEditorTabsControl.closeEditor(editor);
 		this.stickyEditorTabsControl.openEditor(editor);
 
-		this.handlePinnedTabsLayoutChange();
+		this.handleTabBarsStateChange();
 	}
 
 	unstickEditor(editor: EditorInput): void {
 		this.stickyEditorTabsControl.closeEditor(editor);
 		this.unstickyEditorTabsControl.openEditor(editor);
 
-		this.handlePinnedTabsLayoutChange();
+		this.handleTabBarsStateChange();
 	}
 
 	setActive(isActive: boolean): void {
diff --git a/src/vs/workbench/browser/parts/editor/noEditorTabsControl.ts b/src/vs/workbench/browser/parts/editor/noEditorTabsControl.ts
index 6a0859cd3ec..af16587fdb0 100644
--- a/src/vs/workbench/browser/parts/editor/noEditorTabsControl.ts
+++ b/src/vs/workbench/browser/parts/editor/noEditorTabsControl.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/singleeditortabscontrol';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { EditorTabsControl } from 'vs/workbench/browser/parts/editor/editorTabsControl';
-import { Dimension } from 'vs/base/browser/dom';
-import { IEditorTitleControlDimensions } from 'vs/workbench/browser/parts/editor/editorTitleControl';
-import { IToolbarActions } from 'vs/workbench/common/editor';
+import './media/singleeditortabscontrol.css';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { EditorTabsControl } from './editorTabsControl.js';
+import { Dimension } from '../../../../base/browser/dom.js';
+import { IEditorTitleControlDimensions } from './editorTitleControl.js';
+import { IToolbarActions } from '../../../common/editor.js';
 
 export class NoEditorTabsControl extends EditorTabsControl {
 	private activeEditor: EditorInput | null = null;
@@ -47,9 +47,17 @@ export class NoEditorTabsControl extends EditorTabsControl {
 
 	beforeCloseEditor(editor: EditorInput): void { }
 
-	closeEditor(editor: EditorInput): void { }
+	closeEditor(editor: EditorInput): void {
+		this.handleClosedEditors();
+	}
 
-	closeEditors(editors: EditorInput[]): void { }
+	closeEditors(editors: EditorInput[]): void {
+		this.handleClosedEditors();
+	}
+
+	private handleClosedEditors(): void {
+		this.activeEditor = this.tabsModel.activeEditor;
+	}
 
 	moveEditor(editor: EditorInput, fromIndex: number, targetIndex: number): void { }
 
diff --git a/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts b/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
index 2dab828b50a..b373fd8b051 100644
--- a/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
@@ -3,35 +3,35 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/sidebysideeditor';
-import { localize } from 'vs/nls';
-import { Dimension, $, clearNode, multibyteAwareBtoa } from 'vs/base/browser/dom';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IEditorControl, IEditorPane, IEditorOpenContext, EditorExtensions, SIDE_BY_SIDE_EDITOR_ID, SideBySideEditor as Side, IEditorPaneSelection, IEditorPaneWithSelection, IEditorPaneSelectionChangeEvent, isEditorPaneWithSelection, EditorPaneSelectionCompareResult } from 'vs/workbench/common/editor';
-import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditorInput';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IEditorPaneRegistry } from 'vs/workbench/browser/editor';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { SplitView, Sizing, Orientation } from 'vs/base/browser/ui/splitview/splitview';
-import { Event, Relay, Emitter } from 'vs/base/common/event';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { assertIsDefined } from 'vs/base/common/types';
-import { IEditorOptions } from 'vs/platform/editor/common/editor';
-import { IConfigurationChangeEvent, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { DEFAULT_EDITOR_MIN_DIMENSIONS } from 'vs/workbench/browser/parts/editor/editor';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { SIDE_BY_SIDE_EDITOR_HORIZONTAL_BORDER, SIDE_BY_SIDE_EDITOR_VERTICAL_BORDER } from 'vs/workbench/common/theme';
-import { AbstractEditorWithViewState } from 'vs/workbench/browser/parts/editor/editorWithViewState';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { isEqual } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { IBoundarySashes } from 'vs/base/browser/ui/sash/sash';
+import './media/sidebysideeditor.css';
+import { localize } from '../../../../nls.js';
+import { Dimension, $, clearNode, multibyteAwareBtoa } from '../../../../base/browser/dom.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IEditorControl, IEditorPane, IEditorOpenContext, EditorExtensions, SIDE_BY_SIDE_EDITOR_ID, SideBySideEditor as Side, IEditorPaneSelection, IEditorPaneWithSelection, IEditorPaneSelectionChangeEvent, isEditorPaneWithSelection, EditorPaneSelectionCompareResult } from '../../../common/editor.js';
+import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { EditorPane } from './editorPane.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IEditorPaneRegistry } from '../../editor.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IEditorGroup, IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { SplitView, Sizing, Orientation } from '../../../../base/browser/ui/splitview/splitview.js';
+import { Event, Relay, Emitter } from '../../../../base/common/event.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { assertIsDefined } from '../../../../base/common/types.js';
+import { IEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { IConfigurationChangeEvent, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { DEFAULT_EDITOR_MIN_DIMENSIONS } from './editor.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { SIDE_BY_SIDE_EDITOR_HORIZONTAL_BORDER, SIDE_BY_SIDE_EDITOR_VERTICAL_BORDER } from '../../../common/theme.js';
+import { AbstractEditorWithViewState } from './editorWithViewState.js';
+import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IBoundarySashes } from '../../../../base/browser/ui/sash/sash.js';
 
 interface ISideBySideEditorViewState {
 	primary: object;
diff --git a/src/vs/workbench/browser/parts/editor/singleEditorTabsControl.ts b/src/vs/workbench/browser/parts/editor/singleEditorTabsControl.ts
index cfbf35f736a..7f9446ac198 100644
--- a/src/vs/workbench/browser/parts/editor/singleEditorTabsControl.ts
+++ b/src/vs/workbench/browser/parts/editor/singleEditorTabsControl.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/singleeditortabscontrol';
-import { EditorResourceAccessor, Verbosity, IEditorPartOptions, SideBySideEditor, preventEditorClose, EditorCloseMethod, IToolbarActions } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { EditorTabsControl } from 'vs/workbench/browser/parts/editor/editorTabsControl';
-import { ResourceLabel, IResourceLabel } from 'vs/workbench/browser/labels';
-import { TAB_ACTIVE_FOREGROUND, TAB_UNFOCUSED_ACTIVE_FOREGROUND } from 'vs/workbench/common/theme';
-import { EventType as TouchEventType, GestureEvent, Gesture } from 'vs/base/browser/touch';
-import { addDisposableListener, EventType, EventHelper, Dimension, isAncestor, DragAndDropObserver, isHTMLElement } from 'vs/base/browser/dom';
-import { CLOSE_EDITOR_COMMAND_ID, UNLOCK_GROUP_COMMAND_ID } from 'vs/workbench/browser/parts/editor/editorCommands';
-import { Color } from 'vs/base/common/color';
-import { assertIsDefined, assertAllDefined } from 'vs/base/common/types';
-import { equals } from 'vs/base/common/objects';
-import { toDisposable } from 'vs/base/common/lifecycle';
-import { defaultBreadcrumbsWidgetStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { IEditorTitleControlDimensions } from 'vs/workbench/browser/parts/editor/editorTitleControl';
-import { BreadcrumbsControlFactory } from 'vs/workbench/browser/parts/editor/breadcrumbsControl';
+import './media/singleeditortabscontrol.css';
+import { EditorResourceAccessor, Verbosity, IEditorPartOptions, SideBySideEditor, preventEditorClose, EditorCloseMethod, IToolbarActions } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { EditorTabsControl } from './editorTabsControl.js';
+import { ResourceLabel, IResourceLabel } from '../../labels.js';
+import { TAB_ACTIVE_FOREGROUND, TAB_UNFOCUSED_ACTIVE_FOREGROUND } from '../../../common/theme.js';
+import { EventType as TouchEventType, GestureEvent, Gesture } from '../../../../base/browser/touch.js';
+import { addDisposableListener, EventType, EventHelper, Dimension, isAncestor, DragAndDropObserver, isHTMLElement } from '../../../../base/browser/dom.js';
+import { CLOSE_EDITOR_COMMAND_ID, UNLOCK_GROUP_COMMAND_ID } from './editorCommands.js';
+import { Color } from '../../../../base/common/color.js';
+import { assertIsDefined, assertAllDefined } from '../../../../base/common/types.js';
+import { equals } from '../../../../base/common/objects.js';
+import { toDisposable } from '../../../../base/common/lifecycle.js';
+import { defaultBreadcrumbsWidgetStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { IEditorTitleControlDimensions } from './editorTitleControl.js';
+import { BreadcrumbsControlFactory } from './breadcrumbsControl.js';
 
 interface IRenderedEditorLabel {
 	readonly editor?: EditorInput;
@@ -34,7 +34,7 @@ export class SingleEditorTabsControl extends EditorTabsControl {
 	private breadcrumbsControlFactory: BreadcrumbsControlFactory | undefined;
 	private get breadcrumbsControl() { return this.breadcrumbsControlFactory?.control; }
 
-	protected override create(parent: HTMLElement): void {
+	protected override create(parent: HTMLElement): HTMLElement {
 		super.create(parent);
 
 		const titleContainer = this.titleContainer = parent;
@@ -68,6 +68,8 @@ export class SingleEditorTabsControl extends EditorTabsControl {
 
 		// Create editor actions toolbar
 		this.createEditorActionsToolBar(titleContainer, ['title-actions']);
+
+		return titleContainer;
 	}
 
 	private registerContainerListeners(titleContainer: HTMLElement): void {
diff --git a/src/vs/workbench/browser/parts/editor/textCodeEditor.ts b/src/vs/workbench/browser/parts/editor/textCodeEditor.ts
index c3846b6faf2..e7ace5f1af3 100644
--- a/src/vs/workbench/browser/parts/editor/textCodeEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/textCodeEditor.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { URI } from 'vs/base/common/uri';
-import { assertIsDefined } from 'vs/base/common/types';
-import { ITextEditorPane } from 'vs/workbench/common/editor';
-import { applyTextEditorOptions } from 'vs/workbench/common/editor/editorOptions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ITextEditorOptions } from 'vs/platform/editor/common/editor';
-import { isEqual } from 'vs/base/common/resources';
-import { IEditorOptions as ICodeEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { CodeEditorWidget, ICodeEditorWidgetOptions } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { IEditorViewState, ScrollType } from 'vs/editor/common/editorCommon';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { AbstractTextEditor } from 'vs/workbench/browser/parts/editor/textEditor';
-import { Dimension } from 'vs/base/browser/dom';
+import { localize } from '../../../../nls.js';
+import { URI } from '../../../../base/common/uri.js';
+import { assertIsDefined } from '../../../../base/common/types.js';
+import { ITextEditorPane } from '../../../common/editor.js';
+import { applyTextEditorOptions } from '../../../common/editor/editorOptions.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { ITextEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { IEditorOptions as ICodeEditorOptions } from '../../../../editor/common/config/editorOptions.js';
+import { CodeEditorWidget, ICodeEditorWidgetOptions } from '../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { IEditorViewState, ScrollType } from '../../../../editor/common/editorCommon.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { AbstractTextEditor } from './textEditor.js';
+import { Dimension } from '../../../../base/browser/dom.js';
 
 /**
  * A text editor using the code editor widget.
diff --git a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts
index 5743ac16f7a..63b7b0d6f70 100644
--- a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts
@@ -3,38 +3,38 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { deepClone } from 'vs/base/common/objects';
-import { isObject, assertIsDefined } from 'vs/base/common/types';
-import { ICodeEditor, IDiffEditor } from 'vs/editor/browser/editorBrowser';
-import { IDiffEditorOptions, IEditorOptions as ICodeEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { AbstractTextEditor, IEditorConfiguration } from 'vs/workbench/browser/parts/editor/textEditor';
-import { TEXT_DIFF_EDITOR_ID, IEditorFactoryRegistry, EditorExtensions, ITextDiffEditorPane, IEditorOpenContext, isEditorInput, isTextEditorViewState, createTooLargeFileError } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { applyTextEditorOptions } from 'vs/workbench/common/editor/editorOptions';
-import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
-import { TextDiffEditorModel } from 'vs/workbench/common/editor/textDiffEditorModel';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITextResourceConfigurationChangeEvent, ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { TextFileOperationError, TextFileOperationResult } from 'vs/workbench/services/textfile/common/textfiles';
-import { ScrollType, IDiffEditorViewState, IDiffEditorModel, IDiffEditorViewModel } from 'vs/editor/common/editorCommon';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { EditorActivation, ITextEditorOptions } from 'vs/platform/editor/common/editor';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { isEqual } from 'vs/base/common/resources';
-import { Dimension, multibyteAwareBtoa } from 'vs/base/browser/dom';
-import { ByteSize, FileOperationError, FileOperationResult, IFileService, TooLargeFileOperationError } from 'vs/platform/files/common/files';
-import { IBoundarySashes } from 'vs/base/browser/ui/sash/sash';
-import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditor/diffEditorWidget';
+import { localize } from '../../../../nls.js';
+import { deepClone } from '../../../../base/common/objects.js';
+import { isObject, assertIsDefined } from '../../../../base/common/types.js';
+import { ICodeEditor, IDiffEditor } from '../../../../editor/browser/editorBrowser.js';
+import { IDiffEditorOptions, IEditorOptions as ICodeEditorOptions } from '../../../../editor/common/config/editorOptions.js';
+import { AbstractTextEditor, IEditorConfiguration } from './textEditor.js';
+import { TEXT_DIFF_EDITOR_ID, IEditorFactoryRegistry, EditorExtensions, ITextDiffEditorPane, IEditorOpenContext, isEditorInput, isTextEditorViewState, createTooLargeFileError } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { applyTextEditorOptions } from '../../../common/editor/editorOptions.js';
+import { DiffEditorInput } from '../../../common/editor/diffEditorInput.js';
+import { TextDiffEditorModel } from '../../../common/editor/textDiffEditorModel.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { ITextResourceConfigurationChangeEvent, ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { TextFileOperationError, TextFileOperationResult } from '../../../services/textfile/common/textfiles.js';
+import { ScrollType, IDiffEditorViewState, IDiffEditorModel, IDiffEditorViewModel } from '../../../../editor/common/editorCommon.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IEditorGroup, IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { EditorActivation, ITextEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { Dimension, multibyteAwareBtoa } from '../../../../base/browser/dom.js';
+import { ByteSize, FileOperationError, FileOperationResult, IFileService, TooLargeFileOperationError } from '../../../../platform/files/common/files.js';
+import { IBoundarySashes } from '../../../../base/browser/ui/sash/sash.js';
+import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
+import { StopWatch } from '../../../../base/common/stopwatch.js';
+import { DiffEditorWidget } from '../../../../editor/browser/widget/diffEditor/diffEditorWidget.js';
 
 /**
  * The text editor that leverages the diff text editor for the editing experience.
diff --git a/src/vs/workbench/browser/parts/editor/textEditor.ts b/src/vs/workbench/browser/parts/editor/textEditor.ts
index 629d430bbec..e0a45755595 100644
--- a/src/vs/workbench/browser/parts/editor/textEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/textEditor.ts
@@ -3,32 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { URI } from 'vs/base/common/uri';
-import { distinct, deepClone } from 'vs/base/common/objects';
-import { Emitter, Event } from 'vs/base/common/event';
-import { isObject, assertIsDefined } from 'vs/base/common/types';
-import { MutableDisposable } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IEditorOpenContext, IEditorPaneSelection, EditorPaneSelectionCompareResult, EditorPaneSelectionChangeReason, IEditorPaneWithSelection, IEditorPaneSelectionChangeEvent, IEditorPaneScrollPosition, IEditorPaneWithScrolling } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { computeEditorAriaLabel } from 'vs/workbench/browser/editor';
-import { AbstractEditorWithViewState } from 'vs/workbench/browser/parts/editor/editorWithViewState';
-import { IEditorViewState } from 'vs/editor/common/editorCommon';
-import { Selection } from 'vs/editor/common/core/selection';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ITextResourceConfigurationChangeEvent, ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { IEditorOptions as ICodeEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IEditorOptions, ITextEditorOptions, TextEditorSelectionRevealType, TextEditorSelectionSource } from 'vs/platform/editor/common/editor';
-import { ICursorPositionChangedEvent } from 'vs/editor/common/cursorEvents';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
+import { localize } from '../../../../nls.js';
+import { URI } from '../../../../base/common/uri.js';
+import { distinct, deepClone } from '../../../../base/common/objects.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { isObject, assertIsDefined } from '../../../../base/common/types.js';
+import { MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { IEditorOpenContext, IEditorPaneSelection, EditorPaneSelectionCompareResult, EditorPaneSelectionChangeReason, IEditorPaneWithSelection, IEditorPaneSelectionChangeEvent, IEditorPaneScrollPosition, IEditorPaneWithScrolling } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { computeEditorAriaLabel } from '../../editor.js';
+import { AbstractEditorWithViewState } from './editorWithViewState.js';
+import { IEditorViewState } from '../../../../editor/common/editorCommon.js';
+import { Selection } from '../../../../editor/common/core/selection.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ITextResourceConfigurationChangeEvent, ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { IEditorOptions as ICodeEditorOptions } from '../../../../editor/common/config/editorOptions.js';
+import { IEditorGroup, IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IEditorOptions, ITextEditorOptions, TextEditorSelectionRevealType, TextEditorSelectionSource } from '../../../../platform/editor/common/editor.js';
+import { ICursorPositionChangedEvent } from '../../../../editor/common/cursorEvents.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IMarkdownString } from '../../../../base/common/htmlContent.js';
 
 export interface IEditorConfiguration {
 	editor: object;
diff --git a/src/vs/workbench/browser/parts/editor/textResourceEditor.ts b/src/vs/workbench/browser/parts/editor/textResourceEditor.ts
index 0a3b885e01d..f828e558722 100644
--- a/src/vs/workbench/browser/parts/editor/textResourceEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/textResourceEditor.ts
@@ -3,31 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { assertIsDefined } from 'vs/base/common/types';
-import { ICodeEditor, IPasteEvent } from 'vs/editor/browser/editorBrowser';
-import { IEditorOpenContext, isTextEditorViewState } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { applyTextEditorOptions } from 'vs/workbench/common/editor/editorOptions';
-import { AbstractTextResourceEditorInput, TextResourceEditorInput } from 'vs/workbench/common/editor/textResourceEditorInput';
-import { BaseTextEditorModel } from 'vs/workbench/common/editor/textEditorModel';
-import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
-import { AbstractTextCodeEditor } from 'vs/workbench/browser/parts/editor/textCodeEditor';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ScrollType, ICodeEditorViewState } from 'vs/editor/common/editorCommon';
-import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { EditorOption, IEditorOptions as ICodeEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { ModelConstants } from 'vs/editor/common/model';
-import { ITextEditorOptions } from 'vs/platform/editor/common/editor';
-import { IFileService } from 'vs/platform/files/common/files';
+import { assertIsDefined } from '../../../../base/common/types.js';
+import { ICodeEditor, IPasteEvent } from '../../../../editor/browser/editorBrowser.js';
+import { IEditorOpenContext, isTextEditorViewState } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { applyTextEditorOptions } from '../../../common/editor/editorOptions.js';
+import { AbstractTextResourceEditorInput, TextResourceEditorInput } from '../../../common/editor/textResourceEditorInput.js';
+import { BaseTextEditorModel } from '../../../common/editor/textEditorModel.js';
+import { UntitledTextEditorInput } from '../../../services/untitled/common/untitledTextEditorInput.js';
+import { AbstractTextCodeEditor } from './textCodeEditor.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ScrollType, ICodeEditorViewState } from '../../../../editor/common/editorCommon.js';
+import { IEditorGroup, IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../../../../editor/common/languages/modesRegistry.js';
+import { EditorOption, IEditorOptions as ICodeEditorOptions } from '../../../../editor/common/config/editorOptions.js';
+import { ModelConstants } from '../../../../editor/common/model.js';
+import { ITextEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
 
 /**
  * An editor implementation that is capable of showing the contents of resource inputs. Uses
diff --git a/src/vs/workbench/browser/parts/globalCompositeBar.ts b/src/vs/workbench/browser/parts/globalCompositeBar.ts
index 5d203718ce4..8c96ab3e461 100644
--- a/src/vs/workbench/browser/parts/globalCompositeBar.ts
+++ b/src/vs/workbench/browser/parts/globalCompositeBar.ts
@@ -3,47 +3,47 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { ActionBar, ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
-import { ACCOUNTS_ACTIVITY_ID, GLOBAL_ACTIVITY_ID } from 'vs/workbench/common/activity';
-import { IActivity, IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { DisposableStore, Disposable } from 'vs/base/common/lifecycle';
-import { IColorTheme, IThemeService } from 'vs/platform/theme/common/themeService';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { CompositeBarActionViewItem, CompositeBarAction, IActivityHoverOptions, ICompositeBarActionViewItemOptions, ICompositeBarColors } from 'vs/workbench/browser/parts/compositeBarActions';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { Action, IAction, Separator, SubmenuAction, toAction } from 'vs/base/common/actions';
-import { IMenu, IMenuService, MenuId } from 'vs/platform/actions/common/actions';
-import { addDisposableListener, EventType, append, clearNode, hide, show, EventHelper, $, runWhenWindowIdle, getWindow } from 'vs/base/browser/dom';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { EventType as TouchEventType, GestureEvent } from 'vs/base/browser/touch';
-import { AnchorAlignment, AnchorAxisAlignment } from 'vs/base/browser/ui/contextview/contextview';
-import { Lazy } from 'vs/base/common/lazy';
-import { createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ISecretStorageService } from 'vs/platform/secrets/common/secrets';
-import { AuthenticationSessionInfo, getCurrentAuthenticationSessionInfo } from 'vs/workbench/services/authentication/browser/authenticationService';
-import { AuthenticationSessionAccount, IAuthenticationService } from 'vs/workbench/services/authentication/common/authentication';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { ILifecycleService, LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { DEFAULT_ICON } from 'vs/workbench/services/userDataProfile/common/userDataProfileIcons';
-import { isString } from 'vs/base/common/types';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND } from 'vs/workbench/common/theme';
-import { IBaseActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { ICommandService } from 'vs/platform/commands/common/commands';
+import { localize } from '../../../nls.js';
+import { ActionBar, ActionsOrientation } from '../../../base/browser/ui/actionbar/actionbar.js';
+import { ACCOUNTS_ACTIVITY_ID, GLOBAL_ACTIVITY_ID } from '../../common/activity.js';
+import { IActivity, IActivityService, NumberBadge } from '../../services/activity/common/activity.js';
+import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
+import { DisposableStore, Disposable } from '../../../base/common/lifecycle.js';
+import { IColorTheme, IThemeService } from '../../../platform/theme/common/themeService.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../platform/storage/common/storage.js';
+import { IExtensionService } from '../../services/extensions/common/extensions.js';
+import { CompositeBarActionViewItem, CompositeBarAction, IActivityHoverOptions, ICompositeBarActionViewItemOptions, ICompositeBarColors } from './compositeBarActions.js';
+import { Codicon } from '../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../base/common/themables.js';
+import { registerIcon } from '../../../platform/theme/common/iconRegistry.js';
+import { Action, IAction, Separator, SubmenuAction, toAction } from '../../../base/common/actions.js';
+import { IMenu, IMenuService, MenuId } from '../../../platform/actions/common/actions.js';
+import { addDisposableListener, EventType, append, clearNode, hide, show, EventHelper, $, runWhenWindowIdle, getWindow } from '../../../base/browser/dom.js';
+import { StandardKeyboardEvent } from '../../../base/browser/keyboardEvent.js';
+import { StandardMouseEvent } from '../../../base/browser/mouseEvent.js';
+import { EventType as TouchEventType, GestureEvent } from '../../../base/browser/touch.js';
+import { AnchorAlignment, AnchorAxisAlignment } from '../../../base/browser/ui/contextview/contextview.js';
+import { Lazy } from '../../../base/common/lazy.js';
+import { createAndFillInActionBarActions } from '../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../platform/contextview/browser/contextView.js';
+import { IKeybindingService } from '../../../platform/keybinding/common/keybinding.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { IProductService } from '../../../platform/product/common/productService.js';
+import { ISecretStorageService } from '../../../platform/secrets/common/secrets.js';
+import { AuthenticationSessionInfo, getCurrentAuthenticationSessionInfo } from '../../services/authentication/browser/authenticationService.js';
+import { AuthenticationSessionAccount, IAuthenticationService } from '../../services/authentication/common/authentication.js';
+import { IWorkbenchEnvironmentService } from '../../services/environment/common/environmentService.js';
+import { IHoverService } from '../../../platform/hover/browser/hover.js';
+import { ILifecycleService, LifecyclePhase } from '../../services/lifecycle/common/lifecycle.js';
+import { IUserDataProfileService } from '../../services/userDataProfile/common/userDataProfile.js';
+import { DEFAULT_ICON } from '../../services/userDataProfile/common/userDataProfileIcons.js';
+import { isString } from '../../../base/common/types.js';
+import { KeyCode } from '../../../base/common/keyCodes.js';
+import { ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND } from '../../common/theme.js';
+import { IBaseActionViewItemOptions } from '../../../base/browser/ui/actionbar/actionViewItems.js';
+import { ICommandService } from '../../../platform/commands/common/commands.js';
 
 export class GlobalCompositeBar extends Disposable {
 
@@ -337,6 +337,11 @@ export class AccountsActivityActionViewItem extends AbstractGlobalActivityAction
 		}));
 
 		this._register(this.authenticationService.onDidChangeSessions(async e => {
+			if (e.event.removed) {
+				for (const removed of e.event.removed) {
+					this.removeAccount(e.providerId, removed.account);
+				}
+			}
 			for (const changed of [...(e.event.changed ?? []), ...(e.event.added ?? [])]) {
 				try {
 					await this.addOrUpdateAccount(e.providerId, changed.account);
@@ -344,11 +349,6 @@ export class AccountsActivityActionViewItem extends AbstractGlobalActivityAction
 					this.logService.error(e);
 				}
 			}
-			if (e.event.removed) {
-				for (const removed of e.event.removed) {
-					this.removeAccount(e.providerId, removed.account);
-				}
-			}
 		}));
 	}
 
@@ -602,8 +602,7 @@ export class GlobalActivityActionViewItem extends AbstractGlobalActivityActionVi
 		}
 
 		show(this.profileBadge);
-		this.profileBadgeContent.classList.toggle('profile-text-overlay', true);
-		this.profileBadgeContent.classList.toggle('profile-icon-overlay', false);
+		this.profileBadgeContent.classList.add('profile-text-overlay');
 		this.profileBadgeContent.textContent = this.userDataProfileService.currentProfile.name.substring(0, 2).toUpperCase();
 	}
 
diff --git a/src/vs/workbench/browser/parts/media/paneCompositePart.css b/src/vs/workbench/browser/parts/media/paneCompositePart.css
index 52baa5324f7..1f2bd9ee9d5 100644
--- a/src/vs/workbench/browser/parts/media/paneCompositePart.css
+++ b/src/vs/workbench/browser/parts/media/paneCompositePart.css
@@ -73,13 +73,9 @@
 .monaco-workbench .pane-composite-part > .title > .composite-bar-container >.composite-bar > .monaco-action-bar .action-item.icon,
 .monaco-workbench .pane-composite-part > .header-or-footer > .composite-bar-container >.composite-bar > .monaco-action-bar .action-item.icon {
 	height: 35px; /* matches height of composite container */
-	padding: 0 5px;
+	padding: 0 3px;
 }
 
-.monaco-workbench .pane-composite-part > .title > .composite-bar-container >.composite-bar .monaco-action-bar .action-label.codicon,
-.monaco-workbench .pane-composite-part > .header-or-footer > .composite-bar-container >.composite-bar .monaco-action-bar .action-label.codicon {
-	font-size: 18px;
-}
 
 .monaco-workbench .pane-composite-part > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.icon .action-label:not(.codicon),
 .monaco-workbench .pane-composite-part > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.icon .action-label:not(.codicon) {
@@ -209,6 +205,10 @@
 	position: relative;
 }
 
+.monaco-workbench .pane-composite-part > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .icon-badge .badge-content {
+	padding: 3px;
+}
+
 .monaco-workbench .pane-composite-part > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.icon .badge.compact,
 .monaco-workbench .pane-composite-part > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.icon .badge.compact {
 	position: absolute;
@@ -237,6 +237,12 @@
 	text-align: center;
 }
 
+.monaco-workbench .pane-composite-part > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.icon .badge.compact.compact-content .badge-content,
+.monaco-workbench .pane-composite-part > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.icon .badge.compact.compact-content .badge-content {
+	font-size: 8px;
+	padding: 0 3px;
+}
+
 .monaco-workbench .pane-composite-part > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.icon .badge.compact.progress-badge .badge-content::before,
 .monaco-workbench .pane-composite-part > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.icon .badge.compact.progress-badge .badge-content::before {
 	mask-size: 11px;
diff --git a/src/vs/workbench/browser/parts/notifications/media/notificationsCenter.css b/src/vs/workbench/browser/parts/notifications/media/notificationsCenter.css
index b4ac21708ba..a9e4fd0ebb0 100644
--- a/src/vs/workbench/browser/parts/notifications/media/notificationsCenter.css
+++ b/src/vs/workbench/browser/parts/notifications/media/notificationsCenter.css
@@ -44,14 +44,12 @@
 	justify-content: flex-end;
 }
 
-.monaco-workbench > .notifications-center .notifications-list-container .monaco-list-row[data-last-element="false"] > .notification-list-item {
+.monaco-workbench > .notifications-center .notifications-list-container .monaco-list-row:not(:last-child) > .notification-list-item {
 	border-bottom: 1px solid var(--vscode-notifications-border);
 }
 
-.monaco-workbench > .notifications-center .notifications-list-container,
-.monaco-workbench > .notifications-center .notifications-list-container .monaco-scrollable-element,
-.monaco-workbench > .notifications-center .notifications-list-container .notification-list-item {
-	border-radius: 0;
+.monaco-workbench > .notifications-center .notifications-list-container .monaco-list-row:last-child {
+	border-radius: 0px 0px 4px 4px; /* adopt the border radius at the end of the notifications center */
 }
 
 /* Icons */
diff --git a/src/vs/workbench/browser/parts/notifications/media/notificationsList.css b/src/vs/workbench/browser/parts/notifications/media/notificationsList.css
index 1e46a103a1d..c5b4faf8e49 100644
--- a/src/vs/workbench/browser/parts/notifications/media/notificationsList.css
+++ b/src/vs/workbench/browser/parts/notifications/media/notificationsList.css
@@ -9,7 +9,6 @@
 	color: var(--vscode-notifications-foreground);
 	background: var(--vscode-notifications-background);
 	outline-color: var(--vscode-contrastBorder);
-	border-radius: inherit;
 }
 
 .monaco-workbench .notifications-list-container .notification-list-item {
@@ -19,7 +18,6 @@
 	padding: 10px 5px;
 	height: 100%;
 	box-sizing: border-box;
-	border-radius: 4px;
 }
 
 .monaco-workbench .notifications-list-container .notification-offset-helper {
@@ -29,10 +27,6 @@
 	word-wrap: break-word; /* never overflow long words, but break to next line */
 }
 
-.monaco-workbench .notifications-list-container .monaco-scrollable-element {
-	border-radius: 4px;
-}
-
 /** Notification: Main Row */
 
 .monaco-workbench .notifications-list-container .notification-list-item > .notification-list-item-main-row {
diff --git a/src/vs/workbench/browser/parts/notifications/media/notificationsToasts.css b/src/vs/workbench/browser/parts/notifications/media/notificationsToasts.css
index 89ce01ed02b..d4ef2314bc5 100644
--- a/src/vs/workbench/browser/parts/notifications/media/notificationsToasts.css
+++ b/src/vs/workbench/browser/parts/notifications/media/notificationsToasts.css
@@ -30,6 +30,13 @@
 	transform: translate3d(0px, 100%, 0px); /* move the notification 50px to the bottom (to prevent bleed through) */
 	opacity: 0; /*  fade the toast in */
 	transition:	transform 300ms ease-out, opacity 300ms ease-out;
+}
+
+.monaco-workbench > .notifications-toasts .notifications-list-container,
+.monaco-workbench > .notifications-toasts .notification-toast-container > .notification-toast,
+.monaco-workbench > .notifications-toasts .notification-toast-container > .notification-toast .monaco-scrollable-element,
+.monaco-workbench > .notifications-toasts .notification-toast-container > .notification-toast .monaco-list:not(.element-focused):focus:before,
+.monaco-workbench > .notifications-toasts .notification-toast-container > .notification-toast .monaco-list-row {
 	border-radius: 4px;
 }
 
diff --git a/src/vs/workbench/browser/parts/notifications/notificationAccessibleView.ts b/src/vs/workbench/browser/parts/notifications/notificationAccessibleView.ts
index 15a240f9150..0e206216e58 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationAccessibleView.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationAccessibleView.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IAction } from 'vs/base/common/actions';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { localize } from 'vs/nls';
-import { IAccessibleViewService, AccessibleViewProviderId, AccessibleViewType } from 'vs/platform/accessibility/browser/accessibleView';
-import { IAccessibleViewImplentation, alertAccessibleViewFocusChange } from 'vs/platform/accessibility/browser/accessibleViewRegistry';
-import { IAccessibilitySignalService, AccessibilitySignal } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IListService, WorkbenchList } from 'vs/platform/list/browser/listService';
-import { getNotificationFromContext } from 'vs/workbench/browser/parts/notifications/notificationsCommands';
-import { NotificationFocusedContext } from 'vs/workbench/common/contextkeys';
-import { INotificationViewItem } from 'vs/workbench/common/notifications';
+import { IAction } from '../../../../base/common/actions.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { localize } from '../../../../nls.js';
+import { IAccessibleViewService, AccessibleViewProviderId, AccessibleViewType, AccessibleContentProvider } from '../../../../platform/accessibility/browser/accessibleView.js';
+import { IAccessibleViewImplentation } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
+import { IAccessibilitySignalService, AccessibilitySignal } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IListService, WorkbenchList } from '../../../../platform/list/browser/listService.js';
+import { getNotificationFromContext } from './notificationsCommands.js';
+import { NotificationFocusedContext } from '../../../common/contextkeys.js';
+import { INotificationViewItem } from '../../../common/notifications.js';
 
 export class NotificationAccessibleView implements IAccessibleViewImplentation {
 	readonly priority = 90;
@@ -35,11 +35,9 @@ export class NotificationAccessibleView implements IAccessibleViewImplentation {
 			}
 			commandService.executeCommand('notifications.showList');
 			let notificationIndex: number | undefined;
-			let length: number | undefined;
 			const list = listService.lastFocusedList;
 			if (list instanceof WorkbenchList) {
 				notificationIndex = list.indexOf(notification);
-				length = list.length;
 			}
 			if (notificationIndex === undefined) {
 				return;
@@ -54,45 +52,48 @@ export class NotificationAccessibleView implements IAccessibleViewImplentation {
 					} catch { }
 				}
 			}
-			const message = notification.message.original.toString();
-			if (!message) {
+
+			function getContentForNotification(): string | undefined {
+				const notification = getNotificationFromContext(listService);
+				const message = notification?.message.original.toString();
+				if (!notification) {
+					return;
+				}
+				return notification.source ? localize('notification.accessibleViewSrc', '{0} Source: {1}', message, notification.source) : localize('notification.accessibleView', '{0}', message);
+			}
+			const content = getContentForNotification();
+			if (!content) {
 				return;
 			}
 			notification.onDidClose(() => accessibleViewService.next());
-			return {
-				id: AccessibleViewProviderId.Notification,
-				provideContent: () => {
-					return notification.source ? localize('notification.accessibleViewSrc', '{0} Source: {1}', message, notification.source) : localize('notification.accessibleView', '{0}', message);
-				},
-				onClose(): void {
-					focusList();
-				},
-				next(): void {
+			return new AccessibleContentProvider(
+				AccessibleViewProviderId.Notification,
+				{ type: AccessibleViewType.View },
+				() => content,
+				() => focusList(),
+				'accessibility.verbosity.notification',
+				undefined,
+				getActionsFromNotification(notification, accessibilitySignalService),
+				() => {
 					if (!list) {
 						return;
 					}
 					focusList();
 					list.focusNext();
-					alertAccessibleViewFocusChange(notificationIndex, length, 'next');
-					getProvider();
+					return getContentForNotification();
 				},
-				previous(): void {
+				() => {
 					if (!list) {
 						return;
 					}
 					focusList();
 					list.focusPrevious();
-					alertAccessibleViewFocusChange(notificationIndex, length, 'previous');
-					getProvider();
+					return getContentForNotification();
 				},
-				verbositySettingKey: 'accessibility.verbosity.notification',
-				options: { type: AccessibleViewType.View },
-				actions: getActionsFromNotification(notification, accessibilitySignalService)
-			};
+			);
 		}
 		return getProvider();
 	}
-	dispose() { }
 }
 
 
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsActions.ts b/src/vs/workbench/browser/parts/notifications/notificationsActions.ts
index a6295ba424b..e07546c56bc 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsActions.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsActions.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/notificationsActions';
-import { INotificationViewItem } from 'vs/workbench/common/notifications';
-import { localize } from 'vs/nls';
-import { Action } from 'vs/base/common/actions';
-import { CLEAR_NOTIFICATION, EXPAND_NOTIFICATION, COLLAPSE_NOTIFICATION, CLEAR_ALL_NOTIFICATIONS, HIDE_NOTIFICATIONS_CENTER, TOGGLE_DO_NOT_DISTURB_MODE, TOGGLE_DO_NOT_DISTURB_MODE_BY_SOURCE } from 'vs/workbench/browser/parts/notifications/notificationsCommands';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { Codicon } from 'vs/base/common/codicons';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { ThemeIcon } from 'vs/base/common/themables';
+import './media/notificationsActions.css';
+import { INotificationViewItem } from '../../../common/notifications.js';
+import { localize } from '../../../../nls.js';
+import { Action } from '../../../../base/common/actions.js';
+import { CLEAR_NOTIFICATION, EXPAND_NOTIFICATION, COLLAPSE_NOTIFICATION, CLEAR_ALL_NOTIFICATIONS, HIDE_NOTIFICATIONS_CENTER, TOGGLE_DO_NOT_DISTURB_MODE, TOGGLE_DO_NOT_DISTURB_MODE_BY_SOURCE } from './notificationsCommands.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
 
 const clearIcon = registerIcon('notifications-clear', Codicon.close, localize('clearIcon', 'Icon for the clear action in notifications.'));
 const clearAllIcon = registerIcon('notifications-clear-all', Codicon.clearAll, localize('clearAllIcon', 'Icon for the clear all action in notifications.'));
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsAlerts.ts b/src/vs/workbench/browser/parts/notifications/notificationsAlerts.ts
index 0238b6aa05a..bd4ff0b1e2c 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsAlerts.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsAlerts.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { alert } from 'vs/base/browser/ui/aria/aria';
-import { localize } from 'vs/nls';
-import { INotificationViewItem, INotificationsModel, NotificationChangeType, INotificationChangeEvent, NotificationViewItemContentChangeKind } from 'vs/workbench/common/notifications';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { NotificationPriority, Severity } from 'vs/platform/notification/common/notification';
-import { Event } from 'vs/base/common/event';
+import { alert } from '../../../../base/browser/ui/aria/aria.js';
+import { localize } from '../../../../nls.js';
+import { INotificationViewItem, INotificationsModel, NotificationChangeType, INotificationChangeEvent, NotificationViewItemContentChangeKind } from '../../../common/notifications.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { toErrorMessage } from '../../../../base/common/errorMessage.js';
+import { NotificationPriority, Severity } from '../../../../platform/notification/common/notification.js';
+import { Event } from '../../../../base/common/event.js';
 
 export class NotificationsAlerts extends Disposable {
 
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts b/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
index 40bcde5fdb4..85356ca85d9 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
@@ -3,32 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/notificationsCenter';
-import 'vs/css!./media/notificationsActions';
-import { NOTIFICATIONS_CENTER_HEADER_FOREGROUND, NOTIFICATIONS_CENTER_HEADER_BACKGROUND, NOTIFICATIONS_CENTER_BORDER } from 'vs/workbench/common/theme';
-import { IThemeService, Themable } from 'vs/platform/theme/common/themeService';
-import { INotificationsModel, INotificationChangeEvent, NotificationChangeType, NotificationViewItemContentChangeKind } from 'vs/workbench/common/notifications';
-import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/browser/layoutService';
-import { Emitter } from 'vs/base/common/event';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { INotificationsCenterController, NotificationActionRunner } from 'vs/workbench/browser/parts/notifications/notificationsCommands';
-import { NotificationsList } from 'vs/workbench/browser/parts/notifications/notificationsList';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { Dimension, isAncestorOfActiveElement } from 'vs/base/browser/dom';
-import { widgetShadow } from 'vs/platform/theme/common/colorRegistry';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { localize } from 'vs/nls';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { ClearAllNotificationsAction, ConfigureDoNotDisturbAction, ToggleDoNotDisturbBySourceAction, HideNotificationsCenterAction, ToggleDoNotDisturbAction } from 'vs/workbench/browser/parts/notifications/notificationsActions';
-import { IAction, Separator, toAction } from 'vs/base/common/actions';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { assertAllDefined, assertIsDefined } from 'vs/base/common/types';
-import { NotificationsCenterVisibleContext } from 'vs/workbench/common/contextkeys';
-import { INotificationService, NotificationsFilter } from 'vs/platform/notification/common/notification';
-import { mainWindow } from 'vs/base/browser/window';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { DropdownMenuActionViewItem } from 'vs/base/browser/ui/dropdown/dropdownActionViewItem';
-import { AccessibilitySignal, IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
+import './media/notificationsCenter.css';
+import './media/notificationsActions.css';
+import { NOTIFICATIONS_CENTER_HEADER_FOREGROUND, NOTIFICATIONS_CENTER_HEADER_BACKGROUND, NOTIFICATIONS_CENTER_BORDER } from '../../../common/theme.js';
+import { IThemeService, Themable } from '../../../../platform/theme/common/themeService.js';
+import { INotificationsModel, INotificationChangeEvent, NotificationChangeType, NotificationViewItemContentChangeKind } from '../../../common/notifications.js';
+import { IWorkbenchLayoutService, Parts } from '../../../services/layout/browser/layoutService.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { INotificationsCenterController, NotificationActionRunner } from './notificationsCommands.js';
+import { NotificationsList } from './notificationsList.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { Dimension, isAncestorOfActiveElement } from '../../../../base/browser/dom.js';
+import { widgetShadow } from '../../../../platform/theme/common/colorRegistry.js';
+import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { localize } from '../../../../nls.js';
+import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { ClearAllNotificationsAction, ConfigureDoNotDisturbAction, ToggleDoNotDisturbBySourceAction, HideNotificationsCenterAction, ToggleDoNotDisturbAction } from './notificationsActions.js';
+import { IAction, Separator, toAction } from '../../../../base/common/actions.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { assertAllDefined, assertIsDefined } from '../../../../base/common/types.js';
+import { NotificationsCenterVisibleContext } from '../../../common/contextkeys.js';
+import { INotificationService, NotificationsFilter } from '../../../../platform/notification/common/notification.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { DropdownMenuActionViewItem } from '../../../../base/browser/ui/dropdown/dropdownActionViewItem.js';
+import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
 
 export class NotificationsCenter extends Themable implements INotificationsCenterController {
 
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsCommands.ts b/src/vs/workbench/browser/parts/notifications/notificationsCommands.ts
index 92b1b45d184..c80c3561c46 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsCommands.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsCommands.ts
@@ -3,25 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { INotificationViewItem, isNotificationViewItem, NotificationsModel } from 'vs/workbench/common/notifications';
-import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
-import { localize, localize2 } from 'vs/nls';
-import { IListService, WorkbenchList } from 'vs/platform/list/browser/listService';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { NotificationMetrics, NotificationMetricsClassification, notificationToMetrics } from 'vs/workbench/browser/parts/notifications/notificationsTelemetry';
-import { NotificationFocusedContext, NotificationsCenterVisibleContext, NotificationsToastsVisibleContext } from 'vs/workbench/common/contextkeys';
-import { INotificationService, INotificationSourceFilter, NotificationPriority, NotificationsFilter } from 'vs/platform/notification/common/notification';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ActionRunner, IAction, WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification } from 'vs/base/common/actions';
-import { hash } from 'vs/base/common/hash';
-import { firstOrDefault } from 'vs/base/common/arrays';
-import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { AccessibilitySignal, IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeyChord, KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { INotificationViewItem, isNotificationViewItem, NotificationsModel } from '../../../common/notifications.js';
+import { MenuRegistry, MenuId } from '../../../../platform/actions/common/actions.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { IListService, WorkbenchList } from '../../../../platform/list/browser/listService.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { NotificationMetrics, NotificationMetricsClassification, notificationToMetrics } from './notificationsTelemetry.js';
+import { NotificationFocusedContext, NotificationsCenterVisibleContext, NotificationsToastsVisibleContext } from '../../../common/contextkeys.js';
+import { INotificationService, INotificationSourceFilter, NotificationPriority, NotificationsFilter } from '../../../../platform/notification/common/notification.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ActionRunner, IAction, WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification } from '../../../../base/common/actions.js';
+import { hash } from '../../../../base/common/hash.js';
+import { IQuickInputService, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
 
 // Center
 export const SHOW_NOTIFICATIONS_CENTER = 'notifications.showList';
@@ -171,11 +170,11 @@ export function registerNotificationCommands(center: INotificationsCenterControl
 		primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyA,
 		handler: (accessor) => {
 			const actionRunner = accessor.get(IInstantiationService).createInstance(NotificationActionRunner);
-			const notification = getNotificationFromContext(accessor.get(IListService)) || firstOrDefault(model.notifications);
+			const notification = getNotificationFromContext(accessor.get(IListService)) || model.notifications.at(0);
 			if (!notification) {
 				return;
 			}
-			const primaryAction = notification.actions?.primary ? firstOrDefault(notification.actions.primary) : undefined;
+			const primaryAction = notification.actions?.primary ? notification.actions.primary.at(0) : undefined;
 			if (!primaryAction) {
 				return;
 			}
@@ -312,12 +311,12 @@ export function registerNotificationCommands(center: INotificationsCenterControl
 
 		picker.canSelectMany = true;
 		picker.placeholder = localize('selectSources', "Select sources to enable all notifications from");
-		picker.selectedItems = picker.items.filter(item => (item as INotificationSourceFilter).filter === NotificationsFilter.OFF) as (IQuickPickItem & INotificationSourceFilter)[];
+		picker.selectedItems = picker.items.filter(item => item.filter === NotificationsFilter.OFF);
 
 		picker.show();
 
 		disposables.add(picker.onDidAccept(async () => {
-			for (const item of picker.items as (IQuickPickItem & INotificationSourceFilter)[]) {
+			for (const item of picker.items) {
 				notificationService.setFilter({
 					id: item.id,
 					label: item.label,
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsList.ts b/src/vs/workbench/browser/parts/notifications/notificationsList.ts
index 4dad9770b06..e39aa5755c3 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsList.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsList.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/notificationsList';
-import { localize } from 'vs/nls';
-import { getWindow, isAncestorOfActiveElement, trackFocus } from 'vs/base/browser/dom';
-import { WorkbenchList } from 'vs/platform/list/browser/listService';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IListAccessibilityProvider, IListOptions } from 'vs/base/browser/ui/list/listWidget';
-import { NOTIFICATIONS_BACKGROUND } from 'vs/workbench/common/theme';
-import { INotificationViewItem } from 'vs/workbench/common/notifications';
-import { NotificationsListDelegate, NotificationRenderer } from 'vs/workbench/browser/parts/notifications/notificationsViewer';
-import { CopyNotificationMessageAction } from 'vs/workbench/browser/parts/notifications/notificationsActions';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { assertAllDefined } from 'vs/base/common/types';
-import { NotificationFocusedContext } from 'vs/workbench/common/contextkeys';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { AriaRole } from 'vs/base/browser/ui/aria/aria';
-import { NotificationActionRunner } from 'vs/workbench/browser/parts/notifications/notificationsCommands';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import './media/notificationsList.css';
+import { localize } from '../../../../nls.js';
+import { getWindow, isAncestorOfActiveElement, trackFocus } from '../../../../base/browser/dom.js';
+import { WorkbenchList } from '../../../../platform/list/browser/listService.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IListAccessibilityProvider, IListOptions } from '../../../../base/browser/ui/list/listWidget.js';
+import { NOTIFICATIONS_BACKGROUND } from '../../../common/theme.js';
+import { INotificationViewItem } from '../../../common/notifications.js';
+import { NotificationsListDelegate, NotificationRenderer } from './notificationsViewer.js';
+import { CopyNotificationMessageAction } from './notificationsActions.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { assertAllDefined } from '../../../../base/common/types.js';
+import { NotificationFocusedContext } from '../../../common/contextkeys.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { AriaRole } from '../../../../base/browser/ui/aria/aria.js';
+import { NotificationActionRunner } from './notificationsCommands.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 
 export interface INotificationsListOptions extends IListOptions<INotificationViewItem> {
 	readonly widgetAriaLabel?: string;
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsStatus.ts b/src/vs/workbench/browser/parts/notifications/notificationsStatus.ts
index 71b8a59aa62..3e0ec62380d 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsStatus.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsStatus.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { INotificationsModel, INotificationChangeEvent, NotificationChangeType, IStatusMessageChangeEvent, StatusMessageChangeType, IStatusMessageViewItem } from 'vs/workbench/common/notifications';
-import { IStatusbarService, StatusbarAlignment, IStatusbarEntryAccessor, IStatusbarEntry } from 'vs/workbench/services/statusbar/browser/statusbar';
-import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { HIDE_NOTIFICATIONS_CENTER, SHOW_NOTIFICATIONS_CENTER } from 'vs/workbench/browser/parts/notifications/notificationsCommands';
-import { localize } from 'vs/nls';
-import { INotificationService, NotificationsFilter } from 'vs/platform/notification/common/notification';
+import { INotificationsModel, INotificationChangeEvent, NotificationChangeType, IStatusMessageChangeEvent, StatusMessageChangeType, IStatusMessageViewItem } from '../../../common/notifications.js';
+import { IStatusbarService, StatusbarAlignment, IStatusbarEntryAccessor, IStatusbarEntry } from '../../../services/statusbar/browser/statusbar.js';
+import { Disposable, IDisposable, dispose } from '../../../../base/common/lifecycle.js';
+import { HIDE_NOTIFICATIONS_CENTER, SHOW_NOTIFICATIONS_CENTER } from './notificationsCommands.js';
+import { localize } from '../../../../nls.js';
+import { INotificationService, NotificationsFilter } from '../../../../platform/notification/common/notification.js';
 
 export class NotificationsStatus extends Disposable {
 
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsTelemetry.ts b/src/vs/workbench/browser/parts/notifications/notificationsTelemetry.ts
index 97d1d6a18c8..fd7b3f3da3a 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsTelemetry.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsTelemetry.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { INotificationService, NotificationMessage, NotificationPriority } from 'vs/platform/notification/common/notification';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { hash } from 'vs/base/common/hash';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { INotificationService, NotificationMessage, NotificationPriority } from '../../../../platform/notification/common/notification.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { hash } from '../../../../base/common/hash.js';
 
 export interface NotificationMetrics {
 	readonly id: string;
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts b/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
index c42e49f2629..f0dda3b44cb 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
@@ -3,29 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/notificationsToasts';
-import { localize } from 'vs/nls';
-import { INotificationsModel, NotificationChangeType, INotificationChangeEvent, INotificationViewItem, NotificationViewItemContentChangeKind } from 'vs/workbench/common/notifications';
-import { IDisposable, dispose, toDisposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { addDisposableListener, EventType, Dimension, scheduleAtNextAnimationFrame, isAncestorOfActiveElement, getWindow } from 'vs/base/browser/dom';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { NotificationsList } from 'vs/workbench/browser/parts/notifications/notificationsList';
-import { Event, Emitter } from 'vs/base/common/event';
-import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/browser/layoutService';
-import { NOTIFICATIONS_TOAST_BORDER, NOTIFICATIONS_BACKGROUND } from 'vs/workbench/common/theme';
-import { IThemeService, Themable } from 'vs/platform/theme/common/themeService';
-import { widgetShadow } from 'vs/platform/theme/common/colorRegistry';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { INotificationsToastController } from 'vs/workbench/browser/parts/notifications/notificationsCommands';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { Severity, NotificationsFilter, NotificationPriority } from 'vs/platform/notification/common/notification';
-import { ScrollbarVisibility } from 'vs/base/common/scrollable';
-import { ILifecycleService, LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IntervalCounter } from 'vs/base/common/async';
-import { assertIsDefined } from 'vs/base/common/types';
-import { NotificationsToastsVisibleContext } from 'vs/workbench/common/contextkeys';
-import { mainWindow } from 'vs/base/browser/window';
+import './media/notificationsToasts.css';
+import { localize } from '../../../../nls.js';
+import { INotificationsModel, NotificationChangeType, INotificationChangeEvent, INotificationViewItem, NotificationViewItemContentChangeKind } from '../../../common/notifications.js';
+import { IDisposable, dispose, toDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { addDisposableListener, EventType, Dimension, scheduleAtNextAnimationFrame, isAncestorOfActiveElement, getWindow } from '../../../../base/browser/dom.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { NotificationsList } from './notificationsList.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { IWorkbenchLayoutService, Parts } from '../../../services/layout/browser/layoutService.js';
+import { NOTIFICATIONS_TOAST_BORDER, NOTIFICATIONS_BACKGROUND } from '../../../common/theme.js';
+import { IThemeService, Themable } from '../../../../platform/theme/common/themeService.js';
+import { widgetShadow } from '../../../../platform/theme/common/colorRegistry.js';
+import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { INotificationsToastController } from './notificationsCommands.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { Severity, NotificationsFilter, NotificationPriority } from '../../../../platform/notification/common/notification.js';
+import { ScrollbarVisibility } from '../../../../base/common/scrollable.js';
+import { ILifecycleService, LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { IntervalCounter } from '../../../../base/common/async.js';
+import { assertIsDefined } from '../../../../base/common/types.js';
+import { NotificationsToastsVisibleContext } from '../../../common/contextkeys.js';
+import { mainWindow } from '../../../../base/browser/window.js';
 
 interface INotificationToast {
 	readonly item: INotificationViewItem;
@@ -55,7 +55,7 @@ export class NotificationsToasts extends Themable implements INotificationsToast
 		// Count for the number of notifications over 800ms...
 		interval: 800,
 		// ...and ensure we are not showing more than MAX_NOTIFICATIONS
-		limit: NotificationsToasts.MAX_NOTIFICATIONS
+		limit: this.MAX_NOTIFICATIONS
 	};
 
 	private readonly _onDidChangeVisibility = this._register(new Emitter<void>());
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts b/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
index c1fda244291..c1880ef981b 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
@@ -3,35 +3,35 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IListVirtualDelegate, IListRenderer } from 'vs/base/browser/ui/list/list';
-import { clearNode, addDisposableListener, EventType, EventHelper, $, isEventLike } from 'vs/base/browser/dom';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { ButtonBar, IButtonOptions } from 'vs/base/browser/ui/button/button';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { ActionRunner, IAction, IActionRunner, Separator, toAction } from 'vs/base/common/actions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { dispose, DisposableStore, Disposable } from 'vs/base/common/lifecycle';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { INotificationViewItem, NotificationViewItem, NotificationViewItemContentChangeKind, INotificationMessage, ChoiceAction } from 'vs/workbench/common/notifications';
-import { ClearNotificationAction, ExpandNotificationAction, CollapseNotificationAction, ConfigureNotificationAction } from 'vs/workbench/browser/parts/notifications/notificationsActions';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
-import { INotificationService, NotificationsFilter, Severity, isNotificationSource } from 'vs/platform/notification/common/notification';
-import { isNonEmptyArray } from 'vs/base/common/arrays';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { DropdownMenuActionViewItem } from 'vs/base/browser/ui/dropdown/dropdownActionViewItem';
-import { DomEmitter } from 'vs/base/browser/event';
-import { Gesture, EventType as GestureEventType } from 'vs/base/browser/touch';
-import { Event } from 'vs/base/common/event';
-import { defaultButtonStyles, defaultProgressBarStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import type { IManagedHover } from 'vs/base/browser/ui/hover/hover';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import { IListVirtualDelegate, IListRenderer } from '../../../../base/browser/ui/list/list.js';
+import { clearNode, addDisposableListener, EventType, EventHelper, $, isEventLike } from '../../../../base/browser/dom.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { URI } from '../../../../base/common/uri.js';
+import { localize } from '../../../../nls.js';
+import { ButtonBar, IButtonOptions } from '../../../../base/browser/ui/button/button.js';
+import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { ActionRunner, IAction, IActionRunner, Separator, toAction } from '../../../../base/common/actions.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { dispose, DisposableStore, Disposable } from '../../../../base/common/lifecycle.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { INotificationViewItem, NotificationViewItem, NotificationViewItemContentChangeKind, INotificationMessage, ChoiceAction } from '../../../common/notifications.js';
+import { ClearNotificationAction, ExpandNotificationAction, CollapseNotificationAction, ConfigureNotificationAction } from './notificationsActions.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { ProgressBar } from '../../../../base/browser/ui/progressbar/progressbar.js';
+import { INotificationService, NotificationsFilter, Severity, isNotificationSource } from '../../../../platform/notification/common/notification.js';
+import { isNonEmptyArray } from '../../../../base/common/arrays.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { DropdownMenuActionViewItem } from '../../../../base/browser/ui/dropdown/dropdownActionViewItem.js';
+import { DomEmitter } from '../../../../base/browser/event.js';
+import { Gesture, EventType as GestureEventType } from '../../../../base/browser/touch.js';
+import { Event } from '../../../../base/common/event.js';
+import { defaultButtonStyles, defaultProgressBarStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import type { IManagedHover } from '../../../../base/browser/ui/hover/hover.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 
 export class NotificationsListDelegate implements IListVirtualDelegate<INotificationViewItem> {
 
diff --git a/src/vs/workbench/browser/parts/paneCompositeBar.ts b/src/vs/workbench/browser/parts/paneCompositeBar.ts
index 999ec66db58..0dbca889a7f 100644
--- a/src/vs/workbench/browser/parts/paneCompositeBar.ts
+++ b/src/vs/workbench/browser/parts/paneCompositeBar.ts
@@ -3,32 +3,33 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
-import { IActivityService } from 'vs/workbench/services/activity/common/activity';
-import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/browser/layoutService';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IDisposable, DisposableStore, Disposable, DisposableMap } from 'vs/base/common/lifecycle';
-import { IColorTheme } from 'vs/platform/theme/common/themeService';
-import { CompositeBar, ICompositeBarItem, CompositeDragAndDrop } from 'vs/workbench/browser/parts/compositeBar';
-import { Dimension, createCSSRule, asCSSUrl, isMouseEvent } from 'vs/base/browser/dom';
-import { IStorageService, StorageScope, StorageTarget, IProfileStorageValueChangeEvent } from 'vs/platform/storage/common/storage';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { ToggleCompositePinnedAction, ICompositeBarColors, IActivityHoverOptions, ToggleCompositeBadgeAction, CompositeBarAction, ICompositeBar, ICompositeBarActionItem } from 'vs/workbench/browser/parts/compositeBarActions';
-import { IViewDescriptorService, ViewContainer, IViewContainerModel, ViewContainerLocation } from 'vs/workbench/common/views';
-import { IContextKeyService, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { isString } from 'vs/base/common/types';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { isNative } from 'vs/base/common/platform';
-import { Before2D, ICompositeDragAndDrop } from 'vs/workbench/browser/dnd';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IAction, toAction } from 'vs/base/common/actions';
-import { StringSHA1 } from 'vs/base/common/hash';
-import { GestureEvent } from 'vs/base/browser/touch';
-import { IPaneCompositePart } from 'vs/workbench/browser/parts/paneCompositePart';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { localize } from '../../../nls.js';
+import { ActionsOrientation } from '../../../base/browser/ui/actionbar/actionbar.js';
+import { IActivityService } from '../../services/activity/common/activity.js';
+import { IWorkbenchLayoutService, Parts } from '../../services/layout/browser/layoutService.js';
+import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
+import { IDisposable, DisposableStore, Disposable, DisposableMap } from '../../../base/common/lifecycle.js';
+import { IColorTheme } from '../../../platform/theme/common/themeService.js';
+import { CompositeBar, ICompositeBarItem, CompositeDragAndDrop } from './compositeBar.js';
+import { Dimension, createCSSRule, asCSSUrl, isMouseEvent } from '../../../base/browser/dom.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../platform/storage/common/storage.js';
+import { IExtensionService } from '../../services/extensions/common/extensions.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
+import { ToggleCompositePinnedAction, ICompositeBarColors, IActivityHoverOptions, ToggleCompositeBadgeAction, CompositeBarAction, ICompositeBar, ICompositeBarActionItem } from './compositeBarActions.js';
+import { IViewDescriptorService, ViewContainer, IViewContainerModel, ViewContainerLocation } from '../../common/views.js';
+import { IContextKeyService, ContextKeyExpr } from '../../../platform/contextkey/common/contextkey.js';
+import { isString } from '../../../base/common/types.js';
+import { IWorkbenchEnvironmentService } from '../../services/environment/common/environmentService.js';
+import { isNative } from '../../../base/common/platform.js';
+import { Before2D, ICompositeDragAndDrop } from '../dnd.js';
+import { ThemeIcon } from '../../../base/common/themables.js';
+import { IAction, toAction } from '../../../base/common/actions.js';
+import { StringSHA1 } from '../../../base/common/hash.js';
+import { GestureEvent } from '../../../base/browser/touch.js';
+import { IPaneCompositePart } from './paneCompositePart.js';
+import { ITelemetryService } from '../../../platform/telemetry/common/telemetry.js';
+import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
+import { IViewsService } from '../../services/views/common/viewsService.js';
 
 interface IPlaceholderViewContainer {
 	readonly id: string;
@@ -102,6 +103,7 @@ export class PaneCompositeBar extends Disposable {
 		@IStorageService private readonly storageService: IStorageService,
 		@IExtensionService private readonly extensionService: IExtensionService,
 		@IViewDescriptorService private readonly viewDescriptorService: IViewDescriptorService,
+		@IViewsService private readonly viewService: IViewsService,
 		@IContextKeyService protected readonly contextKeyService: IContextKeyService,
 		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService,
 		@IWorkbenchLayoutService protected readonly layoutService: IWorkbenchLayoutService,
@@ -190,8 +192,11 @@ export class PaneCompositeBar extends Disposable {
 				return;
 			}
 			this.onDidRegisterExtensions();
-			this._register(this.compositeBar.onDidChange(() => this.saveCachedViewContainers()));
-			this._register(this.storageService.onDidChangeValue(StorageScope.PROFILE, this.options.pinnedViewContainersKey, this._store)(e => this.onDidPinnedViewContainersStorageValueChange(e)));
+			this._register(this.compositeBar.onDidChange(() => {
+				this.updateCompositeBarItemsFromStorage(true);
+				this.saveCachedViewContainers();
+			}));
+			this._register(this.storageService.onDidChangeValue(StorageScope.PROFILE, this.options.pinnedViewContainersKey, this._store)(() => this.updateCompositeBarItemsFromStorage(false)));
 		});
 	}
 
@@ -383,7 +388,7 @@ export class PaneCompositeBar extends Disposable {
 
 		if (viewContainer) {
 			if (viewContainer.hideIfEmpty) {
-				if (this.viewDescriptorService.getViewContainerModel(viewContainer).activeViewDescriptors.length > 0) {
+				if (this.viewService.isViewContainerActive(viewContainerId)) {
 					return false;
 				}
 			} else {
@@ -469,52 +474,63 @@ export class PaneCompositeBar extends Disposable {
 		return this.viewDescriptorService.getViewContainersByLocation(this.location);
 	}
 
-	private onDidPinnedViewContainersStorageValueChange(e: IProfileStorageValueChangeEvent): void {
-		if (this.pinnedViewContainersValue !== this.getStoredPinnedViewContainersValue() /* This checks if current window changed the value or not */) {
-			this._placeholderViewContainersValue = undefined;
-			this._pinnedViewContainersValue = undefined;
-			this._cachedViewContainers = undefined;
+	private updateCompositeBarItemsFromStorage(retainExisting: boolean): void {
+		if (this.pinnedViewContainersValue === this.getStoredPinnedViewContainersValue()) {
+			return;
+		}
 
-			const newCompositeItems: ICompositeBarItem[] = [];
-			const compositeItems = this.compositeBar.getCompositeBarItems();
+		this._placeholderViewContainersValue = undefined;
+		this._pinnedViewContainersValue = undefined;
+		this._cachedViewContainers = undefined;
 
-			for (const cachedViewContainer of this.cachedViewContainers) {
-				newCompositeItems.push({
-					id: cachedViewContainer.id,
-					name: cachedViewContainer.name,
-					order: cachedViewContainer.order,
-					pinned: cachedViewContainer.pinned,
-					visible: cachedViewContainer.visible && !!this.getViewContainer(cachedViewContainer.id),
-				});
-			}
+		const newCompositeItems: ICompositeBarItem[] = [];
+		const compositeItems = this.compositeBar.getCompositeBarItems();
 
-			for (const viewContainer of this.getViewContainers()) {
-				// Add missing view containers
-				if (!newCompositeItems.some(({ id }) => id === viewContainer.id)) {
-					const index = compositeItems.findIndex(({ id }) => id === viewContainer.id);
-					if (index !== -1) {
-						const compositeItem = compositeItems[index];
-						newCompositeItems.splice(index, 0, {
-							id: viewContainer.id,
-							name: typeof viewContainer.title === 'string' ? viewContainer.title : viewContainer.title.value,
-							order: compositeItem.order,
-							pinned: compositeItem.pinned,
-							visible: compositeItem.visible,
-						});
-					} else {
-						newCompositeItems.push({
-							id: viewContainer.id,
-							name: typeof viewContainer.title === 'string' ? viewContainer.title : viewContainer.title.value,
-							order: viewContainer.order,
-							pinned: true,
-							visible: !this.shouldBeHidden(viewContainer),
-						});
-					}
+		for (const cachedViewContainer of this.cachedViewContainers) {
+			newCompositeItems.push({
+				id: cachedViewContainer.id,
+				name: cachedViewContainer.name,
+				order: cachedViewContainer.order,
+				pinned: cachedViewContainer.pinned,
+				visible: cachedViewContainer.visible && !!this.getViewContainer(cachedViewContainer.id),
+			});
+		}
+
+		for (const viewContainer of this.getViewContainers()) {
+			// Add missing view containers
+			if (!newCompositeItems.some(({ id }) => id === viewContainer.id)) {
+				const index = compositeItems.findIndex(({ id }) => id === viewContainer.id);
+				if (index !== -1) {
+					const compositeItem = compositeItems[index];
+					newCompositeItems.splice(index, 0, {
+						id: viewContainer.id,
+						name: typeof viewContainer.title === 'string' ? viewContainer.title : viewContainer.title.value,
+						order: compositeItem.order,
+						pinned: compositeItem.pinned,
+						visible: compositeItem.visible,
+					});
+				} else {
+					newCompositeItems.push({
+						id: viewContainer.id,
+						name: typeof viewContainer.title === 'string' ? viewContainer.title : viewContainer.title.value,
+						order: viewContainer.order,
+						pinned: true,
+						visible: !this.shouldBeHidden(viewContainer),
+					});
 				}
 			}
-
-			this.compositeBar.setCompositeBarItems(newCompositeItems);
 		}
+
+		if (retainExisting) {
+			for (const compositeItem of compositeItems) {
+				const newCompositeItem = newCompositeItems.find(({ id }) => id === compositeItem.id);
+				if (!newCompositeItem) {
+					newCompositeItems.push(compositeItem);
+				}
+			}
+		}
+
+		this.compositeBar.setCompositeBarItems(newCompositeItems);
 	}
 
 	private saveCachedViewContainers(): void {
diff --git a/src/vs/workbench/browser/parts/paneCompositePart.ts b/src/vs/workbench/browser/parts/paneCompositePart.ts
index 68e797d69e1..9ec755c35c2 100644
--- a/src/vs/workbench/browser/parts/paneCompositePart.ts
+++ b/src/vs/workbench/browser/parts/paneCompositePart.ts
@@ -3,43 +3,43 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/paneCompositePart';
-import { Event } from 'vs/base/common/event';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IProgressIndicator } from 'vs/platform/progress/common/progress';
-import { Extensions, PaneComposite, PaneCompositeDescriptor, PaneCompositeRegistry } from 'vs/workbench/browser/panecomposite';
-import { IPaneComposite } from 'vs/workbench/common/panecomposite';
-import { IViewDescriptorService, ViewContainerLocation } from 'vs/workbench/common/views';
-import { DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
-import { IView } from 'vs/base/browser/ui/grid/grid';
-import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/browser/layoutService';
-import { CompositePart, ICompositeTitleLabel } from 'vs/workbench/browser/parts/compositePart';
-import { IPaneCompositeBarOptions, PaneCompositeBar } from 'vs/workbench/browser/parts/paneCompositeBar';
-import { Dimension, EventHelper, trackFocus, $, addDisposableListener, EventType, prepend, getWindow } from 'vs/base/browser/dom';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IComposite } from 'vs/workbench/common/composite';
-import { localize } from 'vs/nls';
-import { CompositeDragAndDropObserver, toggleDropEffect } from 'vs/workbench/browser/dnd';
-import { EDITOR_DRAG_AND_DROP_BACKGROUND } from 'vs/workbench/common/theme';
-import { IPartOptions } from 'vs/workbench/browser/part';
-import { CompositeMenuActions } from 'vs/workbench/browser/actions';
-import { IMenuService, MenuId } from 'vs/platform/actions/common/actions';
-import { ActionsOrientation, prepareActions } from 'vs/base/browser/ui/actionbar/actionbar';
-import { Gesture, EventType as GestureEventType } from 'vs/base/browser/touch';
-import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { IAction, SubmenuAction } from 'vs/base/common/actions';
-import { Composite } from 'vs/workbench/browser/composite';
-import { ViewsSubMenu } from 'vs/workbench/browser/parts/views/viewPaneContainer';
-import { createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { HiddenItemStrategy, WorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
+import './media/paneCompositePart.css';
+import { Event } from '../../../base/common/event.js';
+import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
+import { IProgressIndicator } from '../../../platform/progress/common/progress.js';
+import { Extensions, PaneComposite, PaneCompositeDescriptor, PaneCompositeRegistry } from '../panecomposite.js';
+import { IPaneComposite } from '../../common/panecomposite.js';
+import { IViewDescriptorService, ViewContainerLocation } from '../../common/views.js';
+import { DisposableStore, MutableDisposable } from '../../../base/common/lifecycle.js';
+import { IView } from '../../../base/browser/ui/grid/grid.js';
+import { IWorkbenchLayoutService, Parts } from '../../services/layout/browser/layoutService.js';
+import { CompositePart, ICompositeTitleLabel } from './compositePart.js';
+import { IPaneCompositeBarOptions, PaneCompositeBar } from './paneCompositeBar.js';
+import { Dimension, EventHelper, trackFocus, $, addDisposableListener, EventType, prepend, getWindow } from '../../../base/browser/dom.js';
+import { Registry } from '../../../platform/registry/common/platform.js';
+import { INotificationService } from '../../../platform/notification/common/notification.js';
+import { IStorageService } from '../../../platform/storage/common/storage.js';
+import { IContextMenuService } from '../../../platform/contextview/browser/contextView.js';
+import { IKeybindingService } from '../../../platform/keybinding/common/keybinding.js';
+import { IThemeService } from '../../../platform/theme/common/themeService.js';
+import { IContextKey, IContextKeyService } from '../../../platform/contextkey/common/contextkey.js';
+import { IExtensionService } from '../../services/extensions/common/extensions.js';
+import { IComposite } from '../../common/composite.js';
+import { localize } from '../../../nls.js';
+import { CompositeDragAndDropObserver, toggleDropEffect } from '../dnd.js';
+import { EDITOR_DRAG_AND_DROP_BACKGROUND } from '../../common/theme.js';
+import { IPartOptions } from '../part.js';
+import { CompositeMenuActions } from '../actions.js';
+import { IMenuService, MenuId } from '../../../platform/actions/common/actions.js';
+import { ActionsOrientation, prepareActions } from '../../../base/browser/ui/actionbar/actionbar.js';
+import { Gesture, EventType as GestureEventType } from '../../../base/browser/touch.js';
+import { StandardMouseEvent } from '../../../base/browser/mouseEvent.js';
+import { IAction, SubmenuAction } from '../../../base/common/actions.js';
+import { Composite } from '../composite.js';
+import { ViewsSubMenu } from './views/viewPaneContainer.js';
+import { createAndFillInActionBarActions } from '../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IHoverService } from '../../../platform/hover/browser/hover.js';
+import { HiddenItemStrategy, WorkbenchToolBar } from '../../../platform/actions/browser/toolbar.js';
 
 export enum CompositeBarPosition {
 	TOP,
@@ -268,7 +268,7 @@ export abstract class AbstractPaneCompositePart extends CompositePart<PaneCompos
 		this.emptyPaneMessageElement.appendChild(messageElement);
 		parent.appendChild(this.emptyPaneMessageElement);
 
-		this._register(CompositeDragAndDropObserver.INSTANCE.registerTarget(this.emptyPaneMessageElement, {
+		this._register(CompositeDragAndDropObserver.INSTANCE.registerTarget(this.element, {
 			onDragOver: (e) => {
 				EventHelper.stop(e.eventData, true);
 				if (this.paneCompositeBar.value) {
@@ -296,6 +296,28 @@ export abstract class AbstractPaneCompositePart extends CompositePart<PaneCompos
 				this.emptyPaneMessageElement!.style.backgroundColor = '';
 				if (this.paneCompositeBar.value) {
 					this.paneCompositeBar.value.dndHandler.drop(e.dragAndDropData, undefined, e.eventData);
+				} else {
+					// Allow opening views/composites if the composite bar is hidden
+					const dragData = e.dragAndDropData.getData();
+
+					if (dragData.type === 'composite') {
+						const currentContainer = this.viewDescriptorService.getViewContainerById(dragData.id)!;
+						this.viewDescriptorService.moveViewContainerToLocation(currentContainer, this.location, undefined, 'dnd');
+						this.openPaneComposite(currentContainer.id, true);
+					}
+
+					else if (dragData.type === 'view') {
+						const viewToMove = this.viewDescriptorService.getViewDescriptorById(dragData.id)!;
+						if (viewToMove && viewToMove.canMoveView) {
+							this.viewDescriptorService.moveViewToLocation(viewToMove, this.location, 'dnd');
+
+							const newContainer = this.viewDescriptorService.getViewContainerByViewId(viewToMove.id)!;
+
+							this.openPaneComposite(newContainer.id, true).then(composite => {
+								composite?.openView(viewToMove.id, true);
+							});
+						}
+					}
 				}
 			},
 		}));
@@ -344,14 +366,14 @@ export abstract class AbstractPaneCompositePart extends CompositePart<PaneCompos
 		return titleLabel;
 	}
 
-	protected updateCompositeBar(): void {
+	protected updateCompositeBar(updateCompositeBarOption: boolean = false): void {
 		const wasCompositeBarVisible = this.compositeBarPosition !== undefined;
 		const isCompositeBarVisible = this.shouldShowCompositeBar();
 		const previousPosition = this.compositeBarPosition;
 		const newPosition = isCompositeBarVisible ? this.getCompositeBarPosition() : undefined;
 
-		// Only update if the visibility or position has changed
-		if (previousPosition === newPosition) {
+		// Only update if the visibility or position has changed or if the composite bar options should be updated
+		if (!updateCompositeBarOption && previousPosition === newPosition) {
 			return;
 		}
 
@@ -401,6 +423,10 @@ export abstract class AbstractPaneCompositePart extends CompositePart<PaneCompos
 		}
 
 		this.compositeBarPosition = newPosition;
+
+		if (updateCompositeBarOption) {
+			this.layoutCompositeBar();
+		}
 	}
 
 	protected override createHeaderArea(): HTMLElement {
@@ -629,8 +655,8 @@ export abstract class AbstractPaneCompositePart extends CompositePart<PaneCompos
 			const viewsActions: IAction[] = [];
 			const scopedContextKeyService = disposables.add(this.contextKeyService.createScoped(this.element));
 			scopedContextKeyService.createKey('viewContainer', viewPaneContainer.viewContainer.id);
-			const menu = disposables.add(this.menuService.createMenu(ViewsSubMenu, scopedContextKeyService));
-			createAndFillInActionBarActions(menu, { shouldForwardArgs: true, renderShortTitle: true }, { primary: viewsActions, secondary: [] }, () => true);
+			const menu = this.menuService.getMenuActions(ViewsSubMenu, scopedContextKeyService, { shouldForwardArgs: true, renderShortTitle: true });
+			createAndFillInActionBarActions(menu, { primary: viewsActions, secondary: [] }, () => true);
 			disposables.dispose();
 			return viewsActions.length > 1 && viewsActions.some(a => a.enabled) ? new SubmenuAction('views', localize('views', "Views"), viewsActions) : undefined;
 		}
diff --git a/src/vs/workbench/browser/parts/paneCompositePartService.ts b/src/vs/workbench/browser/parts/paneCompositePartService.ts
index fe8930252ef..beea4f8b454 100644
--- a/src/vs/workbench/browser/parts/paneCompositePartService.ts
+++ b/src/vs/workbench/browser/parts/paneCompositePartService.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { assertIsDefined } from 'vs/base/common/types';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IProgressIndicator } from 'vs/platform/progress/common/progress';
-import { PaneCompositeDescriptor } from 'vs/workbench/browser/panecomposite';
-import { AuxiliaryBarPart } from 'vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart';
-import { PanelPart } from 'vs/workbench/browser/parts/panel/panelPart';
-import { SidebarPart } from 'vs/workbench/browser/parts/sidebar/sidebarPart';
-import { IPaneComposite } from 'vs/workbench/common/panecomposite';
-import { ViewContainerLocation, ViewContainerLocations } from 'vs/workbench/common/views';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { IPaneCompositePart } from 'vs/workbench/browser/parts/paneCompositePart';
+import { Event } from '../../../base/common/event.js';
+import { assertIsDefined } from '../../../base/common/types.js';
+import { InstantiationType, registerSingleton } from '../../../platform/instantiation/common/extensions.js';
+import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
+import { IProgressIndicator } from '../../../platform/progress/common/progress.js';
+import { PaneCompositeDescriptor } from '../panecomposite.js';
+import { AuxiliaryBarPart } from './auxiliarybar/auxiliaryBarPart.js';
+import { PanelPart } from './panel/panelPart.js';
+import { SidebarPart } from './sidebar/sidebarPart.js';
+import { IPaneComposite } from '../../common/panecomposite.js';
+import { ViewContainerLocation, ViewContainerLocations } from '../../common/views.js';
+import { IPaneCompositePartService } from '../../services/panecomposite/browser/panecomposite.js';
+import { Disposable, DisposableStore } from '../../../base/common/lifecycle.js';
+import { IPaneCompositePart } from './paneCompositePart.js';
 
 export class PaneCompositePartService extends Disposable implements IPaneCompositePartService {
 
diff --git a/src/vs/workbench/browser/parts/panel/media/panelpart.css b/src/vs/workbench/browser/parts/panel/media/panelpart.css
index 40a5ee28faf..e1c147d8e88 100644
--- a/src/vs/workbench/browser/parts/panel/media/panelpart.css
+++ b/src/vs/workbench/browser/parts/panel/media/panelpart.css
@@ -17,6 +17,15 @@
 	border-top-width: 0; /* no border when main editor area is hiden */
 }
 
+.monaco-workbench .part.panel.top {
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+}
+
+.monaco-workbench.nomaineditorarea .part.panel.top {
+	border-bottom-width: 0; /* no border when main editor area is hiden */
+}
+
 .monaco-workbench .part.panel.right {
 	border-left-width: 1px;
 	border-left-style: solid;
@@ -81,3 +90,11 @@
 	display: inline-block;
 	transform: rotate(90deg);
 }
+
+/* Rotate icons when panel is on left */
+.monaco-workbench .part.basepanel.top .title-actions .codicon-split-horizontal::before,
+.monaco-workbench .part.basepanel.top .global-actions .codicon-panel-maximize::before,
+.monaco-workbench .part.basepanel.top .global-actions .codicon-panel-restore::before {
+	display: inline-block;
+	transform: rotate(180deg);
+}
diff --git a/src/vs/workbench/browser/parts/panel/panelActions.ts b/src/vs/workbench/browser/parts/panel/panelActions.ts
index 534db0283a7..77ac81eea44 100644
--- a/src/vs/workbench/browser/parts/panel/panelActions.ts
+++ b/src/vs/workbench/browser/parts/panel/panelActions.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/panelpart';
-import { localize, localize2 } from 'vs/nls';
-import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
-import { MenuId, MenuRegistry, registerAction2, Action2, IAction2Options } from 'vs/platform/actions/common/actions';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { ActivityBarPosition, IWorkbenchLayoutService, LayoutSettings, PanelAlignment, Parts, Position, positionToString } from 'vs/workbench/services/layout/browser/layoutService';
-import { AuxiliaryBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelPositionContext, PanelVisibleContext } from 'vs/workbench/common/contextkeys';
-import { ContextKeyExpr, ContextKeyExpression } from 'vs/platform/contextkey/common/contextkey';
-import { Codicon } from 'vs/base/common/codicons';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { ViewContainerLocationToString, ViewContainerLocation, IViewDescriptorService } from 'vs/workbench/common/views';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { ICommandActionTitle } from 'vs/platform/action/common/action';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import './media/panelpart.css';
+import { localize, localize2 } from '../../../../nls.js';
+import { KeyMod, KeyCode } from '../../../../base/common/keyCodes.js';
+import { MenuId, MenuRegistry, registerAction2, Action2, IAction2Options } from '../../../../platform/actions/common/actions.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { ActivityBarPosition, isHorizontal, IWorkbenchLayoutService, LayoutSettings, PanelAlignment, Parts, Position, positionToString } from '../../../services/layout/browser/layoutService.js';
+import { AuxiliaryBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelPositionContext, PanelVisibleContext } from '../../../common/contextkeys.js';
+import { ContextKeyExpr, ContextKeyExpression } from '../../../../platform/contextkey/common/contextkey.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
+import { ViewContainerLocationToString, ViewContainerLocation, IViewDescriptorService } from '../../../common/views.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { ICommandActionTitle } from '../../../../platform/action/common/action.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 
 const maximizeIcon = registerIcon('panel-maximize', Codicon.chevronUp, localize('maximizeIcon', 'Icon to maximize a panel.'));
 const restoreIcon = registerIcon('panel-restore', Codicon.chevronDown, localize('restoreIcon', 'Icon to restore a panel.'));
@@ -99,6 +99,7 @@ const PositionPanelActionId = {
 	LEFT: 'workbench.action.positionPanelLeft',
 	RIGHT: 'workbench.action.positionPanelRight',
 	BOTTOM: 'workbench.action.positionPanelBottom',
+	TOP: 'workbench.action.positionPanelTop'
 };
 
 const AlignPanelActionId = {
@@ -136,6 +137,7 @@ function createAlignmentPanelActionConfig(id: string, title: ICommandActionTitle
 
 
 const PositionPanelActionConfigs: PanelActionConfig<Position>[] = [
+	createPositionPanelActionConfig(PositionPanelActionId.TOP, localize2('positionPanelTop', "Move Panel To Top"), localize('positionPanelTopShort', "Top"), Position.TOP),
 	createPositionPanelActionConfig(PositionPanelActionId.LEFT, localize2('positionPanelLeft', "Move Panel Left"), localize('positionPanelLeftShort', "Left"), Position.LEFT),
 	createPositionPanelActionConfig(PositionPanelActionId.RIGHT, localize2('positionPanelRight', "Move Panel Right"), localize('positionPanelRightShort', "Right"), Position.RIGHT),
 	createPositionPanelActionConfig(PositionPanelActionId.BOTTOM, localize2('positionPanelBottom', "Move Panel To Bottom"), localize('positionPanelBottomShort', "Bottom"), Position.BOTTOM),
@@ -158,7 +160,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
 	order: 4
 });
 
-PositionPanelActionConfigs.forEach(positionPanelAction => {
+PositionPanelActionConfigs.forEach((positionPanelAction, index) => {
 	const { id, title, shortLabel, value, when } = positionPanelAction;
 
 	registerAction2(class extends Action2 {
@@ -182,7 +184,7 @@ PositionPanelActionConfigs.forEach(positionPanelAction => {
 			title: shortLabel,
 			toggled: when.negate()
 		},
-		order: 5
+		order: 5 + index
 	});
 });
 
@@ -280,23 +282,23 @@ registerAction2(class extends Action2 {
 			tooltip: localize('maximizePanel', "Maximize Panel Size"),
 			category: Categories.View,
 			f1: true,
-			icon: maximizeIcon,
+			icon: maximizeIcon, // This is being rotated in CSS depending on the panel position
 			// the workbench grid currently prevents us from supporting panel maximization with non-center panel alignment
-			precondition: ContextKeyExpr.or(PanelAlignmentContext.isEqualTo('center'), PanelPositionContext.notEqualsTo('bottom')),
+			precondition: ContextKeyExpr.or(PanelAlignmentContext.isEqualTo('center'), ContextKeyExpr.and(PanelPositionContext.notEqualsTo('bottom'), PanelPositionContext.notEqualsTo('top'))),
 			toggled: { condition: PanelMaximizedContext, icon: restoreIcon, tooltip: localize('minimizePanel', "Restore Panel Size") },
 			menu: [{
 				id: MenuId.PanelTitle,
 				group: 'navigation',
 				order: 1,
 				// the workbench grid currently prevents us from supporting panel maximization with non-center panel alignment
-				when: ContextKeyExpr.or(PanelAlignmentContext.isEqualTo('center'), PanelPositionContext.notEqualsTo('bottom'))
+				when: ContextKeyExpr.or(PanelAlignmentContext.isEqualTo('center'), ContextKeyExpr.and(PanelPositionContext.notEqualsTo('bottom'), PanelPositionContext.notEqualsTo('top')))
 			}]
 		});
 	}
 	run(accessor: ServicesAccessor) {
 		const layoutService = accessor.get(IWorkbenchLayoutService);
 		const notificationService = accessor.get(INotificationService);
-		if (layoutService.getPanelAlignment() !== 'center' && layoutService.getPanelPosition() === Position.BOTTOM) {
+		if (layoutService.getPanelAlignment() !== 'center' && isHorizontal(layoutService.getPanelPosition())) {
 			notificationService.warn(localize('panelMaxNotSupported', "Maximizing the panel is only supported when it is center aligned."));
 			return;
 		}
@@ -351,10 +353,6 @@ registerAction2(class extends Action2 {
 				group: 'navigation',
 				order: 2,
 				when: ContextKeyExpr.notEquals(`config.${LayoutSettings.ACTIVITY_BAR_LOCATION}`, ActivityBarPosition.TOP)
-			}, {
-				id: MenuId.AuxiliaryBarHeader,
-				group: 'navigation',
-				when: ContextKeyExpr.equals(`config.${LayoutSettings.ACTIVITY_BAR_LOCATION}`, ActivityBarPosition.TOP)
 			}]
 		});
 	}
diff --git a/src/vs/workbench/browser/parts/panel/panelPart.ts b/src/vs/workbench/browser/parts/panel/panelPart.ts
index e8e8b49bce5..f4f5dbf0977 100644
--- a/src/vs/workbench/browser/parts/panel/panelPart.ts
+++ b/src/vs/workbench/browser/parts/panel/panelPart.ts
@@ -3,33 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/panelpart';
-import { localize } from 'vs/nls';
-import { IAction, Separator, SubmenuAction, toAction } from 'vs/base/common/actions';
-import { ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
-import { ActivePanelContext, PanelFocusContext } from 'vs/workbench/common/contextkeys';
-import { IWorkbenchLayoutService, Parts, Position } from 'vs/workbench/services/layout/browser/layoutService';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { TogglePanelAction } from 'vs/workbench/browser/parts/panel/panelActions';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { PANEL_BACKGROUND, PANEL_BORDER, PANEL_ACTIVE_TITLE_FOREGROUND, PANEL_INACTIVE_TITLE_FOREGROUND, PANEL_ACTIVE_TITLE_BORDER, PANEL_DRAG_AND_DROP_BORDER } from 'vs/workbench/common/theme';
-import { contrastBorder, badgeBackground, badgeForeground } from 'vs/platform/theme/common/colorRegistry';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { Dimension } from 'vs/base/browser/dom';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { assertIsDefined } from 'vs/base/common/types';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IViewDescriptorService } from 'vs/workbench/common/views';
-import { HoverPosition } from 'vs/base/browser/ui/hover/hoverWidget';
-import { IMenuService, MenuId } from 'vs/platform/actions/common/actions';
-import { AbstractPaneCompositePart, CompositeBarPosition } from 'vs/workbench/browser/parts/paneCompositePart';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { createAndFillInContextMenuActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IPaneCompositeBarOptions } from 'vs/workbench/browser/parts/paneCompositeBar';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import './media/panelpart.css';
+import { localize } from '../../../../nls.js';
+import { IAction, Separator, SubmenuAction, toAction } from '../../../../base/common/actions.js';
+import { ActionsOrientation } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { ActivePanelContext, PanelFocusContext } from '../../../common/contextkeys.js';
+import { IWorkbenchLayoutService, Parts, Position } from '../../../services/layout/browser/layoutService.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { TogglePanelAction } from './panelActions.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { PANEL_BACKGROUND, PANEL_BORDER, PANEL_ACTIVE_TITLE_FOREGROUND, PANEL_INACTIVE_TITLE_FOREGROUND, PANEL_ACTIVE_TITLE_BORDER, PANEL_DRAG_AND_DROP_BORDER } from '../../../common/theme.js';
+import { contrastBorder, badgeBackground, badgeForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { Dimension } from '../../../../base/browser/dom.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { assertIsDefined } from '../../../../base/common/types.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IViewDescriptorService } from '../../../common/views.js';
+import { HoverPosition } from '../../../../base/browser/ui/hover/hoverWidget.js';
+import { IMenuService, MenuId } from '../../../../platform/actions/common/actions.js';
+import { AbstractPaneCompositePart, CompositeBarPosition } from '../paneCompositePart.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { createAndFillInContextMenuActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IPaneCompositeBarOptions } from '../paneCompositeBar.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 
 export class PanelPart extends AbstractPaneCompositePart {
 
@@ -79,6 +80,7 @@ export class PanelPart extends AbstractPaneCompositePart {
 		@IExtensionService extensionService: IExtensionService,
 		@ICommandService private commandService: ICommandService,
 		@IMenuService menuService: IMenuService,
+		@IConfigurationService private configurationService: IConfigurationService
 	) {
 		super(
 			Parts.PANEL_PART,
@@ -102,6 +104,12 @@ export class PanelPart extends AbstractPaneCompositePart {
 			extensionService,
 			menuService,
 		);
+
+		this._register(this.configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration('workbench.panel.showLabel')) {
+				this.updateCompositeBar(true);
+			}
+		}));
 	}
 
 	override updateStyles(): void {
@@ -112,6 +120,7 @@ export class PanelPart extends AbstractPaneCompositePart {
 		const borderColor = this.getColor(PANEL_BORDER) || this.getColor(contrastBorder) || '';
 		container.style.borderLeftColor = borderColor;
 		container.style.borderRightColor = borderColor;
+		container.style.borderBottomColor = borderColor;
 
 		const title = this.getTitleArea();
 		if (title) {
@@ -125,7 +134,7 @@ export class PanelPart extends AbstractPaneCompositePart {
 			pinnedViewContainersKey: 'workbench.panel.pinnedPanels',
 			placeholderViewContainersKey: 'workbench.panel.placeholderPanels',
 			viewContainersWorkspaceStateKey: 'workbench.panel.viewContainersWorkspaceState',
-			icon: false,
+			icon: this.configurationService.getValue('workbench.panel.showLabel') === false,
 			orientation: ActionsOrientation.HORIZONTAL,
 			recomputeSizes: true,
 			activityHoverOptions: {
@@ -149,14 +158,12 @@ export class PanelPart extends AbstractPaneCompositePart {
 	}
 
 	private fillExtraContextMenuActions(actions: IAction[]): void {
-		const panelPositionMenu = this.menuService.createMenu(MenuId.PanelPositionMenu, this.contextKeyService);
-		const panelAlignMenu = this.menuService.createMenu(MenuId.PanelAlignmentMenu, this.contextKeyService);
+		const panelPositionMenu = this.menuService.getMenuActions(MenuId.PanelPositionMenu, this.contextKeyService, { shouldForwardArgs: true });
+		const panelAlignMenu = this.menuService.getMenuActions(MenuId.PanelAlignmentMenu, this.contextKeyService, { shouldForwardArgs: true });
 		const positionActions: IAction[] = [];
 		const alignActions: IAction[] = [];
-		createAndFillInContextMenuActions(panelPositionMenu, { shouldForwardArgs: true }, { primary: [], secondary: positionActions });
-		createAndFillInContextMenuActions(panelAlignMenu, { shouldForwardArgs: true }, { primary: [], secondary: alignActions });
-		panelAlignMenu.dispose();
-		panelPositionMenu.dispose();
+		createAndFillInContextMenuActions(panelPositionMenu, { primary: [], secondary: positionActions });
+		createAndFillInContextMenuActions(panelAlignMenu, { primary: [], secondary: alignActions });
 
 		actions.push(...[
 			new Separator(),
@@ -168,10 +175,16 @@ export class PanelPart extends AbstractPaneCompositePart {
 
 	override layout(width: number, height: number, top: number, left: number): void {
 		let dimensions: Dimension;
-		if (this.layoutService.getPanelPosition() === Position.RIGHT) {
-			dimensions = new Dimension(width - 1, height); // Take into account the 1px border when layouting
-		} else {
-			dimensions = new Dimension(width, height);
+		switch (this.layoutService.getPanelPosition()) {
+			case Position.RIGHT:
+				dimensions = new Dimension(width - 1, height); // Take into account the 1px border when layouting
+				break;
+			case Position.TOP:
+				dimensions = new Dimension(width, height - 1); // Take into account the 1px border when layouting
+				break;
+			default:
+				dimensions = new Dimension(width, height);
+				break;
 		}
 
 		// Layout contents
diff --git a/src/vs/workbench/browser/parts/sidebar/media/sidebarpart.css b/src/vs/workbench/browser/parts/sidebar/media/sidebarpart.css
index d4be01b7f2f..2c94078993b 100644
--- a/src/vs/workbench/browser/parts/sidebar/media/sidebarpart.css
+++ b/src/vs/workbench/browser/parts/sidebar/media/sidebarpart.css
@@ -78,7 +78,7 @@
 .monaco-workbench .part.sidebar > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item .action-label::before,
 .monaco-workbench .part.sidebar > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item .action-label::before {
 	position: absolute;
-	left: 6px; /* place icon in center */
+	left: 5px; /* place icon in center */
 }
 
 .monaco-workbench .part.sidebar > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator:before,
diff --git a/src/vs/workbench/browser/parts/sidebar/sidebarActions.ts b/src/vs/workbench/browser/parts/sidebar/sidebarActions.ts
index cd4811f83e6..408bb3e4eea 100644
--- a/src/vs/workbench/browser/parts/sidebar/sidebarActions.ts
+++ b/src/vs/workbench/browser/parts/sidebar/sidebarActions.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/sidebarpart';
-import { localize2 } from 'vs/nls';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/browser/layoutService';
-import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { ViewContainerLocation } from 'vs/workbench/common/views';
+import './media/sidebarpart.css';
+import { localize2 } from '../../../../nls.js';
+import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { IWorkbenchLayoutService, Parts } from '../../../services/layout/browser/layoutService.js';
+import { KeyMod, KeyCode } from '../../../../base/common/keyCodes.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.js';
+import { ViewContainerLocation } from '../../../common/views.js';
 
 export class FocusSideBarAction extends Action2 {
 
diff --git a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
index ac56632023d..bf949bc58c1 100644
--- a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
+++ b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
@@ -3,35 +3,35 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/sidebarpart';
-import 'vs/workbench/browser/parts/sidebar/sidebarActions';
-import { ActivityBarPosition, IWorkbenchLayoutService, LayoutSettings, Parts, Position as SideBarPosition } from 'vs/workbench/services/layout/browser/layoutService';
-import { SidebarFocusContext, ActiveViewletContext } from 'vs/workbench/common/contextkeys';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { contrastBorder } from 'vs/platform/theme/common/colorRegistry';
-import { SIDE_BAR_TITLE_FOREGROUND, SIDE_BAR_BACKGROUND, SIDE_BAR_FOREGROUND, SIDE_BAR_BORDER, SIDE_BAR_DRAG_AND_DROP_BACKGROUND, ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND, ACTIVITY_BAR_TOP_FOREGROUND, ACTIVITY_BAR_TOP_ACTIVE_BORDER, ACTIVITY_BAR_TOP_INACTIVE_FOREGROUND, ACTIVITY_BAR_TOP_DRAG_AND_DROP_BORDER } from 'vs/workbench/common/theme';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { AnchorAlignment } from 'vs/base/browser/ui/contextview/contextview';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { LayoutPriority } from 'vs/base/browser/ui/grid/grid';
-import { assertIsDefined } from 'vs/base/common/types';
-import { IViewDescriptorService } from 'vs/workbench/common/views';
-import { AbstractPaneCompositePart, CompositeBarPosition } from 'vs/workbench/browser/parts/paneCompositePart';
-import { ActivityBarCompositeBar, ActivitybarPart } from 'vs/workbench/browser/parts/activitybar/activitybarPart';
-import { ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
-import { HoverPosition } from 'vs/base/browser/ui/hover/hoverWidget';
-import { IPaneCompositeBarOptions } from 'vs/workbench/browser/parts/paneCompositeBar';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { Action2, IMenuService, registerAction2 } from 'vs/platform/actions/common/actions';
-import { Separator } from 'vs/base/common/actions';
-import { ToggleActivityBarVisibilityActionId } from 'vs/workbench/browser/actions/layoutActions';
-import { localize2 } from 'vs/nls';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import './media/sidebarpart.css';
+import './sidebarActions.js';
+import { ActivityBarPosition, IWorkbenchLayoutService, LayoutSettings, Parts, Position as SideBarPosition } from '../../../services/layout/browser/layoutService.js';
+import { SidebarFocusContext, ActiveViewletContext } from '../../../common/contextkeys.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { contrastBorder } from '../../../../platform/theme/common/colorRegistry.js';
+import { SIDE_BAR_TITLE_FOREGROUND, SIDE_BAR_BACKGROUND, SIDE_BAR_FOREGROUND, SIDE_BAR_BORDER, SIDE_BAR_DRAG_AND_DROP_BACKGROUND, ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND, ACTIVITY_BAR_TOP_FOREGROUND, ACTIVITY_BAR_TOP_ACTIVE_BORDER, ACTIVITY_BAR_TOP_INACTIVE_FOREGROUND, ACTIVITY_BAR_TOP_DRAG_AND_DROP_BORDER } from '../../../common/theme.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { AnchorAlignment } from '../../../../base/browser/ui/contextview/contextview.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { LayoutPriority } from '../../../../base/browser/ui/grid/grid.js';
+import { assertIsDefined } from '../../../../base/common/types.js';
+import { IViewDescriptorService } from '../../../common/views.js';
+import { AbstractPaneCompositePart, CompositeBarPosition } from '../paneCompositePart.js';
+import { ActivityBarCompositeBar, ActivitybarPart } from '../activitybar/activitybarPart.js';
+import { ActionsOrientation } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { HoverPosition } from '../../../../base/browser/ui/hover/hoverWidget.js';
+import { IPaneCompositeBarOptions } from '../paneCompositeBar.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { Action2, IMenuService, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { Separator } from '../../../../base/common/actions.js';
+import { ToggleActivityBarVisibilityActionId } from '../../actions/layoutActions.js';
+import { localize2 } from '../../../../nls.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 
 export class SidebarPart extends AbstractPaneCompositePart {
 
diff --git a/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css b/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css
index d6897bf02d7..b30d2bee088 100644
--- a/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css
+++ b/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css
@@ -88,6 +88,11 @@
 	margin-left: 3px;
 }
 
+.monaco-workbench .part.statusbar > .items-container > .statusbar-item.compact-left.compact-right > .statusbar-item-label {
+	margin-right:0;
+	margin-left: 0;
+}
+
 .monaco-workbench .part.statusbar > .items-container > .statusbar-item.left.first-visible-item {
 	padding-left: 7px; /* Add padding to the most left status bar item */
 }
diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarActions.ts b/src/vs/workbench/browser/parts/statusbar/statusbarActions.ts
index 831d600e896..55117c9fee2 100644
--- a/src/vs/workbench/browser/parts/statusbar/statusbarActions.ts
+++ b/src/vs/workbench/browser/parts/statusbar/statusbarActions.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize, localize2 } from 'vs/nls';
-import { IStatusbarService } from 'vs/workbench/services/statusbar/browser/statusbar';
-import { Action } from 'vs/base/common/actions';
-import { Parts, IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { StatusbarViewModel } from 'vs/workbench/browser/parts/statusbar/statusbarModel';
-import { StatusBarFocused } from 'vs/workbench/common/contextkeys';
-import { getActiveWindow } from 'vs/base/browser/dom';
+import { localize, localize2 } from '../../../../nls.js';
+import { IStatusbarService } from '../../../services/statusbar/browser/statusbar.js';
+import { Action } from '../../../../base/common/actions.js';
+import { Parts, IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
+import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { StatusbarViewModel } from './statusbarModel.js';
+import { StatusBarFocused } from '../../../common/contextkeys.js';
+import { getActiveWindow } from '../../../../base/browser/dom.js';
 
 export class ToggleStatusbarEntryVisibilityAction extends Action {
 
diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarItem.ts b/src/vs/workbench/browser/parts/statusbar/statusbarItem.ts
index d458ce91e79..7003142a183 100644
--- a/src/vs/workbench/browser/parts/statusbar/statusbarItem.ts
+++ b/src/vs/workbench/browser/parts/statusbar/statusbarItem.ts
@@ -3,29 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { SimpleIconLabel } from 'vs/base/browser/ui/iconLabel/simpleIconLabel';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IStatusbarEntry, ShowTooltipCommand, StatusbarEntryKinds } from 'vs/workbench/services/statusbar/browser/statusbar';
-import { WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification } from 'vs/base/common/actions';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ThemeColor } from 'vs/base/common/themables';
-import { isThemeColor } from 'vs/editor/common/editorCommon';
-import { addDisposableListener, EventType, hide, show, append, EventHelper } from 'vs/base/browser/dom';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { assertIsDefined } from 'vs/base/common/types';
-import { Command } from 'vs/editor/common/languages';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { renderIcon, renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
-import { spinningLoading, syncing } from 'vs/platform/theme/common/iconRegistry';
-import { isMarkdownString, markdownStringEqual } from 'vs/base/common/htmlContent';
-import { IHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate';
-import { Gesture, EventType as TouchEventType } from 'vs/base/browser/touch';
-import type { IManagedHover } from 'vs/base/browser/ui/hover/hover';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import { toErrorMessage } from '../../../../base/common/errorMessage.js';
+import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { SimpleIconLabel } from '../../../../base/browser/ui/iconLabel/simpleIconLabel.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IStatusbarEntry, ShowTooltipCommand, StatusbarEntryKinds } from '../../../services/statusbar/browser/statusbar.js';
+import { WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification } from '../../../../base/common/actions.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ThemeColor } from '../../../../base/common/themables.js';
+import { isThemeColor } from '../../../../editor/common/editorCommon.js';
+import { addDisposableListener, EventType, hide, show, append, EventHelper } from '../../../../base/browser/dom.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { assertIsDefined } from '../../../../base/common/types.js';
+import { Command } from '../../../../editor/common/languages.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { renderIcon, renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { spinningLoading, syncing } from '../../../../platform/theme/common/iconRegistry.js';
+import { isMarkdownString, markdownStringEqual } from '../../../../base/common/htmlContent.js';
+import { IHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegate.js';
+import { Gesture, EventType as TouchEventType } from '../../../../base/browser/touch.js';
+import type { IManagedHover } from '../../../../base/browser/ui/hover/hover.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 
 export class StatusbarEntryItem extends Disposable {
 
@@ -39,8 +39,6 @@ export class StatusbarEntryItem extends Disposable {
 	private readonly commandMouseListener = this._register(new MutableDisposable());
 	private readonly commandTouchListener = this._register(new MutableDisposable());
 	private readonly commandKeyboardListener = this._register(new MutableDisposable());
-	private readonly focusListener = this._register(new MutableDisposable());
-	private readonly focusOutListener = this._register(new MutableDisposable());
 
 	private hover: IManagedHover | undefined = undefined;
 
@@ -124,16 +122,6 @@ export class StatusbarEntryItem extends Disposable {
 			} else {
 				this.hover = this._register(this.hoverService.setupManagedHover(this.hoverDelegate, this.container, hoverContents));
 			}
-			if (entry.command !== ShowTooltipCommand /* prevents flicker on click */) {
-				this.focusListener.value = addDisposableListener(this.labelContainer, EventType.FOCUS, e => {
-					EventHelper.stop(e);
-					this.hover?.show(false);
-				});
-				this.focusOutListener.value = addDisposableListener(this.labelContainer, EventType.FOCUS_OUT, e => {
-					EventHelper.stop(e);
-					this.hover?.hide();
-				});
-			}
 		}
 
 		// Update: Command
diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarModel.ts b/src/vs/workbench/browser/parts/statusbar/statusbarModel.ts
index 8fd7e353217..55d52a8bd07 100644
--- a/src/vs/workbench/browser/parts/statusbar/statusbarModel.ts
+++ b/src/vs/workbench/browser/parts/statusbar/statusbarModel.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { isStatusbarEntryLocation, IStatusbarEntryPriority, StatusbarAlignment } from 'vs/workbench/services/statusbar/browser/statusbar';
-import { hide, show, isAncestorOfActiveElement } from 'vs/base/browser/dom';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { Emitter } from 'vs/base/common/event';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { isStatusbarEntryLocation, IStatusbarEntryPriority, StatusbarAlignment } from '../../../services/statusbar/browser/statusbar.js';
+import { hide, show, isAncestorOfActiveElement } from '../../../../base/browser/dom.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { Emitter } from '../../../../base/common/event.js';
 
 export interface IStatusbarViewModelEntry {
 	readonly id: string;
@@ -258,19 +258,34 @@ export class StatusbarViewModel extends Disposable {
 		// - those with `priority: number` that can be compared
 		// - those with `priority: string` that must be sorted
 		//   relative to another entry if possible
-		const mapEntryWithNumberedPriorityToIndex = new Map<IStatusbarViewModelEntry, number /* index of entry */>();
-		const mapEntryWithRelativePriority = new Map<string /* priority of entry */, IStatusbarViewModelEntry[]>();
+		const mapEntryWithNumberedPriorityToIndex = new Map<IStatusbarViewModelEntry, number /* priority of entry as number */>();
+		const mapEntryWithRelativePriority = new Map<string /* id of entry to position after */, Map<string, IStatusbarViewModelEntry>>();
 		for (let i = 0; i < this._entries.length; i++) {
 			const entry = this._entries[i];
 			if (typeof entry.priority.primary === 'number') {
 				mapEntryWithNumberedPriorityToIndex.set(entry, i);
 			} else {
-				let entries = mapEntryWithRelativePriority.get(entry.priority.primary.id);
+				const referenceEntryId = entry.priority.primary.id;
+				let entries = mapEntryWithRelativePriority.get(referenceEntryId);
 				if (!entries) {
-					entries = [];
-					mapEntryWithRelativePriority.set(entry.priority.primary.id, entries);
+
+					// It is possible that this entry references another entry
+					// that itself references an entry. In that case, we want
+					// to add it to the entries of the referenced entry.
+
+					for (const relativeEntries of mapEntryWithRelativePriority.values()) {
+						if (relativeEntries.has(referenceEntryId)) {
+							entries = relativeEntries;
+							break;
+						}
+					}
+
+					if (!entries) {
+						entries = new Map();
+						mapEntryWithRelativePriority.set(referenceEntryId, entries);
+					}
 				}
-				entries.push(entry);
+				entries.set(entry.id, entry);
 			}
 		}
 
@@ -311,7 +326,8 @@ export class StatusbarViewModel extends Disposable {
 			sortedEntries = [];
 
 			for (const entry of sortedEntriesWithNumberedPriority) {
-				const relativeEntries = mapEntryWithRelativePriority.get(entry.id);
+				const relativeEntriesMap = mapEntryWithRelativePriority.get(entry.id);
+				const relativeEntries = relativeEntriesMap ? Array.from(relativeEntriesMap.values()) : undefined;
 
 				// Fill relative entries to LEFT
 				if (relativeEntries) {
@@ -333,7 +349,7 @@ export class StatusbarViewModel extends Disposable {
 			// Finally, just append all entries that reference another entry
 			// that does not exist to the end of the list
 			for (const [, entries] of mapEntryWithRelativePriority) {
-				sortedEntries.push(...entries);
+				sortedEntries.push(...entries.values());
 			}
 		}
 
diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
index f938ea7b353..a1182f5bd0e 100644
--- a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
+++ b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
@@ -3,37 +3,37 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/statusbarpart';
-import { localize } from 'vs/nls';
-import { Disposable, DisposableStore, dispose, disposeIfDisposable, IDisposable, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { MultiWindowParts, Part } from 'vs/workbench/browser/part';
-import { EventType as TouchEventType, Gesture, GestureEvent } from 'vs/base/browser/touch';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { StatusbarAlignment, IStatusbarService, IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarStyleOverride, isStatusbarEntryLocation, IStatusbarEntryLocation, isStatusbarEntryPriority, IStatusbarEntryPriority } from 'vs/workbench/services/statusbar/browser/statusbar';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IAction, Separator, toAction } from 'vs/base/common/actions';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { STATUS_BAR_BACKGROUND, STATUS_BAR_FOREGROUND, STATUS_BAR_NO_FOLDER_BACKGROUND, STATUS_BAR_ITEM_HOVER_BACKGROUND, STATUS_BAR_BORDER, STATUS_BAR_NO_FOLDER_FOREGROUND, STATUS_BAR_NO_FOLDER_BORDER, STATUS_BAR_ITEM_COMPACT_HOVER_BACKGROUND, STATUS_BAR_ITEM_FOCUS_BORDER, STATUS_BAR_FOCUS_BORDER } from 'vs/workbench/common/theme';
-import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { contrastBorder, activeContrastBorder } from 'vs/platform/theme/common/colorRegistry';
-import { EventHelper, createStyleSheet, addDisposableListener, EventType, clearNode, getWindow } from 'vs/base/browser/dom';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { Parts, IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { equals } from 'vs/base/common/arrays';
-import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { ToggleStatusbarVisibilityAction } from 'vs/workbench/browser/actions/layoutActions';
-import { assertIsDefined } from 'vs/base/common/types';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { isHighContrast } from 'vs/platform/theme/common/theme';
-import { hash } from 'vs/base/common/hash';
-import { WorkbenchHoverDelegate } from 'vs/platform/hover/browser/hover';
-import { HideStatusbarEntryAction, ToggleStatusbarEntryVisibilityAction } from 'vs/workbench/browser/parts/statusbar/statusbarActions';
-import { IStatusbarViewModelEntry, StatusbarViewModel } from 'vs/workbench/browser/parts/statusbar/statusbarModel';
-import { StatusbarEntryItem } from 'vs/workbench/browser/parts/statusbar/statusbarItem';
-import { StatusBarFocused } from 'vs/workbench/common/contextkeys';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IView } from 'vs/base/browser/ui/grid/grid';
+import './media/statusbarpart.css';
+import { localize } from '../../../../nls.js';
+import { Disposable, DisposableStore, dispose, disposeIfDisposable, IDisposable, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { MultiWindowParts, Part } from '../../part.js';
+import { EventType as TouchEventType, Gesture, GestureEvent } from '../../../../base/browser/touch.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { StatusbarAlignment, IStatusbarService, IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarStyleOverride, isStatusbarEntryLocation, IStatusbarEntryLocation, isStatusbarEntryPriority, IStatusbarEntryPriority } from '../../../services/statusbar/browser/statusbar.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IAction, Separator, toAction } from '../../../../base/common/actions.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { STATUS_BAR_BACKGROUND, STATUS_BAR_FOREGROUND, STATUS_BAR_NO_FOLDER_BACKGROUND, STATUS_BAR_ITEM_HOVER_BACKGROUND, STATUS_BAR_BORDER, STATUS_BAR_NO_FOLDER_FOREGROUND, STATUS_BAR_NO_FOLDER_BORDER, STATUS_BAR_ITEM_COMPACT_HOVER_BACKGROUND, STATUS_BAR_ITEM_FOCUS_BORDER, STATUS_BAR_FOCUS_BORDER } from '../../../common/theme.js';
+import { IWorkspaceContextService, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { contrastBorder, activeContrastBorder } from '../../../../platform/theme/common/colorRegistry.js';
+import { EventHelper, createStyleSheet, addDisposableListener, EventType, clearNode, getWindow } from '../../../../base/browser/dom.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { Parts, IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { equals } from '../../../../base/common/arrays.js';
+import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
+import { ToggleStatusbarVisibilityAction } from '../../actions/layoutActions.js';
+import { assertIsDefined } from '../../../../base/common/types.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { isHighContrast } from '../../../../platform/theme/common/theme.js';
+import { hash } from '../../../../base/common/hash.js';
+import { WorkbenchHoverDelegate } from '../../../../platform/hover/browser/hover.js';
+import { HideStatusbarEntryAction, ToggleStatusbarEntryVisibilityAction } from './statusbarActions.js';
+import { IStatusbarViewModelEntry, StatusbarViewModel } from './statusbarModel.js';
+import { StatusbarEntryItem } from './statusbarItem.js';
+import { StatusBarFocused } from '../../../common/contextkeys.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { IView } from '../../../../base/browser/ui/grid/grid.js';
 
 export interface IStatusbarEntryContainer extends IDisposable {
 
@@ -433,7 +433,7 @@ class StatusbarPart extends Part implements IStatusbarEntryContainer {
 		}
 
 		// Figure out groups of entries with `compact` alignment
-		const compactEntryGroups = new Map<string, Set<IStatusbarViewModelEntry>>();
+		const compactEntryGroups = new Map<string, Map<string, IStatusbarViewModelEntry>>();
 		for (const entry of mapIdToVisibleEntry.values()) {
 			if (
 				isStatusbarEntryLocation(entry.priority.primary) && // entry references another entry as location
@@ -448,11 +448,25 @@ class StatusbarPart extends Part implements IStatusbarEntryContainer {
 				// Build a map of entries that are compact among each other
 				let compactEntryGroup = compactEntryGroups.get(locationId);
 				if (!compactEntryGroup) {
-					compactEntryGroup = new Set<IStatusbarViewModelEntry>([entry, location]);
-					compactEntryGroups.set(locationId, compactEntryGroup);
-				} else {
-					compactEntryGroup.add(entry);
+
+					// It is possible that this entry references another entry
+					// that itself references an entry. In that case, we want
+					// to add it to the entries of the referenced entry.
+
+					for (const group of compactEntryGroups.values()) {
+						if (group.has(locationId)) {
+							compactEntryGroup = group;
+							break;
+						}
+					}
+
+					if (!compactEntryGroup) {
+						compactEntryGroup = new Map<string, IStatusbarViewModelEntry>();
+						compactEntryGroups.set(locationId, compactEntryGroup);
+					}
 				}
+				compactEntryGroup.set(entry.id, entry);
+				compactEntryGroup.set(location.id, location);
 
 				// Adjust CSS classes to move compact items closer together
 				if (entry.priority.primary.alignment === StatusbarAlignment.LEFT) {
@@ -465,7 +479,6 @@ class StatusbarPart extends Part implements IStatusbarEntryContainer {
 			}
 		}
 
-
 		// Install mouse listeners to update hover feedback for
 		// all compact entries that belong to each other
 		const statusBarItemHoverBackground = this.getColor(STATUS_BAR_ITEM_HOVER_BACKGROUND);
@@ -473,7 +486,7 @@ class StatusbarPart extends Part implements IStatusbarEntryContainer {
 		this.compactEntriesDisposable.value = new DisposableStore();
 		if (statusBarItemHoverBackground && statusBarItemCompactHoverBackground && !isHighContrast(this.theme.type)) {
 			for (const [, compactEntryGroup] of compactEntryGroups) {
-				for (const compactEntry of compactEntryGroup) {
+				for (const compactEntry of compactEntryGroup.values()) {
 					if (!compactEntry.hasCommand) {
 						continue; // only show hover feedback when we have a command
 					}
diff --git a/src/vs/workbench/browser/parts/titlebar/commandCenterControl.ts b/src/vs/workbench/browser/parts/titlebar/commandCenterControl.ts
index 88d5435936b..81db9ad010a 100644
--- a/src/vs/workbench/browser/parts/titlebar/commandCenterControl.ts
+++ b/src/vs/workbench/browser/parts/titlebar/commandCenterControl.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isActiveDocument, reset } from 'vs/base/browser/dom';
-import { BaseActionViewItem, IBaseActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { IHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate';
-import { renderIcon } from 'vs/base/browser/ui/iconLabel/iconLabels';
-import { IAction, SubmenuAction } from 'vs/base/common/actions';
-import { Codicon } from 'vs/base/common/codicons';
-import { Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { localize } from 'vs/nls';
-import { createActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { HiddenItemStrategy, MenuWorkbenchToolBar, WorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
-import { MenuId, MenuRegistry, SubmenuItemAction } from 'vs/platform/actions/common/actions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { WindowTitle } from 'vs/workbench/browser/parts/titlebar/windowTitle';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import { isActiveDocument, reset } from '../../../../base/browser/dom.js';
+import { BaseActionViewItem, IBaseActionViewItemOptions } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { IHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegate.js';
+import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { IAction, SubmenuAction } from '../../../../base/common/actions.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { localize } from '../../../../nls.js';
+import { createActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { HiddenItemStrategy, MenuWorkbenchToolBar, WorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
+import { MenuId, MenuRegistry, SubmenuItemAction } from '../../../../platform/actions/common/actions.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { WindowTitle } from './windowTitle.js';
+import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 
 export class CommandCenterControl {
 
@@ -141,7 +141,7 @@ class CommandCenterCenterViewItem extends BaseActionViewItem {
 						override render(container: HTMLElement): void {
 							super.render(container);
 							container.classList.toggle('command-center-quick-pick');
-
+							container.role = 'button';
 							const action = this.action;
 
 							// icon (search)
diff --git a/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css b/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css
index 15afa9df6bf..4857ef2ef62 100644
--- a/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css
+++ b/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css
@@ -134,15 +134,15 @@
 	visibility: hidden;
 }
 
-.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center > .monaco-toolbar > .monaco-action-bar > .actions-container > .action-item > .action-label {
+.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center > .monaco-toolbar > .monaco-action-bar > .actions-container > .action-item .action-label {
 	color: var(--vscode-titleBar-activeForeground);
 }
 
-.monaco-workbench .part.titlebar.inactive > .titlebar-container > .titlebar-center > .window-title > .command-center > .monaco-toolbar > .monaco-action-bar > .actions-container > .action-item > .action-label  {
+.monaco-workbench .part.titlebar.inactive > .titlebar-container > .titlebar-center > .window-title > .command-center > .monaco-toolbar > .monaco-action-bar > .actions-container > .action-item .action-label {
 	color: var(--vscode-titleBar-inactiveForeground);
 }
 
-.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center > .monaco-toolbar > .monaco-action-bar > .actions-container > .action-item > .action-label  {
+.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center > .monaco-toolbar > .monaco-action-bar > .actions-container > .action-item > .action-label {
 	color: inherit;
 }
 
@@ -153,7 +153,7 @@
 	background-color: var(--vscode-commandCenter-background);
 	border: 1px solid var(--vscode-commandCenter-border);
 	overflow: hidden;
-	margin-left: 6px;
+	margin: 0 6px;
 	border-top-left-radius: 6px;
 	border-bottom-left-radius: 6px;
 	border-top-right-radius: 6px;
@@ -175,6 +175,11 @@
 	font-size: 14px;
 	opacity: .8;
 	margin: auto 3px;
+	color: var(--vscode-commandCenter-foreground);
+}
+
+.monaco-workbench .part.titlebar.inactive > .titlebar-container > .titlebar-center > .window-title > .command-center .action-item.command-center-center .action-item.command-center-quick-pick .search-icon {
+	color: var(--vscode-titleBar-inactiveForeground);
 }
 
 .monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center .action-item.command-center-center .action-item.command-center-quick-pick .search-label {
@@ -182,7 +187,7 @@
 	text-overflow: ellipsis;
 }
 
-.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center .action-item.command-center-center.multiple  {
+.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center .action-item.command-center-center.multiple {
 	justify-content: flex-start;
 	padding: 0 12px;
 }
@@ -200,6 +205,10 @@
 	border-color: var(--vscode-commandCenter-inactiveBorder) !important;
 }
 
+.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center .codicon-copilot {
+	font-size: 14px;
+}
+
 .monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center .action-item.command-center-center:HOVER {
 	color: var(--vscode-commandCenter-activeForeground);
 	background-color: var(--vscode-commandCenter-activeBackground);
@@ -280,7 +289,7 @@
 	border-left: 1px solid transparent;
 }
 
-/* Window Controls (Minimize, Max/Restore, Close) */
+/* Window Controls Container */
 .monaco-workbench .part.titlebar .window-controls-container {
 	display: flex;
 	flex-grow: 0;
@@ -292,7 +301,12 @@
 	height: 100%;
 }
 
-/* Web WCO Sizing/Ordering */
+.monaco-workbench.fullscreen .part.titlebar .window-controls-container {
+	display: none;
+	background-color: transparent;
+}
+
+/* Window Controls Container Web: Apply WCO environment variables (https://developer.mozilla.org/en-US/docs/Web/CSS/env#titlebar-area-x) */
 .monaco-workbench.web .part.titlebar .titlebar-right .window-controls-container {
 	width: calc(100vw - env(titlebar-area-width, 100vw) - env(titlebar-area-x, 0px));
 	height: env(titlebar-area-height, 35px);
@@ -311,29 +325,31 @@
 	order: 1;
 }
 
-/* Desktop Windows/Linux Window Controls*/
-.monaco-workbench:not(.web):not(.mac) .part.titlebar .window-controls-container.primary {
+/* Window Controls Container Desktop: apply zoom friendly size */
+.monaco-workbench:not(.web):not(.mac) .part.titlebar .window-controls-container {
 	width: calc(138px / var(--zoom-factor, 1));
 }
 
-.monaco-workbench:not(.web):not(.mac) .part.titlebar .titlebar-container.counter-zoom .window-controls-container.primary {
+.monaco-workbench:not(.web):not(.mac) .part.titlebar .titlebar-container.counter-zoom .window-controls-container {
 	width: 138px;
 }
 
+.monaco-workbench.linux:not(.web) .part.titlebar .window-controls-container.wco-enabled {
+	width: calc(100vw - env(titlebar-area-width, 100vw) - env(titlebar-area-x, 0px));
+}
+
+.monaco-workbench.linux:not(.web) .part.titlebar .titlebar-container.counter-zoom .window-controls-container.wco-enabled {
+	width: calc(100vw - env(titlebar-area-width, 100vw) - env(titlebar-area-x, 0px));
+}
+
 .monaco-workbench:not(.web):not(.mac) .part.titlebar .titlebar-container:not(.counter-zoom) .window-controls-container * {
 	zoom: calc(1 / var(--zoom-factor, 1));
 }
 
-/* Desktop macOS Window Controls */
-.monaco-workbench:not(.web).mac .part.titlebar .window-controls-container.primary {
+.monaco-workbench:not(.web).mac .part.titlebar .window-controls-container {
 	width: 70px;
 }
 
-.monaco-workbench.fullscreen .part.titlebar .window-controls-container {
-	display: none;
-	background-color: transparent;
-}
-
 /* Window Control Icons */
 .monaco-workbench .part.titlebar .window-controls-container > .window-icon {
 	display: flex;
@@ -342,6 +358,11 @@
 	height: 100%;
 	width: 46px;
 	font-size: 16px;
+	color: var(--vscode-titleBar-activeForeground);
+}
+
+.monaco-workbench .part.titlebar.inactive .window-controls-container > .window-icon {
+	color: var(--vscode-titleBar-inactiveForeground);
 }
 
 .monaco-workbench .part.titlebar .window-controls-container > .window-icon::before {
@@ -376,7 +397,6 @@
 	z-index: 2500;
 	-webkit-app-region: no-drag;
 	height: 100%;
-	min-width: 28px;
 }
 
 .monaco-workbench .part.titlebar > .titlebar-container > .titlebar-right > .action-toolbar-container {
@@ -455,11 +475,3 @@
 	border-radius: 16px;
 	text-align: center;
 }
-
-.monaco-workbench .part.titlebar .window-controls-container .window-icon {
-	color: var(--vscode-titleBar-activeForeground);
-}
-
-.monaco-workbench .part.titlebar.inactive .window-controls-container .window-icon {
-	color: var(--vscode-titleBar-inactiveForeground);
-}
diff --git a/src/vs/workbench/browser/parts/titlebar/menubarControl.ts b/src/vs/workbench/browser/parts/titlebar/menubarControl.ts
index 23fe9a5b1b4..f495bad700a 100644
--- a/src/vs/workbench/browser/parts/titlebar/menubarControl.ts
+++ b/src/vs/workbench/browser/parts/titlebar/menubarControl.ts
@@ -3,45 +3,45 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/menubarControl';
-import { localize, localize2 } from 'vs/nls';
-import { IMenuService, MenuId, IMenu, SubmenuItemAction, registerAction2, Action2, MenuItemAction, MenuRegistry } from 'vs/platform/actions/common/actions';
-import { MenuBarVisibility, IWindowOpenable, getMenuBarVisibility, hasNativeTitlebar, TitleBarSetting } from 'vs/platform/window/common/window';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IAction, Action, SubmenuAction, Separator, IActionRunner, ActionRunner, WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification, toAction } from 'vs/base/common/actions';
-import { addDisposableListener, Dimension, EventType } from 'vs/base/browser/dom';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { isMacintosh, isWeb, isIOS, isNative } from 'vs/base/common/platform';
-import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
-import { Event, Emitter } from 'vs/base/common/event';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { IRecentlyOpened, isRecentFolder, IRecent, isRecentWorkspace, IWorkspacesService } from 'vs/platform/workspaces/common/workspaces';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { URI } from 'vs/base/common/uri';
-import { ILabelService, Verbosity } from 'vs/platform/label/common/label';
-import { IUpdateService, StateType } from 'vs/platform/update/common/update';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { MenuBar, IMenuBarOptions } from 'vs/base/browser/ui/menu/menubar';
-import { HorizontalDirection, IMenuDirection, VerticalDirection } from 'vs/base/browser/ui/menu/menu';
-import { mnemonicMenuLabel, unmnemonicLabel } from 'vs/base/common/labels';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { isFullscreen, onDidChangeFullscreen } from 'vs/base/browser/browser';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { BrowserFeatures } from 'vs/base/browser/canIUse';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { IsMacNativeContext, IsWebContext } from 'vs/platform/contextkey/common/contextkeys';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { OpenRecentAction } from 'vs/workbench/browser/actions/windowActions';
-import { isICommandActionToggleInfo } from 'vs/platform/action/common/action';
-import { createAndFillInContextMenuActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { defaultMenuStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { mainWindow } from 'vs/base/browser/window';
-import { ActivityBarPosition } from 'vs/workbench/services/layout/browser/layoutService';
+import './media/menubarControl.css';
+import { localize, localize2 } from '../../../../nls.js';
+import { IMenuService, MenuId, IMenu, SubmenuItemAction, registerAction2, Action2, MenuItemAction, MenuRegistry } from '../../../../platform/actions/common/actions.js';
+import { MenuBarVisibility, IWindowOpenable, getMenuBarVisibility, hasNativeTitlebar, TitleBarSetting } from '../../../../platform/window/common/window.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IAction, Action, SubmenuAction, Separator, IActionRunner, ActionRunner, WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification, toAction } from '../../../../base/common/actions.js';
+import { addDisposableListener, Dimension, EventType } from '../../../../base/browser/dom.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { isMacintosh, isWeb, isIOS, isNative } from '../../../../base/common/platform.js';
+import { IConfigurationService, IConfigurationChangeEvent } from '../../../../platform/configuration/common/configuration.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { IRecentlyOpened, isRecentFolder, IRecent, isRecentWorkspace, IWorkspacesService } from '../../../../platform/workspaces/common/workspaces.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ILabelService, Verbosity } from '../../../../platform/label/common/label.js';
+import { IUpdateService, StateType } from '../../../../platform/update/common/update.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { MenuBar, IMenuBarOptions } from '../../../../base/browser/ui/menu/menubar.js';
+import { HorizontalDirection, IMenuDirection, VerticalDirection } from '../../../../base/browser/ui/menu/menu.js';
+import { mnemonicMenuLabel, unmnemonicLabel } from '../../../../base/common/labels.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { isFullscreen, onDidChangeFullscreen } from '../../../../base/browser/browser.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { BrowserFeatures } from '../../../../base/browser/canIUse.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IsMacNativeContext, IsWebContext } from '../../../../platform/contextkey/common/contextkeys.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { OpenRecentAction } from '../../actions/windowActions.js';
+import { isICommandActionToggleInfo } from '../../../../platform/action/common/action.js';
+import { createAndFillInContextMenuActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { defaultMenuStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { ActivityBarPosition } from '../../../services/layout/browser/layoutService.js';
 
 export type IOpenRecentAction = IAction & { uri: URI; remoteAuthority?: string };
 
@@ -372,6 +372,35 @@ export abstract class MenubarControl extends Disposable {
 	}
 }
 
+// This is a bit complex due to the issue https://github.com/microsoft/vscode/issues/205836
+let focusMenuBarEmitter: Emitter<void> | undefined = undefined;
+function enableFocusMenuBarAction(): Emitter<void> {
+	if (!focusMenuBarEmitter) {
+		focusMenuBarEmitter = new Emitter<void>();
+
+		registerAction2(class extends Action2 {
+			constructor() {
+				super({
+					id: `workbench.actions.menubar.focus`,
+					title: localize2('focusMenu', 'Focus Application Menu'),
+					keybinding: {
+						primary: KeyMod.Alt | KeyCode.F10,
+						weight: KeybindingWeight.WorkbenchContrib,
+						when: IsWebContext
+					},
+					f1: true
+				});
+			}
+
+			async run(): Promise<void> {
+				focusMenuBarEmitter?.fire();
+			}
+		});
+	}
+
+	return focusMenuBarEmitter;
+}
+
 export class CustomMenubarControl extends MenubarControl {
 	private menubar: MenuBar | undefined;
 	private container: HTMLElement | undefined;
@@ -417,8 +446,6 @@ export class CustomMenubarControl extends MenubarControl {
 		});
 
 		this.registerListeners();
-
-		this.registerActions();
 	}
 
 	protected doUpdateMenubar(firstTime: boolean): void {
@@ -431,31 +458,6 @@ export class CustomMenubarControl extends MenubarControl {
 		}
 	}
 
-	private registerActions(): void {
-		const that = this;
-
-		if (isWeb) {
-			this._register(registerAction2(class extends Action2 {
-				constructor() {
-					super({
-						id: `workbench.actions.menubar.focus`,
-						title: localize2('focusMenu', 'Focus Application Menu'),
-						keybinding: {
-							primary: KeyMod.Alt | KeyCode.F10,
-							weight: KeybindingWeight.WorkbenchContrib,
-							when: IsWebContext
-						},
-						f1: true
-					});
-				}
-
-				async run(): Promise<void> {
-					that.menubar?.toggleFocus();
-				}
-			}));
-		}
-	}
-
 	private getUpdateAction(): IAction | null {
 		const state = this.updateService.state;
 
@@ -808,6 +810,7 @@ export class CustomMenubarControl extends MenubarControl {
 				}
 			}));
 			this._register(this.webNavigationMenu.onDidChange(() => this.updateMenubar()));
+			this._register(enableFocusMenuBarAction().event(() => this.menubar?.toggleFocus()));
 		}
 	}
 
diff --git a/src/vs/workbench/browser/parts/titlebar/titlebarActions.ts b/src/vs/workbench/browser/parts/titlebar/titlebarActions.ts
index 16832936d7c..3963caef06e 100644
--- a/src/vs/workbench/browser/parts/titlebar/titlebarActions.ts
+++ b/src/vs/workbench/browser/parts/titlebar/titlebarActions.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ILocalizedString, localize, localize2 } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { LayoutSettings } from 'vs/workbench/services/layout/browser/layoutService';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ACCOUNTS_ACTIVITY_ID, GLOBAL_ACTIVITY_ID } from 'vs/workbench/common/activity';
-import { IAction } from 'vs/base/common/actions';
-import { IsAuxiliaryWindowFocusedContext, IsMainWindowFullscreenContext, TitleBarStyleContext, TitleBarVisibleContext } from 'vs/workbench/common/contextkeys';
-import { CustomTitleBarVisibility, TitleBarSetting, TitlebarStyle } from 'vs/platform/window/common/window';
+import { ILocalizedString, localize, localize2 } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { LayoutSettings } from '../../../services/layout/browser/layoutService.js';
+import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { ACCOUNTS_ACTIVITY_ID, GLOBAL_ACTIVITY_ID } from '../../../common/activity.js';
+import { IAction } from '../../../../base/common/actions.js';
+import { IsAuxiliaryWindowFocusedContext, IsMainWindowFullscreenContext, TitleBarStyleContext, TitleBarVisibleContext } from '../../../common/contextkeys.js';
+import { CustomTitleBarVisibility, TitleBarSetting, TitlebarStyle } from '../../../../platform/window/common/window.js';
 
 // --- Context Menu Actions --- //
 
diff --git a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
index 80c99f1557d..e49557028f8 100644
--- a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
+++ b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
@@ -3,58 +3,59 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/titlebarpart';
-import { localize, localize2 } from 'vs/nls';
-import { MultiWindowParts, Part } from 'vs/workbench/browser/part';
-import { ITitleService } from 'vs/workbench/services/title/browser/titleService';
-import { getZoomFactor, isWCOEnabled } from 'vs/base/browser/browser';
-import { MenuBarVisibility, getTitleBarStyle, getMenuBarVisibility, TitlebarStyle, hasCustomTitlebar, hasNativeTitlebar, DEFAULT_CUSTOM_TITLEBAR_HEIGHT } from 'vs/platform/window/common/window';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { TITLE_BAR_ACTIVE_BACKGROUND, TITLE_BAR_ACTIVE_FOREGROUND, TITLE_BAR_INACTIVE_FOREGROUND, TITLE_BAR_INACTIVE_BACKGROUND, TITLE_BAR_BORDER, WORKBENCH_BACKGROUND } from 'vs/workbench/common/theme';
-import { isMacintosh, isWindows, isLinux, isWeb, isNative, platformLocale } from 'vs/base/common/platform';
-import { Color } from 'vs/base/common/color';
-import { EventType, EventHelper, Dimension, append, $, addDisposableListener, prepend, reset, getWindow, getWindowId, isAncestor, getActiveDocument, isHTMLElement } from 'vs/base/browser/dom';
-import { CustomMenubarControl } from 'vs/workbench/browser/parts/titlebar/menubarControl';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
-import { Parts, IWorkbenchLayoutService, ActivityBarPosition, LayoutSettings, EditorActionsLocation, EditorTabsMode } from 'vs/workbench/services/layout/browser/layoutService';
-import { createActionViewItem, createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { Action2, IMenu, IMenuService, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { Codicon } from 'vs/base/common/codicons';
-import { getIconRegistry } from 'vs/platform/theme/common/iconRegistry';
-import { WindowTitle } from 'vs/workbench/browser/parts/titlebar/windowTitle';
-import { CommandCenterControl } from 'vs/workbench/browser/parts/titlebar/commandCenterControl';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { WorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
-import { ACCOUNTS_ACTIVITY_ID, GLOBAL_ACTIVITY_ID } from 'vs/workbench/common/activity';
-import { AccountsActivityActionViewItem, isAccountsActionVisible, SimpleAccountActivityActionViewItem, SimpleGlobalActivityActionViewItem } from 'vs/workbench/browser/parts/globalCompositeBar';
-import { HoverPosition } from 'vs/base/browser/ui/hover/hoverWidget';
-import { IEditorGroupsContainer, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { ActionRunner, IAction } from 'vs/base/common/actions';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ActionsOrientation, IActionViewItem, prepareActions } from 'vs/base/browser/ui/actionbar/actionbar';
-import { EDITOR_CORE_NAVIGATION_COMMANDS } from 'vs/workbench/browser/parts/editor/editorCommands';
-import { AnchorAlignment } from 'vs/base/browser/ui/contextview/contextview';
-import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ResolvedKeybinding } from 'vs/base/common/keybindings';
-import { EditorCommandsContextActionRunner } from 'vs/workbench/browser/parts/editor/editorTabsControl';
-import { IEditorCommandsContext, IEditorPartOptionsChangeEvent, IToolbarActions } from 'vs/workbench/common/editor';
-import { CodeWindow, mainWindow } from 'vs/base/browser/window';
-import { ACCOUNTS_ACTIVITY_TILE_ACTION, GLOBAL_ACTIVITY_TITLE_ACTION } from 'vs/workbench/browser/parts/titlebar/titlebarActions';
-import { IView } from 'vs/base/browser/ui/grid/grid';
-import { createInstantHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { IBaseActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { IHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate';
+import './media/titlebarpart.css';
+import { localize, localize2 } from '../../../../nls.js';
+import { MultiWindowParts, Part } from '../../part.js';
+import { ITitleService } from '../../../services/title/browser/titleService.js';
+import { getWCOTitlebarAreaRect, getZoomFactor, isWCOEnabled } from '../../../../base/browser/browser.js';
+import { MenuBarVisibility, getTitleBarStyle, getMenuBarVisibility, TitlebarStyle, hasCustomTitlebar, hasNativeTitlebar, DEFAULT_CUSTOM_TITLEBAR_HEIGHT } from '../../../../platform/window/common/window.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
+import { IConfigurationService, IConfigurationChangeEvent } from '../../../../platform/configuration/common/configuration.js';
+import { DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import { IBrowserWorkbenchEnvironmentService } from '../../../services/environment/browser/environmentService.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { TITLE_BAR_ACTIVE_BACKGROUND, TITLE_BAR_ACTIVE_FOREGROUND, TITLE_BAR_INACTIVE_FOREGROUND, TITLE_BAR_INACTIVE_BACKGROUND, TITLE_BAR_BORDER, WORKBENCH_BACKGROUND } from '../../../common/theme.js';
+import { isMacintosh, isWindows, isLinux, isWeb, isNative, platformLocale } from '../../../../base/common/platform.js';
+import { Color } from '../../../../base/common/color.js';
+import { EventType, EventHelper, Dimension, append, $, addDisposableListener, prepend, reset, getWindow, getWindowId, isAncestor, getActiveDocument, isHTMLElement } from '../../../../base/browser/dom.js';
+import { CustomMenubarControl } from './menubarControl.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { IStorageService, StorageScope } from '../../../../platform/storage/common/storage.js';
+import { Parts, IWorkbenchLayoutService, ActivityBarPosition, LayoutSettings, EditorActionsLocation, EditorTabsMode } from '../../../services/layout/browser/layoutService.js';
+import { createActionViewItem, createAndFillInActionBarActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { Action2, IMenu, IMenuService, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { getIconRegistry } from '../../../../platform/theme/common/iconRegistry.js';
+import { WindowTitle } from './windowTitle.js';
+import { CommandCenterControl } from './commandCenterControl.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { WorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
+import { ACCOUNTS_ACTIVITY_ID, GLOBAL_ACTIVITY_ID } from '../../../common/activity.js';
+import { AccountsActivityActionViewItem, isAccountsActionVisible, SimpleAccountActivityActionViewItem, SimpleGlobalActivityActionViewItem } from '../globalCompositeBar.js';
+import { HoverPosition } from '../../../../base/browser/ui/hover/hoverWidget.js';
+import { IEditorGroupsContainer, IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { ActionRunner, IAction } from '../../../../base/common/actions.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { ActionsOrientation, IActionViewItem, prepareActions } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { EDITOR_CORE_NAVIGATION_COMMANDS } from '../editor/editorCommands.js';
+import { AnchorAlignment } from '../../../../base/browser/ui/contextview/contextview.js';
+import { EditorPane } from '../editor/editorPane.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { ResolvedKeybinding } from '../../../../base/common/keybindings.js';
+import { EditorCommandsContextActionRunner } from '../editor/editorTabsControl.js';
+import { IEditorCommandsContext, IEditorPartOptionsChangeEvent, IToolbarActions } from '../../../common/editor.js';
+import { CodeWindow, mainWindow } from '../../../../base/browser/window.js';
+import { ACCOUNTS_ACTIVITY_TILE_ACTION, GLOBAL_ACTIVITY_TITLE_ACTION } from './titlebarActions.js';
+import { IView } from '../../../../base/browser/ui/grid/grid.js';
+import { createInstantHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { IBaseActionViewItemOptions } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { IHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegate.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
 
 export interface ITitleVariable {
 	readonly name: string;
@@ -101,6 +102,7 @@ export class BrowserTitleService extends MultiWindowParts<BrowserTitlebarPart> i
 		this._register(this.registerPart(this.mainPart));
 
 		this.registerActions();
+		this.registerAPICommands();
 	}
 
 	protected createMainTitlebarPart(): BrowserTitlebarPart {
@@ -128,6 +130,22 @@ export class BrowserTitleService extends MultiWindowParts<BrowserTitlebarPart> i
 		}));
 	}
 
+	private registerAPICommands(): void {
+		this._register(CommandsRegistry.registerCommand({
+			id: 'registerWindowTitleVariable',
+			handler: (accessor: ServicesAccessor, name: string, contextKey: string) => {
+				this.registerVariables([{ name, contextKey }]);
+			},
+			metadata: {
+				description: 'Registers a new title variable',
+				args: [
+					{ name: 'name', schema: { type: 'string' }, description: 'The name of the variable to register' },
+					{ name: 'contextKey', schema: { type: 'string' }, description: 'The context key to use for the value of the variable' }
+				]
+			}
+		}));
+	}
+
 	//#region Auxiliary Titlebar Parts
 
 	createAuxiliaryTitlebarPart(container: HTMLElement, editorGroupsContainer: IEditorGroupsContainer): IAuxiliaryTitlebarPart {
@@ -149,8 +167,8 @@ export class BrowserTitleService extends MultiWindowParts<BrowserTitlebarPart> i
 			titlebarPart.updateProperties(this.properties);
 		}
 
-		if (this.variables.length) {
-			titlebarPart.registerVariables(this.variables);
+		if (this.variables.size) {
+			titlebarPart.registerVariables(Array.from(this.variables.values()));
 		}
 
 		Event.once(titlebarPart.onWillDispose)(() => disposables.dispose());
@@ -179,13 +197,20 @@ export class BrowserTitleService extends MultiWindowParts<BrowserTitlebarPart> i
 		}
 	}
 
-	private variables: ITitleVariable[] = [];
+	private readonly variables = new Map<string, ITitleVariable>();
 
 	registerVariables(variables: ITitleVariable[]): void {
-		this.variables.push(...variables);
+		const newVariables: ITitleVariable[] = [];
+
+		for (const variable of variables) {
+			if (!this.variables.has(variable.name)) {
+				this.variables.set(variable.name, variable);
+				newVariables.push(variable);
+			}
+		}
 
 		for (const part of this.parts) {
-			part.registerVariables(variables);
+			part.registerVariables(newVariables);
 		}
 	}
 
@@ -200,7 +225,11 @@ export class BrowserTitlebarPart extends Part implements ITitlebarPart {
 	readonly maximumWidth: number = Number.POSITIVE_INFINITY;
 
 	get minimumHeight(): number {
-		const value = this.isCommandCenterVisible || (isWeb && isWCOEnabled()) ? DEFAULT_CUSTOM_TITLEBAR_HEIGHT : 30;
+		const wcoEnabled = isWeb && isWCOEnabled();
+		let value = this.isCommandCenterVisible || wcoEnabled ? DEFAULT_CUSTOM_TITLEBAR_HEIGHT : 30;
+		if (wcoEnabled) {
+			value = Math.max(value, getWCOTitlebarAreaRect(getWindow(this.element))?.height ?? 0);
+		}
 
 		return value / (this.preventZoom ? getZoomFactor(getWindow(this.element)) : 1);
 	}
@@ -220,7 +249,7 @@ export class BrowserTitlebarPart extends Part implements ITitlebarPart {
 	//#endregion
 
 	protected rootContainer!: HTMLElement;
-	protected primaryWindowControls: HTMLElement | undefined;
+	protected windowControlsContainer: HTMLElement | undefined;
 	protected dragRegion: HTMLElement | undefined;
 	private title!: HTMLElement;
 
@@ -447,21 +476,37 @@ export class BrowserTitlebarPart extends Part implements ITitlebarPart {
 			this.createActionToolBarMenus();
 		}
 
-		let primaryControlLocation = isMacintosh ? 'left' : 'right';
-		if (isMacintosh && isNative) {
-
-			// Check if the locale is RTL, macOS will move traffic lights in RTL locales
-			// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/Locale/textInfo
-
-			const localeInfo = new Intl.Locale(platformLocale) as any;
-			if (localeInfo?.textInfo?.direction === 'rtl') {
-				primaryControlLocation = 'right';
-			}
-		}
-
+		// Window Controls Container
 		if (!hasNativeTitlebar(this.configurationService, this.titleBarStyle)) {
-			this.primaryWindowControls = append(primaryControlLocation === 'left' ? this.leftContent : this.rightContent, $('div.window-controls-container.primary'));
-			append(primaryControlLocation === 'left' ? this.rightContent : this.leftContent, $('div.window-controls-container.secondary'));
+			let primaryWindowControlsLocation = isMacintosh ? 'left' : 'right';
+			if (isMacintosh && isNative) {
+
+				// Check if the locale is RTL, macOS will move traffic lights in RTL locales
+				// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/Locale/textInfo
+
+				const localeInfo = new Intl.Locale(platformLocale) as any;
+				if (localeInfo?.textInfo?.direction === 'rtl') {
+					primaryWindowControlsLocation = 'right';
+				}
+			}
+
+			if (isMacintosh && isNative && primaryWindowControlsLocation === 'left') {
+				// macOS native: controls are on the left and the container is not needed to make room
+				// for something, except for web where a custom menu being supported). not putting the
+				// container helps with allowing to move the window when clicking very close to the
+				// window control buttons.
+			} else {
+				this.windowControlsContainer = append(primaryWindowControlsLocation === 'left' ? this.leftContent : this.rightContent, $('div.window-controls-container'));
+				if (isWeb) {
+					// Web: its possible to have control overlays on both sides, for example on macOS
+					// with window controls on the left and PWA controls on the right.
+					append(primaryWindowControlsLocation === 'left' ? this.rightContent : this.leftContent, $('div.window-controls-container'));
+				}
+
+				if (isWCOEnabled()) {
+					this.windowControlsContainer.classList.add('wco-enabled');
+				}
+			}
 		}
 
 		// Context menu over title bar: depending on the OS and the location of the click this will either be
@@ -634,7 +679,7 @@ export class BrowserTitlebarPart extends Part implements ITitlebarPart {
 				this.editorToolbarMenuDisposables.add(this.actionToolBar.actionRunner);
 			} else {
 				this.actionToolBar.actionRunner = new ActionRunner();
-				this.actionToolBar.context = {};
+				this.actionToolBar.context = undefined;
 
 				this.editorToolbarMenuDisposables.add(this.actionToolBar.actionRunner);
 			}
diff --git a/src/vs/workbench/browser/parts/titlebar/windowTitle.ts b/src/vs/workbench/browser/parts/titlebar/windowTitle.ts
index e025f5c4d6c..bbe8d3a8d6a 100644
--- a/src/vs/workbench/browser/parts/titlebar/windowTitle.ts
+++ b/src/vs/workbench/browser/parts/titlebar/windowTitle.ts
@@ -3,32 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { dirname, basename } from 'vs/base/common/resources';
-import { ITitleProperties, ITitleVariable } from 'vs/workbench/browser/parts/titlebar/titlebarPart';
-import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { EditorResourceAccessor, Verbosity, SideBySideEditor } from 'vs/workbench/common/editor';
-import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { IWorkspaceContextService, WorkbenchState, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { isWindows, isWeb, isMacintosh, isNative } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { trim } from 'vs/base/common/strings';
-import { IEditorGroupsContainer } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { template } from 'vs/base/common/labels';
-import { ILabelService, Verbosity as LabelVerbosity } from 'vs/platform/label/common/label';
-import { Emitter } from 'vs/base/common/event';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { Schemas } from 'vs/base/common/network';
-import { getVirtualWorkspaceLocation } from 'vs/platform/workspace/common/virtualWorkspace';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { ICodeEditor, isCodeEditor, isDiffEditor } from 'vs/editor/browser/editorBrowser';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { getWindowById } from 'vs/base/browser/dom';
-import { CodeWindow } from 'vs/base/browser/window';
+import { localize } from '../../../../nls.js';
+import { dirname, basename } from '../../../../base/common/resources.js';
+import { ITitleProperties, ITitleVariable } from './titlebarPart.js';
+import { IConfigurationService, IConfigurationChangeEvent } from '../../../../platform/configuration/common/configuration.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { EditorResourceAccessor, Verbosity, SideBySideEditor } from '../../../common/editor.js';
+import { IBrowserWorkbenchEnvironmentService } from '../../../services/environment/browser/environmentService.js';
+import { IWorkspaceContextService, WorkbenchState, IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
+import { isWindows, isWeb, isMacintosh, isNative } from '../../../../base/common/platform.js';
+import { URI } from '../../../../base/common/uri.js';
+import { trim } from '../../../../base/common/strings.js';
+import { IEditorGroupsContainer } from '../../../services/editor/common/editorGroupsService.js';
+import { template } from '../../../../base/common/labels.js';
+import { ILabelService, Verbosity as LabelVerbosity } from '../../../../platform/label/common/label.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { getVirtualWorkspaceLocation } from '../../../../platform/workspace/common/virtualWorkspace.js';
+import { IUserDataProfileService } from '../../../services/userDataProfile/common/userDataProfile.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { ICodeEditor, isCodeEditor, isDiffEditor } from '../../../../editor/browser/editorBrowser.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { getWindowById } from '../../../../base/browser/dom.js';
+import { CodeWindow } from '../../../../base/browser/window.js';
 
 const enum WindowSettingNames {
 	titleSeparator = 'window.titleSeparator',
diff --git a/src/vs/workbench/browser/parts/views/checkbox.ts b/src/vs/workbench/browser/parts/views/checkbox.ts
index f428de9bffe..2907220d046 100644
--- a/src/vs/workbench/browser/parts/views/checkbox.ts
+++ b/src/vs/workbench/browser/parts/views/checkbox.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import type { IManagedHover } from 'vs/base/browser/ui/hover/hover';
-import { IHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate';
-import { Toggle } from 'vs/base/browser/ui/toggle/toggle';
-import { Codicon } from 'vs/base/common/codicons';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { localize } from 'vs/nls';
-import type { IHoverService } from 'vs/platform/hover/browser/hover';
-import { defaultToggleStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { ITreeItem, ITreeItemCheckboxState } from 'vs/workbench/common/views';
+import * as DOM from '../../../../base/browser/dom.js';
+import type { IManagedHover } from '../../../../base/browser/ui/hover/hover.js';
+import { IHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegate.js';
+import { Toggle } from '../../../../base/browser/ui/toggle/toggle.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { localize } from '../../../../nls.js';
+import type { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { defaultToggleStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { ITreeItem, ITreeItemCheckboxState } from '../../../common/views.js';
 
 export class CheckboxStateHandler extends Disposable {
 	private readonly _onDidChangeCheckboxState = this._register(new Emitter<ITreeItem[]>());
diff --git a/src/vs/workbench/browser/parts/views/treeView.ts b/src/vs/workbench/browser/parts/views/treeView.ts
index bf227c9911e..5e32b6e436e 100644
--- a/src/vs/workbench/browser/parts/views/treeView.ts
+++ b/src/vs/workbench/browser/parts/views/treeView.ts
@@ -3,78 +3,79 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DataTransfers, IDragAndDropData } from 'vs/base/browser/dnd';
-import * as DOM from 'vs/base/browser/dom';
-import { renderMarkdownAsPlaintext } from 'vs/base/browser/markdownRenderer';
-import { ActionBar, IActionViewItemProvider } from 'vs/base/browser/ui/actionbar/actionbar';
-import { ActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { IHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate';
-import { IIdentityProvider, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { ElementsDragAndDropData, ListViewTargetSector } from 'vs/base/browser/ui/list/listView';
-import { IAsyncDataSource, ITreeContextMenuEvent, ITreeDragAndDrop, ITreeDragOverReaction, ITreeNode, ITreeRenderer, TreeDragOverBubble } from 'vs/base/browser/ui/tree/tree';
-import { CollapseAllAction } from 'vs/base/browser/ui/tree/treeDefaults';
-import { ActionRunner, IAction, Separator } from 'vs/base/common/actions';
-import { timeout } from 'vs/base/common/async';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Codicon } from 'vs/base/common/codicons';
-import { isCancellationError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { createMatches, FuzzyScore } from 'vs/base/common/filters';
-import { IMarkdownString, isMarkdownString, MarkdownString } from 'vs/base/common/htmlContent';
-import { Disposable, DisposableStore, IDisposable, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { Mimes } from 'vs/base/common/mime';
-import { Schemas } from 'vs/base/common/network';
-import { basename, dirname } from 'vs/base/common/resources';
-import { isFalsyOrWhitespace } from 'vs/base/common/strings';
-import { isString } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import 'vs/css!./media/views';
-import { VSDataTransfer } from 'vs/base/common/dataTransfer';
-import { localize } from 'vs/nls';
-import { createActionViewItem, createAndFillInContextMenuActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { Action2, IMenuService, MenuId, MenuRegistry, registerAction2 } from 'vs/platform/actions/common/actions';
-import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { FileKind } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { WorkbenchAsyncDataTree } from 'vs/platform/list/browser/listService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IProgressService } from 'vs/platform/progress/common/progress';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { ColorScheme } from 'vs/platform/theme/common/theme';
-import { FileThemeIcon, FolderThemeIcon, IThemeService } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { fillEditorsDragData } from 'vs/workbench/browser/dnd';
-import { IResourceLabel, ResourceLabels } from 'vs/workbench/browser/labels';
-import { API_OPEN_DIFF_EDITOR_COMMAND_ID, API_OPEN_EDITOR_COMMAND_ID } from 'vs/workbench/browser/parts/editor/editorCommands';
-import { getLocationBasedViewColors, IViewPaneOptions, ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
-import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
-import { Extensions, ITreeItem, ITreeItemLabel, ITreeView, ITreeViewDataProvider, ITreeViewDescriptor, ITreeViewDragAndDropController, IViewBadge, IViewDescriptorService, IViewsRegistry, ResolvableTreeItem, TreeCommand, TreeItemCollapsibleState, TreeViewItemHandleArg, TreeViewPaneHandleArg, ViewContainer, ViewContainerLocation } from 'vs/workbench/common/views';
-import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IHoverService, WorkbenchHoverDelegate } from 'vs/platform/hover/browser/hover';
-import { CodeDataTransfers, LocalSelectionTransfer } from 'vs/platform/dnd/browser/dnd';
-import { toExternalVSDataTransfer } from 'vs/editor/browser/dnd';
-import { CheckboxStateHandler, TreeItemCheckbox } from 'vs/workbench/browser/parts/views/checkbox';
-import { setTimeout0 } from 'vs/base/common/platform';
-import { AriaRole } from 'vs/base/browser/ui/aria/aria';
-import { TelemetryTrustedValue } from 'vs/platform/telemetry/common/telemetryUtils';
-import { ITreeViewsDnDService } from 'vs/editor/common/services/treeViewsDndService';
-import { DraggedTreeItemsIdentifier } from 'vs/editor/common/services/treeViewsDnd';
-import { IMarkdownRenderResult, MarkdownRenderer } from 'vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
-import type { IManagedHoverTooltipMarkdownString } from 'vs/base/browser/ui/hover/hover';
-import { parseLinkedText } from 'vs/base/common/linkedText';
-import { Button } from 'vs/base/browser/ui/button/button';
-import { defaultButtonStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { IAccessibleViewInformationService } from 'vs/workbench/services/accessibility/common/accessibleViewInformationService';
+import { DataTransfers, IDragAndDropData } from '../../../../base/browser/dnd.js';
+import * as DOM from '../../../../base/browser/dom.js';
+import { renderMarkdownAsPlaintext } from '../../../../base/browser/markdownRenderer.js';
+import { ActionBar, IActionViewItemProvider } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { ActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { IHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegate.js';
+import { IIdentityProvider, IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
+import { ElementsDragAndDropData, ListViewTargetSector } from '../../../../base/browser/ui/list/listView.js';
+import { IAsyncDataSource, ITreeContextMenuEvent, ITreeDragAndDrop, ITreeDragOverReaction, ITreeNode, ITreeRenderer, TreeDragOverBubble } from '../../../../base/browser/ui/tree/tree.js';
+import { CollapseAllAction } from '../../../../base/browser/ui/tree/treeDefaults.js';
+import { ActionRunner, IAction, Separator } from '../../../../base/common/actions.js';
+import { timeout } from '../../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { isCancellationError } from '../../../../base/common/errors.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { createMatches, FuzzyScore } from '../../../../base/common/filters.js';
+import { IMarkdownString, isMarkdownString, MarkdownString } from '../../../../base/common/htmlContent.js';
+import { Disposable, DisposableStore, IDisposable, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { Mimes } from '../../../../base/common/mime.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { basename, dirname } from '../../../../base/common/resources.js';
+import { isFalsyOrWhitespace } from '../../../../base/common/strings.js';
+import { isString } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import './media/views.css';
+import { VSDataTransfer } from '../../../../base/common/dataTransfer.js';
+import { localize } from '../../../../nls.js';
+import { createActionViewItem, createAndFillInContextMenuActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { Action2, IMenuService, MenuId, MenuRegistry, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { CommandsRegistry, ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr, ContextKeyExpression, IContextKey, IContextKeyChangeEvent, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { FileKind } from '../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { WorkbenchAsyncDataTree } from '../../../../platform/list/browser/listService.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IProgressService } from '../../../../platform/progress/common/progress.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { ColorScheme } from '../../../../platform/theme/common/theme.js';
+import { FileThemeIcon, FolderThemeIcon, IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { fillEditorsDragData } from '../../dnd.js';
+import { IResourceLabel, ResourceLabels } from '../../labels.js';
+import { API_OPEN_DIFF_EDITOR_COMMAND_ID, API_OPEN_EDITOR_COMMAND_ID } from '../editor/editorCommands.js';
+import { getLocationBasedViewColors, IViewPaneOptions, ViewPane } from './viewPane.js';
+import { IViewletViewOptions } from './viewsViewlet.js';
+import { Extensions, ITreeItem, ITreeItemLabel, ITreeView, ITreeViewDataProvider, ITreeViewDescriptor, ITreeViewDragAndDropController, IViewBadge, IViewDescriptorService, IViewsRegistry, ResolvableTreeItem, TreeCommand, TreeItemCollapsibleState, TreeViewItemHandleArg, TreeViewPaneHandleArg, ViewContainer, ViewContainerLocation } from '../../../common/views.js';
+import { IActivityService, NumberBadge } from '../../../services/activity/common/activity.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IHoverService, WorkbenchHoverDelegate } from '../../../../platform/hover/browser/hover.js';
+import { CodeDataTransfers, LocalSelectionTransfer } from '../../../../platform/dnd/browser/dnd.js';
+import { toExternalVSDataTransfer } from '../../../../editor/browser/dnd.js';
+import { CheckboxStateHandler, TreeItemCheckbox } from './checkbox.js';
+import { setTimeout0 } from '../../../../base/common/platform.js';
+import { AriaRole } from '../../../../base/browser/ui/aria/aria.js';
+import { TelemetryTrustedValue } from '../../../../platform/telemetry/common/telemetryUtils.js';
+import { ITreeViewsDnDService } from '../../../../editor/common/services/treeViewsDndService.js';
+import { DraggedTreeItemsIdentifier } from '../../../../editor/common/services/treeViewsDnd.js';
+import { IMarkdownRenderResult, MarkdownRenderer } from '../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import type { IManagedHoverTooltipMarkdownString } from '../../../../base/browser/ui/hover/hover.js';
+import { parseLinkedText } from '../../../../base/common/linkedText.js';
+import { Button } from '../../../../base/browser/ui/button/button.js';
+import { defaultButtonStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { IAccessibleViewInformationService } from '../../../services/accessibility/common/accessibleViewInformationService.js';
+import { Command } from '../../../../editor/common/languages.js';
 
 export class TreeViewPane extends ViewPane {
 
@@ -175,15 +176,22 @@ class Root implements ITreeItem {
 	children: ITreeItem[] | undefined = undefined;
 }
 
-function isTreeCommandEnabled(treeCommand: TreeCommand, contextKeyService: IContextKeyService): boolean {
-	const command = CommandsRegistry.getCommand(treeCommand.originalId ? treeCommand.originalId : treeCommand.id);
+function commandPreconditions(commandId: string): ContextKeyExpression | undefined {
+	const command = CommandsRegistry.getCommand(commandId);
 	if (command) {
 		const commandAction = MenuRegistry.getCommand(command.id);
-		const precondition = commandAction && commandAction.precondition;
-		if (precondition) {
-			return contextKeyService.contextMatchesRules(precondition);
-		}
+		return commandAction && commandAction.precondition;
 	}
+	return undefined;
+}
+
+function isTreeCommandEnabled(treeCommand: TreeCommand | Command, contextKeyService: IContextKeyService): boolean {
+	const commandId: string = (treeCommand as TreeCommand).originalId ? (treeCommand as TreeCommand).originalId! : treeCommand.id;
+	const precondition = commandPreconditions(commandId);
+	if (precondition) {
+		return contextKeyService.contextMatchesRules(precondition);
+	}
+
 	return true;
 }
 
@@ -709,6 +717,9 @@ abstract class AbstractTreeView extends Disposable implements ITreeView {
 			dnd: this.treeViewDnd,
 			overrideStyles: getLocationBasedViewColors(this.viewLocation).listOverrideStyles
 		}) as WorkbenchAsyncDataTree<ITreeItem, ITreeItem, FuzzyScore>);
+
+		this.treeDisposables.add(renderer.onDidChangeMenuContext(e => e.forEach(e => this.tree?.rerender(e))));
+
 		this.treeDisposables.add(this.tree);
 		treeMenus.setContextKeyService(this.tree.contextKeyService);
 		aligner.tree = this.tree;
@@ -863,6 +874,20 @@ abstract class AbstractTreeView extends Disposable implements ITreeView {
 				button.onDidClick(_ => {
 					this.openerService.open(node.href, { allowCommands: true });
 				}, null, disposables);
+
+				const href = URI.parse(node.href);
+				if (href.scheme === Schemas.command) {
+					const preConditions = commandPreconditions(href.path);
+					if (preConditions) {
+						button.enabled = this.contextKeyService.contextMatchesRules(preConditions);
+						disposables.add(this.contextKeyService.onDidChangeContext(e => {
+							if (e.affectsSome(new Set(preConditions.keys()))) {
+								button.enabled = this.contextKeyService.contextMatchesRules(preConditions);
+							}
+						}));
+					}
+				}
+
 				disposables.add(button);
 				hasFoundButton = true;
 				result.push(buttonContainer);
@@ -1135,7 +1160,6 @@ class TreeDataSource implements IAsyncDataSource<ITreeItem, ITreeItem> {
 }
 
 interface ITreeExplorerTemplateData {
-	readonly elementDisposable: DisposableStore;
 	readonly container: HTMLElement;
 	readonly resourceLabel: IResourceLabel;
 	readonly icon: HTMLElement;
@@ -1151,6 +1175,9 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS
 	private readonly _onDidChangeCheckboxState: Emitter<readonly ITreeItem[]> = this._register(new Emitter<readonly ITreeItem[]>());
 	readonly onDidChangeCheckboxState: Event<readonly ITreeItem[]> = this._onDidChangeCheckboxState.event;
 
+	private _onDidChangeMenuContext: Emitter<readonly ITreeItem[]> = this._register(new Emitter<readonly ITreeItem[]>());
+	readonly onDidChangeMenuContext: Event<readonly ITreeItem[]> = this._onDidChangeMenuContext.event;
+
 	private _actionRunner: MultipleSelectionActionRunner | undefined;
 	private _hoverDelegate: IHoverDelegate;
 	private _hasCheckbox: boolean = false;
@@ -1178,6 +1205,7 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS
 		this._register(checkboxStateHandler.onDidChangeCheckboxState(items => {
 			this.updateCheckboxes(items);
 		}));
+		this._register(this.contextKeyService.onDidChangeContext(e => this.onDidChangeContext(e)));
 	}
 
 	get templateId(): string {
@@ -1199,7 +1227,7 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS
 			actionViewItemProvider: this.actionViewItemProvider
 		});
 
-		return { resourceLabel, icon, checkboxContainer, actionBar, container, elementDisposable: new DisposableStore() };
+		return { resourceLabel, icon, checkboxContainer, actionBar, container };
 	}
 
 	private getHover(label: string | undefined, resource: URI | null, node: ITreeItem): string | IManagedHoverTooltipMarkdownString | undefined {
@@ -1317,8 +1345,8 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS
 
 		templateData.actionBar.context = { $treeViewId: this.treeViewId, $treeItemHandle: node.handle } satisfies TreeViewItemHandleArg;
 
-		const menuActions = this.menus.getResourceActions([node], templateData.elementDisposable);
-		templateData.actionBar.push(menuActions.actions, { icon: true, label: false });
+		const menuActions = this.menus.getResourceActions([node]);
+		templateData.actionBar.push(menuActions, { icon: true, label: false });
 
 		if (this._actionRunner) {
 			templateData.actionBar.actionRunner = this._actionRunner;
@@ -1406,6 +1434,20 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS
 		return node.collapsibleState === TreeItemCollapsibleState.Collapsed || node.collapsibleState === TreeItemCollapsibleState.Expanded ? FileKind.FOLDER : FileKind.FILE;
 	}
 
+	private onDidChangeContext(e: IContextKeyChangeEvent) {
+		const items: ITreeItem[] = [];
+		for (const [_, elements] of this._renderedElements) {
+			for (const element of elements) {
+				if (e.affectsSome(this.menus.getElementOverlayContexts(element.original.element)) || e.affectsSome(this.menus.getEntireMenuContexts())) {
+					items.push(element.original.element);
+				}
+			}
+		}
+		if (items.length) {
+			this._onDidChangeMenuContext.fire(items);
+		}
+	}
+
 	private updateCheckboxes(items: ITreeItem[]) {
 		const additionalItems: ITreeItem[] = [];
 
@@ -1473,8 +1515,6 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS
 	}
 
 	disposeElement(resource: ITreeNode<ITreeItem, FuzzyScore>, index: number, templateData: ITreeExplorerTemplateData): void {
-		templateData.elementDisposable.clear();
-
 		const itemRenders = this._renderedElements.get(resource.element.handle) ?? [];
 		const renderedIndex = itemRenders.findIndex(renderedItem => templateData === renderedItem.rendered);
 
@@ -1491,7 +1531,6 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS
 	disposeTemplate(templateData: ITreeExplorerTemplateData): void {
 		templateData.resourceLabel.dispose();
 		templateData.actionBar.dispose();
-		templateData.elementDisposable.dispose();
 	}
 }
 
@@ -1584,13 +1623,19 @@ class TreeMenus implements IDisposable {
 		@IMenuService private readonly menuService: IMenuService
 	) { }
 
-	getResourceActions(elements: ITreeItem[], disposableStore: DisposableStore): { actions: IAction[] } {
-		const actions = this.getActions(MenuId.ViewItemContext, elements, disposableStore);
-		return { actions: actions.primary };
+	/**
+	 * Gets only the actions that apply to all of the given elements.
+	 */
+	getResourceActions(elements: ITreeItem[]): IAction[] {
+		const actions = this.getActions(this.getMenuId(), elements);
+		return actions.primary;
 	}
 
+	/**
+	 * Gets only the actions that apply to all of the given elements.
+	 */
 	getResourceContextActions(elements: ITreeItem[]): IAction[] {
-		return this.getActions(MenuId.ViewItemContext, elements).secondary;
+		return this.getActions(this.getMenuId(), elements).secondary;
 	}
 
 	public setContextKeyService(service: IContextKeyService) {
@@ -1637,7 +1682,22 @@ class TreeMenus implements IDisposable {
 		return groups;
 	}
 
-	private getActions(menuId: MenuId, elements: ITreeItem[], listen?: DisposableStore): { primary: IAction[]; secondary: IAction[] } {
+	public getElementOverlayContexts(element: ITreeItem): Map<string, any> {
+		return new Map([
+			['view', this.id],
+			['viewItem', element.contextValue]
+		]);
+	}
+
+	public getEntireMenuContexts(): ReadonlySet<string> {
+		return this.menuService.getMenuContexts(this.getMenuId());
+	}
+
+	public getMenuId(): MenuId {
+		return MenuId.ViewItemContext;
+	}
+
+	private getActions(menuId: MenuId, elements: ITreeItem[]): { primary: IAction[]; secondary: IAction[] } {
 		if (!this.contextKeyService) {
 			return { primary: [], secondary: [] };
 		}
@@ -1646,16 +1706,14 @@ class TreeMenus implements IDisposable {
 		let secondaryGroups: Map<string, IAction>[] = [];
 		for (let i = 0; i < elements.length; i++) {
 			const element = elements[i];
-			const contextKeyService = this.contextKeyService.createOverlay([
-				['view', this.id],
-				['viewItem', element.contextValue]
-			]);
+			const contextKeyService = this.contextKeyService.createOverlay(this.getElementOverlayContexts(element));
+
+			const menuData = this.menuService.getMenuActions(menuId, contextKeyService, { shouldForwardArgs: true });
 
-			const menu = this.menuService.createMenu(menuId, contextKeyService);
 			const primary: IAction[] = [];
 			const secondary: IAction[] = [];
-			const result = { primary, secondary, menu };
-			createAndFillInContextMenuActions(menu, { shouldForwardArgs: true }, result, 'inline');
+			const result = { primary, secondary };
+			createAndFillInContextMenuActions(menuData, result, 'inline');
 			if (i === 0) {
 				primaryGroups = this.createGroups(result.primary);
 				secondaryGroups = this.createGroups(result.secondary);
@@ -1663,12 +1721,6 @@ class TreeMenus implements IDisposable {
 				this.filterNonUniversalActions(primaryGroups, result.primary);
 				this.filterNonUniversalActions(secondaryGroups, result.secondary);
 			}
-			if (listen && elements.length === 1) {
-				listen.add(menu.onDidChange(() => this._onDidChange.fire(element)));
-				listen.add(menu);
-			} else {
-				menu.dispose();
-			}
 		}
 
 		return { primary: this.buildMenu(primaryGroups), secondary: this.buildMenu(secondaryGroups) };
diff --git a/src/vs/workbench/browser/parts/views/viewFilter.ts b/src/vs/workbench/browser/parts/views/viewFilter.ts
index 3331c892d0c..2dfd599de65 100644
--- a/src/vs/workbench/browser/parts/views/viewFilter.ts
+++ b/src/vs/workbench/browser/parts/views/viewFilter.ts
@@ -3,29 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Delayer } from 'vs/base/common/async';
-import * as DOM from 'vs/base/browser/dom';
-import { IAction } from 'vs/base/common/actions';
-import { HistoryInputBox } from 'vs/base/browser/ui/inputbox/inputBox';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { toDisposable } from 'vs/base/common/lifecycle';
-import { badgeBackground, badgeForeground, contrastBorder, asCssVariable } from 'vs/platform/theme/common/colorRegistry';
-import { localize } from 'vs/nls';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ContextScopedHistoryInputBox } from 'vs/platform/history/browser/contextScopedHistoryWidget';
-import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { Codicon } from 'vs/base/common/codicons';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { showHistoryKeybindingHint } from 'vs/platform/history/browser/historyWidgetKeybindingHint';
-import { MenuId, MenuRegistry, SubmenuItemAction } from 'vs/platform/actions/common/actions';
-import { HiddenItemStrategy, MenuWorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
-import { SubmenuEntryActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { Widget } from 'vs/base/browser/ui/widget';
-import { Emitter } from 'vs/base/common/event';
-import { defaultInputBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { IActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
+import { Delayer } from '../../../../base/common/async.js';
+import * as DOM from '../../../../base/browser/dom.js';
+import { IAction } from '../../../../base/common/actions.js';
+import { HistoryInputBox } from '../../../../base/browser/ui/inputbox/inputBox.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { toDisposable } from '../../../../base/common/lifecycle.js';
+import { badgeBackground, badgeForeground, contrastBorder, asCssVariable } from '../../../../platform/theme/common/colorRegistry.js';
+import { localize } from '../../../../nls.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ContextScopedHistoryInputBox } from '../../../../platform/history/browser/contextScopedHistoryWidget.js';
+import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { showHistoryKeybindingHint } from '../../../../platform/history/browser/historyWidgetKeybindingHint.js';
+import { MenuId, MenuRegistry, SubmenuItemAction } from '../../../../platform/actions/common/actions.js';
+import { HiddenItemStrategy, MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
+import { SubmenuEntryActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { Widget } from '../../../../base/browser/ui/widget.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { defaultInputBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { IActionViewItemOptions } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
 
 const viewFilterMenu = new MenuId('menu.view.filter');
 export const viewFilterSubmenu = new MenuId('submenu.view.filter');
@@ -230,6 +230,8 @@ export class FilterWidget extends Widget {
 		if (event.equals(KeyCode.Space)
 			|| event.equals(KeyCode.LeftArrow)
 			|| event.equals(KeyCode.RightArrow)
+			|| event.equals(KeyCode.Home)
+			|| event.equals(KeyCode.End)
 		) {
 			event.stopPropagation();
 		}
diff --git a/src/vs/workbench/browser/parts/views/viewPane.ts b/src/vs/workbench/browser/parts/views/viewPane.ts
index b95f8a1071c..35fb636c080 100644
--- a/src/vs/workbench/browser/parts/views/viewPane.ts
+++ b/src/vs/workbench/browser/parts/views/viewPane.ts
@@ -3,56 +3,56 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/paneviewlet';
-import * as nls from 'vs/nls';
-import { Event, Emitter } from 'vs/base/common/event';
-import { asCssVariable, foreground } from 'vs/platform/theme/common/colorRegistry';
-import { after, append, $, trackFocus, EventType, addDisposableListener, createCSSRule, asCSSUrl, Dimension, reset, asCssValueWithDefault } from 'vs/base/browser/dom';
-import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { Action, IAction, IActionRunner } from 'vs/base/common/actions';
-import { ActionsOrientation, IActionViewItem, prepareActions } from 'vs/base/browser/ui/actionbar/actionbar';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IPaneOptions, Pane, IPaneStyles } from 'vs/base/browser/ui/splitview/paneview';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { Extensions as ViewContainerExtensions, IView, IViewDescriptorService, ViewContainerLocation, IViewsRegistry, IViewContentDescriptor, defaultViewIcon, ViewContainerLocationToString } from 'vs/workbench/common/views';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { assertIsDefined, PartialExcept } from 'vs/base/common/types';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { MenuId, Action2, IAction2Options, SubmenuItemAction } from 'vs/platform/actions/common/actions';
-import { createActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { parseLinkedText } from 'vs/base/common/linkedText';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { Button } from 'vs/base/browser/ui/button/button';
-import { Link } from 'vs/platform/opener/browser/link';
-import { Orientation } from 'vs/base/browser/ui/sash/sash';
-import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
-import { AbstractProgressScope, ScopedProgressIndicator } from 'vs/workbench/services/progress/browser/progressIndicator';
-import { IProgressIndicator } from 'vs/platform/progress/common/progress';
-import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
-import { ScrollbarVisibility } from 'vs/base/common/scrollable';
-import { URI } from 'vs/base/common/uri';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { Codicon } from 'vs/base/common/codicons';
-import { CompositeMenuActions } from 'vs/workbench/browser/actions';
-import { IDropdownMenuActionViewItemOptions } from 'vs/base/browser/ui/dropdown/dropdownActionViewItem';
-import { WorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
-import { FilterWidget, IFilterWidgetOptions } from 'vs/workbench/browser/parts/views/viewFilter';
-import { BaseActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { defaultButtonStyles, defaultProgressBarStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import type { IManagedHover } from 'vs/base/browser/ui/hover/hover';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { IListStyles } from 'vs/base/browser/ui/list/listWidget';
-import { PANEL_BACKGROUND, PANEL_STICKY_SCROLL_BACKGROUND, PANEL_STICKY_SCROLL_BORDER, PANEL_STICKY_SCROLL_SHADOW, SIDE_BAR_BACKGROUND, SIDE_BAR_STICKY_SCROLL_BACKGROUND, SIDE_BAR_STICKY_SCROLL_BORDER, SIDE_BAR_STICKY_SCROLL_SHADOW } from 'vs/workbench/common/theme';
-import { IAccessibleViewInformationService } from 'vs/workbench/services/accessibility/common/accessibleViewInformationService';
+import './media/paneviewlet.css';
+import * as nls from '../../../../nls.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { asCssVariable, foreground } from '../../../../platform/theme/common/colorRegistry.js';
+import { after, append, $, trackFocus, EventType, addDisposableListener, createCSSRule, asCSSUrl, Dimension, reset, asCssValueWithDefault } from '../../../../base/browser/dom.js';
+import { DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { Action, IAction, IActionRunner } from '../../../../base/common/actions.js';
+import { ActionsOrientation, IActionViewItem, prepareActions } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { IPaneOptions, Pane, IPaneStyles } from '../../../../base/browser/ui/splitview/paneview.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { Extensions as ViewContainerExtensions, IView, IViewDescriptorService, ViewContainerLocation, IViewsRegistry, IViewContentDescriptor, defaultViewIcon, ViewContainerLocationToString } from '../../../common/views.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { assertIsDefined, PartialExcept } from '../../../../base/common/types.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { MenuId, Action2, IAction2Options, SubmenuItemAction } from '../../../../platform/actions/common/actions.js';
+import { createActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { parseLinkedText } from '../../../../base/common/linkedText.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { Button } from '../../../../base/browser/ui/button/button.js';
+import { Link } from '../../../../platform/opener/browser/link.js';
+import { Orientation } from '../../../../base/browser/ui/sash/sash.js';
+import { ProgressBar } from '../../../../base/browser/ui/progressbar/progressbar.js';
+import { AbstractProgressScope, ScopedProgressIndicator } from '../../../services/progress/browser/progressIndicator.js';
+import { IProgressIndicator } from '../../../../platform/progress/common/progress.js';
+import { DomScrollableElement } from '../../../../base/browser/ui/scrollbar/scrollableElement.js';
+import { ScrollbarVisibility } from '../../../../base/common/scrollable.js';
+import { URI } from '../../../../base/common/uri.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { CompositeMenuActions } from '../../actions.js';
+import { IDropdownMenuActionViewItemOptions } from '../../../../base/browser/ui/dropdown/dropdownActionViewItem.js';
+import { WorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
+import { FilterWidget, IFilterWidgetOptions } from './viewFilter.js';
+import { BaseActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { defaultButtonStyles, defaultProgressBarStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.js';
+import type { IManagedHover } from '../../../../base/browser/ui/hover/hover.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IListStyles } from '../../../../base/browser/ui/list/listWidget.js';
+import { PANEL_BACKGROUND, PANEL_SECTION_DRAG_AND_DROP_BACKGROUND, PANEL_STICKY_SCROLL_BACKGROUND, PANEL_STICKY_SCROLL_BORDER, PANEL_STICKY_SCROLL_SHADOW, SIDE_BAR_BACKGROUND, SIDE_BAR_DRAG_AND_DROP_BACKGROUND, SIDE_BAR_STICKY_SCROLL_BACKGROUND, SIDE_BAR_STICKY_SCROLL_BORDER, SIDE_BAR_STICKY_SCROLL_SHADOW } from '../../../common/theme.js';
+import { IAccessibleViewInformationService } from '../../../services/accessibility/common/accessibleViewInformationService.js';
 
 export enum ViewPaneShowActions {
 	/** Show the actions when the view is hovered. This is the default behavior. */
@@ -376,7 +376,7 @@ export abstract class ViewPane extends Pane implements IView {
 		@IThemeService protected themeService: IThemeService,
 		@ITelemetryService protected telemetryService: ITelemetryService,
 		@IHoverService protected readonly hoverService: IHoverService,
-		protected readonly accessibleViewService?: IAccessibleViewInformationService
+		protected readonly accessibleViewInformationService?: IAccessibleViewInformationService
 	) {
 		super({ ...options, ...{ orientation: viewDescriptorService.getViewLocationById(options.id) === ViewContainerLocation.Panel ? Orientation.HORIZONTAL : Orientation.VERTICAL } });
 
@@ -391,7 +391,8 @@ export abstract class ViewPane extends Pane implements IView {
 		const viewLocationKey = this.scopedContextKeyService.createKey('viewLocation', ViewContainerLocationToString(viewDescriptorService.getViewLocationById(this.id)!));
 		this._register(Event.filter(viewDescriptorService.onDidChangeLocation, e => e.views.some(view => view.id === this.id))(() => viewLocationKey.set(ViewContainerLocationToString(viewDescriptorService.getViewLocationById(this.id)!))));
 
-		this.menuActions = this._register(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, this.scopedContextKeyService])).createInstance(CompositeMenuActions, options.titleMenuId ?? MenuId.ViewTitle, MenuId.ViewTitleContext, { shouldForwardArgs: !options.donotForwardArgs, renderShortTitle: true }));
+		const childInstantiationService = this._register(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, this.scopedContextKeyService])));
+		this.menuActions = this._register(childInstantiationService.createInstance(CompositeMenuActions, options.titleMenuId ?? MenuId.ViewTitle, MenuId.ViewTitleContext, { shouldForwardArgs: !options.donotForwardArgs, renderShortTitle: true }));
 		this._register(this.menuActions.onDidChange(() => this.updateActions()));
 	}
 
@@ -552,7 +553,7 @@ export abstract class ViewPane extends Pane implements IView {
 
 	private _getAriaLabel(title: string): string {
 		const viewHasAccessibilityHelpContent = this.viewDescriptorService.getViewDescriptorById(this.id)?.accessibilityHelpContent;
-		const accessibleViewHasShownForView = this.accessibleViewService?.hasShownAccessibleView(this.id);
+		const accessibleViewHasShownForView = this.accessibleViewInformationService?.hasShownAccessibleView(this.id);
 		if (!viewHasAccessibilityHelpContent || accessibleViewHasShownForView) {
 			return title;
 		}
@@ -747,7 +748,8 @@ export abstract class FilterViewPane extends ViewPane {
 		accessibleViewService?: IAccessibleViewInformationService
 	) {
 		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService, accessibleViewService);
-		this.filterWidget = this._register(instantiationService.createChild(new ServiceCollection([IContextKeyService, this.scopedContextKeyService])).createInstance(FilterWidget, options.filterOptions));
+		const childInstantiationService = this._register(instantiationService.createChild(new ServiceCollection([IContextKeyService, this.scopedContextKeyService])));
+		this.filterWidget = this._register(childInstantiationService.createInstance(FilterWidget, options.filterOptions));
 	}
 
 	override getFilterWidget(): FilterWidget {
@@ -791,15 +793,17 @@ export abstract class FilterViewPane extends ViewPane {
 
 export interface IViewPaneLocationColors {
 	background: string;
+	overlayBackground: string;
 	listOverrideStyles: PartialExcept<IListStyles, 'listBackground' | 'treeStickyScrollBackground'>;
 }
 
 export function getLocationBasedViewColors(location: ViewContainerLocation | null): IViewPaneLocationColors {
-	let background, stickyScrollBackground, stickyScrollBorder, stickyScrollShadow;
+	let background, overlayBackground, stickyScrollBackground, stickyScrollBorder, stickyScrollShadow;
 
 	switch (location) {
 		case ViewContainerLocation.Panel:
 			background = PANEL_BACKGROUND;
+			overlayBackground = PANEL_SECTION_DRAG_AND_DROP_BACKGROUND;
 			stickyScrollBackground = PANEL_STICKY_SCROLL_BACKGROUND;
 			stickyScrollBorder = PANEL_STICKY_SCROLL_BORDER;
 			stickyScrollShadow = PANEL_STICKY_SCROLL_SHADOW;
@@ -809,6 +813,7 @@ export function getLocationBasedViewColors(location: ViewContainerLocation | nul
 		case ViewContainerLocation.AuxiliaryBar:
 		default:
 			background = SIDE_BAR_BACKGROUND;
+			overlayBackground = SIDE_BAR_DRAG_AND_DROP_BACKGROUND;
 			stickyScrollBackground = SIDE_BAR_STICKY_SCROLL_BACKGROUND;
 			stickyScrollBorder = SIDE_BAR_STICKY_SCROLL_BORDER;
 			stickyScrollShadow = SIDE_BAR_STICKY_SCROLL_SHADOW;
@@ -816,6 +821,7 @@ export function getLocationBasedViewColors(location: ViewContainerLocation | nul
 
 	return {
 		background,
+		overlayBackground,
 		listOverrideStyles: {
 			listBackground: background,
 			treeStickyScrollBackground: stickyScrollBackground,
@@ -832,12 +838,13 @@ export abstract class ViewAction<T extends IView> extends Action2 {
 		this.desc = desc;
 	}
 
-	run(accessor: ServicesAccessor, ...args: any[]) {
+	run(accessor: ServicesAccessor, ...args: any[]): unknown {
 		const view = accessor.get(IViewsService).getActiveViewWithId(this.desc.viewId);
 		if (view) {
 			return this.runInView(accessor, <T>view, ...args);
 		}
+		return undefined;
 	}
 
-	abstract runInView(accessor: ServicesAccessor, view: T, ...args: any[]): any;
+	abstract runInView(accessor: ServicesAccessor, view: T, ...args: any[]): unknown;
 }
diff --git a/src/vs/workbench/browser/parts/views/viewPaneContainer.ts b/src/vs/workbench/browser/parts/views/viewPaneContainer.ts
index f190e2862c7..1ca314af9d2 100644
--- a/src/vs/workbench/browser/parts/views/viewPaneContainer.ts
+++ b/src/vs/workbench/browser/parts/views/viewPaneContainer.ts
@@ -3,44 +3,44 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { addDisposableListener, Dimension, DragAndDropObserver, EventType, getWindow, isAncestor } from 'vs/base/browser/dom';
-import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { EventType as TouchEventType, Gesture } from 'vs/base/browser/touch';
-import { IActionViewItem } from 'vs/base/browser/ui/actionbar/actionbar';
-import { IBoundarySashes, Orientation } from 'vs/base/browser/ui/sash/sash';
-import { IPaneViewOptions, PaneView } from 'vs/base/browser/ui/splitview/paneview';
-import { IAction } from 'vs/base/common/actions';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { Emitter, Event } from 'vs/base/common/event';
-import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { combinedDisposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { assertIsDefined } from 'vs/base/common/types';
-import 'vs/css!./media/paneviewlet';
-import * as nls from 'vs/nls';
-import { createActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { Action2, IAction2Options, IMenuService, ISubmenuItem, MenuId, MenuRegistry, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { activeContrastBorder, asCssVariable } from 'vs/platform/theme/common/colorRegistry';
-import { IThemeService, Themable } from 'vs/platform/theme/common/themeService';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { CompositeMenuActions } from 'vs/workbench/browser/actions';
-import { CompositeDragAndDropObserver, toggleDropEffect } from 'vs/workbench/browser/dnd';
-import { ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
-import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
-import { Component } from 'vs/workbench/common/component';
-import { PANEL_SECTION_BORDER, PANEL_SECTION_DRAG_AND_DROP_BACKGROUND, PANEL_SECTION_HEADER_BACKGROUND, PANEL_SECTION_HEADER_BORDER, PANEL_SECTION_HEADER_FOREGROUND, SIDE_BAR_DRAG_AND_DROP_BACKGROUND, SIDE_BAR_SECTION_HEADER_BACKGROUND, SIDE_BAR_SECTION_HEADER_BORDER, SIDE_BAR_SECTION_HEADER_FOREGROUND } from 'vs/workbench/common/theme';
-import { IAddedViewDescriptorRef, ICustomViewDescriptor, IView, IViewContainerModel, IViewDescriptor, IViewDescriptorRef, IViewDescriptorService, IViewPaneContainer, ViewContainer, ViewContainerLocation, ViewContainerLocationToString, ViewVisibilityState } from 'vs/workbench/common/views';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { FocusedViewContext } from 'vs/workbench/common/contextkeys';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IWorkbenchLayoutService, LayoutSettings, Position } from 'vs/workbench/services/layout/browser/layoutService';
-import { IBaseActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
+import { addDisposableListener, Dimension, DragAndDropObserver, EventType, getWindow, isAncestor } from '../../../../base/browser/dom.js';
+import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
+import { EventType as TouchEventType, Gesture } from '../../../../base/browser/touch.js';
+import { IActionViewItem } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { IBoundarySashes, Orientation } from '../../../../base/browser/ui/sash/sash.js';
+import { IPaneViewOptions, PaneView } from '../../../../base/browser/ui/splitview/paneview.js';
+import { IAction } from '../../../../base/common/actions.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { KeyChord, KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { combinedDisposable, DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { assertIsDefined } from '../../../../base/common/types.js';
+import './media/paneviewlet.css';
+import * as nls from '../../../../nls.js';
+import { createActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { Action2, IAction2Options, IMenuService, ISubmenuItem, MenuId, MenuRegistry, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { activeContrastBorder, asCssVariable } from '../../../../platform/theme/common/colorRegistry.js';
+import { IThemeService, Themable } from '../../../../platform/theme/common/themeService.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { CompositeMenuActions } from '../../actions.js';
+import { CompositeDragAndDropObserver, toggleDropEffect } from '../../dnd.js';
+import { ViewPane } from './viewPane.js';
+import { IViewletViewOptions } from './viewsViewlet.js';
+import { Component } from '../../../common/component.js';
+import { PANEL_SECTION_BORDER, PANEL_SECTION_DRAG_AND_DROP_BACKGROUND, PANEL_SECTION_HEADER_BACKGROUND, PANEL_SECTION_HEADER_BORDER, PANEL_SECTION_HEADER_FOREGROUND, SIDE_BAR_DRAG_AND_DROP_BACKGROUND, SIDE_BAR_SECTION_HEADER_BACKGROUND, SIDE_BAR_SECTION_HEADER_BORDER, SIDE_BAR_SECTION_HEADER_FOREGROUND } from '../../../common/theme.js';
+import { IAddedViewDescriptorRef, ICustomViewDescriptor, IView, IViewContainerModel, IViewDescriptor, IViewDescriptorRef, IViewDescriptorService, IViewPaneContainer, ViewContainer, ViewContainerLocation, ViewContainerLocationToString, ViewVisibilityState } from '../../../common/views.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { FocusedViewContext } from '../../../common/contextkeys.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { isHorizontal, IWorkbenchLayoutService, LayoutSettings } from '../../../services/layout/browser/layoutService.js';
+import { IBaseActionViewItemOptions } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
 
 export const ViewsSubMenu = new MenuId('Views');
 MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
@@ -593,6 +593,9 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {
 	}
 
 	getActionsContext(): unknown {
+		if (this.isViewMergedWithContainer()) {
+			return this.panes[0].getActionsContext();
+		}
 		return undefined;
 	}
 
@@ -625,8 +628,9 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {
 			case ViewContainerLocation.Sidebar:
 			case ViewContainerLocation.AuxiliaryBar:
 				return Orientation.VERTICAL;
-			case ViewContainerLocation.Panel:
-				return this.layoutService.getPanelPosition() === Position.BOTTOM ? Orientation.HORIZONTAL : Orientation.VERTICAL;
+			case ViewContainerLocation.Panel: {
+				return isHorizontal(this.layoutService.getPanelPosition()) ? Orientation.HORIZONTAL : Orientation.VERTICAL;
+			}
 		}
 
 		return Orientation.VERTICAL;
@@ -1100,10 +1104,6 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {
 		if (!(this.options.mergeViewWithContainerWhenSingleView && this.paneItems.length === 1)) {
 			return false;
 		}
-		if (this.paneItems[0].pane.titleDescription) {
-			// Don't merge a view with a titleDescription. See #166000
-			return false;
-		}
 		if (!this.areExtensionsReady) {
 			if (this.visibleViewsCountFromCache === undefined) {
 				return this.paneItems[0].pane.isExpanded();
@@ -1176,14 +1176,15 @@ export abstract class ViewPaneContainerAction<T extends IViewPaneContainer> exte
 		this.desc = desc;
 	}
 
-	run(accessor: ServicesAccessor, ...args: any[]) {
+	run(accessor: ServicesAccessor, ...args: any[]): unknown {
 		const viewPaneContainer = accessor.get(IViewsService).getActiveViewPaneContainerWithId(this.desc.viewPaneContainerId);
 		if (viewPaneContainer) {
 			return this.runInViewPaneContainer(accessor, <T>viewPaneContainer, ...args);
 		}
+		return undefined;
 	}
 
-	abstract runInViewPaneContainer(accessor: ServicesAccessor, viewPaneContainer: T, ...args: any[]): any;
+	abstract runInViewPaneContainer(accessor: ServicesAccessor, viewPaneContainer: T, ...args: any[]): unknown;
 }
 
 class MoveViewPosition extends Action2 {
diff --git a/src/vs/workbench/browser/parts/views/viewsViewlet.ts b/src/vs/workbench/browser/parts/views/viewsViewlet.ts
index dc1175d6c2f..b08338ccac6 100644
--- a/src/vs/workbench/browser/parts/views/viewsViewlet.ts
+++ b/src/vs/workbench/browser/parts/views/viewsViewlet.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IViewDescriptor, IViewDescriptorService, IAddedViewDescriptorRef, IView } from 'vs/workbench/common/views';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
-import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPane';
-import { Event } from 'vs/base/common/event';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IViewDescriptor, IViewDescriptorService, IAddedViewDescriptorRef, IView } from '../../../common/views.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { ViewPaneContainer } from './viewPaneContainer.js';
+import { ViewPane, IViewPaneOptions } from './viewPane.js';
+import { Event } from '../../../../base/common/event.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
 
 export interface IViewletViewOptions extends IViewPaneOptions {
 	readonly fromExtensionId?: ExtensionIdentifier;
diff --git a/src/vs/workbench/browser/quickaccess.ts b/src/vs/workbench/browser/quickaccess.ts
index bf732b89be1..43e82650601 100644
--- a/src/vs/workbench/browser/quickaccess.ts
+++ b/src/vs/workbench/browser/quickaccess.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { ContextKeyExpr, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { ICommandHandler } from 'vs/platform/commands/common/commands';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { getIEditor } from 'vs/editor/browser/editorBrowser';
-import { ICodeEditorViewState, IDiffEditorViewState } from 'vs/editor/common/editorCommon';
-import { IResourceEditorInput, ITextResourceEditorInput } from 'vs/platform/editor/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { ACTIVE_GROUP_TYPE, AUX_WINDOW_GROUP_TYPE, IEditorService, SIDE_GROUP_TYPE } from 'vs/workbench/services/editor/common/editorService';
-import { IUntitledTextResourceEditorInput, IUntypedEditorInput, GroupIdentifier, IEditorPane } from 'vs/workbench/common/editor';
+import { localize } from '../../nls.js';
+import { ContextKeyExpr, RawContextKey } from '../../platform/contextkey/common/contextkey.js';
+import { ICommandHandler } from '../../platform/commands/common/commands.js';
+import { IKeybindingService } from '../../platform/keybinding/common/keybinding.js';
+import { IQuickInputService } from '../../platform/quickinput/common/quickInput.js';
+import { Disposable } from '../../base/common/lifecycle.js';
+import { getIEditor } from '../../editor/browser/editorBrowser.js';
+import { ICodeEditorViewState, IDiffEditorViewState } from '../../editor/common/editorCommon.js';
+import { IResourceEditorInput, ITextResourceEditorInput } from '../../platform/editor/common/editor.js';
+import { EditorInput } from '../common/editor/editorInput.js';
+import { IEditorGroup, IEditorGroupsService } from '../services/editor/common/editorGroupsService.js';
+import { ACTIVE_GROUP_TYPE, AUX_WINDOW_GROUP_TYPE, IEditorService, SIDE_GROUP_TYPE } from '../services/editor/common/editorService.js';
+import { IUntitledTextResourceEditorInput, IUntypedEditorInput, GroupIdentifier, IEditorPane } from '../common/editor.js';
 
 export const inQuickPickContextKeyValue = 'inQuickOpen';
 export const InQuickPickContextKey = new RawContextKey<boolean>(inQuickPickContextKeyValue, false, localize('inQuickOpen', "Whether keyboard focus is inside the quick open control"));
diff --git a/src/vs/workbench/browser/style.ts b/src/vs/workbench/browser/style.ts
index 8fab9bc5b71..9f36f4a74eb 100644
--- a/src/vs/workbench/browser/style.ts
+++ b/src/vs/workbench/browser/style.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/style';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { WORKBENCH_BACKGROUND, TITLE_BAR_ACTIVE_BACKGROUND } from 'vs/workbench/common/theme';
-import { isWeb, isIOS } from 'vs/base/common/platform';
-import { createMetaElement } from 'vs/base/browser/dom';
-import { isSafari, isStandalone } from 'vs/base/browser/browser';
-import { selectionBackground } from 'vs/platform/theme/common/colorRegistry';
-import { mainWindow } from 'vs/base/browser/window';
+import './media/style.css';
+import { registerThemingParticipant } from '../../platform/theme/common/themeService.js';
+import { WORKBENCH_BACKGROUND, TITLE_BAR_ACTIVE_BACKGROUND } from '../common/theme.js';
+import { isWeb, isIOS } from '../../base/common/platform.js';
+import { createMetaElement } from '../../base/browser/dom.js';
+import { isSafari, isStandalone } from '../../base/browser/browser.js';
+import { selectionBackground } from '../../platform/theme/common/colorRegistry.js';
+import { mainWindow } from '../../base/browser/window.js';
 
 registerThemingParticipant((theme, collector) => {
 
diff --git a/src/vs/workbench/browser/web.api.ts b/src/vs/workbench/browser/web.api.ts
index 697e6742183..c2668a8ca6a 100644
--- a/src/vs/workbench/browser/web.api.ts
+++ b/src/vs/workbench/browser/web.api.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import type { PerformanceMark } from 'vs/base/common/performance';
-import type { UriComponents, URI } from 'vs/base/common/uri';
-import type { IWebSocketFactory } from 'vs/platform/remote/browser/browserSocketFactory';
-import type { IURLCallbackProvider } from 'vs/workbench/services/url/browser/urlService';
-import type { LogLevel } from 'vs/platform/log/common/log';
-import type { IUpdateProvider } from 'vs/workbench/services/update/browser/updateService';
-import type { Event } from 'vs/base/common/event';
-import type { IProductConfiguration } from 'vs/base/common/product';
-import type { ISecretStorageProvider } from 'vs/platform/secrets/common/secrets';
-import type { TunnelProviderFeatures } from 'vs/platform/tunnel/common/tunnel';
-import type { IProgress, IProgressCompositeOptions, IProgressDialogOptions, IProgressNotificationOptions, IProgressOptions, IProgressStep, IProgressWindowOptions } from 'vs/platform/progress/common/progress';
-import type { ITextEditorOptions } from 'vs/platform/editor/common/editor';
-import type { IFolderToOpen, IWorkspaceToOpen } from 'vs/platform/window/common/window';
-import type { EditorGroupLayout } from 'vs/workbench/services/editor/common/editorGroupsService';
-import type { IEmbedderTerminalOptions } from 'vs/workbench/services/terminal/common/embedderTerminalService';
-import type { IAuthenticationProvider } from 'vs/workbench/services/authentication/common/authentication';
+import type { PerformanceMark } from '../../base/common/performance.js';
+import type { UriComponents, URI } from '../../base/common/uri.js';
+import type { IWebSocketFactory } from '../../platform/remote/browser/browserSocketFactory.js';
+import type { IURLCallbackProvider } from '../services/url/browser/urlService.js';
+import type { LogLevel } from '../../platform/log/common/log.js';
+import type { IUpdateProvider } from '../services/update/browser/updateService.js';
+import type { Event } from '../../base/common/event.js';
+import type { IProductConfiguration } from '../../base/common/product.js';
+import type { ISecretStorageProvider } from '../../platform/secrets/common/secrets.js';
+import type { TunnelProviderFeatures } from '../../platform/tunnel/common/tunnel.js';
+import type { IProgress, IProgressCompositeOptions, IProgressDialogOptions, IProgressNotificationOptions, IProgressOptions, IProgressStep, IProgressWindowOptions } from '../../platform/progress/common/progress.js';
+import type { ITextEditorOptions } from '../../platform/editor/common/editor.js';
+import type { IFolderToOpen, IWorkspaceToOpen } from '../../platform/window/common/window.js';
+import type { EditorGroupLayout } from '../services/editor/common/editorGroupsService.js';
+import type { IEmbedderTerminalOptions } from '../services/terminal/common/embedderTerminalService.js';
+import type { IAuthenticationProvider } from '../services/authentication/common/authentication.js';
 
 /**
  * The `IWorkbench` interface is the API facade for web embedders
diff --git a/src/vs/workbench/browser/web.factory.ts b/src/vs/workbench/browser/web.factory.ts
index f1ff86dddbb..422fbba83e7 100644
--- a/src/vs/workbench/browser/web.factory.ts
+++ b/src/vs/workbench/browser/web.factory.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ITunnel, ITunnelOptions, IWorkbench, IWorkbenchConstructionOptions, Menu } from 'vs/workbench/browser/web.api';
-import { BrowserMain } from 'vs/workbench/browser/web.main';
-import { URI } from 'vs/base/common/uri';
-import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { mark, PerformanceMark } from 'vs/base/common/performance';
-import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
-import { DeferredPromise } from 'vs/base/common/async';
-import { asArray } from 'vs/base/common/arrays';
-import { IProgress, IProgressCompositeOptions, IProgressDialogOptions, IProgressNotificationOptions, IProgressOptions, IProgressStep, IProgressWindowOptions } from 'vs/platform/progress/common/progress';
-import { LogLevel } from 'vs/platform/log/common/log';
-import { IEmbedderTerminalOptions } from 'vs/workbench/services/terminal/common/embedderTerminalService';
+import { ITunnel, ITunnelOptions, IWorkbench, IWorkbenchConstructionOptions, Menu } from './web.api.js';
+import { BrowserMain } from './web.main.js';
+import { URI } from '../../base/common/uri.js';
+import { IDisposable, toDisposable } from '../../base/common/lifecycle.js';
+import { CommandsRegistry } from '../../platform/commands/common/commands.js';
+import { mark, PerformanceMark } from '../../base/common/performance.js';
+import { MenuId, MenuRegistry } from '../../platform/actions/common/actions.js';
+import { DeferredPromise } from '../../base/common/async.js';
+import { asArray } from '../../base/common/arrays.js';
+import { IProgress, IProgressCompositeOptions, IProgressDialogOptions, IProgressNotificationOptions, IProgressOptions, IProgressStep, IProgressWindowOptions } from '../../platform/progress/common/progress.js';
+import { LogLevel } from '../../platform/log/common/log.js';
+import { IEmbedderTerminalOptions } from '../services/terminal/common/embedderTerminalService.js';
 
 let created = false;
 const workbenchPromise = new DeferredPromise<IWorkbench>();
diff --git a/src/vs/workbench/browser/web.main.ts b/src/vs/workbench/browser/web.main.ts
index 1ea687ba1c6..142cfa90cd1 100644
--- a/src/vs/workbench/browser/web.main.ts
+++ b/src/vs/workbench/browser/web.main.ts
@@ -3,99 +3,99 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { mark } from 'vs/base/common/performance';
-import { domContentLoaded, detectFullscreen, getCookieValue, getWindow } from 'vs/base/browser/dom';
-import { assertIsDefined } from 'vs/base/common/types';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { ILogService, ConsoleLogger, getLogLevel, ILoggerService, ILogger } from 'vs/platform/log/common/log';
-import { ConsoleLogInAutomationLogger } from 'vs/platform/log/browser/log';
-import { Disposable, DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { BrowserWorkbenchEnvironmentService, IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { Workbench } from 'vs/workbench/browser/workbench';
-import { RemoteFileSystemProviderClient } from 'vs/workbench/services/remote/common/remoteFileSystemProviderClient';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IProductService } from 'vs/platform/product/common/productService';
-import product from 'vs/platform/product/common/product';
-import { RemoteAgentService } from 'vs/workbench/services/remote/browser/remoteAgentService';
-import { RemoteAuthorityResolverService } from 'vs/platform/remote/browser/remoteAuthorityResolverService';
-import { IRemoteAuthorityResolverService, RemoteConnectionType } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { IFileService } from 'vs/platform/files/common/files';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { Schemas, connectionTokenCookieName } from 'vs/base/common/network';
-import { IAnyWorkspaceIdentifier, IWorkspaceContextService, UNKNOWN_EMPTY_WINDOW_WORKSPACE, isTemporaryWorkspace, isWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
-import { IWorkbenchConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { setFullscreen } from 'vs/base/browser/browser';
-import { URI } from 'vs/base/common/uri';
-import { WorkspaceService } from 'vs/workbench/services/configuration/browser/configurationService';
-import { ConfigurationCache } from 'vs/workbench/services/configuration/common/configurationCache';
-import { ISignService } from 'vs/platform/sign/common/sign';
-import { SignService } from 'vs/platform/sign/browser/signService';
-import { IWorkbenchConstructionOptions, IWorkbench, IWorkspace, ITunnel } from 'vs/workbench/browser/web.api';
-import { BrowserStorageService } from 'vs/workbench/services/storage/browser/storageService';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { toLocalISOString } from 'vs/base/common/date';
-import { isWorkspaceToOpen, isFolderToOpen } from 'vs/platform/window/common/window';
-import { getSingleFolderWorkspaceIdentifier, getWorkspaceIdentifier } from 'vs/workbench/services/workspaces/browser/workspaces';
-import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IndexedDBFileSystemProviderErrorDataClassification, IndexedDBFileSystemProvider, IndexedDBFileSystemProviderErrorData } from 'vs/platform/files/browser/indexedDBFileSystemProvider';
-import { BrowserRequestService } from 'vs/workbench/services/request/browser/requestService';
-import { IRequestService } from 'vs/platform/request/common/request';
-import { IUserDataInitializationService, IUserDataInitializer, UserDataInitializationService } from 'vs/workbench/services/userData/browser/userDataInit';
-import { UserDataSyncStoreManagementService } from 'vs/platform/userDataSync/common/userDataSyncStoreService';
-import { IUserDataSyncStoreManagementService } from 'vs/platform/userDataSync/common/userDataSync';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { localize, localize2 } from 'vs/nls';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { BrowserWindow } from 'vs/workbench/browser/window';
-import { ITimerService } from 'vs/workbench/services/timer/browser/timerService';
-import { WorkspaceTrustEnablementService, WorkspaceTrustManagementService } from 'vs/workbench/services/workspaces/common/workspaceTrust';
-import { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService } from 'vs/platform/workspace/common/workspaceTrust';
-import { HTMLFileSystemProvider } from 'vs/platform/files/browser/htmlFileSystemProvider';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { mixin, safeStringify } from 'vs/base/common/objects';
-import { IndexedDB } from 'vs/base/browser/indexedDB';
-import { WebFileSystemAccess } from 'vs/platform/files/browser/webFileSystemAccess';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IProgressService } from 'vs/platform/progress/common/progress';
-import { DelayedLogChannel } from 'vs/workbench/services/output/common/delayedLogChannel';
-import { dirname, joinPath } from 'vs/base/common/resources';
-import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { NullPolicyService } from 'vs/platform/policy/common/policy';
-import { IRemoteExplorerService } from 'vs/workbench/services/remote/common/remoteExplorerService';
-import { DisposableTunnel, TunnelProtocol } from 'vs/platform/tunnel/common/tunnel';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { UserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfileService';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { BrowserUserDataProfilesService } from 'vs/platform/userDataProfile/browser/userDataProfile';
-import { DeferredPromise, timeout } from 'vs/base/common/async';
-import { windowLogId } from 'vs/workbench/services/log/common/logConstants';
-import { LogService } from 'vs/platform/log/common/logService';
-import { IRemoteSocketFactoryService, RemoteSocketFactoryService } from 'vs/platform/remote/common/remoteSocketFactoryService';
-import { BrowserSocketFactory } from 'vs/platform/remote/browser/browserSocketFactory';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { IStoredWorkspace } from 'vs/platform/workspaces/common/workspaces';
-import { UserDataProfileInitializer } from 'vs/workbench/services/userDataProfile/browser/userDataProfileInit';
-import { UserDataSyncInitializer } from 'vs/workbench/services/userDataSync/browser/userDataSyncInit';
-import { BrowserRemoteResourceLoader } from 'vs/workbench/services/remote/browser/browserRemoteResourceHandler';
-import { BufferLogger } from 'vs/platform/log/common/bufferLog';
-import { FileLoggerService } from 'vs/platform/log/common/fileLog';
-import { IEmbedderTerminalService } from 'vs/workbench/services/terminal/common/embedderTerminalService';
-import { BrowserSecretStorageService } from 'vs/workbench/services/secrets/browser/secretStorageService';
-import { EncryptionService } from 'vs/workbench/services/encryption/browser/encryptionService';
-import { IEncryptionService } from 'vs/platform/encryption/common/encryptionService';
-import { ISecretStorageService } from 'vs/platform/secrets/common/secrets';
-import { TunnelSource } from 'vs/workbench/services/remote/common/tunnelModel';
-import { mainWindow } from 'vs/base/browser/window';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
+import { mark } from '../../base/common/performance.js';
+import { domContentLoaded, detectFullscreen, getCookieValue, getWindow } from '../../base/browser/dom.js';
+import { assertIsDefined } from '../../base/common/types.js';
+import { ServiceCollection } from '../../platform/instantiation/common/serviceCollection.js';
+import { ILogService, ConsoleLogger, getLogLevel, ILoggerService, ILogger } from '../../platform/log/common/log.js';
+import { ConsoleLogInAutomationLogger } from '../../platform/log/browser/log.js';
+import { Disposable, DisposableStore, toDisposable } from '../../base/common/lifecycle.js';
+import { BrowserWorkbenchEnvironmentService, IBrowserWorkbenchEnvironmentService } from '../services/environment/browser/environmentService.js';
+import { Workbench } from './workbench.js';
+import { RemoteFileSystemProviderClient } from '../services/remote/common/remoteFileSystemProviderClient.js';
+import { IWorkbenchEnvironmentService } from '../services/environment/common/environmentService.js';
+import { IProductService } from '../../platform/product/common/productService.js';
+import product from '../../platform/product/common/product.js';
+import { RemoteAgentService } from '../services/remote/browser/remoteAgentService.js';
+import { RemoteAuthorityResolverService } from '../../platform/remote/browser/remoteAuthorityResolverService.js';
+import { IRemoteAuthorityResolverService, RemoteConnectionType } from '../../platform/remote/common/remoteAuthorityResolver.js';
+import { IRemoteAgentService } from '../services/remote/common/remoteAgentService.js';
+import { IFileService } from '../../platform/files/common/files.js';
+import { FileService } from '../../platform/files/common/fileService.js';
+import { Schemas, connectionTokenCookieName } from '../../base/common/network.js';
+import { IAnyWorkspaceIdentifier, IWorkspaceContextService, UNKNOWN_EMPTY_WINDOW_WORKSPACE, isTemporaryWorkspace, isWorkspaceIdentifier } from '../../platform/workspace/common/workspace.js';
+import { IWorkbenchConfigurationService } from '../services/configuration/common/configuration.js';
+import { onUnexpectedError } from '../../base/common/errors.js';
+import { setFullscreen } from '../../base/browser/browser.js';
+import { URI } from '../../base/common/uri.js';
+import { WorkspaceService } from '../services/configuration/browser/configurationService.js';
+import { ConfigurationCache } from '../services/configuration/common/configurationCache.js';
+import { ISignService } from '../../platform/sign/common/sign.js';
+import { SignService } from '../../platform/sign/browser/signService.js';
+import { IWorkbenchConstructionOptions, IWorkbench, IWorkspace, ITunnel } from './web.api.js';
+import { BrowserStorageService } from '../services/storage/browser/storageService.js';
+import { IStorageService } from '../../platform/storage/common/storage.js';
+import { toLocalISOString } from '../../base/common/date.js';
+import { isWorkspaceToOpen, isFolderToOpen } from '../../platform/window/common/window.js';
+import { getSingleFolderWorkspaceIdentifier, getWorkspaceIdentifier } from '../services/workspaces/browser/workspaces.js';
+import { InMemoryFileSystemProvider } from '../../platform/files/common/inMemoryFilesystemProvider.js';
+import { ICommandService } from '../../platform/commands/common/commands.js';
+import { IndexedDBFileSystemProviderErrorDataClassification, IndexedDBFileSystemProvider, IndexedDBFileSystemProviderErrorData } from '../../platform/files/browser/indexedDBFileSystemProvider.js';
+import { BrowserRequestService } from '../services/request/browser/requestService.js';
+import { IRequestService } from '../../platform/request/common/request.js';
+import { IUserDataInitializationService, IUserDataInitializer, UserDataInitializationService } from '../services/userData/browser/userDataInit.js';
+import { UserDataSyncStoreManagementService } from '../../platform/userDataSync/common/userDataSyncStoreService.js';
+import { IUserDataSyncStoreManagementService } from '../../platform/userDataSync/common/userDataSync.js';
+import { ILifecycleService } from '../services/lifecycle/common/lifecycle.js';
+import { Action2, MenuId, registerAction2 } from '../../platform/actions/common/actions.js';
+import { IInstantiationService, ServicesAccessor } from '../../platform/instantiation/common/instantiation.js';
+import { localize, localize2 } from '../../nls.js';
+import { Categories } from '../../platform/action/common/actionCommonCategories.js';
+import { IDialogService } from '../../platform/dialogs/common/dialogs.js';
+import { IHostService } from '../services/host/browser/host.js';
+import { IUriIdentityService } from '../../platform/uriIdentity/common/uriIdentity.js';
+import { UriIdentityService } from '../../platform/uriIdentity/common/uriIdentityService.js';
+import { BrowserWindow } from './window.js';
+import { ITimerService } from '../services/timer/browser/timerService.js';
+import { WorkspaceTrustEnablementService, WorkspaceTrustManagementService } from '../services/workspaces/common/workspaceTrust.js';
+import { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService } from '../../platform/workspace/common/workspaceTrust.js';
+import { HTMLFileSystemProvider } from '../../platform/files/browser/htmlFileSystemProvider.js';
+import { IOpenerService } from '../../platform/opener/common/opener.js';
+import { mixin, safeStringify } from '../../base/common/objects.js';
+import { IndexedDB } from '../../base/browser/indexedDB.js';
+import { WebFileSystemAccess } from '../../platform/files/browser/webFileSystemAccess.js';
+import { ITelemetryService } from '../../platform/telemetry/common/telemetry.js';
+import { IProgressService } from '../../platform/progress/common/progress.js';
+import { DelayedLogChannel } from '../services/output/common/delayedLogChannel.js';
+import { dirname, joinPath } from '../../base/common/resources.js';
+import { IUserDataProfile, IUserDataProfilesService } from '../../platform/userDataProfile/common/userDataProfile.js';
+import { NullPolicyService } from '../../platform/policy/common/policy.js';
+import { IRemoteExplorerService } from '../services/remote/common/remoteExplorerService.js';
+import { DisposableTunnel, TunnelProtocol } from '../../platform/tunnel/common/tunnel.js';
+import { ILabelService } from '../../platform/label/common/label.js';
+import { UserDataProfileService } from '../services/userDataProfile/common/userDataProfileService.js';
+import { IUserDataProfileService } from '../services/userDataProfile/common/userDataProfile.js';
+import { BrowserUserDataProfilesService } from '../../platform/userDataProfile/browser/userDataProfile.js';
+import { DeferredPromise, timeout } from '../../base/common/async.js';
+import { windowLogId } from '../services/log/common/logConstants.js';
+import { LogService } from '../../platform/log/common/logService.js';
+import { IRemoteSocketFactoryService, RemoteSocketFactoryService } from '../../platform/remote/common/remoteSocketFactoryService.js';
+import { BrowserSocketFactory } from '../../platform/remote/browser/browserSocketFactory.js';
+import { VSBuffer } from '../../base/common/buffer.js';
+import { IStoredWorkspace } from '../../platform/workspaces/common/workspaces.js';
+import { UserDataProfileInitializer } from '../services/userDataProfile/browser/userDataProfileInit.js';
+import { UserDataSyncInitializer } from '../services/userDataSync/browser/userDataSyncInit.js';
+import { BrowserRemoteResourceLoader } from '../services/remote/browser/browserRemoteResourceHandler.js';
+import { BufferLogger } from '../../platform/log/common/bufferLog.js';
+import { FileLoggerService } from '../../platform/log/common/fileLog.js';
+import { IEmbedderTerminalService } from '../services/terminal/common/embedderTerminalService.js';
+import { BrowserSecretStorageService } from '../services/secrets/browser/secretStorageService.js';
+import { EncryptionService } from '../services/encryption/browser/encryptionService.js';
+import { IEncryptionService } from '../../platform/encryption/common/encryptionService.js';
+import { ISecretStorageService } from '../../platform/secrets/common/secrets.js';
+import { TunnelSource } from '../services/remote/common/tunnelModel.js';
+import { mainWindow } from '../../base/browser/window.js';
+import { INotificationService, Severity } from '../../platform/notification/common/notification.js';
 
 export class BrowserMain extends Disposable {
 
@@ -341,6 +341,7 @@ export class BrowserMain extends Disposable {
 		serviceCollection.set(IUserDataProfilesService, userDataProfilesService);
 
 		const currentProfile = await this.getCurrentProfile(workspace, userDataProfilesService, environmentService);
+		await userDataProfilesService.setProfileForWorkspace(workspace, currentProfile);
 		const userDataProfileService = new UserDataProfileService(currentProfile);
 		serviceCollection.set(IUserDataProfileService, userDataProfileService);
 
@@ -396,7 +397,7 @@ export class BrowserMain extends Disposable {
 		this._register(workspaceTrustManagementService.onDidChangeTrust(() => configurationService.updateWorkspaceTrust(workspaceTrustManagementService.isWorkspaceTrusted())));
 
 		// Request Service
-		const requestService = new BrowserRequestService(remoteAgentService, configurationService, loggerService);
+		const requestService = new BrowserRequestService(remoteAgentService, configurationService, logService);
 		serviceCollection.set(IRequestService, requestService);
 
 		// Userdata Sync Store Management Service
@@ -588,13 +589,14 @@ export class BrowserMain extends Disposable {
 		}
 	}
 
-	private async getCurrentProfile(workspace: IAnyWorkspaceIdentifier, userDataProfilesService: BrowserUserDataProfilesService, environmentService: IBrowserWorkbenchEnvironmentService): Promise<IUserDataProfile> {
-		if (environmentService.options?.profile) {
-			const profile = userDataProfilesService.profiles.find(p => p.name === environmentService.options?.profile?.name);
+	private async getCurrentProfile(workspace: IAnyWorkspaceIdentifier, userDataProfilesService: BrowserUserDataProfilesService, environmentService: BrowserWorkbenchEnvironmentService): Promise<IUserDataProfile> {
+		const profileName = environmentService.options?.profile?.name ?? environmentService.profile;
+		if (profileName) {
+			const profile = userDataProfilesService.profiles.find(p => p.name === profileName);
 			if (profile) {
 				return profile;
 			}
-			return userDataProfilesService.createNamedProfile(environmentService.options?.profile?.name, undefined, workspace);
+			return userDataProfilesService.createNamedProfile(profileName, undefined, workspace);
 		}
 		return userDataProfilesService.getProfileForWorkspace(workspace) ?? userDataProfilesService.defaultProfile;
 	}
diff --git a/src/vs/workbench/browser/window.ts b/src/vs/workbench/browser/window.ts
index e964af6543e..3b476132d89 100644
--- a/src/vs/workbench/browser/window.ts
+++ b/src/vs/workbench/browser/window.ts
@@ -3,34 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isSafari, setFullscreen } from 'vs/base/browser/browser';
-import { addDisposableListener, EventHelper, EventType, getActiveWindow, getWindow, getWindowById, getWindows, getWindowsCount, windowOpenNoOpener, windowOpenPopup, windowOpenWithSuccess } from 'vs/base/browser/dom';
-import { DomEmitter } from 'vs/base/browser/event';
-import { HidDeviceData, requestHidDevice, requestSerialPort, requestUsbDevice, SerialPortData, UsbDeviceData } from 'vs/base/browser/deviceAccess';
-import { timeout } from 'vs/base/common/async';
-import { Event } from 'vs/base/common/event';
-import { Disposable, IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
-import { matchesScheme, Schemas } from 'vs/base/common/network';
-import { isIOS, isMacintosh } from 'vs/base/common/platform';
-import Severity from 'vs/base/common/severity';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { IDialogService, IPromptButton } from 'vs/platform/dialogs/common/dialogs';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
-import { BrowserLifecycleService } from 'vs/workbench/services/lifecycle/browser/lifecycleService';
-import { ILifecycleService, ShutdownReason } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { registerWindowDriver } from 'vs/workbench/services/driver/browser/driver';
-import { CodeWindow, isAuxiliaryWindow, mainWindow } from 'vs/base/browser/window';
-import { createSingleCallFunction } from 'vs/base/common/functional';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
+import { isSafari, setFullscreen } from '../../base/browser/browser.js';
+import { addDisposableListener, EventHelper, EventType, getActiveWindow, getWindow, getWindowById, getWindows, getWindowsCount, windowOpenNoOpener, windowOpenPopup, windowOpenWithSuccess } from '../../base/browser/dom.js';
+import { DomEmitter } from '../../base/browser/event.js';
+import { HidDeviceData, requestHidDevice, requestSerialPort, requestUsbDevice, SerialPortData, UsbDeviceData } from '../../base/browser/deviceAccess.js';
+import { timeout } from '../../base/common/async.js';
+import { Event } from '../../base/common/event.js';
+import { Disposable, IDisposable, dispose, toDisposable } from '../../base/common/lifecycle.js';
+import { matchesScheme, Schemas } from '../../base/common/network.js';
+import { isIOS, isMacintosh } from '../../base/common/platform.js';
+import Severity from '../../base/common/severity.js';
+import { URI } from '../../base/common/uri.js';
+import { localize } from '../../nls.js';
+import { CommandsRegistry } from '../../platform/commands/common/commands.js';
+import { IDialogService, IPromptButton } from '../../platform/dialogs/common/dialogs.js';
+import { IInstantiationService, ServicesAccessor } from '../../platform/instantiation/common/instantiation.js';
+import { ILabelService } from '../../platform/label/common/label.js';
+import { IOpenerService } from '../../platform/opener/common/opener.js';
+import { IProductService } from '../../platform/product/common/productService.js';
+import { IBrowserWorkbenchEnvironmentService } from '../services/environment/browser/environmentService.js';
+import { IWorkbenchLayoutService } from '../services/layout/browser/layoutService.js';
+import { BrowserLifecycleService } from '../services/lifecycle/browser/lifecycleService.js';
+import { ILifecycleService, ShutdownReason } from '../services/lifecycle/common/lifecycle.js';
+import { IHostService } from '../services/host/browser/host.js';
+import { registerWindowDriver } from '../services/driver/browser/driver.js';
+import { CodeWindow, isAuxiliaryWindow, mainWindow } from '../../base/browser/window.js';
+import { createSingleCallFunction } from '../../base/common/functional.js';
+import { IConfigurationService } from '../../platform/configuration/common/configuration.js';
+import { IWorkbenchEnvironmentService } from '../services/environment/common/environmentService.js';
 
 export abstract class BaseWindow extends Disposable {
 
@@ -133,9 +133,19 @@ export abstract class BaseWindow extends Disposable {
 					continue; // skip over hidden windows (but never over main window)
 				}
 
-				const handle = (window as any).vscodeOriginalSetTimeout.apply(this, [handlerFn, timeout, ...args]);
+				// we track didClear in case the browser does not properly clear the timeout
+				// this can happen for timeouts on unfocused windows
+				let didClear = false;
+
+				const handle = (window as any).vscodeOriginalSetTimeout.apply(this, [(...args: unknown[]) => {
+					if (didClear) {
+						return;
+					}
+					handlerFn(...args);
+				}, timeout, ...args]);
 
 				const timeoutDisposable = toDisposable(() => {
+					didClear = true;
 					(window as any).vscodeOriginalClearTimeout(handle);
 					timeoutDisposables.delete(timeoutDisposable);
 				});
diff --git a/src/vs/workbench/browser/workbench.contribution.ts b/src/vs/workbench/browser/workbench.contribution.ts
index 8494c963f3f..30699b39a33 100644
--- a/src/vs/workbench/browser/workbench.contribution.ts
+++ b/src/vs/workbench/browser/workbench.contribution.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Registry } from 'vs/platform/registry/common/platform';
-import { localize } from 'vs/nls';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
-import { isMacintosh, isWindows, isLinux, isWeb } from 'vs/base/common/platform';
-import { ConfigurationMigrationWorkbenchContribution, DynamicWorkbenchSecurityConfiguration, IConfigurationMigrationRegistry, workbenchConfigurationNodeBase, Extensions, ConfigurationKeyValuePairs, problemsConfigurationNodeBase, windowConfigurationNodeBase, DynamicWindowConfiguration } from 'vs/workbench/common/configuration';
-import { isStandalone } from 'vs/base/browser/browser';
-import { WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { ActivityBarPosition, EditorActionsLocation, EditorTabsMode, LayoutSettings } from 'vs/workbench/services/layout/browser/layoutService';
-import { defaultWindowTitle, defaultWindowTitleSeparator } from 'vs/workbench/browser/parts/titlebar/windowTitle';
-import { CustomEditorLabelService } from 'vs/workbench/services/editor/common/customEditorLabelService';
+import { Registry } from '../../platform/registry/common/platform.js';
+import { localize } from '../../nls.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from '../../platform/configuration/common/configurationRegistry.js';
+import { isMacintosh, isWindows, isLinux, isWeb, isNative } from '../../base/common/platform.js';
+import { ConfigurationMigrationWorkbenchContribution, DynamicWorkbenchSecurityConfiguration, IConfigurationMigrationRegistry, workbenchConfigurationNodeBase, Extensions, ConfigurationKeyValuePairs, problemsConfigurationNodeBase, windowConfigurationNodeBase, DynamicWindowConfiguration } from '../common/configuration.js';
+import { isStandalone } from '../../base/browser/browser.js';
+import { WorkbenchPhase, registerWorkbenchContribution2 } from '../common/contributions.js';
+import { ActivityBarPosition, EditorActionsLocation, EditorTabsMode, LayoutSettings } from '../services/layout/browser/layoutService.js';
+import { defaultWindowTitle, defaultWindowTitleSeparator } from './parts/titlebar/windowTitle.js';
+import { CustomEditorLabelService } from '../services/editor/common/customEditorLabelService.js';
 
 const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
 
@@ -29,6 +29,12 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
 	registry.registerConfiguration({
 		...workbenchConfigurationNodeBase,
 		'properties': {
+			'workbench.externalBrowser': {
+				type: 'string',
+				markdownDescription: localize('browser', "Configure the browser to use for opening http or https links externally. This can either be the name of the browser (`edge`, `chrome`, `firefox`) or an absolute path to the browser's executable. Will use the system default if not set."),
+				included: isNative,
+				restricted: true
+			},
 			'workbench.editor.titleScrollbarSizing': {
 				type: 'string',
 				enum: ['default', 'large'],
@@ -102,9 +108,10 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
 					let customEditorLabelDescription = localize('workbench.editor.label.patterns', "Controls the rendering of the editor label. Each __Item__ is a pattern that matches a file path. Both relative and absolute file paths are supported. The relative path must include the WORKSPACE_FOLDER (e.g `WORKSPACE_FOLDER/src/**.tsx` or `*/src/**.tsx`). Absolute patterns must start with a `/`. In case multiple patterns match, the longest matching path will be picked. Each __Value__ is the template for the rendered editor when the __Item__ matches. Variables are substituted based on the context:");
 					customEditorLabelDescription += '\n- ' + [
 						localize('workbench.editor.label.dirname', "`${dirname}`: name of the folder in which the file is located (e.g. `WORKSPACE_FOLDER/folder/file.txt -> folder`)."),
-						localize('workbench.editor.label.nthdirname', "`${dirname(N)}`: name of the nth parent folder in which the file is located (e.g. `N=2: WORKSPACE_FOLDER/static/folder/file.txt -> WORKSPACE_FOLDER`). Folders can be picked from the start of the path by using negative numbers (e.g. `N=-1: WORKSPACE_FOLDER/folder/file.txt -> WORKSPACE_FOLDER`). If the __Item__ is an absolute pattern path, the first folder (`N=-1`) refers to the first folder in the absoulte path, otherwise it corresponds to the workspace folder."),
+						localize('workbench.editor.label.nthdirname', "`${dirname(N)}`: name of the nth parent folder in which the file is located (e.g. `N=2: WORKSPACE_FOLDER/static/folder/file.txt -> WORKSPACE_FOLDER`). Folders can be picked from the start of the path by using negative numbers (e.g. `N=-1: WORKSPACE_FOLDER/folder/file.txt -> WORKSPACE_FOLDER`). If the __Item__ is an absolute pattern path, the first folder (`N=-1`) refers to the first folder in the absolute path, otherwise it corresponds to the workspace folder."),
 						localize('workbench.editor.label.filename', "`${filename}`: name of the file without the file extension (e.g. `WORKSPACE_FOLDER/folder/file.txt -> file`)."),
 						localize('workbench.editor.label.extname', "`${extname}`: the file extension (e.g. `WORKSPACE_FOLDER/folder/file.txt -> txt`)."),
+						localize('workbench.editor.label.nthextname', "`${extname(N)}`: the nth extension of the file separated by '.' (e.g. `N=2: WORKSPACE_FOLDER/folder/file.ext1.ext2.ext3 -> ext1`). Extension can be picked from the start of the extension by using negative numbers (e.g. `N=-1: WORKSPACE_FOLDER/folder/file.ext1.ext2.ext3 -> ext2`)."),
 					].join('\n- '); // intentionally concatenated to not produce a string that is too long for translations
 					customEditorLabelDescription += '\n\n' + localize('customEditorLabelDescriptionExample', "Example: `\"**/static/**/*.html\": \"${filename} - ${dirname} (${extname})\"` will render a file `WORKSPACE_FOLDER/static/folder/file.html` as `file - folder (html)`.");
 
@@ -112,8 +119,8 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
 				})(),
 				additionalProperties:
 				{
-					type: 'string',
-					markdownDescription: localize('workbench.editor.label.template', "The template which should be rendered when the pattern mtches. May include the variables ${dirname}, ${filename} and ${extname}."),
+					type: ['string', 'null'],
+					markdownDescription: localize('workbench.editor.label.template', "The template which should be rendered when the pattern matches. May include the variables ${dirname}, ${filename} and ${extname}."),
 					minLength: 1,
 					pattern: '.*[a-zA-Z0-9].*'
 				},
@@ -288,7 +295,7 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
 			},
 			'workbench.editor.enablePreview': {
 				'type': 'boolean',
-				'description': localize('enablePreview', "Controls whether opened editors show as preview editors. Preview editors do not stay open, are reused until explicitly set to be kept open (via double-click or editing), and show file names in italics."),
+				'description': localize('enablePreview', "Controls whether preview mode is used when editors open. There is a maximum of one preview mode editor per editor group. This editor displays its filename in italics on its tab or title label and in the Open Editors view. Its contents will be replaced by the next editor opened in preview mode. Making a change in a preview mode editor will persist it, as will a double-click on its label, or the 'Keep Open' option in its label context menu. Opening a file from Explorer with a double-click persists its editor immediately."),
 				'default': true
 			},
 			'workbench.editor.enablePreviewFromQuickOpen': {
@@ -507,11 +514,17 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
 				'default': 'left',
 				'description': localize('sideBarLocation', "Controls the location of the primary side bar and activity bar. They can either show on the left or right of the workbench. The secondary side bar will show on the opposite side of the workbench.")
 			},
+			'workbench.panel.showLabel': {
+				'type': 'boolean',
+				'default': true,
+				'included': false,
+				'description': localize('panelShowLabel', "Controls whether activity items in the panel title are shown as label or icon."),
+			},
 			'workbench.panel.defaultLocation': {
 				'type': 'string',
-				'enum': ['left', 'bottom', 'right'],
+				'enum': ['left', 'bottom', 'top', 'right'],
 				'default': 'bottom',
-				'description': localize('panelDefaultLocation', "Controls the default location of the panel (Terminal, Debug Console, Output, Problems) in a new workspace. It can either show at the bottom, right, or left of the editor area."),
+				'description': localize('panelDefaultLocation', "Controls the default location of the panel (Terminal, Debug Console, Output, Problems) in a new workspace. It can either show at the bottom, top, right, or left of the editor area."),
 			},
 			'workbench.panel.opensMaximized': {
 				'type': 'string',
diff --git a/src/vs/workbench/browser/workbench.ts b/src/vs/workbench/browser/workbench.ts
index b0688133537..b40c9fa73a9 100644
--- a/src/vs/workbench/browser/workbench.ts
+++ b/src/vs/workbench/browser/workbench.ts
@@ -3,53 +3,52 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/workbench/browser/style';
-import { localize } from 'vs/nls';
-import { runWhenWindowIdle } from 'vs/base/browser/dom';
-import { Event, Emitter, setGlobalLeakWarningThreshold } from 'vs/base/common/event';
-import { RunOnceScheduler, timeout } from 'vs/base/common/async';
-import { isFirefox, isSafari, isChrome } from 'vs/base/browser/browser';
-import { mark } from 'vs/base/common/performance';
-import { onUnexpectedError, setUnexpectedErrorHandler } from 'vs/base/common/errors';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { isWindows, isLinux, isWeb, isNative, isMacintosh } from 'vs/base/common/platform';
-import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
-import { IEditorFactoryRegistry, EditorExtensions } from 'vs/workbench/common/editor';
-import { getSingletonServiceDescriptors } from 'vs/platform/instantiation/common/extensions';
-import { Position, Parts, IWorkbenchLayoutService, positionToString } from 'vs/workbench/services/layout/browser/layoutService';
-import { IStorageService, WillSaveStateReason, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IConfigurationChangeEvent, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { LifecyclePhase, ILifecycleService, WillShutdownEvent } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { NotificationService } from 'vs/workbench/services/notification/common/notificationService';
-import { NotificationsCenter } from 'vs/workbench/browser/parts/notifications/notificationsCenter';
-import { NotificationsAlerts } from 'vs/workbench/browser/parts/notifications/notificationsAlerts';
-import { NotificationsStatus } from 'vs/workbench/browser/parts/notifications/notificationsStatus';
-import { NotificationsTelemetry } from 'vs/workbench/browser/parts/notifications/notificationsTelemetry';
-import { registerNotificationCommands } from 'vs/workbench/browser/parts/notifications/notificationsCommands';
-import { NotificationsToasts } from 'vs/workbench/browser/parts/notifications/notificationsToasts';
-import { setARIAContainer } from 'vs/base/browser/ui/aria/aria';
-import { FontMeasurements } from 'vs/editor/browser/config/fontMeasurements';
-import { BareFontInfo } from 'vs/editor/common/config/fontInfo';
-import { ILogService } from 'vs/platform/log/common/log';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { WorkbenchContextKeysHandler } from 'vs/workbench/browser/contextkeys';
-import { coalesce } from 'vs/base/common/arrays';
-import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
-import { Layout } from 'vs/workbench/browser/layout';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { mainWindow } from 'vs/base/browser/window';
-import { PixelRatio } from 'vs/base/browser/pixelRatio';
-import { IHoverService, WorkbenchHoverDelegate } from 'vs/platform/hover/browser/hover';
-import { setHoverDelegateFactory } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { setBaseLayerHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate2';
-import { AccessibilityProgressSignalScheduler } from 'vs/platform/accessibilitySignal/browser/progressAccessibilitySignalScheduler';
-import { setProgressAcccessibilitySignalScheduler } from 'vs/base/browser/ui/progressbar/progressAccessibilitySignal';
-import { AccessibleViewRegistry } from 'vs/platform/accessibility/browser/accessibleViewRegistry';
-import { NotificationAccessibleView } from 'vs/workbench/browser/parts/notifications/notificationAccessibleView';
+import './style.js';
+import { runWhenWindowIdle } from '../../base/browser/dom.js';
+import { Event, Emitter, setGlobalLeakWarningThreshold } from '../../base/common/event.js';
+import { RunOnceScheduler, timeout } from '../../base/common/async.js';
+import { isFirefox, isSafari, isChrome } from '../../base/browser/browser.js';
+import { mark } from '../../base/common/performance.js';
+import { onUnexpectedError, setUnexpectedErrorHandler } from '../../base/common/errors.js';
+import { Registry } from '../../platform/registry/common/platform.js';
+import { isWindows, isLinux, isWeb, isNative, isMacintosh } from '../../base/common/platform.js';
+import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from '../common/contributions.js';
+import { IEditorFactoryRegistry, EditorExtensions } from '../common/editor.js';
+import { getSingletonServiceDescriptors } from '../../platform/instantiation/common/extensions.js';
+import { Position, Parts, IWorkbenchLayoutService, positionToString } from '../services/layout/browser/layoutService.js';
+import { IStorageService, WillSaveStateReason, StorageScope, StorageTarget } from '../../platform/storage/common/storage.js';
+import { IConfigurationChangeEvent, IConfigurationService } from '../../platform/configuration/common/configuration.js';
+import { IInstantiationService } from '../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../platform/instantiation/common/serviceCollection.js';
+import { LifecyclePhase, ILifecycleService, WillShutdownEvent } from '../services/lifecycle/common/lifecycle.js';
+import { INotificationService } from '../../platform/notification/common/notification.js';
+import { NotificationService } from '../services/notification/common/notificationService.js';
+import { NotificationsCenter } from './parts/notifications/notificationsCenter.js';
+import { NotificationsAlerts } from './parts/notifications/notificationsAlerts.js';
+import { NotificationsStatus } from './parts/notifications/notificationsStatus.js';
+import { NotificationsTelemetry } from './parts/notifications/notificationsTelemetry.js';
+import { registerNotificationCommands } from './parts/notifications/notificationsCommands.js';
+import { NotificationsToasts } from './parts/notifications/notificationsToasts.js';
+import { setARIAContainer } from '../../base/browser/ui/aria/aria.js';
+import { FontMeasurements } from '../../editor/browser/config/fontMeasurements.js';
+import { BareFontInfo } from '../../editor/common/config/fontInfo.js';
+import { ILogService } from '../../platform/log/common/log.js';
+import { toErrorMessage } from '../../base/common/errorMessage.js';
+import { WorkbenchContextKeysHandler } from './contextkeys.js';
+import { coalesce } from '../../base/common/arrays.js';
+import { InstantiationService } from '../../platform/instantiation/common/instantiationService.js';
+import { Layout } from './layout.js';
+import { IHostService } from '../services/host/browser/host.js';
+import { IDialogService } from '../../platform/dialogs/common/dialogs.js';
+import { mainWindow } from '../../base/browser/window.js';
+import { PixelRatio } from '../../base/browser/pixelRatio.js';
+import { IHoverService, WorkbenchHoverDelegate } from '../../platform/hover/browser/hover.js';
+import { setHoverDelegateFactory } from '../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { setBaseLayerHoverDelegate } from '../../base/browser/ui/hover/hoverDelegate2.js';
+import { AccessibilityProgressSignalScheduler } from '../../platform/accessibilitySignal/browser/progressAccessibilitySignalScheduler.js';
+import { setProgressAcccessibilitySignalScheduler } from '../../base/browser/ui/progressbar/progressAccessibilitySignal.js';
+import { AccessibleViewRegistry } from '../../platform/accessibility/browser/accessibleViewRegistry.js';
+import { NotificationAccessibleView } from './parts/notifications/notificationAccessibleView.js';
 
 export interface IWorkbenchOptions {
 
@@ -97,32 +96,6 @@ export class Workbench extends Layout {
 
 		// Install handler for unexpected errors
 		setUnexpectedErrorHandler(error => this.handleUnexpectedError(error, logService));
-
-		// Inform user about loading issues from the loader
-		interface AnnotatedLoadingError extends Error {
-			phase: 'loading';
-			moduleId: string;
-			neededBy: string[];
-		}
-		interface AnnotatedFactoryError extends Error {
-			phase: 'factory';
-			moduleId: string;
-		}
-		interface AnnotatedValidationError extends Error {
-			phase: 'configuration';
-		}
-		type AnnotatedError = AnnotatedLoadingError | AnnotatedFactoryError | AnnotatedValidationError;
-
-		if (typeof mainWindow.require?.config === 'function') {
-			mainWindow.require.config({
-				onError: (err: AnnotatedError) => {
-					if (err.phase === 'loading') {
-						onUnexpectedError(new Error(localize('loaderErrorNative', "Failed to load a required file. Please restart the application to try again. Details: {0}", JSON.stringify(err))));
-					}
-					console.error(err);
-				}
-			});
-		}
 	}
 
 	private previousUnexpectedError: { message: string | undefined; time: number } = { message: undefined, time: 0 };
diff --git a/src/vs/workbench/common/comments.ts b/src/vs/workbench/common/comments.ts
index 038819d8f99..4f4d00de478 100644
--- a/src/vs/workbench/common/comments.ts
+++ b/src/vs/workbench/common/comments.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { MarshalledId } from 'vs/base/common/marshallingIds';
-import { CommentThread } from 'vs/editor/common/languages';
+import { MarshalledId } from '../../base/common/marshallingIds.js';
+import { CommentThread } from '../../editor/common/languages.js';
 
 export interface MarshalledCommentThread {
 	$mid: MarshalledId.CommentThread;
diff --git a/src/vs/workbench/common/component.ts b/src/vs/workbench/common/component.ts
index f8dd0115412..c579f0c1e53 100644
--- a/src/vs/workbench/common/component.ts
+++ b/src/vs/workbench/common/component.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Memento, MementoObject } from 'vs/workbench/common/memento';
-import { IThemeService, Themable } from 'vs/platform/theme/common/themeService';
-import { IStorageService, IStorageValueChangeEvent, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { Event } from 'vs/base/common/event';
+import { Memento, MementoObject } from './memento.js';
+import { IThemeService, Themable } from '../../platform/theme/common/themeService.js';
+import { IStorageService, IStorageValueChangeEvent, StorageScope, StorageTarget } from '../../platform/storage/common/storage.js';
+import { DisposableStore } from '../../base/common/lifecycle.js';
+import { Event } from '../../base/common/event.js';
 
 export class Component extends Themable {
 
diff --git a/src/vs/workbench/common/composite.ts b/src/vs/workbench/common/composite.ts
index 58bc7258b11..57d16c4b36b 100644
--- a/src/vs/workbench/common/composite.ts
+++ b/src/vs/workbench/common/composite.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
+import { Event } from '../../base/common/event.js';
 
 export interface IComposite {
 
diff --git a/src/vs/workbench/common/configuration.ts b/src/vs/workbench/common/configuration.ts
index f4aff57ea85..9fb1e03a4ef 100644
--- a/src/vs/workbench/common/configuration.ts
+++ b/src/vs/workbench/common/configuration.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { ConfigurationScope, IConfigurationNode, IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IWorkspaceContextService, IWorkspaceFolder, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { ConfigurationTarget, IConfigurationService, IConfigurationValue, IInspectValue } from 'vs/platform/configuration/common/configuration';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Emitter } from 'vs/base/common/event';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { OperatingSystem, isWindows } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { equals } from 'vs/base/common/objects';
-import { DeferredPromise } from 'vs/base/common/async';
-import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { localize } from '../../nls.js';
+import { ConfigurationScope, IConfigurationNode, IConfigurationRegistry, Extensions as ConfigurationExtensions } from '../../platform/configuration/common/configurationRegistry.js';
+import { Registry } from '../../platform/registry/common/platform.js';
+import { IWorkbenchContribution } from './contributions.js';
+import { IWorkspaceContextService, IWorkspaceFolder, WorkbenchState } from '../../platform/workspace/common/workspace.js';
+import { ConfigurationTarget, IConfigurationService, IConfigurationValue, IInspectValue } from '../../platform/configuration/common/configuration.js';
+import { Disposable } from '../../base/common/lifecycle.js';
+import { Emitter } from '../../base/common/event.js';
+import { IRemoteAgentService } from '../services/remote/common/remoteAgentService.js';
+import { OperatingSystem, isWindows } from '../../base/common/platform.js';
+import { URI } from '../../base/common/uri.js';
+import { equals } from '../../base/common/objects.js';
+import { DeferredPromise } from '../../base/common/async.js';
+import { IUserDataProfile, IUserDataProfilesService } from '../../platform/userDataProfile/common/userDataProfile.js';
 
 export const applicationConfigurationNodeBase = Object.freeze<IConfigurationNode>({
 	'id': 'application',
@@ -272,7 +272,7 @@ export class DynamicWindowConfiguration extends Disposable implements IWorkbench
 					'default': null,
 					'enum': [...this.userDataProfilesService.profiles.map(profile => profile.name), null],
 					'enumItemLabels': [...this.userDataProfilesService.profiles.map(p => ''), localize('active window', "Active Window")],
-					'description': localize('newWindowProfile', "Specifies the profile to use when opening a new window. If a profile name is provided, the new window will use that profile. If no profile name is provided, the new window will use the profile of the active window or the default profile if no active window exists."),
+					'description': localize('newWindowProfile', "Specifies the profile to use when opening a new window. If a profile name is provided, the new window will use that profile. If no profile name is provided, the new window will use the profile of the active window or the Default profile if no active window exists."),
 					'scope': ConfigurationScope.APPLICATION,
 				}
 			}
diff --git a/src/vs/workbench/common/contextkeys.ts b/src/vs/workbench/common/contextkeys.ts
index 97937218bbb..1e808dfc895 100644
--- a/src/vs/workbench/common/contextkeys.ts
+++ b/src/vs/workbench/common/contextkeys.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { IContextKeyService, IContextKey, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { basename, dirname, extname, isEqual } from 'vs/base/common/resources';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IModelService } from 'vs/editor/common/services/model';
-import { Schemas } from 'vs/base/common/network';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { IEditorResolverService } from 'vs/workbench/services/editor/common/editorResolverService';
-import { DEFAULT_EDITOR_ASSOCIATION } from 'vs/workbench/common/editor';
-import { isLinux } from 'vs/base/common/platform';
+import { DisposableStore } from '../../base/common/lifecycle.js';
+import { URI } from '../../base/common/uri.js';
+import { localize } from '../../nls.js';
+import { IContextKeyService, IContextKey, RawContextKey } from '../../platform/contextkey/common/contextkey.js';
+import { basename, dirname, extname, isEqual } from '../../base/common/resources.js';
+import { ILanguageService } from '../../editor/common/languages/language.js';
+import { IFileService } from '../../platform/files/common/files.js';
+import { IModelService } from '../../editor/common/services/model.js';
+import { Schemas } from '../../base/common/network.js';
+import { EditorInput } from './editor/editorInput.js';
+import { IEditorResolverService } from '../services/editor/common/editorResolverService.js';
+import { DEFAULT_EDITOR_ASSOCIATION } from './editor.js';
+import { isLinux } from '../../base/common/platform.js';
 
 //#region < --- Workbench --- >
 
@@ -74,6 +74,7 @@ export const MultipleEditorGroupsContext = new RawContextKey<boolean>('multipleE
 export const SingleEditorGroupsContext = MultipleEditorGroupsContext.toNegated();
 export const MultipleEditorsSelectedInGroupContext = new RawContextKey<boolean>('multipleEditorsSelectedInGroup', false, localize('multipleEditorsSelectedInGroup', "Whether multiple editors have been selected in an editor group"));
 export const TwoEditorsSelectedInGroupContext = new RawContextKey<boolean>('twoEditorsSelectedInGroup', false, localize('twoEditorsSelectedInGroup', "Whether exactly two editors have been selected in an editor group"));
+export const SelectedEditorsInGroupFileOrUntitledResourceContextKey = new RawContextKey<boolean>('SelectedEditorsInGroupFileOrUntitledResourceContextKey', true, localize('SelectedEditorsInGroupFileOrUntitledResourceContextKey', "Whether all selected editors in a group have a file or untitled resource associated"));
 
 // Editor Part Context Keys
 export const EditorPartMultipleEditorGroupsContext = new RawContextKey<boolean>('editorPartMultipleEditorGroups', false, localize('editorPartMultipleEditorGroups', "Whether there are multiple editor groups opened in an editor part"));
diff --git a/src/vs/workbench/common/contributions.ts b/src/vs/workbench/common/contributions.ts
index f7e23fae0a2..20b66d726fc 100644
--- a/src/vs/workbench/common/contributions.ts
+++ b/src/vs/workbench/common/contributions.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IInstantiationService, IConstructorSignature, ServicesAccessor, BrandedService } from 'vs/platform/instantiation/common/instantiation';
-import { ILifecycleService, LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IdleDeadline, DeferredPromise, runWhenGlobalIdle } from 'vs/base/common/async';
-import { mark } from 'vs/base/common/performance';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { getOrSet } from 'vs/base/common/map';
-import { Disposable, DisposableStore, isDisposable } from 'vs/base/common/lifecycle';
-import { IEditorPaneService } from 'vs/workbench/services/editor/common/editorPaneService';
+import { IInstantiationService, IConstructorSignature, ServicesAccessor, BrandedService } from '../../platform/instantiation/common/instantiation.js';
+import { ILifecycleService, LifecyclePhase } from '../services/lifecycle/common/lifecycle.js';
+import { Registry } from '../../platform/registry/common/platform.js';
+import { IdleDeadline, DeferredPromise, runWhenGlobalIdle } from '../../base/common/async.js';
+import { mark } from '../../base/common/performance.js';
+import { ILogService } from '../../platform/log/common/log.js';
+import { IEnvironmentService } from '../../platform/environment/common/environment.js';
+import { getOrSet } from '../../base/common/map.js';
+import { Disposable, DisposableStore, isDisposable } from '../../base/common/lifecycle.js';
+import { IEditorPaneService } from '../services/editor/common/editorPaneService.js';
 
 /**
  * A workbench contribution that will be loaded when the workbench starts and disposed when the workbench shuts down.
diff --git a/src/vs/workbench/common/dialogs.ts b/src/vs/workbench/common/dialogs.ts
index 5a26c41562c..6073d25b935 100644
--- a/src/vs/workbench/common/dialogs.ts
+++ b/src/vs/workbench/common/dialogs.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DeferredPromise } from 'vs/base/common/async';
-import { Event, Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IDialogArgs, IDialogResult } from 'vs/platform/dialogs/common/dialogs';
+import { DeferredPromise } from '../../base/common/async.js';
+import { Event, Emitter } from '../../base/common/event.js';
+import { Disposable } from '../../base/common/lifecycle.js';
+import { IDialogArgs, IDialogResult } from '../../platform/dialogs/common/dialogs.js';
 
 export interface IDialogViewItem {
 	readonly args: IDialogArgs;
diff --git a/src/vs/workbench/common/editor.ts b/src/vs/workbench/common/editor.ts
index 02aff158f4f..a3e8516c6e6 100644
--- a/src/vs/workbench/common/editor.ts
+++ b/src/vs/workbench/common/editor.ts
@@ -3,31 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { Event } from 'vs/base/common/event';
-import { DeepRequiredNonNullable, assertIsDefined } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { ICodeEditorViewState, IDiffEditor, IDiffEditorViewState, IEditor, IEditorViewState } from 'vs/editor/common/editorCommon';
-import { IEditorOptions, IResourceEditorInput, ITextResourceEditorInput, IBaseTextResourceEditorInput, IBaseUntypedEditorInput, ITextEditorOptions } from 'vs/platform/editor/common/editor';
-import type { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { IInstantiationService, IConstructorSignature, ServicesAccessor, BrandedService } from 'vs/platform/instantiation/common/instantiation';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IEncodingSupport, ILanguageSupport } from 'vs/workbench/services/textfile/common/textfiles';
-import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { ICompositeControl, IComposite } from 'vs/workbench/common/composite';
-import { FileType, IFileReadLimits, IFileService } from 'vs/platform/files/common/files';
-import { IPathData } from 'vs/platform/window/common/window';
-import { IExtUri } from 'vs/base/common/resources';
-import { Schemas } from 'vs/base/common/network';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IErrorWithActions, createErrorWithActions, isErrorWithActions } from 'vs/base/common/errorMessage';
-import { IAction, toAction } from 'vs/base/common/actions';
-import Severity from 'vs/base/common/severity';
-import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
-import { IReadonlyEditorGroupModel } from 'vs/workbench/common/editor/editorGroupModel';
+import { localize } from '../../nls.js';
+import { Event } from '../../base/common/event.js';
+import { DeepRequiredNonNullable, assertIsDefined } from '../../base/common/types.js';
+import { URI } from '../../base/common/uri.js';
+import { Disposable, IDisposable, toDisposable } from '../../base/common/lifecycle.js';
+import { ICodeEditorViewState, IDiffEditor, IDiffEditorViewState, IEditor, IEditorViewState } from '../../editor/common/editorCommon.js';
+import { IEditorOptions, IResourceEditorInput, ITextResourceEditorInput, IBaseTextResourceEditorInput, IBaseUntypedEditorInput, ITextEditorOptions } from '../../platform/editor/common/editor.js';
+import type { EditorInput } from './editor/editorInput.js';
+import { IInstantiationService, IConstructorSignature, ServicesAccessor, BrandedService } from '../../platform/instantiation/common/instantiation.js';
+import { IContextKeyService } from '../../platform/contextkey/common/contextkey.js';
+import { Registry } from '../../platform/registry/common/platform.js';
+import { IEncodingSupport, ILanguageSupport } from '../services/textfile/common/textfiles.js';
+import { IEditorGroup } from '../services/editor/common/editorGroupsService.js';
+import { ICompositeControl, IComposite } from './composite.js';
+import { FileType, IFileReadLimits, IFileService } from '../../platform/files/common/files.js';
+import { IPathData } from '../../platform/window/common/window.js';
+import { IExtUri } from '../../base/common/resources.js';
+import { Schemas } from '../../base/common/network.js';
+import { IEditorService } from '../services/editor/common/editorService.js';
+import { ILogService } from '../../platform/log/common/log.js';
+import { IErrorWithActions, createErrorWithActions, isErrorWithActions } from '../../base/common/errorMessage.js';
+import { IAction, toAction } from '../../base/common/actions.js';
+import Severity from '../../base/common/severity.js';
+import { IPreferencesService } from '../services/preferences/common/preferences.js';
+import { IReadonlyEditorGroupModel } from './editor/editorGroupModel.js';
 
 // Static values for editor contributions
 export const EditorExtensions = {
@@ -547,7 +547,7 @@ export interface IResourceMultiDiffEditorInput extends IBaseUntypedEditorInput {
 	 * The list of resources to compare.
 	 * If not set, the resources are dynamically derived from the {@link multiDiffSource}.
 	 */
-	readonly resources?: IResourceDiffEditorInput[];
+	readonly resources?: IMultiDiffEditorResource[];
 
 	/**
 	 * Whether the editor should be serialized and stored for subsequent sessions.
@@ -555,6 +555,9 @@ export interface IResourceMultiDiffEditorInput extends IBaseUntypedEditorInput {
 	readonly isTransient?: boolean;
 }
 
+export interface IMultiDiffEditorResource extends IResourceDiffEditorInput {
+	readonly goToFileResource?: URI;
+}
 export type IResourceMergeEditorInputSide = (IResourceEditorInput | ITextResourceEditorInput) & { detail?: string };
 
 /**
diff --git a/src/vs/workbench/common/editor/binaryEditorModel.ts b/src/vs/workbench/common/editor/binaryEditorModel.ts
index 9fac71ab78a..42ab32040af 100644
--- a/src/vs/workbench/common/editor/binaryEditorModel.ts
+++ b/src/vs/workbench/common/editor/binaryEditorModel.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { EditorModel } from 'vs/workbench/common/editor/editorModel';
-import { URI } from 'vs/base/common/uri';
-import { IFileService } from 'vs/platform/files/common/files';
-import { Mimes } from 'vs/base/common/mime';
+import { EditorModel } from './editorModel.js';
+import { URI } from '../../../base/common/uri.js';
+import { IFileService } from '../../../platform/files/common/files.js';
+import { Mimes } from '../../../base/common/mime.js';
 
 /**
  * An editor model that just represents a resource that can be loaded.
diff --git a/src/vs/workbench/common/editor/diffEditorInput.ts b/src/vs/workbench/common/editor/diffEditorInput.ts
index f9b9aeb58b2..8ed7a669528 100644
--- a/src/vs/workbench/common/editor/diffEditorInput.ts
+++ b/src/vs/workbench/common/editor/diffEditorInput.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { AbstractSideBySideEditorInputSerializer, SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditorInput';
-import { EditorInput, IUntypedEditorOptions } from 'vs/workbench/common/editor/editorInput';
-import { EditorModel } from 'vs/workbench/common/editor/editorModel';
-import { TEXT_DIFF_EDITOR_ID, BINARY_DIFF_EDITOR_ID, Verbosity, IEditorDescriptor, IEditorPane, IResourceDiffEditorInput, IUntypedEditorInput, isResourceDiffEditorInput, IDiffEditorInput, IResourceSideBySideEditorInput, EditorInputCapabilities } from 'vs/workbench/common/editor';
-import { BaseTextEditorModel } from 'vs/workbench/common/editor/textEditorModel';
-import { DiffEditorModel } from 'vs/workbench/common/editor/diffEditorModel';
-import { TextDiffEditorModel } from 'vs/workbench/common/editor/textDiffEditorModel';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { shorten } from 'vs/base/common/labels';
-import { isResolvedEditorModel } from 'vs/platform/editor/common/editor';
+import { localize } from '../../../nls.js';
+import { AbstractSideBySideEditorInputSerializer, SideBySideEditorInput } from './sideBySideEditorInput.js';
+import { EditorInput, IUntypedEditorOptions } from './editorInput.js';
+import { EditorModel } from './editorModel.js';
+import { TEXT_DIFF_EDITOR_ID, BINARY_DIFF_EDITOR_ID, Verbosity, IEditorDescriptor, IEditorPane, IResourceDiffEditorInput, IUntypedEditorInput, isResourceDiffEditorInput, IDiffEditorInput, IResourceSideBySideEditorInput, EditorInputCapabilities } from '../editor.js';
+import { BaseTextEditorModel } from './textEditorModel.js';
+import { DiffEditorModel } from './diffEditorModel.js';
+import { TextDiffEditorModel } from './textDiffEditorModel.js';
+import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
+import { IEditorService } from '../../services/editor/common/editorService.js';
+import { shorten } from '../../../base/common/labels.js';
+import { isResolvedEditorModel } from '../../../platform/editor/common/editor.js';
 
 interface IDiffEditorInputLabels {
 	name: string;
diff --git a/src/vs/workbench/common/editor/diffEditorModel.ts b/src/vs/workbench/common/editor/diffEditorModel.ts
index deff6e4902f..60932dc4f31 100644
--- a/src/vs/workbench/common/editor/diffEditorModel.ts
+++ b/src/vs/workbench/common/editor/diffEditorModel.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { EditorModel } from 'vs/workbench/common/editor/editorModel';
-import { IResolvableEditorModel } from 'vs/platform/editor/common/editor';
+import { EditorModel } from './editorModel.js';
+import { IResolvableEditorModel } from '../../../platform/editor/common/editor.js';
 
 /**
  * The base editor model for the diff editor. It is made up of two editor models, the original version
diff --git a/src/vs/workbench/common/editor/editorGroupModel.ts b/src/vs/workbench/common/editor/editorGroupModel.ts
index 6f04a87f062..4ee4cf9806a 100644
--- a/src/vs/workbench/common/editor/editorGroupModel.ts
+++ b/src/vs/workbench/common/editor/editorGroupModel.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event, Emitter } from 'vs/base/common/event';
-import { IEditorFactoryRegistry, GroupIdentifier, EditorsOrder, EditorExtensions, IUntypedEditorInput, SideBySideEditor, EditorCloseContext, IMatchEditorOptions, GroupModelChangeKind } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditorInput';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IConfigurationChangeEvent, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { dispose, Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { coalesce } from 'vs/base/common/arrays';
+import { Event, Emitter } from '../../../base/common/event.js';
+import { IEditorFactoryRegistry, GroupIdentifier, EditorsOrder, EditorExtensions, IUntypedEditorInput, SideBySideEditor, EditorCloseContext, IMatchEditorOptions, GroupModelChangeKind } from '../editor.js';
+import { EditorInput } from './editorInput.js';
+import { SideBySideEditorInput } from './sideBySideEditorInput.js';
+import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
+import { IConfigurationChangeEvent, IConfigurationService } from '../../../platform/configuration/common/configuration.js';
+import { dispose, Disposable, DisposableStore } from '../../../base/common/lifecycle.js';
+import { Registry } from '../../../platform/registry/common/platform.js';
+import { coalesce } from '../../../base/common/arrays.js';
 
 const EditorOpenPositioning = {
 	LEFT: 'left',
diff --git a/src/vs/workbench/common/editor/editorInput.ts b/src/vs/workbench/common/editor/editorInput.ts
index d6a10e8c35e..d8a61df5058 100644
--- a/src/vs/workbench/common/editor/editorInput.ts
+++ b/src/vs/workbench/common/editor/editorInput.ts
@@ -3,15 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { URI } from 'vs/base/common/uri';
-import { firstOrDefault } from 'vs/base/common/arrays';
-import { EditorInputCapabilities, Verbosity, GroupIdentifier, ISaveOptions, IRevertOptions, IMoveResult, IEditorDescriptor, IEditorPane, IUntypedEditorInput, EditorResourceAccessor, AbstractEditorInput, isEditorInput, IEditorIdentifier } from 'vs/workbench/common/editor';
-import { isEqual } from 'vs/base/common/resources';
-import { ConfirmResult } from 'vs/platform/dialogs/common/dialogs';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { ThemeIcon } from 'vs/base/common/themables';
+import { Emitter } from '../../../base/common/event.js';
+import { URI } from '../../../base/common/uri.js';
+import { EditorInputCapabilities, Verbosity, GroupIdentifier, ISaveOptions, IRevertOptions, IMoveResult, IEditorDescriptor, IEditorPane, IUntypedEditorInput, EditorResourceAccessor, AbstractEditorInput, isEditorInput, IEditorIdentifier } from '../editor.js';
+import { isEqual } from '../../../base/common/resources.js';
+import { ConfirmResult } from '../../../platform/dialogs/common/dialogs.js';
+import { IMarkdownString } from '../../../base/common/htmlContent.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../base/common/themables.js';
 
 export interface IEditorCloseHandler {
 
@@ -330,7 +329,7 @@ export abstract class EditorInput extends AbstractEditorInput {
 	 * for the editor to open in.
 	 */
 	prefersEditorPane<T extends IEditorDescriptor<IEditorPane>>(editorPanes: T[]): T | undefined {
-		return firstOrDefault(editorPanes);
+		return editorPanes.at(0);
 	}
 
 	/**
diff --git a/src/vs/workbench/common/editor/editorModel.ts b/src/vs/workbench/common/editor/editorModel.ts
index b89b6625f48..f6748ab977a 100644
--- a/src/vs/workbench/common/editor/editorModel.ts
+++ b/src/vs/workbench/common/editor/editorModel.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
+import { Emitter } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
 
 /**
  * The editor model is the heavyweight counterpart of editor input. Depending on the editor input, it
diff --git a/src/vs/workbench/common/editor/editorOptions.ts b/src/vs/workbench/common/editor/editorOptions.ts
index bdb61449405..e1dc1e8688e 100644
--- a/src/vs/workbench/common/editor/editorOptions.ts
+++ b/src/vs/workbench/common/editor/editorOptions.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IRange } from 'vs/editor/common/core/range';
-import { ICodeEditorViewState, IDiffEditorViewState, IEditor, ScrollType } from 'vs/editor/common/editorCommon';
-import { ITextEditorOptions, TextEditorSelectionRevealType, TextEditorSelectionSource } from 'vs/platform/editor/common/editor';
-import { isTextEditorViewState } from 'vs/workbench/common/editor';
+import { IRange } from '../../../editor/common/core/range.js';
+import { ICodeEditorViewState, IDiffEditorViewState, IEditor, ScrollType } from '../../../editor/common/editorCommon.js';
+import { ITextEditorOptions, TextEditorSelectionRevealType, TextEditorSelectionSource } from '../../../platform/editor/common/editor.js';
+import { isTextEditorViewState } from '../editor.js';
 
 export function applyTextEditorOptions(options: ITextEditorOptions, editor: IEditor, scrollType: ScrollType): boolean {
 	let applied = false;
diff --git a/src/vs/workbench/common/editor/filteredEditorGroupModel.ts b/src/vs/workbench/common/editor/filteredEditorGroupModel.ts
index 61d4f6a7c80..0539726cc2c 100644
--- a/src/vs/workbench/common/editor/filteredEditorGroupModel.ts
+++ b/src/vs/workbench/common/editor/filteredEditorGroupModel.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IUntypedEditorInput, IMatchEditorOptions, EditorsOrder, GroupIdentifier } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { Emitter } from 'vs/base/common/event';
-import { IGroupModelChangeEvent, IReadonlyEditorGroupModel } from 'vs/workbench/common/editor/editorGroupModel';
-import { Disposable } from 'vs/base/common/lifecycle';
+import { IUntypedEditorInput, IMatchEditorOptions, EditorsOrder, GroupIdentifier } from '../editor.js';
+import { EditorInput } from './editorInput.js';
+import { Emitter } from '../../../base/common/event.js';
+import { IGroupModelChangeEvent, IReadonlyEditorGroupModel } from './editorGroupModel.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
 
 abstract class FilteredEditorGroupModel extends Disposable implements IReadonlyEditorGroupModel {
 
diff --git a/src/vs/workbench/common/editor/resourceEditorInput.ts b/src/vs/workbench/common/editor/resourceEditorInput.ts
index 7bc68f5e366..778f956ad62 100644
--- a/src/vs/workbench/common/editor/resourceEditorInput.ts
+++ b/src/vs/workbench/common/editor/resourceEditorInput.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Verbosity, EditorInputWithPreferredResource, EditorInputCapabilities, IFileLimitedEditorInputOptions } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { URI } from 'vs/base/common/uri';
-import { ByteSize, IFileReadLimits, IFileService, getLargeFileConfirmationLimit } from 'vs/platform/files/common/files';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { dirname, isEqual } from 'vs/base/common/resources';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { isConfigured } from 'vs/platform/configuration/common/configuration';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { ICustomEditorLabelService } from 'vs/workbench/services/editor/common/customEditorLabelService';
+import { Verbosity, EditorInputWithPreferredResource, EditorInputCapabilities, IFileLimitedEditorInputOptions } from '../editor.js';
+import { EditorInput } from './editorInput.js';
+import { URI } from '../../../base/common/uri.js';
+import { ByteSize, IFileReadLimits, IFileService, getLargeFileConfirmationLimit } from '../../../platform/files/common/files.js';
+import { ILabelService } from '../../../platform/label/common/label.js';
+import { dirname, isEqual } from '../../../base/common/resources.js';
+import { IFilesConfigurationService } from '../../services/filesConfiguration/common/filesConfigurationService.js';
+import { IMarkdownString } from '../../../base/common/htmlContent.js';
+import { isConfigured } from '../../../platform/configuration/common/configuration.js';
+import { ITextResourceConfigurationService } from '../../../editor/common/services/textResourceConfiguration.js';
+import { ICustomEditorLabelService } from '../../services/editor/common/customEditorLabelService.js';
 
 /**
  * The base class for all editor inputs that open resources.
diff --git a/src/vs/workbench/common/editor/sideBySideEditorInput.ts b/src/vs/workbench/common/editor/sideBySideEditorInput.ts
index 0c6e63d43ce..5b20850a87e 100644
--- a/src/vs/workbench/common/editor/sideBySideEditorInput.ts
+++ b/src/vs/workbench/common/editor/sideBySideEditorInput.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { EditorInputCapabilities, GroupIdentifier, ISaveOptions, IRevertOptions, EditorExtensions, IEditorFactoryRegistry, IEditorSerializer, ISideBySideEditorInput, IUntypedEditorInput, isResourceSideBySideEditorInput, isDiffEditorInput, isResourceDiffEditorInput, IResourceSideBySideEditorInput, findViewStateForEditor, IMoveResult, isEditorInput, isResourceEditorInput, Verbosity, isResourceMergeEditorInput, isResourceMultiDiffEditorInput } from 'vs/workbench/common/editor';
-import { EditorInput, IUntypedEditorOptions } from 'vs/workbench/common/editor/editorInput';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { Event } from '../../../base/common/event.js';
+import { IMarkdownString } from '../../../base/common/htmlContent.js';
+import { URI } from '../../../base/common/uri.js';
+import { localize } from '../../../nls.js';
+import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
+import { Registry } from '../../../platform/registry/common/platform.js';
+import { EditorInputCapabilities, GroupIdentifier, ISaveOptions, IRevertOptions, EditorExtensions, IEditorFactoryRegistry, IEditorSerializer, ISideBySideEditorInput, IUntypedEditorInput, isResourceSideBySideEditorInput, isDiffEditorInput, isResourceDiffEditorInput, IResourceSideBySideEditorInput, findViewStateForEditor, IMoveResult, isEditorInput, isResourceEditorInput, Verbosity, isResourceMergeEditorInput, isResourceMultiDiffEditorInput } from '../editor.js';
+import { EditorInput, IUntypedEditorOptions } from './editorInput.js';
+import { IEditorService } from '../../services/editor/common/editorService.js';
 
 /**
  * Side by side editor inputs that have a primary and secondary side.
diff --git a/src/vs/workbench/common/editor/textDiffEditorModel.ts b/src/vs/workbench/common/editor/textDiffEditorModel.ts
index 1260e678d0e..1e16b206338 100644
--- a/src/vs/workbench/common/editor/textDiffEditorModel.ts
+++ b/src/vs/workbench/common/editor/textDiffEditorModel.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDiffEditorModel } from 'vs/editor/common/editorCommon';
-import { BaseTextEditorModel } from 'vs/workbench/common/editor/textEditorModel';
-import { DiffEditorModel } from 'vs/workbench/common/editor/diffEditorModel';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
+import { IDiffEditorModel } from '../../../editor/common/editorCommon.js';
+import { BaseTextEditorModel } from './textEditorModel.js';
+import { DiffEditorModel } from './diffEditorModel.js';
+import { IMarkdownString } from '../../../base/common/htmlContent.js';
 
 /**
  * The base text editor model for the diff editor. It is made up of two text editor models, the original version
diff --git a/src/vs/workbench/common/editor/textEditorModel.ts b/src/vs/workbench/common/editor/textEditorModel.ts
index 44454299bad..482364fda50 100644
--- a/src/vs/workbench/common/editor/textEditorModel.ts
+++ b/src/vs/workbench/common/editor/textEditorModel.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ITextModel, ITextBufferFactory, ITextSnapshot, ModelConstants } from 'vs/editor/common/model';
-import { EditorModel } from 'vs/workbench/common/editor/editorModel';
-import { ILanguageSupport } from 'vs/workbench/services/textfile/common/textfiles';
-import { URI } from 'vs/base/common/uri';
-import { ITextEditorModel, IResolvedTextEditorModel } from 'vs/editor/common/services/resolverService';
-import { ILanguageService, ILanguageSelection } from 'vs/editor/common/languages/language';
-import { IModelService } from 'vs/editor/common/services/model';
-import { MutableDisposable } from 'vs/base/common/lifecycle';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { ILanguageDetectionService, LanguageDetectionLanguageEventSource } from 'vs/workbench/services/languageDetection/common/languageDetectionWorkerService';
-import { ThrottledDelayer } from 'vs/base/common/async';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { localize } from 'vs/nls';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
+import { ITextModel, ITextBufferFactory, ITextSnapshot, ModelConstants } from '../../../editor/common/model.js';
+import { EditorModel } from './editorModel.js';
+import { ILanguageSupport } from '../../services/textfile/common/textfiles.js';
+import { URI } from '../../../base/common/uri.js';
+import { ITextEditorModel, IResolvedTextEditorModel } from '../../../editor/common/services/resolverService.js';
+import { ILanguageService, ILanguageSelection } from '../../../editor/common/languages/language.js';
+import { IModelService } from '../../../editor/common/services/model.js';
+import { MutableDisposable } from '../../../base/common/lifecycle.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../../../editor/common/languages/modesRegistry.js';
+import { ILanguageDetectionService, LanguageDetectionLanguageEventSource } from '../../services/languageDetection/common/languageDetectionWorkerService.js';
+import { ThrottledDelayer } from '../../../base/common/async.js';
+import { IAccessibilityService } from '../../../platform/accessibility/common/accessibility.js';
+import { localize } from '../../../nls.js';
+import { IMarkdownString } from '../../../base/common/htmlContent.js';
 
 /**
  * The base text editor model leverages the code editor model. This class is only intended to be subclassed and not instantiated.
diff --git a/src/vs/workbench/common/editor/textResourceEditorInput.ts b/src/vs/workbench/common/editor/textResourceEditorInput.ts
index 9635fa3f670..ad5369aebdc 100644
--- a/src/vs/workbench/common/editor/textResourceEditorInput.ts
+++ b/src/vs/workbench/common/editor/textResourceEditorInput.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DEFAULT_EDITOR_ASSOCIATION, GroupIdentifier, IRevertOptions, isResourceEditorInput, IUntypedEditorInput } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { AbstractResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput';
-import { URI } from 'vs/base/common/uri';
-import { ITextFileService, ITextFileSaveOptions, ILanguageSupport } from 'vs/workbench/services/textfile/common/textfiles';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IFileService } from 'vs/platform/files/common/files';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { Schemas } from 'vs/base/common/network';
-import { isEqual } from 'vs/base/common/resources';
-import { ITextEditorModel, ITextModelService } from 'vs/editor/common/services/resolverService';
-import { TextResourceEditorModel } from 'vs/workbench/common/editor/textResourceEditorModel';
-import { IReference } from 'vs/base/common/lifecycle';
-import { createTextBufferFactory } from 'vs/editor/common/model/textModel';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { ICustomEditorLabelService } from 'vs/workbench/services/editor/common/customEditorLabelService';
+import { DEFAULT_EDITOR_ASSOCIATION, GroupIdentifier, IRevertOptions, isResourceEditorInput, IUntypedEditorInput } from '../editor.js';
+import { EditorInput } from './editorInput.js';
+import { AbstractResourceEditorInput } from './resourceEditorInput.js';
+import { URI } from '../../../base/common/uri.js';
+import { ITextFileService, ITextFileSaveOptions, ILanguageSupport } from '../../services/textfile/common/textfiles.js';
+import { IEditorService } from '../../services/editor/common/editorService.js';
+import { IFileService } from '../../../platform/files/common/files.js';
+import { ILabelService } from '../../../platform/label/common/label.js';
+import { Schemas } from '../../../base/common/network.js';
+import { isEqual } from '../../../base/common/resources.js';
+import { ITextEditorModel, ITextModelService } from '../../../editor/common/services/resolverService.js';
+import { TextResourceEditorModel } from './textResourceEditorModel.js';
+import { IReference } from '../../../base/common/lifecycle.js';
+import { createTextBufferFactory } from '../../../editor/common/model/textModel.js';
+import { IFilesConfigurationService } from '../../services/filesConfiguration/common/filesConfigurationService.js';
+import { ITextResourceConfigurationService } from '../../../editor/common/services/textResourceConfiguration.js';
+import { ICustomEditorLabelService } from '../../services/editor/common/customEditorLabelService.js';
 
 /**
  * The base class for all editor inputs that open in text editors.
diff --git a/src/vs/workbench/common/editor/textResourceEditorModel.ts b/src/vs/workbench/common/editor/textResourceEditorModel.ts
index c9ec05a73dc..703848412c6 100644
--- a/src/vs/workbench/common/editor/textResourceEditorModel.ts
+++ b/src/vs/workbench/common/editor/textResourceEditorModel.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BaseTextEditorModel } from 'vs/workbench/common/editor/textEditorModel';
-import { URI } from 'vs/base/common/uri';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILanguageDetectionService } from 'vs/workbench/services/languageDetection/common/languageDetectionWorkerService';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
+import { BaseTextEditorModel } from './textEditorModel.js';
+import { URI } from '../../../base/common/uri.js';
+import { ILanguageService } from '../../../editor/common/languages/language.js';
+import { IModelService } from '../../../editor/common/services/model.js';
+import { ILanguageDetectionService } from '../../services/languageDetection/common/languageDetectionWorkerService.js';
+import { IAccessibilityService } from '../../../platform/accessibility/common/accessibility.js';
 
 /**
  * An editor model for in-memory, readonly text content that
diff --git a/src/vs/workbench/common/memento.ts b/src/vs/workbench/common/memento.ts
index ad0e9e50fe3..f97a811e64b 100644
--- a/src/vs/workbench/common/memento.ts
+++ b/src/vs/workbench/common/memento.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IStorageService, IStorageValueChangeEvent, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { isEmptyObject } from 'vs/base/common/types';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { Event } from 'vs/base/common/event';
+import { IStorageService, IStorageValueChangeEvent, StorageScope, StorageTarget } from '../../platform/storage/common/storage.js';
+import { isEmptyObject } from '../../base/common/types.js';
+import { onUnexpectedError } from '../../base/common/errors.js';
+import { DisposableStore } from '../../base/common/lifecycle.js';
+import { Event } from '../../base/common/event.js';
 
 export type MementoObject = { [key: string]: any };
 
diff --git a/src/vs/workbench/common/notifications.ts b/src/vs/workbench/common/notifications.ts
index a0755985cf0..31cef956ceb 100644
--- a/src/vs/workbench/common/notifications.ts
+++ b/src/vs/workbench/common/notifications.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { INotification, INotificationHandle, INotificationActions, INotificationProgress, NoOpNotification, Severity, NotificationMessage, IPromptChoice, IStatusMessageOptions, NotificationsFilter, INotificationProgressProperties, IPromptChoiceWithMenu, NotificationPriority, INotificationSource, isNotificationSource } from 'vs/platform/notification/common/notification';
-import { toErrorMessage, isErrorWithActions } from 'vs/base/common/errorMessage';
-import { Event, Emitter } from 'vs/base/common/event';
-import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { isCancellationError } from 'vs/base/common/errors';
-import { Action } from 'vs/base/common/actions';
-import { equals } from 'vs/base/common/arrays';
-import { parseLinkedText, LinkedText } from 'vs/base/common/linkedText';
-import { mapsStrictEqualIgnoreOrder } from 'vs/base/common/map';
+import { INotification, INotificationHandle, INotificationActions, INotificationProgress, NoOpNotification, Severity, NotificationMessage, IPromptChoice, IStatusMessageOptions, NotificationsFilter, INotificationProgressProperties, IPromptChoiceWithMenu, NotificationPriority, INotificationSource, isNotificationSource } from '../../platform/notification/common/notification.js';
+import { toErrorMessage, isErrorWithActions } from '../../base/common/errorMessage.js';
+import { Event, Emitter } from '../../base/common/event.js';
+import { Disposable, IDisposable, toDisposable } from '../../base/common/lifecycle.js';
+import { isCancellationError } from '../../base/common/errors.js';
+import { Action } from '../../base/common/actions.js';
+import { equals } from '../../base/common/arrays.js';
+import { parseLinkedText, LinkedText } from '../../base/common/linkedText.js';
+import { mapsStrictEqualIgnoreOrder } from '../../base/common/map.js';
 
 export interface INotificationsModel {
 
diff --git a/src/vs/workbench/common/panecomposite.ts b/src/vs/workbench/common/panecomposite.ts
index c412724f06e..cb605d14cbc 100644
--- a/src/vs/workbench/common/panecomposite.ts
+++ b/src/vs/workbench/common/panecomposite.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IView, IViewPaneContainer } from 'vs/workbench/common/views';
-import { IComposite } from 'vs/workbench/common/composite';
+import { IView, IViewPaneContainer } from './views.js';
+import { IComposite } from './composite.js';
 
 export interface IPaneComposite extends IComposite {
 
diff --git a/src/vs/workbench/common/resources.ts b/src/vs/workbench/common/resources.ts
index 1e1f899c409..4a6be89746d 100644
--- a/src/vs/workbench/common/resources.ts
+++ b/src/vs/workbench/common/resources.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { equals } from 'vs/base/common/objects';
-import { isAbsolute } from 'vs/base/common/path';
-import { Emitter } from 'vs/base/common/event';
-import { relativePath } from 'vs/base/common/resources';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ParsedExpression, IExpression, parse } from 'vs/base/common/glob';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
-import { Schemas } from 'vs/base/common/network';
-import { ResourceSet } from 'vs/base/common/map';
-import { getDriveLetter } from 'vs/base/common/extpath';
+import { URI } from '../../base/common/uri.js';
+import { equals } from '../../base/common/objects.js';
+import { isAbsolute } from '../../base/common/path.js';
+import { Emitter } from '../../base/common/event.js';
+import { relativePath } from '../../base/common/resources.js';
+import { Disposable } from '../../base/common/lifecycle.js';
+import { ParsedExpression, IExpression, parse } from '../../base/common/glob.js';
+import { IWorkspaceContextService } from '../../platform/workspace/common/workspace.js';
+import { IConfigurationService, IConfigurationChangeEvent } from '../../platform/configuration/common/configuration.js';
+import { Schemas } from '../../base/common/network.js';
+import { ResourceSet } from '../../base/common/map.js';
+import { getDriveLetter } from '../../base/common/extpath.js';
 
 interface IConfiguredExpression {
 	readonly expression: IExpression;
diff --git a/src/vs/workbench/common/theme.ts b/src/vs/workbench/common/theme.ts
index 3412f81c3bf..f8a88bd495d 100644
--- a/src/vs/workbench/common/theme.ts
+++ b/src/vs/workbench/common/theme.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { registerColor, editorBackground, contrastBorder, transparent, editorWidgetBackground, textLinkForeground, lighten, darken, focusBorder, activeContrastBorder, editorWidgetForeground, editorErrorForeground, editorWarningForeground, editorInfoForeground, treeIndentGuidesStroke, errorForeground, listActiveSelectionBackground, listActiveSelectionForeground, editorForeground, toolbarHoverBackground, inputBorder, widgetBorder, scrollbarShadow } from 'vs/platform/theme/common/colorRegistry';
-import { IColorTheme } from 'vs/platform/theme/common/themeService';
-import { Color } from 'vs/base/common/color';
-import { ColorScheme } from 'vs/platform/theme/common/theme';
+import { localize } from '../../nls.js';
+import { registerColor, editorBackground, contrastBorder, transparent, editorWidgetBackground, textLinkForeground, lighten, darken, focusBorder, activeContrastBorder, editorWidgetForeground, editorErrorForeground, editorWarningForeground, editorInfoForeground, treeIndentGuidesStroke, errorForeground, listActiveSelectionBackground, listActiveSelectionForeground, editorForeground, toolbarHoverBackground, inputBorder, widgetBorder, scrollbarShadow } from '../../platform/theme/common/colorRegistry.js';
+import { IColorTheme } from '../../platform/theme/common/themeService.js';
+import { Color } from '../../base/common/color.js';
+import { ColorScheme } from '../../platform/theme/common/theme.js';
 
 // < --- Workbench (not customizable) --- >
 
@@ -28,19 +28,9 @@ export function WORKBENCH_BACKGROUND(theme: IColorTheme): Color {
 
 //#region Tab Background
 
-export const TAB_ACTIVE_BACKGROUND = registerColor('tab.activeBackground', {
-	dark: editorBackground,
-	light: editorBackground,
-	hcDark: editorBackground,
-	hcLight: editorBackground
-}, localize('tabActiveBackground', "Active tab background color in an active group. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
+export const TAB_ACTIVE_BACKGROUND = registerColor('tab.activeBackground', editorBackground, localize('tabActiveBackground', "Active tab background color in an active group. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
 
-export const TAB_UNFOCUSED_ACTIVE_BACKGROUND = registerColor('tab.unfocusedActiveBackground', {
-	dark: TAB_ACTIVE_BACKGROUND,
-	light: TAB_ACTIVE_BACKGROUND,
-	hcDark: TAB_ACTIVE_BACKGROUND,
-	hcLight: TAB_ACTIVE_BACKGROUND,
-}, localize('tabUnfocusedActiveBackground', "Active tab background color in an unfocused group. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
+export const TAB_UNFOCUSED_ACTIVE_BACKGROUND = registerColor('tab.unfocusedActiveBackground', TAB_ACTIVE_BACKGROUND, localize('tabUnfocusedActiveBackground', "Active tab background color in an unfocused group. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
 
 export const TAB_INACTIVE_BACKGROUND = registerColor('tab.inactiveBackground', {
 	dark: '#2D2D2D',
@@ -49,12 +39,7 @@ export const TAB_INACTIVE_BACKGROUND = registerColor('tab.inactiveBackground', {
 	hcLight: null,
 }, localize('tabInactiveBackground', "Inactive tab background color in an active group. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
 
-export const TAB_UNFOCUSED_INACTIVE_BACKGROUND = registerColor('tab.unfocusedInactiveBackground', {
-	dark: TAB_INACTIVE_BACKGROUND,
-	light: TAB_INACTIVE_BACKGROUND,
-	hcDark: TAB_INACTIVE_BACKGROUND,
-	hcLight: TAB_INACTIVE_BACKGROUND
-}, localize('tabUnfocusedInactiveBackground', "Inactive tab background color in an unfocused group. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
+export const TAB_UNFOCUSED_INACTIVE_BACKGROUND = registerColor('tab.unfocusedInactiveBackground', TAB_INACTIVE_BACKGROUND, localize('tabUnfocusedInactiveBackground', "Inactive tab background color in an unfocused group. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
 
 //#endregion
 
@@ -92,12 +77,7 @@ export const TAB_UNFOCUSED_INACTIVE_FOREGROUND = registerColor('tab.unfocusedIna
 
 //#region Tab Hover Foreground/Background
 
-export const TAB_HOVER_BACKGROUND = registerColor('tab.hoverBackground', {
-	dark: null,
-	light: null,
-	hcDark: null,
-	hcLight: null
-}, localize('tabHoverBackground', "Tab background color when hovering. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
+export const TAB_HOVER_BACKGROUND = registerColor('tab.hoverBackground', null, localize('tabHoverBackground', "Tab background color when hovering. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
 
 export const TAB_UNFOCUSED_HOVER_BACKGROUND = registerColor('tab.unfocusedHoverBackground', {
 	dark: transparent(TAB_HOVER_BACKGROUND, 0.5),
@@ -106,12 +86,7 @@ export const TAB_UNFOCUSED_HOVER_BACKGROUND = registerColor('tab.unfocusedHoverB
 	hcLight: null
 }, localize('tabUnfocusedHoverBackground', "Tab background color in an unfocused group when hovering. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
 
-export const TAB_HOVER_FOREGROUND = registerColor('tab.hoverForeground', {
-	dark: null,
-	light: null,
-	hcDark: null,
-	hcLight: null,
-}, localize('tabHoverForeground', "Tab foreground color when hovering. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
+export const TAB_HOVER_FOREGROUND = registerColor('tab.hoverForeground', null, localize('tabHoverForeground', "Tab foreground color when hovering. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
 
 export const TAB_UNFOCUSED_HOVER_FOREGROUND = registerColor('tab.unfocusedHoverForeground', {
 	dark: transparent(TAB_HOVER_FOREGROUND, 0.5),
@@ -138,12 +113,7 @@ export const TAB_LAST_PINNED_BORDER = registerColor('tab.lastPinnedBorder', {
 	hcLight: contrastBorder
 }, localize('lastPinnedTabBorder', "Border to separate pinned tabs from other tabs. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
 
-export const TAB_ACTIVE_BORDER = registerColor('tab.activeBorder', {
-	dark: null,
-	light: null,
-	hcDark: null,
-	hcLight: null
-}, localize('tabActiveBorder', "Border on the bottom of an active tab. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
+export const TAB_ACTIVE_BORDER = registerColor('tab.activeBorder', null, localize('tabActiveBorder', "Border on the bottom of an active tab. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
 
 export const TAB_UNFOCUSED_ACTIVE_BORDER = registerColor('tab.unfocusedActiveBorder', {
 	dark: transparent(TAB_ACTIVE_BORDER, 0.5),
@@ -166,34 +136,14 @@ export const TAB_UNFOCUSED_ACTIVE_BORDER_TOP = registerColor('tab.unfocusedActiv
 	hcLight: '#B5200D'
 }, localize('tabActiveUnfocusedBorderTop', "Border to the top of an active tab in an unfocused group. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
 
-export const TAB_SELECTED_BORDER_TOP = registerColor('tab.selectedBorderTop', {
-	dark: TAB_ACTIVE_BORDER_TOP,
-	light: TAB_ACTIVE_BORDER_TOP,
-	hcDark: TAB_ACTIVE_BORDER_TOP,
-	hcLight: TAB_ACTIVE_BORDER_TOP
-}, localize('tabSelectedBorderTop', "Border to the top of a selected tab. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
+export const TAB_SELECTED_BORDER_TOP = registerColor('tab.selectedBorderTop', TAB_ACTIVE_BORDER_TOP, localize('tabSelectedBorderTop', "Border to the top of a selected tab. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
 
-export const TAB_SELECTED_BACKGROUND = registerColor('tab.selectedBackground', {
-	dark: TAB_ACTIVE_BACKGROUND,
-	light: TAB_ACTIVE_BACKGROUND,
-	hcDark: TAB_ACTIVE_BACKGROUND,
-	hcLight: TAB_ACTIVE_BACKGROUND
-}, localize('tabSelectedBackground', "Background of a selected tab. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
+export const TAB_SELECTED_BACKGROUND = registerColor('tab.selectedBackground', TAB_ACTIVE_BACKGROUND, localize('tabSelectedBackground', "Background of a selected tab. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
 
-export const TAB_SELECTED_FOREGROUND = registerColor('tab.selectedForeground', {
-	dark: TAB_ACTIVE_FOREGROUND,
-	light: TAB_ACTIVE_FOREGROUND,
-	hcDark: TAB_ACTIVE_FOREGROUND,
-	hcLight: TAB_ACTIVE_FOREGROUND
-}, localize('tabSelectedForeground', "Foreground of a selected tab. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
+export const TAB_SELECTED_FOREGROUND = registerColor('tab.selectedForeground', TAB_ACTIVE_FOREGROUND, localize('tabSelectedForeground', "Foreground of a selected tab. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
 
 
-export const TAB_HOVER_BORDER = registerColor('tab.hoverBorder', {
-	dark: null,
-	light: null,
-	hcDark: null,
-	hcLight: null
-}, localize('tabHoverBorder', "Border to highlight tabs when hovering. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
+export const TAB_HOVER_BORDER = registerColor('tab.hoverBorder', null, localize('tabHoverBorder', "Border to highlight tabs when hovering. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
 
 export const TAB_UNFOCUSED_HOVER_BORDER = registerColor('tab.unfocusedHoverBorder', {
 	dark: transparent(TAB_HOVER_BORDER, 0.5),
@@ -249,19 +199,9 @@ export const TAB_UNFOCUSED_INACTIVE_MODIFIED_BORDER = registerColor('tab.unfocus
 
 // < --- Editors --- >
 
-export const EDITOR_PANE_BACKGROUND = registerColor('editorPane.background', {
-	dark: editorBackground,
-	light: editorBackground,
-	hcDark: editorBackground,
-	hcLight: editorBackground
-}, localize('editorPaneBackground', "Background color of the editor pane visible on the left and right side of the centered editor layout."));
+export const EDITOR_PANE_BACKGROUND = registerColor('editorPane.background', editorBackground, localize('editorPaneBackground', "Background color of the editor pane visible on the left and right side of the centered editor layout."));
 
-export const EDITOR_GROUP_EMPTY_BACKGROUND = registerColor('editorGroup.emptyBackground', {
-	dark: null,
-	light: null,
-	hcDark: null,
-	hcLight: null
-}, localize('editorGroupEmptyBackground', "Background color of an empty editor group. Editor groups are the containers of editors."));
+export const EDITOR_GROUP_EMPTY_BACKGROUND = registerColor('editorGroup.emptyBackground', null, localize('editorGroupEmptyBackground', "Background color of an empty editor group. Editor groups are the containers of editors."));
 
 export const EDITOR_GROUP_FOCUSED_EMPTY_BORDER = registerColor('editorGroup.focusedEmptyBorder', {
 	dark: null,
@@ -277,19 +217,9 @@ export const EDITOR_GROUP_HEADER_TABS_BACKGROUND = registerColor('editorGroupHea
 	hcLight: null
 }, localize('tabsContainerBackground', "Background color of the editor group title header when tabs are enabled. Editor groups are the containers of editors."));
 
-export const EDITOR_GROUP_HEADER_TABS_BORDER = registerColor('editorGroupHeader.tabsBorder', {
-	dark: null,
-	light: null,
-	hcDark: null,
-	hcLight: null
-}, localize('tabsContainerBorder', "Border color of the editor group title header when tabs are enabled. Editor groups are the containers of editors."));
+export const EDITOR_GROUP_HEADER_TABS_BORDER = registerColor('editorGroupHeader.tabsBorder', null, localize('tabsContainerBorder', "Border color of the editor group title header when tabs are enabled. Editor groups are the containers of editors."));
 
-export const EDITOR_GROUP_HEADER_NO_TABS_BACKGROUND = registerColor('editorGroupHeader.noTabsBackground', {
-	dark: editorBackground,
-	light: editorBackground,
-	hcDark: editorBackground,
-	hcLight: editorBackground
-}, localize('editorGroupHeaderBackground', "Background color of the editor group title header when (`\"workbench.editor.showTabs\": \"single\"`). Editor groups are the containers of editors."));
+export const EDITOR_GROUP_HEADER_NO_TABS_BACKGROUND = registerColor('editorGroupHeader.noTabsBackground', editorBackground, localize('editorGroupHeaderBackground', "Background color of the editor group title header when (`\"workbench.editor.showTabs\": \"single\"`). Editor groups are the containers of editors."));
 
 export const EDITOR_GROUP_HEADER_BORDER = registerColor('editorGroupHeader.border', {
 	dark: null,
@@ -312,19 +242,9 @@ export const EDITOR_DRAG_AND_DROP_BACKGROUND = registerColor('editorGroup.dropBa
 	hcLight: Color.fromHex('#0F4A85').transparent(0.50)
 }, localize('editorDragAndDropBackground', "Background color when dragging editors around. The color should have transparency so that the editor contents can still shine through."));
 
-export const EDITOR_DROP_INTO_PROMPT_FOREGROUND = registerColor('editorGroup.dropIntoPromptForeground', {
-	dark: editorWidgetForeground,
-	light: editorWidgetForeground,
-	hcDark: editorWidgetForeground,
-	hcLight: editorWidgetForeground
-}, localize('editorDropIntoPromptForeground', "Foreground color of text shown over editors when dragging files. This text informs the user that they can hold shift to drop into the editor."));
+export const EDITOR_DROP_INTO_PROMPT_FOREGROUND = registerColor('editorGroup.dropIntoPromptForeground', editorWidgetForeground, localize('editorDropIntoPromptForeground', "Foreground color of text shown over editors when dragging files. This text informs the user that they can hold shift to drop into the editor."));
 
-export const EDITOR_DROP_INTO_PROMPT_BACKGROUND = registerColor('editorGroup.dropIntoPromptBackground', {
-	dark: editorWidgetBackground,
-	light: editorWidgetBackground,
-	hcDark: editorWidgetBackground,
-	hcLight: editorWidgetBackground
-}, localize('editorDropIntoPromptBackground', "Background color of text shown over editors when dragging files. This text informs the user that they can hold shift to drop into the editor."));
+export const EDITOR_DROP_INTO_PROMPT_BACKGROUND = registerColor('editorGroup.dropIntoPromptBackground', editorWidgetBackground, localize('editorDropIntoPromptBackground', "Background color of text shown over editors when dragging files. This text informs the user that they can hold shift to drop into the editor."));
 
 export const EDITOR_DROP_INTO_PROMPT_BORDER = registerColor('editorGroup.dropIntoPromptBorder', {
 	dark: null,
@@ -333,28 +253,13 @@ export const EDITOR_DROP_INTO_PROMPT_BORDER = registerColor('editorGroup.dropInt
 	hcLight: contrastBorder
 }, localize('editorDropIntoPromptBorder', "Border color of text shown over editors when dragging files. This text informs the user that they can hold shift to drop into the editor."));
 
-export const SIDE_BY_SIDE_EDITOR_HORIZONTAL_BORDER = registerColor('sideBySideEditor.horizontalBorder', {
-	dark: EDITOR_GROUP_BORDER,
-	light: EDITOR_GROUP_BORDER,
-	hcDark: EDITOR_GROUP_BORDER,
-	hcLight: EDITOR_GROUP_BORDER
-}, localize('sideBySideEditor.horizontalBorder', "Color to separate two editors from each other when shown side by side in an editor group from top to bottom."));
+export const SIDE_BY_SIDE_EDITOR_HORIZONTAL_BORDER = registerColor('sideBySideEditor.horizontalBorder', EDITOR_GROUP_BORDER, localize('sideBySideEditor.horizontalBorder', "Color to separate two editors from each other when shown side by side in an editor group from top to bottom."));
 
-export const SIDE_BY_SIDE_EDITOR_VERTICAL_BORDER = registerColor('sideBySideEditor.verticalBorder', {
-	dark: EDITOR_GROUP_BORDER,
-	light: EDITOR_GROUP_BORDER,
-	hcDark: EDITOR_GROUP_BORDER,
-	hcLight: EDITOR_GROUP_BORDER
-}, localize('sideBySideEditor.verticalBorder', "Color to separate two editors from each other when shown side by side in an editor group from left to right."));
+export const SIDE_BY_SIDE_EDITOR_VERTICAL_BORDER = registerColor('sideBySideEditor.verticalBorder', EDITOR_GROUP_BORDER, localize('sideBySideEditor.verticalBorder', "Color to separate two editors from each other when shown side by side in an editor group from left to right."));
 
 // < --- Panels --- >
 
-export const PANEL_BACKGROUND = registerColor('panel.background', {
-	dark: editorBackground,
-	light: editorBackground,
-	hcDark: editorBackground,
-	hcLight: editorBackground
-}, localize('panelBackground', "Panel background color. Panels are shown below the editor area and contain views like output and integrated terminal."));
+export const PANEL_BACKGROUND = registerColor('panel.background', editorBackground, localize('panelBackground', "Panel background color. Panels are shown below the editor area and contain views like output and integrated terminal."));
 
 export const PANEL_BORDER = registerColor('panel.border', {
 	dark: Color.fromHex('#808080').transparent(0.35),
@@ -391,19 +296,9 @@ export const PANEL_INPUT_BORDER = registerColor('panelInput.border', {
 	hcLight: inputBorder
 }, localize('panelInputBorder', "Input box border for inputs in the panel."));
 
-export const PANEL_DRAG_AND_DROP_BORDER = registerColor('panel.dropBorder', {
-	dark: PANEL_ACTIVE_TITLE_FOREGROUND,
-	light: PANEL_ACTIVE_TITLE_FOREGROUND,
-	hcDark: PANEL_ACTIVE_TITLE_FOREGROUND,
-	hcLight: PANEL_ACTIVE_TITLE_FOREGROUND
-}, localize('panelDragAndDropBorder', "Drag and drop feedback color for the panel titles. Panels are shown below the editor area and contain views like output and integrated terminal."));
+export const PANEL_DRAG_AND_DROP_BORDER = registerColor('panel.dropBorder', PANEL_ACTIVE_TITLE_FOREGROUND, localize('panelDragAndDropBorder', "Drag and drop feedback color for the panel titles. Panels are shown below the editor area and contain views like output and integrated terminal."));
 
-export const PANEL_SECTION_DRAG_AND_DROP_BACKGROUND = registerColor('panelSection.dropBackground', {
-	dark: EDITOR_DRAG_AND_DROP_BACKGROUND,
-	light: EDITOR_DRAG_AND_DROP_BACKGROUND,
-	hcDark: EDITOR_DRAG_AND_DROP_BACKGROUND,
-	hcLight: EDITOR_DRAG_AND_DROP_BACKGROUND
-}, localize('panelSectionDragAndDropBackground', "Drag and drop feedback color for the panel sections. The color should have transparency so that the panel sections can still shine through. Panels are shown below the editor area and contain views like output and integrated terminal. Panel sections are views nested within the panels."));
+export const PANEL_SECTION_DRAG_AND_DROP_BACKGROUND = registerColor('panelSection.dropBackground', EDITOR_DRAG_AND_DROP_BACKGROUND, localize('panelSectionDragAndDropBackground', "Drag and drop feedback color for the panel sections. The color should have transparency so that the panel sections can still shine through. Panels are shown below the editor area and contain views like output and integrated terminal. Panel sections are views nested within the panels."));
 
 export const PANEL_SECTION_HEADER_BACKGROUND = registerColor('panelSectionHeader.background', {
 	dark: Color.fromHex('#808080').transparent(0.2),
@@ -412,64 +307,24 @@ export const PANEL_SECTION_HEADER_BACKGROUND = registerColor('panelSectionHeader
 	hcLight: null,
 }, localize('panelSectionHeaderBackground', "Panel section header background color. Panels are shown below the editor area and contain views like output and integrated terminal. Panel sections are views nested within the panels."));
 
-export const PANEL_SECTION_HEADER_FOREGROUND = registerColor('panelSectionHeader.foreground', {
-	dark: null,
-	light: null,
-	hcDark: null,
-	hcLight: null
-}, localize('panelSectionHeaderForeground', "Panel section header foreground color. Panels are shown below the editor area and contain views like output and integrated terminal. Panel sections are views nested within the panels."));
+export const PANEL_SECTION_HEADER_FOREGROUND = registerColor('panelSectionHeader.foreground', null, localize('panelSectionHeaderForeground', "Panel section header foreground color. Panels are shown below the editor area and contain views like output and integrated terminal. Panel sections are views nested within the panels."));
 
-export const PANEL_SECTION_HEADER_BORDER = registerColor('panelSectionHeader.border', {
-	dark: contrastBorder,
-	light: contrastBorder,
-	hcDark: contrastBorder,
-	hcLight: contrastBorder
-}, localize('panelSectionHeaderBorder', "Panel section header border color used when multiple views are stacked vertically in the panel. Panels are shown below the editor area and contain views like output and integrated terminal. Panel sections are views nested within the panels."));
+export const PANEL_SECTION_HEADER_BORDER = registerColor('panelSectionHeader.border', contrastBorder, localize('panelSectionHeaderBorder', "Panel section header border color used when multiple views are stacked vertically in the panel. Panels are shown below the editor area and contain views like output and integrated terminal. Panel sections are views nested within the panels."));
 
-export const PANEL_SECTION_BORDER = registerColor('panelSection.border', {
-	dark: PANEL_BORDER,
-	light: PANEL_BORDER,
-	hcDark: PANEL_BORDER,
-	hcLight: PANEL_BORDER
-}, localize('panelSectionBorder', "Panel section border color used when multiple views are stacked horizontally in the panel. Panels are shown below the editor area and contain views like output and integrated terminal. Panel sections are views nested within the panels."));
+export const PANEL_SECTION_BORDER = registerColor('panelSection.border', PANEL_BORDER, localize('panelSectionBorder', "Panel section border color used when multiple views are stacked horizontally in the panel. Panels are shown below the editor area and contain views like output and integrated terminal. Panel sections are views nested within the panels."));
 
-export const PANEL_STICKY_SCROLL_BACKGROUND = registerColor('panelStickyScroll.background', {
-	dark: PANEL_BACKGROUND,
-	light: PANEL_BACKGROUND,
-	hcDark: PANEL_BACKGROUND,
-	hcLight: PANEL_BACKGROUND
-}, localize('panelStickyScrollBackground', "Background color of sticky scroll in the panel."));
+export const PANEL_STICKY_SCROLL_BACKGROUND = registerColor('panelStickyScroll.background', PANEL_BACKGROUND, localize('panelStickyScrollBackground', "Background color of sticky scroll in the panel."));
 
-export const PANEL_STICKY_SCROLL_BORDER = registerColor('panelStickyScroll.border', {
-	dark: null,
-	light: null,
-	hcDark: null,
-	hcLight: null
-}, localize('panelStickyScrollBorder', "Border color of sticky scroll in the panel."));
+export const PANEL_STICKY_SCROLL_BORDER = registerColor('panelStickyScroll.border', null, localize('panelStickyScrollBorder', "Border color of sticky scroll in the panel."));
 
-export const PANEL_STICKY_SCROLL_SHADOW = registerColor('panelStickyScroll.shadow', {
-	dark: scrollbarShadow,
-	light: scrollbarShadow,
-	hcDark: scrollbarShadow,
-	hcLight: scrollbarShadow
-}, localize('panelStickyScrollShadow', "Shadow color of sticky scroll in the panel."));
+export const PANEL_STICKY_SCROLL_SHADOW = registerColor('panelStickyScroll.shadow', scrollbarShadow, localize('panelStickyScrollShadow', "Shadow color of sticky scroll in the panel."));
 
 // < --- Output Editor -->
 
-const OUTPUT_VIEW_BACKGROUND = registerColor('outputView.background', {
-	dark: null,
-	light: null,
-	hcDark: null,
-	hcLight: null
-}, localize('outputViewBackground', "Output view background color."));
+const OUTPUT_VIEW_BACKGROUND = registerColor('outputView.background', null, localize('outputViewBackground', "Output view background color."));
 
 
-registerColor('outputViewStickyScroll.background', {
-	dark: OUTPUT_VIEW_BACKGROUND,
-	light: OUTPUT_VIEW_BACKGROUND,
-	hcDark: OUTPUT_VIEW_BACKGROUND,
-	hcLight: OUTPUT_VIEW_BACKGROUND
-}, localize('outputViewStickyScrollBackground', "Output view sticky scroll background color."));
+registerColor('outputViewStickyScroll.background', OUTPUT_VIEW_BACKGROUND, localize('outputViewStickyScrollBackground', "Output view sticky scroll background color."));
 
 
 // < --- Banner --- >
@@ -481,19 +336,9 @@ export const BANNER_BACKGROUND = registerColor('banner.background', {
 	hcLight: listActiveSelectionBackground
 }, localize('banner.background', "Banner background color. The banner is shown under the title bar of the window."));
 
-export const BANNER_FOREGROUND = registerColor('banner.foreground', {
-	dark: listActiveSelectionForeground,
-	light: listActiveSelectionForeground,
-	hcDark: listActiveSelectionForeground,
-	hcLight: listActiveSelectionForeground
-}, localize('banner.foreground', "Banner foreground color. The banner is shown under the title bar of the window."));
+export const BANNER_FOREGROUND = registerColor('banner.foreground', listActiveSelectionForeground, localize('banner.foreground', "Banner foreground color. The banner is shown under the title bar of the window."));
 
-export const BANNER_ICON_FOREGROUND = registerColor('banner.iconForeground', {
-	dark: editorInfoForeground,
-	light: editorInfoForeground,
-	hcDark: editorInfoForeground,
-	hcLight: editorInfoForeground
-}, localize('banner.iconForeground', "Banner icon color. The banner is shown under the title bar of the window."));
+export const BANNER_ICON_FOREGROUND = registerColor('banner.iconForeground', editorInfoForeground, localize('banner.iconForeground', "Banner icon color. The banner is shown under the title bar of the window."));
 
 // < --- Status --- >
 
@@ -504,12 +349,7 @@ export const STATUS_BAR_FOREGROUND = registerColor('statusBar.foreground', {
 	hcLight: editorForeground
 }, localize('statusBarForeground', "Status bar foreground color when a workspace or folder is opened. The status bar is shown in the bottom of the window."));
 
-export const STATUS_BAR_NO_FOLDER_FOREGROUND = registerColor('statusBar.noFolderForeground', {
-	dark: STATUS_BAR_FOREGROUND,
-	light: STATUS_BAR_FOREGROUND,
-	hcDark: STATUS_BAR_FOREGROUND,
-	hcLight: STATUS_BAR_FOREGROUND
-}, localize('statusBarNoFolderForeground', "Status bar foreground color when no folder is opened. The status bar is shown in the bottom of the window."));
+export const STATUS_BAR_NO_FOLDER_FOREGROUND = registerColor('statusBar.noFolderForeground', STATUS_BAR_FOREGROUND, localize('statusBarNoFolderForeground', "Status bar foreground color when no folder is opened. The status bar is shown in the bottom of the window."));
 
 export const STATUS_BAR_BACKGROUND = registerColor('statusBar.background', {
 	dark: '#007ACC',
@@ -539,12 +379,7 @@ export const STATUS_BAR_FOCUS_BORDER = registerColor('statusBar.focusBorder', {
 	hcLight: STATUS_BAR_FOREGROUND
 }, localize('statusBarFocusBorder', "Status bar border color when focused on keyboard navigation. The status bar is shown in the bottom of the window."));
 
-export const STATUS_BAR_NO_FOLDER_BORDER = registerColor('statusBar.noFolderBorder', {
-	dark: STATUS_BAR_BORDER,
-	light: STATUS_BAR_BORDER,
-	hcDark: STATUS_BAR_BORDER,
-	hcLight: STATUS_BAR_BORDER
-}, localize('statusBarNoFolderBorder', "Status bar border color separating to the sidebar and editor when no folder is opened. The status bar is shown in the bottom of the window."));
+export const STATUS_BAR_NO_FOLDER_BORDER = registerColor('statusBar.noFolderBorder', STATUS_BAR_BORDER, localize('statusBarNoFolderBorder', "Status bar border color separating to the sidebar and editor when no folder is opened. The status bar is shown in the bottom of the window."));
 
 export const STATUS_BAR_ITEM_ACTIVE_BACKGROUND = registerColor('statusBarItem.activeBackground', {
 	dark: Color.white.transparent(0.18),
@@ -567,12 +402,7 @@ export const STATUS_BAR_ITEM_HOVER_BACKGROUND = registerColor('statusBarItem.hov
 	hcLight: Color.black.transparent(0.12)
 }, localize('statusBarItemHoverBackground', "Status bar item background color when hovering. The status bar is shown in the bottom of the window."));
 
-export const STATUS_BAR_ITEM_HOVER_FOREGROUND = registerColor('statusBarItem.hoverForeground', {
-	dark: STATUS_BAR_FOREGROUND,
-	light: STATUS_BAR_FOREGROUND,
-	hcDark: STATUS_BAR_FOREGROUND,
-	hcLight: STATUS_BAR_FOREGROUND
-}, localize('statusBarItemHoverForeground', "Status bar item foreground color when hovering. The status bar is shown in the bottom of the window."));
+export const STATUS_BAR_ITEM_HOVER_FOREGROUND = registerColor('statusBarItem.hoverForeground', STATUS_BAR_FOREGROUND, localize('statusBarItemHoverForeground', "Status bar item foreground color when hovering. The status bar is shown in the bottom of the window."));
 
 export const STATUS_BAR_ITEM_COMPACT_HOVER_BACKGROUND = registerColor('statusBarItem.compactHoverBackground', {
 	dark: Color.white.transparent(0.20),
@@ -581,26 +411,11 @@ export const STATUS_BAR_ITEM_COMPACT_HOVER_BACKGROUND = registerColor('statusBar
 	hcLight: Color.black.transparent(0.20)
 }, localize('statusBarItemCompactHoverBackground', "Status bar item background color when hovering an item that contains two hovers. The status bar is shown in the bottom of the window."));
 
-export const STATUS_BAR_PROMINENT_ITEM_FOREGROUND = registerColor('statusBarItem.prominentForeground', {
-	dark: STATUS_BAR_FOREGROUND,
-	light: STATUS_BAR_FOREGROUND,
-	hcDark: STATUS_BAR_FOREGROUND,
-	hcLight: STATUS_BAR_FOREGROUND
-}, localize('statusBarProminentItemForeground', "Status bar prominent items foreground color. Prominent items stand out from other status bar entries to indicate importance. The status bar is shown in the bottom of the window."));
+export const STATUS_BAR_PROMINENT_ITEM_FOREGROUND = registerColor('statusBarItem.prominentForeground', STATUS_BAR_FOREGROUND, localize('statusBarProminentItemForeground', "Status bar prominent items foreground color. Prominent items stand out from other status bar entries to indicate importance. The status bar is shown in the bottom of the window."));
 
-export const STATUS_BAR_PROMINENT_ITEM_BACKGROUND = registerColor('statusBarItem.prominentBackground', {
-	dark: Color.black.transparent(0.5),
-	light: Color.black.transparent(0.5),
-	hcDark: Color.black.transparent(0.5),
-	hcLight: Color.black.transparent(0.5),
-}, localize('statusBarProminentItemBackground', "Status bar prominent items background color. Prominent items stand out from other status bar entries to indicate importance. The status bar is shown in the bottom of the window."));
+export const STATUS_BAR_PROMINENT_ITEM_BACKGROUND = registerColor('statusBarItem.prominentBackground', Color.black.transparent(0.5), localize('statusBarProminentItemBackground', "Status bar prominent items background color. Prominent items stand out from other status bar entries to indicate importance. The status bar is shown in the bottom of the window."));
 
-export const STATUS_BAR_PROMINENT_ITEM_HOVER_FOREGROUND = registerColor('statusBarItem.prominentHoverForeground', {
-	dark: STATUS_BAR_ITEM_HOVER_FOREGROUND,
-	light: STATUS_BAR_ITEM_HOVER_FOREGROUND,
-	hcDark: STATUS_BAR_ITEM_HOVER_FOREGROUND,
-	hcLight: STATUS_BAR_ITEM_HOVER_FOREGROUND
-}, localize('statusBarProminentItemHoverForeground', "Status bar prominent items foreground color when hovering. Prominent items stand out from other status bar entries to indicate importance. The status bar is shown in the bottom of the window."));
+export const STATUS_BAR_PROMINENT_ITEM_HOVER_FOREGROUND = registerColor('statusBarItem.prominentHoverForeground', STATUS_BAR_ITEM_HOVER_FOREGROUND, localize('statusBarProminentItemHoverForeground', "Status bar prominent items foreground color when hovering. Prominent items stand out from other status bar entries to indicate importance. The status bar is shown in the bottom of the window."));
 
 export const STATUS_BAR_PROMINENT_ITEM_HOVER_BACKGROUND = registerColor('statusBarItem.prominentHoverBackground', {
 	dark: Color.black.transparent(0.3),
@@ -616,26 +431,11 @@ export const STATUS_BAR_ERROR_ITEM_BACKGROUND = registerColor('statusBarItem.err
 	hcLight: '#B5200D'
 }, localize('statusBarErrorItemBackground', "Status bar error items background color. Error items stand out from other status bar entries to indicate error conditions. The status bar is shown in the bottom of the window."));
 
-export const STATUS_BAR_ERROR_ITEM_FOREGROUND = registerColor('statusBarItem.errorForeground', {
-	dark: Color.white,
-	light: Color.white,
-	hcDark: Color.white,
-	hcLight: Color.white
-}, localize('statusBarErrorItemForeground', "Status bar error items foreground color. Error items stand out from other status bar entries to indicate error conditions. The status bar is shown in the bottom of the window."));
+export const STATUS_BAR_ERROR_ITEM_FOREGROUND = registerColor('statusBarItem.errorForeground', Color.white, localize('statusBarErrorItemForeground', "Status bar error items foreground color. Error items stand out from other status bar entries to indicate error conditions. The status bar is shown in the bottom of the window."));
 
-export const STATUS_BAR_ERROR_ITEM_HOVER_FOREGROUND = registerColor('statusBarItem.errorHoverForeground', {
-	dark: STATUS_BAR_ITEM_HOVER_FOREGROUND,
-	light: STATUS_BAR_ITEM_HOVER_FOREGROUND,
-	hcDark: STATUS_BAR_ITEM_HOVER_FOREGROUND,
-	hcLight: STATUS_BAR_ITEM_HOVER_FOREGROUND
-}, localize('statusBarErrorItemHoverForeground', "Status bar error items foreground color when hovering. Error items stand out from other status bar entries to indicate error conditions. The status bar is shown in the bottom of the window."));
+export const STATUS_BAR_ERROR_ITEM_HOVER_FOREGROUND = registerColor('statusBarItem.errorHoverForeground', STATUS_BAR_ITEM_HOVER_FOREGROUND, localize('statusBarErrorItemHoverForeground', "Status bar error items foreground color when hovering. Error items stand out from other status bar entries to indicate error conditions. The status bar is shown in the bottom of the window."));
 
-export const STATUS_BAR_ERROR_ITEM_HOVER_BACKGROUND = registerColor('statusBarItem.errorHoverBackground', {
-	dark: STATUS_BAR_ITEM_HOVER_BACKGROUND,
-	light: STATUS_BAR_ITEM_HOVER_BACKGROUND,
-	hcDark: STATUS_BAR_ITEM_HOVER_BACKGROUND,
-	hcLight: STATUS_BAR_ITEM_HOVER_BACKGROUND
-}, localize('statusBarErrorItemHoverBackground', "Status bar error items background color when hovering. Error items stand out from other status bar entries to indicate error conditions. The status bar is shown in the bottom of the window."));
+export const STATUS_BAR_ERROR_ITEM_HOVER_BACKGROUND = registerColor('statusBarItem.errorHoverBackground', STATUS_BAR_ITEM_HOVER_BACKGROUND, localize('statusBarErrorItemHoverBackground', "Status bar error items background color when hovering. Error items stand out from other status bar entries to indicate error conditions. The status bar is shown in the bottom of the window."));
 
 export const STATUS_BAR_WARNING_ITEM_BACKGROUND = registerColor('statusBarItem.warningBackground', {
 	dark: darken(editorWarningForeground, .4),
@@ -644,26 +444,11 @@ export const STATUS_BAR_WARNING_ITEM_BACKGROUND = registerColor('statusBarItem.w
 	hcLight: '#895503'
 }, localize('statusBarWarningItemBackground', "Status bar warning items background color. Warning items stand out from other status bar entries to indicate warning conditions. The status bar is shown in the bottom of the window."));
 
-export const STATUS_BAR_WARNING_ITEM_FOREGROUND = registerColor('statusBarItem.warningForeground', {
-	dark: Color.white,
-	light: Color.white,
-	hcDark: Color.white,
-	hcLight: Color.white
-}, localize('statusBarWarningItemForeground', "Status bar warning items foreground color. Warning items stand out from other status bar entries to indicate warning conditions. The status bar is shown in the bottom of the window."));
+export const STATUS_BAR_WARNING_ITEM_FOREGROUND = registerColor('statusBarItem.warningForeground', Color.white, localize('statusBarWarningItemForeground', "Status bar warning items foreground color. Warning items stand out from other status bar entries to indicate warning conditions. The status bar is shown in the bottom of the window."));
 
-export const STATUS_BAR_WARNING_ITEM_HOVER_FOREGROUND = registerColor('statusBarItem.warningHoverForeground', {
-	dark: STATUS_BAR_ITEM_HOVER_FOREGROUND,
-	light: STATUS_BAR_ITEM_HOVER_FOREGROUND,
-	hcDark: STATUS_BAR_ITEM_HOVER_FOREGROUND,
-	hcLight: STATUS_BAR_ITEM_HOVER_FOREGROUND
-}, localize('statusBarWarningItemHoverForeground', "Status bar warning items foreground color when hovering. Warning items stand out from other status bar entries to indicate warning conditions. The status bar is shown in the bottom of the window."));
+export const STATUS_BAR_WARNING_ITEM_HOVER_FOREGROUND = registerColor('statusBarItem.warningHoverForeground', STATUS_BAR_ITEM_HOVER_FOREGROUND, localize('statusBarWarningItemHoverForeground', "Status bar warning items foreground color when hovering. Warning items stand out from other status bar entries to indicate warning conditions. The status bar is shown in the bottom of the window."));
 
-export const STATUS_BAR_WARNING_ITEM_HOVER_BACKGROUND = registerColor('statusBarItem.warningHoverBackground', {
-	dark: STATUS_BAR_ITEM_HOVER_BACKGROUND,
-	light: STATUS_BAR_ITEM_HOVER_BACKGROUND,
-	hcDark: STATUS_BAR_ITEM_HOVER_BACKGROUND,
-	hcLight: STATUS_BAR_ITEM_HOVER_BACKGROUND
-}, localize('statusBarWarningItemHoverBackground', "Status bar warning items background color when hovering. Warning items stand out from other status bar entries to indicate warning conditions. The status bar is shown in the bottom of the window."));
+export const STATUS_BAR_WARNING_ITEM_HOVER_BACKGROUND = registerColor('statusBarItem.warningHoverBackground', STATUS_BAR_ITEM_HOVER_BACKGROUND, localize('statusBarWarningItemHoverBackground', "Status bar warning items background color when hovering. Warning items stand out from other status bar entries to indicate warning conditions. The status bar is shown in the bottom of the window."));
 
 
 // < --- Activity Bar --- >
@@ -710,12 +495,7 @@ export const ACTIVITY_BAR_ACTIVE_FOCUS_BORDER = registerColor('activityBar.activ
 	hcLight: '#B5200D'
 }, localize('activityBarActiveFocusBorder', "Activity bar focus border color for the active item. The activity bar is showing on the far left or right and allows to switch between views of the side bar."));
 
-export const ACTIVITY_BAR_ACTIVE_BACKGROUND = registerColor('activityBar.activeBackground', {
-	dark: null,
-	light: null,
-	hcDark: null,
-	hcLight: null
-}, localize('activityBarActiveBackground', "Activity bar background color for the active item. The activity bar is showing on the far left or right and allows to switch between views of the side bar."));
+export const ACTIVITY_BAR_ACTIVE_BACKGROUND = registerColor('activityBar.activeBackground', null, localize('activityBarActiveBackground', "Activity bar background color for the active item. The activity bar is showing on the far left or right and allows to switch between views of the side bar."));
 
 export const ACTIVITY_BAR_DRAG_AND_DROP_BORDER = registerColor('activityBar.dropBorder', {
 	dark: ACTIVITY_BAR_FOREGROUND,
@@ -731,12 +511,7 @@ export const ACTIVITY_BAR_BADGE_BACKGROUND = registerColor('activityBarBadge.bac
 	hcLight: '#0F4A85'
 }, localize('activityBarBadgeBackground', "Activity notification badge background color. The activity bar is showing on the far left or right and allows to switch between views of the side bar."));
 
-export const ACTIVITY_BAR_BADGE_FOREGROUND = registerColor('activityBarBadge.foreground', {
-	dark: Color.white,
-	light: Color.white,
-	hcDark: Color.white,
-	hcLight: Color.white
-}, localize('activityBarBadgeForeground', "Activity notification badge foreground color. The activity bar is showing on the far left or right and allows to switch between views of the side bar."));
+export const ACTIVITY_BAR_BADGE_FOREGROUND = registerColor('activityBarBadge.foreground', Color.white, localize('activityBarBadgeForeground', "Activity notification badge foreground color. The activity bar is showing on the far left or right and allows to switch between views of the side bar."));
 
 export const ACTIVITY_BAR_TOP_FOREGROUND = registerColor('activityBarTop.foreground', {
 	dark: '#E7E7E7',
@@ -752,12 +527,7 @@ export const ACTIVITY_BAR_TOP_ACTIVE_BORDER = registerColor('activityBarTop.acti
 	hcLight: '#B5200D'
 }, localize('activityBarTopActiveFocusBorder', "Focus border color for the active item in the Activity bar when it is on top / bottom. The activity allows to switch between views of the side bar."));
 
-export const ACTIVITY_BAR_TOP_ACTIVE_BACKGROUND = registerColor('activityBarTop.activeBackground', {
-	dark: null,
-	light: null,
-	hcDark: null,
-	hcLight: null
-}, localize('activityBarTopActiveBackground', "Background color for the active item in the Activity bar when it is on top / bottom. The activity allows to switch between views of the side bar."));
+export const ACTIVITY_BAR_TOP_ACTIVE_BACKGROUND = registerColor('activityBarTop.activeBackground', null, localize('activityBarTopActiveBackground', "Background color for the active item in the Activity bar when it is on top / bottom. The activity allows to switch between views of the side bar."));
 
 export const ACTIVITY_BAR_TOP_INACTIVE_FOREGROUND = registerColor('activityBarTop.inactiveForeground', {
 	dark: transparent(ACTIVITY_BAR_TOP_FOREGROUND, 0.6),
@@ -766,19 +536,9 @@ export const ACTIVITY_BAR_TOP_INACTIVE_FOREGROUND = registerColor('activityBarTo
 	hcLight: editorForeground
 }, localize('activityBarTopInActiveForeground', "Inactive foreground color of the item in the Activity bar when it is on top / bottom. The activity allows to switch between views of the side bar."));
 
-export const ACTIVITY_BAR_TOP_DRAG_AND_DROP_BORDER = registerColor('activityBarTop.dropBorder', {
-	dark: ACTIVITY_BAR_TOP_FOREGROUND,
-	light: ACTIVITY_BAR_TOP_FOREGROUND,
-	hcDark: ACTIVITY_BAR_TOP_FOREGROUND,
-	hcLight: ACTIVITY_BAR_TOP_FOREGROUND
-}, localize('activityBarTopDragAndDropBorder', "Drag and drop feedback color for the items in the Activity bar when it is on top / bottom. The activity allows to switch between views of the side bar."));
+export const ACTIVITY_BAR_TOP_DRAG_AND_DROP_BORDER = registerColor('activityBarTop.dropBorder', ACTIVITY_BAR_TOP_FOREGROUND, localize('activityBarTopDragAndDropBorder', "Drag and drop feedback color for the items in the Activity bar when it is on top / bottom. The activity allows to switch between views of the side bar."));
 
-export const ACTIVITY_BAR_TOP_BACKGROUND = registerColor('activityBarTop.background', {
-	dark: null,
-	light: null,
-	hcDark: null,
-	hcLight: null,
-}, localize('activityBarTopBackground', "Background color of the activity bar when set to top / bottom."));
+export const ACTIVITY_BAR_TOP_BACKGROUND = registerColor('activityBarTop.background', null, localize('activityBarTopBackground', "Background color of the activity bar when set to top / bottom."));
 
 
 // < --- Profiles --- >
@@ -799,26 +559,11 @@ export const PROFILE_BADGE_FOREGROUND = registerColor('profileBadge.foreground',
 
 // < --- Remote --- >
 
-export const STATUS_BAR_REMOTE_ITEM_BACKGROUND = registerColor('statusBarItem.remoteBackground', {
-	dark: ACTIVITY_BAR_BADGE_BACKGROUND,
-	light: ACTIVITY_BAR_BADGE_BACKGROUND,
-	hcDark: ACTIVITY_BAR_BADGE_BACKGROUND,
-	hcLight: ACTIVITY_BAR_BADGE_BACKGROUND
-}, localize('statusBarItemHostBackground', "Background color for the remote indicator on the status bar."));
+export const STATUS_BAR_REMOTE_ITEM_BACKGROUND = registerColor('statusBarItem.remoteBackground', ACTIVITY_BAR_BADGE_BACKGROUND, localize('statusBarItemHostBackground', "Background color for the remote indicator on the status bar."));
 
-export const STATUS_BAR_REMOTE_ITEM_FOREGROUND = registerColor('statusBarItem.remoteForeground', {
-	dark: ACTIVITY_BAR_BADGE_FOREGROUND,
-	light: ACTIVITY_BAR_BADGE_FOREGROUND,
-	hcDark: ACTIVITY_BAR_BADGE_FOREGROUND,
-	hcLight: ACTIVITY_BAR_BADGE_FOREGROUND
-}, localize('statusBarItemHostForeground', "Foreground color for the remote indicator on the status bar."));
+export const STATUS_BAR_REMOTE_ITEM_FOREGROUND = registerColor('statusBarItem.remoteForeground', ACTIVITY_BAR_BADGE_FOREGROUND, localize('statusBarItemHostForeground', "Foreground color for the remote indicator on the status bar."));
 
-export const STATUS_BAR_REMOTE_ITEM_HOVER_FOREGROUND = registerColor('statusBarItem.remoteHoverForeground', {
-	dark: STATUS_BAR_ITEM_HOVER_FOREGROUND,
-	light: STATUS_BAR_ITEM_HOVER_FOREGROUND,
-	hcDark: STATUS_BAR_ITEM_HOVER_FOREGROUND,
-	hcLight: STATUS_BAR_ITEM_HOVER_FOREGROUND
-}, localize('statusBarRemoteItemHoverForeground', "Foreground color for the remote indicator on the status bar when hovering."));
+export const STATUS_BAR_REMOTE_ITEM_HOVER_FOREGROUND = registerColor('statusBarItem.remoteHoverForeground', STATUS_BAR_ITEM_HOVER_FOREGROUND, localize('statusBarRemoteItemHoverForeground', "Foreground color for the remote indicator on the status bar when hovering."));
 
 export const STATUS_BAR_REMOTE_ITEM_HOVER_BACKGROUND = registerColor('statusBarItem.remoteHoverBackground', {
 	dark: STATUS_BAR_ITEM_HOVER_BACKGROUND,
@@ -827,26 +572,11 @@ export const STATUS_BAR_REMOTE_ITEM_HOVER_BACKGROUND = registerColor('statusBarI
 	hcLight: null
 }, localize('statusBarRemoteItemHoverBackground', "Background color for the remote indicator on the status bar when hovering."));
 
-export const STATUS_BAR_OFFLINE_ITEM_BACKGROUND = registerColor('statusBarItem.offlineBackground', {
-	dark: '#6c1717',
-	light: '#6c1717',
-	hcDark: '#6c1717',
-	hcLight: '#6c1717'
-}, localize('statusBarItemOfflineBackground', "Status bar item background color when the workbench is offline."));
+export const STATUS_BAR_OFFLINE_ITEM_BACKGROUND = registerColor('statusBarItem.offlineBackground', '#6c1717', localize('statusBarItemOfflineBackground', "Status bar item background color when the workbench is offline."));
 
-export const STATUS_BAR_OFFLINE_ITEM_FOREGROUND = registerColor('statusBarItem.offlineForeground', {
-	dark: STATUS_BAR_REMOTE_ITEM_FOREGROUND,
-	light: STATUS_BAR_REMOTE_ITEM_FOREGROUND,
-	hcDark: STATUS_BAR_REMOTE_ITEM_FOREGROUND,
-	hcLight: STATUS_BAR_REMOTE_ITEM_FOREGROUND
-}, localize('statusBarItemOfflineForeground', "Status bar item foreground color when the workbench is offline."));
+export const STATUS_BAR_OFFLINE_ITEM_FOREGROUND = registerColor('statusBarItem.offlineForeground', STATUS_BAR_REMOTE_ITEM_FOREGROUND, localize('statusBarItemOfflineForeground', "Status bar item foreground color when the workbench is offline."));
 
-export const STATUS_BAR_OFFLINE_ITEM_HOVER_FOREGROUND = registerColor('statusBarItem.offlineHoverForeground', {
-	dark: STATUS_BAR_ITEM_HOVER_FOREGROUND,
-	light: STATUS_BAR_ITEM_HOVER_FOREGROUND,
-	hcDark: STATUS_BAR_ITEM_HOVER_FOREGROUND,
-	hcLight: STATUS_BAR_ITEM_HOVER_FOREGROUND
-}, localize('statusBarOfflineItemHoverForeground', "Status bar item foreground hover color when the workbench is offline."));
+export const STATUS_BAR_OFFLINE_ITEM_HOVER_FOREGROUND = registerColor('statusBarItem.offlineHoverForeground', STATUS_BAR_ITEM_HOVER_FOREGROUND, localize('statusBarOfflineItemHoverForeground', "Status bar item foreground hover color when the workbench is offline."));
 
 export const STATUS_BAR_OFFLINE_ITEM_HOVER_BACKGROUND = registerColor('statusBarItem.offlineHoverBackground', {
 	dark: STATUS_BAR_ITEM_HOVER_BACKGROUND,
@@ -855,19 +585,9 @@ export const STATUS_BAR_OFFLINE_ITEM_HOVER_BACKGROUND = registerColor('statusBar
 	hcLight: null
 }, localize('statusBarOfflineItemHoverBackground', "Status bar item background hover color when the workbench is offline."));
 
-export const EXTENSION_BADGE_REMOTE_BACKGROUND = registerColor('extensionBadge.remoteBackground', {
-	dark: ACTIVITY_BAR_BADGE_BACKGROUND,
-	light: ACTIVITY_BAR_BADGE_BACKGROUND,
-	hcDark: ACTIVITY_BAR_BADGE_BACKGROUND,
-	hcLight: ACTIVITY_BAR_BADGE_BACKGROUND
-}, localize('extensionBadge.remoteBackground', "Background color for the remote badge in the extensions view."));
+export const EXTENSION_BADGE_REMOTE_BACKGROUND = registerColor('extensionBadge.remoteBackground', ACTIVITY_BAR_BADGE_BACKGROUND, localize('extensionBadge.remoteBackground', "Background color for the remote badge in the extensions view."));
 
-export const EXTENSION_BADGE_REMOTE_FOREGROUND = registerColor('extensionBadge.remoteForeground', {
-	dark: ACTIVITY_BAR_BADGE_FOREGROUND,
-	light: ACTIVITY_BAR_BADGE_FOREGROUND,
-	hcDark: ACTIVITY_BAR_BADGE_FOREGROUND,
-	hcLight: ACTIVITY_BAR_BADGE_FOREGROUND
-}, localize('extensionBadge.remoteForeground', "Foreground color for the remote badge in the extensions view."));
+export const EXTENSION_BADGE_REMOTE_FOREGROUND = registerColor('extensionBadge.remoteForeground', ACTIVITY_BAR_BADGE_FOREGROUND, localize('extensionBadge.remoteForeground', "Foreground color for the remote badge in the extensions view."));
 
 
 // < --- Side Bar --- >
@@ -879,12 +599,7 @@ export const SIDE_BAR_BACKGROUND = registerColor('sideBar.background', {
 	hcLight: '#FFFFFF'
 }, localize('sideBarBackground', "Side bar background color. The side bar is the container for views like explorer and search."));
 
-export const SIDE_BAR_FOREGROUND = registerColor('sideBar.foreground', {
-	dark: null,
-	light: null,
-	hcDark: null,
-	hcLight: null
-}, localize('sideBarForeground', "Side bar foreground color. The side bar is the container for views like explorer and search."));
+export const SIDE_BAR_FOREGROUND = registerColor('sideBar.foreground', null, localize('sideBarForeground', "Side bar foreground color. The side bar is the container for views like explorer and search."));
 
 export const SIDE_BAR_BORDER = registerColor('sideBar.border', {
 	dark: null,
@@ -893,26 +608,11 @@ export const SIDE_BAR_BORDER = registerColor('sideBar.border', {
 	hcLight: contrastBorder
 }, localize('sideBarBorder', "Side bar border color on the side separating to the editor. The side bar is the container for views like explorer and search."));
 
-export const SIDE_BAR_TITLE_BACKGROUND = registerColor('sideBarTitle.background', {
-	dark: SIDE_BAR_BACKGROUND,
-	light: SIDE_BAR_BACKGROUND,
-	hcDark: SIDE_BAR_BACKGROUND,
-	hcLight: SIDE_BAR_BACKGROUND
-}, localize('sideBarTitleBackground', "Side bar title background color. The side bar is the container for views like explorer and search."));
+export const SIDE_BAR_TITLE_BACKGROUND = registerColor('sideBarTitle.background', SIDE_BAR_BACKGROUND, localize('sideBarTitleBackground', "Side bar title background color. The side bar is the container for views like explorer and search."));
 
-export const SIDE_BAR_TITLE_FOREGROUND = registerColor('sideBarTitle.foreground', {
-	dark: SIDE_BAR_FOREGROUND,
-	light: SIDE_BAR_FOREGROUND,
-	hcDark: SIDE_BAR_FOREGROUND,
-	hcLight: SIDE_BAR_FOREGROUND
-}, localize('sideBarTitleForeground', "Side bar title foreground color. The side bar is the container for views like explorer and search."));
+export const SIDE_BAR_TITLE_FOREGROUND = registerColor('sideBarTitle.foreground', SIDE_BAR_FOREGROUND, localize('sideBarTitleForeground', "Side bar title foreground color. The side bar is the container for views like explorer and search."));
 
-export const SIDE_BAR_DRAG_AND_DROP_BACKGROUND = registerColor('sideBar.dropBackground', {
-	dark: EDITOR_DRAG_AND_DROP_BACKGROUND,
-	light: EDITOR_DRAG_AND_DROP_BACKGROUND,
-	hcDark: EDITOR_DRAG_AND_DROP_BACKGROUND,
-	hcLight: EDITOR_DRAG_AND_DROP_BACKGROUND
-}, localize('sideBarDragAndDropBackground', "Drag and drop feedback color for the side bar sections. The color should have transparency so that the side bar sections can still shine through. The side bar is the container for views like explorer and search. Side bar sections are views nested within the side bar."));
+export const SIDE_BAR_DRAG_AND_DROP_BACKGROUND = registerColor('sideBar.dropBackground', EDITOR_DRAG_AND_DROP_BACKGROUND, localize('sideBarDragAndDropBackground', "Drag and drop feedback color for the side bar sections. The color should have transparency so that the side bar sections can still shine through. The side bar is the container for views like explorer and search. Side bar sections are views nested within the side bar."));
 
 export const SIDE_BAR_SECTION_HEADER_BACKGROUND = registerColor('sideBarSectionHeader.background', {
 	dark: Color.fromHex('#808080').transparent(0.2),
@@ -921,47 +621,17 @@ export const SIDE_BAR_SECTION_HEADER_BACKGROUND = registerColor('sideBarSectionH
 	hcLight: null
 }, localize('sideBarSectionHeaderBackground', "Side bar section header background color. The side bar is the container for views like explorer and search. Side bar sections are views nested within the side bar."));
 
-export const SIDE_BAR_SECTION_HEADER_FOREGROUND = registerColor('sideBarSectionHeader.foreground', {
-	dark: SIDE_BAR_FOREGROUND,
-	light: SIDE_BAR_FOREGROUND,
-	hcDark: SIDE_BAR_FOREGROUND,
-	hcLight: SIDE_BAR_FOREGROUND
-}, localize('sideBarSectionHeaderForeground', "Side bar section header foreground color. The side bar is the container for views like explorer and search. Side bar sections are views nested within the side bar."));
+export const SIDE_BAR_SECTION_HEADER_FOREGROUND = registerColor('sideBarSectionHeader.foreground', SIDE_BAR_FOREGROUND, localize('sideBarSectionHeaderForeground', "Side bar section header foreground color. The side bar is the container for views like explorer and search. Side bar sections are views nested within the side bar."));
 
-export const SIDE_BAR_SECTION_HEADER_BORDER = registerColor('sideBarSectionHeader.border', {
-	dark: contrastBorder,
-	light: contrastBorder,
-	hcDark: contrastBorder,
-	hcLight: contrastBorder
-}, localize('sideBarSectionHeaderBorder', "Side bar section header border color. The side bar is the container for views like explorer and search. Side bar sections are views nested within the side bar."));
+export const SIDE_BAR_SECTION_HEADER_BORDER = registerColor('sideBarSectionHeader.border', contrastBorder, localize('sideBarSectionHeaderBorder', "Side bar section header border color. The side bar is the container for views like explorer and search. Side bar sections are views nested within the side bar."));
 
-export const ACTIVITY_BAR_TOP_BORDER = registerColor('sideBarActivityBarTop.border', {
-	dark: SIDE_BAR_SECTION_HEADER_BORDER,
-	light: SIDE_BAR_SECTION_HEADER_BORDER,
-	hcDark: SIDE_BAR_SECTION_HEADER_BORDER,
-	hcLight: SIDE_BAR_SECTION_HEADER_BORDER
-}, localize('sideBarActivityBarTopBorder', "Border color between the activity bar at the top/bottom and the views."));
+export const ACTIVITY_BAR_TOP_BORDER = registerColor('sideBarActivityBarTop.border', SIDE_BAR_SECTION_HEADER_BORDER, localize('sideBarActivityBarTopBorder', "Border color between the activity bar at the top/bottom and the views."));
 
-export const SIDE_BAR_STICKY_SCROLL_BACKGROUND = registerColor('sideBarStickyScroll.background', {
-	dark: SIDE_BAR_BACKGROUND,
-	light: SIDE_BAR_BACKGROUND,
-	hcDark: SIDE_BAR_BACKGROUND,
-	hcLight: SIDE_BAR_BACKGROUND
-}, localize('sideBarStickyScrollBackground', "Background color of sticky scroll in the side bar."));
+export const SIDE_BAR_STICKY_SCROLL_BACKGROUND = registerColor('sideBarStickyScroll.background', SIDE_BAR_BACKGROUND, localize('sideBarStickyScrollBackground', "Background color of sticky scroll in the side bar."));
 
-export const SIDE_BAR_STICKY_SCROLL_BORDER = registerColor('sideBarStickyScroll.border', {
-	dark: null,
-	light: null,
-	hcDark: null,
-	hcLight: null
-}, localize('sideBarStickyScrollBorder', "Border color of sticky scroll in the side bar."));
+export const SIDE_BAR_STICKY_SCROLL_BORDER = registerColor('sideBarStickyScroll.border', null, localize('sideBarStickyScrollBorder', "Border color of sticky scroll in the side bar."));
 
-export const SIDE_BAR_STICKY_SCROLL_SHADOW = registerColor('sideBarStickyScroll.shadow', {
-	dark: scrollbarShadow,
-	light: scrollbarShadow,
-	hcDark: scrollbarShadow,
-	hcLight: scrollbarShadow
-}, localize('sideBarStickyScrollShadow', "Shadow color of sticky scroll in the side bar."));
+export const SIDE_BAR_STICKY_SCROLL_SHADOW = registerColor('sideBarStickyScroll.shadow', scrollbarShadow, localize('sideBarStickyScrollShadow', "Shadow color of sticky scroll in the side bar."));
 
 // < --- Title Bar --- >
 
@@ -1002,12 +672,7 @@ export const TITLE_BAR_BORDER = registerColor('titleBar.border', {
 
 // < --- Menubar --- >
 
-export const MENUBAR_SELECTION_FOREGROUND = registerColor('menubar.selectionForeground', {
-	dark: TITLE_BAR_ACTIVE_FOREGROUND,
-	light: TITLE_BAR_ACTIVE_FOREGROUND,
-	hcDark: TITLE_BAR_ACTIVE_FOREGROUND,
-	hcLight: TITLE_BAR_ACTIVE_FOREGROUND,
-}, localize('menubarSelectionForeground', "Foreground color of the selected menu item in the menubar."));
+export const MENUBAR_SELECTION_FOREGROUND = registerColor('menubar.selectionForeground', TITLE_BAR_ACTIVE_FOREGROUND, localize('menubarSelectionForeground', "Foreground color of the selected menu item in the menubar."));
 
 export const MENUBAR_SELECTION_BACKGROUND = registerColor('menubar.selectionBackground', {
 	dark: toolbarHoverBackground,
@@ -1028,19 +693,19 @@ export const MENUBAR_SELECTION_BORDER = registerColor('menubar.selectionBorder',
 // foreground (inactive and active)
 export const COMMAND_CENTER_FOREGROUND = registerColor(
 	'commandCenter.foreground',
-	{ dark: TITLE_BAR_ACTIVE_FOREGROUND, hcDark: TITLE_BAR_ACTIVE_FOREGROUND, light: TITLE_BAR_ACTIVE_FOREGROUND, hcLight: TITLE_BAR_ACTIVE_FOREGROUND },
+	TITLE_BAR_ACTIVE_FOREGROUND,
 	localize('commandCenter-foreground', "Foreground color of the command center"),
 	false
 );
 export const COMMAND_CENTER_ACTIVEFOREGROUND = registerColor(
 	'commandCenter.activeForeground',
-	{ dark: MENUBAR_SELECTION_FOREGROUND, hcDark: MENUBAR_SELECTION_FOREGROUND, light: MENUBAR_SELECTION_FOREGROUND, hcLight: MENUBAR_SELECTION_FOREGROUND },
+	MENUBAR_SELECTION_FOREGROUND,
 	localize('commandCenter-activeForeground', "Active foreground color of the command center"),
 	false
 );
 export const COMMAND_CENTER_INACTIVEFOREGROUND = registerColor(
 	'commandCenter.inactiveForeground',
-	{ dark: TITLE_BAR_INACTIVE_FOREGROUND, hcDark: TITLE_BAR_INACTIVE_FOREGROUND, light: TITLE_BAR_INACTIVE_FOREGROUND, hcLight: TITLE_BAR_INACTIVE_FOREGROUND },
+	TITLE_BAR_INACTIVE_FOREGROUND,
 	localize('commandCenter-inactiveForeground', "Foreground color of the command center when the window is inactive"),
 	false
 );
@@ -1070,7 +735,7 @@ export const COMMAND_CENTER_ACTIVEBORDER = registerColor(
 );
 // border: defaults to active background
 export const COMMAND_CENTER_INACTIVEBORDER = registerColor(
-	'commandCenter.inactiveBorder', { dark: transparent(TITLE_BAR_INACTIVE_FOREGROUND, .25), hcDark: transparent(TITLE_BAR_INACTIVE_FOREGROUND, .25), light: transparent(TITLE_BAR_INACTIVE_FOREGROUND, .25), hcLight: transparent(TITLE_BAR_INACTIVE_FOREGROUND, .25) },
+	'commandCenter.inactiveBorder', transparent(TITLE_BAR_INACTIVE_FOREGROUND, .25),
 	localize('commandCenter-inactiveBorder', "Border color of the command center when the window is inactive"),
 	false
 );
@@ -1092,33 +757,13 @@ export const NOTIFICATIONS_TOAST_BORDER = registerColor('notificationToast.borde
 	hcLight: contrastBorder
 }, localize('notificationToastBorder', "Notification toast border color. Notifications slide in from the bottom right of the window."));
 
-export const NOTIFICATIONS_FOREGROUND = registerColor('notifications.foreground', {
-	dark: editorWidgetForeground,
-	light: editorWidgetForeground,
-	hcDark: editorWidgetForeground,
-	hcLight: editorWidgetForeground
-}, localize('notificationsForeground', "Notifications foreground color. Notifications slide in from the bottom right of the window."));
+export const NOTIFICATIONS_FOREGROUND = registerColor('notifications.foreground', editorWidgetForeground, localize('notificationsForeground', "Notifications foreground color. Notifications slide in from the bottom right of the window."));
 
-export const NOTIFICATIONS_BACKGROUND = registerColor('notifications.background', {
-	dark: editorWidgetBackground,
-	light: editorWidgetBackground,
-	hcDark: editorWidgetBackground,
-	hcLight: editorWidgetBackground
-}, localize('notificationsBackground', "Notifications background color. Notifications slide in from the bottom right of the window."));
+export const NOTIFICATIONS_BACKGROUND = registerColor('notifications.background', editorWidgetBackground, localize('notificationsBackground', "Notifications background color. Notifications slide in from the bottom right of the window."));
 
-export const NOTIFICATIONS_LINKS = registerColor('notificationLink.foreground', {
-	dark: textLinkForeground,
-	light: textLinkForeground,
-	hcDark: textLinkForeground,
-	hcLight: textLinkForeground
-}, localize('notificationsLink', "Notification links foreground color. Notifications slide in from the bottom right of the window."));
+export const NOTIFICATIONS_LINKS = registerColor('notificationLink.foreground', textLinkForeground, localize('notificationsLink', "Notification links foreground color. Notifications slide in from the bottom right of the window."));
 
-export const NOTIFICATIONS_CENTER_HEADER_FOREGROUND = registerColor('notificationCenterHeader.foreground', {
-	dark: null,
-	light: null,
-	hcDark: null,
-	hcLight: null
-}, localize('notificationCenterHeaderForeground', "Notifications center header foreground color. Notifications slide in from the bottom right of the window."));
+export const NOTIFICATIONS_CENTER_HEADER_FOREGROUND = registerColor('notificationCenterHeader.foreground', null, localize('notificationCenterHeaderForeground', "Notifications center header foreground color. Notifications slide in from the bottom right of the window."));
 
 export const NOTIFICATIONS_CENTER_HEADER_BACKGROUND = registerColor('notificationCenterHeader.background', {
 	dark: lighten(NOTIFICATIONS_BACKGROUND, 0.3),
@@ -1127,33 +772,13 @@ export const NOTIFICATIONS_CENTER_HEADER_BACKGROUND = registerColor('notificatio
 	hcLight: NOTIFICATIONS_BACKGROUND
 }, localize('notificationCenterHeaderBackground', "Notifications center header background color. Notifications slide in from the bottom right of the window."));
 
-export const NOTIFICATIONS_BORDER = registerColor('notifications.border', {
-	dark: NOTIFICATIONS_CENTER_HEADER_BACKGROUND,
-	light: NOTIFICATIONS_CENTER_HEADER_BACKGROUND,
-	hcDark: NOTIFICATIONS_CENTER_HEADER_BACKGROUND,
-	hcLight: NOTIFICATIONS_CENTER_HEADER_BACKGROUND
-}, localize('notificationsBorder', "Notifications border color separating from other notifications in the notifications center. Notifications slide in from the bottom right of the window."));
+export const NOTIFICATIONS_BORDER = registerColor('notifications.border', NOTIFICATIONS_CENTER_HEADER_BACKGROUND, localize('notificationsBorder', "Notifications border color separating from other notifications in the notifications center. Notifications slide in from the bottom right of the window."));
 
-export const NOTIFICATIONS_ERROR_ICON_FOREGROUND = registerColor('notificationsErrorIcon.foreground', {
-	dark: editorErrorForeground,
-	light: editorErrorForeground,
-	hcDark: editorErrorForeground,
-	hcLight: editorErrorForeground
-}, localize('notificationsErrorIconForeground', "The color used for the icon of error notifications. Notifications slide in from the bottom right of the window."));
+export const NOTIFICATIONS_ERROR_ICON_FOREGROUND = registerColor('notificationsErrorIcon.foreground', editorErrorForeground, localize('notificationsErrorIconForeground', "The color used for the icon of error notifications. Notifications slide in from the bottom right of the window."));
 
-export const NOTIFICATIONS_WARNING_ICON_FOREGROUND = registerColor('notificationsWarningIcon.foreground', {
-	dark: editorWarningForeground,
-	light: editorWarningForeground,
-	hcDark: editorWarningForeground,
-	hcLight: editorWarningForeground
-}, localize('notificationsWarningIconForeground', "The color used for the icon of warning notifications. Notifications slide in from the bottom right of the window."));
+export const NOTIFICATIONS_WARNING_ICON_FOREGROUND = registerColor('notificationsWarningIcon.foreground', editorWarningForeground, localize('notificationsWarningIconForeground', "The color used for the icon of warning notifications. Notifications slide in from the bottom right of the window."));
 
-export const NOTIFICATIONS_INFO_ICON_FOREGROUND = registerColor('notificationsInfoIcon.foreground', {
-	dark: editorInfoForeground,
-	light: editorInfoForeground,
-	hcDark: editorInfoForeground,
-	hcLight: editorInfoForeground
-}, localize('notificationsInfoIconForeground', "The color used for the icon of info notifications. Notifications slide in from the bottom right of the window."));
+export const NOTIFICATIONS_INFO_ICON_FOREGROUND = registerColor('notificationsInfoIcon.foreground', editorInfoForeground, localize('notificationsInfoIconForeground', "The color used for the icon of info notifications. Notifications slide in from the bottom right of the window."));
 
 export const WINDOW_ACTIVE_BORDER = registerColor('window.activeBorder', {
 	dark: null,
diff --git a/src/vs/workbench/common/views.ts b/src/vs/workbench/common/views.ts
index 7d0bb72c307..15937afa708 100644
--- a/src/vs/workbench/common/views.ts
+++ b/src/vs/workbench/common/views.ts
@@ -3,29 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Command } from 'vs/editor/common/languages';
-import { UriComponents, URI } from 'vs/base/common/uri';
-import { Event, Emitter } from 'vs/base/common/event';
-import { ContextKeyExpression } from 'vs/platform/contextkey/common/contextkey';
-import { localize } from 'vs/nls';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IDisposable, Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { getOrSet, SetMap } from 'vs/base/common/map';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IKeybindings } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { IProgressIndicator } from 'vs/platform/progress/common/progress';
-import Severity from 'vs/base/common/severity';
-import { IAccessibilityInformation } from 'vs/platform/accessibility/common/accessibility';
-import { IMarkdownString, MarkdownString } from 'vs/base/common/htmlContent';
-import { mixin } from 'vs/base/common/objects';
-import { Codicon } from 'vs/base/common/codicons';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { VSDataTransfer } from 'vs/base/common/dataTransfer';
-import { ILocalizedString } from 'vs/platform/action/common/action';
+import { Command } from '../../editor/common/languages.js';
+import { UriComponents, URI } from '../../base/common/uri.js';
+import { Event, Emitter } from '../../base/common/event.js';
+import { ContextKeyExpression } from '../../platform/contextkey/common/contextkey.js';
+import { localize } from '../../nls.js';
+import { createDecorator } from '../../platform/instantiation/common/instantiation.js';
+import { IDisposable, Disposable, toDisposable } from '../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../base/common/themables.js';
+import { getOrSet, SetMap } from '../../base/common/map.js';
+import { Registry } from '../../platform/registry/common/platform.js';
+import { IKeybindings } from '../../platform/keybinding/common/keybindingsRegistry.js';
+import { ExtensionIdentifier } from '../../platform/extensions/common/extensions.js';
+import { SyncDescriptor } from '../../platform/instantiation/common/descriptors.js';
+import { IProgressIndicator } from '../../platform/progress/common/progress.js';
+import Severity from '../../base/common/severity.js';
+import { IAccessibilityInformation } from '../../platform/accessibility/common/accessibility.js';
+import { IMarkdownString, MarkdownString } from '../../base/common/htmlContent.js';
+import { mixin } from '../../base/common/objects.js';
+import { Codicon } from '../../base/common/codicons.js';
+import { registerIcon } from '../../platform/theme/common/iconRegistry.js';
+import { CancellationToken } from '../../base/common/cancellation.js';
+import { VSDataTransfer } from '../../base/common/dataTransfer.js';
+import { ILocalizedString } from '../../platform/action/common/action.js';
 
 export const VIEWS_LOG_ID = 'views';
 export const VIEWS_LOG_NAME = localize('views log', "Views");
@@ -832,8 +832,8 @@ export class NoTreeViewError extends Error {
 	constructor(treeViewId: string) {
 		super(localize('treeView.notRegistered', 'No tree view with id \'{0}\' registered.', treeViewId));
 	}
-	static is(err: Error): err is NoTreeViewError {
-		return err.name === 'NoTreeViewError';
+	static is(err: unknown): err is NoTreeViewError {
+		return !!err && (err as Error).name === 'NoTreeViewError';
 	}
 }
 
diff --git a/src/vs/workbench/contrib/accessibility/browser/accessibility.contribution.ts b/src/vs/workbench/contrib/accessibility/browser/accessibility.contribution.ts
index 9a00c6035bf..71a01e7d4a6 100644
--- a/src/vs/workbench/contrib/accessibility/browser/accessibility.contribution.ts
+++ b/src/vs/workbench/contrib/accessibility/browser/accessibility.contribution.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { DynamicSpeechAccessibilityConfiguration, registerAccessibilityConfiguration } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { IWorkbenchContributionsRegistry, WorkbenchPhase, Extensions as WorkbenchExtensions, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { UnfocusedViewDimmingContribution } from 'vs/workbench/contrib/accessibility/browser/unfocusedViewDimmingContribution';
-import { AccessibilityStatus } from 'vs/workbench/contrib/accessibility/browser/accessibilityStatus';
-import { EditorAccessibilityHelpContribution } from 'vs/workbench/contrib/accessibility/browser/editorAccessibilityHelp';
-import { SaveAccessibilitySignalContribution } from 'vs/workbench/contrib/accessibilitySignals/browser/saveAccessibilitySignal';
-import { DiffEditorActiveAnnouncementContribution } from 'vs/workbench/contrib/accessibilitySignals/browser/openDiffEditorAnnouncement';
-import { SpeechAccessibilitySignalContribution } from 'vs/workbench/contrib/speech/browser/speechAccessibilitySignal';
-import { AccessibleViewInformationService, IAccessibleViewInformationService } from 'vs/workbench/services/accessibility/common/accessibleViewInformationService';
-import { IAccessibleViewService } from 'vs/platform/accessibility/browser/accessibleView';
-import { AccessibleViewService } from 'vs/workbench/contrib/accessibility/browser/accessibleView';
-import { AccesibleViewHelpContribution, AccesibleViewContributions } from 'vs/workbench/contrib/accessibility/browser/accessibleViewContributions';
-import { ExtensionAccessibilityHelpDialogContribution } from 'vs/workbench/contrib/accessibility/browser/extensionAccesibilityHelp.contribution';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { DynamicSpeechAccessibilityConfiguration, registerAccessibilityConfiguration } from './accessibilityConfiguration.js';
+import { IWorkbenchContributionsRegistry, WorkbenchPhase, Extensions as WorkbenchExtensions, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { UnfocusedViewDimmingContribution } from './unfocusedViewDimmingContribution.js';
+import { AccessibilityStatus } from './accessibilityStatus.js';
+import { EditorAccessibilityHelpContribution } from './editorAccessibilityHelp.js';
+import { SaveAccessibilitySignalContribution } from '../../accessibilitySignals/browser/saveAccessibilitySignal.js';
+import { DiffEditorActiveAnnouncementContribution } from '../../accessibilitySignals/browser/openDiffEditorAnnouncement.js';
+import { SpeechAccessibilitySignalContribution } from '../../speech/browser/speechAccessibilitySignal.js';
+import { AccessibleViewInformationService, IAccessibleViewInformationService } from '../../../services/accessibility/common/accessibleViewInformationService.js';
+import { IAccessibleViewService } from '../../../../platform/accessibility/browser/accessibleView.js';
+import { AccessibleViewService } from './accessibleView.js';
+import { AccesibleViewHelpContribution, AccesibleViewContributions } from './accessibleViewContributions.js';
+import { ExtensionAccessibilityHelpDialogContribution } from './extensionAccesibilityHelp.contribution.js';
 
 registerAccessibilityConfiguration();
 registerSingleton(IAccessibleViewService, AccessibleViewService, InstantiationType.Delayed);
diff --git a/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.ts b/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.ts
index 0ed847ca9fd..5f00d92b180 100644
--- a/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.ts
+++ b/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { ConfigurationScope, Extensions, IConfigurationNode, IConfigurationPropertySchema, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { workbenchConfigurationNodeBase, Extensions as WorkbenchExtensions, IConfigurationMigrationRegistry, ConfigurationKeyValuePairs, ConfigurationMigration } from 'vs/workbench/common/configuration';
-import { AccessibilitySignal } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { AccessibilityVoiceSettingId, ISpeechService, SPEECH_LANGUAGES } from 'vs/workbench/contrib/speech/common/speechService';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { Event } from 'vs/base/common/event';
-import { isDefined } from 'vs/base/common/types';
-import { IProductService } from 'vs/platform/product/common/productService';
+import { localize } from '../../../../nls.js';
+import { ConfigurationScope, Extensions, IConfigurationNode, IConfigurationPropertySchema, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { workbenchConfigurationNodeBase, Extensions as WorkbenchExtensions, IConfigurationMigrationRegistry, ConfigurationKeyValuePairs, ConfigurationMigration } from '../../../common/configuration.js';
+import { AccessibilitySignal } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { AccessibilityVoiceSettingId, ISpeechService, SPEECH_LANGUAGES } from '../../speech/common/speechService.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { Event } from '../../../../base/common/event.js';
+import { isDefined } from '../../../../base/common/types.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
 
 export const accessibilityHelpIsShown = new RawContextKey<boolean>('accessibilityHelpIsShown', false, true);
 export const accessibleViewIsShown = new RawContextKey<boolean>('accessibleViewIsShown', false, true);
@@ -25,6 +25,8 @@ export const accessibleViewOnLastLine = new RawContextKey<boolean>('accessibleVi
 export const accessibleViewCurrentProviderId = new RawContextKey<string>('accessibleViewCurrentProviderId', undefined, undefined);
 export const accessibleViewInCodeBlock = new RawContextKey<boolean>('accessibleViewInCodeBlock', undefined, undefined);
 export const accessibleViewContainsCodeBlocks = new RawContextKey<boolean>('accessibleViewContainsCodeBlocks', undefined, undefined);
+export const accessibleViewHasUnassignedKeybindings = new RawContextKey<boolean>('accessibleViewHasUnassignedKeybindings', undefined, undefined);
+export const accessibleViewHasAssignedKeybindings = new RawContextKey<boolean>('accessibleViewHasAssignedKeybindings', undefined, undefined);
 
 /**
  * Miscellaneous settings tagged with accessibility and implemented in the accessibility contrib but
@@ -56,8 +58,12 @@ export const enum AccessibilityVerbositySettingId {
 	Hover = 'accessibility.verbosity.hover',
 	Notification = 'accessibility.verbosity.notification',
 	EmptyEditorHint = 'accessibility.verbosity.emptyEditorHint',
+	ReplEditor = 'accessibility.verbosity.notebook',
+	ReplInputHint = 'accessibility.verbosity.replInputHint',
 	Comments = 'accessibility.verbosity.comments',
-	DiffEditorActive = 'accessibility.verbosity.diffEditorActive'
+	DiffEditorActive = 'accessibility.verbosity.diffEditorActive',
+	Debug = 'accessibility.verbosity.debug',
+	Walkthrough = 'accessibility.verbosity.walkthrough',
 }
 
 const baseVerbosityProperty: IConfigurationPropertySchema = {
@@ -158,6 +164,10 @@ const configuration: IConfigurationNode = {
 			description: localize('verbosity.emptyEditorHint', 'Provide information about relevant actions in an empty text editor.'),
 			...baseVerbosityProperty
 		},
+		[AccessibilityVerbositySettingId.ReplInputHint]: {
+			description: localize('verbosity.replInputHint', 'Provide information about relevant actions For the Repl input.'),
+			...baseVerbosityProperty
+		},
 		[AccessibilityVerbositySettingId.Comments]: {
 			description: localize('verbosity.comments', 'Provide information about actions that can be taken in the comment widget or in a file which contains comments.'),
 			...baseVerbosityProperty
@@ -166,6 +176,14 @@ const configuration: IConfigurationNode = {
 			description: localize('verbosity.diffEditorActive', 'Indicate when a diff editor becomes the active editor.'),
 			...baseVerbosityProperty
 		},
+		[AccessibilityVerbositySettingId.Debug]: {
+			description: localize('verbosity.debug', 'Provide information about how to access the debug console accessibility help dialog when the debug console or run and debug viewlet is focused. Note that a reload of the window is required for this to take effect.'),
+			...baseVerbosityProperty
+		},
+		[AccessibilityVerbositySettingId.Walkthrough]: {
+			description: localize('verbosity.walkthrough', 'Provide information about how to open the walkthrough in an Accessible View.'),
+			...baseVerbosityProperty
+		},
 		[AccessibilityWorkbenchSettingId.AccessibleViewCloseOnKeyPress]: {
 			markdownDescription: localize('terminal.integrated.accessibleView.closeOnKeyPress', "On keypress, close the Accessible View and focus the element from which it was invoked."),
 			type: 'boolean',
@@ -657,6 +675,16 @@ const configuration: IConfigurationNode = {
 				'announcement': 'never'
 			}
 		},
+		'accessibility.underlineLinks': {
+			'type': 'boolean',
+			'description': localize('accessibility.underlineLinks', "Controls whether links should be underlined in the workbench."),
+			'default': false,
+		},
+		'accessibility.debugWatchVariableAnnouncements': {
+			'type': 'boolean',
+			'description': localize('accessibility.debugWatchVariableAnnouncements', "Controls whether variable changes should be announced in the debug watch view."),
+			'default': true,
+		},
 	}
 };
 
@@ -741,9 +769,15 @@ export class DynamicSpeechAccessibilityConfiguration extends Disposable implemen
 					'enumItemLabels': languagesSorted.map(key => languages[key].name)
 				},
 				[AccessibilityVoiceSettingId.AutoSynthesize]: {
-					'type': 'boolean',
+					'type': 'string',
+					'enum': ['on', 'off', 'auto'],
+					'enumDescriptions': [
+						localize('accessibility.voice.autoSynthesize.on', "Enable the feature. When a screen reader is enabled, note that this will disable aria updates."),
+						localize('accessibility.voice.autoSynthesize.off', "Disable the feature."),
+						localize('accessibility.voice.autoSynthesize.auto', "When a screen reader is detected, disable the feature. Otherwise, enable the feature.")
+					],
 					'markdownDescription': localize('autoSynthesize', "Whether a textual response should automatically be read out aloud when speech was used as input. For example in a chat session, a response is automatically synthesized when voice was used as chat request."),
-					'default': this.productService.quality !== 'stable', // TODO@bpasero decide on a default
+					'default': this.productService.quality !== 'stable' ? 'auto' : 'off', // TODO@bpasero decide on a default
 					'tags': ['accessibility']
 				}
 			}
@@ -791,14 +825,24 @@ Registry.as<IConfigurationMigrationRegistry>(WorkbenchExtensions.ConfigurationMi
 			const delayWarning = getDelaysFromConfig(accessor, 'warningAtPosition');
 			const volume = getVolumeFromConfig(accessor);
 			const debouncePositionChanges = getDebouncePositionChangesFromConfig(accessor);
-			return [
-				['accessibility.signalOptions.volume', { value: volume }],
-				['accessibility.signalOptions.debouncePositionChanges', { value: debouncePositionChanges }],
-				['accessibility.signalOptions.experimental.delays.general', { value: delayGeneral }],
-				['accessibility.signalOptions.experimental.delays.errorAtPosition', { value: delayError }],
-				['accessibility.signalOptions.experimental.delays.warningAtPosition', { value: delayWarning }],
-				['accessibility.signalOptions', { value: undefined }],
-			];
+			const result: [key: string, { value: any }][] = [];
+			if (!!volume) {
+				result.push(['accessibility.signalOptions.volume', { value: volume }]);
+			}
+			if (!!delayGeneral) {
+				result.push(['accessibility.signalOptions.experimental.delays.general', { value: delayGeneral }]);
+			}
+			if (!!delayError) {
+				result.push(['accessibility.signalOptions.experimental.delays.errorAtPosition', { value: delayError }]);
+			}
+			if (!!delayWarning) {
+				result.push(['accessibility.signalOptions.experimental.delays.warningAtPosition', { value: delayWarning }]);
+			}
+			if (!!debouncePositionChanges) {
+				result.push(['accessibility.signalOptions.debouncePositionChanges', { value: debouncePositionChanges }]);
+			}
+			result.push(['accessibility.signalOptions', { value: undefined }]);
+			return result;
 		}
 	}]);
 
@@ -837,6 +881,24 @@ function getDebouncePositionChangesFromConfig(accessor: (key: string) => any): n
 	return accessor('accessibility.signalOptions.debouncePositionChanges') || accessor('accessibility.signalOptions')?.debouncePositionChanges || accessor('accessibility.signals.debouncePositionChanges') || accessor('audioCues.debouncePositionChanges');
 }
 
+Registry.as<IConfigurationMigrationRegistry>(WorkbenchExtensions.ConfigurationMigration)
+	.registerConfigurationMigrations([{
+		key: AccessibilityVoiceSettingId.AutoSynthesize,
+		migrateFn: (value: boolean) => {
+			let newValue: string | undefined;
+			if (value === true) {
+				newValue = 'on';
+			} else if (value === false) {
+				newValue = 'off';
+			} else {
+				return [];
+			}
+			return [
+				[AccessibilityVoiceSettingId.AutoSynthesize, { value: newValue }],
+			];
+		}
+	}]);
+
 Registry.as<IConfigurationMigrationRegistry>(WorkbenchExtensions.ConfigurationMigration)
 	.registerConfigurationMigrations([{
 		key: 'accessibility.signals.chatResponsePending',
diff --git a/src/vs/workbench/contrib/accessibility/browser/accessibilityStatus.ts b/src/vs/workbench/contrib/accessibility/browser/accessibilityStatus.ts
index 5d3949ad1b2..50ae856a62f 100644
--- a/src/vs/workbench/contrib/accessibility/browser/accessibilityStatus.ts
+++ b/src/vs/workbench/contrib/accessibility/browser/accessibilityStatus.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { Event } from 'vs/base/common/event';
-import Severity from 'vs/base/common/severity';
-import { localize } from 'vs/nls';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { INotificationHandle, INotificationService, NotificationPriority } from 'vs/platform/notification/common/notification';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment } from 'vs/workbench/services/statusbar/browser/statusbar';
+import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { Event } from '../../../../base/common/event.js';
+import Severity from '../../../../base/common/severity.js';
+import { localize } from '../../../../nls.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { ConfigurationTarget, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { INotificationHandle, INotificationService, NotificationPriority } from '../../../../platform/notification/common/notification.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment } from '../../../services/statusbar/browser/statusbar.js';
 
 export class AccessibilityStatus extends Disposable implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts b/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts
index d4bd1f893e8..d0ed55141ca 100644
--- a/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts
+++ b/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts
@@ -3,55 +3,57 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { EventType, addDisposableListener, getActiveWindow, isActiveElement } from 'vs/base/browser/dom';
-import { IKeyboardEvent, StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
-import { alert } from 'vs/base/browser/ui/aria/aria';
-import { IAction } from 'vs/base/common/actions';
-import { Codicon } from 'vs/base/common/codicons';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { marked } from 'vs/base/common/marked/marked';
-import { isMacintosh, isWindows } from 'vs/base/common/platform';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { URI } from 'vs/base/common/uri';
-import { IEditorConstructionOptions } from 'vs/editor/browser/config/editorConfiguration';
-import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
-import { CodeEditorWidget, ICodeEditorWidgetOptions } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { Position } from 'vs/editor/common/core/position';
-import { ITextModel } from 'vs/editor/common/model';
-import { IModelService } from 'vs/editor/common/services/model';
-import { AccessibilityHelpNLS } from 'vs/editor/common/standaloneStrings';
-import { CodeActionController } from 'vs/editor/contrib/codeAction/browser/codeActionController';
-import { localize } from 'vs/nls';
-import { AccessibleViewProviderId, AccessibleViewType, AdvancedContentProvider, ExtensionContentProvider, IAccessibleViewService, IAccessibleViewSymbol } from 'vs/platform/accessibility/browser/accessibleView';
-import { ACCESSIBLE_VIEW_SHOWN_STORAGE_PREFIX, IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { WorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
-import { IMenuService, MenuId } from 'vs/platform/actions/common/actions';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextViewDelegate, IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ResultKind } from 'vs/platform/keybinding/common/keybindingResolver';
-import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IQuickInputService, IQuickPick, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { AccessibilityVerbositySettingId, AccessibilityWorkbenchSettingId, accessibilityHelpIsShown, accessibleViewContainsCodeBlocks, accessibleViewCurrentProviderId, accessibleViewGoToSymbolSupported, accessibleViewInCodeBlock, accessibleViewIsShown, accessibleViewOnLastLine, accessibleViewSupportsNavigation, accessibleViewVerbosityEnabled } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { resolveContentAndKeybindingItems } from 'vs/workbench/contrib/accessibility/browser/accessibleViewKeybindingResolver';
-import { AccessibilityCommandId } from 'vs/workbench/contrib/accessibility/common/accessibilityCommands';
-import { IChatCodeBlockContextProviderService } from 'vs/workbench/contrib/chat/browser/chat';
-import { ICodeBlockActionContext } from 'vs/workbench/contrib/chat/browser/codeBlockPart';
-import { getSimpleEditorOptions } from 'vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
+import { EventType, addDisposableListener, getActiveWindow, isActiveElement } from '../../../../base/browser/dom.js';
+import { IKeyboardEvent, StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { ActionsOrientation } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { alert } from '../../../../base/browser/ui/aria/aria.js';
+import { IAction } from '../../../../base/common/actions.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import * as marked from '../../../../base/common/marked/marked.js';
+import { isMacintosh, isWindows } from '../../../../base/common/platform.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IEditorConstructionOptions } from '../../../../editor/browser/config/editorConfiguration.js';
+import { EditorExtensionsRegistry } from '../../../../editor/browser/editorExtensions.js';
+import { CodeEditorWidget, ICodeEditorWidgetOptions } from '../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { IPosition, Position } from '../../../../editor/common/core/position.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { AccessibilityHelpNLS } from '../../../../editor/common/standaloneStrings.js';
+import { CodeActionController } from '../../../../editor/contrib/codeAction/browser/codeActionController.js';
+import { localize } from '../../../../nls.js';
+import { AccessibleViewProviderId, AccessibleViewType, AccessibleContentProvider, ExtensionContentProvider, IAccessibleViewService, IAccessibleViewSymbol } from '../../../../platform/accessibility/browser/accessibleView.js';
+import { ACCESSIBLE_VIEW_SHOWN_STORAGE_PREFIX, IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { createAndFillInActionBarActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { WorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
+import { IMenuService, MenuId } from '../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextViewDelegate, IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { ResultKind } from '../../../../platform/keybinding/common/keybindingResolver.js';
+import { ILayoutService } from '../../../../platform/layout/browser/layoutService.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IQuickInputService, IQuickPick, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { AccessibilityVerbositySettingId, AccessibilityWorkbenchSettingId, accessibilityHelpIsShown, accessibleViewContainsCodeBlocks, accessibleViewCurrentProviderId, accessibleViewGoToSymbolSupported, accessibleViewHasAssignedKeybindings, accessibleViewHasUnassignedKeybindings, accessibleViewInCodeBlock, accessibleViewIsShown, accessibleViewOnLastLine, accessibleViewSupportsNavigation, accessibleViewVerbosityEnabled } from './accessibilityConfiguration.js';
+import { resolveContentAndKeybindingItems } from './accessibleViewKeybindingResolver.js';
+import { AccessibilityCommandId } from '../common/accessibilityCommands.js';
+import { IChatCodeBlockContextProviderService } from '../../chat/browser/chat.js';
+import { ICodeBlockActionContext } from '../../chat/browser/codeBlockPart.js';
+import { getSimpleEditorOptions } from '../../codeEditor/browser/simpleEditorOptions.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { ITextModelContentProvider, ITextModelService } from '../../../../editor/common/services/resolverService.js';
 
 const enum DIMENSIONS {
 	MAX_WIDTH = 600
 }
 
-export type AccesibleViewContentProvider = AdvancedContentProvider | ExtensionContentProvider;
+export type AccesibleViewContentProvider = AccessibleContentProvider | ExtensionContentProvider;
 
 interface ICodeBlock {
 	startLine: number;
@@ -60,7 +62,7 @@ interface ICodeBlock {
 	languageId?: string;
 }
 
-export class AccessibleView extends Disposable {
+export class AccessibleView extends Disposable implements ITextModelContentProvider {
 	private _editorWidget: CodeEditorWidget;
 
 	private _accessiblityHelpIsShown: IContextKey<boolean>;
@@ -72,6 +74,9 @@ export class AccessibleView extends Disposable {
 	private _accessibleViewCurrentProviderId: IContextKey<string>;
 	private _accessibleViewInCodeBlock: IContextKey<boolean>;
 	private _accessibleViewContainsCodeBlocks: IContextKey<boolean>;
+	private _hasUnassignedKeybindings: IContextKey<boolean>;
+	private _hasAssignedKeybindings: IContextKey<boolean>;
+
 	private _codeBlocks?: ICodeBlock[];
 	private _inQuickPick: boolean = false;
 
@@ -85,6 +90,9 @@ export class AccessibleView extends Disposable {
 
 	private _lastProvider: AccesibleViewContentProvider | undefined;
 
+	private _viewContainer: HTMLElement | undefined;
+
+
 	constructor(
 		@IOpenerService private readonly _openerService: IOpenerService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
@@ -99,6 +107,7 @@ export class AccessibleView extends Disposable {
 		@ICommandService private readonly _commandService: ICommandService,
 		@IChatCodeBlockContextProviderService private readonly _codeBlockContextProviderService: IChatCodeBlockContextProviderService,
 		@IStorageService private readonly _storageService: IStorageService,
+		@ITextModelService private readonly textModelResolverService: ITextModelService,
 		@IQuickInputService private readonly _quickInputService: IQuickInputService
 	) {
 		super();
@@ -112,6 +121,8 @@ export class AccessibleView extends Disposable {
 		this._accessibleViewInCodeBlock = accessibleViewInCodeBlock.bindTo(this._contextKeyService);
 		this._accessibleViewContainsCodeBlocks = accessibleViewContainsCodeBlocks.bindTo(this._contextKeyService);
 		this._onLastLine = accessibleViewOnLastLine.bindTo(this._contextKeyService);
+		this._hasUnassignedKeybindings = accessibleViewHasUnassignedKeybindings.bindTo(this._contextKeyService);
+		this._hasAssignedKeybindings = accessibleViewHasAssignedKeybindings.bindTo(this._contextKeyService);
 
 		this._container = document.createElement('div');
 		this._container.classList.add('accessible-view');
@@ -140,6 +151,7 @@ export class AccessibleView extends Disposable {
 			lineDecorationsWidth: 6,
 			dragAndDrop: false,
 			cursorWidth: 1,
+			wordWrap: 'off',
 			wrappingStrategy: 'advanced',
 			wrappingIndent: 'none',
 			padding: { top: 2, bottom: 2 },
@@ -149,6 +161,8 @@ export class AccessibleView extends Disposable {
 			readOnly: true,
 			fontFamily: 'var(--monaco-monospace-font)'
 		};
+		this.textModelResolverService.registerTextModelContentProvider(Schemas.accessibleView, this);
+
 		this._editorWidget = this._register(this._instantiationService.createInstance(CodeEditorWidget, this._container, editorOptions, codeEditorWidgetOptions));
 		this._register(this._accessibilityService.onDidChangeScreenReaderOptimized(() => {
 			if (this._currentProvider && this._accessiblityHelpIsShown.get()) {
@@ -156,7 +170,7 @@ export class AccessibleView extends Disposable {
 			}
 		}));
 		this._register(this._configurationService.onDidChangeConfiguration(e => {
-			if (this._currentProvider instanceof AdvancedContentProvider && e.affectsConfiguration(this._currentProvider.verbositySettingKey)) {
+			if (this._currentProvider instanceof AccessibleContentProvider && e.affectsConfiguration(this._currentProvider.verbositySettingKey)) {
 				if (this._accessiblityHelpIsShown.get()) {
 					this.show(this._currentProvider);
 				}
@@ -179,6 +193,9 @@ export class AccessibleView extends Disposable {
 			}
 		}));
 	}
+	provideTextContent(resource: URI): Promise<ITextModel | null> | null {
+		return this._getTextModel(resource);
+	}
 
 	private _resetContextKeys(): void {
 		this._accessiblityHelpIsShown.reset();
@@ -187,6 +204,8 @@ export class AccessibleView extends Disposable {
 		this._accessibleViewVerbosityEnabled.reset();
 		this._accessibleViewGoToSymbolSupported.reset();
 		this._accessibleViewCurrentProviderId.reset();
+		this._hasAssignedKeybindings.reset();
+		this._hasUnassignedKeybindings.reset();
 	}
 
 	getPosition(id?: AccessibleViewProviderId): Position | undefined {
@@ -196,11 +215,17 @@ export class AccessibleView extends Disposable {
 		return this._editorWidget.getPosition() || undefined;
 	}
 
-	setPosition(position: Position, reveal?: boolean): void {
+	setPosition(position: Position, reveal?: boolean, select?: boolean): void {
 		this._editorWidget.setPosition(position);
 		if (reveal) {
 			this._editorWidget.revealPosition(position);
 		}
+		if (select) {
+			const lineLength = this._editorWidget.getModel()?.getLineLength(position.lineNumber) ?? 0;
+			if (lineLength) {
+				this._editorWidget.setSelection({ startLineNumber: position.lineNumber, startColumn: 1, endLineNumber: position.lineNumber, endColumn: lineLength + 1 });
+			}
+		}
 	}
 
 	getCodeBlockContext(): ICodeBlockActionContext | undefined {
@@ -241,23 +266,23 @@ export class AccessibleView extends Disposable {
 		this.show(this._lastProvider);
 	}
 
-	show(provider?: AccesibleViewContentProvider, symbol?: IAccessibleViewSymbol, showAccessibleViewHelp?: boolean, position?: Position): void {
+	show(provider?: AccesibleViewContentProvider, symbol?: IAccessibleViewSymbol, showAccessibleViewHelp?: boolean, position?: IPosition): void {
 		provider = provider ?? this._currentProvider;
 		if (!provider) {
 			return;
 		}
 		provider.onOpen?.();
-		let viewContainer: HTMLElement | undefined;
 		const delegate: IContextViewDelegate = {
 			getAnchor: () => { return { x: (getActiveWindow().innerWidth / 2) - ((Math.min(this._layoutService.activeContainerDimension.width * 0.62 /* golden cut */, DIMENSIONS.MAX_WIDTH)) / 2), y: this._layoutService.activeContainerOffset.quickPickTop }; },
 			render: (container) => {
-				viewContainer = container;
-				viewContainer.classList.add('accessible-view-container');
+				this._viewContainer = container;
+				this._viewContainer.classList.add('accessible-view-container');
 				return this._render(provider, container, showAccessibleViewHelp);
 			},
 			onHide: () => {
 				if (!showAccessibleViewHelp) {
 					this._updateLastProvider();
+					this._currentProvider?.dispose();
 					this._currentProvider = undefined;
 					this._resetContextKeys();
 				}
@@ -276,7 +301,7 @@ export class AccessibleView extends Disposable {
 		if (symbol && this._currentProvider) {
 			this.showSymbol(this._currentProvider, symbol);
 		}
-		if (provider instanceof AdvancedContentProvider && provider.onDidRequestClearLastProvider) {
+		if (provider instanceof AccessibleContentProvider && provider.onDidRequestClearLastProvider) {
 			this._register(provider.onDidRequestClearLastProvider((id: string) => {
 				if (this._lastProvider?.options.id === id) {
 					this._lastProvider = undefined;
@@ -295,24 +320,32 @@ export class AccessibleView extends Disposable {
 		}
 		if (provider.onDidChangeContent) {
 			this._register(provider.onDidChangeContent(() => {
-				if (viewContainer) { this._render(provider, viewContainer, showAccessibleViewHelp); }
+				if (this._viewContainer) { this._render(provider, this._viewContainer, showAccessibleViewHelp); }
 			}));
 		}
 	}
 
 	previous(): void {
-		this._currentProvider?.previous?.();
+		const newContent = this._currentProvider?.providePreviousContent?.();
+		if (!this._currentProvider || !this._viewContainer || !newContent) {
+			return;
+		}
+		this._render(this._currentProvider, this._viewContainer, undefined, newContent);
 	}
 
 	next(): void {
-		this._currentProvider?.next?.();
+		const newContent = this._currentProvider?.provideNextContent?.();
+		if (!this._currentProvider || !this._viewContainer || !newContent) {
+			return;
+		}
+		this._render(this._currentProvider, this._viewContainer, undefined, newContent);
 	}
 
 	private _verbosityEnabled(): boolean {
 		if (!this._currentProvider) {
 			return false;
 		}
-		return this._currentProvider instanceof AdvancedContentProvider ? this._configurationService.getValue(this._currentProvider.verbositySettingKey) === true : this._storageService.getBoolean(`${ACCESSIBLE_VIEW_SHOWN_STORAGE_PREFIX}${this._currentProvider.id}`, StorageScope.APPLICATION, false);
+		return this._currentProvider instanceof AccessibleContentProvider ? this._configurationService.getValue(this._currentProvider.verbositySettingKey) === true : this._storageService.getBoolean(`${ACCESSIBLE_VIEW_SHOWN_STORAGE_PREFIX}${this._currentProvider.id}`, StorageScope.APPLICATION, false);
 	}
 
 	goToSymbol(): void {
@@ -322,7 +355,10 @@ export class AccessibleView extends Disposable {
 		this._instantiationService.createInstance(AccessibleViewSymbolQuickPick, this).show(this._currentProvider);
 	}
 
-	calculateCodeBlocks(markdown: string): void {
+	calculateCodeBlocks(markdown?: string): void {
+		if (!markdown) {
+			return;
+		}
 		if (this._currentProvider?.id !== AccessibleViewProviderId.Chat) {
 			return;
 		}
@@ -352,7 +388,7 @@ export class AccessibleView extends Disposable {
 	}
 
 	getSymbols(): IAccessibleViewSymbol[] | undefined {
-		const provider = this._currentProvider instanceof AdvancedContentProvider ? this._currentProvider : undefined;
+		const provider = this._currentProvider instanceof AccessibleContentProvider ? this._currentProvider : undefined;
 		if (!this._currentContent || !provider) {
 			return;
 		}
@@ -364,7 +400,7 @@ export class AccessibleView extends Disposable {
 			// Symbols haven't been provided and we cannot parse this language
 			return;
 		}
-		const markdownTokens: marked.TokensList | undefined = marked.lexer(this._currentContent);
+		const markdownTokens: marked.TokensList | undefined = marked.marked.lexer(this._currentContent);
 		if (!markdownTokens) {
 			return;
 		}
@@ -379,33 +415,33 @@ export class AccessibleView extends Disposable {
 		this._openerService.open(URI.parse(this._currentProvider.options.readMoreUrl));
 	}
 
-	configureKeybindings(): void {
+	configureKeybindings(unassigned: boolean): void {
 		this._inQuickPick = true;
 		const provider = this._updateLastProvider();
-		const items = provider?.options?.configureKeybindingItems;
+		const items = unassigned ? provider?.options?.configureKeybindingItems : provider?.options?.configuredKeybindingItems;
 		if (!items) {
 			return;
 		}
-		const quickPick: IQuickPick<IQuickPickItem> = this._quickInputService.createQuickPick();
-		this._register(quickPick);
+		const disposables = this._register(new DisposableStore());
+		const quickPick: IQuickPick<IQuickPickItem> = disposables.add(this._quickInputService.createQuickPick());
 		quickPick.items = items;
 		quickPick.title = localize('keybindings', 'Configure keybindings');
 		quickPick.placeholder = localize('selectKeybinding', 'Select a command ID to configure a keybinding for it');
 		quickPick.show();
-		quickPick.onDidAccept(async () => {
+		disposables.add(quickPick.onDidAccept(async () => {
 			const item = quickPick.selectedItems[0];
 			if (item) {
 				await this._commandService.executeCommand('workbench.action.openGlobalKeybindings', item.id);
 			}
 			quickPick.dispose();
-		});
-		quickPick.onDidHide(() => {
+		}));
+		disposables.add(quickPick.onDidHide(() => {
 			if (!quickPick.selectedItems.length && provider) {
 				this.show(provider);
 			}
-			quickPick.dispose();
+			disposables.dispose();
 			this._inQuickPick = false;
-		});
+		}));
 	}
 
 	private _convertTokensToSymbols(tokens: marked.TokensList, symbols: IAccessibleViewSymbol[]): void {
@@ -420,12 +456,12 @@ export class AccessibleView extends Disposable {
 						label = token.text;
 						break;
 					case 'list': {
-						const firstItem = token.items?.[0];
+						const firstItem = (token as marked.Tokens.List).items[0];
 						if (!firstItem) {
 							break;
 						}
 						firstListItem = `- ${firstItem.text}`;
-						label = token.items?.map(i => i.text).join(', ');
+						label = (token as marked.Tokens.List).items.map(i => i.text).join(', ');
 						break;
 					}
 				}
@@ -459,12 +495,12 @@ export class AccessibleView extends Disposable {
 		if (lineNumber === undefined) {
 			return;
 		}
-		this.show(provider, undefined, undefined, { lineNumber, column: 1 } as Position);
+		this.show(provider, undefined, undefined, { lineNumber, column: 1 });
 		this._updateContextKeys(provider, true);
 	}
 
 	disableHint(): void {
-		if (!(this._currentProvider instanceof AdvancedContentProvider)) {
+		if (!(this._currentProvider instanceof AccessibleContentProvider)) {
 			return;
 		}
 		this._configurationService.updateValue(this._currentProvider?.verbositySettingKey, false);
@@ -479,53 +515,55 @@ export class AccessibleView extends Disposable {
 			this._accessibleViewIsShown.set(shown);
 			this._accessiblityHelpIsShown.reset();
 		}
-		this._accessibleViewSupportsNavigation.set(provider.next !== undefined || provider.previous !== undefined);
+		this._accessibleViewSupportsNavigation.set(provider.provideNextContent !== undefined || provider.providePreviousContent !== undefined);
 		this._accessibleViewVerbosityEnabled.set(this._verbosityEnabled());
 		this._accessibleViewGoToSymbolSupported.set(this._goToSymbolsSupported() ? this.getSymbols()?.length! > 0 : false);
 	}
 
-	private _render(provider: AccesibleViewContentProvider, container: HTMLElement, showAccessibleViewHelp?: boolean): IDisposable {
+	private _updateContent(provider: AccesibleViewContentProvider, updatedContent?: string): void {
+		let content = updatedContent ?? provider.provideContent();
+		if (provider.options.type === AccessibleViewType.View) {
+			this._currentContent = content;
+			this._hasUnassignedKeybindings.reset();
+			this._hasAssignedKeybindings.reset();
+			return;
+		}
+		const readMoreLinkHint = this._readMoreHint(provider);
+		const disableHelpHint = this._disableVerbosityHint(provider);
+		const screenReaderModeHint = this._screenReaderModeHint(provider);
+		const exitThisDialogHint = this._exitDialogHint(provider);
+		let configureKbHint = '';
+		let configureAssignedKbHint = '';
+		const resolvedContent = resolveContentAndKeybindingItems(this._keybindingService, screenReaderModeHint + content + readMoreLinkHint + disableHelpHint + exitThisDialogHint);
+		if (resolvedContent) {
+			content = resolvedContent.content.value;
+			if (resolvedContent.configureKeybindingItems) {
+				provider.options.configureKeybindingItems = resolvedContent.configureKeybindingItems;
+				this._hasUnassignedKeybindings.set(true);
+				configureKbHint = this._configureUnassignedKbHint();
+			} else {
+				this._hasAssignedKeybindings.reset();
+			}
+			if (resolvedContent.configuredKeybindingItems) {
+				provider.options.configuredKeybindingItems = resolvedContent.configuredKeybindingItems;
+				this._hasAssignedKeybindings.set(true);
+				configureAssignedKbHint = this._configureAssignedKbHint();
+			} else {
+				this._hasAssignedKeybindings.reset();
+			}
+		}
+		this._currentContent = content + configureKbHint + configureAssignedKbHint;
+	}
+
+	private _render(provider: AccesibleViewContentProvider, container: HTMLElement, showAccessibleViewHelp?: boolean, updatedContent?: string): IDisposable {
 		this._currentProvider = provider;
 		this._accessibleViewCurrentProviderId.set(provider.id);
 		const verbose = this._verbosityEnabled();
-		const readMoreLink = provider.options.readMoreUrl ? localize("openDoc", "\n\nOpen a browser window with more information related to accessibility<keybinding:{0}>.", AccessibilityCommandId.AccessibilityHelpOpenHelpLink) : '';
-		let disableHelpHint = '';
-		if (provider instanceof AdvancedContentProvider && provider.options.type === AccessibleViewType.Help && verbose) {
-			disableHelpHint = this._getDisableVerbosityHint();
-		}
-		const accessibilitySupport = this._accessibilityService.isScreenReaderOptimized();
-		let message = '';
-		if (provider.options.type === AccessibleViewType.Help) {
-			const turnOnMessage = (
-				isMacintosh
-					? AccessibilityHelpNLS.changeConfigToOnMac
-					: AccessibilityHelpNLS.changeConfigToOnWinLinux
-			);
-			if (accessibilitySupport && provider instanceof AdvancedContentProvider && provider.verbositySettingKey === AccessibilityVerbositySettingId.Editor) {
-				message = AccessibilityHelpNLS.auto_on;
-				message += '\n';
-			} else if (!accessibilitySupport) {
-				message = AccessibilityHelpNLS.auto_off + '\n' + turnOnMessage;
-				message += '\n';
-			}
-		}
-		const exitThisDialogHint = verbose && !provider.options.position ? localize('exit', '\n\nExit this dialog (Escape).') : '';
-		let content = provider.provideContent();
-		if (provider.options.type === AccessibleViewType.Help) {
-			const resolvedContent = resolveContentAndKeybindingItems(this._keybindingService, content + readMoreLink + disableHelpHint + exitThisDialogHint);
-			if (resolvedContent) {
-				content = resolvedContent.content.value;
-				if (resolvedContent.configureKeybindingItems) {
-					provider.options.configureKeybindingItems = resolvedContent.configureKeybindingItems;
-				}
-			}
-		}
-		const newContent = message + content;
-		this.calculateCodeBlocks(newContent);
-		this._currentContent = newContent;
+		this._updateContent(provider, updatedContent);
+		this.calculateCodeBlocks(this._currentContent);
 		this._updateContextKeys(provider, true);
 		const widgetIsFocused = this._editorWidget.hasTextFocus() || this._editorWidget.hasWidgetFocus();
-		this._getTextModel(URI.from({ path: `accessible-view-${provider.id}`, scheme: 'accessible-view', fragment: this._currentContent })).then((model) => {
+		this._getTextModel(URI.from({ path: `accessible-view-${provider.id}`, scheme: Schemas.accessibleView, fragment: this._currentContent })).then((model) => {
 			if (!model) {
 				return;
 			}
@@ -579,6 +617,8 @@ export class AccessibleView extends Disposable {
 			this._updateContextKeys(provider, false);
 			this._lastProvider = undefined;
 			this._currentContent = undefined;
+			this._currentProvider?.dispose();
+			this._currentProvider = undefined;
 		};
 		const disposableStore = new DisposableStore();
 		disposableStore.add(this._editorWidget.onKeyDown((e) => {
@@ -593,7 +633,7 @@ export class AccessibleView extends Disposable {
 				e.preventDefault();
 				e.stopPropagation();
 			}
-			if (provider instanceof AdvancedContentProvider) {
+			if (provider instanceof AccessibleContentProvider) {
 				provider.onKeyDown?.(e);
 			}
 		}));
@@ -649,7 +689,7 @@ export class AccessibleView extends Disposable {
 		if (!this._currentProvider) {
 			return false;
 		}
-		return this._currentProvider.options.type === AccessibleViewType.Help || this._currentProvider.options.language === 'markdown' || this._currentProvider.options.language === undefined || (this._currentProvider instanceof AdvancedContentProvider && !!this._currentProvider.getSymbols?.());
+		return this._currentProvider.options.type === AccessibleViewType.Help || this._currentProvider.options.language === 'markdown' || this._currentProvider.options.language === undefined || (this._currentProvider instanceof AccessibleContentProvider && !!this._currentProvider.getSymbols?.());
 	}
 
 	private _updateLastProvider(): AccesibleViewContentProvider | undefined {
@@ -657,7 +697,7 @@ export class AccessibleView extends Disposable {
 		if (!provider) {
 			return;
 		}
-		const lastProvider = provider instanceof AdvancedContentProvider ? new AdvancedContentProvider(
+		const lastProvider = provider instanceof AccessibleContentProvider ? new AccessibleContentProvider(
 			provider.id,
 			provider.options,
 			provider.provideContent.bind(provider),
@@ -665,8 +705,8 @@ export class AccessibleView extends Disposable {
 			provider.verbositySettingKey,
 			provider.onOpen?.bind(provider),
 			provider.actions,
-			provider.next?.bind(provider),
-			provider.previous?.bind(provider),
+			provider.provideNextContent?.bind(provider),
+			provider.providePreviousContent?.bind(provider),
 			provider.onDidChangeContent?.bind(provider),
 			provider.onKeyDown?.bind(provider),
 			provider.getSymbols?.bind(provider),
@@ -676,8 +716,8 @@ export class AccessibleView extends Disposable {
 			provider.provideContent.bind(provider),
 			provider.onClose.bind(provider),
 			provider.onOpen?.bind(provider),
-			provider.next?.bind(provider),
-			provider.previous?.bind(provider),
+			provider.provideNextContent?.bind(provider),
+			provider.providePreviousContent?.bind(provider),
 			provider.actions,
 			provider.onDidChangeContent?.bind(provider),
 		);
@@ -689,26 +729,41 @@ export class AccessibleView extends Disposable {
 		if (!lastProvider) {
 			return;
 		}
-
-		const accessibleViewHelpProvider = {
-			id: lastProvider.id,
-			provideContent: () => lastProvider.options.customHelp ? lastProvider?.options.customHelp() : this._getAccessibleViewHelpDialogContent(this._goToSymbolsSupported()),
-			onClose: () => {
-				this._contextViewService.hideContextView();
-				// HACK: Delay to allow the context view to hide #207638
-				queueMicrotask(() => this.show(lastProvider));
-			},
-			options: { type: AccessibleViewType.Help },
-			verbositySettingKey: lastProvider instanceof AdvancedContentProvider ? lastProvider.verbositySettingKey : undefined
-		};
+		let accessibleViewHelpProvider;
+		if (lastProvider instanceof AccessibleContentProvider) {
+			accessibleViewHelpProvider = new AccessibleContentProvider(
+				lastProvider.id,
+				{ type: AccessibleViewType.Help },
+				() => lastProvider.options.customHelp ? lastProvider?.options.customHelp() : this._accessibleViewHelpDialogContent(this._goToSymbolsSupported()),
+				() => {
+					this._contextViewService.hideContextView();
+					// HACK: Delay to allow the context view to hide #207638
+					queueMicrotask(() => this.show(lastProvider));
+				},
+				lastProvider.verbositySettingKey
+			);
+		} else {
+			accessibleViewHelpProvider = new ExtensionContentProvider(
+				lastProvider.id,
+				{ type: AccessibleViewType.Help },
+				() => lastProvider.options.customHelp ? lastProvider?.options.customHelp() : this._accessibleViewHelpDialogContent(this._goToSymbolsSupported()),
+				() => {
+					this._contextViewService.hideContextView();
+					// HACK: Delay to allow the context view to hide #207638
+					queueMicrotask(() => this.show(lastProvider));
+				},
+			);
+		}
 		this._contextViewService.hideContextView();
 		// HACK: Delay to allow the context view to hide #186514
-		queueMicrotask(() => this.show(accessibleViewHelpProvider, undefined, true));
+		if (accessibleViewHelpProvider) {
+			queueMicrotask(() => this.show(accessibleViewHelpProvider, undefined, true));
+		}
 	}
 
-	private _getAccessibleViewHelpDialogContent(providerHasSymbols?: boolean): string {
-		const navigationHint = this._getNavigationHint();
-		const goToSymbolHint = this._getGoToSymbolHint(providerHasSymbols);
+	private _accessibleViewHelpDialogContent(providerHasSymbols?: boolean): string {
+		const navigationHint = this._navigationHint();
+		const goToSymbolHint = this._goToSymbolHint(providerHasSymbols);
 		const toolbarHint = localize('toolbar', "Navigate to the toolbar (Shift+Tab).");
 		const chatHints = this._getChatHints();
 
@@ -732,24 +787,65 @@ export class AccessibleView extends Disposable {
 		if (this._currentProvider?.id !== AccessibleViewProviderId.Chat) {
 			return;
 		}
-		return [localize('insertAtCursor', " - Insert the code block at the cursor<keybinding:workbench.action.chat.insertCodeBlock>."),
-		localize('insertIntoNewFile', " - Insert the code block into a new file<keybinding:workbench.action.chat.insertIntoNewFile>."),
-		localize('runInTerminal', " - Run the code block in the terminal<keybinding:'workbench.action.chat.runInTerminal>.\n")].join('\n');
+		return [localize('insertAtCursor', " - Insert the code block at the cursor{0}.", '<keybinding:workbench.action.chat.insertCodeBlock>'),
+		localize('insertIntoNewFile', " - Insert the code block into a new file{0}.", '<keybinding:workbench.action.chat.insertIntoNewFile>'),
+		localize('runInTerminal', " - Run the code block in the terminal{0}.\n", '<keybinding:workbench.action.chat.runInTerminal>')].join('\n');
 	}
 
-	private _getNavigationHint(): string {
-		return localize('accessibleViewNextPreviousHint', "Show the next item<keybinding:{0}> or previous item<keybinding:{1}>.", AccessibilityCommandId.ShowNext, AccessibilityCommandId.ShowPrevious);
+	private _navigationHint(): string {
+		return localize('accessibleViewNextPreviousHint', "Show the next item{0} or previous item{1}.", `<keybinding:${AccessibilityCommandId.ShowNext}`, `<keybinding:${AccessibilityCommandId.ShowPrevious}>`);
 	}
 
-	private _getDisableVerbosityHint(): string {
-		return localize('acessibleViewDisableHint', "\n\nDisable accessibility verbosity for this feature<keybinding:{0}>.", AccessibilityCommandId.DisableVerbosityHint);
+	private _disableVerbosityHint(provider: AccesibleViewContentProvider): string {
+		if (provider.options.type === AccessibleViewType.Help && this._verbosityEnabled()) {
+			return localize('acessibleViewDisableHint', "\nDisable accessibility verbosity for this feature{0}.", `<keybinding:${AccessibilityCommandId.DisableVerbosityHint}>`);
+		}
+		return '';
 	}
 
-	private _getGoToSymbolHint(providerHasSymbols?: boolean): string | undefined {
+	private _goToSymbolHint(providerHasSymbols?: boolean): string | undefined {
 		if (!providerHasSymbols) {
 			return;
 		}
-		return localize('goToSymbolHint', 'Go to a symbol<keybinding:{0}>.', AccessibilityCommandId.GoToSymbol);
+		return localize('goToSymbolHint', 'Go to a symbol{0}.', `<keybinding:${AccessibilityCommandId.GoToSymbol}>`);
+	}
+
+	private _configureUnassignedKbHint(): string {
+		const configureKb = this._keybindingService.lookupKeybinding(AccessibilityCommandId.AccessibilityHelpConfigureKeybindings)?.getAriaLabel();
+		const keybindingToConfigureQuickPick = configureKb ? '(' + configureKb + ')' : 'by assigning a keybinding to the command Accessibility Help Configure Unassigned Keybindings.';
+		return localize('configureKb', '\nConfigure keybindings for commands that lack them {0}.', keybindingToConfigureQuickPick);
+	}
+
+	private _configureAssignedKbHint(): string {
+		const configureKb = this._keybindingService.lookupKeybinding(AccessibilityCommandId.AccessibilityHelpConfigureAssignedKeybindings)?.getAriaLabel();
+		const keybindingToConfigureQuickPick = configureKb ? '(' + configureKb + ')' : 'by assigning a keybinding to the command Accessibility Help Configure Assigned Keybindings.';
+		return localize('configureKbAssigned', '\nConfigure keybindings for commands that already have assignments {0}.', keybindingToConfigureQuickPick);
+	}
+
+	private _screenReaderModeHint(provider: AccesibleViewContentProvider): string {
+		const accessibilitySupport = this._accessibilityService.isScreenReaderOptimized();
+		let screenReaderModeHint = '';
+		const turnOnMessage = (
+			isMacintosh
+				? AccessibilityHelpNLS.changeConfigToOnMac
+				: AccessibilityHelpNLS.changeConfigToOnWinLinux
+		);
+		if (accessibilitySupport && provider.id === AccessibleViewProviderId.Editor) {
+			screenReaderModeHint = AccessibilityHelpNLS.auto_on;
+			screenReaderModeHint += '\n';
+		} else if (!accessibilitySupport) {
+			screenReaderModeHint = AccessibilityHelpNLS.auto_off + '\n' + turnOnMessage;
+			screenReaderModeHint += '\n';
+		}
+		return screenReaderModeHint;
+	}
+
+	private _exitDialogHint(provider: AccesibleViewContentProvider): string {
+		return this._verbosityEnabled() && !provider.options.position ? localize('exit', '\nExit this dialog (Escape).') : '';
+	}
+
+	private _readMoreHint(provider: AccesibleViewContentProvider): string {
+		return provider.options.readMoreUrl ? localize("openDoc", "\nOpen a browser window with more information related to accessibility{0}.", `<keybinding:${AccessibilityCommandId.AccessibilityHelpOpenHelpLink}>`) : '';
 	}
 }
 
@@ -771,8 +867,8 @@ export class AccessibleViewService extends Disposable implements IAccessibleView
 		}
 		this._accessibleView.show(provider, undefined, undefined, position);
 	}
-	configureKeybindings(): void {
-		this._accessibleView?.configureKeybindings();
+	configureKeybindings(unassigned: boolean): void {
+		this._accessibleView?.configureKeybindings(unassigned);
 	}
 	openHelpLink(): void {
 		this._accessibleView?.openHelpLink();
@@ -815,12 +911,8 @@ export class AccessibleViewService extends Disposable implements IAccessibleView
 		const lastLine = this._accessibleView?.editorWidget.getModel()?.getLineCount();
 		return lastLine !== undefined && lastLine > 0 ? new Position(lastLine, 1) : undefined;
 	}
-	setPosition(position: Position, reveal?: boolean): void {
-		const editorWidget = this._accessibleView?.editorWidget;
-		editorWidget?.setPosition(position);
-		if (reveal) {
-			editorWidget?.revealLine(position.lineNumber);
-		}
+	setPosition(position: Position, reveal?: boolean, select?: boolean): void {
+		this._accessibleView?.setPosition(position, reveal, select);
 	}
 	getCodeBlockContext(): ICodeBlockActionContext | undefined {
 		return this._accessibleView?.getCodeBlockContext();
@@ -835,7 +927,8 @@ class AccessibleViewSymbolQuickPick {
 
 	}
 	show(provider: AccesibleViewContentProvider): void {
-		const quickPick = this._quickInputService.createQuickPick<IAccessibleViewSymbol>();
+		const disposables = new DisposableStore();
+		const quickPick = disposables.add(this._quickInputService.createQuickPick<IAccessibleViewSymbol>());
 		quickPick.placeholder = localize('accessibleViewSymbolQuickPickPlaceholder', "Type to search symbols");
 		quickPick.title = localize('accessibleViewSymbolQuickPickTitle', "Go to Symbol Accessible View");
 		const picks = [];
@@ -852,16 +945,17 @@ class AccessibleViewSymbolQuickPick {
 		quickPick.canSelectMany = false;
 		quickPick.items = symbols;
 		quickPick.show();
-		quickPick.onDidAccept(() => {
+		disposables.add(quickPick.onDidAccept(() => {
 			this._accessibleView.showSymbol(provider, quickPick.selectedItems[0]);
 			quickPick.hide();
-		});
-		quickPick.onDidHide(() => {
+		}));
+		disposables.add(quickPick.onDidHide(() => {
 			if (quickPick.selectedItems.length === 0) {
 				// this was escaped, so refocus the accessible view
 				this._accessibleView.show(provider);
 			}
-		});
+			disposables.dispose();
+		}));
 	}
 }
 
diff --git a/src/vs/workbench/contrib/accessibility/browser/accessibleViewActions.ts b/src/vs/workbench/contrib/accessibility/browser/accessibleViewActions.ts
index 7aba4fa5baf..17695399660 100644
--- a/src/vs/workbench/contrib/accessibility/browser/accessibleViewActions.ts
+++ b/src/vs/workbench/contrib/accessibility/browser/accessibleViewActions.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from 'vs/base/common/codicons';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Command, MultiCommand, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { localize } from 'vs/nls';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { AccessibilityCommandId } from 'vs/workbench/contrib/accessibility/common/accessibilityCommands';
-import { accessibilityHelpIsShown, accessibleViewContainsCodeBlocks, accessibleViewCurrentProviderId, accessibleViewGoToSymbolSupported, accessibleViewIsShown, accessibleViewSupportsNavigation, accessibleViewVerbosityEnabled } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { AccessibleViewProviderId, IAccessibleViewService } from 'vs/platform/accessibility/browser/accessibleView';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { Command, MultiCommand, ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
+import { localize } from '../../../../nls.js';
+import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { AccessibilityCommandId } from '../common/accessibilityCommands.js';
+import { accessibilityHelpIsShown, accessibleViewContainsCodeBlocks, accessibleViewCurrentProviderId, accessibleViewGoToSymbolSupported, accessibleViewHasAssignedKeybindings, accessibleViewHasUnassignedKeybindings, accessibleViewIsShown, accessibleViewSupportsNavigation, accessibleViewVerbosityEnabled } from './accessibilityConfiguration.js';
+import { AccessibleViewProviderId, IAccessibleViewService } from '../../../../platform/accessibility/browser/accessibleView.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { InlineCompletionsController } from '../../../../editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.js';
 
 const accessibleViewMenu = {
 	id: MenuId.AccessibleView,
@@ -62,7 +62,6 @@ class AccessibleViewNextCodeBlockAction extends Action2 {
 				mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown, },
 				weight: KeybindingWeight.WorkbenchContrib,
 			},
-			// to 
 			icon: Codicon.arrowRight,
 			menu:
 			{
@@ -233,20 +232,56 @@ class AccessibilityHelpConfigureKeybindingsAction extends Action2 {
 	constructor() {
 		super({
 			id: AccessibilityCommandId.AccessibilityHelpConfigureKeybindings,
-			precondition: ContextKeyExpr.and(accessibilityHelpIsShown),
+			precondition: ContextKeyExpr.and(accessibilityHelpIsShown, accessibleViewHasUnassignedKeybindings),
+			icon: Codicon.key,
 			keybinding: {
 				primary: KeyMod.Alt | KeyCode.KeyK,
 				weight: KeybindingWeight.WorkbenchContrib
 			},
-			title: localize('editor.action.accessibilityHelpConfigureKeybindings', "Accessibility Help Configure Keybindings")
+			menu: [
+				{
+					id: MenuId.AccessibleView,
+					group: 'navigation',
+					order: 3,
+					when: accessibleViewHasUnassignedKeybindings,
+				}
+			],
+			title: localize('editor.action.accessibilityHelpConfigureUnassignedKeybindings', "Accessibility Help Configure Unassigned Keybindings")
 		});
 	}
 	async run(accessor: ServicesAccessor): Promise<void> {
-		await accessor.get(IAccessibleViewService).configureKeybindings();
+		await accessor.get(IAccessibleViewService).configureKeybindings(true);
 	}
 }
 registerAction2(AccessibilityHelpConfigureKeybindingsAction);
 
+class AccessibilityHelpConfigureAssignedKeybindingsAction extends Action2 {
+	constructor() {
+		super({
+			id: AccessibilityCommandId.AccessibilityHelpConfigureAssignedKeybindings,
+			precondition: ContextKeyExpr.and(accessibilityHelpIsShown, accessibleViewHasAssignedKeybindings),
+			icon: Codicon.key,
+			keybinding: {
+				primary: KeyMod.Alt | KeyCode.KeyA,
+				weight: KeybindingWeight.WorkbenchContrib
+			},
+			menu: [
+				{
+					id: MenuId.AccessibleView,
+					group: 'navigation',
+					order: 4,
+					when: accessibleViewHasAssignedKeybindings,
+				}
+			],
+			title: localize('editor.action.accessibilityHelpConfigureAssignedKeybindings', "Accessibility Help Configure Assigned Keybindings")
+		});
+	}
+	async run(accessor: ServicesAccessor): Promise<void> {
+		await accessor.get(IAccessibleViewService).configureKeybindings(false);
+	}
+}
+registerAction2(AccessibilityHelpConfigureAssignedKeybindingsAction);
+
 
 class AccessibilityHelpOpenHelpLinkAction extends Action2 {
 	constructor() {
diff --git a/src/vs/workbench/contrib/accessibility/browser/accessibleViewContributions.ts b/src/vs/workbench/contrib/accessibility/browser/accessibleViewContributions.ts
index d8d07767246..b1be7884e41 100644
--- a/src/vs/workbench/contrib/accessibility/browser/accessibleViewContributions.ts
+++ b/src/vs/workbench/contrib/accessibility/browser/accessibleViewContributions.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { accessibleViewIsShown } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { AccessibilityHelpAction, AccessibleViewAction } from 'vs/workbench/contrib/accessibility/browser/accessibleViewActions';
-import { AccessibleViewType, AdvancedContentProvider, ExtensionContentProvider, IAccessibleViewService } from 'vs/platform/accessibility/browser/accessibleView';
-import { AccessibleViewRegistry } from 'vs/platform/accessibility/browser/accessibleViewRegistry';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { accessibleViewIsShown } from './accessibilityConfiguration.js';
+import { AccessibilityHelpAction, AccessibleViewAction } from './accessibleViewActions.js';
+import { AccessibleViewType, AccessibleContentProvider, ExtensionContentProvider, IAccessibleViewService } from '../../../../platform/accessibility/browser/accessibleView.js';
+import { AccessibleViewRegistry } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 
 export class AccesibleViewHelpContribution extends Disposable {
 	static ID: 'accesibleViewHelpContribution';
@@ -27,12 +27,17 @@ export class AccesibleViewContributions extends Disposable {
 		super();
 		AccessibleViewRegistry.getImplementations().forEach(impl => {
 			const implementation = (accessor: ServicesAccessor) => {
-				const provider: AdvancedContentProvider | ExtensionContentProvider | undefined = impl.getProvider(accessor);
-				if (provider) {
+				const provider: AccessibleContentProvider | ExtensionContentProvider | undefined = impl.getProvider(accessor);
+				if (!provider) {
+					return false;
+				}
+				try {
 					accessor.get(IAccessibleViewService).show(provider);
 					return true;
+				} catch {
+					provider.dispose();
+					return false;
 				}
-				return false;
 			};
 			if (impl.type === AccessibleViewType.View) {
 				this._register(AccessibleViewAction.addImplementation(impl.priority, impl.name, implementation, impl.when));
diff --git a/src/vs/workbench/contrib/accessibility/browser/accessibleViewKeybindingResolver.ts b/src/vs/workbench/contrib/accessibility/browser/accessibleViewKeybindingResolver.ts
index 88bfbd309d4..fbb785931f8 100644
--- a/src/vs/workbench/contrib/accessibility/browser/accessibleViewKeybindingResolver.ts
+++ b/src/vs/workbench/contrib/accessibility/browser/accessibleViewKeybindingResolver.ts
@@ -3,38 +3,40 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IPickerQuickAccessItem } from 'vs/platform/quickinput/browser/pickerQuickAccess';
-import { AccessibilityCommandId } from 'vs/workbench/contrib/accessibility/common/accessibilityCommands';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IPickerQuickAccessItem } from '../../../../platform/quickinput/browser/pickerQuickAccess.js';
 
-export function resolveContentAndKeybindingItems(keybindingService: IKeybindingService, value?: string): { content: MarkdownString; configureKeybindingItems: IPickerQuickAccessItem[] | undefined } | undefined {
+export function resolveContentAndKeybindingItems(keybindingService: IKeybindingService, value?: string): { content: MarkdownString; configureKeybindingItems: IPickerQuickAccessItem[] | undefined; configuredKeybindingItems: IPickerQuickAccessItem[] | undefined } | undefined {
 	if (!value) {
 		return;
 	}
 	const configureKeybindingItems: IPickerQuickAccessItem[] = [];
-	const matches = value.matchAll(/\<keybinding:(?<commandId>.*)\>/gm);
+	const configuredKeybindingItems: IPickerQuickAccessItem[] = [];
+	const matches = value.matchAll(/(\<keybinding:(?<commandId>[^\<]*)\>)/gm);
 	for (const match of [...matches]) {
 		const commandId = match?.groups?.commandId;
 		let kbLabel;
 		if (match?.length && commandId) {
 			const keybinding = keybindingService.lookupKeybinding(commandId)?.getAriaLabel();
 			if (!keybinding) {
-				const configureKb = keybindingService.lookupKeybinding(AccessibilityCommandId.AccessibilityHelpConfigureKeybindings)?.getAriaLabel();
-				const keybindingToConfigureQuickPick = configureKb ? '(' + configureKb + ')' : 'by assigning a keybinding to the command Accessibility Help Configure Keybindings.';
-				kbLabel = `, configure a keybinding ` + keybindingToConfigureQuickPick;
+				kbLabel = ` (unassigned keybinding)`;
 				configureKeybindingItems.push({
 					label: commandId,
 					id: commandId
 				});
 			} else {
 				kbLabel = ' (' + keybinding + ')';
+				configuredKeybindingItems.push({
+					label: commandId,
+					id: commandId
+				});
 			}
 			value = value.replace(match[0], kbLabel);
 		}
 	}
 	const content = new MarkdownString(value);
 	content.isTrusted = true;
-	return { content, configureKeybindingItems: configureKeybindingItems.length ? configureKeybindingItems : undefined };
+	return { content, configureKeybindingItems: configureKeybindingItems.length ? configureKeybindingItems : undefined, configuredKeybindingItems: configuredKeybindingItems.length ? configuredKeybindingItems : undefined };
 }
 
diff --git a/src/vs/workbench/contrib/accessibility/browser/editorAccessibilityHelp.ts b/src/vs/workbench/contrib/accessibility/browser/editorAccessibilityHelp.ts
index 0e47093d20b..4363a2f6f1f 100644
--- a/src/vs/workbench/contrib/accessibility/browser/editorAccessibilityHelp.ts
+++ b/src/vs/workbench/contrib/accessibility/browser/editorAccessibilityHelp.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { AccessibilityHelpNLS } from 'vs/editor/common/standaloneStrings';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { AccessibilityHelpAction } from 'vs/workbench/contrib/accessibility/browser/accessibleViewActions';
-import { CONTEXT_CHAT_ENABLED } from 'vs/workbench/contrib/chat/common/chatContextKeys';
-import { CommentAccessibilityHelpNLS } from 'vs/workbench/contrib/comments/browser/commentsAccessibility';
-import { CommentContextKeys } from 'vs/workbench/contrib/comments/common/commentContextKeys';
-import { NEW_UNTITLED_FILE_COMMAND_ID } from 'vs/workbench/contrib/files/browser/fileConstants';
-import { IAccessibleViewService, IAccessibleViewContentProvider, AccessibleViewProviderId, IAccessibleViewOptions, AccessibleViewType } from 'vs/platform/accessibility/browser/accessibleView';
-import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
+import { AccessibilityHelpNLS } from '../../../../editor/common/standaloneStrings.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { AccessibilityHelpAction } from './accessibleViewActions.js';
+import { CONTEXT_CHAT_ENABLED } from '../../chat/common/chatContextKeys.js';
+import { CommentAccessibilityHelpNLS } from '../../comments/browser/commentsAccessibility.js';
+import { CommentContextKeys } from '../../comments/common/commentContextKeys.js';
+import { NEW_UNTITLED_FILE_COMMAND_ID } from '../../files/browser/fileConstants.js';
+import { IAccessibleViewService, IAccessibleViewContentProvider, AccessibleViewProviderId, IAccessibleViewOptions, AccessibleViewType } from '../../../../platform/accessibility/browser/accessibleView.js';
+import { AccessibilityVerbositySettingId } from './accessibilityConfiguration.js';
 
 export class EditorAccessibilityHelpContribution extends Disposable {
 	static ID: 'editorAccessibilityHelpContribution';
@@ -39,7 +39,7 @@ export class EditorAccessibilityHelpContribution extends Disposable {
 	}
 }
 
-class EditorAccessibilityHelpProvider implements IAccessibleViewContentProvider {
+class EditorAccessibilityHelpProvider extends Disposable implements IAccessibleViewContentProvider {
 	id = AccessibleViewProviderId.Editor;
 	onClose() {
 		this._editor.focus();
@@ -51,6 +51,7 @@ class EditorAccessibilityHelpProvider implements IAccessibleViewContentProvider
 		@IKeybindingService private readonly _keybindingService: IKeybindingService,
 		@IContextKeyService private readonly _contextKeyService: IContextKeyService
 	) {
+		super();
 	}
 
 	provideContent(): string {
@@ -93,7 +94,15 @@ class EditorAccessibilityHelpProvider implements IAccessibleViewContentProvider
 		} else {
 			content.push(AccessibilityHelpNLS.tabFocusModeOffMsg);
 		}
-		return content.join('\n\n');
+		content.push(AccessibilityHelpNLS.codeFolding);
+		content.push(AccessibilityHelpNLS.intellisense);
+		content.push(AccessibilityHelpNLS.showOrFocusHover);
+		content.push(AccessibilityHelpNLS.goToSymbol);
+		content.push(AccessibilityHelpNLS.startDebugging);
+		content.push(AccessibilityHelpNLS.setBreakpoint);
+		content.push(AccessibilityHelpNLS.debugExecuteSelection);
+		content.push(AccessibilityHelpNLS.addToWatch);
+		return content.join('\n');
 	}
 }
 
diff --git a/src/vs/workbench/contrib/accessibility/browser/extensionAccesibilityHelp.contribution.ts b/src/vs/workbench/contrib/accessibility/browser/extensionAccesibilityHelp.contribution.ts
index f8381417bd8..3cc885bfe64 100644
--- a/src/vs/workbench/contrib/accessibility/browser/extensionAccesibilityHelp.contribution.ts
+++ b/src/vs/workbench/contrib/accessibility/browser/extensionAccesibilityHelp.contribution.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DisposableMap, IDisposable, DisposableStore, Disposable } from 'vs/base/common/lifecycle';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { AccessibleViewType, ExtensionContentProvider } from 'vs/platform/accessibility/browser/accessibleView';
-import { AccessibleViewRegistry } from 'vs/platform/accessibility/browser/accessibleViewRegistry';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { FocusedViewContext } from 'vs/workbench/common/contextkeys';
-import { IViewsRegistry, Extensions, IViewDescriptor } from 'vs/workbench/common/views';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
+import { DisposableMap, IDisposable, DisposableStore, Disposable } from '../../../../base/common/lifecycle.js';
+import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
+import { AccessibleViewType, ExtensionContentProvider } from '../../../../platform/accessibility/browser/accessibleView.js';
+import { AccessibleViewRegistry } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { FocusedViewContext } from '../../../common/contextkeys.js';
+import { IViewsRegistry, Extensions, IViewDescriptor } from '../../../common/views.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
 
 export class ExtensionAccessibilityHelpDialogContribution extends Disposable {
 	static ID = 'extensionAccessibilityHelpDialogContribution';
@@ -57,7 +57,6 @@ function registerAccessibilityHelpAction(keybindingService: IKeybindingService,
 				() => viewsService.openView(viewDescriptor.id, true),
 			);
 		},
-		dispose: () => { },
 	}));
 
 	disposableStore.add(keybindingService.onDidUpdateKeybindings(() => {
diff --git a/src/vs/workbench/contrib/accessibility/browser/unfocusedViewDimmingContribution.ts b/src/vs/workbench/contrib/accessibility/browser/unfocusedViewDimmingContribution.ts
index 013341c5f18..136a9282778 100644
--- a/src/vs/workbench/contrib/accessibility/browser/unfocusedViewDimmingContribution.ts
+++ b/src/vs/workbench/contrib/accessibility/browser/unfocusedViewDimmingContribution.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createStyleSheet } from 'vs/base/browser/dom';
-import { Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { clamp } from 'vs/base/common/numbers';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { AccessibilityWorkbenchSettingId, ViewDimUnfocusedOpacityProperties } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
+import { createStyleSheet } from '../../../../base/browser/dom.js';
+import { Event } from '../../../../base/common/event.js';
+import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { clamp } from '../../../../base/common/numbers.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { AccessibilityWorkbenchSettingId, ViewDimUnfocusedOpacityProperties } from './accessibilityConfiguration.js';
 
 export class UnfocusedViewDimmingContribution extends Disposable implements IWorkbenchContribution {
 	private _styleElement?: HTMLStyleElement;
diff --git a/src/vs/workbench/contrib/accessibility/common/accessibilityCommands.ts b/src/vs/workbench/contrib/accessibility/common/accessibilityCommands.ts
index d689c02503e..7e84a29bc75 100644
--- a/src/vs/workbench/contrib/accessibility/common/accessibilityCommands.ts
+++ b/src/vs/workbench/contrib/accessibility/common/accessibilityCommands.ts
@@ -14,5 +14,6 @@ export const enum AccessibilityCommandId {
 	NextCodeBlock = 'editor.action.accessibleViewNextCodeBlock',
 	PreviousCodeBlock = 'editor.action.accessibleViewPreviousCodeBlock',
 	AccessibilityHelpConfigureKeybindings = 'editor.action.accessibilityHelpConfigureKeybindings',
+	AccessibilityHelpConfigureAssignedKeybindings = 'editor.action.accessibilityHelpConfigureAssignedKeybindings',
 	AccessibilityHelpOpenHelpLink = 'editor.action.accessibilityHelpOpenHelpLink',
 }
diff --git a/src/vs/workbench/contrib/accessibilitySignals/browser/accessibilitySignal.contribution.ts b/src/vs/workbench/contrib/accessibilitySignals/browser/accessibilitySignal.contribution.ts
index cb298c79733..d61658cbc09 100644
--- a/src/vs/workbench/contrib/accessibilitySignals/browser/accessibilitySignal.contribution.ts
+++ b/src/vs/workbench/contrib/accessibilitySignals/browser/accessibilitySignal.contribution.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { AccessibilitySignalService, IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { registerAction2 } from 'vs/platform/actions/common/actions';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { registerWorkbenchContribution2, WorkbenchPhase } from 'vs/workbench/common/contributions';
-import { AccessibilitySignalLineDebuggerContribution } from 'vs/workbench/contrib/accessibilitySignals/browser/accessibilitySignalDebuggerContribution';
-import { ShowAccessibilityAnnouncementHelp, ShowSignalSoundHelp } from 'vs/workbench/contrib/accessibilitySignals/browser/commands';
-import { EditorTextPropertySignalsContribution } from 'vs/workbench/contrib/accessibilitySignals/browser/editorTextPropertySignalsContribution';
-import { wrapInReloadableClass } from 'vs/workbench/contrib/accessibilitySignals/browser/reloadableWorkbenchContribution';
+import { AccessibilitySignalService, IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
+import { AccessibilitySignalLineDebuggerContribution } from './accessibilitySignalDebuggerContribution.js';
+import { ShowAccessibilityAnnouncementHelp, ShowSignalSoundHelp } from './commands.js';
+import { EditorTextPropertySignalsContribution } from './editorTextPropertySignalsContribution.js';
+import { wrapInReloadableClass0 } from '../../../../platform/observable/common/wrapInReloadableClass.js';
 
 registerSingleton(IAccessibilitySignalService, AccessibilitySignalService, InstantiationType.Delayed);
 
-registerWorkbenchContribution2('EditorTextPropertySignalsContribution', wrapInReloadableClass(() => EditorTextPropertySignalsContribution), WorkbenchPhase.AfterRestored);
+registerWorkbenchContribution2('EditorTextPropertySignalsContribution', wrapInReloadableClass0(() => EditorTextPropertySignalsContribution), WorkbenchPhase.AfterRestored);
 registerWorkbenchContribution2('AccessibilitySignalLineDebuggerContribution', AccessibilitySignalLineDebuggerContribution, WorkbenchPhase.AfterRestored);
 
 registerAction2(ShowSignalSoundHelp);
diff --git a/src/vs/workbench/contrib/accessibilitySignals/browser/accessibilitySignalDebuggerContribution.ts b/src/vs/workbench/contrib/accessibilitySignals/browser/accessibilitySignalDebuggerContribution.ts
index 336832eb16c..474fd8fba52 100644
--- a/src/vs/workbench/contrib/accessibilitySignals/browser/accessibilitySignalDebuggerContribution.ts
+++ b/src/vs/workbench/contrib/accessibilitySignals/browser/accessibilitySignalDebuggerContribution.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { autorunWithStore, observableFromEvent } from 'vs/base/common/observable';
-import { IAccessibilitySignalService, AccessibilitySignal, AccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IDebugService, IDebugSession } from 'vs/workbench/contrib/debug/common/debug';
+import { Disposable, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { autorunWithStore, observableFromEvent } from '../../../../base/common/observable.js';
+import { IAccessibilitySignalService, AccessibilitySignal, AccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IDebugService, IDebugSession } from '../../debug/common/debug.js';
 
 export class AccessibilitySignalLineDebuggerContribution
 	extends Disposable
@@ -19,7 +19,7 @@ export class AccessibilitySignalLineDebuggerContribution
 	) {
 		super();
 
-		const isEnabled = observableFromEvent(
+		const isEnabled = observableFromEvent(this,
 			accessibilitySignalService.onSoundEnabledChanged(AccessibilitySignal.onDebugBreak),
 			() => accessibilitySignalService.isSoundEnabled(AccessibilitySignal.onDebugBreak)
 		);
diff --git a/src/vs/workbench/contrib/accessibilitySignals/browser/commands.ts b/src/vs/workbench/contrib/accessibilitySignals/browser/commands.ts
index a20ca9f9dc9..8f95c55fbb9 100644
--- a/src/vs/workbench/contrib/accessibilitySignals/browser/commands.ts
+++ b/src/vs/workbench/contrib/accessibilitySignals/browser/commands.ts
@@ -3,16 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { localize, localize2 } from 'vs/nls';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { Action2 } from 'vs/platform/actions/common/actions';
-import { AccessibilitySignal, AcknowledgeDocCommentsToken, IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { Action2 } from '../../../../platform/actions/common/actions.js';
+import { AccessibilitySignal, AcknowledgeDocCommentsToken, IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IQuickInputService, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
+import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
 
 export class ShowSignalSoundHelp extends Action2 {
 	static readonly ID = 'signals.sounds.help';
@@ -44,10 +45,11 @@ export class ShowSignalSoundHelp extends Action2 {
 				alwaysVisible: true
 			}] : []
 		})).sort((a, b) => a.label.localeCompare(b.label));
-		const qp = quickInputService.createQuickPick<IQuickPickItem & { signal: AccessibilitySignal }>();
+		const disposables = new DisposableStore();
+		const qp = disposables.add(quickInputService.createQuickPick<IQuickPickItem & { signal: AccessibilitySignal }>());
 		qp.items = items;
 		qp.selectedItems = items.filter(i => accessibilitySignalService.isSoundEnabled(i.signal) || userGestureSignals.includes(i.signal) && configurationService.getValue(i.signal.settingsKey + '.sound') !== 'never');
-		qp.onDidAccept(() => {
+		disposables.add(qp.onDidAccept(() => {
 			const enabledSounds = qp.selectedItems.map(i => i.signal);
 			const disabledSounds = qp.items.map(i => (i as any).signal).filter(i => !enabledSounds.includes(i));
 			for (const signal of enabledSounds) {
@@ -67,13 +69,14 @@ export class ShowSignalSoundHelp extends Action2 {
 				configurationService.updateValue(signal.settingsKey, value);
 			}
 			qp.hide();
-		});
-		qp.onDidTriggerItemButton(e => {
+		}));
+		disposables.add(qp.onDidTriggerItemButton(e => {
 			preferencesService.openUserSettings({ jsonEditor: true, revealSetting: { key: e.item.signal.settingsKey, edit: true } });
-		});
-		qp.onDidChangeActive(() => {
+		}));
+		disposables.add(qp.onDidChangeActive(() => {
 			accessibilitySignalService.playSound(qp.activeItems[0].signal.sound.getSound(true), true, AcknowledgeDocCommentsToken);
-		});
+		}));
+		disposables.add(qp.onDidHide(() => disposables.dispose()));
 		qp.placeholder = localize('sounds.help.placeholder', 'Select a sound to play and configure');
 		qp.canSelectMany = true;
 		await qp.show();
@@ -114,11 +117,12 @@ export class ShowAccessibilityAnnouncementHelp extends Action2 {
 				alwaysVisible: true,
 			}] : []
 		})).sort((a, b) => a.label.localeCompare(b.label));
-		const qp = quickInputService.createQuickPick<IQuickPickItem & { signal: AccessibilitySignal }>();
+		const disposables = new DisposableStore();
+		const qp = disposables.add(quickInputService.createQuickPick<IQuickPickItem & { signal: AccessibilitySignal }>());
 		qp.items = items;
 		qp.selectedItems = items.filter(i => accessibilitySignalService.isAnnouncementEnabled(i.signal) || userGestureSignals.includes(i.signal) && configurationService.getValue(i.signal.settingsKey + '.announcement') !== 'never');
 		const screenReaderOptimized = accessibilityService.isScreenReaderOptimized();
-		qp.onDidAccept(() => {
+		disposables.add(qp.onDidAccept(() => {
 			if (!screenReaderOptimized) {
 				// announcements are off by default when screen reader is not active
 				qp.hide();
@@ -139,10 +143,11 @@ export class ShowAccessibilityAnnouncementHelp extends Action2 {
 				configurationService.updateValue(signal.settingsKey, value);
 			}
 			qp.hide();
-		});
-		qp.onDidTriggerItemButton(e => {
+		}));
+		disposables.add(qp.onDidTriggerItemButton(e => {
 			preferencesService.openUserSettings({ jsonEditor: true, revealSetting: { key: e.item.signal.settingsKey, edit: true } });
-		});
+		}));
+		disposables.add(qp.onDidHide(() => disposables.dispose()));
 		qp.placeholder = screenReaderOptimized ? localize('announcement.help.placeholder', 'Select an announcement to configure') : localize('announcement.help.placeholder.disabled', 'Screen reader is not active, announcements are disabled by default.');
 		qp.canSelectMany = true;
 		await qp.show();
diff --git a/src/vs/workbench/contrib/accessibilitySignals/browser/editorTextPropertySignalsContribution.ts b/src/vs/workbench/contrib/accessibilitySignals/browser/editorTextPropertySignalsContribution.ts
index de1c2f798af..28d6fe3edef 100644
--- a/src/vs/workbench/contrib/accessibilitySignals/browser/editorTextPropertySignalsContribution.ts
+++ b/src/vs/workbench/contrib/accessibilitySignals/browser/editorTextPropertySignalsContribution.ts
@@ -3,22 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { disposableTimeout } from 'vs/base/common/async';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { IReader, autorun, autorunWithStore, derived, observableFromEvent, observableFromPromise } from 'vs/base/common/observable';
-import { observableFromValueWithChangeEvent, observableSignalFromEvent, wasEventTriggeredRecently } from 'vs/base/common/observableInternal/utils';
-import { isDefined } from 'vs/base/common/types';
-import { ICodeEditor, isCodeEditor, isDiffEditor } from 'vs/editor/browser/editorBrowser';
-import { Position } from 'vs/editor/common/core/position';
-import { CursorChangeReason } from 'vs/editor/common/cursorEvents';
-import { ITextModel } from 'vs/editor/common/model';
-import { FoldingController } from 'vs/editor/contrib/folding/browser/folding';
-import { AccessibilitySignal, AccessibilityModality, IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IMarkerService, MarkerSeverity } from 'vs/platform/markers/common/markers';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IDebugService } from 'vs/workbench/contrib/debug/common/debug';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { disposableTimeout } from '../../../../base/common/async.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { IReader, autorun, autorunWithStore, derived, observableFromEvent, observableFromPromise, observableFromValueWithChangeEvent, observableSignalFromEvent, wasEventTriggeredRecently } from '../../../../base/common/observable.js';
+import { isDefined } from '../../../../base/common/types.js';
+import { ICodeEditor, isCodeEditor, isDiffEditor } from '../../../../editor/browser/editorBrowser.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { CursorChangeReason } from '../../../../editor/common/cursorEvents.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { FoldingController } from '../../../../editor/contrib/folding/browser/folding.js';
+import { AccessibilityModality, AccessibilitySignal, IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IMarkerService, MarkerSeverity } from '../../../../platform/markers/common/markers.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IDebugService } from '../../debug/common/debug.js';
 
 export class EditorTextPropertySignalsContribution extends Disposable implements IWorkbenchContribution {
 	private readonly _textProperties: TextProperty[] = [
@@ -35,7 +34,7 @@ export class EditorTextPropertySignalsContribution extends Disposable implements
 			.some(signal => observableFromValueWithChangeEvent(this, this._accessibilitySignalService.getEnabledState(signal, false)).read(reader))
 	);
 
-	private readonly _activeEditorObservable = observableFromEvent(
+	private readonly _activeEditorObservable = observableFromEvent(this,
 		this._editorService.onDidActiveEditorChange,
 		(_) => {
 			const activeTextEditorControl = this._editorService.activeTextEditorControl;
@@ -73,7 +72,7 @@ export class EditorTextPropertySignalsContribution extends Disposable implements
 		let lastLine = -1;
 		const ignoredLineSignalsForCurrentLine = new Set<TextProperty>();
 
-		const timeouts = new DisposableStore();
+		const timeouts = store.add(new DisposableStore());
 
 		const propertySources = this._textProperties.map(p => ({ source: p.createSource(editor, editorModel), property: p }));
 
@@ -104,7 +103,7 @@ export class EditorTextPropertySignalsContribution extends Disposable implements
 
 				for (const modality of ['sound', 'announcement'] as AccessibilityModality[]) {
 					if (this._accessibilitySignalService.getEnabledState(signal, false, modality).value) {
-						const delay = this._accessibilitySignalService.getDelayMs(signal, modality) + (didType.get() ? 1000 : 0);
+						const delay = this._accessibilitySignalService.getDelayMs(signal, modality, mode) + (didType.get() ? 1000 : 0);
 
 						timeouts.add(disposableTimeout(() => {
 							if (source.isPresent(position, mode, undefined)) {
diff --git a/src/vs/workbench/contrib/accessibilitySignals/browser/openDiffEditorAnnouncement.ts b/src/vs/workbench/contrib/accessibilitySignals/browser/openDiffEditorAnnouncement.ts
index ed3d0f75cb0..15b1c3b4f9a 100644
--- a/src/vs/workbench/contrib/accessibilitySignals/browser/openDiffEditorAnnouncement.ts
+++ b/src/vs/workbench/contrib/accessibilitySignals/browser/openDiffEditorAnnouncement.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { isDiffEditor } from 'vs/editor/browser/editorBrowser';
-import { localize } from 'vs/nls';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { Event } from 'vs/base/common/event';
-import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
+import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
+import { isDiffEditor } from '../../../../editor/browser/editorBrowser.js';
+import { localize } from '../../../../nls.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { Event } from '../../../../base/common/event.js';
+import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
 
 export class DiffEditorActiveAnnouncementContribution extends Disposable implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/contrib/accessibilitySignals/browser/reloadableWorkbenchContribution.ts b/src/vs/workbench/contrib/accessibilitySignals/browser/reloadableWorkbenchContribution.ts
deleted file mode 100644
index 43fb32eed29..00000000000
--- a/src/vs/workbench/contrib/accessibilitySignals/browser/reloadableWorkbenchContribution.ts
+++ /dev/null
@@ -1,46 +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 { isHotReloadEnabled } from 'vs/base/common/hotReload';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { autorunWithStore } from 'vs/base/common/observable';
-import { readHotReloadableExport } from 'vs/editor/browser/widget/diffEditor/utils';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-
-/**
- * Wrap a class in a reloadable wrapper.
- * When the wrapper is created, the original class is created.
- * When the original class changes, the instance is re-created.
-*/
-export function wrapInReloadableClass(getClass: () => (new (...args: any[]) => any)): (new (...args: any[]) => any) {
-	if (!isHotReloadEnabled()) {
-		return getClass();
-	}
-
-	return class ReloadableWrapper extends BaseClass {
-		private _autorun: IDisposable | undefined = undefined;
-
-		override init() {
-			this._autorun = autorunWithStore((reader, store) => {
-				const clazz = readHotReloadableExport(getClass(), reader);
-				store.add(this.instantiationService.createInstance(clazz));
-			});
-		}
-
-		dispose(): void {
-			this._autorun?.dispose();
-		}
-	};
-}
-
-class BaseClass {
-	constructor(
-		@IInstantiationService protected readonly instantiationService: IInstantiationService,
-	) {
-		this.init();
-	}
-
-	init(): void { }
-}
diff --git a/src/vs/workbench/contrib/accessibilitySignals/browser/saveAccessibilitySignal.ts b/src/vs/workbench/contrib/accessibilitySignals/browser/saveAccessibilitySignal.ts
index e4df2fcc74e..2360da24e08 100644
--- a/src/vs/workbench/contrib/accessibilitySignals/browser/saveAccessibilitySignal.ts
+++ b/src/vs/workbench/contrib/accessibilitySignals/browser/saveAccessibilitySignal.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { AccessibilitySignal, IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { SaveReason } from 'vs/workbench/common/editor';
-import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { SaveReason } from '../../../common/editor.js';
+import { IWorkingCopyService } from '../../../services/workingCopy/common/workingCopyService.js';
 
 export class SaveAccessibilitySignalContribution extends Disposable implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/contrib/accountEntitlements/browser/accountsEntitlements.contribution.ts b/src/vs/workbench/contrib/accountEntitlements/browser/accountsEntitlements.contribution.ts
index 8a4be09b66a..9a824087a90 100644
--- a/src/vs/workbench/contrib/accountEntitlements/browser/accountsEntitlements.contribution.ts
+++ b/src/vs/workbench/contrib/accountEntitlements/browser/accountsEntitlements.contribution.ts
@@ -3,33 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from 'vs/workbench/common/contributions';
-import { Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { ContextKeyExpr, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { AuthenticationSession, IAuthenticationService } from 'vs/workbench/services/authentication/common/authentication';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope, } from 'vs/platform/configuration/common/configurationRegistry';
-import { applicationConfigurationNodeBase } from 'vs/workbench/common/configuration';
-import { localize } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IRequestService, asText } from 'vs/platform/request/common/request';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { isWeb } from 'vs/base/common/platform';
-import { isInternalTelemetry } from 'vs/platform/telemetry/common/telemetryUtils';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
+import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { ContextKeyExpr, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { AuthenticationSession, IAuthenticationService } from '../../../services/authentication/common/authentication.js';
+import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { IActivityService, NumberBadge } from '../../../services/activity/common/activity.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IExtensionManagementService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope, } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { applicationConfigurationNodeBase } from '../../../common/configuration.js';
+import { localize } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IRequestService, asText } from '../../../../platform/request/common/request.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { isWeb } from '../../../../base/common/platform.js';
 
 const accountsBadgeConfigKey = 'workbench.accounts.experimental.showEntitlements';
-const chatWelcomeViewConfigKey = 'workbench.chat.experimental.showWelcomeView';
 
 type EntitlementEnablementClassification = {
 	enabled: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Flag indicating if the entitlement is enabled' };
@@ -47,7 +45,6 @@ class EntitlementsContribution extends Disposable implements IWorkbenchContribut
 
 	private isInitialized = false;
 	private showAccountsBadgeContextKey = new RawContextKey<boolean>(accountsBadgeConfigKey, false).bindTo(this.contextService);
-	private showChatWelcomeViewContextKey = new RawContextKey<boolean>(chatWelcomeViewConfigKey, false).bindTo(this.contextService);
 	private readonly accountsMenuBadgeDisposable = this._register(new MutableDisposable());
 
 	constructor(
@@ -98,7 +95,6 @@ class EntitlementsContribution extends Disposable implements IWorkbenchContribut
 				await this.enableEntitlements(e.event.added[0]);
 			} else if (e.providerId === this.productService.gitHubEntitlement!.providerId && e.event.removed?.length) {
 				this.showAccountsBadgeContextKey.set(false);
-				this.showChatWelcomeViewContextKey.set(false);
 				this.accountsMenuBadgeDisposable.clear();
 			}
 		}));
@@ -156,29 +152,26 @@ class EntitlementsContribution extends Disposable implements IWorkbenchContribut
 			return;
 		}
 
-		const isInternal = isInternalTelemetry(this.productService, this.configurationService);
+		const installedExtensions = await this.extensionManagementService.getInstalled();
+		const installed = installedExtensions.find(value => ExtensionIdentifier.equals(value.identifier.id, this.productService.gitHubEntitlement!.extensionId));
+		if (installed) {
+			this.disableEntitlements();
+			return;
+		}
+
 		const showAccountsBadge = this.configurationService.inspect<boolean>(accountsBadgeConfigKey).value ?? false;
-		const showWelcomeView = this.configurationService.inspect<boolean>(chatWelcomeViewConfigKey).value ?? false;
 
 		const [enabled, org] = await this.getEntitlementsInfo(session);
-		if (enabled) {
-			if (isInternal && showWelcomeView) {
-				this.showChatWelcomeViewContextKey.set(true);
-				this.telemetryService.publicLog2<{ enabled: boolean }, EntitlementEnablementClassification>(chatWelcomeViewConfigKey, { enabled: true });
-			}
-			if (showAccountsBadge) {
-				this.createAccountsBadge(org);
-				this.showAccountsBadgeContextKey.set(showAccountsBadge);
-				this.telemetryService.publicLog2<{ enabled: boolean }, EntitlementEnablementClassification>(accountsBadgeConfigKey, { enabled: true });
-			}
+		if (enabled && showAccountsBadge) {
+			this.createAccountsBadge(org);
+			this.showAccountsBadgeContextKey.set(showAccountsBadge);
+			this.telemetryService.publicLog2<{ enabled: boolean }, EntitlementEnablementClassification>(accountsBadgeConfigKey, { enabled: true });
 		}
 	}
 
 	private disableEntitlements() {
 		this.storageService.store(accountsBadgeConfigKey, false, StorageScope.APPLICATION, StorageTarget.MACHINE);
-		this.storageService.store(chatWelcomeViewConfigKey, false, StorageScope.APPLICATION, StorageTarget.MACHINE);
 		this.showAccountsBadgeContextKey.set(false);
-		this.showChatWelcomeViewContextKey.set(false);
 		this.accountsMenuBadgeDisposable.clear();
 	}
 
@@ -260,17 +253,4 @@ configurationRegistry.registerConfiguration({
 	}
 });
 
-configurationRegistry.registerConfiguration({
-	...applicationConfigurationNodeBase,
-	properties: {
-		'workbench.chat.experimental.showWelcomeView': {
-			scope: ConfigurationScope.MACHINE,
-			type: 'boolean',
-			default: false,
-			tags: ['experimental'],
-			description: localize('workbench.chat.showWelcomeView', "When enabled, the chat panel welcome view will be shown.")
-		}
-	}
-});
-
 registerWorkbenchContribution2('workbench.contrib.entitlements', EntitlementsContribution, WorkbenchPhase.BlockRestore);
diff --git a/src/vs/workbench/contrib/authentication/browser/actions/manageAccountPreferencesForExtensionAction.ts b/src/vs/workbench/contrib/authentication/browser/actions/manageAccountPreferencesForExtensionAction.ts
new file mode 100644
index 00000000000..bd24203b502
--- /dev/null
+++ b/src/vs/workbench/contrib/authentication/browser/actions/manageAccountPreferencesForExtensionAction.ts
@@ -0,0 +1,157 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Event } from '../../../../../base/common/event.js';
+import { DisposableStore, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { localize, localize2 } from '../../../../../nls.js';
+import { Action2 } from '../../../../../platform/actions/common/actions.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IQuickInputService, IQuickPick, IQuickPickItem, QuickPickInput } from '../../../../../platform/quickinput/common/quickInput.js';
+import { IAuthenticationUsageService } from '../../../../services/authentication/browser/authenticationUsageService.js';
+import { AuthenticationSessionAccount, IAuthenticationExtensionsService, IAuthenticationService } from '../../../../services/authentication/common/authentication.js';
+import { IExtensionService } from '../../../../services/extensions/common/extensions.js';
+
+export class ManageAccountPreferencesForExtensionAction extends Action2 {
+	constructor() {
+		super({
+			id: '_manageAccountPreferencesForExtension',
+			title: localize2('manageAccountPreferenceForExtension', "Manage Extension Account Preferences"),
+			category: localize2('accounts', "Accounts"),
+			f1: false
+		});
+	}
+
+	override run(accessor: ServicesAccessor, extensionId?: string, providerId?: string): Promise<void> {
+		return accessor.get(IInstantiationService).createInstance(ManageAccountPreferenceForExtensionActionImpl).run(extensionId, providerId);
+	}
+}
+
+interface AccountPreferenceQuickPickItem extends IQuickPickItem {
+	account: AuthenticationSessionAccount;
+	providerId: string;
+}
+
+class ManageAccountPreferenceForExtensionActionImpl {
+	constructor(
+		@IAuthenticationService private readonly _authenticationService: IAuthenticationService,
+		@IQuickInputService private readonly _quickInputService: IQuickInputService,
+		@IAuthenticationUsageService private readonly _authenticationUsageService: IAuthenticationUsageService,
+		@IAuthenticationExtensionsService private readonly _authenticationExtensionsService: IAuthenticationExtensionsService,
+		@IExtensionService private readonly _extensionService: IExtensionService
+	) { }
+
+	async run(extensionId?: string, providerId?: string) {
+		if (!extensionId) {
+			return;
+		}
+		const extension = await this._extensionService.getExtension(extensionId);
+		if (!extension) {
+			throw new Error(`No extension with id ${extensionId}`);
+		}
+
+		const providerIds = new Array<string>();
+		const providerIdToAccounts = new Map<string, ReadonlyArray<AuthenticationSessionAccount>>();
+		if (providerId) {
+			providerIds.push(providerId);
+			providerIdToAccounts.set(providerId, await this._authenticationService.getAccounts(providerId));
+		} else {
+			for (const providerId of this._authenticationService.getProviderIds()) {
+				const accounts = await this._authenticationService.getAccounts(providerId);
+				for (const account of accounts) {
+					const usage = this._authenticationUsageService.readAccountUsages(providerId, account.label).find(u => u.extensionId === extensionId.toLowerCase());
+					if (usage) {
+						providerIds.push(providerId);
+						providerIdToAccounts.set(providerId, accounts);
+						break;
+					}
+				}
+			}
+		}
+
+		let chosenProviderId: string | undefined = providerIds[0];
+		if (providerIds.length > 1) {
+			const result = await this._quickInputService.pick(
+				providerIds.map(providerId => ({
+					label: this._authenticationService.getProvider(providerId).label,
+					id: providerId,
+				})),
+				{
+					placeHolder: localize('selectProvider', "Select an authentication provider to manage account preferences for"),
+					title: localize('pickAProviderTitle', "Manage Extension Account Preferences")
+				}
+			);
+			chosenProviderId = result?.id;
+		}
+
+		if (!chosenProviderId) {
+			return;
+		}
+
+		const currentAccountNamePreference = this._authenticationExtensionsService.getAccountPreference(extensionId, chosenProviderId);
+		const items: Array<QuickPickInput<AccountPreferenceQuickPickItem>> = this._getItems(providerIdToAccounts.get(chosenProviderId)!, chosenProviderId, currentAccountNamePreference);
+
+		const disposables = new DisposableStore();
+		const picker = this._createQuickPick(disposables, extensionId, extension.displayName ?? extension.name);
+		if (items.length === 0) {
+			// We would only get here if we went through the Command Palette
+			disposables.add(this._handleNoAccounts(picker));
+			return;
+		}
+		picker.items = items;
+		picker.show();
+	}
+
+	private _createQuickPick(disposableStore: DisposableStore, extensionId: string, extensionLabel: string) {
+		const picker = disposableStore.add(this._quickInputService.createQuickPick<AccountPreferenceQuickPickItem>({ useSeparators: true }));
+		disposableStore.add(picker.onDidHide(() => {
+			disposableStore.dispose();
+		}));
+		picker.placeholder = localize('placeholder', "Manage '{0}' account preferences...", extensionLabel);
+		picker.title = localize('title', "'{0}' Account Preferences For This Workspace", extensionLabel);
+		picker.sortByLabel = false;
+		disposableStore.add(picker.onDidAccept(() => {
+			this._accept(extensionId, picker.selectedItems);
+			picker.hide();
+		}));
+		return picker;
+	}
+
+	private _getItems(accounts: ReadonlyArray<AuthenticationSessionAccount>, providerId: string, currentAccountNamePreference: string | undefined): Array<QuickPickInput<AccountPreferenceQuickPickItem>> {
+		return accounts.map<QuickPickInput<AccountPreferenceQuickPickItem>>(a => currentAccountNamePreference === a.label
+			? {
+				label: a.label,
+				account: a,
+				providerId,
+				description: localize('currentAccount', "Current account"),
+				picked: true
+			}
+			: {
+				label: a.label,
+				account: a,
+				providerId,
+			}
+		);
+	}
+
+	private _handleNoAccounts(picker: IQuickPick<IQuickPickItem, { useSeparators: true }>): IDisposable {
+		picker.validationMessage = localize('noAccounts', "No accounts are currently used by this extension.");
+		picker.buttons = [this._quickInputService.backButton];
+		picker.show();
+		return Event.filter(picker.onDidTriggerButton, (e) => e === this._quickInputService.backButton)(() => this.run());
+	}
+
+	private _accept(extensionId: string, selectedItems: ReadonlyArray<AccountPreferenceQuickPickItem>) {
+		for (const item of selectedItems) {
+			const account = item.account;
+			const providerId = item.providerId;
+			const currentAccountName = this._authenticationExtensionsService.getAccountPreference(extensionId, providerId);
+			if (currentAccountName === account.label) {
+				// This account is already the preferred account
+				continue;
+			}
+			this._authenticationExtensionsService.updateAccountPreference(extensionId, providerId, account);
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/authentication/browser/actions/manageTrustedExtensionsForAccountAction.ts b/src/vs/workbench/contrib/authentication/browser/actions/manageTrustedExtensionsForAccountAction.ts
index 3c3d4b9aee1..1af0e19ab54 100644
--- a/src/vs/workbench/contrib/authentication/browser/actions/manageTrustedExtensionsForAccountAction.ts
+++ b/src/vs/workbench/contrib/authentication/browser/actions/manageTrustedExtensionsForAccountAction.ts
@@ -3,18 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { fromNow } from 'vs/base/common/date';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { localize, localize2 } from 'vs/nls';
-import { Action2 } from 'vs/platform/actions/common/actions';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
-import { IAuthenticationAccessService } from 'vs/workbench/services/authentication/browser/authenticationAccessService';
-import { IAuthenticationUsageService } from 'vs/workbench/services/authentication/browser/authenticationUsageService';
-import { AllowedExtension, IAuthenticationService } from 'vs/workbench/services/authentication/common/authentication';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { fromNow } from '../../../../../base/common/date.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { localize, localize2 } from '../../../../../nls.js';
+import { Action2 } from '../../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IProductService } from '../../../../../platform/product/common/productService.js';
+import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from '../../../../../platform/quickinput/common/quickInput.js';
+import { IAuthenticationAccessService } from '../../../../services/authentication/browser/authenticationAccessService.js';
+import { IAuthenticationUsageService } from '../../../../services/authentication/browser/authenticationUsageService.js';
+import { AllowedExtension, IAuthenticationService } from '../../../../services/authentication/common/authentication.js';
+import { IExtensionService } from '../../../../services/extensions/common/extensions.js';
 
 export class ManageTrustedExtensionsForAccountAction extends Action2 {
 	constructor() {
@@ -26,23 +29,52 @@ export class ManageTrustedExtensionsForAccountAction extends Action2 {
 		});
 	}
 
-	override async run(accessor: ServicesAccessor, options?: { providerId: string; accountLabel: string }): Promise<void> {
-		const productService = accessor.get(IProductService);
-		const extensionService = accessor.get(IExtensionService);
-		const dialogService = accessor.get(IDialogService);
-		const quickInputService = accessor.get(IQuickInputService);
-		const authenticationService = accessor.get(IAuthenticationService);
-		const authenticationUsageService = accessor.get(IAuthenticationUsageService);
-		const authenticationAccessService = accessor.get(IAuthenticationAccessService);
+	override run(accessor: ServicesAccessor, options?: { providerId: string; accountLabel: string }): Promise<void> {
+		const instantiationService = accessor.get(IInstantiationService);
+		return instantiationService.createInstance(ManageTrustedExtensionsForAccountActionImpl).run(options);
+	}
+}
 
-		let providerId = options?.providerId;
-		let accountLabel = options?.accountLabel;
+interface TrustedExtensionsQuickPickItem extends IQuickPickItem {
+	extension: AllowedExtension;
+	lastUsed?: number;
+}
 
+class ManageTrustedExtensionsForAccountActionImpl {
+	constructor(
+		@IProductService private readonly _productService: IProductService,
+		@IExtensionService private readonly _extensionService: IExtensionService,
+		@IDialogService private readonly _dialogService: IDialogService,
+		@IQuickInputService private readonly _quickInputService: IQuickInputService,
+		@IAuthenticationService private readonly _authenticationService: IAuthenticationService,
+		@IAuthenticationUsageService private readonly _authenticationUsageService: IAuthenticationUsageService,
+		@IAuthenticationAccessService private readonly _authenticationAccessService: IAuthenticationAccessService,
+		@ICommandService private readonly _commandService: ICommandService
+	) { }
+
+	async run(options?: { providerId: string; accountLabel: string }) {
+		const { providerId, accountLabel } = await this._resolveProviderAndAccountLabel(options?.providerId, options?.accountLabel);
+		if (!providerId || !accountLabel) {
+			return;
+		}
+
+		const items = await this._getItems(providerId, accountLabel);
+		if (!items.length) {
+			return;
+		}
+		const disposables = new DisposableStore();
+		const picker = this._createQuickPick(disposables, providerId, accountLabel);
+		picker.items = items;
+		picker.selectedItems = items.filter((i): i is TrustedExtensionsQuickPickItem => i.type !== 'separator' && !!i.picked);
+		picker.show();
+	}
+
+	private async _resolveProviderAndAccountLabel(providerId: string | undefined, accountLabel: string | undefined) {
 		if (!providerId || !accountLabel) {
 			const accounts = new Array<{ providerId: string; providerLabel: string; accountLabel: string }>();
-			for (const id of authenticationService.getProviderIds()) {
-				const providerLabel = authenticationService.getProvider(id).label;
-				const sessions = await authenticationService.getSessions(id);
+			for (const id of this._authenticationService.getProviderIds()) {
+				const providerLabel = this._authenticationService.getProvider(id).label;
+				const sessions = await this._authenticationService.getSessions(id);
 				const uniqueAccountLabels = new Set<string>();
 				for (const session of sessions) {
 					if (!uniqueAccountLabels.has(session.account.label)) {
@@ -52,7 +84,7 @@ export class ManageTrustedExtensionsForAccountAction extends Action2 {
 				}
 			}
 
-			const pick = await quickInputService.pick(
+			const pick = await this._quickInputService.pick(
 				accounts.map(account => ({
 					providerId: account.providerId,
 					label: account.accountLabel,
@@ -68,12 +100,20 @@ export class ManageTrustedExtensionsForAccountAction extends Action2 {
 				providerId = pick.providerId;
 				accountLabel = pick.label;
 			} else {
-				return;
+				return { providerId: undefined, accountLabel: undefined };
 			}
 		}
+		return { providerId, accountLabel };
+	}
 
-		const allowedExtensions = authenticationAccessService.readAllowedExtensions(providerId, accountLabel);
-		const trustedExtensionAuthAccess = productService.trustedExtensionAuthAccess;
+	private async _getItems(providerId: string, accountLabel: string) {
+		let allowedExtensions = this._authenticationAccessService.readAllowedExtensions(providerId, accountLabel);
+		// only include extensions that are installed
+		const resolvedExtensions = await Promise.all(allowedExtensions.map(ext => this._extensionService.getExtension(ext.id)));
+		allowedExtensions = resolvedExtensions
+			.map((ext, i) => ext ? allowedExtensions[i] : undefined)
+			.filter(ext => !!ext);
+		const trustedExtensionAuthAccess = this._productService.trustedExtensionAuthAccess;
 		const trustedExtensionIds =
 			// Case 1: trustedExtensionAuthAccess is an array
 			Array.isArray(trustedExtensionAuthAccess)
@@ -86,7 +126,7 @@ export class ManageTrustedExtensionsForAccountAction extends Action2 {
 			const allowedExtension = allowedExtensions.find(ext => ext.id === extensionId);
 			if (!allowedExtension) {
 				// Add the extension to the allowedExtensions list
-				const extension = await extensionService.getExtension(extensionId);
+				const extension = await this._extensionService.getExtension(extensionId);
 				if (extension) {
 					allowedExtensions.push({
 						id: extensionId,
@@ -103,21 +143,11 @@ export class ManageTrustedExtensionsForAccountAction extends Action2 {
 		}
 
 		if (!allowedExtensions.length) {
-			dialogService.info(localize('noTrustedExtensions', "This account has not been used by any extensions."));
-			return;
+			this._dialogService.info(localize('noTrustedExtensions', "This account has not been used by any extensions."));
+			return [];
 		}
 
-		interface TrustedExtensionsQuickPickItem extends IQuickPickItem {
-			extension: AllowedExtension;
-			lastUsed?: number;
-		}
-
-		const disposableStore = new DisposableStore();
-		const quickPick = disposableStore.add(quickInputService.createQuickPick<TrustedExtensionsQuickPickItem>());
-		quickPick.canSelectMany = true;
-		quickPick.customButton = true;
-		quickPick.customLabel = localize('manageTrustedExtensions.cancel', 'Cancel');
-		const usages = authenticationUsageService.readAccountUsages(providerId, accountLabel);
+		const usages = this._authenticationUsageService.readAccountUsages(providerId, accountLabel);
 		const trustedExtensions = [];
 		const otherExtensions = [];
 		for (const extension of allowedExtensions) {
@@ -131,34 +161,47 @@ export class ManageTrustedExtensionsForAccountAction extends Action2 {
 		}
 
 		const sortByLastUsed = (a: AllowedExtension, b: AllowedExtension) => (b.lastUsed || 0) - (a.lastUsed || 0);
-		const toQuickPickItem = function (extension: AllowedExtension): IQuickPickItem & { extension: AllowedExtension } {
-			const lastUsed = extension.lastUsed;
-			const description = lastUsed
-				? localize({ key: 'accountLastUsedDate', comment: ['The placeholder {0} is a string with time information, such as "3 days ago"'] }, "Last used this account {0}", fromNow(lastUsed, true))
-				: localize('notUsed', "Has not used this account");
-			let tooltip: string | undefined;
-			let disabled: boolean | undefined;
-			if (extension.trusted) {
-				tooltip = localize('trustedExtensionTooltip', "This extension is trusted by Microsoft and\nalways has access to this account");
-				disabled = true;
-			}
-			return {
-				label: extension.name,
-				extension,
-				description,
-				tooltip,
-				disabled,
-				picked: extension.allowed === undefined || extension.allowed
-			};
-		};
-		const items: Array<TrustedExtensionsQuickPickItem | IQuickPickSeparator> = [
-			...otherExtensions.sort(sortByLastUsed).map(toQuickPickItem),
-			{ type: 'separator', label: localize('trustedExtensions', "Trusted by Microsoft") },
-			...trustedExtensions.sort(sortByLastUsed).map(toQuickPickItem)
+
+		const items = [
+			...otherExtensions.sort(sortByLastUsed).map(this._toQuickPickItem),
+			{ type: 'separator', label: localize('trustedExtensions', "Trusted by Microsoft") } satisfies IQuickPickSeparator,
+			...trustedExtensions.sort(sortByLastUsed).map(this._toQuickPickItem)
 		];
 
-		quickPick.items = items;
-		quickPick.selectedItems = items.filter((item): item is TrustedExtensionsQuickPickItem => item.type !== 'separator' && (item.extension.allowed === undefined || item.extension.allowed));
+		return items;
+	}
+
+	private _toQuickPickItem(extension: AllowedExtension): TrustedExtensionsQuickPickItem {
+		const lastUsed = extension.lastUsed;
+		const description = lastUsed
+			? localize({ key: 'accountLastUsedDate', comment: ['The placeholder {0} is a string with time information, such as "3 days ago"'] }, "Last used this account {0}", fromNow(lastUsed, true))
+			: localize('notUsed', "Has not used this account");
+		let tooltip: string | undefined;
+		let disabled: boolean | undefined;
+		if (extension.trusted) {
+			tooltip = localize('trustedExtensionTooltip', "This extension is trusted by Microsoft and\nalways has access to this account");
+			disabled = true;
+		}
+		return {
+			label: extension.name,
+			extension,
+			description,
+			tooltip,
+			disabled,
+			buttons: [{
+				tooltip: localize('accountPreferences', "Manage account preferences for this extension"),
+				iconClass: ThemeIcon.asClassName(Codicon.settingsGear),
+			}],
+			picked: extension.allowed === undefined || extension.allowed
+		};
+	}
+
+	private _createQuickPick(disposableStore: DisposableStore, providerId: string, accountLabel: string) {
+		const quickPick = disposableStore.add(this._quickInputService.createQuickPick<TrustedExtensionsQuickPickItem>({ useSeparators: true }));
+		quickPick.canSelectMany = true;
+		quickPick.customButton = true;
+		quickPick.customLabel = localize('manageTrustedExtensions.cancel', 'Cancel');
+
 		quickPick.title = localize('manageTrustedExtensions', "Manage Trusted Extensions");
 		quickPick.placeholder = localize('manageExtensions', "Choose which extensions can access this account");
 
@@ -171,7 +214,7 @@ export class ManageTrustedExtensionsForAccountAction extends Action2 {
 			updatedAllowedList.forEach(extension => {
 				extension.allowed = allowedExtensionsSet.has(extension);
 			});
-			authenticationAccessService.updateAllowedExtensions(providerId, accountLabel, updatedAllowedList);
+			this._authenticationAccessService.updateAllowedExtensions(providerId, accountLabel, updatedAllowedList);
 			quickPick.hide();
 		}));
 
@@ -182,8 +225,9 @@ export class ManageTrustedExtensionsForAccountAction extends Action2 {
 		disposableStore.add(quickPick.onDidCustom(() => {
 			quickPick.hide();
 		}));
-
-		quickPick.show();
+		disposableStore.add(quickPick.onDidTriggerItemButton(e =>
+			this._commandService.executeCommand('_manageAccountPreferencesForExtension', e.item.extension.id, providerId)
+		));
+		return quickPick;
 	}
-
 }
diff --git a/src/vs/workbench/contrib/authentication/browser/actions/signOutOfAccountAction.ts b/src/vs/workbench/contrib/authentication/browser/actions/signOutOfAccountAction.ts
index 87afd379e24..034853f5f8e 100644
--- a/src/vs/workbench/contrib/authentication/browser/actions/signOutOfAccountAction.ts
+++ b/src/vs/workbench/contrib/authentication/browser/actions/signOutOfAccountAction.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import Severity from 'vs/base/common/severity';
-import { localize } from 'vs/nls';
-import { Action2 } from 'vs/platform/actions/common/actions';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IAuthenticationAccessService } from 'vs/workbench/services/authentication/browser/authenticationAccessService';
-import { IAuthenticationUsageService } from 'vs/workbench/services/authentication/browser/authenticationUsageService';
-import { IAuthenticationService } from 'vs/workbench/services/authentication/common/authentication';
+import Severity from '../../../../../base/common/severity.js';
+import { localize } from '../../../../../nls.js';
+import { Action2 } from '../../../../../platform/actions/common/actions.js';
+import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
+import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IAuthenticationAccessService } from '../../../../services/authentication/browser/authenticationAccessService.js';
+import { IAuthenticationUsageService } from '../../../../services/authentication/browser/authenticationUsageService.js';
+import { IAuthenticationService } from '../../../../services/authentication/common/authentication.js';
 
 export class SignOutOfAccountAction extends Action2 {
 	constructor() {
diff --git a/src/vs/workbench/contrib/authentication/browser/authentication.contribution.ts b/src/vs/workbench/contrib/authentication/browser/authentication.contribution.ts
index 4e0a9ab1e3d..3575284deb6 100644
--- a/src/vs/workbench/contrib/authentication/browser/authentication.contribution.ts
+++ b/src/vs/workbench/contrib/authentication/browser/authentication.contribution.ts
@@ -3,23 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { isFalsyOrWhitespace } from 'vs/base/common/strings';
-import { localize } from 'vs/nls';
-import { MenuId, MenuRegistry, registerAction2 } from 'vs/platform/actions/common/actions';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IExtensionManifest } from 'vs/platform/extensions/common/extensions';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { SignOutOfAccountAction } from 'vs/workbench/contrib/authentication/browser/actions/signOutOfAccountAction';
-import { AuthenticationProviderInformation, IAuthenticationService } from 'vs/workbench/services/authentication/common/authentication';
-import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { Extensions, IExtensionFeatureTableRenderer, IExtensionFeaturesRegistry, IRenderedData, IRowData, ITableData } from 'vs/workbench/services/extensionManagement/common/extensionFeatures';
-import { ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { ManageTrustedExtensionsForAccountAction } from './actions/manageTrustedExtensionsForAccountAction';
+import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
+import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
+import { isFalsyOrWhitespace } from '../../../../base/common/strings.js';
+import { localize } from '../../../../nls.js';
+import { MenuId, MenuRegistry, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { IExtensionManifest } from '../../../../platform/extensions/common/extensions.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { SignOutOfAccountAction } from './actions/signOutOfAccountAction.js';
+import { AuthenticationProviderInformation, IAuthenticationService } from '../../../services/authentication/common/authentication.js';
+import { IBrowserWorkbenchEnvironmentService } from '../../../services/environment/browser/environmentService.js';
+import { Extensions, IExtensionFeatureTableRenderer, IExtensionFeaturesRegistry, IRenderedData, IRowData, ITableData } from '../../../services/extensionManagement/common/extensionFeatures.js';
+import { ExtensionsRegistry } from '../../../services/extensions/common/extensionsRegistry.js';
+import { ManageTrustedExtensionsForAccountAction } from './actions/manageTrustedExtensionsForAccountAction.js';
+import { ManageAccountPreferencesForExtensionAction } from './actions/manageAccountPreferencesForExtensionAction.js';
+import { IAuthenticationUsageService } from '../../../services/authentication/browser/authenticationUsageService.js';
 
 const codeExchangeProxyCommand = CommandsRegistry.registerCommand('workbench.getCodeExchangeProxyEndpoints', function (accessor, _) {
 	const environmentService = accessor.get(IBrowserWorkbenchEnvironmentService);
@@ -104,7 +106,7 @@ const extensionFeature = Registry.as<IExtensionFeaturesRegistry>(Extensions.Exte
 	renderer: new SyncDescriptor(AuthenticationDataRenderer),
 });
 
-export class AuthenticationContribution extends Disposable implements IWorkbenchContribution {
+class AuthenticationContribution extends Disposable implements IWorkbenchContribution {
 	static ID = 'workbench.contrib.authentication';
 
 	private _placeholderMenuItem: IDisposable | undefined = MenuRegistry.appendMenuItem(MenuId.AccountsContext, {
@@ -115,10 +117,7 @@ export class AuthenticationContribution extends Disposable implements IWorkbench
 		},
 	});
 
-	constructor(
-		@IAuthenticationService private readonly _authenticationService: IAuthenticationService,
-		@IBrowserWorkbenchEnvironmentService private readonly _environmentService: IBrowserWorkbenchEnvironmentService
-	) {
+	constructor(@IAuthenticationService private readonly _authenticationService: IAuthenticationService) {
 		super();
 		this._register(codeExchangeProxyCommand);
 		this._register(extensionFeature);
@@ -129,7 +128,6 @@ export class AuthenticationContribution extends Disposable implements IWorkbench
 		}
 		this._registerHandlers();
 		this._registerAuthenticationExtentionPointHandler();
-		this._registerEnvContributedAuthenticationProviders();
 		this._registerActions();
 	}
 
@@ -165,15 +163,6 @@ export class AuthenticationContribution extends Disposable implements IWorkbench
 		});
 	}
 
-	private _registerEnvContributedAuthenticationProviders(): void {
-		if (!this._environmentService.options?.authenticationProviders?.length) {
-			return;
-		}
-		for (const provider of this._environmentService.options.authenticationProviders) {
-			this._authenticationService.registerAuthenticationProvider(provider.id, provider);
-		}
-	}
-
 	private _registerHandlers(): void {
 		this._register(this._authenticationService.onDidRegisterAuthenticationProvider(_e => {
 			this._clearPlaceholderMenuItem();
@@ -194,6 +183,7 @@ export class AuthenticationContribution extends Disposable implements IWorkbench
 	private _registerActions(): void {
 		this._register(registerAction2(SignOutOfAccountAction));
 		this._register(registerAction2(ManageTrustedExtensionsForAccountAction));
+		this._register(registerAction2(ManageAccountPreferencesForExtensionAction));
 	}
 
 	private _clearPlaceholderMenuItem(): void {
@@ -202,4 +192,19 @@ export class AuthenticationContribution extends Disposable implements IWorkbench
 	}
 }
 
+class AuthenticationUsageContribution implements IWorkbenchContribution {
+	static ID = 'workbench.contrib.authenticationUsage';
+
+	constructor(
+		@IAuthenticationUsageService private readonly _authenticationUsageService: IAuthenticationUsageService,
+	) {
+		this._initializeExtensionUsageCache();
+	}
+
+	private async _initializeExtensionUsageCache() {
+		await this._authenticationUsageService.initializeExtensionUsageCache();
+	}
+}
+
 registerWorkbenchContribution2(AuthenticationContribution.ID, AuthenticationContribution, WorkbenchPhase.AfterRestored);
+registerWorkbenchContribution2(AuthenticationUsageContribution.ID, AuthenticationUsageContribution, WorkbenchPhase.Eventually);
diff --git a/src/vs/workbench/contrib/bracketPairColorizer2Telemetry/browser/bracketPairColorizer2Telemetry.contribution.ts b/src/vs/workbench/contrib/bracketPairColorizer2Telemetry/browser/bracketPairColorizer2Telemetry.contribution.ts
index 3a643b660ba..0b69c619e42 100644
--- a/src/vs/workbench/contrib/bracketPairColorizer2Telemetry/browser/bracketPairColorizer2Telemetry.contribution.ts
+++ b/src/vs/workbench/contrib/bracketPairColorizer2Telemetry/browser/bracketPairColorizer2Telemetry.contribution.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
-import { IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions';
-import { EnablementState } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry } from '../../../common/contributions.js';
+import { IExtensionsWorkbenchService } from '../../extensions/common/extensions.js';
+import { EnablementState } from '../../../services/extensionManagement/common/extensionManagement.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
 
 class BracketPairColorizer2TelemetryContribution {
 	constructor(
diff --git a/src/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits.ts b/src/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits.ts
index ddeb14cedea..ad46b6e8b89 100644
--- a/src/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits.ts
+++ b/src/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { groupBy } from 'vs/base/common/arrays';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { compare } from 'vs/base/common/strings';
-import { isObject } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { ResourceEdit } from 'vs/editor/browser/services/bulkEditService';
-import { WorkspaceEditMetadata } from 'vs/editor/common/languages';
-import { IProgress } from 'vs/platform/progress/common/progress';
-import { UndoRedoGroup, UndoRedoSource } from 'vs/platform/undoRedo/common/undoRedo';
-import { getNotebookEditorFromEditorPane } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CellUri, ICellPartialMetadataEdit, ICellReplaceEdit, IDocumentMetadataEdit, ISelectionState, IWorkspaceNotebookCellEdit, SelectionStateType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotebookEditorModelResolverService } from 'vs/workbench/contrib/notebook/common/notebookEditorModelResolverService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { groupBy } from '../../../../base/common/arrays.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { compare } from '../../../../base/common/strings.js';
+import { isObject } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ResourceEdit } from '../../../../editor/browser/services/bulkEditService.js';
+import { WorkspaceEditMetadata } from '../../../../editor/common/languages.js';
+import { IProgress } from '../../../../platform/progress/common/progress.js';
+import { UndoRedoGroup, UndoRedoSource } from '../../../../platform/undoRedo/common/undoRedo.js';
+import { getNotebookEditorFromEditorPane } from '../../notebook/browser/notebookBrowser.js';
+import { CellUri, ICellPartialMetadataEdit, ICellReplaceEdit, IDocumentMetadataEdit, ISelectionState, IWorkspaceNotebookCellEdit, SelectionStateType } from '../../notebook/common/notebookCommon.js';
+import { INotebookEditorModelResolverService } from '../../notebook/common/notebookEditorModelResolverService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
 
 export class ResourceNotebookCellEdit extends ResourceEdit implements IWorkspaceNotebookCellEdit {
 
diff --git a/src/vs/workbench/contrib/bulkEdit/browser/bulkEditService.ts b/src/vs/workbench/contrib/bulkEdit/browser/bulkEditService.ts
index 888c67f46a9..60e1812f433 100644
--- a/src/vs/workbench/contrib/bulkEdit/browser/bulkEditService.ts
+++ b/src/vs/workbench/contrib/bulkEdit/browser/bulkEditService.ts
@@ -3,31 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { LinkedList } from 'vs/base/common/linkedList';
-import { ResourceMap, ResourceSet } from 'vs/base/common/map';
-import { URI } from 'vs/base/common/uri';
-import { ICodeEditor, isCodeEditor, isDiffEditor } from 'vs/editor/browser/editorBrowser';
-import { IBulkEditOptions, IBulkEditPreviewHandler, IBulkEditResult, IBulkEditService, ResourceEdit, ResourceFileEdit, ResourceTextEdit } from 'vs/editor/browser/services/bulkEditService';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { WorkspaceEdit } from 'vs/editor/common/languages';
-import { localize } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProgress, IProgressStep, Progress } from 'vs/platform/progress/common/progress';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { UndoRedoGroup, UndoRedoSource } from 'vs/platform/undoRedo/common/undoRedo';
-import { BulkCellEdits, ResourceNotebookCellEdit } from 'vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
-import { BulkFileEdits } from 'vs/workbench/contrib/bulkEdit/browser/bulkFileEdits';
-import { BulkTextEdits } from 'vs/workbench/contrib/bulkEdit/browser/bulkTextEdits';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ILifecycleService, ShutdownReason } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { LinkedList } from '../../../../base/common/linkedList.js';
+import { ResourceMap, ResourceSet } from '../../../../base/common/map.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ICodeEditor, isCodeEditor, isDiffEditor } from '../../../../editor/browser/editorBrowser.js';
+import { IBulkEditOptions, IBulkEditPreviewHandler, IBulkEditResult, IBulkEditService, ResourceEdit, ResourceFileEdit, ResourceTextEdit } from '../../../../editor/browser/services/bulkEditService.js';
+import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
+import { WorkspaceEdit } from '../../../../editor/common/languages.js';
+import { localize } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { Extensions, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IProgress, IProgressStep, Progress } from '../../../../platform/progress/common/progress.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { UndoRedoGroup, UndoRedoSource } from '../../../../platform/undoRedo/common/undoRedo.js';
+import { BulkCellEdits, ResourceNotebookCellEdit } from './bulkCellEdits.js';
+import { BulkFileEdits } from './bulkFileEdits.js';
+import { BulkTextEdits } from './bulkTextEdits.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { ILifecycleService, ShutdownReason } from '../../../services/lifecycle/common/lifecycle.js';
+import { IWorkingCopyService } from '../../../services/workingCopy/common/workingCopyService.js';
 
 function liftEdits(edits: ResourceEdit[]): ResourceEdit[] {
 	return edits.map(edit => {
diff --git a/src/vs/workbench/contrib/bulkEdit/browser/bulkFileEdits.ts b/src/vs/workbench/contrib/bulkEdit/browser/bulkFileEdits.ts
index f11d5cb58cd..c61d10b2b81 100644
--- a/src/vs/workbench/contrib/bulkEdit/browser/bulkFileEdits.ts
+++ b/src/vs/workbench/contrib/bulkEdit/browser/bulkFileEdits.ts
@@ -4,21 +4,21 @@
  *--------------------------------------------------------------------------------------------*/
 
 
-import { WorkspaceFileEditOptions } from 'vs/editor/common/languages';
-import { IFileService, FileSystemProviderCapabilities, IFileContent, IFileStatWithMetadata } from 'vs/platform/files/common/files';
-import { IProgress } from 'vs/platform/progress/common/progress';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IWorkingCopyFileService, IFileOperationUndoRedoInfo, IMoveOperation, ICopyOperation, IDeleteOperation, ICreateOperation, ICreateFileOperation } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
-import { IWorkspaceUndoRedoElement, UndoRedoElementType, IUndoRedoService, UndoRedoGroup, UndoRedoSource } from 'vs/platform/undoRedo/common/undoRedo';
-import { URI } from 'vs/base/common/uri';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { ResourceFileEdit } from 'vs/editor/browser/services/bulkEditService';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { tail } from 'vs/base/common/arrays';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { Schemas } from 'vs/base/common/network';
+import { WorkspaceFileEditOptions } from '../../../../editor/common/languages.js';
+import { IFileService, FileSystemProviderCapabilities, IFileContent, IFileStatWithMetadata } from '../../../../platform/files/common/files.js';
+import { IProgress } from '../../../../platform/progress/common/progress.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IWorkingCopyFileService, IFileOperationUndoRedoInfo, IMoveOperation, ICopyOperation, IDeleteOperation, ICreateOperation, ICreateFileOperation } from '../../../services/workingCopy/common/workingCopyFileService.js';
+import { IWorkspaceUndoRedoElement, UndoRedoElementType, IUndoRedoService, UndoRedoGroup, UndoRedoSource } from '../../../../platform/undoRedo/common/undoRedo.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { ResourceFileEdit } from '../../../../editor/browser/services/bulkEditService.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { tail } from '../../../../base/common/arrays.js';
+import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
+import { Schemas } from '../../../../base/common/network.js';
 
 interface IFileOperation {
 	uris: URI[];
diff --git a/src/vs/workbench/contrib/bulkEdit/browser/bulkTextEdits.ts b/src/vs/workbench/contrib/bulkEdit/browser/bulkTextEdits.ts
index 715b2edc5ca..269d2bccfe1 100644
--- a/src/vs/workbench/contrib/bulkEdit/browser/bulkTextEdits.ts
+++ b/src/vs/workbench/contrib/bulkEdit/browser/bulkTextEdits.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { dispose, IDisposable, IReference } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditOperation, ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { EndOfLineSequence, ITextModel } from 'vs/editor/common/model';
-import { ITextModelService, IResolvedTextEditorModel } from 'vs/editor/common/services/resolverService';
-import { IProgress } from 'vs/platform/progress/common/progress';
-import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { IUndoRedoService, UndoRedoGroup, UndoRedoSource } from 'vs/platform/undoRedo/common/undoRedo';
-import { SingleModelEditStackElement, MultiModelEditStackElement } from 'vs/editor/common/model/editStack';
-import { ResourceMap } from 'vs/base/common/map';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ResourceTextEdit } from 'vs/editor/browser/services/bulkEditService';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2';
-import { SnippetParser } from 'vs/editor/contrib/snippet/browser/snippetParser';
-import { ISnippetEdit } from 'vs/editor/contrib/snippet/browser/snippetSession';
+import { dispose, IDisposable, IReference } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { EditOperation, ISingleEditOperation } from '../../../../editor/common/core/editOperation.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { Selection } from '../../../../editor/common/core/selection.js';
+import { EndOfLineSequence, ITextModel } from '../../../../editor/common/model.js';
+import { ITextModelService, IResolvedTextEditorModel } from '../../../../editor/common/services/resolverService.js';
+import { IProgress } from '../../../../platform/progress/common/progress.js';
+import { IEditorWorkerService } from '../../../../editor/common/services/editorWorker.js';
+import { IUndoRedoService, UndoRedoGroup, UndoRedoSource } from '../../../../platform/undoRedo/common/undoRedo.js';
+import { SingleModelEditStackElement, MultiModelEditStackElement } from '../../../../editor/common/model/editStack.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ResourceTextEdit } from '../../../../editor/browser/services/bulkEditService.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { SnippetController2 } from '../../../../editor/contrib/snippet/browser/snippetController2.js';
+import { SnippetParser } from '../../../../editor/contrib/snippet/browser/snippetParser.js';
+import { ISnippetEdit } from '../../../../editor/contrib/snippet/browser/snippetSession.js';
 
 type ValidationResult = { canApply: true } | { canApply: false; reason: URI };
 
diff --git a/src/vs/workbench/contrib/bulkEdit/browser/conflicts.ts b/src/vs/workbench/contrib/bulkEdit/browser/conflicts.ts
index fd18958888b..23371d20aff 100644
--- a/src/vs/workbench/contrib/bulkEdit/browser/conflicts.ts
+++ b/src/vs/workbench/contrib/bulkEdit/browser/conflicts.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IFileService } from 'vs/platform/files/common/files';
-import { URI } from 'vs/base/common/uri';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ResourceMap } from 'vs/base/common/map';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { Emitter, Event } from 'vs/base/common/event';
-import { ITextModel } from 'vs/editor/common/model';
-import { ResourceEdit, ResourceFileEdit, ResourceTextEdit } from 'vs/editor/browser/services/bulkEditService';
-import { ResourceNotebookCellEdit } from 'vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
-import { ILogService } from 'vs/platform/log/common/log';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { ResourceEdit, ResourceFileEdit, ResourceTextEdit } from '../../../../editor/browser/services/bulkEditService.js';
+import { ResourceNotebookCellEdit } from './bulkCellEdits.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
 
 export class ConflictDetector {
 
diff --git a/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEdit.contribution.ts b/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEdit.contribution.ts
index 7e97fd01a69..23d62aa7e39 100644
--- a/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEdit.contribution.ts
+++ b/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEdit.contribution.ts
@@ -3,31 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Registry } from 'vs/platform/registry/common/platform';
-import { WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { IBulkEditService, ResourceEdit } from 'vs/editor/browser/services/bulkEditService';
-import { BulkEditPane } from 'vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPane';
-import { IViewContainersRegistry, Extensions as ViewContainerExtensions, ViewContainerLocation, IViewsRegistry } from 'vs/workbench/common/views';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { FocusedViewContext } from 'vs/workbench/common/contextkeys';
-import { localize, localize2 } from 'vs/nls';
-import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
-import { RawContextKey, IContextKeyService, IContextKey, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
-import { WorkbenchListFocusContextKey } from 'vs/platform/list/browser/listService';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { MenuId, registerAction2, Action2 } from 'vs/platform/actions/common/actions';
-import { EditorResourceAccessor, SideBySideEditor } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import type { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import Severity from 'vs/base/common/severity';
-import { Codicon } from 'vs/base/common/codicons';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
+import { Registry } from '../../../../../platform/registry/common/platform.js';
+import { WorkbenchPhase, registerWorkbenchContribution2 } from '../../../../common/contributions.js';
+import { IBulkEditService, ResourceEdit } from '../../../../../editor/browser/services/bulkEditService.js';
+import { BulkEditPane } from './bulkEditPane.js';
+import { IViewContainersRegistry, Extensions as ViewContainerExtensions, ViewContainerLocation, IViewsRegistry } from '../../../../common/views.js';
+import { IViewsService } from '../../../../services/views/common/viewsService.js';
+import { FocusedViewContext } from '../../../../common/contextkeys.js';
+import { localize, localize2 } from '../../../../../nls.js';
+import { ViewPaneContainer } from '../../../../browser/parts/views/viewPaneContainer.js';
+import { RawContextKey, IContextKeyService, IContextKey, ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeyMod, KeyCode } from '../../../../../base/common/keyCodes.js';
+import { WorkbenchListFocusContextKey } from '../../../../../platform/list/browser/listService.js';
+import { SyncDescriptor } from '../../../../../platform/instantiation/common/descriptors.js';
+import { MenuId, registerAction2, Action2 } from '../../../../../platform/actions/common/actions.js';
+import { EditorResourceAccessor, SideBySideEditor } from '../../../../common/editor.js';
+import { EditorInput } from '../../../../common/editor/editorInput.js';
+import type { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
+import Severity from '../../../../../base/common/severity.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { registerIcon } from '../../../../../platform/theme/common/iconRegistry.js';
+import { IPaneCompositePartService } from '../../../../services/panecomposite/browser/panecomposite.js';
 
 async function getBulkEditPane(viewsService: IViewsService): Promise<BulkEditPane | undefined> {
 	const view = await viewsService.openView(BulkEditPane.ID, true);
@@ -183,7 +183,7 @@ registerAction2(class ApplyAction extends Action2 {
 		});
 	}
 
-	async run(accessor: ServicesAccessor): Promise<any> {
+	async run(accessor: ServicesAccessor): Promise<void> {
 		const viewsService = accessor.get(IViewsService);
 		const view = await getBulkEditPane(viewsService);
 		view?.accept();
diff --git a/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPane.ts b/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPane.ts
index 36ef150418a..db7e87a2456 100644
--- a/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPane.ts
+++ b/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPane.ts
@@ -3,44 +3,44 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./bulkEdit';
-import { WorkbenchAsyncDataTree, IOpenEvent } from 'vs/platform/list/browser/listService';
-import { BulkEditElement, BulkEditDelegate, TextEditElementRenderer, FileElementRenderer, BulkEditDataSource, BulkEditIdentityProvider, FileElement, TextEditElement, BulkEditAccessibilityProvider, CategoryElementRenderer, BulkEditNaviLabelProvider, CategoryElement, BulkEditSorter, compareBulkFileOperations } from 'vs/workbench/contrib/bulkEdit/browser/preview/bulkEditTree';
-import { FuzzyScore } from 'vs/base/common/filters';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { localize } from 'vs/nls';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { BulkEditPreviewProvider, BulkFileOperation, BulkFileOperations, BulkFileOperationType } from 'vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPreview';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { URI } from 'vs/base/common/uri';
-import { ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService, RawContextKey, IContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
-import { ResourceLabels, IResourceLabelsContainer } from 'vs/workbench/browser/labels';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { ITreeContextMenuEvent } from 'vs/base/browser/ui/tree/tree';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import type { IAsyncDataTreeViewState } from 'vs/base/browser/ui/tree/asyncDataTree';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IViewDescriptorService } from 'vs/workbench/common/views';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { ResourceEdit } from 'vs/editor/browser/services/bulkEditService';
-import { ButtonBar } from 'vs/base/browser/ui/button/button';
-import { defaultButtonStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { Mutable } from 'vs/base/common/types';
-import { IResourceDiffEditorInput } from 'vs/workbench/common/editor';
-import { IMultiDiffEditorOptions, IMultiDiffResourceId } from 'vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl';
-import { IRange } from 'vs/editor/common/core/range';
-import { CachedFunction, LRUCachedFunction } from 'vs/base/common/cache';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import { ButtonBar } from '../../../../../base/browser/ui/button/button.js';
+import type { IAsyncDataTreeViewState } from '../../../../../base/browser/ui/tree/asyncDataTree.js';
+import { ITreeContextMenuEvent } from '../../../../../base/browser/ui/tree/tree.js';
+import { CachedFunction, LRUCachedFunction } from '../../../../../base/common/cache.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { FuzzyScore } from '../../../../../base/common/filters.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { Mutable } from '../../../../../base/common/types.js';
+import { URI } from '../../../../../base/common/uri.js';
+import './bulkEdit.css';
+import { ResourceEdit } from '../../../../../editor/browser/services/bulkEditService.js';
+import { IMultiDiffEditorOptions, IMultiDiffResourceId } from '../../../../../editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.js';
+import { IRange } from '../../../../../editor/common/core/range.js';
+import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
+import { localize } from '../../../../../nls.js';
+import { MenuId } from '../../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IContextKey, IContextKeyService, RawContextKey } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
+import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
+import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { ILabelService } from '../../../../../platform/label/common/label.js';
+import { IOpenEvent, WorkbenchAsyncDataTree } from '../../../../../platform/list/browser/listService.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { defaultButtonStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { ResourceLabels } from '../../../../browser/labels.js';
+import { ViewPane } from '../../../../browser/parts/views/viewPane.js';
+import { IViewletViewOptions } from '../../../../browser/parts/views/viewsViewlet.js';
+import { IMultiDiffEditorResource, IResourceDiffEditorInput } from '../../../../common/editor.js';
+import { IViewDescriptorService } from '../../../../common/views.js';
+import { BulkEditPreviewProvider, BulkFileOperation, BulkFileOperations, BulkFileOperationType } from './bulkEditPreview.js';
+import { BulkEditAccessibilityProvider, BulkEditDataSource, BulkEditDelegate, BulkEditElement, BulkEditIdentityProvider, BulkEditNaviLabelProvider, BulkEditSorter, CategoryElement, CategoryElementRenderer, compareBulkFileOperations, FileElement, FileElementRenderer, TextEditElement, TextEditElementRenderer } from './bulkEditTree.js';
+import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } from '../../../../services/editor/common/editorService.js';
 
 const enum State {
 	Data = 'data',
@@ -56,7 +56,7 @@ export class BulkEditPane extends ViewPane {
 	static readonly ctxGroupByFile = new RawContextKey('refactorPreview.groupByFile', true);
 	static readonly ctxHasCheckedChanges = new RawContextKey('refactorPreview.hasCheckedChanges', true);
 
-	private static readonly _memGroupByFile = `${BulkEditPane.ID}.groupByFile`;
+	private static readonly _memGroupByFile = `${this.ID}.groupByFile`;
 
 	private _tree!: WorkbenchAsyncDataTree<BulkFileOperations, BulkEditElement, FuzzyScore>;
 	private _treeDataSource!: BulkEditDataSource;
@@ -120,7 +120,7 @@ export class BulkEditPane extends ViewPane {
 
 		const resourceLabels = this._instaService.createInstance(
 			ResourceLabels,
-			<IResourceLabelsContainer>{ onDidChangeVisibility: this.onDidChangeBodyVisibility }
+			{ onDidChangeVisibility: this.onDidChangeBodyVisibility }
 		);
 		this._disposables.add(resourceLabels);
 
@@ -369,16 +369,20 @@ export class BulkEditPane extends ViewPane {
 		}, e.sideBySide ? SIDE_GROUP : ACTIVE_GROUP);
 	}
 
-	private readonly _computeResourceDiffEditorInputs = new LRUCachedFunction(async (fileOperations: BulkFileOperation[]) => {
-		const computeDiffEditorInput = new CachedFunction<BulkFileOperation, Promise<IResourceDiffEditorInput>>(async (fileOperation) => {
+	private readonly _computeResourceDiffEditorInputs = new LRUCachedFunction<
+		BulkFileOperation[],
+		Promise<{ resources: IMultiDiffEditorResource[]; getResourceDiffEditorInputIdOfOperation: (operation: BulkFileOperation) => Promise<IMultiDiffResourceId> }>
+	>(async (fileOperations) => {
+		const computeDiffEditorInput = new CachedFunction<BulkFileOperation, Promise<IMultiDiffEditorResource>>(async (fileOperation) => {
 			const fileOperationUri = fileOperation.uri;
 			const previewUri = this._currentProvider!.asPreviewUri(fileOperationUri);
 			// delete
 			if (fileOperation.type & BulkFileOperationType.Delete) {
 				return {
 					original: { resource: URI.revive(previewUri) },
-					modified: { resource: undefined }
-				};
+					modified: { resource: undefined },
+					goToFileResource: fileOperation.uri,
+				} satisfies IMultiDiffEditorResource;
 
 			}
 			// rename, create, edits
@@ -392,8 +396,9 @@ export class BulkEditPane extends ViewPane {
 				}
 				return {
 					original: { resource: URI.revive(leftResource) },
-					modified: { resource: URI.revive(previewUri) }
-				};
+					modified: { resource: URI.revive(previewUri) },
+					goToFileResource: leftResource,
+				} satisfies IMultiDiffEditorResource;
 			}
 		});
 
diff --git a/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPreview.ts b/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPreview.ts
index 40fbb606f8b..ad2d7ebb97e 100644
--- a/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPreview.ts
+++ b/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPreview.ts
@@ -3,28 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ITextModelContentProvider, ITextModelService } from 'vs/editor/common/services/resolverService';
-import { URI } from 'vs/base/common/uri';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IModelService } from 'vs/editor/common/services/model';
-import { createTextBufferFactoryFromSnapshot } from 'vs/editor/common/model/textModel';
-import { WorkspaceEditMetadata } from 'vs/editor/common/languages';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { coalesceInPlace } from 'vs/base/common/arrays';
-import { Range } from 'vs/editor/common/core/range';
-import { EditOperation, ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IFileService } from 'vs/platform/files/common/files';
-import { Emitter, Event } from 'vs/base/common/event';
-import { ConflictDetector } from 'vs/workbench/contrib/bulkEdit/browser/conflicts';
-import { ResourceMap } from 'vs/base/common/map';
-import { localize } from 'vs/nls';
-import { extUri } from 'vs/base/common/resources';
-import { ResourceEdit, ResourceFileEdit, ResourceTextEdit } from 'vs/editor/browser/services/bulkEditService';
-import { Codicon } from 'vs/base/common/codicons';
-import { generateUuid } from 'vs/base/common/uuid';
-import { SnippetParser } from 'vs/editor/contrib/snippet/browser/snippetParser';
-import { MicrotaskDelay } from 'vs/base/common/symbols';
+import { ITextModelContentProvider, ITextModelService } from '../../../../../editor/common/services/resolverService.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
+import { IModelService } from '../../../../../editor/common/services/model.js';
+import { createTextBufferFactoryFromSnapshot } from '../../../../../editor/common/model/textModel.js';
+import { WorkspaceEditMetadata } from '../../../../../editor/common/languages.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { coalesceInPlace } from '../../../../../base/common/arrays.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { EditOperation, ISingleEditOperation } from '../../../../../editor/common/core/editOperation.js';
+import { ServicesAccessor, IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { ConflictDetector } from '../conflicts.js';
+import { ResourceMap } from '../../../../../base/common/map.js';
+import { localize } from '../../../../../nls.js';
+import { extUri } from '../../../../../base/common/resources.js';
+import { ResourceEdit, ResourceFileEdit, ResourceTextEdit } from '../../../../../editor/browser/services/bulkEditService.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { generateUuid } from '../../../../../base/common/uuid.js';
+import { SnippetParser } from '../../../../../editor/contrib/snippet/browser/snippetParser.js';
+import { MicrotaskDelay } from '../../../../../base/common/symbols.js';
 
 export class CheckedStates<T extends object> {
 
@@ -307,18 +307,26 @@ export class BulkFileOperations {
 		return result;
 	}
 
-	getFileEdits(uri: URI): ISingleEditOperation[] {
+	private async getFileEditOperation(edit: ResourceFileEdit): Promise<ISingleEditOperation | undefined> {
+		const content = await edit.options.contents;
+		if (!content) { return undefined; }
+		return EditOperation.replaceMove(Range.lift({ startLineNumber: 0, startColumn: 0, endLineNumber: Number.MAX_VALUE, endColumn: 0 }), content.toString());
+	}
+
+	async getFileEdits(uri: URI): Promise<ISingleEditOperation[]> {
 
 		for (const file of this.fileOperations) {
 			if (file.uri.toString() === uri.toString()) {
 
-				const result: ISingleEditOperation[] = [];
+				const result: Promise<ISingleEditOperation | undefined>[] = [];
 				let ignoreAll = false;
 
 				for (const edit of file.originalEdits.values()) {
-					if (edit instanceof ResourceTextEdit) {
+					if (edit instanceof ResourceFileEdit) {
+						result.push(this.getFileEditOperation(edit));
+					} else if (edit instanceof ResourceTextEdit) {
 						if (this.checked.isChecked(edit)) {
-							result.push(EditOperation.replaceMove(Range.lift(edit.textEdit.range), !edit.textEdit.insertAsSnippet ? edit.textEdit.text : SnippetParser.asInsertText(edit.textEdit.text)));
+							result.push(Promise.resolve(EditOperation.replaceMove(Range.lift(edit.textEdit.range), !edit.textEdit.insertAsSnippet ? edit.textEdit.text : SnippetParser.asInsertText(edit.textEdit.text))));
 						}
 
 					} else if (!this.checked.isChecked(edit)) {
@@ -331,7 +339,7 @@ export class BulkFileOperations {
 					return [];
 				}
 
-				return result.sort((a, b) => Range.compareRangesUsingStarts(a.range, b.range));
+				return (await Promise.all(result)).filter(r => r !== undefined).sort((a, b) => Range.compareRangesUsingStarts(a.range, b.range));
 			}
 		}
 		return [];
@@ -353,7 +361,7 @@ export class BulkEditPreviewProvider implements ITextModelContentProvider {
 
 	private static readonly Schema = 'vscode-bulkeditpreview-editor';
 
-	static emptyPreview = URI.from({ scheme: BulkEditPreviewProvider.Schema, fragment: 'empty' });
+	static emptyPreview = URI.from({ scheme: this.Schema, fragment: 'empty' });
 
 
 	static fromPreviewUri(uri: URI): URI {
@@ -402,7 +410,7 @@ export class BulkEditPreviewProvider implements ITextModelContentProvider {
 			model.applyEdits(undoEdits);
 		}
 		// apply new edits and keep (future) undo edits
-		const newEdits = this._operations.getFileEdits(uri);
+		const newEdits = await this._operations.getFileEdits(uri);
 		const newUndoEdits = model.applyEdits(newEdits, true);
 		this._modelPreviewEdits.set(model.id, newUndoEdits);
 	}
diff --git a/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditTree.ts b/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditTree.ts
index e45a95008c3..afb2187645e 100644
--- a/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditTree.ts
+++ b/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditTree.ts
@@ -3,35 +3,33 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IAsyncDataSource, ITreeRenderer, ITreeNode, ITreeSorter } from 'vs/base/browser/ui/tree/tree';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { FuzzyScore, createMatches } from 'vs/base/common/filters';
-import { IResourceLabel, ResourceLabels } from 'vs/workbench/browser/labels';
-import { HighlightedLabel, IHighlight } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
-import { IIdentityProvider, IListVirtualDelegate, IKeyboardNavigationLabelProvider } from 'vs/base/browser/ui/list/list';
-import { Range } from 'vs/editor/common/core/range';
-import * as dom from 'vs/base/browser/dom';
-import { ITextModel } from 'vs/editor/common/model';
-import { IDisposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { TextModel } from 'vs/editor/common/model/textModel';
-import { BulkFileOperations, BulkFileOperation, BulkFileOperationType, BulkTextEdit, BulkCategory } from 'vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPreview';
-import { FileKind } from 'vs/platform/files/common/files';
-import { localize } from 'vs/nls';
-import { ILabelService } from 'vs/platform/label/common/label';
-import type { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
-import { IconLabel } from 'vs/base/browser/ui/iconLabel/iconLabel';
-import { basename } from 'vs/base/common/resources';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { compare } from 'vs/base/common/strings';
-import { URI } from 'vs/base/common/uri';
-import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
-import { ResourceFileEdit } from 'vs/editor/browser/services/bulkEditService';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { SnippetParser } from 'vs/editor/contrib/snippet/browser/snippetParser';
-import { AriaRole } from 'vs/base/browser/ui/aria/aria';
+import { IAsyncDataSource, ITreeRenderer, ITreeNode, ITreeSorter } from '../../../../../base/browser/ui/tree/tree.js';
+import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
+import { FuzzyScore, createMatches } from '../../../../../base/common/filters.js';
+import { IResourceLabel, ResourceLabels } from '../../../../browser/labels.js';
+import { HighlightedLabel, IHighlight } from '../../../../../base/browser/ui/highlightedlabel/highlightedLabel.js';
+import { IIdentityProvider, IListVirtualDelegate, IKeyboardNavigationLabelProvider } from '../../../../../base/browser/ui/list/list.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import * as dom from '../../../../../base/browser/dom.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
+import { IDisposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { TextModel } from '../../../../../editor/common/model/textModel.js';
+import { BulkFileOperations, BulkFileOperation, BulkFileOperationType, BulkTextEdit, BulkCategory } from './bulkEditPreview.js';
+import { FileKind } from '../../../../../platform/files/common/files.js';
+import { localize } from '../../../../../nls.js';
+import { ILabelService } from '../../../../../platform/label/common/label.js';
+import type { IListAccessibilityProvider } from '../../../../../base/browser/ui/list/listWidget.js';
+import { IconLabel } from '../../../../../base/browser/ui/iconLabel/iconLabel.js';
+import { basename } from '../../../../../base/common/resources.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { compare } from '../../../../../base/common/strings.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ResourceFileEdit } from '../../../../../editor/browser/services/bulkEditService.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../../../../../editor/common/languages/modesRegistry.js';
+import { SnippetParser } from '../../../../../editor/contrib/snippet/browser/snippetParser.js';
+import { AriaRole } from '../../../../../base/browser/ui/aria/aria.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 
 // --- VIEW MODEL
 
@@ -202,9 +200,7 @@ export class BulkEditDataSource implements IAsyncDataSource<BulkFileOperations,
 
 	constructor(
 		@ITextModelService private readonly _textModelService: ITextModelService,
-		@IUndoRedoService private readonly _undoRedoService: IUndoRedoService,
-		@ILanguageService private readonly _languageService: ILanguageService,
-		@ILanguageConfigurationService private readonly _languageConfigurationService: ILanguageConfigurationService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 	) { }
 
 	hasChildren(element: BulkFileOperations | BulkEditElement): boolean {
@@ -241,7 +237,7 @@ export class BulkEditDataSource implements IAsyncDataSource<BulkFileOperations,
 				textModel = ref.object.textEditorModel;
 				textModelDisposable = ref;
 			} catch {
-				textModel = new TextModel('', PLAINTEXT_LANGUAGE_ID, TextModel.DEFAULT_CREATION_OPTIONS, null, this._undoRedoService, this._languageService, this._languageConfigurationService);
+				textModel = this._instantiationService.createInstance(TextModel, '', PLAINTEXT_LANGUAGE_ID, TextModel.DEFAULT_CREATION_OPTIONS, null);
 				textModelDisposable = textModel;
 			}
 
diff --git a/src/vs/workbench/contrib/bulkEdit/test/browser/bulkCellEdits.test.ts b/src/vs/workbench/contrib/bulkEdit/test/browser/bulkCellEdits.test.ts
index dc00b4d61d2..042c3cfc9c5 100644
--- a/src/vs/workbench/contrib/bulkEdit/test/browser/bulkCellEdits.test.ts
+++ b/src/vs/workbench/contrib/bulkEdit/test/browser/bulkCellEdits.test.ts
@@ -4,17 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { URI } from 'vs/base/common/uri';
-import { mockObject } from 'vs/base/test/common/mock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IProgress } from 'vs/platform/progress/common/progress';
-import { UndoRedoGroup, UndoRedoSource } from 'vs/platform/undoRedo/common/undoRedo';
-import { BulkCellEdits, ResourceNotebookCellEdit } from 'vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { CellEditType, CellUri, IResolvedNotebookEditorModel } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotebookEditorModelResolverService } from 'vs/workbench/contrib/notebook/common/notebookEditorModelResolverService';
-import { TestEditorService } from 'vs/workbench/test/browser/workbenchTestServices';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { mockObject } from '../../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IProgress } from '../../../../../platform/progress/common/progress.js';
+import { UndoRedoGroup, UndoRedoSource } from '../../../../../platform/undoRedo/common/undoRedo.js';
+import { BulkCellEdits, ResourceNotebookCellEdit } from '../../browser/bulkCellEdits.js';
+import { NotebookTextModel } from '../../../notebook/common/model/notebookTextModel.js';
+import { CellEditType, CellUri, IResolvedNotebookEditorModel } from '../../../notebook/common/notebookCommon.js';
+import { INotebookEditorModelResolverService } from '../../../notebook/common/notebookEditorModelResolverService.js';
+import { TestEditorService } from '../../../../test/browser/workbenchTestServices.js';
 
 suite('BulkCellEdits', function () {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/contrib/bulkEdit/test/browser/bulkEditPreview.test.ts b/src/vs/workbench/contrib/bulkEdit/test/browser/bulkEditPreview.test.ts
index 50cd0b41f8c..d4aaa7577f3 100644
--- a/src/vs/workbench/contrib/bulkEdit/test/browser/bulkEditPreview.test.ts
+++ b/src/vs/workbench/contrib/bulkEdit/test/browser/bulkEditPreview.test.ts
@@ -4,18 +4,18 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Event } from 'vs/base/common/event';
-import { IFileService } from 'vs/platform/files/common/files';
-import { mock } from 'vs/workbench/test/common/workbenchTestServices';
-import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IModelService } from 'vs/editor/common/services/model';
-import { URI } from 'vs/base/common/uri';
-import { BulkFileOperations } from 'vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPreview';
-import { Range } from 'vs/editor/common/core/range';
-import { ResourceFileEdit, ResourceTextEdit } from 'vs/editor/browser/services/bulkEditService';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { Event } from '../../../../../base/common/event.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { mock } from '../../../../test/common/workbenchTestServices.js';
+import { InstantiationService } from '../../../../../platform/instantiation/common/instantiationService.js';
+import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IModelService } from '../../../../../editor/common/services/model.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { BulkFileOperations } from '../../browser/preview/bulkEditPreview.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { ResourceFileEdit, ResourceTextEdit } from '../../../../../editor/browser/services/bulkEditService.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('BulkEditPreview', function () {
 
diff --git a/src/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution.ts b/src/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution.ts
index a68eaeed3c3..fb48c5cd1bb 100644
--- a/src/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution.ts
+++ b/src/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution.ts
@@ -3,29 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize, localize2 } from 'vs/nls';
-import { CallHierarchyProviderRegistry, CallHierarchyDirection, CallHierarchyModel } from 'vs/workbench/contrib/callHierarchy/common/callHierarchy';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { CallHierarchyTreePeekWidget } from 'vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek';
-import { Event } from 'vs/base/common/event';
-import { registerEditorContribution, EditorAction2, EditorContributionInstantiation } from 'vs/editor/browser/editorExtensions';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IContextKeyService, RawContextKey, IContextKey, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { PeekContext } from 'vs/editor/contrib/peekView/browser/peekView';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { Range } from 'vs/editor/common/core/range';
-import { IPosition } from 'vs/editor/common/core/position';
-import { MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { Codicon } from 'vs/base/common/codicons';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { isCancellationError } from 'vs/base/common/errors';
+import { localize, localize2 } from '../../../../nls.js';
+import { CallHierarchyProviderRegistry, CallHierarchyDirection, CallHierarchyModel } from '../common/callHierarchy.js';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { CallHierarchyTreePeekWidget } from './callHierarchyPeek.js';
+import { Event } from '../../../../base/common/event.js';
+import { registerEditorContribution, EditorAction2, EditorContributionInstantiation } from '../../../../editor/browser/editorExtensions.js';
+import { IEditorContribution } from '../../../../editor/common/editorCommon.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { IContextKeyService, RawContextKey, IContextKey, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
+import { PeekContext } from '../../../../editor/contrib/peekView/browser/peekView.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { IPosition } from '../../../../editor/common/core/position.js';
+import { MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { isCancellationError } from '../../../../base/common/errors.js';
 
 const _ctxHasCallHierarchyProvider = new RawContextKey<boolean>('editorHasCallHierarchyProvider', false, localize('editorHasCallHierarchyProvider', 'Whether a call hierarchy provider is available'));
 const _ctxCallHierarchyVisible = new RawContextKey<boolean>('callHierarchyVisible', false, localize('callHierarchyVisible', 'Whether call hierarchy peek is currently showing'));
diff --git a/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek.ts b/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek.ts
index 3dada0c5698..3b4ab40d0ef 100644
--- a/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek.ts
+++ b/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek.ts
@@ -3,37 +3,37 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/callHierarchy';
-import * as peekView from 'vs/editor/contrib/peekView/browser/peekView';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { CallHierarchyDirection, CallHierarchyModel } from 'vs/workbench/contrib/callHierarchy/common/callHierarchy';
-import { WorkbenchAsyncDataTree, IWorkbenchAsyncDataTreeOptions } from 'vs/platform/list/browser/listService';
-import { FuzzyScore } from 'vs/base/common/filters';
-import * as callHTree from 'vs/workbench/contrib/callHierarchy/browser/callHierarchyTree';
-import { IAsyncDataTreeViewState } from 'vs/base/browser/ui/tree/asyncDataTree';
-import { localize } from 'vs/nls';
-import { ScrollType } from 'vs/editor/common/editorCommon';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { SplitView, Orientation, Sizing } from 'vs/base/browser/ui/splitview/splitview';
-import { Dimension, isKeyboardEvent } from 'vs/base/browser/dom';
-import { Event } from 'vs/base/common/event';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget';
-import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { toDisposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { TrackedRangeStickiness, IModelDeltaDecoration, IModelDecorationOptions, OverviewRulerLane } from 'vs/editor/common/model';
-import { themeColorFromId, IThemeService, IColorTheme } from 'vs/platform/theme/common/themeService';
-import { IPosition } from 'vs/editor/common/core/position';
-import { IAction } from 'vs/base/common/actions';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { Color } from 'vs/base/common/color';
-import { TreeMouseEventTarget, ITreeNode } from 'vs/base/browser/ui/tree/tree';
-import { URI } from 'vs/base/common/uri';
-import { MenuId, IMenuService } from 'vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
+import './media/callHierarchy.css';
+import * as peekView from '../../../../editor/contrib/peekView/browser/peekView.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { CallHierarchyDirection, CallHierarchyModel } from '../common/callHierarchy.js';
+import { WorkbenchAsyncDataTree, IWorkbenchAsyncDataTreeOptions } from '../../../../platform/list/browser/listService.js';
+import { FuzzyScore } from '../../../../base/common/filters.js';
+import * as callHTree from './callHierarchyTree.js';
+import { IAsyncDataTreeViewState } from '../../../../base/browser/ui/tree/asyncDataTree.js';
+import { localize } from '../../../../nls.js';
+import { ScrollType } from '../../../../editor/common/editorCommon.js';
+import { IRange, Range } from '../../../../editor/common/core/range.js';
+import { SplitView, Orientation, Sizing } from '../../../../base/browser/ui/splitview/splitview.js';
+import { Dimension, isKeyboardEvent } from '../../../../base/browser/dom.js';
+import { Event } from '../../../../base/common/event.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { EmbeddedCodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/embeddedCodeEditorWidget.js';
+import { IEditorOptions } from '../../../../editor/common/config/editorOptions.js';
+import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { toDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { TrackedRangeStickiness, IModelDeltaDecoration, IModelDecorationOptions, OverviewRulerLane } from '../../../../editor/common/model.js';
+import { themeColorFromId, IThemeService, IColorTheme } from '../../../../platform/theme/common/themeService.js';
+import { IPosition } from '../../../../editor/common/core/position.js';
+import { IAction } from '../../../../base/common/actions.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { Color } from '../../../../base/common/color.js';
+import { TreeMouseEventTarget, ITreeNode } from '../../../../base/browser/ui/tree/tree.js';
+import { URI } from '../../../../base/common/uri.js';
+import { MenuId, IMenuService } from '../../../../platform/actions/common/actions.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { createAndFillInActionBarActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 
 const enum State {
 	Loading = 'loading',
diff --git a/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyTree.ts b/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyTree.ts
index 9021108e90d..160d73e72b8 100644
--- a/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyTree.ts
+++ b/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyTree.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IAsyncDataSource, ITreeRenderer, ITreeNode, ITreeSorter } from 'vs/base/browser/ui/tree/tree';
-import { CallHierarchyItem, CallHierarchyDirection, CallHierarchyModel, } from 'vs/workbench/contrib/callHierarchy/common/callHierarchy';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IIdentityProvider, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { FuzzyScore, createMatches } from 'vs/base/common/filters';
-import { IconLabel } from 'vs/base/browser/ui/iconLabel/iconLabel';
-import { SymbolKinds, Location, SymbolTag } from 'vs/editor/common/languages';
-import { compare } from 'vs/base/common/strings';
-import { Range } from 'vs/editor/common/core/range';
-import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
-import { localize } from 'vs/nls';
-import { ThemeIcon } from 'vs/base/common/themables';
+import { IAsyncDataSource, ITreeRenderer, ITreeNode, ITreeSorter } from '../../../../base/browser/ui/tree/tree.js';
+import { CallHierarchyItem, CallHierarchyDirection, CallHierarchyModel, } from '../common/callHierarchy.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IIdentityProvider, IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
+import { FuzzyScore, createMatches } from '../../../../base/common/filters.js';
+import { IconLabel } from '../../../../base/browser/ui/iconLabel/iconLabel.js';
+import { SymbolKinds, Location, SymbolTag } from '../../../../editor/common/languages.js';
+import { compare } from '../../../../base/common/strings.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { IListAccessibilityProvider } from '../../../../base/browser/ui/list/listWidget.js';
+import { localize } from '../../../../nls.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
 
 export class Call {
 	constructor(
diff --git a/src/vs/workbench/contrib/callHierarchy/common/callHierarchy.ts b/src/vs/workbench/contrib/callHierarchy/common/callHierarchy.ts
index 181d4cf3335..c0ea84d13a7 100644
--- a/src/vs/workbench/contrib/callHierarchy/common/callHierarchy.ts
+++ b/src/vs/workbench/contrib/callHierarchy/common/callHierarchy.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IRange } from 'vs/editor/common/core/range';
-import { SymbolKind, ProviderResult, SymbolTag } from 'vs/editor/common/languages';
-import { ITextModel } from 'vs/editor/common/model';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import { URI } from 'vs/base/common/uri';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { isNonEmptyArray } from 'vs/base/common/arrays';
-import { onUnexpectedExternalError } from 'vs/base/common/errors';
-import { IDisposable, RefCountedDisposable } from 'vs/base/common/lifecycle';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { assertType } from 'vs/base/common/types';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
+import { IRange } from '../../../../editor/common/core/range.js';
+import { SymbolKind, ProviderResult, SymbolTag } from '../../../../editor/common/languages.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { LanguageFeatureRegistry } from '../../../../editor/common/languageFeatureRegistry.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IPosition, Position } from '../../../../editor/common/core/position.js';
+import { isNonEmptyArray } from '../../../../base/common/arrays.js';
+import { onUnexpectedExternalError } from '../../../../base/common/errors.js';
+import { IDisposable, RefCountedDisposable } from '../../../../base/common/lifecycle.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { assertType } from '../../../../base/common/types.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
 
 export const enum CallHierarchyDirection {
 	CallsTo = 'incomingCalls',
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.ts b/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.ts
index e7374ecb565..f463e641a8c 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.ts
@@ -3,29 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { IChatWidgetService } from 'vs/workbench/contrib/chat/browser/chat';
-import { AccessibleViewProviderId, AccessibleViewType } from 'vs/platform/accessibility/browser/accessibleView';
-import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { AccessibleDiffViewerNext } from 'vs/editor/browser/widget/diffEditor/commands';
-import { INLINE_CHAT_ID } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { CONTEXT_IN_CHAT_SESSION, CONTEXT_RESPONSE, CONTEXT_REQUEST } from 'vs/workbench/contrib/chat/common/chatContextKeys';
-import { IAccessibleViewImplentation } from 'vs/platform/accessibility/browser/accessibleViewRegistry';
+import { localize } from '../../../../../nls.js';
+import { ICodeEditor } from '../../../../../editor/browser/editorBrowser.js';
+import { ServicesAccessor } from '../../../../../editor/browser/editorExtensions.js';
+import { IChatWidgetService } from '../chat.js';
+import { AccessibleViewProviderId, AccessibleViewType, AccessibleContentProvider } from '../../../../../platform/accessibility/browser/accessibleView.js';
+import { AccessibilityVerbositySettingId } from '../../../accessibility/browser/accessibilityConfiguration.js';
+import { AccessibleDiffViewerNext } from '../../../../../editor/browser/widget/diffEditor/commands.js';
+import { INLINE_CHAT_ID } from '../../../inlineChat/common/inlineChat.js';
+import { ICodeEditorService } from '../../../../../editor/browser/services/codeEditorService.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { CONTEXT_IN_CHAT_SESSION, CONTEXT_RESPONSE, CONTEXT_REQUEST, CONTEXT_CHAT_LOCATION } from '../../common/chatContextKeys.js';
+import { IAccessibleViewImplentation } from '../../../../../platform/accessibility/browser/accessibleViewRegistry.js';
+import { ChatAgentLocation } from '../../common/chatAgents.js';
 
 export class ChatAccessibilityHelp implements IAccessibleViewImplentation {
-	readonly priority = 105;
+	readonly priority = 107;
 	readonly name = 'panelChat';
 	readonly type = AccessibleViewType.Help;
-	readonly when = ContextKeyExpr.or(CONTEXT_IN_CHAT_SESSION, CONTEXT_RESPONSE, CONTEXT_REQUEST);
+	readonly when = ContextKeyExpr.and(CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Panel), ContextKeyExpr.or(CONTEXT_IN_CHAT_SESSION, CONTEXT_RESPONSE, CONTEXT_REQUEST));
 	getProvider(accessor: ServicesAccessor) {
 		const codeEditor = accessor.get(ICodeEditorService).getActiveCodeEditor() || accessor.get(ICodeEditorService).getFocusedCodeEditor();
 		return getChatAccessibilityHelpProvider(accessor, codeEditor ?? undefined, 'panelChat');
 	}
-	dispose() { }
 }
 
 export function getAccessibilityHelpText(type: 'panelChat' | 'inlineChat'): string {
@@ -33,26 +33,26 @@ export function getAccessibilityHelpText(type: 'panelChat' | 'inlineChat'): stri
 	if (type === 'panelChat') {
 		content.push(localize('chat.overview', 'The chat view is comprised of an input box and a request/response list. The input box is used to make requests and the list is used to display responses.'));
 		content.push(localize('chat.requestHistory', 'In the input box, use up and down arrows to navigate your request history. Edit input and use enter or the submit button to run a new request.'));
-		content.push(localize('chat.inspectResponse', 'In the input box, inspect the last response in the accessible view<keybinding:editor.action.accessibleView>'));
+		content.push(localize('chat.inspectResponse', 'In the input box, inspect the last response in the accessible view{0}.', '<keybinding:editor.action.accessibleView>'));
 		content.push(localize('chat.followUp', 'In the input box, navigate to the suggested follow up question (Shift+Tab) and press Enter to run it.'));
 		content.push(localize('chat.announcement', 'Chat responses will be announced as they come in. A response will indicate the number of code blocks, if any, and then the rest of the response.'));
-		content.push(localize('workbench.action.chat.focus', 'To focus the chat request/response list, which can be navigated with up and down arrows, invoke the Focus Chat command<keybinding:chat.action.focus>.'));
-		content.push(localize('workbench.action.chat.focusInput', 'To focus the input box for chat requests, invoke the Focus Chat Input command<keybinding:workbench.action.chat.focusInput>.'));
-		content.push(localize('workbench.action.chat.nextCodeBlock', 'To focus the next code block within a response, invoke the Chat: Next Code Block command<keybinding:workbench.action.chat.nextCodeBlock>.'));
-		content.push(localize('workbench.action.chat.nextFileTree', 'To focus the next file tree within a response, invoke the Chat: Next File Tree command<keybinding:workbench.action.chat.nextFileTree>.'));
-		content.push(localize('workbench.action.chat.clear', 'To clear the request/response list, invoke the Chat Clear command<keybinding:workbench.action.chat.clear>.'));
+		content.push(localize('workbench.action.chat.focus', 'To focus the chat request/response list, which can be navigated with up and down arrows, invoke the Focus Chat command{0}.', '<keybinding:chat.action.focus>'));
+		content.push(localize('workbench.action.chat.focusInput', 'To focus the input box for chat requests, invoke the Focus Chat Input command{0}.', '<keybinding:workbench.action.chat.focusInput>'));
+		content.push(localize('workbench.action.chat.nextCodeBlock', 'To focus the next code block within a response, invoke the Chat: Next Code Block command{0}.', '<keybinding:workbench.action.chat.nextCodeBlock>'));
+		content.push(localize('workbench.action.chat.nextFileTree', 'To focus the next file tree within a response, invoke the Chat: Next File Tree command{0}.', '<keybinding:workbench.action.chat.nextFileTree>'));
+		content.push(localize('workbench.action.chat.newChat', 'To create a new chat session, invoke the New Chat command{0}.', '<keybinding:workbench.action.chat.new>'));
 	} else {
 		content.push(localize('inlineChat.overview', "Inline chat occurs within a code editor and takes into account the current selection. It is useful for making changes to the current editor. For example, fixing diagnostics, documenting or refactoring code. Keep in mind that AI generated code may be incorrect."));
-		content.push(localize('inlineChat.access', "It can be activated via code actions or directly using the command: Inline Chat: Start Inline Chat<keybinding:inlineChat.start>."));
-		content.push(localize('inlineChat.requestHistory', 'In the input box, use<keybinding:inlineChat.previousFromHistory> and<keybinding:inlineChat.nextFromHistory> to navigate your request history. Edit input and use enter or the submit button to run a new request.'));
-		content.push(localize('inlineChat.inspectResponse', 'In the input box, inspect the response in the accessible viewview<keybinding:editor.action.accessibleView>'));
+		content.push(localize('inlineChat.access', "It can be activated via code actions or directly using the command: Inline Chat: Start Inline Chat{0}.", '<keybinding:inlineChat.start>'));
+		content.push(localize('inlineChat.requestHistory', 'In the input box, use Show Previous{0} and Show Next{1} to navigate your request history. Edit input and use enter or the submit button to run a new request.', '<keybinding:history.showPrevious>', '<keybinding:history.showNext>'));
+		content.push(localize('inlineChat.inspectResponse', 'In the input box, inspect the response in the accessible view{0}.', '<keybinding:editor.action.accessibleView>'));
 		content.push(localize('inlineChat.contextActions', "Context menu actions may run a request prefixed with a /. Type / to discover such ready-made commands."));
 		content.push(localize('inlineChat.fix', "If a fix action is invoked, a response will indicate the problem with the current code. A diff editor will be rendered and can be reached by tabbing."));
-		content.push(localize('inlineChat.diff', "Once in the diff editor, enter review mode with<keybinding:{0}>. Use up and down arrows to navigate lines with the proposed changes.", AccessibleDiffViewerNext.id));
+		content.push(localize('inlineChat.diff', "Once in the diff editor, enter review mode with{0}. Use up and down arrows to navigate lines with the proposed changes.", AccessibleDiffViewerNext.id));
 		content.push(localize('inlineChat.toolbar', "Use tab to reach conditional parts like commands, status, message responses and more."));
 	}
 	content.push(localize('chat.signals', "Accessibility Signals can be changed via settings with a prefix of signals.chat. By default, if a request takes more than 4 seconds, you will hear a sound indicating that progress is still occurring."));
-	return content.join('\n\n');
+	return content.join('\n');
 }
 
 export function getChatAccessibilityHelpProvider(accessor: ServicesAccessor, editor: ICodeEditor | undefined, type: 'panelChat' | 'inlineChat') {
@@ -70,11 +70,11 @@ export function getChatAccessibilityHelpProvider(accessor: ServicesAccessor, edi
 	const cachedPosition = inputEditor.getPosition();
 	inputEditor.getSupportedActions();
 	const helpText = getAccessibilityHelpText(type);
-	return {
-		id: type === 'panelChat' ? AccessibleViewProviderId.Chat : AccessibleViewProviderId.InlineChat,
-		verbositySettingKey: type === 'panelChat' ? AccessibilityVerbositySettingId.Chat : AccessibilityVerbositySettingId.InlineChat,
-		provideContent: () => helpText,
-		onClose: () => {
+	return new AccessibleContentProvider(
+		type === 'panelChat' ? AccessibleViewProviderId.Chat : AccessibleViewProviderId.InlineChat,
+		{ type: AccessibleViewType.Help },
+		() => helpText,
+		() => {
 			if (type === 'panelChat' && cachedPosition) {
 				inputEditor.setPosition(cachedPosition);
 				inputEditor.focus();
@@ -86,6 +86,6 @@ export function getChatAccessibilityHelpProvider(accessor: ServicesAccessor, edi
 
 			}
 		},
-		options: { type: AccessibleViewType.Help }
-	};
+		type === 'panelChat' ? AccessibilityVerbositySettingId.Chat : AccessibilityVerbositySettingId.InlineChat,
+	);
 }
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
index bf426bec1b8..65fd15c1f00 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
@@ -3,30 +3,41 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from 'vs/base/common/codicons';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction2, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { localize, localize2 } from 'vs/nls';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IsLinuxContext, IsWindowsContext } from 'vs/platform/contextkey/common/contextkeys';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { IQuickInputButton, IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { ViewAction } from 'vs/workbench/browser/parts/views/viewPane';
-import { CHAT_VIEW_ID, IChatWidgetService, showChatView } from 'vs/workbench/contrib/chat/browser/chat';
-import { IChatEditorOptions } from 'vs/workbench/contrib/chat/browser/chatEditor';
-import { ChatEditorInput } from 'vs/workbench/contrib/chat/browser/chatEditorInput';
-import { ChatViewPane } from 'vs/workbench/contrib/chat/browser/chatViewPane';
-import { ChatAgentLocation } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { CONTEXT_CHAT_INPUT_CURSOR_AT_TOP, CONTEXT_CHAT_LOCATION, CONTEXT_IN_CHAT_INPUT, CONTEXT_IN_CHAT_SESSION, CONTEXT_CHAT_ENABLED } from 'vs/workbench/contrib/chat/common/chatContextKeys';
-import { IChatDetail, IChatService } from 'vs/workbench/contrib/chat/common/chatService';
-import { IChatRequestViewModel, IChatResponseViewModel, isRequestVM } from 'vs/workbench/contrib/chat/common/chatViewModel';
-import { IChatWidgetHistoryService } from 'vs/workbench/contrib/chat/common/chatWidgetHistoryService';
-import { ACTIVE_GROUP, IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
+import { coalesce } from '../../../../../base/common/arrays.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { fromNowByDay } from '../../../../../base/common/date.js';
+import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { ICodeEditor } from '../../../../../editor/browser/editorBrowser.js';
+import { EditorAction2, ServicesAccessor } from '../../../../../editor/browser/editorExtensions.js';
+import { localize, localize2 } from '../../../../../nls.js';
+import { Action2, MenuId, MenuItemAction, MenuRegistry, registerAction2, SubmenuItemAction } from '../../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IsLinuxContext, IsWindowsContext } from '../../../../../platform/contextkey/common/contextkeys.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IQuickInputButton, IQuickInputService, IQuickPickItem, IQuickPickSeparator } from '../../../../../platform/quickinput/common/quickInput.js';
+import { clearChatEditor } from './chatClear.js';
+import { CHAT_VIEW_ID, IChatWidget, IChatWidgetService, showChatView } from '../chat.js';
+import { IChatEditorOptions } from '../chatEditor.js';
+import { ChatEditorInput } from '../chatEditorInput.js';
+import { ChatViewPane } from '../chatViewPane.js';
+import { CONTEXT_CHAT_ENABLED, CONTEXT_CHAT_INPUT_CURSOR_AT_TOP, CONTEXT_CHAT_LOCATION, CONTEXT_IN_CHAT_INPUT, CONTEXT_IN_CHAT_SESSION, CONTEXT_IN_QUICK_CHAT } from '../../common/chatContextKeys.js';
+import { IChatDetail, IChatService } from '../../common/chatService.js';
+import { IChatRequestViewModel, IChatResponseViewModel, isRequestVM } from '../../common/chatViewModel.js';
+import { IChatWidgetHistoryService } from '../../common/chatWidgetHistoryService.js';
+import { IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
+import { ACTIVE_GROUP, IEditorService } from '../../../../services/editor/common/editorService.js';
+import { IViewsService } from '../../../../services/views/common/viewsService.js';
+import { IWorkbenchContribution } from '../../../../common/contributions.js';
+import { IActionViewItemService } from '../../../../../platform/actions/browser/actionViewItemService.js';
+import { ChatAgentLocation, IChatAgentService } from '../../common/chatAgents.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { DropdownWithPrimaryActionViewItem } from '../../../../../platform/actions/browser/dropdownWithPrimaryActionViewItem.js';
+import { toAction } from '../../../../../base/common/actions.js';
+import { extractAgentAndCommand } from '../../common/chatParserTypes.js';
+import { Position } from '../../../../../editor/common/core/position.js';
+import { SuggestController } from '../../../../../editor/contrib/suggest/browser/suggestController.js';
 
 export interface IChatViewTitleActionContext {
 	chatView: ChatViewPane;
@@ -60,12 +71,15 @@ export interface IChatViewOpenRequestEntry {
 }
 
 class OpenChatGlobalAction extends Action2 {
+
+	static readonly TITLE = localize2('openChat', "Open Chat");
+
 	constructor() {
 		super({
 			id: CHAT_OPEN_ACTION_ID,
-			title: localize2('openChat', "Open Chat"),
+			title: OpenChatGlobalAction.TITLE,
 			icon: Codicon.commentDiscussion,
-			f1: false,
+			f1: true,
 			category: CHAT_CATEGORY,
 			keybinding: {
 				weight: KeybindingWeight.WorkbenchContrib,
@@ -73,6 +87,11 @@ class OpenChatGlobalAction extends Action2 {
 				mac: {
 					primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.KeyI
 				}
+			},
+			menu: {
+				id: MenuId.ChatCommandCenter,
+				group: 'a_chat',
+				order: 1
 			}
 		});
 	}
@@ -102,17 +121,16 @@ class OpenChatGlobalAction extends Action2 {
 	}
 }
 
-class ChatHistoryAction extends ViewAction<ChatViewPane> {
+class ChatHistoryAction extends Action2 {
 	constructor() {
 		super({
-			viewId: CHAT_VIEW_ID,
 			id: `workbench.action.chat.history`,
 			title: localize2('chat.history.label', "Show Chats..."),
 			menu: {
 				id: MenuId.ViewTitle,
 				when: ContextKeyExpr.equals('view', CHAT_VIEW_ID),
 				group: 'navigation',
-				order: -1
+				order: 2
 			},
 			category: CHAT_CATEGORY,
 			icon: Codicon.history,
@@ -121,59 +139,97 @@ class ChatHistoryAction extends ViewAction<ChatViewPane> {
 		});
 	}
 
-	async runInView(accessor: ServicesAccessor, view: ChatViewPane) {
+	async run(accessor: ServicesAccessor) {
 		const chatService = accessor.get(IChatService);
 		const quickInputService = accessor.get(IQuickInputService);
 		const viewsService = accessor.get(IViewsService);
 		const editorService = accessor.get(IEditorService);
-		const items = chatService.getHistory();
 
-		const openInEditorButton: IQuickInputButton = {
-			iconClass: ThemeIcon.asClassName(Codicon.file),
-			tooltip: localize('interactiveSession.history.editor', "Open in Editor"),
-		};
-		const deleteButton: IQuickInputButton = {
-			iconClass: ThemeIcon.asClassName(Codicon.x),
-			tooltip: localize('interactiveSession.history.delete', "Delete"),
-		};
+		const showPicker = () => {
+			const openInEditorButton: IQuickInputButton = {
+				iconClass: ThemeIcon.asClassName(Codicon.file),
+				tooltip: localize('interactiveSession.history.editor', "Open in Editor"),
+			};
+			const deleteButton: IQuickInputButton = {
+				iconClass: ThemeIcon.asClassName(Codicon.x),
+				tooltip: localize('interactiveSession.history.delete', "Delete"),
+			};
+			const renameButton: IQuickInputButton = {
+				iconClass: ThemeIcon.asClassName(Codicon.pencil),
+				tooltip: localize('chat.history.rename', "Rename"),
+			};
 
-		interface IChatPickerItem extends IQuickPickItem {
-			chat: IChatDetail;
-		}
-		const picks: IChatPickerItem[] = items.map((i): IChatPickerItem => ({
-			label: i.title,
-			chat: i,
-			buttons: [
-				openInEditorButton,
-				deleteButton
-			]
-		}));
-		const store = new DisposableStore();
-		const picker = store.add(quickInputService.createQuickPick<IChatPickerItem>());
-		picker.placeholder = localize('interactiveSession.history.pick', "Switch to chat");
-		picker.items = picks;
-		store.add(picker.onDidTriggerItemButton(context => {
-			if (context.button === openInEditorButton) {
-				editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: <IChatEditorOptions>{ target: { sessionId: context.item.chat.sessionId }, pinned: true } }, ACTIVE_GROUP);
-				picker.hide();
-			} else if (context.button === deleteButton) {
-				chatService.removeHistoryEntry(context.item.chat.sessionId);
-				picker.items = picks.filter(i => i !== context.item);
+			interface IChatPickerItem extends IQuickPickItem {
+				chat: IChatDetail;
 			}
-		}));
-		store.add(picker.onDidAccept(async () => {
-			try {
-				const item = picker.selectedItems[0];
-				const sessionId = item.chat.sessionId;
-				const view = await viewsService.openView(CHAT_VIEW_ID) as ChatViewPane;
-				view.loadSession(sessionId);
-			} finally {
-				picker.hide();
-			}
-		}));
-		store.add(picker.onDidHide(() => store.dispose()));
 
-		picker.show();
+			const getPicks = () => {
+				const items = chatService.getHistory();
+				items.sort((a, b) => (b.lastMessageDate ?? 0) - (a.lastMessageDate ?? 0));
+
+				let lastDate: string | undefined = undefined;
+				const picks = items.flatMap((i): [IQuickPickSeparator | undefined, IChatPickerItem] => {
+					const timeAgoStr = fromNowByDay(i.lastMessageDate, true, true);
+					const separator: IQuickPickSeparator | undefined = timeAgoStr !== lastDate ? {
+						type: 'separator', label: timeAgoStr,
+					} : undefined;
+					lastDate = timeAgoStr;
+					return [
+						separator,
+						{
+							label: i.title,
+							description: i.isActive ? `(${localize('currentChatLabel', 'current')})` : '',
+							chat: i,
+							buttons: i.isActive ? [renameButton] : [
+								renameButton,
+								openInEditorButton,
+								deleteButton,
+							]
+						}
+					];
+				});
+
+				return coalesce(picks);
+			};
+
+			const store = new DisposableStore();
+			const picker = store.add(quickInputService.createQuickPick<IChatPickerItem>({ useSeparators: true }));
+			picker.placeholder = localize('interactiveSession.history.pick', "Switch to chat");
+			const picks = getPicks();
+			picker.items = picks;
+			store.add(picker.onDidTriggerItemButton(async context => {
+				if (context.button === openInEditorButton) {
+					const options: IChatEditorOptions = { target: { sessionId: context.item.chat.sessionId }, pinned: true };
+					editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options }, ACTIVE_GROUP);
+					picker.hide();
+				} else if (context.button === deleteButton) {
+					chatService.removeHistoryEntry(context.item.chat.sessionId);
+					picker.items = getPicks();
+				} else if (context.button === renameButton) {
+					const title = await quickInputService.input({ title: localize('newChatTitle', "New chat title"), value: context.item.chat.title });
+					if (title) {
+						chatService.setChatSessionTitle(context.item.chat.sessionId, title);
+					}
+
+					// The quick input hides the picker, it gets disposed, so we kick it off from scratch
+					showPicker();
+				}
+			}));
+			store.add(picker.onDidAccept(async () => {
+				try {
+					const item = picker.selectedItems[0];
+					const sessionId = item.chat.sessionId;
+					const view = await viewsService.openView(CHAT_VIEW_ID) as ChatViewPane;
+					view.loadSession(sessionId);
+				} finally {
+					picker.hide();
+				}
+			}));
+			store.add(picker.onDidHide(() => store.dispose()));
+
+			picker.show();
+		};
+		showPicker();
 	}
 }
 
@@ -194,10 +250,56 @@ class OpenChatEditorAction extends Action2 {
 	}
 }
 
+
+class ChatAddAction extends Action2 {
+	constructor() {
+		super({
+			id: 'workbench.action.chat.addParticipant',
+			title: localize2('chatWith', "Chat with Extension"),
+			icon: Codicon.mention,
+			f1: false,
+			category: CHAT_CATEGORY,
+			menu: {
+				id: MenuId.ChatInput,
+				when: CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Panel),
+				group: 'navigation',
+				order: 1
+			}
+		});
+	}
+
+	override async run(accessor: ServicesAccessor, ...args: any[]): Promise<void> {
+		const widgetService = accessor.get(IChatWidgetService);
+		const context: { widget?: IChatWidget } | undefined = args[0];
+		const widget = context?.widget ?? widgetService.lastFocusedWidget;
+		if (!widget) {
+			return;
+		}
+
+		const hasAgentOrCommand = extractAgentAndCommand(widget.parsedInput);
+		if (hasAgentOrCommand?.agentPart || hasAgentOrCommand?.commandPart) {
+			return;
+		}
+
+		const suggestCtrl = SuggestController.get(widget.inputEditor);
+		if (suggestCtrl) {
+			const curText = widget.inputEditor.getValue();
+			const newValue = curText ? `@ ${curText}` : '@';
+			if (!curText.startsWith('@')) {
+				widget.inputEditor.setValue(newValue);
+			}
+
+			widget.inputEditor.setPosition(new Position(1, 2));
+			suggestCtrl.triggerSuggest(undefined, true);
+		}
+	}
+}
+
 export function registerChatActions() {
 	registerAction2(OpenChatGlobalAction);
 	registerAction2(ChatHistoryAction);
 	registerAction2(OpenChatEditorAction);
+	registerAction2(ChatAddAction);
 
 	registerAction2(class ClearChatInputHistoryAction extends Action2 {
 		constructor() {
@@ -226,8 +328,26 @@ export function registerChatActions() {
 			});
 		}
 		async run(accessor: ServicesAccessor, ...args: any[]) {
+			const editorGroupsService = accessor.get(IEditorGroupsService);
+			const viewsService = accessor.get(IViewsService);
+
 			const chatService = accessor.get(IChatService);
 			chatService.clearAllHistoryEntries();
+
+			const chatView = viewsService.getViewWithId(CHAT_VIEW_ID) as ChatViewPane | undefined;
+			if (chatView) {
+				chatView.widget.clear();
+			}
+
+			// Clear all chat editors. Have to go this route because the chat editor may be in the background and
+			// not have a ChatEditorInput.
+			editorGroupsService.groups.forEach(group => {
+				group.editors.forEach(editor => {
+					if (editor instanceof ChatEditorInput) {
+						clearChatEditor(accessor, editor);
+					}
+				});
+			});
 		}
 	});
 
@@ -236,20 +356,25 @@ export function registerChatActions() {
 			super({
 				id: 'chat.action.focus',
 				title: localize2('actions.interactiveSession.focus', 'Focus Chat List'),
-				precondition: ContextKeyExpr.and(CONTEXT_IN_CHAT_INPUT, CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Panel)),
+				precondition: ContextKeyExpr.and(CONTEXT_IN_CHAT_INPUT),
 				category: CHAT_CATEGORY,
 				keybinding: [
 					// On mac, require that the cursor is at the top of the input, to avoid stealing cmd+up to move the cursor to the top
 					{
-						when: CONTEXT_CHAT_INPUT_CURSOR_AT_TOP,
+						when: ContextKeyExpr.and(CONTEXT_CHAT_INPUT_CURSOR_AT_TOP, CONTEXT_IN_QUICK_CHAT.negate()),
 						primary: KeyMod.CtrlCmd | KeyCode.UpArrow,
 						weight: KeybindingWeight.EditorContrib,
 					},
 					// On win/linux, ctrl+up can always focus the chat list
 					{
-						when: ContextKeyExpr.or(IsWindowsContext, IsLinuxContext),
+						when: ContextKeyExpr.and(ContextKeyExpr.or(IsWindowsContext, IsLinuxContext), CONTEXT_IN_QUICK_CHAT.negate()),
 						primary: KeyMod.CtrlCmd | KeyCode.UpArrow,
 						weight: KeybindingWeight.EditorContrib,
+					},
+					{
+						when: ContextKeyExpr.and(CONTEXT_IN_CHAT_SESSION, CONTEXT_IN_QUICK_CHAT),
+						primary: KeyMod.CtrlCmd | KeyCode.DownArrow,
+						weight: KeybindingWeight.WorkbenchContrib,
 					}
 				]
 			});
@@ -270,11 +395,18 @@ export function registerChatActions() {
 				id: 'workbench.action.chat.focusInput',
 				title: localize2('interactiveSession.focusInput.label', "Focus Chat Input"),
 				f1: false,
-				keybinding: {
-					primary: KeyMod.CtrlCmd | KeyCode.DownArrow,
-					weight: KeybindingWeight.WorkbenchContrib,
-					when: ContextKeyExpr.and(CONTEXT_IN_CHAT_SESSION, CONTEXT_IN_CHAT_INPUT.negate())
-				}
+				keybinding: [
+					{
+						primary: KeyMod.CtrlCmd | KeyCode.DownArrow,
+						weight: KeybindingWeight.WorkbenchContrib,
+						when: ContextKeyExpr.and(CONTEXT_IN_CHAT_SESSION, CONTEXT_IN_CHAT_INPUT.negate(), CONTEXT_IN_QUICK_CHAT.negate()),
+					},
+					{
+						when: ContextKeyExpr.and(CONTEXT_IN_CHAT_SESSION, CONTEXT_IN_CHAT_INPUT.negate(), CONTEXT_IN_QUICK_CHAT),
+						primary: KeyMod.CtrlCmd | KeyCode.UpArrow,
+						weight: KeybindingWeight.WorkbenchContrib,
+					}
+				]
 			});
 		}
 		run(accessor: ServicesAccessor, ...args: any[]) {
@@ -288,6 +420,66 @@ export function stringifyItem(item: IChatRequestViewModel | IChatResponseViewMod
 	if (isRequestVM(item)) {
 		return (includeName ? `${item.username}: ` : '') + item.messageText;
 	} else {
-		return (includeName ? `${item.username}: ` : '') + item.response.asString();
+		return (includeName ? `${item.username}: ` : '') + item.response.toString();
+	}
+}
+
+
+// --- command center chat
+
+MenuRegistry.appendMenuItem(MenuId.CommandCenter, {
+	submenu: MenuId.ChatCommandCenter,
+	title: localize('title4', "Chat"),
+	icon: Codicon.commentDiscussion,
+	when: ContextKeyExpr.and(CONTEXT_CHAT_ENABLED, ContextKeyExpr.has('config.chat.commandCenter.enabled')),
+	order: 10001,
+});
+
+export class ChatCommandCenterRendering implements IWorkbenchContribution {
+
+	static readonly ID = 'chat.commandCenterRendering';
+
+	private readonly _store = new DisposableStore();
+
+	constructor(
+		@IActionViewItemService actionViewItemService: IActionViewItemService,
+		@IChatAgentService agentService: IChatAgentService,
+		@IInstantiationService instantiationService: IInstantiationService,
+	) {
+
+		this._store.add(actionViewItemService.register(MenuId.CommandCenter, MenuId.ChatCommandCenter, (action, options) => {
+
+			const agent = agentService.getDefaultAgent(ChatAgentLocation.Panel);
+			if (!agent?.metadata.themeIcon) {
+				return undefined;
+			}
+
+			if (!(action instanceof SubmenuItemAction)) {
+				return undefined;
+			}
+
+			const dropdownAction = toAction({
+				id: agent.id,
+				label: localize('more', "More..."),
+				run() { }
+			});
+
+			const primaryAction = instantiationService.createInstance(MenuItemAction, {
+				id: CHAT_OPEN_ACTION_ID,
+				title: OpenChatGlobalAction.TITLE,
+				icon: agent.metadata.themeIcon,
+			}, undefined, undefined, undefined, undefined);
+
+			return instantiationService.createInstance(
+				DropdownWithPrimaryActionViewItem,
+				primaryAction, dropdownAction, action.actions,
+				'', options
+			);
+
+		}, agentService.onDidChangeAgents));
+	}
+
+	dispose() {
+		this._store.dispose();
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatClear.ts b/src/vs/workbench/contrib/chat/browser/actions/chatClear.ts
index 00ffcaed8c7..731ffe8e023 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatClear.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatClear.ts
@@ -3,21 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IChatEditorOptions } from 'vs/workbench/contrib/chat/browser/chatEditor';
-import { ChatEditorInput } from 'vs/workbench/contrib/chat/browser/chatEditorInput';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IChatEditorOptions } from '../chatEditor.js';
+import { ChatEditorInput } from '../chatEditorInput.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
 
-export async function clearChatEditor(accessor: ServicesAccessor): Promise<void> {
+export async function clearChatEditor(accessor: ServicesAccessor, chatEditorInput?: ChatEditorInput): Promise<void> {
 	const editorService = accessor.get(IEditorService);
-	const editorGroupsService = accessor.get(IEditorGroupsService);
 
-	const chatEditorInput = editorService.activeEditor;
+	if (!chatEditorInput) {
+		const editorInput = editorService.activeEditor;
+		chatEditorInput = editorInput instanceof ChatEditorInput ? editorInput : undefined;
+	}
+
 	if (chatEditorInput instanceof ChatEditorInput) {
+		// A chat editor can only be open in one group
+		const identifier = editorService.findEditors(chatEditorInput.resource)[0];
 		await editorService.replaceEditors([{
 			editor: chatEditorInput,
 			replacement: { resource: ChatEditorInput.getNewEditorUri(), options: { pinned: true } satisfies IChatEditorOptions }
-		}], editorGroupsService.activeGroup);
+		}], identifier.groupId);
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts
index b74d1b38b9c..a2f11bb2339 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts
@@ -3,25 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from 'vs/base/common/codicons';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { localize2 } from 'vs/nls';
-import { AccessibilitySignal, IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ActiveEditorContext } from 'vs/workbench/common/contextkeys';
-import { CHAT_CATEGORY, isChatViewTitleActionContext } from 'vs/workbench/contrib/chat/browser/actions/chatActions';
-import { clearChatEditor } from 'vs/workbench/contrib/chat/browser/actions/chatClear';
-import { CHAT_VIEW_ID, IChatWidgetService } from 'vs/workbench/contrib/chat/browser/chat';
-import { ChatEditorInput } from 'vs/workbench/contrib/chat/browser/chatEditorInput';
-import { ChatViewPane } from 'vs/workbench/contrib/chat/browser/chatViewPane';
-import { CONTEXT_IN_CHAT_SESSION, CONTEXT_CHAT_ENABLED } from 'vs/workbench/contrib/chat/common/chatContextKeys';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
+import { ServicesAccessor } from '../../../../../editor/browser/editorExtensions.js';
+import { localize2 } from '../../../../../nls.js';
+import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { Action2, MenuId, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ActiveEditorContext } from '../../../../common/contextkeys.js';
+import { CHAT_CATEGORY, isChatViewTitleActionContext } from './chatActions.js';
+import { clearChatEditor } from './chatClear.js';
+import { CHAT_VIEW_ID, EDITS_VIEW_ID, IChatWidgetService } from '../chat.js';
+import { ChatEditorInput } from '../chatEditorInput.js';
+import { ChatViewPane } from '../chatViewPane.js';
+import { CONTEXT_IN_CHAT_SESSION, CONTEXT_CHAT_ENABLED, CONTEXT_CHAT_EDITING_PARTICIPANT_REGISTERED } from '../../common/chatContextKeys.js';
+import { IViewsService } from '../../../../services/views/common/viewsService.js';
+import { ChatAgentLocation } from '../../common/chatAgents.js';
+import { ChatContextAttachments } from '../contrib/chatContextAttachments.js';
 
 export const ACTION_ID_NEW_CHAT = `workbench.action.chat.newChat`;
 
+export const ACTION_ID_NEW_EDIT_SESSION = `workbench.action.chat.newEditSession`;
+
 export function registerNewChatActions() {
 	registerAction2(class NewChatEditorAction extends Action2 {
 		constructor() {
@@ -81,7 +85,7 @@ export function registerNewChatActions() {
 			if (isChatViewTitleActionContext(context)) {
 				// Is running in the Chat view title
 				announceChatCleared(accessibilitySignalService);
-				context.chatView.clear();
+				context.chatView.widget.clear();
 				context.chatView.widget.focusInput();
 			} else {
 				// Is running from f1 or keybinding
@@ -100,6 +104,82 @@ export function registerNewChatActions() {
 			}
 		}
 	});
+
+	registerAction2(class GlobalClearEditsAction extends Action2 {
+		constructor() {
+			super({
+				id: ACTION_ID_NEW_EDIT_SESSION,
+				title: localize2('chat.newEdits.label', "New Edit Session"),
+				category: CHAT_CATEGORY,
+				icon: Codicon.plus,
+				precondition: ContextKeyExpr.and(CONTEXT_CHAT_ENABLED, CONTEXT_CHAT_EDITING_PARTICIPANT_REGISTERED),
+				f1: true,
+				menu: [{
+					id: MenuId.ChatContext,
+					group: 'z_clear'
+				},
+				{
+					id: MenuId.ViewTitle,
+					when: ContextKeyExpr.equals('view', EDITS_VIEW_ID),
+					group: 'navigation',
+					order: -1
+				},
+				]
+			});
+		}
+
+		async run(accessor: ServicesAccessor, ...args: any[]) {
+			const context = args[0];
+			const accessibilitySignalService = accessor.get(IAccessibilitySignalService);
+			if (isChatViewTitleActionContext(context)) {
+				// Is running in the Chat view title
+				announceChatCleared(accessibilitySignalService);
+				context.chatView.widget.clear();
+				context.chatView.widget.getContrib<ChatContextAttachments>(ChatContextAttachments.ID)?.setContext(true, ...[]);
+				context.chatView.widget.focusInput();
+			} else {
+				// Is running from f1 or keybinding
+				const widgetService = accessor.get(IChatWidgetService);
+				const viewsService = accessor.get(IViewsService);
+
+				let widget = widgetService.lastFocusedWidget;
+				if (!widget || widget.location !== ChatAgentLocation.EditingSession) {
+					const chatView = await viewsService.openView(EDITS_VIEW_ID) as ChatViewPane;
+					widget = chatView.widget;
+				}
+
+				announceChatCleared(accessibilitySignalService);
+				widget.clear();
+				widget.getContrib<ChatContextAttachments>(ChatContextAttachments.ID)?.setContext(true, ...[]);
+				widget.focusInput();
+			}
+		}
+	});
+
+	registerAction2(class GlobalClearEditsAction extends Action2 {
+		constructor() {
+			super({
+				id: 'workbench.action.chat.openEditSession',
+				title: localize2('chat.openEdits.label', "Open Edit Session"),
+				category: CHAT_CATEGORY,
+				icon: Codicon.edit,
+				precondition: ContextKeyExpr.and(CONTEXT_CHAT_ENABLED, CONTEXT_CHAT_EDITING_PARTICIPANT_REGISTERED),
+				f1: true,
+				menu: [{
+					id: MenuId.ViewTitle,
+					when: ContextKeyExpr.and(ContextKeyExpr.equals('view', CHAT_VIEW_ID), CONTEXT_CHAT_EDITING_PARTICIPANT_REGISTERED),
+					group: 'navigation',
+					order: 1
+				}]
+			});
+		}
+
+		async run(accessor: ServicesAccessor, ...args: any[]) {
+			const viewsService = accessor.get(IViewsService);
+			const chatView = await viewsService.openView(EDITS_VIEW_ID) as ChatViewPane;
+			chatView.widget.focusInput();
+		}
+	});
 }
 
 function announceChatCleared(accessibilitySignalService: IAccessibilitySignalService): void {
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatCodeblockActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatCodeblockActions.ts
index 6d9b8c58a43..3425dad368f 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatCodeblockActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatCodeblockActions.ts
@@ -3,41 +3,42 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Codicon } from 'vs/base/common/codicons';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { ICodeEditor, isCodeEditor, isDiffEditor } from 'vs/editor/browser/editorBrowser';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { IBulkEditService, ResourceTextEdit } from 'vs/editor/browser/services/bulkEditService';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { Range } from 'vs/editor/common/core/range';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { DocumentContextItem, WorkspaceEdit } from 'vs/editor/common/languages';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ITextModel } from 'vs/editor/common/model';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { CopyAction } from 'vs/editor/contrib/clipboard/browser/clipboard';
-import { localize2 } from 'vs/nls';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { TerminalLocation } from 'vs/platform/terminal/common/terminal';
-import { IUntitledTextResourceEditorInput } from 'vs/workbench/common/editor';
-import { accessibleViewInCodeBlock } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { CHAT_CATEGORY } from 'vs/workbench/contrib/chat/browser/actions/chatActions';
-import { IChatWidgetService, IChatCodeBlockContextProviderService } from 'vs/workbench/contrib/chat/browser/chat';
-import { DefaultChatTextEditor, ICodeBlockActionContext, ICodeCompareBlockActionContext } from 'vs/workbench/contrib/chat/browser/codeBlockPart';
-import { CONTEXT_IN_CHAT_INPUT, CONTEXT_IN_CHAT_SESSION, CONTEXT_CHAT_ENABLED, CONTEXT_CHAT_EDIT_APPLIED } from 'vs/workbench/contrib/chat/common/chatContextKeys';
-import { ChatCopyKind, IChatService, IDocumentContext } from 'vs/workbench/contrib/chat/common/chatService';
-import { IChatResponseViewModel, isResponseVM } from 'vs/workbench/contrib/chat/common/chatViewModel';
-import { insertCell } from 'vs/workbench/contrib/notebook/browser/controller/cellOperations';
-import { INotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CellKind, NOTEBOOK_EDITOR_ID } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { ITerminalEditorService, ITerminalGroupService, ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
+import { ICodeEditor } from '../../../../../editor/browser/editorBrowser.js';
+import { ServicesAccessor } from '../../../../../editor/browser/editorExtensions.js';
+import { ICodeEditorService } from '../../../../../editor/browser/services/codeEditorService.js';
+import { EditorContextKeys } from '../../../../../editor/common/editorContextKeys.js';
+import { CopyAction } from '../../../../../editor/contrib/clipboard/browser/clipboard.js';
+import { localize2 } from '../../../../../nls.js';
+import { Action2, MenuId, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { TerminalLocation } from '../../../../../platform/terminal/common/terminal.js';
+import { IUntitledTextResourceEditorInput } from '../../../../common/editor.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { accessibleViewInCodeBlock } from '../../../accessibility/browser/accessibilityConfiguration.js';
+import { ITerminalEditorService, ITerminalGroupService, ITerminalService } from '../../../terminal/browser/terminal.js';
+import { CONTEXT_CHAT_EDIT_APPLIED, CONTEXT_CHAT_ENABLED, CONTEXT_IN_CHAT_INPUT, CONTEXT_IN_CHAT_SESSION } from '../../common/chatContextKeys.js';
+import { IChatEditingService } from '../../common/chatEditingService.js';
+import { ChatCopyKind, IChatService } from '../../common/chatService.js';
+import { IChatResponseViewModel, isResponseVM } from '../../common/chatViewModel.js';
+import { IChatCodeBlockContextProviderService, IChatWidgetService } from '../chat.js';
+import { DefaultChatTextEditor, ICodeBlockActionContext, ICodeCompareBlockActionContext } from '../codeBlockPart.js';
+import { CHAT_CATEGORY } from './chatActions.js';
+import { ApplyCodeBlockOperation, InsertCodeBlockOperation } from './codeBlockOperations.js';
+
+const shellLangIds = [
+	'fish',
+	'ps1',
+	'pwsh',
+	'powershell',
+	'sh',
+	'shellscript',
+	'zsh'
+];
 
 export interface IChatCodeBlockActionContext extends ICodeBlockActionContext {
 	element: IChatResponseViewModel;
@@ -55,10 +56,6 @@ function isResponseFiltered(context: ICodeBlockActionContext) {
 	return isResponseVM(context.element) && context.element.errorDetails?.responseIsFiltered;
 }
 
-function getUsedDocuments(context: ICodeBlockActionContext): IDocumentContext[] | undefined {
-	return isResponseVM(context.element) ? context.element.usedContext?.documents : undefined;
-}
-
 abstract class ChatCodeBlockAction extends Action2 {
 	run(accessor: ServicesAccessor, ...args: any[]) {
 		let context = args[0];
@@ -92,7 +89,8 @@ export function registerChatCodeBlockActions() {
 				icon: Codicon.copy,
 				menu: {
 					id: MenuId.ChatCodeBlock,
-					group: 'navigation'
+					group: 'navigation',
+					order: 30
 				}
 			});
 		}
@@ -110,6 +108,7 @@ export function registerChatCodeBlockActions() {
 				const chatService = accessor.get(IChatService);
 				chatService.notifyUserAction({
 					agentId: context.element.agent?.id,
+					command: context.element.slashCommand?.name,
 					sessionId: context.element.sessionId,
 					requestId: context.element.requestId,
 					result: context.element.result,
@@ -155,6 +154,7 @@ export function registerChatCodeBlockActions() {
 		if (element) {
 			chatService.notifyUserAction({
 				agentId: element.agent?.id,
+				command: element.slashCommand?.name,
 				sessionId: element.sessionId,
 				requestId: element.requestId,
 				result: element.result,
@@ -178,19 +178,27 @@ export function registerChatCodeBlockActions() {
 		return false;
 	});
 
-	registerAction2(class InsertCodeBlockAction extends ChatCodeBlockAction {
+	registerAction2(class SmartApplyInEditorAction extends ChatCodeBlockAction {
+
+		private operation: ApplyCodeBlockOperation | undefined;
+
 		constructor() {
 			super({
-				id: 'workbench.action.chat.insertCodeBlock',
-				title: localize2('interactive.insertCodeBlock.label', "Insert at Cursor"),
+				id: 'workbench.action.chat.applyInEditor',
+				title: localize2('interactive.applyInEditor.label', "Apply in Editor"),
 				precondition: CONTEXT_CHAT_ENABLED,
 				f1: true,
 				category: CHAT_CATEGORY,
-				icon: Codicon.insert,
+				icon: Codicon.gitPullRequestGoToChanges,
+
 				menu: {
 					id: MenuId.ChatCodeBlock,
 					group: 'navigation',
-					when: CONTEXT_IN_CHAT_SESSION
+					when: ContextKeyExpr.and(
+						CONTEXT_IN_CHAT_SESSION,
+						...shellLangIds.map(e => ContextKeyExpr.notEquals(EditorContextKeys.languageId.key, e))
+					),
+					order: 10
 				},
 				keybinding: {
 					when: ContextKeyExpr.or(ContextKeyExpr.and(CONTEXT_IN_CHAT_SESSION, CONTEXT_IN_CHAT_INPUT.negate()), accessibleViewInCodeBlock),
@@ -201,147 +209,74 @@ export function registerChatCodeBlockActions() {
 			});
 		}
 
-		override async runWithContext(accessor: ServicesAccessor, context: ICodeBlockActionContext) {
-			const editorService = accessor.get(IEditorService);
-			const textFileService = accessor.get(ITextFileService);
-
-			if (isResponseFiltered(context)) {
-				// When run from command palette
-				return;
+		override runWithContext(accessor: ServicesAccessor, context: ICodeBlockActionContext) {
+			if (!this.operation) {
+				this.operation = accessor.get(IInstantiationService).createInstance(ApplyCodeBlockOperation);
 			}
+			return this.operation.run(context);
+		}
+	});
 
-			if (editorService.activeEditorPane?.getId() === NOTEBOOK_EDITOR_ID) {
-				return this.handleNotebookEditor(accessor, editorService.activeEditorPane.getControl() as INotebookEditor, context);
-			}
-
-			let activeEditorControl = editorService.activeTextEditorControl;
-			if (isDiffEditor(activeEditorControl)) {
-				activeEditorControl = activeEditorControl.getOriginalEditor().hasTextFocus() ? activeEditorControl.getOriginalEditor() : activeEditorControl.getModifiedEditor();
-			}
-
-			if (!isCodeEditor(activeEditorControl)) {
-				return;
-			}
-
-			const activeModel = activeEditorControl.getModel();
-			if (!activeModel) {
-				return;
-			}
-
-			// Check if model is editable, currently only support untitled and text file
-			const activeTextModel = textFileService.files.get(activeModel.uri) ?? textFileService.untitled.get(activeModel.uri);
-			if (!activeTextModel || activeTextModel.isReadonly()) {
-				return;
-			}
-
-			await this.handleTextEditor(accessor, activeEditorControl, activeModel, context);
+	registerAction2(class ApplyAllAction extends Action2 {
+		constructor() {
+			super({
+				id: 'workbench.action.chat.applyAll',
+				title: localize2('chat.applyAll.label', "Apply All Edits"),
+				precondition: CONTEXT_CHAT_ENABLED, // improve this condition
+				f1: true,
+				category: CHAT_CATEGORY,
+				icon: Codicon.edit
+			});
 		}
 
-		private async handleNotebookEditor(accessor: ServicesAccessor, notebookEditor: INotebookEditor, context: ICodeBlockActionContext) {
-			if (!notebookEditor.hasModel()) {
+		override async run(accessor: ServicesAccessor, ...args: any[]) {
+			const chatWidgetService = accessor.get(IChatWidgetService);
+			const chatEditingService = accessor.get(IChatEditingService);
+
+			const widget = chatWidgetService.lastFocusedWidget;
+			if (!widget || !widget.viewModel) {
 				return;
 			}
 
-			if (notebookEditor.isReadOnly) {
-				return;
-			}
+			const applyEditsId = args[0];
 
-			if (notebookEditor.activeCodeEditor?.hasTextFocus()) {
-				const codeEditor = notebookEditor.activeCodeEditor;
-				const textModel = codeEditor.getModel();
-
-				if (textModel) {
-					return this.handleTextEditor(accessor, codeEditor, textModel, context);
-				}
-			}
-
-			const languageService = accessor.get(ILanguageService);
-			const focusRange = notebookEditor.getFocus();
-			const next = Math.max(focusRange.end - 1, 0);
-			insertCell(languageService, notebookEditor, next, CellKind.Code, 'below', context.code, true);
-			this.notifyUserAction(accessor, context);
-		}
-
-		private async handleTextEditor(accessor: ServicesAccessor, codeEditor: ICodeEditor, activeModel: ITextModel, codeBlockActionContext: ICodeBlockActionContext) {
-			this.notifyUserAction(accessor, codeBlockActionContext);
-
-			const bulkEditService = accessor.get(IBulkEditService);
-			const codeEditorService = accessor.get(ICodeEditorService);
-
-			const mappedEditsProviders = accessor.get(ILanguageFeaturesService).mappedEditsProvider.ordered(activeModel);
-
-			// try applying workspace edit that was returned by a MappedEditsProvider, else simply insert at selection
-
-			let mappedEdits: WorkspaceEdit | null = null;
-
-			if (mappedEditsProviders.length > 0) {
-				const mostRelevantProvider = mappedEditsProviders[0]; // TODO@ulugbekna: should we try all providers?
-
-				// 0th sub-array - editor selections array if there are any selections
-				// 1st sub-array - array with documents used to get the chat reply
-				const docRefs: DocumentContextItem[][] = [];
-
-				if (codeEditor.hasModel()) {
-					const model = codeEditor.getModel();
-					const currentDocUri = model.uri;
-					const currentDocVersion = model.getVersionId();
-					const selections = codeEditor.getSelections();
-					if (selections.length > 0) {
-						docRefs.push([
-							{
-								uri: currentDocUri,
-								version: currentDocVersion,
-								ranges: selections,
-							}
-						]);
-					}
-				}
-
-				const usedDocuments = getUsedDocuments(codeBlockActionContext);
-				if (usedDocuments) {
-					docRefs.push(usedDocuments);
-				}
-
-				const cancellationTokenSource = new CancellationTokenSource();
-
-				mappedEdits = await mostRelevantProvider.provideMappedEdits(
-					activeModel,
-					[codeBlockActionContext.code],
-					{ documents: docRefs },
-					cancellationTokenSource.token);
-			}
-
-			if (mappedEdits) {
-				await bulkEditService.apply(mappedEdits);
-			} else {
-				const activeSelection = codeEditor.getSelection() ?? new Range(activeModel.getLineCount(), 1, activeModel.getLineCount(), 1);
-				await bulkEditService.apply([
-					new ResourceTextEdit(activeModel.uri, {
-						range: activeSelection,
-						text: codeBlockActionContext.code,
-					}),
-				]);
-			}
-			codeEditorService.listCodeEditors().find(editor => editor.getModel()?.uri.toString() === activeModel.uri.toString())?.focus();
-		}
-
-		private notifyUserAction(accessor: ServicesAccessor, context: ICodeBlockActionContext) {
-			if (isResponseVM(context.element)) {
-				const chatService = accessor.get(IChatService);
-				chatService.notifyUserAction({
-					agentId: context.element.agent?.id,
-					sessionId: context.element.sessionId,
-					requestId: context.element.requestId,
-					result: context.element.result,
-					action: {
-						kind: 'insert',
-						codeBlockIndex: context.codeBlockIndex,
-						totalCharacters: context.code.length,
-					}
-				});
+			const chatModel = widget.viewModel.model;
+			const request = chatModel.getRequests().find(request => request.response?.result?.metadata?.applyEditsId === applyEditsId);
+			if (request && request.response) {
+				await chatEditingService.startOrContinueEditingSession(widget.viewModel.sessionId, { silent: true }); // make sure we have an editing session
+				await chatEditingService.triggerEditComputation(request.response);
 			}
 		}
+	});
 
+	registerAction2(class SmartApplyInEditorAction extends ChatCodeBlockAction {
+		constructor() {
+			super({
+				id: 'workbench.action.chat.insertCodeBlock',
+				title: localize2('interactive.insertCodeBlock.label', "Insert At Cursor"),
+				precondition: CONTEXT_CHAT_ENABLED,
+				f1: true,
+				category: CHAT_CATEGORY,
+				icon: Codicon.insert,
+				menu: {
+					id: MenuId.ChatCodeBlock,
+					group: 'navigation',
+					when: CONTEXT_IN_CHAT_SESSION,
+					order: 20
+				},
+				keybinding: {
+					when: ContextKeyExpr.or(ContextKeyExpr.and(CONTEXT_IN_CHAT_SESSION, CONTEXT_IN_CHAT_INPUT.negate()), accessibleViewInCodeBlock),
+					primary: KeyMod.CtrlCmd | KeyCode.Enter,
+					mac: { primary: KeyMod.WinCtrl | KeyCode.Enter },
+					weight: KeybindingWeight.ExternalExtension + 1
+				},
+			});
+		}
+
+		override runWithContext(accessor: ServicesAccessor, context: ICodeBlockActionContext) {
+			const operation = accessor.get(IInstantiationService).createInstance(InsertCodeBlockOperation);
+			return operation.run(context);
+		}
 	});
 
 	registerAction2(class InsertIntoNewFileAction extends ChatCodeBlockAction {
@@ -356,7 +291,8 @@ export function registerChatCodeBlockActions() {
 				menu: {
 					id: MenuId.ChatCodeBlock,
 					group: 'navigation',
-					isHiddenByDefault: true
+					isHiddenByDefault: true,
+					order: 40,
 				}
 			});
 		}
@@ -375,6 +311,7 @@ export function registerChatCodeBlockActions() {
 			if (isResponseVM(context.element)) {
 				chatService.notifyUserAction({
 					agentId: context.element.agent?.id,
+					command: context.element.slashCommand?.name,
 					sessionId: context.element.sessionId,
 					requestId: context.element.requestId,
 					result: context.element.result,
@@ -389,15 +326,6 @@ export function registerChatCodeBlockActions() {
 		}
 	});
 
-	const shellLangIds = [
-		'fish',
-		'ps1',
-		'pwsh',
-		'powershell',
-		'sh',
-		'shellscript',
-		'zsh'
-	];
 	registerAction2(class RunInTerminalAction extends ChatCodeBlockAction {
 		constructor() {
 			super({
@@ -467,6 +395,7 @@ export function registerChatCodeBlockActions() {
 			if (isResponseVM(context.element)) {
 				chatService.notifyUserAction({
 					agentId: context.element.agent?.id,
+					command: context.element.slashCommand?.name,
 					sessionId: context.element.sessionId,
 					requestId: context.element.requestId,
 					result: context.element.result,
@@ -497,7 +426,7 @@ export function registerChatCodeBlockActions() {
 		const currentResponse = curCodeBlockInfo ?
 			curCodeBlockInfo.element :
 			(focusedResponse ?? widget.viewModel?.getItems().reverse().find((item): item is IChatResponseViewModel => isResponseVM(item)));
-		if (!currentResponse) {
+		if (!currentResponse || !isResponseVM(currentResponse)) {
 			return;
 		}
 
@@ -580,6 +509,7 @@ function getContextFromEditor(editor: ICodeEditor, accessor: ServicesAccessor):
 		codeBlockIndex: codeBlockInfo.codeBlockIndex,
 		code: editor.getValue(),
 		languageId: editor.getModel()!.getLanguageId(),
+		codemapperUri: codeBlockInfo.codemapperUri
 	};
 }
 
@@ -610,7 +540,8 @@ export function registerChatCodeCompareBlockActions() {
 				precondition: ContextKeyExpr.and(EditorContextKeys.hasChanges, CONTEXT_CHAT_EDIT_APPLIED.negate()),
 				menu: {
 					id: MenuId.ChatCompareBlock,
-					group: 'navigation'
+					group: 'navigation',
+					order: 1,
 				}
 			});
 		}
@@ -629,4 +560,28 @@ export function registerChatCodeCompareBlockActions() {
 			});
 		}
 	});
+
+	registerAction2(class DiscardEditsCompareBlockAction extends ChatCompareCodeBlockAction {
+		constructor() {
+			super({
+				id: 'workbench.action.chat.discardCompareEdits',
+				title: localize2('interactive.compare.discard', "Discard Edits"),
+				f1: false,
+				category: CHAT_CATEGORY,
+				icon: Codicon.trash,
+				precondition: ContextKeyExpr.and(EditorContextKeys.hasChanges, CONTEXT_CHAT_EDIT_APPLIED.negate()),
+				menu: {
+					id: MenuId.ChatCompareBlock,
+					group: 'navigation',
+					order: 2,
+				}
+			});
+		}
+
+		async runWithContext(accessor: ServicesAccessor, context: ICodeCompareBlockActionContext): Promise<any> {
+			const instaService = accessor.get(IInstantiationService);
+			const editor = instaService.createInstance(DefaultChatTextEditor);
+			editor.discard(context.element, context.edit);
+		}
+	});
 }
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
index f37af7c9d29..bd02b32ad26 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
@@ -3,35 +3,44 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Codicon } from 'vs/base/common/codicons';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Schemas } from 'vs/base/common/network';
-import { IRange } from 'vs/editor/common/core/range';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { URI } from 'vs/base/common/uri';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { Command } from 'vs/editor/common/languages';
-import { AbstractGotoSymbolQuickAccessProvider, IGotoSymbolQuickPickItem } from 'vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess';
-import { localize, localize2 } from 'vs/nls';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { AnythingQuickAccessProviderRunOptions } from 'vs/platform/quickinput/common/quickAccess';
-import { IQuickInputService, IQuickPickItem, QuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { CHAT_CATEGORY } from 'vs/workbench/contrib/chat/browser/actions/chatActions';
-import { IChatWidget, IChatWidgetService } from 'vs/workbench/contrib/chat/browser/chat';
-import { ChatContextAttachments } from 'vs/workbench/contrib/chat/browser/contrib/chatContextAttachments';
-import { ChatAgentLocation, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { CONTEXT_CHAT_LOCATION, CONTEXT_IN_CHAT_INPUT, CONTEXT_IN_QUICK_CHAT } from 'vs/workbench/contrib/chat/common/chatContextKeys';
-import { IChatRequestVariableEntry } from 'vs/workbench/contrib/chat/common/chatModel';
-import { ChatRequestAgentPart } from 'vs/workbench/contrib/chat/common/chatParserTypes';
-import { IChatVariablesService } from 'vs/workbench/contrib/chat/common/chatVariables';
-import { AnythingQuickAccessProvider } from 'vs/workbench/contrib/search/browser/anythingQuickAccess';
-import { ISymbolQuickPickItem, SymbolsQuickAccessProvider } from 'vs/workbench/contrib/search/browser/symbolsQuickAccess';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { EditorType } from 'vs/editor/common/editorCommon';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { compare } from '../../../../../base/common/strings.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ServicesAccessor } from '../../../../../editor/browser/editorExtensions.js';
+import { IRange } from '../../../../../editor/common/core/range.js';
+import { EditorType } from '../../../../../editor/common/editorCommon.js';
+import { Command } from '../../../../../editor/common/languages.js';
+import { AbstractGotoSymbolQuickAccessProvider, IGotoSymbolQuickPickItem } from '../../../../../editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.js';
+import { localize, localize2 } from '../../../../../nls.js';
+import { Action2, MenuId, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { AnythingQuickAccessProviderRunOptions } from '../../../../../platform/quickinput/common/quickAccess.js';
+import { IQuickInputService, IQuickPickItem, IQuickPickItemWithResource, IQuickPickSeparator, QuickPickItem } from '../../../../../platform/quickinput/common/quickInput.js';
+import { CHAT_CATEGORY } from './chatActions.js';
+import { IChatWidget, IChatWidgetService, IQuickChatService, showChatView } from '../chat.js';
+import { isQuickChat } from '../chatWidget.js';
+import { ChatContextAttachments } from '../contrib/chatContextAttachments.js';
+import { ChatAgentLocation, IChatAgentService } from '../../common/chatAgents.js';
+import { CONTEXT_CHAT_LOCATION, CONTEXT_IN_CHAT_INPUT } from '../../common/chatContextKeys.js';
+import { IChatEditingService } from '../../common/chatEditingService.js';
+import { IChatRequestVariableEntry } from '../../common/chatModel.js';
+import { ChatRequestAgentPart } from '../../common/chatParserTypes.js';
+import { IChatVariableData, IChatVariablesService } from '../../common/chatVariables.js';
+import { ILanguageModelToolsService } from '../../common/languageModelToolsService.js';
+import { ISymbolQuickPickItem, SymbolsQuickAccessProvider } from '../../../search/browser/symbolsQuickAccess.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { IViewsService } from '../../../../services/views/common/viewsService.js';
+import { ActiveEditorContext } from '../../../../common/contextkeys.js';
+import { imageToHash, isImage } from '../chatImagePaste.js';
+import { AnythingQuickAccessProvider } from '../../../search/browser/anythingQuickAccess.js';
 
 export function registerChatContextActions() {
 	registerAction2(AttachContextAction);
@@ -39,45 +48,69 @@ export function registerChatContextActions() {
 	registerAction2(AttachSelectionAction);
 }
 
-export type IChatContextQuickPickItem = IFileQuickPickItem | IDynamicVariableQuickPickItem | IStaticVariableQuickPickItem | IGotoSymbolQuickPickItem | ISymbolQuickPickItem | IQuickAccessQuickPickItem;
+/**
+ * We fill the quickpick with these types, and enable some quick access providers
+ */
+type IAttachmentQuickPickItem = ICommandVariableQuickPickItem | IQuickAccessQuickPickItem | IToolQuickPickItem | IImageQuickPickItem | IVariableQuickPickItem;
 
-export interface IFileQuickPickItem extends IQuickPickItem {
-	kind: 'file';
-	id: string;
-	name: string;
-	value: URI;
-	isDynamic: true;
+/**
+ * These are the types that we can get out of the quick pick
+ */
+type IChatContextQuickPickItem = IAttachmentQuickPickItem | IGotoSymbolQuickPickItem | ISymbolQuickPickItem | IQuickPickItemWithResource;
 
-	resource: URI;
+function isIGotoSymbolQuickPickItem(obj: unknown): obj is IGotoSymbolQuickPickItem {
+	return (
+		typeof obj === 'object'
+		&& typeof (obj as IGotoSymbolQuickPickItem).symbolName === 'string'
+		&& !!(obj as IGotoSymbolQuickPickItem).uri
+		&& !!(obj as IGotoSymbolQuickPickItem).range);
 }
 
-export interface IDynamicVariableQuickPickItem extends IQuickPickItem {
-	kind: 'dynamic';
+function isISymbolQuickPickItem(obj: unknown): obj is ISymbolQuickPickItem {
+	return (
+		typeof obj === 'object'
+		&& typeof (obj as ISymbolQuickPickItem).symbol === 'object'
+		&& !!(obj as ISymbolQuickPickItem).symbol);
+}
+
+function isIQuickPickItemWithResource(obj: unknown): obj is IQuickPickItemWithResource {
+	return (
+		typeof obj === 'object'
+		&& typeof (obj as IQuickPickItemWithResource).resource === 'object'
+		&& URI.isUri((obj as IQuickPickItemWithResource).resource));
+}
+
+interface IImageQuickPickItem extends IQuickPickItem {
+	kind: 'image';
 	id: string;
+}
+
+interface ICommandVariableQuickPickItem extends IQuickPickItem {
+	kind: 'command';
+	id: string;
+	command: Command;
 	name?: string;
 	value: unknown;
 	isDynamic: true;
 
 	icon?: ThemeIcon;
-	command?: Command;
 }
 
-export interface IStaticVariableQuickPickItem extends IQuickPickItem {
-	kind: 'static';
+interface IToolQuickPickItem extends IQuickPickItem {
+	kind: 'tool';
 	id: string;
-	name: string;
-	value: unknown;
-	isDynamic?: false;
-
+	name?: string;
 	icon?: ThemeIcon;
 }
 
-export interface IQuickAccessQuickPickItem extends IQuickPickItem {
+interface IVariableQuickPickItem extends IQuickPickItem {
+	kind: 'variable';
+	variable: IChatVariableData;
+}
+
+interface IQuickAccessQuickPickItem extends IQuickPickItem {
 	kind: 'quickaccess';
 	id: string;
-	name: string;
-	value: string;
-
 	prefix: string;
 }
 
@@ -88,9 +121,15 @@ class AttachFileAction extends Action2 {
 	constructor() {
 		super({
 			id: AttachFileAction.ID,
-			title: localize2('workbench.action.chat.attachFile.label', "Attach File"),
+			title: localize2('workbench.action.chat.attachFile.label', "Add File to Chat"),
 			category: CHAT_CATEGORY,
-			f1: false
+			f1: false,
+			precondition: ActiveEditorContext.isEqualTo('workbench.editors.files.textFileEditor'),
+			menu: {
+				id: MenuId.ChatCommandCenter,
+				group: 'a_chat',
+				order: 10,
+			}
 		});
 	}
 
@@ -99,7 +138,8 @@ class AttachFileAction extends Action2 {
 		const textEditorService = accessor.get(IEditorService);
 
 		const activeUri = textEditorService.activeEditor?.resource;
-		if (textEditorService.activeTextEditorControl?.getEditorType() === EditorType.ICodeEditor && activeUri && [Schemas.file, Schemas.vscodeRemote].includes(activeUri.scheme)) {
+		if (textEditorService.activeTextEditorControl?.getEditorType() === EditorType.ICodeEditor && activeUri && [Schemas.file, Schemas.vscodeRemote, Schemas.untitled].includes(activeUri.scheme)) {
+			(await showChatView(accessor.get(IViewsService)))?.focusInput();
 			variablesService.attachContext('file', activeUri, ChatAgentLocation.Panel);
 		}
 	}
@@ -114,7 +154,13 @@ class AttachSelectionAction extends Action2 {
 			id: AttachSelectionAction.ID,
 			title: localize2('workbench.action.chat.attachSelection.label', "Add Selection to Chat"),
 			category: CHAT_CATEGORY,
-			f1: false
+			f1: false,
+			precondition: ActiveEditorContext.isEqualTo('workbench.editors.files.textFileEditor'),
+			menu: {
+				id: MenuId.ChatCommandCenter,
+				group: 'a_chat',
+				order: 11,
+			}
 		});
 	}
 
@@ -124,25 +170,35 @@ class AttachSelectionAction extends Action2 {
 
 		const activeEditor = textEditorService.activeTextEditorControl;
 		const activeUri = textEditorService.activeEditor?.resource;
-		if (textEditorService.activeTextEditorControl?.getEditorType() === EditorType.ICodeEditor && activeUri && [Schemas.file, Schemas.vscodeRemote].includes(activeUri.scheme)) {
+		if (textEditorService.activeTextEditorControl?.getEditorType() === EditorType.ICodeEditor && activeUri && [Schemas.file, Schemas.vscodeRemote, Schemas.untitled].includes(activeUri.scheme)) {
 			const selection = activeEditor?.getSelection();
 			if (selection) {
+				(await showChatView(accessor.get(IViewsService)))?.focusInput();
 				variablesService.attachContext('file', { uri: activeUri, range: selection }, ChatAgentLocation.Panel);
 			}
 		}
 	}
 }
 
-class AttachContextAction extends Action2 {
+export class AttachContextAction extends Action2 {
 
 	static readonly ID = 'workbench.action.chat.attachContext';
 
+	// used to enable/disable the keybinding and defined menu containment
+	private static _cdt = ContextKeyExpr.or(
+		ContextKeyExpr.and(CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Panel)),
+		ContextKeyExpr.and(CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Editor), ContextKeyExpr.equals('config.chat.experimental.variables.editor', true)),
+		ContextKeyExpr.and(CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Notebook), ContextKeyExpr.equals('config.chat.experimental.variables.notebook', true)),
+		ContextKeyExpr.and(CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Terminal), ContextKeyExpr.equals('config.chat.experimental.variables.terminal', true)),
+	);
+
 	constructor() {
 		super({
 			id: AttachContextAction.ID,
 			title: localize2('workbench.action.chat.attachContext.label', "Attach Context"),
 			icon: Codicon.attach,
 			category: CHAT_CATEGORY,
+			precondition: ContextKeyExpr.or(AttachContextAction._cdt, ContextKeyExpr.and(CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.EditingSession))),
 			keybinding: {
 				when: CONTEXT_IN_CHAT_INPUT,
 				primary: KeyMod.CtrlCmd | KeyCode.Slash,
@@ -150,9 +206,16 @@ class AttachContextAction extends Action2 {
 			},
 			menu: [
 				{
-					when: ContextKeyExpr.and(CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Panel), CONTEXT_IN_QUICK_CHAT.isEqualTo(false)),
+					when: ContextKeyExpr.or(ContextKeyExpr.and(CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.EditingSession)), ContextKeyExpr.and(ContextKeyExpr.or(CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Panel), CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.EditingSession)), AttachContextAction._cdt)),
+					id: MenuId.ChatInput,
+					group: 'navigation',
+					order: 2
+				},
+				{
+					when: ContextKeyExpr.and(CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Panel).negate(), AttachContextAction._cdt),
 					id: MenuId.ChatExecute,
 					group: 'navigation',
+					order: 1
 				},
 			]
 		});
@@ -168,48 +231,42 @@ class AttachContextAction extends Action2 {
 			`:${item.range.startLineNumber}`);
 	}
 
-	private async _attachContext(widget: IChatWidget, commandService: ICommandService, ...picks: IChatContextQuickPickItem[]) {
+	private async _attachContext(widget: IChatWidget, commandService: ICommandService, clipboardService: IClipboardService, chatEditingService: IChatEditingService | undefined, ...picks: IChatContextQuickPickItem[]) {
 		const toAttach: IChatRequestVariableEntry[] = [];
 		for (const pick of picks) {
-			if (pick && typeof pick === 'object' && 'command' in pick && pick.command) {
-				// Dynamic variable with a followup command
-				const selection = await commandService.executeCommand(pick.command.id, ...(pick.command.arguments ?? []));
-				if (!selection) {
-					// User made no selection, skip this variable
-					continue;
-				}
+			if (isISymbolQuickPickItem(pick) && pick.symbol) {
+				// Workspace symbol
 				toAttach.push({
-					...pick,
-					isDynamic: pick.isDynamic,
-					value: pick.value,
-					name: `${typeof pick.value === 'string' && pick.value.startsWith('#') ? pick.value.slice(1) : ''}${selection}`,
-					// Apply the original icon with the new name
-					fullName: `${pick.icon ? `$(${pick.icon.id}) ` : ''}${selection}`
-				});
-			} else if ('symbol' in pick && pick.symbol) {
-				// Symbol
-				toAttach.push({
-					...pick,
 					id: this._getFileContextId(pick.symbol.location),
 					value: pick.symbol.location,
 					fullName: pick.label,
 					name: pick.symbol.name,
 					isDynamic: true
 				});
-			} else if (pick && typeof pick === 'object' && 'resource' in pick && pick.resource) {
-				// #file variable
+			} else if (isIQuickPickItemWithResource(pick) && pick.resource) {
+				if (/\.(png|jpg|jpeg|bmp|gif|tiff)$/i.test(pick.resource.path)) {
+					// checks if the file is an image
+					toAttach.push({
+						id: pick.resource.toString(),
+						name: pick.label,
+						fullName: pick.label,
+						value: pick.resource,
+						isDynamic: true,
+						isImage: true
+					});
+				} else {
+					// file attachment
+					toAttach.push({
+						id: this._getFileContextId({ resource: pick.resource }),
+						value: pick.resource,
+						name: pick.label,
+						isFile: true,
+						isDynamic: true,
+					});
+					chatEditingService?.addFileToWorkingSet(pick.resource);
+				}
+			} else if (isIGotoSymbolQuickPickItem(pick) && pick.uri && pick.range) {
 				toAttach.push({
-					...pick,
-					id: this._getFileContextId({ resource: pick.resource }),
-					value: pick.resource,
-					name: pick.label,
-					isFile: true,
-					isDynamic: true
-				});
-			} else if ('symbolName' in pick && pick.uri && pick.range) {
-				// Symbol
-				toAttach.push({
-					...pick,
 					range: undefined,
 					id: this._getFileContextId({ uri: pick.uri, range: pick.range.decoration }),
 					value: { uri: pick.uri, range: pick.range.decoration },
@@ -218,16 +275,53 @@ class AttachContextAction extends Action2 {
 					isDynamic: true
 				});
 			} else {
-				// All other dynamic variables and static variables
-				toAttach.push({
-					...pick,
-					range: undefined,
-					id: pick.id ?? '',
-					value: 'value' in pick ? pick.value : undefined,
-					fullName: pick.label,
-					name: 'name' in pick && typeof pick.name === 'string' ? pick.name : pick.label,
-					icon: 'icon' in pick && ThemeIcon.isThemeIcon(pick.icon) ? pick.icon : undefined
-				});
+				// Anything else is an attachment
+				const attachmentPick = pick as IAttachmentQuickPickItem;
+				if (attachmentPick.kind === 'command') {
+					// Dynamic variable with a followup command
+					const selection = await commandService.executeCommand(attachmentPick.command.id, ...(attachmentPick.command.arguments ?? []));
+					if (!selection) {
+						// User made no selection, skip this variable
+						continue;
+					}
+					toAttach.push({
+						...attachmentPick,
+						isDynamic: attachmentPick.isDynamic,
+						value: attachmentPick.value,
+						name: `${typeof attachmentPick.value === 'string' && attachmentPick.value.startsWith('#') ? attachmentPick.value.slice(1) : ''}${selection}`,
+						// Apply the original icon with the new name
+						fullName: selection
+					});
+				} else if (attachmentPick.kind === 'tool') {
+					toAttach.push({
+						id: attachmentPick.id,
+						name: attachmentPick.label,
+						fullName: attachmentPick.label,
+						value: undefined,
+						icon: attachmentPick.icon,
+						isTool: true
+					});
+				} else if (attachmentPick.kind === 'image') {
+					const fileBuffer = await clipboardService.readImage();
+					toAttach.push({
+						id: await imageToHash(fileBuffer),
+						name: localize('pastedImage', 'Pasted Image'),
+						fullName: localize('pastedImage', 'Pasted Image'),
+						value: fileBuffer,
+						isDynamic: true,
+						isImage: true
+					});
+				} else if (attachmentPick.kind === 'variable') {
+					// All other dynamic variables and static variables
+					toAttach.push({
+						range: undefined,
+						id: pick.id ?? '',
+						value: undefined,
+						fullName: pick.label,
+						name: attachmentPick.variable.name,
+						icon: attachmentPick.variable.icon
+					});
+				}
 			}
 		}
 
@@ -240,22 +334,40 @@ class AttachContextAction extends Action2 {
 		const chatVariablesService = accessor.get(IChatVariablesService);
 		const commandService = accessor.get(ICommandService);
 		const widgetService = accessor.get(IChatWidgetService);
+		const languageModelToolsService = accessor.get(ILanguageModelToolsService);
+		const quickChatService = accessor.get(IQuickChatService);
+		const clipboardService = accessor.get(IClipboardService);
+		const configurationService = accessor.get(IConfigurationService);
 		const context: { widget?: IChatWidget } | undefined = args[0];
 		const widget = context?.widget ?? widgetService.lastFocusedWidget;
 		if (!widget) {
 			return;
 		}
+		const chatEditingService = widget.location === ChatAgentLocation.EditingSession ? accessor.get(IChatEditingService) : undefined;
 
 		const usedAgent = widget.parsedInput.parts.find(p => p instanceof ChatRequestAgentPart);
 		const slowSupported = usedAgent ? usedAgent.agent.metadata.supportsSlowVariables : true;
-		const quickPickItems: (IChatContextQuickPickItem | QuickPickItem)[] = [];
-		for (const variable of chatVariablesService.getVariables()) {
+		const quickPickItems: IAttachmentQuickPickItem[] = [];
+		for (const variable of chatVariablesService.getVariables(widget.location)) {
 			if (variable.fullName && (!variable.isSlow || slowSupported)) {
 				quickPickItems.push({
-					label: `${variable.icon ? `$(${variable.icon.id}) ` : ''}${variable.fullName}`,
-					name: variable.name,
+					kind: 'variable',
+					variable,
+					label: variable.fullName,
 					id: variable.id,
-					icon: variable.icon
+					iconClass: variable.icon ? ThemeIcon.asClassName(variable.icon) : undefined,
+				});
+			}
+		}
+
+		if (configurationService.getValue<boolean>('chat.experimental.imageAttachments')) {
+			const imageData = await clipboardService.readImage();
+			if (isImage(imageData)) {
+				quickPickItems.push({
+					kind: 'image',
+					id: await imageToHash(imageData),
+					label: localize('imageFromClipboard', 'Image from Clipboard'),
+					iconClass: ThemeIcon.asClassName(Codicon.fileMedia),
 				});
 			}
 		}
@@ -265,32 +377,132 @@ class AttachContextAction extends Action2 {
 			if (agentPart) {
 				const completions = await chatAgentService.getAgentCompletionItems(agentPart.agent.id, '', CancellationToken.None);
 				for (const variable of completions) {
-					if (variable.fullName) {
+					if (variable.fullName && variable.command) {
 						quickPickItems.push({
-							label: `${variable.icon ? `$(${variable.icon.id}) ` : ''}${variable.fullName}`,
+							kind: 'command',
+							label: variable.fullName,
 							id: variable.id,
 							command: variable.command,
 							icon: variable.icon,
+							iconClass: variable.icon ? ThemeIcon.asClassName(variable.icon) : undefined,
 							value: variable.value,
 							isDynamic: true,
 							name: variable.name
 						});
+					} else {
+						// Currently there's nothing that falls into this category
 					}
 				}
 			}
+		}
 
+		if (!usedAgent || usedAgent.agent.supportsToolReferences) {
+			for (const tool of languageModelToolsService.getTools()) {
+				if (tool.canBeInvokedManually) {
+					const item: IToolQuickPickItem = {
+						kind: 'tool',
+						label: tool.displayName ?? tool.name ?? '',
+						id: tool.id,
+						icon: ThemeIcon.isThemeIcon(tool.icon) ? tool.icon : undefined // TODO need to support icon path?
+					};
+					if (ThemeIcon.isThemeIcon(tool.icon)) {
+						item.iconClass = ThemeIcon.asClassName(tool.icon);
+					} else if (tool.icon) {
+						item.iconPath = tool.icon;
+					}
+
+					quickPickItems.push(item);
+				}
+			}
 		}
 
 		quickPickItems.push({
-			label: localize('chatContext.symbol', '{0} Symbol...', `$(${Codicon.symbolField.id})`),
-			icon: ThemeIcon.fromId(Codicon.symbolField.id),
-			prefix: SymbolsQuickAccessProvider.PREFIX
+			kind: 'quickaccess',
+			label: localize('chatContext.symbol', 'Symbol...'),
+			iconClass: ThemeIcon.asClassName(Codicon.symbolField),
+			prefix: SymbolsQuickAccessProvider.PREFIX,
+			id: 'symbol'
 		});
 
-		this._show(quickInputService, commandService, widget, quickPickItems);
+		if (widget.location === ChatAgentLocation.Notebook) {
+			quickPickItems.push({
+				kind: 'command',
+				id: 'chatContext.notebook.kernelVariable',
+				isDynamic: true,
+				icon: ThemeIcon.fromId(Codicon.serverEnvironment.id),
+				iconClass: ThemeIcon.asClassName(Codicon.serverEnvironment),
+				value: 'kernelVariable',
+				label: localize('chatContext.notebook.kernelVariable', 'Kernel Variable...'),
+				command: {
+					id: 'notebook.chat.selectAndInsertKernelVariable',
+					title: localize('chatContext.notebook.selectkernelVariable', 'Select and Insert Kernel Variable'),
+					arguments: [{ widget, range: undefined }]
+				}
+			});
+		}
+
+		function extractTextFromIconLabel(label: string | undefined): string {
+			if (!label) {
+				return '';
+			}
+			const match = label.match(/\$\([^\)]+\)\s*(.+)/);
+			return match ? match[1] : label;
+		}
+
+		this._show(quickInputService, commandService, widget, quickChatService, quickPickItems.sort(function (a, b) {
+
+			const first = extractTextFromIconLabel(a.label).toUpperCase();
+			const second = extractTextFromIconLabel(b.label).toUpperCase();
+
+			return compare(first, second);
+		}), clipboardService, chatEditingService, '');
 	}
 
-	private _show(quickInputService: IQuickInputService, commandService: ICommandService, widget: IChatWidget, quickPickItems: (IChatContextQuickPickItem | QuickPickItem)[], query: string = '') {
+	private _show(quickInputService: IQuickInputService, commandService: ICommandService, widget: IChatWidget, quickChatService: IQuickChatService, quickPickItems: (IChatContextQuickPickItem | QuickPickItem)[], clipboardService: IClipboardService, chatEditingService: IChatEditingService | undefined, query: string = '') {
+		const providerOptions: AnythingQuickAccessProviderRunOptions = {
+			handleAccept: (item: IChatContextQuickPickItem) => {
+				if ('prefix' in item) {
+					this._show(quickInputService, commandService, widget, quickChatService, quickPickItems, clipboardService, chatEditingService, item.prefix);
+				} else {
+					if (!clipboardService) {
+						return;
+					}
+					this._attachContext(widget, commandService, clipboardService, chatEditingService, item);
+					if (isQuickChat(widget)) {
+						quickChatService.open();
+					}
+				}
+			},
+			additionPicks: quickPickItems,
+			filter: (item: IChatContextQuickPickItem | IQuickPickSeparator) => {
+				// Avoid attaching the same context twice
+				const attachedContext = widget.getContrib<ChatContextAttachments>(ChatContextAttachments.ID)?.getContext() ?? new Set();
+
+				if ('kind' in item && item.kind === 'image') {
+					return !attachedContext.has(item.id);
+				}
+
+				if ('symbol' in item && item.symbol) {
+					return !attachedContext.has(this._getFileContextId(item.symbol.location));
+				}
+
+				if (item && typeof item === 'object' && 'resource' in item && URI.isUri(item.resource)) {
+					return [Schemas.file, Schemas.vscodeRemote].includes(item.resource.scheme)
+						&& !attachedContext.has(this._getFileContextId({ resource: item.resource })); // Hack because Typescript doesn't narrow this type correctly
+				}
+
+				if (item && typeof item === 'object' && 'uri' in item && item.uri && item.range) {
+					return !attachedContext.has(this._getFileContextId({ uri: item.uri, range: item.range.decoration }));
+				}
+
+				if (!('command' in item) && item.id) {
+					return !attachedContext.has(item.id);
+				}
+
+				// Don't filter out dynamic variables which show secondary data (temporary)
+				return true;
+			}
+		};
 		quickInputService.quickAccess.show(query, {
 			enabledProviderPrefixes: [
 				AnythingQuickAccessProvider.PREFIX,
@@ -298,41 +510,7 @@ class AttachContextAction extends Action2 {
 				AbstractGotoSymbolQuickAccessProvider.PREFIX
 			],
 			placeholder: localize('chatContext.attach.placeholder', 'Search attachments'),
-			providerOptions: <AnythingQuickAccessProviderRunOptions>{
-				handleAccept: (item: IChatContextQuickPickItem) => {
-					if ('prefix' in item) {
-						this._show(quickInputService, commandService, widget, quickPickItems, item.prefix);
-					} else {
-						this._attachContext(widget, commandService, item);
-					}
-				},
-				additionPicks: quickPickItems,
-				filter: (item: IChatContextQuickPickItem) => {
-					// Avoid attaching the same context twice
-					const attachedContext = widget.getContrib<ChatContextAttachments>(ChatContextAttachments.ID)?.getContext() ?? new Set();
-
-					if ('symbol' in item && item.symbol) {
-						return !attachedContext.has(this._getFileContextId(item.symbol.location));
-					}
-
-					if (item && typeof item === 'object' && 'resource' in item && URI.isUri(item.resource)) {
-						return [Schemas.file, Schemas.vscodeRemote].includes(item.resource.scheme)
-							&& !attachedContext.has(this._getFileContextId({ resource: item.resource })); // Hack because Typescript doesn't narrow this type correctly
-					}
-
-					if (item && typeof item === 'object' && 'uri' in item && item.uri && item.range) {
-						return !attachedContext.has(this._getFileContextId({ uri: item.uri, range: item.range.decoration }));
-					}
-
-					if (!('command' in item) && item.id) {
-						return !attachedContext.has(item.id);
-					}
-
-					// Don't filter out dynamic variables which show secondary data (temporary)
-					return true;
-				}
-			}
+			providerOptions,
 		});
-
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatCopyActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatCopyActions.ts
index 5504c8e556f..989d2d72a41 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatCopyActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatCopyActions.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { localize2 } from 'vs/nls';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { CHAT_CATEGORY, stringifyItem } from 'vs/workbench/contrib/chat/browser/actions/chatActions';
-import { IChatWidgetService } from 'vs/workbench/contrib/chat/browser/chat';
-import { CONTEXT_RESPONSE_FILTERED } from 'vs/workbench/contrib/chat/common/chatContextKeys';
-import { IChatRequestViewModel, IChatResponseViewModel, isRequestVM, isResponseVM } from 'vs/workbench/contrib/chat/common/chatViewModel';
+import { ServicesAccessor } from '../../../../../editor/browser/editorExtensions.js';
+import { localize2 } from '../../../../../nls.js';
+import { Action2, MenuId, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js';
+import { CHAT_CATEGORY, stringifyItem } from './chatActions.js';
+import { IChatWidgetService } from '../chat.js';
+import { CONTEXT_RESPONSE_FILTERED } from '../../common/chatContextKeys.js';
+import { IChatRequestViewModel, IChatResponseViewModel, isRequestVM, isResponseVM } from '../../common/chatViewModel.js';
 
 export function registerChatCopyActions() {
 	registerAction2(class CopyAllAction extends Action2 {
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatDeveloperActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatDeveloperActions.ts
new file mode 100644
index 00000000000..4d9afa63ee4
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatDeveloperActions.ts
@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { ServicesAccessor } from '../../../../../editor/browser/editorExtensions.js';
+import { localize2 } from '../../../../../nls.js';
+import { Categories } from '../../../../../platform/action/common/actionCommonCategories.js';
+import { Action2, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { IChatWidgetService } from '../chat.js';
+
+export function registerChatDeveloperActions() {
+	registerAction2(LogChatInputHistoryAction);
+}
+
+class LogChatInputHistoryAction extends Action2 {
+
+	static readonly ID = 'workbench.action.chat.logInputHistory';
+
+	constructor() {
+		super({
+			id: LogChatInputHistoryAction.ID,
+			title: localize2('workbench.action.chat.logInputHistory.label', "Log Chat Input History"),
+			icon: Codicon.attach,
+			category: Categories.Developer,
+			f1: true
+		});
+	}
+
+	override async run(accessor: ServicesAccessor, ...args: any[]): Promise<void> {
+		const chatWidgetService = accessor.get(IChatWidgetService);
+		chatWidgetService.lastFocusedWidget?.logInputHistory();
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
index 5a6574db112..94d12546a42 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from 'vs/base/common/codicons';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { localize2 } from 'vs/nls';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { CHAT_CATEGORY } from 'vs/workbench/contrib/chat/browser/actions/chatActions';
-import { IChatWidget, IChatWidgetService } from 'vs/workbench/contrib/chat/browser/chat';
-import { IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { CONTEXT_CHAT_INPUT_HAS_AGENT, CONTEXT_CHAT_INPUT_HAS_TEXT, CONTEXT_CHAT_REQUEST_IN_PROGRESS, CONTEXT_IN_CHAT_INPUT } from 'vs/workbench/contrib/chat/common/chatContextKeys';
-import { chatAgentLeader, extractAgentAndCommand } from 'vs/workbench/contrib/chat/common/chatParserTypes';
-import { IChatService } from 'vs/workbench/contrib/chat/common/chatService';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
+import { ServicesAccessor } from '../../../../../editor/browser/editorExtensions.js';
+import { localize2 } from '../../../../../nls.js';
+import { Action2, MenuId, MenuRegistry, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IChatAgentService } from '../../common/chatAgents.js';
+import { CONTEXT_CHAT_INPUT_HAS_AGENT, CONTEXT_CHAT_INPUT_HAS_TEXT, CONTEXT_CHAT_LOCATION, CONTEXT_CHAT_REQUEST_IN_PROGRESS, CONTEXT_LANGUAGE_MODELS_ARE_USER_SELECTABLE, CONTEXT_IN_CHAT_INPUT, CONTEXT_PARTICIPANT_SUPPORTS_MODEL_PICKER } from '../../common/chatContextKeys.js';
+import { chatAgentLeader, extractAgentAndCommand } from '../../common/chatParserTypes.js';
+import { IChatService } from '../../common/chatService.js';
+import { IChatWidget, IChatWidgetService } from '../chat.js';
+import { CHAT_CATEGORY } from './chatActions.js';
 
 export interface IVoiceChatExecuteActionContext {
 	readonly disableTimeout?: boolean;
@@ -50,6 +50,7 @@ export class SubmitAction extends Action2 {
 				},
 				{
 					id: MenuId.ChatExecute,
+					order: 4,
 					when: CONTEXT_CHAT_REQUEST_IN_PROGRESS.negate(),
 					group: 'navigation',
 				},
@@ -66,6 +67,16 @@ export class SubmitAction extends Action2 {
 	}
 }
 
+export const ChatModelPickerActionId = 'workbench.action.chat.pickModel';
+MenuRegistry.appendMenuItem(MenuId.ChatExecute, {
+	command: {
+		id: ChatModelPickerActionId,
+		title: localize2('chat.pickModel.label', "Pick Model"),
+	},
+	order: 3,
+	group: 'navigation',
+	when: ContextKeyExpr.and(CONTEXT_LANGUAGE_MODELS_ARE_USER_SELECTABLE, CONTEXT_PARTICIPANT_SUPPORTS_MODEL_PICKER, ContextKeyExpr.equals(CONTEXT_CHAT_LOCATION.key, 'panel')),
+});
 
 export class ChatSubmitSecondaryAgentAction extends Action2 {
 	static readonly ID = 'workbench.action.chat.submitSecondaryAgent';
@@ -152,15 +163,17 @@ export class CancelAction extends Action2 {
 			title: localize2('interactive.cancel.label', "Cancel"),
 			f1: false,
 			category: CHAT_CATEGORY,
-			icon: Codicon.debugStop,
+			icon: Codicon.stopCircle,
 			menu: {
 				id: MenuId.ChatExecute,
 				when: CONTEXT_CHAT_REQUEST_IN_PROGRESS,
+				order: 4,
 				group: 'navigation',
 			},
 			keybinding: {
 				weight: KeybindingWeight.WorkbenchContrib,
 				primary: KeyMod.CtrlCmd | KeyCode.Escape,
+				win: { primary: KeyMod.Alt | KeyCode.Backspace },
 			}
 		});
 	}
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatFileTreeActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatFileTreeActions.ts
index cb745f5f620..6a04473055f 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatFileTreeActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatFileTreeActions.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { localize2 } from 'vs/nls';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { CHAT_CATEGORY } from 'vs/workbench/contrib/chat/browser/actions/chatActions';
-import { IChatWidgetService } from 'vs/workbench/contrib/chat/browser/chat';
-import { CONTEXT_IN_CHAT_SESSION, CONTEXT_CHAT_ENABLED } from 'vs/workbench/contrib/chat/common/chatContextKeys';
-import { IChatResponseViewModel, isResponseVM } from 'vs/workbench/contrib/chat/common/chatViewModel';
+import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
+import { ServicesAccessor } from '../../../../../editor/browser/editorExtensions.js';
+import { localize2 } from '../../../../../nls.js';
+import { Action2, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { CHAT_CATEGORY } from './chatActions.js';
+import { IChatWidgetService } from '../chat.js';
+import { CONTEXT_IN_CHAT_SESSION, CONTEXT_CHAT_ENABLED } from '../../common/chatContextKeys.js';
+import { IChatResponseViewModel, isResponseVM } from '../../common/chatViewModel.js';
 
 export function registerChatFileTreeActions() {
 	registerAction2(class NextFileTreeAction extends Action2 {
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatImportExport.ts b/src/vs/workbench/contrib/chat/browser/actions/chatImportExport.ts
index b4d1afffad3..709d2605bfe 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatImportExport.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatImportExport.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { joinPath } from 'vs/base/common/resources';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { localize, localize2 } from 'vs/nls';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IFileService } from 'vs/platform/files/common/files';
-import { CHAT_CATEGORY } from 'vs/workbench/contrib/chat/browser/actions/chatActions';
-import { IChatWidgetService } from 'vs/workbench/contrib/chat/browser/chat';
-import { IChatEditorOptions } from 'vs/workbench/contrib/chat/browser/chatEditor';
-import { ChatEditorInput } from 'vs/workbench/contrib/chat/browser/chatEditorInput';
-import { CONTEXT_CHAT_ENABLED } from 'vs/workbench/contrib/chat/common/chatContextKeys';
-import { isExportableSessionData } from 'vs/workbench/contrib/chat/common/chatModel';
-import { IChatService } from 'vs/workbench/contrib/chat/common/chatService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { VSBuffer } from '../../../../../base/common/buffer.js';
+import { joinPath } from '../../../../../base/common/resources.js';
+import { ServicesAccessor } from '../../../../../editor/browser/editorExtensions.js';
+import { localize, localize2 } from '../../../../../nls.js';
+import { Action2, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { IFileDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { CHAT_CATEGORY } from './chatActions.js';
+import { IChatWidgetService } from '../chat.js';
+import { IChatEditorOptions } from '../chatEditor.js';
+import { ChatEditorInput } from '../chatEditorInput.js';
+import { CONTEXT_CHAT_ENABLED } from '../../common/chatContextKeys.js';
+import { isExportableSessionData } from '../../common/chatModel.js';
+import { IChatService } from '../../common/chatService.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
 
 const defaultFileName = 'chat.json';
 const filters = [{ name: localize('chat.file.label', "Chat Session"), extensions: ['json'] }];
@@ -96,7 +96,8 @@ export function registerChatExportActions() {
 					throw new Error('Invalid chat session data');
 				}
 
-				await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { target: { data }, pinned: true } as IChatEditorOptions });
+				const options: IChatEditorOptions = { target: { data }, pinned: true };
+				await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options });
 			} catch (err) {
 				throw err;
 			}
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatMoveActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatMoveActions.ts
index 195ab2b3aa1..26f172ff914 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatMoveActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatMoveActions.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize2 } from 'vs/nls';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ActiveEditorContext } from 'vs/workbench/common/contextkeys';
-import { CHAT_CATEGORY, isChatViewTitleActionContext } from 'vs/workbench/contrib/chat/browser/actions/chatActions';
-import { CHAT_VIEW_ID, IChatWidgetService } from 'vs/workbench/contrib/chat/browser/chat';
-import { IChatEditorOptions } from 'vs/workbench/contrib/chat/browser/chatEditor';
-import { ChatEditorInput } from 'vs/workbench/contrib/chat/browser/chatEditorInput';
-import { ChatViewPane } from 'vs/workbench/contrib/chat/browser/chatViewPane';
-import { CONTEXT_CHAT_ENABLED } from 'vs/workbench/contrib/chat/common/chatContextKeys';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { ACTIVE_GROUP, AUX_WINDOW_GROUP, IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
+import { localize2 } from '../../../../../nls.js';
+import { Action2, MenuId, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ActiveEditorContext } from '../../../../common/contextkeys.js';
+import { CHAT_CATEGORY, isChatViewTitleActionContext } from './chatActions.js';
+import { CHAT_VIEW_ID, IChatWidgetService } from '../chat.js';
+import { ChatEditor, IChatEditorOptions } from '../chatEditor.js';
+import { ChatEditorInput } from '../chatEditorInput.js';
+import { ChatViewPane } from '../chatViewPane.js';
+import { CONTEXT_CHAT_ENABLED } from '../../common/chatContextKeys.js';
+import { IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
+import { ACTIVE_GROUP, AUX_WINDOW_GROUP, IEditorService } from '../../../../services/editor/common/editorService.js';
+import { IViewsService } from '../../../../services/views/common/viewsService.js';
 
 enum MoveToNewLocation {
 	Editor = 'Editor',
@@ -92,12 +92,11 @@ export function registerMoveActions() {
 
 async function executeMoveToAction(accessor: ServicesAccessor, moveTo: MoveToNewLocation, chatView?: ChatViewPane) {
 	const widgetService = accessor.get(IChatWidgetService);
-	const viewService = accessor.get(IViewsService);
 	const editorService = accessor.get(IEditorService);
 
 	const widget = chatView?.widget ?? widgetService.lastFocusedWidget;
 	if (!widget || !('viewId' in widget.viewContext)) {
-		await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: <IChatEditorOptions>{ pinned: true } }, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP);
+		await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { pinned: true } }, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP);
 		return;
 	}
 
@@ -107,11 +106,11 @@ async function executeMoveToAction(accessor: ServicesAccessor, moveTo: MoveToNew
 	}
 
 	const sessionId = viewModel.sessionId;
-	const view = await viewService.openView(widget.viewContext.viewId) as ChatViewPane;
-	const viewState = view.widget.getViewState();
-	view.clear();
+	const viewState = widget.getViewState();
+	widget.clear();
 
-	await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: <IChatEditorOptions>{ target: { sessionId }, pinned: true, viewState: viewState } }, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP);
+	const options: IChatEditorOptions = { target: { sessionId }, pinned: true, viewState: viewState };
+	await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options }, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP);
 }
 
 async function moveToSidebar(accessor: ServicesAccessor): Promise<void> {
@@ -119,12 +118,16 @@ async function moveToSidebar(accessor: ServicesAccessor): Promise<void> {
 	const editorService = accessor.get(IEditorService);
 	const editorGroupService = accessor.get(IEditorGroupsService);
 
-	const chatEditorInput = editorService.activeEditor;
-	if (chatEditorInput instanceof ChatEditorInput && chatEditorInput.sessionId) {
-		await editorService.closeEditor({ editor: chatEditorInput, groupId: editorGroupService.activeGroup.id });
-		const view = await viewsService.openView(CHAT_VIEW_ID) as ChatViewPane;
-		view.loadSession(chatEditorInput.sessionId);
+	const chatEditor = editorService.activeEditorPane;
+	const chatEditorInput = chatEditor?.input;
+	let view: ChatViewPane;
+	if (chatEditor instanceof ChatEditor && chatEditorInput instanceof ChatEditorInput && chatEditorInput.sessionId) {
+		await editorService.closeEditor({ editor: chatEditor.input, groupId: editorGroupService.activeGroup.id });
+		view = await viewsService.openView(CHAT_VIEW_ID) as ChatViewPane;
+		view.loadSession(chatEditorInput.sessionId, chatEditor.getViewState());
 	} else {
-		await viewsService.openView(CHAT_VIEW_ID);
+		view = await viewsService.openView(CHAT_VIEW_ID) as ChatViewPane;
 	}
+
+	view.focus();
 }
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.ts
index f914b8902ee..05652beb196 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from 'vs/base/common/codicons';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { Selection } from 'vs/editor/common/core/selection';
-import { localize, localize2 } from 'vs/nls';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { CHAT_CATEGORY } from 'vs/workbench/contrib/chat/browser/actions/chatActions';
-import { IQuickChatOpenOptions, IQuickChatService } from 'vs/workbench/contrib/chat/browser/chat';
-import { CONTEXT_CHAT_ENABLED } from 'vs/workbench/contrib/chat/common/chatContextKeys';
-import { InlineChatController } from 'vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
+import { ICodeEditorService } from '../../../../../editor/browser/services/codeEditorService.js';
+import { Selection } from '../../../../../editor/common/core/selection.js';
+import { localize, localize2 } from '../../../../../nls.js';
+import { Action2, MenuId, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { CHAT_CATEGORY } from './chatActions.js';
+import { IQuickChatOpenOptions, IQuickChatService } from '../chat.js';
+import { CONTEXT_CHAT_ENABLED } from '../../common/chatContextKeys.js';
+import { InlineChatController } from '../../../inlineChat/browser/inlineChatController.js';
 
 export const ASK_QUICK_QUESTION_ACTION_ID = 'workbench.action.quickchat.toggle';
 export function registerQuickChatActions() {
@@ -114,6 +114,11 @@ class QuickChatGlobalAction extends Action2 {
 					primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyMod.Alt | KeyCode.KeyI
 				}
 			},
+			menu: {
+				id: MenuId.ChatCommandCenter,
+				group: 'c_quickChat',
+				order: 5
+			},
 			metadata: {
 				description: localize('toggle.desc', 'Toggle the quick chat'),
 				args: [{
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts
index 4a2455ea71f..cae373b04d0 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts
@@ -3,25 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from 'vs/base/common/codicons';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { marked } from 'vs/base/common/marked/marked';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { IBulkEditService } from 'vs/editor/browser/services/bulkEditService';
-import { localize2 } from 'vs/nls';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ResourceNotebookCellEdit } from 'vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
-import { CHAT_CATEGORY } from 'vs/workbench/contrib/chat/browser/actions/chatActions';
-import { IChatWidgetService } from 'vs/workbench/contrib/chat/browser/chat';
-import { CONTEXT_CHAT_RESPONSE_SUPPORT_ISSUE_REPORTING, CONTEXT_IN_CHAT_INPUT, CONTEXT_IN_CHAT_SESSION, CONTEXT_REQUEST, CONTEXT_RESPONSE, CONTEXT_RESPONSE_FILTERED, CONTEXT_RESPONSE_VOTE } from 'vs/workbench/contrib/chat/common/chatContextKeys';
-import { IChatService, ChatAgentVoteDirection } from 'vs/workbench/contrib/chat/common/chatService';
-import { isRequestVM, isResponseVM } from 'vs/workbench/contrib/chat/common/chatViewModel';
-import { INotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CellEditType, CellKind, NOTEBOOK_EDITOR_ID } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { NOTEBOOK_IS_ACTIVE_EDITOR } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
+import { marked } from '../../../../../base/common/marked/marked.js';
+import { ServicesAccessor } from '../../../../../editor/browser/editorExtensions.js';
+import { IBulkEditService } from '../../../../../editor/browser/services/bulkEditService.js';
+import { localize2 } from '../../../../../nls.js';
+import { Action2, MenuId, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { ResourceNotebookCellEdit } from '../../../bulkEdit/browser/bulkCellEdits.js';
+import { MENU_INLINE_CHAT_WIDGET_SECONDARY } from '../../../inlineChat/common/inlineChat.js';
+import { INotebookEditor } from '../../../notebook/browser/notebookBrowser.js';
+import { CellEditType, CellKind, NOTEBOOK_EDITOR_ID } from '../../../notebook/common/notebookCommon.js';
+import { NOTEBOOK_IS_ACTIVE_EDITOR } from '../../../notebook/common/notebookContextKeys.js';
+import { CONTEXT_CHAT_RESPONSE_SUPPORT_ISSUE_REPORTING, CONTEXT_IN_CHAT_INPUT, CONTEXT_IN_CHAT_SESSION, CONTEXT_ITEM_ID, CONTEXT_LAST_ITEM_ID, CONTEXT_REQUEST, CONTEXT_RESPONSE, CONTEXT_RESPONSE_ERROR, CONTEXT_RESPONSE_FILTERED, CONTEXT_RESPONSE_VOTE } from '../../common/chatContextKeys.js';
+import { ChatAgentVoteDirection, ChatAgentVoteDownReason, IChatService } from '../../common/chatService.js';
+import { isRequestVM, isResponseVM } from '../../common/chatViewModel.js';
+import { IChatWidgetService } from '../chat.js';
+import { CHAT_CATEGORY } from './chatActions.js';
+
+export const MarkUnhelpfulActionId = 'workbench.action.chat.markUnhelpful';
 
 export function registerChatTitleActions() {
 	registerAction2(class MarkHelpfulAction extends Action2 {
@@ -33,12 +36,17 @@ export function registerChatTitleActions() {
 				category: CHAT_CATEGORY,
 				icon: Codicon.thumbsup,
 				toggled: CONTEXT_RESPONSE_VOTE.isEqualTo('up'),
-				menu: {
-					id: MenuId.ChatMessageTitle,
+				menu: [{
+					id: MenuId.ChatMessageFooter,
 					group: 'navigation',
 					order: 1,
-					when: CONTEXT_RESPONSE
-				}
+					when: ContextKeyExpr.and(CONTEXT_RESPONSE, CONTEXT_RESPONSE_ERROR.negate())
+				}, {
+					id: MENU_INLINE_CHAT_WIDGET_SECONDARY,
+					group: 'navigation',
+					order: 1,
+					when: ContextKeyExpr.and(CONTEXT_RESPONSE, CONTEXT_RESPONSE_ERROR.negate())
+				}]
 			});
 		}
 
@@ -51,33 +59,41 @@ export function registerChatTitleActions() {
 			const chatService = accessor.get(IChatService);
 			chatService.notifyUserAction({
 				agentId: item.agent?.id,
+				command: item.slashCommand?.name,
 				sessionId: item.sessionId,
 				requestId: item.requestId,
 				result: item.result,
 				action: {
 					kind: 'vote',
 					direction: ChatAgentVoteDirection.Up,
+					reason: undefined
 				}
 			});
 			item.setVote(ChatAgentVoteDirection.Up);
+			item.setVoteDownReason(undefined);
 		}
 	});
 
 	registerAction2(class MarkUnhelpfulAction extends Action2 {
 		constructor() {
 			super({
-				id: 'workbench.action.chat.markUnhelpful',
+				id: MarkUnhelpfulActionId,
 				title: localize2('interactive.unhelpful.label', "Unhelpful"),
 				f1: false,
 				category: CHAT_CATEGORY,
 				icon: Codicon.thumbsdown,
 				toggled: CONTEXT_RESPONSE_VOTE.isEqualTo('down'),
-				menu: {
-					id: MenuId.ChatMessageTitle,
+				menu: [{
+					id: MenuId.ChatMessageFooter,
 					group: 'navigation',
 					order: 2,
-					when: CONTEXT_RESPONSE
-				}
+					when: ContextKeyExpr.and(CONTEXT_RESPONSE)
+				}, {
+					id: MENU_INLINE_CHAT_WIDGET_SECONDARY,
+					group: 'navigation',
+					order: 2,
+					when: ContextKeyExpr.and(CONTEXT_RESPONSE, CONTEXT_RESPONSE_ERROR.negate())
+				}]
 			});
 		}
 
@@ -87,18 +103,27 @@ export function registerChatTitleActions() {
 				return;
 			}
 
+			const reason = args[1];
+			if (typeof reason !== 'string') {
+				return;
+			}
+
+			item.setVote(ChatAgentVoteDirection.Down);
+			item.setVoteDownReason(reason as ChatAgentVoteDownReason);
+
 			const chatService = accessor.get(IChatService);
 			chatService.notifyUserAction({
 				agentId: item.agent?.id,
+				command: item.slashCommand?.name,
 				sessionId: item.sessionId,
 				requestId: item.requestId,
 				result: item.result,
 				action: {
 					kind: 'vote',
 					direction: ChatAgentVoteDirection.Down,
+					reason: item.voteDownReason
 				}
 			});
-			item.setVote(ChatAgentVoteDirection.Down);
 		}
 	});
 
@@ -110,12 +135,17 @@ export function registerChatTitleActions() {
 				f1: false,
 				category: CHAT_CATEGORY,
 				icon: Codicon.report,
-				menu: {
-					id: MenuId.ChatMessageTitle,
+				menu: [{
+					id: MenuId.ChatMessageFooter,
 					group: 'navigation',
 					order: 3,
 					when: ContextKeyExpr.and(CONTEXT_CHAT_RESPONSE_SUPPORT_ISSUE_REPORTING, CONTEXT_RESPONSE)
-				}
+				}, {
+					id: MENU_INLINE_CHAT_WIDGET_SECONDARY,
+					group: 'navigation',
+					order: 3,
+					when: ContextKeyExpr.and(CONTEXT_CHAT_RESPONSE_SUPPORT_ISSUE_REPORTING, CONTEXT_RESPONSE)
+				}]
 			});
 		}
 
@@ -128,6 +158,7 @@ export function registerChatTitleActions() {
 			const chatService = accessor.get(IChatService);
 			chatService.notifyUserAction({
 				agentId: item.agent?.id,
+				command: item.slashCommand?.name,
 				sessionId: item.sessionId,
 				requestId: item.requestId,
 				result: item.result,
@@ -138,6 +169,36 @@ export function registerChatTitleActions() {
 		}
 	});
 
+	registerAction2(class RetryChatAction extends Action2 {
+		constructor() {
+			super({
+				id: 'workbench.action.chat.retry',
+				title: localize2('chat.retry.label', "Retry"),
+				f1: false,
+				category: CHAT_CATEGORY,
+				icon: Codicon.refresh,
+				menu: [{
+					id: MenuId.ChatMessageFooter,
+					group: 'navigation',
+					when: ContextKeyExpr.and(
+						CONTEXT_RESPONSE,
+						ContextKeyExpr.in(CONTEXT_ITEM_ID.key, CONTEXT_LAST_ITEM_ID.key))
+				}]
+			});
+		}
+
+		run(accessor: ServicesAccessor, ...args: any[]) {
+			const item = args[0];
+			if (!isResponseVM(item)) {
+				return;
+			}
+
+			const chatService = accessor.get(IChatService);
+			const request = chatService.getSession(item.sessionId)?.getRequests().find(candidate => candidate.id === item.requestId);
+			chatService.resendRequest(request!);
+		}
+	});
+
 	registerAction2(class InsertToNotebookAction extends Action2 {
 		constructor() {
 			super({
@@ -147,7 +208,7 @@ export function registerChatTitleActions() {
 				category: CHAT_CATEGORY,
 				icon: Codicon.insert,
 				menu: {
-					id: MenuId.ChatMessageTitle,
+					id: MenuId.ChatMessageFooter,
 					group: 'navigation',
 					isHiddenByDefault: true,
 					when: ContextKeyExpr.and(NOTEBOOK_IS_ACTIVE_EDITOR, CONTEXT_RESPONSE, CONTEXT_RESPONSE_FILTERED.negate())
@@ -174,7 +235,7 @@ export function registerChatTitleActions() {
 					return;
 				}
 
-				const value = item.response.asString();
+				const value = item.response.toString();
 				const splitContents = splitMarkdownAndCodeBlocks(value);
 
 				const focusRange = notebookEditor.getFocus();
diff --git a/src/vs/workbench/contrib/chat/browser/actions/codeBlockOperations.ts b/src/vs/workbench/contrib/chat/browser/actions/codeBlockOperations.ts
new file mode 100644
index 00000000000..161860a4efc
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/actions/codeBlockOperations.ts
@@ -0,0 +1,469 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import { coalesce } from '../../../../../base/common/arrays.js';
+import { AsyncIterableObject } from '../../../../../base/common/async.js';
+import { VSBuffer } from '../../../../../base/common/buffer.js';
+import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { CharCode } from '../../../../../base/common/charCode.js';
+import { isCancellationError } from '../../../../../base/common/errors.js';
+import { isEqual } from '../../../../../base/common/resources.js';
+import * as strings from '../../../../../base/common/strings.js';
+import { IActiveCodeEditor, isCodeEditor, isDiffEditor } from '../../../../../editor/browser/editorBrowser.js';
+import { IBulkEditService, ResourceTextEdit } from '../../../../../editor/browser/services/bulkEditService.js';
+import { ICodeEditorService } from '../../../../../editor/browser/services/codeEditorService.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { ConversationRequest, ConversationResponse, DocumentContextItem, IWorkspaceFileEdit, IWorkspaceTextEdit } from '../../../../../editor/common/languages.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
+import { ILanguageFeaturesService } from '../../../../../editor/common/services/languageFeatures.js';
+import { localize } from '../../../../../nls.js';
+import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { ILogService } from '../../../../../platform/log/common/log.js';
+import { IProgressService, ProgressLocation } from '../../../../../platform/progress/common/progress.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { ITextFileService } from '../../../../services/textfile/common/textfiles.js';
+import { InlineChatController } from '../../../inlineChat/browser/inlineChatController.js';
+import { insertCell } from '../../../notebook/browser/controller/cellOperations.js';
+import { IActiveNotebookEditor, INotebookEditor } from '../../../notebook/browser/notebookBrowser.js';
+import { CellKind, NOTEBOOK_EDITOR_ID } from '../../../notebook/common/notebookCommon.js';
+import { getReferencesAsDocumentContext } from '../../common/chatCodeMapperService.js';
+import { ChatUserAction, IChatService } from '../../common/chatService.js';
+import { isRequestVM, isResponseVM } from '../../common/chatViewModel.js';
+import { ICodeBlockActionContext } from '../codeBlockPart.js';
+
+export class InsertCodeBlockOperation {
+	constructor(
+		@IEditorService private readonly editorService: IEditorService,
+		@ITextFileService private readonly textFileService: ITextFileService,
+		@IBulkEditService private readonly bulkEditService: IBulkEditService,
+		@ICodeEditorService private readonly codeEditorService: ICodeEditorService,
+		@IChatService private readonly chatService: IChatService,
+		@ILanguageService private readonly languageService: ILanguageService,
+		@IDialogService private readonly dialogService: IDialogService,
+	) {
+	}
+
+	public async run(context: ICodeBlockActionContext) {
+		const activeEditorControl = getEditableActiveCodeEditor(this.editorService);
+		if (activeEditorControl) {
+			await this.handleTextEditor(activeEditorControl, context);
+		} else {
+			const activeNotebookEditor = getActiveNotebookEditor(this.editorService);
+			if (activeNotebookEditor) {
+				await this.handleNotebookEditor(activeNotebookEditor, context);
+			} else {
+				this.notify(localize('insertCodeBlock.noActiveEditor', "To insert the code block, open a code editor or notebook editor and set the cursor at the location where to insert the code block."));
+			}
+		}
+		notifyUserAction(this.chatService, context, {
+			kind: 'insert',
+			codeBlockIndex: context.codeBlockIndex,
+			totalCharacters: context.code.length
+		});
+	}
+
+	private async handleNotebookEditor(notebookEditor: IActiveNotebookEditor, codeBlockContext: ICodeBlockActionContext): Promise<boolean> {
+		if (notebookEditor.isReadOnly) {
+			this.notify(localize('insertCodeBlock.readonlyNotebook', "Cannot insert the code block to read-only notebook editor."));
+			return false;
+		}
+		const focusRange = notebookEditor.getFocus();
+		const next = Math.max(focusRange.end - 1, 0);
+		insertCell(this.languageService, notebookEditor, next, CellKind.Code, 'below', codeBlockContext.code, true);
+		return true;
+	}
+
+	private async handleTextEditor(codeEditor: IActiveCodeEditor, codeBlockContext: ICodeBlockActionContext): Promise<boolean> {
+		const activeModel = codeEditor.getModel();
+		if (isReadOnly(activeModel, this.textFileService)) {
+			this.notify(localize('insertCodeBlock.readonly', "Cannot insert the code block to read-only code editor."));
+			return false;
+		}
+
+		const range = codeEditor.getSelection() ?? new Range(activeModel.getLineCount(), 1, activeModel.getLineCount(), 1);
+		const text = reindent(codeBlockContext.code, activeModel, range.startLineNumber);
+
+		const edits = [new ResourceTextEdit(activeModel.uri, { range, text })];
+		await this.bulkEditService.apply(edits);
+		this.codeEditorService.listCodeEditors().find(editor => editor.getModel()?.uri.toString() === activeModel.uri.toString())?.focus();
+		return true;
+	}
+
+	private notify(message: string) {
+		//this.notificationService.notify({ severity: Severity.Info, message });
+		this.dialogService.info(message);
+	}
+}
+
+type IComputeEditsResult = { readonly edits?: Array<IWorkspaceTextEdit | IWorkspaceFileEdit>; readonly codeMapper?: string };
+
+export class ApplyCodeBlockOperation {
+
+	private inlineChatPreview: InlineChatPreview | undefined;
+
+	constructor(
+		@IEditorService private readonly editorService: IEditorService,
+		@ITextFileService private readonly textFileService: ITextFileService,
+		@IBulkEditService private readonly bulkEditService: IBulkEditService,
+		@ICodeEditorService private readonly codeEditorService: ICodeEditorService,
+		@IChatService private readonly chatService: IChatService,
+		@ILanguageFeaturesService private readonly languageFeaturesService: ILanguageFeaturesService,
+		@IProgressService private readonly progressService: IProgressService,
+		@ILanguageService private readonly languageService: ILanguageService,
+		@IFileService private readonly fileService: IFileService,
+		@IDialogService private readonly dialogService: IDialogService,
+		@ILogService private readonly logService: ILogService,
+	) {
+	}
+
+	public async run(context: ICodeBlockActionContext): Promise<void> {
+		if (this.inlineChatPreview && this.inlineChatPreview.isOpen()) {
+			await this.dialogService.info(
+				localize('overlap', "Another code change is being previewed. Please apply or discard the pending changes first."),
+			);
+			return;
+		}
+
+		let activeEditorControl = getEditableActiveCodeEditor(this.editorService);
+
+		if (context.codemapperUri && !isEqual(activeEditorControl?.getModel().uri, context.codemapperUri)) {
+			// If the code block is from a code mapper, first reveal the target file
+			try {
+				// If the file doesn't exist yet, create it
+				if (!(await this.fileService.exists(context.codemapperUri))) {
+					// TODO: try to find the file in the workspace
+
+					await this.fileService.writeFile(context.codemapperUri, VSBuffer.fromString(''));
+				}
+				await this.editorService.openEditor({ resource: context.codemapperUri });
+
+				activeEditorControl = getEditableActiveCodeEditor(this.editorService);
+				if (activeEditorControl) {
+					this.tryToRevealCodeBlock(activeEditorControl, context.code);
+				}
+			} catch (e) {
+				this.logService.info('[ApplyCodeBlockOperation] error opening code mapper file', context.codemapperUri, e);
+			}
+		}
+
+		let result: IComputeEditsResult | undefined = undefined;
+
+		if (activeEditorControl) {
+			await this.handleTextEditor(activeEditorControl, context);
+		} else {
+			const activeNotebookEditor = getActiveNotebookEditor(this.editorService);
+			if (activeNotebookEditor) {
+				result = await this.handleNotebookEditor(activeNotebookEditor, context);
+			} else {
+				this.notify(localize('applyCodeBlock.noActiveEditor', "To apply this code block, open a code or notebook editor."));
+			}
+		}
+		notifyUserAction(this.chatService, context, {
+			kind: 'apply',
+			codeBlockIndex: context.codeBlockIndex,
+			totalCharacters: context.code.length,
+			codeMapper: result?.codeMapper,
+			editsProposed: !!result?.edits,
+		});
+	}
+
+	private async handleNotebookEditor(notebookEditor: IActiveNotebookEditor, codeBlockContext: ICodeBlockActionContext): Promise<IComputeEditsResult | undefined> {
+		if (notebookEditor.isReadOnly) {
+			this.notify(localize('applyCodeBlock.readonlyNotebook', "Cannot apply code block to read-only notebook editor."));
+			return undefined;
+		}
+		const focusRange = notebookEditor.getFocus();
+		const next = Math.max(focusRange.end - 1, 0);
+		insertCell(this.languageService, notebookEditor, next, CellKind.Code, 'below', codeBlockContext.code, true);
+		return undefined;
+	}
+
+	private async handleTextEditor(codeEditor: IActiveCodeEditor, codeBlockContext: ICodeBlockActionContext): Promise<IComputeEditsResult | undefined> {
+		if (isReadOnly(codeEditor.getModel(), this.textFileService)) {
+			this.notify(localize('applyCodeBlock.readonly', "Cannot apply code block to read-only file."));
+			return undefined;
+		}
+
+		const result = await this.computeEdits(codeEditor, codeBlockContext);
+		if (result.edits) {
+			const showWithPreview = await this.applyWithInlinePreview(result.edits, codeEditor);
+			if (!showWithPreview) {
+				await this.bulkEditService.apply(result.edits, { showPreview: true });
+				const activeModel = codeEditor.getModel();
+				this.codeEditorService.listCodeEditors().find(editor => editor.getModel()?.uri.toString() === activeModel.uri.toString())?.focus();
+			}
+		}
+		return result;
+	}
+
+	private async computeEdits(codeEditor: IActiveCodeEditor, codeBlockActionContext: ICodeBlockActionContext): Promise<IComputeEditsResult> {
+		const activeModel = codeEditor.getModel();
+
+		const mappedEditsProviders = this.languageFeaturesService.mappedEditsProvider.ordered(activeModel);
+		if (mappedEditsProviders.length > 0) {
+
+			// 0th sub-array - editor selections array if there are any selections
+			// 1st sub-array - array with documents used to get the chat reply
+			const docRefs: DocumentContextItem[][] = [];
+			collectDocumentContextFromSelections(codeEditor, docRefs);
+			collectDocumentContextFromContext(codeBlockActionContext, docRefs);
+
+			const cancellationTokenSource = new CancellationTokenSource();
+			let codeMapper; // the last used code mapper
+			try {
+				const result = await this.progressService.withProgress<IComputeEditsResult | undefined>(
+					{ location: ProgressLocation.Notification, delay: 500, sticky: true, cancellable: true },
+					async progress => {
+						for (const provider of mappedEditsProviders) {
+							codeMapper = provider.displayName;
+							progress.report({ message: localize('applyCodeBlock.progress', "Applying code block using {0}...", codeMapper) });
+							const mappedEdits = await provider.provideMappedEdits(
+								activeModel,
+								[codeBlockActionContext.code],
+								{
+									documents: docRefs,
+									conversation: getChatConversation(codeBlockActionContext),
+								},
+								cancellationTokenSource.token
+							);
+							if (mappedEdits) {
+								return { edits: mappedEdits.edits, codeMapper };
+							}
+						}
+						return undefined;
+					},
+					() => cancellationTokenSource.cancel()
+				);
+				if (result) {
+					return result;
+				}
+			} catch (e) {
+				if (!isCancellationError(e)) {
+					this.notify(localize('applyCodeBlock.error', "Failed to apply code block: {0}", e.message));
+				}
+			} finally {
+				cancellationTokenSource.dispose();
+			}
+			return { edits: [], codeMapper };
+		}
+		return { edits: [], codeMapper: undefined };
+	}
+
+	private async applyWithInlinePreview(edits: Array<IWorkspaceTextEdit | IWorkspaceFileEdit>, codeEditor: IActiveCodeEditor): Promise<boolean> {
+		const firstEdit = edits[0];
+		if (!ResourceTextEdit.is(firstEdit)) {
+			return false;
+		}
+		const resource = firstEdit.resource;
+		const textEdits = coalesce(edits.map(edit => ResourceTextEdit.is(edit) && isEqual(resource, edit.resource) ? edit.textEdit : undefined));
+		if (textEdits.length !== edits.length) { // more than one file has changed, fall back to bulk edit preview
+			return false;
+		}
+		const editorToApply = await this.codeEditorService.openCodeEditor({ resource }, codeEditor);
+		if (editorToApply) {
+			const inlineChatController = InlineChatController.get(editorToApply);
+			if (inlineChatController) {
+				const tokenSource = new CancellationTokenSource();
+				let isOpen = true;
+				const firstEdit = textEdits[0];
+				editorToApply.revealLineInCenterIfOutsideViewport(firstEdit.range.startLineNumber);
+				const promise = inlineChatController.reviewEdits(textEdits[0].range, AsyncIterableObject.fromArray(textEdits), tokenSource.token);
+				promise.finally(() => {
+					isOpen = false;
+					tokenSource.dispose();
+				});
+				this.inlineChatPreview = {
+					promise,
+					isOpen: () => isOpen,
+					cancel: () => tokenSource.cancel(),
+				};
+				return true;
+			}
+		}
+		return false;
+	}
+
+	private tryToRevealCodeBlock(codeEditor: IActiveCodeEditor, codeBlock: string): void {
+		const match = codeBlock.match(/(\S[^\n]*)\n/); // substring that starts with a non-whitespace character and ends with a newline
+		if (match && match[1].length > 10) {
+			const findMatch = codeEditor.getModel().findNextMatch(match[1], { lineNumber: 1, column: 1 }, false, false, null, false);
+			if (findMatch) {
+				codeEditor.revealRangeInCenter(findMatch.range);
+			}
+		}
+	}
+
+	private notify(message: string) {
+		//this.notificationService.notify({ severity: Severity.Info, message });
+		this.dialogService.info(message);
+	}
+
+}
+
+type InlineChatPreview = {
+	isOpen(): boolean;
+	cancel(): void;
+	readonly promise: Promise<boolean>;
+};
+
+function notifyUserAction(chatService: IChatService, context: ICodeBlockActionContext, action: ChatUserAction) {
+	if (isResponseVM(context.element)) {
+		chatService.notifyUserAction({
+			agentId: context.element.agent?.id,
+			command: context.element.slashCommand?.name,
+			sessionId: context.element.sessionId,
+			requestId: context.element.requestId,
+			result: context.element.result,
+			action
+		});
+	}
+}
+
+function getActiveNotebookEditor(editorService: IEditorService): IActiveNotebookEditor | undefined {
+	const activeEditorPane = editorService.activeEditorPane;
+	if (activeEditorPane?.getId() === NOTEBOOK_EDITOR_ID) {
+		const notebookEditor = activeEditorPane.getControl() as INotebookEditor;
+		if (notebookEditor.hasModel()) {
+			return notebookEditor;
+		}
+	}
+	return undefined;
+}
+
+function getEditableActiveCodeEditor(editorService: IEditorService): IActiveCodeEditor | undefined {
+	const activeCodeEditorInNotebook = getActiveNotebookEditor(editorService)?.activeCodeEditor;
+	if (activeCodeEditorInNotebook && activeCodeEditorInNotebook.hasTextFocus() && activeCodeEditorInNotebook.hasModel()) {
+		return activeCodeEditorInNotebook;
+	}
+
+	let activeEditorControl = editorService.activeTextEditorControl;
+	if (isDiffEditor(activeEditorControl)) {
+		activeEditorControl = activeEditorControl.getOriginalEditor().hasTextFocus() ? activeEditorControl.getOriginalEditor() : activeEditorControl.getModifiedEditor();
+	}
+
+	if (!isCodeEditor(activeEditorControl)) {
+		return undefined;
+	}
+
+	if (!activeEditorControl.hasModel()) {
+		return undefined;
+	}
+	return activeEditorControl;
+}
+
+function isReadOnly(model: ITextModel, textFileService: ITextFileService): boolean {
+	// Check if model is editable, currently only support untitled and text file
+	const activeTextModel = textFileService.files.get(model.uri) ?? textFileService.untitled.get(model.uri);
+	return !!activeTextModel?.isReadonly();
+}
+
+function collectDocumentContextFromSelections(codeEditor: IActiveCodeEditor, result: DocumentContextItem[][]): void {
+	const activeModel = codeEditor.getModel();
+	const currentDocUri = activeModel.uri;
+	const currentDocVersion = activeModel.getVersionId();
+	const selections = codeEditor.getSelections();
+	if (selections.length > 0) {
+		result.push([
+			{
+				uri: currentDocUri,
+				version: currentDocVersion,
+				ranges: selections,
+			}
+		]);
+	}
+}
+
+
+function collectDocumentContextFromContext(context: ICodeBlockActionContext, result: DocumentContextItem[][]): void {
+	if (isResponseVM(context.element) && context.element.usedContext?.documents) {
+		result.push(context.element.usedContext.documents);
+	}
+}
+
+function getChatConversation(context: ICodeBlockActionContext): (ConversationRequest | ConversationResponse)[] {
+	// TODO@aeschli for now create a conversation with just the current element
+	// this will be expanded in the future to include the request and any other responses
+
+	if (isResponseVM(context.element)) {
+		return [{
+			type: 'response',
+			message: context.element.response.toMarkdown(),
+			references: getReferencesAsDocumentContext(context.element.contentReferences)
+		}];
+	} else if (isRequestVM(context.element)) {
+		return [{
+			type: 'request',
+			message: context.element.messageText,
+		}];
+	} else {
+		return [];
+	}
+}
+
+function reindent(codeBlockContent: string, model: ITextModel, seletionStartLine: number): string {
+	const newContent = strings.splitLines(codeBlockContent);
+	if (newContent.length === 0) {
+		return codeBlockContent;
+	}
+
+	const formattingOptions = model.getFormattingOptions();
+	const codeIndentLevel = computeIndentation(model.getLineContent(seletionStartLine), formattingOptions.tabSize).level;
+
+	const indents = newContent.map(line => computeIndentation(line, formattingOptions.tabSize));
+
+	// find the smallest indent level in the code block
+	const newContentIndentLevel = indents.reduce<number>((min, indent, index) => {
+		if (indent.length !== newContent[index].length) { // ignore empty lines
+			return Math.min(indent.level, min);
+		}
+		return min;
+	}, Number.MAX_VALUE);
+
+	if (newContentIndentLevel === Number.MAX_VALUE || newContentIndentLevel === codeIndentLevel) {
+		// all lines are empty or the indent is already correct
+		return codeBlockContent;
+	}
+	const newLines = [];
+	for (let i = 0; i < newContent.length; i++) {
+		const { level, length } = indents[i];
+		const newLevel = Math.max(0, codeIndentLevel + level - newContentIndentLevel);
+		const newIndentation = formattingOptions.insertSpaces ? ' '.repeat(formattingOptions.tabSize * newLevel) : '\t'.repeat(newLevel);
+		newLines.push(newIndentation + newContent[i].substring(length));
+	}
+	return newLines.join('\n');
+}
+
+/**
+ * Returns:
+ *  - level: the line's the ident level in tabs
+ *  - length: the number of characters of the leading whitespace
+ */
+export function computeIndentation(line: string, tabSize: number): { level: number; length: number } {
+	let nSpaces = 0;
+	let level = 0;
+	let i = 0;
+	let length = 0;
+	const len = line.length;
+	while (i < len) {
+		const chCode = line.charCodeAt(i);
+		if (chCode === CharCode.Space) {
+			nSpaces++;
+			if (nSpaces === tabSize) {
+				level++;
+				nSpaces = 0;
+				length = i + 1;
+			}
+		} else if (chCode === CharCode.Tab) {
+			level++;
+			nSpaces = 0;
+			length = i + 1;
+		} else {
+			break;
+		}
+		i++;
+	}
+	return { level, length };
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
index 44064deca56..dda6330c614 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -3,61 +3,71 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { MarkdownString, isMarkdownString } from 'vs/base/common/htmlContent';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { isMacintosh } from 'vs/base/common/platform';
-import * as nls from 'vs/nls';
-import { AccessibleViewRegistry } from 'vs/platform/accessibility/browser/accessibleViewRegistry';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { EditorPaneDescriptor, IEditorPaneRegistry } from 'vs/workbench/browser/editor';
-import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { EditorExtensions, IEditorFactoryRegistry } from 'vs/workbench/common/editor';
-import { ChatAccessibilityHelp } from 'vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp';
-import { registerChatActions } from 'vs/workbench/contrib/chat/browser/actions/chatActions';
-import { ACTION_ID_NEW_CHAT, registerNewChatActions } from 'vs/workbench/contrib/chat/browser/actions/chatClearActions';
-import { registerChatCodeBlockActions, registerChatCodeCompareBlockActions } from 'vs/workbench/contrib/chat/browser/actions/chatCodeblockActions';
-import { registerChatCopyActions } from 'vs/workbench/contrib/chat/browser/actions/chatCopyActions';
-import { SubmitAction, registerChatExecuteActions } from 'vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
-import { registerChatFileTreeActions } from 'vs/workbench/contrib/chat/browser/actions/chatFileTreeActions';
-import { registerChatExportActions } from 'vs/workbench/contrib/chat/browser/actions/chatImportExport';
-import { registerMoveActions } from 'vs/workbench/contrib/chat/browser/actions/chatMoveActions';
-import { registerQuickChatActions } from 'vs/workbench/contrib/chat/browser/actions/chatQuickInputActions';
-import { registerChatTitleActions } from 'vs/workbench/contrib/chat/browser/actions/chatTitleActions';
-import { IChatAccessibilityService, IChatCodeBlockContextProviderService, IChatWidgetService, IQuickChatService } from 'vs/workbench/contrib/chat/browser/chat';
-import { ChatAccessibilityService } from 'vs/workbench/contrib/chat/browser/chatAccessibilityService';
-import { ChatEditor, IChatEditorOptions } from 'vs/workbench/contrib/chat/browser/chatEditor';
-import { ChatEditorInput, ChatEditorInputSerializer } from 'vs/workbench/contrib/chat/browser/chatEditorInput';
-import { agentSlashCommandToMarkdown, agentToMarkdown } from 'vs/workbench/contrib/chat/browser/chatMarkdownDecorationsRenderer';
-import { ChatExtensionPointHandler } from 'vs/workbench/contrib/chat/browser/chatParticipantContributions';
-import { QuickChatService } from 'vs/workbench/contrib/chat/browser/chatQuick';
-import { ChatResponseAccessibleView } from 'vs/workbench/contrib/chat/browser/chatResponseAccessibleView';
-import { ChatVariablesService } from 'vs/workbench/contrib/chat/browser/chatVariables';
-import { ChatWidgetService } from 'vs/workbench/contrib/chat/browser/chatWidget';
-import { ChatCodeBlockContextProviderService } from 'vs/workbench/contrib/chat/browser/codeBlockContextProviderService';
-import 'vs/workbench/contrib/chat/browser/contrib/chatInputEditorContrib';
-import 'vs/workbench/contrib/chat/browser/contrib/chatContextAttachments';
-import 'vs/workbench/contrib/chat/browser/contrib/chatInputCompletions';
-import 'vs/workbench/contrib/chat/browser/contrib/chatInputEditorHover';
-import { ChatAgentLocation, ChatAgentNameService, ChatAgentService, IChatAgentNameService, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { chatVariableLeader } from 'vs/workbench/contrib/chat/common/chatParserTypes';
-import { IChatService } from 'vs/workbench/contrib/chat/common/chatService';
-import { ChatService } from 'vs/workbench/contrib/chat/common/chatServiceImpl';
-import { ChatSlashCommandService, IChatSlashCommandService } from 'vs/workbench/contrib/chat/common/chatSlashCommands';
-import { IChatVariablesService } from 'vs/workbench/contrib/chat/common/chatVariables';
-import { ChatWidgetHistoryService, IChatWidgetHistoryService } from 'vs/workbench/contrib/chat/common/chatWidgetHistoryService';
-import { ILanguageModelsService, LanguageModelsService } from 'vs/workbench/contrib/chat/common/languageModels';
-import { ILanguageModelStatsService, LanguageModelStatsService } from 'vs/workbench/contrib/chat/common/languageModelStats';
-import { IVoiceChatService, VoiceChatService } from 'vs/workbench/contrib/chat/common/voiceChatService';
-import { IEditorResolverService, RegisteredEditorPriority } from 'vs/workbench/services/editor/common/editorResolverService';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import '../common/chatColors';
-import { registerChatContextActions } from 'vs/workbench/contrib/chat/browser/actions/chatContextActions';
+import { timeout } from '../../../../base/common/async.js';
+import { MarkdownString, isMarkdownString } from '../../../../base/common/htmlContent.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { isMacintosh } from '../../../../base/common/platform.js';
+import { registerEditorFeature } from '../../../../editor/common/editorFeatures.js';
+import * as nls from '../../../../nls.js';
+import { AccessibleViewRegistry } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { EditorPaneDescriptor, IEditorPaneRegistry } from '../../../browser/editor.js';
+import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { EditorExtensions, IEditorFactoryRegistry } from '../../../common/editor.js';
+import { IEditorResolverService, RegisteredEditorPriority } from '../../../services/editor/common/editorResolverService.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { ChatAgentLocation, ChatAgentNameService, ChatAgentService, IChatAgentNameService, IChatAgentService } from '../common/chatAgents.js';
+import { CodeMapperService, ICodeMapperService } from '../common/chatCodeMapperService.js';
+import '../common/chatColors.js';
+import { IChatEditingService } from '../common/chatEditingService.js';
+import { chatVariableLeader } from '../common/chatParserTypes.js';
+import { IChatService } from '../common/chatService.js';
+import { ChatService } from '../common/chatServiceImpl.js';
+import { ChatSlashCommandService, IChatSlashCommandService } from '../common/chatSlashCommands.js';
+import { IChatVariablesService } from '../common/chatVariables.js';
+import { ChatWidgetHistoryService, IChatWidgetHistoryService } from '../common/chatWidgetHistoryService.js';
+import { ILanguageModelsService, LanguageModelsService } from '../common/languageModels.js';
+import { ILanguageModelStatsService, LanguageModelStatsService } from '../common/languageModelStats.js';
+import { ILanguageModelToolsService, LanguageModelToolsService } from '../common/languageModelToolsService.js';
+import { LanguageModelToolsExtensionPointHandler } from '../common/tools/languageModelToolsContribution.js';
+import { IVoiceChatService, VoiceChatService } from '../common/voiceChatService.js';
+import { ChatAccessibilityHelp } from './actions/chatAccessibilityHelp.js';
+import { ChatCommandCenterRendering, registerChatActions } from './actions/chatActions.js';
+import { ACTION_ID_NEW_CHAT, registerNewChatActions } from './actions/chatClearActions.js';
+import { registerChatCodeBlockActions, registerChatCodeCompareBlockActions } from './actions/chatCodeblockActions.js';
+import { registerChatContextActions } from './actions/chatContextActions.js';
+import { registerChatCopyActions } from './actions/chatCopyActions.js';
+import { registerChatDeveloperActions } from './actions/chatDeveloperActions.js';
+import { SubmitAction, registerChatExecuteActions } from './actions/chatExecuteActions.js';
+import { registerChatFileTreeActions } from './actions/chatFileTreeActions.js';
+import { registerChatExportActions } from './actions/chatImportExport.js';
+import { registerMoveActions } from './actions/chatMoveActions.js';
+import { registerQuickChatActions } from './actions/chatQuickInputActions.js';
+import { registerChatTitleActions } from './actions/chatTitleActions.js';
+import { IChatAccessibilityService, IChatCodeBlockContextProviderService, IChatWidgetService, IQuickChatService } from './chat.js';
+import { ChatAccessibilityService } from './chatAccessibilityService.js';
+import { ChatEditingService } from './chatEditingService.js';
+import { ChatEditor, IChatEditorOptions } from './chatEditor.js';
+import { ChatEditorInput, ChatEditorInputSerializer } from './chatEditorInput.js';
+import { ChatGettingStartedContribution } from './chatGettingStarted.js';
+import { agentSlashCommandToMarkdown, agentToMarkdown } from './chatMarkdownDecorationsRenderer.js';
+import { ChatCompatibilityNotifier, ChatExtensionPointHandler } from './chatParticipantContributions.js';
+import { ChatPasteProvidersFeature } from './chatPasteProviders.js';
+import { QuickChatService } from './chatQuick.js';
+import { ChatResponseAccessibleView } from './chatResponseAccessibleView.js';
+import { ChatVariablesService } from './chatVariables.js';
+import { ChatWidgetService } from './chatWidget.js';
+import { ChatCodeBlockContextProviderService } from './codeBlockContextProviderService.js';
+import './contrib/chatContextAttachments.js';
+import './contrib/chatInputCompletions.js';
+import './contrib/chatInputEditorContrib.js';
+import './contrib/chatInputEditorHover.js';
 
 // Register configuration
 const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
@@ -92,16 +102,40 @@ configurationRegistry.registerConfiguration({
 			description: nls.localize('interactiveSession.editor.lineHeight', "Controls the line height in pixels in chat codeblocks. Use 0 to compute the line height from the font size."),
 			default: 0
 		},
+		'chat.commandCenter.enabled': {
+			type: 'boolean',
+			tags: ['experimental'],
+			markdownDescription: nls.localize('chat.commandCenter.enabled', "Controls whether the command center shows a menu for chat actions (requires {0}).", '`#window.commandCenter#`'),
+			default: false
+		},
 		'chat.experimental.implicitContext': {
 			type: 'boolean',
 			description: nls.localize('chat.experimental.implicitContext', "Controls whether a checkbox is shown to allow the user to determine which implicit context is included with a chat participant's prompt."),
 			deprecated: true,
 			default: false
 		},
+		'chat.experimental.variables.editor': {
+			type: 'boolean',
+			description: nls.localize('chat.experimental.variables.editor', "Enables variables for editor chat."),
+			default: true
+		},
+		'chat.experimental.variables.notebook': {
+			type: 'boolean',
+			description: nls.localize('chat.experimental.variables.notebook', "Enables variables for notebook chat."),
+			default: true
+		},
+		'chat.experimental.variables.terminal': {
+			type: 'boolean',
+			description: nls.localize('chat.experimental.variables.terminal', "Enables variables for terminal chat."),
+			default: false
+		},
+		'chat.experimental.detectParticipant.enabled': {
+			type: 'boolean',
+			description: nls.localize('chat.experimental.detectParticipant.enabled', "Enables chat participant autodetection for panel chat."),
+			default: null
+		},
 	}
 });
-
-
 Registry.as<IEditorPaneRegistry>(EditorExtensions.EditorPane).registerEditorPane(
 	EditorPaneDescriptor.create(
 		ChatEditor,
@@ -160,7 +194,8 @@ class ChatSlashStaticSlashCommandsContribution extends Disposable {
 			command: 'clear',
 			detail: nls.localize('clear', "Start a new chat"),
 			sortText: 'z2_clear',
-			executeImmediately: true
+			executeImmediately: true,
+			locations: [ChatAgentLocation.Panel]
 		}, async () => {
 			commandService.executeCommand(ACTION_ID_NEW_CHAT);
 		}));
@@ -168,7 +203,8 @@ class ChatSlashStaticSlashCommandsContribution extends Disposable {
 			command: 'help',
 			detail: '',
 			sortText: 'z1_help',
-			executeImmediately: true
+			executeImmediately: true,
+			locations: [ChatAgentLocation.Panel]
 		}, async (prompt, progress) => {
 			const defaultAgent = chatAgentService.getDefaultAgent(ChatAgentLocation.Panel);
 			const agents = chatAgentService.getAgents();
@@ -210,7 +246,7 @@ class ChatSlashStaticSlashCommandsContribution extends Disposable {
 				}
 
 				const variables = [
-					...chatVariablesService.getVariables(),
+					...chatVariablesService.getVariables(ChatAgentLocation.Panel),
 					{ name: 'file', description: nls.localize('file', "Choose a file in the workspace") }
 				];
 				const variableText = variables
@@ -228,6 +264,11 @@ class ChatSlashStaticSlashCommandsContribution extends Disposable {
 					progress.report({ content: new MarkdownString(defaultAgent.metadata.helpTextPostfix), kind: 'markdownContent' });
 				}
 			}
+
+			// Without this, the response will be done before it renders and so it will not stream. This ensures that if the response starts
+			// rendering during the next 200ms, then it will be streamed. Once it starts streaming, the whole response streams even after
+			// it has received all response data has been received.
+			await timeout(200);
 		}));
 	}
 }
@@ -237,6 +278,10 @@ registerWorkbenchContribution2(ChatResolverContribution.ID, ChatResolverContribu
 workbenchContributionsRegistry.registerWorkbenchContribution(ChatSlashStaticSlashCommandsContribution, LifecyclePhase.Eventually);
 Registry.as<IEditorFactoryRegistry>(EditorExtensions.EditorFactory).registerEditorSerializer(ChatEditorInput.TypeID, ChatEditorInputSerializer);
 registerWorkbenchContribution2(ChatExtensionPointHandler.ID, ChatExtensionPointHandler, WorkbenchPhase.BlockStartup);
+registerWorkbenchContribution2(LanguageModelToolsExtensionPointHandler.ID, LanguageModelToolsExtensionPointHandler, WorkbenchPhase.BlockRestore);
+registerWorkbenchContribution2(ChatCompatibilityNotifier.ID, ChatCompatibilityNotifier, WorkbenchPhase.Eventually);
+registerWorkbenchContribution2(ChatGettingStartedContribution.ID, ChatGettingStartedContribution, WorkbenchPhase.Eventually);
+registerWorkbenchContribution2(ChatCommandCenterRendering.ID, ChatCommandCenterRendering, WorkbenchPhase.AfterRestored);
 
 registerChatActions();
 registerChatCopyActions();
@@ -250,6 +295,9 @@ registerChatExportActions();
 registerMoveActions();
 registerNewChatActions();
 registerChatContextActions();
+registerChatDeveloperActions();
+
+registerEditorFeature(ChatPasteProvidersFeature);
 
 registerSingleton(IChatService, ChatService, InstantiationType.Delayed);
 registerSingleton(IChatWidgetService, ChatWidgetService, InstantiationType.Delayed);
@@ -262,5 +310,8 @@ registerSingleton(IChatSlashCommandService, ChatSlashCommandService, Instantiati
 registerSingleton(IChatAgentService, ChatAgentService, InstantiationType.Delayed);
 registerSingleton(IChatAgentNameService, ChatAgentNameService, InstantiationType.Delayed);
 registerSingleton(IChatVariablesService, ChatVariablesService, InstantiationType.Delayed);
+registerSingleton(ILanguageModelToolsService, LanguageModelToolsService, InstantiationType.Delayed);
 registerSingleton(IVoiceChatService, VoiceChatService, InstantiationType.Delayed);
 registerSingleton(IChatCodeBlockContextProviderService, ChatCodeBlockContextProviderService, InstantiationType.Delayed);
+registerSingleton(ICodeMapperService, CodeMapperService, InstantiationType.Delayed);
+registerSingleton(IChatEditingService, ChatEditingService, InstantiationType.Delayed);
diff --git a/src/vs/workbench/contrib/chat/browser/chat.ts b/src/vs/workbench/contrib/chat/browser/chat.ts
index 48844b393d8..cab43391c45 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.ts
@@ -3,24 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { Selection } from 'vs/editor/common/core/selection';
-import { localize } from 'vs/nls';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ChatViewPane } from 'vs/workbench/contrib/chat/browser/chatViewPane';
-import { IChatWidgetContrib } from 'vs/workbench/contrib/chat/browser/chatWidget';
-import { ICodeBlockActionContext } from 'vs/workbench/contrib/chat/browser/codeBlockPart';
-import { ChatAgentLocation, IChatAgentCommand, IChatAgentData } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { IChatRequestVariableEntry, IChatResponseModel } from 'vs/workbench/contrib/chat/common/chatModel';
-import { IParsedChatRequest } from 'vs/workbench/contrib/chat/common/chatParserTypes';
-import { CHAT_PROVIDER_ID } from 'vs/workbench/contrib/chat/common/chatParticipantContribTypes';
-import { IChatRequestViewModel, IChatResponseViewModel, IChatViewModel, IChatWelcomeMessageViewModel } from 'vs/workbench/contrib/chat/common/chatViewModel';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
+import { Event } from '../../../../base/common/event.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { Selection } from '../../../../editor/common/core/selection.js';
+import { localize } from '../../../../nls.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { ChatViewPane } from './chatViewPane.js';
+import { IChatViewState, IChatWidgetContrib } from './chatWidget.js';
+import { ICodeBlockActionContext } from './codeBlockPart.js';
+import { ChatAgentLocation, IChatAgentCommand, IChatAgentData } from '../common/chatAgents.js';
+import { IChatRequestVariableEntry, IChatResponseModel } from '../common/chatModel.js';
+import { IParsedChatRequest } from '../common/chatParserTypes.js';
+import { CHAT_PROVIDER_ID } from '../common/chatParticipantContribTypes.js';
+import { IChatRequestViewModel, IChatResponseViewModel, IChatViewModel } from '../common/chatViewModel.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { ChatInputPart } from './chatInputPart.js';
 
 export const IChatWidgetService = createDecorator<IChatWidgetService>('chatWidgetService');
 
@@ -34,14 +35,18 @@ export interface IChatWidgetService {
 	readonly lastFocusedWidget: IChatWidget | undefined;
 
 	getWidgetByInputUri(uri: URI): IChatWidget | undefined;
-
 	getWidgetBySessionId(sessionId: string): IChatWidget | undefined;
+	getWidgetByLocation(location: ChatAgentLocation): IChatWidget[];
 }
 
 export async function showChatView(viewsService: IViewsService): Promise<IChatWidget | undefined> {
 	return (await viewsService.openView<ChatViewPane>(CHAT_VIEW_ID))?.widget;
 }
 
+export async function showEditsView(viewsService: IViewsService): Promise<IChatWidget | undefined> {
+	return (await viewsService.openView<ChatViewPane>(EDITS_VIEW_ID))?.widget;
+}
+
 export const IQuickChatService = createDecorator<IQuickChatService>('quickChatService');
 export interface IQuickChatService {
 	readonly _serviceBrand: undefined;
@@ -74,13 +79,17 @@ export const IChatAccessibilityService = createDecorator<IChatAccessibilityServi
 export interface IChatAccessibilityService {
 	readonly _serviceBrand: undefined;
 	acceptRequest(): number;
-	acceptResponse(response: IChatResponseViewModel | string | undefined, requestId: number): void;
+	acceptResponse(response: IChatResponseViewModel | string | undefined, requestId: number, isVoiceInput?: boolean): void;
 }
 
 export interface IChatCodeBlockInfo {
-	codeBlockIndex: number;
-	element: IChatResponseViewModel;
+	readonly ownerMarkdownPartId: string;
+	readonly codeBlockIndex: number;
+	readonly element: ChatTreeItem;
+	readonly uri: URI | undefined;
+	codemapperUri: URI | undefined;
 	focus(): void;
+	getContent(): string;
 }
 
 export interface IChatFileTreeInfo {
@@ -89,10 +98,10 @@ export interface IChatFileTreeInfo {
 	focus(): void;
 }
 
-export type ChatTreeItem = IChatRequestViewModel | IChatResponseViewModel | IChatWelcomeMessageViewModel;
+export type ChatTreeItem = IChatRequestViewModel | IChatResponseViewModel;
 
 export interface IChatListItemRendererOptions {
-	readonly renderStyle?: 'default' | 'compact';
+	readonly renderStyle?: 'compact' | 'minimal';
 	readonly noHeader?: boolean;
 	readonly noPadding?: boolean;
 	readonly editableCodeBlock?: boolean;
@@ -102,13 +111,23 @@ export interface IChatListItemRendererOptions {
 export interface IChatWidgetViewOptions {
 	renderInputOnTop?: boolean;
 	renderFollowups?: boolean;
-	renderStyle?: 'default' | 'compact';
+	renderStyle?: 'compact' | 'minimal';
 	supportsFileReferences?: boolean;
+	supportsAdditionalParticipants?: boolean;
 	filter?: (item: ChatTreeItem) => boolean;
 	rendererOptions?: IChatListItemRendererOptions;
 	menus?: {
+		/**
+		 * The menu that is inside the input editor, use for send, dictation
+		 */
 		executeToolbar?: MenuId;
+		/**
+		 * The menu that next to the input editor, use for close, config etc
+		 */
 		inputSideToolbar?: MenuId;
+		/**
+		 * The telemetry source for all commands of this widget
+		 */
 		telemetrySource?: string;
 	};
 	defaultElementHeight?: number;
@@ -120,18 +139,19 @@ export interface IChatViewViewContext {
 }
 
 export interface IChatResourceViewContext {
-	resource: boolean;
+	isQuickChat?: boolean;
 }
 
-export type IChatWidgetViewContext = IChatViewViewContext | IChatResourceViewContext;
+export type IChatWidgetViewContext = IChatViewViewContext | IChatResourceViewContext | {};
 
 export interface IChatWidget {
 	readonly onDidChangeViewModel: Event<void>;
 	readonly onDidAcceptInput: Event<void>;
 	readonly onDidHide: Event<void>;
 	readonly onDidSubmitAgent: Event<{ agent: IChatAgentData; slashCommand?: IChatAgentCommand }>;
+	readonly onDidChangeAgent: Event<{ agent: IChatAgentData; slashCommand?: IChatAgentCommand }>;
 	readonly onDidChangeParsedInput: Event<void>;
-	readonly onDidDeleteContext: Event<IChatRequestVariableEntry>;
+	readonly onDidChangeContext: Event<{ removed?: IChatRequestVariableEntry[]; added?: IChatRequestVariableEntry[] }>;
 	readonly location: ChatAgentLocation;
 	readonly viewContext: IChatWidgetViewContext;
 	readonly viewModel: IChatViewModel | undefined;
@@ -140,15 +160,17 @@ export interface IChatWidget {
 	readonly parsedInput: IParsedChatRequest;
 	lastSelectedAgent: IChatAgentData | undefined;
 	readonly scopedContextKeyService: IContextKeyService;
+	readonly input: ChatInputPart;
 
 	getContrib<T extends IChatWidgetContrib>(id: string): T | undefined;
 	reveal(item: ChatTreeItem): void;
 	focus(item: ChatTreeItem): void;
-	moveFocus(item: ChatTreeItem, type: 'next' | 'previous'): void;
+	getSibling(item: ChatTreeItem, type: 'next' | 'previous'): ChatTreeItem | undefined;
 	getFocus(): ChatTreeItem | undefined;
 	setInput(query?: string): void;
 	getInput(): string;
-	acceptInput(query?: string): Promise<IChatResponseModel | undefined>;
+	logInputHistory(): void;
+	acceptInput(query?: string, isVoiceInput?: boolean): Promise<IChatResponseModel | undefined>;
 	acceptInputWithPrefix(prefix: string): void;
 	setInputPlaceholder(placeholder: string): void;
 	resetInputPlaceholder(): void;
@@ -161,10 +183,7 @@ export interface IChatWidget {
 	getLastFocusedFileTreeForResponse(response: IChatResponseViewModel): IChatFileTreeInfo | undefined;
 	setContext(overwrite: boolean, ...context: IChatRequestVariableEntry[]): void;
 	clear(): void;
-}
-
-export interface IChatViewPane {
-	clear(): void;
+	getViewState(): IChatViewState;
 }
 
 
@@ -182,3 +201,5 @@ export interface IChatCodeBlockContextProviderService {
 export const GeneratingPhrase = localize('generating', "Generating");
 
 export const CHAT_VIEW_ID = `workbench.panel.chat.view.${CHAT_PROVIDER_ID}`;
+
+export const EDITS_VIEW_ID = 'workbench.panel.chat.view.edits';
diff --git a/src/vs/workbench/contrib/chat/browser/chatAccessibilityProvider.ts b/src/vs/workbench/contrib/chat/browser/chatAccessibilityProvider.ts
index 5eb8edf7f6d..80adb520f3c 100644
--- a/src/vs/workbench/contrib/chat/browser/chatAccessibilityProvider.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatAccessibilityProvider.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { AriaRole } from 'vs/base/browser/ui/aria/aria';
-import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
-import { marked } from 'vs/base/common/marked/marked';
-import { localize } from 'vs/nls';
-import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { IAccessibleViewService } from 'vs/platform/accessibility/browser/accessibleView';
-import { ChatTreeItem } from 'vs/workbench/contrib/chat/browser/chat';
-import { isRequestVM, isResponseVM, isWelcomeVM, IChatResponseViewModel } from 'vs/workbench/contrib/chat/common/chatViewModel';
+import { AriaRole } from '../../../../base/browser/ui/aria/aria.js';
+import { IListAccessibilityProvider } from '../../../../base/browser/ui/list/listWidget.js';
+import { marked } from '../../../../base/common/marked/marked.js';
+import { localize } from '../../../../nls.js';
+import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
+import { IAccessibleViewService } from '../../../../platform/accessibility/browser/accessibleView.js';
+import { ChatTreeItem } from './chat.js';
+import { isRequestVM, isResponseVM, IChatResponseViewModel } from '../common/chatViewModel.js';
 
 export class ChatAccessibilityProvider implements IListAccessibilityProvider<ChatTreeItem> {
 
@@ -40,10 +40,6 @@ export class ChatAccessibilityProvider implements IListAccessibilityProvider<Cha
 			return this._getLabelWithCodeBlockCount(element);
 		}
 
-		if (isWelcomeVM(element)) {
-			return element.content.map(c => 'value' in c ? c.value : c.map(followup => followup.message).join('\n')).join('\n');
-		}
-
 		return '';
 	}
 
@@ -62,16 +58,16 @@ export class ChatAccessibilityProvider implements IListAccessibilityProvider<Cha
 				fileTreeCountHint = localize('multiFileTreeHint', "{0} file trees", fileTreeCount);
 				break;
 		}
-		const codeBlockCount = marked.lexer(element.response.asString()).filter(token => token.type === 'code')?.length ?? 0;
+		const codeBlockCount = marked.lexer(element.response.toString()).filter(token => token.type === 'code')?.length ?? 0;
 		switch (codeBlockCount) {
 			case 0:
-				label = accessibleViewHint ? localize('noCodeBlocksHint', "{0} {1} {2}", fileTreeCountHint, element.response.asString(), accessibleViewHint) : localize('noCodeBlocks', "{0} {1}", fileTreeCountHint, element.response.asString());
+				label = accessibleViewHint ? localize('noCodeBlocksHint', "{0} {1} {2}", fileTreeCountHint, element.response.toString(), accessibleViewHint) : localize('noCodeBlocks', "{0} {1}", fileTreeCountHint, element.response.toString());
 				break;
 			case 1:
-				label = accessibleViewHint ? localize('singleCodeBlockHint', "{0} 1 code block: {1} {2}", fileTreeCountHint, element.response.asString(), accessibleViewHint) : localize('singleCodeBlock', "{0} 1 code block: {1}", fileTreeCountHint, element.response.asString());
+				label = accessibleViewHint ? localize('singleCodeBlockHint', "{0} 1 code block: {1} {2}", fileTreeCountHint, element.response.toString(), accessibleViewHint) : localize('singleCodeBlock', "{0} 1 code block: {1}", fileTreeCountHint, element.response.toString());
 				break;
 			default:
-				label = accessibleViewHint ? localize('multiCodeBlockHint', "{0} {1} code blocks: {2}", fileTreeCountHint, codeBlockCount, element.response.asString(), accessibleViewHint) : localize('multiCodeBlock', "{0} {1} code blocks", fileTreeCountHint, codeBlockCount, element.response.asString());
+				label = accessibleViewHint ? localize('multiCodeBlockHint', "{0} {1} code blocks: {2}", fileTreeCountHint, codeBlockCount, element.response.toString(), accessibleViewHint) : localize('multiCodeBlock', "{0} {1} code blocks", fileTreeCountHint, codeBlockCount, element.response.toString());
 				break;
 		}
 		return label;
diff --git a/src/vs/workbench/contrib/chat/browser/chatAccessibilityService.ts b/src/vs/workbench/contrib/chat/browser/chatAccessibilityService.ts
index d35b283ae34..763de2b1200 100644
--- a/src/vs/workbench/contrib/chat/browser/chatAccessibilityService.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatAccessibilityService.ts
@@ -3,15 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { status } from 'vs/base/browser/ui/aria/aria';
-import { Disposable, DisposableMap } from 'vs/base/common/lifecycle';
-import { AccessibilitySignal, IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { AccessibilityProgressSignalScheduler } from 'vs/platform/accessibilitySignal/browser/progressAccessibilitySignalScheduler';
-import { IChatAccessibilityService } from 'vs/workbench/contrib/chat/browser/chat';
-import { IChatResponseViewModel } from 'vs/workbench/contrib/chat/common/chatViewModel';
-import { renderStringAsPlaintext } from 'vs/base/browser/markdownRenderer';
-import { MarkdownString } from 'vs/base/common/htmlContent';
+import { status } from '../../../../base/browser/ui/aria/aria.js';
+import { Disposable, DisposableMap } from '../../../../base/common/lifecycle.js';
+import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { AccessibilityProgressSignalScheduler } from '../../../../platform/accessibilitySignal/browser/progressAccessibilitySignalScheduler.js';
+import { IChatAccessibilityService } from './chat.js';
+import { IChatResponseViewModel } from '../common/chatViewModel.js';
+import { renderStringAsPlaintext } from '../../../../base/browser/markdownRenderer.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { AccessibilityVoiceSettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
 
 const CHAT_RESPONSE_PENDING_ALLOWANCE_MS = 4000;
 export class ChatAccessibilityService extends Disposable implements IChatAccessibilityService {
@@ -22,7 +24,11 @@ export class ChatAccessibilityService extends Disposable implements IChatAccessi
 
 	private _requestId: number = 0;
 
-	constructor(@IAccessibilitySignalService private readonly _accessibilitySignalService: IAccessibilitySignalService, @IInstantiationService private readonly _instantiationService: IInstantiationService) {
+	constructor(
+		@IAccessibilitySignalService private readonly _accessibilitySignalService: IAccessibilitySignalService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService
+	) {
 		super();
 	}
 	acceptRequest(): number {
@@ -31,17 +37,18 @@ export class ChatAccessibilityService extends Disposable implements IChatAccessi
 		this._pendingSignalMap.set(this._requestId, this._instantiationService.createInstance(AccessibilityProgressSignalScheduler, CHAT_RESPONSE_PENDING_ALLOWANCE_MS, undefined));
 		return this._requestId;
 	}
-	acceptResponse(response: IChatResponseViewModel | string | undefined, requestId: number): void {
+	acceptResponse(response: IChatResponseViewModel | string | undefined, requestId: number, isVoiceInput?: boolean): void {
 		this._pendingSignalMap.deleteAndDispose(requestId);
 		const isPanelChat = typeof response !== 'string';
-		const responseContent = typeof response === 'string' ? response : response?.response.asString();
+		const responseContent = typeof response === 'string' ? response : response?.response.toString();
 		this._accessibilitySignalService.playSignal(AccessibilitySignal.chatResponseReceived, { allowManyInParallel: true });
 		if (!response || !responseContent) {
 			return;
 		}
 		const errorDetails = isPanelChat && response.errorDetails ? ` ${response.errorDetails.message}` : '';
 		const plainTextResponse = renderStringAsPlaintext(new MarkdownString(responseContent));
-		status(plainTextResponse + errorDetails);
+		if (!isVoiceInput || this._configurationService.getValue(AccessibilityVoiceSettingId.AutoSynthesize) !== 'on') {
+			status(plainTextResponse + errorDetails);
+		}
 	}
 }
-
diff --git a/src/vs/workbench/contrib/chat/browser/chatAgentHover.ts b/src/vs/workbench/contrib/chat/browser/chatAgentHover.ts
index 3b1a011b5c5..0f083a319ab 100644
--- a/src/vs/workbench/contrib/chat/browser/chatAgentHover.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatAgentHover.ts
@@ -3,23 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { h } from 'vs/base/browser/dom';
-import { IManagedHoverOptions } from 'vs/base/browser/ui/hover/hover';
-import { renderIcon } from 'vs/base/browser/ui/iconLabel/iconLabels';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Codicon } from 'vs/base/common/codicons';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { FileAccess } from 'vs/base/common/network';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { getFullyQualifiedId, IChatAgentData, IChatAgentNameService, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { showExtensionsWithIdsCommandId } from 'vs/workbench/contrib/extensions/browser/extensionsActions';
-import { verifiedPublisherIcon } from 'vs/workbench/contrib/extensions/browser/extensionsIcons';
-import { IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions';
+import * as dom from '../../../../base/browser/dom.js';
+import { IManagedHoverOptions } from '../../../../base/browser/ui/hover/hover.js';
+import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { FileAccess } from '../../../../base/common/network.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { URI } from '../../../../base/common/uri.js';
+import { localize } from '../../../../nls.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { getFullyQualifiedId, IChatAgentData, IChatAgentNameService, IChatAgentService } from '../common/chatAgents.js';
+import { showExtensionsWithIdsCommandId } from '../../extensions/browser/extensionsActions.js';
+import { verifiedPublisherIcon } from '../../extensions/browser/extensionsIcons.js';
+import { IExtensionsWorkbenchService } from '../../extensions/common/extensions.js';
 
 export class ChatAgentHover extends Disposable {
 	public readonly domNode: HTMLElement;
@@ -40,22 +39,22 @@ export class ChatAgentHover extends Disposable {
 	) {
 		super();
 
-		const hoverElement = h(
+		const hoverElement = dom.h(
 			'.chat-agent-hover@root',
 			[
-				h('.chat-agent-hover-header', [
-					h('.chat-agent-hover-icon@icon'),
-					h('.chat-agent-hover-details', [
-						h('.chat-agent-hover-name@name'),
-						h('.chat-agent-hover-extension', [
-							h('.chat-agent-hover-extension-name@extensionName'),
-							h('.chat-agent-hover-separator@separator'),
-							h('.chat-agent-hover-publisher@publisher'),
+				dom.h('.chat-agent-hover-header', [
+					dom.h('.chat-agent-hover-icon@icon'),
+					dom.h('.chat-agent-hover-details', [
+						dom.h('.chat-agent-hover-name@name'),
+						dom.h('.chat-agent-hover-extension', [
+							dom.h('.chat-agent-hover-extension-name@extensionName'),
+							dom.h('.chat-agent-hover-separator@separator'),
+							dom.h('.chat-agent-hover-publisher@publisher'),
 						]),
 					]),
 				]),
-				h('.chat-agent-hover-warning@warning'),
-				h('span.chat-agent-hover-description@description'),
+				dom.h('.chat-agent-hover-warning@warning'),
+				dom.h('span.chat-agent-hover-description@description'),
 			]);
 		this.domNode = hoverElement.root;
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.ts
new file mode 100644
index 00000000000..cc15830cd26
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.ts
@@ -0,0 +1,176 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from '../../../../../base/browser/dom.js';
+import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { IChatRequestVariableEntry } from '../../common/chatModel.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ResourceLabels } from '../../../../browser/labels.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { FileKind, IFileService } from '../../../../../platform/files/common/files.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { basename, dirname } from '../../../../../base/common/path.js';
+import { localize } from '../../../../../nls.js';
+import { ChatResponseReferencePartStatusKind, IChatContentReference } from '../../common/chatService.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
+import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
+import { createInstantHoverDelegate } from '../../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { IManagedHoverContentOrFactory } from '../../../../../base/browser/ui/hover/hover.js';
+
+export class ChatAttachmentsContentPart extends Disposable {
+	private readonly attachedContextDisposables = this._register(new DisposableStore());
+
+	private readonly _onDidChangeVisibility = this._register(new Emitter<boolean>());
+	private readonly _contextResourceLabels = this.instantiationService.createInstance(ResourceLabels, { onDidChangeVisibility: this._onDidChangeVisibility.event });
+
+	constructor(
+		private readonly variables: IChatRequestVariableEntry[],
+		private readonly contentReferences: ReadonlyArray<IChatContentReference> = [],
+		public readonly domNode: HTMLElement = dom.$('.chat-attached-context'),
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IOpenerService private readonly openerService: IOpenerService,
+		@IHoverService private readonly hoverService: IHoverService,
+		@IFileService private readonly fileService: IFileService
+	) {
+		super();
+
+		this.initAttachedContext(domNode);
+	}
+
+	private initAttachedContext(container: HTMLElement) {
+		dom.clearNode(container);
+		this.attachedContextDisposables.clear();
+		dom.setVisibility(Boolean(this.variables.length), this.domNode);
+		const hoverDelegate = this.attachedContextDisposables.add(createInstantHoverDelegate());
+
+		this.variables.forEach(async (attachment) => {
+			const widget = dom.append(container, dom.$('.chat-attached-context-attachment.show-file-icons'));
+			const label = this._contextResourceLabels.create(widget, { supportIcons: true, hoverDelegate });
+			const file = URI.isUri(attachment.value) ? attachment.value : attachment.value && typeof attachment.value === 'object' && 'uri' in attachment.value && URI.isUri(attachment.value.uri) ? attachment.value.uri : undefined;
+			const range = attachment.value && typeof attachment.value === 'object' && 'range' in attachment.value && Range.isIRange(attachment.value.range) ? attachment.value.range : undefined;
+
+			const correspondingContentReference = this.contentReferences.find((ref) => typeof ref.reference === 'object' && 'variableName' in ref.reference && ref.reference.variableName === attachment.name);
+			const isAttachmentOmitted = correspondingContentReference?.options?.status?.kind === ChatResponseReferencePartStatusKind.Omitted;
+			const isAttachmentPartialOrOmitted = isAttachmentOmitted || correspondingContentReference?.options?.status?.kind === ChatResponseReferencePartStatusKind.Partial;
+
+			let hoverElement: IManagedHoverContentOrFactory;
+			let ariaLabel: string | undefined;
+
+			if (file && attachment.isFile) {
+				const fileBasename = basename(file.path);
+				const fileDirname = dirname(file.path);
+				const friendlyName = `${fileBasename} ${fileDirname}`;
+
+				if (isAttachmentOmitted) {
+					ariaLabel = range ? localize('chat.omittedFileAttachmentWithRange', "Omitted: {0}, line {1} to line {2}.", friendlyName, range.startLineNumber, range.endLineNumber) : localize('chat.omittedFileAttachment', "Omitted: {0}.", friendlyName);
+				} else if (isAttachmentPartialOrOmitted) {
+					ariaLabel = range ? localize('chat.partialFileAttachmentWithRange', "Partially attached: {0}, line {1} to line {2}.", friendlyName, range.startLineNumber, range.endLineNumber) : localize('chat.partialFileAttachment', "Partially attached: {0}.", friendlyName);
+				} else {
+					ariaLabel = range ? localize('chat.fileAttachmentWithRange3', "Attached: {0}, line {1} to line {2}.", friendlyName, range.startLineNumber, range.endLineNumber) : localize('chat.fileAttachment3', "Attached: {0}.", friendlyName);
+				}
+
+				hoverElement = file.fsPath;
+
+				label.setFile(file, {
+					fileKind: FileKind.FILE,
+					hidePath: true,
+					range,
+					title: correspondingContentReference?.options?.status?.description
+				});
+			} else if (attachment.isImage) {
+				ariaLabel = localize('chat.imageAttachment', "Attached image, {0}", attachment.name);
+
+				hoverElement = dom.$('div.chat-attached-context-hover');
+				hoverElement.setAttribute('aria-label', ariaLabel);
+
+				// Custom label
+				const pillIcon = dom.$('div.chat-attached-context-pill', {}, dom.$('span.codicon.codicon-file-media'));
+				const textLabel = dom.$('span.chat-attached-context-custom-text', {}, attachment.name);
+				widget.appendChild(pillIcon);
+				widget.appendChild(textLabel);
+
+				let buffer: Uint8Array;
+				try {
+					if (attachment.value instanceof URI) {
+						const readFile = await this.fileService.readFile(attachment.value);
+						buffer = readFile.value.buffer;
+
+					} else {
+						buffer = attachment.value as Uint8Array;
+					}
+					await this.createImageElements(buffer, widget, hoverElement);
+				} catch (error) {
+					console.error('Error processing attachment:', error);
+				}
+
+				widget.style.position = 'relative';
+			} else {
+				const attachmentLabel = attachment.fullName ?? attachment.name;
+				const withIcon = attachment.icon?.id ? `$(${attachment.icon.id}) ${attachmentLabel}` : attachmentLabel;
+				label.setLabel(withIcon, correspondingContentReference?.options?.status?.description);
+
+				hoverElement = attachmentLabel;
+				ariaLabel = localize('chat.attachment3', "Attached context: {0}.", attachment.name);
+			}
+
+			if (isAttachmentPartialOrOmitted) {
+				widget.classList.add('warning');
+			}
+			const description = correspondingContentReference?.options?.status?.description;
+			if (isAttachmentPartialOrOmitted) {
+				ariaLabel = `${ariaLabel}${description ? ` ${description}` : ''}`;
+				hoverElement = description;
+				for (const selector of ['.monaco-icon-suffix-container', '.monaco-icon-name-container']) {
+					const element = label.element.querySelector(selector);
+					if (element) {
+						element.classList.add('warning');
+					}
+				}
+			}
+
+			if (file) {
+				widget.style.cursor = 'pointer';
+				if (!this.attachedContextDisposables.isDisposed) {
+					this.attachedContextDisposables.add(dom.addDisposableListener(widget, dom.EventType.CLICK, async (e: MouseEvent) => {
+						dom.EventHelper.stop(e, true);
+						this.openerService.open(
+							file,
+							{
+								fromUserGesture: true,
+								editorOptions: {
+									selection: range
+								} as any
+							});
+					}));
+				}
+			}
+
+			widget.ariaLabel = ariaLabel;
+			widget.tabIndex = 0;
+			if (!this.attachedContextDisposables.isDisposed) {
+				this.attachedContextDisposables.add(this.hoverService.setupManagedHover(hoverDelegate, widget, hoverElement));
+			}
+		});
+	}
+
+	// Helper function to create and replace image
+	private async createImageElements(buffer: ArrayBuffer | Uint8Array, widget: HTMLElement, hoverElement: HTMLElement) {
+		const blob = new Blob([buffer], { type: 'image/png' });
+		const url = URL.createObjectURL(blob);
+		const img = dom.$('img.chat-attached-context-image', { src: url, alt: '' });
+		const pillImg = dom.$('img.chat-attached-context-pill-image', { src: url, alt: '' });
+		const pill = dom.$('div.chat-attached-context-pill', {}, pillImg);
+
+		const existingPill = widget.querySelector('.chat-attached-context-pill');
+		if (existingPill) {
+			existingPill.replaceWith(pill);
+		}
+
+		// Update hover image
+		hoverElement.appendChild(img);
+	}
+}
+
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatCodeCitationContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatCodeCitationContentPart.ts
new file mode 100644
index 00000000000..5c4bf99fc1e
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatCodeCitationContentPart.ts
@@ -0,0 +1,61 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from '../../../../../base/browser/dom.js';
+import { Button } from '../../../../../base/browser/ui/button/button.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { localize } from '../../../../../nls.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { ChatTreeItem } from '../chat.js';
+import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts.js';
+import { getCodeCitationsMessage } from '../../common/chatModel.js';
+import { IChatCodeCitations, IChatRendererContent } from '../../common/chatViewModel.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+
+type ChatCodeCitationOpenedClassification = {
+	owner: 'roblourens';
+	comment: 'Indicates when a user opens chat code citations';
+};
+
+export class ChatCodeCitationContentPart extends Disposable implements IChatContentPart {
+	public readonly domNode: HTMLElement;
+
+	constructor(
+		citations: IChatCodeCitations,
+		context: IChatContentPartRenderContext,
+		@IEditorService private readonly editorService: IEditorService,
+		@ITelemetryService private readonly telemetryService: ITelemetryService
+	) {
+		super();
+
+		const label = getCodeCitationsMessage(citations.citations);
+		const elements = dom.h('.chat-code-citation-message@root', [
+			dom.h('span.chat-code-citation-label@label'),
+			dom.h('.chat-code-citation-button-container@button'),
+		]);
+		elements.label.textContent = label + ' - ';
+		const button = this._register(new Button(elements.button, {
+			buttonBackground: undefined,
+			buttonBorder: undefined,
+			buttonForeground: undefined,
+			buttonHoverBackground: undefined,
+			buttonSecondaryBackground: undefined,
+			buttonSecondaryForeground: undefined,
+			buttonSecondaryHoverBackground: undefined,
+			buttonSeparator: undefined
+		}));
+		button.label = localize('viewMatches', "View matches");
+		this._register(button.onDidClick(() => {
+			const citationText = `# Code Citations\n\n` + citations.citations.map(c => `## License: ${c.license}\n${c.value.toString()}\n\n\`\`\`\n${c.snippet}\n\`\`\`\n\n`).join('\n');
+			this.editorService.openEditor({ resource: undefined, contents: citationText, languageId: 'markdown' });
+			this.telemetryService.publicLog2<{}, ChatCodeCitationOpenedClassification>('openedChatCodeCitations');
+		}));
+		this.domNode = elements.root;
+	}
+
+	hasSameContent(other: IChatRendererContent, followingContent: IChatRendererContent[], element: ChatTreeItem): boolean {
+		return other.kind === 'codeCitations';
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatCollections.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatCollections.ts
new file mode 100644
index 00000000000..4432e44201a
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatCollections.ts
@@ -0,0 +1,43 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IDisposable, Disposable } from '../../../../../base/common/lifecycle.js';
+
+export class ResourcePool<T extends IDisposable> extends Disposable {
+	private readonly pool: T[] = [];
+
+	private _inUse = new Set<T>;
+	public get inUse(): ReadonlySet<T> {
+		return this._inUse;
+	}
+
+	constructor(
+		private readonly _itemFactory: () => T,
+	) {
+		super();
+	}
+
+	get(): T {
+		if (this.pool.length > 0) {
+			const item = this.pool.pop()!;
+			this._inUse.add(item);
+			return item;
+		}
+
+		const item = this._register(this._itemFactory());
+		this._inUse.add(item);
+		return item;
+	}
+
+	release(item: T): void {
+		this._inUse.delete(item);
+		this.pool.push(item);
+	}
+}
+
+export interface IDisposableReference<T> extends IDisposable {
+	object: T;
+	isStale: () => boolean;
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatCommandContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatCommandContentPart.ts
new file mode 100644
index 00000000000..c74dfed3728
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatCommandContentPart.ts
@@ -0,0 +1,46 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from '../../../../../base/browser/dom.js';
+import { Button } from '../../../../../base/browser/ui/button/button.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { localize } from '../../../../../nls.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { defaultButtonStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
+import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts.js';
+import { IChatProgressRenderableResponseContent } from '../../common/chatModel.js';
+import { IChatCommandButton } from '../../common/chatService.js';
+import { isResponseVM } from '../../common/chatViewModel.js';
+
+const $ = dom.$;
+
+export class ChatCommandButtonContentPart extends Disposable implements IChatContentPart {
+	public readonly domNode: HTMLElement;
+
+	constructor(
+		commandButton: IChatCommandButton,
+		context: IChatContentPartRenderContext,
+		@ICommandService private readonly commandService: ICommandService
+	) {
+		super();
+
+		this.domNode = $('.chat-command-button');
+		const enabled = !isResponseVM(context.element) || !context.element.isStale;
+		const tooltip = enabled ?
+			commandButton.command.tooltip :
+			localize('commandButtonDisabled', "Button not available in restored chat");
+		const button = this._register(new Button(this.domNode, { ...defaultButtonStyles, supportIcons: true, title: tooltip }));
+		button.label = commandButton.command.title;
+		button.enabled = enabled;
+
+		// TODO still need telemetry for command buttons
+		this._register(button.onDidClick(() => this.commandService.executeCommand(commandButton.command.id, ...(commandButton.command.arguments ?? []))));
+	}
+
+	hasSameContent(other: IChatProgressRenderableResponseContent): boolean {
+		// No other change allowed for this content type
+		return other.kind === 'command';
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationContentPart.ts
new file mode 100644
index 00000000000..c23f0225998
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationContentPart.ts
@@ -0,0 +1,71 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Emitter } from '../../../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { localize } from '../../../../../nls.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ChatConfirmationWidget } from './chatConfirmationWidget.js';
+import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts.js';
+import { IChatProgressRenderableResponseContent } from '../../common/chatModel.js';
+import { IChatConfirmation, IChatSendRequestOptions, IChatService } from '../../common/chatService.js';
+import { isResponseVM } from '../../common/chatViewModel.js';
+
+export class ChatConfirmationContentPart extends Disposable implements IChatContentPart {
+	public readonly domNode: HTMLElement;
+
+	private readonly _onDidChangeHeight = this._register(new Emitter<void>());
+	public readonly onDidChangeHeight = this._onDidChangeHeight.event;
+
+	constructor(
+		confirmation: IChatConfirmation,
+		context: IChatContentPartRenderContext,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IChatService private readonly chatService: IChatService,
+	) {
+		super();
+
+		const element = context.element;
+		const buttons = confirmation.buttons
+			? confirmation.buttons.map(button => ({
+				label: button,
+				data: confirmation.data
+			}))
+			: [
+				{ label: localize('accept', "Accept"), data: confirmation.data },
+				{ label: localize('dismiss', "Dismiss"), data: confirmation.data, isSecondary: true },
+			];
+		const confirmationWidget = this._register(this.instantiationService.createInstance(ChatConfirmationWidget, confirmation.title, confirmation.message, buttons));
+		confirmationWidget.setShowButtons(!confirmation.isUsed);
+
+		this._register(confirmationWidget.onDidClick(async e => {
+			if (isResponseVM(element)) {
+				const prompt = `${e.label}: "${confirmation.title}"`;
+				const data: IChatSendRequestOptions = e.isSecondary ?
+					{ rejectedConfirmationData: [e.data] } :
+					{ acceptedConfirmationData: [e.data] };
+				data.agentId = element.agent?.id;
+				data.slashCommand = element.slashCommand?.name;
+				data.confirmation = e.label;
+				if (await this.chatService.sendRequest(element.sessionId, prompt, data)) {
+					confirmation.isUsed = true;
+					confirmationWidget.setShowButtons(false);
+					this._onDidChangeHeight.fire();
+				}
+			}
+		}));
+
+		this.domNode = confirmationWidget.domNode;
+	}
+
+	hasSameContent(other: IChatProgressRenderableResponseContent): boolean {
+		// No other change allowed for this content type
+		return other.kind === 'confirmation';
+	}
+
+	addDisposable(disposable: IDisposable): void {
+		this._register(disposable);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatConfirmationWidget.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationWidget.ts
similarity index 68%
rename from src/vs/workbench/contrib/chat/browser/chatConfirmationWidget.ts
rename to src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationWidget.ts
index ea5cf39c113..44fd960a147 100644
--- a/src/vs/workbench/contrib/chat/browser/chatConfirmationWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationWidget.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import 'vs/css!./media/chatConfirmationWidget';
-import { Button } from 'vs/base/browser/ui/button/button';
-import { Emitter, Event } from 'vs/base/common/event';
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { MarkdownRenderer } from 'vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { defaultButtonStyles } from 'vs/platform/theme/browser/defaultStyles';
+import * as dom from '../../../../../base/browser/dom.js';
+import './media/chatConfirmationWidget.css';
+import { Button } from '../../../../../base/browser/ui/button/button.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { IMarkdownString, MarkdownString } from '../../../../../base/common/htmlContent.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { MarkdownRenderer } from '../../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { defaultButtonStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
 
 export interface IChatConfirmationButton {
 	label: string;
@@ -34,7 +34,7 @@ export class ChatConfirmationWidget extends Disposable {
 
 	constructor(
 		title: string,
-		message: string,
+		message: string | IMarkdownString,
 		buttons: IChatConfirmationButton[],
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 	) {
@@ -51,7 +51,7 @@ export class ChatConfirmationWidget extends Disposable {
 		const renderedTitle = this._register(renderer.render(new MarkdownString(title)));
 		elements.title.appendChild(renderedTitle.element);
 
-		const renderedMessage = this._register(renderer.render(new MarkdownString(message)));
+		const renderedMessage = this._register(renderer.render(typeof message === 'string' ? new MarkdownString(message) : message));
 		elements.message.appendChild(renderedMessage.element);
 
 		buttons.forEach(buttonData => {
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatContentParts.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatContentParts.ts
new file mode 100644
index 00000000000..a9375bb8688
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatContentParts.ts
@@ -0,0 +1,26 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IDisposable } from '../../../../../base/common/lifecycle.js';
+import { ChatTreeItem } from '../chat.js';
+import { IChatRendererContent } from '../../common/chatViewModel.js';
+
+export interface IChatContentPart extends IDisposable {
+	domNode: HTMLElement;
+
+	/**
+	 * Returns true if the other content is equivalent to what is already rendered in this content part.
+	 * Returns false if a rerender is needed.
+	 * followingContent is all the content that will be rendered after this content part (to support progress messages' behavior).
+	 */
+	hasSameContent(other: IChatRendererContent, followingContent: IChatRendererContent[], element: ChatTreeItem): boolean;
+}
+
+export interface IChatContentPartRenderContext {
+	element: ChatTreeItem;
+	content: ReadonlyArray<IChatRendererContent>;
+	contentIndex: number;
+	preceedingContentParts: ReadonlyArray<IChatContentPart>;
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownContentPart.ts
new file mode 100644
index 00000000000..1d7731a17b7
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownContentPart.ts
@@ -0,0 +1,206 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from '../../../../../base/browser/dom.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { IMarkdownString } from '../../../../../base/common/htmlContent.js';
+import { Disposable, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { equalsIgnoreCase } from '../../../../../base/common/strings.js';
+import { MarkdownRenderer } from '../../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { IResolvedTextEditorModel, ITextModelService } from '../../../../../editor/common/services/resolverService.js';
+import { MenuId } from '../../../../../platform/actions/common/actions.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IChatCodeBlockInfo, IChatListItemRendererOptions } from '../chat.js';
+import { IDisposableReference, ResourcePool } from './chatCollections.js';
+import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts.js';
+import { IChatRendererDelegate } from '../chatListRenderer.js';
+import { ChatMarkdownDecorationsRenderer } from '../chatMarkdownDecorationsRenderer.js';
+import { ChatEditorOptions } from '../chatOptions.js';
+import { CodeBlockPart, ICodeBlockData, localFileLanguageId, parseLocalFileData } from '../codeBlockPart.js';
+import { IMarkdownVulnerability } from '../../common/annotations.js';
+import { IChatProgressRenderableResponseContent } from '../../common/chatModel.js';
+import { isRequestVM, isResponseVM } from '../../common/chatViewModel.js';
+import { CodeBlockModelCollection } from '../../common/codeBlockModelCollection.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { InlineAnchorWidget } from '../chatInlineAnchorWidget.js';
+
+const $ = dom.$;
+
+export class ChatMarkdownContentPart extends Disposable implements IChatContentPart {
+	private static idPool = 0;
+	public readonly id = String(++ChatMarkdownContentPart.idPool);
+	public readonly domNode: HTMLElement;
+	private readonly allRefs: IDisposableReference<CodeBlockPart>[] = [];
+
+	private readonly _onDidChangeHeight = this._register(new Emitter<void>());
+	public readonly onDidChangeHeight = this._onDidChangeHeight.event;
+
+	public readonly codeblocks: IChatCodeBlockInfo[] = [];
+
+	constructor(
+		private readonly markdown: IMarkdownString,
+		context: IChatContentPartRenderContext,
+		private readonly editorPool: EditorPool,
+		fillInIncompleteTokens = false,
+		codeBlockStartIndex = 0,
+		renderer: MarkdownRenderer,
+		currentWidth: number,
+		private readonly codeBlockModelCollection: CodeBlockModelCollection,
+		rendererOptions: IChatListItemRendererOptions,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@ITextModelService private readonly textModelService: ITextModelService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IEditorService private readonly editorService: IEditorService,
+	) {
+		super();
+
+		const element = context.element;
+		const markdownDecorationsRenderer = instantiationService.createInstance(ChatMarkdownDecorationsRenderer);
+
+		// We release editors in order so that it's more likely that the same editor will be assigned if this element is re-rendered right away, like it often is during progressive rendering
+		const orderedDisposablesList: IDisposable[] = [];
+		let codeBlockIndex = codeBlockStartIndex;
+		const result = this._register(renderer.render(markdown, {
+			fillInIncompleteTokens,
+			codeBlockRendererSync: (languageId, text) => {
+				const index = codeBlockIndex++;
+				let textModel: Promise<IResolvedTextEditorModel>;
+				let range: Range | undefined;
+				let vulns: readonly IMarkdownVulnerability[] | undefined;
+				let codemapperUri: URI | undefined;
+				if (equalsIgnoreCase(languageId, localFileLanguageId)) {
+					try {
+						const parsedBody = parseLocalFileData(text);
+						range = parsedBody.range && Range.lift(parsedBody.range);
+						textModel = this.textModelService.createModelReference(parsedBody.uri).then(ref => ref.object);
+					} catch (e) {
+						return $('div');
+					}
+				} else {
+					const sessionId = isResponseVM(element) || isRequestVM(element) ? element.sessionId : '';
+					const modelEntry = this.codeBlockModelCollection.getOrCreate(sessionId, element, index);
+					vulns = modelEntry.vulns;
+					codemapperUri = modelEntry.codemapperUri;
+					textModel = modelEntry.model;
+				}
+
+				const hideToolbar = isResponseVM(element) && element.errorDetails?.responseIsFiltered;
+				const ref = this.renderCodeBlock({ languageId, textModel, codeBlockIndex: index, element, range, hideToolbar, parentContextKeyService: contextKeyService, vulns, codemapperUri }, text, currentWidth, rendererOptions.editableCodeBlock);
+				this.allRefs.push(ref);
+
+				// Attach this after updating text/layout of the editor, so it should only be fired when the size updates later (horizontal scrollbar, wrapping)
+				// not during a renderElement OR a progressive render (when we will be firing this event anyway at the end of the render)
+				this._register(ref.object.onDidChangeContentHeight(() => this._onDidChangeHeight.fire()));
+
+				const ownerMarkdownPartId = this.id;
+				const info: IChatCodeBlockInfo = new class {
+					readonly ownerMarkdownPartId = ownerMarkdownPartId;
+					readonly codeBlockIndex = index;
+					readonly element = element;
+					codemapperUri = undefined; // will be set async
+					public get uri() {
+						// here we must do a getter because the ref.object is rendered
+						// async and the uri might be undefined when it's read immediately
+						return ref.object.uri;
+					}
+					public focus() {
+						ref.object.focus();
+					}
+					public getContent(): string {
+						return ref.object.editor.getValue();
+					}
+				}();
+				this.codeblocks.push(info);
+				orderedDisposablesList.push(ref);
+				return ref.object.element;
+			},
+			asyncRenderCallback: () => this._onDidChangeHeight.fire(),
+		}));
+
+		this._register(markdownDecorationsRenderer.walkTreeAndAnnotateReferenceLinks(result.element));
+
+		orderedDisposablesList.reverse().forEach(d => this._register(d));
+		this.domNode = result.element;
+	}
+
+	private renderCodeBlock(data: ICodeBlockData, text: string, currentWidth: number, editableCodeBlock: boolean | undefined): IDisposableReference<CodeBlockPart> {
+		const ref = this.editorPool.get();
+		const editorInfo = ref.object;
+		if (isResponseVM(data.element)) {
+			this.codeBlockModelCollection.update(data.element.sessionId, data.element, data.codeBlockIndex, { text, languageId: data.languageId }).then((e) => {
+				// Update the existing object's codemapperUri
+				this.codeblocks[data.codeBlockIndex].codemapperUri = e.codemapperUri;
+				this._onDidChangeHeight.fire();
+			});
+		}
+
+		editorInfo.render(data, currentWidth, editableCodeBlock);
+
+		return ref;
+	}
+
+	hasSameContent(other: IChatProgressRenderableResponseContent): boolean {
+		return other.kind === 'markdownContent' && other.content.value === this.markdown.value;
+	}
+
+	layout(width: number): void {
+		this.allRefs.forEach((ref, index) => {
+			const codeblockModel = this.codeblocks[index];
+			if (codeblockModel.codemapperUri) {
+				const fileWidgetAnchor = $('.chat-codeblock');
+				this._register(this.instantiationService.createInstance(InlineAnchorWidget, fileWidgetAnchor, { uri: codeblockModel.codemapperUri }, { handleClick: (uri) => this.editorService.openEditor({ resource: uri }) }));
+				const existingCodeblock = ref.object.element.parentElement?.querySelector('.chat-codeblock');
+				if (!existingCodeblock) {
+					ref.object.element.parentElement?.appendChild(fileWidgetAnchor);
+					ref.object.element.style.display = 'none';
+				}
+			} else {
+				ref.object.layout(width);
+			}
+		});
+	}
+
+	addDisposable(disposable: IDisposable): void {
+		this._register(disposable);
+	}
+}
+
+export class EditorPool extends Disposable {
+
+	private readonly _pool: ResourcePool<CodeBlockPart>;
+
+	public inUse(): Iterable<CodeBlockPart> {
+		return this._pool.inUse;
+	}
+
+	constructor(
+		options: ChatEditorOptions,
+		delegate: IChatRendererDelegate,
+		overflowWidgetsDomNode: HTMLElement | undefined,
+		@IInstantiationService instantiationService: IInstantiationService,
+	) {
+		super();
+		this._pool = this._register(new ResourcePool(() => {
+			return instantiationService.createInstance(CodeBlockPart, options, MenuId.ChatCodeBlock, delegate, overflowWidgetsDomNode);
+		}));
+	}
+
+	get(): IDisposableReference<CodeBlockPart> {
+		const codeBlock = this._pool.get();
+		let stale = false;
+		return {
+			object: codeBlock,
+			isStale: () => stale,
+			dispose: () => {
+				codeBlock.reset();
+				stale = true;
+				this._pool.release(codeBlock);
+			}
+		};
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatProgressContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatProgressContentPart.ts
new file mode 100644
index 00000000000..880011b75c7
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatProgressContentPart.ts
@@ -0,0 +1,66 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { $ } from '../../../../../base/browser/dom.js';
+import { alert } from '../../../../../base/browser/ui/aria/aria.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { MarkdownString } from '../../../../../base/common/htmlContent.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { MarkdownRenderer } from '../../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import { ChatTreeItem } from '../chat.js';
+import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts.js';
+import { IChatProgressMessage, IChatTask } from '../../common/chatService.js';
+import { IChatRendererContent, isResponseVM } from '../../common/chatViewModel.js';
+
+export class ChatProgressContentPart extends Disposable implements IChatContentPart {
+	public readonly domNode: HTMLElement;
+
+	private readonly showSpinner: boolean;
+
+	constructor(
+		progress: IChatProgressMessage | IChatTask,
+		renderer: MarkdownRenderer,
+		context: IChatContentPartRenderContext,
+		forceShowSpinner?: boolean,
+		forceShowMessage?: boolean,
+		icon?: ThemeIcon
+	) {
+		super();
+
+		const followingContent = context.content.slice(context.contentIndex + 1);
+		this.showSpinner = forceShowSpinner ?? shouldShowSpinner(followingContent, context.element);
+		const hideMessage = forceShowMessage !== true && followingContent.some(part => part.kind !== 'progressMessage');
+		if (hideMessage) {
+			// Placeholder, don't show the progress message
+			this.domNode = $('');
+			return;
+		}
+
+		if (this.showSpinner) {
+			// TODO@roblourens is this the right place for this?
+			// this step is in progress, communicate it to SR users
+			alert(progress.content.value);
+		}
+		const codicon = icon ? icon.id : this.showSpinner ? ThemeIcon.modify(Codicon.loading, 'spin').id : Codicon.check.id;
+		const markdown = new MarkdownString(`$(${codicon}) ${progress.content.value}`, {
+			supportThemeIcons: true
+		});
+		const result = this._register(renderer.render(markdown));
+		result.element.classList.add('progress-step');
+
+		this.domNode = result.element;
+	}
+
+	hasSameContent(other: IChatRendererContent, followingContent: IChatRendererContent[], element: ChatTreeItem): boolean {
+		// Needs rerender when spinner state changes
+		const showSpinner = shouldShowSpinner(followingContent, element);
+		return other.kind === 'progressMessage' && this.showSpinner === showSpinner;
+	}
+}
+
+function shouldShowSpinner(followingContent: IChatRendererContent[], element: ChatTreeItem): boolean {
+	return isResponseVM(element) && !element.isComplete && followingContent.length === 0;
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatReferencesContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatReferencesContentPart.ts
new file mode 100644
index 00000000000..0c31726d048
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatReferencesContentPart.ts
@@ -0,0 +1,459 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from '../../../../../base/browser/dom.js';
+import { Button } from '../../../../../base/browser/ui/button/button.js';
+import { IListRenderer, IListVirtualDelegate } from '../../../../../base/browser/ui/list/list.js';
+import { IAction } from '../../../../../base/common/actions.js';
+import { coalesce } from '../../../../../base/common/arrays.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { matchesSomeScheme, Schemas } from '../../../../../base/common/network.js';
+import { basename } from '../../../../../base/common/path.js';
+import { basenameOrAuthority, isEqualAuthority } from '../../../../../base/common/resources.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { localize, localize2 } from '../../../../../nls.js';
+import { createAndFillInContextMenuActions } from '../../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { MenuWorkbenchToolBar } from '../../../../../platform/actions/browser/toolbar.js';
+import { Action2, IMenuService, MenuId, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
+import { FileKind } from '../../../../../platform/files/common/files.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ILabelService } from '../../../../../platform/label/common/label.js';
+import { WorkbenchList } from '../../../../../platform/list/browser/listService.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
+import { IProductService } from '../../../../../platform/product/common/productService.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { fillEditorsDragData } from '../../../../browser/dnd.js';
+import { IResourceLabel, ResourceLabels } from '../../../../browser/labels.js';
+import { ColorScheme } from '../../../../browser/web.api.js';
+import { ResourceContextKey } from '../../../../common/contextkeys.js';
+import { SETTINGS_AUTHORITY } from '../../../../services/preferences/common/preferences.js';
+import { createFileIconThemableTreeContainerScope } from '../../../files/browser/views/explorerView.js';
+import { ExplorerFolderContext } from '../../../files/common/files.js';
+import { ChatResponseReferencePartStatusKind, IChatContentReference, IChatWarningMessage } from '../../common/chatService.js';
+import { IChatVariablesService } from '../../common/chatVariables.js';
+import { IChatRendererContent, IChatResponseViewModel } from '../../common/chatViewModel.js';
+import { ChatTreeItem, IChatWidgetService } from '../chat.js';
+import { IDisposableReference, ResourcePool } from './chatCollections.js';
+import { IChatContentPart } from './chatContentParts.js';
+
+const $ = dom.$;
+
+export interface IChatReferenceListItem extends IChatContentReference {
+	title?: string;
+}
+
+export type IChatCollapsibleListItem = IChatReferenceListItem | IChatWarningMessage;
+
+export class ChatCollapsibleListContentPart extends Disposable implements IChatContentPart {
+	public readonly domNode: HTMLElement;
+
+	private readonly _onDidChangeHeight = this._register(new Emitter<void>());
+	public readonly onDidChangeHeight = this._onDidChangeHeight.event;
+
+	constructor(
+		private readonly data: ReadonlyArray<IChatCollapsibleListItem>,
+		labelOverride: string | undefined,
+		element: IChatResponseViewModel,
+		contentReferencesListPool: CollapsibleListPool,
+		@IOpenerService openerService: IOpenerService,
+		@IMenuService menuService: IMenuService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IContextMenuService private readonly contextMenuService: IContextMenuService,
+	) {
+		super();
+
+		const referencesLabel = labelOverride ?? (data.length > 1 ?
+			localize('usedReferencesPlural', "Used {0} references", data.length) :
+			localize('usedReferencesSingular', "Used {0} reference", 1));
+		const iconElement = $('.chat-used-context-icon');
+		const icon = (element: IChatResponseViewModel) => element.usedReferencesExpanded ? Codicon.chevronDown : Codicon.chevronRight;
+		iconElement.classList.add(...ThemeIcon.asClassNameArray(icon(element)));
+		const buttonElement = $('.chat-used-context-label', undefined);
+
+		const collapseButton = this._register(new Button(buttonElement, {
+			buttonBackground: undefined,
+			buttonBorder: undefined,
+			buttonForeground: undefined,
+			buttonHoverBackground: undefined,
+			buttonSecondaryBackground: undefined,
+			buttonSecondaryForeground: undefined,
+			buttonSecondaryHoverBackground: undefined,
+			buttonSeparator: undefined
+		}));
+		this.domNode = $('.chat-used-context', undefined, buttonElement);
+		collapseButton.label = referencesLabel;
+		collapseButton.element.prepend(iconElement);
+		this.updateAriaLabel(collapseButton.element, referencesLabel, element.usedReferencesExpanded);
+		this.domNode.classList.toggle('chat-used-context-collapsed', !element.usedReferencesExpanded);
+		this._register(collapseButton.onDidClick(() => {
+			iconElement.classList.remove(...ThemeIcon.asClassNameArray(icon(element)));
+			element.usedReferencesExpanded = !element.usedReferencesExpanded;
+			iconElement.classList.add(...ThemeIcon.asClassNameArray(icon(element)));
+			this.domNode.classList.toggle('chat-used-context-collapsed', !element.usedReferencesExpanded);
+			this._onDidChangeHeight.fire();
+			this.updateAriaLabel(collapseButton.element, referencesLabel, element.usedReferencesExpanded);
+		}));
+
+		const ref = this._register(contentReferencesListPool.get());
+		const list = ref.object;
+		this.domNode.appendChild(list.getHTMLElement().parentElement!);
+
+		this._register(list.onDidOpen((e) => {
+			if (e.element && 'reference' in e.element && typeof e.element.reference === 'object') {
+				const uriOrLocation = 'variableName' in e.element.reference ? e.element.reference.value : e.element.reference;
+				const uri = URI.isUri(uriOrLocation) ? uriOrLocation :
+					uriOrLocation?.uri;
+				if (uri) {
+					openerService.open(
+						uri,
+						{
+							fromUserGesture: true,
+							editorOptions: {
+								...e.editorOptions,
+								...{
+									selection: uriOrLocation && 'range' in uriOrLocation ? uriOrLocation.range : undefined
+								}
+							}
+						});
+				}
+			}
+		}));
+
+		this._register(list.onContextMenu(e => {
+			dom.EventHelper.stop(e.browserEvent, true);
+
+			const uri = e.element && getResourceForElement(e.element);
+			if (!uri) {
+				return;
+			}
+
+			this.contextMenuService.showContextMenu({
+				getAnchor: () => e.anchor,
+				getActions: () => {
+					const menu = menuService.getMenuActions(MenuId.ChatAttachmentsContext, list.contextKeyService, { shouldForwardArgs: true, arg: uri });
+					const primary: IAction[] = [];
+					createAndFillInContextMenuActions(menu, primary);
+					return primary;
+				}
+			});
+		}));
+
+		const resourceContextKey = this._register(this.instantiationService.createInstance(ResourceContextKey));
+		this._register(list.onDidChangeFocus(e => {
+			resourceContextKey.reset();
+			const element = e.elements.length ? e.elements[0] : undefined;
+			const uri = element && getResourceForElement(element);
+			resourceContextKey.set(uri ?? null);
+		}));
+
+		const maxItemsShown = 6;
+		const itemsShown = Math.min(data.length, maxItemsShown);
+		const height = itemsShown * 22;
+		list.layout(height);
+		list.getHTMLElement().style.height = `${height}px`;
+		list.splice(0, list.length, data);
+	}
+
+	hasSameContent(other: IChatRendererContent, followingContent: IChatRendererContent[], element: ChatTreeItem): boolean {
+		return other.kind === 'references' && other.references.length === this.data.length ||
+			other.kind === 'codeCitations' && other.citations.length === this.data.length;
+	}
+
+	private updateAriaLabel(element: HTMLElement, label: string, expanded?: boolean): void {
+		element.ariaLabel = expanded ? localize('usedReferencesExpanded', "{0}, expanded", label) : localize('usedReferencesCollapsed', "{0}, collapsed", label);
+	}
+
+	addDisposable(disposable: IDisposable): void {
+		this._register(disposable);
+	}
+}
+
+export class CollapsibleListPool extends Disposable {
+	private _pool: ResourcePool<WorkbenchList<IChatCollapsibleListItem>>;
+
+	public get inUse(): ReadonlySet<WorkbenchList<IChatCollapsibleListItem>> {
+		return this._pool.inUse;
+	}
+
+	constructor(
+		private _onDidChangeVisibility: Event<boolean>,
+		private readonly menuId: MenuId | undefined,
+		private readonly options: { enableFileDecorations?: boolean } | undefined,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IThemeService private readonly themeService: IThemeService,
+		@ILabelService private readonly labelService: ILabelService,
+	) {
+		super();
+		this._pool = this._register(new ResourcePool(() => this.listFactory()));
+	}
+
+	private listFactory(): WorkbenchList<IChatCollapsibleListItem> {
+		const resourceLabels = this._register(this.instantiationService.createInstance(ResourceLabels, { onDidChangeVisibility: this._onDidChangeVisibility }));
+
+		const container = $('.chat-used-context-list');
+		this._register(createFileIconThemableTreeContainerScope(container, this.themeService));
+
+		const list = this.instantiationService.createInstance(
+			WorkbenchList<IChatCollapsibleListItem>,
+			'ChatListRenderer',
+			container,
+			new CollapsibleListDelegate(),
+			[this.instantiationService.createInstance(CollapsibleListRenderer, resourceLabels, this.menuId, this.options)],
+			{
+				alwaysConsumeMouseWheel: false,
+				accessibilityProvider: {
+					getAriaLabel: (element: IChatCollapsibleListItem) => {
+						if (element.kind === 'warning') {
+							return element.content.value;
+						}
+						const reference = element.reference;
+						if (typeof reference === 'string') {
+							return reference;
+						} else if ('variableName' in reference) {
+							return reference.variableName;
+						} else if (URI.isUri(reference)) {
+							return basename(reference.path);
+						} else {
+							return basename(reference.uri.path);
+						}
+					},
+
+					getWidgetAriaLabel: () => localize('chatCollapsibleList', "Collapsible Chat List")
+				},
+				dnd: {
+					getDragURI: (element: IChatCollapsibleListItem) => getResourceForElement(element)?.toString() ?? null,
+					getDragLabel: (elements, originalEvent) => {
+						const uris: URI[] = coalesce(elements.map(getResourceForElement));
+						if (!uris.length) {
+							return undefined;
+						} else if (uris.length === 1) {
+							return this.labelService.getUriLabel(uris[0], { relative: true });
+						} else {
+							return `${uris.length}`;
+						}
+					},
+					dispose: () => { },
+					onDragOver: () => false,
+					drop: () => { },
+					onDragStart: (data, originalEvent) => {
+						try {
+							const elements = data.getData() as IChatCollapsibleListItem[];
+							const uris: URI[] = coalesce(elements.map(getResourceForElement));
+							this.instantiationService.invokeFunction(accessor => fillEditorsDragData(accessor, uris, originalEvent));
+						} catch {
+							// noop
+						}
+					},
+				},
+			});
+
+		return list;
+	}
+
+	get(): IDisposableReference<WorkbenchList<IChatCollapsibleListItem>> {
+		const object = this._pool.get();
+		let stale = false;
+		return {
+			object,
+			isStale: () => stale,
+			dispose: () => {
+				stale = true;
+				this._pool.release(object);
+			}
+		};
+	}
+}
+
+class CollapsibleListDelegate implements IListVirtualDelegate<IChatCollapsibleListItem> {
+	getHeight(element: IChatCollapsibleListItem): number {
+		return 22;
+	}
+
+	getTemplateId(element: IChatCollapsibleListItem): string {
+		return CollapsibleListRenderer.TEMPLATE_ID;
+	}
+}
+
+interface ICollapsibleListTemplate {
+	toolbar: MenuWorkbenchToolBar | undefined;
+	readonly label: IResourceLabel;
+	readonly templateDisposables: DisposableStore;
+}
+
+class CollapsibleListRenderer implements IListRenderer<IChatCollapsibleListItem, ICollapsibleListTemplate> {
+	static TEMPLATE_ID = 'chatCollapsibleListRenderer';
+	readonly templateId: string = CollapsibleListRenderer.TEMPLATE_ID;
+
+	constructor(
+		private labels: ResourceLabels,
+		private menuId: MenuId | undefined,
+		private options: { enableFileDecorations?: boolean } | undefined,
+		@IThemeService private readonly themeService: IThemeService,
+		@IChatVariablesService private readonly chatVariablesService: IChatVariablesService,
+		@IProductService private readonly productService: IProductService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService
+	) { }
+
+	renderTemplate(container: HTMLElement): ICollapsibleListTemplate {
+		const templateDisposables = new DisposableStore();
+		const label = templateDisposables.add(this.labels.create(container, { supportHighlights: true, supportIcons: true }));
+		return { templateDisposables, label, toolbar: undefined };
+	}
+
+
+	private getReferenceIcon(data: IChatContentReference): URI | ThemeIcon | undefined {
+		if (ThemeIcon.isThemeIcon(data.iconPath)) {
+			return data.iconPath;
+		} else {
+			return this.themeService.getColorTheme().type === ColorScheme.DARK && data.iconPath?.dark
+				? data.iconPath?.dark
+				: data.iconPath?.light;
+		}
+	}
+
+	renderElement(data: IChatCollapsibleListItem, index: number, templateData: ICollapsibleListTemplate, height: number | undefined): void {
+		templateData.toolbar?.dispose();
+
+		if (data.kind === 'warning') {
+			templateData.label.setResource({ name: data.content.value }, { icon: Codicon.warning });
+			return;
+		}
+
+		const reference = data.reference;
+		const icon = this.getReferenceIcon(data);
+		templateData.label.element.style.display = 'flex';
+		let arg: URI | undefined;
+		if (typeof reference === 'object' && 'variableName' in reference) {
+			if (reference.value) {
+				const uri = URI.isUri(reference.value) ? reference.value : reference.value.uri;
+				templateData.label.setResource(
+					{
+						resource: uri,
+						name: basenameOrAuthority(uri),
+						description: `#${reference.variableName}`,
+						range: 'range' in reference.value ? reference.value.range : undefined,
+					}, { icon, title: data.options?.status?.description ?? data.title });
+			} else if (reference.variableName.startsWith('kernelVariable')) {
+				const variable = reference.variableName.split(':')[1];
+				const asVariableName = `${variable}`;
+				const label = `Kernel variable`;
+				templateData.label.setLabel(label, asVariableName, { title: data.options?.status?.description });
+			} else {
+				const variable = this.chatVariablesService.getVariable(reference.variableName);
+				// This is a hack to get chat attachment ThemeIcons to render for resource labels
+				const asThemeIcon = variable?.icon ? `$(${variable.icon.id}) ` : '';
+				const asVariableName = `#${reference.variableName}`; // Fallback, shouldn't really happen
+				const label = `${asThemeIcon}${variable?.fullName ?? asVariableName}`;
+				templateData.label.setLabel(label, asVariableName, { title: data.options?.status?.description ?? variable?.description });
+			}
+		} else if (typeof reference === 'string') {
+			templateData.label.setLabel(reference, undefined, { iconPath: URI.isUri(icon) ? icon : undefined, title: data.options?.status?.description ?? data.title });
+
+		} else {
+			const uri = 'uri' in reference ? reference.uri : reference;
+			arg = uri;
+			if (uri.scheme === 'https' && isEqualAuthority(uri.authority, 'github.com') && uri.path.includes('/tree/')) {
+				// Parse a nicer label for GitHub URIs that point at a particular commit + file
+				const label = uri.path.split('/').slice(1, 3).join('/');
+				const description = uri.path.split('/').slice(5).join('/');
+				templateData.label.setResource({ resource: uri, name: label, description }, { icon: Codicon.github, title: data.title });
+			} else if (uri.scheme === this.productService.urlProtocol && isEqualAuthority(uri.authority, SETTINGS_AUTHORITY)) {
+				// a nicer label for settings URIs
+				const settingId = uri.path.substring(1);
+				templateData.label.setResource({ resource: uri, name: settingId }, { icon: Codicon.settingsGear, title: localize('setting.hover', "Open setting '{0}'", settingId) });
+			} else if (matchesSomeScheme(uri, Schemas.mailto, Schemas.http, Schemas.https)) {
+				templateData.label.setResource({ resource: uri, name: uri.toString() }, { icon: icon ?? Codicon.globe, title: data.options?.status?.description ?? data.title ?? uri.toString() });
+			} else {
+				templateData.label.setFile(uri, {
+					fileKind: FileKind.FILE,
+					// Should not have this live-updating data on a historical reference
+					fileDecorations: this.options?.enableFileDecorations ? { badges: true, colors: true } : { badges: false, colors: false },
+					range: 'range' in reference ? reference.range : undefined,
+					title: data.options?.status?.description ?? data.title
+				});
+			}
+		}
+
+		for (const selector of ['.monaco-icon-suffix-container', '.monaco-icon-name-container']) {
+			const element = templateData.label.element.querySelector(selector);
+			if (element) {
+				if (data.options?.status?.kind === ChatResponseReferencePartStatusKind.Omitted || data.options?.status?.kind === ChatResponseReferencePartStatusKind.Partial) {
+					element.classList.add('warning');
+				} else {
+					element.classList.remove('warning');
+				}
+			}
+		}
+
+		if (this.menuId) {
+			const actionBarContainer = $('.chat-collapsible-list-action-bar');
+			templateData.toolbar = templateData.templateDisposables.add(this.instantiationService.createInstance(MenuWorkbenchToolBar, actionBarContainer, this.menuId, { menuOptions: { shouldForwardArgs: true, arg: arg } }));
+			templateData.label.element.appendChild(actionBarContainer);
+		}
+	}
+
+	disposeTemplate(templateData: ICollapsibleListTemplate): void {
+		templateData.templateDisposables.dispose();
+	}
+}
+
+function getResourceForElement(element: IChatCollapsibleListItem): URI | null {
+	if (element.kind === 'warning') {
+		return null;
+	}
+	const { reference } = element;
+	if (typeof reference === 'string' || 'variableName' in reference) {
+		return null;
+	} else if (URI.isUri(reference)) {
+		return reference;
+	} else {
+		return reference.uri;
+	}
+}
+
+//#region Resource context menu
+
+registerAction2(class AddToChatAction extends Action2 {
+
+	static readonly id = 'workbench.action.chat.addToChatAction';
+
+	constructor() {
+		super({
+			id: AddToChatAction.id,
+			title: {
+				...localize2('addToChat', "Add File to Chat"),
+			},
+			f1: false,
+			menu: [{
+				id: MenuId.ChatAttachmentsContext,
+				group: 'chat',
+				order: 1,
+				when: ExplorerFolderContext.negate(),
+			}]
+		});
+	}
+
+	override async run(accessor: ServicesAccessor, resource: URI): Promise<void> {
+		const chatWidgetService = accessor.get(IChatWidgetService);
+		const variablesService = accessor.get(IChatVariablesService);
+
+		if (!resource) {
+			return;
+		}
+
+		const widget = chatWidgetService.lastFocusedWidget;
+		if (!widget) {
+			return;
+		}
+
+		variablesService.attachContext('file', resource, widget.location);
+	}
+});
+
+//#endregion
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTaskContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTaskContentPart.ts
new file mode 100644
index 00000000000..26b5139564f
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTaskContentPart.ts
@@ -0,0 +1,54 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from '../../../../../base/browser/dom.js';
+import { Event } from '../../../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { MarkdownRenderer } from '../../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts.js';
+import { ChatProgressContentPart } from './chatProgressContentPart.js';
+import { ChatCollapsibleListContentPart, CollapsibleListPool } from './chatReferencesContentPart.js';
+import { IChatProgressRenderableResponseContent } from '../../common/chatModel.js';
+import { IChatTask } from '../../common/chatService.js';
+import { IChatResponseViewModel } from '../../common/chatViewModel.js';
+
+export class ChatTaskContentPart extends Disposable implements IChatContentPart {
+	public readonly domNode: HTMLElement;
+	public readonly onDidChangeHeight: Event<void>;
+
+	constructor(
+		private readonly task: IChatTask,
+		contentReferencesListPool: CollapsibleListPool,
+		renderer: MarkdownRenderer,
+		context: IChatContentPartRenderContext,
+		@IInstantiationService instantiationService: IInstantiationService,
+	) {
+		super();
+
+		if (task.progress.length) {
+			const refsPart = this._register(instantiationService.createInstance(ChatCollapsibleListContentPart, task.progress, task.content.value, context.element as IChatResponseViewModel, contentReferencesListPool));
+			this.domNode = dom.$('.chat-progress-task');
+			this.domNode.appendChild(refsPart.domNode);
+			this.onDidChangeHeight = refsPart.onDidChangeHeight;
+		} else {
+			// #217645
+			const isSettled = task.isSettled?.() ?? true;
+			const progressPart = this._register(instantiationService.createInstance(ChatProgressContentPart, task, renderer, context, !isSettled, true));
+			this.domNode = progressPart.domNode;
+			this.onDidChangeHeight = Event.None;
+		}
+	}
+
+	hasSameContent(other: IChatProgressRenderableResponseContent): boolean {
+		return other.kind === 'progressTask'
+			&& other.progress.length === this.task.progress.length
+			&& other.isSettled() === this.task.isSettled();
+	}
+
+	addDisposable(disposable: IDisposable): void {
+		this._register(disposable);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTextEditContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTextEditContentPart.ts
new file mode 100644
index 00000000000..f9f5da9713d
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTextEditContentPart.ts
@@ -0,0 +1,255 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from '../../../../../base/browser/dom.js';
+import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { Disposable, IDisposable, IReference, RefCountedDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { isEqual } from '../../../../../base/common/resources.js';
+import { assertType } from '../../../../../base/common/types.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { generateUuid } from '../../../../../base/common/uuid.js';
+import { ISingleEditOperation } from '../../../../../editor/common/core/editOperation.js';
+import { TextEdit } from '../../../../../editor/common/languages.js';
+import { createTextBufferFactoryFromSnapshot } from '../../../../../editor/common/model/textModel.js';
+import { IModelService } from '../../../../../editor/common/services/model.js';
+import { DefaultModelSHA1Computer } from '../../../../../editor/common/services/modelService.js';
+import { IResolvedTextEditorModel, ITextModelService } from '../../../../../editor/common/services/resolverService.js';
+import { localize } from '../../../../../nls.js';
+import { MenuId } from '../../../../../platform/actions/common/actions.js';
+import { InstantiationType, registerSingleton } from '../../../../../platform/instantiation/common/extensions.js';
+import { createDecorator, IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IChatListItemRendererOptions } from '../chat.js';
+import { IDisposableReference, ResourcePool } from './chatCollections.js';
+import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts.js';
+import { IChatRendererDelegate } from '../chatListRenderer.js';
+import { ChatEditorOptions } from '../chatOptions.js';
+import { CodeCompareBlockPart, ICodeCompareBlockData, ICodeCompareBlockDiffData } from '../codeBlockPart.js';
+import { IChatProgressRenderableResponseContent, IChatTextEditGroup } from '../../common/chatModel.js';
+import { IChatService } from '../../common/chatService.js';
+import { IChatResponseViewModel, isResponseVM } from '../../common/chatViewModel.js';
+
+const $ = dom.$;
+
+const ICodeCompareModelService = createDecorator<ICodeCompareModelService>('ICodeCompareModelService');
+
+interface ICodeCompareModelService {
+	_serviceBrand: undefined;
+	createModel(response: IChatResponseViewModel, chatTextEdit: IChatTextEditGroup): Promise<IReference<{ originalSha1: string; original: IResolvedTextEditorModel; modified: IResolvedTextEditorModel }>>;
+}
+
+export class ChatTextEditContentPart extends Disposable implements IChatContentPart {
+	public readonly domNode: HTMLElement;
+	private readonly comparePart: IDisposableReference<CodeCompareBlockPart> | undefined;
+
+	private readonly _onDidChangeHeight = this._register(new Emitter<void>());
+	public readonly onDidChangeHeight = this._onDidChangeHeight.event;
+
+	constructor(
+		chatTextEdit: IChatTextEditGroup,
+		context: IChatContentPartRenderContext,
+		rendererOptions: IChatListItemRendererOptions,
+		diffEditorPool: DiffEditorPool,
+		currentWidth: number,
+		@ICodeCompareModelService private readonly codeCompareModelService: ICodeCompareModelService
+	) {
+		super();
+		const element = context.element;
+
+		assertType(isResponseVM(element));
+
+		// TODO@jrieken move this into the CompareCodeBlock and properly say what kind of changes happen
+		if (rendererOptions.renderTextEditsAsSummary?.(chatTextEdit.uri)) {
+			if (element.response.value.every(item => item.kind === 'textEditGroup')) {
+				this.domNode = $('.interactive-edits-summary', undefined, !element.isComplete
+					? ''
+					: element.isCanceled
+						? localize('edits0', "Making changes was aborted.")
+						: localize('editsSummary', "Made changes."));
+			} else {
+				this.domNode = $('div');
+			}
+
+			// TODO@roblourens this case is now handled outside this Part in ChatListRenderer, but can it be cleaned up?
+			// return;
+		} else {
+
+
+			const cts = new CancellationTokenSource();
+
+			let isDisposed = false;
+			this._register(toDisposable(() => {
+				isDisposed = true;
+				cts.dispose(true);
+			}));
+
+			this.comparePart = this._register(diffEditorPool.get());
+
+			// Attach this after updating text/layout of the editor, so it should only be fired when the size updates later (horizontal scrollbar, wrapping)
+			// not during a renderElement OR a progressive render (when we will be firing this event anyway at the end of the render)
+			this._register(this.comparePart.object.onDidChangeContentHeight(() => {
+				this._onDidChangeHeight.fire();
+			}));
+
+			const data: ICodeCompareBlockData = {
+				element,
+				edit: chatTextEdit,
+				diffData: (async () => {
+
+					const ref = await this.codeCompareModelService.createModel(element, chatTextEdit);
+
+					if (isDisposed) {
+						ref.dispose();
+						return;
+					}
+
+					this._register(ref);
+
+					return {
+						modified: ref.object.modified.textEditorModel,
+						original: ref.object.original.textEditorModel,
+						originalSha1: ref.object.originalSha1
+					} satisfies ICodeCompareBlockDiffData;
+				})()
+			};
+			this.comparePart.object.render(data, currentWidth, cts.token);
+
+			this.domNode = this.comparePart.object.element;
+		}
+	}
+
+	layout(width: number): void {
+		this.comparePart?.object.layout(width);
+	}
+
+	hasSameContent(other: IChatProgressRenderableResponseContent): boolean {
+		// No other change allowed for this content type
+		return other.kind === 'textEditGroup';
+	}
+
+	addDisposable(disposable: IDisposable): void {
+		this._register(disposable);
+	}
+}
+
+export class DiffEditorPool extends Disposable {
+
+	private readonly _pool: ResourcePool<CodeCompareBlockPart>;
+
+	public inUse(): Iterable<CodeCompareBlockPart> {
+		return this._pool.inUse;
+	}
+
+	constructor(
+		options: ChatEditorOptions,
+		delegate: IChatRendererDelegate,
+		overflowWidgetsDomNode: HTMLElement | undefined,
+		@IInstantiationService instantiationService: IInstantiationService,
+	) {
+		super();
+		this._pool = this._register(new ResourcePool(() => {
+			return instantiationService.createInstance(CodeCompareBlockPart, options, MenuId.ChatCompareBlock, delegate, overflowWidgetsDomNode);
+		}));
+	}
+
+	get(): IDisposableReference<CodeCompareBlockPart> {
+		const codeBlock = this._pool.get();
+		let stale = false;
+		return {
+			object: codeBlock,
+			isStale: () => stale,
+			dispose: () => {
+				codeBlock.reset();
+				stale = true;
+				this._pool.release(codeBlock);
+			}
+		};
+	}
+}
+
+class CodeCompareModelService implements ICodeCompareModelService {
+
+	declare readonly _serviceBrand: undefined;
+
+	constructor(
+		@ITextModelService private readonly textModelService: ITextModelService,
+		@IModelService private readonly modelService: IModelService,
+		@IChatService private readonly chatService: IChatService,
+	) { }
+
+	async createModel(element: IChatResponseViewModel, chatTextEdit: IChatTextEditGroup): Promise<IReference<{ originalSha1: string; original: IResolvedTextEditorModel; modified: IResolvedTextEditorModel }>> {
+
+		const original = await this.textModelService.createModelReference(chatTextEdit.uri);
+
+		const modified = await this.textModelService.createModelReference((this.modelService.createModel(
+			createTextBufferFactoryFromSnapshot(original.object.textEditorModel.createSnapshot()),
+			{ languageId: original.object.textEditorModel.getLanguageId(), onDidChange: Event.None },
+			URI.from({ scheme: Schemas.vscodeChatCodeBlock, path: chatTextEdit.uri.path, query: generateUuid() }),
+			false
+		)).uri);
+
+		const d = new RefCountedDisposable(toDisposable(() => {
+			original.dispose();
+			modified.dispose();
+		}));
+
+		// compute the sha1 of the original model
+		let originalSha1: string = '';
+		if (chatTextEdit.state) {
+			originalSha1 = chatTextEdit.state.sha1;
+		} else {
+			const sha1 = new DefaultModelSHA1Computer();
+			if (sha1.canComputeSHA1(original.object.textEditorModel)) {
+				originalSha1 = sha1.computeSHA1(original.object.textEditorModel);
+				chatTextEdit.state = { sha1: originalSha1, applied: 0 };
+			}
+		}
+
+		// apply edits to the "modified" model
+		const chatModel = this.chatService.getSession(element.sessionId)!;
+		const editGroups: ISingleEditOperation[][] = [];
+		for (const request of chatModel.getRequests()) {
+			if (!request.response) {
+				continue;
+			}
+			for (const item of request.response.response.value) {
+				if (item.kind !== 'textEditGroup' || item.state?.applied || !isEqual(item.uri, chatTextEdit.uri)) {
+					continue;
+				}
+				for (const group of item.edits) {
+					const edits = group.map(TextEdit.asEditOperation);
+					editGroups.push(edits);
+				}
+			}
+			if (request.response === element.model) {
+				break;
+			}
+		}
+		for (const edits of editGroups) {
+			modified.object.textEditorModel.pushEditOperations(null, edits, () => null);
+		}
+
+		// self-acquire a reference to diff models for a short while
+		// because streaming usually means we will be using the original-model
+		// repeatedly and thereby also should reuse the modified-model and just
+		// update it with more edits
+		d.acquire();
+		setTimeout(() => d.release(), 5000);
+
+		return {
+			object: {
+				originalSha1,
+				original: original.object,
+				modified: modified.object
+			},
+			dispose() {
+				d.release();
+			},
+		};
+	}
+}
+
+registerSingleton(ICodeCompareModelService, CodeCompareModelService, InstantiationType.Delayed);
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolInvocationPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolInvocationPart.ts
new file mode 100644
index 00000000000..af42ed61d23
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolInvocationPart.ts
@@ -0,0 +1,100 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from '../../../../../base/browser/dom.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { MarkdownRenderer } from '../../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import { localize } from '../../../../../nls.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IChatProgressMessage, IChatToolInvocation, IChatToolInvocationSerialized } from '../../common/chatService.js';
+import { IChatRendererContent } from '../../common/chatViewModel.js';
+import { ChatTreeItem } from '../chat.js';
+import { ChatConfirmationWidget } from './chatConfirmationWidget.js';
+import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts.js';
+import { ChatProgressContentPart } from './chatProgressContentPart.js';
+
+export class ChatToolInvocationPart extends Disposable implements IChatContentPart {
+	public readonly domNode: HTMLElement;
+
+	private _onDidChangeHeight = this._register(new Emitter<void>());
+	public readonly onDidChangeHeight = this._onDidChangeHeight.event;
+
+	constructor(
+		toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized,
+		context: IChatContentPartRenderContext,
+		renderer: MarkdownRenderer,
+		@IInstantiationService instantiationService: IInstantiationService,
+	) {
+		super();
+
+		this.domNode = dom.$('.chat-tool-invocation-part');
+
+		// This part is a bit different, since IChatToolInvocation is not an immutable model object. So this part is able to rerender itself.
+		// If this turns out to be a typical pattern, we could come up with a more reusable pattern, like telling the list to rerender an element
+		// when the model changes, or trying to make the model immutable and swap out one content part for a new one based on user actions in the view.
+		const partStore = this._register(new DisposableStore());
+		const render = () => {
+			dom.clearNode(this.domNode);
+
+			const subPart = partStore.add(instantiationService.createInstance(ChatToolInvocationSubPart, toolInvocation, context, renderer));
+			this.domNode.appendChild(subPart.domNode);
+			partStore.add(subPart.onNeedsRerender(() => {
+				render();
+				this._onDidChangeHeight.fire();
+			}));
+		};
+		render();
+	}
+
+	hasSameContent(other: IChatRendererContent, followingContent: IChatRendererContent[], element: ChatTreeItem): boolean {
+		return other.kind === 'toolInvocation' || other.kind === 'toolInvocationSerialized';
+	}
+
+	addDisposable(disposable: IDisposable): void {
+		this._register(disposable);
+	}
+}
+
+class ChatToolInvocationSubPart extends Disposable {
+	public readonly domNode: HTMLElement;
+
+	private _onNeedsRerender = this._register(new Emitter<void>());
+	public readonly onNeedsRerender = this._onNeedsRerender.event;
+
+	constructor(
+		toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized,
+		context: IChatContentPartRenderContext,
+		renderer: MarkdownRenderer,
+		@IInstantiationService instantiationService: IInstantiationService,
+	) {
+		super();
+
+		if (toolInvocation.kind === 'toolInvocation' && toolInvocation.confirmationMessages) {
+			const title = toolInvocation.confirmationMessages.title;
+			const message = toolInvocation.confirmationMessages.message;
+			const confirmWidget = this._register(instantiationService.createInstance(
+				ChatConfirmationWidget,
+				title,
+				message,
+				[{ label: localize('continue', "Continue"), data: true }, { label: localize('cancel', "Cancel"), data: false, isSecondary: true }]));
+			this.domNode = confirmWidget.domNode;
+			this._register(confirmWidget.onDidClick(button => {
+				toolInvocation.confirmed.complete(button.data);
+			}));
+			toolInvocation.confirmed.p.then(() => this._onNeedsRerender.fire());
+		} else {
+			const message = toolInvocation.invocationMessage + '…';
+			const progressMessage: IChatProgressMessage = {
+				kind: 'progressMessage',
+				content: { value: message }
+			};
+			const iconOverride = toolInvocation.isConfirmed === false ? Codicon.error : undefined;
+			const progressPart = this._register(instantiationService.createInstance(ChatProgressContentPart, progressMessage, renderer, context, undefined, true, iconOverride));
+			this.domNode = progressPart.domNode;
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTreeContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTreeContentPart.ts
new file mode 100644
index 00000000000..b06a64bb4d9
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTreeContentPart.ts
@@ -0,0 +1,225 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from '../../../../../base/browser/dom.js';
+import { IListVirtualDelegate } from '../../../../../base/browser/ui/list/list.js';
+import { ITreeCompressionDelegate } from '../../../../../base/browser/ui/tree/asyncDataTree.js';
+import { ICompressedTreeNode } from '../../../../../base/browser/ui/tree/compressedObjectTreeModel.js';
+import { ICompressibleTreeRenderer } from '../../../../../base/browser/ui/tree/objectTree.js';
+import { IAsyncDataSource, ITreeNode } from '../../../../../base/browser/ui/tree/tree.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { localize } from '../../../../../nls.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { FileKind, FileType } from '../../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { WorkbenchCompressibleAsyncDataTree } from '../../../../../platform/list/browser/listService.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { IResourceLabel, ResourceLabels } from '../../../../browser/labels.js';
+import { ChatTreeItem } from '../chat.js';
+import { IDisposableReference, ResourcePool } from './chatCollections.js';
+import { IChatContentPart } from './chatContentParts.js';
+import { IChatProgressRenderableResponseContent } from '../../common/chatModel.js';
+import { IChatResponseProgressFileTreeData } from '../../common/chatService.js';
+import { createFileIconThemableTreeContainerScope } from '../../../files/browser/views/explorerView.js';
+import { IFilesConfiguration } from '../../../files/common/files.js';
+
+const $ = dom.$;
+
+export class ChatTreeContentPart extends Disposable implements IChatContentPart {
+	public readonly domNode: HTMLElement;
+
+	private readonly _onDidChangeHeight = this._register(new Emitter<void>());
+	public readonly onDidChangeHeight = this._onDidChangeHeight.event;
+
+	public readonly onDidFocus: Event<void>;
+
+	private tree: WorkbenchCompressibleAsyncDataTree<IChatResponseProgressFileTreeData, IChatResponseProgressFileTreeData, void>;
+
+	constructor(
+		data: IChatResponseProgressFileTreeData,
+		element: ChatTreeItem,
+		treePool: TreePool,
+		treeDataIndex: number,
+		@IOpenerService private readonly openerService: IOpenerService
+	) {
+		super();
+
+		const ref = this._register(treePool.get());
+		this.tree = ref.object;
+		this.onDidFocus = this.tree.onDidFocus;
+
+		this._register(this.tree.onDidOpen((e) => {
+			if (e.element && !('children' in e.element)) {
+				this.openerService.open(e.element.uri);
+			}
+		}));
+		this._register(this.tree.onDidChangeCollapseState(() => {
+			this._onDidChangeHeight.fire();
+		}));
+		this._register(this.tree.onContextMenu((e) => {
+			e.browserEvent.preventDefault();
+			e.browserEvent.stopPropagation();
+		}));
+
+		this.tree.setInput(data).then(() => {
+			if (!ref.isStale()) {
+				this.tree.layout();
+				this._onDidChangeHeight.fire();
+			}
+		});
+
+		this.domNode = this.tree.getHTMLElement().parentElement!;
+	}
+
+	domFocus() {
+		this.tree.domFocus();
+	}
+
+	hasSameContent(other: IChatProgressRenderableResponseContent): boolean {
+		// No other change allowed for this content type
+		return other.kind === 'treeData';
+	}
+
+	addDisposable(disposable: IDisposable): void {
+		this._register(disposable);
+	}
+}
+
+export class TreePool extends Disposable {
+	private _pool: ResourcePool<WorkbenchCompressibleAsyncDataTree<IChatResponseProgressFileTreeData, IChatResponseProgressFileTreeData, void>>;
+
+	public get inUse(): ReadonlySet<WorkbenchCompressibleAsyncDataTree<IChatResponseProgressFileTreeData, IChatResponseProgressFileTreeData, void>> {
+		return this._pool.inUse;
+	}
+
+	constructor(
+		private _onDidChangeVisibility: Event<boolean>,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IConfigurationService private readonly configService: IConfigurationService,
+		@IThemeService private readonly themeService: IThemeService,
+	) {
+		super();
+		this._pool = this._register(new ResourcePool(() => this.treeFactory()));
+	}
+
+	private treeFactory(): WorkbenchCompressibleAsyncDataTree<IChatResponseProgressFileTreeData, IChatResponseProgressFileTreeData, void> {
+		const resourceLabels = this._register(this.instantiationService.createInstance(ResourceLabels, { onDidChangeVisibility: this._onDidChangeVisibility }));
+
+		const container = $('.interactive-response-progress-tree');
+		this._register(createFileIconThemableTreeContainerScope(container, this.themeService));
+
+		const tree = this.instantiationService.createInstance(
+			WorkbenchCompressibleAsyncDataTree<IChatResponseProgressFileTreeData, IChatResponseProgressFileTreeData>,
+			'ChatListRenderer',
+			container,
+			new ChatListTreeDelegate(),
+			new ChatListTreeCompressionDelegate(),
+			[new ChatListTreeRenderer(resourceLabels, this.configService.getValue('explorer.decorations'))],
+			new ChatListTreeDataSource(),
+			{
+				collapseByDefault: () => false,
+				expandOnlyOnTwistieClick: () => false,
+				identityProvider: {
+					getId: (e: IChatResponseProgressFileTreeData) => e.uri.toString()
+				},
+				accessibilityProvider: {
+					getAriaLabel: (element: IChatResponseProgressFileTreeData) => element.label,
+					getWidgetAriaLabel: () => localize('treeAriaLabel', "File Tree")
+				},
+				alwaysConsumeMouseWheel: false
+			});
+
+		return tree;
+	}
+
+	get(): IDisposableReference<WorkbenchCompressibleAsyncDataTree<IChatResponseProgressFileTreeData, IChatResponseProgressFileTreeData, void>> {
+		const object = this._pool.get();
+		let stale = false;
+		return {
+			object,
+			isStale: () => stale,
+			dispose: () => {
+				stale = true;
+				this._pool.release(object);
+			}
+		};
+	}
+}
+
+class ChatListTreeDelegate implements IListVirtualDelegate<IChatResponseProgressFileTreeData> {
+	static readonly ITEM_HEIGHT = 22;
+
+	getHeight(element: IChatResponseProgressFileTreeData): number {
+		return ChatListTreeDelegate.ITEM_HEIGHT;
+	}
+
+	getTemplateId(element: IChatResponseProgressFileTreeData): string {
+		return 'chatListTreeTemplate';
+	}
+}
+
+class ChatListTreeCompressionDelegate implements ITreeCompressionDelegate<IChatResponseProgressFileTreeData> {
+	isIncompressible(element: IChatResponseProgressFileTreeData): boolean {
+		return !element.children;
+	}
+}
+
+interface IChatListTreeRendererTemplate {
+	templateDisposables: DisposableStore;
+	label: IResourceLabel;
+}
+
+class ChatListTreeRenderer implements ICompressibleTreeRenderer<IChatResponseProgressFileTreeData, void, IChatListTreeRendererTemplate> {
+	templateId: string = 'chatListTreeTemplate';
+
+	constructor(private labels: ResourceLabels, private decorations: IFilesConfiguration['explorer']['decorations']) { }
+
+	renderCompressedElements(element: ITreeNode<ICompressedTreeNode<IChatResponseProgressFileTreeData>, void>, index: number, templateData: IChatListTreeRendererTemplate, height: number | undefined): void {
+		templateData.label.element.style.display = 'flex';
+		const label = element.element.elements.map((e) => e.label);
+		templateData.label.setResource({ resource: element.element.elements[0].uri, name: label }, {
+			title: element.element.elements[0].label,
+			fileKind: element.children ? FileKind.FOLDER : FileKind.FILE,
+			extraClasses: ['explorer-item'],
+			fileDecorations: this.decorations
+		});
+	}
+	renderTemplate(container: HTMLElement): IChatListTreeRendererTemplate {
+		const templateDisposables = new DisposableStore();
+		const label = templateDisposables.add(this.labels.create(container, { supportHighlights: true }));
+		return { templateDisposables, label };
+	}
+	renderElement(element: ITreeNode<IChatResponseProgressFileTreeData, void>, index: number, templateData: IChatListTreeRendererTemplate, height: number | undefined): void {
+		templateData.label.element.style.display = 'flex';
+		if (!element.children.length && element.element.type !== FileType.Directory) {
+			templateData.label.setFile(element.element.uri, {
+				fileKind: FileKind.FILE,
+				hidePath: true,
+				fileDecorations: this.decorations,
+			});
+		} else {
+			templateData.label.setResource({ resource: element.element.uri, name: element.element.label }, {
+				title: element.element.label,
+				fileKind: FileKind.FOLDER,
+				fileDecorations: this.decorations
+			});
+		}
+	}
+	disposeTemplate(templateData: IChatListTreeRendererTemplate): void {
+		templateData.templateDisposables.dispose();
+	}
+}
+
+class ChatListTreeDataSource implements IAsyncDataSource<IChatResponseProgressFileTreeData, IChatResponseProgressFileTreeData> {
+	hasChildren(element: IChatResponseProgressFileTreeData): boolean {
+		return !!element.children;
+	}
+
+	async getChildren(element: IChatResponseProgressFileTreeData): Promise<Iterable<IChatResponseProgressFileTreeData>> {
+		return element.children ?? [];
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatWarningContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatWarningContentPart.ts
new file mode 100644
index 00000000000..d3cc224782a
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatWarningContentPart.ts
@@ -0,0 +1,53 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from '../../../../../base/browser/dom.js';
+import { renderIcon } from '../../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { IMarkdownString } from '../../../../../base/common/htmlContent.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { MarkdownRenderer } from '../../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import { IChatContentPart } from './chatContentParts.js';
+import { IChatProgressRenderableResponseContent } from '../../common/chatModel.js';
+
+const $ = dom.$;
+
+export class ChatWarningContentPart extends Disposable implements IChatContentPart {
+	public readonly domNode: HTMLElement;
+
+	constructor(
+		kind: 'info' | 'warning' | 'error',
+		content: IMarkdownString,
+		renderer: MarkdownRenderer,
+	) {
+		super();
+
+		this.domNode = $('.chat-notification-widget');
+		let icon;
+		let iconClass;
+		switch (kind) {
+			case 'warning':
+				icon = Codicon.warning;
+				iconClass = '.chat-warning-codicon';
+				break;
+			case 'error':
+				icon = Codicon.error;
+				iconClass = '.chat-error-codicon';
+				break;
+			case 'info':
+				icon = Codicon.info;
+				iconClass = '.chat-info-codicon';
+				break;
+		}
+		this.domNode.appendChild($(iconClass, undefined, renderIcon(icon)));
+		const markdownContent = renderer.render(content);
+		this.domNode.appendChild(markdownContent.element);
+	}
+
+	hasSameContent(other: IChatProgressRenderableResponseContent): boolean {
+		// No other change allowed for this content type
+		return other.kind === 'warning';
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/media/chatConfirmationWidget.css b/src/vs/workbench/contrib/chat/browser/chatContentParts/media/chatConfirmationWidget.css
similarity index 95%
rename from src/vs/workbench/contrib/chat/browser/media/chatConfirmationWidget.css
rename to src/vs/workbench/contrib/chat/browser/chatContentParts/media/chatConfirmationWidget.css
index e244f077dd6..bb9d7bc7b7e 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chatConfirmationWidget.css
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/media/chatConfirmationWidget.css
@@ -6,10 +6,13 @@
 .chat-confirmation-widget {
 	border: 1px solid var(--vscode-chat-requestBorder);
 	border-radius: 4px;
-	margin-bottom: 16px;
 	padding: 8px 12px 12px;
 }
 
+.chat-confirmation-widget:not(:last-child) {
+	margin-bottom: 16px;
+}
+
 .chat-confirmation-widget .chat-confirmation-widget-title {
 	font-weight: 600;
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts b/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
new file mode 100644
index 00000000000..eab56f87ef3
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
@@ -0,0 +1,260 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { DataTransfers } from '../../../../base/browser/dnd.js';
+import { $, DragAndDropObserver } from '../../../../base/browser/dom.js';
+import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { coalesce } from '../../../../base/common/arrays.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { basename } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { localize } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { containsDragType, extractEditorsDropData, IDraggedResourceEditorInput } from '../../../../platform/dnd/browser/dnd.js';
+import { IThemeService, Themable } from '../../../../platform/theme/common/themeService.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { IChatRequestVariableEntry } from '../common/chatModel.js';
+import { ChatInputPart } from './chatInputPart.js';
+import { IChatWidgetStyles } from './chatWidget.js';
+
+enum ChatDragAndDropType {
+	FILE,
+	IMAGE
+}
+
+export class ChatDragAndDrop extends Themable {
+
+	private readonly overlay: HTMLElement;
+	private overlayText?: HTMLElement;
+	private overlayTextBackground: string = '';
+
+	constructor(
+		private readonly contianer: HTMLElement,
+		private readonly inputPart: ChatInputPart,
+		private readonly styles: IChatWidgetStyles,
+		@IThemeService themeService: IThemeService,
+		@IConfigurationService private readonly configurationService: IConfigurationService
+	) {
+		super(themeService);
+
+		// If the mouse enters and leaves the overlay quickly,
+		// the overlay may stick around due to too many drag enter events
+		// Make sure the mouse enters only once
+		let mouseInside = false;
+		this._register(new DragAndDropObserver(this.contianer, {
+			onDragEnter: (e) => {
+				if (!mouseInside) {
+					mouseInside = true;
+					this.onDragEnter(e);
+				}
+			},
+			onDragOver: (e) => {
+				e.stopPropagation();
+			},
+			onDragLeave: (e) => {
+				this.onDragLeave(e);
+				mouseInside = false;
+			},
+			onDrop: (e) => {
+				this.onDrop(e);
+				mouseInside = false;
+			},
+		}));
+
+		this.overlay = document.createElement('div');
+		this.overlay.classList.add('chat-dnd-overlay');
+		this.contianer.appendChild(this.overlay);
+
+		this.updateStyles();
+	}
+
+	private onDragEnter(e: DragEvent): void {
+		const estimatedDropType = this.guessDropType(e);
+		if (estimatedDropType !== undefined) {
+			e.stopPropagation();
+			e.preventDefault();
+		}
+		this.updateDropFeedback(e, estimatedDropType);
+	}
+
+	private onDragLeave(e: DragEvent): void {
+		this.updateDropFeedback(e, undefined);
+	}
+
+	private onDrop(e: DragEvent): void {
+		this.updateDropFeedback(e, undefined);
+
+		const contexts = this.getAttachContext(e);
+		if (contexts.length === 0) {
+			return;
+		}
+
+		e.stopPropagation();
+		e.preventDefault();
+
+		// Make sure to attach only new contexts
+		const currentContextIds = new Set(Array.from(this.inputPart.attachedContext).map(context => context.id));
+		const filteredContext = [];
+		for (const context of contexts) {
+			if (!currentContextIds.has(context.id)) {
+				currentContextIds.add(context.id);
+				filteredContext.push(context);
+			}
+		}
+
+		this.inputPart.attachContext(false, ...filteredContext);
+	}
+
+	private updateDropFeedback(e: DragEvent, dropType: ChatDragAndDropType | undefined): void {
+		const showOverlay = dropType !== undefined;
+		if (e.dataTransfer) {
+			e.dataTransfer.dropEffect = showOverlay ? 'copy' : 'none';
+		}
+
+		this.setOverlay(dropType);
+	}
+
+	private isImageDnd(e: DragEvent): boolean {
+		// Image detection should not have false positives, only false negatives are allowed
+		if (containsDragType(e, 'image')) {
+			return true;
+		}
+
+		if (containsDragType(e, DataTransfers.FILES)) {
+			const files = e.dataTransfer?.files;
+			if (files && files.length > 0) {
+				const file = files[0];
+				return file.type.startsWith('image/');
+			}
+
+			const items = e.dataTransfer?.items;
+			if (items && items.length > 0) {
+				const item = items[0];
+				return item.type.startsWith('image/');
+			}
+		}
+
+		return false;
+	}
+
+	private guessDropType(e: DragEvent): ChatDragAndDropType | undefined {
+		// This is an esstimation based on the datatransfer types/items
+		if (this.isImageDnd(e)) {
+			const imageDndSupported = this.configurationService.getValue<boolean>('chat.experimental.imageAttachments');
+			return imageDndSupported ? ChatDragAndDropType.IMAGE : undefined;
+		} else if (containsDragType(e, DataTransfers.FILES, DataTransfers.INTERNAL_URI_LIST)) {
+			return ChatDragAndDropType.FILE;
+		}
+
+		return undefined;
+	}
+
+	private isDragEventSupported(e: DragEvent): boolean {
+		// if guessed drop type is undefined, it means the drop is not supported
+		const dropType = this.guessDropType(e);
+		return dropType !== undefined;
+	}
+
+	private getDropTypeName(type: ChatDragAndDropType): string {
+		switch (type) {
+			case ChatDragAndDropType.FILE: return localize('file', 'File');
+			case ChatDragAndDropType.IMAGE: return localize('image', 'Image');
+		}
+	}
+
+	private getAttachContext(e: DragEvent): IChatRequestVariableEntry[] {
+		if (!this.isDragEventSupported(e)) {
+			return [];
+		}
+
+		const data = extractEditorsDropData(e);
+		return coalesce(data.map(editorInput => {
+			return this.resolveAttachContext(editorInput);
+		}));
+	}
+
+	private resolveAttachContext(editorInput: IDraggedResourceEditorInput): IChatRequestVariableEntry | undefined {
+		// Image
+		const imageContext = getImageAttachContext(editorInput);
+		if (imageContext) {
+			const isImageDndSupported = this.configurationService.getValue<boolean>('chat.experimental.imageAttachments');
+			return isImageDndSupported ? imageContext : undefined;
+		}
+
+		// File
+		return getEditorAttachContext(editorInput);
+	}
+
+	private setOverlay(type: ChatDragAndDropType | undefined): void {
+		// Remove any previous overlay text
+		this.overlayText?.remove();
+		this.overlayText = undefined;
+
+		if (type !== undefined) {
+			// Render the overlay text
+			const typeName = this.getDropTypeName(type);
+
+			const iconAndtextElements = renderLabelWithIcons(`$(${Codicon.attach.id}) ${localize('attach as context', 'Attach {0} as Context', typeName)}`);
+			const htmlElements = iconAndtextElements.map(element => {
+				if (typeof element === 'string') {
+					return $('span.overlay-text', undefined, element);
+				}
+				return element;
+			});
+
+			this.overlayText = $('span.attach-context-overlay-text', undefined, ...htmlElements);
+			this.overlayText.style.backgroundColor = this.overlayTextBackground;
+			this.overlay.appendChild(this.overlayText);
+		}
+
+		this.overlay.classList.toggle('visible', type !== undefined);
+	}
+
+	override updateStyles(): void {
+		this.overlay.style.backgroundColor = this.getColor(this.styles.overlayBackground) || '';
+		this.overlay.style.color = this.getColor(this.styles.listForeground) || '';
+		this.overlayTextBackground = this.getColor(this.styles.listBackground) || '';
+	}
+}
+
+function getEditorAttachContext(editor: EditorInput | IDraggedResourceEditorInput): IChatRequestVariableEntry | undefined {
+	if (!editor.resource) {
+		return undefined;
+	}
+
+	return getFileAttachContext(editor.resource);
+}
+
+function getFileAttachContext(resource: URI): IChatRequestVariableEntry | undefined {
+	return {
+		value: resource,
+		id: resource.toString(),
+		name: basename(resource),
+		isFile: true,
+		isDynamic: true
+	};
+}
+
+function getImageAttachContext(editor: EditorInput | IDraggedResourceEditorInput): IChatRequestVariableEntry | undefined {
+	if (!editor.resource) {
+		return undefined;
+	}
+
+	if (/\.(png|jpg|jpeg|bmp|gif|tiff)$/i.test(editor.resource.path)) {
+		const fileName = basename(editor.resource);
+		return {
+			id: editor.resource.toString(),
+			name: fileName,
+			fullName: editor.resource.path,
+			value: editor.resource,
+			icon: Codicon.fileMedia,
+			isDynamic: true,
+			isImage: true,
+			isFile: false
+		};
+	}
+
+	return undefined;
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditingService.ts b/src/vs/workbench/contrib/chat/browser/chatEditingService.ts
new file mode 100644
index 00000000000..2588d2de3bf
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatEditingService.ts
@@ -0,0 +1,849 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Sequencer } from '../../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { BugIndicatingError } from '../../../../base/common/errors.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable, DisposableStore, IDisposable, IReference, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { derived, IObservable, ITransaction, observableValue, ValueWithChangeEventFromObservable } from '../../../../base/common/observable.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IBulkEditService } from '../../../../editor/browser/services/bulkEditService.js';
+import { TextEdit } from '../../../../editor/common/languages.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { createTextBufferFactoryFromSnapshot } from '../../../../editor/common/model/textModel.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { IResolvedTextEditorModel, ITextModelContentProvider, ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { EditorActivation } from '../../../../platform/editor/common/editor.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { bindContextKey } from '../../../../platform/observable/common/platformObservableUtils.js';
+import { IProgressService, ProgressLocation } from '../../../../platform/progress/common/progress.js';
+import { DiffEditorInput } from '../../../common/editor/diffEditorInput.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { IEditorGroup, IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { MultiDiffEditor } from '../../multiDiffEditor/browser/multiDiffEditor.js';
+import { MultiDiffEditorInput } from '../../multiDiffEditor/browser/multiDiffEditorInput.js';
+import { IMultiDiffSourceResolver, IMultiDiffSourceResolverService, IResolvedMultiDiffSource, MultiDiffEditorItem } from '../../multiDiffEditor/browser/multiDiffSourceResolverService.js';
+import { ICodeMapperResponse, ICodeMapperService } from '../common/chatCodeMapperService.js';
+import { ChatEditingSessionState, IChatEditingService, IChatEditingSession, IChatEditingSessionStream, IModifiedFileEntry, ModifiedFileEntryState } from '../common/chatEditingService.js';
+import { IChatResponseModel } from '../common/chatModel.js';
+import { IChatService } from '../common/chatService.js';
+import { IChatWidgetService } from './chat.js';
+
+const decidedChatEditingResourceContextKey = new RawContextKey<string[]>('decidedChatEditingResource', []);
+const chatEditingResourceContextKey = new RawContextKey<string | undefined>('chatEditingResource', undefined);
+const inChatEditingSessionContextKey = new RawContextKey<boolean | undefined>('inChatEditingSession', undefined);
+
+export class ChatEditingService extends Disposable implements IChatEditingService {
+
+	_serviceBrand: undefined;
+
+	private readonly _currentSessionObs = observableValue<ChatEditingSession | null>(this, null);
+	private readonly _currentSessionDisposeListener = this._register(new MutableDisposable());
+
+	get currentEditingSession(): IChatEditingSession | null {
+		return this._currentSessionObs.get();
+	}
+
+	private readonly _onDidCreateEditingSession = new Emitter<IChatEditingSession>();
+	get onDidCreateEditingSession() {
+		return this._onDidCreateEditingSession.event;
+	}
+
+	constructor(
+		@IEditorGroupsService private readonly _editorGroupsService: IEditorGroupsService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IMultiDiffSourceResolverService multiDiffSourceResolverService: IMultiDiffSourceResolverService,
+		@ITextModelService textModelService: ITextModelService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IChatService private readonly _chatService: IChatService,
+		@IProgressService private readonly _progressService: IProgressService,
+		@ICodeMapperService private readonly _codeMapperService: ICodeMapperService,
+	) {
+		super();
+		this._register(multiDiffSourceResolverService.registerResolver(_instantiationService.createInstance(ChatEditingMultiDiffSourceResolver, this._currentSessionObs)));
+		textModelService.registerTextModelContentProvider(ChatEditingTextModelContentProvider.scheme, _instantiationService.createInstance(ChatEditingTextModelContentProvider, this._currentSessionObs));
+		this._register(bindContextKey(decidedChatEditingResourceContextKey, contextKeyService, (reader) => {
+			const currentSession = this._currentSessionObs.read(reader);
+			if (!currentSession) {
+				return;
+			}
+			const entries = currentSession.entries.read(reader);
+			const decidedEntries = entries.filter(entry => entry.state.read(reader) !== ModifiedFileEntryState.Undecided);
+			return decidedEntries.map(entry => entry.entryId);
+		}));
+		this._register(this._chatService.onDidDisposeSession((e) => {
+			if (e.reason === 'cleared' && this._currentSessionObs.get()?.chatSessionId === e.sessionId) {
+				void this._currentSessionObs.get()?.stop();
+			}
+		}));
+	}
+
+	async addFileToWorkingSet(resource: URI): Promise<void> {
+		const session = this._currentSessionObs.get();
+		if (session) {
+			session.addFileToWorkingSet(resource);
+		}
+	}
+
+	override dispose(): void {
+		this._currentSessionObs.get()?.dispose();
+		super.dispose();
+	}
+
+	async startOrContinueEditingSession(chatSessionId: string, options?: { silent: boolean }): Promise<IChatEditingSession> {
+		const session = this._currentSessionObs.get();
+		if (session) {
+			if (session.chatSessionId !== chatSessionId) {
+				throw new BugIndicatingError('Cannot start new session while another session is active');
+			}
+		}
+		return this._createEditingSession(chatSessionId, options);
+	}
+
+	private async _createEditingSession(chatSessionId: string, options?: { silent: boolean }): Promise<IChatEditingSession> {
+		if (this._currentSessionObs.get()) {
+			throw new BugIndicatingError('Cannot have more than one active editing session');
+		}
+
+		// listen for completed responses, run the code mapper and apply the edits to this edit session
+		this._register(this.installAutoApplyObserver(chatSessionId));
+
+		const input = MultiDiffEditorInput.fromResourceMultiDiffEditorInput({
+			multiDiffSource: ChatEditingMultiDiffSourceResolver.getMultiDiffSourceUri(),
+			label: localize('multiDiffEditorInput.name', "Suggested Edits")
+		}, this._instantiationService);
+
+		const editorPane = options?.silent ? undefined : await this._editorGroupsService.activeGroup.openEditor(input, { pinned: true, activation: EditorActivation.ACTIVATE }) as MultiDiffEditor | undefined;
+
+		const session = this._instantiationService.createInstance(ChatEditingSession, chatSessionId, editorPane);
+		this._currentSessionDisposeListener.value = session.onDidDispose(() => {
+			this._currentSessionDisposeListener.clear();
+			this._currentSessionObs.set(null, undefined);
+		});
+
+		this._currentSessionObs.set(session, undefined);
+		this._onDidCreateEditingSession.fire(session);
+		return session;
+	}
+
+	public triggerEditComputation(responseModel: IChatResponseModel): Promise<void> {
+		return this._continueEditingSession(async (builder, token) => {
+			const codeMapperResponse: ICodeMapperResponse = {
+				textEdit: (resource, edits) => builder.textEdits(resource, edits),
+			};
+			await this._codeMapperService.mapCodeFromResponse(responseModel, codeMapperResponse, token);
+		}, { silent: true });
+	}
+
+	private installAutoApplyObserver(sessionId: string): IDisposable {
+
+		const chatModel = this._chatService.getSession(sessionId);
+		if (!chatModel) {
+			throw new Error(`Edit session was created for a non-existing chat session: ${sessionId}`);
+		}
+
+		const observerDisposables = new DisposableStore();
+
+		const onResponseComplete = (responseModel: IChatResponseModel) => {
+			if (responseModel.result?.metadata?.autoApplyEdits) {
+				this.triggerEditComputation(responseModel);
+			}
+		};
+
+		observerDisposables.add(chatModel.onDidChange(e => {
+			if (e.kind === 'addRequest') {
+				const responseModel = e.request.response;
+				if (responseModel) {
+					if (responseModel.isComplete) {
+						onResponseComplete(responseModel);
+					} else {
+						const disposable = responseModel.onDidChange(() => {
+							if (responseModel.isComplete) {
+								onResponseComplete(responseModel);
+								disposable.dispose();
+							} else if (responseModel.isCanceled || responseModel.isStale) {
+								disposable.dispose();
+							}
+						});
+					}
+				}
+			}
+		}));
+		observerDisposables.add(chatModel.onDidDispose(() => observerDisposables.dispose()));
+		return observerDisposables;
+	}
+
+	private async _continueEditingSession(builder: (stream: IChatEditingSessionStream, token: CancellationToken) => Promise<void>, options?: { silent?: boolean }): Promise<void> {
+		const session = this._currentSessionObs.get();
+		if (!session) {
+			throw new BugIndicatingError('Cannot continue missing session');
+		}
+
+		if (session.state.get() === ChatEditingSessionState.StreamingEdits) {
+			throw new BugIndicatingError('Cannot continue session that is still streaming');
+		}
+
+		let editorPane: MultiDiffEditor | undefined;
+		if (!options?.silent && session.isVisible) {
+			const groupedEditors = this._findGroupedEditors();
+			if (groupedEditors.length !== 1) {
+				throw new Error(`Unexpected number of editors: ${groupedEditors.length}`);
+			}
+			const [group, editor] = groupedEditors[0];
+
+			editorPane = await group.openEditor(editor, { pinned: true, activation: EditorActivation.ACTIVATE }) as MultiDiffEditor | undefined;
+		}
+
+		const stream: IChatEditingSessionStream = {
+			textEdits: (resource: URI, textEdits: TextEdit[]) => {
+				session.acceptTextEdits(resource, textEdits);
+			}
+		};
+		session.acceptStreamingEditsStart();
+		const cancellationTokenSource = new CancellationTokenSource();
+		try {
+			if (editorPane) {
+				await editorPane?.showWhile(builder(stream, cancellationTokenSource.token));
+			} else {
+				await this._progressService.withProgress({
+					location: ProgressLocation.Window,
+					title: localize2('chatEditing.startingSession', 'Generating edits...').value,
+				}, async () => {
+					await builder(stream, cancellationTokenSource.token);
+				},
+					() => cancellationTokenSource.cancel()
+				);
+			}
+		} finally {
+			cancellationTokenSource.dispose();
+			session.resolve();
+		}
+	}
+
+	private _findGroupedEditors() {
+		const editors: [IEditorGroup, EditorInput][] = [];
+		for (const group of this._editorGroupsService.groups) {
+			for (const editor of group.editors) {
+				if (editor.resource?.scheme === ChatEditingMultiDiffSourceResolver.scheme) {
+					editors.push([group, editor]);
+				}
+			}
+		}
+		return editors;
+	}
+}
+
+class ChatEditingMultiDiffSourceResolver implements IMultiDiffSourceResolver {
+	public static readonly scheme = 'chat-editing-multi-diff-source';
+
+	public static getMultiDiffSourceUri(): URI {
+		return URI.from({
+			scheme: ChatEditingMultiDiffSourceResolver.scheme,
+			path: '',
+		});
+	}
+
+	constructor(
+		private readonly _currentSession: IObservable<ChatEditingSession | null>,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+	) { }
+
+	canHandleUri(uri: URI): boolean {
+		return uri.scheme === ChatEditingMultiDiffSourceResolver.scheme;
+	}
+
+	async resolveDiffSource(uri: URI): Promise<IResolvedMultiDiffSource> {
+		return this._instantiationService.createInstance(ChatEditingMultiDiffSource, this._currentSession);
+	}
+}
+
+class ChatEditingMultiDiffSource implements IResolvedMultiDiffSource {
+	private readonly _resources = derived<readonly MultiDiffEditorItem[]>(this, (reader) => {
+		const currentSession = this._currentSession.read(reader);
+		if (!currentSession) {
+			return [];
+		}
+		const entries = currentSession.entries.read(reader);
+		return entries.map((entry) => {
+			return new MultiDiffEditorItem(
+				entry.originalURI,
+				entry.modifiedURI,
+				undefined,
+				{
+					[chatEditingResourceContextKey.key]: entry.entryId,
+					// [inChatEditingSessionContextKey.key]: true
+				},
+			);
+		});
+	});
+	readonly resources = new ValueWithChangeEventFromObservable(this._resources);
+
+	readonly contextKeys = {
+		[inChatEditingSessionContextKey.key]: true
+	};
+
+	constructor(
+		private readonly _currentSession: IObservable<ChatEditingSession | null>
+	) { }
+}
+
+registerAction2(class OpenFileAction extends Action2 {
+	constructor() {
+		super({
+			id: 'chatEditing.openFile',
+			title: localize2('open.file', 'Open File'),
+			icon: Codicon.goToFile,
+			menu: [{
+				id: MenuId.ChatEditingSessionWidgetToolbar,
+				order: 0,
+				group: 'navigation'
+			}],
+		});
+	}
+
+	async run(accessor: ServicesAccessor, ...args: any[]): Promise<void> {
+		const chatEditingService = accessor.get(IChatEditingService);
+		const editorService = accessor.get(IEditorService);
+		const currentEditingSession = chatEditingService.currentEditingSession;
+		if (!currentEditingSession) {
+			return;
+		}
+
+		const chatWidget = accessor.get(IChatWidgetService).lastFocusedWidget;
+		const uris: URI[] = [];
+		if (URI.isUri(args[0])) {
+			uris.push(args[0]);
+		} else if (chatWidget) {
+			uris.push(...chatWidget.input.selectedElements);
+		}
+		if (!uris.length) {
+			return;
+		}
+
+		await Promise.all(uris.map((uri) => editorService.openEditor({ resource: uri, options: { pinned: true, activation: EditorActivation.ACTIVATE } })));
+	}
+});
+
+registerAction2(class AcceptAction extends Action2 {
+	constructor() {
+		super({
+			id: 'chatEditing.acceptFile',
+			title: localize2('accept.file', 'Accept'),
+			icon: Codicon.check,
+			menu: [{
+				when: ContextKeyExpr.and(ContextKeyExpr.equals('resourceScheme', ChatEditingMultiDiffSourceResolver.scheme), ContextKeyExpr.notIn(chatEditingResourceContextKey.key, decidedChatEditingResourceContextKey.key)),
+				id: MenuId.MultiDiffEditorFileToolbar,
+				order: 0,
+				group: 'navigation',
+			}, {
+				id: MenuId.ChatEditingSessionWidgetToolbar,
+				order: 2,
+				group: 'navigation'
+			}],
+		});
+	}
+
+	async run(accessor: ServicesAccessor, ...args: any[]): Promise<void> {
+		const chatEditingService = accessor.get(IChatEditingService);
+		const currentEditingSession = chatEditingService.currentEditingSession;
+		if (!currentEditingSession) {
+			return;
+		}
+
+		const chatWidget = accessor.get(IChatWidgetService).lastFocusedWidget;
+		const uris: URI[] = [];
+		if (URI.isUri(args[0])) {
+			uris.push(args[0]);
+		} else if (chatWidget) {
+			uris.push(...chatWidget.input.selectedElements);
+		}
+		if (!uris.length) {
+			return;
+		}
+
+		await currentEditingSession.accept(...uris);
+	}
+});
+
+registerAction2(class DiscardAction extends Action2 {
+	constructor() {
+		super({
+			id: 'chatEditing.discardFile',
+			title: localize2('discard.file', 'Discard'),
+			icon: Codicon.discard,
+			menu: [{
+				when: ContextKeyExpr.and(ContextKeyExpr.equals('resourceScheme', ChatEditingMultiDiffSourceResolver.scheme), ContextKeyExpr.notIn(chatEditingResourceContextKey.key, decidedChatEditingResourceContextKey.key)),
+				id: MenuId.MultiDiffEditorFileToolbar,
+				order: 0,
+				group: 'navigation',
+			}, {
+				id: MenuId.ChatEditingSessionWidgetToolbar,
+				order: 1,
+				group: 'navigation'
+			}],
+		});
+	}
+
+	async run(accessor: ServicesAccessor, ...args: any[]): Promise<void> {
+		const chatEditingService = accessor.get(IChatEditingService);
+		const currentEditingSession = chatEditingService.currentEditingSession;
+		if (!currentEditingSession) {
+			return;
+		}
+
+		const chatWidget = accessor.get(IChatWidgetService).lastFocusedWidget;
+		const uris: URI[] = [];
+		if (URI.isUri(args[0])) {
+			uris.push(args[0]);
+		} else if (chatWidget) {
+			uris.push(...chatWidget.input.selectedElements);
+		}
+		if (!uris.length) {
+			return;
+		}
+
+		await currentEditingSession.reject(...uris);
+	}
+});
+
+export class ChatEditingAcceptAllAction extends Action2 {
+	static readonly ID = 'chatEditing.acceptAllFiles';
+	static readonly LABEL = localize('accept.allFiles', 'Accept All');
+
+	constructor() {
+		super({
+			id: ChatEditingAcceptAllAction.ID,
+			title: ChatEditingAcceptAllAction.LABEL,
+			// icon: Codicon.goToFile,
+			menu: {
+				when: ContextKeyExpr.equals('resourceScheme', ChatEditingMultiDiffSourceResolver.scheme),
+				id: MenuId.EditorTitle,
+				order: 0,
+				group: 'navigation',
+			},
+		});
+	}
+
+	async run(accessor: ServicesAccessor, ...args: any[]): Promise<void> {
+		const chatEditingService = accessor.get(IChatEditingService);
+		const currentEditingSession = chatEditingService.currentEditingSession;
+		if (!currentEditingSession) {
+			return;
+		}
+		await currentEditingSession.accept();
+	}
+}
+registerAction2(ChatEditingAcceptAllAction);
+
+export class ChatEditingDiscardAllAction extends Action2 {
+	static readonly ID = 'chatEditing.discardAllFiles';
+	static readonly LABEL = localize('discard.allFiles', 'Discard All');
+
+	constructor() {
+		super({
+			id: ChatEditingDiscardAllAction.ID,
+			title: ChatEditingDiscardAllAction.LABEL,
+			// icon: Codicon.goToFile,
+			menu: {
+				when: ContextKeyExpr.equals('resourceScheme', ChatEditingMultiDiffSourceResolver.scheme),
+				id: MenuId.EditorTitle,
+				order: 0,
+				group: 'navigation',
+			},
+		});
+	}
+
+	async run(accessor: ServicesAccessor, ...args: any[]): Promise<void> {
+		const chatEditingService = accessor.get(IChatEditingService);
+		const currentEditingSession = chatEditingService.currentEditingSession;
+		if (!currentEditingSession) {
+			return;
+		}
+		await currentEditingSession.reject();
+	}
+}
+registerAction2(ChatEditingDiscardAllAction);
+
+export class ChatEditingShowChangesAction extends Action2 {
+	static readonly ID = 'chatEditing.openDiffs';
+	static readonly LABEL = localize('chatEditing.openDiffs', 'Open Diffs');
+
+	constructor() {
+		super({
+			id: ChatEditingShowChangesAction.ID,
+			title: ChatEditingShowChangesAction.LABEL,
+			f1: false
+		});
+	}
+
+	async run(accessor: ServicesAccessor, ...args: any[]): Promise<void> {
+		const chatEditingService = accessor.get(IChatEditingService);
+		const currentEditingSession = chatEditingService.currentEditingSession;
+		if (!currentEditingSession) {
+			return;
+		}
+		await currentEditingSession.show();
+	}
+}
+registerAction2(ChatEditingShowChangesAction);
+
+type ChatEditingTextModelContentQueryData = { kind: 'empty' } | { kind: 'doc'; documentId: string };
+
+class ChatEditingTextModelContentProvider implements ITextModelContentProvider {
+	public static readonly scheme = 'chat-editing-text-model';
+
+	public static getEmptyFileURI(): URI {
+		return URI.from({
+			scheme: ChatEditingTextModelContentProvider.scheme,
+			query: JSON.stringify({ kind: 'empty' }),
+		});
+	}
+
+	public static getFileURI(documentId: string, path: string): URI {
+		return URI.from({
+			scheme: ChatEditingTextModelContentProvider.scheme,
+			path,
+			query: JSON.stringify({ kind: 'doc', documentId }),
+		});
+	}
+
+	constructor(
+		private readonly _currentSessionObs: IObservable<ChatEditingSession | null>,
+		@IModelService private readonly _modelService: IModelService,
+	) { }
+
+	async provideTextContent(resource: URI): Promise<ITextModel | null> {
+		const existing = this._modelService.getModel(resource);
+		if (existing && !existing.isDisposed()) {
+			return existing;
+		}
+
+		const data: ChatEditingTextModelContentQueryData = JSON.parse(resource.query);
+		if (data.kind === 'empty') {
+			return this._modelService.createModel('', null, resource, false);
+		}
+
+		const session = this._currentSessionObs.get();
+		if (!session) {
+			return null;
+		}
+
+		return session.getVirtualModel(data.documentId);
+	}
+}
+
+class ChatEditingSession extends Disposable implements IChatEditingSession {
+	private readonly _state = observableValue<ChatEditingSessionState>(this, ChatEditingSessionState.Initial);
+	private readonly _entriesObs = observableValue<readonly ModifiedFileEntry[]>(this, []);
+	public get entries(): IObservable<readonly ModifiedFileEntry[]> {
+		this._assertNotDisposed();
+		return this._entriesObs;
+	}
+	private readonly _sequencer = new Sequencer();
+
+	private _entries: ModifiedFileEntry[] = [];
+
+	private _workingSetObs = observableValue<readonly URI[]>(this, []);
+	private _workingSet: URI[] = [];
+	get workingSet() {
+		this._assertNotDisposed();
+		return this._workingSetObs;
+	}
+
+	get state(): IObservable<ChatEditingSessionState> {
+		this._assertNotDisposed();
+		return this._state;
+	}
+
+	private readonly _onDidChange = new Emitter<void>();
+	get onDidChange() {
+		this._assertNotDisposed();
+		return this._onDidChange.event;
+	}
+
+	private readonly _onDidDispose = new Emitter<void>();
+	get onDidDispose() {
+		this._assertNotDisposed();
+		return this._onDidDispose.event;
+	}
+
+	get isVisible(): boolean {
+		this._assertNotDisposed();
+		return Boolean(this.editorPane && this.editorPane.isVisible());
+	}
+
+	constructor(
+		public readonly chatSessionId: string,
+		private editorPane: MultiDiffEditor | undefined,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@ITextModelService private readonly _textModelService: ITextModelService,
+		@IBulkEditService public readonly _bulkEditService: IBulkEditService,
+		@IEditorGroupsService private readonly _editorGroupsService: IEditorGroupsService,
+		@IEditorService private readonly editorService: IEditorService,
+	) {
+		super();
+	}
+
+	private _assertNotDisposed(): void {
+		if (this._state.get() === ChatEditingSessionState.Disposed) {
+			throw new BugIndicatingError(`Cannot access a disposed editing session`);
+		}
+	}
+
+	async accept(...uris: URI[]): Promise<void> {
+		this._assertNotDisposed();
+
+		if (uris.length === 0) {
+			await Promise.all(this._entries.map(entry => entry.accept(undefined)));
+		}
+
+		for (const uri of uris) {
+			const entry = this._entries.find(e => e.modifiedURI.toString() === uri.toString());
+			if (entry) {
+				await entry.accept(undefined);
+			}
+		}
+
+		this._onDidChange.fire();
+	}
+
+	async reject(...uris: URI[]): Promise<void> {
+		this._assertNotDisposed();
+
+		if (uris.length === 0) {
+			await Promise.all(this._entries.map(entry => entry.reject(undefined)));
+		}
+
+		for (const uri of uris) {
+			const entry = this._entries.find(e => e.modifiedURI.toString() === uri.toString());
+			if (entry) {
+				await entry.reject(undefined);
+			}
+		}
+
+		this._onDidChange.fire();
+	}
+
+	async show(): Promise<void> {
+		this._assertNotDisposed();
+
+		if (this.editorPane?.isVisible()) {
+			return;
+		} else if (this.editorPane?.input) {
+			await this._editorGroupsService.activeGroup.openEditor(this.editorPane.input, { pinned: true, activation: EditorActivation.ACTIVATE });
+			return;
+		}
+
+		const input = MultiDiffEditorInput.fromResourceMultiDiffEditorInput({
+			multiDiffSource: ChatEditingMultiDiffSourceResolver.getMultiDiffSourceUri(),
+			label: localize('multiDiffEditorInput.name', "Suggested Edits")
+		}, this._instantiationService);
+
+		const editorPane = await this._editorGroupsService.activeGroup.openEditor(input, { pinned: true, activation: EditorActivation.ACTIVATE }) as MultiDiffEditor | undefined;
+		this.editorPane = editorPane;
+	}
+
+	async stop(): Promise<void> {
+		this._assertNotDisposed();
+
+		// Close out all open files
+		await Promise.allSettled(this._editorGroupsService.groups.map(async (g) => {
+			return Promise.allSettled(g.editors.map(async (e) => {
+				if (e instanceof MultiDiffEditorInput || e instanceof DiffEditorInput && (e.original.resource?.scheme === ModifiedFileEntry.scheme || e.original.resource?.scheme === ChatEditingTextModelContentProvider.scheme)) {
+					await g.closeEditor(e);
+				}
+			}));
+		}));
+
+		if (this._state.get() !== ChatEditingSessionState.Disposed) {
+			// session got disposed while we were closing editors
+			this.dispose();
+		}
+
+	}
+
+	override dispose() {
+		this._assertNotDisposed();
+
+		super.dispose();
+		this._state.set(ChatEditingSessionState.Disposed, undefined);
+		this._onDidDispose.fire();
+	}
+
+	getVirtualModel(documentId: string): ITextModel | null {
+		this._assertNotDisposed();
+
+		const entry = this._entries.find(e => e.entryId === documentId);
+		return entry?.docSnapshot ?? null;
+	}
+
+	acceptStreamingEditsStart(): void {
+		if (this._state.get() === ChatEditingSessionState.Disposed) {
+			// we don't throw in this case because there could be a builder still connected to a disposed session
+			return;
+		}
+
+		// ensure that the edits are processed sequentially
+		this._sequencer.queue(() => this._acceptStreamingEditsStart());
+	}
+
+	acceptTextEdits(resource: URI, textEdits: TextEdit[]): void {
+		if (this._state.get() === ChatEditingSessionState.Disposed) {
+			// we don't throw in this case because there could be a builder still connected to a disposed session
+			return;
+		}
+
+		// ensure that the edits are processed sequentially
+		this._sequencer.queue(() => this._acceptTextEdits(resource, textEdits));
+	}
+
+	resolve(): void {
+		if (this._state.get() === ChatEditingSessionState.Disposed) {
+			// we don't throw in this case because there could be a builder still connected to a disposed session
+			return;
+		}
+
+		// ensure that the edits are processed sequentially
+		this._sequencer.queue(() => this._resolve());
+	}
+
+	addFileToWorkingSet(resource: URI) {
+		this._workingSet = [...this._workingSet, resource];
+		this._workingSetObs.set(this._workingSet, undefined);
+		this._onDidChange.fire();
+	}
+
+	private async _acceptStreamingEditsStart(): Promise<void> {
+		this._state.set(ChatEditingSessionState.StreamingEdits, undefined);
+		this._onDidChange.fire();
+	}
+
+	private async _acceptTextEdits(resource: URI, textEdits: TextEdit[]): Promise<void> {
+		const entry = await this._getOrCreateModifiedFileEntry(resource);
+		entry.applyEdits(textEdits);
+		await this.editorService.openEditor({ original: { resource: entry.originalURI }, modified: { resource: entry.modifiedURI }, options: { inactive: true } });
+	}
+
+	private async _resolve(): Promise<void> {
+		this._state.set(ChatEditingSessionState.Idle, undefined);
+		this._onDidChange.fire();
+	}
+
+	private async _getOrCreateModifiedFileEntry(resource: URI): Promise<ModifiedFileEntry> {
+		const existingEntry = this._entries.find(e => e.resource.toString() === resource.toString());
+		if (existingEntry) {
+			return existingEntry;
+		}
+
+		const entry = await this._createModifiedFileEntry(resource);
+		this._register(entry);
+		this._entries = [...this._entries, entry];
+		this._entriesObs.set(this._entries, undefined);
+		this._onDidChange.fire();
+
+		return entry;
+	}
+
+	private async _createModifiedFileEntry(resource: URI, mustExist = false): Promise<ModifiedFileEntry> {
+		try {
+			const ref = await this._textModelService.createModelReference(resource);
+			return this._instantiationService.createInstance(ModifiedFileEntry, resource, ref, { collapse: (transaction: ITransaction | undefined) => this._collapse(resource, transaction) });
+		} catch (err) {
+			if (mustExist) {
+				throw err;
+			}
+			// this file does not exist yet, create it and try again
+			await this._bulkEditService.apply({ edits: [{ newResource: resource }] });
+			return this._createModifiedFileEntry(resource, true);
+		}
+	}
+
+	private _collapse(resource: URI, transaction: ITransaction | undefined) {
+		const multiDiffItem = this.editorPane?.findDocumentDiffItem(resource);
+		if (multiDiffItem) {
+			this.editorPane?.viewModel?.items.get().find((documentDiffItem) => String(documentDiffItem.originalUri) === String(multiDiffItem.originalUri) && String(documentDiffItem.modifiedUri) === String(multiDiffItem.modifiedUri))?.collapsed.set(true, transaction);
+		}
+	}
+}
+
+class ModifiedFileEntry extends Disposable implements IModifiedFileEntry {
+
+	public static readonly scheme = 'modified-file-entry';
+	static lastEntryId = 0;
+	public readonly entryId = `${ModifiedFileEntry.scheme}::${++ModifiedFileEntry.lastEntryId}`;
+
+	public readonly docSnapshot: ITextModel;
+	private readonly doc: ITextModel;
+
+	get originalURI(): URI {
+		return this.docSnapshot.uri;
+	}
+
+	get modifiedURI(): URI {
+		return this.doc.uri;
+	}
+
+	private readonly _stateObs = observableValue<ModifiedFileEntryState>(this, ModifiedFileEntryState.Undecided);
+	public get state(): IObservable<ModifiedFileEntryState> {
+		return this._stateObs;
+	}
+
+	constructor(
+		public readonly resource: URI,
+		resourceRef: IReference<IResolvedTextEditorModel>,
+		private readonly _multiDiffEntryDelegate: { collapse: (transaction: ITransaction | undefined) => void },
+		@IModelService modelService: IModelService,
+		@ILanguageService languageService: ILanguageService,
+		@IBulkEditService public readonly _bulkEditService: IBulkEditService,
+	) {
+		super();
+		this.doc = resourceRef.object.textEditorModel;
+		this.docSnapshot = this._register(
+			modelService.createModel(
+				createTextBufferFactoryFromSnapshot(this.doc.createSnapshot()),
+				languageService.createById(this.doc.getLanguageId()),
+				ChatEditingTextModelContentProvider.getFileURI(this.entryId, resource.path),
+				false
+			)
+		);
+		this._register(resourceRef);
+	}
+
+	applyEdits(textEdits: TextEdit[]): void {
+		this.doc.applyEdits(textEdits);
+		this._stateObs.set(ModifiedFileEntryState.Undecided, undefined);
+	}
+
+	async accept(transaction: ITransaction | undefined): Promise<void> {
+		if (this._stateObs.get() !== ModifiedFileEntryState.Undecided) {
+			// already accepted or rejected
+			return;
+		}
+		this.docSnapshot.setValue(this.doc.createSnapshot());
+		this._stateObs.set(ModifiedFileEntryState.Accepted, transaction);
+		await this.collapse(transaction);
+	}
+
+	async reject(transaction: ITransaction | undefined): Promise<void> {
+		if (this._stateObs.get() !== ModifiedFileEntryState.Undecided) {
+			// already accepted or rejected
+			return;
+		}
+		this.doc.setValue(this.docSnapshot.createSnapshot());
+		this._stateObs.set(ModifiedFileEntryState.Rejected, transaction);
+		await this.collapse(transaction);
+	}
+
+	async collapse(transaction: ITransaction | undefined): Promise<void> {
+		this._multiDiffEntryDelegate.collapse(transaction);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditor.ts b/src/vs/workbench/contrib/chat/browser/chatEditor.ts
index 1da5d57b810..5a107c88c92 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditor.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditor.ts
@@ -3,26 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IContextKeyService, IScopedContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IEditorOptions } from 'vs/platform/editor/common/editor';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { editorBackground, editorForeground, inputBackground } from 'vs/platform/theme/common/colorRegistry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
-import { IEditorOpenContext } from 'vs/workbench/common/editor';
-import { Memento } from 'vs/workbench/common/memento';
-import { ChatEditorInput } from 'vs/workbench/contrib/chat/browser/chatEditorInput';
-import { IChatViewState, ChatWidget } from 'vs/workbench/contrib/chat/browser/chatWidget';
-import { IChatModel, IExportableChatData, ISerializableChatData } from 'vs/workbench/contrib/chat/common/chatModel';
-import { clearChatEditor } from 'vs/workbench/contrib/chat/browser/actions/chatClear';
-import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { ChatAgentLocation } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { CHAT_PROVIDER_ID } from 'vs/workbench/contrib/chat/common/chatParticipantContribTypes';
+import * as dom from '../../../../base/browser/dom.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IContextKeyService, IScopedContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { editorBackground, editorForeground, inputBackground } from '../../../../platform/theme/common/colorRegistry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { EditorPane } from '../../../browser/parts/editor/editorPane.js';
+import { IEditorOpenContext } from '../../../common/editor.js';
+import { Memento } from '../../../common/memento.js';
+import { clearChatEditor } from './actions/chatClear.js';
+import { ChatEditorInput } from './chatEditorInput.js';
+import { ChatWidget, IChatViewState } from './chatWidget.js';
+import { ChatAgentLocation } from '../common/chatAgents.js';
+import { IChatModel, IExportableChatData, ISerializableChatData } from '../common/chatModel.js';
+import { CHAT_PROVIDER_ID } from '../common/chatParticipantContribTypes.js';
+import { IEditorGroup } from '../../../services/editor/common/editorGroupsService.js';
+import { EDITOR_DRAG_AND_DROP_BACKGROUND } from '../../../common/theme.js';
 
 export interface IChatEditorOptions extends IEditorOptions {
 	target?: { sessionId: string } | { data: IExportableChatData | ISerializableChatData };
@@ -50,23 +51,26 @@ export class ChatEditor extends EditorPane {
 		super(ChatEditorInput.EditorID, group, telemetryService, themeService, storageService);
 	}
 
-	public async clear() {
-		return this.instantiationService.invokeFunction(clearChatEditor);
+	private async clear() {
+		if (this.input) {
+			return this.instantiationService.invokeFunction(clearChatEditor, this.input as ChatEditorInput);
+		}
 	}
 
 	protected override createEditor(parent: HTMLElement): void {
 		this._scopedContextKeyService = this._register(this.contextKeyService.createScoped(parent));
-		const scopedInstantiationService = this.instantiationService.createChild(new ServiceCollection([IContextKeyService, this.scopedContextKeyService]));
+		const scopedInstantiationService = this._register(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, this.scopedContextKeyService])));
 
 		this.widget = this._register(
 			scopedInstantiationService.createInstance(
 				ChatWidget,
 				ChatAgentLocation.Panel,
-				{ resource: true },
+				undefined,
 				{ supportsFileReferences: true },
 				{
 					listForeground: editorForeground,
 					listBackground: editorBackground,
+					overlayBackground: EDITOR_DRAG_AND_DROP_BACKGROUND,
 					inputEditorBackground: inputBackground,
 					resultEditorBackground: editorBackground
 				}));
@@ -75,7 +79,7 @@ export class ChatEditor extends EditorPane {
 		this.widget.setVisible(true);
 	}
 
-	protected override  setEditorVisible(visible: boolean): void {
+	protected override setEditorVisible(visible: boolean): void {
 		super.setEditorVisible(visible);
 
 		this.widget?.setVisible(visible);
@@ -118,11 +122,18 @@ export class ChatEditor extends EditorPane {
 
 		if (this._memento && this._viewState) {
 			const widgetViewState = this.widget.getViewState();
+
+			// Need to set props individually on the memento
 			this._viewState.inputValue = widgetViewState.inputValue;
+			this._viewState.selectedLanguageModelId = widgetViewState.selectedLanguageModelId;
 			this._memento.saveMemento();
 		}
 	}
 
+	override getViewState(): object | undefined {
+		return { ...this._viewState };
+	}
+
 	override layout(dimension: dom.Dimension, position?: dom.IDomPosition | undefined): void {
 		if (this.widget) {
 			this.widget.layout(dimension.height, dimension.width);
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditorInput.ts b/src/vs/workbench/contrib/chat/browser/chatEditorInput.ts
index 626f7b59f88..5bac1b4a5a9 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditorInput.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditorInput.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Codicon } from 'vs/base/common/codicons';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { URI } from 'vs/base/common/uri';
-import * as nls from 'vs/nls';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { EditorInputCapabilities, IEditorSerializer, IUntypedEditorInput } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import type { IChatEditorOptions } from 'vs/workbench/contrib/chat/browser/chatEditor';
-import { ChatAgentLocation } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { IChatModel } from 'vs/workbench/contrib/chat/common/chatModel';
-import { IChatService } from 'vs/workbench/contrib/chat/common/chatService';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { URI } from '../../../../base/common/uri.js';
+import * as nls from '../../../../nls.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { EditorInputCapabilities, IEditorSerializer, IUntypedEditorInput } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import type { IChatEditorOptions } from './chatEditor.js';
+import { ChatAgentLocation } from '../common/chatAgents.js';
+import { IChatModel } from '../common/chatModel.js';
+import { IChatService } from '../common/chatService.js';
 
 const ChatEditorIcon = registerIcon('chat-editor-label-icon', Codicon.commentDiscussion, nls.localize('chatEditorLabelIcon', 'Icon of the chat editor label.'));
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatFollowups.ts b/src/vs/workbench/contrib/chat/browser/chatFollowups.ts
index 4f59229ff85..d600d02a790 100644
--- a/src/vs/workbench/contrib/chat/browser/chatFollowups.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatFollowups.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { Button, IButtonStyles } from 'vs/base/browser/ui/button/button';
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { localize } from 'vs/nls';
-import { ChatAgentLocation, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { chatAgentLeader, chatSubcommandLeader } from 'vs/workbench/contrib/chat/common/chatParserTypes';
-import { IChatFollowup } from 'vs/workbench/contrib/chat/common/chatService';
+import * as dom from '../../../../base/browser/dom.js';
+import { Button, IButtonStyles } from '../../../../base/browser/ui/button/button.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { localize } from '../../../../nls.js';
+import { ChatAgentLocation, IChatAgentService } from '../common/chatAgents.js';
+import { formatChatQuestion } from '../common/chatParserTypes.js';
+import { IChatFollowup } from '../common/chatService.js';
 
 const $ = dom.$;
 
@@ -36,18 +36,9 @@ export class ChatFollowups<T extends IChatFollowup> extends Disposable {
 			return;
 		}
 
-		let tooltipPrefix = '';
-		if ('agentId' in followup && followup.agentId && followup.agentId !== this.chatAgentService.getDefaultAgent(this.location)?.id) {
-			const agent = this.chatAgentService.getAgent(followup.agentId);
-			if (!agent) {
-				// Refers to agent that doesn't exist
-				return;
-			}
-
-			tooltipPrefix += `${chatAgentLeader}${agent.name} `;
-			if ('subCommand' in followup && followup.subCommand) {
-				tooltipPrefix += `${chatSubcommandLeader}${followup.subCommand} `;
-			}
+		const tooltipPrefix = formatChatQuestion(this.chatAgentService, this.location, '', followup.agentId, followup.subCommand);
+		if (tooltipPrefix === undefined) {
+			return;
 		}
 
 		const baseTitle = followup.kind === 'reply' ?
diff --git a/src/vs/workbench/contrib/chat/browser/chatGettingStarted.ts b/src/vs/workbench/contrib/chat/browser/chatGettingStarted.ts
new file mode 100644
index 00000000000..fcaff98fb55
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatGettingStarted.ts
@@ -0,0 +1,139 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IActivityService, NumberBadge } from '../../../services/activity/common/activity.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope, } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { applicationConfigurationNodeBase } from '../../../common/configuration.js';
+import { localize } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { CHAT_VIEW_ID } from './chat.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IExtensionManagementService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+
+const showChatGettingStartedConfigKey = 'workbench.panel.chat.view.experimental.showGettingStarted';
+
+export class ChatGettingStartedContribution extends Disposable implements IWorkbenchContribution {
+
+	static readonly ID = 'workbench.contrib.chatGettingStarted';
+	private readonly showChatGettingStartedDisposable = this._register(new MutableDisposable());
+	constructor(
+		@IContextKeyService private readonly contextService: IContextKeyService,
+		@IProductService private readonly productService: IProductService,
+		@IStorageService private readonly storageService: IStorageService,
+		@IActivityService private readonly activityService: IActivityService,
+		@IExtensionService private readonly extensionService: IExtensionService,
+		@ICommandService private readonly commandService: ICommandService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IExtensionManagementService private readonly extensionManagementService: IExtensionManagementService,
+	) {
+		super();
+
+		if (!this.productService.gitHubEntitlement) {
+			return;
+		}
+
+		if (this.storageService.get(showChatGettingStartedConfigKey, StorageScope.APPLICATION) !== undefined) {
+			return;
+		}
+
+		this.extensionManagementService.getInstalled().then(async exts => {
+			const installed = exts.find(value => ExtensionIdentifier.equals(value.identifier.id, this.productService.gitHubEntitlement!.extensionId));
+			if (!installed) {
+				this.registerListeners();
+				return;
+			}
+			this.storageService.store(showChatGettingStartedConfigKey, 'installed', StorageScope.APPLICATION, StorageTarget.MACHINE);
+		});
+	}
+
+	private registerListeners() {
+
+		this._register(this.extensionService.onDidChangeExtensions(async (result) => {
+
+			if (this.storageService.get(showChatGettingStartedConfigKey, StorageScope.APPLICATION) !== undefined) {
+				return;
+			}
+
+			for (const ext of result.added) {
+				if (ExtensionIdentifier.equals(this.productService.gitHubEntitlement!.extensionId, ext.identifier)) {
+					this.displayBadge();
+					return;
+				}
+			}
+		}));
+
+		this.extensionService.onDidChangeExtensionsStatus(async (event) => {
+
+			if (this.storageService.get(showChatGettingStartedConfigKey, StorageScope.APPLICATION) !== undefined) {
+				return;
+			}
+
+			for (const ext of event) {
+				if (ExtensionIdentifier.equals(this.productService.gitHubEntitlement!.extensionId, ext.value)) {
+					const extensionStatus = this.extensionService.getExtensionsStatus();
+					if (extensionStatus[ext.value].activationTimes) {
+						this.displayChatPanel();
+						return;
+					}
+				}
+			}
+		});
+
+		this._register(this.contextService.onDidChangeContext(event => {
+			if (this.storageService.get(showChatGettingStartedConfigKey, StorageScope.APPLICATION) === undefined) {
+				return;
+			}
+			if (event.affectsSome(new Set([`view.${CHAT_VIEW_ID}.visible`]))) {
+				if (this.contextService.contextMatchesRules(ContextKeyExpr.deserialize(`${CHAT_VIEW_ID}.visible`))) {
+					this.showChatGettingStartedDisposable.clear();
+				}
+			}
+		}));
+	}
+
+	private async displayBadge() {
+		const showGettingStartedExp = this.configurationService.inspect<string>(showChatGettingStartedConfigKey).value ?? '';
+		if (!showGettingStartedExp || showGettingStartedExp !== 'showBadge') {
+			return;
+		}
+
+		const badge = new NumberBadge(1, () => localize('chat.openPanel', 'Open Chat Panel'));
+		this.showChatGettingStartedDisposable.value = this.activityService.showViewActivity(CHAT_VIEW_ID, { badge });
+		this.storageService.store(showChatGettingStartedConfigKey, showGettingStartedExp, StorageScope.APPLICATION, StorageTarget.MACHINE);
+	}
+
+	private async displayChatPanel() {
+		const showGettingStartedExp = this.configurationService.inspect<string>(showChatGettingStartedConfigKey).value ?? '';
+		if (!showGettingStartedExp || showGettingStartedExp !== 'showChatPanel') {
+			return;
+		}
+
+		this.commandService.executeCommand(`${CHAT_VIEW_ID}.focus`);
+		this.storageService.store(showChatGettingStartedConfigKey, showGettingStartedExp, StorageScope.APPLICATION, StorageTarget.MACHINE);
+	}
+}
+
+const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
+configurationRegistry.registerConfiguration({
+	...applicationConfigurationNodeBase,
+	properties: {
+		'workbench.panel.chat.view.experimental.showGettingStarted': {
+			scope: ConfigurationScope.MACHINE,
+			type: 'string',
+			default: '',
+			tags: ['experimental'],
+			description: localize('workbench.panel.chat.view.showGettingStarted', "When enabled, shows a getting started experiments in the chat panel.")
+		}
+	}
+});
+
diff --git a/src/vs/workbench/contrib/chat/browser/chatImagePaste.ts b/src/vs/workbench/contrib/chat/browser/chatImagePaste.ts
new file mode 100644
index 00000000000..057e9767e45
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatImagePaste.ts
@@ -0,0 +1,87 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { IChatRequestVariableEntry } from '../common/chatModel.js';
+import { ChatInputPart } from './chatInputPart.js';
+import { localize } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+
+export class ChatImageDropAndPaste extends Disposable {
+
+	constructor(
+		private readonly inputPart: ChatInputPart,
+		@IClipboardService private readonly clipboardService: IClipboardService,
+		@IConfigurationService private readonly configurationService: IConfigurationService
+	) {
+		super();
+		this._register(this.inputPart.inputEditor.onDidPaste((e) => {
+			if (this.configurationService.getValue<boolean>('chat.experimental.imageAttachments')) {
+				this._handlePaste();
+			}
+		}));
+	}
+
+	private async _handlePaste(): Promise<void> {
+		const currClipboard = await this.clipboardService.readImage();
+
+		if (!currClipboard || !isImage(currClipboard)) {
+			return;
+		}
+		const context = await getImageAttachContext(currClipboard);
+		if (!context) {
+			return;
+		}
+
+		const currentContextIds = new Set(Array.from(this.inputPart.attachedContext).map(context => context.id));
+		const filteredContext = [];
+
+		if (!currentContextIds.has(context.id)) {
+			currentContextIds.add(context.id);
+			filteredContext.push(context);
+		}
+
+		this.inputPart.attachContext(false, ...filteredContext);
+	}
+}
+
+async function getImageAttachContext(data: Uint8Array): Promise<IChatRequestVariableEntry> {
+	return {
+		value: data,
+		id: await imageToHash(data),
+		name: localize('pastedImage', 'Pasted Image'),
+		isImage: true,
+		icon: Codicon.fileMedia,
+		isDynamic: true,
+	};
+}
+
+export async function imageToHash(data: Uint8Array): Promise<string> {
+	const hashBuffer = await crypto.subtle.digest('SHA-256', data);
+	const hashArray = Array.from(new Uint8Array(hashBuffer));
+	return hashArray.map(b => b.toString(16).padStart(2, '0')).join('');
+}
+
+export function isImage(array: Uint8Array): boolean {
+	if (array.length < 4) {
+		return false;
+	}
+
+	// Magic numbers (identification bytes) for various image formats
+	const identifier: { [key: string]: number[] } = {
+		png: [0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A],
+		jpeg: [0xFF, 0xD8, 0xFF],
+		bmp: [0x42, 0x4D],
+		gif: [0x47, 0x49, 0x46, 0x38],
+		tiff: [0x49, 0x49, 0x2A, 0x00]
+	};
+
+	return Object.values(identifier).some((signature) =>
+		signature.every((byte, index) => array[index] === byte)
+	);
+}
+
diff --git a/src/vs/workbench/contrib/chat/browser/chatInlineAnchorWidget.ts b/src/vs/workbench/contrib/chat/browser/chatInlineAnchorWidget.ts
new file mode 100644
index 00000000000..41a39c9aa88
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatInlineAnchorWidget.ts
@@ -0,0 +1,301 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from '../../../../base/browser/dom.js';
+import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { IAction } from '../../../../base/common/actions.js';
+import { Lazy } from '../../../../base/common/lazy.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { IRange } from '../../../../editor/common/core/range.js';
+import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
+import { Location, SymbolKinds } from '../../../../editor/common/languages.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { getIconClasses } from '../../../../editor/common/services/getIconClasses.js';
+import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { DefinitionAction } from '../../../../editor/contrib/gotoSymbol/browser/goToCommands.js';
+import * as nls from '../../../../nls.js';
+import { createAndFillInContextMenuActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { Action2, IMenuService, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { FileKind, IFileService } from '../../../../platform/files/common/files.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { fillEditorsDragData } from '../../../browser/dnd.js';
+import { ResourceContextKey } from '../../../common/contextkeys.js';
+import { ExplorerFolderContext } from '../../files/common/files.js';
+import { ContentRefData } from '../common/annotations.js';
+import { IChatVariablesService } from '../common/chatVariables.js';
+import { IChatWidgetService } from './chat.js';
+
+export class InlineAnchorWidget extends Disposable {
+
+	public static readonly className = 'chat-inline-anchor-widget';
+
+	constructor(
+		element: HTMLAnchorElement | HTMLElement,
+		data: ContentRefData,
+		options: { handleClick?: (uri: URI) => void } = {},
+		@IContextKeyService originalContextKeyService: IContextKeyService,
+		@IContextMenuService contextMenuService: IContextMenuService,
+		@IFileService fileService: IFileService,
+		@IHoverService hoverService: IHoverService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@ILabelService labelService: ILabelService,
+		@ILanguageFeaturesService languageFeaturesService: ILanguageFeaturesService,
+		@ILanguageService languageService: ILanguageService,
+		@IMenuService menuService: IMenuService,
+		@IModelService modelService: IModelService,
+		@ITelemetryService telemetryService: ITelemetryService,
+	) {
+		super();
+
+		const contextKeyService = this._register(originalContextKeyService.createScoped(element));
+		const anchorId = new Lazy(generateUuid);
+
+		element.classList.add(InlineAnchorWidget.className, 'show-file-icons');
+		if (options.handleClick) {
+			element.classList.add('clickable');
+		}
+
+		let iconText: string;
+		let iconClasses: string[];
+
+		let location: { readonly uri: URI; readonly range?: IRange };
+		let contextMenuId: MenuId;
+		let contextMenuArg: URI | { readonly uri: URI; readonly range?: IRange };
+		if (data.kind === 'symbol') {
+			location = data.symbol.location;
+			contextMenuId = MenuId.ChatInlineSymbolAnchorContext;
+			contextMenuArg = location;
+
+			iconText = data.symbol.name;
+			iconClasses = ['codicon', ...getIconClasses(modelService, languageService, undefined, undefined, SymbolKinds.toIcon(data.symbol.kind))];
+
+			const model = modelService.getModel(location.uri);
+			if (model) {
+				const hasDefinitionProvider = EditorContextKeys.hasDefinitionProvider.bindTo(contextKeyService);
+				const hasReferenceProvider = EditorContextKeys.hasReferenceProvider.bindTo(contextKeyService);
+				const updateContents = () => {
+					if (model.isDisposed()) {
+						return;
+					}
+
+					hasDefinitionProvider.set(languageFeaturesService.definitionProvider.has(model));
+					hasReferenceProvider.set(languageFeaturesService.definitionProvider.has(model));
+				};
+				updateContents();
+				this._register(languageFeaturesService.definitionProvider.onDidChange(updateContents));
+				this._register(languageFeaturesService.referenceProvider.onDidChange(updateContents));
+			}
+
+			this._register(dom.addDisposableListener(element, 'click', () => {
+				telemetryService.publicLog2<{
+					anchorId: string;
+				}, {
+					anchorId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Unique identifier for the current anchor.' };
+					owner: 'mjbvz';
+					comment: 'Provides insight into the usage of Chat features.';
+				}>('chat.inlineAnchor.openSymbol', {
+					anchorId: anchorId.value
+				});
+			}));
+		} else {
+			location = data;
+			contextMenuId = MenuId.ChatInlineResourceAnchorContext;
+			contextMenuArg = location.uri;
+
+			const resourceContextKey = this._register(new ResourceContextKey(contextKeyService, fileService, languageService, modelService));
+			resourceContextKey.set(location.uri);
+
+			const label = labelService.getUriBasenameLabel(location.uri);
+			iconText = location.range && data.kind !== 'symbol' ?
+				`${label}#${location.range.startLineNumber}-${location.range.endLineNumber}` :
+				label;
+
+			const fileKind = location.uri.path.endsWith('/') ? FileKind.FOLDER : FileKind.FILE;
+			iconClasses = getIconClasses(modelService, languageService, location.uri, fileKind);
+
+			const isFolderContext = ExplorerFolderContext.bindTo(contextKeyService);
+			fileService.stat(location.uri)
+				.then(stat => {
+					isFolderContext.set(stat.isDirectory);
+				})
+				.catch(() => { });
+
+			this._register(dom.addDisposableListener(element, 'click', () => {
+				options.handleClick?.(location.uri);
+
+				telemetryService.publicLog2<{
+					anchorId: string;
+				}, {
+					anchorId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Unique identifier for the current anchor.' };
+					owner: 'mjbvz';
+					comment: 'Provides insight into the usage of Chat features.';
+				}>('chat.inlineAnchor.openResource', {
+					anchorId: anchorId.value
+				});
+			}));
+		}
+
+		const iconEl = dom.$('span.icon');
+		iconEl.classList.add(...iconClasses);
+		element.replaceChildren(iconEl, dom.$('span.icon-label', {}, iconText));
+
+		const fragment = location.range ? `${location.range.startLineNumber}-${location.range.endLineNumber}` : '';
+		element.setAttribute('data-href', location.uri.with({ fragment }).toString());
+
+		// Context menu
+		this._register(dom.addDisposableListener(element, dom.EventType.CONTEXT_MENU, domEvent => {
+			const event = new StandardMouseEvent(dom.getWindow(domEvent), domEvent);
+			dom.EventHelper.stop(domEvent, true);
+
+			contextMenuService.showContextMenu({
+				contextKeyService,
+				getAnchor: () => event,
+				getActions: () => {
+					const menu = menuService.getMenuActions(contextMenuId, contextKeyService, { arg: contextMenuArg });
+					const primary: IAction[] = [];
+					createAndFillInContextMenuActions(menu, primary);
+					return primary;
+				},
+			});
+		}));
+
+		// Hover
+		const relativeLabel = labelService.getUriLabel(location.uri, { relative: true });
+		this._register(hoverService.setupManagedHover(getDefaultHoverDelegate('element'), element, relativeLabel));
+
+		// Drag and drop
+		element.draggable = true;
+		this._register(dom.addDisposableListener(element, 'dragstart', e => {
+			instantiationService.invokeFunction(accessor => fillEditorsDragData(accessor, [location.uri], e));
+
+			e.dataTransfer?.setDragImage(element, 0, 0);
+		}));
+	}
+}
+
+//#region Resource context menu
+
+registerAction2(class AddFileToChatAction extends Action2 {
+
+	static readonly id = 'chat.inlineResourceAnchor.addFileToChat';
+
+	constructor() {
+		super({
+			id: AddFileToChatAction.id,
+			title: {
+				...nls.localize2('actions.attach.label', "Add File to Chat"),
+			},
+			menu: [{
+				id: MenuId.ChatInlineResourceAnchorContext,
+				group: 'chat',
+				order: 1,
+				when: ExplorerFolderContext.negate(),
+			}]
+		});
+	}
+
+	override async run(accessor: ServicesAccessor, resource: URI): Promise<void> {
+		const chatWidgetService = accessor.get(IChatWidgetService);
+		const variablesService = accessor.get(IChatVariablesService);
+
+		const widget = chatWidgetService.lastFocusedWidget;
+		if (!widget) {
+			return;
+		}
+
+		variablesService.attachContext('file', resource, widget.location);
+	}
+});
+
+//#endregion
+
+//#region Symbol context menu
+
+registerAction2(class GoToDefinitionAction extends Action2 {
+
+	static readonly id = 'chat.inlineSymbolAnchor.goToDefinition';
+
+	constructor() {
+		super({
+			id: GoToDefinitionAction.id,
+			title: {
+				...nls.localize2('actions.goToDecl.label', "Go to Definition"),
+				mnemonicTitle: nls.localize({ key: 'miGotoDefinition', comment: ['&& denotes a mnemonic'] }, "Go to &&Definition"),
+			},
+			precondition: EditorContextKeys.hasDefinitionProvider,
+			menu: [{
+				id: MenuId.ChatInlineSymbolAnchorContext,
+				group: 'navigation',
+				order: 1.1,
+			},]
+		});
+	}
+
+	override async run(accessor: ServicesAccessor, location: Location): Promise<void> {
+		const editorService = accessor.get(ICodeEditorService);
+
+		await editorService.openCodeEditor({
+			resource: location.uri, options: {
+				selection: {
+					startColumn: location.range.startColumn,
+					startLineNumber: location.range.startLineNumber,
+				}
+			}
+		}, null);
+
+		const action = new DefinitionAction({ openToSide: false, openInPeek: false, muteMessage: true }, { title: { value: '', original: '' }, id: '', precondition: undefined });
+		return action.run(accessor);
+	}
+});
+
+registerAction2(class GoToReferencesAction extends Action2 {
+
+	static readonly id = 'chat.inlineSymbolAnchor.goToReferences';
+
+	constructor() {
+		super({
+			id: GoToReferencesAction.id,
+			title: {
+				...nls.localize2('goToReferences.label', "Go to References"),
+				mnemonicTitle: nls.localize({ key: 'miGotoReference', comment: ['&& denotes a mnemonic'] }, "Go to &&References"),
+			},
+			precondition: EditorContextKeys.hasReferenceProvider,
+			menu: [{
+				id: MenuId.ChatInlineSymbolAnchorContext,
+				group: 'navigation',
+				order: 1.1,
+			},]
+		});
+	}
+
+	override async run(accessor: ServicesAccessor, location: Location): Promise<void> {
+		const editorService = accessor.get(ICodeEditorService);
+		const commandService = accessor.get(ICommandService);
+
+		await editorService.openCodeEditor({
+			resource: location.uri, options: {
+				selection: {
+					startColumn: location.range.startColumn,
+					startLineNumber: location.range.startLineNumber,
+				}
+			}
+		}, null);
+
+		await commandService.executeCommand('editor.action.goToReferences');
+	}
+});
+
+//#endregion
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index 5fa1417f4c0..27b631f78dc 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -3,59 +3,80 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { DEFAULT_FONT_FAMILY } from 'vs/base/browser/fonts';
-import { IHistoryNavigationWidget } from 'vs/base/browser/history';
-import * as aria from 'vs/base/browser/ui/aria/aria';
-import { Range } from 'vs/editor/common/core/range';
-import { Button } from 'vs/base/browser/ui/button/button';
-import { IAction } from 'vs/base/common/actions';
-import { Codicon } from 'vs/base/common/codicons';
-import { Emitter } from 'vs/base/common/event';
-import { HistoryNavigator } from 'vs/base/common/history';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { isMacintosh } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { IEditorConstructionOptions } from 'vs/editor/browser/config/editorConfiguration';
-import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
-import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { IDimension } from 'vs/editor/common/core/dimension';
-import { IPosition } from 'vs/editor/common/core/position';
-import { ITextModel } from 'vs/editor/common/model';
-import { IModelService } from 'vs/editor/common/services/model';
-import { HoverController } from 'vs/editor/contrib/hover/browser/hoverController';
-import { localize } from 'vs/nls';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { DropdownWithPrimaryActionViewItem } from 'vs/platform/actions/browser/dropdownWithPrimaryActionViewItem';
-import { createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { HiddenItemStrategy, MenuWorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
-import { IMenuService, MenuId, MenuItemAction } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { FileKind } from 'vs/platform/files/common/files';
-import { registerAndCreateHistoryNavigationContext } from 'vs/platform/history/browser/contextScopedHistoryWidget';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ResourceLabels } from 'vs/workbench/browser/labels';
-import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { AccessibilityCommandId } from 'vs/workbench/contrib/accessibility/common/accessibilityCommands';
-import { CancelAction, ChatSubmitSecondaryAgentAction, IChatExecuteActionContext, SubmitAction } from 'vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
-import { IChatWidget } from 'vs/workbench/contrib/chat/browser/chat';
-import { ChatFollowups } from 'vs/workbench/contrib/chat/browser/chatFollowups';
-import { ChatAgentLocation, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { CONTEXT_CHAT_INPUT_CURSOR_AT_TOP, CONTEXT_CHAT_INPUT_HAS_FOCUS, CONTEXT_CHAT_INPUT_HAS_TEXT, CONTEXT_IN_CHAT_INPUT } from 'vs/workbench/contrib/chat/common/chatContextKeys';
-import { IChatRequestVariableEntry } from 'vs/workbench/contrib/chat/common/chatModel';
-import { IChatFollowup } from 'vs/workbench/contrib/chat/common/chatService';
-import { IChatResponseViewModel } from 'vs/workbench/contrib/chat/common/chatViewModel';
-import { IChatHistoryEntry, IChatWidgetHistoryService } from 'vs/workbench/contrib/chat/common/chatWidgetHistoryService';
-import { getSimpleCodeEditorWidgetOptions, getSimpleEditorOptions } from 'vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { basename, dirname } from 'vs/base/common/path';
+import * as dom from '../../../../base/browser/dom.js';
+import { DEFAULT_FONT_FAMILY } from '../../../../base/browser/fonts.js';
+import { IHistoryNavigationWidget } from '../../../../base/browser/history.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import * as aria from '../../../../base/browser/ui/aria/aria.js';
+import { Button } from '../../../../base/browser/ui/button/button.js';
+import { IManagedHoverContentOrFactory } from '../../../../base/browser/ui/hover/hover.js';
+import { IHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegate.js';
+import { createInstantHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { ProgressBar } from '../../../../base/browser/ui/progressbar/progressbar.js';
+import { IAction } from '../../../../base/common/actions.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { HistoryNavigator2 } from '../../../../base/common/history.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore, IDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { ResourceSet } from '../../../../base/common/map.js';
+import { basename, dirname } from '../../../../base/common/path.js';
+import { isMacintosh } from '../../../../base/common/platform.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IEditorConstructionOptions } from '../../../../editor/browser/config/editorConfiguration.js';
+import { EditorExtensionsRegistry } from '../../../../editor/browser/editorExtensions.js';
+import { CodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { EditorOptions } from '../../../../editor/common/config/editorOptions.js';
+import { IDimension } from '../../../../editor/common/core/dimension.js';
+import { IPosition } from '../../../../editor/common/core/position.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { CopyPasteController } from '../../../../editor/contrib/dropOrPasteInto/browser/copyPasteController.js';
+import { ContentHoverController } from '../../../../editor/contrib/hover/browser/contentHoverController.js';
+import { GlyphHoverController } from '../../../../editor/contrib/hover/browser/glyphHoverController.js';
+import { SuggestController } from '../../../../editor/contrib/suggest/browser/suggestController.js';
+import { localize } from '../../../../nls.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { DropdownWithPrimaryActionViewItem, IDropdownWithPrimaryActionViewItemOptions } from '../../../../platform/actions/browser/dropdownWithPrimaryActionViewItem.js';
+import { createAndFillInActionBarActions, IMenuEntryActionViewItemOptions, MenuEntryActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { HiddenItemStrategy, MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
+import { IMenuService, MenuId, MenuItemAction } from '../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { FileKind, IFileService } from '../../../../platform/files/common/files.js';
+import { registerAndCreateHistoryNavigationContext } from '../../../../platform/history/browser/contextScopedHistoryWidget.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { WorkbenchList } from '../../../../platform/list/browser/listService.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ResourceLabels } from '../../../browser/labels.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
+import { AccessibilityCommandId } from '../../accessibility/common/accessibilityCommands.js';
+import { getSimpleCodeEditorWidgetOptions, getSimpleEditorOptions, setupSimpleEditorSelectionStyling } from '../../codeEditor/browser/simpleEditorOptions.js';
+import { ChatAgentLocation, IChatAgentService } from '../common/chatAgents.js';
+import { CONTEXT_CHAT_INPUT_CURSOR_AT_TOP, CONTEXT_CHAT_INPUT_HAS_FOCUS, CONTEXT_CHAT_INPUT_HAS_TEXT, CONTEXT_IN_CHAT_INPUT } from '../common/chatContextKeys.js';
+import { ChatEditingSessionState, IChatEditingSession, ModifiedFileEntryState } from '../common/chatEditingService.js';
+import { IChatRequestVariableEntry } from '../common/chatModel.js';
+import { IChatFollowup } from '../common/chatService.js';
+import { IChatResponseViewModel } from '../common/chatViewModel.js';
+import { IChatHistoryEntry, IChatWidgetHistoryService } from '../common/chatWidgetHistoryService.js';
+import { ILanguageModelChatMetadata, ILanguageModelsService } from '../common/languageModels.js';
+import { CancelAction, ChatModelPickerActionId, ChatSubmitSecondaryAgentAction, IChatExecuteActionContext, SubmitAction } from './actions/chatExecuteActions.js';
+import { IChatWidget } from './chat.js';
+import { IDisposableReference } from './chatContentParts/chatCollections.js';
+import { CollapsibleListPool, IChatCollapsibleListItem } from './chatContentParts/chatReferencesContentPart.js';
+import { ChatEditingAcceptAllAction, ChatEditingDiscardAllAction, ChatEditingShowChangesAction } from './chatEditingService.js';
+import { ChatFollowups } from './chatFollowups.js';
+import { IChatViewState } from './chatWidget.js';
 
 const $ = dom.$;
 
@@ -63,7 +84,7 @@ const INPUT_EDITOR_MAX_HEIGHT = 250;
 
 interface IChatInputPartOptions {
 	renderFollowups: boolean;
-	renderStyle?: 'default' | 'compact';
+	renderStyle?: 'compact';
 	menus: {
 		executeToolbar: MenuId;
 		inputSideToolbar?: MenuId;
@@ -72,6 +93,26 @@ interface IChatInputPartOptions {
 	editorOverflowWidgetsDomNode?: HTMLElement;
 }
 
+// TODO: @justschen
+// class ChatInputContentProvider extends Disposable implements ITextModelContentProvider {
+// 	constructor(
+// 		textModelService: ITextModelService,
+// 		private readonly modelService: IModelService,
+// 		private readonly languageService: ILanguageService,
+// 	) {
+// 		super();
+// 		this._register(textModelService.registerTextModelContentProvider(ChatInputPart.INPUT_SCHEME, this));
+// 	}
+
+// 	async provideTextContent(resource: URI): Promise<ITextModel | null> {
+// 		const existing = this.modelService.getModel(resource);
+// 		if (existing) {
+// 			return existing;
+// 		}
+// 		return this.modelService.createModel('', this.languageService.createById('chatSessionInput'), resource);
+// 	}
+// }
+
 export class ChatInputPart extends Disposable implements IHistoryNavigationWidget {
 	static readonly INPUT_SCHEME = 'chatSessionInput';
 	private static _counter = 0;
@@ -88,13 +129,13 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 	private _onDidBlur = this._register(new Emitter<void>());
 	readonly onDidBlur = this._onDidBlur.event;
 
-	private _onDidDeleteContext = this._register(new Emitter<IChatRequestVariableEntry>());
-	readonly onDidDeleteContext = this._onDidDeleteContext.event;
+	private _onDidChangeContext = this._register(new Emitter<{ removed?: IChatRequestVariableEntry[]; added?: IChatRequestVariableEntry[] }>());
+	readonly onDidChangeContext = this._onDidChangeContext.event;
 
 	private _onDidAcceptFollowup = this._register(new Emitter<{ followup: IChatFollowup; response: IChatResponseViewModel | undefined }>());
 	readonly onDidAcceptFollowup = this._onDidAcceptFollowup.event;
 
-	public get attachedContext() {
+	public get attachedContext(): ReadonlySet<IChatRequestVariableEntry> {
 		return this._attachedContext;
 	}
 
@@ -116,39 +157,72 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 	private attachedContextContainer!: HTMLElement;
 	private readonly attachedContextDisposables = this._register(new DisposableStore());
 
+	private chatEditingSessionWidgetContainer!: HTMLElement;
+
 	private _inputPartHeight: number = 0;
 	get inputPartHeight() {
 		return this._inputPartHeight;
 	}
 
+	private _followupsHeight: number = 0;
+	get followupsHeight() {
+		return this._followupsHeight;
+	}
+
 	private _inputEditor!: CodeEditorWidget;
 	private _inputEditorElement!: HTMLElement;
 
-	private toolbar!: MenuWorkbenchToolBar;
+	private executeToolbar!: MenuWorkbenchToolBar;
+	private inputActionsToolbar!: MenuWorkbenchToolBar;
 
 	get inputEditor() {
 		return this._inputEditor;
 	}
 
-	private history: HistoryNavigator<IChatHistoryEntry>;
+	private history: HistoryNavigator2<IChatHistoryEntry>;
 	private historyNavigationBackwardsEnablement!: IContextKey<boolean>;
 	private historyNavigationForewardsEnablement!: IContextKey<boolean>;
-	private onHistoryEntry = false;
 	private inHistoryNavigation = false;
 	private inputModel: ITextModel | undefined;
 	private inputEditorHasText: IContextKey<boolean>;
 	private chatCursorAtTop: IContextKey<boolean>;
 	private inputEditorHasFocus: IContextKey<boolean>;
 
+	private readonly _waitForPersistedLanguageModel = this._register(new MutableDisposable<IDisposable>());
+	private _onDidChangeCurrentLanguageModel = new Emitter<string>();
+	private _currentLanguageModel: string | undefined;
+	get currentLanguageModel() {
+		return this._currentLanguageModel;
+	}
+
 	private cachedDimensions: dom.Dimension | undefined;
-	private cachedToolbarWidth: number | undefined;
+	private cachedExecuteToolbarWidth: number | undefined;
+	private cachedInputToolbarWidth: number | undefined;
 
 	readonly inputUri = URI.parse(`${ChatInputPart.INPUT_SCHEME}:input-${ChatInputPart._counter++}`);
 
+	private readonly _chatEditsActionsDisposables = this._register(new DisposableStore());
+	private readonly _chatEditsDisposables = this._register(new DisposableStore());
+	private _chatEditsProgress: ProgressBar | undefined;
+	private _chatEditsListPool: CollapsibleListPool;
+	private _chatEditList: IDisposableReference<WorkbenchList<IChatCollapsibleListItem>> | undefined;
+	get selectedElements(): URI[] {
+		const edits = [];
+		const editsList = this._chatEditList?.object;
+		const selectedElements = editsList?.getSelectedElements() ?? [];
+		for (const element of selectedElements) {
+			if (element.kind === 'reference' && URI.isUri(element.reference)) {
+				edits.push(element.reference);
+			}
+		}
+		return edits;
+	}
+
 	constructor(
 		// private readonly editorOptions: ChatEditorOptions, // TODO this should be used
 		private readonly location: ChatAgentLocation,
 		private readonly options: IChatInputPartOptions,
+		private readonly getInputState: () => any,
 		@IChatWidgetHistoryService private readonly historyService: IChatWidgetHistoryService,
 		@IModelService private readonly modelService: IModelService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
@@ -156,23 +230,60 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IKeybindingService private readonly keybindingService: IKeybindingService,
 		@IAccessibilityService private readonly accessibilityService: IAccessibilityService,
+		@ILanguageModelsService private readonly languageModelsService: ILanguageModelsService,
+		@ILogService private readonly logService: ILogService,
+		@IHoverService private readonly hoverService: IHoverService,
+		@IFileService private readonly fileService: IFileService,
+		@ICommandService private readonly commandService: ICommandService,
+		@IEditorService private readonly editorService: IEditorService
 	) {
 		super();
 
+
 		this.inputEditorMaxHeight = this.options.renderStyle === 'compact' ? INPUT_EDITOR_MAX_HEIGHT / 3 : INPUT_EDITOR_MAX_HEIGHT;
 
 		this.inputEditorHasText = CONTEXT_CHAT_INPUT_HAS_TEXT.bindTo(contextKeyService);
 		this.chatCursorAtTop = CONTEXT_CHAT_INPUT_CURSOR_AT_TOP.bindTo(contextKeyService);
 		this.inputEditorHasFocus = CONTEXT_CHAT_INPUT_HAS_FOCUS.bindTo(contextKeyService);
 
-		this.history = new HistoryNavigator([], 5);
-		this._register(this.historyService.onDidClearHistory(() => this.history.clear()));
+		this.history = this.loadHistory();
+		this._register(this.historyService.onDidClearHistory(() => this.history = new HistoryNavigator2([{ text: '' }], 50, historyKeyFn)));
 
 		this._register(this.configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration(AccessibilityVerbositySettingId.Chat)) {
 				this.inputEditor.updateOptions({ ariaLabel: this._getAriaLabel() });
 			}
 		}));
+
+		this._chatEditsListPool = this._register(this.instantiationService.createInstance(CollapsibleListPool, this._onDidChangeVisibility.event, MenuId.ChatEditingSessionWidgetToolbar, { enableFileDecorations: true }));
+	}
+
+	private setCurrentLanguageModelToDefault() {
+		const defaultLanguageModel = this.languageModelsService.getLanguageModelIds().find(id => this.languageModelsService.lookupLanguageModel(id)?.isDefault);
+		const hasUserSelectableLanguageModels = this.languageModelsService.getLanguageModelIds().find(id => {
+			const model = this.languageModelsService.lookupLanguageModel(id);
+			return model?.isUserSelectable && !model.isDefault;
+		});
+		this._currentLanguageModel = hasUserSelectableLanguageModels ? defaultLanguageModel : undefined;
+	}
+
+	private setCurrentLanguageModelByUser(modelId: string) {
+		this._currentLanguageModel = modelId;
+
+		// The user changed the language model, so we don't wait for the persisted option to be registered
+		this._waitForPersistedLanguageModel.clear();
+		if (this.cachedDimensions) {
+			this.layout(this.cachedDimensions.height, this.cachedDimensions.width);
+		}
+	}
+
+	private loadHistory(): HistoryNavigator2<IChatHistoryEntry> {
+		const history = this.historyService.getHistory(this.location);
+		if (history.length === 0) {
+			history.push({ text: '' });
+		}
+
+		return new HistoryNavigator2(history, 50, historyKeyFn);
 	}
 
 	private _getAriaLabel(): string {
@@ -184,13 +295,59 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		return localize('chatInput', "Chat Input");
 	}
 
-	setState(inputValue: string | undefined): void {
-		const history = this.historyService.getHistory(this.location);
-		this.history = new HistoryNavigator(history, 50);
-
-		if (typeof inputValue === 'string') {
-			this.setValue(inputValue);
+	updateState(inputState: Object): void {
+		if (this.inHistoryNavigation) {
+			return;
 		}
+
+		const newEntry = { text: this._inputEditor.getValue(), state: inputState };
+
+		if (this.history.isAtEnd()) {
+			// The last history entry should always be the current input value
+			this.history.replaceLast(newEntry);
+		} else {
+			// Added a reference while in the middle of history navigation, it's a new entry
+			this.history.replaceLast(newEntry);
+			this.history.resetCursor();
+		}
+	}
+
+	initForNewChatModel(state: IChatViewState): void {
+		this.history = this.loadHistory();
+		this.history.add({
+			text: state.inputValue ?? this.history.current().text,
+			state: state.inputState ?? this.getInputState()
+		});
+
+		if (state.inputValue) {
+			this.setValue(state.inputValue, false);
+		}
+
+		if (state.selectedLanguageModelId) {
+			const model = this.languageModelsService.lookupLanguageModel(state.selectedLanguageModelId);
+			if (model) {
+				this._currentLanguageModel = state.selectedLanguageModelId;
+				this._onDidChangeCurrentLanguageModel.fire(this._currentLanguageModel);
+			} else {
+				this._waitForPersistedLanguageModel.value = this.languageModelsService.onDidChangeLanguageModels(e => {
+					const persistedModel = e.added?.find(m => m.identifier === state.selectedLanguageModelId);
+					if (persistedModel) {
+						this._waitForPersistedLanguageModel.clear();
+
+						if (persistedModel.metadata.isUserSelectable) {
+							this._currentLanguageModel = state.selectedLanguageModelId;
+							this._onDidChangeCurrentLanguageModel.fire(this._currentLanguageModel!);
+						}
+					}
+				});
+			}
+		}
+
+	}
+
+	logInputHistory(): void {
+		const historyStr = [...this.history].map(entry => JSON.stringify(entry)).join('\n');
+		this.logService.info(`[${this.location}] Chat input history:`, historyStr);
 	}
 
 	setVisible(visible: boolean): void {
@@ -202,43 +359,79 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 	}
 
 	showPreviousValue(): void {
+		const inputState = this.getInputState();
+		if (this.history.isAtEnd()) {
+			this.saveCurrentValue(inputState);
+		} else {
+			if (!this.history.has({ text: this._inputEditor.getValue(), state: inputState })) {
+				this.saveCurrentValue(inputState);
+				this.history.resetCursor();
+			}
+		}
+
 		this.navigateHistory(true);
 	}
 
 	showNextValue(): void {
+		const inputState = this.getInputState();
+		if (this.history.isAtEnd()) {
+			return;
+		} else {
+			if (!this.history.has({ text: this._inputEditor.getValue(), state: inputState })) {
+				this.saveCurrentValue(inputState);
+				this.history.resetCursor();
+			}
+		}
+
 		this.navigateHistory(false);
 	}
 
 	private navigateHistory(previous: boolean): void {
-		const historyEntry = (previous ?
-			(this.history.previous() ?? this.history.first()) : this.history.next())
-			?? { text: '' };
-
-		this.onHistoryEntry = previous || this.history.current() !== null;
+		const historyEntry = previous ?
+			this.history.previous() : this.history.next();
 
 		aria.status(historyEntry.text);
 
 		this.inHistoryNavigation = true;
-		this.setValue(historyEntry.text);
+		this.setValue(historyEntry.text, true);
 		this.inHistoryNavigation = false;
 
 		this._onDidLoadInputState.fire(historyEntry.state);
-		if (previous) {
-			this._inputEditor.setPosition({ lineNumber: 1, column: 1 });
-		} else {
-			const model = this._inputEditor.getModel();
-			if (!model) {
-				return;
-			}
 
+		const model = this._inputEditor.getModel();
+		if (!model) {
+			return;
+		}
+
+		if (previous) {
+			const endOfFirstViewLine = this._inputEditor._getViewModel()?.getLineLength(1) ?? 1;
+			const endOfFirstModelLine = model.getLineLength(1);
+			if (endOfFirstViewLine === endOfFirstModelLine) {
+				// Not wrapped - set cursor to the end of the first line
+				this._inputEditor.setPosition({ lineNumber: 1, column: endOfFirstViewLine + 1 });
+			} else {
+				// Wrapped - set cursor one char short of the end of the first view line.
+				// If it's after the next character, the cursor shows on the second line.
+				this._inputEditor.setPosition({ lineNumber: 1, column: endOfFirstViewLine });
+			}
+		} else {
 			this._inputEditor.setPosition(getLastPosition(model));
 		}
 	}
 
-	setValue(value: string): void {
+	setValue(value: string, transient: boolean): void {
 		this.inputEditor.setValue(value);
 		// always leave cursor at the end
 		this.inputEditor.setPosition({ lineNumber: 1, column: value.length + 1 });
+
+		if (!transient) {
+			this.saveCurrentValue(this.getInputState());
+		}
+	}
+
+	private saveCurrentValue(inputState: any): void {
+		const newEntry = { text: this._inputEditor.getValue(), state: inputState };
+		this.history.replaceLast(newEntry);
 	}
 
 	focus() {
@@ -253,17 +446,17 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 	 * Reset the input and update history.
 	 * @param userQuery If provided, this will be added to the history. Followups and programmatic queries should not be passed.
 	 */
-	async acceptInput(userQuery?: string, inputState?: any): Promise<void> {
-		if (userQuery) {
-			let element = this.history.getHistory().find(candidate => candidate.text === userQuery);
-			if (!element) {
-				element = { text: userQuery, state: inputState };
-			} else {
-				element.state = inputState;
-			}
-			this.history.add(element);
+	async acceptInput(isUserQuery?: boolean): Promise<void> {
+		if (isUserQuery) {
+			const userQuery = this._inputEditor.getValue();
+			const entry: IChatHistoryEntry = { text: userQuery, state: this.getInputState() };
+			this.history.replaceLast(entry);
+			this.history.add({ text: '' });
 		}
 
+		// Clear attached context, fire event to clear input state, and clear the input editor
+		this._attachedContext.clear();
+		this._onDidLoadInputState.fire({});
 		if (this.accessibilityService.isScreenReaderOptimized() && isMacintosh) {
 			this._acceptInputForVoiceover();
 		} else {
@@ -285,27 +478,73 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		this._inputEditor.focus();
 	}
 
-	attachContext(...contentReferences: IChatRequestVariableEntry[]): void {
-		for (const reference of contentReferences) {
-			this.attachedContext.add(reference);
+	attachContext(overwrite: boolean, ...contentReferences: IChatRequestVariableEntry[]): void {
+		const removed = [];
+		if (overwrite) {
+			removed.push(...Array.from(this._attachedContext));
+			this._attachedContext.clear();
 		}
 
-		this.initAttachedContext(this.attachedContextContainer);
+		if (contentReferences.length > 0) {
+			for (const reference of contentReferences) {
+				this._attachedContext.add(reference);
+			}
+		}
+
+		if (removed.length > 0 || contentReferences.length > 0) {
+			this.initAttachedContext(this.attachedContextContainer);
+
+			if (!overwrite) {
+				this._onDidChangeContext.fire({ removed, added: contentReferences });
+			}
+		}
 	}
 
 	render(container: HTMLElement, initialValue: string, widget: IChatWidget) {
-		this.container = dom.append(container, $('.interactive-input-part'));
+		let elements;
+		if (this.options.renderStyle === 'compact') {
+			elements = dom.h('.interactive-input-part', [
+				dom.h('.interactive-input-and-edit-session', [
+					dom.h('.chat-editing-session@chatEditingSessionWidgetContainer'),
+					dom.h('.interactive-input-and-side-toolbar@inputAndSideToolbar', [
+						dom.h('.chat-input-container@inputContainer', [
+							dom.h('.chat-editor-container@editorContainer'),
+							dom.h('.chat-input-toolbars@inputToolbars'),
+						]),
+					]),
+					dom.h('.chat-attached-context@attachedContextContainer'),
+					dom.h('.interactive-input-followups@followupsContainer'),
+				])
+			]);
+		} else {
+			elements = dom.h('.interactive-input-part', [
+				dom.h('.interactive-input-followups@followupsContainer'),
+				dom.h('.chat-editing-session@chatEditingSessionWidgetContainer'),
+				dom.h('.interactive-input-and-side-toolbar@inputAndSideToolbar', [
+					dom.h('.chat-input-container@inputContainer', [
+						dom.h('.chat-editor-container@editorContainer'),
+						dom.h('.chat-attached-context@attachedContextContainer'),
+						dom.h('.chat-input-toolbars@inputToolbars'),
+					]),
+				]),
+			]);
+		}
+		this.container = elements.root;
+		container.append(this.container);
 		this.container.classList.toggle('compact', this.options.renderStyle === 'compact');
-
-		this.followupsContainer = dom.append(this.container, $('.interactive-input-followups'));
-		this.attachedContextContainer = dom.append(this.container, $('.chat-attached-context'));
+		this.followupsContainer = elements.followupsContainer;
+		const inputAndSideToolbar = elements.inputAndSideToolbar; // The chat input and toolbar to the right
+		const inputContainer = elements.inputContainer; // The chat editor, attachments, and toolbars
+		const editorContainer = elements.editorContainer;
+		this.attachedContextContainer = elements.attachedContextContainer;
+		const toolbarsContainer = elements.inputToolbars;
+		this.chatEditingSessionWidgetContainer = elements.chatEditingSessionWidgetContainer;
 		this.initAttachedContext(this.attachedContextContainer);
-		const inputAndSideToolbar = dom.append(this.container, $('.interactive-input-and-side-toolbar'));
-		const inputContainer = dom.append(inputAndSideToolbar, $('.interactive-input-and-execute-toolbar'));
+		this.renderChatEditingSessionState(null, undefined, widget);
 
 		const inputScopedContextKeyService = this._register(this.contextKeyService.createScoped(inputContainer));
 		CONTEXT_IN_CHAT_INPUT.bindTo(inputScopedContextKeyService).set(true);
-		const scopedInstantiationService = this.instantiationService.createChild(new ServiceCollection([IContextKeyService, inputScopedContextKeyService]));
+		const scopedInstantiationService = this._register(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, inputScopedContextKeyService])));
 
 		const { historyNavigationBackwardsEnablement, historyNavigationForwardsEnablement } = this._register(registerAndCreateHistoryNavigationContext(inputScopedContextKeyService, this));
 		this.historyNavigationBackwardsEnablement = historyNavigationBackwardsEnablement;
@@ -313,6 +552,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 
 		const options: IEditorConstructionOptions = getSimpleEditorOptions(this.configurationService);
 		options.overflowWidgetsDomNode = this.options.editorOverflowWidgetsDomNode;
+		options.pasteAs = EditorOptions.pasteAs.defaultValue;
 		options.readOnly = false;
 		options.ariaLabel = this._getAriaLabel();
 		options.fontFamily = DEFAULT_FONT_FAMILY;
@@ -330,11 +570,13 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 			insertMode: 'replace',
 		};
 		options.scrollbar = { ...(options.scrollbar ?? {}), vertical: 'hidden' };
+		options.stickyScroll = { enabled: false };
 
-		this._inputEditorElement = dom.append(inputContainer, $('.interactive-input-editor'));
+		this._inputEditorElement = dom.append(editorContainer!, $(chatInputEditorContainerSelector));
 		const editorOptions = getSimpleCodeEditorWidgetOptions();
-		editorOptions.contributions?.push(...EditorExtensionsRegistry.getSomeEditorContributions([HoverController.ID]));
+		editorOptions.contributions?.push(...EditorExtensionsRegistry.getSomeEditorContributions([ContentHoverController.ID, GlyphHoverController.ID, CopyPasteController.ID]));
 		this._inputEditor = this._register(scopedInstantiationService.createInstance(CodeEditorWidget, this._inputEditorElement, options, editorOptions));
+		SuggestController.get(this._inputEditor)?.forceRenderingAbove();
 
 		this._register(this._inputEditor.onDidChangeModelContent(() => {
 			const currentHeight = Math.min(this._inputEditor.getContentHeight(), this.inputEditorMaxHeight);
@@ -343,21 +585,9 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 				this._onDidChangeHeight.fire();
 			}
 
-			// Only allow history navigation when the input is empty.
-			// (If this model change happened as a result of a history navigation, this is canceled out by a call in this.navigateHistory)
 			const model = this._inputEditor.getModel();
 			const inputHasText = !!model && model.getValue().trim().length > 0;
 			this.inputEditorHasText.set(inputHasText);
-
-			// If the user is typing on a history entry, then reset the onHistoryEntry flag so that history navigation can be disabled
-			if (!this.inHistoryNavigation) {
-				this.onHistoryEntry = false;
-			}
-
-			if (!this.onHistoryEntry) {
-				this.historyNavigationForewardsEnablement.set(!inputHasText);
-				this.historyNavigationBackwardsEnablement.set(!inputHasText);
-			}
 		}));
 		this._register(this._inputEditor.onDidFocusEditorText(() => {
 			this.inputEditorHasFocus.set(true);
@@ -370,52 +600,69 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 
 			this._onDidBlur.fire();
 		}));
-		this._register(this._inputEditor.onDidChangeCursorPosition(e => {
-			const model = this._inputEditor.getModel();
-			if (!model) {
-				return;
-			}
 
-			const atTop = e.position.column === 1 && e.position.lineNumber === 1;
-			this.chatCursorAtTop.set(atTop);
+		const hoverDelegate = this._register(createInstantHoverDelegate());
 
-			if (this.onHistoryEntry) {
-				this.historyNavigationBackwardsEnablement.set(atTop);
-				this.historyNavigationForewardsEnablement.set(e.position.equals(getLastPosition(model)));
+		this._register(dom.addStandardDisposableListener(toolbarsContainer, dom.EventType.CLICK, e => this.inputEditor.focus()));
+		this.inputActionsToolbar = this._register(this.instantiationService.createInstance(MenuWorkbenchToolBar, toolbarsContainer, MenuId.ChatInput, {
+			telemetrySource: this.options.menus.telemetrySource,
+			menuOptions: { shouldForwardArgs: true },
+			hiddenItemStrategy: HiddenItemStrategy.Ignore,
+			hoverDelegate
+		}));
+		this.inputActionsToolbar.context = { widget } satisfies IChatExecuteActionContext;
+		this._register(this.inputActionsToolbar.onDidChangeMenuItems(() => {
+			if (this.cachedDimensions && typeof this.cachedInputToolbarWidth === 'number' && this.cachedInputToolbarWidth !== this.inputActionsToolbar.getItemsWidth()) {
+				this.layout(this.cachedDimensions.height, this.cachedDimensions.width);
 			}
 		}));
-
-		this.toolbar = this._register(this.instantiationService.createInstance(MenuWorkbenchToolBar, inputContainer, this.options.menus.executeToolbar, {
+		this.executeToolbar = this._register(this.instantiationService.createInstance(MenuWorkbenchToolBar, toolbarsContainer, this.options.menus.executeToolbar, {
 			telemetrySource: this.options.menus.telemetrySource,
 			menuOptions: {
 				shouldForwardArgs: true
 			},
+			hoverDelegate,
 			hiddenItemStrategy: HiddenItemStrategy.Ignore, // keep it lean when hiding items and avoid a "..." overflow menu
 			actionViewItemProvider: (action, options) => {
 				if (this.location === ChatAgentLocation.Panel) {
 					if ((action.id === SubmitAction.ID || action.id === CancelAction.ID) && action instanceof MenuItemAction) {
 						const dropdownAction = this.instantiationService.createInstance(MenuItemAction, { id: 'chat.moreExecuteActions', title: localize('notebook.moreExecuteActionsLabel', "More..."), icon: Codicon.chevronDown }, undefined, undefined, undefined, undefined);
-						return this.instantiationService.createInstance(ChatSubmitDropdownActionItem, action, dropdownAction);
+						return this.instantiationService.createInstance(ChatSubmitDropdownActionItem, action, dropdownAction, options);
+					}
+				}
+
+				if (action.id === ChatModelPickerActionId && action instanceof MenuItemAction) {
+					if (!this._currentLanguageModel) {
+						this.setCurrentLanguageModelToDefault();
+					}
+
+					if (this._currentLanguageModel) {
+						const itemDelegate: ModelPickerDelegate = {
+							onDidChangeModel: this._onDidChangeCurrentLanguageModel.event,
+							setModel: (modelId: string) => {
+								this.setCurrentLanguageModelByUser(modelId);
+							}
+						};
+						return this.instantiationService.createInstance(ModelPickerActionViewItem, action, this._currentLanguageModel, itemDelegate, { hoverDelegate: options.hoverDelegate, keybinding: options.keybinding ?? undefined });
 					}
 				}
 
 				return undefined;
 			}
 		}));
-		this.toolbar.getElement().classList.add('interactive-execute-toolbar');
-		this.toolbar.context = { widget } satisfies IChatExecuteActionContext;
-		this._register(this.toolbar.onDidChangeMenuItems(() => {
-			if (this.cachedDimensions && typeof this.cachedToolbarWidth === 'number' && this.cachedToolbarWidth !== this.toolbar.getItemsWidth()) {
+		this.executeToolbar.context = { widget } satisfies IChatExecuteActionContext;
+		this._register(this.executeToolbar.onDidChangeMenuItems(() => {
+			if (this.cachedDimensions && typeof this.cachedExecuteToolbarWidth === 'number' && this.cachedExecuteToolbarWidth !== this.executeToolbar.getItemsWidth()) {
 				this.layout(this.cachedDimensions.height, this.cachedDimensions.width);
 			}
 		}));
-
 		if (this.options.menus.inputSideToolbar) {
 			const toolbarSide = this._register(this.instantiationService.createInstance(MenuWorkbenchToolBar, inputAndSideToolbar, this.options.menus.inputSideToolbar, {
 				telemetrySource: this.options.menus.telemetrySource,
 				menuOptions: {
 					shouldForwardArgs: true
-				}
+				},
+				hoverDelegate
 			}));
 			this.inputSideToolbarContainer = toolbarSide.getElement();
 			toolbarSide.getElement().classList.add('chat-side-toolbar');
@@ -436,67 +683,333 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 			const lineNumber = this.inputModel.getLineCount();
 			this._inputEditor.setPosition({ lineNumber, column: this.inputModel.getLineMaxColumn(lineNumber) });
 		}
+
+		const onDidChangeCursorPosition = () => {
+			const model = this._inputEditor.getModel();
+			if (!model) {
+				return;
+			}
+
+			const position = this._inputEditor.getPosition();
+			if (!position) {
+				return;
+			}
+
+			const atTop = position.lineNumber === 1 && position.column - 1 <= (this._inputEditor._getViewModel()?.getLineLength(1) ?? 0);
+			this.chatCursorAtTop.set(atTop);
+
+			this.historyNavigationBackwardsEnablement.set(atTop);
+			this.historyNavigationForewardsEnablement.set(position.equals(getLastPosition(model)));
+		};
+		this._register(this._inputEditor.onDidChangeCursorPosition(e => onDidChangeCursorPosition()));
+		onDidChangeCursorPosition();
 	}
 
-	private initAttachedContext(container: HTMLElement) {
+	private initAttachedContext(container: HTMLElement, isLayout = false) {
+		const oldHeight = container.offsetHeight;
 		dom.clearNode(container);
 		this.attachedContextDisposables.clear();
+		const hoverDelegate = this.attachedContextDisposables.add(createInstantHoverDelegate());
 		dom.setVisibility(Boolean(this.attachedContext.size), this.attachedContextContainer);
 		if (!this.attachedContext.size) {
 			this._indexOfLastAttachedContextDeletedWithKeyboard = -1;
 		}
-		[...this.attachedContext.values()].forEach((attachment, index) => {
+		[...this.attachedContext.values()].forEach(async (attachment, index) => {
+			if (attachment.isFile && this.location === ChatAgentLocation.EditingSession) {
+				return;
+			}
+
 			const widget = dom.append(container, $('.chat-attached-context-attachment.show-file-icons'));
-			const label = this._contextResourceLabels.create(widget, { supportIcons: true });
+			const label = this._contextResourceLabels.create(widget, { supportIcons: true, hoverDelegate });
+
+			let hoverElement: IManagedHoverContentOrFactory;
+			let ariaLabel: string | undefined;
+
 			const file = URI.isUri(attachment.value) ? attachment.value : attachment.value && typeof attachment.value === 'object' && 'uri' in attachment.value && URI.isUri(attachment.value.uri) ? attachment.value.uri : undefined;
 			const range = attachment.value && typeof attachment.value === 'object' && 'range' in attachment.value && Range.isIRange(attachment.value.range) ? attachment.value.range : undefined;
 			if (file && attachment.isFile) {
 				const fileBasename = basename(file.path);
 				const fileDirname = dirname(file.path);
 				const friendlyName = `${fileBasename} ${fileDirname}`;
-				const ariaLabel = range ? localize('chat.fileAttachmentWithRange', "Attached file, {0}, line {1} to line {2}", friendlyName, range.startLineNumber, range.endLineNumber) : localize('chat.fileAttachment', "Attached file, {0}", friendlyName);
+
+				ariaLabel = range ? localize('chat.fileAttachmentWithRange', "Attached file, {0}, line {1} to line {2}", friendlyName, range.startLineNumber, range.endLineNumber) : localize('chat.fileAttachment', "Attached file, {0}", friendlyName);
+				hoverElement = file.fsPath;
 
 				label.setFile(file, {
 					fileKind: FileKind.FILE,
 					hidePath: true,
 					range,
 				});
-				widget.ariaLabel = ariaLabel;
-				widget.tabIndex = 0;
-			} else {
-				const attachmentLabel = attachment.fullName ?? attachment.name;
-				label.setLabel(attachmentLabel, undefined);
+				this.attachButtonAndDisposables(widget, index, attachment, hoverDelegate);
+			} else if (attachment.isImage) {
+				ariaLabel = localize('chat.imageAttachment', "Attached image, {0}", attachment.name);
 
-				widget.ariaLabel = localize('chat.attachment', "Attached context, {0}", attachment.name);
-				widget.tabIndex = 0;
-			}
+				hoverElement = dom.$('div.chat-attached-context-hover');
+				hoverElement.setAttribute('aria-label', ariaLabel);
 
-			const clearButton = new Button(widget, { supportIcons: true });
+				// Custom label
+				const pillIcon = dom.$('div.chat-attached-context-pill', {}, dom.$('span.codicon.codicon-file-media'));
+				const textLabel = dom.$('span.chat-attached-context-custom-text', {}, attachment.name);
+				widget.appendChild(pillIcon);
+				widget.appendChild(textLabel);
 
-			// If this item is rendering in place of the last attached context item, focus the clear button so the user can continue deleting attached context items with the keyboard
-			if (index === Math.min(this._indexOfLastAttachedContextDeletedWithKeyboard, this.attachedContext.size - 1)) {
-				clearButton.focus();
-			}
+				let buffer: Uint8Array;
+				try {
+					if (attachment.value instanceof URI) {
+						this.attachButtonAndDisposables(widget, index, attachment, hoverDelegate);
+						const readFile = await this.fileService.readFile(attachment.value);
+						buffer = readFile.value.buffer;
 
-			this.attachedContextDisposables.add(clearButton);
-			clearButton.icon = Codicon.close;
-			const disp = clearButton.onDidClick((e) => {
-				this.attachedContext.delete(attachment);
-				disp.dispose();
-
-				// Set focus to the next attached context item if deletion was triggered by a keystroke (vs a mouse click)
-				if (dom.isKeyboardEvent(e)) {
-					const event = new StandardKeyboardEvent(e);
-					if (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) {
-						this._indexOfLastAttachedContextDeletedWithKeyboard = index;
+					} else {
+						buffer = attachment.value as Uint8Array;
+						this.attachButtonAndDisposables(widget, index, attachment, hoverDelegate);
 					}
+					this.createImageElements(buffer, widget, hoverElement);
+				} catch (error) {
+					console.error('Error processing attachment:', error);
 				}
 
-				this._onDidChangeHeight.fire();
-				this._onDidDeleteContext.fire(attachment);
-			});
-			this.attachedContextDisposables.add(disp);
+				widget.style.position = 'relative';
+			} else {
+				const attachmentLabel = attachment.fullName ?? attachment.name;
+				const withIcon = attachment.icon?.id ? `$(${attachment.icon.id}) ${attachmentLabel}` : attachmentLabel;
+				label.setLabel(withIcon, undefined);
+
+				ariaLabel = localize('chat.attachment', "Attached context, {0}", attachment.name);
+				hoverElement = attachmentLabel;
+
+				this.attachButtonAndDisposables(widget, index, attachment, hoverDelegate);
+			}
+
+			widget.tabIndex = 0;
+			widget.ariaLabel = ariaLabel;
+			if (!this.attachedContextDisposables.isDisposed) {
+				this.attachedContextDisposables.add(this.hoverService.setupManagedHover(hoverDelegate, widget, hoverElement, { trapFocus: false }));
+			}
 		});
+
+		if (oldHeight !== container.offsetHeight && !isLayout) {
+			this._onDidChangeHeight.fire();
+		}
+	}
+
+	private attachButtonAndDisposables(widget: HTMLElement, index: number, attachment: IChatRequestVariableEntry, hoverDelegate: IHoverDelegate) {
+
+		const clearButton = new Button(widget, {
+			supportIcons: true,
+			hoverDelegate,
+			title: localize('chat.attachment.clearButton', "Remove from context"),
+		});
+
+		// If this item is rendering in place of the last attached context item, focus the clear button so the user can continue deleting attached context items with the keyboard
+		if (index === Math.min(this._indexOfLastAttachedContextDeletedWithKeyboard, this.attachedContext.size - 1)) {
+			clearButton.focus();
+		}
+
+		this.attachedContextDisposables.add(clearButton);
+		clearButton.icon = Codicon.close;
+		const disp = clearButton.onDidClick((e) => {
+			this._attachedContext.delete(attachment);
+			disp.dispose();
+
+			// Set focus to the next attached context item if deletion was triggered by a keystroke (vs a mouse click)
+			if (dom.isKeyboardEvent(e)) {
+				const event = new StandardKeyboardEvent(e);
+				if (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) {
+					this._indexOfLastAttachedContextDeletedWithKeyboard = index;
+				}
+			}
+
+			if (this._attachedContext.size === 0) {
+				this.focus();
+			}
+
+			this._onDidChangeHeight.fire();
+			this._onDidChangeContext.fire({ removed: [attachment] });
+		});
+		this.attachedContextDisposables.add(disp);
+	}
+
+	// Helper function to create and replace image
+	private createImageElements(buffer: ArrayBuffer | Uint8Array, widget: HTMLElement, hoverElement: HTMLElement) {
+		const blob = new Blob([buffer], { type: 'image/png' });
+		const url = URL.createObjectURL(blob);
+		const img = dom.$('img.chat-attached-context-image', { src: url, alt: '' });
+		const pillImg = dom.$('img.chat-attached-context-pill-image', { src: url, alt: '' });
+		const pill = dom.$('div.chat-attached-context-pill', {}, pillImg);
+
+		const existingPill = widget.querySelector('.chat-attached-context-pill');
+		if (existingPill) {
+			existingPill.replaceWith(pill);
+		}
+
+		// Update hover image
+		hoverElement.appendChild(img);
+	}
+
+	async renderChatEditingSessionState(chatEditingSession: IChatEditingSession | null, initialState?: boolean, chatWidget?: IChatWidget) {
+		dom.setVisibility(Boolean(chatEditingSession) || Boolean(initialState), this.chatEditingSessionWidgetContainer);
+
+		if (!chatEditingSession && !initialState) {
+			dom.clearNode(this.chatEditingSessionWidgetContainer);
+			this._chatEditsDisposables.clear();
+			this._chatEditList = undefined;
+			this._chatEditsProgress?.dispose();
+			this._chatEditsProgress = undefined;
+			return;
+		}
+
+		if (this._chatEditList && chatEditingSession?.state.get() === ChatEditingSessionState.Idle) {
+			this._chatEditsProgress?.stop();
+			this._chatEditsProgress?.dispose();
+			this._chatEditsProgress = undefined;
+		}
+
+		// Summary of number of files changed
+		const innerContainer = this.chatEditingSessionWidgetContainer.querySelector('.chat-editing-session-container.show-file-icons') as HTMLElement ?? dom.append(this.chatEditingSessionWidgetContainer, $('.chat-editing-session-container.show-file-icons'));
+		const modifiedFiles = new ResourceSet();
+		const entries: IChatCollapsibleListItem[] = chatEditingSession?.entries.get().map((entry) => {
+			modifiedFiles.add(entry.modifiedURI);
+			return {
+				reference: entry.modifiedURI,
+				kind: 'reference',
+			};
+		}) ?? [];
+		for (const attachment of this._attachedContext) {
+			if (attachment.isFile && URI.isUri(attachment.value) && !modifiedFiles.has(attachment.value)) {
+				entries.unshift({
+					reference: attachment.value,
+					kind: 'reference',
+				});
+				modifiedFiles.add(attachment.value);
+			}
+		}
+		chatEditingSession?.workingSet.get().forEach((file) => {
+			if (!modifiedFiles.has(file)) {
+				entries.unshift({
+					reference: file,
+					kind: 'reference',
+				});
+			}
+		});
+		const overviewRegion = innerContainer.querySelector('.chat-editing-session-overview') as HTMLElement ?? dom.append(innerContainer, $('.chat-editing-session-overview'));
+		if (entries.length !== this._chatEditList?.object.length) {
+			const overviewText = overviewRegion.querySelector('span') ?? dom.append(overviewRegion, $('span'));
+			overviewText.textContent = localize('chatEditingSession.workingSet', 'Working Set');
+
+			if (entries.length === 1) {
+				overviewText.textContent += ' ' + localize('chatEditingSession.oneFile', '(1 file)');
+			} else if (entries.length > 1) {
+				overviewText.textContent += ' ' + localize('chatEditingSession.manyFiles', '({0} files)', entries.length);
+			}
+		}
+
+		// Add File and Clear buttons
+		// Clear out the previous actions (if any)
+		this._chatEditsActionsDisposables.clear();
+		const actionsContainer = innerContainer.querySelector('.chat-editing-session-toolbar-actions') as HTMLElement ?? dom.append(overviewRegion, $('.chat-editing-session-toolbar-actions'));
+
+		const button = this._chatEditsActionsDisposables.add(new Button(actionsContainer, {
+			supportIcons: false,
+			secondary: true
+		}));
+		button.label = localize('chatAddFiles', 'Add Files...');
+		this._chatEditsActionsDisposables.add(button.onDidClick(() => {
+			this.commandService.executeCommand('workbench.action.chat.attachContext', { widget: chatWidget });
+		}));
+		dom.append(actionsContainer, button.element);
+
+		const clearButton = this._chatEditsActionsDisposables.add(new Button(actionsContainer, { supportIcons: true }));
+		clearButton.icon = Codicon.close;
+		this._chatEditsActionsDisposables.add(clearButton.onDidClick((e) => {
+			this.commandService.executeCommand('workbench.action.chat.newEditSession');
+		}));
+		dom.append(actionsContainer, clearButton.element);
+
+		if (!chatEditingSession) {
+			return;
+		}
+
+		if (!this._chatEditsProgress && chatEditingSession.state.get() === ChatEditingSessionState.StreamingEdits) {
+			this._chatEditsProgress = new ProgressBar(innerContainer);
+			this._chatEditsProgress.infinite().show(500);
+		}
+
+		// Working set
+		if (!this._chatEditList) {
+			this._chatEditList = this._chatEditsListPool.get();
+			const list = this._chatEditList.object;
+			this._chatEditsDisposables.add(this._chatEditList);
+			this._chatEditsDisposables.add(list.onDidOpen((e) => {
+				if (e.element?.kind === 'reference' && URI.isUri(e.element.reference)) {
+					const modifiedFileUri = e.element.reference;
+					const editedFile = chatEditingSession.entries.get().find((e) => e.modifiedURI.toString() === modifiedFileUri.toString());
+					if (editedFile?.state.get() === ModifiedFileEntryState.Undecided) {
+						void this.editorService.openEditor({
+							original: { resource: URI.from(editedFile.originalURI, true) },
+							modified: { resource: URI.from(editedFile.modifiedURI, true) },
+						});
+					} else if (editedFile) {
+						void this.editorService.openEditor({ resource: modifiedFileUri });
+					}
+				}
+			}));
+			dom.append(innerContainer, list.getHTMLElement());
+		}
+
+		const maxItemsShown = 6;
+		const itemsShown = Math.min(entries.length, maxItemsShown);
+		const height = itemsShown * 22;
+		const list = this._chatEditList.object;
+		list.layout(height);
+		list.getHTMLElement().style.height = `${height}px`;
+		list.splice(0, list.length, entries);
+
+		//#region Chat editing session actions
+		{
+			const actionsContainer = innerContainer.querySelector('.chat-editing-session-actions') as HTMLElement ?? dom.append(innerContainer, $('.chat-editing-session-actions'));
+			dom.clearNode(actionsContainer);
+			const actionsContainerRight = actionsContainer.querySelector('.chat-editing-session-actions-group') as HTMLElement ?? $('.chat-editing-session-actions-group');
+
+			if (chatEditingSession.entries.get().find((e) => e.state.get() === ModifiedFileEntryState.Undecided)) {
+				// Don't show Accept All / Discard All actions if user already selected Accept All / Discard All
+				const actions = [];
+				actions.push(
+					{
+						command: ChatEditingShowChangesAction.ID,
+						label: ChatEditingShowChangesAction.LABEL,
+						isSecondary: true
+					},
+					{
+						command: ChatEditingDiscardAllAction.ID,
+						label: ChatEditingDiscardAllAction.LABEL,
+						isSecondary: true,
+						container: actionsContainerRight
+					},
+					{
+						command: ChatEditingAcceptAllAction.ID,
+						label: ChatEditingAcceptAllAction.LABEL,
+						isSecondary: false,
+						container: actionsContainerRight
+					}
+				);
+
+				for (const action of actions) {
+					const button = this._chatEditsActionsDisposables.add(new Button(action.container ?? actionsContainer, {
+						supportIcons: false,
+						secondary: action.isSecondary
+					}));
+					button.label = action.label;
+					this._chatEditsActionsDisposables.add(button.onDidClick(() => {
+						this.commandService.executeCommand(action.command);
+					}));
+					dom.append(action.container ?? actionsContainer, button.element);
+				}
+
+				dom.append(actionsContainer, actionsContainerRight);
+			}
+		}
+		//#endregion
 	}
 
 	async renderFollowups(items: IChatFollowup[] | undefined, response: IChatResponseViewModel | undefined): Promise<void> {
@@ -509,11 +1022,12 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		if (items && items.length > 0) {
 			this.followupsDisposables.add(this.instantiationService.createInstance<typeof ChatFollowups<IChatFollowup>, ChatFollowups<IChatFollowup>>(ChatFollowups, this.followupsContainer, items, this.location, undefined, followup => this._onDidAcceptFollowup.fire({ followup, response })));
 		}
+		this._onDidChangeHeight.fire();
 	}
 
 	get contentHeight(): number {
 		const data = this.getLayoutData();
-		return data.followupsHeight + data.inputPartEditorHeight + data.inputPartVerticalPadding + data.inputEditorBorder + data.implicitContextHeight;
+		return data.followupsHeight + data.inputPartEditorHeight + data.inputPartVerticalPadding + data.inputEditorBorder + data.attachmentsHeight + data.toolbarsHeight + data.chatEditingStateHeight;
 	}
 
 	layout(height: number, width: number) {
@@ -524,19 +1038,19 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 
 	private previousInputEditorDimension: IDimension | undefined;
 	private _layout(height: number, width: number, allowRecurse = true): void {
-		this.initAttachedContext(this.attachedContextContainer);
+		this.initAttachedContext(this.attachedContextContainer, true);
 
 		const data = this.getLayoutData();
-
-		const inputEditorHeight = Math.min(data.inputPartEditorHeight, height - data.followupsHeight - data.inputPartVerticalPadding);
+		const inputEditorHeight = Math.min(data.inputPartEditorHeight, height - data.followupsHeight - data.attachmentsHeight - data.inputPartVerticalPadding - data.toolbarsHeight);
 
 		const followupsWidth = width - data.inputPartHorizontalPadding;
 		this.followupsContainer.style.width = `${followupsWidth}px`;
 
-		this._inputPartHeight = data.followupsHeight + inputEditorHeight + data.inputPartVerticalPadding + data.inputEditorBorder + data.implicitContextHeight;
+		this._inputPartHeight = data.inputPartVerticalPadding + data.followupsHeight + inputEditorHeight + data.inputEditorBorder + data.attachmentsHeight + data.toolbarsHeight + data.chatEditingStateHeight;
+		this._followupsHeight = data.followupsHeight;
 
 		const initialEditorScrollWidth = this._inputEditor.getScrollWidth();
-		const newEditorWidth = width - data.inputPartHorizontalPadding - data.editorBorder - data.editorPadding - data.executeToolbarWidth - data.sideToolbarWidth - data.toolbarPadding;
+		const newEditorWidth = width - data.inputPartHorizontalPadding - data.editorBorder - data.inputPartHorizontalPaddingInside - data.toolbarsWidth - data.sideToolbarWidth;
 		const newDimension = { width: newEditorWidth, height: inputEditorHeight };
 		if (!this.previousInputEditorDimension || (this.previousInputEditorDimension.width !== newDimension.width || this.previousInputEditorDimension.height !== newDimension.height)) {
 			// This layout call has side-effects that are hard to understand. eg if we are calling this inside a onDidChangeContent handler, this can trigger the next onDidChangeContent handler
@@ -552,27 +1066,35 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 	}
 
 	private getLayoutData() {
+		const executeToolbarWidth = this.cachedExecuteToolbarWidth = this.executeToolbar.getItemsWidth();
+		const inputToolbarWidth = this.cachedInputToolbarWidth = this.inputActionsToolbar.getItemsWidth();
+		const executeToolbarPadding = (this.executeToolbar.getItemsLength() - 1) * 4;
+		const inputToolbarPadding = this.inputActionsToolbar.getItemsLength() ? (this.inputActionsToolbar.getItemsLength() - 1) * 4 : 0;
 		return {
 			inputEditorBorder: 2,
 			followupsHeight: this.followupsContainer.offsetHeight,
 			inputPartEditorHeight: Math.min(this._inputEditor.getContentHeight(), this.inputEditorMaxHeight),
-			inputPartHorizontalPadding: this.options.renderStyle === 'compact' ? 8 : 40,
-			inputPartVerticalPadding: this.options.renderStyle === 'compact' ? 12 : 24,
-			implicitContextHeight: this.attachedContextContainer.offsetHeight,
+			inputPartHorizontalPadding: this.options.renderStyle === 'compact' ? 16 : 32,
+			inputPartVerticalPadding: this.options.renderStyle === 'compact' ? 12 : 28,
+			attachmentsHeight: this.attachedContextContainer.offsetHeight,
 			editorBorder: 2,
-			editorPadding: 12,
-			toolbarPadding: 4,
-			executeToolbarWidth: this.cachedToolbarWidth = this.toolbar.getItemsWidth(),
+			inputPartHorizontalPaddingInside: 12,
+			toolbarsWidth: this.options.renderStyle === 'compact' ? executeToolbarWidth + executeToolbarPadding + inputToolbarWidth + inputToolbarPadding : 0,
+			toolbarsHeight: this.options.renderStyle === 'compact' ? 0 : 22,
+			chatEditingStateHeight: this.chatEditingSessionWidgetContainer.offsetHeight,
 			sideToolbarWidth: this.inputSideToolbarContainer ? dom.getTotalWidth(this.inputSideToolbarContainer) + 4 /*gap*/ : 0,
 		};
 	}
 
 	saveState(): void {
-		const inputHistory = this.history.getHistory();
+		this.saveCurrentValue(this.getInputState());
+		const inputHistory = [...this.history];
 		this.historyService.saveHistory(this.location, inputHistory);
 	}
 }
 
+const historyKeyFn = (entry: IChatHistoryEntry) => JSON.stringify(entry);
+
 function getLastPosition(model: ITextModel): IPosition {
 	return { lineNumber: model.getLineCount(), column: model.getLineLength(model.getLineCount()) + 1 };
 }
@@ -583,6 +1105,7 @@ class ChatSubmitDropdownActionItem extends DropdownWithPrimaryActionViewItem {
 	constructor(
 		action: MenuItemAction,
 		dropdownAction: IAction,
+		options: IDropdownWithPrimaryActionViewItemOptions,
 		@IMenuService menuService: IMenuService,
 		@IContextMenuService contextMenuService: IContextMenuService,
 		@IChatAgentService chatAgentService: IChatAgentService,
@@ -597,10 +1120,11 @@ class ChatSubmitDropdownActionItem extends DropdownWithPrimaryActionViewItem {
 			dropdownAction,
 			[],
 			'',
-			contextMenuService,
 			{
+				...options,
 				getKeyBinding: (action: IAction) => keybindingService.lookupKeybinding(action.id, contextKeyService)
 			},
+			contextMenuService,
 			keybindingService,
 			notificationService,
 			contextKeyService,
@@ -627,3 +1151,87 @@ class ChatSubmitDropdownActionItem extends DropdownWithPrimaryActionViewItem {
 		this._register(menu.onDidChange(() => setActions()));
 	}
 }
+
+interface ModelPickerDelegate {
+	onDidChangeModel: Event<string>;
+	setModel(selectedModelId: string): void;
+}
+
+class ModelPickerActionViewItem extends MenuEntryActionViewItem {
+	constructor(
+		action: MenuItemAction,
+		private currentLanguageModel: string,
+		private readonly delegate: ModelPickerDelegate,
+		options: IMenuEntryActionViewItemOptions,
+		@IKeybindingService keybindingService: IKeybindingService,
+		@INotificationService notificationService: INotificationService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IThemeService themeService: IThemeService,
+		@IContextMenuService contextMenuService: IContextMenuService,
+		@ILanguageModelsService private readonly _languageModelsService: ILanguageModelsService,
+		@IAccessibilityService _accessibilityService: IAccessibilityService
+	) {
+		super(action, options, keybindingService, notificationService, contextKeyService, themeService, contextMenuService, _accessibilityService);
+
+		this._register(delegate.onDidChangeModel(modelId => {
+			this.currentLanguageModel = modelId;
+			this.updateLabel();
+		}));
+	}
+
+	override async onClick(event: MouseEvent): Promise<void> {
+		this._openContextMenu();
+	}
+
+	override render(container: HTMLElement): void {
+		super.render(container);
+		container.classList.add('chat-modelPicker-item');
+
+		// TODO@roblourens this should be a DropdownMenuActionViewItem, but we can't customize how it's rendered yet.
+		this._register(dom.addDisposableListener(container, dom.EventType.KEY_UP, e => {
+			const event = new StandardKeyboardEvent(e);
+			if (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) {
+				this._openContextMenu();
+			}
+		}));
+	}
+
+	protected override updateLabel(): void {
+		if (this.label) {
+			const model = this._languageModelsService.lookupLanguageModel(this.currentLanguageModel);
+			if (model) {
+				this.label.textContent = model.name;
+				dom.reset(this.label, ...renderLabelWithIcons(`${model.name}$(chevron-down)`));
+			}
+		}
+	}
+
+	private _openContextMenu() {
+		const setLanguageModelAction = (id: string, modelMetadata: ILanguageModelChatMetadata): IAction => {
+			return {
+				id,
+				label: modelMetadata.name,
+				tooltip: '',
+				class: undefined,
+				enabled: true,
+				checked: id === this.currentLanguageModel,
+				run: () => {
+					this.currentLanguageModel = id;
+					this.updateLabel();
+					this.delegate.setModel(id);
+				}
+			};
+		};
+
+		const models = this._languageModelsService.getLanguageModelIds()
+			.map(modelId => ({ id: modelId, model: this._languageModelsService.lookupLanguageModel(modelId)! }))
+			.filter(entry => entry.model?.isUserSelectable);
+		this._contextMenuService.showContextMenu({
+			getAnchor: () => this.element!,
+			getActions: () => models.map(entry => setLanguageModelAction(entry.id, entry.model)),
+		});
+	}
+}
+
+const chatInputEditorContainerSelector = '.interactive-input-editor';
+setupSimpleEditorSelectionStyling(chatInputEditorContainerSelector);
diff --git a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
index d8b214f01d4..505b25d91a3 100644
--- a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
@@ -3,98 +3,88 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { renderFormattedText } from 'vs/base/browser/formattedTextRenderer';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { IActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { alert } from 'vs/base/browser/ui/aria/aria';
-import { Button } from 'vs/base/browser/ui/button/button';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { renderIcon } from 'vs/base/browser/ui/iconLabel/iconLabels';
-import { IListRenderer, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { ITreeCompressionDelegate } from 'vs/base/browser/ui/tree/asyncDataTree';
-import { ICompressedTreeNode } from 'vs/base/browser/ui/tree/compressedObjectTreeModel';
-import { ICompressibleTreeRenderer } from 'vs/base/browser/ui/tree/objectTree';
-import { IAsyncDataSource, ITreeNode, ITreeRenderer } from 'vs/base/browser/ui/tree/tree';
-import { IAction } from 'vs/base/common/actions';
-import { distinct } from 'vs/base/common/arrays';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Codicon } from 'vs/base/common/codicons';
-import { Emitter, Event } from 'vs/base/common/event';
-import { FuzzyScore } from 'vs/base/common/filters';
-import { IMarkdownString, MarkdownString } from 'vs/base/common/htmlContent';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { ResourceMap } from 'vs/base/common/map';
-import { FileAccess, Schemas, matchesSomeScheme } from 'vs/base/common/network';
-import { clamp } from 'vs/base/common/numbers';
-import { autorun } from 'vs/base/common/observable';
-import { basename } from 'vs/base/common/path';
-import { basenameOrAuthority, isEqual } from 'vs/base/common/resources';
-import { equalsIgnoreCase } from 'vs/base/common/strings';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { IMarkdownRenderResult, MarkdownRenderer } from 'vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
-import { Range } from 'vs/editor/common/core/range';
-import { TextEdit } from 'vs/editor/common/languages';
-import { createTextBufferFactoryFromSnapshot } from 'vs/editor/common/model/textModel';
-import { IModelService } from 'vs/editor/common/services/model';
-import { DefaultModelSHA1Computer } from 'vs/editor/common/services/modelService';
-import { IResolvedTextEditorModel, ITextModelService } from 'vs/editor/common/services/resolverService';
-import { localize } from 'vs/nls';
-import { IMenuEntryActionViewItemOptions, MenuEntryActionViewItem, createActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { MenuWorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
-import { MenuId, MenuItemAction } from 'vs/platform/actions/common/actions';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { FileKind, FileType } from 'vs/platform/files/common/files';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { WorkbenchCompressibleAsyncDataTree, WorkbenchList } from 'vs/platform/list/browser/listService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { defaultButtonStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { ColorScheme } from 'vs/platform/theme/common/theme';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IResourceLabel, ResourceLabels } from 'vs/workbench/browser/labels';
-import { ChatTreeItem, GeneratingPhrase, IChatCodeBlockInfo, IChatFileTreeInfo } from 'vs/workbench/contrib/chat/browser/chat';
-import { ChatAgentHover, getChatAgentHoverOptions } from 'vs/workbench/contrib/chat/browser/chatAgentHover';
-import { ChatConfirmationWidget } from 'vs/workbench/contrib/chat/browser/chatConfirmationWidget';
-import { ChatFollowups } from 'vs/workbench/contrib/chat/browser/chatFollowups';
-import { ChatMarkdownDecorationsRenderer } from 'vs/workbench/contrib/chat/browser/chatMarkdownDecorationsRenderer';
-import { ChatEditorOptions } from 'vs/workbench/contrib/chat/browser/chatOptions';
-import { ChatCodeBlockContentProvider, CodeBlockPart, CodeCompareBlockPart, ICodeBlockData, ICodeCompareBlockData, ICodeCompareBlockDiffData, localFileLanguageId, parseLocalFileData } from 'vs/workbench/contrib/chat/browser/codeBlockPart';
-import { ChatAgentLocation, IChatAgentMetadata } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { CONTEXT_CHAT_RESPONSE_SUPPORT_ISSUE_REPORTING, CONTEXT_REQUEST, CONTEXT_RESPONSE, CONTEXT_RESPONSE_DETECTED_AGENT_COMMAND, CONTEXT_RESPONSE_FILTERED, CONTEXT_RESPONSE_VOTE } from 'vs/workbench/contrib/chat/common/chatContextKeys';
-import { IChatProgressRenderableResponseContent, IChatTextEditGroup } from 'vs/workbench/contrib/chat/common/chatModel';
-import { chatSubcommandLeader } from 'vs/workbench/contrib/chat/common/chatParserTypes';
-import { ChatAgentVoteDirection, IChatCommandButton, IChatConfirmation, IChatContentReference, IChatFollowup, IChatProgressMessage, IChatResponseProgressFileTreeData, IChatSendRequestOptions, IChatService, IChatTask, IChatWarningMessage } from 'vs/workbench/contrib/chat/common/chatService';
-import { IChatVariablesService } from 'vs/workbench/contrib/chat/common/chatVariables';
-import { IChatProgressMessageRenderData, IChatRenderData, IChatResponseMarkdownRenderData, IChatResponseViewModel, IChatTaskRenderData, IChatWelcomeMessageViewModel, isRequestVM, isResponseVM, isWelcomeVM } from 'vs/workbench/contrib/chat/common/chatViewModel';
-import { IWordCountResult, getNWords } from 'vs/workbench/contrib/chat/common/chatWordCounter';
-import { createFileIconThemableTreeContainerScope } from 'vs/workbench/contrib/files/browser/views/explorerView';
-import { IFilesConfiguration } from 'vs/workbench/contrib/files/common/files';
-import { IMarkdownVulnerability, annotateSpecialMarkdownContent } from '../common/annotations';
-import { CodeBlockModelCollection } from '../common/codeBlockModelCollection';
-import { IChatListItemRendererOptions } from './chat';
-import { ChatMarkdownRenderer } from 'vs/workbench/contrib/chat/browser/chatMarkdownRenderer';
-import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
+import * as dom from '../../../../base/browser/dom.js';
+import { renderFormattedText } from '../../../../base/browser/formattedTextRenderer.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { IActionViewItemOptions } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { DropdownMenuActionViewItem, IDropdownMenuActionViewItemOptions } from '../../../../base/browser/ui/dropdown/dropdownActionViewItem.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
+import { ITreeNode, ITreeRenderer } from '../../../../base/browser/ui/tree/tree.js';
+import { IAction } from '../../../../base/common/actions.js';
+import { coalesce, distinct } from '../../../../base/common/arrays.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { FuzzyScore } from '../../../../base/common/filters.js';
+import { IMarkdownString, MarkdownString } from '../../../../base/common/htmlContent.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore, IDisposable, dispose, toDisposable } from '../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { FileAccess } from '../../../../base/common/network.js';
+import { clamp } from '../../../../base/common/numbers.js';
+import { autorun } from '../../../../base/common/observable.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { URI } from '../../../../base/common/uri.js';
+import { MarkdownRenderer } from '../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import { localize } from '../../../../nls.js';
+import { IMenuEntryActionViewItemOptions, createActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
+import { MenuId, MenuItemAction } from '../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { ColorScheme } from '../../../../platform/theme/common/theme.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IWorkbenchIssueService } from '../../issue/common/issue.js';
+import { annotateSpecialMarkdownContent } from '../common/annotations.js';
+import { IChatAgentMetadata } from '../common/chatAgents.js';
+import { CONTEXT_CHAT_RESPONSE_SUPPORT_ISSUE_REPORTING, CONTEXT_ITEM_ID, CONTEXT_REQUEST, CONTEXT_RESPONSE, CONTEXT_RESPONSE_DETECTED_AGENT_COMMAND, CONTEXT_RESPONSE_ERROR, CONTEXT_RESPONSE_FILTERED, CONTEXT_RESPONSE_VOTE } from '../common/chatContextKeys.js';
+import { IChatRequestVariableEntry, IChatTextEditGroup } from '../common/chatModel.js';
+import { chatSubcommandLeader } from '../common/chatParserTypes.js';
+import { ChatAgentVoteDirection, ChatAgentVoteDownReason, IChatConfirmation, IChatContentReference, IChatFollowup, IChatTask, IChatToolInvocation, IChatToolInvocationSerialized, IChatTreeData } from '../common/chatService.js';
+import { IChatCodeCitations, IChatReferences, IChatRendererContent, IChatRequestViewModel, IChatResponseViewModel, isRequestVM, isResponseVM } from '../common/chatViewModel.js';
+import { getNWords } from '../common/chatWordCounter.js';
+import { CodeBlockModelCollection } from '../common/codeBlockModelCollection.js';
+import { MarkUnhelpfulActionId } from './actions/chatTitleActions.js';
+import { ChatTreeItem, GeneratingPhrase, IChatCodeBlockInfo, IChatFileTreeInfo, IChatListItemRendererOptions } from './chat.js';
+import { ChatAgentHover, getChatAgentHoverOptions } from './chatAgentHover.js';
+import { ChatAttachmentsContentPart } from './chatContentParts/chatAttachmentsContentPart.js';
+import { ChatCodeCitationContentPart } from './chatContentParts/chatCodeCitationContentPart.js';
+import { ChatCommandButtonContentPart } from './chatContentParts/chatCommandContentPart.js';
+import { ChatConfirmationContentPart } from './chatContentParts/chatConfirmationContentPart.js';
+import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts/chatContentParts.js';
+import { ChatMarkdownContentPart, EditorPool } from './chatContentParts/chatMarkdownContentPart.js';
+import { ChatProgressContentPart } from './chatContentParts/chatProgressContentPart.js';
+import { ChatCollapsibleListContentPart, CollapsibleListPool } from './chatContentParts/chatReferencesContentPart.js';
+import { ChatTaskContentPart } from './chatContentParts/chatTaskContentPart.js';
+import { ChatTextEditContentPart, DiffEditorPool } from './chatContentParts/chatTextEditContentPart.js';
+import { ChatToolInvocationPart } from './chatContentParts/chatToolInvocationPart.js';
+import { ChatTreeContentPart, TreePool } from './chatContentParts/chatTreeContentPart.js';
+import { ChatWarningContentPart } from './chatContentParts/chatWarningContentPart.js';
+import { ChatMarkdownDecorationsRenderer } from './chatMarkdownDecorationsRenderer.js';
+import { ChatMarkdownRenderer } from './chatMarkdownRenderer.js';
+import { ChatEditorOptions } from './chatOptions.js';
+import { ChatCodeBlockContentProvider, CodeBlockPart } from './codeBlockPart.js';
 
 const $ = dom.$;
 
 interface IChatListItemTemplate {
 	currentElement?: ChatTreeItem;
+	renderedParts?: IChatContentPart[];
 	readonly rowContainer: HTMLElement;
 	readonly titleToolbar?: MenuWorkbenchToolBar;
+	readonly footerToolbar: MenuWorkbenchToolBar;
 	readonly avatarContainer: HTMLElement;
 	readonly username: HTMLElement;
 	readonly detail: HTMLElement;
 	readonly value: HTMLElement;
-	readonly referencesListContainer: HTMLElement;
 	readonly contextKeyService: IContextKeyService;
+	readonly instantiationService: IInstantiationService;
 	readonly templateDisposables: IDisposable;
 	readonly elementDisposables: DisposableStore;
 	readonly agentHover: ChatAgentHover;
@@ -105,11 +95,9 @@ interface IItemHeightChangeParams {
 	height: number;
 }
 
-interface IChatMarkdownRenderResult extends IMarkdownRenderResult {
-	codeBlockCount: number;
-}
-
-const forceVerboseLayoutTracing = false;
+const forceVerboseLayoutTracing = false
+	// || Boolean("TRUE") // causes a linter warning so that it cannot be pushed
+	;
 
 export interface IChatRendererDelegate {
 	getListLength(): number;
@@ -141,17 +129,14 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 	private readonly _editorPool: EditorPool;
 	private readonly _diffEditorPool: DiffEditorPool;
 	private readonly _treePool: TreePool;
-	private readonly _contentReferencesListPool: ContentReferencesListPool;
+	private readonly _contentReferencesListPool: CollapsibleListPool;
 
 	private _currentLayoutWidth: number = 0;
 	private _isVisible = true;
 	private _onDidChangeVisibility = this._register(new Emitter<boolean>());
 
-	private _usedReferencesEnabled = false;
-
 	constructor(
 		editorOptions: ChatEditorOptions,
-		private readonly location: ChatAgentLocation,
 		private readonly rendererOptions: IChatListItemRendererOptions,
 		private readonly delegate: IChatRendererDelegate,
 		private readonly codeBlockModelCollection: CodeBlockModelCollection,
@@ -159,14 +144,10 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IConfigurationService configService: IConfigurationService,
 		@ILogService private readonly logService: ILogService,
-		@IOpenerService private readonly openerService: IOpenerService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IThemeService private readonly themeService: IThemeService,
 		@ICommandService private readonly commandService: ICommandService,
-		@ITextModelService private readonly textModelService: ITextModelService,
-		@IModelService private readonly modelService: IModelService,
 		@IHoverService private readonly hoverService: IHoverService,
-		@IChatService private readonly chatService: IChatService,
 	) {
 		super();
 
@@ -175,23 +156,16 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		this._editorPool = this._register(this.instantiationService.createInstance(EditorPool, editorOptions, delegate, overflowWidgetsDomNode));
 		this._diffEditorPool = this._register(this.instantiationService.createInstance(DiffEditorPool, editorOptions, delegate, overflowWidgetsDomNode));
 		this._treePool = this._register(this.instantiationService.createInstance(TreePool, this._onDidChangeVisibility.event));
-		this._contentReferencesListPool = this._register(this.instantiationService.createInstance(ContentReferencesListPool, this._onDidChangeVisibility.event));
+		this._contentReferencesListPool = this._register(this.instantiationService.createInstance(CollapsibleListPool, this._onDidChangeVisibility.event, undefined, undefined));
 
 		this._register(this.instantiationService.createInstance(ChatCodeBlockContentProvider));
-
-		this._usedReferencesEnabled = configService.getValue('chat.experimental.usedReferences') ?? true;
-		this._register(configService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration('chat.experimental.usedReferences')) {
-				this._usedReferencesEnabled = configService.getValue('chat.experimental.usedReferences') ?? true;
-			}
-		}));
 	}
 
 	get templateId(): string {
 		return ChatListItemRenderer.ID;
 	}
 
-	editorsInUse() {
+	editorsInUse(): Iterable<CodeBlockPart> {
 		return this._editorPool.inUse();
 	}
 
@@ -203,21 +177,19 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		}
 	}
 
+	/**
+	 * Compute a rate to render at in words/s.
+	 */
 	private getProgressiveRenderRate(element: IChatResponseViewModel): number {
 		if (element.isComplete) {
 			return 80;
 		}
 
 		if (element.contentUpdateTimings && element.contentUpdateTimings.impliedWordLoadRate) {
-			// words/s
-			const minRate = 12;
+			const minRate = 5;
 			const maxRate = 80;
 
-			// This doesn't account for dead time after the last update. When the previous update is the final one and the model is only waiting for followupQuestions, that's good.
-			// When there was one quick update and then you are waiting longer for the next one, that's not good since the rate should be decreasing.
-			// If it's an issue, we can change this to be based on the total time from now to the beginning.
-			const rateBoost = 1.5;
-			const rate = element.contentUpdateTimings.impliedWordLoadRate * rateBoost;
+			const rate = element.contentUpdateTimings.impliedWordLoadRate;
 			return clamp(rate, minRate, maxRate);
 		}
 
@@ -271,44 +243,74 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		if (this.rendererOptions.noPadding) {
 			rowContainer.classList.add('no-padding');
 		}
-		const header = dom.append(rowContainer, $('.header'));
+
+		let headerParent = rowContainer;
+		let valueParent = rowContainer;
+		let detailContainerParent: HTMLElement | undefined;
+		let toolbarParent: HTMLElement | undefined;
+
+		if (this.rendererOptions.renderStyle === 'minimal') {
+			rowContainer.classList.add('interactive-item-compact');
+			rowContainer.classList.add('minimal');
+			// -----------------------------------------------------
+			//  icon | details
+			//       | references
+			//       | value
+			// -----------------------------------------------------
+			const lhsContainer = dom.append(rowContainer, $('.column.left'));
+			const rhsContainer = dom.append(rowContainer, $('.column.right'));
+
+			headerParent = lhsContainer;
+			detailContainerParent = rhsContainer;
+			valueParent = rhsContainer;
+			toolbarParent = dom.append(rowContainer, $('.header'));
+		}
+
+		const header = dom.append(headerParent, $('.header'));
 		const user = dom.append(header, $('.user'));
 		user.tabIndex = 0;
 		user.role = 'toolbar';
 		const avatarContainer = dom.append(user, $('.avatar-container'));
 		const username = dom.append(user, $('h3.username'));
-		const detailContainer = dom.append(user, $('span.detail-container'));
+		const detailContainer = dom.append(detailContainerParent ?? user, $('span.detail-container'));
 		const detail = dom.append(detailContainer, $('span.detail'));
 		dom.append(detailContainer, $('span.chat-animated-ellipsis'));
-		const referencesListContainer = dom.append(rowContainer, $('.referencesListContainer'));
-		const value = dom.append(rowContainer, $('.value'));
+		const value = dom.append(valueParent, $('.value'));
 		const elementDisposables = new DisposableStore();
 
 		const contextKeyService = templateDisposables.add(this.contextKeyService.createScoped(rowContainer));
-		const scopedInstantiationService = this.instantiationService.createChild(new ServiceCollection([IContextKeyService, contextKeyService]));
+		const scopedInstantiationService = templateDisposables.add(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, contextKeyService])));
+
 		let titleToolbar: MenuWorkbenchToolBar | undefined;
 		if (this.rendererOptions.noHeader) {
 			header.classList.add('hidden');
 		} else {
-			titleToolbar = templateDisposables.add(scopedInstantiationService.createInstance(MenuWorkbenchToolBar, header, MenuId.ChatMessageTitle, {
+			titleToolbar = templateDisposables.add(scopedInstantiationService.createInstance(MenuWorkbenchToolBar, toolbarParent ?? header, MenuId.ChatMessageTitle, {
 				menuOptions: {
 					shouldForwardArgs: true
 				},
 				toolbarOptions: {
 					shouldInlineSubmenu: submenu => submenu.actions.length <= 1
 				},
-				actionViewItemProvider: (action: IAction, options: IActionViewItemOptions) => {
-					if (action instanceof MenuItemAction && (action.item.id === 'workbench.action.chat.voteDown' || action.item.id === 'workbench.action.chat.voteUp')) {
-						return scopedInstantiationService.createInstance(ChatVoteButton, action, options as IMenuEntryActionViewItemOptions);
-					}
-					return createActionViewItem(scopedInstantiationService, action, options);
-				}
 			}));
 		}
 
+		const footerToolbarContainer = dom.append(rowContainer, $('.chat-footer-toolbar'));
+		const footerToolbar = templateDisposables.add(scopedInstantiationService.createInstance(MenuWorkbenchToolBar, footerToolbarContainer, MenuId.ChatMessageFooter, {
+			eventDebounceDelay: 0,
+			menuOptions: { shouldForwardArgs: true },
+			toolbarOptions: { shouldInlineSubmenu: submenu => submenu.actions.length <= 1 },
+			actionViewItemProvider: (action: IAction, options: IActionViewItemOptions) => {
+				if (action instanceof MenuItemAction && action.item.id === MarkUnhelpfulActionId) {
+					return scopedInstantiationService.createInstance(ChatVoteDownButton, action, options as IMenuEntryActionViewItemOptions);
+				}
+				return createActionViewItem(scopedInstantiationService, action, options);
+			}
+		}));
+
 		const agentHover = templateDisposables.add(this.instantiationService.createInstance(ChatAgentHover));
 		const hoverContent = () => {
-			if (isResponseVM(template.currentElement) && template.currentElement.agent) {
+			if (isResponseVM(template.currentElement) && template.currentElement.agent && !template.currentElement.agent.isDefault) {
 				agentHover.setAgent(template.currentElement.agent.id);
 				return agentHover.domNode;
 			}
@@ -328,7 +330,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 				this.hoverService.hideHover();
 			}
 		}));
-		const template: IChatListItemTemplate = { avatarContainer, username, detail, referencesListContainer, value, rowContainer, elementDisposables, titleToolbar, templateDisposables, contextKeyService, agentHover };
+		const template: IChatListItemTemplate = { avatarContainer, username, detail, value, rowContainer, elementDisposables, templateDisposables, contextKeyService, instantiationService: scopedInstantiationService, agentHover, titleToolbar, footerToolbar };
 		return template;
 	}
 
@@ -344,6 +346,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		this.traceLayout('renderElement', `${kind}, index=${index}`);
 
 		CONTEXT_RESPONSE.bindTo(templateData.contextKeyService).set(isResponseVM(element));
+		CONTEXT_ITEM_ID.bindTo(templateData.contextKeyService).set(element.id);
 		CONTEXT_REQUEST.bindTo(templateData.contextKeyService).set(isRequestVM(element));
 		CONTEXT_RESPONSE_DETECTED_AGENT_COMMAND.bindTo(templateData.contextKeyService).set(isResponseVM(element) && element.agentOrSlashCommandDetected);
 		if (isResponseVM(element)) {
@@ -356,14 +359,14 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		if (templateData.titleToolbar) {
 			templateData.titleToolbar.context = element;
 		}
+		templateData.footerToolbar.context = element;
 
+		CONTEXT_RESPONSE_ERROR.bindTo(templateData.contextKeyService).set(isResponseVM(element) && !!element.errorDetails);
 		const isFiltered = !!(isResponseVM(element) && element.errorDetails?.responseIsFiltered);
 		CONTEXT_RESPONSE_FILTERED.bindTo(templateData.contextKeyService).set(isFiltered);
 
 		templateData.rowContainer.classList.toggle('interactive-request', isRequestVM(element));
 		templateData.rowContainer.classList.toggle('interactive-response', isResponseVM(element));
-		templateData.rowContainer.classList.toggle('interactive-welcome', isWelcomeVM(element));
-		templateData.rowContainer.classList.toggle('filtered-response', isFiltered);
 		templateData.rowContainer.classList.toggle('show-detail-progress', isResponseVM(element) && !element.isComplete && !element.progressMessages.length);
 		templateData.username.textContent = element.username;
 		if (!this.rendererOptions.noHeader) {
@@ -375,40 +378,36 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 			this.renderDetail(element, templateData);
 		}
 
+		if (isRequestVM(element) && element.confirmation) {
+			this.renderConfirmationAction(element, templateData);
+		}
+
 		// Do a progressive render if
 		// - This the last response in the list
 		// - And it has some content
 		// - And the response is not complete
 		//   - Or, we previously started a progressive rendering of this element (if the element is complete, we will finish progressive rendering with a very fast rate)
-		// - And, the feature is not disabled in configuration
 		if (isResponseVM(element) && index === this.delegate.getListLength() - 1 && (!element.isComplete || element.renderData) && element.response.value.length) {
-			this.traceLayout('renderElement', `start progressive render ${kind}, index=${index}`);
+			this.traceLayout('renderElement', `start progressive render, index=${index}`);
 
-			const progressiveRenderingDisposables = templateData.elementDisposables.add(new DisposableStore());
 			const timer = templateData.elementDisposables.add(new dom.WindowIntervalTimer());
 			const runProgressiveRender = (initial?: boolean) => {
 				try {
-					if (this.doNextProgressiveRender(element, index, templateData, !!initial, progressiveRenderingDisposables)) {
+					if (this.doNextProgressiveRender(element, index, templateData, !!initial)) {
 						timer.cancel();
 					}
 				} catch (err) {
 					// Kill the timer if anything went wrong, avoid getting stuck in a nasty rendering loop.
 					timer.cancel();
-					throw err;
+					this.logService.error(err);
 				}
 			};
 			timer.cancelAndSet(runProgressiveRender, 50, dom.getWindow(templateData.rowContainer));
 			runProgressiveRender(true);
 		} else if (isResponseVM(element)) {
-			const renderableResponse = annotateSpecialMarkdownContent(element.response.value);
-			this.basicRenderElement(renderableResponse, element, index, templateData);
+			this.basicRenderElement(element, index, templateData);
 		} else if (isRequestVM(element)) {
-			const markdown = 'message' in element.message ?
-				element.message.message :
-				this.markdownDecorationsRenderer.convertParsedRequestToMarkdown(element.message);
-			this.basicRenderElement([{ content: new MarkdownString(markdown), kind: 'markdownContent' }], element, index, templateData);
-		} else {
-			this.renderWelcomeMessage(element, templateData);
+			this.basicRenderElement(element, index, templateData);
 		}
 	}
 
@@ -422,14 +421,8 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 
 		dom.clearNode(templateData.detail);
 
-		if (element.slashCommand && element.agentOrSlashCommandDetected) {
-			let msg: string = '';
-			const usingMsg = `${chatSubcommandLeader}${element.slashCommand.name}`;
-			if (element.isComplete) {
-				msg = localize('usedAgent', "used {0} [[(rerun without)]]", usingMsg);
-			} else {
-				msg = localize('usingAgent', "using {0}", usingMsg);
-			}
+		if (element.agentOrSlashCommandDetected) {
+			const msg = element.slashCommand ? localize('usedAgentSlashCommand', "used {0} [[(rerun without)]]", `${chatSubcommandLeader}${element.slashCommand.name}`) : localize('usedAgent', "[[(rerun without)]]");
 			dom.reset(templateData.detail, renderFormattedText(msg, {
 				className: 'agentOrSlashCommandDetected',
 				inline: true,
@@ -446,6 +439,13 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		}
 	}
 
+	private renderConfirmationAction(element: IChatRequestViewModel, templateData: IChatListItemTemplate) {
+		dom.clearNode(templateData.detail);
+		if (element.confirmation) {
+			templateData.detail.textContent = localize('chatConfirmationAction', 'selected "{0}"', element.confirmation);
+		}
+	}
+
 	private renderAvatar(element: ChatTreeItem, templateData: IChatListItemTemplate): void {
 		const icon = isResponseVM(element) ?
 			this.getAgentIcon(element.agent?.metadata) :
@@ -472,47 +472,69 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		}
 	}
 
-	private basicRenderElement(value: ReadonlyArray<IChatProgressRenderableResponseContent>, element: ChatTreeItem, index: number, templateData: IChatListItemTemplate) {
-		const fillInIncompleteTokens = isResponseVM(element) && (!element.isComplete || element.isCanceled || element.errorDetails?.responseIsFiltered || element.errorDetails?.responseIsIncomplete);
+	private basicRenderElement(element: ChatTreeItem, index: number, templateData: IChatListItemTemplate) {
+		templateData.rowContainer.classList.toggle('chat-response-loading', isResponseVM(element) && !element.isComplete);
+
+		let value: IChatRendererContent[] = [];
+		if (isRequestVM(element) && !element.confirmation) {
+			const markdown = 'message' in element.message ?
+				element.message.message :
+				this.markdownDecorationsRenderer.convertParsedRequestToMarkdown(element.message);
+			value = [{ content: new MarkdownString(markdown), kind: 'markdownContent' }];
+		} else if (isResponseVM(element)) {
+			if (element.contentReferences.length) {
+				value.push({ kind: 'references', references: element.contentReferences });
+			}
+			value.push(...annotateSpecialMarkdownContent(element.response.value));
+			if (element.codeCitations.length) {
+				value.push({ kind: 'codeCitations', citations: element.codeCitations });
+			}
+		}
 
 		dom.clearNode(templateData.value);
-		dom.clearNode(templateData.referencesListContainer);
 
 		if (isResponseVM(element)) {
 			this.renderDetail(element, templateData);
 		}
 
-		this.renderContentReferencesIfNeeded(element, templateData, templateData.elementDisposables);
+		const isFiltered = !!(isResponseVM(element) && element.errorDetails?.responseIsFiltered);
 
-		let fileTreeIndex = 0;
-		let codeBlockIndex = 0;
-		value.forEach((data, index) => {
-			const result = data.kind === 'treeData'
-				? this.renderTreeData(data.treeData, element, templateData, fileTreeIndex++)
-				: data.kind === 'markdownContent'
-					? this.renderMarkdown(data.content, element, templateData, fillInIncompleteTokens, codeBlockIndex)
-					: data.kind === 'progressMessage' && onlyProgressMessagesAfterI(value, index) ? this.renderProgressMessage(data, false) // TODO render command
-						: data.kind === 'progressTask' ? this.renderProgressTask(data, false, element, templateData)
-							: data.kind === 'command' ? this.renderCommandButton(element, data)
-								: data.kind === 'textEditGroup' ? this.renderTextEdit(element, data, templateData)
-									: data.kind === 'warning' ? this.renderNotification('warning', data.content)
-										: data.kind === 'confirmation' ? this.renderConfirmation(element, data, templateData)
-											: undefined;
+		const parts: IChatContentPart[] = [];
+		if (!isFiltered) {
+			value.forEach((data, index) => {
+				const context: IChatContentPartRenderContext = {
+					element,
+					contentIndex: index,
+					content: value,
+					preceedingContentParts: parts,
+				};
+				const newPart = this.renderChatContentPart(data, templateData, context);
+				if (newPart) {
+					templateData.value.appendChild(newPart.domNode);
+					parts.push(newPart);
+				}
+			});
+		}
 
-			if (result) {
-				templateData.value.appendChild(result.element);
-				templateData.elementDisposables.add(result);
+		if (templateData.renderedParts) {
+			dispose(templateData.renderedParts);
+		}
+		templateData.renderedParts = parts;
 
-				if ('codeBlockCount' in result) {
-					codeBlockIndex += (result as IChatMarkdownRenderResult).codeBlockCount;
+		if (!isFiltered) {
+			if (isRequestVM(element) && element.variables.length) {
+				const newPart = this.renderAttachments(element.variables, element.contentReferences, templateData);
+				if (newPart) {
+					templateData.value.appendChild(newPart.domNode);
+					templateData.elementDisposables.add(newPart);
 				}
 			}
-		});
+		}
 
 		if (isResponseVM(element) && element.errorDetails?.message) {
-			const renderedError = this.renderNotification(element.errorDetails.responseIsFiltered ? 'info' : 'error', new MarkdownString(element.errorDetails.message));
+			const renderedError = this.instantiationService.createInstance(ChatWarningContentPart, element.errorDetails.responseIsFiltered ? 'info' : 'error', new MarkdownString(element.errorDetails.message), this.renderer);
 			templateData.elementDisposables.add(renderedError);
-			templateData.value.appendChild(renderedError.element);
+			templateData.value.appendChild(renderedError.domNode);
 		}
 
 		const newHeight = templateData.rowContainer.offsetHeight;
@@ -539,691 +561,148 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		this._onDidChangeItemHeight.fire({ element: templateData.currentElement, height: newHeight });
 	}
 
-	private renderWelcomeMessage(element: IChatWelcomeMessageViewModel, templateData: IChatListItemTemplate) {
-		dom.clearNode(templateData.value);
-		dom.clearNode(templateData.referencesListContainer);
-		dom.hide(templateData.referencesListContainer);
-
-		for (const item of element.content) {
-			if (Array.isArray(item)) {
-				const scopedInstaService = this.instantiationService.createChild(new ServiceCollection([IContextKeyService, templateData.contextKeyService]));
-				templateData.elementDisposables.add(
-					scopedInstaService.createInstance<typeof ChatFollowups<IChatFollowup>, ChatFollowups<IChatFollowup>>(
-						ChatFollowups,
-						templateData.value,
-						item,
-						this.location,
-						undefined,
-						followup => this._onDidClickFollowup.fire(followup)));
-			} else {
-				const result = this.renderMarkdown(item as IMarkdownString, element, templateData);
-				templateData.value.appendChild(result.element);
-				templateData.elementDisposables.add(result);
-			}
-		}
-
-		const newHeight = templateData.rowContainer.offsetHeight;
-		const fireEvent = !element.currentRenderedHeight || element.currentRenderedHeight !== newHeight;
-		element.currentRenderedHeight = newHeight;
-		if (fireEvent) {
-			const disposable = templateData.elementDisposables.add(dom.scheduleAtNextAnimationFrame(dom.getWindow(templateData.value), () => {
-				// Have to recompute the height here because codeblock rendering is currently async and it may have changed.
-				// If it becomes properly sync, then this could be removed.
-				element.currentRenderedHeight = templateData.rowContainer.offsetHeight;
-				disposable.dispose();
-				this._onDidChangeItemHeight.fire({ element, height: element.currentRenderedHeight });
-			}));
-		}
-	}
-
 	/**
 	 *	@returns true if progressive rendering should be considered complete- the element's data is fully rendered or the view is not visible
 	 */
-	private doNextProgressiveRender(element: IChatResponseViewModel, index: number, templateData: IChatListItemTemplate, isInRenderElement: boolean, disposables: DisposableStore): boolean {
+	private doNextProgressiveRender(element: IChatResponseViewModel, index: number, templateData: IChatListItemTemplate, isInRenderElement: boolean): boolean {
 		if (!this._isVisible) {
 			return true;
 		}
 
-		const renderableResponse = annotateSpecialMarkdownContent(element.response.value);
-		let isFullyRendered = false;
 		if (element.isCanceled) {
-			this.traceLayout('runProgressiveRender', `canceled, index=${index}`);
+			this.traceLayout('doNextProgressiveRender', `canceled, index=${index}`);
 			element.renderData = undefined;
-			this.basicRenderElement(renderableResponse, element, index, templateData);
-			isFullyRendered = true;
-		} else {
-			// Figure out what we need to render in addition to what has already been rendered
-			element.renderData ??= { renderedParts: [] };
-			const renderedParts = element.renderData.renderedParts;
-			const wordCountResults: IWordCountResult[] = [];
-			const partsToRender: IChatRenderData[] = [];
-
-			let somePartIsNotFullyRendered = false;
-			renderableResponse.forEach((part, index) => {
-				const renderedPart = renderedParts[index];
-				// Is this part completely new?
-				if (!renderedPart) {
-					if (part.kind === 'treeData') {
-						partsToRender[index] = part.treeData;
-					} else if (part.kind === 'progressMessage') {
-						partsToRender[index] = {
-							progressMessage: part,
-							isAtEndOfResponse: onlyProgressMessagesAfterI(renderableResponse, index),
-							isLast: index === renderableResponse.length - 1,
-						} satisfies IChatProgressMessageRenderData;
-					} else if (part.kind === 'command' ||
-						part.kind === 'textEditGroup' ||
-						part.kind === 'confirmation' ||
-						part.kind === 'warning') {
-						partsToRender[index] = part;
-					} else if (part.kind === 'progressTask') {
-						partsToRender[index] = {
-							task: part,
-							isSettled: part.isSettled?.() ?? true,
-							progressLength: part.progress.length,
-						};
-					} else {
-						const wordCountResult = this.getDataForProgressiveRender(element, contentToMarkdown(part.content), { renderedWordCount: 0, lastRenderTime: 0 });
-						if (wordCountResult !== undefined) {
-							this.traceLayout('doNextProgressiveRender', `Rendering new part ${index}, wordCountResult=${wordCountResult.actualWordCount}, rate=${wordCountResult.rate}`);
-							partsToRender[index] = {
-								renderedWordCount: wordCountResult.actualWordCount,
-								lastRenderTime: Date.now(),
-								isFullyRendered: wordCountResult.isFullString,
-								originalMarkdown: part.content,
-							};
-							wordCountResults[index] = wordCountResult;
-						}
-					}
-				}
-
-				// Did this part's content change?
-				else if ((part.kind === 'markdownContent' || part.kind === 'progressMessage') && isMarkdownRenderData(renderedPart)) { // TODO
-					const wordCountResult = this.getDataForProgressiveRender(element, contentToMarkdown(part.content), renderedPart);
-					// Check if there are any new words to render
-					if (wordCountResult !== undefined && renderedPart.renderedWordCount !== wordCountResult?.actualWordCount) {
-						this.traceLayout('doNextProgressiveRender', `Rendering changed part ${index}, wordCountResult=${wordCountResult.actualWordCount}, rate=${wordCountResult.rate}`);
-						partsToRender[index] = {
-							renderedWordCount: wordCountResult.actualWordCount,
-							lastRenderTime: Date.now(),
-							isFullyRendered: wordCountResult.isFullString,
-							originalMarkdown: part.content,
-						};
-						wordCountResults[index] = wordCountResult;
-					} else if (!renderedPart.isFullyRendered && !wordCountResult) {
-						// This part is not fully rendered, but not enough time has passed to render more content
-						somePartIsNotFullyRendered = true;
-					}
-				}
-
-				// Is it a progress message that needs to be rerendered?
-				else if (part.kind === 'progressMessage' && isProgressMessageRenderData(renderedPart) && (
-					(renderedPart.isAtEndOfResponse !== onlyProgressMessagesAfterI(renderableResponse, index)) ||
-					renderedPart.isLast !== (index === renderableResponse.length - 1))) {
-					partsToRender[index] = {
-						progressMessage: part,
-						isAtEndOfResponse: onlyProgressMessagesAfterI(renderableResponse, index),
-						isLast: index === renderableResponse.length - 1,
-					} satisfies IChatProgressMessageRenderData;
-				}
-
-				else if (part.kind === 'progressTask' && isProgressTaskRenderData(renderedPart)) {
-					const isSettled = part.isSettled?.() ?? true;
-					if (renderedPart.isSettled !== isSettled || part.progress.length !== renderedPart.progressLength || isSettled) {
-						partsToRender[index] = { task: part, isSettled, progressLength: part.progress.length };
-					}
-				}
-			});
-
-			isFullyRendered = partsToRender.filter((p) => !('isSettled' in p) || !p.isSettled).length === 0 && !somePartIsNotFullyRendered;
-
-			if (isFullyRendered && element.isComplete) {
-				// Response is done and content is rendered, so do a normal render
-				this.traceLayout('runProgressiveRender', `end progressive render, index=${index} and clearing renderData, response is complete, index=${index}`);
-				element.renderData = undefined;
-				disposables.clear();
-				this.basicRenderElement(renderableResponse, element, index, templateData);
-			} else if (!isFullyRendered) {
-				disposables.clear();
-				this.renderContentReferencesIfNeeded(element, templateData, disposables);
-				let hasRenderedOneMarkdownBlock = false;
-				partsToRender.forEach((partToRender, index) => {
-					if (!partToRender) {
-						return;
-					}
-
-					// Undefined => don't do anything. null => remove the rendered element
-					let result: { element: HTMLElement } & IDisposable | undefined | null;
-					if (isInteractiveProgressTreeData(partToRender)) {
-						result = this.renderTreeData(partToRender, element, templateData, index);
-					} else if (isProgressMessageRenderData(partToRender)) {
-						if (onlyProgressMessageRenderDatasAfterI(partsToRender, index)) {
-							result = this.renderProgressMessage(partToRender.progressMessage, index === partsToRender.length - 1);
-						} else {
-							result = null;
-						}
-					} else if (isProgressTaskRenderData(partToRender)) {
-						result = this.renderProgressTask(partToRender.task, !partToRender.isSettled, element, templateData);
-					} else if (isCommandButtonRenderData(partToRender)) {
-						result = this.renderCommandButton(element, partToRender);
-					} else if (isTextEditRenderData(partToRender)) {
-						result = this.renderTextEdit(element, partToRender, templateData);
-					} else if (isConfirmationRenderData(partToRender)) {
-						result = this.renderConfirmation(element, partToRender, templateData);
-					} else if (isWarningRenderData(partToRender)) {
-						result = this.renderNotification('warning', partToRender.content);
-					}
-
-					// Avoid doing progressive rendering for multiple markdown parts simultaneously
-					else if (!hasRenderedOneMarkdownBlock && wordCountResults[index]) {
-						const { value } = wordCountResults[index];
-						const part = partsToRender[index];
-						const originalMarkdown = 'originalMarkdown' in part ? part.originalMarkdown : undefined;
-						const markdownToRender = new MarkdownString(value, originalMarkdown);
-						result = this.renderMarkdown(markdownToRender, element, templateData, true);
-						hasRenderedOneMarkdownBlock = true;
-					}
-
-					if (result === undefined) {
-						return;
-					}
-
-					// Doing the progressive render
-					renderedParts[index] = partToRender;
-					const existingElement = templateData.value.children[index];
-					if (existingElement) {
-						if (result === null) {
-							templateData.value.replaceChild($('span.placeholder-for-deleted-thing'), existingElement);
-						} else {
-							templateData.value.replaceChild(result.element, existingElement);
-						}
-					} else if (result) {
-						templateData.value.appendChild(result.element);
-					}
-
-					if (result) {
-						disposables.add(result);
-					}
-				});
-			} else {
-				// Nothing new to render, not done, keep waiting
-				return false;
-			}
+			this.basicRenderElement(element, index, templateData);
+			return true;
 		}
 
-		// Some render happened - update the height
+		templateData.rowContainer.classList.toggle('chat-response-loading', true);
+		let isFullyRendered = false;
+		this.traceLayout('doNextProgressiveRender', `START progressive render, index=${index}, renderData=${JSON.stringify(element.renderData)}`);
+		const contentForThisTurn = this.getNextProgressiveRenderContent(element);
+		const partsToRender = this.diff(templateData.renderedParts ?? [], contentForThisTurn, element);
+		isFullyRendered = partsToRender.every(part => part === null);
+
+		if (isFullyRendered) {
+			if (element.isComplete) {
+				// Response is done and content is rendered, so do a normal render
+				this.traceLayout('doNextProgressiveRender', `END progressive render, index=${index} and clearing renderData, response is complete`);
+				element.renderData = undefined;
+				this.basicRenderElement(element, index, templateData);
+				return true;
+			}
+
+			// Nothing new to render, not done, keep waiting
+			this.traceLayout('doNextProgressiveRender', 'caught up with the stream- no new content to render');
+			return true;
+		}
+
+		// Do an actual progressive render
+		this.traceLayout('doNextProgressiveRender', `doing progressive render, ${partsToRender.length} parts to render`);
+		this.renderChatContentDiff(partsToRender, contentForThisTurn, element, templateData);
+
 		const height = templateData.rowContainer.offsetHeight;
 		element.currentRenderedHeight = height;
 		if (!isInRenderElement) {
 			this._onDidChangeItemHeight.fire({ element, height: templateData.rowContainer.offsetHeight });
 		}
 
-		return isFullyRendered;
+		return false;
 	}
 
-	private renderTreeData(data: IChatResponseProgressFileTreeData, element: ChatTreeItem, templateData: IChatListItemTemplate, treeDataIndex: number): { element: HTMLElement; dispose: () => void } {
-		const treeDisposables = new DisposableStore();
-		const ref = treeDisposables.add(this._treePool.get());
-		const tree = ref.object;
-
-		treeDisposables.add(tree.onDidOpen((e) => {
-			if (e.element && !('children' in e.element)) {
-				this.openerService.open(e.element.uri);
+	private renderChatContentDiff(partsToRender: ReadonlyArray<IChatRendererContent | null>, contentForThisTurn: ReadonlyArray<IChatRendererContent>, element: IChatResponseViewModel, templateData: IChatListItemTemplate): void {
+		const renderedParts = templateData.renderedParts ?? [];
+		templateData.renderedParts = renderedParts;
+		partsToRender.forEach((partToRender, index) => {
+			if (!partToRender) {
+				// null=no change
+				return;
 			}
-		}));
-		treeDisposables.add(tree.onDidChangeCollapseState(() => {
-			this.updateItemHeight(templateData);
-		}));
-		treeDisposables.add(tree.onContextMenu((e) => {
-			e.browserEvent.preventDefault();
-			e.browserEvent.stopPropagation();
-		}));
 
-		tree.setInput(data).then(() => {
-			if (!ref.isStale()) {
-				tree.layout();
-				this.updateItemHeight(templateData);
+			const alreadyRenderedPart = templateData.renderedParts?.[index];
+			if (alreadyRenderedPart) {
+				alreadyRenderedPart.dispose();
 			}
-		});
 
-		if (isResponseVM(element)) {
-			const fileTreeFocusInfo = {
-				treeDataId: data.uri.toString(),
-				treeIndex: treeDataIndex,
-				focus() {
-					tree.domFocus();
-				}
+			const preceedingContentParts = renderedParts.slice(0, index);
+			const context: IChatContentPartRenderContext = {
+				element,
+				content: contentForThisTurn,
+				preceedingContentParts,
+				contentIndex: index,
 			};
-
-			treeDisposables.add(tree.onDidFocus(() => {
-				this.focusedFileTreesByResponseId.set(element.id, fileTreeFocusInfo.treeIndex);
-			}));
-
-			const fileTrees = this.fileTreesByResponseId.get(element.id) ?? [];
-			fileTrees.push(fileTreeFocusInfo);
-			this.fileTreesByResponseId.set(element.id, distinct(fileTrees, (v) => v.treeDataId));
-			treeDisposables.add(toDisposable(() => this.fileTreesByResponseId.set(element.id, fileTrees.filter(v => v.treeDataId !== data.uri.toString()))));
-		}
-
-		return {
-			element: tree.getHTMLElement().parentElement!,
-			dispose: () => {
-				treeDisposables.dispose();
-			}
-		};
-	}
-
-	private renderContentReferencesIfNeeded(element: ChatTreeItem, templateData: IChatListItemTemplate, disposables: DisposableStore): void {
-		if (isResponseVM(element) && this._usedReferencesEnabled && element.contentReferences.length) {
-			dom.show(templateData.referencesListContainer);
-			const contentReferencesListResult = this.renderContentReferencesListData(null, element.contentReferences, element, templateData);
-			if (templateData.referencesListContainer.firstChild) {
-				templateData.referencesListContainer.replaceChild(contentReferencesListResult.element, templateData.referencesListContainer.firstChild!);
-			} else {
-				templateData.referencesListContainer.appendChild(contentReferencesListResult.element);
-			}
-			disposables.add(contentReferencesListResult);
-		} else {
-			dom.hide(templateData.referencesListContainer);
-		}
-	}
-
-	private renderContentReferencesListData(task: IChatTask | null, data: ReadonlyArray<IChatContentReference | IChatWarningMessage>, element: IChatResponseViewModel, templateData: IChatListItemTemplate): { element: HTMLElement; dispose: () => void } {
-		const listDisposables = new DisposableStore();
-		const referencesLabel = task?.content.value ?? (data.length > 1 ?
-			localize('usedReferencesPlural', "Used {0} references", data.length) :
-			localize('usedReferencesSingular', "Used {0} reference", 1));
-		const iconElement = $('.chat-used-context-icon');
-		const icon = (element: IChatResponseViewModel) => element.usedReferencesExpanded ? Codicon.chevronDown : Codicon.chevronRight;
-		iconElement.classList.add(...ThemeIcon.asClassNameArray(icon(element)));
-		const buttonElement = $('.chat-used-context-label', undefined);
-
-		const collapseButton = listDisposables.add(new Button(buttonElement, {
-			buttonBackground: undefined,
-			buttonBorder: undefined,
-			buttonForeground: undefined,
-			buttonHoverBackground: undefined,
-			buttonSecondaryBackground: undefined,
-			buttonSecondaryForeground: undefined,
-			buttonSecondaryHoverBackground: undefined,
-			buttonSeparator: undefined
-		}));
-		const container = $('.chat-used-context', undefined, buttonElement);
-		collapseButton.label = referencesLabel;
-		collapseButton.element.prepend(iconElement);
-		this.updateAriaLabel(collapseButton.element, referencesLabel, element.usedReferencesExpanded);
-		container.classList.toggle('chat-used-context-collapsed', !element.usedReferencesExpanded);
-		listDisposables.add(collapseButton.onDidClick(() => {
-			iconElement.classList.remove(...ThemeIcon.asClassNameArray(icon(element)));
-			element.usedReferencesExpanded = !element.usedReferencesExpanded;
-			iconElement.classList.add(...ThemeIcon.asClassNameArray(icon(element)));
-			container.classList.toggle('chat-used-context-collapsed', !element.usedReferencesExpanded);
-			this.updateItemHeight(templateData);
-			this.updateAriaLabel(collapseButton.element, referencesLabel, element.usedReferencesExpanded);
-		}));
-
-		const ref = listDisposables.add(this._contentReferencesListPool.get());
-		const list = ref.object;
-		container.appendChild(list.getHTMLElement().parentElement!);
-
-		listDisposables.add(list.onDidOpen((e) => {
-			if (e.element && 'reference' in e.element) {
-				const uriOrLocation = 'variableName' in e.element.reference ? e.element.reference.value : e.element.reference;
-				const uri = URI.isUri(uriOrLocation) ? uriOrLocation :
-					uriOrLocation?.uri;
-				if (uri) {
-					this.openerService.open(
-						uri,
-						{
-							fromUserGesture: true,
-							editorOptions: {
-								...e.editorOptions,
-								...{
-									selection: uriOrLocation && 'range' in uriOrLocation ? uriOrLocation.range : undefined
-								}
-							}
-						});
-				}
-			}
-		}));
-		listDisposables.add(list.onContextMenu((e) => {
-			e.browserEvent.preventDefault();
-			e.browserEvent.stopPropagation();
-		}));
-
-		const maxItemsShown = 6;
-		const itemsShown = Math.min(data.length, maxItemsShown);
-		const height = itemsShown * 22;
-		list.layout(height);
-		list.getHTMLElement().style.height = `${height}px`;
-		list.splice(0, list.length, data);
-
-		return {
-			element: container,
-			dispose: () => {
-				listDisposables.dispose();
-			}
-		};
-	}
-
-	private updateAriaLabel(element: HTMLElement, label: string, expanded?: boolean): void {
-		element.ariaLabel = expanded ? localize('usedReferencesExpanded', "{0}, expanded", label) : localize('usedReferencesCollapsed', "{0}, collapsed", label);
-	}
-
-	private renderProgressTask(task: IChatTask, showSpinner: boolean, element: ChatTreeItem, templateData: IChatListItemTemplate): IMarkdownRenderResult | undefined {
-		if (!isResponseVM(element)) {
-			return;
-		}
-
-		if (task.progress.length) {
-			const refs = this.renderContentReferencesListData(task, task.progress, element, templateData);
-			const node = dom.$('.chat-progress-task');
-			node.appendChild(refs.element);
-			return { element: node, dispose: refs.dispose };
-		}
-
-		return this.renderProgressMessage(task, showSpinner);
-	}
-
-	private renderProgressMessage(progress: IChatProgressMessage | IChatTask, showSpinner: boolean): IMarkdownRenderResult {
-		if (showSpinner) {
-			// this step is in progress, communicate it to SR users
-			alert(progress.content.value);
-		}
-		const codicon = showSpinner ? ThemeIcon.modify(Codicon.loading, 'spin').id : Codicon.check.id;
-		const markdown = new MarkdownString(`$(${codicon}) ${progress.content.value}`, {
-			supportThemeIcons: true
-		});
-		const result = this.renderer.render(markdown);
-		result.element.classList.add('progress-step');
-		return result;
-	}
-
-	private renderCommandButton(element: ChatTreeItem, commandButton: IChatCommandButton): IMarkdownRenderResult {
-		const container = $('.chat-command-button');
-		const disposables = new DisposableStore();
-		const enabled = !isResponseVM(element) || !element.isStale;
-		const tooltip = enabled ?
-			commandButton.command.tooltip :
-			localize('commandButtonDisabled', "Button not available in restored chat");
-		const button = disposables.add(new Button(container, { ...defaultButtonStyles, supportIcons: true, title: tooltip }));
-		button.label = commandButton.command.title;
-		button.enabled = enabled;
-
-		// TODO still need telemetry for command buttons
-		disposables.add(button.onDidClick(() => this.commandService.executeCommand(commandButton.command.id, ...(commandButton.command.arguments ?? []))));
-		return {
-			dispose() {
-				disposables.dispose();
-			},
-			element: container
-		};
-	}
-
-	private renderNotification(kind: 'info' | 'warning' | 'error', content: IMarkdownString): IMarkdownRenderResult {
-		const container = $('.chat-notification-widget');
-		let icon;
-		let iconClass;
-		switch (kind) {
-			case 'warning':
-				icon = Codicon.warning;
-				iconClass = '.chat-warning-codicon';
-				break;
-			case 'error':
-				icon = Codicon.error;
-				iconClass = '.chat-error-codicon';
-				break;
-			case 'info':
-				icon = Codicon.info;
-				iconClass = '.chat-info-codicon';
-				break;
-		}
-		container.appendChild($(iconClass, undefined, renderIcon(icon)));
-		const markdownContent = this.renderer.render(content);
-		container.appendChild(markdownContent.element);
-		return {
-			element: container,
-			dispose() { markdownContent.dispose(); }
-		};
-	}
-
-	private renderConfirmation(element: ChatTreeItem, confirmation: IChatConfirmation, templateData: IChatListItemTemplate): IMarkdownRenderResult | undefined {
-		const store = new DisposableStore();
-		const confirmationWidget = store.add(this.instantiationService.createInstance(ChatConfirmationWidget, confirmation.title, confirmation.message, [
-			{ label: localize('accept', "Accept"), data: confirmation.data },
-			{ label: localize('dismiss', "Dismiss"), data: confirmation.data, isSecondary: true },
-		]));
-		confirmationWidget.setShowButtons(!confirmation.isUsed);
-
-		store.add(confirmationWidget.onDidClick(async e => {
-			if (isResponseVM(element)) {
-				const prompt = `${e.label}: "${confirmation.title}"`;
-				const data: IChatSendRequestOptions = e.isSecondary ?
-					{ rejectedConfirmationData: [e.data] } :
-					{ acceptedConfirmationData: [e.data] };
-				data.agentId = element.agent?.id;
-				if (await this.chatService.sendRequest(element.sessionId, prompt, data)) {
-					confirmation.isUsed = true;
-					confirmationWidget.setShowButtons(false);
-					this.updateItemHeight(templateData);
-				}
-			}
-		}));
-
-		return {
-			element: confirmationWidget.domNode,
-			dispose() { store.dispose(); }
-		};
-	}
-
-	private renderTextEdit(element: ChatTreeItem, chatTextEdit: IChatTextEditGroup, templateData: IChatListItemTemplate): IMarkdownRenderResult | undefined {
-
-		// TODO@jrieken move this into the CompareCodeBlock and properly say what kind of changes happen
-		if (this.rendererOptions.renderTextEditsAsSummary?.(chatTextEdit.uri)) {
-			if (isResponseVM(element) && element.response.value.every(item => item.kind === 'textEditGroup')) {
-				return {
-					element: $('.interactive-edits-summary', undefined, !element.isComplete ? localize('editsSummary1', "Making changes...") : localize('editsSummary', "Made changes.")),
-					dispose() { }
-				};
-			}
-			return undefined;
-		}
-
-		const store = new DisposableStore();
-		const cts = new CancellationTokenSource();
-
-		let isDisposed = false;
-		store.add(toDisposable(() => {
-			isDisposed = true;
-			cts.dispose(true);
-		}));
-
-		const ref = this._diffEditorPool.get();
-
-		// Attach this after updating text/layout of the editor, so it should only be fired when the size updates later (horizontal scrollbar, wrapping)
-		// not during a renderElement OR a progressive render (when we will be firing this event anyway at the end of the render)
-		store.add(ref.object.onDidChangeContentHeight(() => {
-			ref.object.layout(this._currentLayoutWidth);
-			this.updateItemHeight(templateData);
-		}));
-
-		const data: ICodeCompareBlockData = {
-			element,
-			edit: chatTextEdit,
-			diffData: (async () => {
-
-				const ref = await this.textModelService.createModelReference(chatTextEdit.uri);
-
-				if (isDisposed) {
-					ref.dispose();
-					return;
-				}
-
-				store.add(ref);
-
-				const original = ref.object.textEditorModel;
-				let originalSha1: string = '';
-
-				if (chatTextEdit.state) {
-					originalSha1 = chatTextEdit.state.sha1;
-				} else {
-					const sha1 = new DefaultModelSHA1Computer();
-					if (sha1.canComputeSHA1(original)) {
-						originalSha1 = sha1.computeSHA1(original);
-						chatTextEdit.state = { sha1: originalSha1, applied: 0 };
-					}
-				}
-
-				const modified = this.modelService.createModel(
-					createTextBufferFactoryFromSnapshot(original.createSnapshot()),
-					{ languageId: original.getLanguageId(), onDidChange: Event.None },
-					URI.from({ scheme: Schemas.vscodeChatCodeBlock, path: original.uri.path, query: generateUuid() }),
-					false
-				);
-				const modRef = await this.textModelService.createModelReference(modified.uri);
-				store.add(modRef);
-
-				const editGroups: ISingleEditOperation[][] = [];
-				if (isResponseVM(element)) {
-					const chatModel = this.chatService.getSession(element.sessionId)!;
-
-					for (const request of chatModel.getRequests()) {
-						if (!request.response) {
-							continue;
-						}
-						for (const item of request.response.response.value) {
-							if (item.kind !== 'textEditGroup' || item.state?.applied || !isEqual(item.uri, chatTextEdit.uri)) {
-								continue;
-							}
-							for (const group of item.edits) {
-								const edits = group.map(TextEdit.asEditOperation);
-								editGroups.push(edits);
-							}
-						}
-						if (request.response === element.model) {
-							break;
-						}
-					}
-				}
-
-				for (const edits of editGroups) {
-					modified.pushEditOperations(null, edits, () => null);
-				}
-
-				return {
-					modified,
-					original,
-					originalSha1
-				} satisfies ICodeCompareBlockDiffData;
-			})()
-		};
-		ref.object.render(data, this._currentLayoutWidth, cts.token);
-
-		return {
-			element: ref.object.element,
-			dispose() {
-				store.dispose();
-				ref.dispose();
-			},
-		};
-	}
-
-	private renderMarkdown(markdown: IMarkdownString, element: ChatTreeItem, templateData: IChatListItemTemplate, fillInIncompleteTokens = false, codeBlockStartIndex = 0): IChatMarkdownRenderResult {
-		const disposables = new DisposableStore();
-
-		// We release editors in order so that it's more likely that the same editor will be assigned if this element is re-rendered right away, like it often is during progressive rendering
-		const orderedDisposablesList: IDisposable[] = [];
-		const codeblocks: IChatCodeBlockInfo[] = [];
-		let codeBlockIndex = codeBlockStartIndex;
-		const result = this.renderer.render(markdown, {
-			fillInIncompleteTokens,
-			codeBlockRendererSync: (languageId, text) => {
-				const index = codeBlockIndex++;
-				let textModel: Promise<IResolvedTextEditorModel>;
-				let range: Range | undefined;
-				let vulns: readonly IMarkdownVulnerability[] | undefined;
-				if (equalsIgnoreCase(languageId, localFileLanguageId)) {
+			const newPart = this.renderChatContentPart(partToRender, templateData, context);
+			if (newPart) {
+				// Maybe the part can't be rendered in this context, but this shouldn't really happen
+				if (alreadyRenderedPart) {
 					try {
-						const parsedBody = parseLocalFileData(text);
-						range = parsedBody.range && Range.lift(parsedBody.range);
-						textModel = this.textModelService.createModelReference(parsedBody.uri).then(ref => ref.object);
-					} catch (e) {
-						return $('div');
+						// This method can throw HierarchyRequestError
+						alreadyRenderedPart.domNode.replaceWith(newPart.domNode);
+					} catch (err) {
+						this.logService.error('ChatListItemRenderer#renderChatContentDiff: error replacing part', err);
 					}
 				} else {
-					if (!isRequestVM(element) && !isResponseVM(element)) {
-						console.error('Trying to render code block in welcome', element.id, index);
-						return $('div');
-					}
-
-					const sessionId = isResponseVM(element) || isRequestVM(element) ? element.sessionId : '';
-					const modelEntry = this.codeBlockModelCollection.getOrCreate(sessionId, element, index);
-					vulns = modelEntry.vulns;
-					textModel = modelEntry.model;
+					templateData.value.appendChild(newPart.domNode);
 				}
 
-				const hideToolbar = isResponseVM(element) && element.errorDetails?.responseIsFiltered;
-				const ref = this.renderCodeBlock({ languageId, textModel, codeBlockIndex: index, element, range, hideToolbar, parentContextKeyService: templateData.contextKeyService, vulns }, text);
-
-				// Attach this after updating text/layout of the editor, so it should only be fired when the size updates later (horizontal scrollbar, wrapping)
-				// not during a renderElement OR a progressive render (when we will be firing this event anyway at the end of the render)
-				disposables.add(ref.object.onDidChangeContentHeight(() => {
-					ref.object.layout(this._currentLayoutWidth);
-					this.updateItemHeight(templateData);
-				}));
-
-				if (isResponseVM(element)) {
-					const info: IChatCodeBlockInfo = {
-						codeBlockIndex: index,
-						element,
-						focus() {
-							ref.object.focus();
-						}
-					};
-					codeblocks.push(info);
-					if (ref.object.uri) {
-						const uri = ref.object.uri;
-						this.codeBlocksByEditorUri.set(uri, info);
-						disposables.add(toDisposable(() => this.codeBlocksByEditorUri.delete(uri)));
-					}
-				}
-				orderedDisposablesList.push(ref);
-				return ref.object.element;
-			},
-			asyncRenderCallback: () => this.updateItemHeight(templateData),
-		});
-
-		if (isResponseVM(element)) {
-			this.codeBlocksByResponseId.set(element.id, codeblocks);
-			disposables.add(toDisposable(() => this.codeBlocksByResponseId.delete(element.id)));
-		}
-
-		disposables.add(this.markdownDecorationsRenderer.walkTreeAndAnnotateReferenceLinks(result.element));
-
-		orderedDisposablesList.reverse().forEach(d => disposables.add(d));
-		return {
-			codeBlockCount: codeBlockIndex - codeBlockStartIndex,
-			element: result.element,
-			dispose() {
-				result.dispose();
-				disposables.dispose();
+				renderedParts[index] = newPart;
+			} else if (alreadyRenderedPart) {
+				alreadyRenderedPart.domNode.remove();
 			}
-		};
+		});
 	}
 
-	private renderCodeBlock(data: ICodeBlockData, text: string): IDisposableReference<CodeBlockPart> {
-		const ref = this._editorPool.get();
-		const editorInfo = ref.object;
-		if (isResponseVM(data.element)) {
-			this.codeBlockModelCollection.update(data.element.sessionId, data.element, data.codeBlockIndex, { text, languageId: data.languageId });
+	/**
+	 * Returns all content parts that should be rendered, and trimmed markdown content. We will diff this with the current rendered set.
+	 */
+	private getNextProgressiveRenderContent(element: IChatResponseViewModel): IChatRendererContent[] {
+		const data = this.getDataForProgressiveRender(element);
+
+		const renderableResponse = annotateSpecialMarkdownContent(element.response.value);
+
+		this.traceLayout('getNextProgressiveRenderContent', `Want to render ${data.numWordsToRender} at ${data.rate} words/s, counting...`);
+		let numNeededWords = data.numWordsToRender;
+		const partsToRender: IChatRendererContent[] = [];
+		if (element.contentReferences.length) {
+			partsToRender.push({ kind: 'references', references: element.contentReferences });
 		}
 
-		editorInfo.render(data, this._currentLayoutWidth, this.rendererOptions.editableCodeBlock);
+		for (let i = 0; i < renderableResponse.length; i++) {
+			const part = renderableResponse[i];
+			if (numNeededWords <= 0) {
+				break;
+			}
 
-		return ref;
+			if (part.kind === 'markdownContent') {
+				const wordCountResult = getNWords(part.content.value, numNeededWords);
+				if (wordCountResult.isFullString) {
+					partsToRender.push(part);
+				} else {
+					partsToRender.push({ kind: 'markdownContent', content: new MarkdownString(wordCountResult.value, part.content) });
+				}
+
+				this.traceLayout('getNextProgressiveRenderContent', `  Chunk ${i}: Want to render ${numNeededWords} words and found ${wordCountResult.returnedWordCount} words. Total words in chunk: ${wordCountResult.totalWordCount}`);
+				numNeededWords -= wordCountResult.returnedWordCount;
+			} else {
+				partsToRender.push(part);
+			}
+		}
+
+		const lastWordCount = element.contentUpdateTimings?.lastWordCount ?? 0;
+		const newRenderedWordCount = data.numWordsToRender - numNeededWords;
+		const bufferWords = lastWordCount - newRenderedWordCount;
+		this.traceLayout('getNextProgressiveRenderContent', `Want to render ${data.numWordsToRender} words. Rendering ${newRenderedWordCount} words. Buffer: ${bufferWords} words`);
+		if (newRenderedWordCount > 0 && newRenderedWordCount !== element.renderData?.renderedWordCount) {
+			// Only update lastRenderTime when we actually render new content
+			element.renderData = { lastRenderTime: Date.now(), renderedWordCount: newRenderedWordCount, renderedParts: partsToRender };
+		}
+
+		return partsToRender;
 	}
 
-	private getDataForProgressiveRender(element: IChatResponseViewModel, data: IMarkdownString, renderData: Pick<IChatResponseMarkdownRenderData, 'lastRenderTime' | 'renderedWordCount'>): IWordCountResult & { rate: number } | undefined {
+	private getDataForProgressiveRender(element: IChatResponseViewModel) {
+		const renderData = element.renderData ?? { lastRenderTime: 0, renderedWordCount: 0 };
+
 		const rate = this.getProgressiveRenderRate(element);
 		const numWordsToRender = renderData.lastRenderTime === 0 ?
 			1 :
@@ -1231,17 +710,201 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 			// Additional words to render beyond what's already rendered
 			Math.floor((Date.now() - renderData.lastRenderTime) / 1000 * rate);
 
-		if (numWordsToRender === renderData.renderedWordCount) {
-			return undefined;
-		}
-
 		return {
-			...getNWords(data.value, numWordsToRender),
+			numWordsToRender,
 			rate
 		};
 	}
 
+	private diff(renderedParts: ReadonlyArray<IChatContentPart>, contentToRender: ReadonlyArray<IChatRendererContent>, element: ChatTreeItem): ReadonlyArray<IChatRendererContent | null> {
+		const diff: (IChatRendererContent | null)[] = [];
+		for (let i = 0; i < contentToRender.length; i++) {
+			const content = contentToRender[i];
+			const renderedPart = renderedParts[i];
+
+			if (!renderedPart || !renderedPart.hasSameContent(content, contentToRender.slice(i + 1), element)) {
+				diff.push(content);
+			} else {
+				// null -> no change
+				diff.push(null);
+			}
+		}
+
+		return diff;
+	}
+
+	private renderChatContentPart(content: IChatRendererContent, templateData: IChatListItemTemplate, context: IChatContentPartRenderContext): IChatContentPart | undefined {
+		if (content.kind === 'treeData') {
+			return this.renderTreeData(content, templateData, context);
+		} else if (content.kind === 'progressMessage') {
+			return this.instantiationService.createInstance(ChatProgressContentPart, content, this.renderer, context);
+		} else if (content.kind === 'progressTask') {
+			return this.renderProgressTask(content, templateData, context);
+		} else if (content.kind === 'command') {
+			return this.instantiationService.createInstance(ChatCommandButtonContentPart, content, context);
+		} else if (content.kind === 'textEditGroup') {
+			return this.renderTextEdit(context, content, templateData);
+		} else if (content.kind === 'confirmation') {
+			return this.renderConfirmation(context, content, templateData);
+		} else if (content.kind === 'warning') {
+			return this.instantiationService.createInstance(ChatWarningContentPart, 'warning', content.content, this.renderer);
+		} else if (content.kind === 'markdownContent') {
+			return this.renderMarkdown(content.content, templateData, context);
+		} else if (content.kind === 'references') {
+			return this.renderContentReferencesListData(content, undefined, context, templateData);
+		} else if (content.kind === 'codeCitations') {
+			return this.renderCodeCitationsListData(content, context, templateData);
+		} else if (content.kind === 'toolInvocation' || content.kind === 'toolInvocationSerialized') {
+			return this.renderToolInvocation(content, context, templateData);
+		}
+
+		return undefined;
+	}
+
+	private renderTreeData(content: IChatTreeData, templateData: IChatListItemTemplate, context: IChatContentPartRenderContext): IChatContentPart {
+		const data = content.treeData;
+		const treeDataIndex = context.preceedingContentParts.filter(part => part instanceof ChatTreeContentPart).length;
+		const treePart = this.instantiationService.createInstance(ChatTreeContentPart, data, context.element, this._treePool, treeDataIndex);
+
+		treePart.addDisposable(treePart.onDidChangeHeight(() => {
+			this.updateItemHeight(templateData);
+		}));
+
+		if (isResponseVM(context.element)) {
+			const fileTreeFocusInfo = {
+				treeDataId: data.uri.toString(),
+				treeIndex: treeDataIndex,
+				focus() {
+					treePart.domFocus();
+				}
+			};
+
+			// TODO@roblourens there's got to be a better way to navigate trees
+			treePart.addDisposable(treePart.onDidFocus(() => {
+				this.focusedFileTreesByResponseId.set(context.element.id, fileTreeFocusInfo.treeIndex);
+			}));
+
+			const fileTrees = this.fileTreesByResponseId.get(context.element.id) ?? [];
+			fileTrees.push(fileTreeFocusInfo);
+			this.fileTreesByResponseId.set(context.element.id, distinct(fileTrees, (v) => v.treeDataId));
+			treePart.addDisposable(toDisposable(() => this.fileTreesByResponseId.set(context.element.id, fileTrees.filter(v => v.treeDataId !== data.uri.toString()))));
+		}
+
+		return treePart;
+	}
+
+	private renderContentReferencesListData(references: IChatReferences, labelOverride: string | undefined, context: IChatContentPartRenderContext, templateData: IChatListItemTemplate): ChatCollapsibleListContentPart {
+		const referencesPart = this.instantiationService.createInstance(ChatCollapsibleListContentPart, references.references, labelOverride, context.element as IChatResponseViewModel, this._contentReferencesListPool);
+		referencesPart.addDisposable(referencesPart.onDidChangeHeight(() => {
+			this.updateItemHeight(templateData);
+		}));
+
+		return referencesPart;
+	}
+
+	private renderCodeCitationsListData(citations: IChatCodeCitations, context: IChatContentPartRenderContext, templateData: IChatListItemTemplate): ChatCodeCitationContentPart {
+		const citationsPart = this.instantiationService.createInstance(ChatCodeCitationContentPart, citations, context);
+		return citationsPart;
+	}
+
+	private renderToolInvocation(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized, context: IChatContentPartRenderContext, templateData: IChatListItemTemplate): IChatContentPart {
+		const part = this.instantiationService.createInstance(ChatToolInvocationPart, toolInvocation, context, this.renderer);
+		part.addDisposable(part.onDidChangeHeight(() => {
+			this.updateItemHeight(templateData);
+		}));
+		return part;
+	}
+
+	private renderProgressTask(task: IChatTask, templateData: IChatListItemTemplate, context: IChatContentPartRenderContext): IChatContentPart | undefined {
+		if (!isResponseVM(context.element)) {
+			return;
+		}
+
+		const taskPart = this.instantiationService.createInstance(ChatTaskContentPart, task, this._contentReferencesListPool, this.renderer, context);
+		taskPart.addDisposable(taskPart.onDidChangeHeight(() => {
+			this.updateItemHeight(templateData);
+		}));
+		return taskPart;
+	}
+
+	private renderConfirmation(context: IChatContentPartRenderContext, confirmation: IChatConfirmation, templateData: IChatListItemTemplate): IChatContentPart {
+		const part = this.instantiationService.createInstance(ChatConfirmationContentPart, confirmation, context);
+		part.addDisposable(part.onDidChangeHeight(() => this.updateItemHeight(templateData)));
+		return part;
+	}
+
+	private renderAttachments(variables: IChatRequestVariableEntry[], contentReferences: ReadonlyArray<IChatContentReference> | undefined, templateData: IChatListItemTemplate) {
+		return this.instantiationService.createInstance(ChatAttachmentsContentPart, variables, contentReferences, undefined);
+	}
+
+	private renderTextEdit(context: IChatContentPartRenderContext, chatTextEdit: IChatTextEditGroup, templateData: IChatListItemTemplate): IChatContentPart {
+		const textEditPart = this.instantiationService.createInstance(ChatTextEditContentPart, chatTextEdit, context, this.rendererOptions, this._diffEditorPool, this._currentLayoutWidth);
+		textEditPart.addDisposable(textEditPart.onDidChangeHeight(() => {
+			textEditPart.layout(this._currentLayoutWidth);
+			this.updateItemHeight(templateData);
+		}));
+
+		return textEditPart;
+	}
+
+	private renderMarkdown(markdown: IMarkdownString, templateData: IChatListItemTemplate, context: IChatContentPartRenderContext): IChatContentPart {
+		const element = context.element;
+		const fillInIncompleteTokens = isResponseVM(element) && (!element.isComplete || element.isCanceled || element.errorDetails?.responseIsFiltered || element.errorDetails?.responseIsIncomplete || !!element.renderData);
+		const codeBlockStartIndex = context.preceedingContentParts.reduce((acc, part) => acc + (part instanceof ChatMarkdownContentPart ? part.codeblocks.length : 0), 0);
+		const markdownPart = this.instantiationService.createInstance(ChatMarkdownContentPart, markdown, context, this._editorPool, fillInIncompleteTokens, codeBlockStartIndex, this.renderer, this._currentLayoutWidth, this.codeBlockModelCollection, this.rendererOptions);
+		const markdownPartId = markdownPart.id;
+		markdownPart.addDisposable(markdownPart.onDidChangeHeight(() => {
+			markdownPart.layout(this._currentLayoutWidth);
+			this.updateItemHeight(templateData);
+		}));
+
+		const codeBlocksByResponseId = this.codeBlocksByResponseId.get(element.id) ?? [];
+		this.codeBlocksByResponseId.set(element.id, codeBlocksByResponseId);
+		markdownPart.addDisposable(toDisposable(() => {
+			const codeBlocksByResponseId = this.codeBlocksByResponseId.get(element.id);
+			if (codeBlocksByResponseId) {
+				// Only delete if this is my code block
+				markdownPart.codeblocks.forEach((info, i) => {
+					const codeblock = codeBlocksByResponseId[codeBlockStartIndex + i];
+					if (codeblock?.ownerMarkdownPartId === markdownPartId) {
+						delete codeBlocksByResponseId[codeBlockStartIndex + i];
+					}
+				});
+			}
+		}));
+
+		markdownPart.codeblocks.forEach((info, i) => {
+			codeBlocksByResponseId[codeBlockStartIndex + i] = info;
+			if (info.uri) {
+				const uri = info.uri;
+				this.codeBlocksByEditorUri.set(uri, info);
+				markdownPart.addDisposable(toDisposable(() => {
+					const codeblock = this.codeBlocksByEditorUri.get(uri);
+					if (codeblock?.ownerMarkdownPartId === markdownPartId) {
+						this.codeBlocksByEditorUri.delete(uri);
+					}
+				}));
+			}
+		});
+
+		return markdownPart;
+	}
+
 	disposeElement(node: ITreeNode<ChatTreeItem, FuzzyScore>, index: number, templateData: IChatListItemTemplate): void {
+		this.traceLayout('disposeElement', `Disposing element, index=${index}`);
+
+		// We could actually reuse a template across a renderElement call?
+		if (templateData.renderedParts) {
+			try {
+				dispose(coalesce(templateData.renderedParts));
+				templateData.renderedParts = undefined;
+				dom.clearNode(templateData.value);
+			} catch (err) {
+				throw err;
+			}
+		}
+
+		templateData.currentElement = undefined;
 		templateData.elementDisposables.clear();
 	}
 
@@ -1280,469 +943,88 @@ export class ChatListDelegate implements IListVirtualDelegate<ChatTreeItem> {
 	}
 }
 
+const voteDownDetailLabels: Record<ChatAgentVoteDownReason, string> = {
+	[ChatAgentVoteDownReason.IncorrectCode]: localize('incorrectCode', "Suggested incorrect code"),
+	[ChatAgentVoteDownReason.DidNotFollowInstructions]: localize('didNotFollowInstructions', "Didn't follow instructions"),
+	[ChatAgentVoteDownReason.MissingContext]: localize('missingContext', "Missing context"),
+	[ChatAgentVoteDownReason.OffensiveOrUnsafe]: localize('offensiveOrUnsafe', "Offensive or unsafe"),
+	[ChatAgentVoteDownReason.PoorlyWrittenOrFormatted]: localize('poorlyWrittenOrFormatted', "Poorly written or formatted"),
+	[ChatAgentVoteDownReason.RefusedAValidRequest]: localize('refusedAValidRequest', "Refused a valid request"),
+	[ChatAgentVoteDownReason.IncompleteCode]: localize('incompleteCode', "Incomplete code"),
+	[ChatAgentVoteDownReason.WillReportIssue]: localize('reportIssue', "Report an issue"),
+	[ChatAgentVoteDownReason.Other]: localize('other', "Other"),
+};
 
-interface IDisposableReference<T> extends IDisposable {
-	object: T;
-	isStale: () => boolean;
-}
-
-class EditorPool extends Disposable {
-
-	private readonly _pool: ResourcePool<CodeBlockPart>;
-
-	public inUse(): Iterable<CodeBlockPart> {
-		return this._pool.inUse;
-	}
-
+export class ChatVoteDownButton extends DropdownMenuActionViewItem {
 	constructor(
-		options: ChatEditorOptions,
-		delegate: IChatRendererDelegate,
-		overflowWidgetsDomNode: HTMLElement | undefined,
-		@IInstantiationService instantiationService: IInstantiationService,
+		action: IAction,
+		options: IDropdownMenuActionViewItemOptions | undefined,
+		@ICommandService private readonly commandService: ICommandService,
+		@IWorkbenchIssueService private readonly issueService: IWorkbenchIssueService,
+		@ILogService private readonly logService: ILogService,
+		@IContextMenuService contextMenuService: IContextMenuService,
 	) {
-		super();
-		this._pool = this._register(new ResourcePool(() => {
-			return instantiationService.createInstance(CodeBlockPart, options, MenuId.ChatCodeBlock, delegate, overflowWidgetsDomNode);
-		}));
-	}
-
-	get(): IDisposableReference<CodeBlockPart> {
-		const codeBlock = this._pool.get();
-		let stale = false;
-		return {
-			object: codeBlock,
-			isStale: () => stale,
-			dispose: () => {
-				codeBlock.reset();
-				stale = true;
-				this._pool.release(codeBlock);
-			}
-		};
-	}
-}
-
-class DiffEditorPool extends Disposable {
-
-	private readonly _pool: ResourcePool<CodeCompareBlockPart>;
-
-	public inUse(): Iterable<CodeCompareBlockPart> {
-		return this._pool.inUse;
-	}
-
-	constructor(
-		options: ChatEditorOptions,
-		delegate: IChatRendererDelegate,
-		overflowWidgetsDomNode: HTMLElement | undefined,
-		@IInstantiationService instantiationService: IInstantiationService,
-	) {
-		super();
-		this._pool = this._register(new ResourcePool(() => {
-			return instantiationService.createInstance(CodeCompareBlockPart, options, MenuId.ChatCompareBlock, delegate, overflowWidgetsDomNode);
-		}));
-	}
-
-	get(): IDisposableReference<CodeCompareBlockPart> {
-		const codeBlock = this._pool.get();
-		let stale = false;
-		return {
-			object: codeBlock,
-			isStale: () => stale,
-			dispose: () => {
-				codeBlock.reset();
-				stale = true;
-				this._pool.release(codeBlock);
-			}
-		};
-	}
-}
-
-class TreePool extends Disposable {
-	private _pool: ResourcePool<WorkbenchCompressibleAsyncDataTree<IChatResponseProgressFileTreeData, IChatResponseProgressFileTreeData, void>>;
-
-	public get inUse(): ReadonlySet<WorkbenchCompressibleAsyncDataTree<IChatResponseProgressFileTreeData, IChatResponseProgressFileTreeData, void>> {
-		return this._pool.inUse;
-	}
-
-	constructor(
-		private _onDidChangeVisibility: Event<boolean>,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@IConfigurationService private readonly configService: IConfigurationService,
-		@IThemeService private readonly themeService: IThemeService,
-	) {
-		super();
-		this._pool = this._register(new ResourcePool(() => this.treeFactory()));
-	}
-
-	private treeFactory(): WorkbenchCompressibleAsyncDataTree<IChatResponseProgressFileTreeData, IChatResponseProgressFileTreeData, void> {
-		const resourceLabels = this._register(this.instantiationService.createInstance(ResourceLabels, { onDidChangeVisibility: this._onDidChangeVisibility }));
-
-		const container = $('.interactive-response-progress-tree');
-		this._register(createFileIconThemableTreeContainerScope(container, this.themeService));
-
-		const tree = this.instantiationService.createInstance(
-			WorkbenchCompressibleAsyncDataTree<IChatResponseProgressFileTreeData, IChatResponseProgressFileTreeData>,
-			'ChatListRenderer',
-			container,
-			new ChatListTreeDelegate(),
-			new ChatListTreeCompressionDelegate(),
-			[new ChatListTreeRenderer(resourceLabels, this.configService.getValue('explorer.decorations'))],
-			new ChatListTreeDataSource(),
+		super(action,
+			{ getActions: () => this.getActions(), },
+			contextMenuService,
 			{
-				collapseByDefault: () => false,
-				expandOnlyOnTwistieClick: () => false,
-				identityProvider: {
-					getId: (e: IChatResponseProgressFileTreeData) => e.uri.toString()
-				},
-				accessibilityProvider: {
-					getAriaLabel: (element: IChatResponseProgressFileTreeData) => element.label,
-					getWidgetAriaLabel: () => localize('treeAriaLabel', "File Tree")
-				},
-				alwaysConsumeMouseWheel: false
+				...options,
+				classNames: ThemeIcon.asClassNameArray(Codicon.thumbsdown),
 			});
-
-		return tree;
 	}
 
-	get(): IDisposableReference<WorkbenchCompressibleAsyncDataTree<IChatResponseProgressFileTreeData, IChatResponseProgressFileTreeData, void>> {
-		const object = this._pool.get();
-		let stale = false;
-		return {
-			object,
-			isStale: () => stale,
-			dispose: () => {
-				stale = true;
-				this._pool.release(object);
-			}
-		};
-	}
-}
-
-class ContentReferencesListPool extends Disposable {
-	private _pool: ResourcePool<WorkbenchList<IChatContentReference | IChatWarningMessage>>;
-
-	public get inUse(): ReadonlySet<WorkbenchList<IChatContentReference | IChatWarningMessage>> {
-		return this._pool.inUse;
-	}
-
-	constructor(
-		private _onDidChangeVisibility: Event<boolean>,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@IThemeService private readonly themeService: IThemeService,
-	) {
-		super();
-		this._pool = this._register(new ResourcePool(() => this.listFactory()));
-	}
-
-	private listFactory(): WorkbenchList<IChatContentReference | IChatWarningMessage> {
-		const resourceLabels = this._register(this.instantiationService.createInstance(ResourceLabels, { onDidChangeVisibility: this._onDidChangeVisibility }));
-
-		const container = $('.chat-used-context-list');
-		this._register(createFileIconThemableTreeContainerScope(container, this.themeService));
-
-		const list = this.instantiationService.createInstance(
-			WorkbenchList<IChatContentReference | IChatWarningMessage>,
-			'ChatListRenderer',
-			container,
-			new ContentReferencesListDelegate(),
-			[this.instantiationService.createInstance(ContentReferencesListRenderer, resourceLabels)],
+	getActions(): readonly IAction[] {
+		return [
+			this.getVoteDownDetailAction(ChatAgentVoteDownReason.IncorrectCode),
+			this.getVoteDownDetailAction(ChatAgentVoteDownReason.DidNotFollowInstructions),
+			this.getVoteDownDetailAction(ChatAgentVoteDownReason.IncompleteCode),
+			this.getVoteDownDetailAction(ChatAgentVoteDownReason.MissingContext),
+			this.getVoteDownDetailAction(ChatAgentVoteDownReason.PoorlyWrittenOrFormatted),
+			this.getVoteDownDetailAction(ChatAgentVoteDownReason.RefusedAValidRequest),
+			this.getVoteDownDetailAction(ChatAgentVoteDownReason.OffensiveOrUnsafe),
+			this.getVoteDownDetailAction(ChatAgentVoteDownReason.Other),
 			{
-				alwaysConsumeMouseWheel: false,
-				accessibilityProvider: {
-					getAriaLabel: (element: IChatContentReference | IChatWarningMessage) => {
-						if (element.kind === 'warning') {
-							return element.content.value;
-						}
-						const reference = element.reference;
-						if ('variableName' in reference) {
-							return reference.variableName;
-						} else if (URI.isUri(reference)) {
-							return basename(reference.path);
-						} else {
-							return basename(reference.uri.path);
-						}
-					},
+				id: 'reportIssue',
+				label: voteDownDetailLabels[ChatAgentVoteDownReason.WillReportIssue],
+				tooltip: '',
+				enabled: true,
+				class: undefined,
+				run: async (context: IChatResponseViewModel) => {
+					if (!isResponseVM(context)) {
+						this.logService.error('ChatVoteDownButton#run: invalid context');
+						return;
+					}
 
-					getWidgetAriaLabel: () => localize('usedReferences', "Used References")
-				},
-				dnd: {
-					getDragURI: (element: IChatContentReference | IChatWarningMessage) => {
-						if (element.kind === 'warning') {
-							return null;
-						}
-						const { reference } = element;
-						if ('variableName' in reference) {
-							return null;
-						} else if (URI.isUri(reference)) {
-							return reference.toString();
-						} else {
-							return reference.uri.toString();
-						}
-					},
-					dispose: () => { },
-					onDragOver: () => false,
-					drop: () => { },
-				},
-			});
-
-		return list;
-	}
-
-	get(): IDisposableReference<WorkbenchList<IChatContentReference | IChatWarningMessage>> {
-		const object = this._pool.get();
-		let stale = false;
-		return {
-			object,
-			isStale: () => stale,
-			dispose: () => {
-				stale = true;
-				this._pool.release(object);
+					await this.commandService.executeCommand(MarkUnhelpfulActionId, context, ChatAgentVoteDownReason.WillReportIssue);
+					await this.issueService.openReporter({ extensionId: context.agent?.extensionId.value });
+				}
 			}
-		};
-	}
-}
-
-class ContentReferencesListDelegate implements IListVirtualDelegate<IChatContentReference | IChatWarningMessage> {
-	getHeight(element: IChatContentReference): number {
-		return 22;
+		];
 	}
 
-	getTemplateId(element: IChatContentReference): string {
-		return ContentReferencesListRenderer.TEMPLATE_ID;
-	}
-}
-
-interface IChatContentReferenceListTemplate {
-	label: IResourceLabel;
-	templateDisposables: IDisposable;
-}
-
-class ContentReferencesListRenderer implements IListRenderer<IChatContentReference | IChatWarningMessage, IChatContentReferenceListTemplate> {
-	static TEMPLATE_ID = 'contentReferencesListRenderer';
-	readonly templateId: string = ContentReferencesListRenderer.TEMPLATE_ID;
-
-	constructor(
-		private labels: ResourceLabels,
-		@IThemeService private readonly themeService: IThemeService,
-		@IChatVariablesService private readonly chatVariablesService: IChatVariablesService,
-	) { }
-
-	renderTemplate(container: HTMLElement): IChatContentReferenceListTemplate {
-		const templateDisposables = new DisposableStore();
-		const label = templateDisposables.add(this.labels.create(container, { supportHighlights: true }));
-		return { templateDisposables, label };
-	}
-
-
-	private getReferenceIcon(data: IChatContentReference): URI | ThemeIcon | undefined {
-		if (ThemeIcon.isThemeIcon(data.iconPath)) {
-			return data.iconPath;
-		} else {
-			return this.themeService.getColorTheme().type === ColorScheme.DARK && data.iconPath?.dark
-				? data.iconPath?.dark
-				: data.iconPath?.light;
-		}
-	}
-
-	renderElement(data: IChatContentReference | IChatWarningMessage, index: number, templateData: IChatContentReferenceListTemplate, height: number | undefined): void {
-		if (data.kind === 'warning') {
-			templateData.label.setResource({ name: data.content.value }, { icon: Codicon.warning });
-			return;
-		}
-
-		const reference = data.reference;
-		const icon = this.getReferenceIcon(data);
-		templateData.label.element.style.display = 'flex';
-		if ('variableName' in reference) {
-			if (reference.value) {
-				const uri = URI.isUri(reference.value) ? reference.value : reference.value.uri;
-				templateData.label.setResource(
-					{
-						resource: uri,
-						name: basenameOrAuthority(uri),
-						description: `#${reference.variableName}`,
-						range: 'range' in reference.value ? reference.value.range : undefined,
-					}, { icon });
-			} else {
-				const variable = this.chatVariablesService.getVariable(reference.variableName);
-				templateData.label.setLabel(`#${reference.variableName}`, undefined, { title: variable?.description });
-			}
-		} else {
-			const uri = 'uri' in reference ? reference.uri : reference;
-			if (matchesSomeScheme(uri, Schemas.mailto, Schemas.http, Schemas.https)) {
-				templateData.label.setResource({ resource: uri, name: uri.toString() }, { icon: icon ?? Codicon.globe });
-			} else {
-				templateData.label.setFile(uri, {
-					fileKind: FileKind.FILE,
-					// Should not have this live-updating data on a historical reference
-					fileDecorations: { badges: false, colors: false },
-					range: 'range' in reference ? reference.range : undefined
-				});
-			}
-		}
-	}
-
-	disposeTemplate(templateData: IChatContentReferenceListTemplate): void {
-		templateData.templateDisposables.dispose();
-	}
-}
-
-class ResourcePool<T extends IDisposable> extends Disposable {
-	private readonly pool: T[] = [];
-
-	private _inUse = new Set<T>;
-	public get inUse(): ReadonlySet<T> {
-		return this._inUse;
-	}
-
-	constructor(
-		private readonly _itemFactory: () => T,
-	) {
-		super();
-	}
-
-	get(): T {
-		if (this.pool.length > 0) {
-			const item = this.pool.pop()!;
-			this._inUse.add(item);
-			return item;
-		}
-
-		const item = this._register(this._itemFactory());
-		this._inUse.add(item);
-		return item;
-	}
-
-	release(item: T): void {
-		this._inUse.delete(item);
-		this.pool.push(item);
-	}
-}
-
-class ChatVoteButton extends MenuEntryActionViewItem {
 	override render(container: HTMLElement): void {
 		super.render(container);
-		container.classList.toggle('checked', this.action.checked);
-	}
-}
 
-class ChatListTreeDelegate implements IListVirtualDelegate<IChatResponseProgressFileTreeData> {
-	static readonly ITEM_HEIGHT = 22;
-
-	getHeight(element: IChatResponseProgressFileTreeData): number {
-		return ChatListTreeDelegate.ITEM_HEIGHT;
+		this.element?.classList.toggle('checked', this.action.checked);
 	}
 
-	getTemplateId(element: IChatResponseProgressFileTreeData): string {
-		return 'chatListTreeTemplate';
+	private getVoteDownDetailAction(reason: ChatAgentVoteDownReason): IAction {
+		const label = voteDownDetailLabels[reason];
+		return {
+			id: MarkUnhelpfulActionId,
+			label,
+			tooltip: '',
+			enabled: true,
+			checked: (this._context as IChatResponseViewModel).voteDownReason === reason,
+			class: undefined,
+			run: async (context: IChatResponseViewModel) => {
+				if (!isResponseVM(context)) {
+					this.logService.error('ChatVoteDownButton#getVoteDownDetailAction: invalid context');
+					return;
+				}
+
+				await this.commandService.executeCommand(MarkUnhelpfulActionId, context, reason);
+			}
+		};
 	}
 }
-
-class ChatListTreeCompressionDelegate implements ITreeCompressionDelegate<IChatResponseProgressFileTreeData> {
-	isIncompressible(element: IChatResponseProgressFileTreeData): boolean {
-		return !element.children;
-	}
-}
-
-interface IChatListTreeRendererTemplate {
-	templateDisposables: DisposableStore;
-	label: IResourceLabel;
-}
-
-class ChatListTreeRenderer implements ICompressibleTreeRenderer<IChatResponseProgressFileTreeData, void, IChatListTreeRendererTemplate> {
-	templateId: string = 'chatListTreeTemplate';
-
-	constructor(private labels: ResourceLabels, private decorations: IFilesConfiguration['explorer']['decorations']) { }
-
-	renderCompressedElements(element: ITreeNode<ICompressedTreeNode<IChatResponseProgressFileTreeData>, void>, index: number, templateData: IChatListTreeRendererTemplate, height: number | undefined): void {
-		templateData.label.element.style.display = 'flex';
-		const label = element.element.elements.map((e) => e.label);
-		templateData.label.setResource({ resource: element.element.elements[0].uri, name: label }, {
-			title: element.element.elements[0].label,
-			fileKind: element.children ? FileKind.FOLDER : FileKind.FILE,
-			extraClasses: ['explorer-item'],
-			fileDecorations: this.decorations
-		});
-	}
-	renderTemplate(container: HTMLElement): IChatListTreeRendererTemplate {
-		const templateDisposables = new DisposableStore();
-		const label = templateDisposables.add(this.labels.create(container, { supportHighlights: true }));
-		return { templateDisposables, label };
-	}
-	renderElement(element: ITreeNode<IChatResponseProgressFileTreeData, void>, index: number, templateData: IChatListTreeRendererTemplate, height: number | undefined): void {
-		templateData.label.element.style.display = 'flex';
-		if (!element.children.length && element.element.type !== FileType.Directory) {
-			templateData.label.setFile(element.element.uri, {
-				fileKind: FileKind.FILE,
-				hidePath: true,
-				fileDecorations: this.decorations,
-			});
-		} else {
-			templateData.label.setResource({ resource: element.element.uri, name: element.element.label }, {
-				title: element.element.label,
-				fileKind: FileKind.FOLDER,
-				fileDecorations: this.decorations
-			});
-		}
-	}
-	disposeTemplate(templateData: IChatListTreeRendererTemplate): void {
-		templateData.templateDisposables.dispose();
-	}
-}
-
-class ChatListTreeDataSource implements IAsyncDataSource<IChatResponseProgressFileTreeData, IChatResponseProgressFileTreeData> {
-	hasChildren(element: IChatResponseProgressFileTreeData): boolean {
-		return !!element.children;
-	}
-
-	async getChildren(element: IChatResponseProgressFileTreeData): Promise<Iterable<IChatResponseProgressFileTreeData>> {
-		return element.children ?? [];
-	}
-}
-
-function isInteractiveProgressTreeData(item: Object): item is IChatResponseProgressFileTreeData {
-	return 'label' in item;
-}
-
-function contentToMarkdown(str: string | IMarkdownString): IMarkdownString {
-	return typeof str === 'string' ? { value: str } : str;
-}
-
-function isProgressMessage(item: any): item is IChatProgressMessage {
-	return item && 'kind' in item && item.kind === 'progressMessage';
-}
-
-function isProgressTaskRenderData(item: any): item is IChatTaskRenderData {
-	return item && 'isSettled' in item;
-}
-
-function isWarningRenderData(item: any): item is IChatWarningMessage {
-	return item && 'kind' in item && item.kind === 'warning';
-}
-
-function isProgressMessageRenderData(item: IChatRenderData): item is IChatProgressMessageRenderData {
-	return item && 'isAtEndOfResponse' in item;
-}
-
-function isCommandButtonRenderData(item: IChatRenderData): item is IChatCommandButton {
-	return item && 'kind' in item && item.kind === 'command';
-}
-
-function isTextEditRenderData(item: IChatRenderData): item is IChatTextEditGroup {
-	return item && 'kind' in item && item.kind === 'textEditGroup';
-}
-
-function isConfirmationRenderData(item: IChatRenderData): item is IChatConfirmation {
-	return item && 'kind' in item && item.kind === 'confirmation';
-}
-
-function isMarkdownRenderData(item: IChatRenderData): item is IChatResponseMarkdownRenderData {
-	return item && 'renderedWordCount' in item;
-}
-
-function onlyProgressMessagesAfterI(items: ReadonlyArray<IChatProgressRenderableResponseContent>, i: number): boolean {
-	return items.slice(i).every(isProgressMessage);
-}
-
-function onlyProgressMessageRenderDatasAfterI(items: ReadonlyArray<IChatRenderData>, i: number): boolean {
-	return items.slice(i).every(isProgressMessageRenderData);
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatMarkdownDecorationsRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatMarkdownDecorationsRenderer.ts
index 9af542462c3..43ed2cc5a5b 100644
--- a/src/vs/workbench/contrib/chat/browser/chatMarkdownDecorationsRenderer.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatMarkdownDecorationsRenderer.ts
@@ -3,29 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { Button } from 'vs/base/browser/ui/button/button';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { revive } from 'vs/base/common/marshalling';
-import { URI } from 'vs/base/common/uri';
-import { Location } from 'vs/editor/common/languages';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { ILogService } from 'vs/platform/log/common/log';
-import { asCssVariable } from 'vs/platform/theme/common/colorUtils';
-import { IChatWidgetService } from 'vs/workbench/contrib/chat/browser/chat';
-import { ChatAgentHover, getChatAgentHoverOptions } from 'vs/workbench/contrib/chat/browser/chatAgentHover';
-import { getFullyQualifiedId, IChatAgentCommand, IChatAgentData, IChatAgentNameService, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { chatSlashCommandBackground, chatSlashCommandForeground } from 'vs/workbench/contrib/chat/common/chatColors';
-import { chatAgentLeader, ChatRequestAgentPart, ChatRequestDynamicVariablePart, ChatRequestTextPart, chatSubcommandLeader, IParsedChatRequest } from 'vs/workbench/contrib/chat/common/chatParserTypes';
-import { IChatService } from 'vs/workbench/contrib/chat/common/chatService';
-import { contentRefUrl } from '../common/annotations';
-import { Lazy } from 'vs/base/common/lazy';
-import { ICommandService } from 'vs/platform/commands/common/commands';
+import * as dom from '../../../../base/browser/dom.js';
+import { Button } from '../../../../base/browser/ui/button/button.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { toErrorMessage } from '../../../../base/common/errorMessage.js';
+import { Lazy } from '../../../../base/common/lazy.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import { revive } from '../../../../base/common/marshalling.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { asCssVariable } from '../../../../platform/theme/common/colorUtils.js';
+import { ContentRefData, contentRefUrl } from '../common/annotations.js';
+import { getFullyQualifiedId, IChatAgentCommand, IChatAgentData, IChatAgentNameService, IChatAgentService } from '../common/chatAgents.js';
+import { chatSlashCommandBackground, chatSlashCommandForeground } from '../common/chatColors.js';
+import { chatAgentLeader, ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestDynamicVariablePart, ChatRequestSlashCommandPart, ChatRequestTextPart, ChatRequestToolPart, ChatRequestVariablePart, chatSubcommandLeader, IParsedChatRequest, IParsedChatRequestPart } from '../common/chatParserTypes.js';
+import { IChatService } from '../common/chatService.js';
+import { IChatVariablesService } from '../common/chatVariables.js';
+import { ILanguageModelToolsService } from '../common/languageModelToolsService.js';
+import { IChatWidgetService } from './chat.js';
+import { ChatAgentHover, getChatAgentHoverOptions } from './chatAgentHover.js';
+import { InlineAnchorWidget } from './chatInlineAnchorWidget.js';
+import './media/chatInlineAnchorWidget.css';
 
 /** For rendering slash commands, variables */
 const decorationRefUrl = `http://_vscodedecoration_`;
@@ -68,10 +71,14 @@ interface ISlashCommandWidgetArgs {
 	command: string;
 }
 
-export class ChatMarkdownDecorationsRenderer {
+interface IDecorationWidgetArgs {
+	title?: string;
+}
+
+export class ChatMarkdownDecorationsRenderer extends Disposable {
+
 	constructor(
 		@IKeybindingService private readonly keybindingService: IKeybindingService,
-		@ILabelService private readonly labelService: ILabelService,
 		@ILogService private readonly logService: ILogService,
 		@IChatAgentService private readonly chatAgentService: IChatAgentService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
@@ -79,7 +86,12 @@ export class ChatMarkdownDecorationsRenderer {
 		@IChatService private readonly chatService: IChatService,
 		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
 		@ICommandService private readonly commandService: ICommandService,
-	) { }
+		@IChatVariablesService private readonly chatVariablesService: IChatVariablesService,
+		@ILabelService private readonly labelService: ILabelService,
+		@ILanguageModelToolsService private readonly toolsService: ILanguageModelToolsService,
+	) {
+		super();
+	}
 
 	convertParsedRequestToMarkdown(parsedRequest: IParsedChatRequest): string {
 		let result = '';
@@ -89,21 +101,29 @@ export class ChatMarkdownDecorationsRenderer {
 			} else if (part instanceof ChatRequestAgentPart) {
 				result += this.instantiationService.invokeFunction(accessor => agentToMarkdown(part.agent, false, accessor));
 			} else {
-				const uri = part instanceof ChatRequestDynamicVariablePart && part.data instanceof URI ?
-					part.data :
-					undefined;
-				const title = uri ? encodeURIComponent(this.labelService.getUriLabel(uri, { relative: true })) :
-					part instanceof ChatRequestAgentPart ? part.agent.id :
-						'';
-
-				const text = part.text;
-				result += `[${text}](${decorationRefUrl}?${title})`;
+				result += this.genericDecorationToMarkdown(part);
 			}
 		}
 
 		return result;
 	}
 
+	private genericDecorationToMarkdown(part: IParsedChatRequestPart): string {
+		const uri = part instanceof ChatRequestDynamicVariablePart && part.data instanceof URI ?
+			part.data :
+			undefined;
+		const title = uri ? this.labelService.getUriLabel(uri, { relative: true }) :
+			part instanceof ChatRequestSlashCommandPart ? part.slashCommand.detail :
+				part instanceof ChatRequestAgentSubcommandPart ? part.command.description :
+					part instanceof ChatRequestVariablePart ? (this.chatVariablesService.getVariable(part.variableName)?.description) :
+						part instanceof ChatRequestToolPart ? (this.toolsService.getTool(part.toolId)?.userDescription) :
+							'';
+
+		const args: IDecorationWidgetArgs = { title };
+		const text = part.text;
+		return `[${text}](${decorationRefUrl}?${encodeURIComponent(JSON.stringify(args))})`;
+	}
+
 	walkTreeAndAnnotateReferenceLinks(element: HTMLElement): IDisposable {
 		const store = new DisposableStore();
 		element.querySelectorAll('a').forEach(a => {
@@ -136,12 +156,16 @@ export class ChatMarkdownDecorationsRenderer {
 							a);
 					}
 				} else if (href.startsWith(decorationRefUrl)) {
-					const title = decodeURIComponent(href.slice(decorationRefUrl.length + 1));
+					let args: IDecorationWidgetArgs | undefined;
+					try {
+						args = JSON.parse(decodeURIComponent(href.slice(decorationRefUrl.length + 1)));
+					} catch (e) { }
+
 					a.parentElement!.replaceChild(
-						this.renderResourceWidget(a.textContent!, title),
+						this.renderResourceWidget(a.textContent!, args, store),
 						a);
 				} else if (href.startsWith(contentRefUrl)) {
-					this.renderFileWidget(href, a);
+					this.renderFileWidget(href, a, store);
 				} else if (href.startsWith('command:')) {
 					this.injectKeybindingHint(a, href, this.keybindingService);
 				}
@@ -172,7 +196,7 @@ export class ChatMarkdownDecorationsRenderer {
 				this.chatService.sendRequest(widget.viewModel!.sessionId, agent.metadata.sampleRequest ?? '', { location: widget.location, agentId: agent.id });
 			}));
 		} else {
-			container = this.renderResourceWidget(nameWithLeader, undefined);
+			container = this.renderResourceWidget(nameWithLeader, undefined, store);
 		}
 
 		const agent = this.chatAgentService.getAgent(args.agentId);
@@ -206,37 +230,30 @@ export class ChatMarkdownDecorationsRenderer {
 		return container;
 	}
 
-	private renderFileWidget(href: string, a: HTMLAnchorElement): void {
+	private renderFileWidget(href: string, a: HTMLAnchorElement, store: DisposableStore): void {
 		// TODO this can be a nicer FileLabel widget with an icon. Do a simple link for now.
 		const fullUri = URI.parse(href);
-		let location: Location | { uri: URI; range: undefined };
+		let data: ContentRefData;
 		try {
-			location = revive(JSON.parse(fullUri.fragment));
+			data = revive(JSON.parse(fullUri.fragment));
 		} catch (err) {
 			this.logService.error('Invalid chat widget render data JSON', toErrorMessage(err));
 			return;
 		}
 
-		if (!location.uri || !URI.isUri(location.uri)) {
+		if (data.kind !== 'symbol' && !URI.isUri(data.uri)) {
 			this.logService.error(`Invalid chat widget render data: ${fullUri.fragment}`);
 			return;
 		}
 
-		const fragment = location.range ? `${location.range.startLineNumber}-${location.range.endLineNumber}` : '';
-		a.setAttribute('data-href', location.uri.with({ fragment }).toString());
-
-		const label = this.labelService.getUriLabel(location.uri, { relative: true });
-		a.title = location.range ?
-			`${label}#${location.range.startLineNumber}-${location.range.endLineNumber}` :
-			label;
+		store.add(this.instantiationService.createInstance(InlineAnchorWidget, a, data, undefined));
 	}
 
-
-	private renderResourceWidget(name: string, title: string | undefined): HTMLElement {
+	private renderResourceWidget(name: string, args: IDecorationWidgetArgs | undefined, store: DisposableStore): HTMLElement {
 		const container = dom.$('span.chat-resource-widget');
 		const alias = dom.$('span', undefined, name);
-		if (title) {
-			alias.title = title;
+		if (args?.title) {
+			store.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), container, args.title));
 		}
 
 		container.appendChild(alias);
diff --git a/src/vs/workbench/contrib/chat/browser/chatMarkdownRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatMarkdownRenderer.ts
index 3e4b6a9349f..6e78f992eeb 100644
--- a/src/vs/workbench/contrib/chat/browser/chatMarkdownRenderer.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatMarkdownRenderer.ts
@@ -3,12 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { MarkdownRenderOptions, MarkedOptions } from 'vs/base/browser/markdownRenderer';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { IMarkdownRendererOptions, IMarkdownRenderResult, MarkdownRenderer } from 'vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { ITrustedDomainService } from 'vs/workbench/contrib/url/browser/trustedDomainService';
+import { MarkdownRenderOptions, MarkedOptions } from '../../../../base/browser/markdownRenderer.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { IMarkdownString } from '../../../../base/common/htmlContent.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IMarkdownRendererOptions, IMarkdownRenderResult, MarkdownRenderer } from '../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { REVEAL_IN_EXPLORER_COMMAND_ID } from '../../files/browser/fileConstants.js';
+import { ITrustedDomainService } from '../../url/browser/trustedDomainService.js';
 
 const allowedHtmlTags = [
 	'b',
@@ -29,6 +36,8 @@ const allowedHtmlTags = [
 	'p',
 	'pre',
 	'strong',
+	'sub',
+	'sup',
 	'table',
 	'tbody',
 	'td',
@@ -54,6 +63,9 @@ export class ChatMarkdownRenderer extends MarkdownRenderer {
 		@ILanguageService languageService: ILanguageService,
 		@IOpenerService openerService: IOpenerService,
 		@ITrustedDomainService private readonly trustedDomainService: ITrustedDomainService,
+		@IHoverService private readonly hoverService: IHoverService,
+		@IFileService private readonly fileService: IFileService,
+		@ICommandService private readonly commandService: ICommandService,
 	) {
 		super(options ?? {}, languageService, openerService);
 	}
@@ -73,9 +85,43 @@ export class ChatMarkdownRenderer extends MarkdownRenderer {
 				...markdown,
 
 				// dompurify uses DOMParser, which strips leading comments. Wrapping it all in 'body' prevents this.
-				value: `<body>${markdown.value}</body>`,
+				// The \n\n prevents marked.js from parsing the body contents as just text in an 'html' token, instead of actual markdown.
+				value: `<body>\n\n${markdown.value}</body>`,
 			}
 			: markdown;
-		return super.render(mdWithBody, options, markedOptions);
+		const result = super.render(mdWithBody, options, markedOptions);
+		return this.attachCustomHover(result);
+	}
+
+	private attachCustomHover(result: IMarkdownRenderResult): IMarkdownRenderResult {
+		const store = new DisposableStore();
+		result.element.querySelectorAll('a').forEach((element) => {
+			if (element.title) {
+				const title = element.title;
+				element.title = '';
+				store.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), element, title));
+			}
+		});
+
+		return {
+			element: result.element,
+			dispose: () => {
+				result.dispose();
+				store.dispose();
+			}
+		};
+	}
+
+	protected override async openMarkdownLink(link: string, markdown: IMarkdownString) {
+		try {
+			const uri = URI.parse(link);
+			if ((await this.fileService.stat(uri)).isDirectory) {
+				return this.commandService.executeCommand(REVEAL_IN_EXPLORER_COMMAND_ID, uri);
+			}
+		} catch {
+			// noop
+		}
+
+		return super.openMarkdownLink(link, markdown);
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatOptions.ts b/src/vs/workbench/contrib/chat/browser/chatOptions.ts
index 1995598eba9..054a323f3fe 100644
--- a/src/vs/workbench/contrib/chat/browser/chatOptions.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatOptions.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Color } from 'vs/base/common/color';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IBracketPairColorizationOptions, IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IViewDescriptorService } from 'vs/workbench/common/views';
+import { Color } from '../../../../base/common/color.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IBracketPairColorizationOptions, IEditorOptions } from '../../../../editor/common/config/editorOptions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IViewDescriptorService } from '../../../common/views.js';
 
 export interface IChatConfiguration {
 	editor: {
diff --git a/src/vs/workbench/contrib/chat/browser/chatParticipantContributions.ts b/src/vs/workbench/contrib/chat/browser/chatParticipantContributions.ts
index 43eb5d2be7b..8f9a2e9195b 100644
--- a/src/vs/workbench/contrib/chat/browser/chatParticipantContributions.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatParticipantContributions.ts
@@ -3,29 +3,30 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isNonEmptyArray } from 'vs/base/common/arrays';
-import * as strings from 'vs/base/common/strings';
-import { Codicon } from 'vs/base/common/codicons';
-import { Disposable, DisposableMap, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { localize, localize2 } from 'vs/nls';
-import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IViewContainersRegistry, IViewDescriptor, IViewsRegistry, ViewContainer, ViewContainerLocation, Extensions as ViewExtensions } from 'vs/workbench/common/views';
-import { CHAT_VIEW_ID } from 'vs/workbench/contrib/chat/browser/chat';
-import { CHAT_SIDEBAR_PANEL_ID, ChatViewPane } from 'vs/workbench/contrib/chat/browser/chatViewPane';
-import { ChatAgentLocation, IChatAgentData, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { IRawChatParticipantContribution } from 'vs/workbench/contrib/chat/common/chatParticipantContribTypes';
-import { isProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
-import * as extensionsRegistry from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { Action } from 'vs/base/common/actions';
-import { ICommandService } from 'vs/platform/commands/common/commands';
+import { coalesce, isNonEmptyArray } from '../../../../base/common/arrays.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Event } from '../../../../base/common/event.js';
+import { Disposable, DisposableMap, DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import * as strings from '../../../../base/common/strings.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { ViewPaneContainer } from '../../../browser/parts/views/viewPaneContainer.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IViewContainersRegistry, IViewDescriptor, IViewsRegistry, ViewContainer, ViewContainerLocation, Extensions as ViewExtensions } from '../../../common/views.js';
+import { isProposedApiEnabled } from '../../../services/extensions/common/extensions.js';
+import * as extensionsRegistry from '../../../services/extensions/common/extensionsRegistry.js';
+import { showExtensionsWithIdsCommandId } from '../../extensions/browser/extensionsActions.js';
+import { IExtension, IExtensionsWorkbenchService } from '../../extensions/common/extensions.js';
+import { ChatAgentLocation, IChatAgentData, IChatAgentService } from '../common/chatAgents.js';
+import { CONTEXT_CHAT_EDITING_PARTICIPANT_REGISTERED, CONTEXT_CHAT_EXTENSION_INVALID, CONTEXT_CHAT_PANEL_PARTICIPANT_REGISTERED } from '../common/chatContextKeys.js';
+import { IRawChatParticipantContribution } from '../common/chatParticipantContribTypes.js';
+import { CHAT_VIEW_ID } from './chat.js';
+import { CHAT_EDITING_SIDEBAR_PANEL_ID, CHAT_SIDEBAR_PANEL_ID, ChatViewPane } from './chatViewPane.js';
 
 const chatParticipantExtensionPoint = extensionsRegistry.ExtensionsRegistry.registerExtensionPoint<IRawChatParticipantContribution[]>({
 	extensionPoint: 'chatParticipants',
@@ -45,7 +46,7 @@ const chatParticipantExtensionPoint = extensionsRegistry.ExtensionsRegistry.regi
 				name: {
 					description: localize('chatParticipantName', "User-facing name for this chat participant. The user will use '@' with this name to invoke the participant. Name must not contain whitespace."),
 					type: 'string',
-					pattern: '^[\\w0-9_-]+$'
+					pattern: '^[\\w-]+$'
 				},
 				fullName: {
 					markdownDescription: localize('chatParticipantFullName', "The full name of this chat participant, which is shown as the label for responses coming from this participant. If not provided, {0} is used.", '`name`'),
@@ -63,6 +64,34 @@ const chatParticipantExtensionPoint = extensionsRegistry.ExtensionsRegistry.regi
 					description: localize('chatSampleRequest', "When the user clicks this participant in `/help`, this text will be submitted to the participant."),
 					type: 'string'
 				},
+				when: {
+					description: localize('chatParticipantWhen', "A condition which must be true to enable this participant."),
+					type: 'string'
+				},
+				disambiguation: {
+					description: localize('chatParticipantDisambiguation', "Metadata to help with automatically routing user questions to this chat participant."),
+					type: 'array',
+					items: {
+						additionalProperties: false,
+						type: 'object',
+						defaultSnippets: [{ body: { category: '', description: '', examples: [] } }],
+						required: ['category', 'description', 'examples'],
+						properties: {
+							category: {
+								markdownDescription: localize('chatParticipantDisambiguationCategory', "A detailed name for this category, e.g. `workspace_questions` or `web_questions`."),
+								type: 'string'
+							},
+							description: {
+								description: localize('chatParticipantDisambiguationDescription', "A detailed description of the kinds of questions that are suitable for this chat participant."),
+								type: 'string'
+							},
+							examples: {
+								description: localize('chatParticipantDisambiguationExamples', "A list of representative example questions that are suitable for this chat participant."),
+								type: 'array'
+							},
+						}
+					}
+				},
 				commands: {
 					markdownDescription: localize('chatCommandsDescription', "Commands available for this chat participant, which the user can invoke with a `/`."),
 					type: 'array',
@@ -92,9 +121,37 @@ const chatParticipantExtensionPoint = extensionsRegistry.ExtensionsRegistry.regi
 								description: localize('chatCommandSticky', "Whether invoking the command puts the chat into a persistent mode, where the command is automatically added to the chat input for the next message."),
 								type: 'boolean'
 							},
+							disambiguation: {
+								description: localize('chatCommandDisambiguation', "Metadata to help with automatically routing user questions to this chat command."),
+								type: 'array',
+								items: {
+									additionalProperties: false,
+									type: 'object',
+									defaultSnippets: [{ body: { category: '', description: '', examples: [] } }],
+									required: ['category', 'description', 'examples'],
+									properties: {
+										category: {
+											markdownDescription: localize('chatCommandDisambiguationCategory', "A detailed name for this category, e.g. `workspace_questions` or `web_questions`."),
+											type: 'string'
+										},
+										description: {
+											description: localize('chatCommandDisambiguationDescription', "A detailed description of the kinds of questions that are suitable for this chat command."),
+											type: 'string'
+										},
+										examples: {
+											description: localize('chatCommandDisambiguationExamples', "A list of representative example questions that are suitable for this chat command."),
+											type: 'array'
+										},
+									}
+								}
+							}
 						}
 					}
 				},
+				supportsToolReferences: {
+					description: localize('chatParticipantSupportsToolReferences', "Whether this participant supports {0}.", 'ChatRequest#toolReferences'),
+					type: 'boolean'
+				}
 			}
 		}
 	},
@@ -109,86 +166,25 @@ export class ChatExtensionPointHandler implements IWorkbenchContribution {
 
 	static readonly ID = 'workbench.contrib.chatExtensionPointHandler';
 
-	private readonly disposables = new DisposableStore();
-	private _welcomeViewDescriptor?: IViewDescriptor;
 	private _viewContainer: ViewContainer;
 	private _participantRegistrationDisposables = new DisposableMap<string>();
 
 	constructor(
 		@IChatAgentService private readonly _chatAgentService: IChatAgentService,
-		@IProductService private readonly productService: IProductService,
-		@IContextKeyService private readonly contextService: IContextKeyService,
-		@ILogService private readonly logService: ILogService,
-		@INotificationService private readonly notificationService: INotificationService,
-		@ICommandService private readonly commandService: ICommandService,
+		@ILogService private readonly logService: ILogService
 	) {
 		this._viewContainer = this.registerViewContainer();
-		this.registerListeners();
+		this.registerDefaultParticipantView();
+		this.registerChatEditingView();
 		this.handleAndRegisterChatExtensions();
 	}
 
-	private registerListeners() {
-		this.contextService.onDidChangeContext(e => {
-
-			if (!this.productService.chatWelcomeView) {
-				return;
-			}
-
-			const showWelcomeViewConfigKey = 'workbench.chat.experimental.showWelcomeView';
-			const keys = new Set([showWelcomeViewConfigKey]);
-			if (e.affectsSome(keys)) {
-				const contextKeyExpr = ContextKeyExpr.equals(showWelcomeViewConfigKey, true);
-				const viewsRegistry = Registry.as<IViewsRegistry>(ViewExtensions.ViewsRegistry);
-				if (this.contextService.contextMatchesRules(contextKeyExpr)) {
-					this._welcomeViewDescriptor = {
-						id: CHAT_VIEW_ID,
-						name: { original: this.productService.chatWelcomeView.welcomeViewTitle, value: this.productService.chatWelcomeView.welcomeViewTitle },
-						containerIcon: this._viewContainer.icon,
-						ctorDescriptor: new SyncDescriptor(ChatViewPane),
-						canToggleVisibility: false,
-						canMoveView: true,
-						order: 100
-					};
-					viewsRegistry.registerViews([this._welcomeViewDescriptor], this._viewContainer);
-
-					viewsRegistry.registerViewWelcomeContent(CHAT_VIEW_ID, {
-						content: this.productService.chatWelcomeView.welcomeViewContent,
-					});
-				} else if (this._welcomeViewDescriptor) {
-					viewsRegistry.deregisterViews([this._welcomeViewDescriptor], this._viewContainer);
-				}
-			}
-		}, null, this.disposables);
-	}
-
 	private handleAndRegisterChatExtensions(): void {
 		chatParticipantExtensionPoint.setHandler((extensions, delta) => {
 			for (const extension of delta.added) {
-				// Detect old version of Copilot Chat extension.
-				// TODO@roblourens remove after one release, after this we will rely on things like the API version
-				if (extension.value.some(participant => participant.id === 'github.copilot.default' && !participant.fullName)) {
-					this.notificationService.notify({
-						severity: Severity.Error,
-						message: localize('chatFailErrorMessage', "Chat failed to load. Please ensure that the GitHub Copilot Chat extension is up to date."),
-						actions: {
-							primary: [
-								new Action('showExtension', localize('action.showExtension', "Show Extension"), undefined, true, () => {
-									return this.commandService.executeCommand('workbench.extensions.action.showExtensionsWithIds', ['GitHub.copilot-chat']);
-								})
-							]
-						}
-					});
-					continue;
-				}
-
-				if (this.productService.quality === 'stable' && !isProposedApiEnabled(extension.description, 'chatParticipantPrivate')) {
-					this.logService.warn(`Chat participants are not yet enabled in VS Code Stable (${extension.description.identifier.value})`);
-					continue;
-				}
-
 				for (const providerDescriptor of extension.value) {
-					if (!providerDescriptor.name.match(/^[\w0-9_-]+$/)) {
-						this.logService.error(`Extension '${extension.description.identifier.value}' CANNOT register participant with invalid name: ${providerDescriptor.name}. Name must match /^[\\w0-9_-]+$/.`);
+					if (!providerDescriptor.name?.match(/^[\w-]+$/)) {
+						this.logService.error(`Extension '${extension.description.identifier.value}' CANNOT register participant with invalid name: ${providerDescriptor.name}. Name must match /^[\\w-]+$/.`);
 						continue;
 					}
 
@@ -208,7 +204,7 @@ export class ChatExtensionPointHandler implements IWorkbenchContribution {
 						continue;
 					}
 
-					if ((providerDescriptor.defaultImplicitVariables || providerDescriptor.locations) && !isProposedApiEnabled(extension.description, 'chatParticipantAdditions')) {
+					if ((providerDescriptor.defaultImplicitVariables || providerDescriptor.locations || providerDescriptor.supportsModelPicker) && !isProposedApiEnabled(extension.description, 'chatParticipantAdditions')) {
 						this.logService.error(`Extension '${extension.description.identifier.value}' CANNOT use API proposal: chatParticipantAdditions.`);
 						continue;
 					}
@@ -218,16 +214,30 @@ export class ChatExtensionPointHandler implements IWorkbenchContribution {
 						continue;
 					}
 
+					const participantsAndCommandsDisambiguation: {
+						category: string;
+						description: string;
+						examples: string[];
+					}[] = [];
+
+					if (isProposedApiEnabled(extension.description, 'contribChatParticipantDetection')) {
+						if (providerDescriptor.disambiguation?.length) {
+							participantsAndCommandsDisambiguation.push(...providerDescriptor.disambiguation.map((d) => ({
+								...d, category: d.category ?? d.categoryName
+							})));
+						}
+						if (providerDescriptor.commands) {
+							for (const command of providerDescriptor.commands) {
+								if (command.disambiguation?.length) {
+									participantsAndCommandsDisambiguation.push(...command.disambiguation.map((d) => ({
+										...d, category: d.category ?? d.categoryName
+									})));
+								}
+							}
+						}
+					}
+
 					const store = new DisposableStore();
-					if (providerDescriptor.isDefault && (!providerDescriptor.locations || providerDescriptor.locations?.includes(ChatAgentLocation.Panel))) {
-						store.add(this.registerDefaultParticipantView(providerDescriptor));
-					}
-
-					if (providerDescriptor.when && !isProposedApiEnabled(extension.description, 'chatParticipantAdditions')) {
-						this.logService.error(`Extension '${extension.description.identifier.value}' CANNOT use API proposal: chatParticipantAdditions.`);
-						continue;
-					}
-
 					store.add(this._chatAgentService.registerAgent(
 						providerDescriptor.id,
 						{
@@ -237,6 +247,7 @@ export class ChatExtensionPointHandler implements IWorkbenchContribution {
 							extensionDisplayName: extension.description.displayName ?? extension.description.name,
 							id: providerDescriptor.id,
 							description: providerDescriptor.description,
+							supportsModelPicker: providerDescriptor.supportsModelPicker,
 							when: providerDescriptor.when,
 							metadata: {
 								isSticky: providerDescriptor.isSticky,
@@ -245,11 +256,12 @@ export class ChatExtensionPointHandler implements IWorkbenchContribution {
 							name: providerDescriptor.name,
 							fullName: providerDescriptor.fullName,
 							isDefault: providerDescriptor.isDefault,
-							defaultImplicitVariables: providerDescriptor.defaultImplicitVariables,
 							locations: isNonEmptyArray(providerDescriptor.locations) ?
 								providerDescriptor.locations.map(ChatAgentLocation.fromRaw) :
 								[ChatAgentLocation.Panel],
-							slashCommands: providerDescriptor.commands ?? []
+							slashCommands: providerDescriptor.commands ?? [],
+							disambiguation: coalesce(participantsAndCommandsDisambiguation.flat()),
+							supportsToolReferences: providerDescriptor.supportsToolReferences,
 						} satisfies IChatAgentData));
 
 					this._participantRegistrationDisposables.set(
@@ -261,7 +273,7 @@ export class ChatExtensionPointHandler implements IWorkbenchContribution {
 
 			for (const extension of delta.removed) {
 				for (const providerDescriptor of extension.value) {
-					this._participantRegistrationDisposables.deleteAndDispose(getParticipantKey(extension.description.identifier, providerDescriptor.name));
+					this._participantRegistrationDisposables.deleteAndDispose(getParticipantKey(extension.description.identifier, providerDescriptor.id));
 				}
 			}
 		});
@@ -285,15 +297,9 @@ export class ChatExtensionPointHandler implements IWorkbenchContribution {
 		return viewContainer;
 	}
 
-	private hasRegisteredDefaultParticipantView = false;
-	private registerDefaultParticipantView(defaultParticipantDescriptor: IRawChatParticipantContribution): IDisposable {
-		if (this.hasRegisteredDefaultParticipantView) {
-			this.logService.warn(`Tried to register a second default chat participant view for "${defaultParticipantDescriptor.id}"`);
-			return Disposable.None;
-		}
-
-		// Register View
-		const name = defaultParticipantDescriptor.fullName ?? defaultParticipantDescriptor.name;
+	private registerDefaultParticipantView(): IDisposable {
+		// Register View. Name must be hardcoded because we want to show it even when the extension fails to load due to an API version incompatibility.
+		const name = 'GitHub Copilot';
 		const viewDescriptor: IViewDescriptor[] = [{
 			id: CHAT_VIEW_ID,
 			containerIcon: this._viewContainer.icon,
@@ -303,17 +309,98 @@ export class ChatExtensionPointHandler implements IWorkbenchContribution {
 			canToggleVisibility: false,
 			canMoveView: true,
 			ctorDescriptor: new SyncDescriptor(ChatViewPane),
+			when: ContextKeyExpr.or(CONTEXT_CHAT_PANEL_PARTICIPANT_REGISTERED, CONTEXT_CHAT_EXTENSION_INVALID)
 		}];
-		this.hasRegisteredDefaultParticipantView = true;
 		Registry.as<IViewsRegistry>(ViewExtensions.ViewsRegistry).registerViews(viewDescriptor, this._viewContainer);
 
 		return toDisposable(() => {
-			this.hasRegisteredDefaultParticipantView = false;
 			Registry.as<IViewsRegistry>(ViewExtensions.ViewsRegistry).deregisterViews(viewDescriptor, this._viewContainer);
 		});
 	}
+
+	private registerChatEditingView(): IDisposable {
+		const title = localize2('chatEditing.viewContainer.label', "Copilot Edits");
+		const icon = Codicon.requestChanges;
+		const viewContainerId = CHAT_EDITING_SIDEBAR_PANEL_ID;
+		const viewContainer: ViewContainer = Registry.as<IViewContainersRegistry>(ViewExtensions.ViewContainersRegistry).registerViewContainer({
+			id: viewContainerId,
+			title,
+			icon,
+			ctorDescriptor: new SyncDescriptor(ViewPaneContainer, [viewContainerId, { mergeViewWithContainerWhenSingleView: true }]),
+			storageId: viewContainerId,
+			hideIfEmpty: true,
+			order: 100,
+		}, ViewContainerLocation.AuxiliaryBar);
+
+		const id = 'workbench.panel.chat.view.edits';
+		const viewDescriptor: IViewDescriptor[] = [{
+			id: id,
+			containerIcon: viewContainer.icon,
+			containerTitle: title.value,
+			singleViewPaneContainerTitle: title.value,
+			name: { value: title.value, original: title.value },
+			canToggleVisibility: false,
+			canMoveView: true,
+			ctorDescriptor: new SyncDescriptor(ChatViewPane, [{ id, title: title.value }, { location: ChatAgentLocation.EditingSession }]),
+			when: CONTEXT_CHAT_EDITING_PARTICIPANT_REGISTERED
+		}];
+		Registry.as<IViewsRegistry>(ViewExtensions.ViewsRegistry).registerViews(viewDescriptor, viewContainer);
+
+		return toDisposable(() => {
+			Registry.as<IViewContainersRegistry>(ViewExtensions.ViewContainersRegistry).deregisterViewContainer(viewContainer);
+			Registry.as<IViewsRegistry>(ViewExtensions.ViewsRegistry).deregisterViews(viewDescriptor, viewContainer);
+		});
+	}
 }
 
 function getParticipantKey(extensionId: ExtensionIdentifier, participantName: string): string {
 	return `${extensionId.value}_${participantName}`;
 }
+
+export class ChatCompatibilityNotifier extends Disposable implements IWorkbenchContribution {
+	static readonly ID = 'workbench.contrib.chatCompatNotifier';
+
+	private registeredWelcomeView = false;
+
+	constructor(
+		@IExtensionsWorkbenchService extensionsWorkbenchService: IExtensionsWorkbenchService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IProductService private readonly productService: IProductService,
+	) {
+		super();
+
+		// It may be better to have some generic UI for this, for any extension that is incompatible,
+		// but this is only enabled for Copilot Chat now and it needs to be obvious.
+		const isInvalid = CONTEXT_CHAT_EXTENSION_INVALID.bindTo(contextKeyService);
+		this._register(Event.runAndSubscribe(
+			extensionsWorkbenchService.onDidChangeExtensionsNotification,
+			() => {
+				const notification = extensionsWorkbenchService.getExtensionsNotification();
+				const chatExtension = notification?.extensions.find(ext => ext.identifier.id === 'github.copilot-chat');
+				if (chatExtension) {
+					isInvalid.set(true);
+					this.registerWelcomeView(chatExtension);
+				} else {
+					isInvalid.set(false);
+				}
+			}
+		));
+	}
+
+	private registerWelcomeView(chatExtension: IExtension) {
+		if (this.registeredWelcomeView) {
+			return;
+		}
+
+		this.registeredWelcomeView = true;
+		const showExtensionLabel = localize('showExtension', "Show Extension");
+		const mainMessage = localize('chatFailErrorMessage', "Chat failed to load because the installed version of the {0} extension is not compatible with this version of {1}. Please ensure that the GitHub Copilot Chat extension is up to date.", 'GitHub Copilot Chat', this.productService.nameLong);
+		const commandButton = `[${showExtensionLabel}](command:${showExtensionsWithIdsCommandId}?${encodeURIComponent(JSON.stringify([['GitHub.copilot-chat']]))})`;
+		const versionMessage = `GitHub Copilot Chat version: ${chatExtension.version}`;
+		const viewsRegistry = Registry.as<IViewsRegistry>(ViewExtensions.ViewsRegistry);
+		this._register(viewsRegistry.registerViewWelcomeContent(CHAT_VIEW_ID, {
+			content: [mainMessage, commandButton, versionMessage].join('\n\n'),
+			when: CONTEXT_CHAT_EXTENSION_INVALID,
+		}));
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatPasteProviders.ts b/src/vs/workbench/contrib/chat/browser/chatPasteProviders.ts
new file mode 100644
index 00000000000..a396f7674ef
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatPasteProviders.ts
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IReadonlyVSDataTransfer } from '../../../../base/common/dataTransfer.js';
+import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
+import { IRange } from '../../../../editor/common/core/range.js';
+import { DocumentPasteContext, DocumentPasteEditProvider, DocumentPasteEditsSession } from '../../../../editor/common/languages.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ChatInputPart } from './chatInputPart.js';
+
+
+export class PasteImageProvider implements DocumentPasteEditProvider {
+
+	public readonly kind = new HierarchicalKind('image');
+
+	public readonly pasteMimeTypes = ['image/*'];
+
+	async provideDocumentPasteEdits(_model: ITextModel, _ranges: readonly IRange[], dataTransfer: IReadonlyVSDataTransfer, context: DocumentPasteContext, token: CancellationToken): Promise<DocumentPasteEditsSession | undefined> {
+		// TODO: @justschen setup image data types
+		// const entry = dataTransfer.get('image/png') || dataTransfer.get('image/jpeg') || dataTransfer.get('image/gif') || dataTransfer.get('image/webp');
+		return;
+	}
+}
+
+export class ChatPasteProvidersFeature extends Disposable {
+	constructor(
+		@ILanguageFeaturesService languageFeaturesService: ILanguageFeaturesService,
+	) {
+		super();
+		this._register(languageFeaturesService.documentPasteEditProvider.register({ scheme: ChatInputPart.INPUT_SCHEME, pattern: '*', hasAccessToAllModels: true }, new PasteImageProvider()));
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatQuick.ts b/src/vs/workbench/contrib/chat/browser/chatQuick.ts
index f40ad589c60..0233da52614 100644
--- a/src/vs/workbench/contrib/chat/browser/chatQuick.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatQuick.ts
@@ -3,27 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { Orientation, Sash } from 'vs/base/browser/ui/sash/sash';
-import { disposableTimeout } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { Selection } from 'vs/editor/common/core/selection';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
-import { IQuickInputService, IQuickWidget } from 'vs/platform/quickinput/common/quickInput';
-import { editorBackground, inputBackground, quickInputBackground, quickInputForeground } from 'vs/platform/theme/common/colorRegistry';
-import { IQuickChatOpenOptions, IQuickChatService, showChatView } from 'vs/workbench/contrib/chat/browser/chat';
-import { ChatWidget } from 'vs/workbench/contrib/chat/browser/chatWidget';
-import { ChatAgentLocation } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { ChatModel } from 'vs/workbench/contrib/chat/common/chatModel';
-import { IParsedChatRequest } from 'vs/workbench/contrib/chat/common/chatParserTypes';
-import { IChatProgress, IChatService } from 'vs/workbench/contrib/chat/common/chatService';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
+import * as dom from '../../../../base/browser/dom.js';
+import { Orientation, Sash } from '../../../../base/browser/ui/sash/sash.js';
+import { disposableTimeout } from '../../../../base/common/async.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, DisposableStore, IDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { Selection } from '../../../../editor/common/core/selection.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { ILayoutService } from '../../../../platform/layout/browser/layoutService.js';
+import { IQuickInputService, IQuickWidget } from '../../../../platform/quickinput/common/quickInput.js';
+import { editorBackground, inputBackground, quickInputBackground, quickInputForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import { IQuickChatOpenOptions, IQuickChatService, showChatView } from './chat.js';
+import { ChatWidget } from './chatWidget.js';
+import { ChatAgentLocation } from '../common/chatAgents.js';
+import { ChatModel } from '../common/chatModel.js';
+import { IParsedChatRequest } from '../common/chatParserTypes.js';
+import { IChatProgress, IChatService } from '../common/chatService.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { EDITOR_DRAG_AND_DROP_BACKGROUND } from '../../../common/theme.js';
 
 export class QuickChatService extends Disposable implements IQuickChatService {
 	readonly _serviceBrand: undefined;
@@ -219,11 +220,12 @@ class QuickChat extends Disposable {
 			scopedInstantiationService.createInstance(
 				ChatWidget,
 				ChatAgentLocation.Panel,
-				{ resource: true },
+				{ isQuickChat: true },
 				{ renderInputOnTop: true, renderStyle: 'compact', menus: { inputSideToolbar: MenuId.ChatInputSide } },
 				{
 					listForeground: quickInputForeground,
 					listBackground: quickInputBackground,
+					overlayBackground: EDITOR_DRAG_AND_DROP_BACKGROUND,
 					inputEditorBackground: inputBackground,
 					resultEditorBackground: editorBackground
 				}));
diff --git a/src/vs/workbench/contrib/chat/browser/chatResponseAccessibleView.ts b/src/vs/workbench/contrib/chat/browser/chatResponseAccessibleView.ts
index 009d9f4c3b1..a6ef61d4b91 100644
--- a/src/vs/workbench/contrib/chat/browser/chatResponseAccessibleView.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatResponseAccessibleView.ts
@@ -3,17 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { renderMarkdownAsPlaintext } from 'vs/base/browser/markdownRenderer';
-import { IMarkdownString, MarkdownString } from 'vs/base/common/htmlContent';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { AccessibleViewProviderId, AccessibleViewType } from 'vs/platform/accessibility/browser/accessibleView';
-import { alertAccessibleViewFocusChange, IAccessibleViewImplentation } from 'vs/platform/accessibility/browser/accessibleViewRegistry';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { IChatWidgetService, IChatWidget } from 'vs/workbench/contrib/chat/browser/chat';
-import { CONTEXT_IN_CHAT_SESSION } from 'vs/workbench/contrib/chat/common/chatContextKeys';
-import { ChatWelcomeMessageModel } from 'vs/workbench/contrib/chat/common/chatModel';
-import { isResponseVM } from 'vs/workbench/contrib/chat/common/chatViewModel';
+import { renderMarkdownAsPlaintext } from '../../../../base/browser/markdownRenderer.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { AccessibleViewProviderId, AccessibleViewType, IAccessibleViewContentProvider } from '../../../../platform/accessibility/browser/accessibleView.js';
+import { IAccessibleViewImplentation } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
+import { CONTEXT_IN_CHAT_SESSION } from '../common/chatContextKeys.js';
+import { isResponseVM } from '../common/chatViewModel.js';
+import { ChatTreeItem, IChatWidget, IChatWidgetService } from './chat.js';
 
 export class ChatResponseAccessibleView implements IAccessibleViewImplentation {
 	readonly priority = 100;
@@ -22,78 +21,77 @@ export class ChatResponseAccessibleView implements IAccessibleViewImplentation {
 	readonly when = CONTEXT_IN_CHAT_SESSION;
 	getProvider(accessor: ServicesAccessor) {
 		const widgetService = accessor.get(IChatWidgetService);
-		const codeEditorService = accessor.get(ICodeEditorService);
-		return resolveProvider(widgetService, codeEditorService, true);
-		function resolveProvider(widgetService: IChatWidgetService, codeEditorService: ICodeEditorService, initialRender?: boolean) {
-			const widget = widgetService.lastFocusedWidget;
-			if (!widget) {
-				return;
-			}
-			const chatInputFocused = initialRender && !!codeEditorService.getFocusedCodeEditor();
-			if (initialRender && chatInputFocused) {
-				widget.focusLastMessage();
-			}
+		const widget = widgetService.lastFocusedWidget;
+		if (!widget) {
+			return;
+		}
+		const chatInputFocused = widget.hasInputFocus();
+		if (chatInputFocused) {
+			widget.focusLastMessage();
+		}
 
-			if (!widget) {
-				return;
-			}
+		const verifiedWidget: IChatWidget = widget;
+		const focusedItem = verifiedWidget.getFocus();
 
-			const verifiedWidget: IChatWidget = widget;
-			const focusedItem = verifiedWidget.getFocus();
+		if (!focusedItem) {
+			return;
+		}
 
-			if (!focusedItem) {
-				return;
-			}
+		return new ChatResponseAccessibleProvider(verifiedWidget, focusedItem, chatInputFocused);
+	}
+}
 
-			widget.focus(focusedItem);
-			const isWelcome = focusedItem instanceof ChatWelcomeMessageModel;
-			let responseContent = isResponseVM(focusedItem) ? focusedItem.response.asString() : undefined;
-			if (isWelcome) {
-				const welcomeReplyContents = [];
-				for (const content of focusedItem.content) {
-					if (Array.isArray(content)) {
-						welcomeReplyContents.push(...content.map(m => m.message));
-					} else {
-						welcomeReplyContents.push((content as IMarkdownString).value);
-					}
-				}
-				responseContent = welcomeReplyContents.join('\n');
-			}
-			if (!responseContent && 'errorDetails' in focusedItem && focusedItem.errorDetails) {
-				responseContent = focusedItem.errorDetails.message;
-			}
-			if (!responseContent) {
-				return;
-			}
-			const responses = verifiedWidget.viewModel?.getItems().filter(i => isResponseVM(i));
-			const length = responses?.length;
-			const responseIndex = responses?.findIndex(i => i === focusedItem);
+class ChatResponseAccessibleProvider extends Disposable implements IAccessibleViewContentProvider {
+	private _focusedItem: ChatTreeItem;
+	constructor(
+		private readonly _widget: IChatWidget,
+		item: ChatTreeItem,
+		private readonly _chatInputFocused: boolean
+	) {
+		super();
+		this._focusedItem = item;
+	}
 
-			return {
-				id: AccessibleViewProviderId.Chat,
-				verbositySettingKey: AccessibilityVerbositySettingId.Chat,
-				provideContent(): string { return renderMarkdownAsPlaintext(new MarkdownString(responseContent), true); },
-				onClose() {
-					verifiedWidget.reveal(focusedItem);
-					if (chatInputFocused) {
-						verifiedWidget.focusInput();
-					} else {
-						verifiedWidget.focus(focusedItem);
-					}
-				},
-				next() {
-					verifiedWidget.moveFocus(focusedItem, 'next');
-					alertAccessibleViewFocusChange(responseIndex, length, 'next');
-					resolveProvider(widgetService, codeEditorService);
-				},
-				previous() {
-					verifiedWidget.moveFocus(focusedItem, 'previous');
-					alertAccessibleViewFocusChange(responseIndex, length, 'previous');
-					resolveProvider(widgetService, codeEditorService);
-				},
-				options: { type: AccessibleViewType.View }
-			};
+	readonly id = AccessibleViewProviderId.Chat;
+	readonly verbositySettingKey = AccessibilityVerbositySettingId.Chat;
+	readonly options = { type: AccessibleViewType.View };
+
+	provideContent(): string {
+		return this._getContent(this._focusedItem);
+	}
+
+	private _getContent(item: ChatTreeItem): string {
+		let responseContent = isResponseVM(item) ? item.response.toString() : '';
+		if (!responseContent && 'errorDetails' in item && item.errorDetails) {
+			responseContent = item.errorDetails.message;
+		}
+		return renderMarkdownAsPlaintext(new MarkdownString(responseContent), true);
+	}
+
+	onClose(): void {
+		this._widget.reveal(this._focusedItem);
+		if (this._chatInputFocused) {
+			this._widget.focusInput();
+		} else {
+			this._widget.focus(this._focusedItem);
 		}
 	}
-	dispose() { }
+
+	provideNextContent(): string | undefined {
+		const next = this._widget.getSibling(this._focusedItem, 'next');
+		if (next) {
+			this._focusedItem = next;
+			return this._getContent(next);
+		}
+		return;
+	}
+
+	providePreviousContent(): string | undefined {
+		const previous = this._widget.getSibling(this._focusedItem, 'previous');
+		if (previous) {
+			this._focusedItem = previous;
+			return this._getContent(previous);
+		}
+		return;
+	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatVariables.ts b/src/vs/workbench/contrib/chat/browser/chatVariables.ts
index 61b4ee1984f..5acdce8b0a7 100644
--- a/src/vs/workbench/contrib/chat/browser/chatVariables.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatVariables.ts
@@ -3,23 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { basename } from 'vs/base/common/path';
-import { coalesce } from 'vs/base/common/arrays';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { onUnexpectedExternalError } from 'vs/base/common/errors';
-import { Iterable } from 'vs/base/common/iterator';
-import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { Location } from 'vs/editor/common/languages';
-import { IChatWidgetService, showChatView } from 'vs/workbench/contrib/chat/browser/chat';
-import { ChatDynamicVariableModel } from 'vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
-import { ChatAgentLocation } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { IChatModel, IChatRequestVariableData, IChatRequestVariableEntry } from 'vs/workbench/contrib/chat/common/chatModel';
-import { ChatRequestDynamicVariablePart, ChatRequestVariablePart, IParsedChatRequest } from 'vs/workbench/contrib/chat/common/chatParserTypes';
-import { IChatContentReference } from 'vs/workbench/contrib/chat/common/chatService';
-import { IChatRequestVariableValue, IChatVariableData, IChatVariableResolver, IChatVariableResolverProgress, IChatVariablesService, IDynamicVariable } from 'vs/workbench/contrib/chat/common/chatVariables';
-import { ChatContextAttachments } from 'vs/workbench/contrib/chat/browser/contrib/chatContextAttachments';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
+import { coalesce } from '../../../../base/common/arrays.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { onUnexpectedExternalError } from '../../../../base/common/errors.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { basename } from '../../../../base/common/path.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Location } from '../../../../editor/common/languages.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { ChatAgentLocation } from '../common/chatAgents.js';
+import { IChatModel, IChatRequestVariableData, IChatRequestVariableEntry } from '../common/chatModel.js';
+import { ChatRequestDynamicVariablePart, ChatRequestToolPart, ChatRequestVariablePart, IParsedChatRequest } from '../common/chatParserTypes.js';
+import { IChatContentReference } from '../common/chatService.js';
+import { IChatRequestVariableValue, IChatVariableData, IChatVariableResolver, IChatVariableResolverProgress, IChatVariablesService, IDynamicVariable } from '../common/chatVariables.js';
+import { IChatWidgetService, showChatView } from './chat.js';
+import { ChatContextAttachments } from './contrib/chatContextAttachments.js';
+import { ChatDynamicVariableModel } from './contrib/chatDynamicVariables.js';
 
 interface IChatData {
 	data: IChatVariableData;
@@ -56,12 +57,14 @@ export class ChatVariablesService implements IChatVariablesService {
 						};
 						jobs.push(data.resolver(prompt.text, part.variableArg, model, variableProgressCallback, token).then(value => {
 							if (value) {
-								resolvedVariables[i] = { id: data.data.id, modelDescription: data.data.modelDescription, name: part.variableName, range: part.range, value, references };
+								resolvedVariables[i] = { id: data.data.id, modelDescription: data.data.modelDescription, name: part.variableName, range: part.range, value, references, fullName: data.data.fullName, icon: data.data.icon };
 							}
 						}).catch(onUnexpectedExternalError));
 					}
 				} else if (part instanceof ChatRequestDynamicVariablePart) {
-					resolvedVariables[i] = { id: part.id, name: part.referenceText, range: part.range, value: part.data };
+					resolvedVariables[i] = { id: part.id, name: part.referenceText, range: part.range, value: part.data, fullName: part.fullName, icon: part.icon };
+				} else if (part instanceof ChatRequestToolPart) {
+					resolvedVariables[i] = { id: part.toolId, name: part.toolName, range: part.range, value: undefined, isTool: true, icon: ThemeIcon.isThemeIcon(part.icon) ? part.icon : undefined, fullName: part.displayName };
 				}
 			});
 
@@ -80,21 +83,25 @@ export class ChatVariablesService implements IChatVariablesService {
 					};
 					jobs.push(data.resolver(prompt.text, '', model, variableProgressCallback, token).then(value => {
 						if (value) {
-							resolvedAttachedContext[i] = { id: data.data.id, modelDescription: data.data.modelDescription, name: attachment.name, range: attachment.range, value, references };
+							resolvedAttachedContext[i] = { id: data.data.id, modelDescription: data.data.modelDescription, name: attachment.name, fullName: attachment.fullName, range: attachment.range, value, references, icon: attachment.icon };
 						}
 					}).catch(onUnexpectedExternalError));
-				} else if (attachment.isDynamic) {
-					resolvedAttachedContext[i] = { id: attachment.id, name: attachment.name, value: attachment.value };
+				} else if (attachment.isDynamic || attachment.isTool) {
+					resolvedAttachedContext[i] = { ...attachment };
 				}
 			});
 
 		await Promise.allSettled(jobs);
 
+		// Make array not sparse
 		resolvedVariables = coalesce<IChatRequestVariableEntry>(resolvedVariables);
 
 		// "reverse", high index first so that replacement is simple
 		resolvedVariables.sort((a, b) => b.range!.start - a.range!.start);
-		resolvedVariables.push(...resolvedAttachedContext);
+
+		// resolvedAttachedContext is a sparse array
+		resolvedVariables.push(...coalesce(resolvedAttachedContext));
+
 
 		return {
 			variables: resolvedVariables,
@@ -118,9 +125,12 @@ export class ChatVariablesService implements IChatVariablesService {
 		return this._resolver.get(name.toLowerCase())?.data;
 	}
 
-	getVariables(): Iterable<Readonly<IChatVariableData>> {
+	getVariables(location: ChatAgentLocation): Iterable<Readonly<IChatVariableData>> {
 		const all = Iterable.map(this._resolver.values(), data => data.data);
-		return Iterable.filter(all, data => !data.hidden);
+		return Iterable.filter(all, data => {
+			// TODO@jrieken this is improper and should be know from the variable registeration data
+			return location !== ChatAgentLocation.Editor || !new Set(['selection', 'editor']).has(data.name);
+		});
 	}
 
 	getDynamicVariables(sessionId: string): ReadonlyArray<IDynamicVariable> {
@@ -157,8 +167,7 @@ export class ChatVariablesService implements IChatVariablesService {
 			return;
 		}
 
-		await showChatView(this.viewsService);
-		const widget = this.chatWidgetService.lastFocusedWidget;
+		const widget = this.chatWidgetService.lastFocusedWidget ?? await showChatView(this.viewsService);
 		if (!widget || !widget.viewModel) {
 			return;
 		}
diff --git a/src/vs/workbench/contrib/chat/browser/chatViewPane.ts b/src/vs/workbench/contrib/chat/browser/chatViewPane.ts
index b0c54404399..19b0ee18b0f 100644
--- a/src/vs/workbench/contrib/chat/browser/chatViewPane.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatViewPane.ts
@@ -3,39 +3,39 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { editorBackground } from 'vs/platform/theme/common/colorRegistry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IViewPaneOptions, ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
-import { Memento } from 'vs/workbench/common/memento';
-import { SIDE_BAR_FOREGROUND } from 'vs/workbench/common/theme';
-import { IViewDescriptorService } from 'vs/workbench/common/views';
-import { IChatViewPane } from 'vs/workbench/contrib/chat/browser/chat';
-import { IChatViewState, ChatWidget } from 'vs/workbench/contrib/chat/browser/chatWidget';
-import { ChatAgentLocation, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { CHAT_PROVIDER_ID } from 'vs/workbench/contrib/chat/common/chatParticipantContribTypes';
-import { ChatModelInitState, IChatModel } from 'vs/workbench/contrib/chat/common/chatModel';
-import { IChatService } from 'vs/workbench/contrib/chat/common/chatService';
-import { IChatViewTitleActionContext } from 'vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { editorBackground } from '../../../../platform/theme/common/colorRegistry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IViewPaneOptions, ViewPane } from '../../../browser/parts/views/viewPane.js';
+import { Memento } from '../../../common/memento.js';
+import { SIDE_BAR_FOREGROUND } from '../../../common/theme.js';
+import { IViewDescriptorService } from '../../../common/views.js';
+import { ChatAgentLocation, IChatAgentService } from '../common/chatAgents.js';
+import { ChatModelInitState, IChatModel } from '../common/chatModel.js';
+import { CHAT_PROVIDER_ID } from '../common/chatParticipantContribTypes.js';
+import { IChatService } from '../common/chatService.js';
+import { IChatViewTitleActionContext } from './actions/chatActions.js';
+import { ChatWidget, IChatViewState } from './chatWidget.js';
 
 interface IViewPaneState extends IChatViewState {
 	sessionId?: string;
 }
 
 export const CHAT_SIDEBAR_PANEL_ID = 'workbench.panel.chatSidebar';
-export class ChatViewPane extends ViewPane implements IChatViewPane {
+export const CHAT_EDITING_SIDEBAR_PANEL_ID = 'workbench.panel.chatEditing';
+export class ChatViewPane extends ViewPane {
 	private _widget!: ChatWidget;
 	get widget(): ChatWidget { return this._widget; }
 
@@ -44,9 +44,12 @@ export class ChatViewPane extends ViewPane implements IChatViewPane {
 	private readonly viewState: IViewPaneState;
 	private didProviderRegistrationFail = false;
 	private didUnregisterProvider = false;
+	// check to display the welcome view right away while awaiting chat agents to register
+	private isInitialized = false;
 
 	constructor(
 		options: IViewPaneOptions,
+		private readonly chatOptions: { location: ChatAgentLocation.Panel | ChatAgentLocation.EditingSession } = { location: ChatAgentLocation.Panel },
 		@IKeybindingService keybindingService: IKeybindingService,
 		@IContextMenuService contextMenuService: IContextMenuService,
 		@IConfigurationService configurationService: IConfigurationService,
@@ -65,10 +68,11 @@ export class ChatViewPane extends ViewPane implements IChatViewPane {
 		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
 
 		// View state for the ViewPane is currently global per-provider basically, but some other strictly per-model state will require a separate memento.
-		this.memento = new Memento('interactive-session-view-' + CHAT_PROVIDER_ID, this.storageService);
+		this.memento = new Memento('interactive-session-view-' + CHAT_PROVIDER_ID + (this.chatOptions.location === ChatAgentLocation.EditingSession ? `-edits` : ''), this.storageService);
 		this.viewState = this.memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE) as IViewPaneState;
 		this._register(this.chatAgentService.onDidChangeAgents(() => {
-			if (this.chatAgentService.getDefaultAgent(ChatAgentLocation.Panel)) {
+			this.isInitialized = true;
+			if (this.chatAgentService.getDefaultAgent(this.chatOptions?.location)) {
 				if (!this._widget?.viewModel) {
 					const sessionId = this.getSessionId();
 					const model = sessionId ? this.chatService.getOrRestoreSession(sessionId) : undefined;
@@ -76,6 +80,7 @@ export class ChatViewPane extends ViewPane implements IChatViewPane {
 					// The widget may be hidden at this point, because welcome views were allowed. Use setVisible to
 					// avoid doing a render while the widget is hidden. This is changing the condition in `shouldShowWelcome`
 					// so it should fire onDidChangeViewWelcomeState.
+					const wasVisible = this._widget.visible;
 					try {
 						this._widget.setVisible(false);
 						this.updateModel(model);
@@ -83,14 +88,15 @@ export class ChatViewPane extends ViewPane implements IChatViewPane {
 						this.didUnregisterProvider = false;
 						this._onDidChangeViewWelcomeState.fire();
 					} finally {
-						this.widget.setVisible(true);
+						this.widget.setVisible(wasVisible);
 					}
 				}
 			} else if (this._widget?.viewModel?.initState === ChatModelInitState.Initialized) {
 				// Model is initialized, and the default agent disappeared, so show welcome view
 				this.didUnregisterProvider = true;
-				this._onDidChangeViewWelcomeState.fire();
 			}
+
+			this._onDidChangeViewWelcomeState.fire();
 		}));
 	}
 
@@ -100,23 +106,31 @@ export class ChatViewPane extends ViewPane implements IChatViewPane {
 		};
 	}
 
-	private updateModel(model?: IChatModel | undefined, viewState?: IViewPaneState): void {
+	private updateModel(model?: IChatModel | undefined, viewState?: IChatViewState): void {
 		this.modelDisposables.clear();
 
 		model = model ?? (this.chatService.transferredSessionData?.sessionId
 			? this.chatService.getOrRestoreSession(this.chatService.transferredSessionData.sessionId)
-			: this.chatService.startSession(ChatAgentLocation.Panel, CancellationToken.None));
+			: this.chatService.startSession(this.chatOptions.location, CancellationToken.None));
 		if (!model) {
 			throw new Error('Could not start chat session');
 		}
 
-		this._widget.setModel(model, { ...(viewState ?? this.viewState) });
+		if (viewState) {
+			this.updateViewState(viewState);
+		}
+
 		this.viewState.sessionId = model.sessionId;
+		this._widget.setModel(model, { ...this.viewState });
 	}
 
 	override shouldShowWelcome(): boolean {
+		if (!this.chatAgentService.getContributedDefaultAgent(this.chatOptions.location)) {
+			return true;
+		}
+
 		const noPersistedSessions = !this.chatService.hasSessions();
-		return this.didUnregisterProvider || !this._widget?.viewModel && (noPersistedSessions || this.didProviderRegistrationFail);
+		return this.didUnregisterProvider || !this._widget?.viewModel && (noPersistedSessions || this.didProviderRegistrationFail) || !this.isInitialized;
 	}
 
 	private getSessionId() {
@@ -134,16 +148,17 @@ export class ChatViewPane extends ViewPane implements IChatViewPane {
 		try {
 			super.renderBody(parent);
 
-			const scopedInstantiationService = this.instantiationService.createChild(new ServiceCollection([IContextKeyService, this.scopedContextKeyService]));
+			const scopedInstantiationService = this._register(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, this.scopedContextKeyService])));
 			const locationBasedColors = this.getLocationBasedColors();
 			this._widget = this._register(scopedInstantiationService.createInstance(
 				ChatWidget,
-				ChatAgentLocation.Panel,
+				this.chatOptions.location,
 				{ viewId: this.id },
-				{ supportsFileReferences: true },
+				{ supportsFileReferences: true, supportsAdditionalParticipants: this.chatOptions.location === ChatAgentLocation.Panel },
 				{
 					listForeground: SIDE_BAR_FOREGROUND,
 					listBackground: locationBasedColors.background,
+					overlayBackground: locationBasedColors.overlayBackground,
 					inputEditorBackground: locationBasedColors.background,
 					resultEditorBackground: editorBackground
 				}));
@@ -176,20 +191,23 @@ export class ChatViewPane extends ViewPane implements IChatViewPane {
 		this._widget.acceptInput(query);
 	}
 
-	clear(): void {
+	private clear(): void {
 		if (this.widget.viewModel) {
 			this.chatService.clearSession(this.widget.viewModel.sessionId);
 		}
-		this.updateModel(undefined, { ...this.viewState, inputValue: undefined });
+
+		// Grab the widget's latest view state because it will be loaded back into the widget
+		this.updateViewState();
+		this.updateModel(undefined);
 	}
 
-	loadSession(sessionId: string): void {
+	loadSession(sessionId: string, viewState?: IChatViewState): void {
 		if (this.widget.viewModel) {
 			this.chatService.clearSession(this.widget.viewModel.sessionId);
 		}
 
 		const newModel = this.chatService.getOrRestoreSession(sessionId);
-		this.updateModel(newModel);
+		this.updateModel(newModel, viewState);
 	}
 
 	focusInput(): void {
@@ -212,12 +230,17 @@ export class ChatViewPane extends ViewPane implements IChatViewPane {
 			// TODO multiple chat views will overwrite each other
 			this._widget.saveState();
 
-			const widgetViewState = this._widget.getViewState();
-			this.viewState.inputValue = widgetViewState.inputValue;
-			this.viewState.inputState = widgetViewState.inputState;
+			this.updateViewState();
 			this.memento.saveMemento();
 		}
 
 		super.saveState();
 	}
+
+	private updateViewState(viewState?: IChatViewState): void {
+		const newViewState = viewState ?? this._widget.getViewState();
+		this.viewState.inputValue = newViewState.inputValue;
+		this.viewState.inputState = newViewState.inputState;
+		this.viewState.selectedLanguageModelId = newViewState.selectedLanguageModelId;
+	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
index 830664edef0..1590ff687ef 100644
--- a/src/vs/workbench/contrib/chat/browser/chatWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
@@ -3,44 +3,52 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { ITreeContextMenuEvent, ITreeElement } from 'vs/base/browser/ui/tree/tree';
-import { disposableTimeout, timeout } from 'vs/base/common/async';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore, IDisposable, MutableDisposable, combinedDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { matchesScheme, Schemas } from 'vs/base/common/network';
-import { extUri, isEqual } from 'vs/base/common/resources';
-import { isDefined } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import 'vs/css!./media/chat';
-import 'vs/css!./media/chatAgentHover';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { ITextResourceEditorInput } from 'vs/platform/editor/common/editor';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { WorkbenchObjectTree } from 'vs/platform/list/browser/listService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ChatTreeItem, IChatAccessibilityService, IChatCodeBlockInfo, IChatFileTreeInfo, IChatWidget, IChatWidgetService, IChatWidgetViewContext, IChatWidgetViewOptions } from 'vs/workbench/contrib/chat/browser/chat';
-import { ChatAccessibilityProvider } from 'vs/workbench/contrib/chat/browser/chatAccessibilityProvider';
-import { ChatInputPart } from 'vs/workbench/contrib/chat/browser/chatInputPart';
-import { ChatListDelegate, ChatListItemRenderer, IChatRendererDelegate } from 'vs/workbench/contrib/chat/browser/chatListRenderer';
-import { ChatEditorOptions } from 'vs/workbench/contrib/chat/browser/chatOptions';
-import { ChatAgentLocation, IChatAgentCommand, IChatAgentData, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { CONTEXT_CHAT_INPUT_HAS_AGENT, CONTEXT_CHAT_LOCATION, CONTEXT_CHAT_REQUEST_IN_PROGRESS, CONTEXT_IN_CHAT_SESSION, CONTEXT_IN_QUICK_CHAT, CONTEXT_RESPONSE_FILTERED } from 'vs/workbench/contrib/chat/common/chatContextKeys';
-import { ChatModelInitState, IChatModel, IChatRequestVariableEntry, IChatResponseModel } from 'vs/workbench/contrib/chat/common/chatModel';
-import { ChatRequestAgentPart, IParsedChatRequest, chatAgentLeader, chatSubcommandLeader } from 'vs/workbench/contrib/chat/common/chatParserTypes';
-import { ChatRequestParser } from 'vs/workbench/contrib/chat/common/chatRequestParser';
-import { IChatFollowup, IChatService } from 'vs/workbench/contrib/chat/common/chatService';
-import { IChatSlashCommandService } from 'vs/workbench/contrib/chat/common/chatSlashCommands';
-import { ChatViewModel, IChatResponseViewModel, isRequestVM, isResponseVM, isWelcomeVM } from 'vs/workbench/contrib/chat/common/chatViewModel';
-import { CodeBlockModelCollection } from 'vs/workbench/contrib/chat/common/codeBlockModelCollection';
-import { IChatListItemRendererOptions } from './chat';
+import * as dom from '../../../../base/browser/dom.js';
+import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { ITreeContextMenuEvent, ITreeElement } from '../../../../base/browser/ui/tree/tree.js';
+import { disposableTimeout, timeout } from '../../../../base/common/async.js';
+import { toErrorMessage } from '../../../../base/common/errorMessage.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { Disposable, DisposableStore, IDisposable, MutableDisposable, combinedDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { extUri, isEqual } from '../../../../base/common/resources.js';
+import { isDefined } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { MarkdownRenderer } from '../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import { localize } from '../../../../nls.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { ITextResourceEditorInput } from '../../../../platform/editor/common/editor.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { WorkbenchObjectTree } from '../../../../platform/list/browser/listService.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { TerminalChatController } from '../../terminal/terminalContribChatExports.js';
+import { ChatAgentLocation, IChatAgentCommand, IChatAgentData, IChatAgentService, IChatWelcomeMessageContent, isChatWelcomeMessageContent } from '../common/chatAgents.js';
+import { CONTEXT_CHAT_INPUT_HAS_AGENT, CONTEXT_CHAT_LOCATION, CONTEXT_CHAT_REQUEST_IN_PROGRESS, CONTEXT_IN_CHAT_SESSION, CONTEXT_IN_QUICK_CHAT, CONTEXT_LAST_ITEM_ID, CONTEXT_PARTICIPANT_SUPPORTS_MODEL_PICKER, CONTEXT_RESPONSE_FILTERED } from '../common/chatContextKeys.js';
+import { ChatEditingSessionState, IChatEditingService, IChatEditingSession } from '../common/chatEditingService.js';
+import { IChatModel, IChatRequestVariableEntry, IChatResponseModel } from '../common/chatModel.js';
+import { ChatRequestAgentPart, IParsedChatRequest, chatAgentLeader, chatSubcommandLeader, formatChatQuestion } from '../common/chatParserTypes.js';
+import { ChatRequestParser } from '../common/chatRequestParser.js';
+import { IChatFollowup, IChatLocationData, IChatService } from '../common/chatService.js';
+import { IChatSlashCommandService } from '../common/chatSlashCommands.js';
+import { ChatViewModel, IChatResponseViewModel, isRequestVM, isResponseVM } from '../common/chatViewModel.js';
+import { CodeBlockModelCollection } from '../common/codeBlockModelCollection.js';
+import { ChatTreeItem, IChatAccessibilityService, IChatCodeBlockInfo, IChatFileTreeInfo, IChatListItemRendererOptions, IChatWidget, IChatWidgetService, IChatWidgetViewContext, IChatWidgetViewOptions } from './chat.js';
+import { ChatAccessibilityProvider } from './chatAccessibilityProvider.js';
+import { ChatDragAndDrop } from './chatDragAndDrop.js';
+import { ChatImageDropAndPaste } from './chatImagePaste.js';
+import { ChatInputPart } from './chatInputPart.js';
+import { ChatListDelegate, ChatListItemRenderer, IChatRendererDelegate } from './chatListRenderer.js';
+import { ChatEditorOptions } from './chatOptions.js';
+import './media/chat.css';
+import './media/chatAgentHover.css';
 
 const $ = dom.$;
 
@@ -52,11 +60,13 @@ export type IChatInputState = Record<string, any>;
 export interface IChatViewState {
 	inputValue?: string;
 	inputState?: IChatInputState;
+	selectedLanguageModelId?: string;
 }
 
 export interface IChatWidgetStyles {
 	listForeground: string;
 	listBackground: string;
+	overlayBackground: string;
 	inputEditorBackground: string;
 	resultEditorBackground: string;
 }
@@ -75,12 +85,26 @@ export interface IChatWidgetContrib extends IDisposable {
 	setInputState?(s: any): void;
 }
 
+export interface IChatWidgetLocationOptions {
+	location: ChatAgentLocation;
+	resolveData?(): IChatLocationData | undefined;
+}
+
+export function isQuickChat(widget: IChatWidget): boolean {
+	return 'viewContext' in widget && 'isQuickChat' in widget.viewContext && Boolean(widget.viewContext.isQuickChat);
+}
+
+const PersistWelcomeMessageContentKey = 'chat.welcomeMessageContent';
+
 export class ChatWidget extends Disposable implements IChatWidget {
 	public static readonly CONTRIBS: { new(...args: [IChatWidget, ...any]): IChatWidgetContrib }[] = [];
 
 	private readonly _onDidSubmitAgent = this._register(new Emitter<{ agent: IChatAgentData; slashCommand?: IChatAgentCommand }>());
 	public readonly onDidSubmitAgent = this._onDidSubmitAgent.event;
 
+	private _onDidChangeAgent = this._register(new Emitter<{ agent: IChatAgentData; slashCommand?: IChatAgentCommand }>());
+	readonly onDidChangeAgent = this._onDidChangeAgent.event;
+
 	private _onDidFocus = this._register(new Emitter<void>());
 	readonly onDidFocus = this._onDidFocus.event;
 
@@ -96,8 +120,8 @@ export class ChatWidget extends Disposable implements IChatWidget {
 	private _onDidAcceptInput = this._register(new Emitter<void>());
 	readonly onDidAcceptInput = this._onDidAcceptInput.event;
 
-	private _onDidDeleteContext = this._register(new Emitter<IChatRequestVariableEntry>());
-	readonly onDidDeleteContext = this._onDidDeleteContext.event;
+	private _onDidChangeContext = this._register(new Emitter<{ removed?: IChatRequestVariableEntry[]; added?: IChatRequestVariableEntry[] }>());
+	readonly onDidChangeContext = this._onDidChangeContext.event;
 
 	private _onDidHide = this._register(new Emitter<void>());
 	readonly onDidHide = this._onDidHide.event;
@@ -105,13 +129,16 @@ export class ChatWidget extends Disposable implements IChatWidget {
 	private _onDidChangeParsedInput = this._register(new Emitter<void>());
 	readonly onDidChangeParsedInput = this._onDidChangeParsedInput.event;
 
+	private readonly _onWillMaybeChangeHeight = new Emitter<void>();
+	readonly onWillMaybeChangeHeight: Event<void> = this._onWillMaybeChangeHeight.event;
+
 	private _onDidChangeHeight = this._register(new Emitter<number>());
 	readonly onDidChangeHeight = this._onDidChangeHeight.event;
 
 	private readonly _onDidChangeContentHeight = new Emitter<void>();
 	readonly onDidChangeContentHeight: Event<void> = this._onDidChangeContentHeight.event;
 
-	private contribs: IChatWidgetContrib[] = [];
+	private contribs: ReadonlyArray<IChatWidgetContrib> = [];
 
 	private tree!: WorkbenchObjectTree<ChatTreeItem>;
 	private renderer!: ChatListItemRenderer;
@@ -122,11 +149,14 @@ export class ChatWidget extends Disposable implements IChatWidget {
 
 	private listContainer!: HTMLElement;
 	private container!: HTMLElement;
+	private welcomeMessageContainer!: HTMLElement;
+	private persistedWelcomeMessage: IChatWelcomeMessageContent | undefined;
 
 	private bodyDimension: dom.Dimension | undefined;
 	private visibleChangeCount = 0;
 	private requestInProgress: IContextKey<boolean>;
 	private agentInInput: IContextKey<boolean>;
+	private agentSupportsModelPicker: IContextKey<boolean>;
 
 	private _visible = false;
 	public get visible() {
@@ -159,9 +189,11 @@ export class ChatWidget extends Disposable implements IChatWidget {
 	private parsedChatRequest: IParsedChatRequest | undefined;
 	get parsedInput() {
 		if (this.parsedChatRequest === undefined) {
-			this.parsedChatRequest = this.instantiationService.createInstance(ChatRequestParser).parseChatRequest(this.viewModel!.sessionId, this.getInput(), this.location, { selectedAgent: this._lastSelectedAgent });
+			if (!this.viewModel) {
+				return { text: '', parts: [] };
+			}
 
-			this.agentInInput.set((!!this.parsedChatRequest.parts.find(part => part instanceof ChatRequestAgentPart)));
+			this.parsedChatRequest = this.instantiationService.createInstance(ChatRequestParser).parseChatRequest(this.viewModel!.sessionId, this.getInput(), this.location, { selectedAgent: this._lastSelectedAgent });
 		}
 
 		return this.parsedChatRequest;
@@ -171,9 +203,16 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		return this.contextKeyService;
 	}
 
+	private readonly _location: IChatWidgetLocationOptions;
+	get location() {
+		return this._location.location;
+	}
+
+	readonly viewContext: IChatWidgetViewContext;
+
 	constructor(
-		readonly location: ChatAgentLocation,
-		readonly viewContext: IChatWidgetViewContext,
+		location: ChatAgentLocation | IChatWidgetLocationOptions,
+		_viewContext: IChatWidgetViewContext | undefined,
 		private readonly viewOptions: IChatWidgetViewOptions,
 		private readonly styles: IChatWidgetStyles,
 		@ICodeEditorService codeEditorService: ICodeEditorService,
@@ -187,26 +226,72 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		@ILogService private readonly logService: ILogService,
 		@IThemeService private readonly themeService: IThemeService,
 		@IChatSlashCommandService private readonly chatSlashCommandService: IChatSlashCommandService,
+		@IChatEditingService private readonly chatEditingService: IChatEditingService,
+		@IStorageService private readonly storageService: IStorageService,
 	) {
 		super();
+
+		this.viewContext = _viewContext ?? {};
+
+		if (typeof location === 'object') {
+			this._location = location;
+		} else {
+			this._location = { location };
+		}
+
 		CONTEXT_IN_CHAT_SESSION.bindTo(contextKeyService).set(true);
-		CONTEXT_CHAT_LOCATION.bindTo(contextKeyService).set(location);
-		CONTEXT_IN_QUICK_CHAT.bindTo(contextKeyService).set('resource' in viewContext);
+		CONTEXT_CHAT_LOCATION.bindTo(contextKeyService).set(this._location.location);
+		CONTEXT_IN_QUICK_CHAT.bindTo(contextKeyService).set(isQuickChat(this));
 		this.agentInInput = CONTEXT_CHAT_INPUT_HAS_AGENT.bindTo(contextKeyService);
+		this.agentSupportsModelPicker = CONTEXT_PARTICIPANT_SUPPORTS_MODEL_PICKER.bindTo(contextKeyService);
 		this.requestInProgress = CONTEXT_CHAT_REQUEST_IN_PROGRESS.bindTo(contextKeyService);
 
 		this._register((chatWidgetService as ChatWidgetService).register(this));
 
 		this._codeBlockModelCollection = this._register(instantiationService.createInstance(CodeBlockModelCollection));
 
-		this._register(codeEditorService.registerCodeEditorOpenHandler(async (input: ITextResourceEditorInput, _source: ICodeEditor | null, _sideBySide?: boolean): Promise<ICodeEditor | null> => {
-			let resource = input.resource;
+		const chatEditingSessionDisposables = this._register(new DisposableStore());
 
-			// if trying to open backing documents, actually open the real chat code block doc
-			if (matchesScheme(resource, Schemas.vscodeCopilotBackingChatCodeBlock)) {
-				resource = resource.with({ scheme: Schemas.vscodeChatCodeBlock });
+		this._register(this.chatEditingService.onDidCreateEditingSession((session) => {
+			if (session.chatSessionId !== this.viewModel?.sessionId) {
+				// this chat editing session is for a different chat widget
+				return;
 			}
+			// make sure to clean up anything related to the prev session (if any)
+			chatEditingSessionDisposables.clear();
+			this.renderChatEditingSessionState(null); // this is necessary to make sure we dispose previous buttons, etc.
 
+			chatEditingSessionDisposables.add(session.onDidChange(() => {
+				this.renderChatEditingSessionState(session);
+			}));
+			chatEditingSessionDisposables.add(session.onDidDispose(() => {
+				chatEditingSessionDisposables.clear();
+				this.renderChatEditingSessionState(null);
+			}));
+			this.renderChatEditingSessionState(session);
+		}));
+
+		if (this._location.location === ChatAgentLocation.EditingSession) {
+			let currentEditSession: IChatEditingSession | undefined = undefined;
+			this._register(this.onDidChangeViewModel(async () => {
+
+				const sessionId = this._viewModel?.sessionId;
+				if (sessionId !== currentEditSession?.chatSessionId) {
+					if (currentEditSession && (currentEditSession.state.get() !== ChatEditingSessionState.Disposed)) {
+						await currentEditSession.stop();
+					}
+					if (sessionId) {
+						currentEditSession = await this.chatEditingService.startOrContinueEditingSession(sessionId, { silent: true });
+					} else {
+						currentEditSession = undefined;
+					}
+				}
+
+			}));
+		}
+
+		this._register(codeEditorService.registerCodeEditorOpenHandler(async (input: ITextResourceEditorInput, _source: ICodeEditor | null, _sideBySide?: boolean): Promise<ICodeEditor | null> => {
+			const resource = input.resource;
 			if (resource.scheme !== Schemas.vscodeChatCodeBlock) {
 				return null;
 			}
@@ -227,22 +312,46 @@ export class ChatWidget extends Disposable implements IChatWidget {
 
 			await timeout(0); // wait for list to actually render
 
-			for (const editor of this.renderer.editorsInUse() ?? []) {
-				if (extUri.isEqual(editor.uri, resource, true)) {
-					const inner = editor.editor;
+			for (const codeBlockPart of this.renderer.editorsInUse()) {
+				if (extUri.isEqual(codeBlockPart.uri, resource, true)) {
+					const editor = codeBlockPart.editor;
+
+					let relativeTop = 0;
+					const editorDomNode = editor.getDomNode();
+					if (editorDomNode) {
+						const row = dom.findParentWithClass(editorDomNode, 'monaco-list-row');
+						if (row) {
+							relativeTop = dom.getTopLeftOffset(editorDomNode).top - dom.getTopLeftOffset(row).top;
+						}
+					}
+
 					if (input.options?.selection) {
-						inner.setSelection({
+						const editorSelectionTopOffset = editor.getTopForPosition(input.options.selection.startLineNumber, input.options.selection.startColumn);
+						relativeTop += editorSelectionTopOffset;
+
+						editor.focus();
+						editor.setSelection({
 							startLineNumber: input.options.selection.startLineNumber,
 							startColumn: input.options.selection.startColumn,
-							endLineNumber: input.options.selection.startLineNumber ?? input.options.selection.endLineNumber,
-							endColumn: input.options.selection.startColumn ?? input.options.selection.endColumn
+							endLineNumber: input.options.selection.endLineNumber ?? input.options.selection.startLineNumber,
+							endColumn: input.options.selection.endColumn ?? input.options.selection.startColumn
 						});
 					}
-					return inner;
+
+					this.reveal(item, relativeTop);
+
+					return editor;
 				}
 			}
 			return null;
 		}));
+
+		const loadedWelcomeContent = storageService.getObject(`${PersistWelcomeMessageContentKey}.${this.location}`, StorageScope.APPLICATION);
+		if (isChatWelcomeMessageContent(loadedWelcomeContent)) {
+			this.persistedWelcomeMessage = loadedWelcomeContent;
+		}
+
+		this._register(this.onDidChangeParsedInput(() => this.updateChatInputContext()));
 	}
 
 	private _lastSelectedAgent: IChatAgentData | undefined;
@@ -284,6 +393,8 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		const renderStyle = this.viewOptions.renderStyle;
 
 		this.container = dom.append(parent, $('.interactive-session'));
+		this.welcomeMessageContainer = dom.append(this.container, $('.chat-welcome-view', { style: 'display: none' }));
+		this.renderWelcomeViewContentIfNeeded();
 		if (renderInputOnTop) {
 			this.createInput(this.container, { renderFollowups, renderStyle });
 			this.listContainer = dom.append(this.container, $(`.interactive-list`));
@@ -311,6 +422,9 @@ export class ChatWidget extends Disposable implements IChatWidget {
 				return undefined;
 			}
 		}).filter(isDefined);
+
+		this._register(this.instantiationService.createInstance(ChatDragAndDrop, this.container, this.inputPart, this.styles));
+		this._register(this.instantiationService.createInstance(ChatImageDropAndPaste, this.inputPart));
 	}
 
 	getContrib<T extends IChatWidgetContrib>(id: string): T | undefined {
@@ -325,7 +439,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		return this.inputPart.hasFocus();
 	}
 
-	moveFocus(item: ChatTreeItem, type: 'next' | 'previous'): void {
+	getSibling(item: ChatTreeItem, type: 'next' | 'previous'): ChatTreeItem | undefined {
 		if (!isResponseVM(item)) {
 			return;
 		}
@@ -342,7 +456,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		if (indexToFocus < 0 || indexToFocus > responseItems.length - 1) {
 			return;
 		}
-		this.focus(responseItems[indexToFocus]);
+		return responseItems[indexToFocus];
 	}
 
 	clear(): void {
@@ -363,19 +477,24 @@ export class ChatWidget extends Disposable implements IChatWidget {
 					};
 				});
 
+			this.renderWelcomeViewContentIfNeeded();
+
+			this._onWillMaybeChangeHeight.fire();
+
 			this.tree.setChildren(null, treeItems, {
 				diffIdentityProvider: {
 					getId: (element) => {
-						return ((isResponseVM(element) || isRequestVM(element)) ? element.dataId : element.id) +
-							// TODO? We can give the welcome message a proper VM or get rid of the rest of the VMs
-							((isWelcomeVM(element) && this.viewModel) ? `_${ChatModelInitState[this.viewModel.initState]}` : '') +
+						return element.dataId +
 							// Ensure re-rendering an element once slash commands are loaded, so the colorization can be applied.
-							`${(isRequestVM(element) || isWelcomeVM(element)) /* && !!this.lastSlashCommands ? '_scLoaded' : '' */}` +
+							`${(isRequestVM(element)) /* && !!this.lastSlashCommands ? '_scLoaded' : '' */}` +
 							// If a response is in the process of progressive rendering, we need to ensure that it will
 							// be re-rendered so progressive rendering is restarted, even if the model wasn't updated.
 							`${isResponseVM(element) && element.renderData ? `_${this.visibleChangeCount}` : ''}` +
 							// Re-render once content references are loaded
-							(isResponseVM(element) ? `_${element.contentReferences.length}` : '');
+							(isResponseVM(element) ? `_${element.contentReferences.length}` : '') +
+							// Rerender request if we got new content references in the response
+							// since this may change how we render the corresponding attachments in the request
+							(isRequestVM(element) && element.contentReferences ? `_${element.contentReferences?.length}` : '');
 					},
 				}
 			});
@@ -385,16 +504,55 @@ export class ChatWidget extends Disposable implements IChatWidget {
 			}
 
 			const lastItem = treeItems[treeItems.length - 1]?.element;
+			if (lastItem) {
+				CONTEXT_LAST_ITEM_ID.bindTo(this.contextKeyService).set([lastItem.id]);
+			}
 			if (lastItem && isResponseVM(lastItem) && lastItem.isComplete) {
 				this.renderFollowups(lastItem.replyFollowups, lastItem);
-			} else if (lastItem && isWelcomeVM(lastItem)) {
-				this.renderFollowups(lastItem.sampleQuestions);
+			} else if (!treeItems.length && this.viewModel) {
+				this.renderFollowups(this.viewModel.model.sampleQuestions);
 			} else {
 				this.renderFollowups(undefined);
 			}
 		}
 	}
 
+	private renderWelcomeViewContentIfNeeded() {
+		const welcomeContent = this.viewModel?.model.welcomeMessage ?? this.persistedWelcomeMessage;
+		if (welcomeContent && this.welcomeMessageContainer.children.length === 0 && !this.viewOptions.renderStyle) {
+			const icon = dom.append(this.welcomeMessageContainer!, $('.chat-welcome-view-icon'));
+			const title = dom.append(this.welcomeMessageContainer!, $('.chat-welcome-view-title'));
+			const message = dom.append(this.welcomeMessageContainer!, $('.chat-welcome-view-message'));
+			const tips = dom.append(this.welcomeMessageContainer!, $('.chat-welcome-view-tips'));
+
+			icon.appendChild(renderIcon(welcomeContent.icon));
+			title.textContent = welcomeContent.title;
+			const renderer = this.instantiationService.createInstance(MarkdownRenderer, {});
+			const messageResult = this._register(renderer.render(welcomeContent.message));
+			dom.append(message, messageResult.element);
+
+			const tipsString = this.viewOptions.supportsAdditionalParticipants
+				? new MarkdownString(localize('chatWidget.tips', "{0} to attach context\n\n{1} to chat with extensions", '$(attach)', '$(mention)'), { supportThemeIcons: true })
+				: new MarkdownString(localize('chatWidget.tips.withoutParticipants', "{0} to attach context", '$(attach)'), { supportThemeIcons: true });
+			const tipsResult = this._register(renderer.render(tipsString));
+			tips.appendChild(tipsResult.element);
+		}
+
+		if (!this.viewOptions.renderStyle && this.viewModel) {
+			const treeItems = this.viewModel.getItems();
+			dom.setVisibility(treeItems.length === 0, this.welcomeMessageContainer);
+			dom.setVisibility(treeItems.length !== 0, this.listContainer);
+		}
+	}
+
+	private async renderChatEditingSessionState(session: IChatEditingSession | null) {
+		this.inputPart.renderChatEditingSessionState(session, undefined, this);
+
+		if (this.bodyDimension) {
+			this.layout(this.bodyDimension.height, this.bodyDimension.width);
+		}
+	}
+
 	private async renderFollowups(items: IChatFollowup[] | undefined, response?: IChatResponseViewModel): Promise<void> {
 		this.inputPart.renderFollowups(items, response);
 
@@ -424,7 +582,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 	}
 
 	private createList(listContainer: HTMLElement, options: IChatListItemRendererOptions): void {
-		const scopedInstantiationService = this._register(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, this.contextKeyService])));
+		const scopedInstantiationService = this._register(this._register(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, this.contextKeyService]))));
 		const delegate = scopedInstantiationService.createInstance(ChatListDelegate, this.viewOptions.defaultElementHeight ?? 200);
 		const rendererDelegate: IChatRendererDelegate = {
 			getListLength: () => this.tree.getNode(null).visibleChildrenCount,
@@ -439,7 +597,6 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		this.renderer = this._register(scopedInstantiationService.createInstance(
 			ChatListItemRenderer,
 			this.editorOptions,
-			this.location,
 			options,
 			rendererDelegate,
 			this._codeBlockModelCollection,
@@ -452,11 +609,11 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		this._register(this.renderer.onDidClickRerunWithAgentOrCommandDetection(item => {
 			const request = this.chatService.getSession(item.sessionId)?.getRequests().find(candidate => candidate.id === item.requestId);
 			if (request) {
-				this.chatService.resendRequest(request, { noCommandDetection: true, attempt: request.attempt, location: this.location }).catch(e => this.logService.error('FAILED to rerun request', e));
+				this.chatService.resendRequest(request, { noCommandDetection: true, attempt: request.attempt + 1, location: this.location }).catch(e => this.logService.error('FAILED to rerun request', e));
 			}
 		}));
 
-		this.tree = <WorkbenchObjectTree<ChatTreeItem>>scopedInstantiationService.createInstance(
+		this.tree = this._register(<WorkbenchObjectTree<ChatTreeItem>>scopedInstantiationService.createInstance(
 			WorkbenchObjectTree,
 			'Chat',
 			listContainer,
@@ -486,8 +643,10 @@ export class ChatWidget extends Disposable implements IChatWidget {
 					listInactiveSelectionForeground: this.styles.listForeground,
 					listActiveSelectionForeground: this.styles.listForeground,
 					listFocusAndSelectionForeground: this.styles.listForeground,
+					listActiveSelectionIconForeground: undefined,
+					listInactiveSelectionIconForeground: undefined,
 				}
-			});
+			}));
 		this._register(this.tree.onContextMenu(e => this.onContextMenu(e)));
 
 		this._register(this.tree.onDidChangeContentHeight(() => {
@@ -538,27 +697,29 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		this._onDidChangeContentHeight.fire();
 	}
 
-	private createInput(container: HTMLElement, options?: { renderFollowups: boolean; renderStyle?: 'default' | 'compact' }): void {
+	private createInput(container: HTMLElement, options?: { renderFollowups: boolean; renderStyle?: 'compact' | 'minimal' }): void {
 		this.inputPart = this._register(this.instantiationService.createInstance(ChatInputPart,
 			this.location,
 			{
 				renderFollowups: options?.renderFollowups ?? true,
-				renderStyle: options?.renderStyle,
+				renderStyle: options?.renderStyle === 'minimal' ? 'compact' : options?.renderStyle,
 				menus: { executeToolbar: MenuId.ChatExecute, ...this.viewOptions.menus },
 				editorOverflowWidgetsDomNode: this.viewOptions.editorOverflowWidgetsDomNode,
-			}
+			},
+			() => this.collectInputState()
 		));
 		this.inputPart.render(container, '', this);
 
 		this._register(this.inputPart.onDidLoadInputState(state => {
 			this.contribs.forEach(c => {
-				if (c.setInputState && typeof state === 'object' && state?.[c.id]) {
-					c.setInputState(state[c.id]);
+				if (c.setInputState) {
+					const contribState = (typeof state === 'object' && state?.[c.id]) ?? {};
+					c.setInputState(contribState);
 				}
 			});
 		}));
 		this._register(this.inputPart.onDidFocus(() => this._onDidFocus.fire()));
-		this._register(this.inputPart.onDidDeleteContext((e) => this._onDidDeleteContext.fire(e)));
+		this._register(this.inputPart.onDidChangeContext((e) => this._onDidChangeContext.fire(e)));
 		this._register(this.inputPart.onDidAcceptFollowup(e => {
 			if (!this.viewModel) {
 				return;
@@ -593,6 +754,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 				sessionId: this.viewModel.sessionId,
 				requestId: e.response.requestId,
 				agentId: e.response.agent?.id,
+				command: e.response.slashCommand?.name,
 				result: e.response.result,
 				action: {
 					kind: 'followUp',
@@ -606,7 +768,10 @@ export class ChatWidget extends Disposable implements IChatWidget {
 			}
 			this._onDidChangeContentHeight.fire();
 		}));
-		this._register(this.inputEditor.onDidChangeModelContent(() => this.parsedChatRequest = undefined));
+		this._register(this.inputEditor.onDidChangeModelContent(() => {
+			this.parsedChatRequest = undefined;
+			this.updateChatInputContext();
+		}));
 		this._register(this.chatAgentService.onDidChangeAgents(() => this.parsedChatRequest = undefined));
 	}
 
@@ -621,6 +786,10 @@ export class ChatWidget extends Disposable implements IChatWidget {
 			throw new Error('Call render() before setModel()');
 		}
 
+		if (model.sessionId === this.viewModel?.sessionId) {
+			return;
+		}
+
 		this._codeBlockModelCollection.clear();
 
 		this.container.setAttribute('data-session-id', model.sessionId);
@@ -646,26 +815,31 @@ export class ChatWidget extends Disposable implements IChatWidget {
 			this.viewModel = undefined;
 			this.onDidChangeItems();
 		}));
-		this.inputPart.setState(viewState.inputValue);
+		this.inputPart.initForNewChatModel(viewState);
 		this.contribs.forEach(c => {
 			if (c.setInputState && viewState.inputState?.[c.id]) {
 				c.setInputState(viewState.inputState?.[c.id]);
 			}
 		});
+		this.viewModelDisposables.add(model.onDidChange((e) => {
+			if (e.kind === 'setAgent') {
+				this._onDidChangeAgent.fire({ agent: e.agent, slashCommand: e.command });
+			}
+		}));
 
 		if (this.tree) {
 			this.onDidChangeItems();
 			revealLastElement(this.tree);
 		}
-
+		this.updateChatInputContext();
 	}
 
 	getFocus(): ChatTreeItem | undefined {
 		return this.tree.getFocus()[0] ?? undefined;
 	}
 
-	reveal(item: ChatTreeItem): void {
-		this.tree.reveal(item);
+	reveal(item: ChatTreeItem, relativeTop?: number): void {
+		this.tree.reveal(item, relativeTop);
 	}
 
 	focus(item: ChatTreeItem): void {
@@ -692,15 +866,19 @@ export class ChatWidget extends Disposable implements IChatWidget {
 	}
 
 	setInput(value = ''): void {
-		this.inputPart.setValue(value);
+		this.inputPart.setValue(value, false);
 	}
 
 	getInput(): string {
 		return this.inputPart.inputEditor.getValue();
 	}
 
-	async acceptInput(query?: string): Promise<IChatResponseModel | undefined> {
-		return this._acceptInput(query ? { query } : undefined);
+	logInputHistory(): void {
+		this.inputPart.logInputHistory();
+	}
+
+	async acceptInput(query?: string, isVoiceInput?: boolean): Promise<IChatResponseModel | undefined> {
+		return this._acceptInput(query ? { query } : undefined, isVoiceInput);
 	}
 
 	async acceptInputWithPrefix(prefix: string): Promise<void> {
@@ -717,7 +895,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		return inputState;
 	}
 
-	private async _acceptInput(opts: { query: string } | { prefix: string } | undefined): Promise<IChatResponseModel | undefined> {
+	private async _acceptInput(opts: { query: string } | { prefix: string } | undefined, isVoiceInput?: boolean): Promise<IChatResponseModel | undefined> {
 		if (this.viewModel) {
 			this._onDidAcceptInput.fire();
 
@@ -727,17 +905,28 @@ export class ChatWidget extends Disposable implements IChatWidget {
 				'query' in opts ? opts.query :
 					`${opts.prefix} ${editorValue}`;
 			const isUserQuery = !opts || 'prefix' in opts;
-			const result = await this.chatService.sendRequest(this.viewModel.sessionId, input, { location: this.location, parserContext: { selectedAgent: this._lastSelectedAgent }, attachedContext: [...this.inputPart.attachedContext.values()] });
+			const result = await this.chatService.sendRequest(this.viewModel.sessionId, input, {
+				userSelectedModelId: this.inputPart.currentLanguageModel,
+				location: this.location,
+				locationData: this._location.resolveData?.(),
+				parserContext: { selectedAgent: this._lastSelectedAgent },
+				attachedContext: [...this.inputPart.attachedContext.values()]
+			});
 
 			if (result) {
-				this.inputPart.attachedContext.clear();
-				const inputState = this.collectInputState();
-				this.inputPart.acceptInput(isUserQuery ? input : undefined, isUserQuery ? inputState : undefined);
+				this.inputPart.acceptInput(isUserQuery);
 				this._onDidSubmitAgent.fire({ agent: result.agent, slashCommand: result.slashCommand });
 				result.responseCompletePromise.then(() => {
 					const responses = this.viewModel?.getItems().filter(isResponseVM);
 					const lastResponse = responses?.[responses.length - 1];
-					this.chatAccessibilityService.acceptResponse(lastResponse, requestId);
+					this.chatAccessibilityService.acceptResponse(lastResponse, requestId, isVoiceInput);
+					if (lastResponse?.result?.nextQuestion) {
+						const { prompt, participant, command } = lastResponse.result.nextQuestion;
+						const question = formatChatQuestion(this.chatAgentService, this.location, prompt, participant, command);
+						if (question) {
+							this.input.setValue(question, false);
+						}
+					}
 				});
 				return result.responseCreatedPromise;
 			}
@@ -745,15 +934,11 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		return undefined;
 	}
 
-
 	setContext(overwrite: boolean, ...contentReferences: IChatRequestVariableEntry[]) {
-		if (overwrite) {
-			this.inputPart.attachedContext.clear();
-		}
-		this.inputPart.attachContext(...contentReferences);
+		this.inputPart.attachContext(overwrite, ...contentReferences);
 
-		if (this.bodyDimension) {
-			this.layout(this.bodyDimension.height, this.bodyDimension.width);
+		if (this.chatEditingService.currentEditingSession) {
+			this.renderChatEditingSessionState(this.chatEditingService.currentEditingSession);
 		}
 	}
 
@@ -792,7 +977,8 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		width = Math.min(width, 850);
 		this.bodyDimension = new dom.Dimension(width, height);
 
-		this.inputPart.layout(height, width);
+		const inputPartMaxHeight = this._dynamicMessageLayoutData?.enabled ? this._dynamicMessageLayoutData.maxHeight : height;
+		this.inputPart.layout(inputPartMaxHeight, width);
 		const inputPartHeight = this.inputPart.inputPartHeight;
 		const lastElementVisible = this.tree.scrollTop + this.tree.renderHeight >= this.tree.scrollHeight;
 
@@ -800,6 +986,11 @@ export class ChatWidget extends Disposable implements IChatWidget {
 
 		this.tree.layout(listHeight, width);
 		this.tree.getHTMLElement().style.height = `${listHeight}px`;
+
+		// Push the welcome message down so it doesn't change position when followups appear
+		const followupsOffset = Math.max(100 - this.inputPart.followupsHeight, 0);
+		this.welcomeMessageContainer.style.height = `${listHeight - followupsOffset}px`;
+		this.welcomeMessageContainer.style.paddingBottom = `${followupsOffset}px`;
 		this.renderer.layout(width);
 		if (lastElementVisible) {
 			revealLastElement(this.tree);
@@ -912,14 +1103,25 @@ export class ChatWidget extends Disposable implements IChatWidget {
 
 	saveState(): void {
 		this.inputPart.saveState();
+
+		if (this.viewModel?.model.welcomeMessage) {
+			this.storageService.store(PersistWelcomeMessageContentKey, this.viewModel?.model.welcomeMessage, StorageScope.APPLICATION, StorageTarget.MACHINE);
+		}
 	}
 
 	getViewState(): IChatViewState {
-		this.inputPart.saveState();
-		return { inputValue: this.getInput(), inputState: this.collectInputState() };
+		return {
+			inputValue: this.getInput(),
+			inputState: this.collectInputState(),
+			selectedLanguageModelId: this.inputPart.currentLanguageModel
+		};
 	}
 
-
+	private updateChatInputContext() {
+		const currentAgent = this.parsedInput.parts.find(part => part instanceof ChatRequestAgentPart);
+		this.agentInInput.set(!!currentAgent);
+		this.agentSupportsModelPicker.set(!currentAgent || !!currentAgent.agent.supportsModelPicker);
+	}
 }
 
 export class ChatWidgetService implements IChatWidgetService {
@@ -929,8 +1131,8 @@ export class ChatWidgetService implements IChatWidgetService {
 	private _widgets: ChatWidget[] = [];
 	private _lastFocusedWidget: ChatWidget | undefined = undefined;
 
-	get lastFocusedWidget(): ChatWidget | undefined {
-		return this._lastFocusedWidget;
+	get lastFocusedWidget(): IChatWidget | undefined {
+		return TerminalChatController.activeChatController?.chatWidget ?? this._lastFocusedWidget;
 	}
 
 	constructor() { }
@@ -939,6 +1141,10 @@ export class ChatWidgetService implements IChatWidgetService {
 		return this._widgets.find(w => isEqual(w.inputUri, uri));
 	}
 
+	getWidgetByLocation(location: ChatAgentLocation): ChatWidget[] {
+		return this._widgets.filter(w => w.location === location);
+	}
+
 	getWidgetBySessionId(sessionId: string): ChatWidget | undefined {
 		return this._widgets.find(w => w.viewModel?.sessionId === sessionId);
 	}
diff --git a/src/vs/workbench/contrib/chat/browser/codeBlockContextProviderService.ts b/src/vs/workbench/contrib/chat/browser/codeBlockContextProviderService.ts
index 8c790c54040..8b5809c60b0 100644
--- a/src/vs/workbench/contrib/chat/browser/codeBlockContextProviderService.ts
+++ b/src/vs/workbench/contrib/chat/browser/codeBlockContextProviderService.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { ICodeBlockActionContextProvider, IChatCodeBlockContextProviderService } from 'vs/workbench/contrib/chat/browser/chat';
+import { IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { ICodeBlockActionContextProvider, IChatCodeBlockContextProviderService } from './chat.js';
 
 export class ChatCodeBlockContextProviderService implements IChatCodeBlockContextProviderService {
 	declare _serviceBrand: undefined;
diff --git a/src/vs/workbench/contrib/chat/browser/codeBlockPart.css b/src/vs/workbench/contrib/chat/browser/codeBlockPart.css
index 279626daf82..92049236a3a 100644
--- a/src/vs/workbench/contrib/chat/browser/codeBlockPart.css
+++ b/src/vs/workbench/contrib/chat/browser/codeBlockPart.css
@@ -15,7 +15,7 @@
 .interactive-result-code-block .interactive-result-code-block-toolbar > .monaco-action-bar,
 .interactive-result-code-block .interactive-result-code-block-toolbar > .monaco-toolbar {
 	position: absolute;
-	top: -13px;
+	top: -15px;
 	height: 26px;
 	line-height: 26px;
 	background-color: var(--vscode-interactive-result-editor-background-color, var(--vscode-editor-background));
@@ -31,6 +31,7 @@
 }
 
 .interactive-result-code-block .interactive-result-code-block-toolbar > .monaco-toolbar {
+	border-radius: 3px;
 	right: 10px;
 }
 
@@ -147,3 +148,17 @@
 .interactive-result-code-block.compare .message A > CODE {
 	color: var(--vscode-textLink-foreground);
 }
+
+.interactive-result-code-block.compare .interactive-result-header {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	padding: 0 3px;
+	box-sizing: border-box;
+	border-bottom: solid 1px var(--vscode-chat-requestBorder);
+}
+
+.interactive-result-code-block.compare.no-diff .interactive-result-header,
+.interactive-result-code-block.compare.no-diff .interactive-result-editor {
+	display: none;
+}
diff --git a/src/vs/workbench/contrib/chat/browser/codeBlockPart.ts b/src/vs/workbench/contrib/chat/browser/codeBlockPart.ts
index 46e306fd9d2..88db10091c0 100644
--- a/src/vs/workbench/contrib/chat/browser/codeBlockPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/codeBlockPart.ts
@@ -3,66 +3,72 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./codeBlockPart';
+import './codeBlockPart.css';
 
-import * as dom from 'vs/base/browser/dom';
-import { Button } from 'vs/base/browser/ui/button/button';
-import { Codicon } from 'vs/base/common/codicons';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable, DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { IEditorConstructionOptions } from 'vs/editor/browser/config/editorConfiguration';
-import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
-import { CodeEditorWidget, ICodeEditorWidgetOptions } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { EDITOR_FONT_DEFAULTS, EditorOption, IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { IDiffEditorViewModel, ScrollType } from 'vs/editor/common/editorCommon';
-import { EndOfLinePreference, ITextModel } from 'vs/editor/common/model';
-import { IModelService } from 'vs/editor/common/services/model';
-import { IResolvedTextEditorModel, ITextModelContentProvider, ITextModelService } from 'vs/editor/common/services/resolverService';
-import { BracketMatchingController } from 'vs/editor/contrib/bracketMatching/browser/bracketMatching';
-import { ContextMenuController } from 'vs/editor/contrib/contextmenu/browser/contextmenu';
-import { GotoDefinitionAtPositionEditorContribution } from 'vs/editor/contrib/gotoSymbol/browser/link/goToDefinitionAtPosition';
-import { ViewportSemanticTokensContribution } from 'vs/editor/contrib/semanticTokens/browser/viewportSemanticTokens';
-import { SmartSelectController } from 'vs/editor/contrib/smartSelect/browser/smartSelect';
-import { WordHighlighterContribution } from 'vs/editor/contrib/wordHighlighter/browser/wordHighlighter';
-import { localize } from 'vs/nls';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { MenuWorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { IChatRendererDelegate } from 'vs/workbench/contrib/chat/browser/chatListRenderer';
-import { ChatEditorOptions } from 'vs/workbench/contrib/chat/browser/chatOptions';
-import { IChatResponseViewModel, isResponseVM } from 'vs/workbench/contrib/chat/common/chatViewModel';
-import { MenuPreventer } from 'vs/workbench/contrib/codeEditor/browser/menuPreventer';
-import { SelectionClipboardContributionID } from 'vs/workbench/contrib/codeEditor/browser/selectionClipboard';
-import { getSimpleEditorOptions } from 'vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
-import { IMarkdownVulnerability } from '../common/annotations';
-import { TabFocus } from 'vs/editor/browser/config/tabFocus';
-import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditor/diffEditorWidget';
-import { ChatTreeItem } from 'vs/workbench/contrib/chat/browser/chat';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IDiffEditor } from 'vs/editor/browser/editorBrowser';
-import { HoverController } from 'vs/editor/contrib/hover/browser/hoverController';
-import { CONTEXT_CHAT_EDIT_APPLIED } from 'vs/workbench/contrib/chat/common/chatContextKeys';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { renderFormattedText } from 'vs/base/browser/formattedTextRenderer';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IChatResponseModel, IChatTextEditGroup } from 'vs/workbench/contrib/chat/common/chatModel';
-import { TextEdit } from 'vs/editor/common/languages';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { basename, isEqual } from 'vs/base/common/resources';
-import { DefaultModelSHA1Computer } from 'vs/editor/common/services/modelService';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { TextModelText } from 'vs/editor/common/model/textModelText';
-import { MessageController } from 'vs/editor/contrib/message/browser/messageController';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { toAction } from 'vs/base/common/actions';
+import * as dom from '../../../../base/browser/dom.js';
+import { renderFormattedText } from '../../../../base/browser/formattedTextRenderer.js';
+import { Button } from '../../../../base/browser/ui/button/button.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { combinedDisposable, Disposable, DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { assertType } from '../../../../base/common/types.js';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
+import { IEditorConstructionOptions } from '../../../../editor/browser/config/editorConfiguration.js';
+import { TabFocus } from '../../../../editor/browser/config/tabFocus.js';
+import { IDiffEditor } from '../../../../editor/browser/editorBrowser.js';
+import { EditorExtensionsRegistry } from '../../../../editor/browser/editorExtensions.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { CodeEditorWidget, ICodeEditorWidgetOptions } from '../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { DiffEditorWidget } from '../../../../editor/browser/widget/diffEditor/diffEditorWidget.js';
+import { EDITOR_FONT_DEFAULTS, EditorOption, IEditorOptions } from '../../../../editor/common/config/editorOptions.js';
+import { IRange, Range } from '../../../../editor/common/core/range.js';
+import { ScrollType } from '../../../../editor/common/editorCommon.js';
+import { TextEdit } from '../../../../editor/common/languages.js';
+import { EndOfLinePreference, ITextModel } from '../../../../editor/common/model.js';
+import { TextModelText } from '../../../../editor/common/model/textModelText.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { DefaultModelSHA1Computer } from '../../../../editor/common/services/modelService.js';
+import { IResolvedTextEditorModel, ITextModelContentProvider, ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { BracketMatchingController } from '../../../../editor/contrib/bracketMatching/browser/bracketMatching.js';
+import { ColorDetector } from '../../../../editor/contrib/colorPicker/browser/colorDetector.js';
+import { ContextMenuController } from '../../../../editor/contrib/contextmenu/browser/contextmenu.js';
+import { GotoDefinitionAtPositionEditorContribution } from '../../../../editor/contrib/gotoSymbol/browser/link/goToDefinitionAtPosition.js';
+import { ContentHoverController } from '../../../../editor/contrib/hover/browser/contentHoverController.js';
+import { GlyphHoverController } from '../../../../editor/contrib/hover/browser/glyphHoverController.js';
+import { LinkDetector } from '../../../../editor/contrib/links/browser/links.js';
+import { MessageController } from '../../../../editor/contrib/message/browser/messageController.js';
+import { ViewportSemanticTokensContribution } from '../../../../editor/contrib/semanticTokens/browser/viewportSemanticTokens.js';
+import { SmartSelectController } from '../../../../editor/contrib/smartSelect/browser/smartSelect.js';
+import { WordHighlighterContribution } from '../../../../editor/contrib/wordHighlighter/browser/wordHighlighter.js';
+import { localize } from '../../../../nls.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { FileKind } from '../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { ResourceLabel } from '../../../browser/labels.js';
+import { ResourceContextKey } from '../../../common/contextkeys.js';
+import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
+import { InspectEditorTokensController } from '../../codeEditor/browser/inspectEditorTokens/inspectEditorTokens.js';
+import { MenuPreventer } from '../../codeEditor/browser/menuPreventer.js';
+import { SelectionClipboardContributionID } from '../../codeEditor/browser/selectionClipboard.js';
+import { getSimpleEditorOptions } from '../../codeEditor/browser/simpleEditorOptions.js';
+import { IMarkdownVulnerability } from '../common/annotations.js';
+import { CONTEXT_CHAT_EDIT_APPLIED } from '../common/chatContextKeys.js';
+import { IChatResponseModel, IChatTextEditGroup } from '../common/chatModel.js';
+import { IChatResponseViewModel, isResponseVM } from '../common/chatViewModel.js';
+import { ChatTreeItem } from './chat.js';
+import { IChatRendererDelegate } from './chatListRenderer.js';
+import { ChatEditorOptions } from './chatOptions.js';
 
 const $ = dom.$;
 
@@ -73,6 +79,8 @@ export interface ICodeBlockData {
 	readonly textModel: Promise<IResolvedTextEditorModel>;
 	readonly languageId: string;
 
+	readonly codemapperUri?: URI;
+
 	readonly vulns?: readonly IMarkdownVulnerability[];
 	readonly range?: Range;
 
@@ -120,6 +128,7 @@ export function parseLocalFileData(text: string) {
 
 export interface ICodeBlockActionContext {
 	code: string;
+	codemapperUri?: URI;
 	languageId?: string;
 	codeBlockIndex: number;
 	element: unknown;
@@ -143,6 +152,9 @@ export class CodeBlockPart extends Disposable {
 	private currentScrollWidth = 0;
 
 	private readonly disposableStore = this._register(new DisposableStore());
+	private isDisposed = false;
+
+	private resourceContextKey: ResourceContextKey;
 
 	constructor(
 		private readonly options: ChatEditorOptions,
@@ -158,8 +170,9 @@ export class CodeBlockPart extends Disposable {
 		super();
 		this.element = $('.interactive-result-code-block');
 
+		this.resourceContextKey = this._register(instantiationService.createInstance(ResourceContextKey));
 		this.contextKeyService = this._register(contextKeyService.createScoped(this.element));
-		const scopedInstantiationService = instantiationService.createChild(new ServiceCollection([IContextKeyService, this.contextKeyService]));
+		const scopedInstantiationService = this._register(instantiationService.createChild(new ServiceCollection([IContextKeyService, this.contextKeyService])));
 		const editorElement = dom.append(this.element, $('.interactive-result-editor'));
 		this.editor = this.createEditor(scopedInstantiationService, editorElement, {
 			...getSimpleEditorOptions(this.configurationService),
@@ -189,7 +202,7 @@ export class CodeBlockPart extends Disposable {
 
 		const toolbarElement = dom.append(this.element, $('.interactive-result-code-block-toolbar'));
 		const editorScopedService = this.editor.contextKeyService.createScoped(toolbarElement);
-		const editorScopedInstantiationService = scopedInstantiationService.createChild(new ServiceCollection([IContextKeyService, editorScopedService]));
+		const editorScopedInstantiationService = this._register(scopedInstantiationService.createChild(new ServiceCollection([IContextKeyService, editorScopedService])));
 		this.toolbar = this._register(editorScopedInstantiationService.createInstance(MenuWorkbenchToolBar, toolbarElement, menuId, {
 			menuOptions: {
 				shouldForwardArgs: true
@@ -263,6 +276,11 @@ export class CodeBlockPart extends Disposable {
 		}
 	}
 
+	override dispose() {
+		this.isDisposed = true;
+		super.dispose();
+	}
+
 	get uri(): URI | undefined {
 		return this.editor.getModel()?.uri;
 	}
@@ -279,9 +297,14 @@ export class CodeBlockPart extends Disposable {
 				ViewportSemanticTokensContribution.ID,
 				BracketMatchingController.ID,
 				SmartSelectController.ID,
-				HoverController.ID,
+				ContentHoverController.ID,
+				GlyphHoverController.ID,
 				MessageController.ID,
 				GotoDefinitionAtPositionEditorContribution.ID,
+				ColorDetector.ID,
+				LinkDetector.ID,
+
+				InspectEditorTokensController.ID,
 			])
 		}));
 	}
@@ -354,6 +377,9 @@ export class CodeBlockPart extends Disposable {
 		}
 
 		await this.updateEditor(data);
+		if (this.isDisposed) {
+			return;
+		}
 
 		this.layout(width);
 		if (editable) {
@@ -385,7 +411,8 @@ export class CodeBlockPart extends Disposable {
 	}
 
 	private clearWidgets() {
-		HoverController.get(this.editor)?.hideContentHover();
+		ContentHoverController.get(this.editor)?.hideContentHover();
+		GlyphHoverController.get(this.editor)?.hideContentHover();
 	}
 
 	private async updateEditor(data: ICodeBlockData): Promise<void> {
@@ -400,8 +427,10 @@ export class CodeBlockPart extends Disposable {
 			code: textModel.getTextBuffer().getValueInRange(data.range ?? textModel.getFullModelRange(), EndOfLinePreference.TextDefined),
 			codeBlockIndex: data.codeBlockIndex,
 			element: data.element,
-			languageId: textModel.getLanguageId()
+			languageId: textModel.getLanguageId(),
+			codemapperUri: data.codemapperUri,
 		} satisfies ICodeBlockActionContext;
+		this.resourceContextKey.set(textModel.uri);
 	}
 
 	private getVulnerabilitiesLabel(): string {
@@ -458,22 +487,23 @@ export interface ICodeCompareBlockData {
 	readonly diffData: Promise<ICodeCompareBlockDiffData | undefined>;
 
 	readonly parentContextKeyService?: IContextKeyService;
-	readonly hideToolbar?: boolean;
+	// readonly hideToolbar?: boolean;
 }
 
 
+// long-lived object that sits in the DiffPool and that gets reused
 export class CodeCompareBlockPart extends Disposable {
 	protected readonly _onDidChangeContentHeight = this._register(new Emitter<void>());
 	public readonly onDidChangeContentHeight = this._onDidChangeContentHeight.event;
 
 	private readonly contextKeyService: IContextKeyService;
 	private readonly diffEditor: DiffEditorWidget;
-	private readonly toolbar1: ActionBar;
-	private readonly toolbar2: MenuWorkbenchToolBar;
+	private readonly resourceLabel: ResourceLabel;
+	private readonly toolbar: MenuWorkbenchToolBar;
 	readonly element: HTMLElement;
 	private readonly messageElement: HTMLElement;
 
-	private readonly _lastDiffEditorViewModel = this._store.add(new MutableDisposable<IDiffEditorViewModel>());
+	private readonly _lastDiffEditorViewModel = this._store.add(new MutableDisposable());
 	private currentScrollWidth = 0;
 
 	constructor(
@@ -498,7 +528,8 @@ export class CodeCompareBlockPart extends Disposable {
 		this.messageElement.tabIndex = 0;
 
 		this.contextKeyService = this._register(contextKeyService.createScoped(this.element));
-		const scopedInstantiationService = instantiationService.createChild(new ServiceCollection([IContextKeyService, this.contextKeyService]));
+		const scopedInstantiationService = this._register(instantiationService.createChild(new ServiceCollection([IContextKeyService, this.contextKeyService])));
+		const editorHeader = dom.append(this.element, $('.interactive-result-header.show-file-icons'));
 		const editorElement = dom.append(this.element, $('.interactive-result-editor'));
 		this.diffEditor = this.createDiffEditor(scopedInstantiationService, editorElement, {
 			...getSimpleEditorOptions(this.configurationService),
@@ -525,24 +556,16 @@ export class CodeCompareBlockPart extends Disposable {
 			...this.getEditorOptionsFromConfig(),
 		});
 
-		const toolbarElement = dom.append(this.element, $('.interactive-result-code-block-toolbar'));
+		this.resourceLabel = this._register(scopedInstantiationService.createInstance(ResourceLabel, editorHeader, { supportIcons: true }));
 
-		// this.resourceLabel = this._register(scopedInstantiationService.createInstance(ResourceLabel, toolbarElement, { supportIcons: true }));
-
-		const editorScopedService = this.diffEditor.getModifiedEditor().contextKeyService.createScoped(toolbarElement);
-		const editorScopedInstantiationService = scopedInstantiationService.createChild(new ServiceCollection([IContextKeyService, editorScopedService]));
-		this.toolbar1 = this._register(new ActionBar(toolbarElement, {}));
-		this.toolbar2 = this._register(editorScopedInstantiationService.createInstance(MenuWorkbenchToolBar, toolbarElement, menuId, {
+		const editorScopedService = this.diffEditor.getModifiedEditor().contextKeyService.createScoped(editorHeader);
+		const editorScopedInstantiationService = this._register(scopedInstantiationService.createChild(new ServiceCollection([IContextKeyService, editorScopedService])));
+		this.toolbar = this._register(editorScopedInstantiationService.createInstance(MenuWorkbenchToolBar, editorHeader, menuId, {
 			menuOptions: {
 				shouldForwardArgs: true
 			}
 		}));
 
-
-		this._register(this.toolbar2.onDidChangeDropdownVisibility(e => {
-			toolbarElement.classList.toggle('force-visibility', e);
-		}));
-
 		this._configureForScreenReader();
 		this._register(this.accessibilityService.onDidChangeScreenReaderOptimized(() => this._configureForScreenReader()));
 		this._register(this.configurationService.onDidChangeConfiguration((e) => {
@@ -598,7 +621,8 @@ export class CodeCompareBlockPart extends Disposable {
 				ViewportSemanticTokensContribution.ID,
 				BracketMatchingController.ID,
 				SmartSelectController.ID,
-				HoverController.ID,
+				ContentHoverController.ID,
+				GlyphHoverController.ID,
 				GotoDefinitionAtPositionEditorContribution.ID,
 			])
 		};
@@ -614,9 +638,16 @@ export class CodeCompareBlockPart extends Disposable {
 			diffAlgorithm: 'advanced',
 			readOnly: false,
 			isInEmbeddedEditor: true,
-			useInlineViewWhenSpaceIsLimited: false,
+			useInlineViewWhenSpaceIsLimited: true,
+			experimental: {
+				useTrueInlineView: true,
+			},
+			renderSideBySideInlineBreakpoint: 300,
+			renderOverviewRuler: false,
+			compactMode: true,
 			hideUnchangedRegions: { enabled: true, contextLineCount: 1 },
 			renderGutterMenu: false,
+			lineNumbersMinChars: 1,
 			...options
 		}, { originalEditor: widgetOptions, modifiedEditor: widgetOptions }));
 	}
@@ -637,7 +668,7 @@ export class CodeCompareBlockPart extends Disposable {
 	}
 
 	private _configureForScreenReader(): void {
-		const toolbarElt = this.toolbar2.getElement();
+		const toolbarElt = this.toolbar.getElement();
 		if (this.accessibilityService.isScreenReaderOptimized()) {
 			toolbarElt.style.display = 'block';
 			toolbarElt.ariaLabel = this.configurationService.getValue(AccessibilityVerbositySettingId.Chat) ? localize('chat.codeBlock.toolbarVerbose', 'Toolbar for code block which can be reached via tab') : localize('chat.codeBlock.toolbar', 'Code block toolbar');
@@ -661,18 +692,20 @@ export class CodeCompareBlockPart extends Disposable {
 	}
 
 	layout(width: number): void {
-		const contentHeight = this.getContentHeight();
 		const editorBorder = 2;
-		const dimension = { width: width - editorBorder, height: contentHeight };
+
+		const toolbar = dom.getTotalHeight(this.toolbar.getElement());
+		const content = this.diffEditor.getModel()
+			? this.diffEditor.getContentHeight()
+			: dom.getTotalHeight(this.messageElement);
+
+		const dimension = new dom.Dimension(width - editorBorder, toolbar + content);
 		this.element.style.height = `${dimension.height}px`;
 		this.element.style.width = `${dimension.width}px`;
-		this.diffEditor.layout(dimension);
+		this.diffEditor.layout(dimension.with(undefined, content - editorBorder));
 		this.updatePaddingForLayout();
 	}
 
-	private getContentHeight() {
-		return this.diffEditor.getContentHeight();
-	}
 
 	async render(data: ICodeCompareBlockData, width: number, token: CancellationToken) {
 		if (data.parentContextKeyService) {
@@ -690,21 +723,10 @@ export class CodeCompareBlockPart extends Disposable {
 		this.layout(width);
 		this.diffEditor.updateOptions({ ariaLabel: localize('chat.compareCodeBlockLabel', "Code Edits") });
 
-		this.toolbar1.clear();
-		this.toolbar1.push(toAction({
-			label: basename(data.edit.uri),
-			tooltip: localize('chat.edit.tooltip', "Open '{0}'", this.labelService.getUriLabel(data.edit.uri, { relative: true })),
-			run: () => {
-				this.openerService.open(data.edit.uri, { fromUserGesture: true, allowCommands: false });
-			},
-			id: '',
-		}), { icon: false, label: true });
-
-		if (data.hideToolbar) {
-			dom.hide(this.toolbar2.getElement());
-		} else {
-			dom.show(this.toolbar2.getElement());
-		}
+		this.resourceLabel.element.setFile(data.edit.uri, {
+			fileKind: FileKind.FILE,
+			fileDecorations: { colors: true, badges: false }
+		});
 	}
 
 	reset() {
@@ -712,8 +734,10 @@ export class CodeCompareBlockPart extends Disposable {
 	}
 
 	private clearWidgets() {
-		HoverController.get(this.diffEditor.getOriginalEditor())?.hideContentHover();
-		HoverController.get(this.diffEditor.getModifiedEditor())?.hideContentHover();
+		ContentHoverController.get(this.diffEditor.getOriginalEditor())?.hideContentHover();
+		ContentHoverController.get(this.diffEditor.getModifiedEditor())?.hideContentHover();
+		GlyphHoverController.get(this.diffEditor.getOriginalEditor())?.hideContentHover();
+		GlyphHoverController.get(this.diffEditor.getModifiedEditor())?.hideContentHover();
 	}
 
 	private async updateEditor(data: ICodeCompareBlockData, token: CancellationToken): Promise<void> {
@@ -728,14 +752,19 @@ export class CodeCompareBlockPart extends Disposable {
 
 		this.element.classList.toggle('no-diff', isEditApplied);
 
-		if (data.edit.state?.applied) {
+		if (isEditApplied) {
+			assertType(data.edit.state?.applied);
 
 			const uriLabel = this.labelService.getUriLabel(data.edit.uri, { relative: true, noPrefix: true });
 
-			const template = data.edit.state.applied > 1
-				? localize('chat.edits.N', "Made {0} changes in [[``{1}``]]", data.edit.state.applied, uriLabel)
-				: localize('chat.edits.1', "Made 1 change in [[``{0}``]]", uriLabel);
-
+			let template: string;
+			if (data.edit.state.applied === 1) {
+				template = localize('chat.edits.1', "Made 1 change in [[``{0}``]]", uriLabel);
+			} else if (data.edit.state.applied < 0) {
+				template = localize('chat.edits.rejected', "Edits in [[``{0}``]] have been rejected", uriLabel);
+			} else {
+				template = localize('chat.edits.N', "Made {0} changes in [[``{1}``]]", data.edit.state.applied, uriLabel);
+			}
 
 			const message = renderFormattedText(template, {
 				renderCodeSegments: true,
@@ -748,15 +777,11 @@ export class CodeCompareBlockPart extends Disposable {
 			});
 
 			dom.reset(this.messageElement, message);
-
 		}
 
 		const diffData = await data.diffData;
-		if (!diffData) {
-			return;
-		}
 
-		if (!isEditApplied) {
+		if (!isEditApplied && diffData) {
 			const viewModel = this.diffEditor.createViewModel({
 				original: diffData.original,
 				modified: diffData.modified
@@ -768,15 +793,21 @@ export class CodeCompareBlockPart extends Disposable {
 				return;
 			}
 
+			const listener = Event.any(diffData.original.onWillDispose, diffData.modified.onWillDispose)(() => {
+				// this a bit weird and basically duplicates https://github.com/microsoft/vscode/blob/7cbcafcbcc88298cfdcd0238018fbbba8eb6853e/src/vs/editor/browser/widget/diffEditor/diffEditorWidget.ts#L328
+				// which cannot call `setModel(null)` without first complaining
+				this.diffEditor.setModel(null);
+			});
 			this.diffEditor.setModel(viewModel);
-			this._lastDiffEditorViewModel.value = viewModel;
+			this._lastDiffEditorViewModel.value = combinedDisposable(listener, viewModel);
 
 		} else {
 			this.diffEditor.setModel(null);
 			this._lastDiffEditorViewModel.value = undefined;
+			this._onDidChangeContentHeight.fire();
 		}
 
-		this.toolbar2.context = {
+		this.toolbar.context = {
 			edit: data.edit,
 			element: data.element,
 			diffEditor: this.diffEditor,
@@ -888,4 +919,18 @@ export class DefaultChatTextEditor {
 		}
 		return true;
 	}
+
+	discard(response: IChatResponseModel | IChatResponseViewModel, item: IChatTextEditGroup) {
+		if (!response.response.value.includes(item)) {
+			// bogous item
+			return;
+		}
+
+		if (item.state?.applied) {
+			// already applied
+			return;
+		}
+
+		response.setEditApplied(item, -1);
+	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatContextAttachments.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatContextAttachments.ts
index ff0a4455486..3f9658d2ab9 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatContextAttachments.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatContextAttachments.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IChatWidget } from 'vs/workbench/contrib/chat/browser/chat';
-import { ChatWidget, IChatWidgetContrib } from 'vs/workbench/contrib/chat/browser/chatWidget';
-import { IChatRequestVariableEntry } from 'vs/workbench/contrib/chat/common/chatModel';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { IChatWidget } from '../chat.js';
+import { ChatWidget, IChatWidgetContrib } from '../chatWidget.js';
+import { IChatRequestVariableEntry, isChatRequestVariableEntry } from '../../common/chatModel.js';
 
 export class ChatContextAttachments extends Disposable implements IChatWidgetContrib {
 
-	private _attachedContext = new Set<IChatRequestVariableEntry>();
+	private _attachedContext = new Map<string, IChatRequestVariableEntry>();
 
 	public static readonly ID = 'chatContextAttachments';
 
@@ -21,8 +21,13 @@ export class ChatContextAttachments extends Disposable implements IChatWidgetCon
 	constructor(readonly widget: IChatWidget) {
 		super();
 
-		this._register(this.widget.onDidDeleteContext((e) => {
-			this._removeContext(e);
+		this._register(this.widget.onDidChangeContext(({ removed, added }) => {
+			removed?.forEach(attachment => this._attachedContext.delete(attachment.id));
+			added?.forEach(attachment => {
+				if (!this._attachedContext.has(attachment.id)) {
+					this._attachedContext.set(attachment.id, attachment);
+				}
+			});
 		}));
 
 		this._register(this.widget.onDidSubmitAgent(() => {
@@ -30,35 +35,33 @@ export class ChatContextAttachments extends Disposable implements IChatWidgetCon
 		}));
 	}
 
-	getInputState?() {
+	getInputState(): IChatRequestVariableEntry[] {
 		return [...this._attachedContext.values()];
 	}
 
-	setInputState?(s: any): void {
-		if (!Array.isArray(s)) {
-			return;
-		}
-
-		this.widget.setContext(true, ...s);
+	setInputState(s: unknown): void {
+		const attachments = Array.isArray(s) ? s.filter(isChatRequestVariableEntry) : [];
+		this.setContext(true, ...attachments);
 	}
 
 	getContext() {
-		return new Set([...this._attachedContext.values()].map((v) => v.id));
+		return new Set(this._attachedContext.keys());
 	}
 
 	setContext(overwrite: boolean, ...attachments: IChatRequestVariableEntry[]) {
 		if (overwrite) {
 			this._attachedContext.clear();
 		}
+
+		const newAttachments = [];
 		for (const attachment of attachments) {
-			this._attachedContext.add(attachment);
+			if (!this._attachedContext.has(attachment.id)) {
+				this._attachedContext.set(attachment.id, attachment);
+				newAttachments.push(attachment);
+			}
 		}
 
-		this.widget.setContext(overwrite, ...attachments);
-	}
-
-	private _removeContext(attachment: IChatRequestVariableEntry) {
-		this._attachedContext.delete(attachment);
+		this.widget.setContext(overwrite, ...newAttachments);
 	}
 
 	private _clearAttachedContext() {
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts
index 4c3fa0ee29c..bd240abb61c 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { coalesce } from 'vs/base/common/arrays';
-import { IMarkdownString, MarkdownString } from 'vs/base/common/htmlContent';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { basename } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { IDecorationOptions } from 'vs/editor/common/editorCommon';
-import { Command } from 'vs/editor/common/languages';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { localize } from 'vs/nls';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { ILogService } from 'vs/platform/log/common/log';
-import { AnythingQuickAccessProviderRunOptions, IQuickAccessOptions } from 'vs/platform/quickinput/common/quickAccess';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { IChatWidget } from 'vs/workbench/contrib/chat/browser/chat';
-import { ChatWidget, IChatWidgetContrib } from 'vs/workbench/contrib/chat/browser/chatWidget';
-import { IChatRequestVariableValue, IChatVariablesService, IDynamicVariable } from 'vs/workbench/contrib/chat/common/chatVariables';
+import { coalesce } from '../../../../../base/common/arrays.js';
+import { IMarkdownString, MarkdownString } from '../../../../../base/common/htmlContent.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { basename } from '../../../../../base/common/resources.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { IRange, Range } from '../../../../../editor/common/core/range.js';
+import { IDecorationOptions } from '../../../../../editor/common/editorCommon.js';
+import { Command } from '../../../../../editor/common/languages.js';
+import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
+import { localize } from '../../../../../nls.js';
+import { Action2, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ILabelService } from '../../../../../platform/label/common/label.js';
+import { ILogService } from '../../../../../platform/log/common/log.js';
+import { AnythingQuickAccessProviderRunOptions, IQuickAccessOptions } from '../../../../../platform/quickinput/common/quickAccess.js';
+import { IQuickInputService } from '../../../../../platform/quickinput/common/quickInput.js';
+import { IChatWidget } from '../chat.js';
+import { ChatWidget, IChatWidgetContrib } from '../chatWidget.js';
+import { IChatRequestVariableValue, IChatVariablesService, IDynamicVariable } from '../../common/chatVariables.js';
 
 export const dynamicVariableDecorationType = 'chat-dynamic-variable';
 
@@ -41,7 +41,6 @@ export class ChatDynamicVariableModel extends Disposable implements IChatWidgetC
 	constructor(
 		private readonly widget: IChatWidget,
 		@ILabelService private readonly labelService: ILabelService,
-		@ILogService private readonly logService: ILogService,
 	) {
 		super();
 		this._register(widget.inputEditor.onDidChangeModelContent(e => {
@@ -50,12 +49,15 @@ export class ChatDynamicVariableModel extends Disposable implements IChatWidgetC
 				this._variables = coalesce(this._variables.map(ref => {
 					const intersection = Range.intersectRanges(ref.range, c.range);
 					if (intersection && !intersection.isEmpty()) {
-						// The reference text was changed, it's broken
-						const rangeToDelete = new Range(ref.range.startLineNumber, ref.range.startColumn, ref.range.endLineNumber, ref.range.endColumn - 1);
-						this.widget.inputEditor.executeEdits(this.id, [{
-							range: rangeToDelete,
-							text: '',
-						}]);
+						// The reference text was changed, it's broken.
+						// But if the whole reference range was deleted (eg history navigation) then don't try to change the editor.
+						if (!Range.containsRange(c.range, ref.range)) {
+							const rangeToDelete = new Range(ref.range.startLineNumber, ref.range.startColumn, ref.range.endLineNumber, ref.range.endColumn - 1);
+							this.widget.inputEditor.executeEdits(this.id, [{
+								range: rangeToDelete,
+								text: '',
+							}]);
+						}
 						return null;
 					} else if (Range.compareRangesUsingStarts(ref.range, c.range) > 0) {
 						const delta = c.text.length - c.rangeLength;
@@ -84,9 +86,7 @@ export class ChatDynamicVariableModel extends Disposable implements IChatWidgetC
 
 	setInputState(s: any): void {
 		if (!Array.isArray(s)) {
-			// Something went wrong
-			this.logService.warn('ChatDynamicVariableModel.setInputState called with invalid state: ' + JSON.stringify(s));
-			return;
+			s = [];
 		}
 
 		this._variables = s;
@@ -99,18 +99,18 @@ export class ChatDynamicVariableModel extends Disposable implements IChatWidgetC
 	}
 
 	private updateDecorations(): void {
-		this.widget.inputEditor.setDecorationsByType('chat', dynamicVariableDecorationType, this._variables.map(r => (<IDecorationOptions>{
+		this.widget.inputEditor.setDecorationsByType('chat', dynamicVariableDecorationType, this._variables.map((r): IDecorationOptions => ({
 			range: r.range,
 			hoverMessage: this.getHoverForReference(r)
 		})));
 	}
 
-	private getHoverForReference(ref: IDynamicVariable): string | IMarkdownString {
+	private getHoverForReference(ref: IDynamicVariable): IMarkdownString | undefined {
 		const value = ref.data;
 		if (URI.isUri(value)) {
 			return new MarkdownString(this.labelService.getUriLabel(value, { relative: true }));
 		} else {
-			return (value as any).toString();
+			return undefined;
 		}
 	}
 }
@@ -162,11 +162,10 @@ export class SelectAndInsertFileAction extends Action2 {
 		// This of course assumes that the `files` variable has the behavior that it searches
 		// through files in the workspace.
 		if (chatVariablesService.hasVariable(SelectAndInsertFileAction.Name)) {
-			options = {
-				providerOptions: <AnythingQuickAccessProviderRunOptions>{
-					additionPicks: [SelectAndInsertFileAction.Item, { type: 'separator' }]
-				},
+			const providerOptions: AnythingQuickAccessProviderRunOptions = {
+				additionPicks: [SelectAndInsertFileAction.Item, { type: 'separator' }]
 			};
+			options = { providerOptions };
 		}
 		// TODO: have dedicated UX for this instead of using the quick access picker
 		const picks = await quickInputService.quickAccess.pick('', options);
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
index cbd7042dc42..5e0c1513b17 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
@@ -3,28 +3,40 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { IWordAtPosition, getWordAtText } from 'vs/editor/common/core/wordHelper';
-import { CompletionContext, CompletionItem, CompletionItemKind } from 'vs/editor/common/languages';
-import { ITextModel } from 'vs/editor/common/model';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { localize } from 'vs/nls';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
-import { SubmitAction } from 'vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
-import { IChatWidget, IChatWidgetService } from 'vs/workbench/contrib/chat/browser/chat';
-import { ChatInputPart } from 'vs/workbench/contrib/chat/browser/chatInputPart';
-import { SelectAndInsertFileAction } from 'vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
-import { ChatAgentLocation, getFullyQualifiedId, IChatAgentData, IChatAgentNameService, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestTextPart, ChatRequestVariablePart, chatAgentLeader, chatSubcommandLeader, chatVariableLeader } from 'vs/workbench/contrib/chat/common/chatParserTypes';
-import { IChatSlashCommandService } from 'vs/workbench/contrib/chat/common/chatSlashCommands';
-import { IChatVariablesService } from 'vs/workbench/contrib/chat/common/chatVariables';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { isPatternInWord } from '../../../../../base/common/filters.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { ResourceSet } from '../../../../../base/common/map.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { generateUuid } from '../../../../../base/common/uuid.js';
+import { Position } from '../../../../../editor/common/core/position.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { IWordAtPosition, getWordAtText } from '../../../../../editor/common/core/wordHelper.js';
+import { CompletionContext, CompletionItem, CompletionItemKind, CompletionItemProvider, CompletionList } from '../../../../../editor/common/languages.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
+import { ILanguageFeaturesService } from '../../../../../editor/common/services/languageFeatures.js';
+import { localize } from '../../../../../nls.js';
+import { Action2, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { CommandsRegistry } from '../../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ILabelService } from '../../../../../platform/label/common/label.js';
+import { Registry } from '../../../../../platform/registry/common/platform.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from '../../../../common/contributions.js';
+import { IHistoryService } from '../../../../services/history/common/history.js';
+import { LifecyclePhase } from '../../../../services/lifecycle/common/lifecycle.js';
+import { QueryBuilder } from '../../../../services/search/common/queryBuilder.js';
+import { ISearchService } from '../../../../services/search/common/search.js';
+import { ChatAgentLocation, IChatAgentData, IChatAgentNameService, IChatAgentService, getFullyQualifiedId } from '../../common/chatAgents.js';
+import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestTextPart, ChatRequestToolPart, ChatRequestVariablePart, chatAgentLeader, chatSubcommandLeader, chatVariableLeader } from '../../common/chatParserTypes.js';
+import { IChatSlashCommandService } from '../../common/chatSlashCommands.js';
+import { IChatVariablesService, IDynamicVariable } from '../../common/chatVariables.js';
+import { ILanguageModelToolsService } from '../../common/languageModelToolsService.js';
+import { SubmitAction } from '../actions/chatExecuteActions.js';
+import { IChatWidget, IChatWidgetService } from '../chat.js';
+import { ChatInputPart } from '../chatInputPart.js';
+import { ChatDynamicVariableModel, SelectAndInsertFileAction } from './chatDynamicVariables.js';
 
 class SlashCommandCompletions extends Disposable {
 	constructor(
@@ -39,7 +51,7 @@ class SlashCommandCompletions extends Disposable {
 			triggerCharacters: ['/'],
 			provideCompletionItems: async (model: ITextModel, position: Position, _context: CompletionContext, _token: CancellationToken) => {
 				const widget = this.chatWidgetService.getWidgetByInputUri(model.uri);
-				if (!widget || !widget.viewModel || (widget.location !== ChatAgentLocation.Panel && widget.location !== ChatAgentLocation.Notebook) /* TODO@jrieken - enable when agents are adopted*/) {
+				if (!widget || !widget.viewModel) {
 					return null;
 				}
 
@@ -55,7 +67,7 @@ class SlashCommandCompletions extends Disposable {
 					return;
 				}
 
-				const slashCommands = this.chatSlashCommandService.getCommands();
+				const slashCommands = this.chatSlashCommandService.getCommands(widget.location);
 				if (!slashCommands) {
 					return null;
 				}
@@ -76,6 +88,42 @@ class SlashCommandCompletions extends Disposable {
 				};
 			}
 		}));
+		this._register(this.languageFeaturesService.completionProvider.register({ scheme: ChatInputPart.INPUT_SCHEME, hasAccessToAllModels: true }, {
+			_debugDisplayName: 'globalSlashCommandsAt',
+			triggerCharacters: ['@'],
+			provideCompletionItems: async (model: ITextModel, position: Position, _context: CompletionContext, _token: CancellationToken) => {
+				const widget = this.chatWidgetService.getWidgetByInputUri(model.uri);
+				if (!widget || !widget.viewModel) {
+					return null;
+				}
+
+				const range = computeCompletionRanges(model, position, /@\w*/g);
+				if (!range) {
+					return null;
+				}
+
+				const slashCommands = this.chatSlashCommandService.getCommands(widget.location);
+				if (!slashCommands) {
+					return null;
+				}
+
+				return {
+					suggestions: slashCommands.map((c, i): CompletionItem => {
+						const withSlash = `${chatSubcommandLeader}${c.command}`;
+						return {
+							label: withSlash,
+							insertText: c.executeImmediately ? '' : `${withSlash} `,
+							detail: c.detail,
+							range: new Range(1, 1, 1, 1),
+							filterText: `${chatAgentLeader}${c.command}`,
+							sortText: c.sortText ?? 'z'.repeat(i + 1),
+							kind: CompletionItemKind.Text, // The icons are disabled here anyway,
+							command: c.executeImmediately ? { id: SubmitAction.ID, title: withSlash, arguments: [{ widget, inputValue: `${withSlash} ` }] } : undefined,
+						};
+					})
+				};
+			}
+		}));
 	}
 }
 
@@ -90,56 +138,13 @@ class AgentCompletions extends Disposable {
 	) {
 		super();
 
-		this._register(this.languageFeaturesService.completionProvider.register({ scheme: ChatInputPart.INPUT_SCHEME, hasAccessToAllModels: true }, {
-			_debugDisplayName: 'chatAgent',
-			triggerCharacters: ['@'],
-			provideCompletionItems: async (model: ITextModel, position: Position, _context: CompletionContext, _token: CancellationToken) => {
-				const widget = this.chatWidgetService.getWidgetByInputUri(model.uri);
-				if (!widget || !widget.viewModel || (widget.location !== ChatAgentLocation.Panel && widget.location !== ChatAgentLocation.Notebook) /* TODO@jrieken - enable when agents are adopted*/) {
-					return null;
-				}
 
-				const parsedRequest = widget.parsedInput.parts;
-				const usedAgent = parsedRequest.find(p => p instanceof ChatRequestAgentPart);
-				if (usedAgent && !Range.containsPosition(usedAgent.editorRange, position)) {
-					// Only one agent allowed
-					return;
-				}
-
-				const range = computeCompletionRanges(model, position, /@\w*/g);
-				if (!range) {
-					return null;
-				}
-
-				const agents = this.chatAgentService.getAgents()
-					.filter(a => !a.isDefault)
-					.filter(a => a.locations.includes(widget.location));
-
-				return {
-					suggestions: agents.map((agent, i): CompletionItem => {
-						const { label: agentLabel, isDupe } = this.getAgentCompletionDetails(agent);
-						return {
-							// Leading space is important because detail has no space at the start by design
-							label: isDupe ?
-								{ label: agentLabel, description: agent.description, detail: ` (${agent.publisherDisplayName})` } :
-								agentLabel,
-							insertText: `${agentLabel} `,
-							detail: agent.description,
-							range: new Range(1, 1, 1, 1),
-							command: { id: AssignSelectedAgentAction.ID, title: AssignSelectedAgentAction.ID, arguments: [{ agent: agent, widget } satisfies AssignSelectedAgentActionArgs] },
-							kind: CompletionItemKind.Text, // The icons are disabled here anyway
-						};
-					})
-				};
-			}
-		}));
-
-		this._register(this.languageFeaturesService.completionProvider.register({ scheme: ChatInputPart.INPUT_SCHEME, hasAccessToAllModels: true }, {
+		const subCommandProvider: CompletionItemProvider = {
 			_debugDisplayName: 'chatAgentSubcommand',
 			triggerCharacters: ['/'],
 			provideCompletionItems: async (model: ITextModel, position: Position, _context: CompletionContext, token: CancellationToken) => {
 				const widget = this.chatWidgetService.getWidgetByInputUri(model.uri);
-				if (!widget || !widget.viewModel || widget.location !== ChatAgentLocation.Panel /* TODO@jrieken - enable when agents are adopted*/) {
+				if (!widget || !widget.viewModel) {
 					return;
 				}
 
@@ -182,24 +187,28 @@ class AgentCompletions extends Disposable {
 					})
 				};
 			}
-		}));
+		};
+		this._register(this.languageFeaturesService.completionProvider.register({ scheme: ChatInputPart.INPUT_SCHEME, hasAccessToAllModels: true }, subCommandProvider));
 
-		// list subcommands when the query is empty, insert agent+subcommand
 		this._register(this.languageFeaturesService.completionProvider.register({ scheme: ChatInputPart.INPUT_SCHEME, hasAccessToAllModels: true }, {
 			_debugDisplayName: 'chatAgentAndSubcommand',
-			triggerCharacters: ['/'],
+			triggerCharacters: ['@', '/'],
 			provideCompletionItems: async (model: ITextModel, position: Position, _context: CompletionContext, token: CancellationToken) => {
 				const widget = this.chatWidgetService.getWidgetByInputUri(model.uri);
 				const viewModel = widget?.viewModel;
-				if (!widget || !viewModel || widget.location !== ChatAgentLocation.Panel /* TODO@jrieken - enable when agents are adopted*/) {
+				if (!widget || !viewModel) {
 					return;
 				}
 
-				const range = computeCompletionRanges(model, position, /\/\w*/g);
+				const range = computeCompletionRanges(model, position, /(@|\/)\w*/g);
 				if (!range) {
 					return null;
 				}
 
+				const preceedingChar = position.column > 1 ?
+					model.getValueInRange(new Range(position.lineNumber, position.column - 1, position.lineNumber, position.column)) :
+					'@';
+
 				const agents = this.chatAgentService.getAgents()
 					.filter(a => a.locations.includes(widget.location));
 
@@ -209,8 +218,8 @@ class AgentCompletions extends Disposable {
 				const getFilterText = (agent: IChatAgentData, command: string) => {
 					// This is hacking the filter algorithm to make @terminal /explain match worse than @workspace /explain by making its match index later in the string.
 					// When I type `/exp`, the workspace one should be sorted over the terminal one.
-					const dummyPrefix = agent.id === 'github.copilot.terminal' ? `0000` : ``;
-					return `${chatSubcommandLeader}${dummyPrefix}${agent.name}.${command}`;
+					const dummyPrefix = agent.id === 'github.copilot.terminalPanel' ? `0000` : ``;
+					return `${preceedingChar}${dummyPrefix}${agent.name}.${command}`;
 				};
 
 				const justAgents: CompletionItem[] = agents
@@ -224,11 +233,11 @@ class AgentCompletions extends Disposable {
 								{ label: agentLabel, description: agent.description, detail: ` (${agent.publisherDisplayName})` } :
 								agentLabel,
 							detail,
-							filterText: `${chatSubcommandLeader}${agent.name}`,
+							filterText: `${preceedingChar}${agent.name}`,
 							insertText: `${agentLabel} `,
 							range: new Range(1, 1, 1, 1),
 							kind: CompletionItemKind.Text,
-							sortText: `${chatSubcommandLeader}${agent.name}`,
+							sortText: `${chatAgentLeader}${agent.name}`,
 							command: { id: AssignSelectedAgentAction.ID, title: AssignSelectedAgentAction.ID, arguments: [{ agent, widget } satisfies AssignSelectedAgentActionArgs] },
 						};
 					});
@@ -237,18 +246,30 @@ class AgentCompletions extends Disposable {
 					suggestions: justAgents.concat(
 						agents.flatMap(agent => agent.slashCommands.map((c, i) => {
 							const { label: agentLabel, isDupe } = this.getAgentCompletionDetails(agent);
-							const withSlash = `${chatSubcommandLeader}${c.name}`;
-							return {
-								label: { label: withSlash, description: agentLabel, detail: isDupe ? ` (${agent.publisherDisplayName})` : undefined },
+							const label = `${agentLabel} ${chatSubcommandLeader}${c.name}`;
+							const item: CompletionItem = {
+								label: isDupe ?
+									{ label, description: c.description, detail: isDupe ? ` (${agent.publisherDisplayName})` : undefined } :
+									label,
+								detail: c.description,
 								filterText: getFilterText(agent, c.name),
 								commitCharacters: [' '],
-								insertText: `${agentLabel} ${withSlash} `,
-								detail: `(${agentLabel}) ${c.description ?? ''}`,
+								insertText: label + ' ',
 								range: new Range(1, 1, 1, 1),
 								kind: CompletionItemKind.Text, // The icons are disabled here anyway
-								sortText: `${chatSubcommandLeader}${agent.name}${c.name}`,
+								sortText: `x${chatAgentLeader}${agent.name}${c.name}`,
 								command: { id: AssignSelectedAgentAction.ID, title: AssignSelectedAgentAction.ID, arguments: [{ agent, widget } satisfies AssignSelectedAgentActionArgs] },
-							} satisfies CompletionItem;
+							};
+
+							if (agent.isDefault) {
+								// default agent isn't mentioned nor inserted
+								const label = `${chatSubcommandLeader}${c.name}`;
+								item.label = label;
+								item.insertText = `${label} `;
+								item.detail = c.description;
+							}
+
+							return item;
 						})))
 				};
 			}
@@ -290,57 +311,197 @@ class AssignSelectedAgentAction extends Action2 {
 }
 registerAction2(AssignSelectedAgentAction);
 
+
+class ReferenceArgument {
+	constructor(
+		readonly widget: IChatWidget,
+		readonly variable: IDynamicVariable
+	) { }
+}
+
 class BuiltinDynamicCompletions extends Disposable {
+	private static readonly addReferenceCommand = '_addReferenceCmd';
 	private static readonly VariableNameDef = new RegExp(`${chatVariableLeader}\\w*`, 'g'); // MUST be using `g`-flag
 
+	private readonly queryBuilder: QueryBuilder;
+
 	constructor(
+		@IHistoryService private readonly historyService: IHistoryService,
+		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
+		@ISearchService private readonly searchService: ISearchService,
+		@ILabelService private readonly labelService: ILabelService,
 		@ILanguageFeaturesService private readonly languageFeaturesService: ILanguageFeaturesService,
 		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
 	) {
 		super();
 
 		this._register(this.languageFeaturesService.completionProvider.register({ scheme: ChatInputPart.INPUT_SCHEME, hasAccessToAllModels: true }, {
 			_debugDisplayName: 'chatDynamicCompletions',
 			triggerCharacters: [chatVariableLeader],
-			provideCompletionItems: async (model: ITextModel, position: Position, _context: CompletionContext, _token: CancellationToken) => {
+			provideCompletionItems: async (model: ITextModel, position: Position, _context: CompletionContext, token: CancellationToken) => {
 				const widget = this.chatWidgetService.getWidgetByInputUri(model.uri);
-				if (!widget || !widget.supportsFileReferences || widget.location !== ChatAgentLocation.Panel /* TODO@jrieken - enable when agents are adopted*/) {
+				if (!widget || !widget.supportsFileReferences) {
 					return null;
 				}
 
-				const range = computeCompletionRanges(model, position, BuiltinDynamicCompletions.VariableNameDef);
-				if (!range) {
-					return null;
+				const result: CompletionList = { suggestions: [] };
+				const range = computeCompletionRanges(model, position, BuiltinDynamicCompletions.VariableNameDef, true);
+
+				if (range) {
+					const afterRange = new Range(position.lineNumber, range.replace.startColumn, position.lineNumber, range.replace.startColumn + '#file:'.length);
+					result.suggestions.push({
+						label: `${chatVariableLeader}file`,
+						insertText: `${chatVariableLeader}file:`,
+						detail: localize('pickFileLabel', "Pick a file"),
+						range,
+						kind: CompletionItemKind.Text,
+						command: { id: SelectAndInsertFileAction.ID, title: SelectAndInsertFileAction.ID, arguments: [{ widget, range: afterRange }] },
+						sortText: 'z'
+					});
 				}
 
-				const afterRange = new Range(position.lineNumber, range.replace.startColumn, position.lineNumber, range.replace.startColumn + '#file:'.length);
-				return {
-					suggestions: [
-						{
-							label: `${chatVariableLeader}file`,
-							insertText: `${chatVariableLeader}file:`,
-							detail: localize('pickFileLabel', "Pick a file"),
-							range,
-							kind: CompletionItemKind.Text,
-							command: { id: SelectAndInsertFileAction.ID, title: SelectAndInsertFileAction.ID, arguments: [{ widget, range: afterRange }] },
-							sortText: 'z'
-						} satisfies CompletionItem
-					]
-				};
+				const range2 = computeCompletionRanges(model, position, new RegExp(`${chatVariableLeader}[^\\s]*`, 'g'), true);
+				if (range2) {
+					await this.addFileEntries(widget, result, range2, token);
+				}
+
+				return result;
 			}
 		}));
+
+		this._register(CommandsRegistry.registerCommand(BuiltinDynamicCompletions.addReferenceCommand, (_services, arg) => this.cmdAddReference(arg)));
+
+		this.queryBuilder = this.instantiationService.createInstance(QueryBuilder);
+	}
+
+	private cacheKey?: { key: string; time: number };
+
+	private async addFileEntries(widget: IChatWidget, result: CompletionList, info: { insert: Range; replace: Range; varWord: IWordAtPosition | null }, token: CancellationToken) {
+
+		const makeFileCompletionItem = (resource: URI): CompletionItem => {
+
+			const basename = this.labelService.getUriBasenameLabel(resource);
+			const text = `${chatVariableLeader}file:${basename}`;
+
+			return {
+				label: { label: basename, description: this.labelService.getUriLabel(resource, { relative: true }) },
+				filterText: `${chatVariableLeader}${basename}`,
+				insertText: info.varWord?.endColumn === info.replace.endColumn ? `${text} ` : text,
+				range: info,
+				kind: CompletionItemKind.File,
+				sortText: '{', // after `z`
+				command: {
+					id: BuiltinDynamicCompletions.addReferenceCommand, title: '', arguments: [new ReferenceArgument(widget, {
+						id: 'vscode.file',
+						range: { startLineNumber: info.replace.startLineNumber, startColumn: info.replace.startColumn, endLineNumber: info.replace.endLineNumber, endColumn: info.replace.startColumn + text.length },
+						data: resource
+					})]
+				}
+			};
+		};
+
+		let pattern: string | undefined;
+		if (info.varWord?.word && info.varWord.word.startsWith(chatVariableLeader)) {
+			pattern = info.varWord.word.toLowerCase().slice(1); // remove leading #
+		}
+
+		const seen = new ResourceSet();
+		const len = result.suggestions.length;
+
+		// HISTORY
+		// always take the last N items
+		for (const item of this.historyService.getHistory()) {
+			if (!item.resource || !this.workspaceContextService.getWorkspaceFolder(item.resource)) {
+				// ignore "forgein" editors
+				continue;
+			}
+
+			if (pattern) {
+				// use pattern if available
+				const basename = this.labelService.getUriBasenameLabel(item.resource).toLowerCase();
+				if (!isPatternInWord(pattern, 0, pattern.length, basename, 0, basename.length)) {
+					continue;
+				}
+			}
+
+			seen.add(item.resource);
+			const newLen = result.suggestions.push(makeFileCompletionItem(item.resource));
+			if (newLen - len >= 5) {
+				break;
+			}
+		}
+
+		// SEARCH
+		// use file search when having a pattern
+		if (pattern) {
+
+			if (this.cacheKey && Date.now() - this.cacheKey.time > 60000) {
+				this.searchService.clearCache(this.cacheKey.key);
+				this.cacheKey = undefined;
+			}
+
+			if (!this.cacheKey) {
+				this.cacheKey = {
+					key: generateUuid(),
+					time: Date.now()
+				};
+			}
+
+			this.cacheKey.time = Date.now();
+
+			const query = this.queryBuilder.file(this.workspaceContextService.getWorkspace().folders, {
+				filePattern: pattern,
+				sortByScore: true,
+				maxResults: 250,
+				cacheKey: this.cacheKey.key
+			});
+
+			const data = await this.searchService.fileSearch(query, token);
+			for (const match of data.results) {
+				if (seen.has(match.resource)) {
+					// already included via history
+					continue;
+				}
+				result.suggestions.push(makeFileCompletionItem(match.resource));
+			}
+		}
+
+		// mark results as incomplete because further typing might yield
+		// in more search results
+		result.incomplete = true;
+	}
+
+	private cmdAddReference(arg: ReferenceArgument) {
+		// invoked via the completion command
+		arg.widget.getContrib<ChatDynamicVariableModel>(ChatDynamicVariableModel.ID)?.addReference(arg.variable);
 	}
 }
 
 Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(BuiltinDynamicCompletions, LifecyclePhase.Eventually);
 
-function computeCompletionRanges(model: ITextModel, position: Position, reg: RegExp): { insert: Range; replace: Range; varWord: IWordAtPosition | null } | undefined {
+export function computeCompletionRanges(model: ITextModel, position: Position, reg: RegExp, onlyOnWordStart = false): { insert: Range; replace: Range; varWord: IWordAtPosition | null } | undefined {
 	const varWord = getWordAtText(position.column, reg, model.getLineContent(position.lineNumber), 0);
 	if (!varWord && model.getWordUntilPosition(position).word) {
 		// inside a "normal" word
 		return;
 	}
 
+	if (!varWord && position.column > 1) {
+		const textBefore = model.getValueInRange(new Range(position.lineNumber, position.column - 1, position.lineNumber, position.column));
+		if (textBefore !== ' ') {
+			return;
+		}
+	}
+
+	if (varWord && onlyOnWordStart) {
+		const wordBefore = model.getWordUntilPosition({ lineNumber: position.lineNumber, column: varWord.startColumn });
+		if (wordBefore.word) {
+			// inside a word
+			return;
+		}
+	}
+
 	let insert: Range;
 	let replace: Range;
 	if (!varWord) {
@@ -355,12 +516,14 @@ function computeCompletionRanges(model: ITextModel, position: Position, reg: Reg
 
 class VariableCompletions extends Disposable {
 
-	private static readonly VariableNameDef = new RegExp(`${chatVariableLeader}\\w*`, 'g'); // MUST be using `g`-flag
+	private static readonly VariableNameDef = new RegExp(`(?<=^|\\s)${chatVariableLeader}\\w*`, 'g'); // MUST be using `g`-flag
 
 	constructor(
 		@ILanguageFeaturesService private readonly languageFeaturesService: ILanguageFeaturesService,
 		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
 		@IChatVariablesService private readonly chatVariablesService: IChatVariablesService,
+		@IConfigurationService configService: IConfigurationService,
+		@ILanguageModelToolsService toolsService: ILanguageModelToolsService
 	) {
 		super();
 
@@ -368,13 +531,21 @@ class VariableCompletions extends Disposable {
 			_debugDisplayName: 'chatVariables',
 			triggerCharacters: [chatVariableLeader],
 			provideCompletionItems: async (model: ITextModel, position: Position, _context: CompletionContext, _token: CancellationToken) => {
+				const locations = new Set<ChatAgentLocation>();
+				locations.add(ChatAgentLocation.Panel);
+
+				for (const value of Object.values(ChatAgentLocation)) {
+					if (typeof value === 'string' && configService.getValue<boolean>(`chat.experimental.variables.${value}`)) {
+						locations.add(value);
+					}
+				}
 
 				const widget = this.chatWidgetService.getWidgetByInputUri(model.uri);
-				if (!widget || widget.location !== ChatAgentLocation.Panel /* TODO@jrieken - enable when agents are adopted*/) {
+				if (!widget || !locations.has(widget.location)) {
 					return null;
 				}
 
-				const range = computeCompletionRanges(model, position, VariableCompletions.VariableNameDef);
+				const range = computeCompletionRanges(model, position, VariableCompletions.VariableNameDef, true);
 				if (!range) {
 					return null;
 				}
@@ -383,9 +554,10 @@ class VariableCompletions extends Disposable {
 				const slowSupported = usedAgent ? usedAgent.agent.metadata.supportsSlowVariables : true;
 
 				const usedVariables = widget.parsedInput.parts.filter((p): p is ChatRequestVariablePart => p instanceof ChatRequestVariablePart);
-				const variableItems = Array.from(this.chatVariablesService.getVariables())
+				const usedVariableNames = new Set(usedVariables.map(v => v.variableName));
+				const variableItems = Array.from(this.chatVariablesService.getVariables(widget.location))
 					// This doesn't look at dynamic variables like `file`, where multiple makes sense.
-					.filter(v => !usedVariables.some(usedVar => usedVar.variableName === v.name))
+					.filter(v => !usedVariableNames.has(v.name))
 					.filter(v => !v.isSlow || slowSupported)
 					.map((v): CompletionItem => {
 						const withLeader = `${chatVariableLeader}${v.name}`;
@@ -399,8 +571,28 @@ class VariableCompletions extends Disposable {
 						};
 					});
 
+				const usedTools = widget.parsedInput.parts.filter((p): p is ChatRequestToolPart => p instanceof ChatRequestToolPart);
+				const usedToolNames = new Set(usedTools.map(v => v.toolName));
+				const toolItems: CompletionItem[] = [];
+				if (!usedAgent || usedAgent.agent.supportsToolReferences) {
+					toolItems.push(...Array.from(toolsService.getTools())
+						.filter(t => t.canBeInvokedManually)
+						.filter(t => !usedToolNames.has(t.name ?? ''))
+						.map((t): CompletionItem => {
+							const withLeader = `${chatVariableLeader}${t.name}`;
+							return {
+								label: withLeader,
+								range,
+								insertText: withLeader + ' ',
+								detail: t.userDescription,
+								kind: CompletionItemKind.Text,
+								sortText: 'z'
+							};
+						}));
+				}
+
 				return {
-					suggestions: variableItems
+					suggestions: [...variableItems, ...toolItems]
 				};
 			}
 		}));
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorContrib.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorContrib.ts
index e58d0fd8294..0f084633c36 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorContrib.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorContrib.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { Range } from 'vs/editor/common/core/range';
-import { IDecorationOptions } from 'vs/editor/common/editorCommon';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { inputPlaceholderForeground } from 'vs/platform/theme/common/colorRegistry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IChatWidget } from 'vs/workbench/contrib/chat/browser/chat';
-import { ChatWidget } from 'vs/workbench/contrib/chat/browser/chatWidget';
-import { dynamicVariableDecorationType } from 'vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
-import { ChatAgentLocation, IChatAgentCommand, IChatAgentData, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { chatSlashCommandBackground, chatSlashCommandForeground } from 'vs/workbench/contrib/chat/common/chatColors';
-import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, ChatRequestTextPart, ChatRequestVariablePart, IParsedChatRequestPart, chatAgentLeader, chatSubcommandLeader } from 'vs/workbench/contrib/chat/common/chatParserTypes';
-import { ChatRequestParser } from 'vs/workbench/contrib/chat/common/chatRequestParser';
+import { MarkdownString } from '../../../../../base/common/htmlContent.js';
+import { Disposable, MutableDisposable } from '../../../../../base/common/lifecycle.js';
+import { ICodeEditorService } from '../../../../../editor/browser/services/codeEditorService.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { IDecorationOptions } from '../../../../../editor/common/editorCommon.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { inputPlaceholderForeground } from '../../../../../platform/theme/common/colorRegistry.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { IChatWidget } from '../chat.js';
+import { ChatWidget } from '../chatWidget.js';
+import { dynamicVariableDecorationType } from './chatDynamicVariables.js';
+import { IChatAgentCommand, IChatAgentData, IChatAgentService } from '../../common/chatAgents.js';
+import { chatSlashCommandBackground, chatSlashCommandForeground } from '../../common/chatColors.js';
+import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, ChatRequestTextPart, ChatRequestToolPart, ChatRequestVariablePart, IParsedChatRequestPart, chatAgentLeader, chatSubcommandLeader } from '../../common/chatParserTypes.js';
+import { ChatRequestParser } from '../../common/chatRequestParser.js';
 
 const decorationDescription = 'chat';
 const placeholderDecorationType = 'chat-session-detail';
@@ -175,8 +175,8 @@ class InputEditorDecorations extends Disposable {
 			}
 		}
 
-		const onlyAgentCommandAndWhitespace = agentPart && agentSubcommandPart && parsedRequest.every(p => p instanceof ChatRequestTextPart && !p.text.trim().length || p instanceof ChatRequestAgentPart || p instanceof ChatRequestAgentSubcommandPart);
-		if (onlyAgentCommandAndWhitespace) {
+		const onlyAgentAndAgentCommandAndWhitespace = agentPart && agentSubcommandPart && parsedRequest.every(p => p instanceof ChatRequestTextPart && !p.text.trim().length || p instanceof ChatRequestAgentPart || p instanceof ChatRequestAgentSubcommandPart);
+		if (onlyAgentAndAgentCommandAndWhitespace) {
 			// Agent reference and subcommand with no other text - show the placeholder
 			const isFollowupSlashCommand = this.previouslyUsedAgents.has(agentAndCommandToKey(agentPart.agent, agentSubcommandPart.command.name));
 			const shouldRenderFollowupPlaceholder = isFollowupSlashCommand && agentSubcommandPart.command.followupPlaceholder;
@@ -193,14 +193,30 @@ class InputEditorDecorations extends Disposable {
 			}
 		}
 
+		const onlyAgentCommandAndWhitespace = agentSubcommandPart && parsedRequest.every(p => p instanceof ChatRequestTextPart && !p.text.trim().length || p instanceof ChatRequestAgentSubcommandPart);
+		if (onlyAgentCommandAndWhitespace) {
+			// Agent subcommand with no other text - show the placeholder
+			if (agentSubcommandPart?.command.description && exactlyOneSpaceAfterPart(agentSubcommandPart)) {
+				placeholderDecoration = [{
+					range: getRangeForPlaceholder(agentSubcommandPart),
+					renderOptions: {
+						after: {
+							contentText: agentSubcommandPart.command.description,
+							color: this.getPlaceholderColor(),
+						}
+					}
+				}];
+			}
+		}
+
 		this.widget.inputEditor.setDecorationsByType(decorationDescription, placeholderDecorationType, placeholderDecoration ?? []);
 
 		const textDecorations: IDecorationOptions[] | undefined = [];
 		if (agentPart) {
 			textDecorations.push({ range: agentPart.editorRange });
-			if (agentSubcommandPart) {
-				textDecorations.push({ range: agentSubcommandPart.editorRange, hoverMessage: new MarkdownString(agentSubcommandPart.command.description) });
-			}
+		}
+		if (agentSubcommandPart) {
+			textDecorations.push({ range: agentSubcommandPart.editorRange, hoverMessage: new MarkdownString(agentSubcommandPart.command.description) });
 		}
 
 		if (slashCommandPart) {
@@ -215,6 +231,11 @@ class InputEditorDecorations extends Disposable {
 			varDecorations.push({ range: variable.editorRange });
 		}
 
+		const toolParts = parsedRequest.filter((p): p is ChatRequestToolPart => p instanceof ChatRequestToolPart);
+		for (const tool of toolParts) {
+			varDecorations.push({ range: tool.editorRange });
+		}
+
 		this.widget.inputEditor.setDecorationsByType(decorationDescription, variableTextDecorationType, varDecorations);
 	}
 }
@@ -226,12 +247,22 @@ class InputEditorSlashCommandMode extends Disposable {
 		private readonly widget: IChatWidget
 	) {
 		super();
+		this._register(this.widget.onDidChangeAgent(e => {
+			if (e.slashCommand && e.slashCommand.isSticky || !e.slashCommand && e.agent.metadata.isSticky) {
+				this.repopulateAgentCommand(e.agent, e.slashCommand);
+			}
+		}));
 		this._register(this.widget.onDidSubmitAgent(e => {
 			this.repopulateAgentCommand(e.agent, e.slashCommand);
 		}));
 	}
 
 	private async repopulateAgentCommand(agent: IChatAgentData, slashCommand: IChatAgentCommand | undefined) {
+		// Make sure we don't repopulate if the user already has something in the input
+		if (this.widget.inputEditor.getValue().trim()) {
+			return;
+		}
+
 		let value: string | undefined;
 		if (slashCommand && slashCommand.isSticky) {
 			value = `${chatAgentLeader}${agent.name} ${chatSubcommandLeader}${slashCommand.name} `;
@@ -275,10 +306,10 @@ class ChatTokenDeleter extends Disposable {
 
 			// If this was a simple delete, try to find out whether it was inside a token
 			if (!change.text && this.widget.viewModel) {
-				const previousParsedValue = parser.parseChatRequest(this.widget.viewModel.sessionId, previousInputValue, ChatAgentLocation.Panel, { selectedAgent: previousSelectedAgent });
+				const previousParsedValue = parser.parseChatRequest(this.widget.viewModel.sessionId, previousInputValue, widget.location, { selectedAgent: previousSelectedAgent });
 
 				// For dynamic variables, this has to happen in ChatDynamicVariableModel with the other bookkeeping
-				const deletableTokens = previousParsedValue.parts.filter(p => p instanceof ChatRequestAgentPart || p instanceof ChatRequestAgentSubcommandPart || p instanceof ChatRequestSlashCommandPart || p instanceof ChatRequestVariablePart);
+				const deletableTokens = previousParsedValue.parts.filter(p => p instanceof ChatRequestAgentPart || p instanceof ChatRequestAgentSubcommandPart || p instanceof ChatRequestSlashCommandPart || p instanceof ChatRequestVariablePart || p instanceof ChatRequestToolPart);
 				deletableTokens.forEach(token => {
 					const deletedRangeOfToken = Range.intersectRanges(token.editorRange, change.range);
 					// Part of this token was deleted, or the space after it was deleted, and the deletion range doesn't go off the front of the token, for simpler math
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorHover.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorHover.ts
index 2ad7122eb92..51808206d1a 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorHover.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorHover.ts
@@ -3,18 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { Range } from 'vs/editor/common/core/range';
-import { IModelDecoration } from 'vs/editor/common/model';
-import { HoverAnchor, HoverAnchorType, HoverParticipantRegistry, IEditorHoverParticipant, IEditorHoverRenderContext, IHoverPart } from 'vs/editor/contrib/hover/browser/hoverTypes';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IChatWidgetService } from 'vs/workbench/contrib/chat/browser/chat';
-import { ChatAgentHover, getChatAgentHoverOptions } from 'vs/workbench/contrib/chat/browser/chatAgentHover';
-import { ChatEditorHoverWrapper } from 'vs/workbench/contrib/chat/browser/contrib/editorHoverWrapper';
-import { IChatAgentData } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { extractAgentAndCommand } from 'vs/workbench/contrib/chat/common/chatParserTypes';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ICodeEditor } from '../../../../../editor/browser/editorBrowser.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { IModelDecoration } from '../../../../../editor/common/model.js';
+import { HoverAnchor, HoverAnchorType, HoverParticipantRegistry, IEditorHoverParticipant, IEditorHoverRenderContext, IHoverPart, IRenderedHoverPart, IRenderedHoverParts, RenderedHoverParts } from '../../../../../editor/contrib/hover/browser/hoverTypes.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IChatWidgetService } from '../chat.js';
+import { ChatAgentHover, getChatAgentHoverOptions } from '../chatAgentHover.js';
+import { ChatEditorHoverWrapper } from './editorHoverWrapper.js';
+import { IChatAgentData } from '../../common/chatAgents.js';
+import { extractAgentAndCommand } from '../../common/chatParserTypes.js';
+import * as nls from '../../../../../nls.js';
 
 export class ChatAgentHoverParticipant implements IEditorHoverParticipant<ChatAgentHoverPart> {
 
@@ -49,22 +50,33 @@ export class ChatAgentHoverParticipant implements IEditorHoverParticipant<ChatAg
 		return [];
 	}
 
-	public renderHoverParts(context: IEditorHoverRenderContext, hoverParts: ChatAgentHoverPart[]): IDisposable {
+	public renderHoverParts(context: IEditorHoverRenderContext, hoverParts: ChatAgentHoverPart[]): IRenderedHoverParts<ChatAgentHoverPart> {
 		if (!hoverParts.length) {
-			return Disposable.None;
+			return new RenderedHoverParts([]);
 		}
 
-		const store = new DisposableStore();
-		const hover = store.add(this.instantiationService.createInstance(ChatAgentHover));
-		store.add(hover.onDidChangeContents(() => context.onContentsChanged()));
-		const agent = hoverParts[0].agent;
+		const disposables = new DisposableStore();
+		const hover = disposables.add(this.instantiationService.createInstance(ChatAgentHover));
+		disposables.add(hover.onDidChangeContents(() => context.onContentsChanged()));
+		const hoverPart = hoverParts[0];
+		const agent = hoverPart.agent;
 		hover.setAgent(agent.id);
 
 		const actions = getChatAgentHoverOptions(() => agent, this.commandService).actions;
 		const wrapper = this.instantiationService.createInstance(ChatEditorHoverWrapper, hover.domNode, actions);
-		context.fragment.appendChild(wrapper.domNode);
+		const wrapperNode = wrapper.domNode;
+		context.fragment.appendChild(wrapperNode);
+		const renderedHoverPart: IRenderedHoverPart<ChatAgentHoverPart> = {
+			hoverPart,
+			hoverElement: wrapperNode,
+			dispose() { disposables.dispose(); }
+		};
+		return new RenderedHoverParts([renderedHoverPart]);
+	}
+
+	public getAccessibleContent(hoverPart: ChatAgentHoverPart): string {
+		return nls.localize('hoverAccessibilityChatAgent', 'There is a chat agent hover part here.');
 
-		return store;
 	}
 }
 
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/editorHoverWrapper.ts b/src/vs/workbench/contrib/chat/browser/contrib/editorHoverWrapper.ts
index 5cbc7d932cc..01f5adf945d 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/editorHoverWrapper.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/editorHoverWrapper.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/editorHoverWrapper';
-import * as dom from 'vs/base/browser/dom';
-import { IHoverAction } from 'vs/base/browser/ui/hover/hover';
-import { HoverAction } from 'vs/base/browser/ui/hover/hoverWidget';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import './media/editorHoverWrapper.css';
+import * as dom from '../../../../../base/browser/dom.js';
+import { IHoverAction } from '../../../../../base/browser/ui/hover/hover.js';
+import { HoverAction } from '../../../../../base/browser/ui/hover/hoverWidget.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
 
 const $ = dom.$;
 const h = dom.h;
diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index f827efc194f..f9f8e14bb59 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -14,10 +14,9 @@
 }
 
 .interactive-item-container {
-	padding: 16px 20px;
+	padding: 12px 16px;
 	display: flex;
 	flex-direction: column;
-	gap: 8px;
 	color: var(--vscode-interactive-session-foreground);
 
 	cursor: default;
@@ -30,6 +29,7 @@
 	align-items: center;
 	justify-content: space-between;
 	position: relative;
+	margin-bottom: 8px;
 }
 
 .interactive-item-container .header.hidden {
@@ -40,6 +40,12 @@
 	display: flex;
 	align-items: center;
 	gap: 8px;
+
+	/*
+	Rendering the avatar icon as round makes it a little larger than the .user container.
+	Add padding so that the focus outline doesn't run into it, and counteract it with a negative margin so it doesn't actually take up any extra space */
+	padding: 2px;
+	margin: -2px;
 }
 
 .interactive-item-container .header .username {
@@ -48,12 +54,13 @@
 	font-weight: 600;
 }
 
-.interactive-item-container .header .detail-container {
+.interactive-item-container .detail-container {
 	font-size: 12px;
 	color: var(--vscode-descriptionForeground);
+	overflow: hidden;
 }
 
-.interactive-item-container .header .detail-container .detail .agentOrSlashCommandDetected A {
+.interactive-item-container .detail-container .detail .agentOrSlashCommandDetected A {
 	cursor: pointer;
 	color: var(--vscode-textLink-foreground);
 }
@@ -159,19 +166,44 @@
 	background-color: inherit;
 }
 
-.interactive-item-container .header .monaco-toolbar .checked.action-label,
-.interactive-item-container .header .monaco-toolbar .checked.action-label:hover {
+.interactive-item-container .chat-footer-toolbar {
+	display: none;
+}
+
+.interactive-item-container .chat-footer-toolbar .monaco-action-bar .actions-container {
+	gap: 4px;
+}
+
+.interactive-item-container .chat-footer-toolbar .checked.action-label,
+.interactive-item-container .chat-footer-toolbar .checked.action-label:hover {
 	color: var(--vscode-inputOption-activeForeground) !important;
 	border-color: var(--vscode-inputOption-activeBorder);
 	background-color: var(--vscode-inputOption-activeBackground);
 }
 
+.interactive-item-container.interactive-response:not(.chat-response-loading) .chat-footer-toolbar {
+	/* Complete response only */
+	display: initial;
+	padding-top: 6px;
+	height: 22px;
+}
+
 .interactive-item-container .value {
 	width: 100%;
 }
 
-.interactive-item-container .chat-progress-task {
-	padding-bottom: 8px;
+.interactive-item-container > .value .chat-used-context {
+	margin-bottom: 8px;
+}
+
+.interactive-item-container .value .rendered-markdown blockquote {
+	margin: 0px;
+	padding: 0px 16px 0 10px;
+	border-left-width: 5px;
+	border-left-style: solid;
+	border-radius: 2px;
+	background: var(--vscode-textBlockQuote-background);
+	border-color: var(--vscode-textBlockQuote-border);
 }
 
 .interactive-item-container .value .rendered-markdown table {
@@ -194,6 +226,10 @@
 	color: var(--vscode-textLink-foreground);
 }
 
+.interactive-item-container .value .rendered-markdown a {
+	user-select: text;
+}
+
 .interactive-item-container .value .rendered-markdown a:hover,
 .interactive-item-container .value .rendered-markdown a:active {
 	color: var(--vscode-textLink-activeForeground);
@@ -208,11 +244,6 @@
 	overflow: hidden;
 }
 
-.interactive-request {
-	border-bottom: 1px solid var(--vscode-chat-requestBorder);
-	border-top: 1px solid var(--vscode-chat-requestBorder);
-}
-
 .hc-black .interactive-request,
 .hc-light .interactive-request {
 	border-left: 3px solid var(--vscode-chat-requestBorder);
@@ -228,23 +259,31 @@
 	margin-bottom: 0px;
 }
 
+.interactive-item-container .value .rendered-markdown hr {
+	border-color: rgba(0, 0, 0, 0.18);
+}
+
+.vs-dark .interactive-item-container .value .rendered-markdown hr {
+	border-color: rgba(255, 255, 255, 0.18);
+}
+
 .interactive-item-container .value .rendered-markdown h1 {
 	font-size: 20px;
 	font-weight: 600;
-	margin: 16px 0;
+	margin: 16px 0 8px 0;
 
 }
 
 .interactive-item-container .value .rendered-markdown h2 {
 	font-size: 16px;
 	font-weight: 600;
-	margin: 16px 0;
+	margin: 16px 0 8px 0;
 }
 
 .interactive-item-container .value .rendered-markdown h3 {
 	font-size: 14px;
 	font-weight: 600;
-	margin: 16px 0;
+	margin: 16px 0 8px 0;
 }
 
 .interactive-item-container .value .rendered-markdown p {
@@ -255,18 +294,50 @@
 	margin: 0 0 16px 0;
 }
 
+.interactive-item-container .value > .chat-tool-invocation-part .rendered-markdown p {
+	margin: 0 0 6px 0;
+}
+
 .interactive-item-container .value > .rendered-markdown li > p {
 	margin: 0;
 }
 
+/* #region list indent rules */
 .interactive-item-container .value .rendered-markdown ul {
+	/* Keep this in sync with the values for dedented codeblocks below */
 	padding-inline-start: 24px;
 }
 
 .interactive-item-container .value .rendered-markdown ol {
+	/* Keep this in sync with the values for dedented codeblocks below */
 	padding-inline-start: 28px;
 }
 
+/* NOTE- We want to dedent codeblocks in lists specifically to give them the full width. No more elegant way to do this, these values
+have to be updated for changes to the rules above, or to support more deeply nested lists. */
+.interactive-item-container .value .rendered-markdown ul .interactive-result-code-block {
+	margin-left: -24px;
+}
+
+.interactive-item-container .value .rendered-markdown ul ul .interactive-result-code-block {
+	margin-left: -48px;
+}
+
+.interactive-item-container .value .rendered-markdown ol .interactive-result-code-block {
+	margin-left: -28px;
+}
+
+.interactive-item-container .value .rendered-markdown ol ol .interactive-result-code-block {
+	margin-left: -56px;
+}
+
+.interactive-item-container .value .rendered-markdown ol ul .interactive-result-code-block,
+.interactive-item-container .value .rendered-markdown ul ol .interactive-result-code-block {
+	margin-left: -52px;
+}
+
+/* #endregion list indent rules */
+
 .interactive-item-container .value .rendered-markdown li {
 	line-height: 1.3rem;
 }
@@ -341,22 +412,188 @@
 	margin: 8px 0;
 }
 
-.interactive-session .interactive-input-and-execute-toolbar {
+.interactive-item-container.minimal {
+	flex-direction: row;
+}
+
+.interactive-item-container.minimal .column.left {
+	padding-top: 2px;
+	display: inline-block;
+	flex-grow: 0;
+}
+
+.interactive-item-container.minimal .column.right {
+	display: inline-block;
+	flex-grow: 1;
+}
+
+.interactive-item-container.minimal .user > .username {
+	display: none;
+}
+
+.interactive-item-container.minimal .detail-container {
+	font-size: unset;
+}
+
+.interactive-item-container.minimal > .header {
+	position: absolute;
+	right: 0;
+}
+
+.interactive-session .chat-dnd-overlay {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+
+	display: none;
+}
+
+.interactive-session .chat-dnd-overlay.visible {
 	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.interactive-session .chat-dnd-overlay .attach-context-overlay-text {
+	padding: 0.6em;
+	margin: 0.2em;
+	line-height: 12px;
+	height: 12px;
+	display: flex;
+	align-items: center;
+	text-align: center;
+}
+
+.interactive-session .chat-dnd-overlay .attach-context-overlay-text .codicon {
+	height: 12px;
+	font-size: 12px;
+	margin-right: 3px;
+}
+
+.interactive-session .chat-input-container {
 	box-sizing: border-box;
 	cursor: text;
 	background-color: var(--vscode-input-background);
 	border: 1px solid var(--vscode-input-border, transparent);
 	border-radius: 4px;
+	padding: 0 6px 6px 6px; /* top padding is inside the editor widget */
+}
+
+.interactive-session .chat-editing-session {
+	margin-bottom: -4px;
+	width: 100%;
+}
+
+.interactive-session .chat-editing-session .chat-editing-session-container {
+	margin-bottom: -14px;
+	padding: 4px 8px 18px 8px;
+	box-sizing: border-box;
+	background-color: var(--vscode-editor-background);
+	border: 1px solid var(--vscode-input-border, transparent);
+	border-radius: 4px;
+	display: flex;
+	flex-direction: column;
+	gap: 2px;
+}
+
+.interactive-session .chat-editing-session .monaco-list-row .chat-collapsible-list-action-bar {
+	display: none;
+}
+
+.interactive-session .chat-editing-session .monaco-list-row:hover .chat-collapsible-list-action-bar,
+.interactive-session .chat-editing-session .monaco-list-row.focused .chat-collapsible-list-action-bar,
+.interactive-session .chat-editing-session .monaco-list-row.selected .chat-collapsible-list-action-bar {
+	display: inherit;
+}
+
+.interactive-session .chat-editing-session .chat-editing-session-container.show-file-icons .monaco-scrollable-element .monaco-list-rows .monaco-list-row {
+	border-radius: 2px;
+}
+
+.interactive-session .chat-editing-session .chat-editing-session-container .chat-editing-session-overview {
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+	gap: 6px;
+}
+
+.interactive-session .chat-editing-session .chat-editing-session-container .chat-editing-session-overview > span {
+	color: var(--vscode-descriptionForeground);
+	font-size: 11px;
+}
+
+.interactive-session .chat-editing-session .chat-editing-session-container .monaco-progress-container {
 	position: relative;
-	padding: 0 6px;
-	margin-bottom: 4px;
-	align-items: flex-end;
+}
+
+.interactive-session .chat-editing-session .chat-editing-session-toolbar-actions,
+.interactive-session .chat-editing-session .chat-editing-session-actions {
+	display: flex;
+	flex-direction: row;
+	flex-wrap: wrap;
+	gap: 6px;
+	align-items: center;
 	justify-content: space-between;
 }
 
-.interactive-session .interactive-input-part.compact .interactive-input-and-execute-toolbar {
-	margin-bottom: 0;
+.interactive-session .chat-editing-session .monaco-button {
+	height: 17px;
+	width: fit-content;
+	padding: 2px 6px;
+	font-size: 11px;
+	background-color: var(--vscode-button-background);
+	border: 1px solid var(--vscode-button-border);
+	color: var(--vscode-button-foreground);
+}
+
+.interactive-session .chat-editing-session .chat-editing-session-toolbar-actions .monaco-button:hover,
+.interactive-session .chat-editing-session .chat-editing-session-actions .monaco-button:hover {
+	background-color: var(--vscode-button-hoverBackground);
+}
+
+.interactive-session .chat-editing-session .chat-editing-session-actions-group {
+	display: flex;
+	flex-direction: row;
+	gap: 6px;
+}
+
+.interactive-session .chat-editing-session .chat-editing-session-toolbar-actions .monaco-button.codicon.codicon-close {
+	width: 22px;
+	height: 22px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 16px;
+	color: var(--vscode-descriptionForeground);
+	background-color: transparent;
+	border: none;
+	padding: 0;
+	border-radius: 5px;
+	cursor: pointer;
+}
+
+.interactive-session .chat-editing-session .chat-editing-session-toolbar-actions .monaco-button.codicon.codicon-close:hover {
+	background-color: var(--vscode-toolbar-hoverBackground);
+}
+
+.interactive-session .chat-editing-session .chat-editing-session-toolbar-actions .monaco-button.secondary,
+.interactive-session .chat-editing-session .chat-editing-session-actions .monaco-button.secondary {
+	background-color: var(--vscode-button-secondaryBackground);
+	border: 1px solid var(--vscode-button-border);
+	color: var(--vscode-button-secondaryForeground);
+}
+
+.interactive-session .chat-editing-session .chat-editing-session-toolbar-actions .monaco-button.secondary:hover,
+.interactive-session .chat-editing-session .chat-editing-session-actions .monaco-button.secondary:hover {
+	background-color: var(--vscode-button-secondaryHoverBackground);
+}
+
+.interactive-session .interactive-input-part.compact .chat-input-container {
+	display: flex;
+	justify-content: space-between;
+	padding-bottom: 0;
 	border-radius: 2px;
 }
 
@@ -366,36 +603,50 @@
 	align-items: center;
 }
 
-.interactive-session .interactive-input-and-execute-toolbar.focused {
+.interactive-session .chat-input-container.focused {
 	border-color: var(--vscode-focusBorder);
 }
 
-.interactive-session .interactive-input-and-execute-toolbar .monaco-editor .mtk1 {
+.chat-editor-container .monaco-editor .mtk1 {
 	color: var(--vscode-input-foreground);
 }
 
-.interactive-session .interactive-input-and-execute-toolbar .monaco-editor,
-.interactive-session .interactive-input-and-execute-toolbar .monaco-editor .monaco-editor-background {
+.interactive-session .chat-editor-container .monaco-editor,
+.interactive-session .chat-editor-container .monaco-editor .monaco-editor-background {
 	background-color: var(--vscode-input-background) !important;
 }
 
-.interactive-session .interactive-input-and-execute-toolbar .monaco-editor .cursors-layer {
+.interactive-session .chat-editor-container .monaco-editor .cursors-layer {
 	padding-left: 4px;
 }
 
-.interactive-session .interactive-input-part .interactive-execute-toolbar {
-	height: 22px;
-
-	/* It's bottom-aligned, make it appear centered within the container */
-	margin-bottom: 7px;
+.interactive-session .chat-input-toolbars {
+	display: flex;
 }
 
-.interactive-session .interactive-input-part .interactive-execute-toolbar .monaco-action-bar .actions-container {
+.interactive-session .chat-input-toolbars :first-child {
+	margin-right: auto;
+}
+
+.interactive-session .chat-input-toolbars .chat-modelPicker-item .action-label {
+	height: 16px;
+	padding: 3px 0px 3px 6px;
+	display: flex;
+	align-items: center;
+}
+
+
+.interactive-session .chat-input-toolbars .chat-modelPicker-item .action-label .codicon-chevron-down {
+	font-size: 12px;
+	margin-left: 2px;
+}
+
+.interactive-session .chat-input-toolbars .monaco-action-bar .actions-container {
 	display: flex;
 	gap: 4px;
 }
 
-.interactive-session .interactive-input-part .interactive-execute-toolbar .codicon-debug-stop {
+.interactive-session .chat-input-toolbars .codicon-debug-stop {
 	color: var(--vscode-icon-foreground) !important;
 }
 
@@ -453,6 +704,17 @@
 	color: var(--vscode-interactive-session-foreground);
 }
 
+.chat-attached-context .chat-attached-context-attachment .monaco-icon-name-container.warning,
+.chat-attached-context .chat-attached-context-attachment .monaco-icon-suffix-container.warning,
+.chat-used-context-list .monaco-icon-name-container.warning,
+.chat-used-context-list .monaco-icon-suffix-container.warning {
+	color: var(--vscode-notificationsWarningIcon-foreground);
+}
+
+.chat-attached-context .chat-attached-context-attachment.show-file-icons.warning {
+	border-color: var(--vscode-notificationsWarningIcon-foreground);
+}
+
 .chat-notification-widget .chat-warning-codicon .codicon-warning {
 	color: var(--vscode-notificationsWarningIcon-foreground) !important; /* Have to override default styles which apply to all lists */
 }
@@ -468,10 +730,11 @@
 }
 
 .interactive-session .interactive-input-part {
-	margin: 0px 20px;
-	padding: 12px 0px;
+	margin: 0px 16px;
+	padding: 4px 0 12px 0px;
 	display: flex;
 	flex-direction: column;
+	gap: 4px;
 }
 
 .interactive-session .interactive-input-part.compact {
@@ -482,15 +745,22 @@
 .interactive-session .chat-attached-context .chat-attached-context-attachment {
 	display: flex;
 	gap: 4px;
-}
-
-.interactive-session .chat-attached-context .chat-attached-context-attachment .monaco-button:hover {
-	cursor: pointer;
+	overflow: hidden;
 }
 
 .interactive-session .chat-attached-context .chat-attached-context-attachment .monaco-button {
 	display: flex;
 	align-items: center;
+	margin-top: -2px;
+	margin-right: -4px;
+	padding-right: 4px;
+	padding-left: 2px;
+	height: calc(100% + 4px);
+}
+
+.interactive-session .chat-attached-context .chat-attached-context-attachment .monaco-button:hover {
+	cursor: pointer;
+	background: var(--vscode-button-secondaryHoverBackground);
 }
 
 .interactive-session .chat-attached-context .chat-attached-context-attachment .monaco-icon-label-container {
@@ -505,6 +775,7 @@
 .interactive-session .chat-attached-context .chat-attached-context-attachment .monaco-icon-label .monaco-button.codicon.codicon-close,
 .interactive-session .chat-attached-context .chat-attached-context-attachment .monaco-button.codicon.codicon-close {
 	color: var(--vscode-descriptionForeground);
+	cursor: pointer;
 }
 
 .interactive-session .chat-attached-context .chat-attached-context-attachment .monaco-icon-label .codicon {
@@ -512,20 +783,40 @@
 }
 
 .interactive-session .chat-attached-context {
-	padding: 0 0 8px 0;
+	padding: 0 0 4px 0;
 	display: flex;
 	gap: 4px;
 	flex-wrap: wrap;
 }
 
+.interactive-session .interactive-input-part.compact .chat-attached-context {
+	padding-top: 8px;
+	display: flex;
+	gap: 4px;
+	flex-wrap: wrap;
+}
+
+.interactive-session .interactive-item-container.interactive-request .chat-attached-context {
+	margin-top: -8px;
+}
+
 .interactive-session .chat-attached-context .chat-attached-context-attachment {
-	padding: 2px;
+	font-size: 11px;
+	padding: 0 4px 0 2px;
 	border: 1px solid var(--vscode-chat-requestBorder, var(--vscode-input-background, transparent));
 	border-radius: 4px;
 	height: 18px;
 	max-width: 100%;
 }
 
+.interactive-session .chat-attached-context .chat-attached-context-attachment .monaco-icon-label::before {
+	padding: 0 2px 0 0;
+}
+
+.interactive-session .interactive-item-container.interactive-request .chat-attached-context .chat-attached-context-attachment {
+	padding-right: 6px;
+}
+
 .interactive-session-followups {
 	display: flex;
 	flex-direction: column;
@@ -547,9 +838,9 @@
 	padding: 4px 8px;
 }
 
-.interactive-session .interactive-input-part .interactive-input-followups .interactive-session-followups {
-	margin-bottom: 8px;
-}
+/* .interactive-session .interactive-input-part .interactive-input-followups .interactive-session-followups {
+	margin-bottom: 4px;
+} */
 
 .interactive-session .interactive-input-part .interactive-input-followups .interactive-session-followups .monaco-button {
 	display: block;
@@ -577,33 +868,29 @@
 	border: none;
 }
 
-.interactive-welcome .value .interactive-session-followups {
-	margin-bottom: 16px;
-}
-
 .interactive-item-container .monaco-toolbar .codicon {
 	/* Very aggressive list styles try to apply focus colors to every codicon in a list row. */
 	color: var(--vscode-icon-foreground) !important;
 }
 
-.interactive-item-container.filtered-response .value > .rendered-markdown {
-	pointer-events: none;
-	-webkit-mask-image: linear-gradient(rgba(0, 0, 0, 0.75), rgba(0, 0, 0, 0.05) 60%, rgba(0, 0, 0, 0.00) 80%);
-	mask-image: linear-gradient(rgba(0, 0, 0, 0.75), rgba(0, 0, 0, 0.05) 60%, rgba(0, 0, 0, 0.00) 80%);
-}
-
 /* #region Quick Chat */
 
 .quick-input-widget .interactive-session .interactive-input-part {
-	padding: 8px 6px 6px 6px;
+	padding: 8px 6px 8px 6px;
 	margin: 0 3px;
 }
 
-.quick-input-widget .interactive-session .interactive-input-part .interactive-execute-toolbar {
-	margin-bottom: 1px;
+.quick-input-widget .interactive-session .interactive-input-part .chat-input-toolbars .monaco-toolbar,
+.quick-input-widget .interactive-session .interactive-input-part .chat-input-toolbars .actions-container {
+	height: initial;
 }
 
-.quick-input-widget .interactive-session .interactive-input-and-execute-toolbar {
+.quick-input-widget .interactive-session .interactive-input-part .chat-input-toolbars {
+	margin-bottom: 1px;
+	align-items: flex-end;
+}
+
+.quick-input-widget .interactive-session .chat-input-container {
 	margin: 0;
 	border-radius: 2px;
 	padding: 0 4px 0 6px;
@@ -690,7 +977,15 @@
 	border: 1px solid var(--vscode-chat-requestBorder);
 	border-radius: 4px;
 	margin-bottom: 8px;
-	padding: 6px 8px;
+}
+
+.interactive-response-progress-tree,
+.interactive-session .chat-used-context-list {
+	padding: 4px 3px;
+
+	.monaco-icon-label {
+		padding: 0px 3px;
+	}
 }
 
 .interactive-item-container .chat-notification-widget {
@@ -714,11 +1009,11 @@
 .interactive-session .chat-used-context-label .monaco-button {
 	/* unset Button styles */
 	display: inline-flex;
-	gap: 4px;
-	width: 100%;
+	width: fit-content;
 	border: none;
 	border-radius: 4px;
-	padding: 4px 8px 4px 0;
+	gap: 2px;
+	padding: 2px 6px 2px 2px;
 	text-align: initial;
 	justify-content: initial;
 }
@@ -738,15 +1033,22 @@
 }
 
 .interactive-session .chat-used-context .chat-used-context-label .monaco-button .codicon {
-	margin: 0 0 0 4px;
+	font-size: 12px;
 }
 
 .interactive-item-container .rendered-markdown.progress-step {
 	display: flex;
+	gap: 2px;
 	margin-left: 4px;
 	white-space: normal;
 }
 
+.interactive-item-container .rendered-markdown.progress-step .monaco-button {
+	flex: 0 0 content;
+	font-size: 12px;
+	padding: 2px;
+}
+
 .interactive-item-container .rendered-markdown.progress-step > p {
 	color: var(--vscode-descriptionForeground);
 	font-size: 12px;
@@ -754,6 +1056,7 @@
 	gap: 8px;
 	align-items: center;
 	margin-bottom: 6px;
+	flex: 1;
 }
 
 .interactive-item-container .rendered-markdown.progress-step > p .codicon {
@@ -787,3 +1090,105 @@
 	margin-left: 0;
 	margin-top: 1px;
 }
+
+.chat-code-citation-label {
+	opacity: 0.7;
+	white-space: pre-wrap;
+}
+
+.chat-code-citation-button-container {
+	display: inline;
+}
+
+.chat-code-citation-button-container .monaco-button {
+	display: inline;
+	border: none;
+	padding: 0;
+	color: var(--vscode-textLink-foreground);
+}
+
+.chat-attached-context-hover .chat-attached-context-image {
+	height: auto;
+	max-height: 500px;
+	max-width: 400px;
+	width: 100%;
+	display: block;
+}
+
+.chat-attached-context-attachment .chat-attached-context-pill {
+	font-size: 12px;
+	display: inline-flex;
+	align-items: center;
+	padding: 0 4px 0 2px;
+	border-radius: 2px;
+	margin-right: 1px;
+	user-select: none;
+	outline: none;
+	border: none;
+}
+
+.chat-attached-context-attachment .chat-attached-context-pill-image {
+	width: 16px;
+	height: 16px;
+	border-radius: 2px;
+}
+
+.chat-attached-context-attachment .chat-attached-context-custom-text {
+	vertical-align: middle;
+	user-select: none;
+	outline: none;
+	border: none;
+}
+
+.interactive-session .chat-welcome-view {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	overflow: hidden;
+
+	& > .chat-welcome-view-icon .codicon {
+		font-size: 40px;
+	}
+
+	& > .chat-welcome-view-title {
+		font-size: 24px;
+		margin-top: 10px;
+		font-weight: 500;
+	}
+
+	& > .chat-welcome-view-message {
+		color: var(--vscode-descriptionForeground);
+		text-align: center;
+		max-width: 350px;
+		padding: 0 20px;
+		margin-top: 15px;
+
+		a {
+			color: var(--vscode-textLink-foreground);
+		}
+	}
+
+	& > .chat-welcome-view-tips {
+		color: var(--vscode-descriptionForeground);
+		max-width: 250px;
+		margin-top: 10px;
+
+		.rendered-markdown {
+			gap: 6px;
+			display: flex;
+			align-items: start;
+			flex-direction: column;
+		}
+
+		.rendered-markdown p {
+			display: flex;
+			gap: 6px;
+			margin: 6px 0 0 0;
+
+			.codicon {
+				padding-top: 1px;
+			}
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/media/chatAgentHover.css b/src/vs/workbench/contrib/chat/browser/media/chatAgentHover.css
index 29e38f48cad..75a0cfa7f39 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chatAgentHover.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chatAgentHover.css
@@ -44,6 +44,8 @@
 
 .chat-agent-hover.verifiedPublisher .extension-verified-publisher {
 	display: flex;
+	align-items: start;
+	margin-top: 1px;
 }
 
 .chat-agent-hover .chat-agent-hover-warning .codicon {
diff --git a/src/vs/workbench/contrib/chat/browser/media/chatInlineAnchorWidget.css b/src/vs/workbench/contrib/chat/browser/media/chatInlineAnchorWidget.css
new file mode 100644
index 00000000000..fc672aae75f
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/media/chatInlineAnchorWidget.css
@@ -0,0 +1,55 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.chat-inline-anchor-widget {
+	border: 1px solid var(--vscode-chat-requestBorder, var(--vscode-input-background, transparent));
+	border-radius: 4px;
+	margin: 0 1px;
+	padding: 1px 3px;
+	text-wrap: nowrap;
+	width: fit-content;
+}
+
+.chat-inline-anchor-widget .icon-label {
+	padding-right: 3px;
+}
+
+.chat-inline-anchor-widget .clickable {
+	cursor: pointer;
+}
+
+.interactive-item-container .value .rendered-markdown .chat-inline-anchor-widget {
+	color: inherit;
+}
+
+.chat-inline-anchor-widget:hover {
+	background-color: var(--vscode-list-hoverBackground);
+}
+
+.chat-inline-anchor-widget .icon {
+	vertical-align: middle;
+	line-height: 1em;
+	font-size: 90%;
+	overflow: hidden;
+}
+
+.show-file-icons.chat-inline-anchor-widget .icon::before {
+	display: inline-block;
+	line-height: 100%;
+	overflow: hidden;
+
+	background-size: contain;
+	background-position: center;
+	background-repeat: no-repeat;
+
+	margin-right: 3px;
+	margin-bottom: 1px;
+
+	flex-shrink: 0;
+}
+
+.chat-inline-anchor-widget .icon-label {
+	text-wrap: wrap;
+}
diff --git a/src/vs/workbench/contrib/chat/common/annotations.ts b/src/vs/workbench/contrib/chat/common/annotations.ts
index 8a57732c95d..bd95ecb599e 100644
--- a/src/vs/workbench/contrib/chat/common/annotations.ts
+++ b/src/vs/workbench/contrib/chat/common/annotations.ts
@@ -2,23 +2,46 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { basename } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { IRange } from 'vs/editor/common/core/range';
-import { IChatProgressRenderableResponseContent, IChatProgressResponseContent, appendMarkdownString, canMergeMarkdownStrings } from 'vs/workbench/contrib/chat/common/chatModel';
-import { IChatAgentVulnerabilityDetails, IChatMarkdownContent } from 'vs/workbench/contrib/chat/common/chatService';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { basename } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IRange } from '../../../../editor/common/core/range.js';
+import { IWorkspaceSymbol } from '../../search/common/search.js';
+import { IChatProgressRenderableResponseContent, IChatProgressResponseContent, appendMarkdownString, canMergeMarkdownStrings } from './chatModel.js';
+import { IChatAgentVulnerabilityDetails, IChatMarkdownContent } from './chatService.js';
 
 export const contentRefUrl = 'http://_vscodecontentref_'; // must be lowercase for URI
 
-export function annotateSpecialMarkdownContent(response: ReadonlyArray<IChatProgressResponseContent>): ReadonlyArray<IChatProgressRenderableResponseContent> {
+export type ContentRefData =
+	| { readonly kind: 'symbol'; readonly symbol: IWorkspaceSymbol }
+	| {
+		readonly kind?: undefined;
+		readonly uri: URI;
+		readonly range?: IRange;
+	};
+
+export function annotateSpecialMarkdownContent(response: ReadonlyArray<IChatProgressResponseContent>): IChatProgressRenderableResponseContent[] {
 	const result: IChatProgressRenderableResponseContent[] = [];
 	for (const item of response) {
 		const previousItem = result[result.length - 1];
 		if (item.kind === 'inlineReference') {
-			const location = 'uri' in item.inlineReference ? item.inlineReference : { uri: item.inlineReference };
+			const location: ContentRefData = 'uri' in item.inlineReference
+				? item.inlineReference
+				: 'name' in item.inlineReference
+					? { kind: 'symbol', symbol: item.inlineReference }
+					: { uri: item.inlineReference };
+
 			const printUri = URI.parse(contentRefUrl).with({ fragment: JSON.stringify(location) });
-			const markdownText = `[${item.name || basename(location.uri)}](${printUri.toString()})`;
+			let label: string | undefined = item.name;
+			if (!label) {
+				if (location.kind === 'symbol') {
+					label = location.symbol.name;
+				} else {
+					label = basename(location.uri);
+				}
+			}
+
+			const markdownText = `[${label}](${printUri.toString()})`;
 			if (previousItem?.kind === 'markdownContent') {
 				const merged = appendMarkdownString(previousItem.content, new MarkdownString(markdownText));
 				result[result.length - 1] = { content: merged, kind: 'markdownContent' };
@@ -38,6 +61,12 @@ export function annotateSpecialMarkdownContent(response: ReadonlyArray<IChatProg
 			} else {
 				result.push({ content: new MarkdownString(markdownText), kind: 'markdownContent' });
 			}
+		} else if (item.kind === 'codeblockUri') {
+			if (previousItem?.kind === 'markdownContent') {
+				const markdownText = `<vscode_codeblock_uri>${item.uri.toString()}</vscode_codeblock_uri>`;
+				const merged = appendMarkdownString(previousItem.content, new MarkdownString(markdownText));
+				result[result.length - 1] = { content: merged, kind: 'markdownContent' };
+			}
 		} else {
 			result.push(item);
 		}
@@ -76,6 +105,16 @@ export function annotateVulnerabilitiesInText(response: ReadonlyArray<IChatProgr
 	return result;
 }
 
+export function extractCodeblockUrisFromText(text: string): { uri: URI; textWithoutResult: string } | undefined {
+	const match = /<vscode_codeblock_uri>(.*?)<\/vscode_codeblock_uri>/ms.exec(text);
+	if (match && match[1]) {
+		const result = URI.parse(match[1]);
+		const textWithoutResult = text.substring(0, match.index) + text.substring(match.index + match[0].length);
+		return { uri: result, textWithoutResult };
+	}
+	return undefined;
+}
+
 export function extractVulnerabilitiesFromText(text: string): { newText: string; vulnerabilities: IMarkdownVulnerability[] } {
 	const vulnerabilities: IMarkdownVulnerability[] = [];
 	let newText = text;
diff --git a/src/vs/workbench/contrib/chat/common/chatAgents.ts b/src/vs/workbench/contrib/chat/common/chatAgents.ts
index e2f703325b1..f61c6f1ba4a 100644
--- a/src/vs/workbench/contrib/chat/common/chatAgents.ts
+++ b/src/vs/workbench/contrib/chat/common/chatAgents.ts
@@ -3,37 +3,36 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { findLast } from 'vs/base/common/arraysFind';
-import { timeout } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { Iterable } from 'vs/base/common/iterator';
-import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { revive } from 'vs/base/common/marshalling';
-import { IObservable } from 'vs/base/common/observable';
-import { observableValue } from 'vs/base/common/observableInternal/base';
-import { equalsIgnoreCase } from 'vs/base/common/strings';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { URI } from 'vs/base/common/uri';
-import { Command, ProviderResult } from 'vs/editor/common/languages';
-import { ContextKeyExpr, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { asJson, IRequestService } from 'vs/platform/request/common/request';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { CONTEXT_CHAT_ENABLED } from 'vs/workbench/contrib/chat/common/chatContextKeys';
-import { IChatProgressResponseContent, IChatRequestVariableData, ISerializableChatAgentData } from 'vs/workbench/contrib/chat/common/chatModel';
-import { IRawChatCommandContribution, RawChatParticipantLocation } from 'vs/workbench/contrib/chat/common/chatParticipantContribTypes';
-import { IChatFollowup, IChatProgress, IChatResponseErrorDetails, IChatTaskDto } from 'vs/workbench/contrib/chat/common/chatService';
+import { findLast } from '../../../../base/common/arraysFind.js';
+import { timeout } from '../../../../base/common/async.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { IMarkdownString, isMarkdownString } from '../../../../base/common/htmlContent.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { revive } from '../../../../base/common/marshalling.js';
+import { IObservable, observableValue } from '../../../../base/common/observable.js';
+import { equalsIgnoreCase } from '../../../../base/common/strings.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Command, ProviderResult } from '../../../../editor/common/languages.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { asJson, IRequestService } from '../../../../platform/request/common/request.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { CONTEXT_CHAT_EDITING_PARTICIPANT_REGISTERED, CONTEXT_CHAT_ENABLED, CONTEXT_CHAT_PANEL_PARTICIPANT_REGISTERED } from './chatContextKeys.js';
+import { IChatProgressHistoryResponseContent, IChatRequestVariableData, ISerializableChatAgentData } from './chatModel.js';
+import { IRawChatCommandContribution, RawChatParticipantLocation } from './chatParticipantContribTypes.js';
+import { IChatFollowup, IChatLocationData, IChatProgress, IChatResponseErrorDetails, IChatTaskDto } from './chatService.js';
 
 //#region agent service, commands etc
 
 export interface IChatAgentHistoryEntry {
 	request: IChatAgentRequest;
-	response: ReadonlyArray<IChatProgressResponseContent | IChatTaskDto>;
+	response: ReadonlyArray<IChatProgressHistoryResponseContent | IChatTaskDto>;
 	result: IChatAgentResult;
 }
 
@@ -41,7 +40,8 @@ export enum ChatAgentLocation {
 	Panel = 'panel',
 	Terminal = 'terminal',
 	Notebook = 'notebook',
-	Editor = 'editor'
+	Editor = 'editor',
+	EditingSession = 'editing-session',
 }
 
 export namespace ChatAgentLocation {
@@ -51,6 +51,7 @@ export namespace ChatAgentLocation {
 			case 'terminal': return ChatAgentLocation.Terminal;
 			case 'notebook': return ChatAgentLocation.Notebook;
 			case 'editor': return ChatAgentLocation.Editor;
+			case 'editing-session': return ChatAgentLocation.EditingSession;
 		}
 		return ChatAgentLocation.Panel;
 	}
@@ -61,6 +62,7 @@ export interface IChatAgentData {
 	name: string;
 	fullName?: string;
 	description?: string;
+	supportsModelPicker?: boolean;
 	when?: string;
 	extensionId: ExtensionIdentifier;
 	extensionPublisherId: string;
@@ -73,17 +75,47 @@ export interface IChatAgentData {
 	isDynamic?: boolean;
 	metadata: IChatAgentMetadata;
 	slashCommands: IChatAgentCommand[];
-	defaultImplicitVariables?: string[];
 	locations: ChatAgentLocation[];
+	disambiguation: { category: string; description: string; examples: string[] }[];
+	supportsToolReferences?: boolean;
+}
+
+export interface IChatWelcomeMessageContent {
+	icon: ThemeIcon;
+	title: string;
+	message: IMarkdownString;
+}
+
+export function isChatWelcomeMessageContent(obj: any): obj is IChatWelcomeMessageContent {
+	return obj &&
+		ThemeIcon.isThemeIcon(obj.icon) &&
+		typeof obj.title === 'string' &&
+		isMarkdownString(obj.message);
 }
 
 export interface IChatAgentImplementation {
 	invoke(request: IChatAgentRequest, progress: (part: IChatProgress) => void, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatAgentResult>;
 	provideFollowups?(request: IChatAgentRequest, result: IChatAgentResult, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatFollowup[]>;
-	provideWelcomeMessage?(location: ChatAgentLocation, token: CancellationToken): ProviderResult<(string | IMarkdownString)[] | undefined>;
+	provideWelcomeMessage?(token: CancellationToken): ProviderResult<IChatWelcomeMessageContent | undefined>;
+	provideChatTitle?: (history: IChatAgentHistoryEntry[], token: CancellationToken) => Promise<string | undefined>;
 	provideSampleQuestions?(location: ChatAgentLocation, token: CancellationToken): ProviderResult<IChatFollowup[] | undefined>;
 }
 
+export interface IChatParticipantDetectionResult {
+	participant: string;
+	command?: string;
+}
+
+export interface IChatParticipantMetadata {
+	participant: string;
+	command?: string;
+	disambiguation: { category: string; description: string; examples: string[] }[];
+}
+
+export interface IChatParticipantDetectionProvider {
+	provideParticipantDetection(request: IChatAgentRequest, history: IChatAgentHistoryEntry[], options: { location: ChatAgentLocation; participants: IChatParticipantMetadata[] }, token: CancellationToken): Promise<IChatParticipantDetectionResult | null | undefined>;
+}
+
 export type IChatAgent = IChatAgentData & IChatAgentImplementation;
 
 export interface IChatAgentCommand extends IRawChatCommandContribution {
@@ -124,20 +156,32 @@ export interface IChatAgentRequest {
 	message: string;
 	attempt?: number;
 	enableCommandDetection?: boolean;
+	isParticipantDetected?: boolean;
 	variables: IChatRequestVariableData;
 	location: ChatAgentLocation;
+	locationData?: IChatLocationData;
 	acceptedConfirmationData?: any[];
 	rejectedConfirmationData?: any[];
+	userSelectedModelId?: string;
+}
+
+export interface IChatQuestion {
+	readonly prompt: string;
+	readonly participant?: string;
+	readonly command?: string;
+}
+
+export interface IChatAgentResultTimings {
+	firstProgress?: number;
+	totalElapsed: number;
 }
 
 export interface IChatAgentResult {
 	errorDetails?: IChatResponseErrorDetails;
-	timings?: {
-		firstProgress?: number;
-		totalElapsed: number;
-	};
+	timings?: IChatAgentResultTimings;
 	/** Extra properties that the agent can use to identify a result */
 	readonly metadata?: { readonly [key: string]: any };
+	nextQuestion?: IChatQuestion;
 }
 
 export const IChatAgentService = createDecorator<IChatAgentService>('chatAgentService');
@@ -167,8 +211,12 @@ export interface IChatAgentService {
 	registerDynamicAgent(data: IChatAgentData, agentImpl: IChatAgentImplementation): IDisposable;
 	registerAgentCompletionProvider(id: string, provider: (query: string, token: CancellationToken) => Promise<IChatAgentCompletionItem[]>): IDisposable;
 	getAgentCompletionItems(id: string, query: string, token: CancellationToken): Promise<IChatAgentCompletionItem[]>;
+	registerChatParticipantDetectionProvider(handle: number, provider: IChatParticipantDetectionProvider): IDisposable;
+	detectAgentOrCommand(request: IChatAgentRequest, history: IChatAgentHistoryEntry[], options: { location: ChatAgentLocation }, token: CancellationToken): Promise<{ agent: IChatAgentData; command?: IChatAgentCommand } | undefined>;
+	hasChatParticipantDetectionProviders(): boolean;
 	invokeAgent(agent: string, request: IChatAgentRequest, progress: (part: IChatProgress) => void, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatAgentResult>;
 	getFollowups(id: string, request: IChatAgentRequest, result: IChatAgentResult, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatFollowup[]>;
+	getChatTitle(id: string, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<string | undefined>;
 	getAgent(id: string): IChatAgentData | undefined;
 	getAgentByFullyQualifiedId(id: string): IChatAgentData | undefined;
 	getAgents(): IChatAgentData[];
@@ -201,11 +249,15 @@ export class ChatAgentService implements IChatAgentService {
 	readonly onDidChangeAgents: Event<IChatAgent | undefined> = this._onDidChangeAgents.event;
 
 	private readonly _hasDefaultAgent: IContextKey<boolean>;
+	private readonly _defaultAgentRegistered: IContextKey<boolean>;
+	private readonly _editingAgentRegistered: IContextKey<boolean>;
 
 	constructor(
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 	) {
 		this._hasDefaultAgent = CONTEXT_CHAT_ENABLED.bindTo(this.contextKeyService);
+		this._defaultAgentRegistered = CONTEXT_CHAT_PANEL_PARTICIPANT_REGISTERED.bindTo(this.contextKeyService);
+		this._editingAgentRegistered = CONTEXT_CHAT_EDITING_PARTICIPANT_REGISTERED.bindTo(this.contextKeyService);
 	}
 
 	registerAgent(id: string, data: IChatAgentData): IDisposable {
@@ -214,6 +266,12 @@ export class ChatAgentService implements IChatAgentService {
 			throw new Error(`Agent already registered: ${JSON.stringify(id)}`);
 		}
 
+		if (data.isDefault && data.locations.includes(ChatAgentLocation.EditingSession)) {
+			this._editingAgentRegistered.set(true);
+		} else if (data.isDefault) {
+			this._defaultAgentRegistered.set(true);
+		}
+
 		const that = this;
 		const commands = data.slashCommands;
 		data = {
@@ -224,8 +282,15 @@ export class ChatAgentService implements IChatAgentService {
 		};
 		const entry = { data };
 		this._agents.set(id, entry);
+		this._onDidChangeAgents.fire(undefined);
 		return toDisposable(() => {
 			this._agents.delete(id);
+			if (data.isDefault && data.locations.includes(ChatAgentLocation.EditingSession)) {
+				this._editingAgentRegistered.set(false);
+			} else if (data.isDefault) {
+				this._defaultAgentRegistered.set(false);
+			}
+
 			this._onDidChangeAgents.fire(undefined);
 		});
 	}
@@ -377,6 +442,70 @@ export class ChatAgentService implements IChatAgentService {
 
 		return data.impl.provideFollowups(request, result, history, token);
 	}
+
+	async getChatTitle(id: string, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<string | undefined> {
+		const data = this._agents.get(id);
+		if (!data?.impl) {
+			throw new Error(`No activated agent with id "${id}"`);
+		}
+
+		if (!data.impl?.provideChatTitle) {
+			return undefined;
+		}
+
+		return data.impl.provideChatTitle(history, token);
+	}
+
+	private _chatParticipantDetectionProviders = new Map<number, IChatParticipantDetectionProvider>();
+	registerChatParticipantDetectionProvider(handle: number, provider: IChatParticipantDetectionProvider) {
+		this._chatParticipantDetectionProviders.set(handle, provider);
+		return toDisposable(() => {
+			this._chatParticipantDetectionProviders.delete(handle);
+		});
+	}
+
+	hasChatParticipantDetectionProviders() {
+		return this._chatParticipantDetectionProviders.size > 0;
+	}
+
+	async detectAgentOrCommand(request: IChatAgentRequest, history: IChatAgentHistoryEntry[], options: { location: ChatAgentLocation }, token: CancellationToken): Promise<{ agent: IChatAgentData; command?: IChatAgentCommand } | undefined> {
+		// TODO@joyceerhl should we have a selector to be able to narrow down which provider to use
+		const provider = Iterable.first(this._chatParticipantDetectionProviders.values());
+		if (!provider) {
+			return;
+		}
+
+		const participants = this.getAgents().reduce<IChatParticipantMetadata[]>((acc, a) => {
+			acc.push({ participant: a.id, disambiguation: a.disambiguation ?? [] });
+			for (const command of a.slashCommands) {
+				acc.push({ participant: a.id, command: command.name, disambiguation: command.disambiguation ?? [] });
+			}
+			return acc;
+		}, []);
+
+		const result = await provider.provideParticipantDetection(request, history, { ...options, participants }, token);
+		if (!result) {
+			return;
+		}
+
+		const agent = this.getAgent(result.participant);
+		if (!agent) {
+			// Couldn't find a participant matching the participant detection result
+			return;
+		}
+
+		if (!result.command) {
+			return { agent };
+		}
+
+		const command = agent?.slashCommands.find(c => c.name === result.command);
+		if (!command) {
+			// Couldn't find a slash command matching the participant detection result
+			return;
+		}
+
+		return { agent, command };
+	}
 }
 
 export class MergedChatAgent implements IChatAgent {
@@ -384,6 +513,9 @@ export class MergedChatAgent implements IChatAgent {
 		private readonly data: IChatAgentData,
 		private readonly impl: IChatAgentImplementation
 	) { }
+	when?: string | undefined;
+	publisherDisplayName?: string | undefined;
+	isDynamic?: boolean | undefined;
 
 	get id(): string { return this.data.id; }
 	get name(): string { return this.data.name ?? ''; }
@@ -396,8 +528,8 @@ export class MergedChatAgent implements IChatAgent {
 	get isDefault(): boolean | undefined { return this.data.isDefault; }
 	get metadata(): IChatAgentMetadata { return this.data.metadata; }
 	get slashCommands(): IChatAgentCommand[] { return this.data.slashCommands; }
-	get defaultImplicitVariables(): string[] | undefined { return this.data.defaultImplicitVariables; }
 	get locations(): ChatAgentLocation[] { return this.data.locations; }
+	get disambiguation(): { category: string; description: string; examples: string[] }[] { return this.data.disambiguation; }
 
 	async invoke(request: IChatAgentRequest, progress: (part: IChatProgress) => void, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatAgentResult> {
 		return this.impl.invoke(request, progress, history, token);
@@ -411,9 +543,9 @@ export class MergedChatAgent implements IChatAgent {
 		return [];
 	}
 
-	provideWelcomeMessage(location: ChatAgentLocation, token: CancellationToken): ProviderResult<(string | IMarkdownString)[] | undefined> {
+	provideWelcomeMessage(token: CancellationToken): ProviderResult<IChatWelcomeMessageContent | undefined> {
 		if (this.impl.provideWelcomeMessage) {
-			return this.impl.provideWelcomeMessage(location, token);
+			return this.impl.provideWelcomeMessage(token);
 		}
 
 		return undefined;
@@ -426,6 +558,10 @@ export class MergedChatAgent implements IChatAgent {
 
 		return undefined;
 	}
+
+	toJSON(): IChatAgentData {
+		return this.data;
+	}
 }
 
 export const IChatAgentNameService = createDecorator<IChatAgentNameService>('chatAgentNameService');
diff --git a/src/vs/workbench/contrib/chat/common/chatCodeMapperService.ts b/src/vs/workbench/contrib/chat/common/chatCodeMapperService.ts
new file mode 100644
index 00000000000..bb6b812551f
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/chatCodeMapperService.ts
@@ -0,0 +1,205 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { CharCode } from '../../../../base/common/charCode.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { splitLinesIncludeSeparators } from '../../../../base/common/strings.js';
+import { isString } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { DocumentContextItem, isLocation, TextEdit } from '../../../../editor/common/languages.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IChatAgentResult } from './chatAgents.js';
+import { IChatResponseModel } from './chatModel.js';
+import { IChatContentReference } from './chatService.js';
+
+
+export interface ICodeMapperResponse {
+	textEdit: (resource: URI, textEdit: TextEdit[]) => void;
+}
+
+export interface ICodeMapperCodeBlock {
+	readonly code: string;
+	readonly resource: URI;
+	readonly markdownBeforeBlock?: string;
+}
+
+export interface ConversationRequest {
+	readonly type: 'request';
+	readonly message: string;
+}
+
+export interface ConversationResponse {
+	readonly type: 'response';
+	readonly message: string;
+	readonly result?: IChatAgentResult;
+	readonly references?: DocumentContextItem[];
+}
+
+export interface ICodeMapperRequest {
+	readonly codeBlocks: ICodeMapperCodeBlock[];
+	readonly conversation: (ConversationResponse | ConversationRequest)[];
+}
+
+export interface ICodeMapperResult {
+	readonly errorMessage?: string;
+}
+
+export interface ICodeMapperProvider {
+	mapCode(request: ICodeMapperRequest, response: ICodeMapperResponse, token: CancellationToken): Promise<ICodeMapperResult | undefined>;
+}
+
+export const ICodeMapperService = createDecorator<ICodeMapperService>('codeMapperService');
+
+export interface ICodeMapperService {
+	readonly _serviceBrand: undefined;
+	registerCodeMapperProvider(handle: number, provider: ICodeMapperProvider): IDisposable;
+	mapCode(request: ICodeMapperRequest, response: ICodeMapperResponse, token: CancellationToken): Promise<ICodeMapperResult | undefined>;
+	mapCodeFromResponse(responseModel: IChatResponseModel, response: ICodeMapperResponse, token: CancellationToken): Promise<ICodeMapperResult | undefined>;
+}
+
+export class CodeMapperService implements ICodeMapperService {
+	_serviceBrand: undefined;
+
+	private readonly providers: ICodeMapperProvider[] = [];
+
+	registerCodeMapperProvider(handle: number, provider: ICodeMapperProvider): IDisposable {
+		this.providers.push(provider);
+		return {
+			dispose: () => {
+				const index = this.providers.indexOf(provider);
+				if (index >= 0) {
+					this.providers.splice(index, 1);
+				}
+			}
+		};
+	}
+
+	async mapCode(request: ICodeMapperRequest, response: ICodeMapperResponse, token: CancellationToken) {
+		for (const provider of this.providers) {
+			const result = await provider.mapCode(request, response, token);
+			if (result) {
+				return result;
+			}
+		}
+		return undefined;
+	}
+
+	async mapCodeFromResponse(responseModel: IChatResponseModel, response: ICodeMapperResponse, token: CancellationToken) {
+		const fenceLanguageRegex = /^`{3,}/;
+		const codeBlocks: ICodeMapperCodeBlock[] = [];
+
+		const currentBlock = [];
+		const markdownBeforeBlock = [];
+		let currentBlockUri = undefined;
+
+		let fence = undefined; // if set, we are in a block
+
+		for (const lineOrUri of iterateLinesOrUris(responseModel)) {
+			if (isString(lineOrUri)) {
+				const fenceLanguageIdMatch = lineOrUri.match(fenceLanguageRegex);
+				if (fenceLanguageIdMatch) {
+					// we found a line that starts with a fence
+					if (fence !== undefined && fenceLanguageIdMatch[0] === fence) {
+						// we are in a code block and the fence matches the opening fence: Close the code block
+						fence = undefined;
+						if (currentBlockUri) {
+							// report the code block if we have a URI
+							codeBlocks.push({ code: currentBlock.join(''), resource: currentBlockUri, markdownBeforeBlock: markdownBeforeBlock.join('') });
+							currentBlock.length = 0;
+							markdownBeforeBlock.length = 0;
+							currentBlockUri = undefined;
+						}
+					} else {
+						// we are not in a code block. Open the block
+						fence = fenceLanguageIdMatch[0];
+					}
+				} else {
+					if (fence !== undefined) {
+						currentBlock.push(lineOrUri);
+					} else {
+						markdownBeforeBlock.push(lineOrUri);
+					}
+				}
+			} else {
+				currentBlockUri = lineOrUri;
+			}
+		}
+		const conversation: (ConversationRequest | ConversationResponse)[] = [];
+		for (const request of responseModel.session.getRequests()) {
+			const response = request.response;
+			if (!response || response === responseModel) {
+				break;
+			}
+			conversation.push({
+				type: 'request',
+				message: request.message.text
+			});
+			conversation.push({
+				type: 'response',
+				message: response.response.toMarkdown(),
+				result: response.result,
+				references: getReferencesAsDocumentContext(response.contentReferences)
+			});
+		}
+		return this.mapCode({ codeBlocks, conversation }, response, token);
+	}
+}
+
+function iterateLinesOrUris(responseModel: IChatResponseModel): Iterable<string | URI> {
+	return {
+		*[Symbol.iterator](): Iterator<string | URI> {
+			let lastIncompleteLine = undefined;
+			for (const part of responseModel.response.value) {
+				if (part.kind === 'markdownContent' || part.kind === 'markdownVuln') {
+					const lines = splitLinesIncludeSeparators(part.content.value);
+					if (lines.length > 0) {
+						if (lastIncompleteLine !== undefined) {
+							lines[0] = lastIncompleteLine + lines[0]; // merge the last incomplete line with the first markdown line
+						}
+						lastIncompleteLine = isLineIncomplete(lines[lines.length - 1]) ? lines.pop() : undefined;
+						for (const line of lines) {
+							yield line;
+						}
+					}
+				} else if (part.kind === 'codeblockUri') {
+					yield part.uri;
+				}
+			}
+		}
+	};
+}
+
+function isLineIncomplete(line: string) {
+	const lastChar = line.charCodeAt(line.length - 1);
+	return lastChar !== CharCode.LineFeed && lastChar !== CharCode.CarriageReturn;
+}
+
+
+export function getReferencesAsDocumentContext(res: readonly IChatContentReference[]): DocumentContextItem[] {
+	const map = new ResourceMap<DocumentContextItem>();
+	for (const r of res) {
+		let uri;
+		let range;
+		if (URI.isUri(r.reference)) {
+			uri = r.reference;
+		} else if (isLocation(r.reference)) {
+			uri = r.reference.uri;
+			range = r.reference.range;
+		}
+		if (uri) {
+			const item = map.get(uri);
+			if (item) {
+				if (range) {
+					item.ranges.push(range);
+				}
+			} else {
+				map.set(uri, { uri, version: -1, ranges: range ? [range] : [] });
+			}
+		}
+	}
+	return [...map.values()];
+}
diff --git a/src/vs/workbench/contrib/chat/common/chatColors.ts b/src/vs/workbench/contrib/chat/common/chatColors.ts
index 3c4cce05e01..b8ce6697597 100644
--- a/src/vs/workbench/contrib/chat/common/chatColors.ts
+++ b/src/vs/workbench/contrib/chat/common/chatColors.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Color, RGBA } from 'vs/base/common/color';
-import { localize } from 'vs/nls';
-import { badgeBackground, badgeForeground, contrastBorder, editorBackground, editorWidgetBackground, foreground, registerColor, transparent } from 'vs/platform/theme/common/colorRegistry';
+import { Color, RGBA } from '../../../../base/common/color.js';
+import { localize } from '../../../../nls.js';
+import { badgeBackground, badgeForeground, contrastBorder, editorBackground, editorWidgetBackground, foreground, registerColor, transparent } from '../../../../platform/theme/common/colorRegistry.js';
 
 export const chatRequestBorder = registerColor(
 	'chat.requestBorder',
@@ -39,6 +39,6 @@ export const chatAvatarBackground = registerColor(
 
 export const chatAvatarForeground = registerColor(
 	'chat.avatarForeground',
-	{ dark: foreground, light: foreground, hcDark: foreground, hcLight: foreground, },
+	foreground,
 	localize('chat.avatarForeground', 'The foreground color of a chat avatar.')
 );
diff --git a/src/vs/workbench/contrib/chat/common/chatContextKeys.ts b/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
index bd51f83ce09..03e3cdf0e12 100644
--- a/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
+++ b/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
@@ -3,18 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { ChatAgentLocation } from 'vs/workbench/contrib/chat/common/chatAgents';
+import { localize } from '../../../../nls.js';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { ChatAgentLocation } from './chatAgents.js';
 
 export const CONTEXT_RESPONSE_VOTE = new RawContextKey<string>('chatSessionResponseVote', '', { type: 'string', description: localize('interactiveSessionResponseVote', "When the response has been voted up, is set to 'up'. When voted down, is set to 'down'. Otherwise an empty string.") });
 export const CONTEXT_RESPONSE_DETECTED_AGENT_COMMAND = new RawContextKey<boolean>('chatSessionResponseDetectedAgentOrCommand', false, { type: 'boolean', description: localize('chatSessionResponseDetectedAgentOrCommand', "When the agent or command was automatically detected") });
 export const CONTEXT_CHAT_RESPONSE_SUPPORT_ISSUE_REPORTING = new RawContextKey<boolean>('chatResponseSupportsIssueReporting', false, { type: 'boolean', description: localize('chatResponseSupportsIssueReporting', "True when the current chat response supports issue reporting.") });
 export const CONTEXT_RESPONSE_FILTERED = new RawContextKey<boolean>('chatSessionResponseFiltered', false, { type: 'boolean', description: localize('chatResponseFiltered', "True when the chat response was filtered out by the server.") });
+export const CONTEXT_RESPONSE_ERROR = new RawContextKey<boolean>('chatSessionResponseError', false, { type: 'boolean', description: localize('chatResponseErrored', "True when the chat response resulted in an error.") });
 export const CONTEXT_CHAT_REQUEST_IN_PROGRESS = new RawContextKey<boolean>('chatSessionRequestInProgress', false, { type: 'boolean', description: localize('interactiveSessionRequestInProgress', "True when the current request is still in progress.") });
 
 export const CONTEXT_RESPONSE = new RawContextKey<boolean>('chatResponse', false, { type: 'boolean', description: localize('chatResponse', "The chat item is a response.") });
 export const CONTEXT_REQUEST = new RawContextKey<boolean>('chatRequest', false, { type: 'boolean', description: localize('chatRequest', "The chat item is a request") });
+export const CONTEXT_ITEM_ID = new RawContextKey<string>('chatItemId', '', { type: 'string', description: localize('chatItemId', "The id of the chat item.") });
+export const CONTEXT_LAST_ITEM_ID = new RawContextKey<string[]>('chatLastItemId', [], { type: 'string', description: localize('chatLastItemId', "The id of the last chat item.") });
 
 export const CONTEXT_CHAT_EDIT_APPLIED = new RawContextKey<boolean>('chatEditApplied', false, { type: 'boolean', description: localize('chatEditApplied', "True when the chat text edits have been applied.") });
 
@@ -23,8 +26,15 @@ export const CONTEXT_CHAT_INPUT_HAS_FOCUS = new RawContextKey<boolean>('chatInpu
 export const CONTEXT_IN_CHAT_INPUT = new RawContextKey<boolean>('inChatInput', false, { type: 'boolean', description: localize('inInteractiveInput', "True when focus is in the chat input, false otherwise.") });
 export const CONTEXT_IN_CHAT_SESSION = new RawContextKey<boolean>('inChat', false, { type: 'boolean', description: localize('inChat', "True when focus is in the chat widget, false otherwise.") });
 
-export const CONTEXT_CHAT_ENABLED = new RawContextKey<boolean>('chatIsEnabled', false, { type: 'boolean', description: localize('chatIsEnabled', "True when chat is enabled because a default chat participant is registered.") });
+export const CONTEXT_CHAT_ENABLED = new RawContextKey<boolean>('chatIsEnabled', false, { type: 'boolean', description: localize('chatIsEnabled', "True when chat is enabled because a default chat participant is activated with an implementation.") });
+export const CONTEXT_CHAT_PANEL_PARTICIPANT_REGISTERED = new RawContextKey<boolean>('chatPanelParticipantRegistered', false, { type: 'boolean', description: localize('chatParticipantRegistered', "True when a default chat participant is registered for the panel.") });
+export const CONTEXT_CHAT_EDITING_PARTICIPANT_REGISTERED = new RawContextKey<boolean>('chatEditingParticipantRegistered', false, { type: 'boolean', description: localize('chatEditingParticipantRegistered', "True when a default chat participant is registered for editing.") });
+export const CONTEXT_CHAT_EXTENSION_INVALID = new RawContextKey<boolean>('chatExtensionInvalid', false, { type: 'boolean', description: localize('chatExtensionInvalid', "True when the installed chat extension is invalid and needs to be updated.") });
 export const CONTEXT_CHAT_INPUT_CURSOR_AT_TOP = new RawContextKey<boolean>('chatCursorAtTop', false);
 export const CONTEXT_CHAT_INPUT_HAS_AGENT = new RawContextKey<boolean>('chatInputHasAgent', false);
 export const CONTEXT_CHAT_LOCATION = new RawContextKey<ChatAgentLocation>('chatLocation', undefined);
 export const CONTEXT_IN_QUICK_CHAT = new RawContextKey<boolean>('quickChatHasFocus', false, { type: 'boolean', description: localize('inQuickChat', "True when the quick chat UI has focus, false otherwise.") });
+
+export const CONTEXT_LANGUAGE_MODELS_ARE_USER_SELECTABLE = new RawContextKey<boolean>('chatModelsAreUserSelectable', false, { type: 'boolean', description: localize('chatModelsAreUserSelectable', "True when the chat model can be selected manually by the user.") });
+export const CONTEXT_PARTICIPANT_SUPPORTS_MODEL_PICKER = new RawContextKey<boolean>('chatParticipantSupportsModelPicker', true, { type: 'boolean', description: localize('chatParticipantSupportsModelPicker', "True when the current chat participant supports picking the model manually.") });
+
diff --git a/src/vs/workbench/contrib/chat/common/chatEditingService.ts b/src/vs/workbench/contrib/chat/common/chatEditingService.ts
new file mode 100644
index 00000000000..8d818a2abde
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/chatEditingService.ts
@@ -0,0 +1,67 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Event } from '../../../../base/common/event.js';
+import { IObservable, ITransaction } from '../../../../base/common/observable.js';
+import { URI } from '../../../../base/common/uri.js';
+import { TextEdit } from '../../../../editor/common/languages.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IChatResponseModel } from './chatModel.js';
+
+export const IChatEditingService = createDecorator<IChatEditingService>('chatEditingService');
+
+export interface IChatEditingService {
+	_serviceBrand: undefined;
+
+	readonly onDidCreateEditingSession: Event<IChatEditingSession>;
+
+	readonly currentEditingSession: IChatEditingSession | null;
+
+	startOrContinueEditingSession(chatSessionId: string, options?: { silent: boolean }): Promise<IChatEditingSession>;
+	addFileToWorkingSet(resource: URI): Promise<void>;
+	triggerEditComputation(responseModel: IChatResponseModel): Promise<void>;
+}
+
+export interface IChatEditingSession {
+	readonly chatSessionId: string;
+	readonly onDidChange: Event<void>;
+	readonly onDidDispose: Event<void>;
+	readonly state: IObservable<ChatEditingSessionState>;
+	readonly workingSet: IObservable<readonly URI[]>;
+	readonly entries: IObservable<readonly IModifiedFileEntry[]>;
+	readonly isVisible: boolean;
+	show(): Promise<void>;
+	accept(...uris: URI[]): Promise<void>;
+	reject(...uris: URI[]): Promise<void>;
+	/**
+	 * Will lead to this object getting disposed
+	 */
+	stop(): Promise<void>;
+}
+
+export const enum ModifiedFileEntryState {
+	Undecided,
+	Accepted,
+	Rejected
+}
+
+export interface IModifiedFileEntry {
+	readonly originalURI: URI;
+	readonly modifiedURI: URI;
+	readonly state: IObservable<ModifiedFileEntryState>;
+	accept(transaction: ITransaction | undefined): Promise<void>;
+	reject(transaction: ITransaction | undefined): Promise<void>;
+}
+
+export interface IChatEditingSessionStream {
+	textEdits(resource: URI, textEdits: TextEdit[]): void;
+}
+
+export const enum ChatEditingSessionState {
+	Initial = 0,
+	StreamingEdits = 1,
+	Idle = 2,
+	Disposed = 3
+}
diff --git a/src/vs/workbench/contrib/chat/common/chatModel.ts b/src/vs/workbench/contrib/chat/common/chatModel.ts
index 1760a265c3b..f08484d8229 100644
--- a/src/vs/workbench/contrib/chat/common/chatModel.ts
+++ b/src/vs/workbench/contrib/chat/common/chatModel.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { asArray, firstOrDefault } from 'vs/base/common/arrays';
-import { DeferredPromise } from 'vs/base/common/async';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IMarkdownString, MarkdownString, isMarkdownString } from 'vs/base/common/htmlContent';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { revive } from 'vs/base/common/marshalling';
-import { equals } from 'vs/base/common/objects';
-import { basename, isEqual } from 'vs/base/common/resources';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { URI, UriComponents, UriDto, isUriComponents } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { IOffsetRange, OffsetRange } from 'vs/editor/common/core/offsetRange';
-import { TextEdit } from 'vs/editor/common/languages';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ChatAgentLocation, IChatAgentCommand, IChatAgentData, IChatAgentHistoryEntry, IChatAgentRequest, IChatAgentResult, IChatAgentService, reviveSerializedAgent } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { ChatRequestTextPart, IParsedChatRequest, getPromptText, reviveParsedChatRequest } from 'vs/workbench/contrib/chat/common/chatParserTypes';
-import { IChatAgentMarkdownContentWithVulnerability, IChatCommandButton, IChatConfirmation, IChatContentInlineReference, IChatContentReference, IChatFollowup, IChatMarkdownContent, IChatProgressMessage, IChatResponseProgressFileTreeData, IChatTask, IChatTextEdit, IChatTreeData, IChatUsedContext, IChatWarningMessage, ChatAgentVoteDirection, isIUsedContext, IChatProgress } from 'vs/workbench/contrib/chat/common/chatService';
-import { IChatRequestVariableValue } from 'vs/workbench/contrib/chat/common/chatVariables';
+import { asArray } from '../../../../base/common/arrays.js';
+import { DeferredPromise } from '../../../../base/common/async.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { IMarkdownString, MarkdownString, isMarkdownString } from '../../../../base/common/htmlContent.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { revive } from '../../../../base/common/marshalling.js';
+import { equals } from '../../../../base/common/objects.js';
+import { basename, isEqual } from '../../../../base/common/resources.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { URI, UriComponents, UriDto, isUriComponents } from '../../../../base/common/uri.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { IOffsetRange, OffsetRange } from '../../../../editor/common/core/offsetRange.js';
+import { IRange } from '../../../../editor/common/core/range.js';
+import { TextEdit } from '../../../../editor/common/languages.js';
+import { localize } from '../../../../nls.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { ChatAgentLocation, IChatAgentCommand, IChatAgentData, IChatAgentResult, IChatAgentService, IChatWelcomeMessageContent, reviveSerializedAgent } from './chatAgents.js';
+import { ChatRequestTextPart, IParsedChatRequest, reviveParsedChatRequest } from './chatParserTypes.js';
+import { ChatAgentVoteDirection, ChatAgentVoteDownReason, IChatAgentMarkdownContentWithVulnerability, IChatCodeCitation, IChatCommandButton, IChatConfirmation, IChatContentInlineReference, IChatContentReference, IChatFollowup, IChatLocationData, IChatMarkdownContent, IChatProgress, IChatProgressMessage, IChatResponseCodeblockUriPart, IChatResponseProgressFileTreeData, IChatTask, IChatTextEdit, IChatToolInvocation, IChatToolInvocationSerialized, IChatTreeData, IChatUsedContext, IChatWarningMessage, isIUsedContext } from './chatService.js';
+import { IChatRequestVariableValue } from './chatVariables.js';
 
 export interface IChatRequestVariableEntry {
 	id: string;
@@ -33,8 +33,20 @@ export interface IChatRequestVariableEntry {
 	range?: IOffsetRange;
 	value: IChatRequestVariableValue;
 	references?: IChatContentReference[];
+
+	// TODO are these just a 'kind'?
 	isDynamic?: boolean;
 	isFile?: boolean;
+	isTool?: boolean;
+	isImage?: boolean;
+}
+
+export function isChatRequestVariableEntry(obj: unknown): obj is IChatRequestVariableEntry {
+	const entry = obj as IChatRequestVariableEntry;
+	return typeof entry === 'object' &&
+		entry !== null &&
+		typeof entry.id === 'string' &&
+		typeof entry.name === 'string';
 }
 
 export interface IChatRequestVariableData {
@@ -49,6 +61,9 @@ export interface IChatRequestModel {
 	readonly message: IParsedChatRequest;
 	readonly attempt: number;
 	readonly variableData: IChatRequestVariableData;
+	readonly confirmation?: string;
+	readonly locationData?: IChatLocationData;
+	readonly attachedContext?: IChatRequestVariableEntry[];
 	readonly response?: IChatResponseModel;
 }
 
@@ -64,9 +79,14 @@ export interface IChatTextEditGroup {
 	kind: 'textEditGroup';
 }
 
-export type IChatProgressResponseContent =
+/**
+ * Progress kinds that are included in the history of a response.
+ * Excludes "internal" types that are included in history.
+ */
+export type IChatProgressHistoryResponseContent =
 	| IChatMarkdownContent
 	| IChatAgentMarkdownContentWithVulnerability
+	| IChatResponseCodeblockUriPart
 	| IChatTreeData
 	| IChatContentInlineReference
 	| IChatProgressMessage
@@ -76,11 +96,29 @@ export type IChatProgressResponseContent =
 	| IChatTextEditGroup
 	| IChatConfirmation;
 
-export type IChatProgressRenderableResponseContent = Exclude<IChatProgressResponseContent, IChatContentInlineReference | IChatAgentMarkdownContentWithVulnerability>;
+/**
+ * "Normal" progress kinds that are rendered as parts of the stream of content.
+ */
+export type IChatProgressResponseContent =
+	| IChatProgressHistoryResponseContent
+	| IChatToolInvocation
+	| IChatToolInvocationSerialized;
+
+const nonHistoryKinds = new Set(['toolInvocation', 'toolInvocationSerialized']);
+function isChatProgressHistoryResponseContent(content: IChatProgressResponseContent): content is IChatProgressHistoryResponseContent {
+	return !nonHistoryKinds.has(content.kind);
+}
+
+export function toChatHistoryContent(content: ReadonlyArray<IChatProgressResponseContent>): IChatProgressHistoryResponseContent[] {
+	return content.filter(isChatProgressHistoryResponseContent);
+}
+
+export type IChatProgressRenderableResponseContent = Exclude<IChatProgressResponseContent, IChatContentInlineReference | IChatAgentMarkdownContentWithVulnerability | IChatResponseCodeblockUriPart>;
 
 export interface IResponse {
 	readonly value: ReadonlyArray<IChatProgressResponseContent>;
-	asString(): string;
+	toMarkdown(): string;
+	toString(): string;
 }
 
 export interface IChatResponseModel {
@@ -93,6 +131,7 @@ export interface IChatResponseModel {
 	readonly agent?: IChatAgentData;
 	readonly usedContext: IChatUsedContext | undefined;
 	readonly contentReferences: ReadonlyArray<IChatContentReference>;
+	readonly codeCitations: ReadonlyArray<IChatCodeCitation>;
 	readonly progressMessages: ReadonlyArray<IChatProgressMessage>;
 	readonly slashCommand?: IChatAgentCommand;
 	readonly agentOrSlashCommandDetected: boolean;
@@ -102,9 +141,11 @@ export interface IChatResponseModel {
 	/** A stale response is one that has been persisted and rehydrated, so e.g. Commands that have their arguments stored in the EH are gone. */
 	readonly isStale: boolean;
 	readonly vote: ChatAgentVoteDirection | undefined;
+	readonly voteDownReason: ChatAgentVoteDownReason | undefined;
 	readonly followups?: IChatFollowup[] | undefined;
 	readonly result?: IChatAgentResult;
 	setVote(vote: ChatAgentVoteDirection): void;
+	setVoteDownReason(reason: ChatAgentVoteDownReason | undefined): void;
 	setEditApplied(edit: IChatTextEditGroup, editCount: number): boolean;
 }
 
@@ -139,11 +180,26 @@ export class ChatRequestModel implements IChatRequestModel {
 		this._variableData = v;
 	}
 
+	public get confirmation(): string | undefined {
+		return this._confirmation;
+	}
+
+	public get locationData(): IChatLocationData | undefined {
+		return this._locationData;
+	}
+
+	public get attachedContext(): IChatRequestVariableEntry[] | undefined {
+		return this._attachedContext;
+	}
+
 	constructor(
 		private _session: ChatModel,
 		public readonly message: IParsedChatRequest,
 		private _variableData: IChatRequestVariableData,
-		private _attempt: number = 0
+		private _attempt: number = 0,
+		private _confirmation?: string,
+		private _locationData?: IChatLocationData,
+		private _attachedContext?: IChatRequestVariableEntry[]
 	) {
 		this.id = 'request_' + ChatRequestModel.nextId++;
 	}
@@ -153,22 +209,32 @@ export class ChatRequestModel implements IChatRequestModel {
 	}
 }
 
-export class Response implements IResponse {
-	private _onDidChangeValue = new Emitter<void>();
+export class Response extends Disposable implements IResponse {
+	private _onDidChangeValue = this._register(new Emitter<void>());
 	public get onDidChangeValue() {
 		return this._onDidChangeValue.event;
 	}
 
-	// responseParts internally tracks all the response parts, including strings which are currently resolving, so that they can be updated when they do resolve
 	private _responseParts: IChatProgressResponseContent[];
-	// responseRepr externally presents the response parts with consolidated contiguous strings (excluding tree data)
-	private _responseRepr!: string;
+
+	/**
+	 * A stringified representation of response data which might be presented to a screenreader or used when copying a response.
+	 */
+	private _responseRepr = '';
+
+	/**
+	 * Just the markdown content of the response, used for determining the rendering rate of markdown
+	 */
+	private _markdownContent = '';
+
+	private _citations: IChatCodeCitation[] = [];
 
 	get value(): IChatProgressResponseContent[] {
 		return this._responseParts;
 	}
 
-	constructor(value: IMarkdownString | ReadonlyArray<IMarkdownString | IChatResponseProgressFileTreeData | IChatContentInlineReference | IChatAgentMarkdownContentWithVulnerability>) {
+	constructor(value: IMarkdownString | ReadonlyArray<IMarkdownString | IChatResponseProgressFileTreeData | IChatContentInlineReference | IChatAgentMarkdownContentWithVulnerability | IChatResponseCodeblockUriPart>) {
+		super();
 		this._responseParts = asArray(value).map((v) => (isMarkdownString(v) ?
 			{ content: v, kind: 'markdownContent' } satisfies IChatMarkdownContent :
 			'kind' in v ? v : { kind: 'treeData', treeData: v }));
@@ -176,10 +242,14 @@ export class Response implements IResponse {
 		this._updateRepr(true);
 	}
 
-	asString(): string {
+	override toString(): string {
 		return this._responseRepr;
 	}
 
+	toMarkdown(): string {
+		return this._markdownContent;
+	}
+
 	clear(): void {
 		this._responseParts = [];
 		this._updateRepr(true);
@@ -232,7 +302,7 @@ export class Response implements IResponse {
 
 				// Replace the resolving part's content with the resolved response
 				if (typeof content === 'string') {
-					this._responseParts[responsePosition] = { ...progress, content: new MarkdownString(content) };
+					(this._responseParts[responsePosition] as IChatTask).content = new MarkdownString(content);
 				}
 				this._updateRepr(false);
 			});
@@ -243,17 +313,25 @@ export class Response implements IResponse {
 		}
 	}
 
+	public addCitation(citation: IChatCodeCitation) {
+		this._citations.push(citation);
+		this._updateRepr();
+	}
+
 	private _updateRepr(quiet?: boolean) {
+		const inlineRefToRepr = (part: IChatContentInlineReference) =>
+			'uri' in part.inlineReference ? basename(part.inlineReference.uri) : 'name' in part.inlineReference ? part.inlineReference.name : basename(part.inlineReference);
+
 		this._responseRepr = this._responseParts.map(part => {
 			if (part.kind === 'treeData') {
 				return '';
 			} else if (part.kind === 'inlineReference') {
-				return basename('uri' in part.inlineReference ? part.inlineReference.uri : part.inlineReference);
+				return inlineRefToRepr(part);
 			} else if (part.kind === 'command') {
 				return part.command.title;
 			} else if (part.kind === 'textEditGroup') {
 				return localize('editsSummary', "Made changes.");
-			} else if (part.kind === 'progressMessage') {
+			} else if (part.kind === 'progressMessage' || part.kind === 'codeblockUri' || part.kind === 'toolInvocation' || part.kind === 'toolInvocationSerialized') {
 				return '';
 			} else if (part.kind === 'confirmation') {
 				return `${part.title}\n${part.message}`;
@@ -264,6 +342,20 @@ export class Response implements IResponse {
 			.filter(s => s.length > 0)
 			.join('\n\n');
 
+		this._responseRepr += this._citations.length ? '\n\n' + getCodeCitationsMessage(this._citations) : '';
+
+		this._markdownContent = this._responseParts.map(part => {
+			if (part.kind === 'inlineReference') {
+				return inlineRefToRepr(part);
+			} else if (part.kind === 'markdownContent' || part.kind === 'markdownVuln') {
+				return part.content.value;
+			} else {
+				return '';
+			}
+		})
+			.filter(s => s.length > 0)
+			.join('\n\n');
+
 		if (!quiet) {
 			this._onDidChangeValue.fire();
 		}
@@ -294,6 +386,10 @@ export class ChatResponseModel extends Disposable implements IChatResponseModel
 		return this._vote;
 	}
 
+	public get voteDownReason(): ChatAgentVoteDownReason | undefined {
+		return this._voteDownReason;
+	}
+
 	public get followups(): IChatFollowup[] | undefined {
 		return this._followups;
 	}
@@ -340,6 +436,11 @@ export class ChatResponseModel extends Disposable implements IChatResponseModel
 		return this._contentReferences;
 	}
 
+	private readonly _codeCitations: IChatCodeCitation[] = [];
+	public get codeCitations(): ReadonlyArray<IChatCodeCitation> {
+		return this._codeCitations;
+	}
+
 	private readonly _progressMessages: IChatProgressMessage[] = [];
 	public get progressMessages(): ReadonlyArray<IChatProgressMessage> {
 		return this._progressMessages;
@@ -351,7 +452,7 @@ export class ChatResponseModel extends Disposable implements IChatResponseModel
 	}
 
 	constructor(
-		_response: IMarkdownString | ReadonlyArray<IMarkdownString | IChatResponseProgressFileTreeData | IChatContentInlineReference | IChatAgentMarkdownContentWithVulnerability>,
+		_response: IMarkdownString | ReadonlyArray<IMarkdownString | IChatResponseProgressFileTreeData | IChatContentInlineReference | IChatAgentMarkdownContentWithVulnerability | IChatResponseCodeblockUriPart>,
 		private _session: ChatModel,
 		private _agent: IChatAgentData | undefined,
 		private _slashCommand: IChatAgentCommand | undefined,
@@ -359,6 +460,7 @@ export class ChatResponseModel extends Disposable implements IChatResponseModel
 		private _isComplete: boolean = false,
 		private _isCanceled = false,
 		private _vote?: ChatAgentVoteDirection,
+		private _voteDownReason?: ChatAgentVoteDownReason,
 		private _result?: IChatAgentResult,
 		followups?: ReadonlyArray<IChatFollowup>
 	) {
@@ -368,7 +470,7 @@ export class ChatResponseModel extends Disposable implements IChatResponseModel
 		this._isStale = Array.isArray(_response) && (_response.length !== 0 || isMarkdownString(_response) && _response.value.length !== 0);
 
 		this._followups = followups ? [...followups] : undefined;
-		this._response = new Response(_response);
+		this._response = this._register(new Response(_response));
 		this._register(this._response.onDidChangeValue(() => this._onDidChange.fire()));
 		this.id = 'response_' + ChatResponseModel.nextId++;
 	}
@@ -392,6 +494,12 @@ export class ChatResponseModel extends Disposable implements IChatResponseModel
 		}
 	}
 
+	applyCodeCitation(progress: IChatCodeCitation) {
+		this._codeCitations.push(progress);
+		this._response.addCitation(progress);
+		this._onDidChange.fire();
+	}
+
 	setAgent(agent: IChatAgentData, slashCommand?: IChatAgentCommand) {
 		this._agent = agent;
 		this._slashCommand = slashCommand;
@@ -429,6 +537,11 @@ export class ChatResponseModel extends Disposable implements IChatResponseModel
 		this._onDidChange.fire();
 	}
 
+	setVoteDownReason(reason: ChatAgentVoteDownReason | undefined): void {
+		this._voteDownReason = reason;
+		this._onDidChange.fire();
+	}
+
 	setEditApplied(edit: IChatTextEditGroup, editCount: number): boolean {
 		if (!this.response.value.includes(edit)) {
 			return false;
@@ -454,7 +567,8 @@ export interface IChatModel {
 	readonly initState: ChatModelInitState;
 	readonly initialLocation: ChatAgentLocation;
 	readonly title: string;
-	readonly welcomeMessage: IChatWelcomeMessageModel | undefined;
+	readonly welcomeMessage: IChatWelcomeMessageContent | undefined;
+	readonly sampleQuestions: IChatFollowup[] | undefined;
 	readonly requestInProgress: boolean;
 	readonly inputPlaceholder?: string;
 	getRequests(): IChatRequestModel[];
@@ -480,14 +594,15 @@ export interface ISerializableChatRequestData {
 	followups: ReadonlyArray<IChatFollowup> | undefined;
 	isCanceled: boolean | undefined;
 	vote: ChatAgentVoteDirection | undefined;
+	voteDownReason?: ChatAgentVoteDownReason;
 	/** For backward compat: should be optional */
 	usedContext?: IChatUsedContext;
 	contentReferences?: ReadonlyArray<IChatContentReference>;
+	codeCitations?: ReadonlyArray<IChatCodeCitation>;
 }
 
 export interface IExportableChatData {
 	initialLocation: ChatAgentLocation | undefined;
-	welcomeMessage: (string | IChatFollowup[])[] | undefined;
 	requests: ISerializableChatRequestData[];
 	requesterUsername: string;
 	responderUsername: string;
@@ -495,10 +610,89 @@ export interface IExportableChatData {
 	responderAvatarIconUri: ThemeIcon | UriComponents | undefined; // Keeping Uri name for backcompat
 }
 
-export interface ISerializableChatData extends IExportableChatData {
+/*
+	NOTE: every time the serialized data format is updated, we need to create a new interface, because we may need to handle any old data format when parsing.
+*/
+
+export interface ISerializableChatData1 extends IExportableChatData {
 	sessionId: string;
 	creationDate: number;
 	isImported: boolean;
+
+	/** Indicates that this session was created in this window. Is cleared after the chat has been written to storage once. Needed to sync chat creations/deletions between empty windows. */
+	isNew?: boolean;
+}
+
+export interface ISerializableChatData2 extends ISerializableChatData1 {
+	version: 2;
+	lastMessageDate: number;
+	computedTitle: string | undefined;
+}
+
+export interface ISerializableChatData3 extends Omit<ISerializableChatData2, 'version' | 'computedTitle'> {
+	version: 3;
+	customTitle: string | undefined;
+}
+
+/**
+ * Chat data that has been parsed and normalized to the current format.
+ */
+export type ISerializableChatData = ISerializableChatData3;
+
+/**
+ * Chat data that has been loaded but not normalized, and could be any format
+ */
+export type ISerializableChatDataIn = ISerializableChatData1 | ISerializableChatData2 | ISerializableChatData3;
+
+/**
+ * Normalize chat data from storage to the current format.
+ * TODO- ChatModel#_deserialize and reviveSerializedAgent also still do some normalization and maybe that should be done in here too.
+ */
+export function normalizeSerializableChatData(raw: ISerializableChatDataIn): ISerializableChatData {
+	normalizeOldFields(raw);
+
+	if (!('version' in raw)) {
+		return {
+			version: 3,
+			...raw,
+			lastMessageDate: raw.creationDate,
+			customTitle: undefined,
+		};
+	}
+
+	if (raw.version === 2) {
+		return {
+			...raw,
+			version: 3,
+			customTitle: raw.computedTitle
+		};
+	}
+
+	return raw;
+}
+
+function normalizeOldFields(raw: ISerializableChatDataIn): void {
+	// Fill in fields that very old chat data may be missing
+	if (!raw.sessionId) {
+		raw.sessionId = generateUuid();
+	}
+
+	if (!raw.creationDate) {
+		raw.creationDate = getLastYearDate();
+	}
+
+	if ('version' in raw && (raw.version === 2 || raw.version === 3)) {
+		if (!raw.lastMessageDate) {
+			// A bug led to not porting creationDate properly, and that was copied to lastMessageDate, so fix that up if missing.
+			raw.lastMessageDate = getLastYearDate();
+		}
+	}
+}
+
+function getLastYearDate(): number {
+	const lastYearDate = new Date();
+	lastYearDate.setFullYear(lastYearDate.getFullYear() - 1);
+	return lastYearDate.getTime();
 }
 
 export function isExportableSessionData(obj: unknown): obj is IExportableChatData {
@@ -517,13 +711,24 @@ export function isSerializableSessionData(obj: unknown): obj is ISerializableCha
 		);
 }
 
-export type IChatChangeEvent = IChatAddRequestEvent | IChatAddResponseEvent | IChatInitEvent | IChatRemoveRequestEvent;
+export type IChatChangeEvent =
+	| IChatInitEvent
+	| IChatAddRequestEvent | IChatChangedRequestEvent | IChatRemoveRequestEvent
+	| IChatAddResponseEvent
+	| IChatSetAgentEvent
+	| IChatMoveEvent
+	;
 
 export interface IChatAddRequestEvent {
 	kind: 'addRequest';
 	request: IChatRequestModel;
 }
 
+export interface IChatChangedRequestEvent {
+	kind: 'changedRequest';
+	request: IChatRequestModel;
+}
+
 export interface IChatAddResponseEvent {
 	kind: 'addResponse';
 	response: IChatResponseModel;
@@ -553,6 +758,18 @@ export interface IChatRemoveRequestEvent {
 	reason: ChatRequestRemovalReason;
 }
 
+export interface IChatMoveEvent {
+	kind: 'move';
+	target: URI;
+	range: IRange;
+}
+
+export interface IChatSetAgentEvent {
+	kind: 'setAgent';
+	agent: IChatAgentData;
+	command?: IChatAgentCommand;
+}
+
 export interface IChatInitEvent {
 	kind: 'initialize';
 }
@@ -565,7 +782,7 @@ export enum ChatModelInitState {
 
 export class ChatModel extends Disposable implements IChatModel {
 	static getDefaultTitle(requests: (ISerializableChatRequestData | IChatRequestModel)[]): string {
-		const firstRequestMessage = firstOrDefault(requests)?.message ?? '';
+		const firstRequestMessage = requests.at(0)?.message ?? '';
 		const message = typeof firstRequestMessage === 'string' ?
 			firstRequestMessage :
 			firstRequestMessage.text;
@@ -582,11 +799,16 @@ export class ChatModel extends Disposable implements IChatModel {
 	private _initState: ChatModelInitState = ChatModelInitState.Created;
 	private _isInitializedDeferred = new DeferredPromise<void>();
 
-	private _welcomeMessage: ChatWelcomeMessageModel | undefined;
-	get welcomeMessage(): ChatWelcomeMessageModel | undefined {
+	private _welcomeMessage: IChatWelcomeMessageContent | undefined;
+	get welcomeMessage(): IChatWelcomeMessageContent | undefined {
 		return this._welcomeMessage;
 	}
 
+	private _sampleQuestions: IChatFollowup[] | undefined;
+	get sampleQuestions(): IChatFollowup[] | undefined {
+		return this._sampleQuestions;
+	}
+
 	// TODO to be clear, this is not the same as the id from the session object, which belongs to the provider.
 	// It's easier to be able to identify this model before its async initialization is complete
 	private _sessionId: string;
@@ -595,46 +817,51 @@ export class ChatModel extends Disposable implements IChatModel {
 	}
 
 	get requestInProgress(): boolean {
-		const lastRequest = this._requests[this._requests.length - 1];
-		return !!lastRequest && !!lastRequest.response && !lastRequest.response.isComplete;
+		const lastRequest = this.lastRequest;
+		return !!lastRequest?.response && !lastRequest.response.isComplete;
 	}
 
 	get hasRequests(): boolean {
 		return this._requests.length > 0;
 	}
 
+	get lastRequest(): ChatRequestModel | undefined {
+		return this._requests.at(-1);
+	}
+
 	private _creationDate: number;
 	get creationDate(): number {
 		return this._creationDate;
 	}
 
+	private _lastMessageDate: number;
+	get lastMessageDate(): number {
+		return this._lastMessageDate;
+	}
+
 	private get _defaultAgent() {
 		return this.chatAgentService.getDefaultAgent(ChatAgentLocation.Panel);
 	}
 
 	get requesterUsername(): string {
-		return (this._defaultAgent ?
-			this._defaultAgent.metadata.requester?.name :
-			this.initialData?.requesterUsername) ?? '';
+		return this._defaultAgent?.metadata.requester?.name ??
+			this.initialData?.requesterUsername ?? '';
 	}
 
 	get responderUsername(): string {
-		return (this._defaultAgent ?
-			this._defaultAgent.fullName :
-			this.initialData?.responderUsername) ?? '';
+		return this._defaultAgent?.fullName ??
+			this.initialData?.responderUsername ?? '';
 	}
 
 	private readonly _initialRequesterAvatarIconUri: URI | undefined;
 	get requesterAvatarIconUri(): URI | undefined {
-		return this._defaultAgent ?
-			this._defaultAgent.metadata.requester?.icon :
+		return this._defaultAgent?.metadata.requester?.icon ??
 			this._initialRequesterAvatarIconUri;
 	}
 
 	private readonly _initialResponderAvatarIconUri: ThemeIcon | URI | undefined;
 	get responderAvatarIcon(): ThemeIcon | URI | undefined {
-		return this._defaultAgent ?
-			this._defaultAgent?.metadata.themeIcon :
+		return this._defaultAgent?.metadata.themeIcon ??
 			this._initialResponderAvatarIconUri;
 	}
 
@@ -647,8 +874,13 @@ export class ChatModel extends Disposable implements IChatModel {
 		return this._isImported;
 	}
 
+	private _customTitle: string | undefined;
+	get customTitle(): string | undefined {
+		return this._customTitle;
+	}
+
 	get title(): string {
-		return ChatModel.getDefaultTitle(this._requests);
+		return this._customTitle || ChatModel.getDefaultTitle(this._requests);
 	}
 
 	get initialLocation() {
@@ -660,7 +892,6 @@ export class ChatModel extends Disposable implements IChatModel {
 		private readonly _initialLocation: ChatAgentLocation,
 		@ILogService private readonly logService: ILogService,
 		@IChatAgentService private readonly chatAgentService: IChatAgentService,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
 	) {
 		super();
 
@@ -668,6 +899,8 @@ export class ChatModel extends Disposable implements IChatModel {
 		this._sessionId = (isSerializableSessionData(initialData) && initialData.sessionId) || generateUuid();
 		this._requests = initialData ? this._deserialize(initialData) : [];
 		this._creationDate = (isSerializableSessionData(initialData) && initialData.creationDate) || Date.now();
+		this._lastMessageDate = (isSerializableSessionData(initialData) && initialData.lastMessageDate) || this._creationDate;
+		this._customTitle = isSerializableSessionData(initialData) ? initialData.customTitle : undefined;
 
 		this._initialRequesterAvatarIconUri = initialData?.requesterAvatarIconUri && URI.revive(initialData.requesterAvatarIconUri);
 		this._initialResponderAvatarIconUri = isUriComponents(initialData?.responderAvatarIconUri) ? URI.revive(initialData.responderAvatarIconUri) : initialData?.responderAvatarIconUri;
@@ -680,11 +913,6 @@ export class ChatModel extends Disposable implements IChatModel {
 			return [];
 		}
 
-		if (obj.welcomeMessage) {
-			const content = obj.welcomeMessage.map(item => typeof item === 'string' ? new MarkdownString(item) : item);
-			this._welcomeMessage = this.instantiationService.createInstance(ChatWelcomeMessageModel, content, []);
-		}
-
 		try {
 			return requests.map((raw: ISerializableChatRequestData) => {
 				const parsedRequest =
@@ -701,15 +929,15 @@ export class ChatModel extends Disposable implements IChatModel {
 
 					// Port entries from old format
 					const result = 'responseErrorDetails' in raw ?
+						// eslint-disable-next-line local/code-no-dangerous-type-assertions
 						{ errorDetails: raw.responseErrorDetails } as IChatAgentResult : raw.result;
-					request.response = new ChatResponseModel(raw.response ?? [new MarkdownString(raw.response)], this, agent, raw.slashCommand, request.id, true, raw.isCanceled, raw.vote, result, raw.followups);
+					request.response = new ChatResponseModel(raw.response ?? [new MarkdownString(raw.response)], this, agent, raw.slashCommand, request.id, true, raw.isCanceled, raw.vote, raw.voteDownReason, result, raw.followups);
 					if (raw.usedContext) { // @ulugbekna: if this's a new vscode sessions, doc versions are incorrect anyway?
 						request.response.applyReference(revive(raw.usedContext));
 					}
 
-					if (raw.contentReferences) {
-						raw.contentReferences.forEach(r => request.response!.applyReference(revive(r)));
-					}
+					raw.contentReferences?.forEach(r => request.response!.applyReference(revive(r)));
+					raw.codeCitations?.forEach(c => request.response!.applyCodeCitation(revive(c)));
 				}
 				return request;
 			});
@@ -725,7 +953,8 @@ export class ChatModel extends Disposable implements IChatModel {
 			{ variables: [] };
 
 		variableData.variables = variableData.variables.map<IChatRequestVariableEntry>((v): IChatRequestVariableEntry => {
-			if ('values' in v && Array.isArray(v.values)) {
+			// Old variables format
+			if (v && 'values' in v && Array.isArray(v.values)) {
 				return {
 					id: v.id ?? '',
 					name: v.name,
@@ -763,17 +992,15 @@ export class ChatModel extends Disposable implements IChatModel {
 		this._isInitializedDeferred = new DeferredPromise<void>();
 	}
 
-	initialize(welcomeMessage: ChatWelcomeMessageModel | undefined): void {
+	initialize(welcomeMessage?: IChatWelcomeMessageContent, sampleQuestions?: IChatFollowup[]): void {
 		if (this.initState !== ChatModelInitState.Initializing) {
 			// Must call startInitialize before initialize, and only call it once
 			throw new Error(`ChatModel is in the wrong state for initialize: ${ChatModelInitState[this.initState]}`);
 		}
 
 		this._initState = ChatModelInitState.Initialized;
-		if (!this._welcomeMessage) {
-			// Could also have loaded the welcome message from persisted data
-			this._welcomeMessage = welcomeMessage;
-		}
+		this._welcomeMessage = welcomeMessage;
+		this._sampleQuestions = sampleQuestions;
 
 		this._isInitializedDeferred.complete();
 		this._onDidChange.fire({ kind: 'initialize' });
@@ -797,17 +1024,26 @@ export class ChatModel extends Disposable implements IChatModel {
 		return this._requests;
 	}
 
-	addRequest(message: IParsedChatRequest, variableData: IChatRequestVariableData, attempt: number, chatAgent?: IChatAgentData, slashCommand?: IChatAgentCommand): ChatRequestModel {
-		const request = new ChatRequestModel(this, message, variableData, attempt);
+	addRequest(message: IParsedChatRequest, variableData: IChatRequestVariableData, attempt: number, chatAgent?: IChatAgentData, slashCommand?: IChatAgentCommand, confirmation?: string, locationData?: IChatLocationData, attachments?: IChatRequestVariableEntry[]): ChatRequestModel {
+		const request = new ChatRequestModel(this, message, variableData, attempt, confirmation, locationData, attachments);
 		request.response = new ChatResponseModel([], this, chatAgent, slashCommand, request.id);
 
 		this._requests.push(request);
+		this._lastMessageDate = Date.now();
 		this._onDidChange.fire({ kind: 'addRequest', request });
 		return request;
 	}
 
-	adoptRequest(request: ChatRequestModel): void {
+	setCustomTitle(title: string): void {
+		this._customTitle = title;
+	}
 
+	updateRequest(request: ChatRequestModel, variableData: IChatRequestVariableData) {
+		request.variableData = variableData;
+		this._onDidChange.fire({ kind: 'changedRequest', request });
+	}
+
+	adoptRequest(request: ChatRequestModel): void {
 		// this doesn't use `removeRequest` because it must not dispose the request object
 		const oldOwner = request.session;
 		const index = oldOwner._requests.findIndex(candidate => candidate.id === request.id);
@@ -838,13 +1074,15 @@ export class ChatModel extends Disposable implements IChatModel {
 		if (progress.kind === 'markdownContent' ||
 			progress.kind === 'treeData' ||
 			progress.kind === 'inlineReference' ||
+			progress.kind === 'codeblockUri' ||
 			progress.kind === 'markdownVuln' ||
 			progress.kind === 'progressMessage' ||
 			progress.kind === 'command' ||
 			progress.kind === 'textEdit' ||
 			progress.kind === 'warning' ||
 			progress.kind === 'progressTask' ||
-			progress.kind === 'confirmation'
+			progress.kind === 'confirmation' ||
+			progress.kind === 'toolInvocation'
 		) {
 			request.response.updateContent(progress, quiet);
 		} else if (progress.kind === 'usedContext' || progress.kind === 'reference') {
@@ -853,7 +1091,12 @@ export class ChatModel extends Disposable implements IChatModel {
 			const agent = this.chatAgentService.getAgent(progress.agentId);
 			if (agent) {
 				request.response.setAgent(agent, progress.command);
+				this._onDidChange.fire({ kind: 'setAgent', agent, command: progress.command });
 			}
+		} else if (progress.kind === 'codeCitation') {
+			request.response.applyCodeCitation(progress);
+		} else if (progress.kind === 'move') {
+			this._onDidChange.fire({ kind: 'move', target: progress.uri, range: progress.range });
 		} else {
 			this.logService.error(`Couldn't handle progress: ${JSON.stringify(progress)}`);
 		}
@@ -913,18 +1156,14 @@ export class ChatModel extends Disposable implements IChatModel {
 			responderUsername: this.responderUsername,
 			responderAvatarIconUri: this.responderAvatarIcon,
 			initialLocation: this.initialLocation,
-			welcomeMessage: this._welcomeMessage?.content.map(c => {
-				if (Array.isArray(c)) {
-					return c;
-				} else {
-					return c.value;
-				}
-			}),
 			requests: this._requests.map((r): ISerializableChatRequestData => {
 				const message = {
 					...r.message,
 					parts: r.message.parts.map(p => p && 'toJSON' in p ? (p.toJSON as Function)() : p)
 				};
+				const agent = r.response?.agent;
+				const agentJson = agent && 'toJSON' in agent ? (agent.toJSON as Function)() :
+					agent ? { ...agent } : undefined;
 				return {
 					message,
 					variableData: r.variableData,
@@ -944,10 +1183,12 @@ export class ChatModel extends Disposable implements IChatModel {
 					followups: r.response?.followups,
 					isCanceled: r.response?.isCanceled,
 					vote: r.response?.vote,
-					agent: r.response?.agent ? { ...r.response.agent } : undefined,
+					voteDownReason: r.response?.voteDownReason,
+					agent: agentJson,
 					slashCommand: r.response?.slashCommand,
 					usedContext: r.response?.usedContext,
-					contentReferences: r.response?.contentReferences
+					contentReferences: r.response?.contentReferences,
+					codeCitations: r.response?.codeCitations
 				};
 			}),
 		};
@@ -955,10 +1196,13 @@ export class ChatModel extends Disposable implements IChatModel {
 
 	toJSON(): ISerializableChatData {
 		return {
+			version: 3,
 			...this.toExport(),
 			sessionId: this.sessionId,
 			creationDate: this._creationDate,
-			isImported: this._isImported
+			isImported: this._isImported,
+			lastMessageDate: this._lastMessageDate,
+			customTitle: this._customTitle
 		};
 	}
 
@@ -970,71 +1214,6 @@ export class ChatModel extends Disposable implements IChatModel {
 	}
 }
 
-export type IChatWelcomeMessageContent = IMarkdownString | IChatFollowup[];
-
-export interface IChatWelcomeMessageModel {
-	readonly id: string;
-	readonly content: IChatWelcomeMessageContent[];
-	readonly sampleQuestions: IChatFollowup[];
-	readonly username: string;
-	readonly avatarIcon?: ThemeIcon;
-
-}
-
-export class ChatWelcomeMessageModel implements IChatWelcomeMessageModel {
-	private static nextId = 0;
-
-	private _id: string;
-	public get id(): string {
-		return this._id;
-	}
-
-	constructor(
-		public readonly content: IChatWelcomeMessageContent[],
-		public readonly sampleQuestions: IChatFollowup[],
-		@IChatAgentService private readonly chatAgentService: IChatAgentService,
-	) {
-		this._id = 'welcome_' + ChatWelcomeMessageModel.nextId++;
-	}
-
-	public get username(): string {
-		return this.chatAgentService.getContributedDefaultAgent(ChatAgentLocation.Panel)?.fullName ?? '';
-	}
-
-	public get avatarIcon(): ThemeIcon | undefined {
-		return this.chatAgentService.getDefaultAgent(ChatAgentLocation.Panel)?.metadata.themeIcon;
-	}
-}
-
-export function getHistoryEntriesFromModel(model: IChatModel, forAgentId: string | undefined): IChatAgentHistoryEntry[] {
-	const history: IChatAgentHistoryEntry[] = [];
-	for (const request of model.getRequests()) {
-		if (!request.response) {
-			continue;
-		}
-
-		if (forAgentId && forAgentId !== request.response.agent?.id) {
-			// An agent only gets to see requests that were sent to this agent.
-			// The default agent (the undefined case) gets to see all of them.
-			continue;
-		}
-
-		const promptTextResult = getPromptText(request.message);
-		const historyRequest: IChatAgentRequest = {
-			sessionId: model.sessionId,
-			requestId: request.id,
-			agentId: request.response.agent?.id ?? '',
-			message: promptTextResult.message,
-			command: request.response.slashCommand?.name,
-			variables: updateRanges(request.variableData, promptTextResult.diff), // TODO bit of a hack
-			location: ChatAgentLocation.Panel
-		};
-		history.push({ request: historyRequest, response: request.response.response.value, result: request.response.result ?? {} });
-	}
-
-	return history;
-}
-
 export function updateRanges(variableData: IChatRequestVariableData, diff: number): IChatRequestVariableData {
 	return {
 		variables: variableData.variables.map(v => ({
@@ -1076,3 +1255,15 @@ export function appendMarkdownString(md1: IMarkdownString, md2: IMarkdownString
 		baseUri: md1.baseUri
 	};
 }
+
+export function getCodeCitationsMessage(citations: ReadonlyArray<IChatCodeCitation>): string {
+	if (citations.length === 0) {
+		return '';
+	}
+
+	const licenseTypes = citations.reduce((set, c) => set.add(c.license), new Set<string>());
+	const label = licenseTypes.size === 1 ?
+		localize('codeCitation', "Similar code found with 1 license type", licenseTypes.size) :
+		localize('codeCitations', "Similar code found with {0} license types", licenseTypes.size);
+	return label;
+}
diff --git a/src/vs/workbench/contrib/chat/common/chatParserTypes.ts b/src/vs/workbench/contrib/chat/common/chatParserTypes.ts
index 66bc10c2061..340d97936f7 100644
--- a/src/vs/workbench/contrib/chat/common/chatParserTypes.ts
+++ b/src/vs/workbench/contrib/chat/common/chatParserTypes.ts
@@ -3,12 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { revive } from 'vs/base/common/marshalling';
-import { IOffsetRange, OffsetRange } from 'vs/editor/common/core/offsetRange';
-import { IRange } from 'vs/editor/common/core/range';
-import { IChatAgentCommand, IChatAgentData, reviveSerializedAgent } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { IChatSlashData } from 'vs/workbench/contrib/chat/common/chatSlashCommands';
-import { IChatRequestVariableValue } from 'vs/workbench/contrib/chat/common/chatVariables';
+import { revive } from '../../../../base/common/marshalling.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { IOffsetRange, OffsetRange } from '../../../../editor/common/core/offsetRange.js';
+import { IRange } from '../../../../editor/common/core/range.js';
+import { ChatAgentLocation, IChatAgentCommand, IChatAgentData, IChatAgentService, reviveSerializedAgent } from './chatAgents.js';
+import { IChatSlashData } from './chatSlashCommands.js';
+import { IChatRequestVariableValue } from './chatVariables.js';
+import { IToolData } from './languageModelToolsService.js';
 
 // These are in a separate file to avoid circular dependencies with the dependencies of the parser
 
@@ -66,6 +68,23 @@ export class ChatRequestVariablePart implements IParsedChatRequestPart {
 	}
 }
 
+/**
+ * An invocation of a tool
+ */
+export class ChatRequestToolPart implements IParsedChatRequestPart {
+	static readonly Kind = 'tool';
+	readonly kind = ChatRequestToolPart.Kind;
+	constructor(readonly range: OffsetRange, readonly editorRange: IRange, readonly toolName: string, readonly toolId: string, readonly displayName?: string, readonly icon?: IToolData['icon']) { }
+
+	get text(): string {
+		return `${chatVariableLeader}${this.toolName}`;
+	}
+
+	get promptText(): string {
+		return this.text;
+	}
+}
+
 /**
  * An invocation of an agent that can be resolved by the agent service
  */
@@ -123,7 +142,7 @@ export class ChatRequestSlashCommandPart implements IParsedChatRequestPart {
 export class ChatRequestDynamicVariablePart implements IParsedChatRequestPart {
 	static readonly Kind = 'dynamic';
 	readonly kind = ChatRequestDynamicVariablePart.Kind;
-	constructor(readonly range: OffsetRange, readonly editorRange: IRange, readonly text: string, readonly id: string, readonly modelDescription: string | undefined, readonly data: IChatRequestVariableValue) { }
+	constructor(readonly range: OffsetRange, readonly editorRange: IRange, readonly text: string, readonly id: string, readonly modelDescription: string | undefined, readonly data: IChatRequestVariableValue, readonly fullName?: string, readonly icon?: ThemeIcon) { }
 
 	get referenceText(): string {
 		return this.text.replace(chatVariableLeader, '');
@@ -150,7 +169,16 @@ export function reviveParsedChatRequest(serialized: IParsedChatRequest): IParsed
 					part.editorRange,
 					(part as ChatRequestVariablePart).variableName,
 					(part as ChatRequestVariablePart).variableArg,
-					(part as ChatRequestVariablePart).variableName || '',
+					(part as ChatRequestVariablePart).variableId || '',
+				);
+			} else if (part.kind === ChatRequestToolPart.Kind) {
+				return new ChatRequestToolPart(
+					new OffsetRange(part.range.start, part.range.endExclusive),
+					part.editorRange,
+					(part as ChatRequestToolPart).toolName,
+					(part as ChatRequestToolPart).toolId,
+					(part as ChatRequestToolPart).displayName,
+					(part as ChatRequestToolPart).icon,
 				);
 			} else if (part.kind === ChatRequestAgentPart.Kind) {
 				let agent = (part as ChatRequestAgentPart).agent;
@@ -180,7 +208,9 @@ export function reviveParsedChatRequest(serialized: IParsedChatRequest): IParsed
 					(part as ChatRequestDynamicVariablePart).text,
 					(part as ChatRequestDynamicVariablePart).id,
 					(part as ChatRequestDynamicVariablePart).modelDescription,
-					revive((part as ChatRequestDynamicVariablePart).data)
+					revive((part as ChatRequestDynamicVariablePart).data),
+					(part as ChatRequestDynamicVariablePart).fullName,
+					(part as ChatRequestDynamicVariablePart).icon
 				);
 			} else {
 				throw new Error(`Unknown chat request part: ${part.kind}`);
@@ -194,3 +224,20 @@ export function extractAgentAndCommand(parsed: IParsedChatRequest): { agentPart:
 	const commandPart = parsed.parts.find((r): r is ChatRequestAgentSubcommandPart => r instanceof ChatRequestAgentSubcommandPart);
 	return { agentPart, commandPart };
 }
+
+export function formatChatQuestion(chatAgentService: IChatAgentService, location: ChatAgentLocation, prompt: string, participant: string | null = null, command: string | null = null): string | undefined {
+	let question = '';
+	if (participant && participant !== chatAgentService.getDefaultAgent(location)?.id) {
+		const agent = chatAgentService.getAgent(participant);
+		if (!agent) {
+			// Refers to agent that doesn't exist
+			return undefined;
+		}
+
+		question += `${chatAgentLeader}${agent.name} `;
+		if (command) {
+			question += `${chatSubcommandLeader}${command} `;
+		}
+	}
+	return question + prompt;
+}
diff --git a/src/vs/workbench/contrib/chat/common/chatParticipantContribTypes.ts b/src/vs/workbench/contrib/chat/common/chatParticipantContribTypes.ts
index 638dce2633c..c2eea41c05c 100644
--- a/src/vs/workbench/contrib/chat/common/chatParticipantContribTypes.ts
+++ b/src/vs/workbench/contrib/chat/common/chatParticipantContribTypes.ts
@@ -10,9 +10,10 @@ export interface IRawChatCommandContribution {
 	isSticky?: boolean;
 	when?: string;
 	defaultImplicitVariables?: string[];
+	disambiguation?: { category: string; categoryName?: string /** Deprecated */; description: string; examples: string[] }[];
 }
 
-export type RawChatParticipantLocation = 'panel' | 'terminal' | 'notebook';
+export type RawChatParticipantLocation = 'panel' | 'terminal' | 'notebook' | 'editing-session';
 
 export interface IRawChatParticipantContribution {
 	id: string;
@@ -20,12 +21,15 @@ export interface IRawChatParticipantContribution {
 	fullName: string;
 	when?: string;
 	description?: string;
+	supportsModelPicker?: boolean;
 	isDefault?: boolean;
 	isSticky?: boolean;
 	sampleRequest?: string;
 	commands?: IRawChatCommandContribution[];
 	defaultImplicitVariables?: string[];
 	locations?: RawChatParticipantLocation[];
+	disambiguation?: { category: string; categoryName?: string /** Deprecated */; description: string; examples: string[] }[];
+	supportsToolReferences?: boolean;
 }
 
 /**
diff --git a/src/vs/workbench/contrib/chat/common/chatProgressTypes/chatToolInvocation.ts b/src/vs/workbench/contrib/chat/common/chatProgressTypes/chatToolInvocation.ts
new file mode 100644
index 00000000000..f57042cf8f3
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/chatProgressTypes/chatToolInvocation.ts
@@ -0,0 +1,70 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { DeferredPromise } from '../../../../../base/common/async.js';
+import { IChatToolInvocation, IChatToolInvocationSerialized } from '../chatService.js';
+import { IToolConfirmationMessages } from '../languageModelToolsService.js';
+
+export class ChatToolInvocation implements IChatToolInvocation {
+	public readonly kind: 'toolInvocation' = 'toolInvocation';
+
+	private _isComplete = false;
+	public get isComplete(): boolean {
+		return this._isComplete;
+	}
+
+	private _isCanceled: boolean | undefined;
+	public get isCanceled(): boolean | undefined {
+		return this._isCanceled;
+	}
+
+	private _confirmDeferred = new DeferredPromise<boolean>();
+	public get confirmed() {
+		return this._confirmDeferred;
+	}
+
+	private _isConfirmed: boolean | undefined;
+	public get isConfirmed(): boolean | undefined {
+		return this._isConfirmed;
+	}
+
+	constructor(
+		public readonly invocationMessage: string,
+		private _confirmationMessages: IToolConfirmationMessages | undefined) {
+		if (!_confirmationMessages) {
+			// No confirmation needed
+			this._isConfirmed = true;
+			this._confirmDeferred.complete(true);
+		}
+
+		this._confirmDeferred.p.then(confirmed => {
+			this._isConfirmed = confirmed;
+			this._confirmationMessages = undefined;
+			if (!confirmed) {
+				// Spinner -> check
+				this.complete();
+			}
+		});
+	}
+
+	complete(): void {
+		if (this._isComplete) {
+			throw new Error('Invocation is already complete.');
+		}
+		this._isComplete = true;
+	}
+
+	public get confirmationMessages(): IToolConfirmationMessages | undefined {
+		return this._confirmationMessages;
+	}
+
+	public toJSON(): IChatToolInvocationSerialized {
+		return {
+			kind: 'toolInvocationSerialized',
+			invocationMessage: this.invocationMessage,
+			isConfirmed: this._isConfirmed ?? false
+		};
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/common/chatRequestParser.ts b/src/vs/workbench/contrib/chat/common/chatRequestParser.ts
index 73276b9464d..1cbf2e81622 100644
--- a/src/vs/workbench/contrib/chat/common/chatRequestParser.ts
+++ b/src/vs/workbench/contrib/chat/common/chatRequestParser.ts
@@ -3,13 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { OffsetRange } from 'vs/editor/common/core/offsetRange';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { ChatAgentLocation, IChatAgentData, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestDynamicVariablePart, ChatRequestSlashCommandPart, ChatRequestTextPart, ChatRequestVariablePart, IParsedChatRequest, IParsedChatRequestPart, chatAgentLeader, chatSubcommandLeader, chatVariableLeader } from 'vs/workbench/contrib/chat/common/chatParserTypes';
-import { IChatSlashCommandService } from 'vs/workbench/contrib/chat/common/chatSlashCommands';
-import { IChatVariablesService, IDynamicVariable } from 'vs/workbench/contrib/chat/common/chatVariables';
+import { OffsetRange } from '../../../../editor/common/core/offsetRange.js';
+import { IPosition, Position } from '../../../../editor/common/core/position.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { ChatAgentLocation, IChatAgentData, IChatAgentService } from './chatAgents.js';
+import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestDynamicVariablePart, ChatRequestSlashCommandPart, ChatRequestTextPart, ChatRequestToolPart, ChatRequestVariablePart, IParsedChatRequest, IParsedChatRequestPart, chatAgentLeader, chatSubcommandLeader, chatVariableLeader } from './chatParserTypes.js';
+import { IChatSlashCommandService } from './chatSlashCommands.js';
+import { IChatVariablesService, IDynamicVariable } from './chatVariables.js';
+import { ILanguageModelToolsService } from './languageModelToolsService.js';
 
 const agentReg = /^@([\w_\-\.]+)(?=(\s|$|\b))/i; // An @-agent
 const variableReg = /^#([\w_\-]+)(:\d+)?(?=(\s|$|\b))/i; // A #-variable with an optional numeric : arg (@response:2)
@@ -24,7 +25,8 @@ export class ChatRequestParser {
 	constructor(
 		@IChatAgentService private readonly agentService: IChatAgentService,
 		@IChatVariablesService private readonly variableService: IChatVariablesService,
-		@IChatSlashCommandService private readonly slashCommandService: IChatSlashCommandService
+		@IChatSlashCommandService private readonly slashCommandService: IChatSlashCommandService,
+		@ILanguageModelToolsService private readonly toolsService: ILanguageModelToolsService,
 	) { }
 
 	parseChatRequest(sessionId: string, message: string, location: ChatAgentLocation = ChatAgentLocation.Panel, context?: IChatParserContext): IParsedChatRequest {
@@ -43,7 +45,7 @@ export class ChatRequestParser {
 				} else if (char === chatAgentLeader) {
 					newPart = this.tryToParseAgent(message.slice(i), message, i, new Position(lineNumber, column), parts, location, context);
 				} else if (char === chatSubcommandLeader) {
-					newPart = this.tryToParseSlashCommand(message.slice(i), message, i, new Position(lineNumber, column), parts);
+					newPart = this.tryToParseSlashCommand(message.slice(i), message, i, new Position(lineNumber, column), parts, location);
 				}
 
 				if (!newPart) {
@@ -90,7 +92,7 @@ export class ChatRequestParser {
 		};
 	}
 
-	private tryToParseAgent(message: string, fullMessage: string, offset: number, position: IPosition, parts: ReadonlyArray<IParsedChatRequestPart>, location: ChatAgentLocation, context: IChatParserContext | undefined): ChatRequestAgentPart | ChatRequestVariablePart | undefined {
+	private tryToParseAgent(message: string, fullMessage: string, offset: number, position: IPosition, parts: Array<IParsedChatRequestPart>, location: ChatAgentLocation, context: IChatParserContext | undefined): ChatRequestAgentPart | ChatRequestVariablePart | undefined {
 		const nextAgentMatch = message.match(agentReg);
 		if (!nextAgentMatch) {
 			return;
@@ -109,11 +111,11 @@ export class ChatRequestParser {
 		}
 
 		// If there is more than one agent with this name, and the user picked it from the suggest widget, then the selected agent should be in the
-		// context and we use that one. Otherwise just pick the first.
+		// context and we use that one.
 		const agent = agents.length > 1 && context?.selectedAgent ?
 			context.selectedAgent :
-			agents[0];
-		if (!agent || !agent.locations.includes(location)) {
+			agents.find((a) => a.locations.includes(location));
+		if (!agent) {
 			return;
 		}
 
@@ -137,7 +139,7 @@ export class ChatRequestParser {
 		return new ChatRequestAgentPart(agentRange, agentEditorRange, agent);
 	}
 
-	private tryToParseVariable(message: string, offset: number, position: IPosition, parts: ReadonlyArray<IParsedChatRequestPart>): ChatRequestAgentPart | ChatRequestVariablePart | undefined {
+	private tryToParseVariable(message: string, offset: number, position: IPosition, parts: ReadonlyArray<IParsedChatRequestPart>): ChatRequestAgentPart | ChatRequestVariablePart | ChatRequestToolPart | undefined {
 		const nextVariableMatch = message.match(variableReg);
 		if (!nextVariableMatch) {
 			return;
@@ -156,10 +158,15 @@ export class ChatRequestParser {
 			return new ChatRequestVariablePart(varRange, varEditorRange, name, variableArg, variable.id);
 		}
 
+		const tool = this.toolsService.getToolByName(name);
+		if (tool && tool.canBeInvokedManually && (!usedAgent || usedAgent.agent.supportsToolReferences)) {
+			return new ChatRequestToolPart(varRange, varEditorRange, name, tool.id, tool.displayName, tool.icon);
+		}
+
 		return;
 	}
 
-	private tryToParseSlashCommand(remainingMessage: string, fullMessage: string, offset: number, position: IPosition, parts: ReadonlyArray<IParsedChatRequestPart>): ChatRequestSlashCommandPart | ChatRequestAgentSubcommandPart | undefined {
+	private tryToParseSlashCommand(remainingMessage: string, fullMessage: string, offset: number, position: IPosition, parts: ReadonlyArray<IParsedChatRequestPart>, location: ChatAgentLocation): ChatRequestSlashCommandPart | ChatRequestAgentSubcommandPart | undefined {
 		const nextSlashMatch = remainingMessage.match(slashReg);
 		if (!nextSlashMatch) {
 			return;
@@ -194,11 +201,19 @@ export class ChatRequestParser {
 				return new ChatRequestAgentSubcommandPart(slashRange, slashEditorRange, subCommand);
 			}
 		} else {
-			const slashCommands = this.slashCommandService.getCommands();
+			const slashCommands = this.slashCommandService.getCommands(location);
 			const slashCommand = slashCommands.find(c => c.command === command);
 			if (slashCommand) {
 				// Valid standalone slash command
 				return new ChatRequestSlashCommandPart(slashRange, slashEditorRange, slashCommand);
+			} else {
+				// check for with default agent for this location
+				const defaultAgent = this.agentService.getDefaultAgent(location);
+				const subCommand = defaultAgent?.slashCommands.find(c => c.name === command);
+				if (subCommand) {
+					// Valid default agent subcommand
+					return new ChatRequestAgentSubcommandPart(slashRange, slashEditorRange, subCommand);
+				}
 			}
 		}
 
@@ -213,7 +228,7 @@ export class ChatRequestParser {
 			const length = refAtThisPosition.range.endColumn - refAtThisPosition.range.startColumn;
 			const text = message.substring(0, length);
 			const range = new OffsetRange(offset, offset + length);
-			return new ChatRequestDynamicVariablePart(range, refAtThisPosition.range, text, refAtThisPosition.id, refAtThisPosition.modelDescription, refAtThisPosition.data);
+			return new ChatRequestDynamicVariablePart(range, refAtThisPosition.range, text, refAtThisPosition.id, refAtThisPosition.modelDescription, refAtThisPosition.data, refAtThisPosition.fullName, refAtThisPosition.icon);
 		}
 
 		return;
diff --git a/src/vs/workbench/contrib/chat/common/chatService.ts b/src/vs/workbench/contrib/chat/common/chatService.ts
index a6921314d18..cb48ff20b72 100644
--- a/src/vs/workbench/contrib/chat/common/chatService.ts
+++ b/src/vs/workbench/contrib/chat/common/chatService.ts
@@ -3,21 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DeferredPromise } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Event } from 'vs/base/common/event';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { URI } from 'vs/base/common/uri';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { Command, Location, TextEdit } from 'vs/editor/common/languages';
-import { FileType } from 'vs/platform/files/common/files';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ChatAgentLocation, IChatAgentCommand, IChatAgentData, IChatAgentResult } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { ChatModel, IChatModel, IChatRequestModel, IChatRequestVariableData, IChatRequestVariableEntry, IChatResponseModel, IExportableChatData, ISerializableChatData } from 'vs/workbench/contrib/chat/common/chatModel';
-import { IParsedChatRequest } from 'vs/workbench/contrib/chat/common/chatParserTypes';
-import { IChatParserContext } from 'vs/workbench/contrib/chat/common/chatRequestParser';
-import { IChatRequestVariableValue } from 'vs/workbench/contrib/chat/common/chatVariables';
+import { DeferredPromise } from '../../../../base/common/async.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Event } from '../../../../base/common/event.js';
+import { IMarkdownString } from '../../../../base/common/htmlContent.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IRange, Range } from '../../../../editor/common/core/range.js';
+import { ISelection } from '../../../../editor/common/core/selection.js';
+import { Command, Location, TextEdit } from '../../../../editor/common/languages.js';
+import { FileType } from '../../../../platform/files/common/files.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IWorkspaceSymbol } from '../../search/common/search.js';
+import { ChatAgentLocation, IChatAgentCommand, IChatAgentData, IChatAgentResult } from './chatAgents.js';
+import { ChatModel, IChatModel, IChatRequestModel, IChatRequestVariableData, IChatRequestVariableEntry, IChatResponseModel, IExportableChatData, ISerializableChatData } from './chatModel.js';
+import { IParsedChatRequest } from './chatParserTypes.js';
+import { IChatParserContext } from './chatRequestParser.js';
+import { IChatRequestVariableValue } from './chatVariables.js';
+import { IToolConfirmationMessages } from './languageModelToolsService.js';
 
 export interface IChatRequest {
 	message: string;
@@ -74,14 +77,28 @@ export interface IChatContentVariableReference {
 	value?: URI | Location;
 }
 
+export enum ChatResponseReferencePartStatusKind {
+	Complete = 1,
+	Partial = 2,
+	Omitted = 3
+}
+
 export interface IChatContentReference {
-	reference: URI | Location | IChatContentVariableReference;
+	reference: URI | Location | IChatContentVariableReference | string;
 	iconPath?: ThemeIcon | { light: URI; dark?: URI };
+	options?: { status?: { description: string; kind: ChatResponseReferencePartStatusKind } };
 	kind: 'reference';
 }
 
+export interface IChatCodeCitation {
+	value: URI;
+	license: string;
+	snippet: string;
+	kind: 'codeCitation';
+}
+
 export interface IChatContentInlineReference {
-	inlineReference: URI | Location;
+	inlineReference: URI | Location | IWorkspaceSymbol;
 	name?: string;
 	kind: 'inlineReference';
 }
@@ -138,6 +155,11 @@ export interface IChatAgentVulnerabilityDetails {
 	description: string;
 }
 
+export interface IChatResponseCodeblockUriPart {
+	kind: 'codeblockUri';
+	uri: URI;
+}
+
 export interface IChatAgentMarkdownContentWithVulnerability {
 	content: IMarkdownString;
 	vulnerabilities: IChatAgentVulnerabilityDetails[];
@@ -149,6 +171,12 @@ export interface IChatCommandButton {
 	kind: 'command';
 }
 
+export interface IChatMoveMessage {
+	uri: URI;
+	range: IRange;
+	kind: 'move';
+}
+
 export interface IChatTextEdit {
 	uri: URI;
 	edits: TextEdit[];
@@ -159,10 +187,32 @@ export interface IChatConfirmation {
 	title: string;
 	message: string;
 	data: any;
+	buttons?: string[];
 	isUsed?: boolean;
 	kind: 'confirmation';
 }
 
+export interface IChatToolInvocation {
+	/** Presence of this property says that confirmation is required */
+	confirmationMessages?: IToolConfirmationMessages;
+	confirmed: DeferredPromise<boolean>;
+	/** A 3-way: undefined=don't know yet. */
+	isConfirmed: boolean | undefined;
+	invocationMessage: string;
+
+	complete(): void;
+	kind: 'toolInvocation';
+}
+
+/**
+ * This is a IChatToolInvocation that has been serialized, like after window reload, so it is no longer an active tool invocation.
+ */
+export interface IChatToolInvocationSerialized {
+	invocationMessage: string;
+	isConfirmed: boolean;
+	kind: 'toolInvocationSerialized';
+}
+
 export type IChatProgress =
 	| IChatMarkdownContent
 	| IChatAgentMarkdownContentWithVulnerability
@@ -170,6 +220,7 @@ export type IChatProgress =
 	| IChatUsedContext
 	| IChatContentReference
 	| IChatContentInlineReference
+	| IChatCodeCitation
 	| IChatAgentDetection
 	| IChatProgressMessage
 	| IChatTask
@@ -177,7 +228,11 @@ export type IChatProgress =
 	| IChatCommandButton
 	| IChatWarningMessage
 	| IChatTextEdit
-	| IChatConfirmation;
+	| IChatMoveMessage
+	| IChatResponseCodeblockUriPart
+	| IChatConfirmation
+	| IChatToolInvocation
+	| IChatToolInvocationSerialized;
 
 export interface IChatFollowup {
 	kind: 'reply';
@@ -193,10 +248,22 @@ export enum ChatAgentVoteDirection {
 	Up = 1
 }
 
+export enum ChatAgentVoteDownReason {
+	IncorrectCode = 'incorrectCode',
+	DidNotFollowInstructions = 'didNotFollowInstructions',
+	IncompleteCode = 'incompleteCode',
+	MissingContext = 'missingContext',
+	PoorlyWrittenOrFormatted = 'poorlyWrittenOrFormatted',
+	RefusedAValidRequest = 'refusedAValidRequest',
+	OffensiveOrUnsafe = 'offensiveOrUnsafe',
+	Other = 'other',
+	WillReportIssue = 'willReportIssue'
+}
+
 export interface IChatVoteAction {
 	kind: 'vote';
 	direction: ChatAgentVoteDirection;
-	reportIssue?: boolean;
+	reason: ChatAgentVoteDownReason | undefined;
 }
 
 export enum ChatCopyKind {
@@ -221,6 +288,16 @@ export interface IChatInsertAction {
 	newFile?: boolean;
 }
 
+export interface IChatApplyAction {
+	kind: 'apply';
+	codeBlockIndex: number;
+	totalCharacters: number;
+	newFile?: boolean;
+	codeMapper?: string;
+	editsProposed: boolean;
+}
+
+
 export interface IChatTerminalAction {
 	kind: 'runInTerminal';
 	codeBlockIndex: number;
@@ -246,11 +323,12 @@ export interface IChatInlineChatCodeAction {
 	action: 'accepted' | 'discarded';
 }
 
-export type ChatUserAction = IChatVoteAction | IChatCopyAction | IChatInsertAction | IChatTerminalAction | IChatCommandAction | IChatFollowupAction | IChatBugReportAction | IChatInlineChatCodeAction;
+export type ChatUserAction = IChatVoteAction | IChatCopyAction | IChatInsertAction | IChatApplyAction | IChatTerminalAction | IChatCommandAction | IChatFollowupAction | IChatBugReportAction | IChatInlineChatCodeAction;
 
 export interface IChatUserActionEvent {
 	action: ChatUserAction;
 	agentId: string | undefined;
+	command: string | undefined;
 	sessionId: string;
 	requestId: string;
 	result: IChatAgentResult | undefined;
@@ -277,6 +355,8 @@ export interface IChatCompleteResponse {
 export interface IChatDetail {
 	sessionId: string;
 	title: string;
+	lastMessageDate: number;
+	isActive: boolean;
 }
 
 export interface IChatProviderInfo {
@@ -298,8 +378,29 @@ export interface IChatSendRequestData extends IChatSendRequestResponseState {
 	slashCommand?: IChatAgentCommand;
 }
 
+export interface IChatEditorLocationData {
+	type: ChatAgentLocation.Editor;
+	document: URI;
+	selection: ISelection;
+	wholeRange: IRange;
+}
+
+export interface IChatNotebookLocationData {
+	type: ChatAgentLocation.Notebook;
+	sessionInputUri: URI;
+}
+
+export interface IChatTerminalLocationData {
+	type: ChatAgentLocation.Terminal;
+	// TBD
+}
+
+export type IChatLocationData = IChatEditorLocationData | IChatNotebookLocationData | IChatTerminalLocationData;
+
 export interface IChatSendRequestOptions {
+	userSelectedModelId?: string;
 	location?: ChatAgentLocation;
+	locationData?: IChatLocationData;
 	parserContext?: IChatParserContext;
 	attempt?: number;
 	noCommandDetection?: boolean;
@@ -310,6 +411,11 @@ export interface IChatSendRequestOptions {
 	/** The target agent ID can be specified with this property instead of using @ in 'message' */
 	agentId?: string;
 	slashCommand?: string;
+
+	/**
+	 * The label of the confirmation action that was selected.
+	 */
+	confirmation?: string;
 }
 
 export const IChatService = createDecorator<IChatService>('IChatService');
@@ -337,6 +443,7 @@ export interface IChatService {
 	clearSession(sessionId: string): void;
 	addCompleteRequest(sessionId: string, message: IParsedChatRequest | string, variableData: IChatRequestVariableData | undefined, attempt: number | undefined, response: IChatCompleteResponse): void;
 	getHistory(): IChatDetail[];
+	setChatSessionTitle(sessionId: string, title: string): void;
 	clearAllHistoryEntries(): void;
 	removeHistoryEntry(sessionId: string): void;
 
diff --git a/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts b/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
index af21078bacd..6bbc96cd055 100644
--- a/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
+++ b/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
@@ -3,35 +3,37 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { coalesce } from 'vs/base/common/arrays';
-import { DeferredPromise } from 'vs/base/common/async';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { ErrorNoTelemetry } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { Iterable } from 'vs/base/common/iterator';
-import { Disposable, DisposableMap } from 'vs/base/common/lifecycle';
-import { revive } from 'vs/base/common/marshalling';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { Progress } from 'vs/platform/progress/common/progress';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { ChatAgentLocation, IChatAgent, IChatAgentRequest, IChatAgentResult, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { ChatModel, ChatRequestModel, ChatRequestRemovalReason, ChatWelcomeMessageModel, IChatModel, IChatRequestModel, IChatRequestVariableData, IChatRequestVariableEntry, IChatResponseModel, IExportableChatData, ISerializableChatData, ISerializableChatsData, getHistoryEntriesFromModel, updateRanges } from 'vs/workbench/contrib/chat/common/chatModel';
-import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, IParsedChatRequest, chatAgentLeader, chatSubcommandLeader, getPromptText } from 'vs/workbench/contrib/chat/common/chatParserTypes';
-import { ChatRequestParser } from 'vs/workbench/contrib/chat/common/chatRequestParser';
-import { ChatCopyKind, IChatCompleteResponse, IChatDetail, IChatFollowup, IChatProgress, IChatSendRequestData, IChatSendRequestOptions, IChatSendRequestResponseState, IChatService, IChatTransferredSessionData, IChatUserActionEvent, ChatAgentVoteDirection } from 'vs/workbench/contrib/chat/common/chatService';
-import { IChatSlashCommandService } from 'vs/workbench/contrib/chat/common/chatSlashCommands';
-import { IChatVariablesService } from 'vs/workbench/contrib/chat/common/chatVariables';
-import { ChatMessageRole, IChatMessage } from 'vs/workbench/contrib/chat/common/languageModels';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { DeferredPromise } from '../../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { toErrorMessage } from '../../../../base/common/errorMessage.js';
+import { ErrorNoTelemetry } from '../../../../base/common/errors.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { Disposable, DisposableMap, IDisposable } from '../../../../base/common/lifecycle.js';
+import { revive } from '../../../../base/common/marshalling.js';
+import { StopWatch } from '../../../../base/common/stopwatch.js';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
+import { localize } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { Progress } from '../../../../platform/progress/common/progress.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { IWorkbenchAssignmentService } from '../../../services/assignment/common/assignmentService.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { ChatAgentLocation, IChatAgent, IChatAgentCommand, IChatAgentData, IChatAgentHistoryEntry, IChatAgentRequest, IChatAgentResult, IChatAgentService } from './chatAgents.js';
+import { ChatModel, ChatRequestModel, ChatRequestRemovalReason, IChatModel, IChatRequestModel, IChatRequestVariableData, IChatResponseModel, IExportableChatData, ISerializableChatData, ISerializableChatDataIn, ISerializableChatsData, normalizeSerializableChatData, toChatHistoryContent, updateRanges } from './chatModel.js';
+import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, IParsedChatRequest, chatAgentLeader, chatSubcommandLeader, getPromptText } from './chatParserTypes.js';
+import { ChatRequestParser } from './chatRequestParser.js';
+import { IChatCompleteResponse, IChatDetail, IChatFollowup, IChatProgress, IChatSendRequestData, IChatSendRequestOptions, IChatSendRequestResponseState, IChatService, IChatTransferredSessionData, IChatUserActionEvent } from './chatService.js';
+import { ChatServiceTelemetry } from './chatServiceTelemetry.js';
+import { IChatSlashCommandService } from './chatSlashCommands.js';
+import { IChatVariablesService } from './chatVariables.js';
+import { ChatMessageRole, IChatMessage } from './languageModels.js';
 
 const serializedChatKey = 'interactive.sessions';
 
@@ -51,8 +53,13 @@ type ChatProviderInvokedEvent = {
 	requestType: 'string' | 'followup' | 'slashCommand';
 	chatSessionId: string;
 	agent: string;
+	agentExtensionId: string | undefined;
 	slashCommand: string | undefined;
 	location: ChatAgentLocation;
+	citations: number;
+	numCodeBlocks: number;
+	isParticipantDetected: boolean;
+	enableCommandDetection: boolean;
 };
 
 type ChatProviderInvokedClassification = {
@@ -62,79 +69,43 @@ type ChatProviderInvokedClassification = {
 	requestType: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The type of request that the user made.' };
 	chatSessionId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'A random ID for the session.' };
 	agent: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The type of agent used.' };
+	agentExtensionId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The extension that contributed the agent.' };
 	slashCommand?: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The type of slashCommand used.' };
-	location?: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The location at which chat request was made.' };
+	location: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The location at which chat request was made.' };
+	citations: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The number of public code citations that were returned with the response.' };
+	numCodeBlocks: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The number of code blocks in the response.' };
+	isParticipantDetected: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the participant was automatically detected.' };
+	enableCommandDetection: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether participation detection was disabled for this invocation.' };
 	owner: 'roblourens';
 	comment: 'Provides insight into the performance of Chat agents.';
 };
 
-type ChatVoteEvent = {
-	direction: 'up' | 'down';
-	agentId: string;
-};
-
-type ChatVoteClassification = {
-	direction: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the user voted up or down.' };
-	agentId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The ID of the chat agent that this vote is for.' };
-	owner: 'roblourens';
-	comment: 'Provides insight into the performance of Chat agents.';
-};
-
-type ChatCopyEvent = {
-	copyKind: 'action' | 'toolbar';
-	agentId: string;
-};
-
-type ChatCopyClassification = {
-	copyKind: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'How the copy was initiated.' };
-	agentId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The ID of the chat agent that the copy acted on.' };
-	owner: 'roblourens';
-	comment: 'Provides insight into the usage of Chat features.';
-};
-
-type ChatInsertEvent = {
-	newFile: boolean;
-	agentId: string;
-};
-
-type ChatInsertClassification = {
-	newFile: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the code was inserted into a new untitled file.' };
-	agentId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The ID of the chat agent that this insertion is for.' };
-	owner: 'roblourens';
-	comment: 'Provides insight into the usage of Chat features.';
-};
-
-type ChatCommandEvent = {
-	commandId: string;
-	agentId: string;
-};
-
-type ChatCommandClassification = {
-	commandId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The id of the command that was executed.' };
-	agentId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The ID of the related chat agent.' };
-	owner: 'roblourens';
-	comment: 'Provides insight into the usage of Chat features.';
-};
-
-type ChatTerminalEvent = {
-	languageId: string;
-};
-
-type ChatTerminalClassification = {
-	languageId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The language of the code that was run in the terminal.' };
-	owner: 'roblourens';
-	comment: 'Provides insight into the usage of Chat features.';
-};
-
 const maxPersistedSessions = 25;
 
+class CancellableRequest implements IDisposable {
+	constructor(
+		public readonly cancellationTokenSource: CancellationTokenSource,
+		public requestId?: string | undefined
+	) { }
+
+	dispose() {
+		this.cancellationTokenSource.dispose();
+	}
+
+	cancel() {
+		this.cancellationTokenSource.cancel();
+	}
+}
+
 export class ChatService extends Disposable implements IChatService {
 	declare _serviceBrand: undefined;
 
 	private readonly _sessionModels = this._register(new DisposableMap<string, ChatModel>());
-	private readonly _pendingRequests = this._register(new DisposableMap<string, CancellationTokenSource>());
+	private readonly _pendingRequests = this._register(new DisposableMap<string, CancellableRequest>());
 	private _persistedSessions: ISerializableChatsData;
 
+	/** Just for empty windows, need to enforce that a chat was deleted, even though other windows still have it */
+	private _deletedChatIds = new Set<string>();
 
 	private _transferredSessionData: IChatTransferredSessionData | undefined;
 	public get transferredSessionData(): IChatTransferredSessionData | undefined {
@@ -148,6 +119,7 @@ export class ChatService extends Disposable implements IChatService {
 	public readonly onDidDisposeSession = this._onDidDisposeSession.event;
 
 	private readonly _sessionFollowupCancelTokens = this._register(new DisposableMap<string, CancellationTokenSource>());
+	private readonly _chatServiceTelemetry: ChatServiceTelemetry;
 
 	constructor(
 		@IStorageService private readonly storageService: IStorageService,
@@ -159,10 +131,15 @@ export class ChatService extends Disposable implements IChatService {
 		@IChatSlashCommandService private readonly chatSlashCommandService: IChatSlashCommandService,
 		@IChatVariablesService private readonly chatVariablesService: IChatVariablesService,
 		@IChatAgentService private readonly chatAgentService: IChatAgentService,
+		@IWorkbenchAssignmentService workbenchAssignmentService: IWorkbenchAssignmentService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IConfigurationService private readonly configurationService: IConfigurationService
 	) {
 		super();
 
-		const sessionData = storageService.get(serializedChatKey, StorageScope.WORKSPACE, '');
+		this._chatServiceTelemetry = this.instantiationService.createInstance(ChatServiceTelemetry);
+		const isEmptyWindow = !workspaceContextService.getWorkspace().folders.length;
+		const sessionData = storageService.get(serializedChatKey, isEmptyWindow ? StorageScope.APPLICATION : StorageScope.WORKSPACE, '');
 		if (sessionData) {
 			this._persistedSessions = this.deserializeChats(sessionData);
 			const countsForLog = Object.keys(this._persistedSessions).length;
@@ -189,59 +166,103 @@ export class ChatService extends Disposable implements IChatService {
 	}
 
 	private saveState(): void {
-		let allSessions: (ChatModel | ISerializableChatData)[] = Array.from(this._sessionModels.values())
+		const liveChats = Array.from(this._sessionModels.values())
 			.filter(session => session.initialLocation === ChatAgentLocation.Panel)
 			.filter(session => session.getRequests().length > 0);
-		allSessions = allSessions.concat(
-			Object.values(this._persistedSessions)
-				.filter(session => !this._sessionModels.has(session.sessionId))
-				.filter(session => session.requests.length));
-		allSessions.sort((a, b) => (b.creationDate ?? 0) - (a.creationDate ?? 0));
-		allSessions = allSessions.slice(0, maxPersistedSessions);
-		if (allSessions.length) {
-			this.trace('onWillSaveState', `Persisting ${allSessions.length} sessions`);
+
+		const isEmptyWindow = !this.workspaceContextService.getWorkspace().folders.length;
+		if (isEmptyWindow) {
+			this.syncEmptyWindowChats(liveChats);
+		} else {
+			let allSessions: (ChatModel | ISerializableChatData)[] = liveChats;
+			allSessions = allSessions.concat(
+				Object.values(this._persistedSessions)
+					.filter(session => !this._sessionModels.has(session.sessionId))
+					.filter(session => session.requests.length));
+			allSessions.sort((a, b) => (b.creationDate ?? 0) - (a.creationDate ?? 0));
+			allSessions = allSessions.slice(0, maxPersistedSessions);
+			if (allSessions.length) {
+				this.trace('onWillSaveState', `Persisting ${allSessions.length} sessions`);
+			}
+
+			const serialized = JSON.stringify(allSessions);
+
+			if (allSessions.length) {
+				this.trace('onWillSaveState', `Persisting ${serialized.length} chars`);
+			}
+
+			this.storageService.store(serializedChatKey, serialized, StorageScope.WORKSPACE, StorageTarget.MACHINE);
 		}
 
-		const serialized = JSON.stringify(allSessions);
+		this._deletedChatIds.clear();
+	}
 
-		if (allSessions.length) {
-			this.trace('onWillSaveState', `Persisting ${serialized.length} chars`);
+	private syncEmptyWindowChats(thisWindowChats: ChatModel[]): void {
+		// Note- an unavoidable race condition exists here. If there are multiple empty windows open, and the user quits the application, then the focused
+		// window may lose active chats, because all windows are reading and writing to storageService at the same time. This can't be fixed without some
+		// kind of locking, but in reality, the focused window will likely have run `saveState` at some point, like on a window focus change, and it will
+		// generally be fine.
+		const sessionData = this.storageService.get(serializedChatKey, StorageScope.APPLICATION, '');
+
+		const originalPersistedSessions = this._persistedSessions;
+		let persistedSessions: ISerializableChatsData;
+		if (sessionData) {
+			persistedSessions = this.deserializeChats(sessionData);
+			const countsForLog = Object.keys(persistedSessions).length;
+			if (countsForLog > 0) {
+				this.trace('constructor', `Restored ${countsForLog} persisted sessions`);
+			}
+		} else {
+			persistedSessions = {};
 		}
 
-		this.storageService.store(serializedChatKey, serialized, StorageScope.WORKSPACE, StorageTarget.MACHINE);
+		this._deletedChatIds.forEach(id => delete persistedSessions[id]);
+
+		// Has the chat in this window been updated, and then closed? Overwrite the old persisted chats.
+		Object.values(originalPersistedSessions).forEach(session => {
+			const persistedSession = persistedSessions[session.sessionId];
+			if (persistedSession && session.requests.length > persistedSession.requests.length) {
+				// We will add a 'modified date' at some point, but comparing the number of requests is good enough
+				persistedSessions[session.sessionId] = session;
+			} else if (!persistedSession && session.isNew) {
+				// This session was created in this window, and hasn't been persisted yet
+				session.isNew = false;
+				persistedSessions[session.sessionId] = session;
+			}
+		});
+
+		this._persistedSessions = persistedSessions;
+
+		// Add this window's active chat models to the set to persist.
+		// Having the same session open in two empty windows at the same time can lead to data loss, this is acceptable
+		const allSessions: Record<string, ISerializableChatData | ChatModel> = { ...this._persistedSessions };
+		for (const chat of thisWindowChats) {
+			allSessions[chat.sessionId] = chat;
+		}
+
+		let sessionsList = Object.values(allSessions);
+		sessionsList.sort((a, b) => (b.creationDate ?? 0) - (a.creationDate ?? 0));
+		sessionsList = sessionsList.slice(0, maxPersistedSessions);
+		const data = JSON.stringify(sessionsList);
+		this.storageService.store(serializedChatKey, data, StorageScope.APPLICATION, StorageTarget.MACHINE);
 	}
 
 	notifyUserAction(action: IChatUserActionEvent): void {
-		if (action.action.kind === 'vote') {
-			this.telemetryService.publicLog2<ChatVoteEvent, ChatVoteClassification>('interactiveSessionVote', {
-				direction: action.action.direction === ChatAgentVoteDirection.Up ? 'up' : 'down',
-				agentId: action.agentId ?? ''
-			});
-		} else if (action.action.kind === 'copy') {
-			this.telemetryService.publicLog2<ChatCopyEvent, ChatCopyClassification>('interactiveSessionCopy', {
-				copyKind: action.action.copyKind === ChatCopyKind.Action ? 'action' : 'toolbar',
-				agentId: action.agentId ?? ''
-			});
-		} else if (action.action.kind === 'insert') {
-			this.telemetryService.publicLog2<ChatInsertEvent, ChatInsertClassification>('interactiveSessionInsert', {
-				newFile: !!action.action.newFile,
-				agentId: action.agentId ?? ''
-			});
-		} else if (action.action.kind === 'command') {
-			// TODO not currently called
-			const command = CommandsRegistry.getCommand(action.action.commandButton.command.id);
-			const commandId = command ? action.action.commandButton.command.id : 'INVALID';
-			this.telemetryService.publicLog2<ChatCommandEvent, ChatCommandClassification>('interactiveSessionCommand', {
-				commandId,
-				agentId: action.agentId ?? ''
-			});
-		} else if (action.action.kind === 'runInTerminal') {
-			this.telemetryService.publicLog2<ChatTerminalEvent, ChatTerminalClassification>('interactiveSessionRunInTerminal', {
-				languageId: action.action.languageId ?? ''
-			});
+		this._chatServiceTelemetry.notifyUserAction(action);
+		this._onDidPerformUserAction.fire(action);
+	}
+
+	setChatSessionTitle(sessionId: string, title: string): void {
+		const model = this._sessionModels.get(sessionId);
+		if (model) {
+			model.setCustomTitle(title);
+			return;
 		}
 
-		this._onDidPerformUserAction.fire(action);
+		const session = this._persistedSessions[sessionId];
+		if (session) {
+			session.customTitle = title;
+		}
 	}
 
 	private trace(method: string, message?: string): void {
@@ -258,7 +279,7 @@ export class ChatService extends Disposable implements IChatService {
 
 	private deserializeChats(sessionData: string): ISerializableChatsData {
 		try {
-			const arrayOfSessions: ISerializableChatData[] = revive(JSON.parse(sessionData)); // Revive serialized URIs in session data
+			const arrayOfSessions: ISerializableChatDataIn[] = revive(JSON.parse(sessionData)); // Revive serialized URIs in session data
 			if (!Array.isArray(arrayOfSessions)) {
 				throw new Error('Expected array');
 			}
@@ -278,7 +299,7 @@ export class ChatService extends Disposable implements IChatService {
 					}
 				}
 
-				acc[session.sessionId] = session;
+				acc[session.sessionId] = normalizeSerializableChatData(session);
 				return acc;
 			}, {});
 			return sessions;
@@ -312,28 +333,45 @@ export class ChatService extends Disposable implements IChatService {
 	 * Imported chat sessions are also excluded from the result.
 	 */
 	getHistory(): IChatDetail[] {
-		const sessions = Object.values(this._persistedSessions)
-			.filter(session => session.requests.length > 0);
-		sessions.sort((a, b) => (b.creationDate ?? 0) - (a.creationDate ?? 0));
+		const persistedSessions = Object.values(this._persistedSessions)
+			.filter(session => session.requests.length > 0)
+			.filter(session => !this._sessionModels.has(session.sessionId));
 
-		return sessions
-			.filter(session => !this._sessionModels.has(session.sessionId))
+		const persistedSessionItems = persistedSessions
 			.filter(session => !session.isImported)
-			.map(item => {
-				const title = ChatModel.getDefaultTitle(item.requests);
+			.map(session => {
+				const title = session.customTitle ?? ChatModel.getDefaultTitle(session.requests);
 				return {
-					sessionId: item.sessionId,
-					title
-				};
+					sessionId: session.sessionId,
+					title,
+					lastMessageDate: session.lastMessageDate,
+					isActive: false,
+				} satisfies IChatDetail;
 			});
+		const liveSessionItems = Array.from(this._sessionModels.values())
+			.filter(session => !session.isImported)
+			.map(session => {
+				const title = session.title || localize('newChat', "New Chat");
+				return {
+					sessionId: session.sessionId,
+					title,
+					lastMessageDate: session.lastMessageDate,
+					isActive: true,
+				} satisfies IChatDetail;
+			});
+		return [...liveSessionItems, ...persistedSessionItems];
 	}
 
 	removeHistoryEntry(sessionId: string): void {
-		delete this._persistedSessions[sessionId];
-		this.saveState();
+		if (this._persistedSessions[sessionId]) {
+			this._deletedChatIds.add(sessionId);
+			delete this._persistedSessions[sessionId];
+			this.saveState();
+		}
 	}
 
 	clearAllHistoryEntries(): void {
+		Object.values(this._persistedSessions).forEach(session => this._deletedChatIds.add(session.sessionId));
 		this._persistedSessions = {};
 		this.saveState();
 	}
@@ -367,14 +405,10 @@ export class ChatService extends Disposable implements IChatService {
 			if (!defaultAgent) {
 				throw new ErrorNoTelemetry('No default agent registered');
 			}
-			const welcomeMessage = model.welcomeMessage ? undefined : await defaultAgent.provideWelcomeMessage?.(model.initialLocation, token) ?? undefined;
-			const welcomeModel = welcomeMessage && this.instantiationService.createInstance(
-				ChatWelcomeMessageModel,
-				welcomeMessage.map(item => typeof item === 'string' ? new MarkdownString(item) : item),
-				await defaultAgent.provideSampleQuestions?.(model.initialLocation, token) ?? []
-			);
 
-			model.initialize(welcomeModel);
+			const welcomeMessage = await defaultAgent.provideWelcomeMessage?.(token) ?? undefined;
+			const sampleQuestions = await defaultAgent.provideSampleQuestions?.(model.initialLocation, token) ?? undefined;
+			model.initialize(welcomeMessage, sampleQuestions);
 		} catch (err) {
 			this.trace('startSession', `initializeSession failed: ${err}`);
 			model.setInitializationError(err);
@@ -431,13 +465,17 @@ export class ChatService extends Disposable implements IChatService {
 
 		model.removeRequest(request.id, ChatRequestRemovalReason.Resend);
 
-		await this._sendRequestAsync(model, model.sessionId, request.message, attempt, enableCommandDetection, defaultAgent, location, options).responseCompletePromise;
+		const resendOptions: IChatSendRequestOptions = {
+			...options,
+			locationData: request.locationData,
+			attachedContext: request.attachedContext,
+		};
+		await this._sendRequestAsync(model, model.sessionId, request.message, attempt, enableCommandDetection, defaultAgent, location, resendOptions).responseCompletePromise;
 	}
 
 	async sendRequest(sessionId: string, request: string, options?: IChatSendRequestOptions): Promise<IChatSendRequestData | undefined> {
-
 		this.trace('sendRequest', `sessionId: ${sessionId}, message: ${request.substring(0, 20)}${request.length > 20 ? '[...]' : ''}}`);
-		if (!request.trim()) {
+		if (!request.trim() && !options?.slashCommand && !options?.agentId) {
 			this.trace('sendRequest', 'Rejected empty message');
 			return;
 		}
@@ -500,6 +538,7 @@ export class ChatService extends Disposable implements IChatService {
 		const agentPart = 'kind' in parsedRequest ? undefined : parsedRequest.parts.find((r): r is ChatRequestAgentPart => r instanceof ChatRequestAgentPart);
 		const agentSlashCommandPart = 'kind' in parsedRequest ? undefined : parsedRequest.parts.find((r): r is ChatRequestAgentSubcommandPart => r instanceof ChatRequestAgentSubcommandPart);
 		const commandPart = 'kind' in parsedRequest ? undefined : parsedRequest.parts.find((r): r is ChatRequestSlashCommandPart => r instanceof ChatRequestSlashCommandPart);
+		const requests = [...model.getRequests()];
 
 		let gotProgress = false;
 		const requestType = commandPart ? 'slashCommand' : 'string';
@@ -533,6 +572,9 @@ export class ChatService extends Disposable implements IChatService {
 				completeResponseCreated();
 			};
 
+			let detectedAgent: IChatAgentData | undefined;
+			let detectedCommand: IChatAgentCommand | undefined;
+
 			const stopWatch = new StopWatch(false);
 			const listener = token.onCancellationRequested(() => {
 				this.trace('sendRequest', `Request for session ${model.sessionId} was cancelled`);
@@ -543,9 +585,14 @@ export class ChatService extends Disposable implements IChatService {
 					result: 'cancelled',
 					requestType,
 					agent: agentPart?.agent.id ?? '',
+					agentExtensionId: agentPart?.agent.extensionId.value ?? '',
 					slashCommand: agentSlashCommandPart ? agentSlashCommandPart.command.name : commandPart?.slashCommand.command,
 					chatSessionId: model.sessionId,
 					location,
+					citations: request?.response?.codeCitations.length ?? 0,
+					numCodeBlocks: getCodeBlocks(request.response?.response.toString() ?? '').length,
+					isParticipantDetected: !!detectedAgent,
+					enableCommandDetection
 				});
 
 				model.cancelRequest(request);
@@ -554,53 +601,69 @@ export class ChatService extends Disposable implements IChatService {
 			try {
 				let rawResult: IChatAgentResult | null | undefined;
 				let agentOrCommandFollowups: Promise<IChatFollowup[] | undefined> | undefined = undefined;
+				let chatTitlePromise: Promise<string | undefined> | undefined;
 
 				if (agentPart || (defaultAgent && !commandPart)) {
-					const agent = (agentPart?.agent ?? defaultAgent)!;
-					await this.extensionService.activateByEvent(`onChatParticipant:${agent.id}`);
-					const history = getHistoryEntriesFromModel(model, agentPart?.agent.id);
+					const prepareChatAgentRequest = async (agent: IChatAgentData, command?: IChatAgentCommand, enableCommandDetection?: boolean, chatRequest?: ChatRequestModel, isParticipantDetected?: boolean): Promise<IChatAgentRequest> => {
+						const initVariableData: IChatRequestVariableData = { variables: [] };
+						request = chatRequest ?? model.addRequest(parsedRequest, initVariableData, attempt, agent, command, options?.confirmation, options?.locationData, options?.attachedContext);
 
-					const initVariableData: IChatRequestVariableData = { variables: [] };
-					request = model.addRequest(parsedRequest, initVariableData, attempt, agent, agentSlashCommandPart?.command);
-					completeResponseCreated();
-					const variableData = await this.chatVariablesService.resolveVariables(parsedRequest, options?.attachedContext, model, progressCallback, token);
-					request.variableData = variableData;
+						// Variables may have changed if the agent and slash command changed, so resolve them again even if we already had a chatRequest
+						const variableData = await this.chatVariablesService.resolveVariables(parsedRequest, request.attachedContext, model, progressCallback, token);
+						model.updateRequest(request, variableData);
+						const promptTextResult = getPromptText(request.message);
+						const updatedVariableData = updateRanges(variableData, promptTextResult.diff); // TODO bit of a hack
 
-					const promptTextResult = getPromptText(request.message);
-					const updatedVariableData = updateRanges(variableData, promptTextResult.diff); // TODO bit of a hack
+						return {
+							sessionId,
+							requestId: request.id,
+							agentId: agent.id,
+							message: promptTextResult.message,
+							command: command?.name,
+							variables: updatedVariableData,
+							enableCommandDetection,
+							isParticipantDetected,
+							attempt,
+							location,
+							locationData: request.locationData,
+							acceptedConfirmationData: options?.acceptedConfirmationData,
+							rejectedConfirmationData: options?.rejectedConfirmationData,
+							userSelectedModelId: options?.userSelectedModelId
+						} satisfies IChatAgentRequest;
+					};
 
-					// TODO- should figure out how to get rid of implicit variables for inline chat
-					const implicitVariablesEnabled = (location === ChatAgentLocation.Editor || location === ChatAgentLocation.Notebook);
-					if (implicitVariablesEnabled) {
-						const implicitVariables = agent.defaultImplicitVariables;
-						if (implicitVariables) {
-							const resolvedImplicitVariables = await Promise.all(implicitVariables.map(async v => {
-								const id = this.chatVariablesService.getVariable(v)?.id ?? '';
-								const value = await this.chatVariablesService.resolveVariable(v, parsedRequest.text, model, progressCallback, token);
-								return value ? { id, name: v, value } satisfies IChatRequestVariableEntry :
-									undefined;
-							}));
-							updatedVariableData.variables.push(...coalesce(resolvedImplicitVariables));
+					if (this.configurationService.getValue('chat.experimental.detectParticipant.enabled') !== false && this.chatAgentService.hasChatParticipantDetectionProviders() && !agentPart && !commandPart && enableCommandDetection) {
+						// We have no agent or command to scope history with, pass the full history to the participant detection provider
+						const defaultAgentHistory = this.getHistoryEntriesFromModel(requests, model.sessionId, location, defaultAgent.id);
+
+						// Prepare the request object that we will send to the participant detection provider
+						const chatAgentRequest = await prepareChatAgentRequest(defaultAgent, agentSlashCommandPart?.command, enableCommandDetection, undefined, false);
+
+						const result = await this.chatAgentService.detectAgentOrCommand(chatAgentRequest, defaultAgentHistory, { location }, token);
+						if (result && this.chatAgentService.getAgent(result.agent.id)?.locations?.includes(location)) {
+							// Update the response in the ChatModel to reflect the detected agent and command
+							request.response?.setAgent(result.agent, result.command);
+							detectedAgent = result.agent;
+							detectedCommand = result.command;
 						}
 					}
 
-					const requestProps: IChatAgentRequest = {
-						sessionId,
-						requestId: request.id,
-						agentId: agent.id,
-						message: promptTextResult.message,
-						command: agentSlashCommandPart?.command.name,
-						variables: updatedVariableData,
-						enableCommandDetection,
-						attempt,
-						location,
-						acceptedConfirmationData: options?.acceptedConfirmationData,
-						rejectedConfirmationData: options?.rejectedConfirmationData,
-					};
+					const agent = (detectedAgent ?? agentPart?.agent ?? defaultAgent)!;
+					const command = detectedCommand ?? agentSlashCommandPart?.command;
+					await this.extensionService.activateByEvent(`onChatParticipant:${agent.id}`);
 
+					// Recompute history in case the agent or command changed
+					const history = this.getHistoryEntriesFromModel(requests, model.sessionId, location, agent.id);
+					const requestProps = await prepareChatAgentRequest(agent, command, enableCommandDetection, request /* Reuse the request object if we already created it for participant detection */, !!detectedAgent);
+					const pendingRequest = this._pendingRequests.get(sessionId);
+					if (pendingRequest && !pendingRequest.requestId) {
+						pendingRequest.requestId = requestProps.requestId;
+					}
+					completeResponseCreated();
 					const agentResult = await this.chatAgentService.invokeAgent(agent.id, requestProps, progressCallback, history, token);
 					rawResult = agentResult;
 					agentOrCommandFollowups = this.chatAgentService.getFollowups(agent.id, requestProps, agentResult, history, followupsCancelToken);
+					chatTitlePromise = model.getRequests().length === 1 && !model.customTitle ? this.chatAgentService.getChatTitle(defaultAgent.id, this.getHistoryEntriesFromModel(model.getRequests(), model.sessionId, location, agent.id), CancellationToken.None) : undefined;
 				} else if (commandPart && this.chatSlashCommandService.hasCommand(commandPart.slashCommand.command)) {
 					request = model.addRequest(parsedRequest, { variables: [] }, attempt);
 					completeResponseCreated();
@@ -611,13 +674,13 @@ export class ChatService extends Disposable implements IChatService {
 						if (!request.response) {
 							continue;
 						}
-						history.push({ role: ChatMessageRole.User, content: { type: 'text', value: request.message.text } });
-						history.push({ role: ChatMessageRole.Assistant, content: { type: 'text', value: request.response.response.asString() } });
+						history.push({ role: ChatMessageRole.User, content: [{ type: 'text', value: request.message.text }] });
+						history.push({ role: ChatMessageRole.Assistant, content: [{ type: 'text', value: request.response.response.toString() }] });
 					}
 					const message = parsedRequest.text;
 					const commandResult = await this.chatSlashCommandService.executeCommand(commandPart.slashCommand.command, message.substring(commandPart.slashCommand.command.length + 1).trimStart(), new Progress<IChatProgress>(p => {
 						progressCallback(p);
-					}), history, token);
+					}), history, location, token);
 					agentOrCommandFollowups = Promise.resolve(commandResult?.followUp);
 					rawResult = {};
 
@@ -637,15 +700,21 @@ export class ChatService extends Disposable implements IChatService {
 						rawResult.errorDetails && gotProgress ? 'errorWithOutput' :
 							rawResult.errorDetails ? 'error' :
 								'success';
+					const commandForTelemetry = agentSlashCommandPart ? agentSlashCommandPart.command.name : commandPart?.slashCommand.command;
 					this.telemetryService.publicLog2<ChatProviderInvokedEvent, ChatProviderInvokedClassification>('interactiveSessionProviderInvoked', {
 						timeToFirstProgress: rawResult.timings?.firstProgress,
 						totalTime: rawResult.timings?.totalElapsed,
 						result,
 						requestType,
 						agent: agentPart?.agent.id ?? '',
-						slashCommand: agentSlashCommandPart ? agentSlashCommandPart.command.name : commandPart?.slashCommand.command,
+						agentExtensionId: agentPart?.agent.extensionId.value ?? '',
+						slashCommand: commandForTelemetry,
 						chatSessionId: model.sessionId,
-						location
+						enableCommandDetection,
+						isParticipantDetected: !!detectedAgent,
+						location,
+						citations: request.response?.codeCitations.length ?? 0,
+						numCodeBlocks: getCodeBlocks(request.response?.response.toString() ?? '').length
 					});
 					model.setResponse(request, rawResult);
 					completeResponseCreated();
@@ -655,8 +724,14 @@ export class ChatService extends Disposable implements IChatService {
 					if (agentOrCommandFollowups) {
 						agentOrCommandFollowups.then(followups => {
 							model.setFollowups(request, followups);
+							this._chatServiceTelemetry.retrievedFollowups(agentPart?.agent.id ?? '', commandForTelemetry, followups?.length ?? 0);
 						});
 					}
+					chatTitlePromise?.then(title => {
+						if (title) {
+							model.setCustomTitle(title);
+						}
+					});
 				}
 			} catch (err) {
 				const result = 'error';
@@ -666,23 +741,28 @@ export class ChatService extends Disposable implements IChatService {
 					result,
 					requestType,
 					agent: agentPart?.agent.id ?? '',
+					agentExtensionId: agentPart?.agent.extensionId.value ?? '',
 					slashCommand: agentSlashCommandPart ? agentSlashCommandPart.command.name : commandPart?.slashCommand.command,
 					chatSessionId: model.sessionId,
-					location
+					location,
+					citations: 0,
+					numCodeBlocks: 0,
+					enableCommandDetection,
+					isParticipantDetected: !!detectedAgent
 				});
-				const rawResult: IChatAgentResult = { errorDetails: { message: err.message } };
+				this.logService.error(`Error while handling chat request: ${toErrorMessage(err, true)}`);
 				if (request) {
+					const rawResult: IChatAgentResult = { errorDetails: { message: err.message } };
 					model.setResponse(request, rawResult);
+					completeResponseCreated();
+					model.completeResponse(request);
 				}
-				completeResponseCreated();
-				this.logService.error(`Error while handling chat request: ${toErrorMessage(err)}`);
-				model.completeResponse(request);
 			} finally {
 				listener.dispose();
 			}
 		};
 		const rawResponsePromise = sendRequestInternal();
-		this._pendingRequests.set(model.sessionId, source);
+		this._pendingRequests.set(model.sessionId, new CancellableRequest(source));
 		rawResponsePromise.finally(() => {
 			this._pendingRequests.deleteAndDispose(model.sessionId);
 		});
@@ -692,6 +772,36 @@ export class ChatService extends Disposable implements IChatService {
 		};
 	}
 
+	private getHistoryEntriesFromModel(requests: IChatRequestModel[], sessionId: string, location: ChatAgentLocation, forAgentId: string): IChatAgentHistoryEntry[] {
+		const history: IChatAgentHistoryEntry[] = [];
+		for (const request of requests) {
+			if (!request.response) {
+				continue;
+			}
+
+			const defaultAgentId = this.chatAgentService.getDefaultAgent(location)?.id;
+			if (forAgentId !== request.response.agent?.id && forAgentId !== defaultAgentId) {
+				// An agent only gets to see requests that were sent to this agent.
+				// The default agent (the undefined case) gets to see all of them.
+				continue;
+			}
+
+			const promptTextResult = getPromptText(request.message);
+			const historyRequest: IChatAgentRequest = {
+				sessionId: sessionId,
+				requestId: request.id,
+				agentId: request.response.agent?.id ?? '',
+				message: promptTextResult.message,
+				command: request.response.slashCommand?.name,
+				variables: updateRanges(request.variableData, promptTextResult.diff), // TODO bit of a hack
+				location: ChatAgentLocation.Panel
+			};
+			history.push({ request: historyRequest, response: toChatHistoryContent(request.response.response.value), result: request.response.result ?? {} });
+		}
+
+		return history;
+	}
+
 	async removeRequest(sessionId: string, requestId: string): Promise<void> {
 		const model = this._sessionModels.get(sessionId);
 		if (!model) {
@@ -700,6 +810,12 @@ export class ChatService extends Disposable implements IChatService {
 
 		await model.waitForInitialization();
 
+		const pendingRequest = this._pendingRequests.get(sessionId);
+		if (pendingRequest?.requestId === requestId) {
+			pendingRequest.cancel();
+			this._pendingRequests.deleteAndDispose(sessionId);
+		}
+
 		model.removeRequest(requestId);
 	}
 
@@ -720,6 +836,7 @@ export class ChatService extends Disposable implements IChatService {
 		if (request.response && !request.response.isComplete) {
 			const cts = this._pendingRequests.deleteAndLeak(oldOwner.sessionId);
 			if (cts) {
+				cts.requestId = request.id;
 				this._pendingRequests.set(target.sessionId, cts);
 			}
 		}
@@ -769,7 +886,9 @@ export class ChatService extends Disposable implements IChatService {
 		if (model.initialLocation === ChatAgentLocation.Panel) {
 			// Turn all the real objects into actual JSON, otherwise, calling 'revive' may fail when it tries to
 			// assign values to properties that are getters- microsoft/vscode-copilot-release#1233
-			this._persistedSessions[sessionId] = JSON.parse(JSON.stringify(model));
+			const sessionData: ISerializableChatData = JSON.parse(JSON.stringify(model));
+			sessionData.isNew = true;
+			this._persistedSessions[sessionId] = sessionData;
 		}
 
 		this._sessionModels.deleteAndDispose(sessionId);
@@ -800,3 +919,26 @@ export class ChatService extends Disposable implements IChatService {
 		this.trace('transferChatSession', `Transferred session ${model.sessionId} to workspace ${toWorkspace.toString()}`);
 	}
 }
+
+function getCodeBlocks(text: string): string[] {
+	const lines = text.split('\n');
+	const codeBlockLanguages: string[] = [];
+
+	let codeBlockState: undefined | { readonly delimiter: string; readonly languageId: string };
+	for (let i = 0; i < lines.length; i++) {
+		const line = lines[i];
+
+		if (codeBlockState) {
+			if (new RegExp(`^\\s*${codeBlockState.delimiter}\\s*$`).test(line)) {
+				codeBlockLanguages.push(codeBlockState.languageId);
+				codeBlockState = undefined;
+			}
+		} else {
+			const match = line.match(/^(\s*)(`{3,}|~{3,})(\w*)/);
+			if (match) {
+				codeBlockState = { delimiter: match[2], languageId: match[3] };
+			}
+		}
+	}
+	return codeBlockLanguages;
+}
diff --git a/src/vs/workbench/contrib/chat/common/chatServiceTelemetry.ts b/src/vs/workbench/contrib/chat/common/chatServiceTelemetry.ts
new file mode 100644
index 00000000000..2cd48f41393
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/chatServiceTelemetry.ts
@@ -0,0 +1,189 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IChatUserActionEvent, ChatAgentVoteDirection, ChatCopyKind } from './chatService.js';
+
+type ChatVoteEvent = {
+	direction: 'up' | 'down';
+	agentId: string;
+	command: string | undefined;
+	reason: string | undefined;
+};
+
+type ChatVoteClassification = {
+	direction: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the user voted up or down.' };
+	agentId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The ID of the chat agent that this vote is for.' };
+	command: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The name of the slash command that this vote is for.' };
+	reason: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The reason selected by the user for voting down.' };
+	owner: 'roblourens';
+	comment: 'Provides insight into the performance of Chat agents.';
+};
+
+type ChatCopyEvent = {
+	copyKind: 'action' | 'toolbar';
+	agentId: string;
+	command: string | undefined;
+};
+
+type ChatCopyClassification = {
+	copyKind: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'How the copy was initiated.' };
+	agentId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The ID of the chat agent that the copy acted on.' };
+	command: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The name of the slash command the copy acted on.' };
+	owner: 'roblourens';
+	comment: 'Provides insight into the usage of Chat features.';
+};
+
+type ChatInsertEvent = {
+	newFile: boolean;
+	agentId: string;
+	command: string | undefined;
+};
+
+type ChatInsertClassification = {
+	newFile: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the code was inserted into a new untitled file.' };
+	agentId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The ID of the chat agent that this insertion is for.' };
+	command: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The name of the slash command that this insertion is for.' };
+	owner: 'roblourens';
+	comment: 'Provides insight into the usage of Chat features.';
+};
+
+type ChatApplyEvent = {
+	newFile: boolean;
+	agentId: string;
+	command: string | undefined;
+	codeMapper: string | undefined;
+	editsProposed: boolean;
+};
+
+type ChatApplyClassification = {
+	newFile: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the code was inserted into a new untitled file.' };
+	agentId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The ID of the chat agent that this insertion is for.' };
+	command: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The name of the slash command that this insertion is for.' };
+	codeMapper: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The code mapper that wa used to compute the edit.' };
+	editsProposed: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether there was a change proposed to the user.' };
+	owner: 'aeschli';
+	comment: 'Provides insight into the usage of Chat features.';
+};
+
+type ChatCommandEvent = {
+	commandId: string;
+	agentId: string;
+	command: string | undefined;
+};
+
+type ChatCommandClassification = {
+	commandId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The id of the command that was executed.' };
+	agentId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The ID of the related chat agent.' };
+	command: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The name of the related slash command.' };
+	owner: 'roblourens';
+	comment: 'Provides insight into the usage of Chat features.';
+};
+
+type ChatFollowupEvent = {
+	agentId: string;
+	command: string | undefined;
+};
+
+type ChatFollowupClassification = {
+	agentId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The ID of the related chat agent.' };
+	command: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The name of the related slash command.' };
+	owner: 'roblourens';
+	comment: 'Provides insight into the usage of Chat features.';
+};
+
+type ChatTerminalEvent = {
+	languageId: string;
+	agentId: string;
+	command: string | undefined;
+};
+
+type ChatTerminalClassification = {
+	languageId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The language of the code that was run in the terminal.' };
+	agentId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The ID of the related chat agent.' };
+	command: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The name of the related slash command.' };
+	owner: 'roblourens';
+	comment: 'Provides insight into the usage of Chat features.';
+};
+
+type ChatFollowupsRetrievedEvent = {
+	agentId: string;
+	command: string | undefined;
+	numFollowups: number;
+};
+
+type ChatFollowupsRetrievedClassification = {
+	agentId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The ID of the related chat agent.' };
+	command: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The name of the related slash command.' };
+	numFollowups: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The number of followup prompts returned by the agent.' };
+	owner: 'roblourens';
+	comment: 'Provides insight into the usage of Chat features.';
+};
+
+export class ChatServiceTelemetry {
+	constructor(
+		@ITelemetryService private readonly telemetryService: ITelemetryService,
+	) { }
+
+	notifyUserAction(action: IChatUserActionEvent): void {
+		if (action.action.kind === 'vote') {
+			this.telemetryService.publicLog2<ChatVoteEvent, ChatVoteClassification>('interactiveSessionVote', {
+				direction: action.action.direction === ChatAgentVoteDirection.Up ? 'up' : 'down',
+				agentId: action.agentId ?? '',
+				command: action.command,
+				reason: action.action.reason,
+			});
+		} else if (action.action.kind === 'copy') {
+			this.telemetryService.publicLog2<ChatCopyEvent, ChatCopyClassification>('interactiveSessionCopy', {
+				copyKind: action.action.copyKind === ChatCopyKind.Action ? 'action' : 'toolbar',
+				agentId: action.agentId ?? '',
+				command: action.command,
+			});
+		} else if (action.action.kind === 'insert') {
+			this.telemetryService.publicLog2<ChatInsertEvent, ChatInsertClassification>('interactiveSessionInsert', {
+				newFile: !!action.action.newFile,
+				agentId: action.agentId ?? '',
+				command: action.command,
+			});
+		} else if (action.action.kind === 'apply') {
+			this.telemetryService.publicLog2<ChatApplyEvent, ChatApplyClassification>('interactiveSessionApply', {
+				newFile: !!action.action.newFile,
+				codeMapper: action.action.codeMapper,
+				agentId: action.agentId ?? '',
+				command: action.command,
+				editsProposed: !!action.action.editsProposed,
+			});
+		} else if (action.action.kind === 'command') {
+			// TODO not currently called
+			const command = CommandsRegistry.getCommand(action.action.commandButton.command.id);
+			const commandId = command ? action.action.commandButton.command.id : 'INVALID';
+			this.telemetryService.publicLog2<ChatCommandEvent, ChatCommandClassification>('interactiveSessionCommand', {
+				commandId,
+				agentId: action.agentId ?? '',
+				command: action.command,
+			});
+		} else if (action.action.kind === 'runInTerminal') {
+			this.telemetryService.publicLog2<ChatTerminalEvent, ChatTerminalClassification>('interactiveSessionRunInTerminal', {
+				languageId: action.action.languageId ?? '',
+				agentId: action.agentId ?? '',
+				command: action.command,
+			});
+		} else if (action.action.kind === 'followUp') {
+			this.telemetryService.publicLog2<ChatFollowupEvent, ChatFollowupClassification>('chatFollowupClicked', {
+				agentId: action.agentId ?? '',
+				command: action.command,
+			});
+		}
+	}
+
+	retrievedFollowups(agentId: string, command: string | undefined, numFollowups: number): void {
+		this.telemetryService.publicLog2<ChatFollowupsRetrievedEvent, ChatFollowupsRetrievedClassification>('chatFollowupsRetrieved', {
+			agentId,
+			command,
+			numFollowups,
+		});
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/common/chatSlashCommands.ts b/src/vs/workbench/contrib/chat/common/chatSlashCommands.ts
index 2d43f1c0396..20ec2affa73 100644
--- a/src/vs/workbench/contrib/chat/common/chatSlashCommands.ts
+++ b/src/vs/workbench/contrib/chat/common/chatSlashCommands.ts
@@ -3,14 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IProgress } from 'vs/platform/progress/common/progress';
-import { IChatMessage } from 'vs/workbench/contrib/chat/common/languageModels';
-import { IChatFollowup, IChatProgress, IChatResponseProgressFileTreeData } from 'vs/workbench/contrib/chat/common/chatService';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IProgress } from '../../../../platform/progress/common/progress.js';
+import { IChatMessage } from './languageModels.js';
+import { IChatFollowup, IChatProgress, IChatResponseProgressFileTreeData } from './chatService.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { ChatAgentLocation } from './chatAgents.js';
 
 //#region slash service, commands etc
 
@@ -18,18 +19,18 @@ export interface IChatSlashData {
 	command: string;
 	detail: string;
 	sortText?: string;
-
 	/**
 	 * Whether the command should execute as soon
 	 * as it is entered. Defaults to `false`.
 	 */
 	executeImmediately?: boolean;
+	locations: ChatAgentLocation[];
 }
 
 export interface IChatSlashFragment {
 	content: string | { treeData: IChatResponseProgressFileTreeData };
 }
-export type IChatSlashCallback = { (prompt: string, progress: IProgress<IChatProgress>, history: IChatMessage[], token: CancellationToken): Promise<{ followUp: IChatFollowup[] } | void> };
+export type IChatSlashCallback = { (prompt: string, progress: IProgress<IChatProgress>, history: IChatMessage[], location: ChatAgentLocation, token: CancellationToken): Promise<{ followUp: IChatFollowup[] } | void> };
 
 export const IChatSlashCommandService = createDecorator<IChatSlashCommandService>('chatSlashCommandService');
 
@@ -40,8 +41,8 @@ export interface IChatSlashCommandService {
 	_serviceBrand: undefined;
 	readonly onDidChangeCommands: Event<void>;
 	registerSlashCommand(data: IChatSlashData, command: IChatSlashCallback): IDisposable;
-	executeCommand(id: string, prompt: string, progress: IProgress<IChatProgress>, history: IChatMessage[], token: CancellationToken): Promise<{ followUp: IChatFollowup[] } | void>;
-	getCommands(): Array<IChatSlashData>;
+	executeCommand(id: string, prompt: string, progress: IProgress<IChatProgress>, history: IChatMessage[], location: ChatAgentLocation, token: CancellationToken): Promise<{ followUp: IChatFollowup[] } | void>;
+	getCommands(location: ChatAgentLocation): Array<IChatSlashData>;
 	hasCommand(id: string): boolean;
 }
 
@@ -80,15 +81,15 @@ export class ChatSlashCommandService extends Disposable implements IChatSlashCom
 		});
 	}
 
-	getCommands(): Array<IChatSlashData> {
-		return Array.from(this._commands.values(), v => v.data);
+	getCommands(location: ChatAgentLocation): Array<IChatSlashData> {
+		return Array.from(this._commands.values(), v => v.data).filter(c => c.locations.includes(location));
 	}
 
 	hasCommand(id: string): boolean {
 		return this._commands.has(id);
 	}
 
-	async executeCommand(id: string, prompt: string, progress: IProgress<IChatProgress>, history: IChatMessage[], token: CancellationToken): Promise<{ followUp: IChatFollowup[] } | void> {
+	async executeCommand(id: string, prompt: string, progress: IProgress<IChatProgress>, history: IChatMessage[], location: ChatAgentLocation, token: CancellationToken): Promise<{ followUp: IChatFollowup[] } | void> {
 		const data = this._commands.get(id);
 		if (!data) {
 			throw new Error('No command with id ${id} NOT registered');
@@ -100,6 +101,6 @@ export class ChatSlashCommandService extends Disposable implements IChatSlashCom
 			throw new Error(`No command with id ${id} NOT resolved`);
 		}
 
-		return await data.command(prompt, progress, history, token);
+		return await data.command(prompt, progress, history, location, token);
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/common/chatVariables.ts b/src/vs/workbench/contrib/chat/common/chatVariables.ts
index 1df71e988eb..9b361cf7d17 100644
--- a/src/vs/workbench/contrib/chat/common/chatVariables.ts
+++ b/src/vs/workbench/contrib/chat/common/chatVariables.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { URI } from 'vs/base/common/uri';
-import { IRange } from 'vs/editor/common/core/range';
-import { Location } from 'vs/editor/common/languages';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ChatAgentLocation } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { IChatModel, IChatRequestVariableData, IChatRequestVariableEntry } from 'vs/workbench/contrib/chat/common/chatModel';
-import { IParsedChatRequest } from 'vs/workbench/contrib/chat/common/chatParserTypes';
-import { IChatContentReference, IChatProgressMessage } from 'vs/workbench/contrib/chat/common/chatService';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IRange } from '../../../../editor/common/core/range.js';
+import { Location } from '../../../../editor/common/languages.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { ChatAgentLocation } from './chatAgents.js';
+import { IChatModel, IChatRequestVariableData, IChatRequestVariableEntry } from './chatModel.js';
+import { IParsedChatRequest } from './chatParserTypes.js';
+import { IChatContentReference, IChatProgressMessage } from './chatService.js';
 
 export interface IChatVariableData {
 	id: string;
@@ -23,11 +23,10 @@ export interface IChatVariableData {
 	description: string;
 	modelDescription?: string;
 	isSlow?: boolean;
-	hidden?: boolean;
 	canTakeArgument?: boolean;
 }
 
-export type IChatRequestVariableValue = string | URI | Location | unknown;
+export type IChatRequestVariableValue = string | URI | Location | unknown | Uint8Array;
 
 export type IChatVariableResolverProgress =
 	| IChatContentReference
@@ -44,7 +43,7 @@ export interface IChatVariablesService {
 	registerVariable(data: IChatVariableData, resolver: IChatVariableResolver): IDisposable;
 	hasVariable(name: string): boolean;
 	getVariable(name: string): IChatVariableData | undefined;
-	getVariables(): Iterable<Readonly<IChatVariableData>>;
+	getVariables(location: ChatAgentLocation): Iterable<Readonly<IChatVariableData>>;
 	getDynamicVariables(sessionId: string): ReadonlyArray<IDynamicVariable>; // should be its own service?
 	attachContext(name: string, value: string | URI | Location | unknown, location: ChatAgentLocation): void;
 
diff --git a/src/vs/workbench/contrib/chat/common/chatViewModel.ts b/src/vs/workbench/contrib/chat/common/chatViewModel.ts
index 130ef76979b..4faeae41c0b 100644
--- a/src/vs/workbench/contrib/chat/common/chatViewModel.ts
+++ b/src/vs/workbench/contrib/chat/common/chatViewModel.ts
@@ -3,21 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { marked } from 'vs/base/common/marked/marked';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { URI } from 'vs/base/common/uri';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { annotateVulnerabilitiesInText } from 'vs/workbench/contrib/chat/common/annotations';
-import { getFullyQualifiedId, IChatAgentCommand, IChatAgentData, IChatAgentNameService, IChatAgentResult } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { ChatModelInitState, IChatModel, IChatRequestModel, IChatResponseModel, IChatTextEditGroup, IChatWelcomeMessageContent, IResponse } from 'vs/workbench/contrib/chat/common/chatModel';
-import { IParsedChatRequest } from 'vs/workbench/contrib/chat/common/chatParserTypes';
-import { ChatAgentVoteDirection, IChatCommandButton, IChatConfirmation, IChatContentReference, IChatFollowup, IChatProgressMessage, IChatResponseErrorDetails, IChatResponseProgressFileTreeData, IChatTask, IChatUsedContext, IChatWarningMessage } from 'vs/workbench/contrib/chat/common/chatService';
-import { countWords } from 'vs/workbench/contrib/chat/common/chatWordCounter';
-import { CodeBlockModelCollection } from './codeBlockModelCollection';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { IMarkdownString } from '../../../../base/common/htmlContent.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import * as marked from '../../../../base/common/marked/marked.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { annotateVulnerabilitiesInText } from './annotations.js';
+import { getFullyQualifiedId, IChatAgentCommand, IChatAgentData, IChatAgentNameService, IChatAgentResult } from './chatAgents.js';
+import { ChatModelInitState, IChatModel, IChatProgressRenderableResponseContent, IChatRequestModel, IChatRequestVariableEntry, IChatResponseModel, IChatTextEditGroup, IResponse } from './chatModel.js';
+import { IParsedChatRequest } from './chatParserTypes.js';
+import { ChatAgentVoteDirection, ChatAgentVoteDownReason, IChatCodeCitation, IChatContentReference, IChatFollowup, IChatProgressMessage, IChatResponseErrorDetails, IChatTask, IChatUsedContext } from './chatService.js';
+import { countWords } from './chatWordCounter.js';
+import { CodeBlockModelCollection } from './codeBlockModelCollection.js';
+import { hash } from '../../../../base/common/hash.js';
 
 export function isRequestVM(item: unknown): item is IChatRequestViewModel {
 	return !!item && typeof item === 'object' && 'message' in item;
@@ -27,10 +28,6 @@ export function isResponseVM(item: unknown): item is IChatResponseViewModel {
 	return !!item && typeof (item as IChatResponseViewModel).setVote !== 'undefined';
 }
 
-export function isWelcomeVM(item: unknown): item is IChatWelcomeMessageViewModel {
-	return !!item && typeof item === 'object' && 'content' in item;
-}
-
 export type IChatViewModelChangeEvent = IChatAddRequestEvent | IChangePlaceholderEvent | IChatSessionInitEvent | null;
 
 export interface IChatAddRequestEvent {
@@ -53,7 +50,7 @@ export interface IChatViewModel {
 	readonly onDidChange: Event<IChatViewModelChangeEvent>;
 	readonly requestInProgress: boolean;
 	readonly inputPlaceholder?: string;
-	getItems(): (IChatRequestViewModel | IChatResponseViewModel | IChatWelcomeMessageViewModel)[];
+	getItems(): (IChatRequestViewModel | IChatResponseViewModel)[];
 	setInputPlaceholder(text: string): void;
 	resetInputPlaceholder(): void;
 }
@@ -68,7 +65,10 @@ export interface IChatRequestViewModel {
 	readonly message: IParsedChatRequest | IChatFollowup;
 	readonly messageText: string;
 	readonly attempt: number;
+	readonly variables: IChatRequestVariableEntry[];
 	currentRenderedHeight: number | undefined;
+	readonly contentReferences?: ReadonlyArray<IChatContentReference>;
+	readonly confirmation?: string;
 }
 
 export interface IChatResponseMarkdownRenderData {
@@ -78,6 +78,13 @@ export interface IChatResponseMarkdownRenderData {
 	originalMarkdown: IMarkdownString;
 }
 
+export interface IChatResponseMarkdownRenderData2 {
+	renderedWordCount: number;
+	lastRenderTime: number;
+	isFullyRendered: boolean;
+	originalMarkdown: IMarkdownString;
+}
+
 export interface IChatProgressMessageRenderData {
 	progressMessage: IChatProgressMessage;
 
@@ -101,13 +108,36 @@ export interface IChatTaskRenderData {
 	progressLength: number;
 }
 
-export type IChatRenderData = IChatResponseProgressFileTreeData | IChatResponseMarkdownRenderData | IChatProgressMessageRenderData | IChatCommandButton | IChatTextEditGroup | IChatConfirmation | IChatTaskRenderData | IChatWarningMessage;
 export interface IChatResponseRenderData {
-	renderedParts: IChatRenderData[];
+	renderedParts: IChatRendererContent[];
+
+	renderedWordCount: number;
+	lastRenderTime: number;
 }
 
+/**
+ * Content type for references used during rendering, not in the model
+ */
+export interface IChatReferences {
+	references: ReadonlyArray<IChatContentReference>;
+	kind: 'references';
+}
+
+/**
+ * Content type for citations used during rendering, not in the model
+ */
+export interface IChatCodeCitations {
+	citations: ReadonlyArray<IChatCodeCitation>;
+	kind: 'codeCitations';
+}
+
+/**
+ * Type for content parts rendered by IChatListRenderer
+ */
+export type IChatRendererContent = IChatProgressRenderableResponseContent | IChatReferences | IChatCodeCitations;
+
 export interface IChatLiveUpdateData {
-	loadingStartTime: number;
+	firstWordTime: number;
 	lastUpdateTime: number;
 	impliedWordLoadRate: number;
 	lastWordCount: number;
@@ -129,11 +159,13 @@ export interface IChatResponseViewModel {
 	readonly response: IResponse;
 	readonly usedContext: IChatUsedContext | undefined;
 	readonly contentReferences: ReadonlyArray<IChatContentReference>;
+	readonly codeCitations: ReadonlyArray<IChatCodeCitation>;
 	readonly progressMessages: ReadonlyArray<IChatProgressMessage>;
 	readonly isComplete: boolean;
 	readonly isCanceled: boolean;
 	readonly isStale: boolean;
 	readonly vote: ChatAgentVoteDirection | undefined;
+	readonly voteDownReason: ChatAgentVoteDownReason | undefined;
 	readonly replyFollowups?: IChatFollowup[];
 	readonly errorDetails?: IChatResponseErrorDetails;
 	readonly result?: IChatAgentResult;
@@ -141,6 +173,7 @@ export interface IChatResponseViewModel {
 	renderData?: IChatResponseRenderData;
 	currentRenderedHeight: number | undefined;
 	setVote(vote: ChatAgentVoteDirection): void;
+	setVoteDownReason(reason: ChatAgentVoteDownReason | undefined): void;
 	usedReferencesExpanded?: boolean;
 	vulnerabilitiesListExpanded: boolean;
 	setEditApplied(edit: IChatTextEditGroup, editCount: number): void;
@@ -251,8 +284,8 @@ export class ChatViewModel extends Disposable implements IChatViewModel {
 		this.updateCodeBlockTextModels(response);
 	}
 
-	getItems(): (IChatRequestViewModel | IChatResponseViewModel | IChatWelcomeMessageViewModel)[] {
-		return [...(this._model.welcomeMessage ? [this._model.welcomeMessage] : []), ...this._items];
+	getItems(): (IChatRequestViewModel | IChatResponseViewModel)[] {
+		return [...this._items];
 	}
 
 	override dispose() {
@@ -271,38 +304,13 @@ export class ChatViewModel extends Disposable implements IChatViewModel {
 		}
 
 		let codeBlockIndex = 0;
-		const renderer = new marked.Renderer();
-		renderer.code = (value, languageId) => {
-			languageId ??= '';
-			this.codeBlockModelCollection.update(this._model.sessionId, model, codeBlockIndex++, { text: value, languageId });
-			return '';
-		};
-
-		marked.parse(this.ensureFencedCodeBlocksTerminated(content), { renderer });
-	}
-
-	/**
-	 * Marked doesn't consistently render fenced code blocks that aren't terminated.
-	 *
-	 * Try to close them ourselves to workaround this.
-	 */
-	private ensureFencedCodeBlocksTerminated(content: string): string {
-		const lines = content.split('\n');
-		let inCodeBlock = false;
-
-		for (let i = 0; i < lines.length; i++) {
-			const line = lines[i];
-			if (line.startsWith('```')) {
-				inCodeBlock = !inCodeBlock;
+		marked.walkTokens(marked.lexer(content), token => {
+			if (token.type === 'code') {
+				const lang = token.lang || '';
+				const text = token.text;
+				this.codeBlockModelCollection.update(this._model.sessionId, model, codeBlockIndex++, { text, languageId: lang });
 			}
-		}
-
-		// If we're still in a code block at the end of the content, add a closing fence
-		if (inCodeBlock) {
-			lines.push('```');
-		}
-
-		return lines.join('\n');
+		});
 	}
 }
 
@@ -312,7 +320,7 @@ export class ChatRequestViewModel implements IChatRequestViewModel {
 	}
 
 	get dataId() {
-		return this.id + `_${ChatModelInitState[this._model.session.initState]}`;
+		return this.id + `_${ChatModelInitState[this._model.session.initState]}_${hash(this.variables)}`;
 	}
 
 	get sessionId() {
@@ -339,6 +347,18 @@ export class ChatRequestViewModel implements IChatRequestViewModel {
 		return this._model.attempt;
 	}
 
+	get variables() {
+		return this._model.variableData.variables;
+	}
+
+	get contentReferences() {
+		return this._model.response?.contentReferences;
+	}
+
+	get confirmation() {
+		return this._model.confirmation;
+	}
+
 	currentRenderedHeight: number | undefined;
 
 	constructor(
@@ -409,6 +429,10 @@ export class ChatResponseViewModel extends Disposable implements IChatResponseVi
 		return this._model.contentReferences;
 	}
 
+	get codeCitations(): ReadonlyArray<IChatCodeCitation> {
+		return this._model.codeCitations;
+	}
+
 	get progressMessages(): ReadonlyArray<IChatProgressMessage> {
 		return this._model.progressMessages;
 	}
@@ -437,6 +461,10 @@ export class ChatResponseViewModel extends Disposable implements IChatResponseVi
 		return this._model.vote;
 	}
 
+	get voteDownReason() {
+		return this._model.voteDownReason;
+	}
+
 	get requestId() {
 		return this._model.requestId;
 	}
@@ -484,7 +512,7 @@ export class ChatResponseViewModel extends Disposable implements IChatResponseVi
 
 		if (!_model.isComplete) {
 			this._contentUpdateTimings = {
-				loadingStartTime: Date.now(),
+				firstWordTime: 0,
 				lastUpdateTime: Date.now(),
 				impliedWordLoadRate: 0,
 				lastWordCount: 0
@@ -492,15 +520,17 @@ export class ChatResponseViewModel extends Disposable implements IChatResponseVi
 		}
 
 		this._register(_model.onDidChange(() => {
+			// This should be true, if the model is changing
 			if (this._contentUpdateTimings) {
-				// This should be true, if the model is changing
 				const now = Date.now();
-				const wordCount = countWords(_model.response.asString());
-				const timeDiff = now - this._contentUpdateTimings.loadingStartTime;
+				const wordCount = countWords(_model.response.toString());
+
+				// Apply a min time difference, or the rate is typically too high for first few words
+				const timeDiff = Math.max(now - this._contentUpdateTimings.firstWordTime, 250);
 				const impliedWordLoadRate = this._contentUpdateTimings.lastWordCount / (timeDiff / 1000);
-				this.trace('onDidChange', `Update- got ${this._contentUpdateTimings.lastWordCount} words over ${timeDiff}ms = ${impliedWordLoadRate} words/s. ${wordCount} words are now available.`);
+				this.trace('onDidChange', `Update- got ${this._contentUpdateTimings.lastWordCount} words over last ${timeDiff}ms = ${impliedWordLoadRate} words/s. ${wordCount} words are now available.`);
 				this._contentUpdateTimings = {
-					loadingStartTime: this._contentUpdateTimings.loadingStartTime,
+					firstWordTime: this._contentUpdateTimings.firstWordTime === 0 && this.response.value.some(v => v.kind === 'markdownContent') ? now : this._contentUpdateTimings.firstWordTime,
 					lastUpdateTime: now,
 					impliedWordLoadRate,
 					lastWordCount: wordCount
@@ -525,17 +555,13 @@ export class ChatResponseViewModel extends Disposable implements IChatResponseVi
 		this._model.setVote(vote);
 	}
 
+	setVoteDownReason(reason: ChatAgentVoteDownReason | undefined): void {
+		this._modelChangeCount++;
+		this._model.setVoteDownReason(reason);
+	}
+
 	setEditApplied(edit: IChatTextEditGroup, editCount: number) {
 		this._modelChangeCount++;
 		this._model.setEditApplied(edit, editCount);
 	}
 }
-
-export interface IChatWelcomeMessageViewModel {
-	readonly id: string;
-	readonly username: string;
-	readonly avatarIcon?: URI | ThemeIcon;
-	readonly content: IChatWelcomeMessageContent[];
-	readonly sampleQuestions: IChatFollowup[];
-	currentRenderedHeight?: number;
-}
diff --git a/src/vs/workbench/contrib/chat/common/chatWidgetHistoryService.ts b/src/vs/workbench/contrib/chat/common/chatWidgetHistoryService.ts
index 01716421e7b..7e4e12e7ff7 100644
--- a/src/vs/workbench/contrib/chat/common/chatWidgetHistoryService.ts
+++ b/src/vs/workbench/contrib/chat/common/chatWidgetHistoryService.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { Memento } from 'vs/workbench/common/memento';
-import { ChatAgentLocation } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { CHAT_PROVIDER_ID } from 'vs/workbench/contrib/chat/common/chatParticipantContribTypes';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { Memento } from '../../../common/memento.js';
+import { ChatAgentLocation } from './chatAgents.js';
+import { CHAT_PROVIDER_ID } from './chatParticipantContribTypes.js';
 
 export interface IChatHistoryEntry {
 	text: string;
diff --git a/src/vs/workbench/contrib/chat/common/chatWordCounter.ts b/src/vs/workbench/contrib/chat/common/chatWordCounter.ts
index c3b7ff8822c..c1989d4f997 100644
--- a/src/vs/workbench/contrib/chat/common/chatWordCounter.ts
+++ b/src/vs/workbench/contrib/chat/common/chatWordCounter.ts
@@ -5,13 +5,48 @@
 
 export interface IWordCountResult {
 	value: string;
-	actualWordCount: number;
+	returnedWordCount: number;
+	totalWordCount: number;
 	isFullString: boolean;
 }
 
+const r = String.raw;
+
+/**
+ * Matches `[text](link title?)` or `[text](<link> title?)`
+ *
+ * Taken from vscode-markdown-languageservice
+ */
+const linkPattern =
+	r`(?<!\\)` + // Must not start with escape
+
+	// text
+	r`(!?\[` + // open prefix match -->
+	/**/r`(?:` +
+	/*****/r`[^\[\]\\]|` + // Non-bracket chars, or...
+	/*****/r`\\.|` + // Escaped char, or...
+	/*****/r`\[[^\[\]]*\]` + // Matched bracket pair
+	/**/r`)*` +
+	r`\])` + // <-- close prefix match
+
+	// Destination
+	r`(\(\s*)` + // Pre href
+	/**/r`(` +
+	/*****/r`[^\s\(\)<](?:[^\s\(\)]|\([^\s\(\)]*?\))*|` + // Link without whitespace, or...
+	/*****/r`<(?:\\[<>]|[^<>])+>` + // In angle brackets
+	/**/r`)` +
+
+	// Title
+	/**/r`\s*(?:"[^"]*"|'[^']*'|\([^\(\)]*\))?\s*` +
+	r`\)`;
+
 export function getNWords(str: string, numWordsToCount: number): IWordCountResult {
-	// Match words and markdown style links
-	const allWordMatches = Array.from(str.matchAll(/\[([^\]]+)\]\(([^)]+)\)|\p{sc=Han}|[^\s\|\-|\p{sc=Han}]+/gu));
+	// This regex matches each word and skips over whitespace and separators. A word is:
+	// A markdown link
+	// One chinese character
+	// One or more + - =, handled so that code like "a=1+2-3" is broken up better
+	// One or more characters that aren't whitepace or any of the above
+	const allWordMatches = Array.from(str.matchAll(new RegExp(linkPattern + r`|\p{sc=Han}|=+|\++|-+|[^\s\|\p{sc=Han}|=|\+|\-]+`, 'gu')));
 
 	const targetWords = allWordMatches.slice(0, numWordsToCount);
 
@@ -22,12 +57,13 @@ export function getNWords(str: string, numWordsToCount: number): IWordCountResul
 	const value = str.substring(0, endIndex);
 	return {
 		value,
-		actualWordCount: targetWords.length === 0 ? (value.length ? 1 : 0) : targetWords.length,
-		isFullString: endIndex >= str.length
+		returnedWordCount: targetWords.length === 0 ? (value.length ? 1 : 0) : targetWords.length,
+		isFullString: endIndex >= str.length,
+		totalWordCount: allWordMatches.length
 	};
 }
 
 export function countWords(str: string): number {
 	const result = getNWords(str, Number.MAX_SAFE_INTEGER);
-	return result.actualWordCount;
+	return result.returnedWordCount;
 }
diff --git a/src/vs/workbench/contrib/chat/common/codeBlockModelCollection.ts b/src/vs/workbench/contrib/chat/common/codeBlockModelCollection.ts
index a857b64cb1d..ad67a6ccc24 100644
--- a/src/vs/workbench/contrib/chat/common/codeBlockModelCollection.ts
+++ b/src/vs/workbench/contrib/chat/common/codeBlockModelCollection.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, IReference } from 'vs/base/common/lifecycle';
-import { ResourceMap } from 'vs/base/common/map';
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { Range } from 'vs/editor/common/core/range';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { EndOfLinePreference } from 'vs/editor/common/model';
-import { IResolvedTextEditorModel, ITextModelService } from 'vs/editor/common/services/resolverService';
-import { IChatRequestViewModel, IChatResponseViewModel, isResponseVM } from 'vs/workbench/contrib/chat/common/chatViewModel';
-import { extractVulnerabilitiesFromText, IMarkdownVulnerability } from './annotations';
+import { Disposable, IReference } from '../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { EndOfLinePreference } from '../../../../editor/common/model.js';
+import { IResolvedTextEditorModel, ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { extractCodeblockUrisFromText, extractVulnerabilitiesFromText, IMarkdownVulnerability } from './annotations.js';
+import { IChatRequestViewModel, IChatResponseViewModel, isResponseVM } from './chatViewModel.js';
 
 
 export class CodeBlockModelCollection extends Disposable {
@@ -20,8 +20,16 @@ export class CodeBlockModelCollection extends Disposable {
 	private readonly _models = new ResourceMap<{
 		readonly model: Promise<IReference<IResolvedTextEditorModel>>;
 		vulns: readonly IMarkdownVulnerability[];
+		codemapperUri?: URI;
 	}>();
 
+	/**
+	 * Max number of models to keep in memory.
+	 *
+	 * Currently always maintains the most recently created models.
+	 */
+	private readonly maxModelCount = 100;
+
 	constructor(
 		@ILanguageService private readonly languageService: ILanguageService,
 		@ITextModelService private readonly textModelService: ITextModelService
@@ -34,16 +42,16 @@ export class CodeBlockModelCollection extends Disposable {
 		this.clear();
 	}
 
-	get(sessionId: string, chat: IChatRequestViewModel | IChatResponseViewModel, codeBlockIndex: number): { model: Promise<IResolvedTextEditorModel>; readonly vulns: readonly IMarkdownVulnerability[] } | undefined {
+	get(sessionId: string, chat: IChatRequestViewModel | IChatResponseViewModel, codeBlockIndex: number): { model: Promise<IResolvedTextEditorModel>; readonly vulns: readonly IMarkdownVulnerability[]; readonly codemapperUri?: URI } | undefined {
 		const uri = this.getUri(sessionId, chat, codeBlockIndex);
 		const entry = this._models.get(uri);
 		if (!entry) {
 			return;
 		}
-		return { model: entry.model.then(ref => ref.object), vulns: entry.vulns };
+		return { model: entry.model.then(ref => ref.object), vulns: entry.vulns, codemapperUri: entry.codemapperUri };
 	}
 
-	getOrCreate(sessionId: string, chat: IChatRequestViewModel | IChatResponseViewModel, codeBlockIndex: number): { model: Promise<IResolvedTextEditorModel>; readonly vulns: readonly IMarkdownVulnerability[] } {
+	getOrCreate(sessionId: string, chat: IChatRequestViewModel | IChatResponseViewModel, codeBlockIndex: number): { model: Promise<IResolvedTextEditorModel>; readonly vulns: readonly IMarkdownVulnerability[]; readonly codemapperUri?: URI } {
 		const existing = this.get(sessionId, chat, codeBlockIndex);
 		if (existing) {
 			return existing;
@@ -51,8 +59,27 @@ export class CodeBlockModelCollection extends Disposable {
 
 		const uri = this.getUri(sessionId, chat, codeBlockIndex);
 		const ref = this.textModelService.createModelReference(uri);
-		this._models.set(uri, { model: ref, vulns: [] });
-		return { model: ref.then(ref => ref.object), vulns: [] };
+		this._models.set(uri, { model: ref, vulns: [], codemapperUri: undefined });
+
+		while (this._models.size > this.maxModelCount) {
+			const first = Array.from(this._models.keys()).at(0);
+			if (!first) {
+				break;
+			}
+			this.delete(first);
+		}
+
+		return { model: ref.then(ref => ref.object), vulns: [], codemapperUri: undefined };
+	}
+
+	private delete(codeBlockUri: URI) {
+		const entry = this._models.get(codeBlockUri);
+		if (!entry) {
+			return;
+		}
+
+		entry.model.then(ref => ref.dispose());
+		this._models.delete(codeBlockUri);
 	}
 
 	clear(): void {
@@ -64,9 +91,15 @@ export class CodeBlockModelCollection extends Disposable {
 		const entry = this.getOrCreate(sessionId, chat, codeBlockIndex);
 
 		const extractedVulns = extractVulnerabilitiesFromText(content.text);
-		const newText = fixCodeText(extractedVulns.newText, content.languageId);
+		let newText = fixCodeText(extractedVulns.newText, content.languageId);
 		this.setVulns(sessionId, chat, codeBlockIndex, extractedVulns.vulnerabilities);
 
+		const codeblockUri = extractCodeblockUrisFromText(newText);
+		if (codeblockUri) {
+			this.setCodemapperUri(sessionId, chat, codeBlockIndex, codeblockUri.uri);
+			newText = codeblockUri.textWithoutResult;
+		}
+
 		const textModel = (await entry.model).textEditorModel;
 		if (content.languageId) {
 			const vscodeLanguageId = this.languageService.getLanguageIdByLanguageName(content.languageId);
@@ -77,7 +110,7 @@ export class CodeBlockModelCollection extends Disposable {
 
 		const currentText = textModel.getValue(EndOfLinePreference.LF);
 		if (newText === currentText) {
-			return;
+			return entry;
 		}
 
 		if (newText.startsWith(currentText)) {
@@ -89,6 +122,16 @@ export class CodeBlockModelCollection extends Disposable {
 			// console.log(`Failed to optimize setText`);
 			textModel.setValue(newText);
 		}
+
+		return entry;
+	}
+
+	private setCodemapperUri(sessionId: string, chat: IChatRequestViewModel | IChatResponseViewModel, codeBlockIndex: number, codemapperUri: URI) {
+		const uri = this.getUri(sessionId, chat, codeBlockIndex);
+		const entry = this._models.get(uri);
+		if (entry) {
+			entry.codemapperUri = codemapperUri;
+		}
 	}
 
 	private setVulns(sessionId: string, chat: IChatRequestViewModel | IChatResponseViewModel, codeBlockIndex: number, vulnerabilities: IMarkdownVulnerability[]) {
@@ -116,6 +159,10 @@ export class CodeBlockModelCollection extends Disposable {
 
 		return {
 			references: chat.contentReferences.map(ref => {
+				if (typeof ref.reference === 'string') {
+					return;
+				}
+
 				const uriOrLocation = 'variableName' in ref.reference ?
 					ref.reference.value :
 					ref.reference;
diff --git a/src/vs/workbench/contrib/chat/common/languageModelStats.ts b/src/vs/workbench/contrib/chat/common/languageModelStats.ts
index ebe85e645d8..290a6e3cd87 100644
--- a/src/vs/workbench/contrib/chat/common/languageModelStats.ts
+++ b/src/vs/workbench/contrib/chat/common/languageModelStats.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { Extensions, IExtensionFeaturesManagementService, IExtensionFeaturesRegistry } from 'vs/workbench/services/extensionManagement/common/extensionFeatures';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { localize } from 'vs/nls';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { Extensions, IExtensionFeaturesManagementService, IExtensionFeaturesRegistry } from '../../../services/extensionManagement/common/extensionFeatures.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { localize } from '../../../../nls.js';
 
 export const ILanguageModelStatsService = createDecorator<ILanguageModelStatsService>('ILanguageModelStatsService');
 
diff --git a/src/vs/workbench/contrib/chat/common/languageModelToolsService.ts b/src/vs/workbench/contrib/chat/common/languageModelToolsService.ts
new file mode 100644
index 00000000000..610b22e32ea
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/languageModelToolsService.ts
@@ -0,0 +1,245 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { CancellationError } from '../../../../base/common/errors.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { IMarkdownString } from '../../../../base/common/htmlContent.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
+import { Disposable, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { URI } from '../../../../base/common/uri.js';
+import { localize } from '../../../../nls.js';
+import { ContextKeyExpression, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { ChatModel } from './chatModel.js';
+import { ChatToolInvocation } from './chatProgressTypes/chatToolInvocation.js';
+import { IChatService } from './chatService.js';
+
+export interface IToolData {
+	id: string;
+	name?: string;
+	icon?: { dark: URI; light?: URI } | ThemeIcon;
+	when?: ContextKeyExpression;
+	displayName?: string;
+	userDescription?: string;
+	modelDescription: string;
+	parametersSchema?: IJSONSchema;
+	canBeInvokedManually?: boolean;
+	supportedContentTypes: string[];
+	requiresConfirmation?: boolean;
+}
+
+interface IToolEntry {
+	data: IToolData;
+	impl?: IToolImpl;
+}
+
+export interface IToolInvocation {
+	callId: string;
+	toolId: string;
+	parameters: any;
+	tokenBudget?: number;
+	context: IToolInvocationContext | undefined;
+	requestedContentTypes: string[];
+}
+
+export interface IToolInvocationContext {
+	sessionId: string;
+}
+
+export interface IToolResult {
+	[contentType: string]: any;
+}
+
+export interface IToolConfirmationMessages {
+	title: string;
+	message: string | IMarkdownString;
+}
+
+export interface IToolImpl {
+	invoke(invocation: IToolInvocation, countTokens: CountTokensCallback, token: CancellationToken): Promise<IToolResult>;
+	provideToolConfirmationMessages(participantName: string, parameters: any, token: CancellationToken): Promise<IToolConfirmationMessages | undefined>;
+	provideToolInvocationMessage(parameters: any, token: CancellationToken): Promise<string | undefined>;
+}
+
+export const ILanguageModelToolsService = createDecorator<ILanguageModelToolsService>('ILanguageModelToolsService');
+
+export type CountTokensCallback = (input: string, token: CancellationToken) => Promise<number>;
+
+export interface ILanguageModelToolsService {
+	_serviceBrand: undefined;
+	onDidChangeTools: Event<void>;
+	registerToolData(toolData: IToolData): IDisposable;
+	registerToolImplementation(id: string, tool: IToolImpl): IDisposable;
+	getTools(): Iterable<Readonly<IToolData>>;
+	getTool(id: string): IToolData | undefined;
+	getToolByName(name: string): IToolData | undefined;
+	invokeTool(invocation: IToolInvocation, countTokens: CountTokensCallback, token: CancellationToken): Promise<IToolResult>;
+}
+
+export class LanguageModelToolsService extends Disposable implements ILanguageModelToolsService {
+	_serviceBrand: undefined;
+
+	private _onDidChangeTools = new Emitter<void>();
+	readonly onDidChangeTools = this._onDidChangeTools.event;
+
+	/** Throttle tools updates because it sends all tools and runs on context key updates */
+	private _onDidChangeToolsScheduler = new RunOnceScheduler(() => this._onDidChangeTools.fire(), 750);
+
+	private _tools = new Map<string, IToolEntry>();
+	private _toolContextKeys = new Set<string>();
+
+	constructor(
+		@IExtensionService private readonly _extensionService: IExtensionService,
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
+		@IChatService private readonly _chatService: IChatService,
+	) {
+		super();
+
+		this._register(this._contextKeyService.onDidChangeContext(e => {
+			if (e.affectsSome(this._toolContextKeys)) {
+				// Not worth it to compute a delta here unless we have many tools changing often
+				this._onDidChangeToolsScheduler.schedule();
+			}
+		}));
+	}
+
+	registerToolData(toolData: IToolData): IDisposable {
+		if (this._tools.has(toolData.id)) {
+			throw new Error(`Tool "${toolData.id}" is already registered.`);
+		}
+
+		// Ensure that text/plain is supported
+		if (!toolData.supportedContentTypes.includes('text/plain')) {
+			toolData.supportedContentTypes.push('text/plain');
+		}
+
+		this._tools.set(toolData.id, { data: toolData });
+		this._onDidChangeToolsScheduler.schedule();
+
+		toolData.when?.keys().forEach(key => this._toolContextKeys.add(key));
+
+		return toDisposable(() => {
+			this._tools.delete(toolData.id);
+			this._refreshAllToolContextKeys();
+			this._onDidChangeToolsScheduler.schedule();
+		});
+	}
+
+	private _refreshAllToolContextKeys() {
+		this._toolContextKeys.clear();
+		for (const tool of this._tools.values()) {
+			tool.data.when?.keys().forEach(key => this._toolContextKeys.add(key));
+		}
+	}
+
+	registerToolImplementation(id: string, tool: IToolImpl): IDisposable {
+		const entry = this._tools.get(id);
+		if (!entry) {
+			throw new Error(`Tool "${id}" was not contributed.`);
+		}
+
+		if (entry.impl) {
+			throw new Error(`Tool "${id}" already has an implementation.`);
+		}
+
+		entry.impl = tool;
+		return toDisposable(() => {
+			entry.impl = undefined;
+		});
+	}
+
+	getTools(): Iterable<Readonly<IToolData>> {
+		const toolDatas = Iterable.map(this._tools.values(), i => i.data);
+		return Iterable.filter(toolDatas, toolData => !toolData.when || this._contextKeyService.contextMatchesRules(toolData.when));
+	}
+
+	getTool(id: string): IToolData | undefined {
+		return this._getToolEntry(id)?.data;
+	}
+
+	private _getToolEntry(id: string): IToolEntry | undefined {
+		const entry = this._tools.get(id);
+		if (entry && (!entry.data.when || this._contextKeyService.contextMatchesRules(entry.data.when))) {
+			return entry;
+		} else {
+			return undefined;
+		}
+	}
+
+	getToolByName(name: string): IToolData | undefined {
+		for (const toolData of this.getTools()) {
+			if (toolData.name === name) {
+				return toolData;
+			}
+		}
+		return undefined;
+	}
+
+	async invokeTool(dto: IToolInvocation, countTokens: CountTokensCallback, token: CancellationToken): Promise<IToolResult> {
+		// When invoking a tool, don't validate the "when" clause. An extension may have invoked a tool just as it was becoming disabled, and just let it go through rather than throw and break the chat.
+		let tool = this._tools.get(dto.toolId);
+		if (!tool) {
+			throw new Error(`Tool ${dto.toolId} was not contributed`);
+		}
+
+		if (!tool.impl) {
+			await this._extensionService.activateByEvent(`onLanguageModelTool:${dto.toolId}`);
+
+			// Extension should activate and register the tool implementation
+			tool = this._tools.get(dto.toolId);
+			if (!tool?.impl) {
+				throw new Error(`Tool ${dto.toolId} does not have an implementation registered.`);
+			}
+		}
+
+		// Shortcut to write to the model directly here, but could call all the way back to use the real stream.
+		let toolInvocation: ChatToolInvocation | undefined;
+		if (dto.context) {
+			const model = this._chatService.getSession(dto.context?.sessionId) as ChatModel;
+			const request = model.getRequests().at(-1)!;
+
+			// TODO if a tool requiresConfirmation but is not being invoked inside a chat session, we can show some other UI, like a modal notification
+			const participantName = request.response?.agent?.fullName ?? ''; // This should always be set in this scenario with a new live request
+
+			const getConfirmationMessages = async (): Promise<IToolConfirmationMessages | undefined> => {
+				if (!tool.data.requiresConfirmation) {
+					return undefined;
+				}
+
+				return (await tool.impl!.provideToolConfirmationMessages(participantName, dto.parameters, token)) ?? {
+					title: localize('toolConfirmTitle', "Use {0}?", `"${tool.data.displayName ?? tool.data.id}"`),
+					message: localize('toolConfirmMessage', "{0} will use {1}.", participantName, `"${tool.data.displayName ?? tool.data.id}"`),
+				};
+			};
+			const [invocationMessage, confirmationMessages] = await Promise.all([
+				tool.impl.provideToolInvocationMessage(dto.parameters, token),
+				getConfirmationMessages()
+			]);
+			const defaultMessage = localize('toolInvocationMessage', "Using {0}", `"${tool.data.displayName ?? tool.data.id}"`);
+			toolInvocation = new ChatToolInvocation(invocationMessage ?? defaultMessage, confirmationMessages);
+			token.onCancellationRequested(() => {
+				toolInvocation!.confirmed.complete(false);
+			});
+			model.acceptResponseProgress(request, toolInvocation);
+			if (tool.data.requiresConfirmation) {
+				const userConfirmed = await toolInvocation.confirmed.p;
+				if (!userConfirmed) {
+					throw new CancellationError();
+				}
+			}
+		}
+
+		try {
+			return tool.impl.invoke(dto, countTokens, token);
+		} finally {
+			toolInvocation?.complete();
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/common/languageModels.ts b/src/vs/workbench/contrib/chat/common/languageModels.ts
index 650d3a40c22..ee5b7d181c8 100644
--- a/src/vs/workbench/contrib/chat/common/languageModels.ts
+++ b/src/vs/workbench/contrib/chat/common/languageModels.ts
@@ -3,19 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Iterable } from 'vs/base/common/iterator';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { isFalsyOrWhitespace } from 'vs/base/common/strings';
-import { localize } from 'vs/nls';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProgress } from 'vs/platform/progress/common/progress';
-import { IExtensionService, isProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
-import { ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
+import { DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { isFalsyOrWhitespace } from '../../../../base/common/strings.js';
+import { localize } from '../../../../nls.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IExtensionService, isProposedApiEnabled } from '../../../services/extensions/common/extensions.js';
+import { ExtensionsRegistry } from '../../../services/extensions/common/extensionsRegistry.js';
+import { CONTEXT_LANGUAGE_MODELS_ARE_USER_SELECTABLE } from './chatContextKeys.js';
 
 export const enum ChatMessageRole {
 	System,
@@ -28,19 +29,19 @@ export interface IChatMessageTextPart {
 	value: string;
 }
 
-export interface IChatMessageFunctionResultPart {
-	type: 'function_result';
-	name: string;
+export interface IChatMessageToolResultPart {
+	type: 'tool_result';
+	toolCallId: string;
 	value: any;
 	isError?: boolean;
 }
 
-export type IChatMessagePart = IChatMessageTextPart | IChatMessageFunctionResultPart;
+export type IChatMessagePart = IChatMessageTextPart | IChatMessageToolResultPart | IChatResponseToolUsePart;
 
 export interface IChatMessage {
 	readonly name?: string | undefined;
 	readonly role: ChatMessageRole;
-	readonly content: IChatMessagePart;
+	readonly content: IChatMessagePart[];
 }
 
 export interface IChatResponseTextPart {
@@ -48,13 +49,14 @@ export interface IChatResponseTextPart {
 	value: string;
 }
 
-export interface IChatResponceFunctionUsePart {
-	type: 'function_use';
+export interface IChatResponseToolUsePart {
+	type: 'tool_use';
 	name: string;
+	toolCallId: string;
 	parameters: any;
 }
 
-export type IChatResponsePart = IChatResponseTextPart | IChatResponceFunctionUsePart;
+export type IChatResponsePart = IChatResponseTextPart | IChatResponseToolUsePart;
 
 export interface IChatResponseFragment {
 	index: number;
@@ -73,15 +75,22 @@ export interface ILanguageModelChatMetadata {
 	readonly maxOutputTokens: number;
 	readonly targetExtensions?: string[];
 
+	readonly isDefault?: boolean;
+	readonly isUserSelectable?: boolean;
 	readonly auth?: {
 		readonly providerLabel: string;
 		readonly accountLabel?: string;
 	};
 }
 
+export interface ILanguageModelChatResponse {
+	stream: AsyncIterable<IChatResponseFragment>;
+	result: Promise<any>;
+}
+
 export interface ILanguageModelChat {
 	metadata: ILanguageModelChatMetadata;
-	provideChatResponse(messages: IChatMessage[], from: ExtensionIdentifier, options: { [name: string]: any }, progress: IProgress<IChatResponseFragment>, token: CancellationToken): Promise<any>;
+	sendChatRequest(messages: IChatMessage[], from: ExtensionIdentifier, options: { [name: string]: any }, token: CancellationToken): Promise<ILanguageModelChatResponse>;
 	provideTokenCount(message: string | IChatMessage, token: CancellationToken): Promise<number>;
 }
 
@@ -119,7 +128,7 @@ export interface ILanguageModelsService {
 
 	registerLanguageModelChat(identifier: string, provider: ILanguageModelChat): IDisposable;
 
-	makeLanguageModelChatRequest(identifier: string, from: ExtensionIdentifier, messages: IChatMessage[], options: { [name: string]: any }, progress: IProgress<IChatResponseFragment>, token: CancellationToken): Promise<any>;
+	sendChatRequest(identifier: string, from: ExtensionIdentifier, messages: IChatMessage[], options: { [name: string]: any }, token: CancellationToken): Promise<ILanguageModelChatResponse>;
 
 	computeTokenLength(identifier: string, message: string | IChatMessage, token: CancellationToken): Promise<number>;
 }
@@ -169,10 +178,14 @@ export class LanguageModelsService implements ILanguageModelsService {
 	private readonly _onDidChangeProviders = this._store.add(new Emitter<ILanguageModelsChangeEvent>());
 	readonly onDidChangeLanguageModels: Event<ILanguageModelsChangeEvent> = this._onDidChangeProviders.event;
 
+	private readonly _hasUserSelectableModels: IContextKey<boolean>;
+
 	constructor(
 		@IExtensionService private readonly _extensionService: IExtensionService,
 		@ILogService private readonly _logService: ILogService,
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
 	) {
+		this._hasUserSelectableModels = CONTEXT_LANGUAGE_MODELS_ARE_USER_SELECTABLE.bindTo(this._contextKeyService);
 
 		this._store.add(languageModelExtensionPoint.setHandler((extensions) => {
 
@@ -270,7 +283,9 @@ export class LanguageModelsService implements ILanguageModelsService {
 		}
 		this._providers.set(identifier, provider);
 		this._onDidChangeProviders.fire({ added: [{ identifier, metadata: provider.metadata }] });
+		this.updateUserSelectableModelsContext();
 		return toDisposable(() => {
+			this.updateUserSelectableModelsContext();
 			if (this._providers.delete(identifier)) {
 				this._onDidChangeProviders.fire({ removed: [identifier] });
 				this._logService.trace('[LM] UNregistered language model chat', identifier, provider.metadata);
@@ -278,12 +293,19 @@ export class LanguageModelsService implements ILanguageModelsService {
 		});
 	}
 
-	makeLanguageModelChatRequest(identifier: string, from: ExtensionIdentifier, messages: IChatMessage[], options: { [name: string]: any }, progress: IProgress<IChatResponseFragment>, token: CancellationToken): Promise<any> {
+	private updateUserSelectableModelsContext() {
+		// This context key to enable the picker is set when there is a default model, and there is at least one other model that is user selectable
+		const hasUserSelectableModels = Array.from(this._providers.values()).some(p => p.metadata.isUserSelectable && !p.metadata.isDefault);
+		const hasDefaultModel = Array.from(this._providers.values()).some(p => p.metadata.isDefault);
+		this._hasUserSelectableModels.set(hasUserSelectableModels && hasDefaultModel);
+	}
+
+	async sendChatRequest(identifier: string, from: ExtensionIdentifier, messages: IChatMessage[], options: { [name: string]: any }, token: CancellationToken): Promise<ILanguageModelChatResponse> {
 		const provider = this._providers.get(identifier);
 		if (!provider) {
 			throw new Error(`Chat response provider with identifier ${identifier} is not registered.`);
 		}
-		return provider.provideChatResponse(messages, from, options, progress, token);
+		return provider.sendChatRequest(messages, from, options, token);
 	}
 
 	computeTokenLength(identifier: string, message: string | IChatMessage, token: CancellationToken): Promise<number> {
diff --git a/src/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution.ts b/src/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution.ts
new file mode 100644
index 00000000000..34b8ed6ecdd
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution.ts
@@ -0,0 +1,183 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+
+import { IJSONSchema } from '../../../../../base/common/jsonSchema.js';
+import { DisposableMap } from '../../../../../base/common/lifecycle.js';
+import { joinPath } from '../../../../../base/common/resources.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { localize } from '../../../../../nls.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { ExtensionIdentifier } from '../../../../../platform/extensions/common/extensions.js';
+import { ILogService } from '../../../../../platform/log/common/log.js';
+import { IWorkbenchContribution } from '../../../../common/contributions.js';
+import { ILanguageModelToolsService, IToolData } from '../languageModelToolsService.js';
+import * as extensionsRegistry from '../../../../services/extensions/common/extensionsRegistry.js';
+
+interface IRawToolContribution {
+	id: string;
+	name?: string;
+	icon?: string | { light: string; dark: string };
+	when?: string;
+	displayName?: string;
+	userDescription?: string;
+	modelDescription: string;
+	parametersSchema?: IJSONSchema;
+	canBeInvokedManually?: boolean;
+	supportedContentTypes?: string[];
+	requiresConfirmation?: boolean;
+}
+
+const languageModelToolsExtensionPoint = extensionsRegistry.ExtensionsRegistry.registerExtensionPoint<IRawToolContribution[]>({
+	extensionPoint: 'languageModelTools',
+	activationEventsGenerator: (contributions: IRawToolContribution[], result) => {
+		for (const contrib of contributions) {
+			result.push(`onLanguageModelTool:${contrib.id}`);
+		}
+	},
+	jsonSchema: {
+		description: localize('vscode.extension.contributes.tools', 'Contributes a tool that can be invoked by a language model.'),
+		type: 'array',
+		items: {
+			additionalProperties: false,
+			type: 'object',
+			defaultSnippets: [{ body: { name: '', description: '' } }],
+			required: ['id', 'modelDescription'],
+			properties: {
+				id: {
+					description: localize('toolId', "A unique id for this tool."),
+					type: 'string',
+					// Borrow OpenAI's requirement for tool names
+					pattern: '^[\\w-]+$'
+				},
+				name: {
+					description: localize('toolName', "If {0} is enabled for this tool, the user may use '#' with this name to invoke the tool in a query. Otherwise, the name is not required. Name must not contain whitespace.", '`canBeInvokedManually`'),
+					type: 'string',
+					pattern: '^[\\w-]+$'
+				},
+				displayName: {
+					description: localize('toolDisplayName', "A human-readable name for this tool that may be used to describe it in the UI."),
+					type: 'string'
+				},
+				userDescription: {
+					description: localize('toolUserDescription', "A description of this tool that may be shown to the user."),
+					type: 'string'
+				},
+				modelDescription: {
+					description: localize('toolModelDescription', "A description of this tool that may be passed to a language model."),
+					type: 'string'
+				},
+				parametersSchema: {
+					description: localize('parametersSchema', "A JSON schema for the parameters this tool accepts."),
+					type: 'object',
+					$ref: 'http://json-schema.org/draft-07/schema#'
+				},
+				canBeInvokedManually: {
+					description: localize('canBeInvokedManually', "Whether this tool can be invoked manually by the user through the chat UX."),
+					type: 'boolean'
+				},
+				icon: {
+					description: localize('icon', "An icon that represents this tool. Either a file path, an object with file paths for dark and light themes, or a theme icon reference, like `\\$(zap)`"),
+					anyOf: [{
+						type: 'string'
+					},
+					{
+						type: 'object',
+						properties: {
+							light: {
+								description: localize('icon.light', 'Icon path when a light theme is used'),
+								type: 'string'
+							},
+							dark: {
+								description: localize('icon.dark', 'Icon path when a dark theme is used'),
+								type: 'string'
+							}
+						}
+					}]
+				},
+				when: {
+					markdownDescription: localize('condition', "Condition which must be true for this tool to be enabled. Note that a tool may still be invoked by another extension even when its `when` condition is false."),
+					type: 'string'
+				},
+				supportedContentTypes: {
+					markdownDescription: localize('contentTypes', "The list of content types that this tool can return. It's required that tools support `text/plain`, and that is assumed even if not specified here. Another example could be the contentType exported by the `@vscode/prompt-tsx` library."),
+					type: 'array',
+					items: {
+						type: 'string'
+					}
+				},
+				requiresConfirmation: {
+					description: localize('requiresConfirmation', "Whether this tool requires user confirmation before being executed."),
+					type: 'boolean'
+				}
+			}
+		}
+	}
+});
+
+function toToolKey(extensionIdentifier: ExtensionIdentifier, toolName: string) {
+	return `${extensionIdentifier.value}/${toolName}`;
+}
+
+export class LanguageModelToolsExtensionPointHandler implements IWorkbenchContribution {
+	static readonly ID = 'workbench.contrib.toolsExtensionPointHandler';
+
+	private _registrationDisposables = new DisposableMap<string>();
+
+	constructor(
+		@ILanguageModelToolsService languageModelToolsService: ILanguageModelToolsService,
+		@ILogService logService: ILogService,
+	) {
+		languageModelToolsExtensionPoint.setHandler((extensions, delta) => {
+			for (const extension of delta.added) {
+				for (const rawTool of extension.value) {
+					if (!rawTool.id || !rawTool.modelDescription) {
+						logService.error(`Extension '${extension.description.identifier.value}' CANNOT register tool without name and modelDescription: ${JSON.stringify(rawTool)}`);
+						continue;
+					}
+
+					if (!rawTool.id.match(/^[\w-]+$/)) {
+						logService.error(`Extension '${extension.description.identifier.value}' CANNOT register tool with invalid id: ${rawTool.id}. The id must match /^[\\w-]+$/.`);
+						continue;
+					}
+
+					if (rawTool.canBeInvokedManually && !rawTool.name) {
+						logService.error(`Extension '${extension.description.identifier.value}' CANNOT register tool with 'canBeInvokedManually' set without a name: ${JSON.stringify(rawTool)}`);
+						continue;
+					}
+
+					const rawIcon = rawTool.icon;
+					let icon: IToolData['icon'] | undefined;
+					if (typeof rawIcon === 'string') {
+						icon = ThemeIcon.fromString(rawIcon) ?? {
+							dark: joinPath(extension.description.extensionLocation, rawIcon),
+							light: joinPath(extension.description.extensionLocation, rawIcon)
+						};
+					} else if (rawIcon) {
+						icon = {
+							dark: joinPath(extension.description.extensionLocation, rawIcon.dark),
+							light: joinPath(extension.description.extensionLocation, rawIcon.light)
+						};
+					}
+
+					const tool: IToolData = {
+						...rawTool,
+						icon,
+						when: rawTool.when ? ContextKeyExpr.deserialize(rawTool.when) : undefined,
+						supportedContentTypes: rawTool.supportedContentTypes ? rawTool.supportedContentTypes : [],
+					};
+					const disposable = languageModelToolsService.registerToolData(tool);
+					this._registrationDisposables.set(toToolKey(extension.description.identifier, rawTool.id), disposable);
+				}
+			}
+
+			for (const extension of delta.removed) {
+				for (const tool of extension.value) {
+					this._registrationDisposables.deleteAndDispose(toToolKey(extension.description.identifier, tool.id));
+				}
+			}
+		});
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/common/voiceChatService.ts b/src/vs/workbench/contrib/chat/common/voiceChatService.ts
index c162f5859d7..71ca69aecb1 100644
--- a/src/vs/workbench/contrib/chat/common/voiceChatService.ts
+++ b/src/vs/workbench/contrib/chat/common/voiceChatService.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { rtrim } from 'vs/base/common/strings';
-import { IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { IChatModel } from 'vs/workbench/contrib/chat/common/chatModel';
-import { chatAgentLeader, chatSubcommandLeader } from 'vs/workbench/contrib/chat/common/chatParserTypes';
-import { ISpeechService, ISpeechToTextEvent, SpeechToTextStatus } from 'vs/workbench/contrib/speech/common/speechService';
+import { localize } from '../../../../nls.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { rtrim } from '../../../../base/common/strings.js';
+import { IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IChatAgentService } from './chatAgents.js';
+import { IChatModel } from './chatModel.js';
+import { chatAgentLeader, chatSubcommandLeader } from './chatParserTypes.js';
+import { ISpeechService, ISpeechToTextEvent, SpeechToTextStatus } from '../../speech/common/speechService.js';
 
 export const IVoiceChatService = createDecorator<IVoiceChatService>('voiceChatService');
 
@@ -70,13 +70,13 @@ export class VoiceChatService extends Disposable implements IVoiceChatService {
 	private static readonly COMMAND_PREFIX = chatSubcommandLeader;
 
 	private static readonly PHRASES_LOWER = {
-		[VoiceChatService.AGENT_PREFIX]: 'at',
-		[VoiceChatService.COMMAND_PREFIX]: 'slash'
+		[this.AGENT_PREFIX]: 'at',
+		[this.COMMAND_PREFIX]: 'slash'
 	};
 
 	private static readonly PHRASES_UPPER = {
-		[VoiceChatService.AGENT_PREFIX]: 'At',
-		[VoiceChatService.COMMAND_PREFIX]: 'Slash'
+		[this.AGENT_PREFIX]: 'At',
+		[this.COMMAND_PREFIX]: 'Slash'
 	};
 
 	private static readonly CHAT_AGENT_ALIAS = new Map<string, string>([['vscode', 'code']]);
diff --git a/src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts b/src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts
index 1c0cdf3fe19..ca1bec64bec 100644
--- a/src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts
+++ b/src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts
@@ -3,67 +3,65 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/voiceChatActions';
-import { RunOnceScheduler, disposableTimeout, raceCancellation } from 'vs/base/common/async';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Codicon } from 'vs/base/common/codicons';
-import { Color } from 'vs/base/common/color';
-import { Event } from 'vs/base/common/event';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Disposable, DisposableStore, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { isNumber } from 'vs/base/common/types';
-import { getCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { localize, localize2 } from 'vs/nls';
-import { Action2, IAction2Options, MenuId } from 'vs/platform/actions/common/actions';
-import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { ContextKeyExpr, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ProgressLocation } from 'vs/platform/progress/common/progress';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { contrastBorder, focusBorder } from 'vs/platform/theme/common/colorRegistry';
-import { spinningLoading, syncing } from 'vs/platform/theme/common/iconRegistry';
-import { ColorScheme } from 'vs/platform/theme/common/theme';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { ActiveEditorContext } from 'vs/workbench/common/contextkeys';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { ACTIVITY_BAR_BADGE_BACKGROUND } from 'vs/workbench/common/theme';
-import { AccessibilityVoiceSettingId, SpeechTimeoutDefault, accessibilityConfigurationNodeBase } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { CHAT_CATEGORY } from 'vs/workbench/contrib/chat/browser/actions/chatActions';
-import { IChatExecuteActionContext } from 'vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
-import { IChatWidget, IChatWidgetService, IQuickChatService, showChatView } from 'vs/workbench/contrib/chat/browser/chat';
-import { ChatAgentLocation, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { CONTEXT_CHAT_REQUEST_IN_PROGRESS, CONTEXT_IN_CHAT_INPUT, CONTEXT_CHAT_ENABLED, CONTEXT_RESPONSE, CONTEXT_RESPONSE_FILTERED } from 'vs/workbench/contrib/chat/common/chatContextKeys';
-import { KEYWORD_ACTIVIATION_SETTING_ID } from 'vs/workbench/contrib/chat/common/chatService';
-import { isResponseVM } from 'vs/workbench/contrib/chat/common/chatViewModel';
-import { IVoiceChatService, VoiceChatInProgress as GlobalVoiceChatInProgress } from 'vs/workbench/contrib/chat/common/voiceChatService';
-import { IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions';
-import { InlineChatController } from 'vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { CTX_INLINE_CHAT_FOCUSED } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
-import { NOTEBOOK_EDITOR_FOCUSED } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { HasSpeechProvider, ISpeechService, KeywordRecognitionStatus, SpeechToTextInProgress, SpeechToTextStatus, TextToSpeechStatus, TextToSpeechInProgress as GlobalTextToSpeechInProgress } from 'vs/workbench/contrib/speech/common/speechService';
-import { ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { TerminalChatContextKeys, TerminalChatController } from 'vs/workbench/contrib/terminal/browser/terminalContribExports';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/browser/layoutService';
-import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment } from 'vs/workbench/services/statusbar/browser/statusbar';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { IChatResponseModel } from 'vs/workbench/contrib/chat/common/chatModel';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { renderStringAsPlaintext } from 'vs/base/browser/markdownRenderer';
+import './media/voiceChatActions.css';
+import { RunOnceScheduler, disposableTimeout, raceCancellation } from '../../../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { Color } from '../../../../../base/common/color.js';
+import { Event } from '../../../../../base/common/event.js';
+import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore, MutableDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { isNumber } from '../../../../../base/common/types.js';
+import { getCodeEditor } from '../../../../../editor/browser/editorBrowser.js';
+import { EditorContextKeys } from '../../../../../editor/common/editorContextKeys.js';
+import { localize, localize2 } from '../../../../../nls.js';
+import { Action2, IAction2Options, MenuId } from '../../../../../platform/actions/common/actions.js';
+import { CommandsRegistry, ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { Extensions, IConfigurationRegistry } from '../../../../../platform/configuration/common/configurationRegistry.js';
+import { ContextKeyExpr, IContextKeyService, RawContextKey } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ProgressLocation } from '../../../../../platform/progress/common/progress.js';
+import { Registry } from '../../../../../platform/registry/common/platform.js';
+import { contrastBorder, focusBorder } from '../../../../../platform/theme/common/colorRegistry.js';
+import { spinningLoading, syncing } from '../../../../../platform/theme/common/iconRegistry.js';
+import { ColorScheme } from '../../../../../platform/theme/common/theme.js';
+import { registerThemingParticipant } from '../../../../../platform/theme/common/themeService.js';
+import { ActiveEditorContext } from '../../../../common/contextkeys.js';
+import { IWorkbenchContribution } from '../../../../common/contributions.js';
+import { ACTIVITY_BAR_BADGE_BACKGROUND } from '../../../../common/theme.js';
+import { AccessibilityVoiceSettingId, SpeechTimeoutDefault, accessibilityConfigurationNodeBase } from '../../../accessibility/browser/accessibilityConfiguration.js';
+import { CHAT_CATEGORY } from '../../browser/actions/chatActions.js';
+import { IChatExecuteActionContext } from '../../browser/actions/chatExecuteActions.js';
+import { IChatWidget, IChatWidgetService, IQuickChatService, showChatView } from '../../browser/chat.js';
+import { ChatAgentLocation, IChatAgentService } from '../../common/chatAgents.js';
+import { CONTEXT_CHAT_REQUEST_IN_PROGRESS, CONTEXT_IN_CHAT_INPUT, CONTEXT_CHAT_ENABLED, CONTEXT_RESPONSE, CONTEXT_RESPONSE_FILTERED, CONTEXT_CHAT_LOCATION } from '../../common/chatContextKeys.js';
+import { KEYWORD_ACTIVIATION_SETTING_ID } from '../../common/chatService.js';
+import { ChatResponseViewModel, IChatResponseViewModel, isResponseVM } from '../../common/chatViewModel.js';
+import { IVoiceChatService, VoiceChatInProgress as GlobalVoiceChatInProgress } from '../../common/voiceChatService.js';
+import { IExtensionsWorkbenchService } from '../../../extensions/common/extensions.js';
+import { InlineChatController } from '../../../inlineChat/browser/inlineChatController.js';
+import { CTX_INLINE_CHAT_FOCUSED, MENU_INLINE_CHAT_WIDGET_SECONDARY } from '../../../inlineChat/common/inlineChat.js';
+import { NOTEBOOK_EDITOR_FOCUSED } from '../../../notebook/common/notebookContextKeys.js';
+import { HasSpeechProvider, ISpeechService, KeywordRecognitionStatus, SpeechToTextInProgress, SpeechToTextStatus, TextToSpeechStatus, TextToSpeechInProgress as GlobalTextToSpeechInProgress } from '../../../speech/common/speechService.js';
+import { ITerminalService } from '../../../terminal/browser/terminal.js';
+import { TerminalChatContextKeys, TerminalChatController } from '../../../terminal/terminalContribChatExports.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { IHostService } from '../../../../services/host/browser/host.js';
+import { IWorkbenchLayoutService, Parts } from '../../../../services/layout/browser/layoutService.js';
+import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment } from '../../../../services/statusbar/browser/statusbar.js';
+import { IViewsService } from '../../../../services/views/common/viewsService.js';
+import { IChatResponseModel } from '../../common/chatModel.js';
+import { IAccessibilityService } from '../../../../../platform/accessibility/common/accessibility.js';
+import { renderStringAsPlaintext } from '../../../../../base/browser/markdownRenderer.js';
 
 //#region Speech to Text
 
 type VoiceChatSessionContext = 'view' | 'inline' | 'terminal' | 'quick' | 'editor';
 const VoiceChatSessionContexts: VoiceChatSessionContext[] = ['view', 'inline', 'terminal', 'quick', 'editor'];
 
-const TerminalChatExecute = MenuId.for('terminalChatInput'); // unfortunately, terminal decided to go with their own menu (https://github.com/microsoft/vscode/issues/208789)
-
 // Global Context Keys (set on global context key service)
 const CanVoiceChat = ContextKeyExpr.and(CONTEXT_CHAT_ENABLED, HasSpeechProvider);
 const FocusInChatInput = ContextKeyExpr.or(CTX_INLINE_CHAT_FOCUSED, CONTEXT_IN_CHAT_INPUT);
@@ -148,7 +146,7 @@ class VoiceChatSessionControllerFactory {
 		// 1.) probe terminal chat which is not part of chat widget service
 		const activeInstance = terminalService.activeInstance;
 		if (activeInstance) {
-			const terminalChat = TerminalChatController.activeChatWidget || TerminalChatController.get(activeInstance);
+			const terminalChat = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance);
 			if (terminalChat?.hasFocus()) {
 				return VoiceChatSessionControllerFactory.doCreateForTerminalChat(terminalChat);
 			}
@@ -209,7 +207,7 @@ class VoiceChatSessionControllerFactory {
 			onDidAcceptInput: chatWidget.onDidAcceptInput,
 			onDidHideInput: chatWidget.onDidHide,
 			focusInput: () => chatWidget.focusInput(),
-			acceptInput: () => chatWidget.acceptInput(),
+			acceptInput: () => chatWidget.acceptInput(undefined, true),
 			updateInput: text => chatWidget.setInput(text),
 			getInput: () => chatWidget.getInput(),
 			setInputPlaceholder: text => chatWidget.setInputPlaceholder(text),
@@ -226,7 +224,7 @@ class VoiceChatSessionControllerFactory {
 			onDidAcceptInput: terminalChat.onDidAcceptInput,
 			onDidHideInput: terminalChat.onDidHide,
 			focusInput: () => terminalChat.focus(),
-			acceptInput: () => terminalChat.acceptInput(),
+			acceptInput: () => terminalChat.acceptInput(true),
 			updateInput: text => terminalChat.updateInput(text, false),
 			getInput: () => terminalChat.getInput(),
 			setInputPlaceholder: text => terminalChat.setPlaceholder(text),
@@ -247,6 +245,8 @@ interface IActiveVoiceChatSession extends IVoiceChatSession {
 	readonly id: number;
 	readonly controller: IVoiceChatSessionController;
 	readonly disposables: DisposableStore;
+
+	hasRecognizedInput: boolean;
 }
 
 class VoiceChatSessions {
@@ -282,6 +282,7 @@ class VoiceChatSessions {
 		const session: IActiveVoiceChatSession = this.currentVoiceChatSession = {
 			id: sessionId,
 			controller,
+			hasRecognizedInput: false,
 			disposables: new DisposableStore(),
 			setTimeoutDisabled: (disabled: boolean) => { disableTimeout = disabled; },
 			accept: () => this.accept(sessionId),
@@ -319,6 +320,7 @@ class VoiceChatSessions {
 					break;
 				case SpeechToTextStatus.Recognizing:
 					if (text) {
+						session.hasRecognizedInput = true;
 						session.controller.updateInput(inputValue ? [inputValue, text].join(' ') : text);
 						if (voiceChatTimeout > 0 && context?.voice?.disableTimeout !== true && !disableTimeout) {
 							acceptTranscriptionScheduler.cancel();
@@ -327,6 +329,7 @@ class VoiceChatSessions {
 					break;
 				case SpeechToTextStatus.Recognized:
 					if (text) {
+						session.hasRecognizedInput = true;
 						inputValue = inputValue ? [inputValue, text].join(' ') : text;
 						session.controller.updateInput(inputValue);
 						if (voiceChatTimeout > 0 && context?.voice?.disableTimeout !== true && !waitingForInput && !disableTimeout) {
@@ -383,16 +386,22 @@ class VoiceChatSessions {
 			return;
 		}
 
+		if (!this.currentVoiceChatSession.hasRecognizedInput) {
+			// If we have an active session but without recognized
+			// input, we do not want to just accept the input that
+			// was maybe typed before. But we still want to stop the
+			// voice session because `acceptInput` would do that.
+			this.stop(voiceChatSessionId, this.currentVoiceChatSession.controller.context);
+			return;
+		}
+
 		const controller = this.currentVoiceChatSession.controller;
 		const response = await controller.acceptInput();
 		if (!response) {
 			return;
 		}
-
-		if (
-			!this.accessibilityService.isScreenReaderOptimized() && // do not auto synthesize when screen reader is active
-			this.configurationService.getValue<boolean>(AccessibilityVoiceSettingId.AutoSynthesize) === true
-		) {
+		const autoSynthesize = this.configurationService.getValue<'on' | 'off' | 'auto'>(AccessibilityVoiceSettingId.AutoSynthesize);
+		if (autoSynthesize === 'on' || autoSynthesize === 'auto' && !this.accessibilityService.isScreenReaderOptimized()) {
 			let context: IVoiceChatSessionController | 'focused';
 			if (controller.context === 'inline') {
 				// TODO@bpasero this is ugly, but the lightweight inline chat turns into
@@ -560,6 +569,12 @@ export class StartVoiceChatAction extends Action2 {
 	static readonly ID = 'workbench.action.chat.startVoiceChat';
 
 	constructor() {
+		const menuCondition = ContextKeyExpr.and(
+			HasSpeechProvider,
+			ScopedChatSynthesisInProgress.negate(),	// hide when text to speech is in progress
+			AnyScopedVoiceChatInProgress?.negate(),	// hide when voice chat is in progress
+		);
+
 		super({
 			id: StartVoiceChatAction.ID,
 			title: localize2('workbench.action.chat.startVoiceChat.label', "Start Voice Chat"),
@@ -581,25 +596,20 @@ export class StartVoiceChatAction extends Action2 {
 				AnyChatRequestInProgress?.negate(),		// disable when any chat request is in progress
 				SpeechToTextInProgress.negate()			// disable when speech to text is in progress
 			),
-			menu: [{
-				id: MenuId.ChatExecute,
-				when: ContextKeyExpr.and(
-					HasSpeechProvider,
-					ScopedChatSynthesisInProgress.negate(),	// hide when text to speech is in progress
-					AnyScopedVoiceChatInProgress?.negate(),	// hide when voice chat is in progress
-				),
-				group: 'navigation',
-				order: -1
-			}, {
-				id: TerminalChatExecute,
-				when: ContextKeyExpr.and(
-					HasSpeechProvider,
-					ScopedChatSynthesisInProgress.negate(),	// hide when text to speech is in progress
-					AnyScopedVoiceChatInProgress?.negate(),	// hide when voice chat is in progress
-				),
-				group: 'navigation',
-				order: -1
-			}]
+			menu: [
+				{
+					id: MenuId.ChatInput,
+					when: ContextKeyExpr.and(ContextKeyExpr.or(CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Panel), CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.EditingSession)), menuCondition),
+					group: 'navigation',
+					order: 3
+				},
+				{
+					id: MenuId.ChatExecute,
+					when: ContextKeyExpr.and(CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Panel).negate(), menuCondition),
+					group: 'navigation',
+					order: 2
+				},
+			]
 		});
 	}
 
@@ -634,17 +644,20 @@ export class StopListeningAction extends Action2 {
 			},
 			icon: spinningLoading,
 			precondition: GlobalVoiceChatInProgress, // need global context here because of `f1: true`
-			menu: [{
-				id: MenuId.ChatExecute,
-				when: AnyScopedVoiceChatInProgress,
-				group: 'navigation',
-				order: -1
-			}, {
-				id: TerminalChatExecute,
-				when: AnyScopedVoiceChatInProgress,
-				group: 'navigation',
-				order: -1
-			}]
+			menu: [
+				{
+					id: MenuId.ChatInput,
+					when: ContextKeyExpr.and(CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Panel), AnyScopedVoiceChatInProgress),
+					group: 'navigation',
+					order: 3
+				},
+				{
+					id: MenuId.ChatExecute,
+					when: ContextKeyExpr.and(CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Panel).negate(), AnyScopedVoiceChatInProgress),
+					group: 'navigation',
+					order: 2
+				},
+			]
 		});
 	}
 
@@ -716,7 +729,7 @@ class ChatSynthesizerSessionController {
 		// 1.) probe terminal chat which is not part of chat widget service
 		const activeInstance = terminalService.activeInstance;
 		if (activeInstance) {
-			const terminalChat = TerminalChatController.activeChatWidget || TerminalChatController.get(activeInstance);
+			const terminalChat = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance);
 			if (terminalChat?.hasFocus()) {
 				return {
 					onDidHideChat: terminalChat.onDidHide,
@@ -805,7 +818,7 @@ class ChatSynthesizerSessions {
 		let totalOffset = 0;
 		let complete = false;
 		do {
-			const responseLength = response.response.asString().length;
+			const responseLength = response.response.toString().length;
 			const { chunk, offset } = this.parseNextChatResponseChunk(response, totalOffset);
 			totalOffset = offset;
 			complete = response.isComplete;
@@ -818,7 +831,7 @@ class ChatSynthesizerSessions {
 				return;
 			}
 
-			if (!complete && responseLength === response.response.asString().length) {
+			if (!complete && responseLength === response.response.toString().length) {
 				await raceCancellation(Event.toPromise(response.onDidChange), token); // wait for the response to change
 			}
 		} while (!token.isCancellationRequested && !complete);
@@ -827,7 +840,7 @@ class ChatSynthesizerSessions {
 	private parseNextChatResponseChunk(response: IChatResponseModel, offset: number): { readonly chunk: string | undefined; readonly offset: number } {
 		let chunk: string | undefined = undefined;
 
-		const text = response.response.asString();
+		const text = response.response.toString();
 
 		if (response.isComplete) {
 			chunk = text.substring(offset);
@@ -880,8 +893,17 @@ export class ReadChatResponseAloud extends Action2 {
 			title: localize2('workbench.action.chat.readChatResponseAloud', "Read Aloud"),
 			icon: Codicon.unmute,
 			precondition: CanVoiceChat,
-			menu: {
-				id: MenuId.ChatMessageTitle,
+			menu: [{
+				id: MenuId.ChatMessageFooter,
+				when: ContextKeyExpr.and(
+					CanVoiceChat,
+					CONTEXT_RESPONSE,						// only for responses
+					ScopedChatSynthesisInProgress.negate(),	// but not when already in progress
+					CONTEXT_RESPONSE_FILTERED.negate(),		// and not when response is filtered
+				),
+				group: 'navigation'
+			}, {
+				id: MENU_INLINE_CHAT_WIDGET_SECONDARY,
 				when: ContextKeyExpr.and(
 					CanVoiceChat,
 					CONTEXT_RESPONSE,						// only for responses
@@ -889,15 +911,48 @@ export class ReadChatResponseAloud extends Action2 {
 					CONTEXT_RESPONSE_FILTERED.negate()		// and not when response is filtered
 				),
 				group: 'navigation'
-			}
+			}]
 		});
 	}
 
 	run(accessor: ServicesAccessor, ...args: any[]) {
 		const instantiationService = accessor.get(IInstantiationService);
+		const chatWidgetService = accessor.get(IChatWidgetService);
 
-		const response = args[0];
-		if (!isResponseVM(response)) {
+		let response: IChatResponseViewModel | undefined = undefined;
+		if (args.length > 0) {
+			const responseArg = args[0];
+			if (isResponseVM(responseArg)) {
+				response = responseArg;
+			}
+		} else {
+			const chatWidget = chatWidgetService.lastFocusedWidget;
+			if (chatWidget) {
+
+				// pick focused response
+				const focus = chatWidget.getFocus();
+				if (focus instanceof ChatResponseViewModel) {
+					response = focus;
+				}
+
+				// pick the last response
+				else {
+					const chatViewModel = chatWidget.viewModel;
+					if (chatViewModel) {
+						const items = chatViewModel.getItems();
+						for (let i = items.length - 1; i >= 0; i--) {
+							const item = items[i];
+							if (isResponseVM(item)) {
+								response = item;
+								break;
+							}
+						}
+					}
+				}
+			}
+		}
+
+		if (!response) {
 			return;
 		}
 
@@ -925,17 +980,17 @@ export class StopReadAloud extends Action2 {
 			},
 			menu: [
 				{
-					id: MenuId.ChatExecute,
-					when: ScopedChatSynthesisInProgress,
+					id: MenuId.ChatInput,
+					when: ContextKeyExpr.and(CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Panel), ScopedChatSynthesisInProgress),
 					group: 'navigation',
-					order: -1
+					order: 3
 				},
 				{
-					id: TerminalChatExecute,
-					when: ScopedChatSynthesisInProgress,
+					id: MenuId.ChatExecute,
+					when: ContextKeyExpr.and(CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Panel).negate(), ScopedChatSynthesisInProgress),
 					group: 'navigation',
-					order: -1
-				}
+					order: 2
+				},
 			]
 		});
 	}
@@ -961,7 +1016,16 @@ export class StopReadChatItemAloud extends Action2 {
 			},
 			menu: [
 				{
-					id: MenuId.ChatMessageTitle,
+					id: MenuId.ChatMessageFooter,
+					when: ContextKeyExpr.and(
+						ScopedChatSynthesisInProgress,		// only when in progress
+						CONTEXT_RESPONSE,					// only for responses
+						CONTEXT_RESPONSE_FILTERED.negate()	// but not when response is filtered
+					),
+					group: 'navigation'
+				},
+				{
+					id: MENU_INLINE_CHAT_WIDGET_SECONDARY,
 					when: ContextKeyExpr.and(
 						ScopedChatSynthesisInProgress,		// only when in progress
 						CONTEXT_RESPONSE,					// only for responses
@@ -1260,15 +1324,10 @@ export class InstallSpeechProviderForVoiceChatAction extends BaseInstallSpeechPr
 			icon: Codicon.mic,
 			precondition: InstallingSpeechProvider.negate(),
 			menu: [{
-				id: MenuId.ChatExecute,
+				id: MenuId.ChatInput,
 				when: HasSpeechProvider.negate(),
 				group: 'navigation',
-				order: -1
-			}, {
-				id: TerminalChatExecute,
-				when: HasSpeechProvider.negate(),
-				group: 'navigation',
-				order: -1
+				order: 3
 			}]
 		});
 	}
@@ -1278,29 +1337,6 @@ export class InstallSpeechProviderForVoiceChatAction extends BaseInstallSpeechPr
 	}
 }
 
-export class InstallSpeechProviderForSynthesizeChatAction extends BaseInstallSpeechProviderAction {
-
-	static readonly ID = 'workbench.action.chat.installProviderForSynthesis';
-
-	constructor() {
-		super({
-			id: InstallSpeechProviderForSynthesizeChatAction.ID,
-			title: localize2('workbench.action.chat.installProviderForSynthesis.label', "Read Aloud"),
-			icon: Codicon.unmute,
-			precondition: InstallingSpeechProvider.negate(),
-			menu: [{
-				id: MenuId.ChatMessageTitle,
-				when: HasSpeechProvider.negate(),
-				group: 'navigation'
-			}]
-		});
-	}
-
-	protected getJustification(): string {
-		return localize('installProviderForSynthesis.justification', "Speaker support requires this extension.");
-	}
-}
-
 //#endregion
 
 registerThemingParticipant((theme, collector) => {
diff --git a/src/vs/workbench/contrib/chat/electron-sandbox/chat.contribution.ts b/src/vs/workbench/contrib/chat/electron-sandbox/chat.contribution.ts
index 9fca2cd9497..0e888b7f864 100644
--- a/src/vs/workbench/contrib/chat/electron-sandbox/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/electron-sandbox/chat.contribution.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { InlineVoiceChatAction, QuickVoiceChatAction, StartVoiceChatAction, VoiceChatInChatViewAction, StopListeningAction, StopListeningAndSubmitAction, KeywordActivationContribution, InstallSpeechProviderForSynthesizeChatAction, InstallSpeechProviderForVoiceChatAction, HoldToVoiceChatInChatViewAction, ReadChatResponseAloud, StopReadAloud, StopReadChatItemAloud } from 'vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions';
-import { registerAction2 } from 'vs/platform/actions/common/actions';
-import { WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
+import { InlineVoiceChatAction, QuickVoiceChatAction, StartVoiceChatAction, VoiceChatInChatViewAction, StopListeningAction, StopListeningAndSubmitAction, KeywordActivationContribution, InstallSpeechProviderForVoiceChatAction, HoldToVoiceChatInChatViewAction, ReadChatResponseAloud, StopReadAloud, StopReadChatItemAloud } from './actions/voiceChatActions.js';
+import { registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
 
 registerAction2(StartVoiceChatAction);
 registerAction2(InstallSpeechProviderForVoiceChatAction);
@@ -21,6 +21,5 @@ registerAction2(StopListeningAndSubmitAction);
 registerAction2(ReadChatResponseAloud);
 registerAction2(StopReadChatItemAloud);
 registerAction2(StopReadAloud);
-registerAction2(InstallSpeechProviderForSynthesizeChatAction);
 
 registerWorkbenchContribution2(KeywordActivationContribution.ID, KeywordActivationContribution, WorkbenchPhase.AfterRestored);
diff --git a/src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_invalid_HTML.0.snap b/src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_invalid_HTML.0.snap
index 0d3458d76b7..9bfd3b945e8 100644
--- a/src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_invalid_HTML.0.snap
+++ b/src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_invalid_HTML.0.snap
@@ -1 +1 @@
-<div class="rendered-markdown">1&lt;canvas&gt;2&lt;details&gt;3&lt;/details&gt;&lt;/canvas&gt;4</div>
\ No newline at end of file
+<div class="rendered-markdown"><p>1&lt;canvas&gt;2&lt;/canvas&gt;</p>&lt;details&gt;3&lt;/details&gt;4<p></p></div>
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_invalid_HTML_with_attributes.0.snap b/src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_invalid_HTML_with_attributes.0.snap
index 3bb96899c11..c0b5a277aac 100644
--- a/src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_invalid_HTML_with_attributes.0.snap
+++ b/src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_invalid_HTML_with_attributes.0.snap
@@ -1 +1 @@
-<div class="rendered-markdown">1&lt;details id="id1" style="display: none"&gt;2&lt;details id="my id 2"&gt;3&lt;/details&gt;&lt;/details&gt;4</div>
\ No newline at end of file
+<div class="rendered-markdown"><p>1</p>&lt;details id="id1" style="display: none"&gt;2&lt;details id="my id 2"&gt;3&lt;/details&gt;&lt;/details&gt;4<p></p></div>
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_remote_images.0.snap b/src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_remote_images.0.snap
index 34a719b0613..1241ef62b5f 100644
--- a/src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_remote_images.0.snap
+++ b/src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_remote_images.0.snap
@@ -1 +1 @@
-<div class="rendered-markdown"><img src="http://allowed.com/image.jpg"> <div>&lt;img src="http://disallowed.com/image.jpg"&gt;</div></div>
\ No newline at end of file
+<div class="rendered-markdown"><p><img src="http://allowed.com/image.jpg"> </p><div>&lt;img src="http://disallowed.com/image.jpg"&gt;</div><p></p></div>
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_self-closing_elements.0.snap b/src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_self-closing_elements.0.snap
index 023b2e6a846..5b482726d3a 100644
--- a/src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_self-closing_elements.0.snap
+++ b/src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_self-closing_elements.0.snap
@@ -1 +1 @@
-<div class="rendered-markdown">&lt;area&gt;<hr><br>&lt;input type="text" value="test"&gt;</div>
\ No newline at end of file
+<div class="rendered-markdown"><p>&lt;area&gt;</p><hr><br>&lt;input type="text" value="test"&gt;<p></p></div>
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_supportHtml_with_one-line_markdown.0.snap b/src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_supportHtml_with_one-line_markdown.0.snap
new file mode 100644
index 00000000000..89991e7676e
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_supportHtml_with_one-line_markdown.0.snap
@@ -0,0 +1 @@
+<div class="rendered-markdown"><p><strong>hello</strong></p></div>
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_supportHtml_with_one-line_markdown.1.snap b/src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_supportHtml_with_one-line_markdown.1.snap
new file mode 100644
index 00000000000..b9ca8267b0c
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_supportHtml_with_one-line_markdown.1.snap
@@ -0,0 +1,4 @@
+<div class="rendered-markdown"><ol>
+<li><a data-href="https://example.com" href="" title="" draggable="false"><em>hello</em></a> test <strong>text</strong></li>
+</ol>
+</div>
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/chat/test/browser/chatMarkdownRenderer.test.ts b/src/vs/workbench/contrib/chat/test/browser/chatMarkdownRenderer.test.ts
index e9975f25283..11e622395c4 100644
--- a/src/vs/workbench/contrib/chat/test/browser/chatMarkdownRenderer.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/chatMarkdownRenderer.test.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { assertSnapshot } from 'vs/base/test/common/snapshot';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ChatMarkdownRenderer } from 'vs/workbench/contrib/chat/browser/chatMarkdownRenderer';
-import { ITrustedDomainService } from 'vs/workbench/contrib/url/browser/trustedDomainService';
-import { MockTrustedDomainService } from 'vs/workbench/contrib/url/test/browser/mockTrustedDomainService';
-import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
+import { MarkdownString } from '../../../../../base/common/htmlContent.js';
+import { assertSnapshot } from '../../../../../base/test/common/snapshot.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { ChatMarkdownRenderer } from '../../browser/chatMarkdownRenderer.js';
+import { ITrustedDomainService } from '../../../url/browser/trustedDomainService.js';
+import { MockTrustedDomainService } from '../../../url/test/browser/mockTrustedDomainService.js';
+import { workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
 
 suite('ChatMarkdownRenderer', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
@@ -27,6 +27,18 @@ suite('ChatMarkdownRenderer', () => {
 		await assertSnapshot(result.element.textContent);
 	});
 
+	test('supportHtml with one-line markdown', async () => {
+		const md = new MarkdownString('**hello**');
+		md.supportHtml = true;
+		const result = store.add(testRenderer.render(md));
+		await assertSnapshot(result.element.outerHTML);
+
+		const md2 = new MarkdownString('1. [_hello_](https://example.com) test **text**');
+		md2.supportHtml = true;
+		const result2 = store.add(testRenderer.render(md2));
+		await assertSnapshot(result2.element.outerHTML);
+	});
+
 	test('invalid HTML', async () => {
 		const md = new MarkdownString('1<canvas>2<details>3</details></canvas>4');
 		md.supportHtml = true;
diff --git a/src/vs/workbench/contrib/chat/test/browser/chatVariables.test.ts b/src/vs/workbench/contrib/chat/test/browser/chatVariables.test.ts
index 2da25bc9817..c061fd10cb8 100644
--- a/src/vs/workbench/contrib/chat/test/browser/chatVariables.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/chatVariables.test.ts
@@ -4,23 +4,25 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { ILogService, NullLogService } from 'vs/platform/log/common/log';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ChatVariablesService } from 'vs/workbench/contrib/chat/browser/chatVariables';
-import { ChatAgentService, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { ChatRequestParser } from 'vs/workbench/contrib/chat/common/chatRequestParser';
-import { IChatService } from 'vs/workbench/contrib/chat/common/chatService';
-import { IChatVariablesService } from 'vs/workbench/contrib/chat/common/chatVariables';
-import { MockChatWidgetService } from 'vs/workbench/contrib/chat/test/browser/mockChatWidget';
-import { MockChatService } from 'vs/workbench/contrib/chat/test/common/mockChatService';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { TestViewsService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { TestExtensionService, TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { MockContextKeyService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { ILogService, NullLogService } from '../../../../../platform/log/common/log.js';
+import { IStorageService } from '../../../../../platform/storage/common/storage.js';
+import { ChatVariablesService } from '../../browser/chatVariables.js';
+import { ChatAgentService, IChatAgentService } from '../../common/chatAgents.js';
+import { ChatRequestParser } from '../../common/chatRequestParser.js';
+import { IChatService } from '../../common/chatService.js';
+import { IChatVariablesService } from '../../common/chatVariables.js';
+import { ILanguageModelToolsService } from '../../common/languageModelToolsService.js';
+import { MockChatWidgetService } from './mockChatWidget.js';
+import { MockChatService } from '../common/mockChatService.js';
+import { MockLanguageModelToolsService } from '../common/mockLanguageModelToolsService.js';
+import { IExtensionService } from '../../../../services/extensions/common/extensions.js';
+import { TestViewsService } from '../../../../test/browser/workbenchTestServices.js';
+import { TestExtensionService, TestStorageService } from '../../../../test/common/workbenchTestServices.js';
 
 suite('ChatVariables', function () {
 
@@ -37,6 +39,7 @@ suite('ChatVariables', function () {
 		instantiationService.stub(IChatVariablesService, service);
 		instantiationService.stub(IChatService, new MockChatService());
 		instantiationService.stub(IContextKeyService, new MockContextKeyService());
+		instantiationService.stub(ILanguageModelToolsService, new MockLanguageModelToolsService());
 		instantiationService.stub(IChatAgentService, instantiationService.createInstance(ChatAgentService));
 	});
 
diff --git a/src/vs/workbench/contrib/chat/test/browser/languageModelToolsService.test.ts b/src/vs/workbench/contrib/chat/test/browser/languageModelToolsService.test.ts
new file mode 100644
index 00000000000..e2beaf638f1
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/languageModelToolsService.test.ts
@@ -0,0 +1,128 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { ContextKeyService } from '../../../../../platform/contextkey/browser/contextKeyService.js';
+import { ContextKeyEqualsExpr, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { TestExtensionService } from '../../../../test/common/workbenchTestServices.js';
+import { IToolData, IToolImpl, IToolInvocation, LanguageModelToolsService } from '../../common/languageModelToolsService.js';
+import { MockChatService } from '../common/mockChatService.js';
+
+suite('LanguageModelToolsService', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let contextKeyService: IContextKeyService;
+	let service: LanguageModelToolsService;
+
+	setup(() => {
+		const extensionService = new TestExtensionService();
+		contextKeyService = store.add(new ContextKeyService(new TestConfigurationService()));
+		service = store.add(new LanguageModelToolsService(extensionService, contextKeyService, new MockChatService()));
+	});
+
+	test('registerToolData', () => {
+		const toolData: IToolData = {
+			id: 'testTool',
+			modelDescription: 'Test Tool',
+			supportedContentTypes: []
+		};
+
+		const disposable = service.registerToolData(toolData);
+		assert.strictEqual(service.getTool('testTool')?.id, 'testTool');
+		disposable.dispose();
+		assert.strictEqual(service.getTool('testTool'), undefined);
+	});
+
+	test('registerToolImplementation', () => {
+		const toolData: IToolData = {
+			id: 'testTool',
+			modelDescription: 'Test Tool',
+			supportedContentTypes: []
+		};
+
+		store.add(service.registerToolData(toolData));
+
+		const toolImpl: IToolImpl = {
+			invoke: async () => ({ 'text/plain': 'result' }),
+			provideToolInvocationMessage: async () => 'test',
+			provideToolConfirmationMessages: async () => ({ title: 'test', message: 'test' }),
+		};
+
+		store.add(service.registerToolImplementation('testTool', toolImpl));
+		assert.strictEqual(service.getTool('testTool')?.id, 'testTool');
+	});
+
+	test('getTools', () => {
+		contextKeyService.createKey('testKey', true);
+		const toolData1: IToolData = {
+			id: 'testTool1',
+			modelDescription: 'Test Tool 1',
+			when: ContextKeyEqualsExpr.create('testKey', false),
+			supportedContentTypes: []
+		};
+
+		const toolData2: IToolData = {
+			id: 'testTool2',
+			modelDescription: 'Test Tool 2',
+			when: ContextKeyEqualsExpr.create('testKey', true),
+			supportedContentTypes: []
+		};
+
+		const toolData3: IToolData = {
+			id: 'testTool3',
+			modelDescription: 'Test Tool 3',
+			supportedContentTypes: []
+		};
+
+		store.add(service.registerToolData(toolData1));
+		store.add(service.registerToolData(toolData2));
+		store.add(service.registerToolData(toolData3));
+
+		const tools = Array.from(service.getTools());
+		assert.strictEqual(tools.length, 2);
+		assert.strictEqual(tools[0].id, 'testTool2');
+		assert.strictEqual(tools[1].id, 'testTool3');
+	});
+
+	test('invokeTool', async () => {
+		const toolData: IToolData = {
+			id: 'testTool',
+			modelDescription: 'Test Tool',
+			supportedContentTypes: []
+		};
+
+		store.add(service.registerToolData(toolData));
+
+		const toolImpl: IToolImpl = {
+			invoke: async (invocation) => {
+				assert.strictEqual(invocation.callId, '1');
+				assert.strictEqual(invocation.toolId, 'testTool');
+				assert.deepStrictEqual(invocation.parameters, { a: 1 });
+				return { 'text/plain': 'result' };
+			},
+			provideToolInvocationMessage: async () => 'test',
+			provideToolConfirmationMessages: async () => ({ title: 'test', message: 'test' }),
+		};
+
+		store.add(service.registerToolImplementation('testTool', toolImpl));
+
+		const dto: IToolInvocation = {
+			callId: '1',
+			toolId: 'testTool',
+			tokenBudget: 100,
+			parameters: {
+				a: 1
+			},
+			context: undefined,
+			requestedContentTypes: ['text/plain']
+		};
+
+		const result = await service.invokeTool(dto, async () => 0, CancellationToken.None);
+		assert.strictEqual(result['text/plain'], 'result');
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/browser/mockChatWidget.ts b/src/vs/workbench/contrib/chat/test/browser/mockChatWidget.ts
index 472877f3e4b..8bf8cbebd77 100644
--- a/src/vs/workbench/contrib/chat/test/browser/mockChatWidget.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/mockChatWidget.ts
@@ -3,8 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { IChatWidget, IChatWidgetService } from 'vs/workbench/contrib/chat/browser/chat';
+import { URI } from '../../../../../base/common/uri.js';
+import { IChatWidget, IChatWidgetService } from '../../browser/chat.js';
+import { ChatAgentLocation } from '../../common/chatAgents.js';
 
 export class MockChatWidgetService implements IChatWidgetService {
 	readonly _serviceBrand: undefined;
@@ -21,4 +22,8 @@ export class MockChatWidgetService implements IChatWidgetService {
 	getWidgetBySessionId(sessionId: string): IChatWidget | undefined {
 		return undefined;
 	}
+
+	getWidgetByLocation(location: ChatAgentLocation): IChatWidget[] {
+		return [];
+	}
 }
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_and_subcommand_after_newline.0.snap b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_and_subcommand_after_newline.0.snap
index bffaba0f3ea..a71a6928c26 100644
--- a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_and_subcommand_after_newline.0.snap
+++ b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_and_subcommand_after_newline.0.snap
@@ -42,7 +42,8 @@
             name: "subCommand",
             description: ""
           }
-        ]
+        ],
+        disambiguation: [  ]
       },
       kind: "agent"
     },
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_and_subcommand_with_leading_whitespace.0.snap b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_and_subcommand_with_leading_whitespace.0.snap
index b2392476b7c..4ca12379473 100644
--- a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_and_subcommand_with_leading_whitespace.0.snap
+++ b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_and_subcommand_with_leading_whitespace.0.snap
@@ -42,7 +42,8 @@
             name: "subCommand",
             description: ""
           }
-        ]
+        ],
+        disambiguation: [  ]
       },
       kind: "agent"
     },
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_with_question_mark.0.snap b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_with_question_mark.0.snap
index 1965499f050..ca95c7e1cfa 100644
--- a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_with_question_mark.0.snap
+++ b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_with_question_mark.0.snap
@@ -28,7 +28,8 @@
             name: "subCommand",
             description: ""
           }
-        ]
+        ],
+        disambiguation: [  ]
       },
       kind: "agent"
     },
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_with_subcommand_after_text.0.snap b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_with_subcommand_after_text.0.snap
index 4ec681f874b..c062f9c138a 100644
--- a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_with_subcommand_after_text.0.snap
+++ b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_with_subcommand_after_text.0.snap
@@ -28,7 +28,8 @@
             name: "subCommand",
             description: ""
           }
-        ]
+        ],
+        disambiguation: [  ]
       },
       kind: "agent"
     },
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agents__subCommand.0.snap b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agents__subCommand.0.snap
index fde8b6955f1..22098b4e0de 100644
--- a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agents__subCommand.0.snap
+++ b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agents__subCommand.0.snap
@@ -28,7 +28,8 @@
             name: "subCommand",
             description: ""
           }
-        ]
+        ],
+        disambiguation: [  ]
       },
       kind: "agent"
     },
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agents_and_variables_and_multiline.0.snap b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agents_and_variables_and_multiline.0.snap
index 0a210c51cfc..c2d6131922c 100644
--- a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agents_and_variables_and_multiline.0.snap
+++ b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agents_and_variables_and_multiline.0.snap
@@ -28,7 +28,8 @@
             name: "subCommand",
             description: ""
           }
-        ]
+        ],
+        disambiguation: [  ]
       },
       kind: "agent"
     },
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agents_and_variables_and_multiline__part2.0.snap b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agents_and_variables_and_multiline__part2.0.snap
index 874558504ef..2362eb812d3 100644
--- a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agents_and_variables_and_multiline__part2.0.snap
+++ b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agents_and_variables_and_multiline__part2.0.snap
@@ -28,7 +28,8 @@
             name: "subCommand",
             description: ""
           }
-        ]
+        ],
+        disambiguation: [  ]
       },
       kind: "agent"
     },
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_can_deserialize.0.snap b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_can_deserialize.0.snap
index 383288306cb..8272d389c81 100644
--- a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_can_deserialize.0.snap
+++ b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_can_deserialize.0.snap
@@ -4,7 +4,6 @@
   responderUsername: "",
   responderAvatarIconUri: undefined,
   initialLocation: "panel",
-  welcomeMessage: undefined,
   requests: [
     {
       message: {
@@ -33,7 +32,8 @@
               extensionDisplayName: "",
               locations: [ "panel" ],
               metadata: {  },
-              slashCommands: [  ]
+              slashCommands: [  ],
+              disambiguation: [  ]
             },
             kind: "agent"
           },
@@ -59,6 +59,7 @@
       followups: undefined,
       isCanceled: false,
       vote: undefined,
+      voteDownReason: undefined,
       agent: {
         name: "ChatProviderWithUsedContext",
         id: "ChatProviderWithUsedContext",
@@ -71,21 +72,14 @@
         extensionDisplayName: "",
         locations: [ "panel" ],
         metadata: {  },
-        slashCommands: [  ]
+        slashCommands: [  ],
+        disambiguation: [  ]
       },
       slashCommand: undefined,
       usedContext: {
         documents: [
           {
-            uri: {
-              scheme: "file",
-              authority: "",
-              path: "/test/path/to/file",
-              query: "",
-              fragment: "",
-              _formatted: null,
-              _fsPath: null
-            },
+            uri: URI(file:///test/path/to/file),
             version: 3,
             ranges: [
               {
@@ -99,7 +93,8 @@
         ],
         kind: "usedContext"
       },
-      contentReferences: [  ]
+      contentReferences: [  ],
+      codeCitations: [  ]
     }
   ]
 }
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_can_serialize.0.snap b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_can_serialize.0.snap
index a0e87754398..404cd0188d2 100644
--- a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_can_serialize.0.snap
+++ b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_can_serialize.0.snap
@@ -4,6 +4,5 @@
   responderUsername: "",
   responderAvatarIconUri: undefined,
   initialLocation: "panel",
-  welcomeMessage: undefined,
   requests: [  ]
 }
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_can_serialize.1.snap b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_can_serialize.1.snap
index cf9cc42dfc6..95982cf5c2e 100644
--- a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_can_serialize.1.snap
+++ b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_can_serialize.1.snap
@@ -4,7 +4,6 @@
   responderUsername: "",
   responderAvatarIconUri: undefined,
   initialLocation: "panel",
-  welcomeMessage: undefined,
   requests: [
     {
       message: {
@@ -32,7 +31,8 @@
               extensionDisplayName: "",
               locations: [ "panel" ],
               metadata: { requester: { name: "test" } },
-              slashCommands: [  ]
+              slashCommands: [  ],
+              disambiguation: [  ]
             },
             kind: "agent"
           },
@@ -56,9 +56,17 @@
       variableData: { variables: [  ] },
       response: [  ],
       result: { metadata: { metadataKey: "value" } },
-      followups: undefined,
+      followups: [
+        {
+          kind: "reply",
+          message: "Something else",
+          agentId: "",
+          tooltip: "a tooltip"
+        }
+      ],
       isCanceled: false,
       vote: undefined,
+      voteDownReason: undefined,
       agent: {
         name: "ChatProviderWithUsedContext",
         id: "ChatProviderWithUsedContext",
@@ -71,21 +79,14 @@
         extensionDisplayName: "",
         locations: [ "panel" ],
         metadata: { requester: { name: "test" } },
-        slashCommands: [  ]
+        slashCommands: [  ],
+        disambiguation: [  ]
       },
       slashCommand: undefined,
       usedContext: {
         documents: [
           {
-            uri: {
-              scheme: "file",
-              authority: "",
-              path: "/test/path/to/file",
-              query: "",
-              fragment: "",
-              _formatted: null,
-              _fsPath: null
-            },
+            uri: URI(file:///test/path/to/file),
             version: 3,
             ranges: [
               {
@@ -99,7 +100,56 @@
         ],
         kind: "usedContext"
       },
-      contentReferences: [  ]
+      contentReferences: [  ],
+      codeCitations: [  ]
+    },
+    {
+      message: {
+        parts: [
+          {
+            range: {
+              start: 0,
+              endExclusive: 14
+            },
+            editorRange: {
+              startLineNumber: 1,
+              startColumn: 1,
+              endLineNumber: 1,
+              endColumn: 15
+            },
+            text: "test request 2",
+            kind: "text"
+          }
+        ],
+        text: "test request 2"
+      },
+      variableData: { variables: [  ] },
+      response: [  ],
+      result: {  },
+      followups: [  ],
+      isCanceled: false,
+      vote: undefined,
+      voteDownReason: undefined,
+      agent: {
+        name: "testAgent",
+        id: "testAgent",
+        extensionId: {
+          value: "nullExtensionDescription",
+          _lower: "nullextensiondescription"
+        },
+        extensionPublisherId: "",
+        publisherDisplayName: "",
+        extensionDisplayName: "",
+        locations: [ "panel" ],
+        metadata: { requester: { name: "test" } },
+        slashCommands: [  ],
+        disambiguation: [  ],
+        isDefault: true
+      },
+      slashCommand: undefined,
+      usedContext: undefined,
+      contentReferences: [  ],
+      codeCitations: [  ]
     }
   ]
 }
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_sendRequest_fails.0.snap b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_sendRequest_fails.0.snap
index a749780f183..4e49d312bcc 100644
--- a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_sendRequest_fails.0.snap
+++ b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_sendRequest_fails.0.snap
@@ -4,7 +4,6 @@
   responderUsername: "",
   responderAvatarIconUri: undefined,
   initialLocation: "panel",
-  welcomeMessage: undefined,
   requests: [
     {
       message: {
@@ -32,7 +31,8 @@
               extensionDisplayName: "",
               locations: [ "panel" ],
               metadata: {  },
-              slashCommands: [  ]
+              slashCommands: [  ],
+              disambiguation: [  ]
             },
             kind: "agent"
           },
@@ -59,6 +59,7 @@
       followups: undefined,
       isCanceled: false,
       vote: undefined,
+      voteDownReason: undefined,
       agent: {
         name: "ChatProviderWithUsedContext",
         id: "ChatProviderWithUsedContext",
@@ -71,11 +72,13 @@
         extensionDisplayName: "",
         locations: [ "panel" ],
         metadata: {  },
-        slashCommands: [  ]
+        slashCommands: [  ],
+        disambiguation: [  ]
       },
       slashCommand: undefined,
       usedContext: undefined,
-      contentReferences: [  ]
+      contentReferences: [  ],
+      codeCitations: [  ]
     }
   ]
 }
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/Response_inline_reference.0.snap b/src/vs/workbench/contrib/chat/test/common/__snapshots__/Response_inline_reference.0.snap
index 5847d813dfe..b26d84334a0 100644
--- a/src/vs/workbench/contrib/chat/test/common/__snapshots__/Response_inline_reference.0.snap
+++ b/src/vs/workbench/contrib/chat/test/common/__snapshots__/Response_inline_reference.0.snap
@@ -9,15 +9,7 @@
     kind: "markdownContent"
   },
   {
-    inlineReference: {
-      scheme: "https",
-      authority: "microsoft.com",
-      path: "/",
-      query: "",
-      fragment: "",
-      _formatted: null,
-      _fsPath: null
-    },
+    inlineReference: URI(https://microsoft.com/),
     kind: "inlineReference"
   },
   {
diff --git a/src/vs/workbench/contrib/chat/test/common/annotations.test.ts b/src/vs/workbench/contrib/chat/test/common/annotations.test.ts
index e16117965c4..9f57b0ad6b4 100644
--- a/src/vs/workbench/contrib/chat/test/common/annotations.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/annotations.test.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { assertSnapshot } from 'vs/base/test/common/snapshot';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IChatMarkdownContent } from 'vs/workbench/contrib/chat/common/chatService';
-import { annotateSpecialMarkdownContent, extractVulnerabilitiesFromText } from '../../common/annotations';
+import { MarkdownString } from '../../../../../base/common/htmlContent.js';
+import { assertSnapshot } from '../../../../../base/test/common/snapshot.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IChatMarkdownContent } from '../../common/chatService.js';
+import { annotateSpecialMarkdownContent, extractVulnerabilitiesFromText } from '../../common/annotations.js';
 
 function content(str: string): IChatMarkdownContent {
 	return { kind: 'markdownContent', content: new MarkdownString(str) };
diff --git a/src/vs/workbench/contrib/chat/test/common/chatAgents.test.ts b/src/vs/workbench/contrib/chat/test/common/chatAgents.test.ts
index f14ffdaa651..49ba119d095 100644
--- a/src/vs/workbench/contrib/chat/test/common/chatAgents.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/chatAgents.test.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { MockObject, mockObject } from 'vs/base/test/common/mock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { ChatAgentService, IChatAgentData, IChatAgentImplementation, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
+import { MockObject, mockObject } from '../../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { ExtensionIdentifier } from '../../../../../platform/extensions/common/extensions.js';
+import { ChatAgentService, IChatAgentData, IChatAgentImplementation, IChatAgentService } from '../../common/chatAgents.js';
 import assert from 'assert';
 
 const testAgentId = 'testAgent';
@@ -20,6 +20,7 @@ const testAgentData: IChatAgentData = {
 	locations: [],
 	metadata: {},
 	slashCommands: [],
+	disambiguation: [],
 };
 
 suite('ChatAgents', function () {
diff --git a/src/vs/workbench/contrib/chat/test/common/chatModel.test.ts b/src/vs/workbench/contrib/chat/test/common/chatModel.test.ts
index e7fb3834f67..0a49d0bfb77 100644
--- a/src/vs/workbench/contrib/chat/test/common/chatModel.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/chatModel.test.ts
@@ -4,23 +4,23 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { timeout } from 'vs/base/common/async';
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { URI } from 'vs/base/common/uri';
-import { assertSnapshot } from 'vs/base/test/common/snapshot';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { OffsetRange } from 'vs/editor/common/core/offsetRange';
-import { Range } from 'vs/editor/common/core/range';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { ILogService, NullLogService } from 'vs/platform/log/common/log';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ChatAgentLocation, ChatAgentService, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { ChatModel, Response } from 'vs/workbench/contrib/chat/common/chatModel';
-import { ChatRequestTextPart } from 'vs/workbench/contrib/chat/common/chatParserTypes';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { TestExtensionService, TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
+import { timeout } from '../../../../../base/common/async.js';
+import { MarkdownString } from '../../../../../base/common/htmlContent.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { assertSnapshot } from '../../../../../base/test/common/snapshot.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { OffsetRange } from '../../../../../editor/common/core/offsetRange.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { MockContextKeyService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { ILogService, NullLogService } from '../../../../../platform/log/common/log.js';
+import { IStorageService } from '../../../../../platform/storage/common/storage.js';
+import { ChatAgentLocation, ChatAgentService, IChatAgentService } from '../../common/chatAgents.js';
+import { ChatModel, ISerializableChatData1, ISerializableChatData2, ISerializableChatData3, normalizeSerializableChatData, Response } from '../../common/chatModel.js';
+import { ChatRequestTextPart } from '../../common/chatParserTypes.js';
+import { IExtensionService } from '../../../../services/extensions/common/extensions.js';
+import { TestExtensionService, TestStorageService } from '../../../../test/common/workbenchTestServices.js';
 
 suite('ChatModel', () => {
 	const testDisposables = ensureNoDisposablesAreLeakedInTestSuite();
@@ -149,24 +149,24 @@ suite('ChatModel', () => {
 
 		model2.acceptResponseProgress(request1, { content: new MarkdownString('Hello'), kind: 'markdownContent' });
 
-		assert.strictEqual(request1.response.response.asString(), 'Hello');
+		assert.strictEqual(request1.response.response.toString(), 'Hello');
 	});
 });
 
 suite('Response', () => {
-	ensureNoDisposablesAreLeakedInTestSuite();
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
 
 	test('mergeable markdown', async () => {
-		const response = new Response([]);
+		const response = store.add(new Response([]));
 		response.updateContent({ content: new MarkdownString('markdown1'), kind: 'markdownContent' });
 		response.updateContent({ content: new MarkdownString('markdown2'), kind: 'markdownContent' });
 		await assertSnapshot(response.value);
 
-		assert.strictEqual(response.asString(), 'markdown1markdown2');
+		assert.strictEqual(response.toString(), 'markdown1markdown2');
 	});
 
 	test('not mergeable markdown', async () => {
-		const response = new Response([]);
+		const response = store.add(new Response([]));
 		const md1 = new MarkdownString('markdown1');
 		md1.supportHtml = true;
 		response.updateContent({ content: md1, kind: 'markdownContent' });
@@ -175,10 +175,104 @@ suite('Response', () => {
 	});
 
 	test('inline reference', async () => {
-		const response = new Response([]);
+		const response = store.add(new Response([]));
 		response.updateContent({ content: new MarkdownString('text before'), kind: 'markdownContent' });
 		response.updateContent({ inlineReference: URI.parse('https://microsoft.com'), kind: 'inlineReference' });
 		response.updateContent({ content: new MarkdownString('text after'), kind: 'markdownContent' });
 		await assertSnapshot(response.value);
 	});
 });
+
+suite('normalizeSerializableChatData', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('v1', () => {
+		const v1Data: ISerializableChatData1 = {
+			creationDate: Date.now(),
+			initialLocation: undefined,
+			isImported: false,
+			requesterAvatarIconUri: undefined,
+			requesterUsername: 'me',
+			requests: [],
+			responderAvatarIconUri: undefined,
+			responderUsername: 'bot',
+			sessionId: 'session1',
+		};
+
+		const newData = normalizeSerializableChatData(v1Data);
+		assert.strictEqual(newData.creationDate, v1Data.creationDate);
+		assert.strictEqual(newData.lastMessageDate, v1Data.creationDate);
+		assert.strictEqual(newData.version, 3);
+		assert.ok('customTitle' in newData);
+	});
+
+	test('v2', () => {
+		const v2Data: ISerializableChatData2 = {
+			version: 2,
+			creationDate: 100,
+			lastMessageDate: Date.now(),
+			initialLocation: undefined,
+			isImported: false,
+			requesterAvatarIconUri: undefined,
+			requesterUsername: 'me',
+			requests: [],
+			responderAvatarIconUri: undefined,
+			responderUsername: 'bot',
+			sessionId: 'session1',
+			computedTitle: 'computed title'
+		};
+
+		const newData = normalizeSerializableChatData(v2Data);
+		assert.strictEqual(newData.version, 3);
+		assert.strictEqual(newData.creationDate, v2Data.creationDate);
+		assert.strictEqual(newData.lastMessageDate, v2Data.lastMessageDate);
+		assert.strictEqual(newData.customTitle, v2Data.computedTitle);
+	});
+
+	test('old bad data', () => {
+		const v1Data: ISerializableChatData1 = {
+			// Testing the scenario where these are missing
+			sessionId: undefined!,
+			creationDate: undefined!,
+
+			initialLocation: undefined,
+			isImported: false,
+			requesterAvatarIconUri: undefined,
+			requesterUsername: 'me',
+			requests: [],
+			responderAvatarIconUri: undefined,
+			responderUsername: 'bot',
+		};
+
+		const newData = normalizeSerializableChatData(v1Data);
+		assert.strictEqual(newData.version, 3);
+		assert.ok(newData.creationDate > 0);
+		assert.ok(newData.lastMessageDate > 0);
+		assert.ok(newData.sessionId);
+	});
+
+	test('v3 with bug', () => {
+		const v3Data: ISerializableChatData3 = {
+			// Test case where old data was wrongly normalized and these fields were missing
+			creationDate: undefined!,
+			lastMessageDate: undefined!,
+
+			version: 3,
+			initialLocation: undefined,
+			isImported: false,
+			requesterAvatarIconUri: undefined,
+			requesterUsername: 'me',
+			requests: [],
+			responderAvatarIconUri: undefined,
+			responderUsername: 'bot',
+			sessionId: 'session1',
+			customTitle: 'computed title'
+		};
+
+		const newData = normalizeSerializableChatData(v3Data);
+		assert.strictEqual(newData.version, 3);
+		assert.ok(newData.creationDate > 0);
+		assert.ok(newData.lastMessageDate > 0);
+		assert.ok(newData.sessionId);
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/common/chatRequestParser.test.ts b/src/vs/workbench/contrib/chat/test/common/chatRequestParser.test.ts
index c0b7a9542a4..1e8a2abf389 100644
--- a/src/vs/workbench/contrib/chat/test/common/chatRequestParser.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/chatRequestParser.test.ts
@@ -3,22 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { MockObject, mockObject } from 'vs/base/test/common/mock';
-import { assertSnapshot } from 'vs/base/test/common/snapshot';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { ILogService, NullLogService } from 'vs/platform/log/common/log';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ChatAgentLocation, ChatAgentService, IChatAgentCommand, IChatAgentData, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { ChatRequestParser } from 'vs/workbench/contrib/chat/common/chatRequestParser';
-import { IChatService } from 'vs/workbench/contrib/chat/common/chatService';
-import { IChatSlashCommandService } from 'vs/workbench/contrib/chat/common/chatSlashCommands';
-import { IChatVariablesService } from 'vs/workbench/contrib/chat/common/chatVariables';
-import { MockChatService } from 'vs/workbench/contrib/chat/test/common/mockChatService';
-import { IExtensionService, nullExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
-import { TestExtensionService, TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
+import { MockObject, mockObject } from '../../../../../base/test/common/mock.js';
+import { assertSnapshot } from '../../../../../base/test/common/snapshot.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { MockContextKeyService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { ILogService, NullLogService } from '../../../../../platform/log/common/log.js';
+import { IStorageService } from '../../../../../platform/storage/common/storage.js';
+import { ChatAgentLocation, ChatAgentService, IChatAgentCommand, IChatAgentData, IChatAgentService } from '../../common/chatAgents.js';
+import { ChatRequestParser } from '../../common/chatRequestParser.js';
+import { IChatService } from '../../common/chatService.js';
+import { IChatSlashCommandService } from '../../common/chatSlashCommands.js';
+import { IChatVariablesService } from '../../common/chatVariables.js';
+import { ILanguageModelToolsService } from '../../common/languageModelToolsService.js';
+import { MockChatService } from './mockChatService.js';
+import { MockLanguageModelToolsService } from './mockLanguageModelToolsService.js';
+import { IExtensionService, nullExtensionDescription } from '../../../../services/extensions/common/extensions.js';
+import { TestExtensionService, TestStorageService } from '../../../../test/common/workbenchTestServices.js';
 
 suite('ChatRequestParser', () => {
 	const testDisposables = ensureNoDisposablesAreLeakedInTestSuite();
@@ -34,6 +36,7 @@ suite('ChatRequestParser', () => {
 		instantiationService.stub(IExtensionService, new TestExtensionService());
 		instantiationService.stub(IChatService, new MockChatService());
 		instantiationService.stub(IContextKeyService, new MockContextKeyService());
+		instantiationService.stub(ILanguageModelToolsService, new MockLanguageModelToolsService());
 		instantiationService.stub(IChatAgentService, instantiationService.createInstance(ChatAgentService));
 
 		varService = mockObject<IChatVariablesService>()({});
@@ -117,7 +120,7 @@ suite('ChatRequestParser', () => {
 	});
 
 	const getAgentWithSlashCommands = (slashCommands: IChatAgentCommand[]) => {
-		return { id: 'agent', name: 'agent', extensionId: nullExtensionDescription.identifier, publisherDisplayName: '', extensionDisplayName: '', extensionPublisherId: '', locations: [ChatAgentLocation.Panel], metadata: {}, slashCommands } satisfies IChatAgentData;
+		return { id: 'agent', name: 'agent', extensionId: nullExtensionDescription.identifier, publisherDisplayName: '', extensionDisplayName: '', extensionPublisherId: '', locations: [ChatAgentLocation.Panel], metadata: {}, slashCommands, disambiguation: [], } satisfies IChatAgentData;
 	};
 
 	test('agent with subcommand after text', async () => {
diff --git a/src/vs/workbench/contrib/chat/test/common/chatService.test.ts b/src/vs/workbench/contrib/chat/test/common/chatService.test.ts
index cf1f2a174d5..879ff3767d3 100644
--- a/src/vs/workbench/contrib/chat/test/common/chatService.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/chatService.test.ts
@@ -4,31 +4,35 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { URI } from 'vs/base/common/uri';
-import { assertSnapshot } from 'vs/base/test/common/snapshot';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Range } from 'vs/editor/common/core/range';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { ILogService, NullLogService } from 'vs/platform/log/common/log';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { ChatAgentLocation, ChatAgentService, IChatAgent, IChatAgentImplementation, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { ISerializableChatData } from 'vs/workbench/contrib/chat/common/chatModel';
-import { IChatFollowup, IChatService } from 'vs/workbench/contrib/chat/common/chatService';
-import { ChatService } from 'vs/workbench/contrib/chat/common/chatServiceImpl';
-import { ChatSlashCommandService, IChatSlashCommandService } from 'vs/workbench/contrib/chat/common/chatSlashCommands';
-import { IChatVariablesService } from 'vs/workbench/contrib/chat/common/chatVariables';
-import { MockChatService } from 'vs/workbench/contrib/chat/test/common/mockChatService';
-import { MockChatVariablesService } from 'vs/workbench/contrib/chat/test/common/mockChatVariables';
-import { IExtensionService, nullExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { TestContextService, TestExtensionService, TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { assertSnapshot } from '../../../../../base/test/common/snapshot.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { MockContextKeyService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { ILogService, NullLogService } from '../../../../../platform/log/common/log.js';
+import { IStorageService } from '../../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { NullTelemetryService } from '../../../../../platform/telemetry/common/telemetryUtils.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { ChatAgentLocation, ChatAgentService, IChatAgent, IChatAgentImplementation, IChatAgentService } from '../../common/chatAgents.js';
+import { ISerializableChatData } from '../../common/chatModel.js';
+import { IChatFollowup, IChatService } from '../../common/chatService.js';
+import { ChatService } from '../../common/chatServiceImpl.js';
+import { ChatSlashCommandService, IChatSlashCommandService } from '../../common/chatSlashCommands.js';
+import { IChatVariablesService } from '../../common/chatVariables.js';
+import { MockChatService } from './mockChatService.js';
+import { MockChatVariablesService } from './mockChatVariables.js';
+import { IWorkbenchAssignmentService } from '../../../../services/assignment/common/assignmentService.js';
+import { NullWorkbenchAssignmentService } from '../../../../services/assignment/test/common/nullAssignmentService.js';
+import { IExtensionService, nullExtensionDescription } from '../../../../services/extensions/common/extensions.js';
+import { IViewsService } from '../../../../services/views/common/viewsService.js';
+import { TestContextService, TestExtensionService, TestStorageService } from '../../../../test/common/workbenchTestServices.js';
 
 const chatAgentWithUsedContextId = 'ChatProviderWithUsedContext';
 const chatAgentWithUsedContext: IChatAgent = {
@@ -41,6 +45,7 @@ const chatAgentWithUsedContext: IChatAgent = {
 	locations: [ChatAgentLocation.Panel],
 	metadata: {},
 	slashCommands: [],
+	disambiguation: [],
 	async invoke(request, progress, history, token) {
 		progress({
 			documents: [
@@ -62,6 +67,21 @@ const chatAgentWithUsedContext: IChatAgent = {
 	},
 };
 
+function getAgentData(id: string) {
+	return {
+		name: id,
+		id: id,
+		extensionId: nullExtensionDescription.identifier,
+		extensionPublisherId: '',
+		publisherDisplayName: '',
+		extensionDisplayName: '',
+		locations: [ChatAgentLocation.Panel],
+		metadata: {},
+		slashCommands: [],
+		disambiguation: [],
+	};
+}
+
 suite('ChatService', () => {
 	const testDisposables = ensureNoDisposablesAreLeakedInTestSuite();
 
@@ -73,6 +93,7 @@ suite('ChatService', () => {
 	setup(async () => {
 		instantiationService = testDisposables.add(new TestInstantiationService(new ServiceCollection(
 			[IChatVariablesService, new MockChatVariablesService()],
+			[IWorkbenchAssignmentService, new NullWorkbenchAssignmentService()]
 		)));
 		instantiationService.stub(IStorageService, storageService = testDisposables.add(new TestStorageService()));
 		instantiationService.stub(ILogService, new NullLogService());
@@ -82,18 +103,19 @@ suite('ChatService', () => {
 		instantiationService.stub(IViewsService, new TestExtensionService());
 		instantiationService.stub(IWorkspaceContextService, new TestContextService());
 		instantiationService.stub(IChatSlashCommandService, testDisposables.add(instantiationService.createInstance(ChatSlashCommandService)));
+		instantiationService.stub(IConfigurationService, new TestConfigurationService());
 		instantiationService.stub(IChatService, new MockChatService());
 
 		chatAgentService = instantiationService.createInstance(ChatAgentService);
 		instantiationService.stub(IChatAgentService, chatAgentService);
 
-		const agent = {
+		const agent: IChatAgentImplementation = {
 			async invoke(request, progress, history, token) {
 				return {};
 			},
-		} satisfies IChatAgentImplementation;
-		testDisposables.add(chatAgentService.registerAgent('testAgent', { name: 'testAgent', id: 'testAgent', isDefault: true, extensionId: nullExtensionDescription.identifier, extensionPublisherId: '', publisherDisplayName: '', extensionDisplayName: '', locations: [ChatAgentLocation.Panel], metadata: {}, slashCommands: [] }));
-		testDisposables.add(chatAgentService.registerAgent(chatAgentWithUsedContextId, { name: chatAgentWithUsedContextId, id: chatAgentWithUsedContextId, extensionId: nullExtensionDescription.identifier, extensionPublisherId: '', publisherDisplayName: '', extensionDisplayName: '', locations: [ChatAgentLocation.Panel], metadata: {}, slashCommands: [] }));
+		};
+		testDisposables.add(chatAgentService.registerAgent('testAgent', { ...getAgentData('testAgent'), isDefault: true }));
+		testDisposables.add(chatAgentService.registerAgent(chatAgentWithUsedContextId, getAgentData(chatAgentWithUsedContextId)));
 		testDisposables.add(chatAgentService.registerAgentImplementation('testAgent', agent));
 		chatAgentService.updateAgent('testAgent', { requester: { name: 'test' } });
 	});
@@ -127,7 +149,7 @@ suite('ChatService', () => {
 		await testService.addCompleteRequest(model.sessionId, 'test request', undefined, 0, { message: 'test response' });
 		assert.strictEqual(model.getRequests().length, 1);
 		assert.ok(model.getRequests()[0].response);
-		assert.strictEqual(model.getRequests()[0].response?.response.asString(), 'test response');
+		assert.strictEqual(model.getRequests()[0].response?.response.toString(), 'test response');
 	});
 
 	test('sendRequest fails', async () => {
@@ -141,6 +163,45 @@ suite('ChatService', () => {
 		await assertSnapshot(model.toExport());
 	});
 
+	test('history', async () => {
+		const historyLengthAgent: IChatAgentImplementation = {
+			async invoke(request, progress, history, token) {
+				return {
+					metadata: { historyLength: history.length }
+				};
+			},
+		};
+
+		testDisposables.add(chatAgentService.registerAgent('defaultAgent', { ...getAgentData('defaultAgent'), isDefault: true }));
+		testDisposables.add(chatAgentService.registerAgent('agent2', getAgentData('agent2')));
+		testDisposables.add(chatAgentService.registerAgentImplementation('defaultAgent', historyLengthAgent));
+		testDisposables.add(chatAgentService.registerAgentImplementation('agent2', historyLengthAgent));
+
+		const testService = testDisposables.add(instantiationService.createInstance(ChatService));
+		const model = testDisposables.add(testService.startSession(ChatAgentLocation.Panel, CancellationToken.None));
+
+		// Send a request to default agent
+		const response = await testService.sendRequest(model.sessionId, `test request`, { agentId: 'defaultAgent' });
+		assert(response);
+		await response.responseCompletePromise;
+		assert.strictEqual(model.getRequests().length, 1);
+		assert.strictEqual(model.getRequests()[0].response?.result?.metadata?.historyLength, 0);
+
+		// Send a request to agent2- it can't see the default agent's message
+		const response2 = await testService.sendRequest(model.sessionId, `test request`, { agentId: 'agent2' });
+		assert(response2);
+		await response2.responseCompletePromise;
+		assert.strictEqual(model.getRequests().length, 2);
+		assert.strictEqual(model.getRequests()[1].response?.result?.metadata?.historyLength, 0);
+
+		// Send a request to defaultAgent - the default agent can see agent2's message
+		const response3 = await testService.sendRequest(model.sessionId, `test request`, { agentId: 'defaultAgent' });
+		assert(response3);
+		await response3.responseCompletePromise;
+		assert.strictEqual(model.getRequests().length, 3);
+		assert.strictEqual(model.getRequests()[2].response?.result?.metadata?.historyLength, 2);
+	});
+
 	test('can serialize', async () => {
 		testDisposables.add(chatAgentService.registerAgentImplementation(chatAgentWithUsedContextId, chatAgentWithUsedContext));
 		chatAgentService.updateAgent(chatAgentWithUsedContextId, { requester: { name: 'test' } });
@@ -154,9 +215,13 @@ suite('ChatService', () => {
 		const response = await testService.sendRequest(model.sessionId, `@${chatAgentWithUsedContextId} test request`);
 		assert(response);
 		await response.responseCompletePromise;
-
 		assert.strictEqual(model.getRequests().length, 1);
 
+		const response2 = await testService.sendRequest(model.sessionId, `test request 2`);
+		assert(response2);
+		await response2.responseCompletePromise;
+		assert.strictEqual(model.getRequests().length, 2);
+
 		await assertSnapshot(model.toExport());
 	});
 
diff --git a/src/vs/workbench/contrib/chat/test/common/chatWordCounter.test.ts b/src/vs/workbench/contrib/chat/test/common/chatWordCounter.test.ts
index c6d32a8d936..b2d51fdf260 100644
--- a/src/vs/workbench/contrib/chat/test/common/chatWordCounter.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/chatWordCounter.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { getNWords } from 'vs/workbench/contrib/chat/common/chatWordCounter';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { getNWords } from '../../common/chatWordCounter.js';
 
 suite('ChatWordCounter', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
@@ -13,31 +13,60 @@ suite('ChatWordCounter', () => {
 	function doTest(str: string, nWords: number, resultStr: string) {
 		const result = getNWords(str, nWords);
 		assert.strictEqual(result.value, resultStr);
-		assert.strictEqual(result.actualWordCount, nWords);
+		assert.strictEqual(result.returnedWordCount, nWords);
 	}
 
-	test('getNWords, matching actualWordCount', () => {
-		const cases: [string, number, string][] = [
-			['hello world', 1, 'hello'],
-			['hello', 1, 'hello'],
-			['hello world', 0, ''],
-			['here\'s, some.   punctuation?', 3, 'here\'s, some.   punctuation?'],
-			['| markdown | _table_ | header |', 3, '| markdown | _table_ | header'],
-			['| --- | --- | --- |', 1, '| --- | --- | --- |'],
-			[' \t some \n whitespace     \n\n\nhere   ', 3, ' \t some \n whitespace     \n\n\nhere'],
-		];
+	suite('getNWords', () => {
+		test('matching actualWordCount', () => {
+			const cases: [string, number, string][] = [
+				['hello world', 1, 'hello'],
+				['hello', 1, 'hello'],
+				['hello world', 0, ''],
+				['here\'s, some.   punctuation?', 3, 'here\'s, some.   punctuation?'],
+				['| markdown | _table_ | header |', 3, '| markdown | _table_ | header'],
+				['| --- | --- | --- |', 1, '| ---'],
+				['| --- | --- | --- |', 3, '| --- | --- | ---'],
+				[' \t some \n whitespace     \n\n\nhere   ', 3, ' \t some \n whitespace     \n\n\nhere'],
+			];
 
-		cases.forEach(([str, nWords, result]) => doTest(str, nWords, result));
+			cases.forEach(([str, nWords, result]) => doTest(str, nWords, result));
+		});
+
+		test('matching links', () => {
+			const cases: [string, number, string][] = [
+				['[hello](https://example.com) world', 1, '[hello](https://example.com)'],
+				['[hello](https://example.com) world', 2, '[hello](https://example.com) world'],
+				['oh [hello](https://example.com "title") world', 1, 'oh'],
+				['oh [hello](https://example.com "title") world', 2, 'oh [hello](https://example.com "title")'],
+				// Parens in link destination
+				['[hello](https://example.com?()) world', 1, '[hello](https://example.com?())'],
+				// Escaped brackets in link text
+				['[he \\[l\\] \\]lo](https://example.com?()) world', 1, '[he \\[l\\] \\]lo](https://example.com?())'],
+			];
+
+			cases.forEach(([str, nWords, result]) => doTest(str, nWords, result));
+		});
+
+		test('code', () => {
+			const cases: [string, number, string][] = [
+				['let a=1-2', 2, 'let a'],
+				['let a=1-2', 3, 'let a='],
+				['let a=1-2', 4, 'let a=1'],
+				['const myVar = 1+2', 4, 'const myVar = 1'],
+				['<div id="myDiv"></div>', 3, '<div id='],
+				['<div id="myDiv"></div>', 4, '<div id="myDiv"></div>'],
+			];
+
+			cases.forEach(([str, nWords, result]) => doTest(str, nWords, result));
+		});
+
+		test('chinese characters', () => {
+			const cases: [string, number, string][] = [
+				['我喜欢中国菜', 3, '我喜欢'],
+			];
+
+			cases.forEach(([str, nWords, result]) => doTest(str, nWords, result));
+		});
 	});
 
-	test('getNWords, matching links', () => {
-		const cases: [string, number, string][] = [
-			['[hello](https://example.com) world', 1, '[hello](https://example.com)'],
-			['[hello](https://example.com) world', 2, '[hello](https://example.com) world'],
-			['oh [hello](https://example.com "title") world', 1, 'oh'],
-			['oh [hello](https://example.com "title") world', 2, 'oh [hello](https://example.com "title")'],
-		];
-
-		cases.forEach(([str, nWords, result]) => doTest(str, nWords, result));
-	});
 });
diff --git a/src/vs/workbench/contrib/chat/test/common/languageModels.test.ts b/src/vs/workbench/contrib/chat/test/common/languageModels.test.ts
index 3f396bd5184..bc148fcd693 100644
--- a/src/vs/workbench/contrib/chat/test/common/languageModels.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/languageModels.test.ts
@@ -4,13 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { mock } from 'vs/base/test/common/mock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { languageModelExtensionPoint, LanguageModelsService } from 'vs/workbench/contrib/chat/common/languageModels';
-import { IExtensionService, nullExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
-import { ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
+import { AsyncIterableSource, DeferredPromise, timeout } from '../../../../../base/common/async.js';
+import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { mock } from '../../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { NullLogService } from '../../../../../platform/log/common/log.js';
+import { ChatMessageRole, IChatResponseFragment, languageModelExtensionPoint, LanguageModelsService } from '../../common/languageModels.js';
+import { IExtensionService, nullExtensionDescription } from '../../../../services/extensions/common/extensions.js';
+import { ExtensionsRegistry } from '../../../../services/extensions/common/extensionsRegistry.js';
+import { MockContextKeyService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
 
 suite('LanguageModels', function () {
 
@@ -28,7 +31,8 @@ suite('LanguageModels', function () {
 					return Promise.resolve();
 				}
 			},
-			new NullLogService()
+			new NullLogService(),
+			new MockContextKeyService()
 		);
 
 		const ext = ExtensionsRegistry.getExtensionPoints().find(e => e.name === languageModelExtensionPoint.name)!;
@@ -51,7 +55,7 @@ suite('LanguageModels', function () {
 				maxInputTokens: 100,
 				maxOutputTokens: 100,
 			},
-			provideChatResponse: async () => {
+			sendChatRequest: async () => {
 				throw new Error();
 			},
 			provideTokenCount: async () => {
@@ -70,7 +74,7 @@ suite('LanguageModels', function () {
 				maxInputTokens: 100,
 				maxOutputTokens: 100,
 			},
-			provideChatResponse: async () => {
+			sendChatRequest: async () => {
 				throw new Error();
 			},
 			provideTokenCount: async () => {
@@ -103,5 +107,56 @@ suite('LanguageModels', function () {
 		assert.deepStrictEqual(result2.length, 0);
 	});
 
+	test('sendChatRequest returns a response-stream', async function () {
 
+		store.add(languageModels.registerLanguageModelChat('actual', {
+			metadata: {
+				extension: nullExtensionDescription.identifier,
+				name: 'Pretty Name',
+				vendor: 'test-vendor',
+				family: 'actual-family',
+				version: 'actual-version',
+				id: 'actual-lm',
+				maxInputTokens: 100,
+				maxOutputTokens: 100,
+			},
+			sendChatRequest: async (messages, _from, _options, token) => {
+				// const message = messages.at(-1);
+
+				const defer = new DeferredPromise();
+				const stream = new AsyncIterableSource<IChatResponseFragment>();
+
+				(async () => {
+					while (!token.isCancellationRequested) {
+						stream.emitOne({ index: 0, part: { type: 'text', value: Date.now().toString() } });
+						await timeout(10);
+					}
+					defer.complete(undefined);
+				})();
+
+				return {
+					stream: stream.asyncIterable,
+					result: defer.p
+				};
+			},
+			provideTokenCount: async () => {
+				throw new Error();
+			}
+		}));
+
+		const models = await languageModels.selectLanguageModels({ identifier: 'actual-lm' });
+		assert.ok(models.length === 1);
+
+		const first = models[0];
+
+		const cts = new CancellationTokenSource();
+
+		const request = await languageModels.sendChatRequest(first, nullExtensionDescription.identifier, [{ role: ChatMessageRole.User, content: [{ type: 'text', value: 'hello' }] }], {}, cts.token);
+
+		assert.ok(request);
+
+		cts.dispose(true);
+
+		await request.result;
+	});
 });
diff --git a/src/vs/workbench/contrib/chat/test/common/mockChatService.ts b/src/vs/workbench/contrib/chat/test/common/mockChatService.ts
index c7cc9199757..ad4262a7dbd 100644
--- a/src/vs/workbench/contrib/chat/test/common/mockChatService.ts
+++ b/src/vs/workbench/contrib/chat/test/common/mockChatService.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Event } from 'vs/base/common/event';
-import { URI } from 'vs/base/common/uri';
-import { ChatAgentLocation } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { ChatModel, IChatModel, IChatRequestModel, IChatRequestVariableData, ISerializableChatData } from 'vs/workbench/contrib/chat/common/chatModel';
-import { IParsedChatRequest } from 'vs/workbench/contrib/chat/common/chatParserTypes';
-import { IChatCompleteResponse, IChatDetail, IChatProviderInfo, IChatSendRequestData, IChatSendRequestOptions, IChatService, IChatTransferredSessionData, IChatUserActionEvent } from 'vs/workbench/contrib/chat/common/chatService';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { Event } from '../../../../../base/common/event.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ChatAgentLocation } from '../../common/chatAgents.js';
+import { ChatModel, IChatModel, IChatRequestModel, IChatRequestVariableData, ISerializableChatData } from '../../common/chatModel.js';
+import { IParsedChatRequest } from '../../common/chatParserTypes.js';
+import { IChatCompleteResponse, IChatDetail, IChatProviderInfo, IChatSendRequestData, IChatSendRequestOptions, IChatService, IChatTransferredSessionData, IChatUserActionEvent } from '../../common/chatService.js';
 
 export class MockChatService implements IChatService {
 	_serviceBrand: undefined;
@@ -80,4 +80,8 @@ export class MockChatService implements IChatService {
 	transferChatSession(transferredSessionData: IChatTransferredSessionData, toWorkspace: URI): void {
 		throw new Error('Method not implemented.');
 	}
+
+	setChatSessionTitle(sessionId: string, title: string): void {
+		throw new Error('Method not implemented.');
+	}
 }
diff --git a/src/vs/workbench/contrib/chat/test/common/mockChatVariables.ts b/src/vs/workbench/contrib/chat/test/common/mockChatVariables.ts
index be7a61b525e..265db696262 100644
--- a/src/vs/workbench/contrib/chat/test/common/mockChatVariables.ts
+++ b/src/vs/workbench/contrib/chat/test/common/mockChatVariables.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { ChatAgentLocation } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { IChatModel, IChatRequestVariableData, IChatRequestVariableEntry } from 'vs/workbench/contrib/chat/common/chatModel';
-import { IParsedChatRequest } from 'vs/workbench/contrib/chat/common/chatParserTypes';
-import { IChatRequestVariableValue, IChatVariableData, IChatVariableResolver, IChatVariableResolverProgress, IChatVariablesService, IDynamicVariable } from 'vs/workbench/contrib/chat/common/chatVariables';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { IDisposable } from '../../../../../base/common/lifecycle.js';
+import { ChatAgentLocation } from '../../common/chatAgents.js';
+import { IChatModel, IChatRequestVariableData, IChatRequestVariableEntry } from '../../common/chatModel.js';
+import { IParsedChatRequest } from '../../common/chatParserTypes.js';
+import { IChatRequestVariableValue, IChatVariableData, IChatVariableResolver, IChatVariableResolverProgress, IChatVariablesService, IDynamicVariable } from '../../common/chatVariables.js';
 
 export class MockChatVariablesService implements IChatVariablesService {
 	_serviceBrand: undefined;
diff --git a/src/vs/workbench/contrib/chat/test/common/mockLanguageModelToolsService.ts b/src/vs/workbench/contrib/chat/test/common/mockLanguageModelToolsService.ts
new file mode 100644
index 00000000000..57e5eca8540
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/common/mockLanguageModelToolsService.ts
@@ -0,0 +1,43 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { Event } from '../../../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { CountTokensCallback, ILanguageModelToolsService, IToolData, IToolImpl, IToolInvocation, IToolResult } from '../../common/languageModelToolsService.js';
+
+export class MockLanguageModelToolsService implements ILanguageModelToolsService {
+	_serviceBrand: undefined;
+
+	constructor() { }
+
+	onDidChangeTools: Event<void> = Event.None;
+
+	registerToolData(toolData: IToolData): IDisposable {
+		return Disposable.None;
+	}
+
+	registerToolImplementation(name: string, tool: IToolImpl): IDisposable {
+		return Disposable.None;
+	}
+
+	getTools(): Iterable<Readonly<IToolData>> {
+		return [];
+	}
+
+	getTool(id: string): IToolData | undefined {
+		return undefined;
+	}
+
+	getToolByName(name: string): IToolData | undefined {
+		return undefined;
+	}
+
+	async invokeTool(dto: IToolInvocation, countTokens: CountTokensCallback, token: CancellationToken): Promise<IToolResult> {
+		return {
+			string: ''
+		};
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/test/common/voiceChatService.test.ts b/src/vs/workbench/contrib/chat/test/common/voiceChatService.test.ts
index 2ad2f91c6b1..60e55441ce7 100644
--- a/src/vs/workbench/contrib/chat/test/common/voiceChatService.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/voiceChatService.test.ts
@@ -4,20 +4,19 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ProviderResult } from 'vs/editor/common/languages';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { ChatAgentLocation, IChatAgent, IChatAgentCommand, IChatAgentCompletionItem, IChatAgentData, IChatAgentHistoryEntry, IChatAgentImplementation, IChatAgentMetadata, IChatAgentRequest, IChatAgentResult, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { IChatModel } from 'vs/workbench/contrib/chat/common/chatModel';
-import { IChatProgress, IChatFollowup } from 'vs/workbench/contrib/chat/common/chatService';
-import { IVoiceChatSessionOptions, IVoiceChatTextEvent, VoiceChatService } from 'vs/workbench/contrib/chat/common/voiceChatService';
-import { ISpeechProvider, ISpeechService, ISpeechToTextEvent, ISpeechToTextSession, ITextToSpeechSession, KeywordRecognitionStatus, SpeechToTextStatus } from 'vs/workbench/contrib/speech/common/speechService';
-import { nullExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
+import { CancellationToken, CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { DisposableStore, IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { ProviderResult } from '../../../../../editor/common/languages.js';
+import { ExtensionIdentifier } from '../../../../../platform/extensions/common/extensions.js';
+import { MockContextKeyService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { nullExtensionDescription } from '../../../../services/extensions/common/extensions.js';
+import { ISpeechProvider, ISpeechService, ISpeechToTextEvent, ISpeechToTextSession, ITextToSpeechSession, KeywordRecognitionStatus, SpeechToTextStatus } from '../../../speech/common/speechService.js';
+import { ChatAgentLocation, IChatAgent, IChatAgentCommand, IChatAgentCompletionItem, IChatAgentData, IChatAgentHistoryEntry, IChatAgentImplementation, IChatAgentMetadata, IChatAgentRequest, IChatAgentResult, IChatAgentService, IChatParticipantDetectionProvider, IChatWelcomeMessageContent } from '../../common/chatAgents.js';
+import { IChatModel } from '../../common/chatModel.js';
+import { IChatFollowup, IChatProgress } from '../../common/chatService.js';
+import { IVoiceChatSessionOptions, IVoiceChatTextEvent, VoiceChatService } from '../../common/voiceChatService.js';
 
 suite('VoiceChat', () => {
 
@@ -36,8 +35,21 @@ suite('VoiceChat', () => {
 		constructor(readonly id: string, readonly slashCommands: IChatAgentCommand[]) {
 			this.name = id;
 		}
+		fullName?: string | undefined;
+		description?: string | undefined;
+		when?: string | undefined;
+		publisherDisplayName?: string | undefined;
+		isDefault?: boolean | undefined;
+		isDynamic?: boolean | undefined;
+		disambiguation: { category: string; description: string; examples: string[] }[] = [];
+		provideFollowups?(request: IChatAgentRequest, result: IChatAgentResult, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatFollowup[]> {
+			throw new Error('Method not implemented.');
+		}
+		provideSampleQuestions?(location: ChatAgentLocation, token: CancellationToken): ProviderResult<IChatFollowup[] | undefined> {
+			throw new Error('Method not implemented.');
+		}
 		invoke(request: IChatAgentRequest, progress: (part: IChatProgress) => void, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatAgentResult> { throw new Error('Method not implemented.'); }
-		provideWelcomeMessage?(location: ChatAgentLocation, token: CancellationToken): ProviderResult<(string | IMarkdownString)[] | undefined> { throw new Error('Method not implemented.'); }
+		provideWelcomeMessage?(token: CancellationToken): ProviderResult<IChatWelcomeMessageContent | undefined> { throw new Error('Method not implemented.'); }
 		metadata = {};
 	}
 
@@ -52,6 +64,15 @@ suite('VoiceChat', () => {
 	];
 
 	class TestChatAgentService implements IChatAgentService {
+		hasChatParticipantDetectionProviders(): boolean {
+			throw new Error('Method not implemented.');
+		}
+		registerChatParticipantDetectionProvider(handle: number, provider: IChatParticipantDetectionProvider): IDisposable {
+			throw new Error('Method not implemented.');
+		}
+		detectAgentOrCommand(request: IChatAgentRequest, history: IChatAgentHistoryEntry[], options: { location: ChatAgentLocation }, token: CancellationToken): Promise<{ agent: IChatAgentData; command?: IChatAgentCommand } | undefined> {
+			throw new Error('Method not implemented.');
+		}
 		_serviceBrand: undefined;
 		readonly onDidChangeAgents = Event.None;
 		registerAgentImplementation(id: string, agent: IChatAgentImplementation): IDisposable { throw new Error(); }
@@ -71,6 +92,7 @@ suite('VoiceChat', () => {
 		registerAgentCompletionProvider(id: string, provider: (query: string, token: CancellationToken) => Promise<IChatAgentCompletionItem[]>): IDisposable { throw new Error('Method not implemented.'); }
 		getAgentCompletionItems(id: string, query: string, token: CancellationToken): Promise<IChatAgentCompletionItem[]> { throw new Error('Method not implemented.'); }
 		agentHasDupeName(id: string): boolean { throw new Error('Method not implemented.'); }
+		getChatTitle(id: string, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<string | undefined> { throw new Error('Method not implemented.'); }
 	}
 
 	class TestSpeechService implements ISpeechService {
diff --git a/src/vs/workbench/contrib/chat/test/electron-sandbox/voiceChatActions.test.ts b/src/vs/workbench/contrib/chat/test/electron-sandbox/voiceChatActions.test.ts
index 85d4a9cdb2f..478a0c14214 100644
--- a/src/vs/workbench/contrib/chat/test/electron-sandbox/voiceChatActions.test.ts
+++ b/src/vs/workbench/contrib/chat/test/electron-sandbox/voiceChatActions.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { parseNextChatResponseChunk } from 'vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { parseNextChatResponseChunk } from '../../electron-sandbox/actions/voiceChatActions.js';
 
 suite('VoiceChatActions', function () {
 
diff --git a/src/vs/workbench/contrib/codeActions/browser/codeActions.contribution.ts b/src/vs/workbench/contrib/codeActions/browser/codeActions.contribution.ts
index afcf9915643..7fdb96233ce 100644
--- a/src/vs/workbench/contrib/codeActions/browser/codeActions.contribution.ts
+++ b/src/vs/workbench/contrib/codeActions/browser/codeActions.contribution.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
-import { CodeActionsExtensionPoint, codeActionsExtensionPointDescriptor } from 'vs/workbench/contrib/codeActions/common/codeActionsExtensionPoint';
-import { DocumentationExtensionPoint, documentationExtensionPointDescriptor } from 'vs/workbench/contrib/codeActions/common/documentationExtensionPoint';
-import { ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { CodeActionsContribution, editorConfiguration } from './codeActionsContribution';
-import { CodeActionDocumentationContribution } from './documentationContribution';
+import { Extensions, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry } from '../../../common/contributions.js';
+import { CodeActionsExtensionPoint, codeActionsExtensionPointDescriptor } from '../common/codeActionsExtensionPoint.js';
+import { DocumentationExtensionPoint, documentationExtensionPointDescriptor } from '../common/documentationExtensionPoint.js';
+import { ExtensionsRegistry } from '../../../services/extensions/common/extensionsRegistry.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { CodeActionsContribution, editorConfiguration, notebookEditorConfiguration } from './codeActionsContribution.js';
+import { CodeActionDocumentationContribution } from './documentationContribution.js';
 
 const codeActionsExtensionPoint = ExtensionsRegistry.registerExtensionPoint<CodeActionsExtensionPoint[]>(codeActionsExtensionPointDescriptor);
 const documentationExtensionPoint = ExtensionsRegistry.registerExtensionPoint<DocumentationExtensionPoint>(documentationExtensionPointDescriptor);
@@ -20,6 +20,9 @@ const documentationExtensionPoint = ExtensionsRegistry.registerExtensionPoint<Do
 Registry.as<IConfigurationRegistry>(Extensions.Configuration)
 	.registerConfiguration(editorConfiguration);
 
+Registry.as<IConfigurationRegistry>(Extensions.Configuration)
+	.registerConfiguration(notebookEditorConfiguration);
+
 class WorkbenchConfigurationContribution {
 	constructor(
 		@IInstantiationService instantiationService: IInstantiationService,
diff --git a/src/vs/workbench/contrib/codeActions/browser/codeActionsContribution.ts b/src/vs/workbench/contrib/codeActions/browser/codeActionsContribution.ts
index 38fd5502ae2..0bd3a24a6fc 100644
--- a/src/vs/workbench/contrib/codeActions/browser/codeActionsContribution.ts
+++ b/src/vs/workbench/contrib/codeActions/browser/codeActionsContribution.ts
@@ -3,20 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { HierarchicalKind } from 'vs/base/common/hierarchicalKind';
-import { IJSONSchema, IJSONSchemaMap } from 'vs/base/common/jsonSchema';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { editorConfigurationBaseNode } from 'vs/editor/common/config/editorConfigurationSchema';
-import { codeActionCommandId, refactorCommandId, sourceActionCommandId } from 'vs/editor/contrib/codeAction/browser/codeAction';
-import { CodeActionKind } from 'vs/editor/contrib/codeAction/common/types';
-import * as nls from 'vs/nls';
-import { ConfigurationScope, Extensions, IConfigurationNode, IConfigurationPropertySchema, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { CodeActionsExtensionPoint, ContributedCodeAction } from 'vs/workbench/contrib/codeActions/common/codeActionsExtensionPoint';
-import { IExtensionPoint } from 'vs/workbench/services/extensions/common/extensionsRegistry';
+import { Emitter } from '../../../../base/common/event.js';
+import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
+import { IJSONSchema, IJSONSchemaMap } from '../../../../base/common/jsonSchema.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { editorConfigurationBaseNode } from '../../../../editor/common/config/editorConfigurationSchema.js';
+import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
+import { codeActionCommandId, refactorCommandId, sourceActionCommandId } from '../../../../editor/contrib/codeAction/browser/codeAction.js';
+import { CodeActionKind } from '../../../../editor/contrib/codeAction/common/types.js';
+import * as nls from '../../../../nls.js';
+import { ConfigurationScope, Extensions, IConfigurationNode, IConfigurationPropertySchema, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { CodeActionsExtensionPoint, ContributedCodeAction } from '../common/codeActionsExtensionPoint.js';
+import { IExtensionPoint } from '../../../services/extensions/common/extensionsRegistry.js';
 
 const createCodeActionsAutoSave = (description: string): IJSONSchema => {
 	return {
@@ -34,15 +35,26 @@ const createCodeActionsAutoSave = (description: string): IJSONSchema => {
 	};
 };
 
-const codeActionsOnSaveDefaultProperties = Object.freeze<IJSONSchemaMap>({
-	'source.fixAll': createCodeActionsAutoSave(nls.localize('codeActionsOnSave.fixAll', "Controls whether auto fix action should be run on file save.")),
-});
+const createNotebookCodeActionsAutoSave = (description: string): IJSONSchema => {
+	return {
+		type: ['string', 'boolean'],
+		enum: ['explicit', 'never', true, false],
+		enumDescriptions: [
+			nls.localize('explicit', 'Triggers Code Actions only when explicitly saved.'),
+			nls.localize('never', 'Never triggers Code Actions on save.'),
+			nls.localize('explicitBoolean', 'Triggers Code Actions only when explicitly saved. This value will be deprecated in favor of "explicit".'),
+			nls.localize('neverBoolean', 'Triggers Code Actions only when explicitly saved. This value will be deprecated in favor of "never".')
+		],
+		default: 'explicit',
+		description: description
+	};
+};
+
 
 const codeActionsOnSaveSchema: IConfigurationPropertySchema = {
 	oneOf: [
 		{
 			type: 'object',
-			properties: codeActionsOnSaveDefaultProperties,
 			additionalProperties: {
 				type: 'string'
 			},
@@ -69,18 +81,57 @@ export const editorConfiguration = Object.freeze<IConfigurationNode>({
 	}
 });
 
+const notebookCodeActionsOnSaveSchema: IConfigurationPropertySchema = {
+	oneOf: [
+		{
+			type: 'object',
+			additionalProperties: {
+				type: 'string'
+			},
+		},
+		{
+			type: 'array',
+			items: { type: 'string' }
+		}
+	],
+	markdownDescription: nls.localize('notebook.codeActionsOnSave', 'Run a series of Code Actions for a notebook on save. Code Actions must be specified, the file must not be saved after delay, and the editor must not be shutting down. Example: `"notebook.source.organizeImports": "explicit"`'),
+	type: 'object',
+	additionalProperties: {
+		type: ['string', 'boolean'],
+		enum: ['explicit', 'never', true, false],
+		// enum: ['explicit', 'always', 'never'], -- autosave support needs to be built first
+		// nls.localize('always', 'Always triggers Code Actions on save, including autosave, focus, and window change events.'),
+	},
+	default: {}
+};
+
+export const notebookEditorConfiguration = Object.freeze<IConfigurationNode>({
+	...editorConfigurationBaseNode,
+	properties: {
+		'notebook.codeActionsOnSave': notebookCodeActionsOnSaveSchema
+	}
+});
+
 export class CodeActionsContribution extends Disposable implements IWorkbenchContribution {
 
 	private _contributedCodeActions: CodeActionsExtensionPoint[] = [];
+	private settings: Set<string> = new Set<string>();
 
 	private readonly _onDidChangeContributions = this._register(new Emitter<void>());
 
 	constructor(
 		codeActionsExtensionPoint: IExtensionPoint<CodeActionsExtensionPoint[]>,
 		@IKeybindingService keybindingService: IKeybindingService,
+		@ILanguageFeaturesService private readonly languageFeatures: ILanguageFeaturesService
 	) {
 		super();
 
+		// TODO: @justschen caching of code actions based on extensions loaded: https://github.com/microsoft/vscode/issues/216019
+		languageFeatures.codeActionProvider.onDidChange(() => {
+			this.updateSettingsFromCodeActionProviders();
+			this.updateConfigurationSchemaFromContribs();
+		}, 2000);
+
 		codeActionsExtensionPoint.setHandler(extensionPoints => {
 			this._contributedCodeActions = extensionPoints.flatMap(x => x.value).filter(x => Array.isArray(x.actions));
 			this.updateConfigurationSchema(this._contributedCodeActions);
@@ -93,26 +144,54 @@ export class CodeActionsContribution extends Disposable implements IWorkbenchCon
 		});
 	}
 
+	private updateSettingsFromCodeActionProviders(): void {
+		const providers = this.languageFeatures.codeActionProvider.allNoModel();
+		providers.forEach(provider => {
+			if (provider.providedCodeActionKinds) {
+				provider.providedCodeActionKinds.forEach(kind => {
+					if (!this.settings.has(kind) && CodeActionKind.Source.contains(new HierarchicalKind(kind))) {
+						this.settings.add(kind);
+					}
+				});
+			}
+		});
+	}
+
 	private updateConfigurationSchema(codeActionContributions: readonly CodeActionsExtensionPoint[]) {
-		const newProperties: IJSONSchemaMap = { ...codeActionsOnSaveDefaultProperties };
+		const newProperties: IJSONSchemaMap = {};
+		const newNotebookProperties: IJSONSchemaMap = {};
 		for (const [sourceAction, props] of this.getSourceActions(codeActionContributions)) {
+			this.settings.add(sourceAction);
 			newProperties[sourceAction] = createCodeActionsAutoSave(nls.localize('codeActionsOnSave.generic', "Controls whether '{0}' actions should be run on file save.", props.title));
+			newNotebookProperties[sourceAction] = createNotebookCodeActionsAutoSave(nls.localize('codeActionsOnSave.generic', "Controls whether '{0}' actions should be run on file save.", props.title));
 		}
 		codeActionsOnSaveSchema.properties = newProperties;
+		notebookCodeActionsOnSaveSchema.properties = newNotebookProperties;
+		Registry.as<IConfigurationRegistry>(Extensions.Configuration)
+			.notifyConfigurationSchemaUpdated(editorConfiguration);
+	}
+
+	private updateConfigurationSchemaFromContribs() {
+		const properties: IJSONSchemaMap = { ...codeActionsOnSaveSchema.properties };
+		const notebookProperties: IJSONSchemaMap = { ...notebookCodeActionsOnSaveSchema.properties };
+		for (const codeActionKind of this.settings) {
+			if (!properties[codeActionKind]) {
+				properties[codeActionKind] = createCodeActionsAutoSave(nls.localize('codeActionsOnSave.generic', "Controls whether '{0}' actions should be run on file save.", codeActionKind));
+				notebookProperties[codeActionKind] = createNotebookCodeActionsAutoSave(nls.localize('codeActionsOnSave.generic', "Controls whether '{0}' actions should be run on file save.", codeActionKind));
+			}
+		}
+		codeActionsOnSaveSchema.properties = properties;
+		notebookCodeActionsOnSaveSchema.properties = notebookProperties;
 		Registry.as<IConfigurationRegistry>(Extensions.Configuration)
 			.notifyConfigurationSchemaUpdated(editorConfiguration);
 	}
 
 	private getSourceActions(contributions: readonly CodeActionsExtensionPoint[]) {
-		const defaultKinds = Object.keys(codeActionsOnSaveDefaultProperties).map(value => new HierarchicalKind(value));
 		const sourceActions = new Map<string, { readonly title: string }>();
 		for (const contribution of contributions) {
 			for (const action of contribution.actions) {
 				const kind = new HierarchicalKind(action.kind);
-				if (CodeActionKind.Source.contains(kind)
-					// Exclude any we already included by default
-					&& !defaultKinds.some(defaultKind => defaultKind.contains(kind))
-				) {
+				if (CodeActionKind.Source.contains(kind)) {
 					sourceActions.set(kind.value, action);
 				}
 			}
diff --git a/src/vs/workbench/contrib/codeActions/browser/documentationContribution.ts b/src/vs/workbench/contrib/codeActions/browser/documentationContribution.ts
index 01f9be18e30..d55cd2c212d 100644
--- a/src/vs/workbench/contrib/codeActions/browser/documentationContribution.ts
+++ b/src/vs/workbench/contrib/codeActions/browser/documentationContribution.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { HierarchicalKind } from 'vs/base/common/hierarchicalKind';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import * as languages from 'vs/editor/common/languages';
-import { ITextModel } from 'vs/editor/common/model';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { CodeActionKind } from 'vs/editor/contrib/codeAction/common/types';
-import { ContextKeyExpr, ContextKeyExpression, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { DocumentationExtensionPoint } from 'vs/workbench/contrib/codeActions/common/documentationExtensionPoint';
-import { IExtensionPoint } from 'vs/workbench/services/extensions/common/extensionsRegistry';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { Selection } from '../../../../editor/common/core/selection.js';
+import * as languages from '../../../../editor/common/languages.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
+import { CodeActionKind } from '../../../../editor/contrib/codeAction/common/types.js';
+import { ContextKeyExpr, ContextKeyExpression, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { DocumentationExtensionPoint } from '../common/documentationExtensionPoint.js';
+import { IExtensionPoint } from '../../../services/extensions/common/extensionsRegistry.js';
 
 
 export class CodeActionDocumentationContribution extends Disposable implements IWorkbenchContribution, languages.CodeActionProvider {
diff --git a/src/vs/workbench/contrib/codeActions/common/codeActionsExtensionPoint.ts b/src/vs/workbench/contrib/codeActions/common/codeActionsExtensionPoint.ts
index d8581f7d67c..ff096f3e33f 100644
--- a/src/vs/workbench/contrib/codeActions/common/codeActionsExtensionPoint.ts
+++ b/src/vs/workbench/contrib/codeActions/common/codeActionsExtensionPoint.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { IConfigurationPropertySchema } from 'vs/platform/configuration/common/configurationRegistry';
-import { languagesExtPoint } from 'vs/workbench/services/language/common/languageService';
-import { Extensions as ExtensionFeaturesExtensions, IExtensionFeatureTableRenderer, IExtensionFeaturesRegistry, IRenderedData, IRowData, ITableData } from 'vs/workbench/services/extensionManagement/common/extensionFeatures';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { IExtensionManifest } from 'vs/platform/extensions/common/extensions';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { MarkdownString } from 'vs/base/common/htmlContent';
+import * as nls from '../../../../nls.js';
+import { IConfigurationPropertySchema } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { languagesExtPoint } from '../../../services/language/common/languageService.js';
+import { Extensions as ExtensionFeaturesExtensions, IExtensionFeatureTableRenderer, IExtensionFeaturesRegistry, IRenderedData, IRowData, ITableData } from '../../../services/extensionManagement/common/extensionFeatures.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { IExtensionManifest } from '../../../../platform/extensions/common/extensions.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
 
 enum CodeActionExtensionPointFields {
 	languages = 'languages',
diff --git a/src/vs/workbench/contrib/codeActions/common/documentationExtensionPoint.ts b/src/vs/workbench/contrib/codeActions/common/documentationExtensionPoint.ts
index daaca8cf47f..512db5723d1 100644
--- a/src/vs/workbench/contrib/codeActions/common/documentationExtensionPoint.ts
+++ b/src/vs/workbench/contrib/codeActions/common/documentationExtensionPoint.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { IConfigurationPropertySchema } from 'vs/platform/configuration/common/configurationRegistry';
-import { languagesExtPoint } from 'vs/workbench/services/language/common/languageService';
+import * as nls from '../../../../nls.js';
+import { IConfigurationPropertySchema } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { languagesExtPoint } from '../../../services/language/common/languageService.js';
 
 enum DocumentationExtensionPointFields {
 	when = 'when',
diff --git a/src/vs/workbench/contrib/codeEditor/browser/accessibility/accessibility.ts b/src/vs/workbench/contrib/codeEditor/browser/accessibility/accessibility.ts
index 36ac99f6654..19baf02bc3c 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/accessibility/accessibility.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/accessibility/accessibility.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./accessibility';
-import * as nls from 'vs/nls';
-import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { accessibilityHelpIsShown } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { alert } from 'vs/base/browser/ui/aria/aria';
-import { AccessibilityHelpNLS } from 'vs/editor/common/standaloneStrings';
+import './accessibility.css';
+import * as nls from '../../../../../nls.js';
+import { ConfigurationTarget, IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IAccessibilityService } from '../../../../../platform/accessibility/common/accessibility.js';
+import { Action2, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { accessibilityHelpIsShown } from '../../../accessibility/browser/accessibilityConfiguration.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
+import { alert } from '../../../../../base/browser/ui/aria/aria.js';
+import { AccessibilityHelpNLS } from '../../../../../editor/common/standaloneStrings.js';
 
 class ToggleScreenReaderMode extends Action2 {
 
diff --git a/src/vs/workbench/contrib/codeEditor/browser/codeEditor.contribution.ts b/src/vs/workbench/contrib/codeEditor/browser/codeEditor.contribution.ts
index ed593625401..ac45ecadd87 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/codeEditor.contribution.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/codeEditor.contribution.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import './menuPreventer';
-import './accessibility/accessibility';
-import './diffEditorHelper';
-import './editorFeatures';
-import './editorSettingsMigration';
-import './inspectKeybindings';
-import './largeFileOptimizations';
-import './inspectEditorTokens/inspectEditorTokens';
-import './quickaccess/gotoLineQuickAccess';
-import './quickaccess/gotoSymbolQuickAccess';
-import './saveParticipants';
-import './toggleColumnSelection';
-import './toggleMinimap';
-import './toggleMultiCursorModifier';
-import './toggleRenderControlCharacter';
-import './toggleRenderWhitespace';
-import './toggleWordWrap';
-import './emptyTextEditorHint/emptyTextEditorHint';
-import './workbenchReferenceSearch';
-import './editorLineNumberMenu';
-import './dictation/editorDictation';
+import './menuPreventer.js';
+import './accessibility/accessibility.js';
+import './diffEditorHelper.js';
+import './editorFeatures.js';
+import './editorSettingsMigration.js';
+import './inspectKeybindings.js';
+import './largeFileOptimizations.js';
+import './inspectEditorTokens/inspectEditorTokens.js';
+import './quickaccess/gotoLineQuickAccess.js';
+import './quickaccess/gotoSymbolQuickAccess.js';
+import './saveParticipants.js';
+import './toggleColumnSelection.js';
+import './toggleMinimap.js';
+import './toggleMultiCursorModifier.js';
+import './toggleRenderControlCharacter.js';
+import './toggleRenderWhitespace.js';
+import './toggleWordWrap.js';
+import './emptyTextEditorHint/emptyTextEditorHint.js';
+import './workbenchReferenceSearch.js';
+import './editorLineNumberMenu.js';
+import './dictation/editorDictation.js';
diff --git a/src/vs/workbench/contrib/codeEditor/browser/dictation/editorDictation.ts b/src/vs/workbench/contrib/codeEditor/browser/dictation/editorDictation.ts
index bfef8956ae8..6c657fb9124 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/dictation/editorDictation.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/dictation/editorDictation.ts
@@ -3,33 +3,33 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./editorDictation';
-import { localize, localize2 } from 'vs/nls';
-import { IDimension } from 'vs/base/browser/dom';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Disposable, DisposableStore, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from 'vs/editor/browser/editorBrowser';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { ContextKeyExpr, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { HasSpeechProvider, ISpeechService, SpeechToTextInProgress, SpeechToTextStatus } from 'vs/workbench/contrib/speech/common/speechService';
-import { Codicon } from 'vs/base/common/codicons';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { EditorAction2, EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { EditOperation } from 'vs/editor/common/core/editOperation';
-import { Selection } from 'vs/editor/common/core/selection';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { registerAction2 } from 'vs/platform/actions/common/actions';
-import { assertIsDefined } from 'vs/base/common/types';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { toAction } from 'vs/base/common/actions';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { isWindows } from 'vs/base/common/platform';
+import './editorDictation.css';
+import { localize, localize2 } from '../../../../../nls.js';
+import { IDimension } from '../../../../../base/browser/dom.js';
+import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { Disposable, DisposableStore, MutableDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from '../../../../../editor/browser/editorBrowser.js';
+import { IEditorContribution } from '../../../../../editor/common/editorCommon.js';
+import { ContextKeyExpr, IContextKeyService, RawContextKey } from '../../../../../platform/contextkey/common/contextkey.js';
+import { HasSpeechProvider, ISpeechService, SpeechToTextInProgress, SpeechToTextStatus } from '../../../speech/common/speechService.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { EditorOption } from '../../../../../editor/common/config/editorOptions.js';
+import { EditorAction2, EditorContributionInstantiation, registerEditorContribution } from '../../../../../editor/browser/editorExtensions.js';
+import { EditorContextKeys } from '../../../../../editor/common/editorContextKeys.js';
+import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { EditOperation } from '../../../../../editor/common/core/editOperation.js';
+import { Selection } from '../../../../../editor/common/core/selection.js';
+import { Position } from '../../../../../editor/common/core/position.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { assertIsDefined } from '../../../../../base/common/types.js';
+import { ActionBar } from '../../../../../base/browser/ui/actionbar/actionbar.js';
+import { toAction } from '../../../../../base/common/actions.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { isWindows } from '../../../../../base/common/platform.js';
 
 const EDITOR_DICTATION_IN_PROGRESS = new RawContextKey<boolean>('editorDictation.inProgress', false);
 const VOICE_CATEGORY = localize2('voiceCategory', "Voice");
diff --git a/src/vs/workbench/contrib/codeEditor/browser/diffEditorAccessibilityHelp.ts b/src/vs/workbench/contrib/codeEditor/browser/diffEditorAccessibilityHelp.ts
index ef4ce7693a1..f73fd0bd85c 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/diffEditorAccessibilityHelp.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/diffEditorAccessibilityHelp.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { AccessibleDiffViewerNext, AccessibleDiffViewerPrev } from 'vs/editor/browser/widget/diffEditor/commands';
-import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditor/diffEditorWidget';
-import { localize } from 'vs/nls';
-import { AccessibleViewProviderId, AccessibleViewType } from 'vs/platform/accessibility/browser/accessibleView';
-import { IAccessibleViewImplentation } from 'vs/platform/accessibility/browser/accessibleViewRegistry';
-import { ContextKeyEqualsExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { getCommentCommandInfo } from 'vs/workbench/contrib/accessibility/browser/editorAccessibilityHelp';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { AccessibleDiffViewerNext, AccessibleDiffViewerPrev } from '../../../../editor/browser/widget/diffEditor/commands.js';
+import { DiffEditorWidget } from '../../../../editor/browser/widget/diffEditor/diffEditorWidget.js';
+import { localize } from '../../../../nls.js';
+import { AccessibleViewProviderId, AccessibleViewType, AccessibleContentProvider } from '../../../../platform/accessibility/browser/accessibleView.js';
+import { IAccessibleViewImplentation } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
+import { ContextKeyEqualsExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
+import { getCommentCommandInfo } from '../../accessibility/browser/editorAccessibilityHelp.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
 
 export class DiffEditorAccessibilityHelp implements IAccessibleViewImplentation {
 	readonly priority = 105;
@@ -36,13 +36,13 @@ export class DiffEditorAccessibilityHelp implements IAccessibleViewImplentation
 			return;
 		}
 
-		const switchSides = localize('msg3', "Run the command Diff Editor: Switch Side<keybinding:diffEditor.switchSide> to toggle between the original and modified editors.");
+		const switchSides = localize('msg3', "Run the command Diff Editor: Switch Side{0} to toggle between the original and modified editors.", '<keybinding:diffEditor.switchSide>');
 		const diffEditorActiveAnnouncement = localize('msg5', "The setting, accessibility.verbosity.diffEditorActive, controls if a diff editor announcement is made when it becomes the active editor.");
 
 		const keys = ['accessibility.signals.diffLineDeleted', 'accessibility.signals.diffLineInserted', 'accessibility.signals.diffLineModified'];
 		const content = [
 			localize('msg1', "You are in a diff editor."),
-			localize('msg2', "View the next<keybinding:{0}> or previous<keybinding:{1}> diff in diff review mode, which is optimized for screen readers.", AccessibleDiffViewerNext.id, AccessibleDiffViewerPrev.id),
+			localize('msg2', "View the next{0} or previous{1} diff in diff review mode, which is optimized for screen readers.", '<keybinding:' + AccessibleDiffViewerNext.id + '>', '<keybinding:' + AccessibleDiffViewerPrev.id + '>'),
 			switchSides,
 			diffEditorActiveAnnouncement,
 			localize('msg4', "To control which accessibility signals should be played, the following settings can be configured: {0}.", keys.join(', ')),
@@ -51,15 +51,12 @@ export class DiffEditorAccessibilityHelp implements IAccessibleViewImplentation
 		if (commentCommandInfo) {
 			content.push(commentCommandInfo);
 		}
-		return {
-			id: AccessibleViewProviderId.DiffEditor,
-			verbositySettingKey: AccessibilityVerbositySettingId.DiffEditor,
-			provideContent: () => content.join('\n\n'),
-			onClose: () => {
-				codeEditor.focus();
-			},
-			options: { type: AccessibleViewType.Help }
-		};
+		return new AccessibleContentProvider(
+			AccessibleViewProviderId.DiffEditor,
+			{ type: AccessibleViewType.Help },
+			() => content.join('\n'),
+			() => codeEditor.focus(),
+			AccessibilityVerbositySettingId.DiffEditor,
+		);
 	}
-	dispose() { }
 }
diff --git a/src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.ts b/src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.ts
index 052608edd82..a2637cab038 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { autorunWithStore, observableFromEvent } from 'vs/base/common/observable';
-import { IDiffEditor } from 'vs/editor/browser/editorBrowser';
-import { registerDiffEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { EmbeddedDiffEditorWidget } from 'vs/editor/browser/widget/diffEditor/embeddedDiffEditorWidget';
-import { IDiffEditorContribution } from 'vs/editor/common/editorCommon';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { localize } from 'vs/nls';
-import { AccessibleViewRegistry } from 'vs/platform/accessibility/browser/accessibleViewRegistry';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { FloatingEditorClickWidget } from 'vs/workbench/browser/codeeditor';
-import { Extensions, IConfigurationMigrationRegistry } from 'vs/workbench/common/configuration';
-import { DiffEditorAccessibilityHelp } from 'vs/workbench/contrib/codeEditor/browser/diffEditorAccessibilityHelp';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { autorunWithStore, observableFromEvent } from '../../../../base/common/observable.js';
+import { IDiffEditor } from '../../../../editor/browser/editorBrowser.js';
+import { registerDiffEditorContribution } from '../../../../editor/browser/editorExtensions.js';
+import { EmbeddedDiffEditorWidget } from '../../../../editor/browser/widget/diffEditor/embeddedDiffEditorWidget.js';
+import { IDiffEditorContribution } from '../../../../editor/common/editorCommon.js';
+import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { localize } from '../../../../nls.js';
+import { AccessibleViewRegistry } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { FloatingEditorClickWidget } from '../../../browser/codeeditor.js';
+import { Extensions, IConfigurationMigrationRegistry } from '../../../common/configuration.js';
+import { DiffEditorAccessibilityHelp } from './diffEditorAccessibilityHelp.js';
 
 class DiffEditorHelperContribution extends Disposable implements IDiffEditorContribution {
 	public static readonly ID = 'editor.contrib.diffEditorHelper';
@@ -33,7 +33,7 @@ class DiffEditorHelperContribution extends Disposable implements IDiffEditorCont
 		const isEmbeddedDiffEditor = this._diffEditor instanceof EmbeddedDiffEditorWidget;
 
 		if (!isEmbeddedDiffEditor) {
-			const computationResult = observableFromEvent(e => this._diffEditor.onDidUpdateDiff(e), () => /** @description diffEditor.diffComputationResult */ this._diffEditor.getDiffComputationResult());
+			const computationResult = observableFromEvent(this, e => this._diffEditor.onDidUpdateDiff(e), () => /** @description diffEditor.diffComputationResult */ this._diffEditor.getDiffComputationResult());
 			const onlyWhiteSpaceChange = computationResult.map(r => r && !r.identical && r.changes2.length === 0);
 
 			this._register(autorunWithStore((reader, store) => {
diff --git a/src/vs/workbench/contrib/codeEditor/browser/editorFeatures.ts b/src/vs/workbench/contrib/codeEditor/browser/editorFeatures.ts
index 1d511d4bb0e..b2287ca01c4 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/editorFeatures.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/editorFeatures.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { getEditorFeatures } from 'vs/editor/common/editorFeatures';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { getEditorFeatures } from '../../../../editor/common/editorFeatures.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
 
 class EditorFeaturesInstantiator extends Disposable implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/contrib/codeEditor/browser/editorLineNumberMenu.ts b/src/vs/workbench/contrib/codeEditor/browser/editorLineNumberMenu.ts
index 5cb892f95cf..6af1d50d7c3 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/editorLineNumberMenu.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/editorLineNumberMenu.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IAction, Separator } from 'vs/base/common/actions';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { isMacintosh } from 'vs/base/common/platform';
-import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
-import { registerEditorContribution, EditorContributionInstantiation } from 'vs/editor/browser/editorExtensions';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { IMenuService, MenuId, MenuItemAction, SubmenuItemAction } from 'vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { TextEditorSelectionSource } from 'vs/platform/editor/common/editor';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { Registry } from 'vs/platform/registry/common/platform';
+import { IAction, Separator } from '../../../../base/common/actions.js';
+import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
+import { isMacintosh } from '../../../../base/common/platform.js';
+import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from '../../../../editor/browser/editorBrowser.js';
+import { registerEditorContribution, EditorContributionInstantiation } from '../../../../editor/browser/editorExtensions.js';
+import { IEditorContribution } from '../../../../editor/common/editorCommon.js';
+import { IMenuService, MenuId, MenuItemAction, SubmenuItemAction } from '../../../../platform/actions/common/actions.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { TextEditorSelectionSource } from '../../../../platform/editor/common/editor.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
 
 export interface IGutterActionsGenerator {
 	(context: { lineNumber: number; editor: ICodeEditor; accessor: ServicesAccessor }, result: { push(action: IAction, group?: string): void }): void;
diff --git a/src/vs/workbench/contrib/codeEditor/browser/editorSettingsMigration.ts b/src/vs/workbench/contrib/codeEditor/browser/editorSettingsMigration.ts
index 6803bea8f1a..d81e1d61d3d 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/editorSettingsMigration.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/editorSettingsMigration.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Registry } from 'vs/platform/registry/common/platform';
-import { EditorSettingMigration, ISettingsWriter } from 'vs/editor/browser/config/migrateOptions';
-import { ConfigurationKeyValuePairs, Extensions, IConfigurationMigrationRegistry } from 'vs/workbench/common/configuration';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { EditorSettingMigration, ISettingsWriter } from '../../../../editor/browser/config/migrateOptions.js';
+import { ConfigurationKeyValuePairs, Extensions, IConfigurationMigrationRegistry } from '../../../common/configuration.js';
 
 Registry.as<IConfigurationMigrationRegistry>(Extensions.ConfigurationMigration)
 	.registerConfigurationMigrations(EditorSettingMigration.items.map(item => ({
diff --git a/src/vs/workbench/contrib/codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.ts b/src/vs/workbench/contrib/codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.ts
index 2402e2e7e29..540a6deec5f 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.ts
@@ -3,37 +3,39 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./emptyTextEditorHint';
-import * as dom from 'vs/base/browser/dom';
-import { DisposableStore, dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from 'vs/editor/browser/editorBrowser';
-import { localize } from 'vs/nls';
-import { ChangeLanguageAction } from 'vs/workbench/browser/parts/editor/editorStatus';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { Schemas } from 'vs/base/common/network';
-import { Event } from 'vs/base/common/event';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ConfigurationChangedEvent, EditorOption } from 'vs/editor/common/config/editorOptions';
-import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IContentActionHandler, renderFormattedText } from 'vs/base/browser/formattedTextRenderer';
-import { ApplyFileSnippetAction } from 'vs/workbench/contrib/snippets/browser/commands/fileTemplateSnippets';
-import { IInlineChatSessionService } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSessionService';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from 'vs/base/common/actions';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { KeybindingLabel } from 'vs/base/browser/ui/keybindingLabel/keybindingLabel';
-import { OS } from 'vs/base/common/platform';
-import { status } from 'vs/base/browser/ui/aria/aria';
-import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { LOG_MODE_ID, OUTPUT_MODE_ID } from 'vs/workbench/services/output/common/output';
-import { SEARCH_RESULT_LANGUAGE_ID } from 'vs/workbench/services/search/common/search';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { ChatAgentLocation, IChatAgent, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
+import './emptyTextEditorHint.css';
+import * as dom from '../../../../../base/browser/dom.js';
+import { DisposableStore, dispose, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from '../../../../../editor/browser/editorBrowser.js';
+import { localize } from '../../../../../nls.js';
+import { ChangeLanguageAction } from '../../../../browser/parts/editor/editorStatus.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../../../../../editor/common/languages/modesRegistry.js';
+import { IEditorContribution } from '../../../../../editor/common/editorCommon.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { Event } from '../../../../../base/common/event.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { ConfigurationChangedEvent, EditorOption } from '../../../../../editor/common/config/editorOptions.js';
+import { EditorContributionInstantiation, registerEditorContribution } from '../../../../../editor/browser/editorExtensions.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
+import { IContentActionHandler, renderFormattedText } from '../../../../../base/browser/formattedTextRenderer.js';
+import { ApplyFileSnippetAction } from '../../../snippets/browser/commands/fileTemplateSnippets.js';
+import { IInlineChatSessionService } from '../../../inlineChat/browser/inlineChatSessionService.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from '../../../../../base/common/actions.js';
+import { IProductService } from '../../../../../platform/product/common/productService.js';
+import { KeybindingLabel } from '../../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
+import { OS } from '../../../../../base/common/platform.js';
+import { status } from '../../../../../base/browser/ui/aria/aria.js';
+import { AccessibilityVerbositySettingId } from '../../../accessibility/browser/accessibilityConfiguration.js';
+import { LOG_MODE_ID, OUTPUT_MODE_ID } from '../../../../services/output/common/output.js';
+import { SEARCH_RESULT_LANGUAGE_ID } from '../../../../services/search/common/search.js';
+import { getDefaultHoverDelegate } from '../../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
+import { ChatAgentLocation, IChatAgent, IChatAgentService } from '../../../chat/common/chatAgents.js';
+import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
+import { StandardMouseEvent } from '../../../../../base/browser/mouseEvent.js';
 
 const $ = dom.$;
 
@@ -60,6 +62,7 @@ export class EmptyTextEditorHintContribution implements IEditorContribution {
 		@IChatAgentService private readonly chatAgentService: IChatAgentService,
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@IProductService protected readonly productService: IProductService,
+		@IContextMenuService private readonly contextMenuService: IContextMenuService
 	) {
 		this.toDispose = [];
 		this.toDispose.push(this.editor.onDidChangeModel(() => this.update()));
@@ -128,7 +131,7 @@ export class EmptyTextEditorHintContribution implements IEditorContribution {
 		}
 
 		const hasEditorAgents = Boolean(this.chatAgentService.getDefaultAgent(ChatAgentLocation.Editor));
-		const shouldRenderDefaultHint = model?.uri.scheme === Schemas.untitled && languageId === PLAINTEXT_LANGUAGE_ID && hasEditorAgents;
+		const shouldRenderDefaultHint = model?.uri.scheme === Schemas.untitled && languageId === PLAINTEXT_LANGUAGE_ID;
 		return hasEditorAgents || shouldRenderDefaultHint;
 	}
 
@@ -145,7 +148,8 @@ export class EmptyTextEditorHintContribution implements IEditorContribution {
 				this.keybindingService,
 				this.chatAgentService,
 				this.telemetryService,
-				this.productService
+				this.productService,
+				this.contextMenuService
 			);
 		} else if (!shouldRenderHint && this.textHintContentWidget) {
 			this.textHintContentWidget.dispose();
@@ -178,7 +182,8 @@ class EmptyTextEditorHintContentWidget implements IContentWidget {
 		private readonly keybindingService: IKeybindingService,
 		private readonly chatAgentService: IChatAgentService,
 		private readonly telemetryService: ITelemetryService,
-		private readonly productService: IProductService
+		private readonly productService: IProductService,
+		private readonly contextMenuService: IContextMenuService,
 	) {
 		this.toDispose = new DisposableStore();
 		this.toDispose.add(this.editor.onDidChangeConfiguration((e: ConfigurationChangedEvent) => {
@@ -199,10 +204,34 @@ class EmptyTextEditorHintContentWidget implements IContentWidget {
 		return EmptyTextEditorHintContentWidget.ID;
 	}
 
-	private _disableHint() {
-		this.configurationService.updateValue(emptyTextEditorHintSetting, 'hidden');
-		this.dispose();
-		this.editor.focus();
+	private _disableHint(e?: MouseEvent) {
+		const disableHint = () => {
+			this.configurationService.updateValue(emptyTextEditorHintSetting, 'hidden');
+			this.dispose();
+			this.editor.focus();
+		};
+
+		if (!e) {
+			disableHint();
+			return;
+		}
+
+		this.contextMenuService.showContextMenu({
+			getAnchor: () => { return new StandardMouseEvent(dom.getActiveWindow(), e); },
+			getActions: () => {
+				return [{
+					id: 'workench.action.disableEmptyEditorHint',
+					label: localize('disableEditorEmptyHint', "Disable Empty Editor Hint"),
+					tooltip: localize('disableEditorEmptyHint', "Disable Empty Editor Hint"),
+					enabled: true,
+					class: undefined,
+					run: () => {
+						disableHint();
+					}
+				}
+				];
+			}
+		});
 	}
 
 	private _getHintInlineChat(providers: IChatAgent[]) {
@@ -244,7 +273,7 @@ class EmptyTextEditorHintContentWidget implements IContentWidget {
 					const hintPart = $('a', undefined, fragment);
 					hintPart.style.fontStyle = 'italic';
 					hintPart.style.cursor = 'pointer';
-					this.toDispose.add(dom.addDisposableListener(hintPart, dom.EventType.CONTEXT_MENU, () => this._disableHint()));
+					this.toDispose.add(dom.addDisposableListener(hintPart, dom.EventType.CONTEXT_MENU, (e) => this._disableHint(e)));
 					this.toDispose.add(dom.addDisposableListener(hintPart, dom.EventType.CLICK, handleClick));
 					return hintPart;
 				} else {
@@ -263,7 +292,7 @@ class EmptyTextEditorHintContentWidget implements IContentWidget {
 
 			if (this.options.clickable) {
 				label.element.style.cursor = 'pointer';
-				this.toDispose.add(dom.addDisposableListener(label.element, dom.EventType.CONTEXT_MENU, () => this._disableHint()));
+				this.toDispose.add(dom.addDisposableListener(label.element, dom.EventType.CONTEXT_MENU, (e) => this._disableHint(e)));
 				this.toDispose.add(dom.addDisposableListener(label.element, dom.EventType.CLICK, handleClick));
 			}
 
@@ -319,7 +348,7 @@ class EmptyTextEditorHintContentWidget implements IContentWidget {
 				id: ChangeLanguageAction.ID,
 				from: 'hint'
 			});
-			await this.commandService.executeCommand(ChangeLanguageAction.ID, { from: 'hint' });
+			await this.commandService.executeCommand(ChangeLanguageAction.ID);
 			this.editor.focus();
 		};
 
diff --git a/src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.ts b/src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.ts
index c7390207969..f990b147834 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.ts
@@ -3,29 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./simpleFindWidget';
-import * as nls from 'vs/nls';
-import * as dom from 'vs/base/browser/dom';
-import { FindInput } from 'vs/base/browser/ui/findinput/findInput';
-import { Widget } from 'vs/base/browser/ui/widget';
-import { Delayer } from 'vs/base/common/async';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { FindReplaceState, INewFindReplaceState } from 'vs/editor/contrib/find/browser/findState';
-import { IMessage as InputBoxMessage } from 'vs/base/browser/ui/inputbox/inputBox';
-import { SimpleButton, findPreviousMatchIcon, findNextMatchIcon, NLS_NO_RESULTS, NLS_MATCHES_LOCATION } from 'vs/editor/contrib/find/browser/findWidget';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { ContextScopedFindInput } from 'vs/platform/history/browser/contextScopedHistoryWidget';
-import { widgetClose } from 'vs/platform/theme/common/iconRegistry';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import * as strings from 'vs/base/common/strings';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { showHistoryKeybindingHint } from 'vs/platform/history/browser/historyWidgetKeybindingHint';
-import { status } from 'vs/base/browser/ui/aria/aria';
-import { defaultInputBoxStyles, defaultToggleStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { ISashEvent, IVerticalSashLayoutProvider, Orientation, Sash } from 'vs/base/browser/ui/sash/sash';
-import { registerColor } from 'vs/platform/theme/common/colorRegistry';
-import type { IHoverService } from 'vs/platform/hover/browser/hover';
+import './simpleFindWidget.css';
+import * as nls from '../../../../../nls.js';
+import * as dom from '../../../../../base/browser/dom.js';
+import { FindInput } from '../../../../../base/browser/ui/findinput/findInput.js';
+import { Widget } from '../../../../../base/browser/ui/widget.js';
+import { Delayer } from '../../../../../base/common/async.js';
+import { KeyCode } from '../../../../../base/common/keyCodes.js';
+import { FindReplaceState, INewFindReplaceState } from '../../../../../editor/contrib/find/browser/findState.js';
+import { IMessage as InputBoxMessage } from '../../../../../base/browser/ui/inputbox/inputBox.js';
+import { SimpleButton, findPreviousMatchIcon, findNextMatchIcon, NLS_NO_RESULTS, NLS_MATCHES_LOCATION } from '../../../../../editor/contrib/find/browser/findWidget.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IContextViewService } from '../../../../../platform/contextview/browser/contextView.js';
+import { ContextScopedFindInput } from '../../../../../platform/history/browser/contextScopedHistoryWidget.js';
+import { widgetClose } from '../../../../../platform/theme/common/iconRegistry.js';
+import { registerThemingParticipant } from '../../../../../platform/theme/common/themeService.js';
+import * as strings from '../../../../../base/common/strings.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { showHistoryKeybindingHint } from '../../../../../platform/history/browser/historyWidgetKeybindingHint.js';
+import { status } from '../../../../../base/browser/ui/aria/aria.js';
+import { defaultInputBoxStyles, defaultToggleStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
+import { ISashEvent, IVerticalSashLayoutProvider, Orientation, Sash } from '../../../../../base/browser/ui/sash/sash.js';
+import { registerColor } from '../../../../../platform/theme/common/colorRegistry.js';
+import type { IHoverService } from '../../../../../platform/hover/browser/hover.js';
 
 const NLS_FIND_INPUT_LABEL = nls.localize('label.find', "Find");
 const NLS_FIND_INPUT_PLACEHOLDER = nls.localize('placeholder.find', "Find");
diff --git a/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.ts b/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.ts
index 8b2fa1d6632..11557af2c05 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.ts
@@ -3,38 +3,40 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./inspectEditorTokens';
-import * as nls from 'vs/nls';
-import * as dom from 'vs/base/browser/dom';
-import { CharCode } from 'vs/base/common/charCode';
-import { Color } from 'vs/base/common/color';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ContentWidgetPositionPreference, IActiveCodeEditor, ICodeEditor, IContentWidget, IContentWidgetPosition } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, ServicesAccessor, registerEditorAction, registerEditorContribution, EditorContributionInstantiation } from 'vs/editor/browser/editorExtensions';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { ITextModel } from 'vs/editor/common/model';
-import { SemanticTokensLegend, SemanticTokens } from 'vs/editor/common/languages';
-import { FontStyle, ColorId, StandardTokenType, TokenMetadata } from 'vs/editor/common/encodedTokenAttributes';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { findMatchingThemeRule } from 'vs/workbench/services/textMate/common/TMHelper';
-import { ITextMateTokenizationService } from 'vs/workbench/services/textMate/browser/textMateTokenizationFeature';
+import './inspectEditorTokens.css';
+import * as nls from '../../../../../nls.js';
+import * as dom from '../../../../../base/browser/dom.js';
+import { CharCode } from '../../../../../base/common/charCode.js';
+import { Color } from '../../../../../base/common/color.js';
+import { KeyCode } from '../../../../../base/common/keyCodes.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { ContentWidgetPositionPreference, IActiveCodeEditor, ICodeEditor, IContentWidget, IContentWidgetPosition } from '../../../../../editor/browser/editorBrowser.js';
+import { EditorAction, ServicesAccessor, registerEditorAction, registerEditorContribution, EditorContributionInstantiation } from '../../../../../editor/browser/editorExtensions.js';
+import { Position } from '../../../../../editor/common/core/position.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { IEditorContribution } from '../../../../../editor/common/editorCommon.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
+import { SemanticTokensLegend, SemanticTokens, TreeSitterTokenizationRegistry } from '../../../../../editor/common/languages.js';
+import { FontStyle, ColorId, StandardTokenType, TokenMetadata } from '../../../../../editor/common/encodedTokenAttributes.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
+import { INotificationService } from '../../../../../platform/notification/common/notification.js';
+import { findMatchingThemeRule } from '../../../../services/textMate/common/TMHelper.js';
+import { ITextMateTokenizationService } from '../../../../services/textMate/browser/textMateTokenizationFeature.js';
 import type { IGrammar, IToken, StateStack } from 'vscode-textmate';
-import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { ColorThemeData, TokenStyleDefinitions, TokenStyleDefinition, TextMateThemingRuleDefinitions } from 'vs/workbench/services/themes/common/colorThemeData';
-import { SemanticTokenRule, TokenStyleData, TokenStyle } from 'vs/platform/theme/common/tokenClassificationRegistry';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { SEMANTIC_HIGHLIGHTING_SETTING_ID, IEditorSemanticHighlightingOptions } from 'vs/editor/contrib/semanticTokens/common/semanticTokensConfig';
-import { Schemas } from 'vs/base/common/network';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
+import { IWorkbenchThemeService } from '../../../../services/themes/common/workbenchThemeService.js';
+import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { ColorThemeData, TokenStyleDefinitions, TokenStyleDefinition, TextMateThemingRuleDefinitions } from '../../../../services/themes/common/colorThemeData.js';
+import { SemanticTokenRule, TokenStyleData, TokenStyle } from '../../../../../platform/theme/common/tokenClassificationRegistry.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { SEMANTIC_HIGHLIGHTING_SETTING_ID, IEditorSemanticHighlightingOptions } from '../../../../../editor/contrib/semanticTokens/common/semanticTokensConfig.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { ILanguageFeaturesService } from '../../../../../editor/common/services/languageFeatures.js';
+import { ITreeSitterParserService } from '../../../../../editor/common/services/treeSitterParserService.js';
+import type { Parser } from '@vscode/tree-sitter-wasm';
 
 const $ = dom.$;
 
-class InspectEditorTokensController extends Disposable implements IEditorContribution {
+export class InspectEditorTokensController extends Disposable implements IEditorContribution {
 
 	public static readonly ID = 'editor.contrib.inspectEditorTokens';
 
@@ -44,6 +46,7 @@ class InspectEditorTokensController extends Disposable implements IEditorContrib
 
 	private _editor: ICodeEditor;
 	private _textMateService: ITextMateTokenizationService;
+	private _treeSitterService: ITreeSitterParserService;
 	private _themeService: IWorkbenchThemeService;
 	private _languageService: ILanguageService;
 	private _notificationService: INotificationService;
@@ -54,6 +57,7 @@ class InspectEditorTokensController extends Disposable implements IEditorContrib
 	constructor(
 		editor: ICodeEditor,
 		@ITextMateTokenizationService textMateService: ITextMateTokenizationService,
+		@ITreeSitterParserService treeSitterService: ITreeSitterParserService,
 		@ILanguageService languageService: ILanguageService,
 		@IWorkbenchThemeService themeService: IWorkbenchThemeService,
 		@INotificationService notificationService: INotificationService,
@@ -63,6 +67,7 @@ class InspectEditorTokensController extends Disposable implements IEditorContrib
 		super();
 		this._editor = editor;
 		this._textMateService = textMateService;
+		this._treeSitterService = treeSitterService;
 		this._themeService = themeService;
 		this._languageService = languageService;
 		this._notificationService = notificationService;
@@ -91,7 +96,7 @@ class InspectEditorTokensController extends Disposable implements IEditorContrib
 			// disable in notebooks
 			return;
 		}
-		this._widget = new InspectEditorTokensWidget(this._editor, this._textMateService, this._languageService, this._themeService, this._notificationService, this._configurationService, this._languageFeaturesService);
+		this._widget = new InspectEditorTokensWidget(this._editor, this._textMateService, this._treeSitterService, this._languageService, this._themeService, this._notificationService, this._configurationService, this._languageFeaturesService);
 	}
 
 	public stop(): void {
@@ -188,6 +193,7 @@ class InspectEditorTokensWidget extends Disposable implements IContentWidget {
 	private readonly _languageService: ILanguageService;
 	private readonly _themeService: IWorkbenchThemeService;
 	private readonly _textMateService: ITextMateTokenizationService;
+	private readonly _treeSitterService: ITreeSitterParserService;
 	private readonly _notificationService: INotificationService;
 	private readonly _configurationService: IConfigurationService;
 	private readonly _languageFeaturesService: ILanguageFeaturesService;
@@ -198,6 +204,7 @@ class InspectEditorTokensWidget extends Disposable implements IContentWidget {
 	constructor(
 		editor: IActiveCodeEditor,
 		textMateService: ITextMateTokenizationService,
+		treeSitterService: ITreeSitterParserService,
 		languageService: ILanguageService,
 		themeService: IWorkbenchThemeService,
 		notificationService: INotificationService,
@@ -210,6 +217,7 @@ class InspectEditorTokensWidget extends Disposable implements IContentWidget {
 		this._languageService = languageService;
 		this._themeService = themeService;
 		this._textMateService = textMateService;
+		this._treeSitterService = treeSitterService;
 		this._notificationService = notificationService;
 		this._configurationService = configurationService;
 		this._languageFeaturesService = languageFeaturesService;
@@ -238,6 +246,7 @@ class InspectEditorTokensWidget extends Disposable implements IContentWidget {
 	private _beginCompute(position: Position): void {
 		const grammar = this._textMateService.createTokenizer(this._model.getLanguageId());
 		const semanticTokens = this._computeSemanticTokens(position);
+		const tree = this._treeSitterService.getParseResult(this._model);
 
 		dom.clearNode(this._domNode);
 		this._domNode.appendChild(document.createTextNode(nls.localize('inspectTMScopesWidget.loading', "Loading...")));
@@ -246,7 +255,7 @@ class InspectEditorTokensWidget extends Disposable implements IContentWidget {
 			if (this._isDisposed) {
 				return;
 			}
-			this._compute(grammar, semanticTokens, position);
+			this._compute(grammar, semanticTokens, tree?.tree, position);
 			this._domNode.style.maxWidth = `${Math.max(this._editor.getLayoutInfo().width * 0.66, 500)}px`;
 			this._editor.layoutContentWidget(this);
 		}, (err) => {
@@ -267,10 +276,11 @@ class InspectEditorTokensWidget extends Disposable implements IContentWidget {
 		return this._themeService.getColorTheme().semanticHighlighting;
 	}
 
-	private _compute(grammar: IGrammar | null, semanticTokens: SemanticTokensResult | null, position: Position) {
+	private _compute(grammar: IGrammar | null, semanticTokens: SemanticTokensResult | null, tree: Parser.Tree | undefined, position: Position) {
 		const textMateTokenInfo = grammar && this._getTokensAtPosition(grammar, position);
 		const semanticTokenInfo = semanticTokens && this._getSemanticTokenAtPosition(semanticTokens, position);
-		if (!textMateTokenInfo && !semanticTokenInfo) {
+		const treeSitterTokenInfo = tree && this._getTreeSitterTokenAtPosition(tree, position);
+		if (!textMateTokenInfo && !semanticTokenInfo && !treeSitterTokenInfo) {
 			dom.reset(this._domNode, 'No grammar or semantic tokens available.');
 			return;
 		}
@@ -389,6 +399,40 @@ class InspectEditorTokensWidget extends Disposable implements IContentWidget {
 				));
 			}
 		}
+
+		if (treeSitterTokenInfo) {
+			dom.append(this._domNode, $('hr.tiw-metadata-separator'));
+			const table = dom.append(this._domNode, $('table.tiw-metadata-table'));
+			const tbody = dom.append(table, $('tbody'));
+
+			dom.append(tbody, $('tr', undefined,
+				$('td.tiw-metadata-key', undefined, 'tree-sitter token' as string),
+				$('td.tiw-metadata-value', undefined, `${treeSitterTokenInfo.text}`)
+			));
+			const scopes = new Array<HTMLElement | string>();
+			let node = treeSitterTokenInfo;
+			while (node.parent) {
+				scopes.push(node.type);
+				node = node.parent;
+				if (node) {
+					scopes.push($('br'));
+				}
+			}
+
+			dom.append(tbody, $('tr', undefined,
+				$('td.tiw-metadata-key', undefined, 'tree-sitter scopes' as string),
+				$('td.tiw-metadata-value.tiw-metadata-scopes', undefined, ...scopes),
+			));
+
+			const tokenizationSupport = TreeSitterTokenizationRegistry.get(this._model.getLanguageId());
+			const captures = tokenizationSupport?.captureAtPosition(position.lineNumber, position.column, this._model);
+			if (captures && captures.length > 0) {
+				dom.append(tbody, $('tr', undefined,
+					$('td.tiw-metadata-key', undefined, 'foreground'),
+					$('td.tiw-metadata-value', undefined, captures[captures.length - 1].name),
+				));
+			}
+		}
 	}
 
 	private _formatMetadata(semantic?: IDecodedMetadata, tm?: IDecodedMetadata): Array<HTMLElement | string> {
@@ -603,6 +647,28 @@ class InspectEditorTokensWidget extends Disposable implements IContentWidget {
 		return null;
 	}
 
+	private _walkTreeforPosition(cursor: Parser.TreeCursor, pos: Position): Parser.SyntaxNode | null {
+		const offset = this._model.getOffsetAt(pos);
+		cursor.gotoFirstChild();
+		let goChild: boolean = false;
+		let lastGoodNode: Parser.SyntaxNode | null = null;
+		do {
+			if (cursor.currentNode.startIndex <= offset && offset < cursor.currentNode.endIndex) {
+				goChild = true;
+				lastGoodNode = cursor.currentNode;
+			} else {
+				goChild = false;
+			}
+		} while (goChild ? cursor.gotoFirstChild() : cursor.gotoNextSibling());
+		return lastGoodNode;
+	}
+
+	private _getTreeSitterTokenAtPosition(tree: Parser.Tree, pos: Position): Parser.SyntaxNode | null {
+		const cursor = tree.walk();
+
+		return this._walkTreeforPosition(cursor, pos);
+	}
+
 	private _renderTokenStyleDefinition(definition: TokenStyleDefinition | undefined, property: keyof TokenStyleData): Array<HTMLElement | string> {
 		const elements = new Array<HTMLElement | string>();
 		if (definition === undefined) {
diff --git a/src/vs/workbench/contrib/codeEditor/browser/inspectKeybindings.ts b/src/vs/workbench/contrib/codeEditor/browser/inspectKeybindings.ts
index af947509e81..c20a27e3812 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/inspectKeybindings.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/inspectKeybindings.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize2 } from 'vs/nls';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
+import { localize2 } from '../../../../nls.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
 
 class InspectKeyMap extends Action2 {
 
diff --git a/src/vs/workbench/contrib/codeEditor/browser/largeFileOptimizations.ts b/src/vs/workbench/contrib/codeEditor/browser/largeFileOptimizations.ts
index 9c2cae83890..3f9f11f81ae 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/largeFileOptimizations.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/largeFileOptimizations.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import * as path from 'vs/base/common/path';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
+import * as nls from '../../../../nls.js';
+import * as path from '../../../../base/common/path.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { EditorContributionInstantiation, registerEditorContribution } from '../../../../editor/browser/editorExtensions.js';
+import { IEditorContribution } from '../../../../editor/common/editorCommon.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
 
 /**
  * Shows a message when opening a large file which has been memory optimized (and features disabled).
diff --git a/src/vs/workbench/contrib/codeEditor/browser/menuPreventer.ts b/src/vs/workbench/contrib/codeEditor/browser/menuPreventer.ts
index 93018cf4929..0eb8e8e03bc 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/menuPreventer.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/menuPreventer.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyMod } from 'vs/base/common/keyCodes';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
+import { KeyMod } from '../../../../base/common/keyCodes.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { EditorContributionInstantiation, registerEditorContribution } from '../../../../editor/browser/editorExtensions.js';
+import { IEditorContribution } from '../../../../editor/common/editorCommon.js';
 
 /**
  * Prevents the top-level menu from showing up when doing Alt + Click in the editor
diff --git a/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsOutline.ts b/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsOutline.ts
index dc43b9557b7..5154d1928f5 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsOutline.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsOutline.ts
@@ -3,36 +3,36 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { OutlineConfigCollapseItemsValues, IBreadcrumbsDataSource, IOutline, IOutlineCreator, IOutlineListConfig, IOutlineService, OutlineChangeEvent, OutlineConfigKeys, OutlineTarget, } from 'vs/workbench/services/outline/browser/outline';
-import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IEditorPane } from 'vs/workbench/common/editor';
-import { DocumentSymbolComparator, DocumentSymbolAccessibilityProvider, DocumentSymbolRenderer, DocumentSymbolFilter, DocumentSymbolGroupRenderer, DocumentSymbolIdentityProvider, DocumentSymbolNavigationLabelProvider, DocumentSymbolVirtualDelegate } from 'vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsTree';
-import { ICodeEditor, isCodeEditor, isDiffEditor } from 'vs/editor/browser/editorBrowser';
-import { OutlineGroup, OutlineElement, OutlineModel, TreeElement, IOutlineMarker, IOutlineModelService } from 'vs/editor/contrib/documentSymbols/browser/outlineModel';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { raceCancellation, TimeoutTimer, timeout, Barrier } from 'vs/base/common/async';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { URI } from 'vs/base/common/uri';
-import { ITextModel } from 'vs/editor/common/model';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IPosition } from 'vs/editor/common/core/position';
-import { ScrollType } from 'vs/editor/common/editorCommon';
-import { Range } from 'vs/editor/common/core/range';
-import { IEditorOptions, TextEditorSelectionRevealType } from 'vs/platform/editor/common/editor';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { IModelContentChangedEvent } from 'vs/editor/common/textModelEvents';
-import { IDataSource } from 'vs/base/browser/ui/tree/tree';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { localize } from 'vs/nls';
-import { IMarkerDecorationsService } from 'vs/editor/common/services/markerDecorations';
-import { MarkerSeverity } from 'vs/platform/markers/common/markers';
-import { isEqual } from 'vs/base/common/resources';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { OutlineConfigCollapseItemsValues, IBreadcrumbsDataSource, IOutline, IOutlineCreator, IOutlineListConfig, IOutlineService, OutlineChangeEvent, OutlineConfigKeys, OutlineTarget, } from '../../../../services/outline/browser/outline.js';
+import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from '../../../../common/contributions.js';
+import { Registry } from '../../../../../platform/registry/common/platform.js';
+import { LifecyclePhase } from '../../../../services/lifecycle/common/lifecycle.js';
+import { IEditorPane } from '../../../../common/editor.js';
+import { DocumentSymbolComparator, DocumentSymbolAccessibilityProvider, DocumentSymbolRenderer, DocumentSymbolFilter, DocumentSymbolGroupRenderer, DocumentSymbolIdentityProvider, DocumentSymbolNavigationLabelProvider, DocumentSymbolVirtualDelegate } from './documentSymbolsTree.js';
+import { ICodeEditor, isCodeEditor, isDiffEditor } from '../../../../../editor/browser/editorBrowser.js';
+import { OutlineGroup, OutlineElement, OutlineModel, TreeElement, IOutlineMarker, IOutlineModelService } from '../../../../../editor/contrib/documentSymbols/browser/outlineModel.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { raceCancellation, TimeoutTimer, timeout, Barrier } from '../../../../../base/common/async.js';
+import { onUnexpectedError } from '../../../../../base/common/errors.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
+import { ITextResourceConfigurationService } from '../../../../../editor/common/services/textResourceConfiguration.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IPosition } from '../../../../../editor/common/core/position.js';
+import { ScrollType } from '../../../../../editor/common/editorCommon.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { IEditorOptions, TextEditorSelectionRevealType } from '../../../../../platform/editor/common/editor.js';
+import { ICodeEditorService } from '../../../../../editor/browser/services/codeEditorService.js';
+import { IModelContentChangedEvent } from '../../../../../editor/common/textModelEvents.js';
+import { IDataSource } from '../../../../../base/browser/ui/tree/tree.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { localize } from '../../../../../nls.js';
+import { IMarkerDecorationsService } from '../../../../../editor/common/services/markerDecorations.js';
+import { MarkerSeverity } from '../../../../../platform/markers/common/markers.js';
+import { isEqual } from '../../../../../base/common/resources.js';
+import { ILanguageFeaturesService } from '../../../../../editor/common/services/languageFeatures.js';
 
 type DocumentSymbolItem = OutlineGroup | OutlineElement;
 
diff --git a/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsTree.ts b/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsTree.ts
index 3d9af339abe..86b72f6b037 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsTree.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsTree.ts
@@ -3,27 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./documentSymbolsTree';
-import 'vs/editor/contrib/symbolIcons/browser/symbolIcons'; // The codicon symbol colors are defined here and must be loaded to get colors
-import * as dom from 'vs/base/browser/dom';
-import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
-import { IIdentityProvider, IKeyboardNavigationLabelProvider, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { ITreeNode, ITreeRenderer, ITreeFilter } from 'vs/base/browser/ui/tree/tree';
-import { createMatches, FuzzyScore } from 'vs/base/common/filters';
-import { Range } from 'vs/editor/common/core/range';
-import { SymbolKind, SymbolKinds, SymbolTag, getAriaLabelForSymbol, symbolKindNames } from 'vs/editor/common/languages';
-import { OutlineElement, OutlineGroup, OutlineModel } from 'vs/editor/contrib/documentSymbols/browser/outlineModel';
-import { localize } from 'vs/nls';
-import { IconLabel, IIconLabelValueOptions } from 'vs/base/browser/ui/iconLabel/iconLabel';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { MarkerSeverity } from 'vs/platform/markers/common/markers';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { listErrorForeground, listWarningForeground } from 'vs/platform/theme/common/colorRegistry';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
-import { IOutlineComparator, OutlineConfigKeys, OutlineTarget } from 'vs/workbench/services/outline/browser/outline';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { mainWindow } from 'vs/base/browser/window';
+import './documentSymbolsTree.css';
+import '../../../../../editor/contrib/symbolIcons/browser/symbolIcons.js'; // The codicon symbol colors are defined here and must be loaded to get colors
+import * as dom from '../../../../../base/browser/dom.js';
+import { HighlightedLabel } from '../../../../../base/browser/ui/highlightedlabel/highlightedLabel.js';
+import { IIdentityProvider, IKeyboardNavigationLabelProvider, IListVirtualDelegate } from '../../../../../base/browser/ui/list/list.js';
+import { ITreeNode, ITreeRenderer, ITreeFilter } from '../../../../../base/browser/ui/tree/tree.js';
+import { createMatches, FuzzyScore } from '../../../../../base/common/filters.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { SymbolKind, SymbolKinds, SymbolTag, getAriaLabelForSymbol, symbolKindNames } from '../../../../../editor/common/languages.js';
+import { OutlineElement, OutlineGroup, OutlineModel } from '../../../../../editor/contrib/documentSymbols/browser/outlineModel.js';
+import { localize } from '../../../../../nls.js';
+import { IconLabel, IIconLabelValueOptions } from '../../../../../base/browser/ui/iconLabel/iconLabel.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { MarkerSeverity } from '../../../../../platform/markers/common/markers.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { listErrorForeground, listWarningForeground } from '../../../../../platform/theme/common/colorRegistry.js';
+import { ITextResourceConfigurationService } from '../../../../../editor/common/services/textResourceConfiguration.js';
+import { IListAccessibilityProvider } from '../../../../../base/browser/ui/list/listWidget.js';
+import { IOutlineComparator, OutlineConfigKeys, OutlineTarget } from '../../../../services/outline/browser/outline.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { mainWindow } from '../../../../../base/browser/window.js';
 
 export type DocumentSymbolItem = OutlineGroup | OutlineElement;
 
diff --git a/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess.ts b/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess.ts
index 14499cff388..972fd363b90 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize, localize2 } from 'vs/nls';
-import { IKeyMods, IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IRange } from 'vs/editor/common/core/range';
-import { AbstractGotoLineQuickAccessProvider } from 'vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IQuickAccessRegistry, Extensions as QuickaccesExtensions } from 'vs/platform/quickinput/common/quickAccess';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IWorkbenchEditorConfiguration } from 'vs/workbench/common/editor';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { IQuickAccessTextEditorContext } from 'vs/editor/contrib/quickAccess/browser/editorNavigationQuickAccess';
-import { ITextEditorOptions } from 'vs/platform/editor/common/editor';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
+import { localize, localize2 } from '../../../../../nls.js';
+import { IKeyMods, IQuickInputService } from '../../../../../platform/quickinput/common/quickInput.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { IRange } from '../../../../../editor/common/core/range.js';
+import { AbstractGotoLineQuickAccessProvider } from '../../../../../editor/contrib/quickAccess/browser/gotoLineQuickAccess.js';
+import { Registry } from '../../../../../platform/registry/common/platform.js';
+import { IQuickAccessRegistry, Extensions as QuickaccesExtensions } from '../../../../../platform/quickinput/common/quickAccess.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IWorkbenchEditorConfiguration } from '../../../../common/editor.js';
+import { Action2, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { KeyMod, KeyCode } from '../../../../../base/common/keyCodes.js';
+import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IQuickAccessTextEditorContext } from '../../../../../editor/contrib/quickAccess/browser/editorNavigationQuickAccess.js';
+import { ITextEditorOptions } from '../../../../../platform/editor/common/editor.js';
+import { IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
 
 export class GotoLineQuickAccessProvider extends AbstractGotoLineQuickAccessProvider {
 
diff --git a/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts b/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts
index 2a40f9d9413..037908fa8db 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts
@@ -3,37 +3,37 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize, localize2 } from 'vs/nls';
-import { IKeyMods, IQuickPickSeparator, IQuickInputService, IQuickPick, ItemActivation } from 'vs/platform/quickinput/common/quickInput';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IRange } from 'vs/editor/common/core/range';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IQuickAccessRegistry, Extensions as QuickaccessExtensions } from 'vs/platform/quickinput/common/quickAccess';
-import { AbstractGotoSymbolQuickAccessProvider, IGotoSymbolQuickPickItem } from 'vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IWorkbenchEditorConfiguration } from 'vs/workbench/common/editor';
-import { ITextModel } from 'vs/editor/common/model';
-import { DisposableStore, IDisposable, toDisposable, Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { timeout } from 'vs/base/common/async';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { registerAction2, Action2, MenuId } from 'vs/platform/actions/common/actions';
-import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
-import { prepareQuery } from 'vs/base/common/fuzzyScorer';
-import { SymbolKind } from 'vs/editor/common/languages';
-import { fuzzyScore } from 'vs/base/common/filters';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { IQuickAccessTextEditorContext } from 'vs/editor/contrib/quickAccess/browser/editorNavigationQuickAccess';
-import { IOutlineService, OutlineTarget } from 'vs/workbench/services/outline/browser/outline';
-import { isCompositeEditor } from 'vs/editor/browser/editorBrowser';
-import { ITextEditorOptions } from 'vs/platform/editor/common/editor';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IOutlineModelService } from 'vs/editor/contrib/documentSymbols/browser/outlineModel';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { accessibilityHelpIsShown, accessibleViewIsShown } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { matchesFuzzyIconAware, parseLabelWithIcons } from 'vs/base/common/iconLabels';
+import { localize, localize2 } from '../../../../../nls.js';
+import { IKeyMods, IQuickPickSeparator, IQuickInputService, IQuickPick, ItemActivation } from '../../../../../platform/quickinput/common/quickInput.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { IRange } from '../../../../../editor/common/core/range.js';
+import { Registry } from '../../../../../platform/registry/common/platform.js';
+import { IQuickAccessRegistry, Extensions as QuickaccessExtensions } from '../../../../../platform/quickinput/common/quickAccess.js';
+import { AbstractGotoSymbolQuickAccessProvider, IGotoSymbolQuickPickItem } from '../../../../../editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IWorkbenchEditorConfiguration } from '../../../../common/editor.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
+import { DisposableStore, IDisposable, toDisposable, Disposable, MutableDisposable } from '../../../../../base/common/lifecycle.js';
+import { timeout } from '../../../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { registerAction2, Action2, MenuId } from '../../../../../platform/actions/common/actions.js';
+import { KeyMod, KeyCode } from '../../../../../base/common/keyCodes.js';
+import { prepareQuery } from '../../../../../base/common/fuzzyScorer.js';
+import { SymbolKind } from '../../../../../editor/common/languages.js';
+import { fuzzyScore } from '../../../../../base/common/filters.js';
+import { onUnexpectedError } from '../../../../../base/common/errors.js';
+import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IQuickAccessTextEditorContext } from '../../../../../editor/contrib/quickAccess/browser/editorNavigationQuickAccess.js';
+import { IOutlineService, OutlineTarget } from '../../../../services/outline/browser/outline.js';
+import { isCompositeEditor } from '../../../../../editor/browser/editorBrowser.js';
+import { ITextEditorOptions } from '../../../../../platform/editor/common/editor.js';
+import { IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
+import { IOutlineModelService } from '../../../../../editor/contrib/documentSymbols/browser/outlineModel.js';
+import { ILanguageFeaturesService } from '../../../../../editor/common/services/languageFeatures.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { accessibilityHelpIsShown, accessibleViewIsShown } from '../../../accessibility/browser/accessibilityConfiguration.js';
+import { matchesFuzzyIconAware, parseLabelWithIcons } from '../../../../../base/common/iconLabels.js';
 
 export class GotoSymbolQuickAccessProvider extends AbstractGotoSymbolQuickAccessProvider {
 
@@ -123,7 +123,7 @@ export class GotoSymbolQuickAccessProvider extends AbstractGotoSymbolQuickAccess
 
 	//#endregion
 
-	protected override provideWithoutTextEditor(picker: IQuickPick<IGotoSymbolQuickPickItem>): IDisposable {
+	protected override provideWithoutTextEditor(picker: IQuickPick<IGotoSymbolQuickPickItem, { useSeparators: true }>): IDisposable {
 		if (this.canPickWithOutlineService()) {
 			return this.doGetOutlinePicks(picker);
 		}
@@ -134,7 +134,7 @@ export class GotoSymbolQuickAccessProvider extends AbstractGotoSymbolQuickAccess
 		return this.editorService.activeEditorPane ? this.outlineService.canCreateOutline(this.editorService.activeEditorPane) : false;
 	}
 
-	private doGetOutlinePicks(picker: IQuickPick<IGotoSymbolQuickPickItem>): IDisposable {
+	private doGetOutlinePicks(picker: IQuickPick<IGotoSymbolQuickPickItem, { useSeparators: true }>): IDisposable {
 		const pane = this.editorService.activeEditorPane;
 		if (!pane) {
 			return Disposable.None;
diff --git a/src/vs/workbench/contrib/codeEditor/browser/saveParticipants.ts b/src/vs/workbench/contrib/codeEditor/browser/saveParticipants.ts
index d04fd459483..9c5a124d021 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/saveParticipants.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/saveParticipants.ts
@@ -3,35 +3,39 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { HierarchicalKind } from 'vs/base/common/hierarchicalKind';
-import { Disposable } from 'vs/base/common/lifecycle';
-import * as strings from 'vs/base/common/strings';
-import { IActiveCodeEditor, isCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { trimTrailingWhitespace } from 'vs/editor/common/commands/trimTrailingWhitespaceCommand';
-import { EditOperation } from 'vs/editor/common/core/editOperation';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { CodeActionProvider, CodeActionTriggerType } from 'vs/editor/common/languages';
-import { ITextModel } from 'vs/editor/common/model';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { ApplyCodeActionReason, applyCodeAction, getCodeActions } from 'vs/editor/contrib/codeAction/browser/codeAction';
-import { CodeActionKind, CodeActionTriggerSource } from 'vs/editor/contrib/codeAction/common/types';
-import { FormattingMode, formatDocumentRangesWithSelectedProvider, formatDocumentWithSelectedProvider } from 'vs/editor/contrib/format/browser/format';
-import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2';
-import { localize } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IProgress, IProgressStep, Progress } from 'vs/platform/progress/common/progress';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchContributionsExtensions } from 'vs/workbench/common/contributions';
-import { SaveReason } from 'vs/workbench/common/editor';
-import { getModifiedRanges } from 'vs/workbench/contrib/format/browser/formatModified';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { ITextFileEditorModel, ITextFileSaveParticipant, ITextFileSaveParticipantContext, ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { StopWatch } from '../../../../base/common/stopwatch.js';
+import * as strings from '../../../../base/common/strings.js';
+import { IActiveCodeEditor, isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { trimTrailingWhitespace } from '../../../../editor/common/commands/trimTrailingWhitespaceCommand.js';
+import { EditOperation } from '../../../../editor/common/core/editOperation.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { Selection } from '../../../../editor/common/core/selection.js';
+import { CodeActionProvider, CodeActionTriggerType } from '../../../../editor/common/languages.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
+import { ApplyCodeActionReason, applyCodeAction, getCodeActions } from '../../../../editor/contrib/codeAction/browser/codeAction.js';
+import { CodeActionKind, CodeActionTriggerSource } from '../../../../editor/contrib/codeAction/common/types.js';
+import { FormattingMode, formatDocumentRangesWithSelectedProvider, formatDocumentWithSelectedProvider } from '../../../../editor/contrib/format/browser/format.js';
+import { SnippetController2 } from '../../../../editor/contrib/snippet/browser/snippetController2.js';
+import { localize } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IProgress, IProgressStep, Progress } from '../../../../platform/progress/common/progress.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchContributionsExtensions } from '../../../common/contributions.js';
+import { SaveReason } from '../../../common/editor.js';
+import { getModifiedRanges } from '../../format/browser/formatModified.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { ITextFileEditorModel, ITextFileSaveParticipant, ITextFileSaveParticipantContext, ITextFileService } from '../../../services/textfile/common/textfiles.js';
 
 export class TrimWhitespaceParticipant implements ITextFileSaveParticipant {
 
@@ -267,13 +271,54 @@ class FormatOnSaveParticipant implements ITextFileSaveParticipant {
 	}
 }
 
-class CodeActionOnSaveParticipant implements ITextFileSaveParticipant {
+class CodeActionOnSaveParticipant extends Disposable implements ITextFileSaveParticipant {
 
 	constructor(
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@ILanguageFeaturesService private readonly languageFeaturesService: ILanguageFeaturesService,
-	) { }
+		@IHostService private readonly hostService: IHostService,
+		@IEditorService private readonly editorService: IEditorService,
+		@ICodeEditorService private readonly codeEditorService: ICodeEditorService,
+		@ITelemetryService private readonly telemetryService: ITelemetryService
+	) {
+		super();
+
+		this._register(this.hostService.onDidChangeFocus(() => { this.triggerCodeActionsCommand(); }));
+		this._register(this.editorService.onDidActiveEditorChange(() => { this.triggerCodeActionsCommand(); }));
+	}
+
+	private async triggerCodeActionsCommand() {
+		if (this.configurationService.getValue<boolean>('editor.codeActions.triggerOnFocusChange') && this.configurationService.getValue<string>('files.autoSave') === 'afterDelay') {
+			const model = this.codeEditorService.getActiveCodeEditor()?.getModel();
+			if (!model) {
+				return undefined;
+			}
+
+			const settingsOverrides = { overrideIdentifier: model.getLanguageId(), resource: model.uri };
+			const setting = this.configurationService.getValue<{ [kind: string]: string | boolean } | string[]>('editor.codeActionsOnSave', settingsOverrides);
+
+			if (!setting) {
+				return undefined;
+			}
+
+			if (Array.isArray(setting)) {
+				return undefined;
+			}
+
+			const settingItems: string[] = Object.keys(setting).filter(x => setting[x] && setting[x] === 'always' && CodeActionKind.Source.contains(new HierarchicalKind(x)));
+
+			const cancellationTokenSource = new CancellationTokenSource();
+
+			const codeActionKindList = [];
+			for (const item of settingItems) {
+				codeActionKindList.push(new HierarchicalKind(item));
+			}
+
+			// run code actions based on what is found from setting === 'always', no exclusions.
+			await this.applyOnSaveActions(model, codeActionKindList, [], Progress.None, cancellationTokenSource.token);
+		}
+	}
 
 	async participate(model: ITextFileEditorModel, context: ITextFileSaveParticipantContext, progress: IProgress<IProgressStep>, token: CancellationToken): Promise<void> {
 		if (!model.textEditorModel) {
@@ -366,7 +411,27 @@ class CodeActionOnSaveParticipant implements ITextFileSaveParticipant {
 		};
 
 		for (const codeActionKind of codeActionsOnSave) {
+			const sw = new StopWatch();
+
 			const actionsToRun = await this.getActionsToRun(model, codeActionKind, excludes, getActionProgress, token);
+
+			// Telemetry for duration of each code action on save.
+			type CodeActionOnSave = {
+				codeAction: string;
+				duration: number;
+			};
+			type CodeActionOnSaveClassification = {
+				owner: 'justschen';
+				comment: 'Information about the code action that was accepted on save.';
+				codeAction: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Kind of the code action setting that is run.' };
+				duration: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Duration it took for TS to return the action to run for each kind. ' };
+			};
+
+			this.telemetryService.publicLog2<CodeActionOnSave, CodeActionOnSaveClassification>('codeAction.appliedOnSave', {
+				codeAction: codeActionKind.value,
+				duration: sw.elapsed()
+			});
+
 			if (token.isCancellationRequested) {
 				actionsToRun.dispose();
 				return;
diff --git a/src/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions.ts b/src/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions.ts
index f7660482b85..6180a3ca030 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions.ts
@@ -3,16 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { ICodeEditorWidgetOptions } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { ContextMenuController } from 'vs/editor/contrib/contextmenu/browser/contextmenu';
-import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2';
-import { SuggestController } from 'vs/editor/contrib/suggest/browser/suggestController';
-import { MenuPreventer } from 'vs/workbench/contrib/codeEditor/browser/menuPreventer';
-import { SelectionClipboardContributionID } from 'vs/workbench/contrib/codeEditor/browser/selectionClipboard';
-import { TabCompletionController } from 'vs/workbench/contrib/snippets/browser/tabCompletion';
-import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IEditorOptions } from '../../../../editor/common/config/editorOptions.js';
+import { ICodeEditorWidgetOptions } from '../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { ContextMenuController } from '../../../../editor/contrib/contextmenu/browser/contextmenu.js';
+import { SnippetController2 } from '../../../../editor/contrib/snippet/browser/snippetController2.js';
+import { SuggestController } from '../../../../editor/contrib/suggest/browser/suggestController.js';
+import { MenuPreventer } from './menuPreventer.js';
+import { SelectionClipboardContributionID } from './selectionClipboard.js';
+import { TabCompletionController } from '../../snippets/browser/tabCompletion.js';
+import { EditorExtensionsRegistry } from '../../../../editor/browser/editorExtensions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { selectionBackground, inputBackground, inputForeground, editorSelectionBackground } from '../../../../platform/theme/common/colorRegistry.js';
 
 export function getSimpleEditorOptions(configurationService: IConfigurationService): IEditorOptions {
 	return {
@@ -43,7 +46,8 @@ export function getSimpleEditorOptions(configurationService: IConfigurationServi
 			indentation: false
 		},
 		accessibilitySupport: configurationService.getValue<'auto' | 'off' | 'on'>('editor.accessibilitySupport'),
-		cursorBlinking: configurationService.getValue<'blink' | 'smooth' | 'phase' | 'expand' | 'solid'>('editor.cursorBlinking')
+		cursorBlinking: configurationService.getValue<'blink' | 'smooth' | 'phase' | 'expand' | 'solid'>('editor.cursorBlinking'),
+		experimentalEditContextEnabled: configurationService.getValue<boolean>('editor.experimentalEditContextEnabled'),
 	};
 }
 
@@ -60,3 +64,35 @@ export function getSimpleCodeEditorWidgetOptions(): ICodeEditorWidgetOptions {
 		])
 	};
 }
+
+/**
+ * Should be called to set the styling on editors that are appearing as just input boxes
+ * @param editorContainerSelector An element selector that will match the container of the editor
+ */
+export function setupSimpleEditorSelectionStyling(editorContainerSelector: string): IDisposable {
+	// Override styles in selections.ts
+	return registerThemingParticipant((theme, collector) => {
+		const selectionBackgroundColor = theme.getColor(selectionBackground);
+
+		if (selectionBackgroundColor) {
+			// Override inactive selection bg
+			const inputBackgroundColor = theme.getColor(inputBackground);
+			if (inputBackgroundColor) {
+				collector.addRule(`${editorContainerSelector} .monaco-editor-background { background-color: ${inputBackgroundColor}; } `);
+				collector.addRule(`${editorContainerSelector} .monaco-editor .selected-text { background-color: ${inputBackgroundColor.transparent(0.4)}; }`);
+			}
+
+			// Override selected fg
+			const inputForegroundColor = theme.getColor(inputForeground);
+			if (inputForegroundColor) {
+				collector.addRule(`${editorContainerSelector} .monaco-editor .view-line span.inline-selected-text { color: ${inputForegroundColor}; }`);
+			}
+
+			collector.addRule(`${editorContainerSelector} .monaco-editor .focused .selected-text { background-color: ${selectionBackgroundColor}; }`);
+		} else {
+			// Use editor selection color if theme has not set a selection background color
+			collector.addRule(`${editorContainerSelector} .monaco-editor .focused .selected-text { background-color: ${theme.getColor(editorSelectionBackground)}; }`);
+		}
+	});
+
+}
diff --git a/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.ts b/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.ts
index e06219499e2..7f84c87d2ab 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.ts
@@ -3,42 +3,41 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./suggestEnabledInput';
-import { $, Dimension, append } from 'vs/base/browser/dom';
-import { Widget } from 'vs/base/browser/ui/widget';
-import { Emitter, Event } from 'vs/base/common/event';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { mixin } from 'vs/base/common/objects';
-import { isMacintosh } from 'vs/base/common/platform';
-import { URI as uri } from 'vs/base/common/uri';
-import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { EditOperation } from 'vs/editor/common/core/editOperation';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { ITextModel } from 'vs/editor/common/model';
-import * as languages from 'vs/editor/common/languages';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ContextMenuController } from 'vs/editor/contrib/contextmenu/browser/contextmenu';
-import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2';
-import { SuggestController } from 'vs/editor/contrib/suggest/browser/suggestController';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ColorIdentifier, asCssVariable, asCssVariableWithDefault, editorSelectionBackground, inputBackground, inputBorder, inputForeground, inputPlaceholderForeground, selectionBackground } from 'vs/platform/theme/common/colorRegistry';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { MenuPreventer } from 'vs/workbench/contrib/codeEditor/browser/menuPreventer';
-import { getSimpleEditorOptions } from 'vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
-import { SelectionClipboardContributionID } from 'vs/workbench/contrib/codeEditor/browser/selectionClipboard';
-import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
-import { DEFAULT_FONT_FAMILY } from 'vs/base/browser/fonts';
-import { HistoryNavigator } from 'vs/base/common/history';
-import { registerAndCreateHistoryNavigationContext, IHistoryNavigationContext } from 'vs/platform/history/browser/contextScopedHistoryWidget';
-import { IHistoryNavigationWidget } from 'vs/base/browser/history';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { IEditorConstructionOptions } from 'vs/editor/browser/config/editorConfiguration';
-import { ensureValidWordDefinition, getWordAtText } from 'vs/editor/common/core/wordHelper';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { $, Dimension, append } from '../../../../../base/browser/dom.js';
+import { DEFAULT_FONT_FAMILY } from '../../../../../base/browser/fonts.js';
+import { IHistoryNavigationWidget } from '../../../../../base/browser/history.js';
+import { Widget } from '../../../../../base/browser/ui/widget.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { HistoryNavigator } from '../../../../../base/common/history.js';
+import { KeyCode } from '../../../../../base/common/keyCodes.js';
+import { mixin } from '../../../../../base/common/objects.js';
+import { isMacintosh } from '../../../../../base/common/platform.js';
+import { URI as uri } from '../../../../../base/common/uri.js';
+import './suggestEnabledInput.css';
+import { IEditorConstructionOptions } from '../../../../../editor/browser/config/editorConfiguration.js';
+import { EditorExtensionsRegistry } from '../../../../../editor/browser/editorExtensions.js';
+import { CodeEditorWidget } from '../../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { IEditorOptions } from '../../../../../editor/common/config/editorOptions.js';
+import { EditOperation } from '../../../../../editor/common/core/editOperation.js';
+import { Position } from '../../../../../editor/common/core/position.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { ensureValidWordDefinition, getWordAtText } from '../../../../../editor/common/core/wordHelper.js';
+import * as languages from '../../../../../editor/common/languages.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
+import { ILanguageFeaturesService } from '../../../../../editor/common/services/languageFeatures.js';
+import { IModelService } from '../../../../../editor/common/services/model.js';
+import { ContextMenuController } from '../../../../../editor/contrib/contextmenu/browser/contextmenu.js';
+import { SnippetController2 } from '../../../../../editor/contrib/snippet/browser/snippetController2.js';
+import { SuggestController } from '../../../../../editor/contrib/suggest/browser/suggestController.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IContextKey, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IHistoryNavigationContext, registerAndCreateHistoryNavigationContext } from '../../../../../platform/history/browser/contextScopedHistoryWidget.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
+import { ColorIdentifier, asCssVariable, asCssVariableWithDefault, inputBackground, inputBorder, inputForeground, inputPlaceholderForeground } from '../../../../../platform/theme/common/colorRegistry.js';
+import { MenuPreventer } from '../menuPreventer.js';
+import { SelectionClipboardContributionID } from '../selectionClipboard.js';
+import { getSimpleEditorOptions, setupSimpleEditorSelectionStyling } from '../simpleEditorOptions.js';
 
 export interface SuggestResultsProvider {
 	/**
@@ -462,34 +461,7 @@ export class ContextScopedSuggestEnabledInputWithHistory extends SuggestEnabledI
 	}
 }
 
-// Override styles in selections.ts
-registerThemingParticipant((theme, collector) => {
-	const selectionBackgroundColor = theme.getColor(selectionBackground);
-
-	if (selectionBackgroundColor) {
-		// Override inactive selection bg
-		const inputBackgroundColor = theme.getColor(inputBackground);
-		if (inputBackgroundColor) {
-			collector.addRule(`.suggest-input-container .monaco-editor .selected-text { background-color: ${inputBackgroundColor.transparent(0.4)}; }`);
-		}
-
-		// Override selected fg
-		const inputForegroundColor = theme.getColor(inputForeground);
-		if (inputForegroundColor) {
-			collector.addRule(`.suggest-input-container .monaco-editor .view-line span.inline-selected-text { color: ${inputForegroundColor}; }`);
-		}
-
-		const backgroundColor = theme.getColor(inputBackground);
-		if (backgroundColor) {
-			collector.addRule(`.suggest-input-container .monaco-editor-background { background-color: ${backgroundColor}; } `);
-		}
-		collector.addRule(`.suggest-input-container .monaco-editor .focused .selected-text { background-color: ${selectionBackgroundColor}; }`);
-	} else {
-		// Use editor selection color if theme has not set a selection background color
-		collector.addRule(`.suggest-input-container .monaco-editor .focused .selected-text { background-color: ${theme.getColor(editorSelectionBackground)}; }`);
-	}
-});
-
+setupSimpleEditorSelectionStyling('.suggest-input-container');
 
 function getSuggestEnabledInputOptions(ariaLabel?: string): IEditorOptions {
 	return {
diff --git a/src/vs/workbench/contrib/codeEditor/browser/toggleColumnSelection.ts b/src/vs/workbench/contrib/codeEditor/browser/toggleColumnSelection.ts
index 8ffe14d4514..913b5548e82 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/toggleColumnSelection.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/toggleColumnSelection.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize, localize2 } from 'vs/nls';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { CoreNavigationCommands } from 'vs/editor/browser/coreCommands';
-import { Position } from 'vs/editor/common/core/position';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { localize, localize2 } from '../../../../nls.js';
+import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { CoreNavigationCommands } from '../../../../editor/browser/coreCommands.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { Selection } from '../../../../editor/common/core/selection.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 
 export class ToggleColumnSelectionAction extends Action2 {
 
diff --git a/src/vs/workbench/contrib/codeEditor/browser/toggleMinimap.ts b/src/vs/workbench/contrib/codeEditor/browser/toggleMinimap.ts
index 825944692db..0248d005a31 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/toggleMinimap.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/toggleMinimap.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize, localize2 } from 'vs/nls';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { localize, localize2 } from '../../../../nls.js';
+import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 
 export class ToggleMinimapAction extends Action2 {
 
diff --git a/src/vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier.ts b/src/vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier.ts
index 5b5081623cf..3f5f577e1a9 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { isMacintosh } from 'vs/base/common/platform';
-import { localize, localize2 } from 'vs/nls';
-import { Action2, MenuId, MenuRegistry, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { isMacintosh } from '../../../../base/common/platform.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { Action2, MenuId, MenuRegistry, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from '../../../common/contributions.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
 
 export class ToggleMultiCursorModifierAction extends Action2 {
 
diff --git a/src/vs/workbench/contrib/codeEditor/browser/toggleRenderControlCharacter.ts b/src/vs/workbench/contrib/codeEditor/browser/toggleRenderControlCharacter.ts
index 0a0795be214..6209189b5d9 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/toggleRenderControlCharacter.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/toggleRenderControlCharacter.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize, localize2 } from 'vs/nls';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { localize, localize2 } from '../../../../nls.js';
+import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 
 export class ToggleRenderControlCharacterAction extends Action2 {
 
diff --git a/src/vs/workbench/contrib/codeEditor/browser/toggleRenderWhitespace.ts b/src/vs/workbench/contrib/codeEditor/browser/toggleRenderWhitespace.ts
index 3a3c87b953d..9f61e2363ba 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/toggleRenderWhitespace.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/toggleRenderWhitespace.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize, localize2 } from 'vs/nls';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { localize, localize2 } from '../../../../nls.js';
+import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 
 class ToggleRenderWhitespaceAction extends Action2 {
 
diff --git a/src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.ts b/src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.ts
index 043e3f5c9e7..dc7f412c22a 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { addDisposableListener, onDidRegisterWindow } from 'vs/base/browser/dom';
-import { mainWindow } from 'vs/base/browser/window';
-import { Codicon } from 'vs/base/common/codicons';
-import { Event } from 'vs/base/common/event';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { IActiveCodeEditor, ICodeEditor, IDiffEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, EditorContributionInstantiation, ServicesAccessor, registerDiffEditorContribution, registerEditorAction, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { IDiffEditorContribution, IEditorContribution } from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { ITextModel } from 'vs/editor/common/model';
-import * as nls from 'vs/nls';
-import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
-import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { addDisposableListener, onDidRegisterWindow } from '../../../../base/browser/dom.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Event } from '../../../../base/common/event.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { IActiveCodeEditor, ICodeEditor, IDiffEditor } from '../../../../editor/browser/editorBrowser.js';
+import { EditorAction, EditorContributionInstantiation, ServicesAccessor, registerDiffEditorContribution, registerEditorAction, registerEditorContribution } from '../../../../editor/browser/editorExtensions.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
+import { IDiffEditorContribution, IEditorContribution } from '../../../../editor/common/editorCommon.js';
+import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import * as nls from '../../../../nls.js';
+import { MenuId, MenuRegistry } from '../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
 
 const transientWordWrapState = 'transientWordWrapState';
 const isWordWrapMinifiedKey = 'isWordWrapMinified';
diff --git a/src/vs/workbench/contrib/codeEditor/browser/workbenchEditorWorkerService.ts b/src/vs/workbench/contrib/codeEditor/browser/workbenchEditorWorkerService.ts
new file mode 100644
index 00000000000..3579b82c48d
--- /dev/null
+++ b/src/vs/workbench/contrib/codeEditor/browser/workbenchEditorWorkerService.ts
@@ -0,0 +1,25 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { WorkerDescriptor } from '../../../../base/browser/defaultWorkerFactory.js';
+import { EditorWorkerService } from '../../../../editor/browser/services/editorWorkerService.js';
+import { ILanguageConfigurationService } from '../../../../editor/common/languages/languageConfigurationRegistry.js';
+import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+
+export class WorkbenchEditorWorkerService extends EditorWorkerService {
+	constructor(
+		@IModelService modelService: IModelService,
+		@ITextResourceConfigurationService configurationService: ITextResourceConfigurationService,
+		@ILogService logService: ILogService,
+		@ILanguageConfigurationService languageConfigurationService: ILanguageConfigurationService,
+		@ILanguageFeaturesService languageFeaturesService: ILanguageFeaturesService,
+	) {
+		const workerDescriptor = new WorkerDescriptor('vs/editor/common/services/editorSimpleWorker', 'TextEditorWorker');
+		super(workerDescriptor, modelService, configurationService, logService, languageConfigurationService, languageFeaturesService);
+	}
+}
diff --git a/src/vs/workbench/contrib/codeEditor/browser/workbenchReferenceSearch.ts b/src/vs/workbench/contrib/codeEditor/browser/workbenchReferenceSearch.ts
index 101e10012ea..877c0032fae 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/workbenchReferenceSearch.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/workbenchReferenceSearch.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { ReferencesController } from 'vs/editor/contrib/gotoSymbol/browser/peek/referencesController';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IStorageService } from 'vs/platform/storage/common/storage';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { EditorContributionInstantiation, registerEditorContribution } from '../../../../editor/browser/editorExtensions.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { ReferencesController } from '../../../../editor/contrib/gotoSymbol/browser/peek/referencesController.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
 
 export class WorkbenchReferencesController extends ReferencesController {
 
diff --git a/src/vs/workbench/contrib/codeEditor/common/languageConfigurationExtensionPoint.ts b/src/vs/workbench/contrib/codeEditor/common/languageConfigurationExtensionPoint.ts
index e3d1fcd1064..80aa77d2019 100644
--- a/src/vs/workbench/contrib/codeEditor/common/languageConfigurationExtensionPoint.ts
+++ b/src/vs/workbench/contrib/codeEditor/common/languageConfigurationExtensionPoint.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { ParseError, parse, getNodeType } from 'vs/base/common/json';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import * as types from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { CharacterPair, CommentRule, EnterAction, ExplicitLanguageConfiguration, FoldingMarkers, FoldingRules, IAutoClosingPair, IAutoClosingPairConditional, IndentAction, IndentationRule, OnEnterRule } from 'vs/editor/common/languages/languageConfiguration';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { Extensions, IJSONContributionRegistry } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { getParseErrorMessage } from 'vs/base/common/jsonErrorMessages';
-import { IExtensionResourceLoaderService } from 'vs/platform/extensionResourceLoader/common/extensionResourceLoader';
-import { hash } from 'vs/base/common/hash';
-import { Disposable } from 'vs/base/common/lifecycle';
+import * as nls from '../../../../nls.js';
+import { ParseError, parse, getNodeType } from '../../../../base/common/json.js';
+import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
+import * as types from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { CharacterPair, CommentRule, EnterAction, ExplicitLanguageConfiguration, FoldingMarkers, FoldingRules, IAutoClosingPair, IAutoClosingPairConditional, IndentAction, IndentationRule, OnEnterRule } from '../../../../editor/common/languages/languageConfiguration.js';
+import { ILanguageConfigurationService } from '../../../../editor/common/languages/languageConfigurationRegistry.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { Extensions, IJSONContributionRegistry } from '../../../../platform/jsonschemas/common/jsonContributionRegistry.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { getParseErrorMessage } from '../../../../base/common/jsonErrorMessages.js';
+import { IExtensionResourceLoaderService } from '../../../../platform/extensionResourceLoader/common/extensionResourceLoader.js';
+import { hash } from '../../../../base/common/hash.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
 
 interface IRegExp {
 	pattern: string;
diff --git a/src/vs/workbench/contrib/codeEditor/electron-sandbox/codeEditor.contribution.ts b/src/vs/workbench/contrib/codeEditor/electron-sandbox/codeEditor.contribution.ts
index cc901137edf..c4e817d6e59 100644
--- a/src/vs/workbench/contrib/codeEditor/electron-sandbox/codeEditor.contribution.ts
+++ b/src/vs/workbench/contrib/codeEditor/electron-sandbox/codeEditor.contribution.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import './displayChangeRemeasureFonts';
-import './inputClipboardActions';
-import './selectionClipboard';
-import './sleepResumeRepaintMinimap';
-import './startDebugTextMate';
+import './displayChangeRemeasureFonts.js';
+import './inputClipboardActions.js';
+import './selectionClipboard.js';
+import './sleepResumeRepaintMinimap.js';
+import './startDebugTextMate.js';
diff --git a/src/vs/workbench/contrib/codeEditor/electron-sandbox/displayChangeRemeasureFonts.ts b/src/vs/workbench/contrib/codeEditor/electron-sandbox/displayChangeRemeasureFonts.ts
index 5600e739d3d..d76daa8532d 100644
--- a/src/vs/workbench/contrib/codeEditor/electron-sandbox/displayChangeRemeasureFonts.ts
+++ b/src/vs/workbench/contrib/codeEditor/electron-sandbox/displayChangeRemeasureFonts.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { FontMeasurements } from 'vs/editor/browser/config/fontMeasurements';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Extensions as WorkbenchExtensions, IWorkbenchContribution, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { FontMeasurements } from '../../../../editor/browser/config/fontMeasurements.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Extensions as WorkbenchExtensions, IWorkbenchContribution, IWorkbenchContributionsRegistry } from '../../../common/contributions.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
 
 class DisplayChangeRemeasureFonts extends Disposable implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/contrib/codeEditor/electron-sandbox/inputClipboardActions.ts b/src/vs/workbench/contrib/codeEditor/electron-sandbox/inputClipboardActions.ts
index e1469be3129..710eba266b1 100644
--- a/src/vs/workbench/contrib/codeEditor/electron-sandbox/inputClipboardActions.ts
+++ b/src/vs/workbench/contrib/codeEditor/electron-sandbox/inputClipboardActions.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import * as platform from 'vs/base/common/platform';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { getActiveWindow } from 'vs/base/browser/dom';
+import { KeybindingsRegistry } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import * as platform from '../../../../base/common/platform.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { getActiveWindow } from '../../../../base/browser/dom.js';
 
 if (platform.isMacintosh) {
 
diff --git a/src/vs/workbench/contrib/codeEditor/electron-sandbox/selectionClipboard.ts b/src/vs/workbench/contrib/codeEditor/electron-sandbox/selectionClipboard.ts
index 46b835cd96d..0c4db4a8b99 100644
--- a/src/vs/workbench/contrib/codeEditor/electron-sandbox/selectionClipboard.ts
+++ b/src/vs/workbench/contrib/codeEditor/electron-sandbox/selectionClipboard.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { Disposable } from 'vs/base/common/lifecycle';
-import * as platform from 'vs/base/common/platform';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { registerEditorContribution, EditorAction, ServicesAccessor, registerEditorAction, EditorContributionInstantiation } from 'vs/editor/browser/editorExtensions';
-import { ConfigurationChangedEvent, EditorOption } from 'vs/editor/common/config/editorOptions';
-import { ICursorSelectionChangedEvent } from 'vs/editor/common/cursorEvents';
-import { Range } from 'vs/editor/common/core/range';
-import { IEditorContribution, Handler } from 'vs/editor/common/editorCommon';
-import { EndOfLinePreference } from 'vs/editor/common/model';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { SelectionClipboardContributionID } from 'vs/workbench/contrib/codeEditor/browser/selectionClipboard';
-import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { mainWindow } from 'vs/base/browser/window';
-import { Event } from 'vs/base/common/event';
-import { addDisposableListener, onDidRegisterWindow } from 'vs/base/browser/dom';
+import * as nls from '../../../../nls.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import * as platform from '../../../../base/common/platform.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { registerEditorContribution, EditorAction, ServicesAccessor, registerEditorAction, EditorContributionInstantiation } from '../../../../editor/browser/editorExtensions.js';
+import { ConfigurationChangedEvent, EditorOption } from '../../../../editor/common/config/editorOptions.js';
+import { ICursorSelectionChangedEvent } from '../../../../editor/common/cursorEvents.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { IEditorContribution, Handler } from '../../../../editor/common/editorCommon.js';
+import { EndOfLinePreference } from '../../../../editor/common/model.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { SelectionClipboardContributionID } from '../browser/selectionClipboard.js';
+import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { Event } from '../../../../base/common/event.js';
+import { addDisposableListener, onDidRegisterWindow } from '../../../../base/browser/dom.js';
 
 export class SelectionClipboard extends Disposable implements IEditorContribution {
 	private static readonly SELECTION_LENGTH_LIMIT = 65536;
diff --git a/src/vs/workbench/contrib/codeEditor/electron-sandbox/sleepResumeRepaintMinimap.ts b/src/vs/workbench/contrib/codeEditor/electron-sandbox/sleepResumeRepaintMinimap.ts
index fdf9a4422b3..0115f14dd83 100644
--- a/src/vs/workbench/contrib/codeEditor/electron-sandbox/sleepResumeRepaintMinimap.ts
+++ b/src/vs/workbench/contrib/codeEditor/electron-sandbox/sleepResumeRepaintMinimap.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Extensions as WorkbenchExtensions, IWorkbenchContribution, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { Disposable } from 'vs/base/common/lifecycle';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Extensions as WorkbenchExtensions, IWorkbenchContribution, IWorkbenchContributionsRegistry } from '../../../common/contributions.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
 
 class SleepResumeRepaintMinimap extends Disposable implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/contrib/codeEditor/electron-sandbox/startDebugTextMate.ts b/src/vs/workbench/contrib/codeEditor/electron-sandbox/startDebugTextMate.ts
index 65773d24025..645eabd6384 100644
--- a/src/vs/workbench/contrib/codeEditor/electron-sandbox/startDebugTextMate.ts
+++ b/src/vs/workbench/contrib/codeEditor/electron-sandbox/startDebugTextMate.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { Range } from 'vs/editor/common/core/range';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { ITextMateTokenizationService } from 'vs/workbench/services/textMate/browser/textMateTokenizationFeature';
-import { IModelService } from 'vs/editor/common/services/model';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { ITextModel } from 'vs/editor/common/model';
-import { Constants } from 'vs/base/common/uint';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
-import { ILoggerService } from 'vs/platform/log/common/log';
-import { joinPath } from 'vs/base/common/resources';
-import { IFileService } from 'vs/platform/files/common/files';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import * as nls from '../../../../nls.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { ITextMateTokenizationService } from '../../../services/textMate/browser/textMateTokenizationFeature.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { URI } from '../../../../base/common/uri.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { Constants } from '../../../../base/common/uint.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-sandbox/environmentService.js';
+import { ILoggerService } from '../../../../platform/log/common/log.js';
+import { joinPath } from '../../../../base/common/resources.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 
 class StartDebugTextMate extends Action2 {
 
diff --git a/src/vs/workbench/contrib/codeEditor/test/browser/saveParticipant.test.ts b/src/vs/workbench/contrib/codeEditor/test/browser/saveParticipant.test.ts
index 42cc4253ad2..1186af19416 100644
--- a/src/vs/workbench/contrib/codeEditor/test/browser/saveParticipant.test.ts
+++ b/src/vs/workbench/contrib/codeEditor/test/browser/saveParticipant.test.ts
@@ -4,18 +4,18 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { FinalNewLineParticipant, TrimFinalNewLinesParticipant, TrimWhitespaceParticipant } from 'vs/workbench/contrib/codeEditor/browser/saveParticipants';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { workbenchInstantiationService, TestServiceAccessor } from 'vs/workbench/test/browser/workbenchTestServices';
-import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from 'vs/base/test/common/utils';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel';
-import { IResolvedTextFileEditorModel, snapshotToString } from 'vs/workbench/services/textfile/common/textfiles';
-import { SaveReason } from 'vs/workbench/common/editor';
-import { TextFileEditorModelManager } from 'vs/workbench/services/textfile/common/textFileEditorModelManager';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { FinalNewLineParticipant, TrimFinalNewLinesParticipant, TrimWhitespaceParticipant } from '../../browser/saveParticipants.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { workbenchInstantiationService, TestServiceAccessor } from '../../../../test/browser/workbenchTestServices.js';
+import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from '../../../../../base/test/common/utils.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { Selection } from '../../../../../editor/common/core/selection.js';
+import { TextFileEditorModel } from '../../../../services/textfile/common/textFileEditorModel.js';
+import { IResolvedTextFileEditorModel, snapshotToString } from '../../../../services/textfile/common/textfiles.js';
+import { SaveReason } from '../../../../common/editor.js';
+import { TextFileEditorModelManager } from '../../../../services/textfile/common/textFileEditorModelManager.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
 
 suite('Save Participants', function () {
 
diff --git a/src/vs/workbench/contrib/codeEditor/test/node/autoindent.test.ts b/src/vs/workbench/contrib/codeEditor/test/node/autoindent.test.ts
index fe3632fb8d0..59ec549cbf0 100644
--- a/src/vs/workbench/contrib/codeEditor/test/node/autoindent.test.ts
+++ b/src/vs/workbench/contrib/codeEditor/test/node/autoindent.test.ts
@@ -6,23 +6,24 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import assert from 'assert';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { getReindentEditOperations } from 'vs/editor/contrib/indentation/common/indentation';
-import { IRelaxedTextModelCreationOptions, createModelServices, instantiateTextModel } from 'vs/editor/test/common/testTextModel';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { ILanguageConfiguration, LanguageConfigurationFileHandler } from 'vs/workbench/contrib/codeEditor/common/languageConfigurationExtensionPoint';
-import { parse } from 'vs/base/common/json';
-import { IRange } from 'vs/editor/common/core/range';
-import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { trimTrailingWhitespace } from 'vs/editor/common/commands/trimTrailingWhitespaceCommand';
+import { DisposableStore, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { ILanguageConfigurationService } from '../../../../../editor/common/languages/languageConfigurationRegistry.js';
+import { getReindentEditOperations } from '../../../../../editor/contrib/indentation/common/indentation.js';
+import { IRelaxedTextModelCreationOptions, createModelServices, instantiateTextModel } from '../../../../../editor/test/common/testTextModel.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { ILanguageConfiguration, LanguageConfigurationFileHandler } from '../../common/languageConfigurationExtensionPoint.js';
+import { parse } from '../../../../../base/common/json.js';
+import { IRange } from '../../../../../editor/common/core/range.js';
+import { ISingleEditOperation } from '../../../../../editor/common/core/editOperation.js';
+import { trimTrailingWhitespace } from '../../../../../editor/common/commands/trimTrailingWhitespaceCommand.js';
 import { execSync } from 'child_process';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { EncodedTokenizationResult, IState, ITokenizationSupport, TokenizationRegistry } from 'vs/editor/common/languages';
-import { NullState } from 'vs/editor/common/languages/nullTokenize';
-import { MetadataConsts, StandardTokenType } from 'vs/editor/common/encodedTokenAttributes';
-import { ITextModel } from 'vs/editor/common/model';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
+import { EncodedTokenizationResult, IState, ITokenizationSupport, TokenizationRegistry } from '../../../../../editor/common/languages.js';
+import { NullState } from '../../../../../editor/common/languages/nullTokenize.js';
+import { MetadataConsts, StandardTokenType } from '../../../../../editor/common/encodedTokenAttributes.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
+import { FileAccess } from '../../../../../base/common/network.js';
 
 function getIRange(range: IRange): IRange {
 	return {
@@ -56,7 +57,7 @@ function registerLanguageConfiguration(instantiationService: TestInstantiationSe
 	let configPath: string;
 	switch (languageId) {
 		case LanguageId.TypeScript:
-			configPath = path.join('extensions', 'typescript-basics', 'language-configuration.json');
+			configPath = FileAccess.asFileUri('vs/workbench/contrib/codeEditor/test/node/language-configuration.json').fsPath;
 			break;
 		default:
 			throw new Error('Unknown languageId');
diff --git a/src/vs/workbench/contrib/codeEditor/test/node/language-configuration.json b/src/vs/workbench/contrib/codeEditor/test/node/language-configuration.json
new file mode 100644
index 00000000000..25a23685738
--- /dev/null
+++ b/src/vs/workbench/contrib/codeEditor/test/node/language-configuration.json
@@ -0,0 +1,250 @@
+{
+	// Note that this file should stay in sync with 'javascript-language-basics/javascript-language-configuration.json'
+	"comments": {
+		"lineComment": "//",
+		"blockComment": [
+			"/*",
+			"*/"
+		]
+	},
+	"brackets": [
+		[
+			"${",
+			"}"
+		],
+		[
+			"{",
+			"}"
+		],
+		[
+			"[",
+			"]"
+		],
+		[
+			"(",
+			")"
+		]
+	],
+	"autoClosingPairs": [
+		{
+			"open": "{",
+			"close": "}"
+		},
+		{
+			"open": "[",
+			"close": "]"
+		},
+		{
+			"open": "(",
+			"close": ")"
+		},
+		{
+			"open": "'",
+			"close": "'",
+			"notIn": [
+				"string",
+				"comment"
+			]
+		},
+		{
+			"open": "\"",
+			"close": "\"",
+			"notIn": [
+				"string"
+			]
+		},
+		{
+			"open": "`",
+			"close": "`",
+			"notIn": [
+				"string",
+				"comment"
+			]
+		},
+		{
+			"open": "/**",
+			"close": " */",
+			"notIn": [
+				"string"
+			]
+		}
+	],
+	"surroundingPairs": [
+		[
+			"{",
+			"}"
+		],
+		[
+			"[",
+			"]"
+		],
+		[
+			"(",
+			")"
+		],
+		[
+			"'",
+			"'"
+		],
+		[
+			"\"",
+			"\""
+		],
+		[
+			"`",
+			"`"
+		],
+		[
+			"<",
+			">"
+		]
+	],
+	"colorizedBracketPairs": [
+		[
+			"(",
+			")"
+		],
+		[
+			"[",
+			"]"
+		],
+		[
+			"{",
+			"}"
+		],
+		[
+			"<",
+			">"
+		]
+	],
+	"autoCloseBefore": ";:.,=}])>` \n\t",
+	"folding": {
+		"markers": {
+			"start": "^\\s*//\\s*#?region\\b",
+			"end": "^\\s*//\\s*#?endregion\\b"
+		}
+	},
+	"wordPattern": {
+		"pattern": "(-?\\d*\\.\\d\\w*)|([^\\`\\@\\~\\!\\%\\^\\&\\*\\(\\)\\-\\=\\+\\[\\{\\]\\}\\\\\\|\\;\\:\\'\\\"\\,\\.\\<\\>/\\?\\s]+)",
+	},
+	"indentationRules": {
+		"decreaseIndentPattern": {
+			"pattern": "^\\s*[\\}\\]\\)].*$"
+		},
+		"increaseIndentPattern": {
+			"pattern": "^.*(\\{[^}]*|\\([^)]*|\\[[^\\]]*)$"
+		},
+		// e.g.  * ...| or */| or *-----*/|
+		"unIndentedLinePattern": {
+			"pattern": "^(\\t|[ ])*[ ]\\*[^/]*\\*/\\s*$|^(\\t|[ ])*[ ]\\*/\\s*$|^(\\t|[ ])*\\*([ ]([^\\*]|\\*(?!/))*)?$"
+		},
+		"indentNextLinePattern": {
+			"pattern": "^((.*=>\\s*)|((.*[^\\w]+|\\s*)(if|while|for)\\s*\\(.*\\)\\s*))$"
+		}
+	},
+	"onEnterRules": [
+		{
+			// e.g. /** | */
+			"beforeText": {
+				"pattern": "^\\s*/\\*\\*(?!/)([^\\*]|\\*(?!/))*$"
+			},
+			"afterText": {
+				"pattern": "^\\s*\\*/$"
+			},
+			"action": {
+				"indent": "indentOutdent",
+				"appendText": " * "
+			}
+		},
+		{
+			// e.g. /** ...|
+			"beforeText": {
+				"pattern": "^\\s*/\\*\\*(?!/)([^\\*]|\\*(?!/))*$"
+			},
+			"action": {
+				"indent": "none",
+				"appendText": " * "
+			}
+		},
+		{
+			// e.g.  * ...|
+			"beforeText": {
+				"pattern": "^(\\t|[ ])*\\*([ ]([^\\*]|\\*(?!/))*)?$"
+			},
+			"previousLineText": {
+				"pattern": "(?=^(\\s*(/\\*\\*|\\*)).*)(?=(?!(\\s*\\*/)))"
+			},
+			"action": {
+				"indent": "none",
+				"appendText": "* "
+			}
+		},
+		{
+			// e.g.  */|
+			"beforeText": {
+				"pattern": "^(\\t|[ ])*[ ]\\*/\\s*$"
+			},
+			"action": {
+				"indent": "none",
+				"removeText": 1
+			},
+		},
+		{
+			// e.g.  *-----*/|
+			"beforeText": {
+				"pattern": "^(\\t|[ ])*[ ]\\*[^/]*\\*/\\s*$"
+			},
+			"action": {
+				"indent": "none",
+				"removeText": 1
+			},
+		},
+		{
+			"beforeText": {
+				"pattern": "^\\s*(\\bcase\\s.+:|\\bdefault:)$"
+			},
+			"afterText": {
+				"pattern": "^(?!\\s*(\\bcase\\b|\\bdefault\\b))"
+			},
+			"action": {
+				"indent": "indent"
+			}
+		},
+		{
+			// Decrease indentation after single line if/else if/else, for, or while
+			"previousLineText": "^\\s*(((else ?)?if|for|while)\\s*\\(.*\\)\\s*|else\\s*)$",
+			// But make sure line doesn't have braces or is not another if statement
+			"beforeText": "^\\s+([^{i\\s]|i(?!f\\b))",
+			"action": {
+				"indent": "outdent"
+			}
+		},
+		// Indent when pressing enter from inside ()
+		{
+			"beforeText": "^.*\\([^\\)]*$",
+			"afterText": "^\\s*\\).*$",
+			"action": {
+				"indent": "indentOutdent",
+				"appendText": "\t",
+			}
+		},
+		// Indent when pressing enter from inside {}
+		{
+			"beforeText": "^.*\\{[^\\}]*$",
+			"afterText": "^\\s*\\}.*$",
+			"action": {
+				"indent": "indentOutdent",
+				"appendText": "\t",
+			}
+		},
+		// Indent when pressing enter from inside []
+		{
+			"beforeText": "^.*\\[[^\\]]*$",
+			"afterText": "^\\s*\\].*$",
+			"action": {
+				"indent": "indentOutdent",
+				"appendText": "\t",
+			}
+		},
+	]
+}
diff --git a/src/vs/workbench/contrib/commands/common/commands.contribution.ts b/src/vs/workbench/contrib/commands/common/commands.contribution.ts
index 55cf296c7f2..3fd6b59a3b0 100644
--- a/src/vs/workbench/contrib/commands/common/commands.contribution.ts
+++ b/src/vs/workbench/contrib/commands/common/commands.contribution.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { safeStringify } from 'vs/base/common/objects';
-import * as nls from 'vs/nls';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { INotificationService } from 'vs/platform/notification/common/notification';
+import { safeStringify } from '../../../../base/common/objects.js';
+import * as nls from '../../../../nls.js';
+import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
 
 type RunnableCommand = string | { command: string; args: any[] };
 
diff --git a/src/vs/workbench/contrib/comments/browser/commentColors.ts b/src/vs/workbench/contrib/comments/browser/commentColors.ts
index 08d44a3224b..6151312d878 100644
--- a/src/vs/workbench/contrib/comments/browser/commentColors.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentColors.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Color } from 'vs/base/common/color';
-import * as languages from 'vs/editor/common/languages';
-import { peekViewTitleBackground } from 'vs/editor/contrib/peekView/browser/peekView';
-import * as nls from 'vs/nls';
-import { contrastBorder, disabledForeground, listFocusOutline, registerColor, transparent } from 'vs/platform/theme/common/colorRegistry';
-import { IColorTheme } from 'vs/platform/theme/common/themeService';
+import { Color } from '../../../../base/common/color.js';
+import * as languages from '../../../../editor/common/languages.js';
+import { peekViewTitleBackground } from '../../../../editor/contrib/peekView/browser/peekView.js';
+import * as nls from '../../../../nls.js';
+import { contrastBorder, disabledForeground, listFocusOutline, registerColor, transparent } from '../../../../platform/theme/common/colorRegistry.js';
+import { IColorTheme } from '../../../../platform/theme/common/themeService.js';
 
 const resolvedCommentViewIcon = registerColor('commentsView.resolvedIcon', { dark: disabledForeground, light: disabledForeground, hcDark: contrastBorder, hcLight: contrastBorder }, nls.localize('resolvedCommentIcon', 'Icon color for resolved comments.'));
 const unresolvedCommentViewIcon = registerColor('commentsView.unresolvedIcon', { dark: listFocusOutline, light: listFocusOutline, hcDark: contrastBorder, hcLight: contrastBorder }, nls.localize('unresolvedCommentIcon', 'Icon color for unresolved comments.'));
 
-registerColor('editorCommentsWidget.replyInputBackground', { dark: peekViewTitleBackground, light: peekViewTitleBackground, hcDark: peekViewTitleBackground, hcLight: peekViewTitleBackground }, nls.localize('commentReplyInputBackground', 'Background color for comment reply input box.'));
+registerColor('editorCommentsWidget.replyInputBackground', peekViewTitleBackground, nls.localize('commentReplyInputBackground', 'Background color for comment reply input box.'));
 const resolvedCommentBorder = registerColor('editorCommentsWidget.resolvedBorder', { dark: resolvedCommentViewIcon, light: resolvedCommentViewIcon, hcDark: contrastBorder, hcLight: contrastBorder }, nls.localize('resolvedCommentBorder', 'Color of borders and arrow for resolved comments.'));
 const unresolvedCommentBorder = registerColor('editorCommentsWidget.unresolvedBorder', { dark: unresolvedCommentViewIcon, light: unresolvedCommentViewIcon, hcDark: contrastBorder, hcLight: contrastBorder }, nls.localize('unresolvedCommentBorder', 'Color of borders and arrow for unresolved comments.'));
-export const commentThreadRangeBackground = registerColor('editorCommentsWidget.rangeBackground', { dark: transparent(unresolvedCommentBorder, .1), light: transparent(unresolvedCommentBorder, .1), hcDark: transparent(unresolvedCommentBorder, .1), hcLight: transparent(unresolvedCommentBorder, .1) }, nls.localize('commentThreadRangeBackground', 'Color of background for comment ranges.'));
-export const commentThreadRangeActiveBackground = registerColor('editorCommentsWidget.rangeActiveBackground', { dark: transparent(unresolvedCommentBorder, .1), light: transparent(unresolvedCommentBorder, .1), hcDark: transparent(unresolvedCommentBorder, .1), hcLight: transparent(unresolvedCommentBorder, .1) }, nls.localize('commentThreadActiveRangeBackground', 'Color of background for currently selected or hovered comment range.'));
+export const commentThreadRangeBackground = registerColor('editorCommentsWidget.rangeBackground', transparent(unresolvedCommentBorder, .1), nls.localize('commentThreadRangeBackground', 'Color of background for comment ranges.'));
+export const commentThreadRangeActiveBackground = registerColor('editorCommentsWidget.rangeActiveBackground', transparent(unresolvedCommentBorder, .1), nls.localize('commentThreadActiveRangeBackground', 'Color of background for currently selected or hovered comment range.'));
 
 const commentThreadStateBorderColors = new Map([
 	[languages.CommentThreadState.Unresolved, unresolvedCommentBorder],
diff --git a/src/vs/workbench/contrib/comments/browser/commentFormActions.ts b/src/vs/workbench/contrib/comments/browser/commentFormActions.ts
index 8afebd30d18..9b559a15e10 100644
--- a/src/vs/workbench/contrib/comments/browser/commentFormActions.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentFormActions.ts
@@ -3,14 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Button } from 'vs/base/browser/ui/button/button';
-import { IAction } from 'vs/base/common/actions';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { IMenu } from 'vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { defaultButtonStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { CommentCommandId } from 'vs/workbench/contrib/comments/common/commentCommandIds';
+import { Button, ButtonWithDropdown } from '../../../../base/browser/ui/button/button.js';
+import { ActionRunner, IAction } from '../../../../base/common/actions.js';
+import { DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import { IMenu, SubmenuItemAction } from '../../../../platform/actions/common/actions.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { defaultButtonStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { CommentCommandId } from '../common/commentCommandIds.js';
 
 export class CommentFormActions implements IDisposable {
 	private _buttonElements: HTMLElement[] = [];
@@ -20,9 +21,11 @@ export class CommentFormActions implements IDisposable {
 	constructor(
 		private readonly keybindingService: IKeybindingService,
 		private readonly contextKeyService: IContextKeyService,
+		private readonly contextMenuService: IContextMenuService,
 		private container: HTMLElement,
 		private actionHandler: (action: IAction) => void,
-		private readonly maxActions?: number
+		private readonly maxActions?: number,
+		private readonly supportDropdowns?: boolean,
 	) { }
 
 	setActions(menu: IMenu, hasOnlySecondaryActions: boolean = false) {
@@ -37,13 +40,28 @@ export class CommentFormActions implements IDisposable {
 			const [, actions] = group;
 
 			this._actions = actions;
-			for (const action of actions) {
+			for (const current of actions) {
+				const dropDownActions = this.supportDropdowns && current instanceof SubmenuItemAction ? current.actions : [];
+				const action = dropDownActions.length ? dropDownActions[0] : current;
 				let keybinding = this.keybindingService.lookupKeybinding(action.id, this.contextKeyService)?.getLabel();
 				if (!keybinding && isPrimary) {
 					keybinding = this.keybindingService.lookupKeybinding(CommentCommandId.Submit, this.contextKeyService)?.getLabel();
 				}
 				const title = keybinding ? `${action.label} (${keybinding})` : action.label;
-				const button = new Button(this.container, { secondary: !isPrimary, title, ...defaultButtonStyles });
+				const actionHandler = this.actionHandler;
+				const button = dropDownActions.length ? new ButtonWithDropdown(this.container, {
+					contextMenuProvider: this.contextMenuService,
+					actions: dropDownActions,
+					actionRunner: new class extends ActionRunner {
+						protected override async runAction(action: IAction, context?: unknown): Promise<void> {
+							return actionHandler(action);
+						}
+					},
+					secondary: !isPrimary,
+					title,
+					addPrimaryActionToDropdown: false,
+					...defaultButtonStyles
+				}) : new Button(this.container, { secondary: !isPrimary, title, ...defaultButtonStyles });
 
 				isPrimary = false;
 				this._buttonElements.push(button.element);
diff --git a/src/vs/workbench/contrib/comments/browser/commentGlyphWidget.ts b/src/vs/workbench/contrib/comments/browser/commentGlyphWidget.ts
index 92b52ac5402..e5cecf7c684 100644
--- a/src/vs/workbench/contrib/comments/browser/commentGlyphWidget.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentGlyphWidget.ts
@@ -3,24 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { Color } from 'vs/base/common/color';
-import { ContentWidgetPositionPreference, ICodeEditor, IContentWidgetPosition } from 'vs/editor/browser/editorBrowser';
-import { IModelDecorationOptions, OverviewRulerLane } from 'vs/editor/common/model';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { darken, editorBackground, editorForeground, listInactiveSelectionBackground, opaque, registerColor } from 'vs/platform/theme/common/colorRegistry';
-import { themeColorFromId } from 'vs/platform/theme/common/themeService';
-import { IEditorDecorationsCollection } from 'vs/editor/common/editorCommon';
-import { CommentThreadState } from 'vs/editor/common/languages';
+import * as nls from '../../../../nls.js';
+import { Color } from '../../../../base/common/color.js';
+import { ContentWidgetPositionPreference, ICodeEditor, IContentWidgetPosition } from '../../../../editor/browser/editorBrowser.js';
+import { IModelDecorationOptions, OverviewRulerLane } from '../../../../editor/common/model.js';
+import { ModelDecorationOptions } from '../../../../editor/common/model/textModel.js';
+import { darken, editorBackground, editorForeground, listInactiveSelectionBackground, opaque, registerColor } from '../../../../platform/theme/common/colorRegistry.js';
+import { themeColorFromId } from '../../../../platform/theme/common/themeService.js';
+import { IEditorDecorationsCollection } from '../../../../editor/common/editorCommon.js';
+import { CommentThreadState } from '../../../../editor/common/languages.js';
+import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { Emitter } from '../../../../base/common/event.js';
 
 export const overviewRulerCommentingRangeForeground = registerColor('editorGutter.commentRangeForeground', { dark: opaque(listInactiveSelectionBackground, editorBackground), light: darken(opaque(listInactiveSelectionBackground, editorBackground), .05), hcDark: Color.white, hcLight: Color.black }, nls.localize('editorGutterCommentRangeForeground', 'Editor gutter decoration color for commenting ranges. This color should be opaque.'));
-const overviewRulerCommentForeground = registerColor('editorOverviewRuler.commentForeground', { dark: overviewRulerCommentingRangeForeground, light: overviewRulerCommentingRangeForeground, hcDark: overviewRulerCommentingRangeForeground, hcLight: overviewRulerCommentingRangeForeground }, nls.localize('editorOverviewRuler.commentForeground', 'Editor overview ruler decoration color for resolved comments. This color should be opaque.'));
-const overviewRulerCommentUnresolvedForeground = registerColor('editorOverviewRuler.commentUnresolvedForeground', { dark: overviewRulerCommentForeground, light: overviewRulerCommentForeground, hcDark: overviewRulerCommentForeground, hcLight: overviewRulerCommentForeground }, nls.localize('editorOverviewRuler.commentUnresolvedForeground', 'Editor overview ruler decoration color for unresolved comments. This color should be opaque.'));
+const overviewRulerCommentForeground = registerColor('editorOverviewRuler.commentForeground', overviewRulerCommentingRangeForeground, nls.localize('editorOverviewRuler.commentForeground', 'Editor overview ruler decoration color for resolved comments. This color should be opaque.'));
+const overviewRulerCommentUnresolvedForeground = registerColor('editorOverviewRuler.commentUnresolvedForeground', overviewRulerCommentForeground, nls.localize('editorOverviewRuler.commentUnresolvedForeground', 'Editor overview ruler decoration color for unresolved comments. This color should be opaque.'));
 
 const editorGutterCommentGlyphForeground = registerColor('editorGutter.commentGlyphForeground', { dark: editorForeground, light: editorForeground, hcDark: Color.black, hcLight: Color.white }, nls.localize('editorGutterCommentGlyphForeground', 'Editor gutter decoration color for commenting glyphs.'));
-registerColor('editorGutter.commentUnresolvedGlyphForeground', { dark: editorGutterCommentGlyphForeground, light: editorGutterCommentGlyphForeground, hcDark: editorGutterCommentGlyphForeground, hcLight: editorGutterCommentGlyphForeground }, nls.localize('editorGutterCommentUnresolvedGlyphForeground', 'Editor gutter decoration color for commenting glyphs for unresolved comment threads.'));
+registerColor('editorGutter.commentUnresolvedGlyphForeground', editorGutterCommentGlyphForeground, nls.localize('editorGutterCommentUnresolvedGlyphForeground', 'Editor gutter decoration color for commenting glyphs for unresolved comment threads.'));
 
-export class CommentGlyphWidget {
+export class CommentGlyphWidget extends Disposable {
 	public static description = 'comment-glyph-widget';
 	private _lineNumber!: number;
 	private _editor: ICodeEditor;
@@ -28,10 +30,22 @@ export class CommentGlyphWidget {
 	private readonly _commentsDecorations: IEditorDecorationsCollection;
 	private _commentsOptions: ModelDecorationOptions;
 
+	private readonly _onDidChangeLineNumber = this._register(new Emitter<number>());
+	public readonly onDidChangeLineNumber = this._onDidChangeLineNumber.event;
+
 	constructor(editor: ICodeEditor, lineNumber: number) {
+		super();
 		this._commentsOptions = this.createDecorationOptions();
 		this._editor = editor;
 		this._commentsDecorations = this._editor.createDecorationsCollection();
+		this._register(this._commentsDecorations.onDidChange(e => {
+			const range = (this._commentsDecorations.length > 0 ? this._commentsDecorations.getRange(0) : null);
+			if (range && range.endLineNumber !== this._lineNumber) {
+				this._lineNumber = range.endLineNumber;
+				this._onDidChangeLineNumber.fire(this._lineNumber);
+			}
+		}));
+		this._register(toDisposable(() => this._commentsDecorations.clear()));
 		this.setLineNumber(lineNumber);
 	}
 
@@ -87,8 +101,4 @@ export class CommentGlyphWidget {
 			preference: [ContentWidgetPositionPreference.EXACT]
 		};
 	}
-
-	dispose() {
-		this._commentsDecorations.clear();
-	}
 }
diff --git a/src/vs/workbench/contrib/comments/browser/commentMenus.ts b/src/vs/workbench/contrib/comments/browser/commentMenus.ts
index c53852bb8cc..486f5c4e338 100644
--- a/src/vs/workbench/contrib/comments/browser/commentMenus.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentMenus.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IMenuService, MenuId, IMenu } from 'vs/platform/actions/common/actions';
-import { IAction } from 'vs/base/common/actions';
-import { Comment } from 'vs/editor/common/languages';
-import { createAndFillInContextMenuActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IMenuService, MenuId, IMenu } from '../../../../platform/actions/common/actions.js';
+import { IAction } from '../../../../base/common/actions.js';
+import { Comment } from '../../../../editor/common/languages.js';
+import { createAndFillInContextMenuActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 
 export class CommentMenus implements IDisposable {
 	constructor(
diff --git a/src/vs/workbench/contrib/comments/browser/commentNode.ts b/src/vs/workbench/contrib/comments/browser/commentNode.ts
index 47e5285466c..1f489cfa05b 100644
--- a/src/vs/workbench/contrib/comments/browser/commentNode.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentNode.ts
@@ -3,53 +3,53 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import * as dom from 'vs/base/browser/dom';
-import * as languages from 'vs/editor/common/languages';
-import { ActionsOrientation, ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { Action, IActionRunner, IAction, Separator, ActionRunner } from 'vs/base/common/actions';
-import { Disposable, IDisposable, IReference, dispose } from 'vs/base/common/lifecycle';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { MarkdownRenderer } from 'vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ICommentService } from 'vs/workbench/contrib/comments/browser/commentService';
-import { LayoutableEditor, MIN_EDITOR_HEIGHT, SimpleCommentEditor, calculateEditorHeight } from 'vs/workbench/contrib/comments/browser/simpleCommentEditor';
-import { Selection } from 'vs/editor/common/core/selection';
-import { Emitter, Event } from 'vs/base/common/event';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { AnchorAlignment } from 'vs/base/browser/ui/contextview/contextview';
-import { ToggleReactionsAction, ReactionAction, ReactionActionViewItem } from './reactionsAction';
-import { ICommentThreadWidget } from 'vs/workbench/contrib/comments/common/commentThreadWidget';
-import { MenuItemAction, SubmenuItemAction, IMenu, MenuId } from 'vs/platform/actions/common/actions';
-import { MenuEntryActionViewItem, SubmenuEntryActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { CommentFormActions } from 'vs/workbench/contrib/comments/browser/commentFormActions';
-import { MOUSE_CURSOR_TEXT_CSS_CLASS_NAME } from 'vs/base/browser/ui/mouseCursor/mouseCursor';
-import { ActionViewItem, IActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { DropdownMenuActionViewItem } from 'vs/base/browser/ui/dropdown/dropdownActionViewItem';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { MarshalledId } from 'vs/base/common/marshallingIds';
-import { TimestampWidget } from 'vs/workbench/contrib/comments/browser/timestamp';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { IRange } from 'vs/editor/common/core/range';
-import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
-import { CommentMenus } from 'vs/workbench/contrib/comments/browser/commentMenus';
-import { Scrollable, ScrollbarVisibility } from 'vs/base/common/scrollable';
-import { SmoothScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
-import { DomEmitter } from 'vs/base/browser/event';
-import { CommentContextKeys } from 'vs/workbench/contrib/comments/common/commentContextKeys';
-import { FileAccess, Schemas } from 'vs/base/common/network';
-import { COMMENTS_SECTION, ICommentsConfiguration } from 'vs/workbench/contrib/comments/common/commentsConfiguration';
-import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { MarshalledCommentThread } from 'vs/workbench/common/comments';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { IResolvedTextEditorModel, ITextModelService } from 'vs/editor/common/services/resolverService';
+import * as nls from '../../../../nls.js';
+import * as dom from '../../../../base/browser/dom.js';
+import * as languages from '../../../../editor/common/languages.js';
+import { ActionsOrientation, ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { Action, IActionRunner, IAction, Separator, ActionRunner } from '../../../../base/common/actions.js';
+import { Disposable, IDisposable, IReference, dispose } from '../../../../base/common/lifecycle.js';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
+import { MarkdownRenderer } from '../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ICommentService } from './commentService.js';
+import { LayoutableEditor, MIN_EDITOR_HEIGHT, SimpleCommentEditor, calculateEditorHeight } from './simpleCommentEditor.js';
+import { Selection } from '../../../../editor/common/core/selection.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { ToolBar } from '../../../../base/browser/ui/toolbar/toolbar.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { AnchorAlignment } from '../../../../base/browser/ui/contextview/contextview.js';
+import { ToggleReactionsAction, ReactionAction, ReactionActionViewItem } from './reactionsAction.js';
+import { ICommentThreadWidget } from '../common/commentThreadWidget.js';
+import { MenuItemAction, SubmenuItemAction, IMenu, MenuId } from '../../../../platform/actions/common/actions.js';
+import { MenuEntryActionViewItem, SubmenuEntryActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IContextKeyService, IContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { CommentFormActions } from './commentFormActions.js';
+import { MOUSE_CURSOR_TEXT_CSS_CLASS_NAME } from '../../../../base/browser/ui/mouseCursor/mouseCursor.js';
+import { ActionViewItem, IActionViewItemOptions } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { DropdownMenuActionViewItem } from '../../../../base/browser/ui/dropdown/dropdownActionViewItem.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { MarshalledId } from '../../../../base/common/marshallingIds.js';
+import { TimestampWidget } from './timestamp.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IMarkdownString } from '../../../../base/common/htmlContent.js';
+import { IRange } from '../../../../editor/common/core/range.js';
+import { ICellRange } from '../../notebook/common/notebookRange.js';
+import { CommentMenus } from './commentMenus.js';
+import { Scrollable, ScrollbarVisibility } from '../../../../base/common/scrollable.js';
+import { SmoothScrollableElement } from '../../../../base/browser/ui/scrollbar/scrollableElement.js';
+import { DomEmitter } from '../../../../base/browser/event.js';
+import { CommentContextKeys } from '../common/commentContextKeys.js';
+import { FileAccess, Schemas } from '../../../../base/common/network.js';
+import { COMMENTS_SECTION, ICommentsConfiguration } from '../common/commentsConfiguration.js';
+import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { MarshalledCommentThread } from '../../../common/comments.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IResolvedTextEditorModel, ITextModelService } from '../../../../editor/common/services/resolverService.js';
 
 class CommentsActionRunner extends ActionRunner {
 	protected override async runAction(action: IAction, context: any[]): Promise<void> {
@@ -122,7 +122,7 @@ export class CommentNode<T extends IRange | ICellRange> extends Disposable {
 		super();
 
 		this._domNode = dom.$('div.review-comment');
-		this._contextKeyService = contextKeyService.createScoped(this._domNode);
+		this._contextKeyService = this._register(contextKeyService.createScoped(this._domNode));
 		this._commentContextValue = CommentContextKeys.commentContext.bindTo(this._contextKeyService);
 		if (this.comment.contextValue) {
 			this._commentContextValue.set(this.comment.contextValue);
@@ -633,7 +633,7 @@ export class CommentNode<T extends IRange | ICellRange> extends Disposable {
 			this._commentFormActions?.setActions(menu);
 		}));
 
-		this._commentFormActions = new CommentFormActions(this.keybindingService, this._contextKeyService, container, (action: IAction): void => {
+		this._commentFormActions = new CommentFormActions(this.keybindingService, this._contextKeyService, this.contextMenuService, container, (action: IAction): void => {
 			const text = this._commentEditor!.getValue();
 
 			action.run({
@@ -659,7 +659,7 @@ export class CommentNode<T extends IRange | ICellRange> extends Disposable {
 			this._commentEditorActions?.setActions(menu);
 		}));
 
-		this._commentEditorActions = new CommentFormActions(this.keybindingService, this._contextKeyService, container, (action: IAction): void => {
+		this._commentEditorActions = new CommentFormActions(this.keybindingService, this._contextKeyService, this.contextMenuService, container, (action: IAction): void => {
 			const text = this._commentEditor!.getValue();
 
 			action.run({
diff --git a/src/vs/workbench/contrib/comments/browser/commentReply.ts b/src/vs/workbench/contrib/comments/browser/commentReply.ts
index bf0506f3b01..1b151755c75 100644
--- a/src/vs/workbench/contrib/comments/browser/commentReply.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentReply.ts
@@ -3,35 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { MOUSE_CURSOR_TEXT_CSS_CLASS_NAME } from 'vs/base/browser/ui/mouseCursor/mouseCursor';
-import { IAction } from 'vs/base/common/actions';
-import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { MarshalledId } from 'vs/base/common/marshallingIds';
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IRange } from 'vs/editor/common/core/range';
-import * as languages from 'vs/editor/common/languages';
-import { ITextModel } from 'vs/editor/common/model';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import * as nls from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { editorForeground, resolveColorValue } from 'vs/platform/theme/common/colorRegistry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { CommentFormActions } from 'vs/workbench/contrib/comments/browser/commentFormActions';
-import { CommentMenus } from 'vs/workbench/contrib/comments/browser/commentMenus';
-import { ICommentService } from 'vs/workbench/contrib/comments/browser/commentService';
-import { CommentContextKeys } from 'vs/workbench/contrib/comments/common/commentContextKeys';
-import { ICommentThreadWidget } from 'vs/workbench/contrib/comments/common/commentThreadWidget';
-import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
-import { LayoutableEditor, MIN_EDITOR_HEIGHT, SimpleCommentEditor, calculateEditorHeight } from './simpleCommentEditor';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import * as dom from '../../../../base/browser/dom.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { MOUSE_CURSOR_TEXT_CSS_CLASS_NAME } from '../../../../base/browser/ui/mouseCursor/mouseCursor.js';
+import { IAction } from '../../../../base/common/actions.js';
+import { Disposable, IDisposable, dispose } from '../../../../base/common/lifecycle.js';
+import { MarshalledId } from '../../../../base/common/marshallingIds.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { URI } from '../../../../base/common/uri.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { IRange } from '../../../../editor/common/core/range.js';
+import * as languages from '../../../../editor/common/languages.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import * as nls from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { CommentFormActions } from './commentFormActions.js';
+import { CommentMenus } from './commentMenus.js';
+import { ICommentService } from './commentService.js';
+import { CommentContextKeys } from '../common/commentContextKeys.js';
+import { ICommentThreadWidget } from '../common/commentThreadWidget.js';
+import { ICellRange } from '../../notebook/common/notebookRange.js';
+import { LayoutableEditor, MIN_EDITOR_HEIGHT, SimpleCommentEditor, calculateEditorHeight } from './simpleCommentEditor.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
 
 let INMEM_MODEL_ID = 0;
 export const COMMENTEDITOR_DECORATION_KEY = 'commenteditordecoration';
@@ -63,9 +62,9 @@ export class CommentReply<T extends IRange | ICellRange> extends Disposable {
 		focus: boolean,
 		private _actionRunDelegate: (() => void) | null,
 		@ICommentService private commentService: ICommentService,
-		@IThemeService private themeService: IThemeService,
 		@IConfigurationService configurationService: IConfigurationService,
 		@IKeybindingService private keybindingService: IKeybindingService,
+		@IContextMenuService private contextMenuService: IContextMenuService,
 		@IHoverService private hoverService: IHoverService,
 		@ITextModelService private readonly textModelService: ITextModelService
 	) {
@@ -213,32 +212,12 @@ export class CommentReply<T extends IRange | ICellRange> extends Disposable {
 	}
 
 	setCommentEditorDecorations() {
-		const model = this.commentEditor.getModel();
-		if (model) {
-			const valueLength = model.getValueLength();
-			const hasExistingComments = this._commentThread.comments && this._commentThread.comments.length > 0;
-			const placeholder = valueLength > 0
-				? ''
-				: hasExistingComments
-					? (this._commentOptions?.placeHolder || nls.localize('reply', "Reply..."))
-					: (this._commentOptions?.placeHolder || nls.localize('newComment', "Type a new comment"));
-			const decorations = [{
-				range: {
-					startLineNumber: 0,
-					endLineNumber: 0,
-					startColumn: 0,
-					endColumn: 1
-				},
-				renderOptions: {
-					after: {
-						contentText: placeholder,
-						color: `${resolveColorValue(editorForeground, this.themeService.getColorTheme())?.transparent(0.4)}`
-					}
-				}
-			}];
+		const hasExistingComments = this._commentThread.comments && this._commentThread.comments.length > 0;
+		const placeholder = hasExistingComments
+			? (this._commentOptions?.placeHolder || nls.localize('reply', "Reply..."))
+			: (this._commentOptions?.placeHolder || nls.localize('newComment', "Type a new comment"));
 
-			this.commentEditor.setDecorationsByType('review-zone-widget', COMMENTEDITOR_DECORATION_KEY, decorations);
-		}
+		this.commentEditor.updateOptions({ placeholder });
 	}
 
 	private createTextModelListener(commentEditor: ICodeEditor, commentForm: HTMLElement) {
@@ -296,7 +275,7 @@ export class CommentReply<T extends IRange | ICellRange> extends Disposable {
 			this._commentFormActions.setActions(menu);
 		}));
 
-		this._commentFormActions = new CommentFormActions(this.keybindingService, this._contextKeyService, container, async (action: IAction) => {
+		this._commentFormActions = new CommentFormActions(this.keybindingService, this._contextKeyService, this.contextMenuService, container, async (action: IAction) => {
 			await this._actionRunDelegate?.();
 
 			await action.run({
@@ -319,7 +298,7 @@ export class CommentReply<T extends IRange | ICellRange> extends Disposable {
 			this._commentEditorActions.setActions(editorMenu);
 		}));
 
-		this._commentEditorActions = new CommentFormActions(this.keybindingService, this._contextKeyService, container, async (action: IAction) => {
+		this._commentEditorActions = new CommentFormActions(this.keybindingService, this._contextKeyService, this.contextMenuService, container, async (action: IAction) => {
 			this._actionRunDelegate?.();
 
 			action.run({
diff --git a/src/vs/workbench/contrib/comments/browser/commentService.ts b/src/vs/workbench/contrib/comments/browser/commentService.ts
index 1d20812ebe5..ca5a8aa59d9 100644
--- a/src/vs/workbench/contrib/comments/browser/commentService.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentService.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CommentThreadChangedEvent, CommentInfo, Comment, CommentReaction, CommentingRanges, CommentThread, CommentOptions, PendingCommentThread, CommentingRangeResourceHint } from 'vs/editor/common/languages';
-import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { Event, Emitter } from 'vs/base/common/event';
-import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { Range, IRange } from 'vs/editor/common/core/range';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { ICommentThreadChangedEvent } from 'vs/workbench/contrib/comments/common/commentModel';
-import { CommentMenus } from 'vs/workbench/contrib/comments/browser/commentMenus';
-import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
-import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { COMMENTS_SECTION, ICommentsConfiguration } from 'vs/workbench/contrib/comments/common/commentsConfiguration';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { CommentContextKeys } from 'vs/workbench/contrib/comments/common/commentContextKeys';
-import { ILogService } from 'vs/platform/log/common/log';
-import { CommentsModel, ICommentsModel } from 'vs/workbench/contrib/comments/browser/commentsModel';
-import { IModelService } from 'vs/editor/common/services/model';
+import { CommentThreadChangedEvent, CommentInfo, Comment, CommentReaction, CommentingRanges, CommentThread, CommentOptions, PendingCommentThread, CommentingRangeResourceHint } from '../../../../editor/common/languages.js';
+import { createDecorator, IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
+import { Range, IRange } from '../../../../editor/common/core/range.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { ICommentThreadChangedEvent } from '../common/commentModel.js';
+import { CommentMenus } from './commentMenus.js';
+import { ICellRange } from '../../notebook/common/notebookRange.js';
+import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { COMMENTS_SECTION, ICommentsConfiguration } from '../common/commentsConfiguration.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { CommentContextKeys } from '../common/commentContextKeys.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { CommentsModel, ICommentsModel } from './commentsModel.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
 
 export const ICommentService = createDecorator<ICommentService>('commentService');
 
@@ -63,6 +63,7 @@ export interface ICommentController {
 	options?: CommentOptions;
 	contextValue?: string;
 	owner: string;
+	activeComment: { thread: CommentThread; comment?: Comment } | undefined;
 	createCommentThreadTemplate(resource: UriComponents, range: IRange | undefined, editorId?: string): Promise<void>;
 	updateCommentThreadTemplate(threadHandle: number, range: IRange): Promise<void>;
 	deleteCommentThreadMain(commentThreadId: string): void;
@@ -91,6 +92,7 @@ export interface ICommentService {
 	readonly onDidChangeCommentingEnabled: Event<boolean>;
 	readonly isCommentingEnabled: boolean;
 	readonly commentsModel: ICommentsModel;
+	readonly lastActiveCommentcontroller: ICommentController | undefined;
 	setDocumentComments(resource: URI, commentInfos: ICommentInfo[]): void;
 	setWorkspaceComments(uniqueOwner: string, commentsByResource: CommentThread<IRange | ICellRange>[]): void;
 	removeWorkspaceComments(uniqueOwner: string): void;
@@ -295,6 +297,10 @@ export class CommentService extends Disposable implements ICommentService {
 		this._onDidChangeActiveEditingCommentThread.fire(commentThread);
 	}
 
+	get lastActiveCommentcontroller() {
+		return this._lastActiveCommentController;
+	}
+
 	private _lastActiveCommentController: ICommentController | undefined;
 	async setActiveCommentAndThread(uniqueOwner: string, commentInfo: { thread: CommentThread<IRange>; comment?: Comment } | undefined) {
 		const commentController = this._commentControls.get(uniqueOwner);
diff --git a/src/vs/workbench/contrib/comments/browser/commentThreadAdditionalActions.ts b/src/vs/workbench/contrib/comments/browser/commentThreadAdditionalActions.ts
index 8e561d6fad2..95ea3147997 100644
--- a/src/vs/workbench/contrib/comments/browser/commentThreadAdditionalActions.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentThreadAdditionalActions.ts
@@ -3,19 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
+import * as dom from '../../../../base/browser/dom.js';
 
-import { IAction } from 'vs/base/common/actions';
-import { IMenu, SubmenuItemAction } from 'vs/platform/actions/common/actions';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { MarshalledId } from 'vs/base/common/marshallingIds';
-import { IRange } from 'vs/editor/common/core/range';
-import * as languages from 'vs/editor/common/languages';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { CommentFormActions } from 'vs/workbench/contrib/comments/browser/commentFormActions';
-import { CommentMenus } from 'vs/workbench/contrib/comments/browser/commentMenus';
-import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { IAction } from '../../../../base/common/actions.js';
+import { IMenu, SubmenuItemAction } from '../../../../platform/actions/common/actions.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { MarshalledId } from '../../../../base/common/marshallingIds.js';
+import { IRange } from '../../../../editor/common/core/range.js';
+import * as languages from '../../../../editor/common/languages.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { CommentFormActions } from './commentFormActions.js';
+import { CommentMenus } from './commentMenus.js';
+import { ICellRange } from '../../notebook/common/notebookRange.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
 
 export class CommentThreadAdditionalActions<T extends IRange | ICellRange> extends Disposable {
 	private _container: HTMLElement | null;
@@ -29,6 +30,7 @@ export class CommentThreadAdditionalActions<T extends IRange | ICellRange> exten
 		private _commentMenus: CommentMenus,
 		private _actionRunDelegate: (() => void) | null,
 		@IKeybindingService private _keybindingService: IKeybindingService,
+		@IContextMenuService private _contextMenuService: IContextMenuService,
 	) {
 		super();
 
@@ -80,14 +82,14 @@ export class CommentThreadAdditionalActions<T extends IRange | ICellRange> exten
 			this._enableDisableMenu(menu);
 		}));
 
-		this._commentFormActions = new CommentFormActions(this._keybindingService, this._contextKeyService, container, async (action: IAction) => {
+		this._commentFormActions = new CommentFormActions(this._keybindingService, this._contextKeyService, this._contextMenuService, container, async (action: IAction) => {
 			this._actionRunDelegate?.();
 
 			action.run({
 				thread: this._commentThread,
 				$mid: MarshalledId.CommentThreadInstance
 			});
-		}, 4);
+		}, 4, true);
 
 		this._register(this._commentFormActions);
 		this._commentFormActions.setActions(menu, /*hasOnlySecondaryActions*/ true);
diff --git a/src/vs/workbench/contrib/comments/browser/commentThreadBody.ts b/src/vs/workbench/contrib/comments/browser/commentThreadBody.ts
index 3728fb02731..2cf1ddeb663 100644
--- a/src/vs/workbench/contrib/comments/browser/commentThreadBody.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentThreadBody.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import * as nls from 'vs/nls';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import * as languages from 'vs/editor/common/languages';
-import { Emitter } from 'vs/base/common/event';
-import { ICommentService } from 'vs/workbench/contrib/comments/browser/commentService';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { CommentNode } from 'vs/workbench/contrib/comments/browser/commentNode';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { URI } from 'vs/base/common/uri';
-import { ICommentThreadWidget } from 'vs/workbench/contrib/comments/common/commentThreadWidget';
-import { IMarkdownRendererOptions, MarkdownRenderer } from 'vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
-import { IRange } from 'vs/editor/common/core/range';
-import { LayoutableEditor } from 'vs/workbench/contrib/comments/browser/simpleCommentEditor';
+import * as dom from '../../../../base/browser/dom.js';
+import * as nls from '../../../../nls.js';
+import { Disposable, DisposableMap, DisposableStore } from '../../../../base/common/lifecycle.js';
+import * as languages from '../../../../editor/common/languages.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { ICommentService } from './commentService.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { CommentNode } from './commentNode.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ICommentThreadWidget } from '../common/commentThreadWidget.js';
+import { IMarkdownRendererOptions, MarkdownRenderer } from '../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { ICellRange } from '../../notebook/common/notebookRange.js';
+import { IRange } from '../../../../editor/common/core/range.js';
+import { LayoutableEditor } from './simpleCommentEditor.js';
 
 export class CommentThreadBody<T extends IRange | ICellRange = IRange> extends Disposable {
 	private _commentsElement!: HTMLElement;
@@ -30,7 +30,7 @@ export class CommentThreadBody<T extends IRange | ICellRange = IRange> extends D
 	private _onDidResize = new Emitter<dom.Dimension>();
 	onDidResize = this._onDidResize.event;
 
-	private _commentDisposable = new Map<CommentNode<T>, IDisposable>();
+	private _commentDisposable = new DisposableMap<CommentNode<T>, DisposableStore>();
 	private _markdownRenderer: MarkdownRenderer;
 
 	get length() {
@@ -66,10 +66,23 @@ export class CommentThreadBody<T extends IRange | ICellRange = IRange> extends D
 		this._markdownRenderer = this._register(new MarkdownRenderer(this._options, this.languageService, this.openerService));
 	}
 
-	focus() {
+	focus(commentUniqueId?: number) {
+		if (commentUniqueId !== undefined) {
+			const comment = this._commentElements.find(commentNode => commentNode.comment.uniqueIdInThread === commentUniqueId);
+			if (comment) {
+				comment.focus();
+				return;
+			}
+		}
 		this._commentsElement.focus();
 	}
 
+	ensureFocusIntoNewEditingComment() {
+		if (this._commentElements.length === 1 && this._commentElements[0].isEditing) {
+			this._commentElements[0].setFocus(true);
+		}
+	}
+
 	async display() {
 		this._commentsElement = dom.append(this.container, dom.$('div.comments-container'));
 		this._commentsElement.setAttribute('role', 'presentation');
@@ -90,6 +103,7 @@ export class CommentThreadBody<T extends IRange | ICellRange = IRange> extends D
 			}
 		}));
 
+		this._commentDisposable.clearAndDisposeAll();
 		this._commentElements = [];
 		if (this._commentThread.comments) {
 			for (const comment of this._commentThread.comments) {
@@ -177,8 +191,7 @@ export class CommentThreadBody<T extends IRange | ICellRange = IRange> extends D
 		// del removed elements
 		for (let i = commentElementsToDel.length - 1; i >= 0; i--) {
 			const commentToDelete = commentElementsToDel[i];
-			this._commentDisposable.get(commentToDelete)?.dispose();
-			this._commentDisposable.delete(commentToDelete);
+			this._commentDisposable.deleteAndDispose(commentToDelete);
 
 			this._commentElements.splice(commentElementsToDelIndex[i], 1);
 			commentToDelete.domNode.remove();
@@ -267,10 +280,12 @@ export class CommentThreadBody<T extends IRange | ICellRange = IRange> extends D
 			this._parentCommentThreadWidget,
 			this._markdownRenderer) as unknown as CommentNode<T>;
 
-		this._register(newCommentNode);
-		this._commentDisposable.set(newCommentNode, newCommentNode.onDidClick(clickedNode =>
+		const disposables: DisposableStore = new DisposableStore();
+		disposables.add(newCommentNode.onDidClick(clickedNode =>
 			this._setFocusedComment(this._commentElements.findIndex(commentNode => commentNode.comment.uniqueIdInThread === clickedNode.comment.uniqueIdInThread))
 		));
+		disposables.add(newCommentNode);
+		this._commentDisposable.set(newCommentNode, disposables);
 
 		return newCommentNode;
 	}
@@ -283,6 +298,6 @@ export class CommentThreadBody<T extends IRange | ICellRange = IRange> extends D
 			this._resizeObserver = null;
 		}
 
-		this._commentDisposable.forEach(v => v.dispose());
+		this._commentDisposable.dispose();
 	}
 }
diff --git a/src/vs/workbench/contrib/comments/browser/commentThreadHeader.ts b/src/vs/workbench/contrib/comments/browser/commentThreadHeader.ts
index 2849c9afd76..c76c842f122 100644
--- a/src/vs/workbench/contrib/comments/browser/commentThreadHeader.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentThreadHeader.ts
@@ -3,30 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { Action, ActionRunner } from 'vs/base/common/actions';
-import { Codicon } from 'vs/base/common/codicons';
-import { Disposable } from 'vs/base/common/lifecycle';
-import * as strings from 'vs/base/common/strings';
-import * as languages from 'vs/editor/common/languages';
-import { IRange } from 'vs/editor/common/core/range';
-import * as nls from 'vs/nls';
-import { createActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IMenu, MenuItemAction, SubmenuItemAction } from 'vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { CommentMenus } from 'vs/workbench/contrib/comments/browser/commentMenus';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { MarshalledId } from 'vs/base/common/marshallingIds';
-import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { MarshalledCommentThread } from 'vs/workbench/common/comments';
+import * as dom from '../../../../base/browser/dom.js';
+import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { Action, ActionRunner } from '../../../../base/common/actions.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Disposable, IDisposable, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import * as strings from '../../../../base/common/strings.js';
+import * as languages from '../../../../editor/common/languages.js';
+import { IRange } from '../../../../editor/common/core/range.js';
+import * as nls from '../../../../nls.js';
+import { createActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IMenu, MenuItemAction, SubmenuItemAction } from '../../../../platform/actions/common/actions.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { CommentMenus } from './commentMenus.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { MarshalledId } from '../../../../base/common/marshallingIds.js';
+import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
+import { MarshalledCommentThread } from '../../../common/comments.js';
 
 const collapseIcon = registerIcon('review-comment-collapse', Codicon.chevronUp, nls.localize('collapseIcon', 'Icon to collapse a review comment.'));
 const COLLAPSE_ACTION_CLASS = 'expand-review-action ' + ThemeIcon.asClassName(collapseIcon);
+const DELETE_ACTION_CLASS = 'expand-review-action ' + ThemeIcon.asClassName(Codicon.trashcan);
 
+function threadHasComments(comments: ReadonlyArray<languages.Comment> | undefined): comments is ReadonlyArray<languages.Comment> {
+	return !!comments && comments.length > 0;
+}
 
 export class CommentThreadHeader<T = IRange> extends Disposable {
 	private _headElement: HTMLElement;
@@ -46,6 +50,7 @@ export class CommentThreadHeader<T = IRange> extends Disposable {
 		super();
 		this._headElement = <HTMLDivElement>dom.$('.head');
 		container.appendChild(this._headElement);
+		this._register(toDisposable(() => this._headElement.remove()));
 		this._fillHead();
 	}
 
@@ -62,7 +67,17 @@ export class CommentThreadHeader<T = IRange> extends Disposable {
 
 		this._register(this._actionbarWidget);
 
-		this._collapseAction = new Action('review.expand', nls.localize('label.collapse', "Collapse"), COLLAPSE_ACTION_CLASS, true, () => this._delegate.collapse());
+		const collapseClass = threadHasComments(this._commentThread.comments) ? COLLAPSE_ACTION_CLASS : DELETE_ACTION_CLASS;
+		this._collapseAction = new Action('review.expand', nls.localize('label.collapse', "Collapse"), collapseClass, true, () => this._delegate.collapse());
+		if (!threadHasComments(this._commentThread.comments)) {
+			const commentsChanged: MutableDisposable<IDisposable> = this._register(new MutableDisposable());
+			commentsChanged.value = this._commentThread.onDidChangeComments(() => {
+				if (threadHasComments(this._commentThread.comments)) {
+					this._collapseAction.class = COLLAPSE_ACTION_CLASS;
+					commentsChanged.clear();
+				}
+			});
+		}
 
 		const menu = this._commentMenus.getCommentThreadTitleActions(this._contextKeyService);
 		this._register(menu);
diff --git a/src/vs/workbench/contrib/comments/browser/commentThreadRangeDecorator.ts b/src/vs/workbench/contrib/comments/browser/commentThreadRangeDecorator.ts
index 182a5f3b397..1b083f5b847 100644
--- a/src/vs/workbench/contrib/comments/browser/commentThreadRangeDecorator.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentThreadRangeDecorator.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IRange } from 'vs/editor/common/core/range';
-import { CommentThread, CommentThreadCollapsibleState } from 'vs/editor/common/languages';
-import { IModelDecorationOptions, IModelDeltaDecoration } from 'vs/editor/common/model';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { ICommentInfo, ICommentService } from 'vs/workbench/contrib/comments/browser/commentService';
+import { Disposable, dispose, IDisposable } from '../../../../base/common/lifecycle.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { IRange } from '../../../../editor/common/core/range.js';
+import { CommentThread, CommentThreadCollapsibleState } from '../../../../editor/common/languages.js';
+import { IModelDecorationOptions, IModelDeltaDecoration } from '../../../../editor/common/model.js';
+import { ModelDecorationOptions } from '../../../../editor/common/model/textModel.js';
+import { ICommentInfo, ICommentService } from './commentService.js';
 
 class CommentThreadRangeDecoration implements IModelDeltaDecoration {
 	private _decorationId: string | undefined;
diff --git a/src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts b/src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts
index a919fe262a9..5b6ed30b649 100644
--- a/src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts
@@ -3,43 +3,44 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/review';
-import * as dom from 'vs/base/browser/dom';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable, dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import * as languages from 'vs/editor/common/languages';
-import { IMarkdownRendererOptions } from 'vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { CommentMenus } from 'vs/workbench/contrib/comments/browser/commentMenus';
-import { CommentReply } from 'vs/workbench/contrib/comments/browser/commentReply';
-import { ICommentService } from 'vs/workbench/contrib/comments/browser/commentService';
-import { CommentThreadBody } from 'vs/workbench/contrib/comments/browser/commentThreadBody';
-import { CommentThreadHeader } from 'vs/workbench/contrib/comments/browser/commentThreadHeader';
-import { CommentThreadAdditionalActions } from 'vs/workbench/contrib/comments/browser/commentThreadAdditionalActions';
-import { CommentContextKeys } from 'vs/workbench/contrib/comments/common/commentContextKeys';
-import { ICommentThreadWidget } from 'vs/workbench/contrib/comments/common/commentThreadWidget';
-import { IColorTheme } from 'vs/platform/theme/common/themeService';
-import { contrastBorder, focusBorder, inputValidationErrorBackground, inputValidationErrorBorder, inputValidationErrorForeground, textBlockQuoteBackground, textBlockQuoteBorder, textLinkActiveForeground, textLinkForeground } from 'vs/platform/theme/common/colorRegistry';
-import { PANEL_BORDER } from 'vs/workbench/common/theme';
-import { IRange } from 'vs/editor/common/core/range';
-import { commentThreadStateBackgroundColorVar, commentThreadStateColorVar } from 'vs/workbench/contrib/comments/browser/commentColors';
-import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
-import { FontInfo } from 'vs/editor/common/config/fontInfo';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { registerNavigableContainer } from 'vs/workbench/browser/actions/widgetNavigationCommands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { COMMENTS_SECTION, ICommentsConfiguration } from 'vs/workbench/contrib/comments/common/commentsConfiguration';
-import { localize } from 'vs/nls';
-import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { AccessibilityCommandId } from 'vs/workbench/contrib/accessibility/common/accessibilityCommands';
-import { LayoutableEditor } from 'vs/workbench/contrib/comments/browser/simpleCommentEditor';
+import './media/review.css';
+import * as dom from '../../../../base/browser/dom.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable, dispose, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import * as languages from '../../../../editor/common/languages.js';
+import { IMarkdownRendererOptions } from '../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { CommentMenus } from './commentMenus.js';
+import { CommentReply } from './commentReply.js';
+import { ICommentService } from './commentService.js';
+import { CommentThreadBody } from './commentThreadBody.js';
+import { CommentThreadHeader } from './commentThreadHeader.js';
+import { CommentThreadAdditionalActions } from './commentThreadAdditionalActions.js';
+import { CommentContextKeys } from '../common/commentContextKeys.js';
+import { ICommentThreadWidget } from '../common/commentThreadWidget.js';
+import { IColorTheme } from '../../../../platform/theme/common/themeService.js';
+import { contrastBorder, focusBorder, inputValidationErrorBackground, inputValidationErrorBorder, inputValidationErrorForeground, textBlockQuoteBackground, textBlockQuoteBorder, textLinkActiveForeground, textLinkForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import { PANEL_BORDER } from '../../../common/theme.js';
+import { IRange, Range } from '../../../../editor/common/core/range.js';
+import { commentThreadStateBackgroundColorVar, commentThreadStateColorVar } from './commentColors.js';
+import { ICellRange } from '../../notebook/common/notebookRange.js';
+import { FontInfo } from '../../../../editor/common/config/fontInfo.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { registerNavigableContainer } from '../../../browser/actions/widgetNavigationCommands.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { COMMENTS_SECTION, ICommentsConfiguration } from '../common/commentsConfiguration.js';
+import { localize } from '../../../../nls.js';
+import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { AccessibilityCommandId } from '../../accessibility/common/accessibilityCommands.js';
+import { LayoutableEditor } from './simpleCommentEditor.js';
+import { DomEmitter } from '../../../../base/browser/event.js';
+import { isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
 
 export const COMMENTEDITOR_DECORATION_KEY = 'commenteditordecoration';
 
-
 export class CommentThreadWidget<T extends IRange | ICellRange = IRange> extends Disposable implements ICommentThreadWidget {
 	private _header!: CommentThreadHeader<T>;
 	private _body: CommentThreadBody<T>;
@@ -104,6 +105,7 @@ export class CommentThreadWidget<T extends IRange | ICellRange = IRange> extends
 
 		const bodyElement = <HTMLDivElement>dom.$('.body');
 		container.appendChild(bodyElement);
+		this._register(toDisposable(() => bodyElement.remove()));
 
 		const tracker = this._register(dom.trackFocus(bodyElement));
 		this._register(registerNavigableContainer({
@@ -155,6 +157,14 @@ export class CommentThreadWidget<T extends IRange | ICellRange = IRange> extends
 		}
 
 		this.currentThreadListeners();
+		this._register(new DomEmitter(this.container, 'keydown').event(e => {
+			if (dom.isKeyboardEvent(e) && e.key === 'Escape') {
+				if (Range.isIRange(this.commentThread.range) && isCodeEditor(this._parentEditor)) {
+					this._parentEditor.setSelection(this.commentThread.range);
+				}
+				this.collapse();
+			}
+		}));
 	}
 
 	private _setAriaLabel(): void {
@@ -166,7 +176,7 @@ export class CommentThreadWidget<T extends IRange | ICellRange = IRange> extends
 		}
 		if (keybinding) {
 			ariaLabel = localize('commentLabelWithKeybinding', "{0}, use ({1}) for accessibility help", ariaLabel, keybinding);
-		} else {
+		} else if (verbose) {
 			ariaLabel = localize('commentLabelWithKeybindingNoKeybinding', "{0}, run the command Open Accessibility Help which is currently not triggerable via keybinding.", ariaLabel);
 		}
 		this._body.container.ariaLabel = ariaLabel;
@@ -352,12 +362,16 @@ export class CommentThreadWidget<T extends IRange | ICellRange = IRange> extends
 		}
 	}
 
+	ensureFocusIntoNewEditingComment() {
+		this._body.ensureFocusIntoNewEditingComment();
+	}
+
 	focusCommentEditor() {
 		this._commentReply?.expandReplyAreaAndFocusCommentEditor();
 	}
 
-	focus() {
-		this._body.focus();
+	focus(commentUniqueId: number | undefined) {
+		this._body.focus(commentUniqueId);
 	}
 
 	async submitComment() {
diff --git a/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts b/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts
index 2c909a2ed5e..e6ff2d08d69 100644
--- a/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts
@@ -3,29 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { Color } from 'vs/base/common/color';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IDisposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
-import { IPosition } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import * as languages from 'vs/editor/common/languages';
-import { ZoneWidget } from 'vs/editor/contrib/zoneWidget/browser/zoneWidget';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IColorTheme, IThemeService } from 'vs/platform/theme/common/themeService';
-import { CommentGlyphWidget } from 'vs/workbench/contrib/comments/browser/commentGlyphWidget';
-import { ICommentService } from 'vs/workbench/contrib/comments/browser/commentService';
-import { ICommentThreadWidget } from 'vs/workbench/contrib/comments/common/commentThreadWidget';
-import { EDITOR_FONT_DEFAULTS, EditorOption, IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { CommentThreadWidget } from 'vs/workbench/contrib/comments/browser/commentThreadWidget';
-import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
-import { commentThreadStateBackgroundColorVar, commentThreadStateColorVar, getCommentThreadStateBorderColor } from 'vs/workbench/contrib/comments/browser/commentColors';
-import { peekViewBorder } from 'vs/editor/contrib/peekView/browser/peekView';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { StableEditorScrollState } from 'vs/editor/browser/stableEditorScroll';
+import * as dom from '../../../../base/browser/dom.js';
+import { Color } from '../../../../base/common/color.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { IDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from '../../../../editor/browser/editorBrowser.js';
+import { IPosition } from '../../../../editor/common/core/position.js';
+import { IRange, Range } from '../../../../editor/common/core/range.js';
+import * as languages from '../../../../editor/common/languages.js';
+import { ZoneWidget } from '../../../../editor/contrib/zoneWidget/browser/zoneWidget.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IColorTheme, IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { CommentGlyphWidget } from './commentGlyphWidget.js';
+import { ICommentService } from './commentService.js';
+import { ICommentThreadWidget } from '../common/commentThreadWidget.js';
+import { EDITOR_FONT_DEFAULTS, EditorOption, IEditorOptions } from '../../../../editor/common/config/editorOptions.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { CommentThreadWidget } from './commentThreadWidget.js';
+import { ICellRange } from '../../notebook/common/notebookRange.js';
+import { commentThreadStateBackgroundColorVar, commentThreadStateColorVar, getCommentThreadStateBorderColor } from './commentColors.js';
+import { peekViewBorder } from '../../../../editor/contrib/peekView/browser/peekView.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { StableEditorScrollState } from '../../../../editor/browser/stableEditorScroll.js';
 
 function getCommentThreadWidgetStateColor(thread: languages.CommentThreadState | undefined, theme: IColorTheme): Color | undefined {
 	return getCommentThreadStateBorderColor(thread, theme) ?? theme.getColor(peekViewBorder);
@@ -187,38 +187,58 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget
 	}
 
 	public reveal(commentUniqueId?: number, focus: CommentWidgetFocus = CommentWidgetFocus.None) {
+		this.makeVisible(commentUniqueId, focus);
+		const comment = this._commentThread.comments?.find(comment => comment.uniqueIdInThread === commentUniqueId);
+		this.commentService.setActiveCommentAndThread(this.uniqueOwner, { thread: this._commentThread, comment });
+	}
+
+	private _expandAndShowZoneWidget() {
 		if (!this._isExpanded) {
 			this.show(this.arrowPosition(this._commentThread.range), 2);
 		}
+	}
 
-		if (commentUniqueId !== undefined) {
-			const height = this.editor.getLayoutInfo().height;
-			const coords = this._commentThreadWidget.getCommentCoords(commentUniqueId);
-			if (coords) {
-				let scrollTop: number = 1;
-				if (this._commentThread.range) {
-					const commentThreadCoords = coords.thread;
-					const commentCoords = coords.comment;
-					scrollTop = this.editor.getTopForLineNumber(this._commentThread.range.startLineNumber) - height / 2 + commentCoords.top - commentThreadCoords.top;
-				}
-				this.editor.setScrollTop(scrollTop);
-				if (focus === CommentWidgetFocus.Widget) {
-					this._commentThreadWidget.focus();
-				} else if (focus === CommentWidgetFocus.Editor) {
-					this._commentThreadWidget.focusCommentEditor();
-				}
-				return;
-			}
+	private _setFocus(commentUniqueId: number | undefined, focus: CommentWidgetFocus) {
+		if (focus === CommentWidgetFocus.Widget) {
+			this._commentThreadWidget.focus(commentUniqueId);
+		} else if (focus === CommentWidgetFocus.Editor) {
+			this._commentThreadWidget.focusCommentEditor();
 		}
+	}
+
+	private _goToComment(commentUniqueId: number, focus: CommentWidgetFocus) {
+		const height = this.editor.getLayoutInfo().height;
+		const coords = this._commentThreadWidget.getCommentCoords(commentUniqueId);
+		if (coords) {
+			let scrollTop: number = 1;
+			if (this._commentThread.range) {
+				const commentThreadCoords = coords.thread;
+				const commentCoords = coords.comment;
+				scrollTop = this.editor.getTopForLineNumber(this._commentThread.range.startLineNumber) - height / 2 + commentCoords.top - commentThreadCoords.top;
+			}
+			this.editor.setScrollTop(scrollTop);
+			this._setFocus(commentUniqueId, focus);
+		} else {
+			this._goToThread(focus);
+		}
+	}
+
+	private _goToThread(focus: CommentWidgetFocus) {
 		const rangeToReveal = this._commentThread.range
 			? new Range(this._commentThread.range.startLineNumber, this._commentThread.range.startColumn, this._commentThread.range.endLineNumber + 1, 1)
 			: new Range(1, 1, 1, 1);
 
 		this.editor.revealRangeInCenter(rangeToReveal);
-		if (focus === CommentWidgetFocus.Widget) {
-			this._commentThreadWidget.focus();
-		} else if (focus === CommentWidgetFocus.Editor) {
-			this._commentThreadWidget.focusCommentEditor();
+		this._setFocus(undefined, focus);
+	}
+
+	public makeVisible(commentUniqueId?: number, focus: CommentWidgetFocus = CommentWidgetFocus.None) {
+		this._expandAndShowZoneWidget();
+
+		if (commentUniqueId !== undefined) {
+			this._goToComment(commentUniqueId, focus);
+		} else {
+			this._goToThread(focus);
 		}
 	}
 
@@ -300,8 +320,11 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget
 		this._commentThread.collapsibleState = languages.CommentThreadCollapsibleState.Collapsed;
 	}
 
-	public expand() {
+	public expand(setActive?: boolean) {
 		this._commentThread.collapsibleState = languages.CommentThreadCollapsibleState.Expanded;
+		if (setActive) {
+			this.commentService.setActiveCommentAndThread(this.uniqueOwner, { thread: this._commentThread });
+		}
 	}
 
 	public getGlyphPosition(): number {
@@ -311,14 +334,6 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget
 		return 0;
 	}
 
-	toggleExpand() {
-		if (this._isExpanded) {
-			this._commentThread.collapsibleState = languages.CommentThreadCollapsibleState.Collapsed;
-		} else {
-			this._commentThread.collapsibleState = languages.CommentThreadCollapsibleState.Expanded;
-		}
-	}
-
 	async update(commentThread: languages.CommentThread<IRange>) {
 		if (this._commentThread !== commentThread) {
 			this._commentThreadDisposables.forEach(disposable => disposable.dispose());
@@ -359,6 +374,14 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget
 		if (range) {
 			this._commentGlyph = new CommentGlyphWidget(this.editor, range?.endLineNumber ?? -1);
 			this._commentGlyph.setThreadState(this._commentThread.state);
+			this._globalToDispose.add(this._commentGlyph.onDidChangeLineNumber(async e => {
+				if (!this._commentThread.range) {
+					return;
+				}
+				const shift = e - (this._commentThread.range.endLineNumber);
+				const newRange = new Range(this._commentThread.range.startLineNumber + shift, this._commentThread.range.startColumn, this._commentThread.range.endLineNumber + shift, this._commentThread.range.endColumn);
+				this._commentThread.range = newRange;
+			}));
 		}
 
 		await this._commentThreadWidget.display(this.editor.getOption(EditorOption.lineHeight), shouldReveal);
@@ -371,7 +394,7 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget
 
 		// If this is a new comment thread awaiting user input then we need to reveal it.
 		if (shouldReveal) {
-			this.reveal();
+			this.makeVisible();
 		}
 
 		this.bindCommentThreadListeners();
@@ -382,25 +405,10 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget
 			await this.update(this._commentThread);
 		}));
 
-		this._commentThreadDisposables.push(this._commentThread.onDidChangeRange(range => {
-			// Move comment glyph widget and show position if the line has changed.
-			const lineNumber = this._commentThread.range?.startLineNumber ?? 1;
-			let shouldMoveWidget = false;
-			if (this._commentGlyph) {
-				if (this._commentGlyph.getPosition().position!.lineNumber !== lineNumber) {
-					shouldMoveWidget = true;
-					this._commentGlyph.setLineNumber(lineNumber);
-				}
-			}
-
-			if (shouldMoveWidget && this._isExpanded) {
-				this.show(this.arrowPosition(this._commentThread.range), 2);
-			}
-		}));
-
 		this._commentThreadDisposables.push(this._commentThread.onDidChangeCollapsibleState(state => {
 			if (state === languages.CommentThreadCollapsibleState.Expanded && !this._isExpanded) {
 				this.show(this.arrowPosition(this._commentThread.range), 2);
+				this._commentThreadWidget.ensureFocusIntoNewEditingComment();
 				return;
 			}
 
diff --git a/src/vs/workbench/contrib/comments/browser/comments.contribution.ts b/src/vs/workbench/contrib/comments/browser/comments.contribution.ts
index 4f7bfdd711d..d2cfe1a5680 100644
--- a/src/vs/workbench/contrib/comments/browser/comments.contribution.ts
+++ b/src/vs/workbench/contrib/comments/browser/comments.contribution.ts
@@ -3,33 +3,33 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { Registry } from 'vs/platform/registry/common/platform';
-import 'vs/workbench/contrib/comments/browser/commentsEditorContribution';
-import { ICommentService, CommentService, IWorkspaceCommentThreadsEvent } from 'vs/workbench/contrib/comments/browser/commentService';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { Disposable, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { Extensions, IWorkbenchContribution, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
-import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity';
-import { COMMENTS_VIEW_ID } from 'vs/workbench/contrib/comments/browser/commentsTreeViewer';
-import { CommentThreadState } from 'vs/editor/common/languages';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { CONTEXT_KEY_HAS_COMMENTS, CONTEXT_KEY_SOME_COMMENTS_EXPANDED, CommentsPanel } from 'vs/workbench/contrib/comments/browser/commentsView';
-import { ViewAction } from 'vs/workbench/browser/parts/views/viewPane';
-import { Codicon } from 'vs/base/common/codicons';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { revealCommentThread } from 'vs/workbench/contrib/comments/browser/commentsController';
-import { MarshalledCommentThreadInternal } from 'vs/workbench/common/comments';
-import { accessibleViewCurrentProviderId, accessibleViewIsShown } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { AccessibleViewProviderId } from 'vs/platform/accessibility/browser/accessibleView';
-import { AccessibleViewRegistry } from 'vs/platform/accessibility/browser/accessibleViewRegistry';
-import { CommentsAccessibleView } from 'vs/workbench/contrib/comments/browser/commentsAccessibleView';
-import { CommentsAccessibilityHelp } from 'vs/workbench/contrib/comments/browser/commentsAccessibility';
+import * as nls from '../../../../nls.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import './commentsEditorContribution.js';
+import { ICommentService, CommentService, IWorkspaceCommentThreadsEvent } from './commentService.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { Disposable, IDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { Extensions, IWorkbenchContribution, IWorkbenchContributionsRegistry } from '../../../common/contributions.js';
+import { IActivityService, NumberBadge } from '../../../services/activity/common/activity.js';
+import { COMMENTS_VIEW_ID } from './commentsTreeViewer.js';
+import { CommentThreadState } from '../../../../editor/common/languages.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { CONTEXT_KEY_HAS_COMMENTS, CONTEXT_KEY_SOME_COMMENTS_EXPANDED, CommentsPanel } from './commentsView.js';
+import { ViewAction } from '../../../browser/parts/views/viewPane.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { revealCommentThread } from './commentsController.js';
+import { MarshalledCommentThreadInternal } from '../../../common/comments.js';
+import { accessibleViewCurrentProviderId, accessibleViewIsShown } from '../../accessibility/browser/accessibilityConfiguration.js';
+import { AccessibleViewProviderId } from '../../../../platform/accessibility/browser/accessibleView.js';
+import { AccessibleViewRegistry } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
+import { CommentsAccessibleView, CommentThreadAccessibleView } from './commentsAccessibleView.js';
+import { CommentsAccessibilityHelp } from './commentsAccessibility.js';
 
 registerAction2(class Collapse extends ViewAction<CommentsPanel> {
 	constructor() {
@@ -193,4 +193,5 @@ export class UnresolvedCommentsBadge extends Disposable implements IWorkbenchCon
 Registry.as<IWorkbenchContributionsRegistry>(Extensions.Workbench).registerWorkbenchContribution(UnresolvedCommentsBadge, LifecyclePhase.Eventually);
 
 AccessibleViewRegistry.register(new CommentsAccessibleView());
+AccessibleViewRegistry.register(new CommentThreadAccessibleView());
 AccessibleViewRegistry.register(new CommentsAccessibilityHelp());
diff --git a/src/vs/workbench/contrib/comments/browser/comments.ts b/src/vs/workbench/contrib/comments/browser/comments.ts
index 7ccfc5706e4..57ea7a3b470 100644
--- a/src/vs/workbench/contrib/comments/browser/comments.ts
+++ b/src/vs/workbench/contrib/comments/browser/comments.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IView } from 'vs/workbench/common/views';
-import { CommentsFilters } from 'vs/workbench/contrib/comments/browser/commentsViewActions';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IView } from '../../../common/views.js';
+import { CommentsFilters } from './commentsViewActions.js';
 
 export const CommentsViewFilterFocusContextKey = new RawContextKey<boolean>('commentsFilterFocus', false);
 
diff --git a/src/vs/workbench/contrib/comments/browser/commentsAccessibility.ts b/src/vs/workbench/contrib/comments/browser/commentsAccessibility.ts
index 1c247dec349..4a52b4036ff 100644
--- a/src/vs/workbench/contrib/comments/browser/commentsAccessibility.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentsAccessibility.ts
@@ -3,31 +3,35 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ctxCommentEditorFocused } from 'vs/workbench/contrib/comments/browser/simpleCommentEditor';
-import { CommentContextKeys } from 'vs/workbench/contrib/comments/common/commentContextKeys';
-import * as nls from 'vs/nls';
-import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { CommentCommandId } from 'vs/workbench/contrib/comments/common/commentCommandIds';
-import { ToggleTabFocusModeAction } from 'vs/editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode';
-import { IAccessibleViewContentProvider, AccessibleViewProviderId, IAccessibleViewOptions, AccessibleViewType } from 'vs/platform/accessibility/browser/accessibleView';
-import { IAccessibleViewImplentation } from 'vs/platform/accessibility/browser/accessibleViewRegistry';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { ctxCommentEditorFocused } from './simpleCommentEditor.js';
+import { CommentContextKeys } from '../common/commentContextKeys.js';
+import * as nls from '../../../../nls.js';
+import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
+import { CommentCommandId } from '../common/commentCommandIds.js';
+import { ToggleTabFocusModeAction } from '../../../../editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode.js';
+import { IAccessibleViewContentProvider, AccessibleViewProviderId, IAccessibleViewOptions, AccessibleViewType } from '../../../../platform/accessibility/browser/accessibleView.js';
+import { IAccessibleViewImplentation } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+
 
 export namespace CommentAccessibilityHelpNLS {
 	export const intro = nls.localize('intro', "The editor contains commentable range(s). Some useful commands include:");
-	export const tabFocus = nls.localize('introWidget', "This widget contains a text area, for composition of new comments, and actions, that can be tabbed to once tab moves focus mode has been enabled with the command Toggle Tab Key Moves Focus{0}", `<keybinding:${ToggleTabFocusModeAction.ID}>`);
+	export const tabFocus = nls.localize('introWidget', "This widget contains a text area, for composition of new comments, and actions, that can be tabbed to once tab moves focus mode has been enabled with the command Toggle Tab Key Moves Focus{0}.", `<keybinding:${ToggleTabFocusModeAction.ID}>`);
 	export const commentCommands = nls.localize('commentCommands', "Some useful comment commands include:");
 	export const escape = nls.localize('escape', "- Dismiss Comment (Escape)");
-	export const nextRange = nls.localize('next', "- Go to Next Commenting Range{0}", `<keybinding:${CommentCommandId.NextRange}>`);
-	export const previousRange = nls.localize('previous', "- Go to Previous Commenting Range{0}", `<keybinding:${CommentCommandId.PreviousRange}>`);
-	export const nextCommentThread = nls.localize('nextCommentThreadKb', "- Go to Next Comment Thread{0}", `<keybinding:${CommentCommandId.NextThread}>`);
-	export const previousCommentThread = nls.localize('previousCommentThreadKb', "- Go to Previous Comment Thread{0}", `<keybinding:${CommentCommandId.PreviousThread}>`);
-	export const addComment = nls.localize('addCommentNoKb', "- Add Comment on Current Selection{0}", `<keybinding:${CommentCommandId.Add}>`);
-	export const submitComment = nls.localize('submitComment', "- Submit Comment{0}", `<keybinding:${CommentCommandId.Submit}>`);
+	export const nextRange = nls.localize('next', "- Go to Next Commenting Range{0}.", `<keybinding:${CommentCommandId.NextRange}>`);
+	export const previousRange = nls.localize('previous', "- Go to Previous Commenting Range{0}.", `<keybinding:${CommentCommandId.PreviousRange}>`);
+	export const nextCommentThread = nls.localize('nextCommentThreadKb', "- Go to Next Comment Thread{0}.", `<keybinding:${CommentCommandId.NextThread}>`);
+	export const previousCommentThread = nls.localize('previousCommentThreadKb', "- Go to Previous Comment Thread{0}.", `<keybinding:${CommentCommandId.PreviousThread}>`);
+	export const nextCommentedRange = nls.localize('nextCommentedRangeKb', "- Go to Next Commented Range{0}.", `<keybinding:${CommentCommandId.NextCommentedRange}>`);
+	export const previousCommentedRange = nls.localize('previousCommentedRangeKb', "- Go to Previous Commented Range{0}.", `<keybinding:${CommentCommandId.PreviousCommentedRange}>`);
+	export const addComment = nls.localize('addCommentNoKb', "- Add Comment on Current Selection{0}.", `<keybinding:${CommentCommandId.Add}>`);
+	export const submitComment = nls.localize('submitComment', "- Submit Comment{0}.", `<keybinding:${CommentCommandId.Submit}>`);
 }
 
-export class CommentsAccessibilityHelpProvider implements IAccessibleViewContentProvider {
+export class CommentsAccessibilityHelpProvider extends Disposable implements IAccessibleViewContentProvider {
 	id = AccessibleViewProviderId.Comments;
 	verbositySettingKey: AccessibilityVerbositySettingId = AccessibilityVerbositySettingId.Comments;
 	options: IAccessibleViewOptions = { type: AccessibleViewType.Help };
@@ -48,5 +52,4 @@ export class CommentsAccessibilityHelp implements IAccessibleViewImplentation {
 	getProvider(accessor: ServicesAccessor) {
 		return accessor.get(IInstantiationService).createInstance(CommentsAccessibilityHelpProvider);
 	}
-	dispose() { }
 }
diff --git a/src/vs/workbench/contrib/comments/browser/commentsAccessibleView.ts b/src/vs/workbench/contrib/comments/browser/commentsAccessibleView.ts
index 2fdac52458d..655618ac92c 100644
--- a/src/vs/workbench/contrib/comments/browser/commentsAccessibleView.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentsAccessibleView.ts
@@ -3,85 +3,181 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { MarshalledId } from 'vs/base/common/marshallingIds';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { AccessibleViewProviderId, AccessibleViewType } from 'vs/platform/accessibility/browser/accessibleView';
-import { IAccessibleViewImplentation } from 'vs/platform/accessibility/browser/accessibleViewRegistry';
-import { IMenuService } from 'vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { COMMENTS_VIEW_ID, CommentsMenus } from 'vs/workbench/contrib/comments/browser/commentsTreeViewer';
-import { CommentsPanel, CONTEXT_KEY_HAS_COMMENTS } from 'vs/workbench/contrib/comments/browser/commentsView';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { MarshalledId } from '../../../../base/common/marshallingIds.js';
+import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
+import { AccessibleViewProviderId, AccessibleViewType, IAccessibleViewContentProvider } from '../../../../platform/accessibility/browser/accessibleView.js';
+import { IAccessibleViewImplentation } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
+import { IMenuService } from '../../../../platform/actions/common/actions.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
+import { COMMENTS_VIEW_ID, CommentsMenus } from './commentsTreeViewer.js';
+import { CommentsPanel, CONTEXT_KEY_COMMENT_FOCUSED } from './commentsView.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { ICommentService } from './commentService.js';
+import { CommentContextKeys } from '../common/commentContextKeys.js';
+import { moveToNextCommentInThread as findNextCommentInThread, revealCommentThread } from './commentsController.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { URI } from '../../../../base/common/uri.js';
+import { CommentThread, Comment } from '../../../../editor/common/languages.js';
+import { IRange } from '../../../../editor/common/core/range.js';
 
 export class CommentsAccessibleView extends Disposable implements IAccessibleViewImplentation {
 	readonly priority = 90;
 	readonly name = 'comment';
-	readonly when = CONTEXT_KEY_HAS_COMMENTS;
+	readonly when = CONTEXT_KEY_COMMENT_FOCUSED;
 	readonly type = AccessibleViewType.View;
 	getProvider(accessor: ServicesAccessor) {
 		const contextKeyService = accessor.get(IContextKeyService);
 		const viewsService = accessor.get(IViewsService);
 		const menuService = accessor.get(IMenuService);
 		const commentsView = viewsService.getActiveViewWithId<CommentsPanel>(COMMENTS_VIEW_ID);
-		if (!commentsView) {
+		const focusedCommentNode = commentsView?.focusedCommentNode;
+
+		if (!commentsView || !focusedCommentNode) {
 			return;
 		}
 		const menus = this._register(new CommentsMenus(menuService));
 		menus.setContextKeyService(contextKeyService);
 
-		function resolveProvider() {
-			if (!commentsView) {
-				return;
-			}
-
-			const commentNode = commentsView.focusedCommentNode;
-			const content = commentsView.focusedCommentInfo?.toString();
-			if (!commentNode || !content) {
-				return;
-			}
-			const menuActions = [...menus.getResourceContextActions(commentNode)].filter(i => i.enabled);
-			const actions = menuActions.map(action => {
-				return {
-					...action,
-					run: () => {
-						commentsView.focus();
-						action.run({
-							thread: commentNode.thread,
-							$mid: MarshalledId.CommentThread,
-							commentControlHandle: commentNode.controllerHandle,
-							commentThreadHandle: commentNode.threadHandle,
-						});
-					}
-				};
-			});
-			return {
-				id: AccessibleViewProviderId.Notification,
-				provideContent: () => {
-					return content;
-				},
-				onClose(): void {
-					commentsView.focus();
-				},
-				next(): void {
-					commentsView.focus();
-					commentsView.focusNextNode();
-					resolveProvider();
-				},
-				previous(): void {
-					commentsView.focus();
-					commentsView.focusPreviousNode();
-					resolveProvider();
-				},
-				verbositySettingKey: AccessibilityVerbositySettingId.Comments,
-				options: { type: AccessibleViewType.View },
-				actions
-			};
-		}
-		return resolveProvider();
+		return new CommentsAccessibleContentProvider(commentsView, focusedCommentNode, menus);
 	}
 	constructor() {
 		super();
 	}
 }
+
+
+export class CommentThreadAccessibleView extends Disposable implements IAccessibleViewImplentation {
+	readonly priority = 85;
+	readonly name = 'commentThread';
+	readonly when = CommentContextKeys.commentFocused;
+	readonly type = AccessibleViewType.View;
+	getProvider(accessor: ServicesAccessor) {
+		const commentService = accessor.get(ICommentService);
+		const editorService = accessor.get(IEditorService);
+		const uriIdentityService = accessor.get(IUriIdentityService);
+		const threads = commentService.commentsModel.hasCommentThreads();
+		if (!threads) {
+			return;
+		}
+		return new CommentsThreadWidgetAccessibleContentProvider(commentService, editorService, uriIdentityService);
+	}
+	constructor() {
+		super();
+	}
+}
+
+
+class CommentsAccessibleContentProvider extends Disposable implements IAccessibleViewContentProvider {
+	constructor(
+		private readonly _commentsView: CommentsPanel,
+		private readonly _focusedCommentNode: any,
+		private readonly _menus: CommentsMenus,
+	) {
+		super();
+	}
+	readonly id = AccessibleViewProviderId.Comments;
+	readonly verbositySettingKey = AccessibilityVerbositySettingId.Comments;
+	readonly options = { type: AccessibleViewType.View };
+	public actions = [...this._menus.getResourceContextActions(this._focusedCommentNode)].filter(i => i.enabled).map(action => {
+		return {
+			...action,
+			run: () => {
+				this._commentsView.focus();
+				action.run({
+					thread: this._focusedCommentNode.thread,
+					$mid: MarshalledId.CommentThread,
+					commentControlHandle: this._focusedCommentNode.controllerHandle,
+					commentThreadHandle: this._focusedCommentNode.threadHandle,
+				});
+			}
+		};
+	});
+	provideContent(): string {
+		const commentNode = this._commentsView.focusedCommentNode;
+		const content = this._commentsView.focusedCommentInfo?.toString();
+		if (!commentNode || !content) {
+			throw new Error('Comment tree is focused but no comment is selected');
+		}
+		return content;
+	}
+	onClose(): void {
+		this._commentsView.focus();
+	}
+	provideNextContent(): string | undefined {
+		this._commentsView.focusNextNode();
+		return this.provideContent();
+	}
+	providePreviousContent(): string | undefined {
+		this._commentsView.focusPreviousNode();
+		return this.provideContent();
+	}
+}
+
+class CommentsThreadWidgetAccessibleContentProvider extends Disposable implements IAccessibleViewContentProvider {
+	readonly id = AccessibleViewProviderId.CommentThread;
+	readonly verbositySettingKey = AccessibilityVerbositySettingId.Comments;
+	readonly options = { type: AccessibleViewType.View };
+	private _activeCommentInfo: { thread: CommentThread<IRange>; comment?: Comment } | undefined;
+	constructor(@ICommentService private readonly _commentService: ICommentService,
+		@IEditorService private readonly _editorService: IEditorService,
+		@IUriIdentityService private readonly _uriIdentityService: IUriIdentityService,
+	) {
+		super();
+	}
+
+	private get activeCommentInfo(): { thread: CommentThread<IRange>; comment?: Comment } | undefined {
+		if (!this._activeCommentInfo && this._commentService.lastActiveCommentcontroller) {
+			this._activeCommentInfo = this._commentService.lastActiveCommentcontroller.activeComment;
+		}
+		return this._activeCommentInfo;
+	}
+
+	provideContent(): string {
+		if (!this.activeCommentInfo) {
+			throw new Error('No current comment thread');
+		}
+		const comment = this.activeCommentInfo.comment?.body;
+		const commentLabel = typeof comment === 'string' ? comment : comment?.value ?? '';
+		const resource = this.activeCommentInfo.thread.resource;
+		const range = this.activeCommentInfo.thread.range;
+		let contentLabel = '';
+		if (resource && range) {
+			const editor = this._editorService.findEditors(URI.parse(resource)) || [];
+			const codeEditor = this._editorService.activeEditorPane?.getControl();
+			if (editor?.length && isCodeEditor(codeEditor)) {
+				const content = codeEditor.getModel()?.getValueInRange(range);
+				if (content) {
+					contentLabel = '\nCorresponding code: \n' + content;
+				}
+			}
+		}
+		return commentLabel + contentLabel;
+	}
+	onClose(): void {
+		const lastComment = this._activeCommentInfo;
+		this._activeCommentInfo = undefined;
+		if (lastComment) {
+			revealCommentThread(this._commentService, this._editorService, this._uriIdentityService, lastComment.thread, lastComment.comment);
+		}
+	}
+	provideNextContent(): string | undefined {
+		const newCommentInfo = findNextCommentInThread(this._activeCommentInfo, 'next');
+		if (newCommentInfo) {
+			this._activeCommentInfo = newCommentInfo;
+			return this.provideContent();
+		}
+		return undefined;
+	}
+	providePreviousContent(): string | undefined {
+		const newCommentInfo = findNextCommentInThread(this._activeCommentInfo, 'previous');
+		if (newCommentInfo) {
+			this._activeCommentInfo = newCommentInfo;
+			return this.provideContent();
+		}
+		return undefined;
+	}
+}
diff --git a/src/vs/workbench/contrib/comments/browser/commentsController.ts b/src/vs/workbench/contrib/comments/browser/commentsController.ts
index 8f60630a00e..60de02295a0 100644
--- a/src/vs/workbench/contrib/comments/browser/commentsController.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentsController.ts
@@ -3,49 +3,50 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Action, IAction } from 'vs/base/common/actions';
-import { coalesce } from 'vs/base/common/arrays';
-import { findFirstIdxMonotonousOrArrLen } from 'vs/base/common/arraysFind';
-import { CancelablePromise, createCancelablePromise, Delayer } from 'vs/base/common/async';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { DisposableStore, dispose, IDisposable } from 'vs/base/common/lifecycle';
-import 'vs/css!./media/review';
-import { ICodeEditor, IEditorMouseEvent, isCodeEditor, isDiffEditor } from 'vs/editor/browser/editorBrowser';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { EditorType, IDiffEditor, IEditor, IEditorContribution, IModelChangedEvent } from 'vs/editor/common/editorCommon';
-import { IModelDecorationOptions, IModelDeltaDecoration } from 'vs/editor/common/model';
-import { ModelDecorationOptions, TextModel } from 'vs/editor/common/model/textModel';
-import * as languages from 'vs/editor/common/languages';
-import * as nls from 'vs/nls';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IQuickInputService, IQuickPickItem, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
-import { CommentGlyphWidget } from 'vs/workbench/contrib/comments/browser/commentGlyphWidget';
-import { ICommentInfo, ICommentService } from 'vs/workbench/contrib/comments/browser/commentService';
-import { CommentWidgetFocus, isMouseUpEventDragFromMouseDown, parseMouseDownInfoFromEvent, ReviewZoneWidget } from 'vs/workbench/contrib/comments/browser/commentThreadZoneWidget';
-import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { COMMENTS_VIEW_ID } from 'vs/workbench/contrib/comments/browser/commentsTreeViewer';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { COMMENTS_SECTION, ICommentsConfiguration } from 'vs/workbench/contrib/comments/common/commentsConfiguration';
-import { COMMENTEDITOR_DECORATION_KEY } from 'vs/workbench/contrib/comments/browser/commentReply';
-import { Emitter } from 'vs/base/common/event';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { Position } from 'vs/editor/common/core/position';
-import { CommentThreadRangeDecorator } from 'vs/workbench/contrib/comments/browser/commentThreadRangeDecorator';
-import { ICursorSelectionChangedEvent } from 'vs/editor/common/cursorEvents';
-import { CommentsPanel } from 'vs/workbench/contrib/comments/browser/commentsView';
-import { status } from 'vs/base/browser/ui/aria/aria';
-import { CommentContextKeys } from 'vs/workbench/contrib/comments/common/commentContextKeys';
-import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { AccessibilityCommandId } from 'vs/workbench/contrib/accessibility/common/accessibilityCommands';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { URI } from 'vs/base/common/uri';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
+import { Action, IAction } from '../../../../base/common/actions.js';
+import { coalesce } from '../../../../base/common/arrays.js';
+import { findFirstIdxMonotonousOrArrLen } from '../../../../base/common/arraysFind.js';
+import { CancelablePromise, createCancelablePromise, Delayer } from '../../../../base/common/async.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { DisposableStore, dispose, IDisposable } from '../../../../base/common/lifecycle.js';
+import './media/review.css';
+import { ICodeEditor, IEditorMouseEvent, isCodeEditor, isDiffEditor } from '../../../../editor/browser/editorBrowser.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { IRange, Range } from '../../../../editor/common/core/range.js';
+import { EditorType, IDiffEditor, IEditor, IEditorContribution, IModelChangedEvent } from '../../../../editor/common/editorCommon.js';
+import { IModelDecorationOptions, IModelDeltaDecoration } from '../../../../editor/common/model.js';
+import { ModelDecorationOptions, TextModel } from '../../../../editor/common/model/textModel.js';
+import * as languages from '../../../../editor/common/languages.js';
+import * as nls from '../../../../nls.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IQuickInputService, IQuickPickItem, QuickPickInput } from '../../../../platform/quickinput/common/quickInput.js';
+import { CommentGlyphWidget } from './commentGlyphWidget.js';
+import { ICommentInfo, ICommentService } from './commentService.js';
+import { CommentWidgetFocus, isMouseUpEventDragFromMouseDown, parseMouseDownInfoFromEvent, ReviewZoneWidget } from './commentThreadZoneWidget.js';
+import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } from '../../../services/editor/common/editorService.js';
+import { EmbeddedCodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/embeddedCodeEditorWidget.js';
+import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { COMMENTS_VIEW_ID } from './commentsTreeViewer.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { COMMENTS_SECTION, ICommentsConfiguration } from '../common/commentsConfiguration.js';
+import { COMMENTEDITOR_DECORATION_KEY } from './commentReply.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { CommentThreadRangeDecorator } from './commentThreadRangeDecorator.js';
+import { ICursorSelectionChangedEvent } from '../../../../editor/common/cursorEvents.js';
+import { CommentsPanel } from './commentsView.js';
+import { status } from '../../../../base/browser/ui/aria/aria.js';
+import { CommentContextKeys } from '../common/commentContextKeys.js';
+import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
+import { AccessibilityCommandId } from '../../accessibility/common/accessibilityCommands.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { threadHasMeaningfulComments } from './commentsModel.js';
 
 export const ID = 'editor.contrib.review';
 
@@ -367,6 +368,34 @@ class CommentingRangeDecorator {
 	}
 }
 
+/**
+* Navigate to the next or previous comment in the current thread.
+* @param type
+*/
+export function moveToNextCommentInThread(commentInfo: { thread: languages.CommentThread<IRange>; comment?: languages.Comment } | undefined, type: 'next' | 'previous') {
+	if (!commentInfo?.comment || !commentInfo?.thread?.comments) {
+		return;
+	}
+	const currentIndex = commentInfo.thread.comments?.indexOf(commentInfo.comment);
+	if (currentIndex === undefined || currentIndex < 0) {
+		return;
+	}
+	if (type === 'previous' && currentIndex === 0) {
+		return;
+	}
+	if (type === 'next' && currentIndex === commentInfo.thread.comments.length - 1) {
+		return;
+	}
+	const comment = commentInfo.thread.comments?.[type === 'previous' ? currentIndex - 1 : currentIndex + 1];
+	if (!comment) {
+		return;
+	}
+	return {
+		...commentInfo,
+		comment,
+	};
+}
+
 export function revealCommentThread(commentService: ICommentService, editorService: IEditorService, uriIdentityService: IUriIdentityService,
 	commentThread: languages.CommentThread<IRange>, comment: languages.Comment | undefined, focusReply?: boolean, pinned?: boolean, preserveFocus?: boolean, sideBySide?: boolean): void {
 	if (!commentThread.resource) {
@@ -440,6 +469,7 @@ export class CommentController implements IEditorContribution {
 	private _inProcessContinueOnComments: Map<string, languages.PendingCommentThread[]> = new Map();
 	private _editorDisposables: IDisposable[] = [];
 	private _activeCursorHasCommentingRange: IContextKey<boolean>;
+	private _activeCursorHasComment: IContextKey<boolean>;
 	private _activeEditorHasCommentingRange: IContextKey<boolean>;
 	private _hasRespondedToEditorChange: boolean = false;
 
@@ -463,6 +493,7 @@ export class CommentController implements IEditorContribution {
 		this._pendingEditsCache = {};
 		this._computePromise = null;
 		this._activeCursorHasCommentingRange = CommentContextKeys.activeCursorHasCommentingRange.bindTo(contextKeyService);
+		this._activeCursorHasComment = CommentContextKeys.activeCursorHasComment.bindTo(contextKeyService);
 		this._activeEditorHasCommentingRange = CommentContextKeys.activeEditorHasCommentingRange.bindTo(contextKeyService);
 
 		if (editor instanceof EmbeddedCodeEditorWidget) {
@@ -604,7 +635,11 @@ export class CommentController implements IEditorContribution {
 	}
 
 	private onEditorChangeCursorPosition(e: Position | null) {
-		const decorations = e ? this.editor?.getDecorationsInRange(Range.fromPositions(e, { column: -1, lineNumber: e.lineNumber })) : undefined;
+		if (!e) {
+			return;
+		}
+		const range = Range.fromPositions(e, { column: -1, lineNumber: e.lineNumber });
+		const decorations = this.editor?.getDecorationsInRange(range);
 		let hasCommentingRange = false;
 		if (decorations) {
 			for (const decoration of decorations) {
@@ -618,6 +653,7 @@ export class CommentController implements IEditorContribution {
 			}
 		}
 		this._activeCursorHasCommentingRange.set(hasCommentingRange);
+		this._activeCursorHasComment.set(this.getCommentsAtLine(range).length > 0);
 	}
 
 	private isEditorInlineOriginal(testEditor: ICodeEditor): boolean {
@@ -722,11 +758,11 @@ export class CommentController implements IEditorContribution {
 		}
 	}
 
-	public nextCommentThread(): void {
-		this._findNearestCommentThread();
+	public nextCommentThread(focusThread: boolean): void {
+		this._findNearestCommentThread(focusThread);
 	}
 
-	private _findNearestCommentThread(reverse?: boolean): void {
+	private _findNearestCommentThread(focusThread: boolean, reverse?: boolean): void {
 		if (!this._commentWidgets.length || !this.editor?.hasModel()) {
 			return;
 		}
@@ -782,18 +818,15 @@ export class CommentController implements IEditorContribution {
 			return false;
 		});
 
-		let nextWidget: ReviewZoneWidget;
-		if (idx === this._commentWidgets.length) {
-			nextWidget = this._commentWidgets[0];
-		} else {
-			nextWidget = sortedWidgets[idx];
+		const nextWidget: ReviewZoneWidget | undefined = sortedWidgets[idx];
+		if (nextWidget !== undefined) {
+			this.editor.setSelection(nextWidget.commentThread.range ?? new Range(1, 1, 1, 1));
+			nextWidget.reveal(undefined, focusThread ? CommentWidgetFocus.Widget : CommentWidgetFocus.None);
 		}
-		this.editor.setSelection(nextWidget.commentThread.range ?? new Range(1, 1, 1, 1));
-		nextWidget.reveal(undefined, CommentWidgetFocus.Widget);
 	}
 
-	public previousCommentThread(): void {
-		this._findNearestCommentThread(true);
+	public previousCommentThread(focusThread: boolean): void {
+		this._findNearestCommentThread(focusThread, true);
 	}
 
 	private _findNearestCommentingRange(reverse?: boolean): void {
@@ -1015,7 +1048,7 @@ export class CommentController implements IEditorContribution {
 	}
 
 	private async openCommentsView(thread: languages.CommentThread) {
-		if (thread.comments && (thread.comments.length > 0)) {
+		if (thread.comments && (thread.comments.length > 0) && threadHasMeaningfulComments(thread)) {
 			const openViewState = this.configurationService.getValue<ICommentsConfiguration>(COMMENTS_SECTION).openView;
 			if (openViewState === 'file') {
 				return this.viewsService.openView(COMMENTS_VIEW_ID);
@@ -1088,16 +1121,20 @@ export class CommentController implements IEditorContribution {
 		}
 	}
 
+	public getCommentsAtLine(commentRange: Range | undefined): ReviewZoneWidget[] {
+		return this._commentWidgets.filter(widget => widget.getGlyphPosition() === (commentRange ? commentRange.endLineNumber : 0));
+	}
+
 	public async addOrToggleCommentAtLine(commentRange: Range | undefined, e: IEditorMouseEvent | undefined): Promise<void> {
 		// If an add is already in progress, queue the next add and process it after the current one finishes to
 		// prevent empty comment threads from being added to the same line.
 		if (!this._addInProgress) {
 			this._addInProgress = true;
 			// The widget's position is undefined until the widget has been displayed, so rely on the glyph position instead
-			const existingCommentsAtLine = this._commentWidgets.filter(widget => widget.getGlyphPosition() === (commentRange ? commentRange.endLineNumber : 0));
+			const existingCommentsAtLine = this.getCommentsAtLine(commentRange);
 			if (existingCommentsAtLine.length) {
 				const allExpanded = existingCommentsAtLine.every(widget => widget.expanded);
-				existingCommentsAtLine.forEach(allExpanded ? widget => widget.collapse() : widget => widget.expand());
+				existingCommentsAtLine.forEach(allExpanded ? widget => widget.collapse() : widget => widget.expand(true));
 				this.processNextThreadToAdd();
 				return;
 			} else {
diff --git a/src/vs/workbench/contrib/comments/browser/commentsEditorContribution.ts b/src/vs/workbench/contrib/comments/browser/commentsEditorContribution.ts
index 896d352efe9..7574e10e007 100644
--- a/src/vs/workbench/contrib/comments/browser/commentsEditorContribution.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentsEditorContribution.ts
@@ -3,31 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import 'vs/css!./media/review';
-import { IActiveCodeEditor, isCodeEditor, isDiffEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import * as nls from 'vs/nls';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ICommentService } from 'vs/workbench/contrib/comments/browser/commentService';
-import { ctxCommentEditorFocused, SimpleCommentEditor } from 'vs/workbench/contrib/comments/browser/simpleCommentEditor';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { CommentController, ID } from 'vs/workbench/contrib/comments/browser/commentsController';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { CommentContextKeys } from 'vs/workbench/contrib/comments/common/commentContextKeys';
-import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from 'vs/platform/accessibility/common/accessibility';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { accessibilityHelpIsShown, accessibleViewCurrentProviderId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { CommentCommandId } from 'vs/workbench/contrib/comments/common/commentCommandIds';
-import { registerWorkbenchContribution2, WorkbenchPhase } from 'vs/workbench/common/contributions';
-import { CommentsInputContentProvider } from 'vs/workbench/contrib/comments/browser/commentsInputContentProvider';
-import { AccessibleViewProviderId } from 'vs/platform/accessibility/browser/accessibleView';
+import { KeyChord, KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import './media/review.css';
+import { IActiveCodeEditor, isCodeEditor, isDiffEditor } from '../../../../editor/browser/editorBrowser.js';
+import { EditorContributionInstantiation, registerEditorContribution } from '../../../../editor/browser/editorExtensions.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import * as nls from '../../../../nls.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ICommentService } from './commentService.js';
+import { ctxCommentEditorFocused, SimpleCommentEditor } from './simpleCommentEditor.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
+import { CommentController, ID } from './commentsController.js';
+import { IRange, Range } from '../../../../editor/common/core/range.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { CommentContextKeys } from '../common/commentContextKeys.js';
+import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from '../../../../platform/accessibility/common/accessibility.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { accessibilityHelpIsShown, accessibleViewCurrentProviderId } from '../../accessibility/browser/accessibilityConfiguration.js';
+import { CommentCommandId } from '../common/commentCommandIds.js';
+import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
+import { CommentsInputContentProvider } from './commentsInputContentProvider.js';
+import { AccessibleViewProviderId } from '../../../../platform/accessibility/browser/accessibleView.js';
+import { CommentWidgetFocus } from './commentThreadZoneWidget.js';
 
 registerEditorContribution(ID, CommentController, EditorContributionInstantiation.AfterFirstRender);
 registerWorkbenchContribution2(CommentsInputContentProvider.ID, CommentsInputContentProvider, WorkbenchPhase.BlockRestore);
@@ -44,7 +44,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 		if (!controller) {
 			return Promise.resolve();
 		}
-		controller.nextCommentThread();
+		controller.nextCommentThread(true);
 	},
 	weight: KeybindingWeight.EditorContrib,
 	primary: KeyMod.Alt | KeyCode.F9,
@@ -62,97 +62,220 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 		if (!controller) {
 			return Promise.resolve();
 		}
-		controller.previousCommentThread();
+		controller.previousCommentThread(true);
 	},
 	weight: KeybindingWeight.EditorContrib,
 	primary: KeyMod.Shift | KeyMod.Alt | KeyCode.F9
 });
 
-KeybindingsRegistry.registerCommandAndKeybindingRule({
-	id: CommentCommandId.NextRange,
-	handler: async (accessor, args?: { range: IRange; fileComment: boolean }) => {
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: CommentCommandId.NextCommentedRange,
+			title: {
+				value: nls.localize('comments.NextCommentedRange', "Go to Next Commented Range"),
+				original: 'Go to Next Commented Range'
+			},
+			category: {
+				value: nls.localize('commentsCategory', "Comments"),
+				original: 'Comments'
+			},
+			menu: [{
+				id: MenuId.CommandPalette,
+				when: CommentContextKeys.activeEditorHasCommentingRange
+			}],
+			keybinding: {
+				primary: KeyMod.Alt | KeyCode.F10,
+				weight: KeybindingWeight.EditorContrib,
+				when: CommentContextKeys.activeEditorHasCommentingRange
+			}
+		});
+	}
+	override run(accessor: ServicesAccessor, ...args: any[]): void {
 		const activeEditor = getActiveEditor(accessor);
 		if (!activeEditor) {
-			return Promise.resolve();
+			return;
 		}
 
 		const controller = CommentController.get(activeEditor);
 		if (!controller) {
-			return Promise.resolve();
+			return;
+		}
+		controller.nextCommentThread(false);
+	}
+});
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: CommentCommandId.PreviousCommentedRange,
+			title: {
+				value: nls.localize('comments.previousCommentedRange', "Go to Previous Commented Range"),
+				original: 'Go to Previous Commented Range'
+			},
+			category: {
+				value: nls.localize('commentsCategory', "Comments"),
+				original: 'Comments'
+			},
+			menu: [{
+				id: MenuId.CommandPalette,
+				when: CommentContextKeys.activeEditorHasCommentingRange
+			}],
+			keybinding: {
+				primary: KeyMod.Shift | KeyMod.Alt | KeyCode.F10,
+				weight: KeybindingWeight.EditorContrib,
+				when: CommentContextKeys.activeEditorHasCommentingRange
+			}
+		});
+	}
+	override run(accessor: ServicesAccessor, ...args: any[]): void {
+		const activeEditor = getActiveEditor(accessor);
+		if (!activeEditor) {
+			return;
+		}
+
+		const controller = CommentController.get(activeEditor);
+		if (!controller) {
+			return;
+		}
+		controller.previousCommentThread(false);
+	}
+});
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: CommentCommandId.NextRange,
+			title: {
+				value: nls.localize('comments.nextCommentingRange', "Go to Next Commenting Range"),
+				original: 'Go to Next Commenting Range'
+			},
+			category: {
+				value: nls.localize('commentsCategory', "Comments"),
+				original: 'Comments'
+			},
+			menu: [{
+				id: MenuId.CommandPalette,
+				when: CommentContextKeys.activeEditorHasCommentingRange
+			}],
+			keybinding: {
+				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.DownArrow),
+				weight: KeybindingWeight.EditorContrib,
+				when: ContextKeyExpr.and(CONTEXT_ACCESSIBILITY_MODE_ENABLED, ContextKeyExpr.or(EditorContextKeys.focus, CommentContextKeys.commentFocused, ContextKeyExpr.and(accessibilityHelpIsShown, accessibleViewCurrentProviderId.isEqualTo(AccessibleViewProviderId.Comments))))
+			}
+		});
+	}
+
+	override run(accessor: ServicesAccessor, args?: { range: IRange; fileComment: boolean }): void {
+		const activeEditor = getActiveEditor(accessor);
+		if (!activeEditor) {
+			return;
+		}
+
+		const controller = CommentController.get(activeEditor);
+		if (!controller) {
+			return;
 		}
 		controller.nextCommentingRange();
-	},
-	when: ContextKeyExpr.and(CONTEXT_ACCESSIBILITY_MODE_ENABLED, ContextKeyExpr.or(EditorContextKeys.focus, CommentContextKeys.commentFocused, ContextKeyExpr.and(accessibilityHelpIsShown, accessibleViewCurrentProviderId.isEqualTo(AccessibleViewProviderId.Comments)))),
-	primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.DownArrow),
-	weight: KeybindingWeight.EditorContrib
+	}
 });
 
-MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
-	command: {
-		id: CommentCommandId.NextRange,
-		title: nls.localize('comments.nextCommentingRange', "Go to Next Commenting Range"),
-		category: 'Comments',
-	},
-	when: CommentContextKeys.activeEditorHasCommentingRange
-});
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: CommentCommandId.PreviousRange,
+			title: {
+				value: nls.localize('comments.previousCommentingRange', "Go to Previous Commenting Range"),
+				original: 'Go to Previous Commenting Range'
+			},
+			category: {
+				value: nls.localize('commentsCategory', "Comments"),
+				original: 'Comments'
+			},
+			menu: [{
+				id: MenuId.CommandPalette,
+				when: CommentContextKeys.activeEditorHasCommentingRange
+			}],
+			keybinding: {
+				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.UpArrow),
+				weight: KeybindingWeight.EditorContrib,
+				when: ContextKeyExpr.and(CONTEXT_ACCESSIBILITY_MODE_ENABLED, ContextKeyExpr.or(EditorContextKeys.focus, CommentContextKeys.commentFocused, ContextKeyExpr.and(accessibilityHelpIsShown, accessibleViewCurrentProviderId.isEqualTo(AccessibleViewProviderId.Comments))))
+			}
+		});
+	}
 
-KeybindingsRegistry.registerCommandAndKeybindingRule({
-	id: CommentCommandId.PreviousRange,
-	handler: async (accessor, args?: { range: IRange; fileComment: boolean }) => {
+	override async run(accessor: ServicesAccessor, ...args: any[]): Promise<void> {
 		const activeEditor = getActiveEditor(accessor);
 		if (!activeEditor) {
-			return Promise.resolve();
+			return;
 		}
 
 		const controller = CommentController.get(activeEditor);
 		if (!controller) {
-			return Promise.resolve();
+			return;
 		}
 		controller.previousCommentingRange();
-	},
-	when: ContextKeyExpr.and(CONTEXT_ACCESSIBILITY_MODE_ENABLED, ContextKeyExpr.or(EditorContextKeys.focus, CommentContextKeys.commentFocused, ContextKeyExpr.and(accessibilityHelpIsShown, accessibleViewCurrentProviderId.isEqualTo(AccessibleViewProviderId.Comments)))),
-	primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.UpArrow),
-	weight: KeybindingWeight.EditorContrib
+	}
 });
 
-MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
-	command: {
-		id: CommentCommandId.PreviousRange,
-		title: nls.localize('comments.previousCommentingRange', "Go to Previous Commenting Range"),
-		category: 'Comments',
-	},
-	when: CommentContextKeys.activeEditorHasCommentingRange
-});
-
-CommandsRegistry.registerCommand({
-	id: CommentCommandId.ToggleCommenting,
-	handler: (accessor) => {
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: CommentCommandId.ToggleCommenting,
+			title: {
+				value: nls.localize('comments.toggleCommenting', "Toggle Editor Commenting"),
+				original: 'Toggle Editor Commenting'
+			},
+			category: {
+				value: nls.localize('commentsCategory', "Comments"),
+				original: 'Comments'
+			},
+			menu: [{
+				id: MenuId.CommandPalette,
+				when: CommentContextKeys.WorkspaceHasCommenting
+			}]
+		});
+	}
+	override run(accessor: ServicesAccessor, ...args: any[]): void {
 		const commentService = accessor.get(ICommentService);
 		const enable = commentService.isCommentingEnabled;
 		commentService.enableCommenting(!enable);
 	}
 });
 
-MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
-	command: {
-		id: CommentCommandId.ToggleCommenting,
-		title: nls.localize('comments.toggleCommenting', "Toggle Editor Commenting"),
-		category: 'Comments',
-	},
-	when: CommentContextKeys.WorkspaceHasCommenting
-});
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: CommentCommandId.Add,
+			title: {
+				value: nls.localize('comments.addCommand', "Add Comment on Current Selection"),
+				original: 'Add Comment on Current Selection'
+			},
+			category: {
+				value: nls.localize('commentsCategory', "Comments"),
+				original: 'Comments'
+			},
+			menu: [{
+				id: MenuId.CommandPalette,
+				when: CommentContextKeys.activeCursorHasCommentingRange
+			}],
+			keybinding: {
+				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyC),
+				weight: KeybindingWeight.EditorContrib,
+				when: CommentContextKeys.activeCursorHasCommentingRange
+			}
+		});
+	}
 
-KeybindingsRegistry.registerCommandAndKeybindingRule({
-	id: CommentCommandId.Add,
-	handler: async (accessor, args?: { range: IRange; fileComment: boolean }) => {
+	override async run(accessor: ServicesAccessor, args?: { range: IRange; fileComment: boolean }): Promise<void> {
 		const activeEditor = getActiveEditor(accessor);
 		if (!activeEditor) {
-			return Promise.resolve();
+			return;
 		}
 
 		const controller = CommentController.get(activeEditor);
 		if (!controller) {
-			return Promise.resolve();
+			return;
 		}
 
 		const position = args?.range ? new Range(args.range.startLineNumber, args.range.startLineNumber, args.range.endLineNumber, args.range.endColumn)
@@ -161,68 +284,123 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 		try {
 			await controller.addOrToggleCommentAtLine(position, undefined);
 		} catch (e) {
-			notificationService.error(nls.localize('comments.addCommand.error', "The cursor must be within a commenting range to add a comment")); // TODO: Once we have commands to go to next commenting range they should be included as buttons in the error.
+			notificationService.error(nls.localize('comments.addCommand.error', "The cursor must be within a commenting range to add a comment"));
 		}
-	},
-	weight: KeybindingWeight.EditorContrib,
-	primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyC),
-});
-
-MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
-	command: {
-		id: CommentCommandId.Add,
-		title: nls.localize('comments.addCommand', "Add Comment on Current Selection"),
-		category: 'Comments'
-	},
-	when: CommentContextKeys.activeCursorHasCommentingRange
-});
-
-CommandsRegistry.registerCommand({
-	id: CommentCommandId.CollapseAll,
-	handler: (accessor) => {
-		return getActiveController(accessor)?.collapseAll();
 	}
 });
 
-MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
-	command: {
-		id: CommentCommandId.CollapseAll,
-		title: nls.localize('comments.collapseAll', "Collapse All Comments"),
-		category: 'Comments'
-	},
-	when: CommentContextKeys.WorkspaceHasCommenting
-});
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: CommentCommandId.FocusCommentOnCurrentLine,
+			title: {
+				value: nls.localize('comments.focusCommentOnCurrentLine', "Focus Comment on Current Line"),
+				original: 'Focus Comment on Current Line'
+			},
+			category: {
+				value: nls.localize('commentsCategory', "Comments"),
+				original: 'Comments'
+			},
+			f1: true,
+			precondition: CommentContextKeys.activeCursorHasComment,
+		});
+	}
+	override async run(accessor: ServicesAccessor, ...args: any[]): Promise<void> {
+		const activeEditor = getActiveEditor(accessor);
+		if (!activeEditor) {
+			return;
+		}
 
-CommandsRegistry.registerCommand({
-	id: CommentCommandId.ExpandAll,
-	handler: (accessor) => {
-		return getActiveController(accessor)?.expandAll();
+		const controller = CommentController.get(activeEditor);
+		if (!controller) {
+			return;
+		}
+		const position = activeEditor.getSelection();
+		const notificationService = accessor.get(INotificationService);
+		let error = false;
+		try {
+			const commentAtLine = controller.getCommentsAtLine(position);
+			if (commentAtLine.length === 0) {
+				error = true;
+			} else {
+				await controller.revealCommentThread(commentAtLine[0].commentThread.threadId, undefined, false, CommentWidgetFocus.Widget);
+			}
+		} catch (e) {
+			error = true;
+		}
+		if (error) {
+			notificationService.error(nls.localize('comments.focusCommand.error', "The cursor must be on a line with a comment to focus the comment"));
+		}
 	}
 });
 
-MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
-	command: {
-		id: CommentCommandId.ExpandAll,
-		title: nls.localize('comments.expandAll', "Expand All Comments"),
-		category: 'Comments'
-	},
-	when: CommentContextKeys.WorkspaceHasCommenting
-});
-
-CommandsRegistry.registerCommand({
-	id: CommentCommandId.ExpandUnresolved,
-	handler: (accessor) => {
-		return getActiveController(accessor)?.expandUnresolved();
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: CommentCommandId.CollapseAll,
+			title: {
+				value: nls.localize('comments.collapseAll', "Collapse All Comments"),
+				original: 'Collapse All Comments'
+			},
+			category: {
+				value: nls.localize('commentsCategory', "Comments"),
+				original: 'Comments'
+			},
+			menu: [{
+				id: MenuId.CommandPalette,
+				when: CommentContextKeys.WorkspaceHasCommenting
+			}]
+		});
+	}
+	override run(accessor: ServicesAccessor, ...args: any[]): void {
+		getActiveController(accessor)?.collapseAll();
 	}
 });
 
-MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
-	command: {
-		id: CommentCommandId.ExpandUnresolved,
-		title: nls.localize('comments.expandUnresolved', "Expand Unresolved Comments"),
-		category: 'Comments'
-	},
-	when: CommentContextKeys.WorkspaceHasCommenting
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: CommentCommandId.ExpandAll,
+			title: {
+				value: nls.localize('comments.expandAll', "Expand All Comments"),
+				original: 'Expand All Comments'
+			},
+			category: {
+				value: nls.localize('commentsCategory', "Comments"),
+				original: 'Comments'
+			},
+			menu: [{
+				id: MenuId.CommandPalette,
+				when: CommentContextKeys.WorkspaceHasCommenting
+			}]
+		});
+	}
+	override run(accessor: ServicesAccessor, ...args: any[]): void {
+		getActiveController(accessor)?.expandAll();
+	}
+});
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: CommentCommandId.ExpandUnresolved,
+			title: {
+				value: nls.localize('comments.expandUnresolved', "Expand Unresolved Comments"),
+				original: 'Expand Unresolved Comments'
+			},
+			category: {
+				value: nls.localize('commentsCategory', "Comments"),
+				original: 'Comments'
+			},
+			menu: [{
+				id: MenuId.CommandPalette,
+				when: CommentContextKeys.WorkspaceHasCommenting
+			}]
+		});
+	}
+	override run(accessor: ServicesAccessor, ...args: any[]): void {
+		getActiveController(accessor)?.expandUnresolved();
+	}
 });
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
diff --git a/src/vs/workbench/contrib/comments/browser/commentsFilterOptions.ts b/src/vs/workbench/contrib/comments/browser/commentsFilterOptions.ts
index 6f610766a4b..16bb6756416 100644
--- a/src/vs/workbench/contrib/comments/browser/commentsFilterOptions.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentsFilterOptions.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IFilter, matchesFuzzy, matchesFuzzy2 } from 'vs/base/common/filters';
-import * as strings from 'vs/base/common/strings';
+import { IFilter, matchesFuzzy, matchesFuzzy2 } from '../../../../base/common/filters.js';
+import * as strings from '../../../../base/common/strings.js';
 
 export class FilterOptions {
 
diff --git a/src/vs/workbench/contrib/comments/browser/commentsInputContentProvider.ts b/src/vs/workbench/contrib/comments/browser/commentsInputContentProvider.ts
index 7e7ee8ad821..58dc41ddd29 100644
--- a/src/vs/workbench/contrib/comments/browser/commentsInputContentProvider.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentsInputContentProvider.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { IEditorContribution, ScrollType } from 'vs/editor/common/editorCommon';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ITextModel } from 'vs/editor/common/model';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ITextModelContentProvider, ITextModelService } from 'vs/editor/common/services/resolverService';
-import { ITextResourceEditorInput } from 'vs/platform/editor/common/editor';
-import { applyTextEditorOptions } from 'vs/workbench/common/editor/editorOptions';
-import { SimpleCommentEditor } from 'vs/workbench/contrib/comments/browser/simpleCommentEditor';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { IEditorContribution, ScrollType } from '../../../../editor/common/editorCommon.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ITextModelContentProvider, ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { ITextResourceEditorInput } from '../../../../platform/editor/common/editor.js';
+import { applyTextEditorOptions } from '../../../common/editor/editorOptions.js';
+import { SimpleCommentEditor } from './simpleCommentEditor.js';
 
 export class CommentsInputContentProvider extends Disposable implements ITextModelContentProvider, IEditorContribution {
 
diff --git a/src/vs/workbench/contrib/comments/browser/commentsModel.ts b/src/vs/workbench/contrib/comments/browser/commentsModel.ts
index d0701d5f344..909955ccd20 100644
--- a/src/vs/workbench/contrib/comments/browser/commentsModel.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentsModel.ts
@@ -3,12 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { groupBy } from 'vs/base/common/arrays';
-import { URI } from 'vs/base/common/uri';
-import { CommentThread } from 'vs/editor/common/languages';
-import { localize } from 'vs/nls';
-import { ResourceWithCommentThreads, ICommentThreadChangedEvent } from 'vs/workbench/contrib/comments/common/commentModel';
-import { Disposable } from 'vs/base/common/lifecycle';
+import { groupBy } from '../../../../base/common/arrays.js';
+import { URI } from '../../../../base/common/uri.js';
+import { CommentThread } from '../../../../editor/common/languages.js';
+import { localize } from '../../../../nls.js';
+import { ResourceWithCommentThreads, ICommentThreadChangedEvent } from '../common/commentModel.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { isMarkdownString } from '../../../../base/common/htmlContent.js';
+
+export function threadHasMeaningfulComments(thread: CommentThread): boolean {
+	return !!thread.comments && !!thread.comments.length && thread.comments.some(comment => isMarkdownString(comment.body) ? comment.body.value.length > 0 : comment.body.length > 0);
+
+}
 
 export interface ICommentsModel {
 	hasCommentThreads(): boolean;
@@ -38,9 +44,6 @@ export class CommentsModel extends Disposable implements ICommentsModel {
 				return resource;
 			}).flat();
 		}).flat();
-		this._resourceCommentThreads.sort((a, b) => {
-			return a.resource.toString() > b.resource.toString() ? 1 : -1;
-		});
 	}
 
 	public setCommentThreads(uniqueOwner: string, owner: string, ownerLabel: string, commentThreads: CommentThread[]): void {
@@ -116,7 +119,14 @@ export class CommentsModel extends Disposable implements ICommentsModel {
 	}
 
 	public hasCommentThreads(): boolean {
-		return !!this._resourceCommentThreads.length;
+		// There's a resource with at least one thread
+		return !!this._resourceCommentThreads.length && this._resourceCommentThreads.some(resource => {
+			// At least one of the threads in the the resource has comments
+			return (resource.commentThreads.length > 0) && resource.commentThreads.some(thread => {
+				// At least one of the comments in the thread is not empty
+				return threadHasMeaningfulComments(thread.thread);
+			});
+		});
 	}
 
 	public getMessage(): string {
diff --git a/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts b/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts
index b527edf7bde..0c58c66d95d 100644
--- a/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts
@@ -3,46 +3,46 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import * as nls from 'vs/nls';
-import { renderMarkdown } from 'vs/base/browser/markdownRenderer';
-import { IDisposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IResourceLabel, ResourceLabels } from 'vs/workbench/browser/labels';
-import { CommentNode, ResourceWithCommentThreads } from 'vs/workbench/contrib/comments/common/commentModel';
-import { ITreeContextMenuEvent, ITreeFilter, ITreeNode, TreeFilterResult, TreeVisibility } from 'vs/base/browser/ui/tree/tree';
-import { IListVirtualDelegate, IListRenderer } from 'vs/base/browser/ui/list/list';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IListService, IWorkbenchAsyncDataTreeOptions, WorkbenchObjectTree } from 'vs/platform/list/browser/listService';
-import { IColorTheme, IThemeService } from 'vs/platform/theme/common/themeService';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { TimestampWidget } from 'vs/workbench/contrib/comments/browser/timestamp';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { commentViewThreadStateColorVar, getCommentThreadStateIconColor } from 'vs/workbench/contrib/comments/browser/commentColors';
-import { CommentThreadApplicability, CommentThreadState } from 'vs/editor/common/languages';
-import { Color } from 'vs/base/common/color';
-import { IMatch } from 'vs/base/common/filters';
-import { FilterOptions } from 'vs/workbench/contrib/comments/browser/commentsFilterOptions';
-import { basename } from 'vs/base/common/resources';
-import { openLinkFromMarkdown } from 'vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
-import { IStyleOverride } from 'vs/platform/theme/browser/defaultStyles';
-import { IListStyles } from 'vs/base/browser/ui/list/listWidget';
-import { ILocalizedString } from 'vs/platform/action/common/action';
-import { CommentsModel } from 'vs/workbench/contrib/comments/browser/commentsModel';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { ActionBar, IActionViewItemProvider } from 'vs/base/browser/ui/actionbar/actionbar';
-import { createActionViewItem, createAndFillInContextMenuActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IMenu, IMenuService, MenuId } from 'vs/platform/actions/common/actions';
-import { IAction } from 'vs/base/common/actions';
-import { MarshalledId } from 'vs/base/common/marshallingIds';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { ActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { MarshalledCommentThread, MarshalledCommentThreadInternal } from 'vs/workbench/common/comments';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import * as dom from '../../../../base/browser/dom.js';
+import * as nls from '../../../../nls.js';
+import { renderMarkdown } from '../../../../base/browser/markdownRenderer.js';
+import { IDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IResourceLabel, ResourceLabels } from '../../../browser/labels.js';
+import { CommentNode, ResourceWithCommentThreads } from '../common/commentModel.js';
+import { ITreeContextMenuEvent, ITreeFilter, ITreeNode, TreeFilterResult, TreeVisibility } from '../../../../base/browser/ui/tree/tree.js';
+import { IListVirtualDelegate, IListRenderer } from '../../../../base/browser/ui/list/list.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IListService, IWorkbenchAsyncDataTreeOptions, WorkbenchObjectTree } from '../../../../platform/list/browser/listService.js';
+import { IColorTheme, IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { TimestampWidget } from './timestamp.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { IMarkdownString } from '../../../../base/common/htmlContent.js';
+import { commentViewThreadStateColorVar, getCommentThreadStateIconColor } from './commentColors.js';
+import { CommentThreadApplicability, CommentThreadState } from '../../../../editor/common/languages.js';
+import { Color } from '../../../../base/common/color.js';
+import { IMatch } from '../../../../base/common/filters.js';
+import { FilterOptions } from './commentsFilterOptions.js';
+import { basename } from '../../../../base/common/resources.js';
+import { openLinkFromMarkdown } from '../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import { IStyleOverride } from '../../../../platform/theme/browser/defaultStyles.js';
+import { IListStyles } from '../../../../base/browser/ui/list/listWidget.js';
+import { ILocalizedString } from '../../../../platform/action/common/action.js';
+import { CommentsModel } from './commentsModel.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { ActionBar, IActionViewItemProvider } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { createActionViewItem, createAndFillInContextMenuActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IMenuService, MenuId } from '../../../../platform/actions/common/actions.js';
+import { IAction } from '../../../../base/common/actions.js';
+import { MarshalledId } from '../../../../base/common/marshallingIds.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { ActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { MarshalledCommentThread, MarshalledCommentThreadInternal } from '../../../common/comments.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 
 export const COMMENTS_VIEW_ID = 'workbench.panel.comments';
 export const COMMENTS_VIEW_STORAGE_ID = 'Comments';
@@ -76,7 +76,7 @@ interface ICommentThreadTemplateData {
 	disposables: IDisposable[];
 }
 
-class CommentsModelVirualDelegate implements IListVirtualDelegate<ResourceWithCommentThreads | CommentNode> {
+class CommentsModelVirtualDelegate implements IListVirtualDelegate<ResourceWithCommentThreads | CommentNode> {
 	private static readonly RESOURCE_ID = 'resource-with-comments';
 	private static readonly COMMENT_ID = 'comment-node';
 
@@ -90,10 +90,10 @@ class CommentsModelVirualDelegate implements IListVirtualDelegate<ResourceWithCo
 
 	public getTemplateId(element: any): string {
 		if (element instanceof ResourceWithCommentThreads) {
-			return CommentsModelVirualDelegate.RESOURCE_ID;
+			return CommentsModelVirtualDelegate.RESOURCE_ID;
 		}
 		if (element instanceof CommentNode) {
-			return CommentsModelVirualDelegate.COMMENT_ID;
+			return CommentsModelVirtualDelegate.COMMENT_ID;
 		}
 
 		return '';
@@ -142,9 +142,9 @@ export class CommentsMenus implements IDisposable {
 		@IMenuService private readonly menuService: IMenuService
 	) { }
 
-	getResourceActions(element: CommentNode): { menu?: IMenu; actions: IAction[] } {
+	getResourceActions(element: CommentNode): { actions: IAction[] } {
 		const actions = this.getActions(MenuId.CommentsViewThreadActions, element);
-		return { menu: actions.menu, actions: actions.primary };
+		return { actions: actions.primary };
 	}
 
 	getResourceContextActions(element: CommentNode): IAction[] {
@@ -155,7 +155,7 @@ export class CommentsMenus implements IDisposable {
 		this.contextKeyService = service;
 	}
 
-	private getActions(menuId: MenuId, element: CommentNode): { menu?: IMenu; primary: IAction[]; secondary: IAction[] } {
+	private getActions(menuId: MenuId, element: CommentNode): { primary: IAction[]; secondary: IAction[] } {
 		if (!this.contextKeyService) {
 			return { primary: [], secondary: [] };
 		}
@@ -168,12 +168,11 @@ export class CommentsMenus implements IDisposable {
 		];
 		const contextKeyService = this.contextKeyService.createOverlay(overlay);
 
-		const menu = this.menuService.createMenu(menuId, contextKeyService);
+		const menu = this.menuService.getMenuActions(menuId, contextKeyService, { shouldForwardArgs: true });
 		const primary: IAction[] = [];
 		const secondary: IAction[] = [];
 		const result = { primary, secondary, menu };
-		createAndFillInContextMenuActions(menu, { shouldForwardArgs: true }, result, 'inline');
-		menu.dispose();
+		createAndFillInContextMenuActions(menu, result, 'inline');
 
 		return result;
 	}
@@ -256,6 +255,9 @@ export class CommentNodeRenderer implements IListRenderer<ITreeNode<CommentNode>
 			textDescription.textContent = image.alt ? nls.localize('imageWithLabel', "Image: {0}", image.alt) : nls.localize('image', "Image");
 			image.parentNode!.replaceChild(textDescription, image);
 		}
+		while ((renderedComment.element.children.length > 1) && (renderedComment.element.firstElementChild?.tagName === 'HR')) {
+			renderedComment.element.removeChild(renderedComment.element.firstElementChild);
+		}
 		return renderedComment;
 	}
 
@@ -451,7 +453,7 @@ export class CommentsList extends WorkbenchObjectTree<CommentsModel | ResourceWi
 		@IContextMenuService private readonly contextMenuService: IContextMenuService,
 		@IKeybindingService private readonly keybindingService: IKeybindingService
 	) {
-		const delegate = new CommentsModelVirualDelegate();
+		const delegate = new CommentsModelVirtualDelegate();
 		const actionViewItemProvider = createActionViewItem.bind(undefined, instantiationService);
 		const menus = instantiationService.createInstance(CommentsMenus);
 		menus.setContextKeyService(contextKeyService);
@@ -485,6 +487,7 @@ export class CommentsList extends WorkbenchObjectTree<CommentsModel | ResourceWi
 				collapseByDefault: false,
 				overrideStyles: options.overrideStyles,
 				filter: options.filter,
+				sorter: options.sorter,
 				findWidgetEnabled: false,
 				multipleSelectionSupport: false,
 			},
diff --git a/src/vs/workbench/contrib/comments/browser/commentsView.ts b/src/vs/workbench/contrib/comments/browser/commentsView.ts
index 671449be16a..f0a12bb0f02 100644
--- a/src/vs/workbench/contrib/comments/browser/commentsView.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentsView.ts
@@ -3,52 +3,64 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/panel';
-import * as nls from 'vs/nls';
-import * as dom from 'vs/base/browser/dom';
-import { basename } from 'vs/base/common/resources';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { CommentNode, ICommentThreadChangedEvent, ResourceWithCommentThreads } from 'vs/workbench/contrib/comments/common/commentModel';
-import { ICommentService, IWorkspaceCommentThreadsEvent } from 'vs/workbench/contrib/comments/browser/commentService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ResourceLabels } from 'vs/workbench/browser/labels';
-import { CommentsList, COMMENTS_VIEW_TITLE, Filter } from 'vs/workbench/contrib/comments/browser/commentsTreeViewer';
-import { IViewPaneOptions, FilterViewPane } from 'vs/workbench/browser/parts/views/viewPane';
-import { IViewDescriptorService } from 'vs/workbench/common/views';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { CommentsViewFilterFocusContextKey, ICommentsView } from 'vs/workbench/contrib/comments/browser/comments';
-import { CommentsFilters, CommentsFiltersChangeEvent } from 'vs/workbench/contrib/comments/browser/commentsViewActions';
-import { Memento, MementoObject } from 'vs/workbench/common/memento';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { FilterOptions } from 'vs/workbench/contrib/comments/browser/commentsFilterOptions';
-import { CommentThreadApplicability, CommentThreadState } from 'vs/editor/common/languages';
-import { ITreeElement } from 'vs/base/browser/ui/tree/tree';
-import { Iterable } from 'vs/base/common/iterator';
-import { revealCommentThread } from 'vs/workbench/contrib/comments/browser/commentsController';
-import { registerNavigableContainer } from 'vs/workbench/browser/actions/widgetNavigationCommands';
-import { CommentsModel, ICommentsModel } from 'vs/workbench/contrib/comments/browser/commentsModel';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { AccessibleViewAction } from 'vs/workbench/contrib/accessibility/browser/accessibleViewActions';
+import './media/panel.css';
+import * as nls from '../../../../nls.js';
+import * as dom from '../../../../base/browser/dom.js';
+import { basename } from '../../../../base/common/resources.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { CommentNode, ICommentThreadChangedEvent, ResourceWithCommentThreads } from '../common/commentModel.js';
+import { ICommentService, IWorkspaceCommentThreadsEvent } from './commentService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { ResourceLabels } from '../../../browser/labels.js';
+import { CommentsList, COMMENTS_VIEW_TITLE, Filter } from './commentsTreeViewer.js';
+import { IViewPaneOptions, FilterViewPane } from '../../../browser/parts/views/viewPane.js';
+import { IViewDescriptorService } from '../../../common/views.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { CommentsViewFilterFocusContextKey, ICommentsView } from './comments.js';
+import { CommentsFilters, CommentsFiltersChangeEvent, CommentsSortOrder } from './commentsViewActions.js';
+import { Memento, MementoObject } from '../../../common/memento.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { FilterOptions } from './commentsFilterOptions.js';
+import { CommentThreadApplicability, CommentThreadState } from '../../../../editor/common/languages.js';
+import { revealCommentThread } from './commentsController.js';
+import { registerNavigableContainer } from '../../../browser/actions/widgetNavigationCommands.js';
+import { CommentsModel, threadHasMeaningfulComments, type ICommentsModel } from './commentsModel.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
+import { AccessibleViewAction } from '../../accessibility/browser/accessibleViewActions.js';
+import type { ITreeElement } from '../../../../base/browser/ui/tree/tree.js';
+import { IPathService } from '../../../services/path/common/pathService.js';
+import { isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
 
 export const CONTEXT_KEY_HAS_COMMENTS = new RawContextKey<boolean>('commentsView.hasComments', false);
 export const CONTEXT_KEY_SOME_COMMENTS_EXPANDED = new RawContextKey<boolean>('commentsView.someCommentsExpanded', false);
+export const CONTEXT_KEY_COMMENT_FOCUSED = new RawContextKey<boolean>('commentsView.commentFocused', false);
 const VIEW_STORAGE_ID = 'commentsViewState';
 
-function createResourceCommentsIterator(model: ICommentsModel): Iterable<ITreeElement<ResourceWithCommentThreads | CommentNode>> {
-	return Iterable.map(model.resourceCommentThreads, m => {
-		const CommentNodeIt = Iterable.from(m.commentThreads);
-		const children = Iterable.map(CommentNodeIt, r => ({ element: r }));
+type CommentsTreeNode = CommentsModel | ResourceWithCommentThreads | CommentNode;
 
-		return { element: m, children };
-	});
+function createResourceCommentsIterator(model: ICommentsModel): Iterable<ITreeElement<CommentsTreeNode>> {
+	const result: ITreeElement<CommentsTreeNode>[] = [];
+
+	for (const m of model.resourceCommentThreads) {
+		const children = [];
+		for (const r of m.commentThreads) {
+			if (threadHasMeaningfulComments(r.thread)) {
+				children.push({ element: r });
+			}
+		}
+		if (children.length > 0) {
+			result.push({ element: m, children });
+		}
+	}
+	return result;
 }
 
 export class CommentsPanel extends FilterViewPane implements ICommentsView {
@@ -59,6 +71,7 @@ export class CommentsPanel extends FilterViewPane implements ICommentsView {
 	private totalComments: number = 0;
 	private readonly hasCommentsContextKey: IContextKey<boolean>;
 	private readonly someCommentsExpandedContextKey: IContextKey<boolean>;
+	private readonly commentsFocusedContextKey: IContextKey<boolean>;
 	private readonly filter: Filter;
 	readonly filters: CommentsFilters;
 
@@ -136,7 +149,8 @@ export class CommentsPanel extends FilterViewPane implements ICommentsView {
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IHoverService hoverService: IHoverService,
 		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
-		@IStorageService storageService: IStorageService
+		@IStorageService storageService: IStorageService,
+		@IPathService private readonly pathService: IPathService,
 	) {
 		const stateMemento = new Memento(VIEW_STORAGE_ID, storageService);
 		const viewState = stateMemento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
@@ -152,12 +166,14 @@ export class CommentsPanel extends FilterViewPane implements ICommentsView {
 		}, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
 		this.hasCommentsContextKey = CONTEXT_KEY_HAS_COMMENTS.bindTo(contextKeyService);
 		this.someCommentsExpandedContextKey = CONTEXT_KEY_SOME_COMMENTS_EXPANDED.bindTo(contextKeyService);
+		this.commentsFocusedContextKey = CONTEXT_KEY_COMMENT_FOCUSED.bindTo(contextKeyService);
 		this.stateMemento = stateMemento;
 		this.viewState = viewState;
 
 		this.filters = this._register(new CommentsFilters({
 			showResolved: this.viewState['showResolved'] !== false,
 			showUnresolved: this.viewState['showUnresolved'] !== false,
+			sortBy: this.viewState['sortBy'] ?? CommentsSortOrder.ResourceAscending,
 		}, this.contextKeyService));
 		this.filter = new Filter(new FilterOptions(this.filterWidget.getFilterText(), this.filters.showResolved, this.filters.showUnresolved));
 
@@ -165,6 +181,9 @@ export class CommentsPanel extends FilterViewPane implements ICommentsView {
 			if (event.showResolved || event.showUnresolved) {
 				this.updateFilter();
 			}
+			if (event.sortBy) {
+				this.refresh();
+			}
 		}));
 		this._register(this.filterWidget.onDidChangeFilterText(() => this.updateFilter()));
 	}
@@ -174,6 +193,7 @@ export class CommentsPanel extends FilterViewPane implements ICommentsView {
 		this.viewState['filterHistory'] = this.filterWidget.getHistory();
 		this.viewState['showResolved'] = this.filters.showResolved;
 		this.viewState['showUnresolved'] = this.filters.showUnresolved;
+		this.viewState['sortBy'] = this.filters.sortBy;
 		this.stateMemento.saveMemento();
 		super.saveState();
 	}
@@ -267,10 +287,10 @@ export class CommentsPanel extends FilterViewPane implements ICommentsView {
 		}
 	}
 
-	private async renderComments(): Promise<void> {
+	private renderComments(): void {
 		this.treeContainer.classList.toggle('hidden', !this.commentService.commentsModel.hasCommentThreads());
 		this.renderMessage();
-		await this.tree?.setChildren(null, createResourceCommentsIterator(this.commentService.commentsModel));
+		this.tree?.setChildren(null, createResourceCommentsIterator(this.commentService.commentsModel));
 	}
 
 	public collapseAll() {
@@ -324,32 +344,43 @@ export class CommentsPanel extends FilterViewPane implements ICommentsView {
 		}
 		const replyCount = this.getReplyCountAsString(element, forAriaLabel);
 		const replies = this.getRepliesAsString(element, forAriaLabel);
+		const editor = this.editorService.findEditors(element.resource);
+		const codeEditor = this.editorService.activeEditorPane?.getControl();
+		let content;
+		if (element.range && editor?.length && isCodeEditor(codeEditor)) {
+			content = codeEditor.getModel()?.getValueInRange(element.range);
+			if (content) {
+				content = '\nCorresponding code: \n' + content;
+			}
+		}
 		if (element.range) {
 			if (element.threadRelevance === CommentThreadApplicability.Outdated) {
 				return accessibleViewHint + nls.localize('resourceWithCommentLabelOutdated',
-					"Outdated from {0} at line {1} column {2} in {3},{4} comment: {5}",
-					element.comment.userName,
-					element.range.startLineNumber,
-					element.range.startColumn,
-					basename(element.resource),
-					replyCount,
-					(typeof element.comment.body === 'string') ? element.comment.body : element.comment.body.value
-				) + replies;
-			} else {
-				return accessibleViewHint + nls.localize('resourceWithCommentLabel',
-					"{0} at line {1} column {2} in {3},{4} comment: {5}",
+					"Outdated from {0} at line {1} column {2} in {3}{4}\nComment: {5}{6}",
 					element.comment.userName,
 					element.range.startLineNumber,
 					element.range.startColumn,
 					basename(element.resource),
 					replyCount,
 					(typeof element.comment.body === 'string') ? element.comment.body : element.comment.body.value,
+					content,
+				) + replies;
+			} else {
+				return accessibleViewHint + nls.localize('resourceWithCommentLabel',
+					"{0} at line {1} column {2} in {3} {4}\nComment: {5}{6}",
+					element.comment.userName,
+					element.range.startLineNumber,
+					element.range.startColumn,
+					basename(element.resource),
+					replyCount,
+					(typeof element.comment.body === 'string') ? element.comment.body : element.comment.body.value,
+					content,
 				) + replies;
 			}
 		} else {
 			if (element.threadRelevance === CommentThreadApplicability.Outdated) {
 				return accessibleViewHint + nls.localize('resourceWithCommentLabelFileOutdated',
-					"Outdated from {0} in {1},{2} comment: {3}",
+					"Outdated from {0} in {1} {2}\nComment: {3}{4}{5}",
 					element.comment.userName,
 					basename(element.resource),
 					replyCount,
@@ -357,11 +388,12 @@ export class CommentsPanel extends FilterViewPane implements ICommentsView {
 				) + replies;
 			} else {
 				return accessibleViewHint + nls.localize('resourceWithCommentLabelFile',
-					"{0} in {1},{2} comment: {3}",
+					"{0} in {1} {2}\nComment: {3}{4}",
 					element.comment.userName,
 					basename(element.resource),
 					replyCount,
-					(typeof element.comment.body === 'string') ? element.comment.body : element.comment.body.value
+					(typeof element.comment.body === 'string') ? element.comment.body : element.comment.body.value,
+					content
 				) + replies;
 			}
 		}
@@ -388,8 +420,30 @@ export class CommentsPanel extends FilterViewPane implements ICommentsView {
 			overrideStyles: this.getLocationBasedColors().listOverrideStyles,
 			selectionNavigation: true,
 			filter: this.filter,
+			sorter: {
+				compare: (a: CommentsTreeNode, b: CommentsTreeNode) => {
+					if (a instanceof CommentsModel || b instanceof CommentsModel) {
+						return 0;
+					}
+					if (this.filters.sortBy === CommentsSortOrder.UpdatedAtDescending) {
+						return a.lastUpdatedAt > b.lastUpdatedAt ? -1 : 1;
+					} else if (this.filters.sortBy === CommentsSortOrder.ResourceAscending) {
+						if (a instanceof ResourceWithCommentThreads && b instanceof ResourceWithCommentThreads) {
+							const workspaceScheme = this.pathService.defaultUriScheme;
+							if ((a.resource.scheme !== b.resource.scheme) && (a.resource.scheme === workspaceScheme || b.resource.scheme === workspaceScheme)) {
+								// Workspace scheme should always come first
+								return b.resource.scheme === workspaceScheme ? 1 : -1;
+							}
+							return a.resource.toString() > b.resource.toString() ? 1 : -1;
+						} else if (a instanceof CommentNode && b instanceof CommentNode && a.thread.range && b.thread.range) {
+							return a.thread.range?.startLineNumber > b.thread.range?.startLineNumber ? 1 : -1;
+						}
+					}
+					return 0;
+				},
+			},
 			keyboardNavigationLabelProvider: {
-				getKeyboardNavigationLabel: (item: CommentsModel | ResourceWithCommentThreads | CommentNode) => {
+				getKeyboardNavigationLabel: (item: CommentsTreeNode) => {
 					return undefined;
 				}
 			},
@@ -423,6 +477,8 @@ export class CommentsPanel extends FilterViewPane implements ICommentsView {
 		this._register(this.tree.onDidChangeCollapseState(() => {
 			this.updateSomeCommentsExpanded();
 		}));
+		this._register(this.tree.onDidFocus(() => this.commentsFocusedContextKey.set(true)));
+		this._register(this.tree.onDidBlur(() => this.commentsFocusedContextKey.set(false)));
 	}
 
 	private openFile(element: any, pinned?: boolean, preserveFocus?: boolean, sideBySide?: boolean): void {
@@ -444,11 +500,8 @@ export class CommentsPanel extends FilterViewPane implements ICommentsView {
 		}
 		if (this.isVisible()) {
 			this.hasCommentsContextKey.set(this.commentService.commentsModel.hasCommentThreads());
-
-			this.treeContainer.classList.toggle('hidden', !this.commentService.commentsModel.hasCommentThreads());
 			this.cachedFilterStats = undefined;
-			this.renderMessage();
-			this.tree?.setChildren(null, createResourceCommentsIterator(this.commentService.commentsModel));
+			this.renderComments();
 
 			if (this.tree.getSelection().length === 0 && this.commentService.commentsModel.hasCommentThreads()) {
 				const firstComment = this.commentService.commentsModel.resourceCommentThreads[0].commentThreads[0];
diff --git a/src/vs/workbench/contrib/comments/browser/commentsViewActions.ts b/src/vs/workbench/contrib/comments/browser/commentsViewActions.ts
index b850d68ac5c..016ead15476 100644
--- a/src/vs/workbench/contrib/comments/browser/commentsViewActions.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentsViewActions.ts
@@ -3,31 +3,41 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { localize } from 'vs/nls';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ContextKeyExpr, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { Event, Emitter } from 'vs/base/common/event';
-import { CommentsViewFilterFocusContextKey, ICommentsView } from 'vs/workbench/contrib/comments/browser/comments';
-import { registerAction2 } from 'vs/platform/actions/common/actions';
-import { ViewAction } from 'vs/workbench/browser/parts/views/viewPane';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { COMMENTS_VIEW_ID } from 'vs/workbench/contrib/comments/browser/commentsTreeViewer';
-import { FocusedViewContext } from 'vs/workbench/common/contextkeys';
-import { viewFilterSubmenu } from 'vs/workbench/browser/parts/views/viewFilter';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { localize } from '../../../../nls.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { CommentsViewFilterFocusContextKey, ICommentsView } from './comments.js';
+import { MenuId, MenuRegistry, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { ViewAction } from '../../../browser/parts/views/viewPane.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { COMMENTS_VIEW_ID } from './commentsTreeViewer.js';
+import { FocusedViewContext } from '../../../common/contextkeys.js';
+import { viewFilterSubmenu } from '../../../browser/parts/views/viewFilter.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+
+export const enum CommentsSortOrder {
+	ResourceAscending = 'resourceAscending',
+	UpdatedAtDescending = 'updatedAtDescending',
+}
+
 
 const CONTEXT_KEY_SHOW_RESOLVED = new RawContextKey<boolean>('commentsView.showResolvedFilter', true);
 const CONTEXT_KEY_SHOW_UNRESOLVED = new RawContextKey<boolean>('commentsView.showUnResolvedFilter', true);
+const CONTEXT_KEY_SORT_BY = new RawContextKey<CommentsSortOrder>('commentsView.sortBy', CommentsSortOrder.ResourceAscending);
 
 export interface CommentsFiltersChangeEvent {
 	showResolved?: boolean;
 	showUnresolved?: boolean;
+	sortBy?: CommentsSortOrder;
 }
 
 interface CommentsFiltersOptions {
 	showResolved: boolean;
 	showUnresolved: boolean;
+	sortBy: CommentsSortOrder;
 }
 
 export class CommentsFilters extends Disposable {
@@ -39,6 +49,7 @@ export class CommentsFilters extends Disposable {
 		super();
 		this._showResolved.set(options.showResolved);
 		this._showUnresolved.set(options.showUnresolved);
+		this._sortBy.set(options.sortBy);
 	}
 
 	private readonly _showUnresolved = CONTEXT_KEY_SHOW_UNRESOLVED.bindTo(this.contextKeyService);
@@ -63,6 +74,16 @@ export class CommentsFilters extends Disposable {
 		}
 	}
 
+	private _sortBy: IContextKey<CommentsSortOrder> = CONTEXT_KEY_SORT_BY.bindTo(this.contextKeyService);
+	get sortBy(): CommentsSortOrder {
+		return this._sortBy.get() ?? CommentsSortOrder.ResourceAscending;
+	}
+	set sortBy(sortBy: CommentsSortOrder) {
+		if (this._sortBy.get() !== sortBy) {
+			this._sortBy.set(sortBy);
+			this._onDidChange.fire({ sortBy });
+		}
+	}
 }
 
 registerAction2(class extends ViewAction<ICommentsView> {
@@ -168,3 +189,64 @@ registerAction2(class extends ViewAction<ICommentsView> {
 		view.filters.showResolved = !view.filters.showResolved;
 	}
 });
+
+const commentSortSubmenu = new MenuId('submenu.filter.commentSort');
+MenuRegistry.appendMenuItem(viewFilterSubmenu, {
+	submenu: commentSortSubmenu,
+	title: localize('comment sorts', "Sort By"),
+	group: '2_sort',
+	icon: Codicon.history,
+	when: ContextKeyExpr.equals('view', COMMENTS_VIEW_ID),
+});
+
+registerAction2(class extends ViewAction<ICommentsView> {
+	constructor() {
+		super({
+			id: `workbench.actions.${COMMENTS_VIEW_ID}.toggleSortByUpdatedAt`,
+			title: localize('toggle sorting by updated at', "Updated Time"),
+			category: localize('comments', "Comments"),
+			icon: Codicon.history,
+			viewId: COMMENTS_VIEW_ID,
+			toggled: {
+				condition: ContextKeyExpr.equals(CONTEXT_KEY_SORT_BY.key, CommentsSortOrder.UpdatedAtDescending),
+				title: localize('sorting by updated at', "Updated Time"),
+			},
+			menu: {
+				id: commentSortSubmenu,
+				group: 'navigation',
+				order: 1,
+				isHiddenByDefault: false,
+			},
+		});
+	}
+
+	async runInView(serviceAccessor: ServicesAccessor, view: ICommentsView): Promise<void> {
+		view.filters.sortBy = CommentsSortOrder.UpdatedAtDescending;
+	}
+});
+
+registerAction2(class extends ViewAction<ICommentsView> {
+	constructor() {
+		super({
+			id: `workbench.actions.${COMMENTS_VIEW_ID}.toggleSortByResource`,
+			title: localize('toggle sorting by resource', "Position in File"),
+			category: localize('comments', "Comments"),
+			icon: Codicon.history,
+			viewId: COMMENTS_VIEW_ID,
+			toggled: {
+				condition: ContextKeyExpr.equals(CONTEXT_KEY_SORT_BY.key, CommentsSortOrder.ResourceAscending),
+				title: localize('sorting by position in file', "Position in File"),
+			},
+			menu: {
+				id: commentSortSubmenu,
+				group: 'navigation',
+				order: 0,
+				isHiddenByDefault: false,
+			},
+		});
+	}
+
+	async runInView(serviceAccessor: ServicesAccessor, view: ICommentsView): Promise<void> {
+		view.filters.sortBy = CommentsSortOrder.ResourceAscending;
+	}
+});
diff --git a/src/vs/workbench/contrib/comments/browser/reactionsAction.ts b/src/vs/workbench/contrib/comments/browser/reactionsAction.ts
index fc77ef38ccf..5e3b7deade6 100644
--- a/src/vs/workbench/contrib/comments/browser/reactionsAction.ts
+++ b/src/vs/workbench/contrib/comments/browser/reactionsAction.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import * as dom from 'vs/base/browser/dom';
-import { Action, IAction } from 'vs/base/common/actions';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { ActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
+import * as nls from '../../../../nls.js';
+import * as dom from '../../../../base/browser/dom.js';
+import { Action, IAction } from '../../../../base/common/actions.js';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
+import { ActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
 
 export class ToggleReactionsAction extends Action {
 	static readonly ID = 'toolbar.toggle.pickReactions';
diff --git a/src/vs/workbench/contrib/comments/browser/simpleCommentEditor.ts b/src/vs/workbench/contrib/comments/browser/simpleCommentEditor.ts
index bad0ff2cab0..f5b4cfbd220 100644
--- a/src/vs/workbench/contrib/comments/browser/simpleCommentEditor.ts
+++ b/src/vs/workbench/contrib/comments/browser/simpleCommentEditor.ts
@@ -3,40 +3,41 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { EditorOption, IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { EditorAction, EditorContributionInstantiation, EditorExtensionsRegistry, IEditorContributionDescription } from 'vs/editor/browser/editorExtensions';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { CodeEditorWidget, ICodeEditorWidgetOptions } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { IContextKeyService, RawContextKey, IContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ICommandService } from 'vs/platform/commands/common/commands';
+import { EditorOption, IEditorOptions } from '../../../../editor/common/config/editorOptions.js';
+import { EditorAction, EditorContributionInstantiation, EditorExtensionsRegistry, IEditorContributionDescription } from '../../../../editor/browser/editorExtensions.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { CodeEditorWidget, ICodeEditorWidgetOptions } from '../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { IContextKeyService, RawContextKey, IContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
 
 // Allowed Editor Contributions:
-import { MenuPreventer } from 'vs/workbench/contrib/codeEditor/browser/menuPreventer';
-import { EditorDictation } from 'vs/workbench/contrib/codeEditor/browser/dictation/editorDictation';
-import { ContextMenuController } from 'vs/editor/contrib/contextmenu/browser/contextmenu';
-import { SuggestController } from 'vs/editor/contrib/suggest/browser/suggestController';
-import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2';
-import { TabCompletionController } from 'vs/workbench/contrib/snippets/browser/tabCompletion';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { ICommentThreadWidget } from 'vs/workbench/contrib/comments/common/commentThreadWidget';
-import { CommentContextKeys } from 'vs/workbench/contrib/comments/common/commentContextKeys';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { clamp } from 'vs/base/common/numbers';
-import { CopyPasteController } from 'vs/editor/contrib/dropOrPasteInto/browser/copyPasteController';
-import { CodeActionController } from 'vs/editor/contrib/codeAction/browser/codeActionController';
-import { DropIntoEditorController } from 'vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorController';
-import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController';
-import { LinkDetector } from 'vs/editor/contrib/links/browser/links';
-import { MessageController } from 'vs/editor/contrib/message/browser/messageController';
-import { SelectionClipboardContributionID } from 'vs/workbench/contrib/codeEditor/browser/selectionClipboard';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { HoverController } from 'vs/editor/contrib/hover/browser/hoverController';
+import { MenuPreventer } from '../../codeEditor/browser/menuPreventer.js';
+import { EditorDictation } from '../../codeEditor/browser/dictation/editorDictation.js';
+import { ContextMenuController } from '../../../../editor/contrib/contextmenu/browser/contextmenu.js';
+import { SuggestController } from '../../../../editor/contrib/suggest/browser/suggestController.js';
+import { SnippetController2 } from '../../../../editor/contrib/snippet/browser/snippetController2.js';
+import { TabCompletionController } from '../../snippets/browser/tabCompletion.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { ICommentThreadWidget } from '../common/commentThreadWidget.js';
+import { CommentContextKeys } from '../common/commentContextKeys.js';
+import { ILanguageConfigurationService } from '../../../../editor/common/languages/languageConfigurationRegistry.js';
+import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { clamp } from '../../../../base/common/numbers.js';
+import { CopyPasteController } from '../../../../editor/contrib/dropOrPasteInto/browser/copyPasteController.js';
+import { CodeActionController } from '../../../../editor/contrib/codeAction/browser/codeActionController.js';
+import { DropIntoEditorController } from '../../../../editor/contrib/dropOrPasteInto/browser/dropIntoEditorController.js';
+import { InlineCompletionsController } from '../../../../editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.js';
+import { LinkDetector } from '../../../../editor/contrib/links/browser/links.js';
+import { MessageController } from '../../../../editor/contrib/message/browser/messageController.js';
+import { SelectionClipboardContributionID } from '../../codeEditor/browser/selectionClipboard.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { ContentHoverController } from '../../../../editor/contrib/hover/browser/contentHoverController.js';
+import { GlyphHoverController } from '../../../../editor/contrib/hover/browser/glyphHoverController.js';
 
 export const ctxCommentEditorFocused = new RawContextKey<boolean>('commentEditorFocused', false);
 export const MIN_EDITOR_HEIGHT = 5 * 18;
@@ -78,7 +79,8 @@ export class SimpleCommentEditor extends CodeEditorWidget {
 					DropIntoEditorController.ID,
 					LinkDetector.ID,
 					MessageController.ID,
-					HoverController.ID,
+					ContentHoverController.ID,
+					GlyphHoverController.ID,
 					SelectionClipboardContributionID,
 					InlineCompletionsController.ID,
 					CodeActionController.ID,
@@ -137,6 +139,7 @@ export class SimpleCommentEditor extends CodeEditorWidget {
 			autoClosingBrackets: configurationService.getValue('editor.autoClosingBrackets'),
 			quickSuggestions: false,
 			accessibilitySupport: configurationService.getValue<'auto' | 'off' | 'on'>('editor.accessibilitySupport'),
+			fontFamily: configurationService.getValue('editor.fontFamily'),
 		};
 	}
 }
@@ -144,7 +147,7 @@ export class SimpleCommentEditor extends CodeEditorWidget {
 export function calculateEditorHeight(parentEditor: LayoutableEditor, editor: ICodeEditor, currentHeight: number): number {
 	const layoutInfo = editor.getLayoutInfo();
 	const lineHeight = editor.getOption(EditorOption.lineHeight);
-	const contentHeight = (editor._getViewModel()?.getLineCount()! * lineHeight) ?? editor.getContentHeight(); // Can't just call getContentHeight() because it returns an incorrect, large, value when the editor is first created.
+	const contentHeight = (editor._getViewModel()?.getLineCount()! * lineHeight); // Can't just call getContentHeight() because it returns an incorrect, large, value when the editor is first created.
 	if ((contentHeight > layoutInfo.height) ||
 		(contentHeight < layoutInfo.height && currentHeight > MIN_EDITOR_HEIGHT)) {
 		const linesToAdd = Math.ceil((contentHeight - layoutInfo.height) / lineHeight);
diff --git a/src/vs/workbench/contrib/comments/browser/timestamp.ts b/src/vs/workbench/contrib/comments/browser/timestamp.ts
index 583ccaa7963..bc9939c4413 100644
--- a/src/vs/workbench/contrib/comments/browser/timestamp.ts
+++ b/src/vs/workbench/contrib/comments/browser/timestamp.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import type { IManagedHover } from 'vs/base/browser/ui/hover/hover';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { fromNow } from 'vs/base/common/date';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { language } from 'vs/base/common/platform';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import type { IHoverService } from 'vs/platform/hover/browser/hover';
-import { COMMENTS_SECTION, ICommentsConfiguration } from 'vs/workbench/contrib/comments/common/commentsConfiguration';
+import * as dom from '../../../../base/browser/dom.js';
+import type { IManagedHover } from '../../../../base/browser/ui/hover/hover.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { fromNow } from '../../../../base/common/date.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { language } from '../../../../base/common/platform.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import type { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { COMMENTS_SECTION, ICommentsConfiguration } from '../common/commentsConfiguration.js';
 
 export class TimestampWidget extends Disposable {
 	private _date: HTMLElement;
diff --git a/src/vs/workbench/contrib/comments/common/commentCommandIds.ts b/src/vs/workbench/contrib/comments/common/commentCommandIds.ts
index 8f0c14875de..265dc57e481 100644
--- a/src/vs/workbench/contrib/comments/common/commentCommandIds.ts
+++ b/src/vs/workbench/contrib/comments/common/commentCommandIds.ts
@@ -5,8 +5,11 @@
 
 export const enum CommentCommandId {
 	Add = 'workbench.action.addComment',
+	FocusCommentOnCurrentLine = 'workbench.action.focusCommentOnCurrentLine',
 	NextThread = 'editor.action.nextCommentThreadAction',
 	PreviousThread = 'editor.action.previousCommentThreadAction',
+	NextCommentedRange = 'editor.action.nextCommentedRangeAction',
+	PreviousCommentedRange = 'editor.action.previousCommentedRangeAction',
 	NextRange = 'editor.action.nextCommentingRange',
 	PreviousRange = 'editor.action.previousCommentingRange',
 	ToggleCommenting = 'workbench.action.toggleCommenting',
diff --git a/src/vs/workbench/contrib/comments/common/commentContextKeys.ts b/src/vs/workbench/contrib/comments/common/commentContextKeys.ts
index e48f7a59d73..210465efe6f 100644
--- a/src/vs/workbench/contrib/comments/common/commentContextKeys.ts
+++ b/src/vs/workbench/contrib/comments/common/commentContextKeys.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import * as nls from '../../../../nls.js';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 
 
 export namespace CommentContextKeys {
@@ -17,6 +17,14 @@ export namespace CommentContextKeys {
 		type: 'boolean'
 	});
 
+	/**
+	 * A context key that is set when the active cursor is in the range of an existing comment.
+	 */
+	export const activeCursorHasComment = new RawContextKey<boolean>('activeCursorHasComment', false, {
+		description: nls.localize('hasComment', "Whether the position at the active cursor has a comment"),
+		type: 'boolean'
+	});
+
 	/**
 	 * A context key that is set when the active editor has commenting ranges.
 	 */
diff --git a/src/vs/workbench/contrib/comments/common/commentModel.ts b/src/vs/workbench/contrib/comments/common/commentModel.ts
index fbf25f6c06b..87eb513d7cc 100644
--- a/src/vs/workbench/contrib/comments/common/commentModel.ts
+++ b/src/vs/workbench/contrib/comments/common/commentModel.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { IRange } from 'vs/editor/common/core/range';
-import { Comment, CommentThread, CommentThreadChangedEvent, CommentThreadApplicability, CommentThreadState } from 'vs/editor/common/languages';
+import { URI } from '../../../../base/common/uri.js';
+import { IRange } from '../../../../editor/common/core/range.js';
+import { Comment, CommentThread, CommentThreadChangedEvent, CommentThreadApplicability, CommentThreadState } from '../../../../editor/common/languages.js';
 
 export interface ICommentThreadChangedEvent extends CommentThreadChangedEvent<IRange> {
 	uniqueOwner: string;
@@ -42,6 +42,23 @@ export class CommentNode {
 	hasReply(): boolean {
 		return this.replies && this.replies.length !== 0;
 	}
+
+	private _lastUpdatedAt: string | undefined;
+
+	get lastUpdatedAt(): string {
+		if (this._lastUpdatedAt === undefined) {
+			let updatedAt = this.comment.timestamp || '';
+			if (this.replies.length) {
+				const reply = this.replies[this.replies.length - 1];
+				const replyUpdatedAt = reply.lastUpdatedAt;
+				if (replyUpdatedAt > updatedAt) {
+					updatedAt = replyUpdatedAt;
+				}
+			}
+			this._lastUpdatedAt = updatedAt;
+		}
+		return this._lastUpdatedAt;
+	}
 }
 
 export class ResourceWithCommentThreads {
@@ -71,5 +88,25 @@ export class ResourceWithCommentThreads {
 
 		return commentNodes[0];
 	}
+
+	private _lastUpdatedAt: string | undefined;
+
+	get lastUpdatedAt() {
+		if (this._lastUpdatedAt === undefined) {
+			let updatedAt = '';
+			// Return result without cahcing as we expect data to arrive later
+			if (!this.commentThreads.length) {
+				return updatedAt;
+			}
+			for (const thread of this.commentThreads) {
+				const threadUpdatedAt = thread.lastUpdatedAt;
+				if (threadUpdatedAt && threadUpdatedAt > updatedAt) {
+					updatedAt = threadUpdatedAt;
+				}
+			}
+			this._lastUpdatedAt = updatedAt;
+		}
+		return this._lastUpdatedAt;
+	}
 }
 
diff --git a/src/vs/workbench/contrib/comments/test/browser/commentsView.test.ts b/src/vs/workbench/contrib/comments/test/browser/commentsView.test.ts
index 9c7d9e80c16..2b2216c8971 100644
--- a/src/vs/workbench/contrib/comments/test/browser/commentsView.test.ts
+++ b/src/vs/workbench/contrib/comments/test/browser/commentsView.test.ts
@@ -4,23 +4,23 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { CommentsPanel } from 'vs/workbench/contrib/comments/browser/commentsView';
-import { CommentService, ICommentController, ICommentInfo, ICommentService, INotebookCommentInfo } from 'vs/workbench/contrib/comments/browser/commentService';
-import { Comment, CommentInput, CommentReaction, CommentThread, CommentThreadCollapsibleState, CommentThreadState } from 'vs/editor/common/languages';
-import { Emitter, Event } from 'vs/base/common/event';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { IViewContainerModel, IViewDescriptor, IViewDescriptorService, ViewContainer, ViewContainerLocation } from 'vs/workbench/common/views';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { NullHoverService } from 'vs/platform/hover/test/browser/nullHoverService';
+import { workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
+import { IRange, Range } from '../../../../../editor/common/core/range.js';
+import { CommentsPanel } from '../../browser/commentsView.js';
+import { CommentService, ICommentController, ICommentInfo, ICommentService, INotebookCommentInfo } from '../../browser/commentService.js';
+import { Comment, CommentInput, CommentReaction, CommentThread, CommentThreadCollapsibleState, CommentThreadState } from '../../../../../editor/common/languages.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { IViewContainerModel, IViewDescriptor, IViewDescriptorService, ViewContainer, ViewContainerLocation } from '../../../../common/views.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { IContextViewService } from '../../../../../platform/contextview/browser/contextView.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { URI, UriComponents } from '../../../../../base/common/uri.js';
+import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
+import { NullHoverService } from '../../../../../platform/hover/test/browser/nullHoverService.js';
 
 class TestCommentThread implements CommentThread<IRange> {
 	isDocumentCommentThread(): this is CommentThread<IRange> {
@@ -49,6 +49,7 @@ class TestCommentThread implements CommentThread<IRange> {
 }
 
 class TestCommentController implements ICommentController {
+	activeComment: { thread: CommentThread; comment?: Comment } | undefined;
 	id: string = 'test';
 	label: string = 'Test Comments';
 	owner: string = 'test';
diff --git a/src/vs/workbench/contrib/configExporter/electron-sandbox/configurationExportHelper.contribution.ts b/src/vs/workbench/contrib/configExporter/electron-sandbox/configurationExportHelper.contribution.ts
index 127283add02..678bf198d59 100644
--- a/src/vs/workbench/contrib/configExporter/electron-sandbox/configurationExportHelper.contribution.ts
+++ b/src/vs/workbench/contrib/configExporter/electron-sandbox/configurationExportHelper.contribution.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
-import { DefaultConfigurationExportHelper } from 'vs/workbench/contrib/configExporter/electron-sandbox/configurationExportHelper';
+import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from '../../../common/contributions.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-sandbox/environmentService.js';
+import { DefaultConfigurationExportHelper } from './configurationExportHelper.js';
 
 export class ExtensionPoints implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/contrib/configExporter/electron-sandbox/configurationExportHelper.ts b/src/vs/workbench/contrib/configExporter/electron-sandbox/configurationExportHelper.ts
index 4aed7b2d974..ae0bcfcaf80 100644
--- a/src/vs/workbench/contrib/configExporter/electron-sandbox/configurationExportHelper.ts
+++ b/src/vs/workbench/contrib/configExporter/electron-sandbox/configurationExportHelper.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IConfigurationNode, IConfigurationRegistry, Extensions, IConfigurationPropertySchema } from 'vs/platform/configuration/common/configurationRegistry';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IFileService } from 'vs/platform/files/common/files';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { URI } from 'vs/base/common/uri';
-import { IProductService } from 'vs/platform/product/common/productService';
+import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-sandbox/environmentService.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IConfigurationNode, IConfigurationRegistry, Extensions, IConfigurationPropertySchema } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
 
 interface IExportedConfigurationNode {
 	name: string;
diff --git a/src/vs/workbench/contrib/contextmenu/browser/contextmenu.contribution.ts b/src/vs/workbench/contrib/contextmenu/browser/contextmenu.contribution.ts
index 3f607d926f3..cd6f33ef323 100644
--- a/src/vs/workbench/contrib/contextmenu/browser/contextmenu.contribution.ts
+++ b/src/vs/workbench/contrib/contextmenu/browser/contextmenu.contribution.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { ILayoutService } from '../../../../platform/layout/browser/layoutService.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from '../../../common/contributions.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
 
 class ContextMenuContribution extends Disposable implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/contrib/customEditor/browser/customEditor.contribution.ts b/src/vs/workbench/contrib/customEditor/browser/customEditor.contribution.ts
index 86e623975c0..17c575eadf5 100644
--- a/src/vs/workbench/contrib/customEditor/browser/customEditor.contribution.ts
+++ b/src/vs/workbench/contrib/customEditor/browser/customEditor.contribution.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { EditorPaneDescriptor, IEditorPaneRegistry } from 'vs/workbench/browser/editor';
-import { WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { EditorExtensions, IEditorFactoryRegistry } from 'vs/workbench/common/editor';
-import { ComplexCustomWorkingCopyEditorHandler as ComplexCustomWorkingCopyEditorHandler, CustomEditorInputSerializer } from 'vs/workbench/contrib/customEditor/browser/customEditorInputFactory';
-import { ICustomEditorService } from 'vs/workbench/contrib/customEditor/common/customEditor';
-import { WebviewEditor } from 'vs/workbench/contrib/webviewPanel/browser/webviewEditor';
-import { CustomEditorInput } from './customEditorInput';
-import { CustomEditorService } from './customEditors';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { EditorPaneDescriptor, IEditorPaneRegistry } from '../../../browser/editor.js';
+import { WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { EditorExtensions, IEditorFactoryRegistry } from '../../../common/editor.js';
+import { ComplexCustomWorkingCopyEditorHandler as ComplexCustomWorkingCopyEditorHandler, CustomEditorInputSerializer } from './customEditorInputFactory.js';
+import { ICustomEditorService } from '../common/customEditor.js';
+import { WebviewEditor } from '../../webviewPanel/browser/webviewEditor.js';
+import { CustomEditorInput } from './customEditorInput.js';
+import { CustomEditorService } from './customEditors.js';
 
 registerSingleton(ICustomEditorService, CustomEditorService, InstantiationType.Delayed);
 
diff --git a/src/vs/workbench/contrib/customEditor/browser/customEditorInput.ts b/src/vs/workbench/contrib/customEditor/browser/customEditorInput.ts
index 214f354088e..f3b3fb7f8d7 100644
--- a/src/vs/workbench/contrib/customEditor/browser/customEditorInput.ts
+++ b/src/vs/workbench/contrib/customEditor/browser/customEditorInput.ts
@@ -3,35 +3,35 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getWindow } from 'vs/base/browser/dom';
-import { CodeWindow } from 'vs/base/browser/window';
-import { toAction } from 'vs/base/common/actions';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { IReference } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { basename } from 'vs/base/common/path';
-import { dirname, isEqual } from 'vs/base/common/resources';
-import { assertIsDefined } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IResourceEditorInput } from 'vs/platform/editor/common/editor';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
-import { EditorInputCapabilities, GroupIdentifier, IMoveResult, IRevertOptions, ISaveOptions, IUntypedEditorInput, Verbosity, createEditorOpenError } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { ICustomEditorLabelService } from 'vs/workbench/services/editor/common/customEditorLabelService';
-import { ICustomEditorModel, ICustomEditorService } from 'vs/workbench/contrib/customEditor/common/customEditor';
-import { IOverlayWebview, IWebviewService } from 'vs/workbench/contrib/webview/browser/webview';
-import { IWebviewWorkbenchService, LazilyResolvedWebviewEditorInput } from 'vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
-import { IUntitledTextEditorService } from 'vs/workbench/services/untitled/common/untitledTextEditorService';
+import { getWindow } from '../../../../base/browser/dom.js';
+import { CodeWindow } from '../../../../base/browser/window.js';
+import { toAction } from '../../../../base/common/actions.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { IMarkdownString } from '../../../../base/common/htmlContent.js';
+import { IReference } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { basename } from '../../../../base/common/path.js';
+import { dirname, isEqual } from '../../../../base/common/resources.js';
+import { assertIsDefined } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { localize } from '../../../../nls.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IResourceEditorInput } from '../../../../platform/editor/common/editor.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { IUndoRedoService } from '../../../../platform/undoRedo/common/undoRedo.js';
+import { EditorInputCapabilities, GroupIdentifier, IMoveResult, IRevertOptions, ISaveOptions, IUntypedEditorInput, Verbosity, createEditorOpenError } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { ICustomEditorLabelService } from '../../../services/editor/common/customEditorLabelService.js';
+import { ICustomEditorModel, ICustomEditorService } from '../common/customEditor.js';
+import { IOverlayWebview, IWebviewService } from '../../webview/browser/webview.js';
+import { IWebviewWorkbenchService, LazilyResolvedWebviewEditorInput } from '../../webviewPanel/browser/webviewWorkbenchService.js';
+import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.js';
+import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
+import { IUntitledTextEditorService } from '../../../services/untitled/common/untitledTextEditorService.js';
 
 interface CustomEditorInputInitInfo {
 	readonly resource: URI;
diff --git a/src/vs/workbench/contrib/customEditor/browser/customEditorInputFactory.ts b/src/vs/workbench/contrib/customEditor/browser/customEditorInputFactory.ts
index 8dc11b1af6b..c8be107e8a2 100644
--- a/src/vs/workbench/contrib/customEditor/browser/customEditorInputFactory.ts
+++ b/src/vs/workbench/contrib/customEditor/browser/customEditorInputFactory.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { isEqual } from 'vs/base/common/resources';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { CustomEditorInput } from 'vs/workbench/contrib/customEditor/browser/customEditorInput';
-import { ICustomEditorService } from 'vs/workbench/contrib/customEditor/common/customEditor';
-import { NotebookEditorInput } from 'vs/workbench/contrib/notebook/common/notebookEditorInput';
-import { IWebviewService, WebviewContentOptions, WebviewContentPurpose, WebviewExtensionDescription, WebviewOptions } from 'vs/workbench/contrib/webview/browser/webview';
-import { DeserializedWebview, restoreWebviewContentOptions, restoreWebviewOptions, reviveWebviewExtensionDescription, SerializedWebview, SerializedWebviewOptions, WebviewEditorInputSerializer } from 'vs/workbench/contrib/webviewPanel/browser/webviewEditorInputSerializer';
-import { IWebviewWorkbenchService } from 'vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService';
-import { IWorkingCopyBackupMeta, IWorkingCopyIdentifier } from 'vs/workbench/services/workingCopy/common/workingCopy';
-import { IWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackup';
-import { IWorkingCopyEditorHandler, IWorkingCopyEditorService } from 'vs/workbench/services/workingCopy/common/workingCopyEditorService';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { CustomEditorInput } from './customEditorInput.js';
+import { ICustomEditorService } from '../common/customEditor.js';
+import { NotebookEditorInput } from '../../notebook/common/notebookEditorInput.js';
+import { IWebviewService, WebviewContentOptions, WebviewContentPurpose, WebviewExtensionDescription, WebviewOptions } from '../../webview/browser/webview.js';
+import { DeserializedWebview, restoreWebviewContentOptions, restoreWebviewOptions, reviveWebviewExtensionDescription, SerializedWebview, SerializedWebviewOptions, WebviewEditorInputSerializer } from '../../webviewPanel/browser/webviewEditorInputSerializer.js';
+import { IWebviewWorkbenchService } from '../../webviewPanel/browser/webviewWorkbenchService.js';
+import { IWorkingCopyBackupMeta, IWorkingCopyIdentifier } from '../../../services/workingCopy/common/workingCopy.js';
+import { IWorkingCopyBackupService } from '../../../services/workingCopy/common/workingCopyBackup.js';
+import { IWorkingCopyEditorHandler, IWorkingCopyEditorService } from '../../../services/workingCopy/common/workingCopyEditorService.js';
 
 export interface CustomDocumentBackupData extends IWorkingCopyBackupMeta {
 	readonly viewType: string;
diff --git a/src/vs/workbench/contrib/customEditor/browser/customEditors.ts b/src/vs/workbench/contrib/customEditor/browser/customEditors.ts
index 04b79c589ec..464f9a8cb19 100644
--- a/src/vs/workbench/contrib/customEditor/browser/customEditors.ts
+++ b/src/vs/workbench/contrib/customEditor/browser/customEditors.ts
@@ -3,31 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/customEditor';
-import { coalesce } from 'vs/base/common/arrays';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { extname, isEqual } from 'vs/base/common/resources';
-import { assertIsDefined } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { RedoCommand, UndoCommand } from 'vs/editor/browser/editorExtensions';
-import { IResourceEditorInput } from 'vs/platform/editor/common/editor';
-import { FileOperation, IFileService } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { DEFAULT_EDITOR_ASSOCIATION, EditorExtensions, GroupIdentifier, IEditorFactoryRegistry, IResourceDiffEditorInput } from 'vs/workbench/common/editor';
-import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { CONTEXT_ACTIVE_CUSTOM_EDITOR_ID, CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE, CustomEditorCapabilities, CustomEditorInfo, CustomEditorInfoCollection, ICustomEditorService } from 'vs/workbench/contrib/customEditor/common/customEditor';
-import { CustomEditorModelManager } from 'vs/workbench/contrib/customEditor/common/customEditorModelManager';
-import { IEditorGroup, IEditorGroupContextKeyProvider, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorResolverService, IEditorType, RegisteredEditorPriority } from 'vs/workbench/services/editor/common/editorResolverService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ContributedCustomEditors } from '../common/contributedCustomEditors';
-import { CustomEditorInput } from './customEditorInput';
+import './media/customEditor.css';
+import { coalesce } from '../../../../base/common/arrays.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { extname, isEqual } from '../../../../base/common/resources.js';
+import { assertIsDefined } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { RedoCommand, UndoCommand } from '../../../../editor/browser/editorExtensions.js';
+import { IResourceEditorInput } from '../../../../platform/editor/common/editor.js';
+import { FileOperation, IFileService } from '../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { DEFAULT_EDITOR_ASSOCIATION, EditorExtensions, GroupIdentifier, IEditorFactoryRegistry, IResourceDiffEditorInput } from '../../../common/editor.js';
+import { DiffEditorInput } from '../../../common/editor/diffEditorInput.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { CONTEXT_ACTIVE_CUSTOM_EDITOR_ID, CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE, CustomEditorCapabilities, CustomEditorInfo, CustomEditorInfoCollection, ICustomEditorService } from '../common/customEditor.js';
+import { CustomEditorModelManager } from '../common/customEditorModelManager.js';
+import { IEditorGroup, IEditorGroupContextKeyProvider, IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { IEditorResolverService, IEditorType, RegisteredEditorPriority } from '../../../services/editor/common/editorResolverService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { ContributedCustomEditors } from '../common/contributedCustomEditors.js';
+import { CustomEditorInput } from './customEditorInput.js';
 
 export class CustomEditorService extends Disposable implements ICustomEditorService {
 	_serviceBrand: any;
@@ -132,7 +132,7 @@ export class CustomEditorService extends Disposable implements ICustomEditorServ
 						priority: contributedEditor.priority,
 					},
 					{
-						singlePerResource: () => !this.getCustomEditorCapabilities(contributedEditor.id)?.supportsMultipleEditorsPerDocument ?? true
+						singlePerResource: () => !(this.getCustomEditorCapabilities(contributedEditor.id)?.supportsMultipleEditorsPerDocument ?? false)
 					},
 					{
 						createEditorInput: ({ resource }, group) => {
diff --git a/src/vs/workbench/contrib/customEditor/common/contributedCustomEditors.ts b/src/vs/workbench/contrib/customEditor/common/contributedCustomEditors.ts
index 0adceb05463..dbcde564a60 100644
--- a/src/vs/workbench/contrib/customEditor/common/contributedCustomEditors.ts
+++ b/src/vs/workbench/contrib/customEditor/common/contributedCustomEditors.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import * as nls from 'vs/nls';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { Memento } from 'vs/workbench/common/memento';
-import { CustomEditorDescriptor, CustomEditorInfo } from 'vs/workbench/contrib/customEditor/common/customEditor';
-import { customEditorsExtensionPoint, ICustomEditorsExtensionPoint } from 'vs/workbench/contrib/customEditor/common/extensionPoint';
-import { RegisteredEditorPriority } from 'vs/workbench/services/editor/common/editorResolverService';
-import { IExtensionPointUser } from 'vs/workbench/services/extensions/common/extensionsRegistry';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import * as nls from '../../../../nls.js';
+import { IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { Memento } from '../../../common/memento.js';
+import { CustomEditorDescriptor, CustomEditorInfo } from './customEditor.js';
+import { customEditorsExtensionPoint, ICustomEditorsExtensionPoint } from './extensionPoint.js';
+import { RegisteredEditorPriority } from '../../../services/editor/common/editorResolverService.js';
+import { IExtensionPointUser } from '../../../services/extensions/common/extensionsRegistry.js';
 
 export class ContributedCustomEditors extends Disposable {
 
diff --git a/src/vs/workbench/contrib/customEditor/common/customEditor.ts b/src/vs/workbench/contrib/customEditor/common/customEditor.ts
index 28efa3bf905..7ea444c107f 100644
--- a/src/vs/workbench/contrib/customEditor/common/customEditor.ts
+++ b/src/vs/workbench/contrib/customEditor/common/customEditor.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { distinct } from 'vs/base/common/arrays';
-import { Event } from 'vs/base/common/event';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { IDisposable, IReference } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import * as nls from 'vs/nls';
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IRevertOptions, ISaveOptions } from 'vs/workbench/common/editor';
-import { globMatchesResource, priorityToRank, RegisteredEditorPriority } from 'vs/workbench/services/editor/common/editorResolverService';
+import { distinct } from '../../../../base/common/arrays.js';
+import { Event } from '../../../../base/common/event.js';
+import { IMarkdownString } from '../../../../base/common/htmlContent.js';
+import { IDisposable, IReference } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import * as nls from '../../../../nls.js';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IRevertOptions, ISaveOptions } from '../../../common/editor.js';
+import { globMatchesResource, priorityToRank, RegisteredEditorPriority } from '../../../services/editor/common/editorResolverService.js';
 
 export const ICustomEditorService = createDecorator<ICustomEditorService>('customEditorService');
 
diff --git a/src/vs/workbench/contrib/customEditor/common/customEditorModelManager.ts b/src/vs/workbench/contrib/customEditor/common/customEditorModelManager.ts
index 1423fc37af5..66d5b2b5989 100644
--- a/src/vs/workbench/contrib/customEditor/common/customEditorModelManager.ts
+++ b/src/vs/workbench/contrib/customEditor/common/customEditorModelManager.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createSingleCallFunction } from 'vs/base/common/functional';
-import { IReference } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { ICustomEditorModel, ICustomEditorModelManager } from 'vs/workbench/contrib/customEditor/common/customEditor';
+import { createSingleCallFunction } from '../../../../base/common/functional.js';
+import { IReference } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ICustomEditorModel, ICustomEditorModelManager } from './customEditor.js';
 
 export class CustomEditorModelManager implements ICustomEditorModelManager {
 
diff --git a/src/vs/workbench/contrib/customEditor/common/customTextEditorModel.ts b/src/vs/workbench/contrib/customEditor/common/customTextEditorModel.ts
index e4aa463c98d..0ca157683f9 100644
--- a/src/vs/workbench/contrib/customEditor/common/customTextEditorModel.ts
+++ b/src/vs/workbench/contrib/customEditor/common/customTextEditorModel.ts
@@ -3,16 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { Disposable, IReference } from 'vs/base/common/lifecycle';
-import { isEqual } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { IResolvedTextEditorModel, ITextModelService } from 'vs/editor/common/services/resolverService';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IRevertOptions, ISaveOptions } from 'vs/workbench/common/editor';
-import { ICustomEditorModel } from 'vs/workbench/contrib/customEditor/common/customEditor';
-import { ITextFileEditorModel, ITextFileService, TextFileEditorModelState } from 'vs/workbench/services/textfile/common/textfiles';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { IMarkdownString } from '../../../../base/common/htmlContent.js';
+import { Disposable, IReference } from '../../../../base/common/lifecycle.js';
+import { basename } from '../../../../base/common/path.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IResolvedTextEditorModel, ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { localize } from '../../../../nls.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { IRevertOptions, ISaveOptions } from '../../../common/editor.js';
+import { ICustomEditorModel } from './customEditor.js';
+import { IExtensionService } from '../../../../workbench/services/extensions/common/extensions.js';
+import { ITextFileEditorModel, ITextFileService, TextFileEditorModelState } from '../../../services/textfile/common/textfiles.js';
 
 export class CustomTextEditorModel extends Disposable implements ICustomEditorModel {
 
@@ -40,7 +44,9 @@ export class CustomTextEditorModel extends Disposable implements ICustomEditorMo
 		public readonly viewType: string,
 		private readonly _resource: URI,
 		private readonly _model: IReference<IResolvedTextEditorModel>,
-		@ITextFileService private readonly textFileService: ITextFileService
+		@ITextFileService private readonly textFileService: ITextFileService,
+		@ILabelService private readonly _labelService: ILabelService,
+		@IExtensionService extensionService: IExtensionService,
 	) {
 		super();
 
@@ -58,12 +64,20 @@ export class CustomTextEditorModel extends Disposable implements ICustomEditorMo
 				this._onDidChangeContent.fire();
 			}
 		}));
+
+		this._register(extensionService.onWillStop(e => {
+			e.veto(true, localize('vetoExtHostRestart', "A custom text editor for '{0}' is open.", this.resource.path));
+		}));
 	}
 
 	public get resource() {
 		return this._resource;
 	}
 
+	public get name() {
+		return basename(this._labelService.getUriLabel(this._resource));
+	}
+
 	public isReadonly(): boolean | IMarkdownString {
 		return this._model.object.isReadonly();
 	}
diff --git a/src/vs/workbench/contrib/customEditor/common/extensionPoint.ts b/src/vs/workbench/contrib/customEditor/common/extensionPoint.ts
index 4be82b83e13..d2e06733cfb 100644
--- a/src/vs/workbench/contrib/customEditor/common/extensionPoint.ts
+++ b/src/vs/workbench/contrib/customEditor/common/extensionPoint.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { coalesce } from 'vs/base/common/arrays';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import { Disposable } from 'vs/base/common/lifecycle';
-import * as nls from 'vs/nls';
-import { IExtensionManifest } from 'vs/platform/extensions/common/extensions';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { CustomEditorPriority, CustomEditorSelector } from 'vs/workbench/contrib/customEditor/common/customEditor';
-import { Extensions, IExtensionFeatureTableRenderer, IExtensionFeaturesRegistry, IRenderedData, IRowData, ITableData } from 'vs/workbench/services/extensionManagement/common/extensionFeatures';
-import { ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { languagesExtPoint } from 'vs/workbench/services/language/common/languageService';
+import { coalesce } from '../../../../base/common/arrays.js';
+import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import * as nls from '../../../../nls.js';
+import { IExtensionManifest } from '../../../../platform/extensions/common/extensions.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { CustomEditorPriority, CustomEditorSelector } from './customEditor.js';
+import { Extensions, IExtensionFeatureTableRenderer, IExtensionFeaturesRegistry, IRenderedData, IRowData, ITableData } from '../../../services/extensionManagement/common/extensionFeatures.js';
+import { ExtensionsRegistry } from '../../../services/extensions/common/extensionsRegistry.js';
+import { languagesExtPoint } from '../../../services/language/common/languageService.js';
 
 const Fields = Object.freeze({
 	viewType: 'viewType',
diff --git a/src/vs/workbench/contrib/debug/browser/baseDebugView.ts b/src/vs/workbench/contrib/debug/browser/baseDebugView.ts
index cf8c7a1980a..9576b7e5bb7 100644
--- a/src/vs/workbench/contrib/debug/browser/baseDebugView.ts
+++ b/src/vs/workbench/contrib/debug/browser/baseDebugView.ts
@@ -3,42 +3,36 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { HighlightedLabel, IHighlight } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { IInputValidationOptions, InputBox } from 'vs/base/browser/ui/inputbox/inputBox';
-import { IAsyncDataSource, ITreeNode, ITreeRenderer } from 'vs/base/browser/ui/tree/tree';
-import { Codicon } from 'vs/base/common/codicons';
-import { FuzzyScore, createMatches } from 'vs/base/common/filters';
-import { createSingleCallFunction } from 'vs/base/common/functional';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { DisposableStore, IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { localize } from 'vs/nls';
-import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
-import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { defaultInputBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { COPY_EVALUATE_PATH_ID, COPY_VALUE_ID } from 'vs/workbench/contrib/debug/browser/debugCommands';
-import { LinkDetector } from 'vs/workbench/contrib/debug/browser/linkDetector';
-import { IDebugService, IExpression, IExpressionValue } from 'vs/workbench/contrib/debug/common/debug';
-import { Expression, ExpressionContainer, Variable } from 'vs/workbench/contrib/debug/common/debugModel';
-import { IDebugVisualizerService } from 'vs/workbench/contrib/debug/common/debugVisualizers';
-import { ReplEvaluationResult } from 'vs/workbench/contrib/debug/common/replModel';
+import * as dom from '../../../../base/browser/dom.js';
+import { IKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { HighlightedLabel, IHighlight } from '../../../../base/browser/ui/highlightedlabel/highlightedLabel.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { IInputValidationOptions, InputBox } from '../../../../base/browser/ui/inputbox/inputBox.js';
+import { IAsyncDataSource, ITreeNode, ITreeRenderer } from '../../../../base/browser/ui/tree/tree.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { FuzzyScore, createMatches } from '../../../../base/common/filters.js';
+import { createSingleCallFunction } from '../../../../base/common/functional.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { DisposableStore, IDisposable, dispose, toDisposable } from '../../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { localize } from '../../../../nls.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { defaultInputBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { IDebugService, IExpression } from '../common/debug.js';
+import { Variable } from '../common/debugModel.js';
+import { IDebugVisualizerService } from '../common/debugVisualizers.js';
+import { LinkDetector } from './linkDetector.js';
 
-const MAX_VALUE_RENDER_LENGTH_IN_VIEWLET = 1024;
-const booleanRegex = /^(true|false)$/i;
-const stringRegex = /^(['"]).*\1$/;
 const $ = dom.$;
 
 export interface IRenderValueOptions {
 	showChanged?: boolean;
 	maxValueLength?: number;
 	/** If set, a hover will be shown on the element. Requires a disposable store for usage. */
-	hover?: DisposableStore | {
-		store: DisposableStore;
+	hover?: false | {
 		commands: { id: string; args: unknown[] }[];
 		commandService: ICommandService;
 	};
@@ -49,6 +43,7 @@ export interface IRenderValueOptions {
 export interface IVariableTemplateData {
 	expression: HTMLElement;
 	name: HTMLElement;
+	type: HTMLElement;
 	value: HTMLElement;
 	label: HighlightedLabel;
 	lazyButton: HTMLElement;
@@ -61,105 +56,6 @@ export function renderViewTree(container: HTMLElement): HTMLElement {
 	return treeContainer;
 }
 
-export function renderExpressionValue(expressionOrValue: IExpressionValue | string, container: HTMLElement, options: IRenderValueOptions, hoverService: IHoverService): void {
-	let value = typeof expressionOrValue === 'string' ? expressionOrValue : expressionOrValue.value;
-
-	// remove stale classes
-	container.className = 'value';
-	// when resolving expressions we represent errors from the server as a variable with name === null.
-	if (value === null || ((expressionOrValue instanceof Expression || expressionOrValue instanceof Variable || expressionOrValue instanceof ReplEvaluationResult) && !expressionOrValue.available)) {
-		container.classList.add('unavailable');
-		if (value !== Expression.DEFAULT_VALUE) {
-			container.classList.add('error');
-		}
-	} else {
-		if (typeof expressionOrValue !== 'string' && options.showChanged && expressionOrValue.valueChanged && value !== Expression.DEFAULT_VALUE) {
-			// value changed color has priority over other colors.
-			container.className = 'value changed';
-			expressionOrValue.valueChanged = false;
-		}
-
-		if (options.colorize && typeof expressionOrValue !== 'string') {
-			if (expressionOrValue.type === 'number' || expressionOrValue.type === 'boolean' || expressionOrValue.type === 'string') {
-				container.classList.add(expressionOrValue.type);
-			} else if (!isNaN(+value)) {
-				container.classList.add('number');
-			} else if (booleanRegex.test(value)) {
-				container.classList.add('boolean');
-			} else if (stringRegex.test(value)) {
-				container.classList.add('string');
-			}
-		}
-	}
-
-	if (options.maxValueLength && value && value.length > options.maxValueLength) {
-		value = value.substring(0, options.maxValueLength) + '...';
-	}
-	if (!value) {
-		value = '';
-	}
-
-	if (options.linkDetector) {
-		container.textContent = '';
-		const session = (expressionOrValue instanceof ExpressionContainer) ? expressionOrValue.getSession() : undefined;
-		container.appendChild(options.linkDetector.linkify(value, false, session ? session.root : undefined, true));
-	} else {
-		container.textContent = value;
-	}
-
-	if (options.hover) {
-		const { store, commands, commandService } = options.hover instanceof DisposableStore ? { store: options.hover, commands: [], commandService: undefined } : options.hover;
-		store.add(hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), container, () => {
-			const container = dom.$('div');
-			const markdownHoverElement = dom.$('div.hover-row');
-			const hoverContentsElement = dom.append(markdownHoverElement, dom.$('div.hover-contents'));
-			const hoverContentsPre = dom.append(hoverContentsElement, dom.$('pre.debug-var-hover-pre'));
-			hoverContentsPre.textContent = value;
-			container.appendChild(markdownHoverElement);
-			return container;
-		}, {
-			actions: commands.map(({ id, args }) => {
-				const description = CommandsRegistry.getCommand(id)?.metadata?.description;
-				return {
-					label: typeof description === 'string' ? description : description ? description.value : id,
-					commandId: id,
-					run: () => commandService!.executeCommand(id, ...args),
-				};
-			})
-		}));
-	}
-}
-
-export function renderVariable(store: DisposableStore, commandService: ICommandService, hoverService: IHoverService, variable: Variable, data: IVariableTemplateData, showChanged: boolean, highlights: IHighlight[], linkDetector?: LinkDetector): void {
-	if (variable.available) {
-		let text = variable.name;
-		if (variable.value && typeof variable.name === 'string') {
-			text += ':';
-		}
-		data.label.set(text, highlights, variable.type ? variable.type : variable.name);
-		data.name.classList.toggle('virtual', variable.presentationHint?.kind === 'virtual');
-		data.name.classList.toggle('internal', variable.presentationHint?.visibility === 'internal');
-	} else if (variable.value && typeof variable.name === 'string' && variable.name) {
-		data.label.set(':');
-	}
-
-	data.expression.classList.toggle('lazy', !!variable.presentationHint?.lazy);
-	const commands = [
-		{ id: COPY_VALUE_ID, args: [variable, [variable]] as unknown[] }
-	];
-	if (variable.evaluateName) {
-		commands.push({ id: COPY_EVALUATE_PATH_ID, args: [{ variable }] });
-	}
-
-	renderExpressionValue(variable, data.value, {
-		showChanged,
-		maxValueLength: MAX_VALUE_RENDER_LENGTH_IN_VIEWLET,
-		hover: { store, commands, commandService },
-		colorize: true,
-		linkDetector
-	}, hoverService);
-}
-
 export interface IInputBoxOptions {
 	initialValue: string;
 	ariaLabel: string;
@@ -171,6 +67,7 @@ export interface IInputBoxOptions {
 export interface IExpressionTemplateData {
 	expression: HTMLElement;
 	name: HTMLSpanElement;
+	type: HTMLSpanElement;
 	value: HTMLSpanElement;
 	inputBoxContainer: HTMLElement;
 	actionBar?: ActionBar;
@@ -228,7 +125,10 @@ export abstract class AbstractExpressionsRenderer<T = IExpression> implements IT
 		const name = dom.append(expression, $('span.name'));
 		const lazyButton = dom.append(expression, $('span.lazy-button'));
 		lazyButton.classList.add(...ThemeIcon.asClassNameArray(Codicon.eye));
+
 		templateDisposable.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), lazyButton, localize('debug.lazyButton.tooltip', "Click to expand")));
+		const type = dom.append(expression, $('span.type'));
+
 		const value = dom.append(expression, $('span.value'));
 
 		const label = templateDisposable.add(new HighlightedLabel(name));
@@ -241,7 +141,7 @@ export abstract class AbstractExpressionsRenderer<T = IExpression> implements IT
 			actionBar = templateDisposable.add(new ActionBar(expression));
 		}
 
-		const template: IExpressionTemplateData = { expression, name, value, label, inputBoxContainer, actionBar, elementDisposable: new DisposableStore(), templateDisposable, lazyButton, currentElement: undefined };
+		const template: IExpressionTemplateData = { expression, name, type, value, label, inputBoxContainer, actionBar, elementDisposable: new DisposableStore(), templateDisposable, lazyButton, currentElement: undefined };
 
 		templateDisposable.add(dom.addDisposableListener(lazyButton, dom.EventType.CLICK, () => {
 			if (template.currentElement) {
@@ -255,7 +155,6 @@ export abstract class AbstractExpressionsRenderer<T = IExpression> implements IT
 	public abstract renderElement(node: ITreeNode<T, FuzzyScore>, index: number, data: IExpressionTemplateData): void;
 
 	protected renderExpressionElement(element: IExpression, node: ITreeNode<T, FuzzyScore>, data: IExpressionTemplateData): void {
-		data.elementDisposable.clear();
 		data.currentElement = element;
 		this.renderExpression(node.element, data, createMatches(node.filterData));
 		if (data.actionBar) {
diff --git a/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.ts b/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.ts
index 1b53d40047f..929118f46c0 100644
--- a/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.ts
+++ b/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.ts
@@ -3,43 +3,43 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isSafari } from 'vs/base/browser/browser';
-import { BrowserFeatures } from 'vs/base/browser/canIUse';
-import * as dom from 'vs/base/browser/dom';
-import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { Action, IAction, Separator, SubmenuAction } from 'vs/base/common/actions';
-import { distinct } from 'vs/base/common/arrays';
-import { RunOnceScheduler, timeout } from 'vs/base/common/async';
-import { memoize } from 'vs/base/common/decorators';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { dispose, disposeIfDisposable, IDisposable } from 'vs/base/common/lifecycle';
-import * as env from 'vs/base/common/platform';
-import severity from 'vs/base/common/severity';
-import { noBreakWhitespace } from 'vs/base/common/strings';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { ContentWidgetPositionPreference, IActiveCodeEditor, ICodeEditor, IContentWidget, IContentWidgetPosition, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { IPosition } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { GlyphMarginLane, IModelDecorationOptions, IModelDecorationOverviewRulerOptions, IModelDecorationsChangeAccessor, ITextModel, OverviewRulerLane, TrackedRangeStickiness } from 'vs/editor/common/model';
-import * as nls from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { registerColor } from 'vs/platform/theme/common/colorRegistry';
-import { registerThemingParticipant, themeColorFromId } from 'vs/platform/theme/common/themeService';
-import { GutterActionsRegistry } from 'vs/workbench/contrib/codeEditor/browser/editorLineNumberMenu';
-import { getBreakpointMessageAndIcon } from 'vs/workbench/contrib/debug/browser/breakpointsView';
-import { BreakpointWidget } from 'vs/workbench/contrib/debug/browser/breakpointWidget';
-import * as icons from 'vs/workbench/contrib/debug/browser/debugIcons';
-import { BREAKPOINT_EDITOR_CONTRIBUTION_ID, BreakpointWidgetContext, CONTEXT_BREAKPOINT_WIDGET_VISIBLE, DebuggerString, IBreakpoint, IBreakpointEditorContribution, IBreakpointUpdateData, IDebugConfiguration, IDebugService, IDebugSession, State } from 'vs/workbench/contrib/debug/common/debug';
+import { isSafari } from '../../../../base/browser/browser.js';
+import { BrowserFeatures } from '../../../../base/browser/canIUse.js';
+import * as dom from '../../../../base/browser/dom.js';
+import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
+import { Action, IAction, Separator, SubmenuAction } from '../../../../base/common/actions.js';
+import { distinct } from '../../../../base/common/arrays.js';
+import { RunOnceScheduler, timeout } from '../../../../base/common/async.js';
+import { memoize } from '../../../../base/common/decorators.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { dispose, disposeIfDisposable, IDisposable } from '../../../../base/common/lifecycle.js';
+import * as env from '../../../../base/common/platform.js';
+import severity from '../../../../base/common/severity.js';
+import { noBreakWhitespace } from '../../../../base/common/strings.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { URI } from '../../../../base/common/uri.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { ContentWidgetPositionPreference, IActiveCodeEditor, ICodeEditor, IContentWidget, IContentWidgetPosition, IEditorMouseEvent, MouseTargetType } from '../../../../editor/browser/editorBrowser.js';
+import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
+import { IPosition } from '../../../../editor/common/core/position.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { GlyphMarginLane, IModelDecorationOptions, IModelDecorationOverviewRulerOptions, IModelDecorationsChangeAccessor, ITextModel, OverviewRulerLane, TrackedRangeStickiness } from '../../../../editor/common/model.js';
+import * as nls from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { registerColor } from '../../../../platform/theme/common/colorRegistry.js';
+import { registerThemingParticipant, themeColorFromId } from '../../../../platform/theme/common/themeService.js';
+import { GutterActionsRegistry } from '../../codeEditor/browser/editorLineNumberMenu.js';
+import { getBreakpointMessageAndIcon } from './breakpointsView.js';
+import { BreakpointWidget } from './breakpointWidget.js';
+import * as icons from './debugIcons.js';
+import { BREAKPOINT_EDITOR_CONTRIBUTION_ID, BreakpointWidgetContext, CONTEXT_BREAKPOINT_WIDGET_VISIBLE, DebuggerString, IBreakpoint, IBreakpointEditorContribution, IBreakpointUpdateData, IDebugConfiguration, IDebugService, IDebugSession, State } from '../common/debug.js';
 
 const $ = dom.$;
 
@@ -504,7 +504,7 @@ export class BreakpointEditorContribution implements IBreakpointEditorContributi
 				if (!clz) {
 					continue;
 				}
-				const hasSomeActionableCodicon = !(clz.includes('codicon-') || clz.startsWith('coverage-deco-')) || clz.includes('codicon-testing-') || clz.includes('codicon-merge-') || clz.includes('codicon-arrow-') || clz.includes('codicon-loading') || clz.includes('codicon-fold') || clz.includes('codicon-inline-chat');
+				const hasSomeActionableCodicon = !(clz.includes('codicon-') || clz.startsWith('coverage-deco-')) || clz.includes('codicon-testing-') || clz.includes('codicon-merge-') || clz.includes('codicon-arrow-') || clz.includes('codicon-loading') || clz.includes('codicon-fold') || clz.includes('codicon-gutter-lightbulb') || clz.includes('codicon-lightbulb-sparkle');
 				if (hasSomeActionableCodicon) {
 					return false;
 				}
@@ -811,66 +811,71 @@ class InlineBreakpointWidget implements IContentWidget, IDisposable {
 }
 
 registerThemingParticipant((theme, collector) => {
+	const scope = '.monaco-editor .glyph-margin-widgets, .monaco-workbench .debug-breakpoints, .monaco-workbench .disassembly-view, .monaco-editor .contentWidgets';
 	const debugIconBreakpointColor = theme.getColor(debugIconBreakpointForeground);
 	if (debugIconBreakpointColor) {
-		collector.addRule(`
-		${icons.allBreakpoints.map(b => `.monaco-workbench ${ThemeIcon.asCSSSelector(b.regular)}`).join(',\n		')},
-		.monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugBreakpointUnsupported)},
-		.monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugBreakpointHint)}:not([class*='codicon-debug-breakpoint']):not([class*='codicon-debug-stackframe']),
-		.monaco-workbench ${ThemeIcon.asCSSSelector(icons.breakpoint.regular)}${ThemeIcon.asCSSSelector(icons.debugStackframeFocused)}::after,
-		.monaco-workbench ${ThemeIcon.asCSSSelector(icons.breakpoint.regular)}${ThemeIcon.asCSSSelector(icons.debugStackframe)}::after {
-			color: ${debugIconBreakpointColor} !important;
-		}
-		`);
+		collector.addRule(`${scope} {
+			${icons.allBreakpoints.map(b => `${ThemeIcon.asCSSSelector(b.regular)}`).join(',\n		')},
+			${ThemeIcon.asCSSSelector(icons.debugBreakpointUnsupported)},
+			${ThemeIcon.asCSSSelector(icons.debugBreakpointHint)}:not([class*='codicon-debug-breakpoint']):not([class*='codicon-debug-stackframe']),
+			${ThemeIcon.asCSSSelector(icons.breakpoint.regular)}${ThemeIcon.asCSSSelector(icons.debugStackframeFocused)}::after,
+			${ThemeIcon.asCSSSelector(icons.breakpoint.regular)}${ThemeIcon.asCSSSelector(icons.debugStackframe)}::after {
+				color: ${debugIconBreakpointColor} !important;
+			}
+		}`);
 
-		collector.addRule(`
-		.monaco-workbench ${ThemeIcon.asCSSSelector(icons.breakpoint.pending)} {
-			color: ${debugIconBreakpointColor} !important;
-			font-size: 12px !important;
-		}
-		`);
+		collector.addRule(`${scope} {
+			${ThemeIcon.asCSSSelector(icons.breakpoint.pending)} {
+				color: ${debugIconBreakpointColor} !important;
+				font-size: 12px !important;
+			}
+		}`);
 	}
 
 	const debugIconBreakpointDisabledColor = theme.getColor(debugIconBreakpointDisabledForeground);
 	if (debugIconBreakpointDisabledColor) {
-		collector.addRule(`
-		${icons.allBreakpoints.map(b => `.monaco-workbench ${ThemeIcon.asCSSSelector(b.disabled)}`).join(',\n		')} {
-			color: ${debugIconBreakpointDisabledColor};
-		}
-		`);
+		collector.addRule(`${scope} {
+			${icons.allBreakpoints.map(b => ThemeIcon.asCSSSelector(b.disabled)).join(',\n		')} {
+				color: ${debugIconBreakpointDisabledColor};
+			}
+		}`);
 	}
 
 	const debugIconBreakpointUnverifiedColor = theme.getColor(debugIconBreakpointUnverifiedForeground);
 	if (debugIconBreakpointUnverifiedColor) {
-		collector.addRule(`
-		${icons.allBreakpoints.map(b => `.monaco-workbench ${ThemeIcon.asCSSSelector(b.unverified)}`).join(',\n		')} {
-			color: ${debugIconBreakpointUnverifiedColor};
-		}
-		`);
+		collector.addRule(`${scope} {
+			${icons.allBreakpoints.map(b => ThemeIcon.asCSSSelector(b.unverified)).join(',\n		')} {
+				color: ${debugIconBreakpointUnverifiedColor};
+			}
+		}`);
 	}
 
 	const debugIconBreakpointCurrentStackframeForegroundColor = theme.getColor(debugIconBreakpointCurrentStackframeForeground);
 	if (debugIconBreakpointCurrentStackframeForegroundColor) {
 		collector.addRule(`
-		.monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugStackframe)},
 		.monaco-editor .debug-top-stack-frame-column {
 			color: ${debugIconBreakpointCurrentStackframeForegroundColor} !important;
 		}
+		${scope} {
+			${ThemeIcon.asCSSSelector(icons.debugStackframe)} {
+				color: ${debugIconBreakpointCurrentStackframeForegroundColor} !important;
+			}
+		}
 		`);
 	}
 
 	const debugIconBreakpointStackframeFocusedColor = theme.getColor(debugIconBreakpointStackframeForeground);
 	if (debugIconBreakpointStackframeFocusedColor) {
-		collector.addRule(`
-		.monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugStackframeFocused)} {
-			color: ${debugIconBreakpointStackframeFocusedColor} !important;
-		}
-		`);
+		collector.addRule(`${scope} {
+			${ThemeIcon.asCSSSelector(icons.debugStackframeFocused)} {
+				color: ${debugIconBreakpointStackframeFocusedColor} !important;
+			}
+		}`);
 	}
 });
 
-export const debugIconBreakpointForeground = registerColor('debugIcon.breakpointForeground', { dark: '#E51400', light: '#E51400', hcDark: '#E51400', hcLight: '#E51400' }, nls.localize('debugIcon.breakpointForeground', 'Icon color for breakpoints.'));
-const debugIconBreakpointDisabledForeground = registerColor('debugIcon.breakpointDisabledForeground', { dark: '#848484', light: '#848484', hcDark: '#848484', hcLight: '#848484' }, nls.localize('debugIcon.breakpointDisabledForeground', 'Icon color for disabled breakpoints.'));
-const debugIconBreakpointUnverifiedForeground = registerColor('debugIcon.breakpointUnverifiedForeground', { dark: '#848484', light: '#848484', hcDark: '#848484', hcLight: '#848484' }, nls.localize('debugIcon.breakpointUnverifiedForeground', 'Icon color for unverified breakpoints.'));
+export const debugIconBreakpointForeground = registerColor('debugIcon.breakpointForeground', '#E51400', nls.localize('debugIcon.breakpointForeground', 'Icon color for breakpoints.'));
+const debugIconBreakpointDisabledForeground = registerColor('debugIcon.breakpointDisabledForeground', '#848484', nls.localize('debugIcon.breakpointDisabledForeground', 'Icon color for disabled breakpoints.'));
+const debugIconBreakpointUnverifiedForeground = registerColor('debugIcon.breakpointUnverifiedForeground', '#848484', nls.localize('debugIcon.breakpointUnverifiedForeground', 'Icon color for unverified breakpoints.'));
 const debugIconBreakpointCurrentStackframeForeground = registerColor('debugIcon.breakpointCurrentStackframeForeground', { dark: '#FFCC00', light: '#BE8700', hcDark: '#FFCC00', hcLight: '#BE8700' }, nls.localize('debugIcon.breakpointCurrentStackframeForeground', 'Icon color for the current breakpoint stack frame.'));
-const debugIconBreakpointStackframeForeground = registerColor('debugIcon.breakpointStackframeForeground', { dark: '#89D185', light: '#89D185', hcDark: '#89D185', hcLight: '#89D185' }, nls.localize('debugIcon.breakpointStackframeForeground', 'Icon color for all breakpoint stack frames.'));
+const debugIconBreakpointStackframeForeground = registerColor('debugIcon.breakpointStackframeForeground', '#89D185', nls.localize('debugIcon.breakpointStackframeForeground', 'Icon color for all breakpoint stack frames.'));
diff --git a/src/vs/workbench/contrib/debug/browser/breakpointWidget.ts b/src/vs/workbench/contrib/debug/browser/breakpointWidget.ts
index 11a82d72c3a..54b56d569fe 100644
--- a/src/vs/workbench/contrib/debug/browser/breakpointWidget.ts
+++ b/src/vs/workbench/contrib/debug/browser/breakpointWidget.ts
@@ -3,47 +3,49 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { Button } from 'vs/base/browser/ui/button/button';
-import { ISelectOptionItem, SelectBox } from 'vs/base/browser/ui/selectBox/selectBox';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import * as lifecycle from 'vs/base/common/lifecycle';
-import { URI as uri } from 'vs/base/common/uri';
-import 'vs/css!./media/breakpointWidget';
-import { IActiveCodeEditor, ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorCommand, ServicesAccessor, registerEditorCommand } from 'vs/editor/browser/editorExtensions';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { EditorOption, IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { IDecorationOptions } from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { CompletionContext, CompletionItemKind, CompletionList } from 'vs/editor/common/languages';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { ITextModel } from 'vs/editor/common/model';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { CompletionOptions, provideSuggestionItems } from 'vs/editor/contrib/suggest/browser/suggest';
-import { ZoneWidget } from 'vs/editor/contrib/zoneWidget/browser/zoneWidget';
-import * as nls from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService, createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { defaultButtonStyles, defaultSelectBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { editorForeground } from 'vs/platform/theme/common/colorRegistry';
-import { IColorTheme, IThemeService } from 'vs/platform/theme/common/themeService';
-import { getSimpleCodeEditorWidgetOptions, getSimpleEditorOptions } from 'vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
-import { BREAKPOINT_EDITOR_CONTRIBUTION_ID, CONTEXT_BREAKPOINT_WIDGET_VISIBLE, CONTEXT_IN_BREAKPOINT_WIDGET, BreakpointWidgetContext as Context, DEBUG_SCHEME, IBreakpoint, IBreakpointEditorContribution, IBreakpointUpdateData, IDebugService } from 'vs/workbench/contrib/debug/common/debug';
+import * as dom from '../../../../base/browser/dom.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { Button } from '../../../../base/browser/ui/button/button.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { ISelectOptionItem, SelectBox } from '../../../../base/browser/ui/selectBox/selectBox.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import * as lifecycle from '../../../../base/common/lifecycle.js';
+import { URI as uri } from '../../../../base/common/uri.js';
+import './media/breakpointWidget.css';
+import { IActiveCodeEditor, ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { EditorCommand, ServicesAccessor, registerEditorCommand } from '../../../../editor/browser/editorExtensions.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { CodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { EditorOption, IEditorOptions } from '../../../../editor/common/config/editorOptions.js';
+import { IPosition, Position } from '../../../../editor/common/core/position.js';
+import { IRange, Range } from '../../../../editor/common/core/range.js';
+import { IDecorationOptions } from '../../../../editor/common/editorCommon.js';
+import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
+import { CompletionContext, CompletionItemKind, CompletionList } from '../../../../editor/common/languages.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../../../../editor/common/languages/modesRegistry.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { CompletionOptions, provideSuggestionItems } from '../../../../editor/contrib/suggest/browser/suggest.js';
+import { ZoneWidget } from '../../../../editor/contrib/zoneWidget/browser/zoneWidget.js';
+import * as nls from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IInstantiationService, createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { defaultButtonStyles, defaultSelectBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { editorForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import { IColorTheme, IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { getSimpleCodeEditorWidgetOptions, getSimpleEditorOptions } from '../../codeEditor/browser/simpleEditorOptions.js';
+import { BREAKPOINT_EDITOR_CONTRIBUTION_ID, CONTEXT_BREAKPOINT_WIDGET_VISIBLE, CONTEXT_IN_BREAKPOINT_WIDGET, BreakpointWidgetContext as Context, DEBUG_SCHEME, IBreakpoint, IBreakpointEditorContribution, IBreakpointUpdateData, IDebugService } from '../common/debug.js';
 
 const $ = dom.$;
 const IPrivateBreakpointWidgetService = createDecorator<IPrivateBreakpointWidgetService>('privateBreakpointWidgetService');
@@ -109,6 +111,7 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakpointWi
 		@IKeybindingService private readonly keybindingService: IKeybindingService,
 		@ILabelService private readonly labelService: ILabelService,
 		@ITextModelService private readonly textModelService: ITextModelService,
+		@IHoverService private readonly hoverService: IHoverService
 	) {
 		super(editor, { showFrame: true, showArrow: false, frameWidth: 1, isAccessible: true });
 
@@ -204,12 +207,12 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakpointWi
 
 	protected _fillContainer(container: HTMLElement): void {
 		this.setCssClass('breakpoint-widget');
-		const selectBox = new SelectBox(<ISelectOptionItem[]>[
+		const selectBox = new SelectBox([
 			{ text: nls.localize('expression', "Expression") },
 			{ text: nls.localize('hitCount', "Hit Count") },
 			{ text: nls.localize('logMessage', "Log Message") },
 			{ text: nls.localize('triggeredBy', "Wait for Breakpoint") },
-		], this.context, this.contextViewService, defaultSelectBoxStyles, { ariaLabel: nls.localize('breakpointType', 'Breakpoint Type') });
+		] satisfies ISelectOptionItem[], this.context, this.contextViewService, defaultSelectBoxStyles, { ariaLabel: nls.localize('breakpointType', 'Breakpoint Type') });
 		this.selectContainer = $('.breakpoint-select-container');
 		selectBox.render(dom.append(container, this.selectContainer));
 		selectBox.onDidSelect(e => {
@@ -221,6 +224,7 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakpointWi
 		this.createModesInput(container);
 
 		this.inputContainer = $('.inputContainer');
+		this.toDispose.push(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), this.inputContainer, this.placeholder));
 		this.createBreakpointInput(dom.append(container, this.inputContainer));
 
 		this.input.getModel().setValue(this.getInputValue(this.breakpoint));
diff --git a/src/vs/workbench/contrib/debug/browser/breakpointsView.ts b/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
index 3ca9114d882..58dd961da31 100644
--- a/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
+++ b/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
@@ -3,66 +3,67 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { Gesture } from 'vs/base/browser/touch';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { AriaRole } from 'vs/base/browser/ui/aria/aria';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { IconLabel } from 'vs/base/browser/ui/iconLabel/iconLabel';
-import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox';
-import { IListContextMenuEvent, IListRenderer, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
-import { Orientation } from 'vs/base/browser/ui/splitview/splitview';
-import { Action, IAction } from 'vs/base/common/actions';
-import { equals } from 'vs/base/common/arrays';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { Codicon } from 'vs/base/common/codicons';
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import * as resources from 'vs/base/common/resources';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { Constants } from 'vs/base/common/uint';
-import { isCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { localize, localize2 } from 'vs/nls';
-import { createAndFillInActionBarActions, createAndFillInContextMenuActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { Action2, IMenu, IMenuService, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { TextEditorSelectionRevealType } from 'vs/platform/editor/common/editor';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { WorkbenchList } from 'vs/platform/list/browser/listService';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { defaultInputBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ViewAction, ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
-import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
-import { IEditorPane } from 'vs/workbench/common/editor';
-import { IViewDescriptorService } from 'vs/workbench/common/views';
-import * as icons from 'vs/workbench/contrib/debug/browser/debugIcons';
-import { DisassemblyView } from 'vs/workbench/contrib/debug/browser/disassemblyView';
-import { BREAKPOINTS_VIEW_ID, BREAKPOINT_EDITOR_CONTRIBUTION_ID, CONTEXT_BREAKPOINTS_EXIST, CONTEXT_BREAKPOINTS_FOCUSED, CONTEXT_BREAKPOINT_HAS_MODES, CONTEXT_BREAKPOINT_INPUT_FOCUSED, CONTEXT_BREAKPOINT_ITEM_IS_DATA_BYTES, CONTEXT_BREAKPOINT_ITEM_TYPE, CONTEXT_BREAKPOINT_SUPPORTS_CONDITION, CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_IN_DEBUG_MODE, CONTEXT_SET_DATA_BREAKPOINT_BYTES_SUPPORTED, DEBUG_SCHEME, DataBreakpointSetType, DataBreakpointSource, DebuggerString, IBaseBreakpoint, IBreakpoint, IBreakpointEditorContribution, IBreakpointUpdateData, IDataBreakpoint, IDataBreakpointInfoResponse, IDebugModel, IDebugService, IEnablement, IExceptionBreakpoint, IFunctionBreakpoint, IInstructionBreakpoint, State } from 'vs/workbench/contrib/debug/common/debug';
-import { Breakpoint, DataBreakpoint, ExceptionBreakpoint, FunctionBreakpoint, InstructionBreakpoint } from 'vs/workbench/contrib/debug/common/debugModel';
-import { DisassemblyViewInput } from 'vs/workbench/contrib/debug/common/disassemblyViewInput';
-import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { INotificationService } from 'vs/platform/notification/common/notification';
+import * as dom from '../../../../base/browser/dom.js';
+import { IKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { Gesture } from '../../../../base/browser/touch.js';
+import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { AriaRole } from '../../../../base/browser/ui/aria/aria.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { IconLabel } from '../../../../base/browser/ui/iconLabel/iconLabel.js';
+import { InputBox } from '../../../../base/browser/ui/inputbox/inputBox.js';
+import { IListContextMenuEvent, IListRenderer, IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
+import { IListAccessibilityProvider } from '../../../../base/browser/ui/list/listWidget.js';
+import { Orientation } from '../../../../base/browser/ui/splitview/splitview.js';
+import { Action, IAction } from '../../../../base/common/actions.js';
+import { equals } from '../../../../base/common/arrays.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { DisposableStore, dispose } from '../../../../base/common/lifecycle.js';
+import * as resources from '../../../../base/common/resources.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { Constants } from '../../../../base/common/uint.js';
+import { isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { createAndFillInActionBarActions, createAndFillInContextMenuActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { Action2, IMenu, IMenuService, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService, IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { TextEditorSelectionRevealType } from '../../../../platform/editor/common/editor.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { WorkbenchList } from '../../../../platform/list/browser/listService.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { defaultInputBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ViewAction, ViewPane } from '../../../browser/parts/views/viewPane.js';
+import { IViewletViewOptions } from '../../../browser/parts/views/viewsViewlet.js';
+import { IEditorPane } from '../../../common/editor.js';
+import { IViewDescriptorService } from '../../../common/views.js';
+import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } from '../../../services/editor/common/editorService.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { BREAKPOINTS_VIEW_ID, BREAKPOINT_EDITOR_CONTRIBUTION_ID, CONTEXT_BREAKPOINTS_EXIST, CONTEXT_BREAKPOINTS_FOCUSED, CONTEXT_BREAKPOINT_HAS_MODES, CONTEXT_BREAKPOINT_INPUT_FOCUSED, CONTEXT_BREAKPOINT_ITEM_IS_DATA_BYTES, CONTEXT_BREAKPOINT_ITEM_TYPE, CONTEXT_BREAKPOINT_SUPPORTS_CONDITION, CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_IN_DEBUG_MODE, CONTEXT_SET_DATA_BREAKPOINT_BYTES_SUPPORTED, DEBUG_SCHEME, DataBreakpointSetType, DataBreakpointSource, DebuggerString, IBaseBreakpoint, IBreakpoint, IBreakpointEditorContribution, IBreakpointUpdateData, IDataBreakpoint, IDataBreakpointInfoResponse, IDebugModel, IDebugService, IEnablement, IExceptionBreakpoint, IFunctionBreakpoint, IInstructionBreakpoint, State } from '../common/debug.js';
+import { Breakpoint, DataBreakpoint, ExceptionBreakpoint, FunctionBreakpoint, InstructionBreakpoint } from '../common/debugModel.js';
+import { DisassemblyViewInput } from '../common/disassemblyViewInput.js';
+import * as icons from './debugIcons.js';
+import { DisassemblyView } from './disassemblyView.js';
 
 const $ = dom.$;
 
-function createCheckbox(disposables: IDisposable[]): HTMLInputElement {
+function createCheckbox(disposables: DisposableStore): HTMLInputElement {
 	const checkbox = <HTMLInputElement>$('input');
 	checkbox.type = 'checkbox';
 	checkbox.tabIndex = -1;
-	disposables.push(Gesture.ignoreTarget(checkbox));
+	disposables.add(Gesture.ignoreTarget(checkbox));
 
 	return checkbox;
 }
@@ -431,7 +432,8 @@ interface IBaseBreakpointTemplateData {
 	checkbox: HTMLInputElement;
 	context: BreakpointItem;
 	actionBar: ActionBar;
-	toDispose: IDisposable[];
+	templateDisposables: DisposableStore;
+	elementDisposables: DisposableStore;
 	badge: HTMLElement;
 }
 
@@ -465,7 +467,8 @@ interface IFunctionBreakpointInputTemplateData {
 	checkbox: HTMLInputElement;
 	icon: HTMLElement;
 	breakpoint: IFunctionBreakpoint;
-	toDispose: IDisposable[];
+	templateDisposables: DisposableStore;
+	elementDisposables: DisposableStore;
 	type: 'hitCount' | 'condition' | 'name';
 	updating?: boolean;
 }
@@ -475,7 +478,8 @@ interface IDataBreakpointInputTemplateData {
 	checkbox: HTMLInputElement;
 	icon: HTMLElement;
 	breakpoint: IDataBreakpoint;
-	toDispose: IDisposable[];
+	elementDisposables: DisposableStore;
+	templateDisposables: DisposableStore;
 	type: 'hitCount' | 'condition' | 'name';
 	updating?: boolean;
 }
@@ -484,7 +488,8 @@ interface IExceptionBreakpointInputTemplateData {
 	inputBox: InputBox;
 	checkbox: HTMLInputElement;
 	breakpoint: IExceptionBreakpoint;
-	toDispose: IDisposable[];
+	templateDisposables: DisposableStore;
+	elementDisposables: DisposableStore;
 }
 
 const breakpointIdToActionBarDomeNode = new Map<string, HTMLElement>();
@@ -510,14 +515,16 @@ class BreakpointsRenderer implements IListRenderer<IBreakpoint, IBreakpointTempl
 
 	renderTemplate(container: HTMLElement): IBreakpointTemplateData {
 		const data: IBreakpointTemplateData = Object.create(null);
-		data.toDispose = [];
+		data.elementDisposables = new DisposableStore();
+		data.templateDisposables = new DisposableStore();
+		data.templateDisposables.add(data.elementDisposables);
 
 		data.breakpoint = dom.append(container, $('.breakpoint'));
 
 		data.icon = $('.icon');
-		data.checkbox = createCheckbox(data.toDispose);
+		data.checkbox = createCheckbox(data.templateDisposables);
 
-		data.toDispose.push(dom.addStandardDisposableListener(data.checkbox, 'change', (e) => {
+		data.templateDisposables.add(dom.addStandardDisposableListener(data.checkbox, 'change', (e) => {
 			this.debugService.enableOrDisableBreakpoints(!data.context.enabled, data.context);
 		}));
 
@@ -528,7 +535,7 @@ class BreakpointsRenderer implements IListRenderer<IBreakpoint, IBreakpointTempl
 
 		data.filePath = dom.append(data.breakpoint, $('span.file-path'));
 		data.actionBar = new ActionBar(data.breakpoint);
-		data.toDispose.push(data.actionBar);
+		data.templateDisposables.add(data.actionBar);
 		const badgeContainer = dom.append(data.breakpoint, $('.badge-container'));
 		data.badge = dom.append(badgeContainer, $('span.line-number.monaco-count-badge'));
 
@@ -553,7 +560,7 @@ class BreakpointsRenderer implements IListRenderer<IBreakpoint, IBreakpointTempl
 
 		const { message, icon } = getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), breakpoint, this.labelService, this.debugService.getModel());
 		data.icon.className = ThemeIcon.asClassName(icon);
-		data.toDispose.push(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.breakpoint, breakpoint.message || message || ''));
+		data.elementDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.breakpoint, breakpoint.message || message || ''));
 
 		const debugActive = this.debugService.state === State.Running || this.debugService.state === State.Stopped;
 		if (debugActive && !breakpoint.verified) {
@@ -571,8 +578,14 @@ class BreakpointsRenderer implements IListRenderer<IBreakpoint, IBreakpointTempl
 		breakpointIdToActionBarDomeNode.set(breakpoint.getId(), data.actionBar.domNode);
 	}
 
+
+
+	disposeElement(a: any, index: number, template: IBreakpointTemplateData): void {
+		template.elementDisposables.clear();
+	}
+
 	disposeTemplate(templateData: IBreakpointTemplateData): void {
-		dispose(templateData.toDispose);
+		templateData.templateDisposables.dispose();
 	}
 }
 
@@ -597,11 +610,13 @@ class ExceptionBreakpointsRenderer implements IListRenderer<IExceptionBreakpoint
 
 	renderTemplate(container: HTMLElement): IExceptionBreakpointTemplateData {
 		const data: IExceptionBreakpointTemplateData = Object.create(null);
-		data.toDispose = [];
+		data.elementDisposables = new DisposableStore();
+		data.templateDisposables = new DisposableStore();
+		data.templateDisposables.add(data.elementDisposables);
 		data.breakpoint = dom.append(container, $('.breakpoint'));
 
-		data.checkbox = createCheckbox(data.toDispose);
-		data.toDispose.push(dom.addStandardDisposableListener(data.checkbox, 'change', (e) => {
+		data.checkbox = createCheckbox(data.templateDisposables);
+		data.templateDisposables.add(dom.addStandardDisposableListener(data.checkbox, 'change', (e) => {
 			this.debugService.enableOrDisableBreakpoints(!data.context.enabled, data.context);
 		}));
 
@@ -612,7 +627,7 @@ class ExceptionBreakpointsRenderer implements IListRenderer<IExceptionBreakpoint
 		data.breakpoint.classList.add('exception');
 
 		data.actionBar = new ActionBar(data.breakpoint);
-		data.toDispose.push(data.actionBar);
+		data.templateDisposables.add(data.actionBar);
 		const badgeContainer = dom.append(data.breakpoint, $('.badge-container'));
 		data.badge = dom.append(badgeContainer, $('span.line-number.monaco-count-badge'));
 
@@ -623,11 +638,11 @@ class ExceptionBreakpointsRenderer implements IListRenderer<IExceptionBreakpoint
 		data.context = exceptionBreakpoint;
 		data.name.textContent = exceptionBreakpoint.label || `${exceptionBreakpoint.filter} exceptions`;
 		const exceptionBreakpointtitle = exceptionBreakpoint.verified ? (exceptionBreakpoint.description || data.name.textContent) : exceptionBreakpoint.message || localize('unverifiedExceptionBreakpoint', "Unverified Exception Breakpoint");
-		data.toDispose.push(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.breakpoint, exceptionBreakpointtitle));
+		data.elementDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.breakpoint, exceptionBreakpointtitle));
 		data.breakpoint.classList.toggle('disabled', !exceptionBreakpoint.verified);
 		data.checkbox.checked = exceptionBreakpoint.enabled;
 		data.condition.textContent = exceptionBreakpoint.condition || '';
-		data.toDispose.push(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.condition, localize('expressionCondition', "Expression condition: {0}", exceptionBreakpoint.condition)));
+		data.elementDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.condition, localize('expressionCondition', "Expression condition: {0}", exceptionBreakpoint.condition)));
 
 		if (exceptionBreakpoint.modeLabel) {
 			data.badge.textContent = exceptionBreakpoint.modeLabel;
@@ -646,8 +661,12 @@ class ExceptionBreakpointsRenderer implements IListRenderer<IExceptionBreakpoint
 		breakpointIdToActionBarDomeNode.set(exceptionBreakpoint.getId(), data.actionBar.domNode);
 	}
 
+	disposeElement(element: IExceptionBreakpoint, index: number, templateData: IExceptionBreakpointTemplateData, height: number | undefined): void {
+		templateData.elementDisposables.clear();
+	}
+
 	disposeTemplate(templateData: IExceptionBreakpointTemplateData): void {
-		dispose(templateData.toDispose);
+		templateData.templateDisposables.dispose();
 	}
 }
 
@@ -672,12 +691,14 @@ class FunctionBreakpointsRenderer implements IListRenderer<FunctionBreakpoint, I
 
 	renderTemplate(container: HTMLElement): IFunctionBreakpointTemplateData {
 		const data: IFunctionBreakpointTemplateData = Object.create(null);
-		data.toDispose = [];
+		data.elementDisposables = new DisposableStore();
+		data.templateDisposables = new DisposableStore();
+		data.templateDisposables.add(data.elementDisposables);
 		data.breakpoint = dom.append(container, $('.breakpoint'));
 
 		data.icon = $('.icon');
-		data.checkbox = createCheckbox(data.toDispose);
-		data.toDispose.push(dom.addStandardDisposableListener(data.checkbox, 'change', (e) => {
+		data.checkbox = createCheckbox(data.templateDisposables);
+		data.templateDisposables.add(dom.addStandardDisposableListener(data.checkbox, 'change', (e) => {
 			this.debugService.enableOrDisableBreakpoints(!data.context.enabled, data.context);
 		}));
 
@@ -688,7 +709,7 @@ class FunctionBreakpointsRenderer implements IListRenderer<FunctionBreakpoint, I
 		data.condition = dom.append(data.breakpoint, $('span.condition'));
 
 		data.actionBar = new ActionBar(data.breakpoint);
-		data.toDispose.push(data.actionBar);
+		data.templateDisposables.add(data.actionBar);
 		const badgeContainer = dom.append(data.breakpoint, $('.badge-container'));
 		data.badge = dom.append(badgeContainer, $('span.line-number.monaco-count-badge'));
 
@@ -700,9 +721,9 @@ class FunctionBreakpointsRenderer implements IListRenderer<FunctionBreakpoint, I
 		data.name.textContent = functionBreakpoint.name;
 		const { icon, message } = getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), functionBreakpoint, this.labelService, this.debugService.getModel());
 		data.icon.className = ThemeIcon.asClassName(icon);
-		data.toDispose.push(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.icon, message ? message : ''));
+		data.elementDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.icon, message ? message : ''));
 		data.checkbox.checked = functionBreakpoint.enabled;
-		data.toDispose.push(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.breakpoint, message ? message : ''));
+		data.elementDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.breakpoint, message ? message : ''));
 		if (functionBreakpoint.condition && functionBreakpoint.hitCondition) {
 			data.condition.textContent = localize('expressionAndHitCount', "Condition: {0} | Hit Count: {1}", functionBreakpoint.condition, functionBreakpoint.hitCondition);
 		} else {
@@ -720,7 +741,7 @@ class FunctionBreakpointsRenderer implements IListRenderer<FunctionBreakpoint, I
 		const session = this.debugService.getViewModel().focusedSession;
 		data.breakpoint.classList.toggle('disabled', (session && !session.capabilities.supportsFunctionBreakpoints) || !this.debugService.getModel().areBreakpointsActivated());
 		if (session && !session.capabilities.supportsFunctionBreakpoints) {
-			data.toDispose.push(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.breakpoint, localize('functionBreakpointsNotSupported', "Function breakpoints are not supported by this debug type")));
+			data.elementDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.breakpoint, localize('functionBreakpointsNotSupported', "Function breakpoints are not supported by this debug type")));
 		}
 
 		const primary: IAction[] = [];
@@ -732,8 +753,12 @@ class FunctionBreakpointsRenderer implements IListRenderer<FunctionBreakpoint, I
 		breakpointIdToActionBarDomeNode.set(functionBreakpoint.getId(), data.actionBar.domNode);
 	}
 
+	disposeElement(element: FunctionBreakpoint, index: number, templateData: IFunctionBreakpointTemplateData, height: number | undefined): void {
+		templateData.elementDisposables.clear();
+	}
+
 	disposeTemplate(templateData: IFunctionBreakpointTemplateData): void {
-		dispose(templateData.toDispose);
+		templateData.templateDisposables.dispose();
 	}
 }
 
@@ -761,11 +786,13 @@ class DataBreakpointsRenderer implements IListRenderer<DataBreakpoint, IDataBrea
 	renderTemplate(container: HTMLElement): IDataBreakpointTemplateData {
 		const data: IDataBreakpointTemplateData = Object.create(null);
 		data.breakpoint = dom.append(container, $('.breakpoint'));
-		data.toDispose = [];
+		data.elementDisposables = new DisposableStore();
+		data.templateDisposables = new DisposableStore();
+		data.templateDisposables.add(data.elementDisposables);
 
 		data.icon = $('.icon');
-		data.checkbox = createCheckbox(data.toDispose);
-		data.toDispose.push(dom.addStandardDisposableListener(data.checkbox, 'change', (e) => {
+		data.checkbox = createCheckbox(data.templateDisposables);
+		data.templateDisposables.add(dom.addStandardDisposableListener(data.checkbox, 'change', (e) => {
 			this.debugService.enableOrDisableBreakpoints(!data.context.enabled, data.context);
 		}));
 
@@ -777,7 +804,7 @@ class DataBreakpointsRenderer implements IListRenderer<DataBreakpoint, IDataBrea
 		data.condition = dom.append(data.breakpoint, $('span.condition'));
 
 		data.actionBar = new ActionBar(data.breakpoint);
-		data.toDispose.push(data.actionBar);
+		data.templateDisposables.add(data.actionBar);
 		const badgeContainer = dom.append(data.breakpoint, $('.badge-container'));
 		data.badge = dom.append(badgeContainer, $('span.line-number.monaco-count-badge'));
 
@@ -789,9 +816,9 @@ class DataBreakpointsRenderer implements IListRenderer<DataBreakpoint, IDataBrea
 		data.name.textContent = dataBreakpoint.description;
 		const { icon, message } = getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), dataBreakpoint, this.labelService, this.debugService.getModel());
 		data.icon.className = ThemeIcon.asClassName(icon);
-		data.toDispose.push(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.icon, message ? message : ''));
+		data.elementDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.icon, message ? message : ''));
 		data.checkbox.checked = dataBreakpoint.enabled;
-		data.toDispose.push(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.breakpoint, message ? message : ''));
+		data.elementDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.breakpoint, message ? message : ''));
 
 		if (dataBreakpoint.modeLabel) {
 			data.badge.textContent = dataBreakpoint.modeLabel;
@@ -804,7 +831,7 @@ class DataBreakpointsRenderer implements IListRenderer<DataBreakpoint, IDataBrea
 		const session = this.debugService.getViewModel().focusedSession;
 		data.breakpoint.classList.toggle('disabled', (session && !session.capabilities.supportsDataBreakpoints) || !this.debugService.getModel().areBreakpointsActivated());
 		if (session && !session.capabilities.supportsDataBreakpoints) {
-			data.toDispose.push(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.breakpoint, localize('dataBreakpointsNotSupported', "Data breakpoints are not supported by this debug type")));
+			data.elementDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.breakpoint, localize('dataBreakpointsNotSupported', "Data breakpoints are not supported by this debug type")));
 		}
 		if (dataBreakpoint.accessType) {
 			const accessType = dataBreakpoint.accessType === 'read' ? localize('read', "Read") : dataBreakpoint.accessType === 'write' ? localize('write', "Write") : localize('access', "Access");
@@ -830,8 +857,12 @@ class DataBreakpointsRenderer implements IListRenderer<DataBreakpoint, IDataBrea
 		this.breakpointIsDataBytes.reset();
 	}
 
+	disposeElement(element: DataBreakpoint, index: number, templateData: IDataBreakpointTemplateData, height: number | undefined): void {
+		templateData.elementDisposables.clear();
+	}
+
 	disposeTemplate(templateData: IBaseBreakpointWithIconTemplateData): void {
-		dispose(templateData.toDispose);
+		templateData.templateDisposables.dispose();
 	}
 }
 
@@ -853,12 +884,14 @@ class InstructionBreakpointsRenderer implements IListRenderer<IInstructionBreakp
 
 	renderTemplate(container: HTMLElement): IInstructionBreakpointTemplateData {
 		const data: IInstructionBreakpointTemplateData = Object.create(null);
-		data.toDispose = [];
+		data.elementDisposables = new DisposableStore();
+		data.templateDisposables = new DisposableStore();
+		data.templateDisposables.add(data.elementDisposables);
 		data.breakpoint = dom.append(container, $('.breakpoint'));
 
 		data.icon = $('.icon');
-		data.checkbox = createCheckbox(data.toDispose);
-		data.toDispose.push(dom.addStandardDisposableListener(data.checkbox, 'change', (e) => {
+		data.checkbox = createCheckbox(data.templateDisposables);
+		data.templateDisposables.add(dom.addStandardDisposableListener(data.checkbox, 'change', (e) => {
 			this.debugService.enableOrDisableBreakpoints(!data.context.enabled, data.context);
 		}));
 
@@ -869,7 +902,7 @@ class InstructionBreakpointsRenderer implements IListRenderer<IInstructionBreakp
 
 		data.address = dom.append(data.breakpoint, $('span.file-path'));
 		data.actionBar = new ActionBar(data.breakpoint);
-		data.toDispose.push(data.actionBar);
+		data.templateDisposables.add(data.actionBar);
 		const badgeContainer = dom.append(data.breakpoint, $('.badge-container'));
 		data.badge = dom.append(badgeContainer, $('span.line-number.monaco-count-badge'));
 
@@ -881,12 +914,12 @@ class InstructionBreakpointsRenderer implements IListRenderer<IInstructionBreakp
 		data.breakpoint.classList.toggle('disabled', !this.debugService.getModel().areBreakpointsActivated());
 
 		data.name.textContent = '0x' + breakpoint.address.toString(16);
-		data.toDispose.push(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.name, `Decimal address: breakpoint.address.toString()`));
+		data.elementDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.name, `Decimal address: breakpoint.address.toString()`));
 		data.checkbox.checked = breakpoint.enabled;
 
 		const { message, icon } = getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), breakpoint, this.labelService, this.debugService.getModel());
 		data.icon.className = ThemeIcon.asClassName(icon);
-		data.toDispose.push(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.breakpoint, breakpoint.message || message || ''));
+		data.elementDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.breakpoint, breakpoint.message || message || ''));
 
 		const debugActive = this.debugService.state === State.Running || this.debugService.state === State.Stopped;
 		if (debugActive && !breakpoint.verified) {
@@ -901,8 +934,13 @@ class InstructionBreakpointsRenderer implements IListRenderer<IInstructionBreakp
 		}
 	}
 
+
+	disposeElement(element: IInstructionBreakpoint, index: number, templateData: IInstructionBreakpointTemplateData, height: number | undefined): void {
+		templateData.elementDisposables.clear();
+	}
+
 	disposeTemplate(templateData: IInstructionBreakpointTemplateData): void {
-		dispose(templateData.toDispose);
+		templateData.templateDisposables.dispose();
 	}
 }
 
@@ -924,7 +962,7 @@ class FunctionBreakpointInputRenderer implements IListRenderer<IFunctionBreakpoi
 
 	renderTemplate(container: HTMLElement): IFunctionBreakpointInputTemplateData {
 		const template: IFunctionBreakpointInputTemplateData = Object.create(null);
-		const toDispose: IDisposable[] = [];
+		const toDispose = new DisposableStore();
 
 		const breakpoint = dom.append(container, $('.breakpoint'));
 		template.icon = $('.icon');
@@ -938,6 +976,8 @@ class FunctionBreakpointInputRenderer implements IListRenderer<IFunctionBreakpoi
 
 		const inputBox = new InputBox(inputBoxContainer, this.contextViewService, { inputBoxStyles: defaultInputBoxStyles });
 
+		toDispose.add(inputBox);
+
 		const wrapUp = (success: boolean) => {
 			template.updating = true;
 			try {
@@ -966,7 +1006,7 @@ class FunctionBreakpointInputRenderer implements IListRenderer<IFunctionBreakpoi
 			}
 		};
 
-		toDispose.push(dom.addStandardDisposableListener(inputBox.inputElement, 'keydown', (e: IKeyboardEvent) => {
+		toDispose.add(dom.addStandardDisposableListener(inputBox.inputElement, 'keydown', (e: IKeyboardEvent) => {
 			const isEscape = e.equals(KeyCode.Escape);
 			const isEnter = e.equals(KeyCode.Enter);
 			if (isEscape || isEnter) {
@@ -975,14 +1015,16 @@ class FunctionBreakpointInputRenderer implements IListRenderer<IFunctionBreakpoi
 				wrapUp(isEnter);
 			}
 		}));
-		toDispose.push(dom.addDisposableListener(inputBox.inputElement, 'blur', () => {
+		toDispose.add(dom.addDisposableListener(inputBox.inputElement, 'blur', () => {
 			if (!template.updating) {
 				wrapUp(!!inputBox.value);
 			}
 		}));
 
 		template.inputBox = inputBox;
-		template.toDispose = toDispose;
+		template.elementDisposables = new DisposableStore();
+		template.templateDisposables = toDispose;
+		template.templateDisposables.add(template.elementDisposables);
 		return template;
 	}
 
@@ -992,7 +1034,7 @@ class FunctionBreakpointInputRenderer implements IListRenderer<IFunctionBreakpoi
 		const { icon, message } = getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), functionBreakpoint, this.labelService, this.debugService.getModel());
 
 		data.icon.className = ThemeIcon.asClassName(icon);
-		data.toDispose.push(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.icon, message ? message : ''));
+		data.elementDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.icon, message ? message : ''));
 		data.checkbox.checked = functionBreakpoint.enabled;
 		data.checkbox.disabled = true;
 		data.inputBox.value = functionBreakpoint.name || '';
@@ -1017,8 +1059,12 @@ class FunctionBreakpointInputRenderer implements IListRenderer<IFunctionBreakpoi
 		}, 0);
 	}
 
+	disposeElement(element: IFunctionBreakpoint, index: number, templateData: IFunctionBreakpointInputTemplateData, height: number | undefined): void {
+		templateData.elementDisposables.clear();
+	}
+
 	disposeTemplate(templateData: IFunctionBreakpointInputTemplateData): void {
-		dispose(templateData.toDispose);
+		templateData.templateDisposables.dispose();
 	}
 }
 
@@ -1040,7 +1086,7 @@ class DataBreakpointInputRenderer implements IListRenderer<IDataBreakpoint, IDat
 
 	renderTemplate(container: HTMLElement): IDataBreakpointInputTemplateData {
 		const template: IDataBreakpointInputTemplateData = Object.create(null);
-		const toDispose: IDisposable[] = [];
+		const toDispose = new DisposableStore();
 
 		const breakpoint = dom.append(container, $('.breakpoint'));
 		template.icon = $('.icon');
@@ -1053,6 +1099,7 @@ class DataBreakpointInputRenderer implements IListRenderer<IDataBreakpoint, IDat
 
 
 		const inputBox = new InputBox(inputBoxContainer, this.contextViewService, { inputBoxStyles: defaultInputBoxStyles });
+		toDispose.add(inputBox);
 
 		const wrapUp = (success: boolean) => {
 			template.updating = true;
@@ -1075,7 +1122,7 @@ class DataBreakpointInputRenderer implements IListRenderer<IDataBreakpoint, IDat
 			}
 		};
 
-		toDispose.push(dom.addStandardDisposableListener(inputBox.inputElement, 'keydown', (e: IKeyboardEvent) => {
+		toDispose.add(dom.addStandardDisposableListener(inputBox.inputElement, 'keydown', (e: IKeyboardEvent) => {
 			const isEscape = e.equals(KeyCode.Escape);
 			const isEnter = e.equals(KeyCode.Enter);
 			if (isEscape || isEnter) {
@@ -1084,14 +1131,16 @@ class DataBreakpointInputRenderer implements IListRenderer<IDataBreakpoint, IDat
 				wrapUp(isEnter);
 			}
 		}));
-		toDispose.push(dom.addDisposableListener(inputBox.inputElement, 'blur', () => {
+		toDispose.add(dom.addDisposableListener(inputBox.inputElement, 'blur', () => {
 			if (!template.updating) {
 				wrapUp(!!inputBox.value);
 			}
 		}));
 
 		template.inputBox = inputBox;
-		template.toDispose = toDispose;
+		template.elementDisposables = new DisposableStore();
+		template.templateDisposables = toDispose;
+		template.templateDisposables.add(template.elementDisposables);
 		return template;
 	}
 
@@ -1101,7 +1150,7 @@ class DataBreakpointInputRenderer implements IListRenderer<IDataBreakpoint, IDat
 		const { icon, message } = getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), dataBreakpoint, this.labelService, this.debugService.getModel());
 
 		data.icon.className = ThemeIcon.asClassName(icon);
-		data.toDispose.push(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.icon, message ?? ''));
+		data.elementDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.icon, message ?? ''));
 		data.checkbox.checked = dataBreakpoint.enabled;
 		data.checkbox.disabled = true;
 		data.inputBox.value = '';
@@ -1125,8 +1174,12 @@ class DataBreakpointInputRenderer implements IListRenderer<IDataBreakpoint, IDat
 		}, 0);
 	}
 
+	disposeElement(element: IDataBreakpoint, index: number, templateData: IDataBreakpointInputTemplateData, height: number | undefined): void {
+		templateData.elementDisposables.clear();
+	}
+
 	disposeTemplate(templateData: IDataBreakpointInputTemplateData): void {
-		dispose(templateData.toDispose);
+		templateData.templateDisposables.dispose();
 	}
 }
 
@@ -1148,7 +1201,7 @@ class ExceptionBreakpointInputRenderer implements IListRenderer<IExceptionBreakp
 
 	renderTemplate(container: HTMLElement): IExceptionBreakpointInputTemplateData {
 		const template: IExceptionBreakpointInputTemplateData = Object.create(null);
-		const toDispose: IDisposable[] = [];
+		const toDispose = new DisposableStore();
 
 		const breakpoint = dom.append(container, $('.breakpoint'));
 		breakpoint.classList.add('exception');
@@ -1162,6 +1215,8 @@ class ExceptionBreakpointInputRenderer implements IListRenderer<IExceptionBreakp
 			inputBoxStyles: defaultInputBoxStyles
 		});
 
+
+		template.templateDisposables.add(inputBox);
 		const wrapUp = (success: boolean) => {
 			this.view.breakpointInputFocused.set(false);
 			let newCondition = template.breakpoint.condition;
@@ -1171,7 +1226,7 @@ class ExceptionBreakpointInputRenderer implements IListRenderer<IExceptionBreakp
 			this.debugService.setExceptionBreakpointCondition(template.breakpoint, newCondition);
 		};
 
-		toDispose.push(dom.addStandardDisposableListener(inputBox.inputElement, 'keydown', (e: IKeyboardEvent) => {
+		toDispose.add(dom.addStandardDisposableListener(inputBox.inputElement, 'keydown', (e: IKeyboardEvent) => {
 			const isEscape = e.equals(KeyCode.Escape);
 			const isEnter = e.equals(KeyCode.Enter);
 			if (isEscape || isEnter) {
@@ -1180,7 +1235,7 @@ class ExceptionBreakpointInputRenderer implements IListRenderer<IExceptionBreakp
 				wrapUp(isEnter);
 			}
 		}));
-		toDispose.push(dom.addDisposableListener(inputBox.inputElement, 'blur', () => {
+		toDispose.add(dom.addDisposableListener(inputBox.inputElement, 'blur', () => {
 			// Need to react with a timeout on the blur event due to possible concurent splices #56443
 			setTimeout(() => {
 				wrapUp(true);
@@ -1188,7 +1243,9 @@ class ExceptionBreakpointInputRenderer implements IListRenderer<IExceptionBreakp
 		}));
 
 		template.inputBox = inputBox;
-		template.toDispose = toDispose;
+		template.elementDisposables = new DisposableStore();
+		template.templateDisposables = toDispose;
+		template.templateDisposables.add(template.elementDisposables);
 		return template;
 	}
 
@@ -1205,8 +1262,12 @@ class ExceptionBreakpointInputRenderer implements IListRenderer<IExceptionBreakp
 		}, 0);
 	}
 
+	disposeElement(element: IExceptionBreakpoint, index: number, templateData: IExceptionBreakpointInputTemplateData, height: number | undefined): void {
+		templateData.elementDisposables.clear();
+	}
+
 	disposeTemplate(templateData: IExceptionBreakpointInputTemplateData): void {
-		dispose(templateData.toDispose);
+		templateData.templateDisposables.dispose();
 	}
 }
 
@@ -1426,8 +1487,10 @@ registerAction2(class extends Action2 {
 		});
 	}
 
-	run(accessor: ServicesAccessor): void {
+	async run(accessor: ServicesAccessor): Promise<void> {
 		const debugService = accessor.get(IDebugService);
+		const viewService = accessor.get(IViewsService);
+		await viewService.openView(BREAKPOINTS_VIEW_ID);
 		debugService.addFunctionBreakpoint();
 	}
 });
@@ -1491,18 +1554,19 @@ abstract class MemoryBreakpointAction extends Action2 {
 
 	private getRange(quickInput: IQuickInputService, defaultValue?: string) {
 		return new Promise<{ address: string; bytes: number } | undefined>(resolve => {
-			const input = quickInput.createInputBox();
+			const disposables = new DisposableStore();
+			const input = disposables.add(quickInput.createInputBox());
 			input.prompt = localize('dataBreakpointMemoryRangePrompt', "Enter a memory range in which to break");
 			input.placeholder = localize('dataBreakpointMemoryRangePlaceholder', 'Absolute range (0x1234 - 0x1300) or range of bytes after an address (0x1234 + 0xff)');
 			if (defaultValue) {
 				input.value = defaultValue;
 				input.valueSelection = [0, defaultValue.length];
 			}
-			input.onDidChangeValue(e => {
+			disposables.add(input.onDidChangeValue(e => {
 				const err = this.parseAddress(e, false);
 				input.validationMessage = err?.error;
-			});
-			input.onDidAccept(() => {
+			}));
+			disposables.add(input.onDidAccept(() => {
 				const r = this.parseAddress(input.value, true);
 				if ('error' in r) {
 					input.validationMessage = r.error;
@@ -1510,11 +1574,11 @@ abstract class MemoryBreakpointAction extends Action2 {
 					resolve(r);
 				}
 				input.dispose();
-			});
-			input.onDidHide(() => {
+			}));
+			disposables.add(input.onDidHide(() => {
 				resolve(undefined);
-				input.dispose();
-			});
+				disposables.dispose();
+			}));
 			input.ignoreFocusOut = true;
 			input.show();
 		});
diff --git a/src/vs/workbench/contrib/debug/browser/callStackEditorContribution.ts b/src/vs/workbench/contrib/debug/browser/callStackEditorContribution.ts
index 6c3aeb1d666..9a0a631edd9 100644
--- a/src/vs/workbench/contrib/debug/browser/callStackEditorContribution.ts
+++ b/src/vs/workbench/contrib/debug/browser/callStackEditorContribution.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { distinct } from 'vs/base/common/arrays';
-import { Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Constants } from 'vs/base/common/uint';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { Range } from 'vs/editor/common/core/range';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { GlyphMarginLane, IModelDecorationOptions, IModelDeltaDecoration, OverviewRulerLane, TrackedRangeStickiness } from 'vs/editor/common/model';
-import { localize } from 'vs/nls';
-import { ILogService } from 'vs/platform/log/common/log';
-import { registerColor } from 'vs/platform/theme/common/colorRegistry';
-import { themeColorFromId } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { debugStackframe, debugStackframeFocused } from 'vs/workbench/contrib/debug/browser/debugIcons';
-import { IDebugService, IStackFrame } from 'vs/workbench/contrib/debug/common/debug';
-import 'vs/css!./media/callStackEditorContribution';
+import { distinct } from '../../../../base/common/arrays.js';
+import { Event } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Constants } from '../../../../base/common/uint.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { IEditorContribution } from '../../../../editor/common/editorCommon.js';
+import { GlyphMarginLane, IModelDecorationOptions, IModelDeltaDecoration, OverviewRulerLane, TrackedRangeStickiness } from '../../../../editor/common/model.js';
+import { localize } from '../../../../nls.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { registerColor } from '../../../../platform/theme/common/colorRegistry.js';
+import { themeColorFromId } from '../../../../platform/theme/common/themeService.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { debugStackframe, debugStackframeFocused } from './debugIcons.js';
+import { IDebugService, IStackFrame } from '../common/debug.js';
+import './media/callStackEditorContribution.css';
 
 export const topStackFrameColor = registerColor('editor.stackFrameHighlightBackground', { dark: '#ffff0033', light: '#ffff6673', hcDark: '#ffff0033', hcLight: '#ffff6673' }, localize('topStackFrameLineHighlight', 'Background color for the highlight of line at the top stack frame position.'));
 export const focusedStackFrameColor = registerColor('editor.focusedStackFrameHighlightBackground', { dark: '#7abd7a4d', light: '#cee7ce73', hcDark: '#7abd7a4d', hcLight: '#cee7ce73' }, localize('focusedStackFrameLineHighlight', 'Background color for the highlight of line at focused stack frame position.'));
@@ -48,19 +48,28 @@ const FOCUSED_STACK_FRAME_MARGIN: IModelDecorationOptions = {
 		color: themeColorFromId(focusedStackFrameColor)
 	}
 };
-const TOP_STACK_FRAME_DECORATION: IModelDecorationOptions = {
+export const TOP_STACK_FRAME_DECORATION: IModelDecorationOptions = {
 	description: 'top-stack-frame-decoration',
 	isWholeLine: true,
 	className: 'debug-top-stack-frame-line',
 	stickiness
 };
-const FOCUSED_STACK_FRAME_DECORATION: IModelDecorationOptions = {
+export const FOCUSED_STACK_FRAME_DECORATION: IModelDecorationOptions = {
 	description: 'focused-stack-frame-decoration',
 	isWholeLine: true,
 	className: 'debug-focused-stack-frame-line',
 	stickiness
 };
 
+export const makeStackFrameColumnDecoration = (noCharactersBefore: boolean): IModelDecorationOptions => ({
+	description: 'top-stack-frame-inline-decoration',
+	before: {
+		content: '\uEB8B',
+		inlineClassName: noCharactersBefore ? 'debug-top-stack-frame-column start-of-line' : 'debug-top-stack-frame-column',
+		inlineClassNameAffectsLetterSpacing: true
+	},
+});
+
 export function createDecorationsForStackFrame(stackFrame: IStackFrame, isFocusedSession: boolean, noCharactersBefore: boolean): IModelDeltaDecoration[] {
 	// only show decorations for the currently focused thread.
 	const result: IModelDeltaDecoration[] = [];
@@ -85,14 +94,7 @@ export function createDecorationsForStackFrame(stackFrame: IStackFrame, isFocuse
 
 		if (stackFrame.range.startColumn > 1) {
 			result.push({
-				options: {
-					description: 'top-stack-frame-inline-decoration',
-					before: {
-						content: '\uEB8B',
-						inlineClassName: noCharactersBefore ? 'debug-top-stack-frame-column start-of-line' : 'debug-top-stack-frame-column',
-						inlineClassNameAffectsLetterSpacing: true
-					},
-				},
+				options: makeStackFrameColumnDecoration(noCharactersBefore),
 				range: columnUntilEOLRange
 			});
 		}
diff --git a/src/vs/workbench/contrib/debug/browser/callStackView.ts b/src/vs/workbench/contrib/debug/browser/callStackView.ts
index 24eba761682..c1f2e3e287e 100644
--- a/src/vs/workbench/contrib/debug/browser/callStackView.ts
+++ b/src/vs/workbench/contrib/debug/browser/callStackView.ts
@@ -3,54 +3,54 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { AriaRole } from 'vs/base/browser/ui/aria/aria';
-import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
-import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
-import { ITreeCompressionDelegate } from 'vs/base/browser/ui/tree/asyncDataTree';
-import { ICompressedTreeNode } from 'vs/base/browser/ui/tree/compressedObjectTreeModel';
-import { ICompressibleTreeRenderer } from 'vs/base/browser/ui/tree/objectTree';
-import { IAsyncDataSource, ITreeContextMenuEvent, ITreeNode } from 'vs/base/browser/ui/tree/tree';
-import { Action, IAction } from 'vs/base/common/actions';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { Codicon } from 'vs/base/common/codicons';
-import { Event } from 'vs/base/common/event';
-import { createMatches, FuzzyScore, IMatch } from 'vs/base/common/filters';
-import { DisposableStore, dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { posix } from 'vs/base/common/path';
-import { commonSuffixLength } from 'vs/base/common/strings';
-import { localize } from 'vs/nls';
-import { ICommandActionTitle, Icon } from 'vs/platform/action/common/action';
-import { createAndFillInActionBarActions, createAndFillInContextMenuActions, MenuEntryActionViewItem, SubmenuEntryActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IMenuService, MenuId, MenuItemAction, MenuRegistry, registerAction2, SubmenuItemAction } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr, ContextKeyExpression, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { WorkbenchCompressibleAsyncDataTree } from 'vs/platform/list/browser/listService';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { asCssVariable, textLinkForeground } from 'vs/platform/theme/common/colorRegistry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { ViewAction, ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
-import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
-import { IViewDescriptorService } from 'vs/workbench/common/views';
-import { renderViewTree } from 'vs/workbench/contrib/debug/browser/baseDebugView';
-import { CONTINUE_ID, CONTINUE_LABEL, DISCONNECT_ID, DISCONNECT_LABEL, PAUSE_ID, PAUSE_LABEL, RESTART_LABEL, RESTART_SESSION_ID, STEP_INTO_ID, STEP_INTO_LABEL, STEP_OUT_ID, STEP_OUT_LABEL, STEP_OVER_ID, STEP_OVER_LABEL, STOP_ID, STOP_LABEL } from 'vs/workbench/contrib/debug/browser/debugCommands';
-import * as icons from 'vs/workbench/contrib/debug/browser/debugIcons';
-import { createDisconnectMenuItemAction } from 'vs/workbench/contrib/debug/browser/debugToolBar';
-import { CALLSTACK_VIEW_ID, CONTEXT_CALLSTACK_ITEM_STOPPED, CONTEXT_CALLSTACK_ITEM_TYPE, CONTEXT_CALLSTACK_SESSION_HAS_ONE_THREAD, CONTEXT_CALLSTACK_SESSION_IS_ATTACH, CONTEXT_DEBUG_STATE, CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG, CONTEXT_STACK_FRAME_SUPPORTS_RESTART, getStateLabel, IDebugModel, IDebugService, IDebugSession, IRawStoppedDetails, isFrameDeemphasized, IStackFrame, IThread, State } from 'vs/workbench/contrib/debug/common/debug';
-import { StackFrame, Thread, ThreadAndSessionIds } from 'vs/workbench/contrib/debug/common/debugModel';
-import { isSessionAttach } from 'vs/workbench/contrib/debug/common/debugUtils';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import type { IManagedHover } from 'vs/base/browser/ui/hover/hover';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import * as dom from '../../../../base/browser/dom.js';
+import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { AriaRole } from '../../../../base/browser/ui/aria/aria.js';
+import { HighlightedLabel } from '../../../../base/browser/ui/highlightedlabel/highlightedLabel.js';
+import { IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
+import { IListAccessibilityProvider } from '../../../../base/browser/ui/list/listWidget.js';
+import { ITreeCompressionDelegate } from '../../../../base/browser/ui/tree/asyncDataTree.js';
+import { ICompressedTreeNode } from '../../../../base/browser/ui/tree/compressedObjectTreeModel.js';
+import { ICompressibleTreeRenderer } from '../../../../base/browser/ui/tree/objectTree.js';
+import { IAsyncDataSource, ITreeContextMenuEvent, ITreeNode } from '../../../../base/browser/ui/tree/tree.js';
+import { Action, IAction } from '../../../../base/common/actions.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Event } from '../../../../base/common/event.js';
+import { createMatches, FuzzyScore, IMatch } from '../../../../base/common/filters.js';
+import { DisposableStore, dispose, IDisposable } from '../../../../base/common/lifecycle.js';
+import { posix } from '../../../../base/common/path.js';
+import { commonSuffixLength } from '../../../../base/common/strings.js';
+import { localize } from '../../../../nls.js';
+import { ICommandActionTitle, Icon } from '../../../../platform/action/common/action.js';
+import { createAndFillInActionBarActions, createAndFillInContextMenuActions, MenuEntryActionViewItem, SubmenuEntryActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IMenuService, MenuId, MenuItemAction, MenuRegistry, registerAction2, SubmenuItemAction } from '../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr, ContextKeyExpression, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { WorkbenchCompressibleAsyncDataTree } from '../../../../platform/list/browser/listService.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { asCssVariable, textLinkForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { ViewAction, ViewPane } from '../../../browser/parts/views/viewPane.js';
+import { IViewletViewOptions } from '../../../browser/parts/views/viewsViewlet.js';
+import { IViewDescriptorService } from '../../../common/views.js';
+import { renderViewTree } from './baseDebugView.js';
+import { CONTINUE_ID, CONTINUE_LABEL, DISCONNECT_ID, DISCONNECT_LABEL, PAUSE_ID, PAUSE_LABEL, RESTART_LABEL, RESTART_SESSION_ID, STEP_INTO_ID, STEP_INTO_LABEL, STEP_OUT_ID, STEP_OUT_LABEL, STEP_OVER_ID, STEP_OVER_LABEL, STOP_ID, STOP_LABEL } from './debugCommands.js';
+import * as icons from './debugIcons.js';
+import { createDisconnectMenuItemAction } from './debugToolBar.js';
+import { CALLSTACK_VIEW_ID, CONTEXT_CALLSTACK_ITEM_STOPPED, CONTEXT_CALLSTACK_ITEM_TYPE, CONTEXT_CALLSTACK_SESSION_HAS_ONE_THREAD, CONTEXT_CALLSTACK_SESSION_IS_ATTACH, CONTEXT_DEBUG_STATE, CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG, CONTEXT_STACK_FRAME_SUPPORTS_RESTART, getStateLabel, IDebugModel, IDebugService, IDebugSession, IRawStoppedDetails, isFrameDeemphasized, IStackFrame, IThread, State } from '../common/debug.js';
+import { StackFrame, Thread, ThreadAndSessionIds } from '../common/debugModel.js';
+import { isSessionAttach } from '../common/debugUtils.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import type { IManagedHover } from '../../../../base/browser/ui/hover/hover.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 
 const $ = dom.$;
 
@@ -465,9 +465,8 @@ export class CallStackView extends ViewPane {
 		const secondary: IAction[] = [];
 		const result = { primary, secondary };
 		const contextKeyService = this.contextKeyService.createOverlay(overlay);
-		const menu = this.menuService.createMenu(MenuId.DebugCallStackContext, contextKeyService);
-		createAndFillInContextMenuActions(menu, { arg: getContextForContributedActions(element), shouldForwardArgs: true }, result, 'inline');
-		menu.dispose();
+		const menu = this.menuService.getMenuActions(MenuId.DebugCallStackContext, contextKeyService, { arg: getContextForContributedActions(element), shouldForwardArgs: true });
+		createAndFillInContextMenuActions(menu, result, 'inline');
 		this.contextMenuService.showContextMenu({
 			getAnchor: () => e.anchor,
 			getActions: () => result.secondary,
diff --git a/src/vs/workbench/contrib/debug/browser/callStackWidget.ts b/src/vs/workbench/contrib/debug/browser/callStackWidget.ts
new file mode 100644
index 00000000000..b0a119685a1
--- /dev/null
+++ b/src/vs/workbench/contrib/debug/browser/callStackWidget.ts
@@ -0,0 +1,738 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from '../../../../base/browser/dom.js';
+import { Button } from '../../../../base/browser/ui/button/button.js';
+import { IListRenderer, IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
+import { IListAccessibilityProvider } from '../../../../base/browser/ui/list/listWidget.js';
+import { assertNever } from '../../../../base/common/assert.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { autorun, autorunWithStore, derived, IObservable, ISettableObservable, observableValue, transaction } from '../../../../base/common/observable.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { Constants } from '../../../../base/common/uint.js';
+import { URI } from '../../../../base/common/uri.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import './media/callStackWidget.css';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { EditorContributionCtor, EditorContributionInstantiation, IEditorContributionDescription } from '../../../../editor/browser/editorExtensions.js';
+import { CodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { EmbeddedCodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/embeddedCodeEditorWidget.js';
+import { IEditorOptions } from '../../../../editor/common/config/editorOptions.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { IWordAtPosition } from '../../../../editor/common/core/wordHelper.js';
+import { IEditorContribution, IEditorDecorationsCollection } from '../../../../editor/common/editorCommon.js';
+import { Location } from '../../../../editor/common/languages.js';
+import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { ClickLinkGesture, ClickLinkMouseEvent } from '../../../../editor/contrib/gotoSymbol/browser/link/clickLinkGesture.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { createActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
+import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { TextEditorSelectionRevealType } from '../../../../platform/editor/common/editor.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { WorkbenchList } from '../../../../platform/list/browser/listService.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { defaultButtonStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { ResourceLabel } from '../../../browser/labels.js';
+import { makeStackFrameColumnDecoration, TOP_STACK_FRAME_DECORATION } from './callStackEditorContribution.js';
+import { IEditorService, SIDE_GROUP } from '../../../services/editor/common/editorService.js';
+
+
+export class CallStackFrame {
+	constructor(
+		public readonly name: string,
+		public readonly source?: URI,
+		public readonly line = 1,
+		public readonly column = 1,
+	) { }
+}
+
+export class SkippedCallFrames {
+	constructor(
+		public readonly label: string,
+		public readonly load: (token: CancellationToken) => Promise<AnyStackFrame[]>,
+	) { }
+}
+
+export abstract class CustomStackFrame {
+	public readonly showHeader = observableValue('CustomStackFrame.showHeader', true);
+	public abstract readonly height: IObservable<number>;
+	public abstract readonly label: string;
+	public icon?: ThemeIcon;
+	public abstract render(container: HTMLElement): IDisposable;
+	public renderActions?(container: HTMLElement): IDisposable;
+}
+
+export type AnyStackFrame = SkippedCallFrames | CallStackFrame | CustomStackFrame;
+
+interface IFrameLikeItem {
+	readonly collapsed: ISettableObservable<boolean>;
+	readonly height: IObservable<number>;
+}
+
+class WrappedCallStackFrame extends CallStackFrame implements IFrameLikeItem {
+	public readonly editorHeight = observableValue('WrappedCallStackFrame.height', this.source ? 100 : 0);
+	public readonly collapsed = observableValue('WrappedCallStackFrame.collapsed', false);
+
+	public readonly height = derived(reader => {
+		return this.collapsed.read(reader) ? HEADER_HEIGHT : HEADER_HEIGHT + this.editorHeight.read(reader);
+	});
+
+	constructor(original: CallStackFrame) {
+		super(original.name, original.source, original.line, original.column);
+	}
+}
+
+class WrappedCustomStackFrame implements IFrameLikeItem {
+	public readonly collapsed = observableValue('WrappedCallStackFrame.collapsed', false);
+
+	public readonly height = derived(reader => {
+		const headerHeight = this.original.showHeader.read(reader) ? HEADER_HEIGHT : 0;
+		return this.collapsed.read(reader) ? headerHeight : headerHeight + this.original.height.read(reader);
+	});
+
+	constructor(public readonly original: CustomStackFrame) { }
+}
+
+const isFrameLike = (item: unknown): item is IFrameLikeItem =>
+	item instanceof WrappedCallStackFrame || item instanceof WrappedCustomStackFrame;
+
+type ListItem = WrappedCallStackFrame | SkippedCallFrames | WrappedCustomStackFrame;
+
+const WIDGET_CLASS_NAME = 'multiCallStackWidget';
+
+/**
+ * A reusable widget that displays a call stack as a series of editors. Note
+ * that this both used in debug's exception widget as well as in the testing
+ * call stack view.
+ */
+export class CallStackWidget extends Disposable {
+	private readonly list: WorkbenchList<ListItem>;
+	private readonly layoutEmitter = this._register(new Emitter<void>());
+	private readonly currentFramesDs = this._register(new DisposableStore());
+	private cts?: CancellationTokenSource;
+
+	constructor(
+		container: HTMLElement,
+		containingEditor: ICodeEditor | undefined,
+		@IInstantiationService instantiationService: IInstantiationService,
+	) {
+		super();
+
+		container.classList.add(WIDGET_CLASS_NAME);
+		this._register(toDisposable(() => container.classList.remove(WIDGET_CLASS_NAME)));
+
+		this.list = this._register(instantiationService.createInstance(
+			WorkbenchList,
+			'TestResultStackWidget',
+			container,
+			new StackDelegate(),
+			[
+				instantiationService.createInstance(FrameCodeRenderer, containingEditor, this.layoutEmitter.event),
+				instantiationService.createInstance(MissingCodeRenderer),
+				instantiationService.createInstance(CustomRenderer),
+				instantiationService.createInstance(SkippedRenderer, (i) => this.loadFrame(i)),
+			],
+			{
+				multipleSelectionSupport: false,
+				mouseSupport: false,
+				keyboardSupport: false,
+				setRowLineHeight: false,
+				accessibilityProvider: instantiationService.createInstance(StackAccessibilityProvider),
+			}
+		) as WorkbenchList<ListItem>);
+	}
+
+	/** Replaces the call frames display in the view. */
+	public setFrames(frames: AnyStackFrame[]): void {
+		// cancel any existing load
+		this.currentFramesDs.clear();
+		this.cts = new CancellationTokenSource();
+		this._register(toDisposable(() => this.cts!.dispose(true)));
+
+		this.list.splice(0, this.list.length, this.mapFrames(frames));
+	}
+
+	public layout(height?: number, width?: number): void {
+		this.list.layout(height, width);
+		this.layoutEmitter.fire();
+	}
+
+	public collapseAll() {
+		transaction(tx => {
+			for (let i = 0; i < this.list.length; i++) {
+				const frame = this.list.element(i);
+				if (isFrameLike(frame)) {
+					frame.collapsed.set(true, tx);
+				}
+			}
+		});
+	}
+
+	private async loadFrame(replacing: SkippedCallFrames): Promise<void> {
+		if (!this.cts) {
+			return;
+		}
+
+		const frames = await replacing.load(this.cts.token);
+		if (this.cts.token.isCancellationRequested) {
+			return;
+		}
+
+		const index = this.list.indexOf(replacing);
+		this.list.splice(index, 1, this.mapFrames(frames));
+	}
+
+	private mapFrames(frames: AnyStackFrame[]): ListItem[] {
+		const result: ListItem[] = [];
+		for (const frame of frames) {
+			if (frame instanceof SkippedCallFrames) {
+				result.push(frame);
+				continue;
+			}
+
+			const wrapped = frame instanceof CustomStackFrame
+				? new WrappedCustomStackFrame(frame) : new WrappedCallStackFrame(frame);
+			result.push(wrapped);
+
+			this.currentFramesDs.add(autorun(reader => {
+				const height = wrapped.height.read(reader);
+				const idx = this.list.indexOf(wrapped);
+				if (idx !== -1) {
+					this.list.updateElementHeight(idx, height);
+				}
+			}));
+		}
+
+		return result;
+	}
+}
+
+class StackAccessibilityProvider implements IListAccessibilityProvider<ListItem> {
+	constructor(@ILabelService private readonly labelService: ILabelService) { }
+
+	getAriaLabel(e: ListItem): string | IObservable<string> | null {
+		if (e instanceof SkippedCallFrames) {
+			return e.label;
+		}
+
+		if (e instanceof WrappedCustomStackFrame) {
+			return e.original.label;
+		}
+
+		if (e instanceof CallStackFrame) {
+			if (e.source && e.line) {
+				return localize({
+					comment: ['{0} is an extension-defined label, then line number and filename'],
+					key: 'stackTraceLabel',
+				}, '{0}, line {1} in {2}', e.name, e.line, this.labelService.getUriLabel(e.source, { relative: true }));
+			}
+
+			return e.name;
+		}
+
+		assertNever(e);
+	}
+	getWidgetAriaLabel(): string {
+		return localize('stackTrace', 'Stack Trace');
+	}
+}
+
+class StackDelegate implements IListVirtualDelegate<ListItem> {
+	getHeight(element: ListItem): number {
+		if (element instanceof CallStackFrame || element instanceof WrappedCustomStackFrame) {
+			return element.height.get();
+		}
+		if (element instanceof SkippedCallFrames) {
+			return HEADER_HEIGHT;
+		}
+
+		assertNever(element);
+	}
+
+	getTemplateId(element: ListItem): string {
+		if (element instanceof CallStackFrame) {
+			return element.source ? FrameCodeRenderer.templateId : MissingCodeRenderer.templateId;
+		}
+		if (element instanceof SkippedCallFrames) {
+			return SkippedRenderer.templateId;
+		}
+		if (element instanceof WrappedCustomStackFrame) {
+			return CustomRenderer.templateId;
+		}
+
+		assertNever(element);
+	}
+}
+
+interface IStackTemplateData extends IAbstractFrameRendererTemplateData {
+	editor: CodeEditorWidget;
+	toolbar: MenuWorkbenchToolBar;
+}
+
+const editorOptions: IEditorOptions = {
+	scrollBeyondLastLine: false,
+	scrollbar: {
+		vertical: 'hidden',
+		horizontal: 'hidden',
+		handleMouseWheel: false,
+		useShadows: false,
+	},
+	overviewRulerLanes: 0,
+	fixedOverflowWidgets: true,
+	overviewRulerBorder: false,
+	stickyScroll: { enabled: false },
+	minimap: { enabled: false },
+	readOnly: true,
+	automaticLayout: false,
+};
+
+const makeFrameElements = () => dom.h('div.multiCallStackFrame', [
+	dom.h('div.header@header', [
+		dom.h('div.collapse-button@collapseButton'),
+		dom.h('div.title.show-file-icons@title'),
+		dom.h('div.actions@actions'),
+	]),
+
+	dom.h('div.editorParent', [
+		dom.h('div.editorContainer@editor'),
+	])
+]);
+
+const HEADER_HEIGHT = 24;
+
+interface IAbstractFrameRendererTemplateData {
+	container: HTMLElement;
+	label: ResourceLabel;
+	elements: ReturnType<typeof makeFrameElements>;
+	decorations: string[];
+	collapse: Button;
+	elementStore: DisposableStore;
+	templateStore: DisposableStore;
+}
+
+abstract class AbstractFrameRenderer<T extends IAbstractFrameRendererTemplateData> implements IListRenderer<ListItem, T> {
+	public abstract templateId: string;
+
+	constructor(
+		@IInstantiationService protected readonly instantiationService: IInstantiationService,
+	) { }
+
+	renderTemplate(container: HTMLElement): T {
+		const elements = makeFrameElements();
+		container.appendChild(elements.root);
+
+
+		const templateStore = new DisposableStore();
+		container.classList.add('multiCallStackFrameContainer');
+		templateStore.add(toDisposable(() => {
+			container.classList.remove('multiCallStackFrameContainer');
+			elements.root.remove();
+		}));
+
+		const label = templateStore.add(this.instantiationService.createInstance(ResourceLabel, elements.title, {}));
+
+		const collapse = templateStore.add(new Button(elements.collapseButton, {}));
+
+		const contentId = generateUuid();
+		elements.editor.id = contentId;
+		elements.editor.role = 'region';
+		elements.collapseButton.setAttribute('aria-controls', contentId);
+
+		return this.finishRenderTemplate({
+			container,
+			decorations: [],
+			elements,
+			label,
+			collapse,
+			elementStore: templateStore.add(new DisposableStore()),
+			templateStore,
+		});
+	}
+
+	protected abstract finishRenderTemplate(data: IAbstractFrameRendererTemplateData): T;
+
+	renderElement(element: ListItem, index: number, template: T, height: number | undefined): void {
+		const { elementStore } = template;
+		elementStore.clear();
+		const item = element as IFrameLikeItem;
+
+		this.setupCollapseButton(item, template);
+	}
+
+	private setupCollapseButton(item: IFrameLikeItem, { elementStore, elements, collapse }: T) {
+		elementStore.add(autorun(reader => {
+			collapse.element.className = '';
+			const collapsed = item.collapsed.read(reader);
+			collapse.icon = collapsed ? Codicon.chevronRight : Codicon.chevronDown;
+			collapse.element.ariaExpanded = String(!collapsed);
+			elements.root.classList.toggle('collapsed', collapsed);
+		}));
+		const toggleCollapse = () => item.collapsed.set(!item.collapsed.get(), undefined);
+		elementStore.add(collapse.onDidClick(toggleCollapse));
+		elementStore.add(dom.addDisposableListener(elements.title, 'click', toggleCollapse));
+	}
+
+	disposeElement(element: ListItem, index: number, templateData: T, height: number | undefined): void {
+		templateData.elementStore.clear();
+	}
+
+	disposeTemplate(templateData: T): void {
+		templateData.templateStore.dispose();
+	}
+}
+
+const CONTEXT_LINES = 2;
+
+/** Renderer for a normal stack frame where code is available. */
+class FrameCodeRenderer extends AbstractFrameRenderer<IStackTemplateData> {
+	public static readonly templateId = 'f';
+
+	public readonly templateId = FrameCodeRenderer.templateId;
+
+	constructor(
+		private readonly containingEditor: ICodeEditor | undefined,
+		private readonly onLayout: Event<void>,
+		@ITextModelService private readonly modelService: ITextModelService,
+		@IInstantiationService instantiationService: IInstantiationService,
+	) {
+		super(instantiationService);
+	}
+
+	protected override finishRenderTemplate(data: IAbstractFrameRendererTemplateData): IStackTemplateData {
+		// override default e.g. language contributions, only allow users to click
+		// on code in the call stack to go to its source location
+		const contributions: IEditorContributionDescription[] = [{
+			id: ClickToLocationContribution.ID,
+			instantiation: EditorContributionInstantiation.BeforeFirstInteraction,
+			ctor: ClickToLocationContribution as EditorContributionCtor,
+		}];
+
+		const editor = this.containingEditor
+			? this.instantiationService.createInstance(
+				EmbeddedCodeEditorWidget,
+				data.elements.editor,
+				editorOptions,
+				{ isSimpleWidget: true, contributions },
+				this.containingEditor,
+			)
+			: this.instantiationService.createInstance(
+				CodeEditorWidget,
+				data.elements.editor,
+				editorOptions,
+				{ isSimpleWidget: true, contributions },
+			);
+
+		data.templateStore.add(editor);
+
+		const toolbar = data.templateStore.add(this.instantiationService.createInstance(MenuWorkbenchToolBar, data.elements.actions, MenuId.DebugCallStackToolbar, {
+			menuOptions: { shouldForwardArgs: true },
+			actionViewItemProvider: (action, options) => createActionViewItem(this.instantiationService, action, options),
+		}));
+
+		return { ...data, editor, toolbar };
+	}
+
+	override renderElement(element: ListItem, index: number, template: IStackTemplateData, height: number | undefined): void {
+		super.renderElement(element, index, template, height);
+
+		const { elementStore, editor } = template;
+
+		const item = element as WrappedCallStackFrame;
+		const uri = item.source!;
+
+		template.label.element.setFile(uri);
+		const cts = new CancellationTokenSource();
+		elementStore.add(toDisposable(() => cts.dispose(true)));
+		this.modelService.createModelReference(uri).then(reference => {
+			if (cts.token.isCancellationRequested) {
+				return reference.dispose();
+			}
+
+			elementStore.add(reference);
+			editor.setModel(reference.object.textEditorModel);
+			this.setupEditorAfterModel(item, template);
+			this.setupEditorLayout(item, template);
+		});
+	}
+
+	private setupEditorLayout(item: WrappedCallStackFrame, { elementStore, container, editor }: IStackTemplateData) {
+		const layout = () => {
+			const prev = editor.getContentHeight();
+			editor.layout({ width: container.clientWidth, height: prev });
+
+			const next = editor.getContentHeight();
+			if (next !== prev) {
+				editor.layout({ width: container.clientWidth, height: next });
+			}
+
+			item.editorHeight.set(next, undefined);
+		};
+		elementStore.add(editor.onDidChangeModelDecorations(layout));
+		elementStore.add(editor.onDidChangeModelContent(layout));
+		elementStore.add(editor.onDidChangeModelOptions(layout));
+		elementStore.add(this.onLayout(layout));
+		layout();
+	}
+
+	private setupEditorAfterModel(item: WrappedCallStackFrame, template: IStackTemplateData): void {
+		const range = Range.fromPositions({
+			column: item.column ?? 1,
+			lineNumber: item.line ?? 1,
+		});
+
+		template.toolbar.context = { uri: item.source, range };
+
+		template.editor.setHiddenAreas([
+			Range.fromPositions(
+				{ column: 1, lineNumber: 1 },
+				{ column: 1, lineNumber: Math.max(1, item.line - CONTEXT_LINES - 1) },
+			),
+			Range.fromPositions(
+				{ column: 1, lineNumber: item.line + CONTEXT_LINES + 1 },
+				{ column: 1, lineNumber: Constants.MAX_SAFE_SMALL_INTEGER },
+			),
+		]);
+
+		template.editor.changeDecorations(accessor => {
+			for (const d of template.decorations) {
+				accessor.removeDecoration(d);
+			}
+			template.decorations.length = 0;
+
+			const beforeRange = range.setStartPosition(range.startLineNumber, 1);
+			const hasCharactersBefore = !!template.editor.getModel()?.getValueInRange(beforeRange).trim();
+			const decoRange = range.setEndPosition(range.startLineNumber, Constants.MAX_SAFE_SMALL_INTEGER);
+
+			template.decorations.push(accessor.addDecoration(
+				decoRange,
+				makeStackFrameColumnDecoration(!hasCharactersBefore),
+			));
+			template.decorations.push(accessor.addDecoration(
+				decoRange,
+				TOP_STACK_FRAME_DECORATION,
+			));
+		});
+
+		item.editorHeight.set(template.editor.getContentHeight(), undefined);
+	}
+}
+
+interface IMissingTemplateData {
+	elements: ReturnType<typeof makeFrameElements>;
+	label: ResourceLabel;
+}
+
+/** Renderer for a call frame that's missing a URI */
+class MissingCodeRenderer implements IListRenderer<ListItem, IMissingTemplateData> {
+	public static readonly templateId = 'm';
+	public readonly templateId = MissingCodeRenderer.templateId;
+
+	constructor(@IInstantiationService private readonly instantiationService: IInstantiationService) { }
+
+	renderTemplate(container: HTMLElement): IMissingTemplateData {
+		const elements = makeFrameElements();
+		elements.root.classList.add('missing');
+		container.appendChild(elements.root);
+		const label = this.instantiationService.createInstance(ResourceLabel, elements.title, {});
+		return { elements, label };
+	}
+
+	renderElement(element: ListItem, _index: number, templateData: IMissingTemplateData): void {
+		const cast = element as CallStackFrame;
+		templateData.label.element.setResource({
+			name: cast.name,
+			description: localize('stackFrameLocation', 'Line {0} column {1}', cast.line, cast.column),
+			range: { startLineNumber: cast.line, startColumn: cast.column, endColumn: cast.column, endLineNumber: cast.line },
+		}, {
+			icon: Codicon.fileBinary,
+		});
+	}
+
+	disposeTemplate(templateData: IMissingTemplateData): void {
+		templateData.label.dispose();
+		templateData.elements.root.remove();
+	}
+}
+
+/** Renderer for a call frame that's missing a URI */
+class CustomRenderer extends AbstractFrameRenderer<IAbstractFrameRendererTemplateData> {
+	public static readonly templateId = 'c';
+	public readonly templateId = CustomRenderer.templateId;
+
+	protected override finishRenderTemplate(data: IAbstractFrameRendererTemplateData): IAbstractFrameRendererTemplateData {
+		return data;
+	}
+
+	override renderElement(element: ListItem, index: number, template: IAbstractFrameRendererTemplateData, height: number | undefined): void {
+		super.renderElement(element, index, template, height);
+
+		const item = element as WrappedCustomStackFrame;
+		const { elementStore, container, label } = template;
+
+		label.element.setResource({ name: item.original.label }, { icon: item.original.icon });
+
+		elementStore.add(autorun(reader => {
+			template.elements.header.style.display = item.original.showHeader.read(reader) ? '' : 'none';
+		}));
+
+		elementStore.add(autorunWithStore((reader, store) => {
+			if (!item.collapsed.read(reader)) {
+				store.add(item.original.render(container));
+			}
+		}));
+
+		const actions = item.original.renderActions?.(template.elements.actions);
+		if (actions) {
+			elementStore.add(actions);
+		}
+	}
+}
+
+interface ISkippedTemplateData {
+	button: Button;
+	current?: SkippedCallFrames;
+	store: DisposableStore;
+}
+
+/** Renderer for a button to load more call frames */
+class SkippedRenderer implements IListRenderer<ListItem, ISkippedTemplateData> {
+	public static readonly templateId = 's';
+	public readonly templateId = SkippedRenderer.templateId;
+
+	constructor(
+		private readonly loadFrames: (fromItem: SkippedCallFrames) => Promise<void>,
+		@INotificationService private readonly notificationService: INotificationService,
+	) { }
+
+	renderTemplate(container: HTMLElement): ISkippedTemplateData {
+		const store = new DisposableStore();
+		const button = new Button(container, { title: '', ...defaultButtonStyles });
+		const data: ISkippedTemplateData = { button, store };
+
+		store.add(button);
+		store.add(button.onDidClick(() => {
+			if (!data.current || !button.enabled) {
+				return;
+			}
+
+			button.enabled = false;
+			this.loadFrames(data.current).catch(e => {
+				this.notificationService.error(localize('failedToLoadFrames', 'Failed to load stack frames: {0}', e.message));
+			});
+		}));
+
+		return data;
+	}
+
+	renderElement(element: ListItem, index: number, templateData: ISkippedTemplateData, height: number | undefined): void {
+		const cast = element as SkippedCallFrames;
+		templateData.button.enabled = true;
+		templateData.button.label = cast.label;
+		templateData.current = cast;
+	}
+
+	disposeTemplate(templateData: ISkippedTemplateData): void {
+		templateData.store.dispose();
+	}
+}
+
+/** A simple contribution that makes all data in the editor clickable to go to the location */
+class ClickToLocationContribution extends Disposable implements IEditorContribution {
+	public static readonly ID = 'clickToLocation';
+	private readonly linkDecorations: IEditorDecorationsCollection;
+	private current: { line: number; word: IWordAtPosition } | undefined;
+
+	constructor(
+		private readonly editor: ICodeEditor,
+		@IEditorService editorService: IEditorService,
+	) {
+		super();
+		this.linkDecorations = editor.createDecorationsCollection();
+		this._register(toDisposable(() => this.linkDecorations.clear()));
+
+		const clickLinkGesture = this._register(new ClickLinkGesture(editor));
+
+		this._register(clickLinkGesture.onMouseMoveOrRelevantKeyDown(([mouseEvent, keyboardEvent]) => {
+			this.onMove(mouseEvent);
+		}));
+		this._register(clickLinkGesture.onExecute((e) => {
+			const model = this.editor.getModel();
+			if (!this.current || !model) {
+				return;
+			}
+
+			editorService.openEditor({
+				resource: model.uri,
+				options: {
+					selection: Range.fromPositions(new Position(this.current.line, this.current.word.startColumn)),
+					selectionRevealType: TextEditorSelectionRevealType.CenterIfOutsideViewport,
+				},
+			}, e.hasSideBySideModifier ? SIDE_GROUP : undefined);
+		}));
+	}
+
+	private onMove(mouseEvent: ClickLinkMouseEvent) {
+		if (!mouseEvent.hasTriggerModifier) {
+			return this.clear();
+		}
+
+		const position = mouseEvent.target.position;
+		const word = position && this.editor.getModel()?.getWordAtPosition(position);
+		if (!word) {
+			return this.clear();
+		}
+
+		const prev = this.current?.word;
+		if (prev && prev.startColumn === word.startColumn && prev.endColumn === word.endColumn && prev.word === word.word) {
+			return;
+		}
+
+		this.current = { word, line: position.lineNumber };
+		this.linkDecorations.set([{
+			range: new Range(position.lineNumber, word.startColumn, position.lineNumber, word.endColumn),
+			options: {
+				description: 'call-stack-go-to-file-link',
+				inlineClassName: 'call-stack-go-to-file-link',
+			},
+		}]);
+	}
+
+	private clear() {
+		this.linkDecorations.clear();
+		this.current = undefined;
+	}
+}
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'callStackWidget.goToFile',
+			title: localize2('goToFile', 'Open File'),
+			icon: Codicon.goToFile,
+			menu: {
+				id: MenuId.DebugCallStackToolbar,
+				order: 22,
+				group: 'navigation',
+			},
+		});
+	}
+
+	async run(accessor: ServicesAccessor, { uri, range }: Location): Promise<void> {
+		const editorService = accessor.get(IEditorService);
+		await editorService.openEditor({
+			resource: uri,
+			options: {
+				selection: range,
+				selectionRevealType: TextEditorSelectionRevealType.CenterIfOutsideViewport,
+			},
+		});
+	}
+});
diff --git a/src/vs/workbench/contrib/debug/browser/debug.contribution.ts b/src/vs/workbench/contrib/debug/browser/debug.contribution.ts
index ab797aa530c..49dc41dd76f 100644
--- a/src/vs/workbench/contrib/debug/browser/debug.contribution.ts
+++ b/src/vs/workbench/contrib/debug/browser/debug.contribution.ts
@@ -3,59 +3,66 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { FileAccess } from 'vs/base/common/network';
-import { isMacintosh, isWeb } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import 'vs/css!./media/debug.contribution';
-import 'vs/css!./media/debugHover';
-import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import * as nls from 'vs/nls';
-import { ICommandActionTitle, Icon } from 'vs/platform/action/common/action';
-import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
-import { Extensions as ConfigurationExtensions, ConfigurationScope, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { ContextKeyExpr, ContextKeyExpression } from 'vs/platform/contextkey/common/contextkey';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IQuickAccessRegistry, Extensions as QuickAccessExtensions } from 'vs/platform/quickinput/common/quickAccess';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { EditorPaneDescriptor, IEditorPaneRegistry } from 'vs/workbench/browser/editor';
-import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
-import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
-import { EditorExtensions } from 'vs/workbench/common/editor';
-import { IViewContainersRegistry, IViewsRegistry, ViewContainer, ViewContainerLocation, Extensions as ViewExtensions } from 'vs/workbench/common/views';
-import { BreakpointEditorContribution } from 'vs/workbench/contrib/debug/browser/breakpointEditorContribution';
-import { BreakpointsView } from 'vs/workbench/contrib/debug/browser/breakpointsView';
-import { CallStackEditorContribution } from 'vs/workbench/contrib/debug/browser/callStackEditorContribution';
-import { CallStackView } from 'vs/workbench/contrib/debug/browser/callStackView';
-import { registerColors } from 'vs/workbench/contrib/debug/browser/debugColors';
-import { ADD_CONFIGURATION_ID, ADD_TO_WATCH_ID, ADD_TO_WATCH_LABEL, CALLSTACK_BOTTOM_ID, CALLSTACK_BOTTOM_LABEL, CALLSTACK_DOWN_ID, CALLSTACK_DOWN_LABEL, CALLSTACK_TOP_ID, CALLSTACK_TOP_LABEL, CALLSTACK_UP_ID, CALLSTACK_UP_LABEL, CONTINUE_ID, CONTINUE_LABEL, COPY_EVALUATE_PATH_ID, COPY_EVALUATE_PATH_LABEL, COPY_STACK_TRACE_ID, COPY_VALUE_ID, COPY_VALUE_LABEL, DEBUG_COMMAND_CATEGORY, DEBUG_CONSOLE_QUICK_ACCESS_PREFIX, DEBUG_QUICK_ACCESS_PREFIX, DEBUG_RUN_COMMAND_ID, DEBUG_RUN_LABEL, DEBUG_START_COMMAND_ID, DEBUG_START_LABEL, DISCONNECT_AND_SUSPEND_ID, DISCONNECT_AND_SUSPEND_LABEL, DISCONNECT_ID, DISCONNECT_LABEL, EDIT_EXPRESSION_COMMAND_ID, FOCUS_REPL_ID, JUMP_TO_CURSOR_ID, NEXT_DEBUG_CONSOLE_ID, NEXT_DEBUG_CONSOLE_LABEL, OPEN_LOADED_SCRIPTS_LABEL, PAUSE_ID, PAUSE_LABEL, PREV_DEBUG_CONSOLE_ID, PREV_DEBUG_CONSOLE_LABEL, REMOVE_EXPRESSION_COMMAND_ID, RESTART_FRAME_ID, RESTART_LABEL, RESTART_SESSION_ID, SELECT_AND_START_ID, SELECT_AND_START_LABEL, SELECT_DEBUG_CONSOLE_ID, SELECT_DEBUG_CONSOLE_LABEL, SELECT_DEBUG_SESSION_ID, SELECT_DEBUG_SESSION_LABEL, SET_EXPRESSION_COMMAND_ID, SHOW_LOADED_SCRIPTS_ID, STEP_INTO_ID, STEP_INTO_LABEL, STEP_INTO_TARGET_ID, STEP_INTO_TARGET_LABEL, STEP_OUT_ID, STEP_OUT_LABEL, STEP_OVER_ID, STEP_OVER_LABEL, STOP_ID, STOP_LABEL, TERMINATE_THREAD_ID, TOGGLE_INLINE_BREAKPOINT_ID } from 'vs/workbench/contrib/debug/browser/debugCommands';
-import { DebugConsoleQuickAccess } from 'vs/workbench/contrib/debug/browser/debugConsoleQuickAccess';
-import { RunToCursorAction, SelectionToReplAction, SelectionToWatchExpressionsAction } from 'vs/workbench/contrib/debug/browser/debugEditorActions';
-import { DebugEditorContribution } from 'vs/workbench/contrib/debug/browser/debugEditorContribution';
-import * as icons from 'vs/workbench/contrib/debug/browser/debugIcons';
-import { DebugProgressContribution } from 'vs/workbench/contrib/debug/browser/debugProgress';
-import { StartDebugQuickAccessProvider } from 'vs/workbench/contrib/debug/browser/debugQuickAccess';
-import { DebugService } from 'vs/workbench/contrib/debug/browser/debugService';
-import { DebugStatusContribution } from 'vs/workbench/contrib/debug/browser/debugStatus';
-import { DebugTitleContribution } from 'vs/workbench/contrib/debug/browser/debugTitle';
-import { DebugToolBar } from 'vs/workbench/contrib/debug/browser/debugToolBar';
-import { DebugViewPaneContainer } from 'vs/workbench/contrib/debug/browser/debugViewlet';
-import { DisassemblyView, DisassemblyViewContribution } from 'vs/workbench/contrib/debug/browser/disassemblyView';
-import { LoadedScriptsView } from 'vs/workbench/contrib/debug/browser/loadedScriptsView';
-import { Repl } from 'vs/workbench/contrib/debug/browser/repl';
-import { StatusBarColorProvider } from 'vs/workbench/contrib/debug/browser/statusbarColorProvider';
-import { BREAK_WHEN_VALUE_CHANGES_ID, BREAK_WHEN_VALUE_IS_ACCESSED_ID, BREAK_WHEN_VALUE_IS_READ_ID, SET_VARIABLE_ID, VIEW_MEMORY_ID, VariablesView } from 'vs/workbench/contrib/debug/browser/variablesView';
-import { ADD_WATCH_ID, ADD_WATCH_LABEL, REMOVE_WATCH_EXPRESSIONS_COMMAND_ID, REMOVE_WATCH_EXPRESSIONS_LABEL, WatchExpressionsView } from 'vs/workbench/contrib/debug/browser/watchExpressionsView';
-import { WelcomeView } from 'vs/workbench/contrib/debug/browser/welcomeView';
-import { BREAKPOINTS_VIEW_ID, BREAKPOINT_EDITOR_CONTRIBUTION_ID, CALLSTACK_VIEW_ID, CONTEXT_BREAKPOINTS_EXIST, CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_ACCESSED_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_READ_SUPPORTED, CONTEXT_CALLSTACK_ITEM_TYPE, CONTEXT_CAN_VIEW_MEMORY, CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DEBUG_STATE, CONTEXT_DEBUG_UX, CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG, CONTEXT_HAS_DEBUGGED, CONTEXT_IN_DEBUG_MODE, CONTEXT_JUMP_TO_CURSOR_SUPPORTED, CONTEXT_LOADED_SCRIPTS_SUPPORTED, CONTEXT_RESTART_FRAME_SUPPORTED, CONTEXT_SET_EXPRESSION_SUPPORTED, CONTEXT_SET_VARIABLE_SUPPORTED, CONTEXT_STACK_FRAME_SUPPORTS_RESTART, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_SUSPEND_DEBUGGEE_SUPPORTED, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED, CONTEXT_VARIABLE_EVALUATE_NAME_PRESENT, CONTEXT_VARIABLE_IS_READONLY, CONTEXT_VARIABLE_VALUE, CONTEXT_WATCH_ITEM_TYPE, DEBUG_PANEL_ID, DISASSEMBLY_VIEW_ID, EDITOR_CONTRIBUTION_ID, IDebugService, INTERNAL_CONSOLE_OPTIONS_SCHEMA, LOADED_SCRIPTS_VIEW_ID, REPL_VIEW_ID, State, VARIABLES_VIEW_ID, VIEWLET_ID, WATCH_VIEW_ID, getStateLabel } from 'vs/workbench/contrib/debug/common/debug';
-import { DebugContentProvider } from 'vs/workbench/contrib/debug/common/debugContentProvider';
-import { DebugLifecycle } from 'vs/workbench/contrib/debug/common/debugLifecycle';
-import { DebugVisualizerService, IDebugVisualizerService } from 'vs/workbench/contrib/debug/common/debugVisualizers';
-import { DisassemblyViewInput } from 'vs/workbench/contrib/debug/common/disassemblyViewInput';
-import { COPY_NOTEBOOK_VARIABLE_VALUE_ID, COPY_NOTEBOOK_VARIABLE_VALUE_LABEL } from 'vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariableCommands';
-import { launchSchemaId } from 'vs/workbench/services/configuration/common/configuration';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { FileAccess } from '../../../../base/common/network.js';
+import { isMacintosh, isWeb } from '../../../../base/common/platform.js';
+import { URI } from '../../../../base/common/uri.js';
+import './media/debug.contribution.css';
+import './media/debugHover.css';
+import { EditorContributionInstantiation, registerEditorContribution } from '../../../../editor/browser/editorExtensions.js';
+import * as nls from '../../../../nls.js';
+import { AccessibleViewRegistry } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
+import { ICommandActionTitle, Icon } from '../../../../platform/action/common/action.js';
+import { MenuId, MenuRegistry } from '../../../../platform/actions/common/actions.js';
+import { Extensions as ConfigurationExtensions, ConfigurationScope, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { ContextKeyExpr, ContextKeyExpression } from '../../../../platform/contextkey/common/contextkey.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IQuickAccessRegistry, Extensions as QuickAccessExtensions } from '../../../../platform/quickinput/common/quickAccess.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { EditorPaneDescriptor, IEditorPaneRegistry } from '../../../browser/editor.js';
+import { ViewPaneContainer } from '../../../browser/parts/views/viewPaneContainer.js';
+import { IWorkbenchContributionsRegistry, registerWorkbenchContribution2, Extensions as WorkbenchExtensions, WorkbenchPhase } from '../../../common/contributions.js';
+import { EditorExtensions } from '../../../common/editor.js';
+import { IViewContainersRegistry, IViewsRegistry, ViewContainer, ViewContainerLocation, Extensions as ViewExtensions } from '../../../common/views.js';
+import { BreakpointEditorContribution } from './breakpointEditorContribution.js';
+import { BreakpointsView } from './breakpointsView.js';
+import { CallStackEditorContribution } from './callStackEditorContribution.js';
+import { CallStackView } from './callStackView.js';
+import { ReplAccessibleView } from './replAccessibleView.js';
+import { registerColors } from './debugColors.js';
+import { ADD_CONFIGURATION_ID, ADD_TO_WATCH_ID, ADD_TO_WATCH_LABEL, CALLSTACK_BOTTOM_ID, CALLSTACK_BOTTOM_LABEL, CALLSTACK_DOWN_ID, CALLSTACK_DOWN_LABEL, CALLSTACK_TOP_ID, CALLSTACK_TOP_LABEL, CALLSTACK_UP_ID, CALLSTACK_UP_LABEL, CONTINUE_ID, CONTINUE_LABEL, COPY_EVALUATE_PATH_ID, COPY_EVALUATE_PATH_LABEL, COPY_STACK_TRACE_ID, COPY_VALUE_ID, COPY_VALUE_LABEL, DEBUG_COMMAND_CATEGORY, DEBUG_CONSOLE_QUICK_ACCESS_PREFIX, DEBUG_QUICK_ACCESS_PREFIX, DEBUG_RUN_COMMAND_ID, DEBUG_RUN_LABEL, DEBUG_START_COMMAND_ID, DEBUG_START_LABEL, DISCONNECT_AND_SUSPEND_ID, DISCONNECT_AND_SUSPEND_LABEL, DISCONNECT_ID, DISCONNECT_LABEL, EDIT_EXPRESSION_COMMAND_ID, FOCUS_REPL_ID, JUMP_TO_CURSOR_ID, NEXT_DEBUG_CONSOLE_ID, NEXT_DEBUG_CONSOLE_LABEL, OPEN_LOADED_SCRIPTS_LABEL, PAUSE_ID, PAUSE_LABEL, PREV_DEBUG_CONSOLE_ID, PREV_DEBUG_CONSOLE_LABEL, REMOVE_EXPRESSION_COMMAND_ID, RESTART_FRAME_ID, RESTART_LABEL, RESTART_SESSION_ID, SELECT_AND_START_ID, SELECT_AND_START_LABEL, SELECT_DEBUG_CONSOLE_ID, SELECT_DEBUG_CONSOLE_LABEL, SELECT_DEBUG_SESSION_ID, SELECT_DEBUG_SESSION_LABEL, SET_EXPRESSION_COMMAND_ID, SHOW_LOADED_SCRIPTS_ID, STEP_INTO_ID, STEP_INTO_LABEL, STEP_INTO_TARGET_ID, STEP_INTO_TARGET_LABEL, STEP_OUT_ID, STEP_OUT_LABEL, STEP_OVER_ID, STEP_OVER_LABEL, STOP_ID, STOP_LABEL, TERMINATE_THREAD_ID, TOGGLE_INLINE_BREAKPOINT_ID } from './debugCommands.js';
+import { DebugConsoleQuickAccess } from './debugConsoleQuickAccess.js';
+import { RunToCursorAction, SelectionToReplAction, SelectionToWatchExpressionsAction } from './debugEditorActions.js';
+import { DebugEditorContribution } from './debugEditorContribution.js';
+import * as icons from './debugIcons.js';
+import { DebugProgressContribution } from './debugProgress.js';
+import { StartDebugQuickAccessProvider } from './debugQuickAccess.js';
+import { DebugService } from './debugService.js';
+import { DebugStatusContribution } from './debugStatus.js';
+import { DebugTitleContribution } from './debugTitle.js';
+import { DebugToolBar } from './debugToolBar.js';
+import { DebugViewPaneContainer } from './debugViewlet.js';
+import { DisassemblyView, DisassemblyViewContribution } from './disassemblyView.js';
+import { LoadedScriptsView } from './loadedScriptsView.js';
+import { Repl } from './repl.js';
+import { StatusBarColorProvider } from './statusbarColorProvider.js';
+import { BREAK_WHEN_VALUE_CHANGES_ID, BREAK_WHEN_VALUE_IS_ACCESSED_ID, BREAK_WHEN_VALUE_IS_READ_ID, SET_VARIABLE_ID, VIEW_MEMORY_ID, VariablesView } from './variablesView.js';
+import { ADD_WATCH_ID, ADD_WATCH_LABEL, REMOVE_WATCH_EXPRESSIONS_COMMAND_ID, REMOVE_WATCH_EXPRESSIONS_LABEL, WatchExpressionsView } from './watchExpressionsView.js';
+import { WelcomeView } from './welcomeView.js';
+import { BREAKPOINTS_VIEW_ID, BREAKPOINT_EDITOR_CONTRIBUTION_ID, CALLSTACK_VIEW_ID, CONTEXT_BREAKPOINTS_EXIST, CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_ACCESSED_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_READ_SUPPORTED, CONTEXT_CALLSTACK_ITEM_TYPE, CONTEXT_CAN_VIEW_MEMORY, CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DEBUG_STATE, CONTEXT_DEBUG_UX, CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG, CONTEXT_HAS_DEBUGGED, CONTEXT_IN_DEBUG_MODE, CONTEXT_JUMP_TO_CURSOR_SUPPORTED, CONTEXT_LOADED_SCRIPTS_SUPPORTED, CONTEXT_RESTART_FRAME_SUPPORTED, CONTEXT_SET_EXPRESSION_SUPPORTED, CONTEXT_SET_VARIABLE_SUPPORTED, CONTEXT_STACK_FRAME_SUPPORTS_RESTART, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_SUSPEND_DEBUGGEE_SUPPORTED, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED, CONTEXT_VARIABLE_EVALUATE_NAME_PRESENT, CONTEXT_VARIABLE_IS_READONLY, CONTEXT_VARIABLE_VALUE, CONTEXT_WATCH_ITEM_TYPE, DEBUG_PANEL_ID, DISASSEMBLY_VIEW_ID, EDITOR_CONTRIBUTION_ID, IDebugService, INTERNAL_CONSOLE_OPTIONS_SCHEMA, LOADED_SCRIPTS_VIEW_ID, REPL_VIEW_ID, State, VARIABLES_VIEW_ID, VIEWLET_ID, WATCH_VIEW_ID, getStateLabel } from '../common/debug.js';
+import { DebugContentProvider } from '../common/debugContentProvider.js';
+import { DebugLifecycle } from '../common/debugLifecycle.js';
+import { DebugVisualizerService, IDebugVisualizerService } from '../common/debugVisualizers.js';
+import { DisassemblyViewInput } from '../common/disassemblyViewInput.js';
+import { COPY_NOTEBOOK_VARIABLE_VALUE_ID, COPY_NOTEBOOK_VARIABLE_VALUE_LABEL } from '../../notebook/browser/contrib/notebookVariables/notebookVariableCommands.js';
+import { launchSchemaId } from '../../../services/configuration/common/configuration.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import './debugSettingMigration.js';
+import { ReplAccessibilityHelp } from './replAccessibilityHelp.js';
+import { ReplAccessibilityAnnouncer } from '../common/replAccessibilityAnnouncer.js';
+import { RunAndDebugAccessibilityHelp } from './runAndDebugAccessibilityHelp.js';
+import { DebugWatchAccessibilityAnnouncer } from '../common/debugAccessibilityAnnouncer.js';
 
 const debugCategory = nls.localize('debugCategory', "Debug");
 registerColors();
@@ -440,6 +447,11 @@ configurationRegistry.registerConfiguration({
 	title: nls.localize('debugConfigurationTitle', "Debug"),
 	type: 'object',
 	properties: {
+		'debug.showVariableTypes': {
+			type: 'boolean',
+			description: nls.localize({ comment: ['This is the description for a setting'], key: 'showVariableTypes' }, "Show variable type in variable pane during debug session"),
+			default: false
+		},
 		'debug.allowBreakpointsEverywhere': {
 			type: 'boolean',
 			description: nls.localize({ comment: ['This is the description for a setting'], key: 'allowBreakpointsEverywhere' }, "Allow setting breakpoints in any file."),
@@ -555,7 +567,8 @@ configurationRegistry.registerConfiguration({
 			type: 'object',
 			description: nls.localize({ comment: ['This is the description for a setting'], key: 'launch' }, "Global debug launch configuration. Should be used as an alternative to 'launch.json' that is shared across workspaces."),
 			default: { configurations: [], compounds: [] },
-			$ref: launchSchemaId
+			$ref: launchSchemaId,
+			disallowConfigurationDefault: true
 		},
 		'debug.focusWindowOnBreak': {
 			type: 'boolean',
@@ -610,9 +623,15 @@ configurationRegistry.registerConfiguration({
 			description: nls.localize('debug.disassemblyView.showSourceCode', "Show Source Code in Disassembly View.")
 		},
 		'debug.autoExpandLazyVariables': {
-			type: 'boolean',
-			default: false,
-			description: nls.localize('debug.autoExpandLazyVariables', "Automatically show values for variables that are lazily resolved by the debugger, such as getters.")
+			type: 'string',
+			enum: ['auto', 'on', 'off'],
+			default: 'auto',
+			enumDescriptions: [
+				nls.localize('debug.autoExpandLazyVariables.auto', "When in screen reader optimized mode, automatically expand lazy variables."),
+				nls.localize('debug.autoExpandLazyVariables.on', "Always automatically expand lazy variables."),
+				nls.localize('debug.autoExpandLazyVariables.off', "Never automatically expand lazy variables.")
+			],
+			description: nls.localize('debug.autoExpandLazyVariables', "Controls whether variables that are lazily resolved, such as getters, are automatically resolved and expanded by the debugger.")
 		},
 		'debug.enableStatusBarColor': {
 			type: 'boolean',
@@ -626,3 +645,9 @@ configurationRegistry.registerConfiguration({
 		}
 	}
 });
+
+AccessibleViewRegistry.register(new ReplAccessibleView());
+AccessibleViewRegistry.register(new ReplAccessibilityHelp());
+AccessibleViewRegistry.register(new RunAndDebugAccessibilityHelp());
+registerWorkbenchContribution2(ReplAccessibilityAnnouncer.ID, ReplAccessibilityAnnouncer, WorkbenchPhase.AfterRestored);
+registerWorkbenchContribution2(DebugWatchAccessibilityAnnouncer.ID, DebugWatchAccessibilityAnnouncer, WorkbenchPhase.AfterRestored);
diff --git a/src/vs/workbench/contrib/debug/browser/debugANSIHandling.ts b/src/vs/workbench/contrib/debug/browser/debugANSIHandling.ts
index 131dd54bbc4..ef05737ca86 100644
--- a/src/vs/workbench/contrib/debug/browser/debugANSIHandling.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugANSIHandling.ts
@@ -3,25 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { LinkDetector } from 'vs/workbench/contrib/debug/browser/linkDetector';
-import { RGBA, Color } from 'vs/base/common/color';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ansiColorIdentifiers } from 'vs/workbench/contrib/terminal/common/terminalColorRegistry';
-import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
+import { Color, RGBA } from '../../../../base/common/color.js';
+import { isDefined } from '../../../../base/common/types.js';
+import { editorHoverBackground } from '../../../../platform/theme/common/colorRegistry.js';
+import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
+import { IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
+import { PANEL_BACKGROUND, SIDE_BAR_BACKGROUND } from '../../../common/theme.js';
+import { ansiColorIdentifiers } from '../../terminal/common/terminalColorRegistry.js';
+import { ILinkDetector } from './linkDetector.js';
 
 /**
  * @param text The content to stylize.
  * @returns An {@link HTMLSpanElement} that contains the potentially stylized text.
  */
-export function handleANSIOutput(text: string, linkDetector: LinkDetector, themeService: IThemeService, workspaceFolder: IWorkspaceFolder | undefined): HTMLSpanElement {
+export function handleANSIOutput(text: string, linkDetector: ILinkDetector, workspaceFolder: IWorkspaceFolder | undefined): HTMLSpanElement {
 
 	const root: HTMLSpanElement = document.createElement('span');
 	const textLength: number = text.length;
 
 	let styleNames: string[] = [];
-	let customFgColor: RGBA | undefined;
-	let customBgColor: RGBA | undefined;
-	let customUnderlineColor: RGBA | undefined;
+	let customFgColor: RGBA | string | undefined;
+	let customBgColor: RGBA | string | undefined;
+	let customUnderlineColor: RGBA | string | undefined;
 	let colorsInverted: boolean = false;
 	let currentPos: number = 0;
 	let buffer: string = '';
@@ -116,7 +119,7 @@ export function handleANSIOutput(text: string, linkDetector: LinkDetector, theme
 	 * @param color Color to change to. If `undefined` or not provided,
 	 * will clear current color without adding a new one.
 	 */
-	function changeColor(colorType: 'foreground' | 'background' | 'underline', color?: RGBA | undefined): void {
+	function changeColor(colorType: 'foreground' | 'background' | 'underline', color?: RGBA | string): void {
 		if (colorType === 'foreground') {
 			customFgColor = color;
 		} else if (colorType === 'background') {
@@ -135,7 +138,7 @@ export function handleANSIOutput(text: string, linkDetector: LinkDetector, theme
 	 * [] flag to make sure it is appropriate to turn ON or OFF (if it is already inverted don't call
 	 */
 	function reverseForegroundAndBackgroundColors(): void {
-		const oldFgColor: RGBA | undefined = customFgColor;
+		const oldFgColor = customFgColor;
 		changeColor('foreground', customBgColor);
 		changeColor('background', oldFgColor);
 	}
@@ -334,12 +337,8 @@ export function handleANSIOutput(text: string, linkDetector: LinkDetector, theme
 		} else if (colorNumber >= 0 && colorNumber <= 15) {
 			if (colorType === 'underline') {
 				// for underline colors we just decode the 0-15 color number to theme color, set and return
-				const theme = themeService.getColorTheme();
 				const colorName = ansiColorIdentifiers[colorNumber];
-				const color = theme.getColor(colorName);
-				if (color) {
-					changeColor(colorType, color.rgba);
-				}
+				changeColor(colorType, `--vscode-debug-ansi-${colorName}`);
 				return;
 			}
 			// Need to map to one of the four basic color ranges (30-37, 90-97, 40-47, 100-107)
@@ -364,7 +363,6 @@ export function handleANSIOutput(text: string, linkDetector: LinkDetector, theme
 	 * nothing.
 	 */
 	function setBasicColor(styleCode: number): void {
-		const theme = themeService.getColorTheme();
 		let colorType: 'foreground' | 'background' | undefined;
 		let colorIndex: number | undefined;
 
@@ -384,10 +382,7 @@ export function handleANSIOutput(text: string, linkDetector: LinkDetector, theme
 
 		if (colorIndex !== undefined && colorType) {
 			const colorName = ansiColorIdentifiers[colorIndex];
-			const color = theme.getColor(colorName);
-			if (color) {
-				changeColor(colorType, color.rgba);
-			}
+			changeColor(colorType, `--vscode-debug-ansi-${colorName.replaceAll('.', '-')}`);
 		}
 	}
 }
@@ -396,7 +391,7 @@ export function handleANSIOutput(text: string, linkDetector: LinkDetector, theme
  * @param root The {@link HTMLElement} to append the content to.
  * @param stringContent The text content to be appended.
  * @param cssClasses The list of CSS styles to apply to the text content.
- * @param linkDetector The {@link LinkDetector} responsible for generating links from {@param stringContent}.
+ * @param linkDetector The {@link ILinkDetector} responsible for generating links from {@param stringContent}.
  * @param customTextColor If provided, will apply custom color with inline style.
  * @param customBackgroundColor If provided, will apply custom backgroundColor with inline style.
  * @param customUnderlineColor If provided, will apply custom textDecorationColor with inline style.
@@ -405,11 +400,11 @@ export function appendStylizedStringToContainer(
 	root: HTMLElement,
 	stringContent: string,
 	cssClasses: string[],
-	linkDetector: LinkDetector,
+	linkDetector: ILinkDetector,
 	workspaceFolder: IWorkspaceFolder | undefined,
-	customTextColor?: RGBA,
-	customBackgroundColor?: RGBA,
-	customUnderlineColor?: RGBA
+	customTextColor?: RGBA | string,
+	customBackgroundColor?: RGBA | string,
+	customUnderlineColor?: RGBA | string,
 ): void {
 	if (!root || !stringContent) {
 		return;
@@ -420,16 +415,17 @@ export function appendStylizedStringToContainer(
 	container.className = cssClasses.join(' ');
 	if (customTextColor) {
 		container.style.color =
-			Color.Format.CSS.formatRGB(new Color(customTextColor));
+			typeof customTextColor === 'string' ? `var(${customTextColor})` : Color.Format.CSS.formatRGB(new Color(customTextColor));
 	}
 	if (customBackgroundColor) {
 		container.style.backgroundColor =
-			Color.Format.CSS.formatRGB(new Color(customBackgroundColor));
+			typeof customBackgroundColor === 'string' ? `var(${customBackgroundColor})` : Color.Format.CSS.formatRGB(new Color(customBackgroundColor));
 	}
 	if (customUnderlineColor) {
 		container.style.textDecorationColor =
-			Color.Format.CSS.formatRGB(new Color(customUnderlineColor));
+			typeof customUnderlineColor === 'string' ? `var(${customUnderlineColor})` : Color.Format.CSS.formatRGB(new Color(customUnderlineColor));
 	}
+
 	root.appendChild(container);
 }
 
@@ -471,3 +467,26 @@ export function calcANSI8bitColor(colorNumber: number): RGBA | undefined {
 		return;
 	}
 }
+
+registerThemingParticipant((theme, collector) => {
+	const areas = [
+		{ selector: '.monaco-workbench .sidebar, .monaco-workbench .auxiliarybar', bg: theme.getColor(SIDE_BAR_BACKGROUND) },
+		{ selector: '.monaco-workbench .panel', bg: theme.getColor(PANEL_BACKGROUND) },
+		{ selector: '.debug-hover-widget', bg: theme.getColor(editorHoverBackground) },
+	];
+
+	for (const { selector, bg } of areas) {
+		const content = ansiColorIdentifiers
+			.map(color => {
+				const actual = theme.getColor(color);
+				if (!actual) { return undefined; }
+				// this uses the default contrast ratio of 4 (from the terminal),
+				// we may want to make this configurable in the future, but this is
+				// good to keep things sane to start with.
+				return `--vscode-debug-ansi-${color.replaceAll('.', '-')}:${bg ? bg.ensureConstrast(actual, 4) : actual}`;
+			})
+			.filter(isDefined);
+
+		collector.addRule(`${selector} { ${content.join(';')} }`);
+	}
+});
diff --git a/src/vs/workbench/contrib/debug/browser/debugActionViewItems.ts b/src/vs/workbench/contrib/debug/browser/debugActionViewItems.ts
index 50a1b351fc2..844e2ff2886 100644
--- a/src/vs/workbench/contrib/debug/browser/debugActionViewItems.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugActionViewItems.ts
@@ -3,27 +3,30 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { IAction } from 'vs/base/common/actions';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import * as dom from 'vs/base/browser/dom';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { SelectBox, ISelectOptionItem } from 'vs/base/browser/ui/selectBox/selectBox';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IDebugService, IDebugSession, IDebugConfiguration, IConfig, ILaunch, State } from 'vs/workbench/contrib/debug/common/debug';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { selectBorder, selectBackground, asCssVariable } from 'vs/platform/theme/common/colorRegistry';
-import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { ADD_CONFIGURATION_ID } from 'vs/workbench/contrib/debug/browser/debugCommands';
-import { BaseActionViewItem, IBaseActionViewItemOptions, SelectActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { debugStart } from 'vs/workbench/contrib/debug/browser/debugIcons';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { defaultSelectBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import * as nls from '../../../../nls.js';
+import { IAction } from '../../../../base/common/actions.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import * as dom from '../../../../base/browser/dom.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { SelectBox, ISelectOptionItem } from '../../../../base/browser/ui/selectBox/selectBox.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IDebugService, IDebugSession, IDebugConfiguration, IConfig, ILaunch, State } from '../common/debug.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { selectBorder, selectBackground, asCssVariable } from '../../../../platform/theme/common/colorRegistry.js';
+import { IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { IWorkspaceContextService, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { IDisposable, dispose } from '../../../../base/common/lifecycle.js';
+import { ADD_CONFIGURATION_ID } from './debugCommands.js';
+import { BaseActionViewItem, IBaseActionViewItemOptions, SelectActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { debugStart } from './debugIcons.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { defaultSelectBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
+import { AccessibilityCommandId } from '../../accessibility/common/accessibilityCommands.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 
 const $ = dom.$;
 
@@ -49,7 +52,8 @@ export class StartDebugActionViewItem extends BaseActionViewItem {
 		@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
 		@IContextViewService contextViewService: IContextViewService,
 		@IKeybindingService private readonly keybindingService: IKeybindingService,
-		@IHoverService private readonly hoverService: IHoverService
+		@IHoverService private readonly hoverService: IHoverService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService
 	) {
 		super(context, action, options);
 		this.toDispose = [];
@@ -80,7 +84,7 @@ export class StartDebugActionViewItem extends BaseActionViewItem {
 		const title = this.action.label + keybindingLabel;
 		this.toDispose.push(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), this.start, title));
 		this.start.setAttribute('role', 'button');
-		this.start.ariaLabel = title;
+		this._setAriaLabel(title);
 
 		this.toDispose.push(dom.addDisposableListener(this.start, dom.EventType.CLICK, () => {
 			this.start.blur();
@@ -261,6 +265,21 @@ export class StartDebugActionViewItem extends BaseActionViewItem {
 
 		this.selectBox.setOptions(this.debugOptions.map((data, index): ISelectOptionItem => ({ text: data.label, isDisabled: disabledIdxs.indexOf(index) !== -1 })), this.selected);
 	}
+
+	private _setAriaLabel(title: string): void {
+		let ariaLabel = title;
+		let keybinding: string | undefined;
+		const verbose = this.configurationService.getValue(AccessibilityVerbositySettingId.Debug);
+		if (verbose) {
+			keybinding = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp, this.contextKeyService)?.getLabel() ?? undefined;
+		}
+		if (keybinding) {
+			ariaLabel = nls.localize('commentLabelWithKeybinding', "{0}, use ({1}) for accessibility help", ariaLabel, keybinding);
+		} else {
+			ariaLabel = nls.localize('commentLabelWithKeybindingNoKeybinding', "{0}, run the command Open Accessibility Help which is currently not triggerable via keybinding.", ariaLabel);
+		}
+		this.start.ariaLabel = ariaLabel;
+	}
 }
 
 export class FocusSessionActionViewItem extends SelectActionViewItem<IDebugSession> {
diff --git a/src/vs/workbench/contrib/debug/browser/debugAdapterManager.ts b/src/vs/workbench/contrib/debug/browser/debugAdapterManager.ts
index 423316207be..20f77ec9f17 100644
--- a/src/vs/workbench/contrib/debug/browser/debugAdapterManager.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugAdapterManager.ts
@@ -3,34 +3,37 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { IJSONSchema, IJSONSchemaMap } from 'vs/base/common/jsonSchema';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import Severity from 'vs/base/common/severity';
-import * as strings from 'vs/base/common/strings';
-import { isCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IEditorModel } from 'vs/editor/common/editorCommon';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ITextModel } from 'vs/editor/common/model';
-import * as nls from 'vs/nls';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { Extensions as JSONExtensions, IJSONContributionRegistry } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { Breakpoints } from 'vs/workbench/contrib/debug/common/breakpoints';
-import { CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DEBUG_EXTENSION_AVAILABLE, IAdapterDescriptor, IAdapterManager, IConfig, IDebugAdapter, IDebugAdapterDescriptorFactory, IDebugAdapterFactory, IDebugConfiguration, IDebugSession, INTERNAL_CONSOLE_OPTIONS_SCHEMA } from 'vs/workbench/contrib/debug/common/debug';
-import { Debugger } from 'vs/workbench/contrib/debug/common/debugger';
-import { breakpointsExtPoint, debuggersExtPoint, launchSchema, presentationSchema } from 'vs/workbench/contrib/debug/common/debugSchemas';
-import { TaskDefinitionRegistry } from 'vs/workbench/contrib/tasks/common/taskDefinitionRegistry';
-import { launchSchemaId } from 'vs/workbench/services/configuration/common/configuration';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { ILifecycleService, LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { IJSONSchema, IJSONSchemaMap } from '../../../../base/common/jsonSchema.js';
+import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
+import Severity from '../../../../base/common/severity.js';
+import * as strings from '../../../../base/common/strings.js';
+import { isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { IEditorModel } from '../../../../editor/common/editorCommon.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import * as nls from '../../../../nls.js';
+import { IMenuService, MenuId, MenuItemAction } from '../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { Extensions as JSONExtensions, IJSONContributionRegistry } from '../../../../platform/jsonschemas/common/jsonContributionRegistry.js';
+import { IQuickInputService, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
+import { Breakpoints } from '../common/breakpoints.js';
+import { CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DEBUG_EXTENSION_AVAILABLE, IAdapterDescriptor, IAdapterManager, IConfig, IDebugAdapter, IDebugAdapterDescriptorFactory, IDebugAdapterFactory, IDebugConfiguration, IDebugSession, INTERNAL_CONSOLE_OPTIONS_SCHEMA } from '../common/debug.js';
+import { Debugger } from '../common/debugger.js';
+import { breakpointsExtPoint, debuggersExtPoint, launchSchema, presentationSchema } from '../common/debugSchemas.js';
+import { TaskDefinitionRegistry } from '../../tasks/common/taskDefinitionRegistry.js';
+import { ITaskService } from '../../tasks/common/taskService.js';
+import { launchSchemaId } from '../../../services/configuration/common/configuration.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { ILifecycleService, LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
 
 const jsonRegistry = Registry.as<IJSONContributionRegistry>(JSONExtensions.JSONContribution);
 
@@ -49,6 +52,7 @@ export class AdapterManager extends Disposable implements IAdapterManager {
 	private readonly _onDidDebuggersExtPointRead = new Emitter<void>();
 	private breakpointContributions: Breakpoints[] = [];
 	private debuggerWhenKeys = new Set<string>();
+	private taskLabels: string[] = [];
 
 	/** Extensions that were already active before any debugger activation events */
 	private earlyActivatedExtensions: Set<string> | undefined;
@@ -66,7 +70,9 @@ export class AdapterManager extends Disposable implements IAdapterManager {
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@ILanguageService private readonly languageService: ILanguageService,
 		@IDialogService private readonly dialogService: IDialogService,
-		@ILifecycleService private readonly lifecycleService: ILifecycleService
+		@ILifecycleService private readonly lifecycleService: ILifecycleService,
+		@ITaskService private readonly tasksService: ITaskService,
+		@IMenuService private readonly menuService: IMenuService,
 	) {
 		super();
 		this.adapterDescriptorFactories = [];
@@ -85,12 +91,22 @@ export class AdapterManager extends Disposable implements IAdapterManager {
 		this._register(this.onDidDebuggersExtPointRead(() => {
 			this.debugExtensionsAvailable.set(this.debuggers.length > 0);
 		}));
+
+		// generous debounce since this will end up calling `resolveTask` internally
+		const updateTaskScheduler = this._register(new RunOnceScheduler(() => this.updateTaskLabels(), 5000));
+
+		this._register(Event.any(tasksService.onDidChangeTaskConfig, tasksService.onDidChangeTaskProviders)(() => {
+			updateTaskScheduler.cancel();
+			updateTaskScheduler.schedule();
+		}));
 		this.lifecycleService.when(LifecyclePhase.Eventually)
 			.then(() => this.debugExtensionsAvailable.set(this.debuggers.length > 0)); // If no extensions with a debugger contribution are loaded
 
 		this._register(delegate.onDidNewSession(s => {
 			this.usedDebugTypes.add(s.configuration.type);
 		}));
+
+		updateTaskScheduler.schedule();
 	}
 
 	private registerListeners(): void {
@@ -137,7 +153,14 @@ export class AdapterManager extends Disposable implements IAdapterManager {
 		});
 	}
 
-	private updateDebugAdapterSchema(): void {
+	private updateTaskLabels() {
+		this.tasksService.getKnownTasks().then(tasks => {
+			this.taskLabels = tasks.map(task => task._label);
+			this.updateDebugAdapterSchema();
+		});
+	}
+
+	private updateDebugAdapterSchema() {
 		// update the schema to include all attributes, snippets and types from extensions.
 		const items = (<IJSONSchema>launchSchema.properties!['configurations'].items);
 		const taskSchema = TaskDefinitionRegistry.getJsonSchema();
@@ -160,7 +183,8 @@ export class AdapterManager extends Disposable implements IAdapterManager {
 						}],
 						default: '',
 						defaultSnippets: [{ body: { task: '', type: '' } }],
-						description: nls.localize('debugPrelaunchTask', "Task to run before debug session starts.")
+						description: nls.localize('debugPrelaunchTask', "Task to run before debug session starts."),
+						examples: this.taskLabels,
 					},
 					'postDebugTask': {
 						anyOf: [taskSchema, {
@@ -168,7 +192,8 @@ export class AdapterManager extends Disposable implements IAdapterManager {
 						}],
 						default: '',
 						defaultSnippets: [{ body: { task: '', type: '' } }],
-						description: nls.localize('debugPostDebugTask', "Task to run after debug session ends.")
+						description: nls.localize('debugPostDebugTask', "Task to run after debug session ends."),
+						examples: this.taskLabels,
 					},
 					'presentation': presentationSchema,
 					'internalConsoleOptions': INTERNAL_CONSOLE_OPTIONS_SCHEMA,
@@ -382,7 +407,7 @@ export class AdapterManager extends Disposable implements IAdapterManager {
 			}
 		});
 
-		const picks: { label: string; debugger?: Debugger; type?: string }[] = [];
+		const picks: ({ label: string; debugger?: Debugger; type?: string } | MenuItemAction)[] = [];
 		if (suggestedCandidates.length > 0) {
 			picks.push(
 				{ type: 'separator', label: nls.localize('suggestedDebuggers', "Suggested") },
@@ -401,11 +426,20 @@ export class AdapterManager extends Disposable implements IAdapterManager {
 			{ type: 'separator', label: '' },
 			{ label: languageLabel ? nls.localize('installLanguage', "Install an extension for {0}...", languageLabel) : nls.localize('installExt', "Install extension...") });
 
+		const contributed = this.menuService.getMenuActions(MenuId.DebugCreateConfiguration, this.contextKeyService);
+		for (const [, action] of contributed) {
+			for (const item of action) {
+				picks.push(item);
+			}
+		}
 		const placeHolder = nls.localize('selectDebug', "Select debugger");
-		return this.quickInputService.pick<{ label: string; debugger?: Debugger }>(picks, { activeItem: picks[0], placeHolder })
-			.then(picked => {
-				if (picked && picked.debugger) {
+		return this.quickInputService.pick<{ label: string; debugger?: Debugger } | IQuickPickItem>(picks, { activeItem: picks[0], placeHolder })
+			.then(async picked => {
+				if (picked && 'debugger' in picked && picked.debugger) {
 					return picked.debugger;
+				} else if (picked instanceof MenuItemAction) {
+					picked.run();
+					return;
 				}
 				if (picked) {
 					this.commandService.executeCommand('debug.installAdditionalDebuggers', languageLabel);
diff --git a/src/vs/workbench/contrib/debug/browser/debugColors.ts b/src/vs/workbench/contrib/debug/browser/debugColors.ts
index f7b758666b1..9b3556c236a 100644
--- a/src/vs/workbench/contrib/debug/browser/debugColors.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugColors.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { registerColor, foreground, editorInfoForeground, editorWarningForeground, errorForeground, badgeBackground, badgeForeground, listDeemphasizedForeground, contrastBorder, inputBorder, toolbarHoverBackground } from 'vs/platform/theme/common/colorRegistry';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { Color } from 'vs/base/common/color';
-import { localize } from 'vs/nls';
-import * as icons from 'vs/workbench/contrib/debug/browser/debugIcons';
-import { isHighContrast } from 'vs/platform/theme/common/theme';
+import { registerColor, foreground, editorInfoForeground, editorWarningForeground, errorForeground, badgeBackground, badgeForeground, listDeemphasizedForeground, contrastBorder, inputBorder, toolbarHoverBackground } from '../../../../platform/theme/common/colorRegistry.js';
+import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { Color } from '../../../../base/common/color.js';
+import { localize } from '../../../../nls.js';
+import * as icons from './debugIcons.js';
+import { isHighContrast } from '../../../../platform/theme/common/theme.js';
 
 export const debugToolBarBackground = registerColor('debugToolBar.background', {
 	dark: '#333333',
@@ -18,12 +18,7 @@ export const debugToolBarBackground = registerColor('debugToolBar.background', {
 	hcLight: '#FFFFFF'
 }, localize('debugToolBarBackground', "Debug toolbar background color."));
 
-export const debugToolBarBorder = registerColor('debugToolBar.border', {
-	dark: null,
-	light: null,
-	hcDark: null,
-	hcLight: null
-}, localize('debugToolBarBorder', "Debug toolbar border color."));
+export const debugToolBarBorder = registerColor('debugToolBar.border', null, localize('debugToolBarBorder', "Debug toolbar border color."));
 
 export const debugIconStartForeground = registerColor('debugIcon.startForeground', {
 	dark: '#89D185',
@@ -35,6 +30,7 @@ export const debugIconStartForeground = registerColor('debugIcon.startForeground
 export function registerColors() {
 
 	const debugTokenExpressionName = registerColor('debugTokenExpression.name', { dark: '#c586c0', light: '#9b46b0', hcDark: foreground, hcLight: foreground }, 'Foreground color for the token names shown in the debug views (ie. the Variables or Watch view).');
+	const debugTokenExpressionType = registerColor('debugTokenExpression.type', { dark: '#4A90E2', light: '#4A90E2', hcDark: foreground, hcLight: foreground }, 'Foreground color for the token types shown in the debug views (ie. the Variables or Watch view).');
 	const debugTokenExpressionValue = registerColor('debugTokenExpression.value', { dark: '#cccccc99', light: '#6c6c6ccc', hcDark: foreground, hcLight: foreground }, 'Foreground color for the token values shown in the debug views (ie. the Variables or Watch view).');
 	const debugTokenExpressionString = registerColor('debugTokenExpression.string', { dark: '#ce9178', light: '#a31515', hcDark: '#f48771', hcLight: '#a31515' }, 'Foreground color for strings in the debug views (ie. the Variables or Watch view).');
 	const debugTokenExpressionBoolean = registerColor('debugTokenExpression.boolean', { dark: '#4e94ce', light: '#0000ff', hcDark: '#75bdfe', hcLight: '#0000ff' }, 'Foreground color for booleans in the debug views (ie. the Variables or Watch view).');
@@ -43,15 +39,15 @@ export function registerColors() {
 
 	const debugViewExceptionLabelForeground = registerColor('debugView.exceptionLabelForeground', { dark: foreground, light: '#FFF', hcDark: foreground, hcLight: foreground }, 'Foreground color for a label shown in the CALL STACK view when the debugger breaks on an exception.');
 	const debugViewExceptionLabelBackground = registerColor('debugView.exceptionLabelBackground', { dark: '#6C2022', light: '#A31515', hcDark: '#6C2022', hcLight: '#A31515' }, 'Background color for a label shown in the CALL STACK view when the debugger breaks on an exception.');
-	const debugViewStateLabelForeground = registerColor('debugView.stateLabelForeground', { dark: foreground, light: foreground, hcDark: foreground, hcLight: foreground }, 'Foreground color for a label in the CALL STACK view showing the current session\'s or thread\'s state.');
-	const debugViewStateLabelBackground = registerColor('debugView.stateLabelBackground', { dark: '#88888844', light: '#88888844', hcDark: '#88888844', hcLight: '#88888844' }, 'Background color for a label in the CALL STACK view showing the current session\'s or thread\'s state.');
-	const debugViewValueChangedHighlight = registerColor('debugView.valueChangedHighlight', { dark: '#569CD6', light: '#569CD6', hcDark: '#569CD6', hcLight: '#569CD6' }, 'Color used to highlight value changes in the debug views (ie. in the Variables view).');
+	const debugViewStateLabelForeground = registerColor('debugView.stateLabelForeground', foreground, 'Foreground color for a label in the CALL STACK view showing the current session\'s or thread\'s state.');
+	const debugViewStateLabelBackground = registerColor('debugView.stateLabelBackground', '#88888844', 'Background color for a label in the CALL STACK view showing the current session\'s or thread\'s state.');
+	const debugViewValueChangedHighlight = registerColor('debugView.valueChangedHighlight', '#569CD6', 'Color used to highlight value changes in the debug views (ie. in the Variables view).');
 
 	const debugConsoleInfoForeground = registerColor('debugConsole.infoForeground', { dark: editorInfoForeground, light: editorInfoForeground, hcDark: foreground, hcLight: foreground }, 'Foreground color for info messages in debug REPL console.');
 	const debugConsoleWarningForeground = registerColor('debugConsole.warningForeground', { dark: editorWarningForeground, light: editorWarningForeground, hcDark: '#008000', hcLight: editorWarningForeground }, 'Foreground color for warning messages in debug REPL console.');
-	const debugConsoleErrorForeground = registerColor('debugConsole.errorForeground', { dark: errorForeground, light: errorForeground, hcDark: errorForeground, hcLight: errorForeground }, 'Foreground color for error messages in debug REPL console.');
-	const debugConsoleSourceForeground = registerColor('debugConsole.sourceForeground', { dark: foreground, light: foreground, hcDark: foreground, hcLight: foreground }, 'Foreground color for source filenames in debug REPL console.');
-	const debugConsoleInputIconForeground = registerColor('debugConsoleInputIcon.foreground', { dark: foreground, light: foreground, hcDark: foreground, hcLight: foreground }, 'Foreground color for debug console input marker icon.');
+	const debugConsoleErrorForeground = registerColor('debugConsole.errorForeground', errorForeground, 'Foreground color for error messages in debug REPL console.');
+	const debugConsoleSourceForeground = registerColor('debugConsole.sourceForeground', foreground, 'Foreground color for source filenames in debug REPL console.');
+	const debugConsoleInputIconForeground = registerColor('debugConsoleInputIcon.foreground', foreground, 'Foreground color for debug console input marker icon.');
 
 	const debugIconPauseForeground = registerColor('debugIcon.pauseForeground', {
 		dark: '#75BEFF',
@@ -210,6 +206,7 @@ export function registerColors() {
 		}
 
 		const tokenNameColor = theme.getColor(debugTokenExpressionName)!;
+		const tokenTypeColor = theme.getColor(debugTokenExpressionType)!;
 		const tokenValueColor = theme.getColor(debugTokenExpressionValue)!;
 		const tokenStringColor = theme.getColor(debugTokenExpressionString)!;
 		const tokenBooleanColor = theme.getColor(debugTokenExpressionBoolean)!;
@@ -221,6 +218,10 @@ export function registerColors() {
 				color: ${tokenNameColor};
 			}
 
+			.monaco-workbench .monaco-list-row .expression .type {
+				color: ${tokenTypeColor};
+			}
+
 			.monaco-workbench .monaco-list-row .expression .value,
 			.monaco-workbench .debug-hover-widget .value {
 				color: ${tokenValueColor};
diff --git a/src/vs/workbench/contrib/debug/browser/debugCommands.ts b/src/vs/workbench/contrib/debug/browser/debugCommands.ts
index 7db66075458..096a909b74a 100644
--- a/src/vs/workbench/contrib/debug/browser/debugCommands.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugCommands.ts
@@ -3,39 +3,41 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { List } from 'vs/base/browser/ui/list/listWidget';
-import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { IListService } from 'vs/platform/list/browser/listService';
-import { IDebugService, IEnablement, CONTEXT_BREAKPOINTS_FOCUSED, CONTEXT_WATCH_EXPRESSIONS_FOCUSED, CONTEXT_VARIABLES_FOCUSED, EDITOR_CONTRIBUTION_ID, IDebugEditorContribution, CONTEXT_IN_DEBUG_MODE, CONTEXT_EXPRESSION_SELECTED, IConfig, IStackFrame, IThread, IDebugSession, CONTEXT_DEBUG_STATE, IDebugConfiguration, CONTEXT_JUMP_TO_CURSOR_SUPPORTED, REPL_VIEW_ID, CONTEXT_DEBUGGERS_AVAILABLE, State, getStateLabel, CONTEXT_BREAKPOINT_INPUT_FOCUSED, CONTEXT_FOCUSED_SESSION_IS_ATTACH, VIEWLET_ID, CONTEXT_DISASSEMBLY_VIEW_FOCUS, CONTEXT_IN_DEBUG_REPL, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, isFrameDeemphasized } from 'vs/workbench/contrib/debug/common/debug';
-import { Expression, Variable, Breakpoint, FunctionBreakpoint, DataBreakpoint, Thread } from 'vs/workbench/contrib/debug/common/debugModel';
-import { IExtensionsViewPaneContainer, VIEWLET_ID as EXTENSIONS_VIEWLET_ID } from 'vs/workbench/contrib/extensions/common/extensions';
-import { ICodeEditor, isCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { MenuRegistry, MenuId, Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { openBreakpointSource } from 'vs/workbench/contrib/debug/browser/breakpointsView';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { InputFocusedContext } from 'vs/platform/contextkey/common/contextkeys';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { ActiveEditorContext, PanelFocusContext, ResourceContextKey } from 'vs/workbench/common/contextkeys';
-import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
-import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfiguration';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { ViewContainerLocation } from 'vs/workbench/common/views';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { deepClone } from 'vs/base/common/objects';
-import { isWeb, isWindows } from 'vs/base/common/platform';
-import { saveAllBeforeDebugStart } from 'vs/workbench/contrib/debug/common/debugUtils';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { showLoadedScriptMenu } from 'vs/workbench/contrib/debug/common/loadedScriptsPicker';
-import { showDebugSessionMenu } from 'vs/workbench/contrib/debug/browser/debugSessionPicker';
-import { TEXT_FILE_EDITOR_ID } from 'vs/workbench/contrib/files/common/files';
-import { ILocalizedString } from 'vs/platform/action/common/action';
+import * as nls from '../../../../nls.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { List } from '../../../../base/browser/ui/list/listWidget.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IListService } from '../../../../platform/list/browser/listService.js';
+import { IDebugService, IEnablement, CONTEXT_BREAKPOINTS_FOCUSED, CONTEXT_WATCH_EXPRESSIONS_FOCUSED, CONTEXT_VARIABLES_FOCUSED, EDITOR_CONTRIBUTION_ID, IDebugEditorContribution, CONTEXT_IN_DEBUG_MODE, CONTEXT_EXPRESSION_SELECTED, IConfig, IStackFrame, IThread, IDebugSession, CONTEXT_DEBUG_STATE, IDebugConfiguration, CONTEXT_JUMP_TO_CURSOR_SUPPORTED, REPL_VIEW_ID, CONTEXT_DEBUGGERS_AVAILABLE, State, getStateLabel, CONTEXT_BREAKPOINT_INPUT_FOCUSED, CONTEXT_FOCUSED_SESSION_IS_ATTACH, VIEWLET_ID, CONTEXT_DISASSEMBLY_VIEW_FOCUS, CONTEXT_IN_DEBUG_REPL, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, isFrameDeemphasized } from '../common/debug.js';
+import { Expression, Variable, Breakpoint, FunctionBreakpoint, DataBreakpoint, Thread } from '../common/debugModel.js';
+import { IExtensionsWorkbenchService } from '../../extensions/common/extensions.js';
+import { ICodeEditor, isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { MenuRegistry, MenuId, Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
+import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { openBreakpointSource } from './breakpointsView.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { InputFocusedContext } from '../../../../platform/contextkey/common/contextkeys.js';
+import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
+import { ActiveEditorContext, PanelFocusContext, ResourceContextKey } from '../../../common/contextkeys.js';
+import { CommandsRegistry, ICommandService } from '../../../../platform/commands/common/commands.js';
+import { ITextResourcePropertiesService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IQuickInputService, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
+import { ViewContainerLocation } from '../../../common/views.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { deepClone } from '../../../../base/common/objects.js';
+import { isWeb, isWindows } from '../../../../base/common/platform.js';
+import { saveAllBeforeDebugStart } from '../common/debugUtils.js';
+import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.js';
+import { showLoadedScriptMenu } from '../common/loadedScriptsPicker.js';
+import { showDebugSessionMenu } from './debugSessionPicker.js';
+import { TEXT_FILE_EDITOR_ID } from '../../files/common/files.js';
+import { ILocalizedString } from '../../../../platform/action/common/action.js';
+import { CONTEXT_IN_CHAT_SESSION } from '../../chat/common/chatContextKeys.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
 
 export const ADD_CONFIGURATION_ID = 'debug.addConfiguration';
 export const TOGGLE_INLINE_BREAKPOINT_ID = 'editor.debug.action.toggleInlineBreakpoint';
@@ -568,11 +570,12 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 			target: DebugProtocol.StepInTarget;
 		}
 
-		const qp = quickInputService.createQuickPick<ITargetItem>();
+		const disposables = new DisposableStore();
+		const qp = disposables.add(quickInputService.createQuickPick<ITargetItem>());
 		qp.busy = true;
 		qp.show();
 
-		qp.onDidChangeActive(([item]) => {
+		disposables.add(qp.onDidChangeActive(([item]) => {
 			if (codeEditor && item && item.target.line !== undefined) {
 				codeEditor.revealLineInCenterIfOutsideViewport(item.target.line);
 				codeEditor.setSelection({
@@ -582,15 +585,15 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 					endColumn: item.target.endColumn || item.target.column || 1,
 				});
 			}
-		});
+		}));
 
-		qp.onDidAccept(() => {
+		disposables.add(qp.onDidAccept(() => {
 			if (qp.activeItems.length) {
 				session.stepIn(frame.thread.threadId, qp.activeItems[0].target.id);
 			}
-		});
+		}));
 
-		qp.onDidHide(() => qp.dispose());
+		disposables.add(qp.onDidHide(() => disposables.dispose()));
 
 		session.stepInTargets(frame.frameId).then(targets => {
 			qp.busy = false;
@@ -934,14 +937,12 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	when: undefined,
 	primary: undefined,
 	handler: async (accessor, query: string) => {
-		const paneCompositeService = accessor.get(IPaneCompositePartService);
-		const viewlet = (await paneCompositeService.openPaneComposite(EXTENSIONS_VIEWLET_ID, ViewContainerLocation.Sidebar, true))?.getViewPaneContainer() as IExtensionsViewPaneContainer;
+		const extensionsWorkbenchService = accessor.get(IExtensionsWorkbenchService);
 		let searchFor = `@category:debuggers`;
 		if (typeof query === 'string') {
 			searchFor += ` ${query}`;
 		}
-		viewlet.search(searchFor);
-		viewlet.focus();
+		return extensionsWorkbenchService.openSearch(searchFor);
 	}
 });
 
@@ -1009,7 +1010,11 @@ MenuRegistry.appendMenuItem(MenuId.EditorContext, {
 		title: nls.localize('addInlineBreakpoint', "Add Inline Breakpoint"),
 		category: DEBUG_COMMAND_CATEGORY
 	},
-	when: ContextKeyExpr.and(CONTEXT_IN_DEBUG_MODE, PanelFocusContext.toNegated(), EditorContextKeys.editorTextFocus),
+	when: ContextKeyExpr.and(
+		CONTEXT_IN_DEBUG_MODE,
+		PanelFocusContext.toNegated(),
+		EditorContextKeys.editorTextFocus,
+		CONTEXT_IN_CHAT_SESSION.toNegated()),
 	group: 'debug',
 	order: 1
 });
diff --git a/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts b/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts
index 7151a0ffa5d..84fd17595e0 100644
--- a/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts
@@ -3,39 +3,40 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { distinct } from 'vs/base/common/arrays';
-import { sequence } from 'vs/base/common/async';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Emitter, Event } from 'vs/base/common/event';
-import * as json from 'vs/base/common/json';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import { DisposableStore, IDisposable, dispose } from 'vs/base/common/lifecycle';
-import * as objects from 'vs/base/common/objects';
-import * as resources from 'vs/base/common/resources';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { URI as uri } from 'vs/base/common/uri';
-import * as nls from 'vs/nls';
-import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IJSONContributionRegistry, Extensions as JSONExtensions } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IWorkspaceContextService, IWorkspaceFolder, IWorkspaceFoldersChangeEvent, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { IEditorPane } from 'vs/workbench/common/editor';
-import { debugConfigure } from 'vs/workbench/contrib/debug/browser/debugIcons';
-import { CONTEXT_DEBUG_CONFIGURATION_TYPE, DebugConfigurationProviderTriggerKind, IAdapterManager, ICompound, IConfig, IConfigPresentation, IConfigurationManager, IDebugConfigurationProvider, IGlobalConfig, ILaunch } from 'vs/workbench/contrib/debug/common/debug';
-import { launchSchema } from 'vs/workbench/contrib/debug/common/debugSchemas';
-import { getVisibleAndSorted } from 'vs/workbench/contrib/debug/common/debugUtils';
-import { launchSchemaId } from 'vs/workbench/services/configuration/common/configuration';
-import { ACTIVE_GROUP, IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IHistoryService } from 'vs/workbench/services/history/common/history';
-import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
+import { distinct } from '../../../../base/common/arrays.js';
+import { sequence } from '../../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import * as json from '../../../../base/common/json.js';
+import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
+import { DisposableStore, IDisposable, dispose } from '../../../../base/common/lifecycle.js';
+import * as objects from '../../../../base/common/objects.js';
+import * as resources from '../../../../base/common/resources.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { URI as uri } from '../../../../base/common/uri.js';
+import * as nls from '../../../../nls.js';
+import { ConfigurationTarget, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IJSONContributionRegistry, Extensions as JSONExtensions } from '../../../../platform/jsonschemas/common/jsonContributionRegistry.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IWorkspaceContextService, IWorkspaceFolder, IWorkspaceFoldersChangeEvent, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { IEditorPane } from '../../../common/editor.js';
+import { debugConfigure } from './debugIcons.js';
+import { CONTEXT_DEBUG_CONFIGURATION_TYPE, DebugConfigurationProviderTriggerKind, IAdapterManager, ICompound, IConfig, IConfigPresentation, IConfigurationManager, IDebugConfigurationProvider, IGlobalConfig, ILaunch } from '../common/debug.js';
+import { launchSchema } from '../common/debugSchemas.js';
+import { getVisibleAndSorted } from '../common/debugUtils.js';
+import { launchSchemaId } from '../../../services/configuration/common/configuration.js';
+import { ACTIVE_GROUP, IEditorService } from '../../../services/editor/common/editorService.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IHistoryService } from '../../../services/history/common/history.js';
+import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
+import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
 
 const jsonRegistry = Registry.as<IJSONContributionRegistry>(JSONExtensions.JSONContribution);
 jsonRegistry.registerSchema(launchSchemaId, launchSchema);
@@ -72,7 +73,8 @@ export class ConfigurationManager implements IConfigurationManager {
 		@IExtensionService private readonly extensionService: IExtensionService,
 		@IHistoryService private readonly historyService: IHistoryService,
 		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
-		@IContextKeyService contextKeyService: IContextKeyService
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@ILogService private readonly logService: ILogService,
 	) {
 		this.configProviders = [];
 		this.toDispose = [this._onDidChangeConfigurationProviders];
@@ -257,7 +259,18 @@ export class ConfigurationManager implements IConfigurationManager {
 						disposables.add(input.onDidHide(() => resolve(undefined)));
 					});
 
-					const nestedPicks = await Promise.all(picks);
+					let nestedPicks: IDynamicPickItem[][];
+					try {
+						// This await invokes the extension providers, which might fail due to several reasons,
+						// therefore we gate this logic under a try/catch to prevent leaving the Debug Tab
+						// selector in a borked state.
+						nestedPicks = await Promise.all(picks);
+					} catch (err) {
+						this.logService.error(err);
+						disposables.dispose();
+						return;
+					}
+
 					const items = nestedPicks.flat();
 
 					input.items = items;
diff --git a/src/vs/workbench/contrib/debug/browser/debugConsoleQuickAccess.ts b/src/vs/workbench/contrib/debug/browser/debugConsoleQuickAccess.ts
index 68936e1018f..07bbe095738 100644
--- a/src/vs/workbench/contrib/debug/browser/debugConsoleQuickAccess.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugConsoleQuickAccess.ts
@@ -2,16 +2,16 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { matchesFuzzy } from 'vs/base/common/filters';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { localize } from 'vs/nls';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { FastAndSlowPicks, IPickerQuickAccessItem, PickerQuickAccessProvider, Picks } from 'vs/platform/quickinput/browser/pickerQuickAccess';
-import { IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { DEBUG_CONSOLE_QUICK_ACCESS_PREFIX, SELECT_AND_START_ID } from 'vs/workbench/contrib/debug/browser/debugCommands';
-import { IDebugService, IDebugSession, REPL_VIEW_ID } from 'vs/workbench/contrib/debug/common/debug';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { matchesFuzzy } from '../../../../base/common/filters.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { localize } from '../../../../nls.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { FastAndSlowPicks, IPickerQuickAccessItem, PickerQuickAccessProvider, Picks } from '../../../../platform/quickinput/browser/pickerQuickAccess.js';
+import { IQuickPickSeparator } from '../../../../platform/quickinput/common/quickInput.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { DEBUG_CONSOLE_QUICK_ACCESS_PREFIX, SELECT_AND_START_ID } from './debugCommands.js';
+import { IDebugService, IDebugSession, REPL_VIEW_ID } from '../common/debug.js';
 
 export class DebugConsoleQuickAccess extends PickerQuickAccessProvider<IPickerQuickAccessItem> {
 
diff --git a/src/vs/workbench/contrib/debug/browser/debugEditorActions.ts b/src/vs/workbench/contrib/debug/browser/debugEditorActions.ts
index 7810995bb38..4072cf0b64a 100644
--- a/src/vs/workbench/contrib/debug/browser/debugEditorActions.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugEditorActions.ts
@@ -3,33 +3,35 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getDomNodePagePosition } from 'vs/base/browser/dom';
-import { Action } from 'vs/base/common/actions';
-import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, IActionOptions, registerEditorAction } from 'vs/editor/browser/editorExtensions';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { Position } from 'vs/editor/common/core/position';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { MessageController } from 'vs/editor/contrib/message/browser/messageController';
-import * as nls from 'vs/nls';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { PanelFocusContext } from 'vs/workbench/common/contextkeys';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { openBreakpointSource } from 'vs/workbench/contrib/debug/browser/breakpointsView';
-import { DisassemblyView } from 'vs/workbench/contrib/debug/browser/disassemblyView';
-import { BREAKPOINT_EDITOR_CONTRIBUTION_ID, BreakpointWidgetContext, CONTEXT_CALLSTACK_ITEM_TYPE, CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DEBUG_STATE, CONTEXT_DISASSEMBLE_REQUEST_SUPPORTED, CONTEXT_DISASSEMBLY_VIEW_FOCUS, CONTEXT_EXCEPTION_WIDGET_VISIBLE, CONTEXT_FOCUSED_STACK_FRAME_HAS_INSTRUCTION_POINTER_REFERENCE, CONTEXT_IN_DEBUG_MODE, CONTEXT_LANGUAGE_SUPPORTS_DISASSEMBLE_REQUEST, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, EDITOR_CONTRIBUTION_ID, IBreakpointEditorContribution, IDebugConfiguration, IDebugEditorContribution, IDebugService, REPL_VIEW_ID, WATCH_VIEW_ID } from 'vs/workbench/contrib/debug/common/debug';
-import { getEvaluatableExpressionAtPosition } from 'vs/workbench/contrib/debug/common/debugUtils';
-import { DisassemblyViewInput } from 'vs/workbench/contrib/debug/common/disassemblyViewInput';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ILocalizedString } from 'vs/platform/action/common/action';
+import { getDomNodePagePosition } from '../../../../base/browser/dom.js';
+import { Action } from '../../../../base/common/actions.js';
+import { KeyChord, KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { EditorAction, IActionOptions, registerEditorAction } from '../../../../editor/browser/editorExtensions.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
+import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
+import { MessageController } from '../../../../editor/contrib/message/browser/messageController.js';
+import * as nls from '../../../../nls.js';
+import { ILocalizedString } from '../../../../platform/action/common/action.js';
+import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { PanelFocusContext } from '../../../common/contextkeys.js';
+import { CONTEXT_IN_CHAT_SESSION } from '../../chat/common/chatContextKeys.js';
+import { openBreakpointSource } from './breakpointsView.js';
+import { DisassemblyView } from './disassemblyView.js';
+import { Repl } from './repl.js';
+import { BREAKPOINT_EDITOR_CONTRIBUTION_ID, BreakpointWidgetContext, CONTEXT_CALLSTACK_ITEM_TYPE, CONTEXT_DEBUG_STATE, CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DISASSEMBLE_REQUEST_SUPPORTED, CONTEXT_DISASSEMBLY_VIEW_FOCUS, CONTEXT_EXCEPTION_WIDGET_VISIBLE, CONTEXT_FOCUSED_STACK_FRAME_HAS_INSTRUCTION_POINTER_REFERENCE, CONTEXT_IN_DEBUG_MODE, CONTEXT_LANGUAGE_SUPPORTS_DISASSEMBLE_REQUEST, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, EDITOR_CONTRIBUTION_ID, IBreakpointEditorContribution, IDebugConfiguration, IDebugEditorContribution, IDebugService, REPL_VIEW_ID, WATCH_VIEW_ID } from '../common/debug.js';
+import { getEvaluatableExpressionAtPosition } from '../common/debugUtils.js';
+import { DisassemblyViewInput } from '../common/disassemblyViewInput.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
 
 class ToggleBreakpointAction extends Action2 {
 	constructor() {
@@ -39,6 +41,7 @@ class ToggleBreakpointAction extends Action2 {
 				...nls.localize2('toggleBreakpointAction', "Debug: Toggle Breakpoint"),
 				mnemonicTitle: nls.localize({ key: 'miToggleBreakpoint', comment: ['&& denotes a mnemonic'] }, "Toggle &&Breakpoint"),
 			},
+			f1: true,
 			precondition: CONTEXT_DEBUGGERS_AVAILABLE,
 			keybinding: {
 				when: ContextKeyExpr.or(EditorContextKeys.editorTextFocus, CONTEXT_DISASSEMBLY_VIEW_FOCUS),
@@ -302,7 +305,12 @@ export class RunToCursorAction extends EditorAction {
 			id: RunToCursorAction.ID,
 			label: RunToCursorAction.LABEL.value,
 			alias: 'Debug: Run to Cursor',
-			precondition: ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, PanelFocusContext.toNegated(), ContextKeyExpr.or(EditorContextKeys.editorTextFocus, CONTEXT_DISASSEMBLY_VIEW_FOCUS)),
+			precondition: ContextKeyExpr.and(
+				CONTEXT_DEBUGGERS_AVAILABLE,
+				PanelFocusContext.toNegated(),
+				ContextKeyExpr.or(EditorContextKeys.editorTextFocus, CONTEXT_DISASSEMBLY_VIEW_FOCUS),
+				CONTEXT_IN_CHAT_SESSION.negate()
+			),
 			contextMenuOpts: {
 				group: 'debug',
 				order: 2,
@@ -343,7 +351,10 @@ export class SelectionToReplAction extends EditorAction {
 			id: SelectionToReplAction.ID,
 			label: SelectionToReplAction.LABEL.value,
 			alias: 'Debug: Evaluate in Console',
-			precondition: ContextKeyExpr.and(CONTEXT_IN_DEBUG_MODE, EditorContextKeys.editorTextFocus),
+			precondition: ContextKeyExpr.and(
+				CONTEXT_IN_DEBUG_MODE,
+				EditorContextKeys.editorTextFocus,
+				CONTEXT_IN_CHAT_SESSION.negate()),
 			contextMenuOpts: {
 				group: 'debug',
 				order: 0
@@ -368,8 +379,8 @@ export class SelectionToReplAction extends EditorAction {
 			text = editor.getModel().getValueInRange(selection);
 		}
 
-		await session.addReplExpression(viewModel.focusedStackFrame, text);
-		await viewsService.openView(REPL_VIEW_ID, false);
+		const replView = await viewsService.openView(REPL_VIEW_ID, false) as Repl | undefined;
+		replView?.sendReplInput(text);
 	}
 }
 
@@ -383,7 +394,10 @@ export class SelectionToWatchExpressionsAction extends EditorAction {
 			id: SelectionToWatchExpressionsAction.ID,
 			label: SelectionToWatchExpressionsAction.LABEL.value,
 			alias: 'Debug: Add to Watch',
-			precondition: ContextKeyExpr.and(CONTEXT_IN_DEBUG_MODE, EditorContextKeys.editorTextFocus),
+			precondition: ContextKeyExpr.and(
+				CONTEXT_IN_DEBUG_MODE,
+				EditorContextKeys.editorTextFocus,
+				CONTEXT_IN_CHAT_SESSION.negate()),
 			contextMenuOpts: {
 				group: 'debug',
 				order: 1
diff --git a/src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts b/src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts
index 1612646a1e9..68fd6479890 100644
--- a/src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts
@@ -3,56 +3,55 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { addDisposableListener, isKeyboardEvent } from 'vs/base/browser/dom';
-import { DomEmitter } from 'vs/base/browser/event';
-import { IKeyboardEvent, StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { IMouseEvent } from 'vs/base/browser/mouseEvent';
-import { distinct } from 'vs/base/common/arrays';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { memoize } from 'vs/base/common/decorators';
-import { illegalArgument, onUnexpectedExternalError } from 'vs/base/common/errors';
-import { Event } from 'vs/base/common/event';
-import { visit } from 'vs/base/common/json';
-import { setProperty } from 'vs/base/common/jsonEdit';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { DisposableStore, IDisposable, MutableDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
-import { clamp } from 'vs/base/common/numbers';
-import { basename } from 'vs/base/common/path';
-import * as env from 'vs/base/common/platform';
-import * as strings from 'vs/base/common/strings';
-import { assertType, isDefined } from 'vs/base/common/types';
-import { Constants } from 'vs/base/common/uint';
-import { URI } from 'vs/base/common/uri';
-import { CoreEditingCommands } from 'vs/editor/browser/coreCommands';
-import { ICodeEditor, IEditorMouseEvent, IPartialEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
-import { EditorOption, IEditorHoverOptions } from 'vs/editor/common/config/editorOptions';
-import { EditOperation } from 'vs/editor/common/core/editOperation';
-import { Position } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { DEFAULT_WORD_REGEXP } from 'vs/editor/common/core/wordHelper';
-import { ScrollType } from 'vs/editor/common/editorCommon';
-import { StandardTokenType } from 'vs/editor/common/encodedTokenAttributes';
-import { InlineValue, InlineValueContext } from 'vs/editor/common/languages';
-import { IModelDeltaDecoration, ITextModel, InjectedTextCursorStops } from 'vs/editor/common/model';
-import { IFeatureDebounceInformation, ILanguageFeatureDebounceService } from 'vs/editor/common/services/languageFeatureDebounce';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { IModelService } from 'vs/editor/common/services/model';
-import { HoverController } from 'vs/editor/contrib/hover/browser/hoverController';
-import { HoverStartMode, HoverStartSource } from 'vs/editor/contrib/hover/browser/hoverOperation';
-import * as nls from 'vs/nls';
-import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { registerColor } from 'vs/platform/theme/common/colorRegistry';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { FloatingEditorClickWidget } from 'vs/workbench/browser/codeeditor';
-import { DebugHoverWidget, ShowDebugHoverResult } from 'vs/workbench/contrib/debug/browser/debugHover';
-import { ExceptionWidget } from 'vs/workbench/contrib/debug/browser/exceptionWidget';
-import { CONTEXT_EXCEPTION_WIDGET_VISIBLE, IDebugConfiguration, IDebugEditorContribution, IDebugService, IDebugSession, IExceptionInfo, IExpression, IStackFrame, State } from 'vs/workbench/contrib/debug/common/debug';
-import { Expression } from 'vs/workbench/contrib/debug/common/debugModel';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
+import { addDisposableListener, isKeyboardEvent } from '../../../../base/browser/dom.js';
+import { DomEmitter } from '../../../../base/browser/event.js';
+import { IKeyboardEvent, StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { IMouseEvent } from '../../../../base/browser/mouseEvent.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { memoize } from '../../../../base/common/decorators.js';
+import { illegalArgument, onUnexpectedExternalError } from '../../../../base/common/errors.js';
+import { Event } from '../../../../base/common/event.js';
+import { visit } from '../../../../base/common/json.js';
+import { setProperty } from '../../../../base/common/jsonEdit.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { DisposableStore, IDisposable, MutableDisposable, dispose, toDisposable } from '../../../../base/common/lifecycle.js';
+import { clamp } from '../../../../base/common/numbers.js';
+import { basename } from '../../../../base/common/path.js';
+import * as env from '../../../../base/common/platform.js';
+import * as strings from '../../../../base/common/strings.js';
+import { assertType, isDefined } from '../../../../base/common/types.js';
+import { Constants } from '../../../../base/common/uint.js';
+import { URI } from '../../../../base/common/uri.js';
+import { CoreEditingCommands } from '../../../../editor/browser/coreCommands.js';
+import { ICodeEditor, IEditorMouseEvent, IPartialEditorMouseEvent, MouseTargetType } from '../../../../editor/browser/editorBrowser.js';
+import { EditorOption, IEditorHoverOptions } from '../../../../editor/common/config/editorOptions.js';
+import { EditOperation } from '../../../../editor/common/core/editOperation.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { IRange, Range } from '../../../../editor/common/core/range.js';
+import { DEFAULT_WORD_REGEXP } from '../../../../editor/common/core/wordHelper.js';
+import { ScrollType } from '../../../../editor/common/editorCommon.js';
+import { StandardTokenType } from '../../../../editor/common/encodedTokenAttributes.js';
+import { InlineValue, InlineValueContext } from '../../../../editor/common/languages.js';
+import { IModelDeltaDecoration, ITextModel, InjectedTextCursorStops } from '../../../../editor/common/model.js';
+import { IFeatureDebounceInformation, ILanguageFeatureDebounceService } from '../../../../editor/common/services/languageFeatureDebounce.js';
+import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ContentHoverController } from '../../../../editor/contrib/hover/browser/contentHoverController.js';
+import { HoverStartMode, HoverStartSource } from '../../../../editor/contrib/hover/browser/hoverOperation.js';
+import * as nls from '../../../../nls.js';
+import { CommandsRegistry, ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { registerColor } from '../../../../platform/theme/common/colorRegistry.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { FloatingEditorClickWidget } from '../../../browser/codeeditor.js';
+import { DebugHoverWidget, ShowDebugHoverResult } from './debugHover.js';
+import { ExceptionWidget } from './exceptionWidget.js';
+import { CONTEXT_EXCEPTION_WIDGET_VISIBLE, IDebugConfiguration, IDebugEditorContribution, IDebugService, IDebugSession, IExceptionInfo, IExpression, IStackFrame, State } from '../common/debug.js';
+import { Expression } from '../common/debugModel.js';
+import { IHostService } from '../../../services/host/browser/host.js';
 
 const MAX_NUM_INLINE_VALUES = 100; // JS Global scope can have 700+ entries. We want to limit ourselves for perf reasons
 const MAX_INLINE_DECORATOR_LENGTH = 150; // Max string length of each inline decorator when debugging. If exceeded ... is added
@@ -67,12 +66,7 @@ export const debugInlineForeground = registerColor('editor.inlineValuesForegroun
 	hcLight: '#00000080'
 }, nls.localize('editor.inlineValuesForeground', "Color for the debug inline value text."));
 
-export const debugInlineBackground = registerColor('editor.inlineValuesBackground', {
-	dark: '#ffc80033',
-	light: '#ffc80033',
-	hcDark: '#ffc80033',
-	hcLight: '#ffc80033'
-}, nls.localize('editor.inlineValuesBackground', "Color for the debug inline value background."));
+export const debugInlineBackground = registerColor('editor.inlineValuesBackground', '#ffc80033', nls.localize('editor.inlineValuesBackground', "Color for the debug inline value background."));
 
 class InlineSegment {
 	constructor(public column: number, public text: string) {
@@ -127,7 +121,7 @@ function replaceWsWithNoBreakWs(str: string): string {
 	return str.replace(/[ \t]/g, strings.noBreakWhitespace);
 }
 
-function createInlineValueDecorationsInsideRange(expressions: ReadonlyArray<IExpression>, ranges: Range[], model: ITextModel, wordToLineNumbersMap: Map<string, number[]>): IModelDeltaDecoration[] {
+function createInlineValueDecorationsInsideRange(expressions: ReadonlyArray<IExpression>, ranges: Range[], model: ITextModel, wordToLineNumbersMap: Map<string, number[]>) {
 	const nameValueMap = new Map<string, string>();
 	for (const expr of expressions) {
 		nameValueMap.set(expr.name, expr.value);
@@ -157,17 +151,14 @@ function createInlineValueDecorationsInsideRange(expressions: ReadonlyArray<IExp
 		}
 	});
 
-	const decorations: IModelDeltaDecoration[] = [];
 	// Compute decorators for each line
-	lineToNamesMap.forEach((names, line) => {
-		const contentText = names.sort((first, second) => {
+	return [...lineToNamesMap].map(([line, names]) => ({
+		line,
+		variables: names.sort((first, second) => {
 			const content = model.getLineContent(line);
 			return content.indexOf(first) - content.indexOf(second);
-		}).map(name => `${name} = ${nameValueMap.get(name)}`).join(', ');
-		decorations.push(...createInlineValueDecoration(line, contentText));
-	});
-
-	return decorations;
+		}).map(name => ({ name, value: nameValueMap.get(name)! }))
+	}));
 }
 
 function getWordToLineNumbersMap(model: ITextModel, lineNumber: number, result: Map<string, number[]>) {
@@ -384,7 +375,7 @@ export class DebugEditorContribution implements IDebugEditorContribution {
 			return;
 		}
 
-		const hoverController = this.editor.getContribution<HoverController>(HoverController.ID);
+		const hoverController = this.editor.getContribution<ContentHoverController>(ContentHoverController.ID);
 		hoverController?.hideContentHover();
 
 		this.editor.updateOptions({ hover: { enabled: false } });
@@ -398,7 +389,7 @@ export class DebugEditorContribution implements IDebugEditorContribution {
 	}
 
 	private showEditorHover(position: Position, focus: boolean) {
-		const hoverController = this.editor.getContribution<HoverController>(HoverController.ID);
+		const hoverController = this.editor.getContribution<ContentHoverController>(ContentHoverController.ID);
 		const range = new Range(position.lineNumber, position.column, position.lineNumber, position.column);
 		// enable the editor hover, otherwise the content controller will see it
 		// as disabled and hide it on the first mouse move (#193149)
@@ -573,7 +564,7 @@ export class DebugEditorContribution implements IDebugEditorContribution {
 		}
 	}
 
-	async addLaunchConfiguration(): Promise<any> {
+	async addLaunchConfiguration(): Promise<void> {
 		const model = this.editor.getModel();
 		if (!model) {
 			return;
@@ -783,10 +774,15 @@ export class DebugEditorContribution implements IDebugEditorContribution {
 			// old "one-size-fits-all" strategy
 
 			const scopes = await stackFrame.getMostSpecificScopes(stackFrame.range);
-			// Get all top level variables in the scope chain
-			const decorationsPerScope = await Promise.all(scopes.map(async scope => {
-				const variables = await scope.getChildren();
+			const scopesWithVariables = await Promise.all(scopes.map(async scope =>
+				({ scope, variables: await scope.getChildren() })));
 
+			// Map of inline values per line that's populated in scope order, from
+			// narrowest to widest. This is done to avoid duplicating values if
+			// they appear in multiple scopes or are shadowed (#129770, #217326)
+			const valuesPerLine = new Map</* line */number, Map</* var */string, /* value */ string>>();
+
+			for (const { scope, variables } of scopesWithVariables) {
 				let scopeRange = new Range(0, 0, stackFrame.range.startLineNumber, stackFrame.range.startColumn);
 				if (scope.range) {
 					scopeRange = scopeRange.setStartPosition(scope.range.startLineNumber, scope.range.startColumn);
@@ -798,12 +794,25 @@ export class DebugEditorContribution implements IDebugEditorContribution {
 					this._wordToLineNumbersMap.ensureRangePopulated(range);
 				}
 
-				return createInlineValueDecorationsInsideRange(variables, ownRanges, model, this._wordToLineNumbersMap.value);
-			}));
+				const mapped = createInlineValueDecorationsInsideRange(variables, ownRanges, model, this._wordToLineNumbersMap.value);
+				for (const { line, variables } of mapped) {
+					let values = valuesPerLine.get(line);
+					if (!values) {
+						values = new Map<string, string>();
+						valuesPerLine.set(line, values);
+					}
 
-			allDecorations = distinct(decorationsPerScope.flat(),
-				// Deduplicate decorations since same variable can appear in multiple scopes, leading to duplicated decorations #129770
-				decoration => `${decoration.range.startLineNumber}:${decoration?.options.after?.content}`);
+					for (const { name, value } of variables) {
+						if (!values.has(name)) {
+							values.set(name, value);
+						}
+					}
+				}
+			}
+
+			allDecorations = [...valuesPerLine.entries()].flatMap(([line, values]) =>
+				createInlineValueDecoration(line, [...values].map(([n, v]) => `${n} = ${v}`).join(', '))
+			);
 		}
 
 		if (cts.token.isCancellationRequested) {
diff --git a/src/vs/workbench/contrib/debug/browser/debugExpressionRenderer.ts b/src/vs/workbench/contrib/debug/browser/debugExpressionRenderer.ts
new file mode 100644
index 00000000000..324a0669579
--- /dev/null
+++ b/src/vs/workbench/contrib/debug/browser/debugExpressionRenderer.ts
@@ -0,0 +1,217 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from '../../../../base/browser/dom.js';
+import { IHighlight } from '../../../../base/browser/ui/highlightedlabel/highlightedLabel.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import { IObservable } from '../../../../base/common/observable.js';
+import { CommandsRegistry, ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { observableConfigValue } from '../../../../platform/observable/common/platformObservableUtils.js';
+import { IDebugSession, IExpressionValue } from '../common/debug.js';
+import { Expression, ExpressionContainer, Variable } from '../common/debugModel.js';
+import { ReplEvaluationResult } from '../common/replModel.js';
+import { IVariableTemplateData } from './baseDebugView.js';
+import { handleANSIOutput } from './debugANSIHandling.js';
+import { COPY_EVALUATE_PATH_ID, COPY_VALUE_ID } from './debugCommands.js';
+import { DebugLinkHoverBehavior, DebugLinkHoverBehaviorTypeData, ILinkDetector, LinkDetector } from './linkDetector.js';
+
+export interface IValueHoverOptions {
+	/** Commands to show in the hover footer. */
+	commands?: { id: string; args: unknown[] }[];
+}
+
+export interface IRenderValueOptions {
+	showChanged?: boolean;
+	maxValueLength?: number;
+	/** If not false, a rich hover will be shown on the element. */
+	hover?: false | IValueHoverOptions;
+	colorize?: boolean;
+
+	/** @deprecated */
+	wasANSI?: boolean;
+	session?: IDebugSession;
+	locationReference?: number;
+}
+
+export interface IRenderVariableOptions {
+	showChanged?: boolean;
+	highlights?: IHighlight[];
+}
+
+
+const MAX_VALUE_RENDER_LENGTH_IN_VIEWLET = 1024;
+const booleanRegex = /^(true|false)$/i;
+const stringRegex = /^(['"]).*\1$/;
+
+const enum Cls {
+	Value = 'value',
+	Unavailable = 'unavailable',
+	Error = 'error',
+	Changed = 'changed',
+	Boolean = 'boolean',
+	String = 'string',
+	Number = 'number',
+}
+
+const allClasses: readonly Cls[] = Object.keys({
+	[Cls.Value]: 0,
+	[Cls.Unavailable]: 0,
+	[Cls.Error]: 0,
+	[Cls.Changed]: 0,
+	[Cls.Boolean]: 0,
+	[Cls.String]: 0,
+	[Cls.Number]: 0,
+} satisfies { [key in Cls]: unknown }) as Cls[];
+
+export class DebugExpressionRenderer {
+	private displayType: IObservable<boolean>;
+	private readonly linkDetector: LinkDetector;
+
+	constructor(
+		@ICommandService private readonly commandService: ICommandService,
+		@IConfigurationService configurationService: IConfigurationService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IHoverService private readonly hoverService: IHoverService,
+	) {
+		this.linkDetector = instantiationService.createInstance(LinkDetector);
+		this.displayType = observableConfigValue('debug.showVariableTypes', false, configurationService);
+	}
+
+	renderVariable(data: IVariableTemplateData, variable: Variable, options: IRenderVariableOptions = {}): IDisposable {
+		const displayType = this.displayType.get();
+
+		if (variable.available) {
+			data.type.textContent = '';
+			let text = variable.name;
+			if (variable.value && typeof variable.name === 'string') {
+				if (variable.type && displayType) {
+					text += ': ';
+					data.type.textContent = variable.type + ' =';
+				} else {
+					text += ' =';
+				}
+			}
+
+			data.label.set(text, options.highlights, variable.type && !displayType ? variable.type : variable.name);
+			data.name.classList.toggle('virtual', variable.presentationHint?.kind === 'virtual');
+			data.name.classList.toggle('internal', variable.presentationHint?.visibility === 'internal');
+		} else if (variable.value && typeof variable.name === 'string' && variable.name) {
+			data.label.set(':');
+		}
+
+		data.expression.classList.toggle('lazy', !!variable.presentationHint?.lazy);
+		const commands = [
+			{ id: COPY_VALUE_ID, args: [variable, [variable]] as unknown[] }
+		];
+		if (variable.evaluateName) {
+			commands.push({ id: COPY_EVALUATE_PATH_ID, args: [{ variable }] });
+		}
+
+		return this.renderValue(data.value, variable, {
+			showChanged: options.showChanged,
+			maxValueLength: MAX_VALUE_RENDER_LENGTH_IN_VIEWLET,
+			hover: { commands },
+			colorize: true,
+			session: variable.getSession(),
+		});
+	}
+
+	renderValue(container: HTMLElement, expressionOrValue: IExpressionValue | string, options: IRenderValueOptions = {}): IDisposable {
+		const store = new DisposableStore();
+		// Use remembered capabilities so REPL elements can render even once a session ends
+		const supportsANSI = !!options.session?.rememberedCapabilities?.supportsANSIStyling;
+
+		let value = typeof expressionOrValue === 'string' ? expressionOrValue : expressionOrValue.value;
+
+		// remove stale classes
+		for (const cls of allClasses) {
+			container.classList.remove(cls);
+		}
+		container.classList.add(Cls.Value);
+		// when resolving expressions we represent errors from the server as a variable with name === null.
+		if (value === null || ((expressionOrValue instanceof Expression || expressionOrValue instanceof Variable || expressionOrValue instanceof ReplEvaluationResult) && !expressionOrValue.available)) {
+			container.classList.add(Cls.Unavailable);
+			if (value !== Expression.DEFAULT_VALUE) {
+				container.classList.add(Cls.Error);
+			}
+		} else {
+			if (typeof expressionOrValue !== 'string' && options.showChanged && expressionOrValue.valueChanged && value !== Expression.DEFAULT_VALUE) {
+				// value changed color has priority over other colors.
+				container.classList.add(Cls.Changed);
+				expressionOrValue.valueChanged = false;
+			}
+
+			if (options.colorize && typeof expressionOrValue !== 'string') {
+				if (expressionOrValue.type === 'number' || expressionOrValue.type === 'boolean' || expressionOrValue.type === 'string') {
+					container.classList.add(expressionOrValue.type);
+				} else if (!isNaN(+value)) {
+					container.classList.add(Cls.Number);
+				} else if (booleanRegex.test(value)) {
+					container.classList.add(Cls.Boolean);
+				} else if (stringRegex.test(value)) {
+					container.classList.add(Cls.String);
+				}
+			}
+		}
+
+		if (options.maxValueLength && value && value.length > options.maxValueLength) {
+			value = value.substring(0, options.maxValueLength) + '...';
+		}
+		if (!value) {
+			value = '';
+		}
+
+		const session = options.session ?? ((expressionOrValue instanceof ExpressionContainer) ? expressionOrValue.getSession() : undefined);
+		// Only use hovers for links if thre's not going to be a hover for the value.
+		const hoverBehavior: DebugLinkHoverBehaviorTypeData = options.hover === false ? { type: DebugLinkHoverBehavior.Rich, store } : { type: DebugLinkHoverBehavior.None };
+		dom.clearNode(container);
+		const locationReference = options.locationReference ?? (expressionOrValue instanceof ExpressionContainer && expressionOrValue.valueLocationReference);
+
+		let linkDetector: ILinkDetector = this.linkDetector;
+		if (locationReference && session) {
+			linkDetector = this.linkDetector.makeReferencedLinkDetector(locationReference, session);
+		}
+
+		if (supportsANSI) {
+			container.appendChild(handleANSIOutput(value, linkDetector, session ? session.root : undefined));
+		} else {
+			container.appendChild(linkDetector.linkify(value, false, session?.root, true, hoverBehavior));
+		}
+
+		if (options.hover !== false) {
+			const { commands = [] } = options.hover || {};
+			store.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), container, () => {
+				const container = dom.$('div');
+				const markdownHoverElement = dom.$('div.hover-row');
+				const hoverContentsElement = dom.append(markdownHoverElement, dom.$('div.hover-contents'));
+				const hoverContentsPre = dom.append(hoverContentsElement, dom.$('pre.debug-var-hover-pre'));
+				if (supportsANSI) {
+					// note: intentionally using `this.linkDetector` so we don't blindly linkify the
+					// entire contents and instead only link file paths that it contains.
+					hoverContentsPre.appendChild(handleANSIOutput(value, this.linkDetector, session ? session.root : undefined));
+				} else {
+					hoverContentsPre.textContent = value;
+				}
+				container.appendChild(markdownHoverElement);
+				return container;
+			}, {
+				actions: commands.map(({ id, args }) => {
+					const description = CommandsRegistry.getCommand(id)?.metadata?.description;
+					return {
+						label: typeof description === 'string' ? description : description ? description.value : id,
+						commandId: id,
+						run: () => this.commandService.executeCommand(id, ...args),
+					};
+				})
+			}));
+		}
+
+		return store;
+	}
+}
diff --git a/src/vs/workbench/contrib/debug/browser/debugHover.ts b/src/vs/workbench/contrib/debug/browser/debugHover.ts
index c3191626a32..5b49fbe87e4 100644
--- a/src/vs/workbench/contrib/debug/browser/debugHover.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugHover.ts
@@ -3,43 +3,42 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { IMouseEvent } from 'vs/base/browser/mouseEvent';
-import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
-import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
-import { AsyncDataTree } from 'vs/base/browser/ui/tree/asyncDataTree';
-import { ITreeContextMenuEvent } from 'vs/base/browser/ui/tree/tree';
-import { coalesce } from 'vs/base/common/arrays';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import * as lifecycle from 'vs/base/common/lifecycle';
-import { clamp } from 'vs/base/common/numbers';
-import { isMacintosh } from 'vs/base/common/platform';
-import { ScrollbarVisibility } from 'vs/base/common/scrollable';
-import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from 'vs/editor/browser/editorBrowser';
-import { ConfigurationChangedEvent, EditorOption } from 'vs/editor/common/config/editorOptions';
-import { IDimension } from 'vs/editor/common/core/dimension';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import * as nls from 'vs/nls';
-import { IMenuService, MenuId } from 'vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { WorkbenchAsyncDataTree } from 'vs/platform/list/browser/listService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { asCssVariable, editorHoverBackground, editorHoverBorder, editorHoverForeground } from 'vs/platform/theme/common/colorRegistry';
-import { AbstractExpressionDataSource, renderExpressionValue } from 'vs/workbench/contrib/debug/browser/baseDebugView';
-import { LinkDetector } from 'vs/workbench/contrib/debug/browser/linkDetector';
-import { VariablesRenderer, VisualizedVariableRenderer, openContextMenuForVariableTreeElement } from 'vs/workbench/contrib/debug/browser/variablesView';
-import { IDebugService, IDebugSession, IExpression, IExpressionContainer, IStackFrame } from 'vs/workbench/contrib/debug/common/debug';
-import { Expression, Variable, VisualizedExpression } from 'vs/workbench/contrib/debug/common/debugModel';
-import { getEvaluatableExpressionAtPosition } from 'vs/workbench/contrib/debug/common/debugUtils';
+import * as dom from '../../../../base/browser/dom.js';
+import { IKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { IMouseEvent } from '../../../../base/browser/mouseEvent.js';
+import { IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
+import { IListAccessibilityProvider } from '../../../../base/browser/ui/list/listWidget.js';
+import { DomScrollableElement } from '../../../../base/browser/ui/scrollbar/scrollableElement.js';
+import { AsyncDataTree } from '../../../../base/browser/ui/tree/asyncDataTree.js';
+import { ITreeContextMenuEvent } from '../../../../base/browser/ui/tree/tree.js';
+import { coalesce } from '../../../../base/common/arrays.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import * as lifecycle from '../../../../base/common/lifecycle.js';
+import { clamp } from '../../../../base/common/numbers.js';
+import { isMacintosh } from '../../../../base/common/platform.js';
+import { ScrollbarVisibility } from '../../../../base/common/scrollable.js';
+import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from '../../../../editor/browser/editorBrowser.js';
+import { ConfigurationChangedEvent, EditorOption } from '../../../../editor/common/config/editorOptions.js';
+import { IDimension } from '../../../../editor/common/core/dimension.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { ModelDecorationOptions } from '../../../../editor/common/model/textModel.js';
+import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
+import * as nls from '../../../../nls.js';
+import { IMenuService, MenuId } from '../../../../platform/actions/common/actions.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { WorkbenchAsyncDataTree } from '../../../../platform/list/browser/listService.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { asCssVariable, editorHoverBackground, editorHoverBorder, editorHoverForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import { IDebugService, IDebugSession, IExpression, IExpressionContainer, IStackFrame } from '../common/debug.js';
+import { Expression, Variable, VisualizedExpression } from '../common/debugModel.js';
+import { getEvaluatableExpressionAtPosition } from '../common/debugUtils.js';
+import { AbstractExpressionDataSource } from './baseDebugView.js';
+import { DebugExpressionRenderer } from './debugExpressionRenderer.js';
+import { VariablesRenderer, VisualizedVariableRenderer, openContextMenuForVariableTreeElement } from './variablesView.js';
 
 const $ = dom.$;
 
@@ -83,7 +82,11 @@ export class DebugHoverWidget implements IContentWidget {
 	// editor.IContentWidget.allowEditorOverflow
 	readonly allowEditorOverflow = true;
 
-	private _isVisible: boolean;
+	// todo@connor4312: move more properties that are only valid while a hover
+	// is happening into `_isVisible`
+	private _isVisible?: {
+		store: lifecycle.DisposableStore;
+	};
 	private safeTriangle?: dom.SafeTriangle;
 	private showCancellationSource?: CancellationTokenSource;
 	private domNode!: HTMLElement;
@@ -98,6 +101,7 @@ export class DebugHoverWidget implements IContentWidget {
 	private toDispose: lifecycle.IDisposable[];
 	private scrollbar!: DomScrollableElement;
 	private debugHoverComputer: DebugHoverComputer;
+	private expressionRenderer: DebugExpressionRenderer;
 
 	private expressionToRender: IExpression | undefined;
 	private isUpdatingTree = false;
@@ -113,14 +117,13 @@ export class DebugHoverWidget implements IContentWidget {
 		@IMenuService private readonly menuService: IMenuService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IContextMenuService private readonly contextMenuService: IContextMenuService,
-		@IHoverService private readonly hoverService: IHoverService,
 	) {
 		this.toDispose = [];
 
-		this._isVisible = false;
 		this.showAtPosition = null;
 		this.positionPreference = [ContentWidgetPositionPreference.ABOVE, ContentWidgetPositionPreference.BELOW];
 		this.debugHoverComputer = this.instantiationService.createInstance(DebugHoverComputer, this.editor);
+		this.expressionRenderer = this.instantiationService.createInstance(DebugExpressionRenderer);
 	}
 
 	private create(): void {
@@ -132,10 +135,9 @@ export class DebugHoverWidget implements IContentWidget {
 		const tip = dom.append(this.complexValueContainer, $('.tip'));
 		tip.textContent = nls.localize({ key: 'quickTip', comment: ['"switch to editor language hover" means to show the programming language hover widget instead of the debug hover'] }, 'Hold {0} key to switch to editor language hover', isMacintosh ? 'Option' : 'Alt');
 		const dataSource = this.instantiationService.createInstance(DebugHoverDataSource);
-		const linkeDetector = this.instantiationService.createInstance(LinkDetector);
 		this.tree = <WorkbenchAsyncDataTree<IExpression, IExpression, any>>this.instantiationService.createInstance(WorkbenchAsyncDataTree, 'DebugHover', this.treeContainer, new DebugHoverDelegate(), [
-			this.instantiationService.createInstance(VariablesRenderer, linkeDetector),
-			this.instantiationService.createInstance(VisualizedVariableRenderer, linkeDetector),
+			this.instantiationService.createInstance(VariablesRenderer, this.expressionRenderer),
+			this.instantiationService.createInstance(VisualizedVariableRenderer, this.expressionRenderer),
 		],
 			dataSource, {
 			accessibilityProvider: new DebugHoverAccessibilityProvider(),
@@ -215,7 +217,7 @@ export class DebugHoverWidget implements IContentWidget {
 	}
 
 	isVisible(): boolean {
-		return this._isVisible;
+		return !!this._isVisible;
 	}
 
 	willBeVisible(): boolean {
@@ -239,7 +241,7 @@ export class DebugHoverWidget implements IContentWidget {
 	}
 
 	async showAt(position: Position, focus: boolean, mouseEvent?: IMouseEvent): Promise<void | ShowDebugHoverResult> {
-		this.showCancellationSource?.cancel();
+		this.showCancellationSource?.dispose(true);
 		const cancellationSource = this.showCancellationSource = new CancellationTokenSource();
 		const session = this.debugService.getViewModel().focusedSession;
 
@@ -279,7 +281,7 @@ export class DebugHoverWidget implements IContentWidget {
 			options: DebugHoverWidget._HOVER_HIGHLIGHT_DECORATION_OPTIONS
 		}]);
 
-		return this.doShow(result.range.getStartPosition(), expression, focus, mouseEvent);
+		return this.doShow(session, result.range.getStartPosition(), expression, focus, mouseEvent);
 	}
 
 	private static readonly _HOVER_HIGHLIGHT_DECORATION_OPTIONS = ModelDecorationOptions.register({
@@ -287,21 +289,24 @@ export class DebugHoverWidget implements IContentWidget {
 		className: 'hoverHighlight'
 	});
 
-	private async doShow(position: Position, expression: IExpression, focus: boolean, mouseEvent: IMouseEvent | undefined): Promise<void> {
+	private async doShow(session: IDebugSession | undefined, position: Position, expression: IExpression, focus: boolean, mouseEvent: IMouseEvent | undefined): Promise<void> {
 		if (!this.domNode) {
 			this.create();
 		}
 
 		this.showAtPosition = position;
-		this._isVisible = true;
+		const store = new lifecycle.DisposableStore();
+		this._isVisible = { store };
 
 		if (!expression.hasChildren) {
 			this.complexValueContainer.hidden = true;
 			this.valueContainer.hidden = false;
-			renderExpressionValue(expression, this.valueContainer, {
+			store.add(this.expressionRenderer.renderValue(this.valueContainer, expression, {
 				showChanged: false,
-				colorize: true
-			}, this.hoverService);
+				colorize: true,
+				hover: false,
+				session,
+			}));
 			this.valueContainer.title = '';
 			this.editor.layoutContentWidget(this);
 			this.scrollbar.scanDomNode();
@@ -316,8 +321,7 @@ export class DebugHoverWidget implements IContentWidget {
 		this.valueContainer.hidden = true;
 
 		this.expressionToRender = expression;
-		this.complexValueTitle.textContent = expression.value;
-		this.complexValueTitle.title = expression.value;
+		store.add(this.expressionRenderer.renderValue(this.complexValueTitle, expression, { hover: false, session }));
 		this.editor.layoutContentWidget(this);
 		this.tree.scrollTop = 0;
 		this.tree.scrollLeft = 0;
@@ -381,7 +385,7 @@ export class DebugHoverWidget implements IContentWidget {
 
 	hide(): void {
 		if (this.showCancellationSource) {
-			this.showCancellationSource.cancel();
+			this.showCancellationSource.dispose(true);
 			this.showCancellationSource = undefined;
 		}
 
@@ -392,7 +396,9 @@ export class DebugHoverWidget implements IContentWidget {
 		if (dom.isAncestorOfActiveElement(this.domNode)) {
 			this.editor.focus();
 		}
-		this._isVisible = false;
+		this._isVisible.store.dispose();
+		this._isVisible = undefined;
+
 		this.highlightDecorations.clear();
 		this.editor.layoutContentWidget(this);
 		this.positionPreference = [ContentWidgetPositionPreference.ABOVE, ContentWidgetPositionPreference.BELOW];
@@ -451,8 +457,10 @@ interface IDebugHoverComputeResult {
 }
 
 class DebugHoverComputer {
-	private _currentRange: Range | undefined;
-	private _currentExpression: string | undefined;
+	private _current?: {
+		range: Range;
+		expression: string;
+	};
 
 	constructor(
 		private editor: ICodeEditor,
@@ -474,30 +482,35 @@ class DebugHoverComputer {
 		}
 
 		const { range, matchingExpression } = result;
-		const rangeChanged = this._currentRange ?
-			!this._currentRange.equalsRange(range) :
-			true;
-		this._currentExpression = matchingExpression;
-		this._currentRange = Range.lift(range);
-		return { rangeChanged, range: this._currentRange };
+		const rangeChanged = !this._current?.range.equalsRange(range);
+		this._current = { expression: matchingExpression, range: Range.lift(range) };
+		return { rangeChanged, range: this._current.range };
 	}
 
 	async evaluate(session: IDebugSession): Promise<IExpression | undefined> {
-		if (!this._currentExpression) {
+		if (!this._current) {
 			this.logService.error('No expression to evaluate');
 			return;
 		}
 
+		const textModel = this.editor.getModel();
+		const debugSource = textModel && session.getSourceForUri(textModel?.uri);
+
 		if (session.capabilities.supportsEvaluateForHovers) {
-			const expression = new Expression(this._currentExpression);
-			await expression.evaluate(session, this.debugService.getViewModel().focusedStackFrame, 'hover');
+			const expression = new Expression(this._current.expression);
+			await expression.evaluate(session, this.debugService.getViewModel().focusedStackFrame, 'hover', undefined, debugSource ? {
+				line: this._current.range.startLineNumber,
+				column: this._current.range.startColumn,
+				source: debugSource.raw,
+			} : undefined);
 			return expression;
 		} else {
 			const focusedStackFrame = this.debugService.getViewModel().focusedStackFrame;
 			if (focusedStackFrame) {
 				return await findExpressionInStackFrame(
 					focusedStackFrame,
-					coalesce(this._currentExpression.split('.').map(word => word.trim())));
+					coalesce(this._current.expression.split('.').map(word => word.trim()))
+				);
 			}
 		}
 
diff --git a/src/vs/workbench/contrib/debug/browser/debugIcons.ts b/src/vs/workbench/contrib/debug/browser/debugIcons.ts
index 12376d1a83f..eba9f915c37 100644
--- a/src/vs/workbench/contrib/debug/browser/debugIcons.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugIcons.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from 'vs/base/common/codicons';
-import { localize } from 'vs/nls';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { localize } from '../../../../nls.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 
 export const debugConsoleViewIcon = registerIcon('debug-console-view-icon', Codicon.debugConsole, localize('debugConsoleViewIcon', 'View icon of the debug console view.'));
 export const runViewIcon = registerIcon('run-view-icon', Codicon.debugAlt, localize('runViewIcon', 'View icon of the run view.'));
diff --git a/src/vs/workbench/contrib/debug/browser/debugMemory.ts b/src/vs/workbench/contrib/debug/browser/debugMemory.ts
index 2e6da04e034..0a5b7f1a16e 100644
--- a/src/vs/workbench/contrib/debug/browser/debugMemory.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugMemory.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { clamp } from 'vs/base/common/numbers';
-import { assertNever } from 'vs/base/common/assert';
-import { URI } from 'vs/base/common/uri';
-import { FileChangeType, IFileOpenOptions, FilePermission, FileSystemProviderCapabilities, FileSystemProviderErrorCode, FileType, IFileChange, IFileSystemProvider, IStat, IWatchOptions, createFileSystemProviderError } from 'vs/platform/files/common/files';
-import { DEBUG_MEMORY_SCHEME, IDebugService, IDebugSession, IMemoryInvalidationEvent, IMemoryRegion, MemoryRange, MemoryRangeType, State } from 'vs/workbench/contrib/debug/common/debug';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { clamp } from '../../../../base/common/numbers.js';
+import { assertNever } from '../../../../base/common/assert.js';
+import { URI } from '../../../../base/common/uri.js';
+import { FileChangeType, IFileOpenOptions, FilePermission, FileSystemProviderCapabilities, FileSystemProviderErrorCode, FileType, IFileChange, IFileSystemProvider, IStat, IWatchOptions, createFileSystemProviderError } from '../../../../platform/files/common/files.js';
+import { DEBUG_MEMORY_SCHEME, IDebugService, IDebugSession, IMemoryInvalidationEvent, IMemoryRegion, MemoryRange, MemoryRangeType, State } from '../common/debug.js';
 
 const rangeRe = /range=([0-9]+):([0-9]+)/;
 
diff --git a/src/vs/workbench/contrib/debug/browser/debugProgress.ts b/src/vs/workbench/contrib/debug/browser/debugProgress.ts
index c87b19974f5..0cca619bf96 100644
--- a/src/vs/workbench/contrib/debug/browser/debugProgress.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugProgress.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IDebugService, IDebugSession, VIEWLET_ID } from 'vs/workbench/contrib/debug/common/debug';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
+import { Event } from '../../../../base/common/event.js';
+import { IDisposable, dispose } from '../../../../base/common/lifecycle.js';
+import { IProgressService, ProgressLocation } from '../../../../platform/progress/common/progress.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IDebugService, IDebugSession, VIEWLET_ID } from '../common/debug.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
 
 export class DebugProgressContribution implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/contrib/debug/browser/debugQuickAccess.ts b/src/vs/workbench/contrib/debug/browser/debugQuickAccess.ts
index 0433b7ae76b..fc12ce3ed99 100644
--- a/src/vs/workbench/contrib/debug/browser/debugQuickAccess.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugQuickAccess.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
-import { PickerQuickAccessProvider, IPickerQuickAccessItem, TriggerAction } from 'vs/platform/quickinput/browser/pickerQuickAccess';
-import { localize } from 'vs/nls';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IDebugService } from 'vs/workbench/contrib/debug/common/debug';
-import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { matchesFuzzy } from 'vs/base/common/filters';
-import { ADD_CONFIGURATION_ID, DEBUG_QUICK_ACCESS_PREFIX } from 'vs/workbench/contrib/debug/browser/debugCommands';
-import { debugConfigure, debugRemoveConfig } from 'vs/workbench/contrib/debug/browser/debugIcons';
-import { ThemeIcon } from 'vs/base/common/themables';
+import { IQuickPickSeparator } from '../../../../platform/quickinput/common/quickInput.js';
+import { PickerQuickAccessProvider, IPickerQuickAccessItem, TriggerAction } from '../../../../platform/quickinput/browser/pickerQuickAccess.js';
+import { localize } from '../../../../nls.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IDebugService } from '../common/debug.js';
+import { IWorkspaceContextService, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { matchesFuzzy } from '../../../../base/common/filters.js';
+import { ADD_CONFIGURATION_ID, DEBUG_QUICK_ACCESS_PREFIX } from './debugCommands.js';
+import { debugConfigure, debugRemoveConfig } from './debugIcons.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
 
 export class StartDebugQuickAccessProvider extends PickerQuickAccessProvider<IPickerQuickAccessItem> {
 
diff --git a/src/vs/workbench/contrib/debug/browser/debugService.ts b/src/vs/workbench/contrib/debug/browser/debugService.ts
index c2ae65ed539..27feb6f94ed 100644
--- a/src/vs/workbench/contrib/debug/browser/debugService.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugService.ts
@@ -3,62 +3,62 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as aria from 'vs/base/browser/ui/aria/aria';
-import { Action, IAction } from 'vs/base/common/actions';
-import { distinct } from 'vs/base/common/arrays';
-import { RunOnceScheduler, raceTimeout } from 'vs/base/common/async';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { isErrorWithActions } from 'vs/base/common/errorMessage';
-import * as errors from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { deepClone, equals } from 'vs/base/common/objects';
-import severity from 'vs/base/common/severity';
-import { URI, URI as uri } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { isCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { ITextModel } from 'vs/editor/common/model';
-import * as nls from 'vs/nls';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IExtensionHostDebugService } from 'vs/platform/debug/common/extensionHostDebug';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { FileChangeType, FileChangesEvent, IFileService } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IWorkspaceContextService, IWorkspaceFolder, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { IWorkspaceTrustRequestService } from 'vs/platform/workspace/common/workspaceTrust';
-import { EditorsOrder } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { IViewDescriptorService, ViewContainerLocation } from 'vs/workbench/common/views';
-import { AdapterManager } from 'vs/workbench/contrib/debug/browser/debugAdapterManager';
-import { DEBUG_CONFIGURE_COMMAND_ID, DEBUG_CONFIGURE_LABEL } from 'vs/workbench/contrib/debug/browser/debugCommands';
-import { ConfigurationManager } from 'vs/workbench/contrib/debug/browser/debugConfigurationManager';
-import { DebugMemoryFileSystemProvider } from 'vs/workbench/contrib/debug/browser/debugMemory';
-import { DebugSession } from 'vs/workbench/contrib/debug/browser/debugSession';
-import { DebugTaskRunner, TaskRunResult } from 'vs/workbench/contrib/debug/browser/debugTaskRunner';
-import { CALLSTACK_VIEW_ID, CONTEXT_BREAKPOINTS_EXIST, CONTEXT_DEBUG_STATE, CONTEXT_DEBUG_TYPE, CONTEXT_DEBUG_UX, CONTEXT_DISASSEMBLY_VIEW_FOCUS, CONTEXT_HAS_DEBUGGED, CONTEXT_IN_DEBUG_MODE, DEBUG_MEMORY_SCHEME, DEBUG_SCHEME, IAdapterManager, IBreakpoint, IBreakpointData, IBreakpointUpdateData, ICompound, IConfig, IConfigurationManager, IDebugConfiguration, IDebugModel, IDebugService, IDebugSession, IDebugSessionOptions, IEnablement, IExceptionBreakpoint, IGlobalConfig, ILaunch, IStackFrame, IThread, IViewModel, REPL_VIEW_ID, State, VIEWLET_ID, debuggerDisabledMessage, getStateLabel } from 'vs/workbench/contrib/debug/common/debug';
-import { DebugCompoundRoot } from 'vs/workbench/contrib/debug/common/debugCompoundRoot';
-import { Breakpoint, DataBreakpoint, DebugModel, FunctionBreakpoint, IDataBreakpointOptions, IFunctionBreakpointOptions, IInstructionBreakpointOptions, InstructionBreakpoint } from 'vs/workbench/contrib/debug/common/debugModel';
-import { Source } from 'vs/workbench/contrib/debug/common/debugSource';
-import { DebugStorage } from 'vs/workbench/contrib/debug/common/debugStorage';
-import { DebugTelemetry } from 'vs/workbench/contrib/debug/common/debugTelemetry';
-import { getExtensionHostDebugSession, saveAllBeforeDebugStart } from 'vs/workbench/contrib/debug/common/debugUtils';
-import { ViewModel } from 'vs/workbench/contrib/debug/common/debugViewModel';
-import { Debugger } from 'vs/workbench/contrib/debug/common/debugger';
-import { DisassemblyViewInput } from 'vs/workbench/contrib/debug/common/disassemblyViewInput';
-import { VIEWLET_ID as EXPLORER_VIEWLET_ID } from 'vs/workbench/contrib/files/common/files';
-import { ITestService } from 'vs/workbench/contrib/testing/common/testService';
-import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/browser/layoutService';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
+import * as aria from '../../../../base/browser/ui/aria/aria.js';
+import { Action, IAction } from '../../../../base/common/actions.js';
+import { distinct } from '../../../../base/common/arrays.js';
+import { RunOnceScheduler, raceTimeout } from '../../../../base/common/async.js';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { isErrorWithActions } from '../../../../base/common/errorMessage.js';
+import * as errors from '../../../../base/common/errors.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import { deepClone, equals } from '../../../../base/common/objects.js';
+import severity from '../../../../base/common/severity.js';
+import { URI, URI as uri } from '../../../../base/common/uri.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import * as nls from '../../../../nls.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IExtensionHostDebugService } from '../../../../platform/debug/common/extensionHostDebug.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { FileChangeType, FileChangesEvent, IFileService } from '../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IWorkspaceContextService, IWorkspaceFolder, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { IWorkspaceTrustRequestService } from '../../../../platform/workspace/common/workspaceTrust.js';
+import { EditorsOrder } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { IViewDescriptorService, ViewContainerLocation } from '../../../common/views.js';
+import { AdapterManager } from './debugAdapterManager.js';
+import { DEBUG_CONFIGURE_COMMAND_ID, DEBUG_CONFIGURE_LABEL } from './debugCommands.js';
+import { ConfigurationManager } from './debugConfigurationManager.js';
+import { DebugMemoryFileSystemProvider } from './debugMemory.js';
+import { DebugSession } from './debugSession.js';
+import { DebugTaskRunner, TaskRunResult } from './debugTaskRunner.js';
+import { CALLSTACK_VIEW_ID, CONTEXT_BREAKPOINTS_EXIST, CONTEXT_DEBUG_STATE, CONTEXT_DEBUG_TYPE, CONTEXT_DEBUG_UX, CONTEXT_DISASSEMBLY_VIEW_FOCUS, CONTEXT_HAS_DEBUGGED, CONTEXT_IN_DEBUG_MODE, DEBUG_MEMORY_SCHEME, DEBUG_SCHEME, IAdapterManager, IBreakpoint, IBreakpointData, IBreakpointUpdateData, ICompound, IConfig, IConfigurationManager, IDebugConfiguration, IDebugModel, IDebugService, IDebugSession, IDebugSessionOptions, IEnablement, IExceptionBreakpoint, IGlobalConfig, ILaunch, IStackFrame, IThread, IViewModel, REPL_VIEW_ID, State, VIEWLET_ID, debuggerDisabledMessage, getStateLabel } from '../common/debug.js';
+import { DebugCompoundRoot } from '../common/debugCompoundRoot.js';
+import { Breakpoint, DataBreakpoint, DebugModel, FunctionBreakpoint, IDataBreakpointOptions, IFunctionBreakpointOptions, IInstructionBreakpointOptions, InstructionBreakpoint } from '../common/debugModel.js';
+import { Source } from '../common/debugSource.js';
+import { DebugStorage } from '../common/debugStorage.js';
+import { DebugTelemetry } from '../common/debugTelemetry.js';
+import { getExtensionHostDebugSession, saveAllBeforeDebugStart } from '../common/debugUtils.js';
+import { ViewModel } from '../common/debugViewModel.js';
+import { Debugger } from '../common/debugger.js';
+import { DisassemblyViewInput } from '../common/disassemblyViewInput.js';
+import { VIEWLET_ID as EXPLORER_VIEWLET_ID } from '../../files/common/files.js';
+import { ITestService } from '../../testing/common/testService.js';
+import { IActivityService, NumberBadge } from '../../../services/activity/common/activity.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IWorkbenchLayoutService, Parts } from '../../../services/layout/browser/layoutService.js';
+import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.js';
+import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
 
 export class DebugService implements IDebugService {
 	declare readonly _serviceBrand: undefined;
@@ -204,8 +204,8 @@ export class DebugService implements IDebugService {
 
 		this.disposables.add(extensionService.onWillStop(evt => {
 			evt.veto(
-				this.stopSession(undefined).then(() => false),
-				nls.localize('stoppingDebug', 'Stopping debug sessions...'),
+				this.model.getSessions().length > 0,
+				nls.localize('active debug session', 'A debug session is still running.'),
 			);
 		}));
 
@@ -756,7 +756,7 @@ export class DebugService implements IDebugService {
 		}));
 	}
 
-	async restartSession(session: IDebugSession, restartData?: any): Promise<any> {
+	async restartSession(session: IDebugSession, restartData?: any): Promise<void> {
 		if (session.saveBeforeRestart) {
 			await saveAllBeforeDebugStart(this.configurationService, this.editorService);
 		}
@@ -1158,7 +1158,7 @@ export class DebugService implements IDebugService {
 		await this.sendExceptionBreakpoints();
 	}
 
-	async sendAllBreakpoints(session?: IDebugSession): Promise<any> {
+	async sendAllBreakpoints(session?: IDebugSession): Promise<void> {
 		const setBreakpointsPromises = distinct(this.model.getBreakpoints(), bp => bp.originalUri.toString())
 			.map(bp => this.sendBreakpoints(bp.originalUri, false, session));
 
diff --git a/src/vs/workbench/contrib/debug/browser/debugSession.ts b/src/vs/workbench/contrib/debug/browser/debugSession.ts
index 3a7ca50029e..92b41d3e596 100644
--- a/src/vs/workbench/contrib/debug/browser/debugSession.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugSession.ts
@@ -3,53 +3,55 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as aria from 'vs/base/browser/ui/aria/aria';
-import { distinct } from 'vs/base/common/arrays';
-import { Queue, RunOnceScheduler, raceTimeout } from 'vs/base/common/async';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { canceled } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { normalizeDriveLetter } from 'vs/base/common/labels';
-import { Disposable, DisposableMap, DisposableStore, IDisposable, MutableDisposable, dispose } from 'vs/base/common/lifecycle';
-import { mixin } from 'vs/base/common/objects';
-import * as platform from 'vs/base/common/platform';
-import * as resources from 'vs/base/common/resources';
-import Severity from 'vs/base/common/severity';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { localize } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ICustomEndpointTelemetryService, ITelemetryService, TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IWorkspaceContextService, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { ViewContainerLocation } from 'vs/workbench/common/views';
-import { RawDebugSession } from 'vs/workbench/contrib/debug/browser/rawDebugSession';
-import { AdapterEndEvent, IBreakpoint, IConfig, IDataBreakpoint, IDataBreakpointInfoResponse, IDebugConfiguration, IDebugService, IDebugSession, IDebugSessionOptions, IDebugger, IExceptionBreakpoint, IExceptionInfo, IFunctionBreakpoint, IInstructionBreakpoint, IMemoryRegion, IRawModelUpdate, IRawStoppedDetails, IReplElement, IStackFrame, IThread, LoadedSourceEvent, State, VIEWLET_ID, isFrameDeemphasized } from 'vs/workbench/contrib/debug/common/debug';
-import { DebugCompoundRoot } from 'vs/workbench/contrib/debug/common/debugCompoundRoot';
-import { DebugModel, ExpressionContainer, MemoryRegion, Thread } from 'vs/workbench/contrib/debug/common/debugModel';
-import { Source } from 'vs/workbench/contrib/debug/common/debugSource';
-import { filterExceptionsFromTelemetry } from 'vs/workbench/contrib/debug/common/debugUtils';
-import { INewReplElementData, ReplModel } from 'vs/workbench/contrib/debug/common/replModel';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { getActiveWindow } from 'vs/base/browser/dom';
-import { mainWindow } from 'vs/base/browser/window';
-import { isDefined } from 'vs/base/common/types';
-import { ITestService } from 'vs/workbench/contrib/testing/common/testService';
-import { ITestResultService } from 'vs/workbench/contrib/testing/common/testResultService';
-import { LiveTestResult } from 'vs/workbench/contrib/testing/common/testResult';
+import * as aria from '../../../../base/browser/ui/aria/aria.js';
+import { distinct } from '../../../../base/common/arrays.js';
+import { Queue, RunOnceScheduler, raceTimeout } from '../../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { canceled } from '../../../../base/common/errors.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { normalizeDriveLetter } from '../../../../base/common/labels.js';
+import { Disposable, DisposableMap, DisposableStore, IDisposable, MutableDisposable, dispose } from '../../../../base/common/lifecycle.js';
+import { mixin } from '../../../../base/common/objects.js';
+import * as platform from '../../../../base/common/platform.js';
+import * as resources from '../../../../base/common/resources.js';
+import Severity from '../../../../base/common/severity.js';
+import { URI } from '../../../../base/common/uri.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { IPosition, Position } from '../../../../editor/common/core/position.js';
+import { localize } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { ICustomEndpointTelemetryService, ITelemetryService, TelemetryLevel } from '../../../../platform/telemetry/common/telemetry.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IWorkspaceContextService, IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
+import { ViewContainerLocation } from '../../../common/views.js';
+import { RawDebugSession } from './rawDebugSession.js';
+import { AdapterEndEvent, IBreakpoint, IConfig, IDataBreakpoint, IDataBreakpointInfoResponse, IDebugConfiguration, IDebugLocationReferenced, IDebugService, IDebugSession, IDebugSessionOptions, IDebugger, IExceptionBreakpoint, IExceptionInfo, IFunctionBreakpoint, IInstructionBreakpoint, IMemoryRegion, IRawModelUpdate, IRawStoppedDetails, IReplElement, IStackFrame, IThread, LoadedSourceEvent, State, VIEWLET_ID, isFrameDeemphasized } from '../common/debug.js';
+import { DebugCompoundRoot } from '../common/debugCompoundRoot.js';
+import { DebugModel, ExpressionContainer, MemoryRegion, Thread } from '../common/debugModel.js';
+import { Source } from '../common/debugSource.js';
+import { filterExceptionsFromTelemetry } from '../common/debugUtils.js';
+import { INewReplElementData, ReplModel } from '../common/replModel.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.js';
+import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.js';
+import { getActiveWindow } from '../../../../base/browser/dom.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { isDefined } from '../../../../base/common/types.js';
+import { ITestService } from '../../testing/common/testService.js';
+import { ITestResultService } from '../../testing/common/testResultService.js';
+import { LiveTestResult } from '../../testing/common/testResult.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
 
 const TRIGGERED_BREAKPOINT_MAX_DELAY = 1500;
 
 export class DebugSession implements IDebugSession, IDisposable {
 	parentSession: IDebugSession | undefined;
+	rememberedCapabilities?: DebugProtocol.Capabilities;
 
 	private _subId: string | undefined;
 	raw: RawDebugSession | undefined; // used in tests
@@ -84,7 +86,7 @@ export class DebugSession implements IDebugSession, IDisposable {
 	private readonly _onDidProgressEnd = new Emitter<DebugProtocol.ProgressEndEvent>();
 	private readonly _onDidInvalidMemory = new Emitter<DebugProtocol.MemoryEvent>();
 
-	private readonly _onDidChangeREPLElements = new Emitter<void>();
+	private readonly _onDidChangeREPLElements = new Emitter<IReplElement | undefined>();
 
 	private _name: string | undefined;
 	private readonly _onDidChangeName = new Emitter<string>();
@@ -117,6 +119,7 @@ export class DebugSession implements IDebugSession, IDisposable {
 		@ILogService private readonly logService: ILogService,
 		@ITestService private readonly testService: ITestService,
 		@ITestResultService testResultService: ITestResultService,
+		@IAccessibilityService private readonly accessibilityService: IAccessibilityService,
 	) {
 		this._options = options || {};
 		this.parentSession = this._options.parentSession;
@@ -128,7 +131,7 @@ export class DebugSession implements IDebugSession, IDisposable {
 
 		const toDispose = this.globalDisposables;
 		const replListener = toDispose.add(new MutableDisposable());
-		replListener.value = this.repl.onDidChangeElements(() => this._onDidChangeREPLElements.fire());
+		replListener.value = this.repl.onDidChangeElements((e) => this._onDidChangeREPLElements.fire(e));
 		if (lifecycleService) {
 			toDispose.add(lifecycleService.onWillShutdown(() => {
 				this.shutdown();
@@ -176,7 +179,7 @@ export class DebugSession implements IDebugSession, IDisposable {
 				// remove its parent, if it's still running
 				if (!this.hasSeparateRepl() && this.raw?.isInShutdown === false) {
 					this.repl = this.repl.clone();
-					replListener.value = this.repl.onDidChangeElements(() => this._onDidChangeREPLElements.fire());
+					replListener.value = this.repl.onDidChangeElements((e) => this._onDidChangeREPLElements.fire(e));
 					this.parentSession = undefined;
 				}
 			}));
@@ -238,7 +241,9 @@ export class DebugSession implements IDebugSession, IDisposable {
 
 	get autoExpandLazyVariables(): boolean {
 		// This tiny helper avoids converting the entire debug model to use service injection
-		return this.configurationService.getValue<IDebugConfiguration>('debug').autoExpandLazyVariables;
+		const screenReaderOptimized = this.accessibilityService.isScreenReaderOptimized();
+		const value = this.configurationService.getValue<IDebugConfiguration>('debug').autoExpandLazyVariables;
+		return value === 'auto' && screenReaderOptimized || value === 'on';
 	}
 
 	setConfiguration(configuration: { resolved: IConfig; unresolved: IConfig | undefined }) {
@@ -291,7 +296,7 @@ export class DebugSession implements IDebugSession, IDisposable {
 		return this._onDidEndAdapter.event;
 	}
 
-	get onDidChangeReplElements(): Event<void> {
+	get onDidChangeReplElements(): Event<IReplElement | undefined> {
 		return this._onDidChangeREPLElements.event;
 	}
 
@@ -359,11 +364,13 @@ export class DebugSession implements IDebugSession, IDisposable {
 				supportsMemoryReferences: true, //#129684
 				supportsArgsCanBeInterpretedByShell: true, // #149910
 				supportsMemoryEvent: true, // #133643
-				supportsStartDebuggingRequest: true
+				supportsStartDebuggingRequest: true,
+				supportsANSIStyling: true,
 			});
 
 			this.initialized = true;
 			this._onDidChangeState.fire();
+			this.rememberedCapabilities = this.raw.capabilities;
 			this.debugService.setExceptionBreakpointsForSession(this, (this.raw && this.raw.capabilities.exceptionBreakpointFilters) || []);
 			this.debugService.getModel().registerBreakpointModes(this.configuration.type, this.raw.capabilities.breakpointModes || []);
 		} catch (err) {
@@ -685,12 +692,12 @@ export class DebugSession implements IDebugSession, IDisposable {
 		return this.raw.variables({ variablesReference, filter, start, count }, token);
 	}
 
-	evaluate(expression: string, frameId: number, context?: string): Promise<DebugProtocol.EvaluateResponse | undefined> {
+	evaluate(expression: string, frameId: number, context?: string, location?: { line: number; column: number; source: DebugProtocol.Source }): Promise<DebugProtocol.EvaluateResponse | undefined> {
 		if (!this.raw) {
 			throw new Error(localize('noDebugAdapter', "No debugger available, can not send '{0}'", 'evaluate'));
 		}
 
-		return this.raw.evaluate({ expression, frameId, context });
+		return this.raw.evaluate({ expression, frameId, context, line: location?.line, column: location?.column, source: location?.source });
 	}
 
 	async restartFrame(frameId: number, threadId: number): Promise<void> {
@@ -902,6 +909,20 @@ export class DebugSession implements IDebugSession, IDisposable {
 		return this.raw.writeMemory({ memoryReference, offset, allowPartial, data });
 	}
 
+	async resolveLocationReference(locationReference: number): Promise<IDebugLocationReferenced> {
+		if (!this.raw) {
+			throw new Error(localize('noDebugAdapter', "No debugger available, can not send '{0}'", 'locations'));
+		}
+
+		const location = await this.raw.locations({ locationReference });
+		if (!location?.body) {
+			throw new Error(localize('noDebugAdapter', "No debugger available, can not send '{0}'", 'locations'));
+		}
+
+		const source = this.getSource(location.body.source);
+		return { column: 1, ...location.body, source };
+	}
+
 	//---- threads
 
 	getThread(threadId: number): Thread | undefined {
@@ -1183,7 +1204,7 @@ export class DebugSession implements IDebugSession, IDisposable {
 
 				if (event.body.group === 'start' || event.body.group === 'startCollapsed') {
 					const expanded = event.body.group === 'start';
-					this.repl.startGroup(event.body.output || '', expanded, source);
+					this.repl.startGroup(this, event.body.output || '', expanded, source);
 					return;
 				}
 				if (event.body.group === 'end') {
@@ -1370,7 +1391,7 @@ export class DebugSession implements IDebugSession, IDisposable {
 					}
 
 					const focusedStackFrame = this.debugService.getViewModel().focusedStackFrame;
-					if (!focusedStackFrame || !isFrameDeemphasized(focusedStackFrame)) {
+					if (!focusedStackFrame || isFrameDeemphasized(focusedStackFrame)) {
 						// The top stack frame can be deemphesized so try to focus again #68616
 						focus();
 					}
@@ -1521,8 +1542,8 @@ export class DebugSession implements IDebugSession, IDisposable {
 		this.repl.removeReplExpressions();
 	}
 
-	async addReplExpression(stackFrame: IStackFrame | undefined, name: string): Promise<void> {
-		await this.repl.addReplExpression(this, stackFrame, name);
+	async addReplExpression(stackFrame: IStackFrame | undefined, expression: string): Promise<void> {
+		await this.repl.addReplExpression(this, stackFrame, expression);
 		// Evaluate all watch expressions and fetch variables again since repl evaluation might have changed some.
 		this.debugService.getViewModel().updateViews();
 	}
diff --git a/src/vs/workbench/contrib/debug/browser/debugSessionPicker.ts b/src/vs/workbench/contrib/debug/browser/debugSessionPicker.ts
index 74ca56b6439..d6c6e952b84 100644
--- a/src/vs/workbench/contrib/debug/browser/debugSessionPicker.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugSessionPicker.ts
@@ -2,16 +2,16 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import * as nls from 'vs/nls';
-import { matchesFuzzy } from 'vs/base/common/filters';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { IDebugService, IDebugSession, REPL_VIEW_ID } from 'vs/workbench/contrib/debug/common/debug';
-import { IQuickInputService, IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
+import * as nls from '../../../../nls.js';
+import { matchesFuzzy } from '../../../../base/common/filters.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { IDebugService, IDebugSession, REPL_VIEW_ID } from '../common/debug.js';
+import { IQuickInputService, IQuickPickSeparator } from '../../../../platform/quickinput/common/quickInput.js';
 
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IPickerDebugItem } from 'vs/workbench/contrib/debug/common/loadedScriptsPicker';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { ICommandService } from 'vs/platform/commands/common/commands';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IPickerDebugItem } from '../common/loadedScriptsPicker.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
 
 
 export async function showDebugSessionMenu(accessor: ServicesAccessor, selectAndStartID: string) {
@@ -21,7 +21,7 @@ export async function showDebugSessionMenu(accessor: ServicesAccessor, selectAnd
 	const commandService = accessor.get(ICommandService);
 
 	const localDisposableStore = new DisposableStore();
-	const quickPick = quickInputService.createQuickPick<IPickerDebugItem>();
+	const quickPick = quickInputService.createQuickPick<IPickerDebugItem>({ useSeparators: true });
 	localDisposableStore.add(quickPick);
 	quickPick.matchOnLabel = quickPick.matchOnDescription = quickPick.matchOnDetail = quickPick.sortByLabel = false;
 	quickPick.placeholder = nls.localize('moveFocusedView.selectView', 'Search debug sessions by name');
diff --git a/src/vs/workbench/contrib/debug/browser/debugSettingMigration.ts b/src/vs/workbench/contrib/debug/browser/debugSettingMigration.ts
new file mode 100644
index 00000000000..6b87017f98d
--- /dev/null
+++ b/src/vs/workbench/contrib/debug/browser/debugSettingMigration.ts
@@ -0,0 +1,20 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Extensions, IConfigurationMigrationRegistry } from '../../../common/configuration.js';
+
+Registry.as<IConfigurationMigrationRegistry>(Extensions.ConfigurationMigration)
+	.registerConfigurationMigrations([{
+		key: 'debug.autoExpandLazyVariables',
+		migrateFn: (value: boolean) => {
+			if (value === true) {
+				return { value: 'on' };
+			} else if (value === false) {
+				return { value: 'off' };
+			}
+
+			return [];
+		}
+	}]);
diff --git a/src/vs/workbench/contrib/debug/browser/debugStatus.ts b/src/vs/workbench/contrib/debug/browser/debugStatus.ts
index 8d16f4d5494..c98e63ab7b7 100644
--- a/src/vs/workbench/contrib/debug/browser/debugStatus.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugStatus.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { IDebugService, State, IDebugConfiguration } from 'vs/workbench/contrib/debug/common/debug';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IStatusbarEntry, IStatusbarService, StatusbarAlignment, IStatusbarEntryAccessor } from 'vs/workbench/services/statusbar/browser/statusbar';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
+import * as nls from '../../../../nls.js';
+import { IDisposable, dispose } from '../../../../base/common/lifecycle.js';
+import { IDebugService, State, IDebugConfiguration } from '../common/debug.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IStatusbarEntry, IStatusbarService, StatusbarAlignment, IStatusbarEntryAccessor } from '../../../services/statusbar/browser/statusbar.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
 
 export class DebugStatusContribution implements IWorkbenchContribution {
 
@@ -66,7 +66,7 @@ export class DebugStatusContribution implements IWorkbenchContribution {
 			name: nls.localize('status.debug', "Debug"),
 			text: '$(debug-alt-small) ' + text,
 			ariaLabel: nls.localize('debugTarget', "Debug: {0}", text),
-			tooltip: nls.localize('selectAndStartDebug', "Select and start debug configuration"),
+			tooltip: nls.localize('selectAndStartDebug', "Select and Start Debug Configuration"),
 			command: 'workbench.action.debug.selectandstart'
 		};
 	}
diff --git a/src/vs/workbench/contrib/debug/browser/debugTaskRunner.ts b/src/vs/workbench/contrib/debug/browser/debugTaskRunner.ts
index 15de8bc4e40..89aa0491869 100644
--- a/src/vs/workbench/contrib/debug/browser/debugTaskRunner.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugTaskRunner.ts
@@ -3,35 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import severity from 'vs/base/common/severity';
-import { Event } from 'vs/base/common/event';
-import { Markers } from 'vs/workbench/contrib/markers/common/markers';
-import { ITaskService, ITaskSummary } from 'vs/workbench/contrib/tasks/common/taskService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IWorkspaceFolder, IWorkspace } from 'vs/platform/workspace/common/workspace';
-import { ITaskEvent, TaskEventKind, ITaskIdentifier, Task } from 'vs/workbench/contrib/tasks/common/tasks';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IMarkerService, MarkerSeverity } from 'vs/platform/markers/common/markers';
-import { IDebugConfiguration } from 'vs/workbench/contrib/debug/common/debug';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { createErrorWithActions } from 'vs/base/common/errorMessage';
-import { Action } from 'vs/base/common/actions';
-import { DEBUG_CONFIGURE_COMMAND_ID, DEBUG_CONFIGURE_LABEL } from 'vs/workbench/contrib/debug/browser/debugCommands';
-import { ICommandService } from 'vs/platform/commands/common/commands';
+import { Action } from '../../../../base/common/actions.js';
+import { disposableTimeout } from '../../../../base/common/async.js';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { createErrorWithActions } from '../../../../base/common/errorMessage.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import severity from '../../../../base/common/severity.js';
+import * as nls from '../../../../nls.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IMarkerService, MarkerSeverity } from '../../../../platform/markers/common/markers.js';
+import { IProgressService, ProgressLocation } from '../../../../platform/progress/common/progress.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IWorkspace, IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
+import { DEBUG_CONFIGURE_COMMAND_ID, DEBUG_CONFIGURE_LABEL } from './debugCommands.js';
+import { IDebugConfiguration } from '../common/debug.js';
+import { Markers } from '../../markers/common/markers.js';
+import { ConfiguringTask, CustomTask, ITaskEvent, ITaskIdentifier, Task, TaskEventKind } from '../../tasks/common/tasks.js';
+import { ITaskService, ITaskSummary } from '../../tasks/common/taskService.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
 
-function once(match: (e: ITaskEvent) => boolean, event: Event<ITaskEvent>): Event<ITaskEvent> {
-	return (listener, thisArgs = null, disposables?) => {
-		const result = event(e => {
-			if (match(e)) {
-				result.dispose();
-				return listener.call(thisArgs, e);
-			}
-		}, null, disposables);
-		return result;
-	};
-}
+const onceFilter = (event: Event<ITaskEvent>, filter: (e: ITaskEvent) => boolean) => Event.once(Event.filter(event, filter));
 
 export const enum TaskRunResult {
 	Failure,
@@ -39,10 +33,17 @@ export const enum TaskRunResult {
 }
 
 const DEBUG_TASK_ERROR_CHOICE_KEY = 'debug.taskerrorchoice';
+const ABORT_LABEL = nls.localize('abort', "Abort");
+const DEBUG_ANYWAY_LABEL = nls.localize({ key: 'debugAnyway', comment: ['&& denotes a mnemonic'] }, "&&Debug Anyway");
+const DEBUG_ANYWAY_LABEL_NO_MEMO = nls.localize('debugAnywayNoMemo', "Debug Anyway");
 
-export class DebugTaskRunner {
+interface IRunnerTaskSummary extends ITaskSummary {
+	cancelled?: boolean;
+}
 
-	private canceled = false;
+export class DebugTaskRunner implements IDisposable {
+
+	private globalCancellation = new CancellationTokenSource();
 
 	constructor(
 		@ITaskService private readonly taskService: ITaskService,
@@ -51,18 +52,26 @@ export class DebugTaskRunner {
 		@IViewsService private readonly viewsService: IViewsService,
 		@IDialogService private readonly dialogService: IDialogService,
 		@IStorageService private readonly storageService: IStorageService,
-		@ICommandService private readonly commandService: ICommandService
+		@ICommandService private readonly commandService: ICommandService,
+		@IProgressService private readonly progressService: IProgressService,
 	) { }
 
 	cancel(): void {
-		this.canceled = true;
+		this.globalCancellation.dispose(true);
+		this.globalCancellation = new CancellationTokenSource();
 	}
 
-	async runTaskAndCheckErrors(root: IWorkspaceFolder | IWorkspace | undefined, taskId: string | ITaskIdentifier | undefined): Promise<TaskRunResult> {
+	public dispose(): void {
+		this.globalCancellation.dispose(true);
+	}
+
+	async runTaskAndCheckErrors(
+		root: IWorkspaceFolder | IWorkspace | undefined,
+		taskId: string | ITaskIdentifier | undefined,
+	): Promise<TaskRunResult> {
 		try {
-			this.canceled = false;
-			const taskSummary = await this.runTask(root, taskId);
-			if (this.canceled || (taskSummary && taskSummary.exitCode === undefined)) {
+			const taskSummary = await this.runTask(root, taskId, this.globalCancellation.token);
+			if (taskSummary && (taskSummary.exitCode === undefined || taskSummary.cancelled)) {
 				// User canceled, either debugging, or the prelaunch task
 				return TaskRunResult.Failure;
 			}
@@ -101,7 +110,7 @@ export class DebugTaskRunner {
 				message,
 				buttons: [
 					{
-						label: nls.localize({ key: 'debugAnyway', comment: ['&& denotes a mnemonic'] }, "&&Debug Anyway"),
+						label: DEBUG_ANYWAY_LABEL,
 						run: () => DebugChoice.DebugAnyway
 					},
 					{
@@ -110,7 +119,7 @@ export class DebugTaskRunner {
 					}
 				],
 				cancelButton: {
-					label: nls.localize('abort', "Abort"),
+					label: ABORT_LABEL,
 					run: () => DebugChoice.Cancel
 				},
 				checkbox: {
@@ -182,7 +191,7 @@ export class DebugTaskRunner {
 		}
 	}
 
-	async runTask(root: IWorkspace | IWorkspaceFolder | undefined, taskId: string | ITaskIdentifier | undefined): Promise<ITaskSummary | null> {
+	async runTask(root: IWorkspace | IWorkspaceFolder | undefined, taskId: string | ITaskIdentifier | undefined, token = this.globalCancellation.token): Promise<IRunnerTaskSummary | null> {
 		if (!taskId) {
 			return Promise.resolve(null);
 		}
@@ -200,23 +209,42 @@ export class DebugTaskRunner {
 
 		// If a task is missing the problem matcher the promise will never complete, so we need to have a workaround #35340
 		let taskStarted = false;
+		const store = new DisposableStore();
 		const getTaskKey = (t: Task) => t.getKey() ?? t.getMapKey();
 		const taskKey = getTaskKey(task);
-		const inactivePromise: Promise<ITaskSummary | null> = new Promise((c) => once(e => {
-			// When a task isBackground it will go inactive when it is safe to launch.
-			// But when a background task is terminated by the user, it will also fire an inactive event.
-			// This means that we will not get to see the real exit code from running the task (undefined when terminated by the user).
-			// Catch the ProcessEnded event here, which occurs before inactive, and capture the exit code to prevent this.
-			return (e.kind === TaskEventKind.Inactive
-				|| (e.kind === TaskEventKind.ProcessEnded && e.exitCode === undefined))
-				&& getTaskKey(e.__task) === taskKey;
-		}, this.taskService.onDidStateChange)(e => {
-			taskStarted = true;
-			c(e.kind === TaskEventKind.ProcessEnded ? { exitCode: e.exitCode } : null);
-		}));
+		const inactivePromise: Promise<ITaskSummary | null> = new Promise((resolve) => store.add(
+			onceFilter(this.taskService.onDidStateChange, e => {
+				// When a task isBackground it will go inactive when it is safe to launch.
+				// But when a background task is terminated by the user, it will also fire an inactive event.
+				// This means that we will not get to see the real exit code from running the task (undefined when terminated by the user).
+				// Catch the ProcessEnded event here, which occurs before inactive, and capture the exit code to prevent this.
+				return (e.kind === TaskEventKind.Inactive
+					|| (e.kind === TaskEventKind.ProcessEnded && e.exitCode === undefined))
+					&& getTaskKey(e.__task) === taskKey;
+			})(e => {
+				taskStarted = true;
+				resolve(e.kind === TaskEventKind.ProcessEnded ? { exitCode: e.exitCode } : null);
+			}),
+		));
 
-		const promise: Promise<ITaskSummary | null> = this.taskService.getActiveTasks().then(async (tasks): Promise<ITaskSummary | null> => {
+		store.add(
+			onceFilter(this.taskService.onDidStateChange, e => ((e.kind === TaskEventKind.Active) || (e.kind === TaskEventKind.DependsOnStarted)) && getTaskKey(e.__task) === taskKey
+			)(() => {
+				// Task is active, so everything seems to be fine, no need to prompt after 10 seconds
+				// Use case being a slow running task should not be prompted even though it takes more than 10 seconds
+				taskStarted = true;
+			})
+		);
+
+		const didAcquireInput = store.add(new Emitter<void>());
+		store.add(onceFilter(
+			this.taskService.onDidStateChange,
+			e => (e.kind === TaskEventKind.AcquiredInput) && getTaskKey(e.__task) === taskKey
+		)(() => didAcquireInput.fire()));
+
+		const taskDonePromise: Promise<ITaskSummary | null> = this.taskService.getActiveTasks().then(async (tasks): Promise<ITaskSummary | null> => {
 			if (tasks.find(t => getTaskKey(t) === taskKey)) {
+				didAcquireInput.fire();
 				// Check that the task isn't busy and if it is, wait for it
 				const busyTasks = await this.taskService.getBusyTasks();
 				if (busyTasks.find(t => getTaskKey(t) === taskKey)) {
@@ -226,11 +254,7 @@ export class DebugTaskRunner {
 				// task is already running and isn't busy - nothing to do.
 				return Promise.resolve(null);
 			}
-			once(e => ((e.kind === TaskEventKind.Active) || (e.kind === TaskEventKind.DependsOnStarted)) && getTaskKey(e.__task) === taskKey, this.taskService.onDidStateChange)(() => {
-				// Task is active, so everything seems to be fine, no need to prompt after 10 seconds
-				// Use case being a slow running task should not be prompted even though it takes more than 10 seconds
-				taskStarted = true;
-			});
+
 			const taskPromise = this.taskService.run(task);
 			if (task.configurationProperties.isBackground) {
 				return inactivePromise;
@@ -239,28 +263,59 @@ export class DebugTaskRunner {
 			return taskPromise.then(x => x ?? null);
 		});
 
-		return new Promise((c, e) => {
-			const waitForInput = new Promise<void>(resolve => once(e => (e.kind === TaskEventKind.AcquiredInput) && getTaskKey(e.__task) === taskKey, this.taskService.onDidStateChange)(() => {
-				resolve();
+		const result = new Promise<IRunnerTaskSummary | null>((resolve, reject) => {
+			taskDonePromise.then(result => {
+				taskStarted = true;
+				resolve(result);
+			}, error => reject(error));
+
+			store.add(token.onCancellationRequested(() => {
+				resolve({ exitCode: undefined, cancelled: true });
+				this.taskService.terminate(task).catch(() => { });
 			}));
 
-			promise.then(result => {
-				taskStarted = true;
-				c(result);
-			}, error => e(error));
-
-			waitForInput.then(() => {
+			// Start the timeouts once a terminal has been acquired
+			store.add(didAcquireInput.event(() => {
 				const waitTime = task.configurationProperties.isBackground ? 5000 : 10000;
 
-				setTimeout(() => {
+				// Error shown if there's a background task with no problem matcher that doesn't exit quickly
+				store.add(disposableTimeout(() => {
 					if (!taskStarted) {
-						const errorMessage = typeof taskId === 'string'
-							? nls.localize('taskNotTrackedWithTaskId', "The task '{0}' cannot be tracked. Make sure to have a problem matcher defined.", taskId)
-							: nls.localize('taskNotTracked', "The task '{0}' cannot be tracked. Make sure to have a problem matcher defined.", JSON.stringify(taskId));
-						e({ severity: severity.Error, message: errorMessage });
+						const errorMessage = nls.localize('taskNotTracked', "The task '{0}' has not exited and doesn't have a 'problemMatcher' defined. Make sure to define a problem matcher for watch tasks.", typeof taskId === 'string' ? taskId : JSON.stringify(taskId));
+						reject({ severity: severity.Error, message: errorMessage });
 					}
-				}, waitTime);
-			});
+				}, waitTime));
+
+				// Notification shown on any task taking a while to resolve
+				store.add(disposableTimeout(() => {
+					const message = nls.localize('runningTask', "Waiting for preLaunchTask '{0}'...", task.configurationProperties.name);
+					const buttons = [DEBUG_ANYWAY_LABEL_NO_MEMO, ABORT_LABEL];
+					const canConfigure = task instanceof CustomTask || task instanceof ConfiguringTask;
+					if (canConfigure) {
+						buttons.splice(1, 0, nls.localize('configureTask', "Configure Task"));
+					}
+
+					this.progressService.withProgress(
+						{ location: ProgressLocation.Notification, title: message, buttons },
+						() => result.catch(() => { }),
+						(choice) => {
+							if (choice === undefined) {
+								// no-op, keep waiting
+							} else if (choice === 0) { // debug anyway
+								resolve({ exitCode: 0 });
+							} else { // abort or configure
+								resolve({ exitCode: undefined, cancelled: true });
+								this.taskService.terminate(task).catch(() => { });
+								if (canConfigure && choice === 1) { // configure
+									this.taskService.openConfig(task as CustomTask);
+								}
+							}
+						}
+					);
+				}, 10_000));
+			}));
 		});
+
+		return result.finally(() => store.dispose());
 	}
 }
diff --git a/src/vs/workbench/contrib/debug/browser/debugTitle.ts b/src/vs/workbench/contrib/debug/browser/debugTitle.ts
index 40716fb747d..f4e223fb46b 100644
--- a/src/vs/workbench/contrib/debug/browser/debugTitle.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugTitle.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IDebugService, State } from 'vs/workbench/contrib/debug/common/debug';
-import { dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { ITitleService } from 'vs/workbench/services/title/browser/titleService';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IDebugService, State } from '../common/debug.js';
+import { dispose, IDisposable } from '../../../../base/common/lifecycle.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { ITitleService } from '../../../services/title/browser/titleService.js';
 
 export class DebugTitleContribution implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/contrib/debug/browser/debugToolBar.ts b/src/vs/workbench/contrib/debug/browser/debugToolBar.ts
index 4bae5574e46..bf1bb46d9e1 100644
--- a/src/vs/workbench/contrib/debug/browser/debugToolBar.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugToolBar.ts
@@ -3,44 +3,43 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { ActionBar, ActionsOrientation, IActionViewItem } from 'vs/base/browser/ui/actionbar/actionbar';
-import { Action, IAction, IRunEvent, WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from 'vs/base/common/actions';
-import * as arrays from 'vs/base/common/arrays';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import * as errors from 'vs/base/common/errors';
-import { DisposableStore, dispose, IDisposable, markAsSingleton, MutableDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import 'vs/css!./media/debugToolBar';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { localize } from 'vs/nls';
-import { ICommandAction, ICommandActionTitle } from 'vs/platform/action/common/action';
-import { DropdownWithPrimaryActionViewItem, IDropdownWithPrimaryActionViewItemOptions } from 'vs/platform/actions/browser/dropdownWithPrimaryActionViewItem';
-import { createActionViewItem, createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IMenu, IMenuService, MenuId, MenuItemAction, MenuRegistry } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr, ContextKeyExpression, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { widgetBorder, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
-import { IThemeService, Themable } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { FocusSessionActionViewItem } from 'vs/workbench/contrib/debug/browser/debugActionViewItems';
-import { debugToolBarBackground, debugToolBarBorder } from 'vs/workbench/contrib/debug/browser/debugColors';
-import { CONTINUE_ID, CONTINUE_LABEL, DISCONNECT_AND_SUSPEND_ID, DISCONNECT_AND_SUSPEND_LABEL, DISCONNECT_ID, DISCONNECT_LABEL, FOCUS_SESSION_ID, FOCUS_SESSION_LABEL, PAUSE_ID, PAUSE_LABEL, RESTART_LABEL, RESTART_SESSION_ID, REVERSE_CONTINUE_ID, STEP_BACK_ID, STEP_INTO_ID, STEP_INTO_LABEL, STEP_OUT_ID, STEP_OUT_LABEL, STEP_OVER_ID, STEP_OVER_LABEL, STOP_ID, STOP_LABEL } from 'vs/workbench/contrib/debug/browser/debugCommands';
-import * as icons from 'vs/workbench/contrib/debug/browser/debugIcons';
-import { CONTEXT_DEBUG_STATE, CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG, CONTEXT_IN_DEBUG_MODE, CONTEXT_MULTI_SESSION_DEBUG, CONTEXT_STEP_BACK_SUPPORTED, CONTEXT_SUSPEND_DEBUGGEE_SUPPORTED, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED, IDebugConfiguration, IDebugService, State, VIEWLET_ID } from 'vs/workbench/contrib/debug/common/debug';
-import { EditorTabsMode, IWorkbenchLayoutService, LayoutSettings, Parts } from 'vs/workbench/services/layout/browser/layoutService';
-import { Codicon } from 'vs/base/common/codicons';
-import { CodeWindow, mainWindow } from 'vs/base/browser/window';
-import { clamp } from 'vs/base/common/numbers';
-import { PixelRatio } from 'vs/base/browser/pixelRatio';
-import { IBaseActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
+import * as dom from '../../../../base/browser/dom.js';
+import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
+import { ActionBar, ActionsOrientation, IActionViewItem } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { Action, IAction, IRunEvent, WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from '../../../../base/common/actions.js';
+import * as arrays from '../../../../base/common/arrays.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import * as errors from '../../../../base/common/errors.js';
+import { DisposableStore, dispose, IDisposable, markAsSingleton, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import './media/debugToolBar.css';
+import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
+import { localize } from '../../../../nls.js';
+import { ICommandAction, ICommandActionTitle } from '../../../../platform/action/common/action.js';
+import { DropdownWithPrimaryActionViewItem, IDropdownWithPrimaryActionViewItemOptions } from '../../../../platform/actions/browser/dropdownWithPrimaryActionViewItem.js';
+import { createActionViewItem, createAndFillInActionBarActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IMenu, IMenuService, MenuId, MenuItemAction, MenuRegistry } from '../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr, ContextKeyExpression, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { widgetBorder, widgetShadow } from '../../../../platform/theme/common/colorRegistry.js';
+import { IThemeService, Themable } from '../../../../platform/theme/common/themeService.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { FocusSessionActionViewItem } from './debugActionViewItems.js';
+import { debugToolBarBackground, debugToolBarBorder } from './debugColors.js';
+import { CONTINUE_ID, CONTINUE_LABEL, DISCONNECT_AND_SUSPEND_ID, DISCONNECT_AND_SUSPEND_LABEL, DISCONNECT_ID, DISCONNECT_LABEL, FOCUS_SESSION_ID, FOCUS_SESSION_LABEL, PAUSE_ID, PAUSE_LABEL, RESTART_LABEL, RESTART_SESSION_ID, REVERSE_CONTINUE_ID, STEP_BACK_ID, STEP_INTO_ID, STEP_INTO_LABEL, STEP_OUT_ID, STEP_OUT_LABEL, STEP_OVER_ID, STEP_OVER_LABEL, STOP_ID, STOP_LABEL } from './debugCommands.js';
+import * as icons from './debugIcons.js';
+import { CONTEXT_DEBUG_STATE, CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG, CONTEXT_IN_DEBUG_MODE, CONTEXT_MULTI_SESSION_DEBUG, CONTEXT_STEP_BACK_SUPPORTED, CONTEXT_SUSPEND_DEBUGGEE_SUPPORTED, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED, IDebugConfiguration, IDebugService, State, VIEWLET_ID } from '../common/debug.js';
+import { EditorTabsMode, IWorkbenchLayoutService, LayoutSettings, Parts } from '../../../services/layout/browser/layoutService.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { CodeWindow, mainWindow } from '../../../../base/browser/window.js';
+import { clamp } from '../../../../base/common/numbers.js';
+import { PixelRatio } from '../../../../base/browser/pixelRatio.js';
+import { IBaseActionViewItemOptions } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
 
 const DEBUG_TOOLBAR_POSITION_KEY = 'debug.actionswidgetposition';
 const DEBUG_TOOLBAR_Y_KEY = 'debug.actionswidgety';
@@ -349,11 +348,10 @@ export function createDisconnectMenuItemAction(action: MenuItemAction, disposabl
 	const menuService = accessor.get(IMenuService);
 	const contextKeyService = accessor.get(IContextKeyService);
 	const instantiationService = accessor.get(IInstantiationService);
-	const contextMenuService = accessor.get(IContextMenuService);
 
-	const menu = menuService.createMenu(MenuId.DebugToolBarStop, contextKeyService);
+	const menu = menuService.getMenuActions(MenuId.DebugToolBarStop, contextKeyService, { shouldForwardArgs: true });
 	const secondary: IAction[] = [];
-	createAndFillInActionBarActions(menu, { shouldForwardArgs: true }, secondary);
+	createAndFillInActionBarActions(menu, secondary);
 
 	if (!secondary.length) {
 		return undefined;
@@ -365,7 +363,6 @@ export function createDisconnectMenuItemAction(action: MenuItemAction, disposabl
 		dropdownAction,
 		secondary,
 		'debug-stop-actions',
-		contextMenuService,
 		options);
 	return item;
 }
diff --git a/src/vs/workbench/contrib/debug/browser/debugViewlet.ts b/src/vs/workbench/contrib/debug/browser/debugViewlet.ts
index f76fda301fd..dc205a0093b 100644
--- a/src/vs/workbench/contrib/debug/browser/debugViewlet.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugViewlet.ts
@@ -3,37 +3,37 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IActionViewItem } from 'vs/base/browser/ui/actionbar/actionbar';
-import { IAction } from 'vs/base/common/actions';
-import { DisposableStore, dispose, IDisposable } from 'vs/base/common/lifecycle';
-import 'vs/css!./media/debugViewlet';
-import * as nls from 'vs/nls';
-import { createActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { Action2, MenuId, MenuItemAction, MenuRegistry, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IProgressService } from 'vs/platform/progress/common/progress';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
-import { ViewPaneContainer, ViewsSubMenu } from 'vs/workbench/browser/parts/views/viewPaneContainer';
-import { WorkbenchStateContext } from 'vs/workbench/common/contextkeys';
-import { IViewDescriptorService } from 'vs/workbench/common/views';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { FocusSessionActionViewItem, StartDebugActionViewItem } from 'vs/workbench/contrib/debug/browser/debugActionViewItems';
-import { DEBUG_CONFIGURE_COMMAND_ID, DEBUG_CONFIGURE_LABEL, DEBUG_START_COMMAND_ID, DEBUG_START_LABEL, DISCONNECT_ID, FOCUS_SESSION_ID, SELECT_AND_START_ID, STOP_ID } from 'vs/workbench/contrib/debug/browser/debugCommands';
-import { debugConfigure } from 'vs/workbench/contrib/debug/browser/debugIcons';
-import { createDisconnectMenuItemAction } from 'vs/workbench/contrib/debug/browser/debugToolBar';
-import { WelcomeView } from 'vs/workbench/contrib/debug/browser/welcomeView';
-import { BREAKPOINTS_VIEW_ID, CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DEBUG_STATE, CONTEXT_DEBUG_UX, CONTEXT_DEBUG_UX_KEY, getStateLabel, IDebugService, ILaunch, REPL_VIEW_ID, State, VIEWLET_ID } from 'vs/workbench/contrib/debug/common/debug';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
-import { IBaseActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
+import { IActionViewItem } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { IAction } from '../../../../base/common/actions.js';
+import { DisposableStore, dispose, IDisposable } from '../../../../base/common/lifecycle.js';
+import './media/debugViewlet.css';
+import * as nls from '../../../../nls.js';
+import { createActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { Action2, MenuId, MenuItemAction, MenuRegistry, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService, IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IProgressService } from '../../../../platform/progress/common/progress.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { ViewPane } from '../../../browser/parts/views/viewPane.js';
+import { ViewPaneContainer, ViewsSubMenu } from '../../../browser/parts/views/viewPaneContainer.js';
+import { WorkbenchStateContext } from '../../../common/contextkeys.js';
+import { IViewDescriptorService } from '../../../common/views.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { FocusSessionActionViewItem, StartDebugActionViewItem } from './debugActionViewItems.js';
+import { DEBUG_CONFIGURE_COMMAND_ID, DEBUG_CONFIGURE_LABEL, DEBUG_START_COMMAND_ID, DEBUG_START_LABEL, DISCONNECT_ID, FOCUS_SESSION_ID, SELECT_AND_START_ID, STOP_ID } from './debugCommands.js';
+import { debugConfigure } from './debugIcons.js';
+import { createDisconnectMenuItemAction } from './debugToolBar.js';
+import { WelcomeView } from './welcomeView.js';
+import { BREAKPOINTS_VIEW_ID, CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DEBUG_STATE, CONTEXT_DEBUG_UX, CONTEXT_DEBUG_UX_KEY, getStateLabel, IDebugService, ILaunch, REPL_VIEW_ID, State, VIEWLET_ID } from '../common/debug.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
+import { IBaseActionViewItemOptions } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
 
 export class DebugViewPaneContainer extends ViewPaneContainer {
 
diff --git a/src/vs/workbench/contrib/debug/browser/disassemblyView.ts b/src/vs/workbench/contrib/debug/browser/disassemblyView.ts
index 92f139a3721..c98e35153df 100644
--- a/src/vs/workbench/contrib/debug/browser/disassemblyView.ts
+++ b/src/vs/workbench/contrib/debug/browser/disassemblyView.ts
@@ -3,46 +3,46 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { PixelRatio } from 'vs/base/browser/pixelRatio';
-import { $, Dimension, addStandardDisposableListener, append } from 'vs/base/browser/dom';
-import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
-import { ITableRenderer, ITableVirtualDelegate } from 'vs/base/browser/ui/table/table';
-import { binarySearch2 } from 'vs/base/common/arrays';
-import { Color } from 'vs/base/common/color';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { isAbsolute } from 'vs/base/common/path';
-import { Constants } from 'vs/base/common/uint';
-import { URI } from 'vs/base/common/uri';
-import { applyFontInfo } from 'vs/editor/browser/config/domFontInfo';
-import { isCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { BareFontInfo } from 'vs/editor/common/config/fontInfo';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { StringBuilder } from 'vs/editor/common/core/stringBuilder';
-import { ITextModel } from 'vs/editor/common/model';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { localize } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { TextEditorSelectionRevealType } from 'vs/platform/editor/common/editor';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { WorkbenchTable } from 'vs/platform/list/browser/listService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { editorBackground } from 'vs/platform/theme/common/colorRegistry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { focusedStackFrameColor, topStackFrameColor } from 'vs/workbench/contrib/debug/browser/callStackEditorContribution';
-import * as icons from 'vs/workbench/contrib/debug/browser/debugIcons';
-import { CONTEXT_LANGUAGE_SUPPORTS_DISASSEMBLE_REQUEST, DISASSEMBLY_VIEW_ID, IDebugConfiguration, IDebugService, IDebugSession, IInstructionBreakpoint, State } from 'vs/workbench/contrib/debug/common/debug';
-import { InstructionBreakpoint } from 'vs/workbench/contrib/debug/common/debugModel';
-import { getUriFromSource } from 'vs/workbench/contrib/debug/common/debugSource';
-import { isUri, sourcesEqual } from 'vs/workbench/contrib/debug/common/debugUtils';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
+import { PixelRatio } from '../../../../base/browser/pixelRatio.js';
+import { $, Dimension, addStandardDisposableListener, append } from '../../../../base/browser/dom.js';
+import { IListAccessibilityProvider } from '../../../../base/browser/ui/list/listWidget.js';
+import { ITableRenderer, ITableVirtualDelegate } from '../../../../base/browser/ui/table/table.js';
+import { binarySearch2 } from '../../../../base/common/arrays.js';
+import { Color } from '../../../../base/common/color.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable, IDisposable, dispose } from '../../../../base/common/lifecycle.js';
+import { isAbsolute } from '../../../../base/common/path.js';
+import { Constants } from '../../../../base/common/uint.js';
+import { URI } from '../../../../base/common/uri.js';
+import { applyFontInfo } from '../../../../editor/browser/config/domFontInfo.js';
+import { isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { BareFontInfo } from '../../../../editor/common/config/fontInfo.js';
+import { IRange, Range } from '../../../../editor/common/core/range.js';
+import { StringBuilder } from '../../../../editor/common/core/stringBuilder.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { localize } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { TextEditorSelectionRevealType } from '../../../../platform/editor/common/editor.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { WorkbenchTable } from '../../../../platform/list/browser/listService.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { editorBackground } from '../../../../platform/theme/common/colorRegistry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { EditorPane } from '../../../browser/parts/editor/editorPane.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { focusedStackFrameColor, topStackFrameColor } from './callStackEditorContribution.js';
+import * as icons from './debugIcons.js';
+import { CONTEXT_LANGUAGE_SUPPORTS_DISASSEMBLE_REQUEST, DISASSEMBLY_VIEW_ID, IDebugConfiguration, IDebugService, IDebugSession, IInstructionBreakpoint, State } from '../common/debug.js';
+import { InstructionBreakpoint } from '../common/debugModel.js';
+import { getUriFromSource } from '../common/debugSource.js';
+import { isUri, sourcesEqual } from '../common/debugUtils.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IEditorGroup } from '../../../services/editor/common/editorGroupsService.js';
 
 interface IDisassembledInstructionEntry {
 	allowBreakpoint: boolean;
@@ -247,6 +247,8 @@ export class DisassemblyView extends EditorPane {
 			}
 		)) as WorkbenchTable<IDisassembledInstructionEntry>;
 
+		this._disassembledInstructions.domNode.classList.add('disassembly-view');
+
 		if (this.focusedInstructionReference) {
 			this.reloadDisassembly(this.focusedInstructionReference, 0);
 		}
@@ -661,8 +663,7 @@ class BreakpointRenderer implements ITableRenderer<IDisassembledInstructionEntry
 		// align from the bottom so that it lines up with instruction when source code is present.
 		container.style.alignSelf = 'flex-end';
 
-		const icon = append(container, $('.disassembly-view'));
-		icon.classList.add('codicon');
+		const icon = append(container, $('.codicon'));
 		icon.style.display = 'flex';
 		icon.style.alignItems = 'center';
 		icon.style.justifyContent = 'center';
diff --git a/src/vs/workbench/contrib/debug/browser/exceptionWidget.ts b/src/vs/workbench/contrib/debug/browser/exceptionWidget.ts
index 1b920801dec..35479f2cef7 100644
--- a/src/vs/workbench/contrib/debug/browser/exceptionWidget.ts
+++ b/src/vs/workbench/contrib/debug/browser/exceptionWidget.ts
@@ -3,28 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/exceptionWidget';
-import * as nls from 'vs/nls';
-import * as dom from 'vs/base/browser/dom';
-import { ZoneWidget } from 'vs/editor/contrib/zoneWidget/browser/zoneWidget';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IExceptionInfo, IDebugSession, IDebugEditorContribution, EDITOR_CONTRIBUTION_ID } from 'vs/workbench/contrib/debug/common/debug';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { IThemeService, IColorTheme } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { Color } from 'vs/base/common/color';
-import { registerColor } from 'vs/platform/theme/common/colorRegistry';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { LinkDetector } from 'vs/workbench/contrib/debug/browser/linkDetector';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { Action } from 'vs/base/common/actions';
-import { widgetClose } from 'vs/platform/theme/common/iconRegistry';
+import './media/exceptionWidget.css';
+import * as nls from '../../../../nls.js';
+import * as dom from '../../../../base/browser/dom.js';
+import { ZoneWidget } from '../../../../editor/contrib/zoneWidget/browser/zoneWidget.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { IExceptionInfo, IDebugSession, IDebugEditorContribution, EDITOR_CONTRIBUTION_ID } from '../common/debug.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { IThemeService, IColorTheme } from '../../../../platform/theme/common/themeService.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { Color } from '../../../../base/common/color.js';
+import { registerColor } from '../../../../platform/theme/common/colorRegistry.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { DebugLinkHoverBehavior, LinkDetector } from './linkDetector.js';
+import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
+import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { Action } from '../../../../base/common/actions.js';
+import { widgetClose } from '../../../../platform/theme/common/iconRegistry.js';
 const $ = dom.$;
 
 // theming
 
-const debugExceptionWidgetBorder = registerColor('debugExceptionWidget.border', { dark: '#a31515', light: '#a31515', hcDark: '#a31515', hcLight: '#a31515' }, nls.localize('debugExceptionWidgetBorder', 'Exception widget border color.'));
+const debugExceptionWidgetBorder = registerColor('debugExceptionWidget.border', '#a31515', nls.localize('debugExceptionWidgetBorder', 'Exception widget border color.'));
 const debugExceptionWidgetBackground = registerColor('debugExceptionWidget.background', { dark: '#420b0d', light: '#f1dfde', hcDark: '#420b0d', hcLight: '#f1dfde' }, nls.localize('debugExceptionWidgetBackground', 'Exception widget background color.'));
 
 export class ExceptionWidget extends ZoneWidget {
@@ -98,7 +98,7 @@ export class ExceptionWidget extends ZoneWidget {
 		if (this.exceptionInfo.details && this.exceptionInfo.details.stackTrace) {
 			const stackTrace = $('.stack-trace');
 			const linkDetector = this.instantiationService.createInstance(LinkDetector);
-			const linkedStackTrace = linkDetector.linkify(this.exceptionInfo.details.stackTrace, true, this.debugSession ? this.debugSession.root : undefined);
+			const linkedStackTrace = linkDetector.linkify(this.exceptionInfo.details.stackTrace, true, this.debugSession ? this.debugSession.root : undefined, undefined, { type: DebugLinkHoverBehavior.Rich, store: this._disposables });
 			stackTrace.appendChild(linkedStackTrace);
 			dom.append(container, stackTrace);
 			ariaLabel += ', ' + this.exceptionInfo.details.stackTrace;
diff --git a/src/vs/workbench/contrib/debug/browser/extensionHostDebugService.ts b/src/vs/workbench/contrib/debug/browser/extensionHostDebugService.ts
index 08449bd2cd7..4cd6bb2b089 100644
--- a/src/vs/workbench/contrib/debug/browser/extensionHostDebugService.ts
+++ b/src/vs/workbench/contrib/debug/browser/extensionHostDebugService.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { IChannel } from 'vs/base/parts/ipc/common/ipc';
-import { IExtensionHostDebugService, IOpenExtensionWindowResult } from 'vs/platform/debug/common/extensionHostDebug';
-import { ExtensionHostDebugBroadcastChannel, ExtensionHostDebugChannelClient } from 'vs/platform/debug/common/extensionHostDebugIpc';
-import { IFileService } from 'vs/platform/files/common/files';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { isFolderToOpen, isWorkspaceToOpen } from 'vs/platform/window/common/window';
-import { IWorkspaceContextService, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, toWorkspaceIdentifier, hasWorkspaceFileExtension } from 'vs/platform/workspace/common/workspace';
-import { IWorkspace, IWorkspaceProvider } from 'vs/workbench/browser/web.api';
-import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
+import { Event } from '../../../../base/common/event.js';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
+import { IChannel } from '../../../../base/parts/ipc/common/ipc.js';
+import { IExtensionHostDebugService, IOpenExtensionWindowResult } from '../../../../platform/debug/common/extensionHostDebug.js';
+import { ExtensionHostDebugBroadcastChannel, ExtensionHostDebugChannelClient } from '../../../../platform/debug/common/extensionHostDebugIpc.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { isFolderToOpen, isWorkspaceToOpen } from '../../../../platform/window/common/window.js';
+import { IWorkspaceContextService, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, toWorkspaceIdentifier, hasWorkspaceFileExtension } from '../../../../platform/workspace/common/workspace.js';
+import { IWorkspace, IWorkspaceProvider } from '../../../browser/web.api.js';
+import { IBrowserWorkbenchEnvironmentService } from '../../../services/environment/browser/environmentService.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';
 
 class BrowserExtensionHostDebugService extends ExtensionHostDebugChannelClient implements IExtensionHostDebugService {
 
diff --git a/src/vs/workbench/contrib/debug/browser/linkDetector.ts b/src/vs/workbench/contrib/debug/browser/linkDetector.ts
index 484f3286dba..98a89453a5a 100644
--- a/src/vs/workbench/contrib/debug/browser/linkDetector.ts
+++ b/src/vs/workbench/contrib/debug/browser/linkDetector.ts
@@ -3,22 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Schemas } from 'vs/base/common/network';
-import * as osPath from 'vs/base/common/path';
-import * as platform from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { localize } from 'vs/nls';
-import { ITunnelService } from 'vs/platform/tunnel/common/tunnel';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { getWindow } from 'vs/base/browser/dom';
+import { getWindow } from '../../../../base/browser/dom.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import * as osPath from '../../../../base/common/path.js';
+import * as platform from '../../../../base/common/platform.js';
+import { URI } from '../../../../base/common/uri.js';
+import { localize } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { ITunnelService } from '../../../../platform/tunnel/common/tunnel.js';
+import { IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
+import { IDebugSession } from '../common/debug.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { IPathService } from '../../../services/path/common/pathService.js';
 
 const CONTROL_CODES = '\\u0000-\\u0020\\u007f-\\u009f';
 const WEB_LINK_REGEX = new RegExp('(?:[a-zA-Z][a-zA-Z0-9+.-]{2,}:\\/\\/|data:|www\\.)[^\\s' + CONTROL_CODES + '"]{2,}[^\\s' + CONTROL_CODES + '"\')}\\],:;.!?]', 'ug');
@@ -40,7 +44,28 @@ type LinkPart = {
 	captures: string[];
 };
 
-export class LinkDetector {
+export const enum DebugLinkHoverBehavior {
+	/** A nice workbench hover */
+	Rich,
+	/**
+	 * Basic browser hover
+	 * @deprecated Consumers should adopt `rich` by propagating disposables appropriately
+	 */
+	Basic,
+	/** No hover */
+	None
+}
+
+/** Store implies HoverBehavior=rich */
+export type DebugLinkHoverBehaviorTypeData = { type: DebugLinkHoverBehavior.None | DebugLinkHoverBehavior.Basic }
+	| { type: DebugLinkHoverBehavior.Rich; store: DisposableStore };
+
+export interface ILinkDetector {
+	linkify(text: string, splitLines?: boolean, workspaceFolder?: IWorkspaceFolder, includeFulltext?: boolean, hoverBehavior?: DebugLinkHoverBehaviorTypeData): HTMLElement;
+	linkifyLocation(text: string, locationReference: number, session: IDebugSession, hoverBehavior?: DebugLinkHoverBehaviorTypeData): HTMLElement;
+}
+
+export class LinkDetector implements ILinkDetector {
 	constructor(
 		@IEditorService private readonly editorService: IEditorService,
 		@IFileService private readonly fileService: IFileService,
@@ -48,7 +73,8 @@ export class LinkDetector {
 		@IPathService private readonly pathService: IPathService,
 		@ITunnelService private readonly tunnelService: ITunnelService,
 		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService,
-		@IConfigurationService private readonly configurationService: IConfigurationService
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IHoverService private readonly hoverService: IHoverService,
 	) {
 		// noop
 	}
@@ -59,8 +85,14 @@ export class LinkDetector {
 	 * 'onclick' event is attached to all anchored links that opens them in the editor.
 	 * When splitLines is true, each line of the text, even if it contains no links, is wrapped in a <span>
 	 * and added as a child of the returned <span>.
+	 * If a `hoverBehavior` is passed, hovers may be added using the workbench hover service.
+	 * This should be preferred for new code where hovers are desirable.
 	 */
-	linkify(text: string, splitLines?: boolean, workspaceFolder?: IWorkspaceFolder, includeFulltext?: boolean): HTMLElement {
+	linkify(text: string, splitLines?: boolean, workspaceFolder?: IWorkspaceFolder, includeFulltext?: boolean, hoverBehavior?: DebugLinkHoverBehaviorTypeData): HTMLElement {
+		return this._linkify(text, splitLines, workspaceFolder, includeFulltext, hoverBehavior);
+	}
+
+	private _linkify(text: string, splitLines?: boolean, workspaceFolder?: IWorkspaceFolder, includeFulltext?: boolean, hoverBehavior?: DebugLinkHoverBehaviorTypeData, defaultRef?: { locationReference: number; session: IDebugSession }): HTMLElement {
 		if (splitLines) {
 			const lines = text.split('\n');
 			for (let i = 0; i < lines.length - 1; i++) {
@@ -70,7 +102,7 @@ export class LinkDetector {
 				// Remove the last element ('') that split added.
 				lines.pop();
 			}
-			const elements = lines.map(line => this.linkify(line, false, workspaceFolder, includeFulltext));
+			const elements = lines.map(line => this._linkify(line, false, workspaceFolder, includeFulltext, hoverBehavior, defaultRef));
 			if (elements.length === 1) {
 				// Do not wrap single line with extra span.
 				return elements[0];
@@ -85,16 +117,16 @@ export class LinkDetector {
 			try {
 				switch (part.kind) {
 					case 'text':
-						container.appendChild(document.createTextNode(part.value));
+						container.appendChild(defaultRef ? this.linkifyLocation(part.value, defaultRef.locationReference, defaultRef.session, hoverBehavior) : document.createTextNode(part.value));
 						break;
 					case 'web':
-						container.appendChild(this.createWebLink(includeFulltext ? text : undefined, part.value));
+						container.appendChild(this.createWebLink(includeFulltext ? text : undefined, part.value, hoverBehavior));
 						break;
 					case 'path': {
 						const path = part.captures[0];
 						const lineNumber = part.captures[1] ? Number(part.captures[1]) : 0;
 						const columnNumber = part.captures[2] ? Number(part.captures[2]) : 0;
-						container.appendChild(this.createPathLink(includeFulltext ? text : undefined, part.value, path, lineNumber, columnNumber, workspaceFolder));
+						container.appendChild(this.createPathLink(includeFulltext ? text : undefined, part.value, path, lineNumber, columnNumber, workspaceFolder, hoverBehavior));
 						break;
 					}
 				}
@@ -105,7 +137,37 @@ export class LinkDetector {
 		return container;
 	}
 
-	private createWebLink(fulltext: string | undefined, url: string): Node {
+	/**
+	 * Linkifies a location reference.
+	 */
+	linkifyLocation(text: string, locationReference: number, session: IDebugSession, hoverBehavior?: DebugLinkHoverBehaviorTypeData) {
+		const link = this.createLink(text);
+		this.decorateLink(link, undefined, text, hoverBehavior, async (preserveFocus: boolean) => {
+			const location = await session.resolveLocationReference(locationReference);
+			await location.source.openInEditor(this.editorService, {
+				startLineNumber: location.line,
+				startColumn: location.column,
+				endLineNumber: location.endLine ?? location.line,
+				endColumn: location.endColumn ?? location.column,
+			}, preserveFocus);
+		});
+
+		return link;
+	}
+
+	/**
+	 * Makes an {@link ILinkDetector} that links everything in the output to the
+	 * reference if they don't have other explicit links.
+	 */
+	makeReferencedLinkDetector(locationReference: number, session: IDebugSession): ILinkDetector {
+		return {
+			linkify: (text, splitLines, workspaceFolder, includeFulltext, hoverBehavior) =>
+				this._linkify(text, splitLines, workspaceFolder, includeFulltext, hoverBehavior, { locationReference, session }),
+			linkifyLocation: this.linkifyLocation.bind(this),
+		};
+	}
+
+	private createWebLink(fulltext: string | undefined, url: string, hoverBehavior?: DebugLinkHoverBehaviorTypeData): Node {
 		const link = this.createLink(url);
 
 		let uri = URI.parse(url);
@@ -119,7 +181,7 @@ export class LinkDetector {
 			});
 		}
 
-		this.decorateLink(link, uri, fulltext, async () => {
+		this.decorateLink(link, uri, fulltext, hoverBehavior, async () => {
 
 			if (uri.scheme === Schemas.file) {
 				// Just using fsPath here is unsafe: https://github.com/microsoft/vscode/issues/109076
@@ -149,7 +211,7 @@ export class LinkDetector {
 		return link;
 	}
 
-	private createPathLink(fulltext: string | undefined, text: string, path: string, lineNumber: number, columnNumber: number, workspaceFolder: IWorkspaceFolder | undefined): Node {
+	private createPathLink(fulltext: string | undefined, text: string, path: string, lineNumber: number, columnNumber: number, workspaceFolder: IWorkspaceFolder | undefined, hoverBehavior?: DebugLinkHoverBehaviorTypeData): Node {
 		if (path[0] === '/' && path[1] === '/') {
 			// Most likely a url part which did not match, for example ftp://path.
 			return document.createTextNode(text);
@@ -162,7 +224,7 @@ export class LinkDetector {
 			}
 			const uri = workspaceFolder.toResource(path);
 			const link = this.createLink(text);
-			this.decorateLink(link, uri, fulltext, (preserveFocus: boolean) => this.editorService.openEditor({ resource: uri, options: { ...options, preserveFocus } }));
+			this.decorateLink(link, uri, fulltext, hoverBehavior, (preserveFocus: boolean) => this.editorService.openEditor({ resource: uri, options: { ...options, preserveFocus } }));
 			return link;
 		}
 
@@ -180,7 +242,7 @@ export class LinkDetector {
 			if (stat.isDirectory) {
 				return;
 			}
-			this.decorateLink(link, uri, fulltext, (preserveFocus: boolean) => this.editorService.openEditor({ resource: uri, options: { ...options, preserveFocus } }));
+			this.decorateLink(link, uri, fulltext, hoverBehavior, (preserveFocus: boolean) => this.editorService.openEditor({ resource: uri, options: { ...options, preserveFocus } }));
 		}).catch(() => {
 			// If the uri can not be resolved we should not spam the console with error, remain quite #86587
 		});
@@ -193,12 +255,19 @@ export class LinkDetector {
 		return link;
 	}
 
-	private decorateLink(link: HTMLElement, uri: URI, fulltext: string | undefined, onClick: (preserveFocus: boolean) => void) {
+	private decorateLink(link: HTMLElement, uri: URI | undefined, fulltext: string | undefined, hoverBehavior: DebugLinkHoverBehaviorTypeData | undefined, onClick: (preserveFocus: boolean) => void) {
 		link.classList.add('link');
-		const followLink = this.tunnelService.canTunnel(uri) ? localize('followForwardedLink', "follow link using forwarded port") : localize('followLink', "follow link");
-		link.title = fulltext
+		const followLink = uri && this.tunnelService.canTunnel(uri) ? localize('followForwardedLink', "follow link using forwarded port") : localize('followLink', "follow link");
+		const title = link.ariaLabel = fulltext
 			? (platform.isMacintosh ? localize('fileLinkWithPathMac', "Cmd + click to {0}\n{1}", followLink, fulltext) : localize('fileLinkWithPath', "Ctrl + click to {0}\n{1}", followLink, fulltext))
 			: (platform.isMacintosh ? localize('fileLinkMac', "Cmd + click to {0}", followLink) : localize('fileLink', "Ctrl + click to {0}", followLink));
+
+		if (hoverBehavior?.type === DebugLinkHoverBehavior.Rich) {
+			hoverBehavior.store.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), link, title));
+		} else if (hoverBehavior?.type !== DebugLinkHoverBehavior.None) {
+			link.title = title;
+		}
+
 		link.onmousemove = (event) => { link.classList.toggle('pointer', platform.isMacintosh ? event.metaKey : event.ctrlKey); };
 		link.onmouseleave = () => link.classList.remove('pointer');
 		link.onclick = (event) => {
diff --git a/src/vs/workbench/contrib/debug/browser/loadedScriptsView.ts b/src/vs/workbench/contrib/debug/browser/loadedScriptsView.ts
index 4a89bd7b40a..d01452aec45 100644
--- a/src/vs/workbench/contrib/debug/browser/loadedScriptsView.ts
+++ b/src/vs/workbench/contrib/debug/browser/loadedScriptsView.ts
@@ -3,47 +3,47 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
-import { normalize, isAbsolute, posix } from 'vs/base/common/path';
-import { ViewPane, ViewAction } from 'vs/workbench/browser/parts/views/viewPane';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { renderViewTree } from 'vs/workbench/contrib/debug/browser/baseDebugView';
-import { IDebugSession, IDebugService, CONTEXT_LOADED_SCRIPTS_ITEM_TYPE, LOADED_SCRIPTS_VIEW_ID } from 'vs/workbench/contrib/debug/common/debug';
-import { Source } from 'vs/workbench/contrib/debug/common/debugSource';
-import { IWorkspaceContextService, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { IContextKey, IContextKeyService, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { normalizeDriveLetter, tildify } from 'vs/base/common/labels';
-import { isWindows } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { ltrim } from 'vs/base/common/strings';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { ResourceLabels, IResourceLabelProps, IResourceLabelOptions, IResourceLabel } from 'vs/workbench/browser/labels';
-import { FileKind } from 'vs/platform/files/common/files';
-import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { ITreeNode, ITreeFilter, TreeVisibility, TreeFilterResult, ITreeElement } from 'vs/base/browser/ui/tree/tree';
-import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { WorkbenchCompressibleObjectTree } from 'vs/platform/list/browser/listService';
-import { dispose } from 'vs/base/common/lifecycle';
-import { createMatches, FuzzyScore } from 'vs/base/common/filters';
-import { DebugContentProvider } from 'vs/workbench/contrib/debug/common/debugContentProvider';
-import { ILabelService } from 'vs/platform/label/common/label';
-import type { ICompressedTreeNode } from 'vs/base/browser/ui/tree/compressedObjectTreeModel';
-import type { ICompressibleTreeRenderer } from 'vs/base/browser/ui/tree/objectTree';
-import { registerAction2, MenuId } from 'vs/platform/actions/common/actions';
-import { Codicon } from 'vs/base/common/codicons';
+import * as nls from '../../../../nls.js';
+import { IViewletViewOptions } from '../../../browser/parts/views/viewsViewlet.js';
+import { normalize, isAbsolute, posix } from '../../../../base/common/path.js';
+import { ViewPane, ViewAction } from '../../../browser/parts/views/viewPane.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { renderViewTree } from './baseDebugView.js';
+import { IDebugSession, IDebugService, CONTEXT_LOADED_SCRIPTS_ITEM_TYPE, LOADED_SCRIPTS_VIEW_ID } from '../common/debug.js';
+import { Source } from '../common/debugSource.js';
+import { IWorkspaceContextService, IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
+import { IContextKey, IContextKeyService, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { normalizeDriveLetter, tildify } from '../../../../base/common/labels.js';
+import { isWindows } from '../../../../base/common/platform.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ltrim } from '../../../../base/common/strings.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { ResourceLabels, IResourceLabelProps, IResourceLabelOptions, IResourceLabel } from '../../../browser/labels.js';
+import { FileKind } from '../../../../platform/files/common/files.js';
+import { IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
+import { ITreeNode, ITreeFilter, TreeVisibility, TreeFilterResult, ITreeElement } from '../../../../base/browser/ui/tree/tree.js';
+import { IListAccessibilityProvider } from '../../../../base/browser/ui/list/listWidget.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { WorkbenchCompressibleObjectTree } from '../../../../platform/list/browser/listService.js';
+import { dispose } from '../../../../base/common/lifecycle.js';
+import { createMatches, FuzzyScore } from '../../../../base/common/filters.js';
+import { DebugContentProvider } from '../common/debugContentProvider.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import type { ICompressedTreeNode } from '../../../../base/browser/ui/tree/compressedObjectTreeModel.js';
+import type { ICompressibleTreeRenderer } from '../../../../base/browser/ui/tree/objectTree.js';
+import { registerAction2, MenuId } from '../../../../platform/actions/common/actions.js';
+import { Codicon } from '../../../../base/common/codicons.js';
 
-import { IViewDescriptorService } from 'vs/workbench/common/views';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { TreeFindMode } from 'vs/base/browser/ui/tree/abstractTree';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import { IViewDescriptorService } from '../../../common/views.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IPathService } from '../../../services/path/common/pathService.js';
+import { TreeFindMode } from '../../../../base/browser/ui/tree/abstractTree.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 
 const NEW_STYLE_COMPRESS = true;
 
diff --git a/src/vs/workbench/contrib/debug/browser/media/callStackWidget.css b/src/vs/workbench/contrib/debug/browser/media/callStackWidget.css
new file mode 100644
index 00000000000..e5e0d56e15f
--- /dev/null
+++ b/src/vs/workbench/contrib/debug/browser/media/callStackWidget.css
@@ -0,0 +1,71 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.multiCallStackFrame {
+	.header {
+		display: flex;
+
+		align-items: center;
+		height: 24px;
+		background: var(--vscode-multiDiffEditor-headerBackground);
+		border-top: 1px solid var(--vscode-multiDiffEditor-border);
+		color: var(--vscode-foreground);
+		padding: 0 5px;
+	}
+
+	.title {
+		flex-grow: 1;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+
+		&[role="link"] {
+			cursor: pointer;
+		}
+
+		.monaco-icon-label::before {
+			height: auto;
+		}
+	}
+
+	&.collapsed {
+		.header {
+			border-bottom: 1px solid var(--vscode-multiDiffEditor-border);
+		}
+
+		.editorParent {
+			display: none;
+		}
+	}
+
+	.collapse-button {
+		width: 16px;
+		min-height: 1px; /* show even if empty */
+		line-height: 0;
+
+		a {
+			cursor: pointer;
+		}
+	}
+
+	.actions {
+		display: flex;
+		align-items: center;
+		gap: 8px;
+		margin-right: 12px;
+	}
+}
+
+.multiCallStackWidget {
+	.multiCallStackFrameContainer {
+		background: none !important;
+	}
+}
+
+.monaco-editor .call-stack-go-to-file-link {
+	text-decoration: underline;
+	cursor: pointer;
+	color: var(--vscode-editorLink-activeForeground) !important;
+}
diff --git a/src/vs/workbench/contrib/debug/browser/media/debug.contribution.css b/src/vs/workbench/contrib/debug/browser/media/debug.contribution.css
index b808f8b5a7c..2a8f7661cb2 100644
--- a/src/vs/workbench/contrib/debug/browser/media/debug.contribution.css
+++ b/src/vs/workbench/contrib/debug/browser/media/debug.contribution.css
@@ -59,6 +59,10 @@
 	margin: 0;
 }
 
+.debug-var-hover-pre span {
+	display: inline !important;
+}
+
 /* Do not push text with inline decoration when decoration on start of line */
 .monaco-editor .debug-top-stack-frame-column.start-of-line {
 	position: absolute;
diff --git a/src/vs/workbench/contrib/debug/browser/media/debugToolBar.css b/src/vs/workbench/contrib/debug/browser/media/debugToolBar.css
index fbe36b38c1a..fc948f97b4a 100644
--- a/src/vs/workbench/contrib/debug/browser/media/debugToolBar.css
+++ b/src/vs/workbench/contrib/debug/browser/media/debugToolBar.css
@@ -5,7 +5,7 @@
 
 .monaco-workbench .debug-toolbar {
 	position: absolute;
-	z-index: 3000;
+	z-index: 2520; /* Below quick input at 2550, above custom titlebar toolbar at 2500 */
 	height: 26px;
 	display: flex;
 	padding-left: 7px;
diff --git a/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts b/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts
index de7be37fe8f..e9abfa201ff 100644
--- a/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts
+++ b/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { Event, Emitter } from 'vs/base/common/event';
-import * as objects from 'vs/base/common/objects';
-import { toAction } from 'vs/base/common/actions';
-import * as errors from 'vs/base/common/errors';
-import { createErrorWithActions } from 'vs/base/common/errorMessage';
-import { formatPII, isUri } from 'vs/workbench/contrib/debug/common/debugUtils';
-import { IDebugAdapter, IConfig, AdapterEndEvent, IDebugger } from 'vs/workbench/contrib/debug/common/debug';
-import { IExtensionHostDebugService, IOpenExtensionWindowResult } from 'vs/platform/debug/common/extensionHostDebug';
-import { URI } from 'vs/base/common/uri';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { Schemas } from 'vs/base/common/network';
+import * as nls from '../../../../nls.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import * as objects from '../../../../base/common/objects.js';
+import { toAction } from '../../../../base/common/actions.js';
+import * as errors from '../../../../base/common/errors.js';
+import { createErrorWithActions } from '../../../../base/common/errorMessage.js';
+import { formatPII, isUri } from '../common/debugUtils.js';
+import { IDebugAdapter, IConfig, AdapterEndEvent, IDebugger } from '../common/debug.js';
+import { IExtensionHostDebugService, IOpenExtensionWindowResult } from '../../../../platform/debug/common/extensionHostDebug.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IDisposable, dispose } from '../../../../base/common/lifecycle.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { Schemas } from '../../../../base/common/network.js';
 
 /**
  * This interface represents a single command line argument split into a "prefix" and a "path" half.
@@ -484,6 +484,10 @@ export class RawDebugSession implements IDisposable {
 		return this.send<DebugProtocol.SourceResponse>('source', args);
 	}
 
+	locations(args: DebugProtocol.LocationsArguments): Promise<DebugProtocol.LocationsResponse | undefined> {
+		return this.send<DebugProtocol.LocationsResponse>('locations', args);
+	}
+
 	loadedSources(args: DebugProtocol.LoadedSourcesArguments): Promise<DebugProtocol.LoadedSourcesResponse | undefined> {
 		if (this.capabilities.supportsLoadedSourcesRequest) {
 			return this.send<DebugProtocol.LoadedSourcesResponse>('loadedSources', args);
@@ -585,7 +589,7 @@ export class RawDebugSession implements IDisposable {
 
 	//---- private
 
-	private async shutdown(error?: Error, restart = false, terminateDebuggee: boolean | undefined = undefined, suspendDebuggee: boolean | undefined = undefined): Promise<any> {
+	private async shutdown(error?: Error, restart = false, terminateDebuggee: boolean | undefined = undefined, suspendDebuggee: boolean | undefined = undefined): Promise<void> {
 		if (!this.inShutdown) {
 			this.inShutdown = true;
 			if (this.debugAdapter) {
@@ -612,7 +616,7 @@ export class RawDebugSession implements IDisposable {
 		}
 	}
 
-	private async stopAdapter(error?: Error): Promise<any> {
+	private async stopAdapter(error?: Error): Promise<void> {
 		try {
 			if (this.debugAdapter) {
 				const da = this.debugAdapter;
diff --git a/src/vs/workbench/contrib/debug/browser/repl.ts b/src/vs/workbench/contrib/debug/browser/repl.ts
index 0590a07895f..613fed3ce95 100644
--- a/src/vs/workbench/contrib/debug/browser/repl.ts
+++ b/src/vs/workbench/contrib/debug/browser/repl.ts
@@ -3,75 +3,78 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { IHistoryNavigationWidget } from 'vs/base/browser/history';
-import { IActionViewItem } from 'vs/base/browser/ui/actionbar/actionbar';
-import * as aria from 'vs/base/browser/ui/aria/aria';
-import { MOUSE_CURSOR_TEXT_CSS_CLASS_NAME } from 'vs/base/browser/ui/mouseCursor/mouseCursor';
-import { IAsyncDataSource, ITreeContextMenuEvent, ITreeNode } from 'vs/base/browser/ui/tree/tree';
-import { IAction } from 'vs/base/common/actions';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { memoize } from 'vs/base/common/decorators';
-import { Emitter } from 'vs/base/common/event';
-import { FuzzyScore } from 'vs/base/common/filters';
-import { HistoryNavigator } from 'vs/base/common/history';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { removeAnsiEscapeCodes } from 'vs/base/common/strings';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { URI as uri } from 'vs/base/common/uri';
-import 'vs/css!./media/repl';
-import { ICodeEditor, isCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, registerEditorAction } from 'vs/editor/browser/editorExtensions';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { EDITOR_FONT_DEFAULTS, EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { IDecorationOptions } from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { CompletionContext, CompletionItem, CompletionItemInsertTextRule, CompletionItemKind, CompletionItemKinds, CompletionList } from 'vs/editor/common/languages';
-import { ITextModel } from 'vs/editor/common/model';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfiguration';
-import { SuggestController } from 'vs/editor/contrib/suggest/browser/suggestController';
-import { localize, localize2 } from 'vs/nls';
-import { createAndFillInContextMenuActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { Action2, IMenu, IMenuService, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { registerAndCreateHistoryNavigationContext } from 'vs/platform/history/browser/contextScopedHistoryWidget';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { WorkbenchAsyncDataTree } from 'vs/platform/list/browser/listService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { editorForeground, resolveColorValue } from 'vs/platform/theme/common/colorRegistry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { FilterViewPane, IViewPaneOptions, ViewAction } from 'vs/workbench/browser/parts/views/viewPane';
-import { IViewDescriptorService } from 'vs/workbench/common/views';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { getSimpleCodeEditorWidgetOptions, getSimpleEditorOptions } from 'vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
-import { FocusSessionActionViewItem } from 'vs/workbench/contrib/debug/browser/debugActionViewItems';
-import { debugConsoleClearAll, debugConsoleEvaluationPrompt } from 'vs/workbench/contrib/debug/browser/debugIcons';
-import { LinkDetector } from 'vs/workbench/contrib/debug/browser/linkDetector';
-import { ReplFilter } from 'vs/workbench/contrib/debug/browser/replFilter';
-import { ReplAccessibilityProvider, ReplDataSource, ReplDelegate, ReplEvaluationInputsRenderer, ReplEvaluationResultsRenderer, ReplGroupRenderer, ReplOutputElementRenderer, ReplRawObjectsRenderer, ReplVariablesRenderer } from 'vs/workbench/contrib/debug/browser/replViewer';
-import { CONTEXT_DEBUG_STATE, CONTEXT_IN_DEBUG_REPL, CONTEXT_MULTI_SESSION_REPL, DEBUG_SCHEME, IDebugConfiguration, IDebugService, IDebugSession, IReplConfiguration, IReplElement, IReplOptions, REPL_VIEW_ID, State, getStateLabel } from 'vs/workbench/contrib/debug/common/debug';
-import { Variable } from 'vs/workbench/contrib/debug/common/debugModel';
-import { ReplEvaluationResult, ReplGroup } from 'vs/workbench/contrib/debug/common/replModel';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { registerNavigableContainer } from 'vs/workbench/browser/actions/widgetNavigationCommands';
-import { AccessibilitySignal, IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import * as dom from '../../../../base/browser/dom.js';
+import { IHistoryNavigationWidget } from '../../../../base/browser/history.js';
+import { IActionViewItem } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import * as aria from '../../../../base/browser/ui/aria/aria.js';
+import { MOUSE_CURSOR_TEXT_CSS_CLASS_NAME } from '../../../../base/browser/ui/mouseCursor/mouseCursor.js';
+import { IAsyncDataSource, ITreeContextMenuEvent, ITreeNode } from '../../../../base/browser/ui/tree/tree.js';
+import { IAction } from '../../../../base/common/actions.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { memoize } from '../../../../base/common/decorators.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { FuzzyScore } from '../../../../base/common/filters.js';
+import { HistoryNavigator } from '../../../../base/common/history.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
+import { removeAnsiEscapeCodes } from '../../../../base/common/strings.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { URI as uri } from '../../../../base/common/uri.js';
+import { ICodeEditor, isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { EditorAction, registerEditorAction } from '../../../../editor/browser/editorExtensions.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { CodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { EDITOR_FONT_DEFAULTS, EditorOption } from '../../../../editor/common/config/editorOptions.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { IDecorationOptions } from '../../../../editor/common/editorCommon.js';
+import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
+import { CompletionContext, CompletionItem, CompletionItemInsertTextRule, CompletionItemKind, CompletionItemKinds, CompletionList } from '../../../../editor/common/languages.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ITextResourcePropertiesService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { SuggestController } from '../../../../editor/contrib/suggest/browser/suggestController.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { createAndFillInContextMenuActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { Action2, IMenu, IMenuService, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { registerAndCreateHistoryNavigationContext } from '../../../../platform/history/browser/contextScopedHistoryWidget.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { WorkbenchAsyncDataTree } from '../../../../platform/list/browser/listService.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { editorForeground, resolveColorValue } from '../../../../platform/theme/common/colorRegistry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { registerNavigableContainer } from '../../../browser/actions/widgetNavigationCommands.js';
+import { FilterViewPane, IViewPaneOptions, ViewAction } from '../../../browser/parts/views/viewPane.js';
+import { IViewDescriptorService } from '../../../common/views.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
+import { AccessibilityCommandId } from '../../accessibility/common/accessibilityCommands.js';
+import { getSimpleCodeEditorWidgetOptions, getSimpleEditorOptions } from '../../codeEditor/browser/simpleEditorOptions.js';
+import { CONTEXT_DEBUG_STATE, CONTEXT_IN_DEBUG_REPL, CONTEXT_MULTI_SESSION_REPL, DEBUG_SCHEME, IDebugConfiguration, IDebugService, IDebugSession, IReplConfiguration, IReplElement, IReplOptions, REPL_VIEW_ID, State, getStateLabel } from '../common/debug.js';
+import { Variable } from '../common/debugModel.js';
+import { ReplEvaluationResult, ReplGroup } from '../common/replModel.js';
+import { FocusSessionActionViewItem } from './debugActionViewItems.js';
+import { DebugExpressionRenderer } from './debugExpressionRenderer.js';
+import { debugConsoleClearAll, debugConsoleEvaluationPrompt } from './debugIcons.js';
+import './media/repl.css';
+import { ReplFilter } from './replFilter.js';
+import { ReplAccessibilityProvider, ReplDataSource, ReplDelegate, ReplEvaluationInputsRenderer, ReplEvaluationResultsRenderer, ReplGroupRenderer, ReplOutputElementRenderer, ReplRawObjectsRenderer, ReplVariablesRenderer } from './replViewer.js';
 
 const $ = dom.$;
 
@@ -116,6 +119,8 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
 	private filter: ReplFilter;
 	private multiSessionRepl: IContextKey<boolean>;
 	private menu: IMenu;
+	private replDataSource: IAsyncDataSource<IDebugSession, IReplElement> | undefined;
+	private findIsOpen: boolean = false;
 
 	constructor(
 		options: IViewPaneOptions,
@@ -128,10 +133,10 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
 		@ICodeEditorService codeEditorService: ICodeEditorService,
 		@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
 		@IContextMenuService contextMenuService: IContextMenuService,
-		@IConfigurationService configurationService: IConfigurationService,
+		@IConfigurationService protected override readonly configurationService: IConfigurationService,
 		@ITextResourcePropertiesService private readonly textResourcePropertiesService: ITextResourcePropertiesService,
 		@IEditorService private readonly editorService: IEditorService,
-		@IKeybindingService keybindingService: IKeybindingService,
+		@IKeybindingService protected override readonly keybindingService: IKeybindingService,
 		@IOpenerService openerService: IOpenerService,
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IHoverService hoverService: IHoverService,
@@ -151,7 +156,7 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
 
 		this.menu = menuService.createMenu(MenuId.DebugConsoleContext, contextKeyService);
 		this._register(this.menu);
-		this.history = new HistoryNavigator(JSON.parse(this.storageService.get(HISTORY_STORAGE_KEY, StorageScope.WORKSPACE, '[]')), 50);
+		this.history = new HistoryNavigator(JSON.parse(this.storageService.get(HISTORY_STORAGE_KEY, StorageScope.WORKSPACE, '[]')), 100);
 		this.filter = new ReplFilter();
 		this.filter.filterQuery = filterText;
 		this.multiSessionRepl = CONTEXT_MULTI_SESSION_REPL.bindTo(contextKeyService);
@@ -205,6 +210,7 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
 				this.refreshReplElements(true);
 				if (this.styleChangedWhenInvisible) {
 					this.styleChangedWhenInvisible = false;
+					this.tree?.updateChildren(undefined, true, false);
 					this.onDidStyleChange();
 				}
 			}
@@ -345,6 +351,10 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
 		this.filterWidget.focus();
 	}
 
+	openFind(): void {
+		this.tree?.openFind();
+	}
+
 	private setMode(): void {
 		if (!this.isVisible()) {
 			return;
@@ -472,6 +482,15 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
 		}
 	}
 
+	sendReplInput(input: string): void {
+		const session = this.tree?.getInput();
+		if (session && !this.isReadonly) {
+			session.addReplExpression(this.debugService.getViewModel().focusedStackFrame, input);
+			revealLastElement(this.tree!);
+			this.history.add(input);
+		}
+	}
+
 	getVisibleContent(): string {
 		let text = '';
 		if (this.model && this.tree) {
@@ -513,10 +532,26 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
 		this.tree?.collapseAll();
 	}
 
+	getDebugSession(): IDebugSession | undefined {
+		return this.tree?.getInput();
+	}
+
 	getReplInput(): CodeEditorWidget {
 		return this.replInput;
 	}
 
+	getReplDataSource(): IAsyncDataSource<IDebugSession, IReplElement> | undefined {
+		return this.replDataSource;
+	}
+
+	getFocusedElement(): IReplElement | undefined {
+		return this.tree?.getFocus()?.[0];
+	}
+
+	focusTree(): void {
+		this.tree?.domFocus();
+	}
+
 	override focus(): void {
 		super.focus();
 		setTimeout(() => this.replInput.focus(), 0);
@@ -614,7 +649,8 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
 		this.replDelegate = new ReplDelegate(this.configurationService, this.replOptions);
 		const wordWrap = this.configurationService.getValue<IDebugConfiguration>('debug').console.wordWrap;
 		this.treeContainer.classList.toggle('word-wrap', wordWrap);
-		const linkDetector = this.instantiationService.createInstance(LinkDetector);
+		const expressionRenderer = this.instantiationService.createInstance(DebugExpressionRenderer);
+		this.replDataSource = new ReplDataSource();
 
 		const tree = this.tree = <WorkbenchAsyncDataTree<IDebugSession, IReplElement, FuzzyScore>>this.instantiationService.createInstance(
 			WorkbenchAsyncDataTree,
@@ -622,21 +658,20 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
 			this.treeContainer,
 			this.replDelegate,
 			[
-				this.instantiationService.createInstance(ReplVariablesRenderer, linkDetector),
-				this.instantiationService.createInstance(ReplOutputElementRenderer, linkDetector),
+				this.instantiationService.createInstance(ReplVariablesRenderer, expressionRenderer),
+				this.instantiationService.createInstance(ReplOutputElementRenderer, expressionRenderer),
 				new ReplEvaluationInputsRenderer(),
-				this.instantiationService.createInstance(ReplGroupRenderer, linkDetector),
-				new ReplEvaluationResultsRenderer(linkDetector, this.hoverService),
-				new ReplRawObjectsRenderer(linkDetector, this.hoverService),
+				this.instantiationService.createInstance(ReplGroupRenderer, expressionRenderer),
+				new ReplEvaluationResultsRenderer(expressionRenderer),
+				new ReplRawObjectsRenderer(expressionRenderer),
 			],
-			// https://github.com/microsoft/TypeScript/issues/32526
-			new ReplDataSource() satisfies IAsyncDataSource<IDebugSession, IReplElement>,
+			this.replDataSource,
 			{
 				filter: this.filter,
 				accessibilityProvider: new ReplAccessibilityProvider(),
 				identityProvider,
 				mouseSupport: false,
-				findWidgetEnabled: false,
+				findWidgetEnabled: true,
 				keyboardNavigationLabelProvider: { getKeyboardNavigationLabel: (e: IReplElement) => e.toString(true) },
 				horizontalScrolling: !wordWrap,
 				setRowLineHeight: false,
@@ -661,11 +696,16 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
 		}));
 
 		this._register(tree.onContextMenu(e => this.onContextMenu(e)));
+		this._register(tree.onDidChangeFindOpenState((open) => this.findIsOpen = open));
+
 		let lastSelectedString: string;
 		this._register(tree.onMouseClick(() => {
+			if (this.findIsOpen) {
+				return;
+			}
 			const selection = dom.getWindow(this.treeContainer).getSelection();
 			if (!selection || selection.type !== 'Range' || lastSelectedString === selection.toString()) {
-				// only focus the input if the user is not currently selecting.
+				// only focus the input if the user is not currently selecting and find isn't open.
 				this.replInput.focus();
 			}
 			lastSelectedString = selection ? selection.toString() : '';
@@ -693,7 +733,7 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
 		options.suggest = { showStatusBar: true };
 		const config = this.configurationService.getValue<IDebugConfiguration>('debug');
 		options.acceptSuggestionOnEnter = config.console.acceptSuggestionOnEnter === 'on' ? 'on' : 'off';
-		options.ariaLabel = localize('debugConsole', "Debug Console");
+		options.ariaLabel = this.getAriaLabel();
 
 		this.replInput = this.scopedInstantiationService.createInstance(CodeEditorWidget, this.replInputContainer, options, getSimpleCodeEditorWidgetOptions());
 
@@ -716,6 +756,21 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
 		this._register(dom.addStandardDisposableListener(this.replInputContainer, dom.EventType.BLUR, () => this.replInputContainer.classList.remove('synthetic-focus')));
 	}
 
+	private getAriaLabel(): string {
+		let ariaLabel = localize('debugConsole', "Debug Console");
+		if (!this.configurationService.getValue(AccessibilityVerbositySettingId.Debug)) {
+			return ariaLabel;
+		}
+		const keybinding = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getAriaLabel();
+		if (keybinding) {
+			ariaLabel = localize('commentLabelWithKeybinding', "{0}, use ({1}) for accessibility help", ariaLabel, keybinding);
+		} else {
+			ariaLabel = localize('commentLabelWithKeybindingNoKeybinding', "{0}, run the command Open Accessibility Help which is currently not triggerable via keybinding.", ariaLabel);
+		}
+
+		return ariaLabel;
+	}
+
 	private onContextMenu(e: ITreeContextMenuEvent<IReplElement>): void {
 		const actions: IAction[] = [];
 		createAndFillInContextMenuActions(this.menu, { arg: e.element, shouldForwardArgs: false }, actions);
@@ -852,8 +907,8 @@ class AcceptReplInputAction extends EditorAction {
 	constructor() {
 		super({
 			id: 'repl.action.acceptInput',
-			label: localize({ key: 'actions.repl.acceptInput', comment: ['Apply input from the debug console input box'] }, "REPL Accept Input"),
-			alias: 'REPL Accept Input',
+			label: localize({ key: 'actions.repl.acceptInput', comment: ['Apply input from the debug console input box'] }, "Debug Console: Accept Input"),
+			alias: 'Debug Console: Accept Input',
 			precondition: CONTEXT_IN_DEBUG_REPL,
 			kbOpts: {
 				kbExpr: EditorContextKeys.textInputFocus,
@@ -870,25 +925,57 @@ class AcceptReplInputAction extends EditorAction {
 	}
 }
 
-class FilterReplAction extends EditorAction {
+class FilterReplAction extends ViewAction<Repl> {
 
 	constructor() {
 		super({
+			viewId: REPL_VIEW_ID,
 			id: 'repl.action.filter',
-			label: localize('repl.action.filter', "REPL Focus Content to Filter"),
-			alias: 'REPL Filter',
+			title: localize('repl.action.filter', "Debug Console: Focus Filter"),
 			precondition: CONTEXT_IN_DEBUG_REPL,
-			kbOpts: {
-				kbExpr: EditorContextKeys.textInputFocus,
+			keybinding: [{
+				when: EditorContextKeys.textInputFocus,
 				primary: KeyMod.CtrlCmd | KeyCode.KeyF,
 				weight: KeybindingWeight.EditorContrib
-			}
+			}]
 		});
 	}
 
-	run(accessor: ServicesAccessor, editor: ICodeEditor): void | Promise<void> {
-		const repl = getReplView(accessor.get(IViewsService));
-		repl?.focusFilter();
+	runInView(accessor: ServicesAccessor, repl: Repl): void | Promise<void> {
+		repl.focusFilter();
+	}
+}
+
+
+class FindReplAction extends ViewAction<Repl> {
+
+	constructor() {
+		super({
+			viewId: REPL_VIEW_ID,
+			id: 'repl.action.find',
+			title: localize('repl.action.find', "Debug Console: Focus Find"),
+			precondition: CONTEXT_IN_DEBUG_REPL,
+			keybinding: [{
+				when: ContextKeyExpr.or(CONTEXT_IN_DEBUG_REPL, ContextKeyExpr.equals('focusedView', 'workbench.panel.repl.view')),
+				primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyF,
+				weight: KeybindingWeight.EditorContrib
+			}],
+			icon: Codicon.search,
+			menu: [{
+				id: MenuId.ViewTitle,
+				group: 'navigation',
+				when: ContextKeyExpr.equals('view', REPL_VIEW_ID),
+				order: 15
+			}, {
+				id: MenuId.DebugConsoleContext,
+				group: 'z_commands',
+				order: 25
+			}],
+		});
+	}
+
+	runInView(accessor: ServicesAccessor, view: Repl): void | Promise<void> {
+		view.openFind();
 	}
 }
 
@@ -914,7 +1001,8 @@ class ReplCopyAllAction extends EditorAction {
 
 registerEditorAction(AcceptReplInputAction);
 registerEditorAction(ReplCopyAllAction);
-registerEditorAction(FilterReplAction);
+registerAction2(FilterReplAction);
+registerAction2(FindReplAction);
 
 class SelectReplActionViewItem extends FocusSessionActionViewItem {
 
@@ -930,7 +1018,7 @@ class SelectReplActionViewItem extends FocusSessionActionViewItem {
 	}
 }
 
-function getReplView(viewsService: IViewsService): Repl | undefined {
+export function getReplView(viewsService: IViewsService): Repl | undefined {
 	return viewsService.getActiveViewWithId(REPL_VIEW_ID) as Repl ?? undefined;
 }
 
@@ -989,7 +1077,15 @@ registerAction2(class extends ViewAction<Repl> {
 				id: MenuId.DebugConsoleContext,
 				group: 'z_commands',
 				order: 20
-			}]
+			}],
+			keybinding: [{
+				primary: 0,
+				mac: { primary: KeyMod.CtrlCmd | KeyCode.KeyK },
+				// Weight is higher than work workbench contributions so the keybinding remains
+				// highest priority when chords are registered afterwards
+				weight: KeybindingWeight.WorkbenchContrib + 1,
+				when: ContextKeyExpr.equals('focusedView', 'workbench.panel.repl.view')
+			}],
 		});
 	}
 
diff --git a/src/vs/workbench/contrib/debug/browser/replAccessibilityHelp.ts b/src/vs/workbench/contrib/debug/browser/replAccessibilityHelp.ts
new file mode 100644
index 00000000000..299374e3154
--- /dev/null
+++ b/src/vs/workbench/contrib/debug/browser/replAccessibilityHelp.ts
@@ -0,0 +1,61 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
+import { AccessibleViewProviderId, AccessibleViewType, IAccessibleViewContentProvider } from '../../../../platform/accessibility/browser/accessibleView.js';
+import { IAccessibleViewImplentation } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { getReplView, Repl } from './repl.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
+import { localize } from '../../../../nls.js';
+
+export class ReplAccessibilityHelp implements IAccessibleViewImplentation {
+	priority = 120;
+	name = 'replHelp';
+	when = ContextKeyExpr.equals('focusedView', 'workbench.panel.repl.view');
+	type: AccessibleViewType = AccessibleViewType.Help;
+	getProvider(accessor: ServicesAccessor) {
+		const viewsService = accessor.get(IViewsService);
+		const replView = getReplView(viewsService);
+		if (!replView) {
+			return undefined;
+		}
+		return new ReplAccessibilityHelpProvider(replView);
+	}
+}
+
+class ReplAccessibilityHelpProvider extends Disposable implements IAccessibleViewContentProvider {
+	public readonly id = AccessibleViewProviderId.ReplHelp;
+	public readonly verbositySettingKey = AccessibilityVerbositySettingId.Debug;
+	public readonly options = { type: AccessibleViewType.Help };
+	private _treeHadFocus = false;
+	constructor(private readonly _replView: Repl) {
+		super();
+		this._treeHadFocus = !!_replView.getFocusedElement();
+	}
+
+	public onClose(): void {
+		if (this._treeHadFocus) {
+			return this._replView.focusTree();
+		}
+		this._replView.getReplInput().focus();
+	}
+
+	public provideContent(): string {
+		return [
+			localize('repl.help', "The debug console is a Read-Eval-Print-Loop that allows you to evaluate expressions and run commands and can be focused with{0}.", '<keybinding:workbench.panel.repl.view.focus>'),
+			localize('repl.output', "The debug console output can be navigated to from the input field with the Focus Previous Widget command{0}.", '<keybinding:widgetNavigation.focusPrevious>'),
+			localize('repl.input', "The debug console input can be navigated to from the output with the Focus Next Widget command{0}.", '<keybinding:widgetNavigation.focusNext>'),
+			localize('repl.history', "The debug console output history can be navigated with the up and down arrow keys."),
+			localize('repl.accessibleView', "The Open Accessible View command{0} will allow character by character navigation of the console output.", '<keybinding:editor.action.accessibleView>'),
+			localize('repl.showRunAndDebug', "The Show Run and Debug view command{0} will open the Run and Debug view and provides more information about debugging.", '<keybinding:workbench.view.debug>'),
+			localize('repl.clear', "The Debug: Clear Console command{0} will clear the console output.", '<keybinding:workbench.debug.panel.action.clearReplAction>'),
+			localize('repl.lazyVariables', "The setting `debug.expandLazyVariables` controls whether variables are evaluated automatically. This is enabled by default when using a screen reader."),
+		].join('\n');
+	}
+}
+
diff --git a/src/vs/workbench/contrib/debug/browser/replAccessibleView.ts b/src/vs/workbench/contrib/debug/browser/replAccessibleView.ts
new file mode 100644
index 00000000000..43ec21a1cd3
--- /dev/null
+++ b/src/vs/workbench/contrib/debug/browser/replAccessibleView.ts
@@ -0,0 +1,129 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { AccessibleViewProviderId, AccessibleViewType, IAccessibleViewContentProvider, IAccessibleViewService } from '../../../../platform/accessibility/browser/accessibleView.js';
+import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
+import { IReplElement } from '../common/debug.js';
+import { IAccessibleViewImplentation } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { getReplView, Repl } from './repl.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Position } from '../../../../editor/common/core/position.js';
+
+export class ReplAccessibleView implements IAccessibleViewImplentation {
+	priority = 70;
+	name = 'debugConsole';
+	when = ContextKeyExpr.equals('focusedView', 'workbench.panel.repl.view');
+	type: AccessibleViewType = AccessibleViewType.View;
+	getProvider(accessor: ServicesAccessor) {
+		const viewsService = accessor.get(IViewsService);
+		const accessibleViewService = accessor.get(IAccessibleViewService);
+		const replView = getReplView(viewsService);
+		if (!replView) {
+			return undefined;
+		}
+
+		const focusedElement = replView.getFocusedElement();
+		return new ReplOutputAccessibleViewProvider(replView, focusedElement, accessibleViewService);
+	}
+}
+
+class ReplOutputAccessibleViewProvider extends Disposable implements IAccessibleViewContentProvider {
+	public readonly id = AccessibleViewProviderId.Repl;
+	private _content: string | undefined;
+	private readonly _onDidChangeContent: Emitter<void> = this._register(new Emitter<void>());
+	public readonly onDidChangeContent: Event<void> = this._onDidChangeContent.event;
+	private readonly _onDidResolveChildren: Emitter<void> = this._register(new Emitter<void>());
+	public readonly onDidResolveChildren: Event<void> = this._onDidResolveChildren.event;
+
+	public readonly verbositySettingKey = AccessibilityVerbositySettingId.Debug;
+	public readonly options = {
+		type: AccessibleViewType.View
+	};
+
+	private _elementPositionMap: Map<string, Position> = new Map<string, Position>();
+	private _treeHadFocus = false;
+
+	constructor(
+		private readonly _replView: Repl,
+		private readonly _focusedElement: IReplElement | undefined,
+		@IAccessibleViewService private readonly _accessibleViewService: IAccessibleViewService) {
+		super();
+		this._treeHadFocus = !!_focusedElement;
+	}
+	public provideContent(): string {
+		const debugSession = this._replView.getDebugSession();
+		if (!debugSession) {
+			return 'No debug session available.';
+		}
+		const elements = debugSession.getReplElements();
+		if (!elements.length) {
+			return 'No output in the debug console.';
+		}
+		if (!this._content) {
+			this._updateContent(elements);
+		}
+		// Content is loaded asynchronously, so we need to check if it's available or fallback to the elements that are already available.
+		return this._content ?? elements.map(e => e.toString(true)).join('\n');
+	}
+
+	public onClose(): void {
+		this._content = undefined;
+		this._elementPositionMap.clear();
+		if (this._treeHadFocus) {
+			return this._replView.focusTree();
+		}
+		this._replView.getReplInput().focus();
+	}
+
+	public onOpen(): void {
+		// Children are resolved async, so we need to update the content when they are resolved.
+		this._register(this.onDidResolveChildren(() => {
+			this._onDidChangeContent.fire();
+			queueMicrotask(() => {
+				if (this._focusedElement) {
+					const position = this._elementPositionMap.get(this._focusedElement.getId());
+					if (position) {
+						this._accessibleViewService.setPosition(position, true);
+					}
+				}
+			});
+		}));
+	}
+
+	private async _updateContent(elements: IReplElement[]) {
+		const dataSource = this._replView.getReplDataSource();
+		if (!dataSource) {
+			return;
+		}
+		let line = 1;
+		const content: string[] = [];
+		for (const e of elements) {
+			content.push(e.toString().replace(/\n/g, ''));
+			this._elementPositionMap.set(e.getId(), new Position(line, 1));
+			line++;
+			if (dataSource.hasChildren(e)) {
+				const childContent: string[] = [];
+				const children = await dataSource.getChildren(e);
+				for (const child of children) {
+					const id = child.getId();
+					if (!this._elementPositionMap.has(id)) {
+						// don't overwrite parent position
+						this._elementPositionMap.set(id, new Position(line, 1));
+					}
+					childContent.push('  ' + child.toString());
+					line++;
+				}
+				content.push(childContent.join('\n'));
+			}
+		}
+
+		this._content = content.join('\n');
+		this._onDidResolveChildren.fire();
+	}
+}
diff --git a/src/vs/workbench/contrib/debug/browser/replFilter.ts b/src/vs/workbench/contrib/debug/browser/replFilter.ts
index 46999a6db49..6ba1f325e1d 100644
--- a/src/vs/workbench/contrib/debug/browser/replFilter.ts
+++ b/src/vs/workbench/contrib/debug/browser/replFilter.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { matchesFuzzy } from 'vs/base/common/filters';
-import { splitGlobAware } from 'vs/base/common/glob';
-import { ITreeFilter, TreeVisibility, TreeFilterResult } from 'vs/base/browser/ui/tree/tree';
-import { IReplElement } from 'vs/workbench/contrib/debug/common/debug';
-import { ReplEvaluationResult, ReplEvaluationInput } from 'vs/workbench/contrib/debug/common/replModel';
-import { Variable } from 'vs/workbench/contrib/debug/common/debugModel';
+import { matchesFuzzy } from '../../../../base/common/filters.js';
+import { splitGlobAware } from '../../../../base/common/glob.js';
+import { ITreeFilter, TreeVisibility, TreeFilterResult } from '../../../../base/browser/ui/tree/tree.js';
+import { IReplElement } from '../common/debug.js';
+import { ReplEvaluationResult, ReplEvaluationInput } from '../common/replModel.js';
+import { Variable } from '../common/debugModel.js';
 
 
 type ParsedQuery = {
diff --git a/src/vs/workbench/contrib/debug/browser/replViewer.ts b/src/vs/workbench/contrib/debug/browser/replViewer.ts
index b2b36204a67..82a76c804bb 100644
--- a/src/vs/workbench/contrib/debug/browser/replViewer.ts
+++ b/src/vs/workbench/contrib/debug/browser/replViewer.ts
@@ -3,36 +3,33 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge';
-import { HighlightedLabel, IHighlight } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
-import { IManagedHover } from 'vs/base/browser/ui/hover/hover';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { CachedListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
-import { IAsyncDataSource, ITreeNode, ITreeRenderer } from 'vs/base/browser/ui/tree/tree';
-import { createMatches, FuzzyScore } from 'vs/base/common/filters';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { basename } from 'vs/base/common/path';
-import severity from 'vs/base/common/severity';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { localize } from 'vs/nls';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { defaultCountBadgeStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { AbstractExpressionsRenderer, IExpressionTemplateData, IInputBoxOptions, renderExpressionValue, renderVariable } from 'vs/workbench/contrib/debug/browser/baseDebugView';
-import { handleANSIOutput } from 'vs/workbench/contrib/debug/browser/debugANSIHandling';
-import { debugConsoleEvaluationInput } from 'vs/workbench/contrib/debug/browser/debugIcons';
-import { LinkDetector } from 'vs/workbench/contrib/debug/browser/linkDetector';
-import { IDebugConfiguration, IDebugService, IDebugSession, IExpression, IExpressionContainer, INestingReplElement, IReplElement, IReplElementSource, IReplOptions } from 'vs/workbench/contrib/debug/common/debug';
-import { Variable } from 'vs/workbench/contrib/debug/common/debugModel';
-import { RawObjectReplElement, ReplEvaluationInput, ReplEvaluationResult, ReplGroup, ReplOutputElement, ReplVariableElement } from 'vs/workbench/contrib/debug/common/replModel';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import * as dom from '../../../../base/browser/dom.js';
+import { CountBadge } from '../../../../base/browser/ui/countBadge/countBadge.js';
+import { HighlightedLabel, IHighlight } from '../../../../base/browser/ui/highlightedlabel/highlightedLabel.js';
+import { IManagedHover } from '../../../../base/browser/ui/hover/hover.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { CachedListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
+import { IListAccessibilityProvider } from '../../../../base/browser/ui/list/listWidget.js';
+import { IAsyncDataSource, ITreeNode, ITreeRenderer } from '../../../../base/browser/ui/tree/tree.js';
+import { createMatches, FuzzyScore } from '../../../../base/common/filters.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import { basename } from '../../../../base/common/path.js';
+import severity from '../../../../base/common/severity.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { localize } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { defaultCountBadgeStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IDebugConfiguration, IDebugService, IDebugSession, IExpression, IExpressionContainer, INestingReplElement, IReplElement, IReplElementSource, IReplOptions } from '../common/debug.js';
+import { Variable } from '../common/debugModel.js';
+import { RawObjectReplElement, ReplEvaluationInput, ReplEvaluationResult, ReplGroup, ReplOutputElement, ReplVariableElement } from '../common/replModel.js';
+import { AbstractExpressionsRenderer, IExpressionTemplateData, IInputBoxOptions } from './baseDebugView.js';
+import { DebugExpressionRenderer } from './debugExpressionRenderer.js';
+import { debugConsoleEvaluationInput } from './debugIcons.js';
 
 const $ = dom.$;
 
@@ -43,10 +40,12 @@ interface IReplEvaluationInputTemplateData {
 interface IReplGroupTemplateData {
 	label: HTMLElement;
 	source: SourceWidget;
+	elementDisposable?: IDisposable;
 }
 
 interface IReplEvaluationResultTemplateData {
 	value: HTMLElement;
+	elementStore: DisposableStore;
 }
 
 interface IOutputReplElementTemplateData {
@@ -56,7 +55,7 @@ interface IOutputReplElementTemplateData {
 	value: HTMLElement;
 	source: SourceWidget;
 	getReplElementSource(): IReplElementSource | undefined;
-	elementListener: IDisposable;
+	elementDisposable: DisposableStore;
 }
 
 interface IRawObjectReplTemplateData {
@@ -65,6 +64,7 @@ interface IRawObjectReplTemplateData {
 	name: HTMLElement;
 	value: HTMLElement;
 	label: HighlightedLabel;
+	elementStore: DisposableStore;
 }
 
 export class ReplEvaluationInputsRenderer implements ITreeRenderer<ReplEvaluationInput, FuzzyScore, IReplEvaluationInputTemplateData> {
@@ -95,8 +95,7 @@ export class ReplGroupRenderer implements ITreeRenderer<ReplGroup, FuzzyScore, I
 	static readonly ID = 'replGroup';
 
 	constructor(
-		private readonly linkDetector: LinkDetector,
-		@IThemeService private readonly themeService: IThemeService,
+		private readonly expressionRenderer: DebugExpressionRenderer,
 		@IInstantiationService private readonly instaService: IInstantiationService,
 	) { }
 
@@ -113,14 +112,16 @@ export class ReplGroupRenderer implements ITreeRenderer<ReplGroup, FuzzyScore, I
 	}
 
 	renderElement(element: ITreeNode<ReplGroup, FuzzyScore>, _index: number, templateData: IReplGroupTemplateData): void {
+
+		templateData.elementDisposable?.dispose();
 		const replGroup = element.element;
 		dom.clearNode(templateData.label);
-		const result = handleANSIOutput(replGroup.name, this.linkDetector, this.themeService, undefined);
-		templateData.label.appendChild(result);
+		templateData.elementDisposable = this.expressionRenderer.renderValue(templateData.label, replGroup.name, { wasANSI: true, session: element.element.session });
 		templateData.source.setSource(replGroup.sourceData);
 	}
 
 	disposeTemplate(templateData: IReplGroupTemplateData): void {
+		templateData.elementDisposable?.dispose();
 		templateData.source.dispose();
 	}
 }
@@ -133,27 +134,28 @@ export class ReplEvaluationResultsRenderer implements ITreeRenderer<ReplEvaluati
 	}
 
 	constructor(
-		private readonly linkDetector: LinkDetector,
-		private readonly hoverService: IHoverService
+		private readonly expressionRenderer: DebugExpressionRenderer,
 	) { }
 
 	renderTemplate(container: HTMLElement): IReplEvaluationResultTemplateData {
 		const output = dom.append(container, $('.evaluation-result.expression'));
 		const value = dom.append(output, $('span.value'));
 
-		return { value };
+		return { value, elementStore: new DisposableStore() };
 	}
 
 	renderElement(element: ITreeNode<ReplEvaluationResult | Variable, FuzzyScore>, index: number, templateData: IReplEvaluationResultTemplateData): void {
+		templateData.elementStore.clear();
 		const expression = element.element;
-		renderExpressionValue(expression, templateData.value, {
+		templateData.elementStore.add(this.expressionRenderer.renderValue(templateData.value, expression, {
 			colorize: true,
-			linkDetector: this.linkDetector
-		}, this.hoverService);
+			hover: false,
+			session: element.element.getSession(),
+		}));
 	}
 
 	disposeTemplate(templateData: IReplEvaluationResultTemplateData): void {
-		// noop
+		templateData.elementStore.dispose();
 	}
 }
 
@@ -161,8 +163,7 @@ export class ReplOutputElementRenderer implements ITreeRenderer<ReplOutputElemen
 	static readonly ID = 'outputReplElement';
 
 	constructor(
-		private readonly linkDetector: LinkDetector,
-		@IThemeService private readonly themeService: IThemeService,
+		private readonly expressionRenderer: DebugExpressionRenderer,
 		@IInstantiationService private readonly instaService: IInstantiationService,
 	) { }
 
@@ -180,19 +181,22 @@ export class ReplOutputElementRenderer implements ITreeRenderer<ReplOutputElemen
 		data.count = new CountBadge(data.countContainer, {}, defaultCountBadgeStyles);
 		data.value = dom.append(expression, $('span.value.label'));
 		data.source = this.instaService.createInstance(SourceWidget, expression);
+		data.elementDisposable = new DisposableStore();
 
 		return data;
 	}
 
 	renderElement({ element }: ITreeNode<ReplOutputElement, FuzzyScore>, index: number, templateData: IOutputReplElementTemplateData): void {
+		templateData.elementDisposable.clear();
 		this.setElementCount(element, templateData);
-		templateData.elementListener = element.onDidChangeCount(() => this.setElementCount(element, templateData));
+		templateData.elementDisposable.add(element.onDidChangeCount(() => this.setElementCount(element, templateData)));
 		// value
 		dom.clearNode(templateData.value);
 		// Reset classes to clear ansi decorations since templates are reused
 		templateData.value.className = 'value';
 
-		templateData.value.appendChild(handleANSIOutput(element.value, this.linkDetector, this.themeService, element.session.root));
+		const locationReference = element.expression?.valueLocationReference;
+		templateData.elementDisposable.add(this.expressionRenderer.renderValue(templateData.value, element.value, { wasANSI: true, session: element.session, locationReference }));
 
 		templateData.value.classList.add((element.severity === severity.Warning) ? 'warn' : (element.severity === severity.Error) ? 'error' : (element.severity === severity.Ignore) ? 'ignore' : 'info');
 		templateData.source.setSource(element.sourceData);
@@ -210,10 +214,11 @@ export class ReplOutputElementRenderer implements ITreeRenderer<ReplOutputElemen
 
 	disposeTemplate(templateData: IOutputReplElementTemplateData): void {
 		templateData.source.dispose();
+		templateData.elementDisposable.dispose();
 	}
 
 	disposeElement(_element: ITreeNode<ReplOutputElement, FuzzyScore>, _index: number, templateData: IOutputReplElementTemplateData): void {
-		templateData.elementListener.dispose();
+		templateData.elementDisposable.clear();
 	}
 }
 
@@ -226,17 +231,17 @@ export class ReplVariablesRenderer extends AbstractExpressionsRenderer<IExpressi
 	}
 
 	constructor(
-		private readonly linkDetector: LinkDetector,
+		private readonly expressionRenderer: DebugExpressionRenderer,
 		@IDebugService debugService: IDebugService,
 		@IContextViewService contextViewService: IContextViewService,
-		@ICommandService private readonly commandService: ICommandService,
-		@IHoverService hoverService: IHoverService
+		@IHoverService hoverService: IHoverService,
 	) {
 		super(debugService, contextViewService, hoverService);
 	}
 
 	public renderElement(node: ITreeNode<IExpression | ReplVariableElement, FuzzyScore>, _index: number, data: IExpressionTemplateData): void {
 		const element = node.element;
+		data.elementDisposable.clear();
 		super.renderExpressionElement(element instanceof ReplVariableElement ? element.expression : element, node, data);
 	}
 
@@ -244,10 +249,11 @@ export class ReplVariablesRenderer extends AbstractExpressionsRenderer<IExpressi
 		const isReplVariable = expression instanceof ReplVariableElement;
 		if (isReplVariable || !expression.name) {
 			data.label.set('');
-			renderExpressionValue(isReplVariable ? expression.expression : expression, data.value, { colorize: true, linkDetector: this.linkDetector }, this.hoverService);
+			const value = isReplVariable ? expression.expression : expression;
+			data.elementDisposable.add(this.expressionRenderer.renderValue(data.value, value, { colorize: true, hover: false, session: expression.getSession() }));
 			data.expression.classList.remove('nested-variable');
 		} else {
-			renderVariable(data.elementDisposable, this.commandService, this.hoverService, expression as Variable, data, true, highlights, this.linkDetector);
+			data.elementDisposable.add(this.expressionRenderer.renderVariable(data, expression as Variable, { showChanged: true, highlights }));
 			data.expression.classList.toggle('nested-variable', isNestedVariable(expression));
 		}
 	}
@@ -261,8 +267,7 @@ export class ReplRawObjectsRenderer implements ITreeRenderer<RawObjectReplElemen
 	static readonly ID = 'rawObject';
 
 	constructor(
-		private readonly linkDetector: LinkDetector,
-		private readonly hoverService: IHoverService
+		private readonly expressionRenderer: DebugExpressionRenderer,
 	) { }
 
 	get templateId(): string {
@@ -277,10 +282,12 @@ export class ReplRawObjectsRenderer implements ITreeRenderer<RawObjectReplElemen
 		const label = new HighlightedLabel(name);
 		const value = dom.append(expression, $('span.value'));
 
-		return { container, expression, name, label, value };
+		return { container, expression, name, label, value, elementStore: new DisposableStore() };
 	}
 
 	renderElement(node: ITreeNode<RawObjectReplElement, FuzzyScore>, index: number, templateData: IRawObjectReplTemplateData): void {
+		templateData.elementStore.clear();
+
 		// key
 		const element = node.element;
 		templateData.label.set(element.name ? `${element.name}:` : '', createMatches(node.filterData));
@@ -291,12 +298,14 @@ export class ReplRawObjectsRenderer implements ITreeRenderer<RawObjectReplElemen
 		}
 
 		// value
-		renderExpressionValue(element.value, templateData.value, {
-			linkDetector: this.linkDetector
-		}, this.hoverService);
+		templateData.elementStore.add(this.expressionRenderer.renderValue(templateData.value, element.value, {
+			hover: false,
+			session: node.element.getSession(),
+		}));
 	}
 
 	disposeTemplate(templateData: IRawObjectReplTemplateData): void {
+		templateData.elementStore.dispose();
 		templateData.label.dispose();
 	}
 }
diff --git a/src/vs/workbench/contrib/debug/browser/runAndDebugAccessibilityHelp.ts b/src/vs/workbench/contrib/debug/browser/runAndDebugAccessibilityHelp.ts
new file mode 100644
index 00000000000..90920dc95c0
--- /dev/null
+++ b/src/vs/workbench/contrib/debug/browser/runAndDebugAccessibilityHelp.ts
@@ -0,0 +1,92 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+
+import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
+import { AccessibleViewProviderId, AccessibleViewType, IAccessibleViewContentProvider } from '../../../../platform/accessibility/browser/accessibleView.js';
+import { IAccessibleViewImplentation } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
+import { localize } from '../../../../nls.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { AccessibilityHelpNLS } from '../../../../editor/common/standaloneStrings.js';
+import { FocusedViewContext, SidebarFocusContext } from '../../../common/contextkeys.js';
+import { BREAKPOINTS_VIEW_ID, CALLSTACK_VIEW_ID, LOADED_SCRIPTS_VIEW_ID, VARIABLES_VIEW_ID, WATCH_VIEW_ID } from '../common/debug.js';
+
+export class RunAndDebugAccessibilityHelp implements IAccessibleViewImplentation {
+	priority = 120;
+	name = 'runAndDebugHelp';
+	when = ContextKeyExpr.or(
+		ContextKeyExpr.and(ContextKeyExpr.equals('activeViewlet', 'workbench.view.debug'), SidebarFocusContext),
+		ContextKeyExpr.equals(FocusedViewContext.key, VARIABLES_VIEW_ID),
+		ContextKeyExpr.equals(FocusedViewContext.key, WATCH_VIEW_ID),
+		ContextKeyExpr.equals(FocusedViewContext.key, CALLSTACK_VIEW_ID),
+		ContextKeyExpr.equals(FocusedViewContext.key, LOADED_SCRIPTS_VIEW_ID),
+		ContextKeyExpr.equals(FocusedViewContext.key, BREAKPOINTS_VIEW_ID)
+	);
+	type: AccessibleViewType = AccessibleViewType.Help;
+	getProvider(accessor: ServicesAccessor) {
+		return new RunAndDebugAccessibilityHelpProvider(accessor.get(ICommandService), accessor.get(IViewsService));
+	}
+}
+
+class RunAndDebugAccessibilityHelpProvider extends Disposable implements IAccessibleViewContentProvider {
+	public readonly id = AccessibleViewProviderId.RunAndDebug;
+	public readonly verbositySettingKey = AccessibilityVerbositySettingId.Debug;
+	public readonly options = { type: AccessibleViewType.Help };
+	private _focusedView: string | undefined;
+	constructor(
+		@ICommandService private readonly _commandService: ICommandService,
+		@IViewsService private readonly _viewsService: IViewsService
+	) {
+		super();
+		this._focusedView = this._viewsService.getFocusedViewName();
+	}
+
+	public onClose(): void {
+		switch (this._focusedView) {
+			case 'Watch':
+				this._commandService.executeCommand('workbench.debug.action.focusWatchView');
+				break;
+			case 'Variables':
+				this._commandService.executeCommand('workbench.debug.action.focusVariablesView');
+				break;
+			case 'Call Stack':
+				this._commandService.executeCommand('workbench.debug.action.focusCallStackView');
+				break;
+			case 'Breakpoints':
+				this._commandService.executeCommand('workbench.debug.action.focusBreakpointsView');
+				break;
+			default:
+				this._commandService.executeCommand('workbench.view.debug');
+		}
+	}
+
+	public provideContent(): string {
+		return [
+			localize('debug.showRunAndDebug', "The Show Run and Debug view command{0} will open the current view.", '<keybinding:workbench.view.debug>'),
+			localize('debug.startDebugging', "The Debug: Start Debugging command{0} will start a debug session.", '<keybinding:workbench.action.debug.start>'),
+			localize('debug.help', "Access debug output and evaluate expressions in the debug console, which can be focused with{0}.", '<keybinding:workbench.panel.repl.view.focus>'),
+			AccessibilityHelpNLS.setBreakpoint,
+			AccessibilityHelpNLS.addToWatch,
+			localize('onceDebugging', "Once debugging, the following commands will be available:"),
+			localize('debug.restartDebugging', "- Debug: Restart Debugging command{0} will restart the current debug session.", '<keybinding:workbench.action.debug.restart>'),
+			localize('debug.stopDebugging', "- Debug: Stop Debugging command{0} will stop the current debugging session.", '<keybinding:workbench.action.debug.stop>'),
+			localize('debug.continue', "- Debug: Continue command{0} will continue execution until the next breakpoint.", '<keybinding:workbench.action.debug.continue>'),
+			localize('debug.stepInto', "- Debug: Step Into command{0} will step into the next function call.", '<keybinding:workbench.action.debug.stepInto>'),
+			localize('debug.stepOver', "- Debug: Step Over command{0} will step over the current function call.", '<keybinding:workbench.action.debug.stepOver>'),
+			localize('debug.stepOut', "- Debug: Step Out command{0} will step out of the current function call.", '<keybinding:workbench.action.debug.stepOut>'),
+			localize('debug.views', 'The debug viewlet is comprised of several views that can be focused with the following commands or navigated to via tab then arrow keys:'),
+			localize('debug.focusBreakpoints', "- Debug: Focus Breakpoints View command{0} will focus the breakpoints view.", '<keybinding:workbench.debug.action.focusBreakpointsView>'),
+			localize('debug.focusCallStack', "- Debug: Focus Call Stack View command{0} will focus the call stack view.", '<keybinding:workbench.debug.action.focusCallStackView>'),
+			localize('debug.focusVariables', "- Debug: Focus Variables View command{0} will focus the variables view.", '<keybinding:workbench.debug.action.focusVariablesView>'),
+			localize('debug.focusWatch', "- Debug: Focus Watch View command{0} will focus the watch view.", '<keybinding:workbench.debug.action.focusWatchView>'),
+			localize('debug.watchSetting', "The setting {0} controls whether watch variable changes are announced.", 'accessibility.debugWatchVariableAnnouncements'),
+		].join('\n');
+	}
+}
+
diff --git a/src/vs/workbench/contrib/debug/browser/statusbarColorProvider.ts b/src/vs/workbench/contrib/debug/browser/statusbarColorProvider.ts
index 1968c0ccdeb..ebc3963e61a 100644
--- a/src/vs/workbench/contrib/debug/browser/statusbarColorProvider.ts
+++ b/src/vs/workbench/contrib/debug/browser/statusbarColorProvider.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { ColorTransformType, asCssVariable, asCssVariableName, registerColor } from 'vs/platform/theme/common/colorRegistry';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IDebugService, State, IDebugSession, IDebugConfiguration } from 'vs/workbench/contrib/debug/common/debug';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { STATUS_BAR_FOREGROUND, STATUS_BAR_BORDER, COMMAND_CENTER_BACKGROUND } from 'vs/workbench/common/theme';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { IStatusbarService } from 'vs/workbench/services/statusbar/browser/statusbar';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
+import { localize } from '../../../../nls.js';
+import { asCssVariable, asCssVariableName, registerColor, transparent } from '../../../../platform/theme/common/colorRegistry.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IDebugService, State, IDebugSession, IDebugConfiguration } from '../common/debug.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { STATUS_BAR_FOREGROUND, STATUS_BAR_BORDER, COMMAND_CENTER_BACKGROUND } from '../../../common/theme.js';
+import { DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import { IStatusbarService } from '../../../services/statusbar/browser/statusbar.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ILayoutService } from '../../../../platform/layout/browser/layoutService.js';
 
 
 // colors for theming
@@ -31,21 +31,11 @@ export const STATUS_BAR_DEBUGGING_FOREGROUND = registerColor('statusBar.debuggin
 	hcLight: '#FFFFFF'
 }, localize('statusBarDebuggingForeground', "Status bar foreground color when a program is being debugged. The status bar is shown in the bottom of the window"));
 
-export const STATUS_BAR_DEBUGGING_BORDER = registerColor('statusBar.debuggingBorder', {
-	dark: STATUS_BAR_BORDER,
-	light: STATUS_BAR_BORDER,
-	hcDark: STATUS_BAR_BORDER,
-	hcLight: STATUS_BAR_BORDER
-}, localize('statusBarDebuggingBorder', "Status bar border color separating to the sidebar and editor when a program is being debugged. The status bar is shown in the bottom of the window"));
+export const STATUS_BAR_DEBUGGING_BORDER = registerColor('statusBar.debuggingBorder', STATUS_BAR_BORDER, localize('statusBarDebuggingBorder', "Status bar border color separating to the sidebar and editor when a program is being debugged. The status bar is shown in the bottom of the window"));
 
 export const COMMAND_CENTER_DEBUGGING_BACKGROUND = registerColor(
 	'commandCenter.debuggingBackground',
-	{
-		dark: { value: STATUS_BAR_DEBUGGING_BACKGROUND, op: ColorTransformType.Transparent, factor: 0.258 },
-		hcDark: { value: STATUS_BAR_DEBUGGING_BACKGROUND, op: ColorTransformType.Transparent, factor: 0.258 },
-		light: { value: STATUS_BAR_DEBUGGING_BACKGROUND, op: ColorTransformType.Transparent, factor: 0.258 },
-		hcLight: { value: STATUS_BAR_DEBUGGING_BACKGROUND, op: ColorTransformType.Transparent, factor: 0.258 }
-	},
+	transparent(STATUS_BAR_DEBUGGING_BACKGROUND, 0.258),
 	localize('commandCenter-activeBackground', "Command center background color when a program is being debugged"),
 	true
 );
diff --git a/src/vs/workbench/contrib/debug/browser/variablesView.ts b/src/vs/workbench/contrib/debug/browser/variablesView.ts
index 5dc2a66b073..696d7eebc0e 100644
--- a/src/vs/workbench/contrib/debug/browser/variablesView.ts
+++ b/src/vs/workbench/contrib/debug/browser/variablesView.ts
@@ -3,51 +3,51 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { HighlightedLabel, IHighlight } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
-import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
-import { AsyncDataTree, IAsyncDataTreeViewState } from 'vs/base/browser/ui/tree/asyncDataTree';
-import { ITreeContextMenuEvent, ITreeMouseEvent, ITreeNode, ITreeRenderer } from 'vs/base/browser/ui/tree/tree';
-import { Action, IAction } from 'vs/base/common/actions';
-import { coalesce } from 'vs/base/common/arrays';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Codicon } from 'vs/base/common/codicons';
-import { FuzzyScore, createMatches } from 'vs/base/common/filters';
-import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { localize } from 'vs/nls';
-import { createAndFillInContextMenuActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IMenuService, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { WorkbenchAsyncDataTree } from 'vs/platform/list/browser/listService';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { ProgressLocation } from 'vs/platform/progress/common/progress';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ViewAction, ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
-import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
-import { IViewDescriptorService } from 'vs/workbench/common/views';
-import { AbstractExpressionDataSource, AbstractExpressionsRenderer, IExpressionTemplateData, IInputBoxOptions, renderExpressionValue, renderVariable, renderViewTree } from 'vs/workbench/contrib/debug/browser/baseDebugView';
-import { ADD_TO_WATCH_ID, ADD_TO_WATCH_LABEL, COPY_EVALUATE_PATH_ID, COPY_EVALUATE_PATH_LABEL, COPY_VALUE_ID, COPY_VALUE_LABEL } from 'vs/workbench/contrib/debug/browser/debugCommands';
-import { LinkDetector } from 'vs/workbench/contrib/debug/browser/linkDetector';
-import { CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_ACCESSED_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_READ_SUPPORTED, CONTEXT_VARIABLES_FOCUSED, DataBreakpointSetType, DebugVisualizationType, IDataBreakpointInfoResponse, IDebugService, IExpression, IScope, IStackFrame, IViewModel, VARIABLES_VIEW_ID } from 'vs/workbench/contrib/debug/common/debug';
-import { getContextForVariable } from 'vs/workbench/contrib/debug/common/debugContext';
-import { ErrorScope, Expression, Scope, StackFrame, Variable, VisualizedExpression, getUriForDebugMemory } from 'vs/workbench/contrib/debug/common/debugModel';
-import { DebugVisualizer, IDebugVisualizerService } from 'vs/workbench/contrib/debug/common/debugVisualizers';
-import { IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions';
-import { IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import * as dom from '../../../../base/browser/dom.js';
+import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { HighlightedLabel, IHighlight } from '../../../../base/browser/ui/highlightedlabel/highlightedLabel.js';
+import { IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
+import { IListAccessibilityProvider } from '../../../../base/browser/ui/list/listWidget.js';
+import { AsyncDataTree, IAsyncDataTreeViewState } from '../../../../base/browser/ui/tree/asyncDataTree.js';
+import { ITreeContextMenuEvent, ITreeMouseEvent, ITreeNode, ITreeRenderer } from '../../../../base/browser/ui/tree/tree.js';
+import { Action, IAction } from '../../../../base/common/actions.js';
+import { coalesce } from '../../../../base/common/arrays.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { FuzzyScore, createMatches } from '../../../../base/common/filters.js';
+import { IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { localize } from '../../../../nls.js';
+import { createAndFillInContextMenuActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IMenuService, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService, IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { WorkbenchAsyncDataTree } from '../../../../platform/list/browser/listService.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { ProgressLocation } from '../../../../platform/progress/common/progress.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ViewAction, ViewPane } from '../../../browser/parts/views/viewPane.js';
+import { IViewletViewOptions } from '../../../browser/parts/views/viewsViewlet.js';
+import { IViewDescriptorService } from '../../../common/views.js';
+import { IEditorService, SIDE_GROUP } from '../../../services/editor/common/editorService.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IExtensionsWorkbenchService } from '../../extensions/common/extensions.js';
+import { CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_ACCESSED_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_READ_SUPPORTED, CONTEXT_VARIABLES_FOCUSED, DataBreakpointSetType, DebugVisualizationType, IDataBreakpointInfoResponse, IDebugService, IExpression, IScope, IStackFrame, IViewModel, VARIABLES_VIEW_ID } from '../common/debug.js';
+import { getContextForVariable } from '../common/debugContext.js';
+import { ErrorScope, Expression, Scope, StackFrame, Variable, VisualizedExpression, getUriForDebugMemory } from '../common/debugModel.js';
+import { DebugVisualizer, IDebugVisualizerService } from '../common/debugVisualizers.js';
+import { AbstractExpressionDataSource, AbstractExpressionsRenderer, IExpressionTemplateData, IInputBoxOptions, renderViewTree } from './baseDebugView.js';
+import { ADD_TO_WATCH_ID, ADD_TO_WATCH_LABEL, COPY_EVALUATE_PATH_ID, COPY_EVALUATE_PATH_LABEL, COPY_VALUE_ID, COPY_VALUE_LABEL } from './debugCommands.js';
+import { DebugExpressionRenderer } from './debugExpressionRenderer.js';
 
 const $ = dom.$;
 let forgetScopes = true;
@@ -122,11 +122,11 @@ export class VariablesView extends ViewPane {
 		this.element.classList.add('debug-pane');
 		container.classList.add('debug-variables');
 		const treeContainer = renderViewTree(container);
-		const linkDetector = this.instantiationService.createInstance(LinkDetector);
+		const expressionRenderer = this.instantiationService.createInstance(DebugExpressionRenderer);
 		this.tree = <WorkbenchAsyncDataTree<IStackFrame | null, IExpression | IScope, FuzzyScore>>this.instantiationService.createInstance(WorkbenchAsyncDataTree, 'VariablesView', treeContainer, new VariablesDelegate(),
 			[
-				this.instantiationService.createInstance(VariablesRenderer, linkDetector),
-				this.instantiationService.createInstance(VisualizedVariableRenderer, linkDetector),
+				this.instantiationService.createInstance(VariablesRenderer, expressionRenderer),
+				this.instantiationService.createInstance(VisualizedVariableRenderer, expressionRenderer),
 				new ScopesRenderer(),
 				new ScopeErrorRenderer(),
 			],
@@ -246,22 +246,16 @@ export async function openContextMenuForVariableTreeElement(parentContextKeyServ
 		return;
 	}
 
-	const toDispose = new DisposableStore();
+	const contextKeyService = await getContextForVariableMenuWithDataAccess(parentContextKeyService, variable);
+	const context: IVariablesContext = getVariablesContext(variable);
+	const menu = menuService.getMenuActions(menuId, contextKeyService, { arg: context, shouldForwardArgs: false });
 
-	try {
-		const contextKeyService = await getContextForVariableMenuWithDataAccess(parentContextKeyService, variable);
-		const menu = toDispose.add(menuService.createMenu(menuId, contextKeyService));
-
-		const context: IVariablesContext = getVariablesContext(variable);
-		const secondary: IAction[] = [];
-		createAndFillInContextMenuActions(menu, { arg: context, shouldForwardArgs: false }, { primary: [], secondary }, 'inline');
-		contextMenuService.showContextMenu({
-			getAnchor: () => e.anchor,
-			getActions: () => secondary
-		});
-	} finally {
-		toDispose.dispose();
-	}
+	const secondary: IAction[] = [];
+	createAndFillInContextMenuActions(menu, { primary: [], secondary }, 'inline');
+	contextMenuService.showContextMenu({
+		getAnchor: () => e.anchor,
+		getActions: () => secondary
+	});
 }
 
 const getVariablesContext = (variable: Variable): IVariablesContext => ({
@@ -440,7 +434,7 @@ export class VisualizedVariableRenderer extends AbstractExpressionsRenderer {
 	}
 
 	constructor(
-		private readonly linkDetector: LinkDetector,
+		private readonly expressionRenderer: DebugExpressionRenderer,
 		@IDebugService debugService: IDebugService,
 		@IContextViewService contextViewService: IContextViewService,
 		@IHoverService hoverService: IHoverService,
@@ -455,6 +449,7 @@ export class VisualizedVariableRenderer extends AbstractExpressionsRenderer {
 	}
 
 	public override renderElement(node: ITreeNode<IExpression, FuzzyScore>, index: number, data: IExpressionTemplateData): void {
+		data.elementDisposable.clear();
 		super.renderExpressionElement(node.element, node, data);
 	}
 
@@ -466,13 +461,12 @@ export class VisualizedVariableRenderer extends AbstractExpressionsRenderer {
 			text += ':';
 		}
 		data.label.set(text, highlights, viz.name);
-		renderExpressionValue(viz, data.value, {
+		data.elementDisposable.add(this.expressionRenderer.renderValue(data.value, viz, {
 			showChanged: false,
 			maxValueLength: 1024,
-			hover: data.elementDisposable,
 			colorize: true,
-			linkDetector: this.linkDetector
-		}, this.hoverService);
+			session: expression.getSession(),
+		}));
 	}
 
 	protected override getInputBoxOptions(expression: IExpression): IInputBoxOptions | undefined {
@@ -499,11 +493,11 @@ export class VisualizedVariableRenderer extends AbstractExpressionsRenderer {
 	protected override renderActionBar(actionBar: ActionBar, expression: IExpression, _data: IExpressionTemplateData) {
 		const viz = expression as VisualizedExpression;
 		const contextKeyService = viz.original ? getContextForVariableMenuBase(this.contextKeyService, viz.original) : this.contextKeyService;
-		const menu = this.menuService.createMenu(MenuId.DebugVariablesContext, contextKeyService);
+		const context = viz.original ? getVariablesContext(viz.original) : undefined;
+		const menu = this.menuService.getMenuActions(MenuId.DebugVariablesContext, contextKeyService, { arg: context, shouldForwardArgs: false });
 
 		const primary: IAction[] = [];
-		const context = viz.original ? getVariablesContext(viz.original) : undefined;
-		createAndFillInContextMenuActions(menu, { arg: context, shouldForwardArgs: false }, { primary, secondary: [] }, 'inline');
+		createAndFillInContextMenuActions(menu, { primary, secondary: [] }, 'inline');
 
 		if (viz.original) {
 			const action = new Action('debugViz', localize('removeVisualizer', 'Remove Visualizer'), ThemeIcon.asClassName(Codicon.eye), true, () => this.debugService.getViewModel().setVisualizedExpression(viz.original!, undefined));
@@ -522,12 +516,11 @@ export class VariablesRenderer extends AbstractExpressionsRenderer {
 	static readonly ID = 'variable';
 
 	constructor(
-		private readonly linkDetector: LinkDetector,
+		private readonly expressionRenderer: DebugExpressionRenderer,
 		@IMenuService private readonly menuService: IMenuService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IDebugVisualizerService private readonly visualization: IDebugVisualizerService,
 		@IContextMenuService private readonly contextMenuService: IContextMenuService,
-		@ICommandService private readonly commandService: ICommandService,
 		@IDebugService debugService: IDebugService,
 		@IContextViewService contextViewService: IContextViewService,
 		@IHoverService hoverService: IHoverService,
@@ -540,10 +533,14 @@ export class VariablesRenderer extends AbstractExpressionsRenderer {
 	}
 
 	protected renderExpression(expression: IExpression, data: IExpressionTemplateData, highlights: IHighlight[]): void {
-		renderVariable(data.elementDisposable, this.commandService, this.hoverService, expression as Variable, data, true, highlights, this.linkDetector);
+		data.elementDisposable.add(this.expressionRenderer.renderVariable(data, expression as Variable, {
+			highlights,
+			showChanged: true,
+		}));
 	}
 
 	public override renderElement(node: ITreeNode<IExpression, FuzzyScore>, index: number, data: IExpressionTemplateData): void {
+		data.elementDisposable.clear();
 		super.renderExpressionElement(node.element, node, data);
 	}
 
@@ -574,11 +571,11 @@ export class VariablesRenderer extends AbstractExpressionsRenderer {
 	protected override renderActionBar(actionBar: ActionBar, expression: IExpression, data: IExpressionTemplateData) {
 		const variable = expression as Variable;
 		const contextKeyService = getContextForVariableMenuBase(this.contextKeyService, variable);
-		const menu = this.menuService.createMenu(MenuId.DebugVariablesContext, contextKeyService);
 
 		const primary: IAction[] = [];
 		const context = getVariablesContext(variable);
-		createAndFillInContextMenuActions(menu, { arg: context, shouldForwardArgs: false }, { primary, secondary: [] }, 'inline');
+		const menu = this.menuService.getMenuActions(MenuId.DebugVariablesContext, contextKeyService, { arg: context, shouldForwardArgs: false });
+		createAndFillInContextMenuActions(menu, { primary, secondary: [] }, 'inline');
 
 		actionBar.clear();
 		actionBar.context = context;
diff --git a/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts b/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts
index 7369a367607..03ec10eedf1 100644
--- a/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts
+++ b/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts
@@ -3,39 +3,39 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDragAndDropData } from 'vs/base/browser/dnd';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { IHighlight } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
-import { IListVirtualDelegate, ListDragOverEffectPosition, ListDragOverEffectType } from 'vs/base/browser/ui/list/list';
-import { ElementsDragAndDropData, ListViewTargetSector } from 'vs/base/browser/ui/list/listView';
-import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
-import { ITreeContextMenuEvent, ITreeDragAndDrop, ITreeDragOverReaction, ITreeMouseEvent, ITreeNode } from 'vs/base/browser/ui/tree/tree';
-import { IAction } from 'vs/base/common/actions';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { Codicon } from 'vs/base/common/codicons';
-import { FuzzyScore } from 'vs/base/common/filters';
-import { localize } from 'vs/nls';
-import { createAndFillInContextMenuActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { Action2, IMenu, IMenuService, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { WorkbenchAsyncDataTree } from 'vs/platform/list/browser/listService';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ViewAction, ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
-import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
-import { IViewDescriptorService } from 'vs/workbench/common/views';
-import { AbstractExpressionDataSource, AbstractExpressionsRenderer, IExpressionTemplateData, IInputBoxOptions, renderExpressionValue, renderViewTree } from 'vs/workbench/contrib/debug/browser/baseDebugView';
-import { watchExpressionsAdd, watchExpressionsRemoveAll } from 'vs/workbench/contrib/debug/browser/debugIcons';
-import { LinkDetector } from 'vs/workbench/contrib/debug/browser/linkDetector';
-import { VariablesRenderer, VisualizedVariableRenderer } from 'vs/workbench/contrib/debug/browser/variablesView';
-import { CONTEXT_CAN_VIEW_MEMORY, CONTEXT_VARIABLE_IS_READONLY, CONTEXT_WATCH_EXPRESSIONS_EXIST, CONTEXT_WATCH_EXPRESSIONS_FOCUSED, CONTEXT_WATCH_ITEM_TYPE, IDebugService, IExpression, WATCH_VIEW_ID } from 'vs/workbench/contrib/debug/common/debug';
-import { Expression, Variable, VisualizedExpression } from 'vs/workbench/contrib/debug/common/debugModel';
+import { IDragAndDropData } from '../../../../base/browser/dnd.js';
+import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { IHighlight } from '../../../../base/browser/ui/highlightedlabel/highlightedLabel.js';
+import { IListVirtualDelegate, ListDragOverEffectPosition, ListDragOverEffectType } from '../../../../base/browser/ui/list/list.js';
+import { ElementsDragAndDropData, ListViewTargetSector } from '../../../../base/browser/ui/list/listView.js';
+import { IListAccessibilityProvider } from '../../../../base/browser/ui/list/listWidget.js';
+import { ITreeContextMenuEvent, ITreeDragAndDrop, ITreeDragOverReaction, ITreeMouseEvent, ITreeNode } from '../../../../base/browser/ui/tree/tree.js';
+import { IAction } from '../../../../base/common/actions.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { FuzzyScore } from '../../../../base/common/filters.js';
+import { localize } from '../../../../nls.js';
+import { createAndFillInContextMenuActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { Action2, IMenu, IMenuService, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService, IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { WorkbenchAsyncDataTree } from '../../../../platform/list/browser/listService.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ViewAction, ViewPane } from '../../../browser/parts/views/viewPane.js';
+import { IViewletViewOptions } from '../../../browser/parts/views/viewsViewlet.js';
+import { IViewDescriptorService } from '../../../common/views.js';
+import { CONTEXT_CAN_VIEW_MEMORY, CONTEXT_VARIABLE_IS_READONLY, CONTEXT_WATCH_EXPRESSIONS_EXIST, CONTEXT_WATCH_EXPRESSIONS_FOCUSED, CONTEXT_WATCH_ITEM_TYPE, IDebugConfiguration, IDebugService, IExpression, WATCH_VIEW_ID } from '../common/debug.js';
+import { Expression, Variable, VisualizedExpression } from '../common/debugModel.js';
+import { AbstractExpressionDataSource, AbstractExpressionsRenderer, IExpressionTemplateData, IInputBoxOptions, renderViewTree } from './baseDebugView.js';
+import { DebugExpressionRenderer } from './debugExpressionRenderer.js';
+import { watchExpressionsAdd, watchExpressionsRemoveAll } from './debugIcons.js';
+import { VariablesRenderer, VisualizedVariableRenderer } from './variablesView.js';
 
 const MAX_VALUE_RENDER_LENGTH_IN_VIEWLET = 1024;
 let ignoreViewUpdates = false;
@@ -50,6 +50,7 @@ export class WatchExpressionsView extends ViewPane {
 	private watchItemType: IContextKey<string | undefined>;
 	private variableReadonly: IContextKey<boolean>;
 	private menu: IMenu;
+	private expressionRenderer: DebugExpressionRenderer;
 
 	constructor(
 		options: IViewletViewOptions,
@@ -78,6 +79,7 @@ export class WatchExpressionsView extends ViewPane {
 		this.variableReadonly = CONTEXT_VARIABLE_IS_READONLY.bindTo(contextKeyService);
 		this.watchExpressionsExist.set(this.debugService.getModel().getWatchExpressions().length > 0);
 		this.watchItemType = CONTEXT_WATCH_ITEM_TYPE.bindTo(contextKeyService);
+		this.expressionRenderer = instantiationService.createInstance(DebugExpressionRenderer);
 	}
 
 	protected override renderBody(container: HTMLElement): void {
@@ -87,13 +89,12 @@ export class WatchExpressionsView extends ViewPane {
 		container.classList.add('debug-watch');
 		const treeContainer = renderViewTree(container);
 
-		const expressionsRenderer = this.instantiationService.createInstance(WatchExpressionsRenderer);
-		const linkDetector = this.instantiationService.createInstance(LinkDetector);
+		const expressionsRenderer = this.instantiationService.createInstance(WatchExpressionsRenderer, this.expressionRenderer);
 		this.tree = <WorkbenchAsyncDataTree<IDebugService | IExpression, IExpression, FuzzyScore>>this.instantiationService.createInstance(WorkbenchAsyncDataTree, 'WatchExpressions', treeContainer, new WatchExpressionsDelegate(),
 			[
 				expressionsRenderer,
-				this.instantiationService.createInstance(VariablesRenderer, linkDetector),
-				this.instantiationService.createInstance(VisualizedVariableRenderer, linkDetector),
+				this.instantiationService.createInstance(VariablesRenderer, this.expressionRenderer),
+				this.instantiationService.createInstance(VisualizedVariableRenderer, this.expressionRenderer),
 			],
 			this.instantiationService.createInstance(WatchExpressionsDataSource), {
 			accessibilityProvider: new WatchExpressionsAccessibilityProvider(),
@@ -157,7 +158,7 @@ export class WatchExpressionsView extends ViewPane {
 		let horizontalScrolling: boolean | undefined;
 		this._register(this.debugService.getViewModel().onDidSelectExpression(e => {
 			const expression = e?.expression;
-			if (expression && this.tree.hasElement(expression)) {
+			if (expression && this.tree.hasNode(expression)) {
 				horizontalScrolling = this.tree.options.horizontalScrolling;
 				if (horizontalScrolling) {
 					this.tree.updateOptions({ horizontalScrolling: false });
@@ -274,16 +275,18 @@ class WatchExpressionsDataSource extends AbstractExpressionDataSource<IDebugServ
 }
 
 
-class WatchExpressionsRenderer extends AbstractExpressionsRenderer {
+export class WatchExpressionsRenderer extends AbstractExpressionsRenderer {
 
 	static readonly ID = 'watchexpression';
 
 	constructor(
+		private readonly expressionRenderer: DebugExpressionRenderer,
 		@IMenuService private readonly menuService: IMenuService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IDebugService debugService: IDebugService,
 		@IContextViewService contextViewService: IContextViewService,
 		@IHoverService hoverService: IHoverService,
+		@IConfigurationService private configurationService: IConfigurationService,
 	) {
 		super(debugService, contextViewService, hoverService);
 	}
@@ -293,27 +296,47 @@ class WatchExpressionsRenderer extends AbstractExpressionsRenderer {
 	}
 
 	public override renderElement(node: ITreeNode<IExpression, FuzzyScore>, index: number, data: IExpressionTemplateData): void {
+		data.elementDisposable.clear();
+		data.elementDisposable.add(this.configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration('debug.showVariableTypes')) {
+				super.renderExpressionElement(node.element, node, data);
+			}
+		}));
 		super.renderExpressionElement(node.element, node, data);
 	}
 
 	protected renderExpression(expression: IExpression, data: IExpressionTemplateData, highlights: IHighlight[]): void {
-		const text = typeof expression.value === 'string' ? `${expression.name}:` : expression.name;
+		let text: string;
+		data.type.textContent = '';
+		const showType = this.configurationService.getValue<IDebugConfiguration>('debug').showVariableTypes;
+		if (showType && expression.type) {
+			text = typeof expression.value === 'string' ? `${expression.name}: ` : expression.name;
+			//render type
+			data.type.textContent = expression.type + ' =';
+		} else {
+			text = typeof expression.value === 'string' ? `${expression.name} =` : expression.name;
+		}
+
 		let title: string;
 		if (expression.type) {
-			title = expression.type === expression.value ?
-				expression.type :
-				`${expression.type}: ${expression.value}`;
+			if (showType) {
+				title = `${expression.name}`;
+			} else {
+				title = expression.type === expression.value ?
+					expression.type :
+					`${expression.type}`;
+			}
 		} else {
 			title = expression.value;
 		}
 
 		data.label.set(text, highlights, title);
-		renderExpressionValue(expression, data.value, {
+		data.elementDisposable.add(this.expressionRenderer.renderValue(data.value, expression, {
 			showChanged: true,
 			maxValueLength: MAX_VALUE_RENDER_LENGTH_IN_VIEWLET,
-			hover: data.elementDisposable,
-			colorize: true
-		}, this.hoverService);
+			colorize: true,
+			session: expression.getSession(),
+		}));
 	}
 
 	protected getInputBoxOptions(expression: IExpression, settingValue: boolean): IInputBoxOptions {
@@ -352,11 +375,11 @@ class WatchExpressionsRenderer extends AbstractExpressionsRenderer {
 
 	protected override renderActionBar(actionBar: ActionBar, expression: IExpression) {
 		const contextKeyService = getContextForWatchExpressionMenu(this.contextKeyService, expression);
-		const menu = this.menuService.createMenu(MenuId.DebugWatchContext, contextKeyService);
+		const context = expression;
+		const menu = this.menuService.getMenuActions(MenuId.DebugWatchContext, contextKeyService, { arg: context, shouldForwardArgs: false });
 
 		const primary: IAction[] = [];
-		const context = expression;
-		createAndFillInContextMenuActions(menu, { arg: context, shouldForwardArgs: false }, { primary, secondary: [] }, 'inline');
+		createAndFillInContextMenuActions(menu, { primary, secondary: [] }, 'inline');
 
 		actionBar.clear();
 		actionBar.context = context;
diff --git a/src/vs/workbench/contrib/debug/browser/welcomeView.ts b/src/vs/workbench/contrib/debug/browser/welcomeView.ts
index 841ae707d47..7dd6a939bb3 100644
--- a/src/vs/workbench/contrib/debug/browser/welcomeView.ts
+++ b/src/vs/workbench/contrib/debug/browser/welcomeView.ts
@@ -3,30 +3,30 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService, RawContextKey, IContextKey, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { localize, localize2 } from 'vs/nls';
-import { IDebugService, CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DEBUG_EXTENSION_AVAILABLE } from 'vs/workbench/contrib/debug/common/debug';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IViewDescriptorService, IViewsRegistry, Extensions, ViewContentGroups } from 'vs/workbench/common/views';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { WorkbenchStateContext } from 'vs/workbench/common/contextkeys';
-import { OpenFolderAction, OpenFileAction, OpenFileFolderAction } from 'vs/workbench/browser/actions/workspaceActions';
-import { isMacintosh, isWeb } from 'vs/base/common/platform';
-import { isCodeEditor, isDiffEditor } from 'vs/editor/browser/editorBrowser';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { SELECT_AND_START_ID, DEBUG_CONFIGURE_COMMAND_ID, DEBUG_START_COMMAND_ID } from 'vs/workbench/contrib/debug/browser/debugCommands';
-import { ILocalizedString } from 'vs/platform/action/common/action';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import { IViewletViewOptions } from '../../../browser/parts/views/viewsViewlet.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService, RawContextKey, IContextKey, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { IDebugService, CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DEBUG_EXTENSION_AVAILABLE } from '../common/debug.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { ViewPane } from '../../../browser/parts/views/viewPane.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IViewDescriptorService, IViewsRegistry, Extensions, ViewContentGroups } from '../../../common/views.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { WorkbenchStateContext } from '../../../common/contextkeys.js';
+import { OpenFolderAction, OpenFileAction, OpenFileFolderAction } from '../../../browser/actions/workspaceActions.js';
+import { isMacintosh, isWeb } from '../../../../base/common/platform.js';
+import { isCodeEditor, isDiffEditor } from '../../../../editor/browser/editorBrowser.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { SELECT_AND_START_ID, DEBUG_CONFIGURE_COMMAND_ID, DEBUG_START_COMMAND_ID } from './debugCommands.js';
+import { ILocalizedString } from '../../../../platform/action/common/action.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 
 const debugStartLanguageKey = 'debugStartLanguage';
 const CONTEXT_DEBUG_START_LANGUAGE = new RawContextKey<string>(debugStartLanguageKey, undefined);
diff --git a/src/vs/workbench/contrib/debug/common/abstractDebugAdapter.ts b/src/vs/workbench/contrib/debug/common/abstractDebugAdapter.ts
index 299a6ad3eb6..8ebd193420a 100644
--- a/src/vs/workbench/contrib/debug/common/abstractDebugAdapter.ts
+++ b/src/vs/workbench/contrib/debug/common/abstractDebugAdapter.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { IDebugAdapter } from 'vs/workbench/contrib/debug/common/debug';
-import { timeout } from 'vs/base/common/async';
-import { localize } from 'vs/nls';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { IDebugAdapter } from './debug.js';
+import { timeout } from '../../../../base/common/async.js';
+import { localize } from '../../../../nls.js';
 
 /**
  * Abstract implementation of the low level API for a debug adapter.
diff --git a/src/vs/workbench/contrib/debug/common/breakpoints.ts b/src/vs/workbench/contrib/debug/common/breakpoints.ts
index 38bc0d5114d..2609a8a3747 100644
--- a/src/vs/workbench/contrib/debug/common/breakpoints.ts
+++ b/src/vs/workbench/contrib/debug/common/breakpoints.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ContextKeyExpr, ContextKeyExpression, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IBreakpointContribution } from 'vs/workbench/contrib/debug/common/debug';
+import { ContextKeyExpr, ContextKeyExpression, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IBreakpointContribution } from './debug.js';
 
 export class Breakpoints {
 
diff --git a/src/vs/workbench/contrib/debug/common/debug.ts b/src/vs/workbench/contrib/debug/common/debug.ts
index a6bf29d33e2..65ecc46b857 100644
--- a/src/vs/workbench/contrib/debug/common/debug.ts
+++ b/src/vs/workbench/contrib/debug/common/debug.ts
@@ -3,32 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IAction } from 'vs/base/common/actions';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Color } from 'vs/base/common/color';
-import { Event } from 'vs/base/common/event';
-import { IJSONSchemaSnippet } from 'vs/base/common/jsonSchema';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import severity from 'vs/base/common/severity';
-import { URI, UriComponents, URI as uri } from 'vs/base/common/uri';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { IRange } from 'vs/editor/common/core/range';
-import * as editorCommon from 'vs/editor/common/editorCommon';
-import { ITextModel as EditorIModel } from 'vs/editor/common/model';
-import * as nls from 'vs/nls';
-import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ITelemetryEndpoint } from 'vs/platform/telemetry/common/telemetry';
-import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { IEditorPane } from 'vs/workbench/common/editor';
-import { DebugCompoundRoot } from 'vs/workbench/contrib/debug/common/debugCompoundRoot';
-import { IDataBreakpointOptions, IFunctionBreakpointOptions, IInstructionBreakpointOptions } from 'vs/workbench/contrib/debug/common/debugModel';
-import { Source } from 'vs/workbench/contrib/debug/common/debugSource';
-import { ITaskIdentifier } from 'vs/workbench/contrib/tasks/common/tasks';
-import { LiveTestResult } from 'vs/workbench/contrib/testing/common/testResult';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IAction } from '../../../../base/common/actions.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Color } from '../../../../base/common/color.js';
+import { Event } from '../../../../base/common/event.js';
+import { IJSONSchemaSnippet } from '../../../../base/common/jsonSchema.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import severity from '../../../../base/common/severity.js';
+import { URI, UriComponents, URI as uri } from '../../../../base/common/uri.js';
+import { IPosition, Position } from '../../../../editor/common/core/position.js';
+import { IRange } from '../../../../editor/common/core/range.js';
+import * as editorCommon from '../../../../editor/common/editorCommon.js';
+import { ITextModel as EditorIModel } from '../../../../editor/common/model.js';
+import * as nls from '../../../../nls.js';
+import { ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { ITelemetryEndpoint } from '../../../../platform/telemetry/common/telemetry.js';
+import { IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
+import { IEditorPane } from '../../../common/editor.js';
+import { DebugCompoundRoot } from './debugCompoundRoot.js';
+import { IDataBreakpointOptions, IFunctionBreakpointOptions, IInstructionBreakpointOptions } from './debugModel.js';
+import { Source } from './debugSource.js';
+import { ITaskIdentifier } from '../../tasks/common/tasks.js';
+import { LiveTestResult } from '../../testing/common/testResult.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
 
 export const VIEWLET_ID = 'workbench.view.debug';
 
@@ -51,9 +51,9 @@ export const CONTEXT_IN_DEBUG_REPL = new RawContextKey<boolean>('inDebugRepl', f
 export const CONTEXT_BREAKPOINT_WIDGET_VISIBLE = new RawContextKey<boolean>('breakpointWidgetVisible', false, { type: 'boolean', description: nls.localize('breakpointWidgetVisibile', "True when breakpoint editor zone widget is visible, false otherwise.") });
 export const CONTEXT_IN_BREAKPOINT_WIDGET = new RawContextKey<boolean>('inBreakpointWidget', false, { type: 'boolean', description: nls.localize('inBreakpointWidget', "True when focus is in the breakpoint editor zone widget, false otherwise.") });
 export const CONTEXT_BREAKPOINTS_FOCUSED = new RawContextKey<boolean>('breakpointsFocused', true, { type: 'boolean', description: nls.localize('breakpointsFocused', "True when the BREAKPOINTS view is focused, false otherwise.") });
-export const CONTEXT_WATCH_EXPRESSIONS_FOCUSED = new RawContextKey<boolean>('watchExpressionsFocused', true, { type: 'boolean', description: nls.localize('watchExpressionsFocused', "True when the WATCH view is focused, false otherwsie.") });
+export const CONTEXT_WATCH_EXPRESSIONS_FOCUSED = new RawContextKey<boolean>('watchExpressionsFocused', true, { type: 'boolean', description: nls.localize('watchExpressionsFocused', "True when the WATCH view is focused, false otherwise.") });
 export const CONTEXT_WATCH_EXPRESSIONS_EXIST = new RawContextKey<boolean>('watchExpressionsExist', false, { type: 'boolean', description: nls.localize('watchExpressionsExist', "True when at least one watch expression exists, false otherwise.") });
-export const CONTEXT_VARIABLES_FOCUSED = new RawContextKey<boolean>('variablesFocused', true, { type: 'boolean', description: nls.localize('variablesFocused', "True when the VARIABLES views is focused, false otherwsie") });
+export const CONTEXT_VARIABLES_FOCUSED = new RawContextKey<boolean>('variablesFocused', true, { type: 'boolean', description: nls.localize('variablesFocused', "True when the VARIABLES views is focused, false otherwise") });
 export const CONTEXT_EXPRESSION_SELECTED = new RawContextKey<boolean>('expressionSelected', false, { type: 'boolean', description: nls.localize('expressionSelected', "True when an expression input box is open in either the WATCH or the VARIABLES view, false otherwise.") });
 export const CONTEXT_BREAKPOINT_INPUT_FOCUSED = new RawContextKey<boolean>('breakpointInputFocused', false, { type: 'boolean', description: nls.localize('breakpointInputFocused', "True when the input box has focus in the BREAKPOINTS view.") });
 export const CONTEXT_CALLSTACK_ITEM_TYPE = new RawContextKey<string>('callStackItemType', undefined, { type: 'string', description: nls.localize('callStackItemType', "Represents the item type of the focused element in the CALL STACK view. For example: 'session', 'thread', 'stackFrame'") });
@@ -72,7 +72,7 @@ export const CONTEXT_FOCUSED_SESSION_IS_ATTACH = new RawContextKey<boolean>('foc
 export const CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG = new RawContextKey<boolean>('focusedSessionIsNoDebug', false, { type: 'boolean', description: nls.localize('focusedSessionIsNoDebug', "True when the focused session is run without debugging.") });
 export const CONTEXT_STEP_BACK_SUPPORTED = new RawContextKey<boolean>('stepBackSupported', false, { type: 'boolean', description: nls.localize('stepBackSupported', "True when the focused session supports 'stepBack' requests.") });
 export const CONTEXT_RESTART_FRAME_SUPPORTED = new RawContextKey<boolean>('restartFrameSupported', false, { type: 'boolean', description: nls.localize('restartFrameSupported', "True when the focused session supports 'restartFrame' requests.") });
-export const CONTEXT_STACK_FRAME_SUPPORTS_RESTART = new RawContextKey<boolean>('stackFrameSupportsRestart', false, { type: 'boolean', description: nls.localize('stackFrameSupportsRestart', "True when the focused stack frame suppots 'restartFrame'.") });
+export const CONTEXT_STACK_FRAME_SUPPORTS_RESTART = new RawContextKey<boolean>('stackFrameSupportsRestart', false, { type: 'boolean', description: nls.localize('stackFrameSupportsRestart', "True when the focused stack frame supports 'restartFrame'.") });
 export const CONTEXT_JUMP_TO_CURSOR_SUPPORTED = new RawContextKey<boolean>('jumpToCursorSupported', false, { type: 'boolean', description: nls.localize('jumpToCursorSupported', "True when the focused session supports 'jumpToCursor' request.") });
 export const CONTEXT_STEP_INTO_TARGETS_SUPPORTED = new RawContextKey<boolean>('stepIntoTargetsSupported', false, { type: 'boolean', description: nls.localize('stepIntoTargetsSupported', "True when the focused session supports 'stepIntoTargets' request.") });
 export const CONTEXT_BREAKPOINTS_EXIST = new RawContextKey<boolean>('breakpointsExist', false, { type: 'boolean', description: nls.localize('breakpointsExist', "True when at least one breakpoint exists.") });
@@ -164,11 +164,13 @@ export interface IExpressionValue {
 
 export interface IExpressionContainer extends ITreeElement, IExpressionValue {
 	readonly hasChildren: boolean;
+	getSession(): IDebugSession | undefined;
 	evaluateLazy(): Promise<void>;
 	getChildren(): Promise<IExpression[]>;
 	readonly reference?: number;
 	readonly memoryReference?: string;
 	readonly presentationHint?: DebugProtocol.VariablePresentationHint | undefined;
+	readonly valueLocationReference?: number;
 }
 
 export interface IExpression extends IExpressionContainer {
@@ -346,6 +348,19 @@ export interface INewReplElementData {
 	source?: IReplElementSource;
 }
 
+export interface IDebugEvaluatePosition {
+	line: number;
+	column: number;
+	source: DebugProtocol.Source;
+}
+
+export interface IDebugLocationReferenced {
+	line: number;
+	column: number;
+	endLine?: number;
+	endColumn?: number;
+	source: Source;
+}
 
 export interface IDebugSession extends ITreeElement {
 
@@ -395,10 +410,12 @@ export interface IDebugSession extends ITreeElement {
 	// session events
 	readonly onDidEndAdapter: Event<AdapterEndEvent | undefined>;
 	readonly onDidChangeState: Event<void>;
-	readonly onDidChangeReplElements: Event<void>;
+	readonly onDidChangeReplElements: Event<IReplElement | undefined>;
 
-	// DA capabilities
+	/** DA capabilities. Set only when there is a running session available. */
 	readonly capabilities: DebugProtocol.Capabilities;
+	/** DA capabilities. These are retained on the session even after is implementation ends. */
+	readonly rememberedCapabilities?: DebugProtocol.Capabilities;
 
 	// DAP events
 
@@ -426,12 +443,13 @@ export interface IDebugSession extends ITreeElement {
 	sendExceptionBreakpoints(exbpts: IExceptionBreakpoint[]): Promise<void>;
 	breakpointsLocations(uri: uri, lineNumber: number): Promise<IPosition[]>;
 	getDebugProtocolBreakpoint(breakpointId: string): DebugProtocol.Breakpoint | undefined;
+	resolveLocationReference(locationReference: number): Promise<IDebugLocationReferenced>;
 
 	stackTrace(threadId: number, startFrame: number, levels: number, token: CancellationToken): Promise<DebugProtocol.StackTraceResponse | undefined>;
 	exceptionInfo(threadId: number): Promise<IExceptionInfo | undefined>;
 	scopes(frameId: number, threadId: number): Promise<DebugProtocol.ScopesResponse | undefined>;
 	variables(variablesReference: number, threadId: number | undefined, filter: 'indexed' | 'named' | undefined, start: number | undefined, count: number | undefined): Promise<DebugProtocol.VariablesResponse | undefined>;
-	evaluate(expression: string, frameId?: number, context?: string): Promise<DebugProtocol.EvaluateResponse | undefined>;
+	evaluate(expression: string, frameId?: number, context?: string, location?: IDebugEvaluatePosition): Promise<DebugProtocol.EvaluateResponse | undefined>;
 	customRequest(request: string, args: any): Promise<DebugProtocol.Response | undefined>;
 	cancel(progressId: string): Promise<DebugProtocol.CancelResponse | undefined>;
 	disassemble(memoryReference: string, offset: number, instructionOffset: number, instructionCount: number): Promise<DebugProtocol.DisassembledInstruction[] | undefined>;
@@ -547,7 +565,8 @@ export interface IStackFrame extends ITreeElement {
 }
 
 export function isFrameDeemphasized(frame: IStackFrame): boolean {
-	return frame.source.presentationHint === 'deemphasize' || frame.presentationHint === 'deemphasize' || frame.presentationHint === 'subtle';
+	const hint = frame.presentationHint ?? frame.source.presentationHint;
+	return hint === 'deemphasize' || hint === 'subtle';
 }
 
 export interface IEnablement extends ITreeElement {
@@ -736,7 +755,14 @@ export interface IDebugModel extends ITreeElement {
 	getBreakpointModes(forBreakpointType: 'source' | 'exception' | 'data' | 'instruction'): DebugProtocol.BreakpointMode[];
 	onDidChangeBreakpoints: Event<IBreakpointsChangeEvent | undefined>;
 	onDidChangeCallStack: Event<void>;
+	/**
+	 * The expression has been added, removed, or repositioned.
+	 */
 	onDidChangeWatchExpressions: Event<IExpression | undefined>;
+	/**
+	 * The expression's value has changed.
+	 */
+	onDidChangeWatchExpressionValue: Event<IExpression | undefined>;
 
 	fetchCallstack(thread: IThread, levels?: number): Promise<void>;
 }
@@ -785,8 +811,9 @@ export interface IDebugConfiguration {
 	disassemblyView: {
 		showSourceCode: boolean;
 	};
-	autoExpandLazyVariables: boolean;
+	autoExpandLazyVariables: 'auto' | 'off' | 'on';
 	enableStatusBarColor: boolean;
+	showVariableTypes: boolean;
 }
 
 export interface IGlobalConfig {
@@ -887,7 +914,6 @@ export interface IDebugAdapterInlineImpl extends IDisposable {
 
 export interface IDebugAdapterImpl {
 	readonly type: 'implementation';
-	readonly implementation: IDebugAdapterInlineImpl;
 }
 
 export type IAdapterDescriptor = IDebugAdapterExecutable | IDebugAdapterServer | IDebugAdapterNamedPipeServer | IDebugAdapterImpl;
diff --git a/src/vs/workbench/contrib/debug/common/debugAccessibilityAnnouncer.ts b/src/vs/workbench/contrib/debug/common/debugAccessibilityAnnouncer.ts
new file mode 100644
index 00000000000..f15750fbbf4
--- /dev/null
+++ b/src/vs/workbench/contrib/debug/common/debugAccessibilityAnnouncer.ts
@@ -0,0 +1,48 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IDebugService } from './debug.js';
+import { Disposable, IDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { Expression } from './debugModel.js';
+
+export class DebugWatchAccessibilityAnnouncer extends Disposable implements IWorkbenchContribution {
+	static ID = 'workbench.contrib.debugWatchAccessibilityAnnouncer';
+	private readonly _listener: MutableDisposable<IDisposable> = this._register(new MutableDisposable());
+	constructor(
+		@IDebugService private readonly _debugService: IDebugService,
+		@ILogService private readonly _logService: ILogService,
+		@IAccessibilityService private readonly _accessibilityService: IAccessibilityService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService
+	) {
+		super();
+		this._setListener();
+		this._register(_configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration('accessibility.debugWatchVariableAnnouncements')) {
+				this._setListener();
+			}
+		}));
+	}
+
+	private _setListener(): void {
+		const value = this._configurationService.getValue('accessibility.debugWatchVariableAnnouncements');
+		if (value && !this._listener.value) {
+			this._listener.value = this._debugService.getModel().onDidChangeWatchExpressionValue((e) => {
+				if (!e || e.value === Expression.DEFAULT_VALUE) {
+					return;
+				}
+
+				// TODO: get user feedback, perhaps setting to configure verbosity + whether value, name, neither, or both are announced
+				this._accessibilityService.alert(`${e.name} = ${e.value}`);
+				this._logService.trace(`debugAccessibilityAnnouncerValueChanged ${e.name} ${e.value}`);
+			});
+		} else {
+			this._listener.clear();
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/debug/common/debugCompoundRoot.ts b/src/vs/workbench/contrib/debug/common/debugCompoundRoot.ts
index adbf292db5c..c4e0e58021e 100644
--- a/src/vs/workbench/contrib/debug/common/debugCompoundRoot.ts
+++ b/src/vs/workbench/contrib/debug/common/debugCompoundRoot.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
+import { Emitter } from '../../../../base/common/event.js';
 
 export class DebugCompoundRoot {
 	private stopped = false;
diff --git a/src/vs/workbench/contrib/debug/common/debugContentProvider.ts b/src/vs/workbench/contrib/debug/common/debugContentProvider.ts
index 62bf8a6c423..935d2c3db2d 100644
--- a/src/vs/workbench/contrib/debug/common/debugContentProvider.ts
+++ b/src/vs/workbench/contrib/debug/common/debugContentProvider.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI as uri } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { getMimeTypes } from 'vs/editor/common/services/languagesAssociations';
-import { ITextModel } from 'vs/editor/common/model';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ITextModelService, ITextModelContentProvider } from 'vs/editor/common/services/resolverService';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { DEBUG_SCHEME, IDebugService, IDebugSession } from 'vs/workbench/contrib/debug/common/debug';
-import { Source } from 'vs/workbench/contrib/debug/common/debugSource';
-import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { EditOperation } from 'vs/editor/common/core/editOperation';
-import { Range } from 'vs/editor/common/core/range';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { ErrorNoTelemetry } from 'vs/base/common/errors';
+import { URI as uri } from '../../../../base/common/uri.js';
+import { localize } from '../../../../nls.js';
+import { getMimeTypes } from '../../../../editor/common/services/languagesAssociations.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { ITextModelService, ITextModelContentProvider } from '../../../../editor/common/services/resolverService.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { DEBUG_SCHEME, IDebugService, IDebugSession } from './debug.js';
+import { Source } from './debugSource.js';
+import { IEditorWorkerService } from '../../../../editor/common/services/editorWorker.js';
+import { EditOperation } from '../../../../editor/common/core/editOperation.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../../../../editor/common/languages/modesRegistry.js';
+import { ErrorNoTelemetry } from '../../../../base/common/errors.js';
 
 /**
  * Debug URI format
diff --git a/src/vs/workbench/contrib/debug/common/debugContext.ts b/src/vs/workbench/contrib/debug/common/debugContext.ts
index 26a69533107..6cb1d6c7909 100644
--- a/src/vs/workbench/contrib/debug/common/debugContext.ts
+++ b/src/vs/workbench/contrib/debug/common/debugContext.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { CONTEXT_DEBUG_PROTOCOL_VARIABLE_MENU_CONTEXT, CONTEXT_VARIABLE_EVALUATE_NAME_PRESENT, CONTEXT_CAN_VIEW_MEMORY, CONTEXT_VARIABLE_IS_READONLY, CONTEXT_DEBUG_TYPE } from 'vs/workbench/contrib/debug/common/debug';
-import { Variable } from 'vs/workbench/contrib/debug/common/debugModel';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { CONTEXT_DEBUG_PROTOCOL_VARIABLE_MENU_CONTEXT, CONTEXT_VARIABLE_EVALUATE_NAME_PRESENT, CONTEXT_CAN_VIEW_MEMORY, CONTEXT_VARIABLE_IS_READONLY, CONTEXT_DEBUG_TYPE } from './debug.js';
+import { Variable } from './debugModel.js';
 
 
 /**
diff --git a/src/vs/workbench/contrib/debug/common/debugLifecycle.ts b/src/vs/workbench/contrib/debug/common/debugLifecycle.ts
index 68420965735..a5d6de90e9e 100644
--- a/src/vs/workbench/contrib/debug/common/debugLifecycle.ts
+++ b/src/vs/workbench/contrib/debug/common/debugLifecycle.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable } from 'vs/base/common/lifecycle';
-import * as nls from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IDebugConfiguration, IDebugService } from 'vs/workbench/contrib/debug/common/debug';
-import { ILifecycleService, ShutdownReason } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import * as nls from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IDebugConfiguration, IDebugService } from './debug.js';
+import { ILifecycleService, ShutdownReason } from '../../../services/lifecycle/common/lifecycle.js';
 
 export class DebugLifecycle implements IWorkbenchContribution {
 	private disposable: IDisposable;
diff --git a/src/vs/workbench/contrib/debug/common/debugModel.ts b/src/vs/workbench/contrib/debug/common/debugModel.ts
index 13f7d1d902d..4660763365f 100644
--- a/src/vs/workbench/contrib/debug/common/debugModel.ts
+++ b/src/vs/workbench/contrib/debug/common/debugModel.ts
@@ -3,32 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { distinct } from 'vs/base/common/arrays';
-import { findLastIdx } from 'vs/base/common/arraysFind';
-import { DeferredPromise, RunOnceScheduler } from 'vs/base/common/async';
-import { VSBuffer, decodeBase64, encodeBase64 } from 'vs/base/common/buffer';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { stringHash } from 'vs/base/common/hash';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { mixin } from 'vs/base/common/objects';
-import { autorun } from 'vs/base/common/observable';
-import * as resources from 'vs/base/common/resources';
-import { isString, isUndefinedOrNull } from 'vs/base/common/types';
-import { URI, URI as uri } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import * as nls from 'vs/nls';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IEditorPane } from 'vs/workbench/common/editor';
-import { DEBUG_MEMORY_SCHEME, DataBreakpointSetType, DataBreakpointSource, DebugTreeItemCollapsibleState, IBaseBreakpoint, IBreakpoint, IBreakpointData, IBreakpointUpdateData, IBreakpointsChangeEvent, IDataBreakpoint, IDebugModel, IDebugSession, IDebugVisualizationTreeItem, IEnablement, IExceptionBreakpoint, IExceptionInfo, IExpression, IExpressionContainer, IFunctionBreakpoint, IInstructionBreakpoint, IMemoryInvalidationEvent, IMemoryRegion, IRawModelUpdate, IRawStoppedDetails, IScope, IStackFrame, IThread, ITreeElement, MemoryRange, MemoryRangeType, State, isFrameDeemphasized } from 'vs/workbench/contrib/debug/common/debug';
-import { Source, UNKNOWN_SOURCE_LABEL, getUriFromSource } from 'vs/workbench/contrib/debug/common/debugSource';
-import { DebugStorage } from 'vs/workbench/contrib/debug/common/debugStorage';
-import { IDebugVisualizerService } from 'vs/workbench/contrib/debug/common/debugVisualizers';
-import { DisassemblyViewInput } from 'vs/workbench/contrib/debug/common/disassemblyViewInput';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
+import { distinct } from '../../../../base/common/arrays.js';
+import { findLastIdx } from '../../../../base/common/arraysFind.js';
+import { DeferredPromise, RunOnceScheduler } from '../../../../base/common/async.js';
+import { VSBuffer, decodeBase64, encodeBase64 } from '../../../../base/common/buffer.js';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { Emitter, Event, trackSetChanges } from '../../../../base/common/event.js';
+import { stringHash } from '../../../../base/common/hash.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { mixin } from '../../../../base/common/objects.js';
+import { autorun } from '../../../../base/common/observable.js';
+import * as resources from '../../../../base/common/resources.js';
+import { isString, isUndefinedOrNull } from '../../../../base/common/types.js';
+import { URI, URI as uri } from '../../../../base/common/uri.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { IRange, Range } from '../../../../editor/common/core/range.js';
+import * as nls from '../../../../nls.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IEditorPane } from '../../../common/editor.js';
+import { DEBUG_MEMORY_SCHEME, DataBreakpointSetType, DataBreakpointSource, DebugTreeItemCollapsibleState, IBaseBreakpoint, IBreakpoint, IBreakpointData, IBreakpointUpdateData, IBreakpointsChangeEvent, IDataBreakpoint, IDebugEvaluatePosition, IDebugModel, IDebugSession, IDebugVisualizationTreeItem, IEnablement, IExceptionBreakpoint, IExceptionInfo, IExpression, IExpressionContainer, IFunctionBreakpoint, IInstructionBreakpoint, IMemoryInvalidationEvent, IMemoryRegion, IRawModelUpdate, IRawStoppedDetails, IScope, IStackFrame, IThread, ITreeElement, MemoryRange, MemoryRangeType, State, isFrameDeemphasized } from './debug.js';
+import { Source, UNKNOWN_SOURCE_LABEL, getUriFromSource } from './debugSource.js';
+import { DebugStorage } from './debugStorage.js';
+import { IDebugVisualizerService } from './debugVisualizers.js';
+import { DisassemblyViewInput } from './disassemblyViewInput.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
 
 interface IDebugProtocolVariableWithContext extends DebugProtocol.Variable {
 	__vscodeVariableMenuContext?: string;
@@ -54,7 +54,8 @@ export class ExpressionContainer implements IExpressionContainer {
 		public indexedVariables: number | undefined = 0,
 		public memoryReference: string | undefined = undefined,
 		private startOfVariables: number | undefined = 0,
-		public presentationHint: DebugProtocol.VariablePresentationHint | undefined = undefined
+		public presentationHint: DebugProtocol.VariablePresentationHint | undefined = undefined,
+		public valueLocationReference: number | undefined = undefined,
 	) { }
 
 	get reference(): number | undefined {
@@ -83,6 +84,7 @@ export class ExpressionContainer implements IExpressionContainer {
 		this.indexedVariables = dummyVar.indexedVariables;
 		this.memoryReference = dummyVar.memoryReference;
 		this.presentationHint = dummyVar.presentationHint;
+		this.valueLocationReference = dummyVar.valueLocationReference;
 		// Also call overridden method to adopt subclass props
 		this.adoptLazyResponse(dummyVar);
 	}
@@ -162,7 +164,7 @@ export class ExpressionContainer implements IExpressionContainer {
 					const count = nameCount.get(v.name) || 0;
 					const idDuplicationIndex = count > 0 ? count.toString() : '';
 					nameCount.set(v.name, count + 1);
-					return new Variable(this.session, this.threadId, this, v.variablesReference, v.name, v.evaluateName, v.value, v.namedVariables, v.indexedVariables, v.memoryReference, v.presentationHint, v.type, v.__vscodeVariableMenuContext, true, 0, idDuplicationIndex);
+					return new Variable(this.session, this.threadId, this, v.variablesReference, v.name, v.evaluateName, v.value, v.namedVariables, v.indexedVariables, v.memoryReference, v.presentationHint, v.type, v.__vscodeVariableMenuContext, true, 0, idDuplicationIndex, v.declarationLocationReference, v.valueLocationReference);
 				}
 				return new Variable(this.session, this.threadId, this, 0, '', undefined, nls.localize('invalidVariableAttributes', "Invalid variable attributes"), 0, 0, undefined, { kind: 'virtual' }, undefined, undefined, false);
 			});
@@ -198,7 +200,9 @@ export class ExpressionContainer implements IExpressionContainer {
 		session: IDebugSession | undefined,
 		stackFrame: IStackFrame | undefined,
 		context: string,
-		keepLazyVars = false): Promise<boolean> {
+		keepLazyVars = false,
+		location?: IDebugEvaluatePosition,
+	): Promise<boolean> {
 
 		if (!session || (!stackFrame && context !== 'repl')) {
 			this.value = context === 'repl' ? nls.localize('startDebugFirst', "Please start a debug session to evaluate expressions") : Expression.DEFAULT_VALUE;
@@ -208,7 +212,7 @@ export class ExpressionContainer implements IExpressionContainer {
 
 		this.session = session;
 		try {
-			const response = await session.evaluate(expression, stackFrame ? stackFrame.frameId : undefined, context);
+			const response = await session.evaluate(expression, stackFrame ? stackFrame.frameId : undefined, context, location);
 
 			if (response && response.body) {
 				this.value = response.body.result || '';
@@ -218,6 +222,7 @@ export class ExpressionContainer implements IExpressionContainer {
 				this.memoryReference = response.body.memoryReference;
 				this.type = response.body.type || this.type;
 				this.presentationHint = response.body.presentationHint;
+				this.valueLocationReference = response.body.valueLocationReference;
 
 				if (!keepLazyVars && response.body.presentationHint?.lazy) {
 					await this.evaluateLazy();
@@ -253,7 +258,7 @@ export class VisualizedExpression implements IExpression {
 		return Promise.resolve();
 	}
 	getChildren(): Promise<IExpression[]> {
-		return this.visualizer.getVisualizedChildren(this.treeId, this.treeItem.id);
+		return this.visualizer.getVisualizedChildren(this.session, this.treeId, this.treeItem.id);
 	}
 
 	getId(): string {
@@ -273,12 +278,17 @@ export class VisualizedExpression implements IExpression {
 	}
 
 	constructor(
+		private readonly session: IDebugSession | undefined,
 		private readonly visualizer: IDebugVisualizerService,
 		public readonly treeId: string,
 		public readonly treeItem: IDebugVisualizationTreeItem,
 		public readonly original?: Variable,
 	) { }
 
+	public getSession(): IDebugSession | undefined {
+		return this.session;
+	}
+
 	/** Edits the value, sets the {@link errorMessage} and returns false if unsuccessful */
 	public async edit(newValue: string) {
 		try {
@@ -296,6 +306,9 @@ export class Expression extends ExpressionContainer implements IExpression {
 
 	public available: boolean;
 
+	private readonly _onDidChangeValue = new Emitter<IExpression>();
+	public readonly onDidChangeValue: Event<IExpression> = this._onDidChangeValue.event;
+
 	constructor(public name: string, id = generateUuid()) {
 		super(undefined, undefined, 0, id);
 		this.available = false;
@@ -306,8 +319,12 @@ export class Expression extends ExpressionContainer implements IExpression {
 		}
 	}
 
-	async evaluate(session: IDebugSession | undefined, stackFrame: IStackFrame | undefined, context: string, keepLazyVars?: boolean): Promise<void> {
-		this.available = await this.evaluateExpression(this.name, session, stackFrame, context, keepLazyVars);
+	async evaluate(session: IDebugSession | undefined, stackFrame: IStackFrame | undefined, context: string, keepLazyVars?: boolean, location?: IDebugEvaluatePosition): Promise<void> {
+		const hadDefaultValue = this.value === Expression.DEFAULT_VALUE;
+		this.available = await this.evaluateExpression(this.name, session, stackFrame, context, keepLazyVars, location);
+		if (hadDefaultValue || this.valueChanged) {
+			this._onDidChangeValue.fire(this);
+		}
 	}
 
 	override toString(): string {
@@ -346,8 +363,10 @@ export class Variable extends ExpressionContainer implements IExpression {
 		public readonly available = true,
 		startOfVariables = 0,
 		idDuplicationIndex = '',
+		public readonly declarationLocationReference: number | undefined = undefined,
+		valueLocationReference: number | undefined = undefined,
 	) {
-		super(session, threadId, reference, `variable:${parent.getId()}:${name}:${idDuplicationIndex}`, namedVariables, indexedVariables, memoryReference, startOfVariables, presentationHint);
+		super(session, threadId, reference, `variable:${parent.getId()}:${name}:${idDuplicationIndex}`, namedVariables, indexedVariables, memoryReference, startOfVariables, presentationHint, valueLocationReference);
 		this.value = value || '';
 		this.type = type;
 	}
@@ -540,6 +559,8 @@ export class StackFrame implements IStackFrame {
 	}
 }
 
+const KEEP_SUBTLE_FRAME_AT_TOP_REASONS: readonly string[] = ['breakpoint', 'step', 'function breakpoint'];
+
 export class Thread implements IThread {
 	private callStack: IStackFrame[];
 	private staleCallStack: IStackFrame[];
@@ -578,10 +599,11 @@ export class Thread implements IThread {
 
 	getTopStackFrame(): IStackFrame | undefined {
 		const callStack = this.getCallStack();
+		const stopReason = this.stoppedDetails?.reason;
 		// Allow stack frame without source and with instructionReferencePointer as top stack frame when using disassembly view.
 		const firstAvailableStackFrame = callStack.find(sf => !!(
-			((this.stoppedDetails?.reason === 'instruction breakpoint' || (this.stoppedDetails?.reason === 'step' && this.lastSteppingGranularity === 'instruction')) && sf.instructionPointerReference) ||
-			(sf.source && sf.source.available && !isFrameDeemphasized(sf))));
+			((stopReason === 'instruction breakpoint' || (stopReason === 'step' && this.lastSteppingGranularity === 'instruction')) && sf.instructionPointerReference) ||
+			(sf.source && sf.source.available && (KEEP_SUBTLE_FRAME_AT_TOP_REASONS.includes(stopReason!) || !isFrameDeemphasized(sf)))));
 		return firstAvailableStackFrame;
 	}
 
@@ -1398,6 +1420,7 @@ export class DebugModel extends Disposable implements IDebugModel {
 	private readonly _onDidChangeBreakpoints = this._register(new Emitter<IBreakpointsChangeEvent | undefined>());
 	private readonly _onDidChangeCallStack = this._register(new Emitter<void>());
 	private readonly _onDidChangeWatchExpressions = this._register(new Emitter<IExpression | undefined>());
+	private readonly _onDidChangeWatchExpressionValue = this._register(new Emitter<IExpression | undefined>());
 	private readonly _breakpointModes = new Map<string, IBreakpointModeInternal>();
 	private breakpoints!: Breakpoint[];
 	private functionBreakpoints!: FunctionBreakpoint[];
@@ -1427,6 +1450,12 @@ export class DebugModel extends Disposable implements IDebugModel {
 			this._onDidChangeWatchExpressions.fire(undefined);
 		}));
 
+		this._register(trackSetChanges(
+			() => new Set(this.watchExpressions),
+			this.onDidChangeWatchExpressions,
+			(we) => we.onDidChangeValue((e) => this._onDidChangeWatchExpressionValue.fire(e)))
+		);
+
 		this.instructionBreakpoints = [];
 		this.sessions = [];
 	}
@@ -1492,6 +1521,10 @@ export class DebugModel extends Disposable implements IDebugModel {
 		return this._onDidChangeWatchExpressions.event;
 	}
 
+	get onDidChangeWatchExpressionValue(): Event<IExpression | undefined> {
+		return this._onDidChangeWatchExpressionValue.event;
+	}
+
 	rawUpdate(data: IRawModelUpdate): void {
 		const session = this.sessions.find(p => p.getId() === data.sessionId);
 		if (session) {
@@ -1544,7 +1577,13 @@ export class DebugModel extends Disposable implements IDebugModel {
 			let topCallStack = Promise.resolve();
 			const wholeCallStack = new Promise<void>((c, e) => {
 				topCallStack = thread.fetchCallStack(1).then(() => {
-					if (!this.schedulers.has(thread.getId()) && fetchFullStack) {
+					if (!fetchFullStack) {
+						c();
+						this._onDidChangeCallStack.fire();
+						return;
+					}
+
+					if (!this.schedulers.has(thread.getId())) {
 						const deferred = new DeferredPromise<void>();
 						this.schedulers.set(thread.getId(), {
 							completeDeferred: deferred,
diff --git a/src/vs/workbench/contrib/debug/common/debugProtocol.d.ts b/src/vs/workbench/contrib/debug/common/debugProtocol.d.ts
index 50eacfd65e2..560d252edd3 100644
--- a/src/vs/workbench/contrib/debug/common/debugProtocol.d.ts
+++ b/src/vs/workbench/contrib/debug/common/debugProtocol.d.ts
@@ -221,7 +221,12 @@ declare module DebugProtocol {
 				etc.
 			*/
 			category?: 'console' | 'important' | 'stdout' | 'stderr' | 'telemetry' | string;
-			/** The output to report. */
+			/** The output to report.
+
+				ANSI escape sequences may be used to inflience text color and styling if `supportsANSIStyling` is present in both the adapter's `Capabilities` and the client's `InitializeRequestArguments`. A client may strip any unrecognized ANSI sequences.
+
+				If the `supportsANSIStyling` capabilities are not both true, then the client should display the output literally.
+			*/
 			output: string;
 			/** Support for keeping an output log organized by grouping related messages.
 				'start': Start a new group in expanded mode. Subsequent output events are members of the group and should be shown indented.
@@ -242,6 +247,11 @@ declare module DebugProtocol {
 			column?: number;
 			/** Additional data to report. For the `telemetry` category the data is sent to telemetry, for the other categories the data is shown in JSON format. */
 			data?: any;
+			/** A reference that allows the client to request the location where the new value is declared. For example, if the logged value is function pointer, the adapter may be able to look up the function's location. This should be present only if the adapter is likely to be able to resolve the location.
+
+				This reference shares the same lifetime as the `variablesReference`. See 'Lifetime of Object References' in the Overview section for details.
+			*/
+			locationReference?: number;
 		};
 	}
 
@@ -294,7 +304,7 @@ declare module DebugProtocol {
 		body: {
 			/** The logical name of the process. This is usually the full path to process's executable file. Example: /home/example/myproj/program.js. */
 			name: string;
-			/** The system process id of the debugged process. This property is missing for non-system processes. */
+			/** The process ID of the debugged process, as assigned by the operating system. This property should be omitted for logical processes that do not map to operating system processes on the machine. */
 			systemProcessId?: number;
 			/** If true, the process is running on the same computer as the debug adapter. */
 			isLocalProcess?: boolean;
@@ -525,6 +535,8 @@ declare module DebugProtocol {
 		supportsArgsCanBeInterpretedByShell?: boolean;
 		/** Client supports the `startDebugging` request. */
 		supportsStartDebuggingRequest?: boolean;
+		/** The client will interpret ANSI escape sequences in the display of `OutputEvent.output` and `Variable.value` fields when `Capabilities.supportsANSIStyling` is also enabled. */
+		supportsANSIStyling?: boolean;
 	}
 
 	/** Response to `initialize` request. */
@@ -1232,7 +1244,10 @@ declare module DebugProtocol {
 			value: string;
 			/** The type of the new value. Typically shown in the UI when hovering over the value. */
 			type?: string;
-			/** If `variablesReference` is > 0, the new value is structured and its children can be retrieved by passing `variablesReference` to the `variables` request as long as execution remains suspended. See 'Lifetime of Object References' in the Overview section for details. */
+			/** If `variablesReference` is > 0, the new value is structured and its children can be retrieved by passing `variablesReference` to the `variables` request as long as execution remains suspended. See 'Lifetime of Object References' in the Overview section for details.
+
+				If this property is included in the response, any `variablesReference` previously associated with the updated variable, and those of its children, are no longer valid.
+			*/
 			variablesReference?: number;
 			/** The number of named child variables.
 				The client can use this information to present the variables in a paged UI and fetch them in chunks.
@@ -1249,6 +1264,11 @@ declare module DebugProtocol {
 				This attribute may be returned by a debug adapter if corresponding capability `supportsMemoryReferences` is true.
 			*/
 			memoryReference?: string;
+			/** A reference that allows the client to request the location where the new value is declared. For example, if the new value is function pointer, the adapter may be able to look up the function's location. This should be present only if the adapter is likely to be able to resolve the location.
+
+				This reference shares the same lifetime as the `variablesReference`. See 'Lifetime of Object References' in the Overview section for details.
+			*/
+			valueLocationReference?: number;
 		};
 	}
 
@@ -1363,7 +1383,7 @@ declare module DebugProtocol {
 	}
 
 	/** Evaluate request; value of command field is 'evaluate'.
-		Evaluates the given expression in the context of the topmost stack frame.
+		Evaluates the given expression in the context of a stack frame.
 		The expression has access to any variables and arguments that are in scope.
 	*/
 	interface EvaluateRequest extends Request {
@@ -1377,6 +1397,15 @@ declare module DebugProtocol {
 		expression: string;
 		/** Evaluate the expression in the scope of this stack frame. If not specified, the expression is evaluated in the global scope. */
 		frameId?: number;
+		/** The contextual line where the expression should be evaluated. In the 'hover' context, this should be set to the start of the expression being hovered. */
+		line?: number;
+		/** The contextual column where the expression should be evaluated. This may be provided if `line` is also provided.
+
+			It is measured in UTF-16 code units and the client capability `columnsStartAt1` determines whether it is 0- or 1-based.
+		*/
+		column?: number;
+		/** The contextual source in which the `line` is found. This must be provided if `line` is provided. */
+		source?: Source;
 		/** The context in which the evaluate request is used.
 			Values:
 			'watch': evaluate is called from a watch view context.
@@ -1423,6 +1452,11 @@ declare module DebugProtocol {
 				This attribute may be returned by a debug adapter if corresponding capability `supportsMemoryReferences` is true.
 			*/
 			memoryReference?: string;
+			/** A reference that allows the client to request the location where the returned value is declared. For example, if a function pointer is returned, the adapter may be able to look up the function's location. This should be present only if the adapter is likely to be able to resolve the location.
+
+				This reference shares the same lifetime as the `variablesReference`. See 'Lifetime of Object References' in the Overview section for details.
+			*/
+			valueLocationReference?: number;
 		};
 	}
 
@@ -1477,6 +1511,11 @@ declare module DebugProtocol {
 				This attribute may be returned by a debug adapter if corresponding capability `supportsMemoryReferences` is true.
 			*/
 			memoryReference?: string;
+			/** A reference that allows the client to request the location where the new value is declared. For example, if the new value is function pointer, the adapter may be able to look up the function's location. This should be present only if the adapter is likely to be able to resolve the location.
+
+				This reference shares the same lifetime as the `variablesReference`. See 'Lifetime of Object References' in the Overview section for details.
+			*/
+			valueLocationReference?: number;
 		};
 	}
 
@@ -1691,6 +1730,36 @@ declare module DebugProtocol {
 		};
 	}
 
+	/** Locations request; value of command field is 'locations'.
+		Looks up information about a location reference previously returned by the debug adapter.
+	*/
+	interface LocationsRequest extends Request {
+		// command: 'locations';
+		arguments: LocationsArguments;
+	}
+
+	/** Arguments for `locations` request. */
+	interface LocationsArguments {
+		/** Location reference to resolve. */
+		locationReference: number;
+	}
+
+	/** Response to `locations` request. */
+	interface LocationsResponse extends Response {
+		body?: {
+			/** The source containing the location; either `source.path` or `source.sourceReference` must be specified. */
+			source: Source;
+			/** The line number of the location. The client capability `linesStartAt1` determines whether it is 0- or 1-based. */
+			line: number;
+			/** Position of the location within the `line`. It is measured in UTF-16 code units and the client capability `columnsStartAt1` determines whether it is 0- or 1-based. If no column is given, the first position in the start line is assumed. */
+			column?: number;
+			/** End line of the location, present if the location refers to a range.  The client capability `linesStartAt1` determines whether it is 0- or 1-based. */
+			endLine?: number;
+			/** End position of the location within `endLine`, present if the location refers to a range. It is measured in UTF-16 code units and the client capability `columnsStartAt1` determines whether it is 0- or 1-based. */
+			endColumn?: number;
+		};
+	}
+
 	/** Information about the capabilities of a debug adapter. */
 	interface Capabilities {
 		/** The debug adapter supports the `configurationDone` request. */
@@ -1778,6 +1847,8 @@ declare module DebugProtocol {
 			Clients may present the first applicable mode in this array as the 'default' mode in gestures that set breakpoints.
 		*/
 		breakpointModes?: BreakpointMode[];
+		/** The debug adapter supports ANSI escape sequences in styling of `OutputEvent.output` and `Variable.value` fields. */
+		supportsANSIStyling?: boolean;
 	}
 
 	/** An `ExceptionBreakpointsFilter` is shown in the UI as an filter option for configuring how exceptions are dealt with. */
@@ -1923,7 +1994,7 @@ declare module DebugProtocol {
 		endLine?: number;
 		/** End position of the range covered by the stack frame. It is measured in UTF-16 code units and the client capability `columnsStartAt1` determines whether it is 0- or 1-based. */
 		endColumn?: number;
-		/** Indicates whether this frame can be restarted with the `restart` request. Clients should only use this if the debug adapter supports the `restart` request and the corresponding capability `supportsRestartRequest` is true. If a debug adapter has this capability, then `canRestart` defaults to `true` if the property is absent. */
+		/** Indicates whether this frame can be restarted with the `restartFrame` request. Clients should only use this if the debug adapter supports the `restart` request and the corresponding capability `supportsRestartFrame` is true. If a debug adapter has this capability, then `canRestart` defaults to `true` if the property is absent. */
 		canRestart?: boolean;
 		/** A memory reference for the current instruction pointer in this frame. */
 		instructionPointerReference?: string;
@@ -1944,9 +2015,10 @@ declare module DebugProtocol {
 			'arguments': Scope contains method arguments.
 			'locals': Scope contains local variables.
 			'registers': Scope contains registers. Only a single `registers` scope should be returned from a `scopes` request.
+			'returnValue': Scope contains one or more return values.
 			etc.
 		*/
-		presentationHint?: 'arguments' | 'locals' | 'registers' | string;
+		presentationHint?: 'arguments' | 'locals' | 'registers' | 'returnValue' | string;
 		/** The variables of this scope can be retrieved by passing the value of `variablesReference` to the `variables` request as long as execution remains suspended. See 'Lifetime of Object References' in the Overview section for details. */
 		variablesReference: number;
 		/** The number of named variables in this scope.
@@ -2011,6 +2083,16 @@ declare module DebugProtocol {
 			This attribute may be returned by a debug adapter if corresponding capability `supportsMemoryReferences` is true.
 		*/
 		memoryReference?: string;
+		/** A reference that allows the client to request the location where the variable is declared. This should be present only if the adapter is likely to be able to resolve the location.
+
+			This reference shares the same lifetime as the `variablesReference`. See 'Lifetime of Object References' in the Overview section for details.
+		*/
+		declarationLocationReference?: number;
+		/** A reference that allows the client to request the location where the variable's value is declared. For example, if the variable contains a function pointer, the adapter may be able to look up the function's location. This should be present only if the adapter is likely to be able to resolve the location.
+
+			This reference shares the same lifetime as the `variablesReference`. See 'Lifetime of Object References' in the Overview section for details.
+		*/
+		valueLocationReference?: number;
 	}
 
 	/** Properties of a variable that can be used to determine how to render the variable in the UI. */
@@ -2401,7 +2483,7 @@ declare module DebugProtocol {
 		Values:
 		'source': In `SourceBreakpoint`s
 		'exception': In exception breakpoints applied in the `ExceptionFilterOptions`
-		'data': In data breakpoints requested in the the `DataBreakpointInfo` request
+		'data': In data breakpoints requested in the `DataBreakpointInfo` request
 		'instruction': In `InstructionBreakpoint`s
 		etc.
 	*/
diff --git a/src/vs/workbench/contrib/debug/common/debugSchemas.ts b/src/vs/workbench/contrib/debug/common/debugSchemas.ts
index 31ec9fc410a..d8f86e982f5 100644
--- a/src/vs/workbench/contrib/debug/common/debugSchemas.ts
+++ b/src/vs/workbench/contrib/debug/common/debugSchemas.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as extensionsRegistry from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import * as nls from 'vs/nls';
-import { IDebuggerContribution, ICompound, IBreakpointContribution } from 'vs/workbench/contrib/debug/common/debug';
-import { launchSchemaId } from 'vs/workbench/services/configuration/common/configuration';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import { inputsSchema } from 'vs/workbench/services/configurationResolver/common/configurationResolverSchema';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Extensions, IExtensionFeatureTableRenderer, IExtensionFeaturesRegistry, IRenderedData, IRowData, ITableData } from 'vs/workbench/services/extensionManagement/common/extensionFeatures';
-import { IExtensionManifest } from 'vs/platform/extensions/common/extensions';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { Registry } from 'vs/platform/registry/common/platform';
+import * as extensionsRegistry from '../../../services/extensions/common/extensionsRegistry.js';
+import * as nls from '../../../../nls.js';
+import { IDebuggerContribution, ICompound, IBreakpointContribution } from './debug.js';
+import { launchSchemaId } from '../../../services/configuration/common/configuration.js';
+import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
+import { inputsSchema } from '../../../services/configurationResolver/common/configurationResolverSchema.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Extensions, IExtensionFeatureTableRenderer, IExtensionFeaturesRegistry, IRenderedData, IRowData, ITableData } from '../../../services/extensionManagement/common/extensionFeatures.js';
+import { IExtensionManifest } from '../../../../platform/extensions/common/extensions.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
 
 // debuggers extension point
 export const debuggersExtPoint = extensionsRegistry.ExtensionsRegistry.registerExtensionPoint<IDebuggerContribution[]>({
diff --git a/src/vs/workbench/contrib/debug/common/debugSource.ts b/src/vs/workbench/contrib/debug/common/debugSource.ts
index d356a8a1381..7791782bb5e 100644
--- a/src/vs/workbench/contrib/debug/common/debugSource.ts
+++ b/src/vs/workbench/contrib/debug/common/debugSource.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { URI } from 'vs/base/common/uri';
-import { normalize, isAbsolute } from 'vs/base/common/path';
-import * as resources from 'vs/base/common/resources';
-import { DEBUG_SCHEME } from 'vs/workbench/contrib/debug/common/debug';
-import { IRange } from 'vs/editor/common/core/range';
-import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { Schemas } from 'vs/base/common/network';
-import { isUri } from 'vs/workbench/contrib/debug/common/debugUtils';
-import { IEditorPane } from 'vs/workbench/common/editor';
-import { TextEditorSelectionRevealType } from 'vs/platform/editor/common/editor';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { ILogService } from 'vs/platform/log/common/log';
+import * as nls from '../../../../nls.js';
+import { URI } from '../../../../base/common/uri.js';
+import { normalize, isAbsolute } from '../../../../base/common/path.js';
+import * as resources from '../../../../base/common/resources.js';
+import { DEBUG_SCHEME } from './debug.js';
+import { IRange } from '../../../../editor/common/core/range.js';
+import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from '../../../services/editor/common/editorService.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { isUri } from './debugUtils.js';
+import { IEditorPane } from '../../../common/editor.js';
+import { TextEditorSelectionRevealType } from '../../../../platform/editor/common/editor.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
 
 export const UNKNOWN_SOURCE_LABEL = nls.localize('unknownSource', "Unknown Source");
 
diff --git a/src/vs/workbench/contrib/debug/common/debugStorage.ts b/src/vs/workbench/contrib/debug/common/debugStorage.ts
index b7e57fff654..f4b4dd6a7a6 100644
--- a/src/vs/workbench/contrib/debug/common/debugStorage.ts
+++ b/src/vs/workbench/contrib/debug/common/debugStorage.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { observableValue } from 'vs/base/common/observable';
-import { URI } from 'vs/base/common/uri';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IDebugModel, IEvaluate, IExpression } from 'vs/workbench/contrib/debug/common/debug';
-import { Breakpoint, DataBreakpoint, ExceptionBreakpoint, Expression, FunctionBreakpoint } from 'vs/workbench/contrib/debug/common/debugModel';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { observableValue } from '../../../../base/common/observable.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IDebugModel, IEvaluate, IExpression } from './debug.js';
+import { Breakpoint, DataBreakpoint, ExceptionBreakpoint, Expression, FunctionBreakpoint } from './debugModel.js';
+import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
 
 const DEBUG_BREAKPOINTS_KEY = 'debug.breakpoint';
 const DEBUG_FUNCTION_BREAKPOINTS_KEY = 'debug.functionbreakpoint';
diff --git a/src/vs/workbench/contrib/debug/common/debugTelemetry.ts b/src/vs/workbench/contrib/debug/common/debugTelemetry.ts
index 000e5f5e6a8..a714bb67f0d 100644
--- a/src/vs/workbench/contrib/debug/common/debugTelemetry.ts
+++ b/src/vs/workbench/contrib/debug/common/debugTelemetry.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDebugModel, IDebugSession, AdapterEndEvent } from 'vs/workbench/contrib/debug/common/debug';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { Debugger } from 'vs/workbench/contrib/debug/common/debugger';
+import { IDebugModel, IDebugSession, AdapterEndEvent } from './debug.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { Debugger } from './debugger.js';
 
 export class DebugTelemetry {
 
diff --git a/src/vs/workbench/contrib/debug/common/debugUtils.ts b/src/vs/workbench/contrib/debug/common/debugUtils.ts
index acf1e467817..3a3791f7622 100644
--- a/src/vs/workbench/contrib/debug/common/debugUtils.ts
+++ b/src/vs/workbench/contrib/debug/common/debugUtils.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { equalsIgnoreCase } from 'vs/base/common/strings';
-import { IDebuggerContribution, IDebugSession, IConfigPresentation } from 'vs/workbench/contrib/debug/common/debug';
-import { URI as uri } from 'vs/base/common/uri';
-import { isAbsolute } from 'vs/base/common/path';
-import { deepClone } from 'vs/base/common/objects';
-import { Schemas } from 'vs/base/common/network';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ITextModel } from 'vs/editor/common/model';
-import { Position } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { coalesce } from 'vs/base/common/arrays';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
+import { equalsIgnoreCase } from '../../../../base/common/strings.js';
+import { IDebuggerContribution, IDebugSession, IConfigPresentation } from './debug.js';
+import { URI as uri } from '../../../../base/common/uri.js';
+import { isAbsolute } from '../../../../base/common/path.js';
+import { deepClone } from '../../../../base/common/objects.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { IRange, Range } from '../../../../editor/common/core/range.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { coalesce } from '../../../../base/common/arrays.js';
+import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
 
 const _formatPIIRegexp = /{([^}]+)}/g;
 
@@ -102,7 +102,7 @@ export function getExactExpressionStartAndEnd(lineContent: string, looseStart: n
 	// If there are non-word characters after the cursor, we want to truncate the expression then.
 	// For example in expression 'a.b.c.d', if the focus was under 'b', 'a.b' would be evaluated.
 	if (matchingExpression) {
-		const subExpression: RegExp = /\w+/g;
+		const subExpression: RegExp = /(\w|\p{L})+/gu;
 		let subExpressionResult: RegExpExecArray | null = null;
 		while (subExpressionResult = subExpression.exec(matchingExpression)) {
 			const subEnd = subExpressionResult.index + 1 + startOffset + subExpressionResult[0].length;
@@ -307,6 +307,9 @@ function convertPaths(msg: DebugProtocol.ProtocolMessage, fixSourcePath: (toDA:
 							di.body?.instructions.forEach(di => fixSourcePath(false, di.location));
 						}
 						break;
+					case 'locations':
+						fixSourcePath(false, (<DebugProtocol.LocationsResponse>response).body?.source);
+						break;
 					default:
 						break;
 				}
diff --git a/src/vs/workbench/contrib/debug/common/debugViewModel.ts b/src/vs/workbench/contrib/debug/common/debugViewModel.ts
index 7221f390771..9336c5448d1 100644
--- a/src/vs/workbench/contrib/debug/common/debugViewModel.ts
+++ b/src/vs/workbench/contrib/debug/common/debugViewModel.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { CONTEXT_DISASSEMBLE_REQUEST_SUPPORTED, CONTEXT_EXPRESSION_SELECTED, CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG, CONTEXT_FOCUSED_STACK_FRAME_HAS_INSTRUCTION_POINTER_REFERENCE, CONTEXT_JUMP_TO_CURSOR_SUPPORTED, CONTEXT_LOADED_SCRIPTS_SUPPORTED, CONTEXT_MULTI_SESSION_DEBUG, CONTEXT_RESTART_FRAME_SUPPORTED, CONTEXT_SET_DATA_BREAKPOINT_BYTES_SUPPORTED, CONTEXT_SET_EXPRESSION_SUPPORTED, CONTEXT_SET_VARIABLE_SUPPORTED, CONTEXT_STEP_BACK_SUPPORTED, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_SUSPEND_DEBUGGEE_SUPPORTED, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED, IDebugSession, IExpression, IExpressionContainer, IStackFrame, IThread, IViewModel } from 'vs/workbench/contrib/debug/common/debug';
-import { isSessionAttach } from 'vs/workbench/contrib/debug/common/debugUtils';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { CONTEXT_DISASSEMBLE_REQUEST_SUPPORTED, CONTEXT_EXPRESSION_SELECTED, CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG, CONTEXT_FOCUSED_STACK_FRAME_HAS_INSTRUCTION_POINTER_REFERENCE, CONTEXT_JUMP_TO_CURSOR_SUPPORTED, CONTEXT_LOADED_SCRIPTS_SUPPORTED, CONTEXT_MULTI_SESSION_DEBUG, CONTEXT_RESTART_FRAME_SUPPORTED, CONTEXT_SET_DATA_BREAKPOINT_BYTES_SUPPORTED, CONTEXT_SET_EXPRESSION_SUPPORTED, CONTEXT_SET_VARIABLE_SUPPORTED, CONTEXT_STEP_BACK_SUPPORTED, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_SUSPEND_DEBUGGEE_SUPPORTED, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED, IDebugSession, IExpression, IExpressionContainer, IStackFrame, IThread, IViewModel } from './debug.js';
+import { isSessionAttach } from './debugUtils.js';
 
 export class ViewModel implements IViewModel {
 
diff --git a/src/vs/workbench/contrib/debug/common/debugVisualizers.ts b/src/vs/workbench/contrib/debug/common/debugVisualizers.ts
index 45d19aee6f9..c607fbe166b 100644
--- a/src/vs/workbench/contrib/debug/common/debugVisualizers.ts
+++ b/src/vs/workbench/contrib/debug/common/debugVisualizers.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IDisposable, IReference, toDisposable } from 'vs/base/common/lifecycle';
-import { isDefined } from 'vs/base/common/types';
-import { ContextKeyExpr, ContextKeyExpression, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ExtensionIdentifier, IRelaxedExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { CONTEXT_VARIABLE_NAME, CONTEXT_VARIABLE_TYPE, CONTEXT_VARIABLE_VALUE, MainThreadDebugVisualization, IDebugVisualization, IDebugVisualizationContext, IExpression, IExpressionContainer, IDebugVisualizationTreeItem } from 'vs/workbench/contrib/debug/common/debug';
-import { getContextForVariable } from 'vs/workbench/contrib/debug/common/debugContext';
-import { Scope, Variable, VisualizedExpression } from 'vs/workbench/contrib/debug/common/debugModel';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IDisposable, IReference, toDisposable } from '../../../../base/common/lifecycle.js';
+import { isDefined } from '../../../../base/common/types.js';
+import { ContextKeyExpr, ContextKeyExpression, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { ExtensionIdentifier, IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { CONTEXT_VARIABLE_NAME, CONTEXT_VARIABLE_TYPE, CONTEXT_VARIABLE_VALUE, MainThreadDebugVisualization, IDebugVisualization, IDebugVisualizationContext, IExpression, IExpressionContainer, IDebugVisualizationTreeItem, IDebugSession } from './debug.js';
+import { getContextForVariable } from './debugContext.js';
+import { Scope, Variable, VisualizedExpression } from './debugModel.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { ExtensionsRegistry } from '../../../services/extensions/common/extensionsRegistry.js';
 
 export const IDebugVisualizerService = createDecorator<IDebugVisualizerService>('debugVisualizerService');
 
@@ -84,7 +84,7 @@ export interface IDebugVisualizerService {
 	/**
 	 * Gets children for a visualized tree node.
 	 */
-	getVisualizedChildren(treeId: string, treeElementId: number): Promise<IExpression[]>;
+	getVisualizedChildren(session: IDebugSession | undefined, treeId: string, treeElementId: number): Promise<IExpression[]>;
 
 	/**
 	 * Gets children for a visualized tree node.
@@ -202,7 +202,7 @@ export class DebugVisualizerService implements IDebugVisualizerService {
 				return;
 			}
 
-			return new VisualizedExpression(this, treeId, treeItem, expr);
+			return new VisualizedExpression(expr.getSession(), this, treeId, treeItem, expr);
 		} catch (e) {
 			this.logService.warn('Failed to get visualized node', e);
 			return;
@@ -210,9 +210,10 @@ export class DebugVisualizerService implements IDebugVisualizerService {
 	}
 
 	/** @inheritdoc */
-	public async getVisualizedChildren(treeId: string, treeElementId: number): Promise<IExpression[]> {
-		const children = await this.trees.get(treeId)?.getChildren(treeElementId) || [];
-		return children.map(c => new VisualizedExpression(this, treeId, c, undefined));
+	public async getVisualizedChildren(session: IDebugSession | undefined, treeId: string, treeElementId: number): Promise<IExpression[]> {
+		const node = this.trees.get(treeId);
+		const children = await node?.getChildren(treeElementId) || [];
+		return children.map(c => new VisualizedExpression(session, this, treeId, c, undefined));
 	}
 
 	/** @inheritdoc */
@@ -250,7 +251,7 @@ export class DebugVisualizerService implements IDebugVisualizerService {
 		return context;
 	}
 
-	private processExtensionRegistration(ext: Readonly<IRelaxedExtensionDescription>) {
+	private processExtensionRegistration(ext: IExtensionDescription) {
 		const viz = ext.contributes?.debugVisualizers;
 		if (!(viz instanceof Array)) {
 			return;
diff --git a/src/vs/workbench/contrib/debug/common/debugger.ts b/src/vs/workbench/contrib/debug/common/debugger.ts
index da2de14c249..ac7c966538a 100644
--- a/src/vs/workbench/contrib/debug/common/debugger.ts
+++ b/src/vs/workbench/contrib/debug/common/debugger.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { isObject } from 'vs/base/common/types';
-import { IJSONSchema, IJSONSchemaMap, IJSONSchemaSnippet } from 'vs/base/common/jsonSchema';
-import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { IConfig, IDebuggerContribution, IDebugAdapter, IDebugger, IDebugSession, IAdapterManager, IDebugService, debuggerDisabledMessage, IDebuggerMetadata, DebugConfigurationProviderTriggerKind } from 'vs/workbench/contrib/debug/common/debug';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
-import * as ConfigurationResolverUtils from 'vs/workbench/services/configurationResolver/common/configurationResolverUtils';
-import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfiguration';
-import { URI } from 'vs/base/common/uri';
-import { Schemas } from 'vs/base/common/network';
-import { isDebuggerMainContribution } from 'vs/workbench/contrib/debug/common/debugUtils';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { ITelemetryEndpoint } from 'vs/platform/telemetry/common/telemetry';
-import { cleanRemoteAuthority } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { ContextKeyExpr, ContextKeyExpression, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { filter } from 'vs/base/common/objects';
+import * as nls from '../../../../nls.js';
+import { isObject } from '../../../../base/common/types.js';
+import { IJSONSchema, IJSONSchemaMap, IJSONSchemaSnippet } from '../../../../base/common/jsonSchema.js';
+import { IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
+import { IConfig, IDebuggerContribution, IDebugAdapter, IDebugger, IDebugSession, IAdapterManager, IDebugService, debuggerDisabledMessage, IDebuggerMetadata, DebugConfigurationProviderTriggerKind } from './debug.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IConfigurationResolverService } from '../../../services/configurationResolver/common/configurationResolver.js';
+import * as ConfigurationResolverUtils from '../../../services/configurationResolver/common/configurationResolverUtils.js';
+import { ITextResourcePropertiesService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { isDebuggerMainContribution } from './debugUtils.js';
+import { IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
+import { ITelemetryEndpoint } from '../../../../platform/telemetry/common/telemetry.js';
+import { cleanRemoteAuthority } from '../../../../platform/telemetry/common/telemetryUtils.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { ContextKeyExpr, ContextKeyExpression, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { filter } from '../../../../base/common/objects.js';
 
 export class Debugger implements IDebugger, IDebuggerMetadata {
 
diff --git a/src/vs/workbench/contrib/debug/common/disassemblyViewInput.ts b/src/vs/workbench/contrib/debug/common/disassemblyViewInput.ts
index 8e715a3fcf8..3673111a55d 100644
--- a/src/vs/workbench/contrib/debug/common/disassemblyViewInput.ts
+++ b/src/vs/workbench/contrib/debug/common/disassemblyViewInput.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { localize } from 'vs/nls';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { Codicon } from 'vs/base/common/codicons';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { localize } from '../../../../nls.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 
 const DisassemblyEditorIcon = registerIcon('disassembly-editor-label-icon', Codicon.debug, localize('disassemblyEditorLabelIcon', 'Icon of the disassembly editor label.'));
 
diff --git a/src/vs/workbench/contrib/debug/common/loadedScriptsPicker.ts b/src/vs/workbench/contrib/debug/common/loadedScriptsPicker.ts
index 5e9bb1fa33e..680ba4579ab 100644
--- a/src/vs/workbench/contrib/debug/common/loadedScriptsPicker.ts
+++ b/src/vs/workbench/contrib/debug/common/loadedScriptsPicker.ts
@@ -2,20 +2,20 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import * as nls from 'vs/nls';
-import { matchesFuzzy } from 'vs/base/common/filters';
-import { Source } from 'vs/workbench/contrib/debug/common/debugSource';
-import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
-import { IDebugService, IDebugSession } from 'vs/workbench/contrib/debug/common/debug';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { getIconClasses } from 'vs/editor/common/services/getIconClasses';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import * as nls from '../../../../nls.js';
+import { matchesFuzzy } from '../../../../base/common/filters.js';
+import { Source } from './debugSource.js';
+import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from '../../../../platform/quickinput/common/quickInput.js';
+import { IDebugService, IDebugSession } from './debug.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { getIconClasses } from '../../../../editor/common/services/getIconClasses.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
 
-import { dirname } from 'vs/base/common/resources';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ILabelService } from 'vs/platform/label/common/label';
+import { dirname } from '../../../../base/common/resources.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
 
 export interface IPickerDebugItem extends IQuickPickItem {
 	accept(): void;
@@ -35,7 +35,7 @@ export async function showLoadedScriptMenu(accessor: ServicesAccessor) {
 	const labelService = accessor.get(ILabelService);
 
 	const localDisposableStore = new DisposableStore();
-	const quickPick = quickInputService.createQuickPick<IPickerDebugItem>();
+	const quickPick = quickInputService.createQuickPick<IPickerDebugItem>({ useSeparators: true });
 	localDisposableStore.add(quickPick);
 	quickPick.matchOnLabel = quickPick.matchOnDescription = quickPick.matchOnDetail = quickPick.sortByLabel = false;
 	quickPick.placeholder = nls.localize('moveFocusedView.selectView', "Search loaded scripts by name");
diff --git a/src/vs/workbench/contrib/debug/common/replAccessibilityAnnouncer.ts b/src/vs/workbench/contrib/debug/common/replAccessibilityAnnouncer.ts
new file mode 100644
index 00000000000..6df698af1e3
--- /dev/null
+++ b/src/vs/workbench/contrib/debug/common/replAccessibilityAnnouncer.ts
@@ -0,0 +1,36 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IDebugService } from './debug.js';
+
+export class ReplAccessibilityAnnouncer extends Disposable implements IWorkbenchContribution {
+	static ID = 'debug.replAccessibilityAnnouncer';
+	constructor(
+		@IDebugService debugService: IDebugService,
+		@IAccessibilityService accessibilityService: IAccessibilityService,
+		@ILogService logService: ILogService
+	) {
+		super();
+		const viewModel = debugService.getViewModel();
+		this._register(viewModel.onDidFocusSession((session) => {
+			if (!session) {
+				return;
+			}
+			this._register(session.onDidChangeReplElements((element) => {
+				if (!element || !('originalExpression' in element)) {
+					// element was removed or hasn't been resolved yet
+					return;
+				}
+				const value = element.toString();
+				accessibilityService.status(value);
+				logService.trace('ReplAccessibilityAnnouncer#onDidChangeReplElements', element.originalExpression + ': ' + value);
+			}));
+		}));
+	}
+}
diff --git a/src/vs/workbench/contrib/debug/common/replModel.ts b/src/vs/workbench/contrib/debug/common/replModel.ts
index 4402ed3f3b5..e2e388eed51 100644
--- a/src/vs/workbench/contrib/debug/common/replModel.ts
+++ b/src/vs/workbench/contrib/debug/common/replModel.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import severity from 'vs/base/common/severity';
-import { isObject, isString } from 'vs/base/common/types';
-import { generateUuid } from 'vs/base/common/uuid';
-import * as nls from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IDebugConfiguration, IDebugSession, IExpression, INestingReplElement, IReplElement, IReplElementSource, IStackFrame } from 'vs/workbench/contrib/debug/common/debug';
-import { ExpressionContainer } from 'vs/workbench/contrib/debug/common/debugModel';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import severity from '../../../../base/common/severity.js';
+import { isObject, isString } from '../../../../base/common/types.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import * as nls from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IDebugConfiguration, IDebugSession, IExpression, INestingReplElement, IReplElement, IReplElementSource, IStackFrame } from './debug.js';
+import { ExpressionContainer } from './debugModel.js';
 
 const MAX_REPL_LENGTH = 10000;
 let topReplElementCounter = 0;
@@ -76,6 +76,7 @@ export class ReplVariableElement implements INestingReplElement {
 	private readonly id = generateUuid();
 
 	constructor(
+		private readonly session: IDebugSession,
 		public readonly expression: IExpression,
 		public readonly severity: severity,
 		public readonly sourceData?: IReplElementSource,
@@ -83,6 +84,10 @@ export class ReplVariableElement implements INestingReplElement {
 		this.hasChildren = expression.hasChildren;
 	}
 
+	getSession() {
+		return this.session;
+	}
+
 	getChildren(): IReplElement[] | Promise<IReplElement[]> {
 		return this.expression.getChildren();
 	}
@@ -106,6 +111,10 @@ export class RawObjectReplElement implements IExpression, INestingReplElement {
 		return this.id;
 	}
 
+	getSession(): IDebugSession | undefined {
+		return undefined;
+	}
+
 	get value(): string {
 		if (this.valueObj === null) {
 			return 'null';
@@ -193,6 +202,7 @@ export class ReplGroup implements INestingReplElement {
 	static COUNTER = 0;
 
 	constructor(
+		public readonly session: IDebugSession,
 		public name: string,
 		public autoExpand: boolean,
 		public sourceData?: IReplElementSource
@@ -260,7 +270,7 @@ export interface INewReplElementData {
 
 export class ReplModel {
 	private replElements: IReplElement[] = [];
-	private readonly _onDidChangeElements = new Emitter<void>();
+	private readonly _onDidChangeElements = new Emitter<IReplElement | undefined>();
 	readonly onDidChangeElements = this._onDidChangeElements.event;
 
 	constructor(private readonly configurationService: IConfigurationService) { }
@@ -269,10 +279,10 @@ export class ReplModel {
 		return this.replElements;
 	}
 
-	async addReplExpression(session: IDebugSession, stackFrame: IStackFrame | undefined, name: string): Promise<void> {
-		this.addReplElement(new ReplEvaluationInput(name));
-		const result = new ReplEvaluationResult(name);
-		await result.evaluateExpression(name, session, stackFrame, 'repl');
+	async addReplExpression(session: IDebugSession, stackFrame: IStackFrame | undefined, expression: string): Promise<void> {
+		this.addReplElement(new ReplEvaluationInput(expression));
+		const result = new ReplEvaluationResult(expression);
+		await result.evaluateExpression(expression, session, stackFrame, 'repl');
 		this.addReplElement(result);
 	}
 
@@ -291,7 +301,7 @@ export class ReplModel {
 			// have formatted it nicely e.g. with ANSI color codes.
 			this.addReplElement(output
 				? new ReplOutputElement(session, getUniqueId(), output, sev, source, expression)
-				: new ReplVariableElement(expression, sev, source));
+				: new ReplVariableElement(session, expression, sev, source));
 			return;
 		}
 
@@ -306,7 +316,7 @@ export class ReplModel {
 			if (!previousElement.value.endsWith('\n') && !previousElement.value.endsWith('\r\n') && previousElement.count === 1) {
 				this.replElements[this.replElements.length - 1] = new ReplOutputElement(
 					session, getUniqueId(), previousElement.value + output, sev, source);
-				this._onDidChangeElements.fire();
+				this._onDidChangeElements.fire(undefined);
 				return;
 			}
 		}
@@ -315,8 +325,8 @@ export class ReplModel {
 		this.addReplElement(element);
 	}
 
-	startGroup(name: string, autoExpand: boolean, sourceData?: IReplElementSource): void {
-		const group = new ReplGroup(name, autoExpand, sourceData);
+	startGroup(session: IDebugSession, name: string, autoExpand: boolean, sourceData?: IReplElementSource): void {
+		const group = new ReplGroup(session, name, autoExpand, sourceData);
 		this.addReplElement(group);
 	}
 
@@ -337,14 +347,13 @@ export class ReplModel {
 				this.replElements.splice(0, this.replElements.length - MAX_REPL_LENGTH);
 			}
 		}
-
-		this._onDidChangeElements.fire();
+		this._onDidChangeElements.fire(newElement);
 	}
 
 	removeReplExpressions(): void {
 		if (this.replElements.length > 0) {
 			this.replElements = [];
-			this._onDidChangeElements.fire();
+			this._onDidChangeElements.fire(undefined);
 		}
 	}
 
diff --git a/src/vs/workbench/contrib/debug/electron-sandbox/extensionHostDebugService.ts b/src/vs/workbench/contrib/debug/electron-sandbox/extensionHostDebugService.ts
index 9df922bf826..cf036366f08 100644
--- a/src/vs/workbench/contrib/debug/electron-sandbox/extensionHostDebugService.ts
+++ b/src/vs/workbench/contrib/debug/electron-sandbox/extensionHostDebugService.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IExtensionHostDebugService } from 'vs/platform/debug/common/extensionHostDebug';
-import { registerMainProcessRemoteService } from 'vs/platform/ipc/electron-sandbox/services';
-import { ExtensionHostDebugChannelClient, ExtensionHostDebugBroadcastChannel } from 'vs/platform/debug/common/extensionHostDebugIpc';
+import { IExtensionHostDebugService } from '../../../../platform/debug/common/extensionHostDebug.js';
+import { registerMainProcessRemoteService } from '../../../../platform/ipc/electron-sandbox/services.js';
+import { ExtensionHostDebugChannelClient, ExtensionHostDebugBroadcastChannel } from '../../../../platform/debug/common/extensionHostDebugIpc.js';
 
 registerMainProcessRemoteService(IExtensionHostDebugService, ExtensionHostDebugBroadcastChannel.ChannelName, { channelClientCtor: ExtensionHostDebugChannelClient });
diff --git a/src/vs/workbench/contrib/debug/node/debugAdapter.ts b/src/vs/workbench/contrib/debug/node/debugAdapter.ts
index 4275f9e0a89..7c2b2e68307 100644
--- a/src/vs/workbench/contrib/debug/node/debugAdapter.ts
+++ b/src/vs/workbench/contrib/debug/node/debugAdapter.ts
@@ -6,15 +6,15 @@
 import * as cp from 'child_process';
 import * as net from 'net';
 import * as stream from 'stream';
-import * as objects from 'vs/base/common/objects';
-import * as path from 'vs/base/common/path';
-import * as platform from 'vs/base/common/platform';
-import * as strings from 'vs/base/common/strings';
-import { Promises } from 'vs/base/node/pfs';
-import * as nls from 'vs/nls';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { IDebugAdapterExecutable, IDebugAdapterNamedPipeServer, IDebugAdapterServer, IDebuggerContribution, IPlatformSpecificAdapterContribution } from 'vs/workbench/contrib/debug/common/debug';
-import { AbstractDebugAdapter } from '../common/abstractDebugAdapter';
+import * as objects from '../../../../base/common/objects.js';
+import * as path from '../../../../base/common/path.js';
+import * as platform from '../../../../base/common/platform.js';
+import * as strings from '../../../../base/common/strings.js';
+import { Promises } from '../../../../base/node/pfs.js';
+import * as nls from '../../../../nls.js';
+import { IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
+import { IDebugAdapterExecutable, IDebugAdapterNamedPipeServer, IDebugAdapterServer, IDebuggerContribution, IPlatformSpecificAdapterContribution } from '../common/debug.js';
+import { AbstractDebugAdapter } from '../common/abstractDebugAdapter.js';
 
 /**
  * An implementation that communicates via two streams with the debug adapter.
@@ -222,13 +222,26 @@ export class ExecutableDebugAdapter extends StreamDebugAdapter {
 					throw new Error(nls.localize('unableToLaunchDebugAdapterNoArgs', "Unable to launch debug adapter."));
 				}
 			} else {
+				let spawnCommand = command;
+				let spawnArgs = args;
 				const spawnOptions: cp.SpawnOptions = {
 					env: env
 				};
 				if (options.cwd) {
 					spawnOptions.cwd = options.cwd;
 				}
-				this.serverProcess = cp.spawn(command, args, spawnOptions);
+				if (platform.isWindows && (command.endsWith('.bat') || command.endsWith('.cmd'))) {
+					// https://github.com/microsoft/vscode/issues/224184
+					spawnOptions.shell = true;
+					spawnCommand = `"${command}"`;
+					spawnArgs = args.map(a => {
+						a = a.replace(/"/g, '\\"'); // Escape existing double quotes with \
+						// Wrap in double quotes
+						return `"${a}"`;
+					});
+				}
+
+				this.serverProcess = cp.spawn(spawnCommand, spawnArgs, spawnOptions);
 			}
 
 			this.serverProcess.on('error', err => {
diff --git a/src/vs/workbench/contrib/debug/node/telemetryApp.ts b/src/vs/workbench/contrib/debug/node/telemetryApp.ts
index 802a806486f..f4d65d3b020 100644
--- a/src/vs/workbench/contrib/debug/node/telemetryApp.ts
+++ b/src/vs/workbench/contrib/debug/node/telemetryApp.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Server } from 'vs/base/parts/ipc/node/ipc.cp';
-import { TelemetryAppenderChannel } from 'vs/platform/telemetry/common/telemetryIpc';
-import { OneDataSystemAppender } from 'vs/platform/telemetry/node/1dsAppender';
+import { Server } from '../../../../base/parts/ipc/node/ipc.cp.js';
+import { TelemetryAppenderChannel } from '../../../../platform/telemetry/common/telemetryIpc.js';
+import { OneDataSystemAppender } from '../../../../platform/telemetry/node/1dsAppender.js';
 
 const appender = new OneDataSystemAppender(undefined, false, process.argv[2], JSON.parse(process.argv[3]), process.argv[4]);
 process.once('exit', () => appender.flush());
diff --git a/src/vs/workbench/contrib/debug/node/terminals.ts b/src/vs/workbench/contrib/debug/node/terminals.ts
index c3f3cd92928..b3b5a84c411 100644
--- a/src/vs/workbench/contrib/debug/node/terminals.ts
+++ b/src/vs/workbench/contrib/debug/node/terminals.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as cp from 'child_process';
-import { getDriveLetter } from 'vs/base/common/extpath';
-import * as platform from 'vs/base/common/platform';
+import { getDriveLetter } from '../../../../base/common/extpath.js';
+import * as platform from '../../../../base/common/platform.js';
 
 function spawnAsPromised(command: string, args: string[]): Promise<string> {
 	return new Promise((resolve, reject) => {
diff --git a/src/vs/workbench/contrib/debug/test/browser/baseDebugView.test.ts b/src/vs/workbench/contrib/debug/test/browser/baseDebugView.test.ts
index aa22ce774db..fcefad3c516 100644
--- a/src/vs/workbench/contrib/debug/test/browser/baseDebugView.test.ts
+++ b/src/vs/workbench/contrib/debug/test/browser/baseDebugView.test.ts
@@ -4,35 +4,102 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import * as dom from 'vs/base/browser/dom';
-import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { isWindows } from 'vs/base/common/platform';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { NullCommandService } from 'vs/platform/commands/test/common/nullCommandService';
-import { NullHoverService } from 'vs/platform/hover/test/browser/nullHoverService';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { renderExpressionValue, renderVariable, renderViewTree } from 'vs/workbench/contrib/debug/browser/baseDebugView';
-import { LinkDetector } from 'vs/workbench/contrib/debug/browser/linkDetector';
-import { isStatusbarInDebugMode } from 'vs/workbench/contrib/debug/browser/statusbarColorProvider';
-import { State } from 'vs/workbench/contrib/debug/common/debug';
-import { Expression, Scope, StackFrame, Thread, Variable } from 'vs/workbench/contrib/debug/common/debugModel';
-import { createTestSession } from 'vs/workbench/contrib/debug/test/browser/callStack.test';
-import { createMockDebugModel } from 'vs/workbench/contrib/debug/test/browser/mockDebugModel';
-import { MockSession } from 'vs/workbench/contrib/debug/test/common/mockDebug';
-import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
+import * as dom from '../../../../../base/browser/dom.js';
+import { HighlightedLabel } from '../../../../../base/browser/ui/highlightedlabel/highlightedLabel.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { isWindows } from '../../../../../base/common/platform.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
+import { NullHoverService } from '../../../../../platform/hover/test/browser/nullHoverService.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
+import { renderViewTree } from '../../browser/baseDebugView.js';
+import { DebugExpressionRenderer } from '../../browser/debugExpressionRenderer.js';
+import { isStatusbarInDebugMode } from '../../browser/statusbarColorProvider.js';
+import { State } from '../../common/debug.js';
+import { Expression, Scope, StackFrame, Thread, Variable } from '../../common/debugModel.js';
+import { MockSession } from '../common/mockDebug.js';
+import { createTestSession } from './callStack.test.js';
+import { createMockDebugModel } from './mockDebugModel.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 const $ = dom.$;
 
+
 suite('Debug - Base Debug View', () => {
 	const disposables = ensureNoDisposablesAreLeakedInTestSuite();
-	let linkDetector: LinkDetector;
+	let renderer: DebugExpressionRenderer;
+	let configurationService: TestConfigurationService;
+
+	function assertVariable(session: MockSession, scope: Scope, disposables: Pick<DisposableStore, "add">, displayType: boolean) {
+		let variable = new Variable(session, 1, scope, 2, 'foo', 'bar.foo', undefined, 0, 0, undefined, {}, 'string');
+		let expression = $('.');
+		let name = $('.');
+		let type = $('.');
+		let value = $('.');
+		const label = new HighlightedLabel(name);
+		const lazyButton = $('.');
+		const store = disposables.add(new DisposableStore());
+		store.add(renderer.renderVariable({ expression, name, type, value, label, lazyButton }, variable, { showChanged: false }));
+
+		assert.strictEqual(label.element.textContent, 'foo');
+		assert.strictEqual(value.textContent, '');
+
+		variable.value = 'hey';
+		expression = $('.');
+		name = $('.');
+		type = $('.');
+		value = $('.');
+		store.add(renderer.renderVariable({ expression, name, type, value, label, lazyButton }, variable, { showChanged: false }));
+		assert.strictEqual(value.textContent, 'hey');
+		assert.strictEqual(label.element.textContent, displayType ? 'foo: ' : 'foo =');
+		assert.strictEqual(type.textContent, displayType ? 'string =' : '');
+
+		variable.value = isWindows ? 'C:\\foo.js:5' : '/foo.js:5';
+		expression = $('.');
+		name = $('.');
+		type = $('.');
+		value = $('.');
+		store.add(renderer.renderVariable({ expression, name, type, value, label, lazyButton }, variable, { showChanged: false }));
+		assert.ok(value.querySelector('a'));
+		assert.strictEqual(value.querySelector('a')!.textContent, variable.value);
+
+		variable = new Variable(session, 1, scope, 2, 'console', 'console', '5', 0, 0, undefined, { kind: 'virtual' });
+		expression = $('.');
+		name = $('.');
+		type = $('.');
+		value = $('.');
+		store.add(renderer.renderVariable({ expression, name, type, value, label, lazyButton }, variable, { showChanged: false }));
+		assert.strictEqual(name.className, 'virtual');
+		assert.strictEqual(label.element.textContent, 'console =');
+		assert.strictEqual(value.className, 'value number');
+
+		variable = new Variable(session, 1, scope, 2, 'xpto', 'xpto.xpto', undefined, 0, 0, undefined, {}, 'custom-type');
+		store.add(renderer.renderVariable({ expression, name, type, value, label, lazyButton }, variable, { showChanged: false }));
+		assert.strictEqual(label.element.textContent, 'xpto');
+		assert.strictEqual(value.textContent, '');
+		variable.value = '2';
+		expression = $('.');
+		name = $('.');
+		type = $('.');
+		value = $('.');
+		store.add(renderer.renderVariable({ expression, name, type, value, label, lazyButton }, variable, { showChanged: false }));
+		assert.strictEqual(value.textContent, '2');
+		assert.strictEqual(label.element.textContent, displayType ? 'xpto: ' : 'xpto =');
+		assert.strictEqual(type.textContent, displayType ? 'custom-type =' : '');
+
+		label.dispose();
+	}
 
 	/**
 	 * Instantiate services for use by the functions being tested.
 	 */
 	setup(() => {
 		const instantiationService: TestInstantiationService = workbenchInstantiationService(undefined, disposables);
-		linkDetector = instantiationService.createInstance(LinkDetector);
+		configurationService = instantiationService.createInstance(TestConfigurationService);
+		instantiationService.stub(IConfigurationService, configurationService);
+		instantiationService.stub(IHoverService, NullHoverService);
+		renderer = instantiationService.createInstance(DebugExpressionRenderer);
 	});
 
 	test('render view tree', () => {
@@ -47,37 +114,38 @@ suite('Debug - Base Debug View', () => {
 
 	test('render expression value', () => {
 		let container = $('.container');
-		renderExpressionValue('render \n me', container, {}, NullHoverService);
-		assert.strictEqual(container.className, 'value');
+		const store = disposables.add(new DisposableStore());
+		store.add(renderer.renderValue(container, 'render \n me', {}));
+		assert.strictEqual(container.className, 'container value');
 		assert.strictEqual(container.textContent, 'render \n me');
 
 		const expression = new Expression('console');
 		expression.value = 'Object';
 		container = $('.container');
-		renderExpressionValue(expression, container, { colorize: true }, NullHoverService);
-		assert.strictEqual(container.className, 'value unavailable error');
+		store.add(renderer.renderValue(container, expression, { colorize: true }));
+		assert.strictEqual(container.className, 'container value unavailable error');
 
 		expression.available = true;
 		expression.value = '"string value"';
 		container = $('.container');
-		renderExpressionValue(expression, container, { colorize: true, linkDetector }, NullHoverService);
-		assert.strictEqual(container.className, 'value string');
+		store.add(renderer.renderValue(container, expression, { colorize: true }));
+		assert.strictEqual(container.className, 'container value string');
 		assert.strictEqual(container.textContent, '"string value"');
 
 		expression.type = 'boolean';
 		container = $('.container');
-		renderExpressionValue(expression, container, { colorize: true }, NullHoverService);
-		assert.strictEqual(container.className, 'value boolean');
+		store.add(renderer.renderValue(container, expression, { colorize: true }));
+		assert.strictEqual(container.className, 'container value boolean');
 		assert.strictEqual(container.textContent, expression.value);
 
 		expression.value = 'this is a long string';
 		container = $('.container');
-		renderExpressionValue(expression, container, { colorize: true, maxValueLength: 4, linkDetector }, NullHoverService);
+		store.add(renderer.renderValue(container, expression, { colorize: true, maxValueLength: 4 }));
 		assert.strictEqual(container.textContent, 'this...');
 
 		expression.value = isWindows ? 'C:\\foo.js:5' : '/foo.js:5';
 		container = $('.container');
-		renderExpressionValue(expression, container, { colorize: true, linkDetector }, NullHoverService);
+		store.add(renderer.renderValue(container, expression, { colorize: true }));
 		assert.ok(container.querySelector('a'));
 		assert.strictEqual(container.querySelector('a')!.textContent, expression.value);
 	});
@@ -85,47 +153,34 @@ suite('Debug - Base Debug View', () => {
 	test('render variable', () => {
 		const session = new MockSession();
 		const thread = new Thread(session, 'mockthread', 1);
-		const stackFrame = new StackFrame(thread, 1, null!, 'app.js', 'normal', { startLineNumber: 1, startColumn: 1, endLineNumber: undefined!, endColumn: undefined! }, 0, true);
+		const range = {
+			startLineNumber: 1,
+			startColumn: 1,
+			endLineNumber: undefined!,
+			endColumn: undefined!
+		};
+		const stackFrame = new StackFrame(thread, 1, null!, 'app.js', 'normal', range, 0, true);
 		const scope = new Scope(stackFrame, 1, 'local', 1, false, 10, 10);
 
-		let variable = new Variable(session, 1, scope, 2, 'foo', 'bar.foo', undefined, 0, 0, undefined, {}, 'string');
-		let expression = $('.');
-		let name = $('.');
-		let value = $('.');
-		const label = new HighlightedLabel(name);
-		const lazyButton = $('.');
-		const store = disposables.add(new DisposableStore());
-		renderVariable(store, NullCommandService, NullHoverService, variable, { expression, name, value, label, lazyButton }, false, []);
+		configurationService.setUserConfiguration('debug.showVariableTypes', false);
+		assertVariable(session, scope, disposables, false);
 
-		assert.strictEqual(label.element.textContent, 'foo');
-		assert.strictEqual(value.textContent, '');
+	});
 
-		variable.value = 'hey';
-		expression = $('.');
-		name = $('.');
-		value = $('.');
-		renderVariable(store, NullCommandService, NullHoverService, variable, { expression, name, value, label, lazyButton }, false, [], linkDetector);
-		assert.strictEqual(value.textContent, 'hey');
-		assert.strictEqual(label.element.textContent, 'foo:');
+	test('render variable with display type setting', () => {
+		const session = new MockSession();
+		const thread = new Thread(session, 'mockthread', 1);
+		const range = {
+			startLineNumber: 1,
+			startColumn: 1,
+			endLineNumber: undefined!,
+			endColumn: undefined!
+		};
+		const stackFrame = new StackFrame(thread, 1, null!, 'app.js', 'normal', range, 0, true);
+		const scope = new Scope(stackFrame, 1, 'local', 1, false, 10, 10);
 
-		variable.value = isWindows ? 'C:\\foo.js:5' : '/foo.js:5';
-		expression = $('.');
-		name = $('.');
-		value = $('.');
-		renderVariable(store, NullCommandService, NullHoverService, variable, { expression, name, value, label, lazyButton }, false, [], linkDetector);
-		assert.ok(value.querySelector('a'));
-		assert.strictEqual(value.querySelector('a')!.textContent, variable.value);
-
-		variable = new Variable(session, 1, scope, 2, 'console', 'console', '5', 0, 0, undefined, { kind: 'virtual' });
-		expression = $('.');
-		name = $('.');
-		value = $('.');
-		renderVariable(store, NullCommandService, NullHoverService, variable, { expression, name, value, label, lazyButton }, false, [], linkDetector);
-		assert.strictEqual(name.className, 'virtual');
-		assert.strictEqual(label.element.textContent, 'console:');
-		assert.strictEqual(value.className, 'value number');
-
-		label.dispose();
+		configurationService.setUserConfiguration('debug.showVariableTypes', true);
+		assertVariable(session, scope, disposables, true);
 	});
 
 	test('statusbar in debug mode', () => {
diff --git a/src/vs/workbench/contrib/debug/test/browser/breakpoints.test.ts b/src/vs/workbench/contrib/debug/test/browser/breakpoints.test.ts
index 292fa730381..61e2ff90693 100644
--- a/src/vs/workbench/contrib/debug/test/browser/breakpoints.test.ts
+++ b/src/vs/workbench/contrib/debug/test/browser/breakpoints.test.ts
@@ -4,28 +4,28 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { dispose } from 'vs/base/common/lifecycle';
-import { URI as uri } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Range } from 'vs/editor/common/core/range';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { OverviewRulerLane } from 'vs/editor/common/model';
-import { LanguageService } from 'vs/editor/common/services/languageService';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { createBreakpointDecorations } from 'vs/workbench/contrib/debug/browser/breakpointEditorContribution';
-import { getBreakpointMessageAndIcon, getExpandedBodySize } from 'vs/workbench/contrib/debug/browser/breakpointsView';
-import { DataBreakpointSetType, IBreakpointData, IBreakpointUpdateData, IDebugService, State } from 'vs/workbench/contrib/debug/common/debug';
-import { Breakpoint, DebugModel } from 'vs/workbench/contrib/debug/common/debugModel';
-import { createTestSession } from 'vs/workbench/contrib/debug/test/browser/callStack.test';
-import { createMockDebugModel, mockUriIdentityService } from 'vs/workbench/contrib/debug/test/browser/mockDebugModel';
-import { MockDebugService, MockDebugStorage } from 'vs/workbench/contrib/debug/test/common/mockDebug';
-import { MockLabelService } from 'vs/workbench/services/label/test/common/mockLabelService';
-import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
+import { MarkdownString } from '../../../../../base/common/htmlContent.js';
+import { dispose } from '../../../../../base/common/lifecycle.js';
+import { URI as uri } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
+import { OverviewRulerLane } from '../../../../../editor/common/model.js';
+import { LanguageService } from '../../../../../editor/common/services/languageService.js';
+import { createTextModel } from '../../../../../editor/test/common/testTextModel.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { ILabelService } from '../../../../../platform/label/common/label.js';
+import { NullLogService } from '../../../../../platform/log/common/log.js';
+import { StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { createBreakpointDecorations } from '../../browser/breakpointEditorContribution.js';
+import { getBreakpointMessageAndIcon, getExpandedBodySize } from '../../browser/breakpointsView.js';
+import { DataBreakpointSetType, IBreakpointData, IBreakpointUpdateData, IDebugService, State } from '../../common/debug.js';
+import { Breakpoint, DebugModel } from '../../common/debugModel.js';
+import { createTestSession } from './callStack.test.js';
+import { createMockDebugModel, mockUriIdentityService } from './mockDebugModel.js';
+import { MockDebugService, MockDebugStorage } from '../common/mockDebug.js';
+import { MockLabelService } from '../../../../services/label/test/common/mockLabelService.js';
+import { TestStorageService } from '../../../../test/common/workbenchTestServices.js';
 
 function addBreakpointsAndCheckEvents(model: DebugModel, uri: uri, data: IBreakpointData[]) {
 	let eventCount = 0;
diff --git a/src/vs/workbench/contrib/debug/test/browser/callStack.test.ts b/src/vs/workbench/contrib/debug/test/browser/callStack.test.ts
index e4473594e4c..59658c31ab6 100644
--- a/src/vs/workbench/contrib/debug/test/browser/callStack.test.ts
+++ b/src/vs/workbench/contrib/debug/test/browser/callStack.test.ts
@@ -5,24 +5,25 @@
 
 import assert from 'assert';
 import * as sinon from 'sinon';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { Constants } from 'vs/base/common/uint';
-import { generateUuid } from 'vs/base/common/uuid';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Range } from 'vs/editor/common/core/range';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { createDecorationsForStackFrame } from 'vs/workbench/contrib/debug/browser/callStackEditorContribution';
-import { getContext, getContextForContributedActions, getSpecificSourceName } from 'vs/workbench/contrib/debug/browser/callStackView';
-import { debugStackframe, debugStackframeFocused } from 'vs/workbench/contrib/debug/browser/debugIcons';
-import { getStackFrameThreadAndSessionToFocus } from 'vs/workbench/contrib/debug/browser/debugService';
-import { DebugSession } from 'vs/workbench/contrib/debug/browser/debugSession';
-import { IDebugService, IDebugSessionOptions, State } from 'vs/workbench/contrib/debug/common/debug';
-import { DebugModel, StackFrame, Thread } from 'vs/workbench/contrib/debug/common/debugModel';
-import { Source } from 'vs/workbench/contrib/debug/common/debugSource';
-import { createMockDebugModel, mockUriIdentityService } from 'vs/workbench/contrib/debug/test/browser/mockDebugModel';
-import { MockRawSession } from 'vs/workbench/contrib/debug/test/common/mockDebug';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { Constants } from '../../../../../base/common/uint.js';
+import { generateUuid } from '../../../../../base/common/uuid.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { TestAccessibilityService } from '../../../../../platform/accessibility/test/common/testAccessibilityService.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { NullLogService } from '../../../../../platform/log/common/log.js';
+import { createDecorationsForStackFrame } from '../../browser/callStackEditorContribution.js';
+import { getContext, getContextForContributedActions, getSpecificSourceName } from '../../browser/callStackView.js';
+import { debugStackframe, debugStackframeFocused } from '../../browser/debugIcons.js';
+import { getStackFrameThreadAndSessionToFocus } from '../../browser/debugService.js';
+import { DebugSession } from '../../browser/debugSession.js';
+import { IDebugService, IDebugSessionOptions, State } from '../../common/debug.js';
+import { DebugModel, StackFrame, Thread } from '../../common/debugModel.js';
+import { Source } from '../../common/debugSource.js';
+import { createMockDebugModel, mockUriIdentityService } from './mockDebugModel.js';
+import { MockRawSession } from '../common/mockDebug.js';
 
 const mockWorkspaceContextService = {
 	getWorkspace: () => {
@@ -41,7 +42,7 @@ export function createTestSession(model: DebugModel, name = 'mockSession', optio
 				}
 			};
 		}
-	} as IDebugService, undefined!, undefined!, new TestConfigurationService({ debug: { console: { collapseIdenticalLines: true } } }), undefined!, mockWorkspaceContextService, undefined!, undefined!, undefined!, mockUriIdentityService, new TestInstantiationService(), undefined!, undefined!, new NullLogService(), undefined!, undefined!);
+	} as IDebugService, undefined!, undefined!, new TestConfigurationService({ debug: { console: { collapseIdenticalLines: true } } }), undefined!, mockWorkspaceContextService, undefined!, undefined!, undefined!, mockUriIdentityService, new TestInstantiationService(), undefined!, undefined!, new NullLogService(), undefined!, undefined!, new TestAccessibilityService());
 }
 
 function createTwoStackFrames(session: DebugSession): { firstStackFrame: StackFrame; secondStackFrame: StackFrame } {
@@ -445,7 +446,7 @@ suite('Debug - CallStack', () => {
 			override get state(): State {
 				return State.Stopped;
 			}
-		}(generateUuid(), { resolved: { name: 'stoppedSession', type: 'node', request: 'launch' }, unresolved: undefined }, undefined, model, undefined, undefined!, undefined!, undefined!, undefined!, undefined!, mockWorkspaceContextService, undefined!, undefined!, undefined!, mockUriIdentityService, new TestInstantiationService(), undefined!, undefined!, new NullLogService(), undefined!, undefined!);
+		}(generateUuid(), { resolved: { name: 'stoppedSession', type: 'node', request: 'launch' }, unresolved: undefined }, undefined, model, undefined, undefined!, undefined!, undefined!, undefined!, undefined!, mockWorkspaceContextService, undefined!, undefined!, undefined!, mockUriIdentityService, new TestInstantiationService(), undefined!, undefined!, new NullLogService(), undefined!, undefined!, new TestAccessibilityService());
 		disposables.add(session);
 
 		const runningSession = createTestSession(model);
diff --git a/src/vs/workbench/contrib/debug/test/browser/debugANSIHandling.test.ts b/src/vs/workbench/contrib/debug/test/browser/debugANSIHandling.test.ts
index 41c662c091b..eb31a388b2e 100644
--- a/src/vs/workbench/contrib/debug/test/browser/debugANSIHandling.test.ts
+++ b/src/vs/workbench/contrib/debug/test/browser/debugANSIHandling.test.ts
@@ -4,22 +4,20 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { isHTMLSpanElement } from 'vs/base/browser/dom';
-import { Color, RGBA } from 'vs/base/common/color';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { generateUuid } from 'vs/base/common/uuid';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { TestColorTheme, TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
-import { appendStylizedStringToContainer, calcANSI8bitColor, handleANSIOutput } from 'vs/workbench/contrib/debug/browser/debugANSIHandling';
-import { DebugSession } from 'vs/workbench/contrib/debug/browser/debugSession';
-import { LinkDetector } from 'vs/workbench/contrib/debug/browser/linkDetector';
-import { DebugModel } from 'vs/workbench/contrib/debug/common/debugModel';
-import { createTestSession } from 'vs/workbench/contrib/debug/test/browser/callStack.test';
-import { createMockDebugModel } from 'vs/workbench/contrib/debug/test/browser/mockDebugModel';
-import { ansiColorMap, registerColors } from 'vs/workbench/contrib/terminal/common/terminalColorRegistry';
-import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
+import { isHTMLSpanElement } from '../../../../../base/browser/dom.js';
+import { Color, RGBA } from '../../../../../base/common/color.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { generateUuid } from '../../../../../base/common/uuid.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
+import { registerColors } from '../../../terminal/common/terminalColorRegistry.js';
+import { appendStylizedStringToContainer, calcANSI8bitColor, handleANSIOutput } from '../../browser/debugANSIHandling.js';
+import { DebugSession } from '../../browser/debugSession.js';
+import { LinkDetector } from '../../browser/linkDetector.js';
+import { DebugModel } from '../../common/debugModel.js';
+import { createTestSession } from './callStack.test.js';
+import { createMockDebugModel } from './mockDebugModel.js';
 
 suite('Debug - ANSI Handling', () => {
 
@@ -27,7 +25,6 @@ suite('Debug - ANSI Handling', () => {
 	let model: DebugModel;
 	let session: DebugSession;
 	let linkDetector: LinkDetector;
-	let themeService: IThemeService;
 
 	/**
 	 * Instantiate services for use by the functions being tested.
@@ -39,13 +36,6 @@ suite('Debug - ANSI Handling', () => {
 
 		const instantiationService: TestInstantiationService = <TestInstantiationService>workbenchInstantiationService(undefined, disposables);
 		linkDetector = instantiationService.createInstance(LinkDetector);
-
-		const colors: { [id: string]: string } = {};
-		for (const color in ansiColorMap) {
-			colors[color] = <any>ansiColorMap[color].defaults.dark;
-		}
-		const testTheme = new TestColorTheme(colors);
-		themeService = new TestThemeService(testTheme);
 		registerColors();
 	});
 
@@ -92,7 +82,7 @@ suite('Debug - ANSI Handling', () => {
 	 * @returns An {@link HTMLSpanElement} that contains the stylized text.
 	 */
 	function getSequenceOutput(sequence: string): HTMLSpanElement {
-		const root: HTMLSpanElement = handleANSIOutput(sequence, linkDetector, themeService, session.root);
+		const root: HTMLSpanElement = handleANSIOutput(sequence, linkDetector, session.root);
 		assert.strictEqual(1, root.children.length);
 		const child: Node = root.lastChild!;
 		if (isHTMLSpanElement(child)) {
@@ -405,7 +395,7 @@ suite('Debug - ANSI Handling', () => {
 		if (elementsExpected === undefined) {
 			elementsExpected = assertions.length;
 		}
-		const root: HTMLSpanElement = handleANSIOutput(sequence, linkDetector, themeService, session.root);
+		const root: HTMLSpanElement = handleANSIOutput(sequence, linkDetector, session.root);
 		assert.strictEqual(elementsExpected, root.children.length);
 		for (let i = 0; i < elementsExpected; i++) {
 			const child: Node = root.children[i];
diff --git a/src/vs/workbench/contrib/debug/test/browser/debugConfigurationManager.test.ts b/src/vs/workbench/contrib/debug/test/browser/debugConfigurationManager.test.ts
index 6cde637373c..1507c55a064 100644
--- a/src/vs/workbench/contrib/debug/test/browser/debugConfigurationManager.test.ts
+++ b/src/vs/workbench/contrib/debug/test/browser/debugConfigurationManager.test.ts
@@ -4,24 +4,24 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Event } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { ContextKeyService } from 'vs/platform/contextkey/browser/contextKeyService';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { ConfigurationManager } from 'vs/workbench/contrib/debug/browser/debugConfigurationManager';
-import { DebugConfigurationProviderTriggerKind, IAdapterManager, IConfig, IDebugAdapterExecutable, IDebugSession } from 'vs/workbench/contrib/debug/common/debug';
-import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
-import { TestQuickInputService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { TestHistoryService, TestContextService, TestExtensionService, TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { Event } from '../../../../../base/common/event.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { ContextKeyService } from '../../../../../platform/contextkey/browser/contextKeyService.js';
+import { FileService } from '../../../../../platform/files/common/fileService.js';
+import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { NullLogService } from '../../../../../platform/log/common/log.js';
+import { UriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentityService.js';
+import { ConfigurationManager } from '../../browser/debugConfigurationManager.js';
+import { DebugConfigurationProviderTriggerKind, IAdapterManager, IConfig, IDebugAdapterExecutable, IDebugSession } from '../../common/debug.js';
+import { IPreferencesService } from '../../../../services/preferences/common/preferences.js';
+import { TestQuickInputService } from '../../../../test/browser/workbenchTestServices.js';
+import { TestHistoryService, TestContextService, TestExtensionService, TestStorageService } from '../../../../test/common/workbenchTestServices.js';
 
 suite('debugConfigurationManager', () => {
 	const configurationProviderType = 'custom-type';
@@ -61,7 +61,8 @@ suite('debugConfigurationManager', () => {
 			new TestExtensionService(),
 			new TestHistoryService(),
 			new UriIdentityService(fileService),
-			new ContextKeyService(configurationService));
+			new ContextKeyService(configurationService),
+			new NullLogService());
 	});
 
 	teardown(() => disposables.dispose());
diff --git a/src/vs/workbench/contrib/debug/test/browser/debugHover.test.ts b/src/vs/workbench/contrib/debug/test/browser/debugHover.test.ts
index 480c811fc87..729b9fc0424 100644
--- a/src/vs/workbench/contrib/debug/test/browser/debugHover.test.ts
+++ b/src/vs/workbench/contrib/debug/test/browser/debugHover.test.ts
@@ -4,14 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { findExpressionInStackFrame } from 'vs/workbench/contrib/debug/browser/debugHover';
-import type { IExpression, IScope } from 'vs/workbench/contrib/debug/common/debug';
-import { Scope, StackFrame, Thread, Variable } from 'vs/workbench/contrib/debug/common/debugModel';
-import { Source } from 'vs/workbench/contrib/debug/common/debugSource';
-import { createTestSession } from 'vs/workbench/contrib/debug/test/browser/callStack.test';
-import { createMockDebugModel, mockUriIdentityService } from 'vs/workbench/contrib/debug/test/browser/mockDebugModel';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { NullLogService } from '../../../../../platform/log/common/log.js';
+import { findExpressionInStackFrame } from '../../browser/debugHover.js';
+import type { IExpression, IScope } from '../../common/debug.js';
+import { Scope, StackFrame, Thread, Variable } from '../../common/debugModel.js';
+import { Source } from '../../common/debugSource.js';
+import { createTestSession } from './callStack.test.js';
+import { createMockDebugModel, mockUriIdentityService } from './mockDebugModel.js';
 
 suite('Debug - Hover', () => {
 	const disposables = ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/contrib/debug/test/browser/debugMemory.test.ts b/src/vs/workbench/contrib/debug/test/browser/debugMemory.test.ts
index 61e92664e50..1ab1a10d2fc 100644
--- a/src/vs/workbench/contrib/debug/test/browser/debugMemory.test.ts
+++ b/src/vs/workbench/contrib/debug/test/browser/debugMemory.test.ts
@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { decodeBase64, encodeBase64, VSBuffer } from 'vs/base/common/buffer';
-import { Emitter } from 'vs/base/common/event';
-import { mockObject, MockObject } from 'vs/base/test/common/mock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { MemoryRangeType } from 'vs/workbench/contrib/debug/common/debug';
-import { MemoryRegion } from 'vs/workbench/contrib/debug/common/debugModel';
-import { MockSession } from 'vs/workbench/contrib/debug/test/common/mockDebug';
+import { decodeBase64, encodeBase64, VSBuffer } from '../../../../../base/common/buffer.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { mockObject, MockObject } from '../../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { MemoryRangeType } from '../../common/debug.js';
+import { MemoryRegion } from '../../common/debugModel.js';
+import { MockSession } from '../common/mockDebug.js';
 
 suite('Debug - Memory', () => {
 	const dapResponseCommon = {
diff --git a/src/vs/workbench/contrib/debug/test/browser/debugSession.test.ts b/src/vs/workbench/contrib/debug/test/browser/debugSession.test.ts
index b58f2509a7b..f3090020c9c 100644
--- a/src/vs/workbench/contrib/debug/test/browser/debugSession.test.ts
+++ b/src/vs/workbench/contrib/debug/test/browser/debugSession.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ThreadStatusScheduler } from 'vs/workbench/contrib/debug/browser/debugSession';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { ThreadStatusScheduler } from '../../browser/debugSession.js';
 
 
 suite('DebugSession - ThreadStatusScheduler', () => {
diff --git a/src/vs/workbench/contrib/debug/test/browser/debugSource.test.ts b/src/vs/workbench/contrib/debug/test/browser/debugSource.test.ts
index aad31249a2c..464be5ba169 100644
--- a/src/vs/workbench/contrib/debug/test/browser/debugSource.test.ts
+++ b/src/vs/workbench/contrib/debug/test/browser/debugSource.test.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { isWindows } from 'vs/base/common/platform';
-import { URI as uri } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { Source } from 'vs/workbench/contrib/debug/common/debugSource';
-import { mockUriIdentityService } from 'vs/workbench/contrib/debug/test/browser/mockDebugModel';
+import { isWindows } from '../../../../../base/common/platform.js';
+import { URI as uri } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { NullLogService } from '../../../../../platform/log/common/log.js';
+import { Source } from '../../common/debugSource.js';
+import { mockUriIdentityService } from './mockDebugModel.js';
 
 suite('Debug - Source', () => {
 
diff --git a/src/vs/workbench/contrib/debug/test/browser/debugUtils.test.ts b/src/vs/workbench/contrib/debug/test/browser/debugUtils.test.ts
index c57bb374b3d..61f776bacd4 100644
--- a/src/vs/workbench/contrib/debug/test/browser/debugUtils.test.ts
+++ b/src/vs/workbench/contrib/debug/test/browser/debugUtils.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IConfig } from 'vs/workbench/contrib/debug/common/debug';
-import { formatPII, getExactExpressionStartAndEnd, getVisibleAndSorted } from 'vs/workbench/contrib/debug/common/debugUtils';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IConfig } from '../../common/debug.js';
+import { formatPII, getExactExpressionStartAndEnd, getVisibleAndSorted } from '../../common/debugUtils.js';
 
 suite('Debug - Utils', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
@@ -41,6 +41,9 @@ suite('Debug - Utils', () => {
 
 		assert.deepStrictEqual(getExactExpressionStartAndEnd('var t = a.b;c.d.name', 16, 20), { start: 13, end: 20 });
 		assert.deepStrictEqual(getExactExpressionStartAndEnd('var t = a.b.c-d.name', 16, 20), { start: 15, end: 20 });
+
+		assert.deepStrictEqual(getExactExpressionStartAndEnd('var aøñéå文 = a.b.c-d.name', 5, 5), { start: 5, end: 10 });
+		assert.deepStrictEqual(getExactExpressionStartAndEnd('aøñéå文.aøñéå文.aøñéå文', 9, 9), { start: 1, end: 13 });
 	});
 
 	test('config presentation', () => {
diff --git a/src/vs/workbench/contrib/debug/test/browser/debugViewModel.test.ts b/src/vs/workbench/contrib/debug/test/browser/debugViewModel.test.ts
index 6e2f76448ec..f6d12fd9dcc 100644
--- a/src/vs/workbench/contrib/debug/test/browser/debugViewModel.test.ts
+++ b/src/vs/workbench/contrib/debug/test/browser/debugViewModel.test.ts
@@ -4,14 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { Expression, StackFrame, Thread } from 'vs/workbench/contrib/debug/common/debugModel';
-import { Source } from 'vs/workbench/contrib/debug/common/debugSource';
-import { ViewModel } from 'vs/workbench/contrib/debug/common/debugViewModel';
-import { mockUriIdentityService } from 'vs/workbench/contrib/debug/test/browser/mockDebugModel';
-import { MockSession } from 'vs/workbench/contrib/debug/test/common/mockDebug';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { MockContextKeyService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { NullLogService } from '../../../../../platform/log/common/log.js';
+import { Expression, StackFrame, Thread } from '../../common/debugModel.js';
+import { Source } from '../../common/debugSource.js';
+import { ViewModel } from '../../common/debugViewModel.js';
+import { mockUriIdentityService } from './mockDebugModel.js';
+import { MockSession } from '../common/mockDebug.js';
 
 suite('Debug - View Model', () => {
 	let model: ViewModel;
diff --git a/src/vs/workbench/contrib/debug/test/browser/linkDetector.test.ts b/src/vs/workbench/contrib/debug/test/browser/linkDetector.test.ts
index 1b888a6e147..c078c4a371e 100644
--- a/src/vs/workbench/contrib/debug/test/browser/linkDetector.test.ts
+++ b/src/vs/workbench/contrib/debug/test/browser/linkDetector.test.ts
@@ -4,15 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { isHTMLAnchorElement } from 'vs/base/browser/dom';
-import { isWindows } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { ITunnelService } from 'vs/platform/tunnel/common/tunnel';
-import { WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { LinkDetector } from 'vs/workbench/contrib/debug/browser/linkDetector';
-import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
+import { isHTMLAnchorElement } from '../../../../../base/browser/dom.js';
+import { isWindows } from '../../../../../base/common/platform.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { ITunnelService } from '../../../../../platform/tunnel/common/tunnel.js';
+import { WorkspaceFolder } from '../../../../../platform/workspace/common/workspace.js';
+import { LinkDetector } from '../../browser/linkDetector.js';
+import { workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
 
 suite('Debug - Link Detector', () => {
 
diff --git a/src/vs/workbench/contrib/debug/test/browser/mockDebugModel.ts b/src/vs/workbench/contrib/debug/test/browser/mockDebugModel.ts
index 385b4c1ae66..1779cb14166 100644
--- a/src/vs/workbench/contrib/debug/test/browser/mockDebugModel.ts
+++ b/src/vs/workbench/contrib/debug/test/browser/mockDebugModel.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { DebugModel } from 'vs/workbench/contrib/debug/common/debugModel';
-import { MockDebugStorage } from 'vs/workbench/contrib/debug/test/common/mockDebug';
-import { TestFileService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { NullLogService } from '../../../../../platform/log/common/log.js';
+import { UriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentityService.js';
+import { DebugModel } from '../../common/debugModel.js';
+import { MockDebugStorage } from '../common/mockDebug.js';
+import { TestFileService } from '../../../../test/browser/workbenchTestServices.js';
+import { TestStorageService } from '../../../../test/common/workbenchTestServices.js';
 
 const fileService = new TestFileService();
 export const mockUriIdentityService = new UriIdentityService(fileService);
diff --git a/src/vs/workbench/contrib/debug/test/browser/rawDebugSession.test.ts b/src/vs/workbench/contrib/debug/test/browser/rawDebugSession.test.ts
index 5a9f3f2f415..6aedb007bd2 100644
--- a/src/vs/workbench/contrib/debug/test/browser/rawDebugSession.test.ts
+++ b/src/vs/workbench/contrib/debug/test/browser/rawDebugSession.test.ts
@@ -4,15 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { mock, mockObject } from 'vs/base/test/common/mock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IExtensionHostDebugService } from 'vs/platform/debug/common/extensionHostDebug';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { RawDebugSession } from 'vs/workbench/contrib/debug/browser/rawDebugSession';
-import { IDebugger } from 'vs/workbench/contrib/debug/common/debug';
-import { MockDebugAdapter } from 'vs/workbench/contrib/debug/test/common/mockDebug';
+import { mock, mockObject } from '../../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IExtensionHostDebugService } from '../../../../../platform/debug/common/extensionHostDebug.js';
+import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
+import { INotificationService } from '../../../../../platform/notification/common/notification.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
+import { RawDebugSession } from '../../browser/rawDebugSession.js';
+import { IDebugger } from '../../common/debug.js';
+import { MockDebugAdapter } from '../common/mockDebug.js';
 
 suite('RawDebugSession', () => {
 	const disposables = ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/contrib/debug/test/browser/repl.test.ts b/src/vs/workbench/contrib/debug/test/browser/repl.test.ts
index 54da8d61f19..7256a353905 100644
--- a/src/vs/workbench/contrib/debug/test/browser/repl.test.ts
+++ b/src/vs/workbench/contrib/debug/test/browser/repl.test.ts
@@ -5,18 +5,18 @@
 
 
 import assert from 'assert';
-import { TreeVisibility } from 'vs/base/browser/ui/tree/tree';
-import { timeout } from 'vs/base/common/async';
-import severity from 'vs/base/common/severity';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { RawDebugSession } from 'vs/workbench/contrib/debug/browser/rawDebugSession';
-import { ReplFilter } from 'vs/workbench/contrib/debug/browser/replFilter';
-import { DebugModel, StackFrame, Thread } from 'vs/workbench/contrib/debug/common/debugModel';
-import { RawObjectReplElement, ReplEvaluationInput, ReplEvaluationResult, ReplGroup, ReplModel, ReplOutputElement, ReplVariableElement } from 'vs/workbench/contrib/debug/common/replModel';
-import { createTestSession } from 'vs/workbench/contrib/debug/test/browser/callStack.test';
-import { createMockDebugModel } from 'vs/workbench/contrib/debug/test/browser/mockDebugModel';
-import { MockDebugAdapter, MockRawSession } from 'vs/workbench/contrib/debug/test/common/mockDebug';
+import { TreeVisibility } from '../../../../../base/browser/ui/tree/tree.js';
+import { timeout } from '../../../../../base/common/async.js';
+import severity from '../../../../../base/common/severity.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { RawDebugSession } from '../../browser/rawDebugSession.js';
+import { ReplFilter } from '../../browser/replFilter.js';
+import { DebugModel, StackFrame, Thread } from '../../common/debugModel.js';
+import { RawObjectReplElement, ReplEvaluationInput, ReplEvaluationResult, ReplGroup, ReplModel, ReplOutputElement, ReplVariableElement } from '../../common/replModel.js';
+import { createTestSession } from './callStack.test.js';
+import { createMockDebugModel } from './mockDebugModel.js';
+import { MockDebugAdapter, MockRawSession } from '../common/mockDebug.js';
 
 suite('Debug - REPL', () => {
 	let model: DebugModel;
@@ -201,7 +201,7 @@ suite('Debug - REPL', () => {
 		const repl = new ReplModel(configurationService);
 
 		repl.appendToRepl(session, { output: 'first global line', sev: severity.Info });
-		repl.startGroup('group_1', true);
+		repl.startGroup(session, 'group_1', true);
 		repl.appendToRepl(session, { output: 'first line in group', sev: severity.Info });
 		repl.appendToRepl(session, { output: 'second line in group', sev: severity.Info });
 		const elements = repl.getReplElements();
@@ -212,7 +212,7 @@ suite('Debug - REPL', () => {
 		assert.strictEqual(group.hasChildren, true);
 		assert.strictEqual(group.hasEnded, false);
 
-		repl.startGroup('group_2', false);
+		repl.startGroup(session, 'group_2', false);
 		repl.appendToRepl(session, { output: 'first line in subgroup', sev: severity.Info });
 		repl.appendToRepl(session, { output: 'second line in subgroup', sev: severity.Info });
 		const children = group.getChildren();
diff --git a/src/vs/workbench/contrib/debug/test/browser/variablesView.test.ts b/src/vs/workbench/contrib/debug/test/browser/variablesView.test.ts
new file mode 100644
index 00000000000..0ca1a84601a
--- /dev/null
+++ b/src/vs/workbench/contrib/debug/test/browser/variablesView.test.ts
@@ -0,0 +1,114 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import * as dom from '../../../../../base/browser/dom.js';
+import { HighlightedLabel } from '../../../../../base/browser/ui/highlightedlabel/highlightedLabel.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
+import { NullHoverService } from '../../../../../platform/hover/test/browser/nullHoverService.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
+import { DebugExpressionRenderer } from '../../browser/debugExpressionRenderer.js';
+import { VariablesRenderer } from '../../browser/variablesView.js';
+import { IDebugService, IViewModel } from '../../common/debug.js';
+import { Scope, StackFrame, Thread, Variable } from '../../common/debugModel.js';
+import { MockDebugService, MockSession } from '../common/mockDebug.js';
+
+const $ = dom.$;
+
+function assertVariable(disposables: Pick<DisposableStore, "add">, variablesRenderer: VariablesRenderer, displayType: boolean) {
+	const session = new MockSession();
+	const thread = new Thread(session, 'mockthread', 1);
+	const range = {
+		startLineNumber: 1,
+		startColumn: 1,
+		endLineNumber: undefined!,
+		endColumn: undefined!
+	};
+	const stackFrame = new StackFrame(thread, 1, null!, 'app.js', 'normal', range, 0, true);
+	const scope = new Scope(stackFrame, 1, 'local', 1, false, 10, 10);
+	const node = {
+		element: new Variable(session, 1, scope, 2, 'foo', 'bar.foo', undefined, 0, 0, undefined, {}, 'string'),
+		depth: 0,
+		visibleChildrenCount: 1,
+		visibleChildIndex: -1,
+		collapsible: false,
+		collapsed: false,
+		visible: true,
+		filterData: undefined,
+		children: []
+	};
+	const expression = $('.');
+	const name = $('.');
+	const type = $('.');
+	const value = $('.');
+	const label = disposables.add(new HighlightedLabel(name));
+	const lazyButton = $('.');
+	const inputBoxContainer = $('.');
+	const elementDisposable = disposables.add(new DisposableStore());
+	const templateDisposable = disposables.add(new DisposableStore());
+	const currentElement = undefined;
+	const data = {
+		expression,
+		name,
+		type,
+		value,
+		label,
+		lazyButton,
+		inputBoxContainer,
+		elementDisposable,
+		templateDisposable,
+		currentElement
+	};
+	variablesRenderer.renderElement(node, 0, data);
+	assert.strictEqual(value.textContent, '');
+	assert.strictEqual(label.element.textContent, 'foo');
+
+	node.element.value = 'xpto';
+	variablesRenderer.renderElement(node, 0, data);
+	assert.strictEqual(value.textContent, 'xpto');
+	assert.strictEqual(type.textContent, displayType ? 'string =' : '');
+	assert.strictEqual(label.element.textContent, displayType ? 'foo: ' : 'foo =');
+
+	variablesRenderer.disposeTemplate(data);
+}
+
+suite('Debug - Variable Debug View', () => {
+	const disposables = ensureNoDisposablesAreLeakedInTestSuite();
+	let variablesRenderer: VariablesRenderer;
+	let instantiationService: TestInstantiationService;
+	let expressionRenderer: DebugExpressionRenderer;
+	let configurationService: TestConfigurationService;
+
+	setup(() => {
+		instantiationService = workbenchInstantiationService(undefined, disposables);
+		configurationService = instantiationService.createInstance(TestConfigurationService);
+		instantiationService.stub(IConfigurationService, configurationService);
+		expressionRenderer = instantiationService.createInstance(DebugExpressionRenderer);
+		const debugService = new MockDebugService();
+		instantiationService.stub(IHoverService, NullHoverService);
+		debugService.getViewModel = () => <IViewModel>{ focusedStackFrame: undefined, getSelectedExpression: () => undefined };
+		debugService.getViewModel().getSelectedExpression = () => undefined;
+		instantiationService.stub(IDebugService, debugService);
+	});
+
+	test('variable expressions with display type', () => {
+		configurationService.setUserConfiguration('debug.showVariableTypes', true);
+		instantiationService.stub(IConfigurationService, configurationService);
+		variablesRenderer = instantiationService.createInstance(VariablesRenderer, expressionRenderer);
+		assertVariable(disposables, variablesRenderer, true);
+	});
+
+	test('variable expressions', () => {
+		configurationService.setUserConfiguration('debug.showVariableTypes', false);
+		instantiationService.stub(IConfigurationService, configurationService);
+		variablesRenderer = instantiationService.createInstance(VariablesRenderer, expressionRenderer);
+		assertVariable(disposables, variablesRenderer, false);
+	});
+});
diff --git a/src/vs/workbench/contrib/debug/test/browser/watch.test.ts b/src/vs/workbench/contrib/debug/test/browser/watch.test.ts
index 92b54afe7ca..e1318aea6ea 100644
--- a/src/vs/workbench/contrib/debug/test/browser/watch.test.ts
+++ b/src/vs/workbench/contrib/debug/test/browser/watch.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { DebugModel, Expression } from 'vs/workbench/contrib/debug/common/debugModel';
-import { createMockDebugModel } from 'vs/workbench/contrib/debug/test/browser/mockDebugModel';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { DebugModel, Expression } from '../../common/debugModel.js';
+import { createMockDebugModel } from './mockDebugModel.js';
 
 // Expressions
 
diff --git a/src/vs/workbench/contrib/debug/test/browser/watchExpressionView.test.ts b/src/vs/workbench/contrib/debug/test/browser/watchExpressionView.test.ts
new file mode 100644
index 00000000000..f3e818393eb
--- /dev/null
+++ b/src/vs/workbench/contrib/debug/test/browser/watchExpressionView.test.ts
@@ -0,0 +1,111 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import * as dom from '../../../../../base/browser/dom.js';
+import { HighlightedLabel } from '../../../../../base/browser/ui/highlightedlabel/highlightedLabel.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { WatchExpressionsRenderer } from '../../browser/watchExpressionsView.js';
+import { Scope, StackFrame, Thread, Variable } from '../../common/debugModel.js';
+import { MockDebugService, MockSession } from '../common/mockDebug.js';
+import { workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
+import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
+import { NullHoverService } from '../../../../../platform/hover/test/browser/nullHoverService.js';
+import { IDebugService, IViewModel } from '../../common/debug.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { DebugExpressionRenderer } from '../../browser/debugExpressionRenderer.js';
+const $ = dom.$;
+
+function assertWatchVariable(disposables: Pick<DisposableStore, "add">, watchExpressionsRenderer: WatchExpressionsRenderer, displayType: boolean) {
+	const session = new MockSession();
+	const thread = new Thread(session, 'mockthread', 1);
+	const range = {
+		startLineNumber: 1,
+		startColumn: 1,
+		endLineNumber: undefined!,
+		endColumn: undefined!
+	};
+	const stackFrame = new StackFrame(thread, 1, null!, 'app.js', 'normal', range, 0, true);
+	const scope = new Scope(stackFrame, 1, 'local', 1, false, 10, 10);
+	const node = {
+		element: new Variable(session, 1, scope, 2, 'foo', 'bar.foo', undefined, 0, 0, undefined, {}, 'string'),
+		depth: 0,
+		visibleChildrenCount: 1,
+		visibleChildIndex: -1,
+		collapsible: false,
+		collapsed: false,
+		visible: true,
+		filterData: undefined,
+		children: []
+	};
+	const expression = $('.');
+	const name = $('.');
+	const type = $('.');
+	const value = $('.');
+	const label = disposables.add(new HighlightedLabel(name));
+	const lazyButton = $('.');
+	const inputBoxContainer = $('.');
+	const elementDisposable = disposables.add(new DisposableStore());
+	const templateDisposable = disposables.add(new DisposableStore());
+	const currentElement = undefined;
+	const data = {
+		expression,
+		name,
+		type,
+		value,
+		label,
+		lazyButton,
+		inputBoxContainer,
+		elementDisposable,
+		templateDisposable,
+		currentElement
+	};
+	watchExpressionsRenderer.renderElement(node, 0, data);
+	assert.strictEqual(value.textContent, '');
+	assert.strictEqual(label.element.textContent, displayType ? 'foo: ' : 'foo =');
+
+	node.element.value = 'xpto';
+	watchExpressionsRenderer.renderElement(node, 0, data);
+	assert.strictEqual(value.textContent, 'xpto');
+	assert.strictEqual(type.textContent, displayType ? 'string =' : '');
+	assert.strictEqual(label.element.textContent, displayType ? 'foo: ' : 'foo =');
+}
+
+suite('Debug - Watch Debug View', () => {
+	const disposables = ensureNoDisposablesAreLeakedInTestSuite();
+	let watchExpressionsRenderer: WatchExpressionsRenderer;
+	let instantiationService: TestInstantiationService;
+	let configurationService: TestConfigurationService;
+	let expressionRenderer: DebugExpressionRenderer;
+
+	setup(() => {
+		instantiationService = workbenchInstantiationService(undefined, disposables);
+		configurationService = instantiationService.createInstance(TestConfigurationService);
+		instantiationService.stub(IConfigurationService, configurationService);
+		expressionRenderer = instantiationService.createInstance(DebugExpressionRenderer);
+		const debugService = new MockDebugService();
+		instantiationService.stub(IHoverService, NullHoverService);
+		debugService.getViewModel = () => <IViewModel>{ focusedStackFrame: undefined, getSelectedExpression: () => undefined };
+		debugService.getViewModel().getSelectedExpression = () => undefined;
+		instantiationService.stub(IDebugService, debugService);
+	});
+
+	test('watch expressions with display type', () => {
+		configurationService.setUserConfiguration('debug', { showVariableTypes: true });
+		instantiationService.stub(IConfigurationService, configurationService);
+		watchExpressionsRenderer = instantiationService.createInstance(WatchExpressionsRenderer, expressionRenderer);
+		assertWatchVariable(disposables, watchExpressionsRenderer, true);
+	});
+
+	test('watch expressions', () => {
+		configurationService.setUserConfiguration('debug', { showVariableTypes: false });
+		instantiationService.stub(IConfigurationService, configurationService);
+		watchExpressionsRenderer = instantiationService.createInstance(WatchExpressionsRenderer, expressionRenderer);
+		assertWatchVariable(disposables, watchExpressionsRenderer, false);
+	});
+});
diff --git a/src/vs/workbench/contrib/debug/test/common/abstractDebugAdapter.test.ts b/src/vs/workbench/contrib/debug/test/common/abstractDebugAdapter.test.ts
index cfcc1af8b87..9bc370859ca 100644
--- a/src/vs/workbench/contrib/debug/test/common/abstractDebugAdapter.test.ts
+++ b/src/vs/workbench/contrib/debug/test/common/abstractDebugAdapter.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { timeout } from 'vs/base/common/async';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { MockDebugAdapter } from 'vs/workbench/contrib/debug/test/common/mockDebug';
+import { timeout } from '../../../../../base/common/async.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { MockDebugAdapter } from './mockDebug.js';
 
 suite('Debug - AbstractDebugAdapter', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/contrib/debug/test/common/debugModel.test.ts b/src/vs/workbench/contrib/debug/test/common/debugModel.test.ts
index e3cf88f9b07..43b8d2cd538 100644
--- a/src/vs/workbench/contrib/debug/test/common/debugModel.test.ts
+++ b/src/vs/workbench/contrib/debug/test/common/debugModel.test.ts
@@ -4,14 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DeferredPromise } from 'vs/base/common/async';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { mockObject } from 'vs/base/test/common/mock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { DebugModel, ExceptionBreakpoint, FunctionBreakpoint, Thread } from 'vs/workbench/contrib/debug/common/debugModel';
-import { MockDebugStorage } from 'vs/workbench/contrib/debug/test/common/mockDebug';
-import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
+import { DeferredPromise } from '../../../../../base/common/async.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { mockObject } from '../../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { NullLogService } from '../../../../../platform/log/common/log.js';
+import { DebugModel, ExceptionBreakpoint, FunctionBreakpoint, Thread } from '../../common/debugModel.js';
+import { MockDebugStorage } from './mockDebug.js';
+import { TestStorageService } from '../../../../test/common/workbenchTestServices.js';
 
 suite('DebugModel', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/contrib/debug/test/common/mockDebug.ts b/src/vs/workbench/contrib/debug/test/common/mockDebug.ts
index 464a4794def..01f78d68fdf 100644
--- a/src/vs/workbench/contrib/debug/test/common/mockDebug.ts
+++ b/src/vs/workbench/contrib/debug/test/common/mockDebug.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DeferredPromise } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Event } from 'vs/base/common/event';
-import { URI as uri } from 'vs/base/common/uri';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { ITextModel } from 'vs/editor/common/model';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { AbstractDebugAdapter } from 'vs/workbench/contrib/debug/common/abstractDebugAdapter';
-import { AdapterEndEvent, IAdapterManager, IBreakpoint, IBreakpointData, IBreakpointUpdateData, IConfig, IConfigurationManager, IDataBreakpoint, IDataBreakpointInfoResponse, IDebugModel, IDebugService, IDebugSession, IDebugSessionOptions, IDebugger, IExceptionBreakpoint, IExceptionInfo, IFunctionBreakpoint, IInstructionBreakpoint, ILaunch, IMemoryRegion, INewReplElementData, IRawModelUpdate, IRawStoppedDetails, IReplElement, IStackFrame, IThread, IViewModel, LoadedSourceEvent, State } from 'vs/workbench/contrib/debug/common/debug';
-import { DebugCompoundRoot } from 'vs/workbench/contrib/debug/common/debugCompoundRoot';
-import { IInstructionBreakpointOptions } from 'vs/workbench/contrib/debug/common/debugModel';
-import { Source } from 'vs/workbench/contrib/debug/common/debugSource';
-import { DebugStorage } from 'vs/workbench/contrib/debug/common/debugStorage';
+import { DeferredPromise } from '../../../../../base/common/async.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { Event } from '../../../../../base/common/event.js';
+import { URI as uri } from '../../../../../base/common/uri.js';
+import { IPosition, Position } from '../../../../../editor/common/core/position.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
+import { NullLogService } from '../../../../../platform/log/common/log.js';
+import { IStorageService } from '../../../../../platform/storage/common/storage.js';
+import { IWorkspaceFolder } from '../../../../../platform/workspace/common/workspace.js';
+import { AbstractDebugAdapter } from '../../common/abstractDebugAdapter.js';
+import { AdapterEndEvent, IAdapterManager, IBreakpoint, IBreakpointData, IBreakpointUpdateData, IConfig, IConfigurationManager, IDataBreakpoint, IDataBreakpointInfoResponse, IDebugLocationReferenced, IDebugModel, IDebugService, IDebugSession, IDebugSessionOptions, IDebugger, IExceptionBreakpoint, IExceptionInfo, IFunctionBreakpoint, IInstructionBreakpoint, ILaunch, IMemoryRegion, INewReplElementData, IRawModelUpdate, IRawStoppedDetails, IReplElement, IStackFrame, IThread, IViewModel, LoadedSourceEvent, State } from '../../common/debug.js';
+import { DebugCompoundRoot } from '../../common/debugCompoundRoot.js';
+import { IInstructionBreakpointOptions } from '../../common/debugModel.js';
+import { Source } from '../../common/debugSource.js';
+import { DebugStorage } from '../../common/debugStorage.js';
 
 export class MockDebugService implements IDebugService {
 	_serviceBrand: undefined;
@@ -258,7 +258,7 @@ export class MockSession implements IDebugSession {
 	}
 
 	removeReplExpressions(): void { }
-	get onDidChangeReplElements(): Event<void> {
+	get onDidChangeReplElements(): Event<IReplElement | undefined> {
 		throw new Error('not implemented');
 	}
 
@@ -451,6 +451,9 @@ export class MockSession implements IDebugSession {
 	goto(threadId: number, targetId: number): Promise<DebugProtocol.GotoResponse> {
 		throw new Error('Method not implemented.');
 	}
+	resolveLocationReference(locationReference: number): Promise<IDebugLocationReferenced> {
+		throw new Error('Method not implemented.');
+	}
 }
 
 export class MockRawSession {
diff --git a/src/vs/workbench/contrib/debug/test/node/debugger.test.ts b/src/vs/workbench/contrib/debug/test/node/debugger.test.ts
index e6891cec75f..9df2d6e6e37 100644
--- a/src/vs/workbench/contrib/debug/test/node/debugger.test.ts
+++ b/src/vs/workbench/contrib/debug/test/node/debugger.test.ts
@@ -4,16 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { join, normalize } from 'vs/base/common/path';
-import * as platform from 'vs/base/common/platform';
-import { IDebugAdapterExecutable, IConfig, IDebugSession, IAdapterManager } from 'vs/workbench/contrib/debug/common/debug';
-import { Debugger } from 'vs/workbench/contrib/debug/common/debugger';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { URI } from 'vs/base/common/uri';
-import { ExecutableDebugAdapter } from 'vs/workbench/contrib/debug/node/debugAdapter';
-import { TestTextResourcePropertiesService } from 'vs/editor/test/common/services/testTextResourcePropertiesService';
-import { ExtensionIdentifier, IExtensionDescription, TargetPlatform } from 'vs/platform/extensions/common/extensions';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { join, normalize } from '../../../../../base/common/path.js';
+import * as platform from '../../../../../base/common/platform.js';
+import { IDebugAdapterExecutable, IConfig, IDebugSession, IAdapterManager } from '../../common/debug.js';
+import { Debugger } from '../../common/debugger.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ExecutableDebugAdapter } from '../../node/debugAdapter.js';
+import { TestTextResourcePropertiesService } from '../../../../../editor/test/common/services/testTextResourcePropertiesService.js';
+import { ExtensionIdentifier, IExtensionDescription, TargetPlatform } from '../../../../../platform/extensions/common/extensions.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 
 suite('Debug - Debugger', () => {
@@ -64,7 +64,8 @@ suite('Debug - Debugger', () => {
 			'debuggers': [
 				debuggerContribution
 			]
-		}
+		},
+		enabledApiProposals: undefined,
 	};
 
 	const extensionDescriptor1 = {
@@ -89,7 +90,8 @@ suite('Debug - Debugger', () => {
 					args: ['parg']
 				}
 			]
-		}
+		},
+		enabledApiProposals: undefined,
 	};
 
 	const extensionDescriptor2 = {
@@ -122,7 +124,8 @@ suite('Debug - Debugger', () => {
 					}
 				}
 			]
-		}
+		},
+		enabledApiProposals: undefined,
 	};
 
 
diff --git a/src/vs/workbench/contrib/debug/test/node/streamDebugAdapter.test.ts b/src/vs/workbench/contrib/debug/test/node/streamDebugAdapter.test.ts
index 89bb6968f5e..8497b429831 100644
--- a/src/vs/workbench/contrib/debug/test/node/streamDebugAdapter.test.ts
+++ b/src/vs/workbench/contrib/debug/test/node/streamDebugAdapter.test.ts
@@ -6,12 +6,12 @@
 import assert from 'assert';
 import * as crypto from 'crypto';
 import * as net from 'net';
-import * as platform from 'vs/base/common/platform';
+import * as platform from '../../../../../base/common/platform.js';
 import { tmpdir } from 'os';
-import { join } from 'vs/base/common/path';
-import * as ports from 'vs/base/node/ports';
-import { SocketDebugAdapter, NamedPipeDebugAdapter, StreamDebugAdapter } from 'vs/workbench/contrib/debug/node/debugAdapter';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { join } from '../../../../../base/common/path.js';
+import * as ports from '../../../../../base/node/ports.js';
+import { SocketDebugAdapter, NamedPipeDebugAdapter, StreamDebugAdapter } from '../../node/debugAdapter.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 
 function sendInitializeRequest(debugAdapter: StreamDebugAdapter): Promise<DebugProtocol.Response> {
diff --git a/src/vs/workbench/contrib/debug/test/node/terminals.test.ts b/src/vs/workbench/contrib/debug/test/node/terminals.test.ts
index bd81c9c13e2..ea756282142 100644
--- a/src/vs/workbench/contrib/debug/test/node/terminals.test.ts
+++ b/src/vs/workbench/contrib/debug/test/node/terminals.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { prepareCommand } from 'vs/workbench/contrib/debug/node/terminals';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { prepareCommand } from '../../node/terminals.js';
 
 
 suite('Debug - prepareCommand', () => {
diff --git a/src/vs/workbench/contrib/deprecatedExtensionMigrator/browser/deprecatedExtensionMigrator.contribution.ts b/src/vs/workbench/contrib/deprecatedExtensionMigrator/browser/deprecatedExtensionMigrator.contribution.ts
index 3abb2f55315..6c1899f0180 100644
--- a/src/vs/workbench/contrib/deprecatedExtensionMigrator/browser/deprecatedExtensionMigrator.contribution.ts
+++ b/src/vs/workbench/contrib/deprecatedExtensionMigrator/browser/deprecatedExtensionMigrator.contribution.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Action } from 'vs/base/common/actions';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { isDefined } from 'vs/base/common/types';
-import { localize } from 'vs/nls';
-import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
-import { IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions';
-import { EnablementState } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { Action } from '../../../../base/common/actions.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { isDefined } from '../../../../base/common/types.js';
+import { localize } from '../../../../nls.js';
+import { ConfigurationTarget, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry } from '../../../common/contributions.js';
+import { IExtensionsWorkbenchService } from '../../extensions/common/extensions.js';
+import { EnablementState } from '../../../services/extensionManagement/common/extensionManagement.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
 
 class DeprecatedExtensionMigratorContribution {
 	constructor(
diff --git a/src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts b/src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts
index deb9b7e7548..d8ed8a95c5f 100644
--- a/src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts
+++ b/src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts
@@ -3,72 +3,71 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { ILifecycleService, LifecyclePhase, ShutdownReason } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { Action2, IAction2Options, MenuId, MenuRegistry, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { localize, localize2 } from 'vs/nls';
-import { IEditSessionsStorageService, Change, ChangeType, Folder, EditSession, FileType, EDIT_SESSION_SYNC_CATEGORY, EDIT_SESSIONS_CONTAINER_ID, EditSessionSchemaVersion, IEditSessionsLogService, EDIT_SESSIONS_VIEW_ICON, EDIT_SESSIONS_TITLE, EDIT_SESSIONS_SHOW_VIEW, EDIT_SESSIONS_DATA_VIEW_ID, decodeEditSessionFileContent, hashedEditSessionId, editSessionsLogId, EDIT_SESSIONS_PENDING } from 'vs/workbench/contrib/editSessions/common/editSessions';
-import { ISCMRepository, ISCMService } from 'vs/workbench/contrib/scm/common/scm';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IWorkspaceContextService, IWorkspaceFolder, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { URI } from 'vs/base/common/uri';
-import { basename, joinPath, relativePath } from 'vs/base/common/resources';
-import { encodeBase64 } from 'vs/base/common/buffer';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IProgress, IProgressService, IProgressStep, ProgressLocation } from 'vs/platform/progress/common/progress';
-import { EditSessionsWorkbenchService } from 'vs/workbench/contrib/editSessions/browser/editSessionsStorageService';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { UserDataSyncErrorCode, UserDataSyncStoreError, IUserDataSynchroniser } from 'vs/platform/userDataSync/common/userDataSync';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { getFileNamesMessage, IDialogService, IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { workbenchConfigurationNodeBase } from 'vs/workbench/common/configuration';
-import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { IQuickInputButton, IQuickInputService, IQuickPickItem, IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
-import { ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { ContextKeyExpr, ContextKeyExpression, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { getVirtualWorkspaceLocation } from 'vs/platform/workspace/common/virtualWorkspace';
-import { Schemas } from 'vs/base/common/network';
-import { IsWebContext } from 'vs/platform/contextkey/common/contextkeys';
-import { IExtensionService, isProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
-import { EditSessionsLogService } from 'vs/workbench/contrib/editSessions/common/editSessionsLogService';
-import { IViewContainersRegistry, Extensions as ViewExtensions, ViewContainerLocation } from 'vs/workbench/common/views';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { EditSessionsDataViews } from 'vs/workbench/contrib/editSessions/browser/editSessionsViews';
-import { EditSessionsFileSystemProvider } from 'vs/workbench/contrib/editSessions/browser/editSessionsFileSystemProvider';
-import { isNative, isWeb } from 'vs/base/common/platform';
-import { VirtualWorkspaceContext, WorkspaceFolderCountContext } from 'vs/workbench/common/contextkeys';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { equals } from 'vs/base/common/objects';
-import { EditSessionIdentityMatch, IEditSessionIdentityService } from 'vs/platform/workspace/common/editSessions';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IOutputService } from 'vs/workbench/services/output/common/output';
-import { sha1Hex } from 'vs/base/browser/hash';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ILocalizedString } from 'vs/platform/action/common/action';
-import { Codicon } from 'vs/base/common/codicons';
-import { CancellationError } from 'vs/base/common/errors';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { IExtensionsViewPaneContainer, VIEWLET_ID } from 'vs/workbench/contrib/extensions/common/extensions';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { WorkspaceStateSynchroniser } from 'vs/workbench/contrib/editSessions/common/workspaceStateSync';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IRequestService } from 'vs/platform/request/common/request';
-import { EditSessionsStoreClient } from 'vs/workbench/contrib/editSessions/common/editSessionsStorageClient';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IWorkspaceIdentityService } from 'vs/workbench/services/workspaces/common/workspaceIdentityService';
+import { Disposable, DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from '../../../common/contributions.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { ILifecycleService, LifecyclePhase, ShutdownReason } from '../../../services/lifecycle/common/lifecycle.js';
+import { Action2, IAction2Options, MenuId, MenuRegistry, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { IEditSessionsStorageService, Change, ChangeType, Folder, EditSession, FileType, EDIT_SESSION_SYNC_CATEGORY, EDIT_SESSIONS_CONTAINER_ID, EditSessionSchemaVersion, IEditSessionsLogService, EDIT_SESSIONS_VIEW_ICON, EDIT_SESSIONS_TITLE, EDIT_SESSIONS_SHOW_VIEW, EDIT_SESSIONS_DATA_VIEW_ID, decodeEditSessionFileContent, hashedEditSessionId, editSessionsLogId, EDIT_SESSIONS_PENDING } from '../common/editSessions.js';
+import { ISCMRepository, ISCMService } from '../../scm/common/scm.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IWorkspaceContextService, IWorkspaceFolder, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { URI } from '../../../../base/common/uri.js';
+import { basename, joinPath, relativePath } from '../../../../base/common/resources.js';
+import { encodeBase64 } from '../../../../base/common/buffer.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IProgress, IProgressService, IProgressStep, ProgressLocation } from '../../../../platform/progress/common/progress.js';
+import { EditSessionsWorkbenchService } from './editSessionsStorageService.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { UserDataSyncErrorCode, UserDataSyncStoreError, IUserDataSynchroniser } from '../../../../platform/userDataSync/common/userDataSync.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { getFileNamesMessage, IDialogService, IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { workbenchConfigurationNodeBase } from '../../../common/configuration.js';
+import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { IQuickInputButton, IQuickInputService, IQuickPickItem, IQuickPickSeparator } from '../../../../platform/quickinput/common/quickInput.js';
+import { ExtensionsRegistry } from '../../../services/extensions/common/extensionsRegistry.js';
+import { ContextKeyExpr, ContextKeyExpression, IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { getVirtualWorkspaceLocation } from '../../../../platform/workspace/common/virtualWorkspace.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { IsWebContext } from '../../../../platform/contextkey/common/contextkeys.js';
+import { IExtensionService, isProposedApiEnabled } from '../../../services/extensions/common/extensions.js';
+import { EditSessionsLogService } from '../common/editSessionsLogService.js';
+import { IViewContainersRegistry, Extensions as ViewExtensions, ViewContainerLocation } from '../../../common/views.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { ViewPaneContainer } from '../../../browser/parts/views/viewPaneContainer.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { EditSessionsDataViews } from './editSessionsViews.js';
+import { EditSessionsFileSystemProvider } from './editSessionsFileSystemProvider.js';
+import { isNative, isWeb } from '../../../../base/common/platform.js';
+import { VirtualWorkspaceContext, WorkspaceFolderCountContext } from '../../../common/contextkeys.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { equals } from '../../../../base/common/objects.js';
+import { EditSessionIdentityMatch, IEditSessionIdentityService } from '../../../../platform/workspace/common/editSessions.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { IOutputService } from '../../../services/output/common/output.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IActivityService, NumberBadge } from '../../../services/activity/common/activity.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { ILocalizedString } from '../../../../platform/action/common/action.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { CancellationError } from '../../../../base/common/errors.js';
+import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';
+import { IExtensionsWorkbenchService } from '../../extensions/common/extensions.js';
+import { WorkspaceStateSynchroniser } from '../common/workspaceStateSync.js';
+import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { IRequestService } from '../../../../platform/request/common/request.js';
+import { EditSessionsStoreClient } from '../common/editSessionsStorageClient.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IWorkspaceIdentityService } from '../../../services/workspaces/common/workspaceIdentityService.js';
+import { hashAsync } from '../../../../base/common/hash.js';
 
 registerSingleton(IEditSessionsLogService, EditSessionsLogService, InstantiationType.Delayed);
 registerSingleton(IEditSessionsStorageService, EditSessionsWorkbenchService, InstantiationType.Delayed);
@@ -101,10 +100,7 @@ registerAction2(class extends Action2 {
 	}
 
 	async run(accessor: ServicesAccessor): Promise<void> {
-		const paneCompositePartService = accessor.get(IPaneCompositePartService);
-		const viewlet = await paneCompositePartService.openPaneComposite(VIEWLET_ID, ViewContainerLocation.Sidebar, true);
-		const view = viewlet?.getViewPaneContainer() as IExtensionsViewPaneContainer | undefined;
-		view?.search('@tag:continueOn');
+		return accessor.get(IExtensionsWorkbenchService).openSearch('@tag:continueOn');
 	}
 });
 
@@ -667,7 +663,10 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 
 		switch (type) {
 			case (ChangeType.Addition): {
-				const [originalContents, incomingContents] = await Promise.all([sha1Hex(contents), sha1Hex(encodeBase64((await this.fileService.readFile(uriWithIncomingChanges)).value))]);
+				const [originalContents, incomingContents] = await Promise.all([
+					hashAsync(contents),
+					hashAsync(encodeBase64((await this.fileService.readFile(uriWithIncomingChanges)).value))
+				]);
 				return originalContents !== incomingContents;
 			}
 			case (ChangeType.Deletion): {
@@ -824,7 +823,8 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 
 		// Prompt the user to use edit sessions if they currently could benefit from using it
 		if (this.hasEditSession()) {
-			const quickpick = this.quickInputService.createQuickPick<IQuickPickItem>();
+			const disposables = new DisposableStore();
+			const quickpick = disposables.add(this.quickInputService.createQuickPick<IQuickPickItem>());
 			quickpick.placeholder = localize('continue with cloud changes', "Select whether to bring your working changes with you");
 			quickpick.ok = false;
 			quickpick.ignoreFocusOut = true;
@@ -833,14 +833,14 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 			quickpick.items = [withCloudChanges, withoutCloudChanges];
 
 			const continueWithCloudChanges = await new Promise<boolean>((resolve, reject) => {
-				quickpick.onDidAccept(() => {
+				disposables.add(quickpick.onDidAccept(() => {
 					resolve(quickpick.selectedItems[0] === withCloudChanges);
-					quickpick.hide();
-				});
-				quickpick.onDidHide(() => {
+					disposables.dispose();
+				}));
+				disposables.add(quickpick.onDidHide(() => {
 					reject(new CancellationError());
-					quickpick.hide();
-				});
+					disposables.dispose();
+				}));
 				quickpick.show();
 			});
 
@@ -960,7 +960,8 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 	}
 
 	private async pickContinueEditSessionDestination(): Promise<string | undefined> {
-		const quickPick = this.quickInputService.createQuickPick<ContinueEditSessionItem>();
+		const disposables = new DisposableStore();
+		const quickPick = disposables.add(this.quickInputService.createQuickPick<ContinueEditSessionItem>({ useSeparators: true }));
 
 		const workspaceContext = this.contextService.getWorkbenchState() === WorkbenchState.FOLDER
 			? this.contextService.getWorkspace().folders[0].name
@@ -972,9 +973,12 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 		});
 
 		const command = await new Promise<string | undefined>((resolve, reject) => {
-			quickPick.onDidHide(() => resolve(undefined));
+			disposables.add(quickPick.onDidHide(() => {
+				disposables.dispose();
+				resolve(undefined);
+			}));
 
-			quickPick.onDidAccept((e) => {
+			disposables.add(quickPick.onDidAccept((e) => {
 				const selection = quickPick.activeItems[0].command;
 
 				if (selection === installAdditionalContinueOnOptionsCommand.id) {
@@ -983,16 +987,16 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 					resolve(selection);
 					quickPick.hide();
 				}
-			});
+			}));
 
 			quickPick.show();
 
-			quickPick.onDidTriggerItemButton(async (e) => {
+			disposables.add(quickPick.onDidTriggerItemButton(async (e) => {
 				if (e.item.documentation !== undefined) {
 					const uri = URI.isUri(e.item.documentation) ? URI.parse(e.item.documentation) : await this.commandService.executeCommand(e.item.documentation);
 					void this.openerService.open(uri, { openExternal: true });
 				}
-			});
+			}));
 		});
 
 		quickPick.dispose();
diff --git a/src/vs/workbench/contrib/editSessions/browser/editSessionsFileSystemProvider.ts b/src/vs/workbench/contrib/editSessions/browser/editSessionsFileSystemProvider.ts
index 2410ed55016..ef40a27b376 100644
--- a/src/vs/workbench/contrib/editSessions/browser/editSessionsFileSystemProvider.ts
+++ b/src/vs/workbench/contrib/editSessions/browser/editSessionsFileSystemProvider.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { Event } from 'vs/base/common/event';
-import { URI } from 'vs/base/common/uri';
-import { FilePermission, FileSystemProviderCapabilities, FileSystemProviderErrorCode, FileType, IFileDeleteOptions, IFileOverwriteOptions, IFileSystemProviderWithFileReadWriteCapability, IStat, IWatchOptions } from 'vs/platform/files/common/files';
-import { ChangeType, decodeEditSessionFileContent, EDIT_SESSIONS_SCHEME, EditSession, IEditSessionsStorageService } from 'vs/workbench/contrib/editSessions/common/editSessions';
-import { NotSupportedError } from 'vs/base/common/errors';
+import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
+import { Event } from '../../../../base/common/event.js';
+import { URI } from '../../../../base/common/uri.js';
+import { FilePermission, FileSystemProviderCapabilities, FileSystemProviderErrorCode, FileType, IFileDeleteOptions, IFileOverwriteOptions, IFileSystemProviderWithFileReadWriteCapability, IStat, IWatchOptions } from '../../../../platform/files/common/files.js';
+import { ChangeType, decodeEditSessionFileContent, EDIT_SESSIONS_SCHEME, EditSession, IEditSessionsStorageService } from '../common/editSessions.js';
+import { NotSupportedError } from '../../../../base/common/errors.js';
 
 export class EditSessionsFileSystemProvider implements IFileSystemProviderWithFileReadWriteCapability {
 
diff --git a/src/vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts b/src/vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts
index f612c22c3e3..18b5815c9c2 100644
--- a/src/vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts
+++ b/src/vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts
@@ -3,28 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { localize } from 'vs/nls';
-import { Action2, MenuId, MenuRegistry, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ContextKeyExpr, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { createSyncHeaders, IAuthenticationProvider, IResourceRefHandle } from 'vs/platform/userDataSync/common/userDataSync';
-import { AuthenticationSession, AuthenticationSessionsChangeEvent, IAuthenticationService } from 'vs/workbench/services/authentication/common/authentication';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { EDIT_SESSIONS_SIGNED_IN, EditSession, EDIT_SESSION_SYNC_CATEGORY, IEditSessionsStorageService, EDIT_SESSIONS_SIGNED_IN_KEY, IEditSessionsLogService, SyncResource, EDIT_SESSIONS_PENDING_KEY } from 'vs/workbench/contrib/editSessions/common/editSessions';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { generateUuid } from 'vs/base/common/uuid';
-import { getCurrentAuthenticationSessionInfo } from 'vs/workbench/services/authentication/browser/authenticationService';
-import { isWeb } from 'vs/base/common/platform';
-import { IUserDataSyncMachinesService, UserDataSyncMachinesService } from 'vs/platform/userDataSync/common/userDataSyncMachines';
-import { Emitter } from 'vs/base/common/event';
-import { CancellationError } from 'vs/base/common/errors';
-import { EditSessionsStoreClient } from 'vs/workbench/contrib/editSessions/common/editSessionsStorageClient';
-import { ISecretStorageService } from 'vs/platform/secrets/common/secrets';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { localize } from '../../../../nls.js';
+import { Action2, MenuId, MenuRegistry, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from '../../../../platform/quickinput/common/quickInput.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { createSyncHeaders, IAuthenticationProvider, IResourceRefHandle } from '../../../../platform/userDataSync/common/userDataSync.js';
+import { AuthenticationSession, AuthenticationSessionsChangeEvent, IAuthenticationService } from '../../../services/authentication/common/authentication.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { EDIT_SESSIONS_SIGNED_IN, EditSession, EDIT_SESSION_SYNC_CATEGORY, IEditSessionsStorageService, EDIT_SESSIONS_SIGNED_IN_KEY, IEditSessionsLogService, SyncResource, EDIT_SESSIONS_PENDING_KEY } from '../common/editSessions.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { getCurrentAuthenticationSessionInfo } from '../../../services/authentication/browser/authenticationService.js';
+import { isWeb } from '../../../../base/common/platform.js';
+import { IUserDataSyncMachinesService, UserDataSyncMachinesService } from '../../../../platform/userDataSync/common/userDataSyncMachines.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { CancellationError } from '../../../../base/common/errors.js';
+import { EditSessionsStoreClient } from '../common/editSessionsStorageClient.js';
+import { ISecretStorageService } from '../../../../platform/secrets/common/secrets.js';
 
 type ExistingSession = IQuickPickItem & { session: AuthenticationSession & { providerId: string } };
 type AuthenticationProviderOption = IQuickPickItem & { provider: IAuthenticationProvider };
@@ -311,24 +311,25 @@ export class EditSessionsWorkbenchService extends Disposable implements IEditSes
 	 * Prompts the user to pick an authentication option for storing and getting edit sessions.
 	 */
 	private async getAccountPreference(reason: 'read' | 'write'): Promise<AuthenticationSession & { providerId: string } | undefined> {
-		const quickpick = this.quickInputService.createQuickPick<ExistingSession | AuthenticationProviderOption | IQuickPickItem>();
+		const disposables = new DisposableStore();
+		const quickpick = disposables.add(this.quickInputService.createQuickPick<ExistingSession | AuthenticationProviderOption | IQuickPickItem>({ useSeparators: true }));
 		quickpick.ok = false;
 		quickpick.placeholder = reason === 'read' ? localize('choose account read placeholder', "Select an account to restore your working changes from the cloud") : localize('choose account placeholder', "Select an account to store your working changes in the cloud");
 		quickpick.ignoreFocusOut = true;
 		quickpick.items = await this.createQuickpickItems();
 
 		return new Promise((resolve, reject) => {
-			quickpick.onDidHide((e) => {
+			disposables.add(quickpick.onDidHide((e) => {
 				reject(new CancellationError());
-				quickpick.dispose();
-			});
+				disposables.dispose();
+			}));
 
-			quickpick.onDidAccept(async (e) => {
+			disposables.add(quickpick.onDidAccept(async (e) => {
 				const selection = quickpick.selectedItems[0];
 				const session = 'provider' in selection ? { ...await this.authenticationService.createSession(selection.provider.id, selection.provider.scopes), providerId: selection.provider.id } : ('session' in selection ? selection.session : undefined);
 				resolve(session);
 				quickpick.hide();
-			});
+			}));
 
 			quickpick.show();
 		});
diff --git a/src/vs/workbench/contrib/editSessions/browser/editSessionsViews.ts b/src/vs/workbench/contrib/editSessions/browser/editSessionsViews.ts
index ce4af2c979b..9f436178a25 100644
--- a/src/vs/workbench/contrib/editSessions/browser/editSessionsViews.ts
+++ b/src/vs/workbench/contrib/editSessions/browser/editSessionsViews.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { localize } from 'vs/nls';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { TreeView, TreeViewPane } from 'vs/workbench/browser/parts/views/treeView';
-import { Extensions, ITreeItem, ITreeViewDataProvider, ITreeViewDescriptor, IViewsRegistry, TreeItemCollapsibleState, TreeViewItemHandleArg, ViewContainer } from 'vs/workbench/common/views';
-import { ChangeType, EDIT_SESSIONS_DATA_VIEW_ID, EDIT_SESSIONS_SCHEME, EDIT_SESSIONS_SHOW_VIEW, EDIT_SESSIONS_TITLE, EditSession, IEditSessionsStorageService } from 'vs/workbench/contrib/editSessions/common/editSessions';
-import { URI } from 'vs/base/common/uri';
-import { fromNow } from 'vs/base/common/date';
-import { Codicon } from 'vs/base/common/codicons';
-import { API_OPEN_EDITOR_COMMAND_ID } from 'vs/workbench/browser/parts/editor/editorCommands';
-import { registerAction2, Action2, MenuId } from 'vs/platform/actions/common/actions';
-import { ContextKeyExpr, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { joinPath } from 'vs/base/common/resources';
-import { IFileService } from 'vs/platform/files/common/files';
-import { basename } from 'vs/base/common/path';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { localize } from '../../../../nls.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { TreeView, TreeViewPane } from '../../../browser/parts/views/treeView.js';
+import { Extensions, ITreeItem, ITreeViewDataProvider, ITreeViewDescriptor, IViewsRegistry, TreeItemCollapsibleState, TreeViewItemHandleArg, ViewContainer } from '../../../common/views.js';
+import { ChangeType, EDIT_SESSIONS_DATA_VIEW_ID, EDIT_SESSIONS_SCHEME, EDIT_SESSIONS_SHOW_VIEW, EDIT_SESSIONS_TITLE, EditSession, IEditSessionsStorageService } from '../common/editSessions.js';
+import { URI } from '../../../../base/common/uri.js';
+import { fromNow } from '../../../../base/common/date.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { API_OPEN_EDITOR_COMMAND_ID } from '../../../browser/parts/editor/editorCommands.js';
+import { registerAction2, Action2, MenuId } from '../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { joinPath } from '../../../../base/common/resources.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { basename } from '../../../../base/common/path.js';
 
 const EDIT_SESSIONS_COUNT_KEY = 'editSessionsCount';
 const EDIT_SESSIONS_COUNT_CONTEXT_KEY = new RawContextKey<number>(EDIT_SESSIONS_COUNT_KEY, 0);
diff --git a/src/vs/workbench/contrib/editSessions/common/editSessions.ts b/src/vs/workbench/contrib/editSessions/common/editSessions.ts
index 950973a04d1..24b969fe1c8 100644
--- a/src/vs/workbench/contrib/editSessions/common/editSessions.ts
+++ b/src/vs/workbench/contrib/editSessions/common/editSessions.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { decodeBase64, VSBuffer } from 'vs/base/common/buffer';
-import { Codicon } from 'vs/base/common/codicons';
-import { localize, localize2 } from 'vs/nls';
-import { ILocalizedString } from 'vs/platform/action/common/action';
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { IResourceRefHandle } from 'vs/platform/userDataSync/common/userDataSync';
-import { Event } from 'vs/base/common/event';
-import { StringSHA1 } from 'vs/base/common/hash';
-import { EditSessionsStoreClient } from 'vs/workbench/contrib/editSessions/common/editSessionsStorageClient';
+import { decodeBase64, VSBuffer } from '../../../../base/common/buffer.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { ILocalizedString } from '../../../../platform/action/common/action.js';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { IResourceRefHandle } from '../../../../platform/userDataSync/common/userDataSync.js';
+import { Event } from '../../../../base/common/event.js';
+import { StringSHA1 } from '../../../../base/common/hash.js';
+import { EditSessionsStoreClient } from './editSessionsStorageClient.js';
 
 export const EDIT_SESSION_SYNC_CATEGORY = localize2('cloud changes', 'Cloud Changes');
 
diff --git a/src/vs/workbench/contrib/editSessions/common/editSessionsLogService.ts b/src/vs/workbench/contrib/editSessions/common/editSessionsLogService.ts
index 7c0e75f1e06..4bdae2d1cf4 100644
--- a/src/vs/workbench/contrib/editSessions/common/editSessionsLogService.ts
+++ b/src/vs/workbench/contrib/editSessions/common/editSessionsLogService.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { joinPath } from 'vs/base/common/resources';
-import { localize } from 'vs/nls';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { AbstractLogger, ILogger, ILoggerService } from 'vs/platform/log/common/log';
-import { IEditSessionsLogService, editSessionsLogId } from 'vs/workbench/contrib/editSessions/common/editSessions';
+import { joinPath } from '../../../../base/common/resources.js';
+import { localize } from '../../../../nls.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { AbstractLogger, ILogger, ILoggerService } from '../../../../platform/log/common/log.js';
+import { IEditSessionsLogService, editSessionsLogId } from './editSessions.js';
 
 export class EditSessionsLogService extends AbstractLogger implements IEditSessionsLogService {
 
diff --git a/src/vs/workbench/contrib/editSessions/common/editSessionsStorageClient.ts b/src/vs/workbench/contrib/editSessions/common/editSessionsStorageClient.ts
index d573fe7897f..35c1b74c29d 100644
--- a/src/vs/workbench/contrib/editSessions/common/editSessionsStorageClient.ts
+++ b/src/vs/workbench/contrib/editSessions/common/editSessionsStorageClient.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { UserDataSyncStoreClient } from 'vs/platform/userDataSync/common/userDataSyncStoreService';
+import { UserDataSyncStoreClient } from '../../../../platform/userDataSync/common/userDataSyncStoreService.js';
 
 export class EditSessionsStoreClient extends UserDataSyncStoreClient {
 	_serviceBrand: any;
diff --git a/src/vs/workbench/contrib/editSessions/common/workspaceStateSync.ts b/src/vs/workbench/contrib/editSessions/common/workspaceStateSync.ts
index 83372f3c0c7..dd6f6145901 100644
--- a/src/vs/workbench/contrib/editSessions/common/workspaceStateSync.ts
+++ b/src/vs/workbench/contrib/editSessions/common/workspaceStateSync.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { Emitter, Event } from 'vs/base/common/event';
-import { parse, stringify } from 'vs/base/common/marshalling';
-import { URI } from 'vs/base/common/uri';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IStorageEntry, IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { AbstractSynchroniser, IAcceptResult, IMergeResult, IResourcePreview, ISyncResourcePreview } from 'vs/platform/userDataSync/common/abstractSynchronizer';
-import { IRemoteUserData, IResourceRefHandle, IUserDataSyncLocalStoreService, IUserDataSyncConfiguration, IUserDataSyncEnablementService, IUserDataSyncLogService, IUserDataSyncStoreService, IUserDataSynchroniser, IWorkspaceState, SyncResource } from 'vs/platform/userDataSync/common/userDataSync';
-import { EditSession, IEditSessionsStorageService } from 'vs/workbench/contrib/editSessions/common/editSessions';
-import { IWorkspaceIdentityService } from 'vs/workbench/services/workspaces/common/workspaceIdentityService';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { IStringDictionary } from '../../../../base/common/collections.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { parse, stringify } from '../../../../base/common/marshalling.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IStorageEntry, IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IUserDataProfile } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { AbstractSynchroniser, IAcceptResult, IMergeResult, IResourcePreview, ISyncResourcePreview } from '../../../../platform/userDataSync/common/abstractSynchronizer.js';
+import { IRemoteUserData, IResourceRefHandle, IUserDataSyncLocalStoreService, IUserDataSyncConfiguration, IUserDataSyncEnablementService, IUserDataSyncLogService, IUserDataSyncStoreService, IUserDataSynchroniser, IWorkspaceState, SyncResource } from '../../../../platform/userDataSync/common/userDataSync.js';
+import { EditSession, IEditSessionsStorageService } from './editSessions.js';
+import { IWorkspaceIdentityService } from '../../../services/workspaces/common/workspaceIdentityService.js';
 
 
 class NullBackupStoreService implements IUserDataSyncLocalStoreService {
diff --git a/src/vs/workbench/contrib/editSessions/test/browser/editSessions.test.ts b/src/vs/workbench/contrib/editSessions/test/browser/editSessions.test.ts
index 244f3dfe5bc..38aeb6c161b 100644
--- a/src/vs/workbench/contrib/editSessions/test/browser/editSessions.test.ts
+++ b/src/vs/workbench/contrib/editSessions/test/browser/editSessions.test.ts
@@ -3,53 +3,53 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { IFileService } from 'vs/platform/files/common/files';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { Schemas } from 'vs/base/common/network';
-import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { EditSessionsContribution } from 'vs/workbench/contrib/editSessions/browser/editSessions.contribution';
-import { ProgressService } from 'vs/workbench/services/progress/browser/progressService';
-import { IProgressService } from 'vs/platform/progress/common/progress';
-import { ISCMService } from 'vs/workbench/contrib/scm/common/scm';
-import { SCMService } from 'vs/workbench/contrib/scm/common/scmService';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { mock } from 'vs/base/test/common/mock';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { FileService } from '../../../../../platform/files/common/fileService.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { InMemoryFileSystemProvider } from '../../../../../platform/files/common/inMemoryFilesystemProvider.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { NullLogService } from '../../../../../platform/log/common/log.js';
+import { EditSessionsContribution } from '../../browser/editSessions.contribution.js';
+import { ProgressService } from '../../../../services/progress/browser/progressService.js';
+import { IProgressService } from '../../../../../platform/progress/common/progress.js';
+import { ISCMService } from '../../../scm/common/scm.js';
+import { SCMService } from '../../../scm/common/scmService.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IWorkspaceContextService, WorkbenchState } from '../../../../../platform/workspace/common/workspace.js';
+import { mock } from '../../../../../base/test/common/mock.js';
 import * as sinon from 'sinon';
 import assert from 'assert';
-import { ChangeType, FileType, IEditSessionsLogService, IEditSessionsStorageService } from 'vs/workbench/contrib/editSessions/common/editSessions';
-import { URI } from 'vs/base/common/uri';
-import { joinPath } from 'vs/base/common/resources';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
-import { TestEnvironmentService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { Event } from 'vs/base/common/event';
-import { IViewDescriptorService } from 'vs/workbench/common/views';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IDialogService, IPrompt } from 'vs/platform/dialogs/common/dialogs';
-import { IEditorService, ISaveAllEditorsOptions } from 'vs/workbench/services/editor/common/editorService';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IEditSessionIdentityService } from 'vs/platform/workspace/common/editSessions';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { IWorkspaceIdentityService, WorkspaceIdentityService } from 'vs/workbench/services/workspaces/common/workspaceIdentityService';
+import { ChangeType, FileType, IEditSessionsLogService, IEditSessionsStorageService } from '../../common/editSessions.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { joinPath } from '../../../../../base/common/resources.js';
+import { INotificationService } from '../../../../../platform/notification/common/notification.js';
+import { TestNotificationService } from '../../../../../platform/notification/test/common/testNotificationService.js';
+import { TestEnvironmentService } from '../../../../test/browser/workbenchTestServices.js';
+import { IEnvironmentService } from '../../../../../platform/environment/common/environment.js';
+import { MockContextKeyService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { Event } from '../../../../../base/common/event.js';
+import { IViewDescriptorService } from '../../../../common/views.js';
+import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
+import { ILifecycleService } from '../../../../services/lifecycle/common/lifecycle.js';
+import { IDialogService, IPrompt } from '../../../../../platform/dialogs/common/dialogs.js';
+import { IEditorService, ISaveAllEditorsOptions } from '../../../../services/editor/common/editorService.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { NullTelemetryService } from '../../../../../platform/telemetry/common/telemetryUtils.js';
+import { IRemoteAgentService } from '../../../../services/remote/common/remoteAgentService.js';
+import { IExtensionService } from '../../../../services/extensions/common/extensions.js';
+import { IEditSessionIdentityService } from '../../../../../platform/workspace/common/editSessions.js';
+import { IUserDataProfilesService } from '../../../../../platform/userDataProfile/common/userDataProfile.js';
+import { IProductService } from '../../../../../platform/product/common/productService.js';
+import { IStorageService } from '../../../../../platform/storage/common/storage.js';
+import { TestStorageService } from '../../../../test/common/workbenchTestServices.js';
+import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.js';
+import { UriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentityService.js';
+import { IWorkspaceIdentityService, WorkspaceIdentityService } from '../../../../services/workspaces/common/workspaceIdentityService.js';
 
 const folderName = 'test-folder';
 const folderUri = URI.file(`/${folderName}`);
diff --git a/src/vs/workbench/contrib/emergencyAlert/electron-sandbox/emergencyAlert.contribution.ts b/src/vs/workbench/contrib/emergencyAlert/electron-sandbox/emergencyAlert.contribution.ts
new file mode 100644
index 00000000000..6a9851fa5b9
--- /dev/null
+++ b/src/vs/workbench/contrib/emergencyAlert/electron-sandbox/emergencyAlert.contribution.ts
@@ -0,0 +1,93 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
+import { IBannerService } from '../../../services/banner/browser/bannerService.js';
+import { asJson, IRequestService } from '../../../../platform/request/common/request.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { arch, platform } from '../../../../base/common/process.js';
+
+interface IEmergencyAlert {
+	readonly commit: string;
+	readonly platform?: string;
+	readonly arch?: string;
+	readonly message: string;
+	readonly actions?: [{
+		readonly label: string;
+		readonly href: string;
+	}];
+}
+
+interface IEmergencyAlerts {
+	readonly alerts: IEmergencyAlert[];
+}
+
+export class EmergencyAlert implements IWorkbenchContribution {
+
+	static readonly ID = 'workbench.contrib.emergencyAlert';
+
+	constructor(
+		@IBannerService private readonly bannerService: IBannerService,
+		@IRequestService private readonly requestService: IRequestService,
+		@IProductService private readonly productService: IProductService,
+		@ILogService private readonly logService: ILogService
+	) {
+		if (productService.quality !== 'insider') {
+			return; // only enabled in insiders for now
+		}
+
+		const emergencyAlertUrl = productService.emergencyAlertUrl;
+		if (!emergencyAlertUrl) {
+			return; // no emergency alert configured
+		}
+
+		this.fetchAlerts(emergencyAlertUrl);
+	}
+
+	private async fetchAlerts(url: string): Promise<void> {
+		try {
+			await this.doFetchAlerts(url);
+		} catch (e) {
+			this.logService.error(e);
+		}
+	}
+
+	private async doFetchAlerts(url: string): Promise<void> {
+		const requestResult = await this.requestService.request({ type: 'GET', url }, CancellationToken.None);
+
+		if (requestResult.res.statusCode !== 200) {
+			throw new Error(`Failed to fetch emergency alerts: HTTP ${requestResult.res.statusCode}`);
+		}
+
+		const emergencyAlerts = await asJson<IEmergencyAlerts>(requestResult);
+		if (!emergencyAlerts) {
+			return;
+		}
+
+		for (const emergencyAlert of emergencyAlerts.alerts) {
+			if (
+				(emergencyAlert.commit !== this.productService.commit) ||				// version mismatch
+				(emergencyAlert.platform && emergencyAlert.platform !== platform) ||	// platform mismatch
+				(emergencyAlert.arch && emergencyAlert.arch !== arch)					// arch mismatch
+			) {
+				return;
+			}
+
+			this.bannerService.show({
+				id: 'emergencyAlert.banner',
+				icon: Codicon.warning,
+				message: emergencyAlert.message,
+				actions: emergencyAlert.actions
+			});
+
+			break;
+		}
+	}
+}
+
+registerWorkbenchContribution2('workbench.emergencyAlert', EmergencyAlert, WorkbenchPhase.Eventually);
diff --git a/src/vs/workbench/contrib/emmet/browser/actions/expandAbbreviation.ts b/src/vs/workbench/contrib/emmet/browser/actions/expandAbbreviation.ts
index b6129b8a6ae..afd2c722adf 100644
--- a/src/vs/workbench/contrib/emmet/browser/actions/expandAbbreviation.ts
+++ b/src/vs/workbench/contrib/emmet/browser/actions/expandAbbreviation.ts
@@ -2,14 +2,14 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import * as nls from 'vs/nls';
-import { EmmetEditorAction } from 'vs/workbench/contrib/emmet/browser/emmetActions';
-import { registerEditorAction } from 'vs/editor/browser/editorExtensions';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { MenuId } from 'vs/platform/actions/common/actions';
+import * as nls from '../../../../../nls.js';
+import { EmmetEditorAction } from '../emmetActions.js';
+import { registerEditorAction } from '../../../../../editor/browser/editorExtensions.js';
+import { EditorContextKeys } from '../../../../../editor/common/editorContextKeys.js';
+import { KeyCode } from '../../../../../base/common/keyCodes.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { MenuId } from '../../../../../platform/actions/common/actions.js';
 
 class ExpandAbbreviationAction extends EmmetEditorAction {
 
diff --git a/src/vs/workbench/contrib/emmet/browser/emmet.contribution.ts b/src/vs/workbench/contrib/emmet/browser/emmet.contribution.ts
index f29d6b2c022..3b03f77ae53 100644
--- a/src/vs/workbench/contrib/emmet/browser/emmet.contribution.ts
+++ b/src/vs/workbench/contrib/emmet/browser/emmet.contribution.ts
@@ -3,5 +3,5 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import './actions/expandAbbreviation';
+import './actions/expandAbbreviation.js';
 
diff --git a/src/vs/workbench/contrib/emmet/browser/emmetActions.ts b/src/vs/workbench/contrib/emmet/browser/emmetActions.ts
index 2ac7efadc90..dc3b0655872 100644
--- a/src/vs/workbench/contrib/emmet/browser/emmetActions.ts
+++ b/src/vs/workbench/contrib/emmet/browser/emmetActions.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { EditorAction, ServicesAccessor, IActionOptions } from 'vs/editor/browser/editorExtensions';
-import { grammarsExtPoint, ITMSyntaxExtensionPoint } from 'vs/workbench/services/textMate/common/TMGrammars';
-import { IExtensionService, ExtensionPointContribution } from 'vs/workbench/services/extensions/common/extensions';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { EditorAction, ServicesAccessor, IActionOptions } from '../../../../editor/browser/editorExtensions.js';
+import { grammarsExtPoint, ITMSyntaxExtensionPoint } from '../../../services/textMate/common/TMGrammars.js';
+import { IExtensionService, ExtensionPointContribution } from '../../../services/extensions/common/extensions.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
 
 interface ModeScopeMap {
 	[key: string]: string;
diff --git a/src/vs/workbench/contrib/emmet/test/browser/emmetAction.test.ts b/src/vs/workbench/contrib/emmet/test/browser/emmetAction.test.ts
index 76d14f29f54..356cacea1b9 100644
--- a/src/vs/workbench/contrib/emmet/test/browser/emmetAction.test.ts
+++ b/src/vs/workbench/contrib/emmet/test/browser/emmetAction.test.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IGrammarContributions, EmmetEditorAction } from 'vs/workbench/contrib/emmet/browser/emmetActions';
-import { withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
+import { IGrammarContributions, EmmetEditorAction } from '../../browser/emmetActions.js';
+import { withTestCodeEditor } from '../../../../../editor/test/browser/testCodeEditor.js';
 import assert from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 class MockGrammarContributions implements IGrammarContributions {
 	private scopeName: string;
diff --git a/src/vs/workbench/contrib/encryption/electron-sandbox/encryption.contribution.ts b/src/vs/workbench/contrib/encryption/electron-sandbox/encryption.contribution.ts
index 9969928a2b5..a530edf2bbf 100644
--- a/src/vs/workbench/contrib/encryption/electron-sandbox/encryption.contribution.ts
+++ b/src/vs/workbench/contrib/encryption/electron-sandbox/encryption.contribution.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isLinux } from 'vs/base/common/platform';
-import { stripComments } from 'vs/base/common/stripComments';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IFileService } from 'vs/platform/files/common/files';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
-import { IJSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditing';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { isLinux } from '../../../../base/common/platform.js';
+import { parse } from '../../../../base/common/jsonc.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from '../../../common/contributions.js';
+import { IJSONEditingService } from '../../../services/configuration/common/jsonEditing.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
 
 class EncryptionContribution implements IWorkbenchContribution {
 	constructor(
@@ -34,7 +34,7 @@ class EncryptionContribution implements IWorkbenchContribution {
 		}
 		try {
 			const content = await this.fileService.readFile(this.environmentService.argvResource);
-			const argv = JSON.parse(stripComments(content.value.toString()));
+			const argv = parse<{ 'password-store'?: string }>(content.value.toString());
 			if (argv['password-store'] === 'gnome' || argv['password-store'] === 'gnome-keyring') {
 				this.jsonEditingService.write(this.environmentService.argvResource, [{ path: ['password-store'], value: 'gnome-libsecret' }], true);
 			}
diff --git a/src/vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor.ts b/src/vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor.ts
index a298cf3c232..f6873bf5524 100644
--- a/src/vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor.ts
+++ b/src/vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor.ts
@@ -3,48 +3,48 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { $, Dimension, addDisposableListener, append, clearNode } from 'vs/base/browser/dom';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
-import { IListRenderer, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
-import { Action, IAction, Separator } from 'vs/base/common/actions';
-import { isNonEmptyArray } from 'vs/base/common/arrays';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { fromNow } from 'vs/base/common/date';
-import { memoize } from 'vs/base/common/decorators';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import 'vs/css!./media/runtimeExtensionsEditor';
-import * as nls from 'vs/nls';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { Action2, MenuId } from 'vs/platform/actions/common/actions';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { ExtensionIdentifier, ExtensionIdentifierMap, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { WorkbenchList } from 'vs/platform/list/browser/listService';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { editorBackground } from 'vs/platform/theme/common/colorRegistry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
-import { errorIcon, warningIcon } from 'vs/workbench/contrib/extensions/browser/extensionsIcons';
-import { IExtension, IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions';
-import { RuntimeExtensionsInput } from 'vs/workbench/contrib/extensions/common/runtimeExtensionsInput';
-import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { Extensions, IExtensionFeaturesManagementService, IExtensionFeaturesRegistry } from 'vs/workbench/services/extensionManagement/common/extensionFeatures';
-import { DefaultIconPath, EnablementState } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { LocalWebWorkerRunningLocation } from 'vs/workbench/services/extensions/common/extensionRunningLocation';
-import { IExtensionHostProfile, IExtensionService, IExtensionsStatus } from 'vs/workbench/services/extensions/common/extensions';
+import { $, Dimension, addDisposableListener, append, clearNode } from '../../../../base/browser/dom.js';
+import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { IListRenderer, IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
+import { IListAccessibilityProvider } from '../../../../base/browser/ui/list/listWidget.js';
+import { Action, IAction, Separator } from '../../../../base/common/actions.js';
+import { isNonEmptyArray } from '../../../../base/common/arrays.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { fromNow } from '../../../../base/common/date.js';
+import { IDisposable, dispose } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import * as nls from '../../../../nls.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { createAndFillInContextMenuActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { Action2, IMenuService, MenuId } from '../../../../platform/actions/common/actions.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { ExtensionIdentifier, ExtensionIdentifierMap, IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { WorkbenchList } from '../../../../platform/list/browser/listService.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { editorBackground } from '../../../../platform/theme/common/colorRegistry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { EditorPane } from '../../../browser/parts/editor/editorPane.js';
+import { IEditorGroup } from '../../../services/editor/common/editorGroupsService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { Extensions, IExtensionFeaturesManagementService, IExtensionFeaturesRegistry } from '../../../services/extensionManagement/common/extensionFeatures.js';
+import { DefaultIconPath, EnablementState } from '../../../services/extensionManagement/common/extensionManagement.js';
+import { LocalWebWorkerRunningLocation } from '../../../services/extensions/common/extensionRunningLocation.js';
+import { IExtensionHostProfile, IExtensionService, IExtensionsStatus } from '../../../services/extensions/common/extensions.js';
+import { IExtension, IExtensionsWorkbenchService } from '../common/extensions.js';
+import { RuntimeExtensionsInput } from '../common/runtimeExtensionsInput.js';
+import { errorIcon, warningIcon } from './extensionsIcons.js';
+import './media/runtimeExtensionsEditor.css';
 
 interface IExtensionProfileInformation {
 	/**
@@ -81,7 +81,7 @@ export abstract class AbstractRuntimeExtensionsEditor extends EditorPane {
 		group: IEditorGroup,
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IThemeService themeService: IThemeService,
-		@IContextKeyService contextKeyService: IContextKeyService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IExtensionsWorkbenchService private readonly _extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@IExtensionService private readonly _extensionService: IExtensionService,
 		@INotificationService private readonly _notificationService: INotificationService,
@@ -93,6 +93,7 @@ export abstract class AbstractRuntimeExtensionsEditor extends EditorPane {
 		@IClipboardService private readonly _clipboardService: IClipboardService,
 		@IExtensionFeaturesManagementService private readonly _extensionFeaturesManagementService: IExtensionFeaturesManagementService,
 		@IHoverService private readonly _hoverService: IHoverService,
+		@IMenuService private readonly _menuService: IMenuService,
 	) {
 		super(AbstractRuntimeExtensionsEditor.ID, group, telemetryService, themeService, storageService);
 
@@ -496,14 +497,9 @@ export abstract class AbstractRuntimeExtensionsEditor extends EditorPane {
 			}
 			actions.push(new Separator());
 
-			const profileAction = this._createProfileAction();
-			if (profileAction) {
-				actions.push(profileAction);
-			}
-			const saveExtensionHostProfileAction = this.saveExtensionHostProfileAction;
-			if (saveExtensionHostProfileAction) {
-				actions.push(saveExtensionHostProfileAction);
-			}
+
+			const menuActions = this._menuService.getMenuActions(MenuId.ExtensionEditorContextMenu, this.contextKeyService);
+			createAndFillInContextMenuActions(menuActions, { primary: [], secondary: actions });
 
 			this._contextMenuService.showContextMenu({
 				getAnchor: () => e.anchor,
@@ -512,11 +508,6 @@ export abstract class AbstractRuntimeExtensionsEditor extends EditorPane {
 		});
 	}
 
-	@memoize
-	private get saveExtensionHostProfileAction(): IAction | null {
-		return this._createSaveExtensionHostProfileAction();
-	}
-
 	public layout(dimension: Dimension): void {
 		this._list?.layout(dimension.height);
 	}
@@ -525,8 +516,6 @@ export abstract class AbstractRuntimeExtensionsEditor extends EditorPane {
 	protected abstract _getUnresponsiveProfile(extensionId: ExtensionIdentifier): IExtensionHostProfile | undefined;
 	protected abstract _createSlowExtensionAction(element: IRuntimeExtension): Action | null;
 	protected abstract _createReportExtensionIssueAction(element: IRuntimeExtension): Action | null;
-	protected abstract _createSaveExtensionHostProfileAction(): Action | null;
-	protected abstract _createProfileAction(): Action | null;
 }
 
 export class ShowRuntimeExtensionsAction extends Action2 {
diff --git a/src/vs/workbench/contrib/extensions/browser/browserRuntimeExtensionsEditor.ts b/src/vs/workbench/contrib/extensions/browser/browserRuntimeExtensionsEditor.ts
index d2da8691027..e7fd431b5a7 100644
--- a/src/vs/workbench/contrib/extensions/browser/browserRuntimeExtensionsEditor.ts
+++ b/src/vs/workbench/contrib/extensions/browser/browserRuntimeExtensionsEditor.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Action } from 'vs/base/common/actions';
-import { IExtensionHostProfile } from 'vs/workbench/services/extensions/common/extensions';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { AbstractRuntimeExtensionsEditor, IRuntimeExtension } from 'vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor';
-import { ReportExtensionIssueAction } from 'vs/workbench/contrib/extensions/common/reportExtensionIssueAction';
+import { Action } from '../../../../base/common/actions.js';
+import { IExtensionHostProfile } from '../../../services/extensions/common/extensions.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { AbstractRuntimeExtensionsEditor, IRuntimeExtension } from './abstractRuntimeExtensionsEditor.js';
+import { ReportExtensionIssueAction } from '../common/reportExtensionIssueAction.js';
 
 export class RuntimeExtensionsEditor extends AbstractRuntimeExtensionsEditor {
 
@@ -29,12 +29,4 @@ export class RuntimeExtensionsEditor extends AbstractRuntimeExtensionsEditor {
 		}
 		return null;
 	}
-
-	protected _createSaveExtensionHostProfileAction(): Action | null {
-		return null;
-	}
-
-	protected _createProfileAction(): Action | null {
-		return null;
-	}
 }
diff --git a/src/vs/workbench/contrib/extensions/browser/configBasedRecommendations.ts b/src/vs/workbench/contrib/extensions/browser/configBasedRecommendations.ts
index 28ae3c3e3ed..3465e63af68 100644
--- a/src/vs/workbench/contrib/extensions/browser/configBasedRecommendations.ts
+++ b/src/vs/workbench/contrib/extensions/browser/configBasedRecommendations.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IExtensionTipsService, IConfigBasedExtensionTip } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { ExtensionRecommendations, ExtensionRecommendation } from 'vs/workbench/contrib/extensions/browser/extensionRecommendations';
-import { localize } from 'vs/nls';
-import { ExtensionRecommendationReason } from 'vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
-import { IWorkspaceContextService, IWorkspaceFoldersChangeEvent } from 'vs/platform/workspace/common/workspace';
-import { Emitter } from 'vs/base/common/event';
+import { IExtensionTipsService, IConfigBasedExtensionTip } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { ExtensionRecommendations, ExtensionRecommendation } from './extensionRecommendations.js';
+import { localize } from '../../../../nls.js';
+import { ExtensionRecommendationReason } from '../../../services/extensionRecommendations/common/extensionRecommendations.js';
+import { IWorkspaceContextService, IWorkspaceFoldersChangeEvent } from '../../../../platform/workspace/common/workspace.js';
+import { Emitter } from '../../../../base/common/event.js';
 
 type ConfigBasedExtensionRecommendation = ExtensionRecommendation & { whenNotInstalled: string[] | undefined };
 
diff --git a/src/vs/workbench/contrib/extensions/browser/deprecatedExtensionsChecker.ts b/src/vs/workbench/contrib/extensions/browser/deprecatedExtensionsChecker.ts
deleted file mode 100644
index 6b85011360d..00000000000
--- a/src/vs/workbench/contrib/extensions/browser/deprecatedExtensionsChecker.ts
+++ /dev/null
@@ -1,82 +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 { IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { localize } from 'vs/nls';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { SearchExtensionsAction } from 'vs/workbench/contrib/extensions/browser/extensionsActions';
-import { distinct } from 'vs/base/common/arrays';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { IWorkbenchExtensionEnablementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-
-export class DeprecatedExtensionsChecker extends Disposable implements IWorkbenchContribution {
-
-	constructor(
-		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
-		@IExtensionManagementService extensionManagementService: IExtensionManagementService,
-		@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService,
-		@IStorageService private readonly storageService: IStorageService,
-		@INotificationService private readonly notificationService: INotificationService,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-	) {
-		super();
-		this.checkForDeprecatedExtensions();
-		this._register(extensionManagementService.onDidInstallExtensions(e => {
-			const ids: string[] = [];
-			for (const { local } of e) {
-				if (local && extensionsWorkbenchService.local.find(extension => areSameExtensions(extension.identifier, local.identifier))?.deprecationInfo) {
-					ids.push(local.identifier.id.toLowerCase());
-				}
-			}
-			if (ids.length) {
-				this.setNotifiedDeprecatedExtensions(ids);
-			}
-		}));
-	}
-
-	private async checkForDeprecatedExtensions(): Promise<void> {
-		if (this.storageService.getBoolean('extensionsAssistant/doNotCheckDeprecated', StorageScope.PROFILE, false)) {
-			return;
-		}
-		const local = await this.extensionsWorkbenchService.queryLocal();
-		const previouslyNotified = this.getNotifiedDeprecatedExtensions();
-		const toNotify = local.filter(e => !!e.deprecationInfo && e.local && this.extensionEnablementService.isEnabled(e.local)).filter(e => !previouslyNotified.includes(e.identifier.id.toLowerCase()));
-		if (toNotify.length) {
-			this.notificationService.prompt(
-				Severity.Warning,
-				localize('deprecated extensions', "You have deprecated extensions installed. We recommend to review them and migrate to alternatives."),
-				[{
-					label: localize('showDeprecated', "Show Deprecated Extensions"),
-					run: async () => {
-						this.setNotifiedDeprecatedExtensions(toNotify.map(e => e.identifier.id.toLowerCase()));
-						const action = this.instantiationService.createInstance(SearchExtensionsAction, toNotify.map(extension => `@id:${extension.identifier.id}`).join(' '));
-						try {
-							await action.run();
-						} finally {
-							action.dispose();
-						}
-					}
-				}, {
-					label: localize('neverShowAgain', "Don't Show Again"),
-					isSecondary: true,
-					run: () => this.storageService.store('extensionsAssistant/doNotCheckDeprecated', true, StorageScope.PROFILE, StorageTarget.USER)
-				}]
-			);
-		}
-	}
-
-	private getNotifiedDeprecatedExtensions(): string[] {
-		return JSON.parse(this.storageService.get('extensionsAssistant/deprecated', StorageScope.PROFILE, '[]'));
-	}
-
-	private setNotifiedDeprecatedExtensions(notified: string[]): void {
-		this.storageService.store('extensionsAssistant/deprecated', JSON.stringify(distinct([...this.getNotifiedDeprecatedExtensions(), ...notified])), StorageScope.PROFILE, StorageTarget.USER);
-	}
-}
diff --git a/src/vs/workbench/contrib/extensions/browser/exeBasedRecommendations.ts b/src/vs/workbench/contrib/extensions/browser/exeBasedRecommendations.ts
index 9e75f3fb4a9..6b057135c42 100644
--- a/src/vs/workbench/contrib/extensions/browser/exeBasedRecommendations.ts
+++ b/src/vs/workbench/contrib/extensions/browser/exeBasedRecommendations.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IExtensionTipsService, IExecutableBasedExtensionTip } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { ExtensionRecommendations, ExtensionRecommendation } from 'vs/workbench/contrib/extensions/browser/extensionRecommendations';
-import { localize } from 'vs/nls';
-import { ExtensionRecommendationReason } from 'vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
+import { IExtensionTipsService, IExecutableBasedExtensionTip } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { ExtensionRecommendations, ExtensionRecommendation } from './extensionRecommendations.js';
+import { localize } from '../../../../nls.js';
+import { ExtensionRecommendationReason } from '../../../services/extensionRecommendations/common/extensionRecommendations.js';
 
 export class ExeBasedRecommendations extends ExtensionRecommendations {
 
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
index f675f2e4c0d..b3cc78f56cc 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
@@ -3,57 +3,56 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { $, Dimension, addDisposableListener, append, setParentFlowTo } from 'vs/base/browser/dom';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
-import { CheckboxActionViewItem } from 'vs/base/browser/ui/toggle/toggle';
-import { Action, IAction } from 'vs/base/common/actions';
-import * as arrays from 'vs/base/common/arrays';
-import { Cache, CacheResult } from 'vs/base/common/cache';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { isCancellationError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Disposable, DisposableStore, MutableDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
-import { Schemas, matchesScheme } from 'vs/base/common/network';
-import { language } from 'vs/base/common/platform';
-import * as semver from 'vs/base/common/semver/semver';
-import { isUndefined } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import 'vs/css!./media/extensionEditor';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { TokenizationRegistry } from 'vs/editor/common/languages';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { generateTokensCSSForColorMap } from 'vs/editor/common/languages/supports/tokenization';
-import { localize } from 'vs/nls';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ContextKeyExpr, IContextKey, IContextKeyService, IScopedContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IExtensionGalleryService, IGalleryExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { ExtensionType, IExtensionManifest } from 'vs/platform/extensions/common/extensions';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { defaultCheckboxStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { buttonForeground, buttonHoverBackground, editorBackground, textLinkActiveForeground, textLinkForeground } from 'vs/platform/theme/common/colorRegistry';
-import { IColorTheme, ICssStyleCollector, IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
-import { IEditorOpenContext } from 'vs/workbench/common/editor';
-import { ViewContainerLocation } from 'vs/workbench/common/views';
-import { ExtensionFeaturesTab } from 'vs/workbench/contrib/extensions/browser/extensionFeaturesTab';
+import { $, Dimension, addDisposableListener, append, setParentFlowTo } from '../../../../base/browser/dom.js';
+import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { DomScrollableElement } from '../../../../base/browser/ui/scrollbar/scrollableElement.js';
+import { CheckboxActionViewItem } from '../../../../base/browser/ui/toggle/toggle.js';
+import { Action, IAction } from '../../../../base/common/actions.js';
+import * as arrays from '../../../../base/common/arrays.js';
+import { Cache, CacheResult } from '../../../../base/common/cache.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { isCancellationError } from '../../../../base/common/errors.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore, MutableDisposable, dispose, toDisposable } from '../../../../base/common/lifecycle.js';
+import { Schemas, matchesScheme } from '../../../../base/common/network.js';
+import { language } from '../../../../base/common/platform.js';
+import * as semver from '../../../../base/common/semver/semver.js';
+import { isUndefined } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import './media/extensionEditor.css';
+import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
+import { TokenizationRegistry } from '../../../../editor/common/languages.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { generateTokensCSSForColorMap } from '../../../../editor/common/languages/supports/tokenization.js';
+import { localize } from '../../../../nls.js';
+import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService, IScopedContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IExtensionGalleryService, IGalleryExtension } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { areSameExtensions } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { ExtensionType, IExtensionManifest } from '../../../../platform/extensions/common/extensions.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { defaultCheckboxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { buttonForeground, buttonHoverBackground, editorBackground, textLinkActiveForeground, textLinkForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import { IColorTheme, ICssStyleCollector, IThemeService, registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { EditorPane } from '../../../browser/parts/editor/editorPane.js';
+import { IEditorOpenContext } from '../../../common/editor.js';
+import { ExtensionFeaturesTab } from './extensionFeaturesTab.js';
 import {
-	ActionWithDropDownAction,
+	ButtonWithDropDownExtensionAction,
 	ClearLanguageAction,
 	DisableDropDownAction,
 	EnableDropDownAction,
-	ExtensionActionWithDropdownActionViewItem, ExtensionDropDownAction,
+	ButtonWithDropdownExtensionActionViewItem, DropDownExtensionAction,
 	ExtensionEditorManageExtensionAction,
 	ExtensionStatusAction,
 	ExtensionStatusLabelAction,
@@ -71,25 +70,24 @@ import {
 	UninstallAction,
 	UpdateAction,
 	WebInstallAction,
-	TogglePreReleaseExtensionAction
-} from 'vs/workbench/contrib/extensions/browser/extensionsActions';
-import { Delegate } from 'vs/workbench/contrib/extensions/browser/extensionsList';
-import { ExtensionData, ExtensionsGridView, ExtensionsTree, getExtensions } from 'vs/workbench/contrib/extensions/browser/extensionsViewer';
-import { ExtensionRecommendationWidget, ExtensionStatusWidget, ExtensionWidget, InstallCountWidget, RatingsWidget, RemoteBadgeWidget, SponsorWidget, VerifiedPublisherWidget, onClick } from 'vs/workbench/contrib/extensions/browser/extensionsWidgets';
-import { ExtensionContainers, ExtensionEditorTab, ExtensionState, IExtension, IExtensionContainer, IExtensionsViewPaneContainer, IExtensionsWorkbenchService, VIEWLET_ID } from 'vs/workbench/contrib/extensions/common/extensions';
-import { ExtensionsInput, IExtensionEditorOptions } from 'vs/workbench/contrib/extensions/common/extensionsInput';
-import { IExplorerService } from 'vs/workbench/contrib/files/browser/files';
-import { DEFAULT_MARKDOWN_STYLES, renderMarkdownDocument } from 'vs/workbench/contrib/markdown/browser/markdownDocumentRenderer';
-import { IWebview, IWebviewService, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED } from 'vs/workbench/contrib/webview/browser/webview';
-import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IExtensionRecommendationsService } from 'vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { VIEW_ID as EXPLORER_VIEW_ID } from 'vs/workbench/contrib/files/common/files';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+	TogglePreReleaseExtensionAction,
+} from './extensionsActions.js';
+import { Delegate } from './extensionsList.js';
+import { ExtensionData, ExtensionsGridView, ExtensionsTree, getExtensions } from './extensionsViewer.js';
+import { ExtensionRecommendationWidget, ExtensionStatusWidget, ExtensionWidget, InstallCountWidget, RatingsWidget, RemoteBadgeWidget, SponsorWidget, VerifiedPublisherWidget, onClick } from './extensionsWidgets.js';
+import { ExtensionContainers, ExtensionEditorTab, ExtensionState, IExtension, IExtensionContainer, IExtensionsWorkbenchService } from '../common/extensions.js';
+import { ExtensionsInput, IExtensionEditorOptions } from '../common/extensionsInput.js';
+import { IExplorerService } from '../../files/browser/files.js';
+import { DEFAULT_MARKDOWN_STYLES, renderMarkdownDocument } from '../../markdown/browser/markdownDocumentRenderer.js';
+import { IWebview, IWebviewService, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED } from '../../webview/browser/webview.js';
+import { IEditorGroup } from '../../../services/editor/common/editorGroupsService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IExtensionRecommendationsService } from '../../../services/extensionRecommendations/common/extensionRecommendations.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { VIEW_ID as EXPLORER_VIEW_ID } from '../../files/common/files.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 
 class NavBar extends Disposable {
 
@@ -240,7 +238,6 @@ export class ExtensionEditor extends EditorPane {
 		group: IEditorGroup,
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@IPaneCompositePartService private readonly paneCompositeService: IPaneCompositePartService,
 		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@IExtensionGalleryService private readonly extensionGalleryService: IExtensionGalleryService,
 		@IThemeService themeService: IThemeService,
@@ -299,7 +296,6 @@ export class ExtensionEditor extends EditorPane {
 
 		const subtitle = append(details, $('.subtitle'));
 		const publisher = append(append(subtitle, $('.subtitle-entry')), $('.publisher.clickable', { tabIndex: 0 }));
-		this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), publisher, localize('publisher', "Publisher")));
 		publisher.setAttribute('role', 'button');
 		const publisherDisplayName = append(publisher, $('.publisher-name'));
 		const verifiedPublisherWidget = this.instantiationService.createInstance(VerifiedPublisherWidget, append(publisher, $('.verified-publisher')), false);
@@ -333,8 +329,7 @@ export class ExtensionEditor extends EditorPane {
 		const actions = [
 			this.instantiationService.createInstance(ExtensionRuntimeStateAction),
 			this.instantiationService.createInstance(ExtensionStatusLabelAction),
-			this.instantiationService.createInstance(ActionWithDropDownAction, 'extensions.updateActions', '',
-				[[this.instantiationService.createInstance(UpdateAction, true)], [this.instantiationService.createInstance(ToggleAutoUpdateForExtensionAction, true, [true, 'onlyEnabledExtensions'])]]),
+			this.instantiationService.createInstance(UpdateAction, true),
 			this.instantiationService.createInstance(SetColorThemeAction),
 			this.instantiationService.createInstance(SetFileIconThemeAction),
 			this.instantiationService.createInstance(SetProductIconThemeAction),
@@ -348,26 +343,35 @@ export class ExtensionEditor extends EditorPane {
 			this.instantiationService.createInstance(WebInstallAction),
 			installAction,
 			this.instantiationService.createInstance(InstallingLabelAction),
-			this.instantiationService.createInstance(ActionWithDropDownAction, 'extensions.uninstall', UninstallAction.UninstallLabel, [
+			this.instantiationService.createInstance(ButtonWithDropDownExtensionAction, 'extensions.uninstall', UninstallAction.UninstallClass, [
 				[
 					this.instantiationService.createInstance(MigrateDeprecatedExtensionAction, false),
 					this.instantiationService.createInstance(UninstallAction),
-					this.instantiationService.createInstance(InstallAnotherVersionAction),
+					this.instantiationService.createInstance(InstallAnotherVersionAction, null, true),
 				]
 			]),
 			this.instantiationService.createInstance(TogglePreReleaseExtensionAction),
-			this.instantiationService.createInstance(ToggleAutoUpdateForExtensionAction, false, [false, 'onlySelectedExtensions']),
+			this.instantiationService.createInstance(ToggleAutoUpdateForExtensionAction),
 			new ExtensionEditorManageExtensionAction(this.scopedContextKeyService || this.contextKeyService, this.instantiationService),
 		];
 
 		const actionsAndStatusContainer = append(details, $('.actions-status-container'));
 		const extensionActionBar = this._register(new ActionBar(actionsAndStatusContainer, {
 			actionViewItemProvider: (action: IAction, options) => {
-				if (action instanceof ExtensionDropDownAction) {
+				if (action instanceof DropDownExtensionAction) {
 					return action.createActionViewItem(options);
 				}
-				if (action instanceof ActionWithDropDownAction) {
-					return new ExtensionActionWithDropdownActionViewItem(action, { ...options, icon: true, label: true, menuActionsOrProvider: { getActions: () => action.menuActions }, menuActionClassNames: (action.class || '').split(' ') }, this.contextMenuService);
+				if (action instanceof ButtonWithDropDownExtensionAction) {
+					return new ButtonWithDropdownExtensionActionViewItem(
+						action,
+						{
+							...options,
+							icon: true,
+							label: true,
+							menuActionsOrProvider: { getActions: () => action.menuActions },
+							menuActionClassNames: action.menuActionClassNames
+						},
+						this.contextMenuService);
 				}
 				if (action instanceof ToggleAutoUpdateForExtensionAction) {
 					return new CheckboxActionViewItem(undefined, action, { ...options, icon: true, label: true, checkboxStyles: defaultCheckboxStyles });
@@ -463,9 +467,16 @@ export class ExtensionEditor extends EditorPane {
 		const currentOptions: IExtensionEditorOptions | undefined = this.options;
 		super.setOptions(options);
 		this.updatePreReleaseVersionContext();
+
 		if (this.input && this.template && currentOptions?.showPreReleaseVersion !== options?.showPreReleaseVersion) {
 			this.render((this.input as ExtensionsInput).extension, this.template, !!options?.preserveFocus);
+			return;
 		}
+
+		if (options?.tab) {
+			this.template?.navbar.switch(options.tab);
+		}
+
 	}
 
 	private updatePreReleaseVersionContext(): void {
@@ -545,6 +556,7 @@ export class ExtensionEditor extends EditorPane {
 		template.publisher.classList.toggle('clickable', !!extension.url);
 		template.publisherDisplayName.textContent = extension.publisherDisplayName;
 		template.publisher.parentElement?.classList.toggle('hide', !!extension.resourceExtension || extension.local?.source === 'resource');
+		this.transientDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), template.publisher, localize('publisher', "Publisher ({0})", extension.publisher)));
 
 		const location = extension.resourceExtension?.location ?? (extension.local?.source === 'resource' ? extension.local?.location : undefined);
 		template.resource.parentElement?.classList.toggle('hide', !location);
@@ -571,11 +583,7 @@ export class ExtensionEditor extends EditorPane {
 		if (extension.url) {
 			this.transientDisposables.add(onClick(template.name, () => this.openerService.open(URI.parse(extension.url!))));
 			this.transientDisposables.add(onClick(template.rating, () => this.openerService.open(URI.parse(`${extension.url}&ssr=false#review-details`))));
-			this.transientDisposables.add(onClick(template.publisher, () => {
-				this.paneCompositeService.openPaneComposite(VIEWLET_ID, ViewContainerLocation.Sidebar, true)
-					.then(viewlet => viewlet?.getViewPaneContainer() as IExtensionsViewPaneContainer)
-					.then(viewlet => viewlet.search(`publisher:"${extension.publisherDisplayName}"`));
-			}));
+			this.transientDisposables.add(onClick(template.publisher, () => this.extensionsWorkbenchService.openSearch(`publisher:"${extension.publisherDisplayName}"`)));
 		}
 
 		const manifest = await this.extensionManifest.get().promise;
@@ -774,7 +782,7 @@ export class ExtensionEditor extends EditorPane {
 			return '';
 		}
 
-		const content = await renderMarkdownDocument(contents, this.extensionService, this.languageService, extension.type !== ExtensionType.System, false, token);
+		const content = await renderMarkdownDocument(contents, this.extensionService, this.languageService, { shouldSanitize: extension.type !== ExtensionType.System, token });
 		if (token?.isCancellationRequested) {
 			return '';
 		}
@@ -929,11 +937,8 @@ export class ExtensionEditor extends EditorPane {
 			append(categoriesContainer, $('.additional-details-title', undefined, localize('categories', "Categories")));
 			const categoriesElement = append(categoriesContainer, $('.categories'));
 			for (const category of extension.categories) {
-				this.transientDisposables.add(onClick(append(categoriesElement, $('span.category', { tabindex: '0' }, category)), () => {
-					this.paneCompositeService.openPaneComposite(VIEWLET_ID, ViewContainerLocation.Sidebar, true)
-						.then(viewlet => viewlet?.getViewPaneContainer() as IExtensionsViewPaneContainer)
-						.then(viewlet => viewlet.search(`@category:"${category}"`));
-				}));
+				this.transientDisposables.add(onClick(append(categoriesElement, $('span.category', { tabindex: '0' }, category)),
+					() => this.extensionsWorkbenchService.openSearch(`@category:"${category}"`)));
 			}
 		}
 	}
@@ -967,7 +972,9 @@ export class ExtensionEditor extends EditorPane {
 			const resourcesElement = append(extensionResourcesContainer, $('.resources'));
 			for (const [label, uri] of resources) {
 				const resource = append(resourcesElement, $('a.resource', { tabindex: '0' }, label));
-				this.transientDisposables.add(onClick(resource, () => this.openerService.open(uri)));
+				this.transientDisposables.add(onClick(resource, () => {
+					this.openerService.open(uri);
+				}));
 				this.transientDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), resource, uri.toString()));
 			}
 		}
@@ -1133,7 +1140,7 @@ registerAction2(class ShowExtensionEditorFindAction extends Action2 {
 			}
 		});
 	}
-	run(accessor: ServicesAccessor): any {
+	run(accessor: ServicesAccessor): void {
 		const extensionEditor = getExtensionEditor(accessor);
 		extensionEditor?.showFind();
 	}
@@ -1153,7 +1160,7 @@ registerAction2(class StartExtensionEditorFindNextAction extends Action2 {
 			}
 		});
 	}
-	run(accessor: ServicesAccessor): any {
+	run(accessor: ServicesAccessor): void {
 		const extensionEditor = getExtensionEditor(accessor);
 		extensionEditor?.runFindAction(false);
 	}
@@ -1173,7 +1180,7 @@ registerAction2(class StartExtensionEditorFindPreviousAction extends Action2 {
 			}
 		});
 	}
-	run(accessor: ServicesAccessor): any {
+	run(accessor: ServicesAccessor): void {
 		const extensionEditor = getExtensionEditor(accessor);
 		extensionEditor?.runFindAction(true);
 	}
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionEnablementWorkspaceTrustTransitionParticipant.ts b/src/vs/workbench/contrib/extensions/browser/extensionEnablementWorkspaceTrustTransitionParticipant.ts
index bae93dc42fa..55de158e6b8 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionEnablementWorkspaceTrustTransitionParticipant.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionEnablementWorkspaceTrustTransitionParticipant.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService, IWorkspaceTrustTransitionParticipant } from 'vs/platform/workspace/common/workspaceTrust';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IWorkbenchExtensionEnablementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
+import { localize } from '../../../../nls.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService, IWorkspaceTrustTransitionParticipant } from '../../../../platform/workspace/common/workspaceTrust.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { IWorkbenchExtensionEnablementService } from '../../../services/extensionManagement/common/extensionManagement.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IHostService } from '../../../services/host/browser/host.js';
 
 export class ExtensionEnablementWorkspaceTrustTransitionParticipant extends Disposable implements IWorkbenchContribution {
 	constructor(
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionFeaturesTab.ts b/src/vs/workbench/contrib/extensions/browser/extensionFeaturesTab.ts
index 42680a4ba1f..1c04096e8a0 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionFeaturesTab.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionFeaturesTab.ts
@@ -3,40 +3,40 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, DisposableStore, IDisposable, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { $, append, clearNode } from 'vs/base/browser/dom';
-import { Emitter, Event } from 'vs/base/common/event';
-import { ExtensionIdentifier, IExtensionManifest } from 'vs/platform/extensions/common/extensions';
-import { Orientation, Sizing, SplitView } from 'vs/base/browser/ui/splitview/splitview';
-import { IExtensionFeatureDescriptor, Extensions, IExtensionFeaturesRegistry, IExtensionFeatureRenderer, IExtensionFeaturesManagementService, IExtensionFeatureTableRenderer, IExtensionFeatureMarkdownRenderer, ITableData, IRenderedData, IExtensionFeatureMarkdownAndTableRenderer } from 'vs/workbench/services/extensionManagement/common/extensionFeatures';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { localize } from 'vs/nls';
-import { WorkbenchList } from 'vs/platform/list/browser/listService';
-import { getExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { IListRenderer, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { Button } from 'vs/base/browser/ui/button/button';
-import { defaultButtonStyles, defaultKeybindingLabelStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { renderMarkdown } from 'vs/base/browser/markdownRenderer';
-import { getErrorMessage, onUnexpectedError } from 'vs/base/common/errors';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { PANEL_SECTION_BORDER } from 'vs/workbench/common/theme';
-import { IThemeService, Themable } from 'vs/platform/theme/common/themeService';
-import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { ThemeIcon } from 'vs/base/common/themables';
-import Severity from 'vs/base/common/severity';
-import { errorIcon, infoIcon, warningIcon } from 'vs/workbench/contrib/extensions/browser/extensionsIcons';
-import { SeverityIcon } from 'vs/platform/severityIcon/browser/severityIcon';
-import { KeybindingLabel } from 'vs/base/browser/ui/keybindingLabel/keybindingLabel';
-import { OS } from 'vs/base/common/platform';
-import { IMarkdownString, MarkdownString, isMarkdownString } from 'vs/base/common/htmlContent';
-import { Color } from 'vs/base/common/color';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { Codicon } from 'vs/base/common/codicons';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { ResolvedKeybinding } from 'vs/base/common/keybindings';
-import { fromNow } from 'vs/base/common/date';
+import { Disposable, DisposableStore, IDisposable, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { $, append, clearNode } from '../../../../base/browser/dom.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { ExtensionIdentifier, IExtensionManifest } from '../../../../platform/extensions/common/extensions.js';
+import { Orientation, Sizing, SplitView } from '../../../../base/browser/ui/splitview/splitview.js';
+import { IExtensionFeatureDescriptor, Extensions, IExtensionFeaturesRegistry, IExtensionFeatureRenderer, IExtensionFeaturesManagementService, IExtensionFeatureTableRenderer, IExtensionFeatureMarkdownRenderer, ITableData, IRenderedData, IExtensionFeatureMarkdownAndTableRenderer } from '../../../services/extensionManagement/common/extensionFeatures.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { localize } from '../../../../nls.js';
+import { WorkbenchList } from '../../../../platform/list/browser/listService.js';
+import { getExtensionId } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { IListRenderer, IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
+import { Button } from '../../../../base/browser/ui/button/button.js';
+import { defaultButtonStyles, defaultKeybindingLabelStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { renderMarkdown } from '../../../../base/browser/markdownRenderer.js';
+import { getErrorMessage, onUnexpectedError } from '../../../../base/common/errors.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { PANEL_SECTION_BORDER } from '../../../common/theme.js';
+import { IThemeService, Themable } from '../../../../platform/theme/common/themeService.js';
+import { DomScrollableElement } from '../../../../base/browser/ui/scrollbar/scrollableElement.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import Severity from '../../../../base/common/severity.js';
+import { errorIcon, infoIcon, warningIcon } from './extensionsIcons.js';
+import { SeverityIcon } from '../../../../platform/severityIcon/browser/severityIcon.js';
+import { KeybindingLabel } from '../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
+import { OS } from '../../../../base/common/platform.js';
+import { IMarkdownString, MarkdownString, isMarkdownString } from '../../../../base/common/htmlContent.js';
+import { Color } from '../../../../base/common/color.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { ResolvedKeybinding } from '../../../../base/common/keybindings.js';
+import { fromNow } from '../../../../base/common/date.js';
 
 class RuntimeStatusMarkdownRenderer extends Disposable implements IExtensionFeatureMarkdownRenderer {
 
@@ -178,10 +178,10 @@ export class ExtensionFeaturesTab extends Themable {
 			return;
 		}
 
-		const splitView = new SplitView<number>(this.domNode, {
+		const splitView = this._register(new SplitView<number>(this.domNode, {
 			orientation: Orientation.HORIZONTAL,
 			proportionalLayout: true
-		});
+		}));
 		this.layoutParticipants.push({
 			layout: (height: number, width: number) => {
 				splitView.el.style.height = `${height - 14}px`;
@@ -190,7 +190,7 @@ export class ExtensionFeaturesTab extends Themable {
 		});
 
 		const featuresListContainer = $('.features-list-container');
-		const list = this.createFeaturesList(featuresListContainer);
+		const list = this._register(this.createFeaturesList(featuresListContainer));
 		list.splice(0, list.length, features);
 
 		const featureViewContainer = $('.feature-view-container');
@@ -470,7 +470,7 @@ class ExtensionFeatureView extends Disposable {
 						return $('tr', undefined,
 							...row.map(rowData => {
 								if (typeof rowData === 'string') {
-									return $('td', undefined, rowData);
+									return $('td', undefined, $('p', undefined, rowData));
 								}
 								const data = Array.isArray(rowData) ? rowData : [rowData];
 								return $('td', undefined, ...data.map(item => {
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionRecommendationNotificationService.ts b/src/vs/workbench/contrib/extensions/browser/extensionRecommendationNotificationService.ts
index 4152bf2f351..1fc880f2465 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionRecommendationNotificationService.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionRecommendationNotificationService.ts
@@ -3,30 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IAction } from 'vs/base/common/actions';
-import { distinct } from 'vs/base/common/arrays';
-import { CancelablePromise, createCancelablePromise, Promises, raceCancellablePromises, raceCancellation, timeout } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { isCancellationError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore, isDisposable, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { isString } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { IExtensionRecommendationNotificationService, IExtensionRecommendations, RecommendationsNotificationResult, RecommendationSource, RecommendationSourceToString } from 'vs/platform/extensionRecommendations/common/extensionRecommendations';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { INotificationHandle, INotificationService, IPromptChoice, IPromptChoiceWithMenu, NotificationPriority, Severity } from 'vs/platform/notification/common/notification';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IUserDataSyncEnablementService, SyncResource } from 'vs/platform/userDataSync/common/userDataSync';
-import { SearchExtensionsAction } from 'vs/workbench/contrib/extensions/browser/extensionsActions';
-import { IExtension, IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { EnablementState, IWorkbenchExtensionManagementService, IWorkbenchExtensionEnablementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { IExtensionIgnoredRecommendationsService } from 'vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
+import { distinct } from '../../../../base/common/arrays.js';
+import { CancelablePromise, createCancelablePromise, Promises, raceCancellablePromises, raceCancellation, timeout } from '../../../../base/common/async.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { isCancellationError } from '../../../../base/common/errors.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, DisposableStore, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { isString } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { localize } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IGalleryExtension } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { areSameExtensions } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { IExtensionRecommendationNotificationService, IExtensionRecommendations, RecommendationsNotificationResult, RecommendationSource, RecommendationSourceToString } from '../../../../platform/extensionRecommendations/common/extensionRecommendations.js';
+import { INotificationHandle, INotificationService, IPromptChoice, IPromptChoiceWithMenu, NotificationPriority, Severity } from '../../../../platform/notification/common/notification.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IUserDataSyncEnablementService, SyncResource } from '../../../../platform/userDataSync/common/userDataSync.js';
+import { IExtension, IExtensionsWorkbenchService } from '../common/extensions.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { EnablementState, IWorkbenchExtensionManagementService, IWorkbenchExtensionEnablementService } from '../../../services/extensionManagement/common/extensionManagement.js';
+import { IExtensionIgnoredRecommendationsService } from '../../../services/extensionRecommendations/common/extensionRecommendations.js';
 
 type ExtensionRecommendationsNotificationClassification = {
 	owner: 'sandy081';
@@ -137,7 +135,6 @@ export class ExtensionRecommendationNotificationService extends Disposable imple
 		@IStorageService private readonly storageService: IStorageService,
 		@INotificationService private readonly notificationService: INotificationService,
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@IWorkbenchExtensionManagementService private readonly extensionManagementService: IWorkbenchExtensionManagementService,
 		@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService,
@@ -281,11 +278,20 @@ export class ExtensionRecommendationNotificationService extends Disposable imple
 			let accepted = false;
 			const choices: (IPromptChoice | IPromptChoiceWithMenu)[] = [];
 			const installExtensions = async (isMachineScoped: boolean) => {
-				this.runAction(this.instantiationService.createInstance(SearchExtensionsAction, searchValue));
+				this.extensionsWorkbenchService.openSearch(searchValue);
 				onDidInstallRecommendedExtensions(extensions);
+				const galleryExtensions: IGalleryExtension[] = [], resourceExtensions: IExtension[] = [];
+				for (const extension of extensions) {
+					if (extension.gallery) {
+						galleryExtensions.push(extension.gallery);
+					} else if (extension.resourceExtension) {
+						resourceExtensions.push(extension);
+					}
+				}
 				await Promises.settled<any>([
 					Promises.settled(extensions.map(extension => this.extensionsWorkbenchService.open(extension, { pinned: true }))),
-					this.extensionManagementService.installGalleryExtensions(extensions.map(e => ({ extension: e.gallery!, options: { isMachineScoped } })))
+					galleryExtensions.length ? this.extensionManagementService.installGalleryExtensions(galleryExtensions.map(e => ({ extension: e, options: { isMachineScoped } }))) : Promise.resolve(),
+					resourceExtensions.length ? Promise.allSettled(resourceExtensions.map(r => this.extensionsWorkbenchService.install(r))) : Promise.resolve()
 				]);
 			};
 			choices.push({
@@ -303,7 +309,7 @@ export class ExtensionRecommendationNotificationService extends Disposable imple
 					for (const extension of extensions) {
 						this.extensionsWorkbenchService.open(extension, { pinned: true });
 					}
-					this.runAction(this.instantiationService.createInstance(SearchExtensionsAction, searchValue));
+					this.extensionsWorkbenchService.openSearch(searchValue);
 				}
 			}, {
 				label: donotShowAgainLabel,
@@ -454,16 +460,6 @@ export class ExtensionRecommendationNotificationService extends Disposable imple
 		return result;
 	}
 
-	private async runAction(action: IAction): Promise<void> {
-		try {
-			await action.run();
-		} finally {
-			if (isDisposable(action)) {
-				action.dispose();
-			}
-		}
-	}
-
 	private addToImportantRecommendationsIgnore(id: string) {
 		const importantRecommendationsIgnoreList = [...this.ignoredRecommendations];
 		if (!importantRecommendationsIgnoreList.includes(id.toLowerCase())) {
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionRecommendations.ts b/src/vs/workbench/contrib/extensions/browser/extensionRecommendations.ts
index bc811fe8ccf..fed09e09317 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionRecommendations.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionRecommendations.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { IExtensionRecommendationReason } from 'vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IExtensionRecommendationReason } from '../../../services/extensionRecommendations/common/extensionRecommendations.js';
 
 export type GalleryExtensionRecommendation = {
 	readonly extension: string;
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionRecommendationsService.ts b/src/vs/workbench/contrib/extensions/browser/extensionRecommendationsService.ts
index 526f2a0ab0c..f9284ebbd8a 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionRecommendationsService.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionRecommendationsService.ts
@@ -3,32 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IExtensionManagementService, IExtensionGalleryService, InstallOperation, InstallExtensionResult } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IExtensionRecommendationsService, ExtensionRecommendationReason, IExtensionIgnoredRecommendationsService } from 'vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { shuffle } from 'vs/base/common/arrays';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { LifecyclePhase, ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { ExeBasedRecommendations } from 'vs/workbench/contrib/extensions/browser/exeBasedRecommendations';
-import { WorkspaceRecommendations } from 'vs/workbench/contrib/extensions/browser/workspaceRecommendations';
-import { FileBasedRecommendations } from 'vs/workbench/contrib/extensions/browser/fileBasedRecommendations';
-import { KeymapRecommendations } from 'vs/workbench/contrib/extensions/browser/keymapRecommendations';
-import { LanguageRecommendations } from 'vs/workbench/contrib/extensions/browser/languageRecommendations';
-import { ExtensionRecommendation } from 'vs/workbench/contrib/extensions/browser/extensionRecommendations';
-import { ConfigBasedRecommendations } from 'vs/workbench/contrib/extensions/browser/configBasedRecommendations';
-import { IExtensionRecommendationNotificationService } from 'vs/platform/extensionRecommendations/common/extensionRecommendations';
-import { CancelablePromise, timeout } from 'vs/base/common/async';
-import { URI } from 'vs/base/common/uri';
-import { WebRecommendations } from 'vs/workbench/contrib/extensions/browser/webRecommendations';
-import { IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions';
-import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { RemoteRecommendations } from 'vs/workbench/contrib/extensions/browser/remoteRecommendations';
-import { IRemoteExtensionsScannerService } from 'vs/platform/remote/common/remoteExtensionsScanner';
-import { IUserDataInitializationService } from 'vs/workbench/services/userData/browser/userDataInit';
-import { isString } from 'vs/base/common/types';
+import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { IExtensionManagementService, IExtensionGalleryService, InstallOperation, InstallExtensionResult } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { IExtensionRecommendationsService, ExtensionRecommendationReason, IExtensionIgnoredRecommendationsService } from '../../../services/extensionRecommendations/common/extensionRecommendations.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { shuffle } from '../../../../base/common/arrays.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { LifecyclePhase, ILifecycleService } from '../../../services/lifecycle/common/lifecycle.js';
+import { ExeBasedRecommendations } from './exeBasedRecommendations.js';
+import { WorkspaceRecommendations } from './workspaceRecommendations.js';
+import { FileBasedRecommendations } from './fileBasedRecommendations.js';
+import { KeymapRecommendations } from './keymapRecommendations.js';
+import { LanguageRecommendations } from './languageRecommendations.js';
+import { ExtensionRecommendation } from './extensionRecommendations.js';
+import { ConfigBasedRecommendations } from './configBasedRecommendations.js';
+import { IExtensionRecommendationNotificationService } from '../../../../platform/extensionRecommendations/common/extensionRecommendations.js';
+import { CancelablePromise, timeout } from '../../../../base/common/async.js';
+import { URI } from '../../../../base/common/uri.js';
+import { WebRecommendations } from './webRecommendations.js';
+import { IExtensionsWorkbenchService } from '../common/extensions.js';
+import { areSameExtensions } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { RemoteRecommendations } from './remoteRecommendations.js';
+import { IRemoteExtensionsScannerService } from '../../../../platform/remote/common/remoteExtensionsScanner.js';
+import { IUserDataInitializationService } from '../../../services/userData/browser/userDataInit.js';
+import { isString } from '../../../../base/common/types.js';
 
 type IgnoreRecommendationClassification = {
 	owner: 'sandy081';
diff --git a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
index 0ff4dca2f71..f4d62c70da1 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
@@ -3,84 +3,80 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize, localize2 } from 'vs/nls';
-import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { MenuRegistry, MenuId, registerAction2, Action2, IMenuItem, IAction2Options } from 'vs/platform/actions/common/actions';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ExtensionsLocalizedLabel, IExtensionManagementService, IExtensionGalleryService, PreferencesLocalizedLabel, InstallOperation, EXTENSION_INSTALL_SOURCE_CONTEXT, ExtensionInstallSource } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { EnablementState, IExtensionManagementServerService, IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService, extensionsConfigurationNodeBase } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { IExtensionIgnoredRecommendationsService, IExtensionRecommendationsService } from 'vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
-import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { VIEWLET_ID, IExtensionsWorkbenchService, IExtensionsViewPaneContainer, TOGGLE_IGNORE_EXTENSION_ACTION_ID, INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID, WORKSPACE_RECOMMENDATIONS_VIEW_ID, IWorkspaceRecommendedExtensionsView, AutoUpdateConfigurationKey, HasOutdatedExtensionsContext, SELECT_INSTALL_VSIX_EXTENSION_COMMAND_ID, LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID, ExtensionEditorTab, THEME_ACTIONS_GROUP, INSTALL_ACTIONS_GROUP, OUTDATED_EXTENSIONS_VIEW_ID, CONTEXT_HAS_GALLERY, IExtension, extensionsSearchActionsMenu, UPDATE_ACTIONS_GROUP, IExtensionArg } from 'vs/workbench/contrib/extensions/common/extensions';
-import { ReinstallAction, InstallSpecificVersionOfExtensionAction, ConfigureWorkspaceRecommendedExtensionsAction, ConfigureWorkspaceFolderRecommendedExtensionsAction, PromptExtensionInstallFailureAction, SearchExtensionsAction, SetColorThemeAction, SetFileIconThemeAction, SetProductIconThemeAction, ClearLanguageAction, ToggleAutoUpdateForExtensionAction, ToggleAutoUpdatesForPublisherAction, TogglePreReleaseExtensionAction } from 'vs/workbench/contrib/extensions/browser/extensionsActions';
-import { ExtensionsInput } from 'vs/workbench/contrib/extensions/common/extensionsInput';
-import { ExtensionEditor } from 'vs/workbench/contrib/extensions/browser/extensionEditor';
-import { StatusUpdater, MaliciousExtensionChecker, ExtensionsViewletViewsContribution, ExtensionsViewPaneContainer, BuiltInExtensionsContext, SearchMarketplaceExtensionsContext, RecommendedExtensionsContext, DefaultViewsContext, ExtensionsSortByContext, SearchHasTextContext } from 'vs/workbench/contrib/extensions/browser/extensionsViewlet';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
-import * as jsonContributionRegistry from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
-import { ExtensionsConfigurationSchema, ExtensionsConfigurationSchemaId } from 'vs/workbench/contrib/extensions/common/extensionsFileTemplate';
-import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeymapExtensions } from 'vs/workbench/contrib/extensions/common/extensionsUtils';
-import { areSameExtensions, getIdAndVersion } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { EditorPaneDescriptor, IEditorPaneRegistry } from 'vs/workbench/browser/editor';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { ExtensionActivationProgress } from 'vs/workbench/contrib/extensions/browser/extensionsActivationProgress';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { ExtensionDependencyChecker } from 'vs/workbench/contrib/extensions/browser/extensionsDependencyChecker';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IViewContainersRegistry, ViewContainerLocation, Extensions as ViewContainerExtensions } from 'vs/workbench/common/views';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
-import { ContextKeyExpr, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IQuickAccessRegistry, Extensions } from 'vs/platform/quickinput/common/quickAccess';
-import { InstallExtensionQuickAccessProvider, ManageExtensionsQuickAccessProvider } from 'vs/workbench/contrib/extensions/browser/extensionsQuickAccess';
-import { ExtensionRecommendationsService } from 'vs/workbench/contrib/extensions/browser/extensionRecommendationsService';
-import { CONTEXT_SYNC_ENABLEMENT } from 'vs/workbench/services/userDataSync/common/userDataSync';
-import { CopyAction, CutAction, PasteAction } from 'vs/editor/contrib/clipboard/browser/clipboard';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { MultiCommand } from 'vs/editor/browser/editorExtensions';
-import { IWebview } from 'vs/workbench/contrib/webview/browser/webview';
-import { ExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/browser/extensionsWorkbenchService';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { IExtensionRecommendationNotificationService } from 'vs/platform/extensionRecommendations/common/extensionRecommendations';
-import { ExtensionRecommendationNotificationService } from 'vs/workbench/contrib/extensions/browser/extensionRecommendationNotificationService';
-import { IExtensionService, toExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { ResourceContextKey, WorkbenchStateContext } from 'vs/workbench/common/contextkeys';
-import { IAction } from 'vs/base/common/actions';
-import { IWorkspaceExtensionsConfigService } from 'vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig';
-import { Schemas } from 'vs/base/common/network';
-import { ShowRuntimeExtensionsAction } from 'vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor';
-import { ExtensionEnablementWorkspaceTrustTransitionParticipant } from 'vs/workbench/contrib/extensions/browser/extensionEnablementWorkspaceTrustTransitionParticipant';
-import { clearSearchResultsIcon, configureRecommendedIcon, extensionsViewIcon, filterIcon, installWorkspaceRecommendedIcon, refreshIcon } from 'vs/workbench/contrib/extensions/browser/extensionsIcons';
-import { EXTENSION_CATEGORIES } from 'vs/platform/extensions/common/extensions';
-import { Disposable, DisposableStore, IDisposable, isDisposable } from 'vs/base/common/lifecycle';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IDialogService, IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { mnemonicButtonLabel } from 'vs/base/common/labels';
-import { Query } from 'vs/workbench/contrib/extensions/common/extensionQuery';
-import { Promises } from 'vs/base/common/async';
-import { EditorExtensions } from 'vs/workbench/common/editor';
-import { WORKSPACE_TRUST_EXTENSION_SUPPORT } from 'vs/workbench/services/workspaces/common/workspaceTrust';
-import { ExtensionsCompletionItemsProvider } from 'vs/workbench/contrib/extensions/browser/extensionsCompletionItemsProvider';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { Event } from 'vs/base/common/event';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { UnsupportedExtensionsMigrationContrib } from 'vs/workbench/contrib/extensions/browser/unsupportedExtensionsMigrationContribution';
-import { isWeb } from 'vs/base/common/platform';
-import { ExtensionStorageService } from 'vs/platform/extensionManagement/common/extensionStorage';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { CONTEXT_KEYBINDINGS_EDITOR } from 'vs/workbench/contrib/preferences/common/preferences';
-import { DeprecatedExtensionsChecker } from 'vs/workbench/contrib/extensions/browser/deprecatedExtensionsChecker';
-import { ProgressLocation } from 'vs/platform/progress/common/progress';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
+import { localize, localize2 } from '../../../../nls.js';
+import { KeyMod, KeyCode } from '../../../../base/common/keyCodes.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { MenuRegistry, MenuId, registerAction2, Action2, IMenuItem, IAction2Options } from '../../../../platform/actions/common/actions.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ExtensionsLocalizedLabel, IExtensionManagementService, IExtensionGalleryService, PreferencesLocalizedLabel, EXTENSION_INSTALL_SOURCE_CONTEXT, ExtensionInstallSource } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { EnablementState, IExtensionManagementServerService, IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService, extensionsConfigurationNodeBase } from '../../../services/extensionManagement/common/extensionManagement.js';
+import { IExtensionIgnoredRecommendationsService, IExtensionRecommendationsService } from '../../../services/extensionRecommendations/common/extensionRecommendations.js';
+import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from '../../../common/contributions.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { VIEWLET_ID, IExtensionsWorkbenchService, IExtensionsViewPaneContainer, TOGGLE_IGNORE_EXTENSION_ACTION_ID, INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID, WORKSPACE_RECOMMENDATIONS_VIEW_ID, IWorkspaceRecommendedExtensionsView, AutoUpdateConfigurationKey, HasOutdatedExtensionsContext, SELECT_INSTALL_VSIX_EXTENSION_COMMAND_ID, LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID, ExtensionEditorTab, THEME_ACTIONS_GROUP, INSTALL_ACTIONS_GROUP, OUTDATED_EXTENSIONS_VIEW_ID, CONTEXT_HAS_GALLERY, extensionsSearchActionsMenu, UPDATE_ACTIONS_GROUP, IExtensionArg, ExtensionRuntimeActionType } from '../common/extensions.js';
+import { ReinstallAction, InstallSpecificVersionOfExtensionAction, ConfigureWorkspaceRecommendedExtensionsAction, ConfigureWorkspaceFolderRecommendedExtensionsAction, SetColorThemeAction, SetFileIconThemeAction, SetProductIconThemeAction, ClearLanguageAction, ToggleAutoUpdateForExtensionAction, ToggleAutoUpdatesForPublisherAction, TogglePreReleaseExtensionAction, InstallAnotherVersionAction, InstallAction } from './extensionsActions.js';
+import { ExtensionsInput } from '../common/extensionsInput.js';
+import { ExtensionEditor } from './extensionEditor.js';
+import { StatusUpdater, MaliciousExtensionChecker, ExtensionsViewletViewsContribution, ExtensionsViewPaneContainer, BuiltInExtensionsContext, SearchMarketplaceExtensionsContext, RecommendedExtensionsContext, DefaultViewsContext, ExtensionsSortByContext, SearchHasTextContext } from './extensionsViewlet.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from '../../../../platform/configuration/common/configurationRegistry.js';
+import * as jsonContributionRegistry from '../../../../platform/jsonschemas/common/jsonContributionRegistry.js';
+import { ExtensionsConfigurationSchema, ExtensionsConfigurationSchemaId } from '../common/extensionsFileTemplate.js';
+import { CommandsRegistry, ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeymapExtensions } from '../common/extensionsUtils.js';
+import { areSameExtensions, getIdAndVersion } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { EditorPaneDescriptor, IEditorPaneRegistry } from '../../../browser/editor.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
+import { ExtensionActivationProgress } from './extensionsActivationProgress.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { ExtensionDependencyChecker } from './extensionsDependencyChecker.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IViewContainersRegistry, ViewContainerLocation, Extensions as ViewContainerExtensions } from '../../../common/views.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
+import { ContextKeyExpr, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IQuickAccessRegistry, Extensions } from '../../../../platform/quickinput/common/quickAccess.js';
+import { InstallExtensionQuickAccessProvider, ManageExtensionsQuickAccessProvider } from './extensionsQuickAccess.js';
+import { ExtensionRecommendationsService } from './extensionRecommendationsService.js';
+import { CONTEXT_SYNC_ENABLEMENT } from '../../../services/userDataSync/common/userDataSync.js';
+import { CopyAction, CutAction, PasteAction } from '../../../../editor/contrib/clipboard/browser/clipboard.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { MultiCommand } from '../../../../editor/browser/editorExtensions.js';
+import { IWebview } from '../../webview/browser/webview.js';
+import { ExtensionsWorkbenchService } from './extensionsWorkbenchService.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { IExtensionRecommendationNotificationService } from '../../../../platform/extensionRecommendations/common/extensionRecommendations.js';
+import { ExtensionRecommendationNotificationService } from './extensionRecommendationNotificationService.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { ResourceContextKey, WorkbenchStateContext } from '../../../common/contextkeys.js';
+import { IAction } from '../../../../base/common/actions.js';
+import { IWorkspaceExtensionsConfigService } from '../../../services/extensionRecommendations/common/workspaceExtensionsConfig.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { ShowRuntimeExtensionsAction } from './abstractRuntimeExtensionsEditor.js';
+import { ExtensionEnablementWorkspaceTrustTransitionParticipant } from './extensionEnablementWorkspaceTrustTransitionParticipant.js';
+import { clearSearchResultsIcon, configureRecommendedIcon, extensionsViewIcon, filterIcon, installWorkspaceRecommendedIcon, refreshIcon } from './extensionsIcons.js';
+import { EXTENSION_CATEGORIES } from '../../../../platform/extensions/common/extensions.js';
+import { Disposable, DisposableStore, IDisposable, isDisposable } from '../../../../base/common/lifecycle.js';
+import { IDialogService, IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { mnemonicButtonLabel } from '../../../../base/common/labels.js';
+import { Query } from '../common/extensionQuery.js';
+import { EditorExtensions } from '../../../common/editor.js';
+import { WORKSPACE_TRUST_EXTENSION_SUPPORT } from '../../../services/workspaces/common/workspaceTrust.js';
+import { ExtensionsCompletionItemsProvider } from './extensionsCompletionItemsProvider.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { Event } from '../../../../base/common/event.js';
+import { UnsupportedExtensionsMigrationContrib } from './unsupportedExtensionsMigrationContribution.js';
+import { isLinux, isNative, isWeb } from '../../../../base/common/platform.js';
+import { ExtensionStorageService } from '../../../../platform/extensionManagement/common/extensionStorage.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { IStringDictionary } from '../../../../base/common/collections.js';
+import { CONTEXT_KEYBINDINGS_EDITOR } from '../../preferences/common/preferences.js';
+import { ProgressLocation } from '../../../../platform/progress/common/progress.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IConfigurationMigrationRegistry, Extensions as ConfigurationMigrationExtensions } from '../../../common/configuration.js';
 
 // Singletons
 registerSingleton(IExtensionsWorkbenchService, ExtensionsWorkbenchService, InstantiationType.Eager /* Auto updates extensions */);
@@ -128,17 +124,15 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
 		...extensionsConfigurationNodeBase,
 		properties: {
 			'extensions.autoUpdate': {
-				enum: [true, 'onlyEnabledExtensions', 'onlySelectedExtensions', false,],
+				enum: [true, 'onlyEnabledExtensions', false,],
 				enumItemLabels: [
 					localize('all', "All Extensions"),
 					localize('enabled', "Only Enabled Extensions"),
-					localize('selected', "Only Selected Extensions"),
 					localize('none', "None"),
 				],
 				enumDescriptions: [
-					localize('extensions.autoUpdate.true', 'Download and install updates automatically for all extensions except for those updates are ignored.'),
-					localize('extensions.autoUpdate.enabled', 'Download and install updates automatically only for enabled extensions except for those updates are ignored. Disabled extensions are not updated automatically.'),
-					localize('extensions.autoUpdate.selected', 'Download and install updates automatically only for selected extensions.'),
+					localize('extensions.autoUpdate.true', 'Download and install updates automatically for all extensions.'),
+					localize('extensions.autoUpdate.enabled', 'Download and install updates automatically only for enabled extensions.'),
 					localize('extensions.autoUpdate.false', 'Extensions are not automatically updated.'),
 				],
 				description: localize('extensions.autoUpdate', "Controls the automatic update behavior of extensions. The updates are fetched from a Microsoft online service."),
@@ -258,6 +252,13 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
 				type: 'boolean',
 				description: localize('extensionsInQuickAccess', "When enabled, extensions can be searched for via Quick Access and report issues from there."),
 				default: true
+			},
+			'extensions.verifySignature': {
+				type: 'boolean',
+				description: localize('extensions.verifySignature', "When enabled, extensions are verified to be signed before getting installed."),
+				default: true,
+				scope: ConfigurationScope.APPLICATION,
+				included: isNative && !isLinux
 			}
 		}
 	});
@@ -380,7 +381,7 @@ CommandsRegistry.registerCommand({
 				}
 			} else {
 				const vsix = URI.revive(arg);
-				await extensionsWorkbenchService.install(vsix, { installOnlyNewlyAddedFromExtensionPack: options?.installOnlyNewlyAddedFromExtensionPackVSIX });
+				await extensionsWorkbenchService.install(vsix, { installOnlyNewlyAddedFromExtensionPack: options?.installOnlyNewlyAddedFromExtensionPackVSIX, installGivenVersion: true });
 			}
 		} catch (e) {
 			onUnexpectedError(e);
@@ -437,15 +438,7 @@ CommandsRegistry.registerCommand({
 		]
 	},
 	handler: async (accessor, query: string = '') => {
-		const paneCompositeService = accessor.get(IPaneCompositePartService);
-		const viewlet = await paneCompositeService.openPaneComposite(VIEWLET_ID, ViewContainerLocation.Sidebar, true);
-
-		if (!viewlet) {
-			return;
-		}
-
-		(viewlet.getViewPaneContainer() as IExtensionsViewPaneContainer).search(query);
-		viewlet.focus();
+		return accessor.get(IExtensionsWorkbenchService).openSearch(query);
 	}
 });
 
@@ -493,7 +486,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 		@IExtensionManagementServerService private readonly extensionManagementServerService: IExtensionManagementServerService,
 		@IExtensionGalleryService extensionGalleryService: IExtensionGalleryService,
 		@IContextKeyService contextKeyService: IContextKeyService,
-		@IPaneCompositePartService private readonly paneCompositeService: IPaneCompositePartService,
+		@IViewsService private readonly viewsService: IViewsService,
 		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
@@ -565,7 +558,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 			category: ExtensionsLocalizedLabel,
 			f1: true,
 			run: async (accessor: ServicesAccessor) => {
-				await accessor.get(IPaneCompositePartService).openPaneComposite(VIEWLET_ID, ViewContainerLocation.Sidebar, true);
+				await accessor.get(IExtensionsWorkbenchService).openSearch('');
 			}
 		});
 
@@ -597,7 +590,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 			menuTitles: {
 				[MenuId.EditorTitle.id]: localize('importKeyboardShortcutsFroms', "Migrate Keyboard Shortcuts from...")
 			},
-			run: () => runAction(this.instantiationService.createInstance(SearchExtensionsAction, '@recommended:keymaps '))
+			run: () => this.extensionsWorkbenchService.openSearch('@recommended:keymaps ')
 		});
 
 		this.registerExtensionAction({
@@ -608,7 +601,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 				id: MenuId.CommandPalette,
 				when: CONTEXT_HAS_GALLERY
 			},
-			run: () => runAction(this.instantiationService.createInstance(SearchExtensionsAction, '@recommended:languages '))
+			run: () => this.extensionsWorkbenchService.openSearch('@recommended:languages ')
 		});
 
 		this.registerExtensionAction({
@@ -628,64 +621,45 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 				await this.extensionsWorkbenchService.checkForUpdates();
 				const outdated = this.extensionsWorkbenchService.outdated;
 				if (outdated.length) {
-					return runAction(this.instantiationService.createInstance(SearchExtensionsAction, '@outdated '));
+					return this.extensionsWorkbenchService.openSearch('@outdated ');
 				} else {
 					return this.dialogService.info(localize('noUpdatesAvailable', "All extensions are up to date."));
 				}
 			}
 		});
 
-		const autoUpdateExtensionsSubMenu = new MenuId('autoUpdateExtensionsSubMenu');
-		MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
-			submenu: autoUpdateExtensionsSubMenu,
-			title: localize('configure auto updating extensions', "Auto Update Extensions"),
-			when: ContextKeyExpr.and(ContextKeyExpr.equals('viewContainer', VIEWLET_ID), CONTEXT_HAS_GALLERY),
-			group: '1_updates',
-			order: 5,
+		const enableAutoUpdateWhenCondition = ContextKeyExpr.equals(`config.${AutoUpdateConfigurationKey}`, false);
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.enableAutoUpdate',
+			title: localize2('enableAutoUpdate', 'Enable Auto Update for All Extensions'),
+			category: ExtensionsLocalizedLabel,
+			precondition: enableAutoUpdateWhenCondition,
+			menu: [{
+				id: MenuId.ViewContainerTitle,
+				order: 5,
+				group: '1_updates',
+				when: ContextKeyExpr.and(ContextKeyExpr.equals('viewContainer', VIEWLET_ID), enableAutoUpdateWhenCondition)
+			}, {
+				id: MenuId.CommandPalette,
+			}],
+			run: (accessor: ServicesAccessor) => accessor.get(IExtensionsWorkbenchService).updateAutoUpdateForAllExtensions(true)
 		});
 
+		const disableAutoUpdateWhenCondition = ContextKeyExpr.notEquals(`config.${AutoUpdateConfigurationKey}`, false);
 		this.registerExtensionAction({
-			id: 'configureExtensionsAutoUpdate.all',
-			title: localize('configureExtensionsAutoUpdate.all', "All Extensions"),
-			toggled: ContextKeyExpr.and(ContextKeyExpr.has(`config.${AutoUpdateConfigurationKey}`), ContextKeyExpr.notEquals(`config.${AutoUpdateConfigurationKey}`, 'onlyEnabledExtensions'), ContextKeyExpr.notEquals(`config.${AutoUpdateConfigurationKey}`, 'onlySelectedExtensions')),
+			id: 'workbench.extensions.action.disableAutoUpdate',
+			title: localize2('disableAutoUpdate', 'Disable Auto Update for All Extensions'),
+			precondition: disableAutoUpdateWhenCondition,
+			category: ExtensionsLocalizedLabel,
 			menu: [{
-				id: autoUpdateExtensionsSubMenu,
-				order: 1,
+				id: MenuId.ViewContainerTitle,
+				order: 5,
+				group: '1_updates',
+				when: ContextKeyExpr.and(ContextKeyExpr.equals('viewContainer', VIEWLET_ID), disableAutoUpdateWhenCondition)
+			}, {
+				id: MenuId.CommandPalette,
 			}],
-			run: (accessor: ServicesAccessor) => accessor.get(IConfigurationService).updateValue(AutoUpdateConfigurationKey, true)
-		});
-
-		this.registerExtensionAction({
-			id: 'configureExtensionsAutoUpdate.enabled',
-			title: localize('configureExtensionsAutoUpdate.enabled', "Enabled Extensions"),
-			toggled: ContextKeyExpr.equals(`config.${AutoUpdateConfigurationKey}`, 'onlyEnabledExtensions'),
-			menu: [{
-				id: autoUpdateExtensionsSubMenu,
-				order: 2,
-			}],
-			run: (accessor: ServicesAccessor) => accessor.get(IConfigurationService).updateValue(AutoUpdateConfigurationKey, 'onlyEnabledExtensions')
-		});
-
-		this.registerExtensionAction({
-			id: 'configureExtensionsAutoUpdate.selected',
-			title: localize('configureExtensionsAutoUpdate.selected', "Selected Extensions"),
-			toggled: ContextKeyExpr.equals(`config.${AutoUpdateConfigurationKey}`, 'onlySelectedExtensions'),
-			menu: [{
-				id: autoUpdateExtensionsSubMenu,
-				order: 2,
-			}],
-			run: (accessor: ServicesAccessor) => accessor.get(IConfigurationService).updateValue(AutoUpdateConfigurationKey, 'onlySelectedExtensions')
-		});
-
-		this.registerExtensionAction({
-			id: 'configureExtensionsAutoUpdate.none',
-			title: localize('configureExtensionsAutoUpdate.none', "None"),
-			toggled: ContextKeyExpr.equals(`config.${AutoUpdateConfigurationKey}`, false),
-			menu: [{
-				id: autoUpdateExtensionsSubMenu,
-				order: 3,
-			}],
-			run: (accessor: ServicesAccessor) => accessor.get(IConfigurationService).updateValue(AutoUpdateConfigurationKey, false)
+			run: (accessor: ServicesAccessor) => accessor.get(IExtensionsWorkbenchService).updateAutoUpdateForAllExtensions(false)
 		});
 
 		this.registerExtensionAction({
@@ -711,37 +685,10 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 			],
 			icon: installWorkspaceRecommendedIcon,
 			run: async () => {
-				const outdated = this.extensionsWorkbenchService.outdated;
-				const results = await this.extensionsWorkbenchService.updateAll();
-				results.forEach((result) => {
-					if (result.error) {
-						const extension: IExtension | undefined = outdated.find((extension) => areSameExtensions(extension.identifier, result.identifier));
-						if (extension) {
-							runAction(this.instantiationService.createInstance(PromptExtensionInstallFailureAction, extension, extension.latestVersion, InstallOperation.Update, result.error));
-						}
-					}
-				});
+				await this.extensionsWorkbenchService.updateAll();
 			}
 		});
 
-		this.registerExtensionAction({
-			id: 'workbench.extensions.action.disableAutoUpdate',
-			title: localize2('disableAutoUpdate', 'Disable Auto Update for All Extensions'),
-			category: ExtensionsLocalizedLabel,
-			f1: true,
-			precondition: CONTEXT_HAS_GALLERY,
-			run: (accessor: ServicesAccessor) => accessor.get(IConfigurationService).updateValue(AutoUpdateConfigurationKey, false)
-		});
-
-		this.registerExtensionAction({
-			id: 'workbench.extensions.action.enableAutoUpdate',
-			title: localize2('enableAutoUpdate', 'Enable Auto Update for All Extensions'),
-			category: ExtensionsLocalizedLabel,
-			f1: true,
-			precondition: CONTEXT_HAS_GALLERY,
-			run: (accessor: ServicesAccessor) => accessor.get(IConfigurationService).updateValue(AutoUpdateConfigurationKey, true)
-		});
-
 		this.registerExtensionAction({
 			id: 'workbench.extensions.action.enableAll',
 			title: localize2('enableAll', 'Enable All Extensions'),
@@ -854,29 +801,51 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 				when: ContextKeyExpr.and(ResourceContextKey.Extension.isEqualTo('.vsix'), ContextKeyExpr.or(CONTEXT_HAS_LOCAL_SERVER, CONTEXT_HAS_REMOTE_SERVER)),
 			}],
 			run: async (accessor: ServicesAccessor, resources: URI[] | URI) => {
-				const extensionService = accessor.get(IExtensionService);
 				const extensionsWorkbenchService = accessor.get(IExtensionsWorkbenchService);
 				const hostService = accessor.get(IHostService);
 				const notificationService = accessor.get(INotificationService);
 
-				const extensions = Array.isArray(resources) ? resources : [resources];
-				await Promises.settled(extensions.map(async (vsix) => await extensionsWorkbenchService.install(vsix)))
-					.then(async (extensions) => {
-						for (const extension of extensions) {
-							const requireReload = !(extension.local && extensionService.canAddExtension(toExtensionDescription(extension.local)));
-							const message = requireReload ? localize('InstallVSIXAction.successReload', "Completed installing {0} extension from VSIX. Please reload Visual Studio Code to enable it.", extension.displayName || extension.name)
-								: localize('InstallVSIXAction.success', "Completed installing {0} extension from VSIX.", extension.displayName || extension.name);
-							const actions = requireReload ? [{
-								label: localize('InstallVSIXAction.reloadNow', "Reload Now"),
-								run: () => hostService.reload()
-							}] : [];
-							notificationService.prompt(
-								Severity.Info,
-								message,
-								actions
-							);
-						}
-					});
+				const vsixs = Array.isArray(resources) ? resources : [resources];
+				const result = await Promise.allSettled(vsixs.map(async (vsix) => await extensionsWorkbenchService.install(vsix, { installGivenVersion: true })));
+				let error: Error | undefined, requireReload = false, requireRestart = false;
+				for (const r of result) {
+					if (r.status === 'rejected') {
+						error = new Error(r.reason);
+						break;
+					}
+					requireReload = requireReload || r.value.runtimeState?.action === ExtensionRuntimeActionType.ReloadWindow;
+					requireRestart = requireRestart || r.value.runtimeState?.action === ExtensionRuntimeActionType.RestartExtensions;
+				}
+				if (error) {
+					throw error;
+				}
+				if (requireReload) {
+					notificationService.prompt(
+						Severity.Info,
+						localize('InstallVSIXAction.successReload', "Completed installing extension from VSIX. Please reload Visual Studio Code to enable it."),
+						[{
+							label: localize('InstallVSIXAction.reloadNow', "Reload Now"),
+							run: () => hostService.reload()
+						}]
+					);
+				}
+				else if (requireRestart) {
+					notificationService.prompt(
+						Severity.Info,
+						localize('InstallVSIXAction.successRestart', "Completed installing extension from VSIX. Please restart extensions to enable it."),
+						[{
+							label: localize('InstallVSIXAction.restartExtensions', "Restart Extensions"),
+							run: () => extensionsWorkbenchService.updateRunningExtensions()
+						}]
+					);
+				}
+				else {
+					notificationService.prompt(
+						Severity.Info,
+						localize('InstallVSIXAction.successNoReload', "Completed installing extension."),
+						[]
+					);
+				}
 			}
 		});
 
@@ -956,7 +925,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 			menuTitles: {
 				[extensionsFilterSubMenu.id]: localize('featured filter', "Featured")
 			},
-			run: () => runAction(this.instantiationService.createInstance(SearchExtensionsAction, '@featured '))
+			run: () => this.extensionsWorkbenchService.openSearch('@featured ')
 		});
 
 		this.registerExtensionAction({
@@ -975,7 +944,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 			menuTitles: {
 				[extensionsFilterSubMenu.id]: localize('most popular filter', "Most Popular")
 			},
-			run: () => runAction(this.instantiationService.createInstance(SearchExtensionsAction, '@popular '))
+			run: () => this.extensionsWorkbenchService.openSearch('@popular ')
 		});
 
 		this.registerExtensionAction({
@@ -994,7 +963,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 			menuTitles: {
 				[extensionsFilterSubMenu.id]: localize('most popular recommended', "Recommended")
 			},
-			run: () => runAction(this.instantiationService.createInstance(SearchExtensionsAction, '@recommended '))
+			run: () => this.extensionsWorkbenchService.openSearch('@recommended ')
 		});
 
 		this.registerExtensionAction({
@@ -1013,7 +982,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 			menuTitles: {
 				[extensionsFilterSubMenu.id]: localize('recently published filter', "Recently Published")
 			},
-			run: () => runAction(this.instantiationService.createInstance(SearchExtensionsAction, '@recentlyPublished '))
+			run: () => this.extensionsWorkbenchService.openSearch('@recentlyPublished ')
 		});
 
 		const extensionsCategoryFilterSubMenu = new MenuId('extensionsCategoryFilterSubMenu');
@@ -1034,7 +1003,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 					when: CONTEXT_HAS_GALLERY,
 					order: index,
 				}],
-				run: () => runAction(this.instantiationService.createInstance(SearchExtensionsAction, `@category:"${category.toLowerCase()}"`))
+				run: () => this.extensionsWorkbenchService.openSearch(`@category:"${category.toLowerCase()}"`)
 			});
 		});
 
@@ -1053,7 +1022,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 			menuTitles: {
 				[extensionsFilterSubMenu.id]: localize('builtin filter', "Built-in")
 			},
-			run: () => runAction(this.instantiationService.createInstance(SearchExtensionsAction, '@builtin '))
+			run: () => this.extensionsWorkbenchService.openSearch('@builtin ')
 		});
 
 		this.registerExtensionAction({
@@ -1071,7 +1040,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 			menuTitles: {
 				[extensionsFilterSubMenu.id]: localize('extension updates filter', "Updates")
 			},
-			run: () => runAction(this.instantiationService.createInstance(SearchExtensionsAction, '@updates'))
+			run: () => this.extensionsWorkbenchService.openSearch('@updates')
 		});
 
 		this.registerExtensionAction({
@@ -1090,7 +1059,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 			menuTitles: {
 				[extensionsFilterSubMenu.id]: localize('workspace unsupported filter', "Workspace Unsupported")
 			},
-			run: () => runAction(this.instantiationService.createInstance(SearchExtensionsAction, '@workspaceUnsupported'))
+			run: () => this.extensionsWorkbenchService.openSearch('@workspaceUnsupported')
 		});
 
 		this.registerExtensionAction({
@@ -1108,7 +1077,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 			menuTitles: {
 				[extensionsFilterSubMenu.id]: localize('enabled filter', "Enabled")
 			},
-			run: () => runAction(this.instantiationService.createInstance(SearchExtensionsAction, '@enabled '))
+			run: () => this.extensionsWorkbenchService.openSearch('@enabled ')
 		});
 
 		this.registerExtensionAction({
@@ -1126,7 +1095,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 			menuTitles: {
 				[extensionsFilterSubMenu.id]: localize('disabled filter', "Disabled")
 			},
-			run: () => runAction(this.instantiationService.createInstance(SearchExtensionsAction, '@disabled '))
+			run: () => this.extensionsWorkbenchService.openSearch('@disabled ')
 		});
 
 		const extensionsSortSubMenu = new MenuId('extensionsSortSubMenu');
@@ -1156,11 +1125,10 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 				}],
 				toggled: ExtensionsSortByContext.isEqualTo(id),
 				run: async () => {
-					const viewlet = await this.paneCompositeService.openPaneComposite(VIEWLET_ID, ViewContainerLocation.Sidebar, true);
-					const extensionsViewPaneContainer = viewlet?.getViewPaneContainer() as IExtensionsViewPaneContainer;
-					const currentQuery = Query.parse(extensionsViewPaneContainer.searchValue || '');
-					extensionsViewPaneContainer.search(new Query(currentQuery.value, id).toString());
-					extensionsViewPaneContainer.focus();
+					const extensionsViewPaneContainer = ((await this.viewsService.openViewContainer(VIEWLET_ID, true))?.getViewPaneContainer()) as IExtensionsViewPaneContainer | undefined;
+					const currentQuery = Query.parse(extensionsViewPaneContainer?.searchValue ?? '');
+					extensionsViewPaneContainer?.search(new Query(currentQuery.value, id).toString());
+					extensionsViewPaneContainer?.focus();
 				}
 			});
 		});
@@ -1364,18 +1332,23 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 			id: ToggleAutoUpdateForExtensionAction.ID,
 			title: ToggleAutoUpdateForExtensionAction.LABEL,
 			category: ExtensionsLocalizedLabel,
+			precondition: ContextKeyExpr.and(ContextKeyExpr.or(ContextKeyExpr.notEquals(`config.${AutoUpdateConfigurationKey}`, 'onlyEnabledExtensions'), ContextKeyExpr.equals('isExtensionEnabled', true)), ContextKeyExpr.not('extensionDisallowInstall')),
 			menu: {
 				id: MenuId.ExtensionContext,
 				group: UPDATE_ACTIONS_GROUP,
 				order: 1,
-				when: ContextKeyExpr.and(ContextKeyExpr.not('inExtensionEditor'), ContextKeyExpr.equals('extensionStatus', 'installed'), ContextKeyExpr.not('isBuiltinExtension'), ContextKeyExpr.or(ContextKeyExpr.equals(`config.${AutoUpdateConfigurationKey}`, 'onlySelectedExtensions'), ContextKeyExpr.equals(`config.${AutoUpdateConfigurationKey}`, false)),)
+				when: ContextKeyExpr.and(
+					ContextKeyExpr.not('inExtensionEditor'),
+					ContextKeyExpr.equals('extensionStatus', 'installed'),
+					ContextKeyExpr.not('isBuiltinExtension'),
+				)
 			},
 			run: async (accessor: ServicesAccessor, id: string) => {
 				const instantiationService = accessor.get(IInstantiationService);
 				const extensionWorkbenchService = accessor.get(IExtensionsWorkbenchService);
 				const extension = extensionWorkbenchService.local.find(e => areSameExtensions(e.identifier, { id }));
 				if (extension) {
-					const action = instantiationService.createInstance(ToggleAutoUpdateForExtensionAction, false, []);
+					const action = instantiationService.createInstance(ToggleAutoUpdateForExtensionAction);
 					action.extension = extension;
 					return action.run();
 				}
@@ -1386,11 +1359,12 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 			id: ToggleAutoUpdatesForPublisherAction.ID,
 			title: { value: ToggleAutoUpdatesForPublisherAction.LABEL, original: 'Auto Update (Publisher)' },
 			category: ExtensionsLocalizedLabel,
+			precondition: ContextKeyExpr.equals(`config.${AutoUpdateConfigurationKey}`, false),
 			menu: {
 				id: MenuId.ExtensionContext,
 				group: UPDATE_ACTIONS_GROUP,
 				order: 2,
-				when: ContextKeyExpr.and(ContextKeyExpr.equals('extensionStatus', 'installed'), ContextKeyExpr.not('isBuiltinExtension'), ContextKeyExpr.or(ContextKeyExpr.equals(`config.${AutoUpdateConfigurationKey}`, 'onlySelectedExtensions'), ContextKeyExpr.equals(`config.${AutoUpdateConfigurationKey}`, false)),)
+				when: ContextKeyExpr.and(ContextKeyExpr.equals('extensionStatus', 'installed'), ContextKeyExpr.not('isBuiltinExtension'))
 			},
 			run: async (accessor: ServicesAccessor, id: string) => {
 				const instantiationService = accessor.get(IInstantiationService);
@@ -1467,6 +1441,94 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 			}
 		});
 
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.installUnsigned',
+			title: localize('install', "Install"),
+			menu: {
+				id: MenuId.ExtensionContext,
+				group: '0_install',
+				when: ContextKeyExpr.and(ContextKeyExpr.equals('extensionStatus', 'uninstalled'), ContextKeyExpr.has('isGalleryExtension'), ContextKeyExpr.not('extensionDisallowInstall'), ContextKeyExpr.has('extensionIsUnsigned')),
+				order: 1
+			},
+			run: async (accessor: ServicesAccessor, extensionId: string) => {
+				const instantiationService = accessor.get(IInstantiationService);
+				const extension = this.extensionsWorkbenchService.local.filter(e => areSameExtensions(e.identifier, { id: extensionId }))[0]
+					|| (await this.extensionsWorkbenchService.getExtensions([{ id: extensionId }], CancellationToken.None))[0];
+				if (extension) {
+					const action = instantiationService.createInstance(InstallAction, { installPreReleaseVersion: this.extensionsWorkbenchService.preferPreReleases });
+					action.extension = extension;
+					return action.run();
+				}
+			}
+		});
+
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.installAndDonotSync',
+			title: localize('install installAndDonotSync', "Install (Do not Sync)"),
+			menu: {
+				id: MenuId.ExtensionContext,
+				group: '0_install',
+				when: ContextKeyExpr.and(ContextKeyExpr.equals('extensionStatus', 'uninstalled'), ContextKeyExpr.has('isGalleryExtension'), ContextKeyExpr.not('extensionDisallowInstall'), CONTEXT_SYNC_ENABLEMENT),
+				order: 1
+			},
+			run: async (accessor: ServicesAccessor, extensionId: string) => {
+				const instantiationService = accessor.get(IInstantiationService);
+				const extension = this.extensionsWorkbenchService.local.filter(e => areSameExtensions(e.identifier, { id: extensionId }))[0]
+					|| (await this.extensionsWorkbenchService.getExtensions([{ id: extensionId }], CancellationToken.None))[0];
+				if (extension) {
+					const action = instantiationService.createInstance(InstallAction, {
+						installPreReleaseVersion: this.extensionsWorkbenchService.preferPreReleases,
+						isMachineScoped: true,
+					});
+					action.extension = extension;
+					return action.run();
+				}
+			}
+		});
+
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.installPrereleaseAndDonotSync',
+			title: localize('installPrereleaseAndDonotSync', "Install Pre-Release (Do not Sync)"),
+			menu: {
+				id: MenuId.ExtensionContext,
+				group: '0_install',
+				when: ContextKeyExpr.and(ContextKeyExpr.equals('extensionStatus', 'uninstalled'), ContextKeyExpr.has('isGalleryExtension'), ContextKeyExpr.has('extensionHasPreReleaseVersion'), ContextKeyExpr.not('extensionDisallowInstall'), CONTEXT_SYNC_ENABLEMENT),
+				order: 2
+			},
+			run: async (accessor: ServicesAccessor, extensionId: string) => {
+				const instantiationService = accessor.get(IInstantiationService);
+				const extension = this.extensionsWorkbenchService.local.filter(e => areSameExtensions(e.identifier, { id: extensionId }))[0]
+					|| (await this.extensionsWorkbenchService.getExtensions([{ id: extensionId }], CancellationToken.None))[0];
+				if (extension) {
+					const action = instantiationService.createInstance(InstallAction, {
+						isMachineScoped: true,
+						preRelease: true
+					});
+					action.extension = extension;
+					return action.run();
+				}
+			}
+		});
+
+		this.registerExtensionAction({
+			id: InstallAnotherVersionAction.ID,
+			title: InstallAnotherVersionAction.LABEL,
+			menu: {
+				id: MenuId.ExtensionContext,
+				group: '0_install',
+				when: ContextKeyExpr.and(ContextKeyExpr.equals('extensionStatus', 'uninstalled'), ContextKeyExpr.has('isGalleryExtension'), ContextKeyExpr.not('extensionDisallowInstall')),
+				order: 3
+			},
+			run: async (accessor: ServicesAccessor, extensionId: string) => {
+				const instantiationService = accessor.get(IInstantiationService);
+				const extension = this.extensionsWorkbenchService.local.filter(e => areSameExtensions(e.identifier, { id: extensionId }))[0]
+					|| (await this.extensionsWorkbenchService.getExtensions([{ id: extensionId }], CancellationToken.None))[0];
+				if (extension) {
+					return instantiationService.createInstance(InstallAnotherVersionAction, extension, false).run();
+				}
+			}
+		});
+
 		this.registerExtensionAction({
 			id: 'workbench.extensions.action.copyExtension',
 			title: localize2('workbench.extensions.action.copyExtension', 'Copy'),
@@ -1503,7 +1565,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 
 		this.registerExtensionAction({
 			id: 'workbench.extensions.action.configure',
-			title: localize2('workbench.extensions.action.configure', 'Extension Settings'),
+			title: localize2('workbench.extensions.action.configure', 'Settings'),
 			menu: {
 				id: MenuId.ExtensionContext,
 				group: '2_configure',
@@ -1513,9 +1575,21 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 			run: async (accessor: ServicesAccessor, id: string) => accessor.get(IPreferencesService).openSettings({ jsonEditor: false, query: `@ext:${id}` })
 		});
 
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.manageAccountPreferences',
+			title: localize2('workbench.extensions.action.changeAccountPreference', "Account Preferences"),
+			menu: {
+				id: MenuId.ExtensionContext,
+				group: '2_configure',
+				when: ContextKeyExpr.and(ContextKeyExpr.equals('extensionStatus', 'installed'), ContextKeyExpr.has('extensionHasAccountPreferences')),
+				order: 2,
+			},
+			run: (accessor: ServicesAccessor, id: string) => accessor.get(ICommandService).executeCommand('_manageAccountPreferencesForExtension', id)
+		});
+
 		this.registerExtensionAction({
 			id: 'workbench.extensions.action.configureKeybindings',
-			title: localize2('workbench.extensions.action.configureKeybindings', 'Extension Keyboard Shortcuts'),
+			title: localize2('workbench.extensions.action.configureKeybindings', 'Keyboard Shortcuts'),
 			menu: {
 				id: MenuId.ExtensionContext,
 				group: '2_configure',
@@ -1550,7 +1624,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 			menu: {
 				id: MenuId.ExtensionContext,
 				group: '2_configure',
-				when: ContextKeyExpr.and(CONTEXT_SYNC_ENABLEMENT, ContextKeyExpr.equals('isWorkspaceScopedExtension', false)),
+				when: ContextKeyExpr.and(ContextKeyExpr.equals('extensionStatus', 'installed'), CONTEXT_SYNC_ENABLEMENT, ContextKeyExpr.equals('isWorkspaceScopedExtension', false)),
 				order: 4
 			},
 			run: async (accessor: ServicesAccessor, id: string) => {
@@ -1748,7 +1822,6 @@ workbenchRegistry.registerWorkbenchContribution(ExtensionDependencyChecker, Life
 workbenchRegistry.registerWorkbenchContribution(ExtensionEnablementWorkspaceTrustTransitionParticipant, LifecyclePhase.Restored);
 workbenchRegistry.registerWorkbenchContribution(ExtensionsCompletionItemsProvider, LifecyclePhase.Restored);
 workbenchRegistry.registerWorkbenchContribution(UnsupportedExtensionsMigrationContrib, LifecyclePhase.Eventually);
-workbenchRegistry.registerWorkbenchContribution(DeprecatedExtensionsChecker, LifecyclePhase.Eventually);
 if (isWeb) {
 	workbenchRegistry.registerWorkbenchContribution(ExtensionStorageCleaner, LifecyclePhase.Eventually);
 }
@@ -1756,3 +1829,14 @@ if (isWeb) {
 
 // Running Extensions
 registerAction2(ShowRuntimeExtensionsAction);
+
+Registry.as<IConfigurationMigrationRegistry>(ConfigurationMigrationExtensions.ConfigurationMigration)
+	.registerConfigurationMigrations([{
+		key: AutoUpdateConfigurationKey,
+		migrateFn: (value, accessor) => {
+			if (value === 'onlySelectedExtensions') {
+				return { value: false };
+			}
+			return [];
+		}
+	}]);
diff --git a/src/vs/workbench/contrib/extensions/browser/extensions.web.contribution.ts b/src/vs/workbench/contrib/extensions/browser/extensions.web.contribution.ts
index a7d69618693..22fa21c50b2 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensions.web.contribution.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensions.web.contribution.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { EditorPaneDescriptor, IEditorPaneRegistry } from 'vs/workbench/browser/editor';
-import { RuntimeExtensionsEditor } from 'vs/workbench/contrib/extensions/browser/browserRuntimeExtensionsEditor';
-import { RuntimeExtensionsInput } from 'vs/workbench/contrib/extensions/common/runtimeExtensionsInput';
-import { EditorExtensions } from 'vs/workbench/common/editor';
+import { localize } from '../../../../nls.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { EditorPaneDescriptor, IEditorPaneRegistry } from '../../../browser/editor.js';
+import { RuntimeExtensionsEditor } from './browserRuntimeExtensionsEditor.js';
+import { RuntimeExtensionsInput } from '../common/runtimeExtensionsInput.js';
+import { EditorExtensions } from '../../../common/editor.js';
 
 // Running Extensions
 Registry.as<IEditorPaneRegistry>(EditorExtensions.EditorPane).registerEditorPane(
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
index fc174208ee6..3930f44a866 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
@@ -3,81 +3,81 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/extensionActions';
-import { localize, localize2 } from 'vs/nls';
-import { IAction, Action, Separator, SubmenuAction } from 'vs/base/common/actions';
-import { Delayer, Promises, Throttler } from 'vs/base/common/async';
-import * as DOM from 'vs/base/browser/dom';
-import { Emitter, Event } from 'vs/base/common/event';
-import * as json from 'vs/base/common/json';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { disposeIfDisposable } from 'vs/base/common/lifecycle';
-import { IExtension, ExtensionState, IExtensionsWorkbenchService, VIEWLET_ID, IExtensionsViewPaneContainer, IExtensionContainer, TOGGLE_IGNORE_EXTENSION_ACTION_ID, SELECT_INSTALL_VSIX_EXTENSION_COMMAND_ID, THEME_ACTIONS_GROUP, INSTALL_ACTIONS_GROUP, UPDATE_ACTIONS_GROUP, AutoUpdateConfigurationKey, AutoUpdateConfigurationValue, ExtensionEditorTab, ExtensionRuntimeActionType, IExtensionArg } from 'vs/workbench/contrib/extensions/common/extensions';
-import { ExtensionsConfigurationInitialContent } from 'vs/workbench/contrib/extensions/common/extensionsFileTemplate';
-import { IGalleryExtension, IExtensionGalleryService, ILocalExtension, InstallOptions, InstallOperation, TargetPlatformToString, ExtensionManagementErrorCode } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionManagementServer } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { ExtensionRecommendationReason, IExtensionIgnoredRecommendationsService, IExtensionRecommendationsService } from 'vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
-import { areSameExtensions, getExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { ExtensionType, ExtensionIdentifier, IExtensionDescription, IExtensionManifest, isLanguagePackExtension, getWorkspaceSupportTypeMessage, TargetPlatform, isApplicationScopedExtension } from 'vs/platform/extensions/common/extensions';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IFileService, IFileContent } from 'vs/platform/files/common/files';
-import { IWorkspaceContextService, WorkbenchState, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IExtensionService, toExtension, toExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
-import { URI } from 'vs/base/common/uri';
-import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { registerThemingParticipant, IColorTheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { buttonBackground, buttonForeground, buttonHoverBackground, registerColor, editorWarningForeground, editorInfoForeground, editorErrorForeground, buttonSeparator } from 'vs/platform/theme/common/colorRegistry';
-import { IJSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditing';
-import { ITextEditorSelection } from 'vs/platform/editor/common/editor';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { MenuId, IMenuService, MenuItemAction, SubmenuItemAction } from 'vs/platform/actions/common/actions';
-import { PICK_WORKSPACE_FOLDER_COMMAND_ID } from 'vs/workbench/browser/actions/workspaceCommands';
-import { INotificationService, IPromptChoice, Severity } from 'vs/platform/notification/common/notification';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IQuickPickItem, IQuickInputService, QuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { alert } from 'vs/base/browser/ui/aria/aria';
-import { IWorkbenchThemeService, IWorkbenchTheme, IWorkbenchColorTheme, IWorkbenchFileIconTheme, IWorkbenchProductIconTheme } from 'vs/workbench/services/themes/common/workbenchThemeService';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IDialogService, IPromptButton } from 'vs/platform/dialogs/common/dialogs';
-import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
-import { IActionViewItemOptions, ActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { EXTENSIONS_CONFIG, IExtensionsConfigContent } from 'vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig';
-import { getErrorMessage, isCancellationError } from 'vs/base/common/errors';
-import { IUserDataSyncEnablementService } from 'vs/platform/userDataSync/common/userDataSync';
-import { ActionWithDropdownActionViewItem, IActionWithDropdownActionViewItemOptions } from 'vs/base/browser/ui/dropdown/dropdownActionViewItem';
-import { IContextMenuProvider } from 'vs/base/browser/contextmenu';
-import { ILogService } from 'vs/platform/log/common/log';
-import { errorIcon, infoIcon, manageExtensionIcon, syncEnabledIcon, syncIgnoredIcon, trustIcon, warningIcon } from 'vs/workbench/contrib/extensions/browser/extensionsIcons';
-import { isIOS, isWeb, language } from 'vs/base/common/platform';
-import { IExtensionManifestPropertiesService } from 'vs/workbench/services/extensions/common/extensionManifestPropertiesService';
-import { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService } from 'vs/platform/workspace/common/workspaceTrust';
-import { isVirtualWorkspace } from 'vs/platform/workspace/common/virtualWorkspace';
-import { escapeMarkdownSyntaxTokens, IMarkdownString, MarkdownString } from 'vs/base/common/htmlContent';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { ViewContainerLocation } from 'vs/workbench/common/views';
-import { fromNow } from 'vs/base/common/date';
-import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
-import { getLocale } from 'vs/platform/languagePacks/common/languagePacks';
-import { ILocaleService } from 'vs/workbench/services/localization/common/locale';
-import { isString } from 'vs/base/common/types';
-import { showWindowLogActionId } from 'vs/workbench/services/log/common/logConstants';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { Extensions, IExtensionFeaturesManagementService, IExtensionFeaturesRegistry } from 'vs/workbench/services/extensionManagement/common/extensionFeatures';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IUpdateService } from 'vs/platform/update/common/update';
+import './media/extensionActions.css';
+import { localize, localize2 } from '../../../../nls.js';
+import { IAction, Action, Separator, SubmenuAction, IActionChangeEvent } from '../../../../base/common/actions.js';
+import { Delayer, Promises, Throttler } from '../../../../base/common/async.js';
+import * as DOM from '../../../../base/browser/dom.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import * as json from '../../../../base/common/json.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { disposeIfDisposable } from '../../../../base/common/lifecycle.js';
+import { IExtension, ExtensionState, IExtensionsWorkbenchService, IExtensionContainer, TOGGLE_IGNORE_EXTENSION_ACTION_ID, SELECT_INSTALL_VSIX_EXTENSION_COMMAND_ID, THEME_ACTIONS_GROUP, INSTALL_ACTIONS_GROUP, UPDATE_ACTIONS_GROUP, ExtensionEditorTab, ExtensionRuntimeActionType, IExtensionArg, AutoUpdateConfigurationKey } from '../common/extensions.js';
+import { ExtensionsConfigurationInitialContent } from '../common/extensionsFileTemplate.js';
+import { IGalleryExtension, IExtensionGalleryService, ILocalExtension, InstallOptions, InstallOperation, TargetPlatformToString, ExtensionManagementErrorCode } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionManagementServer, IWorkbenchExtensionManagementService } from '../../../services/extensionManagement/common/extensionManagement.js';
+import { ExtensionRecommendationReason, IExtensionIgnoredRecommendationsService, IExtensionRecommendationsService } from '../../../services/extensionRecommendations/common/extensionRecommendations.js';
+import { areSameExtensions, getExtensionId } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { ExtensionType, ExtensionIdentifier, IExtensionDescription, IExtensionManifest, isLanguagePackExtension, getWorkspaceSupportTypeMessage, TargetPlatform, isApplicationScopedExtension } from '../../../../platform/extensions/common/extensions.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IFileService, IFileContent } from '../../../../platform/files/common/files.js';
+import { IWorkspaceContextService, WorkbenchState, IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { IExtensionService, toExtension, toExtensionDescription } from '../../../services/extensions/common/extensions.js';
+import { URI } from '../../../../base/common/uri.js';
+import { CommandsRegistry, ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { registerThemingParticipant, IColorTheme, ICssStyleCollector } from '../../../../platform/theme/common/themeService.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { buttonBackground, buttonForeground, buttonHoverBackground, registerColor, editorWarningForeground, editorInfoForeground, editorErrorForeground, buttonSeparator } from '../../../../platform/theme/common/colorRegistry.js';
+import { IJSONEditingService } from '../../../services/configuration/common/jsonEditing.js';
+import { ITextEditorSelection } from '../../../../platform/editor/common/editor.js';
+import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { MenuId, IMenuService, MenuItemAction, SubmenuItemAction } from '../../../../platform/actions/common/actions.js';
+import { PICK_WORKSPACE_FOLDER_COMMAND_ID } from '../../../browser/actions/workspaceCommands.js';
+import { INotificationService, IPromptChoice, Severity } from '../../../../platform/notification/common/notification.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IQuickPickItem, IQuickInputService, QuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { alert } from '../../../../base/browser/ui/aria/aria.js';
+import { IWorkbenchThemeService, IWorkbenchTheme, IWorkbenchColorTheme, IWorkbenchFileIconTheme, IWorkbenchProductIconTheme } from '../../../services/themes/common/workbenchThemeService.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IDialogService, IPromptButton } from '../../../../platform/dialogs/common/dialogs.js';
+import { IProgressService, ProgressLocation } from '../../../../platform/progress/common/progress.js';
+import { IActionViewItemOptions, ActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { EXTENSIONS_CONFIG, IExtensionsConfigContent } from '../../../services/extensionRecommendations/common/workspaceExtensionsConfig.js';
+import { getErrorMessage, isCancellationError } from '../../../../base/common/errors.js';
+import { IUserDataSyncEnablementService } from '../../../../platform/userDataSync/common/userDataSync.js';
+import { IContextMenuProvider } from '../../../../base/browser/contextmenu.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { errorIcon, infoIcon, manageExtensionIcon, syncEnabledIcon, syncIgnoredIcon, trustIcon, warningIcon } from './extensionsIcons.js';
+import { isIOS, isWeb, language } from '../../../../base/common/platform.js';
+import { IExtensionManifestPropertiesService } from '../../../services/extensions/common/extensionManifestPropertiesService.js';
+import { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService } from '../../../../platform/workspace/common/workspaceTrust.js';
+import { isVirtualWorkspace } from '../../../../platform/workspace/common/virtualWorkspace.js';
+import { escapeMarkdownSyntaxTokens, IMarkdownString, MarkdownString } from '../../../../base/common/htmlContent.js';
+import { fromNow } from '../../../../base/common/date.js';
+import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
+import { getLocale } from '../../../../platform/languagePacks/common/languagePacks.js';
+import { ILocaleService } from '../../../services/localization/common/locale.js';
+import { isString } from '../../../../base/common/types.js';
+import { showWindowLogActionId } from '../../../services/log/common/logConstants.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { Extensions, IExtensionFeaturesManagementService, IExtensionFeaturesRegistry } from '../../../services/extensionManagement/common/extensionFeatures.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IUpdateService } from '../../../../platform/update/common/update.js';
+import { ActionWithDropdownActionViewItem, IActionWithDropdownActionViewItemOptions } from '../../../../base/browser/ui/dropdown/dropdownActionViewItem.js';
+import { IAuthenticationUsageService } from '../../../services/authentication/browser/authenticationUsageService.js';
 
 export class PromptExtensionInstallFailureAction extends Action {
 
 	constructor(
 		private readonly extension: IExtension,
+		private readonly options: InstallOptions | undefined,
 		private readonly version: string,
 		private readonly installOperation: InstallOperation,
 		private readonly error: Error,
@@ -134,24 +134,46 @@ export class PromptExtensionInstallFailureAction extends Action {
 			return;
 		}
 
-		if ([ExtensionManagementErrorCode.Incompatible, ExtensionManagementErrorCode.IncompatibleTargetPlatform, ExtensionManagementErrorCode.Malicious, ExtensionManagementErrorCode.Deprecated].includes(<ExtensionManagementErrorCode>this.error.name)) {
+		if ([ExtensionManagementErrorCode.Incompatible, ExtensionManagementErrorCode.IncompatibleApi, ExtensionManagementErrorCode.IncompatibleTargetPlatform, ExtensionManagementErrorCode.Malicious, ExtensionManagementErrorCode.Deprecated].includes(<ExtensionManagementErrorCode>this.error.name)) {
 			await this.dialogService.info(getErrorMessage(this.error));
 			return;
 		}
 
-		if (ExtensionManagementErrorCode.Signature === (<ExtensionManagementErrorCode>this.error.name)) {
+		if (ExtensionManagementErrorCode.PackageNotSigned === (<ExtensionManagementErrorCode>this.error.name)) {
 			await this.dialogService.prompt({
 				type: 'error',
-				message: localize('signature verification failed', "{0} cannot verify the '{1}' extension. Are you sure you want to install it?", this.productService.nameLong, this.extension.displayName || this.extension.identifier.id),
+				message: localize('not signed', "'{0}' is an extension from an unknown source. Are you sure you want to install?", this.extension.displayName),
+				detail: getErrorMessage(this.error),
 				buttons: [{
 					label: localize('install anyway', "Install Anyway"),
 					run: () => {
-						const installAction = this.instantiationService.createInstance(InstallAction, { donotVerifySignature: true });
+						const installAction = this.instantiationService.createInstance(InstallAction, { ...this.options, donotVerifySignature: true, });
 						installAction.extension = this.extension;
 						return installAction.run();
 					}
 				}],
-				cancelButton: localize('cancel', "Cancel")
+				cancelButton: true
+			});
+			return;
+		}
+
+		if (ExtensionManagementErrorCode.SignatureVerificationFailed === (<ExtensionManagementErrorCode>this.error.name) || ExtensionManagementErrorCode.SignatureVerificationInternal === (<ExtensionManagementErrorCode>this.error.name)) {
+			await this.dialogService.prompt({
+				type: 'error',
+				message: localize('verification failed', "Cannot install '{0}' extension because {1} cannot verify the extension signature", this.extension.displayName, this.productService.nameLong),
+				detail: getErrorMessage(this.error),
+				buttons: [{
+					label: localize('learn more', "Learn More"),
+					run: () => this.openerService.open('https://code.visualstudio.com/docs/editor/extension-marketplace#_the-extension-signature-cannot-be-verified-by-vs-code')
+				}, {
+					label: localize('install donot verify', "Install Anyway (Don't Verify Signature)"),
+					run: () => {
+						const installAction = this.instantiationService.createInstance(InstallAction, { ...this.options, donotVerifySignature: true, });
+						installAction.extension = this.extension;
+						return installAction.run();
+					}
+				}],
+				cancelButton: true
 			});
 			return;
 		}
@@ -216,21 +238,52 @@ export class PromptExtensionInstallFailureAction extends Action {
 
 }
 
+export interface IExtensionActionChangeEvent extends IActionChangeEvent {
+	readonly hidden?: boolean;
+	readonly menuActions?: IAction[];
+}
+
 export abstract class ExtensionAction extends Action implements IExtensionContainer {
+
+	protected override _onDidChange = this._register(new Emitter<IExtensionActionChangeEvent>());
+	override readonly onDidChange = this._onDidChange.event;
+
 	static readonly EXTENSION_ACTION_CLASS = 'extension-action';
 	static readonly TEXT_ACTION_CLASS = `${ExtensionAction.EXTENSION_ACTION_CLASS} text`;
 	static readonly LABEL_ACTION_CLASS = `${ExtensionAction.EXTENSION_ACTION_CLASS} label`;
+	static readonly PROMINENT_LABEL_ACTION_CLASS = `${ExtensionAction.LABEL_ACTION_CLASS} prominent`;
 	static readonly ICON_ACTION_CLASS = `${ExtensionAction.EXTENSION_ACTION_CLASS} icon`;
+
 	private _extension: IExtension | null = null;
 	get extension(): IExtension | null { return this._extension; }
 	set extension(extension: IExtension | null) { this._extension = extension; this.update(); }
+
+	private _hidden: boolean = false;
+	get hidden(): boolean { return this._hidden; }
+	set hidden(hidden: boolean) {
+		if (this._hidden !== hidden) {
+			this._hidden = hidden;
+			this._onDidChange.fire({ hidden });
+		}
+	}
+
+	protected override _setEnabled(value: boolean): void {
+		super._setEnabled(value);
+		if (this.hideOnDisabled) {
+			this.hidden = !value;
+		}
+	}
+
+	protected hideOnDisabled: boolean = true;
+
 	abstract update(): void;
 }
 
-export class ActionWithDropDownAction extends ExtensionAction {
+export class ButtonWithDropDownExtensionAction extends ExtensionAction {
 
-	private action: IAction | undefined;
+	private primaryAction: IAction | undefined;
 
+	readonly menuActionClassNames: string[] = [];
 	private _menuActions: IAction[] = [];
 	get menuActions(): IAction[] { return [...this._menuActions]; }
 
@@ -246,10 +299,14 @@ export class ActionWithDropDownAction extends ExtensionAction {
 	protected readonly extensionActions: ExtensionAction[];
 
 	constructor(
-		id: string, label: string,
+		id: string,
+		clazz: string,
 		private readonly actionsGroups: ExtensionAction[][],
 	) {
-		super(id, label);
+		clazz = `${clazz} action-dropdown`;
+		super(id, undefined, clazz);
+		this.menuActionClassNames = clazz.split(' ');
+		this.hideOnDisabled = false;
 		this.extensionActions = actionsGroups.flat();
 		this.update();
 		this._register(Event.any(...this.extensionActions.map(a => a.onDidChange))(() => this.update(true)));
@@ -261,36 +318,35 @@ export class ActionWithDropDownAction extends ExtensionAction {
 			this.extensionActions.forEach(a => a.update());
 		}
 
-		const enabledActionsGroups = this.actionsGroups.map(actionsGroup => actionsGroup.filter(a => a.enabled));
+		const actionsGroups = this.actionsGroups.map(actionsGroup => actionsGroup.filter(a => !a.hidden));
 
 		let actions: IAction[] = [];
-		for (const enabledActions of enabledActionsGroups) {
-			if (enabledActions.length) {
-				actions = [...actions, ...enabledActions, new Separator()];
+		for (const visibleActions of actionsGroups) {
+			if (visibleActions.length) {
+				actions = [...actions, ...visibleActions, new Separator()];
 			}
 		}
 		actions = actions.length ? actions.slice(0, actions.length - 1) : actions;
 
-		this.action = actions[0];
+		this.primaryAction = actions[0];
 		this._menuActions = actions.length > 1 ? actions : [];
+		this._onDidChange.fire({ menuActions: this._menuActions });
 
-		this.enabled = !!this.action;
-		if (this.action) {
-			this.label = this.getLabel(this.action as ExtensionAction);
-			this.tooltip = this.action.tooltip;
+		if (this.primaryAction) {
+			this.hidden = false;
+			this.enabled = this.primaryAction.enabled;
+			this.label = this.getLabel(this.primaryAction as ExtensionAction);
+			this.tooltip = this.primaryAction.tooltip;
+		} else {
+			this.hidden = true;
+			this.enabled = false;
 		}
-
-		let clazz = (this.action || this.extensionActions[0])?.class || '';
-		clazz = clazz ? `${clazz} action-dropdown` : 'action-dropdown';
-		if (this._menuActions.length === 0) {
-			clazz += ' action-dropdown';
-		}
-		this.class = clazz;
 	}
 
-	override run(): Promise<void> {
-		const enabledActions = this.extensionActions.filter(a => a.enabled);
-		return enabledActions[0].run();
+	override async run(): Promise<void> {
+		if (this.enabled) {
+			await this.primaryAction?.run();
+		}
 	}
 
 	protected getLabel(action: ExtensionAction): string {
@@ -298,9 +354,42 @@ export class ActionWithDropDownAction extends ExtensionAction {
 	}
 }
 
+export class ButtonWithDropdownExtensionActionViewItem extends ActionWithDropdownActionViewItem {
+
+	constructor(
+		action: ButtonWithDropDownExtensionAction,
+		options: IActionViewItemOptions & IActionWithDropdownActionViewItemOptions,
+		contextMenuProvider: IContextMenuProvider
+	) {
+		super(null, action, options, contextMenuProvider);
+		this._register(action.onDidChange(e => {
+			if (e.hidden !== undefined || e.menuActions !== undefined) {
+				this.updateClass();
+			}
+		}));
+	}
+
+	override render(container: HTMLElement): void {
+		super.render(container);
+		this.updateClass();
+	}
+
+	protected override updateClass(): void {
+		super.updateClass();
+		if (this.element && this.dropdownMenuActionViewItem?.element) {
+			this.element.classList.toggle('hide', (<ButtonWithDropDownExtensionAction>this._action).hidden);
+			const isMenuEmpty = (<ButtonWithDropDownExtensionAction>this._action).menuActions.length === 0;
+			this.element.classList.toggle('empty', isMenuEmpty);
+			this.dropdownMenuActionViewItem.element.classList.toggle('hide', isMenuEmpty);
+		}
+	}
+
+}
+
 export class InstallAction extends ExtensionAction {
 
-	static readonly Class = `${ExtensionAction.LABEL_ACTION_CLASS} prominent install`;
+	static readonly CLASS = `${this.LABEL_ACTION_CLASS} prominent install`;
+	private static readonly HIDE = `${this.CLASS} hide`;
 
 	protected _manifest: IExtensionManifest | null = null;
 	set manifest(manifest: IExtensionManifest | null) {
@@ -323,8 +412,9 @@ export class InstallAction extends ExtensionAction {
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
 	) {
-		super('extensions.install', localize('install', "Install"), InstallAction.Class, false);
-		this.options = { ...options, isMachineScoped: false };
+		super('extensions.install', localize('install', "Install"), InstallAction.CLASS, false);
+		this.hideOnDisabled = false;
+		this.options = { isMachineScoped: false, ...options };
 		this.update();
 		this._register(this.labelService.onDidChangeFormatters(() => this.updateLabel(), this));
 	}
@@ -335,6 +425,8 @@ export class InstallAction extends ExtensionAction {
 
 	protected async computeAndUpdateEnablement(): Promise<void> {
 		this.enabled = false;
+		this.class = InstallAction.HIDE;
+		this.hidden = true;
 		if (!this.extension) {
 			return;
 		}
@@ -344,8 +436,19 @@ export class InstallAction extends ExtensionAction {
 		if (this.extensionsWorkbenchService.canSetLanguage(this.extension)) {
 			return;
 		}
-		if (this.extension.state === ExtensionState.Uninstalled && await this.extensionsWorkbenchService.canInstall(this.extension)) {
-			this.enabled = this.options.installPreReleaseVersion ? this.extension.hasPreReleaseVersion : this.extension.hasReleaseVersion;
+		if (this.extension.state !== ExtensionState.Uninstalled) {
+			return;
+		}
+		if (this.options.installPreReleaseVersion && !this.extension.hasPreReleaseVersion) {
+			return;
+		}
+		if (!this.options.installPreReleaseVersion && !this.extension.hasReleaseVersion) {
+			return;
+		}
+		this.hidden = false;
+		this.class = InstallAction.CLASS;
+		if (await this.extensionsWorkbenchService.canInstall(this.extension)) {
+			this.enabled = true;
 			this.updateLabel();
 		}
 	}
@@ -355,6 +458,29 @@ export class InstallAction extends ExtensionAction {
 			return;
 		}
 
+		if (this.extension.gallery && !this.extension.gallery.isSigned) {
+			const { result } = await this.dialogService.prompt({
+				type: Severity.Warning,
+				message: localize('not signed', "'{0}' is an extension from an unknown source. Are you sure you want to install?", this.extension.displayName),
+				detail: localize('not signed detail', "Extension is not signed."),
+				buttons: [
+					{
+						label: localize('install anyway', "Install Anyway"),
+						run: () => {
+							this.options.donotVerifySignature = true;
+							return true;
+						}
+					}
+				],
+				cancelButton: {
+					run: () => false
+				}
+			});
+			if (!result) {
+				return;
+			}
+		}
+
 		if (this.extension.deprecationInfo) {
 			let detail: string | MarkdownString = localize('deprecated message', "This extension is deprecated as it is no longer being maintained.");
 			enum DeprecationChoice {
@@ -473,7 +599,7 @@ export class InstallAction extends ExtensionAction {
 		try {
 			return await this.extensionsWorkbenchService.install(extension, this.options);
 		} catch (error) {
-			await this.instantiationService.createInstance(PromptExtensionInstallFailureAction, extension, extension.latestVersion, InstallOperation.Install, error).run();
+			await this.instantiationService.createInstance(PromptExtensionInstallFailureAction, extension, this.options, extension.latestVersion, InstallOperation.Install, error).run();
 			return undefined;
 		}
 	}
@@ -518,7 +644,7 @@ export class InstallAction extends ExtensionAction {
 
 }
 
-export class InstallDropdownAction extends ActionWithDropDownAction {
+export class InstallDropdownAction extends ButtonWithDropDownExtensionAction {
 
 	set manifest(manifest: IExtensionManifest | null) {
 		this.extensionActions.forEach(a => (<InstallAction>a).manifest = manifest);
@@ -529,7 +655,7 @@ export class InstallDropdownAction extends ActionWithDropDownAction {
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IExtensionsWorkbenchService extensionsWorkbenchService: IExtensionsWorkbenchService,
 	) {
-		super(`extensions.installActions`, '', [
+		super(`extensions.installActions`, InstallAction.CLASS, [
 			[
 				instantiationService.createInstance(InstallAction, { installPreReleaseVersion: extensionsWorkbenchService.preferPreReleases }),
 				instantiationService.createInstance(InstallAction, { installPreReleaseVersion: !extensionsWorkbenchService.preferPreReleases }),
@@ -562,8 +688,8 @@ export abstract class InstallInOtherServerAction extends ExtensionAction {
 	protected static readonly INSTALL_LABEL = localize('install', "Install");
 	protected static readonly INSTALLING_LABEL = localize('installing', "Installing");
 
-	private static readonly Class = `${ExtensionAction.LABEL_ACTION_CLASS} prominent install`;
-	private static readonly InstallingClass = `${ExtensionAction.LABEL_ACTION_CLASS} install installing`;
+	private static readonly Class = `${ExtensionAction.LABEL_ACTION_CLASS} prominent install-other-server`;
+	private static readonly InstallingClass = `${ExtensionAction.LABEL_ACTION_CLASS} install-other-server installing`;
 
 	updateWhenCounterExtensionChanges: boolean = true;
 
@@ -721,7 +847,7 @@ export class UninstallAction extends ExtensionAction {
 	static readonly UninstallLabel = localize('uninstallAction', "Uninstall");
 	private static readonly UninstallingLabel = localize('Uninstalling', "Uninstalling");
 
-	private static readonly UninstallClass = `${ExtensionAction.LABEL_ACTION_CLASS} uninstall`;
+	static readonly UninstallClass = `${ExtensionAction.LABEL_ACTION_CLASS} uninstall`;
 	private static readonly UnInstallingClass = `${ExtensionAction.LABEL_ACTION_CLASS} uninstall uninstalling`;
 
 	constructor(
@@ -774,28 +900,36 @@ export class UninstallAction extends ExtensionAction {
 			await this.extensionsWorkbenchService.uninstall(this.extension);
 			alert(localize('uninstallExtensionComplete', "Please reload Visual Studio Code to complete the uninstallation of the extension {0}.", this.extension.displayName));
 		} catch (error) {
-			this.dialogService.error(getErrorMessage(error));
+			if (!isCancellationError(error)) {
+				this.dialogService.error(getErrorMessage(error));
+			}
 		}
 	}
 }
 
-abstract class AbstractUpdateAction extends ExtensionAction {
+export class UpdateAction extends ExtensionAction {
 
-	private static readonly EnabledClass = `${ExtensionAction.LABEL_ACTION_CLASS} prominent update`;
-	private static readonly DisabledClass = `${AbstractUpdateAction.EnabledClass} disabled`;
+	private static readonly EnabledClass = `${this.LABEL_ACTION_CLASS} prominent update`;
+	private static readonly DisabledClass = `${this.EnabledClass} disabled`;
 
 	private readonly updateThrottler = new Throttler();
 
 	constructor(
-		id: string, label: string | undefined,
-		protected readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
+		private readonly verbose: boolean,
+		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
+		@IDialogService private readonly dialogService: IDialogService,
+		@IOpenerService private readonly openerService: IOpenerService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
 	) {
-		super(id, label, AbstractUpdateAction.DisabledClass, false);
+		super(`extensions.update`, localize('update', "Update"), UpdateAction.DisabledClass, false);
 		this.update();
 	}
 
 	update(): void {
 		this.updateThrottler.queue(() => this.computeAndUpdateEnablement());
+		if (this.extension) {
+			this.label = this.verbose ? localize('update to', "Update to v{0}", this.extension.latestVersion) : localize('update', "Update");
+		}
 	}
 
 	private async computeAndUpdateEnablement(): Promise<void> {
@@ -814,41 +948,56 @@ abstract class AbstractUpdateAction extends ExtensionAction {
 		const isInstalled = this.extension.state === ExtensionState.Installed;
 
 		this.enabled = canInstall && isInstalled && this.extension.outdated;
-		this.class = this.enabled ? AbstractUpdateAction.EnabledClass : AbstractUpdateAction.DisabledClass;
-	}
-}
-
-export class UpdateAction extends AbstractUpdateAction {
-
-	constructor(
-		private readonly verbose: boolean,
-		@IExtensionsWorkbenchService extensionsWorkbenchService: IExtensionsWorkbenchService,
-		@IInstantiationService protected readonly instantiationService: IInstantiationService,
-	) {
-		super(`extensions.update`, localize('update', "Update"), extensionsWorkbenchService);
-	}
-
-	override update(): void {
-		super.update();
-		if (this.extension) {
-			this.label = this.verbose ? localize('update to', "Update to v{0}", this.extension.latestVersion) : localize('update', "Update");
-		}
+		this.class = this.enabled ? UpdateAction.EnabledClass : UpdateAction.DisabledClass;
 	}
 
 	override async run(): Promise<any> {
 		if (!this.extension) {
 			return;
 		}
+
+		const consent = await this.extensionsWorkbenchService.shouldRequireConsentToUpdate(this.extension);
+		if (consent) {
+			const { result } = await this.dialogService.prompt<'update' | 'review' | 'cancel'>({
+				type: 'warning',
+				title: localize('updateExtensionConsentTitle', "Update {0} Extension", this.extension.displayName),
+				message: localize('updateExtensionConsent', "{0}\n\nWould you like to update the extension?", consent),
+				buttons: [{
+					label: localize('update', "Update"),
+					run: () => 'update'
+				}, {
+					label: localize('review', "Review"),
+					run: () => 'review'
+				}, {
+					label: localize('cancel', "Cancel"),
+					run: () => 'cancel'
+				}]
+			});
+			if (result === 'cancel') {
+				return;
+			}
+			if (result === 'review') {
+				if (this.extension.hasChangelog()) {
+					return this.extensionsWorkbenchService.open(this.extension, { tab: ExtensionEditorTab.Changelog });
+				}
+				if (this.extension.repository) {
+					return this.openerService.open(this.extension.repository);
+				}
+				return this.extensionsWorkbenchService.open(this.extension);
+			}
+		}
+
 		alert(localize('updateExtensionStart', "Updating extension {0} to version {1} started.", this.extension.displayName, this.extension.latestVersion));
 		return this.install(this.extension);
 	}
 
 	private async install(extension: IExtension): Promise<void> {
+		const options = extension.local?.preRelease ? { installPreReleaseVersion: true } : undefined;
 		try {
-			await this.extensionsWorkbenchService.install(extension, extension.local?.preRelease ? { installPreReleaseVersion: true } : undefined);
+			await this.extensionsWorkbenchService.install(extension, options);
 			alert(localize('updateExtensionComplete', "Updating extension {0} to version {1} completed.", extension.displayName, extension.latestVersion));
 		} catch (err) {
-			this.instantiationService.createInstance(PromptExtensionInstallFailureAction, extension, extension.latestVersion, InstallOperation.Update, err).run();
+			this.instantiationService.createInstance(PromptExtensionInstallFailureAction, extension, options, extension.latestVersion, InstallOperation.Update, err).run();
 		}
 	}
 }
@@ -859,14 +1008,12 @@ export class ToggleAutoUpdateForExtensionAction extends ExtensionAction {
 	static readonly LABEL = localize2('enableAutoUpdateLabel', "Auto Update");
 
 	private static readonly EnabledClass = `${ExtensionAction.EXTENSION_ACTION_CLASS} auto-update`;
-	private static readonly DisabledClass = `${ToggleAutoUpdateForExtensionAction.EnabledClass} hide`;
+	private static readonly DisabledClass = `${this.EnabledClass} hide`;
 
 	constructor(
-		private readonly enableWhenOutdated: boolean,
-		private readonly enableWhenAutoUpdateValue: AutoUpdateConfigurationValue[],
 		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
+		@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService,
 		@IConfigurationService configurationService: IConfigurationService,
-
 	) {
 		super(ToggleAutoUpdateForExtensionAction.ID, ToggleAutoUpdateForExtensionAction.LABEL.value, ToggleAutoUpdateForExtensionAction.DisabledClass);
 		this._register(configurationService.onDidChangeConfiguration(e => {
@@ -886,10 +1033,10 @@ export class ToggleAutoUpdateForExtensionAction extends ExtensionAction {
 		if (this.extension.isBuiltin) {
 			return;
 		}
-		if (this.enableWhenOutdated && (this.extension.state !== ExtensionState.Installed || !this.extension.outdated)) {
+		if (this.extension.deprecationInfo?.disallowInstall) {
 			return;
 		}
-		if (!this.enableWhenAutoUpdateValue.includes(this.extensionsWorkbenchService.getAutoUpdateValue())) {
+		if (this.extensionsWorkbenchService.getAutoUpdateValue() === 'onlyEnabledExtensions' && !this.extensionEnablementService.isEnabledEnablementState(this.extension.enablementState)) {
 			return;
 		}
 		this.enabled = true;
@@ -944,7 +1091,7 @@ export class ToggleAutoUpdatesForPublisherAction extends ExtensionAction {
 export class MigrateDeprecatedExtensionAction extends ExtensionAction {
 
 	private static readonly EnabledClass = `${ExtensionAction.LABEL_ACTION_CLASS} migrate`;
-	private static readonly DisabledClass = `${MigrateDeprecatedExtensionAction.EnabledClass} disabled`;
+	private static readonly DisabledClass = `${this.EnabledClass} disabled`;
 
 	constructor(
 		private readonly small: boolean,
@@ -987,32 +1134,7 @@ export class MigrateDeprecatedExtensionAction extends ExtensionAction {
 	}
 }
 
-export class ExtensionActionWithDropdownActionViewItem extends ActionWithDropdownActionViewItem {
-
-	constructor(
-		action: ActionWithDropDownAction,
-		options: IActionViewItemOptions & IActionWithDropdownActionViewItemOptions,
-		contextMenuProvider: IContextMenuProvider
-	) {
-		super(null, action, options, contextMenuProvider);
-	}
-
-	override render(container: HTMLElement): void {
-		super.render(container);
-		this.updateClass();
-	}
-
-	protected override updateClass(): void {
-		super.updateClass();
-		if (this.element && this.dropdownMenuActionViewItem && this.dropdownMenuActionViewItem.element) {
-			this.element.classList.toggle('empty', (<ActionWithDropDownAction>this._action).menuActions.length === 0);
-			this.dropdownMenuActionViewItem.element.classList.toggle('hide', (<ActionWithDropDownAction>this._action).menuActions.length === 0);
-		}
-	}
-
-}
-
-export abstract class ExtensionDropDownAction extends ExtensionAction {
+export abstract class DropDownExtensionAction extends ExtensionAction {
 
 	constructor(
 		id: string,
@@ -1024,9 +1146,9 @@ export abstract class ExtensionDropDownAction extends ExtensionAction {
 		super(id, label, cssClass, enabled);
 	}
 
-	private _actionViewItem: DropDownMenuActionViewItem | null = null;
-	createActionViewItem(options: IActionViewItemOptions): DropDownMenuActionViewItem {
-		this._actionViewItem = this.instantiationService.createInstance(DropDownMenuActionViewItem, this, options);
+	private _actionViewItem: DropDownExtensionActionViewItem | null = null;
+	createActionViewItem(options: IActionViewItemOptions): DropDownExtensionActionViewItem {
+		this._actionViewItem = this.instantiationService.createInstance(DropDownExtensionActionViewItem, this, options);
 		return this._actionViewItem;
 	}
 
@@ -1036,10 +1158,10 @@ export abstract class ExtensionDropDownAction extends ExtensionAction {
 	}
 }
 
-export class DropDownMenuActionViewItem extends ActionViewItem {
+export class DropDownExtensionActionViewItem extends ActionViewItem {
 
 	constructor(
-		action: ExtensionDropDownAction,
+		action: DropDownExtensionAction,
 		options: IActionViewItemOptions,
 		@IContextMenuService private readonly contextMenuService: IContextMenuService
 	) {
@@ -1072,10 +1194,12 @@ export class DropDownMenuActionViewItem extends ActionViewItem {
 async function getContextMenuActionsGroups(extension: IExtension | undefined | null, contextKeyService: IContextKeyService, instantiationService: IInstantiationService): Promise<[string, Array<MenuItemAction | SubmenuItemAction>][]> {
 	return instantiationService.invokeFunction(async accessor => {
 		const extensionsWorkbenchService = accessor.get(IExtensionsWorkbenchService);
+		const extensionEnablementService = accessor.get(IWorkbenchExtensionEnablementService);
 		const menuService = accessor.get(IMenuService);
 		const extensionRecommendationsService = accessor.get(IExtensionRecommendationsService);
 		const extensionIgnoredRecommendationsService = accessor.get(IExtensionIgnoredRecommendationsService);
 		const workbenchThemeService = accessor.get(IWorkbenchThemeService);
+		const authenticationUsageService = accessor.get(IAuthenticationUsageService);
 		const cksOverlay: [string, any][] = [];
 
 		if (extension) {
@@ -1084,6 +1208,7 @@ async function getContextMenuActionsGroups(extension: IExtension | undefined | n
 			cksOverlay.push(['isDefaultApplicationScopedExtension', extension.local && isApplicationScopedExtension(extension.local.manifest)]);
 			cksOverlay.push(['isApplicationScopedExtension', extension.local && extension.local.isApplicationScoped]);
 			cksOverlay.push(['isWorkspaceScopedExtension', extension.isWorkspaceScoped]);
+			cksOverlay.push(['isGalleryExtension', !!extension.identifier.uuid]);
 			if (extension.local) {
 				cksOverlay.push(['extensionSource', extension.local.source]);
 			}
@@ -1093,27 +1218,42 @@ async function getContextMenuActionsGroups(extension: IExtension | undefined | n
 			cksOverlay.push(['isExtensionRecommended', !!extensionRecommendationsService.getAllRecommendationsWithReason()[extension.identifier.id.toLowerCase()]]);
 			cksOverlay.push(['isExtensionWorkspaceRecommended', extensionRecommendationsService.getAllRecommendationsWithReason()[extension.identifier.id.toLowerCase()]?.reasonId === ExtensionRecommendationReason.Workspace]);
 			cksOverlay.push(['isUserIgnoredRecommendation', extensionIgnoredRecommendationsService.globalIgnoredRecommendations.some(e => e === extension.identifier.id.toLowerCase())]);
-			if (extension.state === ExtensionState.Installed) {
-				cksOverlay.push(['extensionStatus', 'installed']);
+			cksOverlay.push(['isExtensionPinned', extension.pinned]);
+			cksOverlay.push(['isExtensionEnabled', extensionEnablementService.isEnabledEnablementState(extension.enablementState)]);
+			switch (extension.state) {
+				case ExtensionState.Installing:
+					cksOverlay.push(['extensionStatus', 'installing']);
+					break;
+				case ExtensionState.Installed:
+					cksOverlay.push(['extensionStatus', 'installed']);
+					break;
+				case ExtensionState.Uninstalling:
+					cksOverlay.push(['extensionStatus', 'uninstalling']);
+					break;
+				case ExtensionState.Uninstalled:
+					cksOverlay.push(['extensionStatus', 'uninstalled']);
+					break;
 			}
 			cksOverlay.push(['installedExtensionIsPreReleaseVersion', !!extension.local?.isPreReleaseVersion]);
 			cksOverlay.push(['installedExtensionIsOptedToPreRelease', !!extension.local?.preRelease]);
 			cksOverlay.push(['galleryExtensionIsPreReleaseVersion', !!extension.gallery?.properties.isPreReleaseVersion]);
 			cksOverlay.push(['galleryExtensionHasPreReleaseVersion', extension.gallery?.hasPreReleaseVersion]);
+			cksOverlay.push(['extensionHasPreReleaseVersion', extension.hasPreReleaseVersion]);
 			cksOverlay.push(['extensionHasReleaseVersion', extension.hasReleaseVersion]);
+			cksOverlay.push(['extensionDisallowInstall', !!extension.deprecationInfo?.disallowInstall]);
+			cksOverlay.push(['extensionIsUnsigned', extension.gallery && !extension.gallery.isSigned]);
 
-			const [colorThemes, fileIconThemes, productIconThemes] = await Promise.all([workbenchThemeService.getColorThemes(), workbenchThemeService.getFileIconThemes(), workbenchThemeService.getProductIconThemes()]);
+			const [colorThemes, fileIconThemes, productIconThemes, extensionUsesAuth] = await Promise.all([workbenchThemeService.getColorThemes(), workbenchThemeService.getFileIconThemes(), workbenchThemeService.getProductIconThemes(), authenticationUsageService.extensionUsesAuth(extension.identifier.id.toLowerCase())]);
 			cksOverlay.push(['extensionHasColorThemes', colorThemes.some(theme => isThemeFromExtension(theme, extension))]);
 			cksOverlay.push(['extensionHasFileIconThemes', fileIconThemes.some(theme => isThemeFromExtension(theme, extension))]);
 			cksOverlay.push(['extensionHasProductIconThemes', productIconThemes.some(theme => isThemeFromExtension(theme, extension))]);
+			cksOverlay.push(['extensionHasAccountPreferences', extensionUsesAuth]);
 
 			cksOverlay.push(['canSetLanguage', extensionsWorkbenchService.canSetLanguage(extension)]);
 			cksOverlay.push(['isActiveLanguagePackExtension', extension.gallery && language === getLocale(extension.gallery)]);
 		}
 
-		const menu = menuService.createMenu(MenuId.ExtensionContext, contextKeyService.createOverlay(cksOverlay));
-		const actionsGroups = menu.getActions({ shouldForwardArgs: true });
-		menu.dispose();
+		const actionsGroups = menuService.getMenuActions(MenuId.ExtensionContext, contextKeyService.createOverlay(cksOverlay), { shouldForwardArgs: true });
 		return actionsGroups;
 	});
 }
@@ -1137,12 +1277,12 @@ export async function getContextMenuActions(extension: IExtension | undefined |
 	return toActions(actionsGroups, instantiationService);
 }
 
-export class ManageExtensionAction extends ExtensionDropDownAction {
+export class ManageExtensionAction extends DropDownExtensionAction {
 
 	static readonly ID = 'extensions.manage';
 
 	private static readonly Class = `${ExtensionAction.ICON_ACTION_CLASS} manage ` + ThemeIcon.asClassName(manageExtensionIcon);
-	private static readonly HideManageExtensionClass = `${ManageExtensionAction.Class} hide`;
+	private static readonly HideManageExtensionClass = `${this.Class} hide`;
 
 	constructor(
 		@IInstantiationService instantiationService: IInstantiationService,
@@ -1190,7 +1330,7 @@ export class ManageExtensionAction extends ExtensionDropDownAction {
 		}
 		groups.push([
 			...(installActions.length ? installActions : []),
-			this.instantiationService.createInstance(InstallAnotherVersionAction),
+			this.instantiationService.createInstance(InstallAnotherVersionAction, this.extension, false),
 			this.instantiationService.createInstance(UninstallAction),
 		]);
 
@@ -1221,7 +1361,7 @@ export class ManageExtensionAction extends ExtensionDropDownAction {
 	}
 }
 
-export class ExtensionEditorManageExtensionAction extends ExtensionDropDownAction {
+export class ExtensionEditorManageExtensionAction extends DropDownExtensionAction {
 
 	constructor(
 		private readonly contextKeyService: IContextKeyService,
@@ -1255,6 +1395,14 @@ export class MenuItemExtensionAction extends ExtensionAction {
 		super(action.id, action.label);
 	}
 
+	override get enabled(): boolean {
+		return this.action.enabled;
+	}
+
+	override set enabled(value: boolean) {
+		this.action.enabled = value;
+	}
+
 	update() {
 		if (!this.extension) {
 			return;
@@ -1291,7 +1439,7 @@ export class TogglePreReleaseExtensionAction extends ExtensionAction {
 	static readonly LABEL = localize('togglePreRleaseLabel', "Pre-Release");
 
 	private static readonly EnabledClass = `${ExtensionAction.LABEL_ACTION_CLASS} pre-release`;
-	private static readonly DisabledClass = `${TogglePreReleaseExtensionAction.EnabledClass} hide`;
+	private static readonly DisabledClass = `${this.EnabledClass} hide`;
 
 	constructor(
 		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
@@ -1348,29 +1496,39 @@ export class TogglePreReleaseExtensionAction extends ExtensionAction {
 export class InstallAnotherVersionAction extends ExtensionAction {
 
 	static readonly ID = 'workbench.extensions.action.install.anotherVersion';
-	static readonly LABEL = localize('install another version', "Install Another Version...");
+	static readonly LABEL = localize('install another version', "Install Specific Version...");
 
 	constructor(
+		extension: IExtension | null,
+		private readonly whenInstalled: boolean,
 		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
+		@IWorkbenchExtensionManagementService private readonly extensionManagementService: IWorkbenchExtensionManagementService,
 		@IExtensionGalleryService private readonly extensionGalleryService: IExtensionGalleryService,
 		@IQuickInputService private readonly quickInputService: IQuickInputService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IDialogService private readonly dialogService: IDialogService,
 	) {
 		super(InstallAnotherVersionAction.ID, InstallAnotherVersionAction.LABEL, ExtensionAction.LABEL_ACTION_CLASS);
+		this.extension = extension;
 		this.update();
 	}
 
 	update(): void {
-		this.enabled = !!this.extension && !this.extension.isBuiltin && !!this.extension.gallery && !!this.extension.local && !!this.extension.server && this.extension.state === ExtensionState.Installed && !this.extension.deprecationInfo;
+		this.enabled = !!this.extension && !this.extension.isBuiltin && !!this.extension.identifier.uuid && !this.extension.deprecationInfo;
+		if (this.enabled && this.whenInstalled) {
+			this.enabled = !!this.extension?.local && !!this.extension.server && this.extension.state === ExtensionState.Installed;
+		}
 	}
 
 	override async run(): Promise<any> {
 		if (!this.enabled) {
 			return;
 		}
-		const targetPlatform = await this.extension!.server!.extensionManagementService.getTargetPlatform();
-		const allVersions = await this.extensionGalleryService.getAllCompatibleVersions(this.extension!.gallery!, this.extension!.local!.preRelease, targetPlatform);
+		if (!this.extension) {
+			return;
+		}
+		const targetPlatform = this.extension.server ? await this.extension.server.extensionManagementService.getTargetPlatform() : await this.extensionManagementService.getTargetPlatform();
+		const allVersions = await this.extensionGalleryService.getAllCompatibleVersions(this.extension.identifier, this.extension.local?.preRelease ?? this.extension.gallery?.properties.isPreReleaseVersion ?? false, targetPlatform);
 		if (!allVersions.length) {
 			await this.dialogService.info(localize('no versions', "This extension has no other versions."));
 			return;
@@ -1380,8 +1538,7 @@ export class InstallAnotherVersionAction extends ExtensionAction {
 			return {
 				id: v.version,
 				label: v.version,
-				description: `${fromNow(new Date(Date.parse(v.date)), true)}${v.isPreReleaseVersion ? ` (${localize('pre-release', "pre-release")})` : ''}${v.version === this.extension!.version ? ` (${localize('current', "current")})` : ''}`,
-				latest: i === 0,
+				description: `${fromNow(new Date(Date.parse(v.date)), true)}${v.isPreReleaseVersion ? ` (${localize('pre-release', "pre-release")})` : ''}${v.version === this.extension?.local?.manifest.version ? ` (${localize('current', "current")})` : ''}`,
 				ariaLabel: `${v.isPreReleaseVersion ? 'Pre-Release version' : 'Release version'} ${v.version}`,
 				isPreReleaseVersion: v.isPreReleaseVersion
 			};
@@ -1392,18 +1549,14 @@ export class InstallAnotherVersionAction extends ExtensionAction {
 				matchOnDetail: true
 			});
 		if (pick) {
-			if (this.extension!.version === pick.id) {
+			if (this.extension.local?.manifest.version === pick.id) {
 				return;
 			}
+			const options = { installPreReleaseVersion: pick.isPreReleaseVersion, version: pick.id };
 			try {
-				if (pick.latest) {
-					const [extension] = pick.id !== this.extension?.version ? await this.extensionsWorkbenchService.getExtensions([{ id: this.extension!.identifier.id, preRelease: pick.isPreReleaseVersion }], CancellationToken.None) : [this.extension];
-					await this.extensionsWorkbenchService.install(extension ?? this.extension!, { installPreReleaseVersion: pick.isPreReleaseVersion });
-				} else {
-					await this.extensionsWorkbenchService.install(this.extension!, { installPreReleaseVersion: pick.isPreReleaseVersion, version: pick.id });
-				}
+				await this.extensionsWorkbenchService.install(this.extension, options);
 			} catch (error) {
-				this.instantiationService.createInstance(PromptExtensionInstallFailureAction, this.extension!, pick.latest ? this.extension!.latestVersion : pick.id, InstallOperation.Install, error).run();
+				this.instantiationService.createInstance(PromptExtensionInstallFailureAction, this.extension, options, pick.id, InstallOperation.Install, error).run();
 			}
 		}
 		return null;
@@ -1540,12 +1693,12 @@ export class DisableGloballyAction extends ExtensionAction {
 	}
 }
 
-export class EnableDropDownAction extends ActionWithDropDownAction {
+export class EnableDropDownAction extends ButtonWithDropDownExtensionAction {
 
 	constructor(
 		@IInstantiationService instantiationService: IInstantiationService
 	) {
-		super('extensions.enable', localize('enableAction', "Enable"), [
+		super('extensions.enable', ExtensionAction.LABEL_ACTION_CLASS, [
 			[
 				instantiationService.createInstance(EnableGloballyAction),
 				instantiationService.createInstance(EnableForWorkspaceAction)
@@ -1554,12 +1707,12 @@ export class EnableDropDownAction extends ActionWithDropDownAction {
 	}
 }
 
-export class DisableDropDownAction extends ActionWithDropDownAction {
+export class DisableDropDownAction extends ButtonWithDropDownExtensionAction {
 
 	constructor(
 		@IInstantiationService instantiationService: IInstantiationService
 	) {
-		super('extensions.disable', localize('disableAction', "Disable"), [[
+		super('extensions.disable', ExtensionAction.LABEL_ACTION_CLASS, [[
 			instantiationService.createInstance(DisableGloballyAction),
 			instantiationService.createInstance(DisableForWorkspaceAction)
 		]]);
@@ -1570,7 +1723,7 @@ export class DisableDropDownAction extends ActionWithDropDownAction {
 export class ExtensionRuntimeStateAction extends ExtensionAction {
 
 	private static readonly EnabledClass = `${ExtensionAction.LABEL_ACTION_CLASS} reload`;
-	private static readonly DisabledClass = `${ExtensionRuntimeStateAction.EnabledClass} disabled`;
+	private static readonly DisabledClass = `${this.EnabledClass} disabled`;
 
 	updateWhenCounterExtensionChanges: boolean = true;
 
@@ -1684,7 +1837,7 @@ export class SetColorThemeAction extends ExtensionAction {
 	static readonly TITLE = localize2('workbench.extensions.action.setColorTheme', 'Set Color Theme');
 
 	private static readonly EnabledClass = `${ExtensionAction.LABEL_ACTION_CLASS} theme`;
-	private static readonly DisabledClass = `${SetColorThemeAction.EnabledClass} disabled`;
+	private static readonly DisabledClass = `${this.EnabledClass} disabled`;
 
 	constructor(
 		@IExtensionService extensionService: IExtensionService,
@@ -1735,7 +1888,7 @@ export class SetFileIconThemeAction extends ExtensionAction {
 	static readonly TITLE = localize2('workbench.extensions.action.setFileIconTheme', 'Set File Icon Theme');
 
 	private static readonly EnabledClass = `${ExtensionAction.LABEL_ACTION_CLASS} theme`;
-	private static readonly DisabledClass = `${SetFileIconThemeAction.EnabledClass} disabled`;
+	private static readonly DisabledClass = `${this.EnabledClass} disabled`;
 
 	constructor(
 		@IExtensionService extensionService: IExtensionService,
@@ -1785,7 +1938,7 @@ export class SetProductIconThemeAction extends ExtensionAction {
 	static readonly TITLE = localize2('workbench.extensions.action.setProductIconTheme', 'Set Product Icon Theme');
 
 	private static readonly EnabledClass = `${ExtensionAction.LABEL_ACTION_CLASS} theme`;
-	private static readonly DisabledClass = `${SetProductIconThemeAction.EnabledClass} disabled`;
+	private static readonly DisabledClass = `${this.EnabledClass} disabled`;
 
 	constructor(
 		@IExtensionService extensionService: IExtensionService,
@@ -1836,7 +1989,7 @@ export class SetLanguageAction extends ExtensionAction {
 	static readonly TITLE = localize2('workbench.extensions.action.setDisplayLanguage', 'Set Display Language');
 
 	private static readonly EnabledClass = `${ExtensionAction.LABEL_ACTION_CLASS} language`;
-	private static readonly DisabledClass = `${SetLanguageAction.EnabledClass} disabled`;
+	private static readonly DisabledClass = `${this.EnabledClass} disabled`;
 
 	constructor(
 		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
@@ -1872,7 +2025,7 @@ export class ClearLanguageAction extends ExtensionAction {
 	static readonly TITLE = localize2('workbench.extensions.action.clearLanguage', 'Clear Display Language');
 
 	private static readonly EnabledClass = `${ExtensionAction.LABEL_ACTION_CLASS} language`;
-	private static readonly DisabledClass = `${ClearLanguageAction.EnabledClass} disabled`;
+	private static readonly DisabledClass = `${this.EnabledClass} disabled`;
 
 	constructor(
 		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
@@ -1912,7 +2065,6 @@ export class ShowRecommendedExtensionAction extends Action {
 
 	constructor(
 		extensionId: string,
-		@IPaneCompositePartService private readonly paneCompositeService: IPaneCompositePartService,
 		@IExtensionsWorkbenchService private readonly extensionWorkbenchService: IExtensionsWorkbenchService,
 	) {
 		super(ShowRecommendedExtensionAction.ID, ShowRecommendedExtensionAction.LABEL, undefined, false);
@@ -1920,10 +2072,7 @@ export class ShowRecommendedExtensionAction extends Action {
 	}
 
 	override async run(): Promise<any> {
-		const paneComposite = await this.paneCompositeService.openPaneComposite(VIEWLET_ID, ViewContainerLocation.Sidebar, true);
-		const paneContainer = paneComposite?.getViewPaneContainer() as IExtensionsViewPaneContainer;
-		paneContainer.search(`@id:${this.extensionId}`);
-		paneContainer.focus();
+		await this.extensionWorkbenchService.openSearch(`@id:${this.extensionId}`);
 		const [extension] = await this.extensionWorkbenchService.getExtensions([{ id: this.extensionId }], { source: 'install-recommendation' }, CancellationToken.None);
 		if (extension) {
 			return this.extensionWorkbenchService.open(extension);
@@ -1941,7 +2090,6 @@ export class InstallRecommendedExtensionAction extends Action {
 
 	constructor(
 		extensionId: string,
-		@IPaneCompositePartService private readonly paneCompositeService: IPaneCompositePartService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IExtensionsWorkbenchService private readonly extensionWorkbenchService: IExtensionsWorkbenchService,
 	) {
@@ -1950,17 +2098,14 @@ export class InstallRecommendedExtensionAction extends Action {
 	}
 
 	override async run(): Promise<any> {
-		const viewlet = await this.paneCompositeService.openPaneComposite(VIEWLET_ID, ViewContainerLocation.Sidebar, true);
-		const viewPaneContainer = viewlet?.getViewPaneContainer() as IExtensionsViewPaneContainer;
-		viewPaneContainer.search(`@id:${this.extensionId}`);
-		viewPaneContainer.focus();
+		await this.extensionWorkbenchService.openSearch(`@id:${this.extensionId}`);
 		const [extension] = await this.extensionWorkbenchService.getExtensions([{ id: this.extensionId }], { source: 'install-recommendation' }, CancellationToken.None);
 		if (extension) {
 			await this.extensionWorkbenchService.open(extension);
 			try {
 				await this.extensionWorkbenchService.install(extension);
 			} catch (err) {
-				this.instantiationService.createInstance(PromptExtensionInstallFailureAction, extension, extension.latestVersion, InstallOperation.Install, err).run();
+				this.instantiationService.createInstance(PromptExtensionInstallFailureAction, extension, undefined, extension.latestVersion, InstallOperation.Install, err).run();
 			}
 		}
 	}
@@ -2012,22 +2157,6 @@ export class UndoIgnoreExtensionRecommendationAction extends Action {
 	}
 }
 
-export class SearchExtensionsAction extends Action {
-
-	constructor(
-		private readonly searchValue: string,
-		@IPaneCompositePartService private readonly paneCompositeService: IPaneCompositePartService
-	) {
-		super('extensions.searchExtensions', localize('search recommendations', "Search Extensions"), undefined, true);
-	}
-
-	override async run(): Promise<void> {
-		const viewPaneContainer = (await this.paneCompositeService.openPaneComposite(VIEWLET_ID, ViewContainerLocation.Sidebar, true))?.getViewPaneContainer() as IExtensionsViewPaneContainer;
-		viewPaneContainer.search(this.searchValue);
-		viewPaneContainer.focus();
-	}
-}
-
 export abstract class AbstractConfigureRecommendedExtensionsAction extends Action {
 
 	constructor(
@@ -2184,7 +2313,7 @@ export class ConfigureWorkspaceFolderRecommendedExtensionsAction extends Abstrac
 export class ExtensionStatusLabelAction extends Action implements IExtensionContainer {
 
 	private static readonly ENABLED_CLASS = `${ExtensionAction.TEXT_ACTION_CLASS} extension-status-label`;
-	private static readonly DISABLED_CLASS = `${ExtensionStatusLabelAction.ENABLED_CLASS} hide`;
+	private static readonly DISABLED_CLASS = `${this.ENABLED_CLASS} hide`;
 
 	private initialStatus: ExtensionState | null = null;
 	private status: ExtensionState | null = null;
@@ -2255,7 +2384,13 @@ export class ExtensionStatusLabelAction extends Action implements IExtensionCont
 
 		if (currentStatus !== null) {
 			if (currentStatus === ExtensionState.Installing && this.status === ExtensionState.Installed) {
-				return canAddExtension() ? this.initialStatus === ExtensionState.Installed && this.version !== currentVersion ? localize('updated', "Updated") : localize('installed', "Installed") : null;
+				if (this.initialStatus === ExtensionState.Uninstalled && canAddExtension()) {
+					return localize('installed', "Installed");
+				}
+				if (this.initialStatus === ExtensionState.Installed && this.version !== currentVersion && canAddExtension()) {
+					return localize('updated', "Updated");
+				}
+				return null;
 			}
 			if (currentStatus === ExtensionState.Uninstalling && this.status === ExtensionState.Uninstalled) {
 				this.initialStatus = this.status;
@@ -2284,10 +2419,10 @@ export class ExtensionStatusLabelAction extends Action implements IExtensionCont
 
 }
 
-export class ToggleSyncExtensionAction extends ExtensionDropDownAction {
+export class ToggleSyncExtensionAction extends DropDownExtensionAction {
 
 	private static readonly IGNORED_SYNC_CLASS = `${ExtensionAction.ICON_ACTION_CLASS} extension-sync ${ThemeIcon.asClassName(syncIgnoredIcon)}`;
-	private static readonly SYNC_CLASS = `${ToggleSyncExtensionAction.ICON_ACTION_CLASS} extension-sync ${ThemeIcon.asClassName(syncEnabledIcon)}`;
+	private static readonly SYNC_CLASS = `${this.ICON_ACTION_CLASS} extension-sync ${ThemeIcon.asClassName(syncEnabledIcon)}`;
 
 	constructor(
 		@IConfigurationService private readonly configurationService: IConfigurationService,
@@ -2332,8 +2467,8 @@ export class ExtensionStatusAction extends ExtensionAction {
 
 	updateWhenCounterExtensionChanges: boolean = true;
 
-	private _status: ExtensionStatus | undefined;
-	get status(): ExtensionStatus | undefined { return this._status; }
+	private _status: ExtensionStatus[] = [];
+	get status(): ExtensionStatus[] { return this._status; }
 
 	private readonly _onDidChangeStatus = this._register(new Emitter<void>());
 	readonly onDidChangeStatus = this._onDidChangeStatus.event;
@@ -2378,6 +2513,11 @@ export class ExtensionStatusAction extends ExtensionAction {
 			return;
 		}
 
+		if (this.extension.state === ExtensionState.Uninstalled && this.extension.gallery && !this.extension.gallery.isSigned) {
+			this.updateStatus({ icon: warningIcon, message: new MarkdownString(localize('not signed tooltip', "This extension is not signed by the Extension Marketplace.")) }, true);
+			return;
+		}
+
 		if (this.extension.deprecationInfo) {
 			if (this.extension.deprecationInfo.extension) {
 				const link = `[${this.extension.deprecationInfo.extension.displayName}](${URI.parse(`command:extension.open?${encodeURIComponent(JSON.stringify([this.extension.deprecationInfo.extension.id]))}`)})`;
@@ -2399,6 +2539,23 @@ export class ExtensionStatusAction extends ExtensionAction {
 			return;
 		}
 
+		if (this.extension.outdated && this.extensionsWorkbenchService.isAutoUpdateEnabledFor(this.extension)) {
+			const message = await this.extensionsWorkbenchService.shouldRequireConsentToUpdate(this.extension);
+			if (message) {
+				const markdown = new MarkdownString();
+				markdown.appendMarkdown(`${message} `);
+				markdown.appendMarkdown(
+					localize('auto update message', "Please [review the extension]({0}) and update it manually.",
+						this.extension.hasChangelog()
+							? URI.parse(`command:extension.open?${encodeURIComponent(JSON.stringify([this.extension.identifier.id, ExtensionEditorTab.Changelog]))}`).toString()
+							: this.extension.repository
+								? this.extension.repository
+								: URI.parse(`command:extension.open?${encodeURIComponent(JSON.stringify([this.extension.identifier.id]))}`).toString()
+					));
+				this.updateStatus({ icon: warningIcon, message: markdown }, true);
+			}
+		}
+
 		if (this.extension.gallery && this.extension.state === ExtensionState.Uninstalled && !await this.extensionsWorkbenchService.canInstall(this.extension)) {
 			if (this.extensionManagementServerService.localExtensionManagementServer || this.extensionManagementServerService.remoteExtensionManagementServer) {
 				const targetPlatform = await (this.extensionManagementServerService.localExtensionManagementServer ? this.extensionManagementServerService.localExtensionManagementServer.extensionManagementService.getTargetPlatform() : this.extensionManagementServerService.remoteExtensionManagementServer!.extensionManagementService.getTargetPlatform());
@@ -2451,10 +2608,11 @@ export class ExtensionStatusAction extends ExtensionAction {
 			}
 		}
 
-		// Extension is disabled by untrusted workspace
-		if (this.extension.enablementState === EnablementState.DisabledByTrustRequirement ||
-			// All disabled dependencies of the extension are disabled by untrusted workspace
-			(this.extension.enablementState === EnablementState.DisabledByExtensionDependency && this.workbenchExtensionEnablementService.getDependenciesEnablementStates(this.extension.local).every(([, enablementState]) => this.workbenchExtensionEnablementService.isEnabledEnablementState(enablementState) || enablementState === EnablementState.DisabledByTrustRequirement))) {
+		if (!this.workspaceTrustService.isWorkspaceTrusted() &&
+			// Extension is disabled by untrusted workspace
+			(this.extension.enablementState === EnablementState.DisabledByTrustRequirement ||
+				// All disabled dependencies of the extension are disabled by untrusted workspace
+				(this.extension.enablementState === EnablementState.DisabledByExtensionDependency && this.workbenchExtensionEnablementService.getDependenciesEnablementStates(this.extension.local).every(([, enablementState]) => this.workbenchExtensionEnablementService.isEnabledEnablementState(enablementState) || enablementState === EnablementState.DisabledByTrustRequirement)))) {
 			this.enabled = true;
 			const untrustedDetails = getWorkspaceSupportTypeMessage(this.extension.local.manifest.capabilities?.untrustedWorkspaces);
 			this.updateStatus({ icon: trustIcon, message: new MarkdownString(untrustedDetails ? escapeMarkdownSyntaxTokens(untrustedDetails) : localize('extension disabled because of trust requirement', "This extension has been disabled because the current workspace is not trusted.")) }, true);
@@ -2558,7 +2716,17 @@ export class ExtensionStatusAction extends ExtensionAction {
 
 		// Extension is disabled by its dependency
 		if (this.extension.enablementState === EnablementState.DisabledByExtensionDependency) {
-			this.updateStatus({ icon: warningIcon, message: new MarkdownString(localize('extension disabled because of dependency', "This extension has been disabled because it depends on an extension that is disabled.")) }, true);
+			this.updateStatus({
+				icon: warningIcon,
+				message: new MarkdownString(localize('extension disabled because of dependency', "This extension depends on an extension that is disabled."))
+					.appendMarkdown(`&nbsp;[${localize('dependencies', "Show Dependencies")}](${URI.parse(`command:extension.open?${encodeURIComponent(JSON.stringify([this.extension.identifier.id, ExtensionEditorTab.Dependencies]))}`)})`)
+			}, true);
+			return;
+		}
+
+		if (!this.extension.local.isValid) {
+			const errors = this.extension.local.validations.filter(([severity]) => severity === Severity.Error).map(([, message]) => message);
+			this.updateStatus({ icon: warningIcon, message: new MarkdownString(errors.join(' ').trim()) }, true);
 			return;
 		}
 
@@ -2591,33 +2759,46 @@ export class ExtensionStatusAction extends ExtensionAction {
 				return;
 			}
 		}
-
-		if (isEnabled && !isRunning && !this.extension.local.isValid) {
-			const errors = this.extension.local.validations.filter(([severity]) => severity === Severity.Error).map(([, message]) => message);
-			this.updateStatus({ icon: errorIcon, message: new MarkdownString(errors.join(' ').trim()) }, true);
-		}
-
 	}
 
 	private updateStatus(status: ExtensionStatus | undefined, updateClass: boolean): void {
-		if (this._status === status) {
-			return;
+		if (status) {
+			if (this._status.some(s => s.message.value === status.message.value && s.icon?.id === status.icon?.id)) {
+				return;
+			}
+		} else {
+			if (this._status.length === 0) {
+				return;
+			}
+			this._status = [];
 		}
-		if (this._status && status && this._status.message === status.message && this._status.icon?.id === status.icon?.id) {
-			return;
+
+		if (status) {
+			this._status.push(status);
+			this._status.sort((a, b) =>
+				b.icon === trustIcon ? -1 :
+					a.icon === trustIcon ? 1 :
+						b.icon === errorIcon ? -1 :
+							a.icon === errorIcon ? 1 :
+								b.icon === warningIcon ? -1 :
+									a.icon === warningIcon ? 1 :
+										b.icon === infoIcon ? -1 :
+											a.icon === infoIcon ? 1 :
+												0
+			);
 		}
-		this._status = status;
+
 		if (updateClass) {
-			if (this._status?.icon === errorIcon) {
+			if (status?.icon === errorIcon) {
 				this.class = `${ExtensionStatusAction.CLASS} extension-status-error ${ThemeIcon.asClassName(errorIcon)}`;
 			}
-			else if (this._status?.icon === warningIcon) {
+			else if (status?.icon === warningIcon) {
 				this.class = `${ExtensionStatusAction.CLASS} extension-status-warning ${ThemeIcon.asClassName(warningIcon)}`;
 			}
-			else if (this._status?.icon === infoIcon) {
+			else if (status?.icon === infoIcon) {
 				this.class = `${ExtensionStatusAction.CLASS} extension-status-info ${ThemeIcon.asClassName(infoIcon)}`;
 			}
-			else if (this._status?.icon === trustIcon) {
+			else if (status?.icon === trustIcon) {
 				this.class = `${ExtensionStatusAction.CLASS} ${ThemeIcon.asClassName(trustIcon)}`;
 			}
 			else {
@@ -2628,7 +2809,7 @@ export class ExtensionStatusAction extends ExtensionAction {
 	}
 
 	override async run(): Promise<any> {
-		if (this._status?.icon === trustIcon) {
+		if (this._status[0]?.icon === trustIcon) {
 			return this.commandService.executeCommand('workbench.trust.manage');
 		}
 	}
@@ -2646,7 +2827,6 @@ export class ReinstallAction extends Action {
 		@IQuickInputService private readonly quickInputService: IQuickInputService,
 		@INotificationService private readonly notificationService: INotificationService,
 		@IHostService private readonly hostService: IHostService,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IExtensionService private readonly extensionService: IExtensionService
 	) {
 		super(id, label);
@@ -2679,7 +2859,7 @@ export class ReinstallAction extends Action {
 	}
 
 	private reinstallExtension(extension: IExtension): Promise<void> {
-		return this.instantiationService.createInstance(SearchExtensionsAction, '@installed ').run()
+		return this.extensionsWorkbenchService.openSearch('@installed ')
 			.then(() => {
 				return this.extensionsWorkbenchService.reinstall(extension)
 					.then(extension => {
@@ -2723,16 +2903,14 @@ export class InstallSpecificVersionOfExtensionAction extends Action {
 	override async run(): Promise<any> {
 		const extensionPick = await this.quickInputService.pick(this.getExtensionEntries(), { placeHolder: localize('selectExtension', "Select Extension"), matchOnDetail: true });
 		if (extensionPick && extensionPick.extension) {
-			const action = this.instantiationService.createInstance(InstallAnotherVersionAction);
-			action.extension = extensionPick.extension;
+			const action = this.instantiationService.createInstance(InstallAnotherVersionAction, extensionPick.extension, true);
 			await action.run();
-			await this.instantiationService.createInstance(SearchExtensionsAction, extensionPick.extension.identifier.id).run();
+			await this.extensionsWorkbenchService.openSearch(extensionPick.extension.identifier.id);
 		}
 	}
 
 	private isEnabled(extension: IExtension): boolean {
-		const action = this.instantiationService.createInstance(InstallAnotherVersionAction);
-		action.extension = extension;
+		const action = this.instantiationService.createInstance(InstallAnotherVersionAction, extension, true);
 		return action.enabled && !!extension.local && this.extensionEnablementService.isEnabled(extension.local);
 	}
 
@@ -2969,29 +3147,14 @@ export class InstallRemoteExtensionsInLocalAction extends AbstractInstallExtensi
 }
 
 CommandsRegistry.registerCommand('workbench.extensions.action.showExtensionsForLanguage', function (accessor: ServicesAccessor, fileExtension: string) {
-	const paneCompositeService = accessor.get(IPaneCompositePartService);
-
-	return paneCompositeService.openPaneComposite(VIEWLET_ID, ViewContainerLocation.Sidebar, true)
-		.then(viewlet => viewlet?.getViewPaneContainer() as IExtensionsViewPaneContainer)
-		.then(viewlet => {
-			viewlet.search(`ext:${fileExtension.replace(/^\./, '')}`);
-			viewlet.focus();
-		});
+	const extensionsWorkbenchService = accessor.get(IExtensionsWorkbenchService);
+	return extensionsWorkbenchService.openSearch(`ext:${fileExtension.replace(/^\./, '')}`);
 });
 
 export const showExtensionsWithIdsCommandId = 'workbench.extensions.action.showExtensionsWithIds';
 CommandsRegistry.registerCommand(showExtensionsWithIdsCommandId, function (accessor: ServicesAccessor, extensionIds: string[]) {
-	const paneCompositeService = accessor.get(IPaneCompositePartService);
-
-	return paneCompositeService.openPaneComposite(VIEWLET_ID, ViewContainerLocation.Sidebar, true)
-		.then(viewlet => viewlet?.getViewPaneContainer() as IExtensionsViewPaneContainer)
-		.then(viewlet => {
-			const query = extensionIds
-				.map(id => `@id:${id}`)
-				.join(' ');
-			viewlet.search(query);
-			viewlet.focus();
-		});
+	const extensionsWorkbenchService = accessor.get(IExtensionsWorkbenchService);
+	return extensionsWorkbenchService.openSearch(extensionIds.map(id => `@id:${id}`).join(' '));
 });
 
 registerColor('extensionButton.background', {
@@ -3015,12 +3178,7 @@ registerColor('extensionButton.hoverBackground', {
 	hcLight: null
 }, localize('extensionButtonHoverBackground', "Button background hover color for extension actions."));
 
-registerColor('extensionButton.separator', {
-	dark: buttonSeparator,
-	light: buttonSeparator,
-	hcDark: buttonSeparator,
-	hcLight: buttonSeparator
-}, localize('extensionButtonSeparator', "Button separator color for extension actions"));
+registerColor('extensionButton.separator', buttonSeparator, localize('extensionButtonSeparator', "Button separator color for extension actions"));
 
 export const extensionButtonProminentBackground = registerColor('extensionButton.prominentBackground', {
 	dark: buttonBackground,
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsActivationProgress.ts b/src/vs/workbench/contrib/extensions/browser/extensionsActivationProgress.ts
index 5e7c228e17e..0be21dfae33 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsActivationProgress.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsActivationProgress.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
-import { localize } from 'vs/nls';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { DeferredPromise, timeout } from 'vs/base/common/async';
-import { ILogService } from 'vs/platform/log/common/log';
-import { CancellationToken } from 'vs/base/common/cancellation';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IProgressService, ProgressLocation } from '../../../../platform/progress/common/progress.js';
+import { localize } from '../../../../nls.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { DeferredPromise, timeout } from '../../../../base/common/async.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
 
 export class ExtensionActivationProgress implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsCompletionItemsProvider.ts b/src/vs/workbench/contrib/extensions/browser/extensionsCompletionItemsProvider.ts
index 88bc90ab421..1eee95203bd 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsCompletionItemsProvider.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsCompletionItemsProvider.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { getLocation, parse } from 'vs/base/common/json';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Position } from 'vs/editor/common/core/position';
-import { ITextModel } from 'vs/editor/common/model';
-import { CompletionContext, CompletionList, CompletionItemKind, CompletionItem } from 'vs/editor/common/languages';
-import { IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { Range } from 'vs/editor/common/core/range';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
+import { localize } from '../../../../nls.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { getLocation, parse } from '../../../../base/common/json.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { CompletionContext, CompletionList, CompletionItemKind, CompletionItem } from '../../../../editor/common/languages.js';
+import { IExtensionManagementService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
 
 
 export class ExtensionsCompletionItemsProvider extends Disposable implements IWorkbenchContribution {
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsDependencyChecker.ts b/src/vs/workbench/contrib/extensions/browser/extensionsDependencyChecker.ts
index 28b50d2f82b..009f8eada42 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsDependencyChecker.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsDependencyChecker.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
-import { localize } from 'vs/nls';
-import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { Action } from 'vs/base/common/actions';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Promises } from 'vs/base/common/async';
+import { IExtensionsWorkbenchService } from '../common/extensions.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { MenuRegistry, MenuId } from '../../../../platform/actions/common/actions.js';
+import { localize } from '../../../../nls.js';
+import { areSameExtensions } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { Action } from '../../../../base/common/actions.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Promises } from '../../../../base/common/async.js';
 
 export class ExtensionDependencyChecker extends Disposable implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsIcons.ts b/src/vs/workbench/contrib/extensions/browser/extensionsIcons.ts
index 7cf7dc9f362..868e006ddab 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsIcons.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsIcons.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from 'vs/base/common/codicons';
-import { localize } from 'vs/nls';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { localize } from '../../../../nls.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 
 export const extensionsViewIcon = registerIcon('extensions-view-icon', Codicon.extensions, localize('extensionsViewIcon', 'View icon of the extensions view.'));
 
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsList.ts b/src/vs/workbench/contrib/extensions/browser/extensionsList.ts
index 683098f05b6..6c533cd8be7 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsList.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsList.ts
@@ -3,30 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/extension';
-import { append, $, addDisposableListener } from 'vs/base/browser/dom';
-import { IDisposable, dispose, combinedDisposable } from 'vs/base/common/lifecycle';
-import { IAction } from 'vs/base/common/actions';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { IPagedRenderer } from 'vs/base/browser/ui/list/listPaging';
-import { Event } from 'vs/base/common/event';
-import { IExtension, ExtensionContainers, ExtensionState, IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions';
-import { ManageExtensionAction, ExtensionRuntimeStateAction, ExtensionStatusLabelAction, RemoteInstallAction, ExtensionStatusAction, LocalInstallAction, ActionWithDropDownAction, InstallDropdownAction, InstallingLabelAction, ExtensionActionWithDropdownActionViewItem, ExtensionDropDownAction, WebInstallAction, MigrateDeprecatedExtensionAction, SetLanguageAction, ClearLanguageAction, UpdateAction, ToggleAutoUpdateForExtensionAction } from 'vs/workbench/contrib/extensions/browser/extensionsActions';
-import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { RatingsWidget, InstallCountWidget, RecommendationWidget, RemoteBadgeWidget, ExtensionPackCountWidget as ExtensionPackBadgeWidget, SyncIgnoredWidget, ExtensionHoverWidget, ExtensionActivationStatusWidget, PreReleaseBookmarkWidget, extensionVerifiedPublisherIconColor, VerifiedPublisherWidget } from 'vs/workbench/contrib/extensions/browser/extensionsWidgets';
-import { IExtensionService, toExtension } from 'vs/workbench/services/extensions/common/extensions';
-import { IExtensionManagementServerService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { isLanguagePackExtension } from 'vs/platform/extensions/common/extensions';
-import { registerThemingParticipant, IColorTheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { WORKBENCH_BACKGROUND } from 'vs/workbench/common/theme';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { HoverPosition } from 'vs/base/browser/ui/hover/hoverWidget';
-import { verifiedPublisherIcon as verifiedPublisherThemeIcon } from 'vs/workbench/contrib/extensions/browser/extensionsIcons';
-import { IActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
+import './media/extension.css';
+import { append, $, addDisposableListener } from '../../../../base/browser/dom.js';
+import { IDisposable, dispose, combinedDisposable } from '../../../../base/common/lifecycle.js';
+import { IAction } from '../../../../base/common/actions.js';
+import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
+import { IPagedRenderer } from '../../../../base/browser/ui/list/listPaging.js';
+import { Event } from '../../../../base/common/event.js';
+import { IExtension, ExtensionContainers, ExtensionState, IExtensionsWorkbenchService } from '../common/extensions.js';
+import { ManageExtensionAction, ExtensionRuntimeStateAction, ExtensionStatusLabelAction, RemoteInstallAction, ExtensionStatusAction, LocalInstallAction, ButtonWithDropDownExtensionAction, InstallDropdownAction, InstallingLabelAction, ButtonWithDropdownExtensionActionViewItem, DropDownExtensionAction, WebInstallAction, MigrateDeprecatedExtensionAction, SetLanguageAction, ClearLanguageAction, UpdateAction } from './extensionsActions.js';
+import { areSameExtensions } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { RatingsWidget, InstallCountWidget, RecommendationWidget, RemoteBadgeWidget, ExtensionPackCountWidget as ExtensionPackBadgeWidget, SyncIgnoredWidget, ExtensionHoverWidget, ExtensionActivationStatusWidget, PreReleaseBookmarkWidget, extensionVerifiedPublisherIconColor, VerifiedPublisherWidget } from './extensionsWidgets.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IWorkbenchExtensionEnablementService } from '../../../services/extensionManagement/common/extensionManagement.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { registerThemingParticipant, IColorTheme, ICssStyleCollector } from '../../../../platform/theme/common/themeService.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { WORKBENCH_BACKGROUND } from '../../../common/theme.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { HoverPosition } from '../../../../base/browser/ui/hover/hoverWidget.js';
+import { verifiedPublisherIcon as verifiedPublisherThemeIcon } from './extensionsIcons.js';
+import { IActionViewItemOptions } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
 
 const EXTENSION_LIST_ELEMENT_HEIGHT = 72;
 
@@ -69,8 +68,8 @@ export class Renderer implements IPagedRenderer<IExtension, ITemplateData> {
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@INotificationService private readonly notificationService: INotificationService,
 		@IExtensionService private readonly extensionService: IExtensionService,
-		@IExtensionManagementServerService private readonly extensionManagementServerService: IExtensionManagementServerService,
 		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
+		@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService,
 		@IContextMenuService private readonly contextMenuService: IContextMenuService,
 	) { }
 
@@ -100,10 +99,19 @@ export class Renderer implements IPagedRenderer<IExtension, ITemplateData> {
 		const publisherDisplayName = append(publisher, $('.publisher-name.ellipsis'));
 		const actionbar = new ActionBar(footer, {
 			actionViewItemProvider: (action: IAction, options: IActionViewItemOptions) => {
-				if (action instanceof ActionWithDropDownAction) {
-					return new ExtensionActionWithDropdownActionViewItem(action, { ...options, icon: true, label: true, menuActionsOrProvider: { getActions: () => action.menuActions }, menuActionClassNames: (action.class || '').split(' ') }, this.contextMenuService);
+				if (action instanceof ButtonWithDropDownExtensionAction) {
+					return new ButtonWithDropdownExtensionActionViewItem(
+						action,
+						{
+							...options,
+							icon: true,
+							label: true,
+							menuActionsOrProvider: { getActions: () => action.menuActions },
+							menuActionClassNames: action.menuActionClassNames
+						},
+						this.contextMenuService);
 				}
-				if (action instanceof ExtensionDropDownAction) {
+				if (action instanceof DropDownExtensionAction) {
 					return action.createActionViewItem(options);
 				}
 				return undefined;
@@ -118,8 +126,7 @@ export class Renderer implements IPagedRenderer<IExtension, ITemplateData> {
 			this.instantiationService.createInstance(ExtensionStatusLabelAction),
 			this.instantiationService.createInstance(MigrateDeprecatedExtensionAction, true),
 			this.instantiationService.createInstance(ExtensionRuntimeStateAction),
-			this.instantiationService.createInstance(ActionWithDropDownAction, 'extensions.updateActions', '',
-				[[this.instantiationService.createInstance(UpdateAction, false)], [this.instantiationService.createInstance(ToggleAutoUpdateForExtensionAction, true, [true, 'onlyEnabledExtensions'])]]),
+			this.instantiationService.createInstance(UpdateAction, false),
 			this.instantiationService.createInstance(InstallDropdownAction),
 			this.instantiationService.createInstance(InstallingLabelAction),
 			this.instantiationService.createInstance(SetLanguageAction),
@@ -185,23 +192,8 @@ export class Renderer implements IPagedRenderer<IExtension, ITemplateData> {
 
 		data.extensionDisposables = dispose(data.extensionDisposables);
 
-		const computeEnablement = async () => {
-			if (extension.state === ExtensionState.Uninstalled) {
-				if (!!extension.deprecationInfo) {
-					return true;
-				}
-				if (this.extensionsWorkbenchService.canSetLanguage(extension)) {
-					return false;
-				}
-				return !(await this.extensionsWorkbenchService.canInstall(extension));
-			} else if (extension.local && !isLanguagePackExtension(extension.local.manifest)) {
-				const runningExtension = this.extensionService.extensions.filter(e => areSameExtensions({ id: e.identifier.value }, extension.identifier))[0];
-				return !(runningExtension && extension.server === this.extensionManagementServerService.getExtensionManagementServer(toExtension(runningExtension)));
-			}
-			return false;
-		};
-		const updateEnablement = async () => {
-			const disabled = await computeEnablement();
+		const updateEnablement = () => {
+			const disabled = extension.state === ExtensionState.Installed && extension.local && !this.extensionEnablementService.isEnabled(extension.local);
 			const deprecated = !!extension.deprecationInfo;
 			data.element.classList.toggle('deprecated', deprecated);
 			data.root.classList.toggle('disabled', disabled);
@@ -263,6 +255,6 @@ registerThemingParticipant((theme: IColorTheme, collector: ICssStyleCollector) =
 	const verifiedPublisherIconColor = theme.getColor(extensionVerifiedPublisherIconColor);
 	if (verifiedPublisherIconColor) {
 		const disabledVerifiedPublisherIconColor = verifiedPublisherIconColor.transparent(.5).makeOpaque(WORKBENCH_BACKGROUND(theme));
-		collector.addRule(`.extensions-list .monaco-list .monaco-list-row.disabled .author .verified-publisher ${ThemeIcon.asCSSSelector(verifiedPublisherThemeIcon)} { color: ${disabledVerifiedPublisherIconColor}; }`);
+		collector.addRule(`.extensions-list .monaco-list .monaco-list-row.disabled:not(.selected) .author .verified-publisher ${ThemeIcon.asCSSSelector(verifiedPublisherThemeIcon)} { color: ${disabledVerifiedPublisherIconColor}; }`);
 	}
 });
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsQuickAccess.ts b/src/vs/workbench/contrib/extensions/browser/extensionsQuickAccess.ts
index 13d7d765be4..05166b41268 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsQuickAccess.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsQuickAccess.ts
@@ -3,24 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
-import { IPickerQuickAccessItem, PickerQuickAccessProvider } from 'vs/platform/quickinput/browser/pickerQuickAccess';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { localize } from 'vs/nls';
-import { VIEWLET_ID, IExtensionsViewPaneContainer } from 'vs/workbench/contrib/extensions/common/extensions';
-import { IExtensionGalleryService, IExtensionManagementService, IGalleryExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { ILogService } from 'vs/platform/log/common/log';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { ViewContainerLocation } from 'vs/workbench/common/views';
+import { IQuickPickSeparator } from '../../../../platform/quickinput/common/quickInput.js';
+import { IPickerQuickAccessItem, PickerQuickAccessProvider } from '../../../../platform/quickinput/browser/pickerQuickAccess.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { localize } from '../../../../nls.js';
+import { IExtensionGalleryService, IExtensionManagementService, IGalleryExtension } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { IExtensionsWorkbenchService } from '../common/extensions.js';
 
 export class InstallExtensionQuickAccessProvider extends PickerQuickAccessProvider<IPickerQuickAccessItem> {
 
 	static PREFIX = 'ext install ';
 
 	constructor(
-		@IPaneCompositePartService private readonly paneCompositeService: IPaneCompositePartService,
+		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@IExtensionGalleryService private readonly galleryService: IExtensionGalleryService,
 		@IExtensionManagementService private readonly extensionsService: IExtensionManagementService,
 		@INotificationService private readonly notificationService: INotificationService,
@@ -40,7 +38,7 @@ export class InstallExtensionQuickAccessProvider extends PickerQuickAccessProvid
 
 		const genericSearchPickItem: IPickerQuickAccessItem = {
 			label: localize('searchFor', "Press Enter to search for extension '{0}'.", filter),
-			accept: () => this.searchExtension(filter)
+			accept: () => this.extensionsWorkbenchService.openSearch(filter)
 		};
 
 		// Extension ID typed: try to find it
@@ -80,37 +78,26 @@ export class InstallExtensionQuickAccessProvider extends PickerQuickAccessProvid
 
 	private async installExtension(extension: IGalleryExtension, name: string): Promise<void> {
 		try {
-			await openExtensionsViewlet(this.paneCompositeService, `@id:${name}`);
+			await this.extensionsWorkbenchService.openSearch(`@id:${name}`);
 			await this.extensionsService.installFromGallery(extension);
 		} catch (error) {
 			this.notificationService.error(error);
 		}
 	}
-
-	private async searchExtension(name: string): Promise<void> {
-		openExtensionsViewlet(this.paneCompositeService, name);
-	}
 }
 
 export class ManageExtensionsQuickAccessProvider extends PickerQuickAccessProvider<IPickerQuickAccessItem> {
 
 	static PREFIX = 'ext ';
 
-	constructor(@IPaneCompositePartService private readonly paneCompositeService: IPaneCompositePartService) {
+	constructor(@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService) {
 		super(ManageExtensionsQuickAccessProvider.PREFIX);
 	}
 
 	protected _getPicks(): Array<IPickerQuickAccessItem | IQuickPickSeparator> {
 		return [{
 			label: localize('manage', "Press Enter to manage your extensions."),
-			accept: () => openExtensionsViewlet(this.paneCompositeService)
+			accept: () => this.extensionsWorkbenchService.openSearch('')
 		}];
 	}
 }
-
-async function openExtensionsViewlet(paneCompositeService: IPaneCompositePartService, search = ''): Promise<void> {
-	const viewlet = await paneCompositeService.openPaneComposite(VIEWLET_ID, ViewContainerLocation.Sidebar, true);
-	const view = viewlet?.getViewPaneContainer() as IExtensionsViewPaneContainer | undefined;
-	view?.search(search);
-	view?.focus();
-}
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViewer.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViewer.ts
index 2fa59067e8b..491d214b574 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsViewer.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsViewer.ts
@@ -3,30 +3,30 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { localize } from 'vs/nls';
-import { IDisposable, dispose, Disposable, DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { Action } from 'vs/base/common/actions';
-import { IExtensionsWorkbenchService, IExtension } from 'vs/workbench/contrib/extensions/common/extensions';
-import { Event } from 'vs/base/common/event';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IListService, WorkbenchAsyncDataTree } from 'vs/platform/list/browser/listService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { registerThemingParticipant, IColorTheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
-import { IAsyncDataSource, ITreeNode } from 'vs/base/browser/ui/tree/tree';
-import { IListVirtualDelegate, IListRenderer } from 'vs/base/browser/ui/list/list';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { isNonEmptyArray } from 'vs/base/common/arrays';
-import { Delegate, Renderer } from 'vs/workbench/contrib/extensions/browser/extensionsList';
-import { listFocusForeground, listFocusBackground, foreground, editorBackground } from 'vs/platform/theme/common/colorRegistry';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { IListStyles } from 'vs/base/browser/ui/list/listWidget';
-import { HoverPosition } from 'vs/base/browser/ui/hover/hoverWidget';
-import { IStyleOverride } from 'vs/platform/theme/browser/defaultStyles';
-import { getAriaLabelForExtension } from 'vs/workbench/contrib/extensions/browser/extensionsViews';
+import * as dom from '../../../../base/browser/dom.js';
+import { localize } from '../../../../nls.js';
+import { IDisposable, dispose, Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { Action } from '../../../../base/common/actions.js';
+import { IExtensionsWorkbenchService, IExtension } from '../common/extensions.js';
+import { Event } from '../../../../base/common/event.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IListService, WorkbenchAsyncDataTree } from '../../../../platform/list/browser/listService.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { registerThemingParticipant, IColorTheme, ICssStyleCollector } from '../../../../platform/theme/common/themeService.js';
+import { IAsyncDataSource, ITreeNode } from '../../../../base/browser/ui/tree/tree.js';
+import { IListVirtualDelegate, IListRenderer } from '../../../../base/browser/ui/list/list.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { isNonEmptyArray } from '../../../../base/common/arrays.js';
+import { Delegate, Renderer } from './extensionsList.js';
+import { listFocusForeground, listFocusBackground, foreground, editorBackground } from '../../../../platform/theme/common/colorRegistry.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { IListStyles } from '../../../../base/browser/ui/list/listWidget.js';
+import { HoverPosition } from '../../../../base/browser/ui/hover/hoverWidget.js';
+import { IStyleOverride } from '../../../../platform/theme/browser/defaultStyles.js';
+import { getAriaLabelForExtension } from './extensionsViews.js';
 
 export class ExtensionsGridView extends Disposable {
 
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
index 7ca65d956ce..18d5dd82d93 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
@@ -3,67 +3,72 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/extensionsViewlet';
-import { localize, localize2 } from 'vs/nls';
-import { timeout, Delayer, Promises } from 'vs/base/common/async';
-import { isCancellationError } from 'vs/base/common/errors';
-import { createErrorWithActions } from 'vs/base/common/errorMessage';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { Event } from 'vs/base/common/event';
-import { Action } from 'vs/base/common/actions';
-import { append, $, Dimension, hide, show, DragAndDropObserver, trackFocus } from 'vs/base/browser/dom';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IExtensionsWorkbenchService, IExtensionsViewPaneContainer, VIEWLET_ID, CloseExtensionDetailsOnViewChangeKey, INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID, WORKSPACE_RECOMMENDATIONS_VIEW_ID, AutoCheckUpdatesConfigurationKey, OUTDATED_EXTENSIONS_VIEW_ID, CONTEXT_HAS_GALLERY, extensionsSearchActionsMenu } from '../common/extensions';
-import { InstallLocalExtensionsInRemoteAction, InstallRemoteExtensionsInLocalAction } from 'vs/workbench/contrib/extensions/browser/extensionsActions';
-import { IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IWorkbenchExtensionEnablementService, IExtensionManagementServerService, IExtensionManagementServer } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { ExtensionsInput } from 'vs/workbench/contrib/extensions/common/extensionsInput';
-import { ExtensionsListView, EnabledExtensionsView, DisabledExtensionsView, RecommendedExtensionsView, WorkspaceRecommendedExtensionsView, ServerInstalledExtensionsView, DefaultRecommendedExtensionsView, UntrustedWorkspaceUnsupportedExtensionsView, UntrustedWorkspacePartiallySupportedExtensionsView, VirtualWorkspaceUnsupportedExtensionsView, VirtualWorkspacePartiallySupportedExtensionsView, DefaultPopularExtensionsView, DeprecatedExtensionsView, SearchMarketplaceExtensionsView, RecentlyUpdatedExtensionsView, OutdatedExtensionsView, StaticQueryExtensionsView, NONE_CATEGORY } from 'vs/workbench/contrib/extensions/browser/extensionsViews';
-import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import Severity from 'vs/base/common/severity';
-import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IViewsRegistry, IViewDescriptor, Extensions, ViewContainer, IViewDescriptorService, IAddedViewDescriptorRef, ViewContainerLocation } from 'vs/workbench/common/views';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IContextKeyService, ContextKeyExpr, RawContextKey, IContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { ILogService } from 'vs/platform/log/common/log';
-import { INotificationService, NotificationPriority } from 'vs/platform/notification/common/notification';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
-import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
-import { ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
-import { Query } from 'vs/workbench/contrib/extensions/common/extensionQuery';
-import { SuggestEnabledInput } from 'vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput';
-import { alert } from 'vs/base/browser/ui/aria/aria';
-import { EXTENSION_CATEGORIES, ExtensionType } from 'vs/platform/extensions/common/extensions';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { MementoObject } from 'vs/workbench/common/memento';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
-import { SIDE_BAR_DRAG_AND_DROP_BACKGROUND } from 'vs/workbench/common/theme';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { VirtualWorkspaceContext, WorkbenchStateContext } from 'vs/workbench/common/contextkeys';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { installLocalInRemoteIcon } from 'vs/workbench/contrib/extensions/browser/extensionsIcons';
-import { registerAction2, Action2, MenuId } from 'vs/platform/actions/common/actions';
-import { IPaneComposite } from 'vs/workbench/common/panecomposite';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { coalesce } from 'vs/base/common/arrays';
-import { extractEditorsAndFilesDropData } from 'vs/platform/dnd/browser/dnd';
-import { extname } from 'vs/base/common/resources';
-import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { ILocalizedString } from 'vs/platform/action/common/action';
-import { registerNavigableContainer } from 'vs/workbench/browser/actions/widgetNavigationCommands';
-import { MenuWorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
-import { createActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
+import './media/extensionsViewlet.css';
+import { localize, localize2 } from '../../../../nls.js';
+import { timeout, Delayer, Promises } from '../../../../base/common/async.js';
+import { isCancellationError } from '../../../../base/common/errors.js';
+import { createErrorWithActions } from '../../../../base/common/errorMessage.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { Disposable, DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { Event } from '../../../../base/common/event.js';
+import { Action } from '../../../../base/common/actions.js';
+import { append, $, Dimension, hide, show, DragAndDropObserver, trackFocus, addDisposableListener, EventType, clearNode } from '../../../../base/browser/dom.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IExtensionsWorkbenchService, IExtensionsViewPaneContainer, VIEWLET_ID, CloseExtensionDetailsOnViewChangeKey, INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID, WORKSPACE_RECOMMENDATIONS_VIEW_ID, AutoCheckUpdatesConfigurationKey, OUTDATED_EXTENSIONS_VIEW_ID, CONTEXT_HAS_GALLERY, extensionsSearchActionsMenu, AutoRestartConfigurationKey } from '../common/extensions.js';
+import { InstallLocalExtensionsInRemoteAction, InstallRemoteExtensionsInLocalAction } from './extensionsActions.js';
+import { IExtensionManagementService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { IWorkbenchExtensionEnablementService, IExtensionManagementServerService, IExtensionManagementServer } from '../../../services/extensionManagement/common/extensionManagement.js';
+import { ExtensionsInput } from '../common/extensionsInput.js';
+import { ExtensionsListView, EnabledExtensionsView, DisabledExtensionsView, RecommendedExtensionsView, WorkspaceRecommendedExtensionsView, ServerInstalledExtensionsView, DefaultRecommendedExtensionsView, UntrustedWorkspaceUnsupportedExtensionsView, UntrustedWorkspacePartiallySupportedExtensionsView, VirtualWorkspaceUnsupportedExtensionsView, VirtualWorkspacePartiallySupportedExtensionsView, DefaultPopularExtensionsView, DeprecatedExtensionsView, SearchMarketplaceExtensionsView, RecentlyUpdatedExtensionsView, OutdatedExtensionsView, StaticQueryExtensionsView, NONE_CATEGORY } from './extensionsViews.js';
+import { IProgressService, ProgressLocation } from '../../../../platform/progress/common/progress.js';
+import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import Severity from '../../../../base/common/severity.js';
+import { IActivityService, IBadge, NumberBadge, WarningBadge } from '../../../services/activity/common/activity.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IViewsRegistry, IViewDescriptor, Extensions, ViewContainer, IViewDescriptorService, IAddedViewDescriptorRef, ViewContainerLocation } from '../../../common/views.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { IContextKeyService, ContextKeyExpr, RawContextKey, IContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { INotificationService, NotificationPriority } from '../../../../platform/notification/common/notification.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
+import { ViewPaneContainer } from '../../../browser/parts/views/viewPaneContainer.js';
+import { ViewPane } from '../../../browser/parts/views/viewPane.js';
+import { Query } from '../common/extensionQuery.js';
+import { SuggestEnabledInput } from '../../codeEditor/browser/suggestEnabledInput/suggestEnabledInput.js';
+import { alert } from '../../../../base/browser/ui/aria/aria.js';
+import { EXTENSION_CATEGORIES, ExtensionType } from '../../../../platform/extensions/common/extensions.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { MementoObject } from '../../../common/memento.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
+import { SIDE_BAR_DRAG_AND_DROP_BACKGROUND } from '../../../common/theme.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { VirtualWorkspaceContext, WorkbenchStateContext } from '../../../common/contextkeys.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { installLocalInRemoteIcon } from './extensionsIcons.js';
+import { registerAction2, Action2, MenuId } from '../../../../platform/actions/common/actions.js';
+import { IPaneComposite } from '../../../common/panecomposite.js';
+import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.js';
+import { coalesce } from '../../../../base/common/arrays.js';
+import { extractEditorsAndFilesDropData } from '../../../../platform/dnd/browser/dnd.js';
+import { extname } from '../../../../base/common/resources.js';
+import { areSameExtensions } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { ILocalizedString } from '../../../../platform/action/common/action.js';
+import { registerNavigableContainer } from '../../../browser/actions/widgetNavigationCommands.js';
+import { MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
+import { createActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { SeverityIcon } from '../../../../platform/severityIcon/browser/severityIcon.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { Codicon } from '../../../../base/common/codicons.js';
 
 export const DefaultViewsContext = new RawContextKey<boolean>('defaultExtensionViews', true);
 export const ExtensionsSortByContext = new RawContextKey<string>('extensionsSortByValue', '');
@@ -494,7 +499,9 @@ export class ExtensionsViewPaneContainer extends ViewPaneContainer implements IE
 
 	private searchDelayer: Delayer<void>;
 	private root: HTMLElement | undefined;
+	private header: HTMLElement | undefined;
 	private searchBox: SuggestEnabledInput | undefined;
+	private notificationContainer: HTMLElement | undefined;
 	private readonly searchViewletState: MementoObject;
 
 	constructor(
@@ -557,12 +564,12 @@ export class ExtensionsViewPaneContainer extends ViewPaneContainer implements IE
 		overlay.style.backgroundColor = overlayBackgroundColor;
 		hide(overlay);
 
-		const header = append(this.root, $('.header'));
+		this.header = append(this.root, $('.header'));
 		const placeholder = localize('searchExtensions', "Search Extensions in Marketplace");
 
 		const searchValue = this.searchViewletState['query.value'] ? this.searchViewletState['query.value'] : '';
 
-		const searchContainer = append(header, $('.extensions-search-container'));
+		const searchContainer = append(this.header, $('.extensions-search-container'));
 
 		this.searchBox = this._register(this.instantiationService.createInstance(SuggestEnabledInput, `${VIEWLET_ID}.searchbox`, searchContainer, {
 			triggerCharacters: ['@'],
@@ -575,6 +582,10 @@ export class ExtensionsViewPaneContainer extends ViewPaneContainer implements IE
 			provideResults: (query: string) => Query.suggestions(query)
 		}, placeholder, 'extensions:searchinput', { placeholderText: placeholder, value: searchValue }));
 
+		this.notificationContainer = append(this.header, $('.notification-container.hidden', { 'tabindex': '0' }));
+		this.renderNotificaiton();
+		this._register(this.extensionsWorkbenchService.onDidChangeExtensionsNotification(() => this.renderNotificaiton()));
+
 		this.updateInstalledExtensionsContexts();
 		if (this.searchBox.getValue()) {
 			this.triggerSearch();
@@ -657,13 +668,18 @@ export class ExtensionsViewPaneContainer extends ViewPaneContainer implements IE
 		this.searchBox?.focus();
 	}
 
+	private _dimension: Dimension | undefined;
 	override layout(dimension: Dimension): void {
+		this._dimension = dimension;
 		if (this.root) {
 			this.root.classList.toggle('narrow', dimension.width <= 250);
 			this.root.classList.toggle('mini', dimension.width <= 200);
 		}
 		this.searchBox?.layout(new Dimension(dimension.width - 34 - /*padding*/8 - (24 * 2), 20));
-		super.layout(new Dimension(dimension.width, dimension.height - 41));
+		const searchBoxHeight = 20 + 21 /*margin*/;
+		const headerHeight = this.header && !!this.notificationContainer?.childNodes.length ? this.notificationContainer.clientHeight + searchBoxHeight + 10 /*margin*/ : searchBoxHeight;
+		this.header!.style.height = `${headerHeight}px`;
+		super.layout(new Dimension(dimension.width, dimension.height - headerHeight));
 	}
 
 	override getOptimalWidth(): number {
@@ -684,6 +700,61 @@ export class ExtensionsViewPaneContainer extends ViewPaneContainer implements IE
 		}
 	}
 
+	private readonly notificationDisposables = this._register(new MutableDisposable<DisposableStore>());
+	private renderNotificaiton(): void {
+		if (!this.notificationContainer) {
+			return;
+		}
+
+		clearNode(this.notificationContainer);
+		this.notificationDisposables.value = new DisposableStore();
+		const status = this.extensionsWorkbenchService.getExtensionsNotification();
+		const query = status?.extensions.map(extension => `@id:${extension.identifier.id}`).join(' ');
+		if (status && (query === this.searchBox?.getValue() || !this.searchMarketplaceExtensionsContextKey.get())) {
+			this.notificationContainer.setAttribute('aria-label', status.message);
+			this.notificationContainer.classList.remove('hidden');
+			const messageContainer = append(this.notificationContainer, $('.message-container'));
+			append(messageContainer, $('span')).className = SeverityIcon.className(status.severity);
+			append(messageContainer, $('span.message', undefined, status.message));
+			const showAction = append(messageContainer,
+				$('span.message-text-action', {
+					'tabindex': '0',
+					'role': 'button',
+					'aria-label': `${status.message}. ${localize('click show', "Click to Show")}`
+				}, localize('show', "Show")));
+			this.notificationDisposables.value.add(addDisposableListener(showAction, EventType.CLICK, () => this.search(query ?? '')));
+			this.notificationDisposables.value.add(addDisposableListener(showAction, EventType.KEY_DOWN, (e: KeyboardEvent) => {
+				const standardKeyboardEvent = new StandardKeyboardEvent(e);
+				if (standardKeyboardEvent.keyCode === KeyCode.Enter || standardKeyboardEvent.keyCode === KeyCode.Space) {
+					this.search(query ?? '');
+				}
+				standardKeyboardEvent.stopPropagation();
+			}));
+			const dismissAction = append(this.notificationContainer,
+				$(`span.message-action${ThemeIcon.asCSSSelector(Codicon.close)}`, {
+					'tabindex': '0',
+					'role': 'button',
+					'aria-label': localize('dismiss', "Dismiss"),
+					'title': localize('dismiss', "Dismiss")
+				}));
+			this.notificationDisposables.value.add(addDisposableListener(dismissAction, EventType.CLICK, () => status.dismiss()));
+			this.notificationDisposables.value.add(addDisposableListener(dismissAction, EventType.KEY_DOWN, (e: KeyboardEvent) => {
+				const standardKeyboardEvent = new StandardKeyboardEvent(e);
+				if (standardKeyboardEvent.keyCode === KeyCode.Enter || standardKeyboardEvent.keyCode === KeyCode.Space) {
+					status.dismiss();
+				}
+				standardKeyboardEvent.stopPropagation();
+			}));
+		} else {
+			this.notificationContainer.removeAttribute('aria-label');
+			this.notificationContainer.classList.add('hidden');
+		}
+
+		if (this._dimension) {
+			this.layout(this._dimension);
+		}
+	}
+
 	private async updateInstalledExtensionsContexts(): Promise<void> {
 		const result = await this.extensionsWorkbenchService.queryLocal();
 		this.hasInstalledExtensionsContextKey.set(result.some(r => !r.isBuiltin));
@@ -737,6 +808,8 @@ export class ExtensionsViewPaneContainer extends ViewPaneContainer implements IE
 			this.defaultViewsContextKey.set(!value || ExtensionsListView.isSortInstalledExtensionsQuery(value));
 		});
 
+		this.renderNotificaiton();
+
 		return this.progress(Promise.all(this.panes.map(view =>
 			(<ExtensionsListView>view).show(this.normalizedQuery(), refresh)
 				.then(model => this.alertSearchResult(model.length, view.id))
@@ -846,31 +919,45 @@ export class StatusUpdater extends Disposable implements IWorkbenchContribution
 	constructor(
 		@IActivityService private readonly activityService: IActivityService,
 		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
-		@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService
+		@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService,
+		@IConfigurationService private readonly configurationService: IConfigurationService
 	) {
 		super();
 		this.onServiceChange();
-		this._register(Event.debounce(extensionsWorkbenchService.onChange, () => undefined, 100, undefined, undefined, undefined, this._store)(this.onServiceChange, this));
+		this._register(Event.any(Event.debounce(extensionsWorkbenchService.onChange, () => undefined, 100, undefined, undefined, undefined, this._store), extensionsWorkbenchService.onDidChangeExtensionsNotification)(this.onServiceChange, this));
 	}
 
 	private onServiceChange(): void {
 		this.badgeHandle.clear();
+		let badge: IBadge | undefined;
 
-		const actionRequired = this.extensionsWorkbenchService.installed.filter(e => e.runtimeState !== undefined);
-		const outdated = this.extensionsWorkbenchService.outdated.reduce((r, e) => r + (this.extensionEnablementService.isEnabled(e.local!) && !actionRequired.includes(e) ? 1 : 0), 0);
-		const newBadgeNumber = outdated + actionRequired.length;
-		if (newBadgeNumber > 0) {
-			let msg = '';
-			if (outdated) {
-				msg += outdated === 1 ? localize('extensionToUpdate', '{0} requires update', outdated) : localize('extensionsToUpdate', '{0} require update', outdated);
+		const extensionsNotification = this.extensionsWorkbenchService.getExtensionsNotification();
+		if (extensionsNotification) {
+			if (extensionsNotification.severity === Severity.Warning) {
+				badge = new WarningBadge(() => extensionsNotification.message);
 			}
-			if (outdated > 0 && actionRequired.length > 0) {
-				msg += ', ';
+		}
+
+		else {
+			const actionRequired = this.configurationService.getValue(AutoRestartConfigurationKey) === true ? [] : this.extensionsWorkbenchService.installed.filter(e => e.runtimeState !== undefined);
+			const outdated = this.extensionsWorkbenchService.outdated.reduce((r, e) => r + (this.extensionEnablementService.isEnabled(e.local!) && !actionRequired.includes(e) ? 1 : 0), 0);
+			const newBadgeNumber = outdated + actionRequired.length;
+			if (newBadgeNumber > 0) {
+				let msg = '';
+				if (outdated) {
+					msg += outdated === 1 ? localize('extensionToUpdate', '{0} requires update', outdated) : localize('extensionsToUpdate', '{0} require update', outdated);
+				}
+				if (outdated > 0 && actionRequired.length > 0) {
+					msg += ', ';
+				}
+				if (actionRequired.length) {
+					msg += actionRequired.length === 1 ? localize('extensionToReload', '{0} requires restart', actionRequired.length) : localize('extensionsToReload', '{0} require restart', actionRequired.length);
+				}
+				badge = new NumberBadge(newBadgeNumber, () => msg);
 			}
-			if (actionRequired.length) {
-				msg += actionRequired.length === 1 ? localize('extensionToReload', '{0} requires restart', actionRequired.length) : localize('extensionsToReload', '{0} require restart', actionRequired.length);
-			}
-			const badge = new NumberBadge(newBadgeNumber, () => msg);
+		}
+
+		if (badge) {
 			this.badgeHandle.value = this.activityService.showViewContainerActivity(VIEWLET_ID, { badge });
 		}
 	}
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
index 4dcb55bb040..32bb10a91bc 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
@@ -3,63 +3,62 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { Disposable, DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { Event, Emitter } from 'vs/base/common/event';
-import { isCancellationError, getErrorMessage } from 'vs/base/common/errors';
-import { createErrorWithActions } from 'vs/base/common/errorMessage';
-import { PagedModel, IPagedModel, IPager, DelayedPagedModel } from 'vs/base/common/paging';
-import { SortOrder, IQueryOptions as IGalleryQueryOptions, SortBy as GallerySortBy, InstallExtensionInfo } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IExtensionManagementServer, IExtensionManagementServerService, EnablementState, IWorkbenchExtensionManagementService, IWorkbenchExtensionEnablementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { IExtensionRecommendationsService } from 'vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
-import { areSameExtensions, getExtensionDependencies } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { append, $ } from 'vs/base/browser/dom';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { Delegate, Renderer, IExtensionsViewState } from 'vs/workbench/contrib/extensions/browser/extensionsList';
-import { ExtensionState, IExtension, IExtensionsWorkbenchService, IWorkspaceRecommendedExtensionsView } from 'vs/workbench/contrib/extensions/common/extensions';
-import { Query } from 'vs/workbench/contrib/extensions/common/extensionQuery';
-import { IExtensionService, toExtension } from 'vs/workbench/services/extensions/common/extensions';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge';
-import { ManageExtensionAction, getContextMenuActions, ExtensionAction } from 'vs/workbench/contrib/extensions/browser/extensionsActions';
-import { WorkbenchPagedList } from 'vs/platform/list/browser/listService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { ViewPane, IViewPaneOptions, ViewPaneShowActions } from 'vs/workbench/browser/parts/views/viewPane';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { coalesce, distinct } from 'vs/base/common/arrays';
-import { alert } from 'vs/base/browser/ui/aria/aria';
-import { IListContextMenuEvent } from 'vs/base/browser/ui/list/list';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IAction, Action, Separator, ActionRunner } from 'vs/base/common/actions';
-import { ExtensionIdentifier, ExtensionIdentifierMap, ExtensionUntrustedWorkspaceSupportType, ExtensionVirtualWorkspaceSupportType, IExtensionDescription, isLanguagePackExtension } from 'vs/platform/extensions/common/extensions';
-import { CancelablePromise, createCancelablePromise, ThrottledDelayer } from 'vs/base/common/async';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { SeverityIcon } from 'vs/platform/severityIcon/browser/severityIcon';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
-import { IViewDescriptorService, ViewContainerLocation } from 'vs/workbench/common/views';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IExtensionManifestPropertiesService } from 'vs/workbench/services/extensions/common/extensionManifestPropertiesService';
-import { isVirtualWorkspace } from 'vs/platform/workspace/common/virtualWorkspace';
-import { IWorkspaceTrustManagementService } from 'vs/platform/workspace/common/workspaceTrust';
-import { IWorkbenchLayoutService, Position } from 'vs/workbench/services/layout/browser/layoutService';
-import { HoverPosition } from 'vs/base/browser/ui/hover/hoverWidget';
-import { ILogService } from 'vs/platform/log/common/log';
-import { isOfflineError } from 'vs/base/parts/request/common/request';
-import { defaultCountBadgeStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Extensions, IExtensionFeatureRenderer, IExtensionFeaturesManagementService, IExtensionFeaturesRegistry } from 'vs/workbench/services/extensionManagement/common/extensionFeatures';
-import { URI } from 'vs/base/common/uri';
-import { isString } from 'vs/base/common/types';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import { localize } from '../../../../nls.js';
+import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { isCancellationError, getErrorMessage } from '../../../../base/common/errors.js';
+import { createErrorWithActions } from '../../../../base/common/errorMessage.js';
+import { PagedModel, IPagedModel, IPager, DelayedPagedModel } from '../../../../base/common/paging.js';
+import { SortOrder, IQueryOptions as IGalleryQueryOptions, SortBy as GallerySortBy, InstallExtensionInfo, ExtensionGalleryErrorCode, ExtensionGalleryError } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { IExtensionManagementServer, IExtensionManagementServerService, EnablementState, IWorkbenchExtensionManagementService, IWorkbenchExtensionEnablementService } from '../../../services/extensionManagement/common/extensionManagement.js';
+import { IExtensionRecommendationsService } from '../../../services/extensionRecommendations/common/extensionRecommendations.js';
+import { areSameExtensions, getExtensionDependencies } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { append, $ } from '../../../../base/browser/dom.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { Delegate, Renderer, IExtensionsViewState } from './extensionsList.js';
+import { ExtensionState, IExtension, IExtensionsWorkbenchService, IWorkspaceRecommendedExtensionsView } from '../common/extensions.js';
+import { Query } from '../common/extensionQuery.js';
+import { IExtensionService, toExtension } from '../../../services/extensions/common/extensions.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IViewletViewOptions } from '../../../browser/parts/views/viewsViewlet.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { CountBadge } from '../../../../base/browser/ui/countBadge/countBadge.js';
+import { ManageExtensionAction, getContextMenuActions, ExtensionAction } from './extensionsActions.js';
+import { WorkbenchPagedList } from '../../../../platform/list/browser/listService.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { ViewPane, IViewPaneOptions, ViewPaneShowActions } from '../../../browser/parts/views/viewPane.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { coalesce, distinct } from '../../../../base/common/arrays.js';
+import { alert } from '../../../../base/browser/ui/aria/aria.js';
+import { IListContextMenuEvent } from '../../../../base/browser/ui/list/list.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IAction, Action, Separator, ActionRunner } from '../../../../base/common/actions.js';
+import { ExtensionIdentifier, ExtensionIdentifierMap, ExtensionUntrustedWorkspaceSupportType, ExtensionVirtualWorkspaceSupportType, IExtensionDescription, isLanguagePackExtension } from '../../../../platform/extensions/common/extensions.js';
+import { CancelablePromise, createCancelablePromise, ThrottledDelayer } from '../../../../base/common/async.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { SeverityIcon } from '../../../../platform/severityIcon/browser/severityIcon.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IViewDescriptorService, ViewContainerLocation } from '../../../common/views.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IExtensionManifestPropertiesService } from '../../../services/extensions/common/extensionManifestPropertiesService.js';
+import { isVirtualWorkspace } from '../../../../platform/workspace/common/virtualWorkspace.js';
+import { IWorkspaceTrustManagementService } from '../../../../platform/workspace/common/workspaceTrust.js';
+import { IWorkbenchLayoutService, Position } from '../../../services/layout/browser/layoutService.js';
+import { HoverPosition } from '../../../../base/browser/ui/hover/hoverWidget.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { isOfflineError } from '../../../../base/parts/request/common/request.js';
+import { defaultCountBadgeStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Extensions, IExtensionFeatureRenderer, IExtensionFeaturesManagementService, IExtensionFeaturesRegistry } from '../../../services/extensionManagement/common/extensionFeatures.js';
+import { URI } from '../../../../base/common/uri.js';
+import { isString } from '../../../../base/common/types.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 
 export const NONE_CATEGORY = 'none';
 
@@ -214,9 +213,7 @@ export class ExtensionsListView extends ViewPane {
 					return localize('extensions', "Extensions");
 				}
 			},
-			overrideStyles: {
-				listBackground: SIDE_BAR_BACKGROUND
-			},
+			overrideStyles: this.getLocationBasedColors().listOverrideStyles,
 			openOnSingleClick: true
 		}) as WorkbenchPagedList<IExtension>;
 		this._register(this.list.onContextMenu(e => this.onContextMenu(e), this));
@@ -555,11 +552,24 @@ export class ExtensionsListView extends ViewPane {
 				return isE1Running ? -1 : 1;
 			};
 
+			const incompatible: IExtension[] = [];
+			const missingDeps: IExtension[] = [];
+			const deprecated: IExtension[] = [];
 			const outdated: IExtension[] = [];
 			const actionRequired: IExtension[] = [];
 			const noActionRequired: IExtension[] = [];
-			result.forEach(e => {
-				if (e.outdated) {
+
+			for (const e of result) {
+				if (e.enablementState === EnablementState.DisabledByInvalidExtension) {
+					incompatible.push(e);
+				}
+				else if (e.enablementState === EnablementState.DisabledByExtensionDependency) {
+					missingDeps.push(e);
+				}
+				else if (e.deprecationInfo) {
+					deprecated.push(e);
+				}
+				else if (e.outdated) {
 					outdated.push(e);
 				}
 				else if (e.runtimeState) {
@@ -568,9 +578,16 @@ export class ExtensionsListView extends ViewPane {
 				else {
 					noActionRequired.push(e);
 				}
-			});
+			}
 
-			result = [...outdated.sort(defaultSort), ...actionRequired.sort(defaultSort), ...noActionRequired.sort(defaultSort)];
+			result = [
+				...incompatible.sort(defaultSort),
+				...missingDeps.sort(defaultSort),
+				...deprecated.sort(defaultSort),
+				...outdated.sort(defaultSort),
+				...actionRequired.sort(defaultSort),
+				...noActionRequired.sort(defaultSort)
+			];
 		}
 		return result;
 	}
@@ -900,10 +917,16 @@ export class ExtensionsListView extends ViewPane {
 				}
 			}
 			if (galleryExtensions.length) {
-				const extensions = await this.extensionsWorkbenchService.getExtensions(galleryExtensions.map(id => ({ id })), { source: options.source }, token);
-				for (const extension of extensions) {
-					if (extension.gallery && !extension.deprecationInfo && (await this.extensionManagementService.canInstall(extension.gallery))) {
-						result.push(extension);
+				try {
+					const extensions = await this.extensionsWorkbenchService.getExtensions(galleryExtensions.map(id => ({ id })), { source: options.source }, token);
+					for (const extension of extensions) {
+						if (extension.gallery && !extension.deprecationInfo && (await this.extensionManagementService.canInstall(extension.gallery))) {
+							result.push(extension);
+						}
+					}
+				} catch (error) {
+					if (!resourceExtensions.length || !this.isOfflineError(error)) {
+						throw error;
 					}
 				}
 			}
@@ -1070,7 +1093,7 @@ export class ExtensionsListView extends ViewPane {
 
 			if (count === 0 && this.isBodyVisible()) {
 				if (error) {
-					if (isOfflineError(error)) {
+					if (this.isOfflineError(error)) {
 						this.bodyTemplate.messageSeverityIcon.className = SeverityIcon.className(Severity.Warning);
 						this.bodyTemplate.messageBox.textContent = localize('offline error', "Unable to search the Marketplace when offline, please check your network connection.");
 					} else {
@@ -1088,6 +1111,13 @@ export class ExtensionsListView extends ViewPane {
 		this.updateSize();
 	}
 
+	private isOfflineError(error: Error): boolean {
+		if (error instanceof ExtensionGalleryError) {
+			return error.code === ExtensionGalleryErrorCode.Offline;
+		}
+		return isOfflineError(error);
+	}
+
 	protected updateSize() {
 		if (this.options.flexibleHeight) {
 			this.maximumBodySize = this.list?.model.length ? Number.POSITIVE_INFINITY : 0;
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts
index 3a92bc9aa69..417c7bba2a7 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts
@@ -3,46 +3,46 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/extensionsWidgets';
-import * as semver from 'vs/base/common/semver/semver';
-import { Disposable, toDisposable, DisposableStore, MutableDisposable, IDisposable } from 'vs/base/common/lifecycle';
-import { IExtension, IExtensionsWorkbenchService, IExtensionContainer, ExtensionState, ExtensionEditorTab } from 'vs/workbench/contrib/extensions/common/extensions';
-import { append, $, reset, addDisposableListener, EventType, finalHandler } from 'vs/base/browser/dom';
-import * as platform from 'vs/base/common/platform';
-import { localize } from 'vs/nls';
-import { EnablementState, IExtensionManagementServerService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { IExtensionIgnoredRecommendationsService, IExtensionRecommendationsService } from 'vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { extensionButtonProminentBackground, ExtensionStatusAction } from 'vs/workbench/contrib/extensions/browser/extensionsActions';
-import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { EXTENSION_BADGE_REMOTE_BACKGROUND, EXTENSION_BADGE_REMOTE_FOREGROUND } from 'vs/workbench/common/theme';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IUserDataSyncEnablementService } from 'vs/platform/userDataSync/common/userDataSync';
-import { activationTimeIcon, errorIcon, infoIcon, installCountIcon, preReleaseIcon, ratingIcon, remoteIcon, sponsorIcon, starEmptyIcon, starFullIcon, starHalfIcon, syncIgnoredIcon, verifiedPublisherIcon, warningIcon } from 'vs/workbench/contrib/extensions/browser/extensionsIcons';
-import { registerColor, textLinkForeground } from 'vs/platform/theme/common/colorRegistry';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { HoverPosition } from 'vs/base/browser/ui/hover/hoverWidget';
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { URI } from 'vs/base/common/uri';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import Severity from 'vs/base/common/severity';
-import { Color } from 'vs/base/common/color';
-import { renderMarkdown } from 'vs/base/browser/markdownRenderer';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { renderIcon } from 'vs/base/browser/ui/iconLabel/iconLabels';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { defaultCountBadgeStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import type { IManagedHover } from 'vs/base/browser/ui/hover/hover';
+import './media/extensionsWidgets.css';
+import * as semver from '../../../../base/common/semver/semver.js';
+import { Disposable, toDisposable, DisposableStore, MutableDisposable, IDisposable } from '../../../../base/common/lifecycle.js';
+import { IExtension, IExtensionsWorkbenchService, IExtensionContainer, ExtensionState, ExtensionEditorTab } from '../common/extensions.js';
+import { append, $, reset, addDisposableListener, EventType, finalHandler } from '../../../../base/browser/dom.js';
+import * as platform from '../../../../base/common/platform.js';
+import { localize } from '../../../../nls.js';
+import { IExtensionManagementServerService } from '../../../services/extensionManagement/common/extensionManagement.js';
+import { IExtensionIgnoredRecommendationsService, IExtensionRecommendationsService } from '../../../services/extensionRecommendations/common/extensionRecommendations.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { extensionButtonProminentBackground, ExtensionStatusAction } from './extensionsActions.js';
+import { IThemeService, registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { EXTENSION_BADGE_REMOTE_BACKGROUND, EXTENSION_BADGE_REMOTE_FOREGROUND } from '../../../common/theme.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { CountBadge } from '../../../../base/browser/ui/countBadge/countBadge.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IUserDataSyncEnablementService } from '../../../../platform/userDataSync/common/userDataSync.js';
+import { activationTimeIcon, errorIcon, infoIcon, installCountIcon, preReleaseIcon, ratingIcon, remoteIcon, sponsorIcon, starEmptyIcon, starFullIcon, starHalfIcon, syncIgnoredIcon, verifiedPublisherIcon, warningIcon } from './extensionsIcons.js';
+import { registerColor, textLinkForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { HoverPosition } from '../../../../base/browser/ui/hover/hoverWidget.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { areSameExtensions } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import Severity from '../../../../base/common/severity.js';
+import { Color } from '../../../../base/common/color.js';
+import { renderMarkdown } from '../../../../base/browser/markdownRenderer.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { defaultCountBadgeStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import type { IManagedHover } from '../../../../base/browser/ui/hover/hover.js';
 
 export abstract class ExtensionWidget extends Disposable implements IExtensionContainer {
 	private _extension: IExtension | null = null;
@@ -501,7 +501,7 @@ export class ExtensionActivationStatusWidget extends ExtensionWidget {
 			return;
 		}
 
-		const extensionStatus = this.extensionsWorkbenchService.getExtensionStatus(this.extension);
+		const extensionStatus = this.extensionsWorkbenchService.getExtensionRuntimeStatus(this.extension);
 		if (!extensionStatus || !extensionStatus.activationTimes) {
 			return;
 		}
@@ -561,7 +561,18 @@ export class ExtensionHoverWidget extends ExtensionWidget {
 					}, focus);
 				},
 				placement: 'element'
-			}, this.options.target, { markdown: () => Promise.resolve(this.getHoverMarkdown()), markdownNotSupportedFallback: undefined });
+			},
+				this.options.target,
+				{
+					markdown: () => Promise.resolve(this.getHoverMarkdown()),
+					markdownNotSupportedFallback: undefined
+				},
+				{
+					appearance: {
+						showHoverHint: true
+					}
+				}
+			);
 		}
 	}
 
@@ -636,12 +647,12 @@ export class ExtensionHoverWidget extends ExtensionWidget {
 		}
 
 		const preReleaseMessage = ExtensionHoverWidget.getPreReleaseMessage(this.extension);
-		const extensionRuntimeStatus = this.extensionsWorkbenchService.getExtensionStatus(this.extension);
+		const extensionRuntimeStatus = this.extensionsWorkbenchService.getExtensionRuntimeStatus(this.extension);
 		const extensionStatus = this.extensionStatusAction.status;
 		const runtimeState = this.extension.runtimeState;
 		const recommendationMessage = this.getRecommendationMessage(this.extension);
 
-		if (extensionRuntimeStatus || extensionStatus || runtimeState || recommendationMessage || preReleaseMessage) {
+		if (extensionRuntimeStatus || extensionStatus.length || runtimeState || recommendationMessage || preReleaseMessage) {
 
 			markdown.appendMarkdown(`---`);
 			markdown.appendText(`\n`);
@@ -667,14 +678,11 @@ export class ExtensionHoverWidget extends ExtensionWidget {
 				}
 			}
 
-			if (extensionStatus) {
-				if (extensionStatus.icon) {
-					markdown.appendMarkdown(`$(${extensionStatus.icon.id})&nbsp;`);
-				}
-				markdown.appendMarkdown(extensionStatus.message.value);
-				if (this.extension.enablementState === EnablementState.DisabledByExtensionDependency && this.extension.local) {
-					markdown.appendMarkdown(`&nbsp;[${localize('dependencies', "Show Dependencies")}](${URI.parse(`command:extension.open?${encodeURIComponent(JSON.stringify([this.extension.identifier.id, ExtensionEditorTab.Dependencies]))}`)})`);
+			for (const status of extensionStatus) {
+				if (status.icon) {
+					markdown.appendMarkdown(`$(${status.icon.id})&nbsp;`);
 				}
+				markdown.appendMarkdown(status.message.value);
 				markdown.appendText(`\n`);
 			}
 
@@ -756,12 +764,18 @@ export class ExtensionStatusWidget extends ExtensionWidget {
 		const disposables = new DisposableStore();
 		this.renderDisposables.value = disposables;
 		const extensionStatus = this.extensionStatusAction.status;
-		if (extensionStatus) {
+		if (extensionStatus.length) {
 			const markdown = new MarkdownString('', { isTrusted: true, supportThemeIcons: true });
-			if (extensionStatus.icon) {
-				markdown.appendMarkdown(`$(${extensionStatus.icon.id})&nbsp;`);
+			for (let i = 0; i < extensionStatus.length; i++) {
+				const status = extensionStatus[i];
+				if (status.icon) {
+					markdown.appendMarkdown(`$(${status.icon.id})&nbsp;`);
+				}
+				markdown.appendMarkdown(status.message.value);
+				if (i < extensionStatus.length - 1) {
+					markdown.appendText(`\n`);
+				}
 			}
-			markdown.appendMarkdown(extensionStatus.message.value);
 			const rendered = disposables.add(renderMarkdown(markdown, {
 				actionHandler: {
 					callback: (content) => {
@@ -824,7 +838,7 @@ export class ExtensionRecommendationWidget extends ExtensionWidget {
 }
 
 export const extensionRatingIconColor = registerColor('extensionIcon.starForeground', { light: '#DF6100', dark: '#FF8E00', hcDark: '#FF8E00', hcLight: textLinkForeground }, localize('extensionIconStarForeground', "The icon color for extension ratings."), true);
-export const extensionVerifiedPublisherIconColor = registerColor('extensionIcon.verifiedForeground', { dark: textLinkForeground, light: textLinkForeground, hcDark: textLinkForeground, hcLight: textLinkForeground }, localize('extensionIconVerifiedForeground', "The icon color for extension verified publisher."), true);
+export const extensionVerifiedPublisherIconColor = registerColor('extensionIcon.verifiedForeground', textLinkForeground, localize('extensionIconVerifiedForeground', "The icon color for extension verified publisher."), true);
 export const extensionPreReleaseIconColor = registerColor('extensionIcon.preReleaseForeground', { dark: '#1d9271', light: '#1d9271', hcDark: '#1d9271', hcLight: textLinkForeground }, localize('extensionPreReleaseForeground', "The icon color for pre-release extension."), true);
 export const extensionSponsorIconColor = registerColor('extensionIcon.sponsorForeground', { light: '#B51E78', dark: '#D758B3', hcDark: null, hcLight: '#B51E78' }, localize('extensionIcon.sponsorForeground', "The icon color for extension sponsor."), true);
 
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
index f6b528933c6..e34a9006982 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
@@ -3,61 +3,65 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import * as semver from 'vs/base/common/semver/semver';
-import { Event, Emitter } from 'vs/base/common/event';
-import { firstOrDefault, index } from 'vs/base/common/arrays';
-import { CancelablePromise, Promises, ThrottledDelayer, createCancelablePromise } from 'vs/base/common/async';
-import { CancellationError, isCancellationError } from 'vs/base/common/errors';
-import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IPager, singlePagePager } from 'vs/base/common/paging';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import * as nls from '../../../../nls.js';
+import * as semver from '../../../../base/common/semver/semver.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { index } from '../../../../base/common/arrays.js';
+import { CancelablePromise, Promises, ThrottledDelayer, createCancelablePromise } from '../../../../base/common/async.js';
+import { CancellationError, isCancellationError } from '../../../../base/common/errors.js';
+import { Disposable, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { IPager, singlePagePager } from '../../../../base/common/paging.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import {
 	IExtensionGalleryService, ILocalExtension, IGalleryExtension, IQueryOptions,
 	InstallExtensionEvent, DidUninstallExtensionEvent, InstallOperation, WEB_EXTENSION_TAG, InstallExtensionResult,
 	IExtensionsControlManifest, IExtensionInfo, IExtensionQueryOptions, IDeprecationInfo, isTargetPlatformCompatible, InstallExtensionInfo, EXTENSION_IDENTIFIER_REGEX,
-	InstallOptions, IProductVersion
-} from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionManagementServer, IWorkbenchExtensionManagementService, DefaultIconPath, IResourceExtension } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { getGalleryExtensionTelemetryData, getLocalExtensionTelemetryData, areSameExtensions, groupByExtension, getGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { URI } from 'vs/base/common/uri';
-import { IExtension, ExtensionState, IExtensionsWorkbenchService, AutoUpdateConfigurationKey, AutoCheckUpdatesConfigurationKey, HasOutdatedExtensionsContext, AutoUpdateConfigurationValue, InstallExtensionOptions, ExtensionRuntimeState, ExtensionRuntimeActionType } from 'vs/workbench/contrib/extensions/common/extensions';
-import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { IURLService, IURLHandler, IOpenURLOptions } from 'vs/platform/url/common/url';
-import { ExtensionsInput, IExtensionEditorOptions } from 'vs/workbench/contrib/extensions/common/extensionsInput';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProgressOptions, IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import * as resources from 'vs/base/common/resources';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IExtensionManifest, ExtensionType, IExtension as IPlatformExtension, TargetPlatform, ExtensionIdentifier, IExtensionIdentifier, IExtensionDescription, isApplicationScopedExtension } from 'vs/platform/extensions/common/extensions';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { FileAccess } from 'vs/base/common/network';
-import { IIgnoredExtensionsManagementService } from 'vs/platform/userDataSync/common/ignoredExtensions';
-import { IUserDataAutoSyncService, IUserDataSyncEnablementService, SyncResource } from 'vs/platform/userDataSync/common/userDataSync';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { isBoolean, isString, isUndefined } from 'vs/base/common/types';
-import { IExtensionManifestPropertiesService } from 'vs/workbench/services/extensions/common/extensionManifestPropertiesService';
-import { IExtensionService, IExtensionsStatus, toExtension, toExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
-import { isWeb, language } from 'vs/base/common/platform';
-import { getLocale } from 'vs/platform/languagePacks/common/languagePacks';
-import { ILocaleService } from 'vs/workbench/services/localization/common/locale';
-import { TelemetryTrustedValue } from 'vs/platform/telemetry/common/telemetryUtils';
-import { ILifecycleService, LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { mainWindow } from 'vs/base/browser/window';
-import { IDialogService, IPromptButton } from 'vs/platform/dialogs/common/dialogs';
-import { IUpdateService, StateType } from 'vs/platform/update/common/update';
-import { isEngineValid } from 'vs/platform/extensions/common/extensionValidator';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { ShowCurrentReleaseNotesActionId } from 'vs/workbench/contrib/update/common/update';
+	InstallOptions, IProductVersion,
+	UninstallExtensionInfo
+} from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionManagementServer, IWorkbenchExtensionManagementService, DefaultIconPath, IResourceExtension, extensionsConfigurationNodeBase } from '../../../services/extensionManagement/common/extensionManagement.js';
+import { getGalleryExtensionTelemetryData, getLocalExtensionTelemetryData, areSameExtensions, groupByExtension, getGalleryExtensionId } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IExtension, ExtensionState, IExtensionsWorkbenchService, AutoUpdateConfigurationKey, AutoCheckUpdatesConfigurationKey, HasOutdatedExtensionsContext, AutoUpdateConfigurationValue, InstallExtensionOptions, ExtensionRuntimeState, ExtensionRuntimeActionType, AutoRestartConfigurationKey, VIEWLET_ID, IExtensionsViewPaneContainer, IExtensionsNotification } from '../common/extensions.js';
+import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from '../../../services/editor/common/editorService.js';
+import { IURLService, IURLHandler, IOpenURLOptions } from '../../../../platform/url/common/url.js';
+import { ExtensionsInput, IExtensionEditorOptions } from '../common/extensionsInput.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IProgressOptions, IProgressService, ProgressLocation } from '../../../../platform/progress/common/progress.js';
+import { INotificationService, NotificationPriority, Severity } from '../../../../platform/notification/common/notification.js';
+import * as resources from '../../../../base/common/resources.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IExtensionManifest, ExtensionType, IExtension as IPlatformExtension, TargetPlatform, ExtensionIdentifier, IExtensionIdentifier, IExtensionDescription, isApplicationScopedExtension } from '../../../../platform/extensions/common/extensions.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { FileAccess } from '../../../../base/common/network.js';
+import { IIgnoredExtensionsManagementService } from '../../../../platform/userDataSync/common/ignoredExtensions.js';
+import { IUserDataAutoSyncService, IUserDataSyncEnablementService, SyncResource } from '../../../../platform/userDataSync/common/userDataSync.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { isBoolean, isDefined, isString, isUndefined } from '../../../../base/common/types.js';
+import { IExtensionManifestPropertiesService } from '../../../services/extensions/common/extensionManifestPropertiesService.js';
+import { IExtensionService, IExtensionsStatus as IExtensionRuntimeStatus, toExtension, toExtensionDescription } from '../../../services/extensions/common/extensions.js';
+import { isWeb, language } from '../../../../base/common/platform.js';
+import { getLocale } from '../../../../platform/languagePacks/common/languagePacks.js';
+import { ILocaleService } from '../../../services/localization/common/locale.js';
+import { TelemetryTrustedValue } from '../../../../platform/telemetry/common/telemetryUtils.js';
+import { ILifecycleService, LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { IUserDataProfileService } from '../../../services/userDataProfile/common/userDataProfile.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { IDialogService, IPromptButton } from '../../../../platform/dialogs/common/dialogs.js';
+import { IUpdateService, StateType } from '../../../../platform/update/common/update.js';
+import { areApiProposalsCompatible, isEngineValid } from '../../../../platform/extensions/common/extensionValidator.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { ShowCurrentReleaseNotesActionId } from '../../update/common/update.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
 
 interface IExtensionStateProvider<T> {
 	(extension: Extension): T;
@@ -77,14 +81,15 @@ type ExtensionsLoadClassification = {
 export class Extension implements IExtension {
 
 	public enablementState: EnablementState = EnablementState.EnabledGlobally;
-	public readonly resourceExtension: IResourceExtension | undefined;
+
+	private galleryResourcesCache = new Map<string, any>();
 
 	constructor(
 		private stateProvider: IExtensionStateProvider<ExtensionState>,
 		private runtimeStateProvider: IExtensionStateProvider<ExtensionRuntimeState | undefined>,
 		public readonly server: IExtensionManagementServer | undefined,
 		public local: ILocalExtension | undefined,
-		public gallery: IGalleryExtension | undefined,
+		private _gallery: IGalleryExtension | undefined,
 		private readonly resourceExtensionInfo: { resourceExtension: IResourceExtension; isWorkspaceScoped: boolean } | undefined,
 		@IExtensionGalleryService private readonly galleryService: IExtensionGalleryService,
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
@@ -92,7 +97,32 @@ export class Extension implements IExtension {
 		@IFileService private readonly fileService: IFileService,
 		@IProductService private readonly productService: IProductService
 	) {
-		this.resourceExtension = resourceExtensionInfo?.resourceExtension;
+	}
+
+	get resourceExtension(): IResourceExtension | undefined {
+		if (this.resourceExtensionInfo) {
+			return this.resourceExtensionInfo.resourceExtension;
+		}
+		if (this.local?.isWorkspaceScoped) {
+			return {
+				type: 'resource',
+				identifier: this.local.identifier,
+				location: this.local.location,
+				manifest: this.local.manifest,
+				changelogUri: this.local.changelogUrl,
+				readmeUri: this.local.readmeUrl,
+			};
+		}
+		return undefined;
+	}
+
+	get gallery(): IGalleryExtension | undefined {
+		return this._gallery;
+	}
+
+	set gallery(gallery: IGalleryExtension | undefined) {
+		this._gallery = gallery;
+		this.galleryResourcesCache.clear();
 	}
 
 	get type(): ExtensionType {
@@ -339,8 +369,9 @@ export class Extension implements IExtension {
 		return !!this.gallery?.properties.isPreReleaseVersion;
 	}
 
+	private _extensionEnabledWithPreRelease: boolean | undefined;
 	get hasPreReleaseVersion(): boolean {
-		return !!this.gallery?.hasPreReleaseVersion || !!this.local?.hasPreReleaseVersion;
+		return !!this.gallery?.hasPreReleaseVersion || !!this.local?.hasPreReleaseVersion || !!this._extensionEnabledWithPreRelease;
 	}
 
 	get hasReleaseVersion(): boolean {
@@ -358,11 +389,7 @@ export class Extension implements IExtension {
 		}
 
 		if (this.gallery) {
-			if (this.gallery.assets.manifest) {
-				return this.galleryService.getManifest(this.gallery, token);
-			}
-			this.logService.error(nls.localize('Manifest is not found', "Manifest is not found"), this.identifier.id);
-			return null;
+			return this.getGalleryManifest(token);
 		}
 
 		if (this.resourceExtension) {
@@ -372,6 +399,25 @@ export class Extension implements IExtension {
 		return null;
 	}
 
+	async getGalleryManifest(token: CancellationToken = CancellationToken.None): Promise<IExtensionManifest | null> {
+		if (this.gallery) {
+			let cache = this.galleryResourcesCache.get('manifest');
+			if (!cache) {
+				if (this.gallery.assets.manifest) {
+					this.galleryResourcesCache.set('manifest', cache = this.galleryService.getManifest(this.gallery, token)
+						.catch(e => {
+							this.galleryResourcesCache.delete('manifest');
+							throw e;
+						}));
+				} else {
+					this.logService.error(nls.localize('Manifest is not found', "Manifest is not found"), this.identifier.id);
+				}
+			}
+			return cache;
+		}
+		return null;
+	}
+
 	hasReadme(): boolean {
 		if (this.local && this.local.readmeUrl) {
 			return true;
@@ -498,6 +544,12 @@ ${this.description}
 		return [];
 	}
 
+	setExtensionsControlManifest(extensionsControlManifest: IExtensionsControlManifest): void {
+		this.isMalicious = extensionsControlManifest.malicious.some(identifier => areSameExtensions(this.identifier, identifier));
+		this.deprecationInfo = extensionsControlManifest.deprecated ? extensionsControlManifest.deprecated[this.identifier.id.toLowerCase()] : undefined;
+		this._extensionEnabledWithPreRelease = extensionsControlManifest?.extensionsEnabledWithPreRelease?.includes(this.identifier.id.toLowerCase());
+	}
+
 	private getManifestFromLocalOrResource(): IExtensionManifest | null {
 		if (this.local) {
 			return this.local.manifest;
@@ -510,14 +562,11 @@ ${this.description}
 }
 
 const EXTENSIONS_AUTO_UPDATE_KEY = 'extensions.autoUpdate';
+const EXTENSIONS_DONOT_AUTO_UPDATE_KEY = 'extensions.donotAutoUpdate';
+const EXTENSIONS_DISMISSED_NOTIFICATIONS_KEY = 'extensions.dismissedNotifications';
 
 class Extensions extends Disposable {
 
-	static updateExtensionFromControlManifest(extension: Extension, extensionsControlManifest: IExtensionsControlManifest): void {
-		extension.isMalicious = extensionsControlManifest.malicious.some(identifier => areSameExtensions(extension.identifier, identifier));
-		extension.deprecationInfo = extensionsControlManifest.deprecated ? extensionsControlManifest.deprecated[extension.identifier.id.toLowerCase()] : undefined;
-	}
-
 	private readonly _onChange = this._register(new Emitter<{ extension: Extension; operation?: InstallOperation } | undefined>());
 	get onChange() { return this._onChange.event; }
 
@@ -721,7 +770,7 @@ class Extensions extends Disposable {
 			const extension = byId[local.identifier.id] || this.instantiationService.createInstance(Extension, this.stateProvider, this.runtimeStateProvider, this.server, local, undefined, undefined);
 			extension.local = local;
 			extension.enablementState = this.extensionEnablementService.getEnablementState(local);
-			Extensions.updateExtensionFromControlManifest(extension, extensionsControlManifest);
+			extension.setExtensionsControlManifest(extensionsControlManifest);
 			return extension;
 		});
 	}
@@ -757,7 +806,7 @@ class Extensions extends Disposable {
 					if (!extension.gallery) {
 						extension.gallery = gallery;
 					}
-					Extensions.updateExtensionFromControlManifest(extension, await this.server.extensionManagementService.getExtensionsControlManifest());
+					extension.setExtensionsControlManifest(await this.server.extensionManagementService.getExtensionsControlManifest());
 					extension.enablementState = this.extensionEnablementService.getEnablementState(local);
 				}
 			}
@@ -856,9 +905,13 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 	private updatesCheckDelayer: ThrottledDelayer<void>;
 	private autoUpdateDelayer: ThrottledDelayer<void>;
 
-	private readonly _onChange: Emitter<IExtension | undefined> = new Emitter<IExtension | undefined>();
+	private readonly _onChange = this._register(new Emitter<IExtension | undefined>());
 	get onChange(): Event<IExtension | undefined> { return this._onChange.event; }
 
+	private extensionsNotification: IExtensionsNotification | undefined;
+	private readonly _onDidChangeExtensionsNotification = new Emitter<IExtensionsNotification | undefined>();
+	readonly onDidChangeExtensionsNotification = this._onDidChangeExtensionsNotification.event;
+
 	private readonly _onReset = new Emitter<void>();
 	get onReset() { return this._onReset.event; }
 
@@ -900,6 +953,7 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		@IUpdateService private readonly updateService: IUpdateService,
 		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
 		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
+		@IViewsService private readonly viewsService: IViewsService,
 	) {
 		super();
 		const preferPreReleasesValue = configurationService.getValue('_extensions.preferPreReleases');
@@ -950,9 +1004,27 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 
 		urlService.registerHandler(this);
 
+		if (this.productService.quality !== 'stable') {
+			this.registerAutoRestartConfig();
+		}
+
 		this.whenInitialized = this.initialize();
 	}
 
+	private registerAutoRestartConfig(): void {
+		Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
+			.registerConfiguration({
+				...extensionsConfigurationNodeBase,
+				properties: {
+					[AutoRestartConfigurationKey]: {
+						type: 'boolean',
+						description: nls.localize('autoRestart', "If activated, extensions will automatically restart following an update if the window is not in focus. There can be a data loss if you have open Notebooks or Custom Editors."),
+						default: false,
+					}
+				}
+			});
+	}
+
 	private async initialize(): Promise<void> {
 		// initialize local extensions
 		await Promise.all([this.queryLocal(), this.extensionService.whenInstalledExtensionsRegistered()]);
@@ -966,17 +1038,26 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		if (this._store.isDisposed) {
 			return;
 		}
+
 		this.initializeAutoUpdate();
+		this.updateExtensionsNotificaiton();
 		this.reportInstalledExtensionsTelemetry();
-		this._register(Event.debounce(this.onChange, () => undefined, 100)(() => this.reportProgressFromOtherSources()));
-		this._register(this.storageService.onDidChangeValue(StorageScope.APPLICATION, EXTENSIONS_AUTO_UPDATE_KEY, this._store)(e => this.onDidSelectedExtensionToAutoUpdateValueChange(false)));
+		this._register(this.storageService.onDidChangeValue(StorageScope.PROFILE, EXTENSIONS_DISMISSED_NOTIFICATIONS_KEY, this._store)(e => this.onDidDismissedNotificationsValueChange()));
+		this._register(this.storageService.onDidChangeValue(StorageScope.APPLICATION, EXTENSIONS_AUTO_UPDATE_KEY, this._store)(e => this.onDidSelectedExtensionToAutoUpdateValueChange()));
+		this._register(this.storageService.onDidChangeValue(StorageScope.APPLICATION, EXTENSIONS_DONOT_AUTO_UPDATE_KEY, this._store)(e => this.onDidSelectedExtensionToAutoUpdateValueChange()));
+		this._register(Event.debounce(this.onChange, () => undefined, 100)(() => {
+			this.updateExtensionsNotificaiton();
+			this.reportProgressFromOtherSources();
+		}));
 	}
 
 	private initializeAutoUpdate(): void {
 		// Register listeners for auto updates
 		this._register(this.configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration(AutoUpdateConfigurationKey)) {
-				this.onDidAutoUpdateConfigurationChange();
+				if (this.isAutoUpdateEnabled()) {
+					this.eventuallyAutoUpdateExtensions();
+				}
 			}
 			if (e.affectsConfiguration(AutoCheckUpdatesConfigurationKey)) {
 				if (this.isAutoCheckUpdatesEnabled()) {
@@ -991,11 +1072,14 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		}));
 		this._register(Event.debounce(this.onChange, () => undefined, 100)(() => this.hasOutdatedExtensionsContextKey.set(this.outdated.length > 0)));
 		this._register(this.updateService.onStateChange(e => {
-			if (!this.isAutoUpdateEnabled()) {
-				return;
-			}
 			if ((e.type === StateType.CheckingForUpdates && e.explicit) || e.type === StateType.AvailableForDownload || e.type === StateType.Downloaded) {
-				this.eventuallyCheckForUpdates(true);
+				this.telemetryService.publicLog2<{}, {
+					owner: 'sandy081';
+					comment: 'Report when update check is triggered on product update';
+				}>('extensions:updatecheckonproductupdate');
+				if (this.isAutoCheckUpdatesEnabled()) {
+					this.checkForUpdates();
+				}
 			}
 		}));
 
@@ -1012,6 +1096,64 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 				this.autoUpdateBuiltinExtensions();
 			}
 		}
+
+		this.registerAutoRestartListener();
+		this._register(this.configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(AutoRestartConfigurationKey)) {
+				this.registerAutoRestartListener();
+			}
+		}));
+	}
+
+	private isAutoUpdateEnabled(): boolean {
+		return this.getAutoUpdateValue() !== false;
+	}
+
+	getAutoUpdateValue(): AutoUpdateConfigurationValue {
+		const autoUpdate = this.configurationService.getValue<AutoUpdateConfigurationValue>(AutoUpdateConfigurationKey);
+		if (<any>autoUpdate === 'onlySelectedExtensions') {
+			return false;
+		}
+		return isBoolean(autoUpdate) || autoUpdate === 'onlyEnabledExtensions' ? autoUpdate : true;
+	}
+
+	async updateAutoUpdateForAllExtensions(isAutoUpdateEnabled: boolean): Promise<void> {
+		const wasAutoUpdateEnabled = this.isAutoUpdateEnabled();
+		if (wasAutoUpdateEnabled === isAutoUpdateEnabled) {
+			return;
+		}
+
+		const result = await this.dialogService.confirm({
+			title: nls.localize('confirmEnableDisableAutoUpdate', "Auto Update Extensions"),
+			message: isAutoUpdateEnabled
+				? nls.localize('confirmEnableAutoUpdate', "Do you want to enable auto update for all extensions?")
+				: nls.localize('confirmDisableAutoUpdate', "Do you want to disable auto update for all extensions?"),
+			detail: nls.localize('confirmEnableDisableAutoUpdateDetail', "This will reset any auto update settings you have set for individual extensions."),
+		});
+		if (!result.confirmed) {
+			return;
+		}
+
+		// Reset extensions enabled for auto update first to prevent them from being updated
+		this.setEnabledAutoUpdateExtensions([]);
+
+		await this.configurationService.updateValue(AutoUpdateConfigurationKey, isAutoUpdateEnabled);
+
+		this.setDisabledAutoUpdateExtensions([]);
+		await this.updateExtensionsPinnedState(!isAutoUpdateEnabled);
+		this._onChange.fire(undefined);
+	}
+
+	private readonly autoRestartListenerDisposable = this._register(new MutableDisposable());
+	private registerAutoRestartListener(): void {
+		this.autoRestartListenerDisposable.value = undefined;
+		if (this.configurationService.getValue(AutoRestartConfigurationKey) === true) {
+			this.autoRestartListenerDisposable.value = this.hostService.onDidChangeFocus(focus => {
+				if (!focus && this.configurationService.getValue(AutoRestartConfigurationKey) === true) {
+					this.updateRunningExtensions(true);
+				}
+			});
+		}
 	}
 
 	private reportInstalledExtensionsTelemetry() {
@@ -1055,6 +1197,13 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		}
 	}
 
+	private updateExtensionsPinnedState(pinned: boolean): Promise<void> {
+		return this.progressService.withProgress({
+			location: ProgressLocation.Extensions,
+			title: nls.localize('updatingExtensions', "Updating Extensions Auto Update State"),
+		}, () => this.extensionManagementService.resetPinnedStateForAllUserExtensions(pinned));
+	}
+
 	private reset(): void {
 		for (const task of this.tasksInProgress) {
 			task.cancel();
@@ -1191,6 +1340,87 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 			?? this.instantiationService.createInstance(Extension, ext => this.getExtensionState(ext), ext => this.getRuntimeState(ext), undefined, undefined, undefined, { resourceExtension, isWorkspaceScoped }));
 	}
 
+	private onDidDismissedNotificationsValueChange(): void {
+		if (
+			this.dismissedNotificationsValue !== this.getDismissedNotificationsValue() /* This checks if current window changed the value or not */
+		) {
+			this._dismissedNotificationsValue = undefined;
+			this.updateExtensionsNotificaiton();
+		}
+	}
+
+	private updateExtensionsNotificaiton(): void {
+		const computedNotificiations = this.computeExtensionsNotifications();
+		const dismissedNotifications: string[] = [];
+
+		let extensionsNotification: IExtensionsNotification | undefined;
+		if (computedNotificiations.length) {
+			// populate dismissed notifications with the ones that are still valid
+			for (const dismissedNotification of this.getDismissedNotifications()) {
+				if (computedNotificiations.some(e => e.key === dismissedNotification)) {
+					dismissedNotifications.push(dismissedNotification);
+				}
+			}
+			if (!dismissedNotifications.includes(computedNotificiations[0].key)) {
+				extensionsNotification = {
+					message: computedNotificiations[0].message,
+					severity: computedNotificiations[0].severity,
+					extensions: computedNotificiations[0].extensions,
+					dismiss: () => {
+						this.setDismissedNotifications([...this.getDismissedNotifications(), computedNotificiations[0].key]);
+						this.updateExtensionsNotificaiton();
+					},
+				};
+			}
+		}
+		this.setDismissedNotifications(dismissedNotifications);
+
+		if (this.extensionsNotification?.message !== extensionsNotification?.message) {
+			this.extensionsNotification = extensionsNotification;
+			this._onDidChangeExtensionsNotification.fire(this.extensionsNotification);
+		}
+	}
+
+	private computeExtensionsNotifications(): Array<Omit<IExtensionsNotification, 'dismiss'> & { key: string }> {
+		const computedNotificiations: Array<Omit<IExtensionsNotification, 'dismiss'> & { key: string }> = [];
+		const invalidExtensions = this.local.filter(e => e.enablementState === EnablementState.DisabledByInvalidExtension && !e.isWorkspaceScoped);
+		if (invalidExtensions.length) {
+			if (invalidExtensions.some(e => e.local && e.local.manifest.engines?.vscode &&
+				(!isEngineValid(e.local.manifest.engines.vscode, this.productService.version, this.productService.date) || areApiProposalsCompatible([...e.local.manifest.enabledApiProposals ?? []]))
+			)) {
+				computedNotificiations.push({
+					message: nls.localize('incompatibleExtensions', "Some extensions are disabled due to version incompatibility. Review and update them."),
+					severity: Severity.Warning,
+					extensions: invalidExtensions,
+					key: 'incompatibleExtensions:' + invalidExtensions.sort((a, b) => a.identifier.id.localeCompare(b.identifier.id)).map(e => `${e.identifier.id.toLowerCase()}@${e.local?.manifest.version}`).join('-'),
+				});
+			} else {
+				computedNotificiations.push({
+					message: nls.localize('invalidExtensions', "Invalid extensions detected. Review them."),
+					severity: Severity.Warning,
+					extensions: invalidExtensions,
+					key: 'invalidExtensions:' + invalidExtensions.sort((a, b) => a.identifier.id.localeCompare(b.identifier.id)).map(e => `${e.identifier.id.toLowerCase()}@${e.local?.manifest.version}`).join('-'),
+				});
+			}
+		}
+
+		const deprecatedExtensions = this.local.filter(e => !!e.deprecationInfo && e.local && this.extensionEnablementService.isEnabled(e.local));
+		if (deprecatedExtensions.length) {
+			computedNotificiations.push({
+				message: nls.localize('deprecated extensions', "Deprecated extensions detected. Review them and migrate to alternatives."),
+				severity: Severity.Warning,
+				extensions: deprecatedExtensions,
+				key: 'deprecatedExtensions:' + deprecatedExtensions.sort((a, b) => a.identifier.id.localeCompare(b.identifier.id)).map(e => e.identifier.id.toLowerCase()).join('-'),
+			});
+		}
+
+		return computedNotificiations;
+	}
+
+	getExtensionsNotification(): IExtensionsNotification | undefined {
+		return this.extensionsNotification;
+	}
+
 	private resolveQueryText(text: string): string {
 		text = text.replace(/@web/g, `tag:"${WEB_EXTENSION_TAG}"`);
 
@@ -1218,7 +1448,7 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		let extension = this.getInstalledExtensionMatchingGallery(gallery);
 		if (!extension) {
 			extension = this.instantiationService.createInstance(Extension, ext => this.getExtensionState(ext), ext => this.getRuntimeState(ext), undefined, undefined, gallery, undefined);
-			Extensions.updateExtensionFromControlManifest(<Extension>extension, extensionsControlManifest);
+			(<Extension>extension).setExtensionsControlManifest(extensionsControlManifest);
 		}
 		return extension;
 	}
@@ -1253,7 +1483,15 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		await this.editorService.openEditor(this.instantiationService.createInstance(ExtensionsInput, extension), options, options?.sideByside ? SIDE_GROUP : ACTIVE_GROUP);
 	}
 
-	getExtensionStatus(extension: IExtension): IExtensionsStatus | undefined {
+	async openSearch(searchValue: string, preserveFoucs?: boolean): Promise<void> {
+		const viewPaneContainer = (await this.viewsService.openViewContainer(VIEWLET_ID, true))?.getViewPaneContainer() as IExtensionsViewPaneContainer;
+		viewPaneContainer.search(searchValue);
+		if (!preserveFoucs) {
+			viewPaneContainer.focus();
+		}
+	}
+
+	getExtensionRuntimeStatus(extension: IExtension): IExtensionRuntimeStatus | undefined {
 		const extensionsStatus = this.extensionService.getExtensionsStatus();
 		for (const id of Object.keys(extensionsStatus)) {
 			if (areSameExtensions({ id }, extension.identifier)) {
@@ -1263,7 +1501,7 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		return undefined;
 	}
 
-	async updateRunningExtensions(): Promise<void> {
+	async updateRunningExtensions(auto: boolean = false): Promise<void> {
 		const toAdd: ILocalExtension[] = [];
 		const toRemove: string[] = [];
 
@@ -1296,7 +1534,7 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 			if (extension.isUnderDevelopment) {
 				continue;
 			}
-			if (extensionsToCheck.some(e => areSameExtensions({ id: extension.identifier.value, uuid: extension.uuid }, e.identifier))) {
+			if (extensionsToCheck.some(e => areSameExtensions({ id: extension.identifier.value, uuid: extension.uuid }, e.local?.identifier ?? e.identifier))) {
 				continue;
 			}
 			// Extension is running but doesn't exist locally. Remove it from running extensions.
@@ -1304,8 +1542,26 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		}
 
 		if (toAdd.length || toRemove.length) {
-			if (await this.extensionService.stopExtensionHosts(nls.localize('restart', "Enable or Disable extensions"))) {
+			if (await this.extensionService.stopExtensionHosts(nls.localize('restart', "Enable or Disable extensions"), auto)) {
 				await this.extensionService.startExtensionHosts({ toAdd, toRemove });
+				if (auto) {
+					this.notificationService.notify({
+						severity: Severity.Info,
+						message: nls.localize('extensionsAutoRestart', "Extensions were auto restarted to enable updates."),
+						priority: NotificationPriority.SILENT
+					});
+				}
+				type ExtensionsAutoRestartClassification = {
+					owner: 'sandy081';
+					comment: 'Report when extensions are auto restarted';
+					count: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Number of extensions auto restarted' };
+					auto: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the restart was triggered automatically' };
+				};
+				type ExtensionsAutoRestartEvent = {
+					count: number;
+					auto: boolean;
+				};
+				this.telemetryService.publicLog2<ExtensionsAutoRestartEvent, ExtensionsAutoRestartClassification>('extensions:autorestart', { count: toAdd.length + toRemove.length, auto });
 			}
 		}
 	}
@@ -1547,15 +1803,6 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		return ExtensionState.Uninstalled;
 	}
 
-	private async onDidAutoUpdateConfigurationChange(): Promise<void> {
-		await this.updateExtensionsPinnedState();
-		if (this.isAutoUpdateEnabled()) {
-			this.checkForUpdates();
-		} else {
-			this.setSelectedExtensionsToAutoUpdate([]);
-		}
-	}
-
 	async checkForUpdates(onlyBuiltin?: boolean): Promise<void> {
 		if (!this.galleryService.isEnabled()) {
 			return;
@@ -1618,6 +1865,7 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 						operation: InstallOperation.Update,
 						installPreReleaseVersion: extension.local?.isPreReleaseVersion,
 						profileLocation: this.userDataProfileService.currentProfile.extensionsResource,
+						isApplicationScoped: extension.local?.isApplicationScoped,
 					}
 				});
 			}
@@ -1640,20 +1888,11 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 			return;
 		}
 		await Promise.allSettled(extensions.map(extensions => extensions.syncInstalledExtensionsWithGallery(gallery, this.getProductVersion())));
-		if (this.isAutoUpdateEnabled()) {
+		if (this.outdated.length) {
 			this.eventuallyAutoUpdateExtensions();
 		}
 	}
 
-	getAutoUpdateValue(): AutoUpdateConfigurationValue {
-		const autoUpdate = this.configurationService.getValue<AutoUpdateConfigurationValue>(AutoUpdateConfigurationKey);
-		return isBoolean(autoUpdate) || autoUpdate === 'onlyEnabledExtensions' || autoUpdate === 'onlySelectedExtensions' ? autoUpdate : true;
-	}
-
-	isAutoUpdateEnabled(): boolean {
-		return this.getAutoUpdateValue() !== false;
-	}
-
 	private isAutoCheckUpdatesEnabled(): boolean {
 		return this.configurationService.getValue(AutoCheckUpdatesConfigurationKey);
 	}
@@ -1661,7 +1900,7 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 	private eventuallyCheckForUpdates(immediate = false): void {
 		this.updatesCheckDelayer.cancel();
 		this.updatesCheckDelayer.trigger(async () => {
-			if (this.isAutoUpdateEnabled() || this.isAutoCheckUpdatesEnabled()) {
+			if (this.isAutoCheckUpdatesEnabled()) {
 				await this.checkForUpdates();
 			}
 			this.eventuallyCheckForUpdates();
@@ -1702,11 +1941,17 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 	}
 
 	private async autoUpdateExtensions(): Promise<void> {
-		if (!this.isAutoUpdateEnabled()) {
-			return;
+		const toUpdate: IExtension[] = [];
+		for (const extension of this.outdated) {
+			if (!this.shouldAutoUpdateExtension(extension)) {
+				continue;
+			}
+			if (await this.shouldRequireConsentToUpdate(extension)) {
+				continue;
+			}
+			toUpdate.push(extension);
 		}
 
-		const toUpdate = this.outdated.filter(e => !e.local?.pinned && this.shouldAutoUpdateExtension(e));
 		if (!toUpdate.length) {
 			return;
 		}
@@ -1738,32 +1983,72 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		return undefined;
 	}
 
-	private async updateExtensionsPinnedState(): Promise<void> {
-		await Promise.all(this.installed.map(async e => {
-			if (e.isBuiltin) {
-				return;
-			}
-			const shouldBePinned = !this.shouldAutoUpdateExtension(e);
-			if (e.local && e.local.pinned !== shouldBePinned) {
-				await this.extensionManagementService.updateMetadata(e.local, { pinned: shouldBePinned });
-			}
-		}));
-	}
-
 	private shouldAutoUpdateExtension(extension: IExtension): boolean {
-		const autoUpdate = this.getAutoUpdateValue();
-		if (isBoolean(autoUpdate)) {
-			return autoUpdate;
+		if (extension.deprecationInfo?.disallowInstall) {
+			return false;
 		}
 
-		if (autoUpdate === 'onlyEnabledExtensions') {
+		const autoUpdateValue = this.getAutoUpdateValue();
+
+		if (autoUpdateValue === false) {
+			const extensionsToAutoUpdate = this.getEnabledAutoUpdateExtensions();
+			const extensionId = extension.identifier.id.toLowerCase();
+			if (extensionsToAutoUpdate.includes(extensionId)) {
+				return true;
+			}
+			if (this.isAutoUpdateEnabledForPublisher(extension.publisher) && !extensionsToAutoUpdate.includes(`-${extensionId}`)) {
+				return true;
+			}
+			return false;
+		}
+
+		if (extension.pinned) {
+			return false;
+		}
+
+		const disabledAutoUpdateExtensions = this.getDisabledAutoUpdateExtensions();
+		if (disabledAutoUpdateExtensions.includes(extension.identifier.id.toLowerCase())) {
+			return false;
+		}
+
+		if (autoUpdateValue === true) {
+			return true;
+		}
+
+		if (autoUpdateValue === 'onlyEnabledExtensions') {
 			return this.extensionEnablementService.isEnabledEnablementState(extension.enablementState);
 		}
 
-		const extensionsToAutoUpdate = this.getSelectedExtensionsToAutoUpdate();
-		const extensionId = extension.identifier.id.toLowerCase();
-		return extensionsToAutoUpdate.includes(extensionId) ||
-			(!extensionsToAutoUpdate.includes(`-${extensionId}`) && this.isAutoUpdateEnabledForPublisher(extension.publisher));
+		return false;
+	}
+
+	async shouldRequireConsentToUpdate(extension: IExtension): Promise<string | undefined> {
+		if (!extension.outdated) {
+			return;
+		}
+
+		if (extension.local?.manifest.main || extension.local?.manifest.browser) {
+			return;
+		}
+
+		if (!extension.gallery) {
+			return;
+		}
+
+		if (isDefined(extension.gallery.properties?.executesCode)) {
+			if (!extension.gallery.properties.executesCode) {
+				return;
+			}
+		} else {
+			const manifest = extension instanceof Extension
+				? await extension.getGalleryManifest()
+				: await this.galleryService.getManifest(extension.gallery, CancellationToken.None);
+			if (!manifest?.main && !manifest?.browser) {
+				return;
+			}
+		}
+
+		return nls.localize('consentRequiredToUpdate', "The update for {0} extension introduces executable code, which is not present in the currently installed version.", extension.displayName);
 	}
 
 	isAutoUpdateEnabledFor(extensionOrPublisher: IExtension | string): boolean {
@@ -1771,16 +2056,12 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 			if (EXTENSION_IDENTIFIER_REGEX.test(extensionOrPublisher)) {
 				throw new Error('Expected publisher string, found extension identifier');
 			}
-			const autoUpdate = this.getAutoUpdateValue();
-			if (isBoolean(autoUpdate)) {
-				return autoUpdate;
-			}
-			if (autoUpdate === 'onlyEnabledExtensions') {
-				return false;
+			if (this.isAutoUpdateEnabled()) {
+				return true;
 			}
 			return this.isAutoUpdateEnabledForPublisher(extensionOrPublisher);
 		}
-		return !extensionOrPublisher.local?.pinned && this.shouldAutoUpdateExtension(extensionOrPublisher);
+		return this.shouldAutoUpdateExtension(extensionOrPublisher);
 	}
 
 	private isAutoUpdateEnabledForPublisher(publisher: string): boolean {
@@ -1789,101 +2070,131 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 	}
 
 	async updateAutoUpdateEnablementFor(extensionOrPublisher: IExtension | string, enable: boolean): Promise<void> {
-		const autoUpdateValue = this.getAutoUpdateValue();
-
-		if (autoUpdateValue === true || autoUpdateValue === 'onlyEnabledExtensions') {
+		if (this.isAutoUpdateEnabled()) {
 			if (isString(extensionOrPublisher)) {
 				throw new Error('Expected extension, found publisher string');
 			}
-			if (!extensionOrPublisher.local) {
-				throw new Error('Only installed extensions can be pinned');
-			}
-			await this.extensionManagementService.updateMetadata(extensionOrPublisher.local, { pinned: !enable });
-			if (enable) {
-				this.eventuallyAutoUpdateExtensions();
-			}
-			return;
-		}
-
-		if (autoUpdateValue === false && enable) {
-			await this.configurationService.updateValue(AutoUpdateConfigurationKey, 'onlySelectedExtensions');
-		}
-
-		let update = false;
-		const autoUpdateExtensions = this.getSelectedExtensionsToAutoUpdate();
-		if (isString(extensionOrPublisher)) {
-			if (EXTENSION_IDENTIFIER_REGEX.test(extensionOrPublisher)) {
-				throw new Error('Expected publisher string, found extension identifier');
-			}
-			extensionOrPublisher = extensionOrPublisher.toLowerCase();
-			if (this.isAutoUpdateEnabledFor(extensionOrPublisher) !== enable) {
-				update = true;
-				if (enable) {
-					autoUpdateExtensions.push(extensionOrPublisher);
-				} else {
-					if (autoUpdateExtensions.includes(extensionOrPublisher)) {
-						autoUpdateExtensions.splice(autoUpdateExtensions.indexOf(extensionOrPublisher), 1);
-					}
-				}
-			}
-		} else {
+			const disabledAutoUpdateExtensions = this.getDisabledAutoUpdateExtensions();
 			const extensionId = extensionOrPublisher.identifier.id.toLowerCase();
-			const enableAutoUpdatesForPublisher = this.isAutoUpdateEnabledFor(extensionOrPublisher.publisher.toLowerCase());
-			const enableAutoUpdatesForExtension = autoUpdateExtensions.includes(extensionId);
-			const disableAutoUpdatesForExtension = autoUpdateExtensions.includes(`-${extensionId}`);
-
+			const extensionIndex = disabledAutoUpdateExtensions.indexOf(extensionId);
 			if (enable) {
-				if (disableAutoUpdatesForExtension) {
-					autoUpdateExtensions.splice(autoUpdateExtensions.indexOf(`-${extensionId}`), 1);
-					update = true;
-				}
-				if (enableAutoUpdatesForPublisher) {
-					if (enableAutoUpdatesForExtension) {
-						autoUpdateExtensions.splice(autoUpdateExtensions.indexOf(extensionId), 1);
-						update = true;
-					}
-				} else {
-					if (!enableAutoUpdatesForExtension) {
-						autoUpdateExtensions.push(extensionId);
-						update = true;
-					}
-				}
-				if (extensionOrPublisher.local?.pinned) {
-					await this.extensionManagementService.updateMetadata(extensionOrPublisher.local, { pinned: false });
+				if (extensionIndex !== -1) {
+					disabledAutoUpdateExtensions.splice(extensionIndex, 1);
 				}
 			}
-			// Disable Auto Updates
 			else {
-				if (enableAutoUpdatesForExtension) {
-					autoUpdateExtensions.splice(autoUpdateExtensions.indexOf(extensionId), 1);
-					update = true;
+				if (extensionIndex === -1) {
+					disabledAutoUpdateExtensions.push(extensionId);
 				}
-				if (enableAutoUpdatesForPublisher) {
-					if (!disableAutoUpdatesForExtension) {
-						autoUpdateExtensions.push(`-${extensionId}`);
-						update = true;
+			}
+			this.setDisabledAutoUpdateExtensions(disabledAutoUpdateExtensions);
+			if (enable && extensionOrPublisher.local && extensionOrPublisher.pinned) {
+				await this.extensionManagementService.updateMetadata(extensionOrPublisher.local, { pinned: false });
+			}
+			this._onChange.fire(extensionOrPublisher);
+		}
+
+		else {
+			const enabledAutoUpdateExtensions = this.getEnabledAutoUpdateExtensions();
+			if (isString(extensionOrPublisher)) {
+				if (EXTENSION_IDENTIFIER_REGEX.test(extensionOrPublisher)) {
+					throw new Error('Expected publisher string, found extension identifier');
+				}
+				extensionOrPublisher = extensionOrPublisher.toLowerCase();
+				if (this.isAutoUpdateEnabledFor(extensionOrPublisher) !== enable) {
+					if (enable) {
+						enabledAutoUpdateExtensions.push(extensionOrPublisher);
+					} else {
+						if (enabledAutoUpdateExtensions.includes(extensionOrPublisher)) {
+							enabledAutoUpdateExtensions.splice(enabledAutoUpdateExtensions.indexOf(extensionOrPublisher), 1);
+						}
 					}
-				} else {
+				}
+				this.setEnabledAutoUpdateExtensions(enabledAutoUpdateExtensions);
+				for (const e of this.installed) {
+					if (e.publisher.toLowerCase() === extensionOrPublisher) {
+						this._onChange.fire(e);
+					}
+				}
+			} else {
+				const extensionId = extensionOrPublisher.identifier.id.toLowerCase();
+				const enableAutoUpdatesForPublisher = this.isAutoUpdateEnabledFor(extensionOrPublisher.publisher.toLowerCase());
+				const enableAutoUpdatesForExtension = enabledAutoUpdateExtensions.includes(extensionId);
+				const disableAutoUpdatesForExtension = enabledAutoUpdateExtensions.includes(`-${extensionId}`);
+
+				if (enable) {
 					if (disableAutoUpdatesForExtension) {
-						autoUpdateExtensions.splice(autoUpdateExtensions.indexOf(`-${extensionId}`), 1);
-						update = true;
+						enabledAutoUpdateExtensions.splice(enabledAutoUpdateExtensions.indexOf(`-${extensionId}`), 1);
+					}
+					if (enableAutoUpdatesForPublisher) {
+						if (enableAutoUpdatesForExtension) {
+							enabledAutoUpdateExtensions.splice(enabledAutoUpdateExtensions.indexOf(extensionId), 1);
+						}
+					} else {
+						if (!enableAutoUpdatesForExtension) {
+							enabledAutoUpdateExtensions.push(extensionId);
+						}
 					}
 				}
+				// Disable Auto Updates
+				else {
+					if (enableAutoUpdatesForExtension) {
+						enabledAutoUpdateExtensions.splice(enabledAutoUpdateExtensions.indexOf(extensionId), 1);
+					}
+					if (enableAutoUpdatesForPublisher) {
+						if (!disableAutoUpdatesForExtension) {
+							enabledAutoUpdateExtensions.push(`-${extensionId}`);
+						}
+					} else {
+						if (disableAutoUpdatesForExtension) {
+							enabledAutoUpdateExtensions.splice(enabledAutoUpdateExtensions.indexOf(`-${extensionId}`), 1);
+						}
+					}
+				}
+				this.setEnabledAutoUpdateExtensions(enabledAutoUpdateExtensions);
+				this._onChange.fire(extensionOrPublisher);
 			}
 		}
-		if (update) {
-			this.setSelectedExtensionsToAutoUpdate(autoUpdateExtensions);
-			await this.onDidSelectedExtensionToAutoUpdateValueChange(true);
-			if (autoUpdateValue === 'onlySelectedExtensions' && autoUpdateExtensions.length === 0) {
-				await this.configurationService.updateValue(AutoUpdateConfigurationKey, false);
-			}
+
+		if (enable) {
+			this.autoUpdateExtensions();
 		}
 	}
 
-	private async onDidSelectedExtensionToAutoUpdateValueChange(forceUpdate: boolean): Promise<void> {
-		if (forceUpdate || this.selectedExtensionsToAutoUpdateValue !== this.getSelectedExtensionsToAutoUpdateValue() /* This checks if current window changed the value or not */) {
-			await this.updateExtensionsPinnedState();
-			this.eventuallyAutoUpdateExtensions();
+	private onDidSelectedExtensionToAutoUpdateValueChange(): void {
+		if (
+			this.enabledAuotUpdateExtensionsValue !== this.getEnabledAutoUpdateExtensionsValue() /* This checks if current window changed the value or not */
+			|| this.disabledAutoUpdateExtensionsValue !== this.getDisabledAutoUpdateExtensionsValue() /* This checks if current window changed the value or not */
+		) {
+			const userExtensions = this.installed.filter(e => !e.isBuiltin);
+			const groupBy = (extensions: IExtension[]): IExtension[][] => {
+				const shouldAutoUpdate: IExtension[] = [];
+				const shouldNotAutoUpdate: IExtension[] = [];
+				for (const extension of extensions) {
+					if (this.shouldAutoUpdateExtension(extension)) {
+						shouldAutoUpdate.push(extension);
+					} else {
+						shouldNotAutoUpdate.push(extension);
+					}
+				}
+				return [shouldAutoUpdate, shouldNotAutoUpdate];
+			};
+
+			const [wasShouldAutoUpdate, wasShouldNotAutoUpdate] = groupBy(userExtensions);
+			this._enabledAutoUpdateExtensionsValue = undefined;
+			this._disabledAutoUpdateExtensionsValue = undefined;
+			const [shouldAutoUpdate, shouldNotAutoUpdate] = groupBy(userExtensions);
+
+			for (const e of wasShouldAutoUpdate ?? []) {
+				if (shouldNotAutoUpdate?.includes(e)) {
+					this._onChange.fire(e);
+				}
+			}
+			for (const e of wasShouldNotAutoUpdate ?? []) {
+				if (shouldAutoUpdate?.includes(e)) {
+					this._onChange.fire(e);
+				}
+			}
 		}
 	}
 
@@ -1901,6 +2212,10 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		}
 
 		if (extension.gallery) {
+			if (!extension.gallery.isSigned) {
+				return false;
+			}
+
 			if (this.localExtensions && await this.localExtensions.canInstall(extension.gallery)) {
 				return true;
 			}
@@ -1948,11 +2263,11 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 			}
 			if (installableInfo) {
 				const targetPlatform = extension?.server ? await extension.server.extensionManagementService.getTargetPlatform() : undefined;
-				gallery = firstOrDefault(await this.galleryService.getExtensions([installableInfo], { targetPlatform }, CancellationToken.None));
+				gallery = (await this.galleryService.getExtensions([installableInfo], { targetPlatform }, CancellationToken.None)).at(0);
 			}
 			if (!extension && gallery) {
 				extension = this.instantiationService.createInstance(Extension, ext => this.getExtensionState(ext), ext => this.getRuntimeState(ext), undefined, undefined, gallery, undefined);
-				Extensions.updateExtensionFromControlManifest(extension as Extension, await this.extensionManagementService.getExtensionsControlManifest());
+				(<Extension>extension).setExtensionsControlManifest(await this.extensionManagementService.getExtensionsControlManifest());
 			}
 			if (extension?.isMalicious) {
 				throw new Error(nls.localize('malicious', "This extension is reported to be problematic."));
@@ -2024,10 +2339,6 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 			throw new Error(nls.localize('unknown', "Unable to install extension"));
 		}
 
-		if (installOptions.version) {
-			await this.updateAutoUpdateEnablementFor(extension, false);
-		}
-
 		if (installOptions.enable) {
 			if (extension.enablementState === EnablementState.DisabledWorkspace || extension.enablementState === EnablementState.DisabledGlobally) {
 				if (installOptions.justification) {
@@ -2114,18 +2425,101 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		return this.promptAndSetEnablement(extensions, enablementState);
 	}
 
-	uninstall(extension: IExtension): Promise<void> {
-		const ext = extension.local ? extension : this.local.filter(e => areSameExtensions(e.identifier, extension.identifier))[0];
-		const toUninstall: ILocalExtension | null = ext && ext.local ? ext.local : null;
-
-		if (!toUninstall) {
-			return Promise.reject(new Error('Missing local'));
+	async uninstall(e: IExtension): Promise<void> {
+		const extension = e.local ? e : this.local.find(local => areSameExtensions(local.identifier, e.identifier));
+		if (!extension?.local) {
+			throw new Error('Missing local');
 		}
+
+		const extensionsToUninstall: UninstallExtensionInfo[] = [{ extension: extension.local }];
+		for (const packExtension of this.getAllPackExtensionsToUninstall(extension.local, this.local)) {
+			if (!extensionsToUninstall.some(e => areSameExtensions(e.extension.identifier, packExtension.identifier))) {
+				extensionsToUninstall.push({ extension: packExtension });
+			}
+		}
+
+		const dependents: IExtension[] = [];
+		for (const { extension } of extensionsToUninstall) {
+			for (const local of this.local) {
+				if (!local.local) {
+					continue;
+				}
+				if (areSameExtensions(local.identifier, extension.identifier)) {
+					continue;
+				}
+				if (local.dependencies.length === 0) {
+					continue;
+				}
+				if (extension.manifest.extensionPack?.some(id => areSameExtensions({ id }, local.identifier))) {
+					continue;
+				}
+				if (dependents.some(d => d.extensionPack.some(id => areSameExtensions({ id }, local.identifier)))) {
+					continue;
+				}
+				if (local.dependencies.some(dep => areSameExtensions(extension.identifier, { id: dep }))) {
+					dependents.push(local);
+					extensionsToUninstall.push({ extension: local.local });
+				}
+			}
+		}
+
+		if (dependents.length) {
+			const { result } = await this.dialogService.prompt({
+				title: nls.localize('uninstallDependents', "Uninstall Extension with Dependents"),
+				type: Severity.Warning,
+				message: this.getErrorMessageForUninstallingAnExtensionWithDependents(extension, dependents),
+				buttons: [{
+					label: nls.localize('uninstallAll', "Uninstall All"),
+					run: () => true
+				}],
+				cancelButton: {
+					run: () => false
+				}
+			});
+			if (!result) {
+				throw new CancellationError();
+			}
+		}
+
 		return this.withProgress({
 			location: ProgressLocation.Extensions,
 			title: nls.localize('uninstallingExtension', 'Uninstalling extension....'),
-			source: `${toUninstall.identifier.id}`
-		}, () => this.extensionManagementService.uninstall(toUninstall).then(() => undefined));
+			source: `${extension.identifier.id}`
+		}, () => this.extensionManagementService.uninstallExtensions(extensionsToUninstall).then(() => undefined));
+	}
+
+	private getAllPackExtensionsToUninstall(extension: ILocalExtension, installed: IExtension[], checked: ILocalExtension[] = []): ILocalExtension[] {
+		if (checked.some(e => areSameExtensions(e.identifier, extension.identifier))) {
+			return [];
+		}
+		checked.push(extension);
+		const extensionsPack = extension.manifest.extensionPack ?? [];
+		if (extensionsPack.length) {
+			const packedExtensions: ILocalExtension[] = [];
+			for (const i of installed) {
+				if (i.local && !i.isBuiltin && extensionsPack.some(id => areSameExtensions({ id }, i.identifier))) {
+					packedExtensions.push(i.local);
+				}
+			}
+			const packOfPackedExtensions: ILocalExtension[] = [];
+			for (const packedExtension of packedExtensions) {
+				packOfPackedExtensions.push(...this.getAllPackExtensionsToUninstall(packedExtension, installed, checked));
+			}
+			return [...packedExtensions, ...packOfPackedExtensions];
+		}
+		return [];
+	}
+
+	private getErrorMessageForUninstallingAnExtensionWithDependents(extension: IExtension, dependents: IExtension[]): string {
+		if (dependents.length === 1) {
+			return nls.localize('singleDependentUninstallError', "Cannot uninstall '{0}' extension alone. '{1}' extension depends on this. Do you want to uninstall all these extensions?", extension.displayName, dependents[0].displayName);
+		}
+		if (dependents.length === 2) {
+			return nls.localize('twoDependentsUninstallError', "Cannot uninstall '{0}' extension alone. '{1}' and '{2}' extensions depend on this. Do you want to uninstall all these extensions?",
+				extension.displayName, dependents[0].displayName, dependents[1].displayName);
+		}
+		return nls.localize('multipleDependentsUninstallError', "Cannot uninstall '{0}' extension alone. '{1}', '{2}' and other extensions depend on this. Do you want to uninstall all these extensions?",
+			extension.displayName, dependents[0].displayName, dependents[1].displayName);
 	}
 
 	reinstall(extension: IExtension): Promise<IExtension> {
@@ -2256,6 +2650,7 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		installOptions.pinned = extension.local?.pinned || !this.shouldAutoUpdateExtension(extension);
 		if (extension.local) {
 			installOptions.productVersion = this.getProductVersion();
+			installOptions.operation = InstallOperation.Update;
 			return this.extensionManagementService.updateFromGallery(gallery, extension.local, installOptions);
 		} else {
 			return this.extensionManagementService.installFromGallery(gallery, installOptions);
@@ -2310,30 +2705,29 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		}
 	}
 
-	private checkAndSetEnablement(extensions: IExtension[], otherExtensions: IExtension[], enablementState: EnablementState): Promise<any> {
+	private async checkAndSetEnablement(extensions: IExtension[], otherExtensions: IExtension[], enablementState: EnablementState): Promise<any> {
 		const allExtensions = [...extensions, ...otherExtensions];
 		const enable = enablementState === EnablementState.EnabledGlobally || enablementState === EnablementState.EnabledWorkspace;
 		if (!enable) {
 			for (const extension of extensions) {
 				const dependents = this.getDependentsAfterDisablement(extension, allExtensions, this.local);
 				if (dependents.length) {
-					return new Promise<void>((resolve, reject) => {
-						this.notificationService.prompt(Severity.Error, this.getDependentsErrorMessage(extension, allExtensions, dependents), [
-							{
-								label: nls.localize('disable all', 'Disable All'),
-								run: async () => {
-									try {
-										await this.checkAndSetEnablement(dependents, [extension], enablementState);
-										resolve();
-									} catch (error) {
-										reject(error);
-									}
-								}
-							}
-						], {
-							onCancel: () => reject(new CancellationError())
-						});
+					const { result } = await this.dialogService.prompt({
+						title: nls.localize('disableDependents', "Disable Extension with Dependents"),
+						type: Severity.Warning,
+						message: this.getDependentsErrorMessageForDisablement(extension, allExtensions, dependents),
+						buttons: [{
+							label: nls.localize('disable all', 'Disable All'),
+							run: () => true
+						}],
+						cancelButton: {
+							run: () => false
+						}
 					});
+					if (!result) {
+						throw new CancellationError();
+					}
+					await this.checkAndSetEnablement(dependents, [extension], enablementState);
 				}
 			}
 		}
@@ -2388,7 +2782,7 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		});
 	}
 
-	private getDependentsErrorMessage(extension: IExtension, allDisabledExtensions: IExtension[], dependents: IExtension[]): string {
+	private getDependentsErrorMessageForDisablement(extension: IExtension, allDisabledExtensions: IExtension[], dependents: IExtension[]): string {
 		for (const e of [extension, ...allDisabledExtensions]) {
 			const dependentsOfTheExtension = dependents.filter(d => d.dependencies.some(id => areSameExtensions({ id }, e.identifier)));
 			if (dependentsOfTheExtension.length) {
@@ -2511,12 +2905,12 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 	}
 
 	private getPublishersToAutoUpdate(): string[] {
-		return this.getSelectedExtensionsToAutoUpdate().filter(id => !EXTENSION_IDENTIFIER_REGEX.test(id));
+		return this.getEnabledAutoUpdateExtensions().filter(id => !EXTENSION_IDENTIFIER_REGEX.test(id));
 	}
 
-	getSelectedExtensionsToAutoUpdate(): string[] {
+	getEnabledAutoUpdateExtensions(): string[] {
 		try {
-			const parsedValue = JSON.parse(this.selectedExtensionsToAutoUpdateValue);
+			const parsedValue = JSON.parse(this.enabledAuotUpdateExtensionsValue);
 			if (Array.isArray(parsedValue)) {
 				return parsedValue;
 			}
@@ -2524,32 +2918,108 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		return [];
 	}
 
-	private setSelectedExtensionsToAutoUpdate(selectedExtensionsToAutoUpdate: string[]): void {
-		this.selectedExtensionsToAutoUpdateValue = JSON.stringify(selectedExtensionsToAutoUpdate);
+	private setEnabledAutoUpdateExtensions(enabledAutoUpdateExtensions: string[]): void {
+		this.enabledAuotUpdateExtensionsValue = JSON.stringify(enabledAutoUpdateExtensions);
 	}
 
-	private _selectedExtensionsToAutoUpdateValue: string | undefined;
-	private get selectedExtensionsToAutoUpdateValue(): string {
-		if (!this._selectedExtensionsToAutoUpdateValue) {
-			this._selectedExtensionsToAutoUpdateValue = this.getSelectedExtensionsToAutoUpdateValue();
+	private _enabledAutoUpdateExtensionsValue: string | undefined;
+	private get enabledAuotUpdateExtensionsValue(): string {
+		if (!this._enabledAutoUpdateExtensionsValue) {
+			this._enabledAutoUpdateExtensionsValue = this.getEnabledAutoUpdateExtensionsValue();
 		}
 
-		return this._selectedExtensionsToAutoUpdateValue;
+		return this._enabledAutoUpdateExtensionsValue;
 	}
 
-	private set selectedExtensionsToAutoUpdateValue(placeholderViewContainesValue: string) {
-		if (this.selectedExtensionsToAutoUpdateValue !== placeholderViewContainesValue) {
-			this._selectedExtensionsToAutoUpdateValue = placeholderViewContainesValue;
-			this.setSelectedExtensionsToAutoUpdateValue(placeholderViewContainesValue);
+	private set enabledAuotUpdateExtensionsValue(enabledAuotUpdateExtensionsValue: string) {
+		if (this.enabledAuotUpdateExtensionsValue !== enabledAuotUpdateExtensionsValue) {
+			this._enabledAutoUpdateExtensionsValue = enabledAuotUpdateExtensionsValue;
+			this.setEnabledAutoUpdateExtensionsValue(enabledAuotUpdateExtensionsValue);
 		}
 	}
 
-	private getSelectedExtensionsToAutoUpdateValue(): string {
+	private getEnabledAutoUpdateExtensionsValue(): string {
 		return this.storageService.get(EXTENSIONS_AUTO_UPDATE_KEY, StorageScope.APPLICATION, '[]');
 	}
 
-	private setSelectedExtensionsToAutoUpdateValue(value: string): void {
+	private setEnabledAutoUpdateExtensionsValue(value: string): void {
 		this.storageService.store(EXTENSIONS_AUTO_UPDATE_KEY, value, StorageScope.APPLICATION, StorageTarget.USER);
 	}
 
+	getDisabledAutoUpdateExtensions(): string[] {
+		try {
+			const parsedValue = JSON.parse(this.disabledAutoUpdateExtensionsValue);
+			if (Array.isArray(parsedValue)) {
+				return parsedValue;
+			}
+		} catch (e) { /* Ignore */ }
+		return [];
+	}
+
+	private setDisabledAutoUpdateExtensions(disabledAutoUpdateExtensions: string[]): void {
+		this.disabledAutoUpdateExtensionsValue = JSON.stringify(disabledAutoUpdateExtensions);
+	}
+
+	private _disabledAutoUpdateExtensionsValue: string | undefined;
+	private get disabledAutoUpdateExtensionsValue(): string {
+		if (!this._disabledAutoUpdateExtensionsValue) {
+			this._disabledAutoUpdateExtensionsValue = this.getDisabledAutoUpdateExtensionsValue();
+		}
+
+		return this._disabledAutoUpdateExtensionsValue;
+	}
+
+	private set disabledAutoUpdateExtensionsValue(disabledAutoUpdateExtensionsValue: string) {
+		if (this.disabledAutoUpdateExtensionsValue !== disabledAutoUpdateExtensionsValue) {
+			this._disabledAutoUpdateExtensionsValue = disabledAutoUpdateExtensionsValue;
+			this.setDisabledAutoUpdateExtensionsValue(disabledAutoUpdateExtensionsValue);
+		}
+	}
+
+	private getDisabledAutoUpdateExtensionsValue(): string {
+		return this.storageService.get(EXTENSIONS_DONOT_AUTO_UPDATE_KEY, StorageScope.APPLICATION, '[]');
+	}
+
+	private setDisabledAutoUpdateExtensionsValue(value: string): void {
+		this.storageService.store(EXTENSIONS_DONOT_AUTO_UPDATE_KEY, value, StorageScope.APPLICATION, StorageTarget.USER);
+	}
+
+	private getDismissedNotifications(): string[] {
+		try {
+			const parsedValue = JSON.parse(this.dismissedNotificationsValue);
+			if (Array.isArray(parsedValue)) {
+				return parsedValue;
+			}
+		} catch (e) { /* Ignore */ }
+		return [];
+	}
+
+	private setDismissedNotifications(dismissedNotifications: string[]): void {
+		this.dismissedNotificationsValue = JSON.stringify(dismissedNotifications);
+	}
+
+	private _dismissedNotificationsValue: string | undefined;
+	private get dismissedNotificationsValue(): string {
+		if (!this._dismissedNotificationsValue) {
+			this._dismissedNotificationsValue = this.getDismissedNotificationsValue();
+		}
+
+		return this._dismissedNotificationsValue;
+	}
+
+	private set dismissedNotificationsValue(dismissedNotificationsValue: string) {
+		if (this.dismissedNotificationsValue !== dismissedNotificationsValue) {
+			this._dismissedNotificationsValue = dismissedNotificationsValue;
+			this.setDismissedNotificationsValue(dismissedNotificationsValue);
+		}
+	}
+
+	private getDismissedNotificationsValue(): string {
+		return this.storageService.get(EXTENSIONS_DISMISSED_NOTIFICATIONS_KEY, StorageScope.PROFILE, '[]');
+	}
+
+	private setDismissedNotificationsValue(value: string): void {
+		this.storageService.store(EXTENSIONS_DISMISSED_NOTIFICATIONS_KEY, value, StorageScope.PROFILE, StorageTarget.USER);
+	}
+
 }
diff --git a/src/vs/workbench/contrib/extensions/browser/fileBasedRecommendations.ts b/src/vs/workbench/contrib/extensions/browser/fileBasedRecommendations.ts
index 0a208bfe93d..6d98e545b6e 100644
--- a/src/vs/workbench/contrib/extensions/browser/fileBasedRecommendations.ts
+++ b/src/vs/workbench/contrib/extensions/browser/fileBasedRecommendations.ts
@@ -3,31 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ExtensionRecommendations, GalleryExtensionRecommendation } from 'vs/workbench/contrib/extensions/browser/extensionRecommendations';
-import { EnablementState } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { ExtensionRecommendationReason, IExtensionIgnoredRecommendationsService } from 'vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
-import { IExtensionsWorkbenchService, IExtension } from 'vs/workbench/contrib/extensions/common/extensions';
-import { localize } from 'vs/nls';
-import { StorageScope, IStorageService, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IFileContentCondition, IFilePathCondition, IFileLanguageCondition, IFileOpenCondition } from 'vs/base/common/product';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { ITextModel } from 'vs/editor/common/model';
-import { Schemas } from 'vs/base/common/network';
-import { basename, extname } from 'vs/base/common/resources';
-import { match } from 'vs/base/common/glob';
-import { URI } from 'vs/base/common/uri';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IExtensionRecommendationNotificationService, RecommendationsNotificationResult, RecommendationSource } from 'vs/platform/extensionRecommendations/common/extensionRecommendations';
-import { distinct } from 'vs/base/common/arrays';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { CellUri } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { disposableTimeout } from 'vs/base/common/async';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { isEmptyObject } from 'vs/base/common/types';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
+import { ExtensionRecommendations, GalleryExtensionRecommendation } from './extensionRecommendations.js';
+import { EnablementState } from '../../../services/extensionManagement/common/extensionManagement.js';
+import { ExtensionRecommendationReason, IExtensionIgnoredRecommendationsService } from '../../../services/extensionRecommendations/common/extensionRecommendations.js';
+import { IExtensionsWorkbenchService, IExtension } from '../common/extensions.js';
+import { localize } from '../../../../nls.js';
+import { StorageScope, IStorageService, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IFileContentCondition, IFilePathCondition, IFileLanguageCondition, IFileOpenCondition } from '../../../../base/common/product.js';
+import { IStringDictionary } from '../../../../base/common/collections.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { basename, extname } from '../../../../base/common/resources.js';
+import { match } from '../../../../base/common/glob.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { IExtensionRecommendationNotificationService, RecommendationsNotificationResult, RecommendationSource } from '../../../../platform/extensionRecommendations/common/extensionRecommendations.js';
+import { distinct } from '../../../../base/common/arrays.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { CellUri } from '../../notebook/common/notebookCommon.js';
+import { disposableTimeout } from '../../../../base/common/async.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { areSameExtensions } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { isEmptyObject } from '../../../../base/common/types.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../../../../editor/common/languages/modesRegistry.js';
 
 const promptedRecommendationsStorageKey = 'fileBasedRecommendations/promptedRecommendations';
 const recommendationsStorageKey = 'extensionsAssistant/recommendations';
diff --git a/src/vs/workbench/contrib/extensions/browser/keymapRecommendations.ts b/src/vs/workbench/contrib/extensions/browser/keymapRecommendations.ts
index 613fe523715..7ec00c8fd54 100644
--- a/src/vs/workbench/contrib/extensions/browser/keymapRecommendations.ts
+++ b/src/vs/workbench/contrib/extensions/browser/keymapRecommendations.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ExtensionRecommendations, ExtensionRecommendation } from 'vs/workbench/contrib/extensions/browser/extensionRecommendations';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ExtensionRecommendationReason } from 'vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
+import { ExtensionRecommendations, ExtensionRecommendation } from './extensionRecommendations.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { ExtensionRecommendationReason } from '../../../services/extensionRecommendations/common/extensionRecommendations.js';
 
 export class KeymapRecommendations extends ExtensionRecommendations {
 
diff --git a/src/vs/workbench/contrib/extensions/browser/languageRecommendations.ts b/src/vs/workbench/contrib/extensions/browser/languageRecommendations.ts
index a310c9f4fdb..58e63a6d082 100644
--- a/src/vs/workbench/contrib/extensions/browser/languageRecommendations.ts
+++ b/src/vs/workbench/contrib/extensions/browser/languageRecommendations.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ExtensionRecommendations, ExtensionRecommendation } from 'vs/workbench/contrib/extensions/browser/extensionRecommendations';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ExtensionRecommendationReason } from 'vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
+import { ExtensionRecommendations, ExtensionRecommendation } from './extensionRecommendations.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { ExtensionRecommendationReason } from '../../../services/extensionRecommendations/common/extensionRecommendations.js';
 
 export class LanguageRecommendations extends ExtensionRecommendations {
 
diff --git a/src/vs/workbench/contrib/extensions/browser/media/extension.css b/src/vs/workbench/contrib/extensions/browser/media/extension.css
index 985b5511c05..30bbba041ad 100644
--- a/src/vs/workbench/contrib/extensions/browser/media/extension.css
+++ b/src/vs/workbench/contrib/extensions/browser/media/extension.css
@@ -192,14 +192,6 @@
 	font-weight: 600;
 }
 
-.monaco-list-row.disabled .extension-list-item > .details > .footer > .author > .publisher-name{
-	color: var(--vscode-disabledForeground);
-}
-
-.monaco-list-row.disabled.selected .extension-list-item > .details > .footer > .author > .publisher-name{
-	color: unset;
-}
-
 .monaco-list-row.selected .extension-list-item > .details > .footer > .author > .publisher-name{
 	color: unset;
 }
@@ -235,12 +227,16 @@
 	min-width: 0;
 }
 
-.monaco-list-row.disabled .extension-list-item {
+.monaco-list-row.disabled:not(.selected) .extension-list-item > .details > .footer > .author > .publisher-name {
 	color: var(--vscode-disabledForeground);
 }
 
-.monaco-list-row.disabled.selected .extension-list-item .details .header .name,
-.monaco-list-row.disabled.selected .extension-list-item .details .description {
+.monaco-list-row.disabled:not(.selected) .extension-list-item {
+	color: var(--vscode-disabledForeground);
+}
+
+.monaco-list-row.disabled:not(.selected) .extension-list-item .details .header .name,
+.monaco-list-row.disabled:not(.selected) .extension-list-item .details .description {
 	color: unset;
 }
 
diff --git a/src/vs/workbench/contrib/extensions/browser/media/extensionActions.css b/src/vs/workbench/contrib/extensions/browser/media/extensionActions.css
index 7bca4243703..ed8c3395ccc 100644
--- a/src/vs/workbench/contrib/extensions/browser/media/extensionActions.css
+++ b/src/vs/workbench/contrib/extensions/browser/media/extensionActions.css
@@ -74,15 +74,15 @@
 	border-bottom: 1px solid var(--vscode-contrastBorder);
 }
 
-.monaco-action-bar .action-item .action-label.extension-action.extension-status-error {
+.monaco-action-bar .action-item .action-label.extension-action.extension-status-error::before {
 	color: var(--vscode-editorError-foreground);
 }
 
-.monaco-action-bar .action-item .action-label.extension-action.extension-status-warning {
+.monaco-action-bar .action-item .action-label.extension-action.extension-status-warning::before {
 	color: var(--vscode-editorWarning-foreground);
 }
 
-.monaco-action-bar .action-item .action-label.extension-action.extension-status-info {
+.monaco-action-bar .action-item .action-label.extension-action.extension-status-info::before {
 	color: var(--vscode-editorInfo-foreground);
 }
 
@@ -97,7 +97,8 @@
 .monaco-action-bar .action-item.disabled .action-label.extension-action.hide,
 .monaco-action-bar .action-item.disabled .action-label.extension-action.ignore,
 .monaco-action-bar .action-item.disabled .action-label.extension-action.undo-ignore,
-.monaco-action-bar .action-item.disabled .action-label.extension-action.install:not(.installing),
+.monaco-action-bar .action-item .action-label.extension-action.install.hide,
+.monaco-action-bar .action-item.disabled .action-label.extension-action.install-other-server:not(.installing),
 .monaco-action-bar .action-item.disabled .action-label.extension-action.uninstall:not(.uninstalling),
 .monaco-action-bar .action-item.disabled .action-label.extension-action.hide-when-disabled,
 .monaco-action-bar .action-item.disabled .action-label.extension-action.update,
@@ -105,7 +106,7 @@
 .monaco-action-bar .action-item.disabled .action-label.extension-action.theme,
 .monaco-action-bar .action-item.disabled .action-label.extension-action.language,
 .monaco-action-bar .action-item.disabled .action-label.extension-action.extension-sync,
-.monaco-action-bar .action-item.action-dropdown-item.disabled,
+.monaco-action-bar .action-item.action-dropdown-item.hide,
 .monaco-action-bar .action-item.action-dropdown-item .action-label.extension-action.hide,
 .monaco-action-bar .action-item.disabled .action-label.extension-action.reload,
 .monaco-action-bar .action-item.disabled .action-label.disable-status.hide,
@@ -115,6 +116,10 @@
 	display: none;
 }
 
+.monaco-action-bar .action-item.disabled .action-label.extension-action.label {
+	opacity: 0.4 !important;
+}
+
 .monaco-action-bar .action-item.checkbox-action-item.disabled {
 	display: none;
 }
diff --git a/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css b/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css
index a59e7c53d77..1de72e81ee9 100644
--- a/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css
+++ b/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css
@@ -485,6 +485,7 @@
 	overflow: hidden;
 	white-space: nowrap;
 	text-overflow: ellipsis;
+	text-decoration: var(--text-link-decoration);
 }
 
 .extension-editor > .body > .content > .details > .additional-details-container .resources-container > .resources > .resource:hover {
diff --git a/src/vs/workbench/contrib/extensions/browser/media/extensionsViewlet.css b/src/vs/workbench/contrib/extensions/browser/media/extensionsViewlet.css
index 552e9cf54c2..b0141e1c4fa 100644
--- a/src/vs/workbench/contrib/extensions/browser/media/extensionsViewlet.css
+++ b/src/vs/workbench/contrib/extensions/browser/media/extensionsViewlet.css
@@ -8,6 +8,11 @@
 	height: 100%;
 }
 
+.extensions-viewlet .hidden {
+	display: none;
+	visibility: hidden;
+}
+
 .extensions-viewlet > .overlay {
 	position: absolute;
 	top: 0;
@@ -47,6 +52,44 @@
 	height: 100%;
 }
 
+.extensions-viewlet > .header > .notification-container {
+	margin-top: 10px;
+	display: flex;
+	justify-content: space-between;
+}
+
+.extensions-viewlet > .header .notification-container .message-container {
+	padding-left: 4px;
+}
+
+.extensions-viewlet > .header .notification-container .message-container .codicon {
+	vertical-align: text-top;
+	padding-right: 5px;
+}
+
+.extensions-viewlet .notification-container .message-text-action {
+	cursor: pointer;
+	margin-left: 5px;
+	color: var(--vscode-textLink-foreground);
+	text-decoration: underline;
+}
+
+.extensions-viewlet .notification-container .message-text-action:hover,
+.extensions-viewlet .notification-container .message-text-action:active {
+	color: var(--vscode-textLink-activeForeground);
+}
+
+.extensions-viewlet .notification-container .message-action {
+	cursor: pointer;
+	padding: 2px;
+	border-radius: 5px;
+	height: 16px;
+}
+
+.extensions-viewlet .notification-container .message-action:hover {
+	background-color: var(--vscode-toolbar-hoverBackground);
+	outline: 1px dashed var(--vscode-toolbar-hoverOutline);
+}
 
 .extensions-viewlet > .extensions {
 	height: calc(100% - 41px);
@@ -70,12 +113,6 @@
 	display: none;
 }
 
-.extensions-viewlet > .extensions .extensions-list.hidden,
-.extensions-viewlet > .extensions .message-container.hidden {
-	display: none;
-	visibility: hidden;
-}
-
 .extensions-viewlet > .extensions .panel-header {
 	padding-right: 12px;
 }
@@ -144,15 +181,21 @@
 	max-width: 100px;
 }
 
-.monaco-workbench.vs .extensions-viewlet > .extensions .monaco-list-row.disabled > .extension-list-item > .icon-container > .icon,
-.monaco-workbench.vs-dark .extensions-viewlet > .extensions .monaco-list-row.disabled > .extension-list-item > .icon-container > .icon,
-.monaco-workbench.vs .extensions-viewlet > .extensions .monaco-list-row.disabled > .extension-list-item > .details > .header-container .codicon,
-.monaco-workbench.vs-dark .extensions-viewlet > .extensions .monaco-list-row.disabled > .extension-list-item > .details > .header-container .codicon {
+.monaco-workbench.vs .extensions-viewlet > .extensions .monaco-list-row.disabled:not(.selected) > .extension-list-item > .icon-container > .icon,
+.monaco-workbench.vs-dark .extensions-viewlet > .extensions .monaco-list-row.disabled:not(.selected) > .extension-list-item > .icon-container > .icon,
+.monaco-workbench.vs .extensions-viewlet > .extensions .monaco-list-row.disabled:not(.selected) > .extension-list-item > .details > .header-container .codicon,
+.monaco-workbench.vs-dark .extensions-viewlet > .extensions .monaco-list-row.disabled:not(.selected) > .extension-list-item > .details > .header-container .codicon {
 	opacity: 0.5;
 }
 
-.extensions-badge.progress-badge > .badge-content {
-	background-image: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNCIgaGVpZ2h0PSIxNCIgdmlld0JveD0iMiAyIDE0IDE0IiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDIgMiAxNCAxNCI+PHBhdGggZmlsbD0iI2ZmZiIgZD0iTTkgMTZjLTMuODYgMC03LTMuMTQtNy03czMuMTQtNyA3LTdjMy44NTkgMCA3IDMuMTQxIDcgN3MtMy4xNDEgNy03IDd6bTAtMTIuNmMtMy4wODggMC01LjYgMi41MTMtNS42IDUuNnMyLjUxMiA1LjYgNS42IDUuNiA1LjYtMi41MTIgNS42LTUuNi0yLjUxMi01LjYtNS42LTUuNnptMy44NiA3LjFsLTMuMTYtMS44OTZ2LTMuODA0aC0xLjR2NC41OTZsMy44NCAyLjMwNS43Mi0xLjIwMXoiLz48L3N2Zz4=");
-	background-position: center center;
-	background-repeat: no-repeat;
+.extensions-viewlet .codicon-error::before {
+	color: var(--vscode-editorError-foreground);
+}
+
+.extensions-viewlet .codicon-warning::before {
+	color: var(--vscode-editorWarning-foreground);
+}
+
+.extensions-viewlet .codicon-info::before {
+	color: var(--vscode-editorInfo-foreground);
 }
diff --git a/src/vs/workbench/contrib/extensions/browser/media/extensionsWidgets.css b/src/vs/workbench/contrib/extensions/browser/media/extensionsWidgets.css
index d77881dfa39..6a7ab84a23a 100644
--- a/src/vs/workbench/contrib/extensions/browser/media/extensionsWidgets.css
+++ b/src/vs/workbench/contrib/extensions/browser/media/extensionsWidgets.css
@@ -39,6 +39,7 @@
 .extension-verified-publisher > .extension-verified-publisher-domain {
 	padding-left: 2px;
 	color: var(--vscode-extensionIcon-verifiedForeground);
+	text-decoration: var(--text-link-decoration);
 }
 
 .extension-bookmark {
@@ -66,7 +67,7 @@
 	bottom: 9px;
 	left: 1px;
 	color: inherit;
-	font-size: 80%;
+	font-size: 80% !important;
 }
 
 .extension-bookmark .recommendation {
diff --git a/src/vs/workbench/contrib/extensions/browser/remoteRecommendations.ts b/src/vs/workbench/contrib/extensions/browser/remoteRecommendations.ts
index f3ccbdd5a8b..f3a71e6bb47 100644
--- a/src/vs/workbench/contrib/extensions/browser/remoteRecommendations.ts
+++ b/src/vs/workbench/contrib/extensions/browser/remoteRecommendations.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ExtensionRecommendations, GalleryExtensionRecommendation } from 'vs/workbench/contrib/extensions/browser/extensionRecommendations';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ExtensionRecommendationReason } from 'vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
-import { PlatformToString, platform } from 'vs/base/common/platform';
+import { ExtensionRecommendations, GalleryExtensionRecommendation } from './extensionRecommendations.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { ExtensionRecommendationReason } from '../../../services/extensionRecommendations/common/extensionRecommendations.js';
+import { PlatformToString, platform } from '../../../../base/common/platform.js';
 
 export class RemoteRecommendations extends ExtensionRecommendations {
 
diff --git a/src/vs/workbench/contrib/extensions/browser/unsupportedExtensionsMigrationContribution.ts b/src/vs/workbench/contrib/extensions/browser/unsupportedExtensionsMigrationContribution.ts
index ac99ec6f0c6..1ef6e0ab1f1 100644
--- a/src/vs/workbench/contrib/extensions/browser/unsupportedExtensionsMigrationContribution.ts
+++ b/src/vs/workbench/contrib/extensions/browser/unsupportedExtensionsMigrationContribution.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IExtensionGalleryService, IGlobalExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IExtensionStorageService } from 'vs/platform/extensionManagement/common/extensionStorage';
-import { migrateUnsupportedExtensions } from 'vs/platform/extensionManagement/common/unsupportedExtensionsMigration';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IExtensionManagementServerService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
+import { IExtensionGalleryService, IGlobalExtensionEnablementService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { IExtensionStorageService } from '../../../../platform/extensionManagement/common/extensionStorage.js';
+import { migrateUnsupportedExtensions } from '../../../../platform/extensionManagement/common/unsupportedExtensionsMigration.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IExtensionManagementServerService } from '../../../services/extensionManagement/common/extensionManagement.js';
 
 export class UnsupportedExtensionsMigrationContrib implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/contrib/extensions/browser/webRecommendations.ts b/src/vs/workbench/contrib/extensions/browser/webRecommendations.ts
index a5fc4bbf74b..4870f01f8aa 100644
--- a/src/vs/workbench/contrib/extensions/browser/webRecommendations.ts
+++ b/src/vs/workbench/contrib/extensions/browser/webRecommendations.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ExtensionRecommendations, ExtensionRecommendation } from 'vs/workbench/contrib/extensions/browser/extensionRecommendations';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ExtensionRecommendationReason } from 'vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
-import { localize } from 'vs/nls';
-import { IExtensionManagementServerService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
+import { ExtensionRecommendations, ExtensionRecommendation } from './extensionRecommendations.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { ExtensionRecommendationReason } from '../../../services/extensionRecommendations/common/extensionRecommendations.js';
+import { localize } from '../../../../nls.js';
+import { IExtensionManagementServerService } from '../../../services/extensionManagement/common/extensionManagement.js';
 
 export class WebRecommendations extends ExtensionRecommendations {
 
diff --git a/src/vs/workbench/contrib/extensions/browser/workspaceRecommendations.ts b/src/vs/workbench/contrib/extensions/browser/workspaceRecommendations.ts
index 586c9f83b2f..69ff685c658 100644
--- a/src/vs/workbench/contrib/extensions/browser/workspaceRecommendations.ts
+++ b/src/vs/workbench/contrib/extensions/browser/workspaceRecommendations.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { EXTENSION_IDENTIFIER_PATTERN } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { distinct, equals } from 'vs/base/common/arrays';
-import { ExtensionRecommendations, ExtensionRecommendation } from 'vs/workbench/contrib/extensions/browser/extensionRecommendations';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { ExtensionRecommendationReason } from 'vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
-import { localize } from 'vs/nls';
-import { Emitter } from 'vs/base/common/event';
-import { IExtensionsConfigContent, IWorkspaceExtensionsConfigService } from 'vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { FileChangeType, IFileService } from 'vs/platform/files/common/files';
-import { URI } from 'vs/base/common/uri';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { IWorkbenchExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
+import { EXTENSION_IDENTIFIER_PATTERN } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { distinct, equals } from '../../../../base/common/arrays.js';
+import { ExtensionRecommendations, ExtensionRecommendation } from './extensionRecommendations.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { ExtensionRecommendationReason } from '../../../services/extensionRecommendations/common/extensionRecommendations.js';
+import { localize } from '../../../../nls.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { IExtensionsConfigContent, IWorkspaceExtensionsConfigService } from '../../../services/extensionRecommendations/common/workspaceExtensionsConfig.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { FileChangeType, IFileService } from '../../../../platform/files/common/files.js';
+import { URI } from '../../../../base/common/uri.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { IWorkbenchExtensionManagementService } from '../../../services/extensionManagement/common/extensionManagement.js';
 
 const WORKSPACE_EXTENSIONS_FOLDER = '.vscode/extensions';
 
@@ -55,6 +55,8 @@ export class WorkspaceRecommendations extends ExtensionRecommendations {
 			this._register(this.fileService.watch(this.uriIdentityService.extUri.joinPath(folder.uri, WORKSPACE_EXTENSIONS_FOLDER)));
 		}
 
+		this._register(this.contextService.onDidChangeWorkspaceFolders(() => this.onDidChangeWorkspaceExtensionsScheduler.schedule()));
+
 		this._register(this.fileService.onDidFilesChange(e => {
 			if (this.contextService.getWorkspace().folders.some(folder =>
 				e.affects(this.uriIdentityService.extUri.joinPath(folder.uri, WORKSPACE_EXTENSIONS_FOLDER), FileChangeType.ADDED, FileChangeType.DELETED))
diff --git a/src/vs/workbench/contrib/extensions/common/extensionQuery.ts b/src/vs/workbench/contrib/extensions/common/extensionQuery.ts
index d916401a6a7..d6cd57bb5bc 100644
--- a/src/vs/workbench/contrib/extensions/common/extensionQuery.ts
+++ b/src/vs/workbench/contrib/extensions/common/extensionQuery.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { EXTENSION_CATEGORIES } from 'vs/platform/extensions/common/extensions';
+import { EXTENSION_CATEGORIES } from '../../../../platform/extensions/common/extensions.js';
 
 export class Query {
 
diff --git a/src/vs/workbench/contrib/extensions/common/extensions.ts b/src/vs/workbench/contrib/extensions/common/extensions.ts
index 179624e281b..0b880a40d55 100644
--- a/src/vs/workbench/contrib/extensions/common/extensions.ts
+++ b/src/vs/workbench/contrib/extensions/common/extensions.ts
@@ -3,22 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { Event } from 'vs/base/common/event';
-import { IPager } from 'vs/base/common/paging';
-import { IQueryOptions, ILocalExtension, IGalleryExtension, IExtensionIdentifier, InstallOptions, IExtensionInfo, IExtensionQueryOptions, IDeprecationInfo, InstallExtensionResult } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { EnablementState, IExtensionManagementServer, IResourceExtension } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { IExtensionManifest, ExtensionType } from 'vs/platform/extensions/common/extensions';
-import { URI } from 'vs/base/common/uri';
-import { IView, IViewPaneContainer } from 'vs/workbench/common/views';
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IExtensionsStatus } from 'vs/workbench/services/extensions/common/extensions';
-import { IExtensionEditorOptions } from 'vs/workbench/contrib/extensions/common/extensionsInput';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { ProgressLocation } from 'vs/platform/progress/common/progress';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { Event } from '../../../../base/common/event.js';
+import { IPager } from '../../../../base/common/paging.js';
+import { IQueryOptions, ILocalExtension, IGalleryExtension, IExtensionIdentifier, InstallOptions, IExtensionInfo, IExtensionQueryOptions, IDeprecationInfo, InstallExtensionResult } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { EnablementState, IExtensionManagementServer, IResourceExtension } from '../../../services/extensionManagement/common/extensionManagement.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
+import { areSameExtensions } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { IExtensionManifest, ExtensionType } from '../../../../platform/extensions/common/extensions.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IView, IViewPaneContainer } from '../../../common/views.js';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IExtensionsStatus as IExtensionRuntimeStatus } from '../../../services/extensions/common/extensions.js';
+import { IExtensionEditorOptions } from './extensionsInput.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { ProgressLocation } from '../../../../platform/progress/common/progress.js';
+import { Severity } from '../../../../platform/notification/common/notification.js';
 
 export const VIEWLET_ID = 'workbench.view.extensions';
 
@@ -62,6 +63,7 @@ export interface IExtension {
 	readonly publisherUrl?: URI;
 	readonly publisherDomain?: { link: string; verified: boolean };
 	readonly publisherSponsorLink?: URI;
+	readonly pinned: boolean;
 	readonly version: string;
 	readonly latestVersion: string;
 	readonly preRelease: boolean;
@@ -109,6 +111,13 @@ export interface InstallExtensionOptions extends InstallOptions {
 	enable?: boolean;
 }
 
+export interface IExtensionsNotification {
+	readonly message: string;
+	readonly severity: Severity;
+	readonly extensions: IExtension[];
+	dismiss(): void;
+}
+
 export interface IExtensionsWorkbenchService {
 	readonly _serviceBrand: undefined;
 	readonly onChange: Event<IExtension | undefined>;
@@ -137,14 +146,19 @@ export interface IExtensionsWorkbenchService {
 	setEnablement(extensions: IExtension | IExtension[], enablementState: EnablementState): Promise<void>;
 	isAutoUpdateEnabledFor(extensionOrPublisher: IExtension | string): boolean;
 	updateAutoUpdateEnablementFor(extensionOrPublisher: IExtension | string, enable: boolean): Promise<void>;
+	shouldRequireConsentToUpdate(extension: IExtension): Promise<string | undefined>;
+	updateAutoUpdateForAllExtensions(value: boolean): Promise<void>;
 	open(extension: IExtension | string, options?: IExtensionEditorOptions): Promise<void>;
-	isAutoUpdateEnabled(): boolean;
+	openSearch(searchValue: string, focus?: boolean): Promise<void>;
 	getAutoUpdateValue(): AutoUpdateConfigurationValue;
 	checkForUpdates(): Promise<void>;
-	getExtensionStatus(extension: IExtension): IExtensionsStatus | undefined;
+	getExtensionRuntimeStatus(extension: IExtension): IExtensionRuntimeStatus | undefined;
 	updateAll(): Promise<InstallExtensionResult[]>;
 	updateRunningExtensions(): Promise<void>;
 
+	readonly onDidChangeExtensionsNotification: Event<IExtensionsNotification | undefined>;
+	getExtensionsNotification(): IExtensionsNotification | undefined;
+
 	// Sync APIs
 	isExtensionIgnoredToSync(extension: IExtension): boolean;
 	toggleExtensionIgnoredToSync(extension: IExtension): Promise<void>;
@@ -163,6 +177,7 @@ export const ConfigurationKey = 'extensions';
 export const AutoUpdateConfigurationKey = 'extensions.autoUpdate';
 export const AutoCheckUpdatesConfigurationKey = 'extensions.autoCheckUpdates';
 export const CloseExtensionDetailsOnViewChangeKey = 'extensions.closeExtensionDetailsOnViewChange';
+export const AutoRestartConfigurationKey = 'extensions.autoRestart';
 
 export type AutoUpdateConfigurationValue = boolean | 'onlyEnabledExtensions' | 'onlySelectedExtensions';
 
diff --git a/src/vs/workbench/contrib/extensions/common/extensionsFileTemplate.ts b/src/vs/workbench/contrib/extensions/common/extensionsFileTemplate.ts
index 3e8cd713432..818e662847e 100644
--- a/src/vs/workbench/contrib/extensions/common/extensionsFileTemplate.ts
+++ b/src/vs/workbench/contrib/extensions/common/extensionsFileTemplate.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import { EXTENSION_IDENTIFIER_PATTERN } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { localize } from '../../../../nls.js';
+import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
+import { EXTENSION_IDENTIFIER_PATTERN } from '../../../../platform/extensionManagement/common/extensionManagement.js';
 
 export const ExtensionsConfigurationSchemaId = 'vscode://schemas/extensions';
 export const ExtensionsConfigurationSchema: IJSONSchema = {
diff --git a/src/vs/workbench/contrib/extensions/common/extensionsInput.ts b/src/vs/workbench/contrib/extensions/common/extensionsInput.ts
index 8215c4ef18d..a46f23b2c1d 100644
--- a/src/vs/workbench/contrib/extensions/common/extensionsInput.ts
+++ b/src/vs/workbench/contrib/extensions/common/extensionsInput.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { EditorInputCapabilities, IUntypedEditorInput } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { ExtensionEditorTab, IExtension } from 'vs/workbench/contrib/extensions/common/extensions';
-import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { join } from 'vs/base/common/path';
-import { IEditorOptions } from 'vs/platform/editor/common/editor';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { Codicon } from 'vs/base/common/codicons';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
+import { Schemas } from '../../../../base/common/network.js';
+import { URI } from '../../../../base/common/uri.js';
+import { localize } from '../../../../nls.js';
+import { EditorInputCapabilities, IUntypedEditorInput } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { ExtensionEditorTab, IExtension } from './extensions.js';
+import { areSameExtensions } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { join } from '../../../../base/common/path.js';
+import { IEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 
 const ExtensionEditorIcon = registerIcon('extensions-editor-label-icon', Codicon.extensions, localize('extensionsEditorLabelIcon', 'Icon of the extensions editor label.'));
 
diff --git a/src/vs/workbench/contrib/extensions/common/extensionsUtils.ts b/src/vs/workbench/contrib/extensions/common/extensionsUtils.ts
index 1f56b42b32c..a549a2f86f8 100644
--- a/src/vs/workbench/contrib/extensions/common/extensionsUtils.ts
+++ b/src/vs/workbench/contrib/extensions/common/extensionsUtils.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { Event } from 'vs/base/common/event';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IExtensionManagementService, ILocalExtension, IExtensionIdentifier, InstallOperation } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IWorkbenchExtensionEnablementService, EnablementState } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { IExtensionRecommendationsService } from 'vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { Severity, INotificationService } from 'vs/platform/notification/common/notification';
+import { localize } from '../../../../nls.js';
+import { Event } from '../../../../base/common/event.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IExtensionManagementService, ILocalExtension, IExtensionIdentifier, InstallOperation } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { IWorkbenchExtensionEnablementService, EnablementState } from '../../../services/extensionManagement/common/extensionManagement.js';
+import { IExtensionRecommendationsService } from '../../../services/extensionRecommendations/common/extensionRecommendations.js';
+import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { ServicesAccessor, IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { areSameExtensions } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { Severity, INotificationService } from '../../../../platform/notification/common/notification.js';
 
 export interface IExtensionStatus {
 	identifier: IExtensionIdentifier;
diff --git a/src/vs/workbench/contrib/extensions/common/reportExtensionIssueAction.ts b/src/vs/workbench/contrib/extensions/common/reportExtensionIssueAction.ts
index 34a1b543b5b..09e35361c1f 100644
--- a/src/vs/workbench/contrib/extensions/common/reportExtensionIssueAction.ts
+++ b/src/vs/workbench/contrib/extensions/common/reportExtensionIssueAction.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { Action } from 'vs/base/common/actions';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { IWorkbenchIssueService } from 'vs/workbench/contrib/issue/common/issue';
+import * as nls from '../../../../nls.js';
+import { Action } from '../../../../base/common/actions.js';
+import { IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
+import { IWorkbenchIssueService } from '../../issue/common/issue.js';
 
 export class ReportExtensionIssueAction extends Action {
 
diff --git a/src/vs/workbench/contrib/extensions/common/runtimeExtensionsInput.ts b/src/vs/workbench/contrib/extensions/common/runtimeExtensionsInput.ts
index 93821f6950a..ff3261488de 100644
--- a/src/vs/workbench/contrib/extensions/common/runtimeExtensionsInput.ts
+++ b/src/vs/workbench/contrib/extensions/common/runtimeExtensionsInput.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { URI } from 'vs/base/common/uri';
-import { EditorInputCapabilities, IUntypedEditorInput } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { Codicon } from 'vs/base/common/codicons';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
+import * as nls from '../../../../nls.js';
+import { URI } from '../../../../base/common/uri.js';
+import { EditorInputCapabilities, IUntypedEditorInput } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 
 const RuntimeExtensionsEditorIcon = registerIcon('runtime-extensions-editor-label-icon', Codicon.extensions, nls.localize('runtimeExtensionEditorLabelIcon', 'Icon of the runtime extensions editor label.'));
 
diff --git a/src/vs/workbench/contrib/extensions/electron-sandbox/debugExtensionHostAction.ts b/src/vs/workbench/contrib/extensions/electron-sandbox/debugExtensionHostAction.ts
index 4ba4300bff2..71291a40f8e 100644
--- a/src/vs/workbench/contrib/extensions/electron-sandbox/debugExtensionHostAction.ts
+++ b/src/vs/workbench/contrib/extensions/electron-sandbox/debugExtensionHostAction.ts
@@ -3,57 +3,125 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Action } from 'vs/base/common/actions';
-import { randomPort } from 'vs/base/common/ports';
-import * as nls from 'vs/nls';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IDebugService } from 'vs/workbench/contrib/debug/common/debug';
-import { ExtensionHostKind } from 'vs/workbench/services/extensions/common/extensionHostKind';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { randomPort } from '../../../../base/common/ports.js';
+import * as nls from '../../../../nls.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { Action2, MenuId } from '../../../../platform/actions/common/actions.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IProgressService, ProgressLocation } from '../../../../platform/progress/common/progress.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { ActiveEditorContext } from '../../../common/contextkeys.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { ExtensionHostKind } from '../../../services/extensions/common/extensionHostKind.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { IConfig, IDebugService } from '../../debug/common/debug.js';
+import { RuntimeExtensionsEditor } from './runtimeExtensionsEditor.js';
 
-export class DebugExtensionHostAction extends Action {
-	static readonly ID = 'workbench.extensions.action.debugExtensionHost';
-	static readonly LABEL = nls.localize('debugExtensionHost', "Start Debugging Extension Host");
-	static readonly CSS_CLASS = 'debug-extension-host';
-
-	constructor(
-		@IDebugService private readonly _debugService: IDebugService,
-		@INativeHostService private readonly _nativeHostService: INativeHostService,
-		@IDialogService private readonly _dialogService: IDialogService,
-		@IExtensionService private readonly _extensionService: IExtensionService,
-		@IProductService private readonly productService: IProductService
-	) {
-		super(DebugExtensionHostAction.ID, DebugExtensionHostAction.LABEL, DebugExtensionHostAction.CSS_CLASS);
+export class DebugExtensionHostAction extends Action2 {
+	constructor() {
+		super({
+			id: 'workbench.extensions.action.debugExtensionHost',
+			title: { value: nls.localize('debugExtensionHost', "Start Debugging Extension Host In New Window"), original: 'Start Debugging Extension Host In New Window' },
+			category: Categories.Developer,
+			f1: true,
+			icon: Codicon.debugStart,
+			menu: {
+				id: MenuId.EditorTitle,
+				when: ActiveEditorContext.isEqualTo(RuntimeExtensionsEditor.ID),
+				group: 'navigation',
+			}
+		});
 	}
 
-	override async run(): Promise<any> {
+	run(accessor: ServicesAccessor): void {
+		const nativeHostService = accessor.get(INativeHostService);
+		const dialogService = accessor.get(IDialogService);
+		const extensionService = accessor.get(IExtensionService);
+		const productService = accessor.get(IProductService);
+		const instantiationService = accessor.get(IInstantiationService);
+		const hostService = accessor.get(IHostService);
 
-		const inspectPorts = await this._extensionService.getInspectPorts(ExtensionHostKind.LocalProcess, false);
-		if (inspectPorts.length === 0) {
-			const res = await this._dialogService.confirm({
-				message: nls.localize('restart1', "Profile Extensions"),
-				detail: nls.localize('restart2', "In order to profile extensions a restart is required. Do you want to restart '{0}' now?", this.productService.nameLong),
-				primaryButton: nls.localize({ key: 'restart3', comment: ['&& denotes a mnemonic'] }, "&&Restart")
-			});
-			if (res.confirmed) {
-				await this._nativeHostService.relaunch({ addArgs: [`--inspect-extensions=${randomPort()}`] });
+		extensionService.getInspectPorts(ExtensionHostKind.LocalProcess, false).then(async inspectPorts => {
+			if (inspectPorts.length === 0) {
+				const res = await dialogService.confirm({
+					message: nls.localize('restart1', "Debug Extensions"),
+					detail: nls.localize('restart2', "In order to debug extensions a restart is required. Do you want to restart '{0}' now?", productService.nameLong),
+					primaryButton: nls.localize({ key: 'restart3', comment: ['&& denotes a mnemonic'] }, "&&Restart")
+				});
+				if (res.confirmed) {
+					await nativeHostService.relaunch({ addArgs: [`--inspect-extensions=${randomPort()}`] });
+				}
+				return;
 			}
 
-			return;
-		}
+			if (inspectPorts.length > 1) {
+				// TODO
+				console.warn(`There are multiple extension hosts available for debugging. Picking the first one...`);
+			}
 
-		if (inspectPorts.length > 1) {
-			// TODO
-			console.warn(`There are multiple extension hosts available for debugging. Picking the first one...`);
-		}
+			const s = instantiationService.createInstance(Storage);
+			s.storeDebugOnNewWindow(inspectPorts[0].port);
 
-		return this._debugService.startDebugging(undefined, {
-			type: 'node',
-			name: nls.localize('debugExtensionHost.launch.name', "Attach Extension Host"),
-			request: 'attach',
-			port: inspectPorts[0].port,
+			hostService.openWindow();
 		});
 	}
 }
+
+class Storage {
+	constructor(@IStorageService private readonly _storageService: IStorageService,) {
+	}
+
+	storeDebugOnNewWindow(targetPort: number) {
+		this._storageService.store('debugExtensionHost.debugPort', targetPort, StorageScope.APPLICATION, StorageTarget.MACHINE);
+	}
+
+	getAndDeleteDebugPortIfSet(): number | undefined {
+		const port = this._storageService.getNumber('debugExtensionHost.debugPort', StorageScope.APPLICATION);
+		if (port !== undefined) {
+			this._storageService.remove('debugExtensionHost.debugPort', StorageScope.APPLICATION);
+		}
+		return port;
+	}
+}
+
+export class DebugExtensionsContribution extends Disposable implements IWorkbenchContribution {
+	constructor(
+		@IDebugService private readonly _debugService: IDebugService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IProgressService _progressService: IProgressService,
+	) {
+		super();
+
+		const storage = this._instantiationService.createInstance(Storage);
+		const port = storage.getAndDeleteDebugPortIfSet();
+		if (port !== undefined) {
+			_progressService.withProgress({
+				location: ProgressLocation.Notification,
+				title: nls.localize('debugExtensionHost.progress', "Attaching Debugger To Extension Host"),
+			}, async p => {
+				await this._debugService.startDebugging(undefined, {
+					type: 'node',
+					name: nls.localize('debugExtensionHost.launch.name', "Attach Extension Host"),
+					request: 'attach',
+					port,
+					trace: true,
+					// resolve source maps everywhere:
+					resolveSourceMapLocations: null,
+					// announces sources eagerly for the loaded scripts view:
+					eagerSources: true,
+					// source maps of published VS Code are on the CDN and can take a while to load
+					timeouts: {
+						sourceMapMinPause: 30_000,
+						sourceMapCumulativePause: 300_000,
+					},
+				} as IConfig);
+			});
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/extensions/electron-sandbox/extensionProfileService.ts b/src/vs/workbench/contrib/extensions/electron-sandbox/extensionProfileService.ts
index 0ba85727065..99057a3464c 100644
--- a/src/vs/workbench/contrib/extensions/electron-sandbox/extensionProfileService.ts
+++ b/src/vs/workbench/contrib/extensions/electron-sandbox/extensionProfileService.ts
@@ -3,26 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { disposableWindowInterval } from 'vs/base/browser/dom';
-import { mainWindow } from 'vs/base/browser/window';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { randomPort } from 'vs/base/common/ports';
-import * as nls from 'vs/nls';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { ExtensionIdentifier, ExtensionIdentifierMap } from 'vs/platform/extensions/common/extensions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { RuntimeExtensionsInput } from 'vs/workbench/contrib/extensions/common/runtimeExtensionsInput';
-import { IExtensionHostProfileService, ProfileSessionState } from 'vs/workbench/contrib/extensions/electron-sandbox/runtimeExtensionsEditor';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ExtensionHostKind } from 'vs/workbench/services/extensions/common/extensionHostKind';
-import { IExtensionHostProfile, IExtensionService, ProfileSession } from 'vs/workbench/services/extensions/common/extensions';
-import { ExtensionHostProfiler } from 'vs/workbench/services/extensions/electron-sandbox/extensionHostProfiler';
-import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment } from 'vs/workbench/services/statusbar/browser/statusbar';
+import { disposableWindowInterval } from '../../../../base/browser/dom.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { randomPort } from '../../../../base/common/ports.js';
+import * as nls from '../../../../nls.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { ExtensionIdentifier, ExtensionIdentifierMap } from '../../../../platform/extensions/common/extensions.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { RuntimeExtensionsInput } from '../common/runtimeExtensionsInput.js';
+import { IExtensionHostProfileService, ProfileSessionState } from './runtimeExtensionsEditor.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { ExtensionHostKind } from '../../../services/extensions/common/extensionHostKind.js';
+import { IExtensionHostProfile, IExtensionService, ProfileSession } from '../../../services/extensions/common/extensions.js';
+import { ExtensionHostProfiler } from '../../../services/extensions/electron-sandbox/extensionHostProfiler.js';
+import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment } from '../../../services/statusbar/browser/statusbar.js';
+import { URI } from '../../../../base/common/uri.js';
 
 export class ExtensionHostProfileService extends Disposable implements IExtensionHostProfileService {
 
@@ -42,6 +43,7 @@ export class ExtensionHostProfileService extends Disposable implements IExtensio
 	private profilingStatusBarIndicator: IStatusbarEntryAccessor | undefined;
 	private readonly profilingStatusBarIndicatorLabelUpdater = this._register(new MutableDisposable());
 
+	public lastProfileSavedTo: URI | undefined;
 	public get state() { return this._state; }
 	public get lastProfile() { return this._profile; }
 
@@ -166,6 +168,7 @@ export class ExtensionHostProfileService extends Disposable implements IExtensio
 
 	private _setLastProfile(profile: IExtensionHostProfile) {
 		this._profile = profile;
+		this.lastProfileSavedTo = undefined;
 		this._onDidChangeLastProfile.fire(undefined);
 	}
 
diff --git a/src/vs/workbench/contrib/extensions/electron-sandbox/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/electron-sandbox/extensions.contribution.ts
index ff915c04865..021c893c2b6 100644
--- a/src/vs/workbench/contrib/extensions/electron-sandbox/extensions.contribution.ts
+++ b/src/vs/workbench/contrib/extensions/electron-sandbox/extensions.contribution.ts
@@ -3,32 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { MenuRegistry, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { EditorPaneDescriptor, IEditorPaneRegistry } from 'vs/workbench/browser/editor';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { RuntimeExtensionsEditor, StartExtensionHostProfileAction, StopExtensionHostProfileAction, CONTEXT_PROFILE_SESSION_STATE, CONTEXT_EXTENSION_HOST_PROFILE_RECORDED, SaveExtensionHostProfileAction, IExtensionHostProfileService } from 'vs/workbench/contrib/extensions/electron-sandbox/runtimeExtensionsEditor';
-import { DebugExtensionHostAction } from 'vs/workbench/contrib/extensions/electron-sandbox/debugExtensionHostAction';
-import { IEditorSerializer, IEditorFactoryRegistry, EditorExtensions } from 'vs/workbench/common/editor';
-import { ActiveEditorContext } from 'vs/workbench/common/contextkeys';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { RuntimeExtensionsInput } from 'vs/workbench/contrib/extensions/common/runtimeExtensionsInput';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { CleanUpExtensionsFolderAction, OpenExtensionsFolderAction } from 'vs/workbench/contrib/extensions/electron-sandbox/extensionsActions';
-import { IExtensionRecommendationNotificationService } from 'vs/platform/extensionRecommendations/common/extensionRecommendations';
-import { ISharedProcessService } from 'vs/platform/ipc/electron-sandbox/services';
-import { ExtensionRecommendationNotificationServiceChannel } from 'vs/platform/extensionRecommendations/common/extensionRecommendationsIpc';
-import { Codicon } from 'vs/base/common/codicons';
-import { RemoteExtensionsInitializerContribution } from 'vs/workbench/contrib/extensions/electron-sandbox/remoteExtensionsInit';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ExtensionHostProfileService } from 'vs/workbench/contrib/extensions/electron-sandbox/extensionProfileService';
-import { ExtensionsAutoProfiler } from 'vs/workbench/contrib/extensions/electron-sandbox/extensionsAutoProfiler';
-import { Disposable } from 'vs/base/common/lifecycle';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { localize } from '../../../../nls.js';
+import { registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { IExtensionRecommendationNotificationService } from '../../../../platform/extensionRecommendations/common/extensionRecommendations.js';
+import { ExtensionRecommendationNotificationServiceChannel } from '../../../../platform/extensionRecommendations/common/extensionRecommendationsIpc.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ISharedProcessService } from '../../../../platform/ipc/electron-sandbox/services.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { EditorPaneDescriptor, IEditorPaneRegistry } from '../../../browser/editor.js';
+import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from '../../../common/contributions.js';
+import { EditorExtensions, IEditorFactoryRegistry, IEditorSerializer } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { RuntimeExtensionsInput } from '../common/runtimeExtensionsInput.js';
+import { DebugExtensionHostAction, DebugExtensionsContribution } from './debugExtensionHostAction.js';
+import { ExtensionHostProfileService } from './extensionProfileService.js';
+import { CleanUpExtensionsFolderAction, OpenExtensionsFolderAction } from './extensionsActions.js';
+import { ExtensionsAutoProfiler } from './extensionsAutoProfiler.js';
+import { RemoteExtensionsInitializerContribution } from './remoteExtensionsInit.js';
+import { IExtensionHostProfileService, OpenExtensionHostProfileACtion, RuntimeExtensionsEditor, SaveExtensionHostProfileAction, StartExtensionHostProfileAction, StopExtensionHostProfileAction } from './runtimeExtensionsEditor.js';
 
 // Singletons
 registerSingleton(IExtensionHostProfileService, ExtensionHostProfileService, InstantiationType.Delayed);
@@ -75,67 +71,13 @@ const workbenchRegistry = Registry.as<IWorkbenchContributionsRegistry>(Workbench
 workbenchRegistry.registerWorkbenchContribution(ExtensionsContributions, LifecyclePhase.Restored);
 workbenchRegistry.registerWorkbenchContribution(ExtensionsAutoProfiler, LifecyclePhase.Eventually);
 workbenchRegistry.registerWorkbenchContribution(RemoteExtensionsInitializerContribution, LifecyclePhase.Restored);
+workbenchRegistry.registerWorkbenchContribution(DebugExtensionsContribution, LifecyclePhase.Restored);
+
 // Register Commands
 
-CommandsRegistry.registerCommand(DebugExtensionHostAction.ID, (accessor: ServicesAccessor) => {
-	const instantiationService = accessor.get(IInstantiationService);
-	instantiationService.createInstance(DebugExtensionHostAction).run();
-});
+registerAction2(DebugExtensionHostAction);
+registerAction2(StartExtensionHostProfileAction);
+registerAction2(StopExtensionHostProfileAction);
+registerAction2(SaveExtensionHostProfileAction);
+registerAction2(OpenExtensionHostProfileACtion);
 
-CommandsRegistry.registerCommand(StartExtensionHostProfileAction.ID, (accessor: ServicesAccessor) => {
-	const instantiationService = accessor.get(IInstantiationService);
-	instantiationService.createInstance(StartExtensionHostProfileAction, StartExtensionHostProfileAction.ID, StartExtensionHostProfileAction.LABEL).run();
-});
-
-CommandsRegistry.registerCommand(StopExtensionHostProfileAction.ID, (accessor: ServicesAccessor) => {
-	const instantiationService = accessor.get(IInstantiationService);
-	instantiationService.createInstance(StopExtensionHostProfileAction, StopExtensionHostProfileAction.ID, StopExtensionHostProfileAction.LABEL).run();
-});
-
-CommandsRegistry.registerCommand(SaveExtensionHostProfileAction.ID, (accessor: ServicesAccessor) => {
-	const instantiationService = accessor.get(IInstantiationService);
-	instantiationService.createInstance(SaveExtensionHostProfileAction, SaveExtensionHostProfileAction.ID, SaveExtensionHostProfileAction.LABEL).run();
-});
-
-// Running extensions
-
-MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
-	command: {
-		id: DebugExtensionHostAction.ID,
-		title: DebugExtensionHostAction.LABEL,
-		icon: Codicon.debugStart
-	},
-	group: 'navigation',
-	when: ActiveEditorContext.isEqualTo(RuntimeExtensionsEditor.ID)
-});
-
-MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
-	command: {
-		id: StartExtensionHostProfileAction.ID,
-		title: StartExtensionHostProfileAction.LABEL,
-		icon: Codicon.circleFilled
-	},
-	group: 'navigation',
-	when: ContextKeyExpr.and(ActiveEditorContext.isEqualTo(RuntimeExtensionsEditor.ID), CONTEXT_PROFILE_SESSION_STATE.notEqualsTo('running'))
-});
-
-MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
-	command: {
-		id: StopExtensionHostProfileAction.ID,
-		title: StopExtensionHostProfileAction.LABEL,
-		icon: Codicon.debugStop
-	},
-	group: 'navigation',
-	when: ContextKeyExpr.and(ActiveEditorContext.isEqualTo(RuntimeExtensionsEditor.ID), CONTEXT_PROFILE_SESSION_STATE.isEqualTo('running'))
-});
-
-MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
-	command: {
-		id: SaveExtensionHostProfileAction.ID,
-		title: SaveExtensionHostProfileAction.LABEL,
-		icon: Codicon.saveAll,
-		precondition: CONTEXT_EXTENSION_HOST_PROFILE_RECORDED
-	},
-	group: 'navigation',
-	when: ContextKeyExpr.and(ActiveEditorContext.isEqualTo(RuntimeExtensionsEditor.ID))
-});
diff --git a/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsActions.ts b/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsActions.ts
index 0b76db20375..d189fce4a3b 100644
--- a/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsActions.ts
+++ b/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsActions.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize2 } from 'vs/nls';
-import { IFileService } from 'vs/platform/files/common/files';
-import { URI } from 'vs/base/common/uri';
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { Schemas } from 'vs/base/common/network';
-import { Action2 } from 'vs/platform/actions/common/actions';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ExtensionsLocalizedLabel, IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
+import { localize2 } from '../../../../nls.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { URI } from '../../../../base/common/uri.js';
+import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-sandbox/environmentService.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { Action2 } from '../../../../platform/actions/common/actions.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { ExtensionsLocalizedLabel, IExtensionManagementService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
 
 export class OpenExtensionsFolderAction extends Action2 {
 
diff --git a/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsAutoProfiler.ts b/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsAutoProfiler.ts
index a5ce0e4238a..d53da54dcba 100644
--- a/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsAutoProfiler.ts
+++ b/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsAutoProfiler.ts
@@ -3,35 +3,35 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { timeout } from 'vs/base/common/async';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { joinPath } from 'vs/base/common/resources';
-import { TernarySearchTree } from 'vs/base/common/ternarySearchTree';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { localize } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ExtensionIdentifier, ExtensionIdentifierSet, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { INotificationService, NotificationPriority, Severity } from 'vs/platform/notification/common/notification';
-import { IProfileAnalysisWorkerService } from 'vs/platform/profiling/electron-sandbox/profileAnalysisWorkerService';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { RuntimeExtensionsInput } from 'vs/workbench/contrib/extensions/common/runtimeExtensionsInput';
-import { createSlowExtensionAction } from 'vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions';
-import { IExtensionHostProfileService } from 'vs/workbench/contrib/extensions/electron-sandbox/runtimeExtensionsEditor';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
-import { ExtensionHostKind } from 'vs/workbench/services/extensions/common/extensionHostKind';
-import { IExtensionHostProfile, IExtensionService, IResponsiveStateChangeEvent, ProfileSession } from 'vs/workbench/services/extensions/common/extensions';
-import { ExtensionHostProfiler } from 'vs/workbench/services/extensions/electron-sandbox/extensionHostProfiler';
-import { ITimerService } from 'vs/workbench/services/timer/browser/timerService';
+import { timeout } from '../../../../base/common/async.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { joinPath } from '../../../../base/common/resources.js';
+import { TernarySearchTree } from '../../../../base/common/ternarySearchTree.js';
+import { URI } from '../../../../base/common/uri.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { localize } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ExtensionIdentifier, ExtensionIdentifierSet, IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { INotificationService, NotificationPriority, Severity } from '../../../../platform/notification/common/notification.js';
+import { IProfileAnalysisWorkerService } from '../../../../platform/profiling/electron-sandbox/profileAnalysisWorkerService.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { RuntimeExtensionsInput } from '../common/runtimeExtensionsInput.js';
+import { createSlowExtensionAction } from './extensionsSlowActions.js';
+import { IExtensionHostProfileService } from './runtimeExtensionsEditor.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-sandbox/environmentService.js';
+import { ExtensionHostKind } from '../../../services/extensions/common/extensionHostKind.js';
+import { IExtensionHostProfile, IExtensionService, IResponsiveStateChangeEvent, ProfileSession } from '../../../services/extensions/common/extensions.js';
+import { ExtensionHostProfiler } from '../../../services/extensions/electron-sandbox/extensionHostProfiler.js';
+import { ITimerService } from '../../../services/timer/browser/timerService.js';
 
 export class ExtensionsAutoProfiler implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts b/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts
index 87839a6182f..447f4c9ff1f 100644
--- a/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts
+++ b/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IProductService } from 'vs/platform/product/common/productService';
-import { Action } from 'vs/base/common/actions';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { URI } from 'vs/base/common/uri';
-import { IExtensionHostProfile } from 'vs/workbench/services/extensions/common/extensions';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { localize } from 'vs/nls';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IRequestService, asText } from 'vs/platform/request/common/request';
-import { joinPath } from 'vs/base/common/resources';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
-import { Utils } from 'vs/platform/profiling/common/profiling';
-import { IFileService } from 'vs/platform/files/common/files';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { IRequestContext } from 'vs/base/parts/request/common/request';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { Action } from '../../../../base/common/actions.js';
+import { IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IExtensionHostProfile } from '../../../services/extensions/common/extensions.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { localize } from '../../../../nls.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IRequestService, asText } from '../../../../platform/request/common/request.js';
+import { joinPath } from '../../../../base/common/resources.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-sandbox/environmentService.js';
+import { Utils } from '../../../../platform/profiling/common/profiling.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { IRequestContext } from '../../../../base/parts/request/common/request.js';
 
 abstract class RepoInfo {
 	abstract get base(): string;
diff --git a/src/vs/workbench/contrib/extensions/electron-sandbox/remoteExtensionsInit.ts b/src/vs/workbench/contrib/extensions/electron-sandbox/remoteExtensionsInit.ts
index 9b69bd78cf9..203212373a6 100644
--- a/src/vs/workbench/contrib/extensions/electron-sandbox/remoteExtensionsInit.ts
+++ b/src/vs/workbench/contrib/extensions/electron-sandbox/remoteExtensionsInit.ts
@@ -3,27 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IExtensionGalleryService, IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { IStorageService, IS_NEW_KEY, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { AbstractExtensionsInitializer } from 'vs/platform/userDataSync/common/extensionsSync';
-import { IIgnoredExtensionsManagementService } from 'vs/platform/userDataSync/common/ignoredExtensions';
-import { IRemoteUserData, IUserDataSyncEnablementService, IUserDataSyncStoreManagementService, SyncResource } from 'vs/platform/userDataSync/common/userDataSync';
-import { UserDataSyncStoreClient } from 'vs/platform/userDataSync/common/userDataSyncStoreService';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IAuthenticationService } from 'vs/workbench/services/authentication/common/authentication';
-import { IExtensionManagementServerService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { IExtensionManifestPropertiesService } from 'vs/workbench/services/extensions/common/extensionManifestPropertiesService';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { IExtensionGalleryService, IExtensionManagementService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { areSameExtensions } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IRemoteAuthorityResolverService } from '../../../../platform/remote/common/remoteAuthorityResolver.js';
+import { IStorageService, IS_NEW_KEY, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { AbstractExtensionsInitializer } from '../../../../platform/userDataSync/common/extensionsSync.js';
+import { IIgnoredExtensionsManagementService } from '../../../../platform/userDataSync/common/ignoredExtensions.js';
+import { IRemoteUserData, IUserDataSyncEnablementService, IUserDataSyncStoreManagementService, SyncResource } from '../../../../platform/userDataSync/common/userDataSync.js';
+import { UserDataSyncStoreClient } from '../../../../platform/userDataSync/common/userDataSyncStoreService.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IAuthenticationService } from '../../../services/authentication/common/authentication.js';
+import { IExtensionManagementServerService } from '../../../services/extensionManagement/common/extensionManagement.js';
+import { IExtensionManifestPropertiesService } from '../../../services/extensions/common/extensionManifestPropertiesService.js';
+import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';
 
 export class RemoteExtensionsInitializerContribution implements IWorkbenchContribution {
 	constructor(
diff --git a/src/vs/workbench/contrib/extensions/electron-sandbox/runtimeExtensionsEditor.ts b/src/vs/workbench/contrib/extensions/electron-sandbox/runtimeExtensionsEditor.ts
index c46d2f817bf..ac1b7ad2bd8 100644
--- a/src/vs/workbench/contrib/extensions/electron-sandbox/runtimeExtensionsEditor.ts
+++ b/src/vs/workbench/contrib/extensions/electron-sandbox/runtimeExtensionsEditor.ts
@@ -3,35 +3,40 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { Action } from 'vs/base/common/actions';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IInstantiationService, createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IExtensionService, IExtensionHostProfile } from 'vs/workbench/services/extensions/common/extensions';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { Event } from 'vs/base/common/event';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IContextKeyService, RawContextKey, IContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { SlowExtensionAction } from 'vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { ReportExtensionIssueAction } from 'vs/workbench/contrib/extensions/common/reportExtensionIssueAction';
-import { AbstractRuntimeExtensionsEditor, IRuntimeExtension } from 'vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { URI } from 'vs/base/common/uri';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IV8Profile, Utils } from 'vs/platform/profiling/common/profiling';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { Schemas } from 'vs/base/common/network';
-import { joinPath } from 'vs/base/common/resources';
-import { IExtensionFeaturesManagementService } from 'vs/workbench/services/extensionManagement/common/extensionFeatures';
-import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import { Action } from '../../../../base/common/actions.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Event } from '../../../../base/common/event.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { joinPath } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import * as nls from '../../../../nls.js';
+import { Action2, IMenuService, MenuId } from '../../../../platform/actions/common/actions.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IInstantiationService, ServicesAccessor, createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IV8Profile, Utils } from '../../../../platform/profiling/common/profiling.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ActiveEditorContext } from '../../../common/contextkeys.js';
+import { IEditorGroup } from '../../../services/editor/common/editorGroupsService.js';
+import { IEditorService, SIDE_GROUP } from '../../../services/editor/common/editorService.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { IExtensionFeaturesManagementService } from '../../../services/extensionManagement/common/extensionFeatures.js';
+import { IExtensionHostProfile, IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { AbstractRuntimeExtensionsEditor, IRuntimeExtension } from '../browser/abstractRuntimeExtensionsEditor.js';
+import { IExtensionsWorkbenchService } from '../common/extensions.js';
+import { ReportExtensionIssueAction } from '../common/reportExtensionIssueAction.js';
+import { SlowExtensionAction } from './extensionsSlowActions.js';
 
 export const IExtensionHostProfileService = createDecorator<IExtensionHostProfileService>('extensionHostProfileService');
 export const CONTEXT_PROFILE_SESSION_STATE = new RawContextKey<string>('profileSessionState', 'none');
@@ -52,6 +57,7 @@ export interface IExtensionHostProfileService {
 
 	readonly state: ProfileSessionState;
 	readonly lastProfile: IExtensionHostProfile | null;
+	lastProfileSavedTo: URI | undefined;
 
 	startProfiling(): void;
 	stopProfiling(): void;
@@ -82,9 +88,10 @@ export class RuntimeExtensionsEditor extends AbstractRuntimeExtensionsEditor {
 		@IClipboardService clipboardService: IClipboardService,
 		@IExtensionHostProfileService private readonly _extensionHostProfileService: IExtensionHostProfileService,
 		@IExtensionFeaturesManagementService extensionFeaturesManagementService: IExtensionFeaturesManagementService,
-		@IHoverService hoverService: IHoverService
+		@IHoverService hoverService: IHoverService,
+		@IMenuService menuService: IMenuService,
 	) {
-		super(group, telemetryService, themeService, contextKeyService, extensionsWorkbenchService, extensionService, notificationService, contextMenuService, instantiationService, storageService, labelService, environmentService, clipboardService, extensionFeaturesManagementService, hoverService);
+		super(group, telemetryService, themeService, contextKeyService, extensionsWorkbenchService, extensionService, notificationService, contextMenuService, instantiationService, storageService, labelService, environmentService, clipboardService, extensionFeaturesManagementService, hoverService, menuService);
 		this._profileInfo = this._extensionHostProfileService.lastProfile;
 		this._extensionsHostRecorded = CONTEXT_EXTENSION_HOST_PROFILE_RECORDED.bindTo(contextKeyService);
 		this._profileSessionState = CONTEXT_PROFILE_SESSION_STATE.bindTo(contextKeyService);
@@ -121,83 +128,150 @@ export class RuntimeExtensionsEditor extends AbstractRuntimeExtensionsEditor {
 		}
 		return null;
 	}
-
-	protected _createSaveExtensionHostProfileAction(): Action | null {
-		return this._instantiationService.createInstance(SaveExtensionHostProfileAction, SaveExtensionHostProfileAction.ID, SaveExtensionHostProfileAction.LABEL);
-	}
-
-	protected _createProfileAction(): Action | null {
-		const state = this._extensionHostProfileService.state;
-		const profileAction = (
-			state === ProfileSessionState.Running
-				? this._instantiationService.createInstance(StopExtensionHostProfileAction, StopExtensionHostProfileAction.ID, StopExtensionHostProfileAction.LABEL)
-				: this._instantiationService.createInstance(StartExtensionHostProfileAction, StartExtensionHostProfileAction.ID, StartExtensionHostProfileAction.LABEL)
-		);
-		return profileAction;
-	}
 }
 
-export class StartExtensionHostProfileAction extends Action {
+export class StartExtensionHostProfileAction extends Action2 {
 	static readonly ID = 'workbench.extensions.action.extensionHostProfile';
 	static readonly LABEL = nls.localize('extensionHostProfileStart', "Start Extension Host Profile");
 
-	constructor(
-		id: string = StartExtensionHostProfileAction.ID, label: string = StartExtensionHostProfileAction.LABEL,
-		@IExtensionHostProfileService private readonly _extensionHostProfileService: IExtensionHostProfileService,
-	) {
-		super(id, label);
+	constructor() {
+		super({
+			id: StartExtensionHostProfileAction.ID,
+			title: { value: StartExtensionHostProfileAction.LABEL, original: 'Start Extension Host Profile' },
+			precondition: CONTEXT_PROFILE_SESSION_STATE.isEqualTo('none'),
+			icon: Codicon.circleFilled,
+			menu: [{
+				id: MenuId.EditorTitle,
+				when: ContextKeyExpr.and(ActiveEditorContext.isEqualTo(RuntimeExtensionsEditor.ID), CONTEXT_PROFILE_SESSION_STATE.notEqualsTo('running')),
+				group: 'navigation',
+			}, {
+				id: MenuId.ExtensionEditorContextMenu,
+				when: CONTEXT_PROFILE_SESSION_STATE.notEqualsTo('running'),
+				group: 'profiling',
+			}]
+		});
 	}
 
-	override run(): Promise<any> {
-		this._extensionHostProfileService.startProfiling();
+	run(accessor: ServicesAccessor): Promise<any> {
+		const extensionHostProfileService = accessor.get(IExtensionHostProfileService);
+		extensionHostProfileService.startProfiling();
 		return Promise.resolve();
 	}
 }
 
-export class StopExtensionHostProfileAction extends Action {
+export class StopExtensionHostProfileAction extends Action2 {
 	static readonly ID = 'workbench.extensions.action.stopExtensionHostProfile';
 	static readonly LABEL = nls.localize('stopExtensionHostProfileStart', "Stop Extension Host Profile");
 
-	constructor(
-		id: string = StartExtensionHostProfileAction.ID, label: string = StartExtensionHostProfileAction.LABEL,
-		@IExtensionHostProfileService private readonly _extensionHostProfileService: IExtensionHostProfileService,
-	) {
-		super(id, label);
+	constructor() {
+		super({
+			id: StopExtensionHostProfileAction.ID,
+			title: { value: StopExtensionHostProfileAction.LABEL, original: 'Stop Extension Host Profile' },
+			icon: Codicon.debugStop,
+			menu: [{
+				id: MenuId.EditorTitle,
+				when: ContextKeyExpr.and(ActiveEditorContext.isEqualTo(RuntimeExtensionsEditor.ID), CONTEXT_PROFILE_SESSION_STATE.isEqualTo('running')),
+				group: 'navigation',
+			}, {
+				id: MenuId.ExtensionEditorContextMenu,
+				when: CONTEXT_PROFILE_SESSION_STATE.isEqualTo('running'),
+				group: 'profiling',
+			}]
+		});
 	}
 
-	override run(): Promise<any> {
-		this._extensionHostProfileService.stopProfiling();
+	run(accessor: ServicesAccessor): Promise<any> {
+		const extensionHostProfileService = accessor.get(IExtensionHostProfileService);
+		extensionHostProfileService.stopProfiling();
 		return Promise.resolve();
 	}
 }
 
-export class SaveExtensionHostProfileAction extends Action {
+export class OpenExtensionHostProfileACtion extends Action2 {
+	static readonly LABEL = nls.localize('openExtensionHostProfile', "Open Extension Host Profile");
+	static readonly ID = 'workbench.extensions.action.openExtensionHostProfile';
+
+	constructor() {
+		super({
+			id: OpenExtensionHostProfileACtion.ID,
+			title: { value: OpenExtensionHostProfileACtion.LABEL, original: 'Open Extension Host Profile' },
+			precondition: CONTEXT_EXTENSION_HOST_PROFILE_RECORDED,
+			icon: Codicon.graph,
+			menu: [{
+				id: MenuId.EditorTitle,
+				when: ContextKeyExpr.and(ActiveEditorContext.isEqualTo(RuntimeExtensionsEditor.ID)),
+				group: 'navigation',
+			}, {
+				id: MenuId.ExtensionEditorContextMenu,
+				when: CONTEXT_EXTENSION_HOST_PROFILE_RECORDED,
+				group: 'profiling',
+			}]
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const extensionHostProfileService = accessor.get(IExtensionHostProfileService);
+		const commandService = accessor.get(ICommandService);
+		const editorService = accessor.get(IEditorService);
+		if (!extensionHostProfileService.lastProfileSavedTo) {
+			await commandService.executeCommand(SaveExtensionHostProfileAction.ID);
+		}
+		if (!extensionHostProfileService.lastProfileSavedTo) {
+			return;
+		}
+
+		await editorService.openEditor({
+			resource: extensionHostProfileService.lastProfileSavedTo,
+			options: {
+				revealIfOpened: true,
+				override: 'jsProfileVisualizer.cpuprofile.table',
+			},
+		}, SIDE_GROUP);
+	}
+
+}
+
+export class SaveExtensionHostProfileAction extends Action2 {
 
 	static readonly LABEL = nls.localize('saveExtensionHostProfile', "Save Extension Host Profile");
 	static readonly ID = 'workbench.extensions.action.saveExtensionHostProfile';
 
-	constructor(
-		id: string = SaveExtensionHostProfileAction.ID, label: string = SaveExtensionHostProfileAction.LABEL,
-		@IWorkbenchEnvironmentService private readonly _environmentService: IWorkbenchEnvironmentService,
-		@IExtensionHostProfileService private readonly _extensionHostProfileService: IExtensionHostProfileService,
-		@IFileService private readonly _fileService: IFileService,
-		@IFileDialogService private readonly _fileDialogService: IFileDialogService,
-	) {
-		super(id, label, undefined, false);
-		this._extensionHostProfileService.onDidChangeLastProfile(() => {
-			this.enabled = (this._extensionHostProfileService.lastProfile !== null);
+	constructor() {
+		super({
+			id: SaveExtensionHostProfileAction.ID,
+			title: { value: SaveExtensionHostProfileAction.LABEL, original: 'Save Extension Host Profile' },
+			precondition: CONTEXT_EXTENSION_HOST_PROFILE_RECORDED,
+			icon: Codicon.saveAll,
+			menu: [{
+				id: MenuId.EditorTitle,
+				when: ContextKeyExpr.and(ActiveEditorContext.isEqualTo(RuntimeExtensionsEditor.ID)),
+				group: 'navigation',
+			}, {
+				id: MenuId.ExtensionEditorContextMenu,
+				when: CONTEXT_EXTENSION_HOST_PROFILE_RECORDED,
+				group: 'profiling',
+			}]
 		});
 	}
 
-	override run(): Promise<any> {
-		return Promise.resolve(this._asyncRun());
+	run(accessor: ServicesAccessor): Promise<any> {
+		const environmentService = accessor.get(IWorkbenchEnvironmentService);
+		const extensionHostProfileService = accessor.get(IExtensionHostProfileService);
+		const fileService = accessor.get(IFileService);
+		const fileDialogService = accessor.get(IFileDialogService);
+		return this._asyncRun(environmentService, extensionHostProfileService, fileService, fileDialogService);
 	}
 
-	private async _asyncRun(): Promise<any> {
-		const picked = await this._fileDialogService.showSaveDialog({
+	private async _asyncRun(
+		environmentService: IWorkbenchEnvironmentService,
+		extensionHostProfileService: IExtensionHostProfileService,
+		fileService: IFileService,
+		fileDialogService: IFileDialogService
+	): Promise<any> {
+		const picked = await fileDialogService.showSaveDialog({
 			title: nls.localize('saveprofile.dialogTitle', "Save Extension Host Profile"),
 			availableFileSystems: [Schemas.file],
-			defaultUri: joinPath(await this._fileDialogService.defaultFilePath(), `CPU-${new Date().toISOString().replace(/[\-:]/g, '')}.cpuprofile`),
+			defaultUri: joinPath(await fileDialogService.defaultFilePath(), `CPU-${new Date().toISOString().replace(/[\-:]/g, '')}.cpuprofile`),
 			filters: [{
 				name: 'CPU Profiles',
 				extensions: ['cpuprofile', 'txt']
@@ -208,12 +282,12 @@ export class SaveExtensionHostProfileAction extends Action {
 			return;
 		}
 
-		const profileInfo = this._extensionHostProfileService.lastProfile;
+		const profileInfo = extensionHostProfileService.lastProfile;
 		let dataToWrite: object = profileInfo ? profileInfo.data : {};
 
 		let savePath = picked.fsPath;
 
-		if (this._environmentService.isBuilt) {
+		if (environmentService.isBuilt) {
 			// when running from a not-development-build we remove
 			// absolute filenames because we don't want to reveal anything
 			// about users. We also append the `.txt` suffix to make it
@@ -223,6 +297,9 @@ export class SaveExtensionHostProfileAction extends Action {
 			savePath = savePath + '.txt';
 		}
 
-		return this._fileService.writeFile(URI.file(savePath), VSBuffer.fromString(JSON.stringify(profileInfo ? profileInfo.data : {}, null, '\t')));
+		const saveURI = URI.file(savePath);
+		extensionHostProfileService.lastProfileSavedTo = saveURI;
+		return fileService.writeFile(saveURI, VSBuffer.fromString(JSON.stringify(profileInfo ? profileInfo.data : {}, null, '\t')));
 	}
 }
+
diff --git a/src/vs/workbench/contrib/extensions/test/common/extensionQuery.test.ts b/src/vs/workbench/contrib/extensions/test/common/extensionQuery.test.ts
index 588f6a3cec5..61457a1e254 100644
--- a/src/vs/workbench/contrib/extensions/test/common/extensionQuery.test.ts
+++ b/src/vs/workbench/contrib/extensions/test/common/extensionQuery.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Query } from 'vs/workbench/contrib/extensions/common/extensionQuery';
+import { Query } from '../../common/extensionQuery.js';
 
 suite('Extension query', () => {
 	test('parse', () => {
diff --git a/src/vs/workbench/contrib/extensions/test/electron-sandbox/extension.test.ts b/src/vs/workbench/contrib/extensions/test/electron-sandbox/extension.test.ts
index efdcd3abd98..85a5d5c48ad 100644
--- a/src/vs/workbench/contrib/extensions/test/electron-sandbox/extension.test.ts
+++ b/src/vs/workbench/contrib/extensions/test/electron-sandbox/extension.test.ts
@@ -4,16 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ExtensionState } from 'vs/workbench/contrib/extensions/common/extensions';
-import { Extension } from 'vs/workbench/contrib/extensions/browser/extensionsWorkbenchService';
-import { IGalleryExtension, IGalleryExtensionProperties, ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { ExtensionType, IExtensionManifest, TargetPlatform } from 'vs/platform/extensions/common/extensions';
-import { URI } from 'vs/base/common/uri';
-import { getGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { generateUuid } from 'vs/base/common/uuid';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { ExtensionState } from '../../common/extensions.js';
+import { Extension } from '../../browser/extensionsWorkbenchService.js';
+import { IGalleryExtension, IGalleryExtensionProperties, ILocalExtension } from '../../../../../platform/extensionManagement/common/extensionManagement.js';
+import { ExtensionType, IExtensionManifest, TargetPlatform } from '../../../../../platform/extensions/common/extensions.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { getGalleryExtensionId } from '../../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { generateUuid } from '../../../../../base/common/uuid.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { IProductService } from '../../../../../platform/product/common/productService.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('Extension Test', () => {
 
diff --git a/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionRecommendationsService.test.ts b/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionRecommendationsService.test.ts
index be1ca52ad70..6239a1dcd87 100644
--- a/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionRecommendationsService.test.ts
+++ b/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionRecommendationsService.test.ts
@@ -5,67 +5,67 @@
 
 import * as sinon from 'sinon';
 import assert from 'assert';
-import * as uuid from 'vs/base/common/uuid';
+import * as uuid from '../../../../../base/common/uuid.js';
 import {
 	IExtensionGalleryService, IGalleryExtensionAssets, IGalleryExtension, IExtensionManagementService, IExtensionTipsService, getTargetPlatform,
-} from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { ExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionGalleryService';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { Emitter, Event } from 'vs/base/common/event';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { TestLifecycleService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { TestContextService, TestProductService, TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
-import { TestExtensionTipsService, TestSharedProcessService } from 'vs/workbench/test/electron-sandbox/workbenchTestServices';
-import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { URI } from 'vs/base/common/uri';
-import { testWorkspace } from 'vs/platform/workspace/test/common/testWorkspace';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { IPager } from 'vs/base/common/paging';
-import { getGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { ConfigurationKey, IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions';
-import { TestExtensionEnablementService } from 'vs/workbench/services/extensionManagement/test/browser/extensionEnablementService.test';
-import { IURLService } from 'vs/platform/url/common/url';
-import { ITextModel } from 'vs/editor/common/model';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { INotificationService, Severity, IPromptChoice, IPromptOptions } from 'vs/platform/notification/common/notification';
-import { NativeURLService } from 'vs/platform/url/common/urlService';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ExtensionType } from 'vs/platform/extensions/common/extensions';
-import { ISharedProcessService } from 'vs/platform/ipc/electron-sandbox/services';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { NullLogService, ILogService } from 'vs/platform/log/common/log';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ExtensionRecommendationsService } from 'vs/workbench/contrib/extensions/browser/extensionRecommendationsService';
-import { NoOpWorkspaceTagsService } from 'vs/workbench/contrib/tags/browser/workspaceTagsService';
-import { IWorkspaceTagsService } from 'vs/workbench/contrib/tags/common/workspaceTags';
-import { ExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/browser/extensionsWorkbenchService';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IWorkspaceExtensionsConfigService, WorkspaceExtensionsConfigService } from 'vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig';
-import { IExtensionIgnoredRecommendationsService } from 'vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
-import { ExtensionIgnoredRecommendationsService } from 'vs/workbench/services/extensionRecommendations/common/extensionIgnoredRecommendationsService';
-import { IExtensionRecommendationNotificationService } from 'vs/platform/extensionRecommendations/common/extensionRecommendations';
-import { ExtensionRecommendationNotificationService } from 'vs/workbench/contrib/extensions/browser/extensionRecommendationNotificationService';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
-import { joinPath } from 'vs/base/common/resources';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { platform } from 'vs/base/common/platform';
-import { arch } from 'vs/base/common/process';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { timeout } from 'vs/base/common/async';
-import { IUpdateService, State } from 'vs/platform/update/common/update';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
+} from '../../../../../platform/extensionManagement/common/extensionManagement.js';
+import { IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService } from '../../../../services/extensionManagement/common/extensionManagement.js';
+import { ExtensionGalleryService } from '../../../../../platform/extensionManagement/common/extensionGalleryService.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { NullTelemetryService } from '../../../../../platform/telemetry/common/telemetryUtils.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { TestLifecycleService } from '../../../../test/browser/workbenchTestServices.js';
+import { TestContextService, TestProductService, TestStorageService } from '../../../../test/common/workbenchTestServices.js';
+import { TestExtensionTipsService, TestSharedProcessService } from '../../../../test/electron-sandbox/workbenchTestServices.js';
+import { TestNotificationService } from '../../../../../platform/notification/test/common/testNotificationService.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { testWorkspace } from '../../../../../platform/workspace/test/common/testWorkspace.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { IPager } from '../../../../../base/common/paging.js';
+import { getGalleryExtensionId } from '../../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { IEnvironmentService } from '../../../../../platform/environment/common/environment.js';
+import { ConfigurationKey, IExtensionsWorkbenchService } from '../../common/extensions.js';
+import { TestExtensionEnablementService } from '../../../../services/extensionManagement/test/browser/extensionEnablementService.test.js';
+import { IURLService } from '../../../../../platform/url/common/url.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
+import { IModelService } from '../../../../../editor/common/services/model.js';
+import { ILifecycleService } from '../../../../services/lifecycle/common/lifecycle.js';
+import { INotificationService, Severity, IPromptChoice, IPromptOptions } from '../../../../../platform/notification/common/notification.js';
+import { NativeURLService } from '../../../../../platform/url/common/urlService.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { ExtensionType } from '../../../../../platform/extensions/common/extensions.js';
+import { ISharedProcessService } from '../../../../../platform/ipc/electron-sandbox/services.js';
+import { FileService } from '../../../../../platform/files/common/fileService.js';
+import { NullLogService, ILogService } from '../../../../../platform/log/common/log.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { IProductService } from '../../../../../platform/product/common/productService.js';
+import { ExtensionRecommendationsService } from '../../browser/extensionRecommendationsService.js';
+import { NoOpWorkspaceTagsService } from '../../../tags/browser/workspaceTagsService.js';
+import { IWorkspaceTagsService } from '../../../tags/common/workspaceTags.js';
+import { ExtensionsWorkbenchService } from '../../browser/extensionsWorkbenchService.js';
+import { IExtensionService } from '../../../../services/extensions/common/extensions.js';
+import { IWorkspaceExtensionsConfigService, WorkspaceExtensionsConfigService } from '../../../../services/extensionRecommendations/common/workspaceExtensionsConfig.js';
+import { IExtensionIgnoredRecommendationsService } from '../../../../services/extensionRecommendations/common/extensionRecommendations.js';
+import { ExtensionIgnoredRecommendationsService } from '../../../../services/extensionRecommendations/common/extensionIgnoredRecommendationsService.js';
+import { IExtensionRecommendationNotificationService } from '../../../../../platform/extensionRecommendations/common/extensionRecommendations.js';
+import { ExtensionRecommendationNotificationService } from '../../browser/extensionRecommendationNotificationService.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { MockContextKeyService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { InMemoryFileSystemProvider } from '../../../../../platform/files/common/inMemoryFilesystemProvider.js';
+import { joinPath } from '../../../../../base/common/resources.js';
+import { VSBuffer } from '../../../../../base/common/buffer.js';
+import { platform } from '../../../../../base/common/platform.js';
+import { arch } from '../../../../../base/common/process.js';
+import { runWithFakedTimers } from '../../../../../base/test/common/timeTravelScheduler.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { timeout } from '../../../../../base/common/async.js';
+import { IUpdateService, State } from '../../../../../platform/update/common/update.js';
+import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.js';
+import { UriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentityService.js';
 
 const ROOT = URI.file('tests').with({ scheme: 'vscode-tests' });
 
diff --git a/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsActions.test.ts b/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsActions.test.ts
index 7bcaed37ba3..5eb95e87296 100644
--- a/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsActions.test.ts
+++ b/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsActions.test.ts
@@ -4,65 +4,65 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { generateUuid } from 'vs/base/common/uuid';
-import { IExtensionsWorkbenchService, ExtensionContainers } from 'vs/workbench/contrib/extensions/common/extensions';
-import * as ExtensionsActions from 'vs/workbench/contrib/extensions/browser/extensionsActions';
-import { ExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/browser/extensionsWorkbenchService';
+import { generateUuid } from '../../../../../base/common/uuid.js';
+import { IExtensionsWorkbenchService, ExtensionContainers } from '../../common/extensions.js';
+import * as ExtensionsActions from '../../browser/extensionsActions.js';
+import { ExtensionsWorkbenchService } from '../../browser/extensionsWorkbenchService.js';
 import {
 	IExtensionManagementService, IExtensionGalleryService, ILocalExtension, IGalleryExtension,
 	DidUninstallExtensionEvent, InstallExtensionEvent, IExtensionIdentifier, InstallOperation, IExtensionTipsService, InstallExtensionResult, getTargetPlatform, IExtensionsControlManifest, UninstallExtensionEvent, Metadata
-} from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionManagementServer, ExtensionInstallLocation, IProfileAwareExtensionManagementService, IWorkbenchExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { IExtensionRecommendationsService } from 'vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
-import { getGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { TestExtensionEnablementService } from 'vs/workbench/services/extensionManagement/test/browser/extensionEnablementService.test';
-import { ExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionGalleryService';
-import { IURLService } from 'vs/platform/url/common/url';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IPager } from 'vs/base/common/paging';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IExtensionService, toExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { TestContextService, TestWorkspaceTrustManagementService } from 'vs/workbench/test/common/workbenchTestServices';
-import { TestExtensionTipsService, TestSharedProcessService } from 'vs/workbench/test/electron-sandbox/workbenchTestServices';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ILogService, NullLogService } from 'vs/platform/log/common/log';
-import { NativeURLService } from 'vs/platform/url/common/urlService';
-import { URI } from 'vs/base/common/uri';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { RemoteAgentService } from 'vs/workbench/services/remote/electron-sandbox/remoteAgentService';
-import { IExtensionContributions, ExtensionType, IExtensionDescription, IExtension } from 'vs/platform/extensions/common/extensions';
-import { ISharedProcessService } from 'vs/platform/ipc/electron-sandbox/services';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { ILabelService, IFormatterChangeEvent } from 'vs/platform/label/common/label';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { Schemas } from 'vs/base/common/network';
-import { IProgressService } from 'vs/platform/progress/common/progress';
-import { ProgressService } from 'vs/workbench/services/progress/browser/progressService';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { TestEnvironmentService, TestLifecycleService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IUserDataSyncEnablementService } from 'vs/platform/userDataSync/common/userDataSync';
-import { UserDataSyncEnablementService } from 'vs/platform/userDataSync/common/userDataSyncEnablementService';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { IWorkspaceTrustManagementService } from 'vs/platform/workspace/common/workspaceTrust';
-import { IEnvironmentService, INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-import { platform } from 'vs/base/common/platform';
-import { arch } from 'vs/base/common/process';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IUpdateService, State } from 'vs/platform/update/common/update';
-import { IFileService } from 'vs/platform/files/common/files';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { Mutable } from 'vs/base/common/types';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { UserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfileService';
-import { toUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
+} from '../../../../../platform/extensionManagement/common/extensionManagement.js';
+import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionManagementServer, ExtensionInstallLocation, IProfileAwareExtensionManagementService, IWorkbenchExtensionManagementService } from '../../../../services/extensionManagement/common/extensionManagement.js';
+import { IExtensionRecommendationsService } from '../../../../services/extensionRecommendations/common/extensionRecommendations.js';
+import { getGalleryExtensionId } from '../../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { TestExtensionEnablementService } from '../../../../services/extensionManagement/test/browser/extensionEnablementService.test.js';
+import { ExtensionGalleryService } from '../../../../../platform/extensionManagement/common/extensionGalleryService.js';
+import { IURLService } from '../../../../../platform/url/common/url.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { IPager } from '../../../../../base/common/paging.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { NullTelemetryService } from '../../../../../platform/telemetry/common/telemetryUtils.js';
+import { IExtensionService, toExtensionDescription } from '../../../../services/extensions/common/extensions.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { TestContextService, TestWorkspaceTrustManagementService } from '../../../../test/common/workbenchTestServices.js';
+import { TestExtensionTipsService, TestSharedProcessService } from '../../../../test/electron-sandbox/workbenchTestServices.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { ILogService, NullLogService } from '../../../../../platform/log/common/log.js';
+import { NativeURLService } from '../../../../../platform/url/common/urlService.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { IRemoteAgentService } from '../../../../services/remote/common/remoteAgentService.js';
+import { RemoteAgentService } from '../../../../services/remote/electron-sandbox/remoteAgentService.js';
+import { IExtensionContributions, ExtensionType, IExtensionDescription, IExtension } from '../../../../../platform/extensions/common/extensions.js';
+import { ISharedProcessService } from '../../../../../platform/ipc/electron-sandbox/services.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { ILabelService, IFormatterChangeEvent } from '../../../../../platform/label/common/label.js';
+import { IProductService } from '../../../../../platform/product/common/productService.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { IProgressService } from '../../../../../platform/progress/common/progress.js';
+import { ProgressService } from '../../../../services/progress/browser/progressService.js';
+import { ILifecycleService } from '../../../../services/lifecycle/common/lifecycle.js';
+import { TestEnvironmentService, TestLifecycleService } from '../../../../test/browser/workbenchTestServices.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { INativeWorkbenchEnvironmentService } from '../../../../services/environment/electron-sandbox/environmentService.js';
+import { IWorkbenchEnvironmentService } from '../../../../services/environment/common/environmentService.js';
+import { IUserDataSyncEnablementService } from '../../../../../platform/userDataSync/common/userDataSync.js';
+import { UserDataSyncEnablementService } from '../../../../../platform/userDataSync/common/userDataSyncEnablementService.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { MockContextKeyService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { IWorkspaceTrustManagementService } from '../../../../../platform/workspace/common/workspaceTrust.js';
+import { IEnvironmentService, INativeEnvironmentService } from '../../../../../platform/environment/common/environment.js';
+import { platform } from '../../../../../base/common/platform.js';
+import { arch } from '../../../../../base/common/process.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IUpdateService, State } from '../../../../../platform/update/common/update.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { FileService } from '../../../../../platform/files/common/fileService.js';
+import { Mutable } from '../../../../../base/common/types.js';
+import { IUserDataProfileService } from '../../../../services/userDataProfile/common/userDataProfile.js';
+import { UserDataProfileService } from '../../../../services/userDataProfile/common/userDataProfileService.js';
+import { toUserDataProfile } from '../../../../../platform/userDataProfile/common/userDataProfile.js';
 
 let instantiationService: TestInstantiationService;
 let installEvent: Emitter<InstallExtensionEvent>,
@@ -177,7 +177,7 @@ suite('ExtensionsActions', () => {
 						testObject.extension = paged.firstPage[0];
 						assert.ok(!testObject.enabled);
 						assert.strictEqual('Install', testObject.label);
-						assert.strictEqual('extension-action label prominent install', testObject.class);
+						assert.strictEqual('extension-action label prominent install hide', testObject.class);
 					});
 			});
 	});
@@ -206,7 +206,7 @@ suite('ExtensionsActions', () => {
 		const gallery = aGalleryExtension('a');
 		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(gallery));
 		const paged = await workbenchService.queryGallery(CancellationToken.None);
-		const promise = Event.toPromise(testObject.onDidChange);
+		const promise = Event.toPromise(Event.filter(testObject.onDidChange, e => e.enabled === true));
 		testObject.extension = paged.firstPage[0];
 		await promise;
 		assert.ok(testObject.enabled);
@@ -1733,7 +1733,7 @@ suite('RemoteInstallAction', () => {
 		testObject.extension = extensions[0];
 		assert.ok(testObject.enabled);
 		assert.strictEqual('Install in remote', testObject.label);
-		assert.strictEqual('extension-action label prominent install', testObject.class);
+		assert.strictEqual('extension-action label prominent install-other-server', testObject.class);
 	});
 
 	test('Test remote install action when installing local workspace extension', async () => {
@@ -1759,12 +1759,12 @@ suite('RemoteInstallAction', () => {
 		testObject.extension = extensions[0];
 		assert.ok(testObject.enabled);
 		assert.strictEqual('Install in remote', testObject.label);
-		assert.strictEqual('extension-action label prominent install', testObject.class);
+		assert.strictEqual('extension-action label prominent install-other-server', testObject.class);
 
 		onInstallExtension.fire({ identifier: localWorkspaceExtension.identifier, source: gallery, profileLocation: null! });
 		assert.ok(testObject.enabled);
 		assert.strictEqual('Installing', testObject.label);
-		assert.strictEqual('extension-action label install installing', testObject.class);
+		assert.strictEqual('extension-action label install-other-server installing', testObject.class);
 	});
 
 	test('Test remote install action when installing local workspace extension is finished', async () => {
@@ -1792,12 +1792,12 @@ suite('RemoteInstallAction', () => {
 		testObject.extension = extensions[0];
 		assert.ok(testObject.enabled);
 		assert.strictEqual('Install in remote', testObject.label);
-		assert.strictEqual('extension-action label prominent install', testObject.class);
+		assert.strictEqual('extension-action label prominent install-other-server', testObject.class);
 
 		onInstallExtension.fire({ identifier: localWorkspaceExtension.identifier, source: gallery, profileLocation: null! });
 		assert.ok(testObject.enabled);
 		assert.strictEqual('Installing', testObject.label);
-		assert.strictEqual('extension-action label install installing', testObject.class);
+		assert.strictEqual('extension-action label install-other-server installing', testObject.class);
 
 		const installedExtension = aLocalExtension('a', { extensionKind: ['workspace'] }, { location: URI.file(`pub.a`).with({ scheme: Schemas.vscodeRemote }) });
 		const promise = Event.toPromise(testObject.onDidChange);
@@ -1826,7 +1826,7 @@ suite('RemoteInstallAction', () => {
 		testObject.extension = extensions[0];
 		assert.ok(testObject.enabled);
 		assert.strictEqual('Install in remote', testObject.label);
-		assert.strictEqual('extension-action label prominent install', testObject.class);
+		assert.strictEqual('extension-action label prominent install-other-server', testObject.class);
 	});
 
 	test('Test remote install action is enabled local workspace+ui extension', async () => {
@@ -1848,7 +1848,7 @@ suite('RemoteInstallAction', () => {
 		testObject.extension = extensions[0];
 		assert.ok(testObject.enabled);
 		assert.strictEqual('Install in remote', testObject.label);
-		assert.strictEqual('extension-action label prominent install', testObject.class);
+		assert.strictEqual('extension-action label prominent install-other-server', testObject.class);
 	});
 
 	test('Test remote install action is enabled for local ui+workapace extension if can install is true', async () => {
@@ -1870,7 +1870,7 @@ suite('RemoteInstallAction', () => {
 		testObject.extension = extensions[0];
 		assert.ok(testObject.enabled);
 		assert.strictEqual('Install in remote', testObject.label);
-		assert.strictEqual('extension-action label prominent install', testObject.class);
+		assert.strictEqual('extension-action label prominent install-other-server', testObject.class);
 	});
 
 	test('Test remote install action is disabled for local ui+workapace extension if can install is false', async () => {
@@ -2111,7 +2111,7 @@ suite('RemoteInstallAction', () => {
 		testObject.extension = extensions[0];
 		assert.ok(testObject.enabled);
 		assert.strictEqual('Install in remote', testObject.label);
-		assert.strictEqual('extension-action label prominent install', testObject.class);
+		assert.strictEqual('extension-action label prominent install-other-server', testObject.class);
 	});
 
 	test('Test remote install action is disabled if local language pack extension is uninstalled', async () => {
@@ -2164,7 +2164,7 @@ suite('LocalInstallAction', () => {
 		testObject.extension = extensions[0];
 		assert.ok(testObject.enabled);
 		assert.strictEqual('Install Locally', testObject.label);
-		assert.strictEqual('extension-action label prominent install', testObject.class);
+		assert.strictEqual('extension-action label prominent install-other-server', testObject.class);
 	});
 
 	test('Test local install action is enabled for remote ui+workspace extension', async () => {
@@ -2185,7 +2185,7 @@ suite('LocalInstallAction', () => {
 		testObject.extension = extensions[0];
 		assert.ok(testObject.enabled);
 		assert.strictEqual('Install Locally', testObject.label);
-		assert.strictEqual('extension-action label prominent install', testObject.class);
+		assert.strictEqual('extension-action label prominent install-other-server', testObject.class);
 	});
 
 	test('Test local install action when installing remote ui extension', async () => {
@@ -2211,12 +2211,12 @@ suite('LocalInstallAction', () => {
 		testObject.extension = extensions[0];
 		assert.ok(testObject.enabled);
 		assert.strictEqual('Install Locally', testObject.label);
-		assert.strictEqual('extension-action label prominent install', testObject.class);
+		assert.strictEqual('extension-action label prominent install-other-server', testObject.class);
 
 		onInstallExtension.fire({ identifier: remoteUIExtension.identifier, source: gallery, profileLocation: null! });
 		assert.ok(testObject.enabled);
 		assert.strictEqual('Installing', testObject.label);
-		assert.strictEqual('extension-action label install installing', testObject.class);
+		assert.strictEqual('extension-action label install-other-server installing', testObject.class);
 	});
 
 	test('Test local install action when installing remote ui extension is finished', async () => {
@@ -2244,12 +2244,12 @@ suite('LocalInstallAction', () => {
 		testObject.extension = extensions[0];
 		assert.ok(testObject.enabled);
 		assert.strictEqual('Install Locally', testObject.label);
-		assert.strictEqual('extension-action label prominent install', testObject.class);
+		assert.strictEqual('extension-action label prominent install-other-server', testObject.class);
 
 		onInstallExtension.fire({ identifier: remoteUIExtension.identifier, source: gallery, profileLocation: null! });
 		assert.ok(testObject.enabled);
 		assert.strictEqual('Installing', testObject.label);
-		assert.strictEqual('extension-action label install installing', testObject.class);
+		assert.strictEqual('extension-action label install-other-server installing', testObject.class);
 
 		const installedExtension = aLocalExtension('a', { extensionKind: ['ui'] }, { location: URI.file(`pub.a`) });
 		const promise = Event.toPromise(testObject.onDidChange);
@@ -2278,7 +2278,7 @@ suite('LocalInstallAction', () => {
 		testObject.extension = extensions[0];
 		assert.ok(testObject.enabled);
 		assert.strictEqual('Install Locally', testObject.label);
-		assert.strictEqual('extension-action label prominent install', testObject.class);
+		assert.strictEqual('extension-action label prominent install-other-server', testObject.class);
 	});
 
 	test('Test local install action is disabled when extension is not set', async () => {
@@ -2502,7 +2502,7 @@ suite('LocalInstallAction', () => {
 		testObject.extension = extensions[0];
 		assert.ok(testObject.enabled);
 		assert.strictEqual('Install Locally', testObject.label);
-		assert.strictEqual('extension-action label prominent install', testObject.class);
+		assert.strictEqual('extension-action label prominent install-other-server', testObject.class);
 	});
 
 	test('Test local install action is disabled if remote language pack extension is uninstalled', async () => {
@@ -2538,7 +2538,8 @@ function aLocalExtension(name: string = 'someext', manifest: any = {}, propertie
 		type: ExtensionType.User,
 		location: URI.file(`pub.${name}`),
 		identifier: { id: getGalleryExtensionId(manifest.publisher, manifest.name) },
-		...properties
+		...properties,
+		isValid: properties.isValid ?? true,
 	};
 	properties.isBuiltin = properties.type === ExtensionType.System;
 	return <ILocalExtension>Object.create({ manifest, ...properties });
@@ -2546,7 +2547,7 @@ function aLocalExtension(name: string = 'someext', manifest: any = {}, propertie
 
 function aGalleryExtension(name: string, properties: any = {}, galleryExtensionProperties: any = {}, assets: any = {}): IGalleryExtension {
 	const targetPlatform = getTargetPlatform(platform, arch);
-	const galleryExtension = <IGalleryExtension>Object.create({ name, publisher: 'pub', version: '1.0.0', allTargetPlatforms: [targetPlatform], properties: {}, assets: {}, ...properties });
+	const galleryExtension = <IGalleryExtension>Object.create({ name, publisher: 'pub', version: '1.0.0', allTargetPlatforms: [targetPlatform], properties: {}, assets: {}, isSigned: true, ...properties });
 	galleryExtension.properties = { ...galleryExtension.properties, dependencies: [], targetPlatform, ...galleryExtensionProperties };
 	galleryExtension.assets = { ...galleryExtension.assets, ...assets };
 	galleryExtension.identifier = { id: getGalleryExtensionId(galleryExtension.publisher, galleryExtension.name), uuid: generateUuid() };
diff --git a/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsViews.test.ts b/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsViews.test.ts
index 6d62ecebd61..6507d4cb008 100644
--- a/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsViews.test.ts
+++ b/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsViews.test.ts
@@ -4,56 +4,56 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { generateUuid } from 'vs/base/common/uuid';
-import { ExtensionsListView } from 'vs/workbench/contrib/extensions/browser/extensionsViews';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions';
-import { ExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/browser/extensionsWorkbenchService';
+import { generateUuid } from '../../../../../base/common/uuid.js';
+import { ExtensionsListView } from '../../browser/extensionsViews.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { IExtensionsWorkbenchService } from '../../common/extensions.js';
+import { ExtensionsWorkbenchService } from '../../browser/extensionsWorkbenchService.js';
 import {
 	IExtensionManagementService, IExtensionGalleryService, ILocalExtension, IGalleryExtension, IQueryOptions,
 	getTargetPlatform, IExtensionInfo, SortBy
-} from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionManagementServer, IProfileAwareExtensionManagementService, IWorkbenchExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { IExtensionRecommendationsService, ExtensionRecommendationReason } from 'vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
-import { getGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { TestExtensionEnablementService } from 'vs/workbench/services/extensionManagement/test/browser/extensionEnablementService.test';
-import { ExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionGalleryService';
-import { IURLService } from 'vs/platform/url/common/url';
-import { Event } from 'vs/base/common/event';
-import { IPager } from 'vs/base/common/paging';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IExtensionService, toExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { TestMenuService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { TestSharedProcessService } from 'vs/workbench/test/electron-sandbox/workbenchTestServices';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ILogService, NullLogService } from 'vs/platform/log/common/log';
-import { NativeURLService } from 'vs/platform/url/common/urlService';
-import { URI } from 'vs/base/common/uri';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
+} from '../../../../../platform/extensionManagement/common/extensionManagement.js';
+import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionManagementServer, IProfileAwareExtensionManagementService, IWorkbenchExtensionManagementService } from '../../../../services/extensionManagement/common/extensionManagement.js';
+import { IExtensionRecommendationsService, ExtensionRecommendationReason } from '../../../../services/extensionRecommendations/common/extensionRecommendations.js';
+import { getGalleryExtensionId } from '../../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { TestExtensionEnablementService } from '../../../../services/extensionManagement/test/browser/extensionEnablementService.test.js';
+import { ExtensionGalleryService } from '../../../../../platform/extensionManagement/common/extensionGalleryService.js';
+import { IURLService } from '../../../../../platform/url/common/url.js';
+import { Event } from '../../../../../base/common/event.js';
+import { IPager } from '../../../../../base/common/paging.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { NullTelemetryService } from '../../../../../platform/telemetry/common/telemetryUtils.js';
+import { IExtensionService, toExtensionDescription } from '../../../../services/extensions/common/extensions.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { TestMenuService } from '../../../../test/browser/workbenchTestServices.js';
+import { TestSharedProcessService } from '../../../../test/electron-sandbox/workbenchTestServices.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { ILogService, NullLogService } from '../../../../../platform/log/common/log.js';
+import { NativeURLService } from '../../../../../platform/url/common/urlService.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
 import { SinonStub } from 'sinon';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { RemoteAgentService } from 'vs/workbench/services/remote/electron-sandbox/remoteAgentService';
-import { ExtensionType, IExtension } from 'vs/platform/extensions/common/extensions';
-import { ISharedProcessService } from 'vs/platform/ipc/electron-sandbox/services';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { IMenuService } from 'vs/platform/actions/common/actions';
-import { TestContextService } from 'vs/workbench/test/common/workbenchTestServices';
-import { IViewDescriptorService, ViewContainerLocation } from 'vs/workbench/common/views';
-import { Schemas } from 'vs/base/common/network';
-import { platform } from 'vs/base/common/platform';
-import { arch } from 'vs/base/common/process';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IUpdateService, State } from 'vs/platform/update/common/update';
-import { IFileService } from 'vs/platform/files/common/files';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { UserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfileService';
-import { toUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { IRemoteAgentService } from '../../../../services/remote/common/remoteAgentService.js';
+import { RemoteAgentService } from '../../../../services/remote/electron-sandbox/remoteAgentService.js';
+import { ExtensionType, IExtension } from '../../../../../platform/extensions/common/extensions.js';
+import { ISharedProcessService } from '../../../../../platform/ipc/electron-sandbox/services.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { MockContextKeyService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { IMenuService } from '../../../../../platform/actions/common/actions.js';
+import { TestContextService } from '../../../../test/common/workbenchTestServices.js';
+import { IViewDescriptorService, ViewContainerLocation } from '../../../../common/views.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { platform } from '../../../../../base/common/platform.js';
+import { arch } from '../../../../../base/common/process.js';
+import { IProductService } from '../../../../../platform/product/common/productService.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IUpdateService, State } from '../../../../../platform/update/common/update.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { FileService } from '../../../../../platform/files/common/fileService.js';
+import { IUserDataProfileService } from '../../../../services/userDataProfile/common/userDataProfile.js';
+import { UserDataProfileService } from '../../../../services/userDataProfile/common/userDataProfileService.js';
+import { toUserDataProfile } from '../../../../../platform/userDataProfile/common/userDataProfile.js';
 
 suite('ExtensionsViews Tests', () => {
 
@@ -505,9 +505,6 @@ suite('ExtensionsViews Tests', () => {
 			}]
 		});
 
-		testableView.dispose();
-		testableView = disposableStore.add(instantiationService.createInstance(ExtensionsListView, {}, { id: '', title: '' }));
-
 		return testableView.show('search-me').then(result => {
 			const options: IQueryOptions = queryTarget.args[0][0];
 
@@ -532,9 +529,6 @@ suite('ExtensionsViews Tests', () => {
 
 		const queryTarget = <SinonStub>instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(...realResults));
 
-		testableView.dispose();
-		disposableStore.add(testableView = instantiationService.createInstance(ExtensionsListView, {}, { id: '', title: '' }));
-
 		return testableView.show('search-me @sort:installs').then(result => {
 			const options: IQueryOptions = queryTarget.args[0][0];
 
@@ -554,7 +548,8 @@ suite('ExtensionsViews Tests', () => {
 			location: URI.file(`pub.${name}`),
 			identifier: { id: getGalleryExtensionId(manifest.publisher, manifest.name) },
 			metadata: { id: getGalleryExtensionId(manifest.publisher, manifest.name), publisherId: manifest.publisher, publisherDisplayName: 'somename' },
-			...properties
+			...properties,
+			isValid: properties.isValid ?? true,
 		};
 		properties.isBuiltin = properties.type === ExtensionType.System;
 		return <ILocalExtension>Object.create({ manifest, ...properties });
diff --git a/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsWorkbenchService.test.ts b/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsWorkbenchService.test.ts
index 95f83c91d4a..fd474b58a00 100644
--- a/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsWorkbenchService.test.ts
+++ b/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsWorkbenchService.test.ts
@@ -5,58 +5,59 @@
 
 import * as sinon from 'sinon';
 import assert from 'assert';
-import { generateUuid } from 'vs/base/common/uuid';
-import { ExtensionState, AutoCheckUpdatesConfigurationKey, AutoUpdateConfigurationKey } from 'vs/workbench/contrib/extensions/common/extensions';
-import { ExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/browser/extensionsWorkbenchService';
+import { generateUuid } from '../../../../../base/common/uuid.js';
+import { ExtensionState, AutoCheckUpdatesConfigurationKey, AutoUpdateConfigurationKey } from '../../common/extensions.js';
+import { ExtensionsWorkbenchService } from '../../browser/extensionsWorkbenchService.js';
 import {
 	IExtensionManagementService, IExtensionGalleryService, ILocalExtension, IGalleryExtension,
 	DidUninstallExtensionEvent, InstallExtensionEvent, IGalleryExtensionAssets, InstallOperation, IExtensionTipsService, InstallExtensionResult, getTargetPlatform, IExtensionsControlManifest, UninstallExtensionEvent, Metadata
-} from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionManagementServer, IProfileAwareExtensionManagementService, IWorkbenchExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { IExtensionRecommendationsService } from 'vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
-import { getGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { anExtensionManagementServerService, TestExtensionEnablementService } from 'vs/workbench/services/extensionManagement/test/browser/extensionEnablementService.test';
-import { ExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionGalleryService';
-import { IURLService } from 'vs/platform/url/common/url';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { Event, Emitter } from 'vs/base/common/event';
-import { IPager } from 'vs/base/common/paging';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { TestExtensionTipsService, TestSharedProcessService } from 'vs/workbench/test/electron-sandbox/workbenchTestServices';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ILogService, NullLogService } from 'vs/platform/log/common/log';
-import { IProgressService } from 'vs/platform/progress/common/progress';
-import { ProgressService } from 'vs/workbench/services/progress/browser/progressService';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { NativeURLService } from 'vs/platform/url/common/urlService';
-import { URI } from 'vs/base/common/uri';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { ExtensionType } from 'vs/platform/extensions/common/extensions';
-import { ExtensionKind } from 'vs/platform/environment/common/environment';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { RemoteAgentService } from 'vs/workbench/services/remote/electron-sandbox/remoteAgentService';
-import { ISharedProcessService } from 'vs/platform/ipc/electron-sandbox/services';
-import { TestContextService } from 'vs/workbench/test/common/workbenchTestServices';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { TestLifecycleService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { Schemas } from 'vs/base/common/network';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { platform } from 'vs/base/common/platform';
-import { arch } from 'vs/base/common/process';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { toDisposable } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Mutable } from 'vs/base/common/types';
-import { IUpdateService, State } from 'vs/platform/update/common/update';
-import { IFileService } from 'vs/platform/files/common/files';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { UserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfileService';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { toUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
+} from '../../../../../platform/extensionManagement/common/extensionManagement.js';
+import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionManagementServer, IProfileAwareExtensionManagementService, IWorkbenchExtensionManagementService } from '../../../../services/extensionManagement/common/extensionManagement.js';
+import { IExtensionRecommendationsService } from '../../../../services/extensionRecommendations/common/extensionRecommendations.js';
+import { getGalleryExtensionId } from '../../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { anExtensionManagementServerService, TestExtensionEnablementService } from '../../../../services/extensionManagement/test/browser/extensionEnablementService.test.js';
+import { ExtensionGalleryService } from '../../../../../platform/extensionManagement/common/extensionGalleryService.js';
+import { IURLService } from '../../../../../platform/url/common/url.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { Event, Emitter } from '../../../../../base/common/event.js';
+import { IPager } from '../../../../../base/common/paging.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { NullTelemetryService } from '../../../../../platform/telemetry/common/telemetryUtils.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { TestExtensionTipsService, TestSharedProcessService } from '../../../../test/electron-sandbox/workbenchTestServices.js';
+import { ConfigurationTarget, IConfigurationChangeEvent, IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { ILogService, NullLogService } from '../../../../../platform/log/common/log.js';
+import { IProgressService } from '../../../../../platform/progress/common/progress.js';
+import { ProgressService } from '../../../../services/progress/browser/progressService.js';
+import { INotificationService } from '../../../../../platform/notification/common/notification.js';
+import { NativeURLService } from '../../../../../platform/url/common/urlService.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { ExtensionType } from '../../../../../platform/extensions/common/extensions.js';
+import { ExtensionKind } from '../../../../../platform/environment/common/environment.js';
+import { IRemoteAgentService } from '../../../../services/remote/common/remoteAgentService.js';
+import { RemoteAgentService } from '../../../../services/remote/electron-sandbox/remoteAgentService.js';
+import { ISharedProcessService } from '../../../../../platform/ipc/electron-sandbox/services.js';
+import { TestContextService } from '../../../../test/common/workbenchTestServices.js';
+import { IProductService } from '../../../../../platform/product/common/productService.js';
+import { ILifecycleService } from '../../../../services/lifecycle/common/lifecycle.js';
+import { TestLifecycleService } from '../../../../test/browser/workbenchTestServices.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { MockContextKeyService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { platform } from '../../../../../base/common/platform.js';
+import { arch } from '../../../../../base/common/process.js';
+import { IExtensionService } from '../../../../services/extensions/common/extensions.js';
+import { toDisposable } from '../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Mutable } from '../../../../../base/common/types.js';
+import { IUpdateService, State } from '../../../../../platform/update/common/update.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { FileService } from '../../../../../platform/files/common/fileService.js';
+import { UserDataProfileService } from '../../../../services/userDataProfile/common/userDataProfileService.js';
+import { IUserDataProfileService } from '../../../../services/userDataProfile/common/userDataProfile.js';
+import { toUserDataProfile } from '../../../../../platform/userDataProfile/common/userDataProfile.js';
+import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
 
 suite('ExtensionsWorkbenchServiceTest', () => {
 
@@ -111,7 +112,8 @@ suite('ExtensionsWorkbenchServiceTest', () => {
 				return local;
 			},
 			async canInstall() { return true; },
-			getTargetPlatform: async () => getTargetPlatform(platform, arch)
+			getTargetPlatform: async () => getTargetPlatform(platform, arch),
+			async resetPinnedStateForAllUserExtensions(pinned: boolean) { }
 		});
 
 		instantiationService.stub(IExtensionManagementServerService, anExtensionManagementServerService({
@@ -723,10 +725,9 @@ suite('ExtensionsWorkbenchServiceTest', () => {
 		const extensionB = aLocalExtension('b');
 		const extensionC = aLocalExtension('c');
 
-		instantiationService.stub(INotificationService, {
-			prompt(severity, message, choices, options) {
-				choices[0].run();
-				return null!;
+		instantiationService.stub(IDialogService, {
+			prompt() {
+				return Promise.resolve({ result: true });
 			}
 		});
 		return instantiationService.get(IWorkbenchExtensionEnablementService).setEnablement([extensionA], EnablementState.EnabledGlobally)
@@ -1431,10 +1432,35 @@ suite('ExtensionsWorkbenchServiceTest', () => {
 
 		await testObject.updateAutoUpdateEnablementFor(testObject.local[0], false);
 
-		assert.strictEqual(testObject.local[0].local?.pinned, true);
+		assert.strictEqual(testObject.local[0].local?.pinned, undefined);
 		assert.strictEqual(testObject.local[1].local?.pinned, undefined);
 
-		assert.deepStrictEqual(testObject.getSelectedExtensionsToAutoUpdate(), []);
+		assert.deepStrictEqual(testObject.getEnabledAutoUpdateExtensions(), []);
+		assert.deepStrictEqual(testObject.getDisabledAutoUpdateExtensions(), ['pub.a']);
+	});
+
+	test('Test disable autoupdate for extension when auto update is enabled for enabled extensions', async () => {
+		stubConfiguration('onlyEnabledExtensions');
+
+		const extension1 = aLocalExtension('a');
+		const extension2 = aLocalExtension('b');
+		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extension1, extension2]);
+		instantiationService.stub(IExtensionManagementService, 'updateMetadata', (local: Mutable<ILocalExtension>, metadata: Partial<Metadata>) => {
+			local.pinned = !!metadata.pinned;
+			return local;
+		});
+		testObject = await aWorkbenchService();
+
+		assert.strictEqual(testObject.local[0].local?.pinned, undefined);
+		assert.strictEqual(testObject.local[1].local?.pinned, undefined);
+
+		await testObject.updateAutoUpdateEnablementFor(testObject.local[0], false);
+
+		assert.strictEqual(testObject.local[0].local?.pinned, undefined);
+		assert.strictEqual(testObject.local[1].local?.pinned, undefined);
+
+		assert.deepStrictEqual(testObject.getEnabledAutoUpdateExtensions(), []);
+		assert.deepStrictEqual(testObject.getDisabledAutoUpdateExtensions(), ['pub.a']);
 	});
 
 	test('Test enable autoupdate for extension when auto update is enabled for all', async () => {
@@ -1453,10 +1479,33 @@ suite('ExtensionsWorkbenchServiceTest', () => {
 		await testObject.updateAutoUpdateEnablementFor(testObject.local[0], false);
 		await testObject.updateAutoUpdateEnablementFor(testObject.local[0], true);
 
+		assert.strictEqual(testObject.local[0].local?.pinned, undefined);
+		assert.strictEqual(testObject.local[1].local?.pinned, undefined);
+
+		assert.deepStrictEqual(testObject.getEnabledAutoUpdateExtensions(), []);
+		assert.deepStrictEqual(testObject.getDisabledAutoUpdateExtensions(), []);
+	});
+
+	test('Test enable autoupdate for pinned extension when auto update is enabled', async () => {
+		const extension1 = aLocalExtension('a', undefined, { pinned: true });
+		const extension2 = aLocalExtension('b');
+		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extension1, extension2]);
+		instantiationService.stub(IExtensionManagementService, 'updateMetadata', (local: Mutable<ILocalExtension>, metadata: Partial<Metadata>) => {
+			local.pinned = !!metadata.pinned;
+			return local;
+		});
+		testObject = await aWorkbenchService();
+
+		assert.strictEqual(testObject.local[0].local?.pinned, true);
+		assert.strictEqual(testObject.local[1].local?.pinned, undefined);
+
+		await testObject.updateAutoUpdateEnablementFor(testObject.local[0], true);
+
 		assert.strictEqual(testObject.local[0].local?.pinned, false);
 		assert.strictEqual(testObject.local[1].local?.pinned, undefined);
 
-		assert.deepStrictEqual(testObject.getSelectedExtensionsToAutoUpdate(), []);
+		assert.deepStrictEqual(testObject.getEnabledAutoUpdateExtensions(), []);
+		assert.deepStrictEqual(testObject.getDisabledAutoUpdateExtensions(), []);
 	});
 
 	test('Test updateAutoUpdateEnablementFor throws error when auto update is disabled', async () => {
@@ -1489,46 +1538,6 @@ suite('ExtensionsWorkbenchServiceTest', () => {
 		}
 	});
 
-	test('Test updateAutoUpdateEnablementFor throws error for extension id when auto update mode is onlySelectedExtensions', async () => {
-		stubConfiguration('onlySelectedExtensions');
-
-		const extension1 = aLocalExtension('a');
-		const extension2 = aLocalExtension('b');
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extension1, extension2]);
-		testObject = await aWorkbenchService();
-
-		try {
-			await testObject.updateAutoUpdateEnablementFor(testObject.local[0].identifier.id, true);
-			assert.fail('error expected');
-		} catch (error) {
-			// expected
-		}
-	});
-
-	test('Test enable autoupdate for extension when auto update is set to onlySelectedExtensions', async () => {
-		stubConfiguration('onlySelectedExtensions');
-
-		const extension1 = aLocalExtension('a', undefined, { pinned: true });
-		const extension2 = aLocalExtension('b', undefined, { pinned: true });
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extension1, extension2]);
-		instantiationService.stub(IExtensionManagementService, 'updateMetadata', (local: Mutable<ILocalExtension>, metadata: Partial<Metadata>) => {
-			local.pinned = !!metadata.pinned;
-			return local;
-		});
-		testObject = await aWorkbenchService();
-
-		assert.strictEqual(testObject.local[0].local?.pinned, true);
-		assert.strictEqual(testObject.local[1].local?.pinned, true);
-
-		await testObject.updateAutoUpdateEnablementFor(testObject.local[0], true);
-
-		assert.strictEqual(testObject.local[0].local?.pinned, false);
-		assert.strictEqual(testObject.local[1].local?.pinned, true);
-
-		assert.deepStrictEqual(testObject.getSelectedExtensionsToAutoUpdate(), ['pub.a']);
-		assert.equal(instantiationService.get(IConfigurationService).getValue(AutoUpdateConfigurationKey), 'onlySelectedExtensions');
-	});
-
 	test('Test enable autoupdate for extension when auto update is disabled', async () => {
 		stubConfiguration(false);
 
@@ -1546,15 +1555,43 @@ suite('ExtensionsWorkbenchServiceTest', () => {
 
 		await testObject.updateAutoUpdateEnablementFor(testObject.local[0], true);
 
-		assert.strictEqual(testObject.local[0].local?.pinned, false);
+		assert.strictEqual(testObject.local[0].local?.pinned, true);
 		assert.strictEqual(testObject.local[1].local?.pinned, true);
 
-		assert.deepStrictEqual(testObject.getSelectedExtensionsToAutoUpdate(), ['pub.a']);
-		assert.equal(instantiationService.get(IConfigurationService).getValue(AutoUpdateConfigurationKey), 'onlySelectedExtensions');
+		assert.deepStrictEqual(testObject.getEnabledAutoUpdateExtensions(), ['pub.a']);
+		assert.deepStrictEqual(testObject.getDisabledAutoUpdateExtensions(), []);
 	});
 
-	test('Test disable autoupdate for extension when auto update is set to onlySelectedExtensions', async () => {
-		stubConfiguration('onlySelectedExtensions');
+	test('Test reset autoupdate extensions state when auto update is disabled', async () => {
+		instantiationService.stub(IDialogService, {
+			confirm: () => Promise.resolve({ confirmed: true })
+		});
+
+		const extension1 = aLocalExtension('a', undefined, { pinned: true });
+		const extension2 = aLocalExtension('b', undefined, { pinned: true });
+		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extension1, extension2]);
+		instantiationService.stub(IExtensionManagementService, 'updateMetadata', (local: Mutable<ILocalExtension>, metadata: Partial<Metadata>) => {
+			local.pinned = !!metadata.pinned;
+			return local;
+		});
+		testObject = await aWorkbenchService();
+
+		await testObject.updateAutoUpdateEnablementFor(testObject.local[0], false);
+
+		assert.deepStrictEqual(testObject.getEnabledAutoUpdateExtensions(), []);
+		assert.deepStrictEqual(testObject.getDisabledAutoUpdateExtensions(), ['pub.a']);
+
+		await testObject.updateAutoUpdateForAllExtensions(false);
+
+		assert.deepStrictEqual(testObject.getEnabledAutoUpdateExtensions(), []);
+		assert.deepStrictEqual(testObject.getDisabledAutoUpdateExtensions(), []);
+	});
+
+	test('Test reset autoupdate extensions state when auto update is enabled', async () => {
+		stubConfiguration(false);
+		instantiationService.stub(IDialogService, {
+			confirm: () => Promise.resolve({ confirmed: true })
+		});
 
 		const extension1 = aLocalExtension('a', undefined, { pinned: true });
 		const extension2 = aLocalExtension('b', undefined, { pinned: true });
@@ -1566,100 +1603,14 @@ suite('ExtensionsWorkbenchServiceTest', () => {
 		testObject = await aWorkbenchService();
 
 		await testObject.updateAutoUpdateEnablementFor(testObject.local[0], true);
-		await testObject.updateAutoUpdateEnablementFor(testObject.local[0], false);
 
-		assert.strictEqual(testObject.local[0].local?.pinned, true);
-		assert.strictEqual(testObject.local[1].local?.pinned, true);
-		assert.deepStrictEqual(testObject.getSelectedExtensionsToAutoUpdate(), []);
-		assert.equal(instantiationService.get(IConfigurationService).getValue(AutoUpdateConfigurationKey), false);
-	});
+		assert.deepStrictEqual(testObject.getEnabledAutoUpdateExtensions(), ['pub.a']);
+		assert.deepStrictEqual(testObject.getDisabledAutoUpdateExtensions(), []);
 
-	test('Test enable auto update for publisher when auto update mode is onlySelectedExtensions', async () => {
-		stubConfiguration('onlySelectedExtensions');
+		await testObject.updateAutoUpdateForAllExtensions(true);
 
-		const extension1 = aLocalExtension('a', undefined, { pinned: true });
-		const extension2 = aLocalExtension('b', undefined, { pinned: true });
-		const extension3 = aLocalExtension('a', { publisher: 'pub2' }, { pinned: true });
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extension1, extension2, extension3]);
-		instantiationService.stub(IExtensionManagementService, 'updateMetadata', (local: ILocalExtension, metadata: Partial<Metadata>) => {
-			local.pinned = !!metadata.pinned;
-			return local;
-		});
-		testObject = await aWorkbenchService();
-
-		await testObject.updateAutoUpdateEnablementFor(testObject.local[0].publisher, true);
-
-		assert.strictEqual(testObject.local[0].local?.pinned, false);
-		assert.strictEqual(testObject.local[1].local?.pinned, false);
-		assert.strictEqual(testObject.local[2].local?.pinned, true);
-		assert.deepStrictEqual(testObject.getSelectedExtensionsToAutoUpdate(), ['pub']);
-	});
-
-	test('Test disable auto update for publisher when auto update mode is onlySelectedExtensions', async () => {
-		stubConfiguration('onlySelectedExtensions');
-
-		const extension1 = aLocalExtension('a', undefined, { pinned: true });
-		const extension2 = aLocalExtension('b', undefined, { pinned: true });
-		const extension3 = aLocalExtension('a', { publisher: 'pub2' }, { pinned: true });
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extension1, extension2, extension3]);
-		instantiationService.stub(IExtensionManagementService, 'updateMetadata', (local: ILocalExtension, metadata: Partial<Metadata>) => {
-			local.pinned = !!metadata.pinned;
-			return local;
-		});
-		testObject = await aWorkbenchService();
-
-		await testObject.updateAutoUpdateEnablementFor(testObject.local[0].publisher, true);
-		await testObject.updateAutoUpdateEnablementFor(testObject.local[0].publisher, false);
-
-		assert.strictEqual(testObject.local[0].local?.pinned, true);
-		assert.strictEqual(testObject.local[1].local?.pinned, true);
-		assert.strictEqual(testObject.local[2].local?.pinned, true);
-		assert.deepStrictEqual(testObject.getSelectedExtensionsToAutoUpdate(), []);
-	});
-
-	test('Test disable auto update for an extension when auto update for publisher is enabled and update mode is onlySelectedExtensions', async () => {
-		stubConfiguration('onlySelectedExtensions');
-
-		const extension1 = aLocalExtension('a', undefined, { pinned: true });
-		const extension2 = aLocalExtension('b', undefined, { pinned: true });
-		const extension3 = aLocalExtension('a', { publisher: 'pub2' }, { pinned: true });
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extension1, extension2, extension3]);
-		instantiationService.stub(IExtensionManagementService, 'updateMetadata', (local: ILocalExtension, metadata: Partial<Metadata>) => {
-			local.pinned = !!metadata.pinned;
-			return local;
-		});
-		testObject = await aWorkbenchService();
-
-		await testObject.updateAutoUpdateEnablementFor(testObject.local[0].publisher, true);
-		await testObject.updateAutoUpdateEnablementFor(testObject.local[0], false);
-
-		assert.strictEqual(testObject.local[0].local?.pinned, true);
-		assert.strictEqual(testObject.local[1].local?.pinned, false);
-		assert.strictEqual(testObject.local[2].local?.pinned, true);
-		assert.deepStrictEqual(testObject.getSelectedExtensionsToAutoUpdate(), ['pub', '-pub.a']);
-	});
-
-	test('Test enable auto update for an extension when auto updates is enabled for publisher and disabled for extension and update mode is onlySelectedExtensions', async () => {
-		stubConfiguration('onlySelectedExtensions');
-
-		const extension1 = aLocalExtension('a', undefined, { pinned: true });
-		const extension2 = aLocalExtension('b', undefined, { pinned: true });
-		const extension3 = aLocalExtension('a', { publisher: 'pub2' }, { pinned: true });
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extension1, extension2, extension3]);
-		instantiationService.stub(IExtensionManagementService, 'updateMetadata', (local: ILocalExtension, metadata: Partial<Metadata>) => {
-			local.pinned = !!metadata.pinned;
-			return local;
-		});
-		testObject = await aWorkbenchService();
-
-		await testObject.updateAutoUpdateEnablementFor(testObject.local[0].publisher, true);
-		await testObject.updateAutoUpdateEnablementFor(testObject.local[0], false);
-		await testObject.updateAutoUpdateEnablementFor(testObject.local[0], true);
-
-		assert.strictEqual(testObject.local[0].local?.pinned, false);
-		assert.strictEqual(testObject.local[1].local?.pinned, false);
-		assert.strictEqual(testObject.local[2].local?.pinned, true);
-		assert.deepStrictEqual(testObject.getSelectedExtensionsToAutoUpdate(), ['pub']);
+		assert.deepStrictEqual(testObject.getEnabledAutoUpdateExtensions(), []);
+		assert.deepStrictEqual(testObject.getDisabledAutoUpdateExtensions(), []);
 	});
 
 	async function aWorkbenchService(): Promise<ExtensionsWorkbenchService> {
@@ -1673,13 +1624,22 @@ suite('ExtensionsWorkbenchServiceTest', () => {
 			[AutoUpdateConfigurationKey]: autoUpdateValue ?? true,
 			[AutoCheckUpdatesConfigurationKey]: autoCheckUpdatesValue ?? true
 		};
+		const emitter = disposableStore.add(new Emitter<IConfigurationChangeEvent>());
 		instantiationService.stub(IConfigurationService, {
-			onDidChangeConfiguration: () => { return undefined!; },
+			onDidChangeConfiguration: emitter.event,
 			getValue: (key?: any) => {
 				return key ? values[key] : undefined;
 			},
 			updateValue: async (key: string, value: any) => {
 				values[key] = value;
+				emitter.fire({
+					affectedKeys: new Set([key]),
+					source: ConfigurationTarget.USER,
+					change: { keys: [], overrides: [] },
+					affectsConfiguration(configuration, overrides) {
+						return true;
+					},
+				});
 			}
 		});
 	}
@@ -1690,7 +1650,8 @@ suite('ExtensionsWorkbenchServiceTest', () => {
 			type: ExtensionType.User,
 			location: URI.file(`pub.${name}`),
 			identifier: { id: getGalleryExtensionId(manifest.publisher, manifest.name) },
-			...properties
+			...properties,
+			isValid: properties.isValid ?? true,
 		};
 		return <ILocalExtension>Object.create({ manifest, ...properties });
 	}
@@ -1709,7 +1670,7 @@ suite('ExtensionsWorkbenchServiceTest', () => {
 
 	function aGalleryExtension(name: string, properties: any = {}, galleryExtensionProperties: any = {}, assets: IGalleryExtensionAssets = noAssets): IGalleryExtension {
 		const targetPlatform = getTargetPlatform(platform, arch);
-		const galleryExtension = <IGalleryExtension>Object.create({ name, publisher: 'pub', version: '1.0.0', allTargetPlatforms: [targetPlatform], properties: {}, assets: {}, ...properties });
+		const galleryExtension = <IGalleryExtension>Object.create({ name, publisher: 'pub', version: '1.0.0', allTargetPlatforms: [targetPlatform], properties: {}, assets: {}, isSigned: true, ...properties });
 		galleryExtension.properties = { ...galleryExtension.properties, dependencies: [], targetPlatform, ...galleryExtensionProperties };
 		galleryExtension.assets = { ...galleryExtension.assets, ...assets };
 		galleryExtension.identifier = { id: getGalleryExtensionId(galleryExtension.publisher, galleryExtension.name), uuid: generateUuid() };
@@ -1752,6 +1713,7 @@ suite('ExtensionsWorkbenchServiceTest', () => {
 			},
 			getTargetPlatform: async () => getTargetPlatform(platform, arch),
 			async getExtensionsControlManifest() { return <IExtensionsControlManifest>{ malicious: [], deprecated: {}, search: [] }; },
+			async resetPinnedStateForAllUserExtensions(pinned: boolean) { }
 		};
 	}
 });
diff --git a/src/vs/workbench/contrib/externalTerminal/browser/externalTerminal.contribution.ts b/src/vs/workbench/contrib/externalTerminal/browser/externalTerminal.contribution.ts
index 3388ec7baea..da0388a5435 100644
--- a/src/vs/workbench/contrib/externalTerminal/browser/externalTerminal.contribution.ts
+++ b/src/vs/workbench/contrib/externalTerminal/browser/externalTerminal.contribution.ts
@@ -3,30 +3,30 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { URI } from 'vs/base/common/uri';
-import { MenuId, MenuRegistry, IMenuItem } from 'vs/platform/actions/common/actions';
-import { ITerminalGroupService, ITerminalService as IIntegratedTerminalService } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { ResourceContextKey } from 'vs/workbench/common/contextkeys';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IListService } from 'vs/platform/list/browser/listService';
-import { getMultiSelectedResources, IExplorerService } from 'vs/workbench/contrib/files/browser/files';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { Schemas } from 'vs/base/common/network';
-import { distinct } from 'vs/base/common/arrays';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { isWindows } from 'vs/base/common/platform';
-import { dirname, basename } from 'vs/base/common/path';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IExternalTerminalConfiguration, IExternalTerminalService } from 'vs/platform/externalTerminal/common/externalTerminal';
-import { TerminalLocation } from 'vs/platform/terminal/common/terminal';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
+import * as nls from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { URI } from '../../../../base/common/uri.js';
+import { MenuId, MenuRegistry, IMenuItem } from '../../../../platform/actions/common/actions.js';
+import { ITerminalGroupService, ITerminalService as IIntegratedTerminalService } from '../../terminal/browser/terminal.js';
+import { ResourceContextKey } from '../../../common/contextkeys.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { getMultiSelectedResources, IExplorerService } from '../../files/browser/files.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { distinct } from '../../../../base/common/arrays.js';
+import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from '../../../common/contributions.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { isWindows } from '../../../../base/common/platform.js';
+import { dirname, basename } from '../../../../base/common/path.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IExternalTerminalConfiguration, IExternalTerminalService } from '../../../../platform/externalTerminal/common/externalTerminal.js';
+import { TerminalLocation } from '../../../../platform/terminal/common/terminal.js';
+import { IListService } from '../../../../platform/list/browser/listService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
 
 const OPEN_IN_TERMINAL_COMMAND_ID = 'openInTerminal';
 const OPEN_IN_INTEGRATED_TERMINAL_COMMAND_ID = 'openInIntegratedTerminal';
@@ -37,7 +37,6 @@ function registerOpenTerminalCommand(id: string, explorerKind: 'integrated' | 'e
 		handler: async (accessor, resource: URI) => {
 
 			const configurationService = accessor.get(IConfigurationService);
-			const editorService = accessor.get(IEditorService);
 			const fileService = accessor.get(IFileService);
 			const integratedTerminalService = accessor.get(IIntegratedTerminalService);
 			const remoteAgentService = accessor.get(IRemoteAgentService);
@@ -45,10 +44,9 @@ function registerOpenTerminalCommand(id: string, explorerKind: 'integrated' | 'e
 			let externalTerminalService: IExternalTerminalService | undefined = undefined;
 			try {
 				externalTerminalService = accessor.get(IExternalTerminalService);
-			} catch {
-			}
+			} catch { }
 
-			const resources = getMultiSelectedResources(resource, accessor.get(IListService), editorService, accessor.get(IEditorGroupsService), accessor.get(IExplorerService));
+			const resources = getMultiSelectedResources(resource, accessor.get(IListService), accessor.get(IEditorService), accessor.get(IEditorGroupsService), accessor.get(IExplorerService));
 			return fileService.resolveAll(resources.map(r => ({ resource: r }))).then(async stats => {
 				// Always use integrated terminal when using a remote
 				const config = configurationService.getValue<IExternalTerminalConfiguration>();
diff --git a/src/vs/workbench/contrib/externalTerminal/electron-sandbox/externalTerminal.contribution.ts b/src/vs/workbench/contrib/externalTerminal/electron-sandbox/externalTerminal.contribution.ts
index e58341fc486..21967d3de0c 100644
--- a/src/vs/workbench/contrib/externalTerminal/electron-sandbox/externalTerminal.contribution.ts
+++ b/src/vs/workbench/contrib/externalTerminal/electron-sandbox/externalTerminal.contribution.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import * as paths from 'vs/base/common/path';
-import { DEFAULT_TERMINAL_OSX, IExternalTerminalSettings } from 'vs/platform/externalTerminal/common/externalTerminal';
-import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
-import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
-import { IHistoryService } from 'vs/workbench/services/history/common/history';
-import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { Schemas } from 'vs/base/common/network';
-import { IConfigurationRegistry, Extensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
-import { IExternalTerminalService } from 'vs/platform/externalTerminal/electron-sandbox/externalTerminalService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey';
-import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import * as nls from '../../../../nls.js';
+import * as paths from '../../../../base/common/path.js';
+import { DEFAULT_TERMINAL_OSX, IExternalTerminalSettings } from '../../../../platform/externalTerminal/common/externalTerminal.js';
+import { MenuId, MenuRegistry } from '../../../../platform/actions/common/actions.js';
+import { KeyMod, KeyCode } from '../../../../base/common/keyCodes.js';
+import { IHistoryService } from '../../../services/history/common/history.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { IConfigurationRegistry, Extensions, ConfigurationScope } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from '../../../common/contributions.js';
+import { IExternalTerminalService } from '../../../../platform/externalTerminal/electron-sandbox/externalTerminalService.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { TerminalContextKeys } from '../../terminal/common/terminalContextKey.js';
+import { IRemoteAuthorityResolverService } from '../../../../platform/remote/common/remoteAuthorityResolver.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
 
 const OPEN_NATIVE_CONSOLE_COMMAND_ID = 'workbench.action.terminal.openNativeConsole';
 KeybindingsRegistry.registerCommandAndKeybindingRule({
diff --git a/src/vs/workbench/contrib/externalUriOpener/common/configuration.ts b/src/vs/workbench/contrib/externalUriOpener/common/configuration.ts
index 94ea24e0a8d..f54ddfe2109 100644
--- a/src/vs/workbench/contrib/externalUriOpener/common/configuration.ts
+++ b/src/vs/workbench/contrib/externalUriOpener/common/configuration.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IConfigurationNode, IConfigurationRegistry, Extensions } from 'vs/platform/configuration/common/configurationRegistry';
-import { workbenchConfigurationNodeBase } from 'vs/workbench/common/configuration';
-import * as nls from 'vs/nls';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import { Registry } from 'vs/platform/registry/common/platform';
+import { IConfigurationNode, IConfigurationRegistry, Extensions } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { workbenchConfigurationNodeBase } from '../../../common/configuration.js';
+import * as nls from '../../../../nls.js';
+import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
 
 export const defaultExternalUriOpenerId = 'default';
 
diff --git a/src/vs/workbench/contrib/externalUriOpener/common/contributedOpeners.ts b/src/vs/workbench/contrib/externalUriOpener/common/contributedOpeners.ts
index db0b41e39c2..118758dc1a0 100644
--- a/src/vs/workbench/contrib/externalUriOpener/common/contributedOpeners.ts
+++ b/src/vs/workbench/contrib/externalUriOpener/common/contributedOpeners.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { Memento } from 'vs/workbench/common/memento';
-import { updateContributedOpeners } from 'vs/workbench/contrib/externalUriOpener/common/configuration';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { Memento } from '../../../common/memento.js';
+import { updateContributedOpeners } from './configuration.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 
 interface RegisteredExternalOpener {
 	readonly extensionId: string;
diff --git a/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpener.contribution.ts b/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpener.contribution.ts
index 360878f81a1..345438861e4 100644
--- a/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpener.contribution.ts
+++ b/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpener.contribution.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { externalUriOpenersConfigurationNode } from 'vs/workbench/contrib/externalUriOpener/common/configuration';
-import { ExternalUriOpenerService, IExternalUriOpenerService } from 'vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService';
+import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { externalUriOpenersConfigurationNode } from './configuration.js';
+import { ExternalUriOpenerService, IExternalUriOpenerService } from './externalUriOpenerService.js';
 
 registerSingleton(IExternalUriOpenerService, ExternalUriOpenerService, InstantiationType.Delayed);
 
diff --git a/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.ts b/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.ts
index 74ec33c99a4..fe02f19396d 100644
--- a/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.ts
+++ b/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.ts
@@ -3,23 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { firstOrDefault } from 'vs/base/common/arrays';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Iterable } from 'vs/base/common/iterator';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { LinkedList } from 'vs/base/common/linkedList';
-import { isWeb } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import * as languages from 'vs/editor/common/languages';
-import * as nls from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IExternalOpener, IOpenerService } from 'vs/platform/opener/common/opener';
-import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
-import { defaultExternalUriOpenerId, ExternalUriOpenersConfiguration, externalUriOpenersSettingId } from 'vs/workbench/contrib/externalUriOpener/common/configuration';
-import { testUrlMatchesGlob } from 'vs/workbench/contrib/url/common/urlGlob';
-import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
+import { LinkedList } from '../../../../base/common/linkedList.js';
+import { isWeb } from '../../../../base/common/platform.js';
+import { URI } from '../../../../base/common/uri.js';
+import * as languages from '../../../../editor/common/languages.js';
+import * as nls from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IExternalOpener, IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from '../../../../platform/quickinput/common/quickInput.js';
+import { defaultExternalUriOpenerId, ExternalUriOpenersConfiguration, externalUriOpenersSettingId } from './configuration.js';
+import { testUrlMatchesGlob } from '../../url/common/urlGlob.js';
+import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
 
 
 export const IExternalUriOpenerService = createDecorator<IExternalUriOpenerService>('externalUriOpenerService');
@@ -126,7 +125,7 @@ export class ExternalUriOpenerService extends Disposable implements IExternalUri
 		}
 
 		// See if we have a preferred opener first
-		const preferred = firstOrDefault(validOpeners.filter(x => x.priority === languages.ExternalUriOpenerPriority.Preferred));
+		const preferred = validOpeners.filter(x => x.priority === languages.ExternalUriOpenerPriority.Preferred).at(0);
 		if (preferred) {
 			return [preferred.opener];
 		}
diff --git a/src/vs/workbench/contrib/externalUriOpener/test/common/externalUriOpenerService.test.ts b/src/vs/workbench/contrib/externalUriOpener/test/common/externalUriOpenerService.test.ts
index 5be58d57365..81aee12e962 100644
--- a/src/vs/workbench/contrib/externalUriOpener/test/common/externalUriOpenerService.test.ts
+++ b/src/vs/workbench/contrib/externalUriOpener/test/common/externalUriOpenerService.test.ts
@@ -4,17 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ExternalUriOpenerPriority } from 'vs/editor/common/languages';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IPickOptions, IQuickInputService, IQuickPickItem, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
-import { ExternalUriOpenerService, IExternalOpenerProvider, IExternalUriOpener } from 'vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { ExternalUriOpenerPriority } from '../../../../../editor/common/languages.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
+import { IPickOptions, IQuickInputService, IQuickPickItem, QuickPickInput } from '../../../../../platform/quickinput/common/quickInput.js';
+import { ExternalUriOpenerService, IExternalOpenerProvider, IExternalUriOpener } from '../../common/externalUriOpenerService.js';
 
 
 class MockQuickInputService implements Partial<IQuickInputService> {
diff --git a/src/vs/workbench/contrib/files/browser/editors/binaryFileEditor.ts b/src/vs/workbench/contrib/files/browser/editors/binaryFileEditor.ts
index 1b6b279b308..4e0a4360e63 100644
--- a/src/vs/workbench/contrib/files/browser/editors/binaryFileEditor.ts
+++ b/src/vs/workbench/contrib/files/browser/editors/binaryFileEditor.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { BaseBinaryResourceEditor } from 'vs/workbench/browser/parts/editor/binaryEditor';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { FileEditorInput } from 'vs/workbench/contrib/files/browser/editors/fileEditorInput';
-import { BINARY_FILE_EDITOR_ID, BINARY_TEXT_FILE_MODE } from 'vs/workbench/contrib/files/common/files';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { EditorResolution, IEditorOptions } from 'vs/platform/editor/common/editor';
-import { IEditorResolverService, ResolvedStatus, ResolvedEditor } from 'vs/workbench/services/editor/common/editorResolverService';
-import { isEditorInputWithOptions } from 'vs/workbench/common/editor';
-import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
-import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
+import { localize } from '../../../../../nls.js';
+import { BaseBinaryResourceEditor } from '../../../../browser/parts/editor/binaryEditor.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { EditorInput } from '../../../../common/editor/editorInput.js';
+import { FileEditorInput } from './fileEditorInput.js';
+import { BINARY_FILE_EDITOR_ID, BINARY_TEXT_FILE_MODE } from '../../common/files.js';
+import { IStorageService } from '../../../../../platform/storage/common/storage.js';
+import { EditorResolution, IEditorOptions } from '../../../../../platform/editor/common/editor.js';
+import { IEditorResolverService, ResolvedStatus, ResolvedEditor } from '../../../../services/editor/common/editorResolverService.js';
+import { isEditorInputWithOptions } from '../../../../common/editor.js';
+import { DiffEditorInput } from '../../../../common/editor/diffEditorInput.js';
+import { IEditorGroup } from '../../../../services/editor/common/editorGroupsService.js';
 
 /**
  * An implementation of editor for binary files that cannot be displayed.
diff --git a/src/vs/workbench/contrib/files/browser/editors/fileEditorHandler.ts b/src/vs/workbench/contrib/files/browser/editors/fileEditorHandler.ts
index 9aef2c0dcd3..e91914dca4a 100644
--- a/src/vs/workbench/contrib/files/browser/editors/fileEditorHandler.ts
+++ b/src/vs/workbench/contrib/files/browser/editors/fileEditorHandler.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { IEditorSerializer } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { ITextEditorService } from 'vs/workbench/services/textfile/common/textEditorService';
-import { isEqual } from 'vs/base/common/resources';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IWorkingCopyIdentifier, NO_TYPE_ID } from 'vs/workbench/services/workingCopy/common/workingCopy';
-import { IWorkingCopyEditorHandler, IWorkingCopyEditorService } from 'vs/workbench/services/workingCopy/common/workingCopyEditorService';
-import { FileEditorInput } from 'vs/workbench/contrib/files/browser/editors/fileEditorInput';
-import { IFileService } from 'vs/platform/files/common/files';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { URI, UriComponents } from '../../../../../base/common/uri.js';
+import { IEditorSerializer } from '../../../../common/editor.js';
+import { EditorInput } from '../../../../common/editor/editorInput.js';
+import { ITextEditorService } from '../../../../services/textfile/common/textEditorService.js';
+import { isEqual } from '../../../../../base/common/resources.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IWorkbenchContribution } from '../../../../common/contributions.js';
+import { IWorkingCopyIdentifier, NO_TYPE_ID } from '../../../../services/workingCopy/common/workingCopy.js';
+import { IWorkingCopyEditorHandler, IWorkingCopyEditorService } from '../../../../services/workingCopy/common/workingCopyEditorService.js';
+import { FileEditorInput } from './fileEditorInput.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
 
 interface ISerializedFileEditorInput {
 	resourceJSON: UriComponents;
diff --git a/src/vs/workbench/contrib/files/browser/editors/fileEditorInput.ts b/src/vs/workbench/contrib/files/browser/editors/fileEditorInput.ts
index 994733bad77..d7157206c93 100644
--- a/src/vs/workbench/contrib/files/browser/editors/fileEditorInput.ts
+++ b/src/vs/workbench/contrib/files/browser/editors/fileEditorInput.ts
@@ -3,29 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { IFileEditorInput, Verbosity, GroupIdentifier, IMoveResult, EditorInputCapabilities, IEditorDescriptor, IEditorPane, IUntypedEditorInput, DEFAULT_EDITOR_ASSOCIATION, IUntypedFileEditorInput, findViewStateForEditor, isResourceEditorInput, IFileEditorInputOptions } from 'vs/workbench/common/editor';
-import { EditorInput, IUntypedEditorOptions } from 'vs/workbench/common/editor/editorInput';
-import { AbstractTextResourceEditorInput } from 'vs/workbench/common/editor/textResourceEditorInput';
-import { ITextResourceEditorInput } from 'vs/platform/editor/common/editor';
-import { BinaryEditorModel } from 'vs/workbench/common/editor/binaryEditorModel';
-import { IFileService } from 'vs/platform/files/common/files';
-import { ITextFileService, TextFileEditorModelState, TextFileResolveReason, TextFileOperationError, TextFileOperationResult, ITextFileEditorModel, EncodingMode } from 'vs/workbench/services/textfile/common/textfiles';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IReference, dispose, DisposableStore } from 'vs/base/common/lifecycle';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { FILE_EDITOR_INPUT_ID, TEXT_FILE_EDITOR_ID, BINARY_FILE_EDITOR_ID } from 'vs/workbench/contrib/files/common/files';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { isEqual } from 'vs/base/common/resources';
-import { Event } from 'vs/base/common/event';
-import { Schemas } from 'vs/base/common/network';
-import { createTextBufferFactory } from 'vs/editor/common/model/textModel';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { ICustomEditorLabelService } from 'vs/workbench/services/editor/common/customEditorLabelService';
+import { URI } from '../../../../../base/common/uri.js';
+import { IFileEditorInput, Verbosity, GroupIdentifier, IMoveResult, EditorInputCapabilities, IEditorDescriptor, IEditorPane, IUntypedEditorInput, DEFAULT_EDITOR_ASSOCIATION, IUntypedFileEditorInput, findViewStateForEditor, isResourceEditorInput, IFileEditorInputOptions } from '../../../../common/editor.js';
+import { EditorInput, IUntypedEditorOptions } from '../../../../common/editor/editorInput.js';
+import { AbstractTextResourceEditorInput } from '../../../../common/editor/textResourceEditorInput.js';
+import { ITextResourceEditorInput } from '../../../../../platform/editor/common/editor.js';
+import { BinaryEditorModel } from '../../../../common/editor/binaryEditorModel.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { ITextFileService, TextFileEditorModelState, TextFileResolveReason, TextFileOperationError, TextFileOperationResult, ITextFileEditorModel, EncodingMode } from '../../../../services/textfile/common/textfiles.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IReference, dispose, DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
+import { FILE_EDITOR_INPUT_ID, TEXT_FILE_EDITOR_ID, BINARY_FILE_EDITOR_ID } from '../../common/files.js';
+import { ILabelService } from '../../../../../platform/label/common/label.js';
+import { IFilesConfigurationService } from '../../../../services/filesConfiguration/common/filesConfigurationService.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { isEqual } from '../../../../../base/common/resources.js';
+import { Event } from '../../../../../base/common/event.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { createTextBufferFactory } from '../../../../../editor/common/model/textModel.js';
+import { IPathService } from '../../../../services/path/common/pathService.js';
+import { ITextResourceConfigurationService } from '../../../../../editor/common/services/textResourceConfiguration.js';
+import { IMarkdownString } from '../../../../../base/common/htmlContent.js';
+import { ICustomEditorLabelService } from '../../../../services/editor/common/customEditorLabelService.js';
 
 const enum ForceOpenAs {
 	None,
diff --git a/src/vs/workbench/contrib/files/browser/editors/textFileEditor.ts b/src/vs/workbench/contrib/files/browser/editors/textFileEditor.ts
index 7c01103959b..bff940f4e0b 100644
--- a/src/vs/workbench/contrib/files/browser/editors/textFileEditor.ts
+++ b/src/vs/workbench/contrib/files/browser/editors/textFileEditor.ts
@@ -3,40 +3,40 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { mark } from 'vs/base/common/performance';
-import { assertIsDefined } from 'vs/base/common/types';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { IAction, toAction } from 'vs/base/common/actions';
-import { VIEWLET_ID, TEXT_FILE_EDITOR_ID, BINARY_TEXT_FILE_MODE } from 'vs/workbench/contrib/files/common/files';
-import { ITextFileService, TextFileOperationError, TextFileOperationResult } from 'vs/workbench/services/textfile/common/textfiles';
-import { AbstractTextCodeEditor } from 'vs/workbench/browser/parts/editor/textCodeEditor';
-import { IEditorOpenContext, isTextEditorViewState, DEFAULT_EDITOR_ASSOCIATION, createEditorOpenError, IFileEditorInputOptions, createTooLargeFileError } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { applyTextEditorOptions } from 'vs/workbench/common/editor/editorOptions';
-import { BinaryEditorModel } from 'vs/workbench/common/editor/binaryEditorModel';
-import { FileEditorInput } from 'vs/workbench/contrib/files/browser/editors/fileEditorInput';
-import { FileOperationError, FileOperationResult, FileChangesEvent, IFileService, FileOperationEvent, FileOperation, ByteSize, TooLargeFileOperationError } from 'vs/platform/files/common/files';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ICodeEditorViewState, ScrollType } from 'vs/editor/common/editorCommon';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { EditorActivation, ITextEditorOptions } from 'vs/platform/editor/common/editor';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IExplorerService } from 'vs/workbench/contrib/files/browser/files';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { ViewContainerLocation } from 'vs/workbench/common/views';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IEditorOptions as ICodeEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
+import { localize } from '../../../../../nls.js';
+import { mark } from '../../../../../base/common/performance.js';
+import { assertIsDefined } from '../../../../../base/common/types.js';
+import { IPathService } from '../../../../services/path/common/pathService.js';
+import { IAction, toAction } from '../../../../../base/common/actions.js';
+import { VIEWLET_ID, TEXT_FILE_EDITOR_ID, BINARY_TEXT_FILE_MODE } from '../../common/files.js';
+import { ITextFileService, TextFileOperationError, TextFileOperationResult } from '../../../../services/textfile/common/textfiles.js';
+import { AbstractTextCodeEditor } from '../../../../browser/parts/editor/textCodeEditor.js';
+import { IEditorOpenContext, isTextEditorViewState, DEFAULT_EDITOR_ASSOCIATION, createEditorOpenError, IFileEditorInputOptions, createTooLargeFileError } from '../../../../common/editor.js';
+import { EditorInput } from '../../../../common/editor/editorInput.js';
+import { applyTextEditorOptions } from '../../../../common/editor/editorOptions.js';
+import { BinaryEditorModel } from '../../../../common/editor/binaryEditorModel.js';
+import { FileEditorInput } from './fileEditorInput.js';
+import { FileOperationError, FileOperationResult, FileChangesEvent, IFileService, FileOperationEvent, FileOperation, ByteSize, TooLargeFileOperationError } from '../../../../../platform/files/common/files.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { IStorageService } from '../../../../../platform/storage/common/storage.js';
+import { ITextResourceConfigurationService } from '../../../../../editor/common/services/textResourceConfiguration.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { ICodeEditorViewState, ScrollType } from '../../../../../editor/common/editorCommon.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { IEditorGroup, IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { EditorActivation, ITextEditorOptions } from '../../../../../platform/editor/common/editor.js';
+import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IExplorerService } from '../files.js';
+import { IPaneCompositePartService } from '../../../../services/panecomposite/browser/panecomposite.js';
+import { ViewContainerLocation } from '../../../../common/views.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IPreferencesService } from '../../../../services/preferences/common/preferences.js';
+import { IHostService } from '../../../../services/host/browser/host.js';
+import { IEditorOptions as ICodeEditorOptions } from '../../../../../editor/common/config/editorOptions.js';
+import { IFilesConfigurationService } from '../../../../services/filesConfiguration/common/filesConfigurationService.js';
 
 /**
  * An implementation of editor for file system resources.
diff --git a/src/vs/workbench/contrib/files/browser/editors/textFileEditorTracker.ts b/src/vs/workbench/contrib/files/browser/editors/textFileEditorTracker.ts
index ad9b863d3f8..bc0a1f325e4 100644
--- a/src/vs/workbench/contrib/files/browser/editors/textFileEditorTracker.ts
+++ b/src/vs/workbench/contrib/files/browser/editors/textFileEditorTracker.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { URI } from 'vs/base/common/uri';
-import { ITextFileService, TextFileEditorModelState } from 'vs/workbench/services/textfile/common/textfiles';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { distinct, coalesce } from 'vs/base/common/arrays';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { RunOnceWorker } from 'vs/base/common/async';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { FILE_EDITOR_INPUT_ID } from 'vs/workbench/contrib/files/common/files';
-import { Schemas } from 'vs/base/common/network';
-import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
-import { IWorkingCopyEditorService } from 'vs/workbench/services/workingCopy/common/workingCopyEditorService';
-import { DEFAULT_EDITOR_ASSOCIATION } from 'vs/workbench/common/editor';
+import { IWorkbenchContribution } from '../../../../common/contributions.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ITextFileService, TextFileEditorModelState } from '../../../../services/textfile/common/textfiles.js';
+import { ILifecycleService } from '../../../../services/lifecycle/common/lifecycle.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { distinct, coalesce } from '../../../../../base/common/arrays.js';
+import { IHostService } from '../../../../services/host/browser/host.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { RunOnceWorker } from '../../../../../base/common/async.js';
+import { ICodeEditorService } from '../../../../../editor/browser/services/codeEditorService.js';
+import { IFilesConfigurationService } from '../../../../services/filesConfiguration/common/filesConfigurationService.js';
+import { FILE_EDITOR_INPUT_ID } from '../../common/files.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { UntitledTextEditorInput } from '../../../../services/untitled/common/untitledTextEditorInput.js';
+import { IWorkingCopyEditorService } from '../../../../services/workingCopy/common/workingCopyEditorService.js';
+import { DEFAULT_EDITOR_ASSOCIATION } from '../../../../common/editor.js';
 
 export class TextFileEditorTracker extends Disposable implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.ts b/src/vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.ts
index 066e0372c6b..addaf29046f 100644
--- a/src/vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.ts
+++ b/src/vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.ts
@@ -3,34 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { basename, isEqual } from 'vs/base/common/resources';
-import { Action } from 'vs/base/common/actions';
-import { URI } from 'vs/base/common/uri';
-import { FileOperationError, FileOperationResult, IWriteFileOptions } from 'vs/platform/files/common/files';
-import { ITextFileService, ISaveErrorHandler, ITextFileEditorModel, ITextFileSaveAsOptions, ITextFileSaveOptions } from 'vs/workbench/services/textfile/common/textfiles';
-import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IDisposable, dispose, Disposable } from 'vs/base/common/lifecycle';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { ResourceMap } from 'vs/base/common/map';
-import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
-import { IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { TextFileContentProvider } from 'vs/workbench/contrib/files/common/files';
-import { FileEditorInput } from 'vs/workbench/contrib/files/browser/editors/fileEditorInput';
-import { SAVE_FILE_AS_LABEL } from 'vs/workbench/contrib/files/browser/fileConstants';
-import { INotificationService, INotificationHandle, INotificationActions, Severity } from 'vs/platform/notification/common/notification';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { Event } from 'vs/base/common/event';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { isWindows } from 'vs/base/common/platform';
-import { Schemas } from 'vs/base/common/network';
-import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
-import { IEditorIdentifier, SaveReason, SideBySideEditor } from 'vs/workbench/common/editor';
-import { hash } from 'vs/base/common/hash';
+import { localize } from '../../../../../nls.js';
+import { toErrorMessage } from '../../../../../base/common/errorMessage.js';
+import { basename, isEqual } from '../../../../../base/common/resources.js';
+import { Action } from '../../../../../base/common/actions.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { FileOperationError, FileOperationResult, IWriteFileOptions } from '../../../../../platform/files/common/files.js';
+import { ITextFileService, ISaveErrorHandler, ITextFileEditorModel, ITextFileSaveAsOptions, ITextFileSaveOptions } from '../../../../services/textfile/common/textfiles.js';
+import { ServicesAccessor, IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IDisposable, dispose, Disposable } from '../../../../../base/common/lifecycle.js';
+import { IWorkbenchContribution } from '../../../../common/contributions.js';
+import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
+import { ResourceMap } from '../../../../../base/common/map.js';
+import { DiffEditorInput } from '../../../../common/editor/diffEditorInput.js';
+import { IContextKeyService, RawContextKey } from '../../../../../platform/contextkey/common/contextkey.js';
+import { TextFileContentProvider } from '../../common/files.js';
+import { FileEditorInput } from './fileEditorInput.js';
+import { SAVE_FILE_AS_LABEL } from '../fileConstants.js';
+import { INotificationService, INotificationHandle, INotificationActions, Severity } from '../../../../../platform/notification/common/notification.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { IProductService } from '../../../../../platform/product/common/productService.js';
+import { Event } from '../../../../../base/common/event.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { isWindows } from '../../../../../base/common/platform.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { IPreferencesService } from '../../../../services/preferences/common/preferences.js';
+import { IEditorIdentifier, SaveReason, SideBySideEditor } from '../../../../common/editor.js';
+import { hash } from '../../../../../base/common/hash.js';
 
 export const CONFLICT_RESOLUTION_CONTEXT = 'saveConflictResolutionContext';
 export const CONFLICT_RESOLUTION_SCHEME = 'conflictResolution';
@@ -158,8 +158,8 @@ export class TextFileSaveErrorHandler extends Disposable implements ISaveErrorHa
 			// Save As
 			primaryActions.push(this.instantiationService.createInstance(SaveModelAsAction, model));
 
-			// Discard
-			primaryActions.push(this.instantiationService.createInstance(DiscardModelAction, model));
+			// Revert
+			primaryActions.push(this.instantiationService.createInstance(RevertModelAction, model));
 
 			// Message
 			if (isWriteLocked) {
@@ -306,12 +306,12 @@ class RetrySaveModelAction extends Action {
 	}
 }
 
-class DiscardModelAction extends Action {
+class RevertModelAction extends Action {
 
 	constructor(
 		private model: ITextFileEditorModel
 	) {
-		super('workbench.files.action.discardModel', localize('discard', "Discard"));
+		super('workbench.files.action.revertModel', localize('revert', "Revert"));
 	}
 
 	override async run(): Promise<void> {
diff --git a/src/vs/workbench/contrib/files/browser/explorerFileContrib.ts b/src/vs/workbench/contrib/files/browser/explorerFileContrib.ts
index d289007bb68..116ec0994a9 100644
--- a/src/vs/workbench/contrib/files/browser/explorerFileContrib.ts
+++ b/src/vs/workbench/contrib/files/browser/explorerFileContrib.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { Registry } from 'vs/platform/registry/common/platform';
+import { Emitter } from '../../../../base/common/event.js';
+import { DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
 
 export const enum ExplorerExtensions {
 	FileContributionRegistry = 'workbench.registry.explorer.fileContributions'
diff --git a/src/vs/workbench/contrib/files/browser/explorerService.ts b/src/vs/workbench/contrib/files/browser/explorerService.ts
index 1c67fc0f491..e9da7fceeba 100644
--- a/src/vs/workbench/contrib/files/browser/explorerService.ts
+++ b/src/vs/workbench/contrib/files/browser/explorerService.ts
@@ -3,30 +3,30 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { IFilesConfiguration, ISortOrderConfiguration, SortOrder, LexicographicOptions } from 'vs/workbench/contrib/files/common/files';
-import { ExplorerItem, ExplorerModel } from 'vs/workbench/contrib/files/common/explorerModel';
-import { URI } from 'vs/base/common/uri';
-import { FileOperationEvent, FileOperation, IFileService, FileChangesEvent, FileChangeType, IResolveFileOptions } from 'vs/platform/files/common/files';
-import { dirname, basename } from 'vs/base/common/resources';
-import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IEditableData } from 'vs/workbench/common/views';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IBulkEditService, ResourceFileEdit } from 'vs/editor/browser/services/bulkEditService';
-import { UndoRedoSource } from 'vs/platform/undoRedo/common/undoRedo';
-import { IExplorerView, IExplorerService } from 'vs/workbench/contrib/files/browser/files';
-import { IProgressService, ProgressLocation, IProgressCompositeOptions, IProgressOptions } from 'vs/platform/progress/common/progress';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IExpression } from 'vs/base/common/glob';
-import { ResourceGlobMatcher } from 'vs/workbench/common/resources';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { Event } from '../../../../base/common/event.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { IFilesConfiguration, ISortOrderConfiguration, SortOrder, LexicographicOptions } from '../common/files.js';
+import { ExplorerItem, ExplorerModel } from '../common/explorerModel.js';
+import { URI } from '../../../../base/common/uri.js';
+import { FileOperationEvent, FileOperation, IFileService, FileChangesEvent, FileChangeType, IResolveFileOptions } from '../../../../platform/files/common/files.js';
+import { dirname, basename } from '../../../../base/common/resources.js';
+import { IConfigurationService, IConfigurationChangeEvent } from '../../../../platform/configuration/common/configuration.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IEditableData } from '../../../common/views.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IBulkEditService, ResourceFileEdit } from '../../../../editor/browser/services/bulkEditService.js';
+import { UndoRedoSource } from '../../../../platform/undoRedo/common/undoRedo.js';
+import { IExplorerView, IExplorerService } from './files.js';
+import { IProgressService, ProgressLocation, IProgressCompositeOptions, IProgressOptions } from '../../../../platform/progress/common/progress.js';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { IExpression } from '../../../../base/common/glob.js';
+import { ResourceGlobMatcher } from '../../../common/resources.js';
+import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 
 export const UNDO_REDO_SOURCE = new UndoRedoSource();
 
@@ -152,6 +152,7 @@ export class ExplorerService implements IExplorerService {
 		return {
 			sortOrder: this.config.sortOrder,
 			lexicographicOptions: this.config.sortOrderLexicographicOptions,
+			reverse: this.config.sortOrderReverse,
 		};
 	}
 
@@ -521,6 +522,11 @@ export class ExplorerService implements IExplorerService {
 		if (this.config.sortOrderLexicographicOptions !== configLexicographicOptions) {
 			shouldRefresh = shouldRefresh || this.config.sortOrderLexicographicOptions !== undefined;
 		}
+		const sortOrderReverse = configuration?.explorer?.sortOrderReverse || false;
+
+		if (this.config.sortOrderReverse !== sortOrderReverse) {
+			shouldRefresh = shouldRefresh || this.config.sortOrderReverse !== undefined;
+		}
 
 		this.config = configuration.explorer;
 
diff --git a/src/vs/workbench/contrib/files/browser/explorerViewlet.ts b/src/vs/workbench/contrib/files/browser/explorerViewlet.ts
index 0a79bee3fc6..18b860dbafe 100644
--- a/src/vs/workbench/contrib/files/browser/explorerViewlet.ts
+++ b/src/vs/workbench/contrib/files/browser/explorerViewlet.ts
@@ -3,41 +3,41 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/explorerviewlet';
-import { localize, localize2 } from 'vs/nls';
-import { mark } from 'vs/base/common/performance';
-import { VIEWLET_ID, VIEW_ID, IFilesConfiguration, ExplorerViewletVisibleContext } from 'vs/workbench/contrib/files/common/files';
-import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ExplorerView } from 'vs/workbench/contrib/files/browser/views/explorerView';
-import { EmptyView } from 'vs/workbench/contrib/files/browser/views/emptyView';
-import { OpenEditorsView } from 'vs/workbench/contrib/files/browser/views/openEditorsView';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IContextKeyService, IContextKey, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IViewsRegistry, IViewDescriptor, Extensions, ViewContainer, IViewContainersRegistry, ViewContainerLocation, IViewDescriptorService, ViewContentGroups } from 'vs/workbench/common/views';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
-import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
-import { ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
-import { KeyChord, KeyMod, KeyCode } from 'vs/base/common/keyCodes';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { WorkbenchStateContext, RemoteNameContext, OpenFolderWorkspaceSupportContext } from 'vs/workbench/common/contextkeys';
-import { IsWebContext } from 'vs/platform/contextkey/common/contextkeys';
-import { AddRootFolderAction, OpenFolderAction, OpenFileFolderAction, OpenFolderViaWorkspaceAction } from 'vs/workbench/browser/actions/workspaceActions';
-import { OpenRecentAction } from 'vs/workbench/browser/actions/windowActions';
-import { isMacintosh, isWeb } from 'vs/base/common/platform';
-import { Codicon } from 'vs/base/common/codicons';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { isMouseEvent } from 'vs/base/browser/dom';
+import './media/explorerviewlet.css';
+import { localize, localize2 } from '../../../../nls.js';
+import { mark } from '../../../../base/common/performance.js';
+import { VIEWLET_ID, VIEW_ID, IFilesConfiguration, ExplorerViewletVisibleContext } from '../common/files.js';
+import { IViewletViewOptions } from '../../../browser/parts/views/viewsViewlet.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ExplorerView } from './views/explorerView.js';
+import { EmptyView } from './views/emptyView.js';
+import { OpenEditorsView } from './views/openEditorsView.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IWorkspaceContextService, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IContextKeyService, IContextKey, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IViewsRegistry, IViewDescriptor, Extensions, ViewContainer, IViewContainersRegistry, ViewContainerLocation, IViewDescriptorService, ViewContentGroups } from '../../../common/views.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
+import { ViewPaneContainer } from '../../../browser/parts/views/viewPaneContainer.js';
+import { ViewPane } from '../../../browser/parts/views/viewPane.js';
+import { KeyChord, KeyMod, KeyCode } from '../../../../base/common/keyCodes.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IProgressService, ProgressLocation } from '../../../../platform/progress/common/progress.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { WorkbenchStateContext, RemoteNameContext, OpenFolderWorkspaceSupportContext } from '../../../common/contextkeys.js';
+import { IsWebContext } from '../../../../platform/contextkey/common/contextkeys.js';
+import { AddRootFolderAction, OpenFolderAction, OpenFileFolderAction, OpenFolderViaWorkspaceAction } from '../../../browser/actions/workspaceActions.js';
+import { OpenRecentAction } from '../../../browser/actions/windowActions.js';
+import { isMacintosh, isWeb } from '../../../../base/common/platform.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { isMouseEvent } from '../../../../base/browser/dom.js';
 
 const explorerViewIcon = registerIcon('explorer-view-icon', Codicon.files, localize('explorerViewIcon', 'View icon of the explorer view.'));
 const openEditorsViewIcon = registerIcon('open-editors-view-icon', Codicon.book, localize('openEditorsIcon', 'View icon of the open editors view.'));
diff --git a/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts b/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts
index 963e5c56925..ec2a3a69d0a 100644
--- a/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts
+++ b/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts
@@ -3,30 +3,30 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { ToggleAutoSaveAction, FocusFilesExplorer, GlobalCompareResourcesAction, ShowActiveFileInExplorer, CompareWithClipboardAction, NEW_FILE_COMMAND_ID, NEW_FILE_LABEL, NEW_FOLDER_COMMAND_ID, NEW_FOLDER_LABEL, TRIGGER_RENAME_LABEL, MOVE_FILE_TO_TRASH_LABEL, COPY_FILE_LABEL, PASTE_FILE_LABEL, FileCopiedContext, renameHandler, moveFileToTrashHandler, copyFileHandler, pasteFileHandler, deleteFileHandler, cutFileHandler, DOWNLOAD_COMMAND_ID, openFilePreserveFocusHandler, DOWNLOAD_LABEL, OpenActiveFileInEmptyWorkspace, UPLOAD_COMMAND_ID, UPLOAD_LABEL, CompareNewUntitledTextFilesAction, SetActiveEditorReadonlyInSession, SetActiveEditorWriteableInSession, ToggleActiveEditorReadonlyInSession, ResetActiveEditorReadonlyInSession } from 'vs/workbench/contrib/files/browser/fileActions';
-import { revertLocalChangesCommand, acceptLocalChangesCommand, CONFLICT_RESOLUTION_CONTEXT } from 'vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler';
-import { MenuId, MenuRegistry, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ICommandAction } from 'vs/platform/action/common/action';
-import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
-import { openWindowCommand, newWindowCommand } from 'vs/workbench/contrib/files/browser/fileCommands';
-import { COPY_PATH_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, OPEN_TO_SIDE_COMMAND_ID, REVERT_FILE_COMMAND_ID, SAVE_FILE_COMMAND_ID, SAVE_FILE_LABEL, SAVE_FILE_AS_COMMAND_ID, SAVE_FILE_AS_LABEL, SAVE_ALL_IN_GROUP_COMMAND_ID, OpenEditorsGroupContext, COMPARE_WITH_SAVED_COMMAND_ID, COMPARE_RESOURCE_COMMAND_ID, SELECT_FOR_COMPARE_COMMAND_ID, ResourceSelectedForCompareContext, OpenEditorsDirtyEditorContext, COMPARE_SELECTED_COMMAND_ID, REMOVE_ROOT_FOLDER_COMMAND_ID, REMOVE_ROOT_FOLDER_LABEL, SAVE_FILES_COMMAND_ID, COPY_RELATIVE_PATH_COMMAND_ID, SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID, SAVE_FILE_WITHOUT_FORMATTING_LABEL, OpenEditorsReadonlyEditorContext, OPEN_WITH_EXPLORER_COMMAND_ID, NEW_UNTITLED_FILE_COMMAND_ID, NEW_UNTITLED_FILE_LABEL, SAVE_ALL_COMMAND_ID } from 'vs/workbench/contrib/files/browser/fileConstants';
-import { CommandsRegistry, ICommandHandler } from 'vs/platform/commands/common/commands';
-import { ContextKeyExpr, ContextKeyExpression } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { FilesExplorerFocusCondition, ExplorerRootContext, ExplorerFolderContext, ExplorerResourceNotReadonlyContext, ExplorerResourceCut, ExplorerResourceMoveableToTrash, ExplorerResourceAvailableEditorIdsContext, FoldersViewVisibleContext } from 'vs/workbench/contrib/files/common/files';
-import { ADD_ROOT_FOLDER_COMMAND_ID, ADD_ROOT_FOLDER_LABEL } from 'vs/workbench/browser/actions/workspaceCommands';
-import { CLOSE_SAVED_EDITORS_COMMAND_ID, CLOSE_EDITORS_IN_GROUP_COMMAND_ID, CLOSE_EDITOR_COMMAND_ID, CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID, REOPEN_WITH_COMMAND_ID } from 'vs/workbench/browser/parts/editor/editorCommands';
-import { AutoSaveAfterShortDelayContext } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { WorkbenchListDoubleSelection } from 'vs/platform/list/browser/listService';
-import { Schemas } from 'vs/base/common/network';
-import { DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext } from 'vs/workbench/common/contextkeys';
-import { IsWebContext } from 'vs/platform/contextkey/common/contextkeys';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IExplorerService } from 'vs/workbench/contrib/files/browser/files';
-import { Codicon } from 'vs/base/common/codicons';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
+import * as nls from '../../../../nls.js';
+import { ToggleAutoSaveAction, FocusFilesExplorer, GlobalCompareResourcesAction, ShowActiveFileInExplorer, CompareWithClipboardAction, NEW_FILE_COMMAND_ID, NEW_FILE_LABEL, NEW_FOLDER_COMMAND_ID, NEW_FOLDER_LABEL, TRIGGER_RENAME_LABEL, MOVE_FILE_TO_TRASH_LABEL, COPY_FILE_LABEL, PASTE_FILE_LABEL, FileCopiedContext, renameHandler, moveFileToTrashHandler, copyFileHandler, pasteFileHandler, deleteFileHandler, cutFileHandler, DOWNLOAD_COMMAND_ID, openFilePreserveFocusHandler, DOWNLOAD_LABEL, OpenActiveFileInEmptyWorkspace, UPLOAD_COMMAND_ID, UPLOAD_LABEL, CompareNewUntitledTextFilesAction, SetActiveEditorReadonlyInSession, SetActiveEditorWriteableInSession, ToggleActiveEditorReadonlyInSession, ResetActiveEditorReadonlyInSession } from './fileActions.js';
+import { revertLocalChangesCommand, acceptLocalChangesCommand, CONFLICT_RESOLUTION_CONTEXT } from './editors/textFileSaveErrorHandler.js';
+import { MenuId, MenuRegistry, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { ICommandAction } from '../../../../platform/action/common/action.js';
+import { KeyMod, KeyCode } from '../../../../base/common/keyCodes.js';
+import { openWindowCommand, newWindowCommand } from './fileCommands.js';
+import { COPY_PATH_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, OPEN_TO_SIDE_COMMAND_ID, REVERT_FILE_COMMAND_ID, SAVE_FILE_COMMAND_ID, SAVE_FILE_LABEL, SAVE_FILE_AS_COMMAND_ID, SAVE_FILE_AS_LABEL, SAVE_ALL_IN_GROUP_COMMAND_ID, OpenEditorsGroupContext, COMPARE_WITH_SAVED_COMMAND_ID, COMPARE_RESOURCE_COMMAND_ID, SELECT_FOR_COMPARE_COMMAND_ID, ResourceSelectedForCompareContext, OpenEditorsDirtyEditorContext, COMPARE_SELECTED_COMMAND_ID, REMOVE_ROOT_FOLDER_COMMAND_ID, REMOVE_ROOT_FOLDER_LABEL, SAVE_FILES_COMMAND_ID, COPY_RELATIVE_PATH_COMMAND_ID, SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID, SAVE_FILE_WITHOUT_FORMATTING_LABEL, OpenEditorsReadonlyEditorContext, OPEN_WITH_EXPLORER_COMMAND_ID, NEW_UNTITLED_FILE_COMMAND_ID, NEW_UNTITLED_FILE_LABEL, SAVE_ALL_COMMAND_ID, OpenEditorsSelectedFileOrUntitledContext } from './fileConstants.js';
+import { CommandsRegistry, ICommandHandler } from '../../../../platform/commands/common/commands.js';
+import { ContextKeyExpr, ContextKeyExpression } from '../../../../platform/contextkey/common/contextkey.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { FilesExplorerFocusCondition, ExplorerRootContext, ExplorerFolderContext, ExplorerResourceNotReadonlyContext, ExplorerResourceCut, ExplorerResourceMoveableToTrash, ExplorerResourceAvailableEditorIdsContext, FoldersViewVisibleContext } from '../common/files.js';
+import { ADD_ROOT_FOLDER_COMMAND_ID, ADD_ROOT_FOLDER_LABEL } from '../../../browser/actions/workspaceCommands.js';
+import { CLOSE_SAVED_EDITORS_COMMAND_ID, CLOSE_EDITORS_IN_GROUP_COMMAND_ID, CLOSE_EDITOR_COMMAND_ID, CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID, REOPEN_WITH_COMMAND_ID } from '../../../browser/parts/editor/editorCommands.js';
+import { AutoSaveAfterShortDelayContext } from '../../../services/filesConfiguration/common/filesConfigurationService.js';
+import { WorkbenchListDoubleSelection, WorkbenchTreeFindOpen } from '../../../../platform/list/browser/listService.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, SelectedEditorsInGroupFileOrUntitledResourceContextKey } from '../../../common/contextkeys.js';
+import { IsWebContext } from '../../../../platform/contextkey/common/contextkeys.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { IExplorerService } from './files.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
 
 // Contribute Global Actions
 
@@ -64,7 +64,7 @@ const MOVE_FILE_TO_TRASH_ID = 'moveFileToTrash';
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: MOVE_FILE_TO_TRASH_ID,
 	weight: KeybindingWeight.WorkbenchContrib + explorerCommandsWeightBonus,
-	when: ContextKeyExpr.and(FilesExplorerFocusCondition, ExplorerResourceNotReadonlyContext, ExplorerResourceMoveableToTrash),
+	when: ContextKeyExpr.and(FilesExplorerFocusCondition, ExplorerResourceNotReadonlyContext, ExplorerResourceMoveableToTrash, WorkbenchTreeFindOpen.toNegated()),
 	primary: KeyCode.Delete,
 	mac: {
 		primary: KeyMod.CtrlCmd | KeyCode.Backspace,
@@ -77,7 +77,7 @@ const DELETE_FILE_ID = 'deleteFile';
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: DELETE_FILE_ID,
 	weight: KeybindingWeight.WorkbenchContrib + explorerCommandsWeightBonus,
-	when: ContextKeyExpr.and(FilesExplorerFocusCondition, ExplorerResourceNotReadonlyContext),
+	when: ContextKeyExpr.and(FilesExplorerFocusCondition, ExplorerResourceNotReadonlyContext, WorkbenchTreeFindOpen.toNegated()),
 	primary: KeyMod.Shift | KeyCode.Delete,
 	mac: {
 		primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.Backspace
@@ -88,7 +88,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: DELETE_FILE_ID,
 	weight: KeybindingWeight.WorkbenchContrib + explorerCommandsWeightBonus,
-	when: ContextKeyExpr.and(FilesExplorerFocusCondition, ExplorerResourceNotReadonlyContext, ExplorerResourceMoveableToTrash.toNegated()),
+	when: ContextKeyExpr.and(FilesExplorerFocusCondition, ExplorerResourceNotReadonlyContext, ExplorerResourceMoveableToTrash.toNegated(), WorkbenchTreeFindOpen.toNegated()),
 	primary: KeyCode.Delete,
 	mac: {
 		primary: KeyMod.CtrlCmd | KeyCode.Backspace
@@ -100,7 +100,7 @@ const CUT_FILE_ID = 'filesExplorer.cut';
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: CUT_FILE_ID,
 	weight: KeybindingWeight.WorkbenchContrib + explorerCommandsWeightBonus,
-	when: ContextKeyExpr.and(FilesExplorerFocusCondition, ExplorerRootContext.toNegated(), ExplorerResourceNotReadonlyContext),
+	when: ContextKeyExpr.and(FilesExplorerFocusCondition, ExplorerRootContext.toNegated(), ExplorerResourceNotReadonlyContext, WorkbenchTreeFindOpen.toNegated()),
 	primary: KeyMod.CtrlCmd | KeyCode.KeyX,
 	handler: cutFileHandler,
 });
@@ -121,7 +121,7 @@ CommandsRegistry.registerCommand(PASTE_FILE_ID, pasteFileHandler);
 KeybindingsRegistry.registerKeybindingRule({
 	id: `^${PASTE_FILE_ID}`, // the `^` enables pasting files into the explorer by preventing default bubble up
 	weight: KeybindingWeight.WorkbenchContrib + explorerCommandsWeightBonus,
-	when: ContextKeyExpr.and(FilesExplorerFocusCondition, ExplorerResourceNotReadonlyContext),
+	when: ContextKeyExpr.and(FilesExplorerFocusCondition, ExplorerResourceNotReadonlyContext, WorkbenchTreeFindOpen.toNegated()),
 	primary: KeyMod.CtrlCmd | KeyCode.KeyV,
 });
 
@@ -154,10 +154,15 @@ const copyRelativePathCommand = {
 	title: nls.localize('copyRelativePath', "Copy Relative Path")
 };
 
+export const revealInsideBarCommand = {
+	id: REVEAL_IN_EXPLORER_COMMAND_ID,
+	title: nls.localize('revealInSideBar', "Reveal in Explorer View")
+};
+
 // Editor Title Context Menu
 appendEditorTitleContextMenuItem(COPY_PATH_COMMAND_ID, copyPathCommand.title, ResourceContextKey.IsFileSystemResource, '1_cutcopypaste', true);
 appendEditorTitleContextMenuItem(COPY_RELATIVE_PATH_COMMAND_ID, copyRelativePathCommand.title, ResourceContextKey.IsFileSystemResource, '1_cutcopypaste', true);
-appendEditorTitleContextMenuItem(REVEAL_IN_EXPLORER_COMMAND_ID, nls.localize('revealInSideBar', "Reveal in Explorer View"), ResourceContextKey.IsFileSystemResource, '2_files', false, 1);
+appendEditorTitleContextMenuItem(revealInsideBarCommand.id, revealInsideBarCommand.title, ResourceContextKey.IsFileSystemResource, '2_files', false, 1);
 
 export function appendEditorTitleContextMenuItem(id: string, title: string, when: ContextKeyExpression | undefined, group: string, supportsMultiSelect: boolean, order?: number): void {
 	const precondition = supportsMultiSelect !== true ? MultipleEditorsSelectedInGroupContext.negate() : undefined;
@@ -300,7 +305,12 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
 		id: REOPEN_WITH_COMMAND_ID,
 		title: nls.localize('reopenWith', "Reopen Editor With...")
 	},
-	when: ActiveEditorAvailableEditorIdsContext
+	when: ContextKeyExpr.and(
+		// Editors with Available Choices to Open With
+		ActiveEditorAvailableEditorIdsContext,
+		// Not: editor groups
+		OpenEditorsGroupContext.toNegated()
+	)
 });
 
 MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
@@ -413,14 +423,14 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
 	group: '3_compare',
 	order: 30,
 	command: compareSelectedCommand,
-	when: ContextKeyExpr.and(ResourceContextKey.HasResource, WorkbenchListDoubleSelection, isFileOrUntitledResourceContextKey)
+	when: ContextKeyExpr.and(ResourceContextKey.HasResource, WorkbenchListDoubleSelection, OpenEditorsSelectedFileOrUntitledContext)
 });
 
 MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, {
-	group: '3_compare',
+	group: '1_compare',
 	order: 30,
 	command: compareSelectedCommand,
-	when: ContextKeyExpr.and(ResourceContextKey.HasResource, TwoEditorsSelectedInGroupContext, isFileOrUntitledResourceContextKey)
+	when: ContextKeyExpr.and(ResourceContextKey.HasResource, TwoEditorsSelectedInGroupContext, SelectedEditorsInGroupFileOrUntitledResourceContextKey)
 });
 
 MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
@@ -469,7 +479,7 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
 	command: {
 		id: NEW_FILE_COMMAND_ID,
 		title: NEW_FILE_LABEL,
-		precondition: ExplorerResourceNotReadonlyContext
+		precondition: ContextKeyExpr.and(ExplorerResourceNotReadonlyContext, WorkbenchTreeFindOpen.toNegated())
 	},
 	when: ExplorerFolderContext
 });
@@ -480,7 +490,7 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
 	command: {
 		id: NEW_FOLDER_COMMAND_ID,
 		title: NEW_FOLDER_LABEL,
-		precondition: ExplorerResourceNotReadonlyContext
+		precondition: ContextKeyExpr.and(ExplorerResourceNotReadonlyContext, WorkbenchTreeFindOpen.toNegated())
 	},
 	when: ExplorerFolderContext
 });
@@ -528,7 +538,8 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
 	order: 8,
 	command: {
 		id: CUT_FILE_ID,
-		title: nls.localize('cut', "Cut")
+		title: nls.localize('cut', "Cut"),
+		precondition: WorkbenchTreeFindOpen.toNegated()
 	},
 	when: ContextKeyExpr.and(ExplorerRootContext.toNegated(), ExplorerResourceNotReadonlyContext)
 });
@@ -538,7 +549,7 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
 	order: 10,
 	command: {
 		id: COPY_FILE_ID,
-		title: COPY_FILE_LABEL
+		title: COPY_FILE_LABEL,
 	},
 	when: ExplorerRootContext.toNegated()
 });
@@ -549,7 +560,7 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
 	command: {
 		id: PASTE_FILE_ID,
 		title: PASTE_FILE_LABEL,
-		precondition: ContextKeyExpr.and(ExplorerResourceNotReadonlyContext, FileCopiedContext)
+		precondition: ContextKeyExpr.and(ExplorerResourceNotReadonlyContext, FileCopiedContext, WorkbenchTreeFindOpen.toNegated())
 	},
 	when: ExplorerFolderContext
 });
@@ -607,7 +618,8 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
 	order: 10,
 	command: {
 		id: ADD_ROOT_FOLDER_COMMAND_ID,
-		title: ADD_ROOT_FOLDER_LABEL
+		title: ADD_ROOT_FOLDER_LABEL,
+		precondition: WorkbenchTreeFindOpen.toNegated()
 	},
 	when: ContextKeyExpr.and(ExplorerRootContext, ContextKeyExpr.or(EnterMultiRootWorkspaceSupportContext, WorkbenchStateContext.isEqualTo('workspace')))
 });
@@ -617,7 +629,8 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
 	order: 30,
 	command: {
 		id: REMOVE_ROOT_FOLDER_COMMAND_ID,
-		title: REMOVE_ROOT_FOLDER_LABEL
+		title: REMOVE_ROOT_FOLDER_LABEL,
+		precondition: WorkbenchTreeFindOpen.toNegated()
 	},
 	when: ContextKeyExpr.and(ExplorerRootContext, ExplorerFolderContext, ContextKeyExpr.and(WorkspaceFolderCountContext.notEqualsTo('0'), ContextKeyExpr.or(EnterMultiRootWorkspaceSupportContext, WorkbenchStateContext.isEqualTo('workspace'))))
 });
@@ -628,7 +641,7 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
 	command: {
 		id: RENAME_ID,
 		title: TRIGGER_RENAME_LABEL,
-		precondition: ExplorerResourceNotReadonlyContext
+		precondition: ContextKeyExpr.and(ExplorerResourceNotReadonlyContext, WorkbenchTreeFindOpen.toNegated()),
 	},
 	when: ExplorerRootContext.toNegated()
 });
@@ -639,12 +652,12 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
 	command: {
 		id: MOVE_FILE_TO_TRASH_ID,
 		title: MOVE_FILE_TO_TRASH_LABEL,
-		precondition: ExplorerResourceNotReadonlyContext
+		precondition: ContextKeyExpr.and(ExplorerResourceNotReadonlyContext, WorkbenchTreeFindOpen.toNegated()),
 	},
 	alt: {
 		id: DELETE_FILE_ID,
 		title: nls.localize('deleteFile', "Delete Permanently"),
-		precondition: ExplorerResourceNotReadonlyContext
+		precondition: ContextKeyExpr.and(ExplorerResourceNotReadonlyContext, WorkbenchTreeFindOpen.toNegated()),
 	},
 	when: ContextKeyExpr.and(ExplorerRootContext.toNegated(), ExplorerResourceMoveableToTrash)
 });
@@ -655,7 +668,7 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
 	command: {
 		id: DELETE_FILE_ID,
 		title: nls.localize('deleteFile', "Delete Permanently"),
-		precondition: ExplorerResourceNotReadonlyContext
+		precondition: ContextKeyExpr.and(ExplorerResourceNotReadonlyContext, WorkbenchTreeFindOpen.toNegated()),
 	},
 	when: ContextKeyExpr.and(ExplorerRootContext.toNegated(), ExplorerResourceMoveableToTrash.toNegated())
 });
@@ -752,3 +765,64 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
 	},
 	order: 1
 });
+
+
+// Chat used attachment anchor context menu
+
+MenuRegistry.appendMenuItem(MenuId.ChatAttachmentsContext, {
+	group: 'navigation',
+	order: 10,
+	command: openToSideCommand,
+	when: ContextKeyExpr.and(ResourceContextKey.HasResource, ExplorerFolderContext.toNegated())
+});
+
+MenuRegistry.appendMenuItem(MenuId.ChatAttachmentsContext, {
+	group: 'navigation',
+	order: 20,
+	command: revealInsideBarCommand,
+	when: ResourceContextKey.IsFileSystemResource
+});
+
+MenuRegistry.appendMenuItem(MenuId.ChatAttachmentsContext, {
+	group: '1_cutcopypaste',
+	order: 10,
+	command: copyPathCommand,
+	when: ResourceContextKey.IsFileSystemResource
+});
+
+MenuRegistry.appendMenuItem(MenuId.ChatAttachmentsContext, {
+	group: '1_cutcopypaste',
+	order: 20,
+	command: copyRelativePathCommand,
+	when: ResourceContextKey.IsFileSystemResource
+});
+
+// Chat resource anchor context menu
+
+MenuRegistry.appendMenuItem(MenuId.ChatInlineResourceAnchorContext, {
+	group: 'navigation',
+	order: 10,
+	command: openToSideCommand,
+	when: ContextKeyExpr.and(ResourceContextKey.HasResource, ExplorerFolderContext.toNegated())
+});
+
+MenuRegistry.appendMenuItem(MenuId.ChatInlineResourceAnchorContext, {
+	group: 'navigation',
+	order: 20,
+	command: revealInsideBarCommand,
+	when: ResourceContextKey.IsFileSystemResource
+});
+
+MenuRegistry.appendMenuItem(MenuId.ChatInlineResourceAnchorContext, {
+	group: '1_cutcopypaste',
+	order: 10,
+	command: copyPathCommand,
+	when: ResourceContextKey.IsFileSystemResource
+});
+
+MenuRegistry.appendMenuItem(MenuId.ChatInlineResourceAnchorContext, {
+	group: '1_cutcopypaste',
+	order: 20,
+	command: copyRelativePathCommand,
+	when: ResourceContextKey.IsFileSystemResource
+});
diff --git a/src/vs/workbench/contrib/files/browser/fileActions.ts b/src/vs/workbench/contrib/files/browser/fileActions.ts
index 58a3df13a9f..f3c751b649d 100644
--- a/src/vs/workbench/contrib/files/browser/fileActions.ts
+++ b/src/vs/workbench/contrib/files/browser/fileActions.ts
@@ -3,63 +3,63 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { isWindows, OperatingSystem, OS } from 'vs/base/common/platform';
-import { extname, basename, isAbsolute } from 'vs/base/common/path';
-import * as resources from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { Action } from 'vs/base/common/actions';
-import { dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { VIEWLET_ID, IFilesConfiguration, VIEW_ID, UndoConfirmLevel } from 'vs/workbench/contrib/files/common/files';
-import { IFileService } from 'vs/platform/files/common/files';
-import { EditorResourceAccessor, SideBySideEditor } from 'vs/workbench/common/editor';
-import { IQuickInputService, ItemActivation } from 'vs/platform/quickinput/common/quickInput';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ITextModel } from 'vs/editor/common/model';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { REVEAL_IN_EXPLORER_COMMAND_ID, SAVE_ALL_IN_GROUP_COMMAND_ID, NEW_UNTITLED_FILE_COMMAND_ID } from 'vs/workbench/contrib/files/browser/fileConstants';
-import { ITextModelService, ITextModelContentProvider } from 'vs/editor/common/services/resolverService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ICommandService, CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { Schemas } from 'vs/base/common/network';
-import { IDialogService, IConfirmationResult, getFileNamesMessage } from 'vs/platform/dialogs/common/dialogs';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { Constants } from 'vs/base/common/uint';
-import { CLOSE_EDITORS_AND_GROUP_COMMAND_ID } from 'vs/workbench/browser/parts/editor/editorCommands';
-import { coalesce } from 'vs/base/common/arrays';
-import { ExplorerItem, NewExplorerItem } from 'vs/workbench/contrib/files/common/explorerModel';
-import { getErrorMessage } from 'vs/base/common/errors';
-import { triggerUpload } from 'vs/base/browser/dom';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
-import { IWorkingCopy } from 'vs/workbench/services/workingCopy/common/workingCopy';
-import { timeout } from 'vs/base/common/async';
-import { IWorkingCopyFileService } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { ViewContainerLocation } from 'vs/workbench/common/views';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { trim, rtrim } from 'vs/base/common/strings';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { ResourceFileEdit } from 'vs/editor/browser/services/bulkEditService';
-import { IExplorerService } from 'vs/workbench/contrib/files/browser/files';
-import { BrowserFileUpload, FileDownload } from 'vs/workbench/contrib/files/browser/fileImportExport';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { Action2 } from 'vs/platform/actions/common/actions';
-import { ActiveEditorCanToggleReadonlyContext, ActiveEditorContext, EmptyWorkspaceSupportContext } from 'vs/workbench/common/contextkeys';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { ILocalizedString } from 'vs/platform/action/common/action';
-import { VSBuffer } from 'vs/base/common/buffer';
+import * as nls from '../../../../nls.js';
+import { isWindows, OperatingSystem, OS } from '../../../../base/common/platform.js';
+import { extname, basename, isAbsolute } from '../../../../base/common/path.js';
+import * as resources from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { toErrorMessage } from '../../../../base/common/errorMessage.js';
+import { Action } from '../../../../base/common/actions.js';
+import { dispose, IDisposable } from '../../../../base/common/lifecycle.js';
+import { VIEWLET_ID, IFilesConfiguration, VIEW_ID, UndoConfirmLevel } from '../common/files.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
+import { IQuickInputService, ItemActivation } from '../../../../platform/quickinput/common/quickInput.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { REVEAL_IN_EXPLORER_COMMAND_ID, SAVE_ALL_IN_GROUP_COMMAND_ID, NEW_UNTITLED_FILE_COMMAND_ID } from './fileConstants.js';
+import { ITextModelService, ITextModelContentProvider } from '../../../../editor/common/services/resolverService.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ICommandService, CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { IDialogService, IConfirmationResult, getFileNamesMessage } from '../../../../platform/dialogs/common/dialogs.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { Constants } from '../../../../base/common/uint.js';
+import { CLOSE_EDITORS_AND_GROUP_COMMAND_ID } from '../../../browser/parts/editor/editorCommands.js';
+import { coalesce } from '../../../../base/common/arrays.js';
+import { ExplorerItem, NewExplorerItem } from '../common/explorerModel.js';
+import { getErrorMessage } from '../../../../base/common/errors.js';
+import { triggerUpload } from '../../../../base/browser/dom.js';
+import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.js';
+import { IWorkingCopyService } from '../../../services/workingCopy/common/workingCopyService.js';
+import { IWorkingCopy } from '../../../services/workingCopy/common/workingCopy.js';
+import { timeout } from '../../../../base/common/async.js';
+import { IWorkingCopyFileService } from '../../../services/workingCopy/common/workingCopyFileService.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { ViewContainerLocation } from '../../../common/views.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { trim, rtrim } from '../../../../base/common/strings.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { ResourceFileEdit } from '../../../../editor/browser/services/bulkEditService.js';
+import { IExplorerService } from './files.js';
+import { BrowserFileUpload, FileDownload } from './fileImportExport.js';
+import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.js';
+import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';
+import { IPathService } from '../../../services/path/common/pathService.js';
+import { Action2 } from '../../../../platform/actions/common/actions.js';
+import { ActiveEditorCanToggleReadonlyContext, ActiveEditorContext, EmptyWorkspaceSupportContext } from '../../../common/contextkeys.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeyChord, KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { ILocalizedString } from '../../../../platform/action/common/action.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
 
 export const NEW_FILE_COMMAND_ID = 'explorer.newFile';
 export const NEW_FILE_LABEL = nls.localize2('newFile', "New File...");
diff --git a/src/vs/workbench/contrib/files/browser/fileCommands.ts b/src/vs/workbench/contrib/files/browser/fileCommands.ts
index 81bf68c3e0b..69cfd27a424 100644
--- a/src/vs/workbench/contrib/files/browser/fileCommands.ts
+++ b/src/vs/workbench/contrib/files/browser/fileCommands.ts
@@ -3,56 +3,55 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { URI } from 'vs/base/common/uri';
-import { EditorResourceAccessor, IEditorCommandsContext, SideBySideEditor, IEditorIdentifier, SaveReason, EditorsOrder, EditorInputCapabilities } from 'vs/workbench/common/editor';
-import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditorInput';
-import { IWindowOpenable, IOpenWindowOptions, isWorkspaceToOpen, IOpenEmptyWindowOptions } from 'vs/platform/window/common/window';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IWorkspaceContextService, UNTITLED_WORKSPACE_NAME } from 'vs/platform/workspace/common/workspace';
-import { ExplorerFocusCondition, TextFileContentProvider, VIEWLET_ID, ExplorerCompressedFocusContext, ExplorerCompressedFirstFocusContext, ExplorerCompressedLastFocusContext, FilesExplorerFocusCondition, ExplorerFolderContext, VIEW_ID } from 'vs/workbench/contrib/files/common/files';
-import { ExplorerViewPaneContainer } from 'vs/workbench/contrib/files/browser/explorerViewlet';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { IListService } from 'vs/platform/list/browser/listService';
-import { CommandsRegistry, ICommandHandler, ICommandService } from 'vs/platform/commands/common/commands';
-import { IContextKey, IContextKeyService, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IFileService } from 'vs/platform/files/common/files';
-import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { KeyMod, KeyCode, KeyChord } from 'vs/base/common/keyCodes';
-import { isWeb, isWindows } from 'vs/base/common/platform';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { getResourceForCommand, getMultiSelectedResources, getOpenEditorsViewMultiSelection, IExplorerService } from 'vs/workbench/contrib/files/browser/files';
-import { IWorkspaceEditingService } from 'vs/workbench/services/workspaces/common/workspaceEditing';
-import { getMultiSelectedEditorContexts } from 'vs/workbench/browser/parts/editor/editorCommands';
-import { Schemas } from 'vs/base/common/network';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { IEditorService, SIDE_GROUP, ISaveEditorsOptions } from 'vs/workbench/services/editor/common/editorService';
-import { IEditorGroupsService, GroupsOrder, IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { basename, joinPath, isEqual } from 'vs/base/common/resources';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { coalesce } from 'vs/base/common/arrays';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { isCancellationError } from 'vs/base/common/errors';
-import { toAction } from 'vs/base/common/actions';
-import { EditorOpenSource, EditorResolution } from 'vs/platform/editor/common/editor';
-import { hash } from 'vs/base/common/hash';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { ViewContainerLocation } from 'vs/workbench/common/views';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { OPEN_TO_SIDE_COMMAND_ID, COMPARE_WITH_SAVED_COMMAND_ID, SELECT_FOR_COMPARE_COMMAND_ID, ResourceSelectedForCompareContext, COMPARE_SELECTED_COMMAND_ID, COMPARE_RESOURCE_COMMAND_ID, COPY_PATH_COMMAND_ID, COPY_RELATIVE_PATH_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, OPEN_WITH_EXPLORER_COMMAND_ID, SAVE_FILE_COMMAND_ID, SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID, SAVE_FILE_AS_COMMAND_ID, SAVE_ALL_COMMAND_ID, SAVE_ALL_IN_GROUP_COMMAND_ID, SAVE_FILES_COMMAND_ID, REVERT_FILE_COMMAND_ID, REMOVE_ROOT_FOLDER_COMMAND_ID, PREVIOUS_COMPRESSED_FOLDER, NEXT_COMPRESSED_FOLDER, FIRST_COMPRESSED_FOLDER, LAST_COMPRESSED_FOLDER, NEW_UNTITLED_FILE_COMMAND_ID, NEW_UNTITLED_FILE_LABEL, NEW_FILE_COMMAND_ID } from './fileConstants';
-import { IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { RemoveRootFolderAction } from 'vs/workbench/browser/actions/workspaceActions';
-import { OpenEditorsView } from 'vs/workbench/contrib/files/browser/views/openEditorsView';
-import { ExplorerView } from 'vs/workbench/contrib/files/browser/views/explorerView';
+import * as nls from '../../../../nls.js';
+import { URI } from '../../../../base/common/uri.js';
+import { EditorResourceAccessor, IEditorCommandsContext, SideBySideEditor, IEditorIdentifier, SaveReason, EditorsOrder, EditorInputCapabilities } from '../../../common/editor.js';
+import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
+import { IWindowOpenable, IOpenWindowOptions, isWorkspaceToOpen, IOpenEmptyWindowOptions } from '../../../../platform/window/common/window.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { ServicesAccessor, IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IWorkspaceContextService, UNTITLED_WORKSPACE_NAME } from '../../../../platform/workspace/common/workspace.js';
+import { ExplorerFocusCondition, TextFileContentProvider, VIEWLET_ID, ExplorerCompressedFocusContext, ExplorerCompressedFirstFocusContext, ExplorerCompressedLastFocusContext, FilesExplorerFocusCondition, ExplorerFolderContext, VIEW_ID } from '../common/files.js';
+import { ExplorerViewPaneContainer } from './explorerViewlet.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { toErrorMessage } from '../../../../base/common/errorMessage.js';
+import { CommandsRegistry, ICommandHandler, ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IContextKey, IContextKeyService, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeyMod, KeyCode, KeyChord } from '../../../../base/common/keyCodes.js';
+import { isWeb, isWindows } from '../../../../base/common/platform.js';
+import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { getResourceForCommand, getMultiSelectedResources, getOpenEditorsViewMultiSelection, IExplorerService } from './files.js';
+import { IWorkspaceEditingService } from '../../../services/workspaces/common/workspaceEditing.js';
+import { resolveCommandsContext } from '../../../browser/parts/editor/editorCommandsContext.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
+import { IEditorService, SIDE_GROUP, ISaveEditorsOptions } from '../../../services/editor/common/editorService.js';
+import { IEditorGroupsService, GroupsOrder, IEditorGroup } from '../../../services/editor/common/editorGroupsService.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { basename, joinPath, isEqual } from '../../../../base/common/resources.js';
+import { IDisposable, dispose } from '../../../../base/common/lifecycle.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { EmbeddedCodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/embeddedCodeEditorWidget.js';
+import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { isCancellationError } from '../../../../base/common/errors.js';
+import { IAction, toAction } from '../../../../base/common/actions.js';
+import { EditorOpenSource, EditorResolution } from '../../../../platform/editor/common/editor.js';
+import { hash } from '../../../../base/common/hash.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.js';
+import { ViewContainerLocation } from '../../../common/views.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { OPEN_TO_SIDE_COMMAND_ID, COMPARE_WITH_SAVED_COMMAND_ID, SELECT_FOR_COMPARE_COMMAND_ID, ResourceSelectedForCompareContext, COMPARE_SELECTED_COMMAND_ID, COMPARE_RESOURCE_COMMAND_ID, COPY_PATH_COMMAND_ID, COPY_RELATIVE_PATH_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, OPEN_WITH_EXPLORER_COMMAND_ID, SAVE_FILE_COMMAND_ID, SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID, SAVE_FILE_AS_COMMAND_ID, SAVE_ALL_COMMAND_ID, SAVE_ALL_IN_GROUP_COMMAND_ID, SAVE_FILES_COMMAND_ID, REVERT_FILE_COMMAND_ID, REMOVE_ROOT_FOLDER_COMMAND_ID, PREVIOUS_COMPRESSED_FOLDER, NEXT_COMPRESSED_FOLDER, FIRST_COMPRESSED_FOLDER, LAST_COMPRESSED_FOLDER, NEW_UNTITLED_FILE_COMMAND_ID, NEW_UNTITLED_FILE_LABEL, NEW_FILE_COMMAND_ID } from './fileConstants.js';
+import { IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { RemoveRootFolderAction } from '../../../browser/actions/workspaceActions.js';
+import { OpenEditorsView } from './views/openEditorsView.js';
+import { ExplorerView } from './views/explorerView.js';
+import { IListService } from '../../../../platform/list/browser/listService.js';
 
 export const openWindowCommand = (accessor: ServicesAccessor, toOpen: IWindowOpenable[], options?: IOpenWindowOptions) => {
 	if (Array.isArray(toOpen)) {
@@ -90,11 +89,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	},
 	id: OPEN_TO_SIDE_COMMAND_ID, handler: async (accessor, resource: URI | object) => {
 		const editorService = accessor.get(IEditorService);
-		const editorGroupService = accessor.get(IEditorGroupsService);
-		const listService = accessor.get(IListService);
 		const fileService = accessor.get(IFileService);
 		const explorerService = accessor.get(IExplorerService);
-		const resources = getMultiSelectedResources(resource, listService, editorService, editorGroupService, explorerService);
+		const resources = getMultiSelectedResources(resource, accessor.get(IListService), editorService, accessor.get(IEditorGroupsService), explorerService);
 
 		// Set side input
 		if (resources.length) {
@@ -151,6 +148,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 		const textModelService = accessor.get(ITextModelService);
 		const editorService = accessor.get(IEditorService);
 		const fileService = accessor.get(IFileService);
+		const listService = accessor.get(IListService);
 
 		// Register provider at first as needed
 		let registerEditorListener = false;
@@ -163,7 +161,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 		}
 
 		// Open editor (only resources that can be handled by file service are supported)
-		const uri = getResourceForCommand(resource, accessor.get(IListService), editorService);
+		const uri = getResourceForCommand(resource, editorService, listService);
 		if (uri && fileService.hasProvider(uri)) {
 			const name = basename(uri);
 			const editorLabel = nls.localize('modifiedLabel', "{0} (in file) ↔ {1}", name, name);
@@ -190,9 +188,7 @@ let resourceSelectedForCompareContext: IContextKey<boolean>;
 CommandsRegistry.registerCommand({
 	id: SELECT_FOR_COMPARE_COMMAND_ID,
 	handler: (accessor, resource: URI | object) => {
-		const listService = accessor.get(IListService);
-
-		globalResourceToCompare = getResourceForCommand(resource, listService, accessor.get(IEditorService));
+		globalResourceToCompare = getResourceForCommand(resource, accessor.get(IEditorService), accessor.get(IListService));
 		if (!resourceSelectedForCompareContext) {
 			resourceSelectedForCompareContext = ResourceSelectedForCompareContext.bindTo(accessor.get(IContextKeyService));
 		}
@@ -204,9 +200,7 @@ CommandsRegistry.registerCommand({
 	id: COMPARE_SELECTED_COMMAND_ID,
 	handler: async (accessor, resource: URI | object) => {
 		const editorService = accessor.get(IEditorService);
-		const editorGroupService = accessor.get(IEditorGroupsService);
-		const explorerService = accessor.get(IExplorerService);
-		const resources = getMultiSelectedResources(resource, accessor.get(IListService), editorService, editorGroupService, explorerService);
+		const resources = getMultiSelectedResources(resource, accessor.get(IListService), editorService, accessor.get(IEditorGroupsService), accessor.get(IExplorerService));
 
 		if (resources.length === 2) {
 			return editorService.openEditor({
@@ -224,9 +218,7 @@ CommandsRegistry.registerCommand({
 	id: COMPARE_RESOURCE_COMMAND_ID,
 	handler: (accessor, resource: URI | object) => {
 		const editorService = accessor.get(IEditorService);
-		const listService = accessor.get(IListService);
-
-		const rightResource = getResourceForCommand(resource, listService, editorService);
+		const rightResource = getResourceForCommand(resource, editorService, accessor.get(IListService));
 		if (globalResourceToCompare && rightResource) {
 			editorService.openEditor({
 				original: { resource: globalResourceToCompare },
@@ -328,7 +320,9 @@ CommandsRegistry.registerCommand({
 		const viewService = accessor.get(IViewsService);
 		const contextService = accessor.get(IWorkspaceContextService);
 		const explorerService = accessor.get(IExplorerService);
-		const uri = getResourceForCommand(resource, accessor.get(IListService), accessor.get(IEditorService));
+		const editorService = accessor.get(IEditorService);
+		const listService = accessor.get(IListService);
+		const uri = getResourceForCommand(resource, editorService, listService);
 
 		if (uri && contextService.isInsideWorkspace(uri)) {
 			const explorerView = await viewService.openView<ExplorerView>(VIEW_ID, false);
@@ -343,7 +337,9 @@ CommandsRegistry.registerCommand({
 				explorerView.autoReveal = oldAutoReveal;
 			}
 		} else {
-			const openEditorsView = await viewService.openView(OpenEditorsView.ID, false);
+			// Do not reveal the open editors view if it's hidden explicitly
+			// See https://github.com/microsoft/vscode/issues/227378
+			const openEditorsView = viewService.getViewWithId(OpenEditorsView.ID);
 			if (openEditorsView) {
 				openEditorsView.setExpanded(true);
 				openEditorsView.focus();
@@ -356,8 +352,8 @@ CommandsRegistry.registerCommand({
 	id: OPEN_WITH_EXPLORER_COMMAND_ID,
 	handler: async (accessor, resource: URI | object) => {
 		const editorService = accessor.get(IEditorService);
-
-		const uri = getResourceForCommand(resource, accessor.get(IListService), accessor.get(IEditorService));
+		const listService = accessor.get(IListService);
+		const uri = getResourceForCommand(resource, editorService, listService);
 		if (uri) {
 			return editorService.openEditor({ resource: uri, options: { override: EditorResolution.PICK, source: EditorOpenSource.USER } });
 		}
@@ -369,13 +365,12 @@ CommandsRegistry.registerCommand({
 // Save / Save As / Save All / Revert
 
 async function saveSelectedEditors(accessor: ServicesAccessor, options?: ISaveEditorsOptions): Promise<void> {
-	const listService = accessor.get(IListService);
 	const editorGroupService = accessor.get(IEditorGroupsService);
 	const codeEditorService = accessor.get(ICodeEditorService);
 	const textFileService = accessor.get(ITextFileService);
 
 	// Retrieve selected or active editor
-	let editors = getOpenEditorsViewMultiSelection(listService, editorGroupService);
+	let editors = getOpenEditorsViewMultiSelection(accessor);
 	if (!editors) {
 		const activeGroup = editorGroupService.activeGroup;
 		if (activeGroup.activeEditor) {
@@ -451,16 +446,17 @@ async function doSaveEditors(accessor: ServicesAccessor, editors: IEditorIdentif
 		await editorService.save(editors, options);
 	} catch (error) {
 		if (!isCancellationError(error)) {
+			const actions: IAction[] = [toAction({ id: 'workbench.action.files.saveEditors', label: nls.localize('retry', "Retry"), run: () => instantiationService.invokeFunction(accessor => doSaveEditors(accessor, editors, options)) })];
+			const editorsToRevert = editors.filter(({ editor }) => !editor.hasCapability(EditorInputCapabilities.Untitled) /* all except untitled to prevent unexpected data-loss */);
+			if (editorsToRevert.length > 0) {
+				actions.push(toAction({ id: 'workbench.action.files.revertEditors', label: editorsToRevert.length > 1 ? nls.localize('revertAll', "Revert All") : nls.localize('revert', "Revert"), run: () => editorService.revert(editorsToRevert) }));
+			}
+
 			notificationService.notify({
 				id: editors.map(({ editor }) => hash(editor.resource?.toString())).join(), // ensure unique notification ID per set of editor
 				severity: Severity.Error,
 				message: nls.localize({ key: 'genericSaveError', comment: ['{0} is the resource that failed to save and {1} the error message'] }, "Failed to save '{0}': {1}", editors.map(({ editor }) => editor.getName()).join(', '), toErrorMessage(error, false)),
-				actions: {
-					primary: [
-						toAction({ id: 'workbench.action.files.saveEditors', label: nls.localize('retry', "Retry"), run: () => instantiationService.invokeFunction(accessor => doSaveEditors(accessor, editors, options)) }),
-						toAction({ id: 'workbench.action.files.revertEditors', label: nls.localize('discard', "Discard"), run: () => editorService.revert(editors) })
-					]
-				}
+				actions: { primary: actions }
 			});
 		}
 	}
@@ -512,15 +508,15 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 CommandsRegistry.registerCommand({
 	id: SAVE_ALL_IN_GROUP_COMMAND_ID,
 	handler: (accessor, _: URI | object, editorContext: IEditorCommandsContext) => {
-		const editorGroupService = accessor.get(IEditorGroupsService);
+		const editorGroupsService = accessor.get(IEditorGroupsService);
 
-		const contexts = getMultiSelectedEditorContexts(editorContext, accessor.get(IListService), accessor.get(IEditorGroupsService));
+		const resolvedContext = resolveCommandsContext([editorContext], accessor.get(IEditorService), editorGroupsService, accessor.get(IListService));
 
 		let groups: readonly IEditorGroup[] | undefined = undefined;
-		if (!contexts.length) {
-			groups = editorGroupService.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE);
+		if (!resolvedContext.groupedEditors.length) {
+			groups = editorGroupsService.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE);
 		} else {
-			groups = coalesce(contexts.map(context => editorGroupService.getGroup(context.groupId)));
+			groups = resolvedContext.groupedEditors.map(({ group }) => group);
 		}
 
 		return saveDirtyEditorsOfGroups(accessor, groups, { reason: SaveReason.EXPLICIT });
@@ -540,13 +536,11 @@ CommandsRegistry.registerCommand({
 CommandsRegistry.registerCommand({
 	id: REVERT_FILE_COMMAND_ID,
 	handler: async accessor => {
-		const notificationService = accessor.get(INotificationService);
-		const listService = accessor.get(IListService);
 		const editorGroupService = accessor.get(IEditorGroupsService);
 		const editorService = accessor.get(IEditorService);
 
 		// Retrieve selected or active editor
-		let editors = getOpenEditorsViewMultiSelection(listService, editorGroupService);
+		let editors = getOpenEditorsViewMultiSelection(accessor);
 		if (!editors) {
 			const activeGroup = editorGroupService.activeGroup;
 			if (activeGroup.activeEditor) {
@@ -561,6 +555,7 @@ CommandsRegistry.registerCommand({
 		try {
 			await editorService.revert(editors.filter(({ editor }) => !editor.hasCapability(EditorInputCapabilities.Untitled) /* all except untitled */), { force: true });
 		} catch (error) {
+			const notificationService = accessor.get(INotificationService);
 			notificationService.error(nls.localize('genericRevertError', "Failed to revert '{0}': {1}", editors.map(({ editor }) => editor.getName()).join(', '), toErrorMessage(error, false)));
 		}
 	}
@@ -569,7 +564,6 @@ CommandsRegistry.registerCommand({
 CommandsRegistry.registerCommand({
 	id: REMOVE_ROOT_FOLDER_COMMAND_ID,
 	handler: (accessor, resource: URI | object) => {
-		const workspaceEditingService = accessor.get(IWorkspaceEditingService);
 		const contextService = accessor.get(IWorkspaceContextService);
 		const uriIdentityService = accessor.get(IUriIdentityService);
 		const workspace = contextService.getWorkspace();
@@ -583,6 +577,7 @@ CommandsRegistry.registerCommand({
 			return commandService.executeCommand(RemoveRootFolderAction.ID);
 		}
 
+		const workspaceEditingService = accessor.get(IWorkspaceEditingService);
 		return workspaceEditingService.removeFolders(resources);
 	}
 });
diff --git a/src/vs/workbench/contrib/files/browser/fileConstants.ts b/src/vs/workbench/contrib/files/browser/fileConstants.ts
index c38f9987d22..9a591704ee7 100644
--- a/src/vs/workbench/contrib/files/browser/fileConstants.ts
+++ b/src/vs/workbench/contrib/files/browser/fileConstants.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import * as nls from '../../../../nls.js';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 
 export const REVEAL_IN_EXPLORER_COMMAND_ID = 'revealInExplorer';
 export const REVERT_FILE_COMMAND_ID = 'workbench.action.files.revert';
@@ -35,6 +35,7 @@ export const SAVE_FILES_COMMAND_ID = 'workbench.action.files.saveFiles';
 export const OpenEditorsGroupContext = new RawContextKey<boolean>('groupFocusedInOpenEditors', false);
 export const OpenEditorsDirtyEditorContext = new RawContextKey<boolean>('dirtyEditorFocusedInOpenEditors', false);
 export const OpenEditorsReadonlyEditorContext = new RawContextKey<boolean>('readonlyEditorFocusedInOpenEditors', false);
+export const OpenEditorsSelectedFileOrUntitledContext = new RawContextKey<boolean>('openEditorsSelectedFileOrUntitled', true);
 export const ResourceSelectedForCompareContext = new RawContextKey<boolean>('resourceSelectedForCompare', false);
 
 export const REMOVE_ROOT_FOLDER_COMMAND_ID = 'removeRootFolder';
diff --git a/src/vs/workbench/contrib/files/browser/fileImportExport.ts b/src/vs/workbench/contrib/files/browser/fileImportExport.ts
index 86f4f228580..da1f105a484 100644
--- a/src/vs/workbench/contrib/files/browser/fileImportExport.ts
+++ b/src/vs/workbench/contrib/files/browser/fileImportExport.ts
@@ -3,39 +3,39 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { getFileNamesMessage, IConfirmation, IDialogService, IFileDialogService, IPromptButton } from 'vs/platform/dialogs/common/dialogs';
-import { ByteSize, FileSystemProviderCapabilities, IFileService, IFileStatWithMetadata } from 'vs/platform/files/common/files';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { IProgress, IProgressService, IProgressStep, ProgressLocation } from 'vs/platform/progress/common/progress';
-import { IExplorerService } from 'vs/workbench/contrib/files/browser/files';
-import { IFilesConfiguration, UndoConfirmLevel, VIEW_ID } from 'vs/workbench/contrib/files/common/files';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { Limiter, Promises, RunOnceWorker } from 'vs/base/common/async';
-import { newWriteableBufferStream, VSBuffer } from 'vs/base/common/buffer';
-import { basename, dirname, joinPath } from 'vs/base/common/resources';
-import { ResourceFileEdit } from 'vs/editor/browser/services/bulkEditService';
-import { ExplorerItem } from 'vs/workbench/contrib/files/common/explorerModel';
-import { URI } from 'vs/base/common/uri';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { extractEditorsAndFilesDropData } from 'vs/platform/dnd/browser/dnd';
-import { IWorkspaceEditingService } from 'vs/workbench/services/workspaces/common/workspaceEditing';
-import { isWeb } from 'vs/base/common/platform';
-import { getActiveWindow, isDragEvent, triggerDownload } from 'vs/base/browser/dom';
-import { ILogService } from 'vs/platform/log/common/log';
-import { FileAccess, Schemas } from 'vs/base/common/network';
-import { mnemonicButtonLabel } from 'vs/base/common/labels';
-import { listenStream } from 'vs/base/common/stream';
-import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { createSingleCallFunction } from 'vs/base/common/functional';
-import { coalesce } from 'vs/base/common/arrays';
-import { canceled } from 'vs/base/common/errors';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { WebFileSystemAccess } from 'vs/platform/files/browser/webFileSystemAccess';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
+import { localize } from '../../../../nls.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { getFileNamesMessage, IConfirmation, IDialogService, IFileDialogService, IPromptButton } from '../../../../platform/dialogs/common/dialogs.js';
+import { ByteSize, FileSystemProviderCapabilities, IFileService, IFileStatWithMetadata } from '../../../../platform/files/common/files.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { IProgress, IProgressService, IProgressStep, ProgressLocation } from '../../../../platform/progress/common/progress.js';
+import { IExplorerService } from './files.js';
+import { IFilesConfiguration, UndoConfirmLevel, VIEW_ID } from '../common/files.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { Limiter, Promises, RunOnceWorker } from '../../../../base/common/async.js';
+import { newWriteableBufferStream, VSBuffer } from '../../../../base/common/buffer.js';
+import { basename, dirname, joinPath } from '../../../../base/common/resources.js';
+import { ResourceFileEdit } from '../../../../editor/browser/services/bulkEditService.js';
+import { ExplorerItem } from '../common/explorerModel.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { extractEditorsAndFilesDropData } from '../../../../platform/dnd/browser/dnd.js';
+import { IWorkspaceEditingService } from '../../../services/workspaces/common/workspaceEditing.js';
+import { isWeb } from '../../../../base/common/platform.js';
+import { getActiveWindow, isDragEvent, triggerDownload } from '../../../../base/browser/dom.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { FileAccess, Schemas } from '../../../../base/common/network.js';
+import { mnemonicButtonLabel } from '../../../../base/common/labels.js';
+import { listenStream } from '../../../../base/common/stream.js';
+import { DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { createSingleCallFunction } from '../../../../base/common/functional.js';
+import { coalesce } from '../../../../base/common/arrays.js';
+import { canceled } from '../../../../base/common/errors.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { WebFileSystemAccess } from '../../../../platform/files/browser/webFileSystemAccess.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 
 //#region Browser File Upload (drag and drop, input element)
 
@@ -564,7 +564,8 @@ export class ExternalFileImport {
 			});
 
 			// if we only add one file, just open it directly
-			if (resourceFileEdits.length === 1) {
+			const autoOpen = this.configurationService.getValue<IFilesConfiguration>().explorer.autoOpenDroppedFile;
+			if (autoOpen && resourceFileEdits.length === 1) {
 				const item = this.explorerService.findClosest(resourceFileEdits[0].newResource!);
 				if (item && !item.isDirectory) {
 					this.editorService.openEditor({ resource: item.resource, options: { pinned: true } });
diff --git a/src/vs/workbench/contrib/files/browser/files.contribution.ts b/src/vs/workbench/contrib/files/browser/files.contribution.ts
index d525ba5860c..250bb0c060a 100644
--- a/src/vs/workbench/contrib/files/browser/files.contribution.ts
+++ b/src/vs/workbench/contrib/files/browser/files.contribution.ts
@@ -3,38 +3,38 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { sep } from 'vs/base/common/path';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope, IConfigurationPropertySchema } from 'vs/platform/configuration/common/configurationRegistry';
-import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { IFileEditorInput, IEditorFactoryRegistry, EditorExtensions } from 'vs/workbench/common/editor';
-import { AutoSaveConfiguration, HotExitConfiguration, FILES_EXCLUDE_CONFIG, FILES_ASSOCIATIONS_CONFIG, FILES_READONLY_INCLUDE_CONFIG, FILES_READONLY_EXCLUDE_CONFIG, FILES_READONLY_FROM_PERMISSIONS_CONFIG } from 'vs/platform/files/common/files';
-import { SortOrder, LexicographicOptions, FILE_EDITOR_INPUT_ID, BINARY_TEXT_FILE_MODE, UndoConfirmLevel, IFilesConfiguration } from 'vs/workbench/contrib/files/common/files';
-import { TextFileEditorTracker } from 'vs/workbench/contrib/files/browser/editors/textFileEditorTracker';
-import { TextFileSaveErrorHandler } from 'vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler';
-import { FileEditorInput } from 'vs/workbench/contrib/files/browser/editors/fileEditorInput';
-import { BinaryFileEditor } from 'vs/workbench/contrib/files/browser/editors/binaryFileEditor';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { isNative, isWeb, isWindows } from 'vs/base/common/platform';
-import { ExplorerViewletViewsContribution } from 'vs/workbench/contrib/files/browser/explorerViewlet';
-import { IEditorPaneRegistry, EditorPaneDescriptor } from 'vs/workbench/browser/editor';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ExplorerService, UNDO_REDO_SOURCE } from 'vs/workbench/contrib/files/browser/explorerService';
-import { GUESSABLE_ENCODINGS, SUPPORTED_ENCODINGS } from 'vs/workbench/services/textfile/common/encoding';
-import { Schemas } from 'vs/base/common/network';
-import { WorkspaceWatcher } from 'vs/workbench/contrib/files/browser/workspaceWatcher';
-import { editorConfigurationBaseNode } from 'vs/editor/common/config/editorConfigurationSchema';
-import { DirtyFilesIndicator } from 'vs/workbench/contrib/files/common/dirtyFilesIndicator';
-import { UndoCommand, RedoCommand } from 'vs/editor/browser/editorExtensions';
-import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
-import { IExplorerService } from 'vs/workbench/contrib/files/browser/files';
-import { FileEditorInputSerializer, FileEditorWorkingCopyEditorHandler } from 'vs/workbench/contrib/files/browser/editors/fileEditorHandler';
-import { ModesRegistry } from 'vs/editor/common/languages/modesRegistry';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TextFileEditor } from 'vs/workbench/contrib/files/browser/editors/textFileEditor';
+import * as nls from '../../../../nls.js';
+import { sep } from '../../../../base/common/path.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope, IConfigurationPropertySchema } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { IFileEditorInput, IEditorFactoryRegistry, EditorExtensions } from '../../../common/editor.js';
+import { AutoSaveConfiguration, HotExitConfiguration, FILES_EXCLUDE_CONFIG, FILES_ASSOCIATIONS_CONFIG, FILES_READONLY_INCLUDE_CONFIG, FILES_READONLY_EXCLUDE_CONFIG, FILES_READONLY_FROM_PERMISSIONS_CONFIG } from '../../../../platform/files/common/files.js';
+import { SortOrder, LexicographicOptions, FILE_EDITOR_INPUT_ID, BINARY_TEXT_FILE_MODE, UndoConfirmLevel, IFilesConfiguration } from '../common/files.js';
+import { TextFileEditorTracker } from './editors/textFileEditorTracker.js';
+import { TextFileSaveErrorHandler } from './editors/textFileSaveErrorHandler.js';
+import { FileEditorInput } from './editors/fileEditorInput.js';
+import { BinaryFileEditor } from './editors/binaryFileEditor.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { isNative, isWeb, isWindows } from '../../../../base/common/platform.js';
+import { ExplorerViewletViewsContribution } from './explorerViewlet.js';
+import { IEditorPaneRegistry, EditorPaneDescriptor } from '../../../browser/editor.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ExplorerService, UNDO_REDO_SOURCE } from './explorerService.js';
+import { GUESSABLE_ENCODINGS, SUPPORTED_ENCODINGS } from '../../../services/textfile/common/encoding.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { WorkspaceWatcher } from './workspaceWatcher.js';
+import { editorConfigurationBaseNode } from '../../../../editor/common/config/editorConfigurationSchema.js';
+import { DirtyFilesIndicator } from '../common/dirtyFilesIndicator.js';
+import { UndoCommand, RedoCommand } from '../../../../editor/browser/editorExtensions.js';
+import { IUndoRedoService } from '../../../../platform/undoRedo/common/undoRedo.js';
+import { IExplorerService } from './files.js';
+import { FileEditorInputSerializer, FileEditorWorkingCopyEditorHandler } from './editors/fileEditorHandler.js';
+import { ModesRegistry } from '../../../../editor/common/languages/modesRegistry.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { TextFileEditor } from './editors/textFileEditor.js';
 
 class FileUriLabelContribution implements IWorkbenchContribution {
 
@@ -295,7 +295,7 @@ configurationRegistry.registerConfiguration({
 			'patternProperties': {
 				'.*': { 'type': 'boolean' }
 			},
-			'default': { '**/.git/objects/**': true, '**/.git/subtree-cache/**': true, '**/node_modules/*/**': true, '**/.hg/store/**': true },
+			'default': { '**/.git/objects/**': true, '**/.git/subtree-cache/**': true, '**/.hg/store/**': true },
 			'markdownDescription': nls.localize('watcherExclude', "Configure paths or [glob patterns](https://aka.ms/vscode-glob-patterns) to exclude from file watching. Paths can either be relative to the watched folder or absolute. Glob patterns are matched relative from the watched folder. When you experience the file watcher process consuming a lot of CPU, make sure to exclude large folders that are of less interest (such as build output folders)."),
 			'scope': ConfigurationScope.RESOURCE
 		},
@@ -533,6 +533,11 @@ configurationRegistry.registerConfiguration({
 			],
 			'description': nls.localize('sortOrderLexicographicOptions', "Controls the lexicographic sorting of file and folder names in the Explorer.")
 		},
+		'explorer.sortOrderReverse': {
+			'type': 'boolean',
+			'description': nls.localize('sortOrderReverse', "Controls whether the file and folder sort order, should be reversed."),
+			'default': false,
+		},
 		'explorer.decorations.colors': {
 			type: 'boolean',
 			description: nls.localize('explorer.decorations.colors', "Controls whether file decorations should use colors."),
@@ -554,6 +559,11 @@ configurationRegistry.registerConfiguration({
 			description: nls.localize('explorer.incrementalNaming', "Controls which naming strategy to use when giving a new name to a duplicated Explorer item on paste."),
 			default: 'simple'
 		},
+		'explorer.autoOpenDroppedFile': {
+			'type': 'boolean',
+			'description': nls.localize('autoOpenDroppedFile', "Controls whether the Explorer should automatically open a file when it is dropped into the explorer"),
+			'default': true
+		},
 		'explorer.compactFolders': {
 			'type': 'boolean',
 			'description': nls.localize('compressSingleChildFolders', "Controls whether the Explorer should render folders in a compact form. In such a form, single child folders will be compressed in a combined tree element. Useful for Java package structures, for example."),
diff --git a/src/vs/workbench/contrib/files/browser/files.ts b/src/vs/workbench/contrib/files/browser/files.ts
index f1dbd239f4e..a810de1604a 100644
--- a/src/vs/workbench/contrib/files/browser/files.ts
+++ b/src/vs/workbench/contrib/files/browser/files.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { IListService } from 'vs/platform/list/browser/listService';
-import { OpenEditor, ISortOrderConfiguration } from 'vs/workbench/contrib/files/common/files';
-import { EditorResourceAccessor, SideBySideEditor, IEditorIdentifier } from 'vs/workbench/common/editor';
-import { List } from 'vs/base/browser/ui/list/listWidget';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ExplorerItem } from 'vs/workbench/contrib/files/common/explorerModel';
-import { coalesce } from 'vs/base/common/arrays';
-import { AsyncDataTree } from 'vs/base/browser/ui/tree/asyncDataTree';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditableData } from 'vs/workbench/common/views';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ResourceFileEdit } from 'vs/editor/browser/services/bulkEditService';
-import { ProgressLocation } from 'vs/platform/progress/common/progress';
-import { isActiveElement } from 'vs/base/browser/dom';
+import { URI } from '../../../../base/common/uri.js';
+import { IListService } from '../../../../platform/list/browser/listService.js';
+import { OpenEditor, ISortOrderConfiguration } from '../common/files.js';
+import { EditorResourceAccessor, SideBySideEditor, IEditorIdentifier } from '../../../common/editor.js';
+import { List } from '../../../../base/browser/ui/list/listWidget.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { ExplorerItem } from '../common/explorerModel.js';
+import { coalesce } from '../../../../base/common/arrays.js';
+import { AsyncDataTree } from '../../../../base/browser/ui/tree/asyncDataTree.js';
+import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { IEditableData } from '../../../common/views.js';
+import { createDecorator, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { ResourceFileEdit } from '../../../../editor/browser/services/bulkEditService.js';
+import { ProgressLocation } from '../../../../platform/progress/common/progress.js';
+import { isActiveElement } from '../../../../base/browser/dom.js';
 
 export interface IExplorerService {
 	readonly _serviceBrand: undefined;
@@ -90,9 +90,9 @@ function getFocus(listService: IListService): unknown | undefined {
 
 // Commands can get executed from a command palette, from a context menu or from some list using a keybinding
 // To cover all these cases we need to properly compute the resource on which the command is being executed
-export function getResourceForCommand(resource: URI | object | undefined, listService: IListService, editorService: IEditorService): URI | undefined {
-	if (URI.isUri(resource)) {
-		return resource;
+export function getResourceForCommand(commandArg: unknown, editorService: IEditorService, listService: IListService): URI | undefined {
+	if (URI.isUri(commandArg)) {
+		return commandArg;
 	}
 
 	const focus = getFocus(listService);
@@ -105,7 +105,7 @@ export function getResourceForCommand(resource: URI | object | undefined, listSe
 	return EditorResourceAccessor.getOriginalUri(editorService.activeEditor, { supportSideBySide: SideBySideEditor.PRIMARY });
 }
 
-export function getMultiSelectedResources(resource: URI | object | undefined, listService: IListService, editorService: IEditorService, editorGroupService: IEditorGroupsService, explorerService: IExplorerService): Array<URI> {
+export function getMultiSelectedResources(commandArg: unknown, listService: IListService, editorSerice: IEditorService, editorGroupService: IEditorGroupsService, explorerService: IExplorerService): Array<URI> {
 	const list = listService.lastFocusedList;
 	const element = list?.getHTMLElement();
 	if (element && isActiveElement(element)) {
@@ -124,36 +124,45 @@ export function getMultiSelectedResources(resource: URI | object | undefined, li
 			const focusedElements = list.getFocusedElements();
 			const focus = focusedElements.length ? focusedElements[0] : undefined;
 			let mainUriStr: string | undefined = undefined;
-			if (URI.isUri(resource)) {
-				mainUriStr = resource.toString();
+			if (URI.isUri(commandArg)) {
+				mainUriStr = commandArg.toString();
 			} else if (focus instanceof OpenEditor) {
 				const focusedResource = focus.getResource();
 				mainUriStr = focusedResource ? focusedResource.toString() : undefined;
 			}
 			// We only respect the selection if it contains the main element.
-			if (selection.some(s => s.toString() === mainUriStr)) {
+			const mainIndex = selection.findIndex(s => s.toString() === mainUriStr);
+			if (mainIndex !== -1) {
+				// Move the main resource to the front of the selection.
+				const mainResource = selection[mainIndex];
+				selection.splice(mainIndex, 1);
+				selection.unshift(mainResource);
 				return selection;
 			}
 		}
 	}
 
-	// Check for tabs multiselect.
+	// Check for tabs multiselect
 	const activeGroup = editorGroupService.activeGroup;
 	const selection = activeGroup.selectedEditors;
-	if (selection.length > 1 && URI.isUri(resource)) {
+	if (selection.length > 1 && URI.isUri(commandArg)) {
 		// If the resource is part of the tabs selection, return all selected tabs/resources.
 		// It's possible that multiple tabs are selected but the action was applied to a resource that is not part of the selection.
-		if (selection.some(e => e.matches({ resource }))) {
+		const mainEditorSelectionIndex = selection.findIndex(e => e.matches({ resource: commandArg }));
+		if (mainEditorSelectionIndex !== -1) {
+			const mainEditor = selection[mainEditorSelectionIndex];
+			selection.splice(mainEditorSelectionIndex, 1);
+			selection.unshift(mainEditor);
 			return selection.map(editor => EditorResourceAccessor.getOriginalUri(editor)).filter(uri => !!uri);
 		}
 	}
 
-	const result = getResourceForCommand(resource, listService, editorService);
+	const result = getResourceForCommand(commandArg, editorSerice, listService);
 	return !!result ? [result] : [];
 }
 
-export function getOpenEditorsViewMultiSelection(listService: IListService, editorGroupService: IEditorGroupsService): Array<IEditorIdentifier> | undefined {
-	const list = listService.lastFocusedList;
+export function getOpenEditorsViewMultiSelection(accessor: ServicesAccessor): Array<IEditorIdentifier> | undefined {
+	const list = accessor.get(IListService).lastFocusedList;
 	const element = list?.getHTMLElement();
 	if (element && isActiveElement(element)) {
 		// Open editors view
diff --git a/src/vs/workbench/contrib/files/browser/views/emptyView.ts b/src/vs/workbench/contrib/files/browser/views/emptyView.ts
index eb12481e784..a70269a9cba 100644
--- a/src/vs/workbench/contrib/files/browser/views/emptyView.ts
+++ b/src/vs/workbench/contrib/files/browser/views/emptyView.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { isTemporaryWorkspace, IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
-import { ResourcesDropHandler } from 'vs/workbench/browser/dnd';
-import { listDropOverBackground } from 'vs/platform/theme/common/colorRegistry';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IViewDescriptorService } from 'vs/workbench/common/views';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { isWeb } from 'vs/base/common/platform';
-import { DragAndDropObserver, getWindow } from 'vs/base/browser/dom';
-import { ILocalizedString } from 'vs/platform/action/common/action';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import * as nls from '../../../../../nls.js';
+import { IViewletViewOptions } from '../../../../browser/parts/views/viewsViewlet.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
+import { isTemporaryWorkspace, IWorkspaceContextService, WorkbenchState } from '../../../../../platform/workspace/common/workspace.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { ViewPane } from '../../../../browser/parts/views/viewPane.js';
+import { ResourcesDropHandler } from '../../../../browser/dnd.js';
+import { listDropOverBackground } from '../../../../../platform/theme/common/colorRegistry.js';
+import { ILabelService } from '../../../../../platform/label/common/label.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IViewDescriptorService } from '../../../../common/views.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { isWeb } from '../../../../../base/common/platform.js';
+import { DragAndDropObserver, getWindow } from '../../../../../base/browser/dom.js';
+import { ILocalizedString } from '../../../../../platform/action/common/action.js';
+import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
 
 export class EmptyView extends ViewPane {
 
diff --git a/src/vs/workbench/contrib/files/browser/views/explorerDecorationsProvider.ts b/src/vs/workbench/contrib/files/browser/views/explorerDecorationsProvider.ts
index 77a56c2d34b..31811e8ff3e 100644
--- a/src/vs/workbench/contrib/files/browser/views/explorerDecorationsProvider.ts
+++ b/src/vs/workbench/contrib/files/browser/views/explorerDecorationsProvider.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { Event, Emitter } from 'vs/base/common/event';
-import { localize } from 'vs/nls';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IDecorationsProvider, IDecorationData } from 'vs/workbench/services/decorations/common/decorations';
-import { listInvalidItemForeground, listDeemphasizedForeground } from 'vs/platform/theme/common/colorRegistry';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { explorerRootErrorEmitter } from 'vs/workbench/contrib/files/browser/views/explorerViewer';
-import { ExplorerItem } from 'vs/workbench/contrib/files/common/explorerModel';
-import { IExplorerService } from 'vs/workbench/contrib/files/browser/files';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
+import { URI } from '../../../../../base/common/uri.js';
+import { Event, Emitter } from '../../../../../base/common/event.js';
+import { localize } from '../../../../../nls.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { IDecorationsProvider, IDecorationData } from '../../../../services/decorations/common/decorations.js';
+import { listInvalidItemForeground, listDeemphasizedForeground } from '../../../../../platform/theme/common/colorRegistry.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { explorerRootErrorEmitter } from './explorerViewer.js';
+import { ExplorerItem } from '../../common/explorerModel.js';
+import { IExplorerService } from '../files.js';
+import { toErrorMessage } from '../../../../../base/common/errorMessage.js';
 
 export function provideDecorations(fileStat: ExplorerItem): IDecorationData | undefined {
 	if (fileStat.isRoot && fileStat.error) {
diff --git a/src/vs/workbench/contrib/files/browser/views/explorerView.ts b/src/vs/workbench/contrib/files/browser/views/explorerView.ts
index a94048551aa..f42e1491142 100644
--- a/src/vs/workbench/contrib/files/browser/views/explorerView.ts
+++ b/src/vs/workbench/contrib/files/browser/views/explorerView.ts
@@ -3,59 +3,62 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { URI } from 'vs/base/common/uri';
-import * as perf from 'vs/base/common/performance';
-import { WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification } from 'vs/base/common/actions';
-import { memoize } from 'vs/base/common/decorators';
-import { IFilesConfiguration, ExplorerFolderContext, FilesExplorerFocusedContext, ExplorerFocusedContext, ExplorerRootContext, ExplorerResourceReadonlyContext, ExplorerResourceCut, ExplorerResourceMoveableToTrash, ExplorerCompressedFocusContext, ExplorerCompressedFirstFocusContext, ExplorerCompressedLastFocusContext, ExplorerResourceAvailableEditorIdsContext, VIEW_ID, ExplorerResourceNotReadonlyContext, ViewHasSomeCollapsibleRootItemContext, FoldersViewVisibleContext } from 'vs/workbench/contrib/files/common/files';
-import { FileCopiedContext, NEW_FILE_COMMAND_ID, NEW_FOLDER_COMMAND_ID } from 'vs/workbench/contrib/files/browser/fileActions';
-import * as DOM from 'vs/base/browser/dom';
-import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
-import { ExplorerDecorationsProvider } from 'vs/workbench/contrib/files/browser/views/explorerDecorationsProvider';
-import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IContextKeyService, IContextKey, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { ResourceContextKey } from 'vs/workbench/common/contextkeys';
-import { IDecorationsService } from 'vs/workbench/services/decorations/common/decorations';
-import { WorkbenchCompressibleAsyncDataTree } from 'vs/platform/list/browser/listService';
-import { DelayedDragHandler } from 'vs/base/browser/dnd';
-import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { IViewPaneOptions, ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { ExplorerDelegate, ExplorerDataSource, FilesRenderer, ICompressedNavigationController, FilesFilter, FileSorter, FileDragAndDrop, ExplorerCompressionDelegate, isCompressedFolderName } from 'vs/workbench/contrib/files/browser/views/explorerViewer';
-import { IThemeService, IFileIconTheme } from 'vs/platform/theme/common/themeService';
-import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
-import { ITreeContextMenuEvent, TreeVisibility } from 'vs/base/browser/ui/tree/tree';
-import { MenuId, Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { ExplorerItem, NewExplorerItem } from 'vs/workbench/contrib/files/common/explorerModel';
-import { ResourceLabels } from 'vs/workbench/browser/labels';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IAsyncDataTreeViewState } from 'vs/base/browser/ui/tree/asyncDataTree';
-import { FuzzyScore } from 'vs/base/common/filters';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { IFileService, FileSystemProviderCapabilities } from 'vs/platform/files/common/files';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { Event } from 'vs/base/common/event';
-import { IViewDescriptorService } from 'vs/workbench/common/views';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { EditorResourceAccessor, SideBySideEditor } from 'vs/workbench/common/editor';
-import { IExplorerService, IExplorerView } from 'vs/workbench/contrib/files/browser/files';
-import { Codicon } from 'vs/base/common/codicons';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IEditorResolverService } from 'vs/workbench/services/editor/common/editorResolverService';
-import { EditorOpenSource } from 'vs/platform/editor/common/editor';
-import { ResourceMap } from 'vs/base/common/map';
-import { isInputElement } from 'vs/base/browser/ui/list/listWidget';
-import { AbstractTreePart } from 'vs/base/browser/ui/tree/abstractTree';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import * as nls from '../../../../../nls.js';
+import { URI } from '../../../../../base/common/uri.js';
+import * as perf from '../../../../../base/common/performance.js';
+import { WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification } from '../../../../../base/common/actions.js';
+import { memoize } from '../../../../../base/common/decorators.js';
+import { IFilesConfiguration, ExplorerFolderContext, FilesExplorerFocusedContext, ExplorerFocusedContext, ExplorerRootContext, ExplorerResourceReadonlyContext, ExplorerResourceCut, ExplorerResourceMoveableToTrash, ExplorerCompressedFocusContext, ExplorerCompressedFirstFocusContext, ExplorerCompressedLastFocusContext, ExplorerResourceAvailableEditorIdsContext, VIEW_ID, ExplorerResourceNotReadonlyContext, ViewHasSomeCollapsibleRootItemContext, FoldersViewVisibleContext } from '../../common/files.js';
+import { FileCopiedContext, NEW_FILE_COMMAND_ID, NEW_FOLDER_COMMAND_ID } from '../fileActions.js';
+import * as DOM from '../../../../../base/browser/dom.js';
+import { IWorkbenchLayoutService } from '../../../../services/layout/browser/layoutService.js';
+import { ExplorerDecorationsProvider } from './explorerDecorationsProvider.js';
+import { IWorkspaceContextService, WorkbenchState } from '../../../../../platform/workspace/common/workspace.js';
+import { IConfigurationService, IConfigurationChangeEvent } from '../../../../../platform/configuration/common/configuration.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IProgressService, ProgressLocation } from '../../../../../platform/progress/common/progress.js';
+import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
+import { IContextKeyService, IContextKey, ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { ResourceContextKey } from '../../../../common/contextkeys.js';
+import { IDecorationsService } from '../../../../services/decorations/common/decorations.js';
+import { WorkbenchCompressibleAsyncDataTree } from '../../../../../platform/list/browser/listService.js';
+import { DelayedDragHandler } from '../../../../../base/browser/dnd.js';
+import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from '../../../../services/editor/common/editorService.js';
+import { IViewPaneOptions, ViewPane } from '../../../../browser/parts/views/viewPane.js';
+import { ILabelService } from '../../../../../platform/label/common/label.js';
+import { ExplorerDelegate, ExplorerDataSource, FilesRenderer, ICompressedNavigationController, FilesFilter, FileSorter, FileDragAndDrop, ExplorerCompressionDelegate, isCompressedFolderName } from './explorerViewer.js';
+import { IThemeService, IFileIconTheme } from '../../../../../platform/theme/common/themeService.js';
+import { IWorkbenchThemeService } from '../../../../services/themes/common/workbenchThemeService.js';
+import { ITreeContextMenuEvent, TreeVisibility } from '../../../../../base/browser/ui/tree/tree.js';
+import { MenuId, Action2, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { ExplorerItem, NewExplorerItem } from '../../common/explorerModel.js';
+import { ResourceLabels } from '../../../../browser/labels.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { IAsyncDataTreeViewState, IAsyncFindProvider } from '../../../../../base/browser/ui/tree/asyncDataTree.js';
+import { fuzzyScore, FuzzyScore } from '../../../../../base/common/filters.js';
+import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js';
+import { IFileService, FileSystemProviderCapabilities } from '../../../../../platform/files/common/files.js';
+import { IDisposable } from '../../../../../base/common/lifecycle.js';
+import { Event } from '../../../../../base/common/event.js';
+import { IViewDescriptorService } from '../../../../common/views.js';
+import { IViewsService } from '../../../../services/views/common/viewsService.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
+import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.js';
+import { EditorResourceAccessor, SideBySideEditor } from '../../../../common/editor.js';
+import { IExplorerService, IExplorerView } from '../files.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { IEditorResolverService } from '../../../../services/editor/common/editorResolverService.js';
+import { EditorOpenSource } from '../../../../../platform/editor/common/editor.js';
+import { ResourceMap } from '../../../../../base/common/map.js';
+import { AbstractTreePart, ITreeFindToggleContribution } from '../../../../../base/browser/ui/tree/abstractTree.js';
+import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
+import { basename, relativePath } from '../../../../../base/common/resources.js';
+import { IFilesConfigurationService } from '../../../../services/filesConfiguration/common/filesConfigurationService.js';
+import { getExcludes, ISearchComplete, ISearchConfiguration, ISearchService, QueryType } from '../../../../services/search/common/search.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
 
 
 function hasExpandedRootChild(tree: WorkbenchCompressibleAsyncDataTree<ExplorerItem | ExplorerItem[], ExplorerItem, FuzzyScore>, treeInput: ExplorerItem[]): boolean {
@@ -151,6 +154,115 @@ export interface IExplorerViewPaneOptions extends IViewPaneOptions {
 	delegate: IExplorerViewContainerDelegate;
 }
 
+const explorerFuzzyMatch = {
+	id: 'fuzzyMatch',
+	title: 'Fuzzy Match',
+	icon: Codicon.searchFuzzy,
+	isChecked: false
+};
+
+class ExplorerFindProvider implements IAsyncFindProvider<ExplorerItem> {
+
+	readonly toggles: ITreeFindToggleContribution[] = [explorerFuzzyMatch];
+	readonly placeholder: string = nls.localize('type to search files', "Type to search files");
+
+	constructor(
+		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
+		@ISearchService private readonly searchService: ISearchService,
+		@IFileService private readonly fileService: IFileService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IFilesConfigurationService private readonly filesConfigService: IFilesConfigurationService,
+		@IProgressService private readonly progressService: IProgressService,
+		@IExplorerService private readonly explorerService: IExplorerService,
+	) { }
+
+	async *getFindResults(pattern: string, sessionId: number, token: CancellationToken, toggleStates: ITreeFindToggleContribution[]): AsyncIterable<ExplorerItem> {
+		const isFuzzyMatch = toggleStates.find(t => t.id === explorerFuzzyMatch.id)?.isChecked!!;
+
+		const workspaceFolders = this.workspaceContextService.getWorkspace().folders;
+		const folderPromises = Promise.all(workspaceFolders.map(async folder => {
+			// Get exclude settings used for search
+			const searchExcludePattern = getExcludes(this.configurationService.getValue<ISearchConfiguration>({ resource: folder.uri })) || {};
+
+			const result = await this.searchService.fileSearch({
+				folderQueries: [{ folder: folder.uri }],
+				type: QueryType.File,
+				shouldGlobMatchFilePattern: !isFuzzyMatch,
+				filePattern: isFuzzyMatch ? pattern : `**/*${pattern}*`,
+				maxResults: 512,
+				sortByScore: true,
+				cacheKey: `explorerfindprovider:${sessionId}`,
+				excludePattern: searchExcludePattern,
+			}, token);
+
+			return { folder: folder.uri, result };
+		}));
+
+		const folderResults = await this.progressService.withProgress({
+			location: ProgressLocation.Explorer,
+			delay: 1000,
+		}, _progress => folderPromises);
+
+		if (token.isCancellationRequested) {
+			return;
+		}
+
+		yield* this.createResultItems(folderResults, pattern, isFuzzyMatch);
+	}
+
+	private async *createResultItems(folderResults: { folder: URI; result: ISearchComplete }[], pattern: string, isFuzzyMatch: boolean): AsyncIterable<ExplorerItem> {
+		const lowercasePattern = pattern.toLowerCase();
+
+		for (const { folder, result } of folderResults) {
+			const folderRoot = new ExplorerItem(folder, this.fileService, this.configurationService, this.filesConfigService, undefined);
+
+			for (const file of result.results) {
+				// If this is a fuzzy search, results can be very poor, so we need to filter them out
+				if (isFuzzyMatch) {
+					const baseName = basename(file.resource);
+					const score = fuzzyScore(pattern, lowercasePattern, 0, baseName, baseName.toLowerCase(), 0, { firstMatchCanBeWeak: true, boostFullMatch: true });
+					if (!score) {
+						break; // Results are sorted by score, so we can stop here
+					}
+				}
+
+				const item = this.createItem(file.resource, folderRoot);
+				if (item) {
+					yield item;
+				}
+			}
+		}
+	}
+
+	private createItem(resource: URI, root: ExplorerItem): ExplorerItem | undefined {
+		const relativePathToRoot = relativePath(root.resource, resource);
+		if (!relativePathToRoot) {
+			return undefined;
+		}
+
+		let currentItem = root;
+		let currentResource = root.resource;
+		const pathSegments = relativePathToRoot.split('/');
+		for (const stat of pathSegments) {
+			currentResource = currentResource.with({ path: `${currentResource.path}/${stat}` });
+
+			let child = currentItem.children.get(stat);
+			if (!child) {
+				const isDirectory = pathSegments[pathSegments.length - 1] !== stat;
+				child = new ExplorerItem(currentResource, this.fileService, this.configurationService, this.filesConfigService, currentItem, isDirectory);
+			}
+
+			currentItem = child;
+		}
+
+		return currentItem;
+	}
+
+	revealResultInTree(findElement: ExplorerItem): void {
+		this.explorerService.select(findElement.resource, true);
+	}
+}
+
 export class ExplorerView extends ViewPane implements IExplorerView {
 	static readonly TREE_VIEW_STATE_STORAGE_KEY: string = 'workbench.explorer.treeViewState';
 
@@ -489,7 +601,8 @@ export class ExplorerView extends ViewPane implements IExplorerView {
 				return false;
 			},
 			paddingBottom: ExplorerDelegate.ITEM_HEIGHT,
-			overrideStyles: this.getLocationBasedColors().listOverrideStyles
+			overrideStyles: this.getLocationBasedColors().listOverrideStyles,
+			findResultsProvider: this.instantiationService.createInstance(ExplorerFindProvider),
 		});
 		this._register(this.tree);
 		this._register(this.themeService.onDidColorThemeChange(() => this.tree.rerender()));
@@ -602,7 +715,7 @@ export class ExplorerView extends ViewPane implements IExplorerView {
 	}
 
 	private async onContextMenu(e: ITreeContextMenuEvent<ExplorerItem>): Promise<void> {
-		if (isInputElement(e.browserEvent.target as HTMLElement)) {
+		if (DOM.isEditableElement(e.browserEvent.target as HTMLElement)) {
 			return;
 		}
 
@@ -660,7 +773,7 @@ export class ExplorerView extends ViewPane implements IExplorerView {
 		this.setContextKeys(stat);
 
 		if (stat) {
-			const enableTrash = this.configurationService.getValue<IFilesConfiguration>().files.enableTrash;
+			const enableTrash = Boolean(this.configurationService.getValue<IFilesConfiguration>().files?.enableTrash);
 			const hasCapability = this.fileService.hasCapability(stat.resource, FileSystemProviderCapabilities.Trash);
 			this.resourceMoveableToTrash.set(enableTrash && hasCapability);
 		} else {
diff --git a/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts b/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
index bda9eb9b2aa..975f494cbe1 100644
--- a/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
+++ b/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
@@ -3,68 +3,68 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
-import * as DOM from 'vs/base/browser/dom';
-import * as glob from 'vs/base/common/glob';
-import { IListVirtualDelegate, ListDragOverEffectPosition, ListDragOverEffectType } from 'vs/base/browser/ui/list/list';
-import { IProgressService, ProgressLocation, } from 'vs/platform/progress/common/progress';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { IFileService, FileKind, FileOperationError, FileOperationResult, FileChangeType } from 'vs/platform/files/common/files';
-import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
-import { isTemporaryWorkspace, IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { IDisposable, Disposable, dispose, toDisposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { IFileLabelOptions, IResourceLabel, ResourceLabels } from 'vs/workbench/browser/labels';
-import { ITreeNode, ITreeFilter, TreeVisibility, IAsyncDataSource, ITreeSorter, ITreeDragAndDrop, ITreeDragOverReaction, TreeDragOverBubble } from 'vs/base/browser/ui/tree/tree';
-import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IConfigurationChangeEvent, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IFilesConfiguration, UndoConfirmLevel } from 'vs/workbench/contrib/files/common/files';
-import { dirname, joinPath, distinctParents } from 'vs/base/common/resources';
-import { InputBox, MessageType } from 'vs/base/browser/ui/inputbox/inputBox';
-import { localize } from 'vs/nls';
-import { createSingleCallFunction } from 'vs/base/common/functional';
-import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { equals, deepClone } from 'vs/base/common/objects';
-import * as path from 'vs/base/common/path';
-import { ExplorerItem, NewExplorerItem } from 'vs/workbench/contrib/files/common/explorerModel';
-import { compareFileExtensionsDefault, compareFileNamesDefault, compareFileNamesUpper, compareFileExtensionsUpper, compareFileNamesLower, compareFileExtensionsLower, compareFileNamesUnicode, compareFileExtensionsUnicode } from 'vs/base/common/comparers';
-import { CodeDataTransfers, containsDragType } from 'vs/platform/dnd/browser/dnd';
-import { fillEditorsDragData } from 'vs/workbench/browser/dnd';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IDragAndDropData, DataTransfers } from 'vs/base/browser/dnd';
-import { Schemas } from 'vs/base/common/network';
-import { NativeDragAndDropData, ExternalElementsDragAndDropData, ElementsDragAndDropData, ListViewTargetSector } from 'vs/base/browser/ui/list/listView';
-import { isMacintosh, isWeb } from 'vs/base/common/platform';
-import { IDialogService, getFileNamesMessage } from 'vs/platform/dialogs/common/dialogs';
-import { IWorkspaceEditingService } from 'vs/workbench/services/workspaces/common/workspaceEditing';
-import { URI } from 'vs/base/common/uri';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IWorkspaceFolderCreationData } from 'vs/platform/workspaces/common/workspaces';
-import { findValidPasteFileTarget } from 'vs/workbench/contrib/files/browser/fileActions';
-import { FuzzyScore, createMatches } from 'vs/base/common/filters';
-import { Emitter, Event, EventMultiplexer } from 'vs/base/common/event';
-import { ITreeCompressionDelegate } from 'vs/base/browser/ui/tree/asyncDataTree';
-import { ICompressibleTreeRenderer } from 'vs/base/browser/ui/tree/objectTree';
-import { ICompressedTreeNode } from 'vs/base/browser/ui/tree/compressedObjectTreeModel';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { isNumber } from 'vs/base/common/types';
-import { IEditableData } from 'vs/workbench/common/views';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { ResourceFileEdit } from 'vs/editor/browser/services/bulkEditService';
-import { IExplorerService } from 'vs/workbench/contrib/files/browser/files';
-import { BrowserFileUpload, ExternalFileImport, getMultipleFilesOverwriteConfirm } from 'vs/workbench/contrib/files/browser/fileImportExport';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { WebFileSystemAccess } from 'vs/platform/files/browser/webFileSystemAccess';
-import { IgnoreFile } from 'vs/workbench/services/search/common/ignoreFile';
-import { ResourceSet } from 'vs/base/common/map';
-import { TernarySearchTree } from 'vs/base/common/ternarySearchTree';
-import { defaultInputBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { timeout } from 'vs/base/common/async';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { mainWindow } from 'vs/base/browser/window';
-import { IExplorerFileContribution, explorerFileContribRegistry } from 'vs/workbench/contrib/files/browser/explorerFileContrib';
+import { IListAccessibilityProvider } from '../../../../../base/browser/ui/list/listWidget.js';
+import * as DOM from '../../../../../base/browser/dom.js';
+import * as glob from '../../../../../base/common/glob.js';
+import { IListVirtualDelegate, ListDragOverEffectPosition, ListDragOverEffectType } from '../../../../../base/browser/ui/list/list.js';
+import { IProgressService, ProgressLocation, } from '../../../../../platform/progress/common/progress.js';
+import { INotificationService, Severity } from '../../../../../platform/notification/common/notification.js';
+import { IFileService, FileKind, FileOperationError, FileOperationResult, FileChangeType } from '../../../../../platform/files/common/files.js';
+import { IWorkbenchLayoutService } from '../../../../services/layout/browser/layoutService.js';
+import { isTemporaryWorkspace, IWorkspaceContextService, WorkbenchState } from '../../../../../platform/workspace/common/workspace.js';
+import { IDisposable, Disposable, dispose, toDisposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { KeyCode } from '../../../../../base/common/keyCodes.js';
+import { IFileLabelOptions, IResourceLabel, ResourceLabels } from '../../../../browser/labels.js';
+import { ITreeNode, ITreeFilter, TreeVisibility, IAsyncDataSource, ITreeSorter, ITreeDragAndDrop, ITreeDragOverReaction, TreeDragOverBubble } from '../../../../../base/browser/ui/tree/tree.js';
+import { IContextMenuService, IContextViewService } from '../../../../../platform/contextview/browser/contextView.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { IConfigurationChangeEvent, IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IFilesConfiguration, UndoConfirmLevel } from '../../common/files.js';
+import { dirname, joinPath, distinctParents } from '../../../../../base/common/resources.js';
+import { InputBox, MessageType } from '../../../../../base/browser/ui/inputbox/inputBox.js';
+import { localize } from '../../../../../nls.js';
+import { createSingleCallFunction } from '../../../../../base/common/functional.js';
+import { IKeyboardEvent } from '../../../../../base/browser/keyboardEvent.js';
+import { equals, deepClone } from '../../../../../base/common/objects.js';
+import * as path from '../../../../../base/common/path.js';
+import { ExplorerItem, NewExplorerItem } from '../../common/explorerModel.js';
+import { compareFileExtensionsDefault, compareFileNamesDefault, compareFileNamesUpper, compareFileExtensionsUpper, compareFileNamesLower, compareFileExtensionsLower, compareFileNamesUnicode, compareFileExtensionsUnicode } from '../../../../../base/common/comparers.js';
+import { CodeDataTransfers, containsDragType } from '../../../../../platform/dnd/browser/dnd.js';
+import { fillEditorsDragData } from '../../../../browser/dnd.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IDragAndDropData, DataTransfers } from '../../../../../base/browser/dnd.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { NativeDragAndDropData, ExternalElementsDragAndDropData, ElementsDragAndDropData, ListViewTargetSector } from '../../../../../base/browser/ui/list/listView.js';
+import { isMacintosh, isWeb } from '../../../../../base/common/platform.js';
+import { IDialogService, getFileNamesMessage } from '../../../../../platform/dialogs/common/dialogs.js';
+import { IWorkspaceEditingService } from '../../../../services/workspaces/common/workspaceEditing.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { IWorkspaceFolderCreationData } from '../../../../../platform/workspaces/common/workspaces.js';
+import { findValidPasteFileTarget } from '../fileActions.js';
+import { FuzzyScore, createMatches } from '../../../../../base/common/filters.js';
+import { Emitter, Event, EventMultiplexer } from '../../../../../base/common/event.js';
+import { ITreeCompressionDelegate } from '../../../../../base/browser/ui/tree/asyncDataTree.js';
+import { ICompressibleTreeRenderer } from '../../../../../base/browser/ui/tree/objectTree.js';
+import { ICompressedTreeNode } from '../../../../../base/browser/ui/tree/compressedObjectTreeModel.js';
+import { ILabelService } from '../../../../../platform/label/common/label.js';
+import { isNumber } from '../../../../../base/common/types.js';
+import { IEditableData } from '../../../../common/views.js';
+import { EditorInput } from '../../../../common/editor/editorInput.js';
+import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.js';
+import { ResourceFileEdit } from '../../../../../editor/browser/services/bulkEditService.js';
+import { IExplorerService } from '../files.js';
+import { BrowserFileUpload, ExternalFileImport, getMultipleFilesOverwriteConfirm } from '../fileImportExport.js';
+import { toErrorMessage } from '../../../../../base/common/errorMessage.js';
+import { WebFileSystemAccess } from '../../../../../platform/files/browser/webFileSystemAccess.js';
+import { IgnoreFile } from '../../../../services/search/common/ignoreFile.js';
+import { ResourceSet } from '../../../../../base/common/map.js';
+import { TernarySearchTree } from '../../../../../base/common/ternarySearchTree.js';
+import { defaultInputBoxStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
+import { timeout } from '../../../../../base/common/async.js';
+import { IFilesConfigurationService } from '../../../../services/filesConfiguration/common/filesConfigurationService.js';
+import { mainWindow } from '../../../../../base/browser/window.js';
+import { IExplorerFileContribution, explorerFileContribRegistry } from '../explorerFileContrib.js';
 
 export class ExplorerDelegate implements IListVirtualDelegate<ExplorerItem> {
 
@@ -94,6 +94,31 @@ export class ExplorerDataSource implements IAsyncDataSource<ExplorerItem | Explo
 		@IFilesConfigurationService private readonly filesConfigService: IFilesConfigurationService
 	) { }
 
+	getParent(element: ExplorerItem): ExplorerItem {
+		const folders = this.contextService.getWorkspace().folders;
+		const isMultiRoot = folders.length > 1;
+
+		if (isMultiRoot) {
+			// If we have multiple folders, the root is a workspace folder
+			// Workspace folders are rendered and can be returned directly
+			if (element.isRoot) {
+				return element;
+			} else if (element.parent) {
+				return element.parent;
+			}
+		} else if (element.parent) {
+			// If we have a single folder, the root the workspace folder
+			// The workspace folder is not rendered, so all it's children are tree roots
+			if (element.parent.isRoot) {
+				return element;
+			} else {
+				return element.parent;
+			}
+		}
+
+		throw new Error('getParent only supported for cached parents');
+	}
+
 	hasChildren(element: ExplorerItem | ExplorerItem[]): boolean {
 		// don't render nest parents as containing children when all the children are filtered out
 		return Array.isArray(element) || element.hasChildren((stat) => this.fileFilter.filter(stat, TreeVisibility.Visible));
@@ -448,7 +473,7 @@ export class FilesRenderer implements ICompressibleTreeRenderer<ExplorerItem, Fu
 			fileKind: stat.isRoot ? FileKind.ROOT_FOLDER : stat.isDirectory ? FileKind.FOLDER : FileKind.FILE,
 			extraClasses: realignNestedChildren ? [...extraClasses, 'align-nest-icon-with-parent-icon'] : extraClasses,
 			fileDecorations: this.config.explorer.decorations,
-			matches: createMatches(filterData),
+			matches: stat.isDirectory ? [] : createMatches(filterData),
 			separator: this.labelService.getSeparator(stat.resource.scheme, stat.resource.authority),
 			domId
 		});
@@ -880,6 +905,10 @@ export class FileSorter implements ITreeSorter<ExplorerItem> {
 
 		const sortOrder = this.explorerService.sortOrderConfiguration.sortOrder;
 		const lexicographicOptions = this.explorerService.sortOrderConfiguration.lexicographicOptions;
+		const reverse = this.explorerService.sortOrderConfiguration.reverse;
+		if (reverse) {
+			[statA, statB] = [statB, statA];
+		}
 
 		let compareFileNames;
 		let compareFileExtensions;
diff --git a/src/vs/workbench/contrib/files/browser/views/openEditorsView.ts b/src/vs/workbench/contrib/files/browser/views/openEditorsView.ts
index a5de264bfcf..d21998d3bb6 100644
--- a/src/vs/workbench/contrib/files/browser/views/openEditorsView.ts
+++ b/src/vs/workbench/contrib/files/browser/views/openEditorsView.ts
@@ -3,58 +3,59 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/openeditors';
-import * as nls from 'vs/nls';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { IAction, ActionRunner, WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification } from 'vs/base/common/actions';
-import * as dom from 'vs/base/browser/dom';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IEditorGroupsService, IEditorGroup, GroupsOrder, GroupOrientation } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { Verbosity, EditorResourceAccessor, SideBySideEditor, IEditorIdentifier, GroupModelChangeKind, preventEditorClose, EditorCloseMethod } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { SaveAllInGroupAction, CloseGroupAction } from 'vs/workbench/contrib/files/browser/fileActions';
-import { OpenEditorsFocusedContext, ExplorerFocusedContext, IFilesConfiguration, OpenEditor } from 'vs/workbench/contrib/files/common/files';
-import { CloseAllEditorsAction, CloseEditorAction, UnpinEditorAction } from 'vs/workbench/browser/parts/editor/editorActions';
-import { IContextKeyService, IContextKey, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { asCssVariable, badgeBackground, badgeForeground, contrastBorder } from 'vs/platform/theme/common/colorRegistry';
-import { WorkbenchList } from 'vs/platform/list/browser/listService';
-import { IListVirtualDelegate, IListRenderer, IListContextMenuEvent, IListDragAndDrop, IListDragOverReaction, ListDragOverEffectPosition, ListDragOverEffectType } from 'vs/base/browser/ui/list/list';
-import { ResourceLabels, IResourceLabel } from 'vs/workbench/browser/labels';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { DisposableMap, IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { MenuId, Action2, registerAction2, MenuRegistry } from 'vs/platform/actions/common/actions';
-import { OpenEditorsDirtyEditorContext, OpenEditorsGroupContext, OpenEditorsReadonlyEditorContext, SAVE_ALL_LABEL, SAVE_ALL_COMMAND_ID, NEW_UNTITLED_FILE_COMMAND_ID } from 'vs/workbench/contrib/files/browser/fileConstants';
-import { ResourceContextKey, MultipleEditorGroupsContext } from 'vs/workbench/common/contextkeys';
-import { CodeDataTransfers, containsDragType } from 'vs/platform/dnd/browser/dnd';
-import { ResourcesDropHandler, fillEditorsDragData } from 'vs/workbench/browser/dnd';
-import { ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
-import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
-import { IDragAndDropData, DataTransfers } from 'vs/base/browser/dnd';
-import { memoize } from 'vs/base/common/decorators';
-import { ElementsDragAndDropData, ListViewTargetSector, NativeDragAndDropData } from 'vs/base/browser/ui/list/listView';
-import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
-import { IWorkingCopy, WorkingCopyCapabilities } from 'vs/workbench/services/workingCopy/common/workingCopy';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { IViewDescriptorService } from 'vs/workbench/common/views';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { Orientation } from 'vs/base/browser/ui/splitview/splitview';
-import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
-import { compareFileNamesDefault } from 'vs/base/common/comparers';
-import { Codicon } from 'vs/base/common/codicons';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { Schemas } from 'vs/base/common/network';
-import { extUriIgnorePathCase } from 'vs/base/common/resources';
-import { ILocalizedString } from 'vs/platform/action/common/action';
-import { mainWindow } from 'vs/base/browser/window';
-import { EditorGroupView } from 'vs/workbench/browser/parts/editor/editorGroupView';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import './media/openeditors.css';
+import * as nls from '../../../../../nls.js';
+import { RunOnceScheduler } from '../../../../../base/common/async.js';
+import { IAction, ActionRunner, WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification } from '../../../../../base/common/actions.js';
+import * as dom from '../../../../../base/browser/dom.js';
+import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IEditorGroupsService, IEditorGroup, GroupsOrder, GroupOrientation } from '../../../../services/editor/common/editorGroupsService.js';
+import { IConfigurationService, IConfigurationChangeEvent } from '../../../../../platform/configuration/common/configuration.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { Verbosity, EditorResourceAccessor, SideBySideEditor, IEditorIdentifier, GroupModelChangeKind, preventEditorClose, EditorCloseMethod } from '../../../../common/editor.js';
+import { EditorInput } from '../../../../common/editor/editorInput.js';
+import { SaveAllInGroupAction, CloseGroupAction } from '../fileActions.js';
+import { OpenEditorsFocusedContext, ExplorerFocusedContext, IFilesConfiguration, OpenEditor } from '../../common/files.js';
+import { CloseAllEditorsAction, CloseEditorAction, UnpinEditorAction } from '../../../../browser/parts/editor/editorActions.js';
+import { IContextKeyService, ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { asCssVariable, badgeBackground, badgeForeground, contrastBorder } from '../../../../../platform/theme/common/colorRegistry.js';
+import { WorkbenchList } from '../../../../../platform/list/browser/listService.js';
+import { IListVirtualDelegate, IListRenderer, IListContextMenuEvent, IListDragAndDrop, IListDragOverReaction, ListDragOverEffectPosition, ListDragOverEffectType } from '../../../../../base/browser/ui/list/list.js';
+import { ResourceLabels, IResourceLabel } from '../../../../browser/labels.js';
+import { ActionBar } from '../../../../../base/browser/ui/actionbar/actionbar.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { DisposableMap, IDisposable, dispose } from '../../../../../base/common/lifecycle.js';
+import { MenuId, Action2, registerAction2, MenuRegistry } from '../../../../../platform/actions/common/actions.js';
+import { OpenEditorsDirtyEditorContext, OpenEditorsGroupContext, OpenEditorsReadonlyEditorContext, SAVE_ALL_LABEL, SAVE_ALL_COMMAND_ID, NEW_UNTITLED_FILE_COMMAND_ID, OpenEditorsSelectedFileOrUntitledContext } from '../fileConstants.js';
+import { ResourceContextKey, MultipleEditorGroupsContext } from '../../../../common/contextkeys.js';
+import { CodeDataTransfers, containsDragType } from '../../../../../platform/dnd/browser/dnd.js';
+import { ResourcesDropHandler, fillEditorsDragData } from '../../../../browser/dnd.js';
+import { ViewPane } from '../../../../browser/parts/views/viewPane.js';
+import { IViewletViewOptions } from '../../../../browser/parts/views/viewsViewlet.js';
+import { IDragAndDropData, DataTransfers } from '../../../../../base/browser/dnd.js';
+import { memoize } from '../../../../../base/common/decorators.js';
+import { ElementsDragAndDropData, ListViewTargetSector, NativeDragAndDropData } from '../../../../../base/browser/ui/list/listView.js';
+import { IWorkingCopyService } from '../../../../services/workingCopy/common/workingCopyService.js';
+import { IWorkingCopy, WorkingCopyCapabilities } from '../../../../services/workingCopy/common/workingCopy.js';
+import { IFilesConfigurationService } from '../../../../services/filesConfiguration/common/filesConfigurationService.js';
+import { IViewDescriptorService } from '../../../../common/views.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
+import { Orientation } from '../../../../../base/browser/ui/splitview/splitview.js';
+import { IListAccessibilityProvider } from '../../../../../base/browser/ui/list/listWidget.js';
+import { compareFileNamesDefault } from '../../../../../base/common/comparers.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { extUriIgnorePathCase } from '../../../../../base/common/resources.js';
+import { ILocalizedString } from '../../../../../platform/action/common/action.js';
+import { mainWindow } from '../../../../../base/browser/window.js';
+import { EditorGroupView } from '../../../../browser/parts/editor/editorGroupView.js';
+import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
 
 const $ = dom.$;
 
@@ -74,10 +75,6 @@ export class OpenEditorsView extends ViewPane {
 	private needsRefresh = false;
 	private elements: (OpenEditor | IEditorGroup)[] = [];
 	private sortOrder: 'editorOrder' | 'alphabetical' | 'fullPath';
-	private resourceContext!: ResourceContextKey;
-	private groupFocusedContext!: IContextKey<boolean>;
-	private dirtyEditorFocusedContext!: IContextKey<boolean>;
-	private readonlyEditorFocusedContext!: IContextKey<boolean>;
 	private blockFocusActiveEditorTracking = false;
 
 	constructor(
@@ -95,6 +92,7 @@ export class OpenEditorsView extends ViewPane {
 		@IWorkingCopyService private readonly workingCopyService: IWorkingCopyService,
 		@IFilesConfigurationService private readonly filesConfigurationService: IFilesConfigurationService,
 		@IOpenerService openerService: IOpenerService,
+		@IFileService private readonly fileService: IFileService
 	) {
 		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
 
@@ -245,32 +243,8 @@ export class OpenEditorsView extends ViewPane {
 
 		this.updateSize();
 
-		// Bind context keys
-		OpenEditorsFocusedContext.bindTo(this.list.contextKeyService);
-		ExplorerFocusedContext.bindTo(this.list.contextKeyService);
-
-		this.resourceContext = this.instantiationService.createInstance(ResourceContextKey);
-		this._register(this.resourceContext);
-		this.groupFocusedContext = OpenEditorsGroupContext.bindTo(this.contextKeyService);
-		this.dirtyEditorFocusedContext = OpenEditorsDirtyEditorContext.bindTo(this.contextKeyService);
-		this.readonlyEditorFocusedContext = OpenEditorsReadonlyEditorContext.bindTo(this.contextKeyService);
-
+		this.handleContextKeys();
 		this._register(this.list.onContextMenu(e => this.onListContextMenu(e)));
-		this._register(this.list.onDidChangeFocus(e => {
-			this.resourceContext.reset();
-			this.groupFocusedContext.reset();
-			this.dirtyEditorFocusedContext.reset();
-			this.readonlyEditorFocusedContext.reset();
-			const element = e.elements.length ? e.elements[0] : undefined;
-			if (element instanceof OpenEditor) {
-				const resource = element.getResource();
-				this.dirtyEditorFocusedContext.set(element.editor.isDirty() && !element.editor.isSaving());
-				this.readonlyEditorFocusedContext.set(!!element.editor.isReadonly());
-				this.resourceContext.set(resource ?? null);
-			} else if (!!element) {
-				this.groupFocusedContext.set(true);
-			}
-		}));
 
 		// Open when selecting via keyboard
 		this._register(this.list.onMouseMiddleClick(e => {
@@ -318,6 +292,52 @@ export class OpenEditorsView extends ViewPane {
 		}));
 	}
 
+	private handleContextKeys() {
+		if (!this.list) {
+			return;
+		}
+
+		// Bind context keys
+		OpenEditorsFocusedContext.bindTo(this.list.contextKeyService);
+		ExplorerFocusedContext.bindTo(this.list.contextKeyService);
+
+		const groupFocusedContext = OpenEditorsGroupContext.bindTo(this.contextKeyService);
+		const dirtyEditorFocusedContext = OpenEditorsDirtyEditorContext.bindTo(this.contextKeyService);
+		const readonlyEditorFocusedContext = OpenEditorsReadonlyEditorContext.bindTo(this.contextKeyService);
+		const openEditorsSelectedFileOrUntitledContext = OpenEditorsSelectedFileOrUntitledContext.bindTo(this.contextKeyService);
+
+		const resourceContext = this.instantiationService.createInstance(ResourceContextKey);
+		this._register(resourceContext);
+
+		this._register(this.list.onDidChangeFocus(e => {
+			resourceContext.reset();
+			groupFocusedContext.reset();
+			dirtyEditorFocusedContext.reset();
+			readonlyEditorFocusedContext.reset();
+
+			const element = e.elements.length ? e.elements[0] : undefined;
+			if (element instanceof OpenEditor) {
+				const resource = element.getResource();
+				dirtyEditorFocusedContext.set(element.editor.isDirty() && !element.editor.isSaving());
+				readonlyEditorFocusedContext.set(!!element.editor.isReadonly());
+				resourceContext.set(resource ?? null);
+			} else if (!!element) {
+				groupFocusedContext.set(true);
+			}
+		}));
+
+		this._register(this.list.onDidChangeSelection(e => {
+			const selectedAreFileOrUntitled = e.elements.every(e => {
+				if (e instanceof OpenEditor) {
+					const resource = e.getResource();
+					return resource && (resource.scheme === Schemas.untitled || this.fileService.hasProvider(resource));
+				}
+				return false;
+			});
+			openEditorsSelectedFileOrUntitledContext.set(selectedAreFileOrUntitled);
+		}));
+	}
+
 	override focus(): void {
 		super.focus();
 
@@ -840,6 +860,7 @@ registerAction2(class extends Action2 {
 		const editorGroupService = accessor.get(IEditorGroupsService);
 		const newOrientation = (editorGroupService.orientation === GroupOrientation.VERTICAL) ? GroupOrientation.HORIZONTAL : GroupOrientation.VERTICAL;
 		editorGroupService.setGroupOrientation(newOrientation);
+		editorGroupService.activeGroup.focus();
 	}
 });
 
diff --git a/src/vs/workbench/contrib/files/browser/workspaceWatcher.ts b/src/vs/workbench/contrib/files/browser/workspaceWatcher.ts
index 3cba8364293..50ff1ee22ee 100644
--- a/src/vs/workbench/contrib/files/browser/workspaceWatcher.ts
+++ b/src/vs/workbench/contrib/files/browser/workspaceWatcher.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { IDisposable, Disposable, dispose, DisposableStore } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
-import { IFileService, IFilesConfiguration } from 'vs/platform/files/common/files';
-import { IWorkspaceContextService, IWorkspaceFolder, IWorkspaceFoldersChangeEvent } from 'vs/platform/workspace/common/workspace';
-import { ResourceMap } from 'vs/base/common/map';
-import { INotificationService, Severity, NeverShowAgainScope, NotificationPriority } from 'vs/platform/notification/common/notification';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { isAbsolute } from 'vs/base/common/path';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { localize } from '../../../../nls.js';
+import { IDisposable, Disposable, dispose, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IConfigurationService, IConfigurationChangeEvent } from '../../../../platform/configuration/common/configuration.js';
+import { IFileService, IFilesConfiguration } from '../../../../platform/files/common/files.js';
+import { IWorkspaceContextService, IWorkspaceFolder, IWorkspaceFoldersChangeEvent } from '../../../../platform/workspace/common/workspace.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { INotificationService, Severity, NeverShowAgainScope, NotificationPriority } from '../../../../platform/notification/common/notification.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { isAbsolute } from '../../../../base/common/path.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 
 export class WorkspaceWatcher extends Disposable {
 
diff --git a/src/vs/workbench/contrib/files/common/dirtyFilesIndicator.ts b/src/vs/workbench/contrib/files/common/dirtyFilesIndicator.ts
index 7e99a23b0ed..c0cdc3cf1ca 100644
--- a/src/vs/workbench/contrib/files/common/dirtyFilesIndicator.ts
+++ b/src/vs/workbench/contrib/files/common/dirtyFilesIndicator.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { VIEWLET_ID } from 'vs/workbench/contrib/files/common/files';
-import { Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity';
-import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
-import { IWorkingCopy, WorkingCopyCapabilities } from 'vs/workbench/services/workingCopy/common/workingCopy';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
+import * as nls from '../../../../nls.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { VIEWLET_ID } from './files.js';
+import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { IActivityService, NumberBadge } from '../../../services/activity/common/activity.js';
+import { IWorkingCopyService } from '../../../services/workingCopy/common/workingCopyService.js';
+import { IWorkingCopy, WorkingCopyCapabilities } from '../../../services/workingCopy/common/workingCopy.js';
+import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.js';
 
 export class DirtyFilesIndicator extends Disposable implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/contrib/files/common/explorerModel.ts b/src/vs/workbench/contrib/files/common/explorerModel.ts
index 513b29151ef..52edacfa6ab 100644
--- a/src/vs/workbench/contrib/files/common/explorerModel.ts
+++ b/src/vs/workbench/contrib/files/common/explorerModel.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { isEqual } from 'vs/base/common/extpath';
-import { posix } from 'vs/base/common/path';
-import { ResourceMap } from 'vs/base/common/map';
-import { IFileStat, IFileService, FileSystemProviderCapabilities } from 'vs/platform/files/common/files';
-import { rtrim, startsWithIgnoreCase, equalsIgnoreCase } from 'vs/base/common/strings';
-import { coalesce } from 'vs/base/common/arrays';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { memoize } from 'vs/base/common/decorators';
-import { Emitter, Event } from 'vs/base/common/event';
-import { joinPath, isEqualOrParent, basenameOrAuthority } from 'vs/base/common/resources';
-import { IFilesConfiguration, SortOrder } from 'vs/workbench/contrib/files/common/files';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { ExplorerFileNestingTrie } from 'vs/workbench/contrib/files/common/explorerFileNestingTrie';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { assertIsDefined } from 'vs/base/common/types';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
+import { URI } from '../../../../base/common/uri.js';
+import { isEqual } from '../../../../base/common/extpath.js';
+import { posix } from '../../../../base/common/path.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { IFileStat, IFileService, FileSystemProviderCapabilities } from '../../../../platform/files/common/files.js';
+import { rtrim, startsWithIgnoreCase, equalsIgnoreCase } from '../../../../base/common/strings.js';
+import { coalesce } from '../../../../base/common/arrays.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { IDisposable, dispose } from '../../../../base/common/lifecycle.js';
+import { memoize } from '../../../../base/common/decorators.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { joinPath, isEqualOrParent, basenameOrAuthority } from '../../../../base/common/resources.js';
+import { IFilesConfiguration, SortOrder } from './files.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { ExplorerFileNestingTrie } from './explorerFileNestingTrie.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { assertIsDefined } from '../../../../base/common/types.js';
+import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.js';
+import { IMarkdownString } from '../../../../base/common/htmlContent.js';
 
 export class ExplorerModel implements IDisposable {
 
diff --git a/src/vs/workbench/contrib/files/common/files.ts b/src/vs/workbench/contrib/files/common/files.ts
index edf32a0e189..a3120080a3b 100644
--- a/src/vs/workbench/contrib/files/common/files.ts
+++ b/src/vs/workbench/contrib/files/common/files.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { IWorkbenchEditorConfiguration, IEditorIdentifier, EditorResourceAccessor, SideBySideEditor } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { IFilesConfiguration as PlatformIFilesConfiguration, FileChangeType, IFileService } from 'vs/platform/files/common/files';
-import { ContextKeyExpr, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { ITextModelContentProvider } from 'vs/editor/common/services/resolverService';
-import { Disposable, DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
-import { ITextModel } from 'vs/editor/common/model';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILanguageService, ILanguageSelection } from 'vs/editor/common/languages/language';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { InputFocusedContextKey } from 'vs/platform/contextkey/common/contextkeys';
-import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { Event } from 'vs/base/common/event';
-import { ITextEditorOptions } from 'vs/platform/editor/common/editor';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { localize } from 'vs/nls';
-import { IExpression } from 'vs/base/common/glob';
+import { URI } from '../../../../base/common/uri.js';
+import { IEditorOptions } from '../../../../editor/common/config/editorOptions.js';
+import { IWorkbenchEditorConfiguration, IEditorIdentifier, EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { IFilesConfiguration as PlatformIFilesConfiguration, FileChangeType, IFileService } from '../../../../platform/files/common/files.js';
+import { ContextKeyExpr, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { ITextModelContentProvider } from '../../../../editor/common/services/resolverService.js';
+import { Disposable, DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ILanguageService, ILanguageSelection } from '../../../../editor/common/languages/language.js';
+import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
+import { InputFocusedContextKey } from '../../../../platform/contextkey/common/contextkeys.js';
+import { IEditorGroup } from '../../../services/editor/common/editorGroupsService.js';
+import { Event } from '../../../../base/common/event.js';
+import { ITextEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { localize } from '../../../../nls.js';
+import { IExpression } from '../../../../base/common/glob.js';
 
 /**
  * Explorer viewlet id.
@@ -97,6 +97,7 @@ export interface IFilesConfiguration extends PlatformIFilesConfiguration, IWorkb
 		expandSingleFolderWorkspaces: boolean;
 		sortOrder: SortOrder;
 		sortOrderLexicographicOptions: LexicographicOptions;
+		sortOrderReverse: boolean;
 		decorations: {
 			colors: boolean;
 			badges: boolean;
@@ -108,6 +109,7 @@ export interface IFilesConfiguration extends PlatformIFilesConfiguration, IWorkb
 			expand: boolean;
 			patterns: { [parent: string]: string };
 		};
+		autoOpenDroppedFile: boolean;
 	};
 	editor: IEditorOptions;
 }
@@ -142,6 +144,7 @@ export const enum LexicographicOptions {
 export interface ISortOrderConfiguration {
 	sortOrder: SortOrder;
 	lexicographicOptions: LexicographicOptions;
+	reverse: boolean;
 }
 
 export class TextFileContentProvider extends Disposable implements ITextModelContentProvider {
diff --git a/src/vs/workbench/contrib/files/electron-sandbox/fileActions.contribution.ts b/src/vs/workbench/contrib/files/electron-sandbox/fileActions.contribution.ts
index 8cb362e422c..5581931a9e7 100644
--- a/src/vs/workbench/contrib/files/electron-sandbox/fileActions.contribution.ts
+++ b/src/vs/workbench/contrib/files/electron-sandbox/fileActions.contribution.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { URI } from 'vs/base/common/uri';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { isWindows, isMacintosh } from 'vs/base/common/platform';
-import { Schemas } from 'vs/base/common/network';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { KeyMod, KeyCode, KeyChord } from 'vs/base/common/keyCodes';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { getMultiSelectedResources, IExplorerService } from 'vs/workbench/contrib/files/browser/files';
-import { IListService } from 'vs/platform/list/browser/listService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { revealResourcesInOS } from 'vs/workbench/contrib/files/electron-sandbox/fileCommands';
-import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
-import { ResourceContextKey } from 'vs/workbench/common/contextkeys';
-import { appendToCommandPalette, appendEditorTitleContextMenuItem } from 'vs/workbench/contrib/files/browser/fileActions.contribution';
-import { SideBySideEditor, EditorResourceAccessor } from 'vs/workbench/common/editor';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
+import * as nls from '../../../../nls.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { isWindows, isMacintosh } from '../../../../base/common/platform.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
+import { KeyMod, KeyCode, KeyChord } from '../../../../base/common/keyCodes.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { getMultiSelectedResources, IExplorerService } from '../browser/files.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { revealResourcesInOS } from './fileCommands.js';
+import { MenuRegistry, MenuId } from '../../../../platform/actions/common/actions.js';
+import { ResourceContextKey } from '../../../common/contextkeys.js';
+import { appendToCommandPalette, appendEditorTitleContextMenuItem } from '../browser/fileActions.contribution.js';
+import { SideBySideEditor, EditorResourceAccessor } from '../../../common/editor.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { IListService } from '../../../../platform/list/browser/listService.js';
+import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
 
 const REVEAL_IN_OS_COMMAND_ID = 'revealFileInOS';
 const REVEAL_IN_OS_LABEL = isWindows ? nls.localize2('revealInWindows', "Reveal in File Explorer") : isMacintosh ? nls.localize2('revealInMac', "Reveal in Finder") : nls.localize2('openContainer', "Open Containing Folder");
@@ -96,3 +96,21 @@ appendToCommandPalette({
 	title: REVEAL_IN_OS_LABEL,
 	category: category
 }, REVEAL_IN_OS_WHEN_CONTEXT);
+
+// Menu registration - chat attachments context
+
+MenuRegistry.appendMenuItem(MenuId.ChatAttachmentsContext, {
+	group: 'navigation',
+	order: 20,
+	command: revealInOsCommand,
+	when: REVEAL_IN_OS_WHEN_CONTEXT
+});
+
+// Menu registration - chat inline anchor
+
+MenuRegistry.appendMenuItem(MenuId.ChatInlineResourceAnchorContext, {
+	group: 'navigation',
+	order: 20,
+	command: revealInOsCommand,
+	when: REVEAL_IN_OS_WHEN_CONTEXT
+});
diff --git a/src/vs/workbench/contrib/files/electron-sandbox/fileCommands.ts b/src/vs/workbench/contrib/files/electron-sandbox/fileCommands.ts
index 4f62c9c804c..ec009a1c697 100644
--- a/src/vs/workbench/contrib/files/electron-sandbox/fileCommands.ts
+++ b/src/vs/workbench/contrib/files/electron-sandbox/fileCommands.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { sequence } from 'vs/base/common/async';
-import { Schemas } from 'vs/base/common/network';
-import { INativeHostService } from 'vs/platform/native/common/native';
+import { URI } from '../../../../base/common/uri.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { sequence } from '../../../../base/common/async.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
 
 // Commands
 
diff --git a/src/vs/workbench/contrib/files/test/browser/editorAutoSave.test.ts b/src/vs/workbench/contrib/files/test/browser/editorAutoSave.test.ts
index 75b57831d84..759166497bd 100644
--- a/src/vs/workbench/contrib/files/test/browser/editorAutoSave.test.ts
+++ b/src/vs/workbench/contrib/files/test/browser/editorAutoSave.test.ts
@@ -4,26 +4,26 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Event } from 'vs/base/common/event';
-import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from 'vs/base/test/common/utils';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { TestFilesConfigurationService, workbenchInstantiationService, TestServiceAccessor, registerTestFileEditor, createEditorPart, TestEnvironmentService, TestFileService, TestTextResourceConfigurationService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { ITextFileEditorModel } from 'vs/workbench/services/textfile/common/textfiles';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { TextFileEditorModelManager } from 'vs/workbench/services/textfile/common/textFileEditorModelManager';
-import { EditorService } from 'vs/workbench/services/editor/browser/editorService';
-import { EditorAutoSave } from 'vs/workbench/browser/parts/editor/editorAutoSave';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { DEFAULT_EDITOR_ASSOCIATION } from 'vs/workbench/common/editor';
-import { TestWorkspace } from 'vs/platform/workspace/test/common/testWorkspace';
-import { TestContextService, TestMarkerService } from 'vs/workbench/test/common/workbenchTestServices';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
+import { Event } from '../../../../../base/common/event.js';
+import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from '../../../../../base/test/common/utils.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { TestFilesConfigurationService, workbenchInstantiationService, TestServiceAccessor, registerTestFileEditor, createEditorPart, TestEnvironmentService, TestFileService, TestTextResourceConfigurationService } from '../../../../test/browser/workbenchTestServices.js';
+import { ITextFileEditorModel } from '../../../../services/textfile/common/textfiles.js';
+import { IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { TextFileEditorModelManager } from '../../../../services/textfile/common/textFileEditorModelManager.js';
+import { EditorService } from '../../../../services/editor/browser/editorService.js';
+import { EditorAutoSave } from '../../../../browser/parts/editor/editorAutoSave.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { IFilesConfigurationService } from '../../../../services/filesConfiguration/common/filesConfigurationService.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { MockContextKeyService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { DEFAULT_EDITOR_ASSOCIATION } from '../../../../common/editor.js';
+import { TestWorkspace } from '../../../../../platform/workspace/test/common/testWorkspace.js';
+import { TestContextService, TestMarkerService } from '../../../../test/common/workbenchTestServices.js';
+import { UriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentityService.js';
+import { IAccessibilitySignalService } from '../../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
 
 suite('EditorAutoSave', () => {
 
diff --git a/src/vs/workbench/contrib/files/test/browser/explorerFileNestingTrie.test.ts b/src/vs/workbench/contrib/files/test/browser/explorerFileNestingTrie.test.ts
index 66481ab3a23..f4075b3abfc 100644
--- a/src/vs/workbench/contrib/files/test/browser/explorerFileNestingTrie.test.ts
+++ b/src/vs/workbench/contrib/files/test/browser/explorerFileNestingTrie.test.ts
@@ -2,9 +2,9 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { PreTrie, ExplorerFileNestingTrie, SufTrie } from 'vs/workbench/contrib/files/common/explorerFileNestingTrie';
+import { PreTrie, ExplorerFileNestingTrie, SufTrie } from '../../common/explorerFileNestingTrie.js';
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 const fakeFilenameAttributes = { dirname: 'mydir', basename: '', extname: '' };
 
diff --git a/src/vs/workbench/contrib/files/test/browser/explorerModel.test.ts b/src/vs/workbench/contrib/files/test/browser/explorerModel.test.ts
index 13870699b3c..c097107fb4a 100644
--- a/src/vs/workbench/contrib/files/test/browser/explorerModel.test.ts
+++ b/src/vs/workbench/contrib/files/test/browser/explorerModel.test.ts
@@ -4,15 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { isLinux, isWindows, OS } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { join } from 'vs/base/common/path';
-import { validateFileName } from 'vs/workbench/contrib/files/browser/fileActions';
-import { ExplorerItem } from 'vs/workbench/contrib/files/common/explorerModel';
-import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from 'vs/base/test/common/utils';
-import { TestFileService, TestPathService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { NullFilesConfigurationService } from 'vs/workbench/test/common/workbenchTestServices';
+import { isLinux, isWindows, OS } from '../../../../../base/common/platform.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { join } from '../../../../../base/common/path.js';
+import { validateFileName } from '../../browser/fileActions.js';
+import { ExplorerItem } from '../../common/explorerModel.js';
+import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from '../../../../../base/test/common/utils.js';
+import { TestFileService, TestPathService } from '../../../../test/browser/workbenchTestServices.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { NullFilesConfigurationService } from '../../../../test/common/workbenchTestServices.js';
 
 
 suite('Files - View Model', function () {
diff --git a/src/vs/workbench/contrib/files/test/browser/explorerView.test.ts b/src/vs/workbench/contrib/files/test/browser/explorerView.test.ts
index ea30440fa54..0027c63f051 100644
--- a/src/vs/workbench/contrib/files/test/browser/explorerView.test.ts
+++ b/src/vs/workbench/contrib/files/test/browser/explorerView.test.ts
@@ -4,18 +4,18 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Emitter } from 'vs/base/common/event';
-import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from 'vs/base/test/common/utils';
-import { TestFileService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { ExplorerItem } from 'vs/workbench/contrib/files/common/explorerModel';
-import { getContext } from 'vs/workbench/contrib/files/browser/views/explorerView';
-import { listInvalidItemForeground } from 'vs/platform/theme/common/colorRegistry';
-import { CompressedNavigationController } from 'vs/workbench/contrib/files/browser/views/explorerViewer';
-import * as dom from 'vs/base/browser/dom';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { provideDecorations } from 'vs/workbench/contrib/files/browser/views/explorerDecorationsProvider';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { NullFilesConfigurationService } from 'vs/workbench/test/common/workbenchTestServices';
+import { Emitter } from '../../../../../base/common/event.js';
+import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from '../../../../../base/test/common/utils.js';
+import { TestFileService } from '../../../../test/browser/workbenchTestServices.js';
+import { ExplorerItem } from '../../common/explorerModel.js';
+import { getContext } from '../../browser/views/explorerView.js';
+import { listInvalidItemForeground } from '../../../../../platform/theme/common/colorRegistry.js';
+import { CompressedNavigationController } from '../../browser/views/explorerViewer.js';
+import * as dom from '../../../../../base/browser/dom.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { provideDecorations } from '../../browser/views/explorerDecorationsProvider.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { NullFilesConfigurationService } from '../../../../test/common/workbenchTestServices.js';
 
 suite('Files - ExplorerView', () => {
 
diff --git a/src/vs/workbench/contrib/files/test/browser/fileActions.test.ts b/src/vs/workbench/contrib/files/test/browser/fileActions.test.ts
index f5070edb179..cd13c570c8a 100644
--- a/src/vs/workbench/contrib/files/test/browser/fileActions.test.ts
+++ b/src/vs/workbench/contrib/files/test/browser/fileActions.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { incrementFileName } from 'vs/workbench/contrib/files/browser/fileActions';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { incrementFileName } from '../../browser/fileActions.js';
 
 suite('Files - Increment file name simple', () => {
 
diff --git a/src/vs/workbench/contrib/files/test/browser/fileEditorInput.test.ts b/src/vs/workbench/contrib/files/test/browser/fileEditorInput.test.ts
index 1675b2d4571..e79fd5edec8 100644
--- a/src/vs/workbench/contrib/files/test/browser/fileEditorInput.test.ts
+++ b/src/vs/workbench/contrib/files/test/browser/fileEditorInput.test.ts
@@ -4,24 +4,24 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from 'vs/base/test/common/utils';
-import { FileEditorInput } from 'vs/workbench/contrib/files/browser/editors/fileEditorInput';
-import { workbenchInstantiationService, TestServiceAccessor, getLastResolvedFileStat } from 'vs/workbench/test/browser/workbenchTestServices';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IEditorFactoryRegistry, Verbosity, EditorExtensions, EditorInputCapabilities } from 'vs/workbench/common/editor';
-import { EncodingMode, TextFileOperationError, TextFileOperationResult } from 'vs/workbench/services/textfile/common/textfiles';
-import { FileOperationResult, NotModifiedSinceFileOperationError, TooLargeFileOperationError } from 'vs/platform/files/common/files';
-import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel';
-import { timeout } from 'vs/base/common/async';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { BinaryEditorModel } from 'vs/workbench/common/editor/binaryEditorModel';
-import { IResourceEditorInput } from 'vs/platform/editor/common/editor';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { FileEditorInputSerializer } from 'vs/workbench/contrib/files/browser/editors/fileEditorHandler';
-import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
-import { TextEditorService } from 'vs/workbench/services/textfile/common/textEditorService';
+import { URI } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from '../../../../../base/test/common/utils.js';
+import { FileEditorInput } from '../../browser/editors/fileEditorInput.js';
+import { workbenchInstantiationService, TestServiceAccessor, getLastResolvedFileStat } from '../../../../test/browser/workbenchTestServices.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IEditorFactoryRegistry, Verbosity, EditorExtensions, EditorInputCapabilities } from '../../../../common/editor.js';
+import { EncodingMode, TextFileOperationError, TextFileOperationResult } from '../../../../services/textfile/common/textfiles.js';
+import { FileOperationResult, NotModifiedSinceFileOperationError, TooLargeFileOperationError } from '../../../../../platform/files/common/files.js';
+import { TextFileEditorModel } from '../../../../services/textfile/common/textFileEditorModel.js';
+import { timeout } from '../../../../../base/common/async.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../../../../../editor/common/languages/modesRegistry.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { BinaryEditorModel } from '../../../../common/editor/binaryEditorModel.js';
+import { IResourceEditorInput } from '../../../../../platform/editor/common/editor.js';
+import { Registry } from '../../../../../platform/registry/common/platform.js';
+import { FileEditorInputSerializer } from '../../browser/editors/fileEditorHandler.js';
+import { InMemoryFileSystemProvider } from '../../../../../platform/files/common/inMemoryFilesystemProvider.js';
+import { TextEditorService } from '../../../../services/textfile/common/textEditorService.js';
 
 suite('Files - FileEditorInput', () => {
 
diff --git a/src/vs/workbench/contrib/files/test/browser/fileOnDiskProvider.test.ts b/src/vs/workbench/contrib/files/test/browser/fileOnDiskProvider.test.ts
index 94f9a716751..803475c88d5 100644
--- a/src/vs/workbench/contrib/files/test/browser/fileOnDiskProvider.test.ts
+++ b/src/vs/workbench/contrib/files/test/browser/fileOnDiskProvider.test.ts
@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { workbenchInstantiationService, TestServiceAccessor } from 'vs/workbench/test/browser/workbenchTestServices';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { TextFileContentProvider } from 'vs/workbench/contrib/files/common/files';
-import { snapshotToString } from 'vs/workbench/services/textfile/common/textfiles';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { URI } from '../../../../../base/common/uri.js';
+import { workbenchInstantiationService, TestServiceAccessor } from '../../../../test/browser/workbenchTestServices.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { TextFileContentProvider } from '../../common/files.js';
+import { snapshotToString } from '../../../../services/textfile/common/textfiles.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('Files - FileOnDiskContentProvider', () => {
 
diff --git a/src/vs/workbench/contrib/files/test/browser/textFileEditorTracker.test.ts b/src/vs/workbench/contrib/files/test/browser/textFileEditorTracker.test.ts
index f3d6c8fb198..0f6325a28fc 100644
--- a/src/vs/workbench/contrib/files/test/browser/textFileEditorTracker.test.ts
+++ b/src/vs/workbench/contrib/files/test/browser/textFileEditorTracker.test.ts
@@ -4,31 +4,31 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Event } from 'vs/base/common/event';
-import { TextFileEditorTracker } from 'vs/workbench/contrib/files/browser/editors/textFileEditorTracker';
-import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from 'vs/base/test/common/utils';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { workbenchInstantiationService, TestServiceAccessor, TestFilesConfigurationService, registerTestFileEditor, registerTestResourceEditor, createEditorPart, TestEnvironmentService, TestFileService, workbenchTeardown, TestTextResourceConfigurationService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { IResolvedTextFileEditorModel, snapshotToString, ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { FileChangesEvent, FileChangeType, FileOperationError, FileOperationResult } from 'vs/platform/files/common/files';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { timeout } from 'vs/base/common/async';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { TextFileEditorModelManager } from 'vs/workbench/services/textfile/common/textFileEditorModelManager';
-import { EditorService } from 'vs/workbench/services/editor/browser/editorService';
-import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
-import { isEqual } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { FILE_EDITOR_INPUT_ID } from 'vs/workbench/contrib/files/common/files';
-import { DEFAULT_EDITOR_ASSOCIATION } from 'vs/workbench/common/editor';
-import { TestWorkspace } from 'vs/platform/workspace/test/common/testWorkspace';
-import { TestContextService, TestMarkerService } from 'vs/workbench/test/common/workbenchTestServices';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
+import { Event } from '../../../../../base/common/event.js';
+import { TextFileEditorTracker } from '../../browser/editors/textFileEditorTracker.js';
+import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from '../../../../../base/test/common/utils.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { workbenchInstantiationService, TestServiceAccessor, TestFilesConfigurationService, registerTestFileEditor, registerTestResourceEditor, createEditorPart, TestEnvironmentService, TestFileService, workbenchTeardown, TestTextResourceConfigurationService } from '../../../../test/browser/workbenchTestServices.js';
+import { IResolvedTextFileEditorModel, snapshotToString, ITextFileService } from '../../../../services/textfile/common/textfiles.js';
+import { FileChangesEvent, FileChangeType, FileOperationError, FileOperationResult } from '../../../../../platform/files/common/files.js';
+import { IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
+import { timeout } from '../../../../../base/common/async.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { TextFileEditorModelManager } from '../../../../services/textfile/common/textFileEditorModelManager.js';
+import { EditorService } from '../../../../services/editor/browser/editorService.js';
+import { UntitledTextEditorInput } from '../../../../services/untitled/common/untitledTextEditorInput.js';
+import { isEqual } from '../../../../../base/common/resources.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IFilesConfigurationService } from '../../../../services/filesConfiguration/common/filesConfigurationService.js';
+import { MockContextKeyService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { FILE_EDITOR_INPUT_ID } from '../../common/files.js';
+import { DEFAULT_EDITOR_ASSOCIATION } from '../../../../common/editor.js';
+import { TestWorkspace } from '../../../../../platform/workspace/test/common/testWorkspace.js';
+import { TestContextService, TestMarkerService } from '../../../../test/common/workbenchTestServices.js';
+import { UriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentityService.js';
 
 suite('Files - TextFileEditorTracker', () => {
 
diff --git a/src/vs/workbench/contrib/folding/browser/folding.contribution.ts b/src/vs/workbench/contrib/folding/browser/folding.contribution.ts
index 185b51f047d..338e0c1fb2a 100644
--- a/src/vs/workbench/contrib/folding/browser/folding.contribution.ts
+++ b/src/vs/workbench/contrib/folding/browser/folding.contribution.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { FoldingController } from 'vs/editor/contrib/folding/browser/folding';
-import * as nls from 'vs/nls';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry, IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
-import { editorConfigurationBaseNode } from 'vs/editor/common/config/editorConfigurationSchema';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { FoldingRangeProvider } from 'vs/editor/common/languages';
-import { ITextModel } from 'vs/editor/common/model';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { FoldingController } from '../../../../editor/contrib/folding/browser/folding.js';
+import * as nls from '../../../../nls.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry, IWorkbenchContribution } from '../../../common/contributions.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { editorConfigurationBaseNode } from '../../../../editor/common/config/editorConfigurationSchema.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { FoldingRangeProvider } from '../../../../editor/common/languages.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
 
 class DefaultFoldingRangeProvider extends Disposable implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/contrib/format/browser/format.contribution.ts b/src/vs/workbench/contrib/format/browser/format.contribution.ts
index a91827cdc47..612cc4ed86d 100644
--- a/src/vs/workbench/contrib/format/browser/format.contribution.ts
+++ b/src/vs/workbench/contrib/format/browser/format.contribution.ts
@@ -3,6 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import './formatActionsMultiple';
-import './formatActionsNone';
-import './formatModified';
+import './formatActionsMultiple.js';
+import './formatActionsNone.js';
+import './formatModified.js';
diff --git a/src/vs/workbench/contrib/format/browser/formatActionsMultiple.ts b/src/vs/workbench/contrib/format/browser/formatActionsMultiple.ts
index 4339d4117f9..a80963b7f62 100644
--- a/src/vs/workbench/contrib/format/browser/formatActionsMultiple.ts
+++ b/src/vs/workbench/contrib/format/browser/formatActionsMultiple.ts
@@ -3,37 +3,37 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getCodeEditor, ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, registerEditorAction } from 'vs/editor/browser/editorExtensions';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { DocumentFormattingEditProvider, DocumentRangeFormattingEditProvider } from 'vs/editor/common/languages';
-import * as nls from 'vs/nls';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { formatDocumentRangesWithProvider, formatDocumentWithProvider, getRealAndSyntheticDocumentFormattersOrdered, FormattingConflicts, FormattingMode, FormattingKind } from 'vs/editor/contrib/format/browser/format';
-import { Range } from 'vs/editor/common/core/range';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
-import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry, IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IExtensionService, toExtension } from 'vs/workbench/services/extensions/common/extensions';
-import { Disposable, DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ITextModel } from 'vs/editor/common/model';
-import { INotificationService, NotificationPriority, Severity } from 'vs/platform/notification/common/notification';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IWorkbenchExtensionEnablementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { editorConfigurationBaseNode } from 'vs/editor/common/config/editorConfigurationSchema';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { ILanguageStatusService } from 'vs/workbench/services/languageStatus/common/languageStatusService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { generateUuid } from 'vs/base/common/uuid';
+import { getCodeEditor, ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { EditorAction, registerEditorAction } from '../../../../editor/browser/editorExtensions.js';
+import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
+import { DocumentFormattingEditProvider, DocumentRangeFormattingEditProvider } from '../../../../editor/common/languages.js';
+import * as nls from '../../../../nls.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { IQuickInputService, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { formatDocumentRangesWithProvider, formatDocumentWithProvider, getRealAndSyntheticDocumentFormattersOrdered, FormattingConflicts, FormattingMode, FormattingKind } from '../../../../editor/contrib/format/browser/format.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry, IWorkbenchContribution } from '../../../common/contributions.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { IExtensionService, toExtension } from '../../../services/extensions/common/extensions.js';
+import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { INotificationService, NotificationPriority, Severity } from '../../../../platform/notification/common/notification.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { IWorkbenchExtensionEnablementService } from '../../../services/extensionManagement/common/extensionManagement.js';
+import { editorConfigurationBaseNode } from '../../../../editor/common/config/editorConfigurationSchema.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
+import { ILanguageStatusService } from '../../../services/languageStatus/common/languageStatusService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
 
 type FormattingEditProvider = DocumentFormattingEditProvider | DocumentRangeFormattingEditProvider;
 
diff --git a/src/vs/workbench/contrib/format/browser/formatActionsNone.ts b/src/vs/workbench/contrib/format/browser/formatActionsNone.ts
index ef7038481b4..a01e47e17c0 100644
--- a/src/vs/workbench/contrib/format/browser/formatActionsNone.ts
+++ b/src/vs/workbench/contrib/format/browser/formatActionsNone.ts
@@ -3,27 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, registerEditorAction, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import * as nls from 'vs/nls';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { VIEWLET_ID, IExtensionsViewPaneContainer } from 'vs/workbench/contrib/extensions/common/extensions';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { ViewContainerLocation } from 'vs/workbench/common/views';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-
-async function showExtensionQuery(paneCompositeService: IPaneCompositePartService, query: string) {
-	const viewlet = await paneCompositeService.openPaneComposite(VIEWLET_ID, ViewContainerLocation.Sidebar, true);
-	if (viewlet) {
-		(viewlet?.getViewPaneContainer() as IExtensionsViewPaneContainer).search(query);
-	}
-}
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { EditorAction, registerEditorAction, ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
+import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
+import * as nls from '../../../../nls.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IExtensionsWorkbenchService } from '../../extensions/common/extensions.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
 
 registerEditorAction(class FormatDocumentMultipleAction extends EditorAction {
 
@@ -48,7 +39,7 @@ registerEditorAction(class FormatDocumentMultipleAction extends EditorAction {
 		}
 
 		const commandService = accessor.get(ICommandService);
-		const paneCompositeService = accessor.get(IPaneCompositePartService);
+		const extensionsWorkbenchService = accessor.get(IExtensionsWorkbenchService);
 		const notificationService = accessor.get(INotificationService);
 		const dialogService = accessor.get(IDialogService);
 		const languageFeaturesService = accessor.get(ILanguageFeaturesService);
@@ -70,7 +61,7 @@ registerEditorAction(class FormatDocumentMultipleAction extends EditorAction {
 				primaryButton: nls.localize({ key: 'install.formatter', comment: ['&& denotes a mnemonic'] }, "&&Install Formatter...")
 			});
 			if (confirmed) {
-				showExtensionQuery(paneCompositeService, `category:formatters ${langName}`);
+				extensionsWorkbenchService.openSearch(`category:formatters ${langName}`);
 			}
 		}
 	}
diff --git a/src/vs/workbench/contrib/format/browser/formatModified.ts b/src/vs/workbench/contrib/format/browser/formatModified.ts
index 18f492145dc..f59c7cc29ef 100644
--- a/src/vs/workbench/contrib/format/browser/formatModified.ts
+++ b/src/vs/workbench/contrib/format/browser/formatModified.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isNonEmptyArray } from 'vs/base/common/arrays';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, registerEditorAction, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { Range } from 'vs/editor/common/core/range';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { ITextModel, shouldSynchronizeModel } from 'vs/editor/common/model';
-import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { formatDocumentRangesWithSelectedProvider, FormattingMode } from 'vs/editor/contrib/format/browser/format';
-import * as nls from 'vs/nls';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { Progress } from 'vs/platform/progress/common/progress';
-import { getOriginalResource } from 'vs/workbench/contrib/scm/browser/dirtydiffDecorator';
-import { IQuickDiffService } from 'vs/workbench/contrib/scm/common/quickDiff';
+import { isNonEmptyArray } from '../../../../base/common/arrays.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { EditorAction, registerEditorAction, ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
+import { ITextModel, shouldSynchronizeModel } from '../../../../editor/common/model.js';
+import { IEditorWorkerService } from '../../../../editor/common/services/editorWorker.js';
+import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { formatDocumentRangesWithSelectedProvider, FormattingMode } from '../../../../editor/contrib/format/browser/format.js';
+import * as nls from '../../../../nls.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { Progress } from '../../../../platform/progress/common/progress.js';
+import { getOriginalResource } from '../../scm/browser/dirtydiffDecorator.js';
+import { IQuickDiffService } from '../../scm/common/quickDiff.js';
 
 registerEditorAction(class FormatModifiedAction extends EditorAction {
 
diff --git a/src/vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty.ts b/src/vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty.ts
index bd8db57491b..0494623f078 100644
--- a/src/vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty.ts
+++ b/src/vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction2, EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { InlayHintItem, asCommandLink } from 'vs/editor/contrib/inlayHints/browser/inlayHints';
-import { InlayHintsController } from 'vs/editor/contrib/inlayHints/browser/inlayHintsController';
-import { localize, localize2 } from 'vs/nls';
-import { registerAction2 } from 'vs/platform/actions/common/actions';
-import { AccessibilitySignal, IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { Link } from 'vs/platform/opener/browser/link';
+import * as dom from '../../../../base/browser/dom.js';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { EditorAction2, EditorContributionInstantiation, registerEditorContribution } from '../../../../editor/browser/editorExtensions.js';
+import { IEditorContribution } from '../../../../editor/common/editorCommon.js';
+import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
+import { InlayHintItem, asCommandLink } from '../../../../editor/contrib/inlayHints/browser/inlayHints.js';
+import { InlayHintsController } from '../../../../editor/contrib/inlayHints/browser/inlayHintsController.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { Link } from '../../../../platform/opener/browser/link.js';
 
 
 export class InlayHintsAccessibility implements IEditorContribution {
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChat.contribution.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChat.contribution.ts
index 4ab19a40890..bf80d6d241b 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChat.contribution.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChat.contribution.ts
@@ -3,22 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { registerAction2 } from 'vs/platform/actions/common/actions';
-import { InlineChatController } from 'vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import * as InlineChatActions from 'vs/workbench/contrib/inlineChat/browser/inlineChatActions';
-import { INLINE_CHAT_ID } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { InlineChatNotebookContribution } from 'vs/workbench/contrib/inlineChat/browser/inlineChatNotebook';
-import { IWorkbenchContributionsRegistry, registerWorkbenchContribution2, Extensions as WorkbenchExtensions, WorkbenchPhase } from 'vs/workbench/common/contributions';
-import { InlineChatSavingServiceImpl } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSavingServiceImpl';
-import { InlineChatAccessibleView } from 'vs/workbench/contrib/inlineChat/browser/inlineChatAccessibleView';
-import { IInlineChatSavingService } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSavingService';
-import { IInlineChatSessionService } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSessionService';
-import { InlineChatEnabler, InlineChatSessionServiceImpl } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl';
-import { AccessibleViewRegistry } from 'vs/platform/accessibility/browser/accessibleViewRegistry';
+import { EditorContributionInstantiation, registerEditorContribution } from '../../../../editor/browser/editorExtensions.js';
+import { IMenuItem, MenuRegistry, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { InlineChatController } from './inlineChatController.js';
+import * as InlineChatActions from './inlineChatActions.js';
+import { CTX_INLINE_CHAT_EDITING, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, INLINE_CHAT_ID, MENU_INLINE_CHAT_WIDGET_STATUS } from '../common/inlineChat.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { InlineChatNotebookContribution } from './inlineChatNotebook.js';
+import { IWorkbenchContributionsRegistry, registerWorkbenchContribution2, Extensions as WorkbenchExtensions, WorkbenchPhase } from '../../../common/contributions.js';
+import { InlineChatSavingServiceImpl } from './inlineChatSavingServiceImpl.js';
+import { InlineChatAccessibleView } from './inlineChatAccessibleView.js';
+import { IInlineChatSavingService } from './inlineChatSavingService.js';
+import { IInlineChatSessionService } from './inlineChatSessionService.js';
+import { InlineChatEnabler, InlineChatSessionServiceImpl } from './inlineChatSessionServiceImpl.js';
+import { AccessibleViewRegistry } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
+import { CancelAction, SubmitAction } from '../../chat/browser/actions/chatExecuteActions.js';
+import { localize } from '../../../../nls.js';
+import { CONTEXT_CHAT_INPUT_HAS_TEXT } from '../../chat/common/chatContextKeys.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { InlineChatAccessibilityHelp } from './inlineChatAccessibilityHelp.js';
+import { InlineChatExansionContextKey, InlineChatExpandLineAction } from './inlineChatCurrentLine.js';
 
 
 // --- browser
@@ -28,15 +34,65 @@ registerSingleton(IInlineChatSavingService, InlineChatSavingServiceImpl, Instant
 
 registerEditorContribution(INLINE_CHAT_ID, InlineChatController, EditorContributionInstantiation.Eager); // EAGER because of notebook dispose/create of editors
 
+registerEditorContribution(InlineChatExansionContextKey.Id, InlineChatExansionContextKey, EditorContributionInstantiation.BeforeFirstInteraction);
+registerAction2(InlineChatExpandLineAction);
+
+// --- MENU special ---
+
+const editActionMenuItem: IMenuItem = {
+	group: '0_main',
+	order: 0,
+	command: {
+		id: SubmitAction.ID,
+		title: localize('send.edit', "Edit Code"),
+	},
+	when: ContextKeyExpr.and(
+		CONTEXT_CHAT_INPUT_HAS_TEXT,
+		CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated(),
+		CTX_INLINE_CHAT_EDITING
+	),
+};
+
+const generateActionMenuItem: IMenuItem = {
+	group: '0_main',
+	order: 0,
+	command: {
+		id: SubmitAction.ID,
+		title: localize('send.generate', "Generate"),
+	},
+	when: ContextKeyExpr.and(
+		CONTEXT_CHAT_INPUT_HAS_TEXT,
+		CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated(),
+		CTX_INLINE_CHAT_EDITING.toNegated()
+	),
+};
+
+MenuRegistry.appendMenuItem(MENU_INLINE_CHAT_WIDGET_STATUS, editActionMenuItem);
+MenuRegistry.appendMenuItem(MENU_INLINE_CHAT_WIDGET_STATUS, generateActionMenuItem);
+
+const cancelActionMenuItem: IMenuItem = {
+	group: '0_main',
+	order: 0,
+	command: {
+		id: CancelAction.ID,
+		title: localize('cancel', "Cancel Request"),
+		shortTitle: localize('cancelShort', "Cancel"),
+	},
+	when: ContextKeyExpr.and(
+		CTX_INLINE_CHAT_REQUEST_IN_PROGRESS,
+	),
+};
+
+MenuRegistry.appendMenuItem(MENU_INLINE_CHAT_WIDGET_STATUS, cancelActionMenuItem);
+
+// --- actions ---
 
 registerAction2(InlineChatActions.StartSessionAction);
 registerAction2(InlineChatActions.CloseAction);
 registerAction2(InlineChatActions.ConfigureInlineChatAction);
 registerAction2(InlineChatActions.UnstashSessionAction);
 registerAction2(InlineChatActions.DiscardHunkAction);
-registerAction2(InlineChatActions.DiscardAction);
 registerAction2(InlineChatActions.RerunAction);
-registerAction2(InlineChatActions.CancelSessionAction);
 registerAction2(InlineChatActions.MoveToNextHunk);
 registerAction2(InlineChatActions.MoveToPreviousHunk);
 
@@ -48,11 +104,9 @@ registerAction2(InlineChatActions.ViewInChatAction);
 registerAction2(InlineChatActions.ToggleDiffForChange);
 registerAction2(InlineChatActions.AcceptChanges);
 
-registerAction2(InlineChatActions.CopyRecordings);
-
 const workbenchContributionsRegistry = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
 workbenchContributionsRegistry.registerWorkbenchContribution(InlineChatNotebookContribution, LifecyclePhase.Restored);
 
 registerWorkbenchContribution2(InlineChatEnabler.Id, InlineChatEnabler, WorkbenchPhase.AfterRestored);
-
 AccessibleViewRegistry.register(new InlineChatAccessibleView());
+AccessibleViewRegistry.register(new InlineChatAccessibilityHelp());
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatAccessibilityHelp.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatAccessibilityHelp.ts
index a2348928fb6..e44fe66d93f 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatAccessibilityHelp.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatAccessibilityHelp.ts
@@ -3,19 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { AccessibleViewType } from 'vs/platform/accessibility/browser/accessibleView';
-import { IAccessibleViewImplentation } from 'vs/platform/accessibility/browser/accessibleViewRegistry';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { getChatAccessibilityHelpProvider } from 'vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp';
-import { CTX_INLINE_CHAT_RESPONSE_FOCUSED, CTX_INLINE_CHAT_FOCUSED } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
+import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { AccessibleViewType } from '../../../../platform/accessibility/browser/accessibleView.js';
+import { IAccessibleViewImplentation } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { getChatAccessibilityHelpProvider } from '../../chat/browser/actions/chatAccessibilityHelp.js';
+import { CONTEXT_CHAT_INPUT_HAS_FOCUS } from '../../chat/common/chatContextKeys.js';
+import { CTX_INLINE_CHAT_RESPONSE_FOCUSED } from '../common/inlineChat.js';
 
 export class InlineChatAccessibilityHelp implements IAccessibleViewImplentation {
 	readonly priority = 106;
 	readonly name = 'inlineChat';
 	readonly type = AccessibleViewType.Help;
-	readonly when = ContextKeyExpr.or(CTX_INLINE_CHAT_RESPONSE_FOCUSED, CTX_INLINE_CHAT_FOCUSED);
+	readonly when = ContextKeyExpr.or(CTX_INLINE_CHAT_RESPONSE_FOCUSED, CONTEXT_CHAT_INPUT_HAS_FOCUS);
 	getProvider(accessor: ServicesAccessor) {
 		const codeEditor = accessor.get(ICodeEditorService).getActiveCodeEditor() || accessor.get(ICodeEditorService).getFocusedCodeEditor();
 		if (!codeEditor) {
@@ -23,5 +24,4 @@ export class InlineChatAccessibilityHelp implements IAccessibleViewImplentation
 		}
 		return getChatAccessibilityHelpProvider(accessor, codeEditor, 'inlineChat');
 	}
-	dispose() { }
 }
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatAccessibleView.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatAccessibleView.ts
index 797dae2825d..b1d46e25c5a 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatAccessibleView.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatAccessibleView.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { InlineChatController } from 'vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_RESPONSE_FOCUSED } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { AccessibleViewProviderId, AccessibleViewType } from 'vs/platform/accessibility/browser/accessibleView';
-import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IAccessibleViewImplentation } from 'vs/platform/accessibility/browser/accessibleViewRegistry';
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { renderMarkdownAsPlaintext } from 'vs/base/browser/markdownRenderer';
+import { InlineChatController } from './inlineChatController.js';
+import { CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_RESPONSE_FOCUSED } from '../common/inlineChat.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { AccessibleViewProviderId, AccessibleViewType, AccessibleContentProvider } from '../../../../platform/accessibility/browser/accessibleView.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IAccessibleViewImplentation } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { renderMarkdownAsPlaintext } from '../../../../base/browser/markdownRenderer.js';
+import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
 
 export class InlineChatAccessibleView implements IAccessibleViewImplentation {
 	readonly priority = 100;
@@ -34,15 +34,12 @@ export class InlineChatAccessibleView implements IAccessibleViewImplentation {
 		if (!responseContent) {
 			return;
 		}
-		return {
-			id: AccessibleViewProviderId.InlineChat,
-			verbositySettingKey: AccessibilityVerbositySettingId.InlineChat,
-			provideContent(): string { return renderMarkdownAsPlaintext(new MarkdownString(responseContent), true); },
-			onClose() {
-				controller.focus();
-			},
-			options: { type: AccessibleViewType.View }
-		};
+		return new AccessibleContentProvider(
+			AccessibleViewProviderId.InlineChat,
+			{ type: AccessibleViewType.View },
+			() => renderMarkdownAsPlaintext(new MarkdownString(responseContent), true),
+			() => controller.focus(),
+			AccessibilityVerbositySettingId.InlineChat
+		);
 	}
-	dispose() { }
 }
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts
index b7c33b6df15..9ad93733dcb 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts
@@ -3,38 +3,35 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from 'vs/base/common/codicons';
-import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { ICodeEditor, isCodeEditor, isDiffEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction2 } from 'vs/editor/browser/editorExtensions';
-import { EmbeddedDiffEditorWidget } from 'vs/editor/browser/widget/diffEditor/embeddedDiffEditorWidget';
-import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { InlineChatController, InlineChatRunOptions } from 'vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_HAS_AGENT, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, CTX_INLINE_CHAT_VISIBLE, MENU_INLINE_CHAT_WIDGET_STATUS, CTX_INLINE_CHAT_EDIT_MODE, EditMode, CTX_INLINE_CHAT_DOCUMENT_CHANGED, CTX_INLINE_CHAT_HAS_STASHED_SESSION, ACTION_ACCEPT_CHANGES, CTX_INLINE_CHAT_RESPONSE_TYPES, InlineChatResponseTypes, ACTION_VIEW_IN_CHAT, CTX_INLINE_CHAT_USER_DID_EDIT, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, MENU_INLINE_CHAT_WIDGET, ACTION_TOGGLE_DIFF, ACTION_REGENERATE_RESPONSE } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
-import { localize, localize2 } from 'vs/nls';
-import { Action2, IAction2Options } from 'vs/platform/actions/common/actions';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { fromNow } from 'vs/base/common/date';
-import { IInlineChatSessionService, Recording } from './inlineChatSessionService';
-import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from 'vs/platform/accessibility/common/accessibility';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IChatService } from 'vs/workbench/contrib/chat/common/chatService';
-import { CONTEXT_CHAT_REQUEST_IN_PROGRESS } from 'vs/workbench/contrib/chat/common/chatContextKeys';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { KeyChord, KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { ICodeEditor, isCodeEditor, isDiffEditor } from '../../../../editor/browser/editorBrowser.js';
+import { EditorAction2 } from '../../../../editor/browser/editorExtensions.js';
+import { EmbeddedDiffEditorWidget } from '../../../../editor/browser/widget/diffEditor/embeddedDiffEditorWidget.js';
+import { EmbeddedCodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/embeddedCodeEditorWidget.js';
+import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
+import { InlineChatController, InlineChatRunOptions } from './inlineChatController.js';
+import { ACTION_ACCEPT_CHANGES, CTX_INLINE_CHAT_HAS_AGENT, CTX_INLINE_CHAT_HAS_STASHED_SESSION, CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, CTX_INLINE_CHAT_DOCUMENT_CHANGED, CTX_INLINE_CHAT_EDIT_MODE, EditMode, MENU_INLINE_CHAT_WIDGET_STATUS, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_RESPONSE_TYPE, InlineChatResponseType, ACTION_REGENERATE_RESPONSE, ACTION_VIEW_IN_CHAT, ACTION_TOGGLE_DIFF, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, MENU_INLINE_CHAT_ZONE, ACTION_DISCARD_CHANGES, CTX_INLINE_CHAT_POSSIBLE } from '../common/inlineChat.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { Action2, IAction2Options, MenuId } from '../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from '../../../../platform/accessibility/common/accessibility.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IChatService } from '../../chat/common/chatService.js';
+import { CONTEXT_CHAT_INPUT_HAS_TEXT, CONTEXT_IN_CHAT_INPUT } from '../../chat/common/chatContextKeys.js';
+import { HunkInformation } from './inlineChatSession.js';
 
 CommandsRegistry.registerCommandAlias('interactiveEditor.start', 'inlineChat.start');
 CommandsRegistry.registerCommandAlias('interactive.acceptChanges', ACTION_ACCEPT_CHANGES);
 
-export const LOCALIZED_START_INLINE_CHAT_STRING = localize2('run', 'Start in Editor');
+
 export const START_INLINE_CHAT = registerIcon('start-inline-chat', Codicon.sparkle, localize('startInlineChat', 'Icon which spawns the inline chat from the editor toolbar.'));
 
 // some gymnastics to enable hold for speech without moving the StartSessionAction into the electron-layer
@@ -52,17 +49,26 @@ export class StartSessionAction extends EditorAction2 {
 	constructor() {
 		super({
 			id: 'inlineChat.start',
-			title: LOCALIZED_START_INLINE_CHAT_STRING,
+			title: localize2('run', 'Editor Inline Chat'),
 			category: AbstractInlineChatAction.category,
 			f1: true,
-			precondition: ContextKeyExpr.and(CTX_INLINE_CHAT_HAS_AGENT, EditorContextKeys.writable),
+			precondition: ContextKeyExpr.and(
+				CTX_INLINE_CHAT_HAS_AGENT,
+				CTX_INLINE_CHAT_POSSIBLE,
+				EditorContextKeys.writable
+			),
 			keybinding: {
 				when: EditorContextKeys.focus,
 				weight: KeybindingWeight.WorkbenchContrib,
 				primary: KeyMod.CtrlCmd | KeyCode.KeyI,
 				secondary: [KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.KeyI)],
 			},
-			icon: START_INLINE_CHAT
+			icon: START_INLINE_CHAT,
+			menu: {
+				id: MenuId.ChatCommandCenter,
+				group: 'b_inlineChat',
+				order: 10,
+			}
 		});
 	}
 
@@ -80,7 +86,7 @@ export class StartSessionAction extends EditorAction2 {
 
 		let options: InlineChatRunOptions | undefined;
 		const arg = _args[0];
-		if (arg && InlineChatRunOptions.isInteractiveEditorOptions(arg)) {
+		if (arg && InlineChatRunOptions.isInlineChatRunOptions(arg)) {
 			options = arg;
 		}
 		InlineChatController.get(editor)?.run({ ...options });
@@ -228,75 +234,6 @@ export class FocusInlineChat extends EditorAction2 {
 	}
 }
 
-export class DiscardHunkAction extends AbstractInlineChatAction {
-
-	constructor() {
-		super({
-			id: 'inlineChat.discardHunkChange',
-			title: localize('discard', 'Discard'),
-			icon: Codicon.clearAll,
-			precondition: CTX_INLINE_CHAT_VISIBLE,
-			menu: {
-				id: MENU_INLINE_CHAT_WIDGET_STATUS,
-				when: ContextKeyExpr.and(CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo(InlineChatResponseTypes.OnlyMessages), CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo(InlineChatResponseTypes.Empty), CTX_INLINE_CHAT_EDIT_MODE.isEqualTo(EditMode.Live)),
-				group: '0_main',
-				order: 3
-			}
-		});
-	}
-
-	async runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController, _editor: ICodeEditor, ..._args: any[]): Promise<void> {
-		return ctrl.discardHunk();
-	}
-}
-
-export class DiscardAction extends AbstractInlineChatAction {
-
-	constructor() {
-		super({
-			id: 'inlineChat.discard',
-			title: localize('discard', 'Discard'),
-			icon: Codicon.discard,
-			precondition: CTX_INLINE_CHAT_VISIBLE,
-			keybinding: {
-				weight: KeybindingWeight.EditorContrib - 1,
-				primary: KeyCode.Escape,
-				when: CTX_INLINE_CHAT_USER_DID_EDIT.negate()
-			}
-		});
-	}
-
-	async runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController, _editor: ICodeEditor, ..._args: any[]): Promise<void> {
-		await ctrl.cancelSession();
-	}
-}
-
-export class ToggleDiffForChange extends AbstractInlineChatAction {
-
-	constructor() {
-		super({
-			id: ACTION_TOGGLE_DIFF,
-			precondition: ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_EDIT_MODE.isEqualTo(EditMode.Live), CTX_INLINE_CHAT_CHANGE_HAS_DIFF),
-			title: localize2('showChanges', 'Toggle Changes'),
-			icon: Codicon.diffSingle,
-			toggled: {
-				condition: CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF,
-			},
-			menu: [
-				{
-					id: MENU_INLINE_CHAT_WIDGET_STATUS,
-					group: '1_main',
-					when: ContextKeyExpr.and(CTX_INLINE_CHAT_EDIT_MODE.isEqualTo(EditMode.Live), CTX_INLINE_CHAT_CHANGE_HAS_DIFF),
-					order: 10,
-				}
-			]
-		});
-	}
-
-	override runInlineChatCommand(accessor: ServicesAccessor, ctrl: InlineChatController): void {
-		ctrl.toggleDiff();
-	}
-}
 
 export class AcceptChanges extends AbstractInlineChatAction {
 
@@ -312,46 +249,100 @@ export class AcceptChanges extends AbstractInlineChatAction {
 				weight: KeybindingWeight.WorkbenchContrib + 10,
 				primary: KeyMod.CtrlCmd | KeyCode.Enter,
 			}],
-			menu: {
-				when: ContextKeyExpr.and(CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo(InlineChatResponseTypes.OnlyMessages), CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo(InlineChatResponseTypes.Empty)),
+			menu: [{
 				id: MENU_INLINE_CHAT_WIDGET_STATUS,
 				group: '0_main',
-				order: 0
-			}
+				order: 1,
+				when: ContextKeyExpr.and(
+					CONTEXT_CHAT_INPUT_HAS_TEXT.toNegated(),
+					CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated(),
+					CTX_INLINE_CHAT_RESPONSE_TYPE.isEqualTo(InlineChatResponseType.MessagesAndEdits)
+				),
+			}, {
+				id: MENU_INLINE_CHAT_ZONE,
+				group: 'navigation',
+				order: 1,
+			}]
 		});
 	}
 
-	override async runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController): Promise<void> {
-		ctrl.acceptHunk();
+	override async runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController, _editor: ICodeEditor, hunk?: HunkInformation | any): Promise<void> {
+		ctrl.acceptHunk(hunk);
 	}
 }
 
-export class CancelSessionAction extends AbstractInlineChatAction {
+export class DiscardHunkAction extends AbstractInlineChatAction {
 
 	constructor() {
 		super({
-			id: 'inlineChat.cancel',
-			title: localize('cancel', 'Cancel'),
-			icon: Codicon.clearAll,
-			precondition: ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_EDIT_MODE.isEqualTo(EditMode.Preview)),
-			keybinding: {
-				weight: KeybindingWeight.EditorContrib - 1,
-				primary: KeyCode.Escape
-			},
-			menu: {
+			id: ACTION_DISCARD_CHANGES,
+			title: localize('discard', 'Discard'),
+			icon: Codicon.chromeClose,
+			precondition: CTX_INLINE_CHAT_VISIBLE,
+			menu: [{
 				id: MENU_INLINE_CHAT_WIDGET_STATUS,
-				when: ContextKeyExpr.and(CTX_INLINE_CHAT_EDIT_MODE.isEqualTo(EditMode.Preview), CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo(InlineChatResponseTypes.Empty)),
 				group: '0_main',
-				order: 3
+				order: 2,
+				when: ContextKeyExpr.and(
+					CONTEXT_CHAT_INPUT_HAS_TEXT.toNegated(),
+					CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.negate(),
+					CTX_INLINE_CHAT_RESPONSE_TYPE.isEqualTo(InlineChatResponseType.MessagesAndEdits),
+					CTX_INLINE_CHAT_EDIT_MODE.isEqualTo(EditMode.Live)
+				),
+			}, {
+				id: MENU_INLINE_CHAT_ZONE,
+				group: 'navigation',
+				order: 2
+			}],
+			keybinding: {
+				weight: KeybindingWeight.EditorContrib,
+				primary: KeyCode.Escape,
+				when: CTX_INLINE_CHAT_RESPONSE_TYPE.isEqualTo(InlineChatResponseType.MessagesAndEdits)
 			}
 		});
 	}
 
-	async runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController, _editor: ICodeEditor, ..._args: any[]): Promise<void> {
-		ctrl.cancelSession();
+	async runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController, _editor: ICodeEditor, hunk?: HunkInformation | any): Promise<void> {
+		return ctrl.discardHunk(hunk);
 	}
 }
 
+export class RerunAction extends AbstractInlineChatAction {
+	constructor() {
+		super({
+			id: ACTION_REGENERATE_RESPONSE,
+			title: localize2('chat.rerun.label', "Rerun Request"),
+			shortTitle: localize('rerun', 'Rerun'),
+			f1: false,
+			icon: Codicon.refresh,
+			precondition: CTX_INLINE_CHAT_VISIBLE,
+			menu: {
+				id: MENU_INLINE_CHAT_WIDGET_STATUS,
+				group: '0_main',
+				order: 5,
+				when: ContextKeyExpr.and(
+					CONTEXT_CHAT_INPUT_HAS_TEXT.toNegated(),
+					CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.negate(),
+					CTX_INLINE_CHAT_RESPONSE_TYPE.notEqualsTo(InlineChatResponseType.None)
+				)
+			},
+			keybinding: {
+				weight: KeybindingWeight.WorkbenchContrib,
+				primary: KeyMod.CtrlCmd | KeyCode.KeyR
+			}
+		});
+	}
+
+	override async runInlineChatCommand(accessor: ServicesAccessor, ctrl: InlineChatController, _editor: ICodeEditor, ..._args: any[]): Promise<void> {
+		const chatService = accessor.get(IChatService);
+		const model = ctrl.chatWidget.viewModel?.model;
+
+		const lastRequest = model?.getRequests().at(-1);
+		if (lastRequest) {
+			await chatService.resendRequest(lastRequest, { noCommandDetection: false, attempt: lastRequest.attempt + 1, location: ctrl.chatWidget.location });
+		}
+	}
+}
 
 export class CloseAction extends AbstractInlineChatAction {
 
@@ -362,15 +353,21 @@ export class CloseAction extends AbstractInlineChatAction {
 			icon: Codicon.close,
 			precondition: CTX_INLINE_CHAT_VISIBLE,
 			keybinding: {
-				weight: KeybindingWeight.EditorContrib - 1,
+				weight: KeybindingWeight.EditorContrib + 1,
 				primary: KeyCode.Escape,
-				when: CTX_INLINE_CHAT_USER_DID_EDIT.negate()
 			},
-			menu: {
-				id: MENU_INLINE_CHAT_WIDGET,
-				group: 'navigation',
-				order: 10,
-			}
+			menu: [{
+				id: MENU_INLINE_CHAT_WIDGET_STATUS,
+				group: '0_main',
+				order: 1,
+				when: ContextKeyExpr.and(
+					CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.negate(),
+					ContextKeyExpr.or(
+						CTX_INLINE_CHAT_RESPONSE_TYPE.isEqualTo(InlineChatResponseType.Messages),
+						CTX_INLINE_CHAT_EDIT_MODE.isEqualTo(EditMode.Preview)
+					)
+				),
+			}]
 		});
 	}
 
@@ -387,6 +384,11 @@ export class ConfigureInlineChatAction extends AbstractInlineChatAction {
 			icon: Codicon.settingsGear,
 			precondition: CTX_INLINE_CHAT_VISIBLE,
 			f1: true,
+			menu: {
+				id: MENU_INLINE_CHAT_WIDGET_STATUS,
+				group: 'zzz',
+				order: 5
+			}
 		});
 	}
 
@@ -435,42 +437,6 @@ export class MoveToPreviousHunk extends AbstractInlineChatAction {
 	}
 }
 
-export class CopyRecordings extends AbstractInlineChatAction {
-
-	constructor() {
-		super({
-			id: 'inlineChat.copyRecordings',
-			f1: true,
-			title: localize2('copyRecordings', "(Developer) Write Exchange to Clipboard")
-		});
-	}
-
-	override async runInlineChatCommand(accessor: ServicesAccessor): Promise<void> {
-
-		const clipboardService = accessor.get(IClipboardService);
-		const quickPickService = accessor.get(IQuickInputService);
-		const ieSessionService = accessor.get(IInlineChatSessionService);
-
-		const recordings = ieSessionService.recordings().filter(r => r.exchanges.length > 0);
-		if (recordings.length === 0) {
-			return;
-		}
-
-		const picks: (IQuickPickItem & { rec: Recording })[] = recordings.map(rec => {
-			return {
-				rec,
-				label: localize('label', "'{0}' and {1} follow ups ({2})", rec.exchanges[0].prompt, rec.exchanges.length - 1, fromNow(rec.when, true)),
-				tooltip: rec.exchanges.map(ex => ex.prompt).join('\n'),
-			};
-		});
-
-		const pick = await quickPickService.pick(picks, { canPickMany: false });
-		if (pick) {
-			clipboardService.writeText(JSON.stringify(pick.rec, undefined, 2));
-		}
-	}
-}
-
 export class ViewInChatAction extends AbstractInlineChatAction {
 	constructor() {
 		super({
@@ -478,10 +444,25 @@ export class ViewInChatAction extends AbstractInlineChatAction {
 			title: localize('viewInChat', 'View in Chat'),
 			icon: Codicon.commentDiscussion,
 			precondition: CTX_INLINE_CHAT_VISIBLE,
-			menu: {
-				id: MENU_INLINE_CHAT_WIDGET,
-				group: 'navigation',
-				order: 5
+			menu: [{
+				id: MENU_INLINE_CHAT_WIDGET_STATUS,
+				group: 'more',
+				order: 1,
+				when: CTX_INLINE_CHAT_RESPONSE_TYPE.notEqualsTo(InlineChatResponseType.Messages)
+			}, {
+				id: MENU_INLINE_CHAT_WIDGET_STATUS,
+				group: '0_main',
+				order: 1,
+				when: ContextKeyExpr.and(
+					CONTEXT_CHAT_INPUT_HAS_TEXT.toNegated(),
+					CTX_INLINE_CHAT_RESPONSE_TYPE.isEqualTo(InlineChatResponseType.Messages),
+					CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.negate()
+				)
+			}],
+			keybinding: {
+				weight: KeybindingWeight.WorkbenchContrib,
+				primary: KeyMod.CtrlCmd | KeyCode.DownArrow,
+				when: CONTEXT_IN_CHAT_INPUT
 			}
 		});
 	}
@@ -490,29 +471,32 @@ export class ViewInChatAction extends AbstractInlineChatAction {
 	}
 }
 
-export class RerunAction extends AbstractInlineChatAction {
+export class ToggleDiffForChange extends AbstractInlineChatAction {
+
 	constructor() {
 		super({
-			id: ACTION_REGENERATE_RESPONSE,
-			title: localize2('chat.rerun.label', "Rerun Request"),
-			f1: false,
-			icon: Codicon.refresh,
-			precondition: CONTEXT_CHAT_REQUEST_IN_PROGRESS.negate(),
-			menu: {
+			id: ACTION_TOGGLE_DIFF,
+			precondition: ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_EDIT_MODE.isEqualTo(EditMode.Live), CTX_INLINE_CHAT_CHANGE_HAS_DIFF),
+			title: localize2('showChanges', 'Toggle Changes'),
+			icon: Codicon.diffSingle,
+			toggled: {
+				condition: CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF,
+			},
+			menu: [{
 				id: MENU_INLINE_CHAT_WIDGET_STATUS,
-				group: '0_main',
-				order: 5,
-			}
+				group: 'zzz',
+				when: ContextKeyExpr.and(CTX_INLINE_CHAT_EDIT_MODE.isEqualTo(EditMode.Live)),
+				order: 1,
+			}, {
+				id: MENU_INLINE_CHAT_ZONE,
+				group: 'navigation',
+				when: CTX_INLINE_CHAT_CHANGE_HAS_DIFF,
+				order: 2
+			}]
 		});
 	}
 
-	override async runInlineChatCommand(accessor: ServicesAccessor, ctrl: InlineChatController, _editor: ICodeEditor, ..._args: any[]): Promise<void> {
-		const chatService = accessor.get(IChatService);
-		const model = ctrl.chatWidget.viewModel?.model;
-
-		const lastRequest = model?.getRequests().at(-1);
-		if (lastRequest) {
-			await chatService.resendRequest(lastRequest, { noCommandDetection: false, attempt: lastRequest.attempt + 1, location: ctrl.chatWidget.location });
-		}
+	override runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController, _editor: ICodeEditor, hunkInfo: HunkInformation | any): void {
+		ctrl.toggleDiff(hunkInfo);
 	}
 }
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatContentWidget.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatContentWidget.ts
deleted file mode 100644
index c305b01aab4..00000000000
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatContentWidget.ts
+++ /dev/null
@@ -1,196 +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 'vs/css!./media/inlineChatContentWidget';
-import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from 'vs/editor/browser/editorBrowser';
-import * as dom from 'vs/base/browser/dom';
-import { IDimension } from 'vs/editor/common/core/dimension';
-import { Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { inlineChatBackground } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
-import { Session } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSession';
-import { ChatWidget } from 'vs/workbench/contrib/chat/browser/chatWidget';
-import { ChatAgentLocation } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { editorBackground, editorForeground, inputBackground } from 'vs/platform/theme/common/colorRegistry';
-import { ChatModel } from 'vs/workbench/contrib/chat/common/chatModel';
-import { Range } from 'vs/editor/common/core/range';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { ScrollType } from 'vs/editor/common/editorCommon';
-
-export class InlineChatContentWidget implements IContentWidget {
-
-	readonly suppressMouseDown = false;
-	readonly allowEditorOverflow = true;
-
-	private readonly _store = new DisposableStore();
-	private readonly _domNode = document.createElement('div');
-	private readonly _inputContainer = document.createElement('div');
-	private readonly _messageContainer = document.createElement('div');
-
-	private _position?: IPosition;
-
-	private readonly _onDidBlur = this._store.add(new Emitter<void>());
-	readonly onDidBlur: Event<void> = this._onDidBlur.event;
-
-	private _visible: boolean = false;
-	private _focusNext: boolean = false;
-
-	private readonly _defaultChatModel: ChatModel;
-	private readonly _widget: ChatWidget;
-
-	constructor(
-		location: ChatAgentLocation,
-		private readonly _editor: ICodeEditor,
-		@IInstantiationService instaService: IInstantiationService,
-		@IContextKeyService contextKeyService: IContextKeyService,
-	) {
-
-		this._defaultChatModel = this._store.add(instaService.createInstance(ChatModel, undefined, ChatAgentLocation.Editor));
-
-		const scopedInstaService = instaService.createChild(
-			new ServiceCollection([
-				IContextKeyService,
-				this._store.add(contextKeyService.createScoped(this._domNode))
-			]),
-			this._store
-		);
-
-		this._widget = scopedInstaService.createInstance(
-			ChatWidget,
-			location,
-			{ resource: true },
-			{
-				defaultElementHeight: 32,
-				editorOverflowWidgetsDomNode: _editor.getOverflowWidgetsDomNode(),
-				renderStyle: 'compact',
-				renderInputOnTop: true,
-				renderFollowups: true,
-				supportsFileReferences: false,
-				menus: {
-					telemetrySource: 'inlineChat-content'
-				},
-				filter: _item => false
-			},
-			{
-				listForeground: editorForeground,
-				listBackground: inlineChatBackground,
-				inputEditorBackground: inputBackground,
-				resultEditorBackground: editorBackground
-			}
-		);
-		this._store.add(this._widget);
-		this._widget.render(this._inputContainer);
-		this._widget.setModel(this._defaultChatModel, {});
-		this._store.add(this._widget.inputEditor.onDidContentSizeChange(() => _editor.layoutContentWidget(this)));
-
-		this._domNode.tabIndex = -1;
-		this._domNode.className = 'inline-chat-content-widget interactive-session';
-
-		this._domNode.appendChild(this._inputContainer);
-
-		this._messageContainer.classList.add('hidden', 'message');
-		this._domNode.appendChild(this._messageContainer);
-
-
-		const tracker = dom.trackFocus(this._domNode);
-		this._store.add(tracker.onDidBlur(() => {
-			if (this._visible
-				// && !"ON"
-			) {
-				this._onDidBlur.fire();
-			}
-		}));
-		this._store.add(tracker);
-	}
-
-	dispose(): void {
-		this._store.dispose();
-	}
-
-	getId(): string {
-		return 'inline-chat-content-widget';
-	}
-
-	getDomNode(): HTMLElement {
-		return this._domNode;
-	}
-
-	getPosition(): IContentWidgetPosition | null {
-		if (!this._position) {
-			return null;
-		}
-		return {
-			position: this._position,
-			preference: [ContentWidgetPositionPreference.ABOVE]
-		};
-	}
-
-	beforeRender(): IDimension | null {
-
-		const maxHeight = this._widget.input.inputEditor.getOption(EditorOption.lineHeight) * 5;
-		const inputEditorHeight = this._widget.contentHeight;
-
-		this._widget.layout(Math.min(maxHeight, inputEditorHeight), 390);
-
-		// const actualHeight = this._widget.inputPartHeight;
-		// return new dom.Dimension(width, actualHeight);
-		return null;
-	}
-
-	afterRender(): void {
-		if (this._focusNext) {
-			this._focusNext = false;
-			this._widget.focusInput();
-		}
-	}
-
-	// ---
-
-	get chatWidget(): ChatWidget {
-		return this._widget;
-	}
-
-	get isVisible(): boolean {
-		return this._visible;
-	}
-
-	get value(): string {
-		return this._widget.inputEditor.getValue();
-	}
-
-	show(position: IPosition) {
-		if (!this._visible) {
-			this._visible = true;
-			this._focusNext = true;
-
-			this._editor.revealRangeNearTopIfOutsideViewport(Range.fromPositions(position), ScrollType.Immediate);
-			this._widget.inputEditor.setValue('');
-
-			const wordInfo = this._editor.getModel()?.getWordAtPosition(position);
-
-			this._position = wordInfo ? new Position(position.lineNumber, wordInfo.startColumn) : position;
-			this._editor.addContentWidget(this);
-			this._widget.setVisible(true);
-		}
-	}
-
-	hide() {
-		if (this._visible) {
-			this._visible = false;
-			this._editor.removeContentWidget(this);
-			this._widget.saveState();
-			this._widget.setVisible(false);
-		}
-	}
-
-	setSession(session: Session): void {
-		this._widget.setModel(session.chatModel, {});
-		this._widget.setInputPlaceholder(session.agent.description ?? '');
-	}
-}
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts
index 7b0c50ff990..166d0106819 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts
@@ -3,60 +3,58 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as aria from 'vs/base/browser/ui/aria/aria';
-import { Barrier, DeferredPromise, Queue } from 'vs/base/common/async';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Lazy } from 'vs/base/common/lazy';
-import { DisposableStore, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { MovingAverage } from 'vs/base/common/numbers';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { assertType } from 'vs/base/common/types';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { ISelection, Selection } from 'vs/editor/common/core/selection';
-import { IEditorContribution, IEditorDecorationsCollection } from 'vs/editor/common/editorCommon';
-import { CompletionItemKind, CompletionList, TextEdit } from 'vs/editor/common/languages';
-import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController';
-import { localize } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IChatWidgetService, showChatView } from 'vs/workbench/contrib/chat/browser/chat';
-import { IChatService } from 'vs/workbench/contrib/chat/common/chatService';
-import { IInlineChatSavingService } from './inlineChatSavingService';
-import { EmptyResponse, ErrorResponse, ReplyResponse, Session, SessionPrompt } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSession';
-import { IInlineChatSessionService } from './inlineChatSessionService';
-import { EditModeStrategy, IEditObserver, LiveStrategy, PreviewStrategy, ProgressingEditsOptions } from 'vs/workbench/contrib/inlineChat/browser/inlineChatStrategies';
-import { InlineChatZoneWidget } from './inlineChatZoneWidget';
-import { CTX_INLINE_CHAT_RESPONSE_TYPES, CTX_INLINE_CHAT_USER_DID_EDIT, CTX_INLINE_CHAT_VISIBLE, EditMode, INLINE_CHAT_ID, InlineChatConfigKeys, InlineChatResponseTypes } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
-import { StashedSession } from './inlineChatSession';
-import { IModelDeltaDecoration, ITextModel, IValidEditOperation } from 'vs/editor/common/model';
-import { InlineChatContentWidget } from 'vs/workbench/contrib/inlineChat/browser/inlineChatContentWidget';
-import { MessageController } from 'vs/editor/contrib/message/browser/messageController';
-import { ChatModel, ChatRequestRemovalReason, IChatRequestModel, IChatTextEditGroup, IChatTextEditGroupState, IResponse } from 'vs/workbench/contrib/chat/common/chatModel';
-import { InlineChatError } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { ChatInputPart } from 'vs/workbench/contrib/chat/browser/chatInputPart';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { DefaultModelSHA1Computer } from 'vs/editor/common/services/modelService';
-import { generateUuid } from 'vs/base/common/uuid';
-import { isEqual } from 'vs/base/common/resources';
-import { ChatAgentLocation } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { INotebookEditorService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorService';
+import * as aria from '../../../../base/browser/ui/aria/aria.js';
+import { Barrier, DeferredPromise, Queue } from '../../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { toErrorMessage } from '../../../../base/common/errorMessage.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Lazy } from '../../../../base/common/lazy.js';
+import { DisposableStore, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { MovingAverage } from '../../../../base/common/numbers.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { StopWatch } from '../../../../base/common/stopwatch.js';
+import { assertType } from '../../../../base/common/types.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { ICodeEditor, isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { IPosition, Position } from '../../../../editor/common/core/position.js';
+import { IRange, Range } from '../../../../editor/common/core/range.js';
+import { ISelection, Selection, SelectionDirection } from '../../../../editor/common/core/selection.js';
+import { IEditorContribution } from '../../../../editor/common/editorCommon.js';
+import { TextEdit } from '../../../../editor/common/languages.js';
+import { IValidEditOperation } from '../../../../editor/common/model.js';
+import { IEditorWorkerService } from '../../../../editor/common/services/editorWorker.js';
+import { DefaultModelSHA1Computer } from '../../../../editor/common/services/modelService.js';
+import { InlineCompletionsController } from '../../../../editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.js';
+import { MessageController } from '../../../../editor/contrib/message/browser/messageController.js';
+import { localize } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { showChatView } from '../../chat/browser/chat.js';
+import { IChatWidgetLocationOptions } from '../../chat/browser/chatWidget.js';
+import { ChatAgentLocation } from '../../chat/common/chatAgents.js';
+import { ChatModel, ChatRequestRemovalReason, IChatRequestModel, IChatTextEditGroup, IChatTextEditGroupState, IResponse } from '../../chat/common/chatModel.js';
+import { IChatService } from '../../chat/common/chatService.js';
+import { HunkInformation, HunkState, Session, StashedSession } from './inlineChatSession.js';
+import { InlineChatError } from './inlineChatSessionServiceImpl.js';
+import { EditModeStrategy, HunkAction, IEditObserver, LiveStrategy, PreviewStrategy, ProgressingEditsOptions } from './inlineChatStrategies.js';
+import { CTX_INLINE_CHAT_EDITING, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_RESPONSE_TYPE, CTX_INLINE_CHAT_USER_DID_EDIT, CTX_INLINE_CHAT_VISIBLE, EditMode, INLINE_CHAT_ID, InlineChatConfigKeys, InlineChatResponseType } from '../common/inlineChat.js';
+import { INotebookEditorService } from '../../notebook/browser/services/notebookEditorService.js';
+import { IEditorService, SIDE_GROUP } from '../../../services/editor/common/editorService.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { IInlineChatSavingService } from './inlineChatSavingService.js';
+import { IInlineChatSessionService } from './inlineChatSessionService.js';
+import { InlineChatZoneWidget } from './inlineChatZoneWidget.js';
+import { CONTEXT_RESPONSE, CONTEXT_RESPONSE_ERROR } from '../../chat/common/chatContextKeys.js';
 
 export const enum State {
 	CREATE_SESSION = 'CREATE_SESSION',
 	INIT_UI = 'INIT_UI',
 	WAIT_FOR_INPUT = 'WAIT_FOR_INPUT',
 	SHOW_REQUEST = 'SHOW_REQUEST',
-	SHOW_RESPONSE = 'SHOW_RESPONSE',
 	PAUSE = 'PAUSE',
 	CANCEL = 'CANCEL',
 	ACCEPT = 'DONE',
@@ -81,8 +79,9 @@ export abstract class InlineChatRunOptions {
 	isUnstashed?: boolean;
 	position?: IPosition;
 	withIntentDetection?: boolean;
+	headless?: boolean;
 
-	static isInteractiveEditorOptions(options: any): options is InlineChatRunOptions {
+	static isInlineChatRunOptions(options: any): options is InlineChatRunOptions {
 		const { initialSelection, initialRange, message, autoSend, position, existingSession } = <InlineChatRunOptions>options;
 		if (
 			typeof message !== 'undefined' && typeof message !== 'string'
@@ -106,26 +105,26 @@ export class InlineChatController implements IEditorContribution {
 
 	private _isDisposed: boolean = false;
 	private readonly _store = new DisposableStore();
-	// private readonly _input: Lazy<InlineChatContentWidget>;
-	// private readonly _zone: Lazy<InlineChatZoneWidget>;
 
-	private readonly _ui: Lazy<{ content: InlineChatContentWidget; zone: InlineChatZoneWidget }>;
+	private readonly _ui: Lazy<InlineChatZoneWidget>;
 
 	private readonly _ctxVisible: IContextKey<boolean>;
-	private readonly _ctxResponseTypes: IContextKey<undefined | InlineChatResponseTypes>;
+	private readonly _ctxEditing: IContextKey<boolean>;
+	private readonly _ctxResponseType: IContextKey<undefined | InlineChatResponseType>;
 	private readonly _ctxUserDidEdit: IContextKey<boolean>;
+	private readonly _ctxRequestInProgress: IContextKey<boolean>;
 
-	private _messages = this._store.add(new Emitter<Message>());
+	private readonly _ctxResponse: IContextKey<boolean>;
+
+	private readonly _messages = this._store.add(new Emitter<Message>());
+	protected readonly _onDidEnterState = this._store.add(new Emitter<State>());
+	readonly onDidEnterState = this._onDidEnterState.event;
 
 	private readonly _onWillStartSession = this._store.add(new Emitter<void>());
 	readonly onWillStartSession = this._onWillStartSession.event;
 
 	get chatWidget() {
-		if (this._ui.value.content.isVisible) {
-			return this._ui.value.content.chatWidget;
-		} else {
-			return this._ui.value.zone.widget.chatWidget;
-		}
+		return this._ui.value.widget.chatWidget;
 	}
 
 	private readonly _sessionStore = this._store.add(new DisposableStore());
@@ -144,31 +143,48 @@ export class InlineChatController implements IEditorContribution {
 		@IDialogService private readonly _dialogService: IDialogService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IChatService private readonly _chatService: IChatService,
-		@ILanguageFeaturesService private readonly _languageFeatureService: ILanguageFeaturesService,
-		@IChatWidgetService private readonly _chatWidgetService: IChatWidgetService,
+		@IEditorService private readonly _editorService: IEditorService,
 		@INotebookEditorService notebookEditorService: INotebookEditorService,
 	) {
 		this._ctxVisible = CTX_INLINE_CHAT_VISIBLE.bindTo(contextKeyService);
+		this._ctxEditing = CTX_INLINE_CHAT_EDITING.bindTo(contextKeyService);
 		this._ctxUserDidEdit = CTX_INLINE_CHAT_USER_DID_EDIT.bindTo(contextKeyService);
-		this._ctxResponseTypes = CTX_INLINE_CHAT_RESPONSE_TYPES.bindTo(contextKeyService);
+		this._ctxResponseType = CTX_INLINE_CHAT_RESPONSE_TYPE.bindTo(contextKeyService);
+		this._ctxRequestInProgress = CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.bindTo(contextKeyService);
+
+		this._ctxResponse = CONTEXT_RESPONSE.bindTo(contextKeyService);
+		CONTEXT_RESPONSE_ERROR.bindTo(contextKeyService);
 
 		this._ui = new Lazy(() => {
-			let location = ChatAgentLocation.Editor;
+
+			const location: IChatWidgetLocationOptions = {
+				location: ChatAgentLocation.Editor,
+				resolveData: () => {
+					assertType(this._editor.hasModel());
+					assertType(this._session);
+					return {
+						type: ChatAgentLocation.Editor,
+						selection: this._editor.getSelection(),
+						document: this._session.textModelN.uri,
+						wholeRange: this._session?.wholeRange.trackedInitialRange,
+					};
+				}
+			};
 
 			// inline chat in notebooks
 			// check if this editor is part of a notebook editor
-			// and iff so, use the notebook location
+			// and iff so, use the notebook location but keep the resolveData
+			// talk about editor data
 			for (const notebookEditor of notebookEditorService.listNotebookEditors()) {
 				for (const [, codeEditor] of notebookEditor.codeEditors) {
 					if (codeEditor === this._editor) {
-						location = ChatAgentLocation.Notebook;
+						location.location = ChatAgentLocation.Notebook;
 						break;
 					}
 				}
 			}
-			const content = this._store.add(_instaService.createInstance(InlineChatContentWidget, location, this._editor));
-			const zone = this._store.add(_instaService.createInstance(InlineChatZoneWidget, location, this._editor));
-			return { content, zone };
+
+			return this._store.add(_instaService.createInstance(InlineChatZoneWidget, location, this._editor));
 		});
 
 		this._store.add(this._editor.onDidChangeModel(async e => {
@@ -188,10 +204,7 @@ export class InlineChatController implements IEditorContribution {
 		this._store.add(this._inlineChatSessionService.onDidEndSession(e => {
 			if (e.session === this._session && e.endedByExternalCause) {
 				this._log('session ENDED by external cause');
-				this._session = undefined;
-				this._strategy?.cancel();
-				this._resetWidget();
-				this.cancelSession();
+				this.finishExistingSession();
 			}
 		}));
 
@@ -202,7 +215,7 @@ export class InlineChatController implements IEditorContribution {
 			}
 		}));
 
-		this._log('NEW controller');
+		this._log(`NEW controller`);
 	}
 
 	dispose(): void {
@@ -220,12 +233,12 @@ export class InlineChatController implements IEditorContribution {
 		if (message instanceof Error) {
 			this._logService.error(message, ...more);
 		} else {
-			this._logService.trace(`[IE] (editor:${this._editor.getId()})${message}`, ...more);
+			this._logService.trace(`[IE] (editor:${this._editor.getId()}) ${message}`, ...more);
 		}
 	}
 
 	getMessage(): string | undefined {
-		return this._ui.value.zone.widget.responseContent;
+		return this._ui.value.widget.responseContent;
 	}
 
 	getId(): string {
@@ -237,7 +250,7 @@ export class InlineChatController implements IEditorContribution {
 	}
 
 	getWidgetPosition(): Position | undefined {
-		return this._ui.value.zone.position;
+		return this._ui.value.position;
 	}
 
 	private _currentRun?: Promise<void>;
@@ -258,6 +271,7 @@ export class InlineChatController implements IEditorContribution {
 
 		} catch (error) {
 			// this should not happen but when it does make sure to tear down the UI and everything
+			this._log('error during run', error);
 			onUnexpectedError(error);
 			if (this._session) {
 				this._inlineChatSessionService.releaseSession(this._session);
@@ -275,7 +289,9 @@ export class InlineChatController implements IEditorContribution {
 		let nextState: State | void = state;
 		while (nextState && !this._isDisposed) {
 			this._log('setState to ', nextState);
-			nextState = await this[nextState](options);
+			const p: State | Promise<State> | Promise<void> = this[nextState](options);
+			this._onDidEnterState.fire(nextState);
+			nextState = await p;
 		}
 	}
 
@@ -285,14 +301,13 @@ export class InlineChatController implements IEditorContribution {
 
 		let session: Session | undefined = options.existingSession;
 
-
 		let initPosition: Position | undefined;
 		if (options.position) {
 			initPosition = Position.lift(options.position).delta(-1);
 			delete options.position;
 		}
 
-		const widgetPosition = this._showWidget(true, initPosition);
+		const widgetPosition = this._showWidget(options.headless ?? session?.headless, true, initPosition);
 
 		// this._updatePlaceholder();
 		let errorMessage = localize('create.fail', "Failed to start editor chat");
@@ -304,8 +319,7 @@ export class InlineChatController implements IEditorContribution {
 				if (m === Message.ACCEPT_INPUT) {
 					// user accepted the input before having a session
 					options.autoSend = true;
-					this._ui.value.zone.widget.updateProgress(true);
-					this._ui.value.zone.widget.updateInfo(localize('welcome.2', "Getting ready..."));
+					this._ui.value.widget.updateInfo(localize('welcome.2', "Getting ready..."));
 				} else {
 					createSessionCts.cancel();
 				}
@@ -349,11 +363,11 @@ export class InlineChatController implements IEditorContribution {
 		// create a new strategy
 		switch (session.editMode) {
 			case EditMode.Preview:
-				this._strategy = this._instaService.createInstance(PreviewStrategy, session, this._editor, this._ui.value.zone);
+				this._strategy = this._instaService.createInstance(PreviewStrategy, session, this._editor, this._ui.value);
 				break;
 			case EditMode.Live:
 			default:
-				this._strategy = this._instaService.createInstance(LiveStrategy, session, this._editor, this._ui.value.zone);
+				this._strategy = this._instaService.createInstance(LiveStrategy, session, this._editor, this._ui.value, session.headless || this._configurationService.getValue<boolean>(InlineChatConfigKeys.ZoneToolbar));
 				break;
 		}
 
@@ -361,7 +375,7 @@ export class InlineChatController implements IEditorContribution {
 		return State.INIT_UI;
 	}
 
-	private async [State.INIT_UI](options: InlineChatRunOptions): Promise<State.WAIT_FOR_INPUT | State.SHOW_RESPONSE> {
+	private async [State.INIT_UI](options: InlineChatRunOptions): Promise<State.WAIT_FOR_INPUT | State.SHOW_REQUEST> {
 		assertType(this._session);
 		assertType(this._strategy);
 
@@ -371,21 +385,27 @@ export class InlineChatController implements IEditorContribution {
 		this._sessionStore.clear();
 
 		const wholeRangeDecoration = this._editor.createDecorationsCollection();
-		const updateWholeRangeDecoration = () => {
+		const handleWholeRangeChange = () => {
 			const newDecorations = this._strategy?.getWholeRangeDecoration() ?? [];
 			wholeRangeDecoration.set(newDecorations);
+
+			this._ctxEditing.set(!this._session?.wholeRange.trackedInitialRange.isEmpty());
 		};
-		this._sessionStore.add(toDisposable(() => wholeRangeDecoration.clear()));
-		this._sessionStore.add(this._session.wholeRange.onDidChange(updateWholeRangeDecoration));
-		updateWholeRangeDecoration();
+		this._sessionStore.add(toDisposable(() => {
+			wholeRangeDecoration.clear();
+			this._ctxEditing.reset();
+		}));
+		this._sessionStore.add(this._session.wholeRange.onDidChange(handleWholeRangeChange));
+		handleWholeRangeChange();
 
-		this._sessionStore.add(this._ui.value.content.onDidBlur(() => this.cancelSession()));
-
-		this._ui.value.content.setSession(this._session);
-		// this._ui.value.zone.widget.updateSlashCommands(this._session.session.slashCommands ?? []);
+		this._ui.value.widget.setChatModel(this._session.chatModel);
 		this._updatePlaceholder();
 
-		this._showWidget(!this._session.chatModel.hasRequests);
+
+		const isModelEmpty = !this._session.chatModel.hasRequests;
+		this._ui.value.widget.updateToolbar(true);
+		this._ui.value.widget.toggleStatus(!isModelEmpty);
+		this._showWidget(this._session.headless, isModelEmpty);
 
 		this._sessionStore.add(this._editor.onDidChangeModel((e) => {
 			const msg = this._session?.chatModel.hasRequests
@@ -424,128 +444,49 @@ export class InlineChatController implements IEditorContribution {
 		}));
 
 		this._sessionStore.add(this._session.chatModel.onDidChange(async e => {
-			if (e.kind === 'addRequest' && e.request.response) {
-				this._ui.value.zone.widget.updateProgress(true);
-
-				const listener = e.request.response.onDidChange(() => {
-
-					if (e.request.response?.isCanceled || e.request.response?.isComplete) {
-						this._ui.value.zone.widget.updateProgress(false);
-						listener.dispose();
-					}
-				});
-			} else if (e.kind === 'removeRequest') {
+			if (e.kind === 'removeRequest') {
 				// TODO@jrieken there is still some work left for when a request "in the middle"
 				// is removed. We will undo all changes till that point but not remove those
 				// later request
-				const exchange = this._session!.exchanges.find(candidate => candidate.prompt.request.id === e.requestId);
-				if (exchange && this._editor.hasModel()) {
-					// undo till this point
-					this._session!.hunkData.ignoreTextModelNChanges = true;
-					try {
-
-						const model = this._editor.getModel();
-						const targetAltVersion = exchange.prompt.modelAltVersionId;
-						while (targetAltVersion < model.getAlternativeVersionId() && model.canUndo()) {
-							await model.undo();
-						}
-					} finally {
-						this._session!.hunkData.ignoreTextModelNChanges = false;
-					}
-				}
+				await this._session!.undoChangesUntil(e.requestId);
 			}
 		}));
 
-		// #region DEBT
-		// DEBT@jrieken
-		// REMOVE when agents are adopted
-		this._sessionStore.add(this._languageFeatureService.completionProvider.register({ scheme: ChatInputPart.INPUT_SCHEME, hasAccessToAllModels: true }, {
-			_debugDisplayName: 'inline chat commands',
-			triggerCharacters: ['/'],
-			provideCompletionItems: (model, position, context, token) => {
-				if (position.lineNumber !== 1) {
-					return undefined;
-				}
-				if (!this._session || !this._session.agent.slashCommands) {
-					return undefined;
-				}
-				const widget = this._chatWidgetService.getWidgetByInputUri(model.uri);
-				if (widget !== this._ui.value.zone.widget.chatWidget && widget !== this._ui.value.content.chatWidget) {
-					return undefined;
-				}
-
-				const result: CompletionList = { suggestions: [], incomplete: false };
-				for (const command of this._session.agent.slashCommands) {
-					const withSlash = `/${command.name}`;
-					result.suggestions.push({
-						label: { label: withSlash, description: command.description ?? '' },
-						kind: CompletionItemKind.Text,
-						insertText: withSlash,
-						range: Range.fromPositions(new Position(1, 1), position),
-					});
-				}
-
-				return result;
+		// apply edits from completed requests that haven't been applied yet
+		const editState = this._createChatTextEditGroupState();
+		let didEdit = false;
+		for (const request of this._session.chatModel.getRequests()) {
+			if (!request.response) {
+				// done when seeing the first request that is still pending (no response).
+				break;
 			}
-		}));
-
-		const updateSlashDecorations = (collection: IEditorDecorationsCollection, model: ITextModel) => {
-
-			const newDecorations: IModelDeltaDecoration[] = [];
-			for (const command of (this._session?.agent.slashCommands ?? []).sort((a, b) => b.name.length - a.name.length)) {
-				const withSlash = `/${command.name}`;
-				const firstLine = model.getLineContent(1);
-				if (firstLine.startsWith(withSlash)) {
-					newDecorations.push({
-						range: new Range(1, 1, 1, withSlash.length + 1),
-						options: {
-							description: 'inline-chat-slash-command',
-							inlineClassName: 'inline-chat-slash-command',
-							after: {
-								// Force some space between slash command and placeholder
-								content: ' '
-							}
-						}
-					});
-
-					// inject detail when otherwise empty
-					if (firstLine.trim() === `/${command.name}`) {
-						newDecorations.push({
-							range: new Range(1, withSlash.length, 1, withSlash.length),
-							options: {
-								description: 'inline-chat-slash-command-detail',
-								after: {
-									content: `${command.description}`,
-									inlineClassName: 'inline-chat-slash-command-detail'
-								}
-							}
-						});
-					}
-					break;
+			for (const part of request.response.response.value) {
+				if (part.kind !== 'textEditGroup' || !isEqual(part.uri, this._session.textModelN.uri)) {
+					continue;
 				}
+				if (part.state?.applied) {
+					continue;
+				}
+				for (const edit of part.edits) {
+					this._makeChanges(edit, undefined, !didEdit);
+					didEdit = true;
+				}
+				part.state ??= editState;
 			}
-			collection.set(newDecorations);
-		};
-		const inputInputEditor = this._ui.value.content.chatWidget.inputEditor;
-		const zoneInputEditor = this._ui.value.zone.widget.chatWidget.inputEditor;
-		const inputDecorations = inputInputEditor.createDecorationsCollection();
-		const zoneDecorations = zoneInputEditor.createDecorationsCollection();
-		this._sessionStore.add(inputInputEditor.onDidChangeModelContent(() => updateSlashDecorations(inputDecorations, inputInputEditor.getModel()!)));
-		this._sessionStore.add(zoneInputEditor.onDidChangeModelContent(() => updateSlashDecorations(zoneDecorations, zoneInputEditor.getModel()!)));
-		this._sessionStore.add(toDisposable(() => {
-			inputDecorations.clear();
-			zoneDecorations.clear();
-		}));
+		}
+		if (didEdit) {
+			const diff = await this._editorWorkerService.computeDiff(this._session.textModel0.uri, this._session.textModelN.uri, { computeMoves: false, maxComputationTimeMs: Number.MAX_SAFE_INTEGER, ignoreTrimWhitespace: false }, 'advanced');
+			this._session.wholeRange.fixup(diff?.changes ?? []);
+			await this._session.hunkData.recompute(editState, diff);
 
-		//#endregion ------- DEBT
+			this._updateCtxResponseType();
+		}
+		options.position = await this._strategy.renderChanges();
 
-		if (!this._session.chatModel.hasRequests) {
-			return State.WAIT_FOR_INPUT;
-		} else if (options.isUnstashed) {
-			delete options.isUnstashed;
-			return State.SHOW_RESPONSE;
+		if (this._session.chatModel.requestInProgress) {
+			return State.SHOW_REQUEST;
 		} else {
-			return State.SHOW_RESPONSE;
+			return State.WAIT_FOR_INPUT;
 		}
 	}
 
@@ -559,7 +500,7 @@ export class InlineChatController implements IEditorContribution {
 			this.updateInput(options.message);
 			aria.alert(options.message);
 			delete options.message;
-			this._showWidget(false);
+			this._showWidget(this._session.headless, false);
 		}
 
 		let message = Message.NONE;
@@ -584,8 +525,8 @@ export class InlineChatController implements IEditorContribution {
 
 		if (options.autoSend) {
 			delete options.autoSend;
-			this._showWidget(false);
-			this._ui.value.zone.widget.chatWidget.acceptInput();
+			this._showWidget(this._session.headless, false);
+			this._ui.value.widget.chatWidget.acceptInput();
 		}
 
 		await barrier.wait();
@@ -601,7 +542,7 @@ export class InlineChatController implements IEditorContribution {
 		}
 
 		if (message & Message.ACCEPT_SESSION) {
-			this._ui.value.zone.widget.selectAll(false);
+			this._ui.value.widget.selectAll(false);
 			return State.ACCEPT;
 		}
 
@@ -609,29 +550,28 @@ export class InlineChatController implements IEditorContribution {
 			return State.WAIT_FOR_INPUT;
 		}
 
-		const input = request.message.text;
-		this._ui.value.zone.widget.value = input;
-
-		this._session.addInput(new SessionPrompt(request, this._editor.getModel()!.getAlternativeVersionId()));
 
 		return State.SHOW_REQUEST;
 	}
 
 
-	private async [State.SHOW_REQUEST](): Promise<State.SHOW_RESPONSE | State.CANCEL | State.PAUSE | State.ACCEPT | State.WAIT_FOR_INPUT> {
+	private async [State.SHOW_REQUEST](options: InlineChatRunOptions): Promise<State.WAIT_FOR_INPUT | State.CANCEL | State.PAUSE | State.ACCEPT> {
 		assertType(this._session);
+		assertType(this._strategy);
 		assertType(this._session.chatModel.requestInProgress);
 
+		this._ctxRequestInProgress.set(true);
+
 		const { chatModel } = this._session;
-		const request: IChatRequestModel | undefined = chatModel.getRequests().at(-1);
+		const request = chatModel.lastRequest;
 
 		assertType(request);
 		assertType(request.response);
 
-		this._showWidget(false);
-		this._ui.value.zone.widget.value = request.message.text;
-		this._ui.value.zone.widget.selectAll(false);
-		this._ui.value.zone.widget.updateInfo('');
+		this._showWidget(this._session.headless, false);
+		this._ui.value.widget.selectAll(false);
+		this._ui.value.widget.updateInfo('');
+		this._ui.value.widget.toggleStatus(true);
 
 		const { response } = request;
 		const responsePromise = new DeferredPromise<void>();
@@ -643,7 +583,8 @@ export class InlineChatController implements IEditorContribution {
 		const progressiveEditsClock = StopWatch.create();
 		const progressiveEditsQueue = new Queue();
 
-		let next: State.SHOW_RESPONSE | State.SHOW_REQUEST | State.CANCEL | State.PAUSE | State.ACCEPT | State.WAIT_FOR_INPUT = State.SHOW_RESPONSE;
+		let next: State.WAIT_FOR_INPUT | State.SHOW_REQUEST | State.CANCEL | State.PAUSE | State.ACCEPT = State.WAIT_FOR_INPUT;
+
 		store.add(Event.once(this._messages.event)(message => {
 			this._log('state=_makeRequest) message received', message);
 			this._chatService.cancelCurrentRequestForSession(chatModel.sessionId);
@@ -656,7 +597,7 @@ export class InlineChatController implements IEditorContribution {
 			}
 		}));
 
-		store.add(chatModel.onDidChange(e => {
+		store.add(chatModel.onDidChange(async e => {
 			if (e.kind === 'removeRequest' && e.requestId === request.id) {
 				progressiveEditsCts.cancel();
 				responsePromise.complete();
@@ -665,27 +606,69 @@ export class InlineChatController implements IEditorContribution {
 				} else {
 					next = State.CANCEL;
 				}
+				return;
+			}
+			if (e.kind === 'move') {
+				assertType(this._session);
+				const log: typeof this._log = (msg: string, ...args: any[]) => this._log('state=_showRequest) moving inline chat', msg, ...args);
+
+				log('move was requested', e.target, e.range);
+
+				// if there's already a tab open for targetUri, show it and move inline chat to that tab
+				// otherwise, open the tab to the side
+				const initialSelection = Selection.fromRange(Range.lift(e.range), SelectionDirection.LTR);
+				const editorPane = await this._editorService.openEditor({ resource: e.target, options: { selection: initialSelection } }, SIDE_GROUP);
+
+				if (!editorPane) {
+					log('opening editor failed');
+					return;
+				}
+
+				const newEditor = editorPane.getControl();
+				if (!isCodeEditor(newEditor) || !newEditor.hasModel()) {
+					log('new editor is either missing or not a code editor or does not have a model');
+					return;
+				}
+
+				if (this._inlineChatSessionService.getSession(newEditor, e.target)) {
+					log('new editor ALREADY has a session');
+					return;
+				}
+
+				const newSession = await this._inlineChatSessionService.createSession(
+					newEditor,
+					{
+						editMode: this._getMode(),
+						session: this._session,
+					},
+					CancellationToken.None); // TODO@ulugbekna: add proper cancellation?
+
+
+				InlineChatController.get(newEditor)?.run({ existingSession: newSession });
+
+				next = State.CANCEL;
+				responsePromise.complete();
+
+				return;
 			}
 		}));
 
 		// cancel the request when the user types
-		store.add(this._ui.value.zone.widget.chatWidget.inputEditor.onDidChangeModelContent(() => {
+		store.add(this._ui.value.widget.chatWidget.inputEditor.onDidChangeModelContent(() => {
 			this._chatService.cancelCurrentRequestForSession(chatModel.sessionId);
 		}));
 
 		let lastLength = 0;
 		let isFirstChange = true;
 
-		const sha1 = new DefaultModelSHA1Computer();
-		const textModel0Sha1 = sha1.canComputeSHA1(this._session.textModel0)
-			? sha1.computeSHA1(this._session.textModel0)
-			: generateUuid();
-		const editState: IChatTextEditGroupState = { sha1: textModel0Sha1, applied: 0 };
+		const editState = this._createChatTextEditGroupState();
 		let localEditGroup: IChatTextEditGroup | undefined;
 
 		// apply edits
 		const handleResponse = () => {
 
+			this._updateCtxResponseType();
+
 			if (!localEditGroup) {
 				localEditGroup = <IChatTextEditGroup | undefined>response.response.value.find(part => part.kind === 'textEditGroup' && isEqual(part.uri, this._session?.textModelN.uri));
 			}
@@ -697,6 +680,9 @@ export class InlineChatController implements IEditorContribution {
 				const edits = localEditGroup.edits;
 				const newEdits = edits.slice(lastLength);
 				if (newEdits.length > 0) {
+
+					this._log(`${this._session?.textModelN.uri.toString()} received ${newEdits.length} edits`);
+
 					// NEW changes
 					lastLength = edits.length;
 					progressiveEditsAvgDuration.update(progressiveEditsClock.elapsed());
@@ -720,8 +706,8 @@ export class InlineChatController implements IEditorContribution {
 
 						// reshow the widget if the start position changed or shows at the wrong position
 						const startNow = this._session!.wholeRange.value.getStartPosition();
-						if (!startNow.equals(startThen) || !this._ui.value.zone.position?.equals(startNow)) {
-							this._showWidget(false, startNow.delta(-1));
+						if (!startNow.equals(startThen) || !this._ui.value.position?.equals(startNow)) {
+							this._showWidget(this._session!.headless, false, startNow.delta(-1));
 						}
 					});
 				}
@@ -743,66 +729,50 @@ export class InlineChatController implements IEditorContribution {
 		await responsePromise.p;
 		await progressiveEditsQueue.whenIdle();
 
+		if (response.result?.errorDetails) {
+			await this._session.undoChangesUntil(response.requestId);
+		}
+
 		store.dispose();
 
-		// todo@jrieken we can likely remove 'trackEdit'
 		const diff = await this._editorWorkerService.computeDiff(this._session.textModel0.uri, this._session.textModelN.uri, { computeMoves: false, maxComputationTimeMs: Number.MAX_SAFE_INTEGER, ignoreTrimWhitespace: false }, 'advanced');
 		this._session.wholeRange.fixup(diff?.changes ?? []);
+		await this._session.hunkData.recompute(editState, diff);
 
-		await this._session.hunkData.recompute(editState);
+		this._ctxRequestInProgress.set(false);
 
-		this._ui.value.zone.widget.updateToolbar(true);
-		this._ui.value.zone.widget.updateProgress(false);
-
-		return next;
-	}
-
-	private async[State.SHOW_RESPONSE](): Promise<State.WAIT_FOR_INPUT> {
-		assertType(this._session);
-		assertType(this._strategy);
-
-		const { response } = this._session.lastExchange!;
-
-		let responseTypes: InlineChatResponseTypes | undefined;
-		for (const request of this._session.chatModel.getRequests()) {
-			if (!request.response) {
-				continue;
-			}
-			const thisType = asInlineChatResponseType(request.response.response);
-			if (responseTypes === undefined) {
-				responseTypes = thisType;
-			} else if (responseTypes !== thisType) {
-				responseTypes = InlineChatResponseTypes.Mixed;
-				break;
-			}
-		}
-		this._ctxResponseTypes.set(responseTypes);
 
 		let newPosition: Position | undefined;
 
-		if (response instanceof EmptyResponse) {
-			// show status message
+		if (response.result?.errorDetails) {
+			// error -> no message, errors are shown with the request
+
+		} else if (response.response.value.length === 0) {
+			// empty -> show message
 			const status = localize('empty', "No results, please refine your input and try again");
-			this._ui.value.zone.widget.updateStatus(status, { classes: ['warn'] });
-			return State.WAIT_FOR_INPUT;
+			this._ui.value.widget.updateStatus(status, { classes: ['warn'] });
 
-		} else if (response instanceof ErrorResponse) {
-			// show error
-			if (!response.isCancellation) {
-				this._ui.value.zone.widget.updateStatus(response.message, { classes: ['error'] });
-				this._strategy?.cancel();
-			}
-
-		} else if (response instanceof ReplyResponse) {
-			// real response -> complex...
-			this._ui.value.zone.widget.updateStatus('');
-			this._ui.value.zone.widget.updateToolbar(true);
-
-			newPosition = await this._strategy.renderChanges(response);
+		} else {
+			// real response -> no message
+			this._ui.value.widget.updateStatus('');
 		}
-		this._showWidget(false, newPosition);
 
-		return State.WAIT_FOR_INPUT;
+		const position = await this._strategy.renderChanges();
+		if (position) {
+			// if the selection doesn't start far off we keep the widget at its current position
+			// because it makes reading this nicer
+			const selection = this._editor.getSelection();
+			if (selection?.containsPosition(position)) {
+				if (position.lineNumber - selection.startLineNumber > 8) {
+					newPosition = position;
+				}
+			} else {
+				newPosition = position;
+			}
+		}
+		this._showWidget(this._session.headless, false, newPosition);
+
+		return next;
 	}
 
 	private async[State.PAUSE]() {
@@ -842,7 +812,7 @@ export class InlineChatController implements IEditorContribution {
 			this._sessionStore.clear();
 
 			// only stash sessions that were not unstashed, not "empty", and not interacted with
-			const shouldStash = !this._session.isUnstashed && !!this._session.lastExchange && this._session.hunkData.size === this._session.hunkData.pending;
+			const shouldStash = !this._session.isUnstashed && this._session.chatModel.hasRequests && this._session.hunkData.size === this._session.hunkData.pending;
 			let undoCancelEdits: IValidEditOperation[] = [];
 			try {
 				undoCancelEdits = this._strategy.cancel();
@@ -869,57 +839,38 @@ export class InlineChatController implements IEditorContribution {
 
 	// ----
 
-	private _showWidget(initialRender: boolean = false, position?: Position) {
+	private _showWidget(headless: boolean = false, initialRender: boolean = false, position?: Position) {
 		assertType(this._editor.hasModel());
+		this._ctxVisible.set(true);
 
 		let widgetPosition: Position;
 		if (position) {
 			// explicit position wins
 			widgetPosition = position;
-		} else if (this._ui.rawValue?.zone?.position) {
+		} else if (this._ui.rawValue?.position) {
 			// already showing - special case of line 1
-			if (this._ui.rawValue?.zone.position.lineNumber === 1) {
-				widgetPosition = this._ui.rawValue?.zone.position.delta(-1);
+			if (this._ui.rawValue?.position.lineNumber === 1) {
+				widgetPosition = this._ui.rawValue?.position.delta(-1);
 			} else {
-				widgetPosition = this._ui.rawValue?.zone.position;
+				widgetPosition = this._ui.rawValue?.position;
 			}
 		} else {
 			// default to ABOVE the selection
 			widgetPosition = this._editor.getSelection().getStartPosition().delta(-1);
 		}
 
-		if (this._session && !position && (this._session.hasChangedText || this._session.lastExchange)) {
-			widgetPosition = this._session.wholeRange.value.getStartPosition().delta(-1);
+		if (this._session && !position && (this._session.hasChangedText || this._session.chatModel.hasRequests)) {
+			widgetPosition = this._session.wholeRange.trackedInitialRange.getStartPosition().delta(-1);
 		}
 
-		if (this._ui.rawValue?.zone?.position) {
-			this._ui.value.zone.updatePositionAndHeight(widgetPosition);
-
-		} else if (initialRender) {
-			const selection = this._editor.getSelection();
-			widgetPosition = selection.getStartPosition();
-			// TODO@jrieken we are not ready for this
-			// widgetPosition = selection.getEndPosition();
-			// if (Range.spansMultipleLines(selection) && widgetPosition.column === 1) {
-			// 	// selection ends on "nothing" -> move up to match the
-			// 	// rendered/visible part of the selection
-			// 	widgetPosition = this._editor.getModel().validatePosition(widgetPosition.delta(-1, Number.MAX_SAFE_INTEGER));
-			// }
-			this._ui.value.content.show(widgetPosition);
-
-		} else {
-			this._ui.value.content.hide();
-			this._ui.value.zone.show(widgetPosition);
-			if (this._session) {
-				this._ui.value.zone.widget.setChatModel(this._session.chatModel);
+		if (!headless) {
+			if (this._ui.rawValue?.position) {
+				this._ui.value.updatePositionAndHeight(widgetPosition);
+			} else {
+				this._ui.value.show(widgetPosition);
 			}
 		}
 
-		if (this._session && this._ui.rawValue?.zone) {
-			this._ui.rawValue?.zone.updateBackgroundColor(widgetPosition, this._session.wholeRange.value);
-		}
-
-		this._ctxVisible.set(true);
 		return widgetPosition;
 	}
 
@@ -928,8 +879,7 @@ export class InlineChatController implements IEditorContribution {
 		this._ctxVisible.reset();
 		this._ctxUserDidEdit.reset();
 
-		this._ui.rawValue?.content.hide();
-		this._ui.rawValue?.zone?.hide();
+		this._ui.rawValue?.hide();
 
 		// Return focus to the editor only if the current focus is within the editor widget
 		if (this._editor.hasWidgetFocus()) {
@@ -937,6 +887,46 @@ export class InlineChatController implements IEditorContribution {
 		}
 	}
 
+	private _updateCtxResponseType(): void {
+
+		if (!this._session) {
+			this._ctxResponseType.set(InlineChatResponseType.None);
+			return;
+		}
+
+		const hasLocalEdit = (response: IResponse): boolean => {
+			return response.value.some(part => part.kind === 'textEditGroup' && isEqual(part.uri, this._session?.textModelN.uri));
+		};
+
+		let responseType = InlineChatResponseType.None;
+		for (const request of this._session.chatModel.getRequests()) {
+			if (!request.response) {
+				continue;
+			}
+			responseType = InlineChatResponseType.Messages;
+			if (hasLocalEdit(request.response.response)) {
+				responseType = InlineChatResponseType.MessagesAndEdits;
+				break; // no need to check further
+			}
+		}
+		this._ctxResponseType.set(responseType);
+		this._ctxResponse.set(responseType !== InlineChatResponseType.None);
+	}
+
+	private _createChatTextEditGroupState(): IChatTextEditGroupState {
+		assertType(this._session);
+
+		const sha1 = new DefaultModelSHA1Computer();
+		const textModel0Sha1 = sha1.canComputeSHA1(this._session.textModel0)
+			? sha1.computeSHA1(this._session.textModel0)
+			: generateUuid();
+
+		return {
+			sha1: textModel0Sha1,
+			applied: 0
+		};
+	}
+
 	private async _makeChanges(edits: TextEdit[], opts: ProgressingEditsOptions | undefined, undoStopBefore: boolean) {
 		assertType(this._session);
 		assertType(this._strategy);
@@ -958,7 +948,6 @@ export class InlineChatController implements IEditorContribution {
 		};
 
 		this._inlineChatSavingService.markChanged(this._session);
-		this._session.wholeRange.trackEdits(editOperations);
 		if (opts) {
 			await this._strategy.makeProgressiveChanges(editOperations, editsObserver, opts, undoStopBefore);
 		} else {
@@ -969,7 +958,7 @@ export class InlineChatController implements IEditorContribution {
 	private _forcedPlaceholder: string | undefined = undefined;
 
 	private _updatePlaceholder(): void {
-		this._ui.value.zone.widget.placeholder = this._getPlaceholderText();
+		this._ui.value.widget.placeholder = this._getPlaceholderText();
 	}
 
 	private _getPlaceholderText(): string {
@@ -979,8 +968,21 @@ export class InlineChatController implements IEditorContribution {
 	// ---- controller API
 
 	showSaveHint(): void {
-		const status = localize('savehint', "Accept or discard changes to continue saving");
-		this._ui.value.zone.widget.updateStatus(status, { classes: ['warn'] });
+		if (!this._session) {
+			return;
+		}
+
+		const status = localize('savehint', "Accept or discard changes to continue saving.");
+		this._ui.value.widget.updateStatus(status, { classes: ['warn'] });
+
+		if (this._ui.value.position) {
+			this._editor.revealLineInCenterIfOutsideViewport(this._ui.value.position.lineNumber);
+		} else {
+			const hunk = this._session.hunkData.getInfo().find(info => info.getState() === HunkState.Pending);
+			if (hunk) {
+				this._editor.revealLineInCenterIfOutsideViewport(hunk.getRangesN()[0].startLineNumber);
+			}
+		}
 	}
 
 	acceptInput() {
@@ -989,12 +991,10 @@ export class InlineChatController implements IEditorContribution {
 
 	updateInput(text: string, selectAll = true): void {
 
-		this._ui.value.content.chatWidget.setInput(text);
-		this._ui.value.zone.widget.chatWidget.setInput(text);
+		this._ui.value.widget.chatWidget.setInput(text);
 		if (selectAll) {
 			const newSelection = new Selection(1, 1, Number.MAX_SAFE_INTEGER, 1);
-			this._ui.value.content.chatWidget.inputEditor.setSelection(newSelection);
-			this._ui.value.zone.widget.chatWidget.inputEditor.setSelection(newSelection);
+			this._ui.value.widget.chatWidget.inputEditor.setSelection(newSelection);
 		}
 	}
 
@@ -1003,9 +1003,9 @@ export class InlineChatController implements IEditorContribution {
 	}
 
 	arrowOut(up: boolean): void {
-		if (this._ui.value.zone.position && this._editor.hasModel()) {
+		if (this._ui.value.position && this._editor.hasModel()) {
 			const { column } = this._editor.getPosition();
-			const { lineNumber } = this._ui.value.zone.position;
+			const { lineNumber } = this._ui.value.position;
 			const newLine = up ? lineNumber : lineNumber + 1;
 			this._editor.setPosition({ lineNumber: newLine, column });
 			this._editor.focus();
@@ -1013,17 +1013,13 @@ export class InlineChatController implements IEditorContribution {
 	}
 
 	focus(): void {
-		this._ui.value.zone.widget.focus();
+		this._ui.value.widget.focus();
 	}
 
 	hasFocus(): boolean {
-		return this._ui.value.zone.widget.hasFocus();
+		return this._ui.value.widget.hasFocus();
 	}
 
-	moveHunk(next: boolean) {
-		this.focus();
-		this._strategy?.move?.(next);
-	}
 
 	async viewInChat() {
 		if (!this._strategy || !this._session) {
@@ -1053,6 +1049,7 @@ export class InlineChatController implements IEditorContribution {
 		if (someApplied) {
 			assertType(lastEdit);
 			lastEdit.edits = [doEdits];
+			lastEdit.state!.applied = 0;
 		}
 
 		await this._instaService.invokeFunction(moveToPanelChat, this._session?.chatModel);
@@ -1060,17 +1057,14 @@ export class InlineChatController implements IEditorContribution {
 		this.cancelSession();
 	}
 
-	toggleDiff() {
-		this._strategy?.toggleDiff?.();
-	}
-
 	acceptSession(): void {
-		if (this._session?.lastExchange?.response instanceof ReplyResponse && this._session?.lastExchange?.response.chatResponse) {
-			const response = this._session?.lastExchange?.response.chatResponse;
+		const response = this._session?.chatModel.getRequests().at(-1)?.response;
+		if (response) {
 			this._chatService.notifyUserAction({
-				sessionId: this._session.chatModel.sessionId,
+				sessionId: response.session.sessionId,
 				requestId: response.requestId,
 				agentId: response.agent?.id,
+				command: response.slashCommand?.name,
 				result: response.result,
 				action: {
 					kind: 'inlineChat',
@@ -1081,22 +1075,31 @@ export class InlineChatController implements IEditorContribution {
 		this._messages.fire(Message.ACCEPT_SESSION);
 	}
 
-	acceptHunk() {
-		return this._strategy?.acceptHunk();
+	acceptHunk(hunkInfo?: HunkInformation) {
+		return this._strategy?.performHunkAction(hunkInfo, HunkAction.Accept);
 	}
 
-	discardHunk() {
-		return this._strategy?.discardHunk();
+	discardHunk(hunkInfo?: HunkInformation) {
+		return this._strategy?.performHunkAction(hunkInfo, HunkAction.Discard);
+	}
+
+	toggleDiff(hunkInfo?: HunkInformation) {
+		return this._strategy?.performHunkAction(hunkInfo, HunkAction.ToggleDiff);
+	}
+
+	moveHunk(next: boolean) {
+		this.focus();
+		this._strategy?.performHunkAction(undefined, next ? HunkAction.MoveNext : HunkAction.MovePrev);
 	}
 
 	async cancelSession() {
-
-		if (this._session?.lastExchange?.response instanceof ReplyResponse && this._session?.lastExchange?.response.chatResponse) {
-			const response = this._session?.lastExchange?.response.chatResponse;
+		const response = this._session?.chatModel.lastRequest?.response;
+		if (response) {
 			this._chatService.notifyUserAction({
-				sessionId: this._session.chatModel.sessionId,
+				sessionId: response.session.sessionId,
 				requestId: response.requestId,
 				agentId: response.agent?.id,
+				command: response.slashCommand?.name,
 				result: response.result,
 				action: {
 					kind: 'inlineChat',
@@ -1120,6 +1123,20 @@ export class InlineChatController implements IEditorContribution {
 		}
 	}
 
+	reportIssue() {
+		const response = this._session?.chatModel.lastRequest?.response;
+		if (response) {
+			this._chatService.notifyUserAction({
+				sessionId: response.session.sessionId,
+				requestId: response.requestId,
+				agentId: response.agent?.id,
+				command: response.slashCommand?.name,
+				result: response.result,
+				action: { kind: 'bug' }
+			});
+		}
+	}
+
 	unstashLastSession(): Session | undefined {
 		const result = this._stashedSession.value?.unstash();
 		if (result) {
@@ -1131,6 +1148,37 @@ export class InlineChatController implements IEditorContribution {
 	joinCurrentRun(): Promise<void> | undefined {
 		return this._currentRun;
 	}
+
+	async reviewEdits(anchor: IRange, stream: AsyncIterable<TextEdit>, token: CancellationToken) {
+		if (!this._editor.hasModel()) {
+			return false;
+		}
+
+		const session = await this._inlineChatSessionService.createSession(this._editor, { editMode: EditMode.Live, wholeRange: anchor, headless: true }, token);
+		if (!session) {
+			return false;
+		}
+
+		const request = session.chatModel.addRequest({ text: 'DUMMY', parts: [] }, { variables: [] }, 0);
+		const run = this.run({
+			existingSession: session,
+			headless: true
+		});
+
+		await Event.toPromise(Event.filter(this._onDidEnterState.event, candidate => candidate === State.SHOW_REQUEST));
+
+		for await (const chunk of stream) {
+			session.chatModel.acceptResponseProgress(request, { kind: 'textEdit', uri: this._editor.getModel()!.uri, edits: [chunk] });
+		}
+
+		if (token.isCancellationRequested) {
+			session.chatModel.cancelRequest(request);
+		} else {
+			session.chatModel.completeResponse(request);
+		}
+		await run;
+		return true;
+	}
 }
 
 async function moveToPanelChat(accessor: ServicesAccessor, model: ChatModel | undefined) {
@@ -1147,25 +1195,3 @@ async function moveToPanelChat(accessor: ServicesAccessor, model: ChatModel | un
 		widget.focusLastMessage();
 	}
 }
-
-function asInlineChatResponseType(response: IResponse): InlineChatResponseTypes {
-	let result: InlineChatResponseTypes | undefined;
-	for (const item of response.value) {
-		let thisType: InlineChatResponseTypes;
-		switch (item.kind) {
-			case 'textEditGroup':
-				thisType = InlineChatResponseTypes.OnlyEdits;
-				break;
-			case 'markdownContent':
-			default:
-				thisType = InlineChatResponseTypes.OnlyMessages;
-				break;
-		}
-		if (result === undefined) {
-			result = thisType;
-		} else if (result !== thisType) {
-			return InlineChatResponseTypes.Mixed;
-		}
-	}
-	return result ?? InlineChatResponseTypes.Empty;
-}
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.ts
new file mode 100644
index 00000000000..d3df7bce374
--- /dev/null
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.ts
@@ -0,0 +1,166 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { IActiveCodeEditor, ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { CursorChangeReason } from '../../../../editor/common/cursorEvents.js';
+import { IEditorContribution } from '../../../../editor/common/editorCommon.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IChatAgentService } from '../../chat/common/chatAgents.js';
+import { InlineChatController, State } from './inlineChatController.js';
+import { CTX_INLINE_CHAT_HAS_AGENT, CTX_INLINE_CHAT_VISIBLE } from '../common/inlineChat.js';
+import { EditorAction2, ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
+import { EditOperation } from '../../../../editor/common/core/editOperation.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { AbstractInlineChatAction } from './inlineChatActions.js';
+import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
+import { IValidEditOperation } from '../../../../editor/common/model.js';
+
+
+export const CTX_INLINE_CHAT_EXPANSION = new RawContextKey<boolean>('inlineChatExpansion', false, localize('inlineChatExpansion', "Whether the inline chat expansion is enabled when at the end of a just-typed line"));
+
+export class InlineChatExansionContextKey implements IEditorContribution {
+
+	static Id = 'editor.inlineChatExpansion';
+
+	private readonly _store = new DisposableStore();
+	private readonly _editorListener = this._store.add(new MutableDisposable());
+
+	private readonly _ctxInlineChatExpansion: IContextKey<boolean>;
+
+	constructor(
+		editor: ICodeEditor,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IChatAgentService chatAgentService: IChatAgentService
+	) {
+		this._ctxInlineChatExpansion = CTX_INLINE_CHAT_EXPANSION.bindTo(contextKeyService);
+
+		const update = () => {
+			if (editor.hasModel() && chatAgentService.getAgents().length > 0) {
+				this._install(editor);
+			} else {
+				this._uninstall();
+			}
+		};
+		this._store.add(chatAgentService.onDidChangeAgents(update));
+		this._store.add(editor.onDidChangeModel(update));
+		update();
+	}
+
+	dispose(): void {
+		this._ctxInlineChatExpansion.reset();
+		this._store.dispose();
+	}
+
+	private _install(editor: IActiveCodeEditor): void {
+
+		const store = new DisposableStore();
+		this._editorListener.value = store;
+
+		const model = editor.getModel();
+		const lastChangeEnds: number[] = [];
+
+		store.add(editor.onDidChangeCursorPosition(e => {
+
+			let enabled = false;
+
+			if (e.reason === CursorChangeReason.NotSet) {
+
+				const position = editor.getPosition();
+				const positionOffset = model.getOffsetAt(position);
+
+				const lineLength = model.getLineLength(position.lineNumber);
+				const firstNonWhitespace = model.getLineFirstNonWhitespaceColumn(position.lineNumber);
+
+				if (firstNonWhitespace !== 0 && position.column > lineLength && lastChangeEnds.includes(positionOffset)) {
+					enabled = true;
+				}
+			}
+
+			lastChangeEnds.length = 0;
+			this._ctxInlineChatExpansion.set(enabled);
+
+		}));
+
+		store.add(editor.onDidChangeModelContent(e => {
+			lastChangeEnds.length = 0;
+			for (const change of e.changes) {
+				const changeEnd = change.rangeOffset + change.text.length;
+				lastChangeEnds.push(changeEnd);
+			}
+			queueMicrotask(() => {
+				if (lastChangeEnds.length > 0) {
+					// this is a signal that onDidChangeCursorPosition didn't run which means some outside change
+					// which means we should disable the context key
+					this._ctxInlineChatExpansion.set(false);
+				}
+			});
+		}));
+	}
+
+	private _uninstall(): void {
+		this._editorListener.clear();
+	}
+}
+
+export class InlineChatExpandLineAction extends EditorAction2 {
+
+	constructor() {
+		super({
+			id: 'inlineChat.startWithCurrentLine',
+			category: AbstractInlineChatAction.category,
+			title: localize2('startWithCurrentLine', "Start in Editor with Current Line"),
+			f1: true,
+			precondition: ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE.negate(), CTX_INLINE_CHAT_HAS_AGENT, EditorContextKeys.writable),
+			// keybinding: {
+			// 	when: CTX_INLINE_CHAT_EXPANSION,
+			// 	weight: KeybindingWeight.EditorContrib,
+			// 	primary: KeyCode.Tab
+			// }
+		});
+	}
+
+	override async runEditorCommand(_accessor: ServicesAccessor, editor: ICodeEditor) {
+		const ctrl = InlineChatController.get(editor);
+		if (!ctrl || !editor.hasModel()) {
+			return;
+		}
+
+		const model = editor.getModel();
+		const lineNumber = editor.getSelection().positionLineNumber;
+		const lineContent = model.getLineContent(lineNumber);
+
+		const startColumn = model.getLineFirstNonWhitespaceColumn(lineNumber);
+		const endColumn = model.getLineMaxColumn(lineNumber);
+
+		// clear the line
+		let undoEdits: IValidEditOperation[] = [];
+		model.pushEditOperations(null, [EditOperation.replace(new Range(lineNumber, startColumn, lineNumber, endColumn), '')], (edits) => {
+			undoEdits = edits;
+			return null;
+		});
+
+		let lastState: State | undefined;
+		const d = ctrl.onDidEnterState(e => lastState = e);
+
+		try {
+			// trigger chat
+			await ctrl.run({
+				autoSend: true,
+				message: lineContent.trim(),
+				position: new Position(lineNumber, startColumn)
+			});
+
+		} finally {
+			d.dispose();
+		}
+
+		if (lastState === State.CANCEL) {
+			model.pushEditOperations(null, undoEdits, () => null);
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatFileCreationWidget.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatFileCreationWidget.ts
deleted file mode 100644
index eca335cb375..00000000000
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatFileCreationWidget.ts
+++ /dev/null
@@ -1,256 +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 { Dimension, h } from 'vs/base/browser/dom';
-import { DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Range } from 'vs/editor/common/core/range';
-import { ZoneWidget } from 'vs/editor/contrib/zoneWidget/browser/zoneWidget';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import * as colorRegistry from 'vs/platform/theme/common/colorRegistry';
-import * as editorColorRegistry from 'vs/editor/common/core/editorColorRegistry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { INLINE_CHAT_ID, inlineChatRegionHighlight } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
-import { Position } from 'vs/editor/common/core/position';
-import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
-import { ResourceLabel } from 'vs/workbench/browser/labels';
-import { FileKind } from 'vs/platform/files/common/files';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { ButtonBar, IButton } from 'vs/base/browser/ui/button/button';
-import { defaultButtonStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { SaveReason, SideBySideEditor } from 'vs/workbench/common/editor';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IAction, toAction } from 'vs/base/common/actions';
-import { IUntitledTextEditorModel } from 'vs/workbench/services/untitled/common/untitledTextEditorModel';
-import { renderIcon } from 'vs/base/browser/ui/iconLabel/iconLabels';
-import { Codicon } from 'vs/base/common/codicons';
-import { TAB_ACTIVE_MODIFIED_BORDER } from 'vs/workbench/common/theme';
-import { localize } from 'vs/nls';
-import { Event } from 'vs/base/common/event';
-
-export class InlineChatFileCreatePreviewWidget extends ZoneWidget {
-
-	private static TitleHeight = 35;
-
-	private readonly _elements = h('div.inline-chat-newfile-widget@domNode', [
-		h('div.title@title', [
-			h('span.name.show-file-icons@name'),
-			h('span.detail@detail'),
-		]),
-		h('div.editor@editor'),
-	]);
-
-	private readonly _name: ResourceLabel;
-	private readonly _previewEditor: ICodeEditor;
-	private readonly _previewStore = new MutableDisposable();
-	private readonly _buttonBar: ButtonBarWidget;
-	private _dim: Dimension | undefined;
-
-	constructor(
-		parentEditor: ICodeEditor,
-		@IInstantiationService instaService: IInstantiationService,
-		@IThemeService themeService: IThemeService,
-		@ITextModelService private readonly _textModelResolverService: ITextModelService,
-		@IEditorService private readonly _editorService: IEditorService,
-	) {
-		super(parentEditor, {
-			showArrow: false,
-			showFrame: true,
-			frameColor: colorRegistry.asCssVariable(TAB_ACTIVE_MODIFIED_BORDER),
-			frameWidth: 1,
-			isResizeable: true,
-			isAccessible: true,
-			showInHiddenAreas: true,
-			ordinal: 10000 + 2
-		});
-		super.create();
-
-		this._name = instaService.createInstance(ResourceLabel, this._elements.name, { supportIcons: true });
-		this._elements.detail.appendChild(renderIcon(Codicon.circleFilled));
-
-		const contributions = EditorExtensionsRegistry
-			.getEditorContributions()
-			.filter(c => c.id !== INLINE_CHAT_ID);
-
-		this._previewEditor = instaService.createInstance(EmbeddedCodeEditorWidget, this._elements.editor, {
-			scrollBeyondLastLine: false,
-			stickyScroll: { enabled: false },
-			minimap: { enabled: false },
-			scrollbar: { alwaysConsumeMouseWheel: false, useShadows: true, ignoreHorizontalScrollbarInContentHeight: true, },
-		}, { isSimpleWidget: true, contributions }, parentEditor);
-
-		const doStyle = () => {
-			const theme = themeService.getColorTheme();
-			const overrides: [target: string, source: string][] = [
-				[colorRegistry.editorBackground, inlineChatRegionHighlight],
-				[editorColorRegistry.editorGutter, inlineChatRegionHighlight],
-			];
-
-			for (const [target, source] of overrides) {
-				const value = theme.getColor(source);
-				if (value) {
-					this._elements.domNode.style.setProperty(colorRegistry.asCssVariableName(target), String(value));
-				}
-			}
-		};
-		doStyle();
-		this._disposables.add(themeService.onDidColorThemeChange(doStyle));
-
-		this._buttonBar = instaService.createInstance(ButtonBarWidget);
-		this._elements.title.appendChild(this._buttonBar.domNode);
-	}
-
-	override dispose(): void {
-		this._name.dispose();
-		this._buttonBar.dispose();
-		this._previewEditor.dispose();
-		this._previewStore.dispose();
-		super.dispose();
-	}
-
-	protected override _fillContainer(container: HTMLElement): void {
-		container.appendChild(this._elements.domNode);
-	}
-
-	override show(): void {
-		throw new Error('Use showFileCreation');
-	}
-
-	async showCreation(where: Position, untitledTextModel: IUntitledTextEditorModel): Promise<void> {
-
-		const store = new DisposableStore();
-		this._previewStore.value = store;
-
-		this._name.element.setFile(untitledTextModel.resource, {
-			fileKind: FileKind.FILE,
-			fileDecorations: { badges: true, colors: true }
-		});
-
-		const actionSave = toAction({
-			id: '1',
-			label: localize('save', "Create"),
-			run: () => untitledTextModel.save({ reason: SaveReason.EXPLICIT })
-		});
-		const actionSaveAs = toAction({
-			id: '2',
-			label: localize('saveAs', "Create As"),
-			run: async () => {
-				const ids = this._editorService.findEditors(untitledTextModel.resource, { supportSideBySide: SideBySideEditor.ANY });
-				await this._editorService.save(ids.slice(), { saveAs: true, reason: SaveReason.EXPLICIT });
-			}
-		});
-
-		this._buttonBar.update([
-			[actionSave, actionSaveAs],
-			[(toAction({ id: '3', label: localize('discard', "Discard"), run: () => untitledTextModel.revert() }))]
-		]);
-
-		store.add(Event.any(
-			untitledTextModel.onDidRevert,
-			untitledTextModel.onDidSave,
-			untitledTextModel.onDidChangeDirty,
-			untitledTextModel.onWillDispose
-		)(() => this.hide()));
-
-		await untitledTextModel.resolve();
-
-		const ref = await this._textModelResolverService.createModelReference(untitledTextModel.resource);
-		store.add(ref);
-
-		const model = ref.object.textEditorModel;
-		this._previewEditor.setModel(model);
-
-		const lineHeight = this.editor.getOption(EditorOption.lineHeight);
-
-		this._elements.title.style.height = `${InlineChatFileCreatePreviewWidget.TitleHeight}px`;
-		const titleHightInLines = InlineChatFileCreatePreviewWidget.TitleHeight / lineHeight;
-
-		const maxLines = Math.max(4, Math.floor((this.editor.getLayoutInfo().height / lineHeight) * .33));
-		const lines = Math.min(maxLines, model.getLineCount());
-
-		super.show(where, titleHightInLines + lines);
-	}
-
-	override hide(): void {
-		this._previewStore.clear();
-		super.hide();
-	}
-
-	// --- layout
-
-	protected override revealRange(range: Range, isLastLine: boolean): void {
-		// ignore
-	}
-
-	protected override _onWidth(widthInPixel: number): void {
-		if (this._dim) {
-			this._doLayout(this._dim.height, widthInPixel);
-		}
-	}
-
-	protected override _doLayout(heightInPixel: number, widthInPixel: number): void {
-
-		const { lineNumbersLeft } = this.editor.getLayoutInfo();
-		this._elements.title.style.marginLeft = `${lineNumbersLeft}px`;
-
-		const newDim = new Dimension(widthInPixel, heightInPixel);
-		if (!Dimension.equals(this._dim, newDim)) {
-			this._dim = newDim;
-			this._previewEditor.layout(this._dim.with(undefined, this._dim.height - InlineChatFileCreatePreviewWidget.TitleHeight));
-		}
-	}
-}
-
-
-class ButtonBarWidget {
-
-	private readonly _domNode = h('div.buttonbar-widget');
-	private readonly _buttonBar: ButtonBar;
-	private readonly _store = new DisposableStore();
-
-	constructor(
-		@IContextMenuService private _contextMenuService: IContextMenuService,
-	) {
-		this._buttonBar = new ButtonBar(this.domNode);
-
-	}
-
-	update(allActions: IAction[][]): void {
-		this._buttonBar.clear();
-		let secondary = false;
-		for (const actions of allActions) {
-			let btn: IButton;
-			const [first, ...rest] = actions;
-			if (!first) {
-				continue;
-			} else if (rest.length === 0) {
-				// single action
-				btn = this._buttonBar.addButton({ ...defaultButtonStyles, secondary });
-			} else {
-				btn = this._buttonBar.addButtonWithDropdown({
-					...defaultButtonStyles,
-					addPrimaryActionToDropdown: false,
-					actions: rest,
-					contextMenuProvider: this._contextMenuService
-				});
-			}
-			btn.label = first.label;
-			this._store.add(btn.onDidClick(() => first.run()));
-			secondary = true;
-		}
-	}
-
-	dispose(): void {
-		this._buttonBar.dispose();
-		this._store.dispose();
-	}
-
-	get domNode() {
-		return this._domNode.root;
-	}
-}
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatNotebook.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatNotebook.ts
index e074c182fc4..48b9e6ca0e2 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatNotebook.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatNotebook.ts
@@ -3,15 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { illegalState } from 'vs/base/common/errors';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { isEqual } from 'vs/base/common/resources';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { InlineChatController } from 'vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { IInlineChatSessionService } from './inlineChatSessionService';
-import { INotebookEditorService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorService';
-import { CellUri } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { illegalState } from '../../../../base/common/errors.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { InlineChatController } from './inlineChatController.js';
+import { IInlineChatSessionService } from './inlineChatSessionService.js';
+import { INotebookEditorService } from '../../notebook/browser/services/notebookEditorService.js';
+import { CellUri } from '../../notebook/common/notebookCommon.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { NotebookTextDiffEditor } from '../../notebook/browser/diff/notebookDiffEditor.js';
+import { NotebookMultiTextDiffEditor } from '../../notebook/browser/diff/notebookMultiDiffEditor.js';
 
 export class InlineChatNotebookContribution {
 
@@ -19,6 +22,7 @@ export class InlineChatNotebookContribution {
 
 	constructor(
 		@IInlineChatSessionService sessionService: IInlineChatSessionService,
+		@IEditorService editorService: IEditorService,
 		@INotebookEditorService notebookEditorService: INotebookEditorService,
 	) {
 
@@ -58,6 +62,11 @@ export class InlineChatNotebookContribution {
 					return fallback;
 				}
 
+				const activeEditor = editorService.activeEditorPane;
+				if (activeEditor && (activeEditor.getId() === NotebookTextDiffEditor.ID || activeEditor.getId() === NotebookMultiTextDiffEditor.ID)) {
+					return `<notebook>${editor.getId()}#${uri}`;
+				}
+
 				throw illegalState('Expected notebook editor');
 			}
 		}));
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSavingService.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSavingService.ts
index 0ed8719ecf8..ebe92f44f05 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSavingService.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSavingService.ts
@@ -2,8 +2,8 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { Session } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSession';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { Session } from './inlineChatSession.js';
 
 
 export const IInlineChatSavingService = createDecorator<IInlineChatSavingService>('IInlineChatSavingService	');
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSavingServiceImpl.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSavingServiceImpl.ts
index a86426304a3..48108fe51bc 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSavingServiceImpl.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSavingServiceImpl.ts
@@ -3,33 +3,33 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Queue, raceCancellation } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { DisposableStore, IDisposable, MutableDisposable, combinedDisposable, dispose } from 'vs/base/common/lifecycle';
-import { ICodeEditor, isCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { localize } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IProgress, IProgressStep } from 'vs/platform/progress/common/progress';
-import { SaveReason } from 'vs/workbench/common/editor';
-import { Session } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSession';
-import { IInlineChatSessionService } from './inlineChatSessionService';
-import { InlineChatConfigKeys } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
-import { GroupsOrder, IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { IInlineChatSavingService } from './inlineChatSavingService';
-import { Iterable } from 'vs/base/common/iterator';
-import { IResourceEditorInput } from 'vs/platform/editor/common/editor';
-import { Schemas } from 'vs/base/common/network';
-import { CellUri } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { getNotebookEditorFromEditorPane } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { compare } from 'vs/base/common/strings';
-import { IWorkingCopyFileService } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
-import { URI } from 'vs/base/common/uri';
-import { ILogService } from 'vs/platform/log/common/log';
-import { Event } from 'vs/base/common/event';
-import { InlineChatController } from 'vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { Queue, raceCancellation } from '../../../../base/common/async.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { DisposableStore, IDisposable, MutableDisposable, combinedDisposable, dispose } from '../../../../base/common/lifecycle.js';
+import { ICodeEditor, isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { localize } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IProgress, IProgressStep } from '../../../../platform/progress/common/progress.js';
+import { SaveReason } from '../../../common/editor.js';
+import { Session } from './inlineChatSession.js';
+import { IInlineChatSessionService } from './inlineChatSessionService.js';
+import { InlineChatConfigKeys } from '../common/inlineChat.js';
+import { GroupsOrder, IEditorGroup, IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.js';
+import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
+import { IInlineChatSavingService } from './inlineChatSavingService.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { IResourceEditorInput } from '../../../../platform/editor/common/editor.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { CellUri } from '../../notebook/common/notebookCommon.js';
+import { getNotebookEditorFromEditorPane } from '../../notebook/browser/notebookBrowser.js';
+import { compare } from '../../../../base/common/strings.js';
+import { IWorkingCopyFileService } from '../../../services/workingCopy/common/workingCopyFileService.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { Event } from '../../../../base/common/event.js';
+import { InlineChatController } from './inlineChatController.js';
 
 interface SessionData {
 	readonly resourceUri: URI;
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSession.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSession.ts
index 78acedb3c27..324c4b799f8 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSession.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSession.ts
@@ -3,36 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { Emitter, Event } from 'vs/base/common/event';
-import { TextEdit } from 'vs/editor/common/languages';
-import { IIdentifiedSingleEditOperation, IModelDecorationOptions, IModelDeltaDecoration, ITextModel, IValidEditOperation, TrackedRangeStickiness } from 'vs/editor/common/model';
-import { EditMode, CTX_INLINE_CHAT_HAS_STASHED_SESSION } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { isCancellationError } from 'vs/base/common/errors';
-import { EditOperation, ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { DetailedLineRangeMapping, LineRangeMapping, RangeMapping } from 'vs/editor/common/diff/rangeMapping';
-import { IUntitledTextEditorModel } from 'vs/workbench/services/untitled/common/untitledTextEditorModel';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ResourceMap } from 'vs/base/common/map';
-import { Schemas } from 'vs/base/common/network';
-import { isEqual } from 'vs/base/common/resources';
-import { IInlineChatSessionService, Recording } from './inlineChatSessionService';
-import { LineRange } from 'vs/editor/common/core/lineRange';
-import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { coalesceInPlace } from 'vs/base/common/arrays';
-import { Iterable } from 'vs/base/common/iterator';
-import { IModelContentChangedEvent } from 'vs/editor/common/textModelEvents';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ChatModel, IChatRequestModel, IChatResponseModel, IChatTextEditGroupState } from 'vs/workbench/contrib/chat/common/chatModel';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { IChatAgent } from 'vs/workbench/contrib/chat/common/chatAgents';
+import { URI } from '../../../../base/common/uri.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { IIdentifiedSingleEditOperation, IModelDecorationOptions, IModelDeltaDecoration, ITextModel, IValidEditOperation, TrackedRangeStickiness } from '../../../../editor/common/model.js';
+import { EditMode, CTX_INLINE_CHAT_HAS_STASHED_SESSION } from '../common/inlineChat.js';
+import { IRange, Range } from '../../../../editor/common/core/range.js';
+import { ModelDecorationOptions } from '../../../../editor/common/model/textModel.js';
+import { EditOperation, ISingleEditOperation } from '../../../../editor/common/core/editOperation.js';
+import { DetailedLineRangeMapping, LineRangeMapping, RangeMapping } from '../../../../editor/common/diff/rangeMapping.js';
+import { IInlineChatSessionService } from './inlineChatSessionService.js';
+import { LineRange } from '../../../../editor/common/core/lineRange.js';
+import { IEditorWorkerService } from '../../../../editor/common/services/editorWorker.js';
+import { coalesceInPlace } from '../../../../base/common/arrays.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { IModelContentChangedEvent } from '../../../../editor/common/textModelEvents.js';
+import { DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { ChatModel, IChatRequestModel, IChatTextEditGroupState } from '../../chat/common/chatModel.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { IChatAgent } from '../../chat/common/chatAgents.js';
+import { IDocumentDiff } from '../../../../editor/common/diff/documentDiffProvider.js';
 
 
 export type TelemetryData = {
@@ -88,15 +80,6 @@ export class SessionWholeRange {
 		}
 	}
 
-	trackEdits(edits: ISingleEditOperation[]): void {
-		const newDeco: IModelDeltaDecoration[] = [];
-		for (const edit of edits) {
-			newDeco.push({ range: edit.range, options: SessionWholeRange._options });
-		}
-		this._decorationIds.push(...this._textModel.deltaDecorations([], newDeco));
-		this._onDidChange.fire(this);
-	}
-
 	fixup(changes: readonly DetailedLineRangeMapping[]): void {
 
 		const newDeco: IModelDeltaDecoration[] = [];
@@ -136,16 +119,15 @@ export class SessionWholeRange {
 
 export class Session {
 
-	private _lastInput: SessionPrompt | undefined;
 	private _isUnstashed: boolean = false;
-	private readonly _exchange: SessionExchange[] = [];
 	private readonly _startTime = new Date();
 	private readonly _teldata: TelemetryData;
 
-	readonly textModelNAltVersion: number;
+	private readonly _versionByRequest = new Map<string, number>();
 
 	constructor(
 		readonly editMode: EditMode,
+		readonly headless: boolean,
 		/**
 		 * The URI of the document which is being EditorEdit
 		 */
@@ -155,15 +137,16 @@ export class Session {
 		 */
 		readonly textModel0: ITextModel,
 		/**
-		 * The document into which AI edits went, when live this is `targetUri` otherwise it is a temporary document
+		 * The model of the editor
 		 */
 		readonly textModelN: ITextModel,
 		readonly agent: IChatAgent,
 		readonly wholeRange: SessionWholeRange,
 		readonly hunkData: HunkData,
 		readonly chatModel: ChatModel,
+		versionsByRequest?: [string, number][], // DEBT? this is needed when a chat model is "reused" for a new chat session
 	) {
-		this.textModelNAltVersion = textModelN.getAlternativeVersionId();
+
 		this._teldata = {
 			extension: ExtensionIdentifier.toKey(agent.extensionId),
 			startTime: this._startTime.toISOString(),
@@ -178,14 +161,9 @@ export class Session {
 			discardedHunks: 0,
 			responseTypes: ''
 		};
-	}
-
-	addInput(input: SessionPrompt): void {
-		this._lastInput = input;
-	}
-
-	get lastInput() {
-		return this._lastInput;
+		if (versionsByRequest) {
+			this._versionByRequest = new Map(versionsByRequest);
+		}
 	}
 
 	get isUnstashed(): boolean {
@@ -197,19 +175,30 @@ export class Session {
 		this._isUnstashed = true;
 	}
 
-	addExchange(exchange: SessionExchange): void {
-		this._isUnstashed = false;
-		const newLen = this._exchange.push(exchange);
-		this._teldata.rounds += `${newLen}|`;
-		// this._teldata.responseTypes += `${exchange.response instanceof ReplyResponse ? exchange.response.responseType : InlineChatResponseTypes.Empty}|`;
+	markModelVersion(request: IChatRequestModel) {
+		this._versionByRequest.set(request.id, this.textModelN.getAlternativeVersionId());
 	}
 
-	get exchanges(): readonly SessionExchange[] {
-		return this._exchange;
+	get versionsByRequest() {
+		return Array.from(this._versionByRequest);
 	}
 
-	get lastExchange(): SessionExchange | undefined {
-		return this._exchange[this._exchange.length - 1];
+	async undoChangesUntil(requestId: string): Promise<boolean> {
+
+		const targetAltVersion = this._versionByRequest.get(requestId);
+		if (targetAltVersion === undefined) {
+			return false;
+		}
+		// undo till this point
+		this.hunkData.ignoreTextModelNChanges = true;
+		try {
+			while (targetAltVersion < this.textModelN.getAlternativeVersionId() && this.textModelN.canUndo()) {
+				await this.textModelN.undo();
+			}
+		} finally {
+			this.hunkData.ignoreTextModelNChanges = false;
+		}
+		return true;
 	}
 
 	get hasChangedText(): boolean {
@@ -252,110 +241,9 @@ export class Session {
 		this._teldata.endTime = new Date().toISOString();
 		return this._teldata;
 	}
-
-	asRecording(): Recording {
-		const result: Recording = {
-			session: this.chatModel.sessionId,
-			when: this._startTime,
-			exchanges: []
-		};
-		for (const exchange of this._exchange) {
-			const response = exchange.response;
-			if (response instanceof ReplyResponse) {
-				result.exchanges.push({ prompt: exchange.prompt.value, res: response.chatResponse });
-			}
-		}
-		return result;
-	}
 }
 
 
-export class SessionPrompt {
-
-	readonly value: string;
-
-	constructor(
-		readonly request: IChatRequestModel,
-		readonly modelAltVersionId: number,
-	) {
-		this.value = request.message.text;
-	}
-}
-
-export class SessionExchange {
-
-	constructor(
-		readonly prompt: SessionPrompt,
-		readonly response: ReplyResponse | EmptyResponse | ErrorResponse
-	) { }
-}
-
-export class EmptyResponse {
-
-}
-
-export class ErrorResponse {
-
-	readonly message: string;
-	readonly isCancellation: boolean;
-
-	constructor(
-		readonly error: any
-	) {
-		this.message = toErrorMessage(error, false);
-		this.isCancellation = isCancellationError(error);
-	}
-}
-
-export class ReplyResponse {
-
-	readonly untitledTextModel: IUntitledTextEditorModel | undefined;
-
-	constructor(
-		localUri: URI,
-		readonly chatRequest: IChatRequestModel,
-		readonly chatResponse: IChatResponseModel,
-		@ITextFileService private readonly _textFileService: ITextFileService,
-		@ILanguageService private readonly _languageService: ILanguageService,
-	) {
-
-		const editsMap = new ResourceMap<TextEdit[][]>();
-
-		for (const item of chatResponse.response.value) {
-			if (item.kind === 'textEditGroup') {
-				const array = editsMap.get(item.uri);
-				for (const group of item.edits) {
-					if (array) {
-						array.push(group);
-					} else {
-						editsMap.set(item.uri, [group]);
-					}
-				}
-			}
-		}
-
-		for (const [uri, edits] of editsMap) {
-
-			const flatEdits = edits.flat();
-			if (flatEdits.length === 0) {
-				editsMap.delete(uri);
-				continue;
-			}
-
-			const isLocalUri = isEqual(uri, localUri);
-			if (uri.scheme === Schemas.untitled && !isLocalUri && !this.untitledTextModel) { //TODO@jrieken the first untitled model WINS
-				const langSelection = this._languageService.createByFilepathOrFirstLine(uri, undefined);
-				const untitledTextModel = this._textFileService.untitled.create({
-					associatedResource: uri,
-					languageId: langSelection.languageId
-				});
-				this.untitledTextModel = untitledTextModel;
-				untitledTextModel.resolve();
-			}
-		}
-	}
-}
-
 export class StashedSession {
 
 	private readonly _listener: IDisposable;
@@ -375,7 +263,7 @@ export class StashedSession {
 		// keep session for a little bit, only release when user continues to work (type, move cursor, etc.)
 		this._session = session;
 		this._ctxHasStashedSession.set(true);
-		this._listener = Event.once(Event.any(editor.onDidChangeCursorSelection, editor.onDidChangeModelContent, editor.onDidChangeModel))(() => {
+		this._listener = Event.once(Event.any(editor.onDidChangeCursorSelection, editor.onDidChangeModelContent, editor.onDidChangeModel, editor.onDidBlurEditorWidget))(() => {
 			this._session = undefined;
 			this._sessionService.releaseSession(session);
 			this._ctxHasStashedSession.reset();
@@ -410,8 +298,8 @@ export class StashedSession {
 
 function lineRangeAsRange(lineRange: LineRange, model: ITextModel): Range {
 	return lineRange.isEmpty
-		? new Range(lineRange.startLineNumber, 1, lineRange.startLineNumber, model.getLineLength(lineRange.startLineNumber))
-		: new Range(lineRange.startLineNumber, 1, lineRange.endLineNumberExclusive - 1, model.getLineLength(lineRange.endLineNumberExclusive - 1));
+		? new Range(lineRange.startLineNumber, 1, lineRange.startLineNumber, Number.MAX_SAFE_INTEGER)
+		: new Range(lineRange.startLineNumber, 1, lineRange.endLineNumberExclusive - 1, Number.MAX_SAFE_INTEGER);
 }
 
 export class HunkData {
@@ -472,27 +360,30 @@ export class HunkData {
 		// mirror textModelN changes to textModel0 execept for those that
 		// overlap with a hunk
 
-		type HunkRangePair = { rangeN: Range; range0: Range };
+		type HunkRangePair = { rangeN: Range; range0: Range; markAccepted: () => void };
 		const hunkRanges: HunkRangePair[] = [];
 
 		const ranges0: Range[] = [];
 
-		for (const { textModelNDecorations, textModel0Decorations, state } of this._data.values()) {
+		for (const entry of this._data.values()) {
 
-			if (state === HunkState.Pending) {
+			if (entry.state === HunkState.Pending) {
 				// pending means the hunk's changes aren't "sync'd" yet
-				for (let i = 1; i < textModelNDecorations.length; i++) {
-					const rangeN = this._textModelN.getDecorationRange(textModelNDecorations[i]);
-					const range0 = this._textModel0.getDecorationRange(textModel0Decorations[i]);
+				for (let i = 1; i < entry.textModelNDecorations.length; i++) {
+					const rangeN = this._textModelN.getDecorationRange(entry.textModelNDecorations[i]);
+					const range0 = this._textModel0.getDecorationRange(entry.textModel0Decorations[i]);
 					if (rangeN && range0) {
-						hunkRanges.push({ rangeN, range0 });
+						hunkRanges.push({
+							rangeN, range0,
+							markAccepted: () => entry.state = HunkState.Accepted
+						});
 					}
 				}
 
-			} else if (state === HunkState.Accepted) {
+			} else if (entry.state === HunkState.Accepted) {
 				// accepted means the hunk's changes are also in textModel0
-				for (let i = 1; i < textModel0Decorations.length; i++) {
-					const range = this._textModel0.getDecorationRange(textModel0Decorations[i]);
+				for (let i = 1; i < entry.textModel0Decorations.length; i++) {
+					const range = this._textModel0.getDecorationRange(entry.textModel0Decorations[i]);
 					if (range) {
 						ranges0.push(range);
 					}
@@ -511,16 +402,20 @@ export class HunkData {
 
 			let pendingChangesLen = 0;
 
-			for (const { rangeN, range0 } of hunkRanges) {
-				if (rangeN.getEndPosition().isBefore(Range.getStartPosition(change.range))) {
+			for (const entry of hunkRanges) {
+				if (entry.rangeN.getEndPosition().isBefore(Range.getStartPosition(change.range))) {
 					// pending hunk _before_ this change. When projecting into textModel0 we need to
 					// subtract that. Because diffing is relaxed it might include changes that are not
 					// actual insertions/deletions. Therefore we need to take the length of the original
 					// range into account.
-					pendingChangesLen += this._textModelN.getValueLengthInRange(rangeN);
-					pendingChangesLen -= this._textModel0.getValueLengthInRange(range0);
+					pendingChangesLen += this._textModelN.getValueLengthInRange(entry.rangeN);
+					pendingChangesLen -= this._textModel0.getValueLengthInRange(entry.range0);
 
-				} else if (Range.areIntersectingOrTouching(rangeN, change.range)) {
+				} else if (Range.areIntersectingOrTouching(entry.rangeN, change.range)) {
+					// an edit overlaps with a (pending) hunk. We take this as a signal
+					// to mark the hunk as accepted and to ignore the edit. The range of the hunk
+					// will be up-to-date because of decorations created for them
+					entry.markAccepted();
 					isOverlapping = true;
 					break;
 
@@ -555,33 +450,34 @@ export class HunkData {
 		this._textModel0.pushEditOperations(null, edits, () => null);
 	}
 
-	async recompute(editState: IChatTextEditGroupState) {
+	async recompute(editState: IChatTextEditGroupState, diff?: IDocumentDiff | null) {
 
-		const diff = await this._editorWorkerService.computeDiff(this._textModel0.uri, this._textModelN.uri, { ignoreTrimWhitespace: false, maxComputationTimeMs: Number.MAX_SAFE_INTEGER, computeMoves: false }, 'advanced');
+		diff ??= await this._editorWorkerService.computeDiff(this._textModel0.uri, this._textModelN.uri, { ignoreTrimWhitespace: false, maxComputationTimeMs: Number.MAX_SAFE_INTEGER, computeMoves: false }, 'advanced');
 
-		if (!diff || diff.changes.length === 0) {
-			// return new HunkData([], session);
-			return;
-		}
+		let mergedChanges: DetailedLineRangeMapping[] = [];
 
-		// merge changes neighboring changes
-		const mergedChanges = [diff.changes[0]];
-		for (let i = 1; i < diff.changes.length; i++) {
-			const lastChange = mergedChanges[mergedChanges.length - 1];
-			const thisChange = diff.changes[i];
-			if (thisChange.modified.startLineNumber - lastChange.modified.endLineNumberExclusive <= HunkData._HUNK_THRESHOLD) {
-				mergedChanges[mergedChanges.length - 1] = new DetailedLineRangeMapping(
-					lastChange.original.join(thisChange.original),
-					lastChange.modified.join(thisChange.modified),
-					(lastChange.innerChanges ?? []).concat(thisChange.innerChanges ?? [])
-				);
-			} else {
-				mergedChanges.push(thisChange);
+		if (diff && diff.changes.length > 0) {
+			// merge changes neighboring changes
+			mergedChanges = [diff.changes[0]];
+			for (let i = 1; i < diff.changes.length; i++) {
+				const lastChange = mergedChanges[mergedChanges.length - 1];
+				const thisChange = diff.changes[i];
+				if (thisChange.modified.startLineNumber - lastChange.modified.endLineNumberExclusive <= HunkData._HUNK_THRESHOLD) {
+					mergedChanges[mergedChanges.length - 1] = new DetailedLineRangeMapping(
+						lastChange.original.join(thisChange.original),
+						lastChange.modified.join(thisChange.modified),
+						(lastChange.innerChanges ?? []).concat(thisChange.innerChanges ?? [])
+					);
+				} else {
+					mergedChanges.push(thisChange);
+				}
 			}
 		}
 
 		const hunks = mergedChanges.map(change => new RawHunk(change.original, change.modified, change.innerChanges ?? []));
 
+		editState.applied = hunks.length;
+
 		this._textModelN.changeDecorations(accessorN => {
 
 			this._textModel0.changeDecorations(accessor0 => {
@@ -684,6 +580,9 @@ export class HunkData {
 						const edits = this._discardEdits(item);
 						this._textModelN.pushEditOperations(null, edits, () => null);
 						data.state = HunkState.Rejected;
+						if (data.editState.applied > 0) {
+							data.editState.applied -= 1;
+						}
 					}
 				},
 				acceptChanges: () => {
@@ -700,7 +599,6 @@ export class HunkData {
 						}
 						this._textModel0.pushEditOperations(null, edits, () => null);
 						data.state = HunkState.Accepted;
-						data.editState.applied += 1;
 					}
 				}
 			};
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.ts
index 6ab4ea5dbec..233e79d76e3 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.ts
@@ -2,24 +2,16 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { URI } from 'vs/base/common/uri';
-import { Event } from 'vs/base/common/event';
-import { EditMode } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
-import { IRange } from 'vs/editor/common/core/range';
-import { IActiveCodeEditor, ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Session, StashedSession } from './inlineChatSession';
-import { IValidEditOperation } from 'vs/editor/common/model';
-import { IChatResponseModel } from 'vs/workbench/contrib/chat/common/chatModel';
-
-
-export type Recording = {
-	when: Date;
-	session: string;
-	exchanges: { prompt: string; res: IChatResponseModel }[];
-};
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Event } from '../../../../base/common/event.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IActiveCodeEditor, ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { IRange } from '../../../../editor/common/core/range.js';
+import { IValidEditOperation } from '../../../../editor/common/model.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { EditMode } from '../common/inlineChat.js';
+import { Session, StashedSession } from './inlineChatSession.js';
 
 export interface ISessionKeyComputer {
 	getComparisonKey(editor: ICodeEditor, uri: URI): string;
@@ -44,7 +36,7 @@ export interface IInlineChatSessionService {
 	onDidStashSession: Event<IInlineChatSessionEvent>;
 	onDidEndSession: Event<IInlineChatSessionEndEvent>;
 
-	createSession(editor: IActiveCodeEditor, options: { editMode: EditMode; wholeRange?: IRange }, token: CancellationToken): Promise<Session | undefined>;
+	createSession(editor: IActiveCodeEditor, options: { editMode: EditMode; wholeRange?: IRange; session?: Session; headless?: boolean }, token: CancellationToken): Promise<Session | undefined>;
 
 	moveSession(session: Session, newEditor: ICodeEditor): void;
 
@@ -58,8 +50,5 @@ export interface IInlineChatSessionService {
 
 	registerSessionKeyComputer(scheme: string, value: ISessionKeyComputer): IDisposable;
 
-	//
-	recordings(): readonly Recording[];
-
 	dispose(): void;
 }
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.ts
index e77461a562c..758764720e8 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.ts
@@ -2,34 +2,34 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { CancellationError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore, IDisposable, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { IActiveCodeEditor, ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { IValidEditOperation } from 'vs/editor/common/model';
-import { createTextBufferFactoryFromSnapshot } from 'vs/editor/common/model/textModel';
-import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { DEFAULT_EDITOR_ASSOCIATION } from 'vs/workbench/common/editor';
-import { ChatAgentLocation, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { IChatService } from 'vs/workbench/contrib/chat/common/chatService';
-import { CTX_INLINE_CHAT_HAS_AGENT, EditMode } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
-import { EmptyResponse, ErrorResponse, HunkData, ReplyResponse, Session, SessionExchange, SessionWholeRange, StashedSession, TelemetryData, TelemetryDataClassification } from './inlineChatSession';
-import { IInlineChatSessionEndEvent, IInlineChatSessionEvent, IInlineChatSessionService, ISessionKeyComputer, Recording } from './inlineChatSessionService';
-import { IChatVariablesService } from 'vs/workbench/contrib/chat/common/chatVariables';
-import { ISelection } from 'vs/editor/common/core/selection';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { DisposableStore, IDisposable, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { URI } from '../../../../base/common/uri.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { IActiveCodeEditor, ICodeEditor, isCodeEditor, isCompositeEditor, isDiffEditor } from '../../../../editor/browser/editorBrowser.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { IValidEditOperation } from '../../../../editor/common/model.js';
+import { createTextBufferFactoryFromSnapshot } from '../../../../editor/common/model/textModel.js';
+import { IEditorWorkerService } from '../../../../editor/common/services/editorWorker.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { DEFAULT_EDITOR_ASSOCIATION } from '../../../common/editor.js';
+import { ChatAgentLocation, IChatAgentService } from '../../chat/common/chatAgents.js';
+import { IChatService } from '../../chat/common/chatService.js';
+import { CTX_INLINE_CHAT_HAS_AGENT, CTX_INLINE_CHAT_POSSIBLE, EditMode } from '../common/inlineChat.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { UntitledTextEditorInput } from '../../../services/untitled/common/untitledTextEditorInput.js';
+import { HunkData, Session, SessionWholeRange, StashedSession, TelemetryData, TelemetryDataClassification } from './inlineChatSession.js';
+import { IInlineChatSessionEndEvent, IInlineChatSessionEvent, IInlineChatSessionService, ISessionKeyComputer } from './inlineChatSessionService.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
 
 
 type SessionData = {
@@ -46,19 +46,6 @@ export class InlineChatError extends Error {
 	}
 }
 
-const _inlineChatContext = '_inlineChatContext';
-const _inlineChatDocument = '_inlineChatDocument';
-
-class InlineChatContext {
-
-	static readonly variableName = '_inlineChatContext';
-
-	constructor(
-		readonly uri: URI,
-		readonly selection: ISelection,
-		readonly wholeRange: IRange,
-	) { }
-}
 
 export class InlineChatSessionServiceImpl implements IInlineChatSessionService {
 
@@ -80,8 +67,6 @@ export class InlineChatSessionServiceImpl implements IInlineChatSessionService {
 
 	private readonly _sessions = new Map<string, SessionData>();
 	private readonly _keyComputers = new Map<string, ISessionKeyComputer>();
-	private _recordings: Recording[] = [];
-
 
 	constructor(
 		@ITelemetryService private readonly _telemetryService: ITelemetryService,
@@ -91,38 +76,11 @@ export class InlineChatSessionServiceImpl implements IInlineChatSessionService {
 		@ILogService private readonly _logService: ILogService,
 		@IInstantiationService private readonly _instaService: IInstantiationService,
 		@IEditorService private readonly _editorService: IEditorService,
+		@ITextFileService private readonly _textFileService: ITextFileService,
+		@ILanguageService private readonly _languageService: ILanguageService,
 		@IChatService private readonly _chatService: IChatService,
-		@IChatAgentService private readonly _chatAgentService: IChatAgentService,
-		@IChatVariablesService chatVariableService: IChatVariablesService,
-	) {
-
-
-		// MARK: implicit variable for editor selection and (tracked) whole range
-
-		this._store.add(chatVariableService.registerVariable(
-			{ id: _inlineChatContext, name: _inlineChatContext, description: '', hidden: true },
-			async (_message, _arg, model) => {
-				for (const [, data] of this._sessions) {
-					if (data.session.chatModel === model) {
-						return JSON.stringify(new InlineChatContext(data.session.textModelN.uri, data.editor.getSelection()!, data.session.wholeRange.trackedInitialRange));
-					}
-				}
-				return undefined;
-			}
-		));
-		this._store.add(chatVariableService.registerVariable(
-			{ id: _inlineChatDocument, name: _inlineChatDocument, description: '', hidden: true },
-			async (_message, _arg, model) => {
-				for (const [, data] of this._sessions) {
-					if (data.session.chatModel === model) {
-						return data.session.textModelN.uri;
-					}
-				}
-				return undefined;
-			}
-		));
-
-	}
+		@IChatAgentService private readonly _chatAgentService: IChatAgentService
+	) { }
 
 	dispose() {
 		this._store.dispose();
@@ -130,7 +88,7 @@ export class InlineChatSessionServiceImpl implements IInlineChatSessionService {
 		this._sessions.clear();
 	}
 
-	async createSession(editor: IActiveCodeEditor, options: { editMode: EditMode; wholeRange?: Range }, token: CancellationToken): Promise<Session | undefined> {
+	async createSession(editor: IActiveCodeEditor, options: { editMode: EditMode; headless?: boolean; wholeRange?: Range; session?: Session }, token: CancellationToken): Promise<Session | undefined> {
 
 		const agent = this._chatAgentService.getDefaultAgent(ChatAgentLocation.Editor);
 
@@ -139,7 +97,6 @@ export class InlineChatSessionServiceImpl implements IInlineChatSessionService {
 			return undefined;
 		}
 
-
 		this._onWillStartSession.fire(editor);
 
 		const textModel = editor.getModel();
@@ -148,15 +105,19 @@ export class InlineChatSessionServiceImpl implements IInlineChatSessionService {
 		const store = new DisposableStore();
 		this._logService.trace(`[IE] creating NEW session for ${editor.getId()}, ${agent.extensionId}`);
 
-		const chatModel = this._chatService.startSession(ChatAgentLocation.Editor, token);
+		const chatModel = options.session?.chatModel ?? this._chatService.startSession(ChatAgentLocation.Editor, token);
 		if (!chatModel) {
 			this._logService.trace('[IE] NO chatModel found');
 			return undefined;
 		}
 
 		store.add(toDisposable(() => {
-			this._chatService.clearSession(chatModel.sessionId);
-			chatModel.dispose();
+			const doesOtherSessionUseChatModel = [...this._sessions.values()].some(data => data.session !== session && data.session.chatModel === chatModel);
+
+			if (!doesOtherSessionUseChatModel) {
+				this._chatService.clearSession(chatModel.sessionId);
+				chatModel.dispose();
+			}
 		}));
 
 		const lastResponseListener = store.add(new MutableDisposable());
@@ -167,6 +128,7 @@ export class InlineChatSessionServiceImpl implements IInlineChatSessionService {
 
 			const { response } = e.request;
 
+			session.markModelVersion(e.request);
 			lastResponseListener.value = response.onDidChange(() => {
 
 				if (!response.isComplete) {
@@ -175,39 +137,27 @@ export class InlineChatSessionServiceImpl implements IInlineChatSessionService {
 
 				lastResponseListener.clear(); // ONCE
 
-				let inlineResponse: ErrorResponse | EmptyResponse | ReplyResponse;
-
-				// make an response from the ChatResponseModel
-				if (response.isCanceled) {
-					// error: cancelled
-					inlineResponse = new ErrorResponse(new CancellationError());
-				} else if (response.result?.errorDetails) {
-					// error: "real" error
-					inlineResponse = new ErrorResponse(new Error(response.result.errorDetails.message));
-				} else if (response.response.value.length === 0) {
-					// epmty response
-					inlineResponse = new EmptyResponse();
-				} else {
-					inlineResponse = this._instaService.createInstance(
-						ReplyResponse,
-						session.textModelN.uri,
-						e.request,
-						response
-					);
-				}
-
-				session.addExchange(new SessionExchange(session.lastInput!, inlineResponse));
-
-				if (inlineResponse instanceof ReplyResponse && inlineResponse.untitledTextModel) {
-					this._textModelService.createModelReference(inlineResponse.untitledTextModel.resource).then(ref => {
+				// special handling for untitled files
+				for (const part of response.response.value) {
+					if (part.kind !== 'textEditGroup' || part.uri.scheme !== Schemas.untitled || isEqual(part.uri, session.textModelN.uri)) {
+						continue;
+					}
+					const langSelection = this._languageService.createByFilepathOrFirstLine(part.uri, undefined);
+					const untitledTextModel = this._textFileService.untitled.create({
+						associatedResource: part.uri,
+						languageId: langSelection.languageId
+					});
+					untitledTextModel.resolve();
+					this._textModelService.createModelReference(part.uri).then(ref => {
 						store.add(ref);
 					});
 				}
+
 			});
 		}));
 
 		store.add(this._chatAgentService.onDidChangeAgents(e => {
-			if (e === undefined && !this._chatAgentService.getAgent(agent.id)) {
+			if (e === undefined && (!this._chatAgentService.getAgent(agent.id) || !this._chatAgentService.getActivatedAgents().includes(agent))) {
 				this._logService.trace(`[IE] provider GONE for ${editor.getId()}, ${agent.extensionId}`);
 				this._releaseSession(session, true);
 			}
@@ -248,13 +198,15 @@ export class InlineChatSessionServiceImpl implements IInlineChatSessionService {
 
 		const session = new Session(
 			options.editMode,
+			options.headless ?? false,
 			targetUri,
 			textModel0,
 			textModelN,
 			agent,
 			store.add(new SessionWholeRange(textModelN, wholeRange)),
 			store.add(new HunkData(this._editorWorkerService, textModel0, textModelN)),
-			chatModel
+			chatModel,
+			options.session?.versionsByRequest,
 		);
 
 		// store: key -> session
@@ -317,7 +269,6 @@ export class InlineChatSessionServiceImpl implements IInlineChatSessionService {
 			return;
 		}
 
-		this._keepRecording(session);
 		this._telemetryService.publicLog2<TelemetryData, TelemetryDataClassification>('interactiveEditor/session', session.asTelemetryData());
 
 		const [key, value] = tuple;
@@ -329,7 +280,6 @@ export class InlineChatSessionServiceImpl implements IInlineChatSessionService {
 	}
 
 	stashSession(session: Session, editor: ICodeEditor, undoCancelEdits: IValidEditOperation[]): StashedSession {
-		this._keepRecording(session);
 		const result = this._instaService.createInstance(StashedSession, editor, session, undoCancelEdits);
 		this._onDidStashSession.fire({ editor, session });
 		this._logService.trace(`[IE] did STASH session for ${editor.getId()}, ${session.agent.extensionId}`);
@@ -362,19 +312,6 @@ export class InlineChatSessionServiceImpl implements IInlineChatSessionService {
 		this._keyComputers.set(scheme, value);
 		return toDisposable(() => this._keyComputers.delete(scheme));
 	}
-
-	// --- debug
-
-	private _keepRecording(session: Session) {
-		const newLen = this._recordings.unshift(session.asRecording());
-		if (newLen > 5) {
-			this._recordings.pop();
-		}
-	}
-
-	recordings(): readonly Recording[] {
-		return this._recordings;
-	}
 }
 
 export class InlineChatEnabler {
@@ -382,21 +319,38 @@ export class InlineChatEnabler {
 	static Id = 'inlineChat.enabler';
 
 	private readonly _ctxHasProvider: IContextKey<boolean>;
+	private readonly _ctxPossible: IContextKey<boolean>;
 
 	private readonly _store = new DisposableStore();
 
 	constructor(
 		@IContextKeyService contextKeyService: IContextKeyService,
-		@IChatAgentService chatAgentService: IChatAgentService
+		@IChatAgentService chatAgentService: IChatAgentService,
+		@IEditorService editorService: IEditorService,
 	) {
 		this._ctxHasProvider = CTX_INLINE_CHAT_HAS_AGENT.bindTo(contextKeyService);
-		this._store.add(chatAgentService.onDidChangeAgents(() => {
+		this._ctxPossible = CTX_INLINE_CHAT_POSSIBLE.bindTo(contextKeyService);
+
+		const updateAgent = () => {
 			const hasEditorAgent = Boolean(chatAgentService.getDefaultAgent(ChatAgentLocation.Editor));
 			this._ctxHasProvider.set(hasEditorAgent);
-		}));
+		};
+
+		this._store.add(chatAgentService.onDidChangeAgents(updateAgent));
+		updateAgent();
+
+		const updateEditor = () => {
+			const ctrl = editorService.activeEditorPane?.getControl();
+			const isCodeEditorLike = isCodeEditor(ctrl) || isDiffEditor(ctrl) || isCompositeEditor(ctrl);
+			this._ctxPossible.set(isCodeEditorLike);
+		};
+
+		this._store.add(editorService.onDidActiveEditorChange(updateEditor));
+		updateEditor();
 	}
 
 	dispose() {
+		this._ctxPossible.reset();
 		this._ctxHasProvider.reset();
 		this._store.dispose();
 	}
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.ts
index c98fcfa30f8..cd2406cd971 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.ts
@@ -3,57 +3,69 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { WindowIntervalTimer } from 'vs/base/browser/dom';
-import { coalesceInPlace } from 'vs/base/common/arrays';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { themeColorFromId } from 'vs/base/common/themables';
-import { ICodeEditor, IViewZone, IViewZoneChangeAccessor } from 'vs/editor/browser/editorBrowser';
-import { StableEditorScrollState } from 'vs/editor/browser/stableEditorScroll';
-import { LineSource, RenderOptions, renderLines } from 'vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/renderLines';
-import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { LineRange } from 'vs/editor/common/core/lineRange';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { IEditorDecorationsCollection } from 'vs/editor/common/editorCommon';
-import { IModelDecorationsChangeAccessor, IModelDeltaDecoration, IValidEditOperation, MinimapPosition, OverviewRulerLane, TrackedRangeStickiness } from 'vs/editor/common/model';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { InlineDecoration, InlineDecorationType } from 'vs/editor/common/viewModel';
-import { localize } from 'vs/nls';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { Progress } from 'vs/platform/progress/common/progress';
-import { SaveReason } from 'vs/workbench/common/editor';
-import { countWords } from 'vs/workbench/contrib/chat/common/chatWordCounter';
-import { HunkInformation, ReplyResponse, Session } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSession';
-import { InlineChatZoneWidget } from './inlineChatZoneWidget';
-import { CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, CTX_INLINE_CHAT_DOCUMENT_CHANGED, InlineChatConfigKeys, minimapInlineChatDiffInserted, overviewRulerInlineChatDiffInserted } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
-import { HunkState } from './inlineChatSession';
-import { assertType } from 'vs/base/common/types';
-import { IModelService } from 'vs/editor/common/services/model';
-import { performAsyncTextEdit, asProgressiveEdit } from './utils';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { IUntitledTextEditorModel } from 'vs/workbench/services/untitled/common/untitledTextEditorModel';
-import { Schemas } from 'vs/base/common/network';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { DefaultChatTextEditor } from 'vs/workbench/contrib/chat/browser/codeBlockPart';
-import { isEqual } from 'vs/base/common/resources';
+import { getTotalWidth, WindowIntervalTimer } from '../../../../base/browser/dom.js';
+import { coalesceInPlace } from '../../../../base/common/arrays.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { themeColorFromId, ThemeIcon } from '../../../../base/common/themables.js';
+import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, IViewZone, IViewZoneChangeAccessor } from '../../../../editor/browser/editorBrowser.js';
+import { StableEditorScrollState } from '../../../../editor/browser/stableEditorScroll.js';
+import { LineSource, RenderOptions, renderLines } from '../../../../editor/browser/widget/diffEditor/components/diffEditorViewZones/renderLines.js';
+import { ISingleEditOperation } from '../../../../editor/common/core/editOperation.js';
+import { LineRange } from '../../../../editor/common/core/lineRange.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { IEditorDecorationsCollection } from '../../../../editor/common/editorCommon.js';
+import { IModelDecorationsChangeAccessor, IModelDeltaDecoration, IValidEditOperation, MinimapPosition, OverviewRulerLane, TrackedRangeStickiness } from '../../../../editor/common/model.js';
+import { ModelDecorationOptions } from '../../../../editor/common/model/textModel.js';
+import { IEditorWorkerService } from '../../../../editor/common/services/editorWorker.js';
+import { InlineDecoration, InlineDecorationType } from '../../../../editor/common/viewModel.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { Progress } from '../../../../platform/progress/common/progress.js';
+import { SaveReason } from '../../../common/editor.js';
+import { countWords } from '../../chat/common/chatWordCounter.js';
+import { HunkInformation, Session, HunkState } from './inlineChatSession.js';
+import { InlineChatZoneWidget } from './inlineChatZoneWidget.js';
+import { ACTION_TOGGLE_DIFF, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, CTX_INLINE_CHAT_DOCUMENT_CHANGED, InlineChatConfigKeys, MENU_INLINE_CHAT_ZONE, minimapInlineChatDiffInserted, overviewRulerInlineChatDiffInserted } from '../common/inlineChat.js';
+import { assertType } from '../../../../base/common/types.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { performAsyncTextEdit, asProgressiveEdit } from './utils.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
+import { IUntitledTextEditorModel } from '../../../services/untitled/common/untitledTextEditorModel.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { DefaultChatTextEditor } from '../../chat/browser/codeBlockPart.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { MenuWorkbenchButtonBar } from '../../../../platform/actions/browser/buttonbar.js';
+import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { ConflictActionsFactory, IContentWidgetAction } from '../../mergeEditor/browser/view/conflictActions.js';
+import { observableValue } from '../../../../base/common/observable.js';
+import { IMenuService, MenuItemAction } from '../../../../platform/actions/common/actions.js';
 
 export interface IEditObserver {
 	start(): void;
 	stop(): void;
 }
 
+export const enum HunkAction {
+	Accept,
+	Discard,
+	MoveNext,
+	MovePrev,
+	ToggleDiff
+}
+
 export abstract class EditModeStrategy {
 
 	protected static _decoBlock = ModelDecorationOptions.register({
 		description: 'inline-chat',
 		showIfCollapsed: false,
 		isWholeLine: true,
-		className: 'inline-chat-block-selection',
 	});
 
 	protected readonly _store = new DisposableStore();
@@ -64,20 +76,26 @@ export abstract class EditModeStrategy {
 	readonly onDidAccept: Event<void> = this._onDidAccept.event;
 	readonly onDidDiscard: Event<void> = this._onDidDiscard.event;
 
-	toggleDiff?: () => any;
-
 	constructor(
 		protected readonly _session: Session,
 		protected readonly _editor: ICodeEditor,
 		protected readonly _zone: InlineChatZoneWidget,
 		@ITextFileService private readonly _textFileService: ITextFileService,
-		@IInstantiationService private readonly _instaService: IInstantiationService,
+		@IInstantiationService protected readonly _instaService: IInstantiationService,
 	) { }
 
 	dispose(): void {
 		this._store.dispose();
 	}
 
+	performHunkAction(_hunk: HunkInformation | undefined, action: HunkAction) {
+		if (action === HunkAction.Accept) {
+			this._onDidAccept.fire();
+		} else if (action === HunkAction.Discard) {
+			this._onDidDiscard.fire();
+		}
+	}
+
 	protected async _doApplyChanges(ignoreLocal: boolean): Promise<void> {
 
 		const untitledModels: IUntitledTextEditorModel[] = [];
@@ -124,21 +142,13 @@ export abstract class EditModeStrategy {
 		return this._session.hunkData.discardAll();
 	}
 
-	async acceptHunk(): Promise<void> {
-		this._onDidAccept.fire();
-	}
 
-	async discardHunk(): Promise<void> {
-		this._onDidDiscard.fire();
-	}
 
 	abstract makeProgressiveChanges(edits: ISingleEditOperation[], obs: IEditObserver, timings: ProgressingEditsOptions, undoStopBefore: boolean): Promise<void>;
 
 	abstract makeChanges(edits: ISingleEditOperation[], obs: IEditObserver, undoStopBefore: boolean): Promise<void>;
 
-	abstract renderChanges(response: ReplyResponse): Promise<Position | undefined>;
-
-	move?(next: boolean): void;
+	abstract renderChanges(): Promise<Position | undefined>;
 
 	abstract hasFocus(): boolean;
 
@@ -190,7 +200,7 @@ export class PreviewStrategy extends EditModeStrategy {
 	override async makeProgressiveChanges(): Promise<void> {
 	}
 
-	override async renderChanges(response: ReplyResponse): Promise<undefined> { }
+	override async renderChanges(): Promise<undefined> { }
 
 	hasFocus(): boolean {
 		return this._zone.widget.hasFocus();
@@ -209,8 +219,10 @@ type HunkDisplayData = {
 
 	decorationIds: string[];
 
-	viewZoneId: string | undefined;
-	viewZone: IViewZone;
+	diffViewZoneId: string | undefined;
+	diffViewZone: IViewZone;
+
+	lensActionsViewZoneIds?: string[];
 
 	distance: number;
 	position: Position;
@@ -250,19 +262,20 @@ export class LiveStrategy extends EditModeStrategy {
 	private readonly _ctxCurrentChangeShowsDiff: IContextKey<boolean>;
 
 	private readonly _progressiveEditingDecorations: IEditorDecorationsCollection;
+	private readonly _lensActionsFactory: ConflictActionsFactory;
 	private _editCount: number = 0;
 
-	override acceptHunk: () => Promise<void> = () => super.acceptHunk();
-	override discardHunk: () => Promise<void> = () => super.discardHunk();
-
 	constructor(
 		session: Session,
 		editor: ICodeEditor,
 		zone: InlineChatZoneWidget,
+		private readonly _showOverlayToolbar: boolean,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IEditorWorkerService protected readonly _editorWorkerService: IEditorWorkerService,
 		@IAccessibilityService private readonly _accessibilityService: IAccessibilityService,
 		@IConfigurationService private readonly _configService: IConfigurationService,
+		@IMenuService private readonly _menuService: IMenuService,
+		@IContextKeyService private readonly _contextService: IContextKeyService,
 		@ITextFileService textFileService: ITextFileService,
 		@IInstantiationService instaService: IInstantiationService
 	) {
@@ -271,6 +284,7 @@ export class LiveStrategy extends EditModeStrategy {
 		this._ctxCurrentChangeShowsDiff = CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF.bindTo(contextKeyService);
 
 		this._progressiveEditingDecorations = this._editor.createDecorationsCollection();
+		this._lensActionsFactory = this._store.add(new ConflictActionsFactory(this._editor));
 
 	}
 
@@ -362,9 +376,70 @@ export class LiveStrategy extends EditModeStrategy {
 		}
 	}
 
+	override performHunkAction(hunk: HunkInformation | undefined, action: HunkAction) {
+		const displayData = this._findDisplayData(hunk);
+
+		if (!displayData) {
+			// no hunks (left or not yet) found, make sure to
+			// finish the sessions
+			if (action === HunkAction.Accept) {
+				this._onDidAccept.fire();
+			} else if (action === HunkAction.Discard) {
+				this._onDidDiscard.fire();
+			}
+			return;
+		}
+
+		if (action === HunkAction.Accept) {
+			displayData.acceptHunk();
+		} else if (action === HunkAction.Discard) {
+			displayData.discardHunk();
+		} else if (action === HunkAction.MoveNext) {
+			displayData.move(true);
+		} else if (action === HunkAction.MovePrev) {
+			displayData.move(false);
+		} else if (action === HunkAction.ToggleDiff) {
+			displayData.toggleDiff?.();
+		}
+	}
+
+	private _findDisplayData(hunkInfo?: HunkInformation) {
+		let result: HunkDisplayData | undefined;
+		if (hunkInfo) {
+			// use context hunk (from tool/buttonbar)
+			result = this._hunkDisplayData.get(hunkInfo);
+		}
+
+		if (!result && this._zone.position) {
+			// find nearest from zone position
+			const zoneLine = this._zone.position.lineNumber;
+			let distance: number = Number.MAX_SAFE_INTEGER;
+			for (const candidate of this._hunkDisplayData.values()) {
+				if (candidate.hunk.getState() !== HunkState.Pending) {
+					continue;
+				}
+				const hunkRanges = candidate.hunk.getRangesN();
+				const myDistance = zoneLine <= hunkRanges[0].startLineNumber
+					? hunkRanges[0].startLineNumber - zoneLine
+					: zoneLine - hunkRanges[0].endLineNumber;
+
+				if (myDistance < distance) {
+					distance = myDistance;
+					result = candidate;
+				}
+			}
+		}
+
+		if (!result) {
+			// fallback: first hunk that is pending
+			result = Iterable.first(Iterable.filter(this._hunkDisplayData.values(), candidate => candidate.hunk.getState() === HunkState.Pending));
+		}
+		return result;
+	}
+
 	private readonly _hunkDisplayData = new Map<HunkInformation, HunkDisplayData>();
 
-	override async renderChanges(response: ReplyResponse) {
+	override async renderChanges() {
 
 		this._progressiveEditingDecorations.clear();
 
@@ -421,67 +496,110 @@ export class LiveStrategy extends EditModeStrategy {
 							afterLineNumber: -1,
 							heightInLines: result.heightInLines,
 							domNode,
+							ordinal: 50000 + 2 // more than https://github.com/microsoft/vscode/blob/bf52a5cfb2c75a7327c9adeaefbddc06d529dcad/src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.ts#L42
 						};
 
 						const toggleDiff = () => {
 							const scrollState = StableEditorScrollState.capture(this._editor);
 							changeDecorationsAndViewZones(this._editor, (_decorationsAccessor, viewZoneAccessor) => {
 								assertType(data);
-								if (!data.viewZoneId) {
+								if (!data.diffViewZoneId) {
 									const [hunkRange] = hunkData.getRangesN();
 									viewZoneData.afterLineNumber = hunkRange.startLineNumber - 1;
-									data.viewZoneId = viewZoneAccessor.addZone(viewZoneData);
+									data.diffViewZoneId = viewZoneAccessor.addZone(viewZoneData);
+									overlay?.updateExtraTop(result.heightInLines);
 								} else {
-									viewZoneAccessor.removeZone(data.viewZoneId!);
-									data.viewZoneId = undefined;
+									viewZoneAccessor.removeZone(data.diffViewZoneId!);
+									overlay?.updateExtraTop(0);
+									data.diffViewZoneId = undefined;
 								}
 							});
-							this._ctxCurrentChangeShowsDiff.set(typeof data?.viewZoneId === 'string');
+							this._ctxCurrentChangeShowsDiff.set(typeof data?.diffViewZoneId === 'string');
 							scrollState.restore(this._editor);
 						};
 
+						const overlay = this._showOverlayToolbar && false
+							? this._instaService.createInstance(InlineChangeOverlay, this._editor, hunkData)
+							: undefined;
+
+
+						let lensActions: DisposableStore | undefined;
+						const lensActionsViewZoneIds: string[] = [];
+
+						if (this._showOverlayToolbar && hunkData.getState() === HunkState.Pending) {
+
+							lensActions = new DisposableStore();
+
+							const menu = this._menuService.createMenu(MENU_INLINE_CHAT_ZONE, this._contextService);
+							const makeActions = () => {
+								const actions: IContentWidgetAction[] = [];
+								const tuples = menu.getActions({ arg: hunkData });
+								for (const [, group] of tuples) {
+									for (const item of group) {
+										if (item instanceof MenuItemAction) {
+
+											let text = item.label;
+
+											if (item.id === ACTION_TOGGLE_DIFF) {
+												text = item.checked ? 'Hide Changes' : 'Show Changes';
+											} else if (ThemeIcon.isThemeIcon(item.item.icon)) {
+												text = `$(${item.item.icon.id}) ${text}`;
+											}
+
+											actions.push({
+												text,
+												tooltip: item.tooltip,
+												action: async () => item.run(),
+											});
+										}
+									}
+								}
+								return actions;
+							};
+
+							const obs = observableValue(this, makeActions());
+							lensActions.add(menu.onDidChange(() => obs.set(makeActions(), undefined)));
+							lensActions.add(menu);
+
+							lensActions.add(this._lensActionsFactory.createWidget(viewZoneAccessor,
+								hunkRanges[0].startLineNumber - 1,
+								obs,
+								lensActionsViewZoneIds
+							));
+						}
+
 						const remove = () => {
 							changeDecorationsAndViewZones(this._editor, (decorationsAccessor, viewZoneAccessor) => {
 								assertType(data);
 								for (const decorationId of data.decorationIds) {
 									decorationsAccessor.removeDecoration(decorationId);
 								}
-								if (data.viewZoneId) {
-									viewZoneAccessor.removeZone(data.viewZoneId);
+								if (data.diffViewZoneId) {
+									viewZoneAccessor.removeZone(data.diffViewZoneId);
 								}
 								data.decorationIds = [];
-								data.viewZoneId = undefined;
+								data.diffViewZoneId = undefined;
+
+								data.lensActionsViewZoneIds?.forEach(viewZoneAccessor.removeZone);
+								data.lensActionsViewZoneIds = undefined;
 							});
+
+							lensActions?.dispose();
+							overlay?.dispose();
 						};
 
 						const move = (next: boolean) => {
-							assertType(widgetData);
-
-							const candidates: Position[] = [];
-							for (const item of this._session.hunkData.getInfo()) {
-								if (item.getState() === HunkState.Pending) {
-									candidates.push(item.getRangesN()[0].getStartPosition().delta(-1));
-								}
-							}
-							if (candidates.length < 2) {
-								return;
-							}
-							for (let i = 0; i < candidates.length; i++) {
-								if (candidates[i].equals(widgetData.position)) {
-									let newPos: Position;
-									if (next) {
-										newPos = candidates[(i + 1) % candidates.length];
-									} else {
-										newPos = candidates[(i + candidates.length - 1) % candidates.length];
-									}
-									this._zone.updatePositionAndHeight(newPos);
-									renderHunks();
-									break;
-								}
+							const keys = Array.from(this._hunkDisplayData.keys());
+							const idx = keys.indexOf(hunkData);
+							const nextIdx = (idx + (next ? 1 : -1) + keys.length) % keys.length;
+							if (nextIdx !== idx) {
+								const nextData = this._hunkDisplayData.get(keys[nextIdx])!;
+								this._zone.updatePositionAndHeight(nextData?.position);
+								renderHunks();
 							}
 						};
 
-						const zoneLineNumber = this._zone.position!.lineNumber;
+						const zoneLineNumber = this._zone.position?.lineNumber ?? this._editor.getPosition()!.lineNumber;
 						const myDistance = zoneLineNumber <= hunkRanges[0].startLineNumber
 							? hunkRanges[0].startLineNumber - zoneLineNumber
 							: zoneLineNumber - hunkRanges[0].endLineNumber;
@@ -489,8 +607,9 @@ export class LiveStrategy extends EditModeStrategy {
 						data = {
 							hunk: hunkData,
 							decorationIds,
-							viewZoneId: '',
-							viewZone: viewZoneData,
+							diffViewZoneId: '',
+							diffViewZone: viewZoneData,
+							lensActionsViewZoneIds,
 							distance: myDistance,
 							position: hunkRanges[0].getStartPosition().delta(-1),
 							acceptHunk,
@@ -507,7 +626,7 @@ export class LiveStrategy extends EditModeStrategy {
 
 					} else {
 						// update distance and position based on modifiedRange-decoration
-						const zoneLineNumber = this._zone.position!.lineNumber;
+						const zoneLineNumber = this._zone.position?.lineNumber ?? this._editor.getPosition()!.lineNumber;
 						const modifiedRangeNow = hunkRanges[0];
 						data.position = modifiedRangeNow.getStartPosition().delta(-1);
 						data.distance = zoneLineNumber <= modifiedRangeNow.startLineNumber
@@ -530,12 +649,7 @@ export class LiveStrategy extends EditModeStrategy {
 			});
 
 			if (widgetData) {
-				this._zone.updatePositionAndHeight(widgetData.position);
-				this._editor.revealPositionInCenterIfOutsideViewport(widgetData.position);
-
-				const remainingHunks = this._session.hunkData.pending;
-				this._updateSummaryMessage(remainingHunks, this._session.hunkData.size);
-
+				this._zone.reveal(widgetData.position);
 
 				const mode = this._configService.getValue<'on' | 'off' | 'auto'>(InlineChatConfigKeys.AccessibleDiffView);
 				if (mode === 'on' || mode === 'auto' && this._accessibilityService.isScreenReaderOptimized()) {
@@ -543,10 +657,6 @@ export class LiveStrategy extends EditModeStrategy {
 				}
 
 				this._ctxCurrentChangeHasDiff.set(Boolean(widgetData.toggleDiff));
-				this.toggleDiff = widgetData.toggleDiff;
-				this.acceptHunk = async () => widgetData!.acceptHunk();
-				this.discardHunk = async () => widgetData!.discardHunk();
-				this.move = next => widgetData!.move(next);
 
 			} else if (this._hunkDisplayData.size > 0) {
 				// everything accepted or rejected
@@ -570,30 +680,6 @@ export class LiveStrategy extends EditModeStrategy {
 		return renderHunks()?.position;
 	}
 
-	private _updateSummaryMessage(remaining: number, total: number) {
-
-		const needsReview = this._configService.getValue<boolean>(InlineChatConfigKeys.AcceptedOrDiscardBeforeSave);
-		let message: string;
-		if (total === 0) {
-			message = localize('change.0', "Nothing changed.");
-		} else if (remaining === 1) {
-			message = needsReview
-				? localize('review.1', "$(info) Accept or discard 1 change")
-				: localize('change.1', "1 change");
-		} else {
-			message = needsReview
-				? localize('review.N', "$(info) Accept or Discard {0} changes", remaining)
-				: localize('change.N', "{0} changes", total);
-		}
-
-		let title: string | undefined;
-		if (needsReview) {
-			title = localize('review', "Review (accept or discard) all changes before continuing");
-		}
-
-		this._zone.widget.updateStatus(message, { title });
-	}
-
 	hasFocus(): boolean {
 		return this._zone.widget.hasFocus();
 	}
@@ -611,3 +697,78 @@ function changeDecorationsAndViewZones(editor: ICodeEditor, callback: (accessor:
 		});
 	});
 }
+
+
+class InlineChangeOverlay implements IOverlayWidget {
+
+	readonly allowEditorOverflow: boolean = false;
+
+	private readonly _id: string = `inline-chat-diff-overlay-` + generateUuid();
+	private readonly _domNode: HTMLElement = document.createElement('div');
+	private readonly _store: DisposableStore = new DisposableStore();
+
+	private _extraTopLines: number = 0;
+
+	constructor(
+		private readonly _editor: ICodeEditor,
+		private readonly _hunkInfo: HunkInformation,
+		@IInstantiationService private readonly _instaService: IInstantiationService,
+	) {
+
+		this._domNode.classList.add('inline-chat-diff-overlay');
+
+		if (_hunkInfo.getState() === HunkState.Pending) {
+
+			const menuBar = this._store.add(this._instaService.createInstance(MenuWorkbenchButtonBar, this._domNode, MENU_INLINE_CHAT_ZONE, {
+				menuOptions: { arg: _hunkInfo },
+				telemetrySource: 'inlineChat-changesZone',
+				buttonConfigProvider: (_action, idx) => {
+					return {
+						isSecondary: idx > 0,
+						showIcon: true,
+						showLabel: false
+					};
+				},
+			}));
+
+			this._store.add(menuBar.onDidChange(() => this._editor.layoutOverlayWidget(this)));
+		}
+
+		this._editor.addOverlayWidget(this);
+		this._store.add(Event.any(this._editor.onDidLayoutChange, this._editor.onDidScrollChange)(() => this._editor.layoutOverlayWidget(this)));
+		queueMicrotask(() => this._editor.layoutOverlayWidget(this)); // FUNKY but needed to get the initial layout right
+	}
+
+	dispose(): void {
+		this._editor.removeOverlayWidget(this);
+		this._store.dispose();
+	}
+
+	getId(): string {
+		return this._id;
+	}
+
+	getDomNode(): HTMLElement {
+		return this._domNode;
+	}
+
+	getPosition(): IOverlayWidgetPosition | null {
+
+		const line = this._hunkInfo.getRangesN()[0].startLineNumber;
+		const info = this._editor.getLayoutInfo();
+		const top = this._editor.getTopForLineNumber(line) - this._editor.getScrollTop();
+		const left = info.contentLeft + info.contentWidth - info.verticalScrollbarWidth;
+
+		const extraTop = this._editor.getOption(EditorOption.lineHeight) * this._extraTopLines;
+		const width = getTotalWidth(this._domNode);
+
+		return { preference: { top: top - extraTop, left: left - width } };
+	}
+
+	updateExtraTop(value: number) {
+		if (this._extraTopLines !== value) {
+			this._extraTopLines = value;
+			this._editor.layoutOverlayWidget(this);
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.ts
index 4f704f93e9f..ee4ea41d95a 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.ts
@@ -3,51 +3,57 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Dimension, getActiveElement, getTotalHeight, h, reset, trackFocus } from 'vs/base/browser/dom';
-import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
-import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IMarkdownString, MarkdownString } from 'vs/base/common/htmlContent';
-import { DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
-import { ISettableObservable, constObservable, derived, observableValue } from 'vs/base/common/observable';
-import 'vs/css!./media/inlineChat';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { AccessibleDiffViewer, IAccessibleDiffViewerModel } from 'vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer';
-import { EditorOption, IComputedEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { LineRange } from 'vs/editor/common/core/lineRange';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { DetailedLineRangeMapping, RangeMapping } from 'vs/editor/common/diff/rangeMapping';
-import { ICodeEditorViewState, ScrollType } from 'vs/editor/common/editorCommon';
-import { ITextModel } from 'vs/editor/common/model';
-import { IResolvedTextEditorModel, ITextModelService } from 'vs/editor/common/services/resolverService';
-import { localize } from 'vs/nls';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { IWorkbenchButtonBarOptions, MenuWorkbenchButtonBar } from 'vs/platform/actions/browser/buttonbar';
-import { HiddenItemStrategy, MenuWorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { asCssVariable, asCssVariableName, editorBackground, editorForeground, inputBackground } from 'vs/platform/theme/common/colorRegistry';
-import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { IAccessibleViewService } from 'vs/platform/accessibility/browser/accessibleView';
-import { AccessibilityCommandId } from 'vs/workbench/contrib/accessibility/common/accessibilityCommands';
-import { ChatModel, IChatModel } from 'vs/workbench/contrib/chat/common/chatModel';
-import { isRequestVM, isResponseVM, isWelcomeVM } from 'vs/workbench/contrib/chat/common/chatViewModel';
-import { HunkInformation, Session } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSession';
-import { CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_RESPONSE_FOCUSED, inlineChatBackground } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
-import { ChatWidget } from 'vs/workbench/contrib/chat/browser/chatWidget';
-import { chatRequestBackground } from 'vs/workbench/contrib/chat/common/chatColors';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ChatAgentLocation } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { isNonEmptyArray, tail } from 'vs/base/common/arrays';
-import { IChatService } from 'vs/workbench/contrib/chat/common/chatService';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { IChatListItemRendererOptions } from 'vs/workbench/contrib/chat/browser/chat';
+import { $, Dimension, getActiveElement, getTotalHeight, h, reset, trackFocus } from '../../../../base/browser/dom.js';
+import { IActionViewItemOptions } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { IAction } from '../../../../base/common/actions.js';
+import { isNonEmptyArray, tail } from '../../../../base/common/arrays.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { IMarkdownString } from '../../../../base/common/htmlContent.js';
+import { DisposableStore, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { constObservable, derived, ISettableObservable, observableValue } from '../../../../base/common/observable.js';
+import './media/inlineChat.css';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { AccessibleDiffViewer, IAccessibleDiffViewerModel } from '../../../../editor/browser/widget/diffEditor/components/accessibleDiffViewer.js';
+import { EditorOption, IComputedEditorOptions } from '../../../../editor/common/config/editorOptions.js';
+import { LineRange } from '../../../../editor/common/core/lineRange.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { Selection } from '../../../../editor/common/core/selection.js';
+import { DetailedLineRangeMapping, RangeMapping } from '../../../../editor/common/diff/rangeMapping.js';
+import { ICodeEditorViewState, ScrollType } from '../../../../editor/common/editorCommon.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { IResolvedTextEditorModel, ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { localize } from '../../../../nls.js';
+import { IAccessibleViewService } from '../../../../platform/accessibility/browser/accessibleView.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { IWorkbenchButtonBarOptions, MenuWorkbenchButtonBar } from '../../../../platform/actions/browser/buttonbar.js';
+import { createActionViewItem, IMenuEntryActionViewItemOptions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
+import { MenuId, MenuItemAction } from '../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { asCssVariable, asCssVariableName, editorBackground, inputBackground } from '../../../../platform/theme/common/colorRegistry.js';
+import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
+import { AccessibilityCommandId } from '../../accessibility/common/accessibilityCommands.js';
+import { MarkUnhelpfulActionId } from '../../chat/browser/actions/chatTitleActions.js';
+import { IChatWidgetViewOptions } from '../../chat/browser/chat.js';
+import { ChatVoteDownButton } from '../../chat/browser/chatListRenderer.js';
+import { ChatWidget, IChatWidgetLocationOptions } from '../../chat/browser/chatWidget.js';
+import { chatRequestBackground } from '../../chat/common/chatColors.js';
+import { CONTEXT_CHAT_RESPONSE_SUPPORT_ISSUE_REPORTING, CONTEXT_RESPONSE, CONTEXT_RESPONSE_ERROR, CONTEXT_RESPONSE_FILTERED, CONTEXT_RESPONSE_VOTE } from '../../chat/common/chatContextKeys.js';
+import { IChatModel } from '../../chat/common/chatModel.js';
+import { ChatAgentVoteDirection, IChatService } from '../../chat/common/chatService.js';
+import { isResponseVM } from '../../chat/common/chatViewModel.js';
+import { HunkInformation, Session } from './inlineChatSession.js';
+import { CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_RESPONSE_FOCUSED, inlineChatBackground, inlineChatForeground } from '../common/inlineChat.js';
+import { EDITOR_DRAG_AND_DROP_BACKGROUND } from '../../../common/theme.js';
+import { ILayoutService } from '../../../../platform/layout/browser/layoutService.js';
 
 
 export interface InlineChatWidgetViewState {
@@ -57,30 +63,18 @@ export interface InlineChatWidgetViewState {
 }
 
 export interface IInlineChatWidgetConstructionOptions {
-	/**
-	 * The telemetry source for all commands of this widget
-	 */
-	telemetrySource: string;
-	/**
-	 * The menu that is inside the input editor, use for send, dictation
-	 */
-	inputMenuId: MenuId;
-	/**
-	 * The menu that next to the input editor, use for close, config etc
-	 */
-	widgetMenuId: MenuId;
+
 	/**
 	 * The menu that rendered as button bar, use for accept, discard etc
 	 */
 	statusMenuId: MenuId | { menu: MenuId; options: IWorkbenchButtonBarOptions };
+
+	secondaryMenuId?: MenuId;
+
 	/**
-	 * The men that rendered in the lower right corner, use for feedback
+	 * The options for the chat widget
 	 */
-	feedbackMenuId?: MenuId;
-
-	editorOverflowWidgetsDomNode?: HTMLElement;
-
-	rendererOptions?: IChatListItemRendererOptions;
+	chatWidgetViewOptions?: IChatWidgetViewOptions;
 }
 
 export interface IInlineChatMessage {
@@ -100,26 +94,21 @@ export class InlineChatWidget {
 		'div.inline-chat@root',
 		[
 			h('div.chat-widget@chatWidget'),
-			h('div.progress@progress'),
-			h('div.followUps.hidden@followUps'),
-			h('div.previewDiff.hidden@previewDiff'),
 			h('div.accessibleViewer@accessibleViewer'),
 			h('div.status@status', [
 				h('div.label.info.hidden@infoLabel'),
-				h('div.actions.hidden@statusToolbar'),
+				h('div.actions.hidden@toolbar1'),
 				h('div.label.status.hidden@statusLabel'),
-				h('div.actions.hidden@feedbackToolbar'),
+				h('div.actions.secondary.hidden@toolbar2'),
 			]),
 		]
 	);
 
 	protected readonly _store = new DisposableStore();
 
-	private readonly _defaultChatModel: ChatModel;
 	private readonly _ctxInputEditorFocused: IContextKey<boolean>;
 	private readonly _ctxResponseFocused: IContextKey<boolean>;
 
-	private readonly _progressBar: ProgressBar;
 	private readonly _chatWidget: ChatWidget;
 
 	protected readonly _onDidChangeHeight = this._store.add(new Emitter<void>());
@@ -133,7 +122,7 @@ export class InlineChatWidget {
 	readonly scopedContextKeyService: IContextKeyService;
 
 	constructor(
-		location: ChatAgentLocation,
+		location: IChatWidgetLocationOptions,
 		options: IInlineChatWidgetConstructionOptions,
 		@IInstantiationService protected readonly _instantiationService: IInstantiationService,
 		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
@@ -145,12 +134,6 @@ export class InlineChatWidget {
 		@IChatService private readonly _chatService: IChatService,
 		@IHoverService private readonly _hoverService: IHoverService,
 	) {
-		// toolbars
-		this._progressBar = new ProgressBar(this._elements.progress);
-		this._store.add(this._progressBar);
-
-		let allowRequests = false;
-
 		this.scopedContextKeyService = this._store.add(_contextKeyService.createScoped(this._elements.chatWidget));
 		const scopedInstaService = _instantiationService.createChild(
 			new ServiceCollection([
@@ -163,33 +146,34 @@ export class InlineChatWidget {
 		this._chatWidget = scopedInstaService.createInstance(
 			ChatWidget,
 			location,
-			{ resource: true },
+			undefined,
 			{
 				defaultElementHeight: 32,
-				renderStyle: 'compact',
-				renderInputOnTop: true,
+				renderStyle: 'minimal',
+				renderInputOnTop: false,
 				renderFollowups: true,
-				supportsFileReferences: true,
-				editorOverflowWidgetsDomNode: options.editorOverflowWidgetsDomNode,
-				rendererOptions: options.rendererOptions,
-				menus: {
-					executeToolbar: options.inputMenuId,
-					inputSideToolbar: options.widgetMenuId,
-					telemetrySource: options.telemetrySource
-				},
+				supportsFileReferences: _configurationService.getValue(`chat.experimental.variables.${location.location}`) === true,
 				filter: item => {
-					if (isWelcomeVM(item)) {
-						return false;
-					}
-					if (isRequestVM(item)) {
-						return allowRequests;
+					if (isResponseVM(item) && item.isComplete && !item.errorDetails) {
+						// filter responses that
+						// - are just text edits(prevents the "Made Edits")
+						// - are all empty
+						if (item.response.value.length > 0 && item.response.value.every(item => item.kind === 'textEditGroup' && options.chatWidgetViewOptions?.rendererOptions?.renderTextEditsAsSummary?.(item.uri))) {
+							return false;
+						}
+						if (item.response.value.length === 0) {
+							return false;
+						}
+						return true;
 					}
 					return true;
 				},
+				...options.chatWidgetViewOptions
 			},
 			{
-				listForeground: editorForeground,
+				listForeground: inlineChatForeground,
 				listBackground: inlineChatBackground,
+				overlayBackground: EDITOR_DRAG_AND_DROP_BACKGROUND,
 				inputEditorBackground: inputBackground,
 				resultEditorBackground: editorBackground
 			}
@@ -199,41 +183,43 @@ export class InlineChatWidget {
 		this._chatWidget.setVisible(true);
 		this._store.add(this._chatWidget);
 
-		const viewModelListener = this._store.add(new MutableDisposable());
-		this._store.add(this._chatWidget.onDidChangeViewModel(() => {
-			const model = this._chatWidget.viewModel;
-
-			if (!model) {
-				allowRequests = false;
-				viewModelListener.clear();
-				return;
-			}
-
-			const updateAllowRequestsFilter = () => {
-				let requestCount = 0;
-				for (const item of model.getItems()) {
-					if (isRequestVM(item)) {
-						if (++requestCount >= 2) {
-							break;
-						}
-					}
-				}
-				const newAllowRequest = requestCount >= 2;
-				if (newAllowRequest !== allowRequests) {
-					allowRequests = newAllowRequest;
-					this._chatWidget.refilter();
-				}
-			};
-			viewModelListener.value = model.onDidChange(updateAllowRequestsFilter);
-		}));
+		const ctxResponse = CONTEXT_RESPONSE.bindTo(this.scopedContextKeyService);
+		const ctxResponseVote = CONTEXT_RESPONSE_VOTE.bindTo(this.scopedContextKeyService);
+		const ctxResponseSupportIssues = CONTEXT_CHAT_RESPONSE_SUPPORT_ISSUE_REPORTING.bindTo(this.scopedContextKeyService);
+		const ctxResponseError = CONTEXT_RESPONSE_ERROR.bindTo(this.scopedContextKeyService);
+		const ctxResponseErrorFiltered = CONTEXT_RESPONSE_FILTERED.bindTo(this.scopedContextKeyService);
 
 		const viewModelStore = this._store.add(new DisposableStore());
 		this._store.add(this._chatWidget.onDidChangeViewModel(() => {
 			viewModelStore.clear();
+
 			const viewModel = this._chatWidget.viewModel;
-			if (viewModel) {
-				viewModelStore.add(viewModel.onDidChange(() => this._onDidChangeHeight.fire()));
+			if (!viewModel) {
+				return;
 			}
+
+			viewModelStore.add(toDisposable(() => {
+				toolbar2.context = undefined;
+				ctxResponse.reset();
+				ctxResponseVote.reset();
+				ctxResponseError.reset();
+				ctxResponseErrorFiltered.reset();
+				ctxResponseSupportIssues.reset();
+			}));
+
+			viewModelStore.add(viewModel.onDidChange(() => {
+
+				const last = viewModel.getItems().at(-1);
+				toolbar2.context = last;
+
+				ctxResponse.set(isResponseVM(last));
+				ctxResponseVote.set(isResponseVM(last) ? last.vote === ChatAgentVoteDirection.Down ? 'down' : last.vote === ChatAgentVoteDirection.Up ? 'up' : '' : '');
+				ctxResponseError.set(isResponseVM(last) && last.errorDetails !== undefined);
+				ctxResponseErrorFiltered.set((!!(isResponseVM(last) && last.errorDetails?.responseIsFiltered)));
+				ctxResponseSupportIssues.set(isResponseVM(last) && (last.agent?.metadata.supportIssueReporting ?? false));
+
+				this._onDidChangeHeight.fire();
+			}));
 			this._onDidChangeHeight.fire();
 		}));
 
@@ -252,26 +238,32 @@ export class InlineChatWidget {
 		this._store.add(this._chatWidget.inputEditor.onDidBlurEditorWidget(() => this._ctxInputEditorFocused.set(false)));
 
 		const statusMenuId = options.statusMenuId instanceof MenuId ? options.statusMenuId : options.statusMenuId.menu;
-		const statusMenuOptions = options.statusMenuId instanceof MenuId ? undefined : options.statusMenuId.options;
 
-		const statusButtonBar = this._instantiationService.createInstance(MenuWorkbenchButtonBar, this._elements.statusToolbar, statusMenuId, statusMenuOptions);
+		// BUTTON bar
+		const statusMenuOptions = options.statusMenuId instanceof MenuId ? undefined : options.statusMenuId.options;
+		const statusButtonBar = scopedInstaService.createInstance(MenuWorkbenchButtonBar, this._elements.toolbar1, statusMenuId, {
+			toolbarOptions: { primaryGroup: '0_main' },
+			telemetrySource: options.chatWidgetViewOptions?.menus?.telemetrySource,
+			menuOptions: { renderShortTitle: true },
+			...statusMenuOptions,
+		});
 		this._store.add(statusButtonBar.onDidChange(() => this._onDidChangeHeight.fire()));
 		this._store.add(statusButtonBar);
 
-
-		const workbenchToolbarOptions = {
-			hiddenItemStrategy: HiddenItemStrategy.NoHide,
-			toolbarOptions: {
-				primaryGroup: () => true,
-				useSeparatorsInPrimaryActions: true
+		// secondary toolbar
+		const toolbar2 = scopedInstaService.createInstance(MenuWorkbenchToolBar, this._elements.toolbar2, options.secondaryMenuId ?? MenuId.for(''), {
+			telemetrySource: options.chatWidgetViewOptions?.menus?.telemetrySource,
+			menuOptions: { renderShortTitle: true, shouldForwardArgs: true },
+			actionViewItemProvider: (action: IAction, options: IActionViewItemOptions) => {
+				if (action instanceof MenuItemAction && action.item.id === MarkUnhelpfulActionId) {
+					return scopedInstaService.createInstance(ChatVoteDownButton, action, options as IMenuEntryActionViewItemOptions);
+				}
+				return createActionViewItem(scopedInstaService, action, options);
 			}
-		};
+		});
+		this._store.add(toolbar2.onDidChangeMenuItems(() => this._onDidChangeHeight.fire()));
+		this._store.add(toolbar2);
 
-		if (options.feedbackMenuId) {
-			const feedbackToolbar = this._instantiationService.createInstance(MenuWorkbenchToolBar, this._elements.feedbackToolbar, options.feedbackMenuId, { ...workbenchToolbarOptions, hiddenItemStrategy: HiddenItemStrategy.Ignore });
-			this._store.add(feedbackToolbar.onDidChangeMenuItems(() => this._onDidChangeHeight.fire()));
-			this._store.add(feedbackToolbar);
-		}
 
 		this._store.add(this._configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration(AccessibilityVerbositySettingId.InlineChat)) {
@@ -280,7 +272,6 @@ export class InlineChatWidget {
 		}));
 
 		this._elements.root.tabIndex = 0;
-		this._elements.followUps.tabIndex = 0;
 		this._elements.statusLabel.tabIndex = 0;
 		this._updateAriaLabel();
 
@@ -294,13 +285,6 @@ export class InlineChatWidget {
 				this.updateStatus('Thank you for your feedback!', { resetAfter: 1250 });
 			}
 		}));
-
-		// LEGACY - default chat model
-		// this is only here for as long as we offer updateChatMessage
-		this._defaultChatModel = this._store.add(this._instantiationService.createInstance(ChatModel, undefined, ChatAgentLocation.Editor));
-		this._defaultChatModel.startInitialize();
-		this._defaultChatModel.initialize(undefined);
-		this.setChatModel(this._defaultChatModel);
 	}
 
 	private _updateAriaLabel(): void {
@@ -346,18 +330,15 @@ export class InlineChatWidget {
 
 	protected _doLayout(dimension: Dimension): void {
 		const extraHeight = this._getExtraHeight();
-		const progressHeight = getTotalHeight(this._elements.progress);
-		const followUpsHeight = getTotalHeight(this._elements.followUps);
 		const statusHeight = getTotalHeight(this._elements.status);
 
 		// console.log('ZONE#Widget#layout', { height: dimension.height, extraHeight, progressHeight, followUpsHeight, statusHeight, LIST: dimension.height - progressHeight - followUpsHeight - statusHeight - extraHeight });
 
 		this._elements.root.style.height = `${dimension.height - extraHeight}px`;
 		this._elements.root.style.width = `${dimension.width}px`;
-		this._elements.progress.style.width = `${dimension.width}px`;
 
 		this._chatWidget.layout(
-			dimension.height - progressHeight - followUpsHeight - statusHeight - extraHeight,
+			dimension.height - statusHeight - extraHeight,
 			dimension.width
 		);
 	}
@@ -367,13 +348,11 @@ export class InlineChatWidget {
 	 */
 	get contentHeight(): number {
 		const data = {
-			followUpsHeight: getTotalHeight(this._elements.followUps),
 			chatWidgetContentHeight: this._chatWidget.contentHeight,
-			progressHeight: getTotalHeight(this._elements.progress),
 			statusHeight: getTotalHeight(this._elements.status),
 			extraHeight: this._getExtraHeight()
 		};
-		const result = data.progressHeight + data.chatWidgetContentHeight + data.followUpsHeight + data.statusHeight + data.extraHeight;
+		const result = data.chatWidgetContentHeight + data.statusHeight + data.extraHeight;
 		return result;
 	}
 
@@ -396,17 +375,7 @@ export class InlineChatWidget {
 	}
 
 	protected _getExtraHeight(): number {
-		return 12 /* padding */ + 2 /*border*/ + 12 /*shadow*/;
-	}
-
-	updateProgress(show: boolean) {
-		if (show) {
-			this._progressBar.show();
-			this._progressBar.infinite();
-		} else {
-			this._progressBar.stop();
-			this._progressBar.hide();
-		}
+		return 2 /*border*/ + 4 /*shadow*/;
 	}
 
 	get value(): string {
@@ -435,9 +404,18 @@ export class InlineChatWidget {
 		this._chatWidget.setInputPlaceholder(value);
 	}
 
+	toggleStatus(show: boolean) {
+		this._elements.toolbar1.classList.toggle('hidden', !show);
+		this._elements.toolbar2.classList.toggle('hidden', !show);
+		this._elements.status.classList.toggle('hidden', !show);
+		this._elements.infoLabel.classList.toggle('hidden', !show);
+		this._onDidChangeHeight.fire();
+	}
+
 	updateToolbar(show: boolean) {
-		this._elements.statusToolbar.classList.toggle('hidden', !show);
-		this._elements.feedbackToolbar.classList.toggle('hidden', !show);
+		this._elements.root.classList.toggle('toolbar', show);
+		this._elements.toolbar1.classList.toggle('hidden', !show);
+		this._elements.toolbar2.classList.toggle('hidden', !show);
 		this._elements.status.classList.toggle('actions', show);
 		this._elements.infoLabel.classList.toggle('hidden', show);
 		this._onDidChangeHeight.fire();
@@ -448,12 +426,12 @@ export class InlineChatWidget {
 		if (!viewModel) {
 			return undefined;
 		}
-		for (const item of viewModel.getItems()) {
-			if (isResponseVM(item)) {
-				return viewModel.codeBlockModelCollection.get(viewModel.sessionId, item, codeBlockIndex)?.model;
-			}
+		const items = viewModel.getItems().filter(i => isResponseVM(i));
+		if (!items.length) {
+			return;
 		}
-		return undefined;
+		const item = items[items.length - 1];
+		return viewModel.codeBlockModelCollection.get(viewModel.sessionId, item, codeBlockIndex)?.model;
 	}
 
 	get responseContent(): string | undefined {
@@ -461,74 +439,18 @@ export class InlineChatWidget {
 		if (!isNonEmptyArray(requests)) {
 			return undefined;
 		}
-		return tail(requests)?.response?.response.asString();
+		return tail(requests)?.response?.response.toString();
 	}
 
-	get usesDefaultChatModel(): boolean {
-		return this.getChatModel() === this._defaultChatModel;
-	}
 
-	getChatModel(): IChatModel {
-		return this._chatWidget.viewModel?.model ?? this._defaultChatModel;
+	getChatModel(): IChatModel | undefined {
+		return this._chatWidget.viewModel?.model;
 	}
 
 	setChatModel(chatModel: IChatModel) {
 		this._chatWidget.setModel(chatModel, { inputValue: undefined });
 	}
 
-
-	/**
-	 * @deprecated use `setChatModel` instead
-	 */
-	addToHistory(input: string) {
-		if (this._chatWidget.viewModel?.model === this._defaultChatModel) {
-			this._chatWidget.input.acceptInput(input);
-		}
-	}
-
-	/**
-	 * @deprecated use `setChatModel` instead
-	 */
-	updateChatMessage(message: IInlineChatMessage, isIncomplete: true): IInlineChatMessageAppender;
-	updateChatMessage(message: IInlineChatMessage | undefined): void;
-	updateChatMessage(message: IInlineChatMessage | undefined, isIncomplete?: boolean, isCodeBlockEditable?: boolean): IInlineChatMessageAppender | undefined;
-	updateChatMessage(message: IInlineChatMessage | undefined, isIncomplete?: boolean, isCodeBlockEditable?: boolean): IInlineChatMessageAppender | undefined {
-
-		if (!this._chatWidget.viewModel || this._chatWidget.viewModel.model !== this._defaultChatModel) {
-			// this can only be used with the default chat model
-			return;
-		}
-
-		const model = this._defaultChatModel;
-		if (!message?.message.value) {
-			for (const request of model.getRequests()) {
-				model.removeRequest(request.id);
-			}
-			return;
-		}
-
-		const chatRequest = model.addRequest({ parts: [], text: '' }, { variables: [] }, 0);
-		model.acceptResponseProgress(chatRequest, {
-			kind: 'markdownContent',
-			content: message.message
-		});
-
-		if (!isIncomplete) {
-			model.completeResponse(chatRequest);
-			return;
-		}
-		return {
-			cancel: () => model.cancelRequest(chatRequest),
-			complete: () => model.completeResponse(chatRequest),
-			appendContent: (fragment: string) => {
-				model.acceptResponseProgress(chatRequest, {
-					kind: 'markdownContent',
-					content: new MarkdownString(fragment)
-				});
-			}
-		};
-	}
-
 	updateInfo(message: string): void {
 		this._elements.infoLabel.classList.toggle('hidden', !message);
 		const renderedMessage = renderLabelWithIcons(message);
@@ -565,13 +487,13 @@ export class InlineChatWidget {
 	}
 
 	reset() {
+		this._chatWidget.setContext(true);
 		this._chatWidget.saveState();
-		this.updateChatMessage(undefined);
 
 		reset(this._elements.statusLabel);
 		this._elements.statusLabel.classList.toggle('hidden', true);
-		this._elements.statusToolbar.classList.add('hidden');
-		this._elements.feedbackToolbar.classList.add('hidden');
+		this._elements.toolbar1.classList.add('hidden');
+		this._elements.toolbar2.classList.add('hidden');
 		this.updateInfo('');
 
 		this._elements.accessibleViewer.classList.toggle('hidden', true);
@@ -594,8 +516,9 @@ export class EditorBasedInlineChatWidget extends InlineChatWidget {
 
 	private readonly _accessibleViewer = this._store.add(new MutableDisposable<HunkAccessibleDiffViewer>());
 
+
 	constructor(
-		location: ChatAgentLocation,
+		location: IChatWidgetLocationOptions,
 		private readonly _parentEditor: ICodeEditor,
 		options: IInlineChatWidgetConstructionOptions,
 		@IContextKeyService contextKeyService: IContextKeyService,
@@ -607,8 +530,15 @@ export class EditorBasedInlineChatWidget extends InlineChatWidget {
 		@ITextModelService textModelResolverService: ITextModelService,
 		@IChatService chatService: IChatService,
 		@IHoverService hoverService: IHoverService,
+		@ILayoutService layoutService: ILayoutService
 	) {
-		super(location, { ...options, editorOverflowWidgetsDomNode: _parentEditor.getOverflowWidgetsDomNode() }, instantiationService, contextKeyService, keybindingService, accessibilityService, configurationService, accessibleViewService, textModelResolverService, chatService, hoverService);
+		super(location, {
+			...options,
+			chatWidgetViewOptions: {
+				...options.chatWidgetViewOptions,
+				editorOverflowWidgetsDomNode: layoutService.mainContainer.appendChild($('.inline-chat-overflow.monaco-editor'))
+			}
+		}, instantiationService, contextKeyService, keybindingService, accessibilityService, configurationService, accessibleViewService, textModelResolverService, chatService, hoverService);
 	}
 
 	// --- layout
@@ -617,7 +547,7 @@ export class EditorBasedInlineChatWidget extends InlineChatWidget {
 		let result = super.contentHeight;
 
 		if (this._accessibleViewer.value) {
-			result += this._accessibleViewer.value.height;
+			result += this._accessibleViewer.value.height + 8 /* padding */;
 		}
 
 		return result;
@@ -629,7 +559,7 @@ export class EditorBasedInlineChatWidget extends InlineChatWidget {
 
 		if (this._accessibleViewer.value) {
 			this._accessibleViewer.value.width = dimension.width - 12;
-			newHeight -= this._accessibleViewer.value.height;
+			newHeight -= this._accessibleViewer.value.height + 8;
 		}
 
 		super._doLayout(dimension.with(undefined, newHeight));
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.ts
index 88c16b8070d..5e732d8a83a 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.ts
@@ -2,43 +2,45 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { addDisposableListener, Dimension } from 'vs/base/browser/dom';
-import * as aria from 'vs/base/browser/ui/aria/aria';
-import { toDisposable } from 'vs/base/common/lifecycle';
-import { assertType } from 'vs/base/common/types';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorLayoutInfo, EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Position } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { ZoneWidget } from 'vs/editor/contrib/zoneWidget/browser/zoneWidget';
-import { localize } from 'vs/nls';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ACTION_ACCEPT_CHANGES, ACTION_REGENERATE_RESPONSE, ACTION_TOGGLE_DIFF, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, EditMode, InlineChatConfigKeys, MENU_INLINE_CHAT_WIDGET, MENU_INLINE_CHAT_WIDGET_STATUS } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
-import { EditorBasedInlineChatWidget } from './inlineChatWidget';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { isEqual } from 'vs/base/common/resources';
-import { StableEditorBottomScrollState } from 'vs/editor/browser/stableEditorScroll';
-import { ScrollType } from 'vs/editor/common/editorCommon';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ChatAgentLocation } from 'vs/workbench/contrib/chat/common/chatAgents';
+import { addDisposableListener, Dimension } from '../../../../base/browser/dom.js';
+import * as aria from '../../../../base/browser/ui/aria/aria.js';
+import { MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { assertType } from '../../../../base/common/types.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { StableEditorBottomScrollState } from '../../../../editor/browser/stableEditorScroll.js';
+import { EditorLayoutInfo, EditorOption } from '../../../../editor/common/config/editorOptions.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { ScrollType } from '../../../../editor/common/editorCommon.js';
+import { ZoneWidget } from '../../../../editor/contrib/zoneWidget/browser/zoneWidget.js';
+import { localize } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IChatWidgetLocationOptions } from '../../chat/browser/chatWidget.js';
+import { isResponseVM } from '../../chat/common/chatViewModel.js';
+import { ACTION_REGENERATE_RESPONSE, ACTION_REPORT_ISSUE, ACTION_TOGGLE_DIFF, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, EditMode, InlineChatConfigKeys, MENU_INLINE_CHAT_WIDGET_SECONDARY, MENU_INLINE_CHAT_WIDGET_STATUS } from '../common/inlineChat.js';
+import { EditorBasedInlineChatWidget } from './inlineChatWidget.js';
 
 export class InlineChatZoneWidget extends ZoneWidget {
 
 	readonly widget: EditorBasedInlineChatWidget;
 
+	private readonly _scrollUp = this._disposables.add(new ScrollUpState(this.editor));
 	private readonly _ctxCursorPosition: IContextKey<'above' | 'below' | ''>;
 	private _dimension?: Dimension;
-	private _indentationWidth: number | undefined;
 
 	constructor(
-		location: ChatAgentLocation,
+		location: IChatWidgetLocationOptions,
 		editor: ICodeEditor,
 		@IInstantiationService private readonly _instaService: IInstantiationService,
+		@ILogService private _logService: ILogService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IConfigurationService configurationService: IConfigurationService,
 	) {
-		super(editor, { showFrame: false, showArrow: false, isAccessible: true, className: 'inline-chat-widget', keepEditorSelection: true, showInHiddenAreas: true, ordinal: 10000 });
+		super(editor, { showFrame: false, showArrow: false, isAccessible: true, className: 'inline-chat-widget', keepEditorSelection: true, showInHiddenAreas: true, ordinal: 50000 });
 
 		this._ctxCursorPosition = CTX_INLINE_CHAT_OUTER_CURSOR_POSITION.bindTo(contextKeyService);
 
@@ -47,39 +49,53 @@ export class InlineChatZoneWidget extends ZoneWidget {
 		}));
 
 		this.widget = this._instaService.createInstance(EditorBasedInlineChatWidget, location, this.editor, {
-			telemetrySource: 'interactiveEditorWidget-toolbar',
-			inputMenuId: MenuId.ChatExecute,
-			widgetMenuId: MENU_INLINE_CHAT_WIDGET,
 			statusMenuId: {
 				menu: MENU_INLINE_CHAT_WIDGET_STATUS,
 				options: {
-					buttonConfigProvider: action => {
-						if (new Set([ACTION_REGENERATE_RESPONSE, ACTION_TOGGLE_DIFF]).has(action.id)) {
-							return { isSecondary: true, showIcon: true, showLabel: false };
-						} else if (action.id === ACTION_ACCEPT_CHANGES) {
-							return { isSecondary: false };
+					buttonConfigProvider: (action, index) => {
+						const isSecondary = index > 0;
+						if (new Set([ACTION_REGENERATE_RESPONSE, ACTION_TOGGLE_DIFF, ACTION_REPORT_ISSUE]).has(action.id)) {
+							return { isSecondary, showIcon: true, showLabel: false };
 						} else {
-							return { isSecondary: true };
+							return { isSecondary };
 						}
 					}
 				}
 			},
-			rendererOptions: {
-				renderTextEditsAsSummary: (uri) => {
-					// render edits as summary only when using Live mode and when
-					// dealing with the current file in the editor
-					return isEqual(uri, editor.getModel()?.uri)
-						&& configurationService.getValue<EditMode>(InlineChatConfigKeys.Mode) === EditMode.Live;
+			secondaryMenuId: MENU_INLINE_CHAT_WIDGET_SECONDARY,
+			chatWidgetViewOptions: {
+				menus: {
+					telemetrySource: 'interactiveEditorWidget-toolbar',
 				},
+				rendererOptions: {
+					renderTextEditsAsSummary: (uri) => {
+						// render edits as summary only when using Live mode and when
+						// dealing with the current file in the editor
+						return isEqual(uri, editor.getModel()?.uri)
+							&& configurationService.getValue<EditMode>(InlineChatConfigKeys.Mode) === EditMode.Live;
+					},
+				}
 			}
 		});
+		this._disposables.add(this.widget);
+
+		let revealFn: (() => void) | undefined;
+		this._disposables.add(this.widget.chatWidget.onWillMaybeChangeHeight(() => {
+			if (this.position) {
+				revealFn = this._createZoneAndScrollRestoreFn(this.position);
+			}
+		}));
 		this._disposables.add(this.widget.onDidChangeHeight(() => {
 			if (this.position) {
 				// only relayout when visible
-				this._relayout(this._computeHeight().linesValue);
+				revealFn ??= this._createZoneAndScrollRestoreFn(this.position);
+				const height = this._computeHeight();
+				this._relayout(height.linesValue);
+				revealFn();
+				revealFn = undefined;
 			}
 		}));
-		this._disposables.add(this.widget);
+
 		this.create();
 
 		this._disposables.add(addDisposableListener(this.domNode, 'click', e => {
@@ -110,18 +126,16 @@ export class InlineChatZoneWidget extends ZoneWidget {
 		container.appendChild(this.widget.domNode);
 	}
 
-
 	protected override _doLayout(heightInPixel: number): void {
-		const width = Math.min(640, this._availableSpaceGivenIndentation(this._indentationWidth));
+
+		const info = this.editor.getLayoutInfo();
+		let width = info.contentWidth - (info.glyphMarginWidth + info.decorationsWidth);
+		width = Math.min(640, width);
+
 		this._dimension = new Dimension(width, heightInPixel);
 		this.widget.layout(this._dimension);
 	}
 
-	private _availableSpaceGivenIndentation(indentationWidth: number | undefined): number {
-		const info = this.editor.getLayoutInfo();
-		return info.contentWidth - (info.glyphMarginWidth + info.decorationsWidth + (indentationWidth ?? 0));
-	}
-
 	private _computeHeight(): { linesValue: number; pixelsValue: number } {
 		const chatContentHeight = this.widget.contentHeight;
 		const editorHeight = this.editor.getLayoutInfo().height;
@@ -140,93 +154,146 @@ export class InlineChatZoneWidget extends ZoneWidget {
 	override show(position: Position): void {
 		assertType(this.container);
 
-		const scrollState = StableEditorBottomScrollState.capture(this.editor);
 		const info = this.editor.getLayoutInfo();
 		const marginWithoutIndentation = info.glyphMarginWidth + info.decorationsWidth + info.lineNumbersWidth;
 		this.container.style.marginLeft = `${marginWithoutIndentation}px`;
 
-		const height = this._computeHeight();
-		super.show(position, height.linesValue);
-		this._setWidgetMargins(position);
+		const revealZone = this._createZoneAndScrollRestoreFn(position);
+		super.show(position, this._computeHeight().linesValue);
 		this.widget.chatWidget.setVisible(true);
 		this.widget.focus();
 
-		scrollState.restore(this.editor);
+		revealZone();
+		this._scrollUp.enable();
+	}
 
-		if (position.lineNumber > 1) {
-			this.editor.revealRangeNearTopIfOutsideViewport(Range.fromPositions(position.delta(-1)), ScrollType.Immediate);
-		} else {
-			// reveal top of zone widget
-			const lineTop = this.editor.getTopForLineNumber(position.lineNumber);
-			const zoneTop = lineTop - height.pixelsValue;
-			const spaceBelowLine = this.editor.getScrollHeight() - this.editor.getBottomForLineNumber(position.lineNumber);
-			const minTop = this.editor.getScrollTop() - spaceBelowLine;
-			const newTop = Math.max(zoneTop, minTop);
-
-			if (newTop < this.editor.getScrollTop()) {
-				this.editor.setScrollTop(newTop, ScrollType.Immediate);
-			}
-		}
+	reveal(position: Position) {
+		const stickyScroll = this.editor.getOption(EditorOption.stickyScroll);
+		const magicValue = stickyScroll.enabled ? stickyScroll.maxLineCount : 0;
+		this.editor.revealLines(position.lineNumber + magicValue, position.lineNumber + magicValue, ScrollType.Immediate);
+		this._scrollUp.reset();
+		this.updatePositionAndHeight(position);
 	}
 
 	override updatePositionAndHeight(position: Position): void {
+		const revealZone = this._createZoneAndScrollRestoreFn(position);
 		super.updatePositionAndHeight(position, this._computeHeight().linesValue);
-		this._setWidgetMargins(position);
+		revealZone();
+	}
+
+	private _createZoneAndScrollRestoreFn(position: Position): () => void {
+
+		const scrollState = StableEditorBottomScrollState.capture(this.editor);
+
+		const lineNumber = position.lineNumber <= 1 ? 1 : 1 + position.lineNumber;
+		const scrollTop = this.editor.getScrollTop();
+		const lineTop = this.editor.getTopForLineNumber(lineNumber);
+		const zoneTop = lineTop - this._computeHeight().pixelsValue;
+
+		const hasResponse = this.widget.chatWidget.viewModel?.getItems().find(candidate => {
+			return isResponseVM(candidate) && candidate.response.value.length > 0;
+		});
+
+		if (hasResponse && zoneTop < scrollTop || this._scrollUp.didScrollUpOrDown) {
+			// don't reveal the zone if it is already out of view (unless we are still getting ready)
+			// or if an outside scroll-up happened (e.g the user scrolled up/down to see the new content)
+			return this._scrollUp.runIgnored(() => {
+				scrollState.restore(this.editor);
+			});
+		}
+
+		return this._scrollUp.runIgnored(() => {
+			scrollState.restore(this.editor);
+
+			const scrollTop = this.editor.getScrollTop();
+			const lineTop = this.editor.getTopForLineNumber(lineNumber);
+			const zoneTop = lineTop - this._computeHeight().pixelsValue;
+			const editorHeight = this.editor.getLayoutInfo().height;
+			const lineBottom = this.editor.getBottomForLineNumber(lineNumber);
+
+			let newScrollTop = zoneTop;
+			let forceScrollTop = false;
+
+			if (lineBottom >= (scrollTop + editorHeight)) {
+				// revealing the top of the zone would push out the line we are interested in and
+				// therefore we keep the line in the viewport
+				newScrollTop = lineBottom - editorHeight;
+				forceScrollTop = true;
+			}
+
+			if (newScrollTop < scrollTop || forceScrollTop) {
+				this._logService.trace('[IE] REVEAL zone', { zoneTop, lineTop, lineBottom, scrollTop, newScrollTop, forceScrollTop });
+				this.editor.setScrollTop(newScrollTop, ScrollType.Immediate);
+			}
+		});
+	}
+
+	protected override revealRange(range: Range, isLastLine: boolean): void {
+		// noop
 	}
 
 	protected override _getWidth(info: EditorLayoutInfo): number {
 		return info.width - info.minimap.minimapWidth;
 	}
 
-	updateBackgroundColor(newPosition: Position, wholeRange: IRange) {
-		assertType(this.container);
-		const widgetLineNumber = newPosition.lineNumber;
-		this.container.classList.toggle('inside-selection', widgetLineNumber > wholeRange.startLineNumber && widgetLineNumber < wholeRange.endLineNumber);
-	}
-
-	private _calculateIndentationWidth(position: Position): number {
-		const viewModel = this.editor._getViewModel();
-		if (!viewModel) {
-			return 0;
-		}
-
-		const visibleRange = viewModel.getCompletelyVisibleViewRange();
-		if (!visibleRange.containsPosition(position)) {
-			// this is needed because `getOffsetForColumn` won't work when the position
-			// isn't visible/rendered
-			return 0;
-		}
-
-		let indentationLevel = viewModel.getLineFirstNonWhitespaceColumn(position.lineNumber);
-		let indentationLineNumber = position.lineNumber;
-		for (let lineNumber = position.lineNumber; lineNumber >= visibleRange.startLineNumber; lineNumber--) {
-			const currentIndentationLevel = viewModel.getLineFirstNonWhitespaceColumn(lineNumber);
-			if (currentIndentationLevel !== 0) {
-				indentationLineNumber = lineNumber;
-				indentationLevel = currentIndentationLevel;
-				break;
-			}
-		}
-
-		return Math.max(0, this.editor.getOffsetForColumn(indentationLineNumber, indentationLevel)); // double-guard against invalie getOffsetForColumn-calls
-	}
-
-	private _setWidgetMargins(position: Position): void {
-		const indentationWidth = this._calculateIndentationWidth(position);
-		if (this._indentationWidth === indentationWidth) {
-			return;
-		}
-		this._indentationWidth = this._availableSpaceGivenIndentation(indentationWidth) > 400 ? indentationWidth : 0;
-		this.widget.domNode.style.marginLeft = `${this._indentationWidth}px`;
-		this.widget.domNode.style.marginRight = `${this.editor.getLayoutInfo().minimap.minimapWidth}px`;
-	}
-
 	override hide(): void {
-		this.container!.classList.remove('inside-selection');
+		const scrollState = StableEditorBottomScrollState.capture(this.editor);
+		this._scrollUp.disable();
 		this._ctxCursorPosition.reset();
 		this.widget.reset();
 		this.widget.chatWidget.setVisible(false);
 		super.hide();
 		aria.status(localize('inlineChatClosed', 'Closed inline chat widget'));
+		scrollState.restore(this.editor);
 	}
 }
+
+class ScrollUpState {
+
+	private _didScrollUpOrDown?: boolean;
+	private _ignoreEvents = false;
+
+	private readonly _listener = new MutableDisposable();
+
+	constructor(private readonly _editor: ICodeEditor) { }
+
+	dispose(): void {
+		this._listener.dispose();
+	}
+
+	reset(): void {
+		this._didScrollUpOrDown = undefined;
+	}
+
+	enable(): void {
+		this._didScrollUpOrDown = undefined;
+		this._listener.value = this._editor.onDidScrollChange(e => {
+			if (!e.scrollTopChanged || this._ignoreEvents) {
+				return;
+			}
+			this._listener.clear();
+			this._didScrollUpOrDown = true;
+		});
+	}
+
+	disable(): void {
+		this._listener.clear();
+		this._didScrollUpOrDown = undefined;
+	}
+
+	runIgnored(callback: () => void): () => void {
+		return () => {
+			this._ignoreEvents = true;
+			try {
+				return callback();
+			} finally {
+				this._ignoreEvents = false;
+			}
+		};
+	}
+
+	get didScrollUpOrDown(): boolean | undefined {
+		return this._didScrollUpOrDown;
+	}
+
+}
diff --git a/src/vs/workbench/contrib/inlineChat/browser/media/inlineChat.css b/src/vs/workbench/contrib/inlineChat/browser/media/inlineChat.css
index a2d1666ef79..734a66b9966 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/media/inlineChat.css
+++ b/src/vs/workbench/contrib/inlineChat/browser/media/inlineChat.css
@@ -11,18 +11,18 @@
 	max-width: unset;
 }
 
-.monaco-workbench .zone-widget-container.inside-selection {
-	background-color: var(--vscode-inlineChat-regionHighlight);
-}
-
 .monaco-workbench .inline-chat {
 	color: inherit;
-	padding: 0 8px 8px 8px;
 	border-radius: 4px;
 	border: 1px solid var(--vscode-inlineChat-border);
 	box-shadow: 0 2px 4px 0 var(--vscode-widget-shadow);
-	margin-top: 8px;
 	background: var(--vscode-inlineChat-background);
+	padding-top: 3px;
+	position: relative;
+}
+
+.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-input-part {
+	padding: 4px 8px 0 8px;
 }
 
 .monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-input-part .interactive-execute-toolbar {
@@ -34,41 +34,65 @@
 	border-radius: 2px;
 }
 
-.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list {
-	padding: 4px 0 0 0;
+
+.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-input-part .interactive-input-followups .interactive-session-followups {
+	margin: 2px 0 0 4px;
+}
+
+.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .monaco-scrollable-element {
+	border-top-left-radius: 3px;
+	border-top-right-radius: 3px;
+}
+
+.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .monaco-scrollable-element .shadow.top {
+	box-shadow: none;
 }
 
 .monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-item-container.interactive-item-compact {
-	padding: 6px 4px;
-	gap: 6px;
+	gap: 8px;
+	padding: 3px 20px 3px 8px;
 }
 
 .monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-item-container.interactive-item-compact .header .avatar {
 	outline-offset: -1px;
 }
 
+.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-item-container.interactive-item-compact .chat-notification-widget {
+	margin-bottom: 0;
+	padding: 0;
+	border: none;
+}
+
 .monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-request {
 	border: none;
 }
 
-/* progress bit */
-
-.monaco-workbench .inline-chat .progress {
-	position: relative;
+.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-item-container.minimal > .header {
+	top: 5px;
+	right: 10px;
+	display: none;
 }
 
-/* UGLY - fighting against workbench styles */
-.monaco-workbench .part.editor > .content .inline-chat .progress .monaco-progress-container {
-	top: 0;
+.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-item-container.minimal > .chat-footer-toolbar {
+	display: none;
 }
 
+
 /* status */
 
-.monaco-workbench .inline-chat .status {
+.monaco-workbench .inline-chat > .status {
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
-	margin-top: 3px; /*makes space for action focus borders: https://github.com/microsoft/vscode-copilot/issues/5814 */
+	padding-left: 8px;
+	padding-right: 8px;
+}
+
+.monaco-workbench .inline-chat > .status {
+	.label,
+	.actions {
+		padding-top: 8px;
+	}
 }
 
 .monaco-workbench .inline-chat .status .actions.hidden {
@@ -78,8 +102,9 @@
 .monaco-workbench .inline-chat .status .label {
 	overflow: hidden;
 	color: var(--vscode-descriptionForeground);
-	font-size: 12px;
-	display: inline-flex;
+	font-size: 11px;
+	display: flex;
+	white-space: nowrap;
 }
 
 .monaco-workbench .inline-chat .status .label.info {
@@ -89,9 +114,12 @@
 
 .monaco-workbench .inline-chat .status .label.status {
 	margin-left: auto;
+	padding-right: 8px;
+	padding-left: 8px;
 }
 
-.monaco-workbench .inline-chat .status .label.hidden {
+.monaco-workbench .inline-chat .status .label.hidden,
+.monaco-workbench .inline-chat .status .label:empty {
 	display: none;
 }
 
@@ -104,75 +132,88 @@
 }
 
 .monaco-workbench .inline-chat .status .label > .codicon {
-	padding: 0 5px;
+	padding: 0 3px;
 	font-size: 12px;
 	line-height: 18px;
 }
 
-.monaco-workbench .inline-chat .chatMessage .chatMessageContent .value {
-	overflow: hidden;
-	-webkit-user-select: text;
-	user-select: text;
-}
 
-.monaco-workbench .inline-chat .followUps {
-	padding: 5px 5px;
-}
+.monaco-workbench .inline-chat .status .actions,
+.monaco-workbench .inline-chat-diff-overlay {
 
-.monaco-workbench .inline-chat .followUps .interactive-session-followups .monaco-button {
-	display: block;
-	color: var(--vscode-textLink-foreground);
-	font-size: 12px;
-}
+	display: flex;
+	height: 18px;
 
-.monaco-workbench .inline-chat .followUps.hidden {
-	display: none;
-}
+	.actions-container {
+		gap: 3px
+	}
 
-.monaco-workbench .inline-chat .chatMessage {
-	padding: 0 3px;
-}
+	.monaco-button-dropdown > .monaco-dropdown-button {
+		display: flex;
+		align-items: center;
+		padding: 0 4px;
+	}
 
-.monaco-workbench .inline-chat .chatMessage .chatMessageContent {
-	padding: 2px 2px;
-}
+	.monaco-button.codicon {
+		display: flex;
+	}
 
-.monaco-workbench .inline-chat .chatMessage.hidden {
-	display: none;
+	.monaco-button.codicon::before {
+		align-self: center;
+		color: var(--vscode-button-foreground);
+	}
+
+	.monaco-button.secondary.codicon::before {
+		align-self: center;
+		color: var(--vscode-button-secondaryForeground);
+	}
+
+	.monaco-text-button {
+		padding: 0 6px;
+		font-size: 12px;
+		white-space: nowrap;
+	}
 }
 
 .monaco-workbench .inline-chat .status .actions {
-	display: flex;
-	padding-top: 3px;
+	gap: 4px;
 }
 
-.monaco-workbench .inline-chat .status .actions > .monaco-button,
-.monaco-workbench .inline-chat .status .actions > .monaco-button-dropdown {
-	margin-right: 6px;
+.monaco-workbench .inline-chat .status .actions.secondary {
+	display: none;
 }
 
-.monaco-workbench .inline-chat .status .actions > .monaco-button-dropdown > .monaco-dropdown-button {
-	display: flex;
-	align-items: center;
-	padding: 0 4px;
+.monaco-workbench .inline-chat .status:hover .actions.secondary,
+.monaco-workbench .inline-chat:focus .status .actions.secondary,
+.monaco-workbench .inline-chat .status:focus-within .actions.secondary {
+	display: inherit;
 }
 
-.monaco-workbench .inline-chat .status .actions > .monaco-button.codicon {
-	display: flex;
+.monaco-workbench .inline-chat-diff-overlay {
+
+	.monaco-button {
+		border-radius: 0;
+	}
+
+	.monaco-button.secondary.checked {
+		background-color: var(--vscode-button-secondaryHoverBackground);
+	}
+
+	.monaco-button:first-child {
+		border-top-left-radius: 2px;
+		border-bottom-left-radius: 2px;
+	}
+
+	.monaco-button:last-child {
+		border-top-right-radius: 2px;
+		border-bottom-right-radius: 2px;
+	}
+
+	.monaco-button:not(:last-child) {
+		border-right: 1px solid var(--vscode-button-foreground);
+	}
 }
 
-.monaco-workbench .inline-chat .status .actions > .monaco-button.codicon::before {
-	align-self: center;
-}
-
-.monaco-workbench .inline-chat .status .actions .monaco-text-button {
-	padding: 2px 4px;
-	white-space: nowrap;
-}
-
-.monaco-workbench .inline-chat .status .monaco-toolbar .action-item {
-	padding: 0 2px;
-}
 
 /* TODO@jrieken not needed? */
 .monaco-workbench .inline-chat .status .monaco-toolbar .action-label.checked {
@@ -186,45 +227,17 @@
 	background-color: var(--vscode-button-hoverBackground);
 }
 
-/* preview */
+/* accessible diff viewer */
 
-.monaco-workbench .inline-chat .preview {
+.monaco-workbench .inline-chat .diff-review {
+	padding: 4px 6px;
+	background-color: unset;
+}
+
+.monaco-workbench .inline-chat .diff-review.hidden {
 	display: none;
 }
 
-.monaco-workbench .inline-chat .previewDiff,
-.monaco-workbench .inline-chat .previewCreate {
-	display: inherit;
-	border: 1px solid var(--vscode-inlineChat-border);
-	border-radius: 2px;
-	margin: 6px 0px;
-}
-
-.monaco-workbench .inline-chat .previewCreateTitle {
-	padding-top: 6px;
-}
-
-.monaco-workbench .inline-chat .diff-review.hidden,
-.monaco-workbench .inline-chat .previewDiff.hidden,
-.monaco-workbench .inline-chat .previewCreate.hidden,
-.monaco-workbench .inline-chat .previewCreateTitle.hidden {
-	display: none;
-}
-
-.monaco-workbench .inline-chat-toolbar {
-	display: flex;
-}
-
-.monaco-workbench .inline-chat-toolbar > .monaco-button {
-	margin-right: 6px;
-}
-
-.monaco-workbench .inline-chat-toolbar .action-label.checked {
-	color: var(--vscode-inputOption-activeForeground);
-	background-color: var(--vscode-inputOption-activeBackground);
-	outline: 1px solid var(--vscode-inputOption-activeBorder);
-}
-
 /* decoration styles */
 
 .monaco-workbench .inline-chat-inserted-range {
@@ -244,56 +257,6 @@
 	background-color: var(--vscode-diffEditor-insertedTextBackground);
 }
 
-.monaco-workbench .inline-chat-block-selection {
-	background-color: var(--vscode-inlineChat-regionHighlight);
-}
-
-.monaco-workbench .interactive-session .interactive-input-and-execute-toolbar .monaco-editor .inline-chat-slash-command {
-	background-color: var(--vscode-chat-slashCommandBackground);
-	color: var(--vscode-chat-slashCommandForeground); /* Overrides the foreground color rule in chat.css */
-	border-radius: 2px;
-	padding: 1px;
-}
-
-.monaco-workbench .inline-chat-slash-command-detail {
-	opacity: 0.5;
-}
-
-/* diff zone */
-
-.monaco-workbench .inline-chat-diff-widget .monaco-diff-editor .monaco-editor-background,
-.monaco-workbench .inline-chat-diff-widget .monaco-diff-editor .monaco-workbench .margin-view-overlays {
-	background-color: var(--vscode-inlineChat-regionHighlight);
-}
-
-/* create zone */
-
-.monaco-workbench .inline-chat-newfile-widget {
-	background-color: var(--vscode-inlineChat-regionHighlight);
-}
-
-.monaco-workbench .inline-chat-newfile-widget .title {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-}
-
-.monaco-workbench .inline-chat-newfile-widget .title .detail {
-	margin-left: 4px;
-}
-
-.monaco-workbench .inline-chat-newfile-widget .buttonbar-widget {
-	display: flex;
-	margin-left: auto;
-	margin-right: 8px;
-}
-
-.monaco-workbench .inline-chat-newfile-widget .buttonbar-widget > .monaco-button {
-	display: inline-flex;
-	white-space: nowrap;
-	margin-left: 4px;
-}
-
 /* gutter decoration */
 
 .monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque,
diff --git a/src/vs/workbench/contrib/inlineChat/browser/media/inlineChatContentWidget.css b/src/vs/workbench/contrib/inlineChat/browser/media/inlineChatContentWidget.css
deleted file mode 100644
index 829b3d78fc3..00000000000
--- a/src/vs/workbench/contrib/inlineChat/browser/media/inlineChatContentWidget.css
+++ /dev/null
@@ -1,42 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-.monaco-workbench .inline-chat-content-widget {
-	z-index: 50;
-	padding: 6px 6px 6px 6px;
-	border-radius: 4px;
-	background-color: var(--vscode-inlineChat-background);
-	box-shadow: 0 4px 8px var(--vscode-inlineChat-shadow);
-}
-
-
-.monaco-workbench .inline-chat-content-widget.interactive-session .interactive-session {
-	max-width: unset;
-}
-
-.monaco-workbench .inline-chat-content-widget.interactive-session .interactive-input-part .interactive-execute-toolbar {
-	margin-bottom: 1px;
-}
-
-.monaco-workbench .inline-chat-content-widget.interactive-session .interactive-input-part.compact {
-	padding: 0;
-}
-
-.monaco-workbench .inline-chat-content-widget .message {
-	overflow: hidden;
-	color: var(--vscode-descriptionForeground);
-	font-size: 11px;
-	display: inline-flex;
-}
-
-.monaco-workbench .inline-chat-content-widget .message > .codicon {
-	padding-right: 5px;
-	font-size: 12px;
-	line-height: 18px;
-}
-
-.monaco-workbench .inline-chat-content-widget .hidden {
-	display: none;
-}
diff --git a/src/vs/workbench/contrib/inlineChat/browser/utils.ts b/src/vs/workbench/contrib/inlineChat/browser/utils.ts
index 2e593a6ee5f..020cd9e0e58 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/utils.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/utils.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { EditOperation } from 'vs/editor/common/core/editOperation';
-import { IRange } from 'vs/editor/common/core/range';
-import { IIdentifiedSingleEditOperation, ITextModel, IValidEditOperation, TrackedRangeStickiness } from 'vs/editor/common/model';
-import { IEditObserver } from './inlineChatStrategies';
-import { IProgress } from 'vs/platform/progress/common/progress';
-import { IntervalTimer, AsyncIterableSource } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { getNWords } from 'vs/workbench/contrib/chat/common/chatWordCounter';
+import { EditOperation } from '../../../../editor/common/core/editOperation.js';
+import { IRange } from '../../../../editor/common/core/range.js';
+import { IIdentifiedSingleEditOperation, ITextModel, IValidEditOperation, TrackedRangeStickiness } from '../../../../editor/common/model.js';
+import { IEditObserver } from './inlineChatStrategies.js';
+import { IProgress } from '../../../../platform/progress/common/progress.js';
+import { IntervalTimer, AsyncIterableSource } from '../../../../base/common/async.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { getNWords } from '../../chat/common/chatWordCounter.js';
 
 
 
diff --git a/src/vs/workbench/contrib/inlineChat/common/inlineChat.ts b/src/vs/workbench/contrib/inlineChat/common/inlineChat.ts
index a4ba41a17b2..b58d2ccb37c 100644
--- a/src/vs/workbench/contrib/inlineChat/common/inlineChat.ts
+++ b/src/vs/workbench/contrib/inlineChat/common/inlineChat.ts
@@ -3,100 +3,30 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { diffInserted, diffRemoved, editorHoverHighlight, editorWidgetBackground, editorWidgetBorder, focusBorder, inputBackground, inputPlaceholderForeground, registerColor, transparent, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
-import { Extensions as ExtensionsMigration, IConfigurationMigrationRegistry } from 'vs/workbench/common/configuration';
-
-
-export const enum InlineChatResponseTypes {
-	Empty = 'empty',
-	OnlyEdits = 'onlyEdits',
-	OnlyMessages = 'onlyMessages',
-	Mixed = 'mixed'
-}
-
-export const INLINE_CHAT_ID = 'interactiveEditor';
-export const INTERACTIVE_EDITOR_ACCESSIBILITY_HELP_ID = 'interactiveEditorAccessiblityHelp';
-
-export const enum EditMode {
-	Live = 'live',
-	Preview = 'preview'
-}
-
-export const CTX_INLINE_CHAT_HAS_AGENT = new RawContextKey<boolean>('inlineChatHasProvider', false, localize('inlineChatHasProvider', "Whether a provider for interactive editors exists"));
-export const CTX_INLINE_CHAT_VISIBLE = new RawContextKey<boolean>('inlineChatVisible', false, localize('inlineChatVisible', "Whether the interactive editor input is visible"));
-export const CTX_INLINE_CHAT_FOCUSED = new RawContextKey<boolean>('inlineChatFocused', false, localize('inlineChatFocused', "Whether the interactive editor input is focused"));
-export const CTX_INLINE_CHAT_RESPONSE_FOCUSED = new RawContextKey<boolean>('inlineChatResponseFocused', false, localize('inlineChatResponseFocused', "Whether the interactive widget's response is focused"));
-export const CTX_INLINE_CHAT_EMPTY = new RawContextKey<boolean>('inlineChatEmpty', false, localize('inlineChatEmpty', "Whether the interactive editor input is empty"));
-export const CTX_INLINE_CHAT_INNER_CURSOR_FIRST = new RawContextKey<boolean>('inlineChatInnerCursorFirst', false, localize('inlineChatInnerCursorFirst', "Whether the cursor of the iteractive editor input is on the first line"));
-export const CTX_INLINE_CHAT_INNER_CURSOR_LAST = new RawContextKey<boolean>('inlineChatInnerCursorLast', false, localize('inlineChatInnerCursorLast', "Whether the cursor of the iteractive editor input is on the last line"));
-export const CTX_INLINE_CHAT_INNER_CURSOR_START = new RawContextKey<boolean>('inlineChatInnerCursorStart', false, localize('inlineChatInnerCursorStart', "Whether the cursor of the iteractive editor input is on the start of the input"));
-export const CTX_INLINE_CHAT_INNER_CURSOR_END = new RawContextKey<boolean>('inlineChatInnerCursorEnd', false, localize('inlineChatInnerCursorEnd', "Whether the cursor of the iteractive editor input is on the end of the input"));
-export const CTX_INLINE_CHAT_OUTER_CURSOR_POSITION = new RawContextKey<'above' | 'below' | ''>('inlineChatOuterCursorPosition', '', localize('inlineChatOuterCursorPosition', "Whether the cursor of the outer editor is above or below the interactive editor input"));
-export const CTX_INLINE_CHAT_HAS_STASHED_SESSION = new RawContextKey<boolean>('inlineChatHasStashedSession', false, localize('inlineChatHasStashedSession', "Whether interactive editor has kept a session for quick restore"));
-export const CTX_INLINE_CHAT_RESPONSE_TYPES = new RawContextKey<InlineChatResponseTypes | undefined>('inlineChatResponseTypes', InlineChatResponseTypes.Empty, localize('inlineChatResponseTypes', "What type was the responses have been receieved"));
-export const CTX_INLINE_CHAT_USER_DID_EDIT = new RawContextKey<boolean>('inlineChatUserDidEdit', undefined, localize('inlineChatUserDidEdit', "Whether the user did changes ontop of the inline chat"));
-export const CTX_INLINE_CHAT_DOCUMENT_CHANGED = new RawContextKey<boolean>('inlineChatDocumentChanged', false, localize('inlineChatDocumentChanged', "Whether the document has changed concurrently"));
-export const CTX_INLINE_CHAT_CHANGE_HAS_DIFF = new RawContextKey<boolean>('inlineChatChangeHasDiff', false, localize('inlineChatChangeHasDiff', "Whether the current change supports showing a diff"));
-export const CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF = new RawContextKey<boolean>('inlineChatChangeShowsDiff', false, localize('inlineChatChangeShowsDiff', "Whether the current change showing a diff"));
-export const CTX_INLINE_CHAT_EDIT_MODE = new RawContextKey<EditMode>('config.inlineChat.mode', EditMode.Live);
-
-// --- (select) action identifier
-
-export const ACTION_ACCEPT_CHANGES = 'inlineChat.acceptChanges';
-export const ACTION_REGENERATE_RESPONSE = 'inlineChat.regenerate';
-export const ACTION_VIEW_IN_CHAT = 'inlineChat.viewInChat';
-export const ACTION_TOGGLE_DIFF = 'inlineChat.toggleDiff';
-
-// --- menus
-
-export const MENU_INLINE_CHAT_WIDGET = MenuId.for('inlineChatWidget');
-export const MENU_INLINE_CHAT_WIDGET_STATUS = MenuId.for('inlineChatWidget.status');
-
-// --- colors
-
-
-export const inlineChatBackground = registerColor('inlineChat.background', { dark: editorWidgetBackground, light: editorWidgetBackground, hcDark: editorWidgetBackground, hcLight: editorWidgetBackground }, localize('inlineChat.background', "Background color of the interactive editor widget"));
-export const inlineChatBorder = registerColor('inlineChat.border', { dark: editorWidgetBorder, light: editorWidgetBorder, hcDark: editorWidgetBorder, hcLight: editorWidgetBorder }, localize('inlineChat.border', "Border color of the interactive editor widget"));
-export const inlineChatShadow = registerColor('inlineChat.shadow', { dark: widgetShadow, light: widgetShadow, hcDark: widgetShadow, hcLight: widgetShadow }, localize('inlineChat.shadow', "Shadow color of the interactive editor widget"));
-export const inlineChatRegionHighlight = registerColor('inlineChat.regionHighlight', { dark: editorHoverHighlight, light: editorHoverHighlight, hcDark: editorHoverHighlight, hcLight: editorHoverHighlight }, localize('inlineChat.regionHighlight', "Background highlighting of the current interactive region. Must be transparent."), true);
-export const inlineChatInputBorder = registerColor('inlineChatInput.border', { dark: editorWidgetBorder, light: editorWidgetBorder, hcDark: editorWidgetBorder, hcLight: editorWidgetBorder }, localize('inlineChatInput.border', "Border color of the interactive editor input"));
-export const inlineChatInputFocusBorder = registerColor('inlineChatInput.focusBorder', { dark: focusBorder, light: focusBorder, hcDark: focusBorder, hcLight: focusBorder }, localize('inlineChatInput.focusBorder', "Border color of the interactive editor input when focused"));
-export const inlineChatInputPlaceholderForeground = registerColor('inlineChatInput.placeholderForeground', { dark: inputPlaceholderForeground, light: inputPlaceholderForeground, hcDark: inputPlaceholderForeground, hcLight: inputPlaceholderForeground }, localize('inlineChatInput.placeholderForeground', "Foreground color of the interactive editor input placeholder"));
-export const inlineChatInputBackground = registerColor('inlineChatInput.background', { dark: inputBackground, light: inputBackground, hcDark: inputBackground, hcLight: inputBackground }, localize('inlineChatInput.background', "Background color of the interactive editor input"));
-
-export const inlineChatDiffInserted = registerColor('inlineChatDiff.inserted', { dark: transparent(diffInserted, .5), light: transparent(diffInserted, .5), hcDark: transparent(diffInserted, .5), hcLight: transparent(diffInserted, .5) }, localize('inlineChatDiff.inserted', "Background color of inserted text in the interactive editor input"));
-export const overviewRulerInlineChatDiffInserted = registerColor('editorOverviewRuler.inlineChatInserted', { dark: transparent(diffInserted, 0.6), light: transparent(diffInserted, 0.8), hcDark: transparent(diffInserted, 0.6), hcLight: transparent(diffInserted, 0.8) }, localize('editorOverviewRuler.inlineChatInserted', 'Overview ruler marker color for inline chat inserted content.'));
-export const minimapInlineChatDiffInserted = registerColor('editorOverviewRuler.inlineChatInserted', { dark: transparent(diffInserted, 0.6), light: transparent(diffInserted, 0.8), hcDark: transparent(diffInserted, 0.6), hcLight: transparent(diffInserted, 0.8) }, localize('editorOverviewRuler.inlineChatInserted', 'Overview ruler marker color for inline chat inserted content.'));
-
-export const inlineChatDiffRemoved = registerColor('inlineChatDiff.removed', { dark: transparent(diffRemoved, .5), light: transparent(diffRemoved, .5), hcDark: transparent(diffRemoved, .5), hcLight: transparent(diffRemoved, .5) }, localize('inlineChatDiff.removed', "Background color of removed text in the interactive editor input"));
-export const overviewRulerInlineChatDiffRemoved = registerColor('editorOverviewRuler.inlineChatRemoved', { dark: transparent(diffRemoved, 0.6), light: transparent(diffRemoved, 0.8), hcDark: transparent(diffRemoved, 0.6), hcLight: transparent(diffRemoved, 0.8) }, localize('editorOverviewRuler.inlineChatRemoved', 'Overview ruler marker color for inline chat removed content.'));
-
+import { localize } from '../../../../nls.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { Extensions, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { diffInserted, diffRemoved, editorWidgetBackground, editorWidgetBorder, editorWidgetForeground, focusBorder, inputBackground, inputPlaceholderForeground, registerColor, transparent, widgetShadow } from '../../../../platform/theme/common/colorRegistry.js';
 
 // settings
 
-
-
-Registry.as<IConfigurationMigrationRegistry>(ExtensionsMigration.ConfigurationMigration).registerConfigurationMigrations(
-	[{
-		key: 'interactiveEditor.editMode', migrateFn: (value: any) => {
-			return [['inlineChat.mode', { value: value }]];
-		}
-	}]
-);
-
 export const enum InlineChatConfigKeys {
 	Mode = 'inlineChat.mode',
 	FinishOnType = 'inlineChat.finishOnType',
 	AcceptedOrDiscardBeforeSave = 'inlineChat.acceptedOrDiscardBeforeSave',
+	StartWithOverlayWidget = 'inlineChat.startWithOverlayWidget',
+	ZoneToolbar = 'inlineChat.experimental.enableZoneToolbar',
 	HoldToSpeech = 'inlineChat.holdToSpeech',
 	AccessibleDiffView = 'inlineChat.accessibleDiffView'
 }
 
+export const enum EditMode {
+	Live = 'live',
+	Preview = 'preview'
+}
+
 Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfiguration({
 	id: 'editor',
 	properties: {
@@ -132,10 +62,83 @@ Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfigurat
 			type: 'string',
 			enum: ['auto', 'on', 'off'],
 			markdownEnumDescriptions: [
-				localize('accessibleDiffView.auto', "The accessible diff viewer is based screen reader mode being enabled."),
+				localize('accessibleDiffView.auto', "The accessible diff viewer is based on screen reader mode being enabled."),
 				localize('accessibleDiffView.on', "The accessible diff viewer is always enabled."),
 				localize('accessibleDiffView.off', "The accessible diff viewer is never enabled."),
 			],
-		}
+		},
+		[InlineChatConfigKeys.ZoneToolbar]: {
+			description: localize('zoneToolbar', "Whether to show a toolbar to accept or reject changes in the inline chat changes view."),
+			default: false,
+			type: 'boolean',
+			tags: ['experimental']
+		},
 	}
 });
+
+
+export const INLINE_CHAT_ID = 'interactiveEditor';
+export const INTERACTIVE_EDITOR_ACCESSIBILITY_HELP_ID = 'interactiveEditorAccessiblityHelp';
+
+// --- CONTEXT
+
+export const enum InlineChatResponseType {
+	None = 'none',
+	Messages = 'messages',
+	MessagesAndEdits = 'messagesAndEdits'
+}
+
+export const CTX_INLINE_CHAT_POSSIBLE = new RawContextKey<boolean>('inlineChatPossible', false, localize('inlineChatHasPossible', "Whether a provider for inline chat exists and whether an editor for inline chat is open"));
+export const CTX_INLINE_CHAT_HAS_AGENT = new RawContextKey<boolean>('inlineChatHasProvider', false, localize('inlineChatHasProvider', "Whether a provider for interactive editors exists"));
+export const CTX_INLINE_CHAT_VISIBLE = new RawContextKey<boolean>('inlineChatVisible', false, localize('inlineChatVisible', "Whether the interactive editor input is visible"));
+export const CTX_INLINE_CHAT_FOCUSED = new RawContextKey<boolean>('inlineChatFocused', false, localize('inlineChatFocused', "Whether the interactive editor input is focused"));
+export const CTX_INLINE_CHAT_EDITING = new RawContextKey<boolean>('inlineChatEditing', true, localize('inlineChatEditing', "Whether the user is currently editing or generating code in the inline chat"));
+export const CTX_INLINE_CHAT_RESPONSE_FOCUSED = new RawContextKey<boolean>('inlineChatResponseFocused', false, localize('inlineChatResponseFocused', "Whether the interactive widget's response is focused"));
+export const CTX_INLINE_CHAT_EMPTY = new RawContextKey<boolean>('inlineChatEmpty', false, localize('inlineChatEmpty', "Whether the interactive editor input is empty"));
+export const CTX_INLINE_CHAT_INNER_CURSOR_FIRST = new RawContextKey<boolean>('inlineChatInnerCursorFirst', false, localize('inlineChatInnerCursorFirst', "Whether the cursor of the iteractive editor input is on the first line"));
+export const CTX_INLINE_CHAT_INNER_CURSOR_LAST = new RawContextKey<boolean>('inlineChatInnerCursorLast', false, localize('inlineChatInnerCursorLast', "Whether the cursor of the iteractive editor input is on the last line"));
+export const CTX_INLINE_CHAT_INNER_CURSOR_START = new RawContextKey<boolean>('inlineChatInnerCursorStart', false, localize('inlineChatInnerCursorStart', "Whether the cursor of the iteractive editor input is on the start of the input"));
+export const CTX_INLINE_CHAT_INNER_CURSOR_END = new RawContextKey<boolean>('inlineChatInnerCursorEnd', false, localize('inlineChatInnerCursorEnd', "Whether the cursor of the iteractive editor input is on the end of the input"));
+export const CTX_INLINE_CHAT_OUTER_CURSOR_POSITION = new RawContextKey<'above' | 'below' | ''>('inlineChatOuterCursorPosition', '', localize('inlineChatOuterCursorPosition', "Whether the cursor of the outer editor is above or below the interactive editor input"));
+export const CTX_INLINE_CHAT_HAS_STASHED_SESSION = new RawContextKey<boolean>('inlineChatHasStashedSession', false, localize('inlineChatHasStashedSession', "Whether interactive editor has kept a session for quick restore"));
+export const CTX_INLINE_CHAT_USER_DID_EDIT = new RawContextKey<boolean>('inlineChatUserDidEdit', undefined, localize('inlineChatUserDidEdit', "Whether the user did changes ontop of the inline chat"));
+export const CTX_INLINE_CHAT_DOCUMENT_CHANGED = new RawContextKey<boolean>('inlineChatDocumentChanged', false, localize('inlineChatDocumentChanged', "Whether the document has changed concurrently"));
+export const CTX_INLINE_CHAT_CHANGE_HAS_DIFF = new RawContextKey<boolean>('inlineChatChangeHasDiff', false, localize('inlineChatChangeHasDiff', "Whether the current change supports showing a diff"));
+export const CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF = new RawContextKey<boolean>('inlineChatChangeShowsDiff', false, localize('inlineChatChangeShowsDiff', "Whether the current change showing a diff"));
+export const CTX_INLINE_CHAT_EDIT_MODE = new RawContextKey<EditMode>('config.inlineChat.mode', EditMode.Live);
+export const CTX_INLINE_CHAT_REQUEST_IN_PROGRESS = new RawContextKey<boolean>('inlineChatRequestInProgress', false, localize('inlineChatRequestInProgress', "Whether an inline chat request is currently in progress"));
+export const CTX_INLINE_CHAT_RESPONSE_TYPE = new RawContextKey<InlineChatResponseType>('inlineChatResponseType', InlineChatResponseType.None, localize('inlineChatResponseTypes', "What type was the responses have been receieved, nothing yet, just messages, or messaged and local edits"));
+
+// --- (selected) action identifier
+
+export const ACTION_ACCEPT_CHANGES = 'inlineChat.acceptChanges';
+export const ACTION_DISCARD_CHANGES = 'inlineChat.discardHunkChange';
+export const ACTION_REGENERATE_RESPONSE = 'inlineChat.regenerate';
+export const ACTION_VIEW_IN_CHAT = 'inlineChat.viewInChat';
+export const ACTION_TOGGLE_DIFF = 'inlineChat.toggleDiff';
+export const ACTION_REPORT_ISSUE = 'inlineChat.reportIssue';
+
+// --- menus
+
+export const MENU_INLINE_CHAT_WIDGET_STATUS = MenuId.for('inlineChatWidget.status');
+export const MENU_INLINE_CHAT_WIDGET_SECONDARY = MenuId.for('inlineChatWidget.secondary');
+export const MENU_INLINE_CHAT_ZONE = MenuId.for('inlineChatWidget.changesZone');
+
+// --- colors
+
+
+export const inlineChatForeground = registerColor('inlineChat.foreground', editorWidgetForeground, localize('inlineChat.foreground', "Foreground color of the interactive editor widget"));
+export const inlineChatBackground = registerColor('inlineChat.background', editorWidgetBackground, localize('inlineChat.background', "Background color of the interactive editor widget"));
+export const inlineChatBorder = registerColor('inlineChat.border', editorWidgetBorder, localize('inlineChat.border', "Border color of the interactive editor widget"));
+export const inlineChatShadow = registerColor('inlineChat.shadow', widgetShadow, localize('inlineChat.shadow', "Shadow color of the interactive editor widget"));
+export const inlineChatInputBorder = registerColor('inlineChatInput.border', editorWidgetBorder, localize('inlineChatInput.border', "Border color of the interactive editor input"));
+export const inlineChatInputFocusBorder = registerColor('inlineChatInput.focusBorder', focusBorder, localize('inlineChatInput.focusBorder', "Border color of the interactive editor input when focused"));
+export const inlineChatInputPlaceholderForeground = registerColor('inlineChatInput.placeholderForeground', inputPlaceholderForeground, localize('inlineChatInput.placeholderForeground', "Foreground color of the interactive editor input placeholder"));
+export const inlineChatInputBackground = registerColor('inlineChatInput.background', inputBackground, localize('inlineChatInput.background', "Background color of the interactive editor input"));
+
+export const inlineChatDiffInserted = registerColor('inlineChatDiff.inserted', transparent(diffInserted, .5), localize('inlineChatDiff.inserted', "Background color of inserted text in the interactive editor input"));
+export const overviewRulerInlineChatDiffInserted = registerColor('editorOverviewRuler.inlineChatInserted', { dark: transparent(diffInserted, 0.6), light: transparent(diffInserted, 0.8), hcDark: transparent(diffInserted, 0.6), hcLight: transparent(diffInserted, 0.8) }, localize('editorOverviewRuler.inlineChatInserted', 'Overview ruler marker color for inline chat inserted content.'));
+export const minimapInlineChatDiffInserted = registerColor('editorOverviewRuler.inlineChatInserted', { dark: transparent(diffInserted, 0.6), light: transparent(diffInserted, 0.8), hcDark: transparent(diffInserted, 0.6), hcLight: transparent(diffInserted, 0.8) }, localize('editorOverviewRuler.inlineChatInserted', 'Overview ruler marker color for inline chat inserted content.'));
+
+export const inlineChatDiffRemoved = registerColor('inlineChatDiff.removed', transparent(diffRemoved, .5), localize('inlineChatDiff.removed', "Background color of removed text in the interactive editor input"));
+export const overviewRulerInlineChatDiffRemoved = registerColor('editorOverviewRuler.inlineChatRemoved', { dark: transparent(diffRemoved, 0.6), light: transparent(diffRemoved, 0.8), hcDark: transparent(diffRemoved, 0.6), hcLight: transparent(diffRemoved, 0.8) }, localize('editorOverviewRuler.inlineChatRemoved', 'Overview ruler marker color for inline chat removed content.'));
diff --git a/src/vs/workbench/contrib/inlineChat/electron-sandbox/inlineChat.contribution.ts b/src/vs/workbench/contrib/inlineChat/electron-sandbox/inlineChat.contribution.ts
index 7eaefb16698..99549752c8a 100644
--- a/src/vs/workbench/contrib/inlineChat/electron-sandbox/inlineChat.contribution.ts
+++ b/src/vs/workbench/contrib/inlineChat/electron-sandbox/inlineChat.contribution.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { registerAction2 } from 'vs/platform/actions/common/actions';
-import { HoldToSpeak } from './inlineChatActions';
+import { registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { HoldToSpeak } from './inlineChatActions.js';
 
 // start and hold for voice
 
diff --git a/src/vs/workbench/contrib/inlineChat/electron-sandbox/inlineChatActions.ts b/src/vs/workbench/contrib/inlineChat/electron-sandbox/inlineChatActions.ts
index 99862b01d7b..ddf6acf9f63 100644
--- a/src/vs/workbench/contrib/inlineChat/electron-sandbox/inlineChatActions.ts
+++ b/src/vs/workbench/contrib/inlineChat/electron-sandbox/inlineChatActions.ts
@@ -2,24 +2,24 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { InlineChatController } from 'vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { AbstractInlineChatAction, setHoldForSpeech } from 'vs/workbench/contrib/inlineChat/browser/inlineChatActions';
-import { disposableTimeout } from 'vs/base/common/async';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { StartVoiceChatAction, StopListeningAction, VOICE_KEY_HOLD_THRESHOLD } from 'vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions';
-import { IChatExecuteActionContext } from 'vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
-import { CTX_INLINE_CHAT_VISIBLE, InlineChatConfigKeys } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
-import { HasSpeechProvider, ISpeechService } from 'vs/workbench/contrib/speech/common/speechService';
-import { localize2 } from 'vs/nls';
-import { Action2 } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { InlineChatController } from '../browser/inlineChatController.js';
+import { AbstractInlineChatAction, setHoldForSpeech } from '../browser/inlineChatActions.js';
+import { disposableTimeout } from '../../../../base/common/async.js';
+import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { StartVoiceChatAction, StopListeningAction, VOICE_KEY_HOLD_THRESHOLD } from '../../chat/electron-sandbox/actions/voiceChatActions.js';
+import { IChatExecuteActionContext } from '../../chat/browser/actions/chatExecuteActions.js';
+import { CTX_INLINE_CHAT_VISIBLE, InlineChatConfigKeys } from '../common/inlineChat.js';
+import { HasSpeechProvider, ISpeechService } from '../../speech/common/speechService.js';
+import { localize2 } from '../../../../nls.js';
+import { Action2 } from '../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 
 export class HoldToSpeak extends AbstractInlineChatAction {
 
diff --git a/src/vs/workbench/contrib/inlineChat/test/browser/__snapshots__/InlineChatSession_Apply_Code_s_preview_should_be_easier_to_undo_esc__7537.1.snap b/src/vs/workbench/contrib/inlineChat/test/browser/__snapshots__/InlineChatSession_Apply_Code_s_preview_should_be_easier_to_undo_esc__7537.1.snap
new file mode 100644
index 00000000000..a0379e041b9
--- /dev/null
+++ b/src/vs/workbench/contrib/inlineChat/test/browser/__snapshots__/InlineChatSession_Apply_Code_s_preview_should_be_easier_to_undo_esc__7537.1.snap
@@ -0,0 +1,13 @@
+export function fib(n) {
+	if (n <= 0) return 0;
+	if (n === 1) return 0;
+	if (n === 2) return 1;
+
+	let a = 0, b = 1, c;
+	for (let i = 3; i <= n; i++) {
+		c = a + b;
+		a = b;
+		b = c;
+	}
+	return b;
+}
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/inlineChat/test/browser/__snapshots__/InlineChatSession_Apply_Code_s_preview_should_be_easier_to_undo_esc__7537.2.snap b/src/vs/workbench/contrib/inlineChat/test/browser/__snapshots__/InlineChatSession_Apply_Code_s_preview_should_be_easier_to_undo_esc__7537.2.snap
new file mode 100644
index 00000000000..3d44a421300
--- /dev/null
+++ b/src/vs/workbench/contrib/inlineChat/test/browser/__snapshots__/InlineChatSession_Apply_Code_s_preview_should_be_easier_to_undo_esc__7537.2.snap
@@ -0,0 +1,6 @@
+export function fib(n) {
+	if (n <= 0) return 0;
+	if (n === 1) return 0;
+	if (n === 2) return 1;
+	return fib(n - 1) + fib(n - 2);
+}
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts b/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts
index 827280275d5..76cdd4742ea 100644
--- a/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts
+++ b/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts
@@ -4,65 +4,69 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { equals } from 'vs/base/common/arrays';
-import { DeferredPromise, raceCancellation, timeout } from 'vs/base/common/async';
-import { Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { mock } from 'vs/base/test/common/mock';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { IActiveCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IDiffProviderFactoryService } from 'vs/editor/browser/widget/diffEditor/diffProviderFactoryService';
-import { EditOperation } from 'vs/editor/common/core/editOperation';
-import { Range } from 'vs/editor/common/core/range';
-import { EndOfLineSequence, ITextModel } from 'vs/editor/common/model';
-import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { IModelService } from 'vs/editor/common/services/model';
-import { TestDiffProviderFactoryService } from 'vs/editor/test/browser/diff/testDiffProviderFactoryService';
-import { instantiateTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { IEditorProgressService, IProgressRunner } from 'vs/platform/progress/common/progress';
-import { IView, IViewDescriptorService } from 'vs/workbench/common/views';
-import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { IAccessibleViewService } from 'vs/platform/accessibility/browser/accessibleView';
-import { IChatAccessibilityService, IChatWidget, IChatWidgetService } from 'vs/workbench/contrib/chat/browser/chat';
-import { ChatAgentLocation, ChatAgentService, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { IChatResponseViewModel } from 'vs/workbench/contrib/chat/common/chatViewModel';
-import { InlineChatController, InlineChatRunOptions, State } from 'vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { Session } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSession';
-import { CTX_INLINE_CHAT_USER_DID_EDIT, EditMode, InlineChatConfigKeys } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
-import { TestViewsService, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { IInlineChatSavingService } from '../../browser/inlineChatSavingService';
-import { IInlineChatSessionService } from '../../browser/inlineChatSessionService';
-import { InlineChatSessionServiceImpl } from '../../browser/inlineChatSessionServiceImpl';
-import { TestWorkerService } from './testWorkerService';
-import { IExtensionService, nullExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
-import { IChatService } from 'vs/workbench/contrib/chat/common/chatService';
-import { ChatService } from 'vs/workbench/contrib/chat/common/chatServiceImpl';
-import { IChatVariablesService } from 'vs/workbench/contrib/chat/common/chatVariables';
-import { ILogService, NullLogService } from 'vs/platform/log/common/log';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
-import { TestContextService, TestExtensionService } from 'vs/workbench/test/common/workbenchTestServices';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { ChatSlashCommandService, IChatSlashCommandService } from 'vs/workbench/contrib/chat/common/chatSlashCommands';
-import { ChatWidgetService } from 'vs/workbench/contrib/chat/browser/chatWidget';
-import { ChatWidgetHistoryService, IChatWidgetHistoryService } from 'vs/workbench/contrib/chat/common/chatWidgetHistoryService';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { NullHoverService } from 'vs/platform/hover/test/browser/nullHoverService';
-import { ChatVariablesService } from 'vs/workbench/contrib/chat/browser/chatVariables';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { TestCommandService } from 'vs/editor/test/browser/editorTestServices';
-import { INotebookEditorService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorService';
-import { RerunAction } from 'vs/workbench/contrib/inlineChat/browser/inlineChatActions';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { assertType } from 'vs/base/common/types';
+import { equals } from '../../../../../base/common/arrays.js';
+import { DeferredPromise, raceCancellation, timeout } from '../../../../../base/common/async.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { mock } from '../../../../../base/test/common/mock.js';
+import { runWithFakedTimers } from '../../../../../base/test/common/timeTravelScheduler.js';
+import { IActiveCodeEditor } from '../../../../../editor/browser/editorBrowser.js';
+import { IDiffProviderFactoryService } from '../../../../../editor/browser/widget/diffEditor/diffProviderFactoryService.js';
+import { EditOperation } from '../../../../../editor/common/core/editOperation.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { EndOfLineSequence, ITextModel } from '../../../../../editor/common/model.js';
+import { IEditorWorkerService } from '../../../../../editor/common/services/editorWorker.js';
+import { IModelService } from '../../../../../editor/common/services/model.js';
+import { TestDiffProviderFactoryService } from '../../../../../editor/test/browser/diff/testDiffProviderFactoryService.js';
+import { instantiateTestCodeEditor } from '../../../../../editor/test/browser/testCodeEditor.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { SyncDescriptor } from '../../../../../platform/instantiation/common/descriptors.js';
+import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { MockContextKeyService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { IEditorProgressService, IProgressRunner } from '../../../../../platform/progress/common/progress.js';
+import { IView, IViewDescriptorService } from '../../../../common/views.js';
+import { AccessibilityVerbositySettingId } from '../../../accessibility/browser/accessibilityConfiguration.js';
+import { IAccessibleViewService } from '../../../../../platform/accessibility/browser/accessibleView.js';
+import { IChatAccessibilityService, IChatWidget, IChatWidgetService } from '../../../chat/browser/chat.js';
+import { ChatAgentLocation, ChatAgentService, IChatAgentData, IChatAgentNameService, IChatAgentService } from '../../../chat/common/chatAgents.js';
+import { IChatResponseViewModel } from '../../../chat/common/chatViewModel.js';
+import { InlineChatController, State } from '../../browser/inlineChatController.js';
+import { Session } from '../../browser/inlineChatSession.js';
+import { CTX_INLINE_CHAT_RESPONSE_TYPE, CTX_INLINE_CHAT_USER_DID_EDIT, EditMode, InlineChatConfigKeys, InlineChatResponseType } from '../../common/inlineChat.js';
+import { TestViewsService, workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
+import { IExtensionService, nullExtensionDescription } from '../../../../services/extensions/common/extensions.js';
+import { IChatProgress, IChatService } from '../../../chat/common/chatService.js';
+import { ChatService } from '../../../chat/common/chatServiceImpl.js';
+import { IChatVariablesService } from '../../../chat/common/chatVariables.js';
+import { ILogService, NullLogService } from '../../../../../platform/log/common/log.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { NullTelemetryService } from '../../../../../platform/telemetry/common/telemetryUtils.js';
+import { TestContextService, TestExtensionService } from '../../../../test/common/workbenchTestServices.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { IViewsService } from '../../../../services/views/common/viewsService.js';
+import { ChatSlashCommandService, IChatSlashCommandService } from '../../../chat/common/chatSlashCommands.js';
+import { ChatWidgetService } from '../../../chat/browser/chatWidget.js';
+import { ChatWidgetHistoryService, IChatWidgetHistoryService } from '../../../chat/common/chatWidgetHistoryService.js';
+import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
+import { NullHoverService } from '../../../../../platform/hover/test/browser/nullHoverService.js';
+import { ChatVariablesService } from '../../../chat/browser/chatVariables.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { TestCommandService } from '../../../../../editor/test/browser/editorTestServices.js';
+import { INotebookEditorService } from '../../../notebook/browser/services/notebookEditorService.js';
+import { RerunAction } from '../../browser/inlineChatActions.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { assertType } from '../../../../../base/common/types.js';
+import { IWorkbenchAssignmentService } from '../../../../services/assignment/common/assignmentService.js';
+import { NullWorkbenchAssignmentService } from '../../../../services/assignment/test/common/nullAssignmentService.js';
+import { IInlineChatSavingService } from '../../browser/inlineChatSavingService.js';
+import { IInlineChatSessionService } from '../../browser/inlineChatSessionService.js';
+import { InlineChatSessionServiceImpl } from '../../browser/inlineChatSessionServiceImpl.js';
+import { TestWorkerService } from './testWorkerService.js';
+import { ILanguageModelsService, LanguageModelsService } from '../../../chat/common/languageModels.js';
+import { IChatEditingService, IChatEditingSession } from '../../../chat/common/chatEditingService.js';
 
 suite('InteractiveChatController', function () {
 
@@ -76,16 +80,17 @@ suite('InteractiveChatController', function () {
 		isDefault: true,
 		locations: [ChatAgentLocation.Editor],
 		metadata: {},
-		slashCommands: []
+		slashCommands: [],
+		disambiguation: [],
 	};
 
 	class TestController extends InlineChatController {
 
 		static INIT_SEQUENCE: readonly State[] = [State.CREATE_SESSION, State.INIT_UI, State.WAIT_FOR_INPUT];
-		static INIT_SEQUENCE_AUTO_SEND: readonly State[] = [...this.INIT_SEQUENCE, State.SHOW_REQUEST, State.SHOW_RESPONSE, State.WAIT_FOR_INPUT];
+		static INIT_SEQUENCE_AUTO_SEND: readonly State[] = [...this.INIT_SEQUENCE, State.SHOW_REQUEST, State.WAIT_FOR_INPUT];
 
-		private readonly _onDidChangeState = new Emitter<State>();
-		readonly onDidChangeState: Event<State> = this._onDidChangeState.event;
+
+		readonly onDidChangeState: Event<State> = this._onDidEnterState.event;
 
 		readonly states: readonly State[] = [];
 
@@ -107,20 +112,6 @@ suite('InteractiveChatController', function () {
 				}, 1000);
 			});
 		}
-
-		protected override async _nextState(state: State, options: InlineChatRunOptions): Promise<void> {
-			let nextState: State | void = state;
-			while (nextState) {
-				this._onDidChangeState.fire(nextState);
-				(<State[]>this.states).push(nextState);
-				nextState = await this[nextState](options);
-			}
-		}
-
-		override dispose() {
-			super.dispose();
-			this._onDidChangeState.dispose();
-		}
 	}
 
 	const store = new DisposableStore();
@@ -156,12 +147,20 @@ suite('InteractiveChatController', function () {
 			[IChatWidgetService, new SyncDescriptor(ChatWidgetService)],
 			[IChatSlashCommandService, new SyncDescriptor(ChatSlashCommandService)],
 			[IChatService, new SyncDescriptor(ChatService)],
+			[IChatAgentNameService, new class extends mock<IChatAgentNameService>() {
+				override getAgentNameRestriction(chatAgentData: IChatAgentData): boolean {
+					return false;
+				}
+			}],
 			[IEditorWorkerService, new SyncDescriptor(TestWorkerService)],
 			[IContextKeyService, contextKeyService],
 			[IChatAgentService, new SyncDescriptor(ChatAgentService)],
 			[IDiffProviderFactoryService, new SyncDescriptor(TestDiffProviderFactoryService)],
 			[IInlineChatSessionService, new SyncDescriptor(InlineChatSessionServiceImpl)],
 			[ICommandService, new SyncDescriptor(TestCommandService)],
+			[IChatEditingService, new class extends mock<IChatEditingService>() {
+				override onDidCreateEditingSession: Event<IChatEditingSession> = Event.None;
+			}],
 			[IInlineChatSavingService, new class extends mock<IInlineChatSavingService>() {
 				override markChanged(session: Session): void {
 					// noop
@@ -191,7 +190,9 @@ suite('InteractiveChatController', function () {
 			}],
 			[INotebookEditorService, new class extends mock<INotebookEditorService>() {
 				override listNotebookEditors() { return []; }
-			}]
+			}],
+			[IWorkbenchAssignmentService, new NullWorkbenchAssignmentService()],
+			[ILanguageModelsService, new SyncDescriptor(LanguageModelsService)],
 		);
 
 		instaService = store.add((store.add(workbenchInstantiationService(undefined, store))).createChild(serviceCollection));
@@ -207,6 +208,8 @@ suite('InteractiveChatController', function () {
 
 		inlineChatSessionService = store.add(instaService.get(IInlineChatSessionService));
 
+		store.add(instaService.get(ILanguageModelsService) as LanguageModelsService);
+
 		model = store.add(instaService.get(IModelService).createModel('Hello\nWorld\nHello Again\nHello World\n', null));
 		model.setEOL(EndOfLineSequence.LF);
 		editor = store.add(instantiateTestCodeEditor(instaService, model));
@@ -323,8 +326,9 @@ suite('InteractiveChatController', function () {
 		assert.ok(session);
 		assert.deepStrictEqual(session.wholeRange.value, new Range(3, 1, 3, 3)); // initial
 
+		ctrl.chatWidget.setInput('GENGEN');
 		ctrl.acceptInput();
-		assert.strictEqual(await ctrl.awaitStates([State.SHOW_REQUEST, State.SHOW_RESPONSE, State.WAIT_FOR_INPUT]), undefined);
+		assert.strictEqual(await ctrl.awaitStates([State.SHOW_REQUEST, State.WAIT_FOR_INPUT]), undefined);
 
 		assert.deepStrictEqual(session.wholeRange.value, new Range(1, 1, 4, 3));
 
@@ -374,7 +378,7 @@ suite('InteractiveChatController', function () {
 		const valueThen = editor.getModel().getValue();
 
 		ctrl = instaService.createInstance(TestController, editor);
-		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.SHOW_RESPONSE, State.WAIT_FOR_INPUT]);
+		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
 		const r = ctrl.run({ message: 'Hello', autoSend: true });
 		assert.strictEqual(await p, undefined);
 		ctrl.acceptSession();
@@ -417,7 +421,7 @@ suite('InteractiveChatController', function () {
 			// store.add(editor.getModel().onDidChangeContent(() => { modelChangeCounter++; }));
 
 			ctrl = instaService.createInstance(TestController, editor);
-			const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.SHOW_RESPONSE, State.WAIT_FOR_INPUT]);
+			const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
 			const r = ctrl.run({ message: 'Hello', autoSend: true });
 			assert.strictEqual(await p, undefined);
 
@@ -440,7 +444,7 @@ suite('InteractiveChatController', function () {
 
 		// NO manual edits -> cancel
 		ctrl = instaService.createInstance(TestController, editor);
-		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.SHOW_RESPONSE, State.WAIT_FOR_INPUT]);
+		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
 		const r = ctrl.run({ message: 'GENERATED', autoSend: true });
 		assert.strictEqual(await p, undefined);
 
@@ -456,7 +460,7 @@ suite('InteractiveChatController', function () {
 
 		// manual edits -> finish
 		ctrl = instaService.createInstance(TestController, editor);
-		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.SHOW_RESPONSE, State.WAIT_FOR_INPUT]);
+		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
 		const r = ctrl.run({ message: 'GENERATED', autoSend: true });
 		assert.strictEqual(await p, undefined);
 
@@ -491,14 +495,14 @@ suite('InteractiveChatController', function () {
 
 		model.setValue('');
 
-		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.SHOW_RESPONSE, State.WAIT_FOR_INPUT]);
+		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
 		const r = ctrl.run({ message: 'PROMPT_', autoSend: true });
 		assert.strictEqual(await p, undefined);
 
 
 		assert.strictEqual(model.getValue(), 'PROMPT_1');
 
-		const p2 = ctrl.awaitStates([State.SHOW_REQUEST, State.SHOW_RESPONSE, State.WAIT_FOR_INPUT]);
+		const p2 = ctrl.awaitStates([State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
 		await instaService.invokeFunction(rerun.runInlineChatCommand, ctrl, editor);
 
 		assert.strictEqual(await p2, undefined);
@@ -532,21 +536,22 @@ suite('InteractiveChatController', function () {
 		model.setValue('');
 
 		// REQUEST 1
-		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.SHOW_RESPONSE, State.WAIT_FOR_INPUT]);
+		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
 		const r = ctrl.run({ message: '1', autoSend: true });
 		assert.strictEqual(await p, undefined);
 
 		assert.strictEqual(model.getValue(), 'eins-');
 
 		// REQUEST 2
-		const p2 = ctrl.awaitStates([State.SHOW_REQUEST, State.SHOW_RESPONSE, State.WAIT_FOR_INPUT]);
+		const p2 = ctrl.awaitStates([State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
+		ctrl.chatWidget.setInput('1');
 		await ctrl.acceptInput();
 		assert.strictEqual(await p2, undefined);
 
 		assert.strictEqual(model.getValue(), 'zwei-eins-');
 
 		// REQUEST 2 - RERUN
-		const p3 = ctrl.awaitStates([State.SHOW_REQUEST, State.SHOW_RESPONSE, State.WAIT_FOR_INPUT]);
+		const p3 = ctrl.awaitStates([State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
 		await instaService.invokeFunction(rerun.runInlineChatCommand, ctrl, editor);
 		assert.strictEqual(await p3, undefined);
 
@@ -575,7 +580,7 @@ suite('InteractiveChatController', function () {
 		ctrl = instaService.createInstance(TestController, editor);
 
 		// REQUEST 1
-		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.SHOW_RESPONSE, State.WAIT_FOR_INPUT]);
+		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
 		ctrl.run({ message: '1', autoSend: true });
 		assert.strictEqual(await p, undefined);
 
@@ -615,14 +620,15 @@ suite('InteractiveChatController', function () {
 		ctrl = instaService.createInstance(TestController, editor);
 
 		// REQUEST 1
-		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.SHOW_RESPONSE, State.WAIT_FOR_INPUT]);
+		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
 		ctrl.run({ message: '1', autoSend: true });
 		assert.strictEqual(await p, undefined);
 
 		assert.strictEqual(model.getValue(), 'eins\nHello\nWorld\nHello Again\nHello World\n');
 
 		// REQUEST 2
-		const p2 = ctrl.awaitStates([State.SHOW_REQUEST, State.SHOW_RESPONSE, State.WAIT_FOR_INPUT]);
+		const p2 = ctrl.awaitStates([State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
+		ctrl.chatWidget.setInput('1');
 		await ctrl.acceptInput();
 		assert.strictEqual(await p2, undefined);
 
@@ -653,11 +659,14 @@ suite('InteractiveChatController', function () {
 		let count = 0;
 		const commandDetection: (boolean | undefined)[] = [];
 
+		const onDidInvoke = new Emitter<void>();
+
 		store.add(chatAgentService.registerDynamicAgent({
 			id: 'testEditorAgent2',
 			...agentData
 		}, {
 			async invoke(request, progress, history, token) {
+				queueMicrotask(() => onDidInvoke.fire());
 				commandDetection.push(request.enableCommandDetection);
 				progress({ kind: 'textEdit', uri: model.uri, edits: [{ range: new Range(1, 1, 1, 1), text: request.message + (count++) }] });
 
@@ -674,17 +683,23 @@ suite('InteractiveChatController', function () {
 		ctrl = instaService.createInstance(TestController, editor);
 
 		// REQUEST 1
-		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST]);
+		// const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST]);
+		const p = Event.toPromise(onDidInvoke.event);
 		ctrl.run({ message: 'Hello-', autoSend: true });
-		assert.strictEqual(await p, undefined);
+
+		await p;
+
+		// assert.strictEqual(await p, undefined);
 
 		// resend pending request without command detection
 		const request = ctrl.chatWidget.viewModel?.model.getRequests().at(-1);
 		assertType(request);
-		const p2 = ctrl.awaitStates([State.SHOW_REQUEST, State.SHOW_RESPONSE]);
+		const p2 = Event.toPromise(onDidInvoke.event);
+		const p3 = ctrl.awaitStates([State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
 		chatService.resendRequest(request, { noCommandDetection: true, attempt: request.attempt + 1, location: ChatAgentLocation.Editor });
 
-		assert.strictEqual(await p2, undefined);
+		await p2;
+		assert.strictEqual(await p3, undefined);
 
 		assert.deepStrictEqual(commandDetection, [true, false]);
 		assert.strictEqual(model.getValue(), 'Hello-1');
@@ -710,14 +725,14 @@ suite('InteractiveChatController', function () {
 		ctrl = instaService.createInstance(TestController, editor);
 
 		// REQUEST 1
-		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.SHOW_RESPONSE, State.WAIT_FOR_INPUT]);
+		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
 		ctrl.run({ message: 'Hello-', autoSend: true });
 		assert.strictEqual(await p, undefined);
 
 		// resend pending request without command detection
 		const request = ctrl.chatWidget.viewModel?.model.getRequests().at(-1);
 		assertType(request);
-		const p2 = ctrl.awaitStates([State.SHOW_REQUEST, State.SHOW_RESPONSE, State.WAIT_FOR_INPUT]);
+		const p2 = ctrl.awaitStates([State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
 		chatService.resendRequest(request, { noCommandDetection: true, attempt: request.attempt + 1, location: ChatAgentLocation.Editor });
 
 		assert.strictEqual(await p2, undefined);
@@ -757,10 +772,11 @@ suite('InteractiveChatController', function () {
 		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST]);
 		ctrl.run({ message: 'Hello-', autoSend: true });
 		assert.strictEqual(await p, undefined);
+		await timeout(10);
 		assert.deepStrictEqual(attempts, [0]);
 
 		// RERUN (cancel, undo, redo)
-		const p2 = ctrl.awaitStates([State.SHOW_REQUEST, State.SHOW_RESPONSE, State.WAIT_FOR_INPUT]);
+		const p2 = ctrl.awaitStates([State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
 		const rerun = new RerunAction();
 		await instaService.invokeFunction(rerun.runInlineChatCommand, ctrl, editor);
 		assert.strictEqual(await p2, undefined);
@@ -770,4 +786,171 @@ suite('InteractiveChatController', function () {
 		assert.strictEqual(model.getValue(), 'TRY:1\ntwo\none\n');
 
 	});
+
+	test('Stopping/cancelling a request should NOT undo its changes', async function () {
+
+		model.setValue('World');
+
+		const deferred = new DeferredPromise<void>();
+		let progress: ((part: IChatProgress) => void) | undefined;
+
+		store.add(chatAgentService.registerDynamicAgent({
+			id: 'testEditorAgent2',
+			...agentData
+		}, {
+			async invoke(request, _progress, history, token) {
+
+				progress = _progress;
+				await deferred.p;
+				return {};
+			},
+		}));
+
+		ctrl = instaService.createInstance(TestController, editor);
+
+		// REQUEST 1
+		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST]);
+		ctrl.run({ message: 'Hello', autoSend: true });
+		await timeout(10);
+		assert.strictEqual(await p, undefined);
+
+		assertType(progress);
+
+		const modelChange = new Promise<void>(resolve => model.onDidChangeContent(() => resolve()));
+
+		progress({ kind: 'textEdit', uri: model.uri, edits: [{ range: new Range(1, 1, 1, 1), text: 'Hello-Hello' }] });
+
+		await modelChange;
+		assert.strictEqual(model.getValue(), 'HelloWorld'); // first word has been streamed
+
+		const p2 = ctrl.awaitStates([State.WAIT_FOR_INPUT]);
+		chatService.cancelCurrentRequestForSession(ctrl.chatWidget.viewModel!.model.sessionId);
+		assert.strictEqual(await p2, undefined);
+
+		assert.strictEqual(model.getValue(), 'HelloWorld'); // CANCEL just stops the request and progressive typing but doesn't undo
+
+	});
+
+	test('Apply Edits from existing session w/ edits', async function () {
+
+		model.setValue('');
+
+		const newSession = await inlineChatSessionService.createSession(editor, { editMode: EditMode.Live }, CancellationToken.None);
+		assertType(newSession);
+
+		await chatService.sendRequest(newSession.chatModel.sessionId, 'Existing', { location: ChatAgentLocation.Editor });
+
+
+		assert.strictEqual(newSession.chatModel.requestInProgress, true);
+
+		const response = newSession.chatModel.lastRequest?.response;
+		assertType(response);
+
+		await new Promise(resolve => {
+			if (response.isComplete) {
+				resolve(undefined);
+			}
+			const d = response.onDidChange(() => {
+				if (response.isComplete) {
+					d.dispose();
+					resolve(undefined);
+				}
+			});
+		});
+
+		ctrl = instaService.createInstance(TestController, editor);
+		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE]);
+		ctrl.run({ existingSession: newSession });
+
+		assert.strictEqual(await p, undefined);
+
+		assert.strictEqual(model.getValue(), 'Existing');
+
+	});
+
+	test('Undo on error (2 rounds)', async function () {
+
+		return runWithFakedTimers({}, async () => {
+
+
+			store.add(chatAgentService.registerDynamicAgent({ id: 'testEditorAgent', ...agentData, }, {
+				async invoke(request, progress, history, token) {
+
+					progress({
+						kind: 'textEdit',
+						uri: model.uri,
+						edits: [{
+							range: new Range(1, 1, 1, 1),
+							text: request.message
+						}]
+					});
+
+					if (request.message === 'two') {
+						await timeout(100); // give edit a chance
+						return {
+							errorDetails: { message: 'FAILED' }
+						};
+					}
+					return {};
+				},
+			}));
+
+			model.setValue('');
+
+			// ROUND 1
+
+			ctrl = instaService.createInstance(TestController, editor);
+			const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
+			ctrl.run({ autoSend: true, message: 'one' });
+			assert.strictEqual(await p, undefined);
+			assert.strictEqual(model.getValue(), 'one');
+
+
+			// ROUND 2
+
+			const p2 = ctrl.awaitStates([State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
+			const values = new Set<string>();
+			store.add(model.onDidChangeContent(() => values.add(model.getValue())));
+			ctrl.chatWidget.acceptInput('two'); // WILL Trigger a failure
+			assert.strictEqual(await p2, undefined);
+			assert.strictEqual(model.getValue(), 'one'); // undone
+			assert.ok(values.has('twoone')); // we had but the change got undone
+		});
+	});
+
+	test('Inline chat "discard" button does not always appear if response is stopped #228030', async function () {
+
+		model.setValue('World');
+
+		const deferred = new DeferredPromise<void>();
+
+		store.add(chatAgentService.registerDynamicAgent({
+			id: 'testEditorAgent2',
+			...agentData
+		}, {
+			async invoke(request, progress, history, token) {
+
+				progress({ kind: 'textEdit', uri: model.uri, edits: [{ range: new Range(1, 1, 1, 1), text: 'Hello-Hello' }] });
+				await deferred.p;
+				return {};
+			},
+		}));
+
+		ctrl = instaService.createInstance(TestController, editor);
+
+		// REQUEST 1
+		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST]);
+		ctrl.run({ message: 'Hello', autoSend: true });
+
+
+		assert.strictEqual(await p, undefined);
+
+		const p2 = ctrl.awaitStates([State.WAIT_FOR_INPUT]);
+		chatService.cancelCurrentRequestForSession(ctrl.chatWidget.viewModel!.model.sessionId);
+		assert.strictEqual(await p2, undefined);
+
+
+		const value = contextKeyService.getContextKeyValue(CTX_INLINE_CHAT_RESPONSE_TYPE.key);
+		assert.notStrictEqual(value, InlineChatResponseType.None);
+	});
 });
diff --git a/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatSession.test.ts b/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatSession.test.ts
index 26e72175e2c..665206f55b0 100644
--- a/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatSession.test.ts
+++ b/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatSession.test.ts
@@ -3,59 +3,65 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { Event } from 'vs/base/common/event';
-import { mock } from 'vs/base/test/common/mock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { TestDiffProviderFactoryService } from 'vs/editor/test/browser/diff/testDiffProviderFactoryService';
-import { IActiveCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IDiffProviderFactoryService } from 'vs/editor/browser/widget/diffEditor/diffProviderFactoryService';
-import { Range } from 'vs/editor/common/core/range';
-import { ITextModel } from 'vs/editor/common/model';
-import { IModelService } from 'vs/editor/common/services/model';
-import { instantiateTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { IEditorProgressService, IProgressRunner } from 'vs/platform/progress/common/progress';
-import { IViewDescriptorService } from 'vs/workbench/common/views';
-import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { IChatAccessibilityService, IChatWidgetService } from 'vs/workbench/contrib/chat/browser/chat';
-import { IChatResponseViewModel } from 'vs/workbench/contrib/chat/common/chatViewModel';
-import { IInlineChatSavingService } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSavingService';
-import { HunkState, Session } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSession';
-import { IInlineChatSessionService } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSessionService';
-import { InlineChatSessionServiceImpl } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl';
-import { EditMode } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
-import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { assertType } from 'vs/base/common/types';
-import { EditOperation } from 'vs/editor/common/core/editOperation';
-import { Position } from 'vs/editor/common/core/position';
-import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { TestWorkerService } from './testWorkerService';
-import { IExtensionService, nullExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
-import { ILogService, NullLogService } from 'vs/platform/log/common/log';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { ChatWidgetService } from 'vs/workbench/contrib/chat/browser/chatWidget';
-import { IChatService } from 'vs/workbench/contrib/chat/common/chatService';
-import { ChatService } from 'vs/workbench/contrib/chat/common/chatServiceImpl';
-import { IChatSlashCommandService, ChatSlashCommandService } from 'vs/workbench/contrib/chat/common/chatSlashCommands';
-import { IChatVariablesService } from 'vs/workbench/contrib/chat/common/chatVariables';
-import { IChatWidgetHistoryService, ChatWidgetHistoryService } from 'vs/workbench/contrib/chat/common/chatWidgetHistoryService';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { TestExtensionService, TestContextService } from 'vs/workbench/test/common/workbenchTestServices';
-import { IChatAgentService, ChatAgentService, ChatAgentLocation } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { ChatVariablesService } from 'vs/workbench/contrib/chat/browser/chatVariables';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { TestCommandService } from 'vs/editor/test/browser/editorTestServices';
-import { IAccessibleViewService } from 'vs/platform/accessibility/browser/accessibleView';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { Event } from '../../../../../base/common/event.js';
+import { mock } from '../../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { TestDiffProviderFactoryService } from '../../../../../editor/test/browser/diff/testDiffProviderFactoryService.js';
+import { IActiveCodeEditor } from '../../../../../editor/browser/editorBrowser.js';
+import { IDiffProviderFactoryService } from '../../../../../editor/browser/widget/diffEditor/diffProviderFactoryService.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
+import { IModelService } from '../../../../../editor/common/services/model.js';
+import { instantiateTestCodeEditor } from '../../../../../editor/test/browser/testCodeEditor.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { SyncDescriptor } from '../../../../../platform/instantiation/common/descriptors.js';
+import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { MockContextKeyService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { IEditorProgressService, IProgressRunner } from '../../../../../platform/progress/common/progress.js';
+import { IViewDescriptorService } from '../../../../common/views.js';
+import { AccessibilityVerbositySettingId } from '../../../accessibility/browser/accessibilityConfiguration.js';
+import { IChatAccessibilityService, IChatWidgetService } from '../../../chat/browser/chat.js';
+import { IChatResponseViewModel } from '../../../chat/common/chatViewModel.js';
+import { IInlineChatSavingService } from '../../browser/inlineChatSavingService.js';
+import { HunkState, Session } from '../../browser/inlineChatSession.js';
+import { IInlineChatSessionService } from '../../browser/inlineChatSessionService.js';
+import { InlineChatSessionServiceImpl } from '../../browser/inlineChatSessionServiceImpl.js';
+import { EditMode } from '../../common/inlineChat.js';
+import { workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { assertType } from '../../../../../base/common/types.js';
+import { EditOperation } from '../../../../../editor/common/core/editOperation.js';
+import { Position } from '../../../../../editor/common/core/position.js';
+import { IEditorWorkerService } from '../../../../../editor/common/services/editorWorker.js';
+import { TestWorkerService } from './testWorkerService.js';
+import { IExtensionService, nullExtensionDescription } from '../../../../services/extensions/common/extensions.js';
+import { ILogService, NullLogService } from '../../../../../platform/log/common/log.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { NullTelemetryService } from '../../../../../platform/telemetry/common/telemetryUtils.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { ChatWidgetService } from '../../../chat/browser/chatWidget.js';
+import { IChatService } from '../../../chat/common/chatService.js';
+import { ChatService } from '../../../chat/common/chatServiceImpl.js';
+import { IChatSlashCommandService, ChatSlashCommandService } from '../../../chat/common/chatSlashCommands.js';
+import { IChatVariablesService } from '../../../chat/common/chatVariables.js';
+import { IChatWidgetHistoryService, ChatWidgetHistoryService } from '../../../chat/common/chatWidgetHistoryService.js';
+import { IViewsService } from '../../../../services/views/common/viewsService.js';
+import { TestExtensionService, TestContextService } from '../../../../test/common/workbenchTestServices.js';
+import { IChatAgentService, ChatAgentService, ChatAgentLocation } from '../../../chat/common/chatAgents.js';
+import { ChatVariablesService } from '../../../chat/browser/chatVariables.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { TestCommandService } from '../../../../../editor/test/browser/editorTestServices.js';
+import { IAccessibleViewService } from '../../../../../platform/accessibility/browser/accessibleView.js';
+import { IWorkbenchAssignmentService } from '../../../../services/assignment/common/assignmentService.js';
+import { NullWorkbenchAssignmentService } from '../../../../services/assignment/test/common/nullAssignmentService.js';
+import { ILanguageModelToolsService } from '../../../chat/common/languageModelToolsService.js';
+import { MockLanguageModelToolsService } from '../../../chat/test/common/mockLanguageModelToolsService.js';
+import { IChatRequestModel } from '../../../chat/common/chatModel.js';
+import { assertSnapshot } from '../../../../../base/test/common/snapshot.js';
 
 suite('InlineChatSession', function () {
 
@@ -89,6 +95,7 @@ suite('InlineChatSession', function () {
 			[IDiffProviderFactoryService, new SyncDescriptor(TestDiffProviderFactoryService)],
 			[IInlineChatSessionService, new SyncDescriptor(InlineChatSessionServiceImpl)],
 			[ICommandService, new SyncDescriptor(TestCommandService)],
+			[ILanguageModelToolsService, new MockLanguageModelToolsService()],
 			[IInlineChatSavingService, new class extends mock<IInlineChatSavingService>() {
 				override markChanged(session: Session): void {
 					// noop
@@ -115,7 +122,8 @@ suite('InlineChatSession', function () {
 			[IConfigurationService, new TestConfigurationService()],
 			[IViewDescriptorService, new class extends mock<IViewDescriptorService>() {
 				override onDidChangeLocation = Event.None;
-			}]
+			}],
+			[IWorkbenchAssignmentService, new NullWorkbenchAssignmentService()]
 		);
 
 
@@ -133,7 +141,8 @@ suite('InlineChatSession', function () {
 			isDefault: true,
 			locations: [ChatAgentLocation.Editor],
 			metadata: {},
-			slashCommands: []
+			slashCommands: [],
+			disambiguation: [],
 		}, {
 			async invoke() {
 				return {};
@@ -191,11 +200,11 @@ suite('InlineChatSession', function () {
 
 		assert.ok(!session.textModel0.equalsTextBuffer(session.textModelN.getTextBuffer()));
 		assert.strictEqual(hunk.getState(), HunkState.Pending);
-		assert.ok(hunk.getRangesN()[0].equalsRange({ startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 7 }));
+		assert.ok(hunk.getRangesN()[0].equalsRange({ startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 8 }));
 
 		await makeEditAsAi(EditOperation.insert(new Position(1, 3), 'foobar'));
 		[hunk] = session.hunkData.getInfo();
-		assert.ok(hunk.getRangesN()[0].equalsRange({ startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 13 }));
+		assert.ok(hunk.getRangesN()[0].equalsRange({ startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 14 }));
 
 		inlineChatSessionService.releaseSession(session);
 
@@ -480,4 +489,90 @@ suite('InlineChatSession', function () {
 
 		inlineChatSessionService.releaseSession(session);
 	});
+
+	test('Pressing Escape after inline chat errored with "response filtered" leaves document dirty #7764', async function () {
+
+		const origValue = `class Foo {
+	private onError(error: string): void {
+		if (/The request timed out|The network connection was lost/i.test(error)) {
+			return;
+		}
+
+		error = error.replace(/See https:\/\/github\.com\/Squirrel\/Squirrel\.Mac\/issues\/182 for more information/, 'This might mean the application was put on quarantine by macOS. See [this link](https://github.com/microsoft/vscode/issues/7426#issuecomment-425093469) for more information');
+
+		this.notificationService.notify({
+			severity: Severity.Error,
+			message: error,
+			source: nls.localize('update service', "Update Service"),
+		});
+	}
+}`;
+		model.setValue(origValue);
+
+		const session = await inlineChatSessionService.createSession(editor, { editMode: EditMode.Live }, CancellationToken.None);
+		assertType(session);
+
+		const fakeRequest = new class extends mock<IChatRequestModel>() {
+			override get id() { return 'one'; }
+		};
+		session.markModelVersion(fakeRequest);
+
+		assert.strictEqual(editor.getModel().getLineCount(), 15);
+
+		await makeEditAsAi([EditOperation.replace(new Range(7, 1, 7, Number.MAX_SAFE_INTEGER), `error = error.replace(
+			/See https:\/\/github\.com\/Squirrel\/Squirrel\.Mac\/issues\/182 for more information/,
+			'This might mean the application was put on quarantine by macOS. See [this link](https://github.com/microsoft/vscode/issues/7426#issuecomment-425093469) for more information'
+		);`)]);
+
+		assert.strictEqual(editor.getModel().getLineCount(), 18);
+
+		// called when a response errors out
+		await session.undoChangesUntil(fakeRequest.id);
+		await session.hunkData.recompute({ applied: 0, sha1: 'fakeSha1' }, undefined);
+
+		assert.strictEqual(editor.getModel().getValue(), origValue);
+
+		session.hunkData.discardAll(); // called when dimissing the session
+		assert.strictEqual(editor.getModel().getValue(), origValue);
+	});
+
+	test('Apply Code\'s preview should be easier to undo/esc #7537', async function () {
+		model.setValue(`export function fib(n) {
+	if (n <= 0) return 0;
+	if (n === 1) return 0;
+	if (n === 2) return 1;
+	return fib(n - 1) + fib(n - 2);
+}`);
+		const session = await inlineChatSessionService.createSession(editor, { editMode: EditMode.Live }, CancellationToken.None);
+		assertType(session);
+
+		await makeEditAsAi([EditOperation.replace(new Range(5, 1, 6, Number.MAX_SAFE_INTEGER), `
+	let a = 0, b = 1, c;
+	for (let i = 3; i <= n; i++) {
+		c = a + b;
+		a = b;
+		b = c;
+	}
+	return b;
+}`)]);
+
+		assert.strictEqual(session.hunkData.size, 1);
+		assert.strictEqual(session.hunkData.pending, 1);
+		assert.ok(session.hunkData.getInfo().every(d => d.getState() === HunkState.Pending));
+
+		await assertSnapshot(editor.getModel().getValue(), { name: '1' });
+
+		await model.undo();
+		await assertSnapshot(editor.getModel().getValue(), { name: '2' });
+
+		// overlapping edits (even UNDO) mark edits as accepted
+		assert.strictEqual(session.hunkData.size, 1);
+		assert.strictEqual(session.hunkData.pending, 0);
+		assert.ok(session.hunkData.getInfo().every(d => d.getState() === HunkState.Accepted));
+
+		// no further change when discarding
+		session.hunkData.discardAll(); // CANCEL
+		await assertSnapshot(editor.getModel().getValue(), { name: '2' });
+	});
+
 });
diff --git a/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatStrategies.test.ts b/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatStrategies.test.ts
index c6724b095e4..df51a99ed0d 100644
--- a/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatStrategies.test.ts
+++ b/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatStrategies.test.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { IntervalTimer } from 'vs/base/common/async';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { asProgressiveEdit } from '../../browser/utils';
+import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { IntervalTimer } from '../../../../../base/common/async.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { asProgressiveEdit } from '../../browser/utils.js';
 import assert from 'assert';
 
 
diff --git a/src/vs/workbench/contrib/inlineChat/test/browser/testWorkerService.ts b/src/vs/workbench/contrib/inlineChat/test/browser/testWorkerService.ts
index d9b64666384..b8e2b138690 100644
--- a/src/vs/workbench/contrib/inlineChat/test/browser/testWorkerService.ts
+++ b/src/vs/workbench/contrib/inlineChat/test/browser/testWorkerService.ts
@@ -2,23 +2,23 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { URI } from 'vs/base/common/uri';
-import { mock } from 'vs/base/test/common/mock';
-import { Range } from 'vs/editor/common/core/range';
-import { IModelService } from 'vs/editor/common/services/model';
-import { assertType } from 'vs/base/common/types';
-import { DiffAlgorithmName, IEditorWorkerService, ILineChange } from 'vs/editor/common/services/editorWorker';
-import { IDocumentDiff, IDocumentDiffProviderOptions } from 'vs/editor/common/diff/documentDiffProvider';
-import { EditorSimpleWorker } from 'vs/editor/common/services/editorSimpleWorker';
-import { LineRange } from 'vs/editor/common/core/lineRange';
-import { MovedText } from 'vs/editor/common/diff/linesDiffComputer';
-import { LineRangeMapping, DetailedLineRangeMapping, RangeMapping } from 'vs/editor/common/diff/rangeMapping';
-import { TextEdit } from 'vs/editor/common/languages';
+import { URI } from '../../../../../base/common/uri.js';
+import { mock } from '../../../../../base/test/common/mock.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { IModelService } from '../../../../../editor/common/services/model.js';
+import { assertType } from '../../../../../base/common/types.js';
+import { DiffAlgorithmName, IEditorWorkerService, ILineChange } from '../../../../../editor/common/services/editorWorker.js';
+import { IDocumentDiff, IDocumentDiffProviderOptions } from '../../../../../editor/common/diff/documentDiffProvider.js';
+import { BaseEditorSimpleWorker } from '../../../../../editor/common/services/editorSimpleWorker.js';
+import { LineRange } from '../../../../../editor/common/core/lineRange.js';
+import { MovedText } from '../../../../../editor/common/diff/linesDiffComputer.js';
+import { LineRangeMapping, DetailedLineRangeMapping, RangeMapping } from '../../../../../editor/common/diff/rangeMapping.js';
+import { TextEdit } from '../../../../../editor/common/languages.js';
 
 
 export class TestWorkerService extends mock<IEditorWorkerService>() {
 
-	private readonly _worker = new EditorSimpleWorker(null!, null);
+	private readonly _worker = new BaseEditorSimpleWorker();
 
 	constructor(@IModelService private readonly _modelService: IModelService) {
 		super();
@@ -36,21 +36,21 @@ export class TestWorkerService extends mock<IEditorWorkerService>() {
 		assertType(originalModel);
 		assertType(modifiedModel);
 
-		this._worker.acceptNewModel({
+		this._worker.$acceptNewModel({
 			url: originalModel.uri.toString(),
 			versionId: originalModel.getVersionId(),
 			lines: originalModel.getLinesContent(),
 			EOL: originalModel.getEOL(),
 		});
 
-		this._worker.acceptNewModel({
+		this._worker.$acceptNewModel({
 			url: modifiedModel.uri.toString(),
 			versionId: modifiedModel.getVersionId(),
 			lines: modifiedModel.getLinesContent(),
 			EOL: modifiedModel.getEOL(),
 		});
 
-		const result = await this._worker.computeDiff(originalModel.uri.toString(), modifiedModel.uri.toString(), options, algorithm);
+		const result = await this._worker.$computeDiff(originalModel.uri.toString(), modifiedModel.uri.toString(), options, algorithm);
 		if (!result) {
 			return result;
 		}
diff --git a/src/vs/workbench/contrib/interactive/browser/interactive.contribution.ts b/src/vs/workbench/contrib/interactive/browser/interactive.contribution.ts
index 24e4478a278..01849753224 100644
--- a/src/vs/workbench/contrib/interactive/browser/interactive.contribution.ts
+++ b/src/vs/workbench/contrib/interactive/browser/interactive.contribution.ts
@@ -3,64 +3,65 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Iterable } from 'vs/base/common/iterator';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { parse } from 'vs/base/common/marshalling';
-import { Schemas } from 'vs/base/common/network';
-import { extname, isEqual } from 'vs/base/common/resources';
-import { isFalsyOrWhitespace } from 'vs/base/common/strings';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { IBulkEditService } from 'vs/editor/browser/services/bulkEditService';
-import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { EditOperation } from 'vs/editor/common/core/editOperation';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { ITextModel } from 'vs/editor/common/model';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ITextModelContentProvider, ITextModelService } from 'vs/editor/common/services/resolverService';
-import { peekViewBorder } from 'vs/editor/contrib/peekView/browser/peekView';
-import { Context as SuggestContext } from 'vs/editor/contrib/suggest/browser/suggest';
-import { localize, localize2 } from 'vs/nls';
-import { ILocalizedString } from 'vs/platform/action/common/action';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { EditorActivation, IResourceEditorInput } from 'vs/platform/editor/common/editor';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ILogService } from 'vs/platform/log/common/log';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { contrastBorder, ifDefinedThenElse, listInactiveSelectionBackground, registerColor } from 'vs/platform/theme/common/colorRegistry';
-import { EditorPaneDescriptor, IEditorPaneRegistry } from 'vs/workbench/browser/editor';
-import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { EditorExtensions, EditorsOrder, IEditorFactoryRegistry, IEditorSerializer, IUntypedEditorInput } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { PANEL_BORDER } from 'vs/workbench/common/theme';
-import { ResourceNotebookCellEdit } from 'vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
-import { InteractiveWindowSetting, INTERACTIVE_INPUT_CURSOR_BOUNDARY } from 'vs/workbench/contrib/interactive/browser/interactiveCommon';
-import { IInteractiveDocumentService, InteractiveDocumentService } from 'vs/workbench/contrib/interactive/browser/interactiveDocumentService';
-import { InteractiveEditor } from 'vs/workbench/contrib/interactive/browser/interactiveEditor';
-import { InteractiveEditorInput } from 'vs/workbench/contrib/interactive/browser/interactiveEditorInput';
-import { IInteractiveHistoryService, InteractiveHistoryService } from 'vs/workbench/contrib/interactive/browser/interactiveHistoryService';
-import { NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT } from 'vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { INotebookEditorOptions } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NotebookEditorWidget } from 'vs/workbench/contrib/notebook/browser/notebookEditorWidget';
-import * as icons from 'vs/workbench/contrib/notebook/browser/notebookIcons';
-import { INotebookEditorService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorService';
-import { CellEditType, CellKind, CellUri, INTERACTIVE_WINDOW_EDITOR_ID, NotebookSetting, NotebookWorkingCopyTypeIdentifier } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { InteractiveWindowOpen } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { INotebookKernelService } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
-import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
-import { columnToEditorGroup } from 'vs/workbench/services/editor/common/editorGroupColumn';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorResolverService, RegisteredEditorPriority } from 'vs/workbench/services/editor/common/editorResolverService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IWorkingCopyIdentifier } from 'vs/workbench/services/workingCopy/common/workingCopy';
-import { IWorkingCopyEditorHandler, IWorkingCopyEditorService } from 'vs/workbench/services/workingCopy/common/workingCopyEditorService';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
+import { parse } from '../../../../base/common/marshalling.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { extname, isEqual } from '../../../../base/common/resources.js';
+import { isFalsyOrWhitespace } from '../../../../base/common/strings.js';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
+import { IBulkEditService } from '../../../../editor/browser/services/bulkEditService.js';
+import { EditOperation } from '../../../../editor/common/core/editOperation.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../../../../editor/common/languages/modesRegistry.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ITextModelContentProvider, ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { peekViewBorder } from '../../../../editor/contrib/peekView/browser/peekView.js';
+import { Context as SuggestContext } from '../../../../editor/contrib/suggest/browser/suggest.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { ILocalizedString } from '../../../../platform/action/common/action.js';
+import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { EditorActivation, ITextResourceEditorInput } from '../../../../platform/editor/common/editor.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { contrastBorder, ifDefinedThenElse, listInactiveSelectionBackground, registerColor } from '../../../../platform/theme/common/colorRegistry.js';
+import { EditorPaneDescriptor, IEditorPaneRegistry } from '../../../browser/editor.js';
+import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { EditorExtensions, EditorsOrder, IEditorControl, IEditorFactoryRegistry, IEditorSerializer, IUntypedEditorInput } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { PANEL_BORDER } from '../../../common/theme.js';
+import { ResourceNotebookCellEdit } from '../../bulkEdit/browser/bulkCellEdits.js';
+import { InteractiveWindowSetting, INTERACTIVE_INPUT_CURSOR_BOUNDARY } from './interactiveCommon.js';
+import { IInteractiveDocumentService, InteractiveDocumentService } from './interactiveDocumentService.js';
+import { InteractiveEditor } from './interactiveEditor.js';
+import { InteractiveEditorInput } from './interactiveEditorInput.js';
+import { IInteractiveHistoryService, InteractiveHistoryService } from './interactiveHistoryService.js';
+import { NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT } from '../../notebook/browser/controller/coreActions.js';
+import { INotebookEditorOptions } from '../../notebook/browser/notebookBrowser.js';
+import * as icons from '../../notebook/browser/notebookIcons.js';
+import { INotebookEditorService } from '../../notebook/browser/services/notebookEditorService.js';
+import { CellEditType, CellKind, CellUri, INTERACTIVE_WINDOW_EDITOR_ID, NotebookSetting, NotebookWorkingCopyTypeIdentifier } from '../../notebook/common/notebookCommon.js';
+import { InteractiveWindowOpen, IS_COMPOSITE_NOTEBOOK, NOTEBOOK_EDITOR_FOCUSED } from '../../notebook/common/notebookContextKeys.js';
+import { INotebookKernelService } from '../../notebook/common/notebookKernelService.js';
+import { INotebookService } from '../../notebook/common/notebookService.js';
+import { columnToEditorGroup } from '../../../services/editor/common/editorGroupColumn.js';
+import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { IEditorResolverService, RegisteredEditorPriority } from '../../../services/editor/common/editorResolverService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IWorkingCopyIdentifier } from '../../../services/workingCopy/common/workingCopy.js';
+import { IWorkingCopyEditorHandler, IWorkingCopyEditorService } from '../../../services/workingCopy/common/workingCopyEditorService.js';
+import { isReplEditorControl, ReplEditorControl } from '../../replNotebook/browser/replEditor.js';
+import { InlineChatController } from '../../inlineChat/browser/inlineChatController.js';
+import { IsLinuxContext, IsWindowsContext } from '../../../../platform/contextkey/common/contextkeys.js';
 
 const interactiveWindowCategory: ILocalizedString = localize2('interactiveWindow', "Interactive Window");
 
@@ -95,7 +96,7 @@ export class InteractiveDocumentContribution extends Disposable implements IWork
 				providerDisplayName: 'Interactive Notebook',
 				displayName: 'Interactive',
 				filenamePattern: ['*.interactive'],
-				exclusive: true
+				priority: RegisteredEditorPriority.builtin
 			}));
 		}
 
@@ -134,17 +135,25 @@ export class InteractiveDocumentContribution extends Disposable implements IWork
 			{
 				createEditorInput: ({ resource, options }) => {
 					const data = CellUri.parse(resource);
-					let cellOptions: IResourceEditorInput | undefined;
-					let IwResource = resource;
+					let cellOptions: ITextResourceEditorInput | undefined;
+					let iwResource = resource;
 
 					if (data) {
 						cellOptions = { resource, options };
-						IwResource = data.notebook;
+						iwResource = data.notebook;
 					}
 
-					const notebookOptions = { ...options, cellOptions } as INotebookEditorOptions;
+					const notebookOptions: INotebookEditorOptions | undefined = {
+						...options,
+						cellOptions,
+						cellRevealType: undefined,
+						cellSelections: undefined,
+						isReadOnly: undefined,
+						viewState: undefined,
+						indexedCellOptions: undefined
+					};
 
-					const editorInput = createEditor(IwResource, this.instantiationService);
+					const editorInput = createEditor(iwResource, this.instantiationService);
 					return {
 						editor: editorInput,
 						options: notebookOptions
@@ -155,13 +164,21 @@ export class InteractiveDocumentContribution extends Disposable implements IWork
 						throw new Error('Interactive window editors must have a resource name');
 					}
 					const data = CellUri.parse(resource);
-					let cellOptions: IResourceEditorInput | undefined;
+					let cellOptions: ITextResourceEditorInput | undefined;
 
 					if (data) {
 						cellOptions = { resource, options };
 					}
 
-					const notebookOptions = { ...options, cellOptions } as INotebookEditorOptions;
+					const notebookOptions: INotebookEditorOptions = {
+						...options,
+						cellOptions,
+						cellRevealType: undefined,
+						cellSelections: undefined,
+						isReadOnly: undefined,
+						viewState: undefined,
+						indexedCellOptions: undefined
+					};
 
 					const editorInput = createEditor(resource, this.instantiationService);
 					return {
@@ -249,7 +266,7 @@ class InteractiveWindowWorkingCopyEditorHandler extends Disposable implements IW
 	}
 
 	private _getViewType(workingCopy: IWorkingCopyIdentifier): string | undefined {
-		return NotebookWorkingCopyTypeIdentifier.parse(workingCopy.typeId);
+		return NotebookWorkingCopyTypeIdentifier.parse(workingCopy.typeId)?.viewType;
 	}
 }
 
@@ -380,7 +397,7 @@ registerAction2(class extends Action2 {
 				const editorInput = editors[0].editor as InteractiveEditorInput;
 				const currentGroup = editors[0].groupId;
 				const editor = await editorService.openEditor(editorInput, editorOptions, currentGroup);
-				const editorControl = editor?.getControl() as { notebookEditor: NotebookEditorWidget | undefined; codeEditor: CodeEditorWidget } | undefined;
+				const editorControl = editor?.getControl() as ReplEditorControl;
 
 				return {
 					notebookUri: editorInput.resource,
@@ -411,17 +428,17 @@ registerAction2(class extends Action2 {
 		logService.debug('Open new interactive window:', notebookUri.toString(), inputUri.toString());
 
 		if (id) {
-			const allKernels = kernelService.getMatchingKernel({ uri: notebookUri, viewType: 'interactive' }).all;
+			const allKernels = kernelService.getMatchingKernel({ uri: notebookUri, notebookType: 'interactive' }).all;
 			const preferredKernel = allKernels.find(kernel => kernel.id === id);
 			if (preferredKernel) {
-				kernelService.preselectKernelForNotebook(preferredKernel, { uri: notebookUri, viewType: 'interactive' });
+				kernelService.preselectKernelForNotebook(preferredKernel, { uri: notebookUri, notebookType: 'interactive' });
 			}
 		}
 
 		historyService.clearHistory(notebookUri);
 		const editorInput: IUntypedEditorInput = { resource: notebookUri, options: editorOptions };
 		const editorPane = await editorService.openEditor(editorInput, group);
-		const editorControl = editorPane?.getControl() as { notebookEditor: NotebookEditorWidget | undefined; codeEditor: CodeEditorWidget } | undefined;
+		const editorControl = editorPane?.getControl() as ReplEditorControl;
 		// Extensions must retain references to these URIs to manipulate the interactive editor
 		logService.debug('New interactive window opened. Notebook editor id', editorControl?.notebookEditor?.getId());
 		return { notebookUri, inputUri, notebookEditorId: editorControl?.notebookEditor?.getId() };
@@ -435,6 +452,11 @@ registerAction2(class extends Action2 {
 			title: localize2('interactive.execute', 'Execute Code'),
 			category: interactiveWindowCategory,
 			keybinding: [{
+				// when: NOTEBOOK_CELL_LIST_FOCUSED,
+				when: ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive'),
+				primary: KeyMod.CtrlCmd | KeyCode.Enter,
+				weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
+			}, {
 				when: ContextKeyExpr.and(
 					ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive'),
 					ContextKeyExpr.equals('config.interactiveWindow.executeWithShiftEnter', true)
@@ -448,19 +470,11 @@ registerAction2(class extends Action2 {
 				),
 				primary: KeyCode.Enter,
 				weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
-			}, {
-				// when: NOTEBOOK_CELL_LIST_FOCUSED,
-				when: ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive'),
-				primary: KeyMod.WinCtrl | KeyCode.Enter,
-				win: {
-					primary: KeyMod.CtrlCmd | KeyCode.Enter
-				},
-				weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
 			}],
 			menu: [
 				{
 					id: MenuId.InteractiveInputExecute
-				}
+				},
 			],
 			icon: icons.executeIcon,
 			f1: false,
@@ -482,25 +496,26 @@ registerAction2(class extends Action2 {
 		const bulkEditService = accessor.get(IBulkEditService);
 		const historyService = accessor.get(IInteractiveHistoryService);
 		const notebookEditorService = accessor.get(INotebookEditorService);
-		let editorControl: { notebookEditor: NotebookEditorWidget | undefined; codeEditor: CodeEditorWidget } | undefined;
+		let editorControl: IEditorControl | undefined;
 		if (context) {
 			const resourceUri = URI.revive(context);
-			const editors = editorService.findEditors(resourceUri)
-				.filter(id => id.editor instanceof InteractiveEditorInput && id.editor.resource?.toString() === resourceUri.toString());
-			if (editors.length) {
-				const editorInput = editors[0].editor as InteractiveEditorInput;
-				const currentGroup = editors[0].groupId;
-				const editor = await editorService.openEditor(editorInput, currentGroup);
-				editorControl = editor?.getControl() as { notebookEditor: NotebookEditorWidget | undefined; codeEditor: CodeEditorWidget } | undefined;
+			const editors = editorService.findEditors(resourceUri);
+			for (const found of editors) {
+				if (found.editor.typeId === InteractiveEditorInput.ID) {
+					const editor = await editorService.openEditor(found.editor, found.groupId);
+					editorControl = editor?.getControl();
+					break;
+				}
 			}
 		}
 		else {
-			editorControl = editorService.activeEditorPane?.getControl() as { notebookEditor: NotebookEditorWidget | undefined; codeEditor: CodeEditorWidget } | undefined;
+			editorControl = editorService.activeEditorPane?.getControl();
 		}
 
-		if (editorControl && editorControl.notebookEditor && editorControl.codeEditor) {
+
+		if (editorControl && isReplEditorControl(editorControl) && editorControl.notebookEditor) {
 			const notebookDocument = editorControl.notebookEditor.textModel;
-			const textModel = editorControl.codeEditor.getModel();
+			const textModel = editorControl.activeCodeEditor.getModel();
 			const activeKernel = editorControl.notebookEditor.activeKernel;
 			const language = activeKernel?.supportedLanguages[0] ?? PLAINTEXT_LANGUAGE_ID;
 
@@ -512,6 +527,12 @@ registerAction2(class extends Action2 {
 					return;
 				}
 
+				const ctrl = InlineChatController.get(editorControl.activeCodeEditor);
+				if (ctrl) {
+					ctrl.acceptHunk();
+				}
+
+				historyService.replaceLast(notebookDocument.uri, value);
 				historyService.addToHistory(notebookDocument.uri, '');
 				textModel.setValue('');
 
@@ -569,15 +590,15 @@ registerAction2(class extends Action2 {
 
 	async run(accessor: ServicesAccessor): Promise<void> {
 		const editorService = accessor.get(IEditorService);
-		const editorControl = editorService.activeEditorPane?.getControl() as { notebookEditor: NotebookEditorWidget | undefined; codeEditor: CodeEditorWidget } | undefined;
+		const editorControl = editorService.activeEditorPane?.getControl();
 
-		if (editorControl && editorControl.notebookEditor && editorControl.codeEditor) {
+		if (editorControl && isReplEditorControl(editorControl) && editorControl.notebookEditor) {
 			const notebookDocument = editorControl.notebookEditor.textModel;
-			const textModel = editorControl.codeEditor.getModel();
-			const range = editorControl.codeEditor.getModel()?.getFullModelRange();
+			const textModel = editorControl.activeCodeEditor.getModel();
+			const range = editorControl.activeCodeEditor.getModel()?.getFullModelRange();
 
 			if (notebookDocument && textModel && range) {
-				editorControl.codeEditor.executeEdits('', [EditOperation.replace(range, null)]);
+				editorControl.activeCodeEditor.executeEdits('', [EditOperation.replace(range, null)]);
 			}
 		}
 	}
@@ -592,7 +613,6 @@ registerAction2(class extends Action2 {
 			f1: false,
 			keybinding: {
 				when: ContextKeyExpr.and(
-					ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive'),
 					INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('bottom'),
 					INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('none'),
 					SuggestContext.Visible.toNegated()
@@ -600,17 +620,20 @@ registerAction2(class extends Action2 {
 				primary: KeyCode.UpArrow,
 				weight: KeybindingWeight.WorkbenchContrib
 			},
+			precondition: ContextKeyExpr.and(IS_COMPOSITE_NOTEBOOK, NOTEBOOK_EDITOR_FOCUSED.negate())
 		});
 	}
 
 	async run(accessor: ServicesAccessor): Promise<void> {
 		const editorService = accessor.get(IEditorService);
 		const historyService = accessor.get(IInteractiveHistoryService);
-		const editorControl = editorService.activeEditorPane?.getControl() as { notebookEditor: NotebookEditorWidget | undefined; codeEditor: CodeEditorWidget } | undefined;
+		const editorControl = editorService.activeEditorPane?.getControl();
 
-		if (editorControl && editorControl.notebookEditor && editorControl.codeEditor) {
+
+
+		if (editorControl && isReplEditorControl(editorControl) && editorControl.notebookEditor) {
 			const notebookDocument = editorControl.notebookEditor.textModel;
-			const textModel = editorControl.codeEditor.getModel();
+			const textModel = editorControl.activeCodeEditor.getModel();
 
 			if (notebookDocument && textModel) {
 				const previousValue = historyService.getPreviousValue(notebookDocument.uri);
@@ -631,7 +654,6 @@ registerAction2(class extends Action2 {
 			f1: false,
 			keybinding: {
 				when: ContextKeyExpr.and(
-					ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive'),
 					INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('top'),
 					INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('none'),
 					SuggestContext.Visible.toNegated()
@@ -639,22 +661,23 @@ registerAction2(class extends Action2 {
 				primary: KeyCode.DownArrow,
 				weight: KeybindingWeight.WorkbenchContrib
 			},
+			precondition: ContextKeyExpr.and(IS_COMPOSITE_NOTEBOOK, NOTEBOOK_EDITOR_FOCUSED.negate())
 		});
 	}
 
 	async run(accessor: ServicesAccessor): Promise<void> {
 		const editorService = accessor.get(IEditorService);
 		const historyService = accessor.get(IInteractiveHistoryService);
-		const editorControl = editorService.activeEditorPane?.getControl() as { notebookEditor: NotebookEditorWidget | undefined; codeEditor: CodeEditorWidget } | undefined;
+		const editorControl = editorService.activeEditorPane?.getControl();
 
-		if (editorControl && editorControl.notebookEditor && editorControl.codeEditor) {
+		if (editorControl && isReplEditorControl(editorControl) && editorControl.notebookEditor) {
 			const notebookDocument = editorControl.notebookEditor.textModel;
-			const textModel = editorControl.codeEditor.getModel();
+			const textModel = editorControl.activeCodeEditor.getModel();
 
 			if (notebookDocument && textModel) {
-				const previousValue = historyService.getNextValue(notebookDocument.uri);
-				if (previousValue) {
-					textModel.setValue(previousValue);
+				const nextValue = historyService.getNextValue(notebookDocument.uri);
+				if (nextValue !== null) {
+					textModel.setValue(nextValue);
 				}
 			}
 		}
@@ -679,9 +702,9 @@ registerAction2(class extends Action2 {
 
 	async run(accessor: ServicesAccessor): Promise<void> {
 		const editorService = accessor.get(IEditorService);
-		const editorControl = editorService.activeEditorPane?.getControl() as { notebookEditor: NotebookEditorWidget | undefined; codeEditor: CodeEditorWidget } | undefined;
+		const editorControl = editorService.activeEditorPane?.getControl();
 
-		if (editorControl && editorControl.notebookEditor && editorControl.codeEditor) {
+		if (editorControl && isReplEditorControl(editorControl) && editorControl.notebookEditor) {
 			if (editorControl.notebookEditor.getLength() === 0) {
 				return;
 			}
@@ -708,9 +731,9 @@ registerAction2(class extends Action2 {
 
 	async run(accessor: ServicesAccessor): Promise<void> {
 		const editorService = accessor.get(IEditorService);
-		const editorControl = editorService.activeEditorPane?.getControl() as { notebookEditor: NotebookEditorWidget | undefined; codeEditor: CodeEditorWidget } | undefined;
+		const editorControl = editorService.activeEditorPane?.getControl();
 
-		if (editorControl && editorControl.notebookEditor && editorControl.codeEditor) {
+		if (editorControl && isReplEditorControl(editorControl) && editorControl.notebookEditor) {
 			if (editorControl.notebookEditor.getLength() === 0) {
 				return;
 			}
@@ -731,15 +754,19 @@ registerAction2(class extends Action2 {
 				id: MenuId.CommandPalette,
 				when: InteractiveWindowOpen,
 			},
-			precondition: InteractiveWindowOpen,
+			keybinding: {
+				when: ContextKeyExpr.and(IS_COMPOSITE_NOTEBOOK, NOTEBOOK_EDITOR_FOCUSED),
+				weight: KeybindingWeight.WorkbenchContrib + 5,
+				primary: KeyMod.CtrlCmd | KeyCode.DownArrow
+			}
 		});
 	}
 
 	async run(accessor: ServicesAccessor): Promise<void> {
 		const editorService = accessor.get(IEditorService);
-		const editorControl = editorService.activeEditorPane?.getControl() as { notebookEditor: NotebookEditorWidget | undefined; codeEditor: CodeEditorWidget } | undefined;
+		const editorControl = editorService.activeEditorPane?.getControl();
 
-		if (editorControl && editorControl.notebookEditor && editorControl.codeEditor) {
+		if (editorControl && isReplEditorControl(editorControl) && editorControl.notebookEditor) {
 			editorService.activeEditorPane?.focus();
 		}
 		else {
@@ -750,9 +777,9 @@ registerAction2(class extends Action2 {
 				const editorInput = interactiveWindow.editor as InteractiveEditorInput;
 				const currentGroup = interactiveWindow.groupId;
 				const editor = await editorService.openEditor(editorInput, currentGroup);
-				const editorControl = editor?.getControl() as { notebookEditor: NotebookEditorWidget | undefined; codeEditor: CodeEditorWidget } | undefined;
+				const editorControl = editor?.getControl();
 
-				if (editorControl && editorControl.notebookEditor && editorControl.codeEditor) {
+				if (editorControl && isReplEditorControl(editorControl) && editorControl.notebookEditor) {
 					editorService.activeEditorPane?.focus();
 				}
 			}
@@ -770,15 +797,28 @@ registerAction2(class extends Action2 {
 				id: MenuId.CommandPalette,
 				when: ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive'),
 			},
-			precondition: ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive'),
+			keybinding: [{
+				// On mac, require that the cursor is at the top of the input, to avoid stealing cmd+up to move the cursor to the top
+				when: ContextKeyExpr.and(
+					INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('bottom'),
+					INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('none')),
+				weight: KeybindingWeight.WorkbenchContrib + 5,
+				primary: KeyMod.CtrlCmd | KeyCode.UpArrow
+			},
+			{
+				when: ContextKeyExpr.or(IsWindowsContext, IsLinuxContext),
+				weight: KeybindingWeight.WorkbenchContrib,
+				primary: KeyMod.CtrlCmd | KeyCode.UpArrow,
+			}],
+			precondition: ContextKeyExpr.and(IS_COMPOSITE_NOTEBOOK, NOTEBOOK_EDITOR_FOCUSED.negate())
 		});
 	}
 
 	async run(accessor: ServicesAccessor): Promise<void> {
 		const editorService = accessor.get(IEditorService);
-		const editorControl = editorService.activeEditorPane?.getControl() as { notebookEditor: NotebookEditorWidget | undefined; codeEditor: CodeEditorWidget; focusHistory: () => void } | undefined;
+		const editorControl = editorService.activeEditorPane?.getControl();
 
-		if (editorControl && editorControl.notebookEditor && editorControl.codeEditor) {
+		if (editorControl && isReplEditorControl(editorControl) && editorControl.notebookEditor) {
 			editorControl.notebookEditor.focus();
 		}
 	}
@@ -814,10 +854,17 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).regis
 			default: false,
 			markdownDescription: localize('interactiveWindow.promptToSaveOnClose', "Prompt to save the interactive window when it is closed. Only new interactive windows will be affected by this setting change.")
 		},
-		['interactiveWindow.executeWithShiftEnter']: {
+		[InteractiveWindowSetting.executeWithShiftEnter]: {
 			type: 'boolean',
 			default: false,
-			markdownDescription: localize('interactiveWindow.executeWithShiftEnter', "Execute the interactive window (REPL) input box with shift+enter, so that enter can be used to create a newline.")
+			markdownDescription: localize('interactiveWindow.executeWithShiftEnter', "Execute the Interactive Window (REPL) input box with shift+enter, so that enter can be used to create a newline."),
+			tags: ['replExecute']
+		},
+		[InteractiveWindowSetting.showExecutionHint]: {
+			type: 'boolean',
+			default: true,
+			markdownDescription: localize('interactiveWindow.showExecutionHint', "Display a hint in the Interactive Window (REPL) input box to indicate how to execute code."),
+			tags: ['replExecute']
 		}
 	}
 });
diff --git a/src/vs/workbench/contrib/interactive/browser/interactiveCommon.ts b/src/vs/workbench/contrib/interactive/browser/interactiveCommon.ts
index 46a52d9b844..f42d31dc7d9 100644
--- a/src/vs/workbench/contrib/interactive/browser/interactiveCommon.ts
+++ b/src/vs/workbench/contrib/interactive/browser/interactiveCommon.ts
@@ -3,10 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 
 export const INTERACTIVE_INPUT_CURSOR_BOUNDARY = new RawContextKey<'none' | 'top' | 'bottom' | 'both'>('interactiveInputCursorAtBoundary', 'none');
 
 export const InteractiveWindowSetting = {
-	interactiveWindowAlwaysScrollOnNewCell: 'interactiveWindow.alwaysScrollOnNewCell'
+	interactiveWindowAlwaysScrollOnNewCell: 'interactiveWindow.alwaysScrollOnNewCell',
+	executeWithShiftEnter: 'interactiveWindow.executeWithShiftEnter',
+	showExecutionHint: 'interactiveWindow.showExecutionHint'
 };
diff --git a/src/vs/workbench/contrib/interactive/browser/interactiveDocumentService.ts b/src/vs/workbench/contrib/interactive/browser/interactiveDocumentService.ts
index dafe8653915..61306699c3c 100644
--- a/src/vs/workbench/contrib/interactive/browser/interactiveDocumentService.ts
+++ b/src/vs/workbench/contrib/interactive/browser/interactiveDocumentService.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 
 export const IInteractiveDocumentService = createDecorator<IInteractiveDocumentService>('IInteractiveDocumentService');
 
diff --git a/src/vs/workbench/contrib/interactive/browser/interactiveEditor.css b/src/vs/workbench/contrib/interactive/browser/interactiveEditor.css
index d43c6a6e98b..b34478d5eac 100644
--- a/src/vs/workbench/contrib/interactive/browser/interactiveEditor.css
+++ b/src/vs/workbench/contrib/interactive/browser/interactiveEditor.css
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-.interactive-editor .input-cell-container:focus-within .input-editor-container .monaco-editor {
+.interactive-editor .input-cell-container:focus-within .input-editor-container>.monaco-editor {
 	outline: solid 1px var(--vscode-notebook-focusedCellBorder);
 }
 
-.interactive-editor .input-cell-container .input-editor-container .monaco-editor {
+.interactive-editor .input-cell-container .input-editor-container>.monaco-editor {
 	outline: solid 1px var(--vscode-notebook-inactiveFocusedCellBorder);
 }
 
diff --git a/src/vs/workbench/contrib/interactive/browser/interactiveEditor.ts b/src/vs/workbench/contrib/interactive/browser/interactiveEditor.ts
index ba994f540b6..0c6bb6a516f 100644
--- a/src/vs/workbench/contrib/interactive/browser/interactiveEditor.ts
+++ b/src/vs/workbench/contrib/interactive/browser/interactiveEditor.ts
@@ -3,66 +3,69 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/interactive';
-import * as nls from 'vs/nls';
-import * as DOM from 'vs/base/browser/dom';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { ICodeEditorViewState, IDecorationOptions } from 'vs/editor/common/editorCommon';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { editorForeground, resolveColorValue } from 'vs/platform/theme/common/colorRegistry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
-import { EditorPaneSelectionChangeReason, IEditorMemento, IEditorOpenContext, IEditorPaneScrollPosition, IEditorPaneSelectionChangeEvent, IEditorPaneWithScrolling } from 'vs/workbench/common/editor';
-import { getSimpleEditorOptions } from 'vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
-import { InteractiveEditorInput } from 'vs/workbench/contrib/interactive/browser/interactiveEditorInput';
-import { ICellViewModel, INotebookEditorOptions, INotebookEditorViewState } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NotebookEditorExtensionsRegistry } from 'vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
-import { IBorrowValue, INotebookEditorService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorService';
-import { NotebookEditorWidget } from 'vs/workbench/contrib/notebook/browser/notebookEditorWidget';
-import { GroupsOrder, IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { ExecutionStateCellStatusBarContrib, TimerCellStatusBarContrib } from 'vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController';
-import { INotebookKernelService } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IMenuService, MenuId } from 'vs/platform/actions/common/actions';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { InteractiveWindowSetting, INTERACTIVE_INPUT_CURSOR_BOUNDARY } from 'vs/workbench/contrib/interactive/browser/interactiveCommon';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { NotebookOptions } from 'vs/workbench/contrib/notebook/browser/notebookOptions';
-import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { createActionViewItem, createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IAction } from 'vs/base/common/actions';
-import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
-import { ParameterHintsController } from 'vs/editor/contrib/parameterHints/browser/parameterHints';
-import { MenuPreventer } from 'vs/workbench/contrib/codeEditor/browser/menuPreventer';
-import { SelectionClipboardContributionID } from 'vs/workbench/contrib/codeEditor/browser/selectionClipboard';
-import { ContextMenuController } from 'vs/editor/contrib/contextmenu/browser/contextmenu';
-import { SuggestController } from 'vs/editor/contrib/suggest/browser/suggestController';
-import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2';
-import { TabCompletionController } from 'vs/workbench/contrib/snippets/browser/tabCompletion';
-import { MarkerController } from 'vs/editor/contrib/gotoError/browser/gotoError';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { ITextEditorOptions, TextEditorSelectionSource } from 'vs/platform/editor/common/editor';
-import { INotebookExecutionStateService, NotebookExecutionType } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
-import { NOTEBOOK_KERNEL } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { ICursorPositionChangedEvent } from 'vs/editor/common/cursorEvents';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { isEqual } from 'vs/base/common/resources';
-import { NotebookFindContrib } from 'vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget';
-import { INTERACTIVE_WINDOW_EDITOR_ID } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import 'vs/css!./interactiveEditor';
-import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { deepClone } from 'vs/base/common/objects';
-import { HoverController } from 'vs/editor/contrib/hover/browser/hoverController';
+import './media/interactive.css';
+import * as DOM from '../../../../base/browser/dom.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { CodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { ICodeEditorViewState, ICompositeCodeEditor } from '../../../../editor/common/editorCommon.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { EditorPane } from '../../../browser/parts/editor/editorPane.js';
+import { EditorPaneSelectionChangeReason, IEditorMemento, IEditorOpenContext, IEditorPaneScrollPosition, IEditorPaneSelectionChangeEvent, IEditorPaneWithScrolling } from '../../../common/editor.js';
+import { getSimpleEditorOptions } from '../../codeEditor/browser/simpleEditorOptions.js';
+import { InteractiveEditorInput } from './interactiveEditorInput.js';
+import { ICellViewModel, INotebookEditorOptions, INotebookEditorViewState } from '../../notebook/browser/notebookBrowser.js';
+import { NotebookEditorExtensionsRegistry } from '../../notebook/browser/notebookEditorExtensions.js';
+import { IBorrowValue, INotebookEditorService } from '../../notebook/browser/services/notebookEditorService.js';
+import { NotebookEditorWidget } from '../../notebook/browser/notebookEditorWidget.js';
+import { GroupsOrder, IEditorGroup, IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { ExecutionStateCellStatusBarContrib, TimerCellStatusBarContrib } from '../../notebook/browser/contrib/cellStatusBar/executionStatusBarItemController.js';
+import { INotebookKernelService } from '../../notebook/common/notebookKernelService.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../../../../editor/common/languages/modesRegistry.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { IMenuService, MenuId } from '../../../../platform/actions/common/actions.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { InteractiveWindowSetting, INTERACTIVE_INPUT_CURSOR_BOUNDARY } from './interactiveCommon.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { NotebookOptions } from '../../notebook/browser/notebookOptions.js';
+import { ToolBar } from '../../../../base/browser/ui/toolbar/toolbar.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { createActionViewItem, createAndFillInActionBarActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IAction } from '../../../../base/common/actions.js';
+import { EditorExtensionsRegistry } from '../../../../editor/browser/editorExtensions.js';
+import { ParameterHintsController } from '../../../../editor/contrib/parameterHints/browser/parameterHints.js';
+import { MenuPreventer } from '../../codeEditor/browser/menuPreventer.js';
+import { SelectionClipboardContributionID } from '../../codeEditor/browser/selectionClipboard.js';
+import { ContextMenuController } from '../../../../editor/contrib/contextmenu/browser/contextmenu.js';
+import { SuggestController } from '../../../../editor/contrib/suggest/browser/suggestController.js';
+import { SnippetController2 } from '../../../../editor/contrib/snippet/browser/snippetController2.js';
+import { TabCompletionController } from '../../snippets/browser/tabCompletion.js';
+import { MarkerController } from '../../../../editor/contrib/gotoError/browser/gotoError.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { ITextEditorOptions, TextEditorSelectionSource } from '../../../../platform/editor/common/editor.js';
+import { INotebookExecutionStateService, NotebookExecutionType } from '../../notebook/common/notebookExecutionStateService.js';
+import { NOTEBOOK_KERNEL } from '../../notebook/common/notebookContextKeys.js';
+import { ICursorPositionChangedEvent } from '../../../../editor/common/cursorEvents.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { NotebookFindContrib } from '../../notebook/browser/contrib/find/notebookFindWidget.js';
+import { INTERACTIVE_WINDOW_EDITOR_ID } from '../../notebook/common/notebookCommon.js';
+import './interactiveEditor.css';
+import { IEditorOptions } from '../../../../editor/common/config/editorOptions.js';
+import { deepClone } from '../../../../base/common/objects.js';
+import { ContentHoverController } from '../../../../editor/contrib/hover/browser/contentHoverController.js';
+import { GlyphHoverController } from '../../../../editor/contrib/hover/browser/glyphHoverController.js';
+import { ReplInputHintContentWidget } from './replInputHintContentWidget.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { INLINE_CHAT_ID } from '../../inlineChat/common/inlineChat.js';
+import { ReplEditorControl } from '../../replNotebook/browser/replEditor.js';
 
 const DECORATION_KEY = 'interactiveInputDecoration';
 const INTERACTIVE_EDITOR_VIEW_STATE_PREFERENCE_KEY = 'InteractiveEditorViewState';
@@ -71,6 +74,7 @@ const INPUT_CELL_VERTICAL_PADDING = 8;
 const INPUT_CELL_HORIZONTAL_PADDING_RIGHT = 10;
 const INPUT_EDITOR_PADDING = 8;
 
+
 export interface InteractiveEditorViewState {
 	readonly notebook?: INotebookEditorViewState;
 	readonly input?: ICodeEditorViewState | null;
@@ -109,6 +113,7 @@ export class InteractiveEditor extends EditorPane implements IEditorPaneWithScro
 	private _editorMemento: IEditorMemento<InteractiveEditorViewState>;
 	private readonly _groupListener = this._register(new MutableDisposable());
 	private _runbuttonToolbar: ToolBar | undefined;
+	private _hintElement: ReplInputHintContentWidget | undefined;
 
 	private _onDidFocusWidget = this._register(new Emitter<void>());
 	override get onDidFocus(): Event<void> { return this._onDidFocusWidget.event; }
@@ -144,9 +149,7 @@ export class InteractiveEditor extends EditorPane implements IEditorPaneWithScro
 			themeService,
 			storageService
 		);
-		this._instantiationService = instantiationService;
 		this._notebookWidgetService = notebookWidgetService;
-		this._contextKeyService = contextKeyService;
 		this._configurationService = configurationService;
 		this._notebookKernelService = notebookKernelService;
 		this._languageService = languageService;
@@ -157,17 +160,22 @@ export class InteractiveEditor extends EditorPane implements IEditorPaneWithScro
 		this._notebookExecutionStateService = notebookExecutionStateService;
 		this._extensionService = extensionService;
 
+		this._rootElement = DOM.$('.interactive-editor');
+		this._contextKeyService = this._register(contextKeyService.createScoped(this._rootElement));
+		this._contextKeyService.createKey('isCompositeNotebook', true);
+		this._instantiationService = this._register(instantiationService.createChild(new ServiceCollection([IContextKeyService, this._contextKeyService])));
+
 		this._editorOptions = this._computeEditorOptions();
 		this._register(this._configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration('editor') || e.affectsConfiguration('notebook')) {
 				this._editorOptions = this._computeEditorOptions();
 			}
 		}));
-		this._notebookOptions = new NotebookOptions(this.window, configurationService, notebookExecutionStateService, codeEditorService, true, { cellToolbarInteraction: 'hover', globalToolbar: true, stickyScrollEnabled: false, dragAndDropEnabled: false });
+		this._notebookOptions = instantiationService.createInstance(NotebookOptions, this.window, true, { cellToolbarInteraction: 'hover', globalToolbar: true, stickyScrollEnabled: false, dragAndDropEnabled: false });
 		this._editorMemento = this.getEditorMemento<InteractiveEditorViewState>(editorGroupService, textResourceConfigurationService, INTERACTIVE_EDITOR_VIEW_STATE_PREFERENCE_KEY);
 
 		codeEditorService.registerDecorationType('interactive-decoration', DECORATION_KEY, {});
-		this._register(this._keybindingService.onDidUpdateKeybindings(this._updateInputDecoration, this));
+		this._register(this._keybindingService.onDidUpdateKeybindings(this._updateInputHint, this));
 		this._register(this._notebookExecutionStateService.onDidChangeExecution((e) => {
 			if (e.type === NotebookExecutionType.cell && isEqual(e.notebook, this._notebookWidget.value?.viewModel?.notebookDocument.uri)) {
 				const cell = this._notebookWidget.value?.getCellByHandle(e.cellHandle);
@@ -187,7 +195,7 @@ export class InteractiveEditor extends EditorPane implements IEditorPaneWithScro
 	}
 
 	protected createEditor(parent: HTMLElement): void {
-		this._rootElement = DOM.append(parent, DOM.$('.interactive-editor'));
+		DOM.append(parent, this._rootElement);
 		this._rootElement.style.position = 'relative';
 		this._notebookEditorContainer = DOM.append(this._rootElement, DOM.$('.notebook-editor-container'));
 		this._inputCellContainer = DOM.append(this._rootElement, DOM.$('.input-cell-container'));
@@ -361,8 +369,8 @@ export class InteractiveEditor extends EditorPane implements IEditorPaneWithScro
 
 		this._widgetDisposableStore.clear();
 
-		this._notebookWidget = <IBorrowValue<NotebookEditorWidget>>this._instantiationService.invokeFunction(this._notebookWidgetService.retrieveWidget, this.group, notebookInput, {
-			isEmbedded: true,
+		this._notebookWidget = <IBorrowValue<NotebookEditorWidget>>this._instantiationService.invokeFunction(this._notebookWidgetService.retrieveWidget, this.group.id, notebookInput, {
+			isReplHistory: true,
 			isReadOnly: true,
 			contributions: NotebookEditorExtensionsRegistry.getSomeEditorContributions([
 				ExecutionStateCellStatusBarContrib.id,
@@ -381,7 +389,8 @@ export class InteractiveEditor extends EditorPane implements IEditorPaneWithScro
 			cellEditorContributions: EditorExtensionsRegistry.getSomeEditorContributions([
 				SelectionClipboardContributionID,
 				ContextMenuController.ID,
-				HoverController.ID,
+				ContentHoverController.ID,
+				GlyphHoverController.ID,
 				MarkerController.ID
 			]),
 			options: this._notebookOptions,
@@ -399,8 +408,10 @@ export class InteractiveEditor extends EditorPane implements IEditorPaneWithScro
 					ParameterHintsController.ID,
 					SnippetController2.ID,
 					TabCompletionController.ID,
-					HoverController.ID,
-					MarkerController.ID
+					ContentHoverController.ID,
+					GlyphHoverController.ID,
+					MarkerController.ID,
+					INLINE_CHAT_ID
 				])
 			}
 		});
@@ -485,16 +496,32 @@ export class InteractiveEditor extends EditorPane implements IEditorPaneWithScro
 
 		this._widgetDisposableStore.add(this.themeService.onDidColorThemeChange(() => {
 			if (this.isVisible()) {
-				this._updateInputDecoration();
+				this._updateInputHint();
 			}
 		}));
 
 		this._widgetDisposableStore.add(this._codeEditorWidget.onDidChangeModelContent(() => {
 			if (this.isVisible()) {
-				this._updateInputDecoration();
+				this._updateInputHint();
 			}
 		}));
 
+		this._codeEditorWidget.onDidChangeModelDecorations(() => {
+			if (this.isVisible()) {
+				this._updateInputHint();
+			}
+		});
+
+		this._widgetDisposableStore.add(this._codeEditorWidget.onDidChangeModel(() => {
+			this._updateInputHint();
+		}));
+
+		this._configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(InteractiveWindowSetting.showExecutionHint)) {
+				this._updateInputHint();
+			}
+		});
+
 		const cursorAtBoundaryContext = INTERACTIVE_INPUT_CURSOR_BOUNDARY.bindTo(this._contextKeyService);
 		if (input.resource && input.historyService.has(input.resource)) {
 			cursorAtBoundaryContext.set('top');
@@ -527,14 +554,19 @@ export class InteractiveEditor extends EditorPane implements IEditorPaneWithScro
 
 		this._widgetDisposableStore.add(editorModel.onDidChangeContent(() => {
 			const value = editorModel.getValue();
-			if (this.input?.resource && value !== '') {
-				(this.input as InteractiveEditorInput).historyService.replaceLast(this.input.resource, value);
+			if (this.input?.resource) {
+				const historyService = (this.input as InteractiveEditorInput).historyService;
+				if (!historyService.matchesCurrent(this.input.resource, value)) {
+					historyService.replaceLast(this.input.resource, value);
+				}
 			}
 		}));
 
 		this._widgetDisposableStore.add(this._notebookWidget.value!.onDidScroll(() => this._onDidChangeScroll.fire()));
 
 		this._syncWithKernel();
+
+		this._updateInputHint();
 	}
 
 	override setOptions(options: INotebookEditorOptions | undefined): void {
@@ -591,8 +623,6 @@ export class InteractiveEditor extends EditorPane implements IEditorPaneWithScro
 				NOTEBOOK_KERNEL.bindTo(this._contextKeyService).set(selectedOrSuggested.id);
 			}
 		}
-
-		this._updateInputDecoration();
 	}
 
 	layout(dimension: DOM.Dimension, position: DOM.IDomPosition): void {
@@ -632,41 +662,32 @@ export class InteractiveEditor extends EditorPane implements IEditorPaneWithScro
 		return new DOM.Dimension(Math.max(0, width), Math.max(0, height));
 	}
 
-	private _updateInputDecoration(): void {
+	private _hasConflictingDecoration() {
+		return Boolean(this._codeEditorWidget.getLineDecorations(1)?.find((d) =>
+			d.options.beforeContentClassName
+			|| d.options.afterContentClassName
+			|| d.options.before?.content
+			|| d.options.after?.content
+		));
+	}
+
+	private _updateInputHint(): void {
 		if (!this._codeEditorWidget) {
 			return;
 		}
 
-		if (!this._codeEditorWidget.hasModel()) {
-			return;
+		const shouldHide =
+			!this._codeEditorWidget.hasModel() ||
+			this._configurationService.getValue<boolean>(InteractiveWindowSetting.showExecutionHint) === false ||
+			this._codeEditorWidget.getModel()!.getValueLength() !== 0 ||
+			this._hasConflictingDecoration();
+
+		if (!this._hintElement && !shouldHide) {
+			this._hintElement = this._instantiationService.createInstance(ReplInputHintContentWidget, this._codeEditorWidget);
+		} else if (this._hintElement && shouldHide) {
+			this._hintElement.dispose();
+			this._hintElement = undefined;
 		}
-
-		const model = this._codeEditorWidget.getModel();
-
-		const decorations: IDecorationOptions[] = [];
-
-		if (model?.getValueLength() === 0) {
-			const transparentForeground = resolveColorValue(editorForeground, this.themeService.getColorTheme())?.transparent(0.4);
-			const languageId = model.getLanguageId();
-			const keybinding = this._keybindingService.lookupKeybinding('interactive.execute', this._contextKeyService)?.getLabel();
-			const text = nls.localize('interactiveInputPlaceHolder', "Type '{0}' code here and press {1} to run", languageId, keybinding ?? 'ctrl+enter');
-			decorations.push({
-				range: {
-					startLineNumber: 0,
-					endLineNumber: 0,
-					startColumn: 0,
-					endColumn: 1
-				},
-				renderOptions: {
-					after: {
-						contentText: text,
-						color: transparentForeground ? transparentForeground.toString() : undefined
-					}
-				}
-			});
-		}
-
-		this._codeEditorWidget.setDecorationsByType('interactive-decoration', DECORATION_KEY, decorations);
 	}
 
 	getScrollPosition(): IEditorPaneScrollPosition {
@@ -701,6 +722,8 @@ export class InteractiveEditor extends EditorPane implements IEditorPaneWithScro
 				this._notebookWidget.value.onWillHide();
 			}
 		}
+
+		this._updateInputHint();
 	}
 
 	override clearInput() {
@@ -717,10 +740,11 @@ export class InteractiveEditor extends EditorPane implements IEditorPaneWithScro
 		super.clearInput();
 	}
 
-	override getControl(): { notebookEditor: NotebookEditorWidget | undefined; codeEditor: CodeEditorWidget } {
+	override getControl(): ReplEditorControl & ICompositeCodeEditor {
 		return {
 			notebookEditor: this._notebookWidget.value,
-			codeEditor: this._codeEditorWidget
+			activeCodeEditor: this._codeEditorWidget,
+			onDidChangeActiveEditor: Event.None
 		};
 	}
 }
diff --git a/src/vs/workbench/contrib/interactive/browser/interactiveEditorInput.ts b/src/vs/workbench/contrib/interactive/browser/interactiveEditorInput.ts
index b7254439539..122dd42bfaa 100644
--- a/src/vs/workbench/contrib/interactive/browser/interactiveEditorInput.ts
+++ b/src/vs/workbench/contrib/interactive/browser/interactiveEditorInput.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { IReference } from 'vs/base/common/lifecycle';
-import * as paths from 'vs/base/common/path';
-import { isEqual, joinPath } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { IResolvedTextEditorModel, ITextModelService } from 'vs/editor/common/services/resolverService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { EditorInputCapabilities, GroupIdentifier, IRevertOptions, ISaveOptions, IUntypedEditorInput } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { IInteractiveDocumentService } from 'vs/workbench/contrib/interactive/browser/interactiveDocumentService';
-import { IInteractiveHistoryService } from 'vs/workbench/contrib/interactive/browser/interactiveHistoryService';
-import { IResolvedNotebookEditorModel, NotebookSetting } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { ICompositeNotebookEditorInput, NotebookEditorInput } from 'vs/workbench/contrib/notebook/common/notebookEditorInput';
-import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
+import { Event } from '../../../../base/common/event.js';
+import { IReference } from '../../../../base/common/lifecycle.js';
+import * as paths from '../../../../base/common/path.js';
+import { isEqual, joinPath } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../../../../editor/common/languages/modesRegistry.js';
+import { IResolvedTextEditorModel, ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { EditorInputCapabilities, GroupIdentifier, IRevertOptions, ISaveOptions, IUntypedEditorInput } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { IInteractiveDocumentService } from './interactiveDocumentService.js';
+import { IInteractiveHistoryService } from './interactiveHistoryService.js';
+import { IResolvedNotebookEditorModel, NotebookSetting } from '../../notebook/common/notebookCommon.js';
+import { ICompositeNotebookEditorInput, NotebookEditorInput } from '../../notebook/common/notebookEditorInput.js';
+import { INotebookService } from '../../notebook/common/notebookService.js';
 
 export class InteractiveEditorInput extends EditorInput implements ICompositeNotebookEditorInput {
 	static create(instantiationService: IInstantiationService, resource: URI, inputResource: URI, title?: string, language?: string) {
diff --git a/src/vs/workbench/contrib/interactive/browser/interactiveHistoryService.ts b/src/vs/workbench/contrib/interactive/browser/interactiveHistoryService.ts
index cdfbf09592b..1c8e90c04c8 100644
--- a/src/vs/workbench/contrib/interactive/browser/interactiveHistoryService.ts
+++ b/src/vs/workbench/contrib/interactive/browser/interactiveHistoryService.ts
@@ -3,17 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { HistoryNavigator2 } from 'vs/base/common/history';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ResourceMap } from 'vs/base/common/map';
-import { URI } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { HistoryNavigator2 } from '../../../../base/common/history.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { URI } from '../../../../base/common/uri.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 
 export const IInteractiveHistoryService = createDecorator<IInteractiveHistoryService>('IInteractiveHistoryService');
 
 export interface IInteractiveHistoryService {
 	readonly _serviceBrand: undefined;
 
+	matchesCurrent(uri: URI, value: string): boolean;
 	addToHistory(uri: URI, value: string): void;
 	getPreviousValue(uri: URI): string | null;
 	getNextValue(uri: URI): string | null;
@@ -32,19 +33,26 @@ export class InteractiveHistoryService extends Disposable implements IInteractiv
 		this._history = new ResourceMap<HistoryNavigator2<string>>();
 	}
 
+	matchesCurrent(uri: URI, value: string): boolean {
+		const history = this._history.get(uri);
+		if (!history) {
+			return false;
+		}
+
+		return history.current() === value;
+	}
+
 	addToHistory(uri: URI, value: string): void {
-		if (!this._history.has(uri)) {
+		const history = this._history.get(uri);
+		if (!history) {
 			this._history.set(uri, new HistoryNavigator2<string>([value], 50));
 			return;
 		}
 
-		const history = this._history.get(uri)!;
-
 		history.resetCursor();
-		if (history?.current() !== value) {
-			history?.add(value);
-		}
+		history.add(value);
 	}
+
 	getPreviousValue(uri: URI): string | null {
 		const history = this._history.get(uri);
 		return history?.previous() ?? null;
@@ -57,16 +65,14 @@ export class InteractiveHistoryService extends Disposable implements IInteractiv
 	}
 
 	replaceLast(uri: URI, value: string) {
-		if (!this._history.has(uri)) {
+		const history = this._history.get(uri);
+		if (!history) {
 			this._history.set(uri, new HistoryNavigator2<string>([value], 50));
 			return;
 		} else {
-			const history = this._history.get(uri);
-			if (history?.current() !== value) {
-				history?.replaceLast(value);
-			}
+			history.replaceLast(value);
+			history.resetCursor();
 		}
-
 	}
 
 	clearHistory(uri: URI) {
diff --git a/src/vs/workbench/contrib/interactive/browser/replInputHintContentWidget.ts b/src/vs/workbench/contrib/interactive/browser/replInputHintContentWidget.ts
new file mode 100644
index 00000000000..4b83bb64f01
--- /dev/null
+++ b/src/vs/workbench/contrib/interactive/browser/replInputHintContentWidget.ts
@@ -0,0 +1,162 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from '../../../../base/browser/dom.js';
+import { status } from '../../../../base/browser/ui/aria/aria.js';
+import { KeybindingLabel } from '../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
+import { Event } from '../../../../base/common/event.js';
+import { ResolvedKeybinding } from '../../../../base/common/keybindings.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { OS } from '../../../../base/common/platform.js';
+import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from '../../../../editor/browser/editorBrowser.js';
+import { ConfigurationChangedEvent, EditorOption } from '../../../../editor/common/config/editorOptions.js';
+import { localize } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
+import { AccessibilityCommandId } from '../../accessibility/common/accessibilityCommands.js';
+import { InteractiveWindowSetting } from './interactiveCommon.js';
+
+
+export class ReplInputHintContentWidget extends Disposable implements IContentWidget {
+
+	private static readonly ID = 'replInput.widget.emptyHint';
+
+	private domNode: HTMLElement | undefined;
+	private ariaLabel: string = '';
+
+	constructor(
+		private readonly editor: ICodeEditor,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IKeybindingService private readonly keybindingService: IKeybindingService,
+	) {
+		super();
+
+		this._register(this.editor.onDidChangeConfiguration((e: ConfigurationChangedEvent) => {
+			if (this.domNode && e.hasChanged(EditorOption.fontInfo)) {
+				this.editor.applyFontInfo(this.domNode);
+			}
+		}));
+		const onDidFocusEditorText = Event.debounce(this.editor.onDidFocusEditorText, () => undefined, 500);
+		this._register(onDidFocusEditorText(() => {
+			if (this.editor.hasTextFocus() && this.ariaLabel && configurationService.getValue(AccessibilityVerbositySettingId.ReplInputHint)) {
+				status(this.ariaLabel);
+			}
+		}));
+		this._register(configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(InteractiveWindowSetting.executeWithShiftEnter)) {
+				this.setHint();
+			}
+		}));
+		this.editor.addContentWidget(this);
+	}
+
+	getId(): string {
+		return ReplInputHintContentWidget.ID;
+	}
+
+	getPosition(): IContentWidgetPosition | null {
+		return {
+			position: { lineNumber: 1, column: 1 },
+			preference: [ContentWidgetPositionPreference.EXACT]
+		};
+	}
+
+	getDomNode(): HTMLElement {
+		if (!this.domNode) {
+			this.domNode = dom.$('.empty-editor-hint');
+			this.domNode.style.width = 'max-content';
+			this.domNode.style.paddingLeft = '4px';
+
+			this.setHint();
+
+			this._register(dom.addDisposableListener(this.domNode, 'click', () => {
+				this.editor.focus();
+			}));
+
+			this.editor.applyFontInfo(this.domNode);
+		}
+
+		return this.domNode;
+	}
+
+	private setHint() {
+		if (!this.domNode) {
+			return;
+		}
+		while (this.domNode.firstChild) {
+			this.domNode.removeChild(this.domNode.firstChild);
+		}
+
+		const hintElement = dom.$('div.empty-hint-text');
+		hintElement.style.cursor = 'text';
+		hintElement.style.whiteSpace = 'nowrap';
+
+		const keybinding = this.getKeybinding();
+		const keybindingHintLabel = keybinding?.getLabel();
+
+		if (keybinding && keybindingHintLabel) {
+			const actionPart = localize('emptyHintText', 'Press {0} to execute. ', keybindingHintLabel);
+
+			const [before, after] = actionPart.split(keybindingHintLabel).map((fragment) => {
+				const hintPart = dom.$('span', undefined, fragment);
+				hintPart.style.fontStyle = 'italic';
+				return hintPart;
+			});
+
+			hintElement.appendChild(before);
+
+			const label = new KeybindingLabel(hintElement, OS);
+			label.set(keybinding);
+			label.element.style.width = 'min-content';
+			label.element.style.display = 'inline';
+
+			hintElement.appendChild(after);
+			this.domNode.append(hintElement);
+
+			const helpKeybinding = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getLabel();
+			const helpInfo = helpKeybinding
+				? localize('ReplInputAriaLabelHelp', "Use {0} for accessibility help. ", helpKeybinding)
+				: localize('ReplInputAriaLabelHelpNoKb', "Run the Open Accessibility Help command for more information. ");
+
+			this.ariaLabel = helpInfo.concat(actionPart, localize('disableHint', ' Toggle {0} in settings to disable this hint.', AccessibilityVerbositySettingId.ReplInputHint));
+		}
+	}
+
+	private getKeybinding() {
+		const keybindings = this.keybindingService.lookupKeybindings('interactive.execute');
+		const shiftEnterConfig = this.configurationService.getValue(InteractiveWindowSetting.executeWithShiftEnter);
+		const hasEnterChord = (kb: ResolvedKeybinding, modifier: string = '') => {
+			const chords = kb.getDispatchChords();
+			const chord = modifier + 'Enter';
+			const chordAlt = modifier + '[Enter]';
+			return chords.length === 1 && (chords[0] === chord || chords[0] === chordAlt);
+		};
+
+		if (shiftEnterConfig) {
+			const keybinding = keybindings.find(kb => hasEnterChord(kb, 'shift+'));
+			if (keybinding) {
+				return keybinding;
+			}
+		} else {
+			let keybinding = keybindings.find(kb => hasEnterChord(kb));
+			if (keybinding) {
+				return keybinding;
+			}
+			keybinding = this.keybindingService.lookupKeybindings('python.execInREPLEnter')
+				.find(kb => hasEnterChord(kb));
+			if (keybinding) {
+				return keybinding;
+			}
+		}
+
+		return keybindings?.[0];
+	}
+
+	override dispose(): void {
+		super.dispose();
+		this.editor.removeContentWidget(this);
+	}
+}
diff --git a/src/vs/workbench/contrib/issue/browser/issue.ts b/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts
similarity index 80%
rename from src/vs/workbench/contrib/issue/browser/issue.ts
rename to src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts
index 2fe7f6879ab..0fbc0b71baa 100644
--- a/src/vs/workbench/contrib/issue/browser/issue.ts
+++ b/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts
@@ -2,24 +2,28 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IProductConfiguration } from 'vs/base/common/product';
-import { $, createStyleSheet, reset, windowOpenNoOpener } from 'vs/base/browser/dom';
-import { Button, unthemedButtonStyles } from 'vs/base/browser/ui/button/button';
-import { renderIcon } from 'vs/base/browser/ui/iconLabel/iconLabels';
-import { Delayer, RunOnceScheduler } from 'vs/base/common/async';
-import { Codicon } from 'vs/base/common/codicons';
-import { debounce } from 'vs/base/common/decorators';
-import { CancellationError } from 'vs/base/common/errors';
-import { isLinuxSnap } from 'vs/base/common/platform';
-import { escape } from 'vs/base/common/strings';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { IIssueMainService, IssueReporterData, IssueReporterExtensionData, IssueReporterStyles, IssueType } from 'vs/platform/issue/common/issue';
-import { normalizeGitHubUrl } from 'vs/platform/issue/common/issueReporterUtil';
-import { getIconsStyleSheet } from 'vs/platform/theme/browser/iconsStyleSheet';
-import { IssueReporterModel, IssueReporterData as IssueReporterModelData } from 'vs/workbench/contrib/issue/browser/issueReporterModel';
-import { mainWindow } from 'vs/base/browser/window';
+import { $, createStyleSheet, isHTMLInputElement, isHTMLTextAreaElement, reset, windowOpenNoOpener } from '../../../../base/browser/dom.js';
+import { Button, unthemedButtonStyles } from '../../../../base/browser/ui/button/button.js';
+import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { Delayer, RunOnceScheduler } from '../../../../base/common/async.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { groupBy } from '../../../../base/common/collections.js';
+import { debounce } from '../../../../base/common/decorators.js';
+import { CancellationError } from '../../../../base/common/errors.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { isLinuxSnap, isMacintosh } from '../../../../base/common/platform.js';
+import { IProductConfiguration } from '../../../../base/common/product.js';
+import { escape } from '../../../../base/common/strings.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { URI } from '../../../../base/common/uri.js';
+import { localize } from '../../../../nls.js';
+import { OldIssueReporterData } from '../../../../platform/issue/common/issue.js';
+import { getIconsStyleSheet } from '../../../../platform/theme/browser/iconsStyleSheet.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IssueReporterModel, IssueReporterData as IssueReporterModelData } from './issueReporterModel.js';
+import { IIssueFormService, IssueReporterData, IssueReporterExtensionData, IssueReporterStyles, IssueType } from '../common/issue.js';
+import { normalizeGitHubUrl } from '../common/issueReporterUtil.js';
 
 const MAX_URL_LENGTH = 7500;
 
@@ -53,7 +57,7 @@ export class BaseIssueReporterService extends Disposable {
 
 	constructor(
 		public disableExtensions: boolean,
-		public data: IssueReporterData,
+		public data: IssueReporterData | OldIssueReporterData,
 		public os: {
 			type: string;
 			arch: string;
@@ -62,7 +66,8 @@ export class BaseIssueReporterService extends Disposable {
 		public product: IProductConfiguration,
 		public readonly window: Window,
 		public readonly isWeb: boolean,
-		@IIssueMainService public readonly issueMainService: IIssueMainService
+		@IIssueFormService public readonly issueFormService: IIssueFormService,
+		@IThemeService public readonly themeService: IThemeService,
 	) {
 		super();
 		const targetExtension = data.extensionId ? data.enabledExtensions.find(extension => extension.id.toLocaleLowerCase() === data.extensionId?.toLocaleLowerCase()) : undefined;
@@ -117,8 +122,7 @@ export class BaseIssueReporterService extends Disposable {
 		const codiconStyleSheet = createStyleSheet();
 		codiconStyleSheet.id = 'codiconStyles';
 
-		// TODO: Is there a way to use the IThemeService here instead
-		const iconsStyleSheet = this._register(getIconsStyleSheet(undefined));
+		const iconsStyleSheet = this._register(getIconsStyleSheet(this.themeService));
 		function updateAll() {
 			codiconStyleSheet.textContent = iconsStyleSheet.getCSS();
 		}
@@ -127,6 +131,7 @@ export class BaseIssueReporterService extends Disposable {
 		iconsStyleSheet.onDidChange(() => delayer.schedule());
 		delayer.schedule();
 
+		this.handleExtensionData(data.enabledExtensions);
 		this.setUpTypes();
 		this.applyStyles(data.styles);
 
@@ -160,6 +165,11 @@ export class BaseIssueReporterService extends Disposable {
 			content.push(`input[type="text"], textarea, select, .issues-container > .issue > .issue-state, .block-info { background-color: ${styles.inputBackground} !important; }`);
 		}
 
+		if (styles.backgroundColor) {
+			content.push(`.monaco-workbench { background-color: ${styles.backgroundColor} !important; }`);
+			content.push(`.issue-reporter-body::-webkit-scrollbar-track { background-color: ${styles.backgroundColor}; }`);
+		}
+
 		if (styles.inputBorder) {
 			content.push(`input[type="text"], textarea, select { border: 1px solid ${styles.inputBorder}; }`);
 		} else {
@@ -199,16 +209,13 @@ export class BaseIssueReporterService extends Disposable {
 			content.push(`a:hover, .workbenchCommand:hover { color: ${styles.textLinkActiveForeground}; }`);
 		}
 
-		if (styles.sliderBackgroundColor) {
-			content.push(`::-webkit-scrollbar-thumb { background-color: ${styles.sliderBackgroundColor}; }`);
-		}
-
 		if (styles.sliderActiveColor) {
-			content.push(`::-webkit-scrollbar-thumb:active { background-color: ${styles.sliderActiveColor}; }`);
+			content.push(`.issue-reporter-body::-webkit-scrollbar-thumb:active { background-color: ${styles.sliderActiveColor}; }`);
 		}
 
 		if (styles.sliderHoverColor) {
-			content.push(`::--webkit-scrollbar-thumb:hover { background-color: ${styles.sliderHoverColor}; }`);
+			content.push(`.issue-reporter-body::-webkit-scrollbar-thumb { background-color: ${styles.sliderHoverColor}; }`);
+			content.push(`.issue-reporter-body::--webkit-scrollbar-thumb:hover { background-color: ${styles.sliderHoverColor}; }`);
 		}
 
 		if (styles.buttonBackground) {
@@ -239,27 +246,135 @@ export class BaseIssueReporterService extends Disposable {
 		}
 	}
 
-	public setEventHandlers(): void {
-		this.addEventListener('issue-type', 'change', (event: Event) => {
-			const issueType = parseInt((<HTMLInputElement>event.target).value);
-			this.issueReporterModel.update({ issueType: issueType });
-			if (issueType === IssueType.PerformanceIssue && !this.receivedPerformanceInfo) {
-				this.issueMainService.$getPerformanceInfo().then(info => {
-					this.updatePerformanceInfo(info as Partial<IssueReporterData>);
-				});
-			}
-
-			// Resets placeholder
-			const descriptionTextArea = <HTMLInputElement>this.getElementById('issue-title');
-			if (descriptionTextArea) {
-				descriptionTextArea.placeholder = localize('undefinedPlaceholder', "Please enter a title");
-			}
-
-			this.updatePreviewButtonState();
-			this.setSourceOptions();
-			this.render();
+	private handleExtensionData(extensions: IssueReporterExtensionData[]) {
+		const installedExtensions = extensions.filter(x => !x.isBuiltin);
+		const { nonThemes, themes } = groupBy(installedExtensions, ext => {
+			return ext.isTheme ? 'themes' : 'nonThemes';
 		});
 
+		const numberOfThemeExtesions = themes && themes.length;
+		this.issueReporterModel.update({ numberOfThemeExtesions, enabledNonThemeExtesions: nonThemes, allExtensions: installedExtensions });
+		this.updateExtensionTable(nonThemes, numberOfThemeExtesions);
+		if (this.disableExtensions || installedExtensions.length === 0) {
+			(<HTMLButtonElement>this.getElementById('disableExtensions')).disabled = true;
+		}
+
+		this.updateExtensionSelector(installedExtensions);
+	}
+
+	private updateExtensionSelector(extensions: IssueReporterExtensionData[]): void {
+		interface IOption {
+			name: string;
+			id: string;
+		}
+
+		const extensionOptions: IOption[] = extensions.map(extension => {
+			return {
+				name: extension.displayName || extension.name || '',
+				id: extension.id
+			};
+		});
+
+		// Sort extensions by name
+		extensionOptions.sort((a, b) => {
+			const aName = a.name.toLowerCase();
+			const bName = b.name.toLowerCase();
+			if (aName > bName) {
+				return 1;
+			}
+
+			if (aName < bName) {
+				return -1;
+			}
+
+			return 0;
+		});
+
+		const makeOption = (extension: IOption, selectedExtension?: IssueReporterExtensionData): HTMLOptionElement => {
+			const selected = selectedExtension && extension.id === selectedExtension.id;
+			return $<HTMLOptionElement>('option', {
+				'value': extension.id,
+				'selected': selected || ''
+			}, extension.name);
+		};
+
+		const extensionsSelector = this.getElementById<HTMLSelectElement>('extension-selector');
+		if (extensionsSelector) {
+			const { selectedExtension } = this.issueReporterModel.getData();
+			reset(extensionsSelector, this.makeOption('', localize('selectExtension', "Select extension"), true), ...extensionOptions.map(extension => makeOption(extension, selectedExtension)));
+
+			if (!selectedExtension) {
+				extensionsSelector.selectedIndex = 0;
+			}
+
+			this.addEventListener('extension-selector', 'change', async (e: Event) => {
+				this.clearExtensionData();
+				const selectedExtensionId = (<HTMLInputElement>e.target).value;
+				this.selectedExtension = selectedExtensionId;
+				const extensions = this.issueReporterModel.getData().allExtensions;
+				const matches = extensions.filter(extension => extension.id === selectedExtensionId);
+				if (matches.length) {
+					this.issueReporterModel.update({ selectedExtension: matches[0] });
+					const selectedExtension = this.issueReporterModel.getData().selectedExtension;
+					if (selectedExtension) {
+						const iconElement = document.createElement('span');
+						iconElement.classList.add(...ThemeIcon.asClassNameArray(Codicon.loading), 'codicon-modifier-spin');
+						this.setLoading(iconElement);
+						const openReporterData = await this.sendReporterMenu(selectedExtension);
+						if (openReporterData) {
+							if (this.selectedExtension === selectedExtensionId) {
+								this.removeLoading(iconElement, true);
+								// this.configuration.data = openReporterData;
+								this.data = openReporterData;
+							}
+							// else if (this.selectedExtension !== selectedExtensionId) {
+							// }
+						}
+						else {
+							if (!this.loadingExtensionData) {
+								iconElement.classList.remove(...ThemeIcon.asClassNameArray(Codicon.loading), 'codicon-modifier-spin');
+							}
+							this.removeLoading(iconElement);
+							// if not using command, should have no configuration data in fields we care about and check later.
+							this.clearExtensionData();
+
+							// case when previous extension was opened from normal openIssueReporter command
+							selectedExtension.data = undefined;
+							selectedExtension.uri = undefined;
+						}
+						if (this.selectedExtension === selectedExtensionId) {
+							// repopulates the fields with the new data given the selected extension.
+							this.updateExtensionStatus(matches[0]);
+							this.openReporter = false;
+						}
+					} else {
+						this.issueReporterModel.update({ selectedExtension: undefined });
+						this.clearSearchResults();
+						this.clearExtensionData();
+						this.validateSelectedExtension();
+						this.updateExtensionStatus(matches[0]);
+					}
+				}
+			});
+		}
+
+		this.addEventListener('problem-source', 'change', (_) => {
+			this.clearExtensionData();
+			this.validateSelectedExtension();
+		});
+	}
+
+	private async sendReporterMenu(extension: IssueReporterExtensionData): Promise<IssueReporterData | undefined> {
+		try {
+			const data = await this.issueFormService.sendReporterMenu(extension.id);
+			return data;
+		} catch (e) {
+			console.error(e);
+			return undefined;
+		}
+	}
+
+	public setEventHandlers(): void {
 		(['includeSystemInfo', 'includeProcessInfo', 'includeWorkspaceInfo', 'includeExtensions', 'includeExperiments', 'includeExtensionData'] as const).forEach(elementId => {
 			this.addEventListener(elementId, 'click', (event: Event) => {
 				event.stopPropagation();
@@ -361,6 +476,65 @@ export class BaseIssueReporterService extends Disposable {
 			const { fileOnExtension, fileOnMarketplace } = this.issueReporterModel.getData();
 			this.searchIssues(title, fileOnExtension, fileOnMarketplace);
 		});
+
+		this.previewButton.onDidClick(async () => {
+			this.delayedSubmit.trigger(async () => {
+				this.createIssue();
+			});
+		});
+
+		this.addEventListener('disableExtensions', 'click', () => {
+			this.issueFormService.reloadWithExtensionsDisabled();
+		});
+
+		this.addEventListener('extensionBugsLink', 'click', (e: Event) => {
+			const url = (<HTMLElement>e.target).innerText;
+			windowOpenNoOpener(url);
+		});
+
+		this.addEventListener('disableExtensions', 'keydown', (e: Event) => {
+			e.stopPropagation();
+			if ((e as KeyboardEvent).key === 'Enter' || (e as KeyboardEvent).key === ' ') {
+				this.issueFormService.reloadWithExtensionsDisabled();
+			}
+		});
+
+		this.window.document.onkeydown = async (e: KeyboardEvent) => {
+			const cmdOrCtrlKey = isMacintosh ? e.metaKey : e.ctrlKey;
+			// Cmd/Ctrl+Enter previews issue and closes window
+			if (cmdOrCtrlKey && e.key === 'Enter') {
+				this.delayedSubmit.trigger(async () => {
+					if (await this.createIssue()) {
+						this.close();
+					}
+				});
+			}
+
+			// Cmd/Ctrl + w closes issue window
+			if (cmdOrCtrlKey && e.key === 'w') {
+				e.stopPropagation();
+				e.preventDefault();
+
+				const issueTitle = (<HTMLInputElement>this.getElementById('issue-title'))!.value;
+				const { issueDescription } = this.issueReporterModel.getData();
+				if (!this.hasBeenSubmitted && (issueTitle || issueDescription)) {
+					// fire and forget
+					this.issueFormService.showConfirmCloseDialog();
+				} else {
+					this.close();
+				}
+			}
+
+			// With latest electron upgrade, cmd+a is no longer propagating correctly for inputs in this window on mac
+			// Manually perform the selection
+			if (isMacintosh) {
+				if (cmdOrCtrlKey && e.key === 'a' && e.target) {
+					if (isHTMLInputElement(e.target) || isHTMLTextAreaElement(e.target)) {
+						(<HTMLInputElement>e.target).select();
+					}
+				}
+			}
+		};
 	}
 
 	public updatePerformanceInfo(info: Partial<IssueReporterData>) {
@@ -434,6 +608,10 @@ export class BaseIssueReporterService extends Disposable {
 			if (issueType === IssueType.PerformanceIssue && this.receivedSystemInfo && this.receivedPerformanceInfo) {
 				return true;
 			}
+
+			if (issueType === IssueType.FeatureRequest) {
+				return true;
+			}
 		}
 
 		return false;
@@ -500,7 +678,7 @@ export class BaseIssueReporterService extends Disposable {
 	}
 
 	public async close(): Promise<void> {
-		await this.issueMainService.$closeReporter();
+		await this.issueFormService.closeReporter();
 	}
 
 	public clearSearchResults(): void {
@@ -790,7 +968,9 @@ export class BaseIssueReporterService extends Disposable {
 		const inputElement = (<HTMLInputElement>this.getElementById(inputId));
 		const inputValidationMessage = this.getElementById(`${inputId}-empty-error`);
 		const descriptionShortMessage = this.getElementById(`description-short-error`);
-		if (!inputElement.value) {
+		if (inputId === 'description' && this.nonGitHubIssueUrl && this.data.extensionId) {
+			return true;
+		} else if (!inputElement.value) {
 			inputElement.classList.add('invalid-input');
 			inputValidationMessage?.classList.remove('hidden');
 			descriptionShortMessage?.classList.add('hidden');
@@ -800,8 +980,7 @@ export class BaseIssueReporterService extends Disposable {
 			descriptionShortMessage?.classList.remove('hidden');
 			inputValidationMessage?.classList.add('hidden');
 			return false;
-		}
-		else {
+		} else {
 			inputElement.classList.remove('invalid-input');
 			inputValidationMessage?.classList.add('hidden');
 			if (inputId === 'description') {
@@ -930,7 +1109,7 @@ export class BaseIssueReporterService extends Disposable {
 	}
 
 	public async writeToClipboard(baseUrl: string, issueBody: string): Promise<string> {
-		const shouldWrite = await this.issueMainService.$showClipboardDialog();
+		const shouldWrite = await this.issueFormService.showClipboardDialog();
 		if (!shouldWrite) {
 			throw new CancellationError();
 		}
@@ -993,7 +1172,7 @@ export class BaseIssueReporterService extends Disposable {
 	public clearExtensionData(): void {
 		this.nonGitHubIssueUrl = false;
 		this.issueReporterModel.update({ extensionData: undefined });
-		this.data.issueBody = undefined;
+		this.data.issueBody = this.data.issueBody || '';
 		this.data.data = undefined;
 		this.data.uri = undefined;
 	}
diff --git a/src/vs/workbench/contrib/issue/browser/issue.contribution.ts b/src/vs/workbench/contrib/issue/browser/issue.contribution.ts
index 668418a0d46..596fcda8891 100644
--- a/src/vs/workbench/contrib/issue/browser/issue.contribution.ts
+++ b/src/vs/workbench/contrib/issue/browser/issue.contribution.ts
@@ -3,21 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Extensions, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
-import { BrowserIssueService } from 'vs/workbench/contrib/issue/browser/issueService';
-import { IWorkbenchIssueService } from 'vs/workbench/contrib/issue/common/issue';
-import { BaseIssueContribution } from 'vs/workbench/contrib/issue/common/issue.contribution';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
-import { IIssueMainService } from 'vs/platform/issue/common/issue';
-import { IssueFormService } from 'vs/workbench/contrib/issue/browser/issueFormService';
-import 'vs/workbench/contrib/issue/browser/issueTroubleshoot';
+import * as nls from '../../../../nls.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Extensions, IWorkbenchContributionsRegistry } from '../../../common/contributions.js';
+import { IssueFormService } from './issueFormService.js';
+import { BrowserIssueService } from './issueService.js';
+import './issueTroubleshoot.js';
+import { IIssueFormService, IWorkbenchIssueService } from '../common/issue.js';
+import { BaseIssueContribution } from '../common/issue.contribution.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
 
 
 class WebIssueContribution extends BaseIssueContribution {
@@ -38,7 +37,7 @@ class WebIssueContribution extends BaseIssueContribution {
 Registry.as<IWorkbenchContributionsRegistry>(Extensions.Workbench).registerWorkbenchContribution(WebIssueContribution, LifecyclePhase.Restored);
 
 registerSingleton(IWorkbenchIssueService, BrowserIssueService, InstantiationType.Delayed);
-registerSingleton(IIssueMainService, IssueFormService, InstantiationType.Delayed);
+registerSingleton(IIssueFormService, IssueFormService, InstantiationType.Delayed);
 
 CommandsRegistry.registerCommand('_issues.getSystemStatus', (accessor) => {
 	return nls.localize('statusUnsupported', "The --status argument is not yet supported in browsers.");
diff --git a/src/vs/workbench/contrib/issue/browser/issueFormService.ts b/src/vs/workbench/contrib/issue/browser/issueFormService.ts
index ca24026d161..f2e9cad950f 100644
--- a/src/vs/workbench/contrib/issue/browser/issueFormService.ts
+++ b/src/vs/workbench/contrib/issue/browser/issueFormService.ts
@@ -2,106 +2,81 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { safeInnerHtml } from 'vs/base/browser/dom';
-import { mainWindow } from 'vs/base/browser/window';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import BaseHtml from 'vs/workbench/contrib/issue/browser/issueReporterPage';
-import 'vs/css!./media/issueReporter';
-import { IMenuService, MenuId } from 'vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { PerformanceInfo, SystemInfo } from 'vs/platform/diagnostics/common/diagnostics';
-import { ExtensionIdentifier, ExtensionIdentifierSet } from 'vs/platform/extensions/common/extensions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IIssueMainService, IssueReporterData, ProcessExplorerData } from 'vs/platform/issue/common/issue';
-import product from 'vs/platform/product/common/product';
-import { IssueWebReporter } from 'vs/workbench/contrib/issue/browser/issueReporterService';
-import { AuxiliaryWindowMode, IAuxiliaryWindowService } from 'vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService';
+import { safeInnerHtml } from '../../../../base/browser/dom.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import Severity from '../../../../base/common/severity.js';
+import './media/issueReporter.css';
+import { localize } from '../../../../nls.js';
+import { IMenuService, MenuId } from '../../../../platform/actions/common/actions.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { ExtensionIdentifier, ExtensionIdentifierSet } from '../../../../platform/extensions/common/extensions.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import product from '../../../../platform/product/common/product.js';
+import { IRectangle } from '../../../../platform/window/common/window.js';
+import BaseHtml from './issueReporterPage.js';
+import { IssueWebReporter } from './issueReporterService.js';
+import { IIssueFormService, IssueReporterData } from '../common/issue.js';
+import { AuxiliaryWindowMode, IAuxiliaryWindowService } from '../../../services/auxiliaryWindow/browser/auxiliaryWindowService.js';
+import { IHostService } from '../../../services/host/browser/host.js';
 
 export interface IssuePassData {
 	issueTitle: string;
 	issueBody: string;
 }
 
-export class IssueFormService implements IIssueMainService {
+export class IssueFormService implements IIssueFormService {
 
 	readonly _serviceBrand: undefined;
 
-	private issueReporterWindow: Window | null = null;
-	private extensionIdentifierSet: ExtensionIdentifierSet = new ExtensionIdentifierSet();
+	protected currentData: IssueReporterData | undefined;
+
+	protected issueReporterWindow: Window | null = null;
+	protected extensionIdentifierSet: ExtensionIdentifierSet = new ExtensionIdentifierSet();
+
+	protected arch: string = '';
+	protected release: string = '';
+	protected type: string = '';
 
 	constructor(
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@IAuxiliaryWindowService private readonly auxiliaryWindowService: IAuxiliaryWindowService,
-		@IMenuService private readonly menuService: IMenuService,
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
-	) {
-
-		// listen for messages from the main window
-		mainWindow.addEventListener('message', async (event) => {
-			if (event.data && event.data.sendChannel === 'vscode:triggerReporterMenu') {
-				// creates menu from contributed
-				const menu = this.menuService.createMenu(MenuId.IssueReporter, this.contextKeyService);
-
-				// render menu and dispose
-				const actions = menu.getActions({ renderShortTitle: true }).flatMap(entry => entry[1]);
-				for (const action of actions) {
-					try {
-						if (action.item && 'source' in action.item && action.item.source?.id === event.data.extensionId) {
-							this.extensionIdentifierSet.add(event.data.extensionId);
-							await action.run();
-						}
-					} catch (error) {
-						console.error(error);
-					}
-				}
-
-				if (!this.extensionIdentifierSet.has(event.data.extensionId)) {
-					// send undefined to indicate no action was taken
-					const replyChannel = `vscode:triggerReporterMenuResponse`;
-					mainWindow.postMessage({ replyChannel }, '*');
-				}
-
-				menu.dispose();
-			}
-		});
-
-	}
+		@IInstantiationService protected readonly instantiationService: IInstantiationService,
+		@IAuxiliaryWindowService protected readonly auxiliaryWindowService: IAuxiliaryWindowService,
+		@IMenuService protected readonly menuService: IMenuService,
+		@IContextKeyService protected readonly contextKeyService: IContextKeyService,
+		@ILogService protected readonly logService: ILogService,
+		@IDialogService protected readonly dialogService: IDialogService,
+		@IHostService protected readonly hostService: IHostService
+	) { }
 
 	async openReporter(data: IssueReporterData): Promise<void> {
-		if (data.extensionId && this.extensionIdentifierSet.has(data.extensionId)) {
-			const replyChannel = `vscode:triggerReporterMenuResponse`;
-			mainWindow.postMessage({ data, replyChannel }, '*');
-			this.extensionIdentifierSet.delete(new ExtensionIdentifier(data.extensionId));
-		}
-
-		if (this.issueReporterWindow) {
-			const getModelData = await this.getIssueData();
-			if (getModelData) {
-				const { issueTitle, issueBody } = getModelData;
-				if (issueTitle || issueBody) {
-					data.issueTitle = data.issueTitle ?? issueTitle;
-					data.issueBody = data.issueBody ?? issueBody;
-
-					// close issue reporter and re-open with new data
-					this.issueReporterWindow.close();
-					this.openAuxIssueReporter(data);
-					return;
-				}
-			}
-			this.issueReporterWindow.focus();
+		if (this.hasToReload(data)) {
 			return;
 		}
-		this.openAuxIssueReporter(data);
+
+		await this.openAuxIssueReporter(data);
+
+		if (this.issueReporterWindow) {
+			const issueReporter = this.instantiationService.createInstance(IssueWebReporter, false, data, { type: this.type, arch: this.arch, release: this.release }, product, this.issueReporterWindow);
+			issueReporter.render();
+		}
 	}
 
-	async openAuxIssueReporter(data: IssueReporterData): Promise<void> {
+	async openAuxIssueReporter(data: IssueReporterData, bounds?: IRectangle): Promise<void> {
+
+		let issueReporterBounds: Partial<IRectangle> = { width: 700, height: 800 };
+
+		// Center Issue Reporter Window based on bounds from native host service
+		if (bounds && bounds.x && bounds.y) {
+			const centerX = bounds.x + bounds.width / 2;
+			const centerY = bounds.y + bounds.height / 2;
+			issueReporterBounds = { ...issueReporterBounds, x: centerX - 350, y: centerY - 400 };
+		}
+
 		const disposables = new DisposableStore();
 
 		// Auxiliary Window
-		const auxiliaryWindow = disposables.add(await this.auxiliaryWindowService.open({ mode: AuxiliaryWindowMode.Normal }));
-
-		this.issueReporterWindow = auxiliaryWindow.window;
+		const auxiliaryWindow = disposables.add(await this.auxiliaryWindowService.open({ mode: AuxiliaryWindowMode.Normal, bounds: issueReporterBounds, nativeTitlebar: true, disableFullscreen: true }));
 
 		if (auxiliaryWindow) {
 			await auxiliaryWindow.whenStylesHaveLoaded;
@@ -117,9 +92,7 @@ export class IssueFormService implements IIssueMainService {
 			auxiliaryWindow.window.document.body.appendChild(div);
 			safeInnerHtml(div, BaseHtml());
 
-			// create issue reporter and instantiate
-			const issueReporter = this.instantiationService.createInstance(IssueWebReporter, false, data, { type: '', arch: '', release: '' }, product, auxiliaryWindow.window);
-			issueReporter.render();
+			this.issueReporterWindow = auxiliaryWindow.window;
 		} else {
 			console.error('Failed to open auxiliary window');
 		}
@@ -131,94 +104,108 @@ export class IssueFormService implements IIssueMainService {
 		});
 	}
 
-	async openProcessExplorer(data: ProcessExplorerData): Promise<void> {
-		throw new Error('Method not implemented.');
-	}
+	async sendReporterMenu(extensionId: string): Promise<IssueReporterData | undefined> {
+		const menu = this.menuService.createMenu(MenuId.IssueReporter, this.contextKeyService);
 
-	stopTracing(): Promise<void> {
-		throw new Error('Method not implemented.');
-	}
-	getSystemStatus(): Promise<string> {
-		throw new Error('Method not implemented.');
-	}
-	$getSystemInfo(): Promise<SystemInfo> {
-		throw new Error('Method not implemented.');
-	}
-	$getPerformanceInfo(): Promise<PerformanceInfo> {
-		throw new Error('Method not implemented.');
-	}
-	$reloadWithExtensionsDisabled(): Promise<void> {
-		throw new Error('Method not implemented.');
-	}
-	$showConfirmCloseDialog(): Promise<void> {
-		throw new Error('Method not implemented.');
-	}
-	$showClipboardDialog(): Promise<boolean> {
-		throw new Error('Method not implemented.');
-	}
-	$getIssueReporterUri(extensionId: string): Promise<URI> {
-		throw new Error('Method not implemented.');
-	}
-	$getIssueReporterData(extensionId: string): Promise<string> {
-		throw new Error('Method not implemented.');
-	}
-	$getIssueReporterTemplate(extensionId: string): Promise<string> {
-		throw new Error('Method not implemented.');
-	}
-	$getReporterStatus(extensionId: string, extensionName: string): Promise<boolean[]> {
-		throw new Error('Method not implemented.');
-	}
-
-	async $sendReporterMenu(extensionId: string, extensionName: string): Promise<IssueReporterData | undefined> {
-		const sendChannel = `vscode:triggerReporterMenu`;
-		mainWindow.postMessage({ sendChannel, extensionId, extensionName }, '*');
-
-		const result = await new Promise((resolve, reject) => {
-			const timeout = setTimeout(() => {
-				mainWindow.removeEventListener('message', listener);
-				reject(new Error('Timeout exceeded'));
-			}, 5000); // Set the timeout value in milliseconds (e.g., 5000 for 5 seconds)
-
-			const listener = (event: MessageEvent) => {
-				const replyChannel = `vscode:triggerReporterMenuResponse`;
-				if (event.data && event.data.replyChannel === replyChannel) {
-					clearTimeout(timeout);
-					mainWindow.removeEventListener('message', listener);
-					resolve(event.data.data);
+		// render menu and dispose
+		const actions = menu.getActions({ renderShortTitle: true }).flatMap(entry => entry[1]);
+		for (const action of actions) {
+			try {
+				if (action.item && 'source' in action.item && action.item.source?.id === extensionId) {
+					this.extensionIdentifierSet.add(extensionId);
+					await action.run();
 				}
-			};
-			mainWindow.addEventListener('message', listener);
-		});
+			} catch (error) {
+				console.error(error);
+			}
+		}
 
-		return result as IssueReporterData | undefined;
+		if (!this.extensionIdentifierSet.has(extensionId)) {
+			// send undefined to indicate no action was taken
+			return undefined;
+		}
+
+		// we found the extension, now we clean up the menu and remove it from the set. This is to ensure that we do duplicate extension identifiers
+		this.extensionIdentifierSet.delete(new ExtensionIdentifier(extensionId));
+		menu.dispose();
+
+		const result = this.currentData;
+
+		// reset current data.
+		this.currentData = undefined;
+
+		return result ?? undefined;
 	}
 
-	// Listens to data from the issue reporter model, which is updated regularly
-	async getIssueData(): Promise<IssuePassData | undefined> {
-		const sendChannel = `vscode:triggerIssueData`;
-		mainWindow.postMessage({ sendChannel }, '*');
+	//#region used by issue reporter
 
-		const result = await new Promise((resolve, reject) => {
-			const timeout = setTimeout(() => {
-				mainWindow.removeEventListener('message', listener);
-				reject(new Error('Timeout exceeded'));
-			}, 5000); // Set the timeout value in milliseconds (e.g., 5000 for 5 seconds)
-
-			const listener = (event: MessageEvent) => {
-				const replyChannel = `vscode:triggerIssueDataResponse`;
-				if (event.data && event.data.replyChannel === replyChannel) {
-					clearTimeout(timeout);
-					mainWindow.removeEventListener('message', listener);
-					resolve(event.data.data);
-				}
-			};
-			mainWindow.addEventListener('message', listener);
-		});
-
-		return result as IssuePassData | undefined;
-	}
-
-	async $closeReporter(): Promise<void> {
+	async closeReporter(): Promise<void> {
 		this.issueReporterWindow?.close();
 	}
+
+	async reloadWithExtensionsDisabled(): Promise<void> {
+		if (this.issueReporterWindow) {
+			try {
+				await this.hostService.reload({ disableExtensions: true });
+			} catch (error) {
+				this.logService.error(error);
+			}
+		}
+	}
+
+	async showConfirmCloseDialog(): Promise<void> {
+		await this.dialogService.prompt({
+			type: Severity.Warning,
+			message: localize('confirmCloseIssueReporter', "Your input will not be saved. Are you sure you want to close this window?"),
+			buttons: [
+				{
+					label: localize({ key: 'yes', comment: ['&& denotes a mnemonic'] }, "&&Yes"),
+					run: () => {
+						this.closeReporter();
+						this.issueReporterWindow = null;
+					}
+				},
+				{
+					label: localize('cancel', "Cancel"),
+					run: () => { }
+				}
+			]
+		});
+	}
+
+	async showClipboardDialog(): Promise<boolean> {
+		let result = false;
+
+		await this.dialogService.prompt({
+			type: Severity.Warning,
+			message: localize('issueReporterWriteToClipboard', "There is too much data to send to GitHub directly. The data will be copied to the clipboard, please paste it into the GitHub issue page that is opened."),
+			buttons: [
+				{
+					label: localize({ key: 'ok', comment: ['&& denotes a mnemonic'] }, "&&OK"),
+					run: () => { result = true; }
+				},
+				{
+					label: localize('cancel', "Cancel"),
+					run: () => { result = false; }
+				}
+			]
+		});
+
+		return result;
+	}
+
+	hasToReload(data: IssueReporterData): boolean {
+		if (data.extensionId && this.extensionIdentifierSet.has(data.extensionId)) {
+			this.currentData = data;
+			this.issueReporterWindow?.focus();
+			return true;
+		}
+
+		if (this.issueReporterWindow) {
+			this.issueReporterWindow.focus();
+			return true;
+		}
+
+		return false;
+	}
 }
diff --git a/src/vs/workbench/contrib/issue/browser/issueQuickAccess.ts b/src/vs/workbench/contrib/issue/browser/issueQuickAccess.ts
index 37d52199b5b..a0c533b70d5 100644
--- a/src/vs/workbench/contrib/issue/browser/issueQuickAccess.ts
+++ b/src/vs/workbench/contrib/issue/browser/issueQuickAccess.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { PickerQuickAccessProvider, IPickerQuickAccessItem, FastAndSlowPicks, Picks, TriggerAction } from 'vs/platform/quickinput/browser/pickerQuickAccess';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IMenuService, MenuId, MenuItemAction, SubmenuItemAction } from 'vs/platform/actions/common/actions';
-import { matchesFuzzy } from 'vs/base/common/filters';
-import { IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
-import { localize } from 'vs/nls';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IRelaxedExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { Codicon } from 'vs/base/common/codicons';
-import { IssueSource } from 'vs/platform/issue/common/issue';
-import { IProductService } from 'vs/platform/product/common/productService';
+import { PickerQuickAccessProvider, IPickerQuickAccessItem, FastAndSlowPicks, Picks, TriggerAction } from '../../../../platform/quickinput/browser/pickerQuickAccess.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IMenuService, MenuId, MenuItemAction, SubmenuItemAction } from '../../../../platform/actions/common/actions.js';
+import { matchesFuzzy } from '../../../../base/common/filters.js';
+import { IQuickPickSeparator } from '../../../../platform/quickinput/common/quickInput.js';
+import { localize } from '../../../../nls.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { IssueSource } from '../common/issue.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
 
 export class IssueQuickAccess extends PickerQuickAccessProvider<IPickerQuickAccessItem> {
 
@@ -65,13 +65,8 @@ export class IssueQuickAccess extends PickerQuickAccessProvider<IPickerQuickAcce
 		issuePicksConst.push({ type: 'separator', label: localize('extensions', "Extensions") });
 
 
-		// creates menu from contributed
-		const menu = this.menuService.createMenu(MenuId.IssueReporter, this.contextKeyService);
-
-		// render menu and dispose
-		const actions = menu.getActions({ renderShortTitle: true }).flatMap(entry => entry[1]);
-
-		menu.dispose();
+		// gets menu actions from contributed
+		const actions = this.menuService.getMenuActions(MenuId.IssueReporter, this.contextKeyService, { renderShortTitle: true }).flatMap(entry => entry[1]);
 
 		// create picks from contributed menu
 		actions.forEach(action => {
@@ -107,7 +102,7 @@ export class IssueQuickAccess extends PickerQuickAccessProvider<IPickerQuickAcce
 		return [...issuePicksConst, ...issuePicksParts];
 	}
 
-	private _createPick(filter: string, action?: MenuItemAction | SubmenuItemAction | undefined, extension?: IRelaxedExtensionDescription): IPickerQuickAccessItem | undefined {
+	private _createPick(filter: string, action?: MenuItemAction | SubmenuItemAction | undefined, extension?: IExtensionDescription): IPickerQuickAccessItem | undefined {
 		const buttons = [{
 			iconClass: ThemeIcon.asClassName(Codicon.info),
 			tooltip: localize('contributedIssuePage', "Open Extension Page")
diff --git a/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts b/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts
index f8274d9e4c0..97d1199d1e6 100644
--- a/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts
+++ b/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts
@@ -3,12 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { mainWindow } from 'vs/base/browser/window';
-import { isRemoteDiagnosticError, SystemInfo } from 'vs/platform/diagnostics/common/diagnostics';
-import { ISettingSearchResult, IssueReporterExtensionData, IssueType } from 'vs/platform/issue/common/issue';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { isRemoteDiagnosticError, SystemInfo } from '../../../../platform/diagnostics/common/diagnostics.js';
+import { OldIssueType } from '../../../../platform/issue/common/issue.js';
+import { ISettingSearchResult, IssueReporterExtensionData, IssueType } from '../common/issue.js';
 
 export interface IssueReporterData {
-	issueType: IssueType;
+	issueType: IssueType | OldIssueType;
 	issueDescription?: string;
 	issueTitle?: string;
 	extensionData?: string;
diff --git a/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts b/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts
index 195857e0d4b..b54b661ff44 100644
--- a/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts
+++ b/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { escape } from 'vs/base/common/strings';
-import { localize } from 'vs/nls';
+import { escape } from '../../../../base/common/strings.js';
+import { localize } from '../../../../nls.js';
 
 const sendSystemInfoLabel = escape(localize('sendSystemInfo', "Include my system information"));
 const sendProcessInfoLabel = escape(localize('sendProcessInfo', "Include my currently running processes"));
@@ -94,7 +94,7 @@ export default (): string => `
 				<span id="ext-loading" hidden></span>
 				<span class="ext-parens" hidden>(</span><a href="#" class="showInfo" id="extension-id">${escape(localize('show', "show"))}</a><span class="ext-parens" hidden>)</span>
 			</label>
-			<pre class="block-info" id="extension-data" placeholder="${escape(localize('extensionData', "Extension does not have additional data to include."))}" style="white-space: pre-wrap;">
+			<pre class="block-info" id="extension-data" placeholder="${escape(localize('extensionData', "Extension does not have additional data to include."))}" style="white-space: pre-wrap; user-select: text;">
 				<!-- To be dynamically filled -->
 			</pre>
 		</div>
@@ -107,7 +107,7 @@ export default (): string => `
 			</label>
 			<div class="block-info hidden">
 				<!-- To be dynamically filled -->
-			</div>
+		</div>
 		</div>
 		<div class="block block-process">
 			<input class="sendData" aria-label="${sendProcessInfoLabel}" type="checkbox" id="includeProcessInfo" checked/>
diff --git a/src/vs/workbench/contrib/issue/browser/issueReporterService.ts b/src/vs/workbench/contrib/issue/browser/issueReporterService.ts
index 59eae428a91..ae2d6106f75 100644
--- a/src/vs/workbench/contrib/issue/browser/issueReporterService.ts
+++ b/src/vs/workbench/contrib/issue/browser/issueReporterService.ts
@@ -2,15 +2,11 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { $, isHTMLInputElement, isHTMLTextAreaElement, reset, windowOpenNoOpener } from 'vs/base/browser/dom';
-import { Codicon } from 'vs/base/common/codicons';
-import { groupBy } from 'vs/base/common/collections';
-import { isMacintosh } from 'vs/base/common/platform';
-import { IProductConfiguration } from 'vs/base/common/product';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { localize } from 'vs/nls';
-import { IIssueMainService, IssueReporterData, IssueReporterExtensionData } from 'vs/platform/issue/common/issue';
-import { BaseIssueReporterService } from 'vs/workbench/contrib/issue/browser/issue';
+import { IProductConfiguration } from '../../../../base/common/product.js';
+import { localize } from '../../../../nls.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { BaseIssueReporterService } from './baseIssueReporterService.js';
+import { IIssueFormService, IssueReporterData } from '../common/issue.js';
 
 // GitHub has let us know that we could up our limit here to 8k. We chose 7500 to play it safe.
 // ref https://github.com/microsoft/vscode/issues/159191
@@ -26,9 +22,10 @@ export class IssueWebReporter extends BaseIssueReporterService {
 		},
 		product: IProductConfiguration,
 		window: Window,
-		@IIssueMainService issueMainService: IIssueMainService
+		@IIssueFormService issueFormService: IIssueFormService,
+		@IThemeService themeService: IThemeService
 	) {
-		super(disableExtensions, data, os, product, window, true, issueMainService);
+		super(disableExtensions, data, os, product, window, true, issueFormService, themeService);
 
 		const target = this.window.document.querySelector<HTMLElement>('.block-system .block-info');
 
@@ -37,194 +34,27 @@ export class IssueWebReporter extends BaseIssueReporterService {
 			target?.appendChild(this.window.document.createTextNode(webInfo));
 			this.receivedSystemInfo = true;
 			this.issueReporterModel.update({ systemInfoWeb: webInfo });
-
 		}
 
 		this.setEventHandlers();
-		this.handleExtensionData(data.enabledExtensions);
-	}
-
-	private handleExtensionData(extensions: IssueReporterExtensionData[]) {
-		const installedExtensions = extensions.filter(x => !x.isBuiltin);
-		const { nonThemes, themes } = groupBy(installedExtensions, ext => {
-			return ext.isTheme ? 'themes' : 'nonThemes';
-		});
-
-		const numberOfThemeExtesions = themes && themes.length;
-		this.issueReporterModel.update({ numberOfThemeExtesions, enabledNonThemeExtesions: nonThemes, allExtensions: installedExtensions });
-		this.updateExtensionTable(nonThemes, numberOfThemeExtesions);
-		if (this.disableExtensions || installedExtensions.length === 0) {
-			(<HTMLButtonElement>this.getElementById('disableExtensions')).disabled = true;
-		}
-
-		this.updateExtensionSelector(installedExtensions);
-	}
-
-	private async sendReporterMenu(extension: IssueReporterExtensionData): Promise<IssueReporterData | undefined> {
-		try {
-			const data = await this.issueMainService.$sendReporterMenu(extension.id, extension.name);
-			return data;
-		} catch (e) {
-			console.error(e);
-			return undefined;
-		}
 	}
 
 	public override setEventHandlers(): void {
 		super.setEventHandlers();
-		this.previewButton.onDidClick(async () => {
-			this.delayedSubmit.trigger(async () => {
-				this.createIssue();
-			});
-		});
 
-		this.addEventListener('disableExtensions', 'click', () => {
-			this.issueMainService.$reloadWithExtensionsDisabled();
-		});
+		this.addEventListener('issue-type', 'change', (event: Event) => {
+			const issueType = parseInt((<HTMLInputElement>event.target).value);
+			this.issueReporterModel.update({ issueType: issueType });
 
-		this.addEventListener('extensionBugsLink', 'click', (e: Event) => {
-			const url = (<HTMLElement>e.target).innerText;
-			windowOpenNoOpener(url);
-		});
-
-		this.addEventListener('disableExtensions', 'keydown', (e: Event) => {
-			e.stopPropagation();
-			if ((e as KeyboardEvent).key === 'Enter' || (e as KeyboardEvent).key === ' ') {
-				this.issueMainService.$reloadWithExtensionsDisabled();
-			}
-		});
-
-		this.window.document.onkeydown = async (e: KeyboardEvent) => {
-			const cmdOrCtrlKey = isMacintosh ? e.metaKey : e.ctrlKey;
-			// Cmd/Ctrl+Enter previews issue and closes window
-			if (cmdOrCtrlKey && e.key === 'Enter') {
-				this.delayedSubmit.trigger(async () => {
-					if (await this.createIssue()) {
-						this.close();
-					}
-				});
+			// Resets placeholder
+			const descriptionTextArea = <HTMLInputElement>this.getElementById('issue-title');
+			if (descriptionTextArea) {
+				descriptionTextArea.placeholder = localize('undefinedPlaceholder', "Please enter a title");
 			}
 
-			// Cmd/Ctrl + w closes issue window
-			if (cmdOrCtrlKey && e.key === 'w') {
-				e.stopPropagation();
-				e.preventDefault();
-
-				const issueTitle = (<HTMLInputElement>this.getElementById('issue-title'))!.value;
-				const { issueDescription } = this.issueReporterModel.getData();
-				if (!this.hasBeenSubmitted && (issueTitle || issueDescription)) {
-					// fire and forget
-					this.issueMainService.$showConfirmCloseDialog();
-				} else {
-					this.close();
-				}
-			}
-
-			// With latest electron upgrade, cmd+a is no longer propagating correctly for inputs in this window on mac
-			// Manually perform the selection
-			if (isMacintosh) {
-				if (cmdOrCtrlKey && e.key === 'a' && e.target) {
-					if (isHTMLInputElement(e.target) || isHTMLTextAreaElement(e.target)) {
-						(<HTMLInputElement>e.target).select();
-					}
-				}
-			}
-		};
-	}
-
-	private updateExtensionSelector(extensions: IssueReporterExtensionData[]): void {
-		interface IOption {
-			name: string;
-			id: string;
-		}
-
-		const extensionOptions: IOption[] = extensions.map(extension => {
-			return {
-				name: extension.displayName || extension.name || '',
-				id: extension.id
-			};
-		});
-
-		// Sort extensions by name
-		extensionOptions.sort((a, b) => {
-			const aName = a.name.toLowerCase();
-			const bName = b.name.toLowerCase();
-			if (aName > bName) {
-				return 1;
-			}
-
-			if (aName < bName) {
-				return -1;
-			}
-
-			return 0;
-		});
-
-		const makeOption = (extension: IOption, selectedExtension?: IssueReporterExtensionData): HTMLOptionElement => {
-			const selected = selectedExtension && extension.id === selectedExtension.id;
-			return $<HTMLOptionElement>('option', {
-				'value': extension.id,
-				'selected': selected || ''
-			}, extension.name);
-		};
-
-		const extensionsSelector = this.getElementById<HTMLSelectElement>('extension-selector');
-		if (extensionsSelector) {
-			const { selectedExtension } = this.issueReporterModel.getData();
-			reset(extensionsSelector, this.makeOption('', localize('selectExtension', "Select extension"), true), ...extensionOptions.map(extension => makeOption(extension, selectedExtension)));
-
-			if (!selectedExtension) {
-				extensionsSelector.selectedIndex = 0;
-			}
-
-			this.addEventListener('extension-selector', 'change', async (e: Event) => {
-				this.clearExtensionData();
-				const selectedExtensionId = (<HTMLInputElement>e.target).value;
-				this.selectedExtension = selectedExtensionId;
-				const extensions = this.issueReporterModel.getData().allExtensions;
-				const matches = extensions.filter(extension => extension.id === selectedExtensionId);
-				if (matches.length) {
-					this.issueReporterModel.update({ selectedExtension: matches[0] });
-					const selectedExtension = this.issueReporterModel.getData().selectedExtension;
-					if (selectedExtension) {
-						const iconElement = document.createElement('span');
-						iconElement.classList.add(...ThemeIcon.asClassNameArray(Codicon.loading), 'codicon-modifier-spin');
-						this.setLoading(iconElement);
-						const openReporterData = await this.sendReporterMenu(selectedExtension);
-						if (openReporterData) {
-							if (this.selectedExtension === selectedExtensionId) {
-								this.removeLoading(iconElement, true);
-								this.data = openReporterData;
-							} else if (this.selectedExtension !== selectedExtensionId) {
-							}
-						}
-						else {
-							if (!this.loadingExtensionData) {
-								iconElement.classList.remove(...ThemeIcon.asClassNameArray(Codicon.loading), 'codicon-modifier-spin');
-							}
-							this.removeLoading(iconElement);
-							this.clearExtensionData();
-							selectedExtension.data = undefined;
-							selectedExtension.uri = undefined;
-						}
-						if (this.selectedExtension === selectedExtensionId) {
-							// repopulates the fields with the new data given the selected extension.
-							this.updateExtensionStatus(matches[0]);
-							this.openReporter = false;
-						}
-					} else {
-						this.issueReporterModel.update({ selectedExtension: undefined });
-						this.clearSearchResults();
-						this.clearExtensionData();
-						this.validateSelectedExtension();
-						this.updateExtensionStatus(matches[0]);
-					}
-				}
-			});
-		}
-
-		this.addEventListener('problem-source', 'change', (_) => {
-			this.validateSelectedExtension();
+			this.updatePreviewButtonState();
+			this.setSourceOptions();
+			this.render();
 		});
 	}
 }
diff --git a/src/vs/workbench/contrib/issue/browser/issueService.ts b/src/vs/workbench/contrib/issue/browser/issueService.ts
index 6030bbfd928..e0df98d0235 100644
--- a/src/vs/workbench/contrib/issue/browser/issueService.ts
+++ b/src/vs/workbench/contrib/issue/browser/issueService.ts
@@ -3,27 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { userAgent } from 'vs/base/common/platform';
-import { IExtensionDescription, ExtensionType } from 'vs/platform/extensions/common/extensions';
-import { normalizeGitHubUrl } from 'vs/platform/issue/common/issueReporterUtil';
-import { getZoomLevel } from 'vs/base/browser/browser';
-import { mainWindow } from 'vs/base/browser/window';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IIssueMainService, IssueReporterData, IssueReporterExtensionData, IssueReporterStyles } from 'vs/platform/issue/common/issue';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { buttonBackground, buttonForeground, buttonHoverBackground, foreground, inputActiveOptionBorder, inputBackground, inputBorder, inputForeground, inputValidationErrorBackground, inputValidationErrorBorder, inputValidationErrorForeground, scrollbarSliderActiveBackground, scrollbarSliderBackground, scrollbarSliderHoverBackground, textLinkActiveForeground, textLinkForeground } from 'vs/platform/theme/common/colorRegistry';
-import { IColorTheme, IThemeService } from 'vs/platform/theme/common/themeService';
-import { IWorkspaceTrustManagementService } from 'vs/platform/workspace/common/workspaceTrust';
-import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
-import { IWorkbenchAssignmentService } from 'vs/workbench/services/assignment/common/assignmentService';
-import { IAuthenticationService } from 'vs/workbench/services/authentication/common/authentication';
-import { IWorkbenchExtensionEnablementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { IIntegrityService } from 'vs/workbench/services/integrity/common/integrity';
-import { IWorkbenchIssueService } from 'vs/workbench/contrib/issue/common/issue';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { getZoomLevel } from '../../../../base/browser/browser.js';
+import * as dom from '../../../../base/browser/dom.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { userAgent } from '../../../../base/common/platform.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IExtensionManagementService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { ExtensionType, IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { normalizeGitHubUrl } from '../../../../platform/issue/common/issueReporterUtil.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { buttonBackground, buttonForeground, buttonHoverBackground, foreground, inputActiveOptionBorder, inputBackground, inputBorder, inputForeground, inputValidationErrorBackground, inputValidationErrorBorder, inputValidationErrorForeground, scrollbarSliderActiveBackground, scrollbarSliderBackground, scrollbarSliderHoverBackground, textLinkActiveForeground, textLinkForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import { IColorTheme, IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IWorkspaceTrustManagementService } from '../../../../platform/workspace/common/workspaceTrust.js';
+import { SIDE_BAR_BACKGROUND } from '../../../common/theme.js';
+import { IIssueFormService, IssueReporterData, IssueReporterExtensionData, IssueReporterStyles, IWorkbenchIssueService } from '../common/issue.js';
+import { IWorkbenchAssignmentService } from '../../../services/assignment/common/assignmentService.js';
+import { IAuthenticationService } from '../../../services/authentication/common/authentication.js';
+import { IWorkbenchExtensionEnablementService } from '../../../services/extensionManagement/common/extensionManagement.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IIntegrityService } from '../../../services/integrity/common/integrity.js';
 
 
 export class BrowserIssueService implements IWorkbenchIssueService {
@@ -32,7 +31,7 @@ export class BrowserIssueService implements IWorkbenchIssueService {
 	constructor(
 		@IExtensionService private readonly extensionService: IExtensionService,
 		@IProductService private readonly productService: IProductService,
-		@IIssueMainService private readonly issueMainService: IIssueMainService,
+		@IIssueFormService private readonly issueFormService: IIssueFormService,
 		@IThemeService private readonly themeService: IThemeService,
 		@IWorkbenchAssignmentService private readonly experimentService: IWorkbenchAssignmentService,
 		@IWorkspaceTrustManagementService private readonly workspaceTrustManagementService: IWorkspaceTrustManagementService,
@@ -43,11 +42,6 @@ export class BrowserIssueService implements IWorkbenchIssueService {
 		@IConfigurationService private readonly configurationService: IConfigurationService
 	) { }
 
-	//TODO @TylerLeonhardt @Tyriar to implement a process explorer for the web
-	async openProcessExplorer(): Promise<void> {
-		console.error('openProcessExplorer is not implemented in web');
-	}
-
 	async openReporter(options: Partial<IssueReporterData>): Promise<void> {
 		// If web reporter setting is false open the old GitHub issue reporter
 		if (!this.configurationService.getValue<boolean>('issueReporter.experimental.webReporter')) {
@@ -141,7 +135,7 @@ export class BrowserIssueService implements IWorkbenchIssueService {
 				githubAccessToken
 			}, options);
 
-			return this.issueMainService.openReporter(issueReporterData);
+			return this.issueFormService.openReporter(issueReporterData);
 		}
 		throw new Error(`No issue reporting URL configured for ${this.productService.nameLong}.`);
 
diff --git a/src/vs/workbench/contrib/issue/browser/issueTroubleshoot.ts b/src/vs/workbench/contrib/issue/browser/issueTroubleshoot.ts
index f9f3104f8b3..facb8ee9d9f 100644
--- a/src/vs/workbench/contrib/issue/browser/issueTroubleshoot.ts
+++ b/src/vs/workbench/contrib/issue/browser/issueTroubleshoot.ts
@@ -3,32 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize, localize2 } from 'vs/nls';
-import { IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { ExtensionType } from 'vs/platform/extensions/common/extensions';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IWorkbenchIssueService } from 'vs/workbench/contrib/issue/common/issue';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IUserDataProfileImportExportService, IUserDataProfileManagementService, IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IExtensionBisectService } from 'vs/workbench/services/extensionManagement/browser/extensionBisect';
-import { INotificationHandle, INotificationService, IPromptChoice, NotificationPriority, Severity } from 'vs/platform/notification/common/notification';
-import { IWorkbenchExtensionEnablementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { ServicesAccessor, createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ContextKeyExpr, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Extensions, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { URI } from 'vs/base/common/uri';
-import { RemoteNameContext } from 'vs/workbench/common/contextkeys';
-import { IsWebContext } from 'vs/platform/contextkey/common/contextkeys';
+import { localize, localize2 } from '../../../../nls.js';
+import { IExtensionManagementService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { ExtensionType } from '../../../../platform/extensions/common/extensions.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IWorkbenchIssueService } from '../common/issue.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { IUserDataProfileImportExportService, IUserDataProfileManagementService, IUserDataProfileService } from '../../../services/userDataProfile/common/userDataProfile.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IExtensionBisectService } from '../../../services/extensionManagement/browser/extensionBisect.js';
+import { INotificationHandle, INotificationService, IPromptChoice, NotificationPriority, Severity } from '../../../../platform/notification/common/notification.js';
+import { IWorkbenchExtensionEnablementService } from '../../../services/extensionManagement/common/extensionManagement.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { IUserDataProfile, IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { ServicesAccessor, createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ContextKeyExpr, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Extensions, IWorkbenchContributionsRegistry } from '../../../common/contributions.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { URI } from '../../../../base/common/uri.js';
+import { RemoteNameContext } from '../../../common/contextkeys.js';
+import { IsWebContext } from '../../../../platform/contextkey/common/contextkeys.js';
 
 const ITroubleshootIssueService = createDecorator<ITroubleshootIssueService>('ITroubleshootIssueService');
 
diff --git a/src/vs/workbench/contrib/issue/common/issue.contribution.ts b/src/vs/workbench/contrib/issue/common/issue.contribution.ts
index 8e4d7795710..a2805613d96 100644
--- a/src/vs/workbench/contrib/issue/common/issue.contribution.ts
+++ b/src/vs/workbench/contrib/issue/common/issue.contribution.ts
@@ -3,17 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize, localize2 } from 'vs/nls';
-import { ICommandAction } from 'vs/platform/action/common/action';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
-import { CommandsRegistry, ICommandMetadata } from 'vs/platform/commands/common/commands';
-import { IssueReporterData } from 'vs/platform/issue/common/issue';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IWorkbenchIssueService } from 'vs/workbench/contrib/issue/common/issue';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { Disposable } from 'vs/base/common/lifecycle';
+import { localize, localize2 } from '../../../../nls.js';
+import { ICommandAction } from '../../../../platform/action/common/action.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { MenuId, MenuRegistry } from '../../../../platform/actions/common/actions.js';
+import { CommandsRegistry, ICommandMetadata } from '../../../../platform/commands/common/commands.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IWorkbenchIssueService, IssueReporterData } from './issue.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
 
 const OpenIssueReporterActionId = 'workbench.action.openIssueReporter';
 const OpenIssueReporterApiId = 'vscode.openIssueReporter';
diff --git a/src/vs/workbench/contrib/issue/common/issue.ts b/src/vs/workbench/contrib/issue/common/issue.ts
index 3ecd103cf58..d0e970de5f1 100644
--- a/src/vs/workbench/contrib/issue/common/issue.ts
+++ b/src/vs/workbench/contrib/issue/common/issue.ts
@@ -2,13 +2,152 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IssueReporterData } from 'vs/platform/issue/common/issue';
+
+import { UriComponents } from '../../../../base/common/uri.js';
+import { ISandboxConfiguration } from '../../../../base/parts/sandbox/common/sandboxTypes.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { OldIssueReporterData } from '../../../../platform/issue/common/issue.js';
+
+// Since data sent through the service is serialized to JSON, functions will be lost, so Color objects
+// should not be sent as their 'toString' method will be stripped. Instead convert to strings before sending.
+export interface WindowStyles {
+	backgroundColor?: string;
+	color?: string;
+}
+export interface WindowData {
+	styles: WindowStyles;
+	zoomLevel: number;
+}
+
+export const enum IssueType {
+	Bug,
+	PerformanceIssue,
+	FeatureRequest
+}
+
+export enum IssueSource {
+	VSCode = 'vscode',
+	Extension = 'extension',
+	Marketplace = 'marketplace'
+}
+
+export interface IssueReporterStyles extends WindowStyles {
+	textLinkColor?: string;
+	textLinkActiveForeground?: string;
+	inputBackground?: string;
+	inputForeground?: string;
+	inputBorder?: string;
+	inputErrorBorder?: string;
+	inputErrorBackground?: string;
+	inputErrorForeground?: string;
+	inputActiveBorder?: string;
+	buttonBackground?: string;
+	buttonForeground?: string;
+	buttonHoverBackground?: string;
+	sliderBackgroundColor?: string;
+	sliderHoverColor?: string;
+	sliderActiveColor?: string;
+}
+
+export interface IssueReporterExtensionData {
+	name: string;
+	publisher: string | undefined;
+	version: string;
+	id: string;
+	isTheme: boolean;
+	isBuiltin: boolean;
+	displayName: string | undefined;
+	repositoryUrl: string | undefined;
+	bugsUrl: string | undefined;
+	extensionData?: string;
+	extensionTemplate?: string;
+	data?: string;
+	uri?: UriComponents;
+}
+
+export interface IssueReporterData extends WindowData {
+	styles: IssueReporterStyles;
+	enabledExtensions: IssueReporterExtensionData[];
+	issueType?: IssueType;
+	issueSource?: IssueSource;
+	extensionId?: string;
+	experiments?: string;
+	restrictedMode: boolean;
+	isUnsupported: boolean;
+	githubAccessToken: string;
+	issueTitle?: string;
+	issueBody?: string;
+	data?: string;
+	uri?: UriComponents;
+}
+
+export interface ISettingSearchResult {
+	extensionId: string;
+	key: string;
+	score: number;
+}
+
+export interface ProcessExplorerStyles extends WindowStyles {
+	listHoverBackground?: string;
+	listHoverForeground?: string;
+	listFocusBackground?: string;
+	listFocusForeground?: string;
+	listFocusOutline?: string;
+	listActiveSelectionBackground?: string;
+	listActiveSelectionForeground?: string;
+	listHoverOutline?: string;
+	scrollbarShadowColor?: string;
+	scrollbarSliderBackgroundColor?: string;
+	scrollbarSliderHoverBackgroundColor?: string;
+	scrollbarSliderActiveBackgroundColor?: string;
+}
+
+export interface ProcessExplorerData extends WindowData {
+	pid: number;
+	styles: ProcessExplorerStyles;
+	platform: string;
+	applicationName: string;
+}
+
+export interface IssueReporterWindowConfiguration extends ISandboxConfiguration {
+	disableExtensions: boolean;
+	data: IssueReporterData | OldIssueReporterData;
+	os: {
+		type: string;
+		arch: string;
+		release: string;
+	};
+}
+
+export interface ProcessExplorerWindowConfiguration extends ISandboxConfiguration {
+	data: ProcessExplorerData;
+}
+
+export const IIssueFormService = createDecorator<IIssueFormService>('issueFormService');
+
+export interface IIssueFormService {
+	readonly _serviceBrand: undefined;
+
+	// Used by the issue reporter
+	openReporter(data: IssueReporterData): Promise<void>;
+	reloadWithExtensionsDisabled(): Promise<void>;
+	showConfirmCloseDialog(): Promise<void>;
+	showClipboardDialog(): Promise<boolean>;
+	sendReporterMenu(extensionId: string): Promise<IssueReporterData | undefined>;
+	closeReporter(): Promise<void>;
+}
 
 export const IWorkbenchIssueService = createDecorator<IWorkbenchIssueService>('workbenchIssueService');
 
 export interface IWorkbenchIssueService {
 	readonly _serviceBrand: undefined;
 	openReporter(dataOverrides?: Partial<IssueReporterData>): Promise<void>;
+}
+
+export const IWorkbenchProcessService = createDecorator<IWorkbenchProcessService>('workbenchProcessService');
+
+export interface IWorkbenchProcessService {
+	readonly _serviceBrand: undefined;
 	openProcessExplorer(): Promise<void>;
 }
+
diff --git a/src/vs/workbench/contrib/issue/common/issueReporterUtil.ts b/src/vs/workbench/contrib/issue/common/issueReporterUtil.ts
new file mode 100644
index 00000000000..9378ffdf5db
--- /dev/null
+++ b/src/vs/workbench/contrib/issue/common/issueReporterUtil.ts
@@ -0,0 +1,26 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { rtrim } from '../../../../base/common/strings.js';
+
+export function normalizeGitHubUrl(url: string): string {
+	// If the url has a .git suffix, remove it
+	if (url.endsWith('.git')) {
+		url = url.substr(0, url.length - 4);
+	}
+
+	// Remove trailing slash
+	url = rtrim(url, '/');
+
+	if (url.endsWith('/new')) {
+		url = rtrim(url, '/new');
+	}
+
+	if (url.endsWith('/issues')) {
+		url = rtrim(url, '/issues');
+	}
+
+	return url;
+}
diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/issue.contribution.ts b/src/vs/workbench/contrib/issue/electron-sandbox/issue.contribution.ts
index 3b86046d12f..91a0f9b2706 100644
--- a/src/vs/workbench/contrib/issue/electron-sandbox/issue.contribution.ts
+++ b/src/vs/workbench/contrib/issue/electron-sandbox/issue.contribution.ts
@@ -3,33 +3,33 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize, localize2 } from 'vs/nls';
-import { MenuRegistry, MenuId, registerAction2, Action2 } from 'vs/platform/actions/common/actions';
-import { IWorkbenchIssueService } from 'vs/workbench/contrib/issue/common/issue';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { BaseIssueContribution } from 'vs/workbench/contrib/issue/common/issue.contribution';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Extensions, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
-import { IIssueMainService, IssueType } from 'vs/platform/issue/common/issue';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { IQuickAccessRegistry, Extensions as QuickAccessExtensions } from 'vs/platform/quickinput/common/quickAccess';
-import { IssueQuickAccess } from 'vs/workbench/contrib/issue/browser/issueQuickAccess';
-import 'vs/workbench/contrib/issue/electron-sandbox/issueMainService';
-import 'vs/workbench/contrib/issue/electron-sandbox/issueService';
-import 'vs/workbench/contrib/issue/browser/issueTroubleshoot';
+import { localize, localize2 } from '../../../../nls.js';
+import { registerAction2, Action2 } from '../../../../platform/actions/common/actions.js';
+import { IWorkbenchIssueService, IssueType, IIssueFormService } from '../common/issue.js';
+import { BaseIssueContribution } from '../common/issue.contribution.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Extensions, IWorkbenchContributionsRegistry } from '../../../common/contributions.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { IQuickAccessRegistry, Extensions as QuickAccessExtensions } from '../../../../platform/quickinput/common/quickAccess.js';
+import { IssueQuickAccess } from '../browser/issueQuickAccess.js';
+import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js';
+import { NativeIssueService } from './issueService.js';
+import './issueMainService.js';
+import '../browser/issueTroubleshoot.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { NativeIssueFormService } from './nativeIssueFormService.js';
 
 
 //#region Issue Contribution
 
+registerSingleton(IWorkbenchIssueService, NativeIssueService, InstantiationType.Delayed);
+registerSingleton(IIssueFormService, NativeIssueFormService, InstantiationType.Delayed);
+
 class NativeIssueContribution extends BaseIssueContribution {
 
 	constructor(
@@ -57,6 +57,16 @@ class NativeIssueContribution extends BaseIssueContribution {
 			});
 		};
 
+		Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).registerConfiguration({
+			properties: {
+				'issueReporter.experimental.auxWindow': {
+					type: 'boolean',
+					default: true,
+					description: 'Enable the new experimental issue reporter in electron.',
+				},
+			}
+		});
+
 		this._register(configurationService.onDidChangeConfiguration(e => {
 			if (!configurationService.getValue<boolean>('extensions.experimental.issueQuickAccess') && disposable) {
 				disposable.dispose();
@@ -87,87 +97,10 @@ class ReportPerformanceIssueUsingReporterAction extends Action2 {
 	}
 
 	override async run(accessor: ServicesAccessor): Promise<void> {
-		const issueService = accessor.get(IWorkbenchIssueService);
+		const issueService = accessor.get(IWorkbenchIssueService); // later can just get IIssueFormService
 
 		return issueService.openReporter({ issueType: IssueType.PerformanceIssue });
 	}
 }
 
-//#endregion
-
-//#region Commands
-
-class OpenProcessExplorer extends Action2 {
-
-	static readonly ID = 'workbench.action.openProcessExplorer';
-
-	constructor() {
-		super({
-			id: OpenProcessExplorer.ID,
-			title: localize2('openProcessExplorer', 'Open Process Explorer'),
-			category: Categories.Developer,
-			f1: true
-		});
-	}
-
-	override async run(accessor: ServicesAccessor): Promise<void> {
-		const issueService = accessor.get(IWorkbenchIssueService);
-
-		return issueService.openProcessExplorer();
-	}
-}
-registerAction2(OpenProcessExplorer);
-MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
-	group: '5_tools',
-	command: {
-		id: OpenProcessExplorer.ID,
-		title: localize({ key: 'miOpenProcessExplorerer', comment: ['&& denotes a mnemonic'] }, "Open &&Process Explorer")
-	},
-	order: 2
-});
-
-class StopTracing extends Action2 {
-
-	static readonly ID = 'workbench.action.stopTracing';
-
-	constructor() {
-		super({
-			id: StopTracing.ID,
-			title: localize2('stopTracing', 'Stop Tracing'),
-			category: Categories.Developer,
-			f1: true
-		});
-	}
-
-	override async run(accessor: ServicesAccessor): Promise<void> {
-		const issueService = accessor.get(IIssueMainService);
-		const environmentService = accessor.get(INativeEnvironmentService);
-		const dialogService = accessor.get(IDialogService);
-		const nativeHostService = accessor.get(INativeHostService);
-		const progressService = accessor.get(IProgressService);
-
-		if (!environmentService.args.trace) {
-			const { confirmed } = await dialogService.confirm({
-				message: localize('stopTracing.message', "Tracing requires to launch with a '--trace' argument"),
-				primaryButton: localize({ key: 'stopTracing.button', comment: ['&& denotes a mnemonic'] }, "&&Relaunch and Enable Tracing"),
-			});
-
-			if (confirmed) {
-				return nativeHostService.relaunch({ addArgs: ['--trace'] });
-			}
-		}
-
-		await progressService.withProgress({
-			location: ProgressLocation.Dialog,
-			title: localize('stopTracing.title', "Creating trace file..."),
-			cancellable: false,
-			detail: localize('stopTracing.detail', "This can take up to one minute to complete.")
-		}, () => issueService.stopTracing());
-	}
-}
-registerAction2(StopTracing);
-
-CommandsRegistry.registerCommand('_issues.getSystemStatus', (accessor) => {
-	return accessor.get(IIssueMainService).getSystemStatus();
-});
-//#endregion
+// #endregion
diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/issueMainService.ts b/src/vs/workbench/contrib/issue/electron-sandbox/issueMainService.ts
index a3cb28473af..32cbb69428d 100644
--- a/src/vs/workbench/contrib/issue/electron-sandbox/issueMainService.ts
+++ b/src/vs/workbench/contrib/issue/electron-sandbox/issueMainService.ts
@@ -3,7 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { registerMainProcessRemoteService } from 'vs/platform/ipc/electron-sandbox/services';
-import { IIssueMainService } from 'vs/platform/issue/common/issue';
+import { registerMainProcessRemoteService } from '../../../../platform/ipc/electron-sandbox/services.js';
+import { IProcessMainService, IIssueMainService } from '../../../../platform/issue/common/issue.js';
 
 registerMainProcessRemoteService(IIssueMainService, 'issue');
+registerMainProcessRemoteService(IProcessMainService, 'process');
+
diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporter-dev.html b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporter-dev.html
index 455e823692a..f14661a283c 100644
--- a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporter-dev.html
+++ b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporter-dev.html
@@ -15,6 +15,8 @@
 				;
 				script-src
 					'self'
+					blob:
+					'nonce-0c6a828f1297'
 				;
 				style-src
 					'self'
@@ -39,8 +41,6 @@
 	</body>
 
 	<!-- Startup (do not modify order of script tags!) -->
-	<script src="../../../../../bootstrap.js"></script>
-	<script src="../../../../../vs/loader.js"></script>
 	<script src="../../../../../bootstrap-window.js"></script>
-	<script src="issueReporter.js"></script>
+	<script src="./issueReporter.js"></script>
 </html>
diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporter.html b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporter.html
index c6290004d2d..2f87d2489ce 100644
--- a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporter.html
+++ b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporter.html
@@ -15,6 +15,8 @@
 				;
 				script-src
 					'self'
+					blob:
+					'nonce-0c6a828f1297'
 				;
 				style-src
 					'self'
@@ -39,5 +41,5 @@
 	</body>
 
 	<!-- Startup (do not modify order of script tags!) -->
-	<script src="issueReporter.js"></script>
+	<script src="./issueReporter.js" type="module"></script>
 </html>
diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporter.js b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporter.js
deleted file mode 100644
index cad5ddba090..00000000000
--- a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporter.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-//@ts-check
-(function () {
-	'use strict';
-
-	const bootstrapWindow = bootstrapWindowLib();
-
-	// Load issue reporter into window
-	bootstrapWindow.load(['vs/workbench/contrib/issue/electron-sandbox/issueReporterMain'], function (issueReporter, configuration) {
-		return issueReporter.startup(configuration);
-	},
-		{
-			configureDeveloperSettings: function () {
-				return {
-					forceEnableDeveloperKeybindings: true,
-					disallowReloadKeybinding: true
-				};
-			}
-		}
-	);
-
-	/**
-	 * @typedef {import('../../../../base/parts/sandbox/common/sandboxTypes').ISandboxConfiguration} ISandboxConfiguration
-	 *
-	 * @returns {{
-	 *   load: (
-	 *     modules: string[],
-	 *     resultCallback: (result, configuration: ISandboxConfiguration) => unknown,
-	 *     options?: {
-	 *       configureDeveloperSettings?: (config: ISandboxConfiguration) => {
-	 * 			forceEnableDeveloperKeybindings?: boolean,
-	 * 			disallowReloadKeybinding?: boolean,
-	 * 			removeDeveloperKeybindingsAfterLoad?: boolean
-	 * 		 }
-	 *     }
-	 *   ) => Promise<unknown>
-	 * }}
-	 */
-	function bootstrapWindowLib() {
-		// @ts-ignore (defined in bootstrap-window.js)
-		return window.MonacoBootstrapWindow;
-	}
-}());
diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporter.ts b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporter.ts
new file mode 100644
index 00000000000..629a6185ccb
--- /dev/null
+++ b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporter.ts
@@ -0,0 +1,26 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/* eslint-disable no-restricted-globals */
+
+(async function () {
+
+	type IBootstrapWindow = import('vs/platform/window/electron-sandbox/window.js').IBootstrapWindow;
+	type IIssueReporterMain = import('vs/workbench/contrib/issue/electron-sandbox/issueReporterMain').IIssueReporterMain;
+	type OldIssueReporterWindowConfiguration = import('vs/platform/issue/common/issue.js').OldIssueReporterWindowConfiguration;
+
+	const bootstrapWindow: IBootstrapWindow = (window as any).MonacoBootstrapWindow; // defined by bootstrap-window.ts
+
+	const { result, configuration } = await bootstrapWindow.load<IIssueReporterMain, OldIssueReporterWindowConfiguration>('vs/workbench/contrib/issue/electron-sandbox/issueReporterMain', {
+		configureDeveloperSettings: function () {
+			return {
+				forceEnableDeveloperKeybindings: true,
+				disallowReloadKeybinding: true
+			};
+		}
+	});
+
+	result.startup(configuration);
+}());
diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterMain.ts b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterMain.ts
index 05f002de532..fa1628e3be8 100644
--- a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterMain.ts
+++ b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterMain.ts
@@ -3,25 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { safeInnerHtml } from 'vs/base/browser/dom';
-import 'vs/base/browser/ui/codicons/codiconStyles'; // make sure codicon css is loaded
-import { isLinux, isWindows } from 'vs/base/common/platform';
-import BaseHtml from 'vs/workbench/contrib/issue/browser/issueReporterPage';
-import 'vs/css!./media/issueReporter';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { getSingletonServiceDescriptors } from 'vs/platform/instantiation/common/extensions';
-import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IMainProcessService } from 'vs/platform/ipc/common/mainProcessService';
-import { ElectronIPCMainProcessService } from 'vs/platform/ipc/electron-sandbox/mainProcessService';
-import { registerMainProcessRemoteService } from 'vs/platform/ipc/electron-sandbox/services';
-import { IIssueMainService, IssueReporterWindowConfiguration } from 'vs/platform/issue/common/issue';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { NativeHostService } from 'vs/platform/native/common/nativeHostService';
-import { IssueReporter2 } from 'vs/workbench/contrib/issue/electron-sandbox/issueReporterService2';
-import { mainWindow } from 'vs/base/browser/window';
+import { safeInnerHtml } from '../../../../base/browser/dom.js';
+import '../../../../base/browser/ui/codicons/codiconStyles.js'; // make sure codicon css is loaded
+import { mainWindow } from '../../../../base/browser/window.js';
+import { isLinux, isWindows } from '../../../../base/common/platform.js';
+import './media/issueReporter.css';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { getSingletonServiceDescriptors } from '../../../../platform/instantiation/common/extensions.js';
+import { InstantiationService } from '../../../../platform/instantiation/common/instantiationService.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { IMainProcessService } from '../../../../platform/ipc/common/mainProcessService.js';
+import { ElectronIPCMainProcessService } from '../../../../platform/ipc/electron-sandbox/mainProcessService.js';
+import { registerMainProcessRemoteService } from '../../../../platform/ipc/electron-sandbox/services.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { NativeHostService } from '../../../../platform/native/common/nativeHostService.js';
+import BaseHtml from '../browser/issueReporterPage.js';
+import { IProcessMainService, IIssueMainService, OldIssueReporterWindowConfiguration } from '../../../../platform/issue/common/issue.js';
+import { IssueReporter } from './issueReporterService.js';
 
-export function startup(configuration: IssueReporterWindowConfiguration) {
+export interface IIssueReporterMain {
+	startup(configuration: OldIssueReporterWindowConfiguration): void;
+}
+
+export function startup(configuration: OldIssueReporterWindowConfiguration): void {
 	const platformClass = isWindows ? 'windows' : isLinux ? 'linux' : 'mac';
 	mainWindow.document.body.classList.add(platformClass); // used by our fonts
 
@@ -29,7 +33,7 @@ export function startup(configuration: IssueReporterWindowConfiguration) {
 
 	const instantiationService = initServices(configuration.windowId);
 
-	const issueReporter = instantiationService.createInstance(IssueReporter2, configuration);
+	const issueReporter = instantiationService.createInstance(IssueReporter, configuration);
 	issueReporter.render();
 	mainWindow.document.body.style.display = 'block';
 	issueReporter.setInitialFocus();
@@ -50,3 +54,4 @@ function initServices(windowId: number) {
 }
 
 registerMainProcessRemoteService(IIssueMainService, 'issue');
+registerMainProcessRemoteService(IProcessMainService, 'process');
diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService.ts b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService.ts
index 88509ea5334..bc6f5eb9de2 100644
--- a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService.ts
+++ b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService.ts
@@ -2,28 +2,28 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { $, createStyleSheet, isHTMLInputElement, isHTMLTextAreaElement, reset, windowOpenNoOpener } from 'vs/base/browser/dom';
-import { Button, unthemedButtonStyles } from 'vs/base/browser/ui/button/button';
-import { renderIcon } from 'vs/base/browser/ui/iconLabel/iconLabels';
-import { mainWindow } from 'vs/base/browser/window';
-import { Delayer, RunOnceScheduler } from 'vs/base/common/async';
-import { Codicon } from 'vs/base/common/codicons';
-import { groupBy } from 'vs/base/common/collections';
-import { debounce } from 'vs/base/common/decorators';
-import { CancellationError } from 'vs/base/common/errors';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { isLinuxSnap, isMacintosh } from 'vs/base/common/platform';
-import { escape } from 'vs/base/common/strings';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { URI } from 'vs/base/common/uri';
-import { IssueReporterModel, IssueReporterData as IssueReporterModelData } from 'vs/workbench/contrib/issue/browser/issueReporterModel';
-import { localize } from 'vs/nls';
-import { isRemoteDiagnosticError } from 'vs/platform/diagnostics/common/diagnostics';
-import { IIssueMainService, IssueReporterData, IssueReporterExtensionData, IssueReporterStyles, IssueReporterWindowConfiguration, IssueType } from 'vs/platform/issue/common/issue';
-import { normalizeGitHubUrl } from 'vs/platform/issue/common/issueReporterUtil';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { getIconsStyleSheet } from 'vs/platform/theme/browser/iconsStyleSheet';
-import { applyZoom, zoomIn, zoomOut } from 'vs/platform/window/electron-sandbox/window';
+import { $, createStyleSheet, isHTMLInputElement, isHTMLTextAreaElement, reset, windowOpenNoOpener } from '../../../../base/browser/dom.js';
+import { Button, unthemedButtonStyles } from '../../../../base/browser/ui/button/button.js';
+import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { Delayer, RunOnceScheduler } from '../../../../base/common/async.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { groupBy } from '../../../../base/common/collections.js';
+import { debounce } from '../../../../base/common/decorators.js';
+import { CancellationError } from '../../../../base/common/errors.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { isLinuxSnap, isMacintosh } from '../../../../base/common/platform.js';
+import { escape } from '../../../../base/common/strings.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { URI } from '../../../../base/common/uri.js';
+import { localize } from '../../../../nls.js';
+import { isRemoteDiagnosticError } from '../../../../platform/diagnostics/common/diagnostics.js';
+import { IIssueMainService, IProcessMainService, OldIssueReporterData, OldIssueReporterExtensionData, OldIssueReporterStyles, OldIssueReporterWindowConfiguration, OldIssueType } from '../../../../platform/issue/common/issue.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { getIconsStyleSheet } from '../../../../platform/theme/browser/iconsStyleSheet.js';
+import { applyZoom, zoomIn, zoomOut } from '../../../../platform/window/electron-sandbox/window.js';
+import { IssueReporterData, IssueReporterModel, IssueReporterData as IssueReporterModelData } from '../browser/issueReporterModel.js';
+import { normalizeGitHubUrl } from '../common/issueReporterUtil.js';
 
 // GitHub has let us know that we could up our limit here to 8k. We chose 7500 to play it safe.
 // ref https://github.com/microsoft/vscode/issues/159191
@@ -57,15 +57,16 @@ export class IssueReporter extends Disposable {
 	private nonGitHubIssueUrl = false;
 
 	constructor(
-		private readonly configuration: IssueReporterWindowConfiguration,
+		private readonly configuration: OldIssueReporterWindowConfiguration,
 		@INativeHostService private readonly nativeHostService: INativeHostService,
-		@IIssueMainService private readonly issueMainService: IIssueMainService
+		@IIssueMainService private readonly issueMainService: IIssueMainService,
+		@IProcessMainService private readonly processMainService: IProcessMainService
 	) {
 		super();
 		const targetExtension = configuration.data.extensionId ? configuration.data.enabledExtensions.find(extension => extension.id.toLocaleLowerCase() === configuration.data.extensionId?.toLocaleLowerCase()) : undefined;
 		this.issueReporterModel = new IssueReporterModel({
 			...configuration.data,
-			issueType: configuration.data.issueType || IssueType.Bug,
+			issueType: configuration.data.issueType || OldIssueType.Bug,
 			versionInfo: {
 				vscodeVersion: `${configuration.product.nameShort} ${!!configuration.product.darwinUniversalAssetId ? `${configuration.product.version} (Universal)` : configuration.product.version} (${configuration.product.commit || 'Commit unknown'}, ${configuration.product.date || 'Date unknown'})`,
 				os: `${this.configuration.os.type} ${this.configuration.os.arch} ${this.configuration.os.release}${isLinuxSnap ? ' snap' : ''}`
@@ -107,15 +108,15 @@ export class IssueReporter extends Disposable {
 			}
 		}
 
-		this.issueMainService.$getSystemInfo().then(info => {
+		this.processMainService.$getSystemInfo().then(info => {
 			this.issueReporterModel.update({ systemInfo: info });
 			this.receivedSystemInfo = true;
 
 			this.updateSystemInfo(this.issueReporterModel.getData());
 			this.updatePreviewButtonState();
 		});
-		if (configuration.data.issueType === IssueType.PerformanceIssue) {
-			this.issueMainService.$getPerformanceInfo().then(info => {
+		if (configuration.data.issueType === OldIssueType.PerformanceIssue) {
+			this.processMainService.$getPerformanceInfo().then(info => {
 				this.updatePerformanceInfo(info as Partial<IssueReporterData>);
 			});
 		}
@@ -168,7 +169,7 @@ export class IssueReporter extends Disposable {
 	}
 
 	// TODO @justschen: After migration to Aux Window, switch to dedicated css.
-	private applyStyles(styles: IssueReporterStyles) {
+	private applyStyles(styles: OldIssueReporterStyles) {
 		const styleTag = document.createElement('style');
 		const content: string[] = [];
 
@@ -244,7 +245,7 @@ export class IssueReporter extends Disposable {
 		mainWindow.document.body.style.color = styles.color || '';
 	}
 
-	private handleExtensionData(extensions: IssueReporterExtensionData[]) {
+	private handleExtensionData(extensions: OldIssueReporterExtensionData[]) {
 		const installedExtensions = extensions.filter(x => !x.isBuiltin);
 		const { nonThemes, themes } = groupBy(installedExtensions, ext => {
 			return ext.isTheme ? 'themes' : 'nonThemes';
@@ -260,7 +261,7 @@ export class IssueReporter extends Disposable {
 		this.updateExtensionSelector(installedExtensions);
 	}
 
-	private async updateIssueReporterUri(extension: IssueReporterExtensionData): Promise<void> {
+	private async updateIssueReporterUri(extension: OldIssueReporterExtensionData): Promise<void> {
 		try {
 			if (extension.uri) {
 				const uri = URI.revive(extension.uri);
@@ -271,7 +272,7 @@ export class IssueReporter extends Disposable {
 		}
 	}
 
-	private async sendReporterMenu(extension: IssueReporterExtensionData): Promise<IssueReporterData | undefined> {
+	private async sendReporterMenu(extension: OldIssueReporterExtensionData): Promise<OldIssueReporterData | undefined> {
 		try {
 			const data = await this.issueMainService.$sendReporterMenu(extension.id, extension.name);
 			return data;
@@ -285,8 +286,8 @@ export class IssueReporter extends Disposable {
 		this.addEventListener('issue-type', 'change', (event: Event) => {
 			const issueType = parseInt((<HTMLInputElement>event.target).value);
 			this.issueReporterModel.update({ issueType: issueType });
-			if (issueType === IssueType.PerformanceIssue && !this.receivedPerformanceInfo) {
-				this.issueMainService.$getPerformanceInfo().then(info => {
+			if (issueType === OldIssueType.PerformanceIssue && !this.receivedPerformanceInfo) {
+				this.processMainService.$getPerformanceInfo().then(info => {
 					this.updatePerformanceInfo(info as Partial<IssueReporterData>);
 				});
 			}
@@ -525,15 +526,15 @@ export class IssueReporter extends Disposable {
 			return false;
 		}
 
-		if (issueType === IssueType.Bug && this.receivedSystemInfo) {
+		if (issueType === OldIssueType.Bug && this.receivedSystemInfo) {
 			return true;
 		}
 
-		if (issueType === IssueType.PerformanceIssue && this.receivedSystemInfo && this.receivedPerformanceInfo) {
+		if (issueType === OldIssueType.PerformanceIssue && this.receivedSystemInfo && this.receivedPerformanceInfo) {
 			return true;
 		}
 
-		if (issueType === IssueType.FeatureRequest) {
+		if (issueType === OldIssueType.FeatureRequest) {
 			return true;
 		}
 
@@ -724,14 +725,14 @@ export class IssueReporter extends Disposable {
 	}
 
 	private setUpTypes(): void {
-		const makeOption = (issueType: IssueType, description: string) => $('option', { 'value': issueType.valueOf() }, escape(description));
+		const makeOption = (issueType: OldIssueType, description: string) => $('option', { 'value': issueType.valueOf() }, escape(description));
 
 		const typeSelect = this.getElementById('issue-type')! as HTMLSelectElement;
 		const { issueType } = this.issueReporterModel.getData();
 		reset(typeSelect,
-			makeOption(IssueType.Bug, localize('bugReporter', "Bug Report")),
-			makeOption(IssueType.FeatureRequest, localize('featureRequest', "Feature Request")),
-			makeOption(IssueType.PerformanceIssue, localize('performanceIssue', "Performance Issue (freeze, slow, crash)"))
+			makeOption(OldIssueType.Bug, localize('bugReporter', "Bug Report")),
+			makeOption(OldIssueType.FeatureRequest, localize('featureRequest', "Feature Request")),
+			makeOption(OldIssueType.PerformanceIssue, localize('performanceIssue', "Performance Issue (freeze, slow, crash)"))
 		);
 
 		typeSelect.value = issueType.toString();
@@ -772,7 +773,7 @@ export class IssueReporter extends Disposable {
 			sourceSelect.append(this.makeOption(IssueSource.Marketplace, localize('marketplace', "Extensions Marketplace"), false));
 		}
 
-		if (issueType !== IssueType.FeatureRequest) {
+		if (issueType !== OldIssueType.FeatureRequest) {
 			sourceSelect.append(this.makeOption(IssueSource.Unknown, localize('unknown', "Don't know"), false));
 		}
 
@@ -851,7 +852,7 @@ export class IssueReporter extends Disposable {
 			}, 100);
 		}
 
-		if (issueType === IssueType.Bug) {
+		if (issueType === OldIssueType.Bug) {
 			if (!fileOnMarketplace) {
 				show(blockContainer);
 				show(systemBlock);
@@ -863,7 +864,7 @@ export class IssueReporter extends Disposable {
 
 			reset(descriptionTitle, localize('stepsToReproduce', "Steps to Reproduce") + ' ', $('span.required-input', undefined, '*'));
 			reset(descriptionSubtitle, localize('bugDescription', "Share the steps needed to reliably reproduce the problem. Please include actual and expected results. We support GitHub-flavored Markdown. You will be able to edit your issue and add screenshots when we preview it on GitHub."));
-		} else if (issueType === IssueType.PerformanceIssue) {
+		} else if (issueType === OldIssueType.PerformanceIssue) {
 			if (!fileOnMarketplace) {
 				show(blockContainer);
 				show(systemBlock);
@@ -880,7 +881,7 @@ export class IssueReporter extends Disposable {
 
 			reset(descriptionTitle, localize('stepsToReproduce', "Steps to Reproduce") + ' ', $('span.required-input', undefined, '*'));
 			reset(descriptionSubtitle, localize('performanceIssueDesciption', "When did this performance issue happen? Does it occur on startup or after a specific series of actions? We support GitHub-flavored Markdown. You will be able to edit your issue and add screenshots when we preview it on GitHub."));
-		} else if (issueType === IssueType.FeatureRequest) {
+		} else if (issueType === OldIssueType.FeatureRequest) {
 			reset(descriptionTitle, localize('description', "Description") + ' ', $('span.required-input', undefined, '*'));
 			reset(descriptionSubtitle, localize('featureRequestDescription', "Please describe the feature you would like to see. We support GitHub-flavored Markdown. You will be able to edit your issue and add screenshots when we preview it on GitHub."));
 		}
@@ -1008,9 +1009,6 @@ export class IssueReporter extends Disposable {
 		}
 
 		const gitHubDetails = this.parseGitHubUrl(issueUrl);
-		if (this.configuration.data.githubAccessToken && gitHubDetails) {
-			return this.submitToGitHub(issueTitle, issueBody, gitHubDetails);
-		}
 
 		const baseUrl = this.getIssueUrlWithTitle((<HTMLInputElement>this.getElementById('issue-title')).value, issueUrl);
 		let url = baseUrl + `&body=${encodeURIComponent(issueBody)}`;
@@ -1022,6 +1020,8 @@ export class IssueReporter extends Disposable {
 				console.error('Writing to clipboard failed');
 				return false;
 			}
+		} else if (this.configuration.data.githubAccessToken && gitHubDetails) {
+			return this.submitToGitHub(issueTitle, issueBody, gitHubDetails);
 		}
 
 		await this.nativeHostService.openExternal(url);
@@ -1171,7 +1171,7 @@ export class IssueReporter extends Disposable {
 		}
 	}
 
-	private updateExtensionSelector(extensions: IssueReporterExtensionData[]): void {
+	private updateExtensionSelector(extensions: OldIssueReporterExtensionData[]): void {
 		interface IOption {
 			name: string;
 			id: string;
@@ -1199,7 +1199,7 @@ export class IssueReporter extends Disposable {
 			return 0;
 		});
 
-		const makeOption = (extension: IOption, selectedExtension?: IssueReporterExtensionData): HTMLOptionElement => {
+		const makeOption = (extension: IOption, selectedExtension?: OldIssueReporterExtensionData): HTMLOptionElement => {
 			const selected = selectedExtension && extension.id === selectedExtension.id;
 			return $<HTMLOptionElement>('option', {
 				'value': extension.id,
@@ -1278,7 +1278,7 @@ export class IssueReporter extends Disposable {
 		this.configuration.data.uri = undefined;
 	}
 
-	private async updateExtensionStatus(extension: IssueReporterExtensionData) {
+	private async updateExtensionStatus(extension: OldIssueReporterExtensionData) {
 		this.issueReporterModel.update({ selectedExtension: extension });
 
 		// uses this.configuuration.data to ensure that data is coming from `openReporter` command.
@@ -1415,7 +1415,7 @@ export class IssueReporter extends Disposable {
 		mainWindow.document.querySelector('.block-workspace .block-info code')!.textContent = '\n' + state.workspaceInfo;
 	}
 
-	private updateExtensionTable(extensions: IssueReporterExtensionData[], numThemeExtensions: number): void {
+	private updateExtensionTable(extensions: OldIssueReporterExtensionData[], numThemeExtensions: number): void {
 		const target = mainWindow.document.querySelector<HTMLElement>('.block-extensions .block-info');
 		if (target) {
 			if (this.configuration.disableExtensions) {
@@ -1451,7 +1451,7 @@ export class IssueReporter extends Disposable {
 		}
 	}
 
-	private getExtensionTableHtml(extensions: IssueReporterExtensionData[]): HTMLTableElement {
+	private getExtensionTableHtml(extensions: OldIssueReporterExtensionData[]): HTMLTableElement {
 		return $('table', undefined,
 			$('tr', undefined,
 				$('th', undefined, 'Extension'),
diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService2.ts b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService2.ts
index cac5030a2c6..305ee9a7bc9 100644
--- a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService2.ts
+++ b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService2.ts
@@ -2,21 +2,19 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { $, isHTMLInputElement, isHTMLTextAreaElement, reset, windowOpenNoOpener } from 'vs/base/browser/dom';
-import { mainWindow } from 'vs/base/browser/window';
-import { Codicon } from 'vs/base/common/codicons';
-import { groupBy } from 'vs/base/common/collections';
-import { CancellationError } from 'vs/base/common/errors';
-import { isMacintosh } from 'vs/base/common/platform';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { isRemoteDiagnosticError } from 'vs/platform/diagnostics/common/diagnostics';
-import { IIssueMainService, IssueReporterData, IssueReporterExtensionData, IssueReporterWindowConfiguration, IssueType } from 'vs/platform/issue/common/issue';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { applyZoom, zoomIn, zoomOut } from 'vs/platform/window/electron-sandbox/window';
-import { BaseIssueReporterService, hide, show } from 'vs/workbench/contrib/issue/browser/issue';
-import { IssueReporterData as IssueReporterModelData } from 'vs/workbench/contrib/issue/browser/issueReporterModel';
+import { $, reset } from '../../../../base/browser/dom.js';
+import { CancellationError } from '../../../../base/common/errors.js';
+import { IProductConfiguration } from '../../../../base/common/product.js';
+import { URI } from '../../../../base/common/uri.js';
+import { localize } from '../../../../nls.js';
+import { isRemoteDiagnosticError } from '../../../../platform/diagnostics/common/diagnostics.js';
+import { IProcessMainService } from '../../../../platform/issue/common/issue.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { applyZoom } from '../../../../platform/window/electron-sandbox/window.js';
+import { BaseIssueReporterService } from '../browser/baseIssueReporterService.js';
+import { IssueReporterData as IssueReporterModelData } from '../browser/issueReporterModel.js';
+import { IIssueFormService, IssueReporterData, IssueType } from '../common/issue.js';
 
 // GitHub has let us know that we could up our limit here to 8k. We chose 7500 to play it safe.
 // ref https://github.com/microsoft/vscode/issues/159191
@@ -24,134 +22,66 @@ const MAX_URL_LENGTH = 7500;
 
 
 export class IssueReporter2 extends BaseIssueReporterService {
+	private readonly processMainService: IProcessMainService;
 	constructor(
-		private readonly configuration: IssueReporterWindowConfiguration,
+		disableExtensions: boolean,
+		data: IssueReporterData,
+		os: {
+			type: string;
+			arch: string;
+			release: string;
+		},
+		product: IProductConfiguration,
+		window: Window,
 		@INativeHostService private readonly nativeHostService: INativeHostService,
-		@IIssueMainService issueMainService: IIssueMainService
+		@IIssueFormService issueFormService: IIssueFormService,
+		@IProcessMainService processMainService: IProcessMainService,
+		@IThemeService themeService: IThemeService
 	) {
-		super(configuration.disableExtensions, configuration.data, configuration.os, configuration.product, mainWindow, false, issueMainService);
-
-		this.issueMainService.$getSystemInfo().then(info => {
+		super(disableExtensions, data, os, product, window, false, issueFormService, themeService);
+		this.processMainService = processMainService;
+		this.processMainService.$getSystemInfo().then(info => {
 			this.issueReporterModel.update({ systemInfo: info });
 			this.receivedSystemInfo = true;
 
 			this.updateSystemInfo(this.issueReporterModel.getData());
 			this.updatePreviewButtonState();
 		});
-		if (configuration.data.issueType === IssueType.PerformanceIssue) {
-			this.issueMainService.$getPerformanceInfo().then(info => {
+		if (this.data.issueType === IssueType.PerformanceIssue) {
+			this.processMainService.$getPerformanceInfo().then(info => {
 				this.updatePerformanceInfo(info as Partial<IssueReporterData>);
 			});
 		}
 
 		this.setEventHandlers();
-		applyZoom(configuration.data.zoomLevel, mainWindow);
-		this.handleExtensionData(configuration.data.enabledExtensions);
-		this.updateExperimentsInfo(configuration.data.experiments);
-		this.updateRestrictedMode(configuration.data.restrictedMode);
-		this.updateUnsupportedMode(configuration.data.isUnsupported);
-	}
-
-	private handleExtensionData(extensions: IssueReporterExtensionData[]) {
-		const installedExtensions = extensions.filter(x => !x.isBuiltin);
-		const { nonThemes, themes } = groupBy(installedExtensions, ext => {
-			return ext.isTheme ? 'themes' : 'nonThemes';
-		});
-
-		const numberOfThemeExtesions = themes && themes.length;
-		this.issueReporterModel.update({ numberOfThemeExtesions, enabledNonThemeExtesions: nonThemes, allExtensions: installedExtensions });
-		this.updateExtensionTable(nonThemes, numberOfThemeExtesions);
-		if (this.disableExtensions || installedExtensions.length === 0) {
-			(<HTMLButtonElement>this.getElementById('disableExtensions')).disabled = true;
-		}
-
-		this.updateExtensionSelector(installedExtensions);
-	}
-
-	private async sendReporterMenu(extension: IssueReporterExtensionData): Promise<IssueReporterData | undefined> {
-		try {
-			const data = await this.issueMainService.$sendReporterMenu(extension.id, extension.name);
-			return data;
-		} catch (e) {
-			console.error(e);
-			return undefined;
-		}
+		applyZoom(this.data.zoomLevel, this.window);
+		this.updateExperimentsInfo(this.data.experiments);
+		this.updateRestrictedMode(this.data.restrictedMode);
+		this.updateUnsupportedMode(this.data.isUnsupported);
 	}
 
 	public override setEventHandlers(): void {
 		super.setEventHandlers();
 
-		// Keep all event listerns involving window and issue creation
-		this.previewButton.onDidClick(async () => {
-			this.delayedSubmit.trigger(async () => {
-				this.createIssue();
-			});
-		});
-
-		this.addEventListener('disableExtensions', 'click', () => {
-			this.issueMainService.$reloadWithExtensionsDisabled();
-		});
-
-		this.addEventListener('extensionBugsLink', 'click', (e: Event) => {
-			const url = (<HTMLElement>e.target).innerText;
-			windowOpenNoOpener(url);
-		});
-
-		this.addEventListener('disableExtensions', 'keydown', (e: Event) => {
-			e.stopPropagation();
-			if ((e as KeyboardEvent).keyCode === 13 || (e as KeyboardEvent).keyCode === 32) {
-				this.issueMainService.$reloadWithExtensionsDisabled();
-			}
-		});
-
-
-		// THIS IS THE MAIN IMPORTANT PART
-		mainWindow.document.onkeydown = async (e: KeyboardEvent) => {
-			const cmdOrCtrlKey = isMacintosh ? e.metaKey : e.ctrlKey;
-			// Cmd/Ctrl+Enter previews issue and closes window
-			if (cmdOrCtrlKey && e.key === 'Enter') {
-				this.delayedSubmit.trigger(async () => {
-					if (await this.createIssue()) {
-						this.close();
-					}
+		this.addEventListener('issue-type', 'change', (event: Event) => {
+			const issueType = parseInt((<HTMLInputElement>event.target).value);
+			this.issueReporterModel.update({ issueType: issueType });
+			if (issueType === IssueType.PerformanceIssue && !this.receivedPerformanceInfo) {
+				this.processMainService.$getPerformanceInfo().then(info => {
+					this.updatePerformanceInfo(info as Partial<IssueReporterData>);
 				});
 			}
 
-			// Cmd/Ctrl + w closes issue window
-			if (cmdOrCtrlKey && e.key === 'w') {
-				e.stopPropagation();
-				e.preventDefault();
-
-				const issueTitle = (<HTMLInputElement>this.getElementById('issue-title'))!.value;
-				const { issueDescription } = this.issueReporterModel.getData();
-				if (!this.hasBeenSubmitted && (issueTitle || issueDescription)) {
-					// fire and forget
-					this.issueMainService.$showConfirmCloseDialog();
-				} else {
-					this.close();
-				}
+			// Resets placeholder
+			const descriptionTextArea = <HTMLInputElement>this.getElementById('issue-title');
+			if (descriptionTextArea) {
+				descriptionTextArea.placeholder = localize('undefinedPlaceholder', "Please enter a title");
 			}
 
-			// Cmd/Ctrl + zooms in
-			if (cmdOrCtrlKey && (e.key === '+' || e.key === '=')) {
-				zoomIn(mainWindow);
-			}
-
-			// Cmd/Ctrl - zooms out
-			if (cmdOrCtrlKey && e.key === '-') {
-				zoomOut(mainWindow);
-			}
-
-			// With latest electron upgrade, cmd+a is no longer propagating correctly for inputs in this window on mac
-			// Manually perform the selection
-			if (isMacintosh) {
-				if (cmdOrCtrlKey && e.key === 'a' && e.target) {
-					if (isHTMLInputElement(e.target) || isHTMLTextAreaElement(e.target)) {
-						(<HTMLInputElement>e.target).select();
-					}
-				}
-			}
-		};
+			this.updatePreviewButtonState();
+			this.setSourceOptions();
+			this.render();
+		});
 	}
 
 	public override async submitToGitHub(issueTitle: string, issueBody: string, gitHubDetails: { owner: string; repositoryName: string }): Promise<boolean> {
@@ -195,7 +125,7 @@ export class IssueReporter2 extends BaseIssueReporterService {
 		if (!this.validateInputs()) {
 			// If inputs are invalid, set focus to the first one and add listeners on them
 			// to detect further changes
-			const invalidInput = mainWindow.document.getElementsByClassName('invalid-input');
+			const invalidInput = this.window.document.getElementsByClassName('invalid-input');
 			if (invalidInput.length) {
 				(<HTMLInputElement>invalidInput[0]).focus();
 			}
@@ -215,6 +145,7 @@ export class IssueReporter2 extends BaseIssueReporterService {
 			if (this.issueReporterModel.fileOnExtension()) {
 				this.addEventListener('extension-selector', 'change', _ => {
 					this.validateInput('extension-selector');
+					this.validateInput('description');
 				});
 			}
 
@@ -238,9 +169,6 @@ export class IssueReporter2 extends BaseIssueReporterService {
 		}
 
 		const gitHubDetails = this.parseGitHubUrl(issueUrl);
-		if (this.data.githubAccessToken && gitHubDetails) {
-			return this.submitToGitHub(issueTitle, issueBody, gitHubDetails);
-		}
 
 		const baseUrl = this.getIssueUrlWithTitle((<HTMLInputElement>this.getElementById('issue-title')).value, issueUrl);
 		let url = baseUrl + `&body=${encodeURIComponent(issueBody)}`;
@@ -252,6 +180,8 @@ export class IssueReporter2 extends BaseIssueReporterService {
 				console.error('Writing to clipboard failed');
 				return false;
 			}
+		} else if (this.data.githubAccessToken && gitHubDetails) {
+			return this.submitToGitHub(issueTitle, issueBody, gitHubDetails);
 		}
 
 		await this.nativeHostService.openExternal(url);
@@ -259,7 +189,7 @@ export class IssueReporter2 extends BaseIssueReporterService {
 	}
 
 	public override async writeToClipboard(baseUrl: string, issueBody: string): Promise<string> {
-		const shouldWrite = await this.issueMainService.$showClipboardDialog();
+		const shouldWrite = await this.issueFormService.showClipboardDialog();
 		if (!shouldWrite) {
 			throw new CancellationError();
 		}
@@ -270,7 +200,7 @@ export class IssueReporter2 extends BaseIssueReporterService {
 	}
 
 	private updateSystemInfo(state: IssueReporterModelData) {
-		const target = mainWindow.document.querySelector<HTMLElement>('.block-system .block-info');
+		const target = this.window.document.querySelector<HTMLElement>('.block-system .block-info');
 
 		if (target) {
 			const systemInfo = state.systemInfo!;
@@ -349,147 +279,6 @@ export class IssueReporter2 extends BaseIssueReporterService {
 		}
 	}
 
-	public updateExtensionSelector(extensions: IssueReporterExtensionData[]): void {
-		interface IOption {
-			name: string;
-			id: string;
-		}
-
-		const extensionOptions: IOption[] = extensions.map(extension => {
-			return {
-				name: extension.displayName || extension.name || '',
-				id: extension.id
-			};
-		});
-
-		// Sort extensions by name
-		extensionOptions.sort((a, b) => {
-			const aName = a.name.toLowerCase();
-			const bName = b.name.toLowerCase();
-			if (aName > bName) {
-				return 1;
-			}
-
-			if (aName < bName) {
-				return -1;
-			}
-
-			return 0;
-		});
-
-		const makeOption = (extension: IOption, selectedExtension?: IssueReporterExtensionData): HTMLOptionElement => {
-			const selected = selectedExtension && extension.id === selectedExtension.id;
-			return $<HTMLOptionElement>('option', {
-				'value': extension.id,
-				'selected': selected || ''
-			}, extension.name);
-		};
-
-		const extensionsSelector = this.getElementById<HTMLSelectElement>('extension-selector');
-		if (extensionsSelector) {
-			const { selectedExtension } = this.issueReporterModel.getData();
-			reset(extensionsSelector, this.makeOption('', localize('selectExtension', "Select extension"), true), ...extensionOptions.map(extension => makeOption(extension, selectedExtension)));
-
-			if (!selectedExtension) {
-				extensionsSelector.selectedIndex = 0;
-			}
-
-			this.addEventListener('extension-selector', 'change', async (e: Event) => {
-				this.clearExtensionData();
-				const selectedExtensionId = (<HTMLInputElement>e.target).value;
-				this.selectedExtension = selectedExtensionId;
-				const extensions = this.issueReporterModel.getData().allExtensions;
-				const matches = extensions.filter(extension => extension.id === selectedExtensionId);
-				if (matches.length) {
-					this.issueReporterModel.update({ selectedExtension: matches[0] });
-					const selectedExtension = this.issueReporterModel.getData().selectedExtension;
-					if (selectedExtension) {
-						const iconElement = document.createElement('span');
-						iconElement.classList.add(...ThemeIcon.asClassNameArray(Codicon.loading), 'codicon-modifier-spin');
-						this.setLoading(iconElement);
-						const openReporterData = await this.sendReporterMenu(selectedExtension);
-						if (openReporterData) {
-							if (this.selectedExtension === selectedExtensionId) {
-								this.removeLoading(iconElement, true);
-								this.configuration.data = openReporterData;
-								this.data = openReporterData;
-							} else if (this.selectedExtension !== selectedExtensionId) {
-							}
-						}
-						else {
-							if (!this.loadingExtensionData) {
-								iconElement.classList.remove(...ThemeIcon.asClassNameArray(Codicon.loading), 'codicon-modifier-spin');
-							}
-							this.removeLoading(iconElement);
-							// if not using command, should have no configuration data in fields we care about and check later.
-							this.clearExtensionData();
-
-							// case when previous extension was opened from normal openIssueReporter command
-							selectedExtension.data = undefined;
-							selectedExtension.uri = undefined;
-						}
-						if (this.selectedExtension === selectedExtensionId) {
-							// repopulates the fields with the new data given the selected extension.
-							this.updateExtensionStatus(matches[0]);
-							this.openReporter = false;
-						}
-					} else {
-						this.issueReporterModel.update({ selectedExtension: undefined });
-						this.clearSearchResults();
-						this.clearExtensionData();
-						this.validateSelectedExtension();
-						this.updateExtensionStatus(matches[0]);
-					}
-				}
-			});
-		}
-
-		this.addEventListener('problem-source', 'change', (_) => {
-			this.validateSelectedExtension();
-		});
-	}
-
-	public override setLoading(element: HTMLElement) {
-		// Show loading
-		this.openReporter = true;
-		this.loadingExtensionData = true;
-		this.updatePreviewButtonState();
-
-		const extensionDataCaption = this.getElementById('extension-id')!;
-		hide(extensionDataCaption);
-
-		const extensionDataCaption2 = Array.from(mainWindow.document.querySelectorAll('.ext-parens'));
-		extensionDataCaption2.forEach(extensionDataCaption2 => hide(extensionDataCaption2));
-
-		const showLoading = this.getElementById('ext-loading')!;
-		show(showLoading);
-		while (showLoading.firstChild) {
-			showLoading.firstChild.remove();
-		}
-		showLoading.append(element);
-
-		this.renderBlocks();
-	}
-
-	public override removeLoading(element: HTMLElement, fromReporter: boolean = false) {
-		this.openReporter = fromReporter;
-		this.loadingExtensionData = false;
-		this.updatePreviewButtonState();
-
-		const extensionDataCaption = this.getElementById('extension-id')!;
-		show(extensionDataCaption);
-
-		const extensionDataCaption2 = Array.from(mainWindow.document.querySelectorAll('.ext-parens'));
-		extensionDataCaption2.forEach(extensionDataCaption2 => show(extensionDataCaption2));
-
-		const hideLoading = this.getElementById('ext-loading')!;
-		hide(hideLoading);
-		if (hideLoading.firstChild) {
-			element.remove();
-		}
-		this.renderBlocks();
-	}
-
 	private updateRestrictedMode(restrictedMode: boolean) {
 		this.issueReporterModel.update({ restrictedMode });
 	}
@@ -500,7 +289,7 @@ export class IssueReporter2 extends BaseIssueReporterService {
 
 	private updateExperimentsInfo(experimentInfo: string | undefined) {
 		this.issueReporterModel.update({ experimentInfo });
-		const target = mainWindow.document.querySelector<HTMLElement>('.block-experiments .block-info');
+		const target = this.window.document.querySelector<HTMLElement>('.block-experiments .block-info');
 		if (target) {
 			target.textContent = experimentInfo ? experimentInfo : localize('noCurrentExperiments', "No current experiments.");
 		}
diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/issueService.ts b/src/vs/workbench/contrib/issue/electron-sandbox/issueService.ts
index 3b5c8d26ed6..2ee3df7cf70 100644
--- a/src/vs/workbench/contrib/issue/electron-sandbox/issueService.ts
+++ b/src/vs/workbench/contrib/issue/electron-sandbox/issueService.ts
@@ -3,27 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getZoomLevel } from 'vs/base/browser/browser';
-import { platform } from 'vs/base/common/process';
-import { ipcRenderer } from 'vs/base/parts/sandbox/electron-sandbox/globals';
-import { IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { ExtensionIdentifier, ExtensionType, ExtensionIdentifierSet } from 'vs/platform/extensions/common/extensions';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IIssueMainService, IssueReporterData, IssueReporterExtensionData, IssueReporterStyles, ProcessExplorerData } from 'vs/platform/issue/common/issue';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { activeContrastBorder, buttonBackground, buttonForeground, buttonHoverBackground, editorBackground, editorForeground, foreground, inputActiveOptionBorder, inputBackground, inputBorder, inputForeground, inputValidationErrorBackground, inputValidationErrorBorder, inputValidationErrorForeground, listActiveSelectionBackground, listActiveSelectionForeground, listFocusBackground, listFocusForeground, listFocusOutline, listHoverBackground, listHoverForeground, scrollbarShadow, scrollbarSliderActiveBackground, scrollbarSliderBackground, scrollbarSliderHoverBackground, textLinkActiveForeground, textLinkForeground } from 'vs/platform/theme/common/colorRegistry';
-import { IColorTheme, IThemeService } from 'vs/platform/theme/common/themeService';
-import { IWorkspaceTrustManagementService } from 'vs/platform/workspace/common/workspaceTrust';
-import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
-import { IWorkbenchAssignmentService } from 'vs/workbench/services/assignment/common/assignmentService';
-import { IAuthenticationService } from 'vs/workbench/services/authentication/common/authentication';
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
-import { IWorkbenchExtensionEnablementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { IIntegrityService } from 'vs/workbench/services/integrity/common/integrity';
-import { IWorkbenchIssueService } from 'vs/workbench/contrib/issue/common/issue';
-import { mainWindow } from 'vs/base/browser/window';
-import { IMenuService, MenuId } from 'vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { getZoomLevel } from '../../../../base/browser/browser.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { ipcRenderer } from '../../../../base/parts/sandbox/electron-sandbox/globals.js';
+import { IMenuService, MenuId } from '../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IExtensionManagementService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { ExtensionIdentifier, ExtensionIdentifierSet, ExtensionType } from '../../../../platform/extensions/common/extensions.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IIssueMainService, OldIssueReporterData, OldIssueReporterExtensionData, OldIssueReporterStyles } from '../../../../platform/issue/common/issue.js';
+import { buttonBackground, buttonForeground, buttonHoverBackground, foreground, inputActiveOptionBorder, inputBackground, inputBorder, inputForeground, inputValidationErrorBackground, inputValidationErrorBorder, inputValidationErrorForeground, scrollbarSliderActiveBackground, scrollbarSliderBackground, scrollbarSliderHoverBackground, textLinkActiveForeground, textLinkForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import { IColorTheme, IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IWorkspaceTrustManagementService } from '../../../../platform/workspace/common/workspaceTrust.js';
+import { SIDE_BAR_BACKGROUND } from '../../../common/theme.js';
+import { IIssueFormService, IssueReporterData, IssueReporterExtensionData, IssueReporterStyles, IWorkbenchIssueService } from '../common/issue.js';
+import { IWorkbenchAssignmentService } from '../../../services/assignment/common/assignmentService.js';
+import { IAuthenticationService } from '../../../services/authentication/common/authentication.js';
+import { IWorkbenchExtensionEnablementService } from '../../../services/extensionManagement/common/extensionManagement.js';
+import { IIntegrityService } from '../../../services/integrity/common/integrity.js';
 
 export class NativeIssueService implements IWorkbenchIssueService {
 	declare readonly _serviceBrand: undefined;
@@ -31,26 +29,25 @@ export class NativeIssueService implements IWorkbenchIssueService {
 
 	constructor(
 		@IIssueMainService private readonly issueMainService: IIssueMainService,
+		@IIssueFormService private readonly issueFormService: IIssueFormService,
 		@IThemeService private readonly themeService: IThemeService,
 		@IExtensionManagementService private readonly extensionManagementService: IExtensionManagementService,
 		@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService,
-		@INativeWorkbenchEnvironmentService private readonly environmentService: INativeWorkbenchEnvironmentService,
 		@IWorkspaceTrustManagementService private readonly workspaceTrustManagementService: IWorkspaceTrustManagementService,
-		@IProductService private readonly productService: IProductService,
 		@IWorkbenchAssignmentService private readonly experimentService: IWorkbenchAssignmentService,
 		@IAuthenticationService private readonly authenticationService: IAuthenticationService,
 		@IIntegrityService private readonly integrityService: IIntegrityService,
 		@IMenuService private readonly menuService: IMenuService,
-		@IContextKeyService private readonly contextKeyService: IContextKeyService
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IConfigurationService private readonly configurationService: IConfigurationService
 	) {
 		ipcRenderer.on('vscode:triggerReporterMenu', async (event, arg) => {
 			const extensionId = arg.extensionId;
 
-			// creates menu from contributed
-			const menu = this.menuService.createMenu(MenuId.IssueReporter, this.contextKeyService);
+			// gets menu from contributed
+			const actions = this.menuService.getMenuActions(MenuId.IssueReporter, this.contextKeyService, { renderShortTitle: true }).flatMap(entry => entry[1]);
 
 			// render menu and dispose
-			const actions = menu.getActions({ renderShortTitle: true }).flatMap(entry => entry[1]);
 			actions.forEach(async action => {
 				try {
 					if (action.item && 'source' in action.item && action.item.source?.id === extensionId) {
@@ -66,12 +63,13 @@ export class NativeIssueService implements IWorkbenchIssueService {
 				// send undefined to indicate no action was taken
 				ipcRenderer.send(`vscode:triggerReporterMenuResponse:${extensionId}`, undefined);
 			}
-			menu.dispose();
 		});
 	}
 
 	async openReporter(dataOverrides: Partial<IssueReporterData> = {}): Promise<void> {
 		const extensionData: IssueReporterExtensionData[] = [];
+		const oldExtensionData: OldIssueReporterExtensionData[] = [];
+		const oldDataOverrides = dataOverrides as Partial<OldIssueReporterData>;
 		try {
 			const extensions = await this.extensionManagementService.getInstalled();
 			const enabledExtensions = extensions.filter(extension => this.extensionEnablementService.isEnabled(extension) || (dataOverrides.extensionId && extension.identifier.id === dataOverrides.extensionId));
@@ -95,6 +93,26 @@ export class NativeIssueService implements IWorkbenchIssueService {
 					extensionData: 'Extensions data loading',
 				};
 			}));
+			oldExtensionData.push(...enabledExtensions.map((extension): OldIssueReporterExtensionData => {
+				const { manifest } = extension;
+				const manifestKeys = manifest.contributes ? Object.keys(manifest.contributes) : [];
+				const isTheme = !manifest.main && !manifest.browser && manifestKeys.length === 1 && manifestKeys[0] === 'themes';
+				const isBuiltin = extension.type === ExtensionType.System;
+				return {
+					name: manifest.name,
+					publisher: manifest.publisher,
+					version: manifest.version,
+					repositoryUrl: manifest.repository && manifest.repository.url,
+					bugsUrl: manifest.bugs && manifest.bugs.url,
+					displayName: manifest.displayName,
+					id: extension.identifier.id,
+					data: dataOverrides.data,
+					uri: dataOverrides.uri,
+					isTheme,
+					isBuiltin,
+					extensionData: 'Extensions data loading',
+				};
+			}));
 		} catch (e) {
 			extensionData.push({
 				name: 'Workbench Issue Service',
@@ -108,6 +126,18 @@ export class NativeIssueService implements IWorkbenchIssueService {
 				isTheme: false,
 				isBuiltin: true
 			});
+			oldExtensionData.push({
+				name: 'Workbench Issue Service',
+				publisher: 'Unknown',
+				version: '0.0.0',
+				repositoryUrl: undefined,
+				bugsUrl: undefined,
+				extensionData: 'Extensions data loading',
+				displayName: `Extensions not loaded: ${e}`,
+				id: 'workbench.issue',
+				isTheme: false,
+				isBuiltin: true
+			});
 		}
 		const experiments = await this.experimentService.getCurrentExperiments();
 
@@ -139,6 +169,16 @@ export class NativeIssueService implements IWorkbenchIssueService {
 			githubAccessToken
 		}, dataOverrides);
 
+		const oldIssueReporterData: OldIssueReporterData = Object.assign({
+			styles: oldGetIssueReporterStyles(theme),
+			zoomLevel: getZoomLevel(mainWindow),
+			enabledExtensions: oldExtensionData,
+			experiments: experiments?.join('\n'),
+			restrictedMode: !this.workspaceTrustManagementService.isWorkspaceTrusted(),
+			isUnsupported,
+			githubAccessToken
+		}, oldDataOverrides);
+
 		if (issueReporterData.extensionId) {
 			const extensionExists = extensionData.some(extension => ExtensionIdentifier.equals(extension.id, issueReporterData.extensionId));
 			if (!extensionExists) {
@@ -150,40 +190,40 @@ export class NativeIssueService implements IWorkbenchIssueService {
 			ipcRenderer.send(`vscode:triggerReporterMenuResponse:${issueReporterData.extensionId}`, issueReporterData);
 			this.extensionIdentifierSet.delete(new ExtensionIdentifier(issueReporterData.extensionId));
 		}
-		return this.issueMainService.openReporter(issueReporterData);
-	}
 
-	openProcessExplorer(): Promise<void> {
-		const theme = this.themeService.getColorTheme();
-		const data: ProcessExplorerData = {
-			pid: this.environmentService.mainPid,
-			zoomLevel: getZoomLevel(mainWindow),
-			styles: {
-				backgroundColor: getColor(theme, editorBackground),
-				color: getColor(theme, editorForeground),
-				listHoverBackground: getColor(theme, listHoverBackground),
-				listHoverForeground: getColor(theme, listHoverForeground),
-				listFocusBackground: getColor(theme, listFocusBackground),
-				listFocusForeground: getColor(theme, listFocusForeground),
-				listFocusOutline: getColor(theme, listFocusOutline),
-				listActiveSelectionBackground: getColor(theme, listActiveSelectionBackground),
-				listActiveSelectionForeground: getColor(theme, listActiveSelectionForeground),
-				listHoverOutline: getColor(theme, activeContrastBorder),
-				scrollbarShadowColor: getColor(theme, scrollbarShadow),
-				scrollbarSliderActiveBackgroundColor: getColor(theme, scrollbarSliderActiveBackground),
-				scrollbarSliderBackgroundColor: getColor(theme, scrollbarSliderBackground),
-				scrollbarSliderHoverBackgroundColor: getColor(theme, scrollbarSliderHoverBackground),
-			},
-			platform: platform,
-			applicationName: this.productService.applicationName
-		};
-		return this.issueMainService.openProcessExplorer(data);
-	}
 
+		if (this.configurationService.getValue<boolean>('issueReporter.experimental.auxWindow')) {
+			return this.issueFormService.openReporter(issueReporterData);
+		}
+
+		return this.issueMainService.openReporter(oldIssueReporterData);
+	}
 
 }
 
 export function getIssueReporterStyles(theme: IColorTheme): IssueReporterStyles {
+	return {
+		backgroundColor: getColor(theme, SIDE_BAR_BACKGROUND),
+		color: getColor(theme, foreground),
+		textLinkColor: getColor(theme, textLinkForeground),
+		textLinkActiveForeground: getColor(theme, textLinkActiveForeground),
+		inputBackground: getColor(theme, inputBackground),
+		inputForeground: getColor(theme, inputForeground),
+		inputBorder: getColor(theme, inputBorder),
+		inputActiveBorder: getColor(theme, inputActiveOptionBorder),
+		inputErrorBorder: getColor(theme, inputValidationErrorBorder),
+		inputErrorBackground: getColor(theme, inputValidationErrorBackground),
+		inputErrorForeground: getColor(theme, inputValidationErrorForeground),
+		buttonBackground: getColor(theme, buttonBackground),
+		buttonForeground: getColor(theme, buttonForeground),
+		buttonHoverBackground: getColor(theme, buttonHoverBackground),
+		sliderActiveColor: getColor(theme, scrollbarSliderActiveBackground),
+		sliderBackgroundColor: getColor(theme, SIDE_BAR_BACKGROUND),
+		sliderHoverColor: getColor(theme, scrollbarSliderHoverBackground),
+	};
+}
+
+export function oldGetIssueReporterStyles(theme: IColorTheme): OldIssueReporterStyles {
 	return {
 		backgroundColor: getColor(theme, SIDE_BAR_BACKGROUND),
 		color: getColor(theme, foreground),
diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/media/issueReporter.css b/src/vs/workbench/contrib/issue/electron-sandbox/media/issueReporter.css
index 152d6c38bc8..fa2cf8a105a 100644
--- a/src/vs/workbench/contrib/issue/electron-sandbox/media/issueReporter.css
+++ b/src/vs/workbench/contrib/issue/electron-sandbox/media/issueReporter.css
@@ -3,6 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+/*
+* TODO: @justschen - remove this file once the new issue reporter is enabled by default.
+* Split between this and a `newIssueReporter` because of specificy from new issue reporter monaco-workbench stylesheets.
+*/
+
 /**
  * Table
  */
diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/media/newIssueReporter.css b/src/vs/workbench/contrib/issue/electron-sandbox/media/newIssueReporter.css
new file mode 100644
index 00000000000..00b0be10773
--- /dev/null
+++ b/src/vs/workbench/contrib/issue/electron-sandbox/media/newIssueReporter.css
@@ -0,0 +1,470 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/**
+ * Table
+ */
+
+.issue-reporter-body table {
+	width: 100%;
+	max-width: 100%;
+	background-color: transparent;
+	border-collapse: collapse;
+}
+
+.issue-reporter-body th {
+	vertical-align: bottom;
+	border-bottom: 1px solid;
+	padding: 5px;
+	text-align: inherit;
+}
+
+.issue-reporter-body td {
+	padding: 5px;
+	vertical-align: top;
+}
+
+.issue-reporter-body tr td:first-child {
+	width: 30%;
+}
+
+.issue-reporter-body label {
+	user-select: none;
+}
+
+.issue-reporter-body .block-settingsSearchResults-details {
+	padding-bottom: .5rem;
+}
+
+.issue-reporter-body .block-settingsSearchResults-details > div {
+	padding: .5rem .75rem;
+}
+
+.issue-reporter-body .section {
+	margin-bottom: .5em;
+}
+
+/**
+ * Forms
+ */
+.issue-reporter-body input[type="text"],
+.issue-reporter-body textarea {
+	display: block;
+	width: 100%;
+	padding: .375rem .75rem;
+	font-size: 1rem;
+	line-height: 1.5;
+	color: #495057;
+	background-color: #fff;
+	border: 1px solid #ced4da;
+}
+
+.issue-reporter-body textarea {
+	overflow: auto;
+	resize: vertical;
+}
+
+/**
+ * Button
+ */
+
+.issue-reporter-body .monaco-text-button {
+	display: block;
+	width: auto;
+	padding: 4px 10px;
+	align-self: flex-end;
+	margin-bottom: 1em;
+	font-size: 13px;
+}
+
+.issue-reporter-body select {
+	height: calc(2.25rem + 2px);
+	display: inline-block;
+	padding: 3px 3px;
+	font-size: 14px;
+	line-height: 1.5;
+	color: #495057;
+	background-color: #fff;
+	border: none;
+}
+
+.issue-reporter-body * {
+	box-sizing: border-box;
+}
+
+.issue-reporter-body textarea,
+.issue-reporter-body input,
+.issue-reporter-body select {
+	font-family: inherit;
+}
+
+.issue-reporter-body html {
+	color: #CCCCCC;
+	height: 100%;
+}
+
+.issue-reporter-body .extension-caption .codicon-modifier-spin {
+	padding-bottom: 3px;
+	margin-left: 2px;
+}
+
+/* Font Families (with CJK support) */
+
+.issue-reporter-body .mac {
+	font-family: -apple-system, BlinkMacSystemFont, sans-serif;
+}
+
+.issue-reporter-body .mac:lang(zh-Hans) {
+	font-family: -apple-system, BlinkMacSystemFont, "PingFang SC", "Hiragino Sans GB", sans-serif;
+}
+
+.issue-reporter-body .mac:lang(zh-Hant) {
+	font-family: -apple-system, BlinkMacSystemFont, "PingFang TC", sans-serif;
+}
+
+.issue-reporter-body .mac:lang(ja) {
+	font-family: -apple-system, BlinkMacSystemFont, "Hiragino Kaku Gothic Pro", sans-serif;
+}
+
+.issue-reporter-body .mac:lang(ko) {
+	font-family: -apple-system, BlinkMacSystemFont, "Nanum Gothic", "Apple SD Gothic Neo", "AppleGothic", sans-serif;
+}
+
+.issue-reporter-body .windows {
+	font-family: "Segoe WPC", "Segoe UI", sans-serif;
+}
+
+.issue-reporter-body .windows:lang(zh-Hans) {
+	font-family: "Segoe WPC", "Segoe UI", "Microsoft YaHei", sans-serif;
+}
+
+.issue-reporter-body .windows:lang(zh-Hant) {
+	font-family: "Segoe WPC", "Segoe UI", "Microsoft Jhenghei", sans-serif;
+}
+
+.issue-reporter-body .windows:lang(ja) {
+	font-family: "Segoe WPC", "Segoe UI", "Yu Gothic UI", "Meiryo UI", sans-serif;
+}
+
+.issue-reporter-body .windows:lang(ko) {
+	font-family: "Segoe WPC", "Segoe UI", "Malgun Gothic", "Dotom", sans-serif;
+}
+
+/* Linux: add `system-ui` as first font and not `Ubuntu` to allow other distribution pick their standard OS font */
+.issue-reporter-body .linux {
+	font-family: system-ui, "Ubuntu", "Droid Sans", sans-serif;
+}
+
+.issue-reporter-body .linux:lang(zh-Hans) {
+	font-family: system-ui, "Ubuntu", "Droid Sans", "Source Han Sans SC", "Source Han Sans CN", "Source Han Sans", sans-serif;
+}
+
+.issue-reporter-body .linux:lang(zh-Hant) {
+	font-family: system-ui, "Ubuntu", "Droid Sans", "Source Han Sans TC", "Source Han Sans TW", "Source Han Sans", sans-serif;
+}
+
+.issue-reporter-body .linux:lang(ja) {
+	font-family: system-ui, "Ubuntu", "Droid Sans", "Source Han Sans J", "Source Han Sans JP", "Source Han Sans", sans-serif;
+}
+
+.issue-reporter-body .linux:lang(ko) {
+	font-family: system-ui, "Ubuntu", "Droid Sans", "Source Han Sans K", "Source Han Sans JR", "Source Han Sans", "UnDotum", "FBaekmuk Gulim", sans-serif;
+}
+
+body.issue-reporter-body {
+	margin: 0 !important;
+	overflow-y: scroll !important;
+	height: 100% !important;
+}
+
+.issue-reporter-body .hidden {
+	display: none;
+}
+
+.issue-reporter-body .block {
+	font-size: 12px;
+}
+
+.issue-reporter-body .block .block-info {
+	width: 100%;
+	font-size: 12px;
+	overflow: auto;
+	overflow-wrap: break-word;
+	margin: 5px;
+	padding: 10px;
+}
+
+.issue-reporter-body #issue-reporter {
+	max-width: 85vw;
+	margin-left: auto;
+	margin-right: auto;
+	padding-top: 2em;
+	padding-bottom: 2em;
+	display: flex;
+	flex-direction: column;
+	min-height: 100%;
+	overflow: visible;
+}
+
+.issue-reporter-body .description-section {
+	flex-grow: 1;
+	display: flex;
+	flex-direction: column;
+	flex-shrink: 0;
+}
+
+.issue-reporter-body textarea {
+	flex-grow: 1;
+	min-height: 150px;
+}
+
+.issue-reporter-body .block-info-text {
+	display: flex;
+	flex-grow: 1;
+}
+
+.issue-reporter-body #github-submit-btn {
+	flex-shrink: 0;
+	margin-left: auto;
+	margin-top: 10px;
+	margin-bottom: 10px;
+}
+
+.issue-reporter-body .two-col {
+	display: inline-block;
+	width: 49%;
+}
+
+.issue-reporter-body #vscode-version {
+	width: 90%;
+}
+
+.issue-reporter-body .input-group {
+	margin-bottom: 1em;
+}
+
+.issue-reporter-body #extension-selection {
+	margin-top: 1em;
+}
+
+.issue-reporter-body .issue-reporter select,
+.issue-reporter-body .issue-reporter input,
+.issue-reporter-body .issue-reporter textarea {
+	border: 1px solid transparent;
+	margin-top: 10px;
+}
+
+
+.issue-reporter-body #issue-reporter .validation-error {
+	font-size: 12px;
+	padding: 10px;
+	border-top: 0px !important;
+}
+
+.issue-reporter-body #issue-reporter .system-info {
+	margin-bottom: 10px;
+}
+
+
+.issue-reporter-body input[type="checkbox"] {
+	width: auto;
+	display: inline-block;
+	margin-top: 0;
+	vertical-align: middle;
+	cursor: pointer;
+}
+
+.issue-reporter-body input:disabled {
+	opacity: 0.6;
+}
+
+.issue-reporter-body .list-title {
+	margin-top: 1em;
+	margin-left: 1em;
+}
+
+.issue-reporter-body .instructions {
+	font-size: 12px;
+	margin-top: .5em;
+}
+
+.issue-reporter-body a,
+.issue-reporter-body .workbenchCommand {
+	cursor: pointer;
+	border: 1px solid transparent;
+}
+
+.issue-reporter-body .workbenchCommand:disabled {
+	color: #868e96;
+	cursor: default
+}
+
+.issue-reporter-body .block-extensions .block-info {
+	margin-bottom: 1.5em;
+}
+
+/* Default styles, overwritten if a theme is provided */
+.issue-reporter-body input,
+.issue-reporter-body select,
+.issue-reporter-body textarea {
+	background-color: #3c3c3c;
+	border: none;
+	color: #cccccc;
+}
+
+.issue-reporter-body a {
+	color: #CCCCCC;
+	text-decoration: none;
+}
+
+.issue-reporter-body .showInfo,
+.issue-reporter-body .input-group a {
+	color: var(--vscode-textLink-foreground);
+}
+
+.issue-reporter-body .section .input-group .validation-error {
+	margin-left: 100px;
+}
+
+.issue-reporter-body .section .inline-form-control,
+.issue-reporter-body .section .inline-label {
+	display: inline-block;
+	font-size: initial;
+}
+
+.issue-reporter-body .section .inline-label {
+	width: 95px;
+}
+
+.issue-reporter-body .issue-reporter .inline-label,
+.issue-reporter-body .issue-reporter #issue-description-label {
+	font-size: initial;
+	cursor: default;
+}
+
+.issue-reporter-body .monaco-workbench .issue-reporter label {
+	cursor: default;
+}
+
+.issue-reporter-body .section .inline-form-control,
+.issue-reporter-body .section .input-group .validation-error {
+	width: calc(100% - 100px);
+}
+
+.issue-reporter-body #issue-type,
+.issue-reporter-body #issue-source,
+.issue-reporter-body #extension-selector {
+	cursor: pointer;
+	appearance: auto;
+	border: none;
+	border-right: 6px solid transparent;
+	padding-left: 10px;
+}
+
+.issue-reporter-body #similar-issues {
+	margin-left: 15%;
+	display: block;
+}
+
+.issue-reporter-body #problem-source-help-text {
+	margin-left: calc(15% + 1em);
+}
+
+@media (max-width: 950px) {
+	.issue-reporter-body .section .inline-label {
+		width: 15%;
+	}
+
+	.issue-reporter-body #problem-source-help-text {
+		margin-left: calc(15% + 1em);
+	}
+
+	.issue-reporter-body .section .inline-form-control,
+	.issue-reporter-body .section .input-group .validation-error {
+		width: calc(85% - 5px);
+	}
+
+	.issue-reporter-body .section .input-group .validation-error {
+		margin-left: calc(15% + 4px);
+	}
+}
+
+@media (max-width: 620px) {
+	.issue-reporter-body .section .inline-label {
+		display: none !important;
+	}
+
+	.issue-reporter-body #problem-source-help-text {
+		margin-left: 1em;
+	}
+
+	.issue-reporter-body .section .inline-form-control,
+	.issue-reporter-body .section .input-group .validation-error {
+		width: 100%;
+	}
+
+	.issue-reporter-body #similar-issues,
+	.issue-reporter-body .section .input-group .validation-error {
+		margin-left: 0;
+	}
+}
+
+.issue-reporter-body::-webkit-scrollbar {
+	width: 14px;
+}
+
+.issue-reporter-body::-webkit-scrollbar-thumb {
+	min-height: 20px;
+}
+
+.issue-reporter-body::-webkit-scrollbar-corner {
+	display: none;
+}
+
+.issue-reporter-body .issues-container {
+	margin-left: 1.5em;
+	margin-top: .5em;
+	max-height: 92px;
+	overflow-y: auto;
+}
+
+.issue-reporter-body .issues-container > .issue {
+	padding: 4px 0;
+	display: flex;
+}
+
+.issue-reporter-body .issues-container > .issue > .issue-link {
+	width: calc(100% - 82px);
+	overflow: hidden;
+	padding-top: 3px;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+
+.issue-reporter-body .issues-container > .issue > .issue-state .codicon {
+	width: 16px;
+}
+
+.issue-reporter-body .issues-container > .issue > .issue-state {
+	display: flex;
+	width: 77px;
+	padding: 3px 6px;
+	margin-right: 5px;
+	color: #CCCCCC;
+	background-color: #3c3c3c;
+	border-radius: .25rem;
+}
+
+.issue-reporter-body .issues-container > .issue .label {
+	padding-top: 2px;
+	margin-left: 5px;
+	width: 44px;
+	text-overflow: ellipsis;
+	overflow: hidden;
+}
+
+.issue-reporter-body .issues-container > .issue .issue-icon {
+	padding-top: 2px;
+}
diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/nativeIssueFormService.ts b/src/vs/workbench/contrib/issue/electron-sandbox/nativeIssueFormService.ts
new file mode 100644
index 00000000000..508137162ca
--- /dev/null
+++ b/src/vs/workbench/contrib/issue/electron-sandbox/nativeIssueFormService.ts
@@ -0,0 +1,60 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import './media/newIssueReporter.css';
+import { IMenuService } from '../../../../platform/actions/common/actions.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { INativeEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import product from '../../../../platform/product/common/product.js';
+import { IssueFormService } from '../browser/issueFormService.js';
+import { IIssueFormService, IssueReporterData } from '../common/issue.js';
+import { IssueReporter2 } from './issueReporterService2.js';
+import { IAuxiliaryWindowService } from '../../../services/auxiliaryWindow/browser/auxiliaryWindowService.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+
+export class NativeIssueFormService extends IssueFormService implements IIssueFormService {
+	constructor(
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IAuxiliaryWindowService auxiliaryWindowService: IAuxiliaryWindowService,
+		@ILogService logService: ILogService,
+		@IDialogService dialogService: IDialogService,
+		@IMenuService menuService: IMenuService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IHostService hostService: IHostService,
+		@INativeHostService private readonly nativeHostService: INativeHostService,
+		@INativeEnvironmentService private readonly environmentService: INativeEnvironmentService,) {
+		super(instantiationService, auxiliaryWindowService, menuService, contextKeyService, logService, dialogService, hostService);
+	}
+
+	// override to grab platform info
+	override async openReporter(data: IssueReporterData): Promise<void> {
+		if (this.hasToReload(data)) {
+			return;
+		}
+
+		const bounds = await this.nativeHostService.getActiveWindowPosition();
+		if (!bounds) {
+			return;
+		}
+
+		await this.openAuxIssueReporter(data, bounds);
+
+		// Get platform information
+		const { arch, release, type } = await this.nativeHostService.getOSProperties();
+		this.arch = arch;
+		this.release = release;
+		this.type = type;
+
+		// create issue reporter and instantiate
+		if (this.issueReporterWindow) {
+			const issueReporter = this.instantiationService.createInstance(IssueReporter2, !!this.environmentService.disableExtensions, data, { type: this.type, arch: this.arch, release: this.release }, product, this.issueReporterWindow);
+			issueReporter.render();
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/process.contribution.ts b/src/vs/workbench/contrib/issue/electron-sandbox/process.contribution.ts
new file mode 100644
index 00000000000..6c33d9f8133
--- /dev/null
+++ b/src/vs/workbench/contrib/issue/electron-sandbox/process.contribution.ts
@@ -0,0 +1,96 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { localize, localize2 } from '../../../../nls.js';
+import { MenuRegistry, MenuId, registerAction2, Action2 } from '../../../../platform/actions/common/actions.js';
+import { IWorkbenchProcessService } from '../common/issue.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { INativeEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { IProgressService, ProgressLocation } from '../../../../platform/progress/common/progress.js';
+import { IProcessMainService } from '../../../../platform/issue/common/issue.js';
+import './processService.js';
+import './issueMainService.js';
+
+
+//#region Commands
+
+class OpenProcessExplorer extends Action2 {
+
+	static readonly ID = 'workbench.action.openProcessExplorer';
+
+	constructor() {
+		super({
+			id: OpenProcessExplorer.ID,
+			title: localize2('openProcessExplorer', 'Open Process Explorer'),
+			category: Categories.Developer,
+			f1: true
+		});
+	}
+
+	override async run(accessor: ServicesAccessor): Promise<void> {
+		const processService = accessor.get(IWorkbenchProcessService);
+
+		return processService.openProcessExplorer();
+	}
+}
+registerAction2(OpenProcessExplorer);
+MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
+	group: '5_tools',
+	command: {
+		id: OpenProcessExplorer.ID,
+		title: localize({ key: 'miOpenProcessExplorerer', comment: ['&& denotes a mnemonic'] }, "Open &&Process Explorer")
+	},
+	order: 2
+});
+
+class StopTracing extends Action2 {
+
+	static readonly ID = 'workbench.action.stopTracing';
+
+	constructor() {
+		super({
+			id: StopTracing.ID,
+			title: localize2('stopTracing', 'Stop Tracing'),
+			category: Categories.Developer,
+			f1: true
+		});
+	}
+
+	override async run(accessor: ServicesAccessor): Promise<void> {
+		const processService = accessor.get(IProcessMainService);
+		const environmentService = accessor.get(INativeEnvironmentService);
+		const dialogService = accessor.get(IDialogService);
+		const nativeHostService = accessor.get(INativeHostService);
+		const progressService = accessor.get(IProgressService);
+
+		if (!environmentService.args.trace) {
+			const { confirmed } = await dialogService.confirm({
+				message: localize('stopTracing.message', "Tracing requires to launch with a '--trace' argument"),
+				primaryButton: localize({ key: 'stopTracing.button', comment: ['&& denotes a mnemonic'] }, "&&Relaunch and Enable Tracing"),
+			});
+
+			if (confirmed) {
+				return nativeHostService.relaunch({ addArgs: ['--trace'] });
+			}
+		}
+
+		await progressService.withProgress({
+			location: ProgressLocation.Dialog,
+			title: localize('stopTracing.title', "Creating trace file..."),
+			cancellable: false,
+			detail: localize('stopTracing.detail', "This can take up to one minute to complete.")
+		}, () => processService.stopTracing());
+	}
+}
+registerAction2(StopTracing);
+
+CommandsRegistry.registerCommand('_issues.getSystemStatus', (accessor) => {
+	return accessor.get(IProcessMainService).getSystemStatus();
+});
+//#endregion
diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/processService.ts b/src/vs/workbench/contrib/issue/electron-sandbox/processService.ts
new file mode 100644
index 00000000000..c781a4af73c
--- /dev/null
+++ b/src/vs/workbench/contrib/issue/electron-sandbox/processService.ts
@@ -0,0 +1,62 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { getZoomLevel } from '../../../../base/browser/browser.js';
+import { platform } from '../../../../base/common/process.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IProcessMainService, ProcessExplorerData } from '../../../../platform/issue/common/issue.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { activeContrastBorder, editorBackground, editorForeground, listActiveSelectionBackground, listActiveSelectionForeground, listFocusBackground, listFocusForeground, listFocusOutline, listHoverBackground, listHoverForeground, scrollbarShadow, scrollbarSliderActiveBackground, scrollbarSliderBackground, scrollbarSliderHoverBackground } from '../../../../platform/theme/common/colorRegistry.js';
+import { IColorTheme, IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-sandbox/environmentService.js';
+import { IWorkbenchProcessService } from '../common/issue.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+
+export class ProcessService implements IWorkbenchProcessService {
+	declare readonly _serviceBrand: undefined;
+
+	constructor(
+		@IProcessMainService private readonly processMainService: IProcessMainService,
+		@IThemeService private readonly themeService: IThemeService,
+		@INativeWorkbenchEnvironmentService private readonly environmentService: INativeWorkbenchEnvironmentService,
+		@IProductService private readonly productService: IProductService,
+	) { }
+
+	openProcessExplorer(): Promise<void> {
+		const theme = this.themeService.getColorTheme();
+		const data: ProcessExplorerData = {
+			pid: this.environmentService.mainPid,
+			zoomLevel: getZoomLevel(mainWindow),
+			styles: {
+				backgroundColor: getColor(theme, editorBackground),
+				color: getColor(theme, editorForeground),
+				listHoverBackground: getColor(theme, listHoverBackground),
+				listHoverForeground: getColor(theme, listHoverForeground),
+				listFocusBackground: getColor(theme, listFocusBackground),
+				listFocusForeground: getColor(theme, listFocusForeground),
+				listFocusOutline: getColor(theme, listFocusOutline),
+				listActiveSelectionBackground: getColor(theme, listActiveSelectionBackground),
+				listActiveSelectionForeground: getColor(theme, listActiveSelectionForeground),
+				listHoverOutline: getColor(theme, activeContrastBorder),
+				scrollbarShadowColor: getColor(theme, scrollbarShadow),
+				scrollbarSliderActiveBackgroundColor: getColor(theme, scrollbarSliderActiveBackground),
+				scrollbarSliderBackgroundColor: getColor(theme, scrollbarSliderBackground),
+				scrollbarSliderHoverBackgroundColor: getColor(theme, scrollbarSliderHoverBackground),
+			},
+			platform: platform,
+			applicationName: this.productService.applicationName
+		};
+		return this.processMainService.openProcessExplorer(data);
+	}
+
+
+}
+
+function getColor(theme: IColorTheme, key: string): string | undefined {
+	const color = theme.getColor(key);
+	return color ? color.toString() : undefined;
+}
+
+registerSingleton(IWorkbenchProcessService, ProcessService, InstantiationType.Delayed);
diff --git a/src/vs/workbench/contrib/issue/issue/testReporterModel.test.ts b/src/vs/workbench/contrib/issue/test/browser/testReporterModel.test.ts
similarity index 96%
rename from src/vs/workbench/contrib/issue/issue/testReporterModel.test.ts
rename to src/vs/workbench/contrib/issue/test/browser/testReporterModel.test.ts
index 60ea6c2089c..14fd79ddda3 100644
--- a/src/vs/workbench/contrib/issue/issue/testReporterModel.test.ts
+++ b/src/vs/workbench/contrib/issue/test/browser/testReporterModel.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IssueReporterModel } from 'vs/workbench/contrib/issue/browser/issueReporterModel';
-import { IssueType } from 'vs/platform/issue/common/issue';
-import { normalizeGitHubUrl } from 'vs/platform/issue/common/issueReporterUtil';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IssueReporterModel } from '../../browser/issueReporterModel.js';
+import { IssueType } from '../../common/issue.js';
+import { normalizeGitHubUrl } from '../../common/issueReporterUtil.js';
 
 suite('IssueReporter', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/contrib/keybindings/browser/keybindings.contribution.ts b/src/vs/workbench/contrib/keybindings/browser/keybindings.contribution.ts
index 8c4bd19bb0d..096f1bbba54 100644
--- a/src/vs/workbench/contrib/keybindings/browser/keybindings.contribution.ts
+++ b/src/vs/workbench/contrib/keybindings/browser/keybindings.contribution.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { showWindowLogActionId } from 'vs/workbench/services/log/common/logConstants';
+import * as nls from '../../../../nls.js';
+import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { showWindowLogActionId } from '../../../services/log/common/logConstants.js';
 
 class ToggleKeybindingsLogAction extends Action2 {
 
diff --git a/src/vs/workbench/contrib/languageDetection/browser/languageDetection.contribution.ts b/src/vs/workbench/contrib/languageDetection/browser/languageDetection.contribution.ts
index b9735fd8973..d32ed42432f 100644
--- a/src/vs/workbench/contrib/languageDetection/browser/languageDetection.contribution.ts
+++ b/src/vs/workbench/contrib/languageDetection/browser/languageDetection.contribution.ts
@@ -3,28 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { getCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { localize, localize2 } from 'vs/nls';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment } from 'vs/workbench/services/statusbar/browser/statusbar';
-import { ILanguageDetectionService, LanguageDetectionHintConfig, LanguageDetectionLanguageEventSource } from 'vs/workbench/services/languageDetection/common/languageDetectionWorkerService';
-import { ThrottledDelayer } from 'vs/base/common/async';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { registerAction2, Action2 } from 'vs/platform/actions/common/actions';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { NOTEBOOK_EDITOR_EDITABLE } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { Schemas } from 'vs/base/common/network';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { getCodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from '../../../common/contributions.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment } from '../../../services/statusbar/browser/statusbar.js';
+import { ILanguageDetectionService, LanguageDetectionHintConfig, LanguageDetectionLanguageEventSource } from '../../../services/languageDetection/common/languageDetectionWorkerService.js';
+import { ThrottledDelayer } from '../../../../base/common/async.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
+import { registerAction2, Action2 } from '../../../../platform/actions/common/actions.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { NOTEBOOK_EDITOR_EDITABLE } from '../../notebook/common/notebookContextKeys.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 
 const detectLanguageCommandId = 'editor.detectLanguage';
 
diff --git a/src/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution.ts b/src/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution.ts
index daf83ca4cb0..28a38f4a198 100644
--- a/src/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution.ts
+++ b/src/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution.ts
@@ -3,37 +3,37 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/languageStatus';
-import * as dom from 'vs/base/browser/dom';
-import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
-import { Disposable, DisposableStore, dispose, toDisposable } from 'vs/base/common/lifecycle';
-import Severity from 'vs/base/common/severity';
-import { getCodeEditor, ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { localize, localize2 } from 'vs/nls';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ILanguageStatus, ILanguageStatusService } from 'vs/workbench/services/languageStatus/common/languageStatusService';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, ShowTooltipCommand, StatusbarAlignment, StatusbarEntryKind } from 'vs/workbench/services/statusbar/browser/statusbar';
-import { parseLinkedText } from 'vs/base/common/linkedText';
-import { Link } from 'vs/platform/opener/browser/link';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { Action } from 'vs/base/common/actions';
-import { Codicon } from 'vs/base/common/codicons';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { equals } from 'vs/base/common/arrays';
-import { URI } from 'vs/base/common/uri';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { IAccessibilityInformation } from 'vs/platform/accessibility/common/accessibility';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IHoverService, nativeHoverDelegate } from 'vs/platform/hover/browser/hover';
+import './media/languageStatus.css';
+import * as dom from '../../../../base/browser/dom.js';
+import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { Disposable, DisposableStore, dispose, toDisposable } from '../../../../base/common/lifecycle.js';
+import Severity from '../../../../base/common/severity.js';
+import { getCodeEditor, ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from '../../../common/contributions.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { ILanguageStatus, ILanguageStatusService } from '../../../services/languageStatus/common/languageStatusService.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, ShowTooltipCommand, StatusbarAlignment, StatusbarEntryKind } from '../../../services/statusbar/browser/statusbar.js';
+import { parseLinkedText } from '../../../../base/common/linkedText.js';
+import { Link } from '../../../../platform/opener/browser/link.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { Action } from '../../../../base/common/actions.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { equals } from '../../../../base/common/arrays.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { IAccessibilityInformation } from '../../../../platform/accessibility/common/accessibility.js';
+import { IEditorGroupsService, IEditorPart } from '../../../services/editor/common/editorGroupsService.js';
+import { IHoverService, nativeHoverDelegate } from '../../../../platform/hover/browser/hover.js';
+import { Event } from '../../../../base/common/event.js';
 
 class LanguageStatusViewModel {
 
@@ -65,22 +65,23 @@ class StoredCounter {
 class LanguageStatusContribution extends Disposable implements IWorkbenchContribution {
 
 	constructor(
-		@IInstantiationService instantiationService: IInstantiationService,
-		@IEditorGroupsService editorGroupService: IEditorGroupsService,
-		@IEditorService editorService: IEditorService
+		@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService,
 	) {
 		super();
 
-		// --- main language status
-		const mainInstantiationService = this._register(instantiationService.createChild(new ServiceCollection(
-			[IEditorService, editorService.createScoped('main', this._store)]
-		)));
-		this._register(mainInstantiationService.createInstance(LanguageStatus));
+		for (const part of editorGroupService.parts) {
+			this.createLanguageStatus(part);
+		}
 
-		// --- auxiliary language status
-		this._register(editorGroupService.onDidCreateAuxiliaryEditorPart(({ instantiationService, disposables }) => {
-			disposables.add(instantiationService.createInstance(LanguageStatus));
-		}));
+		this._register(editorGroupService.onDidCreateAuxiliaryEditorPart(part => this.createLanguageStatus(part)));
+	}
+
+	private createLanguageStatus(part: IEditorPart): void {
+		const disposables = new DisposableStore();
+		Event.once(part.onWillDispose)(() => disposables.dispose());
+
+		const scopedInstantiationService = this.editorGroupService.getScopedInstantiationService(part);
+		disposables.add(scopedInstantiationService.createInstance(LanguageStatus));
 	}
 }
 
@@ -330,17 +331,19 @@ class LanguageStatus {
 
 		// -- pin
 		const actionBar = new ActionBar(right, { hoverDelegate: nativeHoverDelegate });
+		const actionLabel: string = isPinned ? localize('unpin', "Remove from Status Bar") : localize('pin', "Add to Status Bar");
+		actionBar.setAriaLabel(actionLabel);
 		store.add(actionBar);
 		let action: Action;
 		if (!isPinned) {
-			action = new Action('pin', localize('pin', "Add to Status Bar"), ThemeIcon.asClassName(Codicon.pin), true, () => {
+			action = new Action('pin', actionLabel, ThemeIcon.asClassName(Codicon.pin), true, () => {
 				this._dedicated.add(status.id);
 				this._statusBarService.updateEntryVisibility(status.id, true);
 				this._update();
 				this._storeState();
 			});
 		} else {
-			action = new Action('unpin', localize('unpin', "Remove from Status Bar"), ThemeIcon.asClassName(Codicon.pinned), true, () => {
+			action = new Action('unpin', actionLabel, ThemeIcon.asClassName(Codicon.pinned), true, () => {
 				this._dedicated.delete(status.id);
 				this._statusBarService.updateEntryVisibility(status.id, false);
 				this._update();
diff --git a/src/vs/workbench/contrib/languageStatus/browser/media/languageStatus.css b/src/vs/workbench/contrib/languageStatus/browser/media/languageStatus.css
index 4354ad022df..25433bee4a4 100644
--- a/src/vs/workbench/contrib/languageStatus/browser/media/languageStatus.css
+++ b/src/vs/workbench/contrib/languageStatus/browser/media/languageStatus.css
@@ -113,6 +113,7 @@
 .monaco-workbench .hover-language-status > .element .right .monaco-link {
 	margin: auto 0;
 	white-space: nowrap;
+	text-decoration: var(--text-link-decoration);
 }
 
 .monaco-workbench .hover-language-status > .element .right .monaco-action-bar:not(:first-child) {
diff --git a/src/vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution.ts b/src/vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution.ts
index 29acb09ab9d..538e67d5f0f 100644
--- a/src/vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution.ts
+++ b/src/vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import Severity from 'vs/base/common/severity';
-import { ICodeEditor, getCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ILanguageStatus, ILanguageStatusService } from 'vs/workbench/services/languageStatus/common/languageStatusService';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry, IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { Event } from 'vs/base/common/event';
-import * as nls from 'vs/nls';
+import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
+import Severity from '../../../../base/common/severity.js';
+import { ICodeEditor, getCodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { ILanguageStatus, ILanguageStatusService } from '../../../services/languageStatus/common/languageStatusService.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry, IWorkbenchContribution } from '../../../common/contributions.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { Event } from '../../../../base/common/event.js';
+import * as nls from '../../../../nls.js';
 
-import { FoldingController } from 'vs/editor/contrib/folding/browser/folding';
-import { ColorDetector } from 'vs/editor/contrib/colorPicker/browser/colorDetector';
+import { FoldingController } from '../../../../editor/contrib/folding/browser/folding.js';
+import { ColorDetector } from '../../../../editor/contrib/colorPicker/browser/colorDetector.js';
 
 const openSettingsCommand = 'workbench.action.openSettings';
 const configureSettingsLabel = nls.localize('status.button.configure', "Configure");
diff --git a/src/vs/workbench/contrib/list/browser/list.contribution.ts b/src/vs/workbench/contrib/list/browser/list.contribution.ts
index dffda536058..a15848028e3 100644
--- a/src/vs/workbench/contrib/list/browser/list.contribution.ts
+++ b/src/vs/workbench/contrib/list/browser/list.contribution.ts
@@ -3,8 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { ListResizeColumnAction } from './listResizeColumnAction.js';
 
 export class ListContext implements IWorkbenchContribution {
 
@@ -21,3 +23,5 @@ export class ListContext implements IWorkbenchContribution {
 }
 
 registerWorkbenchContribution2(ListContext.ID, ListContext, WorkbenchPhase.BlockStartup);
+registerAction2(ListResizeColumnAction);
+
diff --git a/src/vs/workbench/contrib/list/browser/listResizeColumnAction.ts b/src/vs/workbench/contrib/list/browser/listResizeColumnAction.ts
new file mode 100644
index 00000000000..ae89c191fa1
--- /dev/null
+++ b/src/vs/workbench/contrib/list/browser/listResizeColumnAction.ts
@@ -0,0 +1,34 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { TableColumnResizeQuickPick } from './tableColumnResizeQuickPick.js';
+import { Table } from '../../../../base/browser/ui/table/tableWidget.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IListService, WorkbenchListFocusContextKey } from '../../../../platform/list/browser/listService.js';
+import { Action2 } from '../../../../platform/actions/common/actions.js';
+import { localize } from '../../../../nls.js';
+
+export class ListResizeColumnAction extends Action2 {
+	constructor() {
+		super({
+			id: 'list.resizeColumn',
+			title: { value: localize('list.resizeColumn', "Resize Column"), original: 'Resize Column' },
+			category: { value: localize('list', "List"), original: 'List' },
+			precondition: WorkbenchListFocusContextKey,
+			f1: true
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const listService = accessor.get(IListService);
+		const instantiationService = accessor.get(IInstantiationService);
+
+		const list = listService.lastFocusedList;
+		if (list instanceof Table) {
+			await instantiationService.createInstance(TableColumnResizeQuickPick, list).show();
+		}
+	}
+}
+
diff --git a/src/vs/workbench/contrib/list/browser/tableColumnResizeQuickPick.ts b/src/vs/workbench/contrib/list/browser/tableColumnResizeQuickPick.ts
new file mode 100644
index 00000000000..1df2bb82a03
--- /dev/null
+++ b/src/vs/workbench/contrib/list/browser/tableColumnResizeQuickPick.ts
@@ -0,0 +1,56 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Table } from '../../../../base/browser/ui/table/tableWidget.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import Severity from '../../../../base/common/severity.js';
+import { localize } from '../../../../nls.js';
+import { IQuickInputService, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
+
+interface IColumnResizeQuickPickItem extends IQuickPickItem {
+	index: number;
+}
+
+export class TableColumnResizeQuickPick extends Disposable {
+	constructor(
+		private readonly _table: Table<any>,
+		@IQuickInputService private readonly _quickInputService: IQuickInputService,
+	) {
+		super();
+	}
+
+	async show(): Promise<void> {
+		const items: IColumnResizeQuickPickItem[] = [];
+		this._table.getColumnLabels().forEach((label, index) => {
+			if (label) {
+				items.push({ label, index });
+			}
+		});
+		const column = await this._quickInputService.pick<IColumnResizeQuickPickItem>(items, { placeHolder: localize('table.column.selection', "Select the column to resize, type to filter.") });
+		if (!column) {
+			return;
+		}
+		const value = await this._quickInputService.input({
+			placeHolder: localize('table.column.resizeValue.placeHolder', "i.e. 20, 60, 100..."),
+			prompt: localize('table.column.resizeValue.prompt', "Please enter a width in percentage for the '{0}' column.", column.label),
+			validateInput: (input: string) => this._validateColumnResizeValue(input)
+		});
+		const percentageValue = value ? Number.parseInt(value) : undefined;
+		if (!percentageValue) {
+			return;
+		}
+		this._table.resizeColumn(column.index, percentageValue);
+	}
+
+	private async _validateColumnResizeValue(input: string): Promise<string | { content: string; severity: Severity } | null | undefined> {
+		const percentage = Number.parseInt(input);
+		if (input && !Number.isInteger(percentage)) {
+			return localize('table.column.resizeValue.invalidType', "Please enter an integer.");
+		} else if (percentage < 0 || percentage > 100) {
+			return localize('table.column.resizeValue.invalidRange', "Please enter a number greater than 0 and less than or equal to 100.");
+		}
+		return null;
+	}
+}
diff --git a/src/vs/workbench/contrib/localHistory/browser/localHistory.contribution.ts b/src/vs/workbench/contrib/localHistory/browser/localHistory.contribution.ts
index f43fa6eb26b..4ada23e72ec 100644
--- a/src/vs/workbench/contrib/localHistory/browser/localHistory.contribution.ts
+++ b/src/vs/workbench/contrib/localHistory/browser/localHistory.contribution.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/workbench/contrib/localHistory/browser/localHistoryCommands';
-import { WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { LocalHistoryTimeline } from 'vs/workbench/contrib/localHistory/browser/localHistoryTimeline';
+import './localHistoryCommands.js';
+import { WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { LocalHistoryTimeline } from './localHistoryTimeline.js';
 
 // Register Local History Timeline
 registerWorkbenchContribution2(LocalHistoryTimeline.ID, LocalHistoryTimeline, WorkbenchPhase.BlockRestore /* registrations only */);
diff --git a/src/vs/workbench/contrib/localHistory/browser/localHistory.ts b/src/vs/workbench/contrib/localHistory/browser/localHistory.ts
index 254f95041b0..0ca0ac19249 100644
--- a/src/vs/workbench/contrib/localHistory/browser/localHistory.ts
+++ b/src/vs/workbench/contrib/localHistory/browser/localHistory.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { Codicon } from 'vs/base/common/codicons';
-import { language } from 'vs/base/common/platform';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
+import { localize } from '../../../../nls.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { language } from '../../../../base/common/platform.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 
 interface ILocalHistoryDateFormatter {
 	format: (timestamp: number) => string;
diff --git a/src/vs/workbench/contrib/localHistory/browser/localHistoryCommands.ts b/src/vs/workbench/contrib/localHistory/browser/localHistoryCommands.ts
index c768ab602f0..2666528ab82 100644
--- a/src/vs/workbench/contrib/localHistory/browser/localHistoryCommands.ts
+++ b/src/vs/workbench/contrib/localHistory/browser/localHistoryCommands.ts
@@ -3,36 +3,41 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize, localize2 } from 'vs/nls';
-import { URI } from 'vs/base/common/uri';
-import { Event } from 'vs/base/common/event';
-import { Schemas } from 'vs/base/common/network';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { IWorkingCopyHistoryEntry, IWorkingCopyHistoryService } from 'vs/workbench/services/workingCopy/common/workingCopyHistory';
-import { API_OPEN_DIFF_EDITOR_COMMAND_ID } from 'vs/workbench/browser/parts/editor/editorCommands';
-import { LocalHistoryFileSystemProvider } from 'vs/workbench/contrib/localHistory/browser/localHistoryFileSystemProvider';
-import { ContextKeyExpr, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { registerAction2, Action2, MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
-import { basename, basenameOrAuthority, dirname } from 'vs/base/common/resources';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { EditorResourceAccessor, SaveSourceRegistry, SideBySideEditor } from 'vs/workbench/common/editor';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ActiveEditorContext, ResourceContextKey } from 'vs/workbench/common/contextkeys';
-import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { getIconClasses } from 'vs/editor/common/services/getIconClasses';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { firstOrDefault } from 'vs/base/common/arrays';
-import { getLocalHistoryDateFormatter, LOCAL_HISTORY_ICON_RESTORE, LOCAL_HISTORY_MENU_CONTEXT_KEY } from 'vs/workbench/contrib/localHistory/browser/localHistory';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
+import { localize, localize2 } from '../../../../nls.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Event } from '../../../../base/common/event.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { toErrorMessage } from '../../../../base/common/errorMessage.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { IWorkingCopyHistoryEntry, IWorkingCopyHistoryService } from '../../../services/workingCopy/common/workingCopyHistory.js';
+import { API_OPEN_DIFF_EDITOR_COMMAND_ID } from '../../../browser/parts/editor/editorCommands.js';
+import { LocalHistoryFileSystemProvider } from './localHistoryFileSystemProvider.js';
+import { ContextKeyExpr, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
+import { registerAction2, Action2, MenuId, MenuRegistry } from '../../../../platform/actions/common/actions.js';
+import { basename, basenameOrAuthority, dirname } from '../../../../base/common/resources.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { EditorResourceAccessor, SaveSourceRegistry, SideBySideEditor } from '../../../common/editor.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IWorkingCopyService } from '../../../services/workingCopy/common/workingCopyService.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { ActiveEditorContext, ResourceContextKey } from '../../../common/contextkeys.js';
+import { IQuickInputService, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
+import { getIconClasses } from '../../../../editor/common/services/getIconClasses.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { coalesce } from '../../../../base/common/arrays.js';
+import { getLocalHistoryDateFormatter, LOCAL_HISTORY_ICON_RESTORE, LOCAL_HISTORY_MENU_CONTEXT_KEY } from './localHistory.js';
+import { IPathService } from '../../../services/path/common/pathService.js';
+import { ResourceSet } from '../../../../base/common/map.js';
+import { IHistoryService } from '../../../services/history/common/history.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { IEditorOptions } from '../../../../platform/editor/common/editor.js';
 
 const LOCAL_HISTORY_CATEGORY = localize2('localHistory.category', 'Local History');
+const CTX_LOCAL_HISTORY_ENABLED = ContextKeyExpr.has('config.workbench.localHistory.enabled');
 
 export interface ITimelineCommandArgument {
 	uri: URI;
@@ -316,7 +321,8 @@ registerAction2(class extends Action2 {
 			id: 'workbench.action.localHistory.restoreViaPicker',
 			title: localize2('localHistory.restoreViaPicker', 'Find Entry to Restore'),
 			f1: true,
-			category: LOCAL_HISTORY_CATEGORY
+			category: LOCAL_HISTORY_CATEGORY,
+			precondition: CTX_LOCAL_HISTORY_ENABLED
 		});
 	}
 	async run(accessor: ServicesAccessor): Promise<void> {
@@ -328,36 +334,51 @@ registerAction2(class extends Action2 {
 		const editorService = accessor.get(IEditorService);
 		const fileService = accessor.get(IFileService);
 		const commandService = accessor.get(ICommandService);
+		const historyService = accessor.get(IHistoryService);
 
 		// Show all resources with associated history entries in picker
 		// with progress because this operation will take longer the more
 		// files have been saved overall.
+		//
+		// Sort the resources by history to put more relevant entries
+		// to the top.
 
-		const resourcePicker = quickInputService.createQuickPick<IQuickPickItem & { resource: URI }>();
+		const resourcePickerDisposables = new DisposableStore();
+		const resourcePicker = resourcePickerDisposables.add(quickInputService.createQuickPick<IQuickPickItem & { resource: URI }>());
 
 		let cts = new CancellationTokenSource();
-		resourcePicker.onDidHide(() => cts.dispose(true));
+		resourcePickerDisposables.add(resourcePicker.onDidHide(() => cts.dispose(true)));
 
 		resourcePicker.busy = true;
 		resourcePicker.show();
 
-		const resources = await workingCopyHistoryService.getAll(cts.token);
+		const resources = new ResourceSet(await workingCopyHistoryService.getAll(cts.token));
+		const recentEditorResources = new ResourceSet(coalesce(historyService.getHistory().map(({ resource }) => resource)));
+
+		const resourcesSortedByRecency: URI[] = [];
+		for (const resource of recentEditorResources) {
+			if (resources.has(resource)) {
+				resourcesSortedByRecency.push(resource);
+				resources.delete(resource);
+			}
+		}
+		resourcesSortedByRecency.push(...[...resources].sort((r1, r2) => r1.fsPath < r2.fsPath ? -1 : 1));
 
 		resourcePicker.busy = false;
 		resourcePicker.placeholder = localize('restoreViaPicker.filePlaceholder', "Select the file to show local history for");
 		resourcePicker.matchOnLabel = true;
 		resourcePicker.matchOnDescription = true;
-		resourcePicker.items = resources.map(resource => ({
+		resourcePicker.items = [...resourcesSortedByRecency].map(resource => ({
 			resource,
 			label: basenameOrAuthority(resource),
 			description: labelService.getUriLabel(dirname(resource), { relative: true }),
 			iconClasses: getIconClasses(modelService, languageService, resource)
-		})).sort((r1, r2) => r1.resource.fsPath < r2.resource.fsPath ? -1 : 1);
+		}));
 
 		await Event.toPromise(resourcePicker.onDidAccept);
-		resourcePicker.dispose();
+		resourcePickerDisposables.dispose();
 
-		const resource = firstOrDefault(resourcePicker.selectedItems)?.resource;
+		const resource = resourcePicker.selectedItems.at(0)?.resource;
 		if (!resource) {
 			return;
 		}
@@ -365,10 +386,11 @@ registerAction2(class extends Action2 {
 		// Show all entries for the picked resource in another picker
 		// and open the entry in the end that was selected by the user
 
-		const entryPicker = quickInputService.createQuickPick<IQuickPickItem & { entry: IWorkingCopyHistoryEntry }>();
+		const entryPickerDisposables = new DisposableStore();
+		const entryPicker = entryPickerDisposables.add(quickInputService.createQuickPick<IQuickPickItem & { entry: IWorkingCopyHistoryEntry }>());
 
 		cts = new CancellationTokenSource();
-		entryPicker.onDidHide(() => cts.dispose(true));
+		entryPickerDisposables.add(entryPicker.onDidHide(() => cts.dispose(true)));
 
 		entryPicker.busy = true;
 		entryPicker.show();
@@ -376,6 +398,7 @@ registerAction2(class extends Action2 {
 		const entries = await workingCopyHistoryService.getEntries(resource, cts.token);
 
 		entryPicker.busy = false;
+		entryPicker.canAcceptInBackground = true;
 		entryPicker.placeholder = localize('restoreViaPicker.entryPlaceholder', "Select the local history entry to open");
 		entryPicker.matchOnLabel = true;
 		entryPicker.matchOnDescription = true;
@@ -385,24 +408,27 @@ registerAction2(class extends Action2 {
 			description: toLocalHistoryEntryDateLabel(entry.timestamp)
 		}));
 
-		await Event.toPromise(entryPicker.onDidAccept);
-		entryPicker.dispose();
+		entryPickerDisposables.add(entryPicker.onDidAccept(async e => {
+			if (!e.inBackground) {
+				entryPickerDisposables.dispose();
+			}
 
-		const selectedItem = firstOrDefault(entryPicker.selectedItems);
-		if (!selectedItem) {
-			return;
-		}
+			const selectedItem = entryPicker.selectedItems.at(0);
+			if (!selectedItem) {
+				return;
+			}
 
-		const resourceExists = await fileService.exists(selectedItem.entry.workingCopy.resource);
-		if (resourceExists) {
-			return commandService.executeCommand(API_OPEN_DIFF_EDITOR_COMMAND_ID, ...toDiffEditorArguments(selectedItem.entry, selectedItem.entry.workingCopy.resource));
-		}
+			const resourceExists = await fileService.exists(selectedItem.entry.workingCopy.resource);
+			if (resourceExists) {
+				return commandService.executeCommand(API_OPEN_DIFF_EDITOR_COMMAND_ID, ...toDiffEditorArguments(selectedItem.entry, selectedItem.entry.workingCopy.resource, { preserveFocus: e.inBackground }));
+			}
 
-		return openEntry(selectedItem.entry, editorService);
+			return openEntry(selectedItem.entry, editorService, { preserveFocus: e.inBackground });
+		}));
 	}
 });
 
-MenuRegistry.appendMenuItem(MenuId.TimelineTitle, { command: { id: 'workbench.action.localHistory.restoreViaPicker', title: localize2('localHistory.restoreViaPickerMenu', 'Local History: Find Entry to Restore...') }, group: 'submenu', order: 1 });
+MenuRegistry.appendMenuItem(MenuId.TimelineTitle, { command: { id: 'workbench.action.localHistory.restoreViaPicker', title: localize2('localHistory.restoreViaPickerMenu', 'Local History: Find Entry to Restore...') }, group: 'submenu', order: 1, when: CTX_LOCAL_HISTORY_ENABLED });
 
 //#endregion
 
@@ -427,18 +453,19 @@ registerAction2(class extends Action2 {
 
 		const { entry } = await findLocalHistoryEntry(workingCopyHistoryService, item);
 		if (entry) {
-			const inputBox = quickInputService.createInputBox();
+			const disposables = new DisposableStore();
+			const inputBox = disposables.add(quickInputService.createInputBox());
 			inputBox.title = localize('renameLocalHistoryEntryTitle', "Rename Local History Entry");
 			inputBox.ignoreFocusOut = true;
 			inputBox.placeholder = localize('renameLocalHistoryPlaceholder', "Enter the new name of the local history entry");
 			inputBox.value = SaveSourceRegistry.getSourceLabel(entry.source);
 			inputBox.show();
-			inputBox.onDidAccept(() => {
+			disposables.add(inputBox.onDidAccept(() => {
 				if (inputBox.value) {
 					workingCopyHistoryService.updateEntry(entry, { source: inputBox.value }, CancellationToken.None);
 				}
-				inputBox.dispose();
-			});
+				disposables.dispose();
+			}));
 		}
 	}
 });
@@ -499,7 +526,8 @@ registerAction2(class extends Action2 {
 			id: 'workbench.action.localHistory.deleteAll',
 			title: localize2('localHistory.deleteAll', 'Delete All'),
 			f1: true,
-			category: LOCAL_HISTORY_CATEGORY
+			category: LOCAL_HISTORY_CATEGORY,
+			precondition: CTX_LOCAL_HISTORY_ENABLED
 		});
 	}
 	async run(accessor: ServicesAccessor): Promise<void> {
@@ -534,7 +562,7 @@ registerAction2(class extends Action2 {
 			title: localize2('localHistory.create', 'Create Entry'),
 			f1: true,
 			category: LOCAL_HISTORY_CATEGORY,
-			precondition: ActiveEditorContext
+			precondition: ContextKeyExpr.and(CTX_LOCAL_HISTORY_ENABLED, ActiveEditorContext)
 		});
 	}
 	async run(accessor: ServicesAccessor): Promise<void> {
@@ -549,19 +577,20 @@ registerAction2(class extends Action2 {
 			return; // only enable for selected schemes
 		}
 
-		const inputBox = quickInputService.createInputBox();
+		const disposables = new DisposableStore();
+		const inputBox = disposables.add(quickInputService.createInputBox());
 		inputBox.title = localize('createLocalHistoryEntryTitle', "Create Local History Entry");
 		inputBox.ignoreFocusOut = true;
 		inputBox.placeholder = localize('createLocalHistoryPlaceholder', "Enter the new name of the local history entry for '{0}'", labelService.getUriBasenameLabel(resource));
 		inputBox.show();
-		inputBox.onDidAccept(async () => {
+		disposables.add(inputBox.onDidAccept(async () => {
 			const entrySource = inputBox.value;
-			inputBox.dispose();
+			disposables.dispose();
 
 			if (entrySource) {
 				await workingCopyHistoryService.addEntry({ resource, source: inputBox.value }, CancellationToken.None);
 			}
-		});
+		}));
 	}
 });
 
@@ -569,12 +598,13 @@ registerAction2(class extends Action2 {
 
 //#region Helpers
 
-async function openEntry(entry: IWorkingCopyHistoryEntry, editorService: IEditorService): Promise<void> {
+async function openEntry(entry: IWorkingCopyHistoryEntry, editorService: IEditorService, options?: IEditorOptions): Promise<void> {
 	const resource = LocalHistoryFileSystemProvider.toLocalHistoryFileSystem({ location: entry.location, associatedResource: entry.workingCopy.resource });
 
 	await editorService.openEditor({
 		resource,
-		label: localize('localHistoryEditorLabel', "{0} ({1} • {2})", entry.workingCopy.name, SaveSourceRegistry.getSourceLabel(entry.source), toLocalHistoryEntryDateLabel(entry.timestamp))
+		label: localize('localHistoryEditorLabel', "{0} ({1} • {2})", entry.workingCopy.name, SaveSourceRegistry.getSourceLabel(entry.source), toLocalHistoryEntryDateLabel(entry.timestamp)),
+		options
 	});
 }
 
@@ -585,9 +615,9 @@ async function closeEntry(entry: IWorkingCopyHistoryEntry, editorService: IEdito
 	await editorService.closeEditors(editors, { preserveFocus: true });
 }
 
-export function toDiffEditorArguments(entry: IWorkingCopyHistoryEntry, resource: URI): unknown[];
-export function toDiffEditorArguments(previousEntry: IWorkingCopyHistoryEntry, entry: IWorkingCopyHistoryEntry): unknown[];
-export function toDiffEditorArguments(arg1: IWorkingCopyHistoryEntry, arg2: IWorkingCopyHistoryEntry | URI): unknown[] {
+export function toDiffEditorArguments(entry: IWorkingCopyHistoryEntry, resource: URI, options?: IEditorOptions): unknown[];
+export function toDiffEditorArguments(previousEntry: IWorkingCopyHistoryEntry, entry: IWorkingCopyHistoryEntry, options?: IEditorOptions): unknown[];
+export function toDiffEditorArguments(arg1: IWorkingCopyHistoryEntry, arg2: IWorkingCopyHistoryEntry | URI, options?: IEditorOptions): unknown[] {
 
 	// Left hand side is always a working copy history entry
 	const originalResource = LocalHistoryFileSystemProvider.toLocalHistoryFileSystem({ location: arg1.location, associatedResource: arg1.workingCopy.resource });
@@ -620,7 +650,7 @@ export function toDiffEditorArguments(arg1: IWorkingCopyHistoryEntry, arg2: IWor
 		originalResource,
 		modifiedResource,
 		label,
-		undefined // important to keep order of arguments in command proper
+		options ? [undefined, options] : undefined
 	];
 }
 
diff --git a/src/vs/workbench/contrib/localHistory/browser/localHistoryFileSystemProvider.ts b/src/vs/workbench/contrib/localHistory/browser/localHistoryFileSystemProvider.ts
index b414bbf3e45..7eb133edc25 100644
--- a/src/vs/workbench/contrib/localHistory/browser/localHistoryFileSystemProvider.ts
+++ b/src/vs/workbench/contrib/localHistory/browser/localHistoryFileSystemProvider.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { IFileDeleteOptions, IFileOverwriteOptions, FileSystemProviderCapabilities, FileType, IFileWriteOptions, hasReadWriteCapability, IFileService, IFileSystemProvider, IFileSystemProviderWithFileReadWriteCapability, IStat, IWatchOptions } from 'vs/platform/files/common/files';
-import { isEqual } from 'vs/base/common/resources';
-import { VSBuffer } from 'vs/base/common/buffer';
+import { Event } from '../../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IFileDeleteOptions, IFileOverwriteOptions, FileSystemProviderCapabilities, FileType, IFileWriteOptions, hasReadWriteCapability, IFileService, IFileSystemProvider, IFileSystemProviderWithFileReadWriteCapability, IStat, IWatchOptions } from '../../../../platform/files/common/files.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
 
 interface ILocalHistoryResource {
 
diff --git a/src/vs/workbench/contrib/localHistory/browser/localHistoryTimeline.ts b/src/vs/workbench/contrib/localHistory/browser/localHistoryTimeline.ts
index 8d30e92f19e..2a03441a905 100644
--- a/src/vs/workbench/contrib/localHistory/browser/localHistoryTimeline.ts
+++ b/src/vs/workbench/contrib/localHistory/browser/localHistoryTimeline.ts
@@ -3,27 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { Emitter } from 'vs/base/common/event';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { ITimelineService, Timeline, TimelineChangeEvent, TimelineItem, TimelineOptions, TimelineProvider } from 'vs/workbench/contrib/timeline/common/timeline';
-import { IWorkingCopyHistoryEntry, IWorkingCopyHistoryService } from 'vs/workbench/services/workingCopy/common/workingCopyHistory';
-import { URI } from 'vs/base/common/uri';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { API_OPEN_DIFF_EDITOR_COMMAND_ID } from 'vs/workbench/browser/parts/editor/editorCommands';
-import { IFileService } from 'vs/platform/files/common/files';
-import { LocalHistoryFileSystemProvider } from 'vs/workbench/contrib/localHistory/browser/localHistoryFileSystemProvider';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { SaveSourceRegistry } from 'vs/workbench/common/editor';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { COMPARE_WITH_FILE_LABEL, toDiffEditorArguments } from 'vs/workbench/contrib/localHistory/browser/localHistoryCommands';
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { getLocalHistoryDateFormatter, LOCAL_HISTORY_ICON_ENTRY, LOCAL_HISTORY_MENU_CONTEXT_VALUE } from 'vs/workbench/contrib/localHistory/browser/localHistory';
-import { Schemas } from 'vs/base/common/network';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { getVirtualWorkspaceAuthority } from 'vs/platform/workspace/common/virtualWorkspace';
+import { localize } from '../../../../nls.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { ITimelineService, Timeline, TimelineChangeEvent, TimelineItem, TimelineOptions, TimelineProvider } from '../../timeline/common/timeline.js';
+import { IWorkingCopyHistoryEntry, IWorkingCopyHistoryService } from '../../../services/workingCopy/common/workingCopyHistory.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IPathService } from '../../../services/path/common/pathService.js';
+import { API_OPEN_DIFF_EDITOR_COMMAND_ID } from '../../../browser/parts/editor/editorCommands.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { LocalHistoryFileSystemProvider } from './localHistoryFileSystemProvider.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { SaveSourceRegistry } from '../../../common/editor.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { COMPARE_WITH_FILE_LABEL, toDiffEditorArguments } from './localHistoryCommands.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { getLocalHistoryDateFormatter, LOCAL_HISTORY_ICON_ENTRY, LOCAL_HISTORY_MENU_CONTEXT_VALUE } from './localHistory.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { getVirtualWorkspaceAuthority } from '../../../../platform/workspace/common/virtualWorkspace.js';
 
 export class LocalHistoryTimeline extends Disposable implements IWorkbenchContribution, TimelineProvider {
 
diff --git a/src/vs/workbench/contrib/localHistory/electron-sandbox/localHistory.contribution.ts b/src/vs/workbench/contrib/localHistory/electron-sandbox/localHistory.contribution.ts
index 0aa8970b30a..c230839847c 100644
--- a/src/vs/workbench/contrib/localHistory/electron-sandbox/localHistory.contribution.ts
+++ b/src/vs/workbench/contrib/localHistory/electron-sandbox/localHistory.contribution.ts
@@ -3,4 +3,4 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/workbench/contrib/localHistory/electron-sandbox/localHistoryCommands';
+import './localHistoryCommands.js';
diff --git a/src/vs/workbench/contrib/localHistory/electron-sandbox/localHistoryCommands.ts b/src/vs/workbench/contrib/localHistory/electron-sandbox/localHistoryCommands.ts
index 76ac171e9af..47cd19da199 100644
--- a/src/vs/workbench/contrib/localHistory/electron-sandbox/localHistoryCommands.ts
+++ b/src/vs/workbench/contrib/localHistory/electron-sandbox/localHistoryCommands.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize2 } from 'vs/nls';
-import { IWorkingCopyHistoryService } from 'vs/workbench/services/workingCopy/common/workingCopyHistory';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { registerAction2, Action2, MenuId } from 'vs/platform/actions/common/actions';
-import { LOCAL_HISTORY_MENU_CONTEXT_KEY } from 'vs/workbench/contrib/localHistory/browser/localHistory';
-import { findLocalHistoryEntry, ITimelineCommandArgument } from 'vs/workbench/contrib/localHistory/browser/localHistoryCommands';
-import { isMacintosh, isWindows } from 'vs/base/common/platform';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { Schemas } from 'vs/base/common/network';
-import { ResourceContextKey } from 'vs/workbench/common/contextkeys';
+import { localize2 } from '../../../../nls.js';
+import { IWorkingCopyHistoryService } from '../../../services/workingCopy/common/workingCopyHistory.js';
+import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
+import { registerAction2, Action2, MenuId } from '../../../../platform/actions/common/actions.js';
+import { LOCAL_HISTORY_MENU_CONTEXT_KEY } from '../browser/localHistory.js';
+import { findLocalHistoryEntry, ITimelineCommandArgument } from '../browser/localHistoryCommands.js';
+import { isMacintosh, isWindows } from '../../../../base/common/platform.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { ResourceContextKey } from '../../../common/contextkeys.js';
 
 //#region Delete
 
diff --git a/src/vs/workbench/contrib/localization/browser/localization.contribution.ts b/src/vs/workbench/contrib/localization/browser/localization.contribution.ts
index e0cf5ed2eb2..7c56d2ef904 100644
--- a/src/vs/workbench/contrib/localization/browser/localization.contribution.ts
+++ b/src/vs/workbench/contrib/localization/browser/localization.contribution.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BaseLocalizationWorkbenchContribution } from 'vs/workbench/contrib/localization/common/localization.contribution';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { BaseLocalizationWorkbenchContribution } from '../common/localization.contribution.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry } from '../../../common/contributions.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
 
 export class WebLocalizationWorkbenchContribution extends BaseLocalizationWorkbenchContribution { }
 
diff --git a/src/vs/workbench/contrib/localization/common/localization.contribution.ts b/src/vs/workbench/contrib/localization/common/localization.contribution.ts
index 4b8d4c29554..b89d74b3f78 100644
--- a/src/vs/workbench/contrib/localization/common/localization.contribution.ts
+++ b/src/vs/workbench/contrib/localization/common/localization.contribution.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { localize } from 'vs/nls';
-import { registerAction2 } from 'vs/platform/actions/common/actions';
-import { IExtensionManifest } from 'vs/platform/extensions/common/extensions';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { ClearDisplayLanguageAction, ConfigureDisplayLanguageAction } from 'vs/workbench/contrib/localization/common/localizationsActions';
-import { IExtensionFeatureTableRenderer, IRenderedData, ITableData, IRowData, IExtensionFeaturesRegistry, Extensions } from 'vs/workbench/services/extensionManagement/common/extensionFeatures';
-import { ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { localize } from '../../../../nls.js';
+import { registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { IExtensionManifest } from '../../../../platform/extensions/common/extensions.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { ClearDisplayLanguageAction, ConfigureDisplayLanguageAction } from './localizationsActions.js';
+import { IExtensionFeatureTableRenderer, IRenderedData, ITableData, IRowData, IExtensionFeaturesRegistry, Extensions } from '../../../services/extensionManagement/common/extensionFeatures.js';
+import { ExtensionsRegistry } from '../../../services/extensions/common/extensionsRegistry.js';
 
 export class BaseLocalizationWorkbenchContribution extends Disposable implements IWorkbenchContribution {
 	constructor() {
diff --git a/src/vs/workbench/contrib/localization/common/localizationsActions.ts b/src/vs/workbench/contrib/localization/common/localizationsActions.ts
index d9ad34f1c1b..86191446731 100644
--- a/src/vs/workbench/contrib/localization/common/localizationsActions.ts
+++ b/src/vs/workbench/contrib/localization/common/localizationsActions.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize, localize2 } from 'vs/nls';
-import { IQuickInputService, IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { Action2, MenuId } from 'vs/platform/actions/common/actions';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ILanguagePackItem, ILanguagePackService } from 'vs/platform/languagePacks/common/languagePacks';
-import { ILocaleService } from 'vs/workbench/services/localization/common/locale';
-import { IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions';
+import { localize, localize2 } from '../../../../nls.js';
+import { IQuickInputService, IQuickPickSeparator } from '../../../../platform/quickinput/common/quickInput.js';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { Action2, MenuId } from '../../../../platform/actions/common/actions.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILanguagePackItem, ILanguagePackService } from '../../../../platform/languagePacks/common/languagePacks.js';
+import { ILocaleService } from '../../../services/localization/common/locale.js';
+import { IExtensionsWorkbenchService } from '../../extensions/common/extensions.js';
 
 export class ConfigureDisplayLanguageAction extends Action2 {
 	public static readonly ID = 'workbench.action.configureLocale';
@@ -37,7 +37,8 @@ export class ConfigureDisplayLanguageAction extends Action2 {
 
 		const installedLanguages = await languagePackService.getInstalledLanguages();
 
-		const qp = quickInputService.createQuickPick<ILanguagePackItem>();
+		const disposables = new DisposableStore();
+		const qp = disposables.add(quickInputService.createQuickPick<ILanguagePackItem>({ useSeparators: true }));
 		qp.matchOnDescription = true;
 		qp.placeholder = localize('chooseLocale', "Select Display Language");
 
@@ -46,7 +47,6 @@ export class ConfigureDisplayLanguageAction extends Action2 {
 			qp.items = items.concat(this.withMoreInfoButton(installedLanguages));
 		}
 
-		const disposables = new DisposableStore();
 		const source = new CancellationTokenSource();
 		disposables.add(qp.onDispose(() => {
 			source.cancel();
diff --git a/src/vs/workbench/contrib/localization/electron-sandbox/localization.contribution.ts b/src/vs/workbench/contrib/localization/electron-sandbox/localization.contribution.ts
index b603ed444e6..9dfa4afa29a 100644
--- a/src/vs/workbench/contrib/localization/electron-sandbox/localization.contribution.ts
+++ b/src/vs/workbench/contrib/localization/electron-sandbox/localization.contribution.ts
@@ -3,24 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import * as platform from 'vs/base/common/platform';
-import { IExtensionManagementService, IExtensionGalleryService, InstallOperation, ILocalExtension, InstallExtensionResult, DidUninstallExtensionEvent } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { INotificationService, NeverShowAgainScope } from 'vs/platform/notification/common/notification';
-import Severity from 'vs/base/common/severity';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { VIEWLET_ID as EXTENSIONS_VIEWLET_ID, IExtensionsViewPaneContainer } from 'vs/workbench/contrib/extensions/common/extensions';
-import { minimumTranslatedStrings } from 'vs/workbench/contrib/localization/electron-sandbox/minimalTranslations';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { ViewContainerLocation } from 'vs/workbench/common/views';
-import { ILocaleService } from 'vs/workbench/services/localization/common/locale';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { BaseLocalizationWorkbenchContribution } from 'vs/workbench/contrib/localization/common/localization.contribution';
+import { localize } from '../../../../nls.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry } from '../../../common/contributions.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import * as platform from '../../../../base/common/platform.js';
+import { IExtensionManagementService, IExtensionGalleryService, InstallOperation, ILocalExtension, InstallExtensionResult, DidUninstallExtensionEvent } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { INotificationService, NeverShowAgainScope } from '../../../../platform/notification/common/notification.js';
+import Severity from '../../../../base/common/severity.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IExtensionsWorkbenchService } from '../../extensions/common/extensions.js';
+import { minimumTranslatedStrings } from './minimalTranslations.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { ILocaleService } from '../../../services/localization/common/locale.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { BaseLocalizationWorkbenchContribution } from '../common/localization.contribution.js';
 
 class NativeLocalizationWorkbenchContribution extends BaseLocalizationWorkbenchContribution {
 	private static LANGUAGEPACK_SUGGESTION_IGNORE_STORAGE_KEY = 'extensionsAssistant/languagePackSuggestionIgnore';
@@ -32,7 +30,7 @@ class NativeLocalizationWorkbenchContribution extends BaseLocalizationWorkbenchC
 		@IStorageService private readonly storageService: IStorageService,
 		@IExtensionManagementService private readonly extensionManagementService: IExtensionManagementService,
 		@IExtensionGalleryService private readonly galleryService: IExtensionGalleryService,
-		@IPaneCompositePartService private readonly paneCompositeService: IPaneCompositePartService,
+		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
 	) {
 		super();
@@ -103,7 +101,7 @@ class NativeLocalizationWorkbenchContribution extends BaseLocalizationWorkbenchC
 		if (!this.galleryService.isEnabled()) {
 			return;
 		}
-		if (!language || !locale || locale === 'en' || locale.indexOf('en-') === 0) {
+		if (!language || !locale || platform.Language.isDefaultVariant()) {
 			return;
 		}
 		if (locale.startsWith(language) || languagePackSuggestionIgnoreList.includes(locale)) {
@@ -168,16 +166,7 @@ class NativeLocalizationWorkbenchContribution extends BaseLocalizationWorkbenchC
 			label: translations['searchMarketplace'],
 			run: async () => {
 				logUserReaction('search');
-				const viewlet = await this.paneCompositeService.openPaneComposite(EXTENSIONS_VIEWLET_ID, ViewContainerLocation.Sidebar, true);
-				if (!viewlet) {
-					return;
-				}
-				const container = viewlet.getViewPaneContainer();
-				if (!container) {
-					return;
-				}
-				(container as IExtensionsViewPaneContainer).search(`tag:lp-${locale}`);
-				container.focus();
+				await this.extensionsWorkbenchService.openSearch(`tag:lp-${locale}`);
 			}
 		};
 
diff --git a/src/vs/workbench/contrib/localization/electron-sandbox/minimalTranslations.ts b/src/vs/workbench/contrib/localization/electron-sandbox/minimalTranslations.ts
index 00cffc61629..2a323211518 100644
--- a/src/vs/workbench/contrib/localization/electron-sandbox/minimalTranslations.ts
+++ b/src/vs/workbench/contrib/localization/electron-sandbox/minimalTranslations.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
+import { localize } from '../../../../nls.js';
 
 // The strings localized in this file will get pulled into the manifest of the language packs.
 // So that they are available for VS Code to use without downloading the entire language pack.
diff --git a/src/vs/workbench/contrib/logs/browser/logs.contribution.ts b/src/vs/workbench/contrib/logs/browser/logs.contribution.ts
index 15bd494c20a..5adbf9390a2 100644
--- a/src/vs/workbench/contrib/logs/browser/logs.contribution.ts
+++ b/src/vs/workbench/contrib/logs/browser/logs.contribution.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { OpenWindowSessionLogFileAction } from 'vs/workbench/contrib/logs/common/logsActions';
-import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { LogsDataCleaner } from 'vs/workbench/contrib/logs/common/logsDataCleaner';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { OpenWindowSessionLogFileAction } from '../common/logsActions.js';
+import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from '../../../common/contributions.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { LogsDataCleaner } from '../common/logsDataCleaner.js';
 
 class WebLogOutputChannels extends Disposable implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/contrib/logs/common/defaultLogLevels.ts b/src/vs/workbench/contrib/logs/common/defaultLogLevels.ts
index 522b64a8cd6..1302428ebdf 100644
--- a/src/vs/workbench/contrib/logs/common/defaultLogLevels.ts
+++ b/src/vs/workbench/contrib/logs/common/defaultLogLevels.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ILogService, ILoggerService, LogLevel, LogLevelToString, getLogLevel, parseLogLevel } from 'vs/platform/log/common/log';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { FileOperationResult, IFileService, toFileOperationResult } from 'vs/platform/files/common/files';
-import { IJSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditing';
-import { isString, isUndefined } from 'vs/base/common/types';
-import { EXTENSION_IDENTIFIER_WITH_LOG_REGEX } from 'vs/platform/environment/common/environmentService';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { parse } from 'vs/base/common/json';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Emitter, Event } from 'vs/base/common/event';
+import { ILogService, ILoggerService, LogLevel, LogLevelToString, getLogLevel, parseLogLevel } from '../../../../platform/log/common/log.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { FileOperationResult, IFileService, toFileOperationResult } from '../../../../platform/files/common/files.js';
+import { IJSONEditingService } from '../../../services/configuration/common/jsonEditing.js';
+import { isString, isUndefined } from '../../../../base/common/types.js';
+import { EXTENSION_IDENTIFIER_WITH_LOG_REGEX } from '../../../../platform/environment/common/environmentService.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { parse } from '../../../../base/common/json.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
 
 interface ParsedArgvLogLevels {
 	default?: LogLevel;
diff --git a/src/vs/workbench/contrib/logs/common/logs.contribution.ts b/src/vs/workbench/contrib/logs/common/logs.contribution.ts
index b96ba30f68c..4901650bec9 100644
--- a/src/vs/workbench/contrib/logs/common/logs.contribution.ts
+++ b/src/vs/workbench/contrib/logs/common/logs.contribution.ts
@@ -3,29 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { SetLogLevelAction } from 'vs/workbench/contrib/logs/common/logsActions';
-import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
-import { IFileService, whenProviderRegistered } from 'vs/platform/files/common/files';
-import { IOutputChannelRegistry, IOutputService, Extensions } from 'vs/workbench/services/output/common/output';
-import { Disposable, DisposableMap, DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { CONTEXT_LOG_LEVEL, ILogService, ILoggerResource, ILoggerService, LogLevel, LogLevelToString, isLogLevel } from 'vs/platform/log/common/log';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { URI } from 'vs/base/common/uri';
-import { Event } from 'vs/base/common/event';
-import { windowLogId, showWindowLogActionId } from 'vs/workbench/services/log/common/logConstants';
-import { createCancelablePromise, timeout } from 'vs/base/common/async';
-import { CancellationError, getErrorMessage, isCancellationError } from 'vs/base/common/errors';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IDefaultLogLevelsService } from 'vs/workbench/contrib/logs/common/defaultLogLevels';
-import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { CounterSet } from 'vs/base/common/map';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { Schemas } from 'vs/base/common/network';
+import * as nls from '../../../../nls.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { SetLogLevelAction } from './logsActions.js';
+import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from '../../../common/contributions.js';
+import { IFileService, whenProviderRegistered } from '../../../../platform/files/common/files.js';
+import { IOutputChannelRegistry, IOutputService, Extensions } from '../../../services/output/common/output.js';
+import { Disposable, DisposableMap, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { CONTEXT_LOG_LEVEL, ILogService, ILoggerResource, ILoggerService, LogLevel, LogLevelToString, isLogLevel } from '../../../../platform/log/common/log.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Event } from '../../../../base/common/event.js';
+import { windowLogId, showWindowLogActionId } from '../../../services/log/common/logConstants.js';
+import { createCancelablePromise, timeout } from '../../../../base/common/async.js';
+import { CancellationError, getErrorMessage, isCancellationError } from '../../../../base/common/errors.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IDefaultLogLevelsService } from './defaultLogLevels.js';
+import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { CounterSet } from '../../../../base/common/map.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { Schemas } from '../../../../base/common/network.js';
 
 registerAction2(class extends Action2 {
 	constructor() {
@@ -70,11 +70,11 @@ class LogOutputChannels extends Disposable implements IWorkbenchContribution {
 		super();
 		const contextKey = CONTEXT_LOG_LEVEL.bindTo(contextKeyService);
 		contextKey.set(LogLevelToString(loggerService.getLogLevel()));
-		loggerService.onDidChangeLogLevel(e => {
+		this._register(loggerService.onDidChangeLogLevel(e => {
 			if (isLogLevel(e)) {
 				contextKey.set(LogLevelToString(loggerService.getLogLevel()));
 			}
-		});
+		}));
 
 		this.onDidAddLoggers(loggerService.getRegisteredLoggers());
 		this._register(loggerService.onDidChangeLoggers(({ added, removed }) => {
diff --git a/src/vs/workbench/contrib/logs/common/logsActions.ts b/src/vs/workbench/contrib/logs/common/logsActions.ts
index 86c59a48995..c28c6ca9140 100644
--- a/src/vs/workbench/contrib/logs/common/logsActions.ts
+++ b/src/vs/workbench/contrib/logs/common/logsActions.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { Action } from 'vs/base/common/actions';
-import { ILoggerService, LogLevel, LogLevelToLocalizedString, isLogLevel } from 'vs/platform/log/common/log';
-import { IQuickInputButton, IQuickInputService, IQuickPickItem, IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
-import { URI } from 'vs/base/common/uri';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { dirname, basename, isEqual } from 'vs/base/common/resources';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IOutputChannelDescriptor, IOutputService } from 'vs/workbench/services/output/common/output';
-import { extensionTelemetryLogChannelId, telemetryLogId } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IDefaultLogLevelsService } from 'vs/workbench/contrib/logs/common/defaultLogLevels';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import * as nls from '../../../../nls.js';
+import { Action } from '../../../../base/common/actions.js';
+import { ILoggerService, LogLevel, LogLevelToLocalizedString, isLogLevel } from '../../../../platform/log/common/log.js';
+import { IQuickInputButton, IQuickInputService, IQuickPickItem, IQuickPickSeparator } from '../../../../platform/quickinput/common/quickInput.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { dirname, basename, isEqual } from '../../../../base/common/resources.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IOutputChannelDescriptor, IOutputService } from '../../../services/output/common/output.js';
+import { extensionTelemetryLogChannelId, telemetryLogId } from '../../../../platform/telemetry/common/telemetryUtils.js';
+import { IDefaultLogLevelsService } from './defaultLogLevels.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
 
 type LogLevelQuickPickItem = IQuickPickItem & { level: LogLevel };
 type LogChannelQuickPickItem = IQuickPickItem & { id: string; resource: URI; extensionId?: string };
@@ -75,7 +75,7 @@ export class SetLogLevelAction extends Action {
 
 		return new Promise((resolve, reject) => {
 			const disposables = new DisposableStore();
-			const quickPick = this.quickInputService.createQuickPick();
+			const quickPick = disposables.add(this.quickInputService.createQuickPick({ useSeparators: true }));
 			quickPick.placeholder = nls.localize('selectlog', "Set Log Level");
 			quickPick.items = entries;
 			let selectedItem: IQuickPickItem | undefined;
@@ -108,7 +108,7 @@ export class SetLogLevelAction extends Action {
 
 		return new Promise((resolve, reject) => {
 			const disposables = new DisposableStore();
-			const quickPick = this.quickInputService.createQuickPick();
+			const quickPick = disposables.add(this.quickInputService.createQuickPick());
 			quickPick.placeholder = logChannel ? nls.localize('selectLogLevelFor', " {0}: Select log level", logChannel?.label) : nls.localize('selectLogLevel', "Select log level");
 			quickPick.items = entries;
 			quickPick.activeItems = entries.filter((entry) => entry.level === this.loggerService.getLogLevel());
diff --git a/src/vs/workbench/contrib/logs/common/logsDataCleaner.ts b/src/vs/workbench/contrib/logs/common/logsDataCleaner.ts
index f4222a3d1c1..03f535360ec 100644
--- a/src/vs/workbench/contrib/logs/common/logsDataCleaner.ts
+++ b/src/vs/workbench/contrib/logs/common/logsDataCleaner.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IFileService } from 'vs/platform/files/common/files';
-import { basename, dirname } from 'vs/base/common/resources';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { Promises } from 'vs/base/common/async';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { basename, dirname } from '../../../../base/common/resources.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.js';
+import { Promises } from '../../../../base/common/async.js';
 
 export class LogsDataCleaner extends Disposable {
 
diff --git a/src/vs/workbench/contrib/logs/electron-sandbox/logs.contribution.ts b/src/vs/workbench/contrib/logs/electron-sandbox/logs.contribution.ts
index cfb0ac9d7d6..566a8bc6d23 100644
--- a/src/vs/workbench/contrib/logs/electron-sandbox/logs.contribution.ts
+++ b/src/vs/workbench/contrib/logs/electron-sandbox/logs.contribution.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { OpenLogsFolderAction, OpenExtensionLogsFolderAction } from 'vs/workbench/contrib/logs/electron-sandbox/logsActions';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { OpenLogsFolderAction, OpenExtensionLogsFolderAction } from './logsActions.js';
+import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 
 registerAction2(class extends Action2 {
 	constructor() {
diff --git a/src/vs/workbench/contrib/logs/electron-sandbox/logsActions.ts b/src/vs/workbench/contrib/logs/electron-sandbox/logsActions.ts
index b0fb77fd4b4..bc7e00198c2 100644
--- a/src/vs/workbench/contrib/logs/electron-sandbox/logsActions.ts
+++ b/src/vs/workbench/contrib/logs/electron-sandbox/logsActions.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Action } from 'vs/base/common/actions';
-import * as nls from 'vs/nls';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
-import { IFileService } from 'vs/platform/files/common/files';
-import { joinPath } from 'vs/base/common/resources';
-import { Schemas } from 'vs/base/common/network';
+import { Action } from '../../../../base/common/actions.js';
+import * as nls from '../../../../nls.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-sandbox/environmentService.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { joinPath } from '../../../../base/common/resources.js';
+import { Schemas } from '../../../../base/common/network.js';
 
 export class OpenLogsFolderAction extends Action {
 
diff --git a/src/vs/workbench/contrib/mappedEdits/common/mappedEdits.contribution.ts b/src/vs/workbench/contrib/mappedEdits/common/mappedEdits.contribution.ts
index fc753a4b673..3470efba634 100644
--- a/src/vs/workbench/contrib/mappedEdits/common/mappedEdits.contribution.ts
+++ b/src/vs/workbench/contrib/mappedEdits/common/mappedEdits.contribution.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { URI } from 'vs/base/common/uri';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import * as languages from 'vs/editor/common/languages';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
+import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import * as languages from '../../../../editor/common/languages.js';
 
 CommandsRegistry.registerCommand(
 	'_executeMappedEditsProvider',
diff --git a/src/vs/workbench/contrib/markdown/browser/markdownDocumentRenderer.ts b/src/vs/workbench/contrib/markdown/browser/markdownDocumentRenderer.ts
index 9b18b5cd028..585e5f0833a 100644
--- a/src/vs/workbench/contrib/markdown/browser/markdownDocumentRenderer.ts
+++ b/src/vs/workbench/contrib/markdown/browser/markdownDocumentRenderer.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { hookDomPurifyHrefAndSrcSanitizer, basicMarkupHtmlTags } from 'vs/base/browser/dom';
-import * as dompurify from 'vs/base/browser/dompurify/dompurify';
-import { allowedMarkdownAttr } from 'vs/base/browser/markdownRenderer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { marked } from 'vs/base/common/marked/marked';
-import { Schemas } from 'vs/base/common/network';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { tokenizeToString } from 'vs/editor/common/languages/textToHtmlTokenizer';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { escape } from 'vs/base/common/strings';
-import { SimpleSettingRenderer } from 'vs/workbench/contrib/markdown/browser/markdownSettingRenderer';
+import { basicMarkupHtmlTags, hookDomPurifyHrefAndSrcSanitizer } from '../../../../base/browser/dom.js';
+import * as dompurify from '../../../../base/browser/dompurify/dompurify.js';
+import { allowedMarkdownAttr } from '../../../../base/browser/markdownRenderer.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import * as marked from '../../../../base/common/marked/marked.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { escape } from '../../../../base/common/strings.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { tokenizeToString } from '../../../../editor/common/languages/textToHtmlTokenizer.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { markedGfmHeadingIdPlugin } from './markedGfmHeadingIdPlugin.js';
 
 export const DEFAULT_MARKDOWN_STYLES = `
 body {
@@ -33,7 +33,7 @@ img {
 }
 
 a {
-	text-decoration: none;
+	text-decoration: var(--text-link-decoration);
 }
 
 a:hover {
@@ -184,6 +184,13 @@ function sanitize(documentContent: string, allowUnknownProtocols: boolean): stri
 	}
 }
 
+interface IRenderMarkdownDocumentOptions {
+	readonly shouldSanitize?: boolean;
+	readonly allowUnknownProtocols?: boolean;
+	readonly markedExtensions?: marked.MarkedExtension[];
+	readonly token?: CancellationToken;
+}
+
 /**
  * Renders a string of markdown as a document.
  *
@@ -193,47 +200,119 @@ export async function renderMarkdownDocument(
 	text: string,
 	extensionService: IExtensionService,
 	languageService: ILanguageService,
-	shouldSanitize: boolean = true,
-	allowUnknownProtocols: boolean = false,
-	token?: CancellationToken,
-	settingRenderer?: SimpleSettingRenderer
+	options?: IRenderMarkdownDocumentOptions
 ): Promise<string> {
+	const m = new marked.Marked(
+		MarkedHighlight.markedHighlight({
+			async: true,
+			async highlight(code: string, lang: string): Promise<string> {
+				if (typeof lang !== 'string') {
+					return escape(code);
+				}
 
-	const highlight = (code: string, lang: string | undefined, callback: ((error: any, code: string) => void) | undefined): any => {
-		if (!callback) {
-			return code;
-		}
+				await extensionService.whenInstalledExtensionsRegistered();
+				if (options?.token?.isCancellationRequested) {
+					return '';
+				}
 
-		if (typeof lang !== 'string') {
-			callback(null, escape(code));
-			return '';
-		}
-
-		extensionService.whenInstalledExtensionsRegistered().then(async () => {
-			if (token?.isCancellationRequested) {
-				callback(null, '');
-				return;
+				const languageId = languageService.getLanguageIdByLanguageName(lang) ?? languageService.getLanguageIdByLanguageName(lang.split(/\s+|:|,|(?!^)\{|\?]/, 1)[0]);
+				return tokenizeToString(languageService, code, languageId);
 			}
+		}),
+		markedGfmHeadingIdPlugin(),
+		...(options?.markedExtensions ?? []),
+	);
 
-			const languageId = languageService.getLanguageIdByLanguageName(lang) ?? languageService.getLanguageIdByLanguageName(lang.split(/\s+|:|,|(?!^)\{|\?]/, 1)[0]);
-			const html = await tokenizeToString(languageService, code, languageId);
-			callback(null, html);
-		});
-		return '';
-	};
+	const raw = await m.parse(text, { async: true });
+	if (options?.shouldSanitize ?? true) {
+		return sanitize(raw, options?.allowUnknownProtocols ?? false);
+	} else {
+		return raw;
+	}
+}
 
-	const renderer = new marked.Renderer();
-	if (settingRenderer) {
-		renderer.html = settingRenderer.getHtmlRenderer();
+namespace MarkedHighlight {
+	// Copied from https://github.com/markedjs/marked-highlight/blob/main/src/index.js
+
+	export function markedHighlight(options: marked.MarkedOptions & { highlight: (code: string, lang: string, info: string) => string | Promise<string> }): marked.MarkedExtension {
+		if (typeof options === 'function') {
+			options = {
+				highlight: options,
+			};
+		}
+
+		if (!options || typeof options.highlight !== 'function') {
+			throw new Error('Must provide highlight function');
+		}
+
+		return {
+			async: !!options.async,
+			walkTokens(token: marked.Token): Promise<void> | void {
+				if (token.type !== 'code') {
+					return;
+				}
+
+				const lang = getLang(token.lang);
+
+				if (options.async) {
+					return Promise.resolve(options.highlight(token.text, lang, token.lang || '')).then(updateToken(token));
+				}
+
+				const code = options.highlight(token.text, lang, token.lang || '');
+				if (code instanceof Promise) {
+					throw new Error('markedHighlight is not set to async but the highlight function is async. Set the async option to true on markedHighlight to await the async highlight function.');
+				}
+				updateToken(token)(code);
+			},
+			renderer: {
+				code({ text, lang, escaped }: marked.Tokens.Code) {
+					const classAttr = lang
+						? ` class="language-${escape(lang)}"`
+						: '';
+					text = text.replace(/\n$/, '');
+					return `<pre><code${classAttr}>${escaped ? text : escape(text, true)}\n</code></pre>`;
+				},
+			},
+		};
 	}
 
-	return new Promise<string>((resolve, reject) => {
-		marked(text, { highlight, renderer }, (err, value) => err ? reject(err) : resolve(value));
-	}).then(raw => {
-		if (shouldSanitize) {
-			return sanitize(raw, allowUnknownProtocols);
+	function getLang(lang: string) {
+		return (lang || '').match(/\S*/)![0];
+	}
+
+	function updateToken(token: any) {
+		return (code: string) => {
+			if (typeof code === 'string' && code !== token.text) {
+				token.escaped = true;
+				token.text = code;
+			}
+		};
+	}
+
+	// copied from marked helpers
+	const escapeTest = /[&<>"']/;
+	const escapeReplace = new RegExp(escapeTest.source, 'g');
+	const escapeTestNoEncode = /[<>"']|&(?!(#\d{1,7}|#[Xx][a-fA-F0-9]{1,6}|\w+);)/;
+	const escapeReplaceNoEncode = new RegExp(escapeTestNoEncode.source, 'g');
+	const escapeReplacement: Record<string, string> = {
+		'&': '&amp;',
+		'<': '&lt;',
+		'>': '&gt;',
+		'"': '&quot;',
+		[`'`]: '&#39;',
+	};
+	const getEscapeReplacement = (ch: string) => escapeReplacement[ch];
+	function escape(html: string, encode?: boolean) {
+		if (encode) {
+			if (escapeTest.test(html)) {
+				return html.replace(escapeReplace, getEscapeReplacement);
+			}
 		} else {
-			return raw;
+			if (escapeTestNoEncode.test(html)) {
+				return html.replace(escapeReplaceNoEncode, getEscapeReplacement);
+			}
 		}
-	});
+
+		return html;
+	}
 }
diff --git a/src/vs/workbench/contrib/markdown/browser/markdownSettingRenderer.ts b/src/vs/workbench/contrib/markdown/browser/markdownSettingRenderer.ts
index 095a2978564..f5ab6a69bee 100644
--- a/src/vs/workbench/contrib/markdown/browser/markdownSettingRenderer.ts
+++ b/src/vs/workbench/contrib/markdown/browser/markdownSettingRenderer.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { IPreferencesService, ISetting, ISettingsGroup } from 'vs/workbench/services/preferences/common/preferences';
-import { settingKeyToDisplayFormat } from 'vs/workbench/contrib/preferences/browser/settingsTreeModels';
-import { URI } from 'vs/base/common/uri';
-import { Schemas } from 'vs/base/common/network';
-import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { DefaultSettings } from 'vs/workbench/services/preferences/common/preferencesModels';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { ActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { IAction } from 'vs/base/common/actions';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-
-const codeSettingRegex = /^<code (codesetting)="([^\s"\:]+)(?::([^"]+))?">/;
+import { ActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { IAction } from '../../../../base/common/actions.js';
+import type { Tokens } from '../../../../base/common/marked/marked.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { URI } from '../../../../base/common/uri.js';
+import * as nls from '../../../../nls.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { ConfigurationTarget, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IPreferencesService, ISetting } from '../../../services/preferences/common/preferences.js';
+import { settingKeyToDisplayFormat } from '../../preferences/browser/settingsTreeModels.js';
 
 export class SimpleSettingRenderer {
-	private _defaultSettings: DefaultSettings;
+	private readonly codeSettingAnchorRegex: RegExp;
+	private readonly codeSettingSimpleRegex: RegExp;
+
 	private _updatedSettings = new Map<string, any>(); // setting ID to user's original setting value
 	private _encounteredSettings = new Map<string, ISetting>(); // setting ID to setting
 	private _featuredSettings = new Map<string, any>(); // setting ID to feature value
@@ -29,9 +29,10 @@ export class SimpleSettingRenderer {
 		@IContextMenuService private readonly _contextMenuService: IContextMenuService,
 		@IPreferencesService private readonly _preferencesService: IPreferencesService,
 		@ITelemetryService private readonly _telemetryService: ITelemetryService,
-		@IClipboardService private readonly _clipboardService: IClipboardService
+		@IClipboardService private readonly _clipboardService: IClipboardService,
 	) {
-		this._defaultSettings = new DefaultSettings([], ConfigurationTarget.USER);
+		this.codeSettingAnchorRegex = new RegExp(`^<a (href)=".*code.*://settings/([^\\s"]+)"(?:\\s*codesetting="([^"]+)")?>`);
+		this.codeSettingSimpleRegex = new RegExp(`^setting\\(([^\\s:)]+)(?::([^)]+))?\\)$`);
 	}
 
 	get featuredSettingStates(): Map<string, boolean> {
@@ -42,17 +43,47 @@ export class SimpleSettingRenderer {
 		return result;
 	}
 
-	getHtmlRenderer(): (html: string) => string {
-		return (html): string => {
-			const match = codeSettingRegex.exec(html);
-			if (match && match.length === 4) {
-				const settingId = match[2];
-				const rendered = this.render(settingId, match[3]);
-				if (rendered) {
-					html = html.replace(codeSettingRegex, rendered);
-				}
+	private replaceAnchor(raw: string): string | undefined {
+		const match = this.codeSettingAnchorRegex.exec(raw);
+		if (match && match.length === 4) {
+			const settingId = match[2];
+			const rendered = this.render(settingId, match[3]);
+			if (rendered) {
+				return raw.replace(this.codeSettingAnchorRegex, rendered);
 			}
-			return html;
+		}
+		return undefined;
+	}
+
+	private replaceSimple(raw: string): string | undefined {
+		const match = this.codeSettingSimpleRegex.exec(raw);
+		if (match && match.length === 3) {
+			const settingId = match[1];
+			const rendered = this.render(settingId, match[2]);
+			if (rendered) {
+				return raw.replace(this.codeSettingSimpleRegex, rendered);
+			}
+		}
+		return undefined;
+	}
+
+	getHtmlRenderer(): (token: Tokens.HTML | Tokens.Tag) => string {
+		return ({ raw }: Tokens.HTML | Tokens.Tag): string => {
+			const replacedAnchor = this.replaceAnchor(raw);
+			if (replacedAnchor) {
+				raw = replacedAnchor;
+			}
+			return raw;
+		};
+	}
+
+	getCodeSpanRenderer(): (token: Tokens.Codespan) => string {
+		return ({ text }: Tokens.Codespan): string => {
+			const replacedSimple = this.replaceSimple(text);
+			if (replacedSimple) {
+				return replacedSimple;
+			}
+			return `<code>${text}</code>`;
 		};
 	}
 
@@ -60,28 +91,14 @@ export class SimpleSettingRenderer {
 		return `${Schemas.codeSetting}://${settingId}${value ? `/${value}` : ''}`;
 	}
 
-	private settingsGroups: ISettingsGroup[] | undefined = undefined;
 	private getSetting(settingId: string): ISetting | undefined {
-		if (!this.settingsGroups) {
-			this.settingsGroups = this._defaultSettings.getSettingsGroups();
-		}
 		if (this._encounteredSettings.has(settingId)) {
 			return this._encounteredSettings.get(settingId);
 		}
-		for (const group of this.settingsGroups) {
-			for (const section of group.sections) {
-				for (const setting of section.settings) {
-					if (setting.key === settingId) {
-						this._encounteredSettings.set(settingId, setting);
-						return setting;
-					}
-				}
-			}
-		}
-		return undefined;
+		return this._preferencesService.getSetting(settingId);
 	}
 
-	parseValue(settingId: string, value: string): any {
+	parseValue(settingId: string, value: string) {
 		if (value === 'undefined' || value === '') {
 			return undefined;
 		}
@@ -165,7 +182,7 @@ export class SimpleSettingRenderer {
 		return `<code tabindex="0"><a href="${href}" class="codesetting" title="${title}" aria-role="button"><svg width="14" height="14" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" fill="currentColor"><path d="M9.1 4.4L8.6 2H7.4l-.5 2.4-.7.3-2-1.3-.9.8 1.3 2-.2.7-2.4.5v1.2l2.4.5.3.8-1.3 2 .8.8 2-1.3.8.3.4 2.3h1.2l.5-2.4.8-.3 2 1.3.8-.8-1.3-2 .3-.8 2.3-.4V7.4l-2.4-.5-.3-.8 1.3-2-.8-.8-2 1.3-.7-.2zM9.4 1l.5 2.4L12 2.1l2 2-1.4 2.1 2.4.4v2.8l-2.4.5L14 12l-2 2-2.1-1.4-.5 2.4H6.6l-.5-2.4L4 13.9l-2-2 1.4-2.1L1 9.4V6.6l2.4-.5L2.1 4l2-2 2.1 1.4.4-2.4h2.8zm.6 7c0 1.1-.9 2-2 2s-2-.9-2-2 .9-2 2-2 2 .9 2 2zM8 9c.6 0 1-.4 1-1s-.4-1-1-1-1 .4-1 1 .4 1 1 1z"/></svg>
 			<span class="separator"></span>
 			<span class="setting-name">${setting.key}</span>
-		</a></code><code>`;
+		</a></code>`;
 	}
 
 	private getSettingMessage(setting: ISetting, newValue: boolean | string | number): string | undefined {
diff --git a/src/vs/workbench/contrib/markdown/browser/markedGfmHeadingIdPlugin.ts b/src/vs/workbench/contrib/markdown/browser/markedGfmHeadingIdPlugin.ts
new file mode 100644
index 00000000000..39ed0d95270
--- /dev/null
+++ b/src/vs/workbench/contrib/markdown/browser/markedGfmHeadingIdPlugin.ts
@@ -0,0 +1,63 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import * as marked from '../../../../base/common/marked/marked.js';
+
+// Copied from https://github.com/Flet/github-slugger since we can't use esm yet.
+// eslint-disable-next-line no-control-regex, no-misleading-character-class
+const githubSlugReplaceRegex = /[\0-\x1F!-,\.\/:-@\[-\^`\{-\xA9\xAB-\xB4\xB6-\xB9\xBB-\xBF\xD7\xF7\u02C2-\u02C5\u02D2-\u02DF\u02E5-\u02EB\u02ED\u02EF-\u02FF\u0375\u0378\u0379\u037E\u0380-\u0385\u0387\u038B\u038D\u03A2\u03F6\u0482\u0530\u0557\u0558\u055A-\u055F\u0589-\u0590\u05BE\u05C0\u05C3\u05C6\u05C8-\u05CF\u05EB-\u05EE\u05F3-\u060F\u061B-\u061F\u066A-\u066D\u06D4\u06DD\u06DE\u06E9\u06FD\u06FE\u0700-\u070F\u074B\u074C\u07B2-\u07BF\u07F6-\u07F9\u07FB\u07FC\u07FE\u07FF\u082E-\u083F\u085C-\u085F\u086B-\u089F\u08B5\u08C8-\u08D2\u08E2\u0964\u0965\u0970\u0984\u098D\u098E\u0991\u0992\u09A9\u09B1\u09B3-\u09B5\u09BA\u09BB\u09C5\u09C6\u09C9\u09CA\u09CF-\u09D6\u09D8-\u09DB\u09DE\u09E4\u09E5\u09F2-\u09FB\u09FD\u09FF\u0A00\u0A04\u0A0B-\u0A0E\u0A11\u0A12\u0A29\u0A31\u0A34\u0A37\u0A3A\u0A3B\u0A3D\u0A43-\u0A46\u0A49\u0A4A\u0A4E-\u0A50\u0A52-\u0A58\u0A5D\u0A5F-\u0A65\u0A76-\u0A80\u0A84\u0A8E\u0A92\u0AA9\u0AB1\u0AB4\u0ABA\u0ABB\u0AC6\u0ACA\u0ACE\u0ACF\u0AD1-\u0ADF\u0AE4\u0AE5\u0AF0-\u0AF8\u0B00\u0B04\u0B0D\u0B0E\u0B11\u0B12\u0B29\u0B31\u0B34\u0B3A\u0B3B\u0B45\u0B46\u0B49\u0B4A\u0B4E-\u0B54\u0B58-\u0B5B\u0B5E\u0B64\u0B65\u0B70\u0B72-\u0B81\u0B84\u0B8B-\u0B8D\u0B91\u0B96-\u0B98\u0B9B\u0B9D\u0BA0-\u0BA2\u0BA5-\u0BA7\u0BAB-\u0BAD\u0BBA-\u0BBD\u0BC3-\u0BC5\u0BC9\u0BCE\u0BCF\u0BD1-\u0BD6\u0BD8-\u0BE5\u0BF0-\u0BFF\u0C0D\u0C11\u0C29\u0C3A-\u0C3C\u0C45\u0C49\u0C4E-\u0C54\u0C57\u0C5B-\u0C5F\u0C64\u0C65\u0C70-\u0C7F\u0C84\u0C8D\u0C91\u0CA9\u0CB4\u0CBA\u0CBB\u0CC5\u0CC9\u0CCE-\u0CD4\u0CD7-\u0CDD\u0CDF\u0CE4\u0CE5\u0CF0\u0CF3-\u0CFF\u0D0D\u0D11\u0D45\u0D49\u0D4F-\u0D53\u0D58-\u0D5E\u0D64\u0D65\u0D70-\u0D79\u0D80\u0D84\u0D97-\u0D99\u0DB2\u0DBC\u0DBE\u0DBF\u0DC7-\u0DC9\u0DCB-\u0DCE\u0DD5\u0DD7\u0DE0-\u0DE5\u0DF0\u0DF1\u0DF4-\u0E00\u0E3B-\u0E3F\u0E4F\u0E5A-\u0E80\u0E83\u0E85\u0E8B\u0EA4\u0EA6\u0EBE\u0EBF\u0EC5\u0EC7\u0ECE\u0ECF\u0EDA\u0EDB\u0EE0-\u0EFF\u0F01-\u0F17\u0F1A-\u0F1F\u0F2A-\u0F34\u0F36\u0F38\u0F3A-\u0F3D\u0F48\u0F6D-\u0F70\u0F85\u0F98\u0FBD-\u0FC5\u0FC7-\u0FFF\u104A-\u104F\u109E\u109F\u10C6\u10C8-\u10CC\u10CE\u10CF\u10FB\u1249\u124E\u124F\u1257\u1259\u125E\u125F\u1289\u128E\u128F\u12B1\u12B6\u12B7\u12BF\u12C1\u12C6\u12C7\u12D7\u1311\u1316\u1317\u135B\u135C\u1360-\u137F\u1390-\u139F\u13F6\u13F7\u13FE-\u1400\u166D\u166E\u1680\u169B-\u169F\u16EB-\u16ED\u16F9-\u16FF\u170D\u1715-\u171F\u1735-\u173F\u1754-\u175F\u176D\u1771\u1774-\u177F\u17D4-\u17D6\u17D8-\u17DB\u17DE\u17DF\u17EA-\u180A\u180E\u180F\u181A-\u181F\u1879-\u187F\u18AB-\u18AF\u18F6-\u18FF\u191F\u192C-\u192F\u193C-\u1945\u196E\u196F\u1975-\u197F\u19AC-\u19AF\u19CA-\u19CF\u19DA-\u19FF\u1A1C-\u1A1F\u1A5F\u1A7D\u1A7E\u1A8A-\u1A8F\u1A9A-\u1AA6\u1AA8-\u1AAF\u1AC1-\u1AFF\u1B4C-\u1B4F\u1B5A-\u1B6A\u1B74-\u1B7F\u1BF4-\u1BFF\u1C38-\u1C3F\u1C4A-\u1C4C\u1C7E\u1C7F\u1C89-\u1C8F\u1CBB\u1CBC\u1CC0-\u1CCF\u1CD3\u1CFB-\u1CFF\u1DFA\u1F16\u1F17\u1F1E\u1F1F\u1F46\u1F47\u1F4E\u1F4F\u1F58\u1F5A\u1F5C\u1F5E\u1F7E\u1F7F\u1FB5\u1FBD\u1FBF-\u1FC1\u1FC5\u1FCD-\u1FCF\u1FD4\u1FD5\u1FDC-\u1FDF\u1FED-\u1FF1\u1FF5\u1FFD-\u203E\u2041-\u2053\u2055-\u2070\u2072-\u207E\u2080-\u208F\u209D-\u20CF\u20F1-\u2101\u2103-\u2106\u2108\u2109\u2114\u2116-\u2118\u211E-\u2123\u2125\u2127\u2129\u212E\u213A\u213B\u2140-\u2144\u214A-\u214D\u214F-\u215F\u2189-\u24B5\u24EA-\u2BFF\u2C2F\u2C5F\u2CE5-\u2CEA\u2CF4-\u2CFF\u2D26\u2D28-\u2D2C\u2D2E\u2D2F\u2D68-\u2D6E\u2D70-\u2D7E\u2D97-\u2D9F\u2DA7\u2DAF\u2DB7\u2DBF\u2DC7\u2DCF\u2DD7\u2DDF\u2E00-\u2E2E\u2E30-\u3004\u3008-\u3020\u3030\u3036\u3037\u303D-\u3040\u3097\u3098\u309B\u309C\u30A0\u30FB\u3100-\u3104\u3130\u318F-\u319F\u31C0-\u31EF\u3200-\u33FF\u4DC0-\u4DFF\u9FFD-\u9FFF\uA48D-\uA4CF\uA4FE\uA4FF\uA60D-\uA60F\uA62C-\uA63F\uA673\uA67E\uA6F2-\uA716\uA720\uA721\uA789\uA78A\uA7C0\uA7C1\uA7CB-\uA7F4\uA828-\uA82B\uA82D-\uA83F\uA874-\uA87F\uA8C6-\uA8CF\uA8DA-\uA8DF\uA8F8-\uA8FA\uA8FC\uA92E\uA92F\uA954-\uA95F\uA97D-\uA97F\uA9C1-\uA9CE\uA9DA-\uA9DF\uA9FF\uAA37-\uAA3F\uAA4E\uAA4F\uAA5A-\uAA5F\uAA77-\uAA79\uAAC3-\uAADA\uAADE\uAADF\uAAF0\uAAF1\uAAF7-\uAB00\uAB07\uAB08\uAB0F\uAB10\uAB17-\uAB1F\uAB27\uAB2F\uAB5B\uAB6A-\uAB6F\uABEB\uABEE\uABEF\uABFA-\uABFF\uD7A4-\uD7AF\uD7C7-\uD7CA\uD7FC-\uD7FF\uE000-\uF8FF\uFA6E\uFA6F\uFADA-\uFAFF\uFB07-\uFB12\uFB18-\uFB1C\uFB29\uFB37\uFB3D\uFB3F\uFB42\uFB45\uFBB2-\uFBD2\uFD3E-\uFD4F\uFD90\uFD91\uFDC8-\uFDEF\uFDFC-\uFDFF\uFE10-\uFE1F\uFE30-\uFE32\uFE35-\uFE4C\uFE50-\uFE6F\uFE75\uFEFD-\uFF0F\uFF1A-\uFF20\uFF3B-\uFF3E\uFF40\uFF5B-\uFF65\uFFBF-\uFFC1\uFFC8\uFFC9\uFFD0\uFFD1\uFFD8\uFFD9\uFFDD-\uFFFF]|\uD800[\uDC0C\uDC27\uDC3B\uDC3E\uDC4E\uDC4F\uDC5E-\uDC7F\uDCFB-\uDD3F\uDD75-\uDDFC\uDDFE-\uDE7F\uDE9D-\uDE9F\uDED1-\uDEDF\uDEE1-\uDEFF\uDF20-\uDF2C\uDF4B-\uDF4F\uDF7B-\uDF7F\uDF9E\uDF9F\uDFC4-\uDFC7\uDFD0\uDFD6-\uDFFF]|\uD801[\uDC9E\uDC9F\uDCAA-\uDCAF\uDCD4-\uDCD7\uDCFC-\uDCFF\uDD28-\uDD2F\uDD64-\uDDFF\uDF37-\uDF3F\uDF56-\uDF5F\uDF68-\uDFFF]|\uD802[\uDC06\uDC07\uDC09\uDC36\uDC39-\uDC3B\uDC3D\uDC3E\uDC56-\uDC5F\uDC77-\uDC7F\uDC9F-\uDCDF\uDCF3\uDCF6-\uDCFF\uDD16-\uDD1F\uDD3A-\uDD7F\uDDB8-\uDDBD\uDDC0-\uDDFF\uDE04\uDE07-\uDE0B\uDE14\uDE18\uDE36\uDE37\uDE3B-\uDE3E\uDE40-\uDE5F\uDE7D-\uDE7F\uDE9D-\uDEBF\uDEC8\uDEE7-\uDEFF\uDF36-\uDF3F\uDF56-\uDF5F\uDF73-\uDF7F\uDF92-\uDFFF]|\uD803[\uDC49-\uDC7F\uDCB3-\uDCBF\uDCF3-\uDCFF\uDD28-\uDD2F\uDD3A-\uDE7F\uDEAA\uDEAD-\uDEAF\uDEB2-\uDEFF\uDF1D-\uDF26\uDF28-\uDF2F\uDF51-\uDFAF\uDFC5-\uDFDF\uDFF7-\uDFFF]|\uD804[\uDC47-\uDC65\uDC70-\uDC7E\uDCBB-\uDCCF\uDCE9-\uDCEF\uDCFA-\uDCFF\uDD35\uDD40-\uDD43\uDD48-\uDD4F\uDD74\uDD75\uDD77-\uDD7F\uDDC5-\uDDC8\uDDCD\uDDDB\uDDDD-\uDDFF\uDE12\uDE38-\uDE3D\uDE3F-\uDE7F\uDE87\uDE89\uDE8E\uDE9E\uDEA9-\uDEAF\uDEEB-\uDEEF\uDEFA-\uDEFF\uDF04\uDF0D\uDF0E\uDF11\uDF12\uDF29\uDF31\uDF34\uDF3A\uDF45\uDF46\uDF49\uDF4A\uDF4E\uDF4F\uDF51-\uDF56\uDF58-\uDF5C\uDF64\uDF65\uDF6D-\uDF6F\uDF75-\uDFFF]|\uD805[\uDC4B-\uDC4F\uDC5A-\uDC5D\uDC62-\uDC7F\uDCC6\uDCC8-\uDCCF\uDCDA-\uDD7F\uDDB6\uDDB7\uDDC1-\uDDD7\uDDDE-\uDDFF\uDE41-\uDE43\uDE45-\uDE4F\uDE5A-\uDE7F\uDEB9-\uDEBF\uDECA-\uDEFF\uDF1B\uDF1C\uDF2C-\uDF2F\uDF3A-\uDFFF]|\uD806[\uDC3B-\uDC9F\uDCEA-\uDCFE\uDD07\uDD08\uDD0A\uDD0B\uDD14\uDD17\uDD36\uDD39\uDD3A\uDD44-\uDD4F\uDD5A-\uDD9F\uDDA8\uDDA9\uDDD8\uDDD9\uDDE2\uDDE5-\uDDFF\uDE3F-\uDE46\uDE48-\uDE4F\uDE9A-\uDE9C\uDE9E-\uDEBF\uDEF9-\uDFFF]|\uD807[\uDC09\uDC37\uDC41-\uDC4F\uDC5A-\uDC71\uDC90\uDC91\uDCA8\uDCB7-\uDCFF\uDD07\uDD0A\uDD37-\uDD39\uDD3B\uDD3E\uDD48-\uDD4F\uDD5A-\uDD5F\uDD66\uDD69\uDD8F\uDD92\uDD99-\uDD9F\uDDAA-\uDEDF\uDEF7-\uDFAF\uDFB1-\uDFFF]|\uD808[\uDF9A-\uDFFF]|\uD809[\uDC6F-\uDC7F\uDD44-\uDFFF]|[\uD80A\uD80B\uD80E-\uD810\uD812-\uD819\uD824-\uD82B\uD82D\uD82E\uD830-\uD833\uD837\uD839\uD83D\uD83F\uD87B-\uD87D\uD87F\uD885-\uDB3F\uDB41-\uDBFF][\uDC00-\uDFFF]|\uD80D[\uDC2F-\uDFFF]|\uD811[\uDE47-\uDFFF]|\uD81A[\uDE39-\uDE3F\uDE5F\uDE6A-\uDECF\uDEEE\uDEEF\uDEF5-\uDEFF\uDF37-\uDF3F\uDF44-\uDF4F\uDF5A-\uDF62\uDF78-\uDF7C\uDF90-\uDFFF]|\uD81B[\uDC00-\uDE3F\uDE80-\uDEFF\uDF4B-\uDF4E\uDF88-\uDF8E\uDFA0-\uDFDF\uDFE2\uDFE5-\uDFEF\uDFF2-\uDFFF]|\uD821[\uDFF8-\uDFFF]|\uD823[\uDCD6-\uDCFF\uDD09-\uDFFF]|\uD82C[\uDD1F-\uDD4F\uDD53-\uDD63\uDD68-\uDD6F\uDEFC-\uDFFF]|\uD82F[\uDC6B-\uDC6F\uDC7D-\uDC7F\uDC89-\uDC8F\uDC9A-\uDC9C\uDC9F-\uDFFF]|\uD834[\uDC00-\uDD64\uDD6A-\uDD6C\uDD73-\uDD7A\uDD83\uDD84\uDD8C-\uDDA9\uDDAE-\uDE41\uDE45-\uDFFF]|\uD835[\uDC55\uDC9D\uDCA0\uDCA1\uDCA3\uDCA4\uDCA7\uDCA8\uDCAD\uDCBA\uDCBC\uDCC4\uDD06\uDD0B\uDD0C\uDD15\uDD1D\uDD3A\uDD3F\uDD45\uDD47-\uDD49\uDD51\uDEA6\uDEA7\uDEC1\uDEDB\uDEFB\uDF15\uDF35\uDF4F\uDF6F\uDF89\uDFA9\uDFC3\uDFCC\uDFCD]|\uD836[\uDC00-\uDDFF\uDE37-\uDE3A\uDE6D-\uDE74\uDE76-\uDE83\uDE85-\uDE9A\uDEA0\uDEB0-\uDFFF]|\uD838[\uDC07\uDC19\uDC1A\uDC22\uDC25\uDC2B-\uDCFF\uDD2D-\uDD2F\uDD3E\uDD3F\uDD4A-\uDD4D\uDD4F-\uDEBF\uDEFA-\uDFFF]|\uD83A[\uDCC5-\uDCCF\uDCD7-\uDCFF\uDD4C-\uDD4F\uDD5A-\uDFFF]|\uD83B[\uDC00-\uDDFF\uDE04\uDE20\uDE23\uDE25\uDE26\uDE28\uDE33\uDE38\uDE3A\uDE3C-\uDE41\uDE43-\uDE46\uDE48\uDE4A\uDE4C\uDE50\uDE53\uDE55\uDE56\uDE58\uDE5A\uDE5C\uDE5E\uDE60\uDE63\uDE65\uDE66\uDE6B\uDE73\uDE78\uDE7D\uDE7F\uDE8A\uDE9C-\uDEA0\uDEA4\uDEAA\uDEBC-\uDFFF]|\uD83C[\uDC00-\uDD2F\uDD4A-\uDD4F\uDD6A-\uDD6F\uDD8A-\uDFFF]|\uD83E[\uDC00-\uDFEF\uDFFA-\uDFFF]|\uD869[\uDEDE-\uDEFF]|\uD86D[\uDF35-\uDF3F]|\uD86E[\uDC1E\uDC1F]|\uD873[\uDEA2-\uDEAF]|\uD87A[\uDFE1-\uDFFF]|\uD87E[\uDE1E-\uDFFF]|\uD884[\uDF4B-\uDFFF]|\uDB40[\uDC00-\uDCFF\uDDF0-\uDFFF]/g;
+
+function slugify(heading: string): string {
+	const slugifiedHeading = heading.trim()
+		.toLowerCase()
+		.replace(githubSlugReplaceRegex, '')
+		.replace(/\s/g, '-'); // Replace whitespace with -
+
+	return slugifiedHeading;
+}
+
+// Copied from https://github.com/markedjs/marked-gfm-heading-id/blob/main/src/index.js
+// Removed logic for handling duplicate header ids for now
+
+// unescape from marked helpers
+const unescapeTest = /&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/ig;
+function unescape(html: string) {
+	// explicitly match decimal, hex, and named HTML entities
+	return html.replace(unescapeTest, (_, n) => {
+		n = n.toLowerCase();
+		if (n === 'colon') { return ':'; }
+		if (n.charAt(0) === '#') {
+			return n.charAt(1) === 'x'
+				? String.fromCharCode(parseInt(n.substring(2), 16))
+				: String.fromCharCode(+n.substring(1));
+		}
+		return '';
+	});
+}
+
+export function markedGfmHeadingIdPlugin({ prefix = '', globalSlugs = false } = {}): marked.MarkedExtension {
+	return {
+		// hooks: {
+		// 	preprocess(src: string) {
+		// 		if (!globalSlugs) {
+		// 			resetHeadings();
+		// 		}
+		// 		return src;
+		// 	},
+		// },
+		renderer: {
+			heading({ tokens, depth }) {
+				const text = this.parser.parseInline(tokens);
+				const raw = unescape(this.parser.parseInline(tokens, this.parser.textRenderer))
+					.trim()
+					.replace(/<[!\/a-z].*?>/gi, '');
+				const level = depth;
+				const id = `${prefix}${slugify(raw)}`;
+				// const heading = { level, text, id, raw };
+				// headings.push(heading);
+				return `<h${level} id="${id}">${text}</h${level}>\n`;
+			},
+		},
+	};
+}
diff --git a/src/vs/workbench/contrib/markdown/test/browser/markdownSettingRenderer.test.ts b/src/vs/workbench/contrib/markdown/test/browser/markdownSettingRenderer.test.ts
index c0ee61a5161..d3ac12543c3 100644
--- a/src/vs/workbench/contrib/markdown/test/browser/markdownSettingRenderer.test.ts
+++ b/src/vs/workbench/contrib/markdown/test/browser/markdownSettingRenderer.test.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { IAction } from 'vs/base/common/actions';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ConfigurationScope, Extensions, IConfigurationNode, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { SimpleSettingRenderer } from 'vs/workbench/contrib/markdown/browser/markdownSettingRenderer';
-import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
+import { IAction } from '../../../../../base/common/actions.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { ConfigurationScope, Extensions, IConfigurationNode, IConfigurationRegistry } from '../../../../../platform/configuration/common/configurationRegistry.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
+import { Registry } from '../../../../../platform/registry/common/platform.js';
+import { SimpleSettingRenderer } from '../../browser/markdownSettingRenderer.js';
+import { IPreferencesService } from '../../../../services/preferences/common/preferences.js';
 
 const configuration: IConfigurationNode = {
 	'id': 'examples',
@@ -58,7 +58,15 @@ suite('Markdown Setting Renderer Test', () => {
 
 	suiteSetup(() => {
 		configurationService = new MarkdownConfigurationService();
-		preferencesService = <IPreferencesService>{};
+		preferencesService = <IPreferencesService>{
+			getSetting: (setting) => {
+				let type = 'boolean';
+				if (setting.includes('string')) {
+					type = 'string';
+				}
+				return { type, key: setting };
+			}
+		};
 		contextMenuService = <IContextMenuService>{};
 		Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfiguration(configuration);
 		settingRenderer = new SimpleSettingRenderer(configurationService, contextMenuService, preferencesService, { publicLog2: () => { } } as any, { writeText: async () => { } } as any);
@@ -70,13 +78,13 @@ suite('Markdown Setting Renderer Test', () => {
 
 	test('render code setting button with value', () => {
 		const htmlRenderer = settingRenderer.getHtmlRenderer();
-		const htmlNoValue = '<code codesetting="example.booleanSetting">';
-		const renderedHtmlNoValue = htmlRenderer(htmlNoValue);
+		const htmlNoValue = '<a href="code-oss://settings/example.booleanSetting" codesetting="true">';
+		const renderedHtmlNoValue = htmlRenderer({ block: false, raw: htmlNoValue, pre: false, text: '', type: 'html' });
 		assert.strictEqual(renderedHtmlNoValue,
-			`<code tabindex="0"><a href="code-setting://example.booleanSetting" class="codesetting" title="View or change setting" aria-role="button"><svg width="14" height="14" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" fill="currentColor"><path d="M9.1 4.4L8.6 2H7.4l-.5 2.4-.7.3-2-1.3-.9.8 1.3 2-.2.7-2.4.5v1.2l2.4.5.3.8-1.3 2 .8.8 2-1.3.8.3.4 2.3h1.2l.5-2.4.8-.3 2 1.3.8-.8-1.3-2 .3-.8 2.3-.4V7.4l-2.4-.5-.3-.8 1.3-2-.8-.8-2 1.3-.7-.2zM9.4 1l.5 2.4L12 2.1l2 2-1.4 2.1 2.4.4v2.8l-2.4.5L14 12l-2 2-2.1-1.4-.5 2.4H6.6l-.5-2.4L4 13.9l-2-2 1.4-2.1L1 9.4V6.6l2.4-.5L2.1 4l2-2 2.1 1.4.4-2.4h2.8zm.6 7c0 1.1-.9 2-2 2s-2-.9-2-2 .9-2 2-2 2 .9 2 2zM8 9c.6 0 1-.4 1-1s-.4-1-1-1-1 .4-1 1 .4 1 1 1z"/></svg>
+			`<code tabindex="0"><a href="code-setting://example.booleanSetting/true" class="codesetting" title="View or change setting" aria-role="button"><svg width="14" height="14" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" fill="currentColor"><path d="M9.1 4.4L8.6 2H7.4l-.5 2.4-.7.3-2-1.3-.9.8 1.3 2-.2.7-2.4.5v1.2l2.4.5.3.8-1.3 2 .8.8 2-1.3.8.3.4 2.3h1.2l.5-2.4.8-.3 2 1.3.8-.8-1.3-2 .3-.8 2.3-.4V7.4l-2.4-.5-.3-.8 1.3-2-.8-.8-2 1.3-.7-.2zM9.4 1l.5 2.4L12 2.1l2 2-1.4 2.1 2.4.4v2.8l-2.4.5L14 12l-2 2-2.1-1.4-.5 2.4H6.6l-.5-2.4L4 13.9l-2-2 1.4-2.1L1 9.4V6.6l2.4-.5L2.1 4l2-2 2.1 1.4.4-2.4h2.8zm.6 7c0 1.1-.9 2-2 2s-2-.9-2-2 .9-2 2-2 2 .9 2 2zM8 9c.6 0 1-.4 1-1s-.4-1-1-1-1 .4-1 1 .4 1 1 1z"/></svg>
 			<span class="separator"></span>
 			<span class="setting-name">example.booleanSetting</span>
-		</a></code><code>`);
+		</a></code>`);
 	});
 
 	test('actions with no value', () => {
diff --git a/src/vs/workbench/contrib/markers/browser/markers.contribution.ts b/src/vs/workbench/contrib/markers/browser/markers.contribution.ts
index aa02cce1cb8..5c1b30c121a 100644
--- a/src/vs/workbench/contrib/markers/browser/markers.contribution.ts
+++ b/src/vs/workbench/contrib/markers/browser/markers.contribution.ts
@@ -3,39 +3,39 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/workbench/contrib/markers/browser/markersFileDecorations';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { localize, localize2 } from 'vs/nls';
-import { Marker, RelatedInformation, ResourceMarkers } from 'vs/workbench/contrib/markers/browser/markersModel';
-import { MarkersView } from 'vs/workbench/contrib/markers/browser/markersView';
-import { MenuId, registerAction2, Action2 } from 'vs/platform/actions/common/actions';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { MarkersViewMode, Markers, MarkersContextKeys } from 'vs/workbench/contrib/markers/common/markers';
-import Messages from 'vs/workbench/contrib/markers/browser/messages';
-import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IMarkersView } from 'vs/workbench/contrib/markers/browser/markers';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { Disposable, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment, IStatusbarEntry } from 'vs/workbench/services/statusbar/browser/statusbar';
-import { IMarkerService, MarkerStatistics } from 'vs/platform/markers/common/markers';
-import { ViewContainer, IViewContainersRegistry, Extensions as ViewContainerExtensions, ViewContainerLocation, IViewsRegistry } from 'vs/workbench/common/views';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { getVisbileViewContextKey, FocusedViewContext } from 'vs/workbench/common/contextkeys';
-import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { Codicon } from 'vs/base/common/codicons';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { ViewAction } from 'vs/workbench/browser/parts/views/viewPane';
-import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity';
-import { viewFilterSubmenu } from 'vs/workbench/browser/parts/views/viewFilter';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { problemsConfigurationNodeBase } from 'vs/workbench/common/configuration';
+import './markersFileDecorations.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { Extensions, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { Marker, RelatedInformation, ResourceMarkers } from './markersModel.js';
+import { MarkersView } from './markersView.js';
+import { MenuId, registerAction2, Action2 } from '../../../../platform/actions/common/actions.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { MarkersViewMode, Markers, MarkersContextKeys } from '../common/markers.js';
+import Messages from './messages.js';
+import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from '../../../common/contributions.js';
+import { IMarkersView } from './markers.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { Disposable, IDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment, IStatusbarEntry } from '../../../services/statusbar/browser/statusbar.js';
+import { IMarkerService, MarkerStatistics } from '../../../../platform/markers/common/markers.js';
+import { ViewContainer, IViewContainersRegistry, Extensions as ViewContainerExtensions, ViewContainerLocation, IViewsRegistry } from '../../../common/views.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { getVisbileViewContextKey, FocusedViewContext } from '../../../common/contextkeys.js';
+import { ViewPaneContainer } from '../../../browser/parts/views/viewPaneContainer.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { ViewAction } from '../../../browser/parts/views/viewPane.js';
+import { IActivityService, NumberBadge } from '../../../services/activity/common/activity.js';
+import { viewFilterSubmenu } from '../../../browser/parts/views/viewFilter.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { problemsConfigurationNodeBase } from '../../../common/configuration.js';
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: Markers.MARKER_OPEN_ACTION_ID,
diff --git a/src/vs/workbench/contrib/markers/browser/markers.ts b/src/vs/workbench/contrib/markers/browser/markers.ts
index d1d3f5cf7f6..1d6cd7984b9 100644
--- a/src/vs/workbench/contrib/markers/browser/markers.ts
+++ b/src/vs/workbench/contrib/markers/browser/markers.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { MarkersFilters } from 'vs/workbench/contrib/markers/browser/markersViewActions';
-import { IView } from 'vs/workbench/common/views';
-import { MarkerElement, ResourceMarkers } from 'vs/workbench/contrib/markers/browser/markersModel';
-import { MarkersViewMode } from 'vs/workbench/contrib/markers/common/markers';
+import { MarkersFilters } from './markersViewActions.js';
+import { IView } from '../../../common/views.js';
+import { MarkerElement, ResourceMarkers } from './markersModel.js';
+import { MarkersViewMode } from '../common/markers.js';
 
 export interface IMarkersView extends IView {
 
diff --git a/src/vs/workbench/contrib/markers/browser/markersFileDecorations.ts b/src/vs/workbench/contrib/markers/browser/markersFileDecorations.ts
index c97455cb4ed..00cd814152a 100644
--- a/src/vs/workbench/contrib/markers/browser/markersFileDecorations.ts
+++ b/src/vs/workbench/contrib/markers/browser/markersFileDecorations.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
-import { IMarkerService, IMarker, MarkerSeverity } from 'vs/platform/markers/common/markers';
-import { IDecorationsService, IDecorationsProvider, IDecorationData } from 'vs/workbench/services/decorations/common/decorations';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { Event } from 'vs/base/common/event';
-import { localize } from 'vs/nls';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { listErrorForeground, listWarningForeground } from 'vs/platform/theme/common/colorRegistry';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from '../../../common/contributions.js';
+import { IMarkerService, IMarker, MarkerSeverity } from '../../../../platform/markers/common/markers.js';
+import { IDecorationsService, IDecorationsProvider, IDecorationData } from '../../../services/decorations/common/decorations.js';
+import { IDisposable, dispose } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Event } from '../../../../base/common/event.js';
+import { localize } from '../../../../nls.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { listErrorForeground, listWarningForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
 
 class MarkersDecorationsProvider implements IDecorationsProvider {
 
diff --git a/src/vs/workbench/contrib/markers/browser/markersFilterOptions.ts b/src/vs/workbench/contrib/markers/browser/markersFilterOptions.ts
index 1adde1f53eb..0b1bec81c46 100644
--- a/src/vs/workbench/contrib/markers/browser/markersFilterOptions.ts
+++ b/src/vs/workbench/contrib/markers/browser/markersFilterOptions.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IFilter, matchesFuzzy, matchesFuzzy2 } from 'vs/base/common/filters';
-import { IExpression, splitGlobAware, getEmptyExpression, ParsedExpression, parse } from 'vs/base/common/glob';
-import * as strings from 'vs/base/common/strings';
-import { URI } from 'vs/base/common/uri';
-import { relativePath } from 'vs/base/common/resources';
-import { TernarySearchTree } from 'vs/base/common/ternarySearchTree';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
+import { IFilter, matchesFuzzy, matchesFuzzy2 } from '../../../../base/common/filters.js';
+import { IExpression, splitGlobAware, getEmptyExpression, ParsedExpression, parse } from '../../../../base/common/glob.js';
+import * as strings from '../../../../base/common/strings.js';
+import { URI } from '../../../../base/common/uri.js';
+import { relativePath } from '../../../../base/common/resources.js';
+import { TernarySearchTree } from '../../../../base/common/ternarySearchTree.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
 
 export class ResourceGlobMatcher {
 
diff --git a/src/vs/workbench/contrib/markers/browser/markersModel.ts b/src/vs/workbench/contrib/markers/browser/markersModel.ts
index 0e4fbdfb802..2e9cea1c76b 100644
--- a/src/vs/workbench/contrib/markers/browser/markersModel.ts
+++ b/src/vs/workbench/contrib/markers/browser/markersModel.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { basename, extUri } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { Range, IRange } from 'vs/editor/common/core/range';
-import { IMarker, MarkerSeverity, IRelatedInformation, IMarkerData } from 'vs/platform/markers/common/markers';
-import { isNonEmptyArray } from 'vs/base/common/arrays';
-import { ResourceMap } from 'vs/base/common/map';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Hasher } from 'vs/base/common/hash';
-import { splitLines } from 'vs/base/common/strings';
-import { IMatch } from 'vs/base/common/filters';
-import { unsupportedSchemas } from 'vs/platform/markers/common/markerService';
+import { isNonEmptyArray } from '../../../../base/common/arrays.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { IMatch } from '../../../../base/common/filters.js';
+import { hash } from '../../../../base/common/hash.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { basename, extUri } from '../../../../base/common/resources.js';
+import { splitLines } from '../../../../base/common/strings.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IRange, Range } from '../../../../editor/common/core/range.js';
+import { IMarker, IMarkerData, IRelatedInformation, MarkerSeverity } from '../../../../platform/markers/common/markers.js';
+import { unsupportedSchemas } from '../../../../platform/markers/common/markerService.js';
 
 export type MarkerElement = ResourceMarkers | Marker | RelatedInformation;
 
@@ -247,11 +247,7 @@ export class MarkersModel {
 	}
 
 	private id(...values: (string | number)[]): string {
-		const hasher = new Hasher();
-		for (const value of values) {
-			hasher.hash(value);
-		}
-		return `${hasher.value}`;
+		return `${hash(values)}`;
 	}
 
 	dispose(): void {
diff --git a/src/vs/workbench/contrib/markers/browser/markersTable.ts b/src/vs/workbench/contrib/markers/browser/markersTable.ts
index 93465f6d3d5..e454955cc23 100644
--- a/src/vs/workbench/contrib/markers/browser/markersTable.ts
+++ b/src/vs/workbench/contrib/markers/browser/markersTable.ts
@@ -3,34 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import * as DOM from 'vs/base/browser/dom';
-import { Event } from 'vs/base/common/event';
-import { ITableContextMenuEvent, ITableEvent, ITableRenderer, ITableVirtualDelegate } from 'vs/base/browser/ui/table/table';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IOpenEvent, IWorkbenchTableOptions, WorkbenchTable } from 'vs/platform/list/browser/listService';
-import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
-import { compareMarkersByUri, Marker, MarkerTableItem, ResourceMarkers } from 'vs/workbench/contrib/markers/browser/markersModel';
-import { MarkerSeverity } from 'vs/platform/markers/common/markers';
-import { SeverityIcon } from 'vs/platform/severityIcon/browser/severityIcon';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { FilterOptions } from 'vs/workbench/contrib/markers/browser/markersFilterOptions';
-import { Link } from 'vs/platform/opener/browser/link';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { MarkersViewModel } from 'vs/workbench/contrib/markers/browser/markersTreeViewer';
-import { IAction } from 'vs/base/common/actions';
-import { QuickFixAction, QuickFixActionViewItem } from 'vs/workbench/contrib/markers/browser/markersViewActions';
-import { DomEmitter } from 'vs/base/browser/event';
-import Messages from 'vs/workbench/contrib/markers/browser/messages';
-import { isUndefinedOrNull } from 'vs/base/common/types';
-import { IProblemsWidget } from 'vs/workbench/contrib/markers/browser/markersView';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { Range } from 'vs/editor/common/core/range';
-import { unsupportedSchemas } from 'vs/platform/markers/common/markerService';
-import Severity from 'vs/base/common/severity';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import { localize } from '../../../../nls.js';
+import * as DOM from '../../../../base/browser/dom.js';
+import { Event } from '../../../../base/common/event.js';
+import { ITableContextMenuEvent, ITableEvent, ITableRenderer, ITableVirtualDelegate } from '../../../../base/browser/ui/table/table.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IOpenEvent, IWorkbenchTableOptions, WorkbenchTable } from '../../../../platform/list/browser/listService.js';
+import { HighlightedLabel } from '../../../../base/browser/ui/highlightedlabel/highlightedLabel.js';
+import { compareMarkersByUri, Marker, MarkerTableItem, ResourceMarkers } from './markersModel.js';
+import { MarkerSeverity } from '../../../../platform/markers/common/markers.js';
+import { SeverityIcon } from '../../../../platform/severityIcon/browser/severityIcon.js';
+import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { FilterOptions } from './markersFilterOptions.js';
+import { Link } from '../../../../platform/opener/browser/link.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { MarkersViewModel } from './markersTreeViewer.js';
+import { IAction } from '../../../../base/common/actions.js';
+import { QuickFixAction, QuickFixActionViewItem } from './markersViewActions.js';
+import { DomEmitter } from '../../../../base/browser/event.js';
+import Messages from './messages.js';
+import { isUndefinedOrNull } from '../../../../base/common/types.js';
+import { IProblemsWidget } from './markersView.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { unsupportedSchemas } from '../../../../platform/markers/common/markerService.js';
+import Severity from '../../../../base/common/severity.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 
 const $ = DOM.$;
 
@@ -157,8 +157,8 @@ class MarkerCodeColumnRenderer implements ITableRenderer<MarkerTableItem, IMarke
 				codeLinkLabel.set(element.marker.code.value, element.codeMatches);
 
 				templateData.codeLink.link = {
-					href: element.marker.code.target.toString(),
-					title: element.marker.code.target.toString(),
+					href: element.marker.code.target.toString(true),
+					title: element.marker.code.target.toString(true),
 					label: codeLinkLabel.element,
 				};
 			}
diff --git a/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts b/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts
index 1a3dec090cc..9820ad9e002 100644
--- a/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts
+++ b/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts
@@ -3,55 +3,55 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import * as paths from 'vs/base/common/path';
-import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge';
-import { ResourceLabels, IResourceLabel } from 'vs/workbench/browser/labels';
-import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
-import { IMarker, MarkerSeverity } from 'vs/platform/markers/common/markers';
-import { ResourceMarkers, Marker, RelatedInformation, MarkerElement, MarkerTableItem } from 'vs/workbench/contrib/markers/browser/markersModel';
-import Messages from 'vs/workbench/contrib/markers/browser/messages';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IDisposable, dispose, Disposable, toDisposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { QuickFixAction, QuickFixActionViewItem } from 'vs/workbench/contrib/markers/browser/markersViewActions';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { basename, isEqual } from 'vs/base/common/resources';
-import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { ITreeFilter, TreeVisibility, TreeFilterResult, ITreeRenderer, ITreeNode } from 'vs/base/browser/ui/tree/tree';
-import { FilterOptions } from 'vs/workbench/contrib/markers/browser/markersFilterOptions';
-import { IMatch } from 'vs/base/common/filters';
-import { Event, Emitter } from 'vs/base/common/event';
-import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
-import { isUndefinedOrNull } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { Action, IAction } from 'vs/base/common/actions';
-import { localize } from 'vs/nls';
-import { CancelablePromise, createCancelablePromise, Delayer } from 'vs/base/common/async';
-import { IModelService } from 'vs/editor/common/services/model';
-import { Range } from 'vs/editor/common/core/range';
-import { applyCodeAction, ApplyCodeActionReason, getCodeActions } from 'vs/editor/contrib/codeAction/browser/codeAction';
-import { CodeActionKind, CodeActionSet, CodeActionTriggerSource } from 'vs/editor/contrib/codeAction/common/types';
-import { ITextModel } from 'vs/editor/common/model';
-import { IEditorService, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { SeverityIcon } from 'vs/platform/severityIcon/browser/severityIcon';
-import { CodeActionTriggerType } from 'vs/editor/common/languages';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { Progress } from 'vs/platform/progress/common/progress';
-import { ActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { Codicon } from 'vs/base/common/codicons';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { Link } from 'vs/platform/opener/browser/link';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { MarkersContextKeys, MarkersViewMode } from 'vs/workbench/contrib/markers/common/markers';
-import { unsupportedSchemas } from 'vs/platform/markers/common/markerService';
-import { defaultCountBadgeStyles } from 'vs/platform/theme/browser/defaultStyles';
-import Severity from 'vs/base/common/severity';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import type { IManagedHover } from 'vs/base/browser/ui/hover/hover';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import * as dom from '../../../../base/browser/dom.js';
+import * as paths from '../../../../base/common/path.js';
+import { CountBadge } from '../../../../base/browser/ui/countBadge/countBadge.js';
+import { ResourceLabels, IResourceLabel } from '../../../browser/labels.js';
+import { HighlightedLabel } from '../../../../base/browser/ui/highlightedlabel/highlightedLabel.js';
+import { IMarker, MarkerSeverity } from '../../../../platform/markers/common/markers.js';
+import { ResourceMarkers, Marker, RelatedInformation, MarkerElement, MarkerTableItem } from './markersModel.js';
+import Messages from './messages.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { IDisposable, dispose, Disposable, toDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { QuickFixAction, QuickFixActionViewItem } from './markersViewActions.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { basename, isEqual } from '../../../../base/common/resources.js';
+import { IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
+import { ITreeFilter, TreeVisibility, TreeFilterResult, ITreeRenderer, ITreeNode } from '../../../../base/browser/ui/tree/tree.js';
+import { FilterOptions } from './markersFilterOptions.js';
+import { IMatch } from '../../../../base/common/filters.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { IListAccessibilityProvider } from '../../../../base/browser/ui/list/listWidget.js';
+import { isUndefinedOrNull } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Action, IAction } from '../../../../base/common/actions.js';
+import { localize } from '../../../../nls.js';
+import { CancelablePromise, createCancelablePromise, Delayer } from '../../../../base/common/async.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { applyCodeAction, ApplyCodeActionReason, getCodeActions } from '../../../../editor/contrib/codeAction/browser/codeAction.js';
+import { CodeActionKind, CodeActionSet, CodeActionTriggerSource } from '../../../../editor/contrib/codeAction/common/types.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { IEditorService, ACTIVE_GROUP } from '../../../services/editor/common/editorService.js';
+import { SeverityIcon } from '../../../../platform/severityIcon/browser/severityIcon.js';
+import { CodeActionTriggerType } from '../../../../editor/common/languages.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { Progress } from '../../../../platform/progress/common/progress.js';
+import { ActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { Link } from '../../../../platform/opener/browser/link.js';
+import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { MarkersContextKeys, MarkersViewMode } from '../common/markers.js';
+import { unsupportedSchemas } from '../../../../platform/markers/common/markerService.js';
+import { defaultCountBadgeStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import Severity from '../../../../base/common/severity.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import type { IManagedHover } from '../../../../base/browser/ui/hover/hover.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 
 interface IResourceMarkersTemplateData {
 	readonly resourceLabel: IResourceLabel;
diff --git a/src/vs/workbench/contrib/markers/browser/markersView.ts b/src/vs/workbench/contrib/markers/browser/markersView.ts
index 8b37d2ede81..85ad02f34be 100644
--- a/src/vs/workbench/contrib/markers/browser/markersView.ts
+++ b/src/vs/workbench/contrib/markers/browser/markersView.ts
@@ -3,59 +3,59 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/markers';
+import './media/markers.css';
 
-import { URI } from 'vs/base/common/uri';
-import * as dom from 'vs/base/browser/dom';
-import { IAction, Separator } from 'vs/base/common/actions';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { Marker, ResourceMarkers, RelatedInformation, MarkerChangesEvent, MarkersModel, compareMarkersByUri, MarkerElement, MarkerTableItem } from 'vs/workbench/contrib/markers/browser/markersModel';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { MarkersFilters, IMarkersFiltersChangeEvent } from 'vs/workbench/contrib/markers/browser/markersViewActions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import Messages from 'vs/workbench/contrib/markers/browser/messages';
-import { RangeHighlightDecorations } from 'vs/workbench/browser/codeeditor';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { localize } from 'vs/nls';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { Iterable } from 'vs/base/common/iterator';
-import { ITreeElement, ITreeNode, ITreeContextMenuEvent, ITreeRenderer, ITreeEvent } from 'vs/base/browser/ui/tree/tree';
-import { Relay, Event } from 'vs/base/common/event';
-import { WorkbenchObjectTree, IListService, IWorkbenchObjectTreeOptions, IOpenEvent } from 'vs/platform/list/browser/listService';
-import { FilterOptions } from 'vs/workbench/contrib/markers/browser/markersFilterOptions';
-import { IExpression } from 'vs/base/common/glob';
-import { deepClone } from 'vs/base/common/objects';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { FilterData, Filter, VirtualDelegate, ResourceMarkersRenderer, MarkerRenderer, RelatedInformationRenderer, MarkersWidgetAccessibilityProvider, MarkersViewModel } from 'vs/workbench/contrib/markers/browser/markersTreeViewer';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { StandardKeyboardEvent, IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { ResourceLabels } from 'vs/workbench/browser/labels';
-import { IMarkerService, MarkerSeverity } from 'vs/platform/markers/common/markers';
-import { MementoObject, Memento } from 'vs/workbench/common/memento';
-import { IIdentityProvider, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { IViewPaneOptions, FilterViewPane } from 'vs/workbench/browser/parts/views/viewPane';
-import { IViewDescriptorService } from 'vs/workbench/common/views';
-import { IOpenerService, withSelection } from 'vs/platform/opener/common/opener';
-import { ActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { groupBy } from 'vs/base/common/arrays';
-import { ResourceMap } from 'vs/base/common/map';
-import { EditorResourceAccessor, SideBySideEditor } from 'vs/workbench/common/editor';
-import { IMarkersView } from 'vs/workbench/contrib/markers/browser/markers';
-import { ResourceListDnDHandler } from 'vs/workbench/browser/dnd';
-import { ITableContextMenuEvent, ITableEvent } from 'vs/base/browser/ui/table/table';
-import { MarkersTable } from 'vs/workbench/contrib/markers/browser/markersTable';
-import { Markers, MarkersContextKeys, MarkersViewMode } from 'vs/workbench/contrib/markers/common/markers';
-import { registerNavigableContainer } from 'vs/workbench/browser/actions/widgetNavigationCommands';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { ResultKind } from 'vs/platform/keybinding/common/keybindingResolver';
+import { URI } from '../../../../base/common/uri.js';
+import * as dom from '../../../../base/browser/dom.js';
+import { IAction, Separator } from '../../../../base/common/actions.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from '../../../services/editor/common/editorService.js';
+import { Marker, ResourceMarkers, RelatedInformation, MarkerChangesEvent, MarkersModel, compareMarkersByUri, MarkerElement, MarkerTableItem } from './markersModel.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { MarkersFilters, IMarkersFiltersChangeEvent } from './markersViewActions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import Messages from './messages.js';
+import { RangeHighlightDecorations } from '../../../browser/codeeditor.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { localize } from '../../../../nls.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { ITreeElement, ITreeNode, ITreeContextMenuEvent, ITreeRenderer, ITreeEvent } from '../../../../base/browser/ui/tree/tree.js';
+import { Relay, Event } from '../../../../base/common/event.js';
+import { WorkbenchObjectTree, IListService, IWorkbenchObjectTreeOptions, IOpenEvent } from '../../../../platform/list/browser/listService.js';
+import { FilterOptions } from './markersFilterOptions.js';
+import { IExpression } from '../../../../base/common/glob.js';
+import { deepClone } from '../../../../base/common/objects.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { FilterData, Filter, VirtualDelegate, ResourceMarkersRenderer, MarkerRenderer, RelatedInformationRenderer, MarkersWidgetAccessibilityProvider, MarkersViewModel } from './markersTreeViewer.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { StandardKeyboardEvent, IKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { ResourceLabels } from '../../../browser/labels.js';
+import { IMarkerService, MarkerSeverity } from '../../../../platform/markers/common/markers.js';
+import { MementoObject, Memento } from '../../../common/memento.js';
+import { IIdentityProvider, IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { IViewPaneOptions, FilterViewPane } from '../../../browser/parts/views/viewPane.js';
+import { IViewDescriptorService } from '../../../common/views.js';
+import { IOpenerService, withSelection } from '../../../../platform/opener/common/opener.js';
+import { ActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { groupBy } from '../../../../base/common/arrays.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
+import { IMarkersView } from './markers.js';
+import { ResourceListDnDHandler } from '../../../browser/dnd.js';
+import { ITableContextMenuEvent, ITableEvent } from '../../../../base/browser/ui/table/table.js';
+import { MarkersTable } from './markersTable.js';
+import { Markers, MarkersContextKeys, MarkersViewMode } from '../common/markers.js';
+import { registerNavigableContainer } from '../../../browser/actions/widgetNavigationCommands.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { ResultKind } from '../../../../platform/keybinding/common/keybindingResolver.js';
 
 function createResourceMarkersIterator(resourceMarkers: ResourceMarkers): Iterable<ITreeElement<MarkerElement>> {
 	return Iterable.map(resourceMarkers.markers, m => {
diff --git a/src/vs/workbench/contrib/markers/browser/markersViewActions.ts b/src/vs/workbench/contrib/markers/browser/markersViewActions.ts
index 2e7f61cc621..fdd6529ef23 100644
--- a/src/vs/workbench/contrib/markers/browser/markersViewActions.ts
+++ b/src/vs/workbench/contrib/markers/browser/markersViewActions.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { Action, IAction } from 'vs/base/common/actions';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import Messages from 'vs/workbench/contrib/markers/browser/messages';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Marker } from 'vs/workbench/contrib/markers/browser/markersModel';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { Event, Emitter } from 'vs/base/common/event';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { ActionViewItem, IActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { MarkersContextKeys } from 'vs/workbench/contrib/markers/common/markers';
-import 'vs/css!./markersViewActions';
+import * as DOM from '../../../../base/browser/dom.js';
+import { Action, IAction } from '../../../../base/common/actions.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import Messages from './messages.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Marker } from './markersModel.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { ActionViewItem, IActionViewItemOptions } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { MarkersContextKeys } from '../common/markers.js';
+import './markersViewActions.css';
 
 export interface IMarkersFiltersChangeEvent {
 	excludedFiles?: boolean;
diff --git a/src/vs/workbench/contrib/markers/browser/messages.ts b/src/vs/workbench/contrib/markers/browser/messages.ts
index 29c07828fc6..89d14380dfe 100644
--- a/src/vs/workbench/contrib/markers/browser/messages.ts
+++ b/src/vs/workbench/contrib/markers/browser/messages.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { basename } from 'vs/base/common/resources';
-import { MarkerSeverity, IRelatedInformation } from 'vs/platform/markers/common/markers';
-import { ILocalizedString } from 'vs/platform/action/common/action';
-import { Marker } from './markersModel';
+import * as nls from '../../../../nls.js';
+import { basename } from '../../../../base/common/resources.js';
+import { MarkerSeverity, IRelatedInformation } from '../../../../platform/markers/common/markers.js';
+import { ILocalizedString } from '../../../../platform/action/common/action.js';
+import { Marker } from './markersModel.js';
 
 export default class Messages {
 
diff --git a/src/vs/workbench/contrib/markers/common/markers.ts b/src/vs/workbench/contrib/markers/common/markers.ts
index 17496243cb3..30ca6ade7ed 100644
--- a/src/vs/workbench/contrib/markers/common/markers.ts
+++ b/src/vs/workbench/contrib/markers/common/markers.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 
 export const enum MarkersViewMode {
 	Table = 'table',
diff --git a/src/vs/workbench/contrib/markers/test/browser/markersModel.test.ts b/src/vs/workbench/contrib/markers/test/browser/markersModel.test.ts
index bec693957c3..1f0094ccd87 100644
--- a/src/vs/workbench/contrib/markers/test/browser/markersModel.test.ts
+++ b/src/vs/workbench/contrib/markers/test/browser/markersModel.test.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { IMarker, MarkerSeverity, IRelatedInformation } from 'vs/platform/markers/common/markers';
-import { MarkersModel, Marker, ResourceMarkers, RelatedInformation } from 'vs/workbench/contrib/markers/browser/markersModel';
-import { groupBy } from 'vs/base/common/collections';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { URI } from '../../../../../base/common/uri.js';
+import { IMarker, MarkerSeverity, IRelatedInformation } from '../../../../../platform/markers/common/markers.js';
+import { MarkersModel, Marker, ResourceMarkers, RelatedInformation } from '../../browser/markersModel.js';
+import { groupBy } from '../../../../../base/common/collections.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 class TestMarkersModel extends MarkersModel {
 
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/commands/commands.ts b/src/vs/workbench/contrib/mergeEditor/browser/commands/commands.ts
index 5b6205106fe..81e0dce9de2 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/commands/commands.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/commands/commands.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from 'vs/base/common/codicons';
-import { basename } from 'vs/base/common/resources';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { localize, localize2 } from 'vs/nls';
-import { ILocalizedString } from 'vs/platform/action/common/action';
-import { Action2, IAction2Options, MenuId } from 'vs/platform/actions/common/actions';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { ITextEditorOptions } from 'vs/platform/editor/common/editor';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
-import { IEditorIdentifier, IResourceMergeEditorInput } from 'vs/workbench/common/editor';
-import { MergeEditorInput, MergeEditorInputData } from 'vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
-import { IMergeEditorInputModel } from 'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel';
-import { MergeEditor } from 'vs/workbench/contrib/mergeEditor/browser/view/mergeEditor';
-import { MergeEditorViewModel } from 'vs/workbench/contrib/mergeEditor/browser/view/viewModel';
-import { ctxIsMergeEditor, ctxMergeEditorLayout, ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop, ctxMergeEditorShowNonConflictingChanges, StorageCloseWithConflicts } from 'vs/workbench/contrib/mergeEditor/common/mergeEditor';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { basename } from '../../../../../base/common/resources.js';
+import { URI, UriComponents } from '../../../../../base/common/uri.js';
+import { localize, localize2 } from '../../../../../nls.js';
+import { ILocalizedString } from '../../../../../platform/action/common/action.js';
+import { Action2, IAction2Options, MenuId } from '../../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
+import { ITextEditorOptions } from '../../../../../platform/editor/common/editor.js';
+import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
+import { IStorageService, StorageScope } from '../../../../../platform/storage/common/storage.js';
+import { IEditorIdentifier, IResourceMergeEditorInput } from '../../../../common/editor.js';
+import { MergeEditorInput, MergeEditorInputData } from '../mergeEditorInput.js';
+import { IMergeEditorInputModel } from '../mergeEditorInputModel.js';
+import { MergeEditor } from '../view/mergeEditor.js';
+import { MergeEditorViewModel } from '../view/viewModel.js';
+import { ctxIsMergeEditor, ctxMergeEditorLayout, ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop, ctxMergeEditorShowNonConflictingChanges, StorageCloseWithConflicts } from '../../common/mergeEditor.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
 
 abstract class MergeEditorAction extends Action2 {
 	constructor(desc: Readonly<IAction2Options>) {
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/commands/devCommands.ts b/src/vs/workbench/contrib/mergeEditor/browser/commands/devCommands.ts
index 264d71f6ac4..2d2edc99e76 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/commands/devCommands.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/commands/devCommands.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { Codicon } from 'vs/base/common/codicons';
-import { URI } from 'vs/base/common/uri';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { localize, localize2 } from 'vs/nls';
-import { ILocalizedString } from 'vs/platform/action/common/action';
-import { Action2 } from 'vs/platform/actions/common/actions';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IFileService } from 'vs/platform/files/common/files';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { IResourceMergeEditorInput } from 'vs/workbench/common/editor';
-import { MergeEditor } from 'vs/workbench/contrib/mergeEditor/browser/view/mergeEditor';
-import { ctxIsMergeEditor, MergeEditorContents } from 'vs/workbench/contrib/mergeEditor/common/mergeEditor';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { VSBuffer } from '../../../../../base/common/buffer.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
+import { localize, localize2 } from '../../../../../nls.js';
+import { ILocalizedString } from '../../../../../platform/action/common/action.js';
+import { Action2 } from '../../../../../platform/actions/common/actions.js';
+import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js';
+import { IFileDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { INotificationService } from '../../../../../platform/notification/common/notification.js';
+import { IQuickInputService } from '../../../../../platform/quickinput/common/quickInput.js';
+import { IResourceMergeEditorInput } from '../../../../common/editor.js';
+import { MergeEditor } from '../view/mergeEditor.js';
+import { ctxIsMergeEditor, MergeEditorContents } from '../../common/mergeEditor.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
 
 const MERGE_EDITOR_CATEGORY: ILocalizedString = localize2('mergeEditor', 'Merge Editor (Dev)');
 
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution.ts b/src/vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution.ts
index 75a7ee7cc77..c0f8bdf3086 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { registerAction2 } from 'vs/platform/actions/common/actions';
-import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { EditorPaneDescriptor, IEditorPaneRegistry } from 'vs/workbench/browser/editor';
-import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { EditorExtensions, IEditorFactoryRegistry } from 'vs/workbench/common/editor';
+import { localize } from '../../../../nls.js';
+import { registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { Extensions, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { EditorPaneDescriptor, IEditorPaneRegistry } from '../../../browser/editor.js';
+import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { EditorExtensions, IEditorFactoryRegistry } from '../../../common/editor.js';
 import {
 	AcceptAllInput1, AcceptAllInput2, AcceptMerge, CompareInput1WithBaseCommand,
 	CompareInput2WithBaseCommand, GoToNextUnhandledConflict, GoToPreviousUnhandledConflict, OpenBaseFile, OpenMergeEditor,
 	OpenResultResource, ResetToBaseAndAutoMergeCommand, SetColumnLayout, SetMixedLayout, ShowHideTopBase, ShowHideCenterBase, ShowHideBase,
 	ShowNonConflictingChanges, ToggleActiveConflictInput1, ToggleActiveConflictInput2, ResetCloseWithConflictsChoice
-} from 'vs/workbench/contrib/mergeEditor/browser/commands/commands';
-import { MergeEditorCopyContentsToJSON, MergeEditorLoadContentsFromFolder, MergeEditorSaveContentsToFolder } from 'vs/workbench/contrib/mergeEditor/browser/commands/devCommands';
-import { MergeEditorInput } from 'vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
-import { MergeEditor, MergeEditorOpenHandlerContribution, MergeEditorResolverContribution } from 'vs/workbench/contrib/mergeEditor/browser/view/mergeEditor';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { MergeEditorSerializer } from './mergeEditorSerializer';
+} from './commands/commands.js';
+import { MergeEditorCopyContentsToJSON, MergeEditorLoadContentsFromFolder, MergeEditorSaveContentsToFolder } from './commands/devCommands.js';
+import { MergeEditorInput } from './mergeEditorInput.js';
+import { MergeEditor, MergeEditorOpenHandlerContribution, MergeEditorResolverContribution } from './view/mergeEditor.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { MergeEditorSerializer } from './mergeEditorSerializer.js';
 
 Registry.as<IEditorPaneRegistry>(EditorExtensions.EditorPane).registerEditorPane(
 	EditorPaneDescriptor.create(
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.ts b/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.ts
index e345bfd2b00..28217f06aa7 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { assertFn } from 'vs/base/common/assert';
-import { autorun } from 'vs/base/common/observable';
-import { isEqual } from 'vs/base/common/resources';
-import { isDefined } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { localize } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { DEFAULT_EDITOR_ASSOCIATION, EditorInputCapabilities, IResourceMergeEditorInput, IRevertOptions, isResourceMergeEditorInput, IUntypedEditorInput } from 'vs/workbench/common/editor';
-import { EditorInput, IEditorCloseHandler } from 'vs/workbench/common/editor/editorInput';
-import { ICustomEditorLabelService } from 'vs/workbench/services/editor/common/customEditorLabelService';
-import { AbstractTextResourceEditorInput } from 'vs/workbench/common/editor/textResourceEditorInput';
-import { IMergeEditorInputModel, TempFileMergeEditorModeFactory, WorkspaceMergeEditorModeFactory } from 'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel';
-import { MergeEditorTelemetry } from 'vs/workbench/contrib/mergeEditor/browser/telemetry';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { ILanguageSupport, ITextFileSaveOptions, ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
+import { assertFn } from '../../../../base/common/assert.js';
+import { autorun } from '../../../../base/common/observable.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { isDefined } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { localize } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { DEFAULT_EDITOR_ASSOCIATION, EditorInputCapabilities, IResourceMergeEditorInput, IRevertOptions, isResourceMergeEditorInput, IUntypedEditorInput } from '../../../common/editor.js';
+import { EditorInput, IEditorCloseHandler } from '../../../common/editor/editorInput.js';
+import { ICustomEditorLabelService } from '../../../services/editor/common/customEditorLabelService.js';
+import { AbstractTextResourceEditorInput } from '../../../common/editor/textResourceEditorInput.js';
+import { IMergeEditorInputModel, TempFileMergeEditorModeFactory, WorkspaceMergeEditorModeFactory } from './mergeEditorInputModel.js';
+import { MergeEditorTelemetry } from './telemetry.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.js';
+import { ILanguageSupport, ITextFileSaveOptions, ITextFileService } from '../../../services/textfile/common/textfiles.js';
 
 export class MergeEditorInputData {
 	constructor(
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.ts b/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.ts
index b043f0840a1..c0c4acc617b 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.ts
@@ -3,30 +3,30 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { assertFn } from 'vs/base/common/assert';
-import { BugIndicatingError } from 'vs/base/common/errors';
-import { Event } from 'vs/base/common/event';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { derived, IObservable, observableFromEvent, observableValue } from 'vs/base/common/observable';
-import { basename, isEqual } from 'vs/base/common/resources';
-import Severity from 'vs/base/common/severity';
-import { URI } from 'vs/base/common/uri';
-import { IModelService } from 'vs/editor/common/services/model';
-import { IResolvedTextEditorModel, ITextModelService } from 'vs/editor/common/services/resolverService';
-import { localize } from 'vs/nls';
-import { ConfirmResult, IDialogService, IPromptButton } from 'vs/platform/dialogs/common/dialogs';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IRevertOptions, SaveSourceRegistry } from 'vs/workbench/common/editor';
-import { EditorModel } from 'vs/workbench/common/editor/editorModel';
-import { MergeEditorInputData } from 'vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
-import { conflictMarkers } from 'vs/workbench/contrib/mergeEditor/browser/mergeMarkers/mergeMarkersController';
-import { MergeDiffComputer } from 'vs/workbench/contrib/mergeEditor/browser/model/diffComputer';
-import { InputData, MergeEditorModel } from 'vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel';
-import { MergeEditorTelemetry } from 'vs/workbench/contrib/mergeEditor/browser/telemetry';
-import { StorageCloseWithConflicts } from 'vs/workbench/contrib/mergeEditor/common/mergeEditor';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ITextFileEditorModel, ITextFileSaveOptions, ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
+import { assertFn } from '../../../../base/common/assert.js';
+import { BugIndicatingError } from '../../../../base/common/errors.js';
+import { Event } from '../../../../base/common/event.js';
+import { DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import { derived, IObservable, observableFromEvent, observableValue } from '../../../../base/common/observable.js';
+import { basename, isEqual } from '../../../../base/common/resources.js';
+import Severity from '../../../../base/common/severity.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { IResolvedTextEditorModel, ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { localize } from '../../../../nls.js';
+import { ConfirmResult, IDialogService, IPromptButton } from '../../../../platform/dialogs/common/dialogs.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IRevertOptions, SaveSourceRegistry } from '../../../common/editor.js';
+import { EditorModel } from '../../../common/editor/editorModel.js';
+import { MergeEditorInputData } from './mergeEditorInput.js';
+import { conflictMarkers } from './mergeMarkers/mergeMarkersController.js';
+import { MergeDiffComputer } from './model/diffComputer.js';
+import { InputData, MergeEditorModel } from './model/mergeEditorModel.js';
+import { MergeEditorTelemetry } from './telemetry.js';
+import { StorageCloseWithConflicts } from '../common/mergeEditor.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { ITextFileEditorModel, ITextFileSaveOptions, ITextFileService } from '../../../services/textfile/common/textfiles.js';
 
 export interface MergeEditorArgs {
 	base: URI;
@@ -126,7 +126,7 @@ export class TempFileMergeEditorModeFactory implements IMergeEditorInputModelFac
 
 class TempFileMergeEditorInputModel extends EditorModel implements IMergeEditorInputModel {
 	private readonly savedAltVersionId = observableValue(this, this.model.resultTextModel.getAlternativeVersionId());
-	private readonly altVersionId = observableFromEvent(
+	private readonly altVersionId = observableFromEvent(this,
 		e => this.model.resultTextModel.onDidChangeContent(e),
 		() =>
 			/** @description getAlternativeVersionId */ this.model.resultTextModel.getAlternativeVersionId()
@@ -340,7 +340,7 @@ export class WorkspaceMergeEditorModeFactory implements IMergeEditorInputModelFa
 }
 
 class WorkspaceMergeEditorInputModel extends EditorModel implements IMergeEditorInputModel {
-	public readonly isDirty = observableFromEvent(
+	public readonly isDirty = observableFromEvent(this,
 		Event.any(this.resultTextFileModel.onDidChangeDirty, this.resultTextFileModel.onDidSaveError),
 		() => /** @description isDirty */ this.resultTextFileModel.isDirty()
 	);
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorSerializer.ts b/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorSerializer.ts
index ee771c4ea8b..6d7aec0d1b3 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorSerializer.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorSerializer.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { parse } from 'vs/base/common/marshalling';
-import { URI } from 'vs/base/common/uri';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IEditorSerializer } from 'vs/workbench/common/editor';
-import { MergeEditorInput, MergeEditorInputData } from 'vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { parse } from '../../../../base/common/marshalling.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IEditorSerializer } from '../../../common/editor.js';
+import { MergeEditorInput, MergeEditorInputData } from './mergeEditorInput.js';
 
 export class MergeEditorSerializer implements IEditorSerializer {
 	canSerialize(): boolean {
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/mergeMarkers/mergeMarkersController.ts b/src/vs/workbench/contrib/mergeEditor/browser/mergeMarkers/mergeMarkersController.ts
index f48e9c9b23a..d2611d0b1f8 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/mergeMarkers/mergeMarkersController.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/mergeMarkers/mergeMarkersController.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { h } from 'vs/base/browser/dom';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { autorun, IObservable } from 'vs/base/common/observable';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { ITextModel } from 'vs/editor/common/model';
-import { LineRange } from 'vs/workbench/contrib/mergeEditor/browser/model/lineRange';
-import { MergeEditorViewModel } from 'vs/workbench/contrib/mergeEditor/browser/view/viewModel';
-import * as nls from 'vs/nls';
+import { h } from '../../../../../base/browser/dom.js';
+import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { autorun, IObservable } from '../../../../../base/common/observable.js';
+import { ICodeEditor } from '../../../../../editor/browser/editorBrowser.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
+import { LineRange } from '../model/lineRange.js';
+import { MergeEditorViewModel } from '../view/viewModel.js';
+import * as nls from '../../../../../nls.js';
 
 export const conflictMarkers = {
 	start: '<<<<<<<',
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/model/diffComputer.ts b/src/vs/workbench/contrib/mergeEditor/browser/model/diffComputer.ts
index 56760afd5eb..8bc16815852 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/model/diffComputer.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/model/diffComputer.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { assertFn, checkAdjacentItems } from 'vs/base/common/assert';
-import { IReader } from 'vs/base/common/observable';
-import { RangeMapping as DiffRangeMapping } from 'vs/editor/common/diff/rangeMapping';
-import { ITextModel } from 'vs/editor/common/model';
-import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { LineRange } from 'vs/workbench/contrib/mergeEditor/browser/model/lineRange';
-import { DetailedLineRangeMapping, RangeMapping } from 'vs/workbench/contrib/mergeEditor/browser/model/mapping';
-import { observableConfigValue } from 'vs/platform/observable/common/platformObservableUtils';
-import { LineRange as DiffLineRange } from 'vs/editor/common/core/lineRange';
+import { assertFn, checkAdjacentItems } from '../../../../../base/common/assert.js';
+import { IReader } from '../../../../../base/common/observable.js';
+import { RangeMapping as DiffRangeMapping } from '../../../../../editor/common/diff/rangeMapping.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
+import { IEditorWorkerService } from '../../../../../editor/common/services/editorWorker.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { LineRange } from './lineRange.js';
+import { DetailedLineRangeMapping, RangeMapping } from './mapping.js';
+import { observableConfigValue } from '../../../../../platform/observable/common/platformObservableUtils.js';
+import { LineRange as DiffLineRange } from '../../../../../editor/common/core/lineRange.js';
 
 export interface IMergeDiffComputer {
 	computeDiff(textModel1: ITextModel, textModel2: ITextModel, reader: IReader): Promise<IMergeDiffComputerResult>;
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/model/editing.ts b/src/vs/workbench/contrib/mergeEditor/browser/model/editing.ts
index 57775b6e7aa..3bbd65333ff 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/model/editing.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/model/editing.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { equals } from 'vs/base/common/arrays';
-import { Range } from 'vs/editor/common/core/range';
-import { IIdentifiedSingleEditOperation } from 'vs/editor/common/model';
-import { LineRange } from './lineRange';
+import { equals } from '../../../../../base/common/arrays.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { IIdentifiedSingleEditOperation } from '../../../../../editor/common/model.js';
+import { LineRange } from './lineRange.js';
 
 /**
  * Represents an edit, expressed in whole lines:
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/model/lineRange.ts b/src/vs/workbench/contrib/mergeEditor/browser/model/lineRange.ts
index a88d0faa583..eff77556a78 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/model/lineRange.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/model/lineRange.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Comparator, compareBy, numberComparator } from 'vs/base/common/arrays';
-import { BugIndicatingError } from 'vs/base/common/errors';
-import { Constants } from 'vs/base/common/uint';
-import { Range } from 'vs/editor/common/core/range';
-import { ITextModel } from 'vs/editor/common/model';
+import { Comparator, compareBy, numberComparator } from '../../../../../base/common/arrays.js';
+import { BugIndicatingError } from '../../../../../base/common/errors.js';
+import { Constants } from '../../../../../base/common/uint.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
 
 export class LineRange {
 	public static readonly compareByStart: Comparator<LineRange> = compareBy(l => l.startLineNumber, numberComparator);
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/model/mapping.ts b/src/vs/workbench/contrib/mergeEditor/browser/model/mapping.ts
index 3bdcb016fef..3025d37f4be 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/model/mapping.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/model/mapping.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { compareBy, lastOrDefault, numberComparator } from 'vs/base/common/arrays';
-import { findLast } from 'vs/base/common/arraysFind';
-import { assertFn, checkAdjacentItems } from 'vs/base/common/assert';
-import { BugIndicatingError } from 'vs/base/common/errors';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { ITextModel } from 'vs/editor/common/model';
-import { concatArrays } from 'vs/workbench/contrib/mergeEditor/browser/utils';
-import { LineRangeEdit } from './editing';
-import { LineRange } from './lineRange';
-import { rangeIsBeforeOrTouching, rangeContainsPosition, lengthBetweenPositions, addLength } from 'vs/workbench/contrib/mergeEditor/browser/model/rangeUtils';
+import { compareBy, numberComparator } from '../../../../../base/common/arrays.js';
+import { findLast } from '../../../../../base/common/arraysFind.js';
+import { assertFn, checkAdjacentItems } from '../../../../../base/common/assert.js';
+import { BugIndicatingError } from '../../../../../base/common/errors.js';
+import { Position } from '../../../../../editor/common/core/position.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
+import { concatArrays } from '../utils.js';
+import { LineRangeEdit } from './editing.js';
+import { LineRange } from './lineRange.js';
+import { addLength, lengthBetweenPositions, rangeContainsPosition, rangeIsBeforeOrTouching } from './rangeUtils.js';
 
 /**
  * Represents a mapping of an input line range to an output line range.
@@ -131,7 +131,7 @@ export class DocumentLineRangeMap {
 	}
 
 	public get outputLineCount(): number {
-		const last = lastOrDefault(this.lineRangeMappings);
+		const last = this.lineRangeMappings.at(-1);
 		const diff = last ? last.outputRange.endLineNumberExclusive - last.inputRange.endLineNumberExclusive : 0;
 		return this.inputLineCount + diff;
 	}
@@ -385,7 +385,7 @@ export class DocumentRangeMap {
 	}
 
 	public get outputLineCount(): number {
-		const last = lastOrDefault(this.rangeMappings);
+		const last = this.rangeMappings.at(-1);
 		const diff = last ? last.outputRange.endLineNumber - last.inputRange.endLineNumber : 0;
 		return this.inputLineCount + diff;
 	}
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.ts b/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.ts
index f6a2ea598b0..26c5f44afd1 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CompareResult, equals } from 'vs/base/common/arrays';
-import { BugIndicatingError } from 'vs/base/common/errors';
-import { autorunHandleChanges, derived, IObservable, IReader, ISettableObservable, ITransaction, keepObserved, observableValue, transaction, waitForState } from 'vs/base/common/observable';
-import { URI } from 'vs/base/common/uri';
-import { Range } from 'vs/editor/common/core/range';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ITextModel } from 'vs/editor/common/model';
-import { localize } from 'vs/nls';
-import { IResourceUndoRedoElement, IUndoRedoService, UndoRedoElementType, UndoRedoGroup } from 'vs/platform/undoRedo/common/undoRedo';
-import { EditorModel } from 'vs/workbench/common/editor/editorModel';
-import { IMergeDiffComputer } from 'vs/workbench/contrib/mergeEditor/browser/model/diffComputer';
-import { LineRange } from 'vs/workbench/contrib/mergeEditor/browser/model/lineRange';
-import { DetailedLineRangeMapping, DocumentLineRangeMap, DocumentRangeMap, LineRangeMapping } from 'vs/workbench/contrib/mergeEditor/browser/model/mapping';
-import { TextModelDiffChangeReason, TextModelDiffs, TextModelDiffState } from 'vs/workbench/contrib/mergeEditor/browser/model/textModelDiffs';
-import { MergeEditorTelemetry } from 'vs/workbench/contrib/mergeEditor/browser/telemetry';
-import { leftJoin } from 'vs/workbench/contrib/mergeEditor/browser/utils';
-import { InputNumber, ModifiedBaseRange, ModifiedBaseRangeState, ModifiedBaseRangeStateKind } from './modifiedBaseRange';
+import { CompareResult, equals } from '../../../../../base/common/arrays.js';
+import { BugIndicatingError } from '../../../../../base/common/errors.js';
+import { autorunHandleChanges, derived, IObservable, IReader, ISettableObservable, ITransaction, keepObserved, observableValue, transaction, waitForState } from '../../../../../base/common/observable.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
+import { localize } from '../../../../../nls.js';
+import { IResourceUndoRedoElement, IUndoRedoService, UndoRedoElementType, UndoRedoGroup } from '../../../../../platform/undoRedo/common/undoRedo.js';
+import { EditorModel } from '../../../../common/editor/editorModel.js';
+import { IMergeDiffComputer } from './diffComputer.js';
+import { LineRange } from './lineRange.js';
+import { DetailedLineRangeMapping, DocumentLineRangeMap, DocumentRangeMap, LineRangeMapping } from './mapping.js';
+import { TextModelDiffChangeReason, TextModelDiffs, TextModelDiffState } from './textModelDiffs.js';
+import { MergeEditorTelemetry } from '../telemetry.js';
+import { leftJoin } from '../utils.js';
+import { InputNumber, ModifiedBaseRange, ModifiedBaseRangeState, ModifiedBaseRangeStateKind } from './modifiedBaseRange.js';
 
 export interface InputData {
 	readonly textModel: ITextModel;
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange.ts b/src/vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange.ts
index ca4c6d284fa..cd62b5944a1 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { compareBy, equals, numberComparator, tieBreakComparators } from 'vs/base/common/arrays';
-import { BugIndicatingError } from 'vs/base/common/errors';
-import { splitLines } from 'vs/base/common/strings';
-import { Constants } from 'vs/base/common/uint';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { ITextModel } from 'vs/editor/common/model';
-import { LineRangeEdit, RangeEdit } from 'vs/workbench/contrib/mergeEditor/browser/model/editing';
-import { LineRange } from 'vs/workbench/contrib/mergeEditor/browser/model/lineRange';
-import { DetailedLineRangeMapping, MappingAlignment } from 'vs/workbench/contrib/mergeEditor/browser/model/mapping';
-import { concatArrays } from 'vs/workbench/contrib/mergeEditor/browser/utils';
+import { compareBy, equals, numberComparator, tieBreakComparators } from '../../../../../base/common/arrays.js';
+import { BugIndicatingError } from '../../../../../base/common/errors.js';
+import { splitLines } from '../../../../../base/common/strings.js';
+import { Constants } from '../../../../../base/common/uint.js';
+import { Position } from '../../../../../editor/common/core/position.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
+import { LineRangeEdit, RangeEdit } from './editing.js';
+import { LineRange } from './lineRange.js';
+import { DetailedLineRangeMapping, MappingAlignment } from './mapping.js';
+import { concatArrays } from '../utils.js';
 
 /**
  * Describes modifications in input 1 and input 2 for a specific range in base.
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/model/rangeUtils.ts b/src/vs/workbench/contrib/mergeEditor/browser/model/rangeUtils.ts
index dd224530145..0c6666af32b 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/model/rangeUtils.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/model/rangeUtils.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { TextLength } from 'vs/editor/common/core/textLength';
+import { Position } from '../../../../../editor/common/core/position.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { TextLength } from '../../../../../editor/common/core/textLength.js';
 
 export function rangeContainsPosition(range: Range, position: Position): boolean {
 	if (position.lineNumber < range.startLineNumber || position.lineNumber > range.endLineNumber) {
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/model/textModelDiffs.ts b/src/vs/workbench/contrib/mergeEditor/browser/model/textModelDiffs.ts
index 9f888b4cec5..63512ae0e38 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/model/textModelDiffs.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/model/textModelDiffs.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { compareBy, numberComparator } from 'vs/base/common/arrays';
-import { BugIndicatingError } from 'vs/base/common/errors';
-import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { ITextModel } from 'vs/editor/common/model';
-import { DetailedLineRangeMapping } from 'vs/workbench/contrib/mergeEditor/browser/model/mapping';
-import { LineRangeEdit } from 'vs/workbench/contrib/mergeEditor/browser/model/editing';
-import { LineRange } from 'vs/workbench/contrib/mergeEditor/browser/model/lineRange';
-import { ReentrancyBarrier } from '../../../../../base/common/controlFlow';
-import { IMergeDiffComputer } from './diffComputer';
-import { autorun, IObservable, IReader, ITransaction, observableSignal, observableValue, transaction } from 'vs/base/common/observable';
-import { UndoRedoGroup } from 'vs/platform/undoRedo/common/undoRedo';
+import { compareBy, numberComparator } from '../../../../../base/common/arrays.js';
+import { BugIndicatingError } from '../../../../../base/common/errors.js';
+import { Disposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
+import { DetailedLineRangeMapping } from './mapping.js';
+import { LineRangeEdit } from './editing.js';
+import { LineRange } from './lineRange.js';
+import { ReentrancyBarrier } from '../../../../../base/common/controlFlow.js';
+import { IMergeDiffComputer } from './diffComputer.js';
+import { autorun, IObservable, IReader, ITransaction, observableSignal, observableValue, transaction } from '../../../../../base/common/observable.js';
+import { UndoRedoGroup } from '../../../../../platform/undoRedo/common/undoRedo.js';
 
 export class TextModelDiffs extends Disposable {
 	private _recomputeCount = 0;
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/telemetry.ts b/src/vs/workbench/contrib/mergeEditor/browser/telemetry.ts
index ba91b9a88fe..e27308b94de 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/telemetry.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/telemetry.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { InputNumber } from 'vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { InputNumber } from './model/modifiedBaseRange.js';
 export class MergeEditorTelemetry {
 	constructor(
 		@ITelemetryService private readonly telemetryService: ITelemetryService
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/utils.ts b/src/vs/workbench/contrib/mergeEditor/browser/utils.ts
index abc62bf6b7e..d60d64bcb8d 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/utils.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/utils.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ArrayQueue, CompareResult } from 'vs/base/common/arrays';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IObservable, autorunOpts } from 'vs/base/common/observable';
-import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { IModelDeltaDecoration } from 'vs/editor/common/model';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
+import { ArrayQueue, CompareResult } from '../../../../base/common/arrays.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { IObservable, autorunOpts } from '../../../../base/common/observable.js';
+import { CodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { IModelDeltaDecoration } from '../../../../editor/common/model.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 
 export function setStyle(
 	element: HTMLElement,
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/view/colors.ts b/src/vs/workbench/contrib/mergeEditor/browser/view/colors.ts
index cc6e5700812..54b4b8e15d2 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/view/colors.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/view/colors.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { mergeCurrentHeaderBackground, mergeIncomingHeaderBackground, registerColor, transparent } from 'vs/platform/theme/common/colorRegistry';
+import { localize } from '../../../../../nls.js';
+import { mergeCurrentHeaderBackground, mergeIncomingHeaderBackground, registerColor, transparent } from '../../../../../platform/theme/common/colorRegistry.js';
 
 export const diff = registerColor(
 	'mergeEditor.change.background',
-	{ dark: '#9bb95533', light: '#9bb95533', hcDark: '#9bb95533', hcLight: '#9bb95533', },
+	'#9bb95533',
 	localize('mergeEditor.change.background', 'The background color for changes.')
 );
 
@@ -38,49 +38,49 @@ export const conflictBorderUnhandledUnfocused = registerColor(
 
 export const conflictBorderUnhandledFocused = registerColor(
 	'mergeEditor.conflict.unhandledFocused.border',
-	{ dark: '#ffa600', light: '#ffa600', hcDark: '#ffa600', hcLight: '#ffa600', },
+	'#ffa600',
 	localize('mergeEditor.conflict.unhandledFocused.border', 'The border color of unhandled focused conflicts.')
 );
 
 export const conflictBorderHandledUnfocused = registerColor(
 	'mergeEditor.conflict.handledUnfocused.border',
-	{ dark: '#86868649', light: '#86868649', hcDark: '#86868649', hcLight: '#86868649', },
+	'#86868649',
 	localize('mergeEditor.conflict.handledUnfocused.border', 'The border color of handled unfocused conflicts.')
 );
 
 export const conflictBorderHandledFocused = registerColor(
 	'mergeEditor.conflict.handledFocused.border',
-	{ dark: '#c1c1c1cc', light: '#c1c1c1cc', hcDark: '#c1c1c1cc', hcLight: '#c1c1c1cc', },
+	'#c1c1c1cc',
 	localize('mergeEditor.conflict.handledFocused.border', 'The border color of handled focused conflicts.')
 );
 
 export const handledConflictMinimapOverViewRulerColor = registerColor(
 	'mergeEditor.conflict.handled.minimapOverViewRuler',
-	{ dark: '#adaca8ee', light: '#adaca8ee', hcDark: '#adaca8ee', hcLight: '#adaca8ee', },
+	'#adaca8ee',
 	localize('mergeEditor.conflict.handled.minimapOverViewRuler', 'The foreground color for changes in input 1.')
 );
 
 export const unhandledConflictMinimapOverViewRulerColor = registerColor(
 	'mergeEditor.conflict.unhandled.minimapOverViewRuler',
-	{ dark: '#fcba03FF', light: '#fcba03FF', hcDark: '#fcba03FF', hcLight: '#fcba03FF', },
+	'#fcba03FF',
 	localize('mergeEditor.conflict.unhandled.minimapOverViewRuler', 'The foreground color for changes in input 1.')
 );
 
 export const conflictingLinesBackground = registerColor(
 	'mergeEditor.conflictingLines.background',
-	{ dark: '#ffea0047', light: '#ffea0047', hcDark: '#ffea0047', hcLight: '#ffea0047', },
+	'#ffea0047',
 	localize('mergeEditor.conflictingLines.background', 'The background of the "Conflicting Lines" text.')
 );
 
 const contentTransparency = 0.4;
 export const conflictInput1Background = registerColor(
 	'mergeEditor.conflict.input1.background',
-	{ dark: transparent(mergeCurrentHeaderBackground, contentTransparency), light: transparent(mergeCurrentHeaderBackground, contentTransparency), hcDark: transparent(mergeCurrentHeaderBackground, contentTransparency), hcLight: transparent(mergeCurrentHeaderBackground, contentTransparency) },
+	transparent(mergeCurrentHeaderBackground, contentTransparency),
 	localize('mergeEditor.conflict.input1.background', 'The background color of decorations in input 1.')
 );
 
 export const conflictInput2Background = registerColor(
 	'mergeEditor.conflict.input2.background',
-	{ dark: transparent(mergeIncomingHeaderBackground, contentTransparency), light: transparent(mergeIncomingHeaderBackground, contentTransparency), hcDark: transparent(mergeIncomingHeaderBackground, contentTransparency), hcLight: transparent(mergeIncomingHeaderBackground, contentTransparency) },
+	transparent(mergeIncomingHeaderBackground, contentTransparency),
 	localize('mergeEditor.conflict.input2.background', 'The background color of decorations in input 2.')
 );
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.ts b/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.ts
index 8d88a891a5b..8a1cd72be34 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { $, createStyleSheet, h, isInShadowDOM, reset } from 'vs/base/browser/dom';
-import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
-import { hash } from 'vs/base/common/hash';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { autorun, derived, IObservable, transaction } from 'vs/base/common/observable';
-import { ICodeEditor, IViewZoneChangeAccessor } from 'vs/editor/browser/editorBrowser';
-import { EditorOption, EDITOR_FONT_DEFAULTS } from 'vs/editor/common/config/editorOptions';
-import { localize } from 'vs/nls';
-import { ModifiedBaseRange, ModifiedBaseRangeState, ModifiedBaseRangeStateKind } from 'vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange';
-import { FixedZoneWidget } from 'vs/workbench/contrib/mergeEditor/browser/view/fixedZoneWidget';
-import { MergeEditorViewModel } from 'vs/workbench/contrib/mergeEditor/browser/view/viewModel';
+import { $, createStyleSheet, h, isInShadowDOM, reset } from '../../../../../base/browser/dom.js';
+import { renderLabelWithIcons } from '../../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { hash } from '../../../../../base/common/hash.js';
+import { Disposable, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { autorun, derived, IObservable, transaction } from '../../../../../base/common/observable.js';
+import { ICodeEditor, IViewZoneChangeAccessor } from '../../../../../editor/browser/editorBrowser.js';
+import { EditorOption, EDITOR_FONT_DEFAULTS } from '../../../../../editor/common/config/editorOptions.js';
+import { localize } from '../../../../../nls.js';
+import { ModifiedBaseRange, ModifiedBaseRangeState, ModifiedBaseRangeStateKind } from '../model/modifiedBaseRange.js';
+import { FixedZoneWidget } from './fixedZoneWidget.js';
+import { MergeEditorViewModel } from './viewModel.js';
 
 export class ConflictActionsFactory extends Disposable {
 	private readonly _styleClassName: string;
@@ -54,8 +54,8 @@ export class ConflictActionsFactory extends Disposable {
 			newStyle += `${this._styleClassName} { font-family: var(${fontFamilyVar}), ${EDITOR_FONT_DEFAULTS.fontFamily}}`;
 		}
 		this._styleElement.textContent = newStyle;
-		this._editor.getContainerDomNode().style.setProperty(fontFamilyVar, fontFamily ?? 'inherit');
-		this._editor.getContainerDomNode().style.setProperty(fontFeaturesVar, editorFontInfo.fontFeatureSettings);
+		this._editor.getContainerDomNode().style?.setProperty(fontFamilyVar, fontFamily ?? 'inherit');
+		this._editor.getContainerDomNode().style?.setProperty(fontFeaturesVar, editorFontInfo.fontFeatureSettings);
 	}
 
 	private _getLayoutInfo() {
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/view/editorGutter.ts b/src/vs/workbench/contrib/mergeEditor/browser/view/editorGutter.ts
index 903b48202d5..18cb85e2292 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/view/editorGutter.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/view/editorGutter.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { h, reset } from 'vs/base/browser/dom';
-import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { autorun, IReader, observableFromEvent, observableSignal, observableSignalFromEvent, transaction } from 'vs/base/common/observable';
-import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { LineRange } from 'vs/workbench/contrib/mergeEditor/browser/model/lineRange';
+import { h, reset } from '../../../../../base/browser/dom.js';
+import { Disposable, IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { autorun, IReader, observableFromEvent, observableSignal, observableSignalFromEvent, transaction } from '../../../../../base/common/observable.js';
+import { CodeEditorWidget } from '../../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { LineRange } from '../model/lineRange.js';
 
 export class EditorGutter<T extends IGutterItemInfo = IGutterItemInfo> extends Disposable {
-	private readonly scrollTop = observableFromEvent(
+	private readonly scrollTop = observableFromEvent(this,
 		this._editor.onDidScrollChange,
 		(e) => /** @description editor.onDidScrollChange */ this._editor.getScrollTop()
 	);
 	private readonly isScrollTopZero = this.scrollTop.map((scrollTop) => /** @description isScrollTopZero */ scrollTop === 0);
-	private readonly modelAttached = observableFromEvent(
+	private readonly modelAttached = observableFromEvent(this,
 		this._editor.onDidChangeModel,
 		(e) => /** @description editor.onDidChangeModel */ this._editor.hasModel()
 	);
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/view/editors/baseCodeEditorView.ts b/src/vs/workbench/contrib/mergeEditor/browser/view/editors/baseCodeEditorView.ts
index c55a657f0d4..e43788e7ed1 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/view/editors/baseCodeEditorView.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/view/editors/baseCodeEditorView.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { h, reset } from 'vs/base/browser/dom';
-import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
-import { BugIndicatingError } from 'vs/base/common/errors';
-import { IObservable, autorun, autorunWithStore, derived } from 'vs/base/common/observable';
-import { IModelDeltaDecoration, MinimapPosition, OverviewRulerLane } from 'vs/editor/common/model';
-import { localize } from 'vs/nls';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { applyObservableDecorations } from 'vs/workbench/contrib/mergeEditor/browser/utils';
-import { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverViewRulerColor } from 'vs/workbench/contrib/mergeEditor/browser/view/colors';
-import { EditorGutter } from 'vs/workbench/contrib/mergeEditor/browser/view/editorGutter';
-import { MergeEditorViewModel } from 'vs/workbench/contrib/mergeEditor/browser/view/viewModel';
-import { CodeEditorView, TitleMenu, createSelectionsAutorun } from './codeEditorView';
+import { h, reset } from '../../../../../../base/browser/dom.js';
+import { renderLabelWithIcons } from '../../../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { BugIndicatingError } from '../../../../../../base/common/errors.js';
+import { IObservable, autorun, autorunWithStore, derived } from '../../../../../../base/common/observable.js';
+import { IModelDeltaDecoration, MinimapPosition, OverviewRulerLane } from '../../../../../../editor/common/model.js';
+import { localize } from '../../../../../../nls.js';
+import { MenuId } from '../../../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { applyObservableDecorations } from '../../utils.js';
+import { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverViewRulerColor } from '../colors.js';
+import { EditorGutter } from '../editorGutter.js';
+import { MergeEditorViewModel } from '../viewModel.js';
+import { CodeEditorView, TitleMenu, createSelectionsAutorun } from './codeEditorView.js';
 
 export class BaseCodeEditorView extends CodeEditorView {
 	constructor(
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/view/editors/codeEditorView.ts b/src/vs/workbench/contrib/mergeEditor/browser/view/editors/codeEditorView.ts
index 29af08fbafe..5520e2a0d72 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/view/editors/codeEditorView.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/view/editors/codeEditorView.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { h } from 'vs/base/browser/dom';
-import { IView, IViewSize } from 'vs/base/browser/ui/grid/grid';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { IObservable, autorun, derived, observableFromEvent } from 'vs/base/common/observable';
-import { EditorExtensionsRegistry, IEditorContributionDescription } from 'vs/editor/browser/editorExtensions';
-import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { CodeLensContribution } from 'vs/editor/contrib/codelens/browser/codelensController';
-import { FoldingController } from 'vs/editor/contrib/folding/browser/folding';
-import { MenuWorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { DEFAULT_EDITOR_MAX_DIMENSIONS, DEFAULT_EDITOR_MIN_DIMENSIONS } from 'vs/workbench/browser/parts/editor/editor';
-import { setStyle } from 'vs/workbench/contrib/mergeEditor/browser/utils';
-import { observableConfigValue } from 'vs/platform/observable/common/platformObservableUtils';
-import { MergeEditorViewModel } from 'vs/workbench/contrib/mergeEditor/browser/view/viewModel';
+import { h } from '../../../../../../base/browser/dom.js';
+import { IView, IViewSize } from '../../../../../../base/browser/ui/grid/grid.js';
+import { Emitter, Event } from '../../../../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { IObservable, autorun, derived, observableFromEvent } from '../../../../../../base/common/observable.js';
+import { EditorExtensionsRegistry, IEditorContributionDescription } from '../../../../../../editor/browser/editorExtensions.js';
+import { CodeEditorWidget } from '../../../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { IEditorOptions } from '../../../../../../editor/common/config/editorOptions.js';
+import { Range } from '../../../../../../editor/common/core/range.js';
+import { Selection } from '../../../../../../editor/common/core/selection.js';
+import { CodeLensContribution } from '../../../../../../editor/contrib/codelens/browser/codelensController.js';
+import { FoldingController } from '../../../../../../editor/contrib/folding/browser/folding.js';
+import { MenuWorkbenchToolBar } from '../../../../../../platform/actions/browser/toolbar.js';
+import { MenuId } from '../../../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { DEFAULT_EDITOR_MAX_DIMENSIONS, DEFAULT_EDITOR_MIN_DIMENSIONS } from '../../../../../browser/parts/editor/editor.js';
+import { setStyle } from '../../utils.js';
+import { observableConfigValue } from '../../../../../../platform/observable/common/platformObservableUtils.js';
+import { MergeEditorViewModel } from '../viewModel.js';
 
 export abstract class CodeEditorView extends Disposable {
 	readonly model = this.viewModel.map(m => /** @description model */ m?.model);
@@ -79,17 +79,17 @@ export abstract class CodeEditorView extends Disposable {
 		this.editor.updateOptions(newOptions);
 	}
 
-	public readonly isFocused = observableFromEvent(
+	public readonly isFocused = observableFromEvent(this,
 		Event.any(this.editor.onDidBlurEditorWidget, this.editor.onDidFocusEditorWidget),
 		() => /** @description editor.hasWidgetFocus */ this.editor.hasWidgetFocus()
 	);
 
-	public readonly cursorPosition = observableFromEvent(
+	public readonly cursorPosition = observableFromEvent(this,
 		this.editor.onDidChangeCursorPosition,
 		() => /** @description editor.getPosition */ this.editor.getPosition()
 	);
 
-	public readonly selection = observableFromEvent(
+	public readonly selection = observableFromEvent(this,
 		this.editor.onDidChangeCursorSelection,
 		() => /** @description editor.getSelections */ this.editor.getSelections()
 	);
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.ts b/src/vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.ts
index 03cffeea7d1..4a3b0081cd3 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.ts
@@ -3,30 +3,30 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { addDisposableListener, EventType, h, reset } from 'vs/base/browser/dom';
-import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
-import { Toggle } from 'vs/base/browser/ui/toggle/toggle';
-import { Action, IAction, Separator } from 'vs/base/common/actions';
-import { Codicon } from 'vs/base/common/codicons';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { clamp } from 'vs/base/common/numbers';
-import { autorun, autorunOpts, derived, derivedOpts, IObservable, ISettableObservable, ITransaction, observableValue, transaction } from 'vs/base/common/observable';
-import { noBreakWhitespace } from 'vs/base/common/strings';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { isDefined } from 'vs/base/common/types';
-import { IModelDeltaDecoration, MinimapPosition, OverviewRulerLane } from 'vs/editor/common/model';
-import { localize } from 'vs/nls';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { defaultToggleStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { InputState, ModifiedBaseRange, ModifiedBaseRangeState } from 'vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange';
-import { applyObservableDecorations, setFields } from 'vs/workbench/contrib/mergeEditor/browser/utils';
-import { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverViewRulerColor } from 'vs/workbench/contrib/mergeEditor/browser/view/colors';
-import { MergeEditorViewModel } from 'vs/workbench/contrib/mergeEditor/browser/view/viewModel';
-import { EditorGutter, IGutterItemInfo, IGutterItemView } from '../editorGutter';
-import { CodeEditorView, createSelectionsAutorun, TitleMenu } from './codeEditorView';
+import { addDisposableListener, EventType, h, reset } from '../../../../../../base/browser/dom.js';
+import { renderLabelWithIcons } from '../../../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { Toggle } from '../../../../../../base/browser/ui/toggle/toggle.js';
+import { Action, IAction, Separator } from '../../../../../../base/common/actions.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { clamp } from '../../../../../../base/common/numbers.js';
+import { autorun, autorunOpts, derived, derivedOpts, IObservable, ISettableObservable, ITransaction, observableValue, transaction } from '../../../../../../base/common/observable.js';
+import { noBreakWhitespace } from '../../../../../../base/common/strings.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { isDefined } from '../../../../../../base/common/types.js';
+import { IModelDeltaDecoration, MinimapPosition, OverviewRulerLane } from '../../../../../../editor/common/model.js';
+import { localize } from '../../../../../../nls.js';
+import { MenuId } from '../../../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { IContextMenuService } from '../../../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { defaultToggleStyles } from '../../../../../../platform/theme/browser/defaultStyles.js';
+import { InputState, ModifiedBaseRange, ModifiedBaseRangeState } from '../../model/modifiedBaseRange.js';
+import { applyObservableDecorations, setFields } from '../../utils.js';
+import { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverViewRulerColor } from '../colors.js';
+import { MergeEditorViewModel } from '../viewModel.js';
+import { EditorGutter, IGutterItemInfo, IGutterItemView } from '../editorGutter.js';
+import { CodeEditorView, createSelectionsAutorun, TitleMenu } from './codeEditorView.js';
 
 export class InputCodeEditorView extends CodeEditorView {
 	public readonly otherInputNumber = this.inputNumber === 1 ? 2 : 1;
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView.ts b/src/vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView.ts
index 54c7d9745b8..c5730805fd3 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView.ts
@@ -3,27 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { reset } from 'vs/base/browser/dom';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
-import { CompareResult } from 'vs/base/common/arrays';
-import { BugIndicatingError } from 'vs/base/common/errors';
-import { toDisposable } from 'vs/base/common/lifecycle';
-import { autorun, autorunWithStore, derived, IObservable } from 'vs/base/common/observable';
-import { IModelDeltaDecoration, MinimapPosition, OverviewRulerLane } from 'vs/editor/common/model';
-import { localize } from 'vs/nls';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { LineRange } from 'vs/workbench/contrib/mergeEditor/browser/model/lineRange';
-import { applyObservableDecorations, join } from 'vs/workbench/contrib/mergeEditor/browser/utils';
-import { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverViewRulerColor } from 'vs/workbench/contrib/mergeEditor/browser/view/colors';
-import { EditorGutter } from 'vs/workbench/contrib/mergeEditor/browser/view/editorGutter';
-import { MergeEditorViewModel } from 'vs/workbench/contrib/mergeEditor/browser/view/viewModel';
-import { ctxIsMergeResultEditor } from 'vs/workbench/contrib/mergeEditor/common/mergeEditor';
-import { CodeEditorView, createSelectionsAutorun, TitleMenu } from './codeEditorView';
+import { reset } from '../../../../../../base/browser/dom.js';
+import { ActionBar } from '../../../../../../base/browser/ui/actionbar/actionbar.js';
+import { renderLabelWithIcons } from '../../../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { CompareResult } from '../../../../../../base/common/arrays.js';
+import { BugIndicatingError } from '../../../../../../base/common/errors.js';
+import { toDisposable } from '../../../../../../base/common/lifecycle.js';
+import { autorun, autorunWithStore, derived, IObservable } from '../../../../../../base/common/observable.js';
+import { IModelDeltaDecoration, MinimapPosition, OverviewRulerLane } from '../../../../../../editor/common/model.js';
+import { localize } from '../../../../../../nls.js';
+import { MenuId } from '../../../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { ILabelService } from '../../../../../../platform/label/common/label.js';
+import { LineRange } from '../../model/lineRange.js';
+import { applyObservableDecorations, join } from '../../utils.js';
+import { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverViewRulerColor } from '../colors.js';
+import { EditorGutter } from '../editorGutter.js';
+import { MergeEditorViewModel } from '../viewModel.js';
+import { ctxIsMergeResultEditor } from '../../../common/mergeEditor.js';
+import { CodeEditorView, createSelectionsAutorun, TitleMenu } from './codeEditorView.js';
 
 export class ResultCodeEditorView extends CodeEditorView {
 	constructor(
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/view/fixedZoneWidget.ts b/src/vs/workbench/contrib/mergeEditor/browser/view/fixedZoneWidget.ts
index 3175a1ca927..6d36ed7ac14 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/view/fixedZoneWidget.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/view/fixedZoneWidget.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { h } from 'vs/base/browser/dom';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ICodeEditor, IOverlayWidget, IViewZoneChangeAccessor } from 'vs/editor/browser/editorBrowser';
-import { Event } from 'vs/base/common/event';
+import { h } from '../../../../../base/browser/dom.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { ICodeEditor, IOverlayWidget, IViewZoneChangeAccessor } from '../../../../../editor/browser/editorBrowser.js';
+import { Event } from '../../../../../base/common/event.js';
 
 export abstract class FixedZoneWidget extends Disposable {
 	private static counter = 0;
@@ -33,6 +33,7 @@ export abstract class FixedZoneWidget extends Disposable {
 			domNode: document.createElement('div'),
 			afterLineNumber: afterLineNumber,
 			heightInPx: height,
+			ordinal: 50000 + 1,
 			onComputedHeight: (height) => {
 				this.widgetDomNode.style.height = `${height}px`;
 			},
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/view/lineAlignment.ts b/src/vs/workbench/contrib/mergeEditor/browser/view/lineAlignment.ts
index c6d9664b4be..e607effbacd 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/view/lineAlignment.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/view/lineAlignment.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { compareBy } from 'vs/base/common/arrays';
-import { assertFn, checkAdjacentItems } from 'vs/base/common/assert';
-import { isDefined } from 'vs/base/common/types';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { TextLength } from 'vs/editor/common/core/textLength';
-import { RangeMapping } from 'vs/workbench/contrib/mergeEditor/browser/model/mapping';
-import { ModifiedBaseRange } from 'vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange';
-import { addLength, lengthBetweenPositions, lengthOfRange } from 'vs/workbench/contrib/mergeEditor/browser/model/rangeUtils';
+import { compareBy } from '../../../../../base/common/arrays.js';
+import { assertFn, checkAdjacentItems } from '../../../../../base/common/assert.js';
+import { isDefined } from '../../../../../base/common/types.js';
+import { Position } from '../../../../../editor/common/core/position.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { TextLength } from '../../../../../editor/common/core/textLength.js';
+import { RangeMapping } from '../model/mapping.js';
+import { ModifiedBaseRange } from '../model/modifiedBaseRange.js';
+import { addLength, lengthBetweenPositions, lengthOfRange } from '../model/rangeUtils.js';
 
 export type LineAlignment = [input1LineNumber: number | undefined, baseLineNumber: number, input2LineNumber: number | undefined];
 
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.ts b/src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.ts
index bec1dec9481..32b12772bef 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.ts
@@ -3,56 +3,56 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Dimension, reset } from 'vs/base/browser/dom';
-import { Grid, GridNodeDescriptor, IView, SerializableGrid } from 'vs/base/browser/ui/grid/grid';
-import { Orientation } from 'vs/base/browser/ui/splitview/splitview';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Color } from 'vs/base/common/color';
-import { BugIndicatingError, onUnexpectedError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore, IDisposable, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { autorun, autorunWithStore, IObservable, IReader, observableValue, transaction } from 'vs/base/common/observable';
-import { basename, isEqual } from 'vs/base/common/resources';
-import { isDefined } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import 'vs/css!./media/mergeEditor';
-import { ICodeEditor, IViewZoneChangeAccessor } from 'vs/editor/browser/editorBrowser';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { IEditorOptions as ICodeEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { ICodeEditorViewState, ScrollType } from 'vs/editor/common/editorCommon';
-import { ITextModel } from 'vs/editor/common/model';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { localize } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IEditorOptions, ITextEditorOptions, ITextResourceEditorInput } from 'vs/platform/editor/common/editor';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { AbstractTextEditor } from 'vs/workbench/browser/parts/editor/textEditor';
-import { DEFAULT_EDITOR_ASSOCIATION, EditorInputWithOptions, IEditorOpenContext, IResourceMergeEditorInput } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { applyTextEditorOptions } from 'vs/workbench/common/editor/editorOptions';
-import { readTransientState, writeTransientState } from 'vs/workbench/contrib/codeEditor/browser/toggleWordWrap';
-import { MergeEditorInput } from 'vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
-import { IMergeEditorInputModel } from 'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel';
-import { MergeEditorModel } from 'vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel';
-import { deepMerge, PersistentStore, thenIfNotDisposed } from 'vs/workbench/contrib/mergeEditor/browser/utils';
-import { observableConfigValue } from 'vs/platform/observable/common/platformObservableUtils';
-import { BaseCodeEditorView } from 'vs/workbench/contrib/mergeEditor/browser/view/editors/baseCodeEditorView';
-import { ScrollSynchronizer } from 'vs/workbench/contrib/mergeEditor/browser/view/scrollSynchronizer';
-import { MergeEditorViewModel } from 'vs/workbench/contrib/mergeEditor/browser/view/viewModel';
-import { ViewZoneComputer } from 'vs/workbench/contrib/mergeEditor/browser/view/viewZones';
-import { ctxIsMergeEditor, ctxMergeBaseUri, ctxMergeEditorLayout, ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop, ctxMergeEditorShowNonConflictingChanges, ctxMergeResultUri, MergeEditorLayoutKind } from 'vs/workbench/contrib/mergeEditor/common/mergeEditor';
-import { settingsSashBorder } from 'vs/workbench/contrib/preferences/common/settingsEditorColorRegistry';
-import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorResolverService, MergeEditorInputFactoryFunction, RegisteredEditorPriority } from 'vs/workbench/services/editor/common/editorResolverService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import './colors';
-import { InputCodeEditorView } from './editors/inputCodeEditorView';
-import { ResultCodeEditorView } from './editors/resultCodeEditorView';
+import { Dimension, reset } from '../../../../../base/browser/dom.js';
+import { Grid, GridNodeDescriptor, IView, SerializableGrid } from '../../../../../base/browser/ui/grid/grid.js';
+import { Orientation } from '../../../../../base/browser/ui/splitview/splitview.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { Color } from '../../../../../base/common/color.js';
+import { BugIndicatingError, onUnexpectedError } from '../../../../../base/common/errors.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { Disposable, DisposableStore, IDisposable, MutableDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { autorun, autorunWithStore, IObservable, IReader, observableValue, transaction } from '../../../../../base/common/observable.js';
+import { basename, isEqual } from '../../../../../base/common/resources.js';
+import { isDefined } from '../../../../../base/common/types.js';
+import { URI } from '../../../../../base/common/uri.js';
+import './media/mergeEditor.css';
+import { ICodeEditor, IViewZoneChangeAccessor } from '../../../../../editor/browser/editorBrowser.js';
+import { ICodeEditorService } from '../../../../../editor/browser/services/codeEditorService.js';
+import { IEditorOptions as ICodeEditorOptions } from '../../../../../editor/common/config/editorOptions.js';
+import { ICodeEditorViewState, ScrollType } from '../../../../../editor/common/editorCommon.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
+import { ITextResourceConfigurationService } from '../../../../../editor/common/services/textResourceConfiguration.js';
+import { localize } from '../../../../../nls.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IContextKey, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IEditorOptions, ITextEditorOptions, ITextResourceEditorInput } from '../../../../../platform/editor/common/editor.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { AbstractTextEditor } from '../../../../browser/parts/editor/textEditor.js';
+import { DEFAULT_EDITOR_ASSOCIATION, EditorInputWithOptions, IEditorOpenContext, IResourceMergeEditorInput } from '../../../../common/editor.js';
+import { EditorInput } from '../../../../common/editor/editorInput.js';
+import { applyTextEditorOptions } from '../../../../common/editor/editorOptions.js';
+import { readTransientState, writeTransientState } from '../../../codeEditor/browser/toggleWordWrap.js';
+import { MergeEditorInput } from '../mergeEditorInput.js';
+import { IMergeEditorInputModel } from '../mergeEditorInputModel.js';
+import { MergeEditorModel } from '../model/mergeEditorModel.js';
+import { deepMerge, PersistentStore, thenIfNotDisposed } from '../utils.js';
+import { observableConfigValue } from '../../../../../platform/observable/common/platformObservableUtils.js';
+import { BaseCodeEditorView } from './editors/baseCodeEditorView.js';
+import { ScrollSynchronizer } from './scrollSynchronizer.js';
+import { MergeEditorViewModel } from './viewModel.js';
+import { ViewZoneComputer } from './viewZones.js';
+import { ctxIsMergeEditor, ctxMergeBaseUri, ctxMergeEditorLayout, ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop, ctxMergeEditorShowNonConflictingChanges, ctxMergeResultUri, MergeEditorLayoutKind } from '../../common/mergeEditor.js';
+import { settingsSashBorder } from '../../../preferences/common/settingsEditorColorRegistry.js';
+import { IEditorGroup, IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
+import { IEditorResolverService, MergeEditorInputFactoryFunction, RegisteredEditorPriority } from '../../../../services/editor/common/editorResolverService.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import './colors.js';
+import { InputCodeEditorView } from './editors/inputCodeEditorView.js';
+import { ResultCodeEditorView } from './editors/resultCodeEditorView.js';
 
 export class MergeEditor extends AbstractTextEditor<IMergeEditorViewState> {
 
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/view/scrollSynchronizer.ts b/src/vs/workbench/contrib/mergeEditor/browser/view/scrollSynchronizer.ts
index 79e0e769398..4d09d327f29 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/view/scrollSynchronizer.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/view/scrollSynchronizer.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { autorunWithStore, IObservable } from 'vs/base/common/observable';
-import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { ScrollType } from 'vs/editor/common/editorCommon';
-import { DocumentLineRangeMap } from 'vs/workbench/contrib/mergeEditor/browser/model/mapping';
-import { ReentrancyBarrier } from '../../../../../base/common/controlFlow';
-import { BaseCodeEditorView } from 'vs/workbench/contrib/mergeEditor/browser/view/editors/baseCodeEditorView';
-import { IMergeEditorLayout } from 'vs/workbench/contrib/mergeEditor/browser/view/mergeEditor';
-import { MergeEditorViewModel } from 'vs/workbench/contrib/mergeEditor/browser/view/viewModel';
-import { InputCodeEditorView } from './editors/inputCodeEditorView';
-import { ResultCodeEditorView } from './editors/resultCodeEditorView';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { autorunWithStore, IObservable } from '../../../../../base/common/observable.js';
+import { CodeEditorWidget } from '../../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { ScrollType } from '../../../../../editor/common/editorCommon.js';
+import { DocumentLineRangeMap } from '../model/mapping.js';
+import { ReentrancyBarrier } from '../../../../../base/common/controlFlow.js';
+import { BaseCodeEditorView } from './editors/baseCodeEditorView.js';
+import { IMergeEditorLayout } from './mergeEditor.js';
+import { MergeEditorViewModel } from './viewModel.js';
+import { InputCodeEditorView } from './editors/inputCodeEditorView.js';
+import { ResultCodeEditorView } from './editors/resultCodeEditorView.js';
 
 export class ScrollSynchronizer extends Disposable {
 	private get model() { return this.viewModel.get()?.model; }
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.ts b/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.ts
index 1c0f093dc27..74322dc65a4 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { findLast } from 'vs/base/common/arraysFind';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { derived, derivedObservableWithWritableCache, IObservable, IReader, ITransaction, observableValue, transaction } from 'vs/base/common/observable';
-import { Range } from 'vs/editor/common/core/range';
-import { ScrollType } from 'vs/editor/common/editorCommon';
-import { ITextModel } from 'vs/editor/common/model';
-import { localize } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { LineRange } from 'vs/workbench/contrib/mergeEditor/browser/model/lineRange';
-import { MergeEditorModel } from 'vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel';
-import { InputNumber, ModifiedBaseRange, ModifiedBaseRangeState } from 'vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange';
-import { observableConfigValue } from 'vs/platform/observable/common/platformObservableUtils';
-import { BaseCodeEditorView } from 'vs/workbench/contrib/mergeEditor/browser/view/editors/baseCodeEditorView';
-import { CodeEditorView } from 'vs/workbench/contrib/mergeEditor/browser/view/editors/codeEditorView';
-import { InputCodeEditorView } from 'vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView';
-import { ResultCodeEditorView } from 'vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView';
+import { findLast } from '../../../../../base/common/arraysFind.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { derived, derivedObservableWithWritableCache, IObservable, IReader, ITransaction, observableValue, transaction } from '../../../../../base/common/observable.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { ScrollType } from '../../../../../editor/common/editorCommon.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
+import { localize } from '../../../../../nls.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { INotificationService } from '../../../../../platform/notification/common/notification.js';
+import { LineRange } from '../model/lineRange.js';
+import { MergeEditorModel } from '../model/mergeEditorModel.js';
+import { InputNumber, ModifiedBaseRange, ModifiedBaseRangeState } from '../model/modifiedBaseRange.js';
+import { observableConfigValue } from '../../../../../platform/observable/common/platformObservableUtils.js';
+import { BaseCodeEditorView } from './editors/baseCodeEditorView.js';
+import { CodeEditorView } from './editors/codeEditorView.js';
+import { InputCodeEditorView } from './editors/inputCodeEditorView.js';
+import { ResultCodeEditorView } from './editors/resultCodeEditorView.js';
 
 export class MergeEditorViewModel extends Disposable {
 	private readonly manuallySetActiveModifiedBaseRange = observableValue<
@@ -193,6 +193,7 @@ export class MergeEditorViewModel extends Disposable {
 	): void {
 		this.manuallySetActiveModifiedBaseRange.set({ range: baseRange, counter: this.counter++ }, tx);
 		this.model.setState(baseRange, state, inputNumber, tx);
+		this.lastFocusedEditor.clearCache(tx);
 	}
 
 	private goToConflict(getModifiedBaseRange: (editor: CodeEditorView, curLineNumber: number) => ModifiedBaseRange | undefined): void {
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/view/viewZones.ts b/src/vs/workbench/contrib/mergeEditor/browser/view/viewZones.ts
index ce3ec967375..edd45916373 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/view/viewZones.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/view/viewZones.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { $ } from 'vs/base/browser/dom';
-import { CompareResult, lastOrDefault } from 'vs/base/common/arrays';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { IObservable, IReader } from 'vs/base/common/observable';
-import { ICodeEditor, IViewZoneChangeAccessor } from 'vs/editor/browser/editorBrowser';
-import { LineRange } from 'vs/workbench/contrib/mergeEditor/browser/model/lineRange';
-import { DetailedLineRangeMapping } from 'vs/workbench/contrib/mergeEditor/browser/model/mapping';
-import { ModifiedBaseRange } from 'vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange';
-import { join } from 'vs/workbench/contrib/mergeEditor/browser/utils';
-import { ActionsSource, ConflictActionsFactory, IContentWidgetAction } from 'vs/workbench/contrib/mergeEditor/browser/view/conflictActions';
-import { getAlignments } from 'vs/workbench/contrib/mergeEditor/browser/view/lineAlignment';
-import { MergeEditorViewModel } from 'vs/workbench/contrib/mergeEditor/browser/view/viewModel';
+import { $ } from '../../../../../base/browser/dom.js';
+import { CompareResult } from '../../../../../base/common/arrays.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { IObservable, IReader } from '../../../../../base/common/observable.js';
+import { ICodeEditor, IViewZoneChangeAccessor } from '../../../../../editor/browser/editorBrowser.js';
+import { LineRange } from '../model/lineRange.js';
+import { DetailedLineRangeMapping } from '../model/mapping.js';
+import { ModifiedBaseRange } from '../model/modifiedBaseRange.js';
+import { join } from '../utils.js';
+import { ActionsSource, ConflictActionsFactory, IContentWidgetAction } from './conflictActions.js';
+import { getAlignments } from './lineAlignment.js';
+import { MergeEditorViewModel } from './viewModel.js';
 
 export class ViewZoneComputer {
 	private readonly conflictActionsFactoryInput1 = new ConflictActionsFactory(this.input1Editor);
@@ -82,7 +82,7 @@ export class ViewZoneComputer {
 
 			}
 
-			const lastResultDiff = lastOrDefault(m.rights)!;
+			const lastResultDiff = m.rights.at(-1)!;
 			if (lastResultDiff) {
 				lastBaseResultDiff = lastResultDiff;
 			}
diff --git a/src/vs/workbench/contrib/mergeEditor/common/mergeEditor.ts b/src/vs/workbench/contrib/mergeEditor/common/mergeEditor.ts
index 9670eb8a573..442ec52db7d 100644
--- a/src/vs/workbench/contrib/mergeEditor/common/mergeEditor.ts
+++ b/src/vs/workbench/contrib/mergeEditor/common/mergeEditor.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { localize } from '../../../../nls.js';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 
 export type MergeEditorLayoutKind = 'mixed' | 'columns';
 
diff --git a/src/vs/workbench/contrib/mergeEditor/electron-sandbox/devCommands.ts b/src/vs/workbench/contrib/mergeEditor/electron-sandbox/devCommands.ts
index cfd541d1d3f..1456ead586b 100644
--- a/src/vs/workbench/contrib/mergeEditor/electron-sandbox/devCommands.ts
+++ b/src/vs/workbench/contrib/mergeEditor/electron-sandbox/devCommands.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { Codicon } from 'vs/base/common/codicons';
-import { randomPath } from 'vs/base/common/extpath';
-import { URI } from 'vs/base/common/uri';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { localize, localize2 } from 'vs/nls';
-import { ILocalizedString } from 'vs/platform/action/common/action';
-import { Action2, IAction2Options } from 'vs/platform/actions/common/actions';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IFileService } from 'vs/platform/files/common/files';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { IResourceMergeEditorInput } from 'vs/workbench/common/editor';
-import { MergeEditor } from 'vs/workbench/contrib/mergeEditor/browser/view/mergeEditor';
-import { MergeEditorViewModel } from 'vs/workbench/contrib/mergeEditor/browser/view/viewModel';
-import { MergeEditorContents } from 'vs/workbench/contrib/mergeEditor/common/mergeEditor';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { randomPath } from '../../../../base/common/extpath.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { ILocalizedString } from '../../../../platform/action/common/action.js';
+import { Action2, IAction2Options } from '../../../../platform/actions/common/actions.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { INativeEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { IResourceMergeEditorInput } from '../../../common/editor.js';
+import { MergeEditor } from '../browser/view/mergeEditor.js';
+import { MergeEditorViewModel } from '../browser/view/viewModel.js';
+import { MergeEditorContents } from '../common/mergeEditor.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
 
 const MERGE_EDITOR_CATEGORY: ILocalizedString = localize2('mergeEditor', 'Merge Editor (Dev)');
 
diff --git a/src/vs/workbench/contrib/mergeEditor/electron-sandbox/mergeEditor.contribution.ts b/src/vs/workbench/contrib/mergeEditor/electron-sandbox/mergeEditor.contribution.ts
index 68c312b131e..8dbd6af99bd 100644
--- a/src/vs/workbench/contrib/mergeEditor/electron-sandbox/mergeEditor.contribution.ts
+++ b/src/vs/workbench/contrib/mergeEditor/electron-sandbox/mergeEditor.contribution.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { registerAction2 } from 'vs/platform/actions/common/actions';
-import { MergeEditorOpenContentsFromJSON, OpenSelectionInTemporaryMergeEditor } from 'vs/workbench/contrib/mergeEditor/electron-sandbox/devCommands';
+import { registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { MergeEditorOpenContentsFromJSON, OpenSelectionInTemporaryMergeEditor } from './devCommands.js';
 
 // Dev Commands
 registerAction2(MergeEditorOpenContentsFromJSON);
diff --git a/src/vs/workbench/contrib/mergeEditor/test/browser/mapping.test.ts b/src/vs/workbench/contrib/mergeEditor/test/browser/mapping.test.ts
index 135d0d9a7ee..bef40313331 100644
--- a/src/vs/workbench/contrib/mergeEditor/test/browser/mapping.test.ts
+++ b/src/vs/workbench/contrib/mergeEditor/test/browser/mapping.test.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { TextLength } from 'vs/editor/common/core/textLength';
-import { DocumentRangeMap, RangeMapping } from 'vs/workbench/contrib/mergeEditor/browser/model/mapping';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Position } from '../../../../../editor/common/core/position.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { TextLength } from '../../../../../editor/common/core/textLength.js';
+import { DocumentRangeMap, RangeMapping } from '../../browser/model/mapping.js';
 
 suite('merge editor mapping', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/contrib/mergeEditor/test/browser/model.test.ts b/src/vs/workbench/contrib/mergeEditor/test/browser/model.test.ts
index a07bc71e675..65b7b366c39 100644
--- a/src/vs/workbench/contrib/mergeEditor/test/browser/model.test.ts
+++ b/src/vs/workbench/contrib/mergeEditor/test/browser/model.test.ts
@@ -4,19 +4,19 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { IReader, transaction } from 'vs/base/common/observable';
-import { isDefined } from 'vs/base/common/types';
-import { Range } from 'vs/editor/common/core/range';
-import { linesDiffComputers } from 'vs/editor/common/diff/linesDiffComputers';
-import { EndOfLinePreference, ITextModel } from 'vs/editor/common/model';
-import { createModelServices, createTextModel } from 'vs/editor/test/common/testTextModel';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IMergeDiffComputer, IMergeDiffComputerResult, toLineRange, toRangeMapping } from 'vs/workbench/contrib/mergeEditor/browser/model/diffComputer';
-import { DetailedLineRangeMapping } from 'vs/workbench/contrib/mergeEditor/browser/model/mapping';
-import { MergeEditorModel } from 'vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel';
-import { MergeEditorTelemetry } from 'vs/workbench/contrib/mergeEditor/browser/telemetry';
+import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { IReader, transaction } from '../../../../../base/common/observable.js';
+import { isDefined } from '../../../../../base/common/types.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { linesDiffComputers } from '../../../../../editor/common/diff/linesDiffComputers.js';
+import { EndOfLinePreference, ITextModel } from '../../../../../editor/common/model.js';
+import { createModelServices, createTextModel } from '../../../../../editor/test/common/testTextModel.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { NullTelemetryService } from '../../../../../platform/telemetry/common/telemetryUtils.js';
+import { IMergeDiffComputer, IMergeDiffComputerResult, toLineRange, toRangeMapping } from '../../browser/model/diffComputer.js';
+import { DetailedLineRangeMapping } from '../../browser/model/mapping.js';
+import { MergeEditorModel } from '../../browser/model/mergeEditorModel.js';
+import { MergeEditorTelemetry } from '../../browser/telemetry.js';
 
 suite('merge editor model', () => {
 	// todo: renable when failing case is found https://github.com/microsoft/vscode/pull/190444#issuecomment-1678151428
diff --git a/src/vs/workbench/contrib/multiDiffEditor/browser/actions.ts b/src/vs/workbench/contrib/multiDiffEditor/browser/actions.ts
index 5b1ab36ce10..553d01befc7 100644
--- a/src/vs/workbench/contrib/multiDiffEditor/browser/actions.ts
+++ b/src/vs/workbench/contrib/multiDiffEditor/browser/actions.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from 'vs/base/common/codicons';
-import { URI } from 'vs/base/common/uri';
-import { Selection } from 'vs/editor/common/core/selection';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { localize2 } from 'vs/nls';
-import { Action2, MenuId } from 'vs/platform/actions/common/actions';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { getCommandsContext, resolveCommandsContext } from 'vs/workbench/browser/parts/editor/editorCommands';
-import { IEditorCommandsContext } from 'vs/workbench/common/editor';
-import { TextFileEditor } from 'vs/workbench/contrib/files/browser/editors/textFileEditor';
-import { MultiDiffEditor } from 'vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor';
-import { MultiDiffEditorInput } from 'vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Selection } from '../../../../editor/common/core/selection.js';
+import { localize2 } from '../../../../nls.js';
+import { Action2, MenuId } from '../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { ITextEditorOptions, TextEditorSelectionRevealType } from '../../../../platform/editor/common/editor.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IListService } from '../../../../platform/list/browser/listService.js';
+import { resolveCommandsContext } from '../../../browser/parts/editor/editorCommandsContext.js';
+import { MultiDiffEditor } from './multiDiffEditor.js';
+import { MultiDiffEditorInput } from './multiDiffEditorInput.js';
+import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { ActiveEditorContext } from '../../../common/contextkeys.js';
 
 export class GoToFileAction extends Action2 {
 	constructor() {
@@ -25,9 +25,9 @@ export class GoToFileAction extends Action2 {
 			id: 'multiDiffEditor.goToFile',
 			title: localize2('goToFile', 'Open File'),
 			icon: Codicon.goToFile,
-			precondition: EditorContextKeys.inMultiDiffEditor,
+			precondition: ActiveEditorContext.isEqualTo(MultiDiffEditor.ID),
 			menu: {
-				when: EditorContextKeys.inMultiDiffEditor,
+				when: ActiveEditorContext.isEqualTo(MultiDiffEditor.ID),
 				id: MenuId.MultiDiffEditorFileToolbar,
 				order: 22,
 				group: 'navigation',
@@ -40,21 +40,28 @@ export class GoToFileAction extends Action2 {
 		const editorService = accessor.get(IEditorService);
 		const activeEditorPane = editorService.activeEditorPane;
 		let selections: Selection[] | undefined = undefined;
-		if (activeEditorPane instanceof MultiDiffEditor) {
-			const editor = activeEditorPane.tryGetCodeEditor(uri);
-			if (editor) {
-				selections = editor.editor.getSelections() ?? undefined;
-			}
+		if (!(activeEditorPane instanceof MultiDiffEditor)) {
+			return;
 		}
 
-		const editor = await editorService.openEditor({ resource: uri });
-		if (selections && (editor instanceof TextFileEditor)) {
-			const c = editor.getControl();
-			if (c) {
-				c.setSelections(selections);
-				c.revealLineInCenter(selections[0].selectionStartLineNumber);
-			}
+		const editor = activeEditorPane.tryGetCodeEditor(uri);
+		if (editor) {
+			selections = editor.editor.getSelections() ?? undefined;
 		}
+
+		let targetUri = uri;
+		const item = activeEditorPane.findDocumentDiffItem(uri);
+		if (item && item.goToFileUri) {
+			targetUri = item.goToFileUri;
+		}
+
+		await editorService.openEditor({
+			resource: targetUri,
+			options: {
+				selection: selections?.[0],
+				selectionRevealType: TextEditorSelectionRevealType.CenterIfOutsideViewport,
+			} satisfies ITextEditorOptions,
+		});
 	}
 }
 
@@ -75,9 +82,15 @@ export class CollapseAllAction extends Action2 {
 		});
 	}
 
-	async run(accessor: ServicesAccessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext): Promise<void> {
-		const { editor } = resolveCommandsContext(accessor.get(IEditorGroupsService), getCommandsContext(accessor, resourceOrContext, context));
+	async run(accessor: ServicesAccessor, ...args: unknown[]): Promise<void> {
+		const resolvedContext = resolveCommandsContext(args, accessor.get(IEditorService), accessor.get(IEditorGroupsService), accessor.get(IListService));
 
+		const groupContext = resolvedContext.groupedEditors[0];
+		if (!groupContext) {
+			return;
+		}
+
+		const editor = groupContext.editors[0];
 		if (editor instanceof MultiDiffEditorInput) {
 			const viewModel = await editor.getViewModel();
 			viewModel.collapseAll();
@@ -102,9 +115,15 @@ export class ExpandAllAction extends Action2 {
 		});
 	}
 
-	async run(accessor: ServicesAccessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext): Promise<void> {
-		const { editor } = resolveCommandsContext(accessor.get(IEditorGroupsService), getCommandsContext(accessor, resourceOrContext, context));
+	async run(accessor: ServicesAccessor, ...args: unknown[]): Promise<void> {
+		const resolvedContext = resolveCommandsContext(args, accessor.get(IEditorService), accessor.get(IEditorGroupsService), accessor.get(IListService));
 
+		const groupContext = resolvedContext.groupedEditors[0];
+		if (!groupContext) {
+			return;
+		}
+
+		const editor = groupContext.editors[0];
 		if (editor instanceof MultiDiffEditorInput) {
 			const viewModel = await editor.getViewModel();
 			viewModel.expandAll();
diff --git a/src/vs/workbench/contrib/multiDiffEditor/browser/icons.contribution.ts b/src/vs/workbench/contrib/multiDiffEditor/browser/icons.contribution.ts
index 40c9b0ae568..83667f8f528 100644
--- a/src/vs/workbench/contrib/multiDiffEditor/browser/icons.contribution.ts
+++ b/src/vs/workbench/contrib/multiDiffEditor/browser/icons.contribution.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from 'vs/base/common/codicons';
-import { localize } from 'vs/nls';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { localize } from '../../../../nls.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 
 export const MultiDiffEditorIcon = registerIcon('multi-diff-editor-label-icon', Codicon.diffMultiple, localize('multiDiffEditorLabelIcon', 'Icon of the multi diff editor label.'));
diff --git a/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.contribution.ts b/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.contribution.ts
index 84d37362cb7..81572303918 100644
--- a/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.contribution.ts
+++ b/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.contribution.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { registerAction2 } from 'vs/platform/actions/common/actions';
-import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { EditorPaneDescriptor, IEditorPaneRegistry } from 'vs/workbench/browser/editor';
-import { WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { EditorExtensions, IEditorFactoryRegistry } from 'vs/workbench/common/editor';
-import { MultiDiffEditor } from 'vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor';
-import { MultiDiffEditorInput, MultiDiffEditorResolverContribution, MultiDiffEditorSerializer } from 'vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
-import { CollapseAllAction, ExpandAllAction, GoToFileAction } from './actions';
-import { IMultiDiffSourceResolverService, MultiDiffSourceResolverService } from 'vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { OpenScmGroupAction, ScmMultiDiffSourceResolverContribution } from 'vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver';
+import { localize } from '../../../../nls.js';
+import { registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { Extensions, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { EditorPaneDescriptor, IEditorPaneRegistry } from '../../../browser/editor.js';
+import { WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { EditorExtensions, IEditorFactoryRegistry } from '../../../common/editor.js';
+import { MultiDiffEditor } from './multiDiffEditor.js';
+import { MultiDiffEditorInput, MultiDiffEditorResolverContribution, MultiDiffEditorSerializer } from './multiDiffEditorInput.js';
+import { CollapseAllAction, ExpandAllAction, GoToFileAction } from './actions.js';
+import { IMultiDiffSourceResolverService, MultiDiffSourceResolverService } from './multiDiffSourceResolverService.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { OpenScmGroupAction, ScmMultiDiffSourceResolverContribution } from './scmMultiDiffSourceResolver.js';
 
 registerAction2(GoToFileAction);
 registerAction2(CollapseAllAction);
diff --git a/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.ts b/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.ts
index ffe7a8738f5..3a45ea35556 100644
--- a/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.ts
+++ b/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.ts
@@ -3,30 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { MultiDiffEditorWidget } from 'vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidget';
-import { IResourceLabel, IWorkbenchUIElementFactory } from 'vs/editor/browser/widget/multiDiffEditor/workbenchUIElementFactory';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ResourceLabel } from 'vs/workbench/browser/labels';
-import { AbstractEditorWithViewState } from 'vs/workbench/browser/parts/editor/editorWithViewState';
-import { ICompositeControl } from 'vs/workbench/common/composite';
-import { IEditorOpenContext } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { MultiDiffEditorInput } from 'vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
-import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { URI } from 'vs/base/common/uri';
-import { MultiDiffEditorViewModel } from 'vs/editor/browser/widget/multiDiffEditor/multiDiffEditorViewModel';
-import { IMultiDiffEditorOptions, IMultiDiffEditorViewState } from 'vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IDiffEditor } from 'vs/editor/common/editorCommon';
-import { Range } from 'vs/editor/common/core/range';
+import * as DOM from '../../../../base/browser/dom.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { MultiDiffEditorWidget } from '../../../../editor/browser/widget/multiDiffEditor/multiDiffEditorWidget.js';
+import { IResourceLabel, IWorkbenchUIElementFactory } from '../../../../editor/browser/widget/multiDiffEditor/workbenchUIElementFactory.js';
+import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { InstantiationService } from '../../../../platform/instantiation/common/instantiationService.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ResourceLabel } from '../../../browser/labels.js';
+import { AbstractEditorWithViewState } from '../../../browser/parts/editor/editorWithViewState.js';
+import { ICompositeControl } from '../../../common/composite.js';
+import { IEditorOpenContext } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { IDocumentDiffItemWithMultiDiffEditorItem, MultiDiffEditorInput } from './multiDiffEditorInput.js';
+import { IEditorGroup, IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { URI } from '../../../../base/common/uri.js';
+import { MultiDiffEditorViewModel } from '../../../../editor/browser/widget/multiDiffEditor/multiDiffEditorViewModel.js';
+import { IMultiDiffEditorOptions, IMultiDiffEditorViewState } from '../../../../editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { IDiffEditor } from '../../../../editor/common/editorCommon.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { MultiDiffEditorItem } from './multiDiffSourceResolverService.js';
+import { IEditorProgressService } from '../../../../platform/progress/common/progress.js';
 
 export class MultiDiffEditor extends AbstractEditorWithViewState<IMultiDiffEditorViewState> {
 	static readonly ID = 'multiDiffEditor';
@@ -47,6 +49,7 @@ export class MultiDiffEditor extends AbstractEditorWithViewState<IMultiDiffEdito
 		@IEditorService editorService: IEditorService,
 		@IEditorGroupsService editorGroupService: IEditorGroupsService,
 		@ITextResourceConfigurationService textResourceConfigurationService: ITextResourceConfigurationService,
+		@IEditorProgressService private editorProgressService: IEditorProgressService,
 	) {
 		super(
 			MultiDiffEditor.ID,
@@ -139,6 +142,17 @@ export class MultiDiffEditor extends AbstractEditorWithViewState<IMultiDiffEdito
 	public tryGetCodeEditor(resource: URI): { diffEditor: IDiffEditor; editor: ICodeEditor } | undefined {
 		return this._multiDiffEditorWidget!.tryGetCodeEditor(resource);
 	}
+
+	public findDocumentDiffItem(resource: URI): MultiDiffEditorItem | undefined {
+		const i = this._multiDiffEditorWidget!.findDocumentDiffItem(resource);
+		if (!i) { return undefined; }
+		const i2 = i as IDocumentDiffItemWithMultiDiffEditorItem;
+		return i2.multiDiffEditorItem;
+	}
+
+	public async showWhile(promise: Promise<unknown>): Promise<void> {
+		return this.editorProgressService.showWhile(promise);
+	}
 }
 
 
diff --git a/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.ts b/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.ts
index 5aa58b14e81..0ab8f25019b 100644
--- a/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.ts
+++ b/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.ts
@@ -3,34 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { LazyStatefulPromise, raceTimeout } from 'vs/base/common/async';
-import { BugIndicatingError, onUnexpectedError } from 'vs/base/common/errors';
-import { Event, ValueWithChangeEvent } from 'vs/base/common/event';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { Disposable, DisposableStore, IDisposable, IReference, toDisposable } from 'vs/base/common/lifecycle';
-import { parse } from 'vs/base/common/marshalling';
-import { Schemas } from 'vs/base/common/network';
-import { deepClone } from 'vs/base/common/objects';
-import { ObservableLazyPromise, autorun, derived, observableFromEvent, observableValue } from 'vs/base/common/observable';
-import { ValueWithChangeEventFromObservable, constObservable, mapObservableArrayCached, observableFromValueWithChangeEvent, recomputeInitiallyAndOnChange } from 'vs/base/common/observableInternal/utils';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { isDefined, isObject } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { ConstLazyPromise, IDocumentDiffItem, IMultiDiffEditorModel, LazyPromise } from 'vs/editor/browser/widget/multiDiffEditor/model';
-import { MultiDiffEditorViewModel } from 'vs/editor/browser/widget/multiDiffEditor/multiDiffEditorViewModel';
-import { IDiffEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { IResolvedTextEditorModel, ITextModelService } from 'vs/editor/common/services/resolverService';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { localize } from 'vs/nls';
-import { ConfirmResult } from 'vs/platform/dialogs/common/dialogs';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IEditorConfiguration } from 'vs/workbench/browser/parts/editor/textEditor';
-import { DEFAULT_EDITOR_ASSOCIATION, EditorInputCapabilities, EditorInputWithOptions, GroupIdentifier, IEditorSerializer, IResourceMultiDiffEditorInput, IRevertOptions, ISaveOptions, IUntypedEditorInput } from 'vs/workbench/common/editor';
-import { EditorInput, IEditorCloseHandler } from 'vs/workbench/common/editor/editorInput';
-import { MultiDiffEditorIcon } from 'vs/workbench/contrib/multiDiffEditor/browser/icons.contribution';
-import { IMultiDiffSourceResolverService, IResolvedMultiDiffSource, MultiDiffEditorItem } from 'vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService';
-import { IEditorResolverService, RegisteredEditorPriority } from 'vs/workbench/services/editor/common/editorResolverService';
-import { ILanguageSupport, ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
+import { LazyStatefulPromise, raceTimeout } from '../../../../base/common/async.js';
+import { BugIndicatingError, onUnexpectedError } from '../../../../base/common/errors.js';
+import { Event, ValueWithChangeEvent } from '../../../../base/common/event.js';
+import { IMarkdownString } from '../../../../base/common/htmlContent.js';
+import { Disposable, DisposableStore, IDisposable, IReference } from '../../../../base/common/lifecycle.js';
+import { parse } from '../../../../base/common/marshalling.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { deepClone } from '../../../../base/common/objects.js';
+import { ObservableLazyPromise, ValueWithChangeEventFromObservable, autorun, constObservable, derived, mapObservableArrayCached, observableFromEvent, observableFromValueWithChangeEvent, observableValue, recomputeInitiallyAndOnChange } from '../../../../base/common/observable.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { isDefined, isObject } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { RefCounted } from '../../../../editor/browser/widget/diffEditor/utils.js';
+import { IDocumentDiffItem, IMultiDiffEditorModel } from '../../../../editor/browser/widget/multiDiffEditor/model.js';
+import { MultiDiffEditorViewModel } from '../../../../editor/browser/widget/multiDiffEditor/multiDiffEditorViewModel.js';
+import { IDiffEditorOptions } from '../../../../editor/common/config/editorOptions.js';
+import { IResolvedTextEditorModel, ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { localize } from '../../../../nls.js';
+import { ConfirmResult } from '../../../../platform/dialogs/common/dialogs.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IEditorConfiguration } from '../../../browser/parts/editor/textEditor.js';
+import { DEFAULT_EDITOR_ASSOCIATION, EditorInputCapabilities, EditorInputWithOptions, GroupIdentifier, IEditorSerializer, IResourceMultiDiffEditorInput, IRevertOptions, ISaveOptions, IUntypedEditorInput } from '../../../common/editor.js';
+import { EditorInput, IEditorCloseHandler } from '../../../common/editor/editorInput.js';
+import { IEditorResolverService, RegisteredEditorPriority } from '../../../services/editor/common/editorResolverService.js';
+import { ILanguageSupport, ITextFileEditorModel, ITextFileService } from '../../../services/textfile/common/textfiles.js';
+import { MultiDiffEditorIcon } from './icons.contribution.js';
+import { IMultiDiffSourceResolverService, IResolvedMultiDiffSource, MultiDiffEditorItem } from './multiDiffSourceResolverService.js';
 
 export class MultiDiffEditorInput extends EditorInput implements ILanguageSupport {
 	public static fromResourceMultiDiffEditorInput(input: IResourceMultiDiffEditorInput, instantiationService: IInstantiationService): MultiDiffEditorInput {
@@ -46,6 +46,7 @@ export class MultiDiffEditorInput extends EditorInput implements ILanguageSuppor
 				return new MultiDiffEditorItem(
 					resource.original.resource,
 					resource.modified.resource,
+					resource.goToFileResource,
 				);
 			}),
 			input.isTransient ?? false
@@ -60,6 +61,7 @@ export class MultiDiffEditorInput extends EditorInput implements ILanguageSuppor
 			data.resources?.map(resource => new MultiDiffEditorItem(
 				resource.originalUri ? URI.parse(resource.originalUri) : undefined,
 				resource.modifiedUri ? URI.parse(resource.modifiedUri) : undefined,
+				resource.goToFileUri ? URI.parse(resource.goToFileUri) : undefined,
 			)),
 			false
 		);
@@ -112,15 +114,16 @@ export class MultiDiffEditorInput extends EditorInput implements ILanguageSuppor
 			label: this.label,
 			multiDiffSourceUri: this.multiDiffSource.toString(),
 			resources: this.initialResources?.map(resource => ({
-				originalUri: resource.original?.toString(),
-				modifiedUri: resource.modified?.toString(),
+				originalUri: resource.originalUri?.toString(),
+				modifiedUri: resource.modifiedUri?.toString(),
+				goToFileUri: resource.goToFileUri?.toString(),
 			})),
 		};
 	}
 
 	public setLanguageId(languageId: string, source?: string | undefined): void {
 		const activeDiffItem = this._viewModel.requireValue().activeDiffItem.get();
-		const value = activeDiffItem?.entry?.value;
+		const value = activeDiffItem?.documentDiffItem;
 		if (!value) { return; }
 		const target = value.modified ?? value.original;
 		if (!target) { return; }
@@ -144,26 +147,20 @@ export class MultiDiffEditorInput extends EditorInput implements ILanguageSuppor
 		const source = await this._resolvedSource.getPromise();
 		const textResourceConfigurationService = this._textResourceConfigurationService;
 
-		// Enables delayed disposing
-		const garbage = new DisposableStore();
-
 		const documentsWithPromises = mapObservableArrayCached(this, source.resources, async (r, store) => {
 			/** @description documentsWithPromises */
 			let original: IReference<IResolvedTextEditorModel> | undefined;
 			let modified: IReference<IResolvedTextEditorModel> | undefined;
-			const store2 = new DisposableStore();
-			store.add(toDisposable(() => {
-				// Mark the text model references as garbage when they get stale (don't dispose them yet)
-				garbage.add(store2);
-			}));
+
+			const multiDiffItemStore = new DisposableStore();
 
 			try {
 				[original, modified] = await Promise.all([
-					r.original ? this._textModelService.createModelReference(r.original) : undefined,
-					r.modified ? this._textModelService.createModelReference(r.modified) : undefined,
+					r.originalUri ? this._textModelService.createModelReference(r.originalUri) : undefined,
+					r.modifiedUri ? this._textModelService.createModelReference(r.modifiedUri) : undefined,
 				]);
-				if (original) { store2.add(original); }
-				if (modified) { store2.add(modified); }
+				if (original) { multiDiffItemStore.add(original); }
+				if (modified) { multiDiffItemStore.add(modified); }
 			} catch (e) {
 				// e.g. "File seems to be binary and cannot be opened as text"
 				console.error(e);
@@ -171,10 +168,12 @@ export class MultiDiffEditorInput extends EditorInput implements ILanguageSuppor
 				return undefined;
 			}
 
-			const uri = (r.modified ?? r.original)!;
-			return new ConstLazyPromise<IDocumentDiffItem>({
+			const uri = (r.modifiedUri ?? r.originalUri)!;
+			const result: IDocumentDiffItemWithMultiDiffEditorItem = {
+				multiDiffEditorItem: r,
 				original: original?.object.textEditorModel,
 				modified: modified?.object.textEditorModel,
+				contextKeys: r.contextKeys,
 				get options() {
 					return {
 						...getReadonlyConfiguration(modified?.object.isReadonly() ?? true),
@@ -186,10 +185,11 @@ export class MultiDiffEditorInput extends EditorInput implements ILanguageSuppor
 						h();
 					}
 				}),
-			});
-		}, i => JSON.stringify([i.modified?.toString(), i.original?.toString()]));
+			};
+			return store.add(RefCounted.createOfNonDisposable(result, multiDiffItemStore, this));
+		}, i => JSON.stringify([i.modifiedUri?.toString(), i.originalUri?.toString()]));
 
-		const documents = observableValue<readonly LazyPromise<IDocumentDiffItem>[]>('documents', []);
+		const documents = observableValue<readonly RefCounted<IDocumentDiffItem>[] | 'loading'>('documents', 'loading');
 
 		const updateDocuments = derived(async reader => {
 			/** @description Update documents */
@@ -197,18 +197,13 @@ export class MultiDiffEditorInput extends EditorInput implements ILanguageSuppor
 			const docs = await Promise.all(docsPromises);
 			const newDocuments = docs.filter(isDefined);
 			documents.set(newDocuments, undefined);
-
-			garbage.clear(); // Only dispose text models after the documents have been updated
 		});
 
 		const a = recomputeInitiallyAndOnChange(updateDocuments);
 		await updateDocuments.get();
 
 		const result: IMultiDiffEditorModel & IDisposable = {
-			dispose: () => {
-				a.dispose();
-				garbage.dispose();
-			},
+			dispose: () => a.dispose(),
 			documents: new ValueWithChangeEventFromObservable(documents),
 			contextKeys: source.source?.contextKeys,
 		};
@@ -238,9 +233,16 @@ export class MultiDiffEditorInput extends EditorInput implements ILanguageSuppor
 	}
 
 	public readonly resources = derived(this, reader => this._resolvedSource.cachedPromiseResult.read(reader)?.data?.resources.read(reader));
+
+	private readonly textFileServiceOnDidChange = new FastEventDispatcher<ITextFileEditorModel, URI>(
+		this._textFileService.files.onDidChangeDirty,
+		item => item.resource.toString(),
+		uri => uri.toString()
+	);
+
 	private readonly _isDirtyObservables = mapObservableArrayCached(this, this.resources.map(r => r ?? []), res => {
-		const isModifiedDirty = res.modified ? isUriDirty(this._textFileService, res.modified) : constObservable(false);
-		const isOriginalDirty = res.original ? isUriDirty(this._textFileService, res.original) : constObservable(false);
+		const isModifiedDirty = res.modifiedUri ? isUriDirty(this.textFileServiceOnDidChange, this._textFileService, res.modifiedUri) : constObservable(false);
+		const isOriginalDirty = res.originalUri ? isUriDirty(this.textFileServiceOnDidChange, this._textFileService, res.originalUri) : constObservable(false);
 		return derived(reader => /** @description modifiedDirty||originalDirty */ isModifiedDirty.read(reader) || isOriginalDirty.read(reader));
 	}, i => i.getKey());
 	private readonly _isDirtyObservable = derived(this, reader => this._isDirtyObservables.read(reader).some(isDirty => isDirty.read(reader)))
@@ -291,11 +293,71 @@ export class MultiDiffEditorInput extends EditorInput implements ILanguageSuppor
 	};
 }
 
-function isUriDirty(textFileService: ITextFileService, uri: URI) {
-	return observableFromEvent(
-		Event.filter(textFileService.files.onDidChangeDirty, e => e.resource.toString() === uri.toString()),
-		() => textFileService.isDirty(uri)
-	);
+export interface IDocumentDiffItemWithMultiDiffEditorItem extends IDocumentDiffItem {
+	multiDiffEditorItem: MultiDiffEditorItem;
+}
+
+/**
+ * Uses a map to efficiently dispatch events to listeners that are interested in a specific key.
+*/
+class FastEventDispatcher<T, TKey> {
+	private _count = 0;
+	private readonly _buckets = new Map<string, Set<(value: T) => void>>();
+
+	private _eventSubscription: IDisposable | undefined;
+
+	constructor(
+		private readonly _event: Event<T>,
+		private readonly _getEventArgsKey: (item: T) => string,
+		private readonly _keyToString: (key: TKey) => string,
+	) {
+	}
+
+	public filteredEvent(filter: TKey): (listener: (e: T) => unknown) => IDisposable {
+		return listener => {
+			const key = this._keyToString(filter);
+			let bucket = this._buckets.get(key);
+			if (!bucket) {
+				bucket = new Set();
+				this._buckets.set(key, bucket);
+			}
+			bucket.add(listener);
+
+			this._count++;
+			if (this._count === 1) {
+				this._eventSubscription = this._event(this._handleEventChange);
+			}
+
+			return {
+				dispose: () => {
+					bucket!.delete(listener);
+					if (bucket!.size === 0) {
+						this._buckets.delete(key);
+					}
+					this._count--;
+
+					if (this._count === 0) {
+						this._eventSubscription?.dispose();
+						this._eventSubscription = undefined;
+					}
+				}
+			};
+		};
+	}
+
+	private readonly _handleEventChange = (e: T) => {
+		const key = this._getEventArgsKey(e);
+		const bucket = this._buckets.get(key);
+		if (bucket) {
+			for (const listener of bucket) {
+				listener(e);
+			}
+		}
+	};
+}
+
+function isUriDirty(onDidChangeDirty: FastEventDispatcher<ITextFileEditorModel, URI>, textFileService: ITextFileService, uri: URI) {
+	return observableFromEvent(onDidChangeDirty.filteredEvent(uri), () => textFileService.isDirty(uri));
 }
 
 function getReadonlyConfiguration(isReadonly: boolean | IMarkdownString | undefined): { readOnly: boolean; readOnlyMessage: IMarkdownString | undefined } {
@@ -361,6 +423,7 @@ interface ISerializedMultiDiffEditorInput {
 	resources: {
 		originalUri: string | undefined;
 		modifiedUri: string | undefined;
+		goToFileUri: string | undefined;
 	}[] | undefined;
 }
 
diff --git a/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.ts b/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.ts
index 43f2f3eb899..615a07713ff 100644
--- a/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.ts
+++ b/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BugIndicatingError } from 'vs/base/common/errors';
-import { IValueWithChangeEvent } from 'vs/base/common/event';
-import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { ContextKeyValue } from 'vs/platform/contextkey/common/contextkey';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { BugIndicatingError } from '../../../../base/common/errors.js';
+import { IValueWithChangeEvent } from '../../../../base/common/event.js';
+import { IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ContextKeyValue } from '../../../../platform/contextkey/common/contextkey.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 
 export const IMultiDiffSourceResolverService = createDecorator<IMultiDiffSourceResolverService>('multiDiffSourceResolverService');
 
@@ -33,16 +33,18 @@ export interface IResolvedMultiDiffSource {
 
 export class MultiDiffEditorItem {
 	constructor(
-		readonly original: URI | undefined,
-		readonly modified: URI | undefined,
+		readonly originalUri: URI | undefined,
+		readonly modifiedUri: URI | undefined,
+		readonly goToFileUri: URI | undefined,
+		readonly contextKeys?: Record<string, ContextKeyValue>
 	) {
-		if (!original && !modified) {
+		if (!originalUri && !modifiedUri) {
 			throw new BugIndicatingError('Invalid arguments');
 		}
 	}
 
 	getKey(): string {
-		return JSON.stringify([this.modified?.toString(), this.original?.toString()]);
+		return JSON.stringify([this.modifiedUri?.toString(), this.originalUri?.toString()]);
 	}
 }
 
diff --git a/src/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver.ts b/src/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver.ts
index a53d4d6c346..cdd3aac6b29 100644
--- a/src/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver.ts
+++ b/src/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { observableFromEvent, waitForState } from 'vs/base/common/observable';
-import { ValueWithChangeEventFromObservable } from 'vs/base/common/observableInternal/utils';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { IMultiDiffEditorOptions } from 'vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl';
-import { localize2 } from 'vs/nls';
-import { Action2 } from 'vs/platform/actions/common/actions';
-import { ContextKeyValue } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IMultiDiffSourceResolver, IMultiDiffSourceResolverService, IResolvedMultiDiffSource, MultiDiffEditorItem } from 'vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService';
-import { ISCMRepository, ISCMResourceGroup, ISCMService } from 'vs/workbench/contrib/scm/common/scm';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { observableFromEvent, ValueWithChangeEventFromObservable, waitForState } from '../../../../base/common/observable.js';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
+import { IMultiDiffEditorOptions } from '../../../../editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.js';
+import { localize2 } from '../../../../nls.js';
+import { Action2 } from '../../../../platform/actions/common/actions.js';
+import { ContextKeyValue } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IActivityService, ProgressBadge } from '../../../services/activity/common/activity.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { ISCMRepository, ISCMResourceGroup, ISCMService } from '../../scm/common/scm.js';
+import { IMultiDiffSourceResolver, IMultiDiffSourceResolverService, IResolvedMultiDiffSource, MultiDiffEditorItem } from './multiDiffSourceResolverService.js';
 
 export class ScmMultiDiffSourceResolver implements IMultiDiffSourceResolver {
 	private static readonly _scheme = 'scm-multi-diff-source';
@@ -52,6 +52,7 @@ export class ScmMultiDiffSourceResolver implements IMultiDiffSourceResolver {
 
 	constructor(
 		@ISCMService private readonly _scmService: ISCMService,
+		@IActivityService private readonly _activityService: IActivityService,
 	) {
 	}
 
@@ -61,14 +62,23 @@ export class ScmMultiDiffSourceResolver implements IMultiDiffSourceResolver {
 
 	async resolveDiffSource(uri: URI): Promise<IResolvedMultiDiffSource> {
 		const { repositoryUri, groupId } = ScmMultiDiffSourceResolver.parseUri(uri)!;
-		const repository = await waitForState(observableFromEvent(
+
+		const repository = await waitForState(observableFromEvent(this,
 			this._scmService.onDidAddRepository,
 			() => [...this._scmService.repositories].find(r => r.provider.rootUri?.toString() === repositoryUri.toString()))
 		);
-		const group = await waitForState(observableFromEvent(
+		const group = await waitForState(observableFromEvent(this,
 			repository.provider.onDidChangeResourceGroups,
 			() => repository.provider.groups.find(g => g.id === groupId)
 		));
+
+		const scmActivities = observableFromEvent(
+			this._activityService.onDidChangeActivity,
+			() => [...this._activityService.getViewContainerActivities('workbench.view.scm')],
+		);
+		const scmViewHasNoProgressBadge = scmActivities.map(activities => !activities.some(a => a.badge instanceof ProgressBadge));
+		await waitForState(scmViewHasNoProgressBadge, v => v);
+
 		return new ScmResolvedMultiDiffSource(group, repository);
 	}
 }
@@ -76,7 +86,7 @@ export class ScmMultiDiffSourceResolver implements IMultiDiffSourceResolver {
 class ScmResolvedMultiDiffSource implements IResolvedMultiDiffSource {
 	private readonly _resources = observableFromEvent<MultiDiffEditorItem[]>(
 		this._group.onDidChangeResources,
-		() => /** @description resources */ this._group.resources.map(e => new MultiDiffEditorItem(e.multiDiffEditorOriginalUri, e.multiDiffEditorModifiedUri))
+		() => /** @description resources */ this._group.resources.map(e => new MultiDiffEditorItem(e.multiDiffEditorOriginalUri, e.multiDiffEditorModifiedUri, e.sourceUri))
 	);
 	readonly resources = new ValueWithChangeEventFromObservable(this._resources);
 
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands.ts b/src/vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands.ts
index 77a91525426..261c8021562 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Mimes } from 'vs/base/common/mime';
-import { IBulkEditService, ResourceTextEdit } from 'vs/editor/browser/services/bulkEditService';
-import { localize, localize2 } from 'vs/nls';
-import { MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { InputFocusedContext, InputFocusedContextKey } from 'vs/platform/contextkey/common/contextkeys';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ResourceNotebookCellEdit } from 'vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
-import { changeCellToKind, computeCellLinesContents, copyCellRange, joinCellsWithSurrounds, joinSelectedCells, moveCellRange } from 'vs/workbench/contrib/notebook/browser/controller/cellOperations';
-import { cellExecutionArgs, CellOverflowToolbarGroups, CellToolbarOrder, CELL_TITLE_CELL_GROUP_ID, INotebookCellActionContext, INotebookCellToolbarActionContext, INotebookCommandContext, NotebookCellAction, NotebookMultiCellAction, parseMultiCellExecutionArgs } from 'vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { CellFocusMode, EXPAND_CELL_INPUT_COMMAND_ID, EXPAND_CELL_OUTPUT_COMMAND_ID, ICellOutputViewModel, ICellViewModel, INotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NOTEBOOK_CELL_EDITABLE, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_INPUT_COLLAPSED, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_OUTPUT_COLLAPSED, NOTEBOOK_CELL_TYPE, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_OUTPUT_FOCUSED } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
-import * as icons from 'vs/workbench/contrib/notebook/browser/notebookIcons';
-import { CellEditType, CellKind, NotebookSetting } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { KeyChord, KeyCode, KeyMod } from '../../../../../../base/common/keyCodes.js';
+import { Mimes } from '../../../../../../base/common/mime.js';
+import { IBulkEditService, ResourceTextEdit } from '../../../../../../editor/browser/services/bulkEditService.js';
+import { localize, localize2 } from '../../../../../../nls.js';
+import { MenuId, registerAction2 } from '../../../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { InputFocusedContext, InputFocusedContextKey } from '../../../../../../platform/contextkey/common/contextkeys.js';
+import { ServicesAccessor } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ResourceNotebookCellEdit } from '../../../../bulkEdit/browser/bulkCellEdits.js';
+import { changeCellToKind, computeCellLinesContents, copyCellRange, joinCellsWithSurrounds, joinSelectedCells, moveCellRange } from '../../controller/cellOperations.js';
+import { cellExecutionArgs, CellOverflowToolbarGroups, CellToolbarOrder, CELL_TITLE_CELL_GROUP_ID, INotebookCellActionContext, INotebookCellToolbarActionContext, INotebookCommandContext, NotebookCellAction, NotebookMultiCellAction, parseMultiCellExecutionArgs } from '../../controller/coreActions.js';
+import { CellFocusMode, EXPAND_CELL_INPUT_COMMAND_ID, EXPAND_CELL_OUTPUT_COMMAND_ID, ICellOutputViewModel, ICellViewModel, INotebookEditor } from '../../notebookBrowser.js';
+import { NOTEBOOK_CELL_EDITABLE, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_INPUT_COLLAPSED, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_OUTPUT_COLLAPSED, NOTEBOOK_CELL_TYPE, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_OUTPUT_FOCUSED } from '../../../common/notebookContextKeys.js';
+import * as icons from '../../notebookIcons.js';
+import { CellEditType, CellKind, NotebookSetting } from '../../../common/notebookCommon.js';
+import { INotificationService } from '../../../../../../platform/notification/common/notification.js';
+import { EditorContextKeys } from '../../../../../../editor/common/editorContextKeys.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
 
 //#region Move/Copy cells
 const MOVE_CELL_UP_COMMAND_ID = 'notebook.cell.moveUp';
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticEditorContrib.ts b/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticEditorContrib.ts
index 79608fb88b4..d5af8a45494 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticEditorContrib.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticEditorContrib.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IMarkerData, IMarkerService } from 'vs/platform/markers/common/markers';
-import { IRange } from 'vs/editor/common/core/range';
-import { ICellExecutionError, ICellExecutionStateChangedEvent, IExecutionStateChangedEvent, INotebookExecutionStateService, NotebookExecutionType } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { CellKind, NotebookSetting } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotebookEditor, INotebookEditorContribution } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { registerNotebookContribution } from 'vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
-import { Iterable } from 'vs/base/common/iterator';
-import { CodeCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
-import { URI } from 'vs/base/common/uri';
-import { Event } from 'vs/base/common/event';
-import { IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
+import { Disposable, IDisposable, toDisposable } from '../../../../../../base/common/lifecycle.js';
+import { IMarkerData, IMarkerService } from '../../../../../../platform/markers/common/markers.js';
+import { IRange } from '../../../../../../editor/common/core/range.js';
+import { ICellExecutionError, ICellExecutionStateChangedEvent, IExecutionStateChangedEvent, INotebookExecutionStateService, NotebookExecutionType } from '../../../common/notebookExecutionStateService.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { CellKind, NotebookSetting } from '../../../common/notebookCommon.js';
+import { INotebookEditor, INotebookEditorContribution } from '../../notebookBrowser.js';
+import { registerNotebookContribution } from '../../notebookEditorExtensions.js';
+import { Iterable } from '../../../../../../base/common/iterator.js';
+import { CodeCellViewModel } from '../../viewModel/codeCellViewModel.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { Event } from '../../../../../../base/common/event.js';
+import { IChatAgentService } from '../../../../chat/common/chatAgents.js';
 
 type CellDiagnostic = {
 	cellUri: URI;
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnostics.ts b/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnostics.ts
index 90606e10022..de30b6a874d 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnostics.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnostics.ts
@@ -3,6 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticEditorContrib';
-import 'vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticsActions';
-import 'vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/diagnosticCellStatusBarContrib';
+import './cellDiagnosticEditorContrib.js';
+import './cellDiagnosticsActions.js';
+import './diagnosticCellStatusBarContrib.js';
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticsActions.ts b/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticsActions.ts
index 1ab2deeb139..f619c126da2 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticsActions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticsActions.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { Range } from 'vs/editor/common/core/range';
-import { CodeActionController } from 'vs/editor/contrib/codeAction/browser/codeActionController';
-import { CodeActionKind, CodeActionTriggerSource } from 'vs/editor/contrib/codeAction/common/types';
-import { localize, localize2 } from 'vs/nls';
-import { registerAction2 } from 'vs/platform/actions/common/actions';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { INotebookCellActionContext, NotebookCellAction, findTargetCellEditor } from 'vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { CodeCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
-import { NOTEBOOK_CELL_EDITOR_FOCUSED, NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { KeyCode, KeyMod } from '../../../../../../base/common/keyCodes.js';
+import { ServicesAccessor } from '../../../../../../editor/browser/editorExtensions.js';
+import { Range } from '../../../../../../editor/common/core/range.js';
+import { CodeActionController } from '../../../../../../editor/contrib/codeAction/browser/codeActionController.js';
+import { CodeActionKind, CodeActionTriggerSource } from '../../../../../../editor/contrib/codeAction/common/types.js';
+import { localize, localize2 } from '../../../../../../nls.js';
+import { registerAction2 } from '../../../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { KeybindingWeight } from '../../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { INotebookCellActionContext, NotebookCellAction, findTargetCellEditor } from '../../controller/coreActions.js';
+import { CodeCellViewModel } from '../../viewModel/codeCellViewModel.js';
+import { NOTEBOOK_CELL_EDITOR_FOCUSED, NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS } from '../../../common/notebookContextKeys.js';
 
 export const OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID = 'notebook.cell.openFailureActions';
 
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/diagnosticCellStatusBarContrib.ts b/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/diagnosticCellStatusBarContrib.ts
index e43479243b9..561addf90df 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/diagnosticCellStatusBarContrib.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/diagnosticCellStatusBarContrib.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { autorun } from 'vs/base/common/observable';
-import { localize } from 'vs/nls';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID } from 'vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticsActions';
-import { NotebookStatusBarController } from 'vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController';
-import { INotebookEditor, INotebookEditorContribution, INotebookViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { registerNotebookContribution } from 'vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
-import { CodeCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
-import { INotebookCellStatusBarItem, CellStatusbarAlignment } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { ICellExecutionError } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { autorun } from '../../../../../../base/common/observable.js';
+import { localize } from '../../../../../../nls.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../../../platform/keybinding/common/keybinding.js';
+import { OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID } from './cellDiagnosticsActions.js';
+import { NotebookStatusBarController } from '../cellStatusBar/executionStatusBarItemController.js';
+import { INotebookEditor, INotebookEditorContribution, INotebookViewModel } from '../../notebookBrowser.js';
+import { registerNotebookContribution } from '../../notebookEditorExtensions.js';
+import { CodeCellViewModel } from '../../viewModel/codeCellViewModel.js';
+import { INotebookCellStatusBarItem, CellStatusbarAlignment } from '../../../common/notebookCommon.js';
+import { ICellExecutionError } from '../../../common/notebookExecutionStateService.js';
 
 export class DiagnosticCellStatusBarContrib extends Disposable implements INotebookEditorContribution {
 	static id: string = 'workbench.notebook.statusBar.diagtnostic';
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/contributedStatusBarItemController.ts b/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/contributedStatusBarItemController.ts
index 77251f6aff3..f7a0408ad32 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/contributedStatusBarItemController.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/contributedStatusBarItemController.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Throttler } from 'vs/base/common/async';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { NotebookVisibleCellObserver } from 'vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/notebookVisibleCellObserver';
-import { ICellViewModel, INotebookEditor, INotebookEditorContribution, INotebookViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { registerNotebookContribution } from 'vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
-import { INotebookCellStatusBarService } from 'vs/workbench/contrib/notebook/common/notebookCellStatusBarService';
-import { INotebookCellStatusBarItemList } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { Throttler } from '../../../../../../base/common/async.js';
+import { CancellationTokenSource } from '../../../../../../base/common/cancellation.js';
+import { Disposable, toDisposable } from '../../../../../../base/common/lifecycle.js';
+import { NotebookVisibleCellObserver } from './notebookVisibleCellObserver.js';
+import { ICellViewModel, INotebookEditor, INotebookEditorContribution, INotebookViewModel } from '../../notebookBrowser.js';
+import { registerNotebookContribution } from '../../notebookEditorExtensions.js';
+import { INotebookCellStatusBarService } from '../../../common/notebookCellStatusBarService.js';
+import { INotebookCellStatusBarItemList } from '../../../common/notebookCommon.js';
 
 export class ContributedStatusBarItemController extends Disposable implements INotebookEditorContribution {
 	static id: string = 'workbench.notebook.statusBar.contributed';
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController.ts b/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController.ts
index 721b711f5d2..ece78349224 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { disposableTimeout, RunOnceScheduler } from 'vs/base/common/async';
-import { Disposable, dispose, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { language } from 'vs/base/common/platform';
-import { localize } from 'vs/nls';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { themeColorFromId } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { ICellVisibilityChangeEvent, NotebookVisibleCellObserver } from 'vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/notebookVisibleCellObserver';
-import { ICellViewModel, INotebookEditor, INotebookEditorContribution, INotebookViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { registerNotebookContribution } from 'vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
-import { cellStatusIconError, cellStatusIconSuccess } from 'vs/workbench/contrib/notebook/browser/notebookEditorWidget';
-import { errorStateIcon, executingStateIcon, pendingStateIcon, successStateIcon } from 'vs/workbench/contrib/notebook/browser/notebookIcons';
-import { CellStatusbarAlignment, INotebookCellStatusBarItem, NotebookCellExecutionState, NotebookCellInternalMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotebookCellExecution, INotebookExecutionStateService, NotebookExecutionType } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
-import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
+import { disposableTimeout, RunOnceScheduler } from '../../../../../../base/common/async.js';
+import { Disposable, dispose, IDisposable, MutableDisposable } from '../../../../../../base/common/lifecycle.js';
+import { language } from '../../../../../../base/common/platform.js';
+import { localize } from '../../../../../../nls.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { themeColorFromId } from '../../../../../../platform/theme/common/themeService.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { ICellVisibilityChangeEvent, NotebookVisibleCellObserver } from './notebookVisibleCellObserver.js';
+import { ICellViewModel, INotebookEditor, INotebookEditorContribution, INotebookViewModel } from '../../notebookBrowser.js';
+import { registerNotebookContribution } from '../../notebookEditorExtensions.js';
+import { cellStatusIconError, cellStatusIconSuccess } from '../../notebookEditorWidget.js';
+import { errorStateIcon, executingStateIcon, pendingStateIcon, successStateIcon } from '../../notebookIcons.js';
+import { CellStatusbarAlignment, INotebookCellStatusBarItem, NotebookCellExecutionState, NotebookCellInternalMetadata } from '../../../common/notebookCommon.js';
+import { INotebookCellExecution, INotebookExecutionStateService, NotebookExecutionType } from '../../../common/notebookExecutionStateService.js';
+import { INotebookService } from '../../../common/notebookService.js';
+import { IMarkdownString } from '../../../../../../base/common/htmlContent.js';
 
 export function formatCellDuration(duration: number, showMilliseconds: boolean = true): string {
 	if (showMilliseconds && duration < 1000) {
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/notebookVisibleCellObserver.ts b/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/notebookVisibleCellObserver.ts
index ba96e077b99..727852300ee 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/notebookVisibleCellObserver.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/notebookVisibleCellObserver.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { diffSets } from 'vs/base/common/collections';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { isDefined } from 'vs/base/common/types';
-import { ICellViewModel, INotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { cellRangesToIndexes } from 'vs/workbench/contrib/notebook/common/notebookRange';
+import { diffSets } from '../../../../../../base/common/collections.js';
+import { Emitter } from '../../../../../../base/common/event.js';
+import { Disposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { isDefined } from '../../../../../../base/common/types.js';
+import { ICellViewModel, INotebookEditor } from '../../notebookBrowser.js';
+import { cellRangesToIndexes } from '../../../common/notebookRange.js';
 
 export interface ICellVisibilityChangeEvent {
 	added: ICellViewModel[];
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/statusBarProviders.ts b/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/statusBarProviders.ts
index 6f3874d0acd..4434091f38d 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/statusBarProviders.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/statusBarProviders.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ResourceMap } from 'vs/base/common/map';
-import { URI } from 'vs/base/common/uri';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { localize } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
-import { CHANGE_CELL_LANGUAGE, DETECT_CELL_LANGUAGE } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { INotebookCellStatusBarService } from 'vs/workbench/contrib/notebook/common/notebookCellStatusBarService';
-import { CellKind, CellStatusbarAlignment, INotebookCellStatusBarItem, INotebookCellStatusBarItemList, INotebookCellStatusBarItemProvider } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotebookKernelService } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
-import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
-import { ILanguageDetectionService, LanguageDetectionHintConfig } from 'vs/workbench/services/languageDetection/common/languageDetectionWorkerService';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { CancellationToken } from '../../../../../../base/common/cancellation.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../../../base/common/map.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { ILanguageService } from '../../../../../../editor/common/languages/language.js';
+import { localize } from '../../../../../../nls.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../../../platform/keybinding/common/keybinding.js';
+import { Registry } from '../../../../../../platform/registry/common/platform.js';
+import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry } from '../../../../../common/contributions.js';
+import { CHANGE_CELL_LANGUAGE, DETECT_CELL_LANGUAGE } from '../../notebookBrowser.js';
+import { INotebookCellStatusBarService } from '../../../common/notebookCellStatusBarService.js';
+import { CellKind, CellStatusbarAlignment, INotebookCellStatusBarItem, INotebookCellStatusBarItemList, INotebookCellStatusBarItemProvider } from '../../../common/notebookCommon.js';
+import { INotebookKernelService } from '../../../common/notebookKernelService.js';
+import { INotebookService } from '../../../common/notebookService.js';
+import { ILanguageDetectionService, LanguageDetectionHintConfig } from '../../../../../services/languageDetection/common/languageDetectionWorkerService.js';
+import { LifecyclePhase } from '../../../../../services/lifecycle/common/lifecycle.js';
 
 class CellStatusBarLanguagePickerProvider implements INotebookCellStatusBarItemProvider {
 
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/clipboard/cellOutputClipboard.ts b/src/vs/workbench/contrib/notebook/browser/contrib/clipboard/cellOutputClipboard.ts
index a544461cc28..9b877b758bf 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/clipboard/cellOutputClipboard.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/clipboard/cellOutputClipboard.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ICellOutputViewModel, ICellViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { isTextStreamMime } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { IClipboardService } from '../../../../../../platform/clipboard/common/clipboardService.js';
+import { ILogService } from '../../../../../../platform/log/common/log.js';
+import { ICellOutputViewModel, ICellViewModel } from '../../notebookBrowser.js';
+import { isTextStreamMime } from '../../../common/notebookCommon.js';
 
 export async function copyCellOutput(mimeType: string | undefined, outputViewModel: ICellOutputViewModel, clipboardService: IClipboardService, logService: ILogService) {
 	const cellOutput = outputViewModel.model;
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/clipboard/notebookClipboard.ts b/src/vs/workbench/contrib/notebook/browser/contrib/clipboard/notebookClipboard.ts
index 8aa8b3f3319..4f4673e1990 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/clipboard/notebookClipboard.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/clipboard/notebookClipboard.ts
@@ -3,32 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize, localize2 } from 'vs/nls';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { NOTEBOOK_CELL_EDITABLE, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { cellRangeToViewCells, expandCellRangesWithHiddenCells, getNotebookEditorFromEditorPane, ICellViewModel, INotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CopyAction, CutAction, PasteAction } from 'vs/editor/contrib/clipboard/browser/clipboard';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { cloneNotebookCellTextModel, NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
-import { CellEditType, ICellEditOperation, ISelectionState, SelectionStateType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
-import * as platform from 'vs/base/common/platform';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { CellOverflowToolbarGroups, INotebookActionContext, INotebookCellActionContext, NotebookAction, NotebookCellAction, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, NOTEBOOK_OUTPUT_WEBVIEW_ACTION_WEIGHT } from 'vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { InputFocusedContextKey } from 'vs/platform/contextkey/common/contextkeys';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { RedoCommand, UndoCommand } from 'vs/editor/browser/editorExtensions';
-import { IWebview } from 'vs/workbench/contrib/webview/browser/webview';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { showWindowLogActionId } from 'vs/workbench/services/log/common/logConstants';
-import { getActiveElement, getWindow, isAncestor, isHTMLElement } from 'vs/base/browser/dom';
+import { localize, localize2 } from '../../../../../../nls.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { WorkbenchPhase, registerWorkbenchContribution2 } from '../../../../../common/contributions.js';
+import { IEditorService } from '../../../../../services/editor/common/editorService.js';
+import { NOTEBOOK_CELL_EDITABLE, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED } from '../../../common/notebookContextKeys.js';
+import { cellRangeToViewCells, expandCellRangesWithHiddenCells, getNotebookEditorFromEditorPane, ICellViewModel, INotebookEditor } from '../../notebookBrowser.js';
+import { CopyAction, CutAction, PasteAction } from '../../../../../../editor/contrib/clipboard/browser/clipboard.js';
+import { IClipboardService } from '../../../../../../platform/clipboard/common/clipboardService.js';
+import { cloneNotebookCellTextModel, NotebookCellTextModel } from '../../../common/model/notebookCellTextModel.js';
+import { CellEditType, ICellEditOperation, ISelectionState, SelectionStateType } from '../../../common/notebookCommon.js';
+import { INotebookService } from '../../../common/notebookService.js';
+import * as platform from '../../../../../../base/common/platform.js';
+import { Action2, MenuId, registerAction2 } from '../../../../../../platform/actions/common/actions.js';
+import { CellOverflowToolbarGroups, INotebookActionContext, INotebookCellActionContext, NotebookAction, NotebookCellAction, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, NOTEBOOK_OUTPUT_WEBVIEW_ACTION_WEIGHT } from '../../controller/coreActions.js';
+import { KeyCode, KeyMod } from '../../../../../../base/common/keyCodes.js';
+import { ContextKeyExpr } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { InputFocusedContextKey } from '../../../../../../platform/contextkey/common/contextkeys.js';
+import { KeybindingWeight } from '../../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ServicesAccessor } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { RedoCommand, UndoCommand } from '../../../../../../editor/browser/editorExtensions.js';
+import { IWebview } from '../../../../webview/browser/webview.js';
+import { Categories } from '../../../../../../platform/action/common/actionCommonCategories.js';
+import { ILogService } from '../../../../../../platform/log/common/log.js';
+import { ICommandService } from '../../../../../../platform/commands/common/commands.js';
+import { showWindowLogActionId } from '../../../../../services/log/common/logConstants.js';
+import { getActiveElement, getWindow, isAncestor, isEditableElement, isHTMLElement } from '../../../../../../base/browser/dom.js';
 
 let _logging: boolean = false;
 function toggleLogging() {
@@ -360,7 +360,7 @@ export class NotebookClipboardContribution extends Disposable {
 		const loggerService = accessor.get(ILogService);
 
 		const activeElement = getActiveElement();
-		if (isHTMLElement(activeElement) && ['input', 'textarea'].indexOf(activeElement.tagName.toLowerCase()) >= 0) {
+		if (isHTMLElement(activeElement) && isEditableElement(activeElement)) {
 			_log(loggerService, '[NotebookEditor] focus is on input or textarea element, bypass');
 			return false;
 		}
@@ -387,7 +387,7 @@ export class NotebookClipboardContribution extends Disposable {
 
 	runPasteAction(accessor: ServicesAccessor) {
 		const activeElement = <HTMLElement>getActiveElement();
-		if (activeElement && ['input', 'textarea'].indexOf(activeElement.tagName.toLowerCase()) >= 0) {
+		if (activeElement && isEditableElement(activeElement)) {
 			return false;
 		}
 
@@ -408,7 +408,7 @@ export class NotebookClipboardContribution extends Disposable {
 
 	runCutAction(accessor: ServicesAccessor) {
 		const activeElement = <HTMLElement>getActiveElement();
-		if (activeElement && ['input', 'textarea'].indexOf(activeElement.tagName.toLowerCase()) >= 0) {
+		if (activeElement && isEditableElement(activeElement)) {
 			return false;
 		}
 
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookBreakpoints.ts b/src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookBreakpoints.ts
index c1bb6fc300a..29b503e2639 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookBreakpoints.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookBreakpoints.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { ResourceMap } from 'vs/base/common/map';
-import { Schemas } from 'vs/base/common/network';
-import { isEqual } from 'vs/base/common/resources';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Extensions as WorkbenchExtensions, IWorkbenchContribution, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
-import { IBreakpoint, IDebugService } from 'vs/workbench/contrib/debug/common/debug';
-import { getNotebookEditorFromEditorPane } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { CellUri, NotebookCellsChangeType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { Disposable, IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../../../base/common/map.js';
+import { Schemas } from '../../../../../../base/common/network.js';
+import { isEqual } from '../../../../../../base/common/resources.js';
+import { Registry } from '../../../../../../platform/registry/common/platform.js';
+import { Extensions as WorkbenchExtensions, IWorkbenchContribution, IWorkbenchContributionsRegistry } from '../../../../../common/contributions.js';
+import { IBreakpoint, IDebugService } from '../../../../debug/common/debug.js';
+import { getNotebookEditorFromEditorPane } from '../../notebookBrowser.js';
+import { NotebookTextModel } from '../../../common/model/notebookTextModel.js';
+import { CellUri, NotebookCellsChangeType } from '../../../common/notebookCommon.js';
+import { INotebookService } from '../../../common/notebookService.js';
+import { IEditorService } from '../../../../../services/editor/common/editorService.js';
+import { LifecyclePhase } from '../../../../../services/lifecycle/common/lifecycle.js';
 
 class NotebookBreakpoints extends Disposable implements IWorkbenchContribution {
 	constructor(
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookCellPausing.ts b/src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookCellPausing.ts
index fca2bb1d351..aa3c0733af4 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookCellPausing.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookCellPausing.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Extensions as WorkbenchExtensions, IWorkbenchContribution, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
-import { IDebugService } from 'vs/workbench/contrib/debug/common/debug';
-import { Thread } from 'vs/workbench/contrib/debug/common/debugModel';
-import { CellUri } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { CellExecutionUpdateType } from 'vs/workbench/contrib/notebook/common/notebookExecutionService';
-import { INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { RunOnceScheduler } from '../../../../../../base/common/async.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { Registry } from '../../../../../../platform/registry/common/platform.js';
+import { Extensions as WorkbenchExtensions, IWorkbenchContribution, IWorkbenchContributionsRegistry } from '../../../../../common/contributions.js';
+import { IDebugService } from '../../../../debug/common/debug.js';
+import { Thread } from '../../../../debug/common/debugModel.js';
+import { CellUri } from '../../../common/notebookCommon.js';
+import { CellExecutionUpdateType } from '../../../common/notebookExecutionService.js';
+import { INotebookExecutionStateService } from '../../../common/notebookExecutionStateService.js';
+import { LifecyclePhase } from '../../../../../services/lifecycle/common/lifecycle.js';
 
 class NotebookCellPausing extends Disposable implements IWorkbenchContribution {
 	private readonly _pausedCells = new Set<string>();
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookDebugDecorations.ts b/src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookDebugDecorations.ts
index 55938102c22..3185f9269bc 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookDebugDecorations.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookDebugDecorations.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Delayer } from 'vs/base/common/async';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { debugIconBreakpointForeground } from 'vs/workbench/contrib/debug/browser/breakpointEditorContribution';
-import { focusedStackFrameColor, topStackFrameColor } from 'vs/workbench/contrib/debug/browser/callStackEditorContribution';
-import { IDebugService, IStackFrame } from 'vs/workbench/contrib/debug/common/debug';
-import { INotebookCellDecorationOptions, INotebookDeltaDecoration, INotebookEditor, INotebookEditorContribution, NotebookOverviewRulerLane } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { registerNotebookContribution } from 'vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
-import { runningCellRulerDecorationColor } from 'vs/workbench/contrib/notebook/browser/notebookEditorWidget';
-import { CellUri, NotebookCellExecutionState } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotebookExecutionStateService, NotebookExecutionType } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
+import { Delayer } from '../../../../../../base/common/async.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { IRange, Range } from '../../../../../../editor/common/core/range.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { debugIconBreakpointForeground } from '../../../../debug/browser/breakpointEditorContribution.js';
+import { focusedStackFrameColor, topStackFrameColor } from '../../../../debug/browser/callStackEditorContribution.js';
+import { IDebugService, IStackFrame } from '../../../../debug/common/debug.js';
+import { INotebookCellDecorationOptions, INotebookDeltaDecoration, INotebookEditor, INotebookEditorContribution, NotebookOverviewRulerLane } from '../../notebookBrowser.js';
+import { registerNotebookContribution } from '../../notebookEditorExtensions.js';
+import { runningCellRulerDecorationColor } from '../../notebookEditorWidget.js';
+import { CellUri, NotebookCellExecutionState } from '../../../common/notebookCommon.js';
+import { INotebookExecutionStateService, NotebookExecutionType } from '../../../common/notebookExecutionStateService.js';
 
 interface ICellAndRange {
 	handle: number;
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/editorHint/emptyCellEditorHint.ts b/src/vs/workbench/contrib/notebook/browser/contrib/editorHint/emptyCellEditorHint.ts
index eeef10e64d2..0beb76ab69d 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/editorHint/emptyCellEditorHint.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/editorHint/emptyCellEditorHint.ts
@@ -3,21 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Schemas } from 'vs/base/common/network';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { EmptyTextEditorHintContribution, IEmptyTextEditorHintOptions } from 'vs/workbench/contrib/codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint';
-import { IInlineChatSessionService } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSessionService';
-import { getNotebookEditorFromEditorPane } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { Schemas } from '../../../../../../base/common/network.js';
+import { ICodeEditor } from '../../../../../../editor/browser/editorBrowser.js';
+import { EditorContributionInstantiation, registerEditorContribution } from '../../../../../../editor/browser/editorExtensions.js';
+import { ICommandService } from '../../../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { IContextMenuService } from '../../../../../../platform/contextview/browser/contextView.js';
+import { IHoverService } from '../../../../../../platform/hover/browser/hover.js';
+import { IKeybindingService } from '../../../../../../platform/keybinding/common/keybinding.js';
+import { IProductService } from '../../../../../../platform/product/common/productService.js';
+import { ITelemetryService } from '../../../../../../platform/telemetry/common/telemetry.js';
+import { IChatAgentService } from '../../../../chat/common/chatAgents.js';
+import { EmptyTextEditorHintContribution, IEmptyTextEditorHintOptions } from '../../../../codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.js';
+import { IInlineChatSessionService } from '../../../../inlineChat/browser/inlineChatSessionService.js';
+import { getNotebookEditorFromEditorPane } from '../../notebookBrowser.js';
+import { IEditorGroupsService } from '../../../../../services/editor/common/editorGroupsService.js';
+import { IEditorService } from '../../../../../services/editor/common/editorService.js';
 
 export class EmptyCellEditorHintContribution extends EmptyTextEditorHintContribution {
 	public static readonly CONTRIB_ID = 'notebook.editor.contrib.emptyCellEditorHint';
@@ -32,7 +33,8 @@ export class EmptyCellEditorHintContribution extends EmptyTextEditorHintContribu
 		@IInlineChatSessionService inlineChatSessionService: IInlineChatSessionService,
 		@IChatAgentService chatAgentService: IChatAgentService,
 		@ITelemetryService telemetryService: ITelemetryService,
-		@IProductService productService: IProductService
+		@IProductService productService: IProductService,
+		@IContextMenuService contextMenuService: IContextMenuService
 	) {
 		super(
 			editor,
@@ -44,7 +46,8 @@ export class EmptyCellEditorHintContribution extends EmptyTextEditorHintContribu
 			inlineChatSessionService,
 			chatAgentService,
 			telemetryService,
-			productService
+			productService,
+			contextMenuService
 		);
 
 		const activeEditor = getNotebookEditorFromEditorPane(this._editorService.activeEditorPane);
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/editorStatusBar/editorStatusBar.ts b/src/vs/workbench/contrib/notebook/browser/contrib/editorStatusBar/editorStatusBar.ts
index 197230a61cc..fd1ed5694fe 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/editorStatusBar/editorStatusBar.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/editorStatusBar/editorStatusBar.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { Disposable, DisposableStore, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { CENTER_ACTIVE_CELL } from 'vs/workbench/contrib/notebook/browser/contrib/navigation/arrow';
-import { SELECT_KERNEL_ID } from 'vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { SELECT_NOTEBOOK_INDENTATION_ID } from 'vs/workbench/contrib/notebook/browser/controller/editActions';
-import { INotebookEditor, getNotebookEditorFromEditorPane } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { NotebookCellsChangeType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotebookKernel, INotebookKernelService } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment } from 'vs/workbench/services/statusbar/browser/statusbar';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
+import * as nls from '../../../../../../nls.js';
+import { Disposable, DisposableStore, IDisposable, MutableDisposable } from '../../../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../../../base/common/network.js';
+import { ILanguageFeaturesService } from '../../../../../../editor/common/services/languageFeatures.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../../../platform/log/common/log.js';
+import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../../../common/contributions.js';
+import { CENTER_ACTIVE_CELL } from '../navigation/arrow.js';
+import { SELECT_KERNEL_ID } from '../../controller/coreActions.js';
+import { SELECT_NOTEBOOK_INDENTATION_ID } from '../../controller/editActions.js';
+import { INotebookEditor, getNotebookEditorFromEditorPane } from '../../notebookBrowser.js';
+import { NotebookTextModel } from '../../../common/model/notebookTextModel.js';
+import { NotebookCellsChangeType } from '../../../common/notebookCommon.js';
+import { INotebookKernel, INotebookKernelService } from '../../../common/notebookKernelService.js';
+import { IEditorService } from '../../../../../services/editor/common/editorService.js';
+import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment } from '../../../../../services/statusbar/browser/statusbar.js';
+import { IEditorGroupsService, IEditorPart } from '../../../../../services/editor/common/editorGroupsService.js';
+import { Event } from '../../../../../../base/common/event.js';
 
 class ImplictKernelSelector implements IDisposable {
 
@@ -340,28 +340,26 @@ export class NotebookEditorStatusContribution extends Disposable implements IWor
 	static readonly ID = 'notebook.contrib.editorStatus';
 
 	constructor(
-		@IInstantiationService instantiationService: IInstantiationService,
-		@IEditorGroupsService editorGroupService: IEditorGroupsService,
-		@IEditorService editorService: IEditorService
+		@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService
 	) {
 		super();
 
-		// Main Editor Status
-		const mainInstantiationService = instantiationService.createChild(new ServiceCollection(
-			[IEditorService, editorService.createScoped('main', this._store)]
-		));
-		this._register(mainInstantiationService.createInstance(KernelStatus));
-		this._register(mainInstantiationService.createInstance(ActiveCellStatus));
-		this._register(mainInstantiationService.createInstance(NotebookIndentationStatus));
+		for (const part of editorGroupService.parts) {
+			this.createNotebookStatus(part);
+		}
 
-		// Auxiliary Editor Status
-		this._register(editorGroupService.onDidCreateAuxiliaryEditorPart(({ part, instantiationService, disposables }) => {
-			disposables.add(instantiationService.createInstance(KernelStatus));
-			disposables.add(instantiationService.createInstance(ActiveCellStatus));
-			disposables.add(instantiationService.createInstance(NotebookIndentationStatus));
-		}));
+		this._register(editorGroupService.onDidCreateAuxiliaryEditorPart(part => this.createNotebookStatus(part)));
+	}
+
+	private createNotebookStatus(part: IEditorPart): void {
+		const disposables = new DisposableStore();
+		Event.once(part.onWillDispose)(() => disposables.dispose());
+
+		const scopedInstantiationService = this.editorGroupService.getScopedInstantiationService(part);
+		disposables.add(scopedInstantiationService.createInstance(KernelStatus));
+		disposables.add(scopedInstantiationService.createInstance(ActiveCellStatus));
+		disposables.add(scopedInstantiationService.createInstance(NotebookIndentationStatus));
 	}
 }
 
-
 registerWorkbenchContribution2(NotebookEditorStatusContribution.ID, NotebookEditorStatusContribution, WorkbenchPhase.AfterRestored);
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/execute/executionEditorProgress.ts b/src/vs/workbench/contrib/notebook/browser/contrib/execute/executionEditorProgress.ts
index ccda24744d2..28335d8f99d 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/execute/executionEditorProgress.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/execute/executionEditorProgress.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { throttle } from 'vs/base/common/decorators';
-import { Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { INotebookEditor, INotebookEditorContribution } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { registerNotebookContribution } from 'vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
-import { NotebookCellExecutionState } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotebookCellExecution, INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
-import { IUserActivityService } from 'vs/workbench/services/userActivity/common/userActivityService';
+import { throttle } from '../../../../../../base/common/decorators.js';
+import { Disposable, MutableDisposable } from '../../../../../../base/common/lifecycle.js';
+import { INotebookEditor, INotebookEditorContribution } from '../../notebookBrowser.js';
+import { registerNotebookContribution } from '../../notebookEditorExtensions.js';
+import { NotebookCellExecutionState } from '../../../common/notebookCommon.js';
+import { INotebookCellExecution, INotebookExecutionStateService } from '../../../common/notebookExecutionStateService.js';
+import { IUserActivityService } from '../../../../../services/userActivity/common/userActivityService.js';
 
 export class ExecutionEditorProgressController extends Disposable implements INotebookEditorContribution {
 	static id: string = 'workbench.notebook.executionEditorProgress';
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/find/findFilters.ts b/src/vs/workbench/contrib/notebook/browser/contrib/find/findFilters.ts
index 0901d295edd..f6e69052556 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/find/findFilters.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/find/findFilters.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Event, Emitter } from 'vs/base/common/event';
-import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
+import { Emitter, Event } from '../../../../../../base/common/event.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { INotebookFindScope, NotebookFindScopeType } from '../../../common/notebookCommon.js';
 
 export interface INotebookFindChangeEvent {
 	markupInput?: boolean;
 	markupPreview?: boolean;
 	codeInput?: boolean;
 	codeOutput?: boolean;
-	searchInRanges?: boolean;
+	findScope?: boolean;
 }
 
 export class NotebookFindFilters extends Disposable {
@@ -70,31 +70,19 @@ export class NotebookFindFilters extends Disposable {
 		}
 	}
 
-	private _searchInRanges: boolean = false;
+	private _findScope: INotebookFindScope = { findScopeType: NotebookFindScopeType.None };
 
-	get searchInRanges(): boolean {
-		return this._searchInRanges;
+	get findScope(): INotebookFindScope {
+		return this._findScope;
 	}
 
-	set searchInRanges(value: boolean) {
-		if (this._searchInRanges !== value) {
-			this._searchInRanges = value;
-			this._onDidChange.fire({ searchInRanges: value });
+	set findScope(value: INotebookFindScope) {
+		if (this._findScope !== value) {
+			this._findScope = value;
+			this._onDidChange.fire({ findScope: true });
 		}
 	}
 
-	private _selectedRanges: ICellRange[] = [];
-
-	get selectedRanges(): ICellRange[] {
-		return this._selectedRanges;
-	}
-
-	set selectedRanges(value: ICellRange[]) {
-		if (this._selectedRanges !== value) {
-			this._selectedRanges = value;
-			this._onDidChange.fire({ searchInRanges: this._searchInRanges });
-		}
-	}
 
 	private readonly _initialMarkupInput: boolean;
 	private readonly _initialMarkupPreview: boolean;
@@ -106,8 +94,7 @@ export class NotebookFindFilters extends Disposable {
 		markupPreview: boolean,
 		codeInput: boolean,
 		codeOutput: boolean,
-		searchInRanges: boolean,
-		selectedRanges: ICellRange[]
+		findScope: INotebookFindScope
 	) {
 		super();
 
@@ -115,8 +102,7 @@ export class NotebookFindFilters extends Disposable {
 		this._markupPreview = markupPreview;
 		this._codeInput = codeInput;
 		this._codeOutput = codeOutput;
-		this._searchInRanges = searchInRanges;
-		this._selectedRanges = selectedRanges;
+		this._findScope = findScope;
 
 		this._initialMarkupInput = markupInput;
 		this._initialMarkupPreview = markupPreview;
@@ -125,7 +111,7 @@ export class NotebookFindFilters extends Disposable {
 	}
 
 	isModified(): boolean {
-		// do not include searchInRanges or selectedRanges in the check. This will incorrectly mark the filter icon as modified
+		// do not include findInSelection or either selectedRanges in the check. This will incorrectly mark the filter icon as modified
 		return (
 			this._markupInput !== this._initialMarkupInput
 			|| this._markupPreview !== this._initialMarkupPreview
@@ -139,7 +125,6 @@ export class NotebookFindFilters extends Disposable {
 		this._markupPreview = v.markupPreview;
 		this._codeInput = v.codeInput;
 		this._codeOutput = v.codeOutput;
-		this._searchInRanges = v.searchInRanges;
-		this._selectedRanges = v.selectedRanges;
+		this._findScope = v.findScope;
 	}
 }
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/find/findMatchDecorationModel.ts b/src/vs/workbench/contrib/notebook/browser/contrib/find/findMatchDecorationModel.ts
index 214de0211a6..8a27b9eefb7 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/find/findMatchDecorationModel.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/find/findMatchDecorationModel.ts
@@ -2,13 +2,13 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IModelDeltaDecoration } from 'vs/editor/common/model';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { FindDecorations } from 'vs/editor/contrib/find/browser/findDecorations';
-import { Range } from 'vs/editor/common/core/range';
-import { overviewRulerSelectionHighlightForeground, overviewRulerFindMatchForeground } from 'vs/platform/theme/common/colorRegistry';
-import { CellFindMatchWithIndex, ICellModelDecorations, ICellModelDeltaDecorations, ICellViewModel, INotebookDeltaDecoration, INotebookEditor, NotebookOverviewRulerLane, } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { IModelDeltaDecoration } from '../../../../../../editor/common/model.js';
+import { ModelDecorationOptions } from '../../../../../../editor/common/model/textModel.js';
+import { FindDecorations } from '../../../../../../editor/contrib/find/browser/findDecorations.js';
+import { Range } from '../../../../../../editor/common/core/range.js';
+import { overviewRulerSelectionHighlightForeground, overviewRulerFindMatchForeground } from '../../../../../../platform/theme/common/colorRegistry.js';
+import { CellFindMatchWithIndex, ICellModelDecorations, ICellModelDeltaDecorations, ICellViewModel, INotebookDeltaDecoration, INotebookEditor, NotebookOverviewRulerLane, } from '../../notebookBrowser.js';
 
 export class FindMatchDecorationModel extends Disposable {
 	private _allMatchesDecorations: ICellModelDecorations[] = [];
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/find/findModel.ts b/src/vs/workbench/contrib/notebook/browser/contrib/find/findModel.ts
index de522b344a5..7858fef22dc 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/find/findModel.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/find/findModel.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancelablePromise, createCancelablePromise, Delayer } from 'vs/base/common/async';
-import { INotebookEditor, CellEditState, CellFindMatchWithIndex, CellWebviewFindMatch, ICellViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { Range } from 'vs/editor/common/core/range';
-import { FindMatch } from 'vs/editor/common/model';
-import { PrefixSumComputer } from 'vs/editor/common/model/prefixSumComputer';
-import { FindReplaceState, FindReplaceStateChangedEvent } from 'vs/editor/contrib/find/browser/findState';
-import { CellKind, INotebookSearchOptions, NotebookCellsChangeType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { findFirstIdxMonotonousOrArrLen } from 'vs/base/common/arraysFind';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { NotebookFindFilters } from 'vs/workbench/contrib/notebook/browser/contrib/find/findFilters';
-import { FindMatchDecorationModel } from 'vs/workbench/contrib/notebook/browser/contrib/find/findMatchDecorationModel';
-import { NotebookViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl';
+import { findFirstIdxMonotonousOrArrLen } from '../../../../../../base/common/arraysFind.js';
+import { CancelablePromise, createCancelablePromise, Delayer } from '../../../../../../base/common/async.js';
+import { CancellationToken } from '../../../../../../base/common/cancellation.js';
+import { Disposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { Range } from '../../../../../../editor/common/core/range.js';
+import { FindMatch } from '../../../../../../editor/common/model.js';
+import { PrefixSumComputer } from '../../../../../../editor/common/model/prefixSumComputer.js';
+import { FindReplaceState, FindReplaceStateChangedEvent } from '../../../../../../editor/contrib/find/browser/findState.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { NotebookFindFilters } from './findFilters.js';
+import { FindMatchDecorationModel } from './findMatchDecorationModel.js';
+import { CellEditState, CellFindMatchWithIndex, CellWebviewFindMatch, ICellViewModel, INotebookEditor } from '../../notebookBrowser.js';
+import { NotebookViewModel } from '../../viewModel/notebookViewModelImpl.js';
+import { NotebookTextModel } from '../../../common/model/notebookTextModel.js';
+import { CellKind, INotebookFindOptions, NotebookCellsChangeType } from '../../../common/notebookCommon.js';
 
 export class CellFindMatchModel implements CellFindMatchWithIndex {
 	readonly cell: ICellViewModel;
@@ -115,7 +115,7 @@ export class FindModel extends Disposable {
 	}
 
 	private _updateCellStates(e: FindReplaceStateChangedEvent) {
-		if (!this._state.filters?.markupInput || !this._state.filters?.markupPreview || !this._state.filters?.searchInRanges || !this._state.filters?.selectedRanges) {
+		if (!this._state.filters?.markupInput || !this._state.filters?.markupPreview || !this._state.filters?.findScope) {
 			return;
 		}
 
@@ -127,7 +127,7 @@ export class FindModel extends Disposable {
 			}
 			// search markup sources first to decide if a markup cell should be in editing mode
 			const wordSeparators = this._configurationService.inspect<string>('editor.wordSeparators').value;
-			const options: INotebookSearchOptions = {
+			const options: INotebookFindOptions = {
 				regex: this._state.isRegex,
 				wholeWord: this._state.wholeWord,
 				caseSensitive: this._state.matchCase,
@@ -136,8 +136,7 @@ export class FindModel extends Disposable {
 				includeCodeInput: false,
 				includeMarkupPreview: false,
 				includeOutput: false,
-				searchInRanges: this._state.filters?.searchInRanges,
-				selectedRanges: this._state.filters?.selectedRanges
+				findScope: this._state.filters?.findScope,
 			};
 
 			const contentMatches = viewModel.find(this._state.searchString, options);
@@ -476,7 +475,7 @@ export class FindModel extends Disposable {
 		const val = this._state.searchString;
 		const wordSeparators = this._configurationService.inspect<string>('editor.wordSeparators').value;
 
-		const options: INotebookSearchOptions = {
+		const options: INotebookFindOptions = {
 			regex: this._state.isRegex,
 			wholeWord: this._state.wholeWord,
 			caseSensitive: this._state.matchCase,
@@ -485,8 +484,7 @@ export class FindModel extends Disposable {
 			includeCodeInput: this._state.filters?.codeInput ?? true,
 			includeMarkupPreview: !!this._state.filters?.markupPreview,
 			includeOutput: !!this._state.filters?.codeOutput,
-			searchInRanges: this._state.filters?.searchInRanges,
-			selectedRanges: this._state.filters?.selectedRanges
+			findScope: this._state.filters?.findScope,
 		};
 
 		ret = await this._notebookEditor.find(val, options, token);
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/find/media/notebookFind.css b/src/vs/workbench/contrib/notebook/browser/contrib/find/media/notebookFind.css
index fe115e23081..d61cc797497 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/find/media/notebookFind.css
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/find/media/notebookFind.css
@@ -19,3 +19,7 @@
 	padding: 0 2px;
 	box-sizing: border-box;
 }
+
+.monaco-workbench .nb-findScope {
+	background-color: var(--vscode-editor-findRangeHighlightBackground);
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFind.ts b/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFind.ts
index fd39a06a3f7..94e37788a69 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFind.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFind.ts
@@ -3,29 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/notebookFind';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Schemas } from 'vs/base/common/network';
-import { isEqual } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { ITextModel } from 'vs/editor/common/model';
-import { FindStartFocusAction, getSelectionSearchString, IFindStartOptions, StartFindAction, StartFindReplaceAction } from 'vs/editor/contrib/find/browser/findController';
-import { localize2 } from 'vs/nls';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { IShowNotebookFindWidgetOptions, NotebookFindContrib } from 'vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget';
-import { getNotebookEditorFromEditorPane } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { registerNotebookContribution } from 'vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
-import { CellUri } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { INTERACTIVE_WINDOW_IS_ACTIVE_EDITOR, KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_IS_ACTIVE_EDITOR } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { INotebookCommandContext, NotebookMultiCellAction } from 'vs/workbench/contrib/notebook/browser/controller/coreActions';
+import './media/notebookFind.css';
+import { KeyCode, KeyMod } from '../../../../../../base/common/keyCodes.js';
+import { Schemas } from '../../../../../../base/common/network.js';
+import { isEqual } from '../../../../../../base/common/resources.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { ICodeEditor } from '../../../../../../editor/browser/editorBrowser.js';
+import { ICodeEditorService } from '../../../../../../editor/browser/services/codeEditorService.js';
+import { EditorOption } from '../../../../../../editor/common/config/editorOptions.js';
+import { EditorContextKeys } from '../../../../../../editor/common/editorContextKeys.js';
+import { ITextModel } from '../../../../../../editor/common/model.js';
+import { FindStartFocusAction, getSelectionSearchString, IFindStartOptions, StartFindAction, StartFindReplaceAction } from '../../../../../../editor/contrib/find/browser/findController.js';
+import { localize2 } from '../../../../../../nls.js';
+import { Action2, registerAction2 } from '../../../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { ServicesAccessor } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IShowNotebookFindWidgetOptions, NotebookFindContrib } from './notebookFindWidget.js';
+import { INotebookCommandContext, NotebookMultiCellAction } from '../../controller/coreActions.js';
+import { getNotebookEditorFromEditorPane } from '../../notebookBrowser.js';
+import { registerNotebookContribution } from '../../notebookEditorExtensions.js';
+import { CellUri, NotebookFindScopeType } from '../../../common/notebookCommon.js';
+import { INTERACTIVE_WINDOW_IS_ACTIVE_EDITOR, KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_IS_ACTIVE_EDITOR } from '../../../common/notebookContextKeys.js';
+import { IEditorService } from '../../../../../services/editor/common/editorService.js';
 
 registerNotebookContribution(NotebookFindContrib.id, NotebookFindContrib);
 
@@ -78,12 +78,7 @@ registerAction2(class extends NotebookMultiCellAction {
 		}
 
 		const controller = editor.getContribution<NotebookFindContrib>(NotebookFindContrib.id);
-
-		if (context.selectedCells.length > 1) {
-			controller.show(undefined, { searchInRanges: true, selectedRanges: editor.getSelections() });
-		} else {
-			controller.show(undefined, { searchInRanges: false, selectedRanges: [] });
-		}
+		controller.show(undefined, { findScope: { findScopeType: NotebookFindScopeType.None } });
 	}
 });
 
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.ts b/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.ts
index 77daeaaf762..ccf772fb920 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.ts
@@ -3,55 +3,56 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { FindInput, IFindInputOptions } from 'vs/base/browser/ui/findinput/findInput';
-import { ReplaceInput } from 'vs/base/browser/ui/findinput/replaceInput';
-import { IMessage as InputBoxMessage } from 'vs/base/browser/ui/inputbox/inputBox';
-import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
-import { Widget } from 'vs/base/browser/ui/widget';
-import { Delayer } from 'vs/base/common/async';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import 'vs/css!./notebookFindReplaceWidget';
-import { FindReplaceState, FindReplaceStateChangedEvent } from 'vs/editor/contrib/find/browser/findState';
-import { findNextMatchIcon, findPreviousMatchIcon, findReplaceAllIcon, findReplaceIcon, findSelectionIcon, SimpleButton } from 'vs/editor/contrib/find/browser/findWidget';
-import * as nls from 'vs/nls';
-import { ContextScopedReplaceInput, registerAndCreateHistoryNavigationContext } from 'vs/platform/history/browser/contextScopedHistoryWidget';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { registerIcon, widgetClose } from 'vs/platform/theme/common/iconRegistry';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { parseReplaceString, ReplacePattern } from 'vs/editor/contrib/find/browser/replacePattern';
-import { Codicon } from 'vs/base/common/codicons';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { Action, ActionRunner, IAction, IActionRunner, Separator } from 'vs/base/common/actions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IMenu } from 'vs/platform/actions/common/actions';
-import { createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { AnchorAlignment, IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview';
-import { DropdownMenuActionViewItem } from 'vs/base/browser/ui/dropdown/dropdownActionViewItem';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { filterIcon } from 'vs/workbench/contrib/extensions/browser/extensionsIcons';
-import { NotebookFindFilters } from 'vs/workbench/contrib/notebook/browser/contrib/find/findFilters';
-import { isSafari } from 'vs/base/common/platform';
-import { ISashEvent, Orientation, Sash } from 'vs/base/browser/ui/sash/sash';
-import { INotebookDeltaDecoration, INotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { defaultInputBoxStyles, defaultProgressBarStyles, defaultToggleStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { IToggleStyles, Toggle } from 'vs/base/browser/ui/toggle/toggle';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { NotebookSetting } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { IActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { asCssVariable, inputActiveOptionBackground, inputActiveOptionBorder, inputActiveOptionForeground } from 'vs/platform/theme/common/colorRegistry';
-import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
+import * as nls from '../../../../../../nls.js';
+import * as dom from '../../../../../../base/browser/dom.js';
+import './notebookFindReplaceWidget.css';
+import { ActionBar } from '../../../../../../base/browser/ui/actionbar/actionbar.js';
+import { IActionViewItemOptions } from '../../../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { AnchorAlignment, IContextViewProvider } from '../../../../../../base/browser/ui/contextview/contextview.js';
+import { DropdownMenuActionViewItem } from '../../../../../../base/browser/ui/dropdown/dropdownActionViewItem.js';
+import { FindInput, IFindInputOptions } from '../../../../../../base/browser/ui/findinput/findInput.js';
+import { ReplaceInput } from '../../../../../../base/browser/ui/findinput/replaceInput.js';
+import { IMessage as InputBoxMessage } from '../../../../../../base/browser/ui/inputbox/inputBox.js';
+import { ProgressBar } from '../../../../../../base/browser/ui/progressbar/progressbar.js';
+import { ISashEvent, Orientation, Sash } from '../../../../../../base/browser/ui/sash/sash.js';
+import { IToggleStyles, Toggle } from '../../../../../../base/browser/ui/toggle/toggle.js';
+import { Widget } from '../../../../../../base/browser/ui/widget.js';
+import { Action, ActionRunner, IAction, IActionRunner, Separator } from '../../../../../../base/common/actions.js';
+import { Delayer } from '../../../../../../base/common/async.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { KeyCode } from '../../../../../../base/common/keyCodes.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { isSafari } from '../../../../../../base/common/platform.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { Range } from '../../../../../../editor/common/core/range.js';
+import { FindReplaceState, FindReplaceStateChangedEvent } from '../../../../../../editor/contrib/find/browser/findState.js';
+import { findNextMatchIcon, findPreviousMatchIcon, findReplaceAllIcon, findReplaceIcon, findSelectionIcon, SimpleButton } from '../../../../../../editor/contrib/find/browser/findWidget.js';
+import { parseReplaceString, ReplacePattern } from '../../../../../../editor/contrib/find/browser/replacePattern.js';
+import { createAndFillInActionBarActions } from '../../../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IMenu } from '../../../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService, IContextViewService } from '../../../../../../platform/contextview/browser/contextView.js';
+import { ContextScopedReplaceInput, registerAndCreateHistoryNavigationContext } from '../../../../../../platform/history/browser/contextScopedHistoryWidget.js';
+import { IHoverService } from '../../../../../../platform/hover/browser/hover.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { defaultInputBoxStyles, defaultProgressBarStyles, defaultToggleStyles } from '../../../../../../platform/theme/browser/defaultStyles.js';
+import { asCssVariable, inputActiveOptionBackground, inputActiveOptionBorder, inputActiveOptionForeground } from '../../../../../../platform/theme/common/colorRegistry.js';
+import { registerIcon, widgetClose } from '../../../../../../platform/theme/common/iconRegistry.js';
+import { registerThemingParticipant } from '../../../../../../platform/theme/common/themeService.js';
+import { filterIcon } from '../../../../extensions/browser/extensionsIcons.js';
+import { NotebookFindFilters } from './findFilters.js';
+import { IShowNotebookFindWidgetOptions } from './notebookFindWidget.js';
+import { ICellModelDecorations, ICellModelDeltaDecorations, ICellViewModel, INotebookDeltaDecoration, INotebookEditor } from '../../notebookBrowser.js';
+import { NotebookFindScopeType, NotebookSetting } from '../../../common/notebookCommon.js';
+import { ICellRange } from '../../../common/notebookRange.js';
 
 
 const NLS_FIND_INPUT_LABEL = nls.localize('label.find', "Find");
 const NLS_FIND_INPUT_PLACEHOLDER = nls.localize('placeholder.find', "Find");
 const NLS_PREVIOUS_MATCH_BTN_LABEL = nls.localize('label.previousMatchButton', "Previous Match");
-// const NLS_FILTER_BTN_LABEL = nls.localize('label.findFilterButton', "Search in View");
 const NLS_NEXT_MATCH_BTN_LABEL = nls.localize('label.nextMatchButton', "Next Match");
-const NLS_FIND_IN_CELL_SELECTION_BTN_LABEL = nls.localize('label.findInCellSelectionButton', "Find in Cell Selection");
+const NLS_TOGGLE_SELECTION_FIND_TITLE = nls.localize('label.toggleSelectionFind', "Find in Selection");
 const NLS_CLOSE_BTN_LABEL = nls.localize('label.closeButton', "Close");
 const NLS_TOGGLE_REPLACE_MODE_BTN_LABEL = nls.localize('label.toggleReplaceButton', "Toggle Replace");
 const NLS_REPLACE_INPUT_LABEL = nls.localize('label.replace', "Replace");
@@ -66,7 +67,7 @@ const NOTEBOOK_FIND_IN_MARKUP_PREVIEW = nls.localize('notebook.find.filter.findI
 const NOTEBOOK_FIND_IN_CODE_INPUT = nls.localize('notebook.find.filter.findInCodeInput', "Code Cell Source");
 const NOTEBOOK_FIND_IN_CODE_OUTPUT = nls.localize('notebook.find.filter.findInCodeOutput', "Code Cell Output");
 
-const NOTEBOOK_FIND_WIDGET_INITIAL_WIDTH = 318;
+const NOTEBOOK_FIND_WIDGET_INITIAL_WIDTH = 419;
 const NOTEBOOK_FIND_WIDGET_INITIAL_HORIZONTAL_PADDING = 4;
 class NotebookFindFilterActionViewItem extends DropdownMenuActionViewItem {
 	constructor(readonly filters: NotebookFindFilters, action: IAction, options: IActionViewItemOptions, actionRunner: IActionRunner, @IContextMenuService contextMenuService: IContextMenuService) {
@@ -319,8 +320,8 @@ export abstract class SimpleFindReplaceWidget extends Widget {
 	private _filters: NotebookFindFilters;
 
 	private readonly inSelectionToggle: Toggle;
-	private searchInSelectionEnabled: boolean;
-	private selectionDecorationIds: string[] = [];
+	private cellSelectionDecorationIds: string[] = [];
+	private textSelectionDecorationIds: ICellModelDecorations[] = [];
 
 	constructor(
 		@IContextViewService private readonly _contextViewService: IContextViewService,
@@ -341,7 +342,7 @@ export abstract class SimpleFindReplaceWidget extends Widget {
 			codeOutput: boolean;
 		}>(NotebookSetting.findFilters) ?? { markupSource: true, markupPreview: true, codeSource: true, codeOutput: true };
 
-		this._filters = new NotebookFindFilters(findFilters.markupSource, findFilters.markupPreview, findFilters.codeSource, findFilters.codeOutput, false, []);
+		this._filters = new NotebookFindFilters(findFilters.markupSource, findFilters.markupPreview, findFilters.codeSource, findFilters.codeOutput, { findScopeType: NotebookFindScopeType.None });
 		this._state.change({ filters: this._filters }, false);
 
 		this._filters.onDidChange(() => {
@@ -386,6 +387,7 @@ export abstract class SimpleFindReplaceWidget extends Widget {
 			null,
 			this._contextViewService,
 			{
+				// width:FIND_INPUT_AREA_WIDTH,
 				label: NLS_FIND_INPUT_LABEL,
 				placeholder: NLS_FIND_INPUT_PLACEHOLDER,
 				validation: (value: string): InputBoxMessage | null => {
@@ -462,22 +464,54 @@ export abstract class SimpleFindReplaceWidget extends Widget {
 
 		this.inSelectionToggle = this._register(new Toggle({
 			icon: findSelectionIcon,
-			title: NLS_FIND_IN_CELL_SELECTION_BTN_LABEL,
+			title: NLS_TOGGLE_SELECTION_FIND_TITLE,
 			isChecked: false,
 			inputActiveOptionBackground: asCssVariable(inputActiveOptionBackground),
 			inputActiveOptionBorder: asCssVariable(inputActiveOptionBorder),
 			inputActiveOptionForeground: asCssVariable(inputActiveOptionForeground),
 		}));
+		this.inSelectionToggle.domNode.style.display = 'inline';
 
 		this.inSelectionToggle.onChange(() => {
 			const checked = this.inSelectionToggle.checked;
-			this._filters.searchInRanges = checked;
 			if (checked) {
-				this._filters.selectedRanges = this._notebookEditor.getSelections();
-				this.setCellSelectionDecorations();
+				// selection logic:
+				// 1. if there are multiple cells, do that.
+				// 2. if there is only one cell, do the following:
+				// 		- if there is a multi-line range highlighted, textual in selection
+				// 		- if there is no range, cell in selection for that cell
+
+				const cellSelection: ICellRange[] = this._notebookEditor.getSelections();
+				const textSelection: Range[] = this._notebookEditor.getSelectionViewModels()[0].getSelections();
+
+				if (cellSelection.length > 1 || cellSelection.some(range => range.end - range.start > 1)) {
+					this._filters.findScope = {
+						findScopeType: NotebookFindScopeType.Cells,
+						selectedCellRanges: cellSelection
+					};
+					this.setCellSelectionDecorations();
+
+				} else if (textSelection.length > 1 || textSelection.some(range => range.endLineNumber - range.startLineNumber >= 1)) {
+					this._filters.findScope = {
+						findScopeType: NotebookFindScopeType.Text,
+						selectedCellRanges: cellSelection,
+						selectedTextRanges: textSelection
+					};
+					this.setTextSelectionDecorations(textSelection, this._notebookEditor.getSelectionViewModels()[0]);
+
+				} else {
+					this._filters.findScope = {
+						findScopeType: NotebookFindScopeType.Cells,
+						selectedCellRanges: cellSelection
+					};
+					this.setCellSelectionDecorations();
+				}
 			} else {
-				this._filters.selectedRanges = [];
+				this._filters.findScope = {
+					findScopeType: NotebookFindScopeType.None
+				};
 				this.clearCellSelectionDecorations();
+				this.clearTextSelectionDecorations();
 			}
 		});
 
@@ -496,22 +530,6 @@ export abstract class SimpleFindReplaceWidget extends Widget {
 		this._innerFindDomNode.appendChild(this.inSelectionToggle.domNode);
 		this._innerFindDomNode.appendChild(closeBtn.domNode);
 
-		this.searchInSelectionEnabled = this._configurationService.getValue<boolean>(NotebookSetting.findScope);
-		this.inSelectionToggle.domNode.style.display = this.searchInSelectionEnabled ? 'inline' : 'none';
-
-		this._configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration(NotebookSetting.findScope)) {
-				this.searchInSelectionEnabled = this._configurationService.getValue<boolean>(NotebookSetting.findScope);
-				if (this.searchInSelectionEnabled) {
-					this.inSelectionToggle.domNode.style.display = 'inline';
-				} else {
-					this.inSelectionToggle.domNode.style.display = 'none';
-					this.inSelectionToggle.checked = false;
-					this.clearCellSelectionDecorations();
-				}
-			}
-		});
-
 		// _domNode wraps _innerDomNode, ensuring that
 		this._domNode.appendChild(this._innerFindDomNode);
 
@@ -704,11 +722,37 @@ export abstract class SimpleFindReplaceWidget extends Widget {
 				options: { className: 'nb-multiCellHighlight', outputClassName: 'nb-multiCellHighlight' }
 			} satisfies INotebookDeltaDecoration);
 		}
-		this.selectionDecorationIds = this._notebookEditor.deltaCellDecorations([], decorations);
+		this.cellSelectionDecorationIds = this._notebookEditor.deltaCellDecorations([], decorations);
 	}
 
 	private clearCellSelectionDecorations() {
-		this._notebookEditor.deltaCellDecorations(this.selectionDecorationIds, []);
+		this._notebookEditor.deltaCellDecorations(this.cellSelectionDecorationIds, []);
+	}
+
+	private setTextSelectionDecorations(textRanges: Range[], cell: ICellViewModel) {
+		this._notebookEditor.changeModelDecorations(changeAccessor => {
+			const decorations: ICellModelDeltaDecorations[] = [];
+			for (const range of textRanges) {
+				decorations.push({
+					ownerId: cell.handle,
+					decorations: [{
+						range: range,
+						options: {
+							description: 'text search range for notebook search scope',
+							isWholeLine: true,
+							className: 'nb-findScope'
+						}
+					}]
+				});
+			}
+			this.textSelectionDecorationIds = changeAccessor.deltaDecorations([], decorations);
+		});
+	}
+
+	private clearTextSelectionDecorations() {
+		this._notebookEditor.changeModelDecorations(changeAccessor => {
+			changeAccessor.deltaDecorations(this.textSelectionDecorationIds, []);
+		});
 	}
 
 	protected _updateMatchesCount(): void {
@@ -748,20 +792,11 @@ export abstract class SimpleFindReplaceWidget extends Widget {
 		this._findInput.focus();
 	}
 
-	public show(initialInput?: string, options?: { focus?: boolean; searchInRanges?: boolean; selectedRanges?: ICellRange[] }): void {
+	public show(initialInput?: string, options?: IShowNotebookFindWidgetOptions): void {
 		if (initialInput) {
 			this._findInput.setValue(initialInput);
 		}
 
-		if (this.searchInSelectionEnabled && options?.searchInRanges !== undefined) {
-			this._filters.searchInRanges = options.searchInRanges;
-			this.inSelectionToggle.checked = options.searchInRanges;
-			if (options.searchInRanges && options.selectedRanges) {
-				this._filters.selectedRanges = options.selectedRanges;
-				this.setCellSelectionDecorations();
-			}
-		}
-
 		this._isVisible = true;
 
 		setTimeout(() => {
@@ -810,7 +845,10 @@ export abstract class SimpleFindReplaceWidget extends Widget {
 	public hide(): void {
 		if (this._isVisible) {
 			this.inSelectionToggle.checked = false;
-			this._notebookEditor.deltaCellDecorations(this.selectionDecorationIds, []);
+			this._notebookEditor.deltaCellDecorations(this.cellSelectionDecorationIds, []);
+			this._notebookEditor.changeModelDecorations(changeAccessor => {
+				changeAccessor.deltaDecorations(this.textSelectionDecorationIds, []);
+			});
 
 			this._domNode.classList.remove('visible-transition');
 			this._domNode.setAttribute('aria-hidden', 'true');
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget.ts b/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget.ts
index 5e67785a00b..0a8a46342e7 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget.ts
@@ -3,30 +3,30 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { alert as alertFn } from 'vs/base/browser/ui/aria/aria';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Lazy } from 'vs/base/common/lazy';
-import { Disposable } from 'vs/base/common/lifecycle';
-import * as strings from 'vs/base/common/strings';
-import { Range } from 'vs/editor/common/core/range';
-import { FindMatch } from 'vs/editor/common/model';
-import { MATCHES_LIMIT } from 'vs/editor/contrib/find/browser/findModel';
-import { FindReplaceState } from 'vs/editor/contrib/find/browser/findState';
-import { NLS_MATCHES_LOCATION, NLS_NO_RESULTS } from 'vs/editor/contrib/find/browser/findWidget';
-import { localize } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { NotebookFindFilters } from 'vs/workbench/contrib/notebook/browser/contrib/find/findFilters';
-import { FindModel } from 'vs/workbench/contrib/notebook/browser/contrib/find/findModel';
-import { SimpleFindReplaceWidget } from 'vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget';
-import { CellEditState, ICellViewModel, INotebookEditor, INotebookEditorContribution } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
+import * as DOM from '../../../../../../base/browser/dom.js';
+import { IKeyboardEvent } from '../../../../../../base/browser/keyboardEvent.js';
+import { alert as alertFn } from '../../../../../../base/browser/ui/aria/aria.js';
+import { KeyCode, KeyMod } from '../../../../../../base/common/keyCodes.js';
+import { Lazy } from '../../../../../../base/common/lazy.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import * as strings from '../../../../../../base/common/strings.js';
+import { Range } from '../../../../../../editor/common/core/range.js';
+import { FindMatch } from '../../../../../../editor/common/model.js';
+import { MATCHES_LIMIT } from '../../../../../../editor/contrib/find/browser/findModel.js';
+import { FindReplaceState } from '../../../../../../editor/contrib/find/browser/findState.js';
+import { NLS_MATCHES_LOCATION, NLS_NO_RESULTS } from '../../../../../../editor/contrib/find/browser/findWidget.js';
+import { localize } from '../../../../../../nls.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { IContextKey, IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService, IContextViewService } from '../../../../../../platform/contextview/browser/contextView.js';
+import { IHoverService } from '../../../../../../platform/hover/browser/hover.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { NotebookFindFilters } from './findFilters.js';
+import { FindModel } from './findModel.js';
+import { SimpleFindReplaceWidget } from './notebookFindReplaceWidget.js';
+import { CellEditState, ICellViewModel, INotebookEditor, INotebookEditorContribution } from '../../notebookBrowser.js';
+import { INotebookFindScope } from '../../../common/notebookCommon.js';
+import { KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED } from '../../../common/notebookContextKeys.js';
 
 const FIND_HIDE_TRANSITION = 'find-hide-transition';
 const FIND_SHOW_TRANSITION = 'find-show-transition';
@@ -40,8 +40,7 @@ export interface IShowNotebookFindWidgetOptions {
 	matchIndex?: number;
 	focus?: boolean;
 	searchStringSeededFrom?: { cell: ICellViewModel; range: Range };
-	searchInRanges?: boolean;
-	selectedRanges?: ICellRange[];
+	findScope?: INotebookFindScope;
 }
 
 export class NotebookFindContrib extends Disposable implements INotebookEditorContribution {
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/format/formatting.ts b/src/vs/workbench/contrib/notebook/browser/contrib/format/formatting.ts
index 943e52e2c17..aeedbb5dbaa 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/format/formatting.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/format/formatting.ts
@@ -3,36 +3,36 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize, localize2 } from 'vs/nls';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, registerEditorAction } from 'vs/editor/browser/editorExtensions';
-import { IBulkEditService, ResourceTextEdit } from 'vs/editor/browser/services/bulkEditService';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { FormattingMode, formatDocumentWithSelectedProvider, getDocumentFormattingEditsWithSelectedProvider } from 'vs/editor/contrib/format/browser/format';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { Progress } from 'vs/platform/progress/common/progress';
-import { NOTEBOOK_ACTIONS_CATEGORY } from 'vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { getNotebookEditorFromEditorPane } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_IS_ACTIVE_EDITOR } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { INotebookCellExecution } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
-import { ICellExecutionParticipant, INotebookExecutionService } from 'vs/workbench/contrib/notebook/common/notebookExecutionService';
-import { NotebookSetting } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchContributionsExtensions } from 'vs/workbench/common/contributions';
-import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
-import { CodeActionParticipantUtils } from 'vs/workbench/contrib/notebook/browser/contrib/saveParticipants/saveParticipants';
+import { localize, localize2 } from '../../../../../../nls.js';
+import { CancellationToken } from '../../../../../../base/common/cancellation.js';
+import { KeyCode, KeyMod } from '../../../../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { ICodeEditor } from '../../../../../../editor/browser/editorBrowser.js';
+import { EditorAction, registerEditorAction } from '../../../../../../editor/browser/editorExtensions.js';
+import { IBulkEditService, ResourceTextEdit } from '../../../../../../editor/browser/services/bulkEditService.js';
+import { EditorContextKeys } from '../../../../../../editor/common/editorContextKeys.js';
+import { IEditorWorkerService } from '../../../../../../editor/common/services/editorWorker.js';
+import { ILanguageFeaturesService } from '../../../../../../editor/common/services/languageFeatures.js';
+import { ITextModelService } from '../../../../../../editor/common/services/resolverService.js';
+import { FormattingMode, formatDocumentWithSelectedProvider, getDocumentFormattingEditsWithSelectedProvider } from '../../../../../../editor/contrib/format/browser/format.js';
+import { Action2, MenuId, registerAction2 } from '../../../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { Progress } from '../../../../../../platform/progress/common/progress.js';
+import { NOTEBOOK_ACTIONS_CATEGORY } from '../../controller/coreActions.js';
+import { getNotebookEditorFromEditorPane } from '../../notebookBrowser.js';
+import { NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_IS_ACTIVE_EDITOR } from '../../../common/notebookContextKeys.js';
+import { IEditorService } from '../../../../../services/editor/common/editorService.js';
+import { INotebookCellExecution } from '../../../common/notebookExecutionStateService.js';
+import { ICellExecutionParticipant, INotebookExecutionService } from '../../../common/notebookExecutionService.js';
+import { NotebookSetting } from '../../../common/notebookCommon.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { LifecyclePhase } from '../../../../../services/lifecycle/common/lifecycle.js';
+import { Registry } from '../../../../../../platform/registry/common/platform.js';
+import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchContributionsExtensions } from '../../../../../common/contributions.js';
+import { INotebookService } from '../../../common/notebookService.js';
+import { CodeActionParticipantUtils } from '../saveParticipants/saveParticipants.js';
 
 // format notebook
 registerAction2(class extends Action2 {
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/gettingStarted/notebookGettingStarted.ts b/src/vs/workbench/contrib/notebook/browser/contrib/gettingStarted/notebookGettingStarted.ts
index 90b77faa7bc..dea7c33359e 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/gettingStarted/notebookGettingStarted.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/gettingStarted/notebookGettingStarted.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { localize2 } from 'vs/nls';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
-import { Memento } from 'vs/workbench/common/memento';
-import { NotebookSetting } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { HAS_OPENED_NOTEBOOK } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { NotebookEditorInput } from 'vs/workbench/contrib/notebook/common/notebookEditorInput';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { localize2 } from '../../../../../../nls.js';
+import { Categories } from '../../../../../../platform/action/common/actionCommonCategories.js';
+import { Action2, registerAction2 } from '../../../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr, IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { ServicesAccessor } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { Registry } from '../../../../../../platform/registry/common/platform.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../../platform/storage/common/storage.js';
+import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from '../../../../../common/contributions.js';
+import { Memento } from '../../../../../common/memento.js';
+import { NotebookSetting } from '../../../common/notebookCommon.js';
+import { HAS_OPENED_NOTEBOOK } from '../../../common/notebookContextKeys.js';
+import { NotebookEditorInput } from '../../../common/notebookEditorInput.js';
+import { IEditorService } from '../../../../../services/editor/common/editorService.js';
+import { LifecyclePhase } from '../../../../../services/lifecycle/common/lifecycle.js';
 
 const hasOpenedNotebookKey = 'hasOpenedNotebook';
 const hasShownGettingStartedKey = 'hasShownNotebookGettingStarted';
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/kernelDetection/notebookKernelDetection.ts b/src/vs/workbench/contrib/notebook/browser/contrib/kernelDetection/notebookKernelDetection.ts
index 85bc8020fe7..d0e63b3f214 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/kernelDetection/notebookKernelDetection.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/kernelDetection/notebookKernelDetection.ts
@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 
-import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
-import { INotebookKernelService } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
-import { INotebookLoggingService } from 'vs/workbench/contrib/notebook/common/notebookLoggingService';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { Disposable, DisposableStore, IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { Registry } from '../../../../../../platform/registry/common/platform.js';
+import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from '../../../../../common/contributions.js';
+import { INotebookKernelService } from '../../../common/notebookKernelService.js';
+import { INotebookLoggingService } from '../../../common/notebookLoggingService.js';
+import { IExtensionService } from '../../../../../services/extensions/common/extensions.js';
+import { LifecyclePhase } from '../../../../../services/lifecycle/common/lifecycle.js';
 
 class NotebookKernelDetection extends Disposable implements IWorkbenchContribution {
 	private _detectionMap = new Map<string, IDisposable>();
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/layout/layoutActions.ts b/src/vs/workbench/contrib/notebook/browser/contrib/layout/layoutActions.ts
index f051ee94662..c1b03d24ada 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/layout/layoutActions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/layout/layoutActions.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize2 } from 'vs/nls';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { INotebookActionContext, NOTEBOOK_ACTIONS_CATEGORY } from 'vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { NotebookSetting } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { localize2 } from '../../../../../../nls.js';
+import { Action2, MenuId, registerAction2 } from '../../../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { ServicesAccessor } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { INotebookActionContext, NOTEBOOK_ACTIONS_CATEGORY } from '../../controller/coreActions.js';
+import { NotebookSetting } from '../../../common/notebookCommon.js';
 
 const TOGGLE_CELL_TOOLBAR_POSITION = 'notebook.toggleCellToolbarPosition';
 
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/marker/markerProvider.ts b/src/vs/workbench/contrib/notebook/browser/contrib/marker/markerProvider.ts
index 760263fada1..ccd6436bd8c 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/marker/markerProvider.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/marker/markerProvider.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { IMarkerListProvider, MarkerList, IMarkerNavigationService } from 'vs/editor/contrib/gotoError/browser/markerNavigationService';
-import { CellUri } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { IMarkerService, MarkerSeverity } from 'vs/platform/markers/common/markers';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { INotebookDeltaDecoration, INotebookEditor, INotebookEditorContribution, NotebookOverviewRulerLane } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { registerNotebookContribution } from 'vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
-import { throttle } from 'vs/base/common/decorators';
-import { editorErrorForeground, editorWarningForeground } from 'vs/platform/theme/common/colorRegistry';
-import { isEqual } from 'vs/base/common/resources';
+import { URI } from '../../../../../../base/common/uri.js';
+import { WorkbenchPhase, registerWorkbenchContribution2 } from '../../../../../common/contributions.js';
+import { IMarkerListProvider, MarkerList, IMarkerNavigationService } from '../../../../../../editor/contrib/gotoError/browser/markerNavigationService.js';
+import { CellUri } from '../../../common/notebookCommon.js';
+import { IMarkerService, MarkerSeverity } from '../../../../../../platform/markers/common/markers.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { Disposable, IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { INotebookDeltaDecoration, INotebookEditor, INotebookEditorContribution, NotebookOverviewRulerLane } from '../../notebookBrowser.js';
+import { registerNotebookContribution } from '../../notebookEditorExtensions.js';
+import { throttle } from '../../../../../../base/common/decorators.js';
+import { editorErrorForeground, editorWarningForeground } from '../../../../../../platform/theme/common/colorRegistry.js';
+import { isEqual } from '../../../../../../base/common/resources.js';
 
 class MarkerListProvider implements IMarkerListProvider {
 
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookMulticursor.ts b/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookMulticursor.ts
new file mode 100644
index 00000000000..9309d784fd7
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookMulticursor.ts
@@ -0,0 +1,1099 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { localize } from '../../../../../../nls.js';
+import { Emitter, Event } from '../../../../../../base/common/event.js';
+import { KeyCode, KeyMod } from '../../../../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../../../base/common/map.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { EditorConfiguration } from '../../../../../../editor/browser/config/editorConfiguration.js';
+import { CoreEditingCommands } from '../../../../../../editor/browser/coreCommands.js';
+import { ICodeEditor, PastePayload } from '../../../../../../editor/browser/editorBrowser.js';
+import { RedoCommand, UndoCommand } from '../../../../../../editor/browser/editorExtensions.js';
+import { CodeEditorWidget } from '../../../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { IEditorConfiguration } from '../../../../../../editor/common/config/editorConfiguration.js';
+import { cursorBlinkingStyleFromString, cursorStyleFromString, TextEditorCursorBlinkingStyle, TextEditorCursorStyle } from '../../../../../../editor/common/config/editorOptions.js';
+import { Position } from '../../../../../../editor/common/core/position.js';
+import { Range } from '../../../../../../editor/common/core/range.js';
+import { Selection, SelectionDirection } from '../../../../../../editor/common/core/selection.js';
+import { IWordAtPosition, USUAL_WORD_SEPARATORS } from '../../../../../../editor/common/core/wordHelper.js';
+import { CommandExecutor, CursorsController } from '../../../../../../editor/common/cursor/cursor.js';
+import { DeleteOperations } from '../../../../../../editor/common/cursor/cursorDeleteOperations.js';
+import { CursorConfiguration, ICursorSimpleModel } from '../../../../../../editor/common/cursorCommon.js';
+import { CursorChangeReason } from '../../../../../../editor/common/cursorEvents.js';
+import { CompositionTypePayload, Handler, ReplacePreviousCharPayload } from '../../../../../../editor/common/editorCommon.js';
+import { ILanguageConfigurationService } from '../../../../../../editor/common/languages/languageConfigurationRegistry.js';
+import { IModelDeltaDecoration, ITextModel, PositionAffinity } from '../../../../../../editor/common/model.js';
+import { indentOfLine } from '../../../../../../editor/common/model/textModel.js';
+import { ITextModelService } from '../../../../../../editor/common/services/resolverService.js';
+import { ICoordinatesConverter } from '../../../../../../editor/common/viewModel.js';
+import { ViewModelEventsCollector } from '../../../../../../editor/common/viewModelEventDispatcher.js';
+import { WordHighlighterContribution } from '../../../../../../editor/contrib/wordHighlighter/browser/wordHighlighter.js';
+import { IAccessibilityService } from '../../../../../../platform/accessibility/common/accessibility.js';
+import { MenuId, registerAction2 } from '../../../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr, IContextKeyService, RawContextKey } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { ServicesAccessor } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IPastFutureElements, IUndoRedoElement, IUndoRedoService, UndoRedoElementType } from '../../../../../../platform/undoRedo/common/undoRedo.js';
+import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../../../common/contributions.js';
+import { IEditorService } from '../../../../../services/editor/common/editorService.js';
+import { NOTEBOOK_CELL_EDITOR_FOCUSED, NOTEBOOK_IS_ACTIVE_EDITOR } from '../../../common/notebookContextKeys.js';
+import { INotebookActionContext, NotebookAction } from '../../controller/coreActions.js';
+import { getNotebookEditorFromEditorPane, ICellViewModel, INotebookEditor, INotebookEditorContribution } from '../../notebookBrowser.js';
+import { registerNotebookContribution } from '../../notebookEditorExtensions.js';
+import { CellEditorOptions } from '../../view/cellParts/cellEditorOptions.js';
+
+const NOTEBOOK_ADD_FIND_MATCH_TO_SELECTION_ID = 'notebook.addFindMatchToSelection';
+
+export enum NotebookMultiCursorState {
+	Idle,
+	Selecting,
+	Editing,
+}
+
+interface NotebookCursorConfig {
+	cursorStyle: TextEditorCursorStyle;
+	cursorBlinking: TextEditorCursorBlinkingStyle;
+	cursorSmoothCaretAnimation: 'off' | 'explicit' | 'on';
+}
+
+interface SelectionTranslation {
+	deltaStartCol: number;
+	deltaStartLine: number;
+	deltaEndCol: number;
+	deltaEndLine: number;
+}
+
+interface TrackedMatch {
+	cellViewModel: ICellViewModel;
+	initialSelection: Selection;
+	wordSelections: Selection[];
+	editorConfig: IEditorConfiguration;
+	cursorConfig: NotebookCursorConfig;
+	decorationIds: string[];
+	undoRedoHistory: IPastFutureElements;
+}
+
+export const NOTEBOOK_MULTI_CURSOR_CONTEXT = {
+	IsNotebookMultiCursor: new RawContextKey<boolean>('isNotebookMultiSelect', false),
+	NotebookMultiSelectCursorState: new RawContextKey<NotebookMultiCursorState>('notebookMultiSelectCursorState', NotebookMultiCursorState.Idle),
+};
+
+export class NotebookMultiCursorController extends Disposable implements INotebookEditorContribution {
+
+	static readonly id: string = 'notebook.multiCursorController';
+
+	private word: string = '';
+	private trackedMatches: TrackedMatch[] = [];
+
+	private readonly _onDidChangeAnchorCell = this._register(new Emitter<void>());
+	readonly onDidChangeAnchorCell: Event<void> = this._onDidChangeAnchorCell.event;
+	private anchorCell: [ICellViewModel, ICodeEditor] | undefined;
+
+	private readonly anchorDisposables = this._register(new DisposableStore());
+	private readonly cursorsDisposables = this._register(new DisposableStore());
+	private cursorsControllers: ResourceMap<CursorsController> = new ResourceMap<CursorsController>();
+
+	private state: NotebookMultiCursorState = NotebookMultiCursorState.Idle;
+	public getState(): NotebookMultiCursorState {
+		return this.state;
+	}
+
+	private _nbIsMultiSelectSession = NOTEBOOK_MULTI_CURSOR_CONTEXT.IsNotebookMultiCursor.bindTo(this.contextKeyService);
+	private _nbMultiSelectState = NOTEBOOK_MULTI_CURSOR_CONTEXT.NotebookMultiSelectCursorState.bindTo(this.contextKeyService);
+
+	constructor(
+		private readonly notebookEditor: INotebookEditor,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@ITextModelService private readonly textModelService: ITextModelService,
+		@ILanguageConfigurationService private readonly languageConfigurationService: ILanguageConfigurationService,
+		@IAccessibilityService private readonly accessibilityService: IAccessibilityService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IUndoRedoService private readonly undoRedoService: IUndoRedoService,
+	) {
+		super();
+
+		this.anchorCell = this.notebookEditor.activeCellAndCodeEditor;
+
+		// anchor cell will catch and relay all type, cut, paste events to the cursors controllers
+		// need to create new controllers when the anchor cell changes, then update their listeners
+		// ** cursor controllers need to happen first, because anchor listeners relay to them
+		this._register(this.onDidChangeAnchorCell(() => {
+			this.updateCursorsControllers();
+			this.updateAnchorListeners();
+		}));
+	}
+
+	private updateCursorsControllers() {
+		this.cursorsDisposables.clear(); // TODO: dial this back for perf and just update the relevant controllers
+		this.trackedMatches.forEach(async match => {
+			const textModelRef = await this.textModelService.createModelReference(match.cellViewModel.uri);
+			const textModel = textModelRef.object.textEditorModel;
+			if (!textModel) {
+				return;
+			}
+
+			const cursorSimpleModel = this.constructCursorSimpleModel(match.cellViewModel);
+			const converter = this.constructCoordinatesConverter();
+			const editorConfig = match.editorConfig;
+
+			const controller = this.cursorsDisposables.add(new CursorsController(
+				textModel,
+				cursorSimpleModel,
+				converter,
+				new CursorConfiguration(textModel.getLanguageId(), textModel.getOptions(), editorConfig, this.languageConfigurationService)
+			));
+
+			controller.setSelections(new ViewModelEventsCollector(), undefined, match.wordSelections, CursorChangeReason.Explicit);
+			this.cursorsControllers.set(match.cellViewModel.uri, controller);
+		});
+	}
+
+	private constructCoordinatesConverter(): ICoordinatesConverter {
+		return {
+			convertViewPositionToModelPosition(viewPosition: Position): Position {
+				return viewPosition;
+			},
+			convertViewRangeToModelRange(viewRange: Range): Range {
+				return viewRange;
+			},
+			validateViewPosition(viewPosition: Position, expectedModelPosition: Position): Position {
+				return viewPosition;
+			},
+			validateViewRange(viewRange: Range, expectedModelRange: Range): Range {
+				return viewRange;
+			},
+			convertModelPositionToViewPosition(modelPosition: Position, affinity?: PositionAffinity, allowZeroLineNumber?: boolean, belowHiddenRanges?: boolean): Position {
+				return modelPosition;
+			},
+			convertModelRangeToViewRange(modelRange: Range, affinity?: PositionAffinity): Range {
+				return modelRange;
+			},
+			modelPositionIsVisible(modelPosition: Position): boolean {
+				return true;
+			},
+			getModelLineViewLineCount(modelLineNumber: number): number {
+				return 1;
+			},
+			getViewLineNumberOfModelPosition(modelLineNumber: number, modelColumn: number): number {
+				return modelLineNumber;
+			}
+		};
+	}
+
+	private constructCursorSimpleModel(cell: ICellViewModel): ICursorSimpleModel {
+		return {
+			getLineCount(): number {
+				return cell.textBuffer.getLineCount();
+			},
+			getLineContent(lineNumber: number): string {
+				return cell.textBuffer.getLineContent(lineNumber);
+			},
+			getLineMinColumn(lineNumber: number): number {
+				return cell.textBuffer.getLineMinColumn(lineNumber);
+			},
+			getLineMaxColumn(lineNumber: number): number {
+				return cell.textBuffer.getLineMaxColumn(lineNumber);
+			},
+			getLineFirstNonWhitespaceColumn(lineNumber: number): number {
+				return cell.textBuffer.getLineFirstNonWhitespaceColumn(lineNumber);
+			},
+			getLineLastNonWhitespaceColumn(lineNumber: number): number {
+				return cell.textBuffer.getLineLastNonWhitespaceColumn(lineNumber);
+			},
+			normalizePosition(position: Position, affinity: PositionAffinity): Position {
+				return position;
+			},
+			getLineIndentColumn(lineNumber: number): number {
+				return indentOfLine(cell.textBuffer.getLineContent(lineNumber)) + 1;
+			}
+		};
+	}
+
+	private updateAnchorListeners() {
+		this.anchorDisposables.clear();
+
+		if (!this.anchorCell) {
+			throw new Error('Anchor cell is undefined');
+		}
+
+		// typing
+		this.anchorDisposables.add(this.anchorCell[1].onWillType((input) => {
+			const collector = new ViewModelEventsCollector();
+			this.trackedMatches.forEach(match => {
+				const controller = this.cursorsControllers.get(match.cellViewModel.uri);
+				if (!controller) {
+					// should not happen
+					return;
+				}
+				if (match.cellViewModel.handle !== this.anchorCell?.[0].handle) { // don't relay to active cell, already has a controller for typing
+					controller.type(collector, input, 'keyboard');
+				}
+			});
+		}));
+
+		this.anchorDisposables.add(this.anchorCell[1].onDidType(() => {
+			this.state = NotebookMultiCursorState.Editing; // typing will continue to work as normal across ranges, just preps for another cmd+d
+			this._nbMultiSelectState.set(NotebookMultiCursorState.Editing);
+
+			const anchorController = this.cursorsControllers.get(this.anchorCell![0].uri);
+			if (!anchorController) {
+				return;
+			}
+			const activeSelections = this.notebookEditor.activeCodeEditor?.getSelections();
+			if (!activeSelections) {
+				return;
+			}
+
+			// need to keep anchor cursor controller in sync manually (for delete usage), since we don't relay type event to it
+			anchorController.setSelections(new ViewModelEventsCollector(), 'keyboard', activeSelections, CursorChangeReason.Explicit);
+
+			this.trackedMatches.forEach(match => {
+				const controller = this.cursorsControllers.get(match.cellViewModel.uri);
+				if (!controller) {
+					return;
+				}
+
+				// this is used upon exiting the multicursor session to set the selections back to the correct cursor state
+				match.initialSelection = controller.getSelection();
+				// clear tracked selection data as it is invalid once typing begins
+				match.wordSelections = [];
+			});
+
+			this.updateLazyDecorations();
+		}));
+
+		// arrow key navigation
+		this.anchorDisposables.add(this.anchorCell[1].onDidChangeCursorSelection((e) => {
+			if (e.source === 'mouse') {
+				this.resetToIdleState();
+				return;
+			}
+
+			// ignore this event if it was caused by a typing event or a delete (NotSet and RecoverFromMarkers respectively)
+			if (!e.oldSelections || e.reason === CursorChangeReason.NotSet || e.reason === CursorChangeReason.RecoverFromMarkers) {
+				return;
+			}
+
+			const translation: SelectionTranslation = {
+				deltaStartCol: e.selection.startColumn - e.oldSelections[0].startColumn,
+				deltaStartLine: e.selection.startLineNumber - e.oldSelections[0].startLineNumber,
+				deltaEndCol: e.selection.endColumn - e.oldSelections[0].endColumn,
+				deltaEndLine: e.selection.endLineNumber - e.oldSelections[0].endLineNumber,
+			};
+			const translationDir = e.selection.getDirection();
+
+			this.trackedMatches.forEach(match => {
+				const controller = this.cursorsControllers.get(match.cellViewModel.uri);
+				if (!controller) {
+					return;
+				}
+
+				const newSelections = controller.getSelections().map(selection => {
+					const newStartCol = selection.startColumn + translation.deltaStartCol;
+					const newStartLine = selection.startLineNumber + translation.deltaStartLine;
+					const newEndCol = selection.endColumn + translation.deltaEndCol;
+					const newEndLine = selection.endLineNumber + translation.deltaEndLine;
+					return Selection.createWithDirection(newStartLine, newStartCol, newEndLine, newEndCol, translationDir);
+				});
+
+				controller.setSelections(new ViewModelEventsCollector(), e.source, newSelections, CursorChangeReason.Explicit);
+			});
+
+			this.updateLazyDecorations();
+		}));
+
+		// core actions
+		this.anchorDisposables.add(this.anchorCell[1].onWillTriggerEditorOperationEvent((e) => {
+			this.trackedMatches.forEach(match => {
+				if (match.cellViewModel.handle === this.anchorCell?.[0].handle) {
+					return;
+				}
+
+				const eventsCollector = new ViewModelEventsCollector();
+				const controller = this.cursorsControllers.get(match.cellViewModel.uri);
+				if (!controller) {
+					return;
+				}
+				switch (e.handlerId) {
+					case Handler.CompositionStart:
+						controller.startComposition(eventsCollector);
+						return;
+					case Handler.CompositionEnd:
+						controller.endComposition(eventsCollector, e.source);
+						return;
+					case Handler.ReplacePreviousChar: {
+						const args = <Partial<ReplacePreviousCharPayload>>e.payload;
+						controller.compositionType(eventsCollector, args.text || '', args.replaceCharCnt || 0, 0, 0, e.source);
+						return;
+					}
+					case Handler.CompositionType: {
+						const args = <Partial<CompositionTypePayload>>e.payload;
+						controller.compositionType(eventsCollector, args.text || '', args.replacePrevCharCnt || 0, args.replaceNextCharCnt || 0, args.positionDelta || 0, e.source);
+						return;
+					}
+					case Handler.Paste: {
+						const args = <Partial<PastePayload>>e.payload;
+						controller.paste(eventsCollector, args.text || '', args.pasteOnNewLine || false, args.multicursorText || null, e.source);
+						return;
+
+						// ! this code is for firing the paste event, not sure what that would enable, trace the event listener
+						// const startPos = XYZ
+						// const endPos = XYZ
+						// if (source === 'keyboard') {
+						// 	this._onDidPaste.fire({
+						// 		clipboardEvent,
+						// 		range: new Range(startPosition.lineNumber, startPosition.column, endPosition.lineNumber, endPosition.column),
+						// 		languageId: mode
+						// 	});
+						// }
+					}
+					case Handler.Cut:
+						controller.cut(eventsCollector, e.source);
+						return;
+				}
+			});
+		}));
+
+		// exit mode
+		this.anchorDisposables.add(this.anchorCell[1].onDidBlurEditorWidget(() => {
+			if (this.state === NotebookMultiCursorState.Selecting || this.state === NotebookMultiCursorState.Editing) {
+				this.resetToIdleState();
+			}
+		}));
+	}
+
+	private updateFinalUndoRedo() {
+		const anchorCellModel = this.anchorCell?.[1].getModel();
+		if (!anchorCellModel) {
+			// should not happen
+			return;
+		}
+
+		const newElementsMap: ResourceMap<IUndoRedoElement[]> = new ResourceMap<IUndoRedoElement[]>();
+		const resources: URI[] = [];
+
+		this.trackedMatches.forEach(trackedMatch => {
+			const undoRedoState = trackedMatch.undoRedoHistory;
+			if (!undoRedoState) {
+				return;
+			}
+
+			resources.push(trackedMatch.cellViewModel.uri);
+
+			const currentPastElements = this.undoRedoService.getElements(trackedMatch.cellViewModel.uri).past.slice();
+			const oldPastElements = trackedMatch.undoRedoHistory.past.slice();
+			const newElements = currentPastElements.slice(oldPastElements.length);
+			if (newElements.length === 0) {
+				return;
+			}
+
+			newElementsMap.set(trackedMatch.cellViewModel.uri, newElements);
+
+			this.undoRedoService.removeElements(trackedMatch.cellViewModel.uri);
+			oldPastElements.forEach(element => {
+				this.undoRedoService.pushElement(element);
+			});
+		});
+
+		this.undoRedoService.pushElement({
+			type: UndoRedoElementType.Workspace,
+			resources: resources,
+			label: 'Multi Cursor Edit',
+			code: 'multiCursorEdit',
+			confirmBeforeUndo: false,
+			undo: async () => {
+				newElementsMap.forEach(async value => {
+					value.reverse().forEach(async element => {
+						await element.undo();
+					});
+				});
+			},
+			redo: async () => {
+				newElementsMap.forEach(async value => {
+					value.forEach(async element => {
+						await element.redo();
+					});
+				});
+			}
+		});
+	}
+
+	public resetToIdleState() {
+		this.state = NotebookMultiCursorState.Idle;
+		this._nbMultiSelectState.set(NotebookMultiCursorState.Idle);
+		this._nbIsMultiSelectSession.set(false);
+		this.updateFinalUndoRedo();
+
+		this.trackedMatches.forEach(match => {
+			this.clearDecorations(match);
+			match.cellViewModel.setSelections([match.initialSelection]); // correct cursor placement upon exiting cmd-d session
+		});
+
+		this.anchorDisposables.clear();
+		this.anchorCell = undefined;
+		this.cursorsDisposables.clear();
+		this.cursorsControllers.clear();
+		this.trackedMatches = [];
+	}
+
+	public async findAndTrackNextSelection(cell: ICellViewModel): Promise<void> {
+		if (this.state === NotebookMultiCursorState.Idle) { // move cursor to end of the symbol + track it, transition to selecting state
+			const textModel = cell.textModel;
+			if (!textModel) {
+				return;
+			}
+
+			const inputSelection = cell.getSelections()[0];
+			const word = this.getWord(inputSelection, textModel);
+			if (!word) {
+				return;
+			}
+			this.word = word.word;
+
+			const newSelection = new Selection(
+				inputSelection.startLineNumber,
+				word.startColumn,
+				inputSelection.startLineNumber,
+				word.endColumn
+			);
+			cell.setSelections([newSelection]);
+
+			this.anchorCell = this.notebookEditor.activeCellAndCodeEditor;
+			if (!this.anchorCell || this.anchorCell[0].handle !== cell.handle) {
+				throw new Error('Active cell is not the same as the cell passed as context');
+			}
+			if (!(this.anchorCell[1] instanceof CodeEditorWidget)) {
+				throw new Error('Active cell is not an instance of CodeEditorWidget');
+			}
+
+			textModel.pushStackElement();
+
+			this.trackedMatches = [];
+			const editorConfig = this.constructCellEditorOptions(this.anchorCell[0]);
+			const rawEditorOptions = editorConfig.getRawOptions();
+			const cursorConfig: NotebookCursorConfig = {
+				cursorStyle: cursorStyleFromString(rawEditorOptions.cursorStyle!),
+				cursorBlinking: cursorBlinkingStyleFromString(rawEditorOptions.cursorBlinking!),
+				cursorSmoothCaretAnimation: rawEditorOptions.cursorSmoothCaretAnimation!
+			};
+
+			const newMatch: TrackedMatch = {
+				cellViewModel: cell,
+				initialSelection: inputSelection,
+				wordSelections: [newSelection],
+				editorConfig: editorConfig, // cache this in the match so we can create new cursors controllers with the correct language config
+				cursorConfig: cursorConfig,
+				decorationIds: [],
+				undoRedoHistory: this.undoRedoService.getElements(cell.uri)
+			};
+			this.trackedMatches.push(newMatch);
+
+			this._nbIsMultiSelectSession.set(true);
+			this.state = NotebookMultiCursorState.Selecting;
+			this._nbMultiSelectState.set(NotebookMultiCursorState.Selecting);
+			this._onDidChangeAnchorCell.fire();
+
+		} else if (this.state === NotebookMultiCursorState.Selecting) { // use the word we stored from idle state transition to find next match, track it
+			const notebookTextModel = this.notebookEditor.textModel;
+			if (!notebookTextModel) {
+				return;
+			}
+
+			const index = this.notebookEditor.getCellIndex(cell);
+			if (index === undefined) {
+				return;
+			}
+
+			const findResult = notebookTextModel.findNextMatch(
+				this.word,
+				{ cellIndex: index, position: cell.getSelections()[cell.getSelections().length - 1].getEndPosition() },
+				false,
+				true,
+				USUAL_WORD_SEPARATORS //! might want to get these from the editor config
+			);
+			if (!findResult) {
+				return; //todo: some sort of message to the user alerting them that there are no more matches? editor does not do this
+			}
+
+			const resultCellViewModel = this.notebookEditor.getCellByHandle(findResult.cell.handle);
+			if (!resultCellViewModel) {
+				return;
+			}
+
+			let newMatch: TrackedMatch;
+			if (findResult.cell.handle === cell.handle) { // match is in the same cell, find tracked entry, update and set selections in viewmodel and cursorController
+				newMatch = this.trackedMatches.find(match => match.cellViewModel.handle === findResult.cell.handle)!;
+				newMatch.wordSelections.push(Selection.fromRange(findResult.match.range, SelectionDirection.LTR));
+				resultCellViewModel.setSelections(newMatch.wordSelections);
+
+				const controller = this.cursorsControllers.get(newMatch.cellViewModel.uri);
+				if (!controller) {
+					// should not happen
+					return;
+				}
+				controller.setSelections(new ViewModelEventsCollector(), undefined, newMatch.wordSelections, CursorChangeReason.Explicit);
+
+			} else if (findResult.cell.handle !== cell.handle) {	// result is in a different cell, move focus there and apply selection, then update anchor
+				await this.notebookEditor.revealRangeInViewAsync(resultCellViewModel, findResult.match.range);
+				this.notebookEditor.focusNotebookCell(resultCellViewModel, 'editor');
+
+				const initialSelection = resultCellViewModel.getSelections()[0];
+				const newSelection = Selection.fromRange(findResult.match.range, SelectionDirection.LTR);
+				resultCellViewModel.setSelections([newSelection]);
+				if (this.notebookEditor.activeCellAndCodeEditor?.[0].handle !== resultCellViewModel.handle) {
+					// should not happen
+					throw new Error('Focused cell does not match the find match data');
+				}
+
+				this.anchorCell = this.notebookEditor.activeCellAndCodeEditor;
+				if (!this.anchorCell || !(this.anchorCell[1] instanceof CodeEditorWidget)) {
+					throw new Error('Active cell is not an instance of CodeEditorWidget');
+				}
+
+				const textModel = await resultCellViewModel.resolveTextModel();
+				textModel.pushStackElement();
+
+				const editorConfig = this.constructCellEditorOptions(this.anchorCell[0]);
+				const rawEditorOptions = editorConfig.getRawOptions();
+				const cursorConfig: NotebookCursorConfig = {
+					cursorStyle: cursorStyleFromString(rawEditorOptions.cursorStyle!),
+					cursorBlinking: cursorBlinkingStyleFromString(rawEditorOptions.cursorBlinking!),
+					cursorSmoothCaretAnimation: rawEditorOptions.cursorSmoothCaretAnimation!
+				};
+
+				newMatch = {
+					cellViewModel: resultCellViewModel,
+					initialSelection: initialSelection,
+					wordSelections: [newSelection],
+					editorConfig: editorConfig,
+					cursorConfig: cursorConfig,
+					decorationIds: [],
+					undoRedoHistory: this.undoRedoService.getElements(resultCellViewModel.uri)
+				} satisfies TrackedMatch;
+				this.trackedMatches.push(newMatch);
+
+				this._onDidChangeAnchorCell.fire();
+
+				// we set the decorations manually for the cell we have just departed, since it blurs
+				// we can find the match with the handle that the find and track request originated
+				this.initializeMultiSelectDecorations(this.trackedMatches.find(match => match.cellViewModel.handle === cell.handle));
+			} else {
+				// should not happen
+				return;
+			}
+
+		}
+	}
+
+	public async deleteLeft(): Promise<void> {
+		this.trackedMatches.forEach(match => {
+			const controller = this.cursorsControllers.get(match.cellViewModel.uri);
+			if (!controller) {
+				// should not happen
+				return;
+			}
+
+			const [, commands] = DeleteOperations.deleteLeft(
+				controller.getPrevEditOperationType(),
+				controller.context.cursorConfig,
+				controller.context.model,
+				controller.getSelections(),
+				controller.getAutoClosedCharacters(),
+			);
+
+			const delSelections = CommandExecutor.executeCommands(controller.context.model, controller.getSelections(), commands);
+			if (!delSelections) {
+				return;
+			}
+			controller.setSelections(new ViewModelEventsCollector(), undefined, delSelections, CursorChangeReason.Explicit);
+		});
+		this.updateLazyDecorations();
+	}
+
+	public async deleteRight(): Promise<void> {
+		this.trackedMatches.forEach(match => {
+			const controller = this.cursorsControllers.get(match.cellViewModel.uri);
+			if (!controller) {
+				// should not happen
+				return;
+			}
+
+			const [, commands] = DeleteOperations.deleteRight(
+				controller.getPrevEditOperationType(),
+				controller.context.cursorConfig,
+				controller.context.model,
+				controller.getSelections(),
+			);
+
+			if (match.cellViewModel.handle !== this.anchorCell?.[0].handle) {
+				const delSelections = CommandExecutor.executeCommands(controller.context.model, controller.getSelections(), commands);
+				if (!delSelections) {
+					return;
+				}
+				controller.setSelections(new ViewModelEventsCollector(), undefined, delSelections, CursorChangeReason.Explicit);
+			} else {
+				// get the selections from the viewmodel since we run the command manually (for cursor decoration reasons)
+				controller.setSelections(new ViewModelEventsCollector(), undefined, match.cellViewModel.getSelections(), CursorChangeReason.Explicit);
+			}
+
+		});
+		this.updateLazyDecorations();
+	}
+
+	async undo() {
+		const models: ITextModel[] = [];
+		for (const match of this.trackedMatches) {
+			const model = await match.cellViewModel.resolveTextModel();
+			if (model) {
+				models.push(model);
+			}
+
+			const controller = this.cursorsControllers.get(match.cellViewModel.uri);
+			if (!controller) {
+				// should not happen
+				return;
+			}
+			controller.setSelections(new ViewModelEventsCollector(), undefined, match.cellViewModel.getSelections(), CursorChangeReason.Explicit);
+		}
+
+		await Promise.all(models.map(model => model.undo()));
+		this.updateLazyDecorations();
+	}
+
+	async redo() {
+		const models: ITextModel[] = [];
+		for (const match of this.trackedMatches) {
+			const model = await match.cellViewModel.resolveTextModel();
+			if (model) {
+				models.push(model);
+			}
+
+			const controller = this.cursorsControllers.get(match.cellViewModel.uri);
+			if (!controller) {
+				// should not happen
+				return;
+			}
+			controller.setSelections(new ViewModelEventsCollector(), undefined, match.cellViewModel.getSelections(), CursorChangeReason.Explicit);
+		}
+
+		await Promise.all(models.map(model => model.redo()));
+		this.updateLazyDecorations();
+	}
+
+	private constructCellEditorOptions(cell: ICellViewModel): EditorConfiguration {
+		const cellEditorOptions = new CellEditorOptions(this.notebookEditor.getBaseCellEditorOptions(cell.language), this.notebookEditor.notebookOptions, this.configurationService);
+		const options = cellEditorOptions.getUpdatedValue(cell.internalMetadata, cell.uri);
+		return new EditorConfiguration(false, MenuId.EditorContent, options, null, this.accessibilityService);
+	}
+
+	/**
+	 * Updates the multicursor selection decorations for a specific matched cell
+	 *
+	 * @param match -- match object containing the viewmodel + selections
+	 */
+	private initializeMultiSelectDecorations(match: TrackedMatch | undefined, isCurrentWord?: boolean) {
+		if (!match) {
+			return;
+		}
+
+		const decorations: IModelDeltaDecoration[] = [];
+		match.wordSelections.forEach(selection => {
+			// mock cursor at the end of the selection
+			decorations.push({
+				range: Selection.fromPositions(selection.getEndPosition()),
+				options: {
+					description: '',
+					className: this.getClassName(match.cursorConfig, true),
+				}
+			});
+		});
+
+		match.decorationIds = match.cellViewModel.deltaModelDecorations(
+			match.decorationIds,
+			decorations
+		);
+	}
+
+	private updateLazyDecorations() {
+		// for every tracked match that is not in the visible range, dispose of their decorations and update them based off the cursorcontroller
+		this.trackedMatches.forEach(match => {
+			if (match.cellViewModel.handle === this.anchorCell?.[0].handle) {
+				return;
+			}
+
+			const controller = this.cursorsControllers.get(match.cellViewModel.uri);
+			if (!controller) {
+				// should not happen
+				return;
+			}
+			const selections = controller.getSelections();
+
+			const newDecorations: IModelDeltaDecoration[] = [];
+			selections?.map(selection => {
+				const isEmpty = selection.isEmpty();
+
+				if (!isEmpty) {
+					// selection decoration (shift+arrow, etc)
+					newDecorations.push({
+						range: selection,
+						options: {
+							description: '',
+							className: this.getClassName(match.cursorConfig, false),
+						}
+					});
+				}
+
+				// mock cursor at the end of the selection
+				newDecorations.push({
+					range: Selection.fromPositions(selection.getPosition()),
+					options: {
+						description: '',
+						zIndex: 10000,
+						className: this.getClassName(match.cursorConfig, true),
+					}
+				});
+			});
+
+			match.decorationIds = match.cellViewModel.deltaModelDecorations(
+				match.decorationIds,
+				newDecorations
+			);
+
+			/**
+			 * TODO: @Yoyokrazy debt
+			 * goal: draw decorations for occurrence higlight on the cursor blink cycle
+			 *
+			 * Trigger WH with delay: x ms (x = cursor blink cycle)
+			 * -> start = Date()
+			 * -> WordHighlighter -> compute
+			 * -> end = Date()
+			 * -> delay = x - ((end - start) % x)
+			 */
+			const matchingEditor = this.notebookEditor.codeEditors.find(cellEditor => cellEditor[0] === match.cellViewModel);
+			if (matchingEditor) {
+				WordHighlighterContribution.get(matchingEditor[1])?.wordHighlighter?.trigger();
+			}
+		});
+	}
+
+	private clearDecorations(match: TrackedMatch) {
+		match.decorationIds = match.cellViewModel.deltaModelDecorations(
+			match.decorationIds,
+			[]
+		);
+	}
+
+	private getWord(selection: Selection, model: ITextModel): IWordAtPosition | null {
+		const lineNumber = selection.startLineNumber;
+		const startColumn = selection.startColumn;
+
+		if (model.isDisposed()) {
+			return null;
+		}
+
+		return model.getWordAtPosition({
+			lineNumber: lineNumber,
+			column: startColumn
+		});
+	}
+
+	private getClassName(cursorConfig: NotebookCursorConfig, isCursor?: boolean): string {
+		let result = isCursor ? '.nb-multicursor-cursor' : '.nb-multicursor-selection';
+
+		if (isCursor) {
+			// handle base style
+			switch (cursorConfig.cursorStyle) {
+				case TextEditorCursorStyle.Line:
+					break; // default style, no additional class needed (handled by base css style)
+				case TextEditorCursorStyle.Block:
+					result += '.nb-cursor-block-style';
+					break;
+				case TextEditorCursorStyle.Underline:
+					result += '.nb-cursor-underline-style';
+					break;
+				case TextEditorCursorStyle.LineThin:
+					result += '.nb-cursor-line-thin-style';
+					break;
+				case TextEditorCursorStyle.BlockOutline:
+					result += '.nb-cursor-block-outline-style';
+					break;
+				case TextEditorCursorStyle.UnderlineThin:
+					result += '.nb-cursor-underline-thin-style';
+					break;
+				default:
+					break;
+			}
+
+			// handle animation style
+			switch (cursorConfig.cursorBlinking) {
+				case TextEditorCursorBlinkingStyle.Blink:
+					result += '.nb-blink';
+					break;
+				case TextEditorCursorBlinkingStyle.Smooth:
+					result += '.nb-smooth';
+					break;
+				case TextEditorCursorBlinkingStyle.Phase:
+					result += '.nb-phase';
+					break;
+				case TextEditorCursorBlinkingStyle.Expand:
+					result += '.nb-expand';
+					break;
+				case TextEditorCursorBlinkingStyle.Solid:
+					result += '.nb-solid';
+					break;
+				default:
+					result += '.nb-solid';
+					break;
+			}
+
+			// handle caret animation style
+			if (cursorConfig.cursorSmoothCaretAnimation === 'on' || cursorConfig.cursorSmoothCaretAnimation === 'explicit') {
+				result += '.nb-smooth-caret-animation';
+			}
+
+		}
+		return result;
+	}
+
+	override dispose(): void {
+		super.dispose();
+		this.anchorDisposables.dispose();
+		this.cursorsDisposables.dispose();
+
+		this.trackedMatches.forEach(match => {
+			this.clearDecorations(match);
+		});
+		this.trackedMatches = [];
+	}
+
+}
+
+class NotebookAddMatchToMultiSelectionAction extends NotebookAction {
+	constructor() {
+		super({
+			id: NOTEBOOK_ADD_FIND_MATCH_TO_SELECTION_ID,
+			title: localize('addFindMatchToSelection', "Add Find Match to Selection"),
+			precondition: ContextKeyExpr.and(
+				ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true),
+				NOTEBOOK_IS_ACTIVE_EDITOR,
+				NOTEBOOK_CELL_EDITOR_FOCUSED,
+			),
+			keybinding: {
+				when: ContextKeyExpr.and(
+					ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true),
+					NOTEBOOK_IS_ACTIVE_EDITOR,
+					NOTEBOOK_CELL_EDITOR_FOCUSED,
+				),
+				primary: KeyMod.CtrlCmd | KeyCode.KeyD,
+				weight: KeybindingWeight.WorkbenchContrib
+			}
+		});
+	}
+
+	override async runWithContext(accessor: ServicesAccessor, context: INotebookActionContext): Promise<void> {
+		const editorService = accessor.get(IEditorService);
+		const editor = getNotebookEditorFromEditorPane(editorService.activeEditorPane);
+
+		if (!editor) {
+			return;
+		}
+
+		if (!context.cell) {
+			return;
+		}
+
+		const controller = editor.getContribution<NotebookMultiCursorController>(NotebookMultiCursorController.id);
+		controller.findAndTrackNextSelection(context.cell);
+	}
+}
+
+class NotebookExitMultiSelectionAction extends NotebookAction {
+	constructor() {
+		super({
+			id: 'noteMultiCursor.exit',
+			title: localize('exitMultiSelection', "Exit Multi Cursor Mode"),
+			precondition: ContextKeyExpr.and(
+				ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true),
+				NOTEBOOK_IS_ACTIVE_EDITOR,
+				NOTEBOOK_MULTI_CURSOR_CONTEXT.IsNotebookMultiCursor,
+			),
+			keybinding: {
+				when: ContextKeyExpr.and(
+					ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true),
+					NOTEBOOK_IS_ACTIVE_EDITOR,
+					NOTEBOOK_MULTI_CURSOR_CONTEXT.IsNotebookMultiCursor,
+				),
+				primary: KeyCode.Escape,
+				weight: KeybindingWeight.WorkbenchContrib
+			}
+		});
+	}
+
+	override async runWithContext(accessor: ServicesAccessor, context: INotebookActionContext): Promise<void> {
+		const editorService = accessor.get(IEditorService);
+		const editor = getNotebookEditorFromEditorPane(editorService.activeEditorPane);
+
+		if (!editor) {
+			return;
+		}
+
+		const controller = editor.getContribution<NotebookMultiCursorController>(NotebookMultiCursorController.id);
+		controller.resetToIdleState();
+	}
+}
+
+class NotebookDeleteLeftMultiSelectionAction extends NotebookAction {
+	constructor() {
+		super({
+			id: 'noteMultiCursor.deleteLeft',
+			title: localize('deleteLeftMultiSelection', "Delete Left"),
+			precondition: ContextKeyExpr.and(
+				ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true),
+				NOTEBOOK_IS_ACTIVE_EDITOR,
+				NOTEBOOK_MULTI_CURSOR_CONTEXT.IsNotebookMultiCursor,
+				ContextKeyExpr.or(
+					NOTEBOOK_MULTI_CURSOR_CONTEXT.NotebookMultiSelectCursorState.isEqualTo(NotebookMultiCursorState.Selecting),
+					NOTEBOOK_MULTI_CURSOR_CONTEXT.NotebookMultiSelectCursorState.isEqualTo(NotebookMultiCursorState.Editing)
+				)
+			),
+			keybinding: {
+				when: ContextKeyExpr.and(
+					ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true),
+					NOTEBOOK_IS_ACTIVE_EDITOR,
+					NOTEBOOK_MULTI_CURSOR_CONTEXT.IsNotebookMultiCursor,
+					ContextKeyExpr.or(
+						NOTEBOOK_MULTI_CURSOR_CONTEXT.NotebookMultiSelectCursorState.isEqualTo(NotebookMultiCursorState.Selecting),
+						NOTEBOOK_MULTI_CURSOR_CONTEXT.NotebookMultiSelectCursorState.isEqualTo(NotebookMultiCursorState.Editing)
+					)
+				),
+				primary: KeyCode.Backspace,
+				weight: KeybindingWeight.WorkbenchContrib
+			}
+		});
+	}
+
+	override async runWithContext(accessor: ServicesAccessor, context: INotebookActionContext): Promise<void> {
+		const editorService = accessor.get(IEditorService);
+		const editor = getNotebookEditorFromEditorPane(editorService.activeEditorPane);
+
+		if (!editor) {
+			return;
+		}
+
+		const controller = editor.getContribution<NotebookMultiCursorController>(NotebookMultiCursorController.id);
+		controller.deleteLeft();
+	}
+}
+
+class NotebookDeleteRightMultiSelectionAction extends NotebookAction {
+	constructor() {
+		super({
+			id: 'noteMultiCursor.deleteRight',
+			title: localize('deleteRightMultiSelection', "Delete Right"),
+			precondition: ContextKeyExpr.and(
+				ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true),
+				NOTEBOOK_IS_ACTIVE_EDITOR,
+				NOTEBOOK_MULTI_CURSOR_CONTEXT.IsNotebookMultiCursor,
+				ContextKeyExpr.or(
+					NOTEBOOK_MULTI_CURSOR_CONTEXT.NotebookMultiSelectCursorState.isEqualTo(NotebookMultiCursorState.Selecting),
+					NOTEBOOK_MULTI_CURSOR_CONTEXT.NotebookMultiSelectCursorState.isEqualTo(NotebookMultiCursorState.Editing)
+				)
+			),
+			keybinding: {
+				when: ContextKeyExpr.and(
+					ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true),
+					NOTEBOOK_IS_ACTIVE_EDITOR,
+					NOTEBOOK_MULTI_CURSOR_CONTEXT.IsNotebookMultiCursor,
+					ContextKeyExpr.or(
+						NOTEBOOK_MULTI_CURSOR_CONTEXT.NotebookMultiSelectCursorState.isEqualTo(NotebookMultiCursorState.Selecting),
+						NOTEBOOK_MULTI_CURSOR_CONTEXT.NotebookMultiSelectCursorState.isEqualTo(NotebookMultiCursorState.Editing)
+					)
+				),
+				primary: KeyCode.Delete,
+				weight: KeybindingWeight.WorkbenchContrib
+			}
+		});
+	}
+
+	override async runWithContext(accessor: ServicesAccessor, context: INotebookActionContext): Promise<void> {
+		const editorService = accessor.get(IEditorService);
+		const nbEditor = getNotebookEditorFromEditorPane(editorService.activeEditorPane);
+		if (!nbEditor) {
+			return;
+		}
+		const cellEditor = nbEditor.activeCodeEditor;
+		if (!cellEditor) {
+			return;
+		}
+
+		// need to run the command manually since we are overriding the command, this ensures proper cursor animation behavior
+		CoreEditingCommands.DeleteRight.runEditorCommand(accessor, cellEditor, null);
+
+		const controller = nbEditor.getContribution<NotebookMultiCursorController>(NotebookMultiCursorController.id);
+		controller.deleteRight();
+	}
+}
+
+class NotebookMultiCursorUndoRedoContribution extends Disposable {
+
+	static readonly ID = 'workbench.contrib.notebook.multiCursorUndoRedo';
+
+	constructor(@IEditorService private readonly _editorService: IEditorService, @IConfigurationService private readonly configurationService: IConfigurationService) {
+		super();
+
+		if (!this.configurationService.getValue<boolean>('notebook.multiCursor.enabled')) {
+			return;
+		}
+
+		const PRIORITY = 10005;
+		this._register(UndoCommand.addImplementation(PRIORITY, 'notebook-multicursor-undo-redo', () => {
+			const editor = getNotebookEditorFromEditorPane(this._editorService.activeEditorPane);
+			if (!editor) {
+				return false;
+			}
+
+			if (!editor.hasModel()) {
+				return false;
+			}
+
+			const controller = editor.getContribution<NotebookMultiCursorController>(NotebookMultiCursorController.id);
+
+			return controller.undo();
+		}, ContextKeyExpr.and(
+			ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true),
+			NOTEBOOK_IS_ACTIVE_EDITOR,
+			NOTEBOOK_MULTI_CURSOR_CONTEXT.IsNotebookMultiCursor,
+		)));
+
+		this._register(RedoCommand.addImplementation(PRIORITY, 'notebook-multicursor-undo-redo', () => {
+			const editor = getNotebookEditorFromEditorPane(this._editorService.activeEditorPane);
+			if (!editor) {
+				return false;
+			}
+
+			if (!editor.hasModel()) {
+				return false;
+			}
+
+			const controller = editor.getContribution<NotebookMultiCursorController>(NotebookMultiCursorController.id);
+			return controller.redo();
+		}, ContextKeyExpr.and(
+			ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true),
+			NOTEBOOK_IS_ACTIVE_EDITOR,
+			NOTEBOOK_MULTI_CURSOR_CONTEXT.IsNotebookMultiCursor,
+		)));
+	}
+}
+
+registerNotebookContribution(NotebookMultiCursorController.id, NotebookMultiCursorController);
+registerWorkbenchContribution2(NotebookMultiCursorUndoRedoContribution.ID, NotebookMultiCursorUndoRedoContribution, WorkbenchPhase.BlockRestore);
+
+registerAction2(NotebookAddMatchToMultiSelectionAction);
+registerAction2(NotebookExitMultiSelectionAction);
+registerAction2(NotebookDeleteLeftMultiSelectionAction);
+registerAction2(NotebookDeleteRightMultiSelectionAction);
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/navigation/arrow.ts b/src/vs/workbench/contrib/notebook/browser/contrib/navigation/arrow.ts
index e6656eaac73..cf1e25c831d 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/navigation/arrow.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/navigation/arrow.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { timeout } from 'vs/base/common/async';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { localize } from 'vs/nls';
-import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from 'vs/platform/accessibility/common/accessibility';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { InputFocusedContextKey } from 'vs/platform/contextkey/common/contextkeys';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { InlineChatController } from 'vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION } from 'vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext';
-import { INotebookActionContext, INotebookCellActionContext, NotebookAction, NotebookCellAction, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, findTargetCellEditor } from 'vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { CellEditState } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CellKind, NOTEBOOK_EDITOR_CURSOR_BOUNDARY } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CELL_TYPE, NOTEBOOK_CURSOR_NAVIGATION_MODE, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_INPUT_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { timeout } from '../../../../../../base/common/async.js';
+import { KeyCode, KeyMod } from '../../../../../../base/common/keyCodes.js';
+import { ICodeEditor } from '../../../../../../editor/browser/editorBrowser.js';
+import { EditorExtensionsRegistry } from '../../../../../../editor/browser/editorExtensions.js';
+import { EditorContextKeys } from '../../../../../../editor/common/editorContextKeys.js';
+import { localize } from '../../../../../../nls.js';
+import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from '../../../../../../platform/accessibility/common/accessibility.js';
+import { Action2, registerAction2 } from '../../../../../../platform/actions/common/actions.js';
+import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from '../../../../../../platform/configuration/common/configurationRegistry.js';
+import { ContextKeyExpr } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { InputFocusedContextKey, IsWindowsContext } from '../../../../../../platform/contextkey/common/contextkeys.js';
+import { ServicesAccessor } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { Registry } from '../../../../../../platform/registry/common/platform.js';
+import { InlineChatController } from '../../../../inlineChat/browser/inlineChatController.js';
+import { CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION } from '../../controller/chat/notebookChatContext.js';
+import { INotebookActionContext, INotebookCellActionContext, NotebookAction, NotebookCellAction, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, findTargetCellEditor } from '../../controller/coreActions.js';
+import { CellEditState } from '../../notebookBrowser.js';
+import { CellKind, NOTEBOOK_EDITOR_CURSOR_BOUNDARY } from '../../../common/notebookCommon.js';
+import { NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CELL_TYPE, NOTEBOOK_CURSOR_NAVIGATION_MODE, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_INPUT_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_CELL_EDITOR_FOCUSED, IS_COMPOSITE_NOTEBOOK } from '../../../common/notebookContextKeys.js';
 
 const NOTEBOOK_FOCUS_TOP = 'notebook.focusTop';
 const NOTEBOOK_FOCUS_BOTTOM = 'notebook.focusBottom';
@@ -104,10 +104,10 @@ registerAction2(class FocusNextCellAction extends NotebookCellAction {
 					weight: KeybindingWeight.WorkbenchContrib
 				},
 				{
-					when: NOTEBOOK_EDITOR_FOCUSED,
-					primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown,
-					mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown, },
-					weight: KeybindingWeight.WorkbenchContrib
+					when: ContextKeyExpr.and(NOTEBOOK_CELL_EDITOR_FOCUSED, CONTEXT_ACCESSIBILITY_MODE_ENABLED),
+					primary: KeyMod.CtrlCmd | KeyCode.PageDown,
+					mac: { primary: KeyMod.WinCtrl | KeyCode.PageUp, },
+					weight: KeybindingWeight.WorkbenchContrib + 1
 				},
 			]
 		});
@@ -180,10 +180,10 @@ registerAction2(class FocusPreviousCellAction extends NotebookCellAction {
 					weight: KeybindingWeight.WorkbenchContrib, // markdown keybinding, focus on list: higher weight to override list.focusDown
 				},
 				{
-					when: NOTEBOOK_EDITOR_FOCUSED,
-					primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp,
-					mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp },
-					weight: KeybindingWeight.WorkbenchContrib
+					when: ContextKeyExpr.and(NOTEBOOK_CELL_EDITOR_FOCUSED, CONTEXT_ACCESSIBILITY_MODE_ENABLED),
+					primary: KeyMod.CtrlCmd | KeyCode.PageUp,
+					mac: { primary: KeyMod.WinCtrl | KeyCode.PageUp, },
+					weight: KeybindingWeight.WorkbenchContrib + 1
 				},
 			],
 		});
@@ -290,12 +290,17 @@ registerAction2(class extends NotebookCellAction {
 		super({
 			id: FOCUS_IN_OUTPUT_COMMAND_ID,
 			title: localize('focusOutput', 'Focus In Active Cell Output'),
-			keybinding: {
-				when: ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_CELL_HAS_OUTPUTS),
-				primary: KeyMod.CtrlCmd | KeyCode.DownArrow,
+			keybinding: [{
+				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.DownArrow,
 				mac: { primary: KeyMod.WinCtrl | KeyMod.CtrlCmd | KeyCode.DownArrow, },
 				weight: KeybindingWeight.WorkbenchContrib
 			},
+			{
+				when: ContextKeyExpr.and(IS_COMPOSITE_NOTEBOOK.negate(), IsWindowsContext),
+				primary: KeyMod.CtrlCmd | KeyCode.DownArrow,
+				weight: KeybindingWeight.WorkbenchContrib
+			}],
+			precondition: ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_CELL_HAS_OUTPUTS)
 		});
 	}
 
@@ -312,11 +317,11 @@ registerAction2(class extends NotebookCellAction {
 			id: FOCUS_OUT_OUTPUT_COMMAND_ID,
 			title: localize('focusOutputOut', 'Focus Out Active Cell Output'),
 			keybinding: {
-				when: ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED),
-				primary: KeyMod.CtrlCmd | KeyCode.UpArrow,
+				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.UpArrow,
 				mac: { primary: KeyMod.WinCtrl | KeyMod.CtrlCmd | KeyCode.UpArrow, },
 				weight: KeybindingWeight.WorkbenchContrib
 			},
+			precondition: ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED),
 		});
 	}
 
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariableCommands.ts b/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariableCommands.ts
index 03db0e250cd..f0641036e70 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariableCommands.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariableCommands.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { contextMenuArg } from 'vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesView';
-import { INotebookKernelService, VariablesResult } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
-import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
+import { CancellationToken } from '../../../../../../base/common/cancellation.js';
+import { URI, UriComponents } from '../../../../../../base/common/uri.js';
+import { localize } from '../../../../../../nls.js';
+import { Action2, registerAction2 } from '../../../../../../platform/actions/common/actions.js';
+import { IClipboardService } from '../../../../../../platform/clipboard/common/clipboardService.js';
+import { ServicesAccessor } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { contextMenuArg } from './notebookVariablesView.js';
+import { INotebookKernelService, VariablesResult } from '../../../common/notebookKernelService.js';
+import { INotebookService } from '../../../common/notebookService.js';
 
 export const COPY_NOTEBOOK_VARIABLE_VALUE_ID = 'workbench.debug.viewlet.action.copyWorkspaceVariableValue';
 export const COPY_NOTEBOOK_VARIABLE_VALUE_LABEL = localize('copyWorkspaceVariableValue', "Copy Value");
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariableContextKeys.ts b/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariableContextKeys.ts
index b90769ef43c..2464574a4bf 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariableContextKeys.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariableContextKeys.ts
@@ -3,6 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { RawContextKey } from '../../../../../../platform/contextkey/common/contextkey.js';
 
 export const NOTEBOOK_VARIABLE_VIEW_ENABLED = new RawContextKey<boolean>('notebookVariableViewEnabled', false);
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariables.ts b/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariables.ts
index 933c67cea81..3280eccce3a 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariables.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariables.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import * as nls from 'vs/nls';
-import { IConfigurationChangeEvent, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { Extensions, IViewContainersRegistry, IViewsRegistry } from 'vs/workbench/common/views';
-import { VIEWLET_ID as debugContainerId } from 'vs/workbench/contrib/debug/common/debug';
-import { NOTEBOOK_VARIABLE_VIEW_ENABLED } from 'vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariableContextKeys';
-import { NotebookVariablesView } from 'vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesView';
-import { getNotebookEditorFromEditorPane } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { variablesViewIcon } from 'vs/workbench/contrib/notebook/browser/notebookIcons';
-import { NotebookSetting } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
-import { INotebookKernelService } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
-import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { Disposable, IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import * as nls from '../../../../../../nls.js';
+import { IConfigurationChangeEvent, IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { IContextKey, IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { SyncDescriptor } from '../../../../../../platform/instantiation/common/descriptors.js';
+import { Registry } from '../../../../../../platform/registry/common/platform.js';
+import { IWorkbenchContribution } from '../../../../../common/contributions.js';
+import { Extensions, IViewContainersRegistry, IViewsRegistry } from '../../../../../common/views.js';
+import { VIEWLET_ID as debugContainerId } from '../../../../debug/common/debug.js';
+import { NOTEBOOK_VARIABLE_VIEW_ENABLED } from './notebookVariableContextKeys.js';
+import { NotebookVariablesView } from './notebookVariablesView.js';
+import { getNotebookEditorFromEditorPane } from '../../notebookBrowser.js';
+import { variablesViewIcon } from '../../notebookIcons.js';
+import { NotebookSetting } from '../../../common/notebookCommon.js';
+import { INotebookExecutionStateService } from '../../../common/notebookExecutionStateService.js';
+import { INotebookKernelService } from '../../../common/notebookKernelService.js';
+import { INotebookService } from '../../../common/notebookService.js';
+import { IEditorService } from '../../../../../services/editor/common/editorService.js';
 
 export class NotebookVariables extends Disposable implements IWorkbenchContribution {
 	private listeners: IDisposable[] = [];
@@ -87,7 +87,7 @@ export class NotebookVariables extends Disposable implements IWorkbenchContribut
 			const viewDescriptor = {
 				id: 'NOTEBOOK_VARIABLES', name: nls.localize2('notebookVariables', "Notebook Variables"),
 				containerIcon: variablesViewIcon, ctorDescriptor: new SyncDescriptor(NotebookVariablesView),
-				order: 50, weight: 5, canToggleVisibility: true, canMoveView: true, collapsed: true, when: NOTEBOOK_VARIABLE_VIEW_ENABLED,
+				order: 50, weight: 5, canToggleVisibility: true, canMoveView: true, collapsed: false, when: NOTEBOOK_VARIABLE_VIEW_ENABLED,
 			};
 
 			viewsRegistry.registerViews([viewDescriptor], debugViewContainer);
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesDataSource.ts b/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesDataSource.ts
index 13bc42a678d..d0af4bc80f9 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesDataSource.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesDataSource.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IAsyncDataSource } from 'vs/base/browser/ui/tree/tree';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { localize } from 'vs/nls';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { INotebookKernel, INotebookKernelService, VariablesResult, variablePageSize } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
+import { IAsyncDataSource } from '../../../../../../base/browser/ui/tree/tree.js';
+import { CancellationTokenSource } from '../../../../../../base/common/cancellation.js';
+import { localize } from '../../../../../../nls.js';
+import { NotebookTextModel } from '../../../common/model/notebookTextModel.js';
+import { INotebookKernel, INotebookKernelService, VariablesResult, variablePageSize } from '../../../common/notebookKernelService.js';
 
 export interface INotebookScope {
 	kind: 'root';
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesTree.ts b/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesTree.ts
index 01c0e2b2d4b..9daccd6d5ba 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesTree.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesTree.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
-import { ITreeNode, ITreeRenderer } from 'vs/base/browser/ui/tree/tree';
-import { FuzzyScore } from 'vs/base/common/filters';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { localize } from 'vs/nls';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { WorkbenchObjectTree } from 'vs/platform/list/browser/listService';
-import { renderExpressionValue } from 'vs/workbench/contrib/debug/browser/baseDebugView';
-import { INotebookVariableElement } from 'vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesDataSource';
+import * as dom from '../../../../../../base/browser/dom.js';
+import { IListVirtualDelegate } from '../../../../../../base/browser/ui/list/list.js';
+import { IListAccessibilityProvider } from '../../../../../../base/browser/ui/list/listWidget.js';
+import { ITreeNode, ITreeRenderer } from '../../../../../../base/browser/ui/tree/tree.js';
+import { FuzzyScore } from '../../../../../../base/common/filters.js';
+import { DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { localize } from '../../../../../../nls.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { WorkbenchObjectTree } from '../../../../../../platform/list/browser/listService.js';
+import { DebugExpressionRenderer } from '../../../../debug/browser/debugExpressionRenderer.js';
+import { INotebookVariableElement } from './notebookVariablesDataSource.js';
 
 const $ = dom.$;
 const MAX_VALUE_RENDER_LENGTH_IN_VIEWLET = 1024;
@@ -40,15 +40,16 @@ export interface IVariableTemplateData {
 
 export class NotebookVariableRenderer implements ITreeRenderer<INotebookVariableElement, FuzzyScore, IVariableTemplateData> {
 
+	private expressionRenderer: DebugExpressionRenderer;
+
 	static readonly ID = 'variableElement';
 
 	get templateId(): string {
 		return NotebookVariableRenderer.ID;
 	}
 
-	constructor(
-		@IHoverService private readonly _hoverService: IHoverService
-	) {
+	constructor(@IInstantiationService instantiationService: IInstantiationService) {
+		this.expressionRenderer = instantiationService.createInstance(DebugExpressionRenderer);
 	}
 
 	renderTemplate(container: HTMLElement): IVariableTemplateData {
@@ -66,11 +67,11 @@ export class NotebookVariableRenderer implements ITreeRenderer<INotebookVariable
 		data.name.textContent = text;
 		data.name.title = element.element.type ?? '';
 
-		renderExpressionValue(element.element, data.value, {
+		data.elementDisposables.add(this.expressionRenderer.renderValue(data.value, element.element, {
 			colorize: true,
-			hover: data.elementDisposables,
-			maxValueLength: MAX_VALUE_RENDER_LENGTH_IN_VIEWLET
-		}, this._hoverService);
+			maxValueLength: MAX_VALUE_RENDER_LENGTH_IN_VIEWLET,
+			session: undefined,
+		}));
 	}
 
 	disposeElement(element: ITreeNode<INotebookVariableElement, FuzzyScore>, index: number, templateData: IVariableTemplateData, height: number | undefined): void {
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesView.ts b/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesView.ts
index c05cdaae7f6..dede87d9eeb 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesView.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesView.ts
@@ -3,44 +3,46 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ITreeContextMenuEvent } from 'vs/base/browser/ui/tree/tree';
-import { IAction } from 'vs/base/common/actions';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { URI } from 'vs/base/common/uri';
-import * as nls from 'vs/nls';
-import { ILocalizedString } from 'vs/platform/action/common/action';
-import { createAndFillInContextMenuActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IMenuService, MenuId } from 'vs/platform/actions/common/actions';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { WorkbenchAsyncDataTree } from 'vs/platform/list/browser/listService';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IViewPaneOptions, ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
-import { IViewDescriptorService } from 'vs/workbench/common/views';
-import { CONTEXT_VARIABLE_EXTENSIONID, CONTEXT_VARIABLE_INTERFACES, CONTEXT_VARIABLE_LANGUAGE, CONTEXT_VARIABLE_NAME, CONTEXT_VARIABLE_TYPE, CONTEXT_VARIABLE_VALUE } from 'vs/workbench/contrib/debug/common/debug';
-import { INotebookScope, INotebookVariableElement, NotebookVariableDataSource } from 'vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesDataSource';
-import { NotebookVariableAccessibilityProvider, NotebookVariableRenderer, NotebookVariablesDelegate } from 'vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesTree';
-import { getNotebookEditorFromEditorPane } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { ICellExecutionStateChangedEvent, IExecutionStateChangedEvent, INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
-import { INotebookKernelService } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { ITreeContextMenuEvent } from '../../../../../../base/browser/ui/tree/tree.js';
+import { IAction } from '../../../../../../base/common/actions.js';
+import { RunOnceScheduler } from '../../../../../../base/common/async.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import * as nls from '../../../../../../nls.js';
+import { ILocalizedString } from '../../../../../../platform/action/common/action.js';
+import { createAndFillInContextMenuActions } from '../../../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IMenuService, MenuId } from '../../../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../../../platform/contextview/browser/contextView.js';
+import { IHoverService } from '../../../../../../platform/hover/browser/hover.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../../../platform/keybinding/common/keybinding.js';
+import { WorkbenchAsyncDataTree } from '../../../../../../platform/list/browser/listService.js';
+import { IOpenerService } from '../../../../../../platform/opener/common/opener.js';
+import { IQuickInputService } from '../../../../../../platform/quickinput/common/quickInput.js';
+import { ITelemetryService } from '../../../../../../platform/telemetry/common/telemetry.js';
+import { IThemeService } from '../../../../../../platform/theme/common/themeService.js';
+import { IViewPaneOptions, ViewPane } from '../../../../../browser/parts/views/viewPane.js';
+import { IViewDescriptorService } from '../../../../../common/views.js';
+import { CONTEXT_VARIABLE_EXTENSIONID, CONTEXT_VARIABLE_INTERFACES, CONTEXT_VARIABLE_LANGUAGE, CONTEXT_VARIABLE_NAME, CONTEXT_VARIABLE_TYPE, CONTEXT_VARIABLE_VALUE } from '../../../../debug/common/debug.js';
+import { INotebookScope, INotebookVariableElement, NotebookVariableDataSource } from './notebookVariablesDataSource.js';
+import { NotebookVariableAccessibilityProvider, NotebookVariableRenderer, NotebookVariablesDelegate } from './notebookVariablesTree.js';
+import { getNotebookEditorFromEditorPane } from '../../notebookBrowser.js';
+import { NotebookTextModel } from '../../../common/model/notebookTextModel.js';
+import { ICellExecutionStateChangedEvent, IExecutionStateChangedEvent, INotebookExecutionStateService } from '../../../common/notebookExecutionStateService.js';
+import { INotebookKernelService } from '../../../common/notebookKernelService.js';
+import { IEditorService } from '../../../../../services/editor/common/editorService.js';
+import { IEditorPane } from '../../../../../common/editor.js';
+import { isCompositeNotebookEditorInput } from '../../../common/notebookEditorInput.js';
 
 export type contextMenuArg = { source: string; name: string; type?: string; value?: string; expression?: string; language?: string; extensionId?: string };
 
 export class NotebookVariablesView extends ViewPane {
 
 	static readonly ID = 'notebookVariablesView';
-	static readonly TITLE: ILocalizedString = nls.localize2('notebook.notebookVariables', "Notebook Variables");
+	static readonly NOTEBOOK_TITLE: ILocalizedString = nls.localize2('notebook.notebookVariables', "Notebook Variables");
+	static readonly REPL_TITLE: ILocalizedString = nls.localize2('notebook.ReplVariables', "REPL Variables");
 
 	private tree: WorkbenchAsyncDataTree<INotebookScope, INotebookVariableElement> | undefined;
 	private activeNotebook: NotebookTextModel | undefined;
@@ -73,7 +75,7 @@ export class NotebookVariablesView extends ViewPane {
 		this._register(this.notebookKernelService.onDidNotebookVariablesUpdate(this.handleVariablesChanged.bind(this)));
 		this._register(this.notebookExecutionStateService.onDidChangeExecution(this.handleExecutionStateChange.bind(this)));
 
-		this.setActiveNotebook();
+		this.activeNotebook = this.getActiveNotebook()?.notebookDocument;
 
 		this.dataSource = new NotebookVariableDataSource(this.notebookKernelService);
 		this.updateScheduler = new RunOnceScheduler(() => this.tree?.updateChildren(), 100);
@@ -88,7 +90,7 @@ export class NotebookVariablesView extends ViewPane {
 			'notebookVariablesTree',
 			container,
 			new NotebookVariablesDelegate(),
-			[new NotebookVariableRenderer(this.hoverService)],
+			[this.instantiationService.createInstance(NotebookVariableRenderer)],
 			this.dataSource,
 			{
 				accessibilityProvider: new NotebookVariableAccessibilityProvider(),
@@ -103,7 +105,7 @@ export class NotebookVariablesView extends ViewPane {
 		this._register(this.tree.onContextMenu(e => this.onContextMenu(e)));
 	}
 
-	private onContextMenu(e: ITreeContextMenuEvent<INotebookVariableElement>): any {
+	private onContextMenu(e: ITreeContextMenuEvent<INotebookVariableElement>): void {
 		if (!e.element) {
 			return;
 		}
@@ -128,9 +130,8 @@ export class NotebookVariablesView extends ViewPane {
 			[CONTEXT_VARIABLE_LANGUAGE.key, element.language],
 			[CONTEXT_VARIABLE_EXTENSIONID.key, element.extensionId]
 		]);
-		const menu = this.menuService.createMenu(MenuId.NotebookVariablesContext, overlayedContext);
-		createAndFillInContextMenuActions(menu, { arg, shouldForwardArgs: true }, actions);
-		menu.dispose();
+		const menu = this.menuService.getMenuActions(MenuId.NotebookVariablesContext, overlayedContext, { arg, shouldForwardArgs: true });
+		createAndFillInContextMenuActions(menu, actions);
 		this.contextMenuService.showContextMenu({
 			getAnchor: () => e.anchor,
 			getActions: () => actions
@@ -142,45 +143,64 @@ export class NotebookVariablesView extends ViewPane {
 		this.tree?.layout(height, width);
 	}
 
-	private setActiveNotebook() {
-		const current = this.activeNotebook;
-		const activeEditorPane = this.editorService.activeEditorPane;
-		if (activeEditorPane?.getId() === 'workbench.editor.notebook' || activeEditorPane?.getId() === 'workbench.editor.interactive') {
-			const notebookDocument = getNotebookEditorFromEditorPane(activeEditorPane)?.getViewModel()?.notebookDocument;
-			this.activeNotebook = notebookDocument;
+	private setActiveNotebook(notebookDocument: NotebookTextModel, editor: IEditorPane) {
+		this.activeNotebook = notebookDocument;
+		this.tree?.setInput({ kind: 'root', notebook: notebookDocument });
+		this.updateScheduler.schedule();
+		if (isCompositeNotebookEditorInput(editor.input)) {
+			this.updateTitle(NotebookVariablesView.REPL_TITLE.value);
+		} else {
+			this.updateTitle(NotebookVariablesView.NOTEBOOK_TITLE.value);
 		}
+	}
 
-		return current !== this.activeNotebook;
+	private getActiveNotebook() {
+		const notebookEditor = this.editorService.activeEditorPane;
+		const notebookDocument = getNotebookEditorFromEditorPane(notebookEditor)?.textModel;
+		return notebookDocument && notebookEditor ? { notebookDocument, notebookEditor } : undefined;
 	}
 
 	private handleActiveEditorChange() {
-		if (this.setActiveNotebook() && this.activeNotebook) {
-			this.tree?.setInput({ kind: 'root', notebook: this.activeNotebook });
-			this.updateScheduler.schedule();
+		const found = this.getActiveNotebook();
+		if (found && found.notebookDocument !== this.activeNotebook) {
+			this.setActiveNotebook(found.notebookDocument, found.notebookEditor);
 		}
 	}
 
 	private handleExecutionStateChange(event: ICellExecutionStateChangedEvent | IExecutionStateChangedEvent) {
-		if (this.activeNotebook) {
-			if (event.affectsNotebook(this.activeNotebook.uri)) {
-				// new execution state means either new variables or the kernel is busy so we shouldn't ask
-				this.dataSource.cancel();
+		if (this.activeNotebook && event.affectsNotebook(this.activeNotebook.uri)) {
+			// new execution state means either new variables or the kernel is busy so we shouldn't ask
+			this.dataSource.cancel();
 
-				// changed === undefined -> excecution ended
-				if (event.changed === undefined) {
-					this.updateScheduler.schedule();
-				}
-				else {
-					this.updateScheduler.cancel();
-				}
+			// changed === undefined -> excecution ended
+			if (event.changed === undefined) {
+				this.updateScheduler.schedule();
 			}
+			else {
+				this.updateScheduler.cancel();
+			}
+		} else if (!this.getActiveNotebook()) {
+			// check if the updated variables are for a visible notebook
+			this.editorService.visibleEditorPanes.forEach(editor => {
+				const notebookDocument = getNotebookEditorFromEditorPane(editor)?.textModel;
+				if (notebookDocument && event.affectsNotebook(notebookDocument.uri)) {
+					this.setActiveNotebook(notebookDocument, editor);
+				}
+			});
 		}
 	}
 
 	private handleVariablesChanged(notebookUri: URI) {
 		if (this.activeNotebook && notebookUri.toString() === this.activeNotebook.uri.toString()) {
-			this.tree?.setInput({ kind: 'root', notebook: this.activeNotebook });
 			this.updateScheduler.schedule();
+		} else if (!this.getActiveNotebook()) {
+			// check if the updated variables are for a visible notebook
+			this.editorService.visibleEditorPanes.forEach(editor => {
+				const notebookDocument = getNotebookEditorFromEditorPane(editor)?.textModel;
+				if (notebookDocument && notebookDocument.uri.toString() === notebookUri.toString()) {
+					this.setActiveNotebook(notebookDocument, editor);
+				}
+			});
 		}
 	}
 }
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.ts b/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.ts
index 2d567006f71..90839d12a98 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.ts
@@ -3,55 +3,57 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import * as DOM from 'vs/base/browser/dom';
-import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar';
-import { IIconLabelValueOptions, IconLabel } from 'vs/base/browser/ui/iconLabel/iconLabel';
-import { IKeyboardNavigationLabelProvider, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
-import { IDataSource, ITreeNode, ITreeRenderer } from 'vs/base/browser/ui/tree/tree';
-import { Emitter, Event } from 'vs/base/common/event';
-import { FuzzyScore, createMatches } from 'vs/base/common/filters';
-import { Disposable, DisposableStore, IDisposable, toDisposable, type IReference } from 'vs/base/common/lifecycle';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { URI } from 'vs/base/common/uri';
-import { getIconClassesForLanguageId } from 'vs/editor/common/services/getIconClasses';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { IEditorOptions } from 'vs/platform/editor/common/editor';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IWorkbenchDataTreeOptions } from 'vs/platform/list/browser/listService';
-import { MarkerSeverity } from 'vs/platform/markers/common/markers';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { listErrorForeground, listWarningForeground } from 'vs/platform/theme/common/colorRegistry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
-import { IEditorPane } from 'vs/workbench/common/editor';
-import { CellFoldingState, CellRevealType, ICellModelDecorations, ICellModelDeltaDecorations, ICellViewModel, INotebookEditor, INotebookEditorOptions, INotebookEditorPane, INotebookViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookEditor';
-import { NotebookCellOutlineProvider } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineProvider';
-import { CellKind, NotebookSetting } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IBreadcrumbsDataSource, IOutline, IOutlineComparator, IOutlineCreator, IOutlineListConfig, IOutlineService, IQuickPickDataSource, IQuickPickOutlineElement, OutlineChangeEvent, OutlineConfigCollapseItemsValues, OutlineConfigKeys, OutlineTarget } from 'vs/workbench/services/outline/browser/outline';
-import { OutlineEntry } from 'vs/workbench/contrib/notebook/browser/viewModel/OutlineEntry';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IModelDeltaDecoration } from 'vs/editor/common/model';
-import { Range } from 'vs/editor/common/core/range';
-import { mainWindow } from 'vs/base/browser/window';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { Action2, IMenu, IMenuService, MenuId, MenuItemAction, MenuRegistry, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ContextKeyExpr, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { MenuEntryActionViewItem, createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IAction } from 'vs/base/common/actions';
-import { NotebookSectionArgs } from 'vs/workbench/contrib/notebook/browser/controller/sectionActions';
-import { MarkupCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/markupCellViewModel';
-import { disposableTimeout } from 'vs/base/common/async';
-import { IOutlinePane } from 'vs/workbench/contrib/outline/browser/outline';
-import { Codicon } from 'vs/base/common/codicons';
-import { NOTEBOOK_IS_ACTIVE_EDITOR } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { NotebookOutlineConstants } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineEntryFactory';
-import { INotebookCellOutlineProviderFactory } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineProviderFactory';
+import { localize } from '../../../../../../nls.js';
+import * as DOM from '../../../../../../base/browser/dom.js';
+import { ToolBar } from '../../../../../../base/browser/ui/toolbar/toolbar.js';
+import { IIconLabelValueOptions, IconLabel } from '../../../../../../base/browser/ui/iconLabel/iconLabel.js';
+import { IKeyboardNavigationLabelProvider, IListVirtualDelegate } from '../../../../../../base/browser/ui/list/list.js';
+import { IListAccessibilityProvider } from '../../../../../../base/browser/ui/list/listWidget.js';
+import { IDataSource, ITreeNode, ITreeRenderer } from '../../../../../../base/browser/ui/tree/tree.js';
+import { Emitter, Event } from '../../../../../../base/common/event.js';
+import { FuzzyScore, createMatches } from '../../../../../../base/common/filters.js';
+import { Disposable, DisposableStore, IDisposable, toDisposable, type IReference } from '../../../../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { getIconClassesForLanguageId } from '../../../../../../editor/common/services/getIconClasses.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from '../../../../../../platform/configuration/common/configurationRegistry.js';
+import { IEditorOptions } from '../../../../../../platform/editor/common/editor.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { IWorkbenchDataTreeOptions } from '../../../../../../platform/list/browser/listService.js';
+import { MarkerSeverity } from '../../../../../../platform/markers/common/markers.js';
+import { Registry } from '../../../../../../platform/registry/common/platform.js';
+import { listErrorForeground, listWarningForeground } from '../../../../../../platform/theme/common/colorRegistry.js';
+import { IThemeService } from '../../../../../../platform/theme/common/themeService.js';
+import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from '../../../../../common/contributions.js';
+import { IEditorPane } from '../../../../../common/editor.js';
+import { CellFoldingState, CellRevealType, ICellModelDecorations, ICellModelDeltaDecorations, ICellViewModel, INotebookEditor, INotebookEditorOptions, INotebookEditorPane, INotebookViewModel } from '../../notebookBrowser.js';
+import { NotebookEditor } from '../../notebookEditor.js';
+import { INotebookCellOutlineDataSource, NotebookCellOutlineDataSource } from '../../viewModel/notebookOutlineDataSource.js';
+import { CellKind, NotebookCellsChangeType, NotebookSetting } from '../../../common/notebookCommon.js';
+import { IEditorService, SIDE_GROUP } from '../../../../../services/editor/common/editorService.js';
+import { LifecyclePhase } from '../../../../../services/lifecycle/common/lifecycle.js';
+import { IBreadcrumbsDataSource, IOutline, IOutlineComparator, IOutlineCreator, IOutlineListConfig, IOutlineService, IQuickPickDataSource, IQuickPickOutlineElement, OutlineChangeEvent, OutlineConfigCollapseItemsValues, OutlineConfigKeys, OutlineTarget } from '../../../../../services/outline/browser/outline.js';
+import { OutlineEntry } from '../../viewModel/OutlineEntry.js';
+import { CancellationToken } from '../../../../../../base/common/cancellation.js';
+import { IModelDeltaDecoration } from '../../../../../../editor/common/model.js';
+import { Range } from '../../../../../../editor/common/core/range.js';
+import { mainWindow } from '../../../../../../base/browser/window.js';
+import { IContextMenuService } from '../../../../../../platform/contextview/browser/contextView.js';
+import { Action2, IMenu, IMenuService, MenuId, MenuItemAction, MenuRegistry, registerAction2 } from '../../../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr, IContextKeyService, RawContextKey } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { MenuEntryActionViewItem, createAndFillInActionBarActions } from '../../../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IAction } from '../../../../../../base/common/actions.js';
+import { NotebookSectionArgs } from '../../controller/sectionActions.js';
+import { MarkupCellViewModel } from '../../viewModel/markupCellViewModel.js';
+import { Delayer, disposableTimeout } from '../../../../../../base/common/async.js';
+import { IOutlinePane } from '../../../../outline/browser/outline.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { NOTEBOOK_IS_ACTIVE_EDITOR } from '../../../common/notebookContextKeys.js';
+import { NotebookOutlineConstants } from '../../viewModel/notebookOutlineEntryFactory.js';
+import { INotebookCellOutlineDataSourceFactory } from '../../viewModel/notebookOutlineDataSourceFactory.js';
+import { INotebookExecutionStateService, NotebookExecutionType } from '../../../common/notebookExecutionStateService.js';
+import { ILanguageFeaturesService } from '../../../../../../editor/common/services/languageFeatures.js';
 
 class NotebookOutlineTemplate {
 
@@ -286,33 +288,44 @@ class NotebookOutlineVirtualDelegate implements IListVirtualDelegate<OutlineEntr
 
 export class NotebookQuickPickProvider implements IQuickPickDataSource<OutlineEntry> {
 
+	private readonly _disposables = new DisposableStore();
+
+	private gotoShowCodeCellSymbols: boolean;
+
 	constructor(
-		private _getEntries: () => OutlineEntry[],
+		private readonly notebookCellOutlineDataSourceRef: IReference<INotebookCellOutlineDataSource> | undefined,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@IThemeService private readonly _themeService: IThemeService
-	) { }
+	) {
+		this.gotoShowCodeCellSymbols = this._configurationService.getValue<boolean>(NotebookSetting.gotoSymbolsAllSymbols);
+
+		this._disposables.add(this._configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(NotebookSetting.gotoSymbolsAllSymbols)) {
+				this.gotoShowCodeCellSymbols = this._configurationService.getValue<boolean>(NotebookSetting.gotoSymbolsAllSymbols);
+			}
+		}));
+	}
 
 	getQuickPickElements(): IQuickPickOutlineElement<OutlineEntry>[] {
 		const bucket: OutlineEntry[] = [];
-		for (const entry of this._getEntries()) {
+		for (const entry of this.notebookCellOutlineDataSourceRef?.object?.entries ?? []) {
 			entry.asFlatList(bucket);
 		}
 		const result: IQuickPickOutlineElement<OutlineEntry>[] = [];
 		const { hasFileIcons } = this._themeService.getFileIconTheme();
 
-		const showSymbols = this._configurationService.getValue<boolean>(NotebookSetting.gotoSymbolsAllSymbols);
 		const isSymbol = (element: OutlineEntry) => !!element.symbolKind;
 		const isCodeCell = (element: OutlineEntry) => (element.cell.cellKind === CellKind.Code && element.level === NotebookOutlineConstants.NonHeaderOutlineLevel); // code cell entries are exactly level 7 by this constant
 		for (let i = 0; i < bucket.length; i++) {
 			const element = bucket[i];
 			const nextElement = bucket[i + 1]; // can be undefined
 
-			if (!showSymbols
+			if (!this.gotoShowCodeCellSymbols
 				&& isSymbol(element)) {
 				continue;
 			}
 
-			if (showSymbols
+			if (this.gotoShowCodeCellSymbols
 				&& isCodeCell(element)
 				&& nextElement && isSymbol(nextElement)) {
 				continue;
@@ -330,32 +343,98 @@ export class NotebookQuickPickProvider implements IQuickPickDataSource<OutlineEn
 		}
 		return result;
 	}
+
+	dispose(): void {
+		this._disposables.dispose();
+	}
 }
 
 export class NotebookOutlinePaneProvider implements IDataSource<NotebookCellOutline, OutlineEntry> {
+
+	private readonly _disposables = new DisposableStore();
+
+	private showCodeCells: boolean;
+	private showCodeCellSymbols: boolean;
+	private showMarkdownHeadersOnly: boolean;
+
 	constructor(
-		private _getEntries: () => OutlineEntry[],
+		private readonly outlineDataSourceRef: IReference<INotebookCellOutlineDataSource> | undefined,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
-	) { }
+	) {
+		this.showCodeCells = this._configurationService.getValue<boolean>(NotebookSetting.outlineShowCodeCells);
+		this.showCodeCellSymbols = this._configurationService.getValue<boolean>(NotebookSetting.outlineShowCodeCellSymbols);
+		this.showMarkdownHeadersOnly = this._configurationService.getValue<boolean>(NotebookSetting.outlineShowMarkdownHeadersOnly);
+
+		this._disposables.add(this._configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(NotebookSetting.outlineShowCodeCells)) {
+				this.showCodeCells = this._configurationService.getValue<boolean>(NotebookSetting.outlineShowCodeCells);
+			}
+			if (e.affectsConfiguration(NotebookSetting.outlineShowCodeCellSymbols)) {
+				this.showCodeCellSymbols = this._configurationService.getValue<boolean>(NotebookSetting.outlineShowCodeCellSymbols);
+			}
+			if (e.affectsConfiguration(NotebookSetting.outlineShowMarkdownHeadersOnly)) {
+				this.showMarkdownHeadersOnly = this._configurationService.getValue<boolean>(NotebookSetting.outlineShowMarkdownHeadersOnly);
+			}
+		}));
+	}
+
+	public getActiveEntry(): OutlineEntry | undefined {
+		const newActive = this.outlineDataSourceRef?.object?.activeElement;
+		if (!newActive) {
+			return undefined;
+		}
+
+		if (!this.filterEntry(newActive)) {
+			return newActive;
+		}
+
+		// find a valid parent
+		let parent = newActive.parent;
+		while (parent) {
+			if (this.filterEntry(parent)) {
+				parent = parent.parent;
+			} else {
+				return parent;
+			}
+		}
+
+		// no valid parent found, return undefined
+		return undefined;
+	}
+
+	/**
+	 * Checks if the given outline entry should be filtered out of the outlinePane
+	 *
+	 * @param entry the OutlineEntry to check
+	 * @returns true if the entry should be filtered out of the outlinePane
+	 */
+	private filterEntry(entry: OutlineEntry): boolean {
+		// if any are true, return true, this entry should NOT be included in the outline
+		if (
+			(this.showMarkdownHeadersOnly && entry.cell.cellKind === CellKind.Markup && entry.level === NotebookOutlineConstants.NonHeaderOutlineLevel) ||	// show headers only   + cell is mkdn + is level 7 (not header)
+			(!this.showCodeCells && entry.cell.cellKind === CellKind.Code) ||																				// show code cells off + cell is code
+			(!this.showCodeCellSymbols && entry.cell.cellKind === CellKind.Code && entry.level > NotebookOutlineConstants.NonHeaderOutlineLevel)				// show symbols off    + cell is code + is level >7 (nb symbol levels)
+		) {
+			return true;
+		}
+
+		return false;
+	}
 
 	*getChildren(element: NotebookCellOutline | OutlineEntry): Iterable<OutlineEntry> {
-		const showCodeCells = this._configurationService.getValue<boolean>(NotebookSetting.outlineShowCodeCells);
-		const showCodeCellSymbols = this._configurationService.getValue<boolean>(NotebookSetting.outlineShowCodeCellSymbols);
-		const showMarkdownHeadersOnly = this._configurationService.getValue<boolean>(NotebookSetting.outlineShowMarkdownHeadersOnly);
-
 		const isOutline = element instanceof NotebookCellOutline;
-		const entries = isOutline ? this._getEntries() : element.children;
+		const entries = isOutline ? this.outlineDataSourceRef?.object?.entries ?? [] : element.children;
 
 		for (const entry of entries) {
 			if (entry.cell.cellKind === CellKind.Markup) {
-				if (!showMarkdownHeadersOnly) {
+				if (!this.showMarkdownHeadersOnly) {
 					yield entry;
 				} else if (entry.level < NotebookOutlineConstants.NonHeaderOutlineLevel) {
 					yield entry;
 				}
 
-			} else if (showCodeCells && entry.cell.cellKind === CellKind.Code) {
-				if (showCodeCellSymbols) {
+			} else if (this.showCodeCells && entry.cell.cellKind === CellKind.Code) {
+				if (this.showCodeCellSymbols) {
 					yield entry;
 				} else if (entry.level === NotebookOutlineConstants.NonHeaderOutlineLevel) {
 					yield entry;
@@ -363,26 +442,45 @@ export class NotebookOutlinePaneProvider implements IDataSource<NotebookCellOutl
 			}
 		}
 	}
+
+	dispose(): void {
+		this._disposables.dispose();
+	}
 }
 
 export class NotebookBreadcrumbsProvider implements IBreadcrumbsDataSource<OutlineEntry> {
+
+	private readonly _disposables = new DisposableStore();
+
+	private showCodeCells: boolean;
+
 	constructor(
-		private _getActiveElement: () => OutlineEntry | undefined,
+		private readonly outlineDataSourceRef: IReference<INotebookCellOutlineDataSource> | undefined,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
-	) { }
+	) {
+		this.showCodeCells = this._configurationService.getValue<boolean>(NotebookSetting.breadcrumbsShowCodeCells);
+		this._disposables.add(this._configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(NotebookSetting.breadcrumbsShowCodeCells)) {
+				this.showCodeCells = this._configurationService.getValue<boolean>(NotebookSetting.breadcrumbsShowCodeCells);
+			}
+		}));
+	}
 
 	getBreadcrumbElements(): readonly OutlineEntry[] {
 		const result: OutlineEntry[] = [];
-		const showCodeCells = this._configurationService.getValue<boolean>(NotebookSetting.breadcrumbsShowCodeCells);
-		let candidate = this._getActiveElement();
+		let candidate = this.outlineDataSourceRef?.object?.activeElement;
 		while (candidate) {
-			if (showCodeCells || candidate.cell.cellKind !== CellKind.Code) {
+			if (this.showCodeCells || candidate.cell.cellKind !== CellKind.Code) {
 				result.unshift(candidate);
 			}
 			candidate = candidate.parent;
 		}
 		return result;
 	}
+
+	dispose(): void {
+		this._disposables.dispose();
+	}
 }
 
 class NotebookComparator implements IOutlineComparator<OutlineEntry> {
@@ -401,64 +499,78 @@ class NotebookComparator implements IOutlineComparator<OutlineEntry> {
 }
 
 export class NotebookCellOutline implements IOutline<OutlineEntry> {
-
-	private readonly _dispoables = new DisposableStore();
-
-	private readonly _onDidChange = new Emitter<OutlineChangeEvent>();
-
-	readonly onDidChange: Event<OutlineChangeEvent> = this._onDidChange.event;
-
-	get entries(): OutlineEntry[] {
-		return this._outlineProviderReference?.object?.entries ?? [];
-	}
-
-	private readonly _entriesDisposables = new DisposableStore();
-
-	readonly config: IOutlineListConfig<OutlineEntry>;
-
 	readonly outlineKind = 'notebookCells';
 
+	private readonly _disposables = new DisposableStore();
+	private readonly _modelDisposables = new DisposableStore();
+	private readonly _dataSourceDisposables = new DisposableStore();
+
+	private readonly _onDidChange = new Emitter<OutlineChangeEvent>();
+	readonly onDidChange: Event<OutlineChangeEvent> = this._onDidChange.event;
+
+	private readonly delayerRecomputeState: Delayer<void> = this._disposables.add(new Delayer<void>(300));
+	private readonly delayerRecomputeActive: Delayer<void> = this._disposables.add(new Delayer<void>(200));
+	// this can be long, because it will force a recompute at the end, so ideally we only do this once all nb language features are registered
+	private readonly delayerRecomputeSymbols: Delayer<void> = this._disposables.add(new Delayer<void>(2000));
+
+	readonly config: IOutlineListConfig<OutlineEntry>;
+	private _outlineDataSourceReference: IReference<NotebookCellOutlineDataSource> | undefined;
+	// These three fields will always be set via setDataSources() on L475
+	private _treeDataSource!: IDataSource<NotebookCellOutline, OutlineEntry>;
+	private _quickPickDataSource!: IQuickPickDataSource<OutlineEntry>;
+	private _breadcrumbsDataSource!: IBreadcrumbsDataSource<OutlineEntry>;
+
+	// view settings
+	private outlineShowCodeCellSymbols: boolean;
+
+	// getters
 	get activeElement(): OutlineEntry | undefined {
-		return this._outlineProviderReference?.object?.activeElement;
+		this.checkDelayer();
+		if (this._target === OutlineTarget.OutlinePane) {
+			return (this.config.treeDataSource as NotebookOutlinePaneProvider).getActiveEntry();
+		} else {
+			console.error('activeElement should not be called outside of the OutlinePane');
+			return undefined;
+		}
+	}
+	get entries(): OutlineEntry[] {
+		this.checkDelayer();
+		return this._outlineDataSourceReference?.object?.entries ?? [];
+	}
+	get uri(): URI | undefined {
+		return this._outlineDataSourceReference?.object?.uri;
+	}
+	get isEmpty(): boolean {
+		return this._outlineDataSourceReference?.object?.isEmpty ?? true;
 	}
 
-	private _outlineProviderReference: IReference<NotebookCellOutlineProvider> | undefined;
-	private readonly _localDisposables = new DisposableStore();
+	private checkDelayer() {
+		if (this.delayerRecomputeState.isTriggered()) {
+			this.delayerRecomputeState.cancel();
+			this.recomputeState();
+		}
+	}
 
 	constructor(
 		private readonly _editor: INotebookEditorPane,
-		_target: OutlineTarget,
-		@IInstantiationService instantiationService: IInstantiationService,
+		private readonly _target: OutlineTarget,
+		@IThemeService private readonly _themeService: IThemeService,
 		@IEditorService private readonly _editorService: IEditorService,
-		@IConfigurationService _configurationService: IConfigurationService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@ILanguageFeaturesService private readonly _languageFeaturesService: ILanguageFeaturesService,
+		@INotebookExecutionStateService private readonly _notebookExecutionStateService: INotebookExecutionStateService,
 	) {
-		const installSelectionListener = () => {
-			const notebookEditor = _editor.getControl();
-			if (!notebookEditor?.hasModel()) {
-				this._outlineProviderReference?.dispose();
-				this._outlineProviderReference = undefined;
-				this._localDisposables.clear();
-			} else {
-				this._outlineProviderReference?.dispose();
-				this._localDisposables.clear();
-				this._outlineProviderReference = instantiationService.invokeFunction((accessor) => accessor.get(INotebookCellOutlineProviderFactory).getOrCreate(notebookEditor, _target));
-				this._localDisposables.add(this._outlineProviderReference.object.onDidChange(e => {
-					this._onDidChange.fire(e);
-				}));
-			}
-		};
+		this.outlineShowCodeCellSymbols = this._configurationService.getValue<boolean>(NotebookSetting.outlineShowCodeCellSymbols);
 
-		this._dispoables.add(_editor.onDidChangeModel(() => {
-			installSelectionListener();
-		}));
+		this.initializeOutline();
 
-		installSelectionListener();
 		const delegate = new NotebookOutlineVirtualDelegate();
-		const renderers = [instantiationService.createInstance(NotebookOutlineRenderer, this._editor.getControl(), _target)];
+		const renderers = [this._instantiationService.createInstance(NotebookOutlineRenderer, this._editor.getControl(), this._target)];
 		const comparator = new NotebookComparator();
 
 		const options: IWorkbenchDataTreeOptions<OutlineEntry, FuzzyScore> = {
-			collapseByDefault: _target === OutlineTarget.Breadcrumbs || (_target === OutlineTarget.OutlinePane && _configurationService.getValue(OutlineConfigKeys.collapseItems) === OutlineConfigCollapseItemsValues.Collapsed),
+			collapseByDefault: this._target === OutlineTarget.Breadcrumbs || (this._target === OutlineTarget.OutlinePane && this._configurationService.getValue(OutlineConfigKeys.collapseItems) === OutlineConfigCollapseItemsValues.Collapsed),
 			expandOnlyOnTwistieClick: true,
 			multipleSelectionSupport: false,
 			accessibilityProvider: new NotebookOutlineAccessibility(),
@@ -467,9 +579,9 @@ export class NotebookCellOutline implements IOutline<OutlineEntry> {
 		};
 
 		this.config = {
-			treeDataSource: instantiationService.createInstance(NotebookOutlinePaneProvider, () => (this.entries ?? [])),
-			quickPickDataSource: instantiationService.createInstance(NotebookQuickPickProvider, () => (this.entries ?? [])),
-			breadcrumbsDataSource: instantiationService.createInstance(NotebookBreadcrumbsProvider, () => (this.activeElement)),
+			treeDataSource: this._treeDataSource,
+			quickPickDataSource: this._quickPickDataSource,
+			breadcrumbsDataSource: this._breadcrumbsDataSource,
 			delegate,
 			renderers,
 			comparator,
@@ -477,16 +589,139 @@ export class NotebookCellOutline implements IOutline<OutlineEntry> {
 		};
 	}
 
-	async setFullSymbols(cancelToken: CancellationToken) {
-		await this._outlineProviderReference?.object?.setFullSymbols(cancelToken);
+	private initializeOutline() {
+		// initial setup
+		this.setDataSources();
+		this.setModelListeners();
+
+		// reset the data sources + model listeners when we get a new notebook model
+		this._disposables.add(this._editor.onDidChangeModel(() => {
+			this.setDataSources();
+			this.setModelListeners();
+			this.computeSymbols();
+		}));
+
+		// recompute symbols as document symbol providers are updated in the language features registry
+		this._disposables.add(this._languageFeaturesService.documentSymbolProvider.onDidChange(() => {
+			this.delayedComputeSymbols();
+		}));
+
+		// recompute active when the selection changes
+		this._disposables.add(this._editor.onDidChangeSelection(() => {
+			this.delayedRecomputeActive();
+		}));
+
+		// recompute state when filter config changes
+		this._disposables.add(this._configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(NotebookSetting.outlineShowMarkdownHeadersOnly) ||
+				e.affectsConfiguration(NotebookSetting.outlineShowCodeCells) ||
+				e.affectsConfiguration(NotebookSetting.outlineShowCodeCellSymbols) ||
+				e.affectsConfiguration(NotebookSetting.breadcrumbsShowCodeCells)
+			) {
+				this.delayedRecomputeState();
+			}
+		}));
+
+		// recompute state when execution states change
+		this._disposables.add(this._notebookExecutionStateService.onDidChangeExecution(e => {
+			if (e.type === NotebookExecutionType.cell && !!this._editor.textModel && e.affectsNotebook(this._editor.textModel?.uri)) {
+				this.delayedRecomputeState();
+			}
+		}));
+
+		// recompute symbols when the configuration changes (recompute state - and therefore recompute active - is also called within compute symbols)
+		this._disposables.add(this._configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(NotebookSetting.outlineShowCodeCellSymbols)) {
+				this.outlineShowCodeCellSymbols = this._configurationService.getValue<boolean>(NotebookSetting.outlineShowCodeCellSymbols);
+				this.computeSymbols();
+			}
+		}));
+
+		// fire a change event when the theme changes
+		this._disposables.add(this._themeService.onDidFileIconThemeChange(() => {
+			this._onDidChange.fire({});
+		}));
+
+		// finish with a recompute state
+		this.recomputeState();
 	}
 
-	get uri(): URI | undefined {
-		return this._outlineProviderReference?.object?.uri;
+	/**
+	 * set up the primary data source + three viewing sources for the various outline views
+	 */
+	private setDataSources(): void {
+		const notebookEditor = this._editor.getControl();
+		this._outlineDataSourceReference?.dispose();
+		this._dataSourceDisposables.clear();
+
+		if (!notebookEditor?.hasModel()) {
+			this._outlineDataSourceReference = undefined;
+		} else {
+			this._outlineDataSourceReference = this._dataSourceDisposables.add(this._instantiationService.invokeFunction((accessor) => accessor.get(INotebookCellOutlineDataSourceFactory).getOrCreate(notebookEditor)));
+			// escalate outline data source change events
+			this._dataSourceDisposables.add(this._outlineDataSourceReference.object.onDidChange(() => {
+				this._onDidChange.fire({});
+			}));
+		}
+
+		// these fields can be passed undefined outlineDataSources. View Providers all handle it accordingly
+		this._treeDataSource = this._dataSourceDisposables.add(this._instantiationService.createInstance(NotebookOutlinePaneProvider, this._outlineDataSourceReference));
+		this._quickPickDataSource = this._dataSourceDisposables.add(this._instantiationService.createInstance(NotebookQuickPickProvider, this._outlineDataSourceReference));
+		this._breadcrumbsDataSource = this._dataSourceDisposables.add(this._instantiationService.createInstance(NotebookBreadcrumbsProvider, this._outlineDataSourceReference));
 	}
-	get isEmpty(): boolean {
-		return this._outlineProviderReference?.object?.isEmpty ?? true;
+
+	/**
+	 * set up the listeners for the outline content, these respond to model changes in the notebook
+	 */
+	private setModelListeners(): void {
+		this._modelDisposables.clear();
+		if (!this._editor.textModel) {
+			return;
+		}
+
+		// Perhaps this is the first time we're building the outline
+		if (!this.entries.length) {
+			this.computeSymbols();
+		}
+
+		// recompute state when there are notebook content changes
+		this._modelDisposables.add(this._editor.textModel.onDidChangeContent(contentChanges => {
+			if (contentChanges.rawEvents.some(c =>
+				c.kind === NotebookCellsChangeType.ChangeCellContent ||
+				c.kind === NotebookCellsChangeType.ChangeCellInternalMetadata ||
+				c.kind === NotebookCellsChangeType.Move ||
+				c.kind === NotebookCellsChangeType.ModelChange)) {
+				this.delayedRecomputeState();
+			}
+		}));
 	}
+
+	private async computeSymbols(cancelToken: CancellationToken = CancellationToken.None) {
+		if (this._target === OutlineTarget.OutlinePane && this.outlineShowCodeCellSymbols) {
+			// No need to wait for this, we want the outline to show up quickly.
+			void this.doComputeSymbols(cancelToken);
+		}
+	}
+	public async doComputeSymbols(cancelToken: CancellationToken): Promise<void> {
+		await this._outlineDataSourceReference?.object?.computeFullSymbols(cancelToken);
+	}
+	private async delayedComputeSymbols() {
+		this.delayerRecomputeState.cancel();
+		this.delayerRecomputeActive.cancel();
+		this.delayerRecomputeSymbols.trigger(() => { this.computeSymbols(); });
+	}
+
+	private recomputeState() { this._outlineDataSourceReference?.object?.recomputeState(); }
+	private delayedRecomputeState() {
+		this.delayerRecomputeActive.cancel(); // Active is always recomputed after a recomputing the State.
+		this.delayerRecomputeState.trigger(() => { this.recomputeState(); });
+	}
+
+	private recomputeActive() { this._outlineDataSourceReference?.object?.recomputeActive(); }
+	private delayedRecomputeActive() {
+		this.delayerRecomputeActive.trigger(() => { this.recomputeActive(); });
+	}
+
 	async reveal(entry: OutlineEntry, options: IEditorOptions, sideBySide: boolean): Promise<void> {
 		const notebookEditorOptions: INotebookEditorOptions = {
 			...options,
@@ -564,10 +799,10 @@ export class NotebookCellOutline implements IOutline<OutlineEntry> {
 
 	dispose(): void {
 		this._onDidChange.dispose();
-		this._dispoables.dispose();
-		this._entriesDisposables.dispose();
-		this._outlineProviderReference?.dispose();
-		this._localDisposables.dispose();
+		this._disposables.dispose();
+		this._modelDisposables.dispose();
+		this._dataSourceDisposables.dispose();
+		this._outlineDataSourceReference?.dispose();
 	}
 }
 
@@ -577,8 +812,7 @@ export class NotebookOutlineCreator implements IOutlineCreator<NotebookEditor, O
 
 	constructor(
 		@IOutlineService outlineService: IOutlineService,
-		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService
 	) {
 		const reg = outlineService.registerOutlineCreator(this);
 		this.dispose = () => reg.dispose();
@@ -588,18 +822,13 @@ export class NotebookOutlineCreator implements IOutlineCreator<NotebookEditor, O
 		return candidate.getId() === NotebookEditor.ID;
 	}
 
-	async createOutline(editor: NotebookEditor, target: OutlineTarget, cancelToken: CancellationToken): Promise<IOutline<OutlineEntry> | undefined> {
+	async createOutline(editor: INotebookEditorPane, target: OutlineTarget, cancelToken: CancellationToken): Promise<IOutline<OutlineEntry> | undefined> {
 		const outline = this._instantiationService.createInstance(NotebookCellOutline, editor, target);
-
-		const showAllGotoSymbols = this._configurationService.getValue<boolean>(NotebookSetting.gotoSymbolsAllSymbols);
-		const showAllOutlineSymbols = this._configurationService.getValue<boolean>(NotebookSetting.outlineShowCodeCellSymbols);
-		if (target === OutlineTarget.QuickPick && showAllGotoSymbols) {
-			await outline.setFullSymbols(cancelToken);
-		} else if (target === OutlineTarget.OutlinePane && showAllOutlineSymbols) {
-			// No need to wait for this, we want the outline to show up quickly.
-			void outline.setFullSymbols(cancelToken);
+		if (target === OutlineTarget.QuickPick) {
+			// The quickpick creates the outline on demand
+			// so we need to ensure the symbols are pre-cached before the entries are syncronously requested
+			await outline.doComputeSymbols(cancelToken);
 		}
-
 		return outline;
 	}
 }
@@ -679,7 +908,6 @@ registerAction2(class ToggleShowMarkdownHeadersOnly extends Action2 {
 	}
 });
 
-
 registerAction2(class ToggleCodeCellEntries extends Action2 {
 	constructor() {
 		super({
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/profile/notebookProfile.ts b/src/vs/workbench/contrib/notebook/browser/contrib/profile/notebookProfile.ts
index ec03486e587..74bdd93a449 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/profile/notebookProfile.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/profile/notebookProfile.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { localize } from 'vs/nls';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { NotebookSetting } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { ServicesAccessor } from '../../../../../../editor/browser/editorExtensions.js';
+import { localize } from '../../../../../../nls.js';
+import { Action2, registerAction2 } from '../../../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { NotebookSetting } from '../../../common/notebookCommon.js';
 
 export enum NotebookProfileType {
 	default = 'default',
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/saveParticipants/saveParticipants.ts b/src/vs/workbench/contrib/notebook/browser/contrib/saveParticipants/saveParticipants.ts
index eb2d57e62fe..96f82e22e15 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/saveParticipants/saveParticipants.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/saveParticipants/saveParticipants.ts
@@ -3,42 +3,60 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { HierarchicalKind } from 'vs/base/common/hierarchicalKind';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { isEqual } from 'vs/base/common/resources';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IBulkEditService, ResourceEdit, ResourceTextEdit } from 'vs/editor/browser/services/bulkEditService';
-import { trimTrailingWhitespace } from 'vs/editor/common/commands/trimTrailingWhitespaceCommand';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { CodeActionProvider, CodeActionTriggerType, IWorkspaceTextEdit } from 'vs/editor/common/languages';
-import { IReadonlyTextBuffer, ITextModel } from 'vs/editor/common/model';
-import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { ApplyCodeActionReason, applyCodeAction, getCodeActions } from 'vs/editor/contrib/codeAction/browser/codeAction';
-import { CodeActionItem, CodeActionKind, CodeActionTriggerSource } from 'vs/editor/contrib/codeAction/common/types';
-import { FormattingMode, getDocumentFormattingEditsWithSelectedProvider } from 'vs/editor/contrib/format/browser/format';
-import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2';
-import { localize } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProgress, IProgressStep } from 'vs/platform/progress/common/progress';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IWorkspaceTrustManagementService } from 'vs/platform/workspace/common/workspaceTrust';
-import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchContributionsExtensions } from 'vs/workbench/common/contributions';
-import { SaveReason } from 'vs/workbench/common/editor';
-import { getNotebookEditorFromEditorPane } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { CellKind, NotebookSetting } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { NotebookFileWorkingCopyModel } from 'vs/workbench/contrib/notebook/common/notebookEditorModel';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel } from 'vs/workbench/services/workingCopy/common/storedFileWorkingCopy';
-import { IStoredFileWorkingCopySaveParticipant, IStoredFileWorkingCopySaveParticipantContext, IWorkingCopyFileService } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
+import { CancellationToken } from '../../../../../../base/common/cancellation.js';
+import { HierarchicalKind } from '../../../../../../base/common/hierarchicalKind.js';
+import { Disposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { isEqual } from '../../../../../../base/common/resources.js';
+import { ICodeEditor } from '../../../../../../editor/browser/editorBrowser.js';
+import { IBulkEditService, ResourceEdit, ResourceTextEdit } from '../../../../../../editor/browser/services/bulkEditService.js';
+import { trimTrailingWhitespace } from '../../../../../../editor/common/commands/trimTrailingWhitespaceCommand.js';
+import { Position } from '../../../../../../editor/common/core/position.js';
+import { Range } from '../../../../../../editor/common/core/range.js';
+import { Selection } from '../../../../../../editor/common/core/selection.js';
+import { CodeActionProvider, CodeActionTriggerType, IWorkspaceTextEdit } from '../../../../../../editor/common/languages.js';
+import { IReadonlyTextBuffer, ITextModel } from '../../../../../../editor/common/model.js';
+import { IEditorWorkerService } from '../../../../../../editor/common/services/editorWorker.js';
+import { ILanguageFeaturesService } from '../../../../../../editor/common/services/languageFeatures.js';
+import { ITextModelService } from '../../../../../../editor/common/services/resolverService.js';
+import { ApplyCodeActionReason, applyCodeAction, getCodeActions } from '../../../../../../editor/contrib/codeAction/browser/codeAction.js';
+import { CodeActionItem, CodeActionKind, CodeActionTriggerSource } from '../../../../../../editor/contrib/codeAction/common/types.js';
+import { FormattingMode, getDocumentFormattingEditsWithSelectedProvider } from '../../../../../../editor/contrib/format/browser/format.js';
+import { SnippetController2 } from '../../../../../../editor/contrib/snippet/browser/snippetController2.js';
+import { localize } from '../../../../../../nls.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../../../platform/log/common/log.js';
+import { IProgress, IProgressStep } from '../../../../../../platform/progress/common/progress.js';
+import { Registry } from '../../../../../../platform/registry/common/platform.js';
+import { IWorkspaceTrustManagementService } from '../../../../../../platform/workspace/common/workspaceTrust.js';
+import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchContributionsExtensions } from '../../../../../common/contributions.js';
+import { SaveReason } from '../../../../../common/editor.js';
+import { getNotebookEditorFromEditorPane } from '../../notebookBrowser.js';
+import { NotebookTextModel } from '../../../common/model/notebookTextModel.js';
+import { CellKind, NotebookSetting } from '../../../common/notebookCommon.js';
+import { NotebookFileWorkingCopyModel } from '../../../common/notebookEditorModel.js';
+import { IEditorService } from '../../../../../services/editor/common/editorService.js';
+import { LifecyclePhase } from '../../../../../services/lifecycle/common/lifecycle.js';
+import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel } from '../../../../../services/workingCopy/common/storedFileWorkingCopy.js';
+import { IStoredFileWorkingCopySaveParticipant, IStoredFileWorkingCopySaveParticipantContext, IWorkingCopyFileService } from '../../../../../services/workingCopy/common/workingCopyFileService.js';
+import { NotebookMultiCursorController, NotebookMultiCursorState } from '../multicursor/notebookMulticursor.js';
+
+abstract class NotebookSaveParticipant implements IStoredFileWorkingCopySaveParticipant {
+	constructor(
+		private readonly _editorService: IEditorService,
+	) { }
+	abstract participate(workingCopy: IStoredFileWorkingCopy<IStoredFileWorkingCopyModel>, context: IStoredFileWorkingCopySaveParticipantContext, progress: IProgress<IProgressStep>, token: CancellationToken): Promise<void>;
+
+	protected canParticipate(): boolean {
+		const editor = getNotebookEditorFromEditorPane(this._editorService.activeEditorPane);
+		const controller = editor?.getContribution<NotebookMultiCursorController>(NotebookMultiCursorController.id);
+		if (!controller) {
+			return true;
+		}
+
+		return controller.getState() !== NotebookMultiCursorState.Editing;
+	}
+}
 
 class FormatOnSaveParticipant implements IStoredFileWorkingCopySaveParticipant {
 	constructor(
@@ -104,19 +122,21 @@ class FormatOnSaveParticipant implements IStoredFileWorkingCopySaveParticipant {
 	}
 }
 
-class TrimWhitespaceParticipant implements IStoredFileWorkingCopySaveParticipant {
+class TrimWhitespaceParticipant extends NotebookSaveParticipant {
 
 	constructor(
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IEditorService private readonly editorService: IEditorService,
 		@ITextModelService private readonly textModelService: ITextModelService,
 		@IBulkEditService private readonly bulkEditService: IBulkEditService,
-	) { }
+	) {
+		super(editorService);
+	}
 
 	async participate(workingCopy: IStoredFileWorkingCopy<IStoredFileWorkingCopyModel>, context: IStoredFileWorkingCopySaveParticipantContext, progress: IProgress<IProgressStep>, _token: CancellationToken): Promise<void> {
 		const trimTrailingWhitespaceOption = this.configurationService.getValue<boolean>('files.trimTrailingWhitespace');
 		const trimInRegexAndStrings = this.configurationService.getValue<boolean>('files.trimTrailingWhitespaceInRegexAndStrings');
-		if (trimTrailingWhitespaceOption) {
+		if (trimTrailingWhitespaceOption && this.canParticipate()) {
 			await this.doTrimTrailingWhitespace(workingCopy, context.reason === SaveReason.AUTO, trimInRegexAndStrings, progress);
 		}
 	}
@@ -174,16 +194,19 @@ class TrimWhitespaceParticipant implements IStoredFileWorkingCopySaveParticipant
 	}
 }
 
-class TrimFinalNewLinesParticipant implements IStoredFileWorkingCopySaveParticipant {
+class TrimFinalNewLinesParticipant extends NotebookSaveParticipant {
 
 	constructor(
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IEditorService private readonly editorService: IEditorService,
 		@IBulkEditService private readonly bulkEditService: IBulkEditService,
-	) { }
+	) {
+		super(editorService);
+	}
+
 
 	async participate(workingCopy: IStoredFileWorkingCopy<IStoredFileWorkingCopyModel>, context: IStoredFileWorkingCopySaveParticipantContext, progress: IProgress<IProgressStep>, _token: CancellationToken): Promise<void> {
-		if (this.configurationService.getValue<boolean>('files.trimFinalNewlines')) {
+		if (this.configurationService.getValue<boolean>('files.trimFinalNewlines') && this.canParticipate()) {
 			await this.doTrimFinalNewLines(workingCopy, context.reason === SaveReason.AUTO, progress);
 		}
 	}
@@ -254,19 +277,21 @@ class TrimFinalNewLinesParticipant implements IStoredFileWorkingCopySaveParticip
 	}
 }
 
-class InsertFinalNewLineParticipant implements IStoredFileWorkingCopySaveParticipant {
+class InsertFinalNewLineParticipant extends NotebookSaveParticipant {
 
 	constructor(
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IBulkEditService private readonly bulkEditService: IBulkEditService,
 		@IEditorService private readonly editorService: IEditorService,
-	) { }
+	) {
+		super(editorService);
+	}
 
 	async participate(workingCopy: IStoredFileWorkingCopy<IStoredFileWorkingCopyModel>, context: IStoredFileWorkingCopySaveParticipantContext, progress: IProgress<IProgressStep>, _token: CancellationToken): Promise<void> {
 		// waiting on notebook-specific override before this feature can sync with 'files.insertFinalNewline'
 		// if (this.configurationService.getValue('files.insertFinalNewline')) {
 
-		if (this.configurationService.getValue<boolean>(NotebookSetting.insertFinalNewline)) {
+		if (this.configurationService.getValue<boolean>(NotebookSetting.insertFinalNewline) && this.canParticipate()) {
 			await this.doInsertFinalNewLine(workingCopy, context.reason === SaveReason.AUTO, progress);
 		}
 	}
@@ -499,7 +524,7 @@ export class CodeActionParticipantUtils {
 		};
 
 		for (const codeActionKind of codeActionsOnSave) {
-			const actionsToRun = await this.getActionsToRun(model, codeActionKind, excludes, languageFeaturesService, getActionProgress, token);
+			const actionsToRun = await CodeActionParticipantUtils.getActionsToRun(model, codeActionKind, excludes, languageFeaturesService, getActionProgress, token);
 			if (token.isCancellationRequested) {
 				actionsToRun.dispose();
 				return;
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/troubleshoot/layout.ts b/src/vs/workbench/contrib/notebook/browser/contrib/troubleshoot/layout.ts
index 22b0a5e3fe3..1e9d121a0a5 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/troubleshoot/layout.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/troubleshoot/layout.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, DisposableStore, dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { localize2 } from 'vs/nls';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { getNotebookEditorFromEditorPane, ICellViewModel, ICommonCellViewModelLayoutChangeInfo, INotebookDeltaCellStatusBarItems, INotebookEditor, INotebookEditorContribution } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { registerNotebookContribution } from 'vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
-import { NotebookEditorWidget } from 'vs/workbench/contrib/notebook/browser/notebookEditorWidget';
-import { CellStatusbarAlignment, INotebookCellStatusBarItem } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { Disposable, DisposableStore, dispose, IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { localize2 } from '../../../../../../nls.js';
+import { Categories } from '../../../../../../platform/action/common/actionCommonCategories.js';
+import { Action2, registerAction2 } from '../../../../../../platform/actions/common/actions.js';
+import { ServicesAccessor } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { getNotebookEditorFromEditorPane, ICellViewModel, ICommonCellViewModelLayoutChangeInfo, INotebookDeltaCellStatusBarItems, INotebookEditor, INotebookEditorContribution } from '../../notebookBrowser.js';
+import { registerNotebookContribution } from '../../notebookEditorExtensions.js';
+import { NotebookEditorWidget } from '../../notebookEditorWidget.js';
+import { CellStatusbarAlignment, INotebookCellStatusBarItem } from '../../../common/notebookCommon.js';
+import { INotebookService } from '../../../common/notebookService.js';
+import { IEditorService } from '../../../../../services/editor/common/editorService.js';
 
 export class TroubleshootController extends Disposable implements INotebookEditorContribution {
 	static id: string = 'workbench.notebook.troubleshoot';
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/undoRedo/notebookUndoRedo.ts b/src/vs/workbench/contrib/notebook/browser/contrib/undoRedo/notebookUndoRedo.ts
index ebe2244af75..b1e33662c2a 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/undoRedo/notebookUndoRedo.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/undoRedo/notebookUndoRedo.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { CellEditState, getNotebookEditorFromEditorPane } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { RedoCommand, UndoCommand } from 'vs/editor/browser/editorExtensions';
-import { NotebookViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { WorkbenchPhase, registerWorkbenchContribution2 } from '../../../../../common/contributions.js';
+import { CellKind } from '../../../common/notebookCommon.js';
+import { IEditorService } from '../../../../../services/editor/common/editorService.js';
+import { CellEditState, getNotebookEditorFromEditorPane } from '../../notebookBrowser.js';
+import { RedoCommand, UndoCommand } from '../../../../../../editor/browser/editorExtensions.js';
+import { NotebookViewModel } from '../../viewModel/notebookViewModelImpl.js';
 
 class NotebookUndoRedoContribution extends Disposable {
 
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/viewportWarmup/viewportWarmup.ts b/src/vs/workbench/contrib/notebook/browser/contrib/viewportWarmup/viewportWarmup.ts
index c48007dd92a..181446ea49e 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/viewportWarmup/viewportWarmup.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/viewportWarmup/viewportWarmup.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { CellEditState, IInsetRenderOutput, INotebookEditor, INotebookEditorContribution, INotebookEditorDelegate, RenderOutputType } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { registerNotebookContribution } from 'vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
-import { CodeCellViewModel, outputDisplayLimit } from 'vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
-import { CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { cellRangesToIndexes } from 'vs/workbench/contrib/notebook/common/notebookRange';
-import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
+import { RunOnceScheduler } from '../../../../../../base/common/async.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { IAccessibilityService } from '../../../../../../platform/accessibility/common/accessibility.js';
+import { CellEditState, IInsetRenderOutput, INotebookEditor, INotebookEditorContribution, INotebookEditorDelegate, RenderOutputType } from '../../notebookBrowser.js';
+import { registerNotebookContribution } from '../../notebookEditorExtensions.js';
+import { CodeCellViewModel, outputDisplayLimit } from '../../viewModel/codeCellViewModel.js';
+import { CellKind } from '../../../common/notebookCommon.js';
+import { cellRangesToIndexes } from '../../../common/notebookRange.js';
+import { INotebookService } from '../../../common/notebookService.js';
 
 class NotebookViewportContribution extends Disposable implements INotebookEditorContribution {
 	static id: string = 'workbench.notebook.viewportWarmup';
diff --git a/src/vs/workbench/contrib/notebook/browser/controller/apiActions.ts b/src/vs/workbench/contrib/notebook/browser/controller/apiActions.ts
index 1d5d4405f06..b85723a2bef 100644
--- a/src/vs/workbench/contrib/notebook/browser/controller/apiActions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/controller/apiActions.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as glob from 'vs/base/common/glob';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { isDocumentExcludePattern, TransientCellMetadata, TransientDocumentMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotebookKernelService } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
-import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
+import * as glob from '../../../../../base/common/glob.js';
+import { URI, UriComponents } from '../../../../../base/common/uri.js';
+import { CommandsRegistry } from '../../../../../platform/commands/common/commands.js';
+import { isDocumentExcludePattern, TransientCellMetadata, TransientDocumentMetadata } from '../../common/notebookCommon.js';
+import { INotebookKernelService } from '../../common/notebookKernelService.js';
+import { INotebookService } from '../../common/notebookService.js';
 
 CommandsRegistry.registerCommand('_resolveNotebookContentProvider', (accessor): {
 	viewType: string;
@@ -64,7 +64,7 @@ CommandsRegistry.registerCommand('_resolveNotebookKernels', async (accessor, arg
 }[]> => {
 	const notebookKernelService = accessor.get(INotebookKernelService);
 	const uri = URI.revive(args.uri as UriComponents);
-	const kernels = notebookKernelService.getMatchingKernel({ uri, viewType: args.viewType });
+	const kernels = notebookKernelService.getMatchingKernel({ uri, notebookType: args.viewType });
 
 	return kernels.all.map(provider => ({
 		id: provider.id,
diff --git a/src/vs/workbench/contrib/notebook/browser/controller/cellOperations.ts b/src/vs/workbench/contrib/notebook/browser/controller/cellOperations.ts
index 64c90739dea..3432d899d1b 100644
--- a/src/vs/workbench/contrib/notebook/browser/controller/cellOperations.ts
+++ b/src/vs/workbench/contrib/notebook/browser/controller/cellOperations.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IBulkEditService, ResourceEdit, ResourceTextEdit } from 'vs/editor/browser/services/bulkEditService';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { EndOfLinePreference, IReadonlyTextBuffer } from 'vs/editor/common/model';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ResourceNotebookCellEdit } from 'vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
-import { INotebookActionContext, INotebookCellActionContext } from 'vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { CellEditState, CellFocusMode, expandCellRangesWithHiddenCells, IActiveNotebookEditor, ICellViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CellViewModel, NotebookViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl';
-import { cloneNotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
-import { CellEditType, CellKind, ICellEditOperation, ICellReplaceEdit, IOutputDto, ISelectionState, NotebookCellMetadata, SelectionStateType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { cellRangeContains, cellRangesToIndexes, ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
-import { localize } from 'vs/nls';
-import { INotificationService } from 'vs/platform/notification/common/notification';
+import { IBulkEditService, ResourceEdit, ResourceTextEdit } from '../../../../../editor/browser/services/bulkEditService.js';
+import { IPosition, Position } from '../../../../../editor/common/core/position.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { EndOfLinePreference, IReadonlyTextBuffer } from '../../../../../editor/common/model.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../../../../../editor/common/languages/modesRegistry.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
+import { ResourceNotebookCellEdit } from '../../../bulkEdit/browser/bulkCellEdits.js';
+import { INotebookActionContext, INotebookCellActionContext } from './coreActions.js';
+import { CellEditState, CellFocusMode, expandCellRangesWithHiddenCells, IActiveNotebookEditor, ICellViewModel } from '../notebookBrowser.js';
+import { CellViewModel, NotebookViewModel } from '../viewModel/notebookViewModelImpl.js';
+import { cloneNotebookCellTextModel } from '../../common/model/notebookCellTextModel.js';
+import { CellEditType, CellKind, ICellEditOperation, ICellReplaceEdit, IOutputDto, ISelectionState, NotebookCellMetadata, SelectionStateType } from '../../common/notebookCommon.js';
+import { cellRangeContains, cellRangesToIndexes, ICellRange } from '../../common/notebookRange.js';
+import { localize } from '../../../../../nls.js';
+import { INotificationService } from '../../../../../platform/notification/common/notification.js';
 
 export async function changeCellToKind(kind: CellKind, context: INotebookActionContext, language?: string, mime?: string): Promise<void> {
 	const { notebookEditor } = context;
@@ -184,7 +184,7 @@ export function runDeleteAction(editor: IActiveNotebookEditor, cell: ICellViewMo
 	}
 }
 
-export async function moveCellRange(context: INotebookCellActionContext, direction: 'up' | 'down'): Promise<void> {
+export async function moveCellRange(context: INotebookActionContext, direction: 'up' | 'down'): Promise<void> {
 	if (!context.notebookEditor.hasModel()) {
 		return;
 	}
@@ -195,9 +195,17 @@ export async function moveCellRange(context: INotebookCellActionContext, directi
 		return;
 	}
 
-	const selections = editor.getSelections();
-	const modelRanges = expandCellRangesWithHiddenCells(editor, selections);
-	const range = modelRanges[0];
+	let range: ICellRange | undefined = undefined;
+
+	if (context.cell) {
+		const idx = editor.getCellIndex(context.cell);
+		range = { start: idx, end: idx + 1 };
+	} else {
+		const selections = editor.getSelections();
+		const modelRanges = expandCellRangesWithHiddenCells(editor, selections);
+		range = modelRanges[0];
+	}
+
 	if (!range || range.start === range.end) {
 		return;
 	}
diff --git a/src/vs/workbench/contrib/notebook/browser/controller/cellOutputActions.ts b/src/vs/workbench/contrib/notebook/browser/controller/cellOutputActions.ts
index 0db8e6dd2b4..d1e521bd6e5 100644
--- a/src/vs/workbench/contrib/notebook/browser/controller/cellOutputActions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/controller/cellOutputActions.ts
@@ -3,22 +3,53 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { localize } from 'vs/nls';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { INotebookOutputActionContext, NOTEBOOK_ACTIONS_CATEGORY } from 'vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { NOTEBOOK_CELL_HAS_OUTPUTS } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
-import * as icons from 'vs/workbench/contrib/notebook/browser/notebookIcons';
-import { ILogService } from 'vs/platform/log/common/log';
-import { copyCellOutput } from 'vs/workbench/contrib/notebook/browser/contrib/clipboard/cellOutputClipboard';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ICellOutputViewModel, ICellViewModel, INotebookEditor, getNotebookEditorFromEditorPane } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { CodeCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
+import { ServicesAccessor } from '../../../../../editor/browser/editorExtensions.js';
+import { localize } from '../../../../../nls.js';
+import { Action2, MenuId, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
+import { INotebookOutputActionContext, NOTEBOOK_ACTIONS_CATEGORY } from './coreActions.js';
+import { NOTEBOOK_CELL_HAS_HIDDEN_OUTPUTS, NOTEBOOK_CELL_HAS_OUTPUTS } from '../../common/notebookContextKeys.js';
+import * as icons from '../notebookIcons.js';
+import { ILogService } from '../../../../../platform/log/common/log.js';
+import { copyCellOutput } from '../contrib/clipboard/cellOutputClipboard.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { ICellOutputViewModel, ICellViewModel, INotebookEditor, getNotebookEditorFromEditorPane } from '../notebookBrowser.js';
+import { CellKind, CellUri } from '../../common/notebookCommon.js';
+import { CodeCellViewModel } from '../viewModel/codeCellViewModel.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { INotebookEditorModelResolverService } from '../../common/notebookEditorModelResolverService.js';
 
 export const COPY_OUTPUT_COMMAND_ID = 'notebook.cellOutput.copy';
 
+registerAction2(class ShowAllOutputsAction extends Action2 {
+	constructor() {
+		super({
+			id: 'notebook.cellOuput.showEmptyOutputs',
+			title: localize('notebookActions.showAllOutput', "Show empty outputs"),
+			menu: {
+				id: MenuId.NotebookOutputToolbar,
+				when: ContextKeyExpr.and(NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_HAS_HIDDEN_OUTPUTS)
+			},
+			f1: false,
+			category: NOTEBOOK_ACTIONS_CATEGORY
+		});
+	}
+
+	run(accessor: ServicesAccessor, context: INotebookOutputActionContext): void {
+		const cell = context.cell;
+		if (cell && cell.cellKind === CellKind.Code) {
+
+			for (let i = 1; i < cell.outputsViewModels.length; i++) {
+				if (!cell.outputsViewModels[i].visible.get()) {
+					cell.outputsViewModels[i].setVisible(true, true);
+					(cell as CodeCellViewModel).updateOutputHeight(i, 1, 'command');
+				}
+			}
+		}
+	}
+});
+
 registerAction2(class CopyCellOutputAction extends Action2 {
 	constructor() {
 		super({
@@ -95,7 +126,7 @@ function getOutputViewModelFromId(outputId: string, notebookEditor: INotebookEdi
 	if (notebookViewModel) {
 		const codeCells = notebookViewModel.viewCells.filter(cell => cell.cellKind === CellKind.Code) as CodeCellViewModel[];
 		for (const cell of codeCells) {
-			const output = cell.outputsViewModels.find(output => output.model.outputId === outputId);
+			const output = cell.outputsViewModels.find(output => output.model.outputId === outputId || output.model.alternativeOutputId === outputId);
 			if (output) {
 				return output;
 			}
@@ -104,3 +135,49 @@ function getOutputViewModelFromId(outputId: string, notebookEditor: INotebookEdi
 
 	return undefined;
 }
+
+export const OPEN_OUTPUT_COMMAND_ID = 'notebook.cellOutput.openInTextEditor';
+
+registerAction2(class OpenCellOutputInEditorAction extends Action2 {
+	constructor() {
+		super({
+			id: OPEN_OUTPUT_COMMAND_ID,
+			title: localize('notebookActions.openOutputInEditor', "Open Cell Output in Text Editor"),
+			f1: false,
+			category: NOTEBOOK_ACTIONS_CATEGORY,
+			icon: icons.copyIcon,
+		});
+	}
+
+	private getNoteboookEditor(editorService: IEditorService, outputContext: INotebookOutputActionContext | { outputViewModel: ICellOutputViewModel } | undefined): INotebookEditor | undefined {
+		if (outputContext && 'notebookEditor' in outputContext) {
+			return outputContext.notebookEditor;
+		}
+		return getNotebookEditorFromEditorPane(editorService.activeEditorPane);
+	}
+
+	async run(accessor: ServicesAccessor, outputContext: INotebookOutputActionContext | { outputViewModel: ICellOutputViewModel } | undefined): Promise<void> {
+		const notebookEditor = this.getNoteboookEditor(accessor.get(IEditorService), outputContext);
+		const notebookModelService = accessor.get(INotebookEditorModelResolverService);
+
+		if (!notebookEditor) {
+			return;
+		}
+
+		let outputViewModel: ICellOutputViewModel | undefined;
+		if (outputContext && 'outputId' in outputContext && typeof outputContext.outputId === 'string') {
+			outputViewModel = getOutputViewModelFromId(outputContext.outputId, notebookEditor);
+		} else if (outputContext && 'outputViewModel' in outputContext) {
+			outputViewModel = outputContext.outputViewModel;
+		}
+
+		const openerService = accessor.get(IOpenerService);
+
+		if (outputViewModel?.model.outputId && notebookEditor.textModel?.uri) {
+			// reserve notebook document reference since the active notebook editor might not be pinned so it can be replaced by the output editor
+			const ref = await notebookModelService.resolve(notebookEditor.textModel.uri);
+			await openerService.open(CellUri.generateCellOutputUri(notebookEditor.textModel.uri, outputViewModel.model.outputId));
+			ref.dispose();
+		}
+	}
+});
diff --git a/src/vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions.ts b/src/vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions.ts
index 7ed5b3c5683..00a48c648f2 100644
--- a/src/vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions.ts
@@ -3,27 +3,33 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from 'vs/base/common/codicons';
-import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { localize, localize2 } from 'vs/nls';
-import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from 'vs/platform/accessibility/common/accessibility';
-import { MenuId, MenuRegistry, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { InputFocusedContextKey } from 'vs/platform/contextkey/common/contextkeys';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_HAS_AGENT, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_RESPONSE_TYPES, InlineChatResponseTypes } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
-import { CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST, CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION, CTX_NOTEBOOK_CHAT_USER_DID_EDIT, MENU_CELL_CHAT_INPUT, MENU_CELL_CHAT_WIDGET, MENU_CELL_CHAT_WIDGET_STATUS } from 'vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext';
-import { NotebookChatController } from 'vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController';
-import { CELL_TITLE_CELL_GROUP_ID, INotebookActionContext, INotebookCellActionContext, NotebookAction, NotebookCellAction, getEditorFromArgsOrActivePane } from 'vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { insertNewCell } from 'vs/workbench/contrib/notebook/browser/controller/insertCellActions';
-import { CellEditState } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CellKind, NOTEBOOK_EDITOR_CURSOR_BOUNDARY, NotebookSetting } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { NOTEBOOK_CELL_EDITOR_FOCUSED, NOTEBOOK_CELL_GENERATED_BY_CHAT, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_EDITOR_FOCUSED } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
-
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { KeyChord, KeyCode, KeyMod } from '../../../../../../base/common/keyCodes.js';
+import { EditorContextKeys } from '../../../../../../editor/common/editorContextKeys.js';
+import { localize, localize2 } from '../../../../../../nls.js';
+import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from '../../../../../../platform/accessibility/common/accessibility.js';
+import { MenuId, MenuRegistry, registerAction2 } from '../../../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { InputFocusedContextKey } from '../../../../../../platform/contextkey/common/contextkeys.js';
+import { ServicesAccessor } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { CTX_INLINE_CHAT_DOCUMENT_CHANGED, CTX_INLINE_CHAT_EDIT_MODE, CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_RESPONSE_TYPE, CTX_INLINE_CHAT_VISIBLE, EditMode, InlineChatResponseType, MENU_INLINE_CHAT_WIDGET_STATUS } from '../../../../inlineChat/common/inlineChat.js';
+import { CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST, CTX_NOTEBOOK_CHAT_HAS_AGENT, CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION, CTX_NOTEBOOK_CHAT_USER_DID_EDIT, MENU_CELL_CHAT_INPUT, MENU_CELL_CHAT_WIDGET, MENU_CELL_CHAT_WIDGET_STATUS } from './notebookChatContext.js';
+import { NotebookChatController } from './notebookChatController.js';
+import { CELL_TITLE_CELL_GROUP_ID, INotebookActionContext, INotebookCellActionContext, NotebookAction, NotebookCellAction, getContextFromActiveEditor, getEditorFromArgsOrActivePane } from '../coreActions.js';
+import { insertNewCell } from '../insertCellActions.js';
+import { CellEditState } from '../../notebookBrowser.js';
+import { CellKind, NOTEBOOK_EDITOR_CURSOR_BOUNDARY, NotebookSetting } from '../../../common/notebookCommon.js';
+import { IS_COMPOSITE_NOTEBOOK, NOTEBOOK_CELL_EDITOR_FOCUSED, NOTEBOOK_CELL_GENERATED_BY_CHAT, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_EDITOR_FOCUSED } from '../../../common/notebookContextKeys.js';
+import { Iterable } from '../../../../../../base/common/iterator.js';
+import { ICodeEditor } from '../../../../../../editor/browser/editorBrowser.js';
+import { IEditorService } from '../../../../../services/editor/common/editorService.js';
+import { CONTEXT_CHAT_INPUT_HAS_TEXT } from '../../../../chat/common/chatContextKeys.js';
+import { AbstractInlineChatAction } from '../../../../inlineChat/browser/inlineChatActions.js';
+import { InlineChatController } from '../../../../inlineChat/browser/inlineChatController.js';
+import { HunkInformation } from '../../../../inlineChat/browser/inlineChatSession.js';
 
 registerAction2(class extends NotebookAction {
 	constructor() {
@@ -159,7 +165,6 @@ registerAction2(class extends NotebookCellAction {
 				title: localize('focusNextChatWidget', 'Focus Next Cell Chat Widget'),
 				keybinding: {
 					when: ContextKeyExpr.and(
-						NOTEBOOK_EDITOR_FOCUSED,
 						CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate(),
 						ContextKeyExpr.and(
 							ContextKeyExpr.has(InputFocusedContextKey),
@@ -172,7 +177,11 @@ registerAction2(class extends NotebookCellAction {
 					weight: KeybindingWeight.EditorCore + 7,
 					primary: KeyMod.CtrlCmd | KeyCode.DownArrow
 				},
-				f1: false
+				f1: false,
+				precondition: ContextKeyExpr.or(
+					ContextKeyExpr.and(IS_COMPOSITE_NOTEBOOK.negate(), NOTEBOOK_CELL_EDITOR_FOCUSED),
+					ContextKeyExpr.and(IS_COMPOSITE_NOTEBOOK, NOTEBOOK_CELL_EDITOR_FOCUSED.negate()),
+				)
 			});
 	}
 
@@ -259,9 +268,9 @@ registerAction2(class extends NotebookAction {
 				menu: [
 					{
 						id: MENU_CELL_CHAT_WIDGET_STATUS,
-						group: 'inline',
+						group: '0_main',
 						order: 0,
-						when: CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo(InlineChatResponseTypes.OnlyMessages),
+						when: CTX_INLINE_CHAT_RESPONSE_TYPE.notEqualsTo(InlineChatResponseType.Messages),
 					}
 				],
 				f1: false
@@ -287,7 +296,7 @@ registerAction2(class extends NotebookAction {
 				},
 				menu: {
 					id: MENU_CELL_CHAT_WIDGET_STATUS,
-					group: 'main',
+					group: '0_main',
 					order: 1
 				},
 				f1: false
@@ -309,10 +318,7 @@ async function startChat(accessor: ServicesAccessor, context: INotebookActionCon
 	const configurationService = accessor.get(IConfigurationService);
 	const commandService = accessor.get(ICommandService);
 
-	if (configurationService.getValue<boolean>(NotebookSetting.cellChat)) {
-		context.notebookEditor.focusContainer();
-		NotebookChatController.get(context.notebookEditor)?.run(index, input, autoSend);
-	} else if (configurationService.getValue<boolean>(NotebookSetting.cellGenerate)) {
+	if (configurationService.getValue<boolean>(NotebookSetting.cellGenerate) || configurationService.getValue<boolean>(NotebookSetting.cellChat)) {
 		const activeCell = context.notebookEditor.getActiveCell();
 		const targetCell = activeCell?.getTextLength() === 0 && source !== 'insertToolbar' ? activeCell : (await insertNewCell(accessor, context, CellKind.Code, 'below', true));
 
@@ -367,7 +373,7 @@ registerAction2(class extends NotebookAction {
 						NOTEBOOK_EDITOR_FOCUSED,
 						NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true),
 						ContextKeyExpr.not(InputFocusedContextKey),
-						CTX_INLINE_CHAT_HAS_AGENT,
+						CTX_NOTEBOOK_CHAT_HAS_AGENT,
 						ContextKeyExpr.or(
 							ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true),
 							ContextKeyExpr.equals(`config.${NotebookSetting.cellGenerate}`, true)
@@ -384,7 +390,7 @@ registerAction2(class extends NotebookAction {
 						order: -1,
 						when: ContextKeyExpr.and(
 							NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true),
-							CTX_INLINE_CHAT_HAS_AGENT,
+							CTX_NOTEBOOK_CHAT_HAS_AGENT,
 							ContextKeyExpr.or(
 								ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true),
 								ContextKeyExpr.equals(`config.${NotebookSetting.cellGenerate}`, true)
@@ -459,7 +465,7 @@ registerAction2(class extends NotebookAction {
 						order: -1,
 						when: ContextKeyExpr.and(
 							NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true),
-							CTX_INLINE_CHAT_HAS_AGENT,
+							CTX_NOTEBOOK_CHAT_HAS_AGENT,
 							ContextKeyExpr.or(
 								ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true),
 								ContextKeyExpr.equals(`config.${NotebookSetting.cellGenerate}`, true)
@@ -488,7 +494,7 @@ MenuRegistry.appendMenuItem(MenuId.NotebookToolbar, {
 		NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true),
 		ContextKeyExpr.notEquals('config.notebook.insertToolbarLocation', 'betweenCells'),
 		ContextKeyExpr.notEquals('config.notebook.insertToolbarLocation', 'hidden'),
-		CTX_INLINE_CHAT_HAS_AGENT,
+		CTX_NOTEBOOK_CHAT_HAS_AGENT,
 		ContextKeyExpr.or(
 			ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true),
 			ContextKeyExpr.equals(`config.${NotebookSetting.cellGenerate}`, true)
@@ -633,7 +639,7 @@ registerAction2(class extends NotebookCellAction {
 					order: 0,
 					when: ContextKeyExpr.and(
 						NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true),
-						CTX_INLINE_CHAT_HAS_AGENT,
+						CTX_NOTEBOOK_CHAT_HAS_AGENT,
 						NOTEBOOK_CELL_GENERATED_BY_CHAT,
 						ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true)
 					)
@@ -663,3 +669,54 @@ registerAction2(class extends NotebookCellAction {
 		}
 	}
 });
+
+
+export class AcceptChangesAndRun extends AbstractInlineChatAction {
+
+	constructor() {
+		super({
+			id: 'notebook.inlineChat.acceptChangesAndRun',
+			title: localize2('notebook.apply1', "Accept and Run"),
+			shortTitle: localize('notebook.apply2', 'Accept & Run'),
+			tooltip: localize('notebook.apply3', 'Accept the changes and run the cell'),
+			icon: Codicon.check,
+			f1: true,
+			precondition: ContextKeyExpr.and(
+				NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true),
+				CTX_INLINE_CHAT_VISIBLE,
+				ContextKeyExpr.or(CTX_INLINE_CHAT_DOCUMENT_CHANGED.toNegated(), CTX_INLINE_CHAT_EDIT_MODE.notEqualsTo(EditMode.Preview))
+			),
+			keybinding: undefined,
+			menu: [{
+				id: MENU_INLINE_CHAT_WIDGET_STATUS,
+				group: '0_main',
+				order: 2,
+				when: ContextKeyExpr.and(
+					NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true),
+					CONTEXT_CHAT_INPUT_HAS_TEXT.toNegated(),
+					CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated(),
+					CTX_INLINE_CHAT_RESPONSE_TYPE.isEqualTo(InlineChatResponseType.MessagesAndEdits)
+				)
+			}]
+		});
+	}
+
+	override async runInlineChatCommand(accessor: ServicesAccessor, ctrl: InlineChatController, codeEditor: ICodeEditor, hunk?: HunkInformation | any): Promise<void> {
+		const editor = getContextFromActiveEditor(accessor.get(IEditorService));
+
+		if (!editor) {
+			return;
+		}
+
+		const matchedCell = editor.notebookEditor.codeEditors.find(e => e[1] === codeEditor);
+		const cell = matchedCell?.[0];
+
+		if (!cell) {
+			return;
+		}
+
+		ctrl.acceptSession();
+		return editor.notebookEditor.executeNotebookCells(Iterable.single(cell));
+	}
+}
+registerAction2(AcceptChangesAndRun);
diff --git a/src/vs/workbench/contrib/notebook/browser/controller/chat/notebook.chat.contribution.ts b/src/vs/workbench/contrib/notebook/browser/controller/chat/notebook.chat.contribution.ts
index f35264aa8cc..3429a3083b4 100644
--- a/src/vs/workbench/contrib/notebook/browser/controller/chat/notebook.chat.contribution.ts
+++ b/src/vs/workbench/contrib/notebook/browser/controller/chat/notebook.chat.contribution.ts
@@ -3,38 +3,232 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from 'vs/workbench/common/contributions';
-import { IChatVariablesService } from 'vs/workbench/contrib/chat/common/chatVariables';
-import 'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions';
-import { NotebookChatController } from 'vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController';
-import { INotebookEditorService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorService';
+import { CancellationToken } from '../../../../../../base/common/cancellation.js';
+import { codiconsLibrary } from '../../../../../../base/common/codiconsLibrary.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { Position } from '../../../../../../editor/common/core/position.js';
+import { Range } from '../../../../../../editor/common/core/range.js';
+import { IWordAtPosition } from '../../../../../../editor/common/core/wordHelper.js';
+import { CompletionContext, CompletionItemKind, CompletionList } from '../../../../../../editor/common/languages.js';
+import { ITextModel } from '../../../../../../editor/common/model.js';
+import { ILanguageFeaturesService } from '../../../../../../editor/common/services/languageFeatures.js';
+import { localize } from '../../../../../../nls.js';
+import { Action2, registerAction2 } from '../../../../../../platform/actions/common/actions.js';
+import { IContextKey, IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { ServicesAccessor } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { IQuickInputService, IQuickPickItem } from '../../../../../../platform/quickinput/common/quickInput.js';
+import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../../../common/contributions.js';
+import { IEditorService } from '../../../../../services/editor/common/editorService.js';
+import { IChatWidget, IChatWidgetService } from '../../../../chat/browser/chat.js';
+import { ChatInputPart } from '../../../../chat/browser/chatInputPart.js';
+import { ChatContextAttachments } from '../../../../chat/browser/contrib/chatContextAttachments.js';
+import { ChatDynamicVariableModel } from '../../../../chat/browser/contrib/chatDynamicVariables.js';
+import { computeCompletionRanges } from '../../../../chat/browser/contrib/chatInputCompletions.js';
+import { ChatAgentLocation, IChatAgentService } from '../../../../chat/common/chatAgents.js';
+import { chatVariableLeader } from '../../../../chat/common/chatParserTypes.js';
+import { INotebookKernelService } from '../../../common/notebookKernelService.js';
+import { getNotebookEditorFromEditorPane } from '../../notebookBrowser.js';
+import './cellChatActions.js';
+import { CTX_NOTEBOOK_CHAT_HAS_AGENT } from './notebookChatContext.js';
 
-class NotebookChatVariables extends Disposable implements IWorkbenchContribution {
+const NotebookKernelVariableKey = 'kernelVariable';
 
-	static readonly ID = 'workbench.contrib.notebookChatVariables';
+class NotebookChatContribution extends Disposable implements IWorkbenchContribution {
+	static readonly ID = 'workbench.contrib.notebookChatContribution';
+
+	private readonly _ctxHasProvider: IContextKey<boolean>;
 
 	constructor(
-		@IChatVariablesService private readonly _chatVariableService: IChatVariablesService,
-		@INotebookEditorService private readonly _notebookEditorService: INotebookEditorService
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IChatAgentService chatAgentService: IChatAgentService,
+		@IEditorService private readonly editorService: IEditorService,
+		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
+		@INotebookKernelService private readonly notebookKernelService: INotebookKernelService,
+		@ILanguageFeaturesService private readonly languageFeaturesService: ILanguageFeaturesService,
 	) {
 		super();
 
-		this._register(this._chatVariableService.registerVariable(
-			{ id: '_notebookChatInput', name: '_notebookChatInput', description: '', hidden: true },
-			async (_message, _arg, model) => {
-				const editors = this._notebookEditorService.listNotebookEditors();
-				for (const editor of editors) {
-					const chatController = editor.getContribution(NotebookChatController.id) as NotebookChatController | undefined;
-					if (chatController?.hasSession(model)) {
-						return chatController.getSessionInputUri();
-					}
+		this._ctxHasProvider = CTX_NOTEBOOK_CHAT_HAS_AGENT.bindTo(contextKeyService);
+
+		const updateNotebookAgentStatus = () => {
+			const hasNotebookAgent = Boolean(chatAgentService.getDefaultAgent(ChatAgentLocation.Notebook));
+			this._ctxHasProvider.set(hasNotebookAgent);
+		};
+
+		updateNotebookAgentStatus();
+		this._register(chatAgentService.onDidChangeAgents(updateNotebookAgentStatus));
+
+		this._register(this.languageFeaturesService.completionProvider.register({ scheme: ChatInputPart.INPUT_SCHEME, hasAccessToAllModels: true }, {
+			_debugDisplayName: 'chatKernelDynamicCompletions',
+			triggerCharacters: [chatVariableLeader],
+			provideCompletionItems: async (model: ITextModel, position: Position, _context: CompletionContext, token: CancellationToken) => {
+				const widget = this.chatWidgetService.getWidgetByInputUri(model.uri);
+				if (!widget || !widget.supportsFileReferences) {
+					return null;
 				}
 
-				return undefined;
+				if (widget.location !== ChatAgentLocation.Notebook) {
+					return null;
+				}
+
+				const variableNameDef = new RegExp(`${chatVariableLeader}\\w*`, 'g');
+				const range = computeCompletionRanges(model, position, variableNameDef, true);
+				if (!range) {
+					return null;
+				}
+
+				const result: CompletionList = { suggestions: [] };
+
+				const afterRange = new Range(position.lineNumber, range.replace.startColumn, position.lineNumber, range.replace.startColumn + `${chatVariableLeader}${NotebookKernelVariableKey}:`.length);
+				result.suggestions.push({
+					label: `${chatVariableLeader}${NotebookKernelVariableKey}`,
+					insertText: `${chatVariableLeader}${NotebookKernelVariableKey}:`,
+					detail: localize('pickKernelVariableLabel', "Pick a variable from the kernel"),
+					range,
+					kind: CompletionItemKind.Text,
+					command: { id: SelectAndInsertKernelVariableAction.ID, title: SelectAndInsertKernelVariableAction.ID, arguments: [{ widget, range: afterRange }] },
+					sortText: 'z'
+				});
+
+				await this.addKernelVariableCompletion(widget, result, range, token);
+
+				return result;
 			}
-		));
+		}));
+	}
+
+	private async addKernelVariableCompletion(widget: IChatWidget, result: CompletionList, info: { insert: Range; replace: Range; varWord: IWordAtPosition | null }, token: CancellationToken) {
+		let pattern: string | undefined;
+		if (info.varWord?.word && info.varWord.word.startsWith(chatVariableLeader)) {
+			pattern = info.varWord.word.toLowerCase().slice(1);
+		}
+
+		const notebook = getNotebookEditorFromEditorPane(this.editorService.activeEditorPane)?.getViewModel()?.notebookDocument;
+
+		if (!notebook) {
+			return;
+		}
+
+		const selectedKernel = this.notebookKernelService.getMatchingKernel(notebook).selected;
+		const hasVariableProvider = selectedKernel?.hasVariableProvider;
+
+		if (!hasVariableProvider) {
+			return;
+		}
+
+		const variables = await selectedKernel.provideVariables(notebook.uri, undefined, 'named', 0, CancellationToken.None);
+
+		for await (const variable of variables) {
+			if (pattern && !variable.name.toLowerCase().includes(pattern)) {
+				continue;
+			}
+
+			result.suggestions.push({
+				label: { label: variable.name, description: variable.type },
+				insertText: `${chatVariableLeader}${NotebookKernelVariableKey}:${variable.name} `,
+				filterText: `${chatVariableLeader}${variable.name}`,
+				range: info,
+				kind: CompletionItemKind.Variable,
+				sortText: 'z',
+				command: { id: SelectAndInsertKernelVariableAction.ID, title: SelectAndInsertKernelVariableAction.ID, arguments: [{ widget, range: info.insert, variable: variable.name }] },
+				detail: variable.type,
+				documentation: variable.value,
+			});
+		}
 	}
 }
 
-registerWorkbenchContribution2(NotebookChatVariables.ID, NotebookChatVariables, WorkbenchPhase.BlockRestore);
+export class SelectAndInsertKernelVariableAction extends Action2 {
+	constructor() {
+		super({
+			id: SelectAndInsertKernelVariableAction.ID,
+			title: '' // not displayed
+		});
+	}
+
+	static readonly ID = 'notebook.chat.selectAndInsertKernelVariable';
+
+	override async run(accessor: ServicesAccessor, ...args: any[]): Promise<void> {
+		const editorService = accessor.get(IEditorService);
+		const notebookKernelService = accessor.get(INotebookKernelService);
+		const quickInputService = accessor.get(IQuickInputService);
+
+		const notebook = getNotebookEditorFromEditorPane(editorService.activeEditorPane)?.getViewModel()?.notebookDocument;
+
+		if (!notebook) {
+			return;
+		}
+
+		const context = args[0];
+		if (!context || !('widget' in context) || !('range' in context)) {
+			return;
+		}
+
+		const widget = <IChatWidget>context.widget;
+		const range = <Range | undefined>context.range;
+		const variable = <string | undefined>context.variable;
+
+		if (variable !== undefined) {
+			this.addVariableReference(widget, variable, range, false);
+			return;
+		}
+
+		const selectedKernel = notebookKernelService.getMatchingKernel(notebook).selected;
+		const hasVariableProvider = selectedKernel?.hasVariableProvider;
+
+		if (!hasVariableProvider) {
+			return;
+		}
+
+		const variables = await selectedKernel.provideVariables(notebook.uri, undefined, 'named', 0, CancellationToken.None);
+
+		const quickPickItems: IQuickPickItem[] = [];
+		for await (const variable of variables) {
+			quickPickItems.push({
+				label: variable.name,
+				description: variable.value,
+				detail: variable.type,
+			});
+		}
+
+		const pickedVariable = await quickInputService.pick(quickPickItems, { placeHolder: 'Select a kernel variable' });
+		if (!pickedVariable) {
+			return;
+		}
+
+		this.addVariableReference(widget, pickedVariable.label, range, true);
+	}
+
+	private addVariableReference(widget: IChatWidget, variableName: string, range?: Range, updateText?: boolean) {
+		if (range) {
+			const text = `#kernelVariable:${variableName}`;
+
+			if (updateText) {
+				const editor = widget.inputEditor;
+				const success = editor.executeEdits('chatInsertFile', [{ range, text: text + ' ' }]);
+				if (!success) {
+					return;
+				}
+			}
+
+			widget.getContrib<ChatDynamicVariableModel>(ChatDynamicVariableModel.ID)?.addReference({
+				id: 'vscode.notebook.variable',
+				range: { startLineNumber: range.startLineNumber, startColumn: range.startColumn, endLineNumber: range.endLineNumber, endColumn: range.startColumn + text.length },
+				data: variableName,
+				fullName: variableName,
+				icon: codiconsLibrary.variable,
+			});
+		} else {
+			widget.getContrib<ChatContextAttachments>(ChatContextAttachments.ID)?.setContext(false, ...[{
+				id: 'vscode.notebook.variable',
+				name: variableName,
+				value: variableName,
+				icon: codiconsLibrary.variable,
+				isDynamic: true
+			}]);
+		}
+	}
+}
+
+registerAction2(SelectAndInsertKernelVariableAction);
+registerWorkbenchContribution2(NotebookChatContribution.ID, NotebookChatContribution, WorkbenchPhase.BlockRestore);
diff --git a/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext.ts b/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext.ts
index 4c8a6aa024d..c09bdb176b5 100644
--- a/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext.ts
+++ b/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { localize } from '../../../../../../nls.js';
+import { MenuId } from '../../../../../../platform/actions/common/actions.js';
+import { RawContextKey } from '../../../../../../platform/contextkey/common/contextkey.js';
 
 export const CTX_NOTEBOOK_CELL_CHAT_FOCUSED = new RawContextKey<boolean>('notebookCellChatFocused', false, localize('notebookCellChatFocused', "Whether the cell chat editor is focused"));
 export const CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST = new RawContextKey<boolean>('notebookChatHasActiveRequest', false, localize('notebookChatHasActiveRequest', "Whether the cell chat editor has an active request"));
@@ -17,3 +17,5 @@ export const MENU_CELL_CHAT_WIDGET = MenuId.for('cellChatWidget');
 export const MENU_CELL_CHAT_WIDGET_STATUS = MenuId.for('cellChatWidget.status');
 export const MENU_CELL_CHAT_WIDGET_FEEDBACK = MenuId.for('cellChatWidget.feedback');
 export const MENU_CELL_CHAT_WIDGET_TOOLBAR = MenuId.for('cellChatWidget.toolbar');
+
+export const CTX_NOTEBOOK_CHAT_HAS_AGENT = new RawContextKey<boolean>('notebookChatAgentRegistered', false, localize('notebookChatAgentRegistered', "Whether a chat agent for notebook is registered"));
diff --git a/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController.ts b/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController.ts
index 4662ab11501..bac32e50bd8 100644
--- a/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController.ts
+++ b/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController.ts
@@ -3,47 +3,45 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Dimension, IFocusTracker, WindowIntervalTimer, getWindow, scheduleAtNextAnimationFrame, trackFocus } from 'vs/base/browser/dom';
-import { CancelablePromise, DeferredPromise, Queue, createCancelablePromise, disposableTimeout } from 'vs/base/common/async';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable, DisposableStore, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { LRUCache } from 'vs/base/common/map';
-import { Schemas } from 'vs/base/common/network';
-import { MovingAverage } from 'vs/base/common/numbers';
-import { isEqual } from 'vs/base/common/resources';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { assertType } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { IActiveCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { Position } from 'vs/editor/common/core/position';
-import { Selection } from 'vs/editor/common/core/selection';
-import { TextEdit } from 'vs/editor/common/languages';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ICursorStateComputer, ITextModel } from 'vs/editor/common/model';
-import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { IModelService } from 'vs/editor/common/services/model';
-import { localize } from 'vs/nls';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ChatAgentLocation } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { ChatModel, IChatModel } from 'vs/workbench/contrib/chat/common/chatModel';
-import { IChatService } from 'vs/workbench/contrib/chat/common/chatService';
-import { countWords } from 'vs/workbench/contrib/chat/common/chatWordCounter';
-import { ProgressingEditsOptions } from 'vs/workbench/contrib/inlineChat/browser/inlineChatStrategies';
-import { InlineChatWidget } from 'vs/workbench/contrib/inlineChat/browser/inlineChatWidget';
-import { asProgressiveEdit, performAsyncTextEdit } from 'vs/workbench/contrib/inlineChat/browser/utils';
-import { MENU_INLINE_CHAT_WIDGET } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
-import { insertCell, runDeleteAction } from 'vs/workbench/contrib/notebook/browser/controller/cellOperations';
-import { CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST, CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION, CTX_NOTEBOOK_CHAT_USER_DID_EDIT, MENU_CELL_CHAT_WIDGET_STATUS } from 'vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext';
-import { ICellViewModel, INotebookEditor, INotebookEditorContribution, INotebookViewZone } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { registerNotebookContribution } from 'vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
-import { CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotebookExecutionStateService, NotebookExecutionType } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
+import { Dimension, IFocusTracker, WindowIntervalTimer, getWindow, scheduleAtNextAnimationFrame, trackFocus } from '../../../../../../base/browser/dom.js';
+import { CancelablePromise, DeferredPromise, Queue, createCancelablePromise, disposableTimeout } from '../../../../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../../../base/common/cancellation.js';
+import { Emitter } from '../../../../../../base/common/event.js';
+import { Disposable, DisposableStore, MutableDisposable, toDisposable } from '../../../../../../base/common/lifecycle.js';
+import { LRUCache } from '../../../../../../base/common/map.js';
+import { Schemas } from '../../../../../../base/common/network.js';
+import { MovingAverage } from '../../../../../../base/common/numbers.js';
+import { isEqual } from '../../../../../../base/common/resources.js';
+import { StopWatch } from '../../../../../../base/common/stopwatch.js';
+import { assertType } from '../../../../../../base/common/types.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { IActiveCodeEditor } from '../../../../../../editor/browser/editorBrowser.js';
+import { CodeEditorWidget } from '../../../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { ISingleEditOperation } from '../../../../../../editor/common/core/editOperation.js';
+import { Position } from '../../../../../../editor/common/core/position.js';
+import { Selection } from '../../../../../../editor/common/core/selection.js';
+import { TextEdit } from '../../../../../../editor/common/languages.js';
+import { ILanguageService } from '../../../../../../editor/common/languages/language.js';
+import { ICursorStateComputer, ITextModel } from '../../../../../../editor/common/model.js';
+import { IEditorWorkerService } from '../../../../../../editor/common/services/editorWorker.js';
+import { IModelService } from '../../../../../../editor/common/services/model.js';
+import { localize } from '../../../../../../nls.js';
+import { IContextKey, IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../../platform/storage/common/storage.js';
+import { ChatAgentLocation } from '../../../../chat/common/chatAgents.js';
+import { ChatModel, IChatModel } from '../../../../chat/common/chatModel.js';
+import { IChatService } from '../../../../chat/common/chatService.js';
+import { countWords } from '../../../../chat/common/chatWordCounter.js';
+import { ProgressingEditsOptions } from '../../../../inlineChat/browser/inlineChatStrategies.js';
+import { InlineChatWidget } from '../../../../inlineChat/browser/inlineChatWidget.js';
+import { asProgressiveEdit, performAsyncTextEdit } from '../../../../inlineChat/browser/utils.js';
+import { insertCell, runDeleteAction } from '../cellOperations.js';
+import { CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST, CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION, CTX_NOTEBOOK_CHAT_USER_DID_EDIT, MENU_CELL_CHAT_WIDGET_STATUS } from './notebookChatContext.js';
+import { ICellViewModel, INotebookEditor, INotebookEditorContribution, INotebookViewZone } from '../../notebookBrowser.js';
+import { registerNotebookContribution } from '../../notebookEditorExtensions.js';
+import { CellKind } from '../../../common/notebookCommon.js';
+import { INotebookExecutionStateService, NotebookExecutionType } from '../../../common/notebookExecutionStateService.js';
 
 class NotebookChatWidget extends Disposable implements INotebookViewZone {
 	set afterModelPosition(afterModelPosition: number) {
@@ -413,16 +411,30 @@ export class NotebookChatController extends Disposable implements INotebookEdito
 
 		const inlineChatWidget = this._widgetDisposableStore.add(this._instantiationService.createInstance(
 			InlineChatWidget,
-			ChatAgentLocation.Notebook,
 			{
-				telemetrySource: 'notebook-generate-cell',
-				inputMenuId: MenuId.ChatExecute,
-				widgetMenuId: MENU_INLINE_CHAT_WIDGET,
+				location: ChatAgentLocation.Notebook,
+				resolveData: () => {
+					const sessionInputUri = this.getSessionInputUri();
+					if (!sessionInputUri) {
+						return undefined;
+					}
+					return {
+						type: ChatAgentLocation.Notebook,
+						sessionInputUri
+					};
+				}
+			},
+			{
 				statusMenuId: MENU_CELL_CHAT_WIDGET_STATUS,
-				rendererOptions: {
-					renderTextEditsAsSummary: (uri) => {
-						return isEqual(uri, this._widget?.parentEditor.getModel()?.uri)
-							|| isEqual(uri, this._notebookEditor.textModel?.uri);
+				chatWidgetViewOptions: {
+					rendererOptions: {
+						renderTextEditsAsSummary: (uri) => {
+							return isEqual(uri, this._widget?.parentEditor.getModel()?.uri)
+								|| isEqual(uri, this._notebookEditor.textModel?.uri);
+						}
+					},
+					menus: {
+						telemetrySource: 'notebook-generate-cell'
 					}
 				}
 			}
@@ -469,6 +481,10 @@ export class NotebookChatController extends Disposable implements INotebookEdito
 
 			this._sessionCtor = createCancelablePromise<void>(async token => {
 				await this._startSession(token);
+				assertType(this._model.value);
+				const model = this._model.value;
+				this._widget?.inlineChatWidget.setChatModel(model);
+
 				if (fakeParentEditor.hasModel()) {
 
 					if (this._widget) {
@@ -546,9 +562,6 @@ export class NotebookChatController extends Disposable implements INotebookEdito
 		assertType(this._model.value);
 		assertType(this._strategy);
 
-		const model = this._model.value;
-		this._widget.inlineChatWidget.setChatModel(model);
-
 		const lastInput = this._widget.inlineChatWidget.value;
 		this._historyUpdate(lastInput);
 
@@ -664,7 +677,6 @@ export class NotebookChatController extends Disposable implements INotebookEdito
 			store.dispose();
 
 			this._ctxHasActiveRequest.set(false);
-			this._widget.inlineChatWidget.updateProgress(false);
 			this._widget.inlineChatWidget.updateInfo('');
 			this._widget.inlineChatWidget.updateToolbar(true);
 		}
diff --git a/src/vs/workbench/contrib/notebook/browser/controller/coreActions.ts b/src/vs/workbench/contrib/notebook/browser/controller/coreActions.ts
index 3cc7faf8354..88c60d0414d 100644
--- a/src/vs/workbench/contrib/notebook/browser/controller/coreActions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/controller/coreActions.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { localize, localize2 } from 'vs/nls';
-import { Action2, IAction2Options, MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { getNotebookEditorFromEditorPane, IActiveNotebookEditor, ICellViewModel, cellRangeToViewCells, ICellOutputViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { INTERACTIVE_WINDOW_IS_ACTIVE_EDITOR, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_KERNEL_COUNT, NOTEBOOK_KERNEL_SOURCE_COUNT } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { ICellRange, isICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IEditorCommandsContext } from 'vs/workbench/common/editor';
-import { INotebookEditorService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorService';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from 'vs/base/common/actions';
-import { TypeConstraint } from 'vs/base/common/types';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import { MarshalledId } from 'vs/base/common/marshallingIds';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { isEqual } from 'vs/base/common/resources';
+import { URI, UriComponents } from '../../../../../base/common/uri.js';
+import { localize, localize2 } from '../../../../../nls.js';
+import { Action2, IAction2Options, MenuId, MenuRegistry } from '../../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { getNotebookEditorFromEditorPane, IActiveNotebookEditor, ICellViewModel, cellRangeToViewCells, ICellOutputViewModel } from '../notebookBrowser.js';
+import { IS_COMPOSITE_NOTEBOOK, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_KERNEL_COUNT, NOTEBOOK_KERNEL_SOURCE_COUNT } from '../../common/notebookContextKeys.js';
+import { ICellRange, isICellRange } from '../../common/notebookRange.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { isEditorCommandsContext } from '../../../../common/editor.js';
+import { INotebookEditorService } from '../services/notebookEditorService.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from '../../../../../base/common/actions.js';
+import { TypeConstraint } from '../../../../../base/common/types.js';
+import { IJSONSchema } from '../../../../../base/common/jsonSchema.js';
+import { MarshalledId } from '../../../../../base/common/marshallingIds.js';
+import { ICodeEditor } from '../../../../../editor/browser/editorBrowser.js';
+import { isEqual } from '../../../../../base/common/resources.js';
 
 // Kernel Command
 export const SELECT_KERNEL_ID = '_notebook.selectKernel';
@@ -135,7 +135,7 @@ export abstract class NotebookAction extends Action2 {
 			desc.f1 = false;
 			const f1Menu = {
 				id: MenuId.CommandPalette,
-				when: ContextKeyExpr.or(NOTEBOOK_IS_ACTIVE_EDITOR, INTERACTIVE_WINDOW_IS_ACTIVE_EDITOR)
+				when: ContextKeyExpr.or(NOTEBOOK_IS_ACTIVE_EDITOR, IS_COMPOSITE_NOTEBOOK)
 			};
 
 			if (!desc.menu) {
@@ -156,8 +156,8 @@ export abstract class NotebookAction extends Action2 {
 	}
 
 	async run(accessor: ServicesAccessor, context?: any, ...additionalArgs: any[]): Promise<void> {
-		const isFromUI = !!context;
-		const from = isFromUI ? (this.isNotebookActionContext(context) ? 'notebookToolbar' : 'editorToolbar') : undefined;
+		sendEntryTelemetry(accessor, this.desc.id, context);
+
 		if (!this.isNotebookActionContext(context)) {
 			context = this.getEditorContextFromArgsOrActive(accessor, context, ...additionalArgs);
 			if (!context) {
@@ -165,11 +165,6 @@ export abstract class NotebookAction extends Action2 {
 			}
 		}
 
-		if (from !== undefined) {
-			const telemetryService = accessor.get(ITelemetryService);
-			telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: this.desc.id, from: from });
-		}
-
 		return this.runWithContext(accessor, context);
 	}
 
@@ -217,13 +212,6 @@ export abstract class NotebookMultiCellAction extends Action2 {
 
 	abstract runWithContext(accessor: ServicesAccessor, context: INotebookCommandContext | INotebookCellToolbarActionContext): Promise<void>;
 
-	private isCellToolbarContext(context?: unknown): context is INotebookCellToolbarActionContext {
-		return !!context && !!(context as INotebookActionContext).notebookEditor && (context as any).$mid === MarshalledId.NotebookCellActionContext;
-	}
-	private isEditorContext(context?: unknown): boolean {
-		return !!context && (context as IEditorCommandsContext).groupId !== undefined;
-	}
-
 	/**
 	 * The action/command args are resolved in following order
 	 * `run(accessor, cellToolbarContext)` from cell toolbar
@@ -232,33 +220,30 @@ export abstract class NotebookMultiCellAction extends Action2 {
 	 */
 	async run(accessor: ServicesAccessor, ...additionalArgs: any[]): Promise<void> {
 		const context = additionalArgs[0];
-		const isFromCellToolbar = this.isCellToolbarContext(context);
-		const isFromEditorToolbar = this.isEditorContext(context);
-		const from = isFromCellToolbar ? 'cellToolbar' : (isFromEditorToolbar ? 'editorToolbar' : 'other');
-		const telemetryService = accessor.get(ITelemetryService);
 
+		sendEntryTelemetry(accessor, this.desc.id, context);
+
+		const isFromCellToolbar = isCellToolbarContext(context);
 		if (isFromCellToolbar) {
-			telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: this.desc.id, from: from });
 			return this.runWithContext(accessor, context);
 		}
 
 		// handle parsed args
-
 		const parsedArgs = this.parseArgs(accessor, ...additionalArgs);
 		if (parsedArgs) {
-			telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: this.desc.id, from: from });
 			return this.runWithContext(accessor, parsedArgs);
 		}
 
 		// no parsed args, try handle active editor
 		const editor = getEditorFromArgsOrActivePane(accessor);
 		if (editor) {
-			telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: this.desc.id, from: from });
+			const selectedCellRange: ICellRange[] = editor.getSelections().length === 0 ? [editor.getFocus()] : editor.getSelections();
+
 
 			return this.runWithContext(accessor, {
 				ui: false,
 				notebookEditor: editor,
-				selectedCells: cellRangeToViewCells(editor, editor.getSelections())
+				selectedCells: cellRangeToViewCells(editor, selectedCellRange)
 			});
 		}
 	}
@@ -274,10 +259,9 @@ export abstract class NotebookCellAction<T = INotebookCellActionContext> extends
 	}
 
 	override async run(accessor: ServicesAccessor, context?: INotebookCellActionContext, ...additionalArgs: any[]): Promise<void> {
-		if (this.isCellActionContext(context)) {
-			const telemetryService = accessor.get(ITelemetryService);
-			telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: this.desc.id, from: 'cellToolbar' });
+		sendEntryTelemetry(accessor, this.desc.id, context);
 
+		if (this.isCellActionContext(context)) {
 			return this.runWithContext(accessor, context);
 		}
 
@@ -304,6 +288,26 @@ interface IMultiCellArgs {
 	autoReveal?: boolean;
 }
 
+function sendEntryTelemetry(accessor: ServicesAccessor, id: string, context?: any) {
+	if (context) {
+		const telemetryService = accessor.get(ITelemetryService);
+		if (context.source) {
+			telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: id, from: context.source });
+		} else if (URI.isUri(context)) {
+			telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: id, from: 'cellEditorContextMenu' });
+		} else if (context && 'from' in context && context.from === 'cellContainer') {
+			telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: id, from: 'cellContainer' });
+		} else {
+			const from = isCellToolbarContext(context) ? 'cellToolbar' : (isEditorCommandsContext(context) ? 'editorToolbar' : 'other');
+			telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: id, from: from });
+		}
+	}
+}
+
+function isCellToolbarContext(context?: unknown): context is INotebookCellToolbarActionContext {
+	return !!context && !!(context as INotebookActionContext).notebookEditor && (context as any).$mid === MarshalledId.NotebookCellActionContext;
+}
+
 function isMultiCellArgs(arg: unknown): arg is IMultiCellArgs {
 	if (arg === undefined) {
 		return false;
diff --git a/src/vs/workbench/contrib/notebook/browser/controller/editActions.ts b/src/vs/workbench/contrib/notebook/browser/controller/editActions.ts
index c73973e433e..b7b76f068bc 100644
--- a/src/vs/workbench/contrib/notebook/browser/controller/editActions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/controller/editActions.ts
@@ -3,44 +3,50 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Mimes } from 'vs/base/common/mime';
-import { URI } from 'vs/base/common/uri';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { getIconClasses } from 'vs/editor/common/services/getIconClasses';
-import { IModelService } from 'vs/editor/common/services/model';
-import { localize, localize2 } from 'vs/nls';
-import { MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { InputFocusedContext, InputFocusedContextKey } from 'vs/platform/contextkey/common/contextkeys';
-import { IConfirmationResult, IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IQuickInputService, IQuickPickItem, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
-import { InlineChatController } from 'vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { CTX_INLINE_CHAT_FOCUSED } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
-import { changeCellToKind, runDeleteAction } from 'vs/workbench/contrib/notebook/browser/controller/cellOperations';
-import { CELL_TITLE_CELL_GROUP_ID, CELL_TITLE_OUTPUT_GROUP_ID, CellToolbarOrder, INotebookActionContext, INotebookCellActionContext, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, NotebookAction, NotebookCellAction, executeNotebookCondition, findTargetCellEditor } from 'vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { NotebookChangeTabDisplaySize, NotebookIndentUsingSpaces, NotebookIndentUsingTabs, NotebookIndentationToSpacesAction, NotebookIndentationToTabsAction } from 'vs/workbench/contrib/notebook/browser/controller/notebookIndentationActions';
-import { CHANGE_CELL_LANGUAGE, CellEditState, DETECT_CELL_LANGUAGE, QUIT_EDIT_CELL_COMMAND_ID, getNotebookEditorFromEditorPane } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CellEditType, CellKind, ICellEditOperation, NotebookCellExecutionState, NotebookSetting } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { NOTEBOOK_CELL_EDITABLE, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CELL_TYPE, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_HAS_OUTPUTS, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_OUTPUT_INPUT_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_USE_CONSOLIDATED_OUTPUT_BUTTON } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
-import { INotebookKernelService } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
-import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ILanguageDetectionService } from 'vs/workbench/services/languageDetection/common/languageDetectionWorkerService';
-import * as icons from 'vs/workbench/contrib/notebook/browser/notebookIcons';
+import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
+import { Mimes } from '../../../../../base/common/mime.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ICodeEditor } from '../../../../../editor/browser/editorBrowser.js';
+import { Selection } from '../../../../../editor/common/core/selection.js';
+import { CommandExecutor } from '../../../../../editor/common/cursor/cursor.js';
+import { EditorContextKeys } from '../../../../../editor/common/editorContextKeys.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
+import { ILanguageConfigurationService } from '../../../../../editor/common/languages/languageConfigurationRegistry.js';
+import { TrackedRangeStickiness } from '../../../../../editor/common/model.js';
+import { getIconClasses } from '../../../../../editor/common/services/getIconClasses.js';
+import { IModelService } from '../../../../../editor/common/services/model.js';
+import { LineCommentCommand, Type } from '../../../../../editor/contrib/comment/browser/lineCommentCommand.js';
+import { localize, localize2 } from '../../../../../nls.js';
+import { MenuId, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { InputFocusedContext, InputFocusedContextKey } from '../../../../../platform/contextkey/common/contextkeys.js';
+import { IConfirmationResult, IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { INotificationService } from '../../../../../platform/notification/common/notification.js';
+import { IQuickInputService, IQuickPickItem, QuickPickInput } from '../../../../../platform/quickinput/common/quickInput.js';
+import { InlineChatController } from '../../../inlineChat/browser/inlineChatController.js';
+import { CTX_INLINE_CHAT_FOCUSED } from '../../../inlineChat/common/inlineChat.js';
+import { changeCellToKind, runDeleteAction } from './cellOperations.js';
+import { CELL_TITLE_CELL_GROUP_ID, CELL_TITLE_OUTPUT_GROUP_ID, CellToolbarOrder, INotebookActionContext, INotebookCellActionContext, INotebookCommandContext, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, NotebookAction, NotebookCellAction, NotebookMultiCellAction, executeNotebookCondition, findTargetCellEditor } from './coreActions.js';
+import { NotebookChangeTabDisplaySize, NotebookIndentUsingSpaces, NotebookIndentUsingTabs, NotebookIndentationToSpacesAction, NotebookIndentationToTabsAction } from './notebookIndentationActions.js';
+import { CHANGE_CELL_LANGUAGE, CellEditState, DETECT_CELL_LANGUAGE, QUIT_EDIT_CELL_COMMAND_ID, getNotebookEditorFromEditorPane } from '../notebookBrowser.js';
+import * as icons from '../notebookIcons.js';
+import { CellEditType, CellKind, ICellEditOperation, NotebookCellExecutionState, NotebookSetting } from '../../common/notebookCommon.js';
+import { NOTEBOOK_CELL_EDITABLE, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_IS_FIRST_OUTPUT, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CELL_TYPE, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_HAS_OUTPUTS, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_OUTPUT_INPUT_FOCUSED, NOTEBOOK_USE_CONSOLIDATED_OUTPUT_BUTTON } from '../../common/notebookContextKeys.js';
+import { INotebookExecutionStateService } from '../../common/notebookExecutionStateService.js';
+import { INotebookKernelService } from '../../common/notebookKernelService.js';
+import { ICellRange } from '../../common/notebookRange.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { ILanguageDetectionService } from '../../../../services/languageDetection/common/languageDetectionWorkerService.js';
 
 const CLEAR_ALL_CELLS_OUTPUTS_COMMAND_ID = 'notebook.clearAllCellsOutputs';
 const EDIT_CELL_COMMAND_ID = 'notebook.cell.edit';
 const DELETE_CELL_COMMAND_ID = 'notebook.cell.delete';
 export const CLEAR_CELL_OUTPUTS_COMMAND_ID = 'notebook.cell.clearOutputs';
 export const SELECT_NOTEBOOK_INDENTATION_ID = 'notebook.selectIndentation';
+export const COMMENT_SELECTED_CELLS_ID = 'notebook.commentSelectedCells';
 
 registerAction2(class EditCellAction extends NotebookCellAction {
 	constructor() {
@@ -227,7 +233,7 @@ registerAction2(class ClearCellOutputsAction extends NotebookCellAction {
 				},
 				{
 					id: MenuId.NotebookOutputToolbar,
-					when: ContextKeyExpr.and(NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE)
+					when: ContextKeyExpr.and(NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_CELL_IS_FIRST_OUTPUT, NOTEBOOK_USE_CONSOLIDATED_OUTPUT_BUTTON)
 				},
 			],
 			keybinding: {
@@ -271,7 +277,6 @@ registerAction2(class ClearCellOutputsAction extends NotebookCellAction {
 	}
 });
 
-
 registerAction2(class ClearAllCellOutputsAction extends NotebookAction {
 	constructor() {
 		super({
@@ -337,7 +342,6 @@ registerAction2(class ClearAllCellOutputsAction extends NotebookAction {
 	}
 });
 
-
 interface ILanguagePickInput extends IQuickPickItem {
 	languageId: string;
 	description: string;
@@ -621,3 +625,56 @@ registerAction2(class SelectNotebookIndentation extends NotebookAction {
 		return;
 	}
 });
+
+registerAction2(class CommentSelectedCellsAction extends NotebookMultiCellAction {
+	constructor() {
+		super({
+			id: COMMENT_SELECTED_CELLS_ID,
+			title: localize('commentSelectedCells', "Comment Selected Cells"),
+			keybinding: {
+				when: ContextKeyExpr.and(
+					NOTEBOOK_EDITOR_FOCUSED,
+					NOTEBOOK_EDITOR_EDITABLE,
+					ContextKeyExpr.not(InputFocusedContextKey),
+				),
+				primary: KeyMod.CtrlCmd | KeyCode.Slash,
+				weight: KeybindingWeight.WorkbenchContrib
+			}
+		});
+	}
+
+	async runWithContext(accessor: ServicesAccessor, context: INotebookCommandContext): Promise<void> {
+		const languageConfigurationService = accessor.get(ILanguageConfigurationService);
+
+		context.selectedCells.forEach(async cellViewModel => {
+			const textModel = await cellViewModel.resolveTextModel();
+
+			const commentsOptions = cellViewModel.commentOptions;
+			const cellCommentCommand = new LineCommentCommand(
+				languageConfigurationService,
+				new Selection(1, 1, textModel.getLineCount(), textModel.getLineMaxColumn(textModel.getLineCount())), // comment the entire cell
+				textModel.getOptions().tabSize,
+				Type.Toggle,
+				commentsOptions.insertSpace ?? true,
+				commentsOptions.ignoreEmptyLines ?? true,
+				false
+			);
+
+			// store any selections that are in the cell, allows them to be shifted by comments and preserved
+			const cellEditorSelections = cellViewModel.getSelections();
+			const initialTrackedRangesIDs: string[] = cellEditorSelections.map(selection => {
+				return textModel._setTrackedRange(null, selection, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges);
+			});
+
+			CommandExecutor.executeCommands(textModel, cellEditorSelections, [cellCommentCommand]);
+
+			const newTrackedSelections = initialTrackedRangesIDs.map(i => {
+				return textModel._getTrackedRange(i);
+			}).filter(r => !!r).map((range,) => {
+				return new Selection(range.startLineNumber, range.startColumn, range.endLineNumber, range.endColumn);
+			});
+			cellViewModel.setSelections(newTrackedSelections ?? []);
+		}); // end of cells forEach
+	}
+
+});
diff --git a/src/vs/workbench/contrib/notebook/browser/controller/executeActions.ts b/src/vs/workbench/contrib/notebook/browser/controller/executeActions.ts
index 2caea9d0c0d..f4e7c8a3f37 100644
--- a/src/vs/workbench/contrib/notebook/browser/controller/executeActions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/controller/executeActions.ts
@@ -3,33 +3,33 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Iterable } from 'vs/base/common/iterator';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { isEqual } from 'vs/base/common/resources';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { localize, localize2 } from 'vs/nls';
-import { MenuId, MenuRegistry, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { EditorsOrder } from 'vs/workbench/common/editor';
-import { IDebugService } from 'vs/workbench/contrib/debug/common/debug';
-import { CTX_INLINE_CHAT_FOCUSED } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
-import { insertCell } from 'vs/workbench/contrib/notebook/browser/controller/cellOperations';
-import { CTX_NOTEBOOK_CELL_CHAT_FOCUSED } from 'vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext';
-import { NotebookChatController } from 'vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController';
-import { CELL_TITLE_CELL_GROUP_ID, CellToolbarOrder, INotebookActionContext, INotebookCellActionContext, INotebookCellToolbarActionContext, INotebookCommandContext, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, NotebookAction, NotebookCellAction, NotebookMultiCellAction, cellExecutionArgs, executeNotebookCondition, getContextFromActiveEditor, getContextFromUri, parseMultiCellExecutionArgs } from 'vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { CellEditState, CellFocusMode, EXECUTE_CELL_COMMAND_ID, IFocusNotebookCellOptions, ScrollToRevealBehavior } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import * as icons from 'vs/workbench/contrib/notebook/browser/notebookIcons';
-import { CellKind, CellUri, NotebookSetting } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { NOTEBOOK_CELL_EXECUTING, NOTEBOOK_CELL_EXECUTION_STATE, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_TYPE, NOTEBOOK_HAS_RUNNING_CELL, NOTEBOOK_HAS_SOMETHING_RUNNING, NOTEBOOK_INTERRUPTIBLE_KERNEL, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_KERNEL_COUNT, NOTEBOOK_KERNEL_SOURCE_COUNT, NOTEBOOK_LAST_CELL_FAILED, NOTEBOOK_MISSING_KERNEL_EXTENSION } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { NotebookEditorInput } from 'vs/workbench/contrib/notebook/common/notebookEditorInput';
-import { INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { Iterable } from '../../../../../base/common/iterator.js';
+import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
+import { isEqual } from '../../../../../base/common/resources.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { URI, UriComponents } from '../../../../../base/common/uri.js';
+import { ICodeEditor } from '../../../../../editor/browser/editorBrowser.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
+import { localize, localize2 } from '../../../../../nls.js';
+import { MenuId, MenuRegistry, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { EditorsOrder } from '../../../../common/editor.js';
+import { IDebugService } from '../../../debug/common/debug.js';
+import { CTX_INLINE_CHAT_FOCUSED } from '../../../inlineChat/common/inlineChat.js';
+import { insertCell } from './cellOperations.js';
+import { CTX_NOTEBOOK_CELL_CHAT_FOCUSED } from './chat/notebookChatContext.js';
+import { NotebookChatController } from './chat/notebookChatController.js';
+import { CELL_TITLE_CELL_GROUP_ID, CellToolbarOrder, INotebookActionContext, INotebookCellActionContext, INotebookCellToolbarActionContext, INotebookCommandContext, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, NotebookAction, NotebookCellAction, NotebookMultiCellAction, cellExecutionArgs, executeNotebookCondition, getContextFromActiveEditor, getContextFromUri, parseMultiCellExecutionArgs } from './coreActions.js';
+import { CellEditState, CellFocusMode, EXECUTE_CELL_COMMAND_ID, IFocusNotebookCellOptions, ScrollToRevealBehavior } from '../notebookBrowser.js';
+import * as icons from '../notebookIcons.js';
+import { CellKind, CellUri, NotebookSetting } from '../../common/notebookCommon.js';
+import { NOTEBOOK_CELL_EXECUTING, NOTEBOOK_CELL_EXECUTION_STATE, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_TYPE, NOTEBOOK_HAS_RUNNING_CELL, NOTEBOOK_HAS_SOMETHING_RUNNING, NOTEBOOK_INTERRUPTIBLE_KERNEL, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_KERNEL_COUNT, NOTEBOOK_KERNEL_SOURCE_COUNT, NOTEBOOK_LAST_CELL_FAILED, NOTEBOOK_MISSING_KERNEL_EXTENSION } from '../../common/notebookContextKeys.js';
+import { NotebookEditorInput } from '../../common/notebookEditorInput.js';
+import { INotebookExecutionStateService } from '../../common/notebookExecutionStateService.js';
+import { IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
 
 const EXECUTE_NOTEBOOK_COMMAND_ID = 'notebook.execute';
 const CANCEL_NOTEBOOK_COMMAND_ID = 'notebook.cancelExecution';
diff --git a/src/vs/workbench/contrib/notebook/browser/controller/foldingController.ts b/src/vs/workbench/contrib/notebook/browser/controller/foldingController.ts
index 29e49248846..66880af4240 100644
--- a/src/vs/workbench/contrib/notebook/browser/controller/foldingController.ts
+++ b/src/vs/workbench/contrib/notebook/browser/controller/foldingController.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_IS_ACTIVE_EDITOR } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { INotebookEditor, INotebookEditorMouseEvent, INotebookEditorContribution, getNotebookEditorFromEditorPane, CellFoldingState } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { FoldingModel } from 'vs/workbench/contrib/notebook/browser/viewModel/foldingModel'; import { CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
-import { registerNotebookContribution } from 'vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
-import { registerAction2, Action2 } from 'vs/platform/actions/common/actions';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { InputFocusedContextKey } from 'vs/platform/contextkey/common/contextkeys';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { NOTEBOOK_ACTIONS_CATEGORY } from 'vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { localize, localize2 } from 'vs/nls';
-import { FoldingRegion } from 'vs/editor/contrib/folding/browser/foldingRanges';
-import { ICommandMetadata } from 'vs/platform/commands/common/commands';
-import { NotebookViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl';
+import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_IS_ACTIVE_EDITOR } from '../../common/notebookContextKeys.js';
+import { INotebookEditor, INotebookEditorMouseEvent, INotebookEditorContribution, getNotebookEditorFromEditorPane, CellFoldingState } from '../notebookBrowser.js';
+import { FoldingModel } from '../viewModel/foldingModel.js'; import { CellKind } from '../../common/notebookCommon.js';
+import { ICellRange } from '../../common/notebookRange.js';
+import { registerNotebookContribution } from '../notebookEditorExtensions.js';
+import { registerAction2, Action2 } from '../../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { InputFocusedContextKey } from '../../../../../platform/contextkey/common/contextkeys.js';
+import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { NOTEBOOK_ACTIONS_CATEGORY } from './coreActions.js';
+import { localize, localize2 } from '../../../../../nls.js';
+import { FoldingRegion } from '../../../../../editor/contrib/folding/browser/foldingRanges.js';
+import { ICommandMetadata } from '../../../../../platform/commands/common/commands.js';
+import { NotebookViewModel } from '../viewModel/notebookViewModelImpl.js';
 
 export class FoldingController extends Disposable implements INotebookEditorContribution {
 	static id: string = 'workbench.notebook.foldingController';
diff --git a/src/vs/workbench/contrib/notebook/browser/controller/insertCellActions.ts b/src/vs/workbench/contrib/notebook/browser/controller/insertCellActions.ts
index d998aed0f14..dc3fbcc179d 100644
--- a/src/vs/workbench/contrib/notebook/browser/controller/insertCellActions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/controller/insertCellActions.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from 'vs/base/common/codicons';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { localize } from 'vs/nls';
-import { IAction2Options, MenuId, MenuRegistry, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { InputFocusedContext } from 'vs/platform/contextkey/common/contextkeys';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { insertCell } from 'vs/workbench/contrib/notebook/browser/controller/cellOperations';
-import { INotebookActionContext, NotebookAction } from 'vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_EDITOR_EDITABLE } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { CellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl';
-import { CellKind, NotebookSetting } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION } from 'vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
+import { localize } from '../../../../../nls.js';
+import { IAction2Options, MenuId, MenuRegistry, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { InputFocusedContext } from '../../../../../platform/contextkey/common/contextkeys.js';
+import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { insertCell } from './cellOperations.js';
+import { INotebookActionContext, NotebookAction } from './coreActions.js';
+import { NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_EDITOR_EDITABLE } from '../../common/notebookContextKeys.js';
+import { CellViewModel } from '../viewModel/notebookViewModelImpl.js';
+import { CellKind, NotebookSetting } from '../../common/notebookCommon.js';
+import { CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION } from './chat/notebookChatContext.js';
 
 const INSERT_CODE_CELL_ABOVE_COMMAND_ID = 'notebook.cell.insertCodeCellAbove';
 const INSERT_CODE_CELL_BELOW_COMMAND_ID = 'notebook.cell.insertCodeCellBelow';
diff --git a/src/vs/workbench/contrib/notebook/browser/controller/layoutActions.ts b/src/vs/workbench/contrib/notebook/browser/controller/layoutActions.ts
index 19f30d4185f..df4c6f1fe55 100644
--- a/src/vs/workbench/contrib/notebook/browser/controller/layoutActions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/controller/layoutActions.ts
@@ -3,24 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from 'vs/base/common/codicons';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { localize, localize2 } from 'vs/nls';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { Action2, MenuId, MenuRegistry, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { NOTEBOOK_ACTIONS_CATEGORY } from 'vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { getNotebookEditorFromEditorPane } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { INotebookEditorService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorService';
-import { NotebookSetting } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_IS_ACTIVE_EDITOR } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { URI, UriComponents } from '../../../../../base/common/uri.js';
+import { localize, localize2 } from '../../../../../nls.js';
+import { Categories } from '../../../../../platform/action/common/actionCommonCategories.js';
+import { Action2, MenuId, MenuRegistry, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { ConfigurationTarget, IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IQuickInputService, IQuickPickItem } from '../../../../../platform/quickinput/common/quickInput.js';
+import { NOTEBOOK_ACTIONS_CATEGORY } from './coreActions.js';
+import { getNotebookEditorFromEditorPane } from '../notebookBrowser.js';
+import { INotebookEditorService } from '../services/notebookEditorService.js';
+import { NotebookSetting } from '../../common/notebookCommon.js';
+import { NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_IS_ACTIVE_EDITOR } from '../../common/notebookContextKeys.js';
+import { INotebookService } from '../../common/notebookService.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { IPreferencesService } from '../../../../services/preferences/common/preferences.js';
 
 registerAction2(class NotebookConfigureLayoutAction extends Action2 {
 	constructor() {
@@ -191,22 +192,23 @@ registerAction2(class SaveMimeTypeDisplayOrder extends Action2 {
 
 	run(accessor: ServicesAccessor) {
 		const service = accessor.get(INotebookService);
-		const qp = accessor.get(IQuickInputService).createQuickPick<IQuickPickItem & { target: ConfigurationTarget }>();
+		const disposables = new DisposableStore();
+		const qp = disposables.add(accessor.get(IQuickInputService).createQuickPick<IQuickPickItem & { target: ConfigurationTarget }>());
 		qp.placeholder = localize('notebook.placeholder', 'Settings file to save in');
 		qp.items = [
 			{ target: ConfigurationTarget.USER, label: localize('saveTarget.machine', 'User Settings') },
 			{ target: ConfigurationTarget.WORKSPACE, label: localize('saveTarget.workspace', 'Workspace Settings') },
 		];
 
-		qp.onDidAccept(() => {
+		disposables.add(qp.onDidAccept(() => {
 			const target = qp.selectedItems[0]?.target;
 			if (target !== undefined) {
 				service.saveMimeDisplayOrder(target);
 			}
 			qp.dispose();
-		});
+		}));
 
-		qp.onDidHide(() => qp.dispose());
+		disposables.add(qp.onDidHide(() => disposables.dispose()));
 
 		qp.show();
 	}
diff --git a/src/vs/workbench/contrib/notebook/browser/controller/notebookIndentationActions.ts b/src/vs/workbench/contrib/notebook/browser/controller/notebookIndentationActions.ts
index c647ab969d7..1172d9c0a39 100644
--- a/src/vs/workbench/contrib/notebook/browser/controller/notebookIndentationActions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/controller/notebookIndentationActions.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { IBulkEditService, ResourceTextEdit } from 'vs/editor/browser/services/bulkEditService';
-import { Range } from 'vs/editor/common/core/range';
-import { ITextModel } from 'vs/editor/common/model';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { INotebookEditorService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorService';
-import { NotebookSetting } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { isNotebookEditorInput } from 'vs/workbench/contrib/notebook/common/notebookEditorInput';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import * as nls from '../../../../../nls.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ServicesAccessor } from '../../../../../editor/browser/editorExtensions.js';
+import { IBulkEditService, ResourceTextEdit } from '../../../../../editor/browser/services/bulkEditService.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
+import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
+import { Action2, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { ILogService } from '../../../../../platform/log/common/log.js';
+import { IQuickInputService } from '../../../../../platform/quickinput/common/quickInput.js';
+import { INotebookEditorService } from '../services/notebookEditorService.js';
+import { NotebookSetting } from '../../common/notebookCommon.js';
+import { isNotebookEditorInput } from '../../common/notebookEditorInput.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
 
 export class NotebookIndentUsingTabs extends Action2 {
 	public static readonly ID = 'notebook.action.indentUsingTabs';
diff --git a/src/vs/workbench/contrib/notebook/browser/controller/sectionActions.ts b/src/vs/workbench/contrib/notebook/browser/controller/sectionActions.ts
index b4831209b27..f51e058a09f 100644
--- a/src/vs/workbench/contrib/notebook/browser/controller/sectionActions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/controller/sectionActions.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize, localize2 } from 'vs/nls';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { NotebookOutlineContext } from 'vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline';
-import { FoldingController } from 'vs/workbench/contrib/notebook/browser/controller/foldingController';
-import { CellFoldingState, INotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import * as icons from 'vs/workbench/contrib/notebook/browser/notebookIcons';
-import { OutlineEntry } from 'vs/workbench/contrib/notebook/browser/viewModel/OutlineEntry';
-import { CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { OutlineTarget } from 'vs/workbench/services/outline/browser/outline';
+import { localize, localize2 } from '../../../../../nls.js';
+import { Action2, MenuId, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { NotebookOutlineContext } from '../contrib/outline/notebookOutline.js';
+import { FoldingController } from './foldingController.js';
+import { CellFoldingState, INotebookEditor } from '../notebookBrowser.js';
+import * as icons from '../notebookIcons.js';
+import { OutlineEntry } from '../viewModel/OutlineEntry.js';
+import { CellKind } from '../../common/notebookCommon.js';
+import { OutlineTarget } from '../../../../services/outline/browser/outline.js';
 
 export type NotebookSectionArgs = {
 	notebookEditor: INotebookEditor | undefined;
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/diffCellEditorOptions.ts b/src/vs/workbench/contrib/notebook/browser/diff/diffCellEditorOptions.ts
index c2b1d9cf252..14c76fe0a75 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/diffCellEditorOptions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/diffCellEditorOptions.ts
@@ -3,14 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDiffEditorConstructionOptions } from 'vs/editor/browser/editorBrowser';
-import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
+import { IDiffEditorConstructionOptions } from '../../../../../editor/browser/editorBrowser.js';
+import { IEditorOptions } from '../../../../../editor/common/config/editorOptions.js';
 
-export const fixedEditorPadding = {
+/**
+ * Do not leave at 12, when at 12 and we have whitespace and only one line,
+ * then there's not enough space for the button `Show Whitespace Differences`
+ */
+const fixedEditorPaddingSingleLineCells = {
+	top: 24,
+	bottom: 24
+};
+const fixedEditorPadding = {
 	top: 12,
 	bottom: 12
 };
 
+export function getEditorPadding(lineCount: number) {
+	return lineCount === 1 ? fixedEditorPaddingSingleLineCells : fixedEditorPadding;
+}
+
 export const fixedEditorOptions: IEditorOptions = {
 	padding: fixedEditorPadding,
 	scrollBeyondLastLine: false,
@@ -29,8 +41,7 @@ export const fixedEditorOptions: IEditorOptions = {
 	selectOnLineNumbers: false,
 	wordWrap: 'off',
 	lineNumbers: 'off',
-	lineDecorationsWidth: 0,
-	glyphMargin: false,
+	glyphMargin: true,
 	fixedOverflowWidgets: true,
 	minimap: { enabled: false },
 	renderValidationDecorations: 'on',
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/diffComponents.ts b/src/vs/workbench/contrib/notebook/browser/diff/diffComponents.ts
index 59a4d27a8e2..c7cb5b3ba20 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/diffComponents.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/diffComponents.ts
@@ -3,46 +3,53 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { DiffElementViewModelBase, getFormattedMetadataJSON, getFormattedOutputJSON, OutputComparison, outputEqual, OUTPUT_EDITOR_HEIGHT_MAGIC, PropertyFoldingState, SideBySideDiffElementViewModel, SingleSideDiffElementViewModel } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
-import { CellDiffSideBySideRenderTemplate, CellDiffSingleSideRenderTemplate, DiffSide, DIFF_CELL_MARGIN, INotebookTextDiffEditor, NOTEBOOK_DIFF_CELL_INPUT, NOTEBOOK_DIFF_CELL_PROPERTY, NOTEBOOK_DIFF_CELL_PROPERTY_EXPANDED } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
-import { CodeEditorWidget, ICodeEditorWidgetOptions } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { CellEditType, CellUri, NotebookCellMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IMenu, IMenuService, MenuId, MenuItemAction } from 'vs/platform/actions/common/actions';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IAction } from 'vs/base/common/actions';
-import { createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { CodiconActionViewItem } from 'vs/workbench/contrib/notebook/browser/view/cellParts/cellActionView';
-import { collapsedIcon, expandedIcon } from 'vs/workbench/contrib/notebook/browser/notebookIcons';
-import { OutputContainer } from 'vs/workbench/contrib/notebook/browser/diff/diffElementOutputs';
-import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
-import { ContextMenuController } from 'vs/editor/contrib/contextmenu/browser/contextmenu';
-import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2';
-import { SuggestController } from 'vs/editor/contrib/suggest/browser/suggestController';
-import { MenuPreventer } from 'vs/workbench/contrib/codeEditor/browser/menuPreventer';
-import { SelectionClipboardContributionID } from 'vs/workbench/contrib/codeEditor/browser/selectionClipboard';
-import { TabCompletionController } from 'vs/workbench/contrib/snippets/browser/tabCompletion';
-import { renderIcon } from 'vs/base/browser/ui/iconLabel/iconLabels';
-import * as editorCommon from 'vs/editor/common/editorCommon';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { WorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { fixedDiffEditorOptions, fixedEditorOptions, fixedEditorPadding } from 'vs/workbench/contrib/notebook/browser/diff/diffCellEditorOptions';
-import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditor/diffEditorWidget';
-import { ICommandService } from 'vs/platform/commands/common/commands';
+import * as DOM from '../../../../../base/browser/dom.js';
+import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { DiffElementCellViewModelBase, getFormattedOutputJSON, OutputComparison, outputEqual, OUTPUT_EDITOR_HEIGHT_MAGIC, PropertyFoldingState, SideBySideDiffElementViewModel, SingleSideDiffElementViewModel, DiffElementPlaceholderViewModel, IDiffElementViewModelBase, NotebookDocumentMetadataViewModel } from './diffElementViewModel.js';
+import { CellDiffSideBySideRenderTemplate, CellDiffSingleSideRenderTemplate, DiffSide, DIFF_CELL_MARGIN, INotebookTextDiffEditor, NOTEBOOK_DIFF_CELL_INPUT, NOTEBOOK_DIFF_CELL_PROPERTY, NOTEBOOK_DIFF_CELL_PROPERTY_EXPANDED, CellDiffPlaceholderRenderTemplate, IDiffCellMarginOverlay, NOTEBOOK_DIFF_CELL_IGNORE_WHITESPACE, NotebookDocumentDiffElementRenderTemplate, NOTEBOOK_DIFF_METADATA } from './notebookDiffEditorBrowser.js';
+import { CodeEditorWidget, ICodeEditorWidgetOptions } from '../../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { IModelService } from '../../../../../editor/common/services/model.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
+import { CellEditType, CellUri, NotebookCellMetadata } from '../../common/notebookCommon.js';
+import { ToolBar } from '../../../../../base/browser/ui/toolbar/toolbar.js';
+import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
+import { IMenu, IMenuService, MenuId, MenuItemAction } from '../../../../../platform/actions/common/actions.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { INotificationService } from '../../../../../platform/notification/common/notification.js';
+import { IAction } from '../../../../../base/common/actions.js';
+import { createAndFillInActionBarActions } from '../../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IContextKey, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { CodiconActionViewItem } from '../view/cellParts/cellActionView.js';
+import { collapsedIcon, expandedIcon } from '../notebookIcons.js';
+import { OutputContainer } from './diffElementOutputs.js';
+import { EditorExtensionsRegistry } from '../../../../../editor/browser/editorExtensions.js';
+import { ContextMenuController } from '../../../../../editor/contrib/contextmenu/browser/contextmenu.js';
+import { SnippetController2 } from '../../../../../editor/contrib/snippet/browser/snippetController2.js';
+import { SuggestController } from '../../../../../editor/contrib/suggest/browser/suggestController.js';
+import { MenuPreventer } from '../../../codeEditor/browser/menuPreventer.js';
+import { SelectionClipboardContributionID } from '../../../codeEditor/browser/selectionClipboard.js';
+import { TabCompletionController } from '../../../snippets/browser/tabCompletion.js';
+import { renderIcon, renderLabelWithIcons } from '../../../../../base/browser/ui/iconLabel/iconLabels.js';
+import * as editorCommon from '../../../../../editor/common/editorCommon.js';
+import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { WorkbenchToolBar } from '../../../../../platform/actions/browser/toolbar.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { fixedDiffEditorOptions, fixedEditorOptions, getEditorPadding } from './diffCellEditorOptions.js';
+import { AccessibilityVerbositySettingId } from '../../../accessibility/browser/accessibilityConfiguration.js';
+import { IAccessibilityService } from '../../../../../platform/accessibility/common/accessibility.js';
+import { DiffEditorWidget } from '../../../../../editor/browser/widget/diffEditor/diffEditorWidget.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { DiffNestedCellViewModel } from './diffNestedCellViewModel.js';
+import { localize } from '../../../../../nls.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { ITextResourceConfigurationService } from '../../../../../editor/common/services/textResourceConfiguration.js';
+import { getFormattedMetadataJSON } from '../../common/model/notebookCellTextModel.js';
+import { IDiffEditorOptions } from '../../../../../editor/common/config/editorOptions.js';
+import { getUnchangedRegionSettings } from './unchangedEditorRegions.js';
 
 export function getOptimizedNestedCodeEditorWidgetOptions(): ICodeEditorWidgetOptions {
 	return {
@@ -58,6 +65,29 @@ export function getOptimizedNestedCodeEditorWidgetOptions(): ICodeEditorWidgetOp
 	};
 }
 
+export class CellDiffPlaceholderElement extends Disposable {
+	constructor(
+		placeholder: DiffElementPlaceholderViewModel,
+		templateData: CellDiffPlaceholderRenderTemplate,
+	) {
+		super();
+		templateData.body.classList.remove('left', 'right', 'full');
+		const text = (placeholder.hiddenCells.length === 1) ?
+			localize('hiddenCell', '{0} hidden cell', placeholder.hiddenCells.length) :
+			localize('hiddenCells', '{0} hidden cells', placeholder.hiddenCells.length);
+		templateData.placeholder.innerText = text;
+
+		this._register(DOM.addDisposableListener(templateData.placeholder, 'dblclick', (e: MouseEvent) => {
+			if (e.button !== 0) {
+				return;
+			}
+			e.preventDefault();
+			placeholder.showHiddenCells();
+		}));
+		this._register(templateData.marginOverlay.onAction(() => placeholder.showHiddenCells()));
+		templateData.marginOverlay.show();
+	}
+}
 
 class PropertyHeader extends Disposable {
 	protected _foldingIndicator!: HTMLElement;
@@ -66,16 +96,17 @@ class PropertyHeader extends Disposable {
 	protected _toolbar!: WorkbenchToolBar;
 	protected _menu!: IMenu;
 	protected _propertyExpanded?: IContextKey<boolean>;
+	protected _propertyChanged?: IContextKey<boolean>;
 
 	constructor(
-		readonly cell: DiffElementViewModelBase,
+		readonly cell: IDiffElementViewModelBase,
 		readonly propertyHeaderContainer: HTMLElement,
 		readonly notebookEditor: INotebookTextDiffEditor,
 		readonly accessor: {
 			updateInfoRendering: (renderOutput: boolean) => void;
-			checkIfModified: (cell: DiffElementViewModelBase) => false | { reason: string | undefined };
-			getFoldingState: (cell: DiffElementViewModelBase) => PropertyFoldingState;
-			updateFoldingState: (cell: DiffElementViewModelBase, newState: PropertyFoldingState) => void;
+			checkIfModified: () => false | { reason: string | undefined };
+			getFoldingState: () => PropertyFoldingState;
+			updateFoldingState: (newState: PropertyFoldingState) => void;
 			unChangedLabel: string;
 			changedLabel: string;
 			prefix: string;
@@ -95,30 +126,14 @@ class PropertyHeader extends Disposable {
 	}
 
 	buildHeader(): void {
-		const metadataChanged = this.accessor.checkIfModified(this.cell);
 		this._foldingIndicator = DOM.append(this.propertyHeaderContainer, DOM.$('.property-folding-indicator'));
 		this._foldingIndicator.classList.add(this.accessor.prefix);
-		this._updateFoldingIcon();
 		const metadataStatus = DOM.append(this.propertyHeaderContainer, DOM.$('div.property-status'));
-
 		this._statusSpan = DOM.append(metadataStatus, DOM.$('span'));
 		this._description = DOM.append(metadataStatus, DOM.$('span.property-description'));
 
-		if (metadataChanged) {
-			this._statusSpan.textContent = this.accessor.changedLabel;
-			this._statusSpan.style.fontWeight = 'bold';
-			if (metadataChanged.reason) {
-				this._description.textContent = metadataChanged.reason;
-			}
-			this.propertyHeaderContainer.classList.add('modified');
-		} else {
-			this._statusSpan.textContent = this.accessor.unChangedLabel;
-			this._description.textContent = '';
-			this.propertyHeaderContainer.classList.remove('modified');
-		}
-
 		const cellToolbarContainer = DOM.append(this.propertyHeaderContainer, DOM.$('div.property-toolbar'));
-		this._toolbar = new WorkbenchToolBar(cellToolbarContainer, {
+		this._toolbar = this._register(new WorkbenchToolBar(cellToolbarContainer, {
 			actionViewItemProvider: (action, options) => {
 				if (action instanceof MenuItemAction) {
 					const item = new CodiconActionViewItem(action, { hoverDelegate: options.hoverDelegate }, this.keybindingService, this.notificationService, this.contextKeyService, this.themeService, this.contextMenuService, this.accessibilityService);
@@ -127,74 +142,47 @@ class PropertyHeader extends Disposable {
 
 				return undefined;
 			}
-		}, this.menuService, this.contextKeyService, this.contextMenuService, this.keybindingService, this.commandService, this.telemetryService);
-		this._register(this._toolbar);
-		this._toolbar.context = {
-			cell: this.cell
-		};
+		}, this.menuService, this.contextKeyService, this.contextMenuService, this.keybindingService, this.commandService, this.telemetryService));
+		this._toolbar.context = this.cell;
 
 		const scopedContextKeyService = this.contextKeyService.createScoped(cellToolbarContainer);
 		this._register(scopedContextKeyService);
-		const propertyChanged = NOTEBOOK_DIFF_CELL_PROPERTY.bindTo(scopedContextKeyService);
-		propertyChanged.set(!!metadataChanged);
+		this._propertyChanged = NOTEBOOK_DIFF_CELL_PROPERTY.bindTo(scopedContextKeyService);
 		this._propertyExpanded = NOTEBOOK_DIFF_CELL_PROPERTY_EXPANDED.bindTo(scopedContextKeyService);
 
-		this._menu = this.menuService.createMenu(this.accessor.menuId, scopedContextKeyService);
-		this._register(this._menu);
-
-		const actions: IAction[] = [];
-		createAndFillInActionBarActions(this._menu, { shouldForwardArgs: true }, actions);
-		this._toolbar.setActions(actions);
-
-		this._register(this._menu.onDidChange(() => {
-			const actions: IAction[] = [];
-			createAndFillInActionBarActions(this._menu, { shouldForwardArgs: true }, actions);
-			this._toolbar.setActions(actions);
-		}));
+		this._menu = this._register(this.menuService.createMenu(this.accessor.menuId, scopedContextKeyService));
+		this._register(this._menu.onDidChange(() => this.updateMenu()));
 
 		this._register(this.notebookEditor.onMouseUp(e => {
-			if (!e.event.target) {
+			if (!e.event.target || e.target !== this.cell) {
 				return;
 			}
 
 			const target = e.event.target as HTMLElement;
 
-			if (target.classList.contains('codicon-notebook-collapsed') || target.classList.contains('codicon-notebook-expanded')) {
-				const parent = target.parentElement as HTMLElement;
-
-				if (!parent) {
-					return;
-				}
-
-				if (!parent.classList.contains(this.accessor.prefix)) {
-					return;
-				}
-
-				if (!parent.classList.contains('property-folding-indicator')) {
-					return;
-				}
-
-				// folding icon
-
-				const cellViewModel = e.target;
-
-				if (cellViewModel === this.cell) {
-					const oldFoldingState = this.accessor.getFoldingState(this.cell);
-					this.accessor.updateFoldingState(this.cell, oldFoldingState === PropertyFoldingState.Expanded ? PropertyFoldingState.Collapsed : PropertyFoldingState.Expanded);
-					this._updateFoldingIcon();
-					this.accessor.updateInfoRendering(this.cell.renderOutput);
-				}
+			if (
+				target === this.propertyHeaderContainer ||
+				target === this._foldingIndicator || this._foldingIndicator.contains(target) ||
+				target === metadataStatus || metadataStatus.contains(target)
+			) {
+				const oldFoldingState = this.accessor.getFoldingState();
+				this.accessor.updateFoldingState(oldFoldingState === PropertyFoldingState.Expanded ? PropertyFoldingState.Collapsed : PropertyFoldingState.Expanded);
+				this._updateFoldingIcon();
+				this.accessor.updateInfoRendering(this.cell.renderOutput);
 			}
-
-			return;
 		}));
 
-		this._updateFoldingIcon();
+		this.refresh();
 		this.accessor.updateInfoRendering(this.cell.renderOutput);
 	}
-
 	refresh() {
-		const metadataChanged = this.accessor.checkIfModified(this.cell);
+		this.updateMenu();
+		this._updateFoldingIcon();
+
+		const metadataChanged = this.accessor.checkIfModified();
+		if (this._propertyChanged) {
+			this._propertyChanged.set(!!metadataChanged);
+		}
 		if (metadataChanged) {
 			this._statusSpan.textContent = this.accessor.changedLabel;
 			this._statusSpan.style.fontWeight = 'bold';
@@ -202,20 +190,27 @@ class PropertyHeader extends Disposable {
 				this._description.textContent = metadataChanged.reason;
 			}
 			this.propertyHeaderContainer.classList.add('modified');
-			const actions: IAction[] = [];
-			createAndFillInActionBarActions(this._menu, undefined, actions);
-			this._toolbar.setActions(actions);
 		} else {
 			this._statusSpan.textContent = this.accessor.unChangedLabel;
 			this._statusSpan.style.fontWeight = 'normal';
 			this._description.textContent = '';
 			this.propertyHeaderContainer.classList.remove('modified');
+		}
+	}
+
+	private updateMenu() {
+		const metadataChanged = this.accessor.checkIfModified();
+		if (metadataChanged) {
+			const actions: IAction[] = [];
+			createAndFillInActionBarActions(this._menu, { shouldForwardArgs: true }, actions);
+			this._toolbar.setActions(actions);
+		} else {
 			this._toolbar.setActions([]);
 		}
 	}
 
 	private _updateFoldingIcon() {
-		if (this.accessor.getFoldingState(this.cell) === PropertyFoldingState.Collapsed) {
+		if (this.accessor.getFoldingState() === PropertyFoldingState.Collapsed) {
 			DOM.reset(this._foldingIndicator, renderIcon(collapsedIcon));
 			this._propertyExpanded?.set(false);
 		} else {
@@ -234,11 +229,282 @@ interface IDiffElementLayoutState {
 	outputTotalHeight?: boolean;
 }
 
+
+export class NotebookDocumentMetadataElement extends Disposable {
+	private readonly _editor: DiffEditorWidget;
+	private _editorViewStateChanged: boolean;
+	private _toolbar!: ToolBar;
+	private readonly _cellHeaderContainer: HTMLElement;
+	private readonly _editorContainer: HTMLElement;
+	private _cellHeader!: PropertyHeader;
+	private _diffEditorContainer!: HTMLElement;
+
+	constructor(
+		readonly notebookEditor: INotebookTextDiffEditor,
+		readonly viewModel: NotebookDocumentMetadataViewModel,
+		readonly templateData: NotebookDocumentDiffElementRenderTemplate,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@ITextModelService private readonly textModelService: ITextModelService,
+		@IMenuService private readonly menuService: IMenuService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@ITextResourceConfigurationService private readonly textConfigurationService: ITextResourceConfigurationService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+	) {
+		super();
+		this._editor = templateData.sourceEditor;
+		this._cellHeaderContainer = this.templateData.cellHeaderContainer;
+		this._editorContainer = this.templateData.editorContainer;
+		this._diffEditorContainer = this.templateData.diffEditorContainer;
+
+		this._editorViewStateChanged = false;
+		// init
+		this._register(viewModel.onDidLayoutChange(e => {
+			this.layout(e);
+			this.updateBorders();
+		}));
+		this.buildBody();
+		this.updateBorders();
+	}
+
+	buildBody(): void {
+		const body = this.templateData.body;
+		body.classList.remove('full');
+		body.classList.add('full');
+
+		this.updateSourceEditor();
+
+		if (this.viewModel instanceof NotebookDocumentMetadataViewModel) {
+			this._register(this.viewModel.modifiedMetadata.onDidChange(e => {
+				this._cellHeader.refresh();
+			}));
+		}
+	}
+	protected layoutNotebookCell() {
+		this.notebookEditor.layoutNotebookCell(
+			this.viewModel,
+			this.viewModel.layoutInfo.totalHeight
+		);
+	}
+
+	updateBorders() {
+		this.templateData.leftBorder.style.height = `${this.viewModel.layoutInfo.totalHeight - 32}px`;
+		this.templateData.rightBorder.style.height = `${this.viewModel.layoutInfo.totalHeight - 32}px`;
+		this.templateData.bottomBorder.style.top = `${this.viewModel.layoutInfo.totalHeight - 32}px`;
+	}
+	updateSourceEditor(): void {
+		this._cellHeaderContainer.style.display = 'flex';
+		this._cellHeaderContainer.innerText = '';
+		this._editorContainer.classList.add('diff');
+
+		const updateSourceEditor = () => {
+			if (this.viewModel.cellFoldingState === PropertyFoldingState.Collapsed) {
+				this._editorContainer.style.display = 'none';
+				this.viewModel.editorHeight = 0;
+				return;
+			}
+
+			const lineHeight = this.notebookEditor.getLayoutInfo().fontInfo.lineHeight || 17;
+			const editorHeight = this.viewModel.layoutInfo.editorHeight !== 0 ? this.viewModel.layoutInfo.editorHeight : this.viewModel.computeInputEditorHeight(lineHeight);
+
+			this._editorContainer.style.height = `${editorHeight}px`;
+			this._editorContainer.style.display = 'block';
+
+			const contentHeight = this._editor.getContentHeight();
+			if (contentHeight >= 0) {
+				this.viewModel.editorHeight = contentHeight;
+			}
+			return editorHeight;
+		};
+		const renderSourceEditor = () => {
+			const editorHeight = updateSourceEditor();
+			if (!editorHeight) {
+				return;
+			}
+
+			// If there is only 1 line, then ensure we have the necessary padding to display the button for whitespaces.
+			// E.g. assume we have a cell with 1 line and we add some whitespace,
+			// Then diff editor displays the button `Show Whitespace Differences`, however with 12 paddings on the top, the
+			// button can get cut off.
+			const lineCount = this.viewModel.modifiedMetadata.textBuffer.getLineCount();
+			const options: IDiffEditorOptions = {
+				padding: getEditorPadding(lineCount)
+			};
+			const unchangedRegions = this._register(getUnchangedRegionSettings(this.configurationService));
+			if (unchangedRegions.options.enabled) {
+				options.hideUnchangedRegions = unchangedRegions.options;
+			}
+			this._editor.updateOptions(options);
+			this._register(unchangedRegions.onDidChangeEnablement(() => {
+				options.hideUnchangedRegions = unchangedRegions.options;
+				this._editor.updateOptions(options);
+			}));
+			this._editor.layout({
+				width: this.notebookEditor.getLayoutInfo().width - 2 * DIFF_CELL_MARGIN,
+				height: editorHeight
+			});
+			this._register(this._editor.onDidContentSizeChange((e) => {
+				if (this.viewModel.cellFoldingState === PropertyFoldingState.Expanded && e.contentHeightChanged && this.viewModel.layoutInfo.editorHeight !== e.contentHeight) {
+					this.viewModel.editorHeight = e.contentHeight;
+				}
+			}));
+			this._initializeSourceDiffEditor();
+		};
+
+		this._cellHeader = this._register(this.instantiationService.createInstance(
+			PropertyHeader,
+			this.viewModel,
+			this._cellHeaderContainer,
+			this.notebookEditor,
+			{
+				updateInfoRendering: () => renderSourceEditor(),
+				checkIfModified: () => {
+					return this.viewModel.originalMetadata.getHash() !== this.viewModel.modifiedMetadata.getHash() ? { reason: undefined } : false;
+				},
+				getFoldingState: () => this.viewModel.cellFoldingState,
+				updateFoldingState: (state) => this.viewModel.cellFoldingState = state,
+				unChangedLabel: 'Notebook Metadata',
+				changedLabel: 'Notebook Metadata changed',
+				prefix: 'metadata',
+				menuId: MenuId.NotebookDiffDocumentMetadata
+			}
+		));
+		this._cellHeader.buildHeader();
+		renderSourceEditor();
+
+		const scopedContextKeyService = this.contextKeyService.createScoped(this.templateData.inputToolbarContainer);
+		this._register(scopedContextKeyService);
+		const inputChanged = NOTEBOOK_DIFF_METADATA.bindTo(scopedContextKeyService);
+		inputChanged.set(this.viewModel.originalMetadata.getHash() !== this.viewModel.modifiedMetadata.getHash());
+
+		this._toolbar = this.templateData.toolbar;
+
+		this._toolbar.context = this.viewModel;
+
+		const refreshToolbar = () => {
+			const hasChanges = this.viewModel.originalMetadata.getHash() !== this.viewModel.modifiedMetadata.getHash();
+			inputChanged.set(hasChanges);
+
+			if (hasChanges) {
+				const actions: IAction[] = [];
+				const menu = this.menuService.getMenuActions(MenuId.NotebookDiffDocumentMetadata, scopedContextKeyService, { shouldForwardArgs: true });
+				createAndFillInActionBarActions(menu, actions);
+				this._toolbar.setActions(actions);
+			} else {
+				this._toolbar.setActions([]);
+			}
+		};
+
+		this._register(this.viewModel.modifiedMetadata.onDidChange(() => {
+			refreshToolbar();
+		}));
+		refreshToolbar();
+	}
+
+	private async _initializeSourceDiffEditor() {
+		const [originalRef, modifiedRef] = await Promise.all([
+			this.textModelService.createModelReference(this.viewModel.originalMetadata.uri),
+			this.textModelService.createModelReference(this.viewModel.modifiedMetadata.uri)]);
+
+		if (this._store.isDisposed) {
+			originalRef.dispose();
+			modifiedRef.dispose();
+			return;
+		}
+
+		this._register(originalRef);
+		this._register(modifiedRef);
+
+		const vm = this._register(this._editor.createViewModel({
+			original: originalRef.object.textEditorModel,
+			modified: modifiedRef.object.textEditorModel,
+		}));
+
+		// Reduces flicker (compute this before setting the model)
+		// Else when the model is set, the height of the editor will be x, after diff is computed, then height will be y.
+		// & that results in flicker.
+		await vm.waitForDiff();
+		this._editor.setModel(vm);
+
+		const handleViewStateChange = () => {
+			this._editorViewStateChanged = true;
+		};
+
+		const handleScrollChange = (e: editorCommon.IScrollEvent) => {
+			if (e.scrollTopChanged || e.scrollLeftChanged) {
+				this._editorViewStateChanged = true;
+			}
+		};
+
+		this.updateEditorOptionsForWhitespace();
+		this._register(this._editor.getOriginalEditor().onDidChangeCursorSelection(handleViewStateChange));
+		this._register(this._editor.getOriginalEditor().onDidScrollChange(handleScrollChange));
+		this._register(this._editor.getModifiedEditor().onDidChangeCursorSelection(handleViewStateChange));
+		this._register(this._editor.getModifiedEditor().onDidScrollChange(handleScrollChange));
+
+		const editorViewState = this.viewModel.getSourceEditorViewState() as editorCommon.IDiffEditorViewState | null;
+		if (editorViewState) {
+			this._editor.restoreViewState(editorViewState);
+		}
+
+		const contentHeight = this._editor.getContentHeight();
+		this.viewModel.editorHeight = contentHeight;
+	}
+	private updateEditorOptionsForWhitespace() {
+		const editor = this._editor;
+		const uri = editor.getModel()?.modified.uri || editor.getModel()?.original.uri;
+		if (!uri) {
+			return;
+		}
+		const ignoreTrimWhitespace = this.textConfigurationService.getValue<boolean>(uri, 'diffEditor.ignoreTrimWhitespace');
+		editor.updateOptions({ ignoreTrimWhitespace });
+
+		this._register(this.textConfigurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(uri, 'diffEditor') &&
+				e.affectedKeys.has('diffEditor.ignoreTrimWhitespace')) {
+				const ignoreTrimWhitespace = this.textConfigurationService.getValue<boolean>(uri, 'diffEditor.ignoreTrimWhitespace');
+				editor.updateOptions({ ignoreTrimWhitespace });
+			}
+		}));
+	}
+	layout(state: IDiffElementLayoutState) {
+		DOM.scheduleAtNextAnimationFrame(DOM.getWindow(this._diffEditorContainer), () => {
+			if (state.editorHeight) {
+				this._editorContainer.style.height = `${this.viewModel.layoutInfo.editorHeight}px`;
+				this._editor.layout({
+					width: this._editor.getViewWidth(),
+					height: this.viewModel.layoutInfo.editorHeight
+				});
+			}
+
+			if (state.outerWidth) {
+				this._editorContainer.style.height = `${this.viewModel.layoutInfo.editorHeight}px`;
+				this._editor.layout();
+			}
+
+			this.layoutNotebookCell();
+		});
+	}
+
+	override dispose() {
+		this._editor.setModel(null);
+
+		if (this._editorViewStateChanged) {
+			this.viewModel.saveSpirceEditorViewState(this._editor.saveViewState());
+		}
+
+		super.dispose();
+	}
+}
+
+
 abstract class AbstractElementRenderer extends Disposable {
 	protected readonly _metadataLocalDisposable = this._register(new DisposableStore());
 	protected readonly _outputLocalDisposable = this._register(new DisposableStore());
 	protected _ignoreMetadata: boolean = false;
 	protected _ignoreOutputs: boolean = false;
+	protected _cellHeaderContainer!: HTMLElement;
+	protected _editorContainer!: HTMLElement;
+	protected _cellHeader!: PropertyHeader;
 	protected _metadataHeaderContainer!: HTMLElement;
 	protected _metadataHeader!: PropertyHeader;
 	protected _metadataInfoContainer!: HTMLElement;
@@ -267,7 +533,7 @@ abstract class AbstractElementRenderer extends Disposable {
 
 	constructor(
 		readonly notebookEditor: INotebookTextDiffEditor,
-		readonly cell: DiffElementViewModelBase,
+		readonly cell: DiffElementCellViewModelBase,
 		readonly templateData: CellDiffSingleSideRenderTemplate | CellDiffSideBySideRenderTemplate,
 		readonly style: 'left' | 'right' | 'full',
 		protected readonly instantiationService: IInstantiationService,
@@ -280,13 +546,16 @@ abstract class AbstractElementRenderer extends Disposable {
 		protected readonly menuService: IMenuService,
 		protected readonly contextKeyService: IContextKeyService,
 		protected readonly configurationService: IConfigurationService,
+		protected readonly textConfigurationService: ITextResourceConfigurationService
 	) {
 		super();
 		// init
 		this._isDisposed = false;
 		this._metadataEditorDisposeStore = this._register(new DisposableStore());
 		this._outputEditorDisposeStore = this._register(new DisposableStore());
-		this._register(cell.onDidLayoutChange(e => this.layout(e)));
+		this._register(cell.onDidLayoutChange(e => {
+			this.layout(e);
+		}));
 		this._register(cell.onDidLayoutChange(e => this.updateBorders()));
 		this.init();
 		this.buildBody();
@@ -321,6 +590,9 @@ abstract class AbstractElementRenderer extends Disposable {
 
 		this.styleContainer(this._diffEditorContainer);
 		this.updateSourceEditor();
+		if (this.cell.modified) {
+			this._register(this.cell.modified.textModel.onDidChangeContent(() => this._cellHeader.refresh()));
+		}
 
 		this._ignoreMetadata = this.configurationService.getValue('notebook.diff.ignoreMetadata');
 		if (this._ignoreMetadata) {
@@ -366,6 +638,7 @@ abstract class AbstractElementRenderer extends Disposable {
 					this._outputLocalDisposable.clear();
 					if (this._ignoreOutputs) {
 						this._disposeOutput();
+						this.cell.layoutChange();
 					} else {
 						this.cell.outputStatusHeight = 25;
 						this._buildOutput();
@@ -510,20 +783,49 @@ abstract class AbstractElementRenderer extends Disposable {
 				originalEditor: getOptimizedNestedCodeEditorWidgetOptions(),
 				modifiedEditor: getOptimizedNestedCodeEditorWidgetOptions()
 			});
+
+			const unchangedRegions = this._register(getUnchangedRegionSettings(this.configurationService));
+			if (unchangedRegions.options.enabled) {
+				this._metadataEditor.updateOptions({ hideUnchangedRegions: unchangedRegions.options });
+			}
+			this._metadataEditorDisposeStore.add(unchangedRegions.onDidChangeEnablement(() => {
+				if (this._metadataEditor) {
+					this._metadataEditor.updateOptions({ hideUnchangedRegions: unchangedRegions.options });
+				}
+			}));
+
+
 			this.layout({ metadataHeight: true });
 			this._metadataEditorDisposeStore.add(this._metadataEditor);
 
 			this._metadataEditorContainer?.classList.add('diff');
 
-			const originalMetadataModel = await this.textModelService.createModelReference(CellUri.generateCellPropertyUri(this.cell.originalDocument.uri, this.cell.original.handle, Schemas.vscodeNotebookCellMetadata));
-			const modifiedMetadataModel = await this.textModelService.createModelReference(CellUri.generateCellPropertyUri(this.cell.modifiedDocument.uri, this.cell.modified.handle, Schemas.vscodeNotebookCellMetadata));
-			this._metadataEditor.setModel({
-				original: originalMetadataModel.object.textEditorModel,
-				modified: modifiedMetadataModel.object.textEditorModel
-			});
+			const [originalMetadataModel, modifiedMetadataModel] = await Promise.all([
+				this.textModelService.createModelReference(CellUri.generateCellPropertyUri(this.cell.originalDocument.uri, this.cell.original.handle, Schemas.vscodeNotebookCellMetadata)),
+				this.textModelService.createModelReference(CellUri.generateCellPropertyUri(this.cell.modifiedDocument.uri, this.cell.modified.handle, Schemas.vscodeNotebookCellMetadata))
+			]);
+
+			if (this._isDisposed) {
+				originalMetadataModel.dispose();
+				modifiedMetadataModel.dispose();
+				return;
+			}
 
 			this._metadataEditorDisposeStore.add(originalMetadataModel);
 			this._metadataEditorDisposeStore.add(modifiedMetadataModel);
+			const vm = this._metadataEditor.createViewModel({
+				original: originalMetadataModel.object.textEditorModel,
+				modified: modifiedMetadataModel.object.textEditorModel
+			});
+			this._metadataEditor.setModel(vm);
+			// Reduces flicker (compute this before setting the model)
+			// Else when the model is set, the height of the editor will be x, after diff is computed, then height will be y.
+			// & that results in flicker.
+			await vm.waitForDiff();
+
+			if (this._isDisposed) {
+				return;
+			}
 
 			this.cell.metadataHeight = this._metadataEditor.getContentHeight();
 
@@ -548,7 +850,7 @@ abstract class AbstractElementRenderer extends Disposable {
 					return;
 				}
 
-				const modifiedMetadataSource = getFormattedMetadataJSON(this.notebookEditor.textModel!, this.cell.modified?.metadata || {}, this.cell.modified?.language);
+				const modifiedMetadataSource = getFormattedMetadataJSON(this.notebookEditor.textModel?.transientOptions.transientCellMetadata, this.cell.modified?.metadata || {}, this.cell.modified?.language);
 				modifiedMetadataModel.object.textEditorModel.setValue(modifiedMetadataSource);
 			}));
 
@@ -567,7 +869,7 @@ abstract class AbstractElementRenderer extends Disposable {
 			this._metadataEditorDisposeStore.add(this._metadataEditor);
 
 			const mode = this.languageService.createById('jsonc');
-			const originalMetadataSource = getFormattedMetadataJSON(this.notebookEditor.textModel!,
+			const originalMetadataSource = getFormattedMetadataJSON(this.notebookEditor.textModel?.transientOptions.transientCellMetadata,
 				this.cell.type === 'insert'
 					? this.cell.modified!.metadata || {}
 					: this.cell.original!.metadata || {});
@@ -666,8 +968,8 @@ abstract class AbstractElementRenderer extends Disposable {
 			this.notebookEditor.textModel!.transientOptions.transientOutputs
 				? []
 				: this.cell.type === 'insert'
-					? this.cell.modified!.outputs || []
-					: this.cell.original!.outputs || []);
+					? this.cell.modified?.outputs || []
+					: this.cell.original?.outputs || []);
 		const outputModel = this.modelService.createModel(originaloutputSource, mode, undefined, true);
 		this._outputEditorDisposeStore.add(outputModel);
 		this._outputEditor.setModel(outputModel);
@@ -716,10 +1018,11 @@ abstract class AbstractElementRenderer extends Disposable {
 }
 
 abstract class SingleSideDiffElement extends AbstractElementRenderer {
-
+	protected _editor!: CodeEditorWidget;
 	override readonly cell: SingleSideDiffElementViewModel;
 	override readonly templateData: CellDiffSingleSideRenderTemplate;
-
+	abstract get nestedCellViewModel(): DiffNestedCellViewModel;
+	abstract get readonly(): boolean;
 	constructor(
 		notebookEditor: INotebookTextDiffEditor,
 		cell: SingleSideDiffElementViewModel,
@@ -735,6 +1038,7 @@ abstract class SingleSideDiffElement extends AbstractElementRenderer {
 		menuService: IMenuService,
 		contextKeyService: IContextKeyService,
 		configurationService: IConfigurationService,
+		textConfigurationService: ITextResourceConfigurationService
 	) {
 		super(
 			notebookEditor,
@@ -750,7 +1054,8 @@ abstract class SingleSideDiffElement extends AbstractElementRenderer {
 			notificationService,
 			menuService,
 			contextKeyService,
-			configurationService
+			configurationService,
+			textConfigurationService
 		);
 		this.cell = cell;
 		this.templateData = templateData;
@@ -825,9 +1130,105 @@ abstract class SingleSideDiffElement extends AbstractElementRenderer {
 		}));
 	}
 
+	override updateSourceEditor(): void {
+		this._cellHeaderContainer = this.templateData.cellHeaderContainer;
+		this._cellHeaderContainer.style.display = 'flex';
+		this._cellHeaderContainer.innerText = '';
+		this._editorContainer = this.templateData.editorContainer;
+		this._editorContainer.classList.add('diff');
+
+		const renderSourceEditor = () => {
+			if (this.cell.cellFoldingState === PropertyFoldingState.Collapsed) {
+				this._editorContainer.style.display = 'none';
+				this.cell.editorHeight = 0;
+				return;
+			}
+			const lineHeight = this.notebookEditor.getLayoutInfo().fontInfo.lineHeight || 17;
+			const editorHeight = this.cell.computeInputEditorHeight(lineHeight);
+
+			this._editorContainer.style.height = `${editorHeight}px`;
+			this._editorContainer.style.display = 'block';
+
+			if (this._editor) {
+				const contentHeight = this._editor.getContentHeight();
+				if (contentHeight >= 0) {
+					this.cell.editorHeight = contentHeight;
+				}
+				return;
+			}
+
+			this._editor = this.templateData.sourceEditor;
+			this._editor.layout(
+				{
+					width: (this.notebookEditor.getLayoutInfo().width - 2 * DIFF_CELL_MARGIN) / 2 - 18,
+					height: editorHeight
+				}
+			);
+			this._editor.updateOptions({ readOnly: this.readonly });
+			this.cell.editorHeight = editorHeight;
+
+			this._register(this._editor.onDidContentSizeChange((e) => {
+				if (this.cell.cellFoldingState === PropertyFoldingState.Expanded && e.contentHeightChanged && this.cell.layoutInfo.editorHeight !== e.contentHeight) {
+					this.cell.editorHeight = e.contentHeight;
+				}
+			}));
+			this._initializeSourceDiffEditor(this.nestedCellViewModel);
+		};
+
+		this._cellHeader = this._register(this.instantiationService.createInstance(
+			PropertyHeader,
+			this.cell,
+			this._cellHeaderContainer,
+			this.notebookEditor,
+			{
+				updateInfoRendering: () => renderSourceEditor(),
+				checkIfModified: () => ({ reason: undefined }),
+				getFoldingState: () => this.cell.cellFoldingState,
+				updateFoldingState: (state) => this.cell.cellFoldingState = state,
+				unChangedLabel: 'Input',
+				changedLabel: 'Input',
+				prefix: 'input',
+				menuId: MenuId.NotebookDiffCellInputTitle
+			}
+		));
+		this._cellHeader.buildHeader();
+		renderSourceEditor();
+
+		this._initializeSourceDiffEditor(this.nestedCellViewModel);
+	}
+	protected calculateDiagonalFillHeight() {
+		return this.cell.layoutInfo.cellStatusHeight + this.cell.layoutInfo.editorHeight + this.cell.layoutInfo.editorMargin + this.cell.layoutInfo.metadataStatusHeight + this.cell.layoutInfo.metadataHeight + this.cell.layoutInfo.outputTotalHeight + this.cell.layoutInfo.outputStatusHeight;
+	}
+
+	private async _initializeSourceDiffEditor(modifiedCell: DiffNestedCellViewModel) {
+		const modifiedRef = await this.textModelService.createModelReference(modifiedCell.uri);
+
+		if (this._isDisposed) {
+			return;
+		}
+
+		const modifiedTextModel = modifiedRef.object.textEditorModel;
+		this._register(modifiedRef);
+
+		this._editor!.setModel(modifiedTextModel);
+
+		const editorViewState = this.cell.getSourceEditorViewState() as editorCommon.IDiffEditorViewState | null;
+		if (editorViewState) {
+			this._editor!.restoreViewState(editorViewState);
+		}
+
+		const contentHeight = this._editor!.getContentHeight();
+		this.cell.editorHeight = contentHeight;
+		const height = `${this.calculateDiagonalFillHeight()}px`;
+		if (this._diagonalFill!.style.height !== height) {
+			this._diagonalFill!.style.height = height;
+		}
+	}
+
 	_disposeMetadata() {
 		this.cell.metadataStatusHeight = 0;
 		this.cell.metadataHeight = 0;
+		this.templateData.cellHeaderContainer.style.display = 'none';
 		this.templateData.metadataHeaderContainer.style.display = 'none';
 		this.templateData.metadataInfoContainer.style.display = 'none';
 		this._metadataEditor = undefined;
@@ -848,14 +1249,14 @@ abstract class SingleSideDiffElement extends AbstractElementRenderer {
 			this.notebookEditor,
 			{
 				updateInfoRendering: this.updateMetadataRendering.bind(this),
-				checkIfModified: (cell) => {
-					return cell.checkMetadataIfModified();
+				checkIfModified: () => {
+					return this.cell.checkMetadataIfModified();
 				},
-				getFoldingState: (cell) => {
-					return cell.metadataFoldingState;
+				getFoldingState: () => {
+					return this.cell.metadataFoldingState;
 				},
-				updateFoldingState: (cell, state) => {
-					cell.metadataFoldingState = state;
+				updateFoldingState: (state) => {
+					this.cell.metadataFoldingState = state;
 				},
 				unChangedLabel: 'Metadata',
 				changedLabel: 'Metadata changed',
@@ -884,14 +1285,14 @@ abstract class SingleSideDiffElement extends AbstractElementRenderer {
 			this.notebookEditor,
 			{
 				updateInfoRendering: this.updateOutputRendering.bind(this),
-				checkIfModified: (cell) => {
-					return cell.checkIfOutputsModified();
+				checkIfModified: () => {
+					return this.cell.checkIfOutputsModified();
 				},
-				getFoldingState: (cell) => {
-					return cell.outputFoldingState;
+				getFoldingState: () => {
+					return this.cell.outputFoldingState;
 				},
-				updateFoldingState: (cell, state) => {
-					cell.outputFoldingState = state;
+				updateFoldingState: (state) => {
+					this.cell.outputFoldingState = state;
 				},
 				unChangedLabel: 'Outputs',
 				changedLabel: 'Outputs changed',
@@ -909,6 +1310,7 @@ abstract class SingleSideDiffElement extends AbstractElementRenderer {
 		this._hideOutputsEmptyView();
 
 		this.cell.rawOutputHeight = 0;
+		this.cell.outputMetadataHeight = 0;
 		this.cell.outputStatusHeight = 0;
 		this.templateData.outputHeaderContainer.style.display = 'none';
 		this.templateData.outputInfoContainer.style.display = 'none';
@@ -916,7 +1318,6 @@ abstract class SingleSideDiffElement extends AbstractElementRenderer {
 	}
 }
 export class DeletedElement extends SingleSideDiffElement {
-	private _editor!: CodeEditorWidget;
 	constructor(
 		notebookEditor: INotebookTextDiffEditor,
 		cell: SingleSideDiffElementViewModel,
@@ -931,9 +1332,16 @@ export class DeletedElement extends SingleSideDiffElement {
 		@IMenuService menuService: IMenuService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IConfigurationService configurationService: IConfigurationService,
-
+		@ITextResourceConfigurationService textConfigurationService: ITextResourceConfigurationService,
 	) {
-		super(notebookEditor, cell, templateData, 'left', instantiationService, languageService, modelService, textModelService, contextMenuService, keybindingService, notificationService, menuService, contextKeyService, configurationService);
+		super(notebookEditor, cell, templateData, 'left', instantiationService, languageService, modelService, textModelService, contextMenuService, keybindingService, notificationService, menuService, contextKeyService, configurationService, textConfigurationService);
+	}
+
+	get nestedCellViewModel() {
+		return this.cell.original!;
+	}
+	get readonly() {
+		return true;
 	}
 
 	styleContainer(container: HTMLElement) {
@@ -941,48 +1349,21 @@ export class DeletedElement extends SingleSideDiffElement {
 		container.classList.add('removed');
 	}
 
-	updateSourceEditor(): void {
-		const originalCell = this.cell.original!;
-		const lineCount = originalCell.textModel.textBuffer.getLineCount();
-		const lineHeight = this.notebookEditor.getLayoutInfo().fontInfo.lineHeight || 17;
-		const editorHeight = lineCount * lineHeight + fixedEditorPadding.top + fixedEditorPadding.bottom;
-
-		this._editor = this.templateData.sourceEditor;
-		this._editor.layout({
-			width: (this.notebookEditor.getLayoutInfo().width - 2 * DIFF_CELL_MARGIN) / 2 - 18,
-			height: editorHeight
-		});
-
-		this.cell.editorHeight = editorHeight;
-
-		this._register(this._editor.onDidContentSizeChange((e) => {
-			if (e.contentHeightChanged && this.cell.layoutInfo.editorHeight !== e.contentHeight) {
-				this.cell.editorHeight = e.contentHeight;
-			}
-		}));
-
-		this.textModelService.createModelReference(originalCell.uri).then(ref => {
-			if (this._isDisposed) {
-				return;
-			}
-
-			this._register(ref);
-
-			const textModel = ref.object.textEditorModel;
-			this._editor.setModel(textModel);
-			this.cell.editorHeight = this._editor.getContentHeight();
-		});
-	}
-
 	layout(state: IDiffElementLayoutState) {
 		DOM.scheduleAtNextAnimationFrame(DOM.getWindow(this._diffEditorContainer), () => {
-			if (state.editorHeight || state.outerWidth) {
+			if ((state.editorHeight || state.outerWidth) && this._editor) {
+				this._editorContainer.style.height = `${this.cell.layoutInfo.editorHeight}px`;
 				this._editor.layout({
 					width: this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), false, false),
 					height: this.cell.layoutInfo.editorHeight
 				});
 			}
 
+			if (state.outerWidth && this._editor) {
+				this._editorContainer.style.height = `${this.cell.layoutInfo.editorHeight}px`;
+				this._editor.layout();
+			}
+
 			if (state.metadataHeight || state.outerWidth) {
 				this._metadataEditor?.layout({
 					width: this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), false, false),
@@ -998,13 +1379,14 @@ export class DeletedElement extends SingleSideDiffElement {
 			}
 
 			if (this._diagonalFill) {
-				this._diagonalFill.style.height = `${this.cell.layoutInfo.totalHeight - 32}px`;
+				this._diagonalFill.style.height = `${this.calculateDiagonalFillHeight()}px`;
 			}
 
 			this.layoutNotebookCell();
 		});
 	}
 
+
 	_buildOutputRendererContainer() {
 		if (!this._outputViewContainer) {
 			this._outputViewContainer = DOM.append(this._outputInfoContainer, DOM.$('.output-view-container'));
@@ -1012,7 +1394,7 @@ export class DeletedElement extends SingleSideDiffElement {
 			const span = DOM.append(this._outputEmptyElement, DOM.$('span'));
 			span.innerText = 'No outputs to render';
 
-			if (this.cell.original!.outputs.length === 0) {
+			if (!this.cell.original?.outputs.length) {
 				this._outputEmptyElement.style.display = 'block';
 			} else {
 				this._outputEmptyElement.style.display = 'none';
@@ -1068,7 +1450,6 @@ export class DeletedElement extends SingleSideDiffElement {
 }
 
 export class InsertElement extends SingleSideDiffElement {
-	private _editor!: CodeEditorWidget;
 	constructor(
 		notebookEditor: INotebookTextDiffEditor,
 		cell: SingleSideDiffElementViewModel,
@@ -1083,8 +1464,15 @@ export class InsertElement extends SingleSideDiffElement {
 		@IMenuService menuService: IMenuService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IConfigurationService configurationService: IConfigurationService,
+		@ITextResourceConfigurationService textConfigurationService: ITextResourceConfigurationService,
 	) {
-		super(notebookEditor, cell, templateData, 'right', instantiationService, languageService, modelService, textModelService, contextMenuService, keybindingService, notificationService, menuService, contextKeyService, configurationService);
+		super(notebookEditor, cell, templateData, 'right', instantiationService, languageService, modelService, textModelService, contextMenuService, keybindingService, notificationService, menuService, contextKeyService, configurationService, textConfigurationService);
+	}
+	get nestedCellViewModel() {
+		return this.cell.modified!;
+	}
+	get readonly() {
+		return false;
 	}
 
 	styleContainer(container: HTMLElement): void {
@@ -1092,49 +1480,13 @@ export class InsertElement extends SingleSideDiffElement {
 		container.classList.add('inserted');
 	}
 
-	updateSourceEditor(): void {
-		const modifiedCell = this.cell.modified!;
-		const lineCount = modifiedCell.textModel.textBuffer.getLineCount();
-		const lineHeight = this.notebookEditor.getLayoutInfo().fontInfo.lineHeight || 17;
-		const editorHeight = lineCount * lineHeight + fixedEditorPadding.top + fixedEditorPadding.bottom;
-
-		this._editor = this.templateData.sourceEditor;
-		this._editor.layout(
-			{
-				width: (this.notebookEditor.getLayoutInfo().width - 2 * DIFF_CELL_MARGIN) / 2 - 18,
-				height: editorHeight
-			}
-		);
-		this._editor.updateOptions({ readOnly: false });
-		this.cell.editorHeight = editorHeight;
-
-		this._register(this._editor.onDidContentSizeChange((e) => {
-			if (e.contentHeightChanged && this.cell.layoutInfo.editorHeight !== e.contentHeight) {
-				this.cell.editorHeight = e.contentHeight;
-			}
-		}));
-
-		this.textModelService.createModelReference(modifiedCell.uri).then(ref => {
-			if (this._isDisposed) {
-				return;
-			}
-
-			this._register(ref);
-
-			const textModel = ref.object.textEditorModel;
-			this._editor.setModel(textModel);
-			this._editor.restoreViewState(this.cell.getSourceEditorViewState() as editorCommon.ICodeEditorViewState);
-			this.cell.editorHeight = this._editor.getContentHeight();
-		});
-	}
-
 	_buildOutputRendererContainer() {
 		if (!this._outputViewContainer) {
 			this._outputViewContainer = DOM.append(this._outputInfoContainer, DOM.$('.output-view-container'));
 			this._outputEmptyElement = DOM.append(this._outputViewContainer, DOM.$('.output-empty-view'));
 			this._outputEmptyElement.innerText = 'No outputs to render';
 
-			if (this.cell.modified!.outputs.length === 0) {
+			if (!this.cell.modified?.outputs.length) {
 				this._outputEmptyElement.style.display = 'block';
 			} else {
 				this._outputEmptyElement.style.display = 'none';
@@ -1179,13 +1531,19 @@ export class InsertElement extends SingleSideDiffElement {
 
 	layout(state: IDiffElementLayoutState) {
 		DOM.scheduleAtNextAnimationFrame(DOM.getWindow(this._diffEditorContainer), () => {
-			if (state.editorHeight || state.outerWidth) {
+			if ((state.editorHeight || state.outerWidth) && this._editor) {
+				this._editorContainer.style.height = `${this.cell.layoutInfo.editorHeight}px`;
 				this._editor.layout({
 					width: this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), false, false),
 					height: this.cell.layoutInfo.editorHeight
 				});
 			}
 
+			if (state.outerWidth && this._editor) {
+				this._editorContainer.style.height = `${this.cell.layoutInfo.editorHeight}px`;
+				this._editor.layout();
+			}
+
 			if (state.metadataHeight || state.outerWidth) {
 				this._metadataEditor?.layout({
 					width: this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), false, true),
@@ -1203,7 +1561,7 @@ export class InsertElement extends SingleSideDiffElement {
 			this.layoutNotebookCell();
 
 			if (this._diagonalFill) {
-				this._diagonalFill.style.height = `${this.cell.layoutInfo.editorHeight + this.cell.layoutInfo.editorMargin + this.cell.layoutInfo.metadataStatusHeight + this.cell.layoutInfo.metadataHeight + this.cell.layoutInfo.outputTotalHeight + this.cell.layoutInfo.outputStatusHeight}px`;
+				this._diagonalFill.style.height = `${this.calculateDiagonalFillHeight()}px`;
 			}
 		});
 	}
@@ -1220,8 +1578,6 @@ export class InsertElement extends SingleSideDiffElement {
 export class ModifiedElement extends AbstractElementRenderer {
 	private _editor?: DiffEditorWidget;
 	private _editorViewStateChanged: boolean;
-	private _editorContainer!: HTMLElement;
-	private _inputToolbarContainer!: HTMLElement;
 	protected _toolbar!: ToolBar;
 	protected _menu!: IMenu;
 
@@ -1242,8 +1598,9 @@ export class ModifiedElement extends AbstractElementRenderer {
 		@IMenuService menuService: IMenuService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IConfigurationService configurationService: IConfigurationService,
+		@ITextResourceConfigurationService textConfigurationService: ITextResourceConfigurationService,
 	) {
-		super(notebookEditor, cell, templateData, 'full', instantiationService, languageService, modelService, textModelService, contextMenuService, keybindingService, notificationService, menuService, contextKeyService, configurationService);
+		super(notebookEditor, cell, templateData, 'full', instantiationService, languageService, modelService, textModelService, contextMenuService, keybindingService, notificationService, menuService, contextKeyService, configurationService, textConfigurationService);
 		this.cell = cell;
 		this.templateData = templateData;
 		this._editorViewStateChanged = false;
@@ -1256,6 +1613,15 @@ export class ModifiedElement extends AbstractElementRenderer {
 		container.classList.remove('inserted', 'removed');
 	}
 
+	override buildBody(): void {
+		super.buildBody();
+		if (this.cell.displayIconToHideUnmodifiedCells) {
+			this._register(this.templateData.marginOverlay.onAction(() => this.cell.hideUnchangedCells()));
+			this.templateData.marginOverlay.show();
+		} else {
+			this.templateData.marginOverlay.hide();
+		}
+	}
 	_disposeMetadata() {
 		this.cell.metadataStatusHeight = 0;
 		this.cell.metadataHeight = 0;
@@ -1280,14 +1646,14 @@ export class ModifiedElement extends AbstractElementRenderer {
 			this.notebookEditor,
 			{
 				updateInfoRendering: this.updateMetadataRendering.bind(this),
-				checkIfModified: (cell) => {
-					return cell.checkMetadataIfModified();
+				checkIfModified: () => {
+					return this.cell.checkMetadataIfModified();
 				},
-				getFoldingState: (cell) => {
-					return cell.metadataFoldingState;
+				getFoldingState: () => {
+					return this.cell.metadataFoldingState;
 				},
-				updateFoldingState: (cell, state) => {
-					cell.metadataFoldingState = state;
+				updateFoldingState: (state) => {
+					this.cell.metadataFoldingState = state;
 				},
 				unChangedLabel: 'Metadata',
 				changedLabel: 'Metadata changed',
@@ -1305,6 +1671,7 @@ export class ModifiedElement extends AbstractElementRenderer {
 		this._hideOutputsEmptyView();
 
 		this.cell.rawOutputHeight = 0;
+		this.cell.outputMetadataHeight = 0;
 		this.cell.outputStatusHeight = 0;
 		this.templateData.outputHeaderContainer.style.display = 'none';
 		this.templateData.outputInfoContainer.style.display = 'none';
@@ -1333,14 +1700,14 @@ export class ModifiedElement extends AbstractElementRenderer {
 			this.notebookEditor,
 			{
 				updateInfoRendering: this.updateOutputRendering.bind(this),
-				checkIfModified: (cell) => {
-					return cell.checkIfOutputsModified();
+				checkIfModified: () => {
+					return this.cell.checkIfOutputsModified();
 				},
-				getFoldingState: (cell) => {
-					return cell.outputFoldingState;
+				getFoldingState: () => {
+					return this.cell.outputFoldingState;
 				},
-				updateFoldingState: (cell, state) => {
-					cell.outputFoldingState = state;
+				updateFoldingState: (state) => {
+					this.cell.outputFoldingState = state;
 				},
 				unChangedLabel: 'Outputs',
 				changedLabel: 'Outputs changed',
@@ -1436,6 +1803,7 @@ export class ModifiedElement extends AbstractElementRenderer {
 					originalEditor: getOptimizedNestedCodeEditorWidgetOptions(),
 					modifiedEditor: getOptimizedNestedCodeEditorWidgetOptions()
 				});
+
 				this._register(this._outputMetadataEditor);
 				const originalOutputMetadataSource = JSON.stringify(this.cell.original.outputs[0].metadata ?? {}, undefined, '\t');
 				const modifiedOutputMetadataSource = JSON.stringify(this.cell.modified.outputs[0].metadata ?? {}, undefined, '\t');
@@ -1476,7 +1844,11 @@ export class ModifiedElement extends AbstractElementRenderer {
 
 			this._outputLeftView?.showOutputs();
 			this._outputRightView?.showOutputs();
-			this._outputMetadataEditor?.layout();
+			this._outputMetadataEditor?.layout({
+				width: this._editor?.getViewWidth() || this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), false, true),
+				height: this.cell.layoutInfo.outputMetadataHeight
+			});
+
 			this._decorate();
 		}
 	}
@@ -1491,86 +1863,147 @@ export class ModifiedElement extends AbstractElementRenderer {
 	}
 
 	updateSourceEditor(): void {
+		this._cellHeaderContainer = this.templateData.cellHeaderContainer;
+		this._cellHeaderContainer.style.display = 'flex';
+		this._cellHeaderContainer.innerText = '';
 		const modifiedCell = this.cell.modified;
-		const lineCount = modifiedCell.textModel.textBuffer.getLineCount();
-		const lineHeight = this.notebookEditor.getLayoutInfo().fontInfo.lineHeight || 17;
-
-		const editorHeight = this.cell.layoutInfo.editorHeight !== 0 ? this.cell.layoutInfo.editorHeight : lineCount * lineHeight + fixedEditorPadding.top + fixedEditorPadding.bottom;
 		this._editorContainer = this.templateData.editorContainer;
-		this._editor = this.templateData.sourceEditor;
-
 		this._editorContainer.classList.add('diff');
 
-		this._editor.layout({
-			width: this.notebookEditor.getLayoutInfo().width - 2 * DIFF_CELL_MARGIN,
-			height: editorHeight
-		});
-
-		this._editorContainer.style.height = `${editorHeight}px`;
-
-		this._register(this._editor.onDidContentSizeChange((e) => {
-			if (e.contentHeightChanged && this.cell.layoutInfo.editorHeight !== e.contentHeight) {
-				this.cell.editorHeight = e.contentHeight;
+		const renderSourceEditor = () => {
+			if (this.cell.cellFoldingState === PropertyFoldingState.Collapsed) {
+				this._editorContainer.style.display = 'none';
+				this.cell.editorHeight = 0;
+				return;
 			}
-		}));
 
-		this._initializeSourceDiffEditor();
+			const lineCount = modifiedCell.textModel.textBuffer.getLineCount();
+			const lineHeight = this.notebookEditor.getLayoutInfo().fontInfo.lineHeight || 17;
+			const editorHeight = this.cell.layoutInfo.editorHeight !== 0 ? this.cell.layoutInfo.editorHeight : this.cell.computeInputEditorHeight(lineHeight);
+
+			this._editorContainer.style.height = `${editorHeight}px`;
+			this._editorContainer.style.display = 'block';
+
+			if (this._editor) {
+				const contentHeight = this._editor.getContentHeight();
+				if (contentHeight >= 0) {
+					this.cell.editorHeight = contentHeight;
+				}
+				return;
+			}
+
+			this._editor = this.templateData.sourceEditor;
+			// If there is only 1 line, then ensure we have the necessary padding to display the button for whitespaces.
+			// E.g. assume we have a cell with 1 line and we add some whitespace,
+			// Then diff editor displays the button `Show Whitespace Differences`, however with 12 paddings on the top, the
+			// button can get cut off.
+			const options: IDiffEditorOptions = {
+				padding: getEditorPadding(lineCount)
+			};
+			const unchangedRegions = this._register(getUnchangedRegionSettings(this.configurationService));
+			if (unchangedRegions.options.enabled) {
+				options.hideUnchangedRegions = unchangedRegions.options;
+			}
+			this._editor.updateOptions(options);
+			this._register(unchangedRegions.onDidChangeEnablement(() => {
+				options.hideUnchangedRegions = unchangedRegions.options;
+				this._editor?.updateOptions(options);
+			}));
+			this._editor.layout({
+				width: this.notebookEditor.getLayoutInfo().width - 2 * DIFF_CELL_MARGIN,
+				height: editorHeight
+			});
+			this._register(this._editor.onDidContentSizeChange((e) => {
+				if (this.cell.cellFoldingState === PropertyFoldingState.Expanded && e.contentHeightChanged && this.cell.layoutInfo.editorHeight !== e.contentHeight) {
+					this.cell.editorHeight = e.contentHeight;
+				}
+			}));
+			this._initializeSourceDiffEditor();
+		};
+
+		this._cellHeader = this._register(this.instantiationService.createInstance(
+			PropertyHeader,
+			this.cell,
+			this._cellHeaderContainer,
+			this.notebookEditor,
+			{
+				updateInfoRendering: () => renderSourceEditor(),
+				checkIfModified: () => {
+					return this.cell.modified?.textModel.getTextBufferHash() !== this.cell.original?.textModel.getTextBufferHash() ? { reason: undefined } : false;
+				},
+				getFoldingState: () => this.cell.cellFoldingState,
+				updateFoldingState: (state) => this.cell.cellFoldingState = state,
+				unChangedLabel: 'Input',
+				changedLabel: 'Input changed',
+				prefix: 'input',
+				menuId: MenuId.NotebookDiffCellInputTitle
+			}
+		));
+		this._cellHeader.buildHeader();
+		renderSourceEditor();
+
 		const scopedContextKeyService = this.contextKeyService.createScoped(this.templateData.inputToolbarContainer);
 		this._register(scopedContextKeyService);
 		const inputChanged = NOTEBOOK_DIFF_CELL_INPUT.bindTo(scopedContextKeyService);
+		inputChanged.set(this.cell.modified.textModel.getTextBufferHash() !== this.cell.original.textModel.getTextBufferHash());
+
+		const ignoreWhitespace = NOTEBOOK_DIFF_CELL_IGNORE_WHITESPACE.bindTo(scopedContextKeyService);
+		const ignore = this.textConfigurationService.getValue<boolean>(this.cell.modified.uri, 'diffEditor.ignoreTrimWhitespace');
+		ignoreWhitespace.set(ignore);
 
-		this._inputToolbarContainer = this.templateData.inputToolbarContainer;
 		this._toolbar = this.templateData.toolbar;
 
-		this._toolbar.context = {
-			cell: this.cell
+		this._toolbar.context = this.cell;
+
+		const refreshToolbar = () => {
+			const ignore = this.textConfigurationService.getValue<boolean>(this.cell.modified.uri, 'diffEditor.ignoreTrimWhitespace');
+			ignoreWhitespace.set(ignore);
+			const hasChanges = this.cell.modified.textModel.getTextBufferHash() !== this.cell.original.textModel.getTextBufferHash();
+			inputChanged.set(hasChanges);
+
+			if (hasChanges) {
+				const actions: IAction[] = [];
+				const menu = this.menuService.getMenuActions(MenuId.NotebookDiffCellInputTitle, scopedContextKeyService, { shouldForwardArgs: true });
+				createAndFillInActionBarActions(menu, actions);
+				this._toolbar.setActions(actions);
+			} else {
+				this._toolbar.setActions([]);
+			}
 		};
 
-		if (this.cell.modified.textModel.getValue() !== this.cell.original.textModel.getValue()) {
-			this._inputToolbarContainer.style.display = 'block';
-			inputChanged.set(true);
-		} else {
-			this._inputToolbarContainer.style.display = 'none';
-			inputChanged.set(false);
-		}
-
-		this._register(this.cell.modified.textModel.onDidChangeContent(() => {
-			if (this.cell.modified.textModel.getValue() !== this.cell.original.textModel.getValue()) {
-				this._inputToolbarContainer.style.display = 'block';
-				inputChanged.set(true);
-			} else {
-				this._inputToolbarContainer.style.display = 'none';
-				inputChanged.set(false);
+		this._register(this.cell.modified.textModel.onDidChangeContent(() => refreshToolbar()));
+		this._register(this.textConfigurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(this.cell.modified.uri, 'diffEditor') &&
+				e.affectedKeys.has('diffEditor.ignoreTrimWhitespace')) {
+				refreshToolbar();
 			}
 		}));
-
-		const menu = this.menuService.createMenu(MenuId.NotebookDiffCellInputTitle, scopedContextKeyService);
-		const actions: IAction[] = [];
-		createAndFillInActionBarActions(menu, { shouldForwardArgs: true }, actions);
-		this._toolbar.setActions(actions);
-		menu.dispose();
+		refreshToolbar();
 	}
 
 	private async _initializeSourceDiffEditor() {
-		const originalCell = this.cell.original;
-		const modifiedCell = this.cell.modified;
-
-		const originalRef = await this.textModelService.createModelReference(originalCell.uri);
-		const modifiedRef = await this.textModelService.createModelReference(modifiedCell.uri);
-
-		if (this._isDisposed) {
-			return;
-		}
-
-		const textModel = originalRef.object.textEditorModel;
-		const modifiedTextModel = modifiedRef.object.textEditorModel;
+		const [originalRef, modifiedRef] = await Promise.all([
+			this.textModelService.createModelReference(this.cell.original.uri),
+			this.textModelService.createModelReference(this.cell.modified.uri)]);
 		this._register(originalRef);
 		this._register(modifiedRef);
 
-		this._editor!.setModel({
-			original: textModel,
-			modified: modifiedTextModel
-		});
+		if (this._isDisposed) {
+			originalRef.dispose();
+			modifiedRef.dispose();
+			return;
+		}
+
+		const vm = this._register(this._editor!.createViewModel({
+			original: originalRef.object.textEditorModel,
+			modified: modifiedRef.object.textEditorModel,
+		}));
+
+		// Reduces flicker (compute this before setting the model)
+		// Else when the model is set, the height of the editor will be x, after diff is computed, then height will be y.
+		// & that results in flicker.
+		await vm.waitForDiff();
+		this._editor!.setModel(vm);
 
 		const handleViewStateChange = () => {
 			this._editorViewStateChanged = true;
@@ -1582,6 +2015,7 @@ export class ModifiedElement extends AbstractElementRenderer {
 			}
 		};
 
+		this.updateEditorOptionsForWhitespace();
 		this._register(this._editor!.getOriginalEditor().onDidChangeCursorSelection(handleViewStateChange));
 		this._register(this._editor!.getOriginalEditor().onDidScrollChange(handleScrollChange));
 		this._register(this._editor!.getModifiedEditor().onDidChangeCursorSelection(handleViewStateChange));
@@ -1595,39 +2029,67 @@ export class ModifiedElement extends AbstractElementRenderer {
 		const contentHeight = this._editor!.getContentHeight();
 		this.cell.editorHeight = contentHeight;
 	}
+	private updateEditorOptionsForWhitespace() {
+		const editor = this._editor;
+		if (!editor) {
+			return;
+		}
+		const uri = editor.getModel()?.modified.uri || editor.getModel()?.original.uri;
+		if (!uri) {
+			return;
+		}
+		const ignoreTrimWhitespace = this.textConfigurationService.getValue<boolean>(uri, 'diffEditor.ignoreTrimWhitespace');
+		editor.updateOptions({ ignoreTrimWhitespace });
 
+		this._register(this.textConfigurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(uri, 'diffEditor') &&
+				e.affectedKeys.has('diffEditor.ignoreTrimWhitespace')) {
+				const ignoreTrimWhitespace = this.textConfigurationService.getValue<boolean>(uri, 'diffEditor.ignoreTrimWhitespace');
+				editor.updateOptions({ ignoreTrimWhitespace });
+			}
+		}));
+	}
 	layout(state: IDiffElementLayoutState) {
 		DOM.scheduleAtNextAnimationFrame(DOM.getWindow(this._diffEditorContainer), () => {
-			if (state.editorHeight) {
+			if (state.editorHeight && this._editor) {
 				this._editorContainer.style.height = `${this.cell.layoutInfo.editorHeight}px`;
-				this._editor!.layout({
+				this._editor.layout({
 					width: this._editor!.getViewWidth(),
 					height: this.cell.layoutInfo.editorHeight
 				});
 			}
 
-			if (state.outerWidth) {
+			if (state.outerWidth && this._editor) {
 				this._editorContainer.style.height = `${this.cell.layoutInfo.editorHeight}px`;
-				this._editor!.layout();
+				this._editor.layout();
 			}
 
 			if (state.metadataHeight || state.outerWidth) {
 				if (this._metadataEditorContainer) {
 					this._metadataEditorContainer.style.height = `${this.cell.layoutInfo.metadataHeight}px`;
-					this._metadataEditor?.layout();
+					this._metadataEditor?.layout({
+						width: this._editor?.getViewWidth() || this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), false, true),
+						height: this.cell.layoutInfo.metadataHeight
+					});
 				}
 			}
 
 			if (state.outputTotalHeight || state.outerWidth) {
 				if (this._outputEditorContainer) {
 					this._outputEditorContainer.style.height = `${this.cell.layoutInfo.outputTotalHeight}px`;
-					this._outputEditor?.layout();
+					this._outputEditor?.layout({
+						width: this._editor?.getViewWidth() || this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), false, true),
+						height: this.cell.layoutInfo.outputTotalHeight
+					});
 				}
 
 				if (this._outputMetadataContainer) {
 					this._outputMetadataContainer.style.height = `${this.cell.layoutInfo.outputMetadataHeight}px`;
 					this._outputMetadataContainer.style.top = `${this.cell.layoutInfo.outputTotalHeight - this.cell.layoutInfo.outputMetadataHeight}px`;
-					this._outputMetadataEditor?.layout();
+					this._outputMetadataEditor?.layout({
+						width: this._editor?.getViewWidth() || this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), false, true),
+						height: this.cell.layoutInfo.outputMetadataHeight
+					});
 				}
 			}
 
@@ -1636,6 +2098,12 @@ export class ModifiedElement extends AbstractElementRenderer {
 	}
 
 	override dispose() {
+		// The editor isn't disposed yet, it can be re-used.
+		// However the model can be disposed before the editor & that causes issues.
+		if (this._editor) {
+			this._editor.setModel(null);
+		}
+
 		if (this._editor && this._editorViewStateChanged) {
 			this.cell.saveSpirceEditorViewState(this._editor.saveViewState());
 		}
@@ -1643,3 +2111,83 @@ export class ModifiedElement extends AbstractElementRenderer {
 		super.dispose();
 	}
 }
+
+
+export class CollapsedCellOverlayWidget extends Disposable implements IDiffCellMarginOverlay {
+	private readonly _nodes = DOM.h('div.diff-hidden-cells', [
+		DOM.h('div.center@content', { style: { display: 'flex' } }, [
+			DOM.$('a', {
+				title: localize('showUnchangedCells', 'Show Unchanged Cells'),
+				role: 'button',
+				onclick: () => { this._action.fire(); }
+			},
+				...renderLabelWithIcons('$(unfold)'))]
+		),
+	]);
+
+	private readonly _action = this._register(new Emitter<void>());
+	public readonly onAction = this._action.event;
+	constructor(
+		private readonly container: HTMLElement
+	) {
+		super();
+
+		this._nodes.root.style.display = 'none';
+		container.appendChild(this._nodes.root);
+	}
+
+	public show() {
+		this._nodes.root.style.display = 'block';
+	}
+
+	public hide() {
+		this._nodes.root.style.display = 'none';
+	}
+
+	public override dispose() {
+		this.hide();
+		this.container.removeChild(this._nodes.root);
+		DOM.reset(this._nodes.root);
+		super.dispose();
+	}
+}
+
+export class UnchangedCellOverlayWidget extends Disposable implements IDiffCellMarginOverlay {
+	private readonly _nodes = DOM.h('div.diff-hidden-cells', [
+		DOM.h('div.center@content', { style: { display: 'flex' } }, [
+			DOM.$('a', {
+				title: localize('hideUnchangedCells', 'Hide Unchanged Cells'),
+				role: 'button',
+				onclick: () => { this._action.fire(); }
+			},
+				...renderLabelWithIcons('$(fold)')
+			),
+		]
+		),
+	]);
+
+	private readonly _action = this._register(new Emitter<void>());
+	public readonly onAction = this._action.event;
+	constructor(
+		private readonly container: HTMLElement
+	) {
+		super();
+
+		this._nodes.root.style.display = 'none';
+		container.appendChild(this._nodes.root);
+	}
+
+	public show() {
+		this._nodes.root.style.display = 'block';
+	}
+
+	public hide() {
+		this._nodes.root.style.display = 'none';
+	}
+	public override dispose() {
+		this.hide();
+		this.container.removeChild(this._nodes.root);
+		DOM.reset(this._nodes.root);
+		super.dispose();
+	}
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/diffElementOutputs.ts b/src/vs/workbench/contrib/notebook/browser/diff/diffElementOutputs.ts
index ea94a04d2ad..0120e349600 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/diffElementOutputs.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/diffElementOutputs.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import * as nls from 'vs/nls';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { DiffElementViewModelBase, SideBySideDiffElementViewModel } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
-import { DiffSide, INotebookTextDiffEditor } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
-import { ICellOutputViewModel, IInsetRenderOutput, RenderOutputType } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { NotebookCellOutputsSplice } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
-import { DiffNestedCellViewModel } from 'vs/workbench/contrib/notebook/browser/diff/diffNestedCellViewModel';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { mimetypeIcon } from 'vs/workbench/contrib/notebook/browser/notebookIcons';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
+import * as DOM from '../../../../../base/browser/dom.js';
+import * as nls from '../../../../../nls.js';
+import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { DiffElementCellViewModelBase, SideBySideDiffElementViewModel } from './diffElementViewModel.js';
+import { DiffSide, INotebookTextDiffEditor } from './notebookDiffEditorBrowser.js';
+import { ICellOutputViewModel, IInsetRenderOutput, RenderOutputType } from '../notebookBrowser.js';
+import { NotebookTextModel } from '../../common/model/notebookTextModel.js';
+import { NotebookCellOutputsSplice } from '../../common/notebookCommon.js';
+import { INotebookService } from '../../common/notebookService.js';
+import { DiffNestedCellViewModel } from './diffNestedCellViewModel.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { mimetypeIcon } from '../notebookIcons.js';
+import { StandardKeyboardEvent } from '../../../../../base/browser/keyboardEvent.js';
+import { KeyCode } from '../../../../../base/common/keyCodes.js';
+import { IQuickInputService, IQuickPickItem } from '../../../../../platform/quickinput/common/quickInput.js';
 
 interface IMimeTypeRenderer extends IQuickPickItem {
 	index: number;
@@ -33,7 +33,7 @@ export class OutputElement extends Disposable {
 		private _notebookTextModel: NotebookTextModel,
 		private _notebookService: INotebookService,
 		private _quickInputService: IQuickInputService,
-		private _diffElementViewModel: DiffElementViewModelBase,
+		private _diffElementViewModel: DiffElementCellViewModelBase,
 		private _diffSide: DiffSide,
 		private _nestedCell: DiffNestedCellViewModel,
 		private _outputContainer: HTMLElement,
@@ -47,7 +47,7 @@ export class OutputElement extends Disposable {
 		let result: IInsetRenderOutput | undefined = undefined;
 
 		const [mimeTypes, pick] = this.output.resolveMimeTypes(this._notebookTextModel, undefined);
-		const pickedMimeTypeRenderer = mimeTypes[pick];
+		const pickedMimeTypeRenderer = this.output.pickedMimeType || mimeTypes[pick];
 		if (mimeTypes.length > 1) {
 			outputItemDiv.style.position = 'relative';
 			const mimeTypePicker = DOM.$('.multi-mimetype-output');
@@ -155,7 +155,8 @@ export class OutputElement extends Disposable {
 			description: index === currIndex ? nls.localize('curruentActiveMimeType', "Currently Active") : undefined
 		}));
 
-		const picker = this._quickInputService.createQuickPick();
+		const disposables = new DisposableStore();
+		const picker = disposables.add(this._quickInputService.createQuickPick());
 		picker.items = items;
 		picker.activeItems = items.filter(item => !!item.picked);
 		picker.placeholder = items.length !== mimeTypes.length
@@ -163,10 +164,10 @@ export class OutputElement extends Disposable {
 			: nls.localize('promptChooseMimeType.placeHolder', "Select mimetype to render for current output");
 
 		const pick = await new Promise<number | undefined>(resolve => {
-			picker.onDidAccept(() => {
+			disposables.add(picker.onDidAccept(() => {
 				resolve(picker.selectedItems.length === 1 ? (picker.selectedItems[0] as IMimeTypeRenderer).index : undefined);
-				picker.dispose();
-			});
+				disposables.dispose();
+			}));
 			picker.show();
 		});
 
@@ -228,7 +229,7 @@ export class OutputContainer extends Disposable {
 	constructor(
 		private _editor: INotebookTextDiffEditor,
 		private _notebookTextModel: NotebookTextModel,
-		private _diffElementViewModel: DiffElementViewModelBase,
+		private _diffElementViewModel: DiffElementCellViewModelBase,
 		private _nestedCellViewModel: DiffNestedCellViewModel,
 		private _diffSide: DiffSide,
 		private _outputContainer: HTMLElement,
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/diffElementViewModel.ts b/src/vs/workbench/contrib/notebook/browser/diff/diffElementViewModel.ts
index fd3336fc32b..57567d1ccf0 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/diffElementViewModel.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/diffElementViewModel.ts
@@ -3,22 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { hash } from 'vs/base/common/hash';
-import { toFormattedString } from 'vs/base/common/jsonFormatter';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditor/diffEditorWidget';
-import { FontInfo } from 'vs/editor/common/config/fontInfo';
-import * as editorCommon from 'vs/editor/common/editorCommon';
-import { fixedEditorPadding } from 'vs/workbench/contrib/notebook/browser/diff/diffCellEditorOptions';
-import { DiffNestedCellViewModel } from 'vs/workbench/contrib/notebook/browser/diff/diffNestedCellViewModel';
-import { NotebookDiffEditorEventDispatcher, NotebookDiffViewEventType } from 'vs/workbench/contrib/notebook/browser/diff/eventDispatcher';
-import { CellDiffViewModelLayoutChangeEvent, DIFF_CELL_MARGIN, DiffSide, IDiffElementLayoutInfo } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
-import { CellLayoutState, IGenericCellViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NotebookLayoutInfo } from 'vs/workbench/contrib/notebook/browser/notebookViewEvents';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { ICellOutput, INotebookTextModel, IOutputDto, IOutputItemDto, NotebookCellMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { Emitter } from '../../../../../base/common/event.js';
+import { hash } from '../../../../../base/common/hash.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { DiffEditorWidget } from '../../../../../editor/browser/widget/diffEditor/diffEditorWidget.js';
+import { FontInfo } from '../../../../../editor/common/config/fontInfo.js';
+import * as editorCommon from '../../../../../editor/common/editorCommon.js';
+import { getEditorPadding } from './diffCellEditorOptions.js';
+import { DiffNestedCellViewModel } from './diffNestedCellViewModel.js';
+import { NotebookDiffEditorEventDispatcher, NotebookDiffViewEventType } from './eventDispatcher.js';
+import { CellDiffViewModelLayoutChangeEvent, DIFF_CELL_MARGIN, DiffSide, IDiffElementLayoutInfo } from './notebookDiffEditorBrowser.js';
+import { CellLayoutState, IGenericCellViewModel } from '../notebookBrowser.js';
+import { NotebookLayoutInfo } from '../notebookViewEvents.js';
+import { getFormattedMetadataJSON, NotebookCellTextModel } from '../../common/model/notebookCellTextModel.js';
+import { NotebookTextModel } from '../../common/model/notebookTextModel.js';
+import { CellUri, ICellOutput, INotebookTextModel, IOutputDto, IOutputItemDto } from '../../common/notebookCommon.js';
+import { INotebookService } from '../../common/notebookService.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { IDiffEditorHeightCalculatorService } from './editorHeightCalculator.js';
+import { NotebookDocumentMetadataTextModel } from '../../common/model/notebookMetadataTextModel.js';
+
+const PropertyHeaderHeight = 25;
+
+// From `.monaco-editor .diff-hidden-lines .center` in src/vs/editor/browser/widget/diffEditor/style.css
+export const HeightOfHiddenLinesRegionInDiffEditor = 24;
+
+export const DefaultLineHeight = 17;
 
 export enum PropertyFoldingState {
 	Expanded,
@@ -33,15 +45,279 @@ interface ILayoutInfoDelta extends ILayoutInfoDelta0 {
 	recomputeOutput?: boolean;
 }
 
+export type IDiffElementViewModelBase = DiffElementCellViewModelBase | DiffElementPlaceholderViewModel | NotebookDocumentMetadataViewModel;
+
 export abstract class DiffElementViewModelBase extends Disposable {
-	public metadataFoldingState: PropertyFoldingState;
-	public outputFoldingState: PropertyFoldingState;
 	protected _layoutInfoEmitter = this._register(new Emitter<CellDiffViewModelLayoutChangeEvent>());
 	onDidLayoutChange = this._layoutInfoEmitter.event;
+	abstract renderOutput: boolean;
+	constructor(
+		public readonly mainDocumentTextModel: INotebookTextModel,
+		public readonly editorEventDispatcher: NotebookDiffEditorEventDispatcher,
+		public readonly initData: {
+			metadataStatusHeight: number;
+			outputStatusHeight: number;
+			fontInfo: FontInfo | undefined;
+		}
+	) {
+		super();
+
+		this._register(this.editorEventDispatcher.onDidChangeLayout(e => this._layoutInfoEmitter.fire({ outerWidth: true })));
+	}
+
+	abstract layoutChange(): void;
+	abstract getHeight(lineHeight: number): number;
+	abstract get totalHeight(): number;
+}
+
+export class DiffElementPlaceholderViewModel extends DiffElementViewModelBase {
+	readonly type: 'placeholder' = 'placeholder';
+	public hiddenCells: DiffElementCellViewModelBase[] = [];
+	protected _unfoldHiddenCells = this._register(new Emitter<void>());
+	onUnfoldHiddenCells = this._unfoldHiddenCells.event;
+
+	public renderOutput: boolean = false;
+	constructor(
+		mainDocumentTextModel: INotebookTextModel,
+		editorEventDispatcher: NotebookDiffEditorEventDispatcher,
+		initData: {
+			metadataStatusHeight: number;
+			outputStatusHeight: number;
+			fontInfo: FontInfo | undefined;
+		}
+	) {
+		super(mainDocumentTextModel, editorEventDispatcher, initData);
+
+	}
+	get totalHeight() {
+		return 24 + (2 * DIFF_CELL_MARGIN);
+	}
+	getHeight(_: number): number {
+		return this.totalHeight;
+	}
+	override layoutChange(): void {
+		//
+	}
+	showHiddenCells() {
+		this._unfoldHiddenCells.fire();
+	}
+}
+
+
+export class NotebookDocumentMetadataViewModel extends DiffElementViewModelBase {
+	public readonly originalMetadata: NotebookDocumentMetadataTextModel;
+	public readonly modifiedMetadata: NotebookDocumentMetadataTextModel;
+	public cellFoldingState: PropertyFoldingState;
+	protected _layoutInfo!: IDiffElementLayoutInfo;
+	public renderOutput: boolean = false;
+	set editorHeight(height: number) {
+		this._layout({ editorHeight: height });
+	}
+
+	get editorHeight() {
+		throw new Error('Use Cell.layoutInfo.editorHeight');
+	}
+
+	set editorMargin(margin: number) {
+		this._layout({ editorMargin: margin });
+	}
+
+	get editorMargin() {
+		throw new Error('Use Cell.layoutInfo.editorMargin');
+	}
+	get layoutInfo(): IDiffElementLayoutInfo {
+		return this._layoutInfo;
+	}
+
+	get totalHeight() {
+		return this.layoutInfo.totalHeight;
+	}
+
+	private _sourceEditorViewState: editorCommon.ICodeEditorViewState | editorCommon.IDiffEditorViewState | null = null;
+	constructor(
+		public readonly originalDocumentTextModel: INotebookTextModel,
+		public readonly modifiedDocumentTextModel: INotebookTextModel,
+		public readonly type: 'unchangedMetadata' | 'modifiedMetadata',
+		editorEventDispatcher: NotebookDiffEditorEventDispatcher,
+		initData: {
+			metadataStatusHeight: number;
+			outputStatusHeight: number;
+			fontInfo: FontInfo | undefined;
+		},
+		notebookService: INotebookService,
+		private readonly editorHeightCalculator: IDiffEditorHeightCalculatorService
+	) {
+		super(originalDocumentTextModel, editorEventDispatcher, initData);
+
+		const cellStatusHeight = PropertyHeaderHeight;
+		this._layoutInfo = {
+			width: 0,
+			editorHeight: 0,
+			editorMargin: 0,
+			metadataHeight: 0,
+			cellStatusHeight,
+			metadataStatusHeight: 0,
+			rawOutputHeight: 0,
+			outputTotalHeight: 0,
+			outputStatusHeight: 0,
+			outputMetadataHeight: 0,
+			bodyMargin: 32,
+			totalHeight: 82 + cellStatusHeight + 0,
+			layoutState: CellLayoutState.Uninitialized
+		};
+
+		this.cellFoldingState = type === 'modifiedMetadata' ? PropertyFoldingState.Expanded : PropertyFoldingState.Collapsed;
+		this.originalMetadata = this._register(new NotebookDocumentMetadataTextModel(originalDocumentTextModel));
+		this.modifiedMetadata = this._register(new NotebookDocumentMetadataTextModel(modifiedDocumentTextModel));
+	}
+
+	public async computeHeights() {
+		if (this.type === 'unchangedMetadata') {
+			this.editorHeight = this.editorHeightCalculator.computeHeightFromLines(this.originalMetadata.textBuffer.getLineCount());
+		} else {
+			const original = this.originalMetadata.uri;
+			const modified = this.modifiedMetadata.uri;
+			this.editorHeight = await this.editorHeightCalculator.diffAndComputeHeight(original, modified);
+		}
+	}
+
+	layoutChange() {
+		this._layout({ recomputeOutput: true });
+	}
+
+	protected _layout(delta: ILayoutInfoDelta) {
+		const width = delta.width !== undefined ? delta.width : this._layoutInfo.width;
+		const editorHeight = delta.editorHeight !== undefined ? delta.editorHeight : this._layoutInfo.editorHeight;
+		const editorMargin = delta.editorMargin !== undefined ? delta.editorMargin : this._layoutInfo.editorMargin;
+		const cellStatusHeight = delta.cellStatusHeight !== undefined ? delta.cellStatusHeight : this._layoutInfo.cellStatusHeight;
+		const bodyMargin = delta.bodyMargin !== undefined ? delta.bodyMargin : this._layoutInfo.bodyMargin;
+
+		const totalHeight = editorHeight
+			+ editorMargin
+			+ cellStatusHeight
+			+ bodyMargin;
+
+		const newLayout: IDiffElementLayoutInfo = {
+			width: width,
+			editorHeight: editorHeight,
+			editorMargin: editorMargin,
+			metadataHeight: 0,
+			cellStatusHeight,
+			metadataStatusHeight: 0,
+			outputTotalHeight: 0,
+			outputStatusHeight: 0,
+			bodyMargin: bodyMargin,
+			rawOutputHeight: 0,
+			outputMetadataHeight: 0,
+			totalHeight: totalHeight,
+			layoutState: CellLayoutState.Measured
+		};
+
+		let somethingChanged = false;
+
+		const changeEvent: CellDiffViewModelLayoutChangeEvent = {};
+
+		if (newLayout.width !== this._layoutInfo.width) {
+			changeEvent.width = true;
+			somethingChanged = true;
+		}
+
+		if (newLayout.editorHeight !== this._layoutInfo.editorHeight) {
+			changeEvent.editorHeight = true;
+			somethingChanged = true;
+		}
+
+		if (newLayout.editorMargin !== this._layoutInfo.editorMargin) {
+			changeEvent.editorMargin = true;
+			somethingChanged = true;
+		}
+
+		if (newLayout.cellStatusHeight !== this._layoutInfo.cellStatusHeight) {
+			changeEvent.cellStatusHeight = true;
+			somethingChanged = true;
+		}
+
+		if (newLayout.bodyMargin !== this._layoutInfo.bodyMargin) {
+			changeEvent.bodyMargin = true;
+			somethingChanged = true;
+		}
+
+		if (newLayout.totalHeight !== this._layoutInfo.totalHeight) {
+			changeEvent.totalHeight = true;
+			somethingChanged = true;
+		}
+
+		if (somethingChanged) {
+			this._layoutInfo = newLayout;
+			this._fireLayoutChangeEvent(changeEvent);
+		}
+	}
+
+	getHeight(lineHeight: number) {
+		if (this._layoutInfo.layoutState === CellLayoutState.Uninitialized) {
+			const editorHeight = this.cellFoldingState === PropertyFoldingState.Collapsed ? 0 : this.computeInputEditorHeight(lineHeight);
+			return this._computeTotalHeight(editorHeight);
+		} else {
+			return this._layoutInfo.totalHeight;
+		}
+	}
+
+	private _computeTotalHeight(editorHeight: number) {
+		const totalHeight = editorHeight
+			+ this._layoutInfo.editorMargin
+			+ this._layoutInfo.metadataHeight
+			+ this._layoutInfo.cellStatusHeight
+			+ this._layoutInfo.metadataStatusHeight
+			+ this._layoutInfo.outputTotalHeight
+			+ this._layoutInfo.outputStatusHeight
+			+ this._layoutInfo.outputMetadataHeight
+			+ this._layoutInfo.bodyMargin;
+
+		return totalHeight;
+	}
+
+	public computeInputEditorHeight(_lineHeight: number): number {
+		return this.editorHeightCalculator.computeHeightFromLines(Math.max(this.originalMetadata.textBuffer.getLineCount(), this.modifiedMetadata.textBuffer.getLineCount()));
+	}
+
+	private _fireLayoutChangeEvent(state: CellDiffViewModelLayoutChangeEvent) {
+		this._layoutInfoEmitter.fire(state);
+		this.editorEventDispatcher.emit([{ type: NotebookDiffViewEventType.CellLayoutChanged, source: this._layoutInfo }]);
+	}
+
+	getComputedCellContainerWidth(layoutInfo: NotebookLayoutInfo, diffEditor: boolean, fullWidth: boolean) {
+		if (fullWidth) {
+			return layoutInfo.width - 2 * DIFF_CELL_MARGIN + (diffEditor ? DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH : 0) - 2;
+		}
+
+		return (layoutInfo.width - 2 * DIFF_CELL_MARGIN + (diffEditor ? DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH : 0)) / 2 - 18 - 2;
+	}
+
+	getSourceEditorViewState(): editorCommon.ICodeEditorViewState | editorCommon.IDiffEditorViewState | null {
+		return this._sourceEditorViewState;
+	}
+
+	saveSpirceEditorViewState(viewState: editorCommon.ICodeEditorViewState | editorCommon.IDiffEditorViewState | null) {
+		this._sourceEditorViewState = viewState;
+	}
+}
+
+
+export abstract class DiffElementCellViewModelBase extends DiffElementViewModelBase {
+	public cellFoldingState: PropertyFoldingState;
+	public metadataFoldingState: PropertyFoldingState;
+	public outputFoldingState: PropertyFoldingState;
 	protected _stateChangeEmitter = this._register(new Emitter<{ renderOutput: boolean }>());
 	onDidStateChange = this._stateChangeEmitter.event;
 	protected _layoutInfo!: IDiffElementLayoutInfo;
 
+	public displayIconToHideUnmodifiedCells?: boolean;
+	private _hideUnchangedCells = this._register(new Emitter<void>());
+	public onHideUnchangedCells = this._hideUnchangedCells.event;
+
+	hideUnchangedCells() {
+		this._hideUnchangedCells.fire();
+	}
 	set rawOutputHeight(height: number) {
 		this._layout({ rawOutputHeight: Math.min(OUTPUT_EDITOR_HEIGHT_MAGIC, height) });
 	}
@@ -114,45 +390,64 @@ export abstract class DiffElementViewModelBase extends Disposable {
 		return this._layoutInfo;
 	}
 
+	get totalHeight() {
+		return this.layoutInfo.totalHeight;
+	}
+
+	private get ignoreOutputs() {
+		return this.configurationService.getValue<boolean>('notebook.diff.ignoreOutputs') || !!(this.mainDocumentTextModel?.transientOptions.transientOutputs);
+	}
+
+	private get ignoreMetadata() {
+		return this.configurationService.getValue<boolean>('notebook.diff.ignoreMetadata');
+	}
+
 	private _sourceEditorViewState: editorCommon.ICodeEditorViewState | editorCommon.IDiffEditorViewState | null = null;
 	private _outputEditorViewState: editorCommon.ICodeEditorViewState | editorCommon.IDiffEditorViewState | null = null;
 	private _metadataEditorViewState: editorCommon.ICodeEditorViewState | editorCommon.IDiffEditorViewState | null = null;
+	public readonly original: DiffNestedCellViewModel | undefined;
 
+	public readonly modified: DiffNestedCellViewModel | undefined;
 	constructor(
-		readonly mainDocumentTextModel: INotebookTextModel,
-		readonly original: DiffNestedCellViewModel | undefined,
-		readonly modified: DiffNestedCellViewModel | undefined,
+		mainDocumentTextModel: INotebookTextModel,
+		original: NotebookCellTextModel | undefined,
+		modified: NotebookCellTextModel | undefined,
 		readonly type: 'unchanged' | 'insert' | 'delete' | 'modified',
-		readonly editorEventDispatcher: NotebookDiffEditorEventDispatcher,
-		readonly initData: {
+		editorEventDispatcher: NotebookDiffEditorEventDispatcher,
+		initData: {
 			metadataStatusHeight: number;
 			outputStatusHeight: number;
 			fontInfo: FontInfo | undefined;
-		}
+		},
+		notebookService: INotebookService,
+		public readonly index: number,
+		private readonly configurationService: IConfigurationService,
+		public readonly diffEditorHeightCalculator: IDiffEditorHeightCalculatorService
 	) {
-		super();
+		super(mainDocumentTextModel, editorEventDispatcher, initData);
+		this.original = original ? this._register(new DiffNestedCellViewModel(original, notebookService)) : undefined;
+		this.modified = modified ? this._register(new DiffNestedCellViewModel(modified, notebookService)) : undefined;
 		const editorHeight = this._estimateEditorHeight(initData.fontInfo);
+		const cellStatusHeight = PropertyHeaderHeight;
 		this._layoutInfo = {
 			width: 0,
 			editorHeight: editorHeight,
 			editorMargin: 0,
 			metadataHeight: 0,
-			metadataStatusHeight: 25,
+			cellStatusHeight,
+			metadataStatusHeight: this.ignoreMetadata ? 0 : PropertyHeaderHeight,
 			rawOutputHeight: 0,
 			outputTotalHeight: 0,
-			outputStatusHeight: 25,
+			outputStatusHeight: this.ignoreOutputs ? 0 : PropertyHeaderHeight,
 			outputMetadataHeight: 0,
 			bodyMargin: 32,
-			totalHeight: 82 + editorHeight,
+			totalHeight: 82 + cellStatusHeight + editorHeight,
 			layoutState: CellLayoutState.Uninitialized
 		};
 
+		this.cellFoldingState = modified?.getTextBufferHash() !== original?.getTextBufferHash() ? PropertyFoldingState.Expanded : PropertyFoldingState.Collapsed;
 		this.metadataFoldingState = PropertyFoldingState.Collapsed;
 		this.outputFoldingState = PropertyFoldingState.Collapsed;
-
-		this._register(this.editorEventDispatcher.onDidChangeLayout(e => {
-			this._layoutInfoEmitter.fire({ outerWidth: true });
-		}));
 	}
 
 	layoutChange() {
@@ -167,14 +462,14 @@ export abstract class DiffElementViewModelBase extends Disposable {
 			case 'insert':
 				{
 					const lineCount = this.modified!.textModel.textBuffer.getLineCount();
-					const editorHeight = lineCount * lineHeight + fixedEditorPadding.top + fixedEditorPadding.bottom;
+					const editorHeight = lineCount * lineHeight + getEditorPadding(lineCount).top + getEditorPadding(lineCount).bottom;
 					return editorHeight;
 				}
 			case 'delete':
 			case 'modified':
 				{
 					const lineCount = this.original!.textModel.textBuffer.getLineCount();
-					const editorHeight = lineCount * lineHeight + fixedEditorPadding.top + fixedEditorPadding.bottom;
+					const editorHeight = lineCount * lineHeight + getEditorPadding(lineCount).top + getEditorPadding(lineCount).bottom;
 					return editorHeight;
 				}
 		}
@@ -185,15 +480,17 @@ export abstract class DiffElementViewModelBase extends Disposable {
 		const editorHeight = delta.editorHeight !== undefined ? delta.editorHeight : this._layoutInfo.editorHeight;
 		const editorMargin = delta.editorMargin !== undefined ? delta.editorMargin : this._layoutInfo.editorMargin;
 		const metadataHeight = delta.metadataHeight !== undefined ? delta.metadataHeight : this._layoutInfo.metadataHeight;
+		const cellStatusHeight = delta.cellStatusHeight !== undefined ? delta.cellStatusHeight : this._layoutInfo.cellStatusHeight;
 		const metadataStatusHeight = delta.metadataStatusHeight !== undefined ? delta.metadataStatusHeight : this._layoutInfo.metadataStatusHeight;
 		const rawOutputHeight = delta.rawOutputHeight !== undefined ? delta.rawOutputHeight : this._layoutInfo.rawOutputHeight;
 		const outputStatusHeight = delta.outputStatusHeight !== undefined ? delta.outputStatusHeight : this._layoutInfo.outputStatusHeight;
 		const bodyMargin = delta.bodyMargin !== undefined ? delta.bodyMargin : this._layoutInfo.bodyMargin;
 		const outputMetadataHeight = delta.outputMetadataHeight !== undefined ? delta.outputMetadataHeight : this._layoutInfo.outputMetadataHeight;
-		const outputHeight = (delta.recomputeOutput || delta.rawOutputHeight !== undefined || delta.outputMetadataHeight !== undefined) ? this._getOutputTotalHeight(rawOutputHeight, outputMetadataHeight) : this._layoutInfo.outputTotalHeight;
+		const outputHeight = this.ignoreOutputs ? 0 : (delta.recomputeOutput || delta.rawOutputHeight !== undefined || delta.outputMetadataHeight !== undefined) ? this._getOutputTotalHeight(rawOutputHeight, outputMetadataHeight) : this._layoutInfo.outputTotalHeight;
 
 		const totalHeight = editorHeight
 			+ editorMargin
+			+ cellStatusHeight
 			+ metadataHeight
 			+ metadataStatusHeight
 			+ outputHeight
@@ -205,6 +502,7 @@ export abstract class DiffElementViewModelBase extends Disposable {
 			editorHeight: editorHeight,
 			editorMargin: editorMargin,
 			metadataHeight: metadataHeight,
+			cellStatusHeight,
 			metadataStatusHeight: metadataStatusHeight,
 			outputTotalHeight: outputHeight,
 			outputStatusHeight: outputStatusHeight,
@@ -239,6 +537,11 @@ export abstract class DiffElementViewModelBase extends Disposable {
 			somethingChanged = true;
 		}
 
+		if (newLayout.cellStatusHeight !== this._layoutInfo.cellStatusHeight) {
+			changeEvent.cellStatusHeight = true;
+			somethingChanged = true;
+		}
+
 		if (newLayout.metadataStatusHeight !== this._layoutInfo.metadataStatusHeight) {
 			changeEvent.metadataStatusHeight = true;
 			somethingChanged = true;
@@ -277,7 +580,7 @@ export abstract class DiffElementViewModelBase extends Disposable {
 
 	getHeight(lineHeight: number) {
 		if (this._layoutInfo.layoutState === CellLayoutState.Uninitialized) {
-			const editorHeight = this.estimateEditorHeight(lineHeight);
+			const editorHeight = this.cellFoldingState === PropertyFoldingState.Collapsed ? 0 : this.computeInputEditorHeight(lineHeight);
 			return this._computeTotalHeight(editorHeight);
 		} else {
 			return this._layoutInfo.totalHeight;
@@ -288,6 +591,7 @@ export abstract class DiffElementViewModelBase extends Disposable {
 		const totalHeight = editorHeight
 			+ this._layoutInfo.editorMargin
 			+ this._layoutInfo.metadataHeight
+			+ this._layoutInfo.cellStatusHeight
 			+ this._layoutInfo.metadataStatusHeight
 			+ this._layoutInfo.outputTotalHeight
 			+ this._layoutInfo.outputStatusHeight
@@ -297,15 +601,9 @@ export abstract class DiffElementViewModelBase extends Disposable {
 		return totalHeight;
 	}
 
-	private estimateEditorHeight(lineHeight: number | undefined = 20): number {
-		const hasScrolling = false;
-		const verticalScrollbarHeight = hasScrolling ? 12 : 0; // take zoom level into account
-		// const editorPadding = this.viewContext.notebookOptions.computeEditorPadding(this.internalMetadata);
+	public computeInputEditorHeight(lineHeight: number): number {
 		const lineCount = Math.max(this.original?.textModel.textBuffer.getLineCount() ?? 1, this.modified?.textModel.textBuffer.getLineCount() ?? 1);
-		return lineCount * lineHeight
-			+ 24 // Top padding
-			+ 12 // Bottom padding
-			+ verticalScrollbarHeight;
+		return this.diffEditorHeightCalculator.computeHeightFromLines(lineCount);
 	}
 
 	private _getOutputTotalHeight(rawOutputHeight: number, metadataHeight: number) {
@@ -329,6 +627,7 @@ export abstract class DiffElementViewModelBase extends Disposable {
 		this.editorEventDispatcher.emit([{ type: NotebookDiffViewEventType.CellLayoutChanged, source: this._layoutInfo }]);
 	}
 
+	abstract checkIfInputModified(): false | { reason: string | undefined };
 	abstract checkIfOutputsModified(): false | { reason: string | undefined };
 	abstract checkMetadataIfModified(): false | { reason: string | undefined };
 	abstract isOutputEmpty(): boolean;
@@ -372,7 +671,7 @@ export abstract class DiffElementViewModelBase extends Disposable {
 	}
 }
 
-export class SideBySideDiffElementViewModel extends DiffElementViewModelBase {
+export class SideBySideDiffElementViewModel extends DiffElementCellViewModelBase {
 	get originalDocument() {
 		return this.otherDocumentTextModel;
 	}
@@ -381,22 +680,30 @@ export class SideBySideDiffElementViewModel extends DiffElementViewModelBase {
 		return this.mainDocumentTextModel;
 	}
 
-	override readonly original: DiffNestedCellViewModel;
-	override readonly modified: DiffNestedCellViewModel;
+	override readonly original!: DiffNestedCellViewModel;
+	override readonly modified!: DiffNestedCellViewModel;
 	override readonly type: 'unchanged' | 'modified';
 
+	/**
+	 * The height of the editor when the unchanged lines are collapsed.
+	 */
+	private editorHeightWithUnchangedLinesCollapsed?: number;
 	constructor(
 		mainDocumentTextModel: NotebookTextModel,
 		readonly otherDocumentTextModel: NotebookTextModel,
-		original: DiffNestedCellViewModel,
-		modified: DiffNestedCellViewModel,
+		original: NotebookCellTextModel,
+		modified: NotebookCellTextModel,
 		type: 'unchanged' | 'modified',
 		editorEventDispatcher: NotebookDiffEditorEventDispatcher,
 		initData: {
 			metadataStatusHeight: number;
 			outputStatusHeight: number;
 			fontInfo: FontInfo | undefined;
-		}
+		},
+		notebookService: INotebookService,
+		configurationService: IConfigurationService,
+		index: number,
+		diffEditorHeightCalculator: IDiffEditorHeightCalculatorService
 	) {
 		super(
 			mainDocumentTextModel,
@@ -404,12 +711,15 @@ export class SideBySideDiffElementViewModel extends DiffElementViewModelBase {
 			modified,
 			type,
 			editorEventDispatcher,
-			initData);
+			initData,
+			notebookService,
+			index,
+			configurationService,
+			diffEditorHeightCalculator);
 
-		this.original = original;
-		this.modified = modified;
 		this.type = type;
 
+		this.cellFoldingState = this.modified.textModel.getValue() !== this.original.textModel.getValue() ? PropertyFoldingState.Expanded : PropertyFoldingState.Collapsed;
 		this.metadataFoldingState = PropertyFoldingState.Collapsed;
 		this.outputFoldingState = PropertyFoldingState.Collapsed;
 
@@ -435,7 +745,9 @@ export class SideBySideDiffElementViewModel extends DiffElementViewModelBase {
 				const modifiedMedataRaw = Object.assign({}, this.modified.metadata);
 				const originalCellMetadata = this.original.metadata;
 				for (const key of cellMetadataKeys) {
-					modifiedMedataRaw[key] = originalCellMetadata[key];
+					if (key in originalCellMetadata) {
+						modifiedMedataRaw[key] = originalCellMetadata[key];
+					}
 				}
 
 				this.modified.textModel.metadata = modifiedMedataRaw;
@@ -443,6 +755,14 @@ export class SideBySideDiffElementViewModel extends DiffElementViewModelBase {
 		}));
 	}
 
+	override checkIfInputModified(): false | { reason: string | undefined } {
+		if (this.original.textModel.getTextBufferHash() === this.modified.textModel.getTextBufferHash()) {
+			return false;
+		}
+		return {
+			reason: 'Cell content has changed',
+		};
+	}
 	checkIfOutputsModified() {
 		if (this.mainDocumentTextModel.transientOptions.transientOutputs) {
 			return false;
@@ -455,13 +775,13 @@ export class SideBySideDiffElementViewModel extends DiffElementViewModelBase {
 		}
 
 		return {
-			reason: ret === OutputComparison.Metadata ? 'Output metadata is changed' : undefined,
+			reason: ret === OutputComparison.Metadata ? 'Output metadata has changed' : undefined,
 			kind: ret
 		};
 	}
 
 	checkMetadataIfModified() {
-		const modified = hash(getFormattedMetadataJSON(this.mainDocumentTextModel, this.original?.metadata || {}, this.original?.language)) !== hash(getFormattedMetadataJSON(this.mainDocumentTextModel, this.modified?.metadata ?? {}, this.modified?.language));
+		const modified = hash(getFormattedMetadataJSON(this.mainDocumentTextModel.transientOptions.transientCellMetadata, this.original?.metadata || {}, this.original?.language)) !== hash(getFormattedMetadataJSON(this.mainDocumentTextModel.transientOptions.transientCellMetadata, this.modified?.metadata ?? {}, this.modified?.language));
 		if (modified) {
 			return { reason: undefined };
 		} else {
@@ -491,6 +811,7 @@ export class SideBySideDiffElementViewModel extends DiffElementViewModelBase {
 		return this._layoutInfo.editorHeight
 			+ this._layoutInfo.editorMargin
 			+ this._layoutInfo.metadataHeight
+			+ this._layoutInfo.cellStatusHeight
 			+ this._layoutInfo.metadataStatusHeight
 			+ this._layoutInfo.outputStatusHeight
 			+ this._layoutInfo.bodyMargin / 2
@@ -526,9 +847,42 @@ export class SideBySideDiffElementViewModel extends DiffElementViewModelBase {
 			return this.modified;
 		}
 	}
+
+	public override computeInputEditorHeight(lineHeight: number): number {
+		if (this.type === 'modified' &&
+			typeof this.editorHeightWithUnchangedLinesCollapsed === 'number' &&
+			this.checkIfInputModified()) {
+			return this.editorHeightWithUnchangedLinesCollapsed;
+		}
+
+		return super.computeInputEditorHeight(lineHeight);
+	}
+
+	private async computeModifiedInputEditorHeight() {
+		if (this.checkIfInputModified()) {
+			this.editorHeightWithUnchangedLinesCollapsed = this._layoutInfo.editorHeight = await this.diffEditorHeightCalculator.diffAndComputeHeight(this.original.uri, this.modified.uri);
+		}
+	}
+
+	private async computeModifiedMetadataEditorHeight() {
+		if (this.checkMetadataIfModified()) {
+			const originalMetadataUri = CellUri.generateCellPropertyUri(this.originalDocument.uri, this.original.handle, Schemas.vscodeNotebookCellMetadata);
+			const modifiedMetadataUri = CellUri.generateCellPropertyUri(this.modifiedDocument.uri, this.modified.handle, Schemas.vscodeNotebookCellMetadata);
+			this._layoutInfo.metadataHeight = await this.diffEditorHeightCalculator.diffAndComputeHeight(originalMetadataUri, modifiedMetadataUri);
+		}
+	}
+
+	public async computeEditorHeights() {
+		if (this.type === 'unchanged') {
+			return;
+		}
+
+		await Promise.all([this.computeModifiedInputEditorHeight(), this.computeModifiedMetadataEditorHeight()]);
+	}
+
 }
 
-export class SingleSideDiffElementViewModel extends DiffElementViewModelBase {
+export class SingleSideDiffElementViewModel extends DiffElementCellViewModelBase {
 	get cellViewModel() {
 		return this.type === 'insert' ? this.modified! : this.original!;
 	}
@@ -554,17 +908,21 @@ export class SingleSideDiffElementViewModel extends DiffElementViewModelBase {
 	constructor(
 		mainDocumentTextModel: NotebookTextModel,
 		readonly otherDocumentTextModel: NotebookTextModel,
-		original: DiffNestedCellViewModel | undefined,
-		modified: DiffNestedCellViewModel | undefined,
+		original: NotebookCellTextModel | undefined,
+		modified: NotebookCellTextModel | undefined,
 		type: 'insert' | 'delete',
 		editorEventDispatcher: NotebookDiffEditorEventDispatcher,
 		initData: {
 			metadataStatusHeight: number;
 			outputStatusHeight: number;
 			fontInfo: FontInfo | undefined;
-		}
+		},
+		notebookService: INotebookService,
+		configurationService: IConfigurationService,
+		diffEditorHeightCalculator: IDiffEditorHeightCalculatorService,
+		index: number
 	) {
-		super(mainDocumentTextModel, original, modified, type, editorEventDispatcher, initData);
+		super(mainDocumentTextModel, original, modified, type, editorEventDispatcher, initData, notebookService, index, configurationService, diffEditorHeightCalculator);
 		this.type = type;
 
 		this._register(this.cellViewModel.onDidChangeOutputLayout(() => {
@@ -572,6 +930,12 @@ export class SingleSideDiffElementViewModel extends DiffElementViewModelBase {
 		}));
 	}
 
+	override checkIfInputModified(): false | { reason: string | undefined } {
+		return {
+			reason: 'Cell content has changed',
+		};
+	}
+
 	getNestedCellViewModel(diffSide: DiffSide): DiffNestedCellViewModel {
 		return this.type === 'insert' ? this.modified! : this.original!;
 	}
@@ -599,6 +963,7 @@ export class SingleSideDiffElementViewModel extends DiffElementViewModelBase {
 		return this._layoutInfo.editorHeight
 			+ this._layoutInfo.editorMargin
 			+ this._layoutInfo.metadataHeight
+			+ this._layoutInfo.cellStatusHeight
 			+ this._layoutInfo.metadataStatusHeight
 			+ this._layoutInfo.outputStatusHeight
 			+ this._layoutInfo.bodyMargin / 2
@@ -699,33 +1064,6 @@ function outputsEqual(original: ICellOutput[], modified: ICellOutput[]) {
 	return OutputComparison.Unchanged;
 }
 
-export function getFormattedMetadataJSON(documentTextModel: INotebookTextModel, metadata: NotebookCellMetadata, language?: string) {
-	let filteredMetadata: { [key: string]: any } = {};
-
-	if (documentTextModel) {
-		const transientCellMetadata = documentTextModel.transientOptions.transientCellMetadata;
-
-		const keys = new Set([...Object.keys(metadata)]);
-		for (const key of keys) {
-			if (!(transientCellMetadata[key as keyof NotebookCellMetadata])
-			) {
-				filteredMetadata[key] = metadata[key as keyof NotebookCellMetadata];
-			}
-		}
-	} else {
-		filteredMetadata = metadata;
-	}
-
-	const obj = {
-		language,
-		...filteredMetadata
-	};
-
-	const metadataSource = toFormattedString(obj, {});
-
-	return metadataSource;
-}
-
 export function getStreamOutputData(outputs: IOutputItemDto[]) {
 	if (!outputs.length) {
 		return null;
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/diffNestedCellViewModel.ts b/src/vs/workbench/contrib/notebook/browser/diff/diffNestedCellViewModel.ts
index 9b15ad922c3..cccd9f4ee2e 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/diffNestedCellViewModel.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/diffNestedCellViewModel.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { generateUuid } from 'vs/base/common/uuid';
-import { PrefixSumComputer } from 'vs/editor/common/model/prefixSumComputer';
-import { IDiffNestedCellViewModel } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
-import { ICellOutputViewModel, IGenericCellViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CellViewModelStateChangeEvent } from 'vs/workbench/contrib/notebook/browser/notebookViewEvents';
-import { CellOutputViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/cellOutputViewModel';
-import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
-import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
+import { Emitter } from '../../../../../base/common/event.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { generateUuid } from '../../../../../base/common/uuid.js';
+import { PrefixSumComputer } from '../../../../../editor/common/model/prefixSumComputer.js';
+import { IDiffNestedCellViewModel } from './notebookDiffEditorBrowser.js';
+import { ICellOutputViewModel, IGenericCellViewModel } from '../notebookBrowser.js';
+import { CellViewModelStateChangeEvent } from '../notebookViewEvents.js';
+import { CellOutputViewModel } from '../viewModel/cellOutputViewModel.js';
+import { NotebookCellTextModel } from '../../common/model/notebookCellTextModel.js';
+import { INotebookService } from '../../common/notebookService.js';
 
 export class DiffNestedCellViewModel extends Disposable implements IDiffNestedCellViewModel, IGenericCellViewModel {
 	private _id: string;
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/editorHeightCalculator.ts b/src/vs/workbench/contrib/notebook/browser/diff/editorHeightCalculator.ts
new file mode 100644
index 00000000000..6c4bbaaa86a
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/browser/diff/editorHeightCalculator.ts
@@ -0,0 +1,74 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { URI } from '../../../../../base/common/uri.js';
+import { UnchangedRegion } from '../../../../../editor/browser/widget/diffEditor/diffEditorViewModel.js';
+import { IEditorWorkerService } from '../../../../../editor/common/services/editorWorker.js';
+import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { getEditorPadding } from './diffCellEditorOptions.js';
+import { HeightOfHiddenLinesRegionInDiffEditor } from './diffElementViewModel.js';
+
+export interface IDiffEditorHeightCalculatorService {
+	diffAndComputeHeight(original: URI, modified: URI): Promise<number>;
+	computeHeightFromLines(lineCount: number): number;
+}
+
+export class DiffEditorHeightCalculatorService {
+	constructor(
+		private readonly lineHeight: number,
+		@ITextModelService private readonly textModelResolverService: ITextModelService,
+		@IEditorWorkerService private readonly editorWorkerService: IEditorWorkerService,
+		@IConfigurationService private readonly configurationService: IConfigurationService
+	) { }
+
+	public async diffAndComputeHeight(original: URI, modified: URI): Promise<number> {
+		const [originalModel, modifiedModel] = await Promise.all([this.textModelResolverService.createModelReference(original), this.textModelResolverService.createModelReference(modified)]);
+		try {
+			const diffChanges = await this.editorWorkerService.computeDiff(original, modified, {
+				ignoreTrimWhitespace: true,
+				maxComputationTimeMs: 0,
+				computeMoves: false
+			}, 'advanced').then(diff => diff?.changes || []);
+
+			const unchangedRegionFeatureEnabled = this.configurationService.getValue<boolean>('diffEditor.hideUnchangedRegions.enabled');
+			const minimumLineCount = this.configurationService.getValue<number>('diffEditor.hideUnchangedRegions.minimumLineCount');
+			const contextLineCount = this.configurationService.getValue<number>('diffEditor.hideUnchangedRegions.contextLineCount');
+			const originalLineCount = originalModel.object.textEditorModel.getLineCount();
+			const modifiedLineCount = modifiedModel.object.textEditorModel.getLineCount();
+			const unchanged = unchangedRegionFeatureEnabled ? UnchangedRegion.fromDiffs(diffChanges,
+				originalLineCount,
+				modifiedLineCount,
+				minimumLineCount ?? 3,
+				contextLineCount ?? 3) : [];
+
+			const numberOfNewLines = diffChanges.reduce((prev, curr) => {
+				if (curr.original.isEmpty && !curr.modified.isEmpty) {
+					return prev + curr.modified.length;
+				}
+				if (!curr.original.isEmpty && !curr.modified.isEmpty && curr.modified.length > curr.original.length) {
+					return prev + curr.modified.length - curr.original.length;
+				}
+				return prev;
+			}, 0);
+			const orginalNumberOfLines = originalModel.object.textEditorModel.getLineCount();
+			const numberOfHiddenLines = unchanged.reduce((prev, curr) => prev + curr.lineCount, 0);
+			const numberOfHiddenSections = unchanged.length;
+			const unchangeRegionsHeight = numberOfHiddenSections * HeightOfHiddenLinesRegionInDiffEditor;
+			const visibleLineCount = orginalNumberOfLines + numberOfNewLines - numberOfHiddenLines;
+
+			// TODO: When we have a horizontal scrollbar, we need to add 12 to the height.
+			// Right now there's no way to determine if a horizontal scrollbar is visible in the editor.
+			return (visibleLineCount * this.lineHeight) + getEditorPadding(visibleLineCount).top + getEditorPadding(visibleLineCount).bottom + unchangeRegionsHeight;
+		} finally {
+			originalModel.dispose();
+			modifiedModel.dispose();
+		}
+	}
+
+	public computeHeightFromLines(lineCount: number): number {
+		return lineCount * this.lineHeight + getEditorPadding(lineCount).top + getEditorPadding(lineCount).bottom;
+	}
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/eventDispatcher.ts b/src/vs/workbench/contrib/notebook/browser/diff/eventDispatcher.ts
index d3a2096911a..7fc85661f7f 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/eventDispatcher.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/eventDispatcher.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IDiffElementLayoutInfo } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
-import { NotebookLayoutChangeEvent, NotebookLayoutInfo } from 'vs/workbench/contrib/notebook/browser/notebookViewEvents';
+import { Emitter } from '../../../../../base/common/event.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { IDiffElementLayoutInfo } from './notebookDiffEditorBrowser.js';
+import { NotebookLayoutChangeEvent, NotebookLayoutInfo } from '../notebookViewEvents.js';
 
 export enum NotebookDiffViewEventType {
 	LayoutChanged = 1,
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiff.css b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiff.css
index a0a89a75d84..3ee2c8557c9 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiff.css
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiff.css
@@ -25,6 +25,11 @@
 	flex-direction: row;
 }
 
+.notebook-text-diff-editor .cell-placeholder-body {
+	display: flex;
+	flex-direction: row;
+}
+
 .notebook-text-diff-editor .webview-cover {
 	user-select: initial;
 	-webkit-user-select: initial;
@@ -99,6 +104,7 @@
 	width: 50%;
 }
 
+.notebook-text-diff-editor .cell-diff-editor-container .input-header-container,
 .notebook-text-diff-editor .cell-diff-editor-container .output-header-container,
 .notebook-text-diff-editor .cell-diff-editor-container .metadata-header-container {
 	display: flex;
@@ -107,13 +113,15 @@
 	cursor: default;
 }
 
+.notebook-text-diff-editor .cell-diff-editor-container .input-header-container .property-folding-indicator .codicon,
 .notebook-text-diff-editor .cell-diff-editor-container .output-header-container .property-folding-indicator .codicon,
 .notebook-text-diff-editor .cell-diff-editor-container .metadata-header-container .property-folding-indicator .codicon {
 	visibility: visible;
-	padding: 4px 0 0 10px;
+	padding: 4px 0 0 6px;
 	cursor: pointer;
 }
 
+.notebook-text-diff-editor .cell-diff-editor-container .input-header-container,
 .notebook-text-diff-editor .cell-diff-editor-container .output-header-container,
 .notebook-text-diff-editor .cell-diff-editor-container .metadata-header-container {
 	display: flex;
@@ -121,22 +129,32 @@
 	align-items: center;
 }
 
+.notebook-text-diff-editor .cell-diff-editor-container .input-header-container,
+.notebook-text-diff-editor .cell-diff-editor-container .output-header-container,
+.notebook-text-diff-editor .cell-diff-editor-container .metadata-header-container {
+	cursor: pointer;
+}
+
+.notebook-text-diff-editor .cell-diff-editor-container .input-header-container .property-toolbar,
 .notebook-text-diff-editor .cell-diff-editor-container .output-header-container .property-toolbar,
 .notebook-text-diff-editor .cell-diff-editor-container .metadata-header-container .property-toolbar {
 	margin-left: auto;
 }
 
+.notebook-text-diff-editor .cell-diff-editor-container .input-header-container .property-status,
 .notebook-text-diff-editor .cell-diff-editor-container .output-header-container .property-status,
 .notebook-text-diff-editor .cell-diff-editor-container .metadata-header-container .property-status {
 	font-size: 12px;
 }
 
+.notebook-text-diff-editor .cell-diff-editor-container .input-header-container .property-status span,
 .notebook-text-diff-editor .cell-diff-editor-container .output-header-container .property-status span,
 .notebook-text-diff-editor .cell-diff-editor-container .metadata-header-container .property-status span {
-	margin: 0 0 0 8px;
+	margin: 0 0 0 5px;
 	line-height: 21px;
 }
 
+.notebook-text-diff-editor .cell-diff-editor-container .input-header-container .property-status span.property-description,
 .notebook-text-diff-editor .cell-diff-editor-container .output-header-container .property-status span.property-description,
 .notebook-text-diff-editor .cell-diff-editor-container .metadata-header-container .property-status span.property-description {
 	font-style: italic;
@@ -292,7 +310,7 @@
 	width: 15px !important;
 }
 
-.monaco-workbench .notebook-text-diff-editor  > .monaco-list > .monaco-scrollable-element > .scrollbar.visible {
+.monaco-workbench .notebook-text-diff-editor > .monaco-list > .monaco-scrollable-element > .scrollbar.visible {
 	z-index: var(--z-index-notebook-scrollbar);
 	cursor: default;
 }
@@ -357,6 +375,7 @@
 .notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .source-container,
 .notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .source-container .monaco-editor .margin,
 .notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .source-container .monaco-editor .monaco-editor-background,
+.notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .input-header-container,
 .notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .metadata-editor-container,
 .notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .metadata-editor-container .monaco-editor .margin,
 .notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .metadata-editor-container .monaco-editor .monaco-editor-background,
@@ -374,6 +393,7 @@
 .notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .source-container,
 .notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .source-container .monaco-editor .margin,
 .notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .source-container .monaco-editor .monaco-editor-background,
+.notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .input-header-container,
 .notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .metadata-editor-container,
 .notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .metadata-editor-container .monaco-editor .margin,
 .notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .metadata-editor-container .monaco-editor .monaco-editor-background,
@@ -390,3 +410,60 @@
 .notebook-text-diff-editor .cell-body .cell-diff-editor-container .source-container .monaco-editor .monaco-editor-background {
 	background: var(--vscode-notebook-cellEditorBackground, var(--vscode-editor-background));
 }
+
+/** Overlay to hide the unchanged cells */
+.notebook-text-diff-editor .cell-body.full div.diff-hidden-cells {
+	position: absolute;
+	left: 0;
+
+	font-size: 13px;
+	line-height: 14px;
+}
+
+.notebook-text-diff-editor .cell-body.full div.diff-hidden-cells .center {
+	color: var(--vscode-diffEditor-unchangedRegionForeground);
+	overflow: hidden;
+	display: block;
+	white-space: nowrap;
+
+	height: 24px;
+}
+
+.notebook-text-diff-editor .cell-body.full div.diff-hidden-cells .center span.codicon {
+	vertical-align: middle;
+}
+
+.notebook-text-diff-editor .cell-body.full div.diff-hidden-cells .center a:hover .codicon {
+	cursor: pointer;
+}
+
+/** Overlay to unhide the unchanged cells */
+.notebook-text-diff-editor .cell-placeholder-body {
+	background: var(--vscode-diffEditor-unchangedRegionBackground);
+	color: var(--vscode-diffEditor-unchangedRegionForeground);
+	min-height: 24px;
+}
+
+.notebook-text-diff-editor .cell-placeholder-body div.diff-hidden-cells .center {
+	overflow: hidden;
+	display: block;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+
+	height: 24px;
+}
+
+.notebook-text-diff-editor .cell-placeholder-body .text {
+	/** Add a gap between text and the unfold icon */
+	padding-left: 2px;
+}
+
+.notebook-text-diff-editor .cell-placeholder-body div.diff-hidden-cells .center span.codicon,
+.notebook-text-diff-editor .cell-placeholder-body .text {
+	vertical-align: middle;
+}
+
+.notebook-text-diff-editor .cell-placeholder-body div.diff-hidden-cells .center a:hover .codicon {
+	cursor: pointer;
+	color: var(--vscode-editorLink-activeForeground) !important;
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffActions.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffActions.ts
index f7cfcf23fec..07463029336 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffActions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffActions.ts
@@ -3,40 +3,45 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IBulkEditService, ResourceTextEdit } from 'vs/editor/browser/services/bulkEditService';
-import { localize, localize2 } from 'vs/nls';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr, ContextKeyExpression } from 'vs/platform/contextkey/common/contextkey';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ActiveEditorContext } from 'vs/workbench/common/contextkeys';
-import { DiffElementViewModelBase, SideBySideDiffElementViewModel } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
-import { INotebookTextDiffEditor, NOTEBOOK_DIFF_CELL_INPUT, NOTEBOOK_DIFF_CELL_PROPERTY, NOTEBOOK_DIFF_CELL_PROPERTY_EXPANDED } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
-import { NotebookTextDiffEditor } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor';
-import { NotebookDiffEditorInput } from 'vs/workbench/contrib/notebook/common/notebookDiffEditorInput';
-import { nextChangeIcon, openAsTextIcon, previousChangeIcon, renderOutputIcon, revertIcon } from 'vs/workbench/contrib/notebook/browser/notebookIcons';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
-import { ICommandActionTitle } from 'vs/platform/action/common/action';
-import { DEFAULT_EDITOR_ASSOCIATION } from 'vs/workbench/common/editor';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { CellEditType, NOTEBOOK_DIFF_EDITOR_ID } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { IBulkEditService, ResourceTextEdit } from '../../../../../editor/browser/services/bulkEditService.js';
+import { localize, localize2 } from '../../../../../nls.js';
+import { Action2, MenuId, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr, ContextKeyExpression } from '../../../../../platform/contextkey/common/contextkey.js';
+import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ActiveEditorContext } from '../../../../common/contextkeys.js';
+import { DiffElementCellViewModelBase, NotebookDocumentMetadataViewModel, SideBySideDiffElementViewModel } from './diffElementViewModel.js';
+import { INotebookTextDiffEditor, NOTEBOOK_DIFF_CELL_IGNORE_WHITESPACE_KEY, NOTEBOOK_DIFF_CELL_INPUT, NOTEBOOK_DIFF_CELL_PROPERTY, NOTEBOOK_DIFF_CELL_PROPERTY_EXPANDED, NOTEBOOK_DIFF_HAS_UNCHANGED_CELLS, NOTEBOOK_DIFF_ITEM_DIFF_STATE, NOTEBOOK_DIFF_ITEM_KIND, NOTEBOOK_DIFF_METADATA, NOTEBOOK_DIFF_UNCHANGED_CELLS_HIDDEN } from './notebookDiffEditorBrowser.js';
+import { NotebookTextDiffEditor } from './notebookDiffEditor.js';
+import { NotebookDiffEditorInput } from '../../common/notebookDiffEditorInput.js';
+import { nextChangeIcon, openAsTextIcon, previousChangeIcon, renderOutputIcon, revertIcon, toggleWhitespace } from '../notebookIcons.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { Registry } from '../../../../../platform/registry/common/platform.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from '../../../../../platform/configuration/common/configurationRegistry.js';
+import { ICommandActionTitle } from '../../../../../platform/action/common/action.js';
+import { DEFAULT_EDITOR_ASSOCIATION } from '../../../../common/editor.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
+import { CellEditType, ICellEditOperation, NOTEBOOK_DIFF_EDITOR_ID } from '../../common/notebookCommon.js';
+import { ITextResourceConfigurationService } from '../../../../../editor/common/services/textResourceConfiguration.js';
+import { NotebookMultiTextDiffEditor } from './notebookMultiDiffEditor.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import type { URI } from '../../../../../base/common/uri.js';
+import { TextEditorSelectionRevealType, type ITextEditorOptions } from '../../../../../platform/editor/common/editor.js';
 
 // ActiveEditorContext.isEqualTo(SearchEditorConstants.SearchEditorID)
 
 registerAction2(class extends Action2 {
 	constructor() {
 		super({
-			id: 'notebook.diff.switchToText',
-			icon: openAsTextIcon,
-			title: localize2('notebook.diff.switchToText', 'Open Text Diff Editor'),
-			precondition: ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID),
+			id: 'notebook.diff.openFile',
+			icon: Codicon.goToFile,
+			title: localize2('notebook.diff.openFile', 'Open File'),
+			precondition: ContextKeyExpr.or(ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID), ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)),
 			menu: [{
 				id: MenuId.EditorTitle,
 				group: 'navigation',
-				when: ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)
+				when: ContextKeyExpr.or(ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID), ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)),
 			}]
 		});
 	}
@@ -45,7 +50,64 @@ registerAction2(class extends Action2 {
 		const editorService = accessor.get(IEditorService);
 
 		const activeEditor = editorService.activeEditorPane;
-		if (activeEditor && activeEditor instanceof NotebookTextDiffEditor) {
+		if (!activeEditor) {
+			return;
+		}
+		if (activeEditor instanceof NotebookTextDiffEditor || activeEditor instanceof NotebookMultiTextDiffEditor) {
+			const diffEditorInput = activeEditor.input as NotebookDiffEditorInput;
+			const resource = diffEditorInput.modified.resource;
+			await editorService.openEditor({ resource });
+		}
+	}
+});
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'notebook.diff.cell.toggleCollapseUnchangedRegions',
+			title: localize2('notebook.diff.cell.toggleCollapseUnchangedRegions', 'Toggle Collapse Unchanged Regions'),
+			icon: Codicon.map,
+			toggled: ContextKeyExpr.has('config.diffEditor.hideUnchangedRegions.enabled'),
+			precondition: ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID),
+			menu: {
+				id: MenuId.EditorTitle,
+				group: 'navigation',
+				when: ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID),
+			},
+		});
+	}
+
+	run(accessor: ServicesAccessor, ...args: unknown[]): void {
+		const configurationService = accessor.get(IConfigurationService);
+		const newValue = !configurationService.getValue<boolean>('diffEditor.hideUnchangedRegions.enabled');
+		configurationService.updateValue('diffEditor.hideUnchangedRegions.enabled', newValue);
+	}
+});
+
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'notebook.diff.switchToText',
+			icon: openAsTextIcon,
+			title: localize2('notebook.diff.switchToText', 'Open Text Diff Editor'),
+			precondition: ContextKeyExpr.or(ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID), ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)),
+			menu: [{
+				id: MenuId.EditorTitle,
+				group: 'navigation',
+				when: ContextKeyExpr.or(ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID), ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)),
+			}]
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const editorService = accessor.get(IEditorService);
+
+		const activeEditor = editorService.activeEditorPane;
+		if (!activeEditor) {
+			return;
+		}
+		if (activeEditor instanceof NotebookTextDiffEditor || activeEditor instanceof NotebookMultiTextDiffEditor) {
 			const diffEditorInput = activeEditor.input as NotebookDiffEditorInput;
 
 			await editorService.openEditor(
@@ -62,12 +124,264 @@ registerAction2(class extends Action2 {
 	}
 });
 
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'notebook.diffEditor.showUnchangedCells',
+			title: localize2('showUnchangedCells', 'Show Unchanged Cells'),
+			icon: Codicon.unfold,
+			precondition: ContextKeyExpr.and(ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID), ContextKeyExpr.has(NOTEBOOK_DIFF_HAS_UNCHANGED_CELLS.key)),
+			menu: {
+				when: ContextKeyExpr.and(ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID), ContextKeyExpr.has(NOTEBOOK_DIFF_HAS_UNCHANGED_CELLS.key), ContextKeyExpr.equals(NOTEBOOK_DIFF_UNCHANGED_CELLS_HIDDEN.key, true)),
+				id: MenuId.EditorTitle,
+				order: 22,
+				group: 'navigation',
+			},
+		});
+	}
+
+	run(accessor: ServicesAccessor, ...args: unknown[]): void {
+		const activeEditor = accessor.get(IEditorService).activeEditorPane;
+		if (!activeEditor) {
+			return;
+		}
+		if (activeEditor instanceof NotebookMultiTextDiffEditor) {
+			activeEditor.showUnchanged();
+		}
+	}
+});
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'notebook.diffEditor.hideUnchangedCells',
+			title: localize2('hideUnchangedCells', 'Hide Unchanged Cells'),
+			icon: Codicon.fold,
+			precondition: ContextKeyExpr.and(ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID), ContextKeyExpr.has(NOTEBOOK_DIFF_HAS_UNCHANGED_CELLS.key)),
+			menu: {
+				when: ContextKeyExpr.and(ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID), ContextKeyExpr.has(NOTEBOOK_DIFF_HAS_UNCHANGED_CELLS.key), ContextKeyExpr.equals(NOTEBOOK_DIFF_UNCHANGED_CELLS_HIDDEN.key, false)),
+				id: MenuId.EditorTitle,
+				order: 22,
+				group: 'navigation',
+			},
+		});
+	}
+
+	run(accessor: ServicesAccessor, ...args: unknown[]): void {
+		const activeEditor = accessor.get(IEditorService).activeEditorPane;
+		if (!activeEditor) {
+			return;
+		}
+		if (activeEditor instanceof NotebookMultiTextDiffEditor) {
+			activeEditor.hideUnchanged();
+		}
+	}
+});
+
+registerAction2(class GoToFileAction extends Action2 {
+	constructor() {
+		super({
+			id: 'notebook.diffEditor.2.goToCell',
+			title: localize2('goToCell', 'Go To Cell'),
+			icon: Codicon.goToFile,
+			menu: {
+				when: ContextKeyExpr.and(ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID), ContextKeyExpr.equals(NOTEBOOK_DIFF_ITEM_KIND.key, 'Cell'), ContextKeyExpr.notEquals(NOTEBOOK_DIFF_ITEM_DIFF_STATE.key, 'delete')),
+				id: MenuId.MultiDiffEditorFileToolbar,
+				order: 0,
+				group: 'navigation',
+			},
+		});
+	}
+
+	async run(accessor: ServicesAccessor, ...args: any[]): Promise<void> {
+		const uri = args[0] as URI;
+		const editorService = accessor.get(IEditorService);
+		const activeEditorPane = editorService.activeEditorPane;
+		if (!(activeEditorPane instanceof NotebookMultiTextDiffEditor)) {
+			return;
+		}
+
+		await editorService.openEditor({
+			resource: uri,
+			options: {
+				selectionRevealType: TextEditorSelectionRevealType.CenterIfOutsideViewport,
+			} satisfies ITextEditorOptions,
+		});
+	}
+});
+
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super(
+			{
+				id: 'notebook.diff.revertMetadata',
+				title: localize('notebook.diff.revertMetadata', "Revert Notebook Metadata"),
+				icon: revertIcon,
+				f1: false,
+				menu: {
+					id: MenuId.NotebookDiffDocumentMetadata,
+					when: NOTEBOOK_DIFF_METADATA,
+				},
+				precondition: NOTEBOOK_DIFF_METADATA
+
+			}
+		);
+	}
+	run(accessor: ServicesAccessor, context?: NotebookDocumentMetadataViewModel) {
+		if (!context) {
+			return;
+		}
+
+		const editorService = accessor.get(IEditorService);
+		const activeEditorPane = editorService.activeEditorPane;
+		if (!(activeEditorPane instanceof NotebookTextDiffEditor)) {
+			return;
+		}
+
+		context.modifiedDocumentTextModel.applyEdits([{
+			editType: CellEditType.DocumentMetadata,
+			metadata: context.originalMetadata.metadata,
+		}], true, undefined, () => undefined, undefined, true);
+	}
+});
+
+const revertInput = localize('notebook.diff.cell.revertInput', "Revert Input");
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'notebook.diffEditor.2.cell.revertInput',
+			title: revertInput,
+			icon: revertIcon,
+			menu: {
+				when: ContextKeyExpr.and(ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID), ContextKeyExpr.equals(NOTEBOOK_DIFF_ITEM_KIND.key, 'Cell'), ContextKeyExpr.equals(NOTEBOOK_DIFF_ITEM_DIFF_STATE.key, 'modified')),
+				id: MenuId.MultiDiffEditorFileToolbar,
+				order: 2,
+				group: 'navigation',
+			},
+		});
+	}
+
+	async run(accessor: ServicesAccessor, ...args: any[]): Promise<void> {
+		const uri = args[0] as URI;
+		const editorService = accessor.get(IEditorService);
+		const activeEditorPane = editorService.activeEditorPane;
+		if (!(activeEditorPane instanceof NotebookMultiTextDiffEditor)) {
+			return;
+		}
+
+		const item = activeEditorPane.getDiffElementViewModel(uri);
+		if (item && item instanceof SideBySideDiffElementViewModel) {
+			const modified = item.modified;
+			const original = item.original;
+
+			if (!original || !modified) {
+				return;
+			}
+
+			const bulkEditService = accessor.get(IBulkEditService);
+			await bulkEditService.apply([
+				new ResourceTextEdit(modified.uri, { range: modified.textModel.getFullModelRange(), text: original.textModel.getValue() }),
+			], { quotableLabel: 'Revert Notebook Cell Content Change' });
+		}
+	}
+});
+
+const revertOutputs = localize('notebook.diff.cell.revertOutputs', "Revert Outputs");
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super(
+			{
+				id: 'notebook.diffEditor.2.cell.revertOutputs',
+				title: revertOutputs,
+				icon: revertIcon,
+				f1: false,
+				menu: {
+					when: ContextKeyExpr.and(ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID), ContextKeyExpr.equals(NOTEBOOK_DIFF_ITEM_KIND.key, 'Output'), ContextKeyExpr.equals(NOTEBOOK_DIFF_ITEM_DIFF_STATE.key, 'modified')),
+					id: MenuId.MultiDiffEditorFileToolbar,
+					order: 2,
+					group: 'navigation',
+				},
+			}
+		);
+	}
+	async run(accessor: ServicesAccessor, ...args: any[]): Promise<void> {
+		const uri = args[0] as URI;
+		const editorService = accessor.get(IEditorService);
+		const activeEditorPane = editorService.activeEditorPane;
+		if (!(activeEditorPane instanceof NotebookMultiTextDiffEditor)) {
+			return;
+		}
+
+		const item = activeEditorPane.getDiffElementViewModel(uri);
+		if (item && item instanceof SideBySideDiffElementViewModel) {
+			const original = item.original;
+
+			const modifiedCellIndex = item.modifiedDocument.cells.findIndex(cell => cell.handle === item.modified.handle);
+			if (modifiedCellIndex === -1) {
+				return;
+			}
+
+			item.mainDocumentTextModel.applyEdits([{
+				editType: CellEditType.Output, index: modifiedCellIndex, outputs: original.outputs
+			}], true, undefined, () => undefined, undefined, true);
+		}
+	}
+});
+
+const revertMetadata = localize('notebook.diff.cell.revertMetadata', "Revert Metadata");
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super(
+			{
+				id: 'notebook.diffEditor.2.cell.revertMetadata',
+				title: revertMetadata,
+				icon: revertIcon,
+				f1: false,
+				menu: {
+					when: ContextKeyExpr.and(ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID), ContextKeyExpr.equals(NOTEBOOK_DIFF_ITEM_KIND.key, 'Metadata'), ContextKeyExpr.equals(NOTEBOOK_DIFF_ITEM_DIFF_STATE.key, 'modified')),
+					id: MenuId.MultiDiffEditorFileToolbar,
+					order: 2,
+					group: 'navigation',
+				},
+			}
+		);
+	}
+	async run(accessor: ServicesAccessor, ...args: any[]): Promise<void> {
+		const uri = args[0] as URI;
+		const editorService = accessor.get(IEditorService);
+		const activeEditorPane = editorService.activeEditorPane;
+		if (!(activeEditorPane instanceof NotebookMultiTextDiffEditor)) {
+			return;
+		}
+
+		const item = activeEditorPane.getDiffElementViewModel(uri);
+		if (item && item instanceof SideBySideDiffElementViewModel) {
+			const original = item.original;
+
+			const modifiedCellIndex = item.modifiedDocument.cells.findIndex(cell => cell.handle === item.modified.handle);
+			if (modifiedCellIndex === -1) {
+				return;
+			}
+
+			item.mainDocumentTextModel.applyEdits([{
+				editType: CellEditType.Metadata, index: modifiedCellIndex, metadata: original.metadata
+			}], true, undefined, () => undefined, undefined, true);
+		}
+	}
+});
+
+
 registerAction2(class extends Action2 {
 	constructor() {
 		super(
 			{
 				id: 'notebook.diff.cell.revertMetadata',
-				title: localize('notebook.diff.cell.revertMetadata', "Revert Metadata"),
+				title: revertMetadata,
 				icon: revertIcon,
 				f1: false,
 				menu: {
@@ -78,19 +392,29 @@ registerAction2(class extends Action2 {
 			}
 		);
 	}
-	run(accessor: ServicesAccessor, context?: { cell: DiffElementViewModelBase }) {
+	run(accessor: ServicesAccessor, context?: DiffElementCellViewModelBase) {
 		if (!context) {
 			return;
 		}
 
-		const original = context.cell.original;
-		const modified = context.cell.modified;
-
-		if (!original || !modified) {
+		if (!(context instanceof SideBySideDiffElementViewModel)) {
 			return;
 		}
 
-		modified.textModel.metadata = original.metadata;
+		const original = context.original;
+		const modified = context.modified;
+
+		const modifiedCellIndex = context.mainDocumentTextModel.cells.indexOf(modified.textModel);
+		if (modifiedCellIndex === -1) {
+			return;
+		}
+
+		const rawEdits: ICellEditOperation[] = [{ editType: CellEditType.Metadata, index: modifiedCellIndex, metadata: original.metadata }];
+		if (context.original.language && context.modified.language !== context.original.language) {
+			rawEdits.push({ editType: CellEditType.CellLanguage, index: modifiedCellIndex, language: context.original.language });
+		}
+
+		context.modifiedDocument.applyEdits(rawEdits, true, undefined, () => undefined, undefined, true);
 	}
 });
 
@@ -108,12 +432,12 @@ registerAction2(class extends Action2 {
 // 			}
 // 		);
 // 	}
-// 	run(accessor: ServicesAccessor, context?: { cell: DiffElementViewModelBase }) {
+// 	run(accessor: ServicesAccessor, context?: DiffElementViewModelBase) {
 // 		if (!context) {
 // 			return;
 // 		}
 
-// 		context.cell.renderOutput = true;
+// 		context.renderOutput = true;
 // 	}
 // });
 
@@ -133,12 +457,12 @@ registerAction2(class extends Action2 {
 			}
 		);
 	}
-	run(accessor: ServicesAccessor, context?: { cell: DiffElementViewModelBase }) {
+	run(accessor: ServicesAccessor, context?: DiffElementCellViewModelBase) {
 		if (!context) {
 			return;
 		}
 
-		context.cell.renderOutput = !context.cell.renderOutput;
+		context.renderOutput = !context.renderOutput;
 	}
 });
 
@@ -158,54 +482,86 @@ registerAction2(class extends Action2 {
 			}
 		);
 	}
-	run(accessor: ServicesAccessor, context?: { cell: DiffElementViewModelBase }) {
+	run(accessor: ServicesAccessor, context?: DiffElementCellViewModelBase) {
 		if (!context) {
 			return;
 		}
 
-		if (!(context.cell instanceof SideBySideDiffElementViewModel)) {
+		if (!(context instanceof SideBySideDiffElementViewModel)) {
 			return;
 		}
 
-		const original = context.cell.original;
-		const modified = context.cell.modified;
+		const original = context.original;
+		const modified = context.modified;
 
-		const modifiedCellIndex = context.cell.mainDocumentTextModel.cells.indexOf(modified.textModel);
+		const modifiedCellIndex = context.mainDocumentTextModel.cells.indexOf(modified.textModel);
 		if (modifiedCellIndex === -1) {
 			return;
 		}
 
-		context.cell.mainDocumentTextModel.applyEdits([{
+		context.mainDocumentTextModel.applyEdits([{
 			editType: CellEditType.Output, index: modifiedCellIndex, outputs: original.outputs
 		}], true, undefined, () => undefined, undefined, true);
 	}
 });
 
 
+registerAction2(class extends Action2 {
+	constructor() {
+		super(
+			{
+				id: 'notebook.toggle.diff.cell.ignoreTrimWhitespace',
+				title: localize('ignoreTrimWhitespace.label', "Show Leading/Trailing Whitespace Differences"),
+				icon: toggleWhitespace,
+				f1: false,
+				menu: {
+					id: MenuId.NotebookDiffCellInputTitle,
+					when: NOTEBOOK_DIFF_CELL_INPUT,
+					order: 1,
+				},
+				precondition: NOTEBOOK_DIFF_CELL_INPUT,
+				toggled: ContextKeyExpr.equals(NOTEBOOK_DIFF_CELL_IGNORE_WHITESPACE_KEY, false),
+			}
+		);
+	}
+	run(accessor: ServicesAccessor, context?: DiffElementCellViewModelBase) {
+		const cell = context;
+		if (!cell?.modified) {
+			return;
+		}
+		const uri = cell.modified.uri;
+		const configService = accessor.get(ITextResourceConfigurationService);
+		const key = 'diffEditor.ignoreTrimWhitespace';
+		const val = configService.getValue(uri, key);
+		configService.updateValue(uri, key, !val);
+	}
+});
+
 registerAction2(class extends Action2 {
 	constructor() {
 		super(
 			{
 				id: 'notebook.diff.cell.revertInput',
-				title: localize('notebook.diff.cell.revertInput', "Revert Input"),
+				title: revertInput,
 				icon: revertIcon,
 				f1: false,
 				menu: {
 					id: MenuId.NotebookDiffCellInputTitle,
-					when: NOTEBOOK_DIFF_CELL_INPUT
+					when: NOTEBOOK_DIFF_CELL_INPUT,
+					order: 2
 				},
 				precondition: NOTEBOOK_DIFF_CELL_INPUT
 
 			}
 		);
 	}
-	run(accessor: ServicesAccessor, context?: { cell: DiffElementViewModelBase }) {
+	run(accessor: ServicesAccessor, context?: DiffElementCellViewModelBase) {
 		if (!context) {
 			return;
 		}
 
-		const original = context.cell.original;
-		const modified = context.cell.modified;
+		const original = context.original;
+		const modified = context.modified;
 
 		if (!original || !modified) {
 			return;
@@ -253,7 +609,7 @@ registerAction2(class extends ToggleRenderAction {
 	constructor() {
 		super('notebook.diff.showOutputs',
 			localize2('notebook.diff.showOutputs', 'Show Outputs Differences'),
-			ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID),
+			ContextKeyExpr.or(ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID), ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)),
 			ContextKeyExpr.notEquals('config.notebook.diff.ignoreOutputs', true),
 			2,
 			true,
@@ -266,7 +622,7 @@ registerAction2(class extends ToggleRenderAction {
 	constructor() {
 		super('notebook.diff.showMetadata',
 			localize2('notebook.diff.showMetadata', 'Show Metadata Differences'),
-			ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID),
+			ContextKeyExpr.or(ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID), ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)),
 			ContextKeyExpr.notEquals('config.notebook.diff.ignoreMetadata', true),
 			1,
 			undefined,
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.ts
index 29dc02777d3..465a3efeeb4 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.ts
@@ -3,51 +3,51 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import * as DOM from 'vs/base/browser/dom';
-import { findLastIdx } from 'vs/base/common/arraysFind';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { EditorPaneSelectionChangeReason, EditorPaneSelectionCompareResult, IEditorOpenContext, IEditorPaneScrollPosition, IEditorPaneSelection, IEditorPaneSelectionChangeEvent, IEditorPaneWithScrolling, IEditorPaneWithSelection } from 'vs/workbench/common/editor';
-import { getDefaultNotebookCreationOptions } from 'vs/workbench/contrib/notebook/browser/notebookEditorWidget';
-import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { NotebookDiffEditorInput } from '../../common/notebookDiffEditorInput';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { DiffElementViewModelBase, SideBySideDiffElementViewModel, SingleSideDiffElementViewModel } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { CellDiffSideBySideRenderer, CellDiffSingleSideRenderer, NotebookCellTextDiffListDelegate, NotebookTextDiffList } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffList';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { diffDiagonalFill, editorBackground, focusBorder, foreground } from 'vs/platform/theme/common/colorRegistry';
-import { INotebookEditorWorkerService } from 'vs/workbench/contrib/notebook/common/services/notebookWorkerService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IEditorOptions as ICodeEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { BareFontInfo, FontInfo } from 'vs/editor/common/config/fontInfo';
-import { PixelRatio } from 'vs/base/browser/pixelRatio';
-import { CellEditState, ICellOutputViewModel, IDisplayOutputLayoutUpdateRequest, IGenericCellViewModel, IInsetRenderOutput, INotebookEditorCreationOptions, INotebookEditorOptions } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { DiffSide, DIFF_CELL_MARGIN, IDiffCellInfo, INotebookTextDiffEditor } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
-import { Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
-import { CellUri, INotebookDiffEditorModel, INotebookDiffResult, NOTEBOOK_DIFF_EDITOR_ID, NotebookSetting } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { URI } from 'vs/base/common/uri';
-import { IDiffChange, IDiffResult } from 'vs/base/common/diff/diff';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { SequencerByKey } from 'vs/base/common/async';
-import { generateUuid } from 'vs/base/common/uuid';
-import { IMouseWheelEvent, StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { DiffNestedCellViewModel } from 'vs/workbench/contrib/notebook/browser/diff/diffNestedCellViewModel';
-import { BackLayerWebView, INotebookDelegateForWebview } from 'vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView';
-import { NotebookDiffEditorEventDispatcher, NotebookDiffLayoutChangedEvent } from 'vs/workbench/contrib/notebook/browser/diff/eventDispatcher';
-import { FontMeasurements } from 'vs/editor/browser/config/fontMeasurements';
-import { NotebookOptions } from 'vs/workbench/contrib/notebook/browser/notebookOptions';
-import { INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
-import { NotebookLayoutInfo } from 'vs/workbench/contrib/notebook/browser/notebookViewEvents';
-import { IEditorOptions } from 'vs/platform/editor/common/editor';
-import { cellIndexesToRanges, cellRangesToIndexes } from 'vs/workbench/contrib/notebook/common/notebookRange';
-import { NotebookDiffOverviewRuler } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffOverviewRuler';
-import { registerZIndex, ZIndex } from 'vs/platform/layout/browser/zIndexRegistry';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
+import * as nls from '../../../../../nls.js';
+import * as DOM from '../../../../../base/browser/dom.js';
+import { findLastIdx } from '../../../../../base/common/arraysFind.js';
+import { IStorageService } from '../../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { IThemeService, registerThemingParticipant } from '../../../../../platform/theme/common/themeService.js';
+import { EditorPaneSelectionChangeReason, EditorPaneSelectionCompareResult, IEditorOpenContext, IEditorPaneScrollPosition, IEditorPaneSelection, IEditorPaneSelectionChangeEvent, IEditorPaneWithScrolling, IEditorPaneWithSelection } from '../../../../common/editor.js';
+import { getDefaultNotebookCreationOptions } from '../notebookEditorWidget.js';
+import { IEditorGroup } from '../../../../services/editor/common/editorGroupsService.js';
+import { NotebookDiffEditorInput } from '../../common/notebookDiffEditorInput.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { DiffElementCellViewModelBase, IDiffElementViewModelBase, SideBySideDiffElementViewModel } from './diffElementViewModel.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { CellDiffPlaceholderRenderer, CellDiffSideBySideRenderer, CellDiffSingleSideRenderer, NotebookCellTextDiffListDelegate, NotebookDocumentMetadataDiffRenderer, NotebookTextDiffList } from './notebookDiffList.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { diffDiagonalFill, editorBackground, focusBorder, foreground } from '../../../../../platform/theme/common/colorRegistry.js';
+import { INotebookEditorWorkerService } from '../../common/services/notebookWorkerService.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IEditorOptions as ICodeEditorOptions } from '../../../../../editor/common/config/editorOptions.js';
+import { BareFontInfo, FontInfo } from '../../../../../editor/common/config/fontInfo.js';
+import { PixelRatio } from '../../../../../base/browser/pixelRatio.js';
+import { CellEditState, ICellOutputViewModel, IDisplayOutputLayoutUpdateRequest, IGenericCellViewModel, IInsetRenderOutput, INotebookEditorCreationOptions, INotebookEditorOptions } from '../notebookBrowser.js';
+import { DiffSide, DIFF_CELL_MARGIN, IDiffCellInfo, INotebookTextDiffEditor, INotebookDiffViewModel } from './notebookDiffEditorBrowser.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { DisposableStore, IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { EditorPane } from '../../../../browser/parts/editor/editorPane.js';
+import { CellUri, INotebookDiffEditorModel, NOTEBOOK_DIFF_EDITOR_ID, NotebookSetting } from '../../common/notebookCommon.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { SequencerByKey } from '../../../../../base/common/async.js';
+import { generateUuid } from '../../../../../base/common/uuid.js';
+import { IMouseWheelEvent, StandardMouseEvent } from '../../../../../base/browser/mouseEvent.js';
+import { DiffNestedCellViewModel } from './diffNestedCellViewModel.js';
+import { BackLayerWebView, INotebookDelegateForWebview } from '../view/renderers/backLayerWebView.js';
+import { NotebookDiffEditorEventDispatcher, NotebookDiffLayoutChangedEvent } from './eventDispatcher.js';
+import { FontMeasurements } from '../../../../../editor/browser/config/fontMeasurements.js';
+import { NotebookOptions } from '../notebookOptions.js';
+import { NotebookLayoutInfo } from '../notebookViewEvents.js';
+import { IEditorOptions } from '../../../../../platform/editor/common/editor.js';
+import { cellIndexesToRanges, cellRangesToIndexes } from '../../common/notebookRange.js';
+import { NotebookDiffOverviewRuler } from './notebookDiffOverviewRuler.js';
+import { registerZIndex, ZIndex } from '../../../../../platform/layout/browser/zIndexRegistry.js';
+import { NotebookDiffViewModel } from './notebookDiffViewModel.js';
+import { INotebookService } from '../../common/notebookService.js';
+import { DiffEditorHeightCalculatorService, IDiffEditorHeightCalculatorService } from './editorHeightCalculator.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
 
 const $ = DOM.$;
 
@@ -96,14 +96,14 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 	private _overviewRulerContainer!: HTMLElement;
 	private _overviewRuler!: NotebookDiffOverviewRuler;
 	private _dimension: DOM.Dimension | null = null;
-	private _diffElementViewModels: DiffElementViewModelBase[] = [];
+	private notebookDiffViewModel?: INotebookDiffViewModel;
 	private _list!: NotebookTextDiffList;
 	private _modifiedWebview: BackLayerWebView<IDiffCellInfo> | null = null;
 	private _originalWebview: BackLayerWebView<IDiffCellInfo> | null = null;
 	private _webviewTransparentCover: HTMLElement | null = null;
 	private _fontInfo: FontInfo | undefined;
 
-	private readonly _onMouseUp = this._register(new Emitter<{ readonly event: MouseEvent; readonly target: DiffElementViewModelBase }>());
+	private readonly _onMouseUp = this._register(new Emitter<{ readonly event: MouseEvent; readonly target: IDiffElementViewModelBase }>());
 	public readonly onMouseUp = this._onMouseUp.event;
 	private readonly _onDidScroll = this._register(new Emitter<void>());
 	readonly onDidScroll: Event<void> = this._onDidScroll.event;
@@ -111,6 +111,7 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 	private _eventDispatcher: NotebookDiffEditorEventDispatcher | undefined;
 	protected _scopeContextKeyService!: IContextKeyService;
 	private _model: INotebookDiffEditorModel | null = null;
+	private readonly diffEditorCalcuator: IDiffEditorHeightCalculatorService;
 	private readonly _modifiedResourceDisposableStore = this._register(new DisposableStore());
 
 	get textModel() {
@@ -151,11 +152,12 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IStorageService storageService: IStorageService,
-		@INotebookExecutionStateService notebookExecutionStateService: INotebookExecutionStateService,
-		@ICodeEditorService codeEditorService: ICodeEditorService
+		@INotebookService private readonly notebookService: INotebookService,
+		@IEditorService private readonly editorService: IEditorService
 	) {
 		super(NotebookTextDiffEditor.ID, group, telemetryService, themeService, storageService);
-		this._notebookOptions = new NotebookOptions(this.window, this.configurationService, notebookExecutionStateService, codeEditorService, false);
+		this.diffEditorCalcuator = this.instantiationService.createInstance(DiffEditorHeightCalculatorService, this.fontInfo.lineHeight);
+		this._notebookOptions = instantiationService.createInstance(NotebookOptions, this.window, false, undefined);
 		this._register(this._notebookOptions);
 		this._revealFirst = true;
 	}
@@ -281,6 +283,8 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		const renderers = [
 			this.instantiationService.createInstance(CellDiffSingleSideRenderer, this),
 			this.instantiationService.createInstance(CellDiffSideBySideRenderer, this),
+			this.instantiationService.createInstance(CellDiffPlaceholderRenderer, this),
+			this.instantiationService.createInstance(NotebookDocumentMetadataDiffRenderer, this),
 		];
 
 		this._listViewContainer = DOM.append(this._rootElement, DOM.$('.notebook-diff-list-view'));
@@ -335,9 +339,11 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		);
 
 		this._register(this._list);
-
 		this._register(this._list.onMouseUp(e => {
 			if (e.element) {
+				if (typeof e.index === 'number') {
+					this._list.setFocus([e.index]);
+				}
 				this._onMouseUp.fire({ event: e.browserEvent, target: e.element });
 			}
 		}));
@@ -379,7 +385,7 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		this._overviewRuler = this._register(this.instantiationService.createInstance(NotebookDiffOverviewRuler, this, NotebookTextDiffEditor.ENTIRE_DIFF_OVERVIEW_WIDTH, this._overviewRulerContainer));
 	}
 
-	private _updateOutputsOffsetsInWebview(scrollTop: number, scrollHeight: number, activeWebview: BackLayerWebView<IDiffCellInfo>, getActiveNestedCell: (diffElement: DiffElementViewModelBase) => DiffNestedCellViewModel | undefined, diffSide: DiffSide) {
+	private _updateOutputsOffsetsInWebview(scrollTop: number, scrollHeight: number, activeWebview: BackLayerWebView<IDiffCellInfo>, getActiveNestedCell: (diffElement: DiffElementCellViewModelBase) => DiffNestedCellViewModel | undefined, diffSide: DiffSide) {
 		activeWebview.element.style.height = `${scrollHeight}px`;
 
 		if (activeWebview.insetMapping) {
@@ -429,8 +435,7 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		const model = await input.resolve();
 		if (this._model !== model) {
 			this._detachModel();
-			this._model = model;
-			this._attachModel();
+			this._attachModel(model);
 		}
 
 		this._model = model;
@@ -445,7 +450,10 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		this._layoutCancellationTokenSource = new CancellationTokenSource();
 
 		this._modifiedResourceDisposableStore.add(Event.any(this._model.original.notebook.onDidChangeContent, this._model.modified.notebook.onDidChangeContent)(e => {
-			if (this._model !== null) {
+			// If the user has made changes to the notebook whilst in the diff editor,
+			// then do not re-compute the diff of the notebook,
+			// As change will result in re-computing diff and re-building entire diff view.
+			if (this._model !== null && this.editorService.activeEditor !== input) {
 				this._layoutCancellationTokenSource?.dispose();
 				this._layoutCancellationTokenSource = new CancellationTokenSource();
 				this.updateLayout(this._layoutCancellationTokenSource.token);
@@ -473,11 +481,15 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		this._modifiedWebview?.element.remove();
 		this._modifiedWebview = null;
 
+		this.notebookDiffViewModel?.dispose();
+		this.notebookDiffViewModel = undefined;
+
 		this._modifiedResourceDisposableStore.clear();
 		this._list.clear();
 
 	}
-	private _attachModel() {
+	private _attachModel(model: INotebookDiffEditorModel) {
+		this._model = model;
 		this._eventDispatcher = new NotebookDiffEditorEventDispatcher();
 		const updateInsets = () => {
 			DOM.scheduleAtNextAnimationFrame(this.window, () => {
@@ -486,13 +498,13 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 				}
 
 				if (this._modifiedWebview) {
-					this._updateOutputsOffsetsInWebview(this._list.scrollTop, this._list.scrollHeight, this._modifiedWebview, (diffElement: DiffElementViewModelBase) => {
+					this._updateOutputsOffsetsInWebview(this._list.scrollTop, this._list.scrollHeight, this._modifiedWebview, (diffElement: DiffElementCellViewModelBase) => {
 						return diffElement.modified;
 					}, DiffSide.Modified);
 				}
 
 				if (this._originalWebview) {
-					this._updateOutputsOffsetsInWebview(this._list.scrollTop, this._list.scrollHeight, this._originalWebview, (diffElement: DiffElementViewModelBase) => {
+					this._updateOutputsOffsetsInWebview(this._list.scrollTop, this._list.scrollHeight, this._originalWebview, (diffElement: DiffElementCellViewModelBase) => {
 						return diffElement.original;
 					}, DiffSide.Original);
 				}
@@ -506,6 +518,24 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		this._localStore.add(this._eventDispatcher.onDidChangeCellLayout(() => {
 			updateInsets();
 		}));
+
+		const vm = this.notebookDiffViewModel = this._register(new NotebookDiffViewModel(this._model, this.notebookEditorWorkerService, this.configurationService, this._eventDispatcher!, this.notebookService, this.diffEditorCalcuator, this.fontInfo, undefined));
+		this._localStore.add(this.notebookDiffViewModel.onDidChangeItems(e => {
+			this._originalWebview?.removeInsets([...this._originalWebview?.insetMapping.keys()]);
+			this._modifiedWebview?.removeInsets([...this._modifiedWebview?.insetMapping.keys()]);
+
+			if (this._revealFirst && typeof e.firstChangeIndex === 'number' && e.firstChangeIndex < this._list.length) {
+				this._revealFirst = false;
+				this._list.setFocus([e.firstChangeIndex]);
+				this._list.reveal(e.firstChangeIndex, 0.3);
+			}
+
+			this._list.splice(e.start, e.deleteCount, e.elements);
+
+			if (this.isOverviewRulerEnabled()) {
+				this._overviewRuler.updateViewModels(vm.items, this._eventDispatcher);
+			}
+		}));
 	}
 
 	private async _createModifiedWebview(id: string, viewType: string, resource: URI): Promise<void> {
@@ -547,235 +577,21 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 	}
 
 	async updateLayout(token: CancellationToken, selections?: number[]) {
-		if (!this._model) {
+		if (!this._model || !this.notebookDiffViewModel) {
 			return;
 		}
 
-		const diffResult = await this.notebookEditorWorkerService.computeDiff(this._model.original.resource, this._model.modified.resource);
-
+		await this.notebookDiffViewModel.computeDiff(token);
 		if (token.isCancellationRequested) {
 			// after await the editor might be disposed.
 			return;
 		}
 
-		NotebookTextDiffEditor.prettyChanges(this._model, diffResult.cellsDiff);
-		const { viewModels, firstChangeIndex } = NotebookTextDiffEditor.computeDiff(this.instantiationService, this.configurationService, this._model, this._eventDispatcher!, diffResult, this.fontInfo);
-		const isSame = this._isViewModelTheSame(viewModels);
-
-		if (!isSame) {
-			this._originalWebview?.removeInsets([...this._originalWebview?.insetMapping.keys()]);
-			this._modifiedWebview?.removeInsets([...this._modifiedWebview?.insetMapping.keys()]);
-			this._setViewModel(viewModels);
-		}
-
-		// this._diffElementViewModels = viewModels;
-		// this._list.splice(0, this._list.length, this._diffElementViewModels);
-
-		if (this._revealFirst && firstChangeIndex !== -1 && firstChangeIndex < this._list.length) {
-			this._revealFirst = false;
-			this._list.setFocus([firstChangeIndex]);
-			this._list.reveal(firstChangeIndex, 0.3);
-		}
-
 		if (selections) {
 			this._list.setFocus(selections);
 		}
 	}
 
-	private _isViewModelTheSame(viewModels: DiffElementViewModelBase[]) {
-		let isSame = true;
-		if (this._diffElementViewModels.length === viewModels.length) {
-			for (let i = 0; i < viewModels.length; i++) {
-				const a = this._diffElementViewModels[i];
-				const b = viewModels[i];
-
-				if (a.original?.textModel.getHashValue() !== b.original?.textModel.getHashValue()
-					|| a.modified?.textModel.getHashValue() !== b.modified?.textModel.getHashValue()) {
-					isSame = false;
-					break;
-				}
-			}
-		} else {
-			isSame = false;
-		}
-
-		return isSame;
-	}
-
-	private _setViewModel(viewModels: DiffElementViewModelBase[]) {
-		this._diffElementViewModels = viewModels;
-		this._list.splice(0, this._list.length, this._diffElementViewModels);
-		if (this.isOverviewRulerEnabled()) {
-			this._overviewRuler.updateViewModels(this._diffElementViewModels, this._eventDispatcher);
-		}
-	}
-
-	/**
-	 * making sure that swapping cells are always translated to `insert+delete`.
-	 */
-	static prettyChanges(model: INotebookDiffEditorModel, diffResult: IDiffResult) {
-		const changes = diffResult.changes;
-		for (let i = 0; i < diffResult.changes.length - 1; i++) {
-			// then we know there is another change after current one
-			const curr = changes[i];
-			const next = changes[i + 1];
-			const x = curr.originalStart;
-			const y = curr.modifiedStart;
-
-			if (
-				curr.originalLength === 1
-				&& curr.modifiedLength === 0
-				&& next.originalStart === x + 2
-				&& next.originalLength === 0
-				&& next.modifiedStart === y + 1
-				&& next.modifiedLength === 1
-				&& model.original.notebook.cells[x].getHashValue() === model.modified.notebook.cells[y + 1].getHashValue()
-				&& model.original.notebook.cells[x + 1].getHashValue() === model.modified.notebook.cells[y].getHashValue()
-			) {
-				// this is a swap
-				curr.originalStart = x;
-				curr.originalLength = 0;
-				curr.modifiedStart = y;
-				curr.modifiedLength = 1;
-
-				next.originalStart = x + 1;
-				next.originalLength = 1;
-				next.modifiedStart = y + 2;
-				next.modifiedLength = 0;
-
-				i++;
-			}
-		}
-	}
-
-	static computeDiff(instantiationService: IInstantiationService, configurationService: IConfigurationService, model: INotebookDiffEditorModel, eventDispatcher: NotebookDiffEditorEventDispatcher, diffResult: INotebookDiffResult, fontInfo: FontInfo | undefined) {
-		const cellChanges = diffResult.cellsDiff.changes;
-		const diffElementViewModels: DiffElementViewModelBase[] = [];
-		const originalModel = model.original.notebook;
-		const modifiedModel = model.modified.notebook;
-		let originalCellIndex = 0;
-		let modifiedCellIndex = 0;
-
-		let firstChangeIndex = -1;
-		const initData = {
-			metadataStatusHeight: configurationService.getValue('notebook.diff.ignoreMetadata') ? 0 : 25,
-			outputStatusHeight: configurationService.getValue<boolean>('notebook.diff.ignoreOutputs') || !!(modifiedModel.transientOptions.transientOutputs) ? 0 : 25,
-			fontInfo
-		};
-
-		for (let i = 0; i < cellChanges.length; i++) {
-			const change = cellChanges[i];
-			// common cells
-
-			for (let j = 0; j < change.originalStart - originalCellIndex; j++) {
-				const originalCell = originalModel.cells[originalCellIndex + j];
-				const modifiedCell = modifiedModel.cells[modifiedCellIndex + j];
-				if (originalCell.getHashValue() === modifiedCell.getHashValue()) {
-					diffElementViewModels.push(new SideBySideDiffElementViewModel(
-						model.modified.notebook,
-						model.original.notebook,
-						instantiationService.createInstance(DiffNestedCellViewModel, originalCell),
-						instantiationService.createInstance(DiffNestedCellViewModel, modifiedCell),
-						'unchanged',
-						eventDispatcher,
-						initData
-					));
-				} else {
-					if (firstChangeIndex === -1) {
-						firstChangeIndex = diffElementViewModels.length;
-					}
-
-					diffElementViewModels.push(new SideBySideDiffElementViewModel(
-						model.modified.notebook,
-						model.original.notebook,
-						instantiationService.createInstance(DiffNestedCellViewModel, originalCell),
-						instantiationService.createInstance(DiffNestedCellViewModel, modifiedCell),
-						'modified',
-						eventDispatcher,
-						initData
-					));
-				}
-			}
-
-			const modifiedLCS = NotebookTextDiffEditor.computeModifiedLCS(instantiationService, change, originalModel, modifiedModel, eventDispatcher, initData);
-			if (modifiedLCS.length && firstChangeIndex === -1) {
-				firstChangeIndex = diffElementViewModels.length;
-			}
-
-			diffElementViewModels.push(...modifiedLCS);
-			originalCellIndex = change.originalStart + change.originalLength;
-			modifiedCellIndex = change.modifiedStart + change.modifiedLength;
-		}
-
-		for (let i = originalCellIndex; i < originalModel.cells.length; i++) {
-			diffElementViewModels.push(new SideBySideDiffElementViewModel(
-				model.modified.notebook,
-				model.original.notebook,
-				instantiationService.createInstance(DiffNestedCellViewModel, originalModel.cells[i]),
-				instantiationService.createInstance(DiffNestedCellViewModel, modifiedModel.cells[i - originalCellIndex + modifiedCellIndex]),
-				'unchanged',
-				eventDispatcher,
-				initData
-			));
-		}
-
-		return {
-			viewModels: diffElementViewModels,
-			firstChangeIndex
-		};
-	}
-
-	static computeModifiedLCS(instantiationService: IInstantiationService, change: IDiffChange, originalModel: NotebookTextModel, modifiedModel: NotebookTextModel, eventDispatcher: NotebookDiffEditorEventDispatcher, initData: {
-		metadataStatusHeight: number;
-		outputStatusHeight: number;
-		fontInfo: FontInfo | undefined;
-	}) {
-		const result: DiffElementViewModelBase[] = [];
-		// modified cells
-		const modifiedLen = Math.min(change.originalLength, change.modifiedLength);
-
-		for (let j = 0; j < modifiedLen; j++) {
-			const isTheSame = originalModel.cells[change.originalStart + j].equal(modifiedModel.cells[change.modifiedStart + j]);
-			result.push(new SideBySideDiffElementViewModel(
-				modifiedModel,
-				originalModel,
-				instantiationService.createInstance(DiffNestedCellViewModel, originalModel.cells[change.originalStart + j]),
-				instantiationService.createInstance(DiffNestedCellViewModel, modifiedModel.cells[change.modifiedStart + j]),
-				isTheSame ? 'unchanged' : 'modified',
-				eventDispatcher,
-				initData
-			));
-		}
-
-		for (let j = modifiedLen; j < change.originalLength; j++) {
-			// deletion
-			result.push(new SingleSideDiffElementViewModel(
-				originalModel,
-				modifiedModel,
-				instantiationService.createInstance(DiffNestedCellViewModel, originalModel.cells[change.originalStart + j]),
-				undefined,
-				'delete',
-				eventDispatcher,
-				initData
-			));
-		}
-
-		for (let j = modifiedLen; j < change.modifiedLength; j++) {
-			// insertion
-			result.push(new SingleSideDiffElementViewModel(
-				modifiedModel,
-				originalModel,
-				undefined,
-				instantiationService.createInstance(DiffNestedCellViewModel, modifiedModel.cells[change.modifiedStart + j]),
-				'insert',
-				eventDispatcher,
-				initData
-			));
-		}
-
-		return result;
-	}
-
 	scheduleOutputHeightAck(cellInfo: IDiffCellInfo, outputId: string, height: number) {
 		const diffElement = cellInfo.diffElement;
 		// const activeWebview = diffSide === DiffSide.Modified ? this._modifiedWebview : this._originalWebview;
@@ -799,11 +615,11 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		}, 10);
 	}
 
-	private pendingLayouts = new WeakMap<DiffElementViewModelBase, IDisposable>();
+	private pendingLayouts = new WeakMap<IDiffElementViewModelBase, IDisposable>();
 
 
-	layoutNotebookCell(cell: DiffElementViewModelBase, height: number) {
-		const relayout = (cell: DiffElementViewModelBase, height: number) => {
+	layoutNotebookCell(cell: IDiffElementViewModelBase, height: number) {
+		const relayout = (cell: IDiffElementViewModelBase, height: number) => {
 			this._list.updateElementHeight2(cell, height);
 		};
 
@@ -836,6 +652,9 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 	}
 
 	previousChange(): void {
+		if (!this.notebookDiffViewModel) {
+			return;
+		}
 		let currFocus = this._list.getFocus()[0];
 
 		if (isNaN(currFocus) || currFocus < 0) {
@@ -844,9 +663,10 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 
 		// find the index of previous change
 		let prevChangeIndex = currFocus - 1;
+		const currentViewModels = this.notebookDiffViewModel.items;
 		while (prevChangeIndex >= 0) {
-			const vm = this._diffElementViewModels[prevChangeIndex];
-			if (vm.type !== 'unchanged') {
+			const vm = currentViewModels[prevChangeIndex];
+			if (vm.type !== 'unchanged' && vm.type !== 'placeholder') {
 				break;
 			}
 
@@ -858,7 +678,7 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 			this._list.reveal(prevChangeIndex);
 		} else {
 			// go to the last one
-			const index = findLastIdx(this._diffElementViewModels, vm => vm.type !== 'unchanged');
+			const index = findLastIdx(currentViewModels, vm => vm.type !== 'unchanged' && vm.type !== 'placeholder');
 			if (index >= 0) {
 				this._list.setFocus([index]);
 				this._list.reveal(index);
@@ -867,6 +687,9 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 	}
 
 	nextChange(): void {
+		if (!this.notebookDiffViewModel) {
+			return;
+		}
 		let currFocus = this._list.getFocus()[0];
 
 		if (isNaN(currFocus) || currFocus < 0) {
@@ -875,21 +698,22 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 
 		// find the index of next change
 		let nextChangeIndex = currFocus + 1;
-		while (nextChangeIndex < this._diffElementViewModels.length) {
-			const vm = this._diffElementViewModels[nextChangeIndex];
-			if (vm.type !== 'unchanged') {
+		const currentViewModels = this.notebookDiffViewModel.items;
+		while (nextChangeIndex < currentViewModels.length) {
+			const vm = currentViewModels[nextChangeIndex];
+			if (vm.type !== 'unchanged' && vm.type !== 'placeholder') {
 				break;
 			}
 
 			nextChangeIndex++;
 		}
 
-		if (nextChangeIndex < this._diffElementViewModels.length) {
+		if (nextChangeIndex < currentViewModels.length) {
 			this._list.setFocus([nextChangeIndex]);
 			this._list.reveal(nextChangeIndex);
 		} else {
 			// go to the first one
-			const index = this._diffElementViewModels.findIndex(vm => vm.type !== 'unchanged');
+			const index = currentViewModels.findIndex(vm => vm.type !== 'unchanged' && vm.type !== 'placeholder');
 			if (index >= 0) {
 				this._list.setFocus([index]);
 				this._list.reveal(index);
@@ -897,7 +721,7 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		}
 	}
 
-	createOutput(cellDiffViewModel: DiffElementViewModelBase, cellViewModel: DiffNestedCellViewModel, output: IInsetRenderOutput, getOffset: () => number, diffSide: DiffSide): void {
+	createOutput(cellDiffViewModel: DiffElementCellViewModelBase, cellViewModel: DiffNestedCellViewModel, output: IInsetRenderOutput, getOffset: () => number, diffSide: DiffSide): void {
 		this._insetModifyQueueByOutputId.queue(output.source.model.outputId + (diffSide === DiffSide.Modified ? '-right' : 'left'), async () => {
 			const activeWebview = diffSide === DiffSide.Modified ? this._modifiedWebview : this._originalWebview;
 			if (!activeWebview) {
@@ -934,7 +758,7 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		throw new Error('Not implemented');
 	}
 
-	removeInset(cellDiffViewModel: DiffElementViewModelBase, cellViewModel: DiffNestedCellViewModel, displayOutput: ICellOutputViewModel, diffSide: DiffSide) {
+	removeInset(cellDiffViewModel: DiffElementCellViewModelBase, cellViewModel: DiffNestedCellViewModel, displayOutput: ICellOutputViewModel, diffSide: DiffSide) {
 		this._insetModifyQueueByOutputId.queue(displayOutput.model.outputId + (diffSide === DiffSide.Modified ? '-right' : 'left'), async () => {
 			const activeWebview = diffSide === DiffSide.Modified ? this._modifiedWebview : this._originalWebview;
 			if (!activeWebview) {
@@ -949,7 +773,7 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		});
 	}
 
-	showInset(cellDiffViewModel: DiffElementViewModelBase, cellViewModel: DiffNestedCellViewModel, displayOutput: ICellOutputViewModel, diffSide: DiffSide) {
+	showInset(cellDiffViewModel: DiffElementCellViewModelBase, cellViewModel: DiffNestedCellViewModel, displayOutput: ICellOutputViewModel, diffSide: DiffSide) {
 		this._insetModifyQueueByOutputId.queue(displayOutput.model.outputId + (diffSide === DiffSide.Modified ? '-right' : 'left'), async () => {
 			const activeWebview = diffSide === DiffSide.Modified ? this._modifiedWebview : this._originalWebview;
 			if (!activeWebview) {
@@ -973,7 +797,7 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		});
 	}
 
-	hideInset(cellDiffViewModel: DiffElementViewModelBase, cellViewModel: DiffNestedCellViewModel, output: ICellOutputViewModel) {
+	hideInset(cellDiffViewModel: DiffElementCellViewModelBase, cellViewModel: DiffNestedCellViewModel, output: ICellOutputViewModel) {
 		this._modifiedWebview?.hideInset(output);
 		this._originalWebview?.hideInset(output);
 	}
@@ -1002,8 +826,8 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		this._modifiedResourceDisposableStore.clear();
 		this._list?.splice(0, this._list?.length || 0);
 		this._model = null;
-		this._diffElementViewModels.forEach(vm => vm.dispose());
-		this._diffElementViewModels = [];
+		this.notebookDiffViewModel?.dispose();
+		this.notebookDiffViewModel = undefined;
 	}
 
 	deltaCellOutputContainerClassNames(diffSide: DiffSide, cellId: string, added: string[], removed: string[]) {
@@ -1028,56 +852,6 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		};
 	}
 
-	getCellOutputLayoutInfo(nestedCell: DiffNestedCellViewModel) {
-		if (!this._model) {
-			throw new Error('Editor is not attached to model yet');
-		}
-		const documentModel = CellUri.parse(nestedCell.uri);
-		if (!documentModel) {
-			throw new Error('Nested cell in the diff editor has wrong Uri');
-		}
-
-		const belongToOriginalDocument = this._model.original.notebook.uri.toString() === documentModel.notebook.toString();
-		const viewModel = this._diffElementViewModels.find(element => {
-			const textModel = belongToOriginalDocument ? element.original : element.modified;
-			if (!textModel) {
-				return false;
-			}
-
-			if (textModel.uri.toString() === nestedCell.uri.toString()) {
-				return true;
-			}
-
-			return false;
-		});
-
-		if (!viewModel) {
-			throw new Error('Nested cell in the diff editor does not match any diff element');
-		}
-
-		if (viewModel.type === 'unchanged') {
-			return this.getLayoutInfo();
-		}
-
-		if (viewModel.type === 'insert' || viewModel.type === 'delete') {
-			return {
-				width: this._dimension!.width / 2,
-				height: this._dimension!.height / 2,
-				fontInfo: this.fontInfo
-			};
-		}
-
-		if (viewModel.checkIfOutputsModified()) {
-			return {
-				width: this._dimension!.width / 2,
-				height: this._dimension!.height / 2,
-				fontInfo: this.fontInfo
-			};
-		} else {
-			return this.getLayoutInfo();
-		}
-	}
-
 	layout(dimension: DOM.Dimension, _position: DOM.IDomPosition): void {
 		this._rootElement.classList.toggle('mid-width', dimension.width < 1000 && dimension.width >= 600);
 		this._rootElement.classList.toggle('narrow-width', dimension.width < 600);
@@ -1137,4 +911,6 @@ registerThemingParticipant((theme, collector) => {
 	`);
 
 	collector.addRule(`.notebook-text-diff-editor .cell-body { margin: ${DIFF_CELL_MARGIN}px; }`);
+	// We do not want a left margin, as we add an overlay for expanind the collapsed/hidden cells.
+	collector.addRule(`.notebook-text-diff-editor .cell-placeholder-body { margin: ${DIFF_CELL_MARGIN}px 0; }`);
 });
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser.ts
index 031c2afdc7f..2cc1ef95b7d 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser.ts
@@ -3,19 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CellLayoutState, ICellOutputViewModel, ICommonCellInfo, IGenericCellViewModel, IInsetRenderOutput } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { DiffElementViewModelBase } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
-import { Event } from 'vs/base/common/event';
-import { BareFontInfo } from 'vs/editor/common/config/fontInfo';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { NotebookOptions } from 'vs/workbench/contrib/notebook/browser/notebookOptions';
-import { NotebookLayoutInfo } from 'vs/workbench/contrib/notebook/browser/notebookViewEvents';
-import { WorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
-import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditor/diffEditorWidget';
+import { CellLayoutState, ICellOutputViewModel, ICommonCellInfo, IGenericCellViewModel, IInsetRenderOutput } from '../notebookBrowser.js';
+import { DiffElementCellViewModelBase, IDiffElementViewModelBase } from './diffElementViewModel.js';
+import { Event } from '../../../../../base/common/event.js';
+import { BareFontInfo } from '../../../../../editor/common/config/fontInfo.js';
+import { DisposableStore, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { NotebookTextModel } from '../../common/model/notebookTextModel.js';
+import { CodeEditorWidget } from '../../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { IMouseWheelEvent } from '../../../../../base/browser/mouseEvent.js';
+import { RawContextKey } from '../../../../../platform/contextkey/common/contextkey.js';
+import { NotebookOptions } from '../notebookOptions.js';
+import { NotebookLayoutInfo } from '../notebookViewEvents.js';
+import { WorkbenchToolBar } from '../../../../../platform/actions/browser/toolbar.js';
+import { DiffEditorWidget } from '../../../../../editor/browser/widget/diffEditor/diffEditorWidget.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { localize } from '../../../../../nls.js';
 
 export enum DiffSide {
 	Original = 0,
@@ -23,24 +25,24 @@ export enum DiffSide {
 }
 
 export interface IDiffCellInfo extends ICommonCellInfo {
-	diffElement: DiffElementViewModelBase;
+	diffElement: DiffElementCellViewModelBase;
 }
 
 export interface INotebookTextDiffEditor {
 	notebookOptions: NotebookOptions;
 	readonly textModel?: NotebookTextModel;
-	onMouseUp: Event<{ readonly event: MouseEvent; readonly target: DiffElementViewModelBase }>;
+	onMouseUp: Event<{ readonly event: MouseEvent; readonly target: IDiffElementViewModelBase }>;
 	onDidScroll: Event<void>;
 	onDidDynamicOutputRendered: Event<{ cell: IGenericCellViewModel; output: ICellOutputViewModel }>;
 	getOverflowContainerDomNode(): HTMLElement;
 	getLayoutInfo(): NotebookLayoutInfo;
 	getScrollTop(): number;
 	getScrollHeight(): number;
-	layoutNotebookCell(cell: DiffElementViewModelBase, height: number): void;
-	createOutput(cellDiffViewModel: DiffElementViewModelBase, cellViewModel: IDiffNestedCellViewModel, output: IInsetRenderOutput, getOffset: () => number, diffSide: DiffSide): void;
-	showInset(cellDiffViewModel: DiffElementViewModelBase, cellViewModel: IDiffNestedCellViewModel, displayOutput: ICellOutputViewModel, diffSide: DiffSide): void;
-	removeInset(cellDiffViewModel: DiffElementViewModelBase, cellViewModel: IDiffNestedCellViewModel, output: ICellOutputViewModel, diffSide: DiffSide): void;
-	hideInset(cellDiffViewModel: DiffElementViewModelBase, cellViewModel: IDiffNestedCellViewModel, output: ICellOutputViewModel): void;
+	layoutNotebookCell(cell: IDiffElementViewModelBase, height: number): void;
+	createOutput(cellDiffViewModel: DiffElementCellViewModelBase, cellViewModel: IDiffNestedCellViewModel, output: IInsetRenderOutput, getOffset: () => number, diffSide: DiffSide): void;
+	showInset(cellDiffViewModel: DiffElementCellViewModelBase, cellViewModel: IDiffNestedCellViewModel, displayOutput: ICellOutputViewModel, diffSide: DiffSide): void;
+	removeInset(cellDiffViewModel: DiffElementCellViewModelBase, cellViewModel: IDiffNestedCellViewModel, output: ICellOutputViewModel, diffSide: DiffSide): void;
+	hideInset(cellDiffViewModel: DiffElementCellViewModelBase, cellViewModel: IDiffNestedCellViewModel, output: ICellOutputViewModel): void;
 	/**
 	 * Trigger the editor to scroll from scroll event programmatically
 	 */
@@ -66,12 +68,22 @@ export interface CellDiffCommonRenderTemplate {
 	readonly bottomBorder: HTMLElement;
 }
 
+export interface CellDiffPlaceholderRenderTemplate {
+	readonly container: HTMLElement;
+	readonly placeholder: HTMLElement;
+	readonly body: HTMLElement;
+	readonly marginOverlay: IDiffCellMarginOverlay;
+	readonly elementDisposables: DisposableStore;
+}
+
 export interface CellDiffSingleSideRenderTemplate extends CellDiffCommonRenderTemplate {
 	readonly container: HTMLElement;
 	readonly body: HTMLElement;
 	readonly diffEditorContainer: HTMLElement;
 	readonly diagonalFill: HTMLElement;
 	readonly elementDisposables: DisposableStore;
+	readonly cellHeaderContainer: HTMLElement;
+	readonly editorContainer: HTMLElement;
 	readonly sourceEditor: CodeEditorWidget;
 	readonly metadataHeaderContainer: HTMLElement;
 	readonly metadataInfoContainer: HTMLElement;
@@ -80,11 +92,31 @@ export interface CellDiffSingleSideRenderTemplate extends CellDiffCommonRenderTe
 }
 
 
+export interface NotebookDocumentDiffElementRenderTemplate extends CellDiffCommonRenderTemplate {
+	readonly container: HTMLElement;
+	readonly body: HTMLElement;
+	readonly diffEditorContainer: HTMLElement;
+	readonly elementDisposables: DisposableStore;
+	readonly cellHeaderContainer: HTMLElement;
+	readonly sourceEditor: DiffEditorWidget;
+	readonly editorContainer: HTMLElement;
+	readonly inputToolbarContainer: HTMLElement;
+	readonly toolbar: WorkbenchToolBar;
+	readonly marginOverlay: IDiffCellMarginOverlay;
+}
+
+export interface IDiffCellMarginOverlay extends IDisposable {
+	onAction: Event<void>;
+	show(): void;
+	hide(): void;
+}
+
 export interface CellDiffSideBySideRenderTemplate extends CellDiffCommonRenderTemplate {
 	readonly container: HTMLElement;
 	readonly body: HTMLElement;
 	readonly diffEditorContainer: HTMLElement;
 	readonly elementDisposables: DisposableStore;
+	readonly cellHeaderContainer: HTMLElement;
 	readonly sourceEditor: DiffEditorWidget;
 	readonly editorContainer: HTMLElement;
 	readonly inputToolbarContainer: HTMLElement;
@@ -93,6 +125,7 @@ export interface CellDiffSideBySideRenderTemplate extends CellDiffCommonRenderTe
 	readonly metadataInfoContainer: HTMLElement;
 	readonly outputHeaderContainer: HTMLElement;
 	readonly outputInfoContainer: HTMLElement;
+	readonly marginOverlay: IDiffCellMarginOverlay;
 }
 
 export interface IDiffElementLayoutInfo {
@@ -101,6 +134,7 @@ export interface IDiffElementLayoutInfo {
 	editorHeight: number;
 	editorMargin: number;
 	metadataHeight: number;
+	cellStatusHeight: number;
 	metadataStatusHeight: number;
 	rawOutputHeight: number;
 	outputMetadataHeight: number;
@@ -121,6 +155,35 @@ export interface CellDiffViewModelLayoutChangeEvent extends IDiffElementSelfLayo
 }
 
 export const DIFF_CELL_MARGIN = 16;
-export const NOTEBOOK_DIFF_CELL_INPUT = new RawContextKey<boolean>('notebookDiffCellInputChanged', false);
-export const NOTEBOOK_DIFF_CELL_PROPERTY = new RawContextKey<boolean>('notebookDiffCellPropertyChanged', false);
-export const NOTEBOOK_DIFF_CELL_PROPERTY_EXPANDED = new RawContextKey<boolean>('notebookDiffCellPropertyExpanded', false);
+export const NOTEBOOK_DIFF_CELL_INPUT = new RawContextKey<boolean>('notebook.diffEditor.cell.inputChanged', false);
+export const NOTEBOOK_DIFF_METADATA = new RawContextKey<boolean>('notebook.diffEditor.metadataChanged', false);
+export const NOTEBOOK_DIFF_CELL_IGNORE_WHITESPACE_KEY = 'notebook.diffEditor.cell.ignoreWhitespace';
+export const NOTEBOOK_DIFF_CELL_IGNORE_WHITESPACE = new RawContextKey<boolean>(NOTEBOOK_DIFF_CELL_IGNORE_WHITESPACE_KEY, false);
+export const NOTEBOOK_DIFF_CELL_PROPERTY = new RawContextKey<boolean>('notebook.diffEditor.cell.property.changed', false);
+export const NOTEBOOK_DIFF_CELL_PROPERTY_EXPANDED = new RawContextKey<boolean>('notebook.diffEditor.cell.property.expanded', false);
+export const NOTEBOOK_DIFF_CELLS_COLLAPSED = new RawContextKey<boolean>('notebook.diffEditor.allCollapsed', undefined, localize('notebook.diffEditor.allCollapsed', "Whether all cells in notebook diff editor are collapsed"));
+export const NOTEBOOK_DIFF_HAS_UNCHANGED_CELLS = new RawContextKey<boolean>('notebook.diffEditor.hasUnchangedCells', undefined, localize('notebook.diffEditor.hasUnchangedCells', "Whether there are unchanged cells in the notebook diff editor"));
+export const NOTEBOOK_DIFF_UNCHANGED_CELLS_HIDDEN = new RawContextKey<boolean>('notebook.diffEditor.unchangedCellsAreHidden', undefined, localize('notebook.diffEditor.unchangedCellsAreHidden', "Whether the unchanged cells in the notebook diff editor are hidden"));
+export const NOTEBOOK_DIFF_ITEM_KIND = new RawContextKey<boolean>('notebook.diffEditor.item.kind', undefined, localize('notebook.diffEditor.item.kind', "The kind of item in the notebook diff editor, Cell, Metadata or Output"));
+export const NOTEBOOK_DIFF_ITEM_DIFF_STATE = new RawContextKey<boolean>('notebook.diffEditor.item.state', undefined, localize('notebook.diffEditor.item.state', "The diff state of item in the notebook diff editor, delete, insert, modified or unchanged"));
+
+export interface INotebookDiffViewModelUpdateEvent {
+	readonly start: number;
+	readonly deleteCount: number;
+	readonly elements: readonly IDiffElementViewModelBase[];
+	readonly firstChangeIndex?: number;
+}
+
+export interface INotebookDiffViewModel extends IDisposable {
+	readonly items: readonly IDiffElementViewModelBase[];
+	/**
+	 * Triggered when ever there's a change in the view model items.
+	 */
+	onDidChangeItems: Event<INotebookDiffViewModelUpdateEvent>;
+	/**
+	 * Computes the differences and generates the viewmodel.
+	 * If view models are generated, then the onDidChangeItems is triggered.
+	 * @param token
+	 */
+	computeDiff(token: CancellationToken): Promise<void>;
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffList.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffList.ts
index a3cfecd2a6f..dd7de68ed52 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffList.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffList.ts
@@ -3,35 +3,39 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./notebookDiff';
-import { IListMouseEvent, IListRenderer, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import * as DOM from 'vs/base/browser/dom';
-import { IListOptions, IListStyles, isMonacoEditor, IStyleController, MouseController } from 'vs/base/browser/ui/list/listWidget';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IListService, IWorkbenchListOptions, WorkbenchList } from 'vs/platform/list/browser/listService';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { DiffElementViewModelBase, SideBySideDiffElementViewModel, SingleSideDiffElementViewModel } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
-import { CellDiffSideBySideRenderTemplate, CellDiffSingleSideRenderTemplate, DIFF_CELL_MARGIN, INotebookTextDiffEditor } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
-import { DeletedElement, getOptimizedNestedCodeEditorWidgetOptions, InsertElement, ModifiedElement } from 'vs/workbench/contrib/notebook/browser/diff/diffComponents';
-import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditor/diffEditorWidget';
-import { IMenuService, MenuItemAction } from 'vs/platform/actions/common/actions';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { CodiconActionViewItem } from 'vs/workbench/contrib/notebook/browser/view/cellParts/cellActionView';
-import { IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
-import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { BareFontInfo } from 'vs/editor/common/config/fontInfo';
-import { PixelRatio } from 'vs/base/browser/pixelRatio';
-import { WorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
-import { fixedDiffEditorOptions, fixedEditorOptions } from 'vs/workbench/contrib/notebook/browser/diff/diffCellEditorOptions';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
+import './notebookDiff.css';
+import { IListMouseEvent, IListRenderer, IListVirtualDelegate } from '../../../../../base/browser/ui/list/list.js';
+import * as DOM from '../../../../../base/browser/dom.js';
+import { IListOptions, IListStyles, isMonacoEditor, IStyleController, MouseController } from '../../../../../base/browser/ui/list/listWidget.js';
+import { DisposableStore, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { IListService, IWorkbenchListOptions, WorkbenchList } from '../../../../../platform/list/browser/listService.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { DiffElementPlaceholderViewModel, IDiffElementViewModelBase, NotebookDocumentMetadataViewModel, SideBySideDiffElementViewModel, SingleSideDiffElementViewModel } from './diffElementViewModel.js';
+import { CellDiffPlaceholderRenderTemplate, CellDiffSideBySideRenderTemplate, CellDiffSingleSideRenderTemplate, DIFF_CELL_MARGIN, INotebookTextDiffEditor, NotebookDocumentDiffElementRenderTemplate } from './notebookDiffEditorBrowser.js';
+import { CellDiffPlaceholderElement, CollapsedCellOverlayWidget, DeletedElement, getOptimizedNestedCodeEditorWidgetOptions, InsertElement, ModifiedElement, NotebookDocumentMetadataElement, UnchangedCellOverlayWidget } from './diffComponents.js';
+import { CodeEditorWidget } from '../../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { DiffEditorWidget } from '../../../../../editor/browser/widget/diffEditor/diffEditorWidget.js';
+import { IMenuService, MenuItemAction } from '../../../../../platform/actions/common/actions.js';
+import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
+import { INotificationService } from '../../../../../platform/notification/common/notification.js';
+import { CodiconActionViewItem } from '../view/cellParts/cellActionView.js';
+import { IMouseWheelEvent } from '../../../../../base/browser/mouseEvent.js';
+import { IEditorOptions } from '../../../../../editor/common/config/editorOptions.js';
+import { BareFontInfo } from '../../../../../editor/common/config/fontInfo.js';
+import { PixelRatio } from '../../../../../base/browser/pixelRatio.js';
+import { WorkbenchToolBar } from '../../../../../platform/actions/browser/toolbar.js';
+import { fixedDiffEditorOptions, fixedEditorOptions } from './diffCellEditorOptions.js';
+import { IAccessibilityService } from '../../../../../platform/accessibility/common/accessibility.js';
+import { localize } from '../../../../../nls.js';
+import { IEditorConstructionOptions } from '../../../../../editor/browser/config/editorConfiguration.js';
+import { IDiffEditorConstructionOptions } from '../../../../../editor/browser/editorBrowser.js';
+import { EditorExtensionsRegistry } from '../../../../../editor/browser/editorExtensions.js';
 
-export class NotebookCellTextDiffListDelegate implements IListVirtualDelegate<DiffElementViewModelBase> {
+export class NotebookCellTextDiffListDelegate implements IListVirtualDelegate<IDiffElementViewModelBase> {
 	private readonly lineHeight: number;
 
 	constructor(
@@ -42,15 +46,15 @@ export class NotebookCellTextDiffListDelegate implements IListVirtualDelegate<Di
 		this.lineHeight = BareFontInfo.createFromRawSettings(editorOptions, PixelRatio.getInstance(targetWindow).value).lineHeight;
 	}
 
-	getHeight(element: DiffElementViewModelBase): number {
+	getHeight(element: IDiffElementViewModelBase): number {
 		return element.getHeight(this.lineHeight);
 	}
 
-	hasDynamicHeight(element: DiffElementViewModelBase): boolean {
+	hasDynamicHeight(element: IDiffElementViewModelBase): boolean {
 		return false;
 	}
 
-	getTemplateId(element: DiffElementViewModelBase): string {
+	getTemplateId(element: IDiffElementViewModelBase): string {
 		switch (element.type) {
 			case 'delete':
 			case 'insert':
@@ -58,10 +62,153 @@ export class NotebookCellTextDiffListDelegate implements IListVirtualDelegate<Di
 			case 'modified':
 			case 'unchanged':
 				return CellDiffSideBySideRenderer.TEMPLATE_ID;
+			case 'placeholder':
+				return CellDiffPlaceholderRenderer.TEMPLATE_ID;
+			case 'modifiedMetadata':
+			case 'unchangedMetadata':
+				return NotebookDocumentMetadataDiffRenderer.TEMPLATE_ID;
 		}
-
 	}
 }
+
+export class CellDiffPlaceholderRenderer implements IListRenderer<DiffElementPlaceholderViewModel, CellDiffPlaceholderRenderTemplate> {
+	static readonly TEMPLATE_ID = 'cell_diff_placeholder';
+
+	constructor(
+		readonly notebookEditor: INotebookTextDiffEditor,
+		@IInstantiationService protected readonly instantiationService: IInstantiationService
+	) { }
+
+	get templateId() {
+		return CellDiffPlaceholderRenderer.TEMPLATE_ID;
+	}
+
+	renderTemplate(container: HTMLElement): CellDiffPlaceholderRenderTemplate {
+		const body = DOM.$('.cell-placeholder-body');
+		DOM.append(container, body);
+
+		const elementDisposables = new DisposableStore();
+		const marginOverlay = new CollapsedCellOverlayWidget(body);
+		const contents = DOM.append(body, DOM.$('.contents'));
+		const placeholder = DOM.append(contents, DOM.$('span.text', { title: localize('notebook.diff.hiddenCells.expandAll', 'Double click to show') }));
+
+		return {
+			body,
+			container,
+			placeholder,
+			marginOverlay,
+			elementDisposables
+		};
+	}
+
+	renderElement(element: DiffElementPlaceholderViewModel, index: number, templateData: CellDiffPlaceholderRenderTemplate, height: number | undefined): void {
+		templateData.body.classList.remove('left', 'right', 'full');
+		templateData.elementDisposables.add(this.instantiationService.createInstance(CellDiffPlaceholderElement, element, templateData));
+	}
+
+	disposeTemplate(templateData: CellDiffPlaceholderRenderTemplate): void {
+		templateData.container.innerText = '';
+	}
+
+	disposeElement(element: DiffElementPlaceholderViewModel, index: number, templateData: CellDiffPlaceholderRenderTemplate): void {
+		templateData.elementDisposables.clear();
+	}
+}
+
+export class NotebookDocumentMetadataDiffRenderer implements IListRenderer<NotebookDocumentMetadataViewModel, NotebookDocumentDiffElementRenderTemplate> {
+	static readonly TEMPLATE_ID = 'notebook_metadata_diff_side_by_side';
+
+	constructor(
+		readonly notebookEditor: INotebookTextDiffEditor,
+		@IInstantiationService protected readonly instantiationService: IInstantiationService,
+		@IContextMenuService protected readonly contextMenuService: IContextMenuService,
+		@IKeybindingService protected readonly keybindingService: IKeybindingService,
+		@IMenuService protected readonly menuService: IMenuService,
+		@IContextKeyService protected readonly contextKeyService: IContextKeyService,
+		@INotificationService protected readonly notificationService: INotificationService,
+		@IThemeService protected readonly themeService: IThemeService,
+		@IAccessibilityService protected readonly accessibilityService: IAccessibilityService
+	) { }
+
+	get templateId() {
+		return NotebookDocumentMetadataDiffRenderer.TEMPLATE_ID;
+	}
+
+	renderTemplate(container: HTMLElement): NotebookDocumentDiffElementRenderTemplate {
+		const body = DOM.$('.cell-body');
+		DOM.append(container, body);
+		const diffEditorContainer = DOM.$('.cell-diff-editor-container');
+		DOM.append(body, diffEditorContainer);
+
+		const cellHeaderContainer = DOM.append(diffEditorContainer, DOM.$('.input-header-container'));
+		const sourceContainer = DOM.append(diffEditorContainer, DOM.$('.source-container'));
+		const { editor, editorContainer } = this._buildSourceEditor(sourceContainer);
+
+		const inputToolbarContainer = DOM.append(sourceContainer, DOM.$('.editor-input-toolbar-container'));
+		const cellToolbarContainer = DOM.append(inputToolbarContainer, DOM.$('div.property-toolbar'));
+		const toolbar = this.instantiationService.createInstance(WorkbenchToolBar, cellToolbarContainer, {
+			actionViewItemProvider: (action, options) => {
+				if (action instanceof MenuItemAction) {
+					const item = new CodiconActionViewItem(action, { hoverDelegate: options.hoverDelegate }, this.keybindingService, this.notificationService, this.contextKeyService, this.themeService, this.contextMenuService, this.accessibilityService);
+					return item;
+				}
+
+				return undefined;
+			},
+			highlightToggledItems: true
+		});
+
+		const borderContainer = DOM.append(body, DOM.$('.border-container'));
+		const leftBorder = DOM.append(borderContainer, DOM.$('.left-border'));
+		const rightBorder = DOM.append(borderContainer, DOM.$('.right-border'));
+		const topBorder = DOM.append(borderContainer, DOM.$('.top-border'));
+		const bottomBorder = DOM.append(borderContainer, DOM.$('.bottom-border'));
+		const marginOverlay = new UnchangedCellOverlayWidget(body);
+		const elementDisposables = new DisposableStore();
+
+		return {
+			body,
+			container,
+			diffEditorContainer,
+			cellHeaderContainer,
+			sourceEditor: editor,
+			editorContainer,
+			inputToolbarContainer,
+			toolbar,
+			leftBorder,
+			rightBorder,
+			topBorder,
+			bottomBorder,
+			marginOverlay,
+			elementDisposables
+		};
+	}
+
+	private _buildSourceEditor(sourceContainer: HTMLElement) {
+		return buildDiffEditorWidget(this.instantiationService, this.notebookEditor, sourceContainer, { readOnly: true });
+	}
+
+	renderElement(element: NotebookDocumentMetadataViewModel, index: number, templateData: NotebookDocumentDiffElementRenderTemplate, height: number | undefined): void {
+		templateData.body.classList.remove('full');
+		templateData.elementDisposables.add(this.instantiationService.createInstance(NotebookDocumentMetadataElement, this.notebookEditor, element, templateData));
+	}
+
+	disposeTemplate(templateData: NotebookDocumentDiffElementRenderTemplate): void {
+		templateData.container.innerText = '';
+		templateData.sourceEditor.dispose();
+		templateData.toolbar?.dispose();
+		templateData.elementDisposables.dispose();
+	}
+
+	disposeElement(element: NotebookDocumentMetadataViewModel, index: number, templateData: NotebookDocumentDiffElementRenderTemplate): void {
+		if (templateData.toolbar) {
+			templateData.toolbar.context = undefined;
+		}
+		templateData.elementDisposables.clear();
+	}
+}
+
+
 export class CellDiffSingleSideRenderer implements IListRenderer<SingleSideDiffElementViewModel, CellDiffSingleSideRenderTemplate | CellDiffSideBySideRenderTemplate> {
 	static readonly TEMPLATE_ID = 'cell_diff_single';
 
@@ -82,8 +229,9 @@ export class CellDiffSingleSideRenderer implements IListRenderer<SingleSideDiffE
 
 		const diagonalFill = DOM.append(body, DOM.$('.diagonal-fill'));
 
+		const cellHeaderContainer = DOM.append(diffEditorContainer, DOM.$('.input-header-container'));
 		const sourceContainer = DOM.append(diffEditorContainer, DOM.$('.source-container'));
-		const editor = this._buildSourceEditor(sourceContainer);
+		const { editor, editorContainer } = this._buildSourceEditor(sourceContainer);
 
 		const metadataHeaderContainer = DOM.append(diffEditorContainer, DOM.$('.metadata-header-container'));
 		const metadataInfoContainer = DOM.append(diffEditorContainer, DOM.$('.metadata-info-container'));
@@ -100,8 +248,10 @@ export class CellDiffSingleSideRenderer implements IListRenderer<SingleSideDiffE
 		return {
 			body,
 			container,
+			editorContainer,
 			diffEditorContainer,
 			diagonalFill,
+			cellHeaderContainer,
 			sourceEditor: editor,
 			metadataHeaderContainer,
 			metadataInfoContainer,
@@ -116,19 +266,7 @@ export class CellDiffSingleSideRenderer implements IListRenderer<SingleSideDiffE
 	}
 
 	private _buildSourceEditor(sourceContainer: HTMLElement) {
-		const editorContainer = DOM.append(sourceContainer, DOM.$('.editor-container'));
-
-		const editor = this.instantiationService.createInstance(CodeEditorWidget, editorContainer, {
-			...fixedEditorOptions,
-			dimension: {
-				width: (this.notebookEditor.getLayoutInfo().width - 2 * DIFF_CELL_MARGIN) / 2 - 18,
-				height: 0
-			},
-			automaticLayout: false,
-			overflowWidgetsDomNode: this.notebookEditor.getOverflowContainerDomNode()
-		}, {});
-
-		return editor;
+		return buildSourceEditor(this.instantiationService, this.notebookEditor, sourceContainer);
 	}
 
 	renderElement(element: SingleSideDiffElementViewModel, index: number, templateData: CellDiffSingleSideRenderTemplate, height: number | undefined): void {
@@ -183,6 +321,7 @@ export class CellDiffSideBySideRenderer implements IListRenderer<SideBySideDiffE
 		const diffEditorContainer = DOM.$('.cell-diff-editor-container');
 		DOM.append(body, diffEditorContainer);
 
+		const cellHeaderContainer = DOM.append(diffEditorContainer, DOM.$('.input-header-container'));
 		const sourceContainer = DOM.append(diffEditorContainer, DOM.$('.source-container'));
 		const { editor, editorContainer } = this._buildSourceEditor(sourceContainer);
 
@@ -196,7 +335,8 @@ export class CellDiffSideBySideRenderer implements IListRenderer<SideBySideDiffE
 				}
 
 				return undefined;
-			}
+			},
+			highlightToggledItems: true
 		});
 
 		const metadataHeaderContainer = DOM.append(diffEditorContainer, DOM.$('.metadata-header-container'));
@@ -210,12 +350,14 @@ export class CellDiffSideBySideRenderer implements IListRenderer<SideBySideDiffE
 		const rightBorder = DOM.append(borderContainer, DOM.$('.right-border'));
 		const topBorder = DOM.append(borderContainer, DOM.$('.top-border'));
 		const bottomBorder = DOM.append(borderContainer, DOM.$('.bottom-border'));
-
+		const marginOverlay = new UnchangedCellOverlayWidget(body);
+		const elementDisposables = new DisposableStore();
 
 		return {
 			body,
 			container,
 			diffEditorContainer,
+			cellHeaderContainer,
 			sourceEditor: editor,
 			editorContainer,
 			inputToolbarContainer,
@@ -228,38 +370,13 @@ export class CellDiffSideBySideRenderer implements IListRenderer<SideBySideDiffE
 			rightBorder,
 			topBorder,
 			bottomBorder,
-			elementDisposables: new DisposableStore()
+			marginOverlay,
+			elementDisposables
 		};
 	}
 
 	private _buildSourceEditor(sourceContainer: HTMLElement) {
-		const editorContainer = DOM.append(sourceContainer, DOM.$('.editor-container'));
-
-		const editor = this.instantiationService.createInstance(DiffEditorWidget, editorContainer, {
-			...fixedDiffEditorOptions,
-			padding: {
-				top: 24,
-				bottom: 12
-			},
-			overflowWidgetsDomNode: this.notebookEditor.getOverflowContainerDomNode(),
-			originalEditable: false,
-			ignoreTrimWhitespace: false,
-			automaticLayout: false,
-			dimension: {
-				height: 0,
-				width: 0
-			},
-			renderSideBySide: true,
-			useInlineViewWhenSpaceIsLimited: false
-		}, {
-			originalEditor: getOptimizedNestedCodeEditorWidgetOptions(),
-			modifiedEditor: getOptimizedNestedCodeEditorWidgetOptions()
-		});
-
-		return {
-			editor,
-			editorContainer
-		};
+		return buildDiffEditorWidget(this.instantiationService, this.notebookEditor, sourceContainer);
 	}
 
 	renderElement(element: SideBySideDiffElementViewModel, index: number, templateData: CellDiffSideBySideRenderTemplate, height: number | undefined): void {
@@ -303,7 +420,7 @@ export class NotebookMouseController<T> extends MouseController<T> {
 	}
 }
 
-export class NotebookTextDiffList extends WorkbenchList<DiffElementViewModelBase> implements IDisposable, IStyleController {
+export class NotebookTextDiffList extends WorkbenchList<IDiffElementViewModelBase> implements IDisposable, IStyleController {
 	private styleElement?: HTMLStyleElement;
 
 	get rowsContainer(): HTMLElement {
@@ -313,21 +430,21 @@ export class NotebookTextDiffList extends WorkbenchList<DiffElementViewModelBase
 	constructor(
 		listUser: string,
 		container: HTMLElement,
-		delegate: IListVirtualDelegate<DiffElementViewModelBase>,
-		renderers: IListRenderer<DiffElementViewModelBase, CellDiffSingleSideRenderTemplate | CellDiffSideBySideRenderTemplate>[],
+		delegate: IListVirtualDelegate<IDiffElementViewModelBase>,
+		renderers: IListRenderer<IDiffElementViewModelBase, CellDiffSingleSideRenderTemplate | CellDiffSideBySideRenderTemplate | CellDiffPlaceholderRenderTemplate | NotebookDocumentDiffElementRenderTemplate>[],
 		contextKeyService: IContextKeyService,
-		options: IWorkbenchListOptions<DiffElementViewModelBase>,
+		options: IWorkbenchListOptions<IDiffElementViewModelBase>,
 		@IListService listService: IListService,
 		@IConfigurationService configurationService: IConfigurationService,
 		@IInstantiationService instantiationService: IInstantiationService) {
 		super(listUser, container, delegate, renderers, options, contextKeyService, listService, configurationService, instantiationService);
 	}
 
-	protected override createMouseController(options: IListOptions<DiffElementViewModelBase>): MouseController<DiffElementViewModelBase> {
+	protected override createMouseController(options: IListOptions<IDiffElementViewModelBase>): MouseController<IDiffElementViewModelBase> {
 		return new NotebookMouseController(this);
 	}
 
-	getCellViewScrollTop(element: DiffElementViewModelBase): number {
+	getCellViewScrollTop(element: IDiffElementViewModelBase): number {
 		const index = this.indexOf(element);
 		// if (index === undefined || index < 0 || index >= this.length) {
 		// 	this._getViewIndexUpperBound(element);
@@ -354,7 +471,7 @@ export class NotebookTextDiffList extends WorkbenchList<DiffElementViewModelBase
 	}
 
 
-	updateElementHeight2(element: DiffElementViewModelBase, size: number) {
+	updateElementHeight2(element: IDiffElementViewModelBase, size: number) {
 		const viewIndex = this.indexOf(element);
 		const focused = this.getFocus();
 
@@ -460,3 +577,53 @@ export class NotebookTextDiffList extends WorkbenchList<DiffElementViewModelBase
 		}
 	}
 }
+
+
+function buildDiffEditorWidget(instantiationService: IInstantiationService, notebookEditor: INotebookTextDiffEditor, sourceContainer: HTMLElement, options: IDiffEditorConstructionOptions = {}) {
+	const editorContainer = DOM.append(sourceContainer, DOM.$('.editor-container'));
+
+	const editor = instantiationService.createInstance(DiffEditorWidget, editorContainer, {
+		...fixedDiffEditorOptions,
+		overflowWidgetsDomNode: notebookEditor.getOverflowContainerDomNode(),
+		originalEditable: false,
+		ignoreTrimWhitespace: false,
+		automaticLayout: false,
+		dimension: {
+			height: 0,
+			width: 0
+		},
+		renderSideBySide: true,
+		useInlineViewWhenSpaceIsLimited: false,
+		...options
+	}, {
+		originalEditor: getOptimizedNestedCodeEditorWidgetOptions(),
+		modifiedEditor: getOptimizedNestedCodeEditorWidgetOptions()
+	});
+
+	return {
+		editor,
+		editorContainer
+	};
+}
+
+function buildSourceEditor(instantiationService: IInstantiationService, notebookEditor: INotebookTextDiffEditor, sourceContainer: HTMLElement, options: IEditorConstructionOptions = {}) {
+	const editorContainer = DOM.append(sourceContainer, DOM.$('.editor-container'));
+	const skipContributions = [
+		'editor.contrib.emptyTextEditorHint'
+	];
+	const editor = instantiationService.createInstance(CodeEditorWidget, editorContainer, {
+		...fixedEditorOptions,
+		glyphMargin: false,
+		dimension: {
+			width: (notebookEditor.getLayoutInfo().width - 2 * DIFF_CELL_MARGIN) / 2 - 18,
+			height: 0
+		},
+		automaticLayout: false,
+		overflowWidgetsDomNode: notebookEditor.getOverflowContainerDomNode(),
+		readOnly: true,
+	}, {
+		contributions: EditorExtensionsRegistry.getEditorContributions().filter(c => skipContributions.indexOf(c.id) === -1)
+	});
+
+	return { editor, editorContainer };
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffOverviewRuler.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffOverviewRuler.ts
index 7d499393536..f24aabe73b4 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffOverviewRuler.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffOverviewRuler.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { createFastDomNode, FastDomNode } from 'vs/base/browser/fastDomNode';
-import { PixelRatio } from 'vs/base/browser/pixelRatio';
-import { Color } from 'vs/base/common/color';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { defaultInsertColor, defaultRemoveColor, diffInserted, diffOverviewRulerInserted, diffOverviewRulerRemoved, diffRemoved } from 'vs/platform/theme/common/colorRegistry';
-import { IColorTheme, IThemeService, Themable } from 'vs/platform/theme/common/themeService';
-import { DiffElementViewModelBase } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
-import { NotebookDiffEditorEventDispatcher } from 'vs/workbench/contrib/notebook/browser/diff/eventDispatcher';
-import { INotebookTextDiffEditor } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
+import * as DOM from '../../../../../base/browser/dom.js';
+import { createFastDomNode, FastDomNode } from '../../../../../base/browser/fastDomNode.js';
+import { PixelRatio } from '../../../../../base/browser/pixelRatio.js';
+import { Color } from '../../../../../base/common/color.js';
+import { DisposableStore, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { defaultInsertColor, defaultRemoveColor, diffInserted, diffOverviewRulerInserted, diffOverviewRulerRemoved, diffRemoved } from '../../../../../platform/theme/common/colorRegistry.js';
+import { IColorTheme, IThemeService, Themable } from '../../../../../platform/theme/common/themeService.js';
+import { IDiffElementViewModelBase } from './diffElementViewModel.js';
+import { NotebookDiffEditorEventDispatcher } from './eventDispatcher.js';
+import { INotebookTextDiffEditor } from './notebookDiffEditorBrowser.js';
 
 const MINIMUM_SLIDER_SIZE = 20;
 
@@ -20,7 +20,7 @@ export class NotebookDiffOverviewRuler extends Themable {
 	private readonly _domNode: FastDomNode<HTMLCanvasElement>;
 	private readonly _overviewViewportDomElement: FastDomNode<HTMLElement>;
 
-	private _diffElementViewModels: DiffElementViewModelBase[] = [];
+	private _diffElementViewModels: readonly IDiffElementViewModelBase[] = [];
 	private _lanes = 2;
 
 	private _insertColor: Color | null;
@@ -94,7 +94,7 @@ export class NotebookDiffOverviewRuler extends Themable {
 		this._layoutNow();
 	}
 
-	updateViewModels(elements: DiffElementViewModelBase[], eventDispatcher: NotebookDiffEditorEventDispatcher | undefined) {
+	updateViewModels(elements: readonly IDiffElementViewModelBase[], eventDispatcher: NotebookDiffEditorEventDispatcher | undefined) {
 		this._disposables.clear();
 
 		this._diffElementViewModels = elements;
@@ -126,7 +126,7 @@ export class NotebookDiffOverviewRuler extends Themable {
 	private _layoutNow() {
 		const layoutInfo = this.notebookEditor.getLayoutInfo();
 		const height = layoutInfo.height;
-		const contentHeight = this._diffElementViewModels.map(view => view.layoutInfo.totalHeight).reduce((a, b) => a + b, 0);
+		const contentHeight = this._diffElementViewModels.map(view => view.totalHeight).reduce((a, b) => a + b, 0);
 		const ratio = PixelRatio.getInstance(DOM.getWindow(this._domNode.domNode)).value;
 		this._domNode.setWidth(this.width);
 		this._domNode.setHeight(height);
@@ -182,8 +182,7 @@ export class NotebookDiffOverviewRuler extends Themable {
 		for (let i = 0; i < this._diffElementViewModels.length; i++) {
 			const element = this._diffElementViewModels[i];
 
-			const cellHeight = Math.round((element.layoutInfo.totalHeight / scrollHeight) * ratio * height);
-
+			const cellHeight = Math.round((element.totalHeight / scrollHeight) * ratio * height);
 			switch (element.type) {
 				case 'insert':
 					ctx.fillStyle = this._insertColorHex;
@@ -194,8 +193,10 @@ export class NotebookDiffOverviewRuler extends Themable {
 					ctx.fillRect(0, currentFrom, laneWidth, cellHeight);
 					break;
 				case 'unchanged':
+				case 'unchangedMetadata':
 					break;
 				case 'modified':
+				case 'modifiedMetadata':
 					ctx.fillStyle = this._removeColorHex;
 					ctx.fillRect(0, currentFrom, laneWidth, cellHeight);
 					ctx.fillStyle = this._insertColorHex;
@@ -203,6 +204,7 @@ export class NotebookDiffOverviewRuler extends Themable {
 					break;
 			}
 
+
 			currentFrom += cellHeight;
 		}
 	}
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel.ts
new file mode 100644
index 00000000000..930a8e5c39a
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel.ts
@@ -0,0 +1,603 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { IDiffResult, IDiffChange } from '../../../../../base/common/diff/diff.js';
+import { Emitter, type IValueWithChangeEvent } from '../../../../../base/common/event.js';
+import { Disposable, DisposableStore, dispose } from '../../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import type { URI } from '../../../../../base/common/uri.js';
+import { FontInfo } from '../../../../../editor/common/config/fontInfo.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import type { ContextKeyValue } from '../../../../../platform/contextkey/common/contextkey.js';
+import { MultiDiffEditorItem } from '../../../multiDiffEditor/browser/multiDiffSourceResolverService.js';
+import { DiffElementCellViewModelBase, DiffElementPlaceholderViewModel, IDiffElementViewModelBase, NotebookDocumentMetadataViewModel, SideBySideDiffElementViewModel, SingleSideDiffElementViewModel } from './diffElementViewModel.js';
+import { NotebookDiffEditorEventDispatcher } from './eventDispatcher.js';
+import { INotebookDiffViewModel, INotebookDiffViewModelUpdateEvent, NOTEBOOK_DIFF_ITEM_DIFF_STATE, NOTEBOOK_DIFF_ITEM_KIND } from './notebookDiffEditorBrowser.js';
+import { NotebookTextModel } from '../../common/model/notebookTextModel.js';
+import { CellUri, INotebookDiffEditorModel, INotebookDiffResult } from '../../common/notebookCommon.js';
+import { INotebookService } from '../../common/notebookService.js';
+import { INotebookEditorWorkerService } from '../../common/services/notebookWorkerService.js';
+import { IDiffEditorHeightCalculatorService } from './editorHeightCalculator.js';
+import { raceCancellation } from '../../../../../base/common/async.js';
+
+export class NotebookDiffViewModel extends Disposable implements INotebookDiffViewModel, IValueWithChangeEvent<readonly MultiDiffEditorItem[]> {
+	private readonly placeholderAndRelatedCells = new Map<DiffElementPlaceholderViewModel, DiffElementCellViewModelBase[]>();
+	private readonly _items: IDiffElementViewModelBase[] = [];
+	get items(): readonly IDiffElementViewModelBase[] {
+		return this._items;
+	}
+	private readonly _onDidChangeItems = this._register(new Emitter<INotebookDiffViewModelUpdateEvent>());
+	public readonly onDidChangeItems = this._onDidChangeItems.event;
+	private readonly disposables = this._register(new DisposableStore());
+	private _onDidChange = this._register(new Emitter<void>());
+	private diffEditorItems: NotebookMultiDiffEditorItem[] = [];
+	public onDidChange = this._onDidChange.event;
+	private notebookMetadataViewModel?: NotebookDocumentMetadataViewModel;
+	get value(): readonly NotebookMultiDiffEditorItem[] {
+		return this.diffEditorItems
+			.filter(item => item.type !== 'placeholder')
+			.filter(item => {
+				if (this._includeUnchanged) {
+					return true;
+				}
+				if (item instanceof NotebookMultiDiffEditorCellItem) {
+					return item.type === 'unchanged' && item.containerType === 'unchanged' ? false : true;
+				}
+				if (item instanceof NotebookMultiDiffEditorMetadataItem) {
+					return item.type === 'unchanged' && item.containerType === 'unchanged' ? false : true;
+				}
+				if (item instanceof NotebookMultiDiffEditorOutputItem) {
+					return item.type === 'unchanged' && item.containerType === 'unchanged' ? false : true;
+				}
+				return true;
+			})
+			.filter(item => item instanceof NotebookMultiDiffEditorOutputItem ? !this.hideOutput : true)
+			.filter(item => item instanceof NotebookMultiDiffEditorMetadataItem ? !this.ignoreMetadata : true);
+	}
+
+	private _hasUnchangedCells?: boolean;
+	public get hasUnchangedCells() {
+		return this._hasUnchangedCells === true;
+	}
+	private _includeUnchanged?: boolean;
+	public get includeUnchanged() {
+		return this._includeUnchanged === true;
+	}
+	public set includeUnchanged(value) {
+		this._includeUnchanged = value;
+		this._onDidChange.fire();
+	}
+	private hideOutput?: boolean;
+	private ignoreMetadata?: boolean;
+
+	private originalCellViewModels: IDiffElementViewModelBase[] = [];
+	constructor(private readonly model: INotebookDiffEditorModel,
+		private readonly notebookEditorWorkerService: INotebookEditorWorkerService,
+		private readonly configurationService: IConfigurationService,
+		private readonly eventDispatcher: NotebookDiffEditorEventDispatcher,
+		private readonly notebookService: INotebookService,
+		private readonly diffEditorHeightCalculator: IDiffEditorHeightCalculatorService,
+		private readonly fontInfo?: FontInfo,
+		private readonly excludeUnchangedPlaceholder?: boolean,
+	) {
+		super();
+		this.hideOutput = this.model.modified.notebook.transientOptions.transientOutputs || this.configurationService.getValue<boolean>('notebook.diff.ignoreOutputs');
+		this.ignoreMetadata = this.configurationService.getValue('notebook.diff.ignoreMetadata');
+
+		this._register(this.configurationService.onDidChangeConfiguration(e => {
+			let triggerChange = false;
+			let metadataChanged = false;
+			if (e.affectsConfiguration('notebook.diff.ignoreMetadata')) {
+				const newValue = this.configurationService.getValue<boolean>('notebook.diff.ignoreMetadata');
+
+				if (newValue !== undefined && this.ignoreMetadata !== newValue) {
+					this.ignoreMetadata = newValue;
+					triggerChange = true;
+					metadataChanged = true;
+				}
+			}
+
+			if (e.affectsConfiguration('notebook.diff.ignoreOutputs')) {
+				const newValue = this.configurationService.getValue<boolean>('notebook.diff.ignoreOutputs');
+
+				if (newValue !== undefined && this.hideOutput !== (newValue || this.model.modified.notebook.transientOptions.transientOutputs)) {
+					this.hideOutput = newValue || !!(this.model.modified.notebook.transientOptions.transientOutputs);
+					triggerChange = true;
+				}
+			}
+
+			if (metadataChanged) {
+				this.toggleNotebookMetadata();
+			}
+			if (triggerChange) {
+				this._onDidChange.fire();
+			}
+		}));
+	}
+	override dispose() {
+		this.clear();
+		super.dispose();
+	}
+	private clear() {
+		this.disposables.clear();
+		dispose(Array.from(this.placeholderAndRelatedCells.keys()));
+		this.placeholderAndRelatedCells.clear();
+		dispose(this.originalCellViewModels);
+		this.originalCellViewModels = [];
+		dispose(this._items);
+		this._items.splice(0, this._items.length);
+	}
+
+	async computeDiff(token: CancellationToken): Promise<void> {
+		const diffResult = await raceCancellation(this.notebookEditorWorkerService.computeDiff(this.model.original.resource, this.model.modified.resource), token);
+		if (!diffResult || token.isCancellationRequested) {
+			// after await the editor might be disposed.
+			return;
+		}
+
+		prettyChanges(this.model, diffResult.cellsDiff);
+
+		const { cellDiffInfo, firstChangeIndex } = computeDiff(this.model, diffResult);
+		if (isEqual(cellDiffInfo, this.originalCellViewModels, this.model)) {
+			return;
+		} else {
+			await raceCancellation(this.updateViewModels(cellDiffInfo, diffResult.metadataChanged, firstChangeIndex), token);
+			if (token.isCancellationRequested) {
+				return;
+			}
+			this.updateDiffEditorItems();
+		}
+	}
+
+	private toggleNotebookMetadata() {
+		if (!this.notebookMetadataViewModel) {
+			return;
+		}
+
+		if (this.ignoreMetadata) {
+			if (this._items.length && this._items[0] === this.notebookMetadataViewModel) {
+				this._items.splice(0, 1);
+				this._onDidChangeItems.fire({ start: 0, deleteCount: 1, elements: [] });
+			}
+		} else {
+			if (!this._items.length || this._items[0] !== this.notebookMetadataViewModel) {
+				this._items.splice(0, 0, this.notebookMetadataViewModel);
+				this._onDidChangeItems.fire({ start: 0, deleteCount: 0, elements: [this.notebookMetadataViewModel] });
+			}
+		}
+	}
+	private updateDiffEditorItems() {
+		this.diffEditorItems = [];
+		const originalSourceUri = this.model.original.resource!;
+		const modifiedSourceUri = this.model.modified.resource!;
+		this._hasUnchangedCells = false;
+		this.items.forEach(item => {
+			switch (item.type) {
+				case 'delete': {
+					this.diffEditorItems.push(new NotebookMultiDiffEditorCellItem(item.original!.uri, undefined, item.type, item.type));
+					const originalMetadata = CellUri.generateCellPropertyUri(originalSourceUri, item.original!.handle, Schemas.vscodeNotebookCellMetadata);
+					this.diffEditorItems.push(new NotebookMultiDiffEditorMetadataItem(originalMetadata, undefined, item.type, item.type));
+					const originalOutput = CellUri.generateCellPropertyUri(originalSourceUri, item.original!.handle, Schemas.vscodeNotebookCellOutput);
+					this.diffEditorItems.push(new NotebookMultiDiffEditorOutputItem(originalOutput, undefined, item.type, item.type));
+					break;
+				}
+				case 'insert': {
+					this.diffEditorItems.push(new NotebookMultiDiffEditorCellItem(undefined, item.modified!.uri, item.type, item.type));
+					const modifiedMetadata = CellUri.generateCellPropertyUri(modifiedSourceUri, item.modified!.handle, Schemas.vscodeNotebookCellMetadata);
+					this.diffEditorItems.push(new NotebookMultiDiffEditorMetadataItem(undefined, modifiedMetadata, item.type, item.type));
+					const modifiedOutput = CellUri.generateCellPropertyUri(modifiedSourceUri, item.modified!.handle, Schemas.vscodeNotebookCellOutput);
+					this.diffEditorItems.push(new NotebookMultiDiffEditorOutputItem(undefined, modifiedOutput, item.type, item.type));
+					break;
+				}
+				case 'modified': {
+					const cellType = item.checkIfInputModified() ? item.type : 'unchanged';
+					const containerChanged = (item.checkIfInputModified() || item.checkMetadataIfModified() || item.checkIfOutputsModified()) ? item.type : 'unchanged';
+					this.diffEditorItems.push(new NotebookMultiDiffEditorCellItem(item.original!.uri, item.modified!.uri, cellType, containerChanged));
+					const originalMetadata = CellUri.generateCellPropertyUri(originalSourceUri, item.original!.handle, Schemas.vscodeNotebookCellMetadata);
+					const modifiedMetadata = CellUri.generateCellPropertyUri(modifiedSourceUri, item.modified!.handle, Schemas.vscodeNotebookCellMetadata);
+					this.diffEditorItems.push(new NotebookMultiDiffEditorMetadataItem(originalMetadata, modifiedMetadata, item.checkMetadataIfModified() ? item.type : 'unchanged', containerChanged));
+					const originalOutput = CellUri.generateCellPropertyUri(originalSourceUri, item.original!.handle, Schemas.vscodeNotebookCellOutput);
+					const modifiedOutput = CellUri.generateCellPropertyUri(modifiedSourceUri, item.modified!.handle, Schemas.vscodeNotebookCellOutput);
+					this.diffEditorItems.push(new NotebookMultiDiffEditorOutputItem(originalOutput, modifiedOutput, item.checkIfOutputsModified() ? item.type : 'unchanged', containerChanged));
+					break;
+				}
+				case 'unchanged': {
+					this._hasUnchangedCells = true;
+					this.diffEditorItems.push(new NotebookMultiDiffEditorCellItem(item.original!.uri, item.modified!.uri, item.type, item.type));
+					const originalMetadata = CellUri.generateCellPropertyUri(originalSourceUri, item.original!.handle, Schemas.vscodeNotebookCellMetadata);
+					const modifiedMetadata = CellUri.generateCellPropertyUri(modifiedSourceUri, item.modified!.handle, Schemas.vscodeNotebookCellMetadata);
+					this.diffEditorItems.push(new NotebookMultiDiffEditorMetadataItem(originalMetadata, modifiedMetadata, item.type, item.type));
+					const originalOutput = CellUri.generateCellPropertyUri(originalSourceUri, item.original!.handle, Schemas.vscodeNotebookCellOutput);
+					const modifiedOutput = CellUri.generateCellPropertyUri(modifiedSourceUri, item.modified!.handle, Schemas.vscodeNotebookCellOutput);
+					this.diffEditorItems.push(new NotebookMultiDiffEditorOutputItem(originalOutput, modifiedOutput, item.type, item.type));
+					break;
+				}
+			}
+		});
+
+		this._onDidChange.fire();
+	}
+
+	private async updateViewModels(cellDiffInfo: CellDiffInfo[], metadataChanged: boolean, firstChangeIndex: number) {
+		const cellViewModels = await this.createDiffViewModels(cellDiffInfo, metadataChanged);
+		const oldLength = this._items.length;
+		this.clear();
+		this._items.splice(0, oldLength);
+
+		let placeholder: DiffElementPlaceholderViewModel | undefined = undefined;
+		this.originalCellViewModels = cellViewModels;
+		cellViewModels.forEach((vm, index) => {
+			if (vm.type === 'unchanged' && !this.excludeUnchangedPlaceholder) {
+				if (!placeholder) {
+					vm.displayIconToHideUnmodifiedCells = true;
+					placeholder = new DiffElementPlaceholderViewModel(vm.mainDocumentTextModel, vm.editorEventDispatcher, vm.initData);
+					this._items.push(placeholder);
+					const placeholderItem = placeholder;
+
+					this.disposables.add(placeholderItem.onUnfoldHiddenCells(() => {
+						const hiddenCellViewModels = this.placeholderAndRelatedCells.get(placeholderItem);
+						if (!Array.isArray(hiddenCellViewModels)) {
+							return;
+						}
+						const start = this._items.indexOf(placeholderItem);
+						this._items.splice(start, 1, ...hiddenCellViewModels);
+						this._onDidChangeItems.fire({ start, deleteCount: 1, elements: hiddenCellViewModels });
+					}));
+					this.disposables.add(vm.onHideUnchangedCells(() => {
+						const hiddenCellViewModels = this.placeholderAndRelatedCells.get(placeholderItem);
+						if (!Array.isArray(hiddenCellViewModels)) {
+							return;
+						}
+						const start = this._items.indexOf(vm);
+						this._items.splice(start, hiddenCellViewModels.length, placeholderItem);
+						this._onDidChangeItems.fire({ start, deleteCount: hiddenCellViewModels.length, elements: [placeholderItem] });
+					}));
+				}
+				const hiddenCellViewModels = this.placeholderAndRelatedCells.get(placeholder) || [];
+				hiddenCellViewModels.push(vm);
+				this.placeholderAndRelatedCells.set(placeholder, hiddenCellViewModels);
+				placeholder.hiddenCells.push(vm);
+			} else {
+				placeholder = undefined;
+				this._items.push(vm);
+			}
+		});
+
+		// Note, ensure all of the height calculations are done before firing the event.
+		// This is to ensure that the diff editor is not resized multiple times, thereby avoiding flickering.
+		this._onDidChangeItems.fire({ start: 0, deleteCount: oldLength, elements: this._items, firstChangeIndex });
+	}
+	private async createDiffViewModels(computedCellDiffs: CellDiffInfo[], metadataChanged: boolean) {
+		const originalModel = this.model.original.notebook;
+		const modifiedModel = this.model.modified.notebook;
+		const initData = {
+			metadataStatusHeight: this.configurationService.getValue('notebook.diff.ignoreMetadata') ? 0 : 25,
+			outputStatusHeight: this.configurationService.getValue<boolean>('notebook.diff.ignoreOutputs') || !!(modifiedModel.transientOptions.transientOutputs) ? 0 : 25,
+			fontInfo: this.fontInfo
+		};
+
+		const viewModels: (SingleSideDiffElementViewModel | SideBySideDiffElementViewModel | NotebookDocumentMetadataViewModel)[] = [];
+		this.notebookMetadataViewModel = this._register(new NotebookDocumentMetadataViewModel(this.model.original.notebook, this.model.modified.notebook, metadataChanged ? 'modifiedMetadata' : 'unchangedMetadata', this.eventDispatcher, initData, this.notebookService, this.diffEditorHeightCalculator));
+		if (!this.ignoreMetadata) {
+			if (metadataChanged) {
+				await this.notebookMetadataViewModel.computeHeights();
+			}
+			viewModels.push(this.notebookMetadataViewModel);
+		}
+		const cellViewModels = await Promise.all(computedCellDiffs.map(async (diff) => {
+			switch (diff.type) {
+				case 'delete': {
+					return new SingleSideDiffElementViewModel(
+						originalModel,
+						modifiedModel,
+						originalModel.cells[diff.originalCellIndex],
+						undefined,
+						'delete',
+						this.eventDispatcher,
+						initData,
+						this.notebookService,
+						this.configurationService,
+						this.diffEditorHeightCalculator,
+						diff.originalCellIndex
+					);
+				}
+				case 'insert': {
+					return new SingleSideDiffElementViewModel(
+						modifiedModel,
+						originalModel,
+						undefined,
+						modifiedModel.cells[diff.modifiedCellIndex],
+						'insert',
+						this.eventDispatcher,
+						initData,
+						this.notebookService,
+						this.configurationService,
+						this.diffEditorHeightCalculator,
+						diff.modifiedCellIndex
+					);
+				}
+				case 'modified': {
+					const viewModel = new SideBySideDiffElementViewModel(
+						this.model.modified.notebook,
+						this.model.original.notebook,
+						originalModel.cells[diff.originalCellIndex],
+						modifiedModel.cells[diff.modifiedCellIndex],
+						'modified',
+						this.eventDispatcher,
+						initData,
+						this.notebookService,
+						this.configurationService,
+						diff.originalCellIndex,
+						this.diffEditorHeightCalculator
+					);
+					// Reduces flicker (compute this before setting the model)
+					// Else when the model is set, the height of the editor will be x, after diff is computed, then height will be y.
+					// & that results in flicker.
+					await viewModel.computeEditorHeights();
+					return viewModel;
+				}
+				case 'unchanged': {
+					return new SideBySideDiffElementViewModel(
+						this.model.modified.notebook,
+						this.model.original.notebook,
+						originalModel.cells[diff.originalCellIndex],
+						modifiedModel.cells[diff.modifiedCellIndex],
+						'unchanged', this.eventDispatcher,
+						initData,
+						this.notebookService,
+						this.configurationService,
+						diff.originalCellIndex,
+						this.diffEditorHeightCalculator
+					);
+				}
+			}
+		}));
+
+		cellViewModels.forEach(vm => viewModels.push(vm));
+
+		return viewModels;
+	}
+
+}
+
+
+/**
+ * making sure that swapping cells are always translated to `insert+delete`.
+ */
+export function prettyChanges(model: INotebookDiffEditorModel, diffResult: IDiffResult) {
+	const changes = diffResult.changes;
+	for (let i = 0; i < diffResult.changes.length - 1; i++) {
+		// then we know there is another change after current one
+		const curr = changes[i];
+		const next = changes[i + 1];
+		const x = curr.originalStart;
+		const y = curr.modifiedStart;
+
+		if (
+			curr.originalLength === 1
+			&& curr.modifiedLength === 0
+			&& next.originalStart === x + 2
+			&& next.originalLength === 0
+			&& next.modifiedStart === y + 1
+			&& next.modifiedLength === 1
+			&& model.original.notebook.cells[x].getHashValue() === model.modified.notebook.cells[y + 1].getHashValue()
+			&& model.original.notebook.cells[x + 1].getHashValue() === model.modified.notebook.cells[y].getHashValue()
+		) {
+			// this is a swap
+			curr.originalStart = x;
+			curr.originalLength = 0;
+			curr.modifiedStart = y;
+			curr.modifiedLength = 1;
+
+			next.originalStart = x + 1;
+			next.originalLength = 1;
+			next.modifiedStart = y + 2;
+			next.modifiedLength = 0;
+
+			i++;
+		}
+	}
+}
+
+type CellDiffInfo = {
+	originalCellIndex: number;
+	modifiedCellIndex: number;
+	type: 'unchanged' | 'modified';
+} |
+{
+	originalCellIndex: number;
+	type: 'delete';
+} |
+{
+	modifiedCellIndex: number;
+	type: 'insert';
+};
+function computeDiff(model: INotebookDiffEditorModel, diffResult: INotebookDiffResult) {
+	const cellChanges = diffResult.cellsDiff.changes;
+	const cellDiffInfo: CellDiffInfo[] = [];
+	const originalModel = model.original.notebook;
+	const modifiedModel = model.modified.notebook;
+	let originalCellIndex = 0;
+	let modifiedCellIndex = 0;
+
+	let firstChangeIndex = -1;
+
+	for (let i = 0; i < cellChanges.length; i++) {
+		const change = cellChanges[i];
+		// common cells
+
+		for (let j = 0; j < change.originalStart - originalCellIndex; j++) {
+			const originalCell = originalModel.cells[originalCellIndex + j];
+			const modifiedCell = modifiedModel.cells[modifiedCellIndex + j];
+			if (originalCell.getHashValue() === modifiedCell.getHashValue()) {
+				cellDiffInfo.push({
+					originalCellIndex: originalCellIndex + j,
+					modifiedCellIndex: modifiedCellIndex + j,
+					type: 'unchanged'
+				});
+			} else {
+				if (firstChangeIndex === -1) {
+					firstChangeIndex = cellDiffInfo.length;
+				}
+				cellDiffInfo.push({
+					originalCellIndex: originalCellIndex + j,
+					modifiedCellIndex: modifiedCellIndex + j,
+					type: 'modified'
+				});
+			}
+		}
+
+		const modifiedLCS = computeModifiedLCS(change, originalModel, modifiedModel);
+		if (modifiedLCS.length && firstChangeIndex === -1) {
+			firstChangeIndex = cellDiffInfo.length;
+		}
+
+		cellDiffInfo.push(...modifiedLCS);
+		originalCellIndex = change.originalStart + change.originalLength;
+		modifiedCellIndex = change.modifiedStart + change.modifiedLength;
+	}
+
+	for (let i = originalCellIndex; i < originalModel.cells.length; i++) {
+		cellDiffInfo.push({
+			originalCellIndex: i,
+			modifiedCellIndex: i - originalCellIndex + modifiedCellIndex,
+			type: 'unchanged'
+		});
+	}
+
+	return {
+		cellDiffInfo,
+		firstChangeIndex
+	};
+}
+function isEqual(cellDiffInfo: CellDiffInfo[], viewModels: IDiffElementViewModelBase[], model: INotebookDiffEditorModel) {
+	if (cellDiffInfo.length !== viewModels.length) {
+		return false;
+	}
+	const originalModel = model.original.notebook;
+	const modifiedModel = model.modified.notebook;
+	for (let i = 0; i < viewModels.length; i++) {
+		const a = cellDiffInfo[i];
+		const b = viewModels[i];
+		if (a.type !== b.type) {
+			return false;
+		}
+		switch (a.type) {
+			case 'delete': {
+				if (originalModel.cells[a.originalCellIndex].handle !== b.original?.handle) {
+					return false;
+				}
+				continue;
+			}
+			case 'insert': {
+				if (modifiedModel.cells[a.modifiedCellIndex].handle !== b.modified?.handle) {
+					return false;
+				}
+				continue;
+			}
+			default: {
+				if (originalModel.cells[a.originalCellIndex].handle !== b.original?.handle) {
+					return false;
+				}
+				if (modifiedModel.cells[a.modifiedCellIndex].handle !== b.modified?.handle) {
+					return false;
+				}
+				continue;
+			}
+		}
+	}
+
+	return true;
+}
+
+function computeModifiedLCS(change: IDiffChange, originalModel: NotebookTextModel, modifiedModel: NotebookTextModel) {
+	const result: CellDiffInfo[] = [];
+	// modified cells
+	const modifiedLen = Math.min(change.originalLength, change.modifiedLength);
+
+	for (let j = 0; j < modifiedLen; j++) {
+		const isTheSame = originalModel.cells[change.originalStart + j].equal(modifiedModel.cells[change.modifiedStart + j]);
+		result.push({
+			originalCellIndex: change.originalStart + j,
+			modifiedCellIndex: change.modifiedStart + j,
+			type: isTheSame ? 'unchanged' : 'modified'
+		});
+	}
+
+	for (let j = modifiedLen; j < change.originalLength; j++) {
+		// deletion
+		result.push({
+			originalCellIndex: change.originalStart + j,
+			type: 'delete'
+		});
+	}
+
+	for (let j = modifiedLen; j < change.modifiedLength; j++) {
+		result.push({
+			modifiedCellIndex: change.modifiedStart + j,
+			type: 'insert'
+		});
+	}
+
+	return result;
+}
+
+
+export abstract class NotebookMultiDiffEditorItem extends MultiDiffEditorItem {
+	constructor(
+		originalUri: URI | undefined,
+		modifiedUri: URI | undefined,
+		goToFileUri: URI | undefined,
+		public readonly type: IDiffElementViewModelBase['type'],
+		public readonly containerType: IDiffElementViewModelBase['type'],
+		public kind: 'Cell' | 'Metadata' | 'Output',
+		contextKeys?: Record<string, ContextKeyValue>,
+	) {
+		super(originalUri, modifiedUri, goToFileUri, contextKeys);
+	}
+}
+
+class NotebookMultiDiffEditorCellItem extends NotebookMultiDiffEditorItem {
+	constructor(
+		originalUri: URI | undefined,
+		modifiedUri: URI | undefined,
+		type: IDiffElementViewModelBase['type'],
+		containerType: IDiffElementViewModelBase['type'],
+	) {
+		super(originalUri, modifiedUri, modifiedUri || originalUri, type, containerType, 'Cell', {
+			[NOTEBOOK_DIFF_ITEM_KIND.key]: 'Cell',
+			[NOTEBOOK_DIFF_ITEM_DIFF_STATE.key]: type
+		});
+	}
+}
+
+class NotebookMultiDiffEditorMetadataItem extends NotebookMultiDiffEditorItem {
+	constructor(
+		originalUri: URI | undefined,
+		modifiedUri: URI | undefined,
+		type: IDiffElementViewModelBase['type'],
+		containerType: IDiffElementViewModelBase['type'],
+	) {
+		super(originalUri, modifiedUri, modifiedUri || originalUri, type, containerType, 'Metadata', {
+			[NOTEBOOK_DIFF_ITEM_KIND.key]: 'Metadata',
+			[NOTEBOOK_DIFF_ITEM_DIFF_STATE.key]: type
+		});
+	}
+}
+
+class NotebookMultiDiffEditorOutputItem extends NotebookMultiDiffEditorItem {
+	constructor(
+		originalUri: URI | undefined,
+		modifiedUri: URI | undefined,
+		type: IDiffElementViewModelBase['type'],
+		containerType: IDiffElementViewModelBase['type'],
+	) {
+		super(originalUri, modifiedUri, modifiedUri || originalUri, type, containerType, 'Output', {
+			[NOTEBOOK_DIFF_ITEM_KIND.key]: 'Output',
+			[NOTEBOOK_DIFF_ITEM_DIFF_STATE.key]: type
+		});
+	}
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditor.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditor.ts
new file mode 100644
index 00000000000..c6d7549eb6e
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditor.ts
@@ -0,0 +1,291 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as DOM from '../../../../../base/browser/dom.js';
+import { IWorkbenchUIElementFactory, type IResourceLabel } from '../../../../../editor/browser/widget/multiDiffEditor/workbenchUIElementFactory.js';
+import { IStorageService } from '../../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { IEditorOpenContext } from '../../../../common/editor.js';
+import { IEditorGroup } from '../../../../services/editor/common/editorGroupsService.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { INotebookEditorWorkerService } from '../../common/services/notebookWorkerService.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IEditorOptions as ICodeEditorOptions } from '../../../../../editor/common/config/editorOptions.js';
+import { BareFontInfo, FontInfo } from '../../../../../editor/common/config/fontInfo.js';
+import { PixelRatio } from '../../../../../base/browser/pixelRatio.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { EditorPane } from '../../../../browser/parts/editor/editorPane.js';
+import { CellUri, INotebookDiffEditorModel, NOTEBOOK_MULTI_DIFF_EDITOR_ID } from '../../common/notebookCommon.js';
+import { FontMeasurements } from '../../../../../editor/browser/config/fontMeasurements.js';
+import { NotebookOptions } from '../notebookOptions.js';
+import { INotebookService } from '../../common/notebookService.js';
+import { NotebookMultiDiffEditorInput, NotebookMultiDiffEditorWidgetInput } from './notebookMultiDiffEditorInput.js';
+import { MultiDiffEditorWidget } from '../../../../../editor/browser/widget/multiDiffEditor/multiDiffEditorWidget.js';
+import { ResourceLabel } from '../../../../browser/labels.js';
+import type { IMultiDiffEditorOptions } from '../../../../../editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.js';
+import { INotebookDocumentService } from '../../../../services/notebook/common/notebookDocumentService.js';
+import { localize } from '../../../../../nls.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { getIconClassesForLanguageId } from '../../../../../editor/common/services/getIconClasses.js';
+import { NotebookDiffViewModel } from './notebookDiffViewModel.js';
+import { NotebookDiffEditorEventDispatcher } from './eventDispatcher.js';
+import { NOTEBOOK_DIFF_CELLS_COLLAPSED, NOTEBOOK_DIFF_HAS_UNCHANGED_CELLS, NOTEBOOK_DIFF_UNCHANGED_CELLS_HIDDEN } from './notebookDiffEditorBrowser.js';
+import type { DocumentDiffItemViewModel, MultiDiffEditorViewModel } from '../../../../../editor/browser/widget/multiDiffEditor/multiDiffEditorViewModel.js';
+import type { URI } from '../../../../../base/common/uri.js';
+import { type IDiffElementViewModelBase } from './diffElementViewModel.js';
+import { autorun, transaction } from '../../../../../base/common/observable.js';
+import { DiffEditorHeightCalculatorService } from './editorHeightCalculator.js';
+
+export class NotebookMultiTextDiffEditor extends EditorPane {
+	private _multiDiffEditorWidget?: MultiDiffEditorWidget;
+	static readonly ID: string = NOTEBOOK_MULTI_DIFF_EDITOR_ID;
+	private _fontInfo: FontInfo | undefined;
+	protected _scopeContextKeyService!: IContextKeyService;
+	private readonly modelSpecificResources = this._register(new DisposableStore());
+	private _model?: INotebookDiffEditorModel;
+	private viewModel?: NotebookDiffViewModel;
+	private widgetViewModel?: MultiDiffEditorViewModel;
+	get textModel() {
+		return this._model?.modified.notebook;
+	}
+	private _notebookOptions: NotebookOptions;
+	get notebookOptions() {
+		return this._notebookOptions;
+	}
+	private readonly ctxAllCollapsed = this._parentContextKeyService.createKey<boolean>(NOTEBOOK_DIFF_CELLS_COLLAPSED.key, false);
+	private readonly ctxHasUnchangedCells = this._parentContextKeyService.createKey<boolean>(NOTEBOOK_DIFF_HAS_UNCHANGED_CELLS.key, false);
+	private readonly ctxHiddenUnchangedCells = this._parentContextKeyService.createKey<boolean>(NOTEBOOK_DIFF_UNCHANGED_CELLS_HIDDEN.key, true);
+
+	constructor(
+		group: IEditorGroup,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IThemeService themeService: IThemeService,
+		@IContextKeyService private readonly _parentContextKeyService: IContextKeyService,
+		@INotebookEditorWorkerService private readonly notebookEditorWorkerService: INotebookEditorWorkerService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@ITelemetryService telemetryService: ITelemetryService,
+		@IStorageService storageService: IStorageService,
+		@INotebookService private readonly notebookService: INotebookService,
+	) {
+		super(NotebookMultiTextDiffEditor.ID, group, telemetryService, themeService, storageService);
+		this._notebookOptions = instantiationService.createInstance(NotebookOptions, this.window, false, undefined);
+		this._register(this._notebookOptions);
+	}
+
+	private get fontInfo() {
+		if (!this._fontInfo) {
+			this._fontInfo = this.createFontInfo();
+		}
+
+		return this._fontInfo;
+	}
+	override layout(dimension: DOM.Dimension, position?: DOM.IDomPosition): void {
+		this._multiDiffEditorWidget!.layout(dimension);
+	}
+
+	private createFontInfo() {
+		const editorOptions = this.configurationService.getValue<ICodeEditorOptions>('editor');
+		return FontMeasurements.readFontInfo(this.window, BareFontInfo.createFromRawSettings(editorOptions, PixelRatio.getInstance(this.window).value));
+	}
+
+	protected createEditor(parent: HTMLElement): void {
+		this._multiDiffEditorWidget = this._register(this.instantiationService.createInstance(
+			MultiDiffEditorWidget,
+			parent,
+			this.instantiationService.createInstance(WorkbenchUIElementFactory),
+		));
+
+		this._register(this._multiDiffEditorWidget.onDidChangeActiveControl(() => {
+			this._onDidChangeControl.fire();
+		}));
+	}
+	override async setInput(input: NotebookMultiDiffEditorInput, options: IMultiDiffEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void> {
+		super.setInput(input, options, context, token);
+		const model = await input.resolve();
+		if (this._model !== model) {
+			this._detachModel();
+			this._model = model;
+		}
+		const eventDispatcher = this.modelSpecificResources.add(new NotebookDiffEditorEventDispatcher());
+		const diffEditorHeightCalculator = this.instantiationService.createInstance(DiffEditorHeightCalculatorService, this.fontInfo.lineHeight);
+		this.viewModel = this.modelSpecificResources.add(new NotebookDiffViewModel(model, this.notebookEditorWorkerService, this.configurationService, eventDispatcher, this.notebookService, diffEditorHeightCalculator, undefined, true));
+		await this.viewModel.computeDiff(this.modelSpecificResources.add(new CancellationTokenSource()).token);
+		this.ctxHasUnchangedCells.set(this.viewModel.hasUnchangedCells);
+		this.ctxHasUnchangedCells.set(this.viewModel.hasUnchangedCells);
+
+		const widgetInput = this.modelSpecificResources.add(NotebookMultiDiffEditorWidgetInput.createInput(this.viewModel, this.instantiationService));
+		this.widgetViewModel = this.modelSpecificResources.add(await widgetInput.getViewModel());
+
+		const itemsWeHaveSeen = new WeakSet<DocumentDiffItemViewModel>();
+		this.modelSpecificResources.add(autorun(reader => {
+			/** @description NotebookDiffEditor => Collapse unmodified items */
+			if (!this.widgetViewModel || !this.viewModel) {
+				return;
+			}
+			const items = this.widgetViewModel.items.read(reader);
+			const diffItems = this.viewModel.value;
+			if (items.length !== diffItems.length) {
+				return;
+			}
+
+			// If cell has not changed, but metadata or output has changed, then collapse the cell & keep output/metadata expanded.
+			// Similarly if the cell has changed, but the metadata or output has not, then expand the cell, but collapse output/metadata.
+			transaction((tx) => {
+				items.forEach(item => {
+					// We do not want to mess with UI state if users change it, hence no need to collapse again.
+					if (itemsWeHaveSeen.has(item)) {
+						return;
+					}
+					itemsWeHaveSeen.add(item);
+					const diffItem = diffItems.find(d => d.modifiedUri?.toString() === item.modifiedUri?.toString() && d.originalUri?.toString() === item.originalUri?.toString());
+					if (diffItem && diffItem.type === 'unchanged') {
+						item.collapsed.set(true, tx);
+					}
+				});
+			});
+		}));
+
+
+		this._multiDiffEditorWidget!.setViewModel(this.widgetViewModel);
+	}
+
+	private _detachModel() {
+		this.viewModel = undefined;
+		this.modelSpecificResources.clear();
+	}
+	_generateFontFamily(): string {
+		return this.fontInfo.fontFamily ?? `"SF Mono", Monaco, Menlo, Consolas, "Ubuntu Mono", "Liberation Mono", "DejaVu Sans Mono", "Courier New", monospace`;
+	}
+	override setOptions(options: IMultiDiffEditorOptions | undefined): void {
+		super.setOptions(options);
+	}
+
+	override getControl() {
+		return this._multiDiffEditorWidget!.getActiveControl();
+	}
+
+	override focus(): void {
+		super.focus();
+
+		this._multiDiffEditorWidget?.getActiveControl()?.focus();
+	}
+
+	override hasFocus(): boolean {
+		return this._multiDiffEditorWidget?.getActiveControl()?.hasTextFocus() || super.hasFocus();
+	}
+
+	override clearInput(): void {
+		super.clearInput();
+		this._multiDiffEditorWidget!.setViewModel(undefined);
+		this.modelSpecificResources.clear();
+		this.viewModel = undefined;
+		this.widgetViewModel = undefined;
+	}
+
+	public expandAll() {
+		if (this.widgetViewModel) {
+			this.widgetViewModel.expandAll();
+			this.ctxAllCollapsed.set(false);
+		}
+	}
+	public collapseAll() {
+		if (this.widgetViewModel) {
+			this.widgetViewModel.collapseAll();
+			this.ctxAllCollapsed.set(true);
+		}
+	}
+
+	public hideUnchanged() {
+		if (this.viewModel) {
+			this.viewModel.includeUnchanged = false;
+			this.ctxHiddenUnchangedCells.set(true);
+		}
+	}
+
+	public showUnchanged() {
+		if (this.viewModel) {
+			this.viewModel.includeUnchanged = true;
+			this.ctxHiddenUnchangedCells.set(false);
+		}
+	}
+
+	public getDiffElementViewModel(uri: URI): IDiffElementViewModelBase | undefined {
+		if (uri.scheme === Schemas.vscodeNotebookCellOutput || uri.scheme === Schemas.vscodeNotebookCellOutputDiff ||
+			uri.scheme === Schemas.vscodeNotebookCellMetadata || uri.scheme === Schemas.vscodeNotebookCellMetadataDiff
+		) {
+			const data = CellUri.parseCellPropertyUri(uri, uri.scheme);
+			if (data) {
+				uri = CellUri.generate(data.notebook, data.handle);
+			}
+		}
+		if (uri.scheme === Schemas.vscodeNotebookMetadata) {
+			return this.viewModel?.items.find(item =>
+				item.type === 'modifiedMetadata' ||
+				item.type === 'unchangedMetadata'
+			);
+		}
+		return this.viewModel?.items.find(c => {
+			switch (c.type) {
+				case 'delete':
+					return c.original?.uri.toString() === uri.toString();
+				case 'insert':
+					return c.modified?.uri.toString() === uri.toString();
+				case 'modified':
+				case 'unchanged':
+					return c.modified?.uri.toString() === uri.toString() || c.original?.uri.toString() === uri.toString();
+				default:
+					return;
+			}
+		});
+	}
+}
+
+
+class WorkbenchUIElementFactory implements IWorkbenchUIElementFactory {
+	constructor(
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@INotebookDocumentService private readonly notebookDocumentService: INotebookDocumentService,
+		@INotebookService private readonly notebookService: INotebookService
+	) { }
+
+	createResourceLabel(element: HTMLElement): IResourceLabel {
+		const label = this._instantiationService.createInstance(ResourceLabel, element, {});
+		const that = this;
+		return {
+			setUri(uri, options = {}) {
+				if (!uri) {
+					label.element.clear();
+				} else {
+					let name = '';
+					let description = '';
+					let extraClasses: string[] | undefined = undefined;
+
+					if (uri.scheme === Schemas.vscodeNotebookCell) {
+						const notebookDocument = uri.scheme === Schemas.vscodeNotebookCell ? that.notebookDocumentService.getNotebook(uri) : undefined;
+						const cellIndex = Schemas.vscodeNotebookCell ? that.notebookDocumentService.getNotebook(uri)?.getCellIndex(uri) : undefined;
+						if (notebookDocument && cellIndex !== undefined) {
+							name = localize('notebookCellLabel', "Cell {0}", `${cellIndex + 1}`);
+							const nb = notebookDocument ? that.notebookService.getNotebookTextModel(notebookDocument?.uri) : undefined;
+							const cellLanguage = nb && cellIndex !== undefined ? nb.cells[cellIndex].language : undefined;
+							extraClasses = cellLanguage ? getIconClassesForLanguageId(cellLanguage) : undefined;
+						}
+					} else if (uri.scheme === Schemas.vscodeNotebookCellMetadata || uri.scheme === Schemas.vscodeNotebookCellMetadataDiff) {
+						description = localize('notebookCellMetadataLabel', "Metadata");
+					} else if (uri.scheme === Schemas.vscodeNotebookCellOutput || uri.scheme === Schemas.vscodeNotebookCellOutputDiff) {
+						description = localize('notebookCellOutputLabel', "Output");
+					}
+
+					label.element.setResource({ name, description }, { strikethrough: options.strikethrough, forceLabel: true, hideIcon: !extraClasses, extraClasses });
+				}
+			},
+			dispose() {
+				label.dispose();
+			}
+		};
+	}
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditorInput.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditorInput.ts
new file mode 100644
index 00000000000..c84dcb0e3de
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditorInput.ts
@@ -0,0 +1,57 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { URI } from '../../../../../base/common/uri.js';
+import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
+import { ITextResourceConfigurationService } from '../../../../../editor/common/services/textResourceConfiguration.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { MultiDiffEditorInput } from '../../../multiDiffEditor/browser/multiDiffEditorInput.js';
+import { IMultiDiffSourceResolverService, IResolvedMultiDiffSource, type IMultiDiffSourceResolver } from '../../../multiDiffEditor/browser/multiDiffSourceResolverService.js';
+import { NotebookDiffViewModel } from './notebookDiffViewModel.js';
+import { NotebookDiffEditorInput } from '../../common/notebookDiffEditorInput.js';
+import { NotebookEditorInput } from '../../common/notebookEditorInput.js';
+import { ITextFileService } from '../../../../services/textfile/common/textfiles.js';
+
+export const NotebookMultiDiffEditorScheme = 'multi-cell-notebook-diff-editor';
+
+export class NotebookMultiDiffEditorInput extends NotebookDiffEditorInput {
+	static override readonly ID: string = 'workbench.input.multiDiffNotebookInput';
+	static override create(instantiationService: IInstantiationService, resource: URI, name: string | undefined, description: string | undefined, originalResource: URI, viewType: string) {
+		const original = NotebookEditorInput.getOrCreate(instantiationService, originalResource, undefined, viewType);
+		const modified = NotebookEditorInput.getOrCreate(instantiationService, resource, undefined, viewType);
+		return instantiationService.createInstance(NotebookMultiDiffEditorInput, name, description, original, modified, viewType);
+	}
+}
+
+export class NotebookMultiDiffEditorWidgetInput extends MultiDiffEditorInput implements IMultiDiffSourceResolver {
+	public static createInput(notebookDiffViewModel: NotebookDiffViewModel, instantiationService: IInstantiationService): NotebookMultiDiffEditorWidgetInput {
+		const multiDiffSource = URI.parse(`${NotebookMultiDiffEditorScheme}:${new Date().getMilliseconds().toString() + Math.random().toString()}`);
+		return instantiationService.createInstance(
+			NotebookMultiDiffEditorWidgetInput,
+			multiDiffSource,
+			notebookDiffViewModel
+		);
+	}
+	constructor(
+		multiDiffSource: URI,
+		private readonly notebookDiffViewModel: NotebookDiffViewModel,
+		@ITextModelService _textModelService: ITextModelService,
+		@ITextResourceConfigurationService _textResourceConfigurationService: ITextResourceConfigurationService,
+		@IInstantiationService _instantiationService: IInstantiationService,
+		@IMultiDiffSourceResolverService _multiDiffSourceResolverService: IMultiDiffSourceResolverService,
+		@ITextFileService _textFileService: ITextFileService,
+	) {
+		super(multiDiffSource, undefined, undefined, true, _textModelService, _textResourceConfigurationService, _instantiationService, _multiDiffSourceResolverService, _textFileService);
+		this._register(_multiDiffSourceResolverService.registerResolver(this));
+	}
+
+	canHandleUri(uri: URI): boolean {
+		return uri.toString() === this.multiDiffSource.toString();
+	}
+
+	async resolveDiffSource(_: URI): Promise<IResolvedMultiDiffSource> {
+		return { resources: this.notebookDiffViewModel };
+	}
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/unchangedEditorRegions.ts b/src/vs/workbench/contrib/notebook/browser/diff/unchangedEditorRegions.ts
new file mode 100644
index 00000000000..fdfce77d716
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/browser/diff/unchangedEditorRegions.ts
@@ -0,0 +1,60 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { DisposableStore, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+
+export type UnchangedEditorRegionOptions = {
+	options: {
+		enabled: boolean;
+		contextLineCount: number;
+		minimumLineCount: number;
+		revealLineCount: number;
+	};
+	onDidChangeEnablement: Event<boolean>;
+};
+
+export function getUnchangedRegionSettings(configurationService: IConfigurationService): (Readonly<UnchangedEditorRegionOptions> & IDisposable) {
+	return createHideUnchangedRegionOptions(configurationService);
+}
+
+function createHideUnchangedRegionOptions(configurationService: IConfigurationService): UnchangedEditorRegionOptions & { dispose: () => void } {
+	const disposables = new DisposableStore();
+	const unchangedRegionsEnablementEmitter = disposables.add(new Emitter<boolean>());
+
+	const result = {
+		options: {
+			enabled: configurationService.getValue<boolean>('diffEditor.hideUnchangedRegions.enabled'),
+			minimumLineCount: configurationService.getValue<number>('diffEditor.hideUnchangedRegions.minimumLineCount'),
+			contextLineCount: configurationService.getValue<number>('diffEditor.hideUnchangedRegions.contextLineCount'),
+			revealLineCount: configurationService.getValue<number>('diffEditor.hideUnchangedRegions.revealLineCount'),
+		},
+		// We only care about enable/disablement.
+		// If user changes counters when a diff editor is open, we do not care, might as well ask user to reload.
+		// Simpler and almost never going to happen.
+		onDidChangeEnablement: unchangedRegionsEnablementEmitter.event.bind(unchangedRegionsEnablementEmitter),
+		dispose: () => disposables.dispose()
+	};
+
+	disposables.add(configurationService.onDidChangeConfiguration(e => {
+		if (e.affectsConfiguration('diffEditor.hideUnchangedRegions.minimumLineCount')) {
+			result.options.minimumLineCount = configurationService.getValue<number>('diffEditor.hideUnchangedRegions.minimumLineCount');
+		}
+		if (e.affectsConfiguration('diffEditor.hideUnchangedRegions.contextLineCount')) {
+			result.options.contextLineCount = configurationService.getValue<number>('diffEditor.hideUnchangedRegions.contextLineCount');
+		}
+		if (e.affectsConfiguration('diffEditor.hideUnchangedRegions.revealLineCount')) {
+			result.options.revealLineCount = configurationService.getValue<number>('diffEditor.hideUnchangedRegions.revealLineCount');
+		}
+		if (e.affectsConfiguration('diffEditor.hideUnchangedRegions.enabled')) {
+			result.options.enabled = configurationService.getValue('diffEditor.hideUnchangedRegions.enabled');
+			unchangedRegionsEnablementEmitter.fire(result.options.enabled);
+		}
+
+	}));
+
+	return result;
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/media/notebook.css b/src/vs/workbench/contrib/notebook/browser/media/notebook.css
index d659b3cf277..250ceaf80ef 100644
--- a/src/vs/workbench/contrib/notebook/browser/media/notebook.css
+++ b/src/vs/workbench/contrib/notebook/browser/media/notebook.css
@@ -11,6 +11,10 @@
 	position: relative;
 }
 
+.monaco-workbench .notebookOverlay.notebook-editor .monaco-editor {
+	line-height: 1.4em;
+}
+
 .monaco-workbench .notebookOverlay .cell-list-container > .monaco-list {
 	position: absolute;
 }
@@ -353,6 +357,8 @@
 
 .cell-comment-container.review-widget {
 	border-left: 1px solid var(--vscode-peekView-border); border-right: 1px solid var(--vscode-peekView-border);
+	/* Restore text-wrap to default value to avoid inheriting nowrap from monaco-list. */
+	text-wrap: initial;
 }
 
 .cell-comment-container.review-widget > .head {
@@ -446,6 +452,122 @@
 	background-color: var(--vscode-notebook-symbolHighlightBackground) !important;
 }
 
+/** Cell Multi-Cursor Cursor highlight */
+/* -- base selection styling -- */
+.nb-multicursor-selection {
+	top: 0;
+	min-width: 1.9px;
+	background-color: var(--vscode-editor-selectionBackground);
+
+	/* unsure about these two */
+	overflow: hidden;
+	box-sizing: border-box;
+}
+/* -- base cursor styling -- */
+.nb-multicursor-cursor {
+	top: 0;
+	min-width: 1.9px;
+	/* z-index: 10000000; */
+	background-color: #AEAFAD;
+
+	/* unsure about these two */
+	overflow: hidden;
+	box-sizing: border-box;
+}
+/* ======================================================================== */
+/* ======================================================================== */
+/* -- block-style -- */
+.nb-cursor-block-style {
+	width: 8px !important;
+}
+/* -- underline-style -- */
+.nb-cursor-underline-style {
+	width: 8px !important;
+	border-bottom-width: 2px;
+	border-bottom-style: solid;
+	background: transparent;
+}
+/* -- line-thin-style -- */
+.nb-cursor-line-thin-style {
+	min-width: none;
+	width: 0.9px !important;
+}
+/* -- block-outline-style -- */
+.nb-cursor-block-outline-style {
+	width: 8px !important;
+	border-width: 1px;
+	border-style: solid;
+	background: transparent;
+}
+/* -- underline-thin-style -- */
+.nb-cursor-underline-thin-style {
+	width: 8px !important;
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+	background: transparent;
+}
+/* ======================================================================== */
+/* ======================================================================== */
+/* -- cursor animations -- */
+.nb-blink {
+	animation: nb-cursor-blink 1s step-end infinite;
+}
+.nb-smooth {
+	animation: nb-cursor-smooth 0.5s ease-in-out 0.5s infinite alternate;
+}
+.nb-phase {
+	animation: nb-cursor-phase 0.5s ease-in-out 0.5s infinite alternate;
+}
+.nb-expand{
+	animation: nb-cursor-expand 0.5s ease-in-out 0.5s infinite alternate;
+}
+.nb-smooth-caret-animation {
+	transition: all 80ms;
+}
+
+/* -- animation keyframes -- */
+@keyframes nb-cursor-blink {
+	0% {
+		opacity: 1;
+	}
+	50% {
+		opacity: 0;
+	}
+	100% {
+		opacity: 1;
+	}
+}
+@keyframes nb-cursor-smooth {
+	0%,
+	20% {
+		opacity: 1;
+	}
+	60%,
+	100% {
+		opacity: 0;
+	}
+}
+@keyframes nb-cursor-phase {
+	0%,
+	20% {
+		opacity: 1;
+	}
+	90%,
+	100% {
+		opacity: 0;
+	}
+}
+@keyframes nb-cursor-expand {
+	0%,
+	20% {
+		transform: scaleY(1);
+	}
+	80%,
+	100% {
+		transform: scaleY(0);
+	}
+}
+
 /** Cell Search Range selection highlight */
 .monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.code-cell-row.nb-multiCellHighlight .cell-focus-indicator,
 .monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.markdown-cell-row.nb-multiCellHighlight {
diff --git a/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts b/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts
index 0f9026c0dde..c35c62624f7 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts
@@ -3,126 +3,132 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Schemas } from 'vs/base/common/network';
-import { IDisposable, Disposable, DisposableStore, dispose } from 'vs/base/common/lifecycle';
-import { parse } from 'vs/base/common/marshalling';
-import { extname, isEqual } from 'vs/base/common/resources';
-import { assertType } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { toFormattedString } from 'vs/base/common/jsonFormatter';
-import { ITextModel, ITextBufferFactory, DefaultEndOfLine, ITextBuffer } from 'vs/editor/common/model';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILanguageSelection, ILanguageService } from 'vs/editor/common/languages/language';
-import { ITextModelContentProvider, ITextModelService } from 'vs/editor/common/services/resolverService';
-import * as nls from 'vs/nls';
-import { Extensions, IConfigurationPropertySchema, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { EditorPaneDescriptor, IEditorPaneRegistry } from 'vs/workbench/browser/editor';
-import { Extensions as WorkbenchExtensions, IWorkbenchContribution, IWorkbenchContributionsRegistry, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { IEditorSerializer, IEditorFactoryRegistry, EditorExtensions } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { NotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookEditor';
-import { NotebookEditorInput, NotebookEditorInputOptions } from 'vs/workbench/contrib/notebook/common/notebookEditorInput';
-import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
-import { NotebookService } from 'vs/workbench/contrib/notebook/browser/services/notebookServiceImpl';
-import { CellKind, CellUri, IResolvedNotebookEditorModel, NotebookWorkingCopyTypeIdentifier, NotebookSetting, ICellOutput, ICell } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
-import { INotebookEditorModelResolverService } from 'vs/workbench/contrib/notebook/common/notebookEditorModelResolverService';
-import { NotebookDiffEditorInput } from 'vs/workbench/contrib/notebook/common/notebookDiffEditorInput';
-import { NotebookTextDiffEditor } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor';
-import { INotebookEditorWorkerService } from 'vs/workbench/contrib/notebook/common/services/notebookWorkerService';
-import { NotebookEditorWorkerServiceImpl } from 'vs/workbench/contrib/notebook/browser/services/notebookWorkerServiceImpl';
-import { INotebookCellStatusBarService } from 'vs/workbench/contrib/notebook/common/notebookCellStatusBarService';
-import { NotebookCellStatusBarService } from 'vs/workbench/contrib/notebook/browser/services/notebookCellStatusBarServiceImpl';
-import { INotebookEditorService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorService';
-import { NotebookEditorWidgetService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl';
-import { IJSONContributionRegistry, Extensions as JSONExtensions } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
-import { IJSONSchema, IJSONSchemaMap } from 'vs/base/common/jsonSchema';
-import { Event } from 'vs/base/common/event';
-import { getFormattedMetadataJSON, getStreamOutputData } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
-import { NotebookModelResolverServiceImpl } from 'vs/workbench/contrib/notebook/common/notebookEditorModelResolverServiceImpl';
-import { INotebookKernelHistoryService, INotebookKernelService } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
-import { NotebookKernelService } from 'vs/workbench/contrib/notebook/browser/services/notebookKernelServiceImpl';
-import { IWorkingCopyIdentifier } from 'vs/workbench/services/workingCopy/common/workingCopy';
-import { IResourceEditorInput } from 'vs/platform/editor/common/editor';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IWorkingCopyEditorHandler, IWorkingCopyEditorService } from 'vs/workbench/services/workingCopy/common/workingCopyEditorService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { NotebookRendererMessagingService } from 'vs/workbench/contrib/notebook/browser/services/notebookRendererMessagingServiceImpl';
-import { INotebookRendererMessagingService } from 'vs/workbench/contrib/notebook/common/notebookRendererMessagingService';
-import { INotebookCellOutlineProviderFactory, NotebookCellOutlineProviderFactory } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineProviderFactory';
+import { Schemas } from '../../../../base/common/network.js';
+import { IDisposable, Disposable, DisposableStore, dispose } from '../../../../base/common/lifecycle.js';
+import { parse } from '../../../../base/common/marshalling.js';
+import { extname, isEqual } from '../../../../base/common/resources.js';
+import { assertType } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { toFormattedString } from '../../../../base/common/jsonFormatter.js';
+import { ITextModel, ITextBufferFactory, DefaultEndOfLine, ITextBuffer } from '../../../../editor/common/model.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ILanguageSelection, ILanguageService } from '../../../../editor/common/languages/language.js';
+import { ITextModelContentProvider, ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import * as nls from '../../../../nls.js';
+import { Extensions, IConfigurationPropertySchema, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { EditorPaneDescriptor, IEditorPaneRegistry } from '../../../browser/editor.js';
+import { Extensions as WorkbenchExtensions, IWorkbenchContribution, IWorkbenchContributionsRegistry, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { IEditorSerializer, IEditorFactoryRegistry, EditorExtensions } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { NotebookEditor } from './notebookEditor.js';
+import { NotebookEditorInput, NotebookEditorInputOptions } from '../common/notebookEditorInput.js';
+import { INotebookService } from '../common/notebookService.js';
+import { NotebookService } from './services/notebookServiceImpl.js';
+import { CellKind, CellUri, IResolvedNotebookEditorModel, NotebookWorkingCopyTypeIdentifier, NotebookSetting, ICellOutput, ICell, NotebookCellsChangeType, NotebookMetadataUri } from '../common/notebookCommon.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IUndoRedoService } from '../../../../platform/undoRedo/common/undoRedo.js';
+import { INotebookEditorModelResolverService } from '../common/notebookEditorModelResolverService.js';
+import { NotebookDiffEditorInput } from '../common/notebookDiffEditorInput.js';
+import { NotebookTextDiffEditor } from './diff/notebookDiffEditor.js';
+import { INotebookEditorWorkerService } from '../common/services/notebookWorkerService.js';
+import { NotebookEditorWorkerServiceImpl } from './services/notebookWorkerServiceImpl.js';
+import { INotebookCellStatusBarService } from '../common/notebookCellStatusBarService.js';
+import { NotebookCellStatusBarService } from './services/notebookCellStatusBarServiceImpl.js';
+import { INotebookEditorService } from './services/notebookEditorService.js';
+import { NotebookEditorWidgetService } from './services/notebookEditorServiceImpl.js';
+import { IJSONContributionRegistry, Extensions as JSONExtensions } from '../../../../platform/jsonschemas/common/jsonContributionRegistry.js';
+import { IJSONSchema, IJSONSchemaMap } from '../../../../base/common/jsonSchema.js';
+import { Event } from '../../../../base/common/event.js';
+import { getFormattedOutputJSON, getStreamOutputData } from './diff/diffElementViewModel.js';
+import { NotebookModelResolverServiceImpl } from '../common/notebookEditorModelResolverServiceImpl.js';
+import { INotebookKernelHistoryService, INotebookKernelService } from '../common/notebookKernelService.js';
+import { NotebookKernelService } from './services/notebookKernelServiceImpl.js';
+import { IWorkingCopyIdentifier } from '../../../services/workingCopy/common/workingCopy.js';
+import { IResourceEditorInput } from '../../../../platform/editor/common/editor.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IWorkingCopyEditorHandler, IWorkingCopyEditorService } from '../../../services/workingCopy/common/workingCopyEditorService.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { NotebookRendererMessagingService } from './services/notebookRendererMessagingServiceImpl.js';
+import { INotebookRendererMessagingService } from '../common/notebookRendererMessagingService.js';
+import { INotebookCellOutlineDataSourceFactory, NotebookCellOutlineDataSourceFactory } from './viewModel/notebookOutlineDataSourceFactory.js';
 
 // Editor Controller
-import 'vs/workbench/contrib/notebook/browser/controller/coreActions';
-import 'vs/workbench/contrib/notebook/browser/controller/insertCellActions';
-import 'vs/workbench/contrib/notebook/browser/controller/executeActions';
-import 'vs/workbench/contrib/notebook/browser/controller/sectionActions';
-import 'vs/workbench/contrib/notebook/browser/controller/layoutActions';
-import 'vs/workbench/contrib/notebook/browser/controller/editActions';
-import 'vs/workbench/contrib/notebook/browser/controller/cellOutputActions';
-import 'vs/workbench/contrib/notebook/browser/controller/apiActions';
-import 'vs/workbench/contrib/notebook/browser/controller/foldingController';
-import 'vs/workbench/contrib/notebook/browser/controller/chat/notebook.chat.contribution';
+import './controller/coreActions.js';
+import './controller/insertCellActions.js';
+import './controller/executeActions.js';
+import './controller/sectionActions.js';
+import './controller/layoutActions.js';
+import './controller/editActions.js';
+import './controller/cellOutputActions.js';
+import './controller/apiActions.js';
+import './controller/foldingController.js';
+import './controller/chat/notebook.chat.contribution.js';
 
 // Editor Contribution
-import 'vs/workbench/contrib/notebook/browser/contrib/editorHint/emptyCellEditorHint';
-import 'vs/workbench/contrib/notebook/browser/contrib/clipboard/notebookClipboard';
-import 'vs/workbench/contrib/notebook/browser/contrib/find/notebookFind';
-import 'vs/workbench/contrib/notebook/browser/contrib/format/formatting';
-import 'vs/workbench/contrib/notebook/browser/contrib/saveParticipants/saveParticipants';
-import 'vs/workbench/contrib/notebook/browser/contrib/gettingStarted/notebookGettingStarted';
-import 'vs/workbench/contrib/notebook/browser/contrib/layout/layoutActions';
-import 'vs/workbench/contrib/notebook/browser/contrib/marker/markerProvider';
-import 'vs/workbench/contrib/notebook/browser/contrib/navigation/arrow';
-import 'vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline';
-import 'vs/workbench/contrib/notebook/browser/contrib/profile/notebookProfile';
-import 'vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/statusBarProviders';
-import 'vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/contributedStatusBarItemController';
-import 'vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController';
-import 'vs/workbench/contrib/notebook/browser/contrib/editorStatusBar/editorStatusBar';
-import 'vs/workbench/contrib/notebook/browser/contrib/undoRedo/notebookUndoRedo';
-import 'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands';
-import 'vs/workbench/contrib/notebook/browser/contrib/viewportWarmup/viewportWarmup';
-import 'vs/workbench/contrib/notebook/browser/contrib/troubleshoot/layout';
-import 'vs/workbench/contrib/notebook/browser/contrib/debug/notebookBreakpoints';
-import 'vs/workbench/contrib/notebook/browser/contrib/debug/notebookCellPausing';
-import 'vs/workbench/contrib/notebook/browser/contrib/debug/notebookDebugDecorations';
-import 'vs/workbench/contrib/notebook/browser/contrib/execute/executionEditorProgress';
-import 'vs/workbench/contrib/notebook/browser/contrib/kernelDetection/notebookKernelDetection';
-import 'vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnostics';
+import './contrib/editorHint/emptyCellEditorHint.js';
+import './contrib/clipboard/notebookClipboard.js';
+import './contrib/find/notebookFind.js';
+import './contrib/format/formatting.js';
+import './contrib/saveParticipants/saveParticipants.js';
+import './contrib/gettingStarted/notebookGettingStarted.js';
+import './contrib/layout/layoutActions.js';
+import './contrib/marker/markerProvider.js';
+import './contrib/navigation/arrow.js';
+import './contrib/outline/notebookOutline.js';
+import './contrib/profile/notebookProfile.js';
+import './contrib/cellStatusBar/statusBarProviders.js';
+import './contrib/cellStatusBar/contributedStatusBarItemController.js';
+import './contrib/cellStatusBar/executionStatusBarItemController.js';
+import './contrib/editorStatusBar/editorStatusBar.js';
+import './contrib/undoRedo/notebookUndoRedo.js';
+import './contrib/cellCommands/cellCommands.js';
+import './contrib/viewportWarmup/viewportWarmup.js';
+import './contrib/troubleshoot/layout.js';
+import './contrib/debug/notebookBreakpoints.js';
+import './contrib/debug/notebookCellPausing.js';
+import './contrib/debug/notebookDebugDecorations.js';
+import './contrib/execute/executionEditorProgress.js';
+import './contrib/kernelDetection/notebookKernelDetection.js';
+import './contrib/cellDiagnostics/cellDiagnostics.js';
+import './contrib/multicursor/notebookMulticursor.js';
 
 // Diff Editor Contribution
-import 'vs/workbench/contrib/notebook/browser/diff/notebookDiffActions';
+import './diff/notebookDiffActions.js';
 
 // Services
-import { editorOptionsRegistry } from 'vs/editor/common/config/editorOptions';
-import { NotebookExecutionStateService } from 'vs/workbench/contrib/notebook/browser/services/notebookExecutionStateServiceImpl';
-import { NotebookExecutionService } from 'vs/workbench/contrib/notebook/browser/services/notebookExecutionServiceImpl';
-import { INotebookExecutionService } from 'vs/workbench/contrib/notebook/common/notebookExecutionService';
-import { INotebookKeymapService } from 'vs/workbench/contrib/notebook/common/notebookKeymapService';
-import { NotebookKeymapService } from 'vs/workbench/contrib/notebook/browser/services/notebookKeymapServiceImpl';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { NotebookInfo } from 'vs/editor/common/languageFeatureRegistry';
-import { COMMENTEDITOR_DECORATION_KEY } from 'vs/workbench/contrib/comments/browser/commentReply';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { NotebookKernelHistoryService } from 'vs/workbench/contrib/notebook/browser/services/notebookKernelHistoryServiceImpl';
-import { INotebookLoggingService } from 'vs/workbench/contrib/notebook/common/notebookLoggingService';
-import { NotebookLoggingService } from 'vs/workbench/contrib/notebook/browser/services/notebookLoggingServiceImpl';
-import product from 'vs/platform/product/common/product';
-import { NotebookVariables } from 'vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariables';
-import { AccessibleViewRegistry } from 'vs/platform/accessibility/browser/accessibleViewRegistry';
-import { NotebookAccessibilityHelp } from 'vs/workbench/contrib/notebook/browser/notebookAccessibilityHelp';
-import { NotebookAccessibleView } from 'vs/workbench/contrib/notebook/browser/notebookAccessibleView';
-import { DefaultFormatter } from 'vs/workbench/contrib/format/browser/formatActionsMultiple';
+import { editorOptionsRegistry } from '../../../../editor/common/config/editorOptions.js';
+import { NotebookExecutionStateService } from './services/notebookExecutionStateServiceImpl.js';
+import { NotebookExecutionService } from './services/notebookExecutionServiceImpl.js';
+import { INotebookExecutionService } from '../common/notebookExecutionService.js';
+import { INotebookKeymapService } from '../common/notebookKeymapService.js';
+import { NotebookKeymapService } from './services/notebookKeymapServiceImpl.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../../../../editor/common/languages/modesRegistry.js';
+import { INotebookExecutionStateService } from '../common/notebookExecutionStateService.js';
+import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
+import { NotebookInfo } from '../../../../editor/common/languageFeatureRegistry.js';
+import { COMMENTEDITOR_DECORATION_KEY } from '../../comments/browser/commentReply.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { NotebookKernelHistoryService } from './services/notebookKernelHistoryServiceImpl.js';
+import { INotebookLoggingService } from '../common/notebookLoggingService.js';
+import { NotebookLoggingService } from './services/notebookLoggingServiceImpl.js';
+import product from '../../../../platform/product/common/product.js';
+import { NotebookVariables } from './contrib/notebookVariables/notebookVariables.js';
+import { AccessibleViewRegistry } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
+import { NotebookAccessibilityHelp } from './notebookAccessibilityHelp.js';
+import { NotebookAccessibleView } from './notebookAccessibleView.js';
+import { DefaultFormatter } from '../../format/browser/formatActionsMultiple.js';
+import { NotebookMultiTextDiffEditor } from './diff/notebookMultiDiffEditor.js';
+import { NotebookMultiDiffEditorInput } from './diff/notebookMultiDiffEditorInput.js';
+import { getFormattedMetadataJSON } from '../common/model/notebookCellTextModel.js';
+import { INotebookOutlineEntryFactory, NotebookOutlineEntryFactory } from './viewModel/notebookOutlineEntryFactory.js';
+import { getFormattedNotebookMetadataJSON } from '../common/model/notebookMetadataTextModel.js';
 
 /*--------------------------------------------------------------------------------------------- */
 
@@ -148,7 +154,19 @@ Registry.as<IEditorPaneRegistry>(EditorExtensions.EditorPane).registerEditorPane
 	]
 );
 
+Registry.as<IEditorPaneRegistry>(EditorExtensions.EditorPane).registerEditorPane(
+	EditorPaneDescriptor.create(
+		NotebookMultiTextDiffEditor,
+		NotebookMultiTextDiffEditor.ID,
+		'Notebook Diff Editor'
+	),
+	[
+		new SyncDescriptor(NotebookMultiDiffEditorInput)
+	]
+);
+
 class NotebookDiffEditorSerializer implements IEditorSerializer {
+	constructor(@IConfigurationService private readonly _configurationService: IConfigurationService) { }
 	canSerialize(): boolean {
 		return true;
 	}
@@ -176,8 +194,11 @@ class NotebookDiffEditorSerializer implements IEditorSerializer {
 			return undefined;
 		}
 
-		const input = NotebookDiffEditorInput.create(instantiationService, resource, name, undefined, originalResource, viewType);
-		return input;
+		if (this._configurationService.getValue('notebook.experimental.enableNewDiffEditor')) {
+			return NotebookMultiDiffEditorInput.create(instantiationService, resource, name, undefined, originalResource, viewType);
+		} else {
+			return NotebookDiffEditorInput.create(instantiationService, resource, name, undefined, originalResource, viewType);
+		}
 	}
 
 	static canResolveBackup(editorInput: EditorInput, backupResource: URI): boolean {
@@ -187,8 +208,8 @@ class NotebookDiffEditorSerializer implements IEditorSerializer {
 }
 type SerializedNotebookEditorData = { resource: URI; preferredResource: URI; viewType: string; options?: NotebookEditorInputOptions };
 class NotebookEditorSerializer implements IEditorSerializer {
-	canSerialize(): boolean {
-		return true;
+	canSerialize(input: EditorInput): boolean {
+		return input.typeId === NotebookEditorInput.ID;
 	}
 	serialize(input: EditorInput): string {
 		assertType(input instanceof NotebookEditorInput);
@@ -420,15 +441,24 @@ class CellInfoContentProvider {
 		let result: ITextModel | null = null;
 
 		const mode = this._languageService.createById('json');
-
+		const disposables = new DisposableStore();
 		for (const cell of ref.object.notebook.cells) {
 			if (cell.handle === data.handle) {
-				const metadataSource = getFormattedMetadataJSON(ref.object.notebook, cell.metadata, cell.language);
+				const cellIndex = ref.object.notebook.cells.indexOf(cell);
+				const metadataSource = getFormattedMetadataJSON(ref.object.notebook.transientOptions.transientCellMetadata, cell.metadata, cell.language);
 				result = this._modelService.createModel(
 					metadataSource,
 					mode,
 					resource
 				);
+				this._disposables.push(disposables.add(ref.object.notebook.onDidChangeContent(e => {
+					if (result && e.rawEvents.some(event => (event.kind === NotebookCellsChangeType.ChangeCellMetadata || event.kind === NotebookCellsChangeType.ChangeCellLanguage) && event.index === cellIndex)) {
+						const value = getFormattedMetadataJSON(ref.object.notebook.transientOptions.transientCellMetadata, cell.metadata, cell.language);
+						if (result.getValue() !== value) {
+							result.setValue(getFormattedMetadataJSON(ref.object.notebook.transientOptions.transientCellMetadata, cell.metadata, cell.language));
+						}
+					}
+				})));
 				break;
 			}
 		}
@@ -439,6 +469,7 @@ class CellInfoContentProvider {
 		}
 
 		const once = result.onWillDispose(() => {
+			disposables.dispose();
 			once.dispose();
 			ref.dispose();
 		});
@@ -493,6 +524,40 @@ class CellInfoContentProvider {
 		return result;
 	}
 
+	async provideOutputsTextContent(resource: URI): Promise<ITextModel | null> {
+		const existing = this._modelService.getModel(resource);
+		if (existing) {
+			return existing;
+		}
+
+		const data = CellUri.parseCellPropertyUri(resource, Schemas.vscodeNotebookCellOutput);
+		if (!data) {
+			return null;
+		}
+
+		const ref = await this._notebookModelResolverService.resolve(data.notebook);
+		const cell = ref.object.notebook.cells.find(cell => cell.handle === data.handle);
+
+		if (!cell) {
+			ref.dispose();
+			return null;
+		}
+
+		const mode = this._languageService.createById('json');
+		const model = this._modelService.createModel(getFormattedOutputJSON(cell.outputs || []), mode, resource, true);
+		const cellModelListener = Event.any(cell.onDidChangeOutputs ?? Event.None, cell.onDidChangeOutputItems ?? Event.None)(() => {
+			model.setValue(getFormattedOutputJSON(cell.outputs || []));
+		});
+
+		const once = model.onWillDispose(() => {
+			once.dispose();
+			cellModelListener.dispose();
+			ref.dispose();
+		});
+
+		return model;
+	}
+
 	async provideOutputTextContent(resource: URI): Promise<ITextModel | null> {
 		const existing = this._modelService.getModel(resource);
 		if (existing) {
@@ -501,7 +566,7 @@ class CellInfoContentProvider {
 
 		const data = CellUri.parseCellOutputUri(resource);
 		if (!data) {
-			return null;
+			return this.provideOutputsTextContent(resource);
 		}
 
 		const ref = await this._notebookModelResolverService.resolve(data.notebook);
@@ -541,6 +606,82 @@ class CellInfoContentProvider {
 	}
 }
 
+class NotebookMetadataContentProvider {
+	static readonly ID = 'workbench.contrib.notebookMetadataContentProvider';
+
+	private readonly _disposables: IDisposable[] = [];
+
+	constructor(
+		@ITextModelService textModelService: ITextModelService,
+		@IModelService private readonly _modelService: IModelService,
+		@ILanguageService private readonly _languageService: ILanguageService,
+		@ILabelService private readonly _labelService: ILabelService,
+		@INotebookEditorModelResolverService private readonly _notebookModelResolverService: INotebookEditorModelResolverService,
+	) {
+		this._disposables.push(textModelService.registerTextModelContentProvider(Schemas.vscodeNotebookMetadata, {
+			provideTextContent: this.provideMetadataTextContent.bind(this)
+		}));
+
+		this._disposables.push(this._labelService.registerFormatter({
+			scheme: Schemas.vscodeNotebookMetadata,
+			formatting: {
+				label: '${path} (metadata)',
+				separator: '/'
+			}
+		}));
+	}
+
+	dispose(): void {
+		dispose(this._disposables);
+	}
+
+	async provideMetadataTextContent(resource: URI): Promise<ITextModel | null> {
+		const existing = this._modelService.getModel(resource);
+		if (existing) {
+			return existing;
+		}
+
+		const data = NotebookMetadataUri.parse(resource);
+		if (!data) {
+			return null;
+		}
+
+		const ref = await this._notebookModelResolverService.resolve(data);
+		let result: ITextModel | null = null;
+
+		const mode = this._languageService.createById('json');
+		const disposables = new DisposableStore();
+		const metadataSource = getFormattedNotebookMetadataJSON(ref.object.notebook.transientOptions.transientDocumentMetadata, ref.object.notebook.metadata);
+		result = this._modelService.createModel(
+			metadataSource,
+			mode,
+			resource
+		);
+
+		if (!result) {
+			ref.dispose();
+			return null;
+		}
+
+		this._disposables.push(disposables.add(ref.object.notebook.onDidChangeContent(e => {
+			if (result && e.rawEvents.some(event => (event.kind === NotebookCellsChangeType.ChangeCellContent || event.kind === NotebookCellsChangeType.ChangeDocumentMetadata || event.kind === NotebookCellsChangeType.ModelChange))) {
+				const value = getFormattedNotebookMetadataJSON(ref.object.notebook.transientOptions.transientDocumentMetadata, ref.object.notebook.metadata);
+				if (result.getValue() !== value) {
+					result.setValue(value);
+				}
+			}
+		})));
+
+		const once = result.onWillDispose(() => {
+			disposables.dispose();
+			once.dispose();
+			ref.dispose();
+		});
+
+		return result;
+	}
+}
+
 class RegisterSchemasContribution extends Disposable implements IWorkbenchContribution {
 
 	static readonly ID = 'workbench.contrib.registerCellSchemas';
@@ -669,8 +810,12 @@ class SimpleNotebookWorkingCopyEditorHandler extends Disposable implements IWork
 		this._register(this._workingCopyEditorService.registerHandler(this));
 	}
 
-	private _getViewType(workingCopy: IWorkingCopyIdentifier): string | undefined {
-		return NotebookWorkingCopyTypeIdentifier.parse(workingCopy.typeId);
+	private _getViewType(workingCopy: IWorkingCopyIdentifier) {
+		const notebookType = NotebookWorkingCopyTypeIdentifier.parse(workingCopy.typeId);
+		if (notebookType && notebookType.viewType === notebookType.notebookType) {
+			return notebookType?.viewType;
+		}
+		return undefined;
 	}
 }
 
@@ -705,6 +850,7 @@ const workbenchContributionsRegistry = Registry.as<IWorkbenchContributionsRegist
 registerWorkbenchContribution2(NotebookContribution.ID, NotebookContribution, WorkbenchPhase.BlockStartup);
 registerWorkbenchContribution2(CellContentProvider.ID, CellContentProvider, WorkbenchPhase.BlockStartup);
 registerWorkbenchContribution2(CellInfoContentProvider.ID, CellInfoContentProvider, WorkbenchPhase.BlockStartup);
+registerWorkbenchContribution2(NotebookMetadataContentProvider.ID, NotebookMetadataContentProvider, WorkbenchPhase.BlockStartup);
 registerWorkbenchContribution2(RegisterSchemasContribution.ID, RegisterSchemasContribution, WorkbenchPhase.BlockStartup);
 registerWorkbenchContribution2(NotebookEditorManager.ID, NotebookEditorManager, WorkbenchPhase.BlockRestore);
 registerWorkbenchContribution2(NotebookLanguageSelectorScoreRefine.ID, NotebookLanguageSelectorScoreRefine, WorkbenchPhase.BlockRestore);
@@ -726,7 +872,8 @@ registerSingleton(INotebookExecutionStateService, NotebookExecutionStateService,
 registerSingleton(INotebookRendererMessagingService, NotebookRendererMessagingService, InstantiationType.Delayed);
 registerSingleton(INotebookKeymapService, NotebookKeymapService, InstantiationType.Delayed);
 registerSingleton(INotebookLoggingService, NotebookLoggingService, InstantiationType.Delayed);
-registerSingleton(INotebookCellOutlineProviderFactory, NotebookCellOutlineProviderFactory, InstantiationType.Delayed);
+registerSingleton(INotebookCellOutlineDataSourceFactory, NotebookCellOutlineDataSourceFactory, InstantiationType.Delayed);
+registerSingleton(INotebookOutlineEntryFactory, NotebookOutlineEntryFactory, InstantiationType.Delayed);
 
 const schemas: IJSONSchemaMap = {};
 function isConfigurationPropertySchema(x: IConfigurationPropertySchema | { [path: string]: IConfigurationPropertySchema }): x is IConfigurationPropertySchema {
@@ -1004,18 +1151,6 @@ configurationRegistry.registerConfiguration({
 			tags: ['notebookLayout'],
 			default: false
 		},
-		[NotebookSetting.codeActionsOnSave]: {
-			markdownDescription: nls.localize('notebook.codeActionsOnSave', 'Run a series of Code Actions for a notebook on save. Code Actions must be specified, the file must not be saved after delay, and the editor must not be shutting down. Example: `"notebook.source.organizeImports": "explicit"`'),
-			type: 'object',
-			additionalProperties: {
-				type: ['string', 'boolean'],
-				enum: ['explicit', 'never', true, false],
-				// enum: ['explicit', 'always', 'never'], -- autosave support needs to be built first
-				// nls.localize('always', 'Always triggers Code Actions on save, including autosave, focus, and window change events.'),
-				enumDescriptions: [nls.localize('explicit', 'Triggers Code Actions only when explicitly saved.'), nls.localize('never', 'Never triggers Code Actions on save.'), nls.localize('explicitBoolean', 'Triggers Code Actions only when explicitly saved. This value will be deprecated in favor of "explicit".'), nls.localize('neverBoolean', 'Triggers Code Actions only when explicitly saved. This value will be deprecated in favor of "never".')],
-			},
-			default: {}
-		},
 		[NotebookSetting.formatOnCellExecution]: {
 			markdownDescription: nls.localize('notebook.formatOnCellExecution', "Format a notebook cell upon execution. A formatter must be available."),
 			type: 'boolean',
@@ -1055,11 +1190,6 @@ configurationRegistry.registerConfiguration({
 			},
 			tags: ['notebookLayout']
 		},
-		[NotebookSetting.findScope]: {
-			markdownDescription: nls.localize('notebook.experimental.find.scope.enabled', "Enables the user to search within a selection of cells in the notebook. When enabled, the user will see a \"Find in Cell Selection\" icon in the notebook find widget."),
-			type: 'boolean',
-			default: false,
-		},
 		[NotebookSetting.remoteSaving]: {
 			markdownDescription: nls.localize('notebook.remoteSaving', "Enables the incremental saving of notebooks between processes and across Remote connections. When enabled, only the changes to the notebook are sent to the extension host, improving performance for large notebooks and slow network connections."),
 			type: 'boolean',
@@ -1077,11 +1207,6 @@ configurationRegistry.registerConfiguration({
 			],
 			default: 'fullCell'
 		},
-		[NotebookSetting.cellChat]: {
-			markdownDescription: nls.localize('notebook.cellChat', "Enable experimental floating chat widget in notebooks."),
-			type: 'boolean',
-			default: false
-		},
 		[NotebookSetting.cellGenerate]: {
 			markdownDescription: nls.localize('notebook.cellGenerate', "Enable experimental generate action to create code cell with inline chat enabled."),
 			type: 'boolean',
@@ -1102,6 +1227,11 @@ configurationRegistry.registerConfiguration({
 			markdownDescription: nls.localize('notebook.backup.sizeLimit', "The limit of notebook output size in kilobytes (KB) where notebook files will no longer be backed up for hot reload. Use 0 for unlimited."),
 			type: 'number',
 			default: 10000
-		}
+		},
+		[NotebookSetting.multiCursor]: {
+			markdownDescription: nls.localize('notebook.multiCursor.enabled', "Experimental. Enables a limited set of multi cursor controls across multiple cells in the notebook editor. Currently supported are core editor actions (typing/cut/copy/paste/composition) and a limited subset of editor commands."),
+			type: 'boolean',
+			default: false
+		},
 	}
 });
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookAccessibilityHelp.ts b/src/vs/workbench/contrib/notebook/browser/notebookAccessibilityHelp.ts
index b146d0f71d2..9e2118bcb10 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookAccessibilityHelp.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookAccessibilityHelp.ts
@@ -2,61 +2,57 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IAccessibleViewImplentation } from 'vs/platform/accessibility/browser/accessibleViewRegistry';
-import { NOTEBOOK_IS_ACTIVE_EDITOR } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { localize } from 'vs/nls';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { AccessibleViewProviderId, AccessibleViewType } from 'vs/platform/accessibility/browser/accessibleView';
-import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IVisibleEditorPane } from 'vs/workbench/common/editor';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IAccessibleViewImplentation } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
+import { IS_COMPOSITE_NOTEBOOK, NOTEBOOK_EDITOR_FOCUSED } from '../common/notebookContextKeys.js';
+import { localize } from '../../../../nls.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { AccessibleViewProviderId, AccessibleViewType, AccessibleContentProvider } from '../../../../platform/accessibility/browser/accessibleView.js';
+import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IVisibleEditorPane } from '../../../common/editor.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 
 export class NotebookAccessibilityHelp implements IAccessibleViewImplentation {
 	readonly priority = 105;
 	readonly name = 'notebook';
-	readonly when = NOTEBOOK_IS_ACTIVE_EDITOR;
+	readonly when = ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, IS_COMPOSITE_NOTEBOOK.negate());
 	readonly type: AccessibleViewType = AccessibleViewType.Help;
 	getProvider(accessor: ServicesAccessor) {
 		const activeEditor = accessor.get(ICodeEditorService).getActiveCodeEditor()
 			|| accessor.get(ICodeEditorService).getFocusedCodeEditor()
 			|| accessor.get(IEditorService).activeEditorPane;
 
-		if (activeEditor) {
-			return runAccessibilityHelpAction(accessor, activeEditor);
+		if (!activeEditor) {
+			return;
 		}
-		return;
+		return getAccessibilityHelpProvider(accessor, activeEditor);
 	}
-	dispose() { }
 }
 
-
-
-export function getAccessibilityHelpText(): string {
+function getAccessibilityHelpText(): string {
 	return [
 		localize('notebook.overview', 'The notebook view is a collection of code and markdown cells. Code cells can be executed and will produce output directly below the cell.'),
-		localize('notebook.cell.edit', 'The Edit Cell command<keybinding:notebook.cell.edit> will focus on the cell input.'),
-		localize('notebook.cell.quitEdit', 'The Quit Edit command<keybinding:notebook.cell.quitEdit> will set focus on the cell container. The default (Escape) key may need to be pressed twice first exit the virtual cursor if active.'),
-		localize('notebook.cell.focusInOutput', 'The Focus Output command<keybinding:notebook.cell.focusInOutput> will set focus in the cell\'s output.'),
-		localize('notebook.focusNextEditor', 'The Focus Next Cell Editor command<keybinding:notebook.focusNextEditor> will set focus in the next cell\'s editor.'),
-		localize('notebook.focusPreviousEditor', 'The Focus Previous Cell Editor command<keybinding:notebook.focusPreviousEditor> will set focus in the previous cell\'s editor.'),
+		localize('notebook.cell.edit', 'The Edit Cell command{0} will focus on the cell input.', '<keybinding:notebook.cell.edit>'),
+		localize('notebook.cell.quitEdit', 'The Quit Edit command{0} will set focus on the cell container. The default (Escape) key may need to be pressed twice first exit the virtual cursor if active.', '<keybinding:notebook.cell.quitEdit>'),
+		localize('notebook.cell.focusInOutput', 'The Focus Output command{0} will set focus in the cell\'s output.', '<keybinding:notebook.cell.focusInOutput>'),
+		localize('notebook.focusNextEditor', 'The Focus Next Cell Editor command{0} will set focus in the next cell\'s editor.', '<keybinding:notebook.focusNextEditor>'),
+		localize('notebook.focusPreviousEditor', 'The Focus Previous Cell Editor command{0} will set focus in the previous cell\'s editor.', '<keybinding:notebook.focusPreviousEditor>'),
 		localize('notebook.cellNavigation', 'The up and down arrows will also move focus between cells while focused on the outer cell container.'),
-		localize('notebook.cell.executeAndFocusContainer', 'The Execute Cell command<keybinding:notebook.cell.executeAndFocusContainer> executes the cell that currently has focus.',),
-		localize('notebook.cell.insertCodeCellBelowAndFocusContainer', 'The Insert Cell Above/Below commands will create new empty code cells'),
+		localize('notebook.cell.executeAndFocusContainer', 'The Execute Cell command{0} executes the cell that currently has focus.', '<keybinding:notebook.cell.executeAndFocusContainer>'),
+		localize('notebook.cell.insertCodeCellBelowAndFocusContainer', 'The Insert Cell Above{0} and Below{1} commands will create new empty code cells.', '<keybinding:notebook.cell.insertCodeCellAbove>', '<keybinding:notebook.cell.insertCodeCellBelow>'),
 		localize('notebook.changeCellType', 'The Change Cell to Code/Markdown commands are used to switch between cell types.')
-	].join('\n\n');
+	].join('\n');
 }
 
-export function runAccessibilityHelpAction(accessor: ServicesAccessor, editor: ICodeEditor | IVisibleEditorPane) {
+function getAccessibilityHelpProvider(accessor: ServicesAccessor, editor: ICodeEditor | IVisibleEditorPane) {
 	const helpText = getAccessibilityHelpText();
-	return {
-		id: AccessibleViewProviderId.Notebook,
-		verbositySettingKey: AccessibilityVerbositySettingId.Notebook,
-		provideContent: () => helpText,
-		onClose: () => {
-			editor.focus();
-		},
-		options: { type: AccessibleViewType.Help }
-	};
+	return new AccessibleContentProvider(
+		AccessibleViewProviderId.Notebook,
+		{ type: AccessibleViewType.Help },
+		() => helpText,
+		() => editor.focus(),
+		AccessibilityVerbositySettingId.Notebook,
+	);
 }
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookAccessibilityProvider.ts b/src/vs/workbench/contrib/notebook/browser/notebookAccessibilityProvider.ts
index 948db4cd3a1..3e358ecdc01 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookAccessibilityProvider.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookAccessibilityProvider.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
-import { Event, Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { observableFromEvent } from 'vs/base/common/observable';
-import * as nls from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { AccessibilityCommandId } from 'vs/workbench/contrib/accessibility/common/accessibilityCommands';
-import { CellViewModel, NotebookViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl';
-import { CellKind, NotebookCellExecutionState } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { ICellExecutionStateChangedEvent, IExecutionStateChangedEvent, INotebookExecutionStateService, NotebookExecutionType } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
+import { IListAccessibilityProvider } from '../../../../base/browser/ui/list/listWidget.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { observableFromEvent } from '../../../../base/common/observable.js';
+import * as nls from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
+import { AccessibilityCommandId } from '../../accessibility/common/accessibilityCommands.js';
+import { CellViewModel, NotebookViewModel } from './viewModel/notebookViewModelImpl.js';
+import { CellKind, NotebookCellExecutionState } from '../common/notebookCommon.js';
+import { ICellExecutionStateChangedEvent, IExecutionStateChangedEvent, INotebookExecutionStateService, NotebookExecutionType } from '../common/notebookExecutionStateService.js';
 
 export class NotebookAccessibilityProvider extends Disposable implements IListAccessibilityProvider<CellViewModel> {
 	private readonly _onDidAriaLabelChange = new Emitter<CellViewModel>();
@@ -24,7 +24,8 @@ export class NotebookAccessibilityProvider extends Disposable implements IListAc
 		private readonly notebookExecutionStateService: INotebookExecutionStateService,
 		private readonly viewModel: () => NotebookViewModel | undefined,
 		private readonly keybindingService: IKeybindingService,
-		private readonly configurationService: IConfigurationService
+		private readonly configurationService: IConfigurationService,
+		private readonly isReplHistory: boolean
 	) {
 		super();
 		this._register(Event.debounce<ICellExecutionStateChangedEvent | IExecutionStateChangedEvent, number[]>(
@@ -44,9 +45,15 @@ export class NotebookAccessibilityProvider extends Disposable implements IListAc
 		}, this));
 	}
 
+	get verbositySettingId() {
+		return this.isReplHistory ?
+			AccessibilityVerbositySettingId.ReplEditor :
+			AccessibilityVerbositySettingId.Notebook;
+	}
+
 	getAriaLabel(element: CellViewModel) {
 		const event = Event.filter(this.onDidAriaLabelChange, e => e === element);
-		return observableFromEvent(event, () => {
+		return observableFromEvent(this, event, () => {
 			const viewModel = this.viewModel();
 			if (!viewModel) {
 				return '';
@@ -61,6 +68,12 @@ export class NotebookAccessibilityProvider extends Disposable implements IListAc
 		});
 	}
 
+	private createItemLabel(executionLabel: string, index: number, cellKind: CellKind) {
+		return this.isReplHistory ?
+			`item${executionLabel}` :
+			`${cellKind === CellKind.Markup ? 'markdown' : 'code'} cell${executionLabel}`;
+	}
+
 	private getLabel(index: number, element: CellViewModel) {
 		const executionState = this.notebookExecutionStateService.getCellExecution(element.uri)?.state;
 		const executionLabel =
@@ -69,18 +82,25 @@ export class NotebookAccessibilityProvider extends Disposable implements IListAc
 				: executionState === NotebookCellExecutionState.Pending
 					? ', pending'
 					: '';
-		return `Cell ${index}, ${element.cellKind === CellKind.Markup ? 'markdown' : 'code'} cell${executionLabel}`;
+
+		return this.createItemLabel(executionLabel, index, element.cellKind);
+	}
+
+	private get widgetAriaLabelName() {
+		return this.isReplHistory ?
+			nls.localize('replHistoryTreeAriaLabel', "REPL Editor History") :
+			nls.localize('notebookTreeAriaLabel', "Notebook");
 	}
 
 	getWidgetAriaLabel() {
 		const keybinding = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getLabel();
 
-		if (this.configurationService.getValue(AccessibilityVerbositySettingId.Notebook)) {
+		if (this.configurationService.getValue(this.verbositySettingId)) {
 			return keybinding
-				? nls.localize('notebookTreeAriaLabelHelp', "Notebook\nUse {0} for accessibility help", keybinding)
-				: nls.localize('notebookTreeAriaLabelHelpNoKb', "Notebook\nRun the Open Accessibility Help command for more information", keybinding);
+				? nls.localize('notebookTreeAriaLabelHelp', "{0}\nUse {1} for accessibility help", this.widgetAriaLabelName, keybinding)
+				: nls.localize('notebookTreeAriaLabelHelpNoKb', "{0}\nRun the Open Accessibility Help command for more information", this.widgetAriaLabelName);
 		}
-		return nls.localize('notebookTreeAriaLabel', "Notebook");
+		return this.widgetAriaLabelName;
 	}
 
 	private mergeEvents(last: number[] | undefined, e: ICellExecutionStateChangedEvent | IExecutionStateChangedEvent): number[] {
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookAccessibleView.ts b/src/vs/workbench/contrib/notebook/browser/notebookAccessibleView.ts
index daa9bae804d..78e9d118af7 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookAccessibleView.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookAccessibleView.ts
@@ -2,14 +2,14 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { AccessibleViewProviderId, AccessibleViewType } from 'vs/platform/accessibility/browser/accessibleView';
-import { IAccessibleViewImplentation } from 'vs/platform/accessibility/browser/accessibleViewRegistry';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { getNotebookEditorFromEditorPane } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NOTEBOOK_OUTPUT_FOCUSED } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { AccessibleViewProviderId, AccessibleViewType, AccessibleContentProvider } from '../../../../platform/accessibility/browser/accessibleView.js';
+import { IAccessibleViewImplentation } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
+import { getNotebookEditorFromEditorPane } from './notebookBrowser.js';
+import { NOTEBOOK_OUTPUT_FOCUSED } from '../common/notebookContextKeys.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
 
 export class NotebookAccessibleView implements IAccessibleViewImplentation {
 	readonly priority = 100;
@@ -18,13 +18,12 @@ export class NotebookAccessibleView implements IAccessibleViewImplentation {
 	readonly when = ContextKeyExpr.and(NOTEBOOK_OUTPUT_FOCUSED, ContextKeyExpr.equals('resourceExtname', '.ipynb'));
 	getProvider(accessor: ServicesAccessor) {
 		const editorService = accessor.get(IEditorService);
-		return showAccessibleOutput(editorService);
+		return getAccessibleOutputProvider(editorService);
 	}
-	dispose() { }
 }
 
 
-export function showAccessibleOutput(editorService: IEditorService) {
+export function getAccessibleOutputProvider(editorService: IEditorService) {
 	const activePane = editorService.activeEditorPane;
 	const notebookEditor = getNotebookEditorFromEditorPane(activePane);
 	const notebookViewModel = notebookEditor?.getViewModel();
@@ -73,15 +72,15 @@ export function showAccessibleOutput(editorService: IEditorService) {
 		return;
 	}
 
-	return {
-		id: AccessibleViewProviderId.Notebook,
-		verbositySettingKey: AccessibilityVerbositySettingId.Notebook,
-		provideContent(): string { return outputContent; },
-		onClose() {
+	return new AccessibleContentProvider(
+		AccessibleViewProviderId.Notebook,
+		{ type: AccessibleViewType.View },
+		() => { return outputContent; },
+		() => {
 			notebookEditor?.setFocus(selections[0]);
 			activePane?.focus();
 		},
-		options: { type: AccessibleViewType.View }
-	};
+		AccessibilityVerbositySettingId.Notebook,
+	);
 }
 
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts b/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts
index f474d202cb1..a14d5f6ca45 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts
@@ -3,34 +3,35 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CodeWindow } from 'vs/base/browser/window';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Event } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { IEditorContributionDescription } from 'vs/editor/browser/editorExtensions';
-import * as editorCommon from 'vs/editor/common/editorCommon';
-import { FontInfo } from 'vs/editor/common/config/fontInfo';
-import { IPosition } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { FindMatch, IModelDeltaDecoration, IReadonlyTextBuffer, ITextModel, TrackedRangeStickiness } from 'vs/editor/common/model';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { ITextEditorOptions, ITextResourceEditorInput } from 'vs/platform/editor/common/editor';
-import { IConstructorSignature } from 'vs/platform/instantiation/common/instantiation';
-import { IEditorPane, IEditorPaneWithSelection } from 'vs/workbench/common/editor';
-import { CellViewModelStateChangeEvent, NotebookCellStateChangedEvent, NotebookLayoutInfo } from 'vs/workbench/contrib/notebook/browser/notebookViewEvents';
-import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { CellKind, ICellOutput, INotebookCellStatusBarItem, INotebookRendererInfo, INotebookSearchOptions, IOrderedMimeType, NotebookCellInternalMetadata, NotebookCellMetadata, NOTEBOOK_EDITOR_ID } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { isCompositeNotebookEditorInput } from 'vs/workbench/contrib/notebook/common/notebookEditorInput';
-import { INotebookKernel } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
-import { NotebookOptions } from 'vs/workbench/contrib/notebook/browser/notebookOptions';
-import { cellRangesToIndexes, ICellRange, reduceCellRanges } from 'vs/workbench/contrib/notebook/common/notebookRange';
-import { IWebviewElement } from 'vs/workbench/contrib/webview/browser/webview';
-import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { CodeWindow } from '../../../../base/browser/window.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Event } from '../../../../base/common/event.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IEditorContributionDescription } from '../../../../editor/browser/editorExtensions.js';
+import * as editorCommon from '../../../../editor/common/editorCommon.js';
+import { FontInfo } from '../../../../editor/common/config/fontInfo.js';
+import { IPosition } from '../../../../editor/common/core/position.js';
+import { IRange, Range } from '../../../../editor/common/core/range.js';
+import { Selection } from '../../../../editor/common/core/selection.js';
+import { FindMatch, IModelDeltaDecoration, IReadonlyTextBuffer, ITextModel, TrackedRangeStickiness } from '../../../../editor/common/model.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { ITextEditorOptions, ITextResourceEditorInput } from '../../../../platform/editor/common/editor.js';
+import { IConstructorSignature } from '../../../../platform/instantiation/common/instantiation.js';
+import { IEditorPane, IEditorPaneWithSelection } from '../../../common/editor.js';
+import { CellViewModelStateChangeEvent, NotebookCellStateChangedEvent, NotebookLayoutInfo } from './notebookViewEvents.js';
+import { NotebookCellTextModel } from '../common/model/notebookCellTextModel.js';
+import { NotebookTextModel } from '../common/model/notebookTextModel.js';
+import { CellKind, ICellOutput, INotebookCellStatusBarItem, INotebookRendererInfo, INotebookFindOptions, IOrderedMimeType, NotebookCellInternalMetadata, NotebookCellMetadata, NOTEBOOK_EDITOR_ID } from '../common/notebookCommon.js';
+import { isCompositeNotebookEditorInput } from '../common/notebookEditorInput.js';
+import { INotebookKernel } from '../common/notebookKernelService.js';
+import { NotebookOptions } from './notebookOptions.js';
+import { cellRangesToIndexes, ICellRange, reduceCellRanges } from '../common/notebookRange.js';
+import { IWebviewElement } from '../../webview/browser/webview.js';
+import { IEditorCommentsOptions, IEditorOptions } from '../../../../editor/common/config/editorOptions.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { IObservable } from '../../../../base/common/observable.js';
 
 //#region Shared commands
 export const EXPAND_CELL_INPUT_COMMAND_ID = 'notebook.cell.expandCellInput';
@@ -108,6 +109,8 @@ export interface ICellOutputViewModel extends IDisposable {
 	pickedMimeType: IOrderedMimeType | undefined;
 	hasMultiMimeType(): boolean;
 	readonly onDidResetRenderer: Event<void>;
+	readonly visible: IObservable<boolean>;
+	setVisible(visible: boolean, force?: boolean): void;
 	resetRenderer(): void;
 	toRawJSON(): any;
 }
@@ -172,47 +175,47 @@ export enum CellLayoutState {
 	Measured
 }
 
-export interface CodeCellLayoutInfo {
+/** LayoutInfo of the parts that are shared between all cell types. */
+export interface CellLayoutInfo {
+	readonly layoutState: CellLayoutState;
 	readonly fontInfo: FontInfo | null;
 	readonly chatHeight: number;
-	readonly editorHeight: number;
 	readonly editorWidth: number;
-	readonly estimatedHasHorizontalScrolling: boolean;
+	readonly editorHeight: number;
 	readonly statusBarHeight: number;
+	readonly commentOffset: number;
 	readonly commentHeight: number;
+	readonly bottomToolbarOffset: number;
 	readonly totalHeight: number;
+}
+
+export interface CellLayoutChangeEvent {
+	readonly font?: FontInfo;
+	readonly outerWidth?: number;
+	readonly commentHeight?: boolean;
+}
+
+export interface CodeCellLayoutInfo extends CellLayoutInfo {
+	readonly estimatedHasHorizontalScrolling: boolean;
 	readonly outputContainerOffset: number;
 	readonly outputTotalHeight: number;
 	readonly outputShowMoreContainerHeight: number;
 	readonly outputShowMoreContainerOffset: number;
-	readonly bottomToolbarOffset: number;
-	readonly layoutState: CellLayoutState;
 	readonly codeIndicatorHeight: number;
 	readonly outputIndicatorHeight: number;
 }
 
-export interface CodeCellLayoutChangeEvent {
+export interface CodeCellLayoutChangeEvent extends CellLayoutChangeEvent {
 	readonly source?: string;
 	readonly chatHeight?: boolean;
 	readonly editorHeight?: boolean;
-	readonly commentHeight?: boolean;
 	readonly outputHeight?: boolean;
 	readonly outputShowMoreContainerHeight?: number;
 	readonly totalHeight?: boolean;
-	readonly outerWidth?: number;
-	readonly font?: FontInfo;
 }
 
-export interface MarkupCellLayoutInfo {
-	readonly fontInfo: FontInfo | null;
-	readonly chatHeight: number;
-	readonly editorWidth: number;
-	readonly editorHeight: number;
-	readonly statusBarHeight: number;
+export interface MarkupCellLayoutInfo extends CellLayoutInfo {
 	readonly previewHeight: number;
-	readonly bottomToolbarOffset: number;
-	readonly totalHeight: number;
-	readonly layoutState: CellLayoutState;
 	readonly foldHintHeight: number;
 }
 
@@ -220,9 +223,7 @@ export enum CellLayoutContext {
 	Fold
 }
 
-export interface MarkupCellLayoutChangeEvent {
-	readonly font?: FontInfo;
-	readonly outerWidth?: number;
+export interface MarkupCellLayoutChangeEvent extends CellLayoutChangeEvent {
 	readonly editorHeight?: number;
 	readonly previewHeight?: number;
 	totalHeight?: number;
@@ -238,7 +239,7 @@ export interface ICellViewModel extends IGenericCellViewModel {
 	readonly model: NotebookCellTextModel;
 	readonly id: string;
 	readonly textBuffer: IReadonlyTextBuffer;
-	readonly layoutInfo: { totalHeight: number; bottomToolbarOffset: number; editorWidth: number; editorHeight: number; statusBarHeight: number; chatHeight: number };
+	readonly layoutInfo: CellLayoutInfo;
 	readonly onDidChangeLayout: Event<ICommonCellViewModelLayoutChangeInfo>;
 	readonly onDidChangeCellStatusBarItems: Event<void>;
 	readonly onCellDecorationsChanged: Event<{ added: INotebookCellDecorationOptions[]; removed: INotebookCellDecorationOptions[] }>;
@@ -255,7 +256,9 @@ export interface ICellViewModel extends IGenericCellViewModel {
 	readonly mime: string;
 	cellKind: CellKind;
 	lineNumbers: 'on' | 'off' | 'inherit';
+	commentOptions: IEditorCommentsOptions;
 	chatHeight: number;
+	commentHeight: number;
 	focusMode: CellFocusMode;
 	focusedOutputId?: string | undefined;
 	outputIsHovered: boolean;
@@ -269,6 +272,7 @@ export interface ICellViewModel extends IGenericCellViewModel {
 	hasModel(): this is IEditableCellViewModel;
 	resolveTextModel(): Promise<ITextModel>;
 	getSelections(): Selection[];
+	setSelections(selections: Selection[]): void;
 	getSelectionsStartPosition(): IPosition[] | undefined;
 	getCellDecorations(): INotebookCellDecorationOptions[];
 	getCellStatusBarItems(): INotebookCellStatusBarItem[];
@@ -358,6 +362,7 @@ export interface INotebookEditorOptions extends ITextEditorOptions {
 	readonly isReadOnly?: boolean;
 	readonly viewState?: INotebookEditorViewState;
 	readonly indexedCellOptions?: { index: number; selection?: IRange };
+	readonly label?: string;
 }
 
 export type INotebookEditorContributionCtor = IConstructorSignature<INotebookEditorContribution, [INotebookEditor]>;
@@ -368,7 +373,7 @@ export interface INotebookEditorContributionDescription {
 }
 
 export interface INotebookEditorCreationOptions {
-	readonly isEmbedded?: boolean;
+	readonly isReplHistory?: boolean;
 	readonly isReadOnly?: boolean;
 	readonly contributions?: INotebookEditorContributionDescription[];
 	readonly cellEditorContributions?: IEditorContributionDescription[];
@@ -448,8 +453,9 @@ export interface INotebookViewCellsUpdateEvent {
 
 export interface INotebookViewModel {
 	notebookDocument: NotebookTextModel;
-	viewCells: ICellViewModel[];
+	readonly viewCells: ICellViewModel[];
 	layoutInfo: NotebookLayoutInfo | null;
+	viewType: string;
 	onDidChangeViewCells: Event<INotebookViewCellsUpdateEvent>;
 	onDidChangeSelection: Event<string>;
 	onDidFoldingStateChanged: Event<void>;
@@ -480,7 +486,9 @@ export interface INotebookEditor {
 	readonly onDidFocusWidget: Event<void>;
 	readonly onDidBlurWidget: Event<void>;
 	readonly onDidScroll: Event<void>;
+	readonly onDidChangeLayout: Event<void>;
 	readonly onDidChangeActiveCell: Event<void>;
+	readonly onDidChangeActiveEditor: Event<INotebookEditor>;
 	readonly onDidChangeActiveKernel: Event<void>;
 	readonly onMouseUp: Event<INotebookEditorMouseEvent>;
 	readonly onMouseDown: Event<INotebookEditorMouseEvent>;
@@ -496,9 +504,14 @@ export interface INotebookEditor {
 	readonly isDisposed: boolean;
 	readonly activeKernel: INotebookKernel | undefined;
 	readonly scrollTop: number;
+	readonly scrollBottom: number;
 	readonly scopedContextKeyService: IContextKeyService;
+	/**
+	 * Required for Composite Editor check. The interface should not be changed.
+	 */
 	readonly activeCodeEditor: ICodeEditor | undefined;
 	readonly codeEditors: [ICellViewModel, ICodeEditor][];
+	readonly activeCellAndCodeEditor: [ICellViewModel, ICodeEditor] | undefined;
 	//#endregion
 
 	getLength(): number;
@@ -517,6 +530,7 @@ export interface INotebookEditor {
 	getEditorViewState(): INotebookEditorViewState;
 	restoreListViewState(viewState: INotebookEditorViewState | undefined): void;
 
+	getBaseCellEditorOptions(language: string): IBaseCellEditorOptions;
 
 	/**
 	 * Focus the active cell in notebook cell list
@@ -737,7 +751,7 @@ export interface INotebookEditor {
 	getCellIndex(cell: ICellViewModel): number | undefined;
 	getNextVisibleCellIndex(index: number): number | undefined;
 	getPreviousVisibleCellIndex(index: number): number | undefined;
-	find(query: string, options: INotebookSearchOptions, token: CancellationToken, skipWarmup?: boolean, shouldGetSearchPreviewInfo?: boolean, ownerID?: string): Promise<CellFindMatchWithIndex[]>;
+	find(query: string, options: INotebookFindOptions, token: CancellationToken, skipWarmup?: boolean, shouldGetSearchPreviewInfo?: boolean, ownerID?: string): Promise<CellFindMatchWithIndex[]>;
 	findHighlightCurrent(matchIndex: number, ownerID?: string): Promise<number>;
 	findUnHighlightCurrent(matchIndex: number, ownerID?: string): Promise<void>;
 	findStop(ownerID?: string): void;
@@ -777,7 +791,6 @@ export interface INotebookEditorDelegate extends INotebookEditor {
 	readonly creationOptions: INotebookEditorCreationOptions;
 	readonly onDidChangeOptions: Event<void>;
 	readonly onDidChangeDecorations: Event<void>;
-	getBaseCellEditorOptions(language: string): IBaseCellEditorOptions;
 	createMarkupPreview(cell: ICellViewModel): Promise<void>;
 	unhideMarkupPreviews(cells: readonly ICellViewModel[]): Promise<void>;
 	hideMarkupPreviews(cells: readonly ICellViewModel[]): Promise<void>;
@@ -878,7 +891,9 @@ export function getNotebookEditorFromEditorPane(editorPane?: IEditorPane): INote
 
 	const input = editorPane.input;
 
-	if (input && isCompositeNotebookEditorInput(input)) {
+	const isCompositeNotebook = input && isCompositeNotebookEditorInput(input);
+
+	if (isCompositeNotebook) {
 		return (editorPane.getControl() as { notebookEditor: INotebookEditor | undefined } | undefined)?.notebookEditor;
 	}
 
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts
index 473e8a1168d..743b101a4f3 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts
@@ -3,52 +3,52 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { IActionViewItem } from 'vs/base/browser/ui/actionbar/actionbar';
-import { IAction, toAction } from 'vs/base/common/actions';
-import { timeout } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
-import { extname, isEqual } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { localize } from 'vs/nls';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IEditorOptions } from 'vs/platform/editor/common/editor';
-import { ByteSize, FileOperationError, FileOperationResult, IFileService, TooLargeFileOperationError } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { Selection } from 'vs/editor/common/core/selection';
-import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
-import { DEFAULT_EDITOR_ASSOCIATION, EditorPaneSelectionChangeReason, EditorPaneSelectionCompareResult, EditorResourceAccessor, IEditorMemento, IEditorOpenContext, IEditorPaneScrollPosition, IEditorPaneSelection, IEditorPaneSelectionChangeEvent, IEditorPaneWithScrolling, createEditorOpenError, createTooLargeFileError, isEditorOpenError } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { SELECT_KERNEL_ID } from 'vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { INotebookEditorOptions, INotebookEditorPane, INotebookEditorViewState } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { IBorrowValue, INotebookEditorService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorService';
-import { NotebookEditorWidget } from 'vs/workbench/contrib/notebook/browser/notebookEditorWidget';
-import { NotebooKernelActionViewItem } from 'vs/workbench/contrib/notebook/browser/viewParts/notebookKernelView';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { CellKind, NOTEBOOK_EDITOR_ID, NotebookWorkingCopyTypeIdentifier } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { NotebookEditorInput } from 'vs/workbench/contrib/notebook/common/notebookEditorInput';
-import { NotebookPerfMarks } from 'vs/workbench/contrib/notebook/common/notebookPerformance';
-import { GroupsOrder, IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IEditorProgressService } from 'vs/platform/progress/common/progress';
-import { InstallRecommendedExtensionAction } from 'vs/workbench/contrib/extensions/browser/extensionsActions';
-import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
-import { IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions';
-import { EnablementState } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { IWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackup';
-import { streamToBuffer } from 'vs/base/common/buffer';
-import { ILogService } from 'vs/platform/log/common/log';
-import { INotebookEditorWorkerService } from 'vs/workbench/contrib/notebook/common/services/notebookWorkerService';
-import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
-import { IActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { StopWatch } from 'vs/base/common/stopwatch';
+import * as DOM from '../../../../base/browser/dom.js';
+import { IActionViewItem } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { IAction, toAction } from '../../../../base/common/actions.js';
+import { timeout } from '../../../../base/common/async.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { extname, isEqual } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { localize } from '../../../../nls.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { ByteSize, FileOperationError, FileOperationResult, IFileService, TooLargeFileOperationError } from '../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { Selection } from '../../../../editor/common/core/selection.js';
+import { EditorPane } from '../../../browser/parts/editor/editorPane.js';
+import { DEFAULT_EDITOR_ASSOCIATION, EditorPaneSelectionChangeReason, EditorPaneSelectionCompareResult, EditorResourceAccessor, IEditorMemento, IEditorOpenContext, IEditorPaneScrollPosition, IEditorPaneSelection, IEditorPaneSelectionChangeEvent, IEditorPaneWithScrolling, createEditorOpenError, createTooLargeFileError, isEditorOpenError } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { SELECT_KERNEL_ID } from './controller/coreActions.js';
+import { INotebookEditorOptions, INotebookEditorPane, INotebookEditorViewState } from './notebookBrowser.js';
+import { IBorrowValue, INotebookEditorService } from './services/notebookEditorService.js';
+import { NotebookEditorWidget } from './notebookEditorWidget.js';
+import { NotebooKernelActionViewItem } from './viewParts/notebookKernelView.js';
+import { NotebookTextModel } from '../common/model/notebookTextModel.js';
+import { CellKind, NOTEBOOK_EDITOR_ID, NotebookWorkingCopyTypeIdentifier } from '../common/notebookCommon.js';
+import { NotebookEditorInput } from '../common/notebookEditorInput.js';
+import { NotebookPerfMarks } from '../common/notebookPerformance.js';
+import { GroupsOrder, IEditorGroup, IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IEditorProgressService } from '../../../../platform/progress/common/progress.js';
+import { InstallRecommendedExtensionAction } from '../../extensions/browser/extensionsActions.js';
+import { INotebookService } from '../common/notebookService.js';
+import { IExtensionsWorkbenchService } from '../../extensions/common/extensions.js';
+import { EnablementState } from '../../../services/extensionManagement/common/extensionManagement.js';
+import { IWorkingCopyBackupService } from '../../../services/workingCopy/common/workingCopyBackup.js';
+import { streamToBuffer } from '../../../../base/common/buffer.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { INotebookEditorWorkerService } from '../common/services/notebookWorkerService.js';
+import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
+import { IActionViewItemOptions } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { StopWatch } from '../../../../base/common/stopwatch.js';
 
 const NOTEBOOK_EDITOR_VIEW_STATE_PREFERENCE_KEY = 'NotebookEditorViewState';
 
@@ -215,7 +215,7 @@ export class NotebookEditor extends EditorPane implements INotebookEditorPane, I
 			// we need to hide it before getting a new widget
 			this._widget.value?.onWillHide();
 
-			this._widget = <IBorrowValue<NotebookEditorWidget>>this._instantiationService.invokeFunction(this._notebookWidgetService.retrieveWidget, this.group, input, undefined, this._pagePosition?.dimension, this.window);
+			this._widget = <IBorrowValue<NotebookEditorWidget>>this._instantiationService.invokeFunction(this._notebookWidgetService.retrieveWidget, this.group.id, input, undefined, this._pagePosition?.dimension, this.window);
 
 			if (this._rootElement && this._widget.value!.getDomNode()) {
 				this._rootElement.setAttribute('aria-flowto', this._widget.value!.getDomNode().id || '');
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditorExtensions.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditorExtensions.ts
index 25211785f0e..b3709ebf7f5 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookEditorExtensions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookEditorExtensions.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BrandedService } from 'vs/platform/instantiation/common/instantiation';
-import { INotebookEditor, INotebookEditorContribution, INotebookEditorContributionCtor, INotebookEditorContributionDescription } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { BrandedService } from '../../../../platform/instantiation/common/instantiation.js';
+import { INotebookEditor, INotebookEditorContribution, INotebookEditorContributionCtor, INotebookEditorContributionDescription } from './notebookBrowser.js';
 
 
 class EditorContributionRegistry {
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
index addc97632f0..1d4ee1948be 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
@@ -3,105 +3,105 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/notebook';
-import 'vs/css!./media/notebookCellChat';
-import 'vs/css!./media/notebookCellEditorHint';
-import 'vs/css!./media/notebookCellInsertToolbar';
-import 'vs/css!./media/notebookCellStatusBar';
-import 'vs/css!./media/notebookCellTitleToolbar';
-import 'vs/css!./media/notebookFocusIndicator';
-import 'vs/css!./media/notebookToolbar';
-import 'vs/css!./media/notebookDnd';
-import 'vs/css!./media/notebookFolding';
-import 'vs/css!./media/notebookCellOutput';
-import 'vs/css!./media/notebookEditorStickyScroll';
-import 'vs/css!./media/notebookKernelActionViewItem';
-import 'vs/css!./media/notebookOutline';
-import * as DOM from 'vs/base/browser/dom';
-import { IMouseWheelEvent, StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { IListContextMenuEvent } from 'vs/base/browser/ui/list/list';
-import { mainWindow } from 'vs/base/browser/window';
-import { DeferredPromise, SequencerByKey } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Color, RGBA } from 'vs/base/common/color';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { combinedDisposable, Disposable, DisposableStore, dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { setTimeout0 } from 'vs/base/common/platform';
-import { extname, isEqual } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { FontMeasurements } from 'vs/editor/browser/config/fontMeasurements';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { BareFontInfo, FontInfo } from 'vs/editor/common/config/fontInfo';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { SuggestController } from 'vs/editor/contrib/suggest/browser/suggestController';
-import * as nls from 'vs/nls';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
-import { registerZIndex, ZIndex } from 'vs/platform/layout/browser/zIndexRegistry';
-import { IEditorProgressService, IProgressRunner } from 'vs/platform/progress/common/progress';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { contrastBorder, errorForeground, focusBorder, foreground, listInactiveSelectionBackground, registerColor, scrollbarSliderActiveBackground, scrollbarSliderBackground, scrollbarSliderHoverBackground, transparent } from 'vs/platform/theme/common/colorRegistry';
-import { EDITOR_PANE_BACKGROUND, PANEL_BORDER, SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
-import { debugIconStartForeground } from 'vs/workbench/contrib/debug/browser/debugColors';
-import { CellEditState, CellFindMatchWithIndex, CellFocusMode, CellLayoutContext, CellRevealRangeType, CellRevealType, IActiveNotebookEditorDelegate, IBaseCellEditorOptions, ICellOutputViewModel, ICellViewModel, ICommonCellInfo, IDisplayOutputLayoutUpdateRequest, IFocusNotebookCellOptions, IInsetRenderOutput, IModelDecorationsChangeAccessor, INotebookDeltaDecoration, INotebookEditor, INotebookEditorContribution, INotebookEditorContributionDescription, INotebookEditorCreationOptions, INotebookEditorDelegate, INotebookEditorMouseEvent, INotebookEditorOptions, INotebookEditorViewState, INotebookViewCellsUpdateEvent, INotebookViewZoneChangeAccessor, INotebookWebviewMessage, RenderOutputType, ScrollToRevealBehavior } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NotebookEditorExtensionsRegistry } from 'vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
-import { INotebookEditorService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorService';
-import { notebookDebug } from 'vs/workbench/contrib/notebook/browser/notebookLogger';
-import { NotebookCellStateChangedEvent, NotebookLayoutChangedEvent, NotebookLayoutInfo } from 'vs/workbench/contrib/notebook/browser/notebookViewEvents';
-import { CellContextKeyManager } from 'vs/workbench/contrib/notebook/browser/view/cellParts/cellContextKeys';
-import { CellDragAndDropController } from 'vs/workbench/contrib/notebook/browser/view/cellParts/cellDnd';
-import { ListViewInfoAccessor, NotebookCellList, NOTEBOOK_WEBVIEW_BOUNDARY } from 'vs/workbench/contrib/notebook/browser/view/notebookCellList';
-import { INotebookCellList } from 'vs/workbench/contrib/notebook/browser/view/notebookRenderingCommon';
-import { BackLayerWebView } from 'vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView';
-import { CodeCellRenderer, MarkupCellRenderer, NotebookCellListDelegate } from 'vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer';
-import { IAckOutputHeight, IMarkupCellInitialization } from 'vs/workbench/contrib/notebook/browser/view/renderers/webviewMessages';
-import { CodeCellViewModel, outputDisplayLimit } from 'vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
-import { NotebookEventDispatcher } from 'vs/workbench/contrib/notebook/browser/viewModel/eventDispatcher';
-import { MarkupCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/markupCellViewModel';
-import { CellViewModel, NotebookViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl';
-import { ViewContext } from 'vs/workbench/contrib/notebook/browser/viewModel/viewContext';
-import { NotebookEditorWorkbenchToolbar } from 'vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar';
-import { NotebookEditorContextKeys } from 'vs/workbench/contrib/notebook/browser/viewParts/notebookEditorWidgetContextKeys';
-import { NotebookOverviewRuler } from 'vs/workbench/contrib/notebook/browser/viewParts/notebookOverviewRuler';
-import { ListTopCellToolbar } from 'vs/workbench/contrib/notebook/browser/viewParts/notebookTopCellToolbar';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { CellEditType, CellKind, INotebookSearchOptions, RENDERER_NOT_AVAILABLE, SelectionStateType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { NOTEBOOK_CURSOR_NAVIGATION_MODE, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_OUTPUT_INPUT_FOCUSED } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { INotebookExecutionService } from 'vs/workbench/contrib/notebook/common/notebookExecutionService';
-import { INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
-import { INotebookKernelService } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
-import { NotebookOptions, OutputInnerContainerTopPadding } from 'vs/workbench/contrib/notebook/browser/notebookOptions';
-import { cellRangesToIndexes, ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
-import { INotebookRendererMessagingService } from 'vs/workbench/contrib/notebook/common/notebookRendererMessagingService';
-import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
-import { IWebviewElement } from 'vs/workbench/contrib/webview/browser/webview';
-import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { NotebookPerfMarks } from 'vs/workbench/contrib/notebook/common/notebookPerformance';
-import { BaseCellEditorOptions } from 'vs/workbench/contrib/notebook/browser/viewModel/cellEditorOptions';
-import { FloatingEditorClickMenu } from 'vs/workbench/browser/codeeditor';
-import { IDimension } from 'vs/editor/common/core/dimension';
-import { CellFindMatchModel } from 'vs/workbench/contrib/notebook/browser/contrib/find/findModel';
-import { INotebookLoggingService } from 'vs/workbench/contrib/notebook/common/notebookLoggingService';
-import { Schemas } from 'vs/base/common/network';
-import { DropIntoEditorController } from 'vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorController';
-import { CopyPasteController } from 'vs/editor/contrib/dropOrPasteInto/browser/copyPasteController';
-import { NotebookStickyScroll } from 'vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll';
-import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { PixelRatio } from 'vs/base/browser/pixelRatio';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { PreventDefaultContextMenuItemsContextKeyName } from 'vs/workbench/contrib/webview/browser/webview.contribution';
-import { NotebookAccessibilityProvider } from 'vs/workbench/contrib/notebook/browser/notebookAccessibilityProvider';
+import './media/notebook.css';
+import './media/notebookCellChat.css';
+import './media/notebookCellEditorHint.css';
+import './media/notebookCellInsertToolbar.css';
+import './media/notebookCellStatusBar.css';
+import './media/notebookCellTitleToolbar.css';
+import './media/notebookFocusIndicator.css';
+import './media/notebookToolbar.css';
+import './media/notebookDnd.css';
+import './media/notebookFolding.css';
+import './media/notebookCellOutput.css';
+import './media/notebookEditorStickyScroll.css';
+import './media/notebookKernelActionViewItem.css';
+import './media/notebookOutline.css';
+import * as DOM from '../../../../base/browser/dom.js';
+import { IMouseWheelEvent, StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
+import { IListContextMenuEvent } from '../../../../base/browser/ui/list/list.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { DeferredPromise, SequencerByKey } from '../../../../base/common/async.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Color, RGBA } from '../../../../base/common/color.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { combinedDisposable, Disposable, DisposableStore, dispose, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { setTimeout0 } from '../../../../base/common/platform.js';
+import { extname, isEqual } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { FontMeasurements } from '../../../../editor/browser/config/fontMeasurements.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { IEditorOptions } from '../../../../editor/common/config/editorOptions.js';
+import { BareFontInfo, FontInfo } from '../../../../editor/common/config/fontInfo.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { Selection } from '../../../../editor/common/core/selection.js';
+import { SuggestController } from '../../../../editor/contrib/suggest/browser/suggestController.js';
+import * as nls from '../../../../nls.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { ILayoutService } from '../../../../platform/layout/browser/layoutService.js';
+import { registerZIndex, ZIndex } from '../../../../platform/layout/browser/zIndexRegistry.js';
+import { IEditorProgressService, IProgressRunner } from '../../../../platform/progress/common/progress.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { contrastBorder, errorForeground, focusBorder, foreground, listInactiveSelectionBackground, registerColor, scrollbarSliderActiveBackground, scrollbarSliderBackground, scrollbarSliderHoverBackground, transparent } from '../../../../platform/theme/common/colorRegistry.js';
+import { EDITOR_PANE_BACKGROUND, PANEL_BORDER, SIDE_BAR_BACKGROUND } from '../../../common/theme.js';
+import { debugIconStartForeground } from '../../debug/browser/debugColors.js';
+import { CellEditState, CellFindMatchWithIndex, CellFocusMode, CellLayoutContext, CellRevealRangeType, CellRevealType, IActiveNotebookEditorDelegate, IBaseCellEditorOptions, ICellOutputViewModel, ICellViewModel, ICommonCellInfo, IDisplayOutputLayoutUpdateRequest, IFocusNotebookCellOptions, IInsetRenderOutput, IModelDecorationsChangeAccessor, INotebookDeltaDecoration, INotebookEditor, INotebookEditorContribution, INotebookEditorContributionDescription, INotebookEditorCreationOptions, INotebookEditorDelegate, INotebookEditorMouseEvent, INotebookEditorOptions, INotebookEditorViewState, INotebookViewCellsUpdateEvent, INotebookViewZoneChangeAccessor, INotebookWebviewMessage, RenderOutputType, ScrollToRevealBehavior } from './notebookBrowser.js';
+import { NotebookEditorExtensionsRegistry } from './notebookEditorExtensions.js';
+import { INotebookEditorService } from './services/notebookEditorService.js';
+import { notebookDebug } from './notebookLogger.js';
+import { NotebookCellStateChangedEvent, NotebookLayoutChangedEvent, NotebookLayoutInfo } from './notebookViewEvents.js';
+import { CellContextKeyManager } from './view/cellParts/cellContextKeys.js';
+import { CellDragAndDropController } from './view/cellParts/cellDnd.js';
+import { ListViewInfoAccessor, NotebookCellList, NOTEBOOK_WEBVIEW_BOUNDARY } from './view/notebookCellList.js';
+import { INotebookCellList } from './view/notebookRenderingCommon.js';
+import { BackLayerWebView } from './view/renderers/backLayerWebView.js';
+import { CodeCellRenderer, MarkupCellRenderer, NotebookCellListDelegate } from './view/renderers/cellRenderer.js';
+import { IAckOutputHeight, IMarkupCellInitialization } from './view/renderers/webviewMessages.js';
+import { CodeCellViewModel, outputDisplayLimit } from './viewModel/codeCellViewModel.js';
+import { NotebookEventDispatcher } from './viewModel/eventDispatcher.js';
+import { MarkupCellViewModel } from './viewModel/markupCellViewModel.js';
+import { CellViewModel, NotebookViewModel } from './viewModel/notebookViewModelImpl.js';
+import { ViewContext } from './viewModel/viewContext.js';
+import { NotebookEditorWorkbenchToolbar } from './viewParts/notebookEditorToolbar.js';
+import { NotebookEditorContextKeys } from './viewParts/notebookEditorWidgetContextKeys.js';
+import { NotebookOverviewRuler } from './viewParts/notebookOverviewRuler.js';
+import { ListTopCellToolbar } from './viewParts/notebookTopCellToolbar.js';
+import { NotebookTextModel } from '../common/model/notebookTextModel.js';
+import { CellEditType, CellKind, INotebookFindOptions, NotebookFindScopeType, RENDERER_NOT_AVAILABLE, SelectionStateType } from '../common/notebookCommon.js';
+import { NOTEBOOK_CURSOR_NAVIGATION_MODE, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_OUTPUT_INPUT_FOCUSED } from '../common/notebookContextKeys.js';
+import { INotebookExecutionService } from '../common/notebookExecutionService.js';
+import { INotebookExecutionStateService } from '../common/notebookExecutionStateService.js';
+import { INotebookKernelService } from '../common/notebookKernelService.js';
+import { NotebookOptions, OutputInnerContainerTopPadding } from './notebookOptions.js';
+import { cellRangesToIndexes, ICellRange } from '../common/notebookRange.js';
+import { INotebookRendererMessagingService } from '../common/notebookRendererMessagingService.js';
+import { INotebookService } from '../common/notebookService.js';
+import { IWebviewElement } from '../../webview/browser/webview.js';
+import { EditorExtensionsRegistry } from '../../../../editor/browser/editorExtensions.js';
+import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { NotebookPerfMarks } from '../common/notebookPerformance.js';
+import { BaseCellEditorOptions } from './viewModel/cellEditorOptions.js';
+import { FloatingEditorClickMenu } from '../../../browser/codeeditor.js';
+import { IDimension } from '../../../../editor/common/core/dimension.js';
+import { CellFindMatchModel } from './contrib/find/findModel.js';
+import { INotebookLoggingService } from '../common/notebookLoggingService.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { DropIntoEditorController } from '../../../../editor/contrib/dropOrPasteInto/browser/dropIntoEditorController.js';
+import { CopyPasteController } from '../../../../editor/contrib/dropOrPasteInto/browser/copyPasteController.js';
+import { NotebookStickyScroll } from './viewParts/notebookEditorStickyScroll.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { PixelRatio } from '../../../../base/browser/pixelRatio.js';
+import { PreventDefaultContextMenuItemsContextKeyName } from '../../webview/browser/webview.contribution.js';
+import { NotebookAccessibilityProvider } from './notebookAccessibilityProvider.js';
+import { NotebookHorizontalTracker } from './viewParts/notebookHorizontalTracker.js';
+import { NotebookCellEditorPool } from './view/notebookCellEditorPool.js';
 
 const $ = DOM.$;
 
@@ -151,6 +151,8 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 	readonly onDidChangeDecorations: Event<void> = this._onDidChangeDecorations.event;
 	private readonly _onDidScroll = this._register(new Emitter<void>());
 	readonly onDidScroll: Event<void> = this._onDidScroll.event;
+	private readonly _onDidChangeLayout = this._register(new Emitter<void>());
+	readonly onDidChangeLayout: Event<void> = this._onDidChangeLayout.event;
 	private readonly _onDidChangeActiveCell = this._register(new Emitter<void>());
 	readonly onDidChangeActiveCell: Event<void> = this._onDidChangeActiveCell.event;
 	private readonly _onDidChangeFocus = this._register(new Emitter<void>());
@@ -200,6 +202,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 	private _dndController: CellDragAndDropController | null = null;
 	private _listTopCellToolbar: ListTopCellToolbar | null = null;
 	private _renderedEditors: Map<ICellViewModel, ICodeEditor> = new Map();
+	private _editorPool!: NotebookCellEditorPool;
 	private _viewContext: ViewContext;
 	private _notebookViewModel: NotebookViewModel | undefined;
 	private readonly _localStore: DisposableStore = this._register(new DisposableStore());
@@ -260,6 +263,19 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 		return this._renderedEditors.get(focused);
 	}
 
+	get activeCellAndCodeEditor(): [ICellViewModel, ICodeEditor] | undefined {
+		if (this._isDisposed) {
+			return;
+		}
+
+		const [focused] = this._list.getFocusedElements();
+		const editor = this._renderedEditors.get(focused);
+		if (!editor) {
+			return;
+		}
+		return [focused, editor];
+	}
+
 	get codeEditors(): [ICellViewModel, ICodeEditor][] {
 		return [...this._renderedEditors];
 	}
@@ -270,7 +286,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 
 	private _baseCellEditorOptions = new Map<string, IBaseCellEditorOptions>();
 
-	readonly isEmbedded: boolean;
+	readonly isReplHistory: boolean;
 	private _readOnly: boolean;
 
 	public readonly scopedContextKeyService: IContextKeyService;
@@ -302,29 +318,33 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 		@IEditorProgressService private editorProgressService: IEditorProgressService,
 		@INotebookLoggingService private readonly logService: INotebookLoggingService,
 		@IKeybindingService private readonly keybindingService: IKeybindingService,
-		@ICodeEditorService codeEditorService: ICodeEditorService
 	) {
 		super();
 
 		this._dimension = dimension;
 
-		this.isEmbedded = creationOptions.isEmbedded ?? false;
+		this.isReplHistory = creationOptions.isReplHistory ?? false;
 		this._readOnly = creationOptions.isReadOnly ?? false;
 
-		this._notebookOptions = creationOptions.options ?? new NotebookOptions(this.creationOptions?.codeWindow ?? mainWindow, this.configurationService, notebookExecutionStateService, codeEditorService, this._readOnly);
+		this._overlayContainer = document.createElement('div');
+		this.scopedContextKeyService = this._register(contextKeyService.createScoped(this._overlayContainer));
+		this.instantiationService = this._register(instantiationService.createChild(new ServiceCollection([IContextKeyService, this.scopedContextKeyService])));
+
+		this._notebookOptions = creationOptions.options ??
+			this.instantiationService.createInstance(NotebookOptions, this.creationOptions?.codeWindow ?? mainWindow, this._readOnly, undefined);
 		this._register(this._notebookOptions);
 		const eventDispatcher = this._register(new NotebookEventDispatcher());
 		this._viewContext = new ViewContext(
 			this._notebookOptions,
 			eventDispatcher,
 			language => this.getBaseCellEditorOptions(language));
+		this._register(this._viewContext.eventDispatcher.onDidChangeLayout(() => {
+			this._onDidChangeLayout.fire();
+		}));
 		this._register(this._viewContext.eventDispatcher.onDidChangeCellState(e => {
 			this._onDidChangeCellState.fire(e);
 		}));
 
-		this._overlayContainer = document.createElement('div');
-		this.scopedContextKeyService = this._register(contextKeyService.createScoped(this._overlayContainer));
-		this.instantiationService = this._register(instantiationService.createChild(new ServiceCollection([IContextKeyService, this.scopedContextKeyService])));
 
 		this._register(_notebookService.onDidChangeOutputRenderers(() => {
 			this._updateOutputRenderers();
@@ -608,6 +628,8 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 		this._list.scrollableElement.appendChild(this._notebookOverviewRulerContainer);
 		this._registerNotebookOverviewRuler();
 
+		this._register(this.instantiationService.createInstance(NotebookHorizontalTracker, this, this._list.scrollableElement));
+
 		this._overflowContainer = document.createElement('div');
 		this._overflowContainer.classList.add('notebook-overflow-widget-container', 'monaco-editor');
 		DOM.append(parent, this._overflowContainer);
@@ -894,11 +916,11 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 
 	private _createCellList(): void {
 		this._body.classList.add('cell-list-container');
-
 		this._dndController = this._register(new CellDragAndDropController(this, this._body));
 		const getScopedContextKeyService = (container: HTMLElement) => this._list.contextKeyService.createScoped(container);
+		this._editorPool = this._register(this.instantiationService.createInstance(NotebookCellEditorPool, this, getScopedContextKeyService));
 		const renderers = [
-			this.instantiationService.createInstance(CodeCellRenderer, this, this._renderedEditors, this._dndController, getScopedContextKeyService),
+			this.instantiationService.createInstance(CodeCellRenderer, this, this._renderedEditors, this._editorPool, this._dndController, getScopedContextKeyService),
 			this.instantiationService.createInstance(MarkupCellRenderer, this, this._dndController, this._renderedEditors, getScopedContextKeyService),
 		];
 
@@ -909,7 +931,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 		this._listDelegate = this.instantiationService.createInstance(NotebookCellListDelegate, DOM.getWindow(this.getDomNode()));
 		this._register(this._listDelegate);
 
-		const accessibilityProvider = new NotebookAccessibilityProvider(this.notebookExecutionStateService, () => this.viewModel, this.keybindingService, this.configurationService);
+		const accessibilityProvider = new NotebookAccessibilityProvider(this.notebookExecutionStateService, () => this.viewModel, this.keybindingService, this.configurationService, this.isReplHistory);
 		this._register(accessibilityProvider);
 
 		this._list = this.instantiationService.createInstance(
@@ -1035,7 +1057,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 		this._registerNotebookStickyScroll();
 
 		this._register(this.configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration(AccessibilityVerbositySettingId.Notebook)) {
+			if (e.affectsConfiguration(accessibilityProvider.verbositySettingId)) {
 				this._list.ariaLabel = accessibilityProvider?.getWidgetAriaLabel();
 			}
 		}));
@@ -1044,8 +1066,16 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 	private showListContextMenu(e: IListContextMenuEvent<CellViewModel>) {
 		this.contextMenuService.showContextMenu({
 			menuId: MenuId.NotebookCellTitle,
+			menuActionOptions: {
+				shouldForwardArgs: true
+			},
 			contextKeyService: this.scopedContextKeyService,
-			getAnchor: () => e.anchor
+			getAnchor: () => e.anchor,
+			getActionsContext: () => {
+				return {
+					from: 'cellContainer'
+				};
+			}
 		});
 	}
 
@@ -1063,27 +1093,22 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 	}
 
 	private _registerNotebookStickyScroll() {
-		this._notebookStickyScroll = this._register(this.instantiationService.createInstance(NotebookStickyScroll, this._notebookStickyScrollContainer, this, this._list));
+		this._notebookStickyScroll = this._register(this.instantiationService.createInstance(NotebookStickyScroll, this._notebookStickyScrollContainer, this, this._list, (sizeDelta) => {
+			if (this.isDisposed) {
+				return;
+			}
 
-		const localDisposableStore = this._register(new DisposableStore());
-
-		this._register(this._notebookStickyScroll.onDidChangeNotebookStickyScroll((sizeDelta) => {
-			const d = localDisposableStore.add(DOM.scheduleAtNextAnimationFrame(DOM.getWindow(this.getDomNode()), () => {
-				if (this.isDisposed) {
-					return;
+			if (this._dimension && this._isVisible) {
+				if (sizeDelta > 0) { // delta > 0 ==> sticky is growing, cell list shrinking
+					this.layout(this._dimension);
+					this.setScrollTop(this.scrollTop + sizeDelta);
+				} else if (sizeDelta < 0) { // delta < 0 ==> sticky is shrinking, cell list growing
+					this.setScrollTop(this.scrollTop + sizeDelta);
+					this.layout(this._dimension);
 				}
+			}
 
-				if (this._dimension && this._isVisible) {
-					if (sizeDelta > 0) { // delta > 0 ==> sticky is growing, cell list shrinking
-						this.layout(this._dimension);
-						this.setScrollTop(this.scrollTop + sizeDelta);
-					} else if (sizeDelta < 0) { // delta < 0 ==> sticky is shrinking, cell list growing
-						this.setScrollTop(this.scrollTop + sizeDelta);
-						this.layout(this._dimension);
-					}
-				}
-				localDisposableStore.delete(d);
-			}));
+			this._onDidScroll.fire();
 		}));
 	}
 
@@ -1122,11 +1147,11 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 		this.scopedContextKeyService.updateParent(parentContextKeyService);
 	}
 
-	async setModel(textModel: NotebookTextModel, viewState: INotebookEditorViewState | undefined, perf?: NotebookPerfMarks): Promise<void> {
+	async setModel(textModel: NotebookTextModel, viewState: INotebookEditorViewState | undefined, perf?: NotebookPerfMarks, viewType?: string): Promise<void> {
 		if (this.viewModel === undefined || !this.viewModel.equal(textModel)) {
 			const oldBottomToolbarDimensions = this._notebookOptions.computeBottomToolbarDimensions(this.viewModel?.viewType);
 			this._detachModel();
-			await this._attachModel(textModel, viewState, perf);
+			await this._attachModel(textModel, viewType ?? textModel.viewType, viewState, perf);
 			const newBottomToolbarDimensions = this._notebookOptions.computeBottomToolbarDimensions(this.viewModel?.viewType);
 
 			if (oldBottomToolbarDimensions.bottomToolbarGap !== newBottomToolbarDimensions.bottomToolbarGap
@@ -1432,10 +1457,10 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 		this._list.attachWebview(this._webview.element);
 	}
 
-	private async _attachModel(textModel: NotebookTextModel, viewState: INotebookEditorViewState | undefined, perf?: NotebookPerfMarks) {
+	private async _attachModel(textModel: NotebookTextModel, viewType: string, viewState: INotebookEditorViewState | undefined, perf?: NotebookPerfMarks) {
 		this._ensureWebview(this.getId(), textModel.viewType, textModel.uri);
 
-		this.viewModel = this.instantiationService.createInstance(NotebookViewModel, textModel.viewType, textModel, this._viewContext, this.getLayoutInfo(), { isReadOnly: this._readOnly });
+		this.viewModel = this.instantiationService.createInstance(NotebookViewModel, viewType, textModel, this._viewContext, this.getLayoutInfo(), { isReadOnly: this._readOnly });
 		this._viewContext.eventDispatcher.emit([new NotebookLayoutChangedEvent({ width: true, fontInfo: true }, this.getLayoutInfo())]);
 		this.notebookOptions.updateOptions(this._readOnly);
 
@@ -1807,7 +1832,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 	}
 
 	private _allowScrollBeyondLastLine() {
-		return this._scrollBeyondLastLine && !this.isEmbedded;
+		return this._scrollBeyondLastLine && !this.isReplHistory;
 	}
 
 	private getBodyHeight(dimensionHeight: number) {
@@ -2098,6 +2123,10 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 		return this._list.scrollTop;
 	}
 
+	get scrollBottom() {
+		return this._list.scrollTop + this._list.getRenderHeight();
+	}
+
 	getAbsoluteTopOfElement(cell: ICellViewModel) {
 		return this._list.getCellViewScrollTop(cell);
 	}
@@ -2565,7 +2594,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 		return Promise.all(requests);
 	}
 
-	async find(query: string, options: INotebookSearchOptions, token: CancellationToken, skipWarmup: boolean = false, shouldGetSearchPreviewInfo = false, ownerID?: string): Promise<CellFindMatchWithIndex[]> {
+	async find(query: string, options: INotebookFindOptions, token: CancellationToken, skipWarmup: boolean = false, shouldGetSearchPreviewInfo = false, ownerID?: string): Promise<CellFindMatchWithIndex[]> {
 		if (!this._notebookViewModel) {
 			return [];
 		}
@@ -2576,7 +2605,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 
 		const findMatches = this._notebookViewModel.find(query, options).filter(match => match.length > 0);
 
-		if (!options.includeMarkupPreview && !options.includeOutput) {
+		if ((!options.includeMarkupPreview && !options.includeOutput) || options.findScope?.findScopeType === NotebookFindScopeType.Text) {
 			this._webview?.findStop(ownerID);
 			return findMatches;
 		}
@@ -2600,11 +2629,13 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 				return [];
 			}
 
-			const selectedRanges = options.selectedRanges?.map(range => this._notebookViewModel?.validateRange(range)).filter(range => !!range);
-			const selectedIndexes = cellRangesToIndexes(selectedRanges ?? []);
-			const findIds: string[] = selectedIndexes.map<string>(index => this._notebookViewModel?.viewCells[index].id ?? '');
+			let findIds: string[] = [];
+			if (options.findScope && options.findScope.findScopeType === NotebookFindScopeType.Cells && options.findScope.selectedCellRanges) {
+				const selectedIndexes = cellRangesToIndexes(options.findScope.selectedCellRanges);
+				findIds = selectedIndexes.map<string>(index => this._notebookViewModel?.viewCells[index].id ?? '');
+			}
 
-			const webviewMatches = await this._webview.find(query, { caseSensitive: options.caseSensitive, wholeWord: options.wholeWord, includeMarkup: !!options.includeMarkupPreview, includeOutput: !!options.includeOutput, shouldGetSearchPreviewInfo, ownerID, findIds: options.searchInRanges ? findIds : [] });
+			const webviewMatches = await this._webview.find(query, { caseSensitive: options.caseSensitive, wholeWord: options.wholeWord, includeMarkup: !!options.includeMarkupPreview, includeOutput: !!options.includeOutput, shouldGetSearchPreviewInfo, ownerID, findIds: findIds });
 
 			if (token.isCancellationRequested) {
 				return [];
@@ -3223,54 +3254,19 @@ export const notebookCellBorder = registerColor('notebook.cellBorderColor', {
 	hcLight: PANEL_BORDER
 }, nls.localize('notebook.cellBorderColor', "The border color for notebook cells."));
 
-export const focusedEditorBorderColor = registerColor('notebook.focusedEditorBorder', {
-	light: focusBorder,
-	dark: focusBorder,
-	hcDark: focusBorder,
-	hcLight: focusBorder
-}, nls.localize('notebook.focusedEditorBorder', "The color of the notebook cell editor border."));
+export const focusedEditorBorderColor = registerColor('notebook.focusedEditorBorder', focusBorder, nls.localize('notebook.focusedEditorBorder', "The color of the notebook cell editor border."));
 
-export const cellStatusIconSuccess = registerColor('notebookStatusSuccessIcon.foreground', {
-	light: debugIconStartForeground,
-	dark: debugIconStartForeground,
-	hcDark: debugIconStartForeground,
-	hcLight: debugIconStartForeground
-}, nls.localize('notebookStatusSuccessIcon.foreground', "The error icon color of notebook cells in the cell status bar."));
+export const cellStatusIconSuccess = registerColor('notebookStatusSuccessIcon.foreground', debugIconStartForeground, nls.localize('notebookStatusSuccessIcon.foreground', "The error icon color of notebook cells in the cell status bar."));
 
-export const runningCellRulerDecorationColor = registerColor('notebookEditorOverviewRuler.runningCellForeground', {
-	light: debugIconStartForeground,
-	dark: debugIconStartForeground,
-	hcDark: debugIconStartForeground,
-	hcLight: debugIconStartForeground
-}, nls.localize('notebookEditorOverviewRuler.runningCellForeground', "The color of the running cell decoration in the notebook editor overview ruler."));
+export const runningCellRulerDecorationColor = registerColor('notebookEditorOverviewRuler.runningCellForeground', debugIconStartForeground, nls.localize('notebookEditorOverviewRuler.runningCellForeground', "The color of the running cell decoration in the notebook editor overview ruler."));
 
-export const cellStatusIconError = registerColor('notebookStatusErrorIcon.foreground', {
-	light: errorForeground,
-	dark: errorForeground,
-	hcDark: errorForeground,
-	hcLight: errorForeground
-}, nls.localize('notebookStatusErrorIcon.foreground', "The error icon color of notebook cells in the cell status bar."));
+export const cellStatusIconError = registerColor('notebookStatusErrorIcon.foreground', errorForeground, nls.localize('notebookStatusErrorIcon.foreground', "The error icon color of notebook cells in the cell status bar."));
 
-export const cellStatusIconRunning = registerColor('notebookStatusRunningIcon.foreground', {
-	light: foreground,
-	dark: foreground,
-	hcDark: foreground,
-	hcLight: foreground
-}, nls.localize('notebookStatusRunningIcon.foreground', "The running icon color of notebook cells in the cell status bar."));
+export const cellStatusIconRunning = registerColor('notebookStatusRunningIcon.foreground', foreground, nls.localize('notebookStatusRunningIcon.foreground', "The running icon color of notebook cells in the cell status bar."));
 
-export const notebookOutputContainerBorderColor = registerColor('notebook.outputContainerBorderColor', {
-	dark: null,
-	light: null,
-	hcDark: null,
-	hcLight: null
-}, nls.localize('notebook.outputContainerBorderColor', "The border color of the notebook output container."));
+export const notebookOutputContainerBorderColor = registerColor('notebook.outputContainerBorderColor', null, nls.localize('notebook.outputContainerBorderColor', "The border color of the notebook output container."));
 
-export const notebookOutputContainerColor = registerColor('notebook.outputContainerBackgroundColor', {
-	dark: null,
-	light: null,
-	hcDark: null,
-	hcLight: null
-}, nls.localize('notebook.outputContainerBackgroundColor', "The color of the notebook output container background."));
+export const notebookOutputContainerColor = registerColor('notebook.outputContainerBackgroundColor', null, nls.localize('notebook.outputContainerBackgroundColor', "The color of the notebook output container background."));
 
 // TODO@rebornix currently also used for toolbar border, if we keep all of this, pick a generic name
 export const CELL_TOOLBAR_SEPERATOR = registerColor('notebook.cellToolbarSeparator', {
@@ -3280,12 +3276,7 @@ export const CELL_TOOLBAR_SEPERATOR = registerColor('notebook.cellToolbarSeparat
 	hcLight: contrastBorder
 }, nls.localize('notebook.cellToolbarSeparator', "The color of the separator in the cell bottom toolbar"));
 
-export const focusedCellBackground = registerColor('notebook.focusedCellBackground', {
-	dark: null,
-	light: null,
-	hcDark: null,
-	hcLight: null
-}, nls.localize('focusedCellBackground', "The background color of a cell when the cell is focused."));
+export const focusedCellBackground = registerColor('notebook.focusedCellBackground', null, nls.localize('focusedCellBackground', "The background color of a cell when the cell is focused."));
 
 export const selectedCellBackground = registerColor('notebook.selectedCellBackground', {
 	dark: listInactiveSelectionBackground,
@@ -3316,19 +3307,9 @@ export const inactiveSelectedCellBorder = registerColor('notebook.inactiveSelect
 	hcLight: focusBorder
 }, nls.localize('notebook.inactiveSelectedCellBorder', "The color of the cell's borders when multiple cells are selected."));
 
-export const focusedCellBorder = registerColor('notebook.focusedCellBorder', {
-	dark: focusBorder,
-	light: focusBorder,
-	hcDark: focusBorder,
-	hcLight: focusBorder
-}, nls.localize('notebook.focusedCellBorder', "The color of the cell's focus indicator borders when the cell is focused."));
+export const focusedCellBorder = registerColor('notebook.focusedCellBorder', focusBorder, nls.localize('notebook.focusedCellBorder', "The color of the cell's focus indicator borders when the cell is focused."));
 
-export const inactiveFocusedCellBorder = registerColor('notebook.inactiveFocusedCellBorder', {
-	dark: notebookCellBorder,
-	light: notebookCellBorder,
-	hcDark: notebookCellBorder,
-	hcLight: notebookCellBorder
-}, nls.localize('notebook.inactiveFocusedCellBorder', "The color of the cell's top and bottom border when a cell is focused while the primary focus is outside of the editor."));
+export const inactiveFocusedCellBorder = registerColor('notebook.inactiveFocusedCellBorder', notebookCellBorder, nls.localize('notebook.inactiveFocusedCellBorder', "The color of the cell's top and bottom border when a cell is focused while the primary focus is outside of the editor."));
 
 export const cellStatusBarItemHover = registerColor('notebook.cellStatusBarItemHoverBackground', {
 	light: new Color(new RGBA(0, 0, 0, 0.08)),
@@ -3337,33 +3318,13 @@ export const cellStatusBarItemHover = registerColor('notebook.cellStatusBarItemH
 	hcLight: new Color(new RGBA(0, 0, 0, 0.08)),
 }, nls.localize('notebook.cellStatusBarItemHoverBackground', "The background color of notebook cell status bar items."));
 
-export const cellInsertionIndicator = registerColor('notebook.cellInsertionIndicator', {
-	light: focusBorder,
-	dark: focusBorder,
-	hcDark: focusBorder,
-	hcLight: focusBorder
-}, nls.localize('notebook.cellInsertionIndicator', "The color of the notebook cell insertion indicator."));
+export const cellInsertionIndicator = registerColor('notebook.cellInsertionIndicator', focusBorder, nls.localize('notebook.cellInsertionIndicator', "The color of the notebook cell insertion indicator."));
 
-export const listScrollbarSliderBackground = registerColor('notebookScrollbarSlider.background', {
-	dark: scrollbarSliderBackground,
-	light: scrollbarSliderBackground,
-	hcDark: scrollbarSliderBackground,
-	hcLight: scrollbarSliderBackground
-}, nls.localize('notebookScrollbarSliderBackground', "Notebook scrollbar slider background color."));
+export const listScrollbarSliderBackground = registerColor('notebookScrollbarSlider.background', scrollbarSliderBackground, nls.localize('notebookScrollbarSliderBackground', "Notebook scrollbar slider background color."));
 
-export const listScrollbarSliderHoverBackground = registerColor('notebookScrollbarSlider.hoverBackground', {
-	dark: scrollbarSliderHoverBackground,
-	light: scrollbarSliderHoverBackground,
-	hcDark: scrollbarSliderHoverBackground,
-	hcLight: scrollbarSliderHoverBackground
-}, nls.localize('notebookScrollbarSliderHoverBackground', "Notebook scrollbar slider background color when hovering."));
+export const listScrollbarSliderHoverBackground = registerColor('notebookScrollbarSlider.hoverBackground', scrollbarSliderHoverBackground, nls.localize('notebookScrollbarSliderHoverBackground', "Notebook scrollbar slider background color when hovering."));
 
-export const listScrollbarSliderActiveBackground = registerColor('notebookScrollbarSlider.activeBackground', {
-	dark: scrollbarSliderActiveBackground,
-	light: scrollbarSliderActiveBackground,
-	hcDark: scrollbarSliderActiveBackground,
-	hcLight: scrollbarSliderActiveBackground
-}, nls.localize('notebookScrollbarSliderActiveBackground', "Notebook scrollbar slider background color when clicked on."));
+export const listScrollbarSliderActiveBackground = registerColor('notebookScrollbarSlider.activeBackground', scrollbarSliderActiveBackground, nls.localize('notebookScrollbarSliderActiveBackground', "Notebook scrollbar slider background color when clicked on."));
 
 export const cellSymbolHighlight = registerColor('notebook.symbolHighlightBackground', {
 	dark: Color.fromHex('#ffffff0b'),
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookExtensionPoint.ts b/src/vs/workbench/contrib/notebook/browser/notebookExtensionPoint.ts
index 267d93ba91c..352dea887c8 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookExtensionPoint.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookExtensionPoint.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import * as nls from 'vs/nls';
-import { ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { NotebookEditorPriority, ContributedNotebookRendererEntrypoint, RendererMessagingSpec } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IExtensionManifest } from 'vs/platform/extensions/common/extensions';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { IExtensionFeatureTableRenderer, IRenderedData, ITableData, IRowData, IExtensionFeaturesRegistry, Extensions } from 'vs/workbench/services/extensionManagement/common/extensionFeatures';
-import { Registry } from 'vs/platform/registry/common/platform';
+import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
+import * as nls from '../../../../nls.js';
+import { ExtensionsRegistry } from '../../../services/extensions/common/extensionsRegistry.js';
+import { NotebookEditorPriority, ContributedNotebookRendererEntrypoint, RendererMessagingSpec } from '../common/notebookCommon.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IExtensionManifest } from '../../../../platform/extensions/common/extensions.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { IExtensionFeatureTableRenderer, IRenderedData, ITableData, IRowData, IExtensionFeaturesRegistry, Extensions } from '../../../services/extensionManagement/common/extensionFeatures.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
 
 const NotebookEditorContribution = Object.freeze({
 	type: 'type',
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookIcons.ts b/src/vs/workbench/contrib/notebook/browser/notebookIcons.ts
index 20ffe3867e8..312d0653f4b 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookIcons.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookIcons.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from 'vs/base/common/codicons';
-import { localize } from 'vs/nls';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { localize } from '../../../../nls.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 
 export const selectKernelIcon = registerIcon('notebook-kernel-select', Codicon.serverEnvironment, localize('selectKernelIcon', 'Configure icon to select a kernel in notebook editors.'));
 export const executeIcon = registerIcon('notebook-execute', Codicon.play, localize('executeIcon', 'Icon to execute in notebook editors.'));
@@ -29,6 +29,7 @@ export const collapsedIcon = registerIcon('notebook-collapsed', Codicon.chevronR
 export const expandedIcon = registerIcon('notebook-expanded', Codicon.chevronDown, localize('expandedIcon', 'Icon to annotate an expanded section in notebook editors.'));
 export const openAsTextIcon = registerIcon('notebook-open-as-text', Codicon.fileCode, localize('openAsTextIcon', 'Icon to open the notebook in a text editor.'));
 export const revertIcon = registerIcon('notebook-revert', Codicon.discard, localize('revertIcon', 'Icon to revert in notebook editors.'));
+export const toggleWhitespace = registerIcon('notebook-diff-cell-toggle-whitespace', Codicon.whitespace, localize('toggleWhitespace', 'Icon for the toggle whitespace action in the diff editor.'));
 export const renderOutputIcon = registerIcon('notebook-render-output', Codicon.preview, localize('renderOutputIcon', 'Icon to render output in diff editor.'));
 export const mimetypeIcon = registerIcon('notebook-mimetype', Codicon.code, localize('mimetypeIcon', 'Icon for a mime type in notebook editors.'));
 export const copyIcon = registerIcon('notebook-copy', Codicon.copy, localize('copyIcon', 'Icon to copy content to clipboard'));
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookOptions.ts b/src/vs/workbench/contrib/notebook/browser/notebookOptions.ts
index 46ce122a004..634b9cdb5bb 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookOptions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookOptions.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { PixelRatio } from 'vs/base/browser/pixelRatio';
-import { CodeWindow } from 'vs/base/browser/window';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { isObject } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { FontMeasurements } from 'vs/editor/browser/config/fontMeasurements';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { BareFontInfo } from 'vs/editor/common/config/fontInfo';
-import { ConfigurationTarget, IConfigurationChangeEvent, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { InteractiveWindowCollapseCodeCells, NotebookCellDefaultCollapseConfig, NotebookCellInternalMetadata, NotebookSetting, ShowCellStatusBarType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
+import { PixelRatio } from '../../../../base/browser/pixelRatio.js';
+import { CodeWindow } from '../../../../base/browser/window.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { isObject } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { FontMeasurements } from '../../../../editor/browser/config/fontMeasurements.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { IEditorOptions } from '../../../../editor/common/config/editorOptions.js';
+import { BareFontInfo } from '../../../../editor/common/config/fontInfo.js';
+import { ConfigurationTarget, IConfigurationChangeEvent, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { InteractiveWindowCollapseCodeCells, NotebookCellDefaultCollapseConfig, NotebookCellInternalMetadata, NotebookSetting, ShowCellStatusBarType } from '../common/notebookCommon.js';
+import { INotebookExecutionStateService } from '../common/notebookExecutionStateService.js';
 
 const SCROLLABLE_ELEMENT_PADDING_TOP = 18;
 
@@ -107,6 +107,7 @@ export interface NotebookOptionsChangeEvent {
 	readonly outputScrolling?: boolean;
 	readonly outputLinkifyFilePaths?: boolean;
 	readonly minimalError?: boolean;
+	readonly readonly?: boolean;
 }
 
 const defaultConfigConstants = Object.freeze({
@@ -137,11 +138,11 @@ export class NotebookOptions extends Disposable {
 
 	constructor(
 		readonly targetWindow: CodeWindow,
-		private readonly configurationService: IConfigurationService,
-		private readonly notebookExecutionStateService: INotebookExecutionStateService,
-		private readonly codeEditorService: ICodeEditorService,
 		private isReadonly: boolean,
-		private readonly overrides?: { cellToolbarInteraction: string; globalToolbar: boolean; stickyScrollEnabled: boolean; dragAndDropEnabled: boolean }
+		private readonly overrides: { cellToolbarInteraction: string; globalToolbar: boolean; stickyScrollEnabled: boolean; dragAndDropEnabled: boolean } | undefined,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@INotebookExecutionStateService private readonly notebookExecutionStateService: INotebookExecutionStateService,
+		@ICodeEditorService private readonly codeEditorService: ICodeEditorService,
 	) {
 		super();
 		const showCellStatusBar = this.configurationService.getValue<ShowCellStatusBarType>(NotebookSetting.showCellStatusBar);
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookViewEvents.ts b/src/vs/workbench/contrib/notebook/browser/notebookViewEvents.ts
index 1b3b02345fc..1956087c8e3 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookViewEvents.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookViewEvents.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { FontInfo } from 'vs/editor/common/config/fontInfo';
-import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
-import { NotebookDocumentMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { FontInfo } from '../../../../editor/common/config/fontInfo.js';
+import { NotebookCellTextModel } from '../common/model/notebookCellTextModel.js';
+import { NotebookDocumentMetadata } from '../common/notebookCommon.js';
 
 export interface NotebookLayoutInfo {
 	width: number;
diff --git a/src/vs/workbench/contrib/notebook/browser/services/notebookCellStatusBarServiceImpl.ts b/src/vs/workbench/contrib/notebook/browser/services/notebookCellStatusBarServiceImpl.ts
index 67d223ef756..a1c44a5c45b 100644
--- a/src/vs/workbench/contrib/notebook/browser/services/notebookCellStatusBarServiceImpl.ts
+++ b/src/vs/workbench/contrib/notebook/browser/services/notebookCellStatusBarServiceImpl.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { onUnexpectedExternalError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { INotebookCellStatusBarService } from 'vs/workbench/contrib/notebook/common/notebookCellStatusBarService';
-import { INotebookCellStatusBarItemList, INotebookCellStatusBarItemProvider } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { onUnexpectedExternalError } from '../../../../../base/common/errors.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { Disposable, IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { INotebookCellStatusBarService } from '../../common/notebookCellStatusBarService.js';
+import { INotebookCellStatusBarItemList, INotebookCellStatusBarItemProvider } from '../../common/notebookCommon.js';
 
 export class NotebookCellStatusBarService extends Disposable implements INotebookCellStatusBarService {
 
diff --git a/src/vs/workbench/contrib/notebook/browser/services/notebookEditorService.ts b/src/vs/workbench/contrib/notebook/browser/services/notebookEditorService.ts
index ec20db8d5cf..a292db61aa1 100644
--- a/src/vs/workbench/contrib/notebook/browser/services/notebookEditorService.ts
+++ b/src/vs/workbench/contrib/notebook/browser/services/notebookEditorService.ts
@@ -3,15 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CodeWindow } from 'vs/base/browser/window';
-import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { createDecorator, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { NotebookEditorInput } from 'vs/workbench/contrib/notebook/common/notebookEditorInput';
-import { INotebookEditor, INotebookEditorCreationOptions } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { Event } from 'vs/base/common/event';
-import { Dimension } from 'vs/base/browser/dom';
-import { NotebookEditorWidget } from 'vs/workbench/contrib/notebook/browser/notebookEditorWidget';
-import { URI } from 'vs/base/common/uri';
+import { CodeWindow } from '../../../../../base/browser/window.js';
+import { createDecorator, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { NotebookEditorInput } from '../../common/notebookEditorInput.js';
+import { INotebookEditor, INotebookEditorCreationOptions } from '../notebookBrowser.js';
+import { Event } from '../../../../../base/common/event.js';
+import { Dimension } from '../../../../../base/browser/dom.js';
+import { NotebookEditorWidget } from '../notebookEditorWidget.js';
+import { URI } from '../../../../../base/common/uri.js';
 
 export const INotebookEditorService = createDecorator<INotebookEditorService>('INotebookEditorWidgetService');
 
@@ -22,7 +21,7 @@ export interface IBorrowValue<T> {
 export interface INotebookEditorService {
 	_serviceBrand: undefined;
 
-	retrieveWidget(accessor: ServicesAccessor, group: IEditorGroup, input: NotebookEditorInput, creationOptions?: INotebookEditorCreationOptions, dimension?: Dimension, codeWindow?: CodeWindow): IBorrowValue<INotebookEditor>;
+	retrieveWidget(accessor: ServicesAccessor, groupId: number, input: NotebookEditorInput, creationOptions?: INotebookEditorCreationOptions, dimension?: Dimension, codeWindow?: CodeWindow): IBorrowValue<INotebookEditor>;
 
 	retrieveExistingWidgetFromURI(resource: URI): IBorrowValue<NotebookEditorWidget> | undefined;
 	retrieveAllExistingWidgets(): IBorrowValue<NotebookEditorWidget>[];
diff --git a/src/vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl.ts b/src/vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl.ts
index 4be07da63b7..412c6f77621 100644
--- a/src/vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl.ts
+++ b/src/vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl.ts
@@ -3,22 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CodeWindow } from 'vs/base/browser/window';
-import { ResourceMap } from 'vs/base/common/map';
-import { getDefaultNotebookCreationOptions, NotebookEditorWidget } from 'vs/workbench/contrib/notebook/browser/notebookEditorWidget';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { IEditorGroupsService, IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { isCompositeNotebookEditorInput, NotebookEditorInput } from 'vs/workbench/contrib/notebook/common/notebookEditorInput';
-import { IBorrowValue, INotebookEditorService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorService';
-import { INotebookEditor, INotebookEditorCreationOptions } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { Emitter } from 'vs/base/common/event';
-import { GroupIdentifier, GroupModelChangeKind } from 'vs/workbench/common/editor';
-import { Dimension } from 'vs/base/browser/dom';
-import { URI } from 'vs/base/common/uri';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { InteractiveWindowOpen } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { CodeWindow } from '../../../../../base/browser/window.js';
+import { ResourceMap } from '../../../../../base/common/map.js';
+import { getDefaultNotebookCreationOptions, NotebookEditorWidget } from '../notebookEditorWidget.js';
+import { DisposableStore, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { IEditorGroupsService, IEditorGroup } from '../../../../services/editor/common/editorGroupsService.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { isCompositeNotebookEditorInput, isNotebookEditorInput, NotebookEditorInput } from '../../common/notebookEditorInput.js';
+import { IBorrowValue, INotebookEditorService } from './notebookEditorService.js';
+import { INotebookEditor, INotebookEditorCreationOptions } from '../notebookBrowser.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { GroupIdentifier, GroupModelChangeKind } from '../../../../common/editor.js';
+import { Dimension } from '../../../../../base/browser/dom.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { InteractiveWindowOpen } from '../../common/notebookContextKeys.js';
+import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
+import { IEditorProgressService } from '../../../../../platform/progress/common/progress.js';
 
 export class NotebookEditorWidgetService implements INotebookEditorService {
 
@@ -29,43 +31,45 @@ export class NotebookEditorWidgetService implements INotebookEditorService {
 	private readonly _disposables = new DisposableStore();
 	private readonly _notebookEditors = new Map<string, INotebookEditor>();
 
+	private readonly groupListener = new Map<number, IDisposable[]>();
+
 	private readonly _onNotebookEditorAdd = new Emitter<INotebookEditor>();
 	private readonly _onNotebookEditorsRemove = new Emitter<INotebookEditor>();
 	readonly onDidAddNotebookEditor = this._onNotebookEditorAdd.event;
 	readonly onDidRemoveNotebookEditor = this._onNotebookEditorsRemove.event;
 
-	private readonly _borrowableEditors = new Map<number, ResourceMap<{ widget: NotebookEditorWidget; token: number | undefined }>>();
+	private readonly _borrowableEditors = new Map<number, ResourceMap<{ widget: NotebookEditorWidget; editorType: string; token: number | undefined }[]>>();
 
 	constructor(
 		@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService,
 		@IEditorService editorService: IEditorService,
-		@IContextKeyService contextKeyService: IContextKeyService
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService
 	) {
-
-		const groupListener = new Map<number, IDisposable[]>();
 		const onNewGroup = (group: IEditorGroup) => {
 			const { id } = group;
 			const listeners: IDisposable[] = [];
 			listeners.push(group.onDidCloseEditor(e => {
-				const widgets = this._borrowableEditors.get(group.id);
-				if (!widgets) {
+				const widgetMap = this._borrowableEditors.get(group.id);
+				if (!widgetMap) {
 					return;
 				}
 
 				const inputs = e.editor instanceof NotebookEditorInput ? [e.editor] : (isCompositeNotebookEditorInput(e.editor) ? e.editor.editorInputs : []);
 				inputs.forEach(input => {
-					const value = widgets.get(input.resource);
-					if (!value) {
+					const widgets = widgetMap.get(input.resource);
+					const index = widgets?.findIndex(widget => widget.editorType === input.typeId);
+					if (!widgets || index === undefined || index === -1) {
 						return;
 					}
+					const value = widgets.splice(index, 1)[0];
 					value.token = undefined;
 					this._disposeWidget(value.widget);
-					widgets.delete(input.resource);
 					value.widget = (<any>undefined); // unset the widget so that others that still hold a reference don't harm us
 				});
 			}));
 			listeners.push(group.onWillMoveEditor(e => {
-				if (e.editor instanceof NotebookEditorInput) {
+				if (isNotebookEditorInput(e.editor)) {
 					this._allowWidgetMove(e.editor, e.groupId, e.target);
 				}
 
@@ -75,24 +79,26 @@ export class NotebookEditorWidgetService implements INotebookEditorService {
 					});
 				}
 			}));
-			groupListener.set(id, listeners);
+			this.groupListener.set(id, listeners);
 		};
 		this._disposables.add(editorGroupService.onDidAddGroup(onNewGroup));
 		editorGroupService.whenReady.then(() => editorGroupService.groups.forEach(onNewGroup));
 
 		// group removed -> clean up listeners, clean up widgets
 		this._disposables.add(editorGroupService.onDidRemoveGroup(group => {
-			const listeners = groupListener.get(group.id);
+			const listeners = this.groupListener.get(group.id);
 			if (listeners) {
 				listeners.forEach(listener => listener.dispose());
-				groupListener.delete(group.id);
+				this.groupListener.delete(group.id);
 			}
 			const widgets = this._borrowableEditors.get(group.id);
 			this._borrowableEditors.delete(group.id);
 			if (widgets) {
-				for (const value of widgets.values()) {
-					value.token = undefined;
-					this._disposeWidget(value.widget);
+				for (const values of widgets.values()) {
+					for (const value of values) {
+						value.token = undefined;
+						this._disposeWidget(value.widget);
+					}
 				}
 			}
 		}));
@@ -100,11 +106,11 @@ export class NotebookEditorWidgetService implements INotebookEditorService {
 		const interactiveWindowOpen = InteractiveWindowOpen.bindTo(contextKeyService);
 		this._disposables.add(editorService.onDidEditorsChange(e => {
 			if (e.event.kind === GroupModelChangeKind.EDITOR_OPEN && !interactiveWindowOpen.get()) {
-				if (editorService.editors.find(editor => editor.editorId === 'interactive')) {
+				if (editorService.editors.find(editor => isCompositeNotebookEditorInput(editor))) {
 					interactiveWindowOpen.set(true);
 				}
 			} else if (e.event.kind === GroupModelChangeKind.EDITOR_CLOSE && interactiveWindowOpen.get()) {
-				if (!editorService.editors.find(editor => editor.editorId === 'interactive')) {
+				if (!editorService.editors.find(editor => isCompositeNotebookEditorInput(editor))) {
 					interactiveWindowOpen.set(false);
 				}
 			}
@@ -115,6 +121,10 @@ export class NotebookEditorWidgetService implements INotebookEditorService {
 		this._disposables.dispose();
 		this._onNotebookEditorAdd.dispose();
 		this._onNotebookEditorsRemove.dispose();
+		this.groupListener.forEach((listeners) => {
+			listeners.forEach(listener => listener.dispose());
+		});
+		this.groupListener.clear();
 	}
 
 	// --- group-based editor borrowing...
@@ -134,18 +144,25 @@ export class NotebookEditorWidgetService implements INotebookEditorService {
 			return;
 		}
 
-		const targetWidget = this._borrowableEditors.get(targetID)?.get(input.resource);
-		if (targetWidget) {
-			// not needed
+		const target = this._borrowableEditors.get(targetID)?.get(input.resource)?.findIndex(widget => widget.editorType === input.typeId);
+		if (target !== undefined && target !== -1) {
+			// not needed, a separate widget is already there
 			return;
 		}
 
-		const widget = this._borrowableEditors.get(sourceID)?.get(input.resource);
+		const widget = this._borrowableEditors.get(sourceID)?.get(input.resource)?.find(widget => widget.editorType === input.typeId);
 		if (!widget) {
 			throw new Error('no widget at source group');
 		}
+
 		// don't allow the widget to be retrieved at its previous location any more
-		this._borrowableEditors.get(sourceID)?.delete(input.resource);
+		const sourceWidgets = this._borrowableEditors.get(sourceID)?.get(input.resource);
+		if (sourceWidgets) {
+			const indexToRemove = sourceWidgets.findIndex(widget => widget.editorType === input.typeId);
+			if (indexToRemove !== -1) {
+				sourceWidgets.splice(indexToRemove, 1);
+			}
+		}
 
 		// allow the widget to be retrieved at its new location
 		let targetMap = this._borrowableEditors.get(targetID);
@@ -153,14 +170,16 @@ export class NotebookEditorWidgetService implements INotebookEditorService {
 			targetMap = new ResourceMap();
 			this._borrowableEditors.set(targetID, targetMap);
 		}
-		targetMap.set(input.resource, widget);
+		const widgetsAtTarget = targetMap.get(input.resource) ?? [];
+		widgetsAtTarget?.push(widget);
+		targetMap.set(input.resource, widgetsAtTarget);
 	}
 
 	retrieveExistingWidgetFromURI(resource: URI): IBorrowValue<NotebookEditorWidget> | undefined {
 		for (const widgetInfo of this._borrowableEditors.values()) {
-			const widget = widgetInfo.get(resource);
-			if (widget) {
-				return this._createBorrowValue(widget.token!, widget);
+			const widgets = widgetInfo.get(resource);
+			if (widgets && widgets.length > 0) {
+				return this._createBorrowValue(widgets[0].token!, widgets[0]);
 			}
 		}
 		return undefined;
@@ -169,34 +188,35 @@ export class NotebookEditorWidgetService implements INotebookEditorService {
 	retrieveAllExistingWidgets(): IBorrowValue<NotebookEditorWidget>[] {
 		const ret: IBorrowValue<NotebookEditorWidget>[] = [];
 		for (const widgetInfo of this._borrowableEditors.values()) {
-			for (const widget of widgetInfo.values()) {
-				ret.push(this._createBorrowValue(widget.token!, widget));
+			for (const widgets of widgetInfo.values()) {
+				for (const widget of widgets) {
+					ret.push(this._createBorrowValue(widget.token!, widget));
+				}
 			}
 		}
 		return ret;
 	}
 
-	retrieveWidget(accessor: ServicesAccessor, group: IEditorGroup, input: NotebookEditorInput, creationOptions?: INotebookEditorCreationOptions, initialDimension?: Dimension, codeWindow?: CodeWindow): IBorrowValue<NotebookEditorWidget> {
+	retrieveWidget(accessor: ServicesAccessor, groupId: number, input: NotebookEditorInput, creationOptions?: INotebookEditorCreationOptions, initialDimension?: Dimension, codeWindow?: CodeWindow): IBorrowValue<NotebookEditorWidget> {
 
-		let value = this._borrowableEditors.get(group.id)?.get(input.resource);
+		let value = this._borrowableEditors.get(groupId)?.get(input.resource)?.find(widget => widget.editorType === input.typeId);
 
 		if (!value) {
 			// NEW widget
-			const instantiationService = accessor.get(IInstantiationService);
-			const ctorOptions = creationOptions ?? getDefaultNotebookCreationOptions();
-			const widget = instantiationService.createInstance(NotebookEditorWidget, {
-				...ctorOptions,
-				codeWindow: codeWindow ?? ctorOptions.codeWindow,
-			}, initialDimension);
+			const editorGroupContextKeyService = accessor.get(IContextKeyService);
+			const editorGroupEditorProgressService = accessor.get(IEditorProgressService);
+			const widget = this.createWidget(editorGroupContextKeyService, editorGroupEditorProgressService, creationOptions, codeWindow, initialDimension);
 			const token = this._tokenPool++;
-			value = { widget, token };
+			value = { widget, editorType: input.typeId, token };
 
-			let map = this._borrowableEditors.get(group.id);
+			let map = this._borrowableEditors.get(groupId);
 			if (!map) {
 				map = new ResourceMap();
-				this._borrowableEditors.set(group.id, map);
+				this._borrowableEditors.set(groupId, map);
 			}
-			map.set(input.resource, value);
+			const values = map.get(input.resource) ?? [];
+			values.push(value);
+			map.set(input.resource, values);
 
 		} else {
 			// reuse a widget which was either free'ed before or which
@@ -207,6 +227,19 @@ export class NotebookEditorWidgetService implements INotebookEditorService {
 		return this._createBorrowValue(value.token!, value);
 	}
 
+	// protected for unit testing overrides
+	protected createWidget(editorGroupContextKeyService: IContextKeyService, editorGroupEditorProgressService: IEditorProgressService, creationOptions?: INotebookEditorCreationOptions, codeWindow?: CodeWindow, initialDimension?: Dimension) {
+		const notebookInstantiationService = this.instantiationService.createChild(new ServiceCollection(
+			[IContextKeyService, editorGroupContextKeyService],
+			[IEditorProgressService, editorGroupEditorProgressService]));
+		const ctorOptions = creationOptions ?? getDefaultNotebookCreationOptions();
+		const widget = notebookInstantiationService.createInstance(NotebookEditorWidget, {
+			...ctorOptions,
+			codeWindow: codeWindow ?? ctorOptions.codeWindow,
+		}, initialDimension);
+		return widget;
+	}
+
 	private _createBorrowValue(myToken: number, widget: { widget: NotebookEditorWidget; token: number | undefined }): IBorrowValue<NotebookEditorWidget> {
 		return {
 			get value() {
diff --git a/src/vs/workbench/contrib/notebook/browser/services/notebookExecutionServiceImpl.ts b/src/vs/workbench/contrib/notebook/browser/services/notebookExecutionServiceImpl.ts
index d3666822f40..d80fe2b9353 100644
--- a/src/vs/workbench/contrib/notebook/browser/services/notebookExecutionServiceImpl.ts
+++ b/src/vs/workbench/contrib/notebook/browser/services/notebookExecutionServiceImpl.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import * as nls from 'vs/nls';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IWorkspaceTrustRequestService } from 'vs/platform/workspace/common/workspaceTrust';
-import { KernelPickerMRUStrategy } from 'vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy';
-import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
-import { CellKind, INotebookTextModel, NotebookCellExecutionState } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotebookExecutionService, ICellExecutionParticipant } from 'vs/workbench/contrib/notebook/common/notebookExecutionService';
-import { INotebookCellExecution, INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
-import { INotebookKernelHistoryService, INotebookKernelService } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
+import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import * as nls from '../../../../../nls.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IWorkspaceTrustRequestService } from '../../../../../platform/workspace/common/workspaceTrust.js';
+import { KernelPickerMRUStrategy } from '../viewParts/notebookKernelQuickPickStrategy.js';
+import { NotebookCellTextModel } from '../../common/model/notebookCellTextModel.js';
+import { CellKind, INotebookTextModel, NotebookCellExecutionState } from '../../common/notebookCommon.js';
+import { INotebookExecutionService, ICellExecutionParticipant } from '../../common/notebookExecutionService.js';
+import { INotebookCellExecution, INotebookExecutionStateService } from '../../common/notebookExecutionStateService.js';
+import { INotebookKernelHistoryService, INotebookKernelService } from '../../common/notebookKernelService.js';
+import { INotebookLoggingService } from '../../common/notebookLoggingService.js';
 
 
 export class NotebookExecutionService implements INotebookExecutionService, IDisposable {
@@ -27,7 +27,7 @@ export class NotebookExecutionService implements INotebookExecutionService, IDis
 		@INotebookKernelService private readonly _notebookKernelService: INotebookKernelService,
 		@INotebookKernelHistoryService private readonly _notebookKernelHistoryService: INotebookKernelHistoryService,
 		@IWorkspaceTrustRequestService private readonly _workspaceTrustRequestService: IWorkspaceTrustRequestService,
-		@ILogService private readonly _logService: ILogService,
+		@INotebookLoggingService private readonly _logService: INotebookLoggingService,
 		@INotebookExecutionStateService private readonly _notebookExecutionStateService: INotebookExecutionStateService,
 	) {
 	}
@@ -39,7 +39,7 @@ export class NotebookExecutionService implements INotebookExecutionService, IDis
 			return;
 		}
 
-		this._logService.debug(`NotebookExecutionService#executeNotebookCells ${JSON.stringify(cellsArr.map(c => c.handle))}`);
+		this._logService.debug(`Execution`, `${JSON.stringify(cellsArr.map(c => c.handle))}`);
 		const message = nls.localize('notebookRunTrust', "Executing a notebook cell will run code from this workspace.");
 		const trust = await this._workspaceTrustRequestService.requestWorkspaceTrust({ message });
 		if (!trust) {
@@ -85,15 +85,16 @@ export class NotebookExecutionService implements INotebookExecutionService, IDis
 			// the connecting state can change before the kernel resolves executeNotebookCellsRequest
 			const unconfirmed = validCellExecutions.filter(exe => exe.state === NotebookCellExecutionState.Unconfirmed);
 			if (unconfirmed.length) {
-				this._logService.debug(`NotebookExecutionService#executeNotebookCells completing unconfirmed executions ${JSON.stringify(unconfirmed.map(exe => exe.cellHandle))}`);
+				this._logService.debug(`Execution`, `Completing unconfirmed executions ${JSON.stringify(unconfirmed.map(exe => exe.cellHandle))}`);
 				unconfirmed.forEach(exe => exe.complete({}));
 			}
+			this._logService.debug(`Execution`, `Completed executions ${JSON.stringify(validCellExecutions.map(exe => exe.cellHandle))}`);
 		}
 	}
 
 	async cancelNotebookCellHandles(notebook: INotebookTextModel, cells: Iterable<number>): Promise<void> {
 		const cellsArr = Array.from(cells);
-		this._logService.debug(`NotebookExecutionService#cancelNotebookCellHandles ${JSON.stringify(cellsArr)}`);
+		this._logService.debug(`Execution`, `CancelNotebookCellHandles ${JSON.stringify(cellsArr)}`);
 		const kernel = this._notebookKernelService.getSelectedOrSuggestedKernel(notebook);
 		if (kernel) {
 			await kernel.cancelNotebookCellExecution(notebook.uri, cellsArr);
diff --git a/src/vs/workbench/contrib/notebook/browser/services/notebookExecutionStateServiceImpl.ts b/src/vs/workbench/contrib/notebook/browser/services/notebookExecutionStateServiceImpl.ts
index 52157f4ae29..6541654dc3e 100644
--- a/src/vs/workbench/contrib/notebook/browser/services/notebookExecutionStateServiceImpl.ts
+++ b/src/vs/workbench/contrib/notebook/browser/services/notebookExecutionStateServiceImpl.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { combinedDisposable, Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { ResourceMap } from 'vs/base/common/map';
-import { isEqual } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { AccessibilitySignal, IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { CellEditType, CellUri, ICellEditOperation, NotebookCellExecutionState, NotebookCellInternalMetadata, NotebookExecutionState, NotebookTextModelWillAddRemoveEvent } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { CellExecutionUpdateType, INotebookExecutionService } from 'vs/workbench/contrib/notebook/common/notebookExecutionService';
-import { ICellExecuteUpdate, ICellExecutionComplete, ICellExecutionStateChangedEvent, ICellExecutionStateUpdate, IExecutionStateChangedEvent, IFailedCellInfo, INotebookCellExecution, INotebookExecution, INotebookExecutionStateService, INotebookFailStateChangedEvent, NotebookExecutionType } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
-import { INotebookKernelService } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
-import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
+import { Emitter } from '../../../../../base/common/event.js';
+import { combinedDisposable, Disposable, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../../base/common/map.js';
+import { isEqual } from '../../../../../base/common/resources.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { generateUuid } from '../../../../../base/common/uuid.js';
+import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../../platform/log/common/log.js';
+import { NotebookTextModel } from '../../common/model/notebookTextModel.js';
+import { CellEditType, CellUri, ICellEditOperation, NotebookCellExecutionState, NotebookCellInternalMetadata, NotebookExecutionState, NotebookTextModelWillAddRemoveEvent } from '../../common/notebookCommon.js';
+import { CellExecutionUpdateType, INotebookExecutionService } from '../../common/notebookExecutionService.js';
+import { ICellExecuteUpdate, ICellExecutionComplete, ICellExecutionStateChangedEvent, ICellExecutionStateUpdate, IExecutionStateChangedEvent, IFailedCellInfo, INotebookCellExecution, INotebookExecution, INotebookExecutionStateService, INotebookFailStateChangedEvent, NotebookExecutionType } from '../../common/notebookExecutionStateService.js';
+import { INotebookKernelService } from '../../common/notebookKernelService.js';
+import { INotebookService } from '../../common/notebookService.js';
 
 export class NotebookExecutionStateService extends Disposable implements INotebookExecutionStateService {
 	declare _serviceBrand: undefined;
diff --git a/src/vs/workbench/contrib/notebook/browser/services/notebookKernelHistoryServiceImpl.ts b/src/vs/workbench/contrib/notebook/browser/services/notebookKernelHistoryServiceImpl.ts
index 3e3446349b8..e0ae64391ac 100644
--- a/src/vs/workbench/contrib/notebook/browser/services/notebookKernelHistoryServiceImpl.ts
+++ b/src/vs/workbench/contrib/notebook/browser/services/notebookKernelHistoryServiceImpl.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { LinkedMap, Touch } from 'vs/base/common/map';
-import { localize2 } from 'vs/nls';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { INotebookKernel, INotebookKernelHistoryService, INotebookKernelService, INotebookTextModelLike } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
-import { INotebookLoggingService } from 'vs/workbench/contrib/notebook/common/notebookLoggingService';
+import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { LinkedMap, Touch } from '../../../../../base/common/map.js';
+import { localize2 } from '../../../../../nls.js';
+import { Categories } from '../../../../../platform/action/common/actionCommonCategories.js';
+import { Action2, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { INotebookKernel, INotebookKernelHistoryService, INotebookKernelService, INotebookTextModelLike } from '../../common/notebookKernelService.js';
+import { INotebookLoggingService } from '../../common/notebookLoggingService.js';
 
 interface ISerializedKernelsListPerType {
 	entries: string[];
@@ -48,7 +48,7 @@ export class NotebookKernelHistoryService extends Disposable implements INoteboo
 		// We will suggest the only kernel
 		const suggested = allAvailableKernels.all.length === 1 ? allAvailableKernels.all[0] : undefined;
 		this._notebookLoggingService.debug('History', `getMatchingKernels: ${allAvailableKernels.all.length} kernels available for ${notebook.uri.path}. Selected: ${allAvailableKernels.selected?.label}. Suggested: ${suggested?.label}`);
-		const mostRecentKernelIds = this._mostRecentKernelsMap[notebook.viewType] ? [...this._mostRecentKernelsMap[notebook.viewType].values()] : [];
+		const mostRecentKernelIds = this._mostRecentKernelsMap[notebook.notebookType] ? [...this._mostRecentKernelsMap[notebook.notebookType].values()] : [];
 		const all = mostRecentKernelIds.map(kernelId => allKernels.find(kernel => kernel.id === kernelId)).filter(kernel => !!kernel) as INotebookKernel[];
 		this._notebookLoggingService.debug('History', `mru: ${mostRecentKernelIds.length} kernels in history, ${all.length} registered already.`);
 
diff --git a/src/vs/workbench/contrib/notebook/browser/services/notebookKernelServiceImpl.ts b/src/vs/workbench/contrib/notebook/browser/services/notebookKernelServiceImpl.ts
index 572a833e173..dc0652d5569 100644
--- a/src/vs/workbench/contrib/notebook/browser/services/notebookKernelServiceImpl.ts
+++ b/src/vs/workbench/contrib/notebook/browser/services/notebookKernelServiceImpl.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event, Emitter } from 'vs/base/common/event';
-import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { INotebookKernelSourceAction, INotebookTextModel } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotebookKernel, ISelectedNotebooksChangeEvent, INotebookKernelMatchResult, INotebookKernelService, INotebookTextModelLike, ISourceAction, INotebookSourceActionChangeEvent, INotebookKernelDetectionTask, IKernelSourceActionProvider } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
-import { LRUCache, ResourceMap } from 'vs/base/common/map';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { URI } from 'vs/base/common/uri';
-import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
-import { IMenu, IMenuService, MenuId } from 'vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IAction } from 'vs/base/common/actions';
-import { MarshalledId } from 'vs/base/common/marshallingIds';
-import { Schemas } from 'vs/base/common/network';
-import { getActiveWindow, runWhenWindowIdle } from 'vs/base/browser/dom';
+import { Event, Emitter } from '../../../../../base/common/event.js';
+import { Disposable, IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { INotebookKernelSourceAction, INotebookTextModel } from '../../common/notebookCommon.js';
+import { INotebookKernel, ISelectedNotebooksChangeEvent, INotebookKernelMatchResult, INotebookKernelService, INotebookTextModelLike, ISourceAction, INotebookSourceActionChangeEvent, INotebookKernelDetectionTask, IKernelSourceActionProvider } from '../../common/notebookKernelService.js';
+import { LRUCache, ResourceMap } from '../../../../../base/common/map.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { INotebookService } from '../../common/notebookService.js';
+import { IMenu, IMenuService, MenuId } from '../../../../../platform/actions/common/actions.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IAction } from '../../../../../base/common/actions.js';
+import { MarshalledId } from '../../../../../base/common/marshallingIds.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { getActiveWindow, runWhenWindowIdle } from '../../../../../base/browser/dom.js';
 
 class KernelInfo {
 
@@ -37,12 +37,12 @@ class KernelInfo {
 
 class NotebookTextModelLikeId {
 	static str(k: INotebookTextModelLike): string {
-		return `${k.viewType}/${k.uri.toString()}`;
+		return `${k.notebookType}/${k.uri.toString()}`;
 	}
 	static obj(s: string): INotebookTextModelLike {
 		const idx = s.indexOf('/');
 		return {
-			viewType: s.substring(0, idx),
+			notebookType: s.substring(0, idx),
 			uri: URI.parse(s.substring(idx + 1))
 		};
 	}
@@ -178,7 +178,7 @@ export class NotebookKernelService extends Disposable implements INotebookKernel
 	private static _score(kernel: INotebookKernel, notebook: INotebookTextModelLike): number {
 		if (kernel.viewType === '*') {
 			return 5;
-		} else if (kernel.viewType === notebook.viewType) {
+		} else if (kernel.viewType === notebook.notebookType) {
 			return 10;
 		} else {
 			return 0;
@@ -343,7 +343,7 @@ export class NotebookKernelService extends Disposable implements INotebookKernel
 					const stateChangeListener = sourceAction.onDidChangeState(() => {
 						this._onDidChangeSourceActions.fire({
 							notebook: document.uri,
-							viewType: document.viewType,
+							viewType: document.notebookType,
 						});
 					});
 					sourceActions.push([sourceAction, stateChangeListener]);
@@ -351,7 +351,7 @@ export class NotebookKernelService extends Disposable implements INotebookKernel
 			});
 			info.actions = sourceActions;
 			this._kernelSources.set(id, info);
-			this._onDidChangeSourceActions.fire({ notebook: document.uri, viewType: document.viewType });
+			this._onDidChangeSourceActions.fire({ notebook: document.uri, viewType: document.notebookType });
 		};
 
 		this._kernelSourceActionsUpdates.get(id)?.dispose();
@@ -382,7 +382,7 @@ export class NotebookKernelService extends Disposable implements INotebookKernel
 	}
 
 	getKernelDetectionTasks(notebook: INotebookTextModelLike): INotebookKernelDetectionTask[] {
-		return this._kernelDetectionTasks.get(notebook.viewType) ?? [];
+		return this._kernelDetectionTasks.get(notebook.notebookType) ?? [];
 	}
 
 	registerKernelSourceActionProvider(viewType: string, provider: IKernelSourceActionProvider): IDisposable {
@@ -411,7 +411,7 @@ export class NotebookKernelService extends Disposable implements INotebookKernel
 	 * Get kernel source actions from providers
 	 */
 	getKernelSourceActions2(notebook: INotebookTextModelLike): Promise<INotebookKernelSourceAction[]> {
-		const viewType = notebook.viewType;
+		const viewType = notebook.notebookType;
 		const providers = this._kernelSourceActionProviders.get(viewType) ?? [];
 		const promises = providers.map(provider => provider.provideKernelSourceActions());
 		return Promise.all(promises).then(actions => {
diff --git a/src/vs/workbench/contrib/notebook/browser/services/notebookKeymapServiceImpl.ts b/src/vs/workbench/contrib/notebook/browser/services/notebookKeymapServiceImpl.ts
index 8682f88efc3..0e68bf1e0fd 100644
--- a/src/vs/workbench/contrib/notebook/browser/services/notebookKeymapServiceImpl.ts
+++ b/src/vs/workbench/contrib/notebook/browser/services/notebookKeymapServiceImpl.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { localize } from 'vs/nls';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { getInstalledExtensions, IExtensionStatus } from 'vs/workbench/contrib/extensions/common/extensionsUtils';
-import { INotebookKeymapService } from 'vs/workbench/contrib/notebook/common/notebookKeymapService';
-import { EnablementState, IWorkbenchExtensionEnablementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IExtensionIdentifier, IExtensionManagementService, InstallOperation } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { Memento, MementoObject } from 'vs/workbench/common/memento';
-import { distinct } from 'vs/base/common/arrays';
+import { onUnexpectedError } from '../../../../../base/common/errors.js';
+import { Event } from '../../../../../base/common/event.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { localize } from '../../../../../nls.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { INotificationService, Severity } from '../../../../../platform/notification/common/notification.js';
+import { getInstalledExtensions, IExtensionStatus } from '../../../extensions/common/extensionsUtils.js';
+import { INotebookKeymapService } from '../../common/notebookKeymapService.js';
+import { EnablementState, IWorkbenchExtensionEnablementService } from '../../../../services/extensionManagement/common/extensionManagement.js';
+import { ILifecycleService } from '../../../../services/lifecycle/common/lifecycle.js';
+import { IExtensionIdentifier, IExtensionManagementService, InstallOperation } from '../../../../../platform/extensionManagement/common/extensionManagement.js';
+import { areSameExtensions } from '../../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { Memento, MementoObject } from '../../../../common/memento.js';
+import { distinct } from '../../../../../base/common/arrays.js';
 
 function onExtensionChanged(accessor: ServicesAccessor): Event<IExtensionIdentifier[]> {
 	const extensionService = accessor.get(IExtensionManagementService);
diff --git a/src/vs/workbench/contrib/notebook/browser/services/notebookLoggingServiceImpl.ts b/src/vs/workbench/contrib/notebook/browser/services/notebookLoggingServiceImpl.ts
index 9ca31a78982..37aa5e99bef 100644
--- a/src/vs/workbench/contrib/notebook/browser/services/notebookLoggingServiceImpl.ts
+++ b/src/vs/workbench/contrib/notebook/browser/services/notebookLoggingServiceImpl.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { INotebookLoggingService } from 'vs/workbench/contrib/notebook/common/notebookLoggingService';
-import { ILogger, ILoggerService } from 'vs/platform/log/common/log';
+import * as nls from '../../../../../nls.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { INotebookLoggingService } from '../../common/notebookLoggingService.js';
+import { ILogger, ILoggerService } from '../../../../../platform/log/common/log.js';
 
 const logChannelId = 'notebook.rendering';
 
@@ -20,7 +20,7 @@ export class NotebookLoggingService extends Disposable implements INotebookLoggi
 		@ILoggerService loggerService: ILoggerService,
 	) {
 		super();
-		this._logger = this._register(loggerService.createLogger(logChannelId, { name: nls.localize('renderChannelName', "Notebook rendering") }));
+		this._logger = this._register(loggerService.createLogger(logChannelId, { name: nls.localize('renderChannelName', "Notebook") }));
 	}
 
 	debug(category: string, output: string): void {
@@ -30,5 +30,13 @@ export class NotebookLoggingService extends Disposable implements INotebookLoggi
 	info(category: string, output: string): void {
 		this._logger.info(`[${category}] ${output}`);
 	}
+
+	warn(category: string, output: string): void {
+		this._logger.warn(`[${category}] ${output}`);
+	}
+
+	error(category: string, output: string): void {
+		this._logger.error(`[${category}] ${output}`);
+	}
 }
 
diff --git a/src/vs/workbench/contrib/notebook/browser/services/notebookRendererMessagingServiceImpl.ts b/src/vs/workbench/contrib/notebook/browser/services/notebookRendererMessagingServiceImpl.ts
index 05ce804d229..159aad2d06d 100644
--- a/src/vs/workbench/contrib/notebook/browser/services/notebookRendererMessagingServiceImpl.ts
+++ b/src/vs/workbench/contrib/notebook/browser/services/notebookRendererMessagingServiceImpl.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { INotebookRendererMessagingService, IScopedRendererMessaging } from 'vs/workbench/contrib/notebook/common/notebookRendererMessagingService';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { Emitter } from '../../../../../base/common/event.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { INotebookRendererMessagingService, IScopedRendererMessaging } from '../../common/notebookRendererMessagingService.js';
+import { IExtensionService } from '../../../../services/extensions/common/extensions.js';
 
 type MessageToSend = { editorId: string; rendererId: string; message: unknown };
 
diff --git a/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.ts b/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.ts
index 99a74727cb4..c57cb325bb3 100644
--- a/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.ts
+++ b/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.ts
@@ -3,45 +3,48 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { toAction } from 'vs/base/common/actions';
-import { createErrorWithActions } from 'vs/base/common/errorMessage';
-import { Emitter, Event } from 'vs/base/common/event';
-import * as glob from 'vs/base/common/glob';
-import { Iterable } from 'vs/base/common/iterator';
-import { Lazy } from 'vs/base/common/lazy';
-import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { ResourceMap } from 'vs/base/common/map';
-import { Schemas } from 'vs/base/common/network';
-import { basename, isEqual } from 'vs/base/common/resources';
-import { isDefined } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IResourceEditorInput } from 'vs/platform/editor/common/editor';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { Memento, MementoObject } from 'vs/workbench/common/memento';
-import { INotebookEditorContribution, notebookPreloadExtensionPoint, notebookRendererExtensionPoint, notebooksExtensionPoint } from 'vs/workbench/contrib/notebook/browser/notebookExtensionPoint';
-import { INotebookEditorOptions } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NotebookDiffEditorInput } from 'vs/workbench/contrib/notebook/common/notebookDiffEditorInput';
-import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { ACCESSIBLE_NOTEBOOK_DISPLAY_ORDER, CellUri, NotebookSetting, INotebookContributionData, INotebookExclusiveDocumentFilter, INotebookRendererInfo, INotebookTextModel, IOrderedMimeType, IOutputDto, MimeTypeDisplayOrder, NotebookData, NotebookEditorPriority, NotebookRendererMatch, NOTEBOOK_DISPLAY_ORDER, RENDERER_EQUIVALENT_EXTENSIONS, RENDERER_NOT_AVAILABLE, TransientOptions, NotebookExtensionDescription, INotebookStaticPreloadInfo } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { NotebookEditorInput } from 'vs/workbench/contrib/notebook/common/notebookEditorInput';
-import { INotebookEditorModelResolverService } from 'vs/workbench/contrib/notebook/common/notebookEditorModelResolverService';
-import { NotebookOutputRendererInfo, NotebookStaticPreloadInfo as NotebookStaticPreloadInfo } from 'vs/workbench/contrib/notebook/common/notebookOutputRenderer';
-import { NotebookEditorDescriptor, NotebookProviderInfo } from 'vs/workbench/contrib/notebook/common/notebookProvider';
-import { INotebookSerializer, INotebookService, SimpleNotebookProviderInfo } from 'vs/workbench/contrib/notebook/common/notebookService';
-import { DiffEditorInputFactoryFunction, EditorInputFactoryFunction, EditorInputFactoryObject, IEditorResolverService, IEditorType, RegisteredEditorInfo, RegisteredEditorPriority, UntitledEditorInputFactoryFunction, type MergeEditorInputFactoryFunction } from 'vs/workbench/services/editor/common/editorResolverService';
-import { IExtensionService, isProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
-import { IExtensionPointUser } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { InstallRecommendedExtensionAction } from 'vs/workbench/contrib/extensions/browser/extensionsActions';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { INotebookDocument, INotebookDocumentService } from 'vs/workbench/services/notebook/common/notebookDocumentService';
-import { MergeEditorInput } from 'vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
-import type { EditorInputWithOptions, IResourceMergeEditorInput } from 'vs/workbench/common/editor';
+import { localize } from '../../../../../nls.js';
+import { toAction } from '../../../../../base/common/actions.js';
+import { createErrorWithActions } from '../../../../../base/common/errorMessage.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import * as glob from '../../../../../base/common/glob.js';
+import { Iterable } from '../../../../../base/common/iterator.js';
+import { Lazy } from '../../../../../base/common/lazy.js';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../../base/common/map.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { basename, isEqual } from '../../../../../base/common/resources.js';
+import { isDefined } from '../../../../../base/common/types.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { IAccessibilityService } from '../../../../../platform/accessibility/common/accessibility.js';
+import { ConfigurationTarget, IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IResourceEditorInput } from '../../../../../platform/editor/common/editor.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { Memento, MementoObject } from '../../../../common/memento.js';
+import { INotebookEditorContribution, notebookPreloadExtensionPoint, notebookRendererExtensionPoint, notebooksExtensionPoint } from '../notebookExtensionPoint.js';
+import { INotebookEditorOptions } from '../notebookBrowser.js';
+import { NotebookDiffEditorInput } from '../../common/notebookDiffEditorInput.js';
+import { NotebookCellTextModel } from '../../common/model/notebookCellTextModel.js';
+import { NotebookTextModel } from '../../common/model/notebookTextModel.js';
+import { ACCESSIBLE_NOTEBOOK_DISPLAY_ORDER, CellUri, NotebookSetting, INotebookContributionData, INotebookExclusiveDocumentFilter, INotebookRendererInfo, INotebookTextModel, IOrderedMimeType, IOutputDto, MimeTypeDisplayOrder, NotebookEditorPriority, NotebookRendererMatch, NOTEBOOK_DISPLAY_ORDER, RENDERER_EQUIVALENT_EXTENSIONS, RENDERER_NOT_AVAILABLE, NotebookExtensionDescription, INotebookStaticPreloadInfo } from '../../common/notebookCommon.js';
+import { NotebookEditorInput } from '../../common/notebookEditorInput.js';
+import { INotebookEditorModelResolverService } from '../../common/notebookEditorModelResolverService.js';
+import { NotebookOutputRendererInfo, NotebookStaticPreloadInfo as NotebookStaticPreloadInfo } from '../../common/notebookOutputRenderer.js';
+import { NotebookEditorDescriptor, NotebookProviderInfo } from '../../common/notebookProvider.js';
+import { INotebookSerializer, INotebookService, SimpleNotebookProviderInfo } from '../../common/notebookService.js';
+import { DiffEditorInputFactoryFunction, EditorInputFactoryFunction, EditorInputFactoryObject, IEditorResolverService, IEditorType, RegisteredEditorInfo, RegisteredEditorPriority, UntitledEditorInputFactoryFunction, type MergeEditorInputFactoryFunction } from '../../../../services/editor/common/editorResolverService.js';
+import { IExtensionService, isProposedApiEnabled } from '../../../../services/extensions/common/extensions.js';
+import { IExtensionPointUser } from '../../../../services/extensions/common/extensionsRegistry.js';
+import { InstallRecommendedExtensionAction } from '../../../extensions/browser/extensionsActions.js';
+import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.js';
+import { INotebookDocument, INotebookDocumentService } from '../../../../services/notebook/common/notebookDocumentService.js';
+import { MergeEditorInput } from '../../../mergeEditor/browser/mergeEditorInput.js';
+import type { EditorInputWithOptions, IResourceDiffEditorInput, IResourceMergeEditorInput } from '../../../../common/editor.js';
+import { streamToBuffer, VSBuffer, VSBufferReadableStream } from '../../../../../base/common/buffer.js';
+import type { IEditorGroup } from '../../../../services/editor/common/editorGroupsService.js';
+import { NotebookMultiDiffEditorInput } from '../diff/notebookMultiDiffEditorInput.js';
 
 export class NotebookProviderInfoStore extends Disposable {
 
@@ -132,7 +135,6 @@ export class NotebookProviderInfoStore extends Disposable {
 					selectors: notebookContribution.selector || [],
 					priority: this._convertPriority(notebookContribution.priority),
 					providerDisplayName: extension.description.displayName ?? extension.description.identifier.value,
-					exclusive: false
 				}));
 			}
 		}
@@ -171,7 +173,7 @@ export class NotebookProviderInfoStore extends Disposable {
 				id: notebookProviderInfo.id,
 				label: notebookProviderInfo.displayName,
 				detail: notebookProviderInfo.providerDisplayName,
-				priority: notebookProviderInfo.exclusive ? RegisteredEditorPriority.exclusive : notebookProviderInfo.priority,
+				priority: notebookProviderInfo.priority,
 			};
 			const notebookEditorOptions = {
 				canHandleDiff: () => !!this._configurationService.getValue(NotebookSetting.textDiffEditorPreview) && !this._accessibilityService.isScreenReaderOptimized(),
@@ -213,7 +215,12 @@ export class NotebookProviderInfoStore extends Disposable {
 
 				return { editor: NotebookEditorInput.getOrCreate(this._instantiationService, ref.object.resource, undefined, notebookProviderInfo.id), options };
 			};
-			const notebookDiffEditorInputFactory: DiffEditorInputFactoryFunction = ({ modified, original, label, description }) => {
+			const notebookDiffEditorInputFactory: DiffEditorInputFactoryFunction = (diffEditorInput: IResourceDiffEditorInput, group: IEditorGroup) => {
+				const { modified, original, label, description } = diffEditorInput;
+
+				if (this._configurationService.getValue('notebook.experimental.enableNewDiffEditor')) {
+					return { editor: NotebookMultiDiffEditorInput.create(this._instantiationService, modified.resource!, label, description, original.resource!, notebookProviderInfo.id) };
+				}
 				return { editor: NotebookDiffEditorInput.create(this._instantiationService, modified.resource!, label, description, original.resource!, notebookProviderInfo.id) };
 			};
 			const mergeEditorInputFactory: MergeEditorInputFactoryFunction = (mergeEditor: IResourceMergeEditorInput): EditorInputWithOptions => {
@@ -639,8 +646,7 @@ export class NotebookService extends Disposable implements INotebookService {
 			id: viewType,
 			displayName: data.displayName,
 			providerDisplayName: data.providerDisplayName,
-			exclusive: data.exclusive,
-			priority: RegisteredEditorPriority.default,
+			priority: data.priority || RegisteredEditorPriority.default,
 			selectors: []
 		});
 
@@ -745,17 +751,28 @@ export class NotebookService extends Disposable implements INotebookService {
 
 	// --- notebook documents: create, destory, retrieve, enumerate
 
-	createNotebookTextModel(viewType: string, uri: URI, data: NotebookData, transientOptions: TransientOptions): NotebookTextModel {
+	async createNotebookTextModel(viewType: string, uri: URI, stream?: VSBufferReadableStream): Promise<NotebookTextModel> {
 		if (this._models.has(uri)) {
 			throw new Error(`notebook for ${uri} already exists`);
 		}
-		const notebookModel = this._instantiationService.createInstance(NotebookTextModel, viewType, uri, data.cells, data.metadata, transientOptions);
+
+		const info = await this.withNotebookDataProvider(viewType);
+		if (!(info instanceof SimpleNotebookProviderInfo)) {
+			throw new Error('CANNOT open file notebook with this provider');
+		}
+
+
+		const bytes = stream ? await streamToBuffer(stream) : VSBuffer.fromByteArray([]);
+		const data = await info.serializer.dataToNotebook(bytes);
+
+
+		const notebookModel = this._instantiationService.createInstance(NotebookTextModel, info.viewType, uri, data.cells, data.metadata, info.serializer.options);
 		const modelData = new ModelData(notebookModel, this._onWillDisposeDocument.bind(this));
 		this._models.set(uri, modelData);
 		this._notebookDocumentService.addNotebookDocument(modelData);
 		this._onWillAddNotebookDocument.fire(notebookModel);
 		this._onDidAddNotebookDocument.fire(notebookModel);
-		this._postDocumentOpenActivation(viewType);
+		this._postDocumentOpenActivation(info.viewType);
 		return notebookModel;
 	}
 
diff --git a/src/vs/workbench/contrib/notebook/browser/services/notebookWorkerServiceImpl.ts b/src/vs/workbench/contrib/notebook/browser/services/notebookWorkerServiceImpl.ts
index 65980c57a9c..5fcfbbcfd91 100644
--- a/src/vs/workbench/contrib/notebook/browser/services/notebookWorkerServiceImpl.ts
+++ b/src/vs/workbench/contrib/notebook/browser/services/notebookWorkerServiceImpl.ts
@@ -3,16 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, DisposableStore, dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { SimpleWorkerClient } from 'vs/base/common/worker/simpleWorker';
-import { DefaultWorkerFactory } from 'vs/base/browser/defaultWorkerFactory';
-import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
-import { IMainCellDto, INotebookDiffResult, NotebookCellsChangeType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
-import { NotebookEditorSimpleWorker } from 'vs/workbench/contrib/notebook/common/services/notebookSimpleWorker';
-import { INotebookWorkerHost } from 'vs/workbench/contrib/notebook/common/services/notebookWorkerHost';
-import { INotebookEditorWorkerService } from 'vs/workbench/contrib/notebook/common/services/notebookWorkerService';
+import { Disposable, DisposableStore, dispose, IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { IWorkerClient, Proxied } from '../../../../../base/common/worker/simpleWorker.js';
+import { createWebWorker } from '../../../../../base/browser/defaultWorkerFactory.js';
+import { NotebookCellTextModel } from '../../common/model/notebookCellTextModel.js';
+import { CellUri, IMainCellDto, INotebookDiffResult, NotebookCellsChangeType, NotebookRawContentEventDto } from '../../common/notebookCommon.js';
+import { INotebookService } from '../../common/notebookService.js';
+import { NotebookEditorSimpleWorker } from '../../common/services/notebookSimpleWorker.js';
+import { INotebookEditorWorkerService } from '../../common/services/notebookWorkerService.js';
+import { IModelService } from '../../../../../editor/common/services/model.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
+import { TextModel } from '../../../../../editor/common/model/textModel.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { isEqual } from '../../../../../base/common/resources.js';
 
 export class NotebookEditorWorkerServiceImpl extends Disposable implements INotebookEditorWorkerService {
 	declare readonly _serviceBrand: undefined;
@@ -20,11 +24,12 @@ export class NotebookEditorWorkerServiceImpl extends Disposable implements INote
 	private readonly _workerManager: WorkerManager;
 
 	constructor(
-		@INotebookService notebookService: INotebookService
+		@INotebookService notebookService: INotebookService,
+		@IModelService modelService: IModelService,
 	) {
 		super();
 
-		this._workerManager = this._register(new WorkerManager(notebookService));
+		this._workerManager = this._register(new WorkerManager(notebookService, modelService));
 	}
 	canComputeDiff(original: URI, modified: URI): boolean {
 		throw new Error('Method not implemented.');
@@ -48,7 +53,8 @@ class WorkerManager extends Disposable {
 	// private _lastWorkerUsedTime: number;
 
 	constructor(
-		private readonly _notebookService: INotebookService
+		private readonly _notebookService: INotebookService,
+		private readonly _modelService: IModelService,
 	) {
 		super();
 		this._editorWorkerClient = null;
@@ -58,24 +64,20 @@ class WorkerManager extends Disposable {
 	withWorker(): Promise<NotebookWorkerClient> {
 		// this._lastWorkerUsedTime = (new Date()).getTime();
 		if (!this._editorWorkerClient) {
-			this._editorWorkerClient = new NotebookWorkerClient(this._notebookService, 'notebookEditorWorkerService');
+			this._editorWorkerClient = new NotebookWorkerClient(this._notebookService, this._modelService);
 		}
 		return Promise.resolve(this._editorWorkerClient);
 	}
 }
 
-interface IWorkerClient<W> {
-	getProxyObject(): Promise<W>;
-	dispose(): void;
-}
-
 class NotebookEditorModelManager extends Disposable {
 	private _syncedModels: { [modelUrl: string]: IDisposable } = Object.create(null);
 	private _syncedModelsLastUsedTime: { [modelUrl: string]: number } = Object.create(null);
 
 	constructor(
-		private readonly _proxy: NotebookEditorSimpleWorker,
-		private readonly _notebookService: INotebookService
+		private readonly _proxy: Proxied<NotebookEditorSimpleWorker>,
+		private readonly _notebookService: INotebookService,
+		private readonly _modelService: IModelService,
 	) {
 		super();
 	}
@@ -101,23 +103,22 @@ class NotebookEditorModelManager extends Disposable {
 
 		const modelUrl = resource.toString();
 
-		this._proxy.acceptNewModel(
+		this._proxy.$acceptNewModel(
 			model.uri.toString(),
-			{
-				cells: model.cells.map(cell => ({
-					handle: cell.handle,
-					uri: cell.uri,
-					source: cell.getValue(),
-					eol: cell.textBuffer.getEOL(),
-					language: cell.language,
-					mime: cell.mime,
-					cellKind: cell.cellKind,
-					outputs: cell.outputs.map(op => ({ outputId: op.outputId, outputs: op.outputs })),
-					metadata: cell.metadata,
-					internalMetadata: cell.internalMetadata,
-				})),
-				metadata: model.metadata
-			}
+			model.metadata,
+			model.cells.map(cell => ({
+				handle: cell.handle,
+				url: cell.uri.toString(),
+				source: cell.textBuffer.getLinesContent(),
+				eol: cell.textBuffer.getEOL(),
+				versionId: cell.textModel?.getVersionId() ?? 0,
+				language: cell.language,
+				mime: cell.mime,
+				cellKind: cell.cellKind,
+				outputs: cell.outputs.map(op => ({ outputId: op.outputId, outputs: op.outputs })),
+				metadata: cell.metadata,
+				internalMetadata: cell.internalMetadata,
+			}))
 		);
 
 		const toDispose = new DisposableStore();
@@ -125,9 +126,10 @@ class NotebookEditorModelManager extends Disposable {
 		const cellToDto = (cell: NotebookCellTextModel): IMainCellDto => {
 			return {
 				handle: cell.handle,
-				uri: cell.uri,
+				url: cell.uri.toString(),
 				source: cell.textBuffer.getLinesContent(),
 				eol: cell.textBuffer.getEOL(),
+				versionId: 0,
 				language: cell.language,
 				cellKind: cell.cellKind,
 				outputs: cell.outputs.map(op => ({ outputId: op.outputId, outputs: op.outputs })),
@@ -136,32 +138,78 @@ class NotebookEditorModelManager extends Disposable {
 			};
 		};
 
+		const cellHandlers = new Set<NotebookCellTextModel>();
+		const addCellContentChangeHandler = (cell: NotebookCellTextModel) => {
+			cellHandlers.add(cell);
+			toDispose.add(cell.onDidChangeContent((e) => {
+				if (typeof e === 'object' && e.type === 'model') {
+					this._proxy.$acceptCellModelChanged(modelUrl, cell.handle, e.event);
+				}
+			}));
+		};
+
+		model.cells.forEach(cell => addCellContentChangeHandler(cell));
+		// Possible some of the models have not yet been loaded.
+		// If all have been loaded, for all cells, then no need to listen to model add events.
+		if (model.cells.length !== cellHandlers.size) {
+			toDispose.add(this._modelService.onModelAdded((textModel: ITextModel) => {
+				if (textModel.uri.scheme !== Schemas.vscodeNotebookCell || !(textModel instanceof TextModel)) {
+					return;
+				}
+				const cellUri = CellUri.parse(textModel.uri);
+				if (!cellUri || !isEqual(cellUri.notebook, model.uri)) {
+					return;
+				}
+				const cell = model.cells.find(cell => cell.handle === cellUri.handle);
+				if (cell) {
+					addCellContentChangeHandler(cell);
+				}
+			}));
+		}
+
 		toDispose.add(model.onDidChangeContent((event) => {
-			const dto = event.rawEvents.map(e => {
-				const data =
-					e.kind === NotebookCellsChangeType.ModelChange || e.kind === NotebookCellsChangeType.Initialize
-						? {
-							kind: e.kind,
-							versionId: event.versionId,
-							changes: e.changes.map(diff => [diff[0], diff[1], diff[2].map(cell => cellToDto(cell as NotebookCellTextModel))] as [number, number, IMainCellDto[]])
-						}
-						: (
-							e.kind === NotebookCellsChangeType.Move
-								? {
-									kind: e.kind,
-									index: e.index,
-									length: e.length,
-									newIdx: e.newIdx,
-									versionId: event.versionId,
-									cells: e.cells.map(cell => cellToDto(cell as NotebookCellTextModel))
+			const dto: NotebookRawContentEventDto[] = [];
+			event.rawEvents
+				.forEach(e => {
+					switch (e.kind) {
+						case NotebookCellsChangeType.ModelChange:
+						case NotebookCellsChangeType.Initialize: {
+							dto.push({
+								kind: e.kind,
+								changes: e.changes.map(diff => [diff[0], diff[1], diff[2].map(cell => cellToDto(cell as NotebookCellTextModel))] as [number, number, IMainCellDto[]])
+							});
+
+							for (const change of e.changes) {
+								for (const cell of change[2]) {
+									addCellContentChangeHandler(cell as NotebookCellTextModel);
 								}
-								: e
-						);
+							}
+							break;
+						}
+						case NotebookCellsChangeType.Move: {
+							dto.push({
+								kind: NotebookCellsChangeType.Move,
+								index: e.index,
+								length: e.length,
+								newIdx: e.newIdx,
+								cells: e.cells.map(cell => cellToDto(cell as NotebookCellTextModel))
+							});
+							break;
+						}
+						case NotebookCellsChangeType.ChangeCellContent:
+							// Changes to cell content are handled by the cell model change listener.
+							break;
+						case NotebookCellsChangeType.ChangeDocumentMetadata:
+							dto.push({
+								kind: e.kind,
+								metadata: e.metadata
+							});
+						default:
+							dto.push(e);
+					}
+				});
 
-				return data;
-			});
-
-			this._proxy.acceptModelChanged(modelUrl.toString(), {
+			this._proxy.$acceptModelChanged(modelUrl.toString(), {
 				rawEvents: dto,
 				versionId: event.versionId
 			});
@@ -171,7 +219,7 @@ class NotebookEditorModelManager extends Disposable {
 			this._stopModelSync(modelUrl);
 		}));
 		toDispose.add(toDisposable(() => {
-			this._proxy.acceptRemovedModel(modelUrl);
+			this._proxy.$acceptRemovedModel(modelUrl);
 		}));
 
 		this._syncedModels[modelUrl] = toDispose;
@@ -185,72 +233,47 @@ class NotebookEditorModelManager extends Disposable {
 	}
 }
 
-class NotebookWorkerHost implements INotebookWorkerHost {
-
-	private readonly _workerClient: NotebookWorkerClient;
-
-	constructor(workerClient: NotebookWorkerClient) {
-		this._workerClient = workerClient;
-	}
-
-	// foreign host request
-	public fhr(method: string, args: any[]): Promise<any> {
-		return this._workerClient.fhr(method, args);
-	}
-}
-
 class NotebookWorkerClient extends Disposable {
 	private _worker: IWorkerClient<NotebookEditorSimpleWorker> | null;
-	private readonly _workerFactory: DefaultWorkerFactory;
 	private _modelManager: NotebookEditorModelManager | null;
 
 
-	constructor(private readonly _notebookService: INotebookService, label: string) {
+	constructor(private readonly _notebookService: INotebookService, private readonly _modelService: IModelService) {
 		super();
-		this._workerFactory = new DefaultWorkerFactory(label);
 		this._worker = null;
 		this._modelManager = null;
 
 	}
 
-	// foreign host request
-	public fhr(method: string, args: any[]): Promise<any> {
-		throw new Error(`Not implemented!`);
-	}
-
 	computeDiff(original: URI, modified: URI) {
-		return this._withSyncedResources([original, modified]).then(proxy => {
-			return proxy.computeDiff(original.toString(), modified.toString());
-		});
+		const proxy = this._ensureSyncedResources([original, modified]);
+		return proxy.$computeDiff(original.toString(), modified.toString());
 	}
 
 	canPromptRecommendation(modelUri: URI) {
-		return this._withSyncedResources([modelUri]).then(proxy => {
-			return proxy.canPromptRecommendation(modelUri.toString());
-		});
+		const proxy = this._ensureSyncedResources([modelUri]);
+		return proxy.$canPromptRecommendation(modelUri.toString());
 	}
 
-	private _getOrCreateModelManager(proxy: NotebookEditorSimpleWorker): NotebookEditorModelManager {
+	private _getOrCreateModelManager(proxy: Proxied<NotebookEditorSimpleWorker>): NotebookEditorModelManager {
 		if (!this._modelManager) {
-			this._modelManager = this._register(new NotebookEditorModelManager(proxy, this._notebookService));
+			this._modelManager = this._register(new NotebookEditorModelManager(proxy, this._notebookService, this._modelService));
 		}
 		return this._modelManager;
 	}
 
-	protected _withSyncedResources(resources: URI[]): Promise<NotebookEditorSimpleWorker> {
-		return this._getProxy().then((proxy) => {
-			this._getOrCreateModelManager(proxy).ensureSyncedResources(resources);
-			return proxy;
-		});
+	protected _ensureSyncedResources(resources: URI[]): Proxied<NotebookEditorSimpleWorker> {
+		const proxy = this._getOrCreateWorker().proxy;
+		this._getOrCreateModelManager(proxy).ensureSyncedResources(resources);
+		return proxy;
 	}
 
 	private _getOrCreateWorker(): IWorkerClient<NotebookEditorSimpleWorker> {
 		if (!this._worker) {
 			try {
-				this._worker = this._register(new SimpleWorkerClient<NotebookEditorSimpleWorker, NotebookWorkerHost>(
-					this._workerFactory,
+				this._worker = this._register(createWebWorker<NotebookEditorSimpleWorker>(
 					'vs/workbench/contrib/notebook/common/services/notebookSimpleWorker',
-					new NotebookWorkerHost(this)
+					'NotebookEditorWorker'
 				));
 			} catch (err) {
 				// logOnceWebWorkerWarning(err);
@@ -260,15 +283,4 @@ class NotebookWorkerClient extends Disposable {
 		}
 		return this._worker;
 	}
-
-	protected _getProxy(): Promise<NotebookEditorSimpleWorker> {
-		return this._getOrCreateWorker().getProxyObject().then(undefined, (err) => {
-			// logOnceWebWorkerWarning(err);
-			// this._worker = new SynchronousWorkerClient(new EditorSimpleWorker(new EditorWorkerHost(this), null));
-			// return this._getOrCreateWorker().getProxyObject();
-			throw (err);
-		});
-	}
-
-
 }
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellPart.ts b/src/vs/workbench/contrib/notebook/browser/view/cellPart.ts
index 546637fae83..374050e94db 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellPart.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellPart.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Disposable, DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
-import { ICellViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CellViewModelStateChangeEvent } from 'vs/workbench/contrib/notebook/browser/notebookViewEvents';
-import { ICellExecutionStateChangedEvent } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
+import * as DOM from '../../../../../base/browser/dom.js';
+import { onUnexpectedError } from '../../../../../base/common/errors.js';
+import { Disposable, DisposableStore, MutableDisposable } from '../../../../../base/common/lifecycle.js';
+import { ICellViewModel } from '../notebookBrowser.js';
+import { CellViewModelStateChangeEvent } from '../notebookViewEvents.js';
+import { ICellExecutionStateChangedEvent } from '../../common/notebookExecutionStateService.js';
 
 /**
  * A content part is a non-floating element that is rendered inside a cell.
@@ -16,7 +16,7 @@ import { ICellExecutionStateChangedEvent } from 'vs/workbench/contrib/notebook/c
  */
 export abstract class CellContentPart extends Disposable {
 	protected currentCell: ICellViewModel | undefined;
-	protected readonly cellDisposables = new DisposableStore();
+	protected readonly cellDisposables = this._register(new DisposableStore());
 
 	constructor() {
 		super();
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellActionView.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellActionView.ts
index bfb757be79c..f9b8bb771c5 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellActionView.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellActionView.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import * as types from 'vs/base/common/types';
-import { EventType as TouchEventType } from 'vs/base/browser/touch';
-import { IActionViewItemProvider } from 'vs/base/browser/ui/actionbar/actionbar';
-import { IActionProvider } from 'vs/base/browser/ui/dropdown/dropdown';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
-import { IAction } from 'vs/base/common/actions';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IMenuEntryActionViewItemOptions, MenuEntryActionViewItem, SubmenuEntryActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { MenuItemAction, SubmenuItemAction } from 'vs/platform/actions/common/actions';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import type { IManagedHover } from 'vs/base/browser/ui/hover/hover';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import * as DOM from '../../../../../../base/browser/dom.js';
+import * as types from '../../../../../../base/common/types.js';
+import { EventType as TouchEventType } from '../../../../../../base/browser/touch.js';
+import { IActionViewItemProvider } from '../../../../../../base/browser/ui/actionbar/actionbar.js';
+import { IActionProvider } from '../../../../../../base/browser/ui/dropdown/dropdown.js';
+import { getDefaultHoverDelegate } from '../../../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { renderLabelWithIcons } from '../../../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { IAction } from '../../../../../../base/common/actions.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { IMenuEntryActionViewItemOptions, MenuEntryActionViewItem, SubmenuEntryActionViewItem } from '../../../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { MenuItemAction, SubmenuItemAction } from '../../../../../../platform/actions/common/actions.js';
+import { IContextMenuService } from '../../../../../../platform/contextview/browser/contextView.js';
+import { IKeybindingService } from '../../../../../../platform/keybinding/common/keybinding.js';
+import { IThemeService } from '../../../../../../platform/theme/common/themeService.js';
+import type { IManagedHover } from '../../../../../../base/browser/ui/hover/hover.js';
+import { IHoverService } from '../../../../../../platform/hover/browser/hover.js';
 
 export class CodiconActionViewItem extends MenuEntryActionViewItem {
 
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellComments.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellComments.ts
index b8ccbf07abf..bddd86c74ae 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellComments.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellComments.ts
@@ -3,32 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { coalesce } from 'vs/base/common/arrays';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { EDITOR_FONT_DEFAULTS, IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import * as languages from 'vs/editor/common/languages';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ICommentService } from 'vs/workbench/contrib/comments/browser/commentService';
-import { CommentThreadWidget } from 'vs/workbench/contrib/comments/browser/commentThreadWidget';
-import { ICellViewModel, INotebookEditorDelegate } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CellContentPart } from 'vs/workbench/contrib/notebook/browser/view/cellPart';
-import { CodeCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
-import { CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
+import { coalesce } from '../../../../../../base/common/arrays.js';
+import { DisposableMap, DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { EDITOR_FONT_DEFAULTS, IEditorOptions } from '../../../../../../editor/common/config/editorOptions.js';
+import * as languages from '../../../../../../editor/common/languages.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { IThemeService } from '../../../../../../platform/theme/common/themeService.js';
+import { ICommentService, INotebookCommentInfo } from '../../../../comments/browser/commentService.js';
+import { CommentThreadWidget } from '../../../../comments/browser/commentThreadWidget.js';
+import { ICellViewModel, INotebookEditorDelegate } from '../../notebookBrowser.js';
+import { CellContentPart } from '../cellPart.js';
+import { ICellRange } from '../../../common/notebookRange.js';
 
 export class CellComments extends CellContentPart {
-	private _initialized: boolean = false;
-	private _commentThreadWidget: CommentThreadWidget<ICellRange> | null = null;
-	private currentElement: CodeCellViewModel | undefined;
-	private readonly commentTheadDisposables = this._register(new DisposableStore());
+	// keyed by threadId
+	private readonly _commentThreadWidgets: DisposableMap<string, { widget: CommentThreadWidget<ICellRange>; dispose: () => void }>;
+	private currentElement: ICellViewModel | undefined;
 
 	constructor(
 		private readonly notebookEditor: INotebookEditorDelegate,
 		private readonly container: HTMLElement,
-
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IThemeService private readonly themeService: IThemeService,
 		@ICommentService private readonly commentService: ICommentService,
@@ -38,6 +34,8 @@ export class CellComments extends CellContentPart {
 		super();
 		this.container.classList.add('review-widget');
 
+		this._register(this._commentThreadWidgets = new DisposableMap<string, { widget: CommentThreadWidget<ICellRange>; dispose: () => void }>());
+
 		this._register(this.themeService.onDidColorThemeChange(this._applyTheme, this));
 		// TODO @rebornix onDidChangeLayout (font change)
 		// this._register(this.notebookEditor.onDidchangeLa)
@@ -45,22 +43,17 @@ export class CellComments extends CellContentPart {
 	}
 
 	private async initialize(element: ICellViewModel) {
-		if (this._initialized) {
+		if (this.currentElement === element) {
 			return;
 		}
 
-		this._initialized = true;
-		const info = await this._getCommentThreadForCell(element);
-
-		if (info) {
-			await this._createCommentTheadWidget(info.owner, info.thread);
-		}
+		this.currentElement = element;
+		await this._updateThread();
 	}
 
 	private async _createCommentTheadWidget(owner: string, commentThread: languages.CommentThread<ICellRange>) {
-		this._commentThreadWidget?.dispose();
-		this.commentTheadDisposables.clear();
-		this._commentThreadWidget = this.instantiationService.createInstance(
+		const widgetDisposables = new DisposableStore();
+		const widget = this.instantiationService.createInstance(
 			CommentThreadWidget,
 			this.container,
 			this.notebookEditor,
@@ -81,47 +74,50 @@ export class CellComments extends CellContentPart {
 				collapse: () => { }
 			}
 		) as unknown as CommentThreadWidget<ICellRange>;
+		widgetDisposables.add(widget);
+		this._commentThreadWidgets.set(commentThread.threadId, { widget, dispose: () => widgetDisposables.dispose() });
 
 		const layoutInfo = this.notebookEditor.getLayoutInfo();
 
-		await this._commentThreadWidget.display(layoutInfo.fontInfo.lineHeight, true);
+		await widget.display(layoutInfo.fontInfo.lineHeight, true);
 		this._applyTheme();
 
-		this.commentTheadDisposables.add(this._commentThreadWidget.onDidResize(() => {
-			if (this.currentElement?.cellKind === CellKind.Code && this._commentThreadWidget) {
-				this.currentElement.commentHeight = this._calculateCommentThreadHeight(this._commentThreadWidget.getDimensions().height);
+		widgetDisposables.add(widget.onDidResize(() => {
+			if (this.currentElement) {
+				this.currentElement.commentHeight = this._calculateCommentThreadHeight(widget.getDimensions().height);
 			}
 		}));
 	}
 
 	private _bindListeners() {
-		this.cellDisposables.add(this.commentService.onDidUpdateCommentThreads(async () => {
-			if (this.currentElement) {
-				const info = await this._getCommentThreadForCell(this.currentElement);
-				if (!this._commentThreadWidget && info) {
-					await this._createCommentTheadWidget(info.owner, info.thread);
-					const layoutInfo = (this.currentElement as CodeCellViewModel).layoutInfo;
-					this.container.style.top = `${layoutInfo.outputContainerOffset + layoutInfo.outputTotalHeight}px`;
-					this.currentElement.commentHeight = this._calculateCommentThreadHeight(this._commentThreadWidget!.getDimensions().height);
-					return;
-				}
+		this.cellDisposables.add(this.commentService.onDidUpdateCommentThreads(async () => this._updateThread()));
+	}
 
-				if (this._commentThreadWidget) {
-					if (!info) {
-						this._commentThreadWidget.dispose();
-						this.currentElement.commentHeight = 0;
-						return;
-					}
-					if (this._commentThreadWidget.commentThread === info.thread) {
-						this.currentElement.commentHeight = this._calculateCommentThreadHeight(this._commentThreadWidget.getDimensions().height);
-						return;
-					}
-
-					await this._commentThreadWidget.updateCommentThread(info.thread);
-					this.currentElement.commentHeight = this._calculateCommentThreadHeight(this._commentThreadWidget.getDimensions().height);
+	private async _updateThread() {
+		if (!this.currentElement) {
+			return;
+		}
+		const infos = await this._getCommentThreadsForCell(this.currentElement);
+		const widgetsToDelete = new Set(this._commentThreadWidgets.keys());
+		const layoutInfo = this.currentElement.layoutInfo;
+		this.container.style.top = `${layoutInfo.commentOffset}px`;
+		for (const info of infos) {
+			if (!info) { continue; }
+			for (const thread of info.threads) {
+				widgetsToDelete.delete(thread.threadId);
+				const widget = this._commentThreadWidgets.get(thread.threadId)?.widget;
+				if (widget) {
+					await widget.updateCommentThread(thread);
+				} else {
+					await this._createCommentTheadWidget(info.uniqueOwner, thread);
 				}
 			}
-		}));
+		}
+		for (const threadId of widgetsToDelete) {
+			this._commentThreadWidgets.deleteAndDispose(threadId);
+		}
+		this._updateHeight();
+
 	}
 
 	private _calculateCommentThreadHeight(bodyHeight: number) {
@@ -134,45 +130,47 @@ export class CellComments extends CellContentPart {
 
 		const computedHeight = headHeight + bodyHeight + arrowHeight + frameThickness + 8 /** margin bottom to avoid margin collapse */;
 		return computedHeight;
-
 	}
 
-	private async _getCommentThreadForCell(element: ICellViewModel): Promise<{ thread: languages.CommentThread<ICellRange>; owner: string } | null> {
+	private _updateHeight() {
+		if (!this.currentElement) {
+			return;
+		}
+		let height = 0;
+		for (const { widget } of this._commentThreadWidgets.values()) {
+			height += this._calculateCommentThreadHeight(widget.getDimensions().height);
+		}
+		this.currentElement.commentHeight = height;
+	}
+
+	private async _getCommentThreadsForCell(element: ICellViewModel): Promise<(INotebookCommentInfo | null)[]> {
 		if (this.notebookEditor.hasModel()) {
-			const commentInfos = coalesce(await this.commentService.getNotebookComments(element.uri));
-			if (commentInfos.length && commentInfos[0].threads.length) {
-				return { owner: commentInfos[0].uniqueOwner, thread: commentInfos[0].threads[0] };
-			}
+			return coalesce(await this.commentService.getNotebookComments(element.uri));
 		}
 
-		return null;
+		return [];
 	}
 
 	private _applyTheme() {
 		const theme = this.themeService.getColorTheme();
 		const fontInfo = this.notebookEditor.getLayoutInfo().fontInfo;
-		this._commentThreadWidget?.applyTheme(theme, fontInfo);
+		for (const { widget } of this._commentThreadWidgets.values()) {
+			widget.applyTheme(theme, fontInfo);
+		}
 	}
 
 	override didRenderCell(element: ICellViewModel): void {
-		if (element.cellKind === CellKind.Code) {
-			this.currentElement = element as CodeCellViewModel;
-			this.initialize(element);
-			this._bindListeners();
-		}
-
+		this.initialize(element);
+		this._bindListeners();
 	}
 
 	override prepareLayout(): void {
-		if (this.currentElement?.cellKind === CellKind.Code && this._commentThreadWidget) {
-			this.currentElement.commentHeight = this._calculateCommentThreadHeight(this._commentThreadWidget.getDimensions().height);
-		}
+		this._updateHeight();
 	}
 
 	override updateInternalLayoutNow(element: ICellViewModel): void {
-		if (this.currentElement?.cellKind === CellKind.Code && this._commentThreadWidget) {
-			const layoutInfo = (element as CodeCellViewModel).layoutInfo;
-			this.container.style.top = `${layoutInfo.outputContainerOffset + layoutInfo.outputTotalHeight}px`;
+		if (this.currentElement) {
+			this.container.style.top = `${element.layoutInfo.commentOffset}px`;
 		}
 	}
 }
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellContextKeys.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellContextKeys.ts
index e1713a81178..833605ad37b 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellContextKeys.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellContextKeys.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { autorun } from 'vs/base/common/observable';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { NotebookChatController } from 'vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController';
-import { CellEditState, CellFocusMode, ICellViewModel, INotebookEditorDelegate } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CellViewModelStateChangeEvent } from 'vs/workbench/contrib/notebook/browser/notebookViewEvents';
-import { CellContentPart } from 'vs/workbench/contrib/notebook/browser/view/cellPart';
-import { CodeCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
-import { MarkupCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/markupCellViewModel';
-import { NotebookCellExecutionState } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { NotebookCellExecutionStateContext, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_CELL_EDITOR_FOCUSED, NOTEBOOK_CELL_EXECUTING, NOTEBOOK_CELL_EXECUTION_STATE, NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_INPUT_COLLAPSED, NOTEBOOK_CELL_LINE_NUMBERS, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CELL_OUTPUT_COLLAPSED, NOTEBOOK_CELL_RESOURCE, NOTEBOOK_CELL_TYPE, NOTEBOOK_CELL_GENERATED_BY_CHAT, NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { INotebookExecutionStateService, NotebookExecutionType } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
+import { Disposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { autorun } from '../../../../../../base/common/observable.js';
+import { IContextKey, IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { NotebookChatController } from '../../controller/chat/notebookChatController.js';
+import { CellEditState, CellFocusMode, ICellViewModel, INotebookEditorDelegate } from '../../notebookBrowser.js';
+import { CellViewModelStateChangeEvent } from '../../notebookViewEvents.js';
+import { CellContentPart } from '../cellPart.js';
+import { CodeCellViewModel } from '../../viewModel/codeCellViewModel.js';
+import { MarkupCellViewModel } from '../../viewModel/markupCellViewModel.js';
+import { NotebookCellExecutionState } from '../../../common/notebookCommon.js';
+import { NotebookCellExecutionStateContext, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_CELL_EDITOR_FOCUSED, NOTEBOOK_CELL_EXECUTING, NOTEBOOK_CELL_EXECUTION_STATE, NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_INPUT_COLLAPSED, NOTEBOOK_CELL_LINE_NUMBERS, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CELL_OUTPUT_COLLAPSED, NOTEBOOK_CELL_RESOURCE, NOTEBOOK_CELL_TYPE, NOTEBOOK_CELL_GENERATED_BY_CHAT, NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS } from '../../../common/notebookContextKeys.js';
+import { INotebookExecutionStateService, NotebookExecutionType } from '../../../common/notebookExecutionStateService.js';
 
 export class CellContextKeyPart extends CellContentPart {
 	private cellContextKeyManager: CellContextKeyManager;
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellDecorations.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellDecorations.ts
index 04c63a56d45..98340a20af7 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellDecorations.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellDecorations.ts
@@ -3,12 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { ICellViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CellContentPart } from 'vs/workbench/contrib/notebook/browser/view/cellPart';
+import * as DOM from '../../../../../../base/browser/dom.js';
+import { ICellViewModel, INotebookEditorDelegate } from '../../notebookBrowser.js';
+import { CellContentPart } from '../cellPart.js';
 
 export class CellDecorations extends CellContentPart {
 	constructor(
+		readonly notebookEditor: INotebookEditorDelegate,
 		readonly rootContainer: HTMLElement,
 		readonly decorationContainer: HTMLElement,
 	) {
@@ -46,5 +47,47 @@ export class CellDecorations extends CellContentPart {
 		}));
 
 		generateCellTopDecorations();
+		this.registerDecorations();
+	}
+
+	private registerDecorations() {
+		if (!this.currentCell) {
+			return;
+		}
+
+		this.cellDisposables.add(this.currentCell.onCellDecorationsChanged((e) => {
+			e.added.forEach(options => {
+				if (options.className && this.currentCell) {
+					this.rootContainer.classList.add(options.className);
+					this.notebookEditor.deltaCellContainerClassNames(this.currentCell.id, [options.className], []);
+				}
+
+				if (options.outputClassName && this.currentCell) {
+					this.notebookEditor.deltaCellContainerClassNames(this.currentCell.id, [options.outputClassName], []);
+				}
+			});
+
+			e.removed.forEach(options => {
+				if (options.className && this.currentCell) {
+					this.rootContainer.classList.remove(options.className);
+					this.notebookEditor.deltaCellContainerClassNames(this.currentCell.id, [], [options.className]);
+				}
+
+				if (options.outputClassName && this.currentCell) {
+					this.notebookEditor.deltaCellContainerClassNames(this.currentCell.id, [], [options.outputClassName]);
+				}
+			});
+		}));
+
+		this.currentCell.getCellDecorations().forEach(options => {
+			if (options.className && this.currentCell) {
+				this.rootContainer.classList.add(options.className);
+				this.notebookEditor.deltaCellContainerClassNames(this.currentCell.id, [options.className], []);
+			}
+
+			if (options.outputClassName && this.currentCell) {
+				this.notebookEditor.deltaCellContainerClassNames(this.currentCell.id, [options.outputClassName], []);
+			}
+		});
 	}
 }
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellDnd.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellDnd.ts
index 407fc5eaa81..c43ed3236bf 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellDnd.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellDnd.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { Delayer } from 'vs/base/common/async';
-import { Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import * as platform from 'vs/base/common/platform';
-import { expandCellRangesWithHiddenCells, ICellViewModel, INotebookEditorDelegate } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CellViewModelStateChangeEvent } from 'vs/workbench/contrib/notebook/browser/notebookViewEvents';
-import { CellContentPart } from 'vs/workbench/contrib/notebook/browser/view/cellPart';
-import { BaseCellRenderTemplate, INotebookCellList } from 'vs/workbench/contrib/notebook/browser/view/notebookRenderingCommon';
-import { cloneNotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
-import { CellEditType, ICellMoveEdit, SelectionStateType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { cellRangesToIndexes, ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
+import * as DOM from '../../../../../../base/browser/dom.js';
+import { Delayer } from '../../../../../../base/common/async.js';
+import { Disposable, MutableDisposable } from '../../../../../../base/common/lifecycle.js';
+import * as platform from '../../../../../../base/common/platform.js';
+import { expandCellRangesWithHiddenCells, ICellViewModel, INotebookEditorDelegate } from '../../notebookBrowser.js';
+import { CellViewModelStateChangeEvent } from '../../notebookViewEvents.js';
+import { CellContentPart } from '../cellPart.js';
+import { BaseCellRenderTemplate, INotebookCellList } from '../notebookRenderingCommon.js';
+import { cloneNotebookCellTextModel } from '../../../common/model/notebookCellTextModel.js';
+import { CellEditType, ICellMoveEdit, SelectionStateType } from '../../../common/notebookCommon.js';
+import { cellRangesToIndexes, ICellRange } from '../../../common/notebookRange.js';
 
 const $ = DOM.$;
 
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellDragRenderer.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellDragRenderer.ts
index 51defe19e49..b02c85371d4 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellDragRenderer.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellDragRenderer.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { createTrustedTypesPolicy } from 'vs/base/browser/trustedTypes';
-import { Color } from 'vs/base/common/color';
-import * as platform from 'vs/base/common/platform';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Range } from 'vs/editor/common/core/range';
-import { ColorId } from 'vs/editor/common/encodedTokenAttributes';
-import * as languages from 'vs/editor/common/languages';
-import { tokenizeLineToHTML } from 'vs/editor/common/languages/textToHtmlTokenizer';
-import { ITextModel } from 'vs/editor/common/model';
-import { BaseCellRenderTemplate } from 'vs/workbench/contrib/notebook/browser/view/notebookRenderingCommon';
+import * as DOM from '../../../../../../base/browser/dom.js';
+import { createTrustedTypesPolicy } from '../../../../../../base/browser/trustedTypes.js';
+import { Color } from '../../../../../../base/common/color.js';
+import * as platform from '../../../../../../base/common/platform.js';
+import { ICodeEditor } from '../../../../../../editor/browser/editorBrowser.js';
+import { EditorOption } from '../../../../../../editor/common/config/editorOptions.js';
+import { Range } from '../../../../../../editor/common/core/range.js';
+import { ColorId } from '../../../../../../editor/common/encodedTokenAttributes.js';
+import * as languages from '../../../../../../editor/common/languages.js';
+import { tokenizeLineToHTML } from '../../../../../../editor/common/languages/textToHtmlTokenizer.js';
+import { ITextModel } from '../../../../../../editor/common/model.js';
+import { BaseCellRenderTemplate } from '../notebookRenderingCommon.js';
 
 class EditorTextRenderer {
 
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions.ts
index 345a7a0e492..743fdc10a26 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { URI } from 'vs/base/common/uri';
-import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { localize, localize2 } from 'vs/nls';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { ActiveEditorContext } from 'vs/workbench/common/contextkeys';
-import { INotebookCellToolbarActionContext, INotebookCommandContext, NotebookMultiCellAction, NOTEBOOK_ACTIONS_CATEGORY } from 'vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { IBaseCellEditorOptions, ICellViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NOTEBOOK_CELL_LINE_NUMBERS, NOTEBOOK_EDITOR_FOCUSED } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { CellContentPart } from 'vs/workbench/contrib/notebook/browser/view/cellPart';
-import { NotebookCellInternalMetadata, NOTEBOOK_EDITOR_ID } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { NotebookOptions } from 'vs/workbench/contrib/notebook/browser/notebookOptions';
-import { CellViewModelStateChangeEvent } from 'vs/workbench/contrib/notebook/browser/notebookViewEvents';
-import { ITextModelUpdateOptions } from 'vs/editor/common/model';
+import { Emitter, Event } from '../../../../../../base/common/event.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { IEditorOptions } from '../../../../../../editor/common/config/editorOptions.js';
+import { localize, localize2 } from '../../../../../../nls.js';
+import { Action2, MenuId, registerAction2 } from '../../../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from '../../../../../../platform/configuration/common/configurationRegistry.js';
+import { ContextKeyExpr } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { ServicesAccessor } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { Registry } from '../../../../../../platform/registry/common/platform.js';
+import { ActiveEditorContext } from '../../../../../common/contextkeys.js';
+import { INotebookCellToolbarActionContext, INotebookCommandContext, NotebookMultiCellAction, NOTEBOOK_ACTIONS_CATEGORY } from '../../controller/coreActions.js';
+import { IBaseCellEditorOptions, ICellViewModel } from '../../notebookBrowser.js';
+import { NOTEBOOK_CELL_LINE_NUMBERS, NOTEBOOK_EDITOR_FOCUSED } from '../../../common/notebookContextKeys.js';
+import { CellContentPart } from '../cellPart.js';
+import { NotebookCellInternalMetadata, NOTEBOOK_EDITOR_ID } from '../../../common/notebookCommon.js';
+import { NotebookOptions } from '../../notebookOptions.js';
+import { CellViewModelStateChangeEvent } from '../../notebookViewEvents.js';
+import { ITextModelUpdateOptions } from '../../../../../../editor/common/model.js';
 
 //todo@Yoyokrazy implenets is needed or not?
 export class CellEditorOptions extends CellContentPart implements ITextModelUpdateOptions {
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellExecution.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellExecution.ts
index d5c27d01001..11611c7448f 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellExecution.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellExecution.ts
@@ -3,14 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { disposableTimeout } from 'vs/base/common/async';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ICellViewModel, INotebookEditorDelegate } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CellViewModelStateChangeEvent } from 'vs/workbench/contrib/notebook/browser/notebookViewEvents';
-import { CellContentPart } from 'vs/workbench/contrib/notebook/browser/view/cellPart';
-import { NotebookCellInternalMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
+import * as DOM from '../../../../../../base/browser/dom.js';
+import { disposableTimeout } from '../../../../../../base/common/async.js';
+import { DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { clamp } from '../../../../../../base/common/numbers.js';
+import { ICellViewModel, INotebookEditorDelegate } from '../../notebookBrowser.js';
+import { CellViewModelStateChangeEvent } from '../../notebookViewEvents.js';
+import { CellContentPart } from '../cellPart.js';
+import { CodeCellViewModel } from '../../viewModel/codeCellViewModel.js';
+import { NotebookCellInternalMetadata } from '../../../common/notebookCommon.js';
+import { INotebookExecutionStateService } from '../../../common/notebookExecutionStateService.js';
 
 const UPDATE_EXECUTION_ORDER_GRACE_PERIOD = 200;
 
@@ -39,6 +41,10 @@ export class CellExecutionPart extends CellContentPart {
 				this.updateExecutionOrder(this.currentCell.internalMetadata);
 			}
 		}));
+
+		this._register(this._notebookEditor.onDidScroll(() => {
+			this._updatePosition();
+		}));
 	}
 
 	override didRenderCell(element: ICellViewModel): void {
@@ -74,12 +80,38 @@ export class CellExecutionPart extends CellContentPart {
 	}
 
 	override updateInternalLayoutNow(element: ICellViewModel): void {
-		if (element.isInputCollapsed) {
-			DOM.hide(this._executionOrderLabel);
-		} else {
-			DOM.show(this._executionOrderLabel);
-			const top = element.layoutInfo.editorHeight - 22 + element.layoutInfo.statusBarHeight;
-			this._executionOrderLabel.style.top = `${top}px`;
+		this._updatePosition();
+	}
+
+	private _updatePosition() {
+		if (this.currentCell) {
+			if (this.currentCell.isInputCollapsed) {
+				DOM.hide(this._executionOrderLabel);
+			} else {
+				DOM.show(this._executionOrderLabel);
+				let top = this.currentCell.layoutInfo.editorHeight - 22 + this.currentCell.layoutInfo.statusBarHeight;
+
+				if (this.currentCell instanceof CodeCellViewModel) {
+					const elementTop = this._notebookEditor.getAbsoluteTopOfElement(this.currentCell);
+					const editorBottom = elementTop + this.currentCell.layoutInfo.outputContainerOffset;
+					// another approach to avoid the flicker caused by sticky scroll is manually calculate the scrollBottom:
+					// const scrollBottom = this._notebookEditor.scrollTop + this._notebookEditor.getLayoutInfo().height - 26 - this._notebookEditor.getLayoutInfo().stickyHeight;
+					const scrollBottom = this._notebookEditor.scrollBottom;
+
+					const lineHeight = 22;
+					if (scrollBottom <= editorBottom) {
+						const offset = editorBottom - scrollBottom;
+						top -= offset;
+						top = clamp(
+							top,
+							lineHeight + 12, // line height + padding for single line
+							this.currentCell.layoutInfo.editorHeight - lineHeight + this.currentCell.layoutInfo.statusBarHeight
+						);
+					}
+				}
+
+				this._executionOrderLabel.style.top = `${top}px`;
+			}
 		}
 	}
 }
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellFocus.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellFocus.ts
index f7df5d49e59..eed77c75c9d 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellFocus.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellFocus.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { INotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CellContentPart } from 'vs/workbench/contrib/notebook/browser/view/cellPart';
-import { CodeCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
+import * as DOM from '../../../../../../base/browser/dom.js';
+import { INotebookEditor } from '../../notebookBrowser.js';
+import { CellContentPart } from '../cellPart.js';
+import { CodeCellViewModel } from '../../viewModel/codeCellViewModel.js';
 
 export class CellFocusPart extends CellContentPart {
 	constructor(
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellFocusIndicator.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellFocusIndicator.ts
index 189ef50f166..2990a60008a 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellFocusIndicator.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellFocusIndicator.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { FastDomNode } from 'vs/base/browser/fastDomNode';
-import { CodeCellLayoutInfo, ICellViewModel, INotebookEditorDelegate } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CellContentPart } from 'vs/workbench/contrib/notebook/browser/view/cellPart';
-import { CellTitleToolbarPart } from 'vs/workbench/contrib/notebook/browser/view/cellParts/cellToolbars';
-import { CodeCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
-import { MarkupCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/markupCellViewModel';
-import { CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import * as DOM from '../../../../../../base/browser/dom.js';
+import { FastDomNode } from '../../../../../../base/browser/fastDomNode.js';
+import { CodeCellLayoutInfo, ICellViewModel, INotebookEditorDelegate } from '../../notebookBrowser.js';
+import { CellContentPart } from '../cellPart.js';
+import { CellTitleToolbarPart } from './cellToolbars.js';
+import { CodeCellViewModel } from '../../viewModel/codeCellViewModel.js';
+import { MarkupCellViewModel } from '../../viewModel/markupCellViewModel.js';
+import { CellKind } from '../../../common/notebookCommon.js';
 
 export class CellFocusIndicator extends CellContentPart {
 	public codeFocusIndicator: FastDomNode<HTMLElement>;
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellOutput.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellOutput.ts
index f864ea9345d..e561cf6e626 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellOutput.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellOutput.ts
@@ -3,38 +3,37 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { FastDomNode } from 'vs/base/browser/fastDomNode';
-import { renderMarkdown } from 'vs/base/browser/markdownRenderer';
-import { Action, IAction } from 'vs/base/common/actions';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { MarshalledId } from 'vs/base/common/marshallingIds';
-import * as nls from 'vs/nls';
-import { createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { WorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
-import { IMenuService, MenuId } from 'vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { ViewContainerLocation } from 'vs/workbench/common/views';
-import { IExtensionsViewPaneContainer, VIEWLET_ID as EXTENSION_VIEWLET_ID } from 'vs/workbench/contrib/extensions/common/extensions';
-import { ICellOutputViewModel, ICellViewModel, IInsetRenderOutput, INotebookEditorDelegate, JUPYTER_EXTENSION_ID, RenderOutputType } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { mimetypeIcon } from 'vs/workbench/contrib/notebook/browser/notebookIcons';
-import { CellContentPart } from 'vs/workbench/contrib/notebook/browser/view/cellPart';
-import { CodeCellRenderTemplate } from 'vs/workbench/contrib/notebook/browser/view/notebookRenderingCommon';
-import { CodeCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { CellUri, IOrderedMimeType, NotebookCellExecutionState, NotebookCellOutputsSplice, RENDERER_NOT_AVAILABLE, isTextStreamMime } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
-import { INotebookKernel } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
-import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { COPY_OUTPUT_COMMAND_ID } from 'vs/workbench/contrib/notebook/browser/controller/cellOutputActions';
-import { CLEAR_CELL_OUTPUTS_COMMAND_ID } from 'vs/workbench/contrib/notebook/browser/controller/editActions';
-import { TEXT_BASED_MIMETYPES } from 'vs/workbench/contrib/notebook/browser/contrib/clipboard/cellOutputClipboard';
+import * as DOM from '../../../../../../base/browser/dom.js';
+import { FastDomNode } from '../../../../../../base/browser/fastDomNode.js';
+import { renderMarkdown } from '../../../../../../base/browser/markdownRenderer.js';
+import { Action, IAction } from '../../../../../../base/common/actions.js';
+import { IMarkdownString } from '../../../../../../base/common/htmlContent.js';
+import { Disposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { MarshalledId } from '../../../../../../base/common/marshallingIds.js';
+import * as nls from '../../../../../../nls.js';
+import { createAndFillInActionBarActions } from '../../../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { WorkbenchToolBar } from '../../../../../../platform/actions/browser/toolbar.js';
+import { IMenuService, MenuId } from '../../../../../../platform/actions/common/actions.js';
+import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { IOpenerService } from '../../../../../../platform/opener/common/opener.js';
+import { IQuickInputService, IQuickPickItem } from '../../../../../../platform/quickinput/common/quickInput.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { IExtensionsWorkbenchService } from '../../../../extensions/common/extensions.js';
+import { ICellOutputViewModel, ICellViewModel, IInsetRenderOutput, INotebookEditorDelegate, JUPYTER_EXTENSION_ID, RenderOutputType } from '../../notebookBrowser.js';
+import { mimetypeIcon } from '../../notebookIcons.js';
+import { CellContentPart } from '../cellPart.js';
+import { CodeCellRenderTemplate } from '../notebookRenderingCommon.js';
+import { CodeCellViewModel } from '../../viewModel/codeCellViewModel.js';
+import { NotebookTextModel } from '../../../common/model/notebookTextModel.js';
+import { CellUri, IOrderedMimeType, NotebookCellExecutionState, NotebookCellOutputsSplice, RENDERER_NOT_AVAILABLE, isTextStreamMime } from '../../../common/notebookCommon.js';
+import { INotebookExecutionStateService } from '../../../common/notebookExecutionStateService.js';
+import { INotebookKernel } from '../../../common/notebookKernelService.js';
+import { INotebookService } from '../../../common/notebookService.js';
+import { COPY_OUTPUT_COMMAND_ID } from '../../controller/cellOutputActions.js';
+import { TEXT_BASED_MIMETYPES } from '../../contrib/clipboard/cellOutputClipboard.js';
+import { autorun, observableValue } from '../../../../../../base/common/observable.js';
+import { NOTEBOOK_CELL_HAS_HIDDEN_OUTPUTS, NOTEBOOK_CELL_IS_FIRST_OUTPUT } from '../../../common/notebookContextKeys.js';
 
 interface IMimeTypeRenderer extends IQuickPickItem {
 	index: number;
@@ -60,13 +59,14 @@ interface IRenderResult {
 //  |                        |  #cell-output-toolbar
 //  |                        |  #output-element
 class CellOutputElement extends Disposable {
-	private readonly _renderDisposableStore = this._register(new DisposableStore());
+	private readonly toolbarDisposables = this._register(new DisposableStore());
 
 	innerContainer?: HTMLElement;
 	renderedOutputContainer!: HTMLElement;
 	renderResult?: IInsetRenderOutput;
 
 	private readonly contextKeyService: IContextKeyService;
+	private toolbarAttached = false;
 
 	constructor(
 		private notebookEditor: INotebookEditorDelegate,
@@ -78,7 +78,7 @@ class CellOutputElement extends Disposable {
 		@IQuickInputService private readonly quickInputService: IQuickInputService,
 		@IContextKeyService parentContextKeyService: IContextKeyService,
 		@IMenuService private readonly menuService: IMenuService,
-		@IPaneCompositePartService private readonly paneCompositeService: IPaneCompositePartService,
+		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 	) {
 		super();
@@ -151,7 +151,7 @@ class CellOutputElement extends Disposable {
 		} else {
 			// Another mimetype or renderer is picked, we need to clear the current output and re-render
 			const nextElement = this.innerContainer.nextElementSibling;
-			this._renderDisposableStore.clear();
+			this.toolbarDisposables.clear();
 			const element = this.innerContainer;
 			if (element) {
 				element.remove();
@@ -207,7 +207,20 @@ class CellOutputElement extends Disposable {
 		}
 
 		const innerContainer = this._generateInnerOutputContainer(previousSibling, selectedPresentation);
-		this._attachToolbar(innerContainer, notebookTextModel, this.notebookEditor.activeKernel, index, mimeTypes);
+		if (index === 0 || this.output.visible.get()) {
+			this._attachToolbar(innerContainer, notebookTextModel, this.notebookEditor.activeKernel, index, mimeTypes);
+		} else {
+			this._register(autorun((reader) => {
+				const visible = reader.readObservable(this.output.visible);
+				if (visible && !this.toolbarAttached) {
+					this._attachToolbar(innerContainer, notebookTextModel, this.notebookEditor.activeKernel, index, mimeTypes);
+				} else if (!visible) {
+					this.toolbarDisposables.clear();
+				}
+				this.cellOutputContainer.checkForHiddenOutputs();
+			}));
+			this.cellOutputContainer.hasHiddenOutputs.set(true, undefined);
+		}
 
 		this.renderedOutputContainer = DOM.append(innerContainer, DOM.$('.rendered-output'));
 
@@ -291,14 +304,12 @@ class CellOutputElement extends Disposable {
 			return;
 		}
 
-		const useConsolidatedButton = this.notebookEditor.notebookOptions.getDisplayOptions().consolidatedOutputButton;
-
 		outputItemDiv.style.position = 'relative';
 		const mimeTypePicker = DOM.$('.cell-output-toolbar');
 
 		outputItemDiv.appendChild(mimeTypePicker);
 
-		const toolbar = this._renderDisposableStore.add(this.instantiationService.createInstance(WorkbenchToolBar, mimeTypePicker, {
+		const toolbar = this.toolbarDisposables.add(this.instantiationService.createInstance(WorkbenchToolBar, mimeTypePicker, {
 			renderDropdownAsChildElement: false
 		}));
 		toolbar.context = {
@@ -310,20 +321,22 @@ class CellOutputElement extends Disposable {
 		};
 
 		// TODO: This could probably be a real registered action, but it has to talk to this output element
-		const pickAction = new Action('notebook.output.pickMimetype', nls.localize('pickMimeType', "Change Presentation"), ThemeIcon.asClassName(mimetypeIcon), undefined,
-			async _context => this._pickActiveMimeTypeRenderer(outputItemDiv, notebookTextModel, kernel, this.output));
+		const pickAction = this.toolbarDisposables.add(new Action('notebook.output.pickMimetype', nls.localize('pickMimeType', "Change Presentation"), ThemeIcon.asClassName(mimetypeIcon), undefined,
+			async _context => this._pickActiveMimeTypeRenderer(outputItemDiv, notebookTextModel, kernel, this.output)));
+
+		const menuContextKeyService = this.toolbarDisposables.add(this.contextKeyService.createScoped(outputItemDiv));
+		const hasHiddenOutputs = NOTEBOOK_CELL_HAS_HIDDEN_OUTPUTS.bindTo(menuContextKeyService);
+		const isFirstCellOutput = NOTEBOOK_CELL_IS_FIRST_OUTPUT.bindTo(menuContextKeyService);
+		isFirstCellOutput.set(index === 0);
+		this.toolbarDisposables.add(autorun((reader) => { hasHiddenOutputs.set(reader.readObservable(this.cellOutputContainer.hasHiddenOutputs)); }));
+		const menu = this.toolbarDisposables.add(this.menuService.createMenu(MenuId.NotebookOutputToolbar, menuContextKeyService));
 
-		const menu = this._renderDisposableStore.add(this.menuService.createMenu(MenuId.NotebookOutputToolbar, this.contextKeyService));
 		const updateMenuToolbar = () => {
 			const primary: IAction[] = [];
 			let secondary: IAction[] = [];
 			const result = { primary, secondary };
 
-			createAndFillInActionBarActions(menu, { shouldForwardArgs: true }, result, () => false);
-			if (index > 0 || !useConsolidatedButton) {
-				// clear outputs should only appear in the first output item's menu
-				secondary = secondary.filter((action) => action.id !== CLEAR_CELL_OUTPUTS_COMMAND_ID);
-			}
+			createAndFillInActionBarActions(menu!, { shouldForwardArgs: true }, result, () => false);
 			if (!isCopyEnabled) {
 				secondary = secondary.filter((action) => action.id !== COPY_OUTPUT_COMMAND_ID);
 			}
@@ -334,8 +347,7 @@ class CellOutputElement extends Disposable {
 			toolbar.setActions([], secondary);
 		};
 		updateMenuToolbar();
-		this._renderDisposableStore.add(menu.onDidChange(updateMenuToolbar));
-
+		this.toolbarDisposables.add(menu.onDidChange(updateMenuToolbar));
 	}
 
 	private async _pickActiveMimeTypeRenderer(outputItemDiv: HTMLElement, notebookTextModel: NotebookTextModel, kernel: INotebookKernel | undefined, viewModel: ICellOutputViewModel) {
@@ -367,7 +379,8 @@ class CellOutputElement extends Disposable {
 			});
 		}
 
-		const picker = this.quickInputService.createQuickPick();
+		const disposables = new DisposableStore();
+		const picker = disposables.add(this.quickInputService.createQuickPick({ useSeparators: true }));
 		picker.items = [
 			...items,
 			{ type: 'separator' },
@@ -379,10 +392,10 @@ class CellOutputElement extends Disposable {
 			: nls.localize('promptChooseMimeType.placeHolder', "Select mimetype to render for current output");
 
 		const pick = await new Promise<IMimeTypeRenderer | undefined>(resolve => {
-			picker.onDidAccept(() => {
+			disposables.add(picker.onDidAccept(() => {
 				resolve(picker.selectedItems.length === 1 ? (picker.selectedItems[0] as IMimeTypeRenderer) : undefined);
-				picker.dispose();
-			});
+				disposables.dispose();
+			}));
 			picker.show();
 		});
 
@@ -397,7 +410,7 @@ class CellOutputElement extends Disposable {
 
 		// user chooses another mimetype
 		const nextElement = outputItemDiv.nextElementSibling;
-		this._renderDisposableStore.clear();
+		this.toolbarDisposables.clear();
 		const element = this.innerContainer;
 		if (element) {
 			element.remove();
@@ -415,9 +428,7 @@ class CellOutputElement extends Disposable {
 	}
 
 	private async _showJupyterExtension() {
-		const viewlet = await this.paneCompositeService.openPaneComposite(EXTENSION_VIEWLET_ID, ViewContainerLocation.Sidebar, true);
-		const view = viewlet?.getViewPaneContainer() as IExtensionsViewPaneContainer | undefined;
-		view?.search(`@id:${JUPYTER_EXTENSION_ID}`);
+		await this.extensionsWorkbenchService.openSearch(`@id:${JUPYTER_EXTENSION_ID}`);
 	}
 
 	private _generateRendererInfo(renderId: string): string {
@@ -479,6 +490,15 @@ export class CellOutputContainer extends CellContentPart {
 	private _outputEntries: OutputEntryViewHandler[] = [];
 	private _hasStaleOutputs: boolean = false;
 
+	hasHiddenOutputs = observableValue<boolean>('hasHiddenOutputs', false);
+	checkForHiddenOutputs() {
+		if (this._outputEntries.find(entry => { return entry.model.visible; })) {
+			this.hasHiddenOutputs.set(true, undefined);
+		} else {
+			this.hasHiddenOutputs.set(false, undefined);
+		}
+	}
+
 	get renderedOutputEntries() {
 		return this._outputEntries;
 	}
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellProgressBar.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellProgressBar.ts
index 6b4ac184e7b..1e0397bc4a3 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellProgressBar.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellProgressBar.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
-import { defaultProgressBarStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { ICellViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CellViewModelStateChangeEvent } from 'vs/workbench/contrib/notebook/browser/notebookViewEvents';
-import { CellContentPart } from 'vs/workbench/contrib/notebook/browser/view/cellPart';
-import { NotebookCellExecutionState } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { ICellExecutionStateChangedEvent, INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
+import { ProgressBar } from '../../../../../../base/browser/ui/progressbar/progressbar.js';
+import { defaultProgressBarStyles } from '../../../../../../platform/theme/browser/defaultStyles.js';
+import { ICellViewModel } from '../../notebookBrowser.js';
+import { CellViewModelStateChangeEvent } from '../../notebookViewEvents.js';
+import { CellContentPart } from '../cellPart.js';
+import { NotebookCellExecutionState } from '../../../common/notebookCommon.js';
+import { ICellExecutionStateChangedEvent, INotebookExecutionStateService } from '../../../common/notebookExecutionStateService.js';
 
 export class CellProgressBar extends CellContentPart {
 	private readonly _progressBar: ProgressBar;
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellStatusPart.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellStatusPart.ts
index a4514e41d4d..f58ff0aa23f 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellStatusPart.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellStatusPart.ts
@@ -3,35 +3,35 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { SimpleIconLabel } from 'vs/base/browser/ui/iconLabel/simpleIconLabel';
-import { WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from 'vs/base/common/actions';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { Emitter, Event } from 'vs/base/common/event';
-import { stripIcons } from 'vs/base/common/iconLabels';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { Disposable, DisposableStore, dispose } from 'vs/base/common/lifecycle';
-import { MarshalledId } from 'vs/base/common/marshallingIds';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { isThemeColor } from 'vs/editor/common/editorCommon';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ThemeColor } from 'vs/base/common/themables';
-import { INotebookCellActionContext } from 'vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { CellFocusMode, ICellViewModel, INotebookEditorDelegate } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CellContentPart } from 'vs/workbench/contrib/notebook/browser/view/cellPart';
-import { ClickTargetType, IClickTarget } from 'vs/workbench/contrib/notebook/browser/view/cellParts/cellWidgets';
-import { CodeCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
-import { CellStatusbarAlignment, INotebookCellStatusBarItem } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { IHoverDelegate, IHoverDelegateOptions } from 'vs/base/browser/ui/hover/hoverDelegate';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { HoverPosition } from 'vs/base/browser/ui/hover/hoverWidget';
-import type { IManagedHoverTooltipMarkdownString } from 'vs/base/browser/ui/hover/hover';
+import * as DOM from '../../../../../../base/browser/dom.js';
+import { StandardKeyboardEvent } from '../../../../../../base/browser/keyboardEvent.js';
+import { SimpleIconLabel } from '../../../../../../base/browser/ui/iconLabel/simpleIconLabel.js';
+import { WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from '../../../../../../base/common/actions.js';
+import { toErrorMessage } from '../../../../../../base/common/errorMessage.js';
+import { Emitter, Event } from '../../../../../../base/common/event.js';
+import { stripIcons } from '../../../../../../base/common/iconLabels.js';
+import { KeyCode } from '../../../../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore, dispose } from '../../../../../../base/common/lifecycle.js';
+import { MarshalledId } from '../../../../../../base/common/marshallingIds.js';
+import { ICodeEditor } from '../../../../../../editor/browser/editorBrowser.js';
+import { isThemeColor } from '../../../../../../editor/common/editorCommon.js';
+import { ICommandService } from '../../../../../../platform/commands/common/commands.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { INotificationService } from '../../../../../../platform/notification/common/notification.js';
+import { ITelemetryService } from '../../../../../../platform/telemetry/common/telemetry.js';
+import { IThemeService } from '../../../../../../platform/theme/common/themeService.js';
+import { ThemeColor } from '../../../../../../base/common/themables.js';
+import { INotebookCellActionContext } from '../../controller/coreActions.js';
+import { CellFocusMode, ICellViewModel, INotebookEditorDelegate } from '../../notebookBrowser.js';
+import { CellContentPart } from '../cellPart.js';
+import { ClickTargetType, IClickTarget } from './cellWidgets.js';
+import { CodeCellViewModel } from '../../viewModel/codeCellViewModel.js';
+import { CellStatusbarAlignment, INotebookCellStatusBarItem } from '../../../common/notebookCommon.js';
+import { IHoverDelegate, IHoverDelegateOptions } from '../../../../../../base/browser/ui/hover/hoverDelegate.js';
+import { IHoverService } from '../../../../../../platform/hover/browser/hover.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { HoverPosition } from '../../../../../../base/browser/ui/hover/hoverWidget.js';
+import type { IManagedHoverTooltipMarkdownString } from '../../../../../../base/browser/ui/hover/hover.js';
 
 const $ = DOM.$;
 
@@ -105,7 +105,17 @@ export class CellEditorStatusBar extends CellContentPart {
 					event: e
 				});
 			} else {
-				if ((e.target as HTMLElement).classList.contains('cell-status-item-has-command')) {
+				const target = e.target;
+				let itemHasCommand = false;
+				if (target && DOM.isHTMLElement(target)) {
+					const targetElement = <HTMLElement>target;
+					if (targetElement.classList.contains('cell-status-item-has-command')) {
+						itemHasCommand = true;
+					} else if (targetElement.parentElement && targetElement.parentElement.classList.contains('cell-status-item-has-command')) {
+						itemHasCommand = true;
+					}
+				}
+				if (itemHasCommand) {
 					this._onDidClick.fire({
 						type: ClickTargetType.ContributedCommandItem,
 						event: e
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellToolbarStickyScroll.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellToolbarStickyScroll.ts
index f425ea10dcb..548fae02c0a 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellToolbarStickyScroll.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellToolbarStickyScroll.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { clamp } from 'vs/base/common/numbers';
-import { ICellViewModel, INotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { clamp } from '../../../../../../base/common/numbers.js';
+import { ICellViewModel, INotebookEditor } from '../../notebookBrowser.js';
 
 export function registerCellToolbarStickyScroll(notebookEditor: INotebookEditor, cell: ICellViewModel, element: HTMLElement, opts?: { extraOffset?: number; min?: number }): IDisposable {
 	const extraOffset = opts?.extraOffset ?? 0;
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellToolbars.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellToolbars.ts
index 36911bfbdbb..4f33acf6f21 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellToolbars.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellToolbars.ts
@@ -3,27 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar';
-import { IAction } from 'vs/base/common/actions';
-import { disposableTimeout } from 'vs/base/common/async';
-import { Emitter, Event } from 'vs/base/common/event';
-import { MarshalledId } from 'vs/base/common/marshallingIds';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { createActionViewItem, createAndFillInActionBarActions, MenuEntryActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IMenu, IMenuService, MenuId, MenuItemAction } from 'vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { INotebookCellActionContext } from 'vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { ICellViewModel, INotebookEditorDelegate } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CodiconActionViewItem } from 'vs/workbench/contrib/notebook/browser/view/cellParts/cellActionView';
-import { CellOverlayPart } from 'vs/workbench/contrib/notebook/browser/view/cellPart';
-import { registerCellToolbarStickyScroll } from 'vs/workbench/contrib/notebook/browser/view/cellParts/cellToolbarStickyScroll';
-import { WorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
-import { createInstantHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { IHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate';
+import * as DOM from '../../../../../../base/browser/dom.js';
+import { ToolBar } from '../../../../../../base/browser/ui/toolbar/toolbar.js';
+import { IAction } from '../../../../../../base/common/actions.js';
+import { disposableTimeout } from '../../../../../../base/common/async.js';
+import { Emitter, Event } from '../../../../../../base/common/event.js';
+import { MarshalledId } from '../../../../../../base/common/marshallingIds.js';
+import { ServicesAccessor } from '../../../../../../editor/browser/editorExtensions.js';
+import { createActionViewItem, createAndFillInActionBarActions, MenuEntryActionViewItem } from '../../../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IMenu, IMenuService, MenuId, MenuItemAction } from '../../../../../../platform/actions/common/actions.js';
+import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../../../platform/keybinding/common/keybinding.js';
+import { INotebookCellActionContext } from '../../controller/coreActions.js';
+import { ICellViewModel, INotebookEditorDelegate } from '../../notebookBrowser.js';
+import { CodiconActionViewItem } from './cellActionView.js';
+import { CellOverlayPart } from '../cellPart.js';
+import { registerCellToolbarStickyScroll } from './cellToolbarStickyScroll.js';
+import { WorkbenchToolBar } from '../../../../../../platform/actions/browser/toolbar.js';
+import { createInstantHoverDelegate } from '../../../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { IHoverDelegate } from '../../../../../../base/browser/ui/hover/hoverDelegate.js';
 
 export class BetweenCellToolbar extends CellOverlayPart {
 	private _betweenCellToolbar: ToolBar | undefined;
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/chat/cellChatPart.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/chat/cellChatPart.ts
index 059f5ab7b14..8e224e7995d 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/chat/cellChatPart.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/chat/cellChatPart.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ICellViewModel, INotebookEditorDelegate } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CellContentPart } from 'vs/workbench/contrib/notebook/browser/view/cellPart';
+import { ICellViewModel, INotebookEditorDelegate } from '../../../notebookBrowser.js';
+import { CellContentPart } from '../../cellPart.js';
 
 export class CellChatPart extends CellContentPart {
 	// private _controller: NotebookCellChatController | undefined;
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCell.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCell.ts
index 4370f036558..e86ed7e347f 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCell.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCell.ts
@@ -3,34 +3,35 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { raceCancellation } from 'vs/base/common/async';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { Event } from 'vs/base/common/event';
-import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import * as strings from 'vs/base/common/strings';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { IDimension } from 'vs/editor/common/core/dimension';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { tokenizeToStringSync } from 'vs/editor/common/languages/textToHtmlTokenizer';
-import { IReadonlyTextBuffer, ITextModel } from 'vs/editor/common/model';
-import { localize } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { CellFocusMode, EXPAND_CELL_INPUT_COMMAND_ID, IActiveNotebookEditorDelegate } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CellPartsCollection } from 'vs/workbench/contrib/notebook/browser/view/cellPart';
-import { CellEditorOptions } from 'vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions';
-import { CellOutputContainer } from 'vs/workbench/contrib/notebook/browser/view/cellParts/cellOutput';
-import { CollapsedCodeCellExecutionIcon } from 'vs/workbench/contrib/notebook/browser/view/cellParts/codeCellExecutionIcon';
-import { CodeCellRenderTemplate } from 'vs/workbench/contrib/notebook/browser/view/notebookRenderingCommon';
-import { CodeCellViewModel, outputDisplayLimit } from 'vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
-import { INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
-import { WordHighlighterContribution } from 'vs/editor/contrib/wordHighlighter/browser/wordHighlighter';
-import { CodeActionController } from 'vs/editor/contrib/codeAction/browser/codeActionController';
+import { localize } from '../../../../../../nls.js';
+import * as DOM from '../../../../../../base/browser/dom.js';
+import { raceCancellation } from '../../../../../../base/common/async.js';
+import { CancellationTokenSource } from '../../../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { Event } from '../../../../../../base/common/event.js';
+import { Disposable, IDisposable, toDisposable } from '../../../../../../base/common/lifecycle.js';
+import { clamp } from '../../../../../../base/common/numbers.js';
+import * as strings from '../../../../../../base/common/strings.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { EditorOption } from '../../../../../../editor/common/config/editorOptions.js';
+import { IDimension } from '../../../../../../editor/common/core/dimension.js';
+import { ILanguageService } from '../../../../../../editor/common/languages/language.js';
+import { tokenizeToStringSync } from '../../../../../../editor/common/languages/textToHtmlTokenizer.js';
+import { IReadonlyTextBuffer, ITextModel } from '../../../../../../editor/common/model.js';
+import { CodeActionController } from '../../../../../../editor/contrib/codeAction/browser/codeActionController.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../../../platform/keybinding/common/keybinding.js';
+import { IOpenerService } from '../../../../../../platform/opener/common/opener.js';
+import { INotebookExecutionStateService } from '../../../common/notebookExecutionStateService.js';
+import { CellFocusMode, EXPAND_CELL_INPUT_COMMAND_ID, IActiveNotebookEditorDelegate } from '../../notebookBrowser.js';
+import { CodeCellViewModel, outputDisplayLimit } from '../../viewModel/codeCellViewModel.js';
+import { CellPartsCollection } from '../cellPart.js';
+import { NotebookCellEditorPool } from '../notebookCellEditorPool.js';
+import { CodeCellRenderTemplate } from '../notebookRenderingCommon.js';
+import { CellEditorOptions } from './cellEditorOptions.js';
+import { CellOutputContainer } from './cellOutput.js';
+import { CollapsedCodeCellExecutionIcon } from './codeCellExecutionIcon.js';
 
 export class CodeCell extends Disposable {
 	private _outputContainerRenderer: CellOutputContainer;
@@ -48,6 +49,7 @@ export class CodeCell extends Disposable {
 		private readonly notebookEditor: IActiveNotebookEditorDelegate,
 		private readonly viewCell: CodeCellViewModel,
 		private readonly templateData: CodeCellRenderTemplate,
+		private readonly editorPool: NotebookCellEditorPool,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IKeybindingService private readonly keybindingService: IKeybindingService,
 		@IOpenerService openerService: IOpenerService,
@@ -66,9 +68,9 @@ export class CodeCell extends Disposable {
 		this.initializeEditor(editorHeight);
 		this._renderedInputCollapseState = false; // editor is always expanded initially
 
+		this.registerNotebookEditorListeners();
 		this.registerViewCellLayoutChange();
 		this.registerCellEditorEventListeners();
-		this.registerDecorations();
 		this.registerMouseListener();
 
 		this._register(Event.any(this.viewCell.onDidStartExecution, this.viewCell.onDidStopExecution)((e) => {
@@ -264,12 +266,52 @@ export class CodeCell extends Disposable {
 		}
 	}
 
+	private registerNotebookEditorListeners() {
+		this._register(this.notebookEditor.onDidScroll(() => {
+			this.adjustEditorPosition();
+		}));
+
+		this._register(this.notebookEditor.onDidChangeLayout(() => {
+			this.adjustEditorPosition();
+			this.onCellWidthChange();
+		}));
+	}
+
+	private adjustEditorPosition() {
+		const extraOffset = - 6 /** distance to the top of the cell editor, which is 6px under the focus indicator */ - 1 /** border */;
+		const min = 0;
+
+		const scrollTop = this.notebookEditor.scrollTop;
+		const elementTop = this.notebookEditor.getAbsoluteTopOfElement(this.viewCell);
+		const diff = scrollTop - elementTop + extraOffset;
+
+		const notebookEditorLayout = this.notebookEditor.getLayoutInfo();
+
+		// we should stop adjusting the top when users are viewing the bottom of the cell editor
+		const editorMaxHeight = notebookEditorLayout.height
+			- notebookEditorLayout.stickyHeight
+			- 26 /** notebook toolbar */;
+
+		const maxTop =
+			this.viewCell.layoutInfo.editorHeight
+			// + this.viewCell.layoutInfo.statusBarHeight
+			- editorMaxHeight
+			;
+		const top = maxTop > 20 ?
+			clamp(min, diff, maxTop) :
+			min;
+		this.templateData.editorPart.style.top = `${top}px`;
+		// scroll the editor with top
+		this.templateData.editor?.setScrollTop(top);
+	}
+
 	private registerViewCellLayoutChange() {
 		this._register(this.viewCell.onDidChangeLayout((e) => {
 			if (e.outerWidth !== undefined) {
 				const layoutInfo = this.templateData.editor.getLayoutInfo();
 				if (layoutInfo.width !== this.viewCell.layoutInfo.editorWidth) {
 					this.onCellWidthChange();
+					this.adjustEditorPosition();
 				}
 			}
 		}));
@@ -280,6 +322,7 @@ export class CodeCell extends Disposable {
 			if (e.contentHeightChanged) {
 				if (this.viewCell.layoutInfo.editorHeight !== e.contentHeight) {
 					this.onCellEditorHeightChange(e.contentHeight);
+					this.adjustEditorPosition();
 				}
 			}
 		}));
@@ -309,13 +352,9 @@ export class CodeCell extends Disposable {
 		}));
 
 		this._register(this.templateData.editor.onDidBlurEditorWidget(() => {
-			WordHighlighterContribution.get(this.templateData.editor)?.stopHighlighting();
 			CodeActionController.get(this.templateData.editor)?.hideCodeActions();
 			CodeActionController.get(this.templateData.editor)?.hideLightBulbWidget();
 		}));
-		this._register(this.templateData.editor.onDidFocusEditorWidget(() => {
-			WordHighlighterContribution.get(this.templateData.editor)?.restoreViewState(true);
-		}));
 	}
 
 	private _reigsterModelListeners(model: ITextModel) {
@@ -329,41 +368,6 @@ export class CodeCell extends Disposable {
 		}));
 	}
 
-	private registerDecorations() {
-		// Apply decorations
-		this._register(this.viewCell.onCellDecorationsChanged((e) => {
-			e.added.forEach(options => {
-				if (options.className) {
-					this.templateData.rootContainer.classList.add(options.className);
-				}
-
-				if (options.outputClassName) {
-					this.notebookEditor.deltaCellContainerClassNames(this.viewCell.id, [options.outputClassName], []);
-				}
-			});
-
-			e.removed.forEach(options => {
-				if (options.className) {
-					this.templateData.rootContainer.classList.remove(options.className);
-				}
-
-				if (options.outputClassName) {
-					this.notebookEditor.deltaCellContainerClassNames(this.viewCell.id, [], [options.outputClassName]);
-				}
-			});
-		}));
-
-		this.viewCell.getCellDecorations().forEach(options => {
-			if (options.className) {
-				this.templateData.rootContainer.classList.add(options.className);
-			}
-
-			if (options.outputClassName) {
-				this.notebookEditor.deltaCellContainerClassNames(this.viewCell.id, [options.outputClassName], []);
-			}
-		});
-	}
-
 	private registerMouseListener() {
 		this._register(this.templateData.editor.onMouseDown(e => {
 			// prevent default on right mouse click, otherwise it will trigger unexpected focus changes
@@ -374,7 +378,7 @@ export class CodeCell extends Disposable {
 		}));
 	}
 
-	private shouldUpdateDOMFocus() {
+	private shouldPreserveEditor() {
 		// The DOM focus needs to be adjusted:
 		// when a cell editor should be focused
 		// the document active element is inside the notebook editor or the document body (cell editor being disposed previously)
@@ -384,7 +388,7 @@ export class CodeCell extends Disposable {
 	}
 
 	private updateEditorForFocusModeChange(sync: boolean) {
-		if (this.shouldUpdateDOMFocus()) {
+		if (this.shouldPreserveEditor()) {
 			if (sync) {
 				this.templateData.editor?.focus();
 			} else {
@@ -532,7 +536,17 @@ export class CodeCell extends Disposable {
 	}
 
 	private layoutEditor(dimension: IDimension): void {
-		this.templateData.editor?.layout(dimension, true);
+		const editorLayout = this.notebookEditor.getLayoutInfo();
+		const maxHeight = Math.min(
+			editorLayout.height
+			- editorLayout.stickyHeight
+			- 26 /** notebook toolbar */,
+			dimension.height
+		);
+		this.templateData.editor?.layout({
+			width: dimension.width,
+			height: maxHeight
+		}, true);
 	}
 
 	private onCellWidthChange(): void {
@@ -571,8 +585,9 @@ export class CodeCell extends Disposable {
 		this._isDisposed = true;
 
 		// move focus back to the cell list otherwise the focus goes to body
-		if (this.shouldUpdateDOMFocus()) {
-			this.notebookEditor.focusContainer();
+		if (this.shouldPreserveEditor()) {
+			// now the focus is on the monaco editor for the cell but detached from the rows.
+			this.editorPool.preserveFocusedEditor(this.viewCell);
 		}
 
 		this.viewCell.detachTextEditor();
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCellExecutionIcon.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCellExecutionIcon.ts
index b647817b586..e7dcd5fdd70 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCellExecutionIcon.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCellExecutionIcon.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { localize } from 'vs/nls';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { ICellViewModel, INotebookEditorDelegate } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { errorStateIcon, executingStateIcon, pendingStateIcon, successStateIcon } from 'vs/workbench/contrib/notebook/browser/notebookIcons';
-import { NotebookCellExecutionState, NotebookCellInternalMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotebookCellExecution, INotebookExecutionStateService, NotebookExecutionType } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
+import * as DOM from '../../../../../../base/browser/dom.js';
+import { renderLabelWithIcons } from '../../../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { localize } from '../../../../../../nls.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { ICellViewModel, INotebookEditorDelegate } from '../../notebookBrowser.js';
+import { errorStateIcon, executingStateIcon, pendingStateIcon, successStateIcon } from '../../notebookIcons.js';
+import { NotebookCellExecutionState, NotebookCellInternalMetadata } from '../../../common/notebookCommon.js';
+import { INotebookCellExecution, INotebookExecutionStateService, NotebookExecutionType } from '../../../common/notebookExecutionStateService.js';
 
 interface IExecutionItem {
 	text: string;
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCellRunToolbar.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCellRunToolbar.ts
index c6f345362ea..1bdbbade438 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCellRunToolbar.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCellRunToolbar.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar';
-import { Action, IAction } from 'vs/base/common/actions';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { MarshalledId } from 'vs/base/common/marshallingIds';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { localize } from 'vs/nls';
-import { DropdownWithPrimaryActionViewItem } from 'vs/platform/actions/browser/dropdownWithPrimaryActionViewItem';
-import { createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IMenu, IMenuService, MenuItemAction } from 'vs/platform/actions/common/actions';
-import { IContextKeyService, IScopedContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { InputFocusedContext } from 'vs/platform/contextkey/common/contextkeys';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { INotebookCellActionContext } from 'vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { ICellViewModel, INotebookEditorDelegate } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CellContentPart } from 'vs/workbench/contrib/notebook/browser/view/cellPart';
-import { registerCellToolbarStickyScroll } from 'vs/workbench/contrib/notebook/browser/view/cellParts/cellToolbarStickyScroll';
-import { NOTEBOOK_CELL_EXECUTION_STATE, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_TYPE, NOTEBOOK_EDITOR_FOCUSED } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { ToolBar } from '../../../../../../base/browser/ui/toolbar/toolbar.js';
+import { Action, IAction } from '../../../../../../base/common/actions.js';
+import { DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { MarshalledId } from '../../../../../../base/common/marshallingIds.js';
+import { EditorContextKeys } from '../../../../../../editor/common/editorContextKeys.js';
+import { localize } from '../../../../../../nls.js';
+import { DropdownWithPrimaryActionViewItem } from '../../../../../../platform/actions/browser/dropdownWithPrimaryActionViewItem.js';
+import { createAndFillInActionBarActions } from '../../../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IMenu, IMenuService, MenuId, MenuItemAction } from '../../../../../../platform/actions/common/actions.js';
+import { IContextKeyService, IScopedContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { InputFocusedContext } from '../../../../../../platform/contextkey/common/contextkeys.js';
+import { IContextMenuService } from '../../../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../../../platform/keybinding/common/keybinding.js';
+import { INotebookCellActionContext } from '../../controller/coreActions.js';
+import { ICellViewModel, INotebookEditorDelegate } from '../../notebookBrowser.js';
+import { CellContentPart } from '../cellPart.js';
+import { registerCellToolbarStickyScroll } from './cellToolbarStickyScroll.js';
+import { NOTEBOOK_CELL_EXECUTION_STATE, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_TYPE, NOTEBOOK_EDITOR_FOCUSED } from '../../../common/notebookContextKeys.js';
 
 export class RunToolbar extends CellContentPart {
 	private toolbar!: ToolBar;
@@ -34,6 +34,8 @@ export class RunToolbar extends CellContentPart {
 		readonly contextKeyService: IContextKeyService,
 		readonly cellContainer: HTMLElement,
 		readonly runButtonContainer: HTMLElement,
+		primaryMenuId: MenuId,
+		secondaryMenuId: MenuId,
 		@IMenuService menuService: IMenuService,
 		@IKeybindingService private readonly keybindingService: IKeybindingService,
 		@IContextMenuService private readonly contextMenuService: IContextMenuService,
@@ -41,8 +43,8 @@ export class RunToolbar extends CellContentPart {
 	) {
 		super();
 
-		this.primaryMenu = this._register(menuService.createMenu(this.notebookEditor.creationOptions.menuIds.cellExecutePrimary!, contextKeyService));
-		this.secondaryMenu = this._register(menuService.createMenu(this.notebookEditor.creationOptions.menuIds.cellExecuteToolbar, contextKeyService));
+		this.primaryMenu = this._register(menuService.createMenu(primaryMenuId, contextKeyService));
+		this.secondaryMenu = this._register(menuService.createMenu(secondaryMenuId, contextKeyService));
 		this.createRunCellToolbar(runButtonContainer, cellContainer, contextKeyService);
 		const updateActions = () => {
 			const actions = this.getCellToolbarActions(this.primaryMenu);
@@ -105,7 +107,6 @@ export class RunToolbar extends CellContentPart {
 					dropdownAction,
 					secondary,
 					'notebook-cell-run-toolbar',
-					this.contextMenuService,
 					{
 						..._options,
 						getKeyBinding: keybindingProvider
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/collapsedCellInput.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/collapsedCellInput.ts
index ceee7ec9ff9..85593cd4e50 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/collapsedCellInput.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/collapsedCellInput.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { INotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CellContentPart } from 'vs/workbench/contrib/notebook/browser/view/cellPart';
+import * as DOM from '../../../../../../base/browser/dom.js';
+import { INotebookEditor } from '../../notebookBrowser.js';
+import { CellContentPart } from '../cellPart.js';
 
 export class CollapsedCellInput extends CellContentPart {
 	constructor(
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/collapsedCellOutput.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/collapsedCellOutput.ts
index 4994eae4f62..b78216262f0 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/collapsedCellOutput.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/collapsedCellOutput.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { localize } from 'vs/nls';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { EXPAND_CELL_OUTPUT_COMMAND_ID, INotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CellContentPart } from 'vs/workbench/contrib/notebook/browser/view/cellPart';
+import * as DOM from '../../../../../../base/browser/dom.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { localize } from '../../../../../../nls.js';
+import { IKeybindingService } from '../../../../../../platform/keybinding/common/keybinding.js';
+import { EXPAND_CELL_OUTPUT_COMMAND_ID, INotebookEditor } from '../../notebookBrowser.js';
+import { CellContentPart } from '../cellPart.js';
 
 const $ = DOM.$;
 
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/foldedCellHint.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/foldedCellHint.ts
index 04d42f4ad1e..dcdc2ed972a 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/foldedCellHint.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/foldedCellHint.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { localize } from 'vs/nls';
-import { FoldingController } from 'vs/workbench/contrib/notebook/browser/controller/foldingController';
-import { CellEditState, CellFoldingState, INotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CellContentPart } from 'vs/workbench/contrib/notebook/browser/view/cellPart';
-import { MarkupCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/markupCellViewModel';
-import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
-import { executingStateIcon } from 'vs/workbench/contrib/notebook/browser/notebookIcons';
-import { INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
-import { CellKind, NotebookCellExecutionState } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { MutableDisposable } from 'vs/base/common/lifecycle';
+import * as DOM from '../../../../../../base/browser/dom.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { localize } from '../../../../../../nls.js';
+import { FoldingController } from '../../controller/foldingController.js';
+import { CellEditState, CellFoldingState, INotebookEditor } from '../../notebookBrowser.js';
+import { CellContentPart } from '../cellPart.js';
+import { MarkupCellViewModel } from '../../viewModel/markupCellViewModel.js';
+import { ICellRange } from '../../../common/notebookRange.js';
+import { executingStateIcon } from '../../notebookIcons.js';
+import { INotebookExecutionStateService } from '../../../common/notebookExecutionStateService.js';
+import { CellKind, NotebookCellExecutionState } from '../../../common/notebookCommon.js';
+import { MutableDisposable } from '../../../../../../base/common/lifecycle.js';
 
 export class FoldedCellHint extends CellContentPart {
 
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/markupCell.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/markupCell.ts
index 7fbe705a0a0..1797591072f 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/markupCell.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/markupCell.ts
@@ -3,33 +3,33 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { renderIcon } from 'vs/base/browser/ui/iconLabel/iconLabels';
-import { disposableTimeout, raceCancellation } from 'vs/base/common/async';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { Disposable, DisposableStore, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { tokenizeToStringSync } from 'vs/editor/common/languages/textToHtmlTokenizer';
-import { IReadonlyTextBuffer } from 'vs/editor/common/model';
-import { localize } from 'vs/nls';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { CellEditState, CellFocusMode, CellFoldingState, EXPAND_CELL_INPUT_COMMAND_ID, IActiveNotebookEditorDelegate, ICellViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { collapsedIcon, expandedIcon } from 'vs/workbench/contrib/notebook/browser/notebookIcons';
-import { CellEditorOptions } from 'vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions';
-import { MarkdownCellRenderTemplate } from 'vs/workbench/contrib/notebook/browser/view/notebookRenderingCommon';
-import { MarkupCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/markupCellViewModel';
-import { WordHighlighterContribution } from 'vs/editor/contrib/wordHighlighter/browser/wordHighlighter';
+import * as DOM from '../../../../../../base/browser/dom.js';
+import { renderIcon } from '../../../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { disposableTimeout, raceCancellation } from '../../../../../../base/common/async.js';
+import { CancellationTokenSource } from '../../../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { Disposable, DisposableStore, MutableDisposable, toDisposable } from '../../../../../../base/common/lifecycle.js';
+import { ICodeEditor } from '../../../../../../editor/browser/editorBrowser.js';
+import { CodeEditorWidget } from '../../../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { IEditorOptions } from '../../../../../../editor/common/config/editorOptions.js';
+import { EditorContextKeys } from '../../../../../../editor/common/editorContextKeys.js';
+import { ILanguageService } from '../../../../../../editor/common/languages/language.js';
+import { tokenizeToStringSync } from '../../../../../../editor/common/languages/textToHtmlTokenizer.js';
+import { IReadonlyTextBuffer } from '../../../../../../editor/common/model.js';
+import { localize } from '../../../../../../nls.js';
+import { IAccessibilityService } from '../../../../../../platform/accessibility/common/accessibility.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../../../../platform/instantiation/common/serviceCollection.js';
+import { IKeybindingService } from '../../../../../../platform/keybinding/common/keybinding.js';
+import { CellEditState, CellFocusMode, CellFoldingState, EXPAND_CELL_INPUT_COMMAND_ID, IActiveNotebookEditorDelegate, ICellViewModel } from '../../notebookBrowser.js';
+import { collapsedIcon, expandedIcon } from '../../notebookIcons.js';
+import { CellEditorOptions } from './cellEditorOptions.js';
+import { MarkdownCellRenderTemplate } from '../notebookRenderingCommon.js';
+import { MarkupCellViewModel } from '../../viewModel/markupCellViewModel.js';
+import { WordHighlighterContribution } from '../../../../../../editor/contrib/wordHighlighter/browser/wordHighlighter.js';
 
 export class MarkupCell extends Disposable {
 
@@ -91,7 +91,6 @@ export class MarkupCell extends Disposable {
 			this.relayoutCell();
 		}
 
-		this.applyDecorations();
 		this.viewUpdate();
 
 		this.layoutCellParts();
@@ -178,7 +177,7 @@ export class MarkupCell extends Disposable {
 		this._register(this.cellEditorOptions.onDidChange(() => this.updateMarkupCellOptions()));
 	}
 
-	private updateMarkupCellOptions(): any {
+	private updateMarkupCellOptions(): void {
 		this.updateEditorOptions(this.cellEditorOptions.getUpdatedValue(this.viewCell.internalMetadata, this.viewCell.uri));
 
 		if (this.editor) {
@@ -222,32 +221,6 @@ export class MarkupCell extends Disposable {
 		this.templateData.container.classList.toggle('cell-editor-focus', this.viewCell.focusMode === CellFocusMode.Editor);
 	}
 
-	private applyDecorations() {
-		// apply decorations
-		this._register(this.viewCell.onCellDecorationsChanged((e) => {
-			e.added.forEach(options => {
-				if (options.className) {
-					this.notebookEditor.deltaCellContainerClassNames(this.viewCell.id, [options.className], []);
-					this.templateData.rootContainer.classList.add(options.className);
-				}
-			});
-
-			e.removed.forEach(options => {
-				if (options.className) {
-					this.notebookEditor.deltaCellContainerClassNames(this.viewCell.id, [], [options.className]);
-					this.templateData.rootContainer.classList.remove(options.className);
-				}
-			});
-		}));
-
-		this.viewCell.getCellDecorations().forEach(options => {
-			if (options.className) {
-				this.notebookEditor.deltaCellContainerClassNames(this.viewCell.id, [options.className], []);
-				this.templateData.rootContainer.classList.add(options.className);
-			}
-		});
-	}
-
 	override dispose() {
 		this._isDisposed = true;
 
diff --git a/src/vs/workbench/contrib/notebook/browser/view/notebookCellAnchor.ts b/src/vs/workbench/contrib/notebook/browser/view/notebookCellAnchor.ts
index 7e1b5d0a13d..b222a0a2153 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/notebookCellAnchor.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/notebookCellAnchor.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { CellFocusMode, ICellViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CodeCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
-import { CellKind, NotebookCellExecutionState, NotebookSetting } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
-import { Event } from 'vs/base/common/event';
-import { ScrollEvent } from 'vs/base/common/scrollable';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IListView } from 'vs/base/browser/ui/list/listView';
-import { CellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl';
+import { IDisposable } from '../../../../../base/common/lifecycle.js';
+import { CellFocusMode, ICellViewModel } from '../notebookBrowser.js';
+import { CodeCellViewModel } from '../viewModel/codeCellViewModel.js';
+import { CellKind, NotebookCellExecutionState, NotebookSetting } from '../../common/notebookCommon.js';
+import { INotebookExecutionStateService } from '../../common/notebookExecutionStateService.js';
+import { Event } from '../../../../../base/common/event.js';
+import { ScrollEvent } from '../../../../../base/common/scrollable.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IListView } from '../../../../../base/browser/ui/list/listView.js';
+import { CellViewModel } from '../viewModel/notebookViewModelImpl.js';
 
 
 export class NotebookCellAnchor implements IDisposable {
diff --git a/src/vs/workbench/contrib/notebook/browser/view/notebookCellEditorPool.ts b/src/vs/workbench/contrib/notebook/browser/view/notebookCellEditorPool.ts
new file mode 100644
index 00000000000..a7d750ea051
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/browser/view/notebookCellEditorPool.ts
@@ -0,0 +1,136 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as DOM from '../../../../../base/browser/dom.js';
+import { CancelablePromise, createCancelablePromise } from '../../../../../base/common/async.js';
+import { Disposable, DisposableStore, MutableDisposable } from '../../../../../base/common/lifecycle.js';
+import { CodeEditorWidget } from '../../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { EditorContextKeys } from '../../../../../editor/common/editorContextKeys.js';
+import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService, IScopedContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
+import { CellFocusMode, ICellViewModel, INotebookEditorDelegate } from '../notebookBrowser.js';
+import { CellEditorOptions } from './cellParts/cellEditorOptions.js';
+
+export class NotebookCellEditorPool extends Disposable {
+	private readonly _focusedEditorDOM: HTMLElement;
+	private readonly _editorDisposable = this._register(new MutableDisposable());
+	private _editorContextKeyService!: IScopedContextKeyService;
+	private _editor!: CodeEditorWidget;
+	private _focusEditorCancellablePromise: CancelablePromise<void> | undefined;
+	private _isInitialized = false;
+	private _isDisposed = false;
+
+	constructor(
+		readonly notebookEditor: INotebookEditorDelegate,
+		private readonly contextKeyServiceProvider: (container: HTMLElement) => IScopedContextKeyService,
+		@ITextModelService private readonly textModelService: ITextModelService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+	) {
+		super();
+
+		this._focusedEditorDOM = this.notebookEditor.getDomNode().appendChild(DOM.$('.cell-editor-part-cache'));
+		this._focusedEditorDOM.style.position = 'absolute';
+		this._focusedEditorDOM.style.top = '-50000px';
+		this._focusedEditorDOM.style.width = '1px';
+		this._focusedEditorDOM.style.height = '1px';
+	}
+
+	private _initializeEditor(cell: ICellViewModel) {
+		this._editorContextKeyService = this._register(this.contextKeyServiceProvider(this._focusedEditorDOM));
+
+		const editorContainer = DOM.prepend(this._focusedEditorDOM, DOM.$('.cell-editor-container'));
+		const editorInstaService = this._register(this._instantiationService.createChild(new ServiceCollection([IContextKeyService, this._editorContextKeyService])));
+		EditorContextKeys.inCompositeEditor.bindTo(this._editorContextKeyService).set(true);
+		const editorOptions = new CellEditorOptions(this.notebookEditor.getBaseCellEditorOptions(cell.language), this.notebookEditor.notebookOptions, this._configurationService);
+
+		this._editor = this._register(editorInstaService.createInstance(CodeEditorWidget, editorContainer, {
+			...editorOptions.getDefaultValue(),
+			dimension: {
+				width: 0,
+				height: 0
+			},
+			scrollbar: {
+				vertical: 'hidden',
+				horizontal: 'auto',
+				handleMouseWheel: false,
+				useShadows: false,
+			},
+		}, {
+			contributions: this.notebookEditor.creationOptions.cellEditorContributions
+		}));
+
+		this._isInitialized = true;
+	}
+
+	preserveFocusedEditor(cell: ICellViewModel): void {
+		if (!this._isInitialized) {
+			this._initializeEditor(cell);
+		}
+
+		this._editorDisposable.clear();
+		this._focusEditorCancellablePromise?.cancel();
+
+		this._focusEditorCancellablePromise = createCancelablePromise(async token => {
+			const ref = await this.textModelService.createModelReference(cell.uri);
+
+			if (this._isDisposed || token.isCancellationRequested) {
+				ref.dispose();
+				return;
+			}
+
+			const editorDisposable = new DisposableStore();
+			editorDisposable.add(ref);
+			this._editor.setModel(ref.object.textEditorModel);
+			this._editor.setSelections(cell.getSelections());
+			this._editor.focus();
+
+			const _update = () => {
+				const editorSelections = this._editor.getSelections();
+				if (editorSelections) {
+					cell.setSelections(editorSelections);
+				}
+
+				this.notebookEditor.revealInView(cell);
+				this._editor.setModel(null);
+				ref.dispose();
+			};
+
+			editorDisposable.add(this._editor.onDidChangeModelContent((e) => {
+				_update();
+			}));
+
+			editorDisposable.add(this._editor.onDidChangeCursorSelection(e => {
+				if (e.source === 'keyboard' || e.source === 'mouse') {
+					_update();
+				}
+			}));
+
+			editorDisposable.add(this.notebookEditor.onDidChangeActiveEditor(() => {
+				const latestActiveCell = this.notebookEditor.getActiveCell();
+
+				if (latestActiveCell !== cell || latestActiveCell.focusMode !== CellFocusMode.Editor) {
+					// focus moves to another cell or cell container
+					// we should stop preserving the editor
+					this._editorDisposable.clear();
+					this._editor.setModel(null);
+					ref.dispose();
+				}
+			}));
+
+			this._editorDisposable.value = editorDisposable;
+		});
+	}
+
+	override dispose() {
+		this._isDisposed = true;
+		this._focusEditorCancellablePromise?.cancel();
+
+		super.dispose();
+	}
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts b/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts
index a7cd34ca453..88b3d188074 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts
@@ -3,38 +3,38 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
-import { IListRenderer, IListVirtualDelegate, ListError } from 'vs/base/browser/ui/list/list';
-import { IListStyles, IStyleController } from 'vs/base/browser/ui/list/listWidget';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { isMacintosh } from 'vs/base/common/platform';
-import { ScrollEvent } from 'vs/base/common/scrollable';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { TrackedRangeStickiness } from 'vs/editor/common/model';
-import { PrefixSumComputer } from 'vs/editor/common/model/prefixSumComputer';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IListService, IWorkbenchListOptions, WorkbenchList } from 'vs/platform/list/browser/listService';
-import { CursorAtBoundary, ICellViewModel, CellEditState, CellFocusMode, ICellOutputViewModel, CellRevealType, CellRevealRangeType, CursorAtLineBoundary, INotebookViewZoneChangeAccessor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CellViewModel, NotebookViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl';
-import { diff, NOTEBOOK_EDITOR_CURSOR_BOUNDARY, CellKind, SelectionStateType, NOTEBOOK_EDITOR_CURSOR_LINE_BOUNDARY } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { ICellRange, cellRangesToIndexes, reduceCellRanges, cellRangesEqual } from 'vs/workbench/contrib/notebook/common/notebookRange';
-import { NOTEBOOK_CELL_LIST_FOCUSED } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { clamp } from 'vs/base/common/numbers';
-import { ISplice } from 'vs/base/common/sequence';
-import { BaseCellRenderTemplate, INotebookCellList } from 'vs/workbench/contrib/notebook/browser/view/notebookRenderingCommon';
-import { FastDomNode } from 'vs/base/browser/fastDomNode';
-import { MarkupCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/markupCellViewModel';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IListViewOptions, IListView } from 'vs/base/browser/ui/list/listView';
-import { NotebookCellListView } from 'vs/workbench/contrib/notebook/browser/view/notebookCellListView';
-import { NotebookOptions } from 'vs/workbench/contrib/notebook/browser/notebookOptions';
-import { INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
-import { NotebookCellAnchor } from 'vs/workbench/contrib/notebook/browser/view/notebookCellAnchor';
-import { NotebookViewZones } from 'vs/workbench/contrib/notebook/browser/viewParts/notebookViewZones';
+import * as DOM from '../../../../../base/browser/dom.js';
+import { IMouseWheelEvent } from '../../../../../base/browser/mouseEvent.js';
+import { IListRenderer, IListVirtualDelegate, ListError } from '../../../../../base/browser/ui/list/list.js';
+import { IListStyles, IStyleController } from '../../../../../base/browser/ui/list/listWidget.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { Disposable, DisposableStore, IDisposable, MutableDisposable } from '../../../../../base/common/lifecycle.js';
+import { isMacintosh } from '../../../../../base/common/platform.js';
+import { ScrollEvent } from '../../../../../base/common/scrollable.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { Selection } from '../../../../../editor/common/core/selection.js';
+import { TrackedRangeStickiness } from '../../../../../editor/common/model.js';
+import { PrefixSumComputer } from '../../../../../editor/common/model/prefixSumComputer.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IListService, IWorkbenchListOptions, WorkbenchList } from '../../../../../platform/list/browser/listService.js';
+import { CursorAtBoundary, ICellViewModel, CellEditState, CellFocusMode, ICellOutputViewModel, CellRevealType, CellRevealRangeType, CursorAtLineBoundary, INotebookViewZoneChangeAccessor } from '../notebookBrowser.js';
+import { CellViewModel, NotebookViewModel } from '../viewModel/notebookViewModelImpl.js';
+import { diff, NOTEBOOK_EDITOR_CURSOR_BOUNDARY, CellKind, SelectionStateType, NOTEBOOK_EDITOR_CURSOR_LINE_BOUNDARY } from '../../common/notebookCommon.js';
+import { ICellRange, cellRangesToIndexes, reduceCellRanges, cellRangesEqual } from '../../common/notebookRange.js';
+import { NOTEBOOK_CELL_LIST_FOCUSED } from '../../common/notebookContextKeys.js';
+import { clamp } from '../../../../../base/common/numbers.js';
+import { ISplice } from '../../../../../base/common/sequence.js';
+import { BaseCellRenderTemplate, INotebookCellList } from './notebookRenderingCommon.js';
+import { FastDomNode } from '../../../../../base/browser/fastDomNode.js';
+import { MarkupCellViewModel } from '../viewModel/markupCellViewModel.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IListViewOptions, IListView } from '../../../../../base/browser/ui/list/listView.js';
+import { NotebookCellListView } from './notebookCellListView.js';
+import { NotebookOptions } from '../notebookOptions.js';
+import { INotebookExecutionStateService } from '../../common/notebookExecutionStateService.js';
+import { NotebookCellAnchor } from './notebookCellAnchor.js';
+import { NotebookViewZones } from '../viewParts/notebookViewZones.js';
 
 const enum CellRevealPosition {
 	Top,
@@ -1152,9 +1152,6 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
 			// Scrolled into view from above
 			this.view.setScrollTop(positionTop - 30);
 		}
-
-
-		element.revealRangeInCenter(range);
 	}
 	//#endregion
 
diff --git a/src/vs/workbench/contrib/notebook/browser/view/notebookCellListView.ts b/src/vs/workbench/contrib/notebook/browser/view/notebookCellListView.ts
index 52fbff1055d..16a00de1977 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/notebookCellListView.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/notebookCellListView.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IRange } from 'vs/base/common/range';
-import { ListView } from 'vs/base/browser/ui/list/listView';
-import { IItem, IRangeMap } from 'vs/base/browser/ui/list/rangeMap';
-import { ConstantTimePrefixSumComputer } from 'vs/editor/common/model/prefixSumComputer';
+import { IRange } from '../../../../../base/common/range.js';
+import { ListView } from '../../../../../base/browser/ui/list/listView.js';
+import { IItem, IRangeMap } from '../../../../../base/browser/ui/list/rangeMap.js';
+import { ConstantTimePrefixSumComputer } from '../../../../../editor/common/model/prefixSumComputer.js';
 
 export interface IWhitespace {
 	id: string;
@@ -210,7 +210,7 @@ export class NotebookCellsLayout implements IRangeMap {
 			return this.count;
 		}
 
-		return this._prefixSumComputer.getIndexOf(offset).index;
+		return this._prefixSumComputer.getIndexOf(Math.trunc(offset)).index;
 	}
 
 	indexAfter(position: number): number {
diff --git a/src/vs/workbench/contrib/notebook/browser/view/notebookRenderingCommon.ts b/src/vs/workbench/contrib/notebook/browser/view/notebookRenderingCommon.ts
index f2700c72a21..94ced5b89d7 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/notebookRenderingCommon.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/notebookRenderingCommon.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { FastDomNode } from 'vs/base/browser/fastDomNode';
-import { IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
-import { IListContextMenuEvent, IListEvent, IListMouseEvent } from 'vs/base/browser/ui/list/list';
-import { IListStyles } from 'vs/base/browser/ui/list/listWidget';
-import { Event } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ScrollEvent } from 'vs/base/common/scrollable';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IWorkbenchListOptionsUpdate } from 'vs/platform/list/browser/listService';
-import { CellRevealRangeType, CellRevealType, ICellOutputViewModel, ICellViewModel, INotebookViewZoneChangeAccessor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CellPartsCollection } from 'vs/workbench/contrib/notebook/browser/view/cellPart';
-import { CellViewModel, NotebookViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl';
-import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
+import { FastDomNode } from '../../../../../base/browser/fastDomNode.js';
+import { IMouseWheelEvent } from '../../../../../base/browser/mouseEvent.js';
+import { IListContextMenuEvent, IListEvent, IListMouseEvent } from '../../../../../base/browser/ui/list/list.js';
+import { IListStyles } from '../../../../../base/browser/ui/list/listWidget.js';
+import { Event } from '../../../../../base/common/event.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ScrollEvent } from '../../../../../base/common/scrollable.js';
+import { ICodeEditor } from '../../../../../editor/browser/editorBrowser.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { Selection } from '../../../../../editor/common/core/selection.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IWorkbenchListOptionsUpdate } from '../../../../../platform/list/browser/listService.js';
+import { CellRevealRangeType, CellRevealType, ICellOutputViewModel, ICellViewModel, INotebookViewZoneChangeAccessor } from '../notebookBrowser.js';
+import { CellPartsCollection } from './cellPart.js';
+import { CellViewModel, NotebookViewModel } from '../viewModel/notebookViewModelImpl.js';
+import { ICellRange } from '../../common/notebookRange.js';
 
 
 export interface INotebookCellList extends ICoordinatesConverter {
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts
index 1640156d5ff..8eb293b41ba 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts
@@ -3,60 +3,60 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getWindow } from 'vs/base/browser/dom';
-import { IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
-import { CodeWindow } from 'vs/base/browser/window';
-import { WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from 'vs/base/common/actions';
-import { coalesce } from 'vs/base/common/arrays';
-import { DeferredPromise, runWhenGlobalIdle } from 'vs/base/common/async';
-import { decodeBase64 } from 'vs/base/common/buffer';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { getExtensionForMimeType } from 'vs/base/common/mime';
-import { FileAccess, Schemas, matchesScheme, matchesSomeScheme } from 'vs/base/common/network';
-import { equals } from 'vs/base/common/objects';
-import * as osPath from 'vs/base/common/path';
-import { isMacintosh, isWeb } from 'vs/base/common/platform';
-import { dirname, extname, isEqual, joinPath } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import * as UUID from 'vs/base/common/uuid';
-import { TokenizationRegistry } from 'vs/editor/common/languages';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { generateTokensCSSForColorMap } from 'vs/editor/common/languages/supports/tokenization';
-import { tokenizeToString } from 'vs/editor/common/languages/textToHtmlTokenizer';
-import * as nls from 'vs/nls';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { ITextEditorOptions, ITextEditorSelection } from 'vs/platform/editor/common/editor';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { editorFindMatch, editorFindMatchHighlight } from 'vs/platform/theme/common/colorRegistry';
-import { IThemeService, Themable } from 'vs/platform/theme/common/themeService';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IWorkspaceTrustManagementService } from 'vs/platform/workspace/common/workspaceTrust';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { CellEditState, ICellOutputViewModel, ICellViewModel, ICommonCellInfo, IDisplayOutputLayoutUpdateRequest, IDisplayOutputViewModel, IFocusNotebookCellOptions, IGenericCellViewModel, IInsetRenderOutput, INotebookEditorCreationOptions, INotebookWebviewMessage, RenderOutputType } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NOTEBOOK_WEBVIEW_BOUNDARY } from 'vs/workbench/contrib/notebook/browser/view/notebookCellList';
-import { preloadsScriptStr } from 'vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads';
-import { transformWebviewThemeVars } from 'vs/workbench/contrib/notebook/browser/view/renderers/webviewThemeMapping';
-import { MarkupCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/markupCellViewModel';
-import { CellUri, ICellOutput, INotebookRendererInfo, RendererMessagingSpec } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotebookKernel } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
-import { INotebookLoggingService } from 'vs/workbench/contrib/notebook/common/notebookLoggingService';
-import { IScopedRendererMessaging } from 'vs/workbench/contrib/notebook/common/notebookRendererMessagingService';
-import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
-import { IWebviewElement, IWebviewService, WebviewContentPurpose, WebviewOriginStore } from 'vs/workbench/contrib/webview/browser/webview';
-import { WebviewWindowDragMonitor } from 'vs/workbench/contrib/webview/browser/webviewWindowDragMonitor';
-import { asWebviewUri, webviewGenericCspSource } from 'vs/workbench/contrib/webview/common/webview';
-import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { FromWebviewMessage, IAckOutputHeight, IClickedDataUrlMessage, ICodeBlockHighlightRequest, IContentWidgetTopRequest, IControllerPreload, ICreationContent, ICreationRequestMessage, IFindMatch, IMarkupCellInitialization, RendererMetadata, StaticPreloadMetadata, ToWebviewMessage } from './webviewMessages';
+import { getWindow } from '../../../../../../base/browser/dom.js';
+import { IMouseWheelEvent } from '../../../../../../base/browser/mouseEvent.js';
+import { CodeWindow } from '../../../../../../base/browser/window.js';
+import { WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from '../../../../../../base/common/actions.js';
+import { coalesce } from '../../../../../../base/common/arrays.js';
+import { DeferredPromise, runWhenGlobalIdle } from '../../../../../../base/common/async.js';
+import { decodeBase64 } from '../../../../../../base/common/buffer.js';
+import { Emitter, Event } from '../../../../../../base/common/event.js';
+import { IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { getExtensionForMimeType } from '../../../../../../base/common/mime.js';
+import { FileAccess, Schemas, matchesScheme, matchesSomeScheme } from '../../../../../../base/common/network.js';
+import { equals } from '../../../../../../base/common/objects.js';
+import * as osPath from '../../../../../../base/common/path.js';
+import { isMacintosh, isWeb } from '../../../../../../base/common/platform.js';
+import { dirname, extname, isEqual, joinPath } from '../../../../../../base/common/resources.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import * as UUID from '../../../../../../base/common/uuid.js';
+import { TokenizationRegistry } from '../../../../../../editor/common/languages.js';
+import { ILanguageService } from '../../../../../../editor/common/languages/language.js';
+import { generateTokensCSSForColorMap } from '../../../../../../editor/common/languages/supports/tokenization.js';
+import { tokenizeToString } from '../../../../../../editor/common/languages/textToHtmlTokenizer.js';
+import * as nls from '../../../../../../nls.js';
+import { MenuId } from '../../../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../../../platform/contextview/browser/contextView.js';
+import { IFileDialogService } from '../../../../../../platform/dialogs/common/dialogs.js';
+import { ITextEditorOptions, ITextEditorSelection } from '../../../../../../platform/editor/common/editor.js';
+import { IFileService } from '../../../../../../platform/files/common/files.js';
+import { IOpenerService } from '../../../../../../platform/opener/common/opener.js';
+import { IStorageService } from '../../../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../../../platform/telemetry/common/telemetry.js';
+import { editorFindMatch, editorFindMatchHighlight } from '../../../../../../platform/theme/common/colorRegistry.js';
+import { IThemeService, Themable } from '../../../../../../platform/theme/common/themeService.js';
+import { IWorkspaceContextService } from '../../../../../../platform/workspace/common/workspace.js';
+import { IWorkspaceTrustManagementService } from '../../../../../../platform/workspace/common/workspaceTrust.js';
+import { EditorInput } from '../../../../../common/editor/editorInput.js';
+import { CellEditState, ICellOutputViewModel, ICellViewModel, ICommonCellInfo, IDisplayOutputLayoutUpdateRequest, IDisplayOutputViewModel, IFocusNotebookCellOptions, IGenericCellViewModel, IInsetRenderOutput, INotebookEditorCreationOptions, INotebookWebviewMessage, RenderOutputType } from '../../notebookBrowser.js';
+import { NOTEBOOK_WEBVIEW_BOUNDARY } from '../notebookCellList.js';
+import { preloadsScriptStr } from './webviewPreloads.js';
+import { transformWebviewThemeVars } from './webviewThemeMapping.js';
+import { MarkupCellViewModel } from '../../viewModel/markupCellViewModel.js';
+import { CellUri, ICellOutput, INotebookRendererInfo, RendererMessagingSpec } from '../../../common/notebookCommon.js';
+import { INotebookKernel } from '../../../common/notebookKernelService.js';
+import { INotebookLoggingService } from '../../../common/notebookLoggingService.js';
+import { IScopedRendererMessaging } from '../../../common/notebookRendererMessagingService.js';
+import { INotebookService } from '../../../common/notebookService.js';
+import { IWebviewElement, IWebviewService, WebviewContentPurpose, WebviewOriginStore } from '../../../../webview/browser/webview.js';
+import { WebviewWindowDragMonitor } from '../../../../webview/browser/webviewWindowDragMonitor.js';
+import { asWebviewUri, webviewGenericCspSource } from '../../../../webview/common/webview.js';
+import { IEditorGroup, IEditorGroupsService } from '../../../../../services/editor/common/editorGroupsService.js';
+import { IWorkbenchEnvironmentService } from '../../../../../services/environment/common/environmentService.js';
+import { IPathService } from '../../../../../services/path/common/pathService.js';
+import { FromWebviewMessage, IAckOutputHeight, IClickedDataUrlMessage, ICodeBlockHighlightRequest, IContentWidgetTopRequest, IControllerPreload, ICreationContent, ICreationRequestMessage, IFindMatch, IMarkupCellInitialization, RendererMetadata, StaticPreloadMetadata, ToWebviewMessage } from './webviewMessages.js';
 
 const LINE_COLUMN_REGEX = /:([\d]+)(?::([\d]+))?$/;
 const LineQueryRegex = /line=(\d+)$/;
@@ -270,7 +270,7 @@ export class BackLayerWebView<T extends ICommonCellInfo> extends Themable {
 			'notebook-markdown-line-height': typeof this.options.markdownLineHeight === 'number' && this.options.markdownLineHeight > 0 ? `${this.options.markdownLineHeight}px` : `normal`,
 			'notebook-cell-output-font-size': `${this.options.outputFontSize || this.options.fontSize}px`,
 			'notebook-cell-output-line-height': `${this.options.outputLineHeight}px`,
-			'notebook-cell-output-max-height': `${this.options.outputLineHeight * this.options.outputLineLimit}px`,
+			'notebook-cell-output-max-height': `${this.options.outputLineHeight * this.options.outputLineLimit + 2}px`,
 			'notebook-cell-output-font-family': this.options.outputFontFamily || this.options.fontFamily,
 			'notebook-cell-markup-empty-content': nls.localize('notebook.emptyMarkdownPlaceholder', "Empty markdown cell, double-click or press enter to edit."),
 			'notebook-cell-renderer-not-found-error': nls.localize({
@@ -497,7 +497,7 @@ export class BackLayerWebView<T extends ICommonCellInfo> extends Themable {
 				id: renderer.id,
 				entrypoint,
 				mimeTypes: renderer.mimeTypes,
-				messaging: renderer.messaging !== RendererMessagingSpec.Never,
+				messaging: renderer.messaging !== RendererMessagingSpec.Never && !!this.rendererMessaging,
 				isBuiltin: renderer.isBuiltin
 			};
 		});
@@ -569,7 +569,7 @@ export class BackLayerWebView<T extends ICommonCellInfo> extends Themable {
 		}
 
 		return [
-			dirname(FileAccess.asFileUri('vs/loader.js')),
+			dirname(FileAccess.asFileUri('vs/nls.js')),
 		];
 	}
 
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts
index 564ddd06414..6c0a4f516d3 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts
@@ -3,53 +3,54 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { PixelRatio } from 'vs/base/browser/pixelRatio';
-import * as DOM from 'vs/base/browser/dom';
-import { FastDomNode } from 'vs/base/browser/fastDomNode';
-import { IListRenderer, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { BareFontInfo } from 'vs/editor/common/config/fontInfo';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { localize } from 'vs/nls';
-import { IMenuService } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService, IScopedContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { ICellViewModel, INotebookEditorDelegate } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CellPartsCollection } from 'vs/workbench/contrib/notebook/browser/view/cellPart';
-import { CellChatPart } from 'vs/workbench/contrib/notebook/browser/view/cellParts/chat/cellChatPart';
-import { CellComments } from 'vs/workbench/contrib/notebook/browser/view/cellParts/cellComments';
-import { CellContextKeyPart } from 'vs/workbench/contrib/notebook/browser/view/cellParts/cellContextKeys';
-import { CellDecorations } from 'vs/workbench/contrib/notebook/browser/view/cellParts/cellDecorations';
-import { CellDragAndDropController, CellDragAndDropPart } from 'vs/workbench/contrib/notebook/browser/view/cellParts/cellDnd';
-import { CodeCellDragImageRenderer } from 'vs/workbench/contrib/notebook/browser/view/cellParts/cellDragRenderer';
-import { CellEditorOptions } from 'vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions';
-import { CellExecutionPart } from 'vs/workbench/contrib/notebook/browser/view/cellParts/cellExecution';
-import { CellFocusPart } from 'vs/workbench/contrib/notebook/browser/view/cellParts/cellFocus';
-import { CellFocusIndicator } from 'vs/workbench/contrib/notebook/browser/view/cellParts/cellFocusIndicator';
-import { CellProgressBar } from 'vs/workbench/contrib/notebook/browser/view/cellParts/cellProgressBar';
-import { CellEditorStatusBar } from 'vs/workbench/contrib/notebook/browser/view/cellParts/cellStatusPart';
-import { BetweenCellToolbar, CellTitleToolbarPart } from 'vs/workbench/contrib/notebook/browser/view/cellParts/cellToolbars';
-import { CodeCell } from 'vs/workbench/contrib/notebook/browser/view/cellParts/codeCell';
-import { RunToolbar } from 'vs/workbench/contrib/notebook/browser/view/cellParts/codeCellRunToolbar';
-import { CollapsedCellInput } from 'vs/workbench/contrib/notebook/browser/view/cellParts/collapsedCellInput';
-import { CollapsedCellOutput } from 'vs/workbench/contrib/notebook/browser/view/cellParts/collapsedCellOutput';
-import { FoldedCellHint } from 'vs/workbench/contrib/notebook/browser/view/cellParts/foldedCellHint';
-import { MarkupCell } from 'vs/workbench/contrib/notebook/browser/view/cellParts/markupCell';
-import { CodeCellRenderTemplate, MarkdownCellRenderTemplate } from 'vs/workbench/contrib/notebook/browser/view/notebookRenderingCommon';
-import { CodeCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
-import { MarkupCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/markupCellViewModel';
-import { CellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl';
-import { CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
+import { PixelRatio } from '../../../../../../base/browser/pixelRatio.js';
+import * as DOM from '../../../../../../base/browser/dom.js';
+import { FastDomNode } from '../../../../../../base/browser/fastDomNode.js';
+import { IListRenderer, IListVirtualDelegate } from '../../../../../../base/browser/ui/list/list.js';
+import { Disposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { ICodeEditor } from '../../../../../../editor/browser/editorBrowser.js';
+import { CodeEditorWidget } from '../../../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { IEditorOptions } from '../../../../../../editor/common/config/editorOptions.js';
+import { BareFontInfo } from '../../../../../../editor/common/config/fontInfo.js';
+import { EditorContextKeys } from '../../../../../../editor/common/editorContextKeys.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../../../../../../editor/common/languages/modesRegistry.js';
+import { localize } from '../../../../../../nls.js';
+import { IMenuService } from '../../../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService, IScopedContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../../../../platform/instantiation/common/serviceCollection.js';
+import { IKeybindingService } from '../../../../../../platform/keybinding/common/keybinding.js';
+import { INotificationService } from '../../../../../../platform/notification/common/notification.js';
+import { ICellViewModel, INotebookEditorDelegate } from '../../notebookBrowser.js';
+import { CellPartsCollection } from '../cellPart.js';
+import { CellChatPart } from '../cellParts/chat/cellChatPart.js';
+import { CellComments } from '../cellParts/cellComments.js';
+import { CellContextKeyPart } from '../cellParts/cellContextKeys.js';
+import { CellDecorations } from '../cellParts/cellDecorations.js';
+import { CellDragAndDropController, CellDragAndDropPart } from '../cellParts/cellDnd.js';
+import { CodeCellDragImageRenderer } from '../cellParts/cellDragRenderer.js';
+import { CellEditorOptions } from '../cellParts/cellEditorOptions.js';
+import { CellExecutionPart } from '../cellParts/cellExecution.js';
+import { CellFocusPart } from '../cellParts/cellFocus.js';
+import { CellFocusIndicator } from '../cellParts/cellFocusIndicator.js';
+import { CellProgressBar } from '../cellParts/cellProgressBar.js';
+import { CellEditorStatusBar } from '../cellParts/cellStatusPart.js';
+import { BetweenCellToolbar, CellTitleToolbarPart } from '../cellParts/cellToolbars.js';
+import { CodeCell } from '../cellParts/codeCell.js';
+import { RunToolbar } from '../cellParts/codeCellRunToolbar.js';
+import { CollapsedCellInput } from '../cellParts/collapsedCellInput.js';
+import { CollapsedCellOutput } from '../cellParts/collapsedCellOutput.js';
+import { FoldedCellHint } from '../cellParts/foldedCellHint.js';
+import { MarkupCell } from '../cellParts/markupCell.js';
+import { CodeCellRenderTemplate, MarkdownCellRenderTemplate } from '../notebookRenderingCommon.js';
+import { CodeCellViewModel } from '../../viewModel/codeCellViewModel.js';
+import { MarkupCellViewModel } from '../../viewModel/markupCellViewModel.js';
+import { CellViewModel } from '../../viewModel/notebookViewModelImpl.js';
+import { CellKind } from '../../../common/notebookCommon.js';
+import { INotebookExecutionStateService } from '../../../common/notebookExecutionStateService.js';
+import { NotebookCellEditorPool } from '../notebookCellEditorPool.js';
 
 const $ = DOM.$;
 
@@ -175,7 +176,7 @@ export class MarkupCellRenderer extends AbstractCellRenderer implements IListRen
 			templateDisposables.add(scopedInstaService.createInstance(CellEditorStatusBar, this.notebookEditor, container, editorPart, undefined)),
 			templateDisposables.add(new CellFocusIndicator(this.notebookEditor, titleToolbar, focusIndicatorTop, focusIndicatorLeft, focusIndicatorRight, focusIndicatorBottom)),
 			templateDisposables.add(new FoldedCellHint(this.notebookEditor, DOM.append(container, $('.notebook-folded-hint')), this._notebookExecutionStateService)),
-			templateDisposables.add(new CellDecorations(rootContainer, decorationContainer)),
+			templateDisposables.add(new CellDecorations(this.notebookEditor, rootContainer, decorationContainer)),
 			templateDisposables.add(scopedInstaService.createInstance(CellComments, this.notebookEditor, cellCommentPartContainer)),
 			templateDisposables.add(new CollapsedCellInput(this.notebookEditor, cellInputCollapsedContainer)),
 			templateDisposables.add(new CellFocusPart(container, undefined, this.notebookEditor)),
@@ -239,6 +240,7 @@ export class CodeCellRenderer extends AbstractCellRenderer implements IListRende
 	constructor(
 		notebookEditor: INotebookEditorDelegate,
 		private renderedEditors: Map<ICellViewModel, ICodeEditor>,
+		private editorPool: NotebookCellEditorPool,
 		dndController: CellDragAndDropController,
 		contextKeyServiceProvider: (container: HTMLElement) => IScopedContextKeyService,
 		@IConfigurationService configurationService: IConfigurationService,
@@ -288,6 +290,12 @@ export class CodeCellRenderer extends AbstractCellRenderer implements IListRende
 				width: 0,
 				height: 0
 			},
+			scrollbar: {
+				vertical: 'hidden',
+				horizontal: 'auto',
+				handleMouseWheel: false,
+				useShadows: false,
+			},
 		}, {
 			contributions: this.notebookEditor.creationOptions.cellEditorContributions
 		});
@@ -316,13 +324,12 @@ export class CodeCellRenderer extends AbstractCellRenderer implements IListRende
 			this.notebookEditor));
 
 		const focusIndicatorPart = templateDisposables.add(new CellFocusIndicator(this.notebookEditor, titleToolbar, focusIndicatorTop, focusIndicatorLeft, focusIndicatorRight, focusIndicatorBottom));
-		const cellParts = new CellPartsCollection(DOM.getWindow(rootContainer), [
+		const contentParts = [
 			focusIndicatorPart,
 			templateDisposables.add(scopedInstaService.createInstance(CellChatPart, this.notebookEditor, cellChatPart)),
 			templateDisposables.add(scopedInstaService.createInstance(CellEditorStatusBar, this.notebookEditor, container, editorPart, editor)),
 			templateDisposables.add(scopedInstaService.createInstance(CellProgressBar, editorPart, cellInputCollapsedContainer)),
-			templateDisposables.add(scopedInstaService.createInstance(RunToolbar, this.notebookEditor, contextKeyService, container, runButtonContainer)),
-			templateDisposables.add(new CellDecorations(rootContainer, decorationContainer)),
+			templateDisposables.add(new CellDecorations(this.notebookEditor, rootContainer, decorationContainer)),
 			templateDisposables.add(scopedInstaService.createInstance(CellComments, this.notebookEditor, cellCommentPartContainer)),
 			templateDisposables.add(scopedInstaService.createInstance(CellExecutionPart, this.notebookEditor, executionOrderLabel)),
 			templateDisposables.add(scopedInstaService.createInstance(CollapsedCellOutput, this.notebookEditor, cellOutputCollapsedContainer)),
@@ -330,7 +337,16 @@ export class CodeCellRenderer extends AbstractCellRenderer implements IListRende
 			templateDisposables.add(new CellFocusPart(container, focusSinkElement, this.notebookEditor)),
 			templateDisposables.add(new CellDragAndDropPart(container)),
 			templateDisposables.add(scopedInstaService.createInstance(CellContextKeyPart, this.notebookEditor)),
-		], [
+		];
+
+		const { cellExecutePrimary, cellExecuteToolbar } = this.notebookEditor.creationOptions.menuIds;
+		if (cellExecutePrimary && cellExecuteToolbar) {
+			contentParts.push(templateDisposables.add(
+				scopedInstaService.createInstance(RunToolbar, this.notebookEditor, contextKeyService, container, runButtonContainer, cellExecutePrimary, cellExecuteToolbar)
+			));
+		}
+
+		const cellParts = new CellPartsCollection(DOM.getWindow(rootContainer), contentParts, [
 			titleToolbar,
 			templateDisposables.add(scopedInstaService.createInstance(BetweenCellToolbar, this.notebookEditor, titleToolbarContainer, bottomCellToolbarContainer))
 		]);
@@ -376,7 +392,7 @@ export class CodeCellRenderer extends AbstractCellRenderer implements IListRende
 		templateData.outputContainer.domNode.innerText = '';
 		templateData.outputContainer.domNode.appendChild(templateData.cellOutputCollapsedContainer);
 
-		templateData.elementDisposables.add(templateData.instantiationService.createInstance(CodeCell, this.notebookEditor, element, templateData));
+		templateData.elementDisposables.add(templateData.instantiationService.createInstance(CodeCell, this.notebookEditor, element, templateData, this.editorPool));
 		this.renderedEditors.set(element, templateData.editor);
 	}
 
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewMessages.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewMessages.ts
index a59abdada13..b18398d5497 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewMessages.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewMessages.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import type { RenderOutputType } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import type { PreloadOptions, RenderOptions } from 'vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads';
-import { NotebookCellMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import type { RenderOutputType } from '../../notebookBrowser.js';
+import type { PreloadOptions, RenderOptions } from './webviewPreloads.js';
+import { NotebookCellMetadata } from '../../../common/notebookCommon.js';
 
 interface BaseToWebviewMessage {
 	readonly __vscode_notebook_message: true;
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts
index 7f79531b37e..da6d359d55e 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import type { Event } from 'vs/base/common/event';
-import type { IDisposable } from 'vs/base/common/lifecycle';
-import type * as webviewMessages from 'vs/workbench/contrib/notebook/browser/view/renderers/webviewMessages';
-import type { NotebookCellMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import type { Event } from '../../../../../../base/common/event.js';
+import type { IDisposable } from '../../../../../../base/common/lifecycle.js';
+import type * as webviewMessages from './webviewMessages.js';
+import type { NotebookCellMetadata } from '../../../common/notebookCommon.js';
 import type * as rendererApi from 'vscode-notebook-renderer';
 
 // !! IMPORTANT !! ----------------------------------------------------------------------------------
@@ -187,6 +187,10 @@ async function webviewPreloads(ctx: PreloadContext) {
 		}, 0);
 	};
 
+	const isEditableElement = (element: Element) => {
+		return element.tagName.toLowerCase() === 'input' || element.tagName.toLowerCase() === 'textarea' || 'editContext' in element;
+	};
+
 	// check if an input element is focused within the output element
 	const checkOutputInputFocus = (e: FocusEvent) => {
 		lastFocusedOutput = getOutputContainer(e);
@@ -196,7 +200,7 @@ async function webviewPreloads(ctx: PreloadContext) {
 		}
 
 		const id = lastFocusedOutput?.id;
-		if (id && (activeElement.tagName === 'INPUT' || activeElement.tagName === 'TEXTAREA' || activeElement.tagName === 'SELECT')) {
+		if (id && (isEditableElement(activeElement) || activeElement.tagName === 'SELECT')) {
 			postNotebookMessage<webviewMessages.IOutputInputFocusMessage>('outputInputFocus', { inputFocused: true, id });
 
 			activeElement.addEventListener('blur', () => {
@@ -303,7 +307,7 @@ async function webviewPreloads(ctx: PreloadContext) {
 			return;
 		}
 		const activeElement = window.document.activeElement;
-		if (activeElement?.tagName === 'INPUT' || activeElement?.tagName === 'TEXTAREA') {
+		if (activeElement && isEditableElement(activeElement)) {
 			(activeElement as HTMLInputElement).select();
 		}
 	};
@@ -329,7 +333,7 @@ async function webviewPreloads(ctx: PreloadContext) {
 			return;
 		}
 		const activeElement = window.document.activeElement;
-		if (activeElement?.tagName === 'INPUT' || activeElement?.tagName === 'TEXTAREA') {
+		if (activeElement && isEditableElement(activeElement)) {
 			// Leave for default behavior.
 			return;
 		}
@@ -357,7 +361,7 @@ async function webviewPreloads(ctx: PreloadContext) {
 			return;
 		}
 		const activeElement = window.document.activeElement;
-		if (activeElement?.tagName === 'INPUT' || activeElement?.tagName === 'TEXTAREA') {
+		if (activeElement && isEditableElement(activeElement)) {
 			// The input element will handle this.
 			return;
 		}
@@ -461,7 +465,7 @@ async function webviewPreloads(ctx: PreloadContext) {
 					id,
 					height,
 					init: update.init,
-					isOutput: update.isOutput,
+					isOutput: update.isOutput
 				});
 			} else {
 				this.pending.set(id, {
@@ -484,6 +488,11 @@ async function webviewPreloads(ctx: PreloadContext) {
 		}
 	};
 
+	function elementHasContent(height: number) {
+		// we need to account for a potential 1px top and bottom border on a child within the output container
+		return height > 2.1;
+	}
+
 	const resizeObserver = new class {
 
 		private readonly _observer: ResizeObserver;
@@ -519,23 +528,23 @@ async function webviewPreloads(ctx: PreloadContext) {
 						continue;
 					}
 
-					const newHeight = entry.contentRect.height;
+					const hasContent = elementHasContent(entry.contentRect.height);
 					const shouldUpdatePadding =
-						(newHeight !== 0 && observedElementInfo.lastKnownPadding === 0) ||
-						(newHeight === 0 && observedElementInfo.lastKnownPadding !== 0);
+						(hasContent && observedElementInfo.lastKnownPadding === 0) ||
+						(!hasContent && observedElementInfo.lastKnownPadding !== 0);
 
 					if (shouldUpdatePadding) {
 						// Do not update dimension in resize observer
 						window.requestAnimationFrame(() => {
-							if (newHeight !== 0) {
+							if (hasContent) {
 								entry.target.style.padding = `${ctx.style.outputNodePadding}px ${ctx.style.outputNodePadding}px ${ctx.style.outputNodePadding}px ${ctx.style.outputNodeLeftPadding}px`;
 							} else {
 								entry.target.style.padding = `0px`;
 							}
-							this.updateHeight(observedElementInfo, entry.target.offsetHeight);
+							this.updateHeight(observedElementInfo, hasContent ? entry.target.offsetHeight : 0);
 						});
 					} else {
-						this.updateHeight(observedElementInfo, entry.target.offsetHeight);
+						this.updateHeight(observedElementInfo, hasContent ? entry.target.offsetHeight : 0);
 					}
 				}
 			});
@@ -691,7 +700,7 @@ async function webviewPreloads(ctx: PreloadContext) {
 				focusableElement.tabIndex = -1;
 				postNotebookMessage<webviewMessages.IOutputInputFocusMessage>('outputInputFocus', { inputFocused: false, id });
 			} else {
-				const inputFocused = focusableElement.tagName === 'INPUT' || focusableElement.tagName === 'TEXTAREA';
+				const inputFocused = isEditableElement(focusableElement);
 				postNotebookMessage<webviewMessages.IOutputInputFocusMessage>('outputInputFocus', { inputFocused, id });
 			}
 
@@ -2755,10 +2764,6 @@ async function webviewPreloads(ctx: PreloadContext) {
 
 			this.element.style.visibility = '';
 			this.element.style.top = `${top}px`;
-
-			dimensionUpdater.updateHeight(outputId, outputContainer.element.offsetHeight, {
-				isOutput: true,
-			});
 		}
 
 		public hide() {
@@ -2941,17 +2946,26 @@ async function webviewPreloads(ctx: PreloadContext) {
 
 			const offsetHeight = this.element.offsetHeight;
 			const cps = document.defaultView!.getComputedStyle(this.element);
-			if (offsetHeight !== 0 && cps.padding === '0px') {
-				// we set padding to zero if the output height is zero (then we can have a zero-height output DOM node)
+			const verticalPadding = parseFloat(cps.paddingTop) + parseFloat(cps.paddingBottom);
+			const contentHeight = offsetHeight - verticalPadding;
+			if (elementHasContent(contentHeight) && cps.padding === '0px') {
+				// we set padding to zero if the output has no content (then we can have a zero-height output DOM node)
 				// thus we need to ensure the padding is accounted when updating the init height of the output
 				dimensionUpdater.updateHeight(this.outputId, offsetHeight + ctx.style.outputNodePadding * 2, {
 					isOutput: true,
-					init: true,
+					init: true
 				});
 
 				this.element.style.padding = `${ctx.style.outputNodePadding}px ${ctx.style.outputNodePadding}px ${ctx.style.outputNodePadding}px ${ctx.style.outputNodeLeftPadding}`;
-			} else {
+			} else if (elementHasContent(contentHeight)) {
 				dimensionUpdater.updateHeight(this.outputId, this.element.offsetHeight, {
+					isOutput: true,
+					init: true
+				});
+				this.element.style.padding = `0 ${ctx.style.outputNodePadding}px 0 ${ctx.style.outputNodeLeftPadding}`;
+			} else {
+				// we have a zero-height output DOM node
+				dimensionUpdater.updateHeight(this.outputId, 0, {
 					isOutput: true,
 					init: true,
 				});
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewThemeMapping.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewThemeMapping.ts
index 7375ca1eb33..2b8fa64762d 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewThemeMapping.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewThemeMapping.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { WebviewStyles } from 'vs/workbench/contrib/webview/browser/webview';
+import { WebviewStyles } from '../../../../webview/browser/webview.js';
 
 const mapping: ReadonlyMap<string, string> = new Map([
 	['theme-font-family', 'vscode-font-family'],
diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/OutlineEntry.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/OutlineEntry.ts
index 398f676c876..833d9aa5a14 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewModel/OutlineEntry.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewModel/OutlineEntry.ts
@@ -2,14 +2,14 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IMarkerService, MarkerSeverity } from 'vs/platform/markers/common/markers';
-import { ICellViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { executingStateIcon } from 'vs/workbench/contrib/notebook/browser/notebookIcons';
-import { CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { IRange } from 'vs/editor/common/core/range';
-import { SymbolKind, SymbolKinds } from 'vs/editor/common/languages';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { IMarkerService, MarkerSeverity } from '../../../../../platform/markers/common/markers.js';
+import { ICellViewModel } from '../notebookBrowser.js';
+import { executingStateIcon } from '../notebookIcons.js';
+import { CellKind } from '../../common/notebookCommon.js';
+import { IRange } from '../../../../../editor/common/core/range.js';
+import { SymbolKind, SymbolKinds } from '../../../../../editor/common/languages.js';
 
 export interface IOutlineMarkerInfo {
 	readonly count: number;
diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/baseCellViewModel.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/baseCellViewModel.ts
index f1c1ab7b7c8..dc6f2165675 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewModel/baseCellViewModel.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewModel/baseCellViewModel.ts
@@ -3,28 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, IDisposable, IReference, MutableDisposable, dispose } from 'vs/base/common/lifecycle';
-import { Mimes } from 'vs/base/common/mime';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { IPosition } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import * as editorCommon from 'vs/editor/common/editorCommon';
-import * as model from 'vs/editor/common/model';
-import { SearchParams } from 'vs/editor/common/model/textModelSearch';
-import { IResolvedTextEditorModel, ITextModelService } from 'vs/editor/common/services/resolverService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
-import { IWordWrapTransientState, readTransientState, writeTransientState } from 'vs/workbench/contrib/codeEditor/browser/toggleWordWrap';
-import { InlineChatController } from 'vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { CellEditState, CellFocusMode, CursorAtBoundary, CursorAtLineBoundary, IEditableCellViewModel, INotebookCellDecorationOptions } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NotebookOptionsChangeEvent } from 'vs/workbench/contrib/notebook/browser/notebookOptions';
-import { CellViewModelStateChangeEvent } from 'vs/workbench/contrib/notebook/browser/notebookViewEvents';
-import { ViewContext } from 'vs/workbench/contrib/notebook/browser/viewModel/viewContext';
-import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
-import { CellKind, INotebookCellStatusBarItem, INotebookSearchOptions } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { Disposable, IDisposable, IReference, MutableDisposable, dispose } from '../../../../../base/common/lifecycle.js';
+import { Mimes } from '../../../../../base/common/mime.js';
+import { ICodeEditor } from '../../../../../editor/browser/editorBrowser.js';
+import { ICodeEditorService } from '../../../../../editor/browser/services/codeEditorService.js';
+import { IEditorCommentsOptions } from '../../../../../editor/common/config/editorOptions.js';
+import { IPosition } from '../../../../../editor/common/core/position.js';
+import { IRange, Range } from '../../../../../editor/common/core/range.js';
+import { Selection } from '../../../../../editor/common/core/selection.js';
+import * as editorCommon from '../../../../../editor/common/editorCommon.js';
+import * as model from '../../../../../editor/common/model.js';
+import { SearchParams } from '../../../../../editor/common/model/textModelSearch.js';
+import { IResolvedTextEditorModel, ITextModelService } from '../../../../../editor/common/services/resolverService.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IUndoRedoService } from '../../../../../platform/undoRedo/common/undoRedo.js';
+import { IWordWrapTransientState, readTransientState, writeTransientState } from '../../../codeEditor/browser/toggleWordWrap.js';
+import { InlineChatController } from '../../../inlineChat/browser/inlineChatController.js';
+import { CellEditState, CellFocusMode, CellLayoutChangeEvent, CursorAtBoundary, CursorAtLineBoundary, IEditableCellViewModel, INotebookCellDecorationOptions } from '../notebookBrowser.js';
+import { NotebookOptionsChangeEvent } from '../notebookOptions.js';
+import { CellViewModelStateChangeEvent } from '../notebookViewEvents.js';
+import { ViewContext } from './viewContext.js';
+import { NotebookCellTextModel } from '../../common/model/notebookCellTextModel.js';
+import { CellKind, INotebookCellStatusBarItem, INotebookFindOptions } from '../../common/notebookCommon.js';
 
 export abstract class BaseCellViewModel extends Disposable {
 
@@ -85,6 +86,15 @@ export abstract class BaseCellViewModel extends Disposable {
 		this._onDidChangeState.fire({ cellLineNumberChanged: true });
 	}
 
+	private _commentOptions: IEditorCommentsOptions;
+	public get commentOptions(): IEditorCommentsOptions {
+		return this._commentOptions;
+	}
+
+	public set commentOptions(newOptions: IEditorCommentsOptions) {
+		this._commentOptions = newOptions;
+	}
+
 	private _focusMode: CellFocusMode = CellFocusMode.Container;
 	get focusMode() {
 		return this._focusMode;
@@ -158,7 +168,18 @@ export abstract class BaseCellViewModel extends Disposable {
 		this._onDidChangeState.fire({ outputCollapsedChanged: true });
 	}
 
+	protected _commentHeight = 0;
+
+	set commentHeight(height: number) {
+		if (this._commentHeight === height) {
+			return;
+		}
+		this._commentHeight = height;
+		this.layoutChange({ commentHeight: true }, 'BaseCellViewModel#commentHeight');
+	}
+
 	private _isDisposed = false;
+	private _isReadonly = false;
 
 	constructor(
 		readonly viewType: string,
@@ -198,13 +219,27 @@ export abstract class BaseCellViewModel extends Disposable {
 		if (this.model.collapseState?.outputCollapsed) {
 			this._outputCollapsed = true;
 		}
+
+		this._commentOptions = this._configurationService.getValue<IEditorCommentsOptions>('editor.comments', { overrideIdentifier: this.language });
+		this._register(this._configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration('editor.comments')) {
+				this._commentOptions = this._configurationService.getValue<IEditorCommentsOptions>('editor.comments', { overrideIdentifier: this.language });
+			}
+		}));
 	}
 
 
-	abstract updateOptions(e: NotebookOptionsChangeEvent): void;
+	updateOptions(e: NotebookOptionsChangeEvent): void {
+		if (this._textEditor && typeof e.readonly === 'boolean') {
+			this._textEditor.updateOptions({ readOnly: e.readonly });
+		}
+		if (typeof e.readonly === 'boolean') {
+			this._isReadonly = e.readonly;
+		}
+	}
 	abstract getHeight(lineHeight: number): number;
 	abstract onDeselect(): void;
-	abstract layoutChange(change: any): void;
+	abstract layoutChange(change: CellLayoutChangeEvent, source?: string): void;
 
 	assertTextModelAttached(): boolean {
 		if (this.textModel && this._textEditor && this._textEditor.getModel() === this.textModel) {
@@ -235,7 +270,9 @@ export abstract class BaseCellViewModel extends Disposable {
 		}
 
 		this._textEditor = editor;
-
+		if (this._isReadonly) {
+			editor.updateOptions({ readOnly: this._isReadonly });
+		}
 		if (this._editorViewStates) {
 			this._restoreViewState(this._editorViewStates);
 		} else {
@@ -500,12 +537,24 @@ export abstract class BaseCellViewModel extends Disposable {
 
 	setSelections(selections: Selection[]) {
 		if (selections.length) {
-			this._textEditor?.setSelections(selections);
+			if (this._textEditor) {
+				this._textEditor?.setSelections(selections);
+			} else if (this._editorViewStates) {
+				this._editorViewStates.cursorState = selections.map(selection => {
+					return {
+						inSelectionMode: !selection.isEmpty(),
+						selectionStart: selection.getStartPosition(),
+						position: selection.getEndPosition(),
+					};
+				});
+			}
 		}
 	}
 
 	getSelections() {
-		return this._textEditor?.getSelections() || [];
+		return this._textEditor?.getSelections()
+			?? this._editorViewStates?.cursorState.map(state => new Selection(state.selectionStart.lineNumber, state.selectionStart.column, state.position.lineNumber, state.position.column))
+			?? [];
 	}
 
 	getSelectionsStartPosition(): IPosition[] | undefined {
@@ -650,20 +699,21 @@ export abstract class BaseCellViewModel extends Disposable {
 
 	protected abstract onDidChangeTextModelContent(): void;
 
-	protected cellStartFind(value: string, options: INotebookSearchOptions): model.FindMatch[] | null {
+	protected cellStartFind(value: string, options: INotebookFindOptions): model.FindMatch[] | null {
 		let cellMatches: model.FindMatch[] = [];
 
+		const lineCount = this.textBuffer.getLineCount();
+		const findRange: IRange[] = options.findScope?.selectedTextRanges ?? [new Range(1, 1, lineCount, this.textBuffer.getLineLength(lineCount) + 1)];
+
 		if (this.assertTextModelAttached()) {
 			cellMatches = this.textModel!.findMatches(
 				value,
-				false,
+				findRange,
 				options.regex || false,
 				options.caseSensitive || false,
 				options.wholeWord ? options.wordSeparators || null : null,
 				options.regex || false);
 		} else {
-			const lineCount = this.textBuffer.getLineCount();
-			const fullRange = new Range(1, 1, lineCount, this.textBuffer.getLineLength(lineCount) + 1);
 			const searchParams = new SearchParams(value, options.regex || false, options.caseSensitive || false, options.wholeWord ? options.wordSeparators || null : null,);
 			const searchData = searchParams.parseSearchRequest();
 
@@ -671,7 +721,9 @@ export abstract class BaseCellViewModel extends Disposable {
 				return null;
 			}
 
-			cellMatches = this.textBuffer.findMatchesLineByLine(fullRange, searchData, options.regex || false, 1000);
+			findRange.forEach(range => {
+				cellMatches.push(...this.textBuffer.findMatchesLineByLine(new Range(range.startLineNumber, range.startColumn, range.endLineNumber, range.endColumn), searchData, options.regex || false, 1000));
+			});
 		}
 
 		return cellMatches;
diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/cellEdit.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/cellEdit.ts
index 6c73c4348ff..7878dbc978d 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewModel/cellEdit.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewModel/cellEdit.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { CellKind, IOutputDto, NotebookCellMetadata, SelectionStateType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { IResourceUndoRedoElement, UndoRedoElementType } from 'vs/platform/undoRedo/common/undoRedo';
-import { URI } from 'vs/base/common/uri';
-import { BaseCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/baseCellViewModel';
-import { CellFocusMode } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
-import { ITextCellEditingDelegate } from 'vs/workbench/contrib/notebook/common/model/cellEdit';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { Selection } from '../../../../../editor/common/core/selection.js';
+import { CellKind, IOutputDto, NotebookCellMetadata, SelectionStateType } from '../../common/notebookCommon.js';
+import { IResourceUndoRedoElement, UndoRedoElementType } from '../../../../../platform/undoRedo/common/undoRedo.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { BaseCellViewModel } from './baseCellViewModel.js';
+import { CellFocusMode } from '../notebookBrowser.js';
+import { NotebookCellTextModel } from '../../common/model/notebookCellTextModel.js';
+import { ITextCellEditingDelegate } from '../../common/model/cellEdit.js';
 
 
 export interface IViewCellEditingDelegate extends ITextCellEditingDelegate {
diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/cellEditorOptions.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/cellEditorOptions.ts
index 84e444ac388..ae027df4af5 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewModel/cellEditorOptions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewModel/cellEditorOptions.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { deepClone } from 'vs/base/common/objects';
-import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IBaseCellEditorOptions, INotebookEditorDelegate } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NotebookOptions } from 'vs/workbench/contrib/notebook/browser/notebookOptions';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { deepClone } from '../../../../../base/common/objects.js';
+import { IEditorOptions } from '../../../../../editor/common/config/editorOptions.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IBaseCellEditorOptions, INotebookEditorDelegate } from '../notebookBrowser.js';
+import { NotebookOptions } from '../notebookOptions.js';
 
 export class BaseCellEditorOptions extends Disposable implements IBaseCellEditorOptions {
 	private static fixedEditorOptions: IEditorOptions = {
diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/cellOutputViewModel.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/cellOutputViewModel.ts
index e8cf31df9e3..db56e595b64 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewModel/cellOutputViewModel.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewModel/cellOutputViewModel.ts
@@ -3,17 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ICellOutputViewModel, IGenericCellViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { ICellOutput, IOrderedMimeType, RENDERER_NOT_AVAILABLE } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
+import { Emitter } from '../../../../../base/common/event.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { observableValue } from '../../../../../base/common/observable.js';
+import { ICellOutputViewModel, IGenericCellViewModel } from '../notebookBrowser.js';
+import { NotebookTextModel } from '../../common/model/notebookTextModel.js';
+import { ICellOutput, IOrderedMimeType, RENDERER_NOT_AVAILABLE } from '../../common/notebookCommon.js';
+import { INotebookService } from '../../common/notebookService.js';
 
 let handle = 0;
 export class CellOutputViewModel extends Disposable implements ICellOutputViewModel {
 	private _onDidResetRendererEmitter = this._register(new Emitter<void>());
 	readonly onDidResetRenderer = this._onDidResetRendererEmitter.event;
+
+	private alwaysShow = false;
+	visible = observableValue<boolean>('outputVisible', false);
+	setVisible(visible = true, force: boolean = false) {
+		if (!visible && this.alwaysShow) {
+			// we are forced to show, so no-op
+			return;
+		}
+
+		if (force && visible) {
+			this.alwaysShow = true;
+		}
+
+		this.visible.set(visible, undefined);
+	}
+
 	outputHandle = handle++;
 	get model(): ICellOutput {
 		return this._outputRawData;
diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/cellSelectionCollection.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/cellSelectionCollection.ts
index 500323ec4e5..d66657a4701 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewModel/cellSelectionCollection.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewModel/cellSelectionCollection.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { ICellRange } from '../../common/notebookRange.js';
 
 function rangesEqual(a: ICellRange[], b: ICellRange[]) {
 	if (a.length !== b.length) {
diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel.ts
index 3f5a6c3e68d..038f9c88d87 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel.ts
@@ -3,27 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event, PauseableEmitter } from 'vs/base/common/event';
-import { dispose } from 'vs/base/common/lifecycle';
-import * as UUID from 'vs/base/common/uuid';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import * as editorCommon from 'vs/editor/common/editorCommon';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { PrefixSumComputer } from 'vs/editor/common/model/prefixSumComputer';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
-import { CellEditState, CellFindMatch, CodeCellLayoutChangeEvent, CodeCellLayoutInfo, CellLayoutState, ICellOutputViewModel, ICellViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CellOutputViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/cellOutputViewModel';
-import { ViewContext } from 'vs/workbench/contrib/notebook/browser/viewModel/viewContext';
-import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
-import { CellKind, INotebookSearchOptions, NotebookCellOutputsSplice } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { NotebookOptionsChangeEvent } from 'vs/workbench/contrib/notebook/browser/notebookOptions';
-import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
-import { BaseCellViewModel } from './baseCellViewModel';
-import { NotebookLayoutInfo } from 'vs/workbench/contrib/notebook/browser/notebookViewEvents';
-import { ICellExecutionError, ICellExecutionStateChangedEvent } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { observableValue } from 'vs/base/common/observable';
+import { Emitter, Event, PauseableEmitter } from '../../../../../base/common/event.js';
+import { dispose } from '../../../../../base/common/lifecycle.js';
+import { observableValue } from '../../../../../base/common/observable.js';
+import * as UUID from '../../../../../base/common/uuid.js';
+import { ICodeEditorService } from '../../../../../editor/browser/services/codeEditorService.js';
+import * as editorCommon from '../../../../../editor/common/editorCommon.js';
+import { PrefixSumComputer } from '../../../../../editor/common/model/prefixSumComputer.js';
+import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IUndoRedoService } from '../../../../../platform/undoRedo/common/undoRedo.js';
+import { CellEditState, CellFindMatch, CellLayoutState, CodeCellLayoutChangeEvent, CodeCellLayoutInfo, ICellOutputViewModel, ICellViewModel } from '../notebookBrowser.js';
+import { NotebookOptionsChangeEvent } from '../notebookOptions.js';
+import { NotebookLayoutInfo } from '../notebookViewEvents.js';
+import { CellOutputViewModel } from './cellOutputViewModel.js';
+import { ViewContext } from './viewContext.js';
+import { NotebookCellTextModel } from '../../common/model/notebookCellTextModel.js';
+import { CellKind, INotebookFindOptions, NotebookCellOutputsSplice } from '../../common/notebookCommon.js';
+import { ICellExecutionError, ICellExecutionStateChangedEvent } from '../../common/notebookExecutionStateService.js';
+import { INotebookService } from '../../common/notebookService.js';
+import { BaseCellViewModel } from './baseCellViewModel.js';
 
 export const outputDisplayLimit = 500;
 
@@ -80,16 +80,6 @@ export class CodeCellViewModel extends BaseCellViewModel implements ICellViewMod
 		return this._chatHeight;
 	}
 
-	private _commentHeight = 0;
-
-	set commentHeight(height: number) {
-		if (this._commentHeight === height) {
-			return;
-		}
-		this._commentHeight = height;
-		this.layoutChange({ commentHeight: true }, 'CodeCellViewModel#commentHeight');
-	}
-
 	private _hoveringOutput: boolean = false;
 	public get outputIsHovered(): boolean {
 		return this._hoveringOutput;
@@ -193,6 +183,7 @@ export class CodeCellViewModel extends BaseCellViewModel implements ICellViewMod
 				: 0,
 			chatHeight: 0,
 			statusBarHeight: 0,
+			commentOffset: 0,
 			commentHeight: 0,
 			outputContainerOffset: 0,
 			outputTotalHeight: 0,
@@ -215,7 +206,8 @@ export class CodeCellViewModel extends BaseCellViewModel implements ICellViewMod
 		}
 	}
 
-	updateOptions(e: NotebookOptionsChangeEvent) {
+	override updateOptions(e: NotebookOptionsChangeEvent) {
+		super.updateOptions(e);
 		if (e.cellStatusBarVisibility || e.insertToolbarPosition || e.cellToolbarLocation) {
 			this.layoutChange({});
 		}
@@ -289,11 +281,12 @@ export class CodeCellViewModel extends BaseCellViewModel implements ICellViewMod
 				editorHeight,
 				editorWidth,
 				statusBarHeight,
-				commentHeight,
 				outputContainerOffset,
 				outputTotalHeight,
 				outputShowMoreContainerHeight,
 				outputShowMoreContainerOffset,
+				commentOffset: outputContainerOffset + outputTotalHeight,
+				commentHeight,
 				totalHeight,
 				codeIndicatorHeight,
 				outputIndicatorHeight,
@@ -330,11 +323,12 @@ export class CodeCellViewModel extends BaseCellViewModel implements ICellViewMod
 				editorWidth,
 				chatHeight: chatHeight,
 				statusBarHeight: 0,
-				commentHeight,
 				outputContainerOffset,
 				outputTotalHeight,
 				outputShowMoreContainerHeight,
 				outputShowMoreContainerOffset,
+				commentOffset: outputContainerOffset + outputTotalHeight,
+				commentHeight,
 				totalHeight,
 				codeIndicatorHeight,
 				outputIndicatorHeight,
@@ -359,22 +353,9 @@ export class CodeCellViewModel extends BaseCellViewModel implements ICellViewMod
 		super.restoreEditorViewState(editorViewStates);
 		if (totalHeight !== undefined && this._layoutInfo.layoutState !== CellLayoutState.Measured) {
 			this._layoutInfo = {
-				fontInfo: this._layoutInfo.fontInfo,
-				chatHeight: this._layoutInfo.chatHeight,
-				editorHeight: this._layoutInfo.editorHeight,
-				editorWidth: this._layoutInfo.editorWidth,
-				statusBarHeight: this.layoutInfo.statusBarHeight,
-				commentHeight: this.layoutInfo.commentHeight,
-				outputContainerOffset: this._layoutInfo.outputContainerOffset,
-				outputTotalHeight: this._layoutInfo.outputTotalHeight,
-				outputShowMoreContainerHeight: this._layoutInfo.outputShowMoreContainerHeight,
-				outputShowMoreContainerOffset: this._layoutInfo.outputShowMoreContainerOffset,
+				...this._layoutInfo,
 				totalHeight: totalHeight,
-				codeIndicatorHeight: this._layoutInfo.codeIndicatorHeight,
-				outputIndicatorHeight: this._layoutInfo.outputIndicatorHeight,
-				bottomToolbarOffset: this._layoutInfo.bottomToolbarOffset,
 				layoutState: CellLayoutState.FromCache,
-				estimatedHasHorizontalScrolling: this._layoutInfo.estimatedHasHorizontalScrolling
 			};
 		}
 	}
@@ -464,7 +445,14 @@ export class CodeCellViewModel extends BaseCellViewModel implements ICellViewMod
 		}
 
 		this._ensureOutputsTop();
-		if (height < 28 && this._outputViewModels[index].hasMultiMimeType()) {
+
+		if (index === 0 || height > 0) {
+			this._outputViewModels[index].setVisible(true);
+		} else if (height === 0) {
+			this._outputViewModels[index].setVisible(false);
+		}
+
+		if (this._outputViewModels[index].visible.get() && height < 28) {
 			height = 28;
 		}
 
@@ -518,7 +506,7 @@ export class CodeCellViewModel extends BaseCellViewModel implements ICellViewMod
 	private readonly _hasFindResult = this._register(new Emitter<boolean>());
 	public readonly hasFindResult: Event<boolean> = this._hasFindResult.event;
 
-	startFind(value: string, options: INotebookSearchOptions): CellFindMatch | null {
+	startFind(value: string, options: INotebookFindOptions): CellFindMatch | null {
 		const matches = super.cellStartFind(value, options);
 
 		if (matches === null) {
diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/eventDispatcher.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/eventDispatcher.ts
index 798931f6a84..df1c2c4bbba 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewModel/eventDispatcher.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewModel/eventDispatcher.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { NotebookCellStateChangedEvent, NotebookLayoutChangedEvent, NotebookMetadataChangedEvent, NotebookViewEvent, NotebookViewEventType } from 'vs/workbench/contrib/notebook/browser/notebookViewEvents';
+import { Emitter } from '../../../../../base/common/event.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { NotebookCellStateChangedEvent, NotebookLayoutChangedEvent, NotebookMetadataChangedEvent, NotebookViewEvent, NotebookViewEventType } from '../notebookViewEvents.js';
 
 export class NotebookEventDispatcher extends Disposable {
 	private readonly _onDidChangeLayout = this._register(new Emitter<NotebookLayoutChangedEvent>());
diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/foldingModel.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/foldingModel.ts
index 4b86fdf8427..2cda442af03 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewModel/foldingModel.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewModel/foldingModel.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { renderMarkdownAsPlaintext } from 'vs/base/browser/markdownRenderer';
-import { Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { marked } from 'vs/base/common/marked/marked';
-import { TrackedRangeStickiness } from 'vs/editor/common/model';
-import { FoldingLimitReporter } from 'vs/editor/contrib/folding/browser/folding';
-import { FoldingRegion, FoldingRegions } from 'vs/editor/contrib/folding/browser/foldingRanges';
-import { IFoldingRangeData, sanitizeRanges } from 'vs/editor/contrib/folding/browser/syntaxRangeProvider';
-import { INotebookViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { cellRangesToIndexes, ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
+import { renderMarkdownAsPlaintext } from '../../../../../base/browser/markdownRenderer.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { DisposableStore, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { marked } from '../../../../../base/common/marked/marked.js';
+import { TrackedRangeStickiness } from '../../../../../editor/common/model.js';
+import { FoldingLimitReporter } from '../../../../../editor/contrib/folding/browser/folding.js';
+import { FoldingRegion, FoldingRegions } from '../../../../../editor/contrib/folding/browser/foldingRanges.js';
+import { IFoldingRangeData, sanitizeRanges } from '../../../../../editor/contrib/folding/browser/syntaxRangeProvider.js';
+import { INotebookViewModel } from '../notebookBrowser.js';
+import { CellKind } from '../../common/notebookCommon.js';
+import { cellRangesToIndexes, ICellRange } from '../../common/notebookRange.js';
 
 type RegionFilter = (r: FoldingRegion) => boolean;
 type RegionFilterWithLevel = (r: FoldingRegion, level: number) => boolean;
diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/markupCellViewModel.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/markupCellViewModel.ts
index 0f255cc20db..c7d85a24cca 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewModel/markupCellViewModel.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewModel/markupCellViewModel.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import * as UUID from 'vs/base/common/uuid';
-import * as editorCommon from 'vs/editor/common/editorCommon';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { CellEditState, CellFindMatch, CellFoldingState, CellLayoutContext, CellLayoutState, EditorFoldingStateDelegate, ICellOutputViewModel, ICellViewModel, MarkupCellLayoutChangeEvent, MarkupCellLayoutInfo } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { BaseCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/baseCellViewModel';
-import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
-import { CellKind, INotebookSearchOptions } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { ViewContext } from 'vs/workbench/contrib/notebook/browser/viewModel/viewContext';
-import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
-import { NotebookOptionsChangeEvent } from 'vs/workbench/contrib/notebook/browser/notebookOptions';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { NotebookCellStateChangedEvent, NotebookLayoutInfo } from 'vs/workbench/contrib/notebook/browser/notebookViewEvents';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import * as UUID from '../../../../../base/common/uuid.js';
+import * as editorCommon from '../../../../../editor/common/editorCommon.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { CellEditState, CellFindMatch, CellFoldingState, CellLayoutContext, CellLayoutState, EditorFoldingStateDelegate, ICellOutputViewModel, ICellViewModel, MarkupCellLayoutChangeEvent, MarkupCellLayoutInfo } from '../notebookBrowser.js';
+import { BaseCellViewModel } from './baseCellViewModel.js';
+import { NotebookCellTextModel } from '../../common/model/notebookCellTextModel.js';
+import { CellKind, INotebookFindOptions } from '../../common/notebookCommon.js';
+import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
+import { ViewContext } from './viewContext.js';
+import { IUndoRedoService } from '../../../../../platform/undoRedo/common/undoRedo.js';
+import { NotebookOptionsChangeEvent } from '../notebookOptions.js';
+import { ICodeEditorService } from '../../../../../editor/browser/services/codeEditorService.js';
+import { NotebookCellStateChangedEvent, NotebookLayoutInfo } from '../notebookViewEvents.js';
 
 export class MarkupCellViewModel extends BaseCellViewModel implements ICellViewModel {
 
@@ -134,6 +134,8 @@ export class MarkupCellViewModel extends BaseCellViewModel implements ICellViewM
 			editorWidth: initialNotebookLayoutInfo?.width
 				? this.viewContext.notebookOptions.computeMarkdownCellEditorWidth(initialNotebookLayoutInfo.width)
 				: 0,
+			commentOffset: 0,
+			commentHeight: 0,
 			bottomToolbarOffset: bottomToolbarGap,
 			totalHeight: 100,
 			layoutState: CellLayoutState.Uninitialized,
@@ -160,13 +162,14 @@ export class MarkupCellViewModel extends BaseCellViewModel implements ICellViewM
 				+ layoutConfiguration.markdownCellTopMargin
 				+ layoutConfiguration.markdownCellBottomMargin
 				+ bottomToolbarGap
-				+ this._statusBarHeight;
+				+ this._statusBarHeight
+				+ this._commentHeight;
 		} else {
 			// @rebornix
 			// On file open, the previewHeight + bottomToolbarGap for a cell out of viewport can be 0
 			// When it's 0, the list view will never try to render it anymore even if we scroll the cell into view.
 			// Thus we make sure it's greater than 0
-			return Math.max(1, this._previewHeight + bottomToolbarGap + foldHintHeight);
+			return Math.max(1, this._previewHeight + bottomToolbarGap + foldHintHeight + this._commentHeight);
 		}
 	}
 
@@ -175,7 +178,8 @@ export class MarkupCellViewModel extends BaseCellViewModel implements ICellViewM
 			0 : this.viewContext.notebookOptions.getLayoutConfiguration().markdownFoldHintHeight;
 	}
 
-	updateOptions(e: NotebookOptionsChangeEvent) {
+	override updateOptions(e: NotebookOptionsChangeEvent) {
+		super.updateOptions(e);
 		if (e.cellStatusBarVisibility || e.insertToolbarPosition || e.cellToolbarLocation) {
 			this._updateTotalHeight(this._computeTotalHeight());
 		}
@@ -204,50 +208,58 @@ export class MarkupCellViewModel extends BaseCellViewModel implements ICellViewM
 	}
 
 	layoutChange(state: MarkupCellLayoutChangeEvent) {
-		// recompute
-		const foldHintHeight = this._computeFoldHintHeight();
+		let totalHeight: number;
+		let foldHintHeight: number;
 		if (!this.isInputCollapsed) {
-			const editorWidth = state.outerWidth !== undefined
-				? this.viewContext.notebookOptions.computeMarkdownCellEditorWidth(state.outerWidth)
-				: this._layoutInfo.editorWidth;
-			const totalHeight = state.totalHeight === undefined
-				? (this._layoutInfo.layoutState === CellLayoutState.Uninitialized ? 100 : this._layoutInfo.totalHeight)
-				: state.totalHeight;
-			const previewHeight = this._previewHeight;
-
-			this._layoutInfo = {
-				fontInfo: state.font || this._layoutInfo.fontInfo,
-				editorWidth,
-				previewHeight,
-				chatHeight: this._chatHeight,
-				editorHeight: this._editorHeight,
-				statusBarHeight: this._statusBarHeight,
-				bottomToolbarOffset: this.viewContext.notebookOptions.computeBottomToolbarOffset(totalHeight, this.viewType),
-				totalHeight,
-				layoutState: CellLayoutState.Measured,
-				foldHintHeight
-			};
+			totalHeight = state.totalHeight === undefined ?
+				(this._layoutInfo.layoutState ===
+					CellLayoutState.Uninitialized ?
+					100 :
+					this._layoutInfo.totalHeight) :
+				state.totalHeight;
+			// recompute
+			foldHintHeight = this._computeFoldHintHeight();
 		} else {
-			const editorWidth = state.outerWidth !== undefined
-				? this.viewContext.notebookOptions.computeMarkdownCellEditorWidth(state.outerWidth)
-				: this._layoutInfo.editorWidth;
-			const totalHeight = this.viewContext.notebookOptions.computeCollapsedMarkdownCellHeight(this.viewType);
-
+			totalHeight =
+				this.viewContext.notebookOptions
+					.computeCollapsedMarkdownCellHeight(this.viewType);
 			state.totalHeight = totalHeight;
 
-			this._layoutInfo = {
-				fontInfo: state.font || this._layoutInfo.fontInfo,
-				editorWidth,
-				chatHeight: this._chatHeight,
-				editorHeight: this._editorHeight,
-				statusBarHeight: this._statusBarHeight,
-				previewHeight: this._previewHeight,
-				bottomToolbarOffset: this.viewContext.notebookOptions.computeBottomToolbarOffset(totalHeight, this.viewType),
-				totalHeight,
-				layoutState: CellLayoutState.Measured,
-				foldHintHeight: 0
-			};
+			foldHintHeight = 0;
 		}
+		let commentOffset: number;
+		if (this.getEditState() === CellEditState.Editing) {
+			const notebookLayoutConfiguration = this.viewContext.notebookOptions.getLayoutConfiguration();
+			commentOffset = notebookLayoutConfiguration.editorToolbarHeight
+				+ notebookLayoutConfiguration.cellTopMargin // CELL_TOP_MARGIN
+				+ this._chatHeight
+				+ this._editorHeight
+				+ this._statusBarHeight;
+		} else {
+			commentOffset = this._previewHeight;
+		}
+
+		this._layoutInfo = {
+			fontInfo: state.font || this._layoutInfo.fontInfo,
+			editorWidth: state.outerWidth !== undefined ?
+				this.viewContext.notebookOptions
+					.computeMarkdownCellEditorWidth(state.outerWidth) :
+				this._layoutInfo.editorWidth,
+			chatHeight: this._chatHeight,
+			editorHeight: this._editorHeight,
+			statusBarHeight: this._statusBarHeight,
+			previewHeight: this._previewHeight,
+			bottomToolbarOffset: this.viewContext.notebookOptions
+				.computeBottomToolbarOffset(
+					totalHeight, this.viewType),
+			totalHeight,
+			layoutState: CellLayoutState.Measured,
+			foldHintHeight,
+			commentOffset,
+			commentHeight: state.commentHeight ?
+				this._commentHeight :
+				this._layoutInfo.commentHeight,
+		};
 
 		this._onDidChangeLayout.fire(state);
 	}
@@ -257,16 +269,12 @@ export class MarkupCellViewModel extends BaseCellViewModel implements ICellViewM
 		// we might already warmup the viewport so the cell has a total height computed
 		if (totalHeight !== undefined && this.layoutInfo.layoutState === CellLayoutState.Uninitialized) {
 			this._layoutInfo = {
-				fontInfo: this._layoutInfo.fontInfo,
-				editorWidth: this._layoutInfo.editorWidth,
-				previewHeight: this._layoutInfo.previewHeight,
-				bottomToolbarOffset: this._layoutInfo.bottomToolbarOffset,
+				...this.layoutInfo,
 				totalHeight: totalHeight,
 				chatHeight: this._chatHeight,
 				editorHeight: this._editorHeight,
 				statusBarHeight: this._statusBarHeight,
 				layoutState: CellLayoutState.FromCache,
-				foldHintHeight: this._layoutInfo.foldHintHeight
 			};
 			this.layoutChange({});
 		}
@@ -295,7 +303,7 @@ export class MarkupCellViewModel extends BaseCellViewModel implements ICellViewM
 	private readonly _hasFindResult = this._register(new Emitter<boolean>());
 	public readonly hasFindResult: Event<boolean> = this._hasFindResult.event;
 
-	startFind(value: string, options: INotebookSearchOptions): CellFindMatch | null {
+	startFind(value: string, options: INotebookFindOptions): CellFindMatch | null {
 		const matches = super.cellStartFind(value, options);
 
 		if (matches === null) {
diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineDataSource.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineDataSource.ts
new file mode 100644
index 00000000000..57c4a840aa7
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineDataSource.ts
@@ -0,0 +1,216 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { DisposableStore, MutableDisposable } from '../../../../../base/common/lifecycle.js';
+import { isEqual } from '../../../../../base/common/resources.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IMarkerService } from '../../../../../platform/markers/common/markers.js';
+import { IActiveNotebookEditor, INotebookEditor } from '../notebookBrowser.js';
+import { CellKind } from '../../common/notebookCommon.js';
+import { OutlineChangeEvent, OutlineConfigKeys } from '../../../../services/outline/browser/outline.js';
+import { OutlineEntry } from './OutlineEntry.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { INotebookOutlineEntryFactory, NotebookOutlineEntryFactory } from './notebookOutlineEntryFactory.js';
+
+export interface INotebookCellOutlineDataSource {
+	readonly activeElement: OutlineEntry | undefined;
+	readonly entries: OutlineEntry[];
+}
+
+export class NotebookCellOutlineDataSource implements INotebookCellOutlineDataSource {
+
+	private readonly _disposables = new DisposableStore();
+
+	private readonly _onDidChange = new Emitter<OutlineChangeEvent>();
+	readonly onDidChange: Event<OutlineChangeEvent> = this._onDidChange.event;
+
+	private _uri: URI | undefined;
+	private _entries: OutlineEntry[] = [];
+	private _activeEntry?: OutlineEntry;
+
+	constructor(
+		private readonly _editor: INotebookEditor,
+		@IMarkerService private readonly _markerService: IMarkerService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@INotebookOutlineEntryFactory private readonly _outlineEntryFactory: NotebookOutlineEntryFactory
+	) {
+		this.recomputeState();
+	}
+
+	get activeElement(): OutlineEntry | undefined {
+		return this._activeEntry;
+	}
+	get entries(): OutlineEntry[] {
+		return this._entries;
+	}
+	get isEmpty(): boolean {
+		return this._entries.length === 0;
+	}
+	get uri() {
+		return this._uri;
+	}
+
+	public async computeFullSymbols(cancelToken: CancellationToken) {
+		const notebookEditorWidget = this._editor;
+
+		const notebookCells = notebookEditorWidget?.getViewModel()?.viewCells.filter((cell) => cell.cellKind === CellKind.Code);
+
+		if (notebookCells) {
+			const promises: Promise<void>[] = [];
+			// limit the number of cells so that we don't resolve an excessive amount of text models
+			for (const cell of notebookCells.slice(0, 50)) {
+				// gather all symbols asynchronously
+				promises.push(this._outlineEntryFactory.cacheSymbols(cell, cancelToken));
+			}
+			await Promise.allSettled(promises);
+		}
+		this.recomputeState();
+	}
+
+	public recomputeState(): void {
+		this._disposables.clear();
+		this._activeEntry = undefined;
+		this._uri = undefined;
+
+		if (!this._editor.hasModel()) {
+			return;
+		}
+
+		this._uri = this._editor.textModel.uri;
+
+		const notebookEditorWidget: IActiveNotebookEditor = this._editor;
+
+		if (notebookEditorWidget.getLength() === 0) {
+			return;
+		}
+
+		const notebookCells = notebookEditorWidget.getViewModel().viewCells;
+
+		const entries: OutlineEntry[] = [];
+		for (const cell of notebookCells) {
+			entries.push(...this._outlineEntryFactory.getOutlineEntries(cell, entries.length));
+		}
+
+		// build a tree from the list of entries
+		if (entries.length > 0) {
+			const result: OutlineEntry[] = [entries[0]];
+			const parentStack: OutlineEntry[] = [entries[0]];
+
+			for (let i = 1; i < entries.length; i++) {
+				const entry = entries[i];
+
+				while (true) {
+					const len = parentStack.length;
+					if (len === 0) {
+						// root node
+						result.push(entry);
+						parentStack.push(entry);
+						break;
+
+					} else {
+						const parentCandidate = parentStack[len - 1];
+						if (parentCandidate.level < entry.level) {
+							parentCandidate.addChild(entry);
+							parentStack.push(entry);
+							break;
+						} else {
+							parentStack.pop();
+						}
+					}
+				}
+			}
+			this._entries = result;
+		}
+
+		// feature: show markers with each cell
+		const markerServiceListener = new MutableDisposable();
+		this._disposables.add(markerServiceListener);
+		const updateMarkerUpdater = () => {
+			if (notebookEditorWidget.isDisposed) {
+				return;
+			}
+
+			const doUpdateMarker = (clear: boolean) => {
+				for (const entry of this._entries) {
+					if (clear) {
+						entry.clearMarkers();
+					} else {
+						entry.updateMarkers(this._markerService);
+					}
+				}
+			};
+			const problem = this._configurationService.getValue('problems.visibility');
+			if (problem === undefined) {
+				return;
+			}
+
+			const config = this._configurationService.getValue(OutlineConfigKeys.problemsEnabled);
+
+			if (problem && config) {
+				markerServiceListener.value = this._markerService.onMarkerChanged(e => {
+					if (notebookEditorWidget.isDisposed) {
+						console.error('notebook editor is disposed');
+						return;
+					}
+
+					if (e.some(uri => notebookEditorWidget.getCellsInRange().some(cell => isEqual(cell.uri, uri)))) {
+						doUpdateMarker(false);
+						this._onDidChange.fire({});
+					}
+				});
+				doUpdateMarker(false);
+			} else {
+				markerServiceListener.clear();
+				doUpdateMarker(true);
+			}
+		};
+		updateMarkerUpdater();
+		this._disposables.add(this._configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration('problems.visibility') || e.affectsConfiguration(OutlineConfigKeys.problemsEnabled)) {
+				updateMarkerUpdater();
+				this._onDidChange.fire({});
+			}
+		}));
+
+		const { changeEventTriggered } = this.recomputeActive();
+		if (!changeEventTriggered) {
+			this._onDidChange.fire({});
+		}
+	}
+
+	public recomputeActive(): { changeEventTriggered: boolean } {
+		let newActive: OutlineEntry | undefined;
+		const notebookEditorWidget = this._editor;
+
+		if (notebookEditorWidget) {//TODO don't check for widget, only here if we do have
+			if (notebookEditorWidget.hasModel() && notebookEditorWidget.getLength() > 0) {
+				const cell = notebookEditorWidget.cellAt(notebookEditorWidget.getFocus().start);
+				if (cell) {
+					for (const entry of this._entries) {
+						newActive = entry.find(cell, []);
+						if (newActive) {
+							break;
+						}
+					}
+				}
+			}
+		}
+
+		if (newActive !== this._activeEntry) {
+			this._activeEntry = newActive;
+			this._onDidChange.fire({ affectOnlyActiveElement: true });
+			return { changeEventTriggered: true };
+		}
+		return { changeEventTriggered: false };
+	}
+
+	dispose(): void {
+		this._entries.length = 0;
+		this._activeEntry = undefined;
+		this._disposables.dispose();
+	}
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineDataSourceFactory.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineDataSourceFactory.ts
new file mode 100644
index 00000000000..dcc982a81c6
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineDataSourceFactory.ts
@@ -0,0 +1,38 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ReferenceCollection, type IReference } from '../../../../../base/common/lifecycle.js';
+import { IInstantiationService, createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
+import type { INotebookEditor } from '../notebookBrowser.js';
+import { NotebookCellOutlineDataSource } from './notebookOutlineDataSource.js';
+
+class NotebookCellOutlineDataSourceReferenceCollection extends ReferenceCollection<NotebookCellOutlineDataSource> {
+	constructor(@IInstantiationService private readonly instantiationService: IInstantiationService) {
+		super();
+	}
+	protected override createReferencedObject(_key: string, editor: INotebookEditor): NotebookCellOutlineDataSource {
+		return this.instantiationService.createInstance(NotebookCellOutlineDataSource, editor);
+	}
+	protected override destroyReferencedObject(_key: string, object: NotebookCellOutlineDataSource): void {
+		object.dispose();
+	}
+}
+
+export const INotebookCellOutlineDataSourceFactory = createDecorator<INotebookCellOutlineDataSourceFactory>('INotebookCellOutlineDataSourceFactory');
+
+export interface INotebookCellOutlineDataSourceFactory {
+	getOrCreate(editor: INotebookEditor): IReference<NotebookCellOutlineDataSource>;
+}
+
+export class NotebookCellOutlineDataSourceFactory implements INotebookCellOutlineDataSourceFactory {
+	private readonly _data: NotebookCellOutlineDataSourceReferenceCollection;
+	constructor(@IInstantiationService instantiationService: IInstantiationService) {
+		this._data = instantiationService.createInstance(NotebookCellOutlineDataSourceReferenceCollection);
+	}
+
+	getOrCreate(editor: INotebookEditor): IReference<NotebookCellOutlineDataSource> {
+		return this._data.acquire(editor.getId(), editor);
+	}
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineEntryFactory.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineEntryFactory.ts
index 77a8ba22ab4..6c708a2fa67 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineEntryFactory.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineEntryFactory.ts
@@ -3,18 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { renderMarkdownAsPlaintext } from 'vs/base/browser/markdownRenderer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IOutlineModelService, OutlineModelService } from 'vs/editor/contrib/documentSymbols/browser/outlineModel';
-import { localize } from 'vs/nls';
-import { ICellViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { getMarkdownHeadersInCell } from 'vs/workbench/contrib/notebook/browser/viewModel/foldingModel';
-import { OutlineEntry } from './OutlineEntry';
-import { CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
-import { IRange } from 'vs/editor/common/core/range';
-import { SymbolKind } from 'vs/editor/common/languages';
-import { OutlineTarget } from 'vs/workbench/services/outline/browser/outline';
+import { renderMarkdownAsPlaintext } from '../../../../../base/browser/markdownRenderer.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { IOutlineModelService, OutlineModelService } from '../../../../../editor/contrib/documentSymbols/browser/outlineModel.js';
+import { localize } from '../../../../../nls.js';
+import { ICellViewModel } from '../notebookBrowser.js';
+import { getMarkdownHeadersInCell } from './foldingModel.js';
+import { OutlineEntry } from './OutlineEntry.js';
+import { CellKind } from '../../common/notebookCommon.js';
+import { INotebookExecutionStateService } from '../../common/notebookExecutionStateService.js';
+import { IRange } from '../../../../../editor/common/core/range.js';
+import { SymbolKind } from '../../../../../editor/common/languages.js';
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
 
 export const enum NotebookOutlineConstants {
 	NonHeaderOutlineLevel = 7,
@@ -42,15 +43,28 @@ function getMarkdownHeadersInCellFallbackToHtmlTags(fullContent: string) {
 	return headers;
 }
 
-export class NotebookOutlineEntryFactory {
+export const INotebookOutlineEntryFactory = createDecorator<INotebookOutlineEntryFactory>('INotebookOutlineEntryFactory');
+
+export interface INotebookOutlineEntryFactory {
+	readonly _serviceBrand: undefined;
+
+	getOutlineEntries(cell: ICellViewModel, index: number): OutlineEntry[];
+	cacheSymbols(cell: ICellViewModel, cancelToken: CancellationToken): Promise<void>;
+}
+
+export class NotebookOutlineEntryFactory implements INotebookOutlineEntryFactory {
+
+	declare readonly _serviceBrand: undefined;
 
 	private cellOutlineEntryCache: Record<string, entryDesc[]> = {};
 	private readonly cachedMarkdownOutlineEntries = new WeakMap<ICellViewModel, { alternativeId: number; headers: { depth: number; text: string }[] }>();
 	constructor(
-		private readonly executionStateService: INotebookExecutionStateService
+		@INotebookExecutionStateService private readonly executionStateService: INotebookExecutionStateService,
+		@IOutlineModelService private readonly outlineModelService: IOutlineModelService,
+		@ITextModelService private readonly textModelService: ITextModelService
 	) { }
 
-	public getOutlineEntries(cell: ICellViewModel, target: OutlineTarget, index: number): OutlineEntry[] {
+	public getOutlineEntries(cell: ICellViewModel, index: number): OutlineEntry[] {
 		const entries: OutlineEntry[] = [];
 
 		const isMarkdown = cell.cellKind === CellKind.Markup;
@@ -81,16 +95,16 @@ export class NotebookOutlineEntryFactory {
 			const exeState = !isMarkdown && this.executionStateService.getCellExecution(cell.uri);
 			let preview = content.trim();
 
-			if (!isMarkdown && cell.model.textModel) {
-				const cachedEntries = this.cellOutlineEntryCache[cell.model.textModel.id];
+			if (!isMarkdown) {
+				const cached = this.cellOutlineEntryCache[cell.id];
 
 				// Gathering symbols from the model is an async operation, but this provider is syncronous.
 				// So symbols need to be precached before this function is called to get the full list.
-				if (cachedEntries) {
+				if (cached) {
 					// push code cell entry that is a parent of cached symbols, always necessary. filtering for quickpick done in that provider.
 					entries.push(new OutlineEntry(index++, NotebookOutlineConstants.NonHeaderOutlineLevel, cell, preview, !!exeState, exeState ? exeState.isPaused : false));
-					cachedEntries.forEach((cached) => {
-						entries.push(new OutlineEntry(index++, cached.level, cell, cached.name, false, false, cached.range, cached.kind));
+					cached.forEach((entry) => {
+						entries.push(new OutlineEntry(index++, entry.level, cell, entry.name, false, false, entry.range, entry.kind));
 					});
 				}
 			}
@@ -107,11 +121,20 @@ export class NotebookOutlineEntryFactory {
 		return entries;
 	}
 
-	public async cacheSymbols(cell: ICellViewModel, outlineModelService: IOutlineModelService, cancelToken: CancellationToken) {
-		const textModel = await cell.resolveTextModel();
-		const outlineModel = await outlineModelService.getOrCreate(textModel, cancelToken);
-		const entries = createOutlineEntries(outlineModel.getTopLevelSymbols(), 8);
-		this.cellOutlineEntryCache[textModel.id] = entries;
+	public async cacheSymbols(cell: ICellViewModel, cancelToken: CancellationToken) {
+		if (cell.cellKind === CellKind.Markup) {
+			return;
+		}
+
+		const ref = await this.textModelService.createModelReference(cell.uri);
+		try {
+			const textModel = ref.object.textEditorModel;
+			const outlineModel = await this.outlineModelService.getOrCreate(textModel, cancelToken);
+			const entries = createOutlineEntries(outlineModel.getTopLevelSymbols(), 8);
+			this.cellOutlineEntryCache[cell.id] = entries;
+		} finally {
+			ref.dispose();
+		}
 	}
 }
 
diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineProvider.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineProvider.ts
deleted file mode 100644
index 1ac843597ab..00000000000
--- a/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineProvider.ts
+++ /dev/null
@@ -1,316 +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 { Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
-import { isEqual } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IMarkerService } from 'vs/platform/markers/common/markers';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IActiveNotebookEditor, ICellViewModel, INotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CellKind, NotebookCellsChangeType, NotebookSetting } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotebookExecutionStateService, NotebookExecutionType } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
-import { OutlineChangeEvent, OutlineConfigKeys, OutlineTarget } from 'vs/workbench/services/outline/browser/outline';
-import { OutlineEntry } from './OutlineEntry';
-import { IOutlineModelService } from 'vs/editor/contrib/documentSymbols/browser/outlineModel';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { NotebookOutlineConstants, NotebookOutlineEntryFactory } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineEntryFactory';
-import { Delayer } from 'vs/base/common/async';
-
-export class NotebookCellOutlineProvider {
-	private readonly _disposables = new DisposableStore();
-	private readonly _onDidChange = new Emitter<OutlineChangeEvent>();
-
-	readonly onDidChange: Event<OutlineChangeEvent> = this._onDidChange.event;
-
-	private _uri: URI | undefined;
-	private _entries: OutlineEntry[] = [];
-	get entries(): OutlineEntry[] {
-		if (this.delayedOutlineRecompute.isTriggered()) {
-			this.delayedOutlineRecompute.cancel();
-			this._recomputeState();
-		}
-		return this._entries;
-	}
-
-	private _activeEntry?: OutlineEntry;
-	private readonly _entriesDisposables = new DisposableStore();
-
-	readonly outlineKind = 'notebookCells';
-
-	get activeElement(): OutlineEntry | undefined {
-		if (this.delayedOutlineRecompute.isTriggered()) {
-			this.delayedOutlineRecompute.cancel();
-			this._recomputeState();
-		}
-		return this._activeEntry;
-	}
-
-	private readonly _outlineEntryFactory: NotebookOutlineEntryFactory;
-	private readonly delayedOutlineRecompute: Delayer<void>;
-	constructor(
-		private readonly _editor: INotebookEditor,
-		private readonly _target: OutlineTarget,
-		@IThemeService themeService: IThemeService,
-		@INotebookExecutionStateService notebookExecutionStateService: INotebookExecutionStateService,
-		@IOutlineModelService private readonly _outlineModelService: IOutlineModelService,
-		@IMarkerService private readonly _markerService: IMarkerService,
-		@IConfigurationService private readonly _configurationService: IConfigurationService,
-	) {
-		this._outlineEntryFactory = new NotebookOutlineEntryFactory(notebookExecutionStateService);
-
-		const delayerRecomputeActive = this._disposables.add(new Delayer(200));
-		this._disposables.add(_editor.onDidChangeSelection(() => {
-			delayerRecomputeActive.trigger(() => this._recomputeActive());
-		}, this));
-
-		// .3s of a delay is sufficient, 100-200s is too quick and will unnecessarily block the ui thread.
-		// Given we're only updating the outline when the user types, we can afford to wait a bit.
-		this.delayedOutlineRecompute = this._disposables.add(new Delayer<void>(300));
-		const delayedRecompute = () => {
-			delayerRecomputeActive.cancel(); // Active is always recomputed after a recomputing the outline state.
-			this.delayedOutlineRecompute.trigger(() => this._recomputeState());
-		};
-
-		this._disposables.add(_configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration(NotebookSetting.outlineShowMarkdownHeadersOnly) ||
-				e.affectsConfiguration(NotebookSetting.outlineShowCodeCells) ||
-				e.affectsConfiguration(NotebookSetting.outlineShowCodeCellSymbols) ||
-				e.affectsConfiguration(NotebookSetting.breadcrumbsShowCodeCells)
-			) {
-				delayedRecompute();
-			}
-		}));
-
-		this._disposables.add(themeService.onDidFileIconThemeChange(() => {
-			this._onDidChange.fire({});
-		}));
-
-		this._disposables.add(
-			notebookExecutionStateService.onDidChangeExecution(e => {
-				if (e.type === NotebookExecutionType.cell && !!this._editor.textModel && e.affectsNotebook(this._editor.textModel?.uri)) {
-					delayedRecompute();
-				}
-			})
-		);
-
-		const disposable = this._disposables.add(new DisposableStore());
-		const monitorModelChanges = () => {
-			disposable.clear();
-			if (!this._editor.textModel) {
-				return;
-			}
-			disposable.add(this._editor.textModel.onDidChangeContent(contentChanges => {
-				if (contentChanges.rawEvents.some(c => c.kind === NotebookCellsChangeType.ChangeCellContent ||
-					c.kind === NotebookCellsChangeType.ChangeCellInternalMetadata ||
-					c.kind === NotebookCellsChangeType.Move ||
-					c.kind === NotebookCellsChangeType.ModelChange)) {
-					delayedRecompute();
-				}
-			}));
-			// Perhaps this is the first time we're building the outline
-			if (!this._entries.length) {
-				this._recomputeState();
-			}
-		};
-		this._disposables.add(this._editor.onDidChangeModel(monitorModelChanges));
-		monitorModelChanges();
-		this._recomputeState();
-	}
-
-	dispose(): void {
-		this._entries.length = 0;
-		this._activeEntry = undefined;
-		this._entriesDisposables.dispose();
-		this._disposables.dispose();
-	}
-
-	async setFullSymbols(cancelToken: CancellationToken) {
-		const notebookEditorWidget = this._editor;
-
-		const notebookCells = notebookEditorWidget?.getViewModel()?.viewCells.filter((cell) => cell.cellKind === CellKind.Code);
-
-		if (notebookCells) {
-			const promises: Promise<void>[] = [];
-			// limit the number of cells so that we don't resolve an excessive amount of text models
-			for (const cell of notebookCells.slice(0, 100)) {
-				// gather all symbols asynchronously
-				promises.push(this._outlineEntryFactory.cacheSymbols(cell, this._outlineModelService, cancelToken));
-			}
-			await Promise.allSettled(promises);
-		}
-
-		this._recomputeState();
-	}
-	private _recomputeState(): void {
-		this._entriesDisposables.clear();
-		this._activeEntry = undefined;
-		this._uri = undefined;
-
-		if (!this._editor.hasModel()) {
-			return;
-		}
-
-		this._uri = this._editor.textModel.uri;
-
-		const notebookEditorWidget: IActiveNotebookEditor = this._editor;
-
-		if (notebookEditorWidget.getLength() === 0) {
-			return;
-		}
-
-		let includeCodeCells = true;
-		if (this._target === OutlineTarget.Breadcrumbs) {
-			includeCodeCells = this._configurationService.getValue<boolean>('notebook.breadcrumbs.showCodeCells');
-		}
-
-		let notebookCells: ICellViewModel[];
-		if (this._target === OutlineTarget.Breadcrumbs) {
-			notebookCells = notebookEditorWidget.getViewModel().viewCells.filter((cell) => cell.cellKind === CellKind.Markup || includeCodeCells);
-		} else {
-			notebookCells = notebookEditorWidget.getViewModel().viewCells;
-		}
-
-		const entries: OutlineEntry[] = [];
-		for (const cell of notebookCells) {
-			entries.push(...this._outlineEntryFactory.getOutlineEntries(cell, this._target, entries.length));
-		}
-
-		// build a tree from the list of entries
-		if (entries.length > 0) {
-			const result: OutlineEntry[] = [entries[0]];
-			const parentStack: OutlineEntry[] = [entries[0]];
-
-			for (let i = 1; i < entries.length; i++) {
-				const entry = entries[i];
-
-				while (true) {
-					const len = parentStack.length;
-					if (len === 0) {
-						// root node
-						result.push(entry);
-						parentStack.push(entry);
-						break;
-
-					} else {
-						const parentCandidate = parentStack[len - 1];
-						if (parentCandidate.level < entry.level) {
-							parentCandidate.addChild(entry);
-							parentStack.push(entry);
-							break;
-						} else {
-							parentStack.pop();
-						}
-					}
-				}
-			}
-			this._entries = result;
-		}
-
-		// feature: show markers with each cell
-		const markerServiceListener = new MutableDisposable();
-		this._entriesDisposables.add(markerServiceListener);
-		const updateMarkerUpdater = () => {
-			if (notebookEditorWidget.isDisposed) {
-				return;
-			}
-
-			const doUpdateMarker = (clear: boolean) => {
-				for (const entry of this._entries) {
-					if (clear) {
-						entry.clearMarkers();
-					} else {
-						entry.updateMarkers(this._markerService);
-					}
-				}
-			};
-			const problem = this._configurationService.getValue('problems.visibility');
-			if (problem === undefined) {
-				return;
-			}
-
-			const config = this._configurationService.getValue(OutlineConfigKeys.problemsEnabled);
-
-			if (problem && config) {
-				markerServiceListener.value = this._markerService.onMarkerChanged(e => {
-					if (notebookEditorWidget.isDisposed) {
-						console.error('notebook editor is disposed');
-						return;
-					}
-
-					if (e.some(uri => notebookEditorWidget.getCellsInRange().some(cell => isEqual(cell.uri, uri)))) {
-						doUpdateMarker(false);
-						this._onDidChange.fire({});
-					}
-				});
-				doUpdateMarker(false);
-			} else {
-				markerServiceListener.clear();
-				doUpdateMarker(true);
-			}
-		};
-		updateMarkerUpdater();
-		this._entriesDisposables.add(this._configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration('problems.visibility') || e.affectsConfiguration(OutlineConfigKeys.problemsEnabled)) {
-				updateMarkerUpdater();
-				this._onDidChange.fire({});
-			}
-		}));
-
-		const { changeEventTriggered } = this._recomputeActive();
-		if (!changeEventTriggered) {
-			this._onDidChange.fire({});
-		}
-	}
-
-	private _recomputeActive(): { changeEventTriggered: boolean } {
-		let newActive: OutlineEntry | undefined;
-		const notebookEditorWidget = this._editor;
-
-		if (notebookEditorWidget) {//TODO don't check for widget, only here if we do have
-			if (notebookEditorWidget.hasModel() && notebookEditorWidget.getLength() > 0) {
-				const cell = notebookEditorWidget.cellAt(notebookEditorWidget.getFocus().start);
-				if (cell) {
-					for (const entry of this._entries) {
-						newActive = entry.find(cell, []);
-						if (newActive) {
-							break;
-						}
-					}
-				}
-			}
-		}
-
-		// @Yoyokrazy - Make sure the new active entry isn't part of the filtered exclusions
-		const showCodeCells = this._configurationService.getValue<boolean>(NotebookSetting.outlineShowCodeCells);
-		const showCodeCellSymbols = this._configurationService.getValue<boolean>(NotebookSetting.outlineShowCodeCellSymbols);
-		const showMarkdownHeadersOnly = this._configurationService.getValue<boolean>(NotebookSetting.outlineShowMarkdownHeadersOnly);
-
-		// check the three outline filtering conditions
-		// if any are true, newActive should NOT be set to this._activeEntry and the event should NOT fire
-		if (
-			(newActive !== this._activeEntry) && !(
-				(showMarkdownHeadersOnly && newActive?.cell.cellKind === CellKind.Markup && newActive?.level === NotebookOutlineConstants.NonHeaderOutlineLevel) ||	// show headers only + cell is mkdn + is level 7 (no header)
-				(!showCodeCells && newActive?.cell.cellKind === CellKind.Code) ||																					// show code cells   + cell is code
-				(!showCodeCellSymbols && newActive?.cell.cellKind === CellKind.Code && newActive?.level > NotebookOutlineConstants.NonHeaderOutlineLevel)			// show code symbols + cell is code + has level > 7 (nb symbol levels)
-			)
-		) {
-			this._activeEntry = newActive;
-			this._onDidChange.fire({ affectOnlyActiveElement: true });
-			return { changeEventTriggered: true };
-		}
-
-		return { changeEventTriggered: false };
-	}
-
-	get isEmpty(): boolean {
-		return this._entries.length === 0;
-	}
-
-	get uri() {
-		return this._uri;
-	}
-}
diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineProviderFactory.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineProviderFactory.ts
deleted file mode 100644
index 54411bcd296..00000000000
--- a/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineProviderFactory.ts
+++ /dev/null
@@ -1,39 +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 { ReferenceCollection, type IReference } from 'vs/base/common/lifecycle';
-import { IInstantiationService, createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import type { INotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NotebookCellOutlineProvider } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineProvider';
-import type { OutlineTarget } from 'vs/workbench/services/outline/browser/outline';
-
-class NotebookCellOutlineProviderReferenceCollection extends ReferenceCollection<NotebookCellOutlineProvider> {
-	constructor(@IInstantiationService private readonly instantiationService: IInstantiationService) {
-		super();
-	}
-	protected override createReferencedObject(_key: string, editor: INotebookEditor, target: OutlineTarget): NotebookCellOutlineProvider {
-		return this.instantiationService.createInstance(NotebookCellOutlineProvider, editor, target);
-	}
-	protected override destroyReferencedObject(_key: string, object: NotebookCellOutlineProvider): void {
-		object.dispose();
-	}
-}
-
-export const INotebookCellOutlineProviderFactory = createDecorator<INotebookCellOutlineProviderFactory>('INotebookCellOutlineProviderFactory');
-
-export interface INotebookCellOutlineProviderFactory {
-	getOrCreate(editor: INotebookEditor, target: OutlineTarget): IReference<NotebookCellOutlineProvider>;
-}
-
-export class NotebookCellOutlineProviderFactory implements INotebookCellOutlineProviderFactory {
-	private readonly _data: NotebookCellOutlineProviderReferenceCollection;
-	constructor(@IInstantiationService instantiationService: IInstantiationService) {
-		this._data = instantiationService.createInstance(NotebookCellOutlineProviderReferenceCollection);
-	}
-
-	getOrCreate(editor: INotebookEditor, target: OutlineTarget): IReference<NotebookCellOutlineProvider> {
-		return this._data.acquire(editor.getId(), editor, target);
-	}
-}
diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl.ts
index 8a0f8379011..09d6f75c5cf 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl.ts
@@ -3,37 +3,37 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { groupBy } from 'vs/base/common/collections';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { clamp } from 'vs/base/common/numbers';
-import * as strings from 'vs/base/common/strings';
-import { URI } from 'vs/base/common/uri';
-import { IBulkEditService, ResourceTextEdit } from 'vs/editor/browser/services/bulkEditService';
-import { Range } from 'vs/editor/common/core/range';
-import * as editorCommon from 'vs/editor/common/editorCommon';
-import { FindMatch, IModelDecorationOptions, IModelDeltaDecoration, TrackedRangeStickiness } from 'vs/editor/common/model';
-import { MultiModelEditStackElement, SingleModelEditStackElement } from 'vs/editor/common/model/editStack';
-import { IntervalNode, IntervalTree } from 'vs/editor/common/model/intervalTree';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { IWorkspaceTextEdit } from 'vs/editor/common/languages';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { FoldingRegions } from 'vs/editor/contrib/folding/browser/foldingRanges';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
-import { CellEditState, CellFindMatchWithIndex, CellFoldingState, EditorFoldingStateDelegate, ICellViewModel, INotebookDeltaCellStatusBarItems, INotebookDeltaDecoration, ICellModelDecorations, ICellModelDeltaDecorations, IModelDecorationsChangeAccessor, INotebookEditorViewState, INotebookViewCellsUpdateEvent, INotebookViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NotebookCellSelectionCollection } from 'vs/workbench/contrib/notebook/browser/viewModel/cellSelectionCollection';
-import { CodeCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
-import { MarkupCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/markupCellViewModel';
-import { ViewContext } from 'vs/workbench/contrib/notebook/browser/viewModel/viewContext';
-import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { CellKind, ICell, INotebookSearchOptions, ISelectionState, NotebookCellsChangeType, NotebookCellTextModelSplice, SelectionStateType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { cellIndexesToRanges, cellRangesToIndexes, ICellRange, reduceCellRanges } from 'vs/workbench/contrib/notebook/common/notebookRange';
-import { NotebookLayoutInfo, NotebookMetadataChangedEvent } from 'vs/workbench/contrib/notebook/browser/notebookViewEvents';
-import { CellFindMatchModel } from 'vs/workbench/contrib/notebook/browser/contrib/find/findModel';
-import { INotebookExecutionStateService, NotebookExecutionType } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
+import { groupBy } from '../../../../../base/common/collections.js';
+import { onUnexpectedError } from '../../../../../base/common/errors.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { clamp } from '../../../../../base/common/numbers.js';
+import * as strings from '../../../../../base/common/strings.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { IBulkEditService, ResourceTextEdit } from '../../../../../editor/browser/services/bulkEditService.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import * as editorCommon from '../../../../../editor/common/editorCommon.js';
+import { IWorkspaceTextEdit } from '../../../../../editor/common/languages.js';
+import { FindMatch, IModelDecorationOptions, IModelDeltaDecoration, TrackedRangeStickiness } from '../../../../../editor/common/model.js';
+import { MultiModelEditStackElement, SingleModelEditStackElement } from '../../../../../editor/common/model/editStack.js';
+import { IntervalNode, IntervalTree } from '../../../../../editor/common/model/intervalTree.js';
+import { ModelDecorationOptions } from '../../../../../editor/common/model/textModel.js';
+import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
+import { FoldingRegions } from '../../../../../editor/contrib/folding/browser/foldingRanges.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IUndoRedoService } from '../../../../../platform/undoRedo/common/undoRedo.js';
+import { CellFindMatchModel } from '../contrib/find/findModel.js';
+import { CellEditState, CellFindMatchWithIndex, CellFoldingState, EditorFoldingStateDelegate, ICellModelDecorations, ICellModelDeltaDecorations, ICellViewModel, IModelDecorationsChangeAccessor, INotebookDeltaCellStatusBarItems, INotebookDeltaDecoration, INotebookEditorViewState, INotebookViewCellsUpdateEvent, INotebookViewModel } from '../notebookBrowser.js';
+import { NotebookLayoutInfo, NotebookMetadataChangedEvent } from '../notebookViewEvents.js';
+import { NotebookCellSelectionCollection } from './cellSelectionCollection.js';
+import { CodeCellViewModel } from './codeCellViewModel.js';
+import { MarkupCellViewModel } from './markupCellViewModel.js';
+import { ViewContext } from './viewContext.js';
+import { NotebookCellTextModel } from '../../common/model/notebookCellTextModel.js';
+import { NotebookTextModel } from '../../common/model/notebookTextModel.js';
+import { CellKind, ICell, INotebookFindOptions, ISelectionState, NotebookCellsChangeType, NotebookCellTextModelSplice, NotebookFindScopeType, SelectionStateType } from '../../common/notebookCommon.js';
+import { INotebookExecutionStateService, NotebookExecutionType } from '../../common/notebookExecutionStateService.js';
+import { cellIndexesToRanges, cellRangesToIndexes, ICellRange, reduceCellRanges } from '../../common/notebookRange.js';
 
 const invalidFunc = () => { throw new Error(`Invalid change accessor`); };
 
@@ -113,10 +113,6 @@ export class NotebookViewModel extends Disposable implements EditorFoldingStateD
 		return this._viewCells;
 	}
 
-	set viewCells(_: ICellViewModel[]) {
-		throw new Error('NotebookViewModel.viewCells is readonly');
-	}
-
 	get length(): number {
 		return this._viewCells.length;
 	}
@@ -133,6 +129,10 @@ export class NotebookViewModel extends Disposable implements EditorFoldingStateD
 		return this._notebook.metadata;
 	}
 
+	private get isRepl() {
+		return this.viewType === 'repl';
+	}
+
 	private readonly _onDidChangeViewCells = this._register(new Emitter<INotebookViewCellsUpdateEvent>());
 	get onDidChangeViewCells(): Event<INotebookViewCellsUpdateEvent> { return this._onDidChangeViewCells.event; }
 
@@ -337,9 +337,12 @@ export class NotebookViewModel extends Disposable implements EditorFoldingStateD
 			this._onDidChangeSelection.fire(e);
 		}));
 
-		this._viewCells = this._notebook.cells.map(cell => {
-			return createCellViewModel(this._instantiationService, this, cell, this._viewContext);
-		});
+
+		const viewCellCount = this.isRepl ? this._notebook.cells.length - 1 : this._notebook.cells.length;
+		for (let i = 0; i < viewCellCount; i++) {
+			this._viewCells.push(createCellViewModel(this._instantiationService, this, this._notebook.cells[i], this._viewContext));
+		}
+
 
 		this._viewCells.forEach(cell => {
 			this._handleToViewCellMapping.set(cell.handle, cell);
@@ -348,6 +351,7 @@ export class NotebookViewModel extends Disposable implements EditorFoldingStateD
 
 	updateOptions(newOptions: Partial<NotebookViewModelOptions>) {
 		this._options = { ...this._options, ...newOptions };
+		this._viewCells.forEach(cell => cell.updateOptions({ readonly: this._options.isReadOnly }));
 		this._onDidChangeOptions.fire();
 	}
 
@@ -908,13 +912,12 @@ export class NotebookViewModel extends Disposable implements EditorFoldingStateD
 	}
 
 	//#region Find
-	find(value: string, options: INotebookSearchOptions): CellFindMatchWithIndex[] {
+	find(value: string, options: INotebookFindOptions): CellFindMatchWithIndex[] {
 		const matches: CellFindMatchWithIndex[] = [];
 		let findCells: CellViewModel[] = [];
 
-		const selectedRanges = options.selectedRanges?.map(range => this.validateRange(range)).filter(range => !!range);
-
-		if (options.searchInRanges && selectedRanges) {
+		if (options.findScope && (options.findScope.findScopeType === NotebookFindScopeType.Cells || options.findScope.findScopeType === NotebookFindScopeType.Text)) {
+			const selectedRanges = options.findScope.selectedCellRanges?.map(range => this.validateRange(range)).filter(range => !!range) ?? [];
 			const selectedIndexes = cellRangesToIndexes(selectedRanges);
 			findCells = selectedIndexes.map(index => this._viewCells[index]);
 		} else {
diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/viewContext.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/viewContext.ts
index 76573564d4d..197d9cff692 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewModel/viewContext.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewModel/viewContext.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IBaseCellEditorOptions } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NotebookEventDispatcher } from 'vs/workbench/contrib/notebook/browser/viewModel/eventDispatcher';
-import { NotebookOptions } from 'vs/workbench/contrib/notebook/browser/notebookOptions';
+import { IBaseCellEditorOptions } from '../notebookBrowser.js';
+import { NotebookEventDispatcher } from './eventDispatcher.js';
+import { NotebookOptions } from '../notebookOptions.js';
 
 export class ViewContext {
 	constructor(
diff --git a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.ts b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.ts
index 52e6889c4bc..f742c0f3e67 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.ts
@@ -3,28 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { EventType as TouchEventType } from 'vs/base/browser/touch';
-import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore, type IReference } from 'vs/base/common/lifecycle';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { CellFoldingState, INotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { INotebookCellList } from 'vs/workbench/contrib/notebook/browser/view/notebookRenderingCommon';
-import { OutlineEntry } from 'vs/workbench/contrib/notebook/browser/viewModel/OutlineEntry';
-import { NotebookCellOutlineProvider } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineProvider';
-import { CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { Delayer } from 'vs/base/common/async';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { foldingCollapsedIcon, foldingExpandedIcon } from 'vs/editor/contrib/folding/browser/foldingDecorations';
-import { MarkupCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/markupCellViewModel';
-import { FoldingController } from 'vs/workbench/contrib/notebook/browser/controller/foldingController';
-import { NotebookOptionsChangeEvent } from 'vs/workbench/contrib/notebook/browser/notebookOptions';
-import { NotebookSectionArgs } from 'vs/workbench/contrib/notebook/browser/controller/sectionActions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { INotebookCellOutlineProviderFactory } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineProviderFactory';
-import { OutlineTarget } from 'vs/workbench/services/outline/browser/outline';
+import * as DOM from '../../../../../base/browser/dom.js';
+import { EventType as TouchEventType } from '../../../../../base/browser/touch.js';
+import { StandardMouseEvent } from '../../../../../base/browser/mouseEvent.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { Disposable, DisposableStore, type IReference } from '../../../../../base/common/lifecycle.js';
+import { MenuId } from '../../../../../platform/actions/common/actions.js';
+import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
+import { CellFoldingState, INotebookEditor } from '../notebookBrowser.js';
+import { INotebookCellList } from '../view/notebookRenderingCommon.js';
+import { OutlineEntry } from '../viewModel/OutlineEntry.js';
+import { NotebookCellOutlineDataSource } from '../viewModel/notebookOutlineDataSource.js';
+import { CellKind } from '../../common/notebookCommon.js';
+import { Delayer } from '../../../../../base/common/async.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { foldingCollapsedIcon, foldingExpandedIcon } from '../../../../../editor/contrib/folding/browser/foldingDecorations.js';
+import { MarkupCellViewModel } from '../viewModel/markupCellViewModel.js';
+import { FoldingController } from '../controller/foldingController.js';
+import { NotebookOptionsChangeEvent } from '../notebookOptions.js';
+import { NotebookSectionArgs } from '../controller/sectionActions.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { INotebookCellOutlineDataSourceFactory } from '../viewModel/notebookOutlineDataSourceFactory.js';
 
 export class NotebookStickyLine extends Disposable {
 	constructor(
@@ -105,7 +104,9 @@ export class NotebookStickyScroll extends Disposable {
 
 	private readonly _onDidChangeNotebookStickyScroll = this._register(new Emitter<number>());
 	readonly onDidChangeNotebookStickyScroll: Event<number> = this._onDidChangeNotebookStickyScroll.event;
-	private notebookOutlineReference?: IReference<NotebookCellOutlineProvider>;
+	private notebookCellOutlineReference?: IReference<NotebookCellOutlineDataSource>;
+
+	private readonly _layoutDisposableStore = this._register(new DisposableStore());
 
 	getDomNode(): HTMLElement {
 		return this.domNode;
@@ -144,6 +145,7 @@ export class NotebookStickyScroll extends Disposable {
 		private readonly domNode: HTMLElement,
 		private readonly notebookEditor: INotebookEditor,
 		private readonly notebookCellList: INotebookCellList,
+		private readonly layoutFn: (delta: number) => void,
 		@IContextMenuService private readonly _contextMenuService: IContextMenuService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService
 	) {
@@ -191,37 +193,37 @@ export class NotebookStickyScroll extends Disposable {
 				this.init();
 			} else {
 				this._disposables.clear();
-				this.notebookOutlineReference?.dispose();
+				this.notebookCellOutlineReference?.dispose();
 				this.disposeCurrentStickyLines();
 				DOM.clearNode(this.domNode);
 				this.updateDisplay();
 			}
-		} else if (e.stickyScrollMode && this.notebookEditor.notebookOptions.getDisplayOptions().stickyScrollEnabled && this.notebookOutlineReference?.object) {
-			this.updateContent(computeContent(this.notebookEditor, this.notebookCellList, this.notebookOutlineReference?.object?.entries, this.getCurrentStickyHeight()));
+		} else if (e.stickyScrollMode && this.notebookEditor.notebookOptions.getDisplayOptions().stickyScrollEnabled && this.notebookCellOutlineReference?.object) {
+			this.updateContent(computeContent(this.notebookEditor, this.notebookCellList, this.notebookCellOutlineReference?.object?.entries, this.getCurrentStickyHeight()));
 		}
 	}
 
 	private init() {
-		const { object: notebookOutlineReference } = this.notebookOutlineReference = this.instantiationService.invokeFunction((accessor) => accessor.get(INotebookCellOutlineProviderFactory).getOrCreate(this.notebookEditor, OutlineTarget.OutlinePane));
-		this._register(this.notebookOutlineReference);
-		this.updateContent(computeContent(this.notebookEditor, this.notebookCellList, notebookOutlineReference.entries, this.getCurrentStickyHeight()));
+		const { object: notebookCellOutline } = this.notebookCellOutlineReference = this.instantiationService.invokeFunction((accessor) => accessor.get(INotebookCellOutlineDataSourceFactory).getOrCreate(this.notebookEditor));
+		this._register(this.notebookCellOutlineReference);
+		this.updateContent(computeContent(this.notebookEditor, this.notebookCellList, notebookCellOutline.entries, this.getCurrentStickyHeight()));
 
-		this._disposables.add(notebookOutlineReference.onDidChange(() => {
-			const recompute = computeContent(this.notebookEditor, this.notebookCellList, notebookOutlineReference.entries, this.getCurrentStickyHeight());
+		this._disposables.add(notebookCellOutline.onDidChange(() => {
+			const recompute = computeContent(this.notebookEditor, this.notebookCellList, notebookCellOutline.entries, this.getCurrentStickyHeight());
 			if (!this.compareStickyLineMaps(recompute, this.currentStickyLines)) {
 				this.updateContent(recompute);
 			}
 		}));
 
 		this._disposables.add(this.notebookEditor.onDidAttachViewModel(() => {
-			this.updateContent(computeContent(this.notebookEditor, this.notebookCellList, notebookOutlineReference.entries, this.getCurrentStickyHeight()));
+			this.updateContent(computeContent(this.notebookEditor, this.notebookCellList, notebookCellOutline.entries, this.getCurrentStickyHeight()));
 		}));
 
 		this._disposables.add(this.notebookEditor.onDidScroll(() => {
 			const d = new Delayer(100);
 			d.trigger(() => {
 				d.dispose();
-				const recompute = computeContent(this.notebookEditor, this.notebookCellList, notebookOutlineReference.entries, this.getCurrentStickyHeight());
+				const recompute = computeContent(this.notebookEditor, this.notebookCellList, notebookCellOutline.entries, this.getCurrentStickyHeight());
 				if (!this.compareStickyLineMaps(recompute, this.currentStickyLines)) {
 					this.updateContent(recompute);
 				}
@@ -270,8 +272,16 @@ export class NotebookStickyScroll extends Disposable {
 		const sizeDelta = this.getCurrentStickyHeight() - oldStickyHeight;
 		if (sizeDelta !== 0) {
 			this._onDidChangeNotebookStickyScroll.fire(sizeDelta);
+
+			const d = this._layoutDisposableStore.add(DOM.scheduleAtNextAnimationFrame(DOM.getWindow(this.getDomNode()), () => {
+				this.layoutFn(sizeDelta);
+				this.updateDisplay();
+
+				this._layoutDisposableStore.delete(d);
+			}));
+		} else {
+			this.updateDisplay();
 		}
-		this.updateDisplay();
 	}
 
 	private updateDisplay() {
@@ -369,7 +379,7 @@ export class NotebookStickyScroll extends Disposable {
 	override dispose() {
 		this._disposables.dispose();
 		this.disposeCurrentStickyLines();
-		this.notebookOutlineReference?.dispose();
+		this.notebookCellOutlineReference?.dispose();
 		super.dispose();
 	}
 }
diff --git a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar.ts b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar.ts
index ea1039d672c..13f928feb06 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar.ts
@@ -3,33 +3,33 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
-import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar';
-import { IAction, Separator } from 'vs/base/common/actions';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { ScrollbarVisibility } from 'vs/base/common/scrollable';
-import { MenuEntryActionViewItem, SubmenuEntryActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IMenu, IMenuService, MenuId, MenuItemAction, SubmenuItemAction } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { SELECT_KERNEL_ID } from 'vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { NOTEBOOK_EDITOR_ID, NotebookSetting } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotebookEditorDelegate } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NotebooKernelActionViewItem } from 'vs/workbench/contrib/notebook/browser/viewParts/notebookKernelView';
-import { ActionViewWithLabel, UnifiedSubmenuActionView } from 'vs/workbench/contrib/notebook/browser/view/cellParts/cellActionView';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IWorkbenchAssignmentService } from 'vs/workbench/services/assignment/common/assignmentService';
-import { NotebookOptions } from 'vs/workbench/contrib/notebook/browser/notebookOptions';
-import { IActionViewItem, IActionViewItemProvider } from 'vs/base/browser/ui/actionbar/actionbar';
-import { disposableTimeout } from 'vs/base/common/async';
-import { HiddenItemStrategy, IWorkbenchToolBarOptions, WorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
-import { IActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { WorkbenchHoverDelegate } from 'vs/platform/hover/browser/hover';
+import * as DOM from '../../../../../base/browser/dom.js';
+import { DomScrollableElement } from '../../../../../base/browser/ui/scrollbar/scrollableElement.js';
+import { ToolBar } from '../../../../../base/browser/ui/toolbar/toolbar.js';
+import { IAction, Separator } from '../../../../../base/common/actions.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { ScrollbarVisibility } from '../../../../../base/common/scrollable.js';
+import { MenuEntryActionViewItem, SubmenuEntryActionViewItem } from '../../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IMenu, IMenuService, MenuId, MenuItemAction, SubmenuItemAction } from '../../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { SELECT_KERNEL_ID } from '../controller/coreActions.js';
+import { NOTEBOOK_EDITOR_ID, NotebookSetting } from '../../common/notebookCommon.js';
+import { INotebookEditorDelegate } from '../notebookBrowser.js';
+import { NotebooKernelActionViewItem } from './notebookKernelView.js';
+import { ActionViewWithLabel, UnifiedSubmenuActionView } from '../view/cellParts/cellActionView.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { IWorkbenchAssignmentService } from '../../../../services/assignment/common/assignmentService.js';
+import { NotebookOptions } from '../notebookOptions.js';
+import { IActionViewItem, IActionViewItemProvider } from '../../../../../base/browser/ui/actionbar/actionbar.js';
+import { disposableTimeout } from '../../../../../base/common/async.js';
+import { HiddenItemStrategy, IWorkbenchToolBarOptions, WorkbenchToolBar } from '../../../../../platform/actions/browser/toolbar.js';
+import { IActionViewItemOptions } from '../../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { WorkbenchHoverDelegate } from '../../../../../platform/hover/browser/hover.js';
 
 interface IActionModel {
 	action: IAction;
diff --git a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorWidgetContextKeys.ts b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorWidgetContextKeys.ts
index 19830132b60..e6f42671e8a 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorWidgetContextKeys.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorWidgetContextKeys.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { DisposableStore, dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ICellViewModel, INotebookEditorDelegate, KERNEL_EXTENSIONS } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NOTEBOOK_CELL_TOOLBAR_LOCATION, NOTEBOOK_HAS_OUTPUTS, NOTEBOOK_HAS_RUNNING_CELL, NOTEBOOK_HAS_SOMETHING_RUNNING, NOTEBOOK_INTERRUPTIBLE_KERNEL, NOTEBOOK_KERNEL, NOTEBOOK_KERNEL_COUNT, NOTEBOOK_KERNEL_SELECTED, NOTEBOOK_KERNEL_SOURCE_COUNT, NOTEBOOK_LAST_CELL_FAILED, NOTEBOOK_MISSING_KERNEL_EXTENSION, NOTEBOOK_USE_CONSOLIDATED_OUTPUT_BUTTON, NOTEBOOK_VIEW_TYPE } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { ICellExecutionStateChangedEvent, IExecutionStateChangedEvent, INotebookExecutionStateService, INotebookFailStateChangedEvent, NotebookExecutionType } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
-import { INotebookKernelService } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import * as DOM from '../../../../../base/browser/dom.js';
+import { DisposableStore, dispose, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { IContextKey, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { ICellViewModel, INotebookEditorDelegate, KERNEL_EXTENSIONS } from '../notebookBrowser.js';
+import { NOTEBOOK_CELL_TOOLBAR_LOCATION, NOTEBOOK_HAS_OUTPUTS, NOTEBOOK_HAS_RUNNING_CELL, NOTEBOOK_HAS_SOMETHING_RUNNING, NOTEBOOK_INTERRUPTIBLE_KERNEL, NOTEBOOK_KERNEL, NOTEBOOK_KERNEL_COUNT, NOTEBOOK_KERNEL_SELECTED, NOTEBOOK_KERNEL_SOURCE_COUNT, NOTEBOOK_LAST_CELL_FAILED, NOTEBOOK_MISSING_KERNEL_EXTENSION, NOTEBOOK_USE_CONSOLIDATED_OUTPUT_BUTTON, NOTEBOOK_VIEW_TYPE } from '../../common/notebookContextKeys.js';
+import { ICellExecutionStateChangedEvent, IExecutionStateChangedEvent, INotebookExecutionStateService, INotebookFailStateChangedEvent, NotebookExecutionType } from '../../common/notebookExecutionStateService.js';
+import { INotebookKernelService } from '../../common/notebookKernelService.js';
+import { IExtensionService } from '../../../../services/extensions/common/extensions.js';
 
 export class NotebookEditorContextKeys {
 
diff --git a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookHorizontalTracker.ts b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookHorizontalTracker.ts
new file mode 100644
index 00000000000..a594b8123b4
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookHorizontalTracker.ts
@@ -0,0 +1,64 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { addDisposableListener, EventType, getWindow } from '../../../../../base/browser/dom.js';
+import { IMouseWheelEvent } from '../../../../../base/browser/mouseEvent.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { isChrome } from '../../../../../base/common/platform.js';
+import { CodeEditorWidget } from '../../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { INotebookEditorDelegate } from '../notebookBrowser.js';
+
+export class NotebookHorizontalTracker extends Disposable {
+	constructor(
+		private readonly _notebookEditor: INotebookEditorDelegate,
+		private readonly _listViewScrollablement: HTMLElement,
+	) {
+		super();
+
+		this._register(addDisposableListener(this._listViewScrollablement, EventType.MOUSE_WHEEL, (event: IMouseWheelEvent) => {
+			if (event.deltaX === 0) {
+				return;
+			}
+
+			const hoveringOnEditor = this._notebookEditor.codeEditors.find(editor => {
+				const editorLayout = editor[1].getLayoutInfo();
+				if (editorLayout.contentWidth === editorLayout.width) {
+					// no overflow
+					return false;
+				}
+
+				const editorDOM = editor[1].getDomNode();
+				if (editorDOM && editorDOM.contains(event.target as HTMLElement)) {
+					return true;
+				}
+
+				return false;
+			});
+
+			if (!hoveringOnEditor) {
+				return;
+			}
+
+			const targetWindow = getWindow(event);
+			const evt = {
+				deltaMode: event.deltaMode,
+				deltaX: event.deltaX,
+				deltaY: 0,
+				deltaZ: 0,
+				wheelDelta: event.wheelDelta && isChrome ? (event.wheelDelta / targetWindow.devicePixelRatio) : event.wheelDelta,
+				wheelDeltaX: event.wheelDeltaX && isChrome ? (event.wheelDeltaX / targetWindow.devicePixelRatio) : event.wheelDeltaX,
+				wheelDeltaY: 0,
+				detail: event.detail,
+				shiftKey: event.shiftKey,
+				type: event.type,
+				defaultPrevented: false,
+				preventDefault: () => { },
+				stopPropagation: () => { }
+			};
+
+			(hoveringOnEditor[1] as CodeEditorWidget).delegateScrollFromMouseWheelEvent(evt as any);
+		}));
+	}
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.ts b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.ts
index 8874848aabb..f14a7619562 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.ts
@@ -3,39 +3,37 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IAction } from 'vs/base/common/actions';
-import { groupBy } from 'vs/base/common/arrays';
-import { createCancelablePromise } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Codicon } from 'vs/base/common/codicons';
-import { Event } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { MarshalledId } from 'vs/base/common/marshallingIds';
-import { uppercaseFirstLetter } from 'vs/base/common/strings';
-import { Command } from 'vs/editor/common/languages';
-import { localize } from 'vs/nls';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ProgressLocation } from 'vs/platform/progress/common/progress';
-import { IQuickInputButton, IQuickInputService, IQuickPick, IQuickPickItem, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { ViewContainerLocation } from 'vs/workbench/common/views';
-import { IExtension, IExtensionsViewPaneContainer, IExtensionsWorkbenchService, VIEWLET_ID as EXTENSION_VIEWLET_ID } from 'vs/workbench/contrib/extensions/common/extensions';
-import { IActiveNotebookEditor, INotebookExtensionRecommendation, JUPYTER_EXTENSION_ID, KERNEL_RECOMMENDATIONS } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NotebookEditorWidget } from 'vs/workbench/contrib/notebook/browser/notebookEditorWidget';
-import { executingStateIcon, selectKernelIcon } from 'vs/workbench/contrib/notebook/browser/notebookIcons';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { INotebookKernel, INotebookKernelHistoryService, INotebookKernelMatchResult, INotebookKernelService, ISourceAction } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { URI } from 'vs/base/common/uri';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { INotebookTextModel } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { SELECT_KERNEL_ID } from 'vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { EnablementState } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
+import { IAction } from '../../../../../base/common/actions.js';
+import { groupBy } from '../../../../../base/common/arrays.js';
+import { createCancelablePromise } from '../../../../../base/common/async.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { Event } from '../../../../../base/common/event.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { MarshalledId } from '../../../../../base/common/marshallingIds.js';
+import { uppercaseFirstLetter } from '../../../../../base/common/strings.js';
+import { Command } from '../../../../../editor/common/languages.js';
+import { localize } from '../../../../../nls.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { ILabelService } from '../../../../../platform/label/common/label.js';
+import { ILogService } from '../../../../../platform/log/common/log.js';
+import { IProductService } from '../../../../../platform/product/common/productService.js';
+import { ProgressLocation } from '../../../../../platform/progress/common/progress.js';
+import { IQuickInputButton, IQuickInputService, IQuickPick, IQuickPickItem, QuickPickInput } from '../../../../../platform/quickinput/common/quickInput.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { IExtension, IExtensionsWorkbenchService } from '../../../extensions/common/extensions.js';
+import { IActiveNotebookEditor, INotebookExtensionRecommendation, JUPYTER_EXTENSION_ID, KERNEL_RECOMMENDATIONS } from '../notebookBrowser.js';
+import { NotebookEditorWidget } from '../notebookEditorWidget.js';
+import { executingStateIcon, selectKernelIcon } from '../notebookIcons.js';
+import { NotebookTextModel } from '../../common/model/notebookTextModel.js';
+import { INotebookKernel, INotebookKernelHistoryService, INotebookKernelMatchResult, INotebookKernelService, ISourceAction } from '../../common/notebookKernelService.js';
+import { IExtensionService } from '../../../../services/extensions/common/extensions.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
+import { INotebookTextModel } from '../../common/notebookCommon.js';
+import { SELECT_KERNEL_ID } from '../controller/coreActions.js';
+import { EnablementState } from '../../../../services/extensionManagement/common/extensionManagement.js';
 
 type KernelPick = IQuickPickItem & { kernel: INotebookKernel };
 function isKernelPick(item: QuickPickInput<IQuickPickItem>): item is KernelPick {
@@ -105,7 +103,6 @@ abstract class KernelPickerStrategyBase implements IKernelPickerStrategy {
 		protected readonly _quickInputService: IQuickInputService,
 		protected readonly _labelService: ILabelService,
 		protected readonly _logService: ILogService,
-		protected readonly _paneCompositePartService: IPaneCompositePartService,
 		protected readonly _extensionWorkbenchService: IExtensionsWorkbenchService,
 		protected readonly _extensionService: IExtensionService,
 		protected readonly _commandService: ICommandService
@@ -136,11 +133,15 @@ abstract class KernelPickerStrategyBase implements IKernelPickerStrategy {
 			return true;
 		}
 
-		const quickPick = this._quickInputService.createQuickPick<KernelQuickPickItem>();
+
+		const localDisposableStore = new DisposableStore();
+		const quickPick = localDisposableStore.add(this._quickInputService.createQuickPick<KernelQuickPickItem>({ useSeparators: true }));
 		const quickPickItems = this._getKernelPickerQuickPickItems(notebook, matchResult, this._notebookKernelService, scopedContextKeyService);
 
 		if (quickPickItems.length === 1 && supportAutoRun(quickPickItems[0]) && !skipAutoRun) {
-			return await this._handleQuickPick(editor, quickPickItems[0], quickPickItems as KernelQuickPickItem[]);
+			const picked = await this._handleQuickPick(editor, quickPickItems[0], quickPickItems as KernelQuickPickItem[]);
+			localDisposableStore.dispose();
+			return picked;
 		}
 
 		quickPick.items = quickPickItems;
@@ -201,7 +202,7 @@ abstract class KernelPickerStrategyBase implements IKernelPickerStrategy {
 		}, this);
 
 		const pick = await new Promise<{ selected: KernelQuickPickItem | undefined; items: KernelQuickPickItem[] }>((resolve, reject) => {
-			quickPick.onDidAccept(() => {
+			localDisposableStore.add(quickPick.onDidAccept(() => {
 				const item = quickPick.selectedItems[0];
 				if (item) {
 					resolve({ selected: item, items: quickPick.items as KernelQuickPickItem[] });
@@ -210,17 +211,19 @@ abstract class KernelPickerStrategyBase implements IKernelPickerStrategy {
 				}
 
 				quickPick.hide();
-			});
+			}));
 
-			quickPick.onDidHide(() => {
+			localDisposableStore.add(quickPick.onDidHide(() => {
 				kernelDetectionTaskListener.dispose();
 				kernelChangeEventListener.dispose();
 				quickPick.dispose();
 				resolve({ selected: undefined, items: quickPick.items as KernelQuickPickItem[] });
-			});
+			}));
 			quickPick.show();
 		});
 
+		localDisposableStore.dispose();
+
 		if (pick.selected) {
 			return await this._handleQuickPick(editor, pick.selected, pick.items);
 		}
@@ -249,7 +252,6 @@ abstract class KernelPickerStrategyBase implements IKernelPickerStrategy {
 		// actions
 		if (isSearchMarketplacePick(pick)) {
 			await this._showKernelExtension(
-				this._paneCompositePartService,
 				this._extensionWorkbenchService,
 				this._extensionService,
 				editor.textModel.viewType,
@@ -258,7 +260,6 @@ abstract class KernelPickerStrategyBase implements IKernelPickerStrategy {
 			// suggestedExtension must be defined for this option to be shown, but still check to make TS happy
 		} else if (isInstallExtensionPick(pick)) {
 			await this._showKernelExtension(
-				this._paneCompositePartService,
 				this._extensionWorkbenchService,
 				this._extensionService,
 				editor.textModel.viewType,
@@ -278,7 +279,6 @@ abstract class KernelPickerStrategyBase implements IKernelPickerStrategy {
 	}
 
 	protected async _showKernelExtension(
-		paneCompositePartService: IPaneCompositePartService,
 		extensionWorkbenchService: IExtensionsWorkbenchService,
 		extensionService: IExtensionService,
 		viewType: string,
@@ -331,15 +331,13 @@ abstract class KernelPickerStrategyBase implements IKernelPickerStrategy {
 			return;
 		}
 
-		const viewlet = await paneCompositePartService.openPaneComposite(EXTENSION_VIEWLET_ID, ViewContainerLocation.Sidebar, true);
-		const view = viewlet?.getViewPaneContainer() as IExtensionsViewPaneContainer | undefined;
 		const pascalCased = viewType.split(/[^a-z0-9]/ig).map(uppercaseFirstLetter).join('');
-		view?.search(`@tag:notebookKernel${pascalCased}`);
+		await extensionWorkbenchService.openSearch(`@tag:notebookKernel${pascalCased}`);
 	}
 
 	private async _showInstallKernelExtensionRecommendation(
 		notebookTextModel: NotebookTextModel,
-		quickPick: IQuickPick<KernelQuickPickItem>,
+		quickPick: IQuickPick<KernelQuickPickItem, { useSeparators: true }>,
 		extensionWorkbenchService: IExtensionsWorkbenchService,
 		token: CancellationToken
 	) {
@@ -435,7 +433,6 @@ export class KernelPickerMRUStrategy extends KernelPickerStrategyBase {
 		@IQuickInputService _quickInputService: IQuickInputService,
 		@ILabelService _labelService: ILabelService,
 		@ILogService _logService: ILogService,
-		@IPaneCompositePartService _paneCompositePartService: IPaneCompositePartService,
 		@IExtensionsWorkbenchService _extensionWorkbenchService: IExtensionsWorkbenchService,
 		@IExtensionService _extensionService: IExtensionService,
 		@ICommandService _commandService: ICommandService,
@@ -449,7 +446,6 @@ export class KernelPickerMRUStrategy extends KernelPickerStrategyBase {
 			_quickInputService,
 			_labelService,
 			_logService,
-			_paneCompositePartService,
 			_extensionWorkbenchService,
 			_extensionService,
 			_commandService,
@@ -519,7 +515,7 @@ export class KernelPickerMRUStrategy extends KernelPickerStrategyBase {
 	private async displaySelectAnotherQuickPick(editor: IActiveNotebookEditor, kernelListEmpty: boolean): Promise<boolean> {
 		const notebook: NotebookTextModel = editor.textModel;
 		const disposables = new DisposableStore();
-		const quickPick = this._quickInputService.createQuickPick<KernelQuickPickItem>();
+		const quickPick = disposables.add(this._quickInputService.createQuickPick<KernelQuickPickItem>({ useSeparators: true }));
 		const quickPickItem = await new Promise<KernelQuickPickItem | IQuickInputButton | undefined>(resolve => {
 			// select from kernel sources
 			quickPick.title = kernelListEmpty ? localize('select', "Select Kernel") : localize('selectAnotherKernel', "Select Another Kernel");
@@ -533,13 +529,12 @@ export class KernelPickerMRUStrategy extends KernelPickerStrategyBase {
 					resolve(button);
 				}
 			}));
-			quickPick.onDidTriggerItemButton(async (e) => {
-
+			disposables.add(quickPick.onDidTriggerItemButton(async (e) => {
 				if (isKernelSourceQuickPickItem(e.item) && e.item.documentation !== undefined) {
 					const uri = URI.isUri(e.item.documentation) ? URI.parse(e.item.documentation) : await this._commandService.executeCommand(e.item.documentation);
 					void this._openerService.open(uri, { openExternal: true });
 				}
-			});
+			}));
 			disposables.add(quickPick.onDidAccept(async () => {
 				resolve(quickPick.selectedItems[0]);
 			}));
@@ -612,7 +607,6 @@ export class KernelPickerMRUStrategy extends KernelPickerStrategyBase {
 				}
 			} else if (isSearchMarketplacePick(selectedKernelPickItem)) {
 				await this._showKernelExtension(
-					this._paneCompositePartService,
 					this._extensionWorkbenchService,
 					this._extensionService,
 					editor.textModel.viewType,
@@ -621,7 +615,6 @@ export class KernelPickerMRUStrategy extends KernelPickerStrategyBase {
 				return true;
 			} else if (isInstallExtensionPick(selectedKernelPickItem)) {
 				await this._showKernelExtension(
-					this._paneCompositePartService,
 					this._extensionWorkbenchService,
 					this._extensionService,
 					editor.textModel.viewType,
@@ -699,24 +692,25 @@ export class KernelPickerMRUStrategy extends KernelPickerStrategyBase {
 
 	private async _selectOneKernel(notebook: NotebookTextModel, source: string, kernels: INotebookKernel[]) {
 		const quickPickItems: QuickPickInput<KernelPick>[] = kernels.map(kernel => toKernelQuickPick(kernel, undefined));
-		const quickPick = this._quickInputService.createQuickPick<KernelQuickPickItem>();
+		const localDisposableStore = new DisposableStore();
+		const quickPick = localDisposableStore.add(this._quickInputService.createQuickPick<KernelQuickPickItem>({ useSeparators: true }));
 		quickPick.items = quickPickItems;
 		quickPick.canSelectMany = false;
 
 		quickPick.title = localize('selectKernelFromExtension', "Select Kernel from {0}", source);
 
-		quickPick.onDidAccept(async () => {
+		localDisposableStore.add(quickPick.onDidAccept(async () => {
 			if (quickPick.selectedItems && quickPick.selectedItems.length > 0 && isKernelPick(quickPick.selectedItems[0])) {
 				await this._selecteKernel(notebook, quickPick.selectedItems[0].kernel);
 			}
 
 			quickPick.hide();
 			quickPick.dispose();
-		});
+		}));
 
-		quickPick.onDidHide(() => {
-			quickPick.dispose();
-		});
+		localDisposableStore.add(quickPick.onDidHide(() => {
+			localDisposableStore.dispose();
+		}));
 
 		quickPick.show();
 	}
diff --git a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelView.ts b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelView.ts
index 8c3ecd82436..2b2bd8bd744 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelView.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelView.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ActionViewItem, IActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { Action, IAction } from 'vs/base/common/actions';
-import { Event } from 'vs/base/common/event';
-import { localize, localize2 } from 'vs/nls';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { NOTEBOOK_ACTIONS_CATEGORY, SELECT_KERNEL_ID } from 'vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { getNotebookEditorFromEditorPane, INotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { selectKernelIcon } from 'vs/workbench/contrib/notebook/browser/notebookIcons';
-import { KernelPickerMRUStrategy, KernelQuickPickContext } from 'vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_KERNEL_COUNT } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { INotebookKernelHistoryService, INotebookKernelService } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { ActionViewItem, IActionViewItemOptions } from '../../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { Action, IAction } from '../../../../../base/common/actions.js';
+import { Event } from '../../../../../base/common/event.js';
+import { localize, localize2 } from '../../../../../nls.js';
+import { Action2, MenuId, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { ExtensionIdentifier } from '../../../../../platform/extensions/common/extensions.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { NOTEBOOK_ACTIONS_CATEGORY, SELECT_KERNEL_ID } from '../controller/coreActions.js';
+import { getNotebookEditorFromEditorPane, INotebookEditor } from '../notebookBrowser.js';
+import { selectKernelIcon } from '../notebookIcons.js';
+import { KernelPickerMRUStrategy, KernelQuickPickContext } from './notebookKernelQuickPickStrategy.js';
+import { NotebookTextModel } from '../../common/model/notebookTextModel.js';
+import { NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_KERNEL_COUNT } from '../../common/notebookContextKeys.js';
+import { INotebookKernelHistoryService, INotebookKernelService } from '../../common/notebookKernelService.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
 
 function getEditorFromContext(editorService: IEditorService, context?: KernelQuickPickContext): INotebookEditor | undefined {
 	let editor: INotebookEditor | undefined;
diff --git a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookOverviewRuler.ts b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookOverviewRuler.ts
index b40af87b805..4085b53aff2 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookOverviewRuler.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookOverviewRuler.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getWindow } from 'vs/base/browser/dom';
-import { createFastDomNode, FastDomNode } from 'vs/base/browser/fastDomNode';
-import { PixelRatio } from 'vs/base/browser/pixelRatio';
-import { IThemeService, Themable } from 'vs/platform/theme/common/themeService';
-import { INotebookEditorDelegate, NotebookOverviewRulerLane } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getWindow } from '../../../../../base/browser/dom.js';
+import { createFastDomNode, FastDomNode } from '../../../../../base/browser/fastDomNode.js';
+import { PixelRatio } from '../../../../../base/browser/pixelRatio.js';
+import { IThemeService, Themable } from '../../../../../platform/theme/common/themeService.js';
+import { INotebookEditorDelegate, NotebookOverviewRulerLane } from '../notebookBrowser.js';
 
 export class NotebookOverviewRuler extends Themable {
 	private readonly _domNode: FastDomNode<HTMLCanvasElement>;
diff --git a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookTopCellToolbar.ts b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookTopCellToolbar.ts
index 19b4df7f193..74a61b09736 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookTopCellToolbar.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookTopCellToolbar.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { Disposable, DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
-import { HiddenItemStrategy, MenuWorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
-import { IMenuService, MenuItemAction } from 'vs/platform/actions/common/actions';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { INotebookActionContext } from 'vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { INotebookEditorDelegate } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NotebookOptions } from 'vs/workbench/contrib/notebook/browser/notebookOptions';
-import { CodiconActionViewItem } from 'vs/workbench/contrib/notebook/browser/view/cellParts/cellActionView';
+import * as DOM from '../../../../../base/browser/dom.js';
+import { Disposable, DisposableStore, MutableDisposable } from '../../../../../base/common/lifecycle.js';
+import { HiddenItemStrategy, MenuWorkbenchToolBar } from '../../../../../platform/actions/browser/toolbar.js';
+import { IMenuService, MenuItemAction } from '../../../../../platform/actions/common/actions.js';
+import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { INotebookActionContext } from '../controller/coreActions.js';
+import { INotebookEditorDelegate } from '../notebookBrowser.js';
+import { NotebookOptions } from '../notebookOptions.js';
+import { CodiconActionViewItem } from '../view/cellParts/cellActionView.js';
 
 export class ListTopCellToolbar extends Disposable {
 	private readonly topCellToolbarContainer: HTMLElement;
diff --git a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookViewZones.ts b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookViewZones.ts
index 7332529b231..8645d66dc19 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookViewZones.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookViewZones.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { INotebookViewCellsUpdateEvent, INotebookViewZone, INotebookViewZoneChangeAccessor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NotebookCellListView } from 'vs/workbench/contrib/notebook/browser/view/notebookCellListView';
-import { ICoordinatesConverter } from 'vs/workbench/contrib/notebook/browser/view/notebookRenderingCommon';
-import { CellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl';
+import { FastDomNode, createFastDomNode } from '../../../../../base/browser/fastDomNode.js';
+import { onUnexpectedError } from '../../../../../base/common/errors.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { INotebookViewCellsUpdateEvent, INotebookViewZone, INotebookViewZoneChangeAccessor } from '../notebookBrowser.js';
+import { NotebookCellListView } from '../view/notebookCellListView.js';
+import { ICoordinatesConverter } from '../view/notebookRenderingCommon.js';
+import { CellViewModel } from '../viewModel/notebookViewModelImpl.js';
 
 const invalidFunc = () => { throw new Error(`Invalid notebook view zone change accessor`); };
 
@@ -179,9 +179,9 @@ export class NotebookViewZones extends Disposable {
 	}
 }
 
-function safeInvoke1Arg(func: Function, arg1: any): any {
+function safeInvoke1Arg(func: Function, arg1: any): void {
 	try {
-		return func(arg1);
+		func(arg1);
 	} catch (e) {
 		onUnexpectedError(e);
 	}
diff --git a/src/vs/workbench/contrib/notebook/common/model/cellEdit.ts b/src/vs/workbench/contrib/notebook/common/model/cellEdit.ts
index 0625af50b5d..6d4543ede83 100644
--- a/src/vs/workbench/contrib/notebook/common/model/cellEdit.ts
+++ b/src/vs/workbench/contrib/notebook/common/model/cellEdit.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IResourceUndoRedoElement, UndoRedoElementType } from 'vs/platform/undoRedo/common/undoRedo';
-import { URI } from 'vs/base/common/uri';
-import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
-import { ISelectionState, NotebookCellMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { IResourceUndoRedoElement, UndoRedoElementType } from '../../../../../platform/undoRedo/common/undoRedo.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { NotebookCellTextModel } from './notebookCellTextModel.js';
+import { ISelectionState, NotebookCellMetadata } from '../notebookCommon.js';
 
 /**
  * It should not modify Undo/Redo stack
diff --git a/src/vs/workbench/contrib/notebook/common/model/notebookCellOutputTextModel.ts b/src/vs/workbench/contrib/notebook/common/model/notebookCellOutputTextModel.ts
index 2e2ad62c97e..4241ec66c11 100644
--- a/src/vs/workbench/contrib/notebook/common/model/notebookCellOutputTextModel.ts
+++ b/src/vs/workbench/contrib/notebook/common/model/notebookCellOutputTextModel.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ICellOutput, IOutputDto, IOutputItemDto, compressOutputItemStreams, isTextStreamMime } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { VSBuffer } from '../../../../../base/common/buffer.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { ICellOutput, IOutputDto, IOutputItemDto, compressOutputItemStreams, isTextStreamMime } from '../notebookCommon.js';
 
 export class NotebookCellOutputTextModel extends Disposable implements ICellOutput {
 
diff --git a/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.ts b/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.ts
index 5c373d8b7cc..7c7ff8c87f3 100644
--- a/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.ts
+++ b/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.ts
@@ -3,22 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { hash, StringSHA1 } from 'vs/base/common/hash';
-import { Disposable, DisposableStore, dispose } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import * as UUID from 'vs/base/common/uuid';
-import { Range } from 'vs/editor/common/core/range';
-import * as model from 'vs/editor/common/model';
-import { PieceTreeTextBuffer } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer';
-import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder';
-import { TextModel } from 'vs/editor/common/model/textModel';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { NotebookCellOutputTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellOutputTextModel';
-import { CellInternalMetadataChangedEvent, CellKind, ICell, ICellDto2, ICellOutput, IOutputDto, IOutputItemDto, NotebookCellCollapseState, NotebookCellInternalMetadata, NotebookCellMetadata, NotebookCellOutputsSplice, TransientOptions } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { ThrottledDelayer } from 'vs/base/common/async';
-import { ILanguageDetectionService } from 'vs/workbench/services/languageDetection/common/languageDetectionWorkerService';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { hash, StringSHA1 } from '../../../../../base/common/hash.js';
+import { Disposable, DisposableStore, dispose } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+import * as UUID from '../../../../../base/common/uuid.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import * as model from '../../../../../editor/common/model.js';
+import { PieceTreeTextBuffer } from '../../../../../editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.js';
+import { createTextBuffer, TextModel } from '../../../../../editor/common/model/textModel.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../../../../../editor/common/languages/modesRegistry.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
+import { NotebookCellOutputTextModel } from './notebookCellOutputTextModel.js';
+import { CellInternalMetadataChangedEvent, CellKind, ICell, ICellDto2, ICellOutput, IOutputDto, IOutputItemDto, NotebookCellCollapseState, NotebookCellInternalMetadata, NotebookCellMetadata, NotebookCellOutputsSplice, TransientCellMetadata, TransientOptions } from '../notebookCommon.js';
+import { ThrottledDelayer } from '../../../../../base/common/async.js';
+import { ILanguageDetectionService } from '../../../../services/languageDetection/common/languageDetectionWorkerService.js';
+import { toFormattedString } from '../../../../../base/common/jsonFormatter.js';
+import { IModelContentChangedEvent } from '../../../../../editor/common/textModelEvents.js';
 
 export class NotebookCellTextModel extends Disposable implements ICell {
 	private readonly _onDidChangeOutputs = this._register(new Emitter<NotebookCellOutputsSplice>());
@@ -27,8 +28,8 @@ export class NotebookCellTextModel extends Disposable implements ICell {
 	private readonly _onDidChangeOutputItems = this._register(new Emitter<void>());
 	readonly onDidChangeOutputItems: Event<void> = this._onDidChangeOutputItems.event;
 
-	private readonly _onDidChangeContent = this._register(new Emitter<'content' | 'language' | 'mime'>());
-	readonly onDidChangeContent: Event<'content' | 'language' | 'mime'> = this._onDidChangeContent.event;
+	private readonly _onDidChangeContent = this._register(new Emitter<'content' | 'language' | 'mime' | { type: 'model'; event: IModelContentChangedEvent }>());
+	readonly onDidChangeContent: Event<'content' | 'language' | 'mime' | { type: 'model'; event: IModelContentChangedEvent }> = this._onDidChangeContent.event;
 
 	private readonly _onDidChangeMetadata = this._register(new Emitter<void>());
 	readonly onDidChangeMetadata: Event<void> = this._onDidChangeMetadata.event;
@@ -112,12 +113,7 @@ export class NotebookCellTextModel extends Disposable implements ICell {
 			return this._textBuffer;
 		}
 
-		const builder = new PieceTreeTextBufferBuilder();
-		builder.acceptChunk(this._source);
-		const bufferFactory = builder.finish(true);
-		const { textBuffer, disposable } = bufferFactory.create(model.DefaultEndOfLine.LF);
-		this._textBuffer = textBuffer;
-		this._register(disposable);
+		this._textBuffer = this._register(createTextBuffer(this._source, model.DefaultEndOfLine.LF).textBuffer);
 
 		this._register(this._textBuffer.onDidChangeContent(() => {
 			this._hash = null;
@@ -158,12 +154,14 @@ export class NotebookCellTextModel extends Disposable implements ICell {
 			// Listen to language changes on the model
 			this._textModelDisposables.add(this._textModel.onDidChangeLanguage((e) => this.setRegisteredLanguage(this._languageService, e.newLanguage, this.language)));
 			this._textModelDisposables.add(this._textModel.onWillDispose(() => this.textModel = undefined));
-			this._textModelDisposables.add(this._textModel.onDidChangeContent(() => {
+			this._textModelDisposables.add(this._textModel.onDidChangeContent((e) => {
 				if (this._textModel) {
 					this._versionId = this._textModel.getVersionId();
 					this._alternativeId = this._textModel.getAlternativeVersionId();
 				}
+				this._textBufferHash = null;
 				this._onDidChangeContent.fire('content');
+				this._onDidChangeContent.fire({ type: 'model', event: e });
 			}));
 
 			this._textModel._overwriteVersionId(this._versionId);
@@ -306,18 +304,7 @@ export class NotebookCellTextModel extends Disposable implements ICell {
 	}
 
 	private _getPersisentMetadata() {
-		const filteredMetadata: { [key: string]: any } = {};
-		const transientCellMetadata = this.transientOptions.transientCellMetadata;
-
-		const keys = new Set([...Object.keys(this.metadata)]);
-		for (const key of keys) {
-			if (!(transientCellMetadata[key as keyof NotebookCellMetadata])
-			) {
-				filteredMetadata[key] = this.metadata[key as keyof NotebookCellMetadata];
-			}
-		}
-
-		return filteredMetadata;
+		return getFormattedMetadataJSON(this.transientOptions.transientCellMetadata, this.metadata, this.language);
 	}
 
 	getTextLength(): number {
@@ -418,6 +405,10 @@ export class NotebookCellTextModel extends Disposable implements ICell {
 			return false;
 		}
 
+		if (this.outputs.length !== b.outputs.length) {
+			return false;
+		}
+
 		if (this.getTextLength() !== b.getTextLength()) {
 			return false;
 		}
@@ -505,3 +496,34 @@ function computeRunStartTimeAdjustment(oldMetadata: NotebookCellInternalMetadata
 		return newMetadata.runStartTimeAdjustment;
 	}
 }
+
+
+export function getFormattedMetadataJSON(transientCellMetadata: TransientCellMetadata | undefined, metadata: NotebookCellMetadata, language?: string) {
+	let filteredMetadata: { [key: string]: any } = {};
+
+	if (transientCellMetadata) {
+		const keys = new Set([...Object.keys(metadata)]);
+		for (const key of keys) {
+			if (!(transientCellMetadata[key as keyof NotebookCellMetadata])
+			) {
+				filteredMetadata[key] = metadata[key as keyof NotebookCellMetadata];
+			}
+		}
+	} else {
+		filteredMetadata = metadata;
+	}
+
+	const obj = {
+		language,
+		...filteredMetadata
+	};
+	// Give preference to the language we have been given.
+	// Metadata can contain `language` due to round-tripping of cell metadata.
+	// I.e. we add it here, and then from SCM when we revert the cell, we get this same metadata back with the `language` property.
+	if (language) {
+		obj.language = language;
+	}
+	const metadataSource = toFormattedString(obj, {});
+
+	return metadataSource;
+}
diff --git a/src/vs/workbench/contrib/notebook/common/model/notebookMetadataTextModel.ts b/src/vs/workbench/contrib/notebook/common/model/notebookMetadataTextModel.ts
new file mode 100644
index 00000000000..80ea702c5f0
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/common/model/notebookMetadataTextModel.ts
@@ -0,0 +1,103 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { toFormattedString } from '../../../../../base/common/jsonFormatter.js';
+import { INotebookDocumentMetadataTextModel, INotebookTextModel, NotebookCellMetadata, NotebookCellsChangeType, NotebookDocumentMetadata, NotebookMetadataUri, TransientDocumentMetadata } from '../notebookCommon.js';
+import { StringSHA1 } from '../../../../../base/common/hash.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { DefaultEndOfLine, EndOfLinePreference, ITextBuffer } from '../../../../../editor/common/model.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { createTextBuffer } from '../../../../../editor/common/model/textModel.js';
+
+export function getFormattedNotebookMetadataJSON(transientMetadata: TransientDocumentMetadata | undefined, metadata: NotebookDocumentMetadata) {
+	let filteredMetadata: { [key: string]: any } = {};
+
+	if (transientMetadata) {
+		const keys = new Set([...Object.keys(metadata)]);
+		for (const key of keys) {
+			if (!(transientMetadata[key as keyof NotebookCellMetadata])
+			) {
+				filteredMetadata[key] = metadata[key as keyof NotebookCellMetadata];
+			}
+		}
+	} else {
+		filteredMetadata = metadata;
+	}
+
+	const metadataSource = toFormattedString(filteredMetadata, {});
+
+	return metadataSource;
+}
+
+export class NotebookDocumentMetadataTextModel extends Disposable implements INotebookDocumentMetadataTextModel {
+	public readonly uri: URI;
+	public get metadata(): NotebookDocumentMetadata {
+		return this.notebookModel.metadata;
+	}
+	private readonly _onDidChange = this._register(new Emitter<void>());
+	public readonly onDidChange = this._onDidChange.event;
+
+	private _textBufferHash: string | null = null;
+	private _textBuffer?: ITextBuffer;
+	get textBuffer() {
+		if (this._textBuffer) {
+			return this._textBuffer;
+		}
+
+		const source = getFormattedNotebookMetadataJSON(this.notebookModel.transientOptions.transientDocumentMetadata, this.metadata);
+		this._textBuffer = this._register(createTextBuffer(source, DefaultEndOfLine.LF).textBuffer);
+
+		this._register(this._textBuffer.onDidChangeContent(() => {
+			this._onDidChange.fire();
+		}));
+
+		return this._textBuffer;
+	}
+
+	constructor(public readonly notebookModel: INotebookTextModel) {
+		super();
+		this.uri = NotebookMetadataUri.generate(this.notebookModel.uri);
+		this._register(this.notebookModel.onDidChangeContent((e) => {
+			if (e.rawEvents.some(event => event.kind === NotebookCellsChangeType.ChangeDocumentMetadata || event.kind === NotebookCellsChangeType.ModelChange)) {
+				this._textBuffer?.dispose();
+				this._textBuffer = undefined;
+				this._textBufferHash = null;
+				this._onDidChange.fire();
+			}
+		}));
+	}
+
+	getHash() {
+		if (this._textBufferHash !== null) {
+			return this._textBufferHash;
+		}
+
+		const shaComputer = new StringSHA1();
+		const snapshot = this.textBuffer.createSnapshot(false);
+		let text: string | null;
+		while ((text = snapshot.read())) {
+			shaComputer.update(text);
+		}
+		this._textBufferHash = shaComputer.digest();
+		return this._textBufferHash;
+	}
+
+	public getValue() {
+		const fullRange = this.getFullModelRange();
+		const eol = this.textBuffer.getEOL();
+		if (eol === '\n') {
+			return this.textBuffer.getValueInRange(fullRange, EndOfLinePreference.LF);
+		} else {
+			return this.textBuffer.getValueInRange(fullRange, EndOfLinePreference.CRLF);
+		}
+	}
+	private getFullModelRange() {
+		const lineCount = this.textBuffer.getLineCount();
+		return new Range(1, 1, lineCount, this.textBuffer.getLineLength(lineCount) + 1);
+	}
+
+}
diff --git a/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts b/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts
index b3b6ff6e2f9..ea6bf326dd4 100644
--- a/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts
+++ b/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts
@@ -3,25 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event, PauseableEmitter } from 'vs/base/common/event';
-import { Disposable, dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
-import { INotebookTextModel, NotebookCellOutputsSplice, NotebookDocumentMetadata, NotebookCellMetadata, ICellEditOperation, CellEditType, CellUri, diff, NotebookCellsChangeType, ICellDto2, TransientOptions, NotebookTextModelChangedEvent, IOutputDto, ICellOutput, IOutputItemDto, ISelectionState, NullablePartialNotebookCellMetadata, NotebookCellInternalMetadata, NullablePartialNotebookCellInternalMetadata, NotebookTextModelWillAddRemoveEvent, NotebookCellTextModelSplice, ICell, NotebookCellCollapseState, NotebookCellDefaultCollapseConfig, CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { IUndoRedoService, UndoRedoElementType, IUndoRedoElement, IResourceUndoRedoElement, UndoRedoGroup, IWorkspaceUndoRedoElement } from 'vs/platform/undoRedo/common/undoRedo';
-import { MoveCellEdit, SpliceCellsEdit, CellMetadataEdit } from 'vs/workbench/contrib/notebook/common/model/cellEdit';
-import { ISequence, LcsDiff } from 'vs/base/common/diff/diff';
-import { hash } from 'vs/base/common/hash';
-import { NotebookCellOutputTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellOutputTextModel';
-import { IModelService } from 'vs/editor/common/services/model';
-import { Schemas } from 'vs/base/common/network';
-import { isEqual } from 'vs/base/common/resources';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ITextModel } from 'vs/editor/common/model';
-import { TextModel } from 'vs/editor/common/model/textModel';
-import { isDefined } from 'vs/base/common/types';
-import { ILanguageDetectionService } from 'vs/workbench/services/languageDetection/common/languageDetectionWorkerService';
-
+import { Emitter, Event, PauseableEmitter } from '../../../../../base/common/event.js';
+import { Disposable, dispose, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { NotebookCellTextModel } from './notebookCellTextModel.js';
+import { INotebookTextModel, NotebookCellOutputsSplice, NotebookDocumentMetadata, NotebookCellMetadata, ICellEditOperation, CellEditType, CellUri, diff, NotebookCellsChangeType, ICellDto2, TransientOptions, NotebookTextModelChangedEvent, IOutputDto, ICellOutput, IOutputItemDto, ISelectionState, NullablePartialNotebookCellMetadata, NotebookCellInternalMetadata, NullablePartialNotebookCellInternalMetadata, NotebookTextModelWillAddRemoveEvent, NotebookCellTextModelSplice, ICell, NotebookCellCollapseState, NotebookCellDefaultCollapseConfig, CellKind } from '../notebookCommon.js';
+import { IUndoRedoService, UndoRedoElementType, IUndoRedoElement, IResourceUndoRedoElement, UndoRedoGroup, IWorkspaceUndoRedoElement } from '../../../../../platform/undoRedo/common/undoRedo.js';
+import { MoveCellEdit, SpliceCellsEdit, CellMetadataEdit } from './cellEdit.js';
+import { ISequence, LcsDiff } from '../../../../../base/common/diff/diff.js';
+import { hash } from '../../../../../base/common/hash.js';
+import { NotebookCellOutputTextModel } from './notebookCellOutputTextModel.js';
+import { IModelService } from '../../../../../editor/common/services/model.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { isEqual } from '../../../../../base/common/resources.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
+import { FindMatch, ITextModel } from '../../../../../editor/common/model.js';
+import { TextModel } from '../../../../../editor/common/model/textModel.js';
+import { isDefined } from '../../../../../base/common/types.js';
+import { ILanguageDetectionService } from '../../../../services/languageDetection/common/languageDetectionWorkerService.js';
+import { IPosition } from '../../../../../editor/common/core/position.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { SearchParams } from '../../../../../editor/common/model/textModelSearch.js';
+import { IModelContentChangedEvent } from '../../../../../editor/common/textModelEvents.js';
 
 class StackOperation implements IWorkspaceUndoRedoElement {
 	type: UndoRedoElementType.Workspace;
@@ -215,6 +218,10 @@ export class NotebookTextModel extends Disposable implements INotebookTextModel
 		return this._alternativeVersionId;
 	}
 
+	get notebookType() {
+		return this.viewType;
+	}
+
 	constructor(
 		readonly viewType: string,
 		readonly uri: URI,
@@ -322,8 +329,8 @@ export class NotebookTextModel extends Disposable implements INotebookTextModel
 		}
 	}
 
-	private _bindCellContentHandler(cell: NotebookCellTextModel, e: 'content' | 'language' | 'mime') {
-		this._increaseVersionId(e === 'content');
+	private _bindCellContentHandler(cell: NotebookCellTextModel, e: 'content' | 'language' | 'mime' | { type: 'model'; event: IModelContentChangedEvent }) {
+		this._increaseVersionId(e === 'content' || (typeof e === 'object' && e.type === 'model'));
 		switch (e) {
 			case 'content':
 				this._pauseableEmitter.fire({
@@ -351,6 +358,17 @@ export class NotebookTextModel extends Disposable implements INotebookTextModel
 					endSelectionState: undefined
 				});
 				break;
+
+			default:
+				if (typeof e === 'object' && e.type === 'model') {
+					this._pauseableEmitter.fire({
+						rawEvents: [{ kind: NotebookCellsChangeType.ChangeCellContent, index: this._getCellIndexByHandle(cell.handle), transient: false }],
+						versionId: this.versionId,
+						synchronous: true,
+						endSelectionState: undefined
+					});
+				}
+				break;
 		}
 	}
 
@@ -1169,6 +1187,44 @@ export class NotebookTextModel extends Disposable implements INotebookTextModel
 	private _indexIsInvalid(index: number): boolean {
 		return index < 0 || index >= this._cells.length;
 	}
+
+	//#region Find
+	// TODO: enable wrapping through cell indices -- could do this with a wrapped flag
+	findNextMatch(searchString: string, searchStart: { cellIndex: number; position: IPosition }, isRegex: boolean, matchCase: boolean, wordSeparators: string | null): { cell: NotebookCellTextModel; match: FindMatch } | null {
+		// check if search cell index is valid
+		this._assertIndex(searchStart.cellIndex);
+		const searchParams = new SearchParams(searchString, isRegex, matchCase, wordSeparators);
+		const searchData = searchParams.parseSearchRequest();
+
+		if (!searchData) {
+			return null;
+		}
+
+		let cellIndex = searchStart.cellIndex;
+		let searchStartPosition = searchStart.position;
+
+		while (cellIndex < this._cells.length) {
+			const cell = this._cells[cellIndex];
+			const searchRange = new Range(
+				searchStartPosition.lineNumber,
+				searchStartPosition.column,
+				cell.textBuffer.getLineCount(),
+				cell.textBuffer.getLineMaxColumn(cell.textBuffer.getLineCount())
+			);
+
+			const result = cell.textBuffer.findMatchesLineByLine(searchRange, searchData, false, 1);
+			if (result.length > 0) {
+				return { cell, match: result[0] };
+			}
+
+			// Move to the next cell
+			cellIndex++;
+			searchStartPosition = { lineNumber: 1, column: 1 }; // Reset position to start of the next cell
+		}
+
+		return null;
+	}
+	//#endregion
 }
 
 class OutputSequence implements ISequence {
diff --git a/src/vs/workbench/contrib/notebook/common/notebookCellStatusBarService.ts b/src/vs/workbench/contrib/notebook/common/notebookCellStatusBarService.ts
index 133fa494d7b..2837037f5b6 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookCellStatusBarService.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookCellStatusBarService.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Event } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { INotebookCellStatusBarItemList, INotebookCellStatusBarItemProvider } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Event } from '../../../../base/common/event.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { INotebookCellStatusBarItemList, INotebookCellStatusBarItemProvider } from './notebookCommon.js';
 
 export const INotebookCellStatusBarService = createDecorator<INotebookCellStatusBarService>('notebookCellStatusBarService');
 
diff --git a/src/vs/workbench/contrib/notebook/common/notebookCommon.ts b/src/vs/workbench/contrib/notebook/common/notebookCommon.ts
index 33c85b27420..4d8506b9adf 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookCommon.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookCommon.ts
@@ -3,41 +3,47 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IDiffResult } from 'vs/base/common/diff/diff';
-import { Event } from 'vs/base/common/event';
-import * as glob from 'vs/base/common/glob';
-import { Iterable } from 'vs/base/common/iterator';
-import { Mimes } from 'vs/base/common/mime';
-import { Schemas } from 'vs/base/common/network';
-import { basename } from 'vs/base/common/path';
-import { isWindows } from 'vs/base/common/platform';
-import { ISplice } from 'vs/base/common/sequence';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { ILineChange } from 'vs/editor/common/diff/legacyLinesDiffComputer';
-import * as editorCommon from 'vs/editor/common/editorCommon';
-import { Command, WorkspaceEditMetadata } from 'vs/editor/common/languages';
-import { IReadonlyTextBuffer } from 'vs/editor/common/model';
-import { IAccessibilityInformation } from 'vs/platform/accessibility/common/accessibility';
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { ThemeColor } from 'vs/base/common/themables';
-import { UndoRedoGroup } from 'vs/platform/undoRedo/common/undoRedo';
-import { IRevertOptions, ISaveOptions, IUntypedEditorInput } from 'vs/workbench/common/editor';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
-import { IWorkingCopyBackupMeta, IWorkingCopySaveEvent } from 'vs/workbench/services/workingCopy/common/workingCopy';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { IFileReadLimits } from 'vs/platform/files/common/files';
-import { parse as parseUri, generate as generateUri } from 'vs/workbench/services/notebook/common/notebookDocumentService';
-import { ICellExecutionError } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IDiffResult } from '../../../../base/common/diff/diff.js';
+import { Event } from '../../../../base/common/event.js';
+import * as glob from '../../../../base/common/glob.js';
+import { IMarkdownString } from '../../../../base/common/htmlContent.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { Mimes } from '../../../../base/common/mime.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { basename } from '../../../../base/common/path.js';
+import { isWindows } from '../../../../base/common/platform.js';
+import { ISplice } from '../../../../base/common/sequence.js';
+import { ThemeColor } from '../../../../base/common/themables.js';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { ILineChange } from '../../../../editor/common/diff/legacyLinesDiffComputer.js';
+import * as editorCommon from '../../../../editor/common/editorCommon.js';
+import { Command, WorkspaceEditMetadata } from '../../../../editor/common/languages.js';
+import { IReadonlyTextBuffer } from '../../../../editor/common/model.js';
+import { IAccessibilityInformation } from '../../../../platform/accessibility/common/accessibility.js';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { IFileReadLimits } from '../../../../platform/files/common/files.js';
+import { UndoRedoGroup } from '../../../../platform/undoRedo/common/undoRedo.js';
+import { IRevertOptions, ISaveOptions, IUntypedEditorInput } from '../../../common/editor.js';
+import { NotebookTextModel } from './model/notebookTextModel.js';
+import { ICellExecutionError } from './notebookExecutionStateService.js';
+import { INotebookTextModelLike } from './notebookKernelService.js';
+import { ICellRange } from './notebookRange.js';
+import { RegisteredEditorPriority } from '../../../services/editor/common/editorResolverService.js';
+import { generateMetadataUri, generate as generateUri, parseMetadataUri, parse as parseUri } from '../../../services/notebook/common/notebookDocumentService.js';
+import { IWorkingCopyBackupMeta, IWorkingCopySaveEvent } from '../../../services/workingCopy/common/workingCopy.js';
 
 export const NOTEBOOK_EDITOR_ID = 'workbench.editor.notebook';
 export const NOTEBOOK_DIFF_EDITOR_ID = 'workbench.editor.notebookTextDiffEditor';
+export const NOTEBOOK_MULTI_DIFF_EDITOR_ID = 'workbench.editor.notebookMultiTextDiffEditor';
 export const INTERACTIVE_WINDOW_EDITOR_ID = 'workbench.editor.interactive';
+export const REPL_EDITOR_ID = 'workbench.editor.repl';
 
+export const EXECUTE_REPL_COMMAND_ID = 'replNotebook.input.execute';
 
 export enum CellKind {
 	Markup = 1,
@@ -235,6 +241,24 @@ export interface CellInternalMetadataChangedEvent {
 	readonly lastRunSuccessChanged?: boolean;
 }
 
+export interface INotebookDocumentMetadataTextModel {
+	/**
+	 * Notebook Metadata Uri.
+	 */
+	readonly uri: URI;
+	/**
+	 * Triggered when the Notebook Metadata changes.
+	 */
+	readonly onDidChange: Event<void>;
+	readonly metadata: Readonly<NotebookDocumentMetadata>;
+	readonly textBuffer: IReadonlyTextBuffer;
+	/**
+	 * Text representation of the Notebook Metadata
+	 */
+	getValue(): string;
+	getHash(): string;
+}
+
 export interface ICell {
 	readonly uri: URI;
 	handle: number;
@@ -252,7 +276,8 @@ export interface ICell {
 	onDidChangeInternalMetadata: Event<CellInternalMetadataChangedEvent>;
 }
 
-export interface INotebookTextModel {
+export interface INotebookTextModel extends INotebookTextModelLike {
+	readonly notebookType: string;
 	readonly viewType: string;
 	metadata: NotebookDocumentMetadata;
 	readonly transientOptions: TransientOptions;
@@ -280,9 +305,10 @@ export type NotebookCellOutputsSplice = {
 
 export interface IMainCellDto {
 	handle: number;
-	uri: UriComponents;
+	url: string;
 	source: string[];
 	eol: string;
+	versionId: number;
 	language: string;
 	cellKind: CellKind;
 	outputs: IOutputDto[];
@@ -551,9 +577,18 @@ export interface INotebookContributionData {
 	providerDisplayName: string;
 	displayName: string;
 	filenamePattern: (string | glob.IRelativePattern | INotebookExclusiveDocumentFilter)[];
-	exclusive: boolean;
+	priority?: RegisteredEditorPriority;
 }
 
+export namespace NotebookMetadataUri {
+	export const scheme = Schemas.vscodeNotebookMetadata;
+	export function generate(notebook: URI): URI {
+		return generateMetadataUri(notebook);
+	}
+	export function parse(metadata: URI): URI | undefined {
+		return parseMetadataUri(metadata);
+	}
+}
 
 export namespace CellUri {
 	export const scheme = Schemas.vscodeNotebookCell;
@@ -776,6 +811,12 @@ export interface INotebookLoadOptions {
 	readonly limits?: IFileReadLimits;
 }
 
+export type NotebookEditorModelCreationOptions = {
+	limits?: IFileReadLimits;
+	scratchpad?: boolean;
+	viewType?: string;
+};
+
 export interface IResolvedNotebookEditorModel extends INotebookEditorModel {
 	notebook: NotebookTextModel;
 }
@@ -818,7 +859,7 @@ export enum NotebookEditorPriority {
 	option = 'option',
 }
 
-export interface INotebookSearchOptions {
+export interface INotebookFindOptions {
 	regex?: boolean;
 	wholeWord?: boolean;
 	caseSensitive?: boolean;
@@ -827,8 +868,19 @@ export interface INotebookSearchOptions {
 	includeMarkupPreview?: boolean;
 	includeCodeInput?: boolean;
 	includeOutput?: boolean;
-	searchInRanges?: boolean;
-	selectedRanges?: ICellRange[];
+	findScope?: INotebookFindScope;
+}
+
+export interface INotebookFindScope {
+	findScopeType: NotebookFindScopeType;
+	selectedCellRanges?: ICellRange[];
+	selectedTextRanges?: Range[];
+}
+
+export enum NotebookFindScopeType {
+	Cells = 'cells',
+	Text = 'text',
+	None = 'none'
 }
 
 export interface INotebookExclusiveDocumentFilter {
@@ -889,6 +941,7 @@ export interface INotebookCellStatusBarItemProvider {
 
 export interface INotebookDiffResult {
 	cellsDiff: IDiffResult;
+	metadataChanged: boolean;
 	linesDiff?: { originalCellhandle: number; modifiedCellhandle: number; lineChanges: ILineChange[] }[];
 }
 
@@ -954,7 +1007,6 @@ export const NotebookSetting = {
 	outputFontFamilyDeprecated: 'notebook.outputFontFamily',
 	outputFontFamily: 'notebook.output.fontFamily',
 	findFilters: 'notebook.find.filters',
-	findScope: 'notebook.experimental.find.scope.enabled',
 	logging: 'notebook.logging',
 	confirmDeleteRunningCell: 'notebook.confirmDeleteRunningCell',
 	remoteSaving: 'notebook.experimental.remoteSave',
@@ -970,6 +1022,7 @@ export const NotebookSetting = {
 	InteractiveWindowPromptToSave: 'interactiveWindow.promptToSaveOnClose',
 	cellFailureDiagnostics: 'notebook.cellFailureDiagnostics',
 	outputBackupSizeLimit: 'notebook.backup.sizeLimit',
+	multiCursor: 'notebook.multiCursor.enabled',
 } as const;
 
 export const enum CellStatusbarAlignment {
@@ -981,13 +1034,16 @@ export class NotebookWorkingCopyTypeIdentifier {
 
 	private static _prefix = 'notebook/';
 
-	static create(viewType: string): string {
-		return `${NotebookWorkingCopyTypeIdentifier._prefix}${viewType}`;
+	static create(notebookType: string, viewType?: string): string {
+		return `${NotebookWorkingCopyTypeIdentifier._prefix}${notebookType}/${viewType ?? notebookType}`;
 	}
 
-	static parse(candidate: string): string | undefined {
+	static parse(candidate: string): { notebookType: string; viewType: string } | undefined {
 		if (candidate.startsWith(NotebookWorkingCopyTypeIdentifier._prefix)) {
-			return candidate.substring(NotebookWorkingCopyTypeIdentifier._prefix.length);
+			const split = candidate.substring(NotebookWorkingCopyTypeIdentifier._prefix.length).split('/');
+			if (split.length === 2) {
+				return { notebookType: split[0], viewType: split[1] };
+			}
 		}
 		return undefined;
 	}
diff --git a/src/vs/workbench/contrib/notebook/common/notebookContextKeys.ts b/src/vs/workbench/contrib/notebook/common/notebookContextKeys.ts
index 4aad255f787..ad68c6dd087 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookContextKeys.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookContextKeys.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ContextKeyExpr, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { INTERACTIVE_WINDOW_EDITOR_ID, NOTEBOOK_EDITOR_ID } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { ContextKeyExpr, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { INTERACTIVE_WINDOW_EDITOR_ID, NOTEBOOK_EDITOR_ID, REPL_EDITOR_ID } from './notebookCommon.js';
 
 
 
@@ -16,11 +16,16 @@ export const InteractiveWindowOpen = new RawContextKey<boolean>('interactiveWind
 // Is Notebook
 export const NOTEBOOK_IS_ACTIVE_EDITOR = ContextKeyExpr.equals('activeEditor', NOTEBOOK_EDITOR_ID);
 export const INTERACTIVE_WINDOW_IS_ACTIVE_EDITOR = ContextKeyExpr.equals('activeEditor', INTERACTIVE_WINDOW_EDITOR_ID);
+export const REPL_NOTEBOOK_IS_ACTIVE_EDITOR = ContextKeyExpr.equals('activeEditor', REPL_EDITOR_ID);
+export const IS_COMPOSITE_NOTEBOOK = new RawContextKey<boolean>('isCompositeNotebook', false);
 
 // Editor keys
+// based on the focus of the notebook editor widget
 export const NOTEBOOK_EDITOR_FOCUSED = new RawContextKey<boolean>('notebookEditorFocused', false);
+// always true within the cell list html element
 export const NOTEBOOK_CELL_LIST_FOCUSED = new RawContextKey<boolean>('notebookCellListFocused', false);
 export const NOTEBOOK_OUTPUT_FOCUSED = new RawContextKey<boolean>('notebookOutputFocused', false);
+// an input html element within the output webview has focus
 export const NOTEBOOK_OUTPUT_INPUT_FOCUSED = new RawContextKey<boolean>('notebookOutputInputFocused', false);
 export const NOTEBOOK_EDITOR_EDITABLE = new RawContextKey<boolean>('notebookEditable', true);
 export const NOTEBOOK_HAS_RUNNING_CELL = new RawContextKey<boolean>('notebookHasRunningCell', false);
@@ -43,6 +48,8 @@ export type NotebookCellExecutionStateContext = 'idle' | 'pending' | 'executing'
 export const NOTEBOOK_CELL_EXECUTION_STATE = new RawContextKey<NotebookCellExecutionStateContext>('notebookCellExecutionState', undefined);
 export const NOTEBOOK_CELL_EXECUTING = new RawContextKey<boolean>('notebookCellExecuting', false); // This only exists to simplify a context key expression, see #129625
 export const NOTEBOOK_CELL_HAS_OUTPUTS = new RawContextKey<boolean>('notebookCellHasOutputs', false);
+export const NOTEBOOK_CELL_IS_FIRST_OUTPUT = new RawContextKey<boolean>('notebookCellIsFirstOutput', false);
+export const NOTEBOOK_CELL_HAS_HIDDEN_OUTPUTS = new RawContextKey<boolean>('hasHiddenOutputs', false);
 export const NOTEBOOK_CELL_INPUT_COLLAPSED = new RawContextKey<boolean>('notebookCellInputIsCollapsed', false);
 export const NOTEBOOK_CELL_OUTPUT_COLLAPSED = new RawContextKey<boolean>('notebookCellOutputIsCollapsed', false);
 export const NOTEBOOK_CELL_RESOURCE = new RawContextKey<string>('notebookCellResource', '');
diff --git a/src/vs/workbench/contrib/notebook/common/notebookDiffEditorInput.ts b/src/vs/workbench/contrib/notebook/common/notebookDiffEditorInput.ts
index 5884848448e..76591c71e6b 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookDiffEditorInput.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookDiffEditorInput.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IResourceDiffEditorInput, IResourceSideBySideEditorInput, isResourceDiffEditorInput, IUntypedEditorInput } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { EditorModel } from 'vs/workbench/common/editor/editorModel';
-import { URI } from 'vs/base/common/uri';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { INotebookDiffEditorModel, IResolvedNotebookEditorModel } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
-import { NotebookEditorInput } from 'vs/workbench/contrib/notebook/common/notebookEditorInput';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IResourceDiffEditorInput, IResourceSideBySideEditorInput, isResourceDiffEditorInput, IUntypedEditorInput } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { EditorModel } from '../../../common/editor/editorModel.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { INotebookDiffEditorModel, IResolvedNotebookEditorModel } from './notebookCommon.js';
+import { DiffEditorInput } from '../../../common/editor/diffEditorInput.js';
+import { NotebookEditorInput } from './notebookEditorInput.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
 
 class NotebookDiffEditorModel extends EditorModel implements INotebookDiffEditorModel {
 	constructor(
diff --git a/src/vs/workbench/contrib/notebook/common/notebookEditorInput.ts b/src/vs/workbench/contrib/notebook/common/notebookEditorInput.ts
index 0ac6de71100..e6fdd481218 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookEditorInput.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookEditorInput.ts
@@ -3,34 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as glob from 'vs/base/common/glob';
-import { GroupIdentifier, ISaveOptions, IMoveResult, IRevertOptions, EditorInputCapabilities, Verbosity, IUntypedEditorInput, IFileLimitedEditorInputOptions } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { INotebookService, SimpleNotebookProviderInfo } from 'vs/workbench/contrib/notebook/common/notebookService';
-import { URI } from 'vs/base/common/uri';
-import { isEqual, joinPath } from 'vs/base/common/resources';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { INotebookEditorModelResolverService } from 'vs/workbench/contrib/notebook/common/notebookEditorModelResolverService';
-import { IDisposable, IReference } from 'vs/base/common/lifecycle';
-import { CellEditType, IResolvedNotebookEditorModel } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { Schemas } from 'vs/base/common/network';
-import { IFileService } from 'vs/platform/files/common/files';
-import { AbstractResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput';
-import { IResourceEditorInput } from 'vs/platform/editor/common/editor';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { IWorkingCopyIdentifier } from 'vs/workbench/services/workingCopy/common/workingCopy';
-import { NotebookProviderInfo } from 'vs/workbench/contrib/notebook/common/notebookProvider';
-import { NotebookPerfMarks } from 'vs/workbench/contrib/notebook/common/notebookPerformance';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { localize } from 'vs/nls';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { ICustomEditorLabelService } from 'vs/workbench/services/editor/common/customEditorLabelService';
+import * as glob from '../../../../base/common/glob.js';
+import { GroupIdentifier, ISaveOptions, IMoveResult, IRevertOptions, EditorInputCapabilities, Verbosity, IUntypedEditorInput, IFileLimitedEditorInputOptions } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { INotebookService, SimpleNotebookProviderInfo } from './notebookService.js';
+import { URI } from '../../../../base/common/uri.js';
+import { isEqual, joinPath } from '../../../../base/common/resources.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { INotebookEditorModelResolverService } from './notebookEditorModelResolverService.js';
+import { IDisposable, IReference } from '../../../../base/common/lifecycle.js';
+import { CellEditType, IResolvedNotebookEditorModel } from './notebookCommon.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { AbstractResourceEditorInput } from '../../../common/editor/resourceEditorInput.js';
+import { IResourceEditorInput } from '../../../../platform/editor/common/editor.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { IWorkingCopyIdentifier } from '../../../services/workingCopy/common/workingCopy.js';
+import { NotebookProviderInfo } from './notebookProvider.js';
+import { NotebookPerfMarks } from './notebookPerformance.js';
+import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { localize } from '../../../../nls.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IMarkdownString } from '../../../../base/common/htmlContent.js';
+import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { ICustomEditorLabelService } from '../../../services/editor/common/customEditorLabelService.js';
 
 export interface NotebookEditorInputOptions {
 	startDirty?: boolean;
@@ -53,7 +53,7 @@ export class NotebookEditorInput extends AbstractResourceEditorInput {
 
 	static readonly ID: string = 'workbench.input.notebook';
 
-	private _editorModelReference: IReference<IResolvedNotebookEditorModel> | null = null;
+	protected editorModelReference: IReference<IResolvedNotebookEditorModel> | null = null;
 	private _sideLoadedListener: IDisposable;
 	private _defaultDirtyState: boolean = false;
 
@@ -86,12 +86,19 @@ export class NotebookEditorInput extends AbstractResourceEditorInput {
 		});
 
 		this._register(extensionService.onWillStop(e => {
-			if (!this.isDirty()) {
+			if (!e.auto && !this.isDirty()) {
 				return;
 			}
 
+			const reason = e.auto
+				? localize('vetoAutoExtHostRestart', "One of the opened editors is a notebook editor.")
+				: localize('vetoExtHostRestart', "Notebook '{0}' could not be saved.", this.resource.path);
+
 			e.veto((async () => {
 				const editors = editorService.findEditors(this);
+				if (e.auto) {
+					return true;
+				}
 				if (editors.length > 0) {
 					const result = await editorService.save(editors[0]);
 					if (result.success) {
@@ -99,14 +106,14 @@ export class NotebookEditorInput extends AbstractResourceEditorInput {
 					}
 				}
 				return true; // Veto
-			})(), localize('vetoExtHostRestart', "Notebook '{0}' could not be saved.", this.resource.path));
+			})(), reason);
 		}));
 	}
 
 	override dispose() {
 		this._sideLoadedListener.dispose();
-		this._editorModelReference?.dispose();
-		this._editorModelReference = null;
+		this.editorModelReference?.dispose();
+		this.editorModelReference = null;
 		super.dispose();
 	}
 
@@ -125,8 +132,8 @@ export class NotebookEditorInput extends AbstractResourceEditorInput {
 			capabilities |= EditorInputCapabilities.Untitled;
 		}
 
-		if (this._editorModelReference) {
-			if (this._editorModelReference.object.isReadonly()) {
+		if (this.editorModelReference) {
+			if (this.editorModelReference.object.isReadonly()) {
 				capabilities |= EditorInputCapabilities.Readonly;
 			}
 		} else {
@@ -143,7 +150,7 @@ export class NotebookEditorInput extends AbstractResourceEditorInput {
 	}
 
 	override getDescription(verbosity = Verbosity.MEDIUM): string | undefined {
-		if (!this.hasCapability(EditorInputCapabilities.Untitled) || this._editorModelReference?.object.hasAssociatedFilePath()) {
+		if (!this.hasCapability(EditorInputCapabilities.Untitled) || this.editorModelReference?.object.hasAssociatedFilePath()) {
 			return super.getDescription(verbosity);
 		}
 
@@ -151,21 +158,21 @@ export class NotebookEditorInput extends AbstractResourceEditorInput {
 	}
 
 	override isReadonly(): boolean | IMarkdownString {
-		if (!this._editorModelReference) {
+		if (!this.editorModelReference) {
 			return this.filesConfigurationService.isReadonly(this.resource);
 		}
-		return this._editorModelReference.object.isReadonly();
+		return this.editorModelReference.object.isReadonly();
 	}
 
 	override isDirty() {
-		if (!this._editorModelReference) {
+		if (!this.editorModelReference) {
 			return this._defaultDirtyState;
 		}
-		return this._editorModelReference.object.isDirty();
+		return this.editorModelReference.object.isDirty();
 	}
 
 	override isSaving(): boolean {
-		const model = this._editorModelReference?.object;
+		const model = this.editorModelReference?.object;
 		if (!model || !model.isDirty() || model.hasErrorState || this.hasCapability(EditorInputCapabilities.Untitled)) {
 			return false; // require the model to be dirty, file-backed and not in an error state
 		}
@@ -175,12 +182,12 @@ export class NotebookEditorInput extends AbstractResourceEditorInput {
 	}
 
 	override async save(group: GroupIdentifier, options?: ISaveOptions): Promise<EditorInput | IUntypedEditorInput | undefined> {
-		if (this._editorModelReference) {
+		if (this.editorModelReference) {
 
 			if (this.hasCapability(EditorInputCapabilities.Untitled)) {
 				return this.saveAs(group, options);
 			} else {
-				await this._editorModelReference.object.save(options);
+				await this.editorModelReference.object.save(options);
 			}
 
 			return this;
@@ -190,7 +197,7 @@ export class NotebookEditorInput extends AbstractResourceEditorInput {
 	}
 
 	override async saveAs(group: GroupIdentifier, options?: ISaveOptions): Promise<IUntypedEditorInput | undefined> {
-		if (!this._editorModelReference) {
+		if (!this.editorModelReference) {
 			return undefined;
 		}
 
@@ -200,9 +207,9 @@ export class NotebookEditorInput extends AbstractResourceEditorInput {
 			return undefined;
 		}
 
-		const pathCandidate = this.hasCapability(EditorInputCapabilities.Untitled) ? await this._suggestName(provider, this.labelService.getUriBasenameLabel(this.resource)) : this._editorModelReference.object.resource;
+		const pathCandidate = this.hasCapability(EditorInputCapabilities.Untitled) ? await this._suggestName(provider, this.labelService.getUriBasenameLabel(this.resource)) : this.editorModelReference.object.resource;
 		let target: URI | undefined;
-		if (this._editorModelReference.object.hasAssociatedFilePath()) {
+		if (this.editorModelReference.object.hasAssociatedFilePath()) {
 			target = pathCandidate;
 		} else {
 			target = await this._fileDialogService.pickFileToSave(pathCandidate, options?.availableFileSystems);
@@ -231,7 +238,7 @@ export class NotebookEditorInput extends AbstractResourceEditorInput {
 			throw new Error(`File name ${target} is not supported by ${provider.providerDisplayName}.\n\nPlease make sure the file name matches following patterns:\n${patterns}`);
 		}
 
-		return await this._editorModelReference.object.saveAs(target);
+		return await this.editorModelReference.object.saveAs(target);
 	}
 
 	private async _suggestName(provider: NotebookProviderInfo, suggestedFilename: string) {
@@ -260,7 +267,7 @@ export class NotebookEditorInput extends AbstractResourceEditorInput {
 
 	// called when users rename a notebook document
 	override async rename(group: GroupIdentifier, target: URI): Promise<IMoveResult | undefined> {
-		if (this._editorModelReference) {
+		if (this.editorModelReference) {
 			return { editor: { resource: target }, options: { override: this.viewType } };
 
 		}
@@ -268,8 +275,8 @@ export class NotebookEditorInput extends AbstractResourceEditorInput {
 	}
 
 	override async revert(_group: GroupIdentifier, options?: IRevertOptions): Promise<void> {
-		if (this._editorModelReference && this._editorModelReference.object.isDirty()) {
-			await this._editorModelReference.object.revert(options);
+		if (this.editorModelReference && this.editorModelReference.object.isDirty()) {
+			await this.editorModelReference.object.revert(options);
 		}
 	}
 
@@ -284,42 +291,43 @@ export class NotebookEditorInput extends AbstractResourceEditorInput {
 		// "other" loading anymore
 		this._sideLoadedListener.dispose();
 
-		if (!this._editorModelReference) {
-			const ref = await this._notebookModelResolverService.resolve(this.resource, this.viewType, this.ensureLimits(_options));
-			if (this._editorModelReference) {
+		if (!this.editorModelReference) {
+			const scratchpad = this.capabilities & EditorInputCapabilities.Scratchpad ? true : false;
+			const ref = await this._notebookModelResolverService.resolve(this.resource, this.viewType, { limits: this.ensureLimits(_options), scratchpad, viewType: this.editorId });
+			if (this.editorModelReference) {
 				// Re-entrant, double resolve happened. Dispose the addition references and proceed
 				// with the truth.
 				ref.dispose();
-				return (<IReference<IResolvedNotebookEditorModel>>this._editorModelReference).object;
+				return (<IReference<IResolvedNotebookEditorModel>>this.editorModelReference).object;
 			}
-			this._editorModelReference = ref;
+			this.editorModelReference = ref;
 			if (this.isDisposed()) {
-				this._editorModelReference.dispose();
-				this._editorModelReference = null;
+				this.editorModelReference.dispose();
+				this.editorModelReference = null;
 				return null;
 			}
-			this._register(this._editorModelReference.object.onDidChangeDirty(() => this._onDidChangeDirty.fire()));
-			this._register(this._editorModelReference.object.onDidChangeReadonly(() => this._onDidChangeCapabilities.fire()));
-			this._register(this._editorModelReference.object.onDidRevertUntitled(() => this.dispose()));
-			if (this._editorModelReference.object.isDirty()) {
+			this._register(this.editorModelReference.object.onDidChangeDirty(() => this._onDidChangeDirty.fire()));
+			this._register(this.editorModelReference.object.onDidChangeReadonly(() => this._onDidChangeCapabilities.fire()));
+			this._register(this.editorModelReference.object.onDidRevertUntitled(() => this.dispose()));
+			if (this.editorModelReference.object.isDirty()) {
 				this._onDidChangeDirty.fire();
 			}
 		} else {
-			this._editorModelReference.object.load({ limits: this.ensureLimits(_options) });
+			this.editorModelReference.object.load({ limits: this.ensureLimits(_options) });
 		}
 
 		if (this.options._backupId) {
-			const info = await this._notebookService.withNotebookDataProvider(this._editorModelReference.object.notebook.viewType);
+			const info = await this._notebookService.withNotebookDataProvider(this.editorModelReference.object.notebook.viewType);
 			if (!(info instanceof SimpleNotebookProviderInfo)) {
 				throw new Error('CANNOT open file notebook with this provider');
 			}
 
 			const data = await info.serializer.dataToNotebook(VSBuffer.fromString(JSON.stringify({ __webview_backup: this.options._backupId })));
-			this._editorModelReference.object.notebook.applyEdits([
+			this.editorModelReference.object.notebook.applyEdits([
 				{
 					editType: CellEditType.Replace,
 					index: 0,
-					count: this._editorModelReference.object.notebook.length,
+					count: this.editorModelReference.object.notebook.length,
 					cells: data.cells
 				}
 			], true, undefined, () => undefined, undefined, false);
@@ -331,7 +339,7 @@ export class NotebookEditorInput extends AbstractResourceEditorInput {
 			}
 		}
 
-		return this._editorModelReference.object;
+		return this.editorModelReference.object;
 	}
 
 	override toUntyped(): IResourceEditorInput {
@@ -365,8 +373,8 @@ export function isCompositeNotebookEditorInput(thing: unknown): thing is ICompos
 		&& ((<ICompositeNotebookEditorInput>thing).editorInputs.every(input => input instanceof NotebookEditorInput));
 }
 
-export function isNotebookEditorInput(thing: unknown): thing is NotebookEditorInput {
+export function isNotebookEditorInput(thing: EditorInput | undefined): thing is NotebookEditorInput {
 	return !!thing
 		&& typeof thing === 'object'
-		&& thing instanceof NotebookEditorInput;
+		&& thing.typeId === NotebookEditorInput.ID;
 }
diff --git a/src/vs/workbench/contrib/notebook/common/notebookEditorModel.ts b/src/vs/workbench/contrib/notebook/common/notebookEditorModel.ts
index a6a06d63186..5f0e06387b1 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookEditorModel.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookEditorModel.ts
@@ -3,31 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBufferReadableStream, bufferToStream, streamToBuffer } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { CancellationError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { filter } from 'vs/base/common/objects';
-import { assertType } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IWriteFileOptions, IFileStatWithMetadata } from 'vs/platform/files/common/files';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IRevertOptions, ISaveOptions, IUntypedEditorInput } from 'vs/workbench/common/editor';
-import { EditorModel } from 'vs/workbench/common/editor/editorModel';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { ICellDto2, INotebookEditorModel, INotebookLoadOptions, IResolvedNotebookEditorModel, NotebookCellsChangeType, NotebookData, NotebookSetting } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotebookSerializer, INotebookService, SimpleNotebookProviderInfo } from 'vs/workbench/contrib/notebook/common/notebookService';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { IFileWorkingCopyModelConfiguration, SnapshotContext } from 'vs/workbench/services/workingCopy/common/fileWorkingCopy';
-import { IFileWorkingCopyManager } from 'vs/workbench/services/workingCopy/common/fileWorkingCopyManager';
-import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel, IStoredFileWorkingCopyModelContentChangedEvent, IStoredFileWorkingCopyModelFactory, IStoredFileWorkingCopySaveEvent, StoredFileWorkingCopyState } from 'vs/workbench/services/workingCopy/common/storedFileWorkingCopy';
-import { IUntitledFileWorkingCopy, IUntitledFileWorkingCopyModel, IUntitledFileWorkingCopyModelContentChangedEvent, IUntitledFileWorkingCopyModelFactory } from 'vs/workbench/services/workingCopy/common/untitledFileWorkingCopy';
-import { WorkingCopyCapabilities } from 'vs/workbench/services/workingCopy/common/workingCopy';
+import { VSBufferReadableStream, bufferToStream, streamToBuffer } from '../../../../base/common/buffer.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { CancellationError } from '../../../../base/common/errors.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { IMarkdownString } from '../../../../base/common/htmlContent.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { filter } from '../../../../base/common/objects.js';
+import { assertType } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IWriteFileOptions, IFileStatWithMetadata } from '../../../../platform/files/common/files.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IRevertOptions, ISaveOptions, IUntypedEditorInput } from '../../../common/editor.js';
+import { EditorModel } from '../../../common/editor/editorModel.js';
+import { NotebookTextModel } from './model/notebookTextModel.js';
+import { ICellDto2, INotebookEditorModel, INotebookLoadOptions, IResolvedNotebookEditorModel, NotebookCellsChangeType, NotebookData, NotebookSetting } from './notebookCommon.js';
+import { INotebookLoggingService } from './notebookLoggingService.js';
+import { INotebookSerializer, INotebookService, SimpleNotebookProviderInfo } from './notebookService.js';
+import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.js';
+import { IFileWorkingCopyModelConfiguration, SnapshotContext } from '../../../services/workingCopy/common/fileWorkingCopy.js';
+import { IFileWorkingCopyManager } from '../../../services/workingCopy/common/fileWorkingCopyManager.js';
+import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel, IStoredFileWorkingCopyModelContentChangedEvent, IStoredFileWorkingCopyModelFactory, IStoredFileWorkingCopySaveEvent, StoredFileWorkingCopyState } from '../../../services/workingCopy/common/storedFileWorkingCopy.js';
+import { IUntitledFileWorkingCopy, IUntitledFileWorkingCopyModel, IUntitledFileWorkingCopyModelContentChangedEvent, IUntitledFileWorkingCopyModelFactory } from '../../../services/workingCopy/common/untitledFileWorkingCopy.js';
+import { WorkingCopyCapabilities } from '../../../services/workingCopy/common/workingCopy.js';
 
 //#region --- simple content provider
 
@@ -199,7 +199,7 @@ export class NotebookFileWorkingCopyModel extends Disposable implements IStoredF
 		private readonly _notebookService: INotebookService,
 		private readonly _configurationService: IConfigurationService,
 		private readonly _telemetryService: ITelemetryService,
-		private readonly _logService: ILogService
+		private readonly _notebookLogService: INotebookLoggingService,
 	) {
 		super();
 
@@ -247,7 +247,7 @@ export class NotebookFileWorkingCopyModel extends Disposable implements IStoredF
 				let serializer = this._notebookService.tryGetDataProviderSync(this.notebookModel.viewType)?.serializer;
 
 				if (!serializer) {
-					this._logService.warn('No serializer found for notebook model, checking if provider still needs to be resolved');
+					this._notebookLogService.info('WorkingCopyModel', 'No serializer found for notebook model, checking if provider still needs to be resolved');
 					serializer = await this.getNotebookSerializer();
 				}
 
@@ -342,6 +342,8 @@ export class NotebookFileWorkingCopyModel extends Disposable implements IStoredF
 		if (token.isCancellationRequested) {
 			throw new CancellationError();
 		}
+
+		this._notebookLogService.info('WorkingCopyModel', 'Notebook content updated from file system - ' + this._notebookModel.uri.toString());
 		this._notebookModel.reset(data.cells, data.metadata, serializer.options);
 	}
 
@@ -370,25 +372,15 @@ export class NotebookFileWorkingCopyModelFactory implements IStoredFileWorkingCo
 		@INotebookService private readonly _notebookService: INotebookService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@ITelemetryService private readonly _telemetryService: ITelemetryService,
-		@ILogService private readonly _logService: ILogService
+		@INotebookLoggingService private readonly _notebookLogService: INotebookLoggingService
 	) { }
 
 	async createModel(resource: URI, stream: VSBufferReadableStream, token: CancellationToken): Promise<NotebookFileWorkingCopyModel> {
 
-		const info = await this._notebookService.withNotebookDataProvider(this._viewType);
-		if (!(info instanceof SimpleNotebookProviderInfo)) {
-			throw new Error('CANNOT open file notebook with this provider');
-		}
+		const notebookModel = this._notebookService.getNotebookTextModel(resource) ??
+			await this._notebookService.createNotebookTextModel(this._viewType, resource, stream);
 
-		const bytes = await streamToBuffer(stream);
-		const data = await info.serializer.dataToNotebook(bytes);
-
-		if (token.isCancellationRequested) {
-			throw new CancellationError();
-		}
-
-		const notebookModel = this._notebookService.createNotebookTextModel(info.viewType, resource, data, info.serializer.options);
-		return new NotebookFileWorkingCopyModel(notebookModel, this._notebookService, this._configurationService, this._telemetryService, this._logService);
+		return new NotebookFileWorkingCopyModel(notebookModel, this._notebookService, this._configurationService, this._telemetryService, this._notebookLogService);
 	}
 }
 
diff --git a/src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.ts b/src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.ts
index 3eff1eb5060..3e2692686c0 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { URI } from 'vs/base/common/uri';
-import { IResolvedNotebookEditorModel } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { IReference } from 'vs/base/common/lifecycle';
-import { Event, IWaitUntil } from 'vs/base/common/event';
-import { IFileReadLimits } from 'vs/platform/files/common/files';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IResolvedNotebookEditorModel, NotebookEditorModelCreationOptions } from './notebookCommon.js';
+import { IReference } from '../../../../base/common/lifecycle.js';
+import { Event, IWaitUntil } from '../../../../base/common/event.js';
+import { NotebookTextModel } from './model/notebookTextModel.js';
 
 export const INotebookEditorModelResolverService = createDecorator<INotebookEditorModelResolverService>('INotebookModelResolverService');
 
@@ -50,6 +50,8 @@ export interface INotebookEditorModelResolverService {
 
 	isDirty(resource: URI): boolean;
 
-	resolve(resource: URI, viewType?: string, limits?: IFileReadLimits): Promise<IReference<IResolvedNotebookEditorModel>>;
-	resolve(resource: IUntitledNotebookResource, viewType: string, limits?: IFileReadLimits): Promise<IReference<IResolvedNotebookEditorModel>>;
+	createUntitledNotebookTextModel(viewType: string): Promise<NotebookTextModel>;
+
+	resolve(resource: URI, viewType?: string, creationOptions?: NotebookEditorModelCreationOptions): Promise<IReference<IResolvedNotebookEditorModel>>;
+	resolve(resource: IUntitledNotebookResource, viewType: string, creationOtions?: NotebookEditorModelCreationOptions): Promise<IReference<IResolvedNotebookEditorModel>>;
 }
diff --git a/src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverServiceImpl.ts b/src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverServiceImpl.ts
index 318a2a96731..410339077b3 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverServiceImpl.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverServiceImpl.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { URI } from 'vs/base/common/uri';
-import { CellUri, IResolvedNotebookEditorModel, NotebookSetting, NotebookWorkingCopyTypeIdentifier } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { NotebookFileWorkingCopyModel, NotebookFileWorkingCopyModelFactory, SimpleNotebookEditorModel } from 'vs/workbench/contrib/notebook/common/notebookEditorModel';
-import { combinedDisposable, DisposableStore, dispose, IDisposable, IReference, ReferenceCollection, toDisposable } from 'vs/base/common/lifecycle';
-import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { AsyncEmitter, Emitter, Event } from 'vs/base/common/event';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { INotebookConflictEvent, INotebookEditorModelResolverService, IUntitledNotebookResource } from 'vs/workbench/contrib/notebook/common/notebookEditorModelResolverService';
-import { ResourceMap } from 'vs/base/common/map';
-import { FileWorkingCopyManager, IFileWorkingCopyManager } from 'vs/workbench/services/workingCopy/common/fileWorkingCopyManager';
-import { Schemas } from 'vs/base/common/network';
-import { NotebookProviderInfo } from 'vs/workbench/contrib/notebook/common/notebookProvider';
-import { assertIsDefined } from 'vs/base/common/types';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IFileReadLimits } from 'vs/platform/files/common/files';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { URI } from '../../../../base/common/uri.js';
+import { CellUri, IResolvedNotebookEditorModel, NotebookEditorModelCreationOptions, NotebookSetting, NotebookWorkingCopyTypeIdentifier } from './notebookCommon.js';
+import { NotebookFileWorkingCopyModel, NotebookFileWorkingCopyModelFactory, SimpleNotebookEditorModel } from './notebookEditorModel.js';
+import { combinedDisposable, DisposableStore, dispose, IDisposable, IReference, ReferenceCollection, toDisposable } from '../../../../base/common/lifecycle.js';
+import { INotebookService } from './notebookService.js';
+import { AsyncEmitter, Emitter, Event } from '../../../../base/common/event.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { INotebookConflictEvent, INotebookEditorModelResolverService, IUntitledNotebookResource } from './notebookEditorModelResolverService.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { FileWorkingCopyManager, IFileWorkingCopyManager } from '../../../services/workingCopy/common/fileWorkingCopyManager.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { NotebookProviderInfo } from './notebookProvider.js';
+import { assertIsDefined } from '../../../../base/common/types.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IFileReadLimits } from '../../../../platform/files/common/files.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { INotebookLoggingService } from './notebookLoggingService.js';
 
 class NotebookModelReferenceCollection extends ReferenceCollection<Promise<IResolvedNotebookEditorModel>> {
 
@@ -42,9 +42,9 @@ class NotebookModelReferenceCollection extends ReferenceCollection<Promise<IReso
 	constructor(
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@INotebookService private readonly _notebookService: INotebookService,
-		@ILogService private readonly _logService: ILogService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
-		@ITelemetryService private readonly _telemetryService: ITelemetryService
+		@ITelemetryService private readonly _telemetryService: ITelemetryService,
+		@INotebookLoggingService private readonly _notebookLoggingService: INotebookLoggingService,
 	) {
 		super();
 	}
@@ -61,16 +61,16 @@ class NotebookModelReferenceCollection extends ReferenceCollection<Promise<IReso
 		return this._dirtyStates.get(resource) ?? false;
 	}
 
-	protected async createReferencedObject(key: string, viewType: string, hasAssociatedFilePath: boolean, limits?: IFileReadLimits): Promise<IResolvedNotebookEditorModel> {
+	protected async createReferencedObject(key: string, notebookType: string, hasAssociatedFilePath: boolean, limits?: IFileReadLimits, isScratchpad?: boolean, viewType?: string): Promise<IResolvedNotebookEditorModel> {
 		// Untrack as being disposed
 		this.modelsToDispose.delete(key);
 
 		const uri = URI.parse(key);
 
-		const workingCopyTypeId = NotebookWorkingCopyTypeIdentifier.create(viewType);
+		const workingCopyTypeId = NotebookWorkingCopyTypeIdentifier.create(notebookType, viewType);
 		let workingCopyManager = this._workingCopyManagers.get(workingCopyTypeId);
 		if (!workingCopyManager) {
-			const factory = new NotebookFileWorkingCopyModelFactory(viewType, this._notebookService, this._configurationService, this._telemetryService, this._logService);
+			const factory = new NotebookFileWorkingCopyModelFactory(notebookType, this._notebookService, this._configurationService, this._telemetryService, this._notebookLoggingService);
 			workingCopyManager = <IFileWorkingCopyManager<NotebookFileWorkingCopyModel, NotebookFileWorkingCopyModel>><any>this._instantiationService.createInstance(
 				FileWorkingCopyManager,
 				workingCopyTypeId,
@@ -79,8 +79,9 @@ class NotebookModelReferenceCollection extends ReferenceCollection<Promise<IReso
 			);
 			this._workingCopyManagers.set(workingCopyTypeId, workingCopyManager);
 		}
-		const scratchPad = viewType === 'interactive' && this._configurationService.getValue<boolean>(NotebookSetting.InteractiveWindowPromptToSave) !== true;
-		const model = this._instantiationService.createInstance(SimpleNotebookEditorModel, uri, hasAssociatedFilePath, viewType, workingCopyManager, scratchPad);
+
+		const isScratchpadView = isScratchpad || (notebookType === 'interactive' && this._configurationService.getValue<boolean>(NotebookSetting.InteractiveWindowPromptToSave) !== true);
+		const model = this._instantiationService.createInstance(SimpleNotebookEditorModel, uri, hasAssociatedFilePath, notebookType, workingCopyManager, isScratchpadView);
 		const result = await model.load({ limits });
 
 
@@ -98,7 +99,7 @@ class NotebookModelReferenceCollection extends ReferenceCollection<Promise<IReso
 				// isDirty -> add reference
 				// !isDirty -> free reference
 				if (isDirty && !onDirtyAutoReference) {
-					onDirtyAutoReference = this.acquire(key, viewType);
+					onDirtyAutoReference = this.acquire(key, notebookType);
 				} else if (onDirtyAutoReference) {
 					onDirtyAutoReference.dispose();
 					onDirtyAutoReference = undefined;
@@ -137,7 +138,7 @@ class NotebookModelReferenceCollection extends ReferenceCollection<Promise<IReso
 				this._modelListener.delete(model);
 				model.dispose();
 			} catch (err) {
-				this._logService.error('FAILED to destory notebook', err);
+				this._notebookLoggingService.error('NotebookModelCollection', 'FAILED to destory notebook - ' + err);
 			} finally {
 				this.modelsToDispose.delete(key); // Untrack as being disposed
 			}
@@ -176,51 +177,42 @@ export class NotebookModelResolverServiceImpl implements INotebookEditorModelRes
 		return this._data.isDirty(resource);
 	}
 
-	async resolve(resource: URI, viewType?: string, limits?: IFileReadLimits): Promise<IReference<IResolvedNotebookEditorModel>>;
-	async resolve(resource: IUntitledNotebookResource, viewType: string, limits?: IFileReadLimits): Promise<IReference<IResolvedNotebookEditorModel>>;
-	async resolve(arg0: URI | IUntitledNotebookResource, viewType?: string, limits?: IFileReadLimits): Promise<IReference<IResolvedNotebookEditorModel>> {
-		let resource: URI;
-		let hasAssociatedFilePath = false;
-		if (URI.isUri(arg0)) {
-			resource = arg0;
-		} else {
-			if (!arg0.untitledResource) {
-				const info = this._notebookService.getContributedNotebookType(assertIsDefined(viewType));
-				if (!info) {
-					throw new Error('UNKNOWN view type: ' + viewType);
-				}
+	private createUntitledUri(notebookType: string) {
+		const info = this._notebookService.getContributedNotebookType(assertIsDefined(notebookType));
+		if (!info) {
+			throw new Error('UNKNOWN notebook type: ' + notebookType);
+		}
 
-				const suffix = NotebookProviderInfo.possibleFileEnding(info.selectors) ?? '';
-				for (let counter = 1; ; counter++) {
-					const candidate = URI.from({ scheme: Schemas.untitled, path: `Untitled-${counter}${suffix}`, query: viewType });
-					if (!this._notebookService.getNotebookTextModel(candidate)) {
-						resource = candidate;
-						break;
-					}
-				}
-			} else if (arg0.untitledResource.scheme === Schemas.untitled) {
-				resource = arg0.untitledResource;
-			} else {
-				resource = arg0.untitledResource.with({ scheme: Schemas.untitled });
-				hasAssociatedFilePath = true;
+		const suffix = NotebookProviderInfo.possibleFileEnding(info.selectors) ?? '';
+		for (let counter = 1; ; counter++) {
+			const candidate = URI.from({ scheme: Schemas.untitled, path: `Untitled-${counter}${suffix}`, query: notebookType });
+			if (!this._notebookService.getNotebookTextModel(candidate)) {
+				return candidate;
 			}
 		}
+	}
 
-		if (resource.scheme === CellUri.scheme) {
-			throw new Error(`CANNOT open a cell-uri as notebook. Tried with ${resource.toString()}`);
+	private async validateResourceViewType(uri: URI | undefined, viewType: string | undefined) {
+		if (!uri && !viewType) {
+			throw new Error('Must provide at least one of resource or viewType');
 		}
 
-		resource = this._uriIdentService.asCanonicalUri(resource);
+		if (uri?.scheme === CellUri.scheme) {
+			throw new Error(`CANNOT open a cell-uri as notebook. Tried with ${uri.toString()}`);
+		}
 
-		const existingViewType = this._notebookService.getNotebookTextModel(resource)?.viewType;
+		const resource = this._uriIdentService.asCanonicalUri(uri ?? this.createUntitledUri(viewType!));
+
+		const existingNotebook = this._notebookService.getNotebookTextModel(resource);
 		if (!viewType) {
-			if (existingViewType) {
-				viewType = existingViewType;
+			if (existingNotebook) {
+				viewType = existingNotebook.viewType;
 			} else {
 				await this._extensionService.whenInstalledExtensionsRegistered();
 				const providers = this._notebookService.getContributedNotebookTypes(resource);
-				const exclusiveProvider = providers.find(provider => provider.exclusive);
-				viewType = exclusiveProvider?.id || providers[0]?.id;
+				viewType = providers.find(provider => provider.priority === 'exclusive')?.id ??
+					providers.find(provider => provider.priority === 'default')?.id ??
+					providers[0]?.id;
 			}
 		}
 
@@ -228,9 +220,9 @@ export class NotebookModelResolverServiceImpl implements INotebookEditorModelRes
 			throw new Error(`Missing viewType for '${resource}'`);
 		}
 
-		if (existingViewType && existingViewType !== viewType) {
+		if (existingNotebook && existingNotebook.viewType !== viewType) {
 
-			await this._onWillFailWithConflict.fireAsync({ resource, viewType }, CancellationToken.None);
+			await this._onWillFailWithConflict.fireAsync({ resource: resource, viewType }, CancellationToken.None);
 
 			// check again, listener should have done cleanup
 			const existingViewType2 = this._notebookService.getNotebookTextModel(resource)?.viewType;
@@ -238,8 +230,34 @@ export class NotebookModelResolverServiceImpl implements INotebookEditorModelRes
 				throw new Error(`A notebook with view type '${existingViewType2}' already exists for '${resource}', CANNOT create another notebook with view type ${viewType}`);
 			}
 		}
+		return { resource, viewType };
+	}
 
-		const reference = this._data.acquire(resource.toString(), viewType, hasAssociatedFilePath, limits);
+	public async createUntitledNotebookTextModel(viewType: string) {
+		const resource = this._uriIdentService.asCanonicalUri(this.createUntitledUri(viewType));
+
+		return (await this._notebookService.createNotebookTextModel(viewType, resource));
+	}
+
+	async resolve(resource: URI, viewType?: string, options?: NotebookEditorModelCreationOptions): Promise<IReference<IResolvedNotebookEditorModel>>;
+	async resolve(resource: IUntitledNotebookResource, viewType: string, options: NotebookEditorModelCreationOptions): Promise<IReference<IResolvedNotebookEditorModel>>;
+	async resolve(arg0: URI | IUntitledNotebookResource, viewType?: string, options?: NotebookEditorModelCreationOptions): Promise<IReference<IResolvedNotebookEditorModel>> {
+		let resource: URI | undefined;
+		let hasAssociatedFilePath;
+		if (URI.isUri(arg0)) {
+			resource = arg0;
+		} else if (arg0.untitledResource) {
+			if (arg0.untitledResource.scheme === Schemas.untitled) {
+				resource = arg0.untitledResource;
+			} else {
+				resource = arg0.untitledResource.with({ scheme: Schemas.untitled });
+				hasAssociatedFilePath = true;
+			}
+		}
+
+		const validated = await this.validateResourceViewType(resource, viewType);
+
+		const reference = this._data.acquire(validated.resource.toString(), validated.viewType, hasAssociatedFilePath, options?.limits, options?.scratchpad, options?.viewType);
 		try {
 			const model = await reference.object;
 			return {
diff --git a/src/vs/workbench/contrib/notebook/common/notebookExecutionService.ts b/src/vs/workbench/contrib/notebook/common/notebookExecutionService.ts
index 9d00a5d2894..68e3f98f6c8 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookExecutionService.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookExecutionService.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
-import { INotebookTextModel, IOutputDto, IOutputItemDto } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotebookCellExecution } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { NotebookCellTextModel } from './model/notebookCellTextModel.js';
+import { INotebookTextModel, IOutputDto, IOutputItemDto } from './notebookCommon.js';
+import { INotebookCellExecution } from './notebookExecutionStateService.js';
 
 export enum CellExecutionUpdateType {
 	Output = 1,
diff --git a/src/vs/workbench/contrib/notebook/common/notebookExecutionStateService.ts b/src/vs/workbench/contrib/notebook/common/notebookExecutionStateService.ts
index 5b98e7ca262..b51293c2add 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookExecutionStateService.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookExecutionStateService.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { IRange } from 'vs/editor/common/core/range';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { NotebookCellExecutionState, NotebookExecutionState } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { CellExecutionUpdateType, ICellExecuteOutputEdit, ICellExecuteOutputItemEdit } from 'vs/workbench/contrib/notebook/common/notebookExecutionService';
+import { Event } from '../../../../base/common/event.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
+import { IRange } from '../../../../editor/common/core/range.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { NotebookCellExecutionState, NotebookExecutionState } from './notebookCommon.js';
+import { CellExecutionUpdateType, ICellExecuteOutputEdit, ICellExecuteOutputItemEdit } from './notebookExecutionService.js';
 
 export type ICellExecuteUpdate = ICellExecuteOutputEdit | ICellExecuteOutputItemEdit | ICellExecutionStateUpdate;
 
diff --git a/src/vs/workbench/contrib/notebook/common/notebookKernelService.ts b/src/vs/workbench/contrib/notebook/common/notebookKernelService.ts
index be999203d75..1f246ef44e7 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookKernelService.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookKernelService.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IAction } from 'vs/base/common/actions';
-import { AsyncIterableObject } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Event } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { INotebookKernelSourceAction } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { IAction } from '../../../../base/common/actions.js';
+import { AsyncIterableObject } from '../../../../base/common/async.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Event } from '../../../../base/common/event.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { INotebookKernelSourceAction } from './notebookCommon.js';
 
 export interface ISelectedNotebooksChangeEvent {
 	notebook: URI;
@@ -106,7 +106,7 @@ export interface IKernelSourceActionProvider {
 	provideKernelSourceActions(): Promise<INotebookKernelSourceAction[]>;
 }
 
-export interface INotebookTextModelLike { uri: URI; viewType: string }
+export interface INotebookTextModelLike { uri: URI; notebookType: string }
 
 export const INotebookKernelService = createDecorator<INotebookKernelService>('INotebookKernelService');
 
diff --git a/src/vs/workbench/contrib/notebook/common/notebookKeymapService.ts b/src/vs/workbench/contrib/notebook/common/notebookKeymapService.ts
index a06f4e0e495..68697989a84 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookKeymapService.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookKeymapService.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 
 export const INotebookKeymapService = createDecorator<INotebookKeymapService>('notebookKeymapService');
 
diff --git a/src/vs/workbench/contrib/notebook/common/notebookLoggingService.ts b/src/vs/workbench/contrib/notebook/common/notebookLoggingService.ts
index 95d716f71b3..148f31569ec 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookLoggingService.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookLoggingService.ts
@@ -3,12 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 
 export const INotebookLoggingService = createDecorator<INotebookLoggingService>('INotebookLoggingService');
 
 export interface INotebookLoggingService {
 	readonly _serviceBrand: undefined;
 	info(category: string, output: string): void;
+	warn(category: string, output: string): void;
+	error(category: string, output: string): void;
 	debug(category: string, output: string): void;
 }
diff --git a/src/vs/workbench/contrib/notebook/common/notebookOutputRenderer.ts b/src/vs/workbench/contrib/notebook/common/notebookOutputRenderer.ts
index 404e84c910d..dc984e4e14d 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookOutputRenderer.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookOutputRenderer.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as glob from 'vs/base/common/glob';
-import { Iterable } from 'vs/base/common/iterator';
-import { joinPath } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { INotebookRendererInfo, ContributedNotebookRendererEntrypoint, NotebookRendererMatch, RendererMessagingSpec, NotebookRendererEntrypoint, INotebookStaticPreloadInfo as INotebookStaticPreloadInfo } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import * as glob from '../../../../base/common/glob.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { joinPath } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ExtensionIdentifier, IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
+import { INotebookRendererInfo, ContributedNotebookRendererEntrypoint, NotebookRendererMatch, RendererMessagingSpec, NotebookRendererEntrypoint, INotebookStaticPreloadInfo as INotebookStaticPreloadInfo } from './notebookCommon.js';
 
 class DependencyList {
 	private readonly value: ReadonlySet<string>;
diff --git a/src/vs/workbench/contrib/notebook/common/notebookProvider.ts b/src/vs/workbench/contrib/notebook/common/notebookProvider.ts
index 16a9ee3a57b..58264be9626 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookProvider.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookProvider.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as glob from 'vs/base/common/glob';
-import { URI } from 'vs/base/common/uri';
-import { basename } from 'vs/base/common/path';
-import { INotebookExclusiveDocumentFilter, isDocumentExcludePattern, TransientOptions } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { RegisteredEditorPriority } from 'vs/workbench/services/editor/common/editorResolverService';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
+import * as glob from '../../../../base/common/glob.js';
+import { URI } from '../../../../base/common/uri.js';
+import { basename } from '../../../../base/common/path.js';
+import { INotebookExclusiveDocumentFilter, isDocumentExcludePattern, TransientOptions } from './notebookCommon.js';
+import { RegisteredEditorPriority } from '../../../services/editor/common/editorResolverService.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
 
 type NotebookSelector = string | glob.IRelativePattern | INotebookExclusiveDocumentFilter;
 
@@ -19,7 +19,6 @@ export interface NotebookEditorDescriptor {
 	readonly selectors: readonly { filenamePattern?: string; excludeFileNamePattern?: string }[];
 	readonly priority: RegisteredEditorPriority;
 	readonly providerDisplayName: string;
-	readonly exclusive: boolean;
 }
 
 export class NotebookProviderInfo {
@@ -29,7 +28,6 @@ export class NotebookProviderInfo {
 	readonly displayName: string;
 	readonly priority: RegisteredEditorPriority;
 	readonly providerDisplayName: string;
-	readonly exclusive: boolean;
 
 	private _selectors: NotebookSelector[];
 	get selectors() {
@@ -50,7 +48,6 @@ export class NotebookProviderInfo {
 		})) || [];
 		this.priority = descriptor.priority;
 		this.providerDisplayName = descriptor.providerDisplayName;
-		this.exclusive = descriptor.exclusive;
 		this._options = {
 			transientCellMetadata: {},
 			transientDocumentMetadata: {},
diff --git a/src/vs/workbench/contrib/notebook/common/notebookRendererMessagingService.ts b/src/vs/workbench/contrib/notebook/common/notebookRendererMessagingService.ts
index 4d5f5dc04f7..d7e62a46889 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookRendererMessagingService.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookRendererMessagingService.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { Event } from '../../../../base/common/event.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 
 export const INotebookRendererMessagingService = createDecorator<INotebookRendererMessagingService>('INotebookRendererMessagingService');
 
diff --git a/src/vs/workbench/contrib/notebook/common/notebookService.ts b/src/vs/workbench/contrib/notebook/common/notebookService.ts
index 50e49939035..aa4af44726e 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookService.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookService.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { URI } from 'vs/base/common/uri';
-import { NotebookProviderInfo } from 'vs/workbench/contrib/notebook/common/notebookProvider';
-import { Event } from 'vs/base/common/event';
-import { INotebookRendererInfo, NotebookData, TransientOptions, IOrderedMimeType, IOutputDto, INotebookContributionData, NotebookExtensionDescription, INotebookStaticPreloadInfo } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
-import { IFileStatWithMetadata, IWriteFileOptions } from 'vs/platform/files/common/files';
-import { ITextQuery } from 'vs/workbench/services/search/common/search';
-import { NotebookPriorityInfo } from 'vs/workbench/contrib/search/common/search';
-import { INotebookFileMatchNoModel } from 'vs/workbench/contrib/search/common/searchNotebookHelpers';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { URI } from '../../../../base/common/uri.js';
+import { NotebookProviderInfo } from './notebookProvider.js';
+import { Event } from '../../../../base/common/event.js';
+import { INotebookRendererInfo, NotebookData, TransientOptions, IOrderedMimeType, IOutputDto, INotebookContributionData, NotebookExtensionDescription, INotebookStaticPreloadInfo } from './notebookCommon.js';
+import { NotebookTextModel } from './model/notebookTextModel.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { NotebookCellTextModel } from './model/notebookCellTextModel.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { VSBuffer, VSBufferReadableStream } from '../../../../base/common/buffer.js';
+import { ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
+import { IFileStatWithMetadata, IWriteFileOptions } from '../../../../platform/files/common/files.js';
+import { ITextQuery } from '../../../services/search/common/search.js';
+import { NotebookPriorityInfo } from '../../search/common/search.js';
+import { INotebookFileMatchNoModel } from '../../search/common/searchNotebookHelpers.js';
 
 
 export const INotebookService = createDecorator<INotebookService>('notebookService');
@@ -79,7 +79,7 @@ export interface INotebookService {
 	updateMimePreferredRenderer(viewType: string, mimeType: string, rendererId: string, otherMimetypes: readonly string[]): void;
 	saveMimeDisplayOrder(target: ConfigurationTarget): void;
 
-	createNotebookTextModel(viewType: string, uri: URI, data: NotebookData, transientOptions: TransientOptions): NotebookTextModel;
+	createNotebookTextModel(viewType: string, uri: URI, stream?: VSBufferReadableStream): Promise<NotebookTextModel>;
 	getNotebookTextModel(uri: URI): NotebookTextModel | undefined;
 	getNotebookTextModels(): Iterable<NotebookTextModel>;
 	listNotebookDocuments(): readonly NotebookTextModel[];
diff --git a/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.ts b/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.ts
index b0b8c5153ab..6db964ea574 100644
--- a/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.ts
+++ b/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.ts
@@ -2,98 +2,77 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { ISequence, LcsDiff } from 'vs/base/common/diff/diff';
-import { doHash, hash, numberHash } from 'vs/base/common/hash';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { IRequestHandler } from 'vs/base/common/worker/simpleWorker';
-import * as model from 'vs/editor/common/model';
-import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder';
-import { CellKind, ICellDto2, IMainCellDto, INotebookDiffResult, IOutputDto, NotebookCellInternalMetadata, NotebookCellMetadata, NotebookCellsChangedEventDto, NotebookCellsChangeType, NotebookCellTextModelSplice, NotebookData, NotebookDocumentMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { Range } from 'vs/editor/common/core/range';
-import { INotebookWorkerHost } from 'vs/workbench/contrib/notebook/common/services/notebookWorkerHost';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { SearchParams } from 'vs/editor/common/model/textModelSearch';
-
-function bufferHash(buffer: VSBuffer): number {
-	let initialHashVal = numberHash(104579, 0);
-	for (let k = 0; k < buffer.buffer.length; k++) {
-		initialHashVal = doHash(buffer.buffer[k], initialHashVal);
-	}
-
-	return initialHashVal;
-}
+import { ISequence, LcsDiff } from '../../../../../base/common/diff/diff.js';
+import { doHash, numberHash } from '../../../../../base/common/hash.js';
+import { IDisposable } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { IRequestHandler, IWorkerServer } from '../../../../../base/common/worker/simpleWorker.js';
+import { PieceTreeTextBufferBuilder } from '../../../../../editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder.js';
+import { CellKind, IMainCellDto, INotebookDiffResult, IOutputDto, NotebookCellInternalMetadata, NotebookCellMetadata, NotebookCellsChangedEventDto, NotebookCellsChangeType, NotebookCellTextModelSplice, NotebookDocumentMetadata } from '../notebookCommon.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { SearchParams } from '../../../../../editor/common/model/textModelSearch.js';
+import { MirrorModel } from '../../../../../editor/common/services/textModelSync/textModelSync.impl.js';
+import { DefaultEndOfLine } from '../../../../../editor/common/model.js';
+import { IModelChangedEvent } from '../../../../../editor/common/model/mirrorTextModel.js';
 
 class MirrorCell {
-	private _textBuffer!: model.IReadonlyTextBuffer;
-
-	get textBuffer() {
-		if (this._textBuffer) {
-			return this._textBuffer;
-		}
-
-		const builder = new PieceTreeTextBufferBuilder();
-		builder.acceptChunk(Array.isArray(this._source) ? this._source.join('\n') : this._source);
-		const bufferFactory = builder.finish(true);
-		this._textBuffer = bufferFactory.create(model.DefaultEndOfLine.LF).textBuffer;
-
-		return this._textBuffer;
+	private readonly textModel: MirrorModel;
+	private _hash?: Promise<number>;
+	public get eol() {
+		return this._eol === '\r\n' ? DefaultEndOfLine.CRLF : DefaultEndOfLine.LF;
 	}
-
-	private _primaryKey?: number | null = null;
-	primaryKey(): number | null {
-		if (this._primaryKey === undefined) {
-			this._primaryKey = hash(this.getValue());
-		}
-
-		return this._primaryKey;
-	}
-
-	private _hash: number | null = null;
-
 	constructor(
-		readonly handle: number,
-		private _source: string | string[],
+		public readonly handle: number,
+		uri: URI,
+		source: string[],
+		private readonly _eol: string,
+		versionId: number,
 		public language: string,
 		public cellKind: CellKind,
 		public outputs: IOutputDto[],
 		public metadata?: NotebookCellMetadata,
 		public internalMetadata?: NotebookCellInternalMetadata,
 
-	) { }
-
-	getFullModelRange() {
-		const lineCount = this.textBuffer.getLineCount();
-		return new Range(1, 1, lineCount, this.textBuffer.getLineLength(lineCount) + 1);
+	) {
+		this.textModel = new MirrorModel(uri, source, _eol, versionId);
 	}
 
+	onEvents(e: IModelChangedEvent) {
+		this.textModel.onEvents(e);
+		this._hash = undefined;
+	}
 	getValue(): string {
-		const fullRange = this.getFullModelRange();
-		return this.textBuffer.getValueInRange(fullRange, model.EndOfLinePreference.LF);
+		return this.textModel.getValue();
 	}
 
-	getComparisonValue(): number {
-		if (this._primaryKey !== null) {
-			return this._primaryKey!;
-		}
-
-		this._hash = hash([hash(this.language), hash(this.getValue()), this.metadata, this.internalMetadata, this.outputs.map(op => ({
-			outputs: op.outputs.map(output => ({
-				mime: output.mime,
-				data: bufferHash(output.data)
-			})),
-			metadata: op.metadata
-		}))]);
-		return this._hash;
+	async getComparisonValue(): Promise<number> {
+		return this._hash ??= this._getHash();
 	}
 
-	getHashValue() {
-		if (this._hash !== null) {
-			return this._hash;
+	private async _getHash() {
+		let hashValue = numberHash(104579, 0);
+
+		hashValue = doHash(this.language, hashValue);
+		hashValue = doHash(this.getValue(), hashValue);
+		hashValue = doHash(this.metadata, hashValue);
+		hashValue = doHash(this.internalMetadata, hashValue);
+		for (const op of this.outputs) {
+			hashValue = doHash(op.metadata, hashValue);
+			for (const output of op.outputs) {
+				hashValue = doHash(output.mime, hashValue);
+			}
 		}
 
-		this._hash = hash([hash(this.getValue()), this.language, this.metadata, this.internalMetadata]);
-		return this._hash;
+		// note: hash has not updated within the Promise.all since we must retain order
+		const digests = await Promise.all(this.outputs.flatMap(op =>
+			op.outputs.map(o => crypto.subtle.digest('sha-1', o.data.buffer))
+		));
+		for (const digest of digests) {
+			hashValue = numberHash(new Int32Array(digest)[0], hashValue);
+		}
+
+
+		return hashValue;
 	}
 }
 
@@ -130,6 +109,8 @@ class MirrorNotebookDocument {
 				this._assertIndex(e.index);
 				const cell = this.cells[e.index];
 				cell.internalMetadata = e.internalMetadata;
+			} else if (e.kind === NotebookCellsChangeType.ChangeDocumentMetadata) {
+				this.metadata = e.metadata;
 			}
 		});
 	}
@@ -145,12 +126,15 @@ class MirrorNotebookDocument {
 			const cellDtos = splice[2];
 			const newCells = cellDtos.map(cell => {
 				return new MirrorCell(
-					(cell as unknown as IMainCellDto).handle,
+					cell.handle,
+					URI.parse(cell.url),
 					cell.source,
+					cell.eol,
+					cell.versionId,
 					cell.language,
 					cell.cellKind,
 					cell.outputs,
-					cell.metadata
+					cell.metadata,
 				);
 			});
 
@@ -161,22 +145,18 @@ class MirrorNotebookDocument {
 
 class CellSequence implements ISequence {
 
-	constructor(readonly textModel: MirrorNotebookDocument) {
+	static async create(textModel: MirrorNotebookDocument) {
+		const hashValue = new Int32Array(textModel.cells.length);
+		await Promise.all(textModel.cells.map(async (c, i) => {
+			hashValue[i] = await c.getComparisonValue();
+		}));
+		return new CellSequence(hashValue);
 	}
 
+	constructor(readonly hashValue: Int32Array) { }
+
 	getElements(): string[] | number[] | Int32Array {
-		const hashValue = new Int32Array(this.textModel.cells.length);
-		for (let i = 0; i < this.textModel.cells.length; i++) {
-			hashValue[i] = this.textModel.cells[i].getComparisonValue();
-		}
-
-		return hashValue;
-	}
-
-	getCellHash(cell: ICellDto2) {
-		const source = Array.isArray(cell.source) ? cell.source.join('\n') : cell.source;
-		const hashVal = hash([hash(source), cell.metadata]);
-		return hashVal;
+		return this.hashValue;
 	}
 }
 
@@ -191,34 +171,47 @@ export class NotebookEditorSimpleWorker implements IRequestHandler, IDisposable
 	dispose(): void {
 	}
 
-	public acceptNewModel(uri: string, data: NotebookData): void {
-		this._models[uri] = new MirrorNotebookDocument(URI.parse(uri), data.cells.map(dto => new MirrorCell(
-			(dto as unknown as IMainCellDto).handle,
+	public $acceptNewModel(uri: string, metadata: NotebookDocumentMetadata, cells: IMainCellDto[]): void {
+		this._models[uri] = new MirrorNotebookDocument(URI.parse(uri), cells.map(dto => new MirrorCell(
+			dto.handle,
+			URI.parse(dto.url),
 			dto.source,
+			dto.eol,
+			dto.versionId,
 			dto.language,
 			dto.cellKind,
 			dto.outputs,
 			dto.metadata
-		)), data.metadata);
+		)), metadata);
 	}
 
-	public acceptModelChanged(strURL: string, event: NotebookCellsChangedEventDto) {
+	public $acceptModelChanged(strURL: string, event: NotebookCellsChangedEventDto) {
 		const model = this._models[strURL];
 		model?.acceptModelChanged(event);
 	}
 
-	public acceptRemovedModel(strURL: string): void {
+	public $acceptCellModelChanged(strURL: string, handle: number, event: IModelChangedEvent) {
+		const model = this._models[strURL];
+		model.cells.find(cell => cell.handle === handle)?.onEvents(event);
+	}
+
+	public $acceptRemovedModel(strURL: string): void {
 		if (!this._models[strURL]) {
 			return;
 		}
 		delete this._models[strURL];
 	}
 
-	computeDiff(originalUrl: string, modifiedUrl: string): INotebookDiffResult {
+	async $computeDiff(originalUrl: string, modifiedUrl: string): Promise<INotebookDiffResult> {
 		const original = this._getModel(originalUrl);
 		const modified = this._getModel(modifiedUrl);
 
-		const diff = new LcsDiff(new CellSequence(original), new CellSequence(modified));
+		const [originalSeq, modifiedSeq] = await Promise.all([
+			CellSequence.create(original),
+			CellSequence.create(modified),
+		]);
+
+		const diff = new LcsDiff(originalSeq, modifiedSeq);
 		const diffResult = diff.ComputeDiff(false);
 
 		/* let cellLineChanges: { originalCellhandle: number, modifiedCellhandle: number, lineChanges: ILineChange[] }[] = [];
@@ -271,12 +264,13 @@ export class NotebookEditorSimpleWorker implements IRequestHandler, IDisposable
 		});
  */
 		return {
+			metadataChanged: JSON.stringify(original.metadata) !== JSON.stringify(modified.metadata),
 			cellsDiff: diffResult,
 			// linesDiff: cellLineChanges
 		};
 	}
 
-	canPromptRecommendation(modelUrl: string): boolean {
+	$canPromptRecommendation(modelUrl: string): boolean {
 		const model = this._getModel(modelUrl);
 		const cells = model.cells;
 
@@ -290,9 +284,6 @@ export class NotebookEditorSimpleWorker implements IRequestHandler, IDisposable
 				continue;
 			}
 
-			const lineCount = cell.textBuffer.getLineCount();
-			const maxLineCount = Math.min(lineCount, 20);
-			const range = new Range(1, 1, maxLineCount, cell.textBuffer.getLineLength(maxLineCount) + 1);
 			const searchParams = new SearchParams('import\\s*pandas|from\\s*pandas', true, false, null);
 			const searchData = searchParams.parseSearchRequest();
 
@@ -300,7 +291,15 @@ export class NotebookEditorSimpleWorker implements IRequestHandler, IDisposable
 				continue;
 			}
 
-			const cellMatches = cell.textBuffer.findMatchesLineByLine(range, searchData, true, 1);
+			const builder = new PieceTreeTextBufferBuilder();
+			builder.acceptChunk(cell.getValue());
+			const bufferFactory = builder.finish(true);
+			const textBuffer = bufferFactory.create(cell.eol).textBuffer;
+
+			const lineCount = textBuffer.getLineCount();
+			const maxLineCount = Math.min(lineCount, 20);
+			const range = new Range(1, 1, maxLineCount, textBuffer.getLineLength(maxLineCount) + 1);
+			const cellMatches = textBuffer.findMatchesLineByLine(range, searchData, true, 1);
 			if (cellMatches.length > 0) {
 				return true;
 			}
@@ -315,9 +314,9 @@ export class NotebookEditorSimpleWorker implements IRequestHandler, IDisposable
 }
 
 /**
- * Called on the worker side
- * @internal
+ * Defines the worker entry point. Must be exported and named `create`.
+ * @skipMangle
  */
-export function create(host: INotebookWorkerHost): IRequestHandler {
+export function create(workerServer: IWorkerServer): IRequestHandler {
 	return new NotebookEditorSimpleWorker();
 }
diff --git a/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorkerMain.ts b/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorkerMain.ts
new file mode 100644
index 00000000000..edebb727d13
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorkerMain.ts
@@ -0,0 +1,9 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { bootstrapSimpleWorker } from '../../../../../base/common/worker/simpleWorkerBootstrap.js';
+import { create } from './notebookSimpleWorker.js';
+
+bootstrapSimpleWorker(create);
diff --git a/src/vs/workbench/contrib/notebook/common/services/notebookWorkerService.ts b/src/vs/workbench/contrib/notebook/common/services/notebookWorkerService.ts
index 8155c9d58db..f6928fb75ec 100644
--- a/src/vs/workbench/contrib/notebook/common/services/notebookWorkerService.ts
+++ b/src/vs/workbench/contrib/notebook/common/services/notebookWorkerService.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { INotebookDiffResult } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { URI } from '../../../../../base/common/uri.js';
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
+import { INotebookDiffResult } from '../notebookCommon.js';
 
 export const ID_NOTEBOOK_EDITOR_WORKER_SERVICE = 'notebookEditorWorkerService';
 export const INotebookEditorWorkerService = createDecorator<INotebookEditorWorkerService>(ID_NOTEBOOK_EDITOR_WORKER_SERVICE);
diff --git a/src/vs/workbench/contrib/notebook/test/browser/NotebookEditorWidgetService.test.ts b/src/vs/workbench/contrib/notebook/test/browser/NotebookEditorWidgetService.test.ts
new file mode 100644
index 00000000000..4740b7d3651
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/test/browser/NotebookEditorWidgetService.test.ts
@@ -0,0 +1,161 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+
+import assert from 'assert';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { mock } from '../../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { GroupIdentifier, IEditorCloseEvent, IEditorWillMoveEvent } from '../../../../common/editor.js';
+import { NotebookEditorWidget } from '../../browser/notebookEditorWidget.js';
+import { NotebookEditorWidgetService } from '../../browser/services/notebookEditorServiceImpl.js';
+import { NotebookEditorInput } from '../../common/notebookEditorInput.js';
+import { setupInstantiationService } from './testNotebookEditor.js';
+import { IEditorGroup, IEditorGroupsService, IEditorPart } from '../../../../services/editor/common/editorGroupsService.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+
+class TestNotebookEditorWidgetService extends NotebookEditorWidgetService {
+	constructor(
+		@IEditorGroupsService editorGroupService: IEditorGroupsService,
+		@IEditorService editorService: IEditorService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IInstantiationService instantiationService: IInstantiationService
+	) {
+		super(editorGroupService, editorService, contextKeyService, instantiationService);
+	}
+
+	protected override createWidget(): NotebookEditorWidget {
+		return new class extends mock<NotebookEditorWidget>() {
+			override onWillHide = () => { };
+			override getDomNode = () => { return { remove: () => { } } as any; };
+			override dispose = () => { };
+		};
+	}
+}
+
+function createNotebookInput(path: string, editorType: string) {
+	return new class extends mock<NotebookEditorInput>() {
+		override resource = URI.parse(path);
+		override get typeId() { return editorType; }
+	};
+}
+
+suite('NotebookEditorWidgetService', () => {
+	let disposables: DisposableStore;
+	let instantiationService: TestInstantiationService;
+	let editorGroup1: IEditorGroup;
+	let editorGroup2: IEditorGroup;
+
+	let ondidRemoveGroup: Emitter<IEditorGroup>;
+	let onDidCloseEditor: Emitter<IEditorCloseEvent>;
+	let onWillMoveEditor: Emitter<IEditorWillMoveEvent>;
+	teardown(() => disposables.dispose());
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	setup(() => {
+		disposables = new DisposableStore();
+
+		ondidRemoveGroup = new Emitter<IEditorGroup>();
+		onDidCloseEditor = new Emitter<IEditorCloseEvent>();
+		onWillMoveEditor = new Emitter<IEditorWillMoveEvent>();
+
+		editorGroup1 = new class extends mock<IEditorGroup>() {
+			override id = 1;
+			override onDidCloseEditor = onDidCloseEditor.event;
+			override onWillMoveEditor = onWillMoveEditor.event;
+		};
+		editorGroup2 = new class extends mock<IEditorGroup>() {
+			override id = 2;
+			override onDidCloseEditor = Event.None;
+			override onWillMoveEditor = Event.None;
+		};
+
+		instantiationService = setupInstantiationService(disposables);
+		instantiationService.stub(IEditorGroupsService, new class extends mock<IEditorGroupsService>() {
+			override onDidRemoveGroup = ondidRemoveGroup.event;
+			override onDidAddGroup = Event.None;
+			override whenReady = Promise.resolve();
+			override groups = [editorGroup1, editorGroup2];
+			override getPart(group: IEditorGroup | GroupIdentifier): IEditorPart;
+			override getPart(container: unknown): IEditorPart;
+			override getPart(container: unknown): import("../../../../services/editor/common/editorGroupsService.js").IEditorPart {
+				return { windowId: 0 } as any;
+			}
+		});
+		instantiationService.stub(IEditorService, new class extends mock<IEditorService>() {
+			override onDidEditorsChange = Event.None;
+		});
+	});
+
+	test('Retrieve widget within group', async function () {
+		const notebookEditorInput = createNotebookInput('/test.np', 'type1');
+		const notebookEditorService = disposables.add(instantiationService.createInstance(TestNotebookEditorWidgetService));
+		const widget = notebookEditorService.retrieveWidget(instantiationService, 1, notebookEditorInput);
+		const value = widget.value;
+		const widget2 = notebookEditorService.retrieveWidget(instantiationService, 1, notebookEditorInput);
+
+		assert.notStrictEqual(widget2.value, undefined, 'should create a widget');
+		assert.strictEqual(value, widget2.value, 'should return the same widget');
+		assert.strictEqual(widget.value, undefined, 'initial borrow should no longer have widget');
+	});
+
+	test('Retrieve independent widgets', async function () {
+		const inputType1 = createNotebookInput('/test.np', 'type1');
+		const inputType2 = createNotebookInput('/test.np', 'type2');
+		const notebookEditorService = disposables.add(instantiationService.createInstance(TestNotebookEditorWidgetService));
+		const widget = notebookEditorService.retrieveWidget(instantiationService, 1, inputType1);
+		const widgetDiffGroup = notebookEditorService.retrieveWidget(instantiationService, 2, inputType1);
+		const widgetDiffType = notebookEditorService.retrieveWidget(instantiationService, 1, inputType2);
+
+		assert.notStrictEqual(widget.value, undefined, 'should create a widget');
+		assert.notStrictEqual(widgetDiffGroup.value, undefined, 'should create a widget');
+		assert.notStrictEqual(widgetDiffType.value, undefined, 'should create a widget');
+		assert.notStrictEqual(widget.value, widgetDiffGroup.value, 'should return a different widget');
+		assert.notStrictEqual(widget.value, widgetDiffType.value, 'should return a different widget');
+	});
+
+	test('Only relevant widgets get disposed', async function () {
+		const inputType1 = createNotebookInput('/test.np', 'type1');
+		const inputType2 = createNotebookInput('/test.np', 'type2');
+		const notebookEditorService = disposables.add(instantiationService.createInstance(TestNotebookEditorWidgetService));
+		const widget = notebookEditorService.retrieveWidget(instantiationService, 1, inputType1);
+		const widgetDiffType = notebookEditorService.retrieveWidget(instantiationService, 1, inputType2);
+		const widgetDiffGroup = notebookEditorService.retrieveWidget(instantiationService, 2, inputType1);
+
+		ondidRemoveGroup.fire(editorGroup1);
+
+		assert.strictEqual(widget.value, undefined, 'widgets in group should get disposed');
+		assert.strictEqual(widgetDiffType.value, undefined, 'widgets in group should get disposed');
+		assert.notStrictEqual(widgetDiffGroup.value, undefined, 'other group should not be disposed');
+	});
+
+	test('Widget should move between groups when editor is moved', async function () {
+		const inputType1 = createNotebookInput('/test.np', NotebookEditorInput.ID);
+		const notebookEditorService = disposables.add(instantiationService.createInstance(TestNotebookEditorWidgetService));
+		const initialValue = notebookEditorService.retrieveWidget(instantiationService, 1, inputType1).value;
+
+		await new Promise(resolve => setTimeout(resolve, 0));
+
+		onWillMoveEditor.fire({
+			editor: inputType1,
+			groupId: 1,
+			target: 2,
+		});
+
+		const widgetDiffGroup = notebookEditorService.retrieveWidget(instantiationService, 2, inputType1);
+		const widgetFirstGroup = notebookEditorService.retrieveWidget(instantiationService, 1, inputType1);
+
+		assert.notStrictEqual(initialValue, undefined, 'valid widget');
+		assert.strictEqual(widgetDiffGroup.value, initialValue, 'widget should be reused in new group');
+		assert.notStrictEqual(widgetFirstGroup.value, initialValue, 'should create a new widget in the first group');
+	});
+
+});
diff --git a/src/vs/workbench/contrib/notebook/test/browser/cellDecorations.test.ts b/src/vs/workbench/contrib/notebook/test/browser/cellDecorations.test.ts
index 7063f688505..f4003f3b060 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/cellDecorations.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/cellDecorations.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { withTestNotebook } from 'vs/workbench/contrib/notebook/test/browser/testNotebookEditor';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Event } from 'vs/base/common/event';
+import { CellKind } from '../../common/notebookCommon.js';
+import { withTestNotebook } from './testNotebookEditor.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Event } from '../../../../../base/common/event.js';
 
 suite('CellDecorations', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/contrib/notebook/test/browser/cellDnd.test.ts b/src/vs/workbench/contrib/notebook/test/browser/cellDnd.test.ts
index 5867385c0aa..8f8d6cbbbce 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/cellDnd.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/cellDnd.test.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { performCellDropEdits } from 'vs/workbench/contrib/notebook/browser/view/cellParts/cellDnd';
-import { CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { withTestNotebook } from 'vs/workbench/contrib/notebook/test/browser/testNotebookEditor';
+import { performCellDropEdits } from '../../browser/view/cellParts/cellDnd.js';
+import { CellKind } from '../../common/notebookCommon.js';
+import { withTestNotebook } from './testNotebookEditor.js';
 import assert from 'assert';
-import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { ICellRange } from '../../common/notebookRange.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 interface IBeginningState {
 	startOrder: string[];
diff --git a/src/vs/workbench/contrib/notebook/test/browser/cellOperations.test.ts b/src/vs/workbench/contrib/notebook/test/browser/cellOperations.test.ts
index 65ea08b7f27..ba4a760c42f 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/cellOperations.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/cellOperations.test.ts
@@ -4,16 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { FoldingModel, updateFoldingStateAtIndex } from 'vs/workbench/contrib/notebook/browser/viewModel/foldingModel';
-import { changeCellToKind, computeCellLinesContents, copyCellRange, insertCell, joinNotebookCells, moveCellRange, runDeleteAction } from 'vs/workbench/contrib/notebook/browser/controller/cellOperations';
-import { CellEditType, CellKind, SelectionStateType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { withTestNotebook } from 'vs/workbench/contrib/notebook/test/browser/testNotebookEditor';
-import { Range } from 'vs/editor/common/core/range';
-import { ResourceTextEdit } from 'vs/editor/browser/services/bulkEditService';
-import { ResourceNotebookCellEdit } from 'vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ITextBuffer, ValidAnnotatedEditOperation } from 'vs/editor/common/model';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { FoldingModel, updateFoldingStateAtIndex } from '../../browser/viewModel/foldingModel.js';
+import { changeCellToKind, computeCellLinesContents, copyCellRange, insertCell, joinNotebookCells, moveCellRange, runDeleteAction } from '../../browser/controller/cellOperations.js';
+import { CellEditType, CellKind, SelectionStateType } from '../../common/notebookCommon.js';
+import { withTestNotebook } from './testNotebookEditor.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { ResourceTextEdit } from '../../../../../editor/browser/services/bulkEditService.js';
+import { ResourceNotebookCellEdit } from '../../../bulkEdit/browser/bulkCellEdits.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
+import { ITextBuffer, ValidAnnotatedEditOperation } from '../../../../../editor/common/model.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('CellOperations', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
@@ -48,7 +48,7 @@ suite('CellOperations', () => {
 			],
 			async (editor, viewModel) => {
 				viewModel.updateSelectionsState({ kind: SelectionStateType.Index, focus: { start: 1, end: 2 }, selections: [{ start: 0, end: 2 }] });
-				await moveCellRange({ notebookEditor: editor, cell: viewModel.cellAt(1)! }, 'down');
+				await moveCellRange({ notebookEditor: editor }, 'down');
 				assert.strictEqual(viewModel.cellAt(0)?.getText(), '# header b');
 				assert.strictEqual(viewModel.cellAt(1)?.getText(), '# header a');
 				assert.strictEqual(viewModel.cellAt(2)?.getText(), 'var b = 1;');
@@ -74,7 +74,7 @@ suite('CellOperations', () => {
 				editor.setHiddenAreas(viewModel.getHiddenRanges());
 
 				viewModel.updateSelectionsState({ kind: SelectionStateType.Index, focus: { start: 0, end: 1 }, selections: [{ start: 0, end: 1 }] });
-				await moveCellRange({ notebookEditor: editor, cell: viewModel.cellAt(1)! }, 'down');
+				await moveCellRange({ notebookEditor: editor }, 'down');
 				assert.strictEqual(viewModel.cellAt(0)?.getText(), '# header b');
 				assert.strictEqual(viewModel.cellAt(1)?.getText(), '# header a');
 				assert.strictEqual(viewModel.cellAt(2)?.getText(), 'var b = 1;');
diff --git a/src/vs/workbench/contrib/notebook/test/browser/cellOutput.test.ts b/src/vs/workbench/contrib/notebook/test/browser/cellOutput.test.ts
new file mode 100644
index 00000000000..da351613c10
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/test/browser/cellOutput.test.ts
@@ -0,0 +1,130 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { VSBuffer } from '../../../../../base/common/buffer.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { CellOutputContainer } from '../../browser/view/cellParts/cellOutput.js';
+import { CodeCellRenderTemplate } from '../../browser/view/notebookRenderingCommon.js';
+import { CodeCellViewModel } from '../../browser/viewModel/codeCellViewModel.js';
+import { CellKind, INotebookRendererInfo, IOutputDto } from '../../common/notebookCommon.js';
+import { setupInstantiationService, withTestNotebook } from './testNotebookEditor.js';
+import { FastDomNode } from '../../../../../base/browser/fastDomNode.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { INotebookService } from '../../common/notebookService.js';
+import { mock } from '../../../../../base/test/common/mock.js';
+import { IMenu, IMenuService } from '../../../../../platform/actions/common/actions.js';
+import { Event } from '../../../../../base/common/event.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+
+suite('CellOutput', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+	let instantiationService: TestInstantiationService;
+	let outputMenus: IMenu[] = [];
+
+	setup(() => {
+		outputMenus = [];
+		instantiationService = setupInstantiationService(store);
+		instantiationService.stub(INotebookService, new class extends mock<INotebookService>() {
+			override getOutputMimeTypeInfo() {
+				return [{
+					rendererId: 'plainTextRendererId',
+					mimeType: 'text/plain',
+					isTrusted: true
+				}, {
+					rendererId: 'htmlRendererId',
+					mimeType: 'text/html',
+					isTrusted: true
+				}];
+			}
+			override getRendererInfo(): INotebookRendererInfo {
+				return {
+					id: 'rendererId',
+					displayName: 'Stubbed Renderer',
+					extensionId: { _lower: 'id', value: 'id' },
+				} as INotebookRendererInfo;
+			}
+		});
+		instantiationService.stub(IMenuService, new class extends mock<IMenuService>() {
+			override createMenu() {
+				const menu = new class extends mock<IMenu>() {
+					override onDidChange = Event.None;
+					override getActions() { return []; }
+					override dispose() { outputMenus = outputMenus.filter(item => item !== menu); }
+				};
+				outputMenus.push(menu);
+				return menu;
+			}
+		});
+	});
+
+	test('Render cell output items with multiple mime types', async function () {
+		const outputItem = { data: VSBuffer.fromString('output content'), mime: 'text/plain' };
+		const htmlOutputItem = { data: VSBuffer.fromString('output content'), mime: 'text/html' };
+		const output1: IOutputDto = { outputId: 'abc', outputs: [outputItem, htmlOutputItem] };
+		const output2: IOutputDto = { outputId: 'def', outputs: [outputItem, htmlOutputItem] };
+
+		await withTestNotebook(
+			[
+				['print(output content)', 'python', CellKind.Code, [output1, output2], {}],
+			],
+			(editor, viewModel, disposables, accessor) => {
+
+				const cell = viewModel.viewCells[0] as CodeCellViewModel;
+				const cellTemplate = createCellTemplate(disposables);
+				const output = disposables.add(accessor.createInstance(CellOutputContainer, editor, cell, cellTemplate, { limit: 100 }));
+				output.render();
+				cell.outputsViewModels[0].setVisible(true);
+				assert.strictEqual(outputMenus.length, 1, 'should have 1 output menus');
+				assert(cellTemplate.outputContainer.domNode.style.display !== 'none', 'output container should be visible');
+				cell.outputsViewModels[1].setVisible(true);
+				assert.strictEqual(outputMenus.length, 2, 'should have 2 output menus');
+				cell.outputsViewModels[1].setVisible(true);
+				assert.strictEqual(outputMenus.length, 2, 'should still have 2 output menus');
+			},
+			instantiationService
+		);
+	});
+
+	test('One of many cell outputs becomes hidden', async function () {
+		const outputItem = { data: VSBuffer.fromString('output content'), mime: 'text/plain' };
+		const htmlOutputItem = { data: VSBuffer.fromString('output content'), mime: 'text/html' };
+		const output1: IOutputDto = { outputId: 'abc', outputs: [outputItem, htmlOutputItem] };
+		const output2: IOutputDto = { outputId: 'def', outputs: [outputItem, htmlOutputItem] };
+		const output3: IOutputDto = { outputId: 'ghi', outputs: [outputItem, htmlOutputItem] };
+
+		await withTestNotebook(
+			[
+				['print(output content)', 'python', CellKind.Code, [output1, output2, output3], {}],
+			],
+			(editor, viewModel, disposables, accessor) => {
+
+				const cell = viewModel.viewCells[0] as CodeCellViewModel;
+				const cellTemplate = createCellTemplate(disposables);
+				const output = disposables.add(accessor.createInstance(CellOutputContainer, editor, cell, cellTemplate, { limit: 100 }));
+				output.render();
+				cell.outputsViewModels[0].setVisible(true);
+				cell.outputsViewModels[1].setVisible(true);
+				cell.outputsViewModels[2].setVisible(true);
+				cell.outputsViewModels[1].setVisible(false);
+				assert(cellTemplate.outputContainer.domNode.style.display !== 'none', 'output container should be visible');
+				assert.strictEqual(outputMenus.length, 2, 'should have 2 output menus');
+			},
+			instantiationService
+		);
+	});
+
+
+});
+
+function createCellTemplate(disposables: DisposableStore) {
+	return {
+		outputContainer: new FastDomNode(document.createElement('div')),
+		outputShowMoreContainer: new FastDomNode(document.createElement('div')),
+		focusSinkElement: document.createElement('div'),
+		templateDisposables: disposables,
+		elementDisposables: disposables,
+	} as unknown as CodeCellRenderTemplate;
+}
diff --git a/src/vs/workbench/contrib/notebook/test/browser/contrib/contributedStatusBarItemController.test.ts b/src/vs/workbench/contrib/notebook/test/browser/contrib/contributedStatusBarItemController.test.ts
index 13b2d31e380..5ee45ec29a1 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/contrib/contributedStatusBarItemController.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/contrib/contributedStatusBarItemController.test.ts
@@ -4,15 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ContributedStatusBarItemController } from 'vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/contributedStatusBarItemController';
-import { INotebookCellStatusBarService } from 'vs/workbench/contrib/notebook/common/notebookCellStatusBarService';
-import { CellKind, INotebookCellStatusBarItemProvider } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { withTestNotebook } from 'vs/workbench/contrib/notebook/test/browser/testNotebookEditor';
+import { CancellationToken } from '../../../../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../../../../base/common/event.js';
+import { Disposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { ContributedStatusBarItemController } from '../../../browser/contrib/cellStatusBar/contributedStatusBarItemController.js';
+import { INotebookCellStatusBarService } from '../../../common/notebookCellStatusBarService.js';
+import { CellKind, INotebookCellStatusBarItemProvider } from '../../../common/notebookCommon.js';
+import { withTestNotebook } from '../testNotebookEditor.js';
 
 suite('Notebook Statusbar', () => {
 	const testDisposables = new DisposableStore();
diff --git a/src/vs/workbench/contrib/notebook/test/browser/contrib/executionStatusBarItem.test.ts b/src/vs/workbench/contrib/notebook/test/browser/contrib/executionStatusBarItem.test.ts
index 342bbd90a93..efc3a222904 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/contrib/executionStatusBarItem.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/contrib/executionStatusBarItem.test.ts
@@ -9,8 +9,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { formatCellDuration } from 'vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { formatCellDuration } from '../../../browser/contrib/cellStatusBar/executionStatusBarItemController.js';
 
 suite('notebookBrowser', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/contrib/notebook/test/browser/contrib/find.test.ts b/src/vs/workbench/contrib/notebook/test/browser/contrib/find.test.ts
index 7f9571b91e1..9bbb172b694 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/contrib/find.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/contrib/find.test.ts
@@ -4,20 +4,20 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Range } from 'vs/editor/common/core/range';
-import { FindMatch, ITextBuffer, ValidAnnotatedEditOperation } from 'vs/editor/common/model';
-import { USUAL_WORD_SEPARATORS } from 'vs/editor/common/core/wordHelper';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { FindReplaceState } from 'vs/editor/contrib/find/browser/findState';
-import { IConfigurationService, IConfigurationValue } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { NotebookFindFilters } from 'vs/workbench/contrib/notebook/browser/contrib/find/findFilters';
-import { CellFindMatchModel, FindModel } from 'vs/workbench/contrib/notebook/browser/contrib/find/findModel';
-import { IActiveNotebookEditor, ICellModelDecorations, ICellModelDeltaDecorations } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NotebookViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl';
-import { CellEditType, CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { TestCell, withTestNotebook } from 'vs/workbench/contrib/notebook/test/browser/testNotebookEditor';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { Range } from '../../../../../../editor/common/core/range.js';
+import { FindMatch, ITextBuffer, ValidAnnotatedEditOperation } from '../../../../../../editor/common/model.js';
+import { USUAL_WORD_SEPARATORS } from '../../../../../../editor/common/core/wordHelper.js';
+import { ILanguageService } from '../../../../../../editor/common/languages/language.js';
+import { FindReplaceState } from '../../../../../../editor/contrib/find/browser/findState.js';
+import { IConfigurationService, IConfigurationValue } from '../../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { NotebookFindFilters } from '../../../browser/contrib/find/findFilters.js';
+import { CellFindMatchModel, FindModel } from '../../../browser/contrib/find/findModel.js';
+import { IActiveNotebookEditor, ICellModelDecorations, ICellModelDeltaDecorations } from '../../../browser/notebookBrowser.js';
+import { NotebookViewModel } from '../../../browser/viewModel/notebookViewModelImpl.js';
+import { CellEditType, CellKind } from '../../../common/notebookCommon.js';
+import { TestCell, withTestNotebook } from '../testNotebookEditor.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
 
 suite('Notebook Find', () => {
 	const disposables = ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/contrib/notebook/test/browser/contrib/layoutActions.test.ts b/src/vs/workbench/contrib/notebook/test/browser/contrib/layoutActions.test.ts
index 11a24c15fec..3c5611b9b9d 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/contrib/layoutActions.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/contrib/layoutActions.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ToggleCellToolbarPositionAction } from 'vs/workbench/contrib/notebook/browser/contrib/layout/layoutActions';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { ToggleCellToolbarPositionAction } from '../../../browser/contrib/layout/layoutActions.js';
 
 suite('Notebook Layout Actions', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/contrib/notebook/test/browser/contrib/notebookCellDiagnostics.test.ts b/src/vs/workbench/contrib/notebook/test/browser/contrib/notebookCellDiagnostics.test.ts
index 86636c92a0b..24f75181ddb 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/contrib/notebookCellDiagnostics.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/contrib/notebookCellDiagnostics.test.ts
@@ -4,24 +4,24 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ResourceMap } from 'vs/base/common/map';
-import { waitForState } from 'vs/base/common/observable';
-import { URI } from 'vs/base/common/uri';
-import { mock } from 'vs/base/test/common/mock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { IMarkerData, IMarkerService } from 'vs/platform/markers/common/markers';
-import { ChatAgentLocation, IChatAgent, IChatAgentData, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { CellDiagnostics } from 'vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticEditorContrib';
-import { CodeCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
-import { CellKind, NotebookSetting } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { ICellExecutionStateChangedEvent, IExecutionStateChangedEvent, INotebookCellExecution, INotebookExecutionStateService, NotebookExecutionType } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
-import { setupInstantiationService, TestNotebookExecutionStateService, withTestNotebook } from 'vs/workbench/contrib/notebook/test/browser/testNotebookEditor';
-import { nullExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
+import { Emitter, Event } from '../../../../../../base/common/event.js';
+import { DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../../../base/common/map.js';
+import { waitForState } from '../../../../../../base/common/observable.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { mock } from '../../../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { IMarkerData, IMarkerService } from '../../../../../../platform/markers/common/markers.js';
+import { ChatAgentLocation, IChatAgent, IChatAgentData, IChatAgentService } from '../../../../chat/common/chatAgents.js';
+import { CellDiagnostics } from '../../../browser/contrib/cellDiagnostics/cellDiagnosticEditorContrib.js';
+import { CodeCellViewModel } from '../../../browser/viewModel/codeCellViewModel.js';
+import { CellKind, NotebookSetting } from '../../../common/notebookCommon.js';
+import { ICellExecutionStateChangedEvent, IExecutionStateChangedEvent, INotebookCellExecution, INotebookExecutionStateService, NotebookExecutionType } from '../../../common/notebookExecutionStateService.js';
+import { setupInstantiationService, TestNotebookExecutionStateService, withTestNotebook } from '../testNotebookEditor.js';
+import { nullExtensionDescription } from '../../../../../services/extensions/common/extensions.js';
 
 
 suite('notebookCellDiagnostics', () => {
@@ -73,7 +73,8 @@ suite('notebookCellDiagnostics', () => {
 			isDefault: true,
 			locations: [ChatAgentLocation.Editor],
 			metadata: {},
-			slashCommands: []
+			slashCommands: [],
+			disambiguation: [],
 		};
 		const chatAgentService = new class extends mock<IChatAgentService>() {
 			override getAgents(): IChatAgentData[] {
diff --git a/src/vs/workbench/contrib/notebook/test/browser/contrib/notebookClipboard.test.ts b/src/vs/workbench/contrib/notebook/test/browser/contrib/notebookClipboard.test.ts
index 501dcb337c9..c1e1abd0316 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/contrib/notebookClipboard.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/contrib/notebookClipboard.test.ts
@@ -4,17 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { mock } from 'vs/base/test/common/mock';
-import { NotebookClipboardContribution, runCopyCells, runCutCells } from 'vs/workbench/contrib/notebook/browser/contrib/clipboard/notebookClipboard';
-import { CellKind, NOTEBOOK_EDITOR_ID, SelectionStateType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { withTestNotebook } from 'vs/workbench/contrib/notebook/test/browser/testNotebookEditor';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IActiveNotebookEditor, INotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { IVisibleEditorPane } from 'vs/workbench/common/editor';
-import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
-import { FoldingModel, updateFoldingStateAtIndex } from 'vs/workbench/contrib/notebook/browser/viewModel/foldingModel';
-import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { mock } from '../../../../../../base/test/common/mock.js';
+import { NotebookClipboardContribution, runCopyCells, runCutCells } from '../../../browser/contrib/clipboard/notebookClipboard.js';
+import { CellKind, NOTEBOOK_EDITOR_ID, SelectionStateType } from '../../../common/notebookCommon.js';
+import { withTestNotebook } from '../testNotebookEditor.js';
+import { IEditorService } from '../../../../../services/editor/common/editorService.js';
+import { IActiveNotebookEditor, INotebookEditor } from '../../../browser/notebookBrowser.js';
+import { IVisibleEditorPane } from '../../../../../common/editor.js';
+import { INotebookService } from '../../../common/notebookService.js';
+import { FoldingModel, updateFoldingStateAtIndex } from '../../../browser/viewModel/foldingModel.js';
+import { NotebookCellTextModel } from '../../../common/model/notebookCellTextModel.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
 
 suite('Notebook Clipboard', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/contrib/notebook/test/browser/contrib/notebookOutline.test.ts b/src/vs/workbench/contrib/notebook/test/browser/contrib/notebookOutline.test.ts
index 582490022a1..81042265ee8 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/contrib/notebookOutline.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/contrib/notebookOutline.test.ts
@@ -4,34 +4,42 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { setupInstantiationService, withTestNotebook } from 'vs/workbench/contrib/notebook/test/browser/testNotebookEditor';
-import { OutlineTarget } from 'vs/workbench/services/outline/browser/outline';
-import { IFileIconTheme, IThemeService } from 'vs/platform/theme/common/themeService';
-import { mock } from 'vs/base/test/common/mock';
-import { Event } from 'vs/base/common/event';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IMarkerService } from 'vs/platform/markers/common/markers';
-import { MarkerService } from 'vs/platform/markers/common/markerService';
-import { CellKind, IOutputDto, NotebookCellMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { IActiveNotebookEditor, INotebookEditorPane } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { NotebookCellOutline } from 'vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { setupInstantiationService, withTestNotebook } from '../testNotebookEditor.js';
+import { OutlineTarget } from '../../../../../services/outline/browser/outline.js';
+import { IFileIconTheme, IThemeService } from '../../../../../../platform/theme/common/themeService.js';
+import { mock } from '../../../../../../base/test/common/mock.js';
+import { Event } from '../../../../../../base/common/event.js';
+import { IEditorService } from '../../../../../services/editor/common/editorService.js';
+import { IMarkerService } from '../../../../../../platform/markers/common/markers.js';
+import { MarkerService } from '../../../../../../platform/markers/common/markerService.js';
+import { CellKind, IOutputDto, NotebookCellMetadata } from '../../../common/notebookCommon.js';
+import { IActiveNotebookEditor, INotebookEditorPane } from '../../../browser/notebookBrowser.js';
+import { DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { NotebookCellOutline, NotebookOutlineCreator } from '../../../browser/contrib/outline/notebookOutline.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { ILanguageFeaturesService } from '../../../../../../editor/common/services/languageFeatures.js';
+import { LanguageFeaturesService } from '../../../../../../editor/common/services/languageFeaturesService.js';
+import { IEditorPaneSelectionChangeEvent } from '../../../../../common/editor.js';
+import { CancellationToken } from '../../../../../../base/common/cancellation.js';
+import { INotebookOutlineEntryFactory, NotebookOutlineEntryFactory } from '../../../browser/viewModel/notebookOutlineEntryFactory.js';
 
 suite('Notebook Outline', function () {
 
 	let disposables: DisposableStore;
 	let instantiationService: TestInstantiationService;
+	let symbolsCached: boolean;
 
 	teardown(() => disposables.dispose());
 
 	ensureNoDisposablesAreLeakedInTestSuite();
 
 	setup(() => {
+		symbolsCached = false;
 		disposables = new DisposableStore();
 		instantiationService = setupInstantiationService(disposables);
 		instantiationService.set(IEditorService, new class extends mock<IEditorService>() { });
+		instantiationService.set(ILanguageFeaturesService, new LanguageFeaturesService());
 		instantiationService.set(IMarkerService, disposables.add(new MarkerService()));
 		instantiationService.set(IThemeService, new class extends mock<IThemeService>() {
 			override onDidFileIconThemeChange = Event.None;
@@ -42,26 +50,39 @@ suite('Notebook Outline', function () {
 	});
 
 
-	function withNotebookOutline<R = any>(cells: [source: string, lang: string, kind: CellKind, output?: IOutputDto[], metadata?: NotebookCellMetadata][], callback: (outline: NotebookCellOutline, editor: IActiveNotebookEditor) => R): Promise<R> {
-		return withTestNotebook(cells, (editor) => {
+	async function withNotebookOutline<R = any>(
+		cells: [source: string, lang: string, kind: CellKind, output?: IOutputDto[], metadata?: NotebookCellMetadata][],
+		target: OutlineTarget,
+		callback: (outline: NotebookCellOutline, editor: IActiveNotebookEditor) => R,
+	): Promise<R> {
+
+		return withTestNotebook(cells, async (editor) => {
 			if (!editor.hasModel()) {
 				assert.ok(false, 'MUST have active text editor');
 			}
-			const outline = instantiationService.createInstance(NotebookCellOutline, new class extends mock<INotebookEditorPane>() {
+			const notebookEditorPane = new class extends mock<INotebookEditorPane>() {
 				override getControl() {
 					return editor;
 				}
 				override onDidChangeModel: Event<void> = Event.None;
-			}, OutlineTarget.OutlinePane);
+				override onDidChangeSelection: Event<IEditorPaneSelectionChangeEvent> = Event.None;
+			};
 
-			disposables.add(outline);
-			return callback(outline, editor);
+
+			const testOutlineEntryFactory = instantiationService.createInstance(NotebookOutlineEntryFactory) as any;
+			testOutlineEntryFactory.cacheSymbols = async () => { symbolsCached = true; };
+			instantiationService.stub(INotebookOutlineEntryFactory, testOutlineEntryFactory);
+
+			const outline = await instantiationService.createInstance(NotebookOutlineCreator).createOutline(notebookEditorPane, target, CancellationToken.None);
+
+			disposables.add(outline!);
+			return callback(outline as NotebookCellOutline, editor);
 		});
 
 	}
 
 	test('basic', async function () {
-		await withNotebookOutline([], outline => {
+		await withNotebookOutline([], OutlineTarget.OutlinePane, outline => {
 			assert.ok(outline instanceof NotebookCellOutline);
 			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements(), []);
 		});
@@ -70,7 +91,7 @@ suite('Notebook Outline', function () {
 	test('special characters in heading', async function () {
 		await withNotebookOutline([
 			['# Hellö & Hällo', 'md', CellKind.Markup]
-		], outline => {
+		], OutlineTarget.OutlinePane, outline => {
 			assert.ok(outline instanceof NotebookCellOutline);
 			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements().length, 1);
 			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[0].label, 'Hellö & Hällo');
@@ -78,7 +99,7 @@ suite('Notebook Outline', function () {
 
 		await withNotebookOutline([
 			['# bo<i>ld</i>', 'md', CellKind.Markup]
-		], outline => {
+		], OutlineTarget.OutlinePane, outline => {
 			assert.ok(outline instanceof NotebookCellOutline);
 			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements().length, 1);
 			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[0].label, 'bold');
@@ -88,7 +109,7 @@ suite('Notebook Outline', function () {
 	test('Notebook falsely detects "empty cells"', async function () {
 		await withNotebookOutline([
 			['  的时代   ', 'md', CellKind.Markup]
-		], outline => {
+		], OutlineTarget.OutlinePane, outline => {
 			assert.ok(outline instanceof NotebookCellOutline);
 			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements().length, 1);
 			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[0].label, '的时代');
@@ -96,7 +117,7 @@ suite('Notebook Outline', function () {
 
 		await withNotebookOutline([
 			['   ', 'md', CellKind.Markup]
-		], outline => {
+		], OutlineTarget.OutlinePane, outline => {
 			assert.ok(outline instanceof NotebookCellOutline);
 			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements().length, 1);
 			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[0].label, 'empty cell');
@@ -104,7 +125,7 @@ suite('Notebook Outline', function () {
 
 		await withNotebookOutline([
 			['+++++[]{}--)(0  ', 'md', CellKind.Markup]
-		], outline => {
+		], OutlineTarget.OutlinePane, outline => {
 			assert.ok(outline instanceof NotebookCellOutline);
 			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements().length, 1);
 			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[0].label, '+++++[]{}--)(0');
@@ -112,7 +133,7 @@ suite('Notebook Outline', function () {
 
 		await withNotebookOutline([
 			['+++++[]{}--)(0 Hello **&^ ', 'md', CellKind.Markup]
-		], outline => {
+		], OutlineTarget.OutlinePane, outline => {
 			assert.ok(outline instanceof NotebookCellOutline);
 			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements().length, 1);
 			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[0].label, '+++++[]{}--)(0 Hello **&^');
@@ -120,7 +141,7 @@ suite('Notebook Outline', function () {
 
 		await withNotebookOutline([
 			['!@#$\n Überschrïft', 'md', CellKind.Markup]
-		], outline => {
+		], OutlineTarget.OutlinePane, outline => {
 			assert.ok(outline instanceof NotebookCellOutline);
 			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements().length, 1);
 			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[0].label, '!@#$');
@@ -130,7 +151,7 @@ suite('Notebook Outline', function () {
 	test('Heading text defines entry label', async function () {
 		return await withNotebookOutline([
 			['foo\n # h1', 'md', CellKind.Markup]
-		], outline => {
+		], OutlineTarget.OutlinePane, outline => {
 			assert.ok(outline instanceof NotebookCellOutline);
 			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements().length, 1);
 			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[0].label, 'h1');
@@ -140,7 +161,7 @@ suite('Notebook Outline', function () {
 	test('Notebook outline ignores markdown headings #115200', async function () {
 		await withNotebookOutline([
 			['## h2 \n# h1', 'md', CellKind.Markup]
-		], outline => {
+		], OutlineTarget.OutlinePane, outline => {
 			assert.ok(outline instanceof NotebookCellOutline);
 			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements().length, 2);
 			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[0].label, 'h2');
@@ -150,11 +171,20 @@ suite('Notebook Outline', function () {
 		await withNotebookOutline([
 			['## h2', 'md', CellKind.Markup],
 			['# h1', 'md', CellKind.Markup]
-		], outline => {
+		], OutlineTarget.OutlinePane, outline => {
 			assert.ok(outline instanceof NotebookCellOutline);
 			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements().length, 2);
 			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[0].label, 'h2');
 			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[1].label, 'h1');
 		});
 	});
+
+	test('Symbols for goto quickpick are pre-cached', async function () {
+		await withNotebookOutline([
+			['a = 1\nb = 2', 'python', CellKind.Code]
+		], OutlineTarget.QuickPick, outline => {
+			assert.ok(outline instanceof NotebookCellOutline);
+			assert.strictEqual(symbolsCached, true);
+		});
+	});
 });
diff --git a/src/vs/workbench/contrib/notebook/test/browser/contrib/notebookOutlineViewProviders.test.ts b/src/vs/workbench/contrib/notebook/test/browser/contrib/notebookOutlineViewProviders.test.ts
index 0e22c66ed01..a7f35bacea3 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/contrib/notebookOutlineViewProviders.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/contrib/notebookOutlineViewProviders.test.ts
@@ -4,25 +4,30 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { IDataSource } from 'vs/base/browser/ui/tree/tree';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { mock } from 'vs/base/test/common/mock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ITextModel } from 'vs/editor/common/model';
-import { IOutlineModelService, OutlineModel } from 'vs/editor/contrib/documentSymbols/browser/outlineModel';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
-import { NotebookBreadcrumbsProvider, NotebookCellOutline, NotebookOutlinePaneProvider, NotebookQuickPickProvider } from 'vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline';
-import { ICellViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NotebookOutlineEntryFactory } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineEntryFactory';
-import { OutlineEntry } from 'vs/workbench/contrib/notebook/browser/viewModel/OutlineEntry';
-import { INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
-import { MockDocumentSymbol } from 'vs/workbench/contrib/notebook/test/browser/testNotebookEditor';
-import { OutlineTarget } from 'vs/workbench/services/outline/browser/outline';
+import { IDataSource } from '../../../../../../base/browser/ui/tree/tree.js';
+import { CancellationToken } from '../../../../../../base/common/cancellation.js';
+import { IReference } from '../../../../../../base/common/lifecycle.js';
+import { mock } from '../../../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { ITextModel } from '../../../../../../editor/common/model.js';
+import { IOutlineModelService, OutlineModel } from '../../../../../../editor/contrib/documentSymbols/browser/outlineModel.js';
+import { TestConfigurationService } from '../../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { TestThemeService } from '../../../../../../platform/theme/test/common/testThemeService.js';
+import { NotebookBreadcrumbsProvider, NotebookCellOutline, NotebookOutlinePaneProvider, NotebookQuickPickProvider } from '../../../browser/contrib/outline/notebookOutline.js';
+import { ICellViewModel } from '../../../browser/notebookBrowser.js';
+import { INotebookCellOutlineDataSource } from '../../../browser/viewModel/notebookOutlineDataSource.js';
+import { NotebookOutlineEntryFactory } from '../../../browser/viewModel/notebookOutlineEntryFactory.js';
+import { OutlineEntry } from '../../../browser/viewModel/OutlineEntry.js';
+import { INotebookExecutionStateService } from '../../../common/notebookExecutionStateService.js';
+import { MockDocumentSymbol } from '../testNotebookEditor.js';
+import { IResolvedTextEditorModel, ITextModelService } from '../../../../../../editor/common/services/resolverService.js';
+import { URI } from '../../../../../../base/common/uri.js';
 
 suite('Notebook Outline View Providers', function () {
+
 	// #region Setup
-	ensureNoDisposablesAreLeakedInTestSuite();
+
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
 
 	const configurationService = new TestConfigurationService();
 	const themeService = new TestThemeService();
@@ -52,10 +57,27 @@ suite('Notebook Outline View Providers', function () {
 			return 0;
 		}
 	};
+	const textModelService = new class extends mock<ITextModelService>() {
+		override createModelReference(uri: URI) {
+			return Promise.resolve({
+				object: {
+					textEditorModel: {
+						id: uri.toString(),
+						getVersionId() { return 1; }
+					}
+				},
+				dispose() { }
+			} as IReference<IResolvedTextEditorModel>);
+		}
+	};
+
 	// #endregion
 	// #region Helpers
+
 	function createCodeCellViewModel(version: number = 1, source = '# code', textmodelId = 'textId') {
 		return {
+			uri: { toString() { return textmodelId; } },
+			id: textmodelId,
 			textBuffer: {
 				getLineCount() { return 0; }
 			},
@@ -75,6 +97,15 @@ suite('Notebook Outline View Providers', function () {
 		} as ICellViewModel;
 	}
 
+	function createMockOutlineDataSource(entries: OutlineEntry[], activeElement: OutlineEntry | undefined = undefined) {
+		return new class extends mock<IReference<INotebookCellOutlineDataSource>>() {
+			override object: INotebookCellOutlineDataSource = {
+				entries: entries,
+				activeElement: activeElement,
+			};
+		};
+	}
+
 	function createMarkupCellViewModel(version: number = 1, source = 'markup', textmodelId = 'textId', alternativeId = 1) {
 		return {
 			textBuffer: {
@@ -99,7 +130,7 @@ suite('Notebook Outline View Providers', function () {
 		} as ICellViewModel;
 	}
 
-	function flatten(element: NotebookCellOutline | OutlineEntry, dataSource: IDataSource<NotebookCellOutline, OutlineEntry>): OutlineEntry[] {
+	function flatten(element: OutlineEntry, dataSource: IDataSource<NotebookCellOutline, OutlineEntry>): OutlineEntry[] {
 		const elements: OutlineEntry[] = [];
 
 		const children = dataSource.getChildren(element);
@@ -166,6 +197,7 @@ suite('Notebook Outline View Providers', function () {
 		await configurationService.setUserConfiguration('notebook.gotoSymbols.showAllSymbols', config.quickPickShowAllSymbols);
 		await configurationService.setUserConfiguration('notebook.breadcrumbs.showCodeCells', config.breadcrumbsShowCodeCells);
 	}
+
 	// #endregion
 	// #region OutlinePane
 
@@ -191,19 +223,19 @@ suite('Notebook Outline View Providers', function () {
 		setSymbolsForTextModel([{ name: 'var3', range: {} }], '$3');
 
 		// Cache symbols
-		const entryFactory = new NotebookOutlineEntryFactory(executionService);
+		const entryFactory = new NotebookOutlineEntryFactory(executionService, outlineModelService, textModelService);
 		for (const cell of cells) {
-			await entryFactory.cacheSymbols(cell, outlineModelService, CancellationToken.None);
+			await entryFactory.cacheSymbols(cell, CancellationToken.None);
 		}
 
 		// Generate raw outline
 		const outlineModel = new OutlineEntry(-1, -1, createCodeCellViewModel(), 'fakeRoot', false, false, undefined, undefined);
 		for (const cell of cells) {
-			entryFactory.getOutlineEntries(cell, OutlineTarget.OutlinePane, 0).forEach(entry => outlineModel.addChild(entry));
+			entryFactory.getOutlineEntries(cell, 0).forEach(entry => outlineModel.addChild(entry));
 		}
 
 		// Generate filtered outline (view model)
-		const outlinePaneProvider = new NotebookOutlinePaneProvider(() => [], configurationService);
+		const outlinePaneProvider = store.add(new NotebookOutlinePaneProvider(undefined, configurationService));
 		const results = flatten(outlineModel, outlinePaneProvider);
 
 		// Validate
@@ -234,19 +266,19 @@ suite('Notebook Outline View Providers', function () {
 		setSymbolsForTextModel([{ name: 'var3', range: {} }], '$3');
 
 		// Cache symbols
-		const entryFactory = new NotebookOutlineEntryFactory(executionService);
+		const entryFactory = new NotebookOutlineEntryFactory(executionService, outlineModelService, textModelService);
 		for (const cell of cells) {
-			await entryFactory.cacheSymbols(cell, outlineModelService, CancellationToken.None);
+			await entryFactory.cacheSymbols(cell, CancellationToken.None);
 		}
 
 		// Generate raw outline
 		const outlineModel = new OutlineEntry(-1, -1, createCodeCellViewModel(), 'fakeRoot', false, false, undefined, undefined);
 		for (const cell of cells) {
-			entryFactory.getOutlineEntries(cell, OutlineTarget.OutlinePane, 0).forEach(entry => outlineModel.addChild(entry));
+			entryFactory.getOutlineEntries(cell, 0).forEach(entry => outlineModel.addChild(entry));
 		}
 
 		// Generate filtered outline (view model)
-		const outlinePaneProvider = new NotebookOutlinePaneProvider(() => [], configurationService);
+		const outlinePaneProvider = store.add(new NotebookOutlinePaneProvider(undefined, configurationService));
 		const results = flatten(outlineModel, outlinePaneProvider);
 
 		assert.equal(results.length, 2);
@@ -280,19 +312,19 @@ suite('Notebook Outline View Providers', function () {
 		setSymbolsForTextModel([{ name: 'var3', range: {} }], '$3');
 
 		// Cache symbols
-		const entryFactory = new NotebookOutlineEntryFactory(executionService);
+		const entryFactory = new NotebookOutlineEntryFactory(executionService, outlineModelService, textModelService);
 		for (const cell of cells) {
-			await entryFactory.cacheSymbols(cell, outlineModelService, CancellationToken.None);
+			await entryFactory.cacheSymbols(cell, CancellationToken.None);
 		}
 
 		// Generate raw outline
 		const outlineModel = new OutlineEntry(-1, -1, createCodeCellViewModel(), 'fakeRoot', false, false, undefined, undefined);
 		for (const cell of cells) {
-			entryFactory.getOutlineEntries(cell, OutlineTarget.OutlinePane, 0).forEach(entry => outlineModel.addChild(entry));
+			entryFactory.getOutlineEntries(cell, 0).forEach(entry => outlineModel.addChild(entry));
 		}
 
 		// Generate filtered outline (view model)
-		const outlinePaneProvider = new NotebookOutlinePaneProvider(() => [], configurationService);
+		const outlinePaneProvider = store.add(new NotebookOutlinePaneProvider(undefined, configurationService));
 		const results = flatten(outlineModel, outlinePaneProvider);
 
 		assert.equal(results.length, 1);
@@ -323,19 +355,19 @@ suite('Notebook Outline View Providers', function () {
 		setSymbolsForTextModel([{ name: 'var3', range: {} }], '$3');
 
 		// Cache symbols
-		const entryFactory = new NotebookOutlineEntryFactory(executionService);
+		const entryFactory = new NotebookOutlineEntryFactory(executionService, outlineModelService, textModelService);
 		for (const cell of cells) {
-			await entryFactory.cacheSymbols(cell, outlineModelService, CancellationToken.None);
+			await entryFactory.cacheSymbols(cell, CancellationToken.None);
 		}
 
 		// Generate raw outline
 		const outlineModel = new OutlineEntry(-1, -1, createCodeCellViewModel(), 'fakeRoot', false, false, undefined, undefined);
 		for (const cell of cells) {
-			entryFactory.getOutlineEntries(cell, OutlineTarget.OutlinePane, 0).forEach(entry => outlineModel.addChild(entry));
+			entryFactory.getOutlineEntries(cell, 0).forEach(entry => outlineModel.addChild(entry));
 		}
 
 		// Generate filtered outline (view model)
-		const outlinePaneProvider = new NotebookOutlinePaneProvider(() => [], configurationService);
+		const outlinePaneProvider = store.add(new NotebookOutlinePaneProvider(undefined, configurationService));
 		const results = flatten(outlineModel, outlinePaneProvider);
 
 		assert.equal(results.length, 3);
@@ -372,19 +404,19 @@ suite('Notebook Outline View Providers', function () {
 		setSymbolsForTextModel([{ name: 'var3', range: {} }], '$3');
 
 		// Cache symbols
-		const entryFactory = new NotebookOutlineEntryFactory(executionService);
+		const entryFactory = new NotebookOutlineEntryFactory(executionService, outlineModelService, textModelService);
 		for (const cell of cells) {
-			await entryFactory.cacheSymbols(cell, outlineModelService, CancellationToken.None);
+			await entryFactory.cacheSymbols(cell, CancellationToken.None);
 		}
 
 		// Generate raw outline
 		const outlineModel = new OutlineEntry(-1, -1, createCodeCellViewModel(), 'fakeRoot', false, false, undefined, undefined);
 		for (const cell of cells) {
-			entryFactory.getOutlineEntries(cell, OutlineTarget.OutlinePane, 0).forEach(entry => outlineModel.addChild(entry));
+			entryFactory.getOutlineEntries(cell, 0).forEach(entry => outlineModel.addChild(entry));
 		}
 
 		// Generate filtered outline (view model)
-		const outlinePaneProvider = new NotebookOutlinePaneProvider(() => [], configurationService);
+		const outlinePaneProvider = store.add(new NotebookOutlinePaneProvider(undefined, configurationService));
 		const results = flatten(outlineModel, outlinePaneProvider);
 
 		// validate
@@ -431,19 +463,19 @@ suite('Notebook Outline View Providers', function () {
 		setSymbolsForTextModel([{ name: 'var3', range: {}, kind: 12 }], '$3');
 
 		// Cache symbols
-		const entryFactory = new NotebookOutlineEntryFactory(executionService);
+		const entryFactory = new NotebookOutlineEntryFactory(executionService, outlineModelService, textModelService);
 		for (const cell of cells) {
-			await entryFactory.cacheSymbols(cell, outlineModelService, CancellationToken.None);
+			await entryFactory.cacheSymbols(cell, CancellationToken.None);
 		}
 
 		// Generate raw outline
 		const outlineModel = new OutlineEntry(-1, -1, createCodeCellViewModel(), 'fakeRoot', false, false, undefined, undefined);
 		for (const cell of cells) {
-			entryFactory.getOutlineEntries(cell, OutlineTarget.OutlinePane, 0).forEach(entry => outlineModel.addChild(entry));
+			entryFactory.getOutlineEntries(cell, 0).forEach(entry => outlineModel.addChild(entry));
 		}
 
 		// Generate filtered outline (view model)
-		const quickPickProvider = new NotebookQuickPickProvider(() => [...outlineModel.children], configurationService, themeService);
+		const quickPickProvider = store.add(new NotebookQuickPickProvider(createMockOutlineDataSource([...outlineModel.children]), configurationService, themeService));
 		const results = quickPickProvider.getQuickPickElements();
 
 		// Validate
@@ -484,19 +516,19 @@ suite('Notebook Outline View Providers', function () {
 		setSymbolsForTextModel([{ name: 'var3', range: {}, kind: 12 }], '$3');
 
 		// Cache symbols
-		const entryFactory = new NotebookOutlineEntryFactory(executionService);
+		const entryFactory = new NotebookOutlineEntryFactory(executionService, outlineModelService, textModelService);
 		for (const cell of cells) {
-			await entryFactory.cacheSymbols(cell, outlineModelService, CancellationToken.None);
+			await entryFactory.cacheSymbols(cell, CancellationToken.None);
 		}
 
 		// Generate raw outline
 		const outlineModel = new OutlineEntry(-1, -1, createCodeCellViewModel(), 'fakeRoot', false, false, undefined, undefined);
 		for (const cell of cells) {
-			entryFactory.getOutlineEntries(cell, OutlineTarget.OutlinePane, 0).forEach(entry => outlineModel.addChild(entry));
+			entryFactory.getOutlineEntries(cell, 0).forEach(entry => outlineModel.addChild(entry));
 		}
 
 		// Generate filtered outline (view model)
-		const quickPickProvider = new NotebookQuickPickProvider(() => [...outlineModel.children], configurationService, themeService);
+		const quickPickProvider = store.add(new NotebookQuickPickProvider(createMockOutlineDataSource([...outlineModel.children]), configurationService, themeService));
 		const results = quickPickProvider.getQuickPickElements();
 
 		// Validate
@@ -537,19 +569,19 @@ suite('Notebook Outline View Providers', function () {
 		setSymbolsForTextModel([{ name: 'var3', range: {}, kind: 12 }], '$3');
 
 		// Cache symbols
-		const entryFactory = new NotebookOutlineEntryFactory(executionService);
+		const entryFactory = new NotebookOutlineEntryFactory(executionService, outlineModelService, textModelService);
 		for (const cell of cells) {
-			await entryFactory.cacheSymbols(cell, outlineModelService, CancellationToken.None);
+			await entryFactory.cacheSymbols(cell, CancellationToken.None);
 		}
 
 		// Generate raw outline
 		const outlineModel = new OutlineEntry(-1, -1, createCodeCellViewModel(), 'fakeRoot', false, false, undefined, undefined);
 		for (const cell of cells) {
-			entryFactory.getOutlineEntries(cell, OutlineTarget.OutlinePane, 0).forEach(entry => outlineModel.addChild(entry));
+			entryFactory.getOutlineEntries(cell, 0).forEach(entry => outlineModel.addChild(entry));
 		}
 
 		// Generate filtered outline (view model)
-		const quickPickProvider = new NotebookQuickPickProvider(() => [...outlineModel.children], configurationService, themeService);
+		const quickPickProvider = store.add(new NotebookQuickPickProvider(createMockOutlineDataSource([...outlineModel.children]), configurationService, themeService));
 		const results = quickPickProvider.getQuickPickElements();
 
 		// Validate
@@ -593,20 +625,20 @@ suite('Notebook Outline View Providers', function () {
 		setSymbolsForTextModel([{ name: 'var3', range: {}, kind: 12 }], '$3');
 
 		// Cache symbols
-		const entryFactory = new NotebookOutlineEntryFactory(executionService);
+		const entryFactory = new NotebookOutlineEntryFactory(executionService, outlineModelService, textModelService);
 		for (const cell of cells) {
-			await entryFactory.cacheSymbols(cell, outlineModelService, CancellationToken.None);
+			await entryFactory.cacheSymbols(cell, CancellationToken.None);
 		}
 
 		// Generate raw outline
 		const outlineModel = new OutlineEntry(-1, -1, createMarkupCellViewModel(), 'fakeRoot', false, false, undefined, undefined);
 		for (const cell of cells) {
-			entryFactory.getOutlineEntries(cell, OutlineTarget.OutlinePane, 0).forEach(entry => outlineModel.addChild(entry));
+			entryFactory.getOutlineEntries(cell, 0).forEach(entry => outlineModel.addChild(entry));
 		}
 		const outlineTree = buildOutlineTree([...outlineModel.children]);
 
 		// Generate filtered outline (view model)
-		const breadcrumbsProvider = new NotebookBreadcrumbsProvider(() => [...outlineTree![0].children][1], configurationService);
+		const breadcrumbsProvider = store.add(new NotebookBreadcrumbsProvider(createMockOutlineDataSource([], [...outlineTree![0].children][1]), configurationService));
 		const results = breadcrumbsProvider.getBreadcrumbElements();
 
 		// Validate
@@ -644,20 +676,20 @@ suite('Notebook Outline View Providers', function () {
 		setSymbolsForTextModel([{ name: 'var3', range: {}, kind: 12 }], '$3');
 
 		// Cache symbols
-		const entryFactory = new NotebookOutlineEntryFactory(executionService);
+		const entryFactory = new NotebookOutlineEntryFactory(executionService, outlineModelService, textModelService);
 		for (const cell of cells) {
-			await entryFactory.cacheSymbols(cell, outlineModelService, CancellationToken.None);
+			await entryFactory.cacheSymbols(cell, CancellationToken.None);
 		}
 
 		// Generate raw outline
 		const outlineModel = new OutlineEntry(-1, -1, createMarkupCellViewModel(), 'fakeRoot', false, false, undefined, undefined);
 		for (const cell of cells) {
-			entryFactory.getOutlineEntries(cell, OutlineTarget.OutlinePane, 0).forEach(entry => outlineModel.addChild(entry));
+			entryFactory.getOutlineEntries(cell, 0).forEach(entry => outlineModel.addChild(entry));
 		}
 		const outlineTree = buildOutlineTree([...outlineModel.children]);
 
 		// Generate filtered outline (view model)
-		const breadcrumbsProvider = new NotebookBreadcrumbsProvider(() => [...outlineTree![0].children][1], configurationService);
+		const breadcrumbsProvider = store.add(new NotebookBreadcrumbsProvider(createMockOutlineDataSource([], [...outlineTree![0].children][1]), configurationService));
 		const results = breadcrumbsProvider.getBreadcrumbElements();
 
 		// Validate
diff --git a/src/vs/workbench/contrib/notebook/test/browser/contrib/notebookSymbols.test.ts b/src/vs/workbench/contrib/notebook/test/browser/contrib/notebookSymbols.test.ts
index 9c802bd2331..1eaf85e79f5 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/contrib/notebookSymbols.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/contrib/notebookSymbols.test.ts
@@ -4,16 +4,18 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { mock } from 'vs/base/test/common/mock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ITextModel } from 'vs/editor/common/model';
-import { IOutlineModelService, OutlineModel } from 'vs/editor/contrib/documentSymbols/browser/outlineModel';
-import { ICellViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NotebookOutlineEntryFactory } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineEntryFactory';
-import { INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
-import { MockDocumentSymbol } from 'vs/workbench/contrib/notebook/test/browser/testNotebookEditor';
-import { OutlineTarget } from 'vs/workbench/services/outline/browser/outline';
+import { CancellationToken } from '../../../../../../base/common/cancellation.js';
+import { mock } from '../../../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { ITextModel } from '../../../../../../editor/common/model.js';
+import { IOutlineModelService, OutlineModel } from '../../../../../../editor/contrib/documentSymbols/browser/outlineModel.js';
+import { ICellViewModel } from '../../../browser/notebookBrowser.js';
+import { NotebookOutlineEntryFactory } from '../../../browser/viewModel/notebookOutlineEntryFactory.js';
+import { INotebookExecutionStateService } from '../../../common/notebookExecutionStateService.js';
+import { MockDocumentSymbol } from '../testNotebookEditor.js';
+import { IResolvedTextEditorModel, ITextModelService } from '../../../../../../editor/common/services/resolverService.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { IReference } from '../../../../../../base/common/lifecycle.js';
 
 suite('Notebook Symbols', function () {
 	ensureNoDisposablesAreLeakedInTestSuite();
@@ -43,9 +45,24 @@ suite('Notebook Symbols', function () {
 			return 0;
 		}
 	};
+	const textModelService = new class extends mock<ITextModelService>() {
+		override createModelReference(uri: URI) {
+			return Promise.resolve({
+				object: {
+					textEditorModel: {
+						id: uri.toString(),
+						getVersionId() { return 1; }
+					}
+				},
+				dispose() { }
+			} as IReference<IResolvedTextEditorModel>);
+		}
+	};
 
 	function createCellViewModel(version: number = 1, textmodelId = 'textId') {
 		return {
+			id: textmodelId,
+			uri: { toString() { return textmodelId; } },
 			textBuffer: {
 				getLineCount() { return 0; }
 			},
@@ -66,8 +83,8 @@ suite('Notebook Symbols', function () {
 
 	test('Cell without symbols cache', function () {
 		setSymbolsForTextModel([{ name: 'var', range: {} }]);
-		const entryFactory = new NotebookOutlineEntryFactory(executionService);
-		const entries = entryFactory.getOutlineEntries(createCellViewModel(), OutlineTarget.QuickPick, 0);
+		const entryFactory = new NotebookOutlineEntryFactory(executionService, outlineModelService, textModelService);
+		const entries = entryFactory.getOutlineEntries(createCellViewModel(), 0);
 
 		assert.equal(entries.length, 1, 'no entries created');
 		assert.equal(entries[0].label, '# code', 'entry should fall back to first line of cell');
@@ -75,11 +92,11 @@ suite('Notebook Symbols', function () {
 
 	test('Cell with simple symbols', async function () {
 		setSymbolsForTextModel([{ name: 'var1', range: {} }, { name: 'var2', range: {} }]);
-		const entryFactory = new NotebookOutlineEntryFactory(executionService);
+		const entryFactory = new NotebookOutlineEntryFactory(executionService, outlineModelService, textModelService);
 		const cell = createCellViewModel();
 
-		await entryFactory.cacheSymbols(cell, outlineModelService, CancellationToken.None);
-		const entries = entryFactory.getOutlineEntries(cell, OutlineTarget.QuickPick, 0);
+		await entryFactory.cacheSymbols(cell, CancellationToken.None);
+		const entries = entryFactory.getOutlineEntries(cell, 0);
 
 		assert.equal(entries.length, 3, 'wrong number of outline entries');
 		assert.equal(entries[0].label, '# code');
@@ -97,11 +114,11 @@ suite('Notebook Symbols', function () {
 			{ name: 'root1', range: {}, children: [{ name: 'nested1', range: {} }, { name: 'nested2', range: {} }] },
 			{ name: 'root2', range: {}, children: [{ name: 'nested1', range: {} }] }
 		]);
-		const entryFactory = new NotebookOutlineEntryFactory(executionService);
+		const entryFactory = new NotebookOutlineEntryFactory(executionService, outlineModelService, textModelService);
 		const cell = createCellViewModel();
 
-		await entryFactory.cacheSymbols(cell, outlineModelService, CancellationToken.None);
-		const entries = entryFactory.getOutlineEntries(createCellViewModel(), OutlineTarget.QuickPick, 0);
+		await entryFactory.cacheSymbols(cell, CancellationToken.None);
+		const entries = entryFactory.getOutlineEntries(createCellViewModel(), 0);
 
 		assert.equal(entries.length, 6, 'wrong number of outline entries');
 		assert.equal(entries[0].label, '# code');
@@ -120,15 +137,15 @@ suite('Notebook Symbols', function () {
 	test('Multiple Cells with symbols', async function () {
 		setSymbolsForTextModel([{ name: 'var1', range: {} }], '$1');
 		setSymbolsForTextModel([{ name: 'var2', range: {} }], '$2');
-		const entryFactory = new NotebookOutlineEntryFactory(executionService);
+		const entryFactory = new NotebookOutlineEntryFactory(executionService, outlineModelService, textModelService);
 
 		const cell1 = createCellViewModel(1, '$1');
 		const cell2 = createCellViewModel(1, '$2');
-		await entryFactory.cacheSymbols(cell1, outlineModelService, CancellationToken.None);
-		await entryFactory.cacheSymbols(cell2, outlineModelService, CancellationToken.None);
+		await entryFactory.cacheSymbols(cell1, CancellationToken.None);
+		await entryFactory.cacheSymbols(cell2, CancellationToken.None);
 
-		const entries1 = entryFactory.getOutlineEntries(createCellViewModel(1, '$1'), OutlineTarget.QuickPick, 0);
-		const entries2 = entryFactory.getOutlineEntries(createCellViewModel(1, '$2'), OutlineTarget.QuickPick, 0);
+		const entries1 = entryFactory.getOutlineEntries(createCellViewModel(1, '$1'), 0);
+		const entries2 = entryFactory.getOutlineEntries(createCellViewModel(1, '$2'), 0);
 
 
 		assert.equal(entries1.length, 2, 'wrong number of outline entries');
diff --git a/src/vs/workbench/contrib/notebook/test/browser/contrib/notebookUndoRedo.test.ts b/src/vs/workbench/contrib/notebook/test/browser/contrib/notebookUndoRedo.test.ts
index 0770113f20a..f98d62c6875 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/contrib/notebookUndoRedo.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/contrib/notebookUndoRedo.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { CellEditType, CellKind, SelectionStateType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { createNotebookCellList, withTestNotebook } from 'vs/workbench/contrib/notebook/test/browser/testNotebookEditor';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { CellEditType, CellKind, SelectionStateType } from '../../../common/notebookCommon.js';
+import { createNotebookCellList, withTestNotebook } from '../testNotebookEditor.js';
 
 suite('Notebook Undo/Redo', () => {
 	const disposables = ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/contrib/notebook/test/browser/contrib/outputCopyTests.test.ts b/src/vs/workbench/contrib/notebook/test/browser/contrib/outputCopyTests.test.ts
index ade4aa5abc3..150cab62ed8 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/contrib/outputCopyTests.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/contrib/outputCopyTests.test.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ICellOutputViewModel, ICellViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { mock } from 'vs/base/test/common/mock';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { ILogService } from 'vs/platform/log/common/log';
+import { ICellOutputViewModel, ICellViewModel } from '../../../browser/notebookBrowser.js';
+import { mock } from '../../../../../../base/test/common/mock.js';
+import { IClipboardService } from '../../../../../../platform/clipboard/common/clipboardService.js';
+import { ILogService } from '../../../../../../platform/log/common/log.js';
 import assert from 'assert';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { IOutputItemDto } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { copyCellOutput } from 'vs/workbench/contrib/notebook/browser/contrib/clipboard/cellOutputClipboard';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { VSBuffer } from '../../../../../../base/common/buffer.js';
+import { IOutputItemDto } from '../../../common/notebookCommon.js';
+import { copyCellOutput } from '../../../browser/contrib/clipboard/cellOutputClipboard.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
 
 suite('Cell Output Clipboard Tests', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/contrib/notebook/test/browser/diff/editorHeightCalculator.test.ts b/src/vs/workbench/contrib/notebook/test/browser/diff/editorHeightCalculator.test.ts
new file mode 100644
index 00000000000..64dd4ba3073
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/test/browser/diff/editorHeightCalculator.test.ts
@@ -0,0 +1,151 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { DisposableStore, IReference } from '../../../../../../base/common/lifecycle.js';
+import { mock } from '../../../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { TestConfigurationService } from '../../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { DiffEditorHeightCalculatorService } from '../../../browser/diff/editorHeightCalculator.js';
+import { FontInfo } from '../../../../../../editor/common/config/fontInfo.js';
+import { IResolvedTextEditorModel, ITextModelService } from '../../../../../../editor/common/services/resolverService.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { createTextModel as createTextModelWithText } from '../../../../../../editor/test/common/testTextModel.js';
+import { ITextModel } from '../../../../../../editor/common/model.js';
+import { DefaultLinesDiffComputer } from '../../../../../../editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer.js';
+import { DiffAlgorithmName, IEditorWorkerService } from '../../../../../../editor/common/services/editorWorker.js';
+import { IDocumentDiffProviderOptions, IDocumentDiff } from '../../../../../../editor/common/diff/documentDiffProvider.js';
+import { getEditorPadding } from '../../../browser/diff/diffCellEditorOptions.js';
+import { HeightOfHiddenLinesRegionInDiffEditor } from '../../../browser/diff/diffElementViewModel.js';
+
+suite('NotebookDiff EditorHeightCalculator', () => {
+	['Hide Unchanged Regions', 'Show Unchanged Regions'].forEach(suiteTitle => {
+		suite(suiteTitle, () => {
+			const fontInfo: FontInfo = { lineHeight: 18, fontSize: 18 } as any;
+			let disposables: DisposableStore;
+			let textModelResolver: ITextModelService;
+			let editorWorkerService: IEditorWorkerService;
+			const original: URI = URI.parse('original');
+			const modified: URI = URI.parse('modified');
+			let originalModel: ITextModel;
+			let modifiedModel: ITextModel;
+			const diffComputer = new DefaultLinesDiffComputer();
+			let calculator: DiffEditorHeightCalculatorService;
+			const hideUnchangedRegions = suiteTitle.startsWith('Hide');
+			const configurationService = new TestConfigurationService({
+				notebook: { diff: { ignoreMetadata: true } }, diffEditor: {
+					hideUnchangedRegions: {
+						enabled: hideUnchangedRegions, minimumLineCount: 3, contextLineCount: 3
+					}
+				}
+			});
+
+			function createTextModel(lines: string[]): ITextModel {
+				return createTextModelWithText(lines.join('\n'));
+			}
+
+			teardown(() => disposables.dispose());
+			ensureNoDisposablesAreLeakedInTestSuite();
+
+			setup(() => {
+				disposables = new DisposableStore();
+				textModelResolver = new class extends mock<ITextModelService>() {
+					override async createModelReference(resource: URI): Promise<IReference<IResolvedTextEditorModel>> {
+						return {
+							dispose: () => { },
+							object: {
+								textEditorModel: resource === original ? originalModel : modifiedModel,
+								getLanguageId: () => 'javascript',
+							} as any
+						};
+					}
+				};
+				editorWorkerService = new class extends mock<IEditorWorkerService>() {
+					override async computeDiff(_original: URI, _modified: URI, options: IDocumentDiffProviderOptions, _algorithm: DiffAlgorithmName): Promise<IDocumentDiff | null> {
+						const originalLines = new Array(originalModel.getLineCount()).fill(0).map((_, i) => originalModel.getLineContent(i + 1));
+						const modifiedLines = new Array(modifiedModel.getLineCount()).fill(0).map((_, i) => modifiedModel.getLineContent(i + 1));
+						const result = diffComputer.computeDiff(originalLines, modifiedLines, options);
+						const identical = originalLines.join('') === modifiedLines.join('');
+
+						return {
+							identical,
+							quitEarly: result.hitTimeout,
+							changes: result.changes,
+							moves: result.moves,
+						};
+
+					}
+				};
+				calculator = new DiffEditorHeightCalculatorService(fontInfo.lineHeight, textModelResolver, editorWorkerService, configurationService);
+			});
+
+			test('1 original line with change in same line', async () => {
+				originalModel = disposables.add(createTextModel(['Hello World']));
+				modifiedModel = disposables.add(createTextModel(['Foo Bar']));
+
+				const height = await calculator.diffAndComputeHeight(original, modified);
+				const expectedHeight = getExpectedHeight(1, 0);
+
+				assert.strictEqual(height, expectedHeight);
+			});
+
+			test('1 original line with insertion of a new line', async () => {
+				originalModel = disposables.add(createTextModel(['Hello World']));
+				modifiedModel = disposables.add(createTextModel(['Hello World', 'Foo Bar']));
+
+				const height = await calculator.diffAndComputeHeight(original, modified);
+				const expectedHeight = getExpectedHeight(2, 0);
+
+				assert.strictEqual(height, expectedHeight);
+			});
+
+			test('1 line with update to a line and insert of a new line', async () => {
+				originalModel = disposables.add(createTextModel(['Hello World']));
+				modifiedModel = disposables.add(createTextModel(['Foo Bar', 'Bar Baz']));
+
+				const height = await calculator.diffAndComputeHeight(original, modified);
+				const expectedHeight = getExpectedHeight(2, 0);
+
+				assert.strictEqual(height, expectedHeight);
+			});
+
+			test('10 line with update to a line and insert of a new line', async () => {
+				originalModel = disposables.add(createTextModel(createLines(10)));
+				modifiedModel = disposables.add(createTextModel(createLines(10).concat('Foo Bar')));
+
+				const height = await calculator.diffAndComputeHeight(original, modified);
+				const expectedHeight = getExpectedHeight(hideUnchangedRegions ? 4 : 11, hideUnchangedRegions ? 1 : 0);
+
+				assert.strictEqual(height, expectedHeight);
+			});
+
+			test('50 lines with updates, deletions and inserts', async () => {
+				originalModel = disposables.add(createTextModel(createLines(60)));
+				const modifiedLines = createLines(60);
+				modifiedLines[3] = 'Foo Bar';
+				modifiedLines.splice(7, 3);
+				modifiedLines.splice(10, 0, 'Foo Bar1', 'Foo Bar2', 'Foo Bar3');
+				modifiedLines.splice(30, 0, '', '');
+				modifiedLines.splice(40, 4);
+				modifiedLines.splice(50, 0, '1', '2', '3', '4', '5');
+
+				modifiedModel = disposables.add(createTextModel(modifiedLines));
+
+				const height = await calculator.diffAndComputeHeight(original, modified);
+				const expectedHeight = getExpectedHeight(hideUnchangedRegions ? 50 : 70, hideUnchangedRegions ? 3 : 0);
+
+				assert.strictEqual(height, expectedHeight);
+			});
+
+			function getExpectedHeight(visibleLineCount: number, unchangeRegionsHeight: number): number {
+				return (visibleLineCount * fontInfo.lineHeight) + getEditorPadding(visibleLineCount).top + getEditorPadding(visibleLineCount).bottom + (unchangeRegionsHeight * HeightOfHiddenLinesRegionInDiffEditor);
+			}
+
+			function createLines(count: number, linePrefix = 'Hello World'): string[] {
+				return new Array(count).fill(0).map((_, i) => `${linePrefix} ${i}`);
+			}
+		});
+	});
+});
diff --git a/src/vs/workbench/contrib/notebook/test/browser/diff/notebookDiff.test.ts b/src/vs/workbench/contrib/notebook/test/browser/diff/notebookDiff.test.ts
new file mode 100644
index 00000000000..1398cdb1a17
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/test/browser/diff/notebookDiff.test.ts
@@ -0,0 +1,658 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { VSBuffer } from '../../../../../../base/common/buffer.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../../../base/common/cancellation.js';
+import { IDiffResult, ISequence, LcsDiff } from '../../../../../../base/common/diff/diff.js';
+import { DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { Mimes } from '../../../../../../base/common/mime.js';
+import { mock } from '../../../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { TestConfigurationService } from '../../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { IDiffElementViewModelBase, SideBySideDiffElementViewModel } from '../../../browser/diff/diffElementViewModel.js';
+import { NotebookDiffEditorEventDispatcher } from '../../../browser/diff/eventDispatcher.js';
+import { INotebookDiffViewModel, INotebookDiffViewModelUpdateEvent } from '../../../browser/diff/notebookDiffEditorBrowser.js';
+import { NotebookDiffViewModel, prettyChanges } from '../../../browser/diff/notebookDiffViewModel.js';
+import { CellKind, INotebookTextModel } from '../../../common/notebookCommon.js';
+import { INotebookService } from '../../../common/notebookService.js';
+import { INotebookEditorWorkerService } from '../../../common/services/notebookWorkerService.js';
+import { withTestNotebookDiffModel } from '../testNotebookEditor.js';
+import { IDiffEditorHeightCalculatorService } from '../../../browser/diff/editorHeightCalculator.js';
+
+class CellSequence implements ISequence {
+
+	constructor(readonly textModel: INotebookTextModel) {
+	}
+
+	getElements(): string[] | number[] | Int32Array {
+		const hashValue = new Int32Array(this.textModel.cells.length);
+		for (let i = 0; i < this.textModel.cells.length; i++) {
+			hashValue[i] = this.textModel.cells[i].getHashValue();
+		}
+
+		return hashValue;
+	}
+}
+
+suite('NotebookDiff', () => {
+	let disposables: DisposableStore;
+	let token: CancellationToken;
+	let eventDispatcher: NotebookDiffEditorEventDispatcher;
+	let diffViewModel: NotebookDiffViewModel;
+	let diffResult: IDiffResult;
+	let notebookEditorWorkerService: INotebookEditorWorkerService;
+	let heightCalculator: IDiffEditorHeightCalculatorService;
+	teardown(() => disposables.dispose());
+
+	const configurationService = new TestConfigurationService({ notebook: { diff: { ignoreMetadata: true } } });
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	setup(() => {
+		disposables = new DisposableStore();
+		const cancellation = disposables.add(new CancellationTokenSource());
+		eventDispatcher = disposables.add(new NotebookDiffEditorEventDispatcher());
+		token = cancellation.token;
+		notebookEditorWorkerService = new class extends mock<INotebookEditorWorkerService>() {
+			override computeDiff() { return Promise.resolve({ cellsDiff: diffResult, metadataChanged: false }); }
+		};
+		heightCalculator = new class extends mock<IDiffEditorHeightCalculatorService>() {
+			override diffAndComputeHeight() { return Promise.resolve(0); }
+			override computeHeightFromLines(_lineCount: number): number {
+				return 0;
+			}
+		};
+	});
+
+	async function verifyChangeEventIsNotFired(diffViewModel: INotebookDiffViewModel) {
+		let eventArgs: INotebookDiffViewModelUpdateEvent | undefined = undefined;
+		disposables.add(diffViewModel.onDidChangeItems(e => eventArgs = e));
+		await diffViewModel.computeDiff(token);
+
+		assert.strictEqual(eventArgs, undefined);
+	}
+
+	test('diff different source', async () => {
+		await withTestNotebookDiffModel([
+			['x', 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
+		], [
+			['y', 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
+		], async (model, disposables, accessor) => {
+			const diff = new LcsDiff(new CellSequence(model.original.notebook), new CellSequence(model.modified.notebook));
+			diffResult = diff.ComputeDiff(false);
+			assert.strictEqual(diffResult.changes.length, 1);
+			assert.deepStrictEqual(diffResult.changes.map(change => ({
+				originalStart: change.originalStart,
+				originalLength: change.originalLength,
+				modifiedStart: change.modifiedStart,
+				modifiedLength: change.modifiedLength
+			})), [{
+				originalStart: 0,
+				originalLength: 1,
+				modifiedStart: 0,
+				modifiedLength: 1
+			}]);
+
+			diffViewModel = disposables.add(new NotebookDiffViewModel(model, notebookEditorWorkerService, configurationService, eventDispatcher, accessor.get<INotebookService>(INotebookService), heightCalculator, undefined));
+			await diffViewModel.computeDiff(token);
+
+			assert.strictEqual(diffViewModel.items.length, 1);
+			assert.strictEqual(diffViewModel.items[0].type, 'modified');
+		});
+	});
+
+	test('No changes when re-computing diff with the same source', async () => {
+		await withTestNotebookDiffModel([
+			['x', 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
+		], [
+			['y', 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
+		], async (model, disposables, accessor) => {
+			const diff = new LcsDiff(new CellSequence(model.original.notebook), new CellSequence(model.modified.notebook));
+			diffResult = diff.ComputeDiff(false);
+			assert.strictEqual(diffResult.changes.length, 1);
+			assert.deepStrictEqual(diffResult.changes.map(change => ({
+				originalStart: change.originalStart,
+				originalLength: change.originalLength,
+				modifiedStart: change.modifiedStart,
+				modifiedLength: change.modifiedLength
+			})), [{
+				originalStart: 0,
+				originalLength: 1,
+				modifiedStart: 0,
+				modifiedLength: 1
+			}]);
+
+			diffViewModel = disposables.add(new NotebookDiffViewModel(model, notebookEditorWorkerService, configurationService, eventDispatcher, accessor.get<INotebookService>(INotebookService), heightCalculator, undefined));
+			await diffViewModel.computeDiff(token);
+
+			await verifyChangeEventIsNotFired(diffViewModel);
+		});
+	});
+
+	test('diff different output', async () => {
+		await withTestNotebookDiffModel([
+			['x', 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([5])) }] }], { metadata: { collapsed: false }, executionOrder: 5 }],
+			['', 'javascript', CellKind.Code, [], {}]
+		], [
+			['x', 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
+			['', 'javascript', CellKind.Code, [], {}]
+		], async (model, disposables, accessor) => {
+			const diff = new LcsDiff(new CellSequence(model.original.notebook), new CellSequence(model.modified.notebook));
+			diffResult = diff.ComputeDiff(false);
+			assert.strictEqual(diffResult.changes.length, 1);
+			assert.deepStrictEqual(diffResult.changes.map(change => ({
+				originalStart: change.originalStart,
+				originalLength: change.originalLength,
+				modifiedStart: change.modifiedStart,
+				modifiedLength: change.modifiedLength
+			})), [{
+				originalStart: 0,
+				originalLength: 1,
+				modifiedStart: 0,
+				modifiedLength: 1
+			}]);
+
+			diffViewModel = disposables.add(new NotebookDiffViewModel(model, notebookEditorWorkerService, configurationService, eventDispatcher, accessor.get<INotebookService>(INotebookService), heightCalculator, undefined));
+			let eventArgs: INotebookDiffViewModelUpdateEvent | undefined = undefined;
+			disposables.add(diffViewModel.onDidChangeItems(e => eventArgs = e));
+			await diffViewModel.computeDiff(token);
+
+			assert.strictEqual(diffViewModel.items.length, 2);
+			assert.strictEqual(diffViewModel.items[0].type, 'modified');
+			assert.strictEqual(diffViewModel.items[1].type, 'placeholder');
+
+
+			diffViewModel.items[1].showHiddenCells();
+
+			assert.strictEqual(diffViewModel.items.length, 2);
+			assert.strictEqual(diffViewModel.items[0].type, 'modified');
+			assert.strictEqual(diffViewModel.items[1].type, 'unchanged');
+			assert.deepStrictEqual(eventArgs, { start: 1, deleteCount: 1, elements: [diffViewModel.items[1]] });
+
+			(diffViewModel.items[1] as unknown as SideBySideDiffElementViewModel).hideUnchangedCells();
+
+			assert.strictEqual(diffViewModel.items.length, 2);
+			assert.strictEqual(diffViewModel.items[0].type, 'modified');
+			assert.strictEqual((diffViewModel.items[1] as IDiffElementViewModelBase).type, 'placeholder');
+			assert.deepStrictEqual(eventArgs, { start: 1, deleteCount: 1, elements: [diffViewModel.items[1]] });
+
+			await verifyChangeEventIsNotFired(diffViewModel);
+		});
+	});
+
+	test('diff test small source', async () => {
+		await withTestNotebookDiffModel([
+			['123456789', 'javascript', CellKind.Code, [], {}]
+		], [
+			['987654321', 'javascript', CellKind.Code, [], {}],
+		], async (model, disposables, accessor) => {
+			const diff = new LcsDiff(new CellSequence(model.original.notebook), new CellSequence(model.modified.notebook));
+			diffResult = diff.ComputeDiff(false);
+			assert.strictEqual(diffResult.changes.length, 1);
+			assert.deepStrictEqual(diffResult.changes.map(change => ({
+				originalStart: change.originalStart,
+				originalLength: change.originalLength,
+				modifiedStart: change.modifiedStart,
+				modifiedLength: change.modifiedLength
+			})), [{
+				originalStart: 0,
+				originalLength: 1,
+				modifiedStart: 0,
+				modifiedLength: 1
+			}]);
+
+			diffViewModel = disposables.add(new NotebookDiffViewModel(model, notebookEditorWorkerService, configurationService, eventDispatcher, accessor.get<INotebookService>(INotebookService), heightCalculator, undefined));
+			await diffViewModel.computeDiff(token);
+
+			assert.strictEqual(diffViewModel.items.length, 1);
+			assert.strictEqual(diffViewModel.items[0].type, 'modified');
+
+			await verifyChangeEventIsNotFired(diffViewModel);
+		});
+	});
+
+	test('diff test data single cell', async () => {
+		await withTestNotebookDiffModel([
+			[[
+				'# This version has a bug\n',
+				'def mult(a, b):\n',
+				'    return a / b'
+			].join(''), 'javascript', CellKind.Code, [], {}]
+		], [
+			[[
+				'def mult(a, b):\n',
+				'    \'This version is debugged.\'\n',
+				'    return a * b'
+			].join(''), 'javascript', CellKind.Code, [], {}],
+		], async (model, disposables, accessor) => {
+			const diff = new LcsDiff(new CellSequence(model.original.notebook), new CellSequence(model.modified.notebook));
+			diffResult = diff.ComputeDiff(false);
+			assert.strictEqual(diffResult.changes.length, 1);
+			assert.deepStrictEqual(diffResult.changes.map(change => ({
+				originalStart: change.originalStart,
+				originalLength: change.originalLength,
+				modifiedStart: change.modifiedStart,
+				modifiedLength: change.modifiedLength
+			})), [{
+				originalStart: 0,
+				originalLength: 1,
+				modifiedStart: 0,
+				modifiedLength: 1
+			}]);
+
+			diffViewModel = disposables.add(new NotebookDiffViewModel(model, notebookEditorWorkerService, configurationService, eventDispatcher, accessor.get<INotebookService>(INotebookService), heightCalculator, undefined));
+			await diffViewModel.computeDiff(token);
+
+			assert.strictEqual(diffViewModel.items.length, 1);
+			assert.strictEqual(diffViewModel.items[0].type, 'modified');
+
+			await verifyChangeEventIsNotFired(diffViewModel);
+		});
+	});
+
+	test('diff foo/foe', async () => {
+		await withTestNotebookDiffModel([
+			[['def foe(x, y):\n', '    return x + y\n', 'foe(3, 2)'].join(''), 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([6])) }] }], { metadata: { collapsed: false }, executionOrder: 5 }],
+			[['def foo(x, y):\n', '    return x * y\n', 'foo(1, 2)'].join(''), 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([2])) }] }], { metadata: { collapsed: false }, executionOrder: 6 }],
+			['', 'javascript', CellKind.Code, [], {}]
+		], [
+			[['def foo(x, y):\n', '    return x * y\n', 'foo(1, 2)'].join(''), 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([6])) }] }], { metadata: { collapsed: false }, executionOrder: 5 }],
+			[['def foe(x, y):\n', '    return x + y\n', 'foe(3, 2)'].join(''), 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([2])) }] }], { metadata: { collapsed: false }, executionOrder: 6 }],
+			['', 'javascript', CellKind.Code, [], {}]
+		], async (model, disposables, accessor) => {
+			const diff = new LcsDiff(new CellSequence(model.original.notebook), new CellSequence(model.modified.notebook));
+			diffResult = diff.ComputeDiff(false);
+
+			diffViewModel = disposables.add(new NotebookDiffViewModel(model, notebookEditorWorkerService, configurationService, eventDispatcher, accessor.get<INotebookService>(INotebookService), heightCalculator, undefined));
+			let eventArgs: INotebookDiffViewModelUpdateEvent | undefined = undefined;
+			disposables.add(diffViewModel.onDidChangeItems(e => eventArgs = e));
+			await diffViewModel.computeDiff(token);
+
+			assert.strictEqual(diffViewModel.items.length, 3);
+			assert.strictEqual(diffViewModel.items[0].type, 'modified');
+			assert.strictEqual(diffViewModel.items[1].type, 'modified');
+			assert.strictEqual(diffViewModel.items[2].type, 'placeholder');
+			diffViewModel.items[2].showHiddenCells();
+			assert.strictEqual(diffViewModel.items[2].type, 'unchanged');
+			assert.deepStrictEqual(eventArgs, { start: 2, deleteCount: 1, elements: [diffViewModel.items[2]] });
+
+			await verifyChangeEventIsNotFired(diffViewModel);
+		});
+	});
+
+	test('diff markdown', async () => {
+		await withTestNotebookDiffModel([
+			['This is a test notebook with only markdown cells', 'markdown', CellKind.Markup, [], {}],
+			['Lorem ipsum dolor sit amet', 'markdown', CellKind.Markup, [], {}],
+			['In other news', 'markdown', CellKind.Markup, [], {}],
+		], [
+			['This is a test notebook with markdown cells only', 'markdown', CellKind.Markup, [], {}],
+			['Lorem ipsum dolor sit amet', 'markdown', CellKind.Markup, [], {}],
+			['In the news', 'markdown', CellKind.Markup, [], {}],
+		], async (model, disposables, accessor) => {
+			const diff = new LcsDiff(new CellSequence(model.original.notebook), new CellSequence(model.modified.notebook));
+			diffResult = diff.ComputeDiff(false);
+
+			diffViewModel = disposables.add(new NotebookDiffViewModel(model, notebookEditorWorkerService, configurationService, eventDispatcher, accessor.get<INotebookService>(INotebookService), heightCalculator, undefined));
+			let eventArgs: INotebookDiffViewModelUpdateEvent | undefined = undefined;
+			disposables.add(diffViewModel.onDidChangeItems(e => eventArgs = e));
+			await diffViewModel.computeDiff(token);
+
+			assert.strictEqual(diffViewModel.items.length, 3);
+			assert.strictEqual(diffViewModel.items[0].type, 'modified');
+			assert.strictEqual(diffViewModel.items[1].type, 'placeholder');
+			assert.strictEqual(diffViewModel.items[2].type, 'modified');
+
+			diffViewModel.items[1].showHiddenCells();
+			assert.strictEqual(diffViewModel.items[1].type, 'unchanged');
+			assert.deepStrictEqual(eventArgs, { start: 1, deleteCount: 1, elements: [diffViewModel.items[1]] });
+
+			await verifyChangeEventIsNotFired(diffViewModel);
+
+		});
+	});
+
+	test('diff insert', async () => {
+		await withTestNotebookDiffModel([
+			['var a = 1;', 'javascript', CellKind.Code, [], {}],
+			['var b = 2;', 'javascript', CellKind.Code, [], {}]
+		], [
+			['var h = 8;', 'javascript', CellKind.Code, [], {}],
+			['var a = 1;', 'javascript', CellKind.Code, [], {}],
+			['var b = 2;', 'javascript', CellKind.Code, [], {}]
+		], async (model, disposables, accessor) => {
+			diffResult = {
+				changes: [{
+					originalStart: 0,
+					originalLength: 0,
+					modifiedStart: 0,
+					modifiedLength: 1
+				}],
+				quitEarly: false
+			};
+
+			diffViewModel = disposables.add(new NotebookDiffViewModel(model, notebookEditorWorkerService, configurationService, eventDispatcher, accessor.get<INotebookService>(INotebookService), heightCalculator, undefined));
+			let eventArgs: INotebookDiffViewModelUpdateEvent | undefined;
+			disposables.add(diffViewModel.onDidChangeItems(e => eventArgs = e));
+			await diffViewModel.computeDiff(token);
+
+			assert.strictEqual(eventArgs?.firstChangeIndex, 0);
+			assert.strictEqual(diffViewModel.items[0].type, 'insert');
+			assert.strictEqual(diffViewModel.items[1].type, 'placeholder');
+
+			diffViewModel.items[1].showHiddenCells();
+			assert.strictEqual(diffViewModel.items[1].type, 'unchanged');
+			assert.strictEqual(diffViewModel.items[2].type, 'unchanged');
+			assert.deepStrictEqual(eventArgs, { start: 1, deleteCount: 1, elements: [diffViewModel.items[1], diffViewModel.items[2]] });
+
+			await verifyChangeEventIsNotFired(diffViewModel);
+		});
+	});
+
+	test('diff insert 2', async () => {
+
+		await withTestNotebookDiffModel([
+			['var a = 1;', 'javascript', CellKind.Code, [], {}],
+			['var b = 2;', 'javascript', CellKind.Code, [], {}],
+			['var c = 3;', 'javascript', CellKind.Code, [], {}],
+			['var d = 4;', 'javascript', CellKind.Code, [], {}],
+			['var e = 5;', 'javascript', CellKind.Code, [], {}],
+			['var f = 6;', 'javascript', CellKind.Code, [], {}],
+			['var g = 7;', 'javascript', CellKind.Code, [], {}],
+		], [
+			['var h = 8;', 'javascript', CellKind.Code, [], {}],
+			['var a = 1;', 'javascript', CellKind.Code, [], {}],
+			['var b = 2;', 'javascript', CellKind.Code, [], {}],
+			['var c = 3;', 'javascript', CellKind.Code, [], {}],
+			['var d = 4;', 'javascript', CellKind.Code, [], {}],
+			['var e = 5;', 'javascript', CellKind.Code, [], {}],
+			['var f = 6;', 'javascript', CellKind.Code, [], {}],
+			['var g = 7;', 'javascript', CellKind.Code, [], {}],
+		], async (model, disposables, accessor) => {
+			const eventDispatcher = disposables.add(new NotebookDiffEditorEventDispatcher());
+			diffResult = {
+				changes: [{
+					originalStart: 0,
+					originalLength: 0,
+					modifiedStart: 0,
+					modifiedLength: 1
+				}, {
+					originalStart: 0,
+					originalLength: 6,
+					modifiedStart: 1,
+					modifiedLength: 6
+				}],
+				quitEarly: false
+			};
+
+			diffViewModel = disposables.add(new NotebookDiffViewModel(model, notebookEditorWorkerService, configurationService, eventDispatcher, accessor.get<INotebookService>(INotebookService), heightCalculator, undefined));
+			let eventArgs: INotebookDiffViewModelUpdateEvent | undefined;
+			disposables.add(diffViewModel.onDidChangeItems(e => eventArgs = e));
+			await diffViewModel.computeDiff(token);
+
+			assert.strictEqual(eventArgs?.firstChangeIndex, 0);
+			assert.strictEqual(diffViewModel.items.length, 2);
+			assert.strictEqual(diffViewModel.items[0].type, 'insert');
+			assert.strictEqual(diffViewModel.items[1].type, 'placeholder');
+
+			diffViewModel.items[1].showHiddenCells();
+			assert.strictEqual(diffViewModel.items[1].type, 'unchanged');
+			assert.strictEqual(diffViewModel.items[2].type, 'unchanged');
+			assert.strictEqual(diffViewModel.items[3].type, 'unchanged');
+			assert.strictEqual(diffViewModel.items[4].type, 'unchanged');
+			assert.strictEqual(diffViewModel.items[5].type, 'unchanged');
+			assert.strictEqual(diffViewModel.items[6].type, 'unchanged');
+			assert.strictEqual(diffViewModel.items[7].type, 'unchanged');
+			assert.deepStrictEqual(eventArgs, { start: 1, deleteCount: 1, elements: diffViewModel.items.slice(1) });
+
+
+			(diffViewModel.items[1] as unknown as SideBySideDiffElementViewModel).hideUnchangedCells();
+
+			assert.strictEqual(diffViewModel.items.length, 2);
+			assert.strictEqual(diffViewModel.items[0].type, 'insert');
+			assert.strictEqual((diffViewModel.items[1] as IDiffElementViewModelBase).type, 'placeholder');
+			assert.deepStrictEqual(eventArgs, { start: 1, deleteCount: 7, elements: [diffViewModel.items[1]] });
+
+			await verifyChangeEventIsNotFired(diffViewModel);
+		});
+	});
+
+	test('diff insert 3', async () => {
+
+		await withTestNotebookDiffModel([
+			['var a = 1;', 'javascript', CellKind.Code, [], {}],
+			['var b = 2;', 'javascript', CellKind.Code, [], {}],
+			['var c = 3;', 'javascript', CellKind.Code, [], {}],
+			['var d = 4;', 'javascript', CellKind.Code, [], {}],
+			['var e = 5;', 'javascript', CellKind.Code, [], {}],
+			['var f = 6;', 'javascript', CellKind.Code, [], {}],
+			['var g = 7;', 'javascript', CellKind.Code, [], {}],
+		], [
+			['var a = 1;', 'javascript', CellKind.Code, [], {}],
+			['var b = 2;', 'javascript', CellKind.Code, [], {}],
+			['var c = 3;', 'javascript', CellKind.Code, [], {}],
+			['var d = 4;', 'javascript', CellKind.Code, [], {}],
+			['var h = 8;', 'javascript', CellKind.Code, [], {}],
+			['var e = 5;', 'javascript', CellKind.Code, [], {}],
+			['var f = 6;', 'javascript', CellKind.Code, [], {}],
+			['var g = 7;', 'javascript', CellKind.Code, [], {}],
+		], async (model, disposables, accessor) => {
+			diffResult = {
+				changes: [{
+					originalStart: 4,
+					originalLength: 0,
+					modifiedStart: 4,
+					modifiedLength: 1
+				}],
+				quitEarly: false
+			};
+
+			diffViewModel = disposables.add(new NotebookDiffViewModel(model, notebookEditorWorkerService, configurationService, eventDispatcher, accessor.get<INotebookService>(INotebookService), heightCalculator, undefined));
+			let eventArgs: INotebookDiffViewModelUpdateEvent | undefined = undefined;
+			disposables.add(diffViewModel.onDidChangeItems(e => eventArgs = e));
+			await diffViewModel.computeDiff(token);
+
+			assert.strictEqual(diffViewModel.items[0].type, 'placeholder');
+			assert.strictEqual(diffViewModel.items[1].type, 'insert');
+			assert.strictEqual(diffViewModel.items[2].type, 'placeholder');
+
+			diffViewModel.items[0].showHiddenCells();
+			assert.strictEqual(diffViewModel.items[0].type, 'unchanged');
+			assert.strictEqual(diffViewModel.items[1].type, 'unchanged');
+			assert.strictEqual(diffViewModel.items[2].type, 'unchanged');
+			assert.strictEqual(diffViewModel.items[3].type, 'unchanged');
+			assert.strictEqual(diffViewModel.items[4].type, 'insert');
+			assert.strictEqual(diffViewModel.items[5].type, 'placeholder');
+			assert.deepStrictEqual(eventArgs, { start: 0, deleteCount: 1, elements: diffViewModel.items.slice(0, 4) });
+
+			diffViewModel.items[5].showHiddenCells();
+			assert.strictEqual((diffViewModel.items[0] as IDiffElementViewModelBase).type, 'unchanged');
+			assert.strictEqual(diffViewModel.items[1].type, 'unchanged');
+			assert.strictEqual((diffViewModel.items[2] as IDiffElementViewModelBase).type, 'unchanged');
+			assert.strictEqual(diffViewModel.items[3].type, 'unchanged');
+			assert.strictEqual(diffViewModel.items[4].type, 'insert');
+			assert.strictEqual(diffViewModel.items[5].type, 'unchanged');
+			assert.deepStrictEqual(eventArgs, { start: 5, deleteCount: 1, elements: diffViewModel.items.slice(5) });
+
+			(diffViewModel.items[0] as SideBySideDiffElementViewModel).hideUnchangedCells();
+			assert.strictEqual((diffViewModel.items[0] as IDiffElementViewModelBase).type, 'placeholder');
+			assert.strictEqual(diffViewModel.items[1].type, 'insert');
+			assert.strictEqual((diffViewModel.items[2] as IDiffElementViewModelBase).type, 'unchanged');
+			assert.deepStrictEqual(eventArgs, { start: 0, deleteCount: 4, elements: diffViewModel.items.slice(0, 1) });
+
+			await verifyChangeEventIsNotFired(diffViewModel);
+
+		});
+	});
+
+	test('LCS', async () => {
+		await withTestNotebookDiffModel([
+			['# Description', 'markdown', CellKind.Markup, [], { metadata: {} }],
+			['x = 3', 'javascript', CellKind.Code, [], { metadata: { collapsed: true }, executionOrder: 1 }],
+			['x', 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 1 }],
+			['x', 'javascript', CellKind.Code, [], { metadata: { collapsed: false } }]
+		], [
+			['# Description', 'markdown', CellKind.Markup, [], { metadata: {} }],
+			['x = 3', 'javascript', CellKind.Code, [], { metadata: { collapsed: true }, executionOrder: 1 }],
+			['x', 'javascript', CellKind.Code, [], { metadata: { collapsed: false } }],
+			['x', 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 1 }]
+		], async (model) => {
+			const diff = new LcsDiff(new CellSequence(model.original.notebook), new CellSequence(model.modified.notebook));
+			const diffResult = diff.ComputeDiff(false);
+			assert.deepStrictEqual(diffResult.changes.map(change => ({
+				originalStart: change.originalStart,
+				originalLength: change.originalLength,
+				modifiedStart: change.modifiedStart,
+				modifiedLength: change.modifiedLength
+			})), [{
+				originalStart: 2,
+				originalLength: 0,
+				modifiedStart: 2,
+				modifiedLength: 1
+			}, {
+				originalStart: 3,
+				originalLength: 1,
+				modifiedStart: 4,
+				modifiedLength: 0
+			}]);
+		});
+	});
+
+	test('LCS 2', async () => {
+		await withTestNotebookDiffModel([
+			['# Description', 'markdown', CellKind.Markup, [], { metadata: {} }],
+			['x = 3', 'javascript', CellKind.Code, [], { metadata: { collapsed: true }, executionOrder: 1 }],
+			['x', 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 1 }],
+			['x', 'javascript', CellKind.Code, [], { metadata: { collapsed: false } }],
+			['x = 5', 'javascript', CellKind.Code, [], {}],
+			['x', 'javascript', CellKind.Code, [], {}],
+			['x', 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([5])) }] }], {}],
+		], [
+			['# Description', 'markdown', CellKind.Markup, [], { metadata: {} }],
+			['x = 3', 'javascript', CellKind.Code, [], { metadata: { collapsed: true }, executionOrder: 1 }],
+			['x', 'javascript', CellKind.Code, [], { metadata: { collapsed: false } }],
+			['x', 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 1 }],
+			['x = 5', 'javascript', CellKind.Code, [], {}],
+			['x', 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([5])) }] }], {}],
+			['x', 'javascript', CellKind.Code, [], {}],
+		], async (model) => {
+			const diff = new LcsDiff(new CellSequence(model.original.notebook), new CellSequence(model.modified.notebook));
+			const diffResult = diff.ComputeDiff(false);
+			prettyChanges(model, diffResult);
+
+			assert.deepStrictEqual(diffResult.changes.map(change => ({
+				originalStart: change.originalStart,
+				originalLength: change.originalLength,
+				modifiedStart: change.modifiedStart,
+				modifiedLength: change.modifiedLength
+			})), [{
+				originalStart: 2,
+				originalLength: 0,
+				modifiedStart: 2,
+				modifiedLength: 1
+			}, {
+				originalStart: 3,
+				originalLength: 1,
+				modifiedStart: 4,
+				modifiedLength: 0
+			}, {
+				originalStart: 5,
+				originalLength: 0,
+				modifiedStart: 5,
+				modifiedLength: 1
+			}, {
+				originalStart: 6,
+				originalLength: 1,
+				modifiedStart: 7,
+				modifiedLength: 0
+			}]);
+		});
+	});
+
+	test('LCS 3', async () => {
+		await withTestNotebookDiffModel([
+			['var a = 1;', 'javascript', CellKind.Code, [], {}],
+			['var b = 2;', 'javascript', CellKind.Code, [], {}],
+			['var c = 3;', 'javascript', CellKind.Code, [], {}],
+			['var d = 4;', 'javascript', CellKind.Code, [], {}],
+			['var e = 5;', 'javascript', CellKind.Code, [], {}],
+			['var f = 6;', 'javascript', CellKind.Code, [], {}],
+			['var g = 7;', 'javascript', CellKind.Code, [], {}],
+		], [
+			['var a = 1;', 'javascript', CellKind.Code, [], {}],
+			['var b = 2;', 'javascript', CellKind.Code, [], {}],
+			['var c = 3;', 'javascript', CellKind.Code, [], {}],
+			['var d = 4;', 'javascript', CellKind.Code, [], {}],
+			['var h = 8;', 'javascript', CellKind.Code, [], {}],
+			['var e = 5;', 'javascript', CellKind.Code, [], {}],
+			['var f = 6;', 'javascript', CellKind.Code, [], {}],
+			['var g = 7;', 'javascript', CellKind.Code, [], {}],
+		], async (model) => {
+			const diff = new LcsDiff(new CellSequence(model.original.notebook), new CellSequence(model.modified.notebook));
+			const diffResult = diff.ComputeDiff(false);
+			prettyChanges(model, diffResult);
+
+			assert.deepStrictEqual(diffResult.changes.map(change => ({
+				originalStart: change.originalStart,
+				originalLength: change.originalLength,
+				modifiedStart: change.modifiedStart,
+				modifiedLength: change.modifiedLength
+			})), [{
+				originalStart: 4,
+				originalLength: 0,
+				modifiedStart: 4,
+				modifiedLength: 1
+			}]);
+		});
+	});
+
+	test('diff output', async () => {
+		await withTestNotebookDiffModel([
+			['x', 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
+			['y', 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([4])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
+		], [
+			['x', 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
+			['y', 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([5])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
+		], async (model, disposables, accessor) => {
+			const diff = new LcsDiff(new CellSequence(model.original.notebook), new CellSequence(model.modified.notebook));
+			diffResult = diff.ComputeDiff(false);
+
+			diffViewModel = disposables.add(new NotebookDiffViewModel(model, notebookEditorWorkerService, configurationService, eventDispatcher, accessor.get<INotebookService>(INotebookService), heightCalculator, undefined));
+			await diffViewModel.computeDiff(token);
+
+			assert.strictEqual(diffViewModel.items.length, 2);
+			assert.strictEqual(diffViewModel.items[0].type, 'placeholder');
+			diffViewModel.items[0].showHiddenCells();
+			assert.strictEqual((diffViewModel.items[0] as unknown as SideBySideDiffElementViewModel).checkIfOutputsModified(), false);
+			assert.strictEqual(diffViewModel.items[1].type, 'modified');
+
+			await verifyChangeEventIsNotFired(diffViewModel);
+		});
+	});
+
+	test('diff output fast check', async () => {
+		await withTestNotebookDiffModel([
+			['x', 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
+			['y', 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([4])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
+		], [
+			['x', 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
+			['y', 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([5])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
+		], async (model, disposables, accessor) => {
+			const diff = new LcsDiff(new CellSequence(model.original.notebook), new CellSequence(model.modified.notebook));
+			diffResult = diff.ComputeDiff(false);
+
+			diffViewModel = disposables.add(new NotebookDiffViewModel(model, notebookEditorWorkerService, configurationService, eventDispatcher, accessor.get<INotebookService>(INotebookService), heightCalculator, undefined));
+			await diffViewModel.computeDiff(token);
+
+			assert.strictEqual(diffViewModel.items.length, 2);
+			assert.strictEqual(diffViewModel.items[0].type, 'placeholder');
+			diffViewModel.items[0].showHiddenCells();
+			assert.strictEqual((diffViewModel.items[0] as unknown as SideBySideDiffElementViewModel).original!.textModel.equal((diffViewModel.items[0] as any).modified!.textModel), true);
+			assert.strictEqual((diffViewModel.items[1] as any).original!.textModel.equal((diffViewModel.items[1] as any).modified!.textModel), false);
+
+			await verifyChangeEventIsNotFired(diffViewModel);
+		});
+	});
+});
diff --git a/src/vs/workbench/contrib/notebook/test/browser/notebookBrowser.test.ts b/src/vs/workbench/contrib/notebook/test/browser/notebookBrowser.test.ts
index dedeec1068b..d3a529f23e2 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/notebookBrowser.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/notebookBrowser.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ICellViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { ICellViewModel } from '../../browser/notebookBrowser.js';
+import { CellKind } from '../../common/notebookCommon.js';
+import { ICellRange } from '../../common/notebookRange.js';
 
 /**
  * Return a set of ranges for the cells matching the given predicate
diff --git a/src/vs/workbench/contrib/notebook/test/browser/notebookCellAnchor.test.ts b/src/vs/workbench/contrib/notebook/test/browser/notebookCellAnchor.test.ts
index b2dfc2be7ff..1d85ae69f2c 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/notebookCellAnchor.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/notebookCellAnchor.test.ts
@@ -4,16 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ScrollEvent } from 'vs/base/common/scrollable';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { CellFocusMode } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NotebookCellAnchor } from 'vs/workbench/contrib/notebook/browser/view/notebookCellAnchor';
-import { Emitter } from 'vs/base/common/event';
-import { INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
-import { CellKind, NotebookCellExecutionState, NotebookSetting } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { CodeCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IListView } from 'vs/base/browser/ui/list/listView';
+import { ScrollEvent } from '../../../../../base/common/scrollable.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { CellFocusMode } from '../../browser/notebookBrowser.js';
+import { NotebookCellAnchor } from '../../browser/view/notebookCellAnchor.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { INotebookExecutionStateService } from '../../common/notebookExecutionStateService.js';
+import { CellKind, NotebookCellExecutionState, NotebookSetting } from '../../common/notebookCommon.js';
+import { CodeCellViewModel } from '../../browser/viewModel/codeCellViewModel.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IListView } from '../../../../../base/browser/ui/list/listView.js';
 
 
 suite('NotebookCellAnchor', () => {
diff --git a/src/vs/workbench/contrib/notebook/test/browser/notebookCellList.test.ts b/src/vs/workbench/contrib/notebook/test/browser/notebookCellList.test.ts
index f62c916928e..f05c1cd57b2 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/notebookCellList.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/notebookCellList.test.ts
@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { CellKind, NotebookSetting } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { createNotebookCellList, setupInstantiationService, withTestNotebook } from 'vs/workbench/contrib/notebook/test/browser/testNotebookEditor';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { CellKind, NotebookSetting } from '../../common/notebookCommon.js';
+import { createNotebookCellList, setupInstantiationService, withTestNotebook } from './testNotebookEditor.js';
 
 suite('NotebookCellList', () => {
 	let testDisposables: DisposableStore;
diff --git a/src/vs/workbench/contrib/notebook/test/browser/notebookCommon.test.ts b/src/vs/workbench/contrib/notebook/test/browser/notebookCommon.test.ts
index d0c5bc4bd91..a5c1637df4c 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/notebookCommon.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/notebookCommon.test.ts
@@ -4,15 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { Mimes } from 'vs/base/common/mime';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { CellKind, CellUri, diff, MimeTypeDisplayOrder, NotebookWorkingCopyTypeIdentifier } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { cellIndexesToRanges, cellRangesToIndexes, reduceCellRanges } from 'vs/workbench/contrib/notebook/common/notebookRange';
-import { setupInstantiationService, TestCell } from 'vs/workbench/contrib/notebook/test/browser/testNotebookEditor';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { Mimes } from '../../../../../base/common/mime.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { CellKind, CellUri, diff, MimeTypeDisplayOrder, NotebookWorkingCopyTypeIdentifier } from '../../common/notebookCommon.js';
+import { cellIndexesToRanges, cellRangesToIndexes, reduceCellRanges } from '../../common/notebookRange.js';
+import { setupInstantiationService, TestCell } from './testNotebookEditor.js';
 
 suite('NotebookCommon', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
@@ -410,10 +410,17 @@ suite('CellRange', function () {
 suite('NotebookWorkingCopyTypeIdentifier', function () {
 	ensureNoDisposablesAreLeakedInTestSuite();
 
-	test('works', function () {
+	test('supports notebook type only', function () {
 		const viewType = 'testViewType';
-		const type = NotebookWorkingCopyTypeIdentifier.create('testViewType');
-		assert.strictEqual(NotebookWorkingCopyTypeIdentifier.parse(type), viewType);
+		const type = NotebookWorkingCopyTypeIdentifier.create(viewType);
+		assert.deepEqual(NotebookWorkingCopyTypeIdentifier.parse(type), { notebookType: viewType, viewType });
+		assert.strictEqual(NotebookWorkingCopyTypeIdentifier.parse('something'), undefined);
+	});
+
+	test('supports different viewtype', function () {
+		const notebookType = { notebookType: 'testNotebookType', viewType: 'testViewType' };
+		const type = NotebookWorkingCopyTypeIdentifier.create(notebookType.notebookType, notebookType.viewType);
+		assert.deepEqual(NotebookWorkingCopyTypeIdentifier.parse(type), notebookType);
 		assert.strictEqual(NotebookWorkingCopyTypeIdentifier.parse('something'), undefined);
 	});
 });
diff --git a/src/vs/workbench/contrib/notebook/test/browser/notebookDiff.test.ts b/src/vs/workbench/contrib/notebook/test/browser/notebookDiff.test.ts
deleted file mode 100644
index f2bb130dba9..00000000000
--- a/src/vs/workbench/contrib/notebook/test/browser/notebookDiff.test.ts
+++ /dev/null
@@ -1,584 +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 assert from 'assert';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { ISequence, LcsDiff } from 'vs/base/common/diff/diff';
-import { Mimes } from 'vs/base/common/mime';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { NotebookDiffEditorEventDispatcher } from 'vs/workbench/contrib/notebook/browser/diff/eventDispatcher';
-import { NotebookTextDiffEditor } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor';
-import { CellKind, INotebookTextModel } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { withTestNotebookDiffModel } from 'vs/workbench/contrib/notebook/test/browser/testNotebookEditor';
-
-class CellSequence implements ISequence {
-
-	constructor(readonly textModel: INotebookTextModel) {
-	}
-
-	getElements(): string[] | number[] | Int32Array {
-		const hashValue = new Int32Array(this.textModel.cells.length);
-		for (let i = 0; i < this.textModel.cells.length; i++) {
-			hashValue[i] = this.textModel.cells[i].getHashValue();
-		}
-
-		return hashValue;
-	}
-}
-
-suite('NotebookCommon', () => {
-	const configurationService = new TestConfigurationService();
-	ensureNoDisposablesAreLeakedInTestSuite();
-
-	test('diff different source', async () => {
-		await withTestNotebookDiffModel([
-			['x', 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
-		], [
-			['y', 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
-		], (model, disposables, accessor) => {
-			const diff = new LcsDiff(new CellSequence(model.original.notebook), new CellSequence(model.modified.notebook));
-			const diffResult = diff.ComputeDiff(false);
-			assert.strictEqual(diffResult.changes.length, 1);
-			assert.deepStrictEqual(diffResult.changes.map(change => ({
-				originalStart: change.originalStart,
-				originalLength: change.originalLength,
-				modifiedStart: change.modifiedStart,
-				modifiedLength: change.modifiedLength
-			})), [{
-				originalStart: 0,
-				originalLength: 1,
-				modifiedStart: 0,
-				modifiedLength: 1
-			}]);
-
-			const eventDispatcher = disposables.add(new NotebookDiffEditorEventDispatcher());
-			const diffViewModels = NotebookTextDiffEditor.computeDiff(accessor, configurationService, model, eventDispatcher, {
-				cellsDiff: diffResult
-			}, undefined);
-			assert.strictEqual(diffViewModels.viewModels.length, 1);
-			assert.strictEqual(diffViewModels.viewModels[0].type, 'modified');
-			diffViewModels.viewModels.forEach(vm => {
-				vm.original?.dispose();
-				vm.modified?.dispose();
-				vm.dispose();
-			});
-			model.original.notebook.dispose();
-			model.modified.notebook.dispose();
-		});
-	});
-
-	test('diff different output', async () => {
-		await withTestNotebookDiffModel([
-			['x', 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([5])) }] }], { metadata: { collapsed: false }, executionOrder: 5 }],
-			['', 'javascript', CellKind.Code, [], {}]
-		], [
-			['x', 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
-			['', 'javascript', CellKind.Code, [], {}]
-		], (model, disposables, accessor) => {
-			const diff = new LcsDiff(new CellSequence(model.original.notebook), new CellSequence(model.modified.notebook));
-			const diffResult = diff.ComputeDiff(false);
-			assert.strictEqual(diffResult.changes.length, 1);
-			assert.deepStrictEqual(diffResult.changes.map(change => ({
-				originalStart: change.originalStart,
-				originalLength: change.originalLength,
-				modifiedStart: change.modifiedStart,
-				modifiedLength: change.modifiedLength
-			})), [{
-				originalStart: 0,
-				originalLength: 1,
-				modifiedStart: 0,
-				modifiedLength: 1
-			}]);
-
-			const eventDispatcher = disposables.add(new NotebookDiffEditorEventDispatcher());
-			const diffViewModels = NotebookTextDiffEditor.computeDiff(accessor, configurationService, model, eventDispatcher, {
-				cellsDiff: diffResult
-			}, undefined);
-			assert.strictEqual(diffViewModels.viewModels.length, 2);
-			assert.strictEqual(diffViewModels.viewModels[0].type, 'modified');
-			assert.strictEqual(diffViewModels.viewModels[1].type, 'unchanged');
-
-			diffViewModels.viewModels.forEach(vm => {
-				vm.original?.dispose();
-				vm.modified?.dispose();
-				vm.dispose();
-			});
-			model.original.notebook.dispose();
-			model.modified.notebook.dispose();
-		});
-	});
-
-	test('diff test small source', async () => {
-		await withTestNotebookDiffModel([
-			['123456789', 'javascript', CellKind.Code, [], {}]
-		], [
-			['987654321', 'javascript', CellKind.Code, [], {}],
-		], (model, disposables, accessor) => {
-			const diff = new LcsDiff(new CellSequence(model.original.notebook), new CellSequence(model.modified.notebook));
-			const diffResult = diff.ComputeDiff(false);
-			assert.strictEqual(diffResult.changes.length, 1);
-			assert.deepStrictEqual(diffResult.changes.map(change => ({
-				originalStart: change.originalStart,
-				originalLength: change.originalLength,
-				modifiedStart: change.modifiedStart,
-				modifiedLength: change.modifiedLength
-			})), [{
-				originalStart: 0,
-				originalLength: 1,
-				modifiedStart: 0,
-				modifiedLength: 1
-			}]);
-
-			const eventDispatcher = disposables.add(new NotebookDiffEditorEventDispatcher());
-			const diffViewModels = NotebookTextDiffEditor.computeDiff(accessor, configurationService, model, eventDispatcher, {
-				cellsDiff: diffResult
-			}, undefined);
-			assert.strictEqual(diffViewModels.viewModels.length, 1);
-			assert.strictEqual(diffViewModels.viewModels[0].type, 'modified');
-
-			diffViewModels.viewModels.forEach(vm => {
-				vm.original?.dispose();
-				vm.modified?.dispose();
-				vm.dispose();
-			});
-			model.original.notebook.dispose();
-			model.modified.notebook.dispose();
-		});
-	});
-
-	test('diff test data single cell', async () => {
-		await withTestNotebookDiffModel([
-			[[
-				'# This version has a bug\n',
-				'def mult(a, b):\n',
-				'    return a / b'
-			].join(''), 'javascript', CellKind.Code, [], {}]
-		], [
-			[[
-				'def mult(a, b):\n',
-				'    \'This version is debugged.\'\n',
-				'    return a * b'
-			].join(''), 'javascript', CellKind.Code, [], {}],
-		], (model, disposables, accessor) => {
-			const diff = new LcsDiff(new CellSequence(model.original.notebook), new CellSequence(model.modified.notebook));
-			const diffResult = diff.ComputeDiff(false);
-			assert.strictEqual(diffResult.changes.length, 1);
-			assert.deepStrictEqual(diffResult.changes.map(change => ({
-				originalStart: change.originalStart,
-				originalLength: change.originalLength,
-				modifiedStart: change.modifiedStart,
-				modifiedLength: change.modifiedLength
-			})), [{
-				originalStart: 0,
-				originalLength: 1,
-				modifiedStart: 0,
-				modifiedLength: 1
-			}]);
-
-			const eventDispatcher = disposables.add(new NotebookDiffEditorEventDispatcher());
-			const diffViewModels = NotebookTextDiffEditor.computeDiff(accessor, configurationService, model, eventDispatcher, {
-				cellsDiff: diffResult
-			}, undefined);
-			assert.strictEqual(diffViewModels.viewModels.length, 1);
-			assert.strictEqual(diffViewModels.viewModels[0].type, 'modified');
-
-			diffViewModels.viewModels.forEach(vm => {
-				vm.original?.dispose();
-				vm.modified?.dispose();
-				vm.dispose();
-			});
-			model.original.notebook.dispose();
-			model.modified.notebook.dispose();
-		});
-	});
-
-	test('diff foo/foe', async () => {
-		await withTestNotebookDiffModel([
-			[['def foe(x, y):\n', '    return x + y\n', 'foe(3, 2)'].join(''), 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([6])) }] }], { metadata: { collapsed: false }, executionOrder: 5 }],
-			[['def foo(x, y):\n', '    return x * y\n', 'foo(1, 2)'].join(''), 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([2])) }] }], { metadata: { collapsed: false }, executionOrder: 6 }],
-			['', 'javascript', CellKind.Code, [], {}]
-		], [
-			[['def foo(x, y):\n', '    return x * y\n', 'foo(1, 2)'].join(''), 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([6])) }] }], { metadata: { collapsed: false }, executionOrder: 5 }],
-			[['def foe(x, y):\n', '    return x + y\n', 'foe(3, 2)'].join(''), 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([2])) }] }], { metadata: { collapsed: false }, executionOrder: 6 }],
-			['', 'javascript', CellKind.Code, [], {}]
-		], (model, disposables, accessor) => {
-			const diff = new LcsDiff(new CellSequence(model.original.notebook), new CellSequence(model.modified.notebook));
-			const diffResult = diff.ComputeDiff(false);
-			const eventDispatcher = disposables.add(new NotebookDiffEditorEventDispatcher());
-			const diffViewModels = NotebookTextDiffEditor.computeDiff(accessor, configurationService, model, eventDispatcher, {
-				cellsDiff: diffResult
-			}, undefined);
-			assert.strictEqual(diffViewModels.viewModels.length, 3);
-			assert.strictEqual(diffViewModels.viewModels[0].type, 'modified');
-			assert.strictEqual(diffViewModels.viewModels[1].type, 'modified');
-			assert.strictEqual(diffViewModels.viewModels[2].type, 'unchanged');
-
-			diffViewModels.viewModels.forEach(vm => {
-				vm.original?.dispose();
-				vm.modified?.dispose();
-				vm.dispose();
-			});
-			model.original.notebook.dispose();
-			model.modified.notebook.dispose();
-		});
-	});
-
-	test('diff markdown', async () => {
-		await withTestNotebookDiffModel([
-			['This is a test notebook with only markdown cells', 'markdown', CellKind.Markup, [], {}],
-			['Lorem ipsum dolor sit amet', 'markdown', CellKind.Markup, [], {}],
-			['In other news', 'markdown', CellKind.Markup, [], {}],
-		], [
-			['This is a test notebook with markdown cells only', 'markdown', CellKind.Markup, [], {}],
-			['Lorem ipsum dolor sit amet', 'markdown', CellKind.Markup, [], {}],
-			['In the news', 'markdown', CellKind.Markup, [], {}],
-		], (model, disposables, accessor) => {
-			const diff = new LcsDiff(new CellSequence(model.original.notebook), new CellSequence(model.modified.notebook));
-			const diffResult = diff.ComputeDiff(false);
-			const eventDispatcher = disposables.add(new NotebookDiffEditorEventDispatcher());
-			const diffViewModels = NotebookTextDiffEditor.computeDiff(accessor, configurationService, model, eventDispatcher, {
-				cellsDiff: diffResult
-			}, undefined);
-			assert.strictEqual(diffViewModels.viewModels.length, 3);
-			assert.strictEqual(diffViewModels.viewModels[0].type, 'modified');
-			assert.strictEqual(diffViewModels.viewModels[1].type, 'unchanged');
-			assert.strictEqual(diffViewModels.viewModels[2].type, 'modified');
-
-			diffViewModels.viewModels.forEach(vm => {
-				vm.original?.dispose();
-				vm.modified?.dispose();
-				vm.dispose();
-			});
-			model.original.notebook.dispose();
-			model.modified.notebook.dispose();
-		});
-	});
-
-	test('diff insert', async () => {
-		await withTestNotebookDiffModel([
-			['var a = 1;', 'javascript', CellKind.Code, [], {}],
-			['var b = 2;', 'javascript', CellKind.Code, [], {}]
-		], [
-			['var h = 8;', 'javascript', CellKind.Code, [], {}],
-			['var a = 1;', 'javascript', CellKind.Code, [], {}],
-			['var b = 2;', 'javascript', CellKind.Code, [], {}]
-		], (model, disposables, accessor) => {
-			const eventDispatcher = disposables.add(new NotebookDiffEditorEventDispatcher());
-			const diffResult = NotebookTextDiffEditor.computeDiff(accessor, configurationService, model, eventDispatcher, {
-				cellsDiff: {
-					changes: [{
-						originalStart: 0,
-						originalLength: 0,
-						modifiedStart: 0,
-						modifiedLength: 1
-					}],
-					quitEarly: false
-				}
-			}, undefined);
-
-			assert.strictEqual(diffResult.firstChangeIndex, 0);
-			assert.strictEqual(diffResult.viewModels[0].type, 'insert');
-			assert.strictEqual(diffResult.viewModels[1].type, 'unchanged');
-			assert.strictEqual(diffResult.viewModels[2].type, 'unchanged');
-
-			diffResult.viewModels.forEach(vm => {
-				vm.original?.dispose();
-				vm.modified?.dispose();
-				vm.dispose();
-			});
-			model.original.notebook.dispose();
-			model.modified.notebook.dispose();
-		});
-	});
-
-	test('diff insert 2', async () => {
-
-		await withTestNotebookDiffModel([
-			['var a = 1;', 'javascript', CellKind.Code, [], {}],
-			['var b = 2;', 'javascript', CellKind.Code, [], {}],
-			['var c = 3;', 'javascript', CellKind.Code, [], {}],
-			['var d = 4;', 'javascript', CellKind.Code, [], {}],
-			['var e = 5;', 'javascript', CellKind.Code, [], {}],
-			['var f = 6;', 'javascript', CellKind.Code, [], {}],
-			['var g = 7;', 'javascript', CellKind.Code, [], {}],
-		], [
-			['var h = 8;', 'javascript', CellKind.Code, [], {}],
-			['var a = 1;', 'javascript', CellKind.Code, [], {}],
-			['var b = 2;', 'javascript', CellKind.Code, [], {}],
-			['var c = 3;', 'javascript', CellKind.Code, [], {}],
-			['var d = 4;', 'javascript', CellKind.Code, [], {}],
-			['var e = 5;', 'javascript', CellKind.Code, [], {}],
-			['var f = 6;', 'javascript', CellKind.Code, [], {}],
-			['var g = 7;', 'javascript', CellKind.Code, [], {}],
-		], async (model, disposables, accessor) => {
-			const eventDispatcher = disposables.add(new NotebookDiffEditorEventDispatcher());
-			const diffResult = NotebookTextDiffEditor.computeDiff(accessor, configurationService, model, eventDispatcher, {
-				cellsDiff: {
-					changes: [{
-						originalStart: 0,
-						originalLength: 0,
-						modifiedStart: 0,
-						modifiedLength: 1
-					}, {
-						originalStart: 0,
-						originalLength: 6,
-						modifiedStart: 1,
-						modifiedLength: 6
-					}],
-					quitEarly: false
-				}
-			}, undefined);
-
-			assert.strictEqual(diffResult.firstChangeIndex, 0);
-			assert.strictEqual(diffResult.viewModels[0].type, 'insert');
-			assert.strictEqual(diffResult.viewModels[1].type, 'unchanged');
-			assert.strictEqual(diffResult.viewModels[2].type, 'unchanged');
-			assert.strictEqual(diffResult.viewModels[3].type, 'unchanged');
-			assert.strictEqual(diffResult.viewModels[4].type, 'unchanged');
-			assert.strictEqual(diffResult.viewModels[5].type, 'unchanged');
-			assert.strictEqual(diffResult.viewModels[6].type, 'unchanged');
-			assert.strictEqual(diffResult.viewModels[7].type, 'unchanged');
-
-			diffResult.viewModels.forEach(vm => {
-				vm.original?.dispose();
-				vm.modified?.dispose();
-				vm.dispose();
-			});
-			model.original.notebook.dispose();
-			model.modified.notebook.dispose();
-		});
-	});
-
-	test('diff insert 3', async () => {
-
-		await withTestNotebookDiffModel([
-			['var a = 1;', 'javascript', CellKind.Code, [], {}],
-			['var b = 2;', 'javascript', CellKind.Code, [], {}],
-			['var c = 3;', 'javascript', CellKind.Code, [], {}],
-			['var d = 4;', 'javascript', CellKind.Code, [], {}],
-			['var e = 5;', 'javascript', CellKind.Code, [], {}],
-			['var f = 6;', 'javascript', CellKind.Code, [], {}],
-			['var g = 7;', 'javascript', CellKind.Code, [], {}],
-		], [
-			['var a = 1;', 'javascript', CellKind.Code, [], {}],
-			['var b = 2;', 'javascript', CellKind.Code, [], {}],
-			['var c = 3;', 'javascript', CellKind.Code, [], {}],
-			['var d = 4;', 'javascript', CellKind.Code, [], {}],
-			['var h = 8;', 'javascript', CellKind.Code, [], {}],
-			['var e = 5;', 'javascript', CellKind.Code, [], {}],
-			['var f = 6;', 'javascript', CellKind.Code, [], {}],
-			['var g = 7;', 'javascript', CellKind.Code, [], {}],
-		], async (model, disposables, accessor) => {
-			const eventDispatcher = disposables.add(new NotebookDiffEditorEventDispatcher());
-			const diffResult = NotebookTextDiffEditor.computeDiff(accessor, configurationService, model, eventDispatcher, {
-				cellsDiff: {
-					changes: [{
-						originalStart: 4,
-						originalLength: 0,
-						modifiedStart: 4,
-						modifiedLength: 1
-					}],
-					quitEarly: false
-				}
-			}, undefined);
-
-			// assert.strictEqual(diffResult.firstChangeIndex, 4);
-			assert.strictEqual(diffResult.viewModels[0].type, 'unchanged');
-			assert.strictEqual(diffResult.viewModels[1].type, 'unchanged');
-			assert.strictEqual(diffResult.viewModels[2].type, 'unchanged');
-			assert.strictEqual(diffResult.viewModels[3].type, 'unchanged');
-			assert.strictEqual(diffResult.viewModels[4].type, 'insert');
-			assert.strictEqual(diffResult.viewModels[5].type, 'unchanged');
-			assert.strictEqual(diffResult.viewModels[6].type, 'unchanged');
-			assert.strictEqual(diffResult.viewModels[7].type, 'unchanged');
-
-			diffResult.viewModels.forEach(vm => {
-				vm.original?.dispose();
-				vm.modified?.dispose();
-				vm.dispose();
-			});
-			model.original.notebook.dispose();
-			model.modified.notebook.dispose();
-		});
-	});
-
-	test('LCS', async () => {
-		await withTestNotebookDiffModel([
-			['# Description', 'markdown', CellKind.Markup, [], { metadata: {} }],
-			['x = 3', 'javascript', CellKind.Code, [], { metadata: { collapsed: true }, executionOrder: 1 }],
-			['x', 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 1 }],
-			['x', 'javascript', CellKind.Code, [], { metadata: { collapsed: false } }]
-		], [
-			['# Description', 'markdown', CellKind.Markup, [], { metadata: {} }],
-			['x = 3', 'javascript', CellKind.Code, [], { metadata: { collapsed: true }, executionOrder: 1 }],
-			['x', 'javascript', CellKind.Code, [], { metadata: { collapsed: false } }],
-			['x', 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 1 }]
-		], async (model) => {
-			const diff = new LcsDiff(new CellSequence(model.original.notebook), new CellSequence(model.modified.notebook));
-			const diffResult = diff.ComputeDiff(false);
-			assert.deepStrictEqual(diffResult.changes.map(change => ({
-				originalStart: change.originalStart,
-				originalLength: change.originalLength,
-				modifiedStart: change.modifiedStart,
-				modifiedLength: change.modifiedLength
-			})), [{
-				originalStart: 2,
-				originalLength: 0,
-				modifiedStart: 2,
-				modifiedLength: 1
-			}, {
-				originalStart: 3,
-				originalLength: 1,
-				modifiedStart: 4,
-				modifiedLength: 0
-			}]);
-		});
-	});
-
-	test('LCS 2', async () => {
-		await withTestNotebookDiffModel([
-			['# Description', 'markdown', CellKind.Markup, [], { metadata: {} }],
-			['x = 3', 'javascript', CellKind.Code, [], { metadata: { collapsed: true }, executionOrder: 1 }],
-			['x', 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 1 }],
-			['x', 'javascript', CellKind.Code, [], { metadata: { collapsed: false } }],
-			['x = 5', 'javascript', CellKind.Code, [], {}],
-			['x', 'javascript', CellKind.Code, [], {}],
-			['x', 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([5])) }] }], {}],
-		], [
-			['# Description', 'markdown', CellKind.Markup, [], { metadata: {} }],
-			['x = 3', 'javascript', CellKind.Code, [], { metadata: { collapsed: true }, executionOrder: 1 }],
-			['x', 'javascript', CellKind.Code, [], { metadata: { collapsed: false } }],
-			['x', 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 1 }],
-			['x = 5', 'javascript', CellKind.Code, [], {}],
-			['x', 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([5])) }] }], {}],
-			['x', 'javascript', CellKind.Code, [], {}],
-		], async (model) => {
-			const diff = new LcsDiff(new CellSequence(model.original.notebook), new CellSequence(model.modified.notebook));
-			const diffResult = diff.ComputeDiff(false);
-			NotebookTextDiffEditor.prettyChanges(model, diffResult);
-
-			assert.deepStrictEqual(diffResult.changes.map(change => ({
-				originalStart: change.originalStart,
-				originalLength: change.originalLength,
-				modifiedStart: change.modifiedStart,
-				modifiedLength: change.modifiedLength
-			})), [{
-				originalStart: 2,
-				originalLength: 0,
-				modifiedStart: 2,
-				modifiedLength: 1
-			}, {
-				originalStart: 3,
-				originalLength: 1,
-				modifiedStart: 4,
-				modifiedLength: 0
-			}, {
-				originalStart: 5,
-				originalLength: 0,
-				modifiedStart: 5,
-				modifiedLength: 1
-			}, {
-				originalStart: 6,
-				originalLength: 1,
-				modifiedStart: 7,
-				modifiedLength: 0
-			}]);
-		});
-	});
-
-	test('LCS 3', async () => {
-		await withTestNotebookDiffModel([
-			['var a = 1;', 'javascript', CellKind.Code, [], {}],
-			['var b = 2;', 'javascript', CellKind.Code, [], {}],
-			['var c = 3;', 'javascript', CellKind.Code, [], {}],
-			['var d = 4;', 'javascript', CellKind.Code, [], {}],
-			['var e = 5;', 'javascript', CellKind.Code, [], {}],
-			['var f = 6;', 'javascript', CellKind.Code, [], {}],
-			['var g = 7;', 'javascript', CellKind.Code, [], {}],
-		], [
-			['var a = 1;', 'javascript', CellKind.Code, [], {}],
-			['var b = 2;', 'javascript', CellKind.Code, [], {}],
-			['var c = 3;', 'javascript', CellKind.Code, [], {}],
-			['var d = 4;', 'javascript', CellKind.Code, [], {}],
-			['var h = 8;', 'javascript', CellKind.Code, [], {}],
-			['var e = 5;', 'javascript', CellKind.Code, [], {}],
-			['var f = 6;', 'javascript', CellKind.Code, [], {}],
-			['var g = 7;', 'javascript', CellKind.Code, [], {}],
-		], async (model) => {
-			const diff = new LcsDiff(new CellSequence(model.original.notebook), new CellSequence(model.modified.notebook));
-			const diffResult = diff.ComputeDiff(false);
-			NotebookTextDiffEditor.prettyChanges(model, diffResult);
-
-			assert.deepStrictEqual(diffResult.changes.map(change => ({
-				originalStart: change.originalStart,
-				originalLength: change.originalLength,
-				modifiedStart: change.modifiedStart,
-				modifiedLength: change.modifiedLength
-			})), [{
-				originalStart: 4,
-				originalLength: 0,
-				modifiedStart: 4,
-				modifiedLength: 1
-			}]);
-		});
-	});
-
-	test('diff output', async () => {
-		await withTestNotebookDiffModel([
-			['x', 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
-			['y', 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([4])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
-		], [
-			['x', 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
-			['y', 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([5])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
-		], (model, disposables, accessor) => {
-			const diff = new LcsDiff(new CellSequence(model.original.notebook), new CellSequence(model.modified.notebook));
-			const diffResult = diff.ComputeDiff(false);
-			const eventDispatcher = disposables.add(new NotebookDiffEditorEventDispatcher());
-			const diffViewModels = NotebookTextDiffEditor.computeDiff(accessor, configurationService, model, eventDispatcher, {
-				cellsDiff: diffResult
-			}, undefined);
-			assert.strictEqual(diffViewModels.viewModels.length, 2);
-			assert.strictEqual(diffViewModels.viewModels[0].type, 'unchanged');
-			assert.strictEqual(diffViewModels.viewModels[0].checkIfOutputsModified(), false);
-			assert.strictEqual(diffViewModels.viewModels[1].type, 'modified');
-
-			diffViewModels.viewModels.forEach(vm => {
-				vm.original?.dispose();
-				vm.modified?.dispose();
-				vm.dispose();
-			});
-			model.original.notebook.dispose();
-			model.modified.notebook.dispose();
-		});
-	});
-
-	test('diff output fast check', async () => {
-		await withTestNotebookDiffModel([
-			['x', 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
-			['y', 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([4])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
-		], [
-			['x', 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
-			['y', 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([5])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
-		], (model, disposables, accessor) => {
-			const diff = new LcsDiff(new CellSequence(model.original.notebook), new CellSequence(model.modified.notebook));
-			const diffResult = diff.ComputeDiff(false);
-			const eventDispatcher = disposables.add(new NotebookDiffEditorEventDispatcher());
-			const diffViewModels = NotebookTextDiffEditor.computeDiff(accessor, configurationService, model, eventDispatcher, {
-				cellsDiff: diffResult
-			}, undefined);
-			assert.strictEqual(diffViewModels.viewModels.length, 2);
-			assert.strictEqual(diffViewModels.viewModels[0].original!.textModel.equal(diffViewModels.viewModels[0].modified!.textModel), true);
-			assert.strictEqual(diffViewModels.viewModels[1].original!.textModel.equal(diffViewModels.viewModels[1].modified!.textModel), false);
-			diffViewModels.viewModels.forEach(vm => {
-				vm.original?.dispose();
-				vm.modified?.dispose();
-				vm.dispose();
-			});
-			model.original.notebook.dispose();
-			model.modified.notebook.dispose();
-		});
-	});
-});
diff --git a/src/vs/workbench/contrib/notebook/test/browser/notebookEditor.test.ts b/src/vs/workbench/contrib/notebook/test/browser/notebookEditor.test.ts
index 8bfdf049701..b5b894eb2cb 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/notebookEditor.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/notebookEditor.test.ts
@@ -4,15 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { mock } from 'vs/base/test/common/mock';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { FoldingModel, updateFoldingStateAtIndex } from 'vs/workbench/contrib/notebook/browser/viewModel/foldingModel';
-import { expandCellRangesWithHiddenCells, INotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { createNotebookCellList, setupInstantiationService, withTestNotebook } from 'vs/workbench/contrib/notebook/test/browser/testNotebookEditor';
-import { ListViewInfoAccessor } from 'vs/workbench/contrib/notebook/browser/view/notebookCellList';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import { mock } from '../../../../../base/test/common/mock.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { FoldingModel, updateFoldingStateAtIndex } from '../../browser/viewModel/foldingModel.js';
+import { expandCellRangesWithHiddenCells, INotebookEditor } from '../../browser/notebookBrowser.js';
+import { CellKind } from '../../common/notebookCommon.js';
+import { createNotebookCellList, setupInstantiationService, withTestNotebook } from './testNotebookEditor.js';
+import { ListViewInfoAccessor } from '../../browser/view/notebookCellList.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
 
 suite('ListViewInfoAccessor', () => {
 	let disposables: DisposableStore;
diff --git a/src/vs/workbench/contrib/notebook/test/browser/notebookEditorModel.test.ts b/src/vs/workbench/contrib/notebook/test/browser/notebookEditorModel.test.ts
index a7849fd7319..48f4e9a231a 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/notebookEditorModel.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/notebookEditorModel.test.ts
@@ -4,25 +4,25 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { Mimes } from 'vs/base/common/mime';
-import { URI } from 'vs/base/common/uri';
-import { mock } from 'vs/base/test/common/mock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { IFileStatWithMetadata } from 'vs/platform/files/common/files';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { CellKind, IOutputDto, NotebookData, NotebookSetting, TransientOptions } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { NotebookFileWorkingCopyModel } from 'vs/workbench/contrib/notebook/common/notebookEditorModel';
-import { INotebookSerializer, INotebookService, SimpleNotebookProviderInfo } from 'vs/workbench/contrib/notebook/common/notebookService';
-import { setupInstantiationService } from 'vs/workbench/contrib/notebook/test/browser/testNotebookEditor';
-import { SnapshotContext } from 'vs/workbench/services/workingCopy/common/fileWorkingCopy';
+import { VSBuffer } from '../../../../../base/common/buffer.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { Mimes } from '../../../../../base/common/mime.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { mock } from '../../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { ExtensionIdentifier } from '../../../../../platform/extensions/common/extensions.js';
+import { IFileStatWithMetadata } from '../../../../../platform/files/common/files.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { ILogService } from '../../../../../platform/log/common/log.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { NotebookTextModel } from '../../common/model/notebookTextModel.js';
+import { CellKind, IOutputDto, NotebookData, NotebookSetting, TransientOptions } from '../../common/notebookCommon.js';
+import { NotebookFileWorkingCopyModel } from '../../common/notebookEditorModel.js';
+import { INotebookSerializer, INotebookService, SimpleNotebookProviderInfo } from '../../common/notebookService.js';
+import { setupInstantiationService } from './testNotebookEditor.js';
+import { SnapshotContext } from '../../../../services/workingCopy/common/fileWorkingCopy.js';
 
 suite('NotebookFileWorkingCopyModel', function () {
 
diff --git a/src/vs/workbench/contrib/notebook/test/browser/notebookExecutionService.test.ts b/src/vs/workbench/contrib/notebook/test/browser/notebookExecutionService.test.ts
index 09731c28e5d..2113cf4fe1e 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/notebookExecutionService.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/notebookExecutionService.test.ts
@@ -5,29 +5,30 @@
 
 import assert from 'assert';
 import * as sinon from 'sinon';
-import { AsyncIterableObject } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Event } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { mock } from 'vs/base/test/common/mock';
-import { assertThrowsAsync, ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { IMenu, IMenuService } from 'vs/platform/actions/common/actions';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { insertCellAtIndex } from 'vs/workbench/contrib/notebook/browser/controller/cellOperations';
-import { NotebookExecutionService } from 'vs/workbench/contrib/notebook/browser/services/notebookExecutionServiceImpl';
-import { NotebookKernelService } from 'vs/workbench/contrib/notebook/browser/services/notebookKernelServiceImpl';
-import { NotebookViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { CellKind, IOutputDto, NotebookCellMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
-import { INotebookKernel, INotebookKernelHistoryService, INotebookKernelService, INotebookTextModelLike, VariablesResult } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
-import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
-import { setupInstantiationService, withTestNotebook as _withTestNotebook } from 'vs/workbench/contrib/notebook/test/browser/testNotebookEditor';
+import { AsyncIterableObject } from '../../../../../base/common/async.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { Event } from '../../../../../base/common/event.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { mock } from '../../../../../base/test/common/mock.js';
+import { assertThrowsAsync, ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../../../../../editor/common/languages/modesRegistry.js';
+import { IMenu, IMenuService } from '../../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { ExtensionIdentifier } from '../../../../../platform/extensions/common/extensions.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { insertCellAtIndex } from '../../browser/controller/cellOperations.js';
+import { NotebookExecutionService } from '../../browser/services/notebookExecutionServiceImpl.js';
+import { NotebookKernelService } from '../../browser/services/notebookKernelServiceImpl.js';
+import { NotebookViewModel } from '../../browser/viewModel/notebookViewModelImpl.js';
+import { NotebookTextModel } from '../../common/model/notebookTextModel.js';
+import { CellKind, IOutputDto, NotebookCellMetadata } from '../../common/notebookCommon.js';
+import { INotebookExecutionStateService } from '../../common/notebookExecutionStateService.js';
+import { INotebookKernel, INotebookKernelHistoryService, INotebookKernelService, INotebookTextModelLike, VariablesResult } from '../../common/notebookKernelService.js';
+import { INotebookLoggingService } from '../../common/notebookLoggingService.js';
+import { INotebookService } from '../../common/notebookService.js';
+import { setupInstantiationService, withTestNotebook as _withTestNotebook } from './testNotebookEditor.js';
 
 suite('NotebookExecutionService', () => {
 
@@ -54,6 +55,12 @@ suite('NotebookExecutionService', () => {
 			override getNotebookTextModels() { return []; }
 		});
 
+		instantiationService.stub(INotebookLoggingService, new class extends mock<INotebookLoggingService>() {
+			override debug(category: string, output: string): void {
+				//
+			}
+		});
+
 		instantiationService.stub(IMenuService, new class extends mock<IMenuService>() {
 			override createMenu() {
 				return new class extends mock<IMenu>() {
diff --git a/src/vs/workbench/contrib/notebook/test/browser/notebookExecutionStateService.test.ts b/src/vs/workbench/contrib/notebook/test/browser/notebookExecutionStateService.test.ts
index 8dd95c484df..6cfaeb99408 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/notebookExecutionStateService.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/notebookExecutionStateService.test.ts
@@ -4,29 +4,30 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { AsyncIterableObject, DeferredPromise } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Event } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { mock } from 'vs/base/test/common/mock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { IMenu, IMenuService } from 'vs/platform/actions/common/actions';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { insertCellAtIndex } from 'vs/workbench/contrib/notebook/browser/controller/cellOperations';
-import { NotebookExecutionService } from 'vs/workbench/contrib/notebook/browser/services/notebookExecutionServiceImpl';
-import { NotebookExecutionStateService } from 'vs/workbench/contrib/notebook/browser/services/notebookExecutionStateServiceImpl';
-import { NotebookKernelService } from 'vs/workbench/contrib/notebook/browser/services/notebookKernelServiceImpl';
-import { NotebookViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { CellEditType, CellKind, CellUri, IOutputDto, NotebookCellMetadata, NotebookExecutionState } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { CellExecutionUpdateType, INotebookExecutionService } from 'vs/workbench/contrib/notebook/common/notebookExecutionService';
-import { INotebookExecutionStateService, NotebookExecutionType } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
-import { INotebookKernel, INotebookKernelService, VariablesResult } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
-import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
-import { setupInstantiationService, withTestNotebook as _withTestNotebook } from 'vs/workbench/contrib/notebook/test/browser/testNotebookEditor';
+import { AsyncIterableObject, DeferredPromise } from '../../../../../base/common/async.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { Event } from '../../../../../base/common/event.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { mock } from '../../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../../../../../editor/common/languages/modesRegistry.js';
+import { IMenu, IMenuService } from '../../../../../platform/actions/common/actions.js';
+import { ExtensionIdentifier } from '../../../../../platform/extensions/common/extensions.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { insertCellAtIndex } from '../../browser/controller/cellOperations.js';
+import { NotebookExecutionService } from '../../browser/services/notebookExecutionServiceImpl.js';
+import { NotebookExecutionStateService } from '../../browser/services/notebookExecutionStateServiceImpl.js';
+import { NotebookKernelService } from '../../browser/services/notebookKernelServiceImpl.js';
+import { NotebookViewModel } from '../../browser/viewModel/notebookViewModelImpl.js';
+import { NotebookTextModel } from '../../common/model/notebookTextModel.js';
+import { CellEditType, CellKind, CellUri, IOutputDto, NotebookCellMetadata, NotebookExecutionState } from '../../common/notebookCommon.js';
+import { CellExecutionUpdateType, INotebookExecutionService } from '../../common/notebookExecutionService.js';
+import { INotebookExecutionStateService, NotebookExecutionType } from '../../common/notebookExecutionStateService.js';
+import { INotebookKernel, INotebookKernelService, VariablesResult } from '../../common/notebookKernelService.js';
+import { INotebookLoggingService } from '../../common/notebookLoggingService.js';
+import { INotebookService } from '../../common/notebookService.js';
+import { setupInstantiationService, withTestNotebook as _withTestNotebook } from './testNotebookEditor.js';
 
 suite('NotebookExecutionStateService', () => {
 
@@ -65,6 +66,11 @@ suite('NotebookExecutionStateService', () => {
 				};
 			}
 		});
+		instantiationService.stub(INotebookLoggingService, new class extends mock<INotebookLoggingService>() {
+			override debug(category: string, output: string): void {
+				//
+			}
+		});
 
 		kernelService = disposables.add(instantiationService.createInstance(NotebookKernelService));
 		instantiationService.set(INotebookKernelService, kernelService);
diff --git a/src/vs/workbench/contrib/notebook/test/browser/notebookFolding.test.ts b/src/vs/workbench/contrib/notebook/test/browser/notebookFolding.test.ts
index 0d397b63bf6..17cfedad7ee 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/notebookFolding.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/notebookFolding.test.ts
@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { setupInstantiationService, withTestNotebook } from 'vs/workbench/contrib/notebook/test/browser/testNotebookEditor';
-import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
-import { FoldingModel, updateFoldingStateAtIndex } from 'vs/workbench/contrib/notebook/browser/viewModel/foldingModel';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { CellKind } from '../../common/notebookCommon.js';
+import { setupInstantiationService, withTestNotebook } from './testNotebookEditor.js';
+import { IUndoRedoService } from '../../../../../platform/undoRedo/common/undoRedo.js';
+import { FoldingModel, updateFoldingStateAtIndex } from '../../browser/viewModel/foldingModel.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('Notebook Folding', () => {
 	let disposables: DisposableStore;
diff --git a/src/vs/workbench/contrib/notebook/test/browser/notebookKernelHistory.test.ts b/src/vs/workbench/contrib/notebook/test/browser/notebookKernelHistory.test.ts
index 237ec6bd599..be58fe1c8e0 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/notebookKernelHistory.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/notebookKernelHistory.test.ts
@@ -4,25 +4,25 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { setupInstantiationService } from 'vs/workbench/contrib/notebook/test/browser/testNotebookEditor';
-import { Emitter, Event } from 'vs/base/common/event';
-import { INotebookKernel, INotebookKernelService, VariablesResult } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
-import { NotebookKernelService } from 'vs/workbench/contrib/notebook/browser/services/notebookKernelServiceImpl';
-import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
-import { mock } from 'vs/base/test/common/mock';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { IMenu, IMenuService } from 'vs/platform/actions/common/actions';
-import { NotebookKernelHistoryService } from 'vs/workbench/contrib/notebook/browser/services/notebookKernelHistoryServiceImpl';
-import { IApplicationStorageValueChangeEvent, IProfileStorageValueChangeEvent, IStorageService, IStorageValueChangeEvent, IWillSaveStateEvent, IWorkspaceStorageValueChangeEvent, StorageScope } from 'vs/platform/storage/common/storage';
-import { INotebookLoggingService } from 'vs/workbench/contrib/notebook/common/notebookLoggingService';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { AsyncIterableObject } from 'vs/base/common/async';
+import { URI } from '../../../../../base/common/uri.js';
+import { ExtensionIdentifier } from '../../../../../platform/extensions/common/extensions.js';
+import { setupInstantiationService } from './testNotebookEditor.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { INotebookKernel, INotebookKernelService, VariablesResult } from '../../common/notebookKernelService.js';
+import { NotebookKernelService } from '../../browser/services/notebookKernelServiceImpl.js';
+import { INotebookService } from '../../common/notebookService.js';
+import { mock } from '../../../../../base/test/common/mock.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { NotebookTextModel } from '../../common/model/notebookTextModel.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../../../../../editor/common/languages/modesRegistry.js';
+import { IMenu, IMenuService } from '../../../../../platform/actions/common/actions.js';
+import { NotebookKernelHistoryService } from '../../browser/services/notebookKernelHistoryServiceImpl.js';
+import { IApplicationStorageValueChangeEvent, IProfileStorageValueChangeEvent, IStorageService, IStorageValueChangeEvent, IWillSaveStateEvent, IWorkspaceStorageValueChangeEvent, StorageScope } from '../../../../../platform/storage/common/storage.js';
+import { INotebookLoggingService } from '../../common/notebookLoggingService.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { AsyncIterableObject } from '../../../../../base/common/async.js';
 
 suite('NotebookKernelHistoryService', () => {
 
@@ -66,8 +66,8 @@ suite('NotebookKernelHistoryService', () => {
 
 		const u1 = URI.parse('foo:///one');
 
-		const k1 = new TestNotebookKernel({ label: 'z', viewType: 'foo' });
-		const k2 = new TestNotebookKernel({ label: 'a', viewType: 'foo' });
+		const k1 = new TestNotebookKernel({ label: 'z', notebookType: 'foo' });
+		const k2 = new TestNotebookKernel({ label: 'a', notebookType: 'foo' });
 
 		disposables.add(kernelService.registerKernel(k1));
 		disposables.add(kernelService.registerKernel(k2));
@@ -102,14 +102,14 @@ suite('NotebookKernelHistoryService', () => {
 
 		const kernelHistoryService = disposables.add(instantiationService.createInstance(NotebookKernelHistoryService));
 
-		let info = kernelHistoryService.getKernels({ uri: u1, viewType: 'foo' });
+		let info = kernelHistoryService.getKernels({ uri: u1, notebookType: 'foo' });
 		assert.equal(info.all.length, 0);
 		assert.ok(!info.selected);
 
 		// update priorities for u1 notebook
 		kernelService.updateKernelNotebookAffinity(k2, u1, 2);
 
-		info = kernelHistoryService.getKernels({ uri: u1, viewType: 'foo' });
+		info = kernelHistoryService.getKernels({ uri: u1, notebookType: 'foo' });
 		assert.equal(info.all.length, 0);
 		// MRU only auto selects kernel if there is only one
 		assert.deepStrictEqual(info.selected, undefined);
@@ -119,9 +119,9 @@ suite('NotebookKernelHistoryService', () => {
 
 		const u1 = URI.parse('foo:///one');
 
-		const k1 = new TestNotebookKernel({ label: 'z', viewType: 'foo' });
-		const k2 = new TestNotebookKernel({ label: 'a', viewType: 'foo' });
-		const k3 = new TestNotebookKernel({ label: 'b', viewType: 'foo' });
+		const k1 = new TestNotebookKernel({ label: 'z', notebookType: 'foo' });
+		const k2 = new TestNotebookKernel({ label: 'a', notebookType: 'foo' });
+		const k3 = new TestNotebookKernel({ label: 'b', notebookType: 'foo' });
 
 		disposables.add(kernelService.registerKernel(k1));
 		disposables.add(kernelService.registerKernel(k2));
@@ -158,12 +158,12 @@ suite('NotebookKernelHistoryService', () => {
 		});
 
 		const kernelHistoryService = disposables.add(instantiationService.createInstance(NotebookKernelHistoryService));
-		let info = kernelHistoryService.getKernels({ uri: u1, viewType: 'foo' });
+		let info = kernelHistoryService.getKernels({ uri: u1, notebookType: 'foo' });
 		assert.equal(info.all.length, 1);
 		assert.deepStrictEqual(info.selected, undefined);
 
 		kernelHistoryService.addMostRecentKernel(k3);
-		info = kernelHistoryService.getKernels({ uri: u1, viewType: 'foo' });
+		info = kernelHistoryService.getKernels({ uri: u1, notebookType: 'foo' });
 		assert.deepStrictEqual(info.all, [k3, k2]);
 	});
 });
@@ -190,9 +190,9 @@ class TestNotebookKernel implements INotebookKernel {
 		return AsyncIterableObject.EMPTY;
 	}
 
-	constructor(opts?: { languages?: string[]; label?: string; viewType?: string }) {
+	constructor(opts?: { languages?: string[]; label?: string; notebookType?: string }) {
 		this.supportedLanguages = opts?.languages ?? [PLAINTEXT_LANGUAGE_ID];
 		this.label = opts?.label ?? this.label;
-		this.viewType = opts?.viewType ?? this.viewType;
+		this.viewType = opts?.notebookType ?? this.viewType;
 	}
 }
diff --git a/src/vs/workbench/contrib/notebook/test/browser/notebookKernelService.test.ts b/src/vs/workbench/contrib/notebook/test/browser/notebookKernelService.test.ts
index cbe5bf90b3b..ba96e44b1df 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/notebookKernelService.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/notebookKernelService.test.ts
@@ -4,23 +4,23 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { setupInstantiationService } from 'vs/workbench/contrib/notebook/test/browser/testNotebookEditor';
-import { Emitter, Event } from 'vs/base/common/event';
-import { INotebookKernel, INotebookKernelService, VariablesResult } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
-import { NotebookKernelService } from 'vs/workbench/contrib/notebook/browser/services/notebookKernelServiceImpl';
-import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
-import { mock } from 'vs/base/test/common/mock';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { IMenu, IMenuService } from 'vs/platform/actions/common/actions';
-import { TransientOptions } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { AsyncIterableObject } from 'vs/base/common/async';
+import { URI } from '../../../../../base/common/uri.js';
+import { ExtensionIdentifier } from '../../../../../platform/extensions/common/extensions.js';
+import { setupInstantiationService } from './testNotebookEditor.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { INotebookKernel, INotebookKernelService, VariablesResult } from '../../common/notebookKernelService.js';
+import { NotebookKernelService } from '../../browser/services/notebookKernelServiceImpl.js';
+import { INotebookService } from '../../common/notebookService.js';
+import { mock } from '../../../../../base/test/common/mock.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { NotebookTextModel } from '../../common/model/notebookTextModel.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../../../../../editor/common/languages/modesRegistry.js';
+import { IMenu, IMenuService } from '../../../../../platform/actions/common/actions.js';
+import { TransientOptions } from '../../common/notebookCommon.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { AsyncIterableObject } from '../../../../../base/common/async.js';
 
 suite('NotebookKernelService', () => {
 
@@ -72,7 +72,7 @@ suite('NotebookKernelService', () => {
 		disposables.add(kernelService.registerKernel(k2));
 
 		// equal priorities -> sort by name
-		let info = kernelService.getMatchingKernel({ uri: u1, viewType: 'foo' });
+		let info = kernelService.getMatchingKernel({ uri: u1, notebookType: 'foo' });
 		assert.ok(info.all[0] === k2);
 		assert.ok(info.all[1] === k1);
 
@@ -81,18 +81,18 @@ suite('NotebookKernelService', () => {
 		kernelService.updateKernelNotebookAffinity(k2, u2, 1);
 
 		// updated
-		info = kernelService.getMatchingKernel({ uri: u1, viewType: 'foo' });
+		info = kernelService.getMatchingKernel({ uri: u1, notebookType: 'foo' });
 		assert.ok(info.all[0] === k2);
 		assert.ok(info.all[1] === k1);
 
 		// NOT updated
-		info = kernelService.getMatchingKernel({ uri: u2, viewType: 'foo' });
+		info = kernelService.getMatchingKernel({ uri: u2, notebookType: 'foo' });
 		assert.ok(info.all[0] === k2);
 		assert.ok(info.all[1] === k1);
 
 		// reset
 		kernelService.updateKernelNotebookAffinity(k2, u1, undefined);
-		info = kernelService.getMatchingKernel({ uri: u1, viewType: 'foo' });
+		info = kernelService.getMatchingKernel({ uri: u1, notebookType: 'foo' });
 		assert.ok(info.all[0] === k2);
 		assert.ok(info.all[1] === k1);
 	});
@@ -103,18 +103,18 @@ suite('NotebookKernelService', () => {
 		const kernel = new TestNotebookKernel();
 		disposables.add(kernelService.registerKernel(kernel));
 
-		let info = kernelService.getMatchingKernel({ uri: notebook, viewType: 'foo' });
+		let info = kernelService.getMatchingKernel({ uri: notebook, notebookType: 'foo' });
 		assert.strictEqual(info.all.length, 1);
 		assert.ok(info.all[0] === kernel);
 
 		const betterKernel = new TestNotebookKernel();
 		disposables.add(kernelService.registerKernel(betterKernel));
 
-		info = kernelService.getMatchingKernel({ uri: notebook, viewType: 'foo' });
+		info = kernelService.getMatchingKernel({ uri: notebook, notebookType: 'foo' });
 		assert.strictEqual(info.all.length, 2);
 
 		kernelService.updateKernelNotebookAffinity(betterKernel, notebook, 2);
-		info = kernelService.getMatchingKernel({ uri: notebook, viewType: 'foo' });
+		info = kernelService.getMatchingKernel({ uri: notebook, notebookType: 'foo' });
 		assert.strictEqual(info.all.length, 2);
 		assert.ok(info.all[0] === betterKernel);
 		assert.ok(info.all[1] === kernel);
@@ -123,8 +123,8 @@ suite('NotebookKernelService', () => {
 	test('onDidChangeSelectedNotebooks not fired on initial notebook open #121904', function () {
 
 		const uri = URI.parse('foo:///one');
-		const jupyter = { uri, viewType: 'jupyter' };
-		const dotnet = { uri, viewType: 'dotnet' };
+		const jupyter = { uri, viewType: 'jupyter', notebookType: 'jupyter' };
+		const dotnet = { uri, viewType: 'dotnet', notebookType: 'dotnet' };
 
 		const jupyterKernel = new TestNotebookKernel({ viewType: jupyter.viewType });
 		const dotnetKernel = new TestNotebookKernel({ viewType: dotnet.viewType });
@@ -144,8 +144,8 @@ suite('NotebookKernelService', () => {
 	test('onDidChangeSelectedNotebooks not fired on initial notebook open #121904, p2', async function () {
 
 		const uri = URI.parse('foo:///one');
-		const jupyter = { uri, viewType: 'jupyter' };
-		const dotnet = { uri, viewType: 'dotnet' };
+		const jupyter = { uri, viewType: 'jupyter', notebookType: 'jupyter' };
+		const dotnet = { uri, viewType: 'dotnet', notebookType: 'dotnet' };
 
 		const jupyterKernel = new TestNotebookKernel({ viewType: jupyter.viewType });
 		const dotnetKernel = new TestNotebookKernel({ viewType: dotnet.viewType });
diff --git a/src/vs/workbench/contrib/notebook/test/browser/notebookRendererMessagingService.test.ts b/src/vs/workbench/contrib/notebook/test/browser/notebookRendererMessagingService.test.ts
index d40658ab353..dfc17df81d1 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/notebookRendererMessagingService.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/notebookRendererMessagingService.test.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { NullExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { NullExtensionService } from '../../../../services/extensions/common/extensions.js';
 import { stub } from 'sinon';
-import { NotebookRendererMessagingService } from 'vs/workbench/contrib/notebook/browser/services/notebookRendererMessagingServiceImpl';
+import { NotebookRendererMessagingService } from '../../browser/services/notebookRendererMessagingServiceImpl.js';
 import assert from 'assert';
-import { timeout } from 'vs/base/common/async';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { timeout } from '../../../../../base/common/async.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('NotebookRendererMessaging', () => {
 	let extService: NullExtensionService;
diff --git a/src/vs/workbench/contrib/notebook/test/browser/notebookSelection.test.ts b/src/vs/workbench/contrib/notebook/test/browser/notebookSelection.test.ts
index 0fd1c9a92fe..05072b46b2e 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/notebookSelection.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/notebookSelection.test.ts
@@ -4,15 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { FoldingModel, updateFoldingStateAtIndex } from 'vs/workbench/contrib/notebook/browser/viewModel/foldingModel';
-import { runDeleteAction } from 'vs/workbench/contrib/notebook/browser/controller/cellOperations';
-import { NotebookCellSelectionCollection } from 'vs/workbench/contrib/notebook/browser/viewModel/cellSelectionCollection';
-import { CellEditType, CellKind, SelectionStateType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { createNotebookCellList, setupInstantiationService, TestCell, withTestNotebook } from 'vs/workbench/contrib/notebook/test/browser/testNotebookEditor';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { FoldingModel, updateFoldingStateAtIndex } from '../../browser/viewModel/foldingModel.js';
+import { runDeleteAction } from '../../browser/controller/cellOperations.js';
+import { NotebookCellSelectionCollection } from '../../browser/viewModel/cellSelectionCollection.js';
+import { CellEditType, CellKind, SelectionStateType } from '../../common/notebookCommon.js';
+import { createNotebookCellList, setupInstantiationService, TestCell, withTestNotebook } from './testNotebookEditor.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
 
 suite('NotebookSelection', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/contrib/notebook/test/browser/notebookServiceImpl.test.ts b/src/vs/workbench/contrib/notebook/test/browser/notebookServiceImpl.test.ts
index ce634389f93..1099d6beeae 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/notebookServiceImpl.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/notebookServiceImpl.test.ts
@@ -4,23 +4,23 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Event } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { mock } from 'vs/base/test/common/mock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { NotebookProviderInfoStore } from 'vs/workbench/contrib/notebook/browser/services/notebookServiceImpl';
-import { INotebookEditorModelResolverService } from 'vs/workbench/contrib/notebook/common/notebookEditorModelResolverService';
-import { NotebookProviderInfo } from 'vs/workbench/contrib/notebook/common/notebookProvider';
-import { EditorResolverService } from 'vs/workbench/services/editor/browser/editorResolverService';
-import { RegisteredEditorPriority } from 'vs/workbench/services/editor/common/editorResolverService';
-import { IExtensionService, nullExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
-import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
+import { Event } from '../../../../../base/common/event.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { mock } from '../../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IAccessibilityService } from '../../../../../platform/accessibility/common/accessibility.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { IStorageService } from '../../../../../platform/storage/common/storage.js';
+import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.js';
+import { NotebookProviderInfoStore } from '../../browser/services/notebookServiceImpl.js';
+import { INotebookEditorModelResolverService } from '../../common/notebookEditorModelResolverService.js';
+import { NotebookProviderInfo } from '../../common/notebookProvider.js';
+import { EditorResolverService } from '../../../../services/editor/browser/editorResolverService.js';
+import { RegisteredEditorPriority } from '../../../../services/editor/common/editorResolverService.js';
+import { IExtensionService, nullExtensionDescription } from '../../../../services/extensions/common/extensions.js';
+import { workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
 
 suite('NotebookProviderInfoStore', function () {
 	const disposables = ensureNoDisposablesAreLeakedInTestSuite() as Pick<DisposableStore, 'add'>;
@@ -56,7 +56,6 @@ suite('NotebookProviderInfoStore', function () {
 			displayName: 'foo',
 			selectors: [{ filenamePattern: '*.foo' }],
 			priority: RegisteredEditorPriority.default,
-			exclusive: false,
 			providerDisplayName: 'foo',
 		});
 		const barInfo = new NotebookProviderInfo({
@@ -65,7 +64,6 @@ suite('NotebookProviderInfoStore', function () {
 			displayName: 'bar',
 			selectors: [{ filenamePattern: '*.bar' }],
 			priority: RegisteredEditorPriority.default,
-			exclusive: false,
 			providerDisplayName: 'bar',
 		});
 
diff --git a/src/vs/workbench/contrib/notebook/test/browser/notebookStickyScroll.test.ts b/src/vs/workbench/contrib/notebook/test/browser/notebookStickyScroll.test.ts
index 9026b78d457..2b6b687f3a0 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/notebookStickyScroll.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/notebookStickyScroll.test.ts
@@ -4,20 +4,23 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Event } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { mock } from 'vs/base/test/common/mock';
-import { assertSnapshot } from 'vs/base/test/common/snapshot';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { NotebookCellOutline } from 'vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline';
-import { INotebookEditor, INotebookEditorPane } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { INotebookCellList } from 'vs/workbench/contrib/notebook/browser/view/notebookRenderingCommon';
-import { OutlineEntry } from 'vs/workbench/contrib/notebook/browser/viewModel/OutlineEntry';
-import { NotebookStickyLine, computeContent } from 'vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll';
-import { CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { createNotebookCellList, setupInstantiationService, withTestNotebook } from 'vs/workbench/contrib/notebook/test/browser/testNotebookEditor';
-import { OutlineTarget } from 'vs/workbench/services/outline/browser/outline';
+import { Event } from '../../../../../base/common/event.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { mock } from '../../../../../base/test/common/mock.js';
+import { assertSnapshot } from '../../../../../base/test/common/snapshot.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { ILanguageFeaturesService } from '../../../../../editor/common/services/languageFeatures.js';
+import { LanguageFeaturesService } from '../../../../../editor/common/services/languageFeaturesService.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { IEditorPaneSelectionChangeEvent } from '../../../../common/editor.js';
+import { NotebookCellOutline } from '../../browser/contrib/outline/notebookOutline.js';
+import { INotebookEditor, INotebookEditorPane } from '../../browser/notebookBrowser.js';
+import { INotebookCellList } from '../../browser/view/notebookRenderingCommon.js';
+import { OutlineEntry } from '../../browser/viewModel/OutlineEntry.js';
+import { NotebookStickyLine, computeContent } from '../../browser/viewParts/notebookEditorStickyScroll.js';
+import { CellKind } from '../../common/notebookCommon.js';
+import { createNotebookCellList, setupInstantiationService, withTestNotebook } from './testNotebookEditor.js';
+import { OutlineTarget } from '../../../../services/outline/browser/outline.js';
 
 suite('NotebookEditorStickyScroll', () => {
 	let disposables: DisposableStore;
@@ -29,23 +32,25 @@ suite('NotebookEditorStickyScroll', () => {
 		disposables.dispose();
 	});
 
-	ensureNoDisposablesAreLeakedInTestSuite();
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
 
 	setup(() => {
 		disposables = new DisposableStore();
 		instantiationService = setupInstantiationService(disposables);
+		instantiationService.set(ILanguageFeaturesService, new LanguageFeaturesService());
 	});
 
 	function getOutline(editor: any) {
 		if (!editor.hasModel()) {
 			assert.ok(false, 'MUST have active text editor');
 		}
-		const outline = instantiationService.createInstance(NotebookCellOutline, new class extends mock<INotebookEditorPane>() {
+		const outline = store.add(instantiationService.createInstance(NotebookCellOutline, new class extends mock<INotebookEditorPane>() {
 			override getControl() {
 				return editor;
 			}
 			override onDidChangeModel: Event<void> = Event.None;
-		}, OutlineTarget.QuickPick);
+			override onDidChangeSelection: Event<IEditorPaneSelectionChangeEvent> = Event.None;
+		}, OutlineTarget.QuickPick));
 		return outline;
 	}
 
diff --git a/src/vs/workbench/contrib/notebook/test/browser/notebookTextModel.test.ts b/src/vs/workbench/contrib/notebook/test/browser/notebookTextModel.test.ts
index abcb1828caa..da5246f35a4 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/notebookTextModel.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/notebookTextModel.test.ts
@@ -4,16 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { Mimes } from 'vs/base/common/mime';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { CellEditType, CellKind, ICellEditOperation, MOVE_CURSOR_1_LINE_COMMAND, NotebookTextModelChangedEvent, NotebookTextModelWillAddRemoveEvent, SelectionStateType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { setupInstantiationService, TestCell, valueBytesFromString, withTestNotebook } from 'vs/workbench/contrib/notebook/test/browser/testNotebookEditor';
+import { VSBuffer } from '../../../../../base/common/buffer.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { Mimes } from '../../../../../base/common/mime.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { IUndoRedoService } from '../../../../../platform/undoRedo/common/undoRedo.js';
+import { NotebookTextModel } from '../../common/model/notebookTextModel.js';
+import { CellEditType, CellKind, ICellEditOperation, MOVE_CURSOR_1_LINE_COMMAND, NotebookTextModelChangedEvent, NotebookTextModelWillAddRemoveEvent, SelectionStateType } from '../../common/notebookCommon.js';
+import { setupInstantiationService, TestCell, valueBytesFromString, withTestNotebook } from './testNotebookEditor.js';
 
 suite('NotebookTextModel', () => {
 	let disposables: DisposableStore;
@@ -1403,4 +1403,112 @@ suite('NotebookTextModel', () => {
 		});
 
 	});
+
+	test('findNextMatch', async function () {
+		await withTestNotebook(
+			[
+				['var a = 1;', 'javascript', CellKind.Code, [], {}],
+				['var b = 2;', 'javascript', CellKind.Code, [], {}],
+				['var c = 3;', 'javascript', CellKind.Code, [], {}],
+				['var d = 4;', 'javascript', CellKind.Code, [], {}]
+			],
+			(editor, viewModel) => {
+				const notebookModel = viewModel.notebookDocument;
+
+				// Test case 1: Find 'var' starting from the first cell
+				let findMatch = notebookModel.findNextMatch('var', { cellIndex: 0, position: { lineNumber: 1, column: 1 } }, false, false, null);
+				assert.ok(findMatch);
+				assert.strictEqual(findMatch!.match.range.startLineNumber, 1);
+				assert.strictEqual(findMatch!.match.range.startColumn, 1);
+
+				// Test case 2: Find 'b' starting from the second cell
+				findMatch = notebookModel.findNextMatch('b', { cellIndex: 1, position: { lineNumber: 1, column: 1 } }, false, false, null);
+				assert.ok(findMatch);
+				assert.strictEqual(findMatch!.match.range.startLineNumber, 1);
+				assert.strictEqual(findMatch!.match.range.startColumn, 5);
+
+				// Test case 3: Find 'c' starting from the third cell
+				findMatch = notebookModel.findNextMatch('c', { cellIndex: 2, position: { lineNumber: 1, column: 1 } }, false, false, null);
+				assert.ok(findMatch);
+				assert.strictEqual(findMatch!.match.range.startLineNumber, 1);
+				assert.strictEqual(findMatch!.match.range.startColumn, 5);
+
+				// Test case 4: Find 'd' starting from the fourth cell
+				findMatch = notebookModel.findNextMatch('d', { cellIndex: 3, position: { lineNumber: 1, column: 1 } }, false, false, null);
+				assert.ok(findMatch);
+				assert.strictEqual(findMatch!.match.range.startLineNumber, 1);
+				assert.strictEqual(findMatch!.match.range.startColumn, 5);
+
+				// Test case 5: No match found
+				findMatch = notebookModel.findNextMatch('e', { cellIndex: 0, position: { lineNumber: 1, column: 1 } }, false, false, null);
+				assert.strictEqual(findMatch, null);
+			}
+		);
+	});
+
+	test('findNextMatch 2', async function () {
+		await withTestNotebook(
+			[
+				['var a = 1; var a = 2;', 'javascript', CellKind.Code, [], {}],
+				['var b = 2;', 'javascript', CellKind.Code, [], {}],
+				['var c = 3;', 'javascript', CellKind.Code, [], {}],
+				['var d = 4;', 'javascript', CellKind.Code, [], {}]
+			],
+			(editor, viewModel) => {
+				const notebookModel = viewModel.notebookDocument;
+
+				// Test case 1: Find 'var' starting from the first cell
+				let findMatch = notebookModel.findNextMatch('var', { cellIndex: 0, position: { lineNumber: 1, column: 1 } }, false, false, null);
+				assert.ok(findMatch);
+				assert.strictEqual(findMatch!.match.range.startLineNumber, 1);
+				assert.strictEqual(findMatch!.match.range.startColumn, 1);
+
+				// Test case 2: Find 'b' starting from the second cell
+				findMatch = notebookModel.findNextMatch('b', { cellIndex: 1, position: { lineNumber: 1, column: 1 } }, false, false, null);
+				assert.ok(findMatch);
+				assert.strictEqual(findMatch!.match.range.startLineNumber, 1);
+				assert.strictEqual(findMatch!.match.range.startColumn, 5);
+
+				// Test case 3: Find 'c' starting from the third cell
+				findMatch = notebookModel.findNextMatch('c', { cellIndex: 2, position: { lineNumber: 1, column: 1 } }, false, false, null);
+				assert.ok(findMatch);
+				assert.strictEqual(findMatch!.match.range.startLineNumber, 1);
+				assert.strictEqual(findMatch!.match.range.startColumn, 5);
+
+				// Test case 4: Find 'd' starting from the fourth cell
+				findMatch = notebookModel.findNextMatch('d', { cellIndex: 3, position: { lineNumber: 1, column: 1 } }, false, false, null);
+				assert.ok(findMatch);
+				assert.strictEqual(findMatch!.match.range.startLineNumber, 1);
+				assert.strictEqual(findMatch!.match.range.startColumn, 5);
+
+				// Test case 5: No match found
+				findMatch = notebookModel.findNextMatch('e', { cellIndex: 0, position: { lineNumber: 1, column: 1 } }, false, false, null);
+				assert.strictEqual(findMatch, null);
+
+				// Test case 6: Same keywords in the same cell
+				findMatch = notebookModel.findNextMatch('var', { cellIndex: 0, position: { lineNumber: 1, column: 1 } }, false, false, null);
+				assert.ok(findMatch);
+				assert.strictEqual(findMatch!.match.range.startLineNumber, 1);
+				assert.strictEqual(findMatch!.match.range.startColumn, 1);
+
+				findMatch = notebookModel.findNextMatch('var', { cellIndex: 0, position: { lineNumber: 1, column: 5 } }, false, false, null);
+				assert.ok(findMatch);
+				assert.strictEqual(findMatch!.match.range.startLineNumber, 1);
+				assert.strictEqual(findMatch!.match.range.startColumn, 12);
+
+				// Test case 7: Search from the middle of a cell with keyword before and after
+				findMatch = notebookModel.findNextMatch('a', { cellIndex: 0, position: { lineNumber: 1, column: 10 } }, false, false, null);
+				assert.ok(findMatch);
+				assert.strictEqual(findMatch!.match.range.startLineNumber, 1);
+				assert.strictEqual(findMatch!.match.range.startColumn, 13);
+
+				// Test case 8: Search from a cell and next match is in another cell below
+				findMatch = notebookModel.findNextMatch('var', { cellIndex: 0, position: { lineNumber: 1, column: 20 } }, false, false, null);
+				assert.ok(findMatch);
+				assert.strictEqual(findMatch!.match.range.startLineNumber, 1);
+				assert.strictEqual(findMatch!.match.range.startColumn, 1);
+				// assert.strictEqual(match!.cellIndex, 1);
+			}
+		);
+	});
 });
diff --git a/src/vs/workbench/contrib/notebook/test/browser/notebookVariablesDataSource.test.ts b/src/vs/workbench/contrib/notebook/test/browser/notebookVariablesDataSource.test.ts
index ee359d70e9d..ecd7842a833 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/notebookVariablesDataSource.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/notebookVariablesDataSource.test.ts
@@ -3,25 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { AsyncIterableObject, AsyncIterableSource } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { URI } from 'vs/base/common/uri';
-import { mock } from 'vs/base/test/common/mock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { INotebookVariableElement, NotebookVariableDataSource } from 'vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesDataSource';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { INotebookKernel, INotebookKernelService, VariablesResult } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
+import { AsyncIterableObject, AsyncIterableSource } from '../../../../../base/common/async.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { mock } from '../../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { INotebookVariableElement, NotebookVariableDataSource } from '../../browser/contrib/notebookVariables/notebookVariablesDataSource.js';
+import { NotebookTextModel } from '../../common/model/notebookTextModel.js';
+import { INotebookKernel, INotebookKernelService, VariablesResult } from '../../common/notebookKernelService.js';
 
 
 suite('NotebookVariableDataSource', () => {
 	let dataSource: NotebookVariableDataSource;
 	const notebookModel = { uri: 'one.ipynb', languages: ['python'] } as unknown as NotebookTextModel;
-	let provideVariablesCalled = false;
+	let provideVariablesCalled: boolean;
 
 	type VariablesResultWithAction = VariablesResult & { action?: () => void };
-	let results: VariablesResultWithAction[] = [
-		{ id: 1, name: 'a', value: '1', hasNamedChildren: false, indexedChildrenCount: 0 },
-	];
+	let results: VariablesResultWithAction[];
 
 	const kernel = new class extends mock<INotebookKernel>() {
 		override hasVariableProvider = true;
@@ -60,6 +58,9 @@ suite('NotebookVariableDataSource', () => {
 	setup(() => {
 		provideVariablesCalled = false;
 		dataSource = new NotebookVariableDataSource(kernelService);
+		results = [
+			{ id: 1, name: 'a', value: '1', hasNamedChildren: false, indexedChildrenCount: 0 },
+		];
 	});
 
 	test('Root element should return children', async () => {
diff --git a/src/vs/workbench/contrib/notebook/test/browser/notebookViewModel.test.ts b/src/vs/workbench/contrib/notebook/test/browser/notebookViewModel.test.ts
index 1e512e7c1a0..ffe21e24923 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/notebookViewModel.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/notebookViewModel.test.ts
@@ -4,34 +4,34 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { IBulkEditService } from 'vs/editor/browser/services/bulkEditService';
-import { TrackedRangeStickiness } from 'vs/editor/common/model';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
-import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
-import { insertCellAtIndex, runDeleteAction } from 'vs/workbench/contrib/notebook/browser/controller/cellOperations';
-import { NotebookEventDispatcher } from 'vs/workbench/contrib/notebook/browser/viewModel/eventDispatcher';
-import { NotebookViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl';
-import { ViewContext } from 'vs/workbench/contrib/notebook/browser/viewModel/viewContext';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { CellKind, diff } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { NotebookOptions } from 'vs/workbench/contrib/notebook/browser/notebookOptions';
-import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
-import { NotebookEditorTestModel, setupInstantiationService, withTestNotebook } from 'vs/workbench/contrib/notebook/test/browser/testNotebookEditor';
-import { INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
-import { IBaseCellEditorOptions } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { mainWindow } from 'vs/base/browser/window';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { ILanguageDetectionService } from 'vs/workbench/services/languageDetection/common/languageDetectionWorkerService';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { IBulkEditService } from '../../../../../editor/browser/services/bulkEditService.js';
+import { TrackedRangeStickiness } from '../../../../../editor/common/model.js';
+import { IModelService } from '../../../../../editor/common/services/model.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
+import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { TestThemeService } from '../../../../../platform/theme/test/common/testThemeService.js';
+import { IUndoRedoService } from '../../../../../platform/undoRedo/common/undoRedo.js';
+import { insertCellAtIndex, runDeleteAction } from '../../browser/controller/cellOperations.js';
+import { NotebookEventDispatcher } from '../../browser/viewModel/eventDispatcher.js';
+import { NotebookViewModel } from '../../browser/viewModel/notebookViewModelImpl.js';
+import { ViewContext } from '../../browser/viewModel/viewContext.js';
+import { NotebookTextModel } from '../../common/model/notebookTextModel.js';
+import { CellKind, diff } from '../../common/notebookCommon.js';
+import { NotebookOptions } from '../../browser/notebookOptions.js';
+import { ICellRange } from '../../common/notebookRange.js';
+import { NotebookEditorTestModel, setupInstantiationService, withTestNotebook } from './testNotebookEditor.js';
+import { INotebookExecutionStateService } from '../../common/notebookExecutionStateService.js';
+import { IBaseCellEditorOptions } from '../../browser/notebookBrowser.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { mainWindow } from '../../../../../base/browser/window.js';
+import { ICodeEditorService } from '../../../../../editor/browser/services/codeEditorService.js';
+import { ILanguageDetectionService } from '../../../../services/languageDetection/common/languageDetectionWorkerService.js';
 
 suite('NotebookViewModel', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
@@ -66,7 +66,7 @@ suite('NotebookViewModel', () => {
 	test('ctor', function () {
 		const notebook = new NotebookTextModel('notebook', URI.parse('test'), [], {}, { transientCellMetadata: {}, transientDocumentMetadata: {}, transientOutputs: false, cellContentMetadata: {} }, undoRedoService, modelService, languageService, languageDetectionService);
 		const model = new NotebookEditorTestModel(notebook);
-		const options = new NotebookOptions(mainWindow, instantiationService.get(IConfigurationService), instantiationService.get(INotebookExecutionStateService), instantiationService.get(ICodeEditorService), false);
+		const options = new NotebookOptions(mainWindow, false, undefined, instantiationService.get(IConfigurationService), instantiationService.get(INotebookExecutionStateService), instantiationService.get(ICodeEditorService));
 		const eventDispatcher = new NotebookEventDispatcher();
 		const viewContext = new ViewContext(options, eventDispatcher, () => ({} as IBaseCellEditorOptions));
 		const viewModel = new NotebookViewModel('notebook', model.notebook, viewContext, null, { isReadOnly: false }, instantiationService, bulkEditService, undoRedoService, textModelService, notebookExecutionStateService);
diff --git a/src/vs/workbench/contrib/notebook/test/browser/notebookViewZones.test.ts b/src/vs/workbench/contrib/notebook/test/browser/notebookViewZones.test.ts
index 199ee022a90..fe54ccba306 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/notebookViewZones.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/notebookViewZones.test.ts
@@ -5,15 +5,15 @@
 
 
 import assert from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { NotebookCellsLayout } from 'vs/workbench/contrib/notebook/browser/view/notebookCellListView';
-import { FoldingModel } from 'vs/workbench/contrib/notebook/browser/viewModel/foldingModel';
-import { CellEditType, CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { createNotebookCellList, setupInstantiationService, withTestNotebook } from 'vs/workbench/contrib/notebook/test/browser/testNotebookEditor';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { NotebookCellsLayout } from '../../browser/view/notebookCellListView.js';
+import { FoldingModel } from '../../browser/viewModel/foldingModel.js';
+import { CellEditType, CellKind } from '../../common/notebookCommon.js';
+import { createNotebookCellList, setupInstantiationService, withTestNotebook } from './testNotebookEditor.js';
 
 suite('NotebookRangeMap', () => {
 
diff --git a/src/vs/workbench/contrib/notebook/test/browser/notebookWorkbenchToolbar.test.ts b/src/vs/workbench/contrib/notebook/test/browser/notebookWorkbenchToolbar.test.ts
index 8d530e9c21c..aeba7512788 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/notebookWorkbenchToolbar.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/notebookWorkbenchToolbar.test.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { workbenchCalculateActions, workbenchDynamicCalculateActions } from 'vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar';
-import { Action, IAction, Separator } from 'vs/base/common/actions';
+import { workbenchCalculateActions, workbenchDynamicCalculateActions } from '../../browser/viewParts/notebookEditorToolbar.js';
+import { Action, IAction, Separator } from '../../../../../base/common/actions.js';
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 interface IActionModel {
 	action: IAction;
diff --git a/src/vs/workbench/contrib/notebook/test/browser/testNotebookEditor.ts b/src/vs/workbench/contrib/notebook/test/browser/testNotebookEditor.ts
index 3b15b354fbf..de21fbf708a 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/testNotebookEditor.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/testNotebookEditor.ts
@@ -3,70 +3,72 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { IListRenderer, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { NotImplementedError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ResourceMap } from 'vs/base/common/map';
-import { Mimes } from 'vs/base/common/mime';
-import { URI } from 'vs/base/common/uri';
-import { mock } from 'vs/base/test/common/mock';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { LanguageService } from 'vs/editor/common/services/languageService';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ModelService } from 'vs/editor/common/services/modelService';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { TestLanguageConfigurationService } from 'vs/editor/test/common/modes/testLanguageConfigurationService';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { TestClipboardService } from 'vs/platform/clipboard/test/common/testClipboardService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { ContextKeyService } from 'vs/platform/contextkey/browser/contextKeyService';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { MockKeybindingService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
-import { IListService, ListService } from 'vs/platform/list/browser/listService';
-import { ILogService, NullLogService } from 'vs/platform/log/common/log';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
-import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
-import { UndoRedoService } from 'vs/platform/undoRedo/common/undoRedoService';
-import { IWorkspaceTrustRequestService } from 'vs/platform/workspace/common/workspaceTrust';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { EditorModel } from 'vs/workbench/common/editor/editorModel';
-import { CellFindMatchWithIndex, CellFocusMode, IActiveNotebookEditorDelegate, IBaseCellEditorOptions, ICellViewModel, INotebookEditorDelegate } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NotebookCellStateChangedEvent, NotebookLayoutInfo } from 'vs/workbench/contrib/notebook/browser/notebookViewEvents';
-import { NotebookCellStatusBarService } from 'vs/workbench/contrib/notebook/browser/services/notebookCellStatusBarServiceImpl';
-import { ListViewInfoAccessor, NotebookCellList } from 'vs/workbench/contrib/notebook/browser/view/notebookCellList';
-import { BaseCellRenderTemplate } from 'vs/workbench/contrib/notebook/browser/view/notebookRenderingCommon';
-import { NotebookEventDispatcher } from 'vs/workbench/contrib/notebook/browser/viewModel/eventDispatcher';
-import { CellViewModel, NotebookViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl';
-import { ViewContext } from 'vs/workbench/contrib/notebook/browser/viewModel/viewContext';
-import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { INotebookCellStatusBarService } from 'vs/workbench/contrib/notebook/common/notebookCellStatusBarService';
-import { CellKind, CellUri, ICellDto2, INotebookDiffEditorModel, INotebookEditorModel, INotebookSearchOptions, IOutputDto, IResolvedNotebookEditorModel, NotebookCellExecutionState, NotebookCellMetadata, SelectionStateType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { ICellExecuteUpdate, ICellExecutionComplete, ICellExecutionStateChangedEvent, IExecutionStateChangedEvent, INotebookCellExecution, INotebookExecution, INotebookExecutionStateService, INotebookFailStateChangedEvent } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
-import { NotebookOptions } from 'vs/workbench/contrib/notebook/browser/notebookOptions';
-import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
-import { TextModelResolverService } from 'vs/workbench/services/textmodelResolver/common/textModelResolverService';
-import { IWorkingCopySaveEvent } from 'vs/workbench/services/workingCopy/common/workingCopy';
-import { TestLayoutService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { TestStorageService, TestWorkspaceTrustRequestService } from 'vs/workbench/test/common/workbenchTestServices';
-import { FontInfo } from 'vs/editor/common/config/fontInfo';
-import { EditorFontLigatures, EditorFontVariations } from 'vs/editor/common/config/editorOptions';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { mainWindow } from 'vs/base/browser/window';
-import { TestCodeEditorService } from 'vs/editor/test/browser/editorTestServices';
-import { INotebookCellOutlineProviderFactory, NotebookCellOutlineProviderFactory } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineProviderFactory';
-import { ILanguageDetectionService } from 'vs/workbench/services/languageDetection/common/languageDetectionWorkerService';
+import * as DOM from '../../../../../base/browser/dom.js';
+import { IListRenderer, IListVirtualDelegate } from '../../../../../base/browser/ui/list/list.js';
+import { VSBuffer } from '../../../../../base/common/buffer.js';
+import { NotImplementedError } from '../../../../../base/common/errors.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../../base/common/map.js';
+import { Mimes } from '../../../../../base/common/mime.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { mock } from '../../../../../base/test/common/mock.js';
+import { runWithFakedTimers } from '../../../../../base/test/common/timeTravelScheduler.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
+import { ILanguageConfigurationService } from '../../../../../editor/common/languages/languageConfigurationRegistry.js';
+import { LanguageService } from '../../../../../editor/common/services/languageService.js';
+import { IModelService } from '../../../../../editor/common/services/model.js';
+import { ModelService } from '../../../../../editor/common/services/modelService.js';
+import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
+import { TestLanguageConfigurationService } from '../../../../../editor/test/common/modes/testLanguageConfigurationService.js';
+import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js';
+import { TestClipboardService } from '../../../../../platform/clipboard/test/common/testClipboardService.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { ContextKeyService } from '../../../../../platform/contextkey/browser/contextKeyService.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { MockKeybindingService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { ILayoutService } from '../../../../../platform/layout/browser/layoutService.js';
+import { IListService, ListService } from '../../../../../platform/list/browser/listService.js';
+import { ILogService, NullLogService } from '../../../../../platform/log/common/log.js';
+import { IStorageService } from '../../../../../platform/storage/common/storage.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { TestThemeService } from '../../../../../platform/theme/test/common/testThemeService.js';
+import { IUndoRedoService } from '../../../../../platform/undoRedo/common/undoRedo.js';
+import { UndoRedoService } from '../../../../../platform/undoRedo/common/undoRedoService.js';
+import { IWorkspaceTrustRequestService } from '../../../../../platform/workspace/common/workspaceTrust.js';
+import { EditorInput } from '../../../../common/editor/editorInput.js';
+import { EditorModel } from '../../../../common/editor/editorModel.js';
+import { CellFindMatchWithIndex, CellFocusMode, IActiveNotebookEditorDelegate, IBaseCellEditorOptions, ICellViewModel, INotebookEditorDelegate } from '../../browser/notebookBrowser.js';
+import { NotebookCellStateChangedEvent, NotebookLayoutInfo } from '../../browser/notebookViewEvents.js';
+import { NotebookCellStatusBarService } from '../../browser/services/notebookCellStatusBarServiceImpl.js';
+import { ListViewInfoAccessor, NotebookCellList } from '../../browser/view/notebookCellList.js';
+import { BaseCellRenderTemplate } from '../../browser/view/notebookRenderingCommon.js';
+import { NotebookEventDispatcher } from '../../browser/viewModel/eventDispatcher.js';
+import { CellViewModel, NotebookViewModel } from '../../browser/viewModel/notebookViewModelImpl.js';
+import { ViewContext } from '../../browser/viewModel/viewContext.js';
+import { NotebookCellTextModel } from '../../common/model/notebookCellTextModel.js';
+import { NotebookTextModel } from '../../common/model/notebookTextModel.js';
+import { INotebookCellStatusBarService } from '../../common/notebookCellStatusBarService.js';
+import { CellKind, CellUri, ICellDto2, INotebookDiffEditorModel, INotebookEditorModel, INotebookFindOptions, IOutputDto, IResolvedNotebookEditorModel, NotebookCellExecutionState, NotebookCellMetadata, SelectionStateType } from '../../common/notebookCommon.js';
+import { ICellExecuteUpdate, ICellExecutionComplete, ICellExecutionStateChangedEvent, IExecutionStateChangedEvent, INotebookCellExecution, INotebookExecution, INotebookExecutionStateService, INotebookFailStateChangedEvent } from '../../common/notebookExecutionStateService.js';
+import { NotebookOptions } from '../../browser/notebookOptions.js';
+import { ICellRange } from '../../common/notebookRange.js';
+import { TextModelResolverService } from '../../../../services/textmodelResolver/common/textModelResolverService.js';
+import { IWorkingCopySaveEvent } from '../../../../services/workingCopy/common/workingCopy.js';
+import { TestLayoutService } from '../../../../test/browser/workbenchTestServices.js';
+import { TestStorageService, TestWorkspaceTrustRequestService } from '../../../../test/common/workbenchTestServices.js';
+import { FontInfo } from '../../../../../editor/common/config/fontInfo.js';
+import { EditorFontLigatures, EditorFontVariations } from '../../../../../editor/common/config/editorOptions.js';
+import { ICodeEditorService } from '../../../../../editor/browser/services/codeEditorService.js';
+import { mainWindow } from '../../../../../base/browser/window.js';
+import { TestCodeEditorService } from '../../../../../editor/test/browser/editorTestServices.js';
+import { INotebookCellOutlineDataSourceFactory, NotebookCellOutlineDataSourceFactory } from '../../browser/viewModel/notebookOutlineDataSourceFactory.js';
+import { ILanguageDetectionService } from '../../../../services/languageDetection/common/languageDetectionWorkerService.js';
+import { INotebookOutlineEntryFactory, NotebookOutlineEntryFactory } from '../../browser/viewModel/notebookOutlineEntryFactory.js';
+import { IOutlineService } from '../../../../services/outline/browser/outline.js';
 
 export class TestCell extends NotebookCellTextModel {
 	constructor(
@@ -178,7 +180,7 @@ export class NotebookEditorTestModel extends EditorModel implements INotebookEdi
 	}
 }
 
-export function setupInstantiationService(disposables: DisposableStore) {
+export function setupInstantiationService(disposables: Pick<DisposableStore, 'add'>) {
 	const instantiationService = disposables.add(new TestInstantiationService());
 	const testThemeService = new TestThemeService();
 	instantiationService.stub(ILanguageService, disposables.add(new LanguageService()));
@@ -199,7 +201,9 @@ export function setupInstantiationService(disposables: DisposableStore) {
 	instantiationService.stub(IKeybindingService, new MockKeybindingService());
 	instantiationService.stub(INotebookCellStatusBarService, disposables.add(new NotebookCellStatusBarService()));
 	instantiationService.stub(ICodeEditorService, disposables.add(new TestCodeEditorService(testThemeService)));
-	instantiationService.stub(INotebookCellOutlineProviderFactory, instantiationService.createInstance(NotebookCellOutlineProviderFactory));
+	instantiationService.stub(IOutlineService, new class extends mock<IOutlineService>() { override registerOutlineCreator() { return { dispose() { } }; } });
+	instantiationService.stub(INotebookCellOutlineDataSourceFactory, instantiationService.createInstance(NotebookCellOutlineDataSourceFactory));
+	instantiationService.stub(INotebookOutlineEntryFactory, instantiationService.createInstance(NotebookOutlineEntryFactory));
 
 	instantiationService.stub(ILanguageDetectionService, new class MockLanguageDetectionService implements ILanguageDetectionService {
 		_serviceBrand: undefined;
@@ -217,7 +221,7 @@ export function setupInstantiationService(disposables: DisposableStore) {
 function _createTestNotebookEditor(instantiationService: TestInstantiationService, disposables: DisposableStore, cells: MockNotebookCell[]): { editor: IActiveNotebookEditorDelegate; viewModel: NotebookViewModel } {
 
 	const viewType = 'notebook';
-	const notebook = disposables.add(instantiationService.createInstance(NotebookTextModel, viewType, URI.parse('test'), cells.map((cell): ICellDto2 => {
+	const notebook = disposables.add(instantiationService.createInstance(NotebookTextModel, viewType, URI.parse('test://test'), cells.map((cell): ICellDto2 => {
 		return {
 			source: cell[0],
 			mime: undefined,
@@ -229,7 +233,7 @@ function _createTestNotebookEditor(instantiationService: TestInstantiationServic
 	}), {}, { transientCellMetadata: {}, transientDocumentMetadata: {}, cellContentMetadata: {}, transientOutputs: false }));
 
 	const model = disposables.add(new NotebookEditorTestModel(notebook));
-	const notebookOptions = disposables.add(new NotebookOptions(mainWindow, instantiationService.get(IConfigurationService), instantiationService.get(INotebookExecutionStateService), instantiationService.get(ICodeEditorService), false));
+	const notebookOptions = disposables.add(new NotebookOptions(mainWindow, false, undefined, instantiationService.get(IConfigurationService), instantiationService.get(INotebookExecutionStateService), instantiationService.get(ICodeEditorService)));
 	const baseCellEditorOptions = new class extends mock<IBaseCellEditorOptions>() { };
 	const viewContext = new ViewContext(notebookOptions, disposables.add(new NotebookEventDispatcher()), () => baseCellEditorOptions);
 	const viewModel: NotebookViewModel = disposables.add(instantiationService.createInstance(NotebookViewModel, viewType, model.notebook, viewContext, null, { isReadOnly: false }));
@@ -296,6 +300,7 @@ function _createTestNotebookEditor(instantiationService: TestInstantiationServic
 		override setCellEditorSelection() { }
 		override async revealRangeInCenterIfOutsideViewportAsync() { }
 		override async layoutNotebookCell() { }
+		override async createOutput() { }
 		override async removeInset() { }
 		override async focusNotebookCell(cell: ICellViewModel, focusItem: 'editor' | 'container' | 'output') {
 			cell.focusMode = focusItem === 'editor' ? CellFocusMode.Editor
@@ -311,7 +316,7 @@ function _createTestNotebookEditor(instantiationService: TestInstantiationServic
 		override get onDidChangeSelection() { return viewModel.onDidChangeSelection as Event<any>; }
 		override get onDidChangeOptions() { return viewModel.onDidChangeOptions; }
 		override get onDidChangeViewCells() { return viewModel.onDidChangeViewCells; }
-		override async find(query: string, options: INotebookSearchOptions): Promise<CellFindMatchWithIndex[]> {
+		override async find(query: string, options: INotebookFindOptions): Promise<CellFindMatchWithIndex[]> {
 			const findMatches = viewModel.find(query, options).filter(match => match.length > 0);
 			return findMatches;
 		}
@@ -377,12 +382,18 @@ export async function withTestNotebookDiffModel<R = any>(originalCells: [source:
 		override get notebook() {
 			return originalNotebook.viewModel.notebookDocument;
 		}
+		override get resource() {
+			return originalNotebook.viewModel.notebookDocument.uri;
+		}
 	};
 
 	const modifiedResource = new class extends mock<IResolvedNotebookEditorModel>() {
 		override get notebook() {
 			return modifiedNotebook.viewModel.notebookDocument;
 		}
+		override get resource() {
+			return modifiedNotebook.viewModel.notebookDocument.uri;
+		}
 	};
 
 	const model = new class extends mock<INotebookDiffEditorModel>() {
@@ -398,15 +409,19 @@ export async function withTestNotebookDiffModel<R = any>(originalCells: [source:
 	if (res instanceof Promise) {
 		res.finally(() => {
 			originalNotebook.editor.dispose();
+			originalNotebook.viewModel.notebookDocument.dispose();
 			originalNotebook.viewModel.dispose();
 			modifiedNotebook.editor.dispose();
+			modifiedNotebook.viewModel.notebookDocument.dispose();
 			modifiedNotebook.viewModel.dispose();
 			disposables.dispose();
 		});
 	} else {
 		originalNotebook.editor.dispose();
+		originalNotebook.viewModel.notebookDocument.dispose();
 		originalNotebook.viewModel.dispose();
 		modifiedNotebook.editor.dispose();
+		modifiedNotebook.viewModel.notebookDocument.dispose();
 		modifiedNotebook.viewModel.dispose();
 		disposables.dispose();
 	}
@@ -471,7 +486,7 @@ export function createNotebookCellList(instantiationService: TestInstantiationSe
 	};
 
 	const notebookOptions = !!viewContext ? viewContext.notebookOptions
-		: disposables.add(new NotebookOptions(mainWindow, instantiationService.get(IConfigurationService), instantiationService.get(INotebookExecutionStateService), instantiationService.get(ICodeEditorService), false));
+		: disposables.add(new NotebookOptions(mainWindow, false, undefined, instantiationService.get(IConfigurationService), instantiationService.get(INotebookExecutionStateService), instantiationService.get(ICodeEditorService)));
 	const cellList: NotebookCellList = disposables.add(instantiationService.createInstance(
 		NotebookCellList,
 		'NotebookCellList',
diff --git a/src/vs/workbench/contrib/outline/browser/outline.contribution.ts b/src/vs/workbench/contrib/outline/browser/outline.contribution.ts
index 794c8bdfdd3..bb8dd6560d4 100644
--- a/src/vs/workbench/contrib/outline/browser/outline.contribution.ts
+++ b/src/vs/workbench/contrib/outline/browser/outline.contribution.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize, localize2 } from 'vs/nls';
-import { IViewsRegistry, Extensions as ViewExtensions } from 'vs/workbench/common/views';
-import { OutlinePane } from './outlinePane';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
-import { VIEW_CONTAINER } from 'vs/workbench/contrib/files/browser/explorerViewlet';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { Codicon } from 'vs/base/common/codicons';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { OutlineConfigKeys } from 'vs/workbench/services/outline/browser/outline';
-import { IOutlinePane } from 'vs/workbench/contrib/outline/browser/outline';
+import { localize, localize2 } from '../../../../nls.js';
+import { IViewsRegistry, Extensions as ViewExtensions } from '../../../common/views.js';
+import { OutlinePane } from './outlinePane.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { VIEW_CONTAINER } from '../../files/browser/explorerViewlet.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { OutlineConfigKeys } from '../../../services/outline/browser/outline.js';
+import { IOutlinePane } from './outline.js';
 
 // --- actions
 
-import './outlineActions';
+import './outlineActions.js';
 
 // --- view
 
diff --git a/src/vs/workbench/contrib/outline/browser/outline.ts b/src/vs/workbench/contrib/outline/browser/outline.ts
index ac25b5ee279..6e2228a4356 100644
--- a/src/vs/workbench/contrib/outline/browser/outline.ts
+++ b/src/vs/workbench/contrib/outline/browser/outline.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import type { IView } from 'vs/workbench/common/views';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import type { IView } from '../../../common/views.js';
 
 export const enum OutlineSortOrder {
 	ByPosition,
diff --git a/src/vs/workbench/contrib/outline/browser/outlineActions.ts b/src/vs/workbench/contrib/outline/browser/outlineActions.ts
index bf140f5a63c..0b7b82e4552 100644
--- a/src/vs/workbench/contrib/outline/browser/outlineActions.ts
+++ b/src/vs/workbench/contrib/outline/browser/outlineActions.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { Codicon } from 'vs/base/common/codicons';
-import { MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ViewAction } from 'vs/workbench/browser/parts/views/viewPane';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ctxAllCollapsed, ctxFilterOnType, ctxFollowsCursor, ctxSortMode, IOutlinePane, OutlineSortOrder } from 'vs/workbench/contrib/outline/browser/outline';
+import { localize } from '../../../../nls.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { ViewAction } from '../../../browser/parts/views/viewPane.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { ctxAllCollapsed, ctxFilterOnType, ctxFollowsCursor, ctxSortMode, IOutlinePane, OutlineSortOrder } from './outline.js';
 
 
 // --- commands
diff --git a/src/vs/workbench/contrib/outline/browser/outlinePane.ts b/src/vs/workbench/contrib/outline/browser/outlinePane.ts
index 33192e08dc2..50389f95534 100644
--- a/src/vs/workbench/contrib/outline/browser/outlinePane.ts
+++ b/src/vs/workbench/contrib/outline/browser/outlinePane.ts
@@ -3,40 +3,40 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./outlinePane';
-import * as dom from 'vs/base/browser/dom';
-import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
-import { TimeoutTimer, timeout } from 'vs/base/common/async';
-import { IDisposable, toDisposable, DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
-import { LRUCache } from 'vs/base/common/map';
-import { localize } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { WorkbenchDataTree } from 'vs/platform/list/browser/listService';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
-import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { FuzzyScore } from 'vs/base/common/filters';
-import { basename } from 'vs/base/common/resources';
-import { IViewDescriptorService } from 'vs/workbench/common/views';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { OutlineViewState } from './outlineViewState';
-import { IOutline, IOutlineComparator, IOutlineService, OutlineTarget } from 'vs/workbench/services/outline/browser/outline';
-import { EditorResourceAccessor, IEditorPane } from 'vs/workbench/common/editor';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Event } from 'vs/base/common/event';
-import { ITreeSorter } from 'vs/base/browser/ui/tree/tree';
-import { AbstractTreeViewState, IAbstractTreeViewState, TreeFindMode } from 'vs/base/browser/ui/tree/abstractTree';
-import { URI } from 'vs/base/common/uri';
-import { ctxAllCollapsed, ctxFilterOnType, ctxFollowsCursor, ctxSortMode, IOutlinePane, OutlineSortOrder } from 'vs/workbench/contrib/outline/browser/outline';
-import { defaultProgressBarStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import './outlinePane.css';
+import * as dom from '../../../../base/browser/dom.js';
+import { ProgressBar } from '../../../../base/browser/ui/progressbar/progressbar.js';
+import { TimeoutTimer, timeout } from '../../../../base/common/async.js';
+import { IDisposable, toDisposable, DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { LRUCache } from '../../../../base/common/map.js';
+import { localize } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { WorkbenchDataTree } from '../../../../platform/list/browser/listService.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ViewPane } from '../../../browser/parts/views/viewPane.js';
+import { IViewletViewOptions } from '../../../browser/parts/views/viewsViewlet.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { FuzzyScore } from '../../../../base/common/filters.js';
+import { basename } from '../../../../base/common/resources.js';
+import { IViewDescriptorService } from '../../../common/views.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { OutlineViewState } from './outlineViewState.js';
+import { IOutline, IOutlineComparator, IOutlineService, OutlineTarget } from '../../../services/outline/browser/outline.js';
+import { EditorResourceAccessor, IEditorPane } from '../../../common/editor.js';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { Event } from '../../../../base/common/event.js';
+import { ITreeSorter } from '../../../../base/browser/ui/tree/tree.js';
+import { AbstractTreeViewState, IAbstractTreeViewState, TreeFindMode } from '../../../../base/browser/ui/tree/abstractTree.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ctxAllCollapsed, ctxFilterOnType, ctxFollowsCursor, ctxSortMode, IOutlinePane, OutlineSortOrder } from './outline.js';
+import { defaultProgressBarStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 
 class OutlineTreeSorter<E> implements ITreeSorter<E> {
 
diff --git a/src/vs/workbench/contrib/outline/browser/outlineViewState.ts b/src/vs/workbench/contrib/outline/browser/outlineViewState.ts
index a4a173bffaf..2adc50df7c6 100644
--- a/src/vs/workbench/contrib/outline/browser/outlineViewState.ts
+++ b/src/vs/workbench/contrib/outline/browser/outlineViewState.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IOutlineViewState, OutlineSortOrder } from 'vs/workbench/contrib/outline/browser/outline';
+import { Emitter } from '../../../../base/common/event.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IOutlineViewState, OutlineSortOrder } from './outline.js';
 
 export class OutlineViewState implements IOutlineViewState {
 
diff --git a/src/vs/workbench/contrib/output/browser/output.contribution.ts b/src/vs/workbench/contrib/output/browser/output.contribution.ts
index 6d3f4d9ad31..a06d596b9b0 100644
--- a/src/vs/workbench/contrib/output/browser/output.contribution.ts
+++ b/src/vs/workbench/contrib/output/browser/output.contribution.ts
@@ -3,35 +3,40 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes';
-import { ModesRegistry } from 'vs/editor/common/languages/modesRegistry';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { MenuId, registerAction2, Action2, MenuRegistry } from 'vs/platform/actions/common/actions';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { OutputService } from 'vs/workbench/contrib/output/browser/outputServices';
-import { OUTPUT_MODE_ID, OUTPUT_MIME, OUTPUT_VIEW_ID, IOutputService, CONTEXT_IN_OUTPUT, LOG_MODE_ID, LOG_MIME, CONTEXT_ACTIVE_FILE_OUTPUT, CONTEXT_OUTPUT_SCROLL_LOCK, IOutputChannelDescriptor, IFileOutputChannelDescriptor, ACTIVE_OUTPUT_CHANNEL_CONTEXT, CONTEXT_ACTIVE_OUTPUT_LEVEL_SETTABLE, IOutputChannelRegistry, Extensions, CONTEXT_ACTIVE_OUTPUT_LEVEL, CONTEXT_ACTIVE_OUTPUT_LEVEL_IS_DEFAULT } from 'vs/workbench/services/output/common/output';
-import { OutputViewPane } from 'vs/workbench/contrib/output/browser/outputView';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ViewContainer, IViewContainersRegistry, ViewContainerLocation, Extensions as ViewContainerExtensions, IViewsRegistry } from 'vs/workbench/common/views';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
-import { IQuickPickItem, IQuickInputService, IQuickPickSeparator, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
-import { AUX_WINDOW_GROUP, AUX_WINDOW_GROUP_TYPE, IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { assertIsDefined } from 'vs/base/common/types';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { Codicon } from 'vs/base/common/codicons';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { Disposable, dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { AccessibilitySignal, IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { ILoggerService, LogLevel, LogLevelToLocalizedString, LogLevelToString } from 'vs/platform/log/common/log';
-import { IDefaultLogLevelsService } from 'vs/workbench/contrib/logs/common/defaultLogLevels';
+import * as nls from '../../../../nls.js';
+import { KeyMod, KeyChord, KeyCode } from '../../../../base/common/keyCodes.js';
+import { ModesRegistry } from '../../../../editor/common/languages/modesRegistry.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { MenuId, registerAction2, Action2, MenuRegistry } from '../../../../platform/actions/common/actions.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { OutputService } from './outputServices.js';
+import { OUTPUT_MODE_ID, OUTPUT_MIME, OUTPUT_VIEW_ID, IOutputService, CONTEXT_IN_OUTPUT, LOG_MODE_ID, LOG_MIME, CONTEXT_ACTIVE_FILE_OUTPUT, CONTEXT_OUTPUT_SCROLL_LOCK, IOutputChannelDescriptor, IFileOutputChannelDescriptor, ACTIVE_OUTPUT_CHANNEL_CONTEXT, CONTEXT_ACTIVE_OUTPUT_LEVEL_SETTABLE, IOutputChannelRegistry, Extensions, CONTEXT_ACTIVE_OUTPUT_LEVEL, CONTEXT_ACTIVE_OUTPUT_LEVEL_IS_DEFAULT } from '../../../services/output/common/output.js';
+import { OutputViewPane } from './outputView.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from '../../../common/contributions.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { ViewContainer, IViewContainersRegistry, ViewContainerLocation, Extensions as ViewContainerExtensions, IViewsRegistry } from '../../../common/views.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { ViewPaneContainer } from '../../../browser/parts/views/viewPaneContainer.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { IQuickPickItem, IQuickInputService, IQuickPickSeparator, QuickPickInput } from '../../../../platform/quickinput/common/quickInput.js';
+import { AUX_WINDOW_GROUP, AUX_WINDOW_GROUP_TYPE, IEditorService } from '../../../services/editor/common/editorService.js';
+import { assertIsDefined } from '../../../../base/common/types.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { Disposable, dispose, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.js';
+import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { ILoggerService, LogLevel, LogLevelToLocalizedString, LogLevelToString } from '../../../../platform/log/common/log.js';
+import { IDefaultLogLevelsService } from '../../logs/common/defaultLogLevels.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
+import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from '../../../../platform/accessibility/common/accessibility.js';
+import { IsWindowsContext } from '../../../../platform/contextkey/common/contextkeys.js';
+import { FocusedViewContext } from '../../../common/contextkeys.js';
 
 // Register Service
 registerSingleton(IOutputService, OutputService, InstantiationType.Delayed);
@@ -541,3 +546,28 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).regis
 		}
 	}
 });
+
+KeybindingsRegistry.registerKeybindingRule({
+	id: 'cursorWordAccessibilityLeft',
+	when: ContextKeyExpr.and(EditorContextKeys.textInputFocus, CONTEXT_ACCESSIBILITY_MODE_ENABLED, IsWindowsContext, ContextKeyExpr.equals(FocusedViewContext.key, OUTPUT_VIEW_ID)),
+	primary: KeyMod.CtrlCmd | KeyCode.LeftArrow,
+	weight: KeybindingWeight.WorkbenchContrib
+});
+KeybindingsRegistry.registerKeybindingRule({
+	id: 'cursorWordAccessibilityLeftSelect',
+	when: ContextKeyExpr.and(EditorContextKeys.textInputFocus, CONTEXT_ACCESSIBILITY_MODE_ENABLED, IsWindowsContext, ContextKeyExpr.equals(FocusedViewContext.key, OUTPUT_VIEW_ID)),
+	primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.LeftArrow,
+	weight: KeybindingWeight.WorkbenchContrib
+});
+KeybindingsRegistry.registerKeybindingRule({
+	id: 'cursorWordAccessibilityRight',
+	when: ContextKeyExpr.and(EditorContextKeys.textInputFocus, CONTEXT_ACCESSIBILITY_MODE_ENABLED, IsWindowsContext, ContextKeyExpr.equals(FocusedViewContext.key, OUTPUT_VIEW_ID)),
+	primary: KeyMod.CtrlCmd | KeyCode.RightArrow,
+	weight: KeybindingWeight.WorkbenchContrib
+});
+KeybindingsRegistry.registerKeybindingRule({
+	id: 'cursorWordAccessibilityRightSelect',
+	when: ContextKeyExpr.and(EditorContextKeys.textInputFocus, CONTEXT_ACCESSIBILITY_MODE_ENABLED, IsWindowsContext, ContextKeyExpr.equals(FocusedViewContext.key, OUTPUT_VIEW_ID)),
+	primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.RightArrow,
+	weight: KeybindingWeight.WorkbenchContrib
+});
diff --git a/src/vs/workbench/contrib/output/browser/outputLinkProvider.ts b/src/vs/workbench/contrib/output/browser/outputLinkProvider.ts
index 3b82ad1889e..e1b956a62ae 100644
--- a/src/vs/workbench/contrib/output/browser/outputLinkProvider.ts
+++ b/src/vs/workbench/contrib/output/browser/outputLinkProvider.ts
@@ -3,30 +3,30 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILink } from 'vs/editor/common/languages';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { OUTPUT_MODE_ID, LOG_MODE_ID } from 'vs/workbench/services/output/common/output';
-import { MonacoWebWorker, createWebWorker } from 'vs/editor/browser/services/webWorker';
-import { ICreateData, OutputLinkComputer } from 'vs/workbench/contrib/output/common/outputLinkComputer';
-import { IDisposable, dispose, Disposable } from 'vs/base/common/lifecycle';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
+import { URI } from '../../../../base/common/uri.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ILink } from '../../../../editor/common/languages.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { OUTPUT_MODE_ID, LOG_MODE_ID } from '../../../services/output/common/output.js';
+import { OutputLinkComputer } from '../common/outputLinkComputer.js';
+import { IDisposable, dispose, Disposable } from '../../../../base/common/lifecycle.js';
+import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
+import { createWebWorker } from '../../../../base/browser/defaultWorkerFactory.js';
+import { IWorkerClient } from '../../../../base/common/worker/simpleWorker.js';
+import { WorkerTextModelSyncClient } from '../../../../editor/common/services/textModelSync/textModelSync.impl.js';
 
 export class OutputLinkProvider extends Disposable {
 
 	private static readonly DISPOSE_WORKER_TIME = 3 * 60 * 1000; // dispose worker after 3 minutes of inactivity
 
-	private worker?: MonacoWebWorker<OutputLinkComputer>;
+	private worker?: OutputLinkWorkerClient;
 	private disposeWorkerScheduler: RunOnceScheduler;
 	private linkProviderRegistration: IDisposable | undefined;
 
 	constructor(
 		@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
 		@IModelService private readonly modelService: IModelService,
-		@ILanguageConfigurationService private readonly languageConfigurationService: ILanguageConfigurationService,
 		@ILanguageFeaturesService private readonly languageFeaturesService: ILanguageFeaturesService,
 	) {
 		super();
@@ -65,28 +65,18 @@ export class OutputLinkProvider extends Disposable {
 		this.disposeWorkerScheduler.cancel();
 	}
 
-	private getOrCreateWorker(): MonacoWebWorker<OutputLinkComputer> {
+	private getOrCreateWorker(): OutputLinkWorkerClient {
 		this.disposeWorkerScheduler.schedule();
 
 		if (!this.worker) {
-			const createData: ICreateData = {
-				workspaceFolders: this.contextService.getWorkspace().folders.map(folder => folder.uri.toString())
-			};
-
-			this.worker = createWebWorker<OutputLinkComputer>(this.modelService, this.languageConfigurationService, {
-				moduleId: 'vs/workbench/contrib/output/common/outputLinkComputer',
-				createData,
-				label: 'outputLinkComputer'
-			});
+			this.worker = new OutputLinkWorkerClient(this.contextService, this.modelService);
 		}
 
 		return this.worker;
 	}
 
 	private async provideLinks(modelUri: URI): Promise<ILink[]> {
-		const linkComputer = await this.getOrCreateWorker().withSyncedResources([modelUri]);
-
-		return linkComputer.computeLinks(modelUri.toString());
+		return this.getOrCreateWorker().provideLinks(modelUri);
 	}
 
 	private disposeWorker(): void {
@@ -96,3 +86,32 @@ export class OutputLinkProvider extends Disposable {
 		}
 	}
 }
+
+class OutputLinkWorkerClient extends Disposable {
+	private readonly _workerClient: IWorkerClient<OutputLinkComputer>;
+	private readonly _workerTextModelSyncClient: WorkerTextModelSyncClient;
+	private readonly _initializeBarrier: Promise<void>;
+
+	constructor(
+		@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
+		@IModelService modelService: IModelService,
+	) {
+		super();
+		this._workerClient = this._register(createWebWorker<OutputLinkComputer>(
+			'vs/workbench/contrib/output/common/outputLinkComputer',
+			'OutputLinkDetectionWorker'
+		));
+		this._workerTextModelSyncClient = WorkerTextModelSyncClient.create(this._workerClient, modelService);
+		this._initializeBarrier = this._ensureWorkspaceFolders();
+	}
+
+	private async _ensureWorkspaceFolders(): Promise<void> {
+		await this._workerClient.proxy.$setWorkspaceFolders(this.contextService.getWorkspace().folders.map(folder => folder.uri.toString()));
+	}
+
+	public async provideLinks(modelUri: URI): Promise<ILink[]> {
+		await this._initializeBarrier;
+		await this._workerTextModelSyncClient.ensureSyncedResources([modelUri]);
+		return this._workerClient.proxy.$computeLinks(modelUri.toString());
+	}
+}
diff --git a/src/vs/workbench/contrib/output/browser/outputServices.ts b/src/vs/workbench/contrib/output/browser/outputServices.ts
index 6521eeec891..25950e9f7e9 100644
--- a/src/vs/workbench/contrib/output/browser/outputServices.ts
+++ b/src/vs/workbench/contrib/output/browser/outputServices.ts
@@ -3,26 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event, Emitter } from 'vs/base/common/event';
-import { URI } from 'vs/base/common/uri';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IOutputChannel, IOutputService, OUTPUT_VIEW_ID, OUTPUT_SCHEME, LOG_MIME, OUTPUT_MIME, OutputChannelUpdateMode, IOutputChannelDescriptor, Extensions, IOutputChannelRegistry, ACTIVE_OUTPUT_CHANNEL_CONTEXT, CONTEXT_ACTIVE_FILE_OUTPUT, CONTEXT_ACTIVE_OUTPUT_LEVEL_SETTABLE, CONTEXT_ACTIVE_OUTPUT_LEVEL, CONTEXT_ACTIVE_OUTPUT_LEVEL_IS_DEFAULT } from 'vs/workbench/services/output/common/output';
-import { OutputLinkProvider } from 'vs/workbench/contrib/output/browser/outputLinkProvider';
-import { ITextModelService, ITextModelContentProvider } from 'vs/editor/common/services/resolverService';
-import { ITextModel } from 'vs/editor/common/model';
-import { ILogService, ILoggerService, LogLevelToString } from 'vs/platform/log/common/log';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IOutputChannelModel } from 'vs/workbench/contrib/output/common/outputChannelModel';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { OutputViewPane } from 'vs/workbench/contrib/output/browser/outputView';
-import { IOutputChannelModelService } from 'vs/workbench/contrib/output/common/outputChannelModelService';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { SetLogLevelAction } from 'vs/workbench/contrib/logs/common/logsActions';
-import { IDefaultLogLevelsService } from 'vs/workbench/contrib/logs/common/defaultLogLevels';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IOutputChannel, IOutputService, OUTPUT_VIEW_ID, LOG_MIME, OUTPUT_MIME, OutputChannelUpdateMode, IOutputChannelDescriptor, Extensions, IOutputChannelRegistry, ACTIVE_OUTPUT_CHANNEL_CONTEXT, CONTEXT_ACTIVE_FILE_OUTPUT, CONTEXT_ACTIVE_OUTPUT_LEVEL_SETTABLE, CONTEXT_ACTIVE_OUTPUT_LEVEL, CONTEXT_ACTIVE_OUTPUT_LEVEL_IS_DEFAULT } from '../../../services/output/common/output.js';
+import { OutputLinkProvider } from './outputLinkProvider.js';
+import { ITextModelService, ITextModelContentProvider } from '../../../../editor/common/services/resolverService.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { ILogService, ILoggerService, LogLevelToString } from '../../../../platform/log/common/log.js';
+import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.js';
+import { IOutputChannelModel } from '../common/outputChannelModel.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { OutputViewPane } from './outputView.js';
+import { IOutputChannelModelService } from '../common/outputChannelModelService.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { SetLogLevelAction } from '../../logs/common/logsActions.js';
+import { IDefaultLogLevelsService } from '../../logs/common/defaultLogLevels.js';
 
 const OUTPUT_ACTIVE_CHANNEL_KEY = 'output.activechannel';
 
@@ -42,7 +43,7 @@ class OutputChannel extends Disposable implements IOutputChannel {
 		super();
 		this.id = outputChannelDescriptor.id;
 		this.label = outputChannelDescriptor.label;
-		this.uri = URI.from({ scheme: OUTPUT_SCHEME, path: this.id });
+		this.uri = URI.from({ scheme: Schemas.outputChannel, path: this.id });
 		this.model = this._register(outputChannelModelService.createOutputChannelModel(this.id, this.uri, outputChannelDescriptor.languageId ? languageService.createById(outputChannelDescriptor.languageId) : languageService.createByMimeType(outputChannelDescriptor.log ? LOG_MIME : OUTPUT_MIME), outputChannelDescriptor.file));
 	}
 
@@ -103,7 +104,7 @@ export class OutputService extends Disposable implements IOutputService, ITextMo
 		this.activeOutputChannelLevelIsDefaultContext = CONTEXT_ACTIVE_OUTPUT_LEVEL_IS_DEFAULT.bindTo(contextKeyService);
 
 		// Register as text model content provider for output
-		this._register(textModelResolverService.registerTextModelContentProvider(OUTPUT_SCHEME, this));
+		this._register(textModelResolverService.registerTextModelContentProvider(Schemas.outputChannel, this));
 		this._register(instantiationService.createInstance(OutputLinkProvider));
 
 		// Create output channels for already registered channels
diff --git a/src/vs/workbench/contrib/output/browser/outputView.ts b/src/vs/workbench/contrib/output/browser/outputView.ts
index 19e5642f145..3876b25ea9e 100644
--- a/src/vs/workbench/contrib/output/browser/outputView.ts
+++ b/src/vs/workbench/contrib/output/browser/outputView.ts
@@ -2,39 +2,39 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import 'vs/css!./output';
-import * as nls from 'vs/nls';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IEditorOptions as ICodeEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IEditorOpenContext } from 'vs/workbench/common/editor';
-import { AbstractTextResourceEditor } from 'vs/workbench/browser/parts/editor/textResourceEditor';
-import { OUTPUT_VIEW_ID, CONTEXT_IN_OUTPUT, IOutputChannel, CONTEXT_OUTPUT_SCROLL_LOCK } from 'vs/workbench/services/output/common/output';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { CursorChangeReason } from 'vs/editor/common/cursorEvents';
-import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPane';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IViewDescriptorService } from 'vs/workbench/common/views';
-import { TextResourceEditorInput } from 'vs/workbench/common/editor/textResourceEditorInput';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { Dimension } from 'vs/base/browser/dom';
-import { ITextEditorOptions } from 'vs/platform/editor/common/editor';
-import { CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
-import { IFileService } from 'vs/platform/files/common/files';
-import { ResourceContextKey } from 'vs/workbench/common/contextkeys';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IEditorConfiguration } from 'vs/workbench/browser/parts/editor/textEditor';
-import { computeEditorAriaLabel } from 'vs/workbench/browser/editor';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import './output.css';
+import * as nls from '../../../../nls.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { IEditorOptions as ICodeEditorOptions } from '../../../../editor/common/config/editorOptions.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IContextKeyService, IContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IEditorOpenContext } from '../../../common/editor.js';
+import { AbstractTextResourceEditor } from '../../../browser/parts/editor/textResourceEditor.js';
+import { OUTPUT_VIEW_ID, CONTEXT_IN_OUTPUT, IOutputChannel, CONTEXT_OUTPUT_SCROLL_LOCK } from '../../../services/output/common/output.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { CursorChangeReason } from '../../../../editor/common/cursorEvents.js';
+import { ViewPane, IViewPaneOptions } from '../../../browser/parts/views/viewPane.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IViewDescriptorService } from '../../../common/views.js';
+import { TextResourceEditorInput } from '../../../common/editor/textResourceEditorInput.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { Dimension } from '../../../../base/browser/dom.js';
+import { ITextEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { CancelablePromise, createCancelablePromise } from '../../../../base/common/async.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { ResourceContextKey } from '../../../common/contextkeys.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { IEditorConfiguration } from '../../../browser/parts/editor/textEditor.js';
+import { computeEditorAriaLabel } from '../../../browser/editor.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 
 export class OutputViewPane extends ViewPane {
 
@@ -62,8 +62,8 @@ export class OutputViewPane extends ViewPane {
 		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
 		this.scrollLockContextKey = CONTEXT_OUTPUT_SCROLL_LOCK.bindTo(this.contextKeyService);
 
-		const editorInstantiationService = instantiationService.createChild(new ServiceCollection([IContextKeyService, this.scopedContextKeyService]));
-		this.editor = editorInstantiationService.createInstance(OutputEditor);
+		const editorInstantiationService = this._register(instantiationService.createChild(new ServiceCollection([IContextKeyService, this.scopedContextKeyService])));
+		this.editor = this._register(editorInstantiationService.createInstance(OutputEditor));
 		this._register(this.editor.onTitleAreaUpdate(() => {
 			this.updateTitle(this.editor.getTitle());
 			this.updateActions();
diff --git a/src/vs/workbench/contrib/output/common/outputChannelModel.ts b/src/vs/workbench/contrib/output/common/outputChannelModel.ts
index 07926124b30..8d813401113 100644
--- a/src/vs/workbench/contrib/output/common/outputChannelModel.ts
+++ b/src/vs/workbench/contrib/output/common/outputChannelModel.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import * as resources from 'vs/base/common/resources';
-import { ITextModel } from 'vs/editor/common/model';
-import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { Emitter, Event } from 'vs/base/common/event';
-import { URI } from 'vs/base/common/uri';
-import { Promises, ThrottledDelayer } from 'vs/base/common/async';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILanguageSelection } from 'vs/editor/common/languages/language';
-import { Disposable, toDisposable, IDisposable, dispose, MutableDisposable } from 'vs/base/common/lifecycle';
-import { isNumber } from 'vs/base/common/types';
-import { EditOperation, ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { ILogger, ILoggerService, ILogService } from 'vs/platform/log/common/log';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { OutputChannelUpdateMode } from 'vs/workbench/services/output/common/output';
-import { isCancellationError } from 'vs/base/common/errors';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import * as resources from '../../../../base/common/resources.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { IEditorWorkerService } from '../../../../editor/common/services/editorWorker.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Promises, ThrottledDelayer } from '../../../../base/common/async.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ILanguageSelection } from '../../../../editor/common/languages/language.js';
+import { Disposable, toDisposable, IDisposable, dispose, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { isNumber } from '../../../../base/common/types.js';
+import { EditOperation, ISingleEditOperation } from '../../../../editor/common/core/editOperation.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { ILogger, ILoggerService, ILogService } from '../../../../platform/log/common/log.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { OutputChannelUpdateMode } from '../../../services/output/common/output.js';
+import { isCancellationError } from '../../../../base/common/errors.js';
 
 export interface IOutputChannelModel extends IDisposable {
 	readonly onDispose: Event<void>;
diff --git a/src/vs/workbench/contrib/output/common/outputChannelModelService.ts b/src/vs/workbench/contrib/output/common/outputChannelModelService.ts
index ec25f0df576..3f500babda6 100644
--- a/src/vs/workbench/contrib/output/common/outputChannelModelService.ts
+++ b/src/vs/workbench/contrib/output/common/outputChannelModelService.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IFileService } from 'vs/platform/files/common/files';
-import { toLocalISOString } from 'vs/base/common/date';
-import { joinPath } from 'vs/base/common/resources';
-import { DelegatedOutputChannelModel, FileOutputChannelModel, IOutputChannelModel } from 'vs/workbench/contrib/output/common/outputChannelModel';
-import { URI } from 'vs/base/common/uri';
-import { ILanguageSelection } from 'vs/editor/common/languages/language';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { createDecorator, IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { toLocalISOString } from '../../../../base/common/date.js';
+import { joinPath } from '../../../../base/common/resources.js';
+import { DelegatedOutputChannelModel, FileOutputChannelModel, IOutputChannelModel } from './outputChannelModel.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ILanguageSelection } from '../../../../editor/common/languages/language.js';
 
 export const IOutputChannelModelService = createDecorator<IOutputChannelModelService>('outputChannelModelService');
 
diff --git a/src/vs/workbench/contrib/output/common/outputLinkComputer.ts b/src/vs/workbench/contrib/output/common/outputLinkComputer.ts
index 0de2f9f2e15..bed7368cf18 100644
--- a/src/vs/workbench/contrib/output/common/outputLinkComputer.ts
+++ b/src/vs/workbench/contrib/output/common/outputLinkComputer.ts
@@ -3,37 +3,41 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IMirrorModel, IWorkerContext } from 'vs/editor/common/services/editorSimpleWorker';
-import { ILink } from 'vs/editor/common/languages';
-import { URI } from 'vs/base/common/uri';
-import * as extpath from 'vs/base/common/extpath';
-import * as resources from 'vs/base/common/resources';
-import * as strings from 'vs/base/common/strings';
-import { Range } from 'vs/editor/common/core/range';
-import { isWindows } from 'vs/base/common/platform';
-import { Schemas } from 'vs/base/common/network';
-
-export interface ICreateData {
-	workspaceFolders: string[];
-}
+import { ILink } from '../../../../editor/common/languages.js';
+import { URI } from '../../../../base/common/uri.js';
+import * as extpath from '../../../../base/common/extpath.js';
+import * as resources from '../../../../base/common/resources.js';
+import * as strings from '../../../../base/common/strings.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { isWindows } from '../../../../base/common/platform.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { IRequestHandler, IWorkerServer } from '../../../../base/common/worker/simpleWorker.js';
+import { WorkerTextModelSyncServer, ICommonModel } from '../../../../editor/common/services/textModelSync/textModelSync.impl.js';
 
 export interface IResourceCreator {
 	toResource: (folderRelativePath: string) => URI | null;
 }
 
-export class OutputLinkComputer {
+export class OutputLinkComputer implements IRequestHandler {
+	_requestHandlerBrand: any;
+
+	private readonly workerTextModelSyncServer = new WorkerTextModelSyncServer();
 	private patterns = new Map<URI /* folder uri */, RegExp[]>();
 
-	constructor(private ctx: IWorkerContext, createData: ICreateData) {
-		this.computePatterns(createData);
+	constructor(workerServer: IWorkerServer) {
+		this.workerTextModelSyncServer.bindToServer(workerServer);
 	}
 
-	private computePatterns(createData: ICreateData): void {
+	$setWorkspaceFolders(workspaceFolders: string[]) {
+		this.computePatterns(workspaceFolders);
+	}
+
+	private computePatterns(_workspaceFolders: string[]): void {
 
 		// Produce patterns for each workspace root we are configured with
 		// This means that we will be able to detect links for paths that
 		// contain any of the workspace roots as segments.
-		const workspaceFolders = createData.workspaceFolders
+		const workspaceFolders = _workspaceFolders
 			.sort((resourceStrA, resourceStrB) => resourceStrB.length - resourceStrA.length) // longest paths first (for https://github.com/microsoft/vscode/issues/88121)
 			.map(resourceStr => URI.parse(resourceStr));
 
@@ -43,13 +47,11 @@ export class OutputLinkComputer {
 		}
 	}
 
-	private getModel(uri: string): IMirrorModel | undefined {
-		const models = this.ctx.getMirrorModels();
-
-		return models.find(model => model.uri.toString() === uri);
+	private getModel(uri: string): ICommonModel | undefined {
+		return this.workerTextModelSyncServer.getModel(uri);
 	}
 
-	computeLinks(uri: string): ILink[] {
+	$computeLinks(uri: string): ILink[] {
 		const model = this.getModel(uri);
 		if (!model) {
 			return [];
@@ -179,7 +181,10 @@ export class OutputLinkComputer {
 	}
 }
 
-// Export this function because this will be called by the web worker for computing links
-export function create(ctx: IWorkerContext, createData: ICreateData): OutputLinkComputer {
-	return new OutputLinkComputer(ctx, createData);
+/**
+ * Defines the worker entry point. Must be exported and named `create`.
+ * @skipMangle
+ */
+export function create(workerServer: IWorkerServer): OutputLinkComputer {
+	return new OutputLinkComputer(workerServer);
 }
diff --git a/src/vs/workbench/contrib/output/common/outputLinkComputerMain.ts b/src/vs/workbench/contrib/output/common/outputLinkComputerMain.ts
new file mode 100644
index 00000000000..3f296c6d279
--- /dev/null
+++ b/src/vs/workbench/contrib/output/common/outputLinkComputerMain.ts
@@ -0,0 +1,9 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { create } from './outputLinkComputer.js';
+import { bootstrapSimpleWorker } from '../../../../base/common/worker/simpleWorkerBootstrap.js';
+
+bootstrapSimpleWorker(create);
diff --git a/src/vs/workbench/contrib/output/test/browser/outputLinkProvider.test.ts b/src/vs/workbench/contrib/output/test/browser/outputLinkProvider.test.ts
index 722c80940c9..8f62d74399f 100644
--- a/src/vs/workbench/contrib/output/test/browser/outputLinkProvider.test.ts
+++ b/src/vs/workbench/contrib/output/test/browser/outputLinkProvider.test.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { isMacintosh, isLinux, isWindows } from 'vs/base/common/platform';
-import { OutputLinkComputer } from 'vs/workbench/contrib/output/common/outputLinkComputer';
-import { TestContextService } from 'vs/workbench/test/common/workbenchTestServices';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { URI } from '../../../../../base/common/uri.js';
+import { isMacintosh, isLinux, isWindows } from '../../../../../base/common/platform.js';
+import { OutputLinkComputer } from '../../common/outputLinkComputer.js';
+import { TestContextService } from '../../../../test/common/workbenchTestServices.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('OutputLinkProvider', () => {
 
diff --git a/src/vs/workbench/contrib/performance/browser/inputLatencyContrib.ts b/src/vs/workbench/contrib/performance/browser/inputLatencyContrib.ts
index 6d35f4c07f1..80676ac2b56 100644
--- a/src/vs/workbench/contrib/performance/browser/inputLatencyContrib.ts
+++ b/src/vs/workbench/contrib/performance/browser/inputLatencyContrib.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { inputLatency } from 'vs/base/browser/performance';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { Event } from 'vs/base/common/event';
-import { Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { inputLatency } from '../../../../base/browser/performance.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { Event } from '../../../../base/common/event.js';
+import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
 
 export class InputLatencyContrib extends Disposable implements IWorkbenchContribution {
 	private readonly _listener = this._register(new MutableDisposable());
diff --git a/src/vs/workbench/contrib/performance/browser/performance.contribution.ts b/src/vs/workbench/contrib/performance/browser/performance.contribution.ts
index 18f8d85b4cc..a4b1a39c3e4 100644
--- a/src/vs/workbench/contrib/performance/browser/performance.contribution.ts
+++ b/src/vs/workbench/contrib/performance/browser/performance.contribution.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize2 } from 'vs/nls';
-import { registerAction2, Action2 } from 'vs/platform/actions/common/actions';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { Extensions, IWorkbenchContributionsRegistry, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { EditorExtensions, IEditorSerializer, IEditorFactoryRegistry } from 'vs/workbench/common/editor';
-import { PerfviewContrib, PerfviewInput } from 'vs/workbench/contrib/performance/browser/perfviewEditor';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { InstantiationService, Trace } from 'vs/platform/instantiation/common/instantiationService';
-import { EventProfiling } from 'vs/base/common/event';
-import { InputLatencyContrib } from 'vs/workbench/contrib/performance/browser/inputLatencyContrib';
+import { localize2 } from '../../../../nls.js';
+import { registerAction2, Action2 } from '../../../../platform/actions/common/actions.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { Extensions, IWorkbenchContributionsRegistry, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { EditorExtensions, IEditorSerializer, IEditorFactoryRegistry } from '../../../common/editor.js';
+import { PerfviewContrib, PerfviewInput } from './perfviewEditor.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { InstantiationService, Trace } from '../../../../platform/instantiation/common/instantiationService.js';
+import { EventProfiling } from '../../../../base/common/event.js';
+import { InputLatencyContrib } from './inputLatencyContrib.js';
 
 // -- startup performance view
 
diff --git a/src/vs/workbench/contrib/performance/browser/performance.web.contribution.ts b/src/vs/workbench/contrib/performance/browser/performance.web.contribution.ts
index 3d4daca704a..41462d14743 100644
--- a/src/vs/workbench/contrib/performance/browser/performance.web.contribution.ts
+++ b/src/vs/workbench/contrib/performance/browser/performance.web.contribution.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Extensions, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
-import { BrowserResourcePerformanceMarks, BrowserStartupTimings } from 'vs/workbench/contrib/performance/browser/startupTimings';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Extensions, IWorkbenchContributionsRegistry } from '../../../common/contributions.js';
+import { BrowserResourcePerformanceMarks, BrowserStartupTimings } from './startupTimings.js';
 
 // -- startup timings
 
diff --git a/src/vs/workbench/contrib/performance/browser/perfviewEditor.ts b/src/vs/workbench/contrib/performance/browser/perfviewEditor.ts
index 81653b58f6d..37559fe0aa3 100644
--- a/src/vs/workbench/contrib/performance/browser/perfviewEditor.ts
+++ b/src/vs/workbench/contrib/performance/browser/perfviewEditor.ts
@@ -3,34 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { URI } from 'vs/base/common/uri';
-import { TextResourceEditorInput } from 'vs/workbench/common/editor/textResourceEditorInput';
-import { ITextModelService, ITextModelContentProvider } from 'vs/editor/common/services/resolverService';
-import { ITextModel } from 'vs/editor/common/model';
-import { ILifecycleService, LifecyclePhase, StartupKindToString } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ITimerService } from 'vs/workbench/services/timer/browser/timerService';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { writeTransientState } from 'vs/workbench/contrib/codeEditor/browser/toggleWordWrap';
-import { LoaderEventType, LoaderStats, isESM } from 'vs/base/common/amd';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ByteSize, IFileService } from 'vs/platform/files/common/files';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { isWeb } from 'vs/base/common/platform';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal';
-import * as perf from 'vs/base/common/performance';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, getWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { ICustomEditorLabelService } from 'vs/workbench/services/editor/common/customEditorLabelService';
+import { localize } from '../../../../nls.js';
+import { URI } from '../../../../base/common/uri.js';
+import { TextResourceEditorInput } from '../../../common/editor/textResourceEditorInput.js';
+import { ITextModelService, ITextModelContentProvider } from '../../../../editor/common/services/resolverService.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { ILifecycleService, LifecyclePhase, StartupKindToString } from '../../../services/lifecycle/common/lifecycle.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ITimerService } from '../../../services/timer/browser/timerService.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IDisposable, dispose } from '../../../../base/common/lifecycle.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { writeTransientState } from '../../codeEditor/browser/toggleWordWrap.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { ByteSize, IFileService } from '../../../../platform/files/common/files.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { isWeb } from '../../../../base/common/platform.js';
+import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.js';
+import { ITerminalService } from '../../terminal/browser/terminal.js';
+import * as perf from '../../../../base/common/performance.js';
+import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, getWorkbenchContribution } from '../../../common/contributions.js';
+import { ICustomEditorLabelService } from '../../../services/editor/common/customEditorLabelService.js';
+import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';
 
 export class PerfviewContrib {
 
@@ -112,6 +112,7 @@ class PerfModelContentProvider implements ITextModelContentProvider {
 		@ITimerService private readonly _timerService: ITimerService,
 		@IExtensionService private readonly _extensionService: IExtensionService,
 		@IProductService private readonly _productService: IProductService,
+		@IRemoteAgentService private readonly _remoteAgentService: IRemoteAgentService,
 		@ITerminalService private readonly _terminalService: ITerminalService
 	) { }
 
@@ -139,15 +140,15 @@ class PerfModelContentProvider implements ITextModelContentProvider {
 			this._timerService.whenReady(),
 			this._lifecycleService.when(LifecyclePhase.Eventually),
 			this._extensionService.whenInstalledExtensionsRegistered(),
-			this._terminalService.whenConnected
+			// The terminal service never connects to the pty host on the web
+			isWeb && !this._remoteAgentService.getConnection()?.remoteAuthority ? Promise.resolve() : this._terminalService.whenConnected
 		]).then(() => {
 			if (this._model && !this._model.isDisposed()) {
 
-				const stats = LoaderStats.get();
 				const md = new MarkdownBuilder();
 				this._addSummary(md);
 				md.blank();
-				this._addSummaryTable(md, stats);
+				this._addSummaryTable(md);
 				md.blank();
 				this._addExtensionsTable(md);
 				md.blank();
@@ -156,12 +157,6 @@ class PerfModelContentProvider implements ITextModelContentProvider {
 				this._addWorkbenchContributionsPerfMarksTable(md);
 				md.blank();
 				this._addRawPerfMarks(md);
-				if (!isESM) {
-					md.blank();
-					this._addLoaderStats(md, stats);
-					md.blank();
-					this._addCachedDataStats(md);
-				}
 				md.blank();
 				this._addResourceTimingStats(md);
 
@@ -192,7 +187,7 @@ class PerfModelContentProvider implements ITextModelContentProvider {
 		md.li(`Empty Workspace: ${metrics.emptyWorkbench}`);
 	}
 
-	private _addSummaryTable(md: MarkdownBuilder, stats?: LoaderStats): void {
+	private _addSummaryTable(md: MarkdownBuilder): void {
 
 		const metrics = this._timerService.startupMetrics;
 		const contribTimings = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).timings;
@@ -200,13 +195,13 @@ class PerfModelContentProvider implements ITextModelContentProvider {
 		const table: Array<Array<string | number | undefined>> = [];
 		table.push(['start => app.isReady', metrics.timers.ellapsedAppReady, '[main]', `initial startup: ${metrics.initialStartup}`]);
 		table.push(['nls:start => nls:end', metrics.timers.ellapsedNlsGeneration, '[main]', `initial startup: ${metrics.initialStartup}`]);
-		table.push(['require(main.bundle.js)', metrics.timers.ellapsedLoadMainBundle, '[main]', `initial startup: ${metrics.initialStartup}`]);
+		table.push(['import(main.bundle.js)', metrics.timers.ellapsedLoadMainBundle, '[main]', `initial startup: ${metrics.initialStartup}`]);
 		table.push(['start crash reporter', metrics.timers.ellapsedCrashReporter, '[main]', `initial startup: ${metrics.initialStartup}`]);
 		table.push(['serve main IPC handle', metrics.timers.ellapsedMainServer, '[main]', `initial startup: ${metrics.initialStartup}`]);
 		table.push(['create window', metrics.timers.ellapsedWindowCreate, '[main]', `initial startup: ${metrics.initialStartup}, ${metrics.initialStartup ? `state: ${metrics.timers.ellapsedWindowRestoreState}ms, widget: ${metrics.timers.ellapsedBrowserWindowCreate}ms, show: ${metrics.timers.ellapsedWindowMaximize}ms` : ''}`]);
 		table.push(['app.isReady => window.loadUrl()', metrics.timers.ellapsedWindowLoad, '[main]', `initial startup: ${metrics.initialStartup}`]);
-		table.push(['window.loadUrl() => begin to require(workbench.desktop.main.js)', metrics.timers.ellapsedWindowLoadToRequire, '[main->renderer]', StartupKindToString(metrics.windowKind)]);
-		table.push(['require(workbench.desktop.main.js)', metrics.timers.ellapsedRequire, '[renderer]', `cached data: ${(metrics.didUseCachedData ? 'YES' : 'NO')}${stats ? `, node_modules took ${stats.nodeRequireTotal}ms` : ''}`]);
+		table.push(['window.loadUrl() => begin to import(workbench.desktop.main.js)', metrics.timers.ellapsedWindowLoadToRequire, '[main->renderer]', StartupKindToString(metrics.windowKind)]);
+		table.push(['import(workbench.desktop.main.js)', metrics.timers.ellapsedRequire, '[renderer]', `cached data: ${(metrics.didUseCachedData ? 'YES' : 'NO')}`]);
 		table.push(['wait for window config', metrics.timers.ellapsedWaitForWindowConfig, '[renderer]', undefined]);
 		table.push(['init storage (global & workspace)', metrics.timers.ellapsedStorageInit, '[renderer]', undefined]);
 		table.push(['init workspace service', metrics.timers.ellapsedWorkspaceServiceInit, '[renderer]', undefined]);
@@ -310,58 +305,6 @@ class PerfModelContentProvider implements ITextModelContentProvider {
 		}
 	}
 
-	private _addLoaderStats(md: MarkdownBuilder, stats: LoaderStats): void {
-		md.heading(2, 'Loader Stats');
-		md.heading(3, 'Load AMD-module');
-		md.table(['Module', 'Duration'], stats.amdLoad);
-		md.blank();
-		md.heading(3, 'Load commonjs-module');
-		md.table(['Module', 'Duration'], stats.nodeRequire);
-		md.blank();
-		md.heading(3, 'Invoke AMD-module factory');
-		md.table(['Module', 'Duration'], stats.amdInvoke);
-		md.blank();
-		md.heading(3, 'Invoke commonjs-module');
-		md.table(['Module', 'Duration'], stats.nodeEval);
-	}
-
-	private _addCachedDataStats(md: MarkdownBuilder): void {
-
-		const map = new Map<LoaderEventType, string[]>();
-		map.set(LoaderEventType.CachedDataCreated, []);
-		map.set(LoaderEventType.CachedDataFound, []);
-		map.set(LoaderEventType.CachedDataMissed, []);
-		map.set(LoaderEventType.CachedDataRejected, []);
-		if (typeof require.getStats === 'function') {
-			for (const stat of require.getStats()) {
-				if (map.has(stat.type)) {
-					map.get(stat.type)!.push(stat.detail);
-				}
-			}
-		}
-
-		const printLists = (arr?: string[]) => {
-			if (arr) {
-				arr.sort();
-				for (const e of arr) {
-					md.li(`${e}`);
-				}
-				md.blank();
-			}
-		};
-
-		md.heading(2, 'Node Cached Data Stats');
-		md.blank();
-		md.heading(3, 'cached data used');
-		printLists(map.get(LoaderEventType.CachedDataFound));
-		md.heading(3, 'cached data missed');
-		printLists(map.get(LoaderEventType.CachedDataMissed));
-		md.heading(3, 'cached data rejected');
-		printLists(map.get(LoaderEventType.CachedDataRejected));
-		md.heading(3, 'cached data created (lazy, might need refreshes)');
-		printLists(map.get(LoaderEventType.CachedDataCreated));
-	}
-
 	private _addResourceTimingStats(md: MarkdownBuilder) {
 		const stats = performance.getEntriesByType('resource').map(entry => {
 			return [entry.name, entry.duration];
@@ -394,6 +337,42 @@ class MarkdownBuilder {
 	}
 
 	table(header: string[], rows: Array<Array<{ toString(): string } | undefined>>) {
-		this.value += LoaderStats.toMarkdownTable(header, rows);
+		this.value += this.toMarkdownTable(header, rows);
+	}
+
+	private toMarkdownTable(header: string[], rows: Array<Array<{ toString(): string } | undefined>>): string {
+		let result = '';
+
+		const lengths: number[] = [];
+		header.forEach((cell, ci) => {
+			lengths[ci] = cell.length;
+		});
+		rows.forEach(row => {
+			row.forEach((cell, ci) => {
+				if (typeof cell === 'undefined') {
+					cell = row[ci] = '-';
+				}
+				const len = cell.toString().length;
+				lengths[ci] = Math.max(len, lengths[ci]);
+			});
+		});
+
+		// header
+		header.forEach((cell, ci) => { result += `| ${cell + ' '.repeat(lengths[ci] - cell.toString().length)} `; });
+		result += '|\n';
+		header.forEach((_cell, ci) => { result += `| ${'-'.repeat(lengths[ci])} `; });
+		result += '|\n';
+
+		// cells
+		rows.forEach(row => {
+			row.forEach((cell, ci) => {
+				if (typeof cell !== 'undefined') {
+					result += `| ${cell + ' '.repeat(lengths[ci] - cell.toString().length)} `;
+				}
+			});
+			result += '|\n';
+		});
+
+		return result;
 	}
 }
diff --git a/src/vs/workbench/contrib/performance/browser/startupTimings.ts b/src/vs/workbench/contrib/performance/browser/startupTimings.ts
index c74e721ff8a..eb0a9ffbc42 100644
--- a/src/vs/workbench/contrib/performance/browser/startupTimings.ts
+++ b/src/vs/workbench/contrib/performance/browser/startupTimings.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { ILifecycleService, StartupKind, StartupKindToString } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IUpdateService } from 'vs/platform/update/common/update';
-import * as files from 'vs/workbench/contrib/files/common/files';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IWorkspaceTrustManagementService } from 'vs/platform/workspace/common/workspaceTrust';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { ViewContainerLocation } from 'vs/workbench/common/views';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { ITimerService } from 'vs/workbench/services/timer/browser/timerService';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { posix } from 'vs/base/common/path';
-import { hash } from 'vs/base/common/hash';
+import { isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { ILifecycleService, StartupKind, StartupKindToString } from '../../../services/lifecycle/common/lifecycle.js';
+import { IUpdateService } from '../../../../platform/update/common/update.js';
+import * as files from '../../files/common/files.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IWorkspaceTrustManagementService } from '../../../../platform/workspace/common/workspaceTrust.js';
+import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.js';
+import { ViewContainerLocation } from '../../../common/views.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IBrowserWorkbenchEnvironmentService } from '../../../services/environment/browser/environmentService.js';
+import { ITimerService } from '../../../services/timer/browser/timerService.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { posix } from '../../../../base/common/path.js';
+import { hash } from '../../../../base/common/hash.js';
 
 export abstract class StartupTimings {
 
diff --git a/src/vs/workbench/contrib/performance/electron-sandbox/performance.contribution.ts b/src/vs/workbench/contrib/performance/electron-sandbox/performance.contribution.ts
index 8c3aeb78639..be0231753a6 100644
--- a/src/vs/workbench/contrib/performance/electron-sandbox/performance.contribution.ts
+++ b/src/vs/workbench/contrib/performance/electron-sandbox/performance.contribution.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Extensions, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
-import { StartupProfiler } from './startupProfiler';
-import { NativeStartupTimings } from './startupTimings';
-import { RendererProfiling } from 'vs/workbench/contrib/performance/electron-sandbox/rendererAutoProfiler';
-import { IConfigurationRegistry, Extensions as ConfigExt } from 'vs/platform/configuration/common/configurationRegistry';
-import { localize } from 'vs/nls';
-import { applicationConfigurationNodeBase } from 'vs/workbench/common/configuration';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Extensions, IWorkbenchContributionsRegistry } from '../../../common/contributions.js';
+import { StartupProfiler } from './startupProfiler.js';
+import { NativeStartupTimings } from './startupTimings.js';
+import { RendererProfiling } from './rendererAutoProfiler.js';
+import { IConfigurationRegistry, Extensions as ConfigExt } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { localize } from '../../../../nls.js';
+import { applicationConfigurationNodeBase } from '../../../common/configuration.js';
 
 // -- auto profiler
 
diff --git a/src/vs/workbench/contrib/performance/electron-sandbox/rendererAutoProfiler.ts b/src/vs/workbench/contrib/performance/electron-sandbox/rendererAutoProfiler.ts
index 18f0addea7d..274d3340b87 100644
--- a/src/vs/workbench/contrib/performance/electron-sandbox/rendererAutoProfiler.ts
+++ b/src/vs/workbench/contrib/performance/electron-sandbox/rendererAutoProfiler.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { timeout } from 'vs/base/common/async';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { joinPath } from 'vs/base/common/resources';
-import { generateUuid } from 'vs/base/common/uuid';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IFileService } from 'vs/platform/files/common/files';
-import { ILogService } from 'vs/platform/log/common/log';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { IV8Profile } from 'vs/platform/profiling/common/profiling';
-import { IProfileAnalysisWorkerService, ProfilingOutput } from 'vs/platform/profiling/electron-sandbox/profileAnalysisWorkerService';
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
-import { parseExtensionDevOptions } from 'vs/workbench/services/extensions/common/extensionDevOptions';
-import { ITimerService } from 'vs/workbench/services/timer/browser/timerService';
+import { timeout } from '../../../../base/common/async.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { joinPath } from '../../../../base/common/resources.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { IV8Profile } from '../../../../platform/profiling/common/profiling.js';
+import { IProfileAnalysisWorkerService, ProfilingOutput } from '../../../../platform/profiling/electron-sandbox/profileAnalysisWorkerService.js';
+import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-sandbox/environmentService.js';
+import { parseExtensionDevOptions } from '../../../services/extensions/common/extensionDevOptions.js';
+import { ITimerService } from '../../../services/timer/browser/timerService.js';
 
 export class RendererProfiling {
 
diff --git a/src/vs/workbench/contrib/performance/electron-sandbox/startupProfiler.ts b/src/vs/workbench/contrib/performance/electron-sandbox/startupProfiler.ts
index 452a8a65971..448ebcba59f 100644
--- a/src/vs/workbench/contrib/performance/electron-sandbox/startupProfiler.ts
+++ b/src/vs/workbench/contrib/performance/electron-sandbox/startupProfiler.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { localize } from 'vs/nls';
-import { dirname, basename } from 'vs/base/common/resources';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
-import { ILifecycleService, LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { PerfviewContrib } from 'vs/workbench/contrib/performance/browser/perfviewEditor';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { URI } from 'vs/base/common/uri';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IFileService } from 'vs/platform/files/common/files';
-import { ILabelService } from 'vs/platform/label/common/label';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { localize } from '../../../../nls.js';
+import { dirname, basename } from '../../../../base/common/resources.js';
+import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-sandbox/environmentService.js';
+import { ILifecycleService, LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { PerfviewContrib } from '../browser/perfviewEditor.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
 
 export class StartupProfiler implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/contrib/performance/electron-sandbox/startupTimings.ts b/src/vs/workbench/contrib/performance/electron-sandbox/startupTimings.ts
index 028a744f38a..7753789e588 100644
--- a/src/vs/workbench/contrib/performance/electron-sandbox/startupTimings.ts
+++ b/src/vs/workbench/contrib/performance/electron-sandbox/startupTimings.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { timeout } from 'vs/base/common/async';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IUpdateService } from 'vs/platform/update/common/update';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ITimerService } from 'vs/workbench/services/timer/browser/timerService';
-import { IFileService } from 'vs/platform/files/common/files';
-import { URI } from 'vs/base/common/uri';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { IWorkspaceTrustManagementService } from 'vs/platform/workspace/common/workspaceTrust';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { StartupTimings } from 'vs/workbench/contrib/performance/browser/startupTimings';
-import { coalesce } from 'vs/base/common/arrays';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { timeout } from '../../../../base/common/async.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-sandbox/environmentService.js';
+import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IUpdateService } from '../../../../platform/update/common/update.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { ITimerService } from '../../../services/timer/browser/timerService.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { URI } from '../../../../base/common/uri.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { IWorkspaceTrustManagementService } from '../../../../platform/workspace/common/workspaceTrust.js';
+import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.js';
+import { StartupTimings } from '../browser/startupTimings.js';
+import { coalesce } from '../../../../base/common/arrays.js';
 
 interface ITracingData {
 	readonly args?: {
diff --git a/src/vs/workbench/contrib/preferences/browser/keybindingWidgets.ts b/src/vs/workbench/contrib/preferences/browser/keybindingWidgets.ts
index 14372b3e3bf..663e4a1d78d 100644
--- a/src/vs/workbench/contrib/preferences/browser/keybindingWidgets.ts
+++ b/src/vs/workbench/contrib/preferences/browser/keybindingWidgets.ts
@@ -3,29 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/keybindings';
-import * as nls from 'vs/nls';
-import { OS } from 'vs/base/common/platform';
-import { Disposable, toDisposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { Event, Emitter } from 'vs/base/common/event';
-import { KeybindingLabel } from 'vs/base/browser/ui/keybindingLabel/keybindingLabel';
-import { Widget } from 'vs/base/browser/ui/widget';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { ResolvedKeybinding } from 'vs/base/common/keybindings';
-import * as dom from 'vs/base/browser/dom';
-import * as aria from 'vs/base/browser/ui/aria/aria';
-import { IKeyboardEvent, StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition } from 'vs/editor/browser/editorBrowser';
-import { asCssVariable, editorWidgetBackground, editorWidgetForeground, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
-import { ScrollType } from 'vs/editor/common/editorCommon';
-import { SearchWidget, SearchOptions } from 'vs/workbench/contrib/preferences/browser/preferencesWidgets';
-import { Promises, timeout } from 'vs/base/common/async';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { defaultInputBoxStyles, defaultKeybindingLabelStyles } from 'vs/platform/theme/browser/defaultStyles';
+import './media/keybindings.css';
+import * as nls from '../../../../nls.js';
+import { OS } from '../../../../base/common/platform.js';
+import { Disposable, toDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { KeybindingLabel } from '../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
+import { Widget } from '../../../../base/browser/ui/widget.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { ResolvedKeybinding } from '../../../../base/common/keybindings.js';
+import * as dom from '../../../../base/browser/dom.js';
+import * as aria from '../../../../base/browser/ui/aria/aria.js';
+import { IKeyboardEvent, StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { FastDomNode, createFastDomNode } from '../../../../base/browser/fastDomNode.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition } from '../../../../editor/browser/editorBrowser.js';
+import { asCssVariable, editorWidgetBackground, editorWidgetForeground, widgetShadow } from '../../../../platform/theme/common/colorRegistry.js';
+import { ScrollType } from '../../../../editor/common/editorCommon.js';
+import { SearchWidget, SearchOptions } from './preferencesWidgets.js';
+import { Promises, timeout } from '../../../../base/common/async.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { defaultInputBoxStyles, defaultKeybindingLabelStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 
 export interface KeybindingsSearchOptions extends SearchOptions {
 	recordEnter?: boolean;
diff --git a/src/vs/workbench/contrib/preferences/browser/keybindingsEditor.ts b/src/vs/workbench/contrib/preferences/browser/keybindingsEditor.ts
index d1bbf48e3e8..d8719d3ff19 100644
--- a/src/vs/workbench/contrib/preferences/browser/keybindingsEditor.ts
+++ b/src/vs/workbench/contrib/preferences/browser/keybindingsEditor.ts
@@ -3,65 +3,66 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/keybindingsEditor';
-import { localize } from 'vs/nls';
-import { Delayer } from 'vs/base/common/async';
-import * as DOM from 'vs/base/browser/dom';
-import { isIOS, OS } from 'vs/base/common/platform';
-import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { ToggleActionViewItem } from 'vs/base/browser/ui/toggle/toggle';
-import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
-import { KeybindingLabel } from 'vs/base/browser/ui/keybindingLabel/keybindingLabel';
-import { IAction, Action, Separator } from 'vs/base/common/actions';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
-import { IEditorOpenContext } from 'vs/workbench/common/editor';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { KeybindingsEditorModel, KEYBINDING_ENTRY_TEMPLATE_ID } from 'vs/workbench/services/preferences/browser/keybindingsEditorModel';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService, IUserFriendlyKeybinding } from 'vs/platform/keybinding/common/keybinding';
-import { DefineKeybindingWidget, KeybindingsSearchWidget } from 'vs/workbench/contrib/preferences/browser/keybindingWidgets';
-import { CONTEXT_KEYBINDING_FOCUS, CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDINGS_SEARCH_FOCUS, KEYBINDINGS_EDITOR_COMMAND_RECORD_SEARCH_KEYS, KEYBINDINGS_EDITOR_COMMAND_SORTBY_PRECEDENCE, KEYBINDINGS_EDITOR_COMMAND_DEFINE, KEYBINDINGS_EDITOR_COMMAND_REMOVE, KEYBINDINGS_EDITOR_COMMAND_RESET, KEYBINDINGS_EDITOR_COMMAND_COPY, KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND, KEYBINDINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS, KEYBINDINGS_EDITOR_COMMAND_DEFINE_WHEN, KEYBINDINGS_EDITOR_COMMAND_SHOW_SIMILAR, KEYBINDINGS_EDITOR_COMMAND_ADD, KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND_TITLE, CONTEXT_WHEN_FOCUS } from 'vs/workbench/contrib/preferences/common/preferences';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IKeybindingEditingService } from 'vs/workbench/services/keybinding/common/keybindingEditing';
-import { IListContextMenuEvent } from 'vs/base/browser/ui/list/list';
-import { IThemeService, registerThemingParticipant, IColorTheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IContextKeyService, IContextKey, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { badgeBackground, contrastBorder, badgeForeground, listActiveSelectionForeground, listInactiveSelectionForeground, listHoverForeground, listFocusForeground, editorBackground, foreground, listActiveSelectionBackground, listInactiveSelectionBackground, listFocusBackground, listHoverBackground, registerColor, tableOddRowsBackgroundColor, asCssVariable } from 'vs/platform/theme/common/colorRegistry';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
-import { WorkbenchTable } from 'vs/platform/list/browser/listService';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { Emitter, Event } from 'vs/base/common/event';
-import { MenuRegistry, MenuId, isIMenuItem } from 'vs/platform/actions/common/actions';
-import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
-import { WORKBENCH_BACKGROUND } from 'vs/workbench/common/theme';
-import { IKeybindingItemEntry, IKeybindingsEditorPane } from 'vs/workbench/services/preferences/common/preferences';
-import { keybindingsRecordKeysIcon, keybindingsSortIcon, keybindingsAddIcon, preferencesClearInputIcon, keybindingsEditIcon } from 'vs/workbench/contrib/preferences/browser/preferencesIcons';
-import { ITableRenderer, ITableVirtualDelegate } from 'vs/base/browser/ui/table/table';
-import { KeybindingsEditorInput } from 'vs/workbench/services/preferences/browser/keybindingsEditorInput';
-import { IEditorOptions } from 'vs/platform/editor/common/editor';
-import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar';
-import { defaultKeybindingLabelStyles, defaultToggleStyles, getInputBoxStyle } from 'vs/platform/theme/browser/defaultStyles';
-import { IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { isString } from 'vs/base/common/types';
-import { SuggestEnabledInput } from 'vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput';
-import { CompletionItemKind } from 'vs/editor/common/languages';
-import { settingsTextInputBorder } from 'vs/workbench/contrib/preferences/common/settingsEditorColorRegistry';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { registerNavigableContainer } from 'vs/workbench/browser/actions/widgetNavigationCommands';
-import { IActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
-import type { IManagedHover } from 'vs/base/browser/ui/hover/hover';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import './media/keybindingsEditor.css';
+import { localize } from '../../../../nls.js';
+import { Delayer } from '../../../../base/common/async.js';
+import * as DOM from '../../../../base/browser/dom.js';
+import { isIOS, OS } from '../../../../base/common/platform.js';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { ToggleActionViewItem } from '../../../../base/browser/ui/toggle/toggle.js';
+import { HighlightedLabel } from '../../../../base/browser/ui/highlightedlabel/highlightedLabel.js';
+import { KeybindingLabel } from '../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
+import { IAction, Action, Separator } from '../../../../base/common/actions.js';
+import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { EditorPane } from '../../../browser/parts/editor/editorPane.js';
+import { IEditorOpenContext } from '../../../common/editor.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { KeybindingsEditorModel, KEYBINDING_ENTRY_TEMPLATE_ID } from '../../../services/preferences/browser/keybindingsEditorModel.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService, IUserFriendlyKeybinding } from '../../../../platform/keybinding/common/keybinding.js';
+import { DefineKeybindingWidget, KeybindingsSearchWidget } from './keybindingWidgets.js';
+import { CONTEXT_KEYBINDING_FOCUS, CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDINGS_SEARCH_FOCUS, KEYBINDINGS_EDITOR_COMMAND_RECORD_SEARCH_KEYS, KEYBINDINGS_EDITOR_COMMAND_SORTBY_PRECEDENCE, KEYBINDINGS_EDITOR_COMMAND_DEFINE, KEYBINDINGS_EDITOR_COMMAND_REMOVE, KEYBINDINGS_EDITOR_COMMAND_RESET, KEYBINDINGS_EDITOR_COMMAND_COPY, KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND, KEYBINDINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS, KEYBINDINGS_EDITOR_COMMAND_DEFINE_WHEN, KEYBINDINGS_EDITOR_COMMAND_SHOW_SIMILAR, KEYBINDINGS_EDITOR_COMMAND_ADD, KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND_TITLE, CONTEXT_WHEN_FOCUS } from '../common/preferences.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IKeybindingEditingService } from '../../../services/keybinding/common/keybindingEditing.js';
+import { IListContextMenuEvent } from '../../../../base/browser/ui/list/list.js';
+import { IThemeService, registerThemingParticipant, IColorTheme, ICssStyleCollector } from '../../../../platform/theme/common/themeService.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { IContextKeyService, IContextKey, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { badgeBackground, contrastBorder, badgeForeground, listActiveSelectionForeground, listInactiveSelectionForeground, listHoverForeground, listFocusForeground, editorBackground, foreground, listActiveSelectionBackground, listInactiveSelectionBackground, listFocusBackground, listHoverBackground, registerColor, tableOddRowsBackgroundColor, asCssVariable } from '../../../../platform/theme/common/colorRegistry.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { EditorExtensionsRegistry } from '../../../../editor/browser/editorExtensions.js';
+import { WorkbenchTable } from '../../../../platform/list/browser/listService.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { MenuRegistry, MenuId, isIMenuItem } from '../../../../platform/actions/common/actions.js';
+import { IListAccessibilityProvider } from '../../../../base/browser/ui/list/listWidget.js';
+import { WORKBENCH_BACKGROUND } from '../../../common/theme.js';
+import { IKeybindingItemEntry, IKeybindingsEditorPane } from '../../../services/preferences/common/preferences.js';
+import { keybindingsRecordKeysIcon, keybindingsSortIcon, keybindingsAddIcon, preferencesClearInputIcon, keybindingsEditIcon } from './preferencesIcons.js';
+import { ITableRenderer, ITableVirtualDelegate } from '../../../../base/browser/ui/table/table.js';
+import { KeybindingsEditorInput } from '../../../services/preferences/browser/keybindingsEditorInput.js';
+import { IEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { ToolBar } from '../../../../base/browser/ui/toolbar/toolbar.js';
+import { defaultKeybindingLabelStyles, defaultToggleStyles, getInputBoxStyle } from '../../../../platform/theme/browser/defaultStyles.js';
+import { IExtensionsWorkbenchService } from '../../extensions/common/extensions.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { isString } from '../../../../base/common/types.js';
+import { SuggestEnabledInput } from '../../codeEditor/browser/suggestEnabledInput/suggestEnabledInput.js';
+import { CompletionItemKind } from '../../../../editor/common/languages.js';
+import { settingsTextInputBorder } from '../common/settingsEditorColorRegistry.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
+import { registerNavigableContainer } from '../../../browser/actions/widgetNavigationCommands.js';
+import { IActionViewItemOptions } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { IEditorGroup } from '../../../services/editor/common/editorGroupsService.js';
+import type { IManagedHover } from '../../../../base/browser/ui/hover/hover.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
 
 const $ = DOM.$;
 
@@ -122,7 +123,8 @@ export class KeybindingsEditor extends EditorPane implements IKeybindingsEditorP
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IEditorService private readonly editorService: IEditorService,
 		@IStorageService storageService: IStorageService,
-		@IConfigurationService private readonly configurationService: IConfigurationService
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IAccessibilityService private readonly accessibilityService: IAccessibilityService
 	) {
 		super(KeybindingsEditor.ID, group, telemetryService, themeService, storageService);
 		this.delayedFiltering = new Delayer<void>(300);
@@ -590,7 +592,7 @@ export class KeybindingsEditor extends EditorPane implements IKeybindingsEditorP
 		if (this.keybindingsEditorModel) {
 			const filter = this.searchWidget.getValue();
 			const keybindingsEntries: IKeybindingItemEntry[] = this.keybindingsEditorModel.fetch(filter, this.sortByPrecedenceAction.checked);
-
+			this.accessibilityService.alert(localize('foundResults', "{0} results", keybindingsEntries.length));
 			this.ariaLabelElement.setAttribute('aria-label', this.getAriaLabel(keybindingsEntries));
 
 			if (keybindingsEntries.length === 0) {
@@ -1248,8 +1250,8 @@ class AccessibilityProvider implements IListAccessibilityProvider<IKeybindingIte
 	}
 }
 
-registerColor('keybindingTable.headerBackground', { dark: tableOddRowsBackgroundColor, light: tableOddRowsBackgroundColor, hcDark: tableOddRowsBackgroundColor, hcLight: tableOddRowsBackgroundColor }, 'Background color for the keyboard shortcuts table header.');
-registerColor('keybindingTable.rowsBackground', { light: tableOddRowsBackgroundColor, dark: tableOddRowsBackgroundColor, hcDark: tableOddRowsBackgroundColor, hcLight: tableOddRowsBackgroundColor }, 'Background color for the keyboard shortcuts table alternating rows.');
+registerColor('keybindingTable.headerBackground', tableOddRowsBackgroundColor, 'Background color for the keyboard shortcuts table header.');
+registerColor('keybindingTable.rowsBackground', tableOddRowsBackgroundColor, 'Background color for the keyboard shortcuts table alternating rows.');
 
 registerThemingParticipant((theme: IColorTheme, collector: ICssStyleCollector) => {
 	const foregroundColor = theme.getColor(foreground);
diff --git a/src/vs/workbench/contrib/preferences/browser/keybindingsEditorContribution.ts b/src/vs/workbench/contrib/preferences/browser/keybindingsEditorContribution.ts
index a5f92a455cd..d896d8650da 100644
--- a/src/vs/workbench/contrib/preferences/browser/keybindingsEditorContribution.ts
+++ b/src/vs/workbench/contrib/preferences/browser/keybindingsEditorContribution.ts
@@ -3,29 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { Range } from 'vs/editor/common/core/range';
-import { registerEditorContribution, EditorContributionInstantiation } from 'vs/editor/browser/editorExtensions';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2';
-import { SmartSnippetInserter } from 'vs/workbench/contrib/preferences/common/smartSnippetInserter';
-import { DefineKeybindingOverlayWidget } from 'vs/workbench/contrib/preferences/browser/keybindingWidgets';
-import { parseTree, Node } from 'vs/base/common/json';
-import { WindowsNativeResolvedKeybinding } from 'vs/workbench/services/keybinding/common/windowsKeyboardMapper';
-import { themeColorFromId } from 'vs/platform/theme/common/themeService';
-import { ThemeColor } from 'vs/base/common/themables';
-import { overviewRulerInfo, overviewRulerError } from 'vs/editor/common/core/editorColorRegistry';
-import { IModelDeltaDecoration, ITextModel, TrackedRangeStickiness, OverviewRulerLane } from 'vs/editor/common/model';
-import { KeybindingParser } from 'vs/base/common/keybindingParser';
-import { assertIsDefined } from 'vs/base/common/types';
-import { isEqual } from 'vs/base/common/resources';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { DEFINE_KEYBINDING_EDITOR_CONTRIB_ID, IDefineKeybindingEditorContribution } from 'vs/workbench/services/preferences/common/preferences';
+import * as nls from '../../../../nls.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { registerEditorContribution, EditorContributionInstantiation } from '../../../../editor/browser/editorExtensions.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { SnippetController2 } from '../../../../editor/contrib/snippet/browser/snippetController2.js';
+import { SmartSnippetInserter } from '../common/smartSnippetInserter.js';
+import { DefineKeybindingOverlayWidget } from './keybindingWidgets.js';
+import { parseTree, Node } from '../../../../base/common/json.js';
+import { WindowsNativeResolvedKeybinding } from '../../../services/keybinding/common/windowsKeyboardMapper.js';
+import { themeColorFromId } from '../../../../platform/theme/common/themeService.js';
+import { ThemeColor } from '../../../../base/common/themables.js';
+import { overviewRulerInfo, overviewRulerError } from '../../../../editor/common/core/editorColorRegistry.js';
+import { IModelDeltaDecoration, ITextModel, TrackedRangeStickiness, OverviewRulerLane } from '../../../../editor/common/model.js';
+import { KeybindingParser } from '../../../../base/common/keybindingParser.js';
+import { assertIsDefined } from '../../../../base/common/types.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { IUserDataProfileService } from '../../../services/userDataProfile/common/userDataProfile.js';
+import { DEFINE_KEYBINDING_EDITOR_CONTRIB_ID, IDefineKeybindingEditorContribution } from '../../../services/preferences/common/preferences.js';
 
 const NLS_KB_LAYOUT_ERROR_MESSAGE = nls.localize('defineKeybinding.kbLayoutErrorMessage', "You won't be able to produce this key combination under your current keyboard layout.");
 
diff --git a/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.ts b/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.ts
index 50ed5aaa3fd..b533feb123b 100644
--- a/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.ts
+++ b/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { StatusbarAlignment, IStatusbarService, IStatusbarEntryAccessor } from 'vs/workbench/services/statusbar/browser/statusbar';
-import { Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { parseKeyboardLayoutDescription, areKeyboardLayoutsEqual, getKeyboardLayoutId, IKeyboardLayoutService, IKeyboardLayoutInfo } from 'vs/platform/keyboardLayout/common/keyboardLayout';
-import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { KEYBOARD_LAYOUT_OPEN_PICKER } from 'vs/workbench/contrib/preferences/common/preferences';
-import { isMacintosh, isWindows } from 'vs/base/common/platform';
-import { QuickPickInput, IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { IEditorPane } from 'vs/workbench/common/editor';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import * as nls from '../../../../nls.js';
+import { StatusbarAlignment, IStatusbarService, IStatusbarEntryAccessor } from '../../../services/statusbar/browser/statusbar.js';
+import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { parseKeyboardLayoutDescription, areKeyboardLayoutsEqual, getKeyboardLayoutId, IKeyboardLayoutService, IKeyboardLayoutInfo } from '../../../../platform/keyboardLayout/common/keyboardLayout.js';
+import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { KEYBOARD_LAYOUT_OPEN_PICKER } from '../common/preferences.js';
+import { isMacintosh, isWindows } from '../../../../base/common/platform.js';
+import { QuickPickInput, IQuickInputService, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
+import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { IEditorPane } from '../../../common/editor.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 
 export class KeyboardLayoutPickerContribution extends Disposable implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/contrib/preferences/browser/media/settingsEditor2.css b/src/vs/workbench/contrib/preferences/browser/media/settingsEditor2.css
index 74caeb8c44e..26034cdf7de 100644
--- a/src/vs/workbench/contrib/preferences/browser/media/settingsEditor2.css
+++ b/src/vs/workbench/contrib/preferences/browser/media/settingsEditor2.css
@@ -162,10 +162,16 @@
 }
 
 .settings-editor > .settings-body .settings-tree-container .setting-item-extension-toggle .setting-item-extension-toggle-button {
-	display: block;
+	display: inline-block;
 	width: fit-content;
 }
 
+.settings-editor > .settings-body .settings-tree-container .setting-item-extension-toggle .setting-item-extension-dismiss-button {
+	display: inline-block;
+	width: fit-content;
+	margin-left: 8px;
+}
+
 .settings-editor.no-results > .settings-body .settings-toc-container,
 .settings-editor.no-results > .settings-body .settings-tree-container {
 	display: none;
@@ -408,7 +414,8 @@
 }
 
 .settings-editor > .settings-body .settings-tree-container .setting-item-contents .setting-item-title .setting-item-overrides a.modified-scope {
-	text-decoration: underline;
+	color: var(--vscode-textLink-foreground);
+	text-decoration: var(--text-link-decoration);
 	cursor: pointer;
 }
 
@@ -512,6 +519,11 @@
 	color: var(--vscode-textLink-foreground);
 }
 
+.settings-editor > .settings-body .settings-tree-container .setting-item-contents .setting-item-markdown a,
+.settings-editor > .settings-body .settings-tree-container .setting-item-contents .edit-in-settings-button {
+	text-decoration: var(--text-link-decoration);
+}
+
 .settings-editor > .settings-body .settings-tree-container .setting-item-contents .setting-item-markdown a:focus,
 .settings-editor > .settings-body .settings-tree-container .setting-item-contents .edit-in-settings-button:focus {
 	outline: 1px solid -webkit-focus-ring-color;
diff --git a/src/vs/workbench/contrib/preferences/browser/preferences.contribution.ts b/src/vs/workbench/contrib/preferences/browser/preferences.contribution.ts
index 66ca47c40e5..175e8bd518b 100644
--- a/src/vs/workbench/contrib/preferences/browser/preferences.contribution.ts
+++ b/src/vs/workbench/contrib/preferences/browser/preferences.contribution.ts
@@ -3,50 +3,50 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Disposable, DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { isBoolean, isObject, isString } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import 'vs/css!./media/preferences';
-import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { Context as SuggestContext } from 'vs/editor/contrib/suggest/browser/suggest';
-import * as nls from 'vs/nls';
-import { Action2, MenuId, MenuRegistry, registerAction2 } from 'vs/platform/actions/common/actions';
-import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { InputFocusedContext, IsMacNativeContext } from 'vs/platform/contextkey/common/contextkeys';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IWorkspaceContextService, IWorkspaceFolder, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { PICK_WORKSPACE_FOLDER_COMMAND_ID } from 'vs/workbench/browser/actions/workspaceCommands';
-import { EditorPaneDescriptor, IEditorPaneRegistry } from 'vs/workbench/browser/editor';
-import { Extensions as WorkbenchExtensions, IWorkbenchContribution, IWorkbenchContributionsRegistry, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { EditorExtensions, IEditorFactoryRegistry, IEditorSerializer } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { ResourceContextKey, RemoteNameContext, WorkbenchStateContext } from 'vs/workbench/common/contextkeys';
-import { ExplorerFolderContext, ExplorerRootContext } from 'vs/workbench/contrib/files/common/files';
-import { KeybindingsEditor } from 'vs/workbench/contrib/preferences/browser/keybindingsEditor';
-import { ConfigureLanguageBasedSettingsAction } from 'vs/workbench/contrib/preferences/browser/preferencesActions';
-import { SettingsEditorContribution } from 'vs/workbench/contrib/preferences/browser/preferencesEditor';
-import { preferencesOpenSettingsIcon } from 'vs/workbench/contrib/preferences/browser/preferencesIcons';
-import { SettingsEditor2, SettingsFocusContext } from 'vs/workbench/contrib/preferences/browser/settingsEditor2';
-import { CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDINGS_SEARCH_FOCUS, CONTEXT_KEYBINDING_FOCUS, CONTEXT_SETTINGS_EDITOR, CONTEXT_SETTINGS_JSON_EDITOR, CONTEXT_SETTINGS_ROW_FOCUS, CONTEXT_SETTINGS_SEARCH_FOCUS, CONTEXT_TOC_ROW_FOCUS, CONTEXT_WHEN_FOCUS, KEYBINDINGS_EDITOR_COMMAND_ACCEPT_WHEN, KEYBINDINGS_EDITOR_COMMAND_ADD, KEYBINDINGS_EDITOR_COMMAND_CLEAR_SEARCH_HISTORY, KEYBINDINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS, KEYBINDINGS_EDITOR_COMMAND_COPY, KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND, KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND_TITLE, KEYBINDINGS_EDITOR_COMMAND_DEFINE, KEYBINDINGS_EDITOR_COMMAND_DEFINE_WHEN, KEYBINDINGS_EDITOR_COMMAND_FOCUS_KEYBINDINGS, KEYBINDINGS_EDITOR_COMMAND_RECORD_SEARCH_KEYS, KEYBINDINGS_EDITOR_COMMAND_REJECT_WHEN, KEYBINDINGS_EDITOR_COMMAND_REMOVE, KEYBINDINGS_EDITOR_COMMAND_RESET, KEYBINDINGS_EDITOR_COMMAND_SEARCH, KEYBINDINGS_EDITOR_COMMAND_SHOW_SIMILAR, KEYBINDINGS_EDITOR_COMMAND_SORTBY_PRECEDENCE, KEYBINDINGS_EDITOR_SHOW_DEFAULT_KEYBINDINGS, KEYBINDINGS_EDITOR_SHOW_EXTENSION_KEYBINDINGS, KEYBINDINGS_EDITOR_SHOW_USER_KEYBINDINGS, REQUIRE_TRUSTED_WORKSPACE_SETTING_TAG, SETTINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS, SETTINGS_EDITOR_COMMAND_SHOW_CONTEXT_MENU } from 'vs/workbench/contrib/preferences/common/preferences';
-import { PreferencesContribution } from 'vs/workbench/contrib/preferences/common/preferencesContribution';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { KeybindingsEditorInput } from 'vs/workbench/services/preferences/browser/keybindingsEditorInput';
-import { DEFINE_KEYBINDING_EDITOR_CONTRIB_ID, IDefineKeybindingEditorContribution, IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
-import { SettingsEditor2Input } from 'vs/workbench/services/preferences/common/preferencesEditorInput';
-import { IUserDataProfileService, CURRENT_PROFILE_CONTEXT } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { isCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
+import { KeyChord, KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { isBoolean, isObject, isString } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import './media/preferences.css';
+import { EditorContributionInstantiation, registerEditorContribution } from '../../../../editor/browser/editorExtensions.js';
+import { Context as SuggestContext } from '../../../../editor/contrib/suggest/browser/suggest.js';
+import * as nls from '../../../../nls.js';
+import { Action2, MenuId, MenuRegistry, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { CommandsRegistry, ICommandService } from '../../../../platform/commands/common/commands.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { InputFocusedContext, IsMacNativeContext } from '../../../../platform/contextkey/common/contextkeys.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IWorkspaceContextService, IWorkspaceFolder, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { PICK_WORKSPACE_FOLDER_COMMAND_ID } from '../../../browser/actions/workspaceCommands.js';
+import { EditorPaneDescriptor, IEditorPaneRegistry } from '../../../browser/editor.js';
+import { Extensions as WorkbenchExtensions, IWorkbenchContribution, IWorkbenchContributionsRegistry, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { EditorExtensions, IEditorFactoryRegistry, IEditorSerializer } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { ResourceContextKey, RemoteNameContext, WorkbenchStateContext } from '../../../common/contextkeys.js';
+import { ExplorerFolderContext, ExplorerRootContext } from '../../files/common/files.js';
+import { KeybindingsEditor } from './keybindingsEditor.js';
+import { ConfigureLanguageBasedSettingsAction } from './preferencesActions.js';
+import { SettingsEditorContribution } from './preferencesEditor.js';
+import { preferencesOpenSettingsIcon } from './preferencesIcons.js';
+import { SettingsEditor2, SettingsFocusContext } from './settingsEditor2.js';
+import { CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDINGS_SEARCH_FOCUS, CONTEXT_KEYBINDING_FOCUS, CONTEXT_SETTINGS_EDITOR, CONTEXT_SETTINGS_JSON_EDITOR, CONTEXT_SETTINGS_ROW_FOCUS, CONTEXT_SETTINGS_SEARCH_FOCUS, CONTEXT_TOC_ROW_FOCUS, CONTEXT_WHEN_FOCUS, KEYBINDINGS_EDITOR_COMMAND_ACCEPT_WHEN, KEYBINDINGS_EDITOR_COMMAND_ADD, KEYBINDINGS_EDITOR_COMMAND_CLEAR_SEARCH_HISTORY, KEYBINDINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS, KEYBINDINGS_EDITOR_COMMAND_COPY, KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND, KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND_TITLE, KEYBINDINGS_EDITOR_COMMAND_DEFINE, KEYBINDINGS_EDITOR_COMMAND_DEFINE_WHEN, KEYBINDINGS_EDITOR_COMMAND_FOCUS_KEYBINDINGS, KEYBINDINGS_EDITOR_COMMAND_RECORD_SEARCH_KEYS, KEYBINDINGS_EDITOR_COMMAND_REJECT_WHEN, KEYBINDINGS_EDITOR_COMMAND_REMOVE, KEYBINDINGS_EDITOR_COMMAND_RESET, KEYBINDINGS_EDITOR_COMMAND_SEARCH, KEYBINDINGS_EDITOR_COMMAND_SHOW_SIMILAR, KEYBINDINGS_EDITOR_COMMAND_SORTBY_PRECEDENCE, KEYBINDINGS_EDITOR_SHOW_DEFAULT_KEYBINDINGS, KEYBINDINGS_EDITOR_SHOW_EXTENSION_KEYBINDINGS, KEYBINDINGS_EDITOR_SHOW_USER_KEYBINDINGS, REQUIRE_TRUSTED_WORKSPACE_SETTING_TAG, SETTINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS, SETTINGS_EDITOR_COMMAND_SHOW_CONTEXT_MENU } from '../common/preferences.js';
+import { PreferencesContribution } from '../common/preferencesContribution.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { KeybindingsEditorInput } from '../../../services/preferences/browser/keybindingsEditorInput.js';
+import { DEFINE_KEYBINDING_EDITOR_CONTRIB_ID, IDefineKeybindingEditorContribution, IPreferencesService } from '../../../services/preferences/common/preferences.js';
+import { SettingsEditor2Input } from '../../../services/preferences/common/preferencesEditorInput.js';
+import { IUserDataProfileService, CURRENT_PROFILE_CONTEXT } from '../../../services/userDataProfile/common/userDataProfile.js';
+import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
 
 const SETTINGS_EDITOR_COMMAND_SEARCH = 'settings.action.search';
 
@@ -1246,6 +1246,7 @@ class SettingsEditorTitleContribution extends Disposable implements IWorkbenchCo
 				ResourceContextKey.Resource.isEqualTo(this.userDataProfilesService.defaultProfile.settingsResource.toString())),
 			ContextKeyExpr.not('isInDiffEditor'));
 		const registerOpenUserSettingsEditorFromJsonAction = () => {
+			registerOpenUserSettingsEditorFromJsonActionDisposables.value = undefined;
 			registerOpenUserSettingsEditorFromJsonActionDisposables.value = registerAction2(class extends Action2 {
 				constructor() {
 					super({
diff --git a/src/vs/workbench/contrib/preferences/browser/preferencesActions.ts b/src/vs/workbench/contrib/preferences/browser/preferencesActions.ts
index e706aeb4a42..328832f0025 100644
--- a/src/vs/workbench/contrib/preferences/browser/preferencesActions.ts
+++ b/src/vs/workbench/contrib/preferences/browser/preferencesActions.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Action } from 'vs/base/common/actions';
-import { URI } from 'vs/base/common/uri';
-import { getIconClasses } from 'vs/editor/common/services/getIconClasses';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import * as nls from 'vs/nls';
-import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
-import { MenuId, MenuRegistry, isIMenuItem } from 'vs/platform/actions/common/actions';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { isLocalizedString } from 'vs/platform/action/common/action';
+import { Action } from '../../../../base/common/actions.js';
+import { URI } from '../../../../base/common/uri.js';
+import { getIconClasses } from '../../../../editor/common/services/getIconClasses.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import * as nls from '../../../../nls.js';
+import { IQuickInputService, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
+import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Extensions, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { EditorExtensionsRegistry } from '../../../../editor/browser/editorExtensions.js';
+import { MenuId, MenuRegistry, isIMenuItem } from '../../../../platform/actions/common/actions.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { isLocalizedString } from '../../../../platform/action/common/action.js';
 
 export class ConfigureLanguageBasedSettingsAction extends Action {
 
diff --git a/src/vs/workbench/contrib/preferences/browser/preferencesEditor.ts b/src/vs/workbench/contrib/preferences/browser/preferencesEditor.ts
index 91a2cd923d1..aed3a321c96 100644
--- a/src/vs/workbench/contrib/preferences/browser/preferencesEditor.ts
+++ b/src/vs/workbench/contrib/preferences/browser/preferencesEditor.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IPreferencesRenderer, UserSettingsRenderer, WorkspaceSettingsRenderer } from 'vs/workbench/contrib/preferences/browser/preferencesRenderers';
-import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
-import { SettingsEditorModel } from 'vs/workbench/services/preferences/common/preferencesModels';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { IPreferencesRenderer, UserSettingsRenderer, WorkspaceSettingsRenderer } from './preferencesRenderers.js';
+import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
+import { SettingsEditorModel } from '../../../services/preferences/common/preferencesModels.js';
 
 export class SettingsEditorContribution extends Disposable {
 	static readonly ID: string = 'editor.contrib.settings';
diff --git a/src/vs/workbench/contrib/preferences/browser/preferencesIcons.ts b/src/vs/workbench/contrib/preferences/browser/preferencesIcons.ts
index ce77f864b92..a1e96eb3715 100644
--- a/src/vs/workbench/contrib/preferences/browser/preferencesIcons.ts
+++ b/src/vs/workbench/contrib/preferences/browser/preferencesIcons.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from 'vs/base/common/codicons';
-import { localize } from 'vs/nls';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { localize } from '../../../../nls.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 
 export const settingsScopeDropDownIcon = registerIcon('settings-folder-dropdown', Codicon.triangleDown, localize('settingsScopeDropDownIcon', 'Icon for the folder dropdown button in the split JSON Settings editor.'));
 export const settingsMoreActionIcon = registerIcon('settings-more-action', Codicon.gear, localize('settingsMoreActionIcon', 'Icon for the \'more actions\' action in the Settings UI.'));
diff --git a/src/vs/workbench/contrib/preferences/browser/preferencesRenderers.ts b/src/vs/workbench/contrib/preferences/browser/preferencesRenderers.ts
index 1ce23e61678..b1d3b13161a 100644
--- a/src/vs/workbench/contrib/preferences/browser/preferencesRenderers.ts
+++ b/src/vs/workbench/contrib/preferences/browser/preferencesRenderers.ts
@@ -3,48 +3,48 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { EventHelper, getDomNodePagePosition } from 'vs/base/browser/dom';
-import { IAction, SubmenuAction } from 'vs/base/common/actions';
-import { Delayer } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { ResourceMap } from 'vs/base/common/map';
-import { isEqual } from 'vs/base/common/resources';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Position } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ICursorPositionChangedEvent } from 'vs/editor/common/cursorEvents';
-import * as editorCommon from 'vs/editor/common/editorCommon';
-import * as languages from 'vs/editor/common/languages';
-import { IModelDeltaDecoration, ITextModel, TrackedRangeStickiness } from 'vs/editor/common/model';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { CodeActionKind } from 'vs/editor/contrib/codeAction/common/types';
-import * as nls from 'vs/nls';
-import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { Extensions as ConfigurationExtensions, ConfigurationScope, IConfigurationPropertySchema, IConfigurationRegistry, IRegisteredConfigurationPropertySchema, OVERRIDE_PROPERTY_REGEX, overrideIdentifiersFromKey } from 'vs/platform/configuration/common/configurationRegistry';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IMarkerData, IMarkerService, MarkerSeverity, MarkerTag } from 'vs/platform/markers/common/markers';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { IWorkspaceTrustManagementService } from 'vs/platform/workspace/common/workspaceTrust';
-import { RangeHighlightDecorations } from 'vs/workbench/browser/codeeditor';
-import { settingsEditIcon } from 'vs/workbench/contrib/preferences/browser/preferencesIcons';
-import { EditPreferenceWidget } from 'vs/workbench/contrib/preferences/browser/preferencesWidgets';
-import { APPLY_ALL_PROFILES_SETTING, IWorkbenchConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IPreferencesEditorModel, IPreferencesService, ISetting, ISettingsEditorModel, ISettingsGroup } from 'vs/workbench/services/preferences/common/preferences';
-import { DefaultSettingsEditorModel, SettingsEditorModel, WorkspaceConfigurationEditorModel } from 'vs/workbench/services/preferences/common/preferencesModels';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
+import { EventHelper, getDomNodePagePosition } from '../../../../base/browser/dom.js';
+import { IAction, SubmenuAction } from '../../../../base/common/actions.js';
+import { Delayer } from '../../../../base/common/async.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IStringDictionary } from '../../../../base/common/collections.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
+import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from '../../../../editor/browser/editorBrowser.js';
+import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { IRange, Range } from '../../../../editor/common/core/range.js';
+import { Selection } from '../../../../editor/common/core/selection.js';
+import { ICursorPositionChangedEvent } from '../../../../editor/common/cursorEvents.js';
+import * as editorCommon from '../../../../editor/common/editorCommon.js';
+import * as languages from '../../../../editor/common/languages.js';
+import { IModelDeltaDecoration, ITextModel, TrackedRangeStickiness } from '../../../../editor/common/model.js';
+import { ModelDecorationOptions } from '../../../../editor/common/model/textModel.js';
+import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
+import { CodeActionKind } from '../../../../editor/contrib/codeAction/common/types.js';
+import * as nls from '../../../../nls.js';
+import { ConfigurationTarget, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { Extensions as ConfigurationExtensions, ConfigurationScope, IConfigurationPropertySchema, IConfigurationRegistry, IRegisteredConfigurationPropertySchema, OVERRIDE_PROPERTY_REGEX, overrideIdentifiersFromKey } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IMarkerData, IMarkerService, MarkerSeverity, MarkerTag } from '../../../../platform/markers/common/markers.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { IWorkspaceContextService, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { IWorkspaceTrustManagementService } from '../../../../platform/workspace/common/workspaceTrust.js';
+import { RangeHighlightDecorations } from '../../../browser/codeeditor.js';
+import { settingsEditIcon } from './preferencesIcons.js';
+import { EditPreferenceWidget } from './preferencesWidgets.js';
+import { APPLY_ALL_PROFILES_SETTING, IWorkbenchConfigurationService } from '../../../services/configuration/common/configuration.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { IPreferencesEditorModel, IPreferencesService, ISetting, ISettingsEditorModel, ISettingsGroup } from '../../../services/preferences/common/preferences.js';
+import { DefaultSettingsEditorModel, SettingsEditorModel, WorkspaceConfigurationEditorModel } from '../../../services/preferences/common/preferencesModels.js';
+import { IUserDataProfileService } from '../../../services/userDataProfile/common/userDataProfile.js';
 
 export interface IPreferencesRenderer extends IDisposable {
 	render(): void;
@@ -500,6 +500,7 @@ class UnsupportedSettingsRenderer extends Disposable implements languages.CodeAc
 		this._register(this.editor.getModel()!.onDidChangeContent(() => this.delayedRender()));
 		this._register(Event.filter(this.configurationService.onDidChangeConfiguration, e => e.source === ConfigurationTarget.DEFAULT)(() => this.delayedRender()));
 		this._register(languageFeaturesService.codeActionProvider.register({ pattern: settingsEditorModel.uri.path }, this));
+		this._register(userDataProfileService.onDidChangeCurrentProfile(() => this.delayedRender()));
 	}
 
 	private delayedRender(): void {
diff --git a/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts b/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
index 7f8bb17a88f..e81c8009f79 100644
--- a/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
+++ b/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ISettingsEditorModel, ISetting, ISettingsGroup, ISearchResult, IGroupFilter, SettingMatchType, ISettingMatch } from 'vs/workbench/services/preferences/common/preferences';
-import { IRange } from 'vs/editor/common/core/range';
-import { distinct } from 'vs/base/common/arrays';
-import * as strings from 'vs/base/common/strings';
-import { IMatch, matchesContiguousSubString, matchesWords } from 'vs/base/common/filters';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IPreferencesSearchService, IRemoteSearchProvider, ISearchProvider, IWorkbenchSettingsConfiguration } from 'vs/workbench/contrib/preferences/common/preferences';
-import { IExtensionManagementService, ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IWorkbenchExtensionEnablementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { ExtensionType } from 'vs/platform/extensions/common/extensions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IAiRelatedInformationService, RelatedInformationType, SettingInformationResult } from 'vs/workbench/services/aiRelatedInformation/common/aiRelatedInformation';
-import { TfIdfCalculator, TfIdfDocument } from 'vs/base/common/tfIdf';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { nullRange } from 'vs/workbench/services/preferences/common/preferencesModels';
+import { ISettingsEditorModel, ISetting, ISettingsGroup, ISearchResult, IGroupFilter, SettingMatchType, ISettingMatch } from '../../../services/preferences/common/preferences.js';
+import { IRange } from '../../../../editor/common/core/range.js';
+import { distinct } from '../../../../base/common/arrays.js';
+import * as strings from '../../../../base/common/strings.js';
+import { IMatch, matchesContiguousSubString, matchesWords } from '../../../../base/common/filters.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IPreferencesSearchService, IRemoteSearchProvider, ISearchProvider, IWorkbenchSettingsConfiguration } from '../common/preferences.js';
+import { IExtensionManagementService, ILocalExtension } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { IWorkbenchExtensionEnablementService } from '../../../services/extensionManagement/common/extensionManagement.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { ExtensionType } from '../../../../platform/extensions/common/extensions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IAiRelatedInformationService, RelatedInformationType, SettingInformationResult } from '../../../services/aiRelatedInformation/common/aiRelatedInformation.js';
+import { TfIdfCalculator, TfIdfDocument } from '../../../../base/common/tfIdf.js';
+import { IStringDictionary } from '../../../../base/common/collections.js';
+import { nullRange } from '../../../services/preferences/common/preferencesModels.js';
 
 export interface IEndpointDetails {
 	urlBase?: string;
@@ -57,7 +57,7 @@ export class PreferencesSearchService extends Disposable implements IPreferences
 		return workbenchSettings.enableNaturalLanguageSearch;
 	}
 
-	getRemoteSearchProvider(filter: string, newExtensionsOnly = false): IRemoteSearchProvider | undefined {
+	getRemoteSearchProvider(filter: string): IRemoteSearchProvider | undefined {
 		if (!this.remoteSearchAllowed) {
 			return undefined;
 		}
@@ -360,7 +360,6 @@ class AiRelatedInformationSearchKeysProvider {
 }
 
 class AiRelatedInformationSearchProvider implements IRemoteSearchProvider {
-	private static readonly AI_RELATED_INFORMATION_THRESHOLD = 0.73;
 	private static readonly AI_RELATED_INFORMATION_MAX_PICKS = 5;
 
 	private readonly _keysProvider: AiRelatedInformationSearchKeysProvider;
@@ -399,7 +398,7 @@ class AiRelatedInformationSearchProvider implements IRemoteSearchProvider {
 		relatedInformation.sort((a, b) => b.weight - a.weight);
 
 		for (const info of relatedInformation) {
-			if (info.weight < AiRelatedInformationSearchProvider.AI_RELATED_INFORMATION_THRESHOLD || filterMatches.length === AiRelatedInformationSearchProvider.AI_RELATED_INFORMATION_MAX_PICKS) {
+			if (filterMatches.length === AiRelatedInformationSearchProvider.AI_RELATED_INFORMATION_MAX_PICKS) {
 				break;
 			}
 			const pick = info.setting;
@@ -523,9 +522,8 @@ class RemoteSearchProvider implements IRemoteSearchProvider {
 	private initializeSearchProviders() {
 		if (this.aiRelatedInformationService.isEnabled()) {
 			this.adaSearchProvider ??= new AiRelatedInformationSearchProvider(this.aiRelatedInformationService);
-		} else {
-			this.tfIdfSearchProvider ??= new TfIdfSearchProvider();
 		}
+		this.tfIdfSearchProvider ??= new TfIdfSearchProvider();
 	}
 
 	setFilter(filter: string): void {
@@ -533,9 +531,8 @@ class RemoteSearchProvider implements IRemoteSearchProvider {
 		this.filter = filter;
 		if (this.adaSearchProvider) {
 			this.adaSearchProvider.setFilter(filter);
-		} else {
-			this.tfIdfSearchProvider!.setFilter(filter);
 		}
+		this.tfIdfSearchProvider!.setFilter(filter);
 	}
 
 	searchModel(preferencesModel: ISettingsEditorModel, token?: CancellationToken): Promise<ISearchResult | null> {
@@ -543,11 +540,14 @@ class RemoteSearchProvider implements IRemoteSearchProvider {
 			return Promise.resolve(null);
 		}
 
-		if (this.adaSearchProvider) {
-			return this.adaSearchProvider.searchModel(preferencesModel, token);
-		} else {
+		if (!this.adaSearchProvider) {
 			return this.tfIdfSearchProvider!.searchModel(preferencesModel, token);
 		}
+
+		// Use TF-IDF search as a fallback, ref https://github.com/microsoft/vscode/issues/224946
+		return this.adaSearchProvider.searchModel(preferencesModel, token).then((results) => {
+			return results?.filterMatches.length ? results : this.tfIdfSearchProvider!.searchModel(preferencesModel, token);
+		});
 	}
 }
 
diff --git a/src/vs/workbench/contrib/preferences/browser/preferencesWidgets.ts b/src/vs/workbench/contrib/preferences/browser/preferencesWidgets.ts
index 4e68e88dc97..84321a355d9 100644
--- a/src/vs/workbench/contrib/preferences/browser/preferencesWidgets.ts
+++ b/src/vs/workbench/contrib/preferences/browser/preferencesWidgets.ts
@@ -3,40 +3,40 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { ActionBar, ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
-import { BaseActionViewItem, IActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { HistoryInputBox, IHistoryInputOptions } from 'vs/base/browser/ui/inputbox/inputBox';
-import { Widget } from 'vs/base/browser/ui/widget';
-import { Action, IAction } from 'vs/base/common/actions';
-import { Emitter, Event } from 'vs/base/common/event';
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { isEqual } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
-import { IModelDeltaDecoration, TrackedRangeStickiness } from 'vs/editor/common/model';
-import { localize } from 'vs/nls';
-import { ContextScopedHistoryInputBox } from 'vs/platform/history/browser/contextScopedHistoryWidget';
-import { showHistoryKeybindingHint } from 'vs/platform/history/browser/historyWidgetKeybindingHint';
-import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { asCssVariable, badgeBackground, badgeForeground, contrastBorder } from 'vs/platform/theme/common/colorRegistry';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { isWorkspaceFolder, IWorkspaceContextService, IWorkspaceFolder, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { settingsEditIcon, settingsScopeDropDownIcon } from 'vs/workbench/contrib/preferences/browser/preferencesIcons';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import type { IManagedHover } from 'vs/base/browser/ui/hover/hover';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import * as DOM from '../../../../base/browser/dom.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { ActionBar, ActionsOrientation } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { BaseActionViewItem, IActionViewItemOptions } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { HistoryInputBox, IHistoryInputOptions } from '../../../../base/browser/ui/inputbox/inputBox.js';
+import { Widget } from '../../../../base/browser/ui/widget.js';
+import { Action, IAction } from '../../../../base/common/actions.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from '../../../../editor/browser/editorBrowser.js';
+import { IModelDeltaDecoration, TrackedRangeStickiness } from '../../../../editor/common/model.js';
+import { localize } from '../../../../nls.js';
+import { ContextScopedHistoryInputBox } from '../../../../platform/history/browser/contextScopedHistoryWidget.js';
+import { showHistoryKeybindingHint } from '../../../../platform/history/browser/historyWidgetKeybindingHint.js';
+import { ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService, IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { asCssVariable, badgeBackground, badgeForeground, contrastBorder } from '../../../../platform/theme/common/colorRegistry.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { isWorkspaceFolder, IWorkspaceContextService, IWorkspaceFolder, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { settingsEditIcon, settingsScopeDropDownIcon } from './preferencesIcons.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import type { IManagedHover } from '../../../../base/browser/ui/hover/hover.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 
 export class FolderSettingsActionViewItem extends BaseActionViewItem {
 
@@ -261,6 +261,7 @@ export class SettingsTargetsWidget extends Widget {
 			orientation: ActionsOrientation.HORIZONTAL,
 			focusOnlyEnabledItems: true,
 			ariaLabel: localize('settingsSwitcherBarAriaLabel', "Settings Switcher"),
+			ariaRole: 'tablist',
 			actionViewItemProvider: (action: IAction, options: IActionViewItemOptions) => action.id === 'folderSettings' ? this.folderSettings : undefined
 		}));
 
@@ -436,8 +437,7 @@ export class SearchWidget extends Widget {
 
 	protected createInputBox(parent: HTMLElement): HistoryInputBox {
 		const showHistoryHint = () => showHistoryKeybindingHint(this.keybindingService);
-		const box = this._register(new ContextScopedHistoryInputBox(parent, this.contextViewService, { ...this.options, showHistoryHint }, this.contextKeyService));
-		return box;
+		return new ContextScopedHistoryInputBox(parent, this.contextViewService, { ...this.options, showHistoryHint }, this.contextKeyService);
 	}
 
 	showMessage(message: string): void {
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts b/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
index 0b0441c9356..bb13de3a12f 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
@@ -3,70 +3,71 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import * as aria from 'vs/base/browser/ui/aria/aria';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { Button } from 'vs/base/browser/ui/button/button';
-import { ITreeElement } from 'vs/base/browser/ui/tree/tree';
-import { Action } from 'vs/base/common/actions';
-import { Delayer, ThrottledDelayer } from 'vs/base/common/async';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { fromNow } from 'vs/base/common/date';
-import { isCancellationError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Iterable } from 'vs/base/common/iterator';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { Disposable, DisposableStore, dispose } from 'vs/base/common/lifecycle';
-import * as platform from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import 'vs/css!./media/settingsEditor2';
-import { localize } from 'vs/nls';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { ConfigurationTarget, IConfigurationUpdateOverrides } from 'vs/platform/configuration/common/configuration';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { asCssVariable, badgeBackground, badgeForeground, contrastBorder, editorForeground } from 'vs/platform/theme/common/colorRegistry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IUserDataSyncEnablementService, IUserDataSyncService, SyncStatus } from 'vs/platform/userDataSync/common/userDataSync';
-import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
-import { IEditorMemento, IEditorOpenContext, IEditorPane } from 'vs/workbench/common/editor';
-import { SuggestEnabledInput } from 'vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput';
-import { SettingsTarget, SettingsTargetsWidget } from 'vs/workbench/contrib/preferences/browser/preferencesWidgets';
-import { ITOCEntry, getCommonlyUsedData, tocData } from 'vs/workbench/contrib/preferences/browser/settingsLayout';
-import { AbstractSettingRenderer, HeightChangeParams, ISettingLinkClickEvent, resolveConfiguredUntrustedSettings, createTocTreeForExtensionSettings, resolveSettingsTree, SettingsTree, SettingTreeRenderers } from 'vs/workbench/contrib/preferences/browser/settingsTree';
-import { ISettingsEditorViewState, parseQuery, SearchResultIdx, SearchResultModel, SettingsTreeElement, SettingsTreeGroupChild, SettingsTreeGroupElement, SettingsTreeModel, SettingsTreeSettingElement } from 'vs/workbench/contrib/preferences/browser/settingsTreeModels';
-import { createTOCIterator, TOCTree, TOCTreeModel } from 'vs/workbench/contrib/preferences/browser/tocTree';
-import { CONTEXT_SETTINGS_EDITOR, CONTEXT_SETTINGS_ROW_FOCUS, CONTEXT_SETTINGS_SEARCH_FOCUS, CONTEXT_TOC_ROW_FOCUS, ENABLE_LANGUAGE_FILTER, EXTENSION_SETTING_TAG, FEATURE_SETTING_TAG, ID_SETTING_TAG, IPreferencesSearchService, ISearchProvider, LANGUAGE_SETTING_TAG, MODIFIED_SETTING_TAG, POLICY_SETTING_TAG, REQUIRE_TRUSTED_WORKSPACE_SETTING_TAG, SETTINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS, SETTINGS_EDITOR_COMMAND_SUGGEST_FILTERS, WORKSPACE_TRUST_SETTING_TAG, getExperimentalExtensionToggleData } from 'vs/workbench/contrib/preferences/common/preferences';
-import { settingsHeaderBorder, settingsSashBorder, settingsTextInputBorder } from 'vs/workbench/contrib/preferences/common/settingsEditorColorRegistry';
-import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IOpenSettingsOptions, IPreferencesService, ISearchResult, ISetting, ISettingsEditorModel, ISettingsEditorOptions, ISettingsGroup, SettingMatchType, SettingValueType, validateSettingsEditorOptions } from 'vs/workbench/services/preferences/common/preferences';
-import { SettingsEditor2Input } from 'vs/workbench/services/preferences/common/preferencesEditorInput';
-import { Settings2EditorModel, nullRange } from 'vs/workbench/services/preferences/common/preferencesModels';
-import { IUserDataSyncWorkbenchService } from 'vs/workbench/services/userDataSync/common/userDataSync';
-import { preferencesClearInputIcon, preferencesFilterIcon } from 'vs/workbench/contrib/preferences/browser/preferencesIcons';
-import { IWorkspaceTrustManagementService } from 'vs/platform/workspace/common/workspaceTrust';
-import { IWorkbenchConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { Orientation, Sizing, SplitView } from 'vs/base/browser/ui/splitview/splitview';
-import { Color } from 'vs/base/common/color';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { SettingsSearchFilterDropdownMenuActionViewItem } from 'vs/workbench/contrib/preferences/browser/settingsSearchMenu';
-import { IExtensionGalleryService, IExtensionManagementService, IGalleryExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { ISettingOverrideClickEvent } from 'vs/workbench/contrib/preferences/browser/settingsEditorSettingIndicators';
-import { ConfigurationScope, Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { defaultButtonStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { registerNavigableContainer } from 'vs/workbench/browser/actions/widgetNavigationCommands';
-import { IEditorProgressService } from 'vs/platform/progress/common/progress';
-import { IExtensionManifest } from 'vs/platform/extensions/common/extensions';
-import { CodeWindow } from 'vs/base/browser/window';
+import * as DOM from '../../../../base/browser/dom.js';
+import * as aria from '../../../../base/browser/ui/aria/aria.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { Button } from '../../../../base/browser/ui/button/button.js';
+import { ITreeElement } from '../../../../base/browser/ui/tree/tree.js';
+import { Action } from '../../../../base/common/actions.js';
+import { Delayer, raceTimeout } from '../../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { fromNow } from '../../../../base/common/date.js';
+import { isCancellationError } from '../../../../base/common/errors.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore, dispose, type IDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import * as platform from '../../../../base/common/platform.js';
+import { URI } from '../../../../base/common/uri.js';
+import './media/settingsEditor2.css';
+import { localize } from '../../../../nls.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { ConfigurationTarget, IConfigurationUpdateOverrides } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { asCssVariable, badgeBackground, badgeForeground, contrastBorder, editorForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { IUserDataSyncEnablementService, IUserDataSyncService, SyncStatus } from '../../../../platform/userDataSync/common/userDataSync.js';
+import { EditorPane } from '../../../browser/parts/editor/editorPane.js';
+import { IEditorMemento, IEditorOpenContext, IEditorPane } from '../../../common/editor.js';
+import { SuggestEnabledInput } from '../../codeEditor/browser/suggestEnabledInput/suggestEnabledInput.js';
+import { SettingsTarget, SettingsTargetsWidget } from './preferencesWidgets.js';
+import { ITOCEntry, getCommonlyUsedData, tocData } from './settingsLayout.js';
+import { AbstractSettingRenderer, HeightChangeParams, ISettingLinkClickEvent, resolveConfiguredUntrustedSettings, createTocTreeForExtensionSettings, resolveSettingsTree, SettingsTree, SettingTreeRenderers } from './settingsTree.js';
+import { ISettingsEditorViewState, parseQuery, SearchResultIdx, SearchResultModel, SettingsTreeElement, SettingsTreeGroupChild, SettingsTreeGroupElement, SettingsTreeModel, SettingsTreeSettingElement } from './settingsTreeModels.js';
+import { createTOCIterator, TOCTree, TOCTreeModel } from './tocTree.js';
+import { CONTEXT_SETTINGS_EDITOR, CONTEXT_SETTINGS_ROW_FOCUS, CONTEXT_SETTINGS_SEARCH_FOCUS, CONTEXT_TOC_ROW_FOCUS, ENABLE_LANGUAGE_FILTER, EXTENSION_FETCH_TIMEOUT_MS, EXTENSION_SETTING_TAG, FEATURE_SETTING_TAG, ID_SETTING_TAG, IPreferencesSearchService, ISearchProvider, LANGUAGE_SETTING_TAG, MODIFIED_SETTING_TAG, POLICY_SETTING_TAG, REQUIRE_TRUSTED_WORKSPACE_SETTING_TAG, SETTINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS, SETTINGS_EDITOR_COMMAND_SUGGEST_FILTERS, WORKSPACE_TRUST_SETTING_TAG, getExperimentalExtensionToggleData } from '../common/preferences.js';
+import { settingsHeaderBorder, settingsSashBorder, settingsTextInputBorder } from '../common/settingsEditorColorRegistry.js';
+import { IEditorGroup, IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { IOpenSettingsOptions, IPreferencesService, ISearchResult, ISetting, ISettingsEditorModel, ISettingsEditorOptions, ISettingsGroup, SettingMatchType, SettingValueType, validateSettingsEditorOptions } from '../../../services/preferences/common/preferences.js';
+import { SettingsEditor2Input } from '../../../services/preferences/common/preferencesEditorInput.js';
+import { Settings2EditorModel, nullRange } from '../../../services/preferences/common/preferencesModels.js';
+import { IUserDataSyncWorkbenchService } from '../../../services/userDataSync/common/userDataSync.js';
+import { preferencesClearInputIcon, preferencesFilterIcon } from './preferencesIcons.js';
+import { IWorkspaceTrustManagementService } from '../../../../platform/workspace/common/workspaceTrust.js';
+import { IWorkbenchConfigurationService } from '../../../services/configuration/common/configuration.js';
+import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { Orientation, Sizing, SplitView } from '../../../../base/browser/ui/splitview/splitview.js';
+import { Color } from '../../../../base/common/color.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { SettingsSearchFilterDropdownMenuActionViewItem } from './settingsSearchMenu.js';
+import { IExtensionGalleryService, IExtensionManagementService, IGalleryExtension } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { ISettingOverrideClickEvent } from './settingsEditorSettingIndicators.js';
+import { ConfigurationScope, Extensions, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { defaultButtonStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { registerNavigableContainer } from '../../../browser/actions/widgetNavigationCommands.js';
+import { IEditorProgressService } from '../../../../platform/progress/common/progress.js';
+import { IExtensionManifest } from '../../../../platform/extensions/common/extensions.js';
+import { CodeWindow } from '../../../../base/browser/window.js';
+import { IUserDataProfileService } from '../../../services/userDataProfile/common/userDataProfile.js';
 
 
 export const enum SettingsFocusContext {
@@ -109,7 +110,7 @@ export class SettingsEditor2 extends EditorPane {
 	private static TOC_RESET_WIDTH: number = 200;
 	private static EDITOR_MIN_WIDTH: number = 500;
 	// Below NARROW_TOTAL_WIDTH, we only render the editor rather than the ToC.
-	private static NARROW_TOTAL_WIDTH: number = SettingsEditor2.TOC_RESET_WIDTH + SettingsEditor2.EDITOR_MIN_WIDTH;
+	private static NARROW_TOTAL_WIDTH: number = this.TOC_RESET_WIDTH + this.EDITOR_MIN_WIDTH;
 
 	private static SUGGESTIONS: string[] = [
 		`@${MODIFIED_SETTING_TAG}`,
@@ -180,8 +181,7 @@ export class SettingsEditor2 extends EditorPane {
 	private tocTree!: TOCTree;
 
 	private delayedFilterLogging: Delayer<void>;
-	private localSearchDelayer: Delayer<void>;
-	private remoteSearchThrottle: ThrottledDelayer<void>;
+	private searchDelayer: Delayer<void>;
 	private searchInProgress: CancellationTokenSource | null = null;
 
 	private searchInputDelayer: Delayer<void>;
@@ -218,6 +218,12 @@ export class SettingsEditor2 extends EditorPane {
 	private dimension!: DOM.Dimension;
 
 	private installedExtensionIds: string[] = [];
+	private dismissedExtensionSettings: string[] = [];
+
+	private readonly DISMISSED_EXTENSION_SETTINGS_STORAGE_KEY = 'settingsEditor2.dismissedExtensionSettings';
+	private readonly DISMISSED_EXTENSION_SETTINGS_DELIMITER = '\t';
+
+	private readonly inputChangeListener: MutableDisposable<IDisposable>;
 
 	constructor(
 		group: IEditorGroup,
@@ -241,11 +247,11 @@ export class SettingsEditor2 extends EditorPane {
 		@IProductService private readonly productService: IProductService,
 		@IExtensionGalleryService private readonly extensionGalleryService: IExtensionGalleryService,
 		@IEditorProgressService private readonly editorProgressService: IEditorProgressService,
+		@IUserDataProfileService userDataProfileService: IUserDataProfileService,
 	) {
 		super(SettingsEditor2.ID, group, telemetryService, themeService, storageService);
 		this.delayedFilterLogging = new Delayer<void>(1000);
-		this.localSearchDelayer = new Delayer(300);
-		this.remoteSearchThrottle = new ThrottledDelayer(200);
+		this.searchDelayer = new Delayer(300);
 		this.viewState = { settingsTarget: ConfigurationTarget.USER_LOCAL };
 
 		this.settingFastUpdateDelayer = new Delayer<void>(SettingsEditor2.SETTING_UPDATE_FAST_DEBOUNCE);
@@ -263,12 +269,20 @@ export class SettingsEditor2 extends EditorPane {
 
 		this.editorMemento = this.getEditorMemento<ISettingsEditor2State>(editorGroupService, textResourceConfigurationService, SETTINGS_EDITOR_STATE_KEY);
 
+		this.dismissedExtensionSettings = this.storageService
+			.get(this.DISMISSED_EXTENSION_SETTINGS_STORAGE_KEY, StorageScope.PROFILE, '')
+			.split(this.DISMISSED_EXTENSION_SETTINGS_DELIMITER);
+
 		this._register(configurationService.onDidChangeConfiguration(e => {
 			if (e.source !== ConfigurationTarget.DEFAULT) {
 				this.onConfigUpdate(e.affectedKeys);
 			}
 		}));
 
+		this._register(userDataProfileService.onDidChangeCurrentProfile(e => {
+			e.join(this.whenCurrentProfileChanged());
+		}));
+
 		this._register(workspaceTrustManagementService.onDidChangeTrust(() => {
 			this.searchResultModel?.updateWorkspaceTrust(workspaceTrustManagementService.isWorkspaceTrusted());
 
@@ -284,11 +298,28 @@ export class SettingsEditor2 extends EditorPane {
 			}
 		}));
 
+		this._register(extensionManagementService.onDidInstallExtensions(() => {
+			this.refreshInstalledExtensionsList();
+		}));
+		this._register(extensionManagementService.onDidUninstallExtension(() => {
+			this.refreshInstalledExtensionsList();
+		}));
+
 		this.modelDisposables = this._register(new DisposableStore());
 
 		if (ENABLE_LANGUAGE_FILTER && !SettingsEditor2.SUGGESTIONS.includes(`@${LANGUAGE_SETTING_TAG}`)) {
 			SettingsEditor2.SUGGESTIONS.push(`@${LANGUAGE_SETTING_TAG}`);
 		}
+		this.inputChangeListener = this._register(new MutableDisposable());
+	}
+
+	private async whenCurrentProfileChanged(): Promise<void> {
+		this.updatedConfigSchemaDelayer.trigger(() => {
+			this.dismissedExtensionSettings = this.storageService
+				.get(this.DISMISSED_EXTENSION_SETTINGS_STORAGE_KEY, StorageScope.PROFILE, '')
+				.split(this.DISMISSED_EXTENSION_SETTINGS_DELIMITER);
+			this.onConfigUpdate(undefined, true);
+		});
 	}
 
 	override get minimumWidth(): number { return SettingsEditor2.EDITOR_MIN_WIDTH; }
@@ -382,9 +413,9 @@ export class SettingsEditor2 extends EditorPane {
 
 		// Don't block setInput on render (which can trigger an async search)
 		this.onConfigUpdate(undefined, true).then(() => {
-			this._register(input.onWillDispose(() => {
+			this.inputChangeListener.value = input.onWillDispose(() => {
 				this.searchWidget.setValue('');
-			}));
+			});
 
 			// Init TOC selection
 			this.updateTreeScrollSync();
@@ -396,7 +427,7 @@ export class SettingsEditor2 extends EditorPane {
 	private async refreshInstalledExtensionsList(): Promise<void> {
 		const installedExtensions = await this.extensionManagementService.getInstalled();
 		this.installedExtensionIds = installedExtensions
-			.filter(ext => ext.manifest && ext.manifest.contributes && ext.manifest.contributes.configuration)
+			.filter(ext => ext.manifest.contributes?.configuration)
 			.map(ext => ext.identifier.id);
 	}
 
@@ -451,8 +482,7 @@ export class SettingsEditor2 extends EditorPane {
 
 		const target: SettingsTarget | undefined = options.folderUri ?? recoveredViewState?.settingsTarget ?? <SettingsTarget | undefined>options.target;
 		if (target) {
-			this.settingsTargetsWidget.settingsTarget = target;
-			this.viewState.settingsTarget = target;
+			this.settingsTargetsWidget.updateTarget(target);
 		}
 	}
 
@@ -676,6 +706,19 @@ export class SettingsEditor2 extends EditorPane {
 		this.onConfigUpdate(undefined, true);
 	}
 
+	private onDidDismissExtensionSetting(extensionId: string): void {
+		if (!this.dismissedExtensionSettings.includes(extensionId)) {
+			this.dismissedExtensionSettings.push(extensionId);
+		}
+		this.storageService.store(
+			this.DISMISSED_EXTENSION_SETTINGS_STORAGE_KEY,
+			this.dismissedExtensionSettings.join(this.DISMISSED_EXTENSION_SETTINGS_DELIMITER),
+			StorageScope.PROFILE,
+			StorageTarget.USER
+		);
+		this.onConfigUpdate(undefined, true);
+	}
+
 	private onDidClickSetting(evt: ISettingLinkClickEvent, recursed?: boolean): void {
 		const targetElement = this.currentSettingsModel.getElementsByName(evt.targetKey)?.[0];
 		let revealFailed = false;
@@ -791,10 +834,10 @@ export class SettingsEditor2 extends EditorPane {
 		this.createTOC(this.tocTreeContainer);
 		this.createSettingsTree(this.settingsTreeContainer);
 
-		this.splitView = new SplitView(this.bodyContainer, {
+		this.splitView = this._register(new SplitView(this.bodyContainer, {
 			orientation: Orientation.HORIZONTAL,
 			proportionalLayout: true
-		});
+		}));
 		const startingWidth = this.storageService.getNumber('settingsEditor2.splitViewWidth', StorageScope.PROFILE, SettingsEditor2.TOC_RESET_WIDTH);
 		this.splitView.addView({
 			onDidChange: Event.None,
@@ -834,8 +877,7 @@ export class SettingsEditor2 extends EditorPane {
 			if (
 				e.keyCode === KeyCode.KeyA &&
 				(platform.isMacintosh ? e.metaKey : e.ctrlKey) &&
-				e.target.tagName !== 'TEXTAREA' &&
-				e.target.tagName !== 'INPUT'
+				!DOM.isEditableElement(e.target)
 			) {
 				// Avoid browser ctrl+a
 				e.browserEvent.stopPropagation();
@@ -911,8 +953,9 @@ export class SettingsEditor2 extends EditorPane {
 	}
 
 	private createSettingsTree(container: HTMLElement): void {
-		this.settingRenderers = this.instantiationService.createInstance(SettingTreeRenderers);
+		this.settingRenderers = this._register(this.instantiationService.createInstance(SettingTreeRenderers));
 		this._register(this.settingRenderers.onDidChangeSetting(e => this.onDidChangeSetting(e.key, e.value, e.type, e.manualReset, e.scope)));
+		this._register(this.settingRenderers.onDidDismissExtensionSetting((e) => this.onDidDismissExtensionSetting(e)));
 		this._register(this.settingRenderers.onDidOpenSettings(settingKey => {
 			this.openSettingsFile({ revealSetting: { key: settingKey, edit: true } });
 		}));
@@ -1207,43 +1250,6 @@ export class SettingsEditor2 extends EditorPane {
 		});
 	}
 
-	private addOrRemoveManageExtensionSetting(setting: ISetting, extension: IGalleryExtension, groups: ISettingsGroup[]): ISettingsGroup | undefined {
-		const matchingGroups = groups.filter(g => {
-			const lowerCaseId = g.extensionInfo?.id.toLowerCase();
-			return (lowerCaseId === setting.stableExtensionId!.toLowerCase() ||
-				lowerCaseId === setting.prereleaseExtensionId!.toLowerCase());
-		});
-
-		const extensionId = setting.displayExtensionId!;
-		const extensionInstalled = this.installedExtensionIds.includes(extensionId);
-		if (!matchingGroups.length && !extensionInstalled) {
-			// Only show the recommendation when the extension hasn't been installed.
-			const newGroup: ISettingsGroup = {
-				sections: [{
-					settings: [setting],
-				}],
-				id: extensionId,
-				title: setting.extensionGroupTitle!,
-				titleRange: nullRange,
-				range: nullRange,
-				extensionInfo: {
-					id: extensionId,
-					displayName: extension?.displayName,
-				}
-			};
-			groups.push(newGroup);
-			return newGroup;
-		} else if (matchingGroups.length >= 2 || extensionInstalled) {
-			// Remove the group with the manage extension setting.
-			const matchingGroupIndex = matchingGroups.findIndex(group =>
-				group.sections.length === 1 && group.sections[0].settings.length === 1 && group.sections[0].settings[0].displayExtensionId);
-			if (matchingGroupIndex !== -1) {
-				groups.splice(matchingGroupIndex, 1);
-			}
-		}
-		return undefined;
-	}
-
 	private createSettingsOrderByTocIndex(resolvedSettingsRoot: ITOCEntry<ISetting>): Map<string, number> {
 		const index = new Map<string, number>();
 		function indexSettings(resolvedSettingsRoot: ITOCEntry<ISetting>, counter = 0): number {
@@ -1298,18 +1304,55 @@ export class SettingsEditor2 extends EditorPane {
 		}
 
 		const additionalGroups: ISettingsGroup[] = [];
+		let setAdditionalGroups = false;
 		const toggleData = await getExperimentalExtensionToggleData(this.extensionGalleryService, this.productService);
 		if (toggleData && groups.filter(g => g.extensionInfo).length) {
 			for (const key in toggleData.settingsEditorRecommendedExtensions) {
-				const extension = toggleData.recommendedExtensionsGalleryInfo[key];
+				const extension: IGalleryExtension = toggleData.recommendedExtensionsGalleryInfo[key];
+				if (!extension) {
+					continue;
+				}
+
+				const extensionId = extension.identifier.id;
+				// prevent race between extension update handler and this (onConfigUpdate) handler
+				await this.refreshInstalledExtensionsList();
+				const extensionInstalled = this.installedExtensionIds.includes(extensionId);
+
+				// Drill down to see whether the group and setting already exist
+				// and need to be removed.
+				const matchingGroupIndex = groups.findIndex(g =>
+					g.extensionInfo && g.extensionInfo!.id.toLowerCase() === extensionId.toLowerCase() &&
+					g.sections.length === 1 && g.sections[0].settings.length === 1 && g.sections[0].settings[0].displayExtensionId
+				);
+				if (extensionInstalled || this.dismissedExtensionSettings.includes(extensionId)) {
+					if (matchingGroupIndex !== -1) {
+						groups.splice(matchingGroupIndex, 1);
+						setAdditionalGroups = true;
+					}
+					continue;
+				}
+
+				if (matchingGroupIndex !== -1) {
+					continue;
+				}
+
+				// Create the entry. extensionInstalled is false in this case.
 				let manifest: IExtensionManifest | null = null;
 				try {
-					manifest = await this.extensionGalleryService.getManifest(extension, CancellationToken.None);
+					manifest = await raceTimeout(
+						this.extensionGalleryService.getManifest(extension, CancellationToken.None),
+						EXTENSION_FETCH_TIMEOUT_MS
+					) ?? null;
 				} catch (e) {
 					// Likely a networking issue.
 					// Skip adding a button for this extension to the Settings editor.
 					continue;
 				}
+
+				if (manifest === null) {
+					continue;
+				}
+
 				const contributesConfiguration = manifest?.contributes?.configuration;
 
 				let groupTitle: string | undefined;
@@ -1319,7 +1362,8 @@ export class SettingsEditor2 extends EditorPane {
 					groupTitle = contributesConfiguration[0].title;
 				}
 
-				const extensionName = extension?.displayName ?? extension?.name ?? extension.identifier.id;
+				const recommendationInfo = toggleData.settingsEditorRecommendedExtensions[key];
+				const extensionName = extension.displayName ?? extension.name ?? extensionId;
 				const settingKey = `${key}.manageExtension`;
 				const setting: ISetting = {
 					range: nullRange,
@@ -1327,21 +1371,32 @@ export class SettingsEditor2 extends EditorPane {
 					keyRange: nullRange,
 					value: null,
 					valueRange: nullRange,
-					description: [extension?.description || ''],
+					description: [recommendationInfo.onSettingsEditorOpen?.descriptionOverride ?? extension.description],
 					descriptionIsMarkdown: false,
 					descriptionRanges: [],
-					title: extensionName,
 					scope: ConfigurationScope.WINDOW,
 					type: 'null',
-					displayExtensionId: extension.identifier.id,
-					prereleaseExtensionId: key,
-					stableExtensionId: key,
-					extensionGroupTitle: groupTitle ?? extensionName
+					displayExtensionId: extensionId,
+					extensionGroupTitle: groupTitle ?? extensionName,
+					categoryLabel: 'Extensions',
+					title: extensionName
 				};
-				const additionalGroup = this.addOrRemoveManageExtensionSetting(setting, extension, groups);
-				if (additionalGroup) {
-					additionalGroups.push(additionalGroup);
-				}
+				const additionalGroup: ISettingsGroup = {
+					sections: [{
+						settings: [setting],
+					}],
+					id: extensionId,
+					title: setting.extensionGroupTitle!,
+					titleRange: nullRange,
+					range: nullRange,
+					extensionInfo: {
+						id: extensionId,
+						displayName: extension.displayName,
+					}
+				};
+				groups.push(additionalGroup);
+				additionalGroups.push(additionalGroup);
+				setAdditionalGroups = true;
 			}
 		}
 
@@ -1351,7 +1406,7 @@ export class SettingsEditor2 extends EditorPane {
 		const commonlyUsed = resolveSettingsTree(commonlyUsedDataToUse, groups, this.logService);
 		resolvedSettingsRoot.children!.unshift(commonlyUsed.tree);
 
-		if (toggleData) {
+		if (toggleData && setAdditionalGroups) {
 			// Add the additional groups to the model to help with searching.
 			this.defaultSettingsEditorModel.setAdditionalGroups(additionalGroups);
 		}
@@ -1405,9 +1460,7 @@ export class SettingsEditor2 extends EditorPane {
 				keys.forEach(key => this.settingsTreeModel.updateElementsByName(key));
 			}
 
-			// Attempt to render the tree once rather than
-			// once for each key to avoid redundant calls to this.refreshTree()
-			this.renderTree();
+			keys.forEach(key => this.renderTree(key));
 		} else {
 			this.renderTree();
 		}
@@ -1447,7 +1500,6 @@ export class SettingsEditor2 extends EditorPane {
 					// update `list`s live, as they have a separate "submit edit" step built in before this
 					(focusedSetting.parentElement && !focusedSetting.parentElement.classList.contains('setting-item-list'))
 				) {
-
 					this.updateModifiedLabelForKey(key);
 					this.scheduleRefresh(focusedSetting, key);
 					return;
@@ -1463,8 +1515,10 @@ export class SettingsEditor2 extends EditorPane {
 		if (key) {
 			const elements = this.currentSettingsModel.getElementsByName(key);
 			if (elements && elements.length) {
-				// TODO https://github.com/microsoft/vscode/issues/57360
-				this.refreshTree();
+				if (elements.length >= 2) {
+					console.warn('More than one setting with key ' + key + ' found');
+				}
+				this.refreshSingleElement(elements[0]);
 			} else {
 				// Refresh requested for a key that we don't know about
 				return;
@@ -1480,6 +1534,12 @@ export class SettingsEditor2 extends EditorPane {
 		return !!DOM.findParentWithClass(<HTMLElement>this.rootElement.ownerDocument.activeElement, 'context-view');
 	}
 
+	private refreshSingleElement(element: SettingsTreeSettingElement): void {
+		if (this.isVisible()) {
+			this.settingsTree.rerender(element);
+		}
+	}
+
 	private refreshTree(): void {
 		if (this.isVisible()) {
 			this.settingsTree.setChildren(null, createGroupIterator(this.currentSettingsModel.root));
@@ -1573,8 +1633,7 @@ export class SettingsEditor2 extends EditorPane {
 				this.searchResultModel = null;
 			}
 
-			this.localSearchDelayer.cancel();
-			this.remoteSearchThrottle.cancel();
+			this.searchDelayer.cancel();
 			if (this.searchInProgress) {
 				this.searchInProgress.cancel();
 				this.searchInProgress.dispose();
@@ -1665,7 +1724,7 @@ export class SettingsEditor2 extends EditorPane {
 		this.telemetryService.publicLog2<SettingsEditorFilterEvent, SettingsEditorFilterClassification>('settingsEditor.filter', data);
 	}
 
-	private triggerFilterPreferences(query: string): Promise<void> {
+	private async triggerFilterPreferences(query: string): Promise<void> {
 		if (this.searchInProgress) {
 			this.searchInProgress.cancel();
 			this.searchInProgress = null;
@@ -1673,33 +1732,39 @@ export class SettingsEditor2 extends EditorPane {
 
 		// Trigger the local search. If it didn't find an exact match, trigger the remote search.
 		const searchInProgress = this.searchInProgress = new CancellationTokenSource();
-		return this.localSearchDelayer.trigger(async () => {
-			if (searchInProgress && !searchInProgress.token.isCancellationRequested) {
-				const result = await this.localFilterPreferences(query);
-				if (result && !result.exactMatch) {
-					this.remoteSearchThrottle.trigger(async () => {
-						if (searchInProgress && !searchInProgress.token.isCancellationRequested) {
-							await this.remoteSearchPreferences(query, this.searchInProgress?.token);
-						}
-					});
+		return this.searchDelayer.trigger(async () => {
+			if (!searchInProgress.token.isCancellationRequested) {
+				const localResults = await this.localFilterPreferences(query, searchInProgress.token);
+				if (localResults && !localResults.exactMatch && !searchInProgress.token.isCancellationRequested) {
+					await this.remoteSearchPreferences(query, searchInProgress.token);
 				}
+
+				// Update UI only after all the search results are in
+				// ref https://github.com/microsoft/vscode/issues/224946
+				this.onDidFinishSearch();
 			}
 		});
 	}
 
+	private onDidFinishSearch() {
+		this.tocTreeModel.currentSearchModel = this.searchResultModel;
+		this.tocTreeModel.update();
+		this.tocTree.setFocus([]);
+		this.viewState.filterToCategory = undefined;
+		this.tocTree.expandAll();
+		this.settingsTree.scrollTop = 0;
+		this.refreshTOCTree();
+		this.renderTree(undefined, true);
+	}
+
 	private localFilterPreferences(query: string, token?: CancellationToken): Promise<ISearchResult | null> {
 		const localSearchProvider = this.preferencesSearchService.getLocalSearchProvider(query);
 		return this.filterOrSearchPreferences(query, SearchResultIdx.Local, localSearchProvider, token);
 	}
 
-	private remoteSearchPreferences(query: string, token?: CancellationToken): Promise<void> {
+	private remoteSearchPreferences(query: string, token?: CancellationToken): Promise<ISearchResult | null> {
 		const remoteSearchProvider = this.preferencesSearchService.getRemoteSearchProvider(query);
-		const newExtSearchProvider = this.preferencesSearchService.getRemoteSearchProvider(query, true);
-
-		return Promise.all([
-			this.filterOrSearchPreferences(query, SearchResultIdx.Remote, remoteSearchProvider, token),
-			this.filterOrSearchPreferences(query, SearchResultIdx.NewExtensions, newExtSearchProvider, token)
-		]).then(() => { });
+		return this.filterOrSearchPreferences(query, SearchResultIdx.Remote, remoteSearchProvider, token);
 	}
 
 	private async filterOrSearchPreferences(query: string, type: SearchResultIdx, searchProvider?: ISearchProvider, token?: CancellationToken): Promise<ISearchResult | null> {
@@ -1708,24 +1773,8 @@ export class SettingsEditor2 extends EditorPane {
 			// Handle cancellation like this because cancellation is lost inside the search provider due to async/await
 			return null;
 		}
-		if (!this.searchResultModel) {
-			this.searchResultModel = this.instantiationService.createInstance(SearchResultModel, this.viewState, this.settingsOrderByTocIndex, this.workspaceTrustManagementService.isWorkspaceTrusted());
-			// Must be called before this.renderTree()
-			// to make sure the search results count is set.
-			this.searchResultModel.setResult(type, result);
-			this.tocTreeModel.currentSearchModel = this.searchResultModel;
-		} else {
-			this.searchResultModel.setResult(type, result);
-			this.tocTreeModel.update();
-		}
-		if (type === SearchResultIdx.Local) {
-			this.tocTree.setFocus([]);
-			this.viewState.filterToCategory = undefined;
-			this.tocTree.expandAll();
-		}
-		this.settingsTree.scrollTop = 0;
-		this.refreshTOCTree();
-		this.renderTree(undefined, true);
+		this.searchResultModel ??= this.instantiationService.createInstance(SearchResultModel, this.viewState, this.settingsOrderByTocIndex, this.workspaceTrustManagementService.isWorkspaceTrusted());
+		this.searchResultModel.setResult(type, result);
 		return result;
 	}
 
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsEditorSettingIndicators.ts b/src/vs/workbench/contrib/preferences/browser/settingsEditorSettingIndicators.ts
index 6db2e7883d9..0e70d274178 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsEditorSettingIndicators.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsEditorSettingIndicators.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { HoverPosition } from 'vs/base/browser/ui/hover/hoverWidget';
-import { SimpleIconLabel } from 'vs/base/browser/ui/iconLabel/simpleIconLabel';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { Emitter } from 'vs/base/common/event';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { IDisposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { localize } from 'vs/nls';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IUserDataSyncEnablementService } from 'vs/platform/userDataSync/common/userDataSync';
-import { SettingsTreeSettingElement } from 'vs/workbench/contrib/preferences/browser/settingsTreeModels';
-import { POLICY_SETTING_TAG } from 'vs/workbench/contrib/preferences/common/preferences';
-import { IWorkbenchConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import type { IHoverOptions, IHoverWidget } from 'vs/base/browser/ui/hover/hover';
+import * as DOM from '../../../../base/browser/dom.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { HoverPosition } from '../../../../base/browser/ui/hover/hoverWidget.js';
+import { SimpleIconLabel } from '../../../../base/browser/ui/iconLabel/simpleIconLabel.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { IMarkdownString, MarkdownString } from '../../../../base/common/htmlContent.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { IDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { localize } from '../../../../nls.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
+import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { IUserDataSyncEnablementService } from '../../../../platform/userDataSync/common/userDataSync.js';
+import { SettingsTreeSettingElement } from './settingsTreeModels.js';
+import { POLICY_SETTING_TAG } from '../common/preferences.js';
+import { IWorkbenchConfigurationService } from '../../../services/configuration/common/configuration.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import type { IHoverOptions, IHoverWidget } from '../../../../base/browser/ui/hover/hover.js';
 
 const $ = DOM.$;
 
@@ -448,15 +448,27 @@ export class SettingsTreeIndicatorsLabel implements IDisposable {
 
 	updateDefaultOverrideIndicator(element: SettingsTreeSettingElement) {
 		this.defaultOverrideIndicator.element.style.display = 'none';
-		const sourceToDisplay = getDefaultValueSourceToDisplay(element);
+		let sourceToDisplay = getDefaultValueSourceToDisplay(element);
 		if (sourceToDisplay !== undefined) {
 			this.defaultOverrideIndicator.element.style.display = 'inline';
 			this.defaultOverrideIndicator.disposables.clear();
 
-			const defaultOverrideHoverContent = localize('defaultOverriddenDetails', "Default setting value overridden by {0}", sourceToDisplay);
+			// Show source of default value when hovered
+			if (Array.isArray(sourceToDisplay) && sourceToDisplay.length === 1) {
+				sourceToDisplay = sourceToDisplay[0];
+			}
+
+			let defaultOverrideHoverContent;
+			if (!Array.isArray(sourceToDisplay)) {
+				defaultOverrideHoverContent = localize('defaultOverriddenDetails', "Default setting value overridden by `{0}`", sourceToDisplay);
+			} else {
+				sourceToDisplay = sourceToDisplay.map(source => `\`${source}\``);
+				defaultOverrideHoverContent = localize('multipledefaultOverriddenDetails', "A default values has been set by {0}", sourceToDisplay.slice(0, -1).join(', ') + ' & ' + sourceToDisplay.slice(-1));
+			}
+
 			const showHover = (focus: boolean) => {
 				return this.hoverService.showHover({
-					content: defaultOverrideHoverContent,
+					content: new MarkdownString().appendMarkdown(defaultOverrideHoverContent),
 					target: this.defaultOverrideIndicator.element,
 					position: {
 						hoverPosition: HoverPosition.BELOW,
@@ -473,14 +485,22 @@ export class SettingsTreeIndicatorsLabel implements IDisposable {
 	}
 }
 
-function getDefaultValueSourceToDisplay(element: SettingsTreeSettingElement): string | undefined {
-	let sourceToDisplay: string | undefined;
+function getDefaultValueSourceToDisplay(element: SettingsTreeSettingElement): string | undefined | string[] {
+	let sourceToDisplay: string | undefined | string[];
 	const defaultValueSource = element.defaultValueSource;
 	if (defaultValueSource) {
-		if (typeof defaultValueSource !== 'string') {
-			sourceToDisplay = defaultValueSource.displayName ?? defaultValueSource.id;
+		if (defaultValueSource instanceof Map) {
+			sourceToDisplay = [];
+			for (const [, value] of defaultValueSource) {
+				const newValue = typeof value !== 'string' ? value.displayName ?? value.id : value;
+				if (!sourceToDisplay.includes(newValue)) {
+					sourceToDisplay.push(newValue);
+				}
+			}
 		} else if (typeof defaultValueSource === 'string') {
 			sourceToDisplay = defaultValueSource;
+		} else {
+			sourceToDisplay = defaultValueSource.displayName ?? defaultValueSource.id;
 		}
 	}
 	return sourceToDisplay;
@@ -538,9 +558,19 @@ export function getIndicatorsLabelAriaLabel(element: SettingsTreeSettingElement,
 	}
 
 	// Add default override indicator text
-	const sourceToDisplay = getDefaultValueSourceToDisplay(element);
+	let sourceToDisplay = getDefaultValueSourceToDisplay(element);
 	if (sourceToDisplay !== undefined) {
-		ariaLabelSections.push(localize('defaultOverriddenDetailsAriaLabel', "{0} overrides the default value", sourceToDisplay));
+		if (Array.isArray(sourceToDisplay) && sourceToDisplay.length === 1) {
+			sourceToDisplay = sourceToDisplay[0];
+		}
+
+		let overriddenDetailsText;
+		if (!Array.isArray(sourceToDisplay)) {
+			overriddenDetailsText = localize('defaultOverriddenDetailsAriaLabel', "{0} overrides the default value", sourceToDisplay);
+		} else {
+			overriddenDetailsText = localize('multipleDefaultOverriddenDetailsAriaLabel', "{0} override the default value", sourceToDisplay.slice(0, -1).join(', ') + ' & ' + sourceToDisplay.slice(-1));
+		}
+		ariaLabelSections.push(overriddenDetailsText);
 	}
 
 	// Add text about default values being overridden in other languages
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts b/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts
index a47b4ff6e15..7e9aab40f94 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { ExtensionToggleData } from 'vs/workbench/contrib/preferences/common/preferences';
+import { localize } from '../../../../nls.js';
+import { ExtensionToggleData } from '../common/preferences.js';
 
 export interface ITOCEntry<T> {
 	id: string;
@@ -235,6 +235,11 @@ export const tocData: ITOCEntry<string> = {
 					id: 'features/chat',
 					label: localize('chat', 'Chat'),
 					settings: ['chat.*', 'inlineChat.*']
+				},
+				{
+					id: 'features/issueReporter',
+					label: localize('issueReporter', 'Issue Reporter'),
+					settings: ['issueReporter.*']
 				}
 			]
 		},
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsSearchMenu.ts b/src/vs/workbench/contrib/preferences/browser/settingsSearchMenu.ts
index d119cd97f69..43fd169c61c 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsSearchMenu.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsSearchMenu.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { AnchorAlignment } from 'vs/base/browser/ui/contextview/contextview';
-import { DropdownMenuActionViewItem } from 'vs/base/browser/ui/dropdown/dropdownActionViewItem';
-import { IAction, IActionRunner } from 'vs/base/common/actions';
-import { SuggestController } from 'vs/editor/contrib/suggest/browser/suggestController';
-import { localize } from 'vs/nls';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { SuggestEnabledInput } from 'vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput';
-import { EXTENSION_SETTING_TAG, FEATURE_SETTING_TAG, GENERAL_TAG_SETTING_TAG, LANGUAGE_SETTING_TAG, MODIFIED_SETTING_TAG, POLICY_SETTING_TAG } from 'vs/workbench/contrib/preferences/common/preferences';
+import { IActionViewItemOptions } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { AnchorAlignment } from '../../../../base/browser/ui/contextview/contextview.js';
+import { DropdownMenuActionViewItem } from '../../../../base/browser/ui/dropdown/dropdownActionViewItem.js';
+import { IAction, IActionRunner } from '../../../../base/common/actions.js';
+import { SuggestController } from '../../../../editor/contrib/suggest/browser/suggestController.js';
+import { localize } from '../../../../nls.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { SuggestEnabledInput } from '../../codeEditor/browser/suggestEnabledInput/suggestEnabledInput.js';
+import { EXTENSION_SETTING_TAG, FEATURE_SETTING_TAG, GENERAL_TAG_SETTING_TAG, LANGUAGE_SETTING_TAG, MODIFIED_SETTING_TAG, POLICY_SETTING_TAG } from '../common/preferences.js';
 
 export class SettingsSearchFilterDropdownMenuActionViewItem extends DropdownMenuActionViewItem {
 	private readonly suggestController: SuggestController | null;
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
index 79dadc81822..4ff3b3b600f 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
@@ -3,85 +3,98 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BrowserFeatures } from 'vs/base/browser/canIUse';
-import * as DOM from 'vs/base/browser/dom';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { renderMarkdownAsPlaintext } from 'vs/base/browser/markdownRenderer';
-import { IMouseEvent } from 'vs/base/browser/mouseEvent';
-import * as aria from 'vs/base/browser/ui/aria/aria';
-import { Button } from 'vs/base/browser/ui/button/button';
-import { SimpleIconLabel } from 'vs/base/browser/ui/iconLabel/simpleIconLabel';
-import { IInputOptions, InputBox } from 'vs/base/browser/ui/inputbox/inputBox';
-import { CachedListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { DefaultStyleController, IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
-import { ISelectOptionItem, SelectBox } from 'vs/base/browser/ui/selectBox/selectBox';
-import { Toggle, unthemedToggleStyles } from 'vs/base/browser/ui/toggle/toggle';
-import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar';
-import { RenderIndentGuides } from 'vs/base/browser/ui/tree/abstractTree';
-import { IList } from 'vs/base/browser/ui/tree/indexTreeModel';
-import { IObjectTreeOptions } from 'vs/base/browser/ui/tree/objectTree';
-import { ObjectTreeModel } from 'vs/base/browser/ui/tree/objectTreeModel';
-import { ITreeFilter, ITreeModel, ITreeNode, ITreeRenderer, TreeFilterResult, TreeVisibility } from 'vs/base/browser/ui/tree/tree';
-import { Action, IAction, Separator } from 'vs/base/common/actions';
-import { distinct } from 'vs/base/common/arrays';
-import { Codicon } from 'vs/base/common/codicons';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { Disposable, DisposableStore, dispose, isDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { isIOS } from 'vs/base/common/platform';
-import { escapeRegExpCharacters } from 'vs/base/common/strings';
-import { isDefined, isUndefinedOrNull } from 'vs/base/common/types';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { MarkdownRenderer } from 'vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
-import { localize } from 'vs/nls';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { ConfigurationTarget, IConfigurationService, getLanguageTagSettingPlainKey } from 'vs/platform/configuration/common/configuration';
-import { ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IListService, WorkbenchObjectTree } from 'vs/platform/list/browser/listService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { defaultButtonStyles, getInputBoxStyle, getListStyles, getSelectBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { editorBackground, foreground } from 'vs/platform/theme/common/colorRegistry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { getIgnoredSettings } from 'vs/platform/userDataSync/common/settingsMerge';
-import { IUserDataSyncEnablementService, getDefaultIgnoredSettings } from 'vs/platform/userDataSync/common/userDataSync';
-import { IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions';
-import { settingsMoreActionIcon } from 'vs/workbench/contrib/preferences/browser/preferencesIcons';
-import { SettingsTarget } from 'vs/workbench/contrib/preferences/browser/preferencesWidgets';
-import { ISettingOverrideClickEvent, SettingsTreeIndicatorsLabel, getIndicatorsLabelAriaLabel } from 'vs/workbench/contrib/preferences/browser/settingsEditorSettingIndicators';
-import { ITOCEntry } from 'vs/workbench/contrib/preferences/browser/settingsLayout';
-import { ISettingsEditorViewState, SettingsTreeElement, SettingsTreeGroupChild, SettingsTreeGroupElement, SettingsTreeNewExtensionsElement, SettingsTreeSettingElement, inspectSetting, settingKeyToDisplayFormat } from 'vs/workbench/contrib/preferences/browser/settingsTreeModels';
-import { ExcludeSettingWidget, IListDataItem, IObjectDataItem, IObjectEnumOption, IObjectKeySuggester, IObjectValueSuggester, ISettingListChangeEvent, IncludeSettingWidget, ListSettingWidget, ObjectSettingCheckboxWidget, ObjectSettingDropdownWidget, ObjectValue } from 'vs/workbench/contrib/preferences/browser/settingsWidgets';
-import { LANGUAGE_SETTING_TAG, SETTINGS_EDITOR_COMMAND_SHOW_CONTEXT_MENU, compareTwoNullableNumbers } from 'vs/workbench/contrib/preferences/common/preferences';
-import { settingsNumberInputBackground, settingsNumberInputBorder, settingsNumberInputForeground, settingsSelectBackground, settingsSelectBorder, settingsSelectForeground, settingsSelectListBorder, settingsTextInputBackground, settingsTextInputBorder, settingsTextInputForeground } from 'vs/workbench/contrib/preferences/common/settingsEditorColorRegistry';
-import { APPLY_ALL_PROFILES_SETTING, IWorkbenchConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { ISetting, ISettingsGroup, SettingValueType } from 'vs/workbench/services/preferences/common/preferences';
-import { getInvalidTypeError } from 'vs/workbench/services/preferences/common/preferencesValidation';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import { BrowserFeatures } from '../../../../base/browser/canIUse.js';
+import * as DOM from '../../../../base/browser/dom.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { renderMarkdownAsPlaintext } from '../../../../base/browser/markdownRenderer.js';
+import { IMouseEvent } from '../../../../base/browser/mouseEvent.js';
+import * as aria from '../../../../base/browser/ui/aria/aria.js';
+import { Button } from '../../../../base/browser/ui/button/button.js';
+import { SimpleIconLabel } from '../../../../base/browser/ui/iconLabel/simpleIconLabel.js';
+import { IInputOptions, InputBox } from '../../../../base/browser/ui/inputbox/inputBox.js';
+import { CachedListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
+import { DefaultStyleController, IListAccessibilityProvider } from '../../../../base/browser/ui/list/listWidget.js';
+import { ISelectOptionItem, SelectBox } from '../../../../base/browser/ui/selectBox/selectBox.js';
+import { Toggle, unthemedToggleStyles } from '../../../../base/browser/ui/toggle/toggle.js';
+import { ToolBar } from '../../../../base/browser/ui/toolbar/toolbar.js';
+import { RenderIndentGuides } from '../../../../base/browser/ui/tree/abstractTree.js';
+import { IObjectTreeOptions } from '../../../../base/browser/ui/tree/objectTree.js';
+import { ObjectTreeModel } from '../../../../base/browser/ui/tree/objectTreeModel.js';
+import { ITreeFilter, ITreeModel, ITreeNode, ITreeRenderer, TreeFilterResult, TreeVisibility } from '../../../../base/browser/ui/tree/tree.js';
+import { Action, IAction, Separator } from '../../../../base/common/actions.js';
+import { distinct } from '../../../../base/common/arrays.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore, dispose, isDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { isIOS } from '../../../../base/common/platform.js';
+import { escapeRegExpCharacters } from '../../../../base/common/strings.js';
+import { isDefined, isUndefinedOrNull } from '../../../../base/common/types.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { MarkdownRenderer } from '../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import { localize } from '../../../../nls.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { ConfigurationTarget, IConfigurationService, getLanguageTagSettingPlainKey } from '../../../../platform/configuration/common/configuration.js';
+import { ConfigurationScope } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService, IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IListService, WorkbenchObjectTree } from '../../../../platform/list/browser/listService.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { defaultButtonStyles, getInputBoxStyle, getListStyles, getSelectBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { editorBackground, foreground } from '../../../../platform/theme/common/colorRegistry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { getIgnoredSettings } from '../../../../platform/userDataSync/common/settingsMerge.js';
+import { IUserDataSyncEnablementService, getDefaultIgnoredSettings } from '../../../../platform/userDataSync/common/userDataSync.js';
+import { IExtensionsWorkbenchService } from '../../extensions/common/extensions.js';
+import { settingsMoreActionIcon } from './preferencesIcons.js';
+import { SettingsTarget } from './preferencesWidgets.js';
+import { ISettingOverrideClickEvent, SettingsTreeIndicatorsLabel, getIndicatorsLabelAriaLabel } from './settingsEditorSettingIndicators.js';
+import { ITOCEntry } from './settingsLayout.js';
+import { ISettingsEditorViewState, SettingsTreeElement, SettingsTreeGroupChild, SettingsTreeGroupElement, SettingsTreeNewExtensionsElement, SettingsTreeSettingElement, inspectSetting, objectSettingSupportsRemoveDefaultValue, settingKeyToDisplayFormat } from './settingsTreeModels.js';
+import { ExcludeSettingWidget, IBoolObjectDataItem, IIncludeExcludeDataItem, IListDataItem, IObjectDataItem, IObjectEnumOption, IObjectKeySuggester, IObjectValueSuggester, IncludeSettingWidget, ListSettingWidget, ObjectSettingCheckboxWidget, ObjectSettingDropdownWidget, ObjectValue, SettingListEvent } from './settingsWidgets.js';
+import { LANGUAGE_SETTING_TAG, SETTINGS_EDITOR_COMMAND_SHOW_CONTEXT_MENU, compareTwoNullableNumbers } from '../common/preferences.js';
+import { settingsNumberInputBackground, settingsNumberInputBorder, settingsNumberInputForeground, settingsSelectBackground, settingsSelectBorder, settingsSelectForeground, settingsSelectListBorder, settingsTextInputBackground, settingsTextInputBorder, settingsTextInputForeground } from '../common/settingsEditorColorRegistry.js';
+import { APPLY_ALL_PROFILES_SETTING, IWorkbenchConfigurationService } from '../../../services/configuration/common/configuration.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { ISetting, ISettingsGroup, SETTINGS_AUTHORITY, SettingValueType } from '../../../services/preferences/common/preferences.js';
+import { getInvalidTypeError } from '../../../services/preferences/common/preferencesValidation.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { URI } from '../../../../base/common/uri.js';
 
 const $ = DOM.$;
 
-function getIncludeExcludeDisplayValue(element: SettingsTreeSettingElement): IListDataItem[] {
+function getIncludeExcludeDisplayValue(element: SettingsTreeSettingElement): IIncludeExcludeDataItem[] {
+	const elementDefaultValue: Record<string, unknown> = typeof element.defaultValue === 'object'
+		? element.defaultValue ?? {}
+		: {};
+
 	const data = element.isConfigured ?
-		{ ...element.defaultValue, ...element.scopeValue } :
-		element.defaultValue;
+		{ ...elementDefaultValue, ...element.scopeValue } :
+		elementDefaultValue;
 
 	return Object.keys(data)
 		.filter(key => !!data[key])
 		.map(key => {
+			const defaultValue = elementDefaultValue[key];
+
+			// Get source if it's a default value
+			let source: string | undefined;
+			if (defaultValue === data[key] && element.setting.type === 'object' && element.defaultValueSource instanceof Map) {
+				const defaultSource = element.defaultValueSource.get(`${element.setting.key}.${key}`);
+				source = typeof defaultSource === 'string' ? defaultSource : defaultSource?.displayName;
+			}
+
 			const value = data[key];
 			const sibling = typeof value === 'boolean' ? undefined : value.when;
 			return {
@@ -90,7 +103,8 @@ function getIncludeExcludeDisplayValue(element: SettingsTreeSettingElement): ILi
 					data: key
 				},
 				sibling,
-				elementType: element.valueType
+				elementType: element.valueType,
+				source
 			};
 		});
 }
@@ -135,6 +149,16 @@ function getObjectValueType(schema: IJSONSchema): ObjectValue['type'] {
 	}
 }
 
+function getObjectEntryValueDisplayValue(type: ObjectValue['type'], data: unknown, options: IObjectEnumOption[]): ObjectValue {
+	if (type === 'boolean') {
+		return { type, data: !!data };
+	} else if (type === 'enum') {
+		return { type, data: '' + data, options };
+	} else {
+		return { type, data: '' + data };
+	}
+}
+
 function getObjectDisplayValue(element: SettingsTreeSettingElement): IObjectDataItem[] {
 	const elementDefaultValue: Record<string, unknown> = typeof element.defaultValue === 'object'
 		? element.defaultValue ?? {}
@@ -162,22 +186,15 @@ function getObjectDisplayValue(element: SettingsTreeSettingElement): IObjectData
 
 	return Object.keys(data).map(key => {
 		const defaultValue = elementDefaultValue[key];
-		if (isDefined(objectProperties) && key in objectProperties) {
-			if (element.setting.allKeysAreBoolean) {
-				return {
-					key: {
-						type: 'string',
-						data: key
-					},
-					value: {
-						type: 'boolean',
-						data: data[key]
-					},
-					keyDescription: objectProperties[key].description,
-					removable: false
-				} as IObjectDataItem;
-			}
 
+		// Get source if it's a default value
+		let source: string | undefined;
+		if (defaultValue === data[key] && element.setting.type === 'object' && element.defaultValueSource instanceof Map) {
+			const defaultSource = element.defaultValueSource.get(`${element.setting.key}.${key}`);
+			source = typeof defaultSource === 'string' ? defaultSource : defaultSource?.displayName;
+		}
+
+		if (isDefined(objectProperties) && key in objectProperties) {
 			const valueEnumOptions = getEnumOptionsFromSchema(objectProperties[key]);
 			return {
 				key: {
@@ -185,32 +202,29 @@ function getObjectDisplayValue(element: SettingsTreeSettingElement): IObjectData
 					data: key,
 					options: wellDefinedKeyEnumOptions,
 				},
-				value: {
-					type: getObjectValueType(objectProperties[key]),
-					data: data[key],
-					options: valueEnumOptions,
-				},
+				value: getObjectEntryValueDisplayValue(getObjectValueType(objectProperties[key]), data[key], valueEnumOptions),
 				keyDescription: objectProperties[key].description,
 				removable: isUndefinedOrNull(defaultValue),
-			} as IObjectDataItem;
+				resetable: !isUndefinedOrNull(defaultValue),
+				source
+			} satisfies IObjectDataItem;
 		}
 
-		// The row is removable if it doesn't have a default value assigned.
-		// Otherwise, it is not removable, but its value can be reset to the default.
-		const removable = !defaultValue;
+		// The row is removable if it doesn't have a default value assigned or the setting supports removing the default value.
+		// If a default value is assigned and the user modified the default, it can be reset back to the default.
+		const removable = defaultValue === undefined || objectSettingSupportsRemoveDefaultValue(element.setting.key);
+		const resetable = !!defaultValue && defaultValue !== data[key];
 		const schema = patternsAndSchemas.find(({ pattern }) => pattern.test(key))?.schema;
 		if (schema) {
 			const valueEnumOptions = getEnumOptionsFromSchema(schema);
 			return {
 				key: { type: 'string', data: key },
-				value: {
-					type: getObjectValueType(schema),
-					data: data[key],
-					options: valueEnumOptions,
-				},
+				value: getObjectEntryValueDisplayValue(getObjectValueType(schema), data[key], valueEnumOptions),
 				keyDescription: schema.description,
 				removable,
-			} as IObjectDataItem;
+				resetable,
+				source
+			} satisfies IObjectDataItem;
 		}
 
 		const additionalValueEnums = getEnumOptionsFromSchema(
@@ -221,17 +235,62 @@ function getObjectDisplayValue(element: SettingsTreeSettingElement): IObjectData
 
 		return {
 			key: { type: 'string', data: key },
-			value: {
-				type: typeof objectAdditionalProperties === 'object' ? getObjectValueType(objectAdditionalProperties) : 'string',
-				data: data[key],
-				options: additionalValueEnums,
-			},
+			value: getObjectEntryValueDisplayValue(
+				typeof objectAdditionalProperties === 'object' ? getObjectValueType(objectAdditionalProperties) : 'string',
+				data[key],
+				additionalValueEnums,
+			),
 			keyDescription: typeof objectAdditionalProperties === 'object' ? objectAdditionalProperties.description : undefined,
 			removable,
-		} as IObjectDataItem;
+			resetable,
+			source
+		} satisfies IObjectDataItem;
 	}).filter(item => !isUndefinedOrNull(item.value.data));
 }
 
+function getBoolObjectDisplayValue(element: SettingsTreeSettingElement): IBoolObjectDataItem[] {
+	const elementDefaultValue: Record<string, unknown> = typeof element.defaultValue === 'object'
+		? element.defaultValue ?? {}
+		: {};
+
+	const elementScopeValue: Record<string, unknown> = typeof element.scopeValue === 'object'
+		? element.scopeValue ?? {}
+		: {};
+
+	const data = element.isConfigured ?
+		{ ...elementDefaultValue, ...elementScopeValue } :
+		elementDefaultValue;
+
+	const { objectProperties } = element.setting;
+	const displayValues: IBoolObjectDataItem[] = [];
+	for (const key in objectProperties) {
+		const defaultValue = elementDefaultValue[key];
+
+		// Get source if it's a default value
+		let source: string | undefined;
+		if (defaultValue === data[key] && element.setting.type === 'object' && element.defaultValueSource instanceof Map) {
+			const defaultSource = element.defaultValueSource.get(key);
+			source = typeof defaultSource === 'string' ? defaultSource : defaultSource?.displayName;
+		}
+
+		displayValues.push({
+			key: {
+				type: 'string',
+				data: key
+			},
+			value: {
+				type: 'boolean',
+				data: !!data[key]
+			},
+			keyDescription: objectProperties[key].description,
+			removable: false,
+			resetable: true,
+			source
+		});
+	}
+	return displayValues;
+}
+
 function createArraySuggester(element: SettingsTreeSettingElement): IObjectKeySuggester {
 	return (keys, idx) => {
 		const enumOptions: IObjectEnumOption[] = [];
@@ -608,6 +667,7 @@ interface ISettingBoolItemTemplate extends ISettingItemTemplate<boolean> {
 
 interface ISettingExtensionToggleItemTemplate extends ISettingItemTemplate<undefined> {
 	actionButton: Button;
+	dismissButton: Button;
 }
 
 interface ISettingTextItemTemplate extends ISettingItemTemplate<string> {
@@ -629,12 +689,12 @@ interface ISettingComplexItemTemplate extends ISettingItemTemplate<void> {
 }
 
 interface ISettingListItemTemplate extends ISettingItemTemplate<string[] | undefined> {
-	listWidget: ListSettingWidget;
+	listWidget: ListSettingWidget<IListDataItem>;
 	validationErrorMessageElement: HTMLElement;
 }
 
 interface ISettingIncludeExcludeItemTemplate extends ISettingItemTemplate<void> {
-	includeExcludeWidget: ListSettingWidget;
+	includeExcludeWidget: ListSettingWidget<IIncludeExcludeDataItem>;
 }
 
 interface ISettingObjectItemTemplate extends ISettingItemTemplate<Record<string, unknown> | undefined> {
@@ -719,9 +779,9 @@ export abstract class AbstractSettingRenderer extends Disposable implements ITre
 	abstract get templateId(): string;
 
 	static readonly CONTROL_CLASS = 'setting-control-focus-target';
-	static readonly CONTROL_SELECTOR = '.' + AbstractSettingRenderer.CONTROL_CLASS;
+	static readonly CONTROL_SELECTOR = '.' + this.CONTROL_CLASS;
 	static readonly CONTENTS_CLASS = 'setting-item-contents';
-	static readonly CONTENTS_SELECTOR = '.' + AbstractSettingRenderer.CONTENTS_CLASS;
+	static readonly CONTENTS_SELECTOR = '.' + this.CONTENTS_CLASS;
 	static readonly ALL_ROWS_SELECTOR = '.monaco-list-row';
 
 	static readonly SETTING_KEY_ATTR = 'data-key';
@@ -996,7 +1056,7 @@ export abstract class AbstractSettingRenderer extends Disposable implements ITre
 	}
 }
 
-export class SettingGroupRenderer implements ITreeRenderer<SettingsTreeGroupElement, never, IGroupTitleTemplate> {
+class SettingGroupRenderer implements ITreeRenderer<SettingsTreeGroupElement, never, IGroupTitleTemplate> {
 	templateId = SETTINGS_ELEMENT_TEMPLATE_ID;
 
 	renderTemplate(container: HTMLElement): IGroupTitleTemplate {
@@ -1174,7 +1234,7 @@ class SettingArrayRenderer extends AbstractSettingRenderer implements ITreeRende
 		return template;
 	}
 
-	private computeNewList(template: ISettingListItemTemplate, e: ISettingListChangeEvent<IListDataItem>): string[] | undefined {
+	private computeNewList(template: ISettingListItemTemplate, e: SettingListEvent<IListDataItem>): string[] | undefined {
 		if (template.context) {
 			let newValue: string[] = [];
 			if (Array.isArray(template.context.scopeValue)) {
@@ -1183,33 +1243,28 @@ class SettingArrayRenderer extends AbstractSettingRenderer implements ITreeRende
 				newValue = [...template.context.value];
 			}
 
-			if (e.sourceIndex !== undefined) {
+			if (e.type === 'move') {
 				// A drag and drop occurred
 				const sourceIndex = e.sourceIndex;
-				const targetIndex = e.targetIndex!;
+				const targetIndex = e.targetIndex;
 				const splicedElem = newValue.splice(sourceIndex, 1)[0];
 				newValue.splice(targetIndex, 0, splicedElem);
-			} else if (e.targetIndex !== undefined) {
-				const itemValueData = e.item?.value.data.toString() ?? '';
-				// Delete value
-				if (!e.item?.value.data && e.originalItem.value.data && e.targetIndex > -1) {
-					newValue.splice(e.targetIndex, 1);
-				}
+			} else if (e.type === 'remove' || e.type === 'reset') {
+				newValue.splice(e.targetIndex, 1);
+			} else if (e.type === 'change') {
+				const itemValueData = e.newItem.value.data.toString();
+
 				// Update value
-				else if (e.item?.value.data && e.originalItem.value.data) {
-					if (e.targetIndex > -1) {
-						newValue[e.targetIndex] = itemValueData;
-					}
-					// For some reason, we are updating and cannot find original value
-					// Just append the value in this case
-					else {
-						newValue.push(itemValueData);
-					}
+				if (e.targetIndex > -1) {
+					newValue[e.targetIndex] = itemValueData;
 				}
-				// Add value
-				else if (e.item?.value.data && !e.originalItem.value.data && e.targetIndex >= newValue.length) {
+				// For some reason, we are updating and cannot find original value
+				// Just append the value in this case
+				else {
 					newValue.push(itemValueData);
 				}
+			} else if (e.type === 'add') {
+				newValue.push(e.newItem.value.data.toString());
 			}
 
 			if (
@@ -1280,80 +1335,9 @@ abstract class AbstractSettingObjectRenderer extends AbstractSettingRenderer imp
 		}
 
 		this.addSettingElementFocusHandler(template);
-
-		common.toDispose.add(widget.onDidChangeList(e => {
-			this.onDidChangeObject(template, e);
-		}));
-
 		return template;
 	}
 
-	protected onDidChangeObject(template: ISettingObjectItemTemplate, e: ISettingListChangeEvent<IObjectDataItem>): void {
-		const widget = (template.objectCheckboxWidget ?? template.objectDropdownWidget)!;
-		if (template.context) {
-			const defaultValue: Record<string, unknown> = typeof template.context.defaultValue === 'object'
-				? template.context.defaultValue ?? {}
-				: {};
-
-			const scopeValue: Record<string, unknown> = typeof template.context.scopeValue === 'object'
-				? template.context.scopeValue ?? {}
-				: {};
-
-			const newValue: Record<string, unknown> = {};
-			const newItems: IObjectDataItem[] = [];
-
-			widget.items.forEach((item, idx) => {
-				// Item was updated
-				if (isDefined(e.item) && e.targetIndex === idx) {
-					newValue[e.item.key.data] = e.item.value.data;
-					newItems.push(e.item);
-				}
-				// All remaining items, but skip the one that we just updated
-				else if (isUndefinedOrNull(e.item) || e.item.key.data !== item.key.data) {
-					newValue[item.key.data] = item.value.data;
-					newItems.push(item);
-				}
-			});
-
-			// Item was deleted
-			if (isUndefinedOrNull(e.item)) {
-				delete newValue[e.originalItem.key.data];
-
-				const itemToDelete = newItems.findIndex(item => item.key.data === e.originalItem.key.data);
-				const defaultItemValue = defaultValue[e.originalItem.key.data] as string | boolean;
-
-				// Item does not have a default
-				if (isUndefinedOrNull(defaultValue[e.originalItem.key.data]) && itemToDelete > -1) {
-					newItems.splice(itemToDelete, 1);
-				} else if (itemToDelete > -1) {
-					newItems[itemToDelete].value.data = defaultItemValue;
-				}
-			}
-			// New item was added
-			else if (widget.isItemNew(e.originalItem) && e.item.key.data !== '') {
-				newValue[e.item.key.data] = e.item.value.data;
-				newItems.push(e.item);
-			}
-
-			Object.entries(newValue).forEach(([key, value]) => {
-				// value from the scope has changed back to the default
-				if (scopeValue[key] !== value && defaultValue[key] === value) {
-					delete newValue[key];
-				}
-			});
-
-			const newObject = Object.keys(newValue).length === 0 ? undefined : newValue;
-
-			if (template.objectCheckboxWidget) {
-				template.objectCheckboxWidget.setValue(newItems);
-			} else {
-				template.objectDropdownWidget!.setValue(newItems);
-			}
-
-			template.onChange?.(newObject);
-		}
-	}
-
 	renderElement(element: ITreeNode<SettingsTreeSettingElement, never>, index: number, templateData: ISettingObjectItemTemplate): void {
 		super.renderSettingElement(element, index, templateData);
 	}
@@ -1365,7 +1349,84 @@ class SettingObjectRenderer extends AbstractSettingObjectRenderer implements ITr
 	renderTemplate(container: HTMLElement): ISettingObjectItemTemplate {
 		const common = this.renderCommonTemplate(null, container, 'list');
 		const widget = this._instantiationService.createInstance(ObjectSettingDropdownWidget, common.controlElement);
-		return this.renderTemplateWithWidget(common, widget);
+		const template = this.renderTemplateWithWidget(common, widget);
+		common.toDispose.add(widget.onDidChangeList(e => {
+			this.onDidChangeObject(template, e);
+		}));
+		return template;
+	}
+
+	private onDidChangeObject(template: ISettingObjectItemTemplate, e: SettingListEvent<IObjectDataItem>): void {
+		const widget = template.objectDropdownWidget!;
+		if (template.context) {
+			const settingSupportsRemoveDefault = objectSettingSupportsRemoveDefaultValue(template.context.setting.key);
+			const defaultValue: Record<string, unknown> = typeof template.context.defaultValue === 'object'
+				? template.context.defaultValue ?? {}
+				: {};
+
+			const scopeValue: Record<string, unknown> = typeof template.context.scopeValue === 'object'
+				? template.context.scopeValue ?? {}
+				: {};
+
+			const newValue: Record<string, unknown> = { ...template.context.scopeValue }; // Initialize with scoped values as removed default values are not rendered
+			const newItems: IObjectDataItem[] = [];
+
+			widget.items.forEach((item, idx) => {
+				// Item was updated
+				if ((e.type === 'change' || e.type === 'move') && e.targetIndex === idx) {
+					// If the key of the default value is changed, remove the default value
+					if (e.originalItem.key.data !== e.newItem.key.data && settingSupportsRemoveDefault && e.originalItem.key.data in defaultValue) {
+						newValue[e.originalItem.key.data] = null;
+					} else {
+						delete newValue[e.originalItem.key.data];
+					}
+					newValue[e.newItem.key.data] = e.newItem.value.data;
+					newItems.push(e.newItem);
+				}
+				// All remaining items, but skip the one that we just updated
+				else if ((e.type !== 'change' && e.type !== 'move') || e.newItem.key.data !== item.key.data) {
+					newValue[item.key.data] = item.value.data;
+					newItems.push(item);
+				}
+			});
+
+			// Item was deleted
+			if (e.type === 'remove' || e.type === 'reset') {
+				const objectKey = e.originalItem.key.data;
+				const removingDefaultValue = e.type === 'remove' && settingSupportsRemoveDefault && defaultValue[objectKey] === e.originalItem.value.data;
+				if (removingDefaultValue) {
+					newValue[objectKey] = null;
+				} else {
+					delete newValue[objectKey];
+				}
+
+				const itemToDelete = newItems.findIndex(item => item.key.data === objectKey);
+				const defaultItemValue = defaultValue[objectKey] as string | boolean;
+
+				// Item does not have a default or default is bing removed
+				if (removingDefaultValue || isUndefinedOrNull(defaultValue[objectKey]) && itemToDelete > -1) {
+					newItems.splice(itemToDelete, 1);
+				} else if (!removingDefaultValue && itemToDelete > -1) {
+					newItems[itemToDelete].value.data = defaultItemValue;
+				}
+			}
+			// New item was added
+			else if (e.type === 'add') {
+				newValue[e.newItem.key.data] = e.newItem.value.data;
+				newItems.push(e.newItem);
+			}
+
+			Object.entries(newValue).forEach(([key, value]) => {
+				// value from the scope has changed back to the default
+				if (scopeValue[key] !== value && defaultValue[key] === value && !(settingSupportsRemoveDefault && value === null)) {
+					delete newValue[key];
+				}
+			});
+
+			const newObject = Object.keys(newValue).length === 0 ? undefined : newValue;
+			template.objectDropdownWidget!.setValue(newItems);
+			template.onChange?.(newObject);
+		}
 	}
 
 	protected renderValue(dataElement: SettingsTreeSettingElement, template: ISettingObjectItemTemplate, onChange: (value: Record<string, unknown> | undefined) => void): void {
@@ -1410,12 +1471,55 @@ class SettingBoolObjectRenderer extends AbstractSettingObjectRenderer implements
 	renderTemplate(container: HTMLElement): ISettingObjectItemTemplate {
 		const common = this.renderCommonTemplate(null, container, 'list');
 		const widget = this._instantiationService.createInstance(ObjectSettingCheckboxWidget, common.controlElement);
-		return this.renderTemplateWithWidget(common, widget);
+		const template = this.renderTemplateWithWidget(common, widget);
+		common.toDispose.add(widget.onDidChangeList(e => {
+			this.onDidChangeObject(template, e);
+		}));
+		return template;
 	}
 
-	protected override onDidChangeObject(template: ISettingObjectItemTemplate, e: ISettingListChangeEvent<IObjectDataItem>): void {
+	protected onDidChangeObject(template: ISettingObjectItemTemplate, e: SettingListEvent<IBoolObjectDataItem>): void {
 		if (template.context) {
-			super.onDidChangeObject(template, e);
+			const widget = template.objectCheckboxWidget!;
+			const defaultValue: Record<string, unknown> = typeof template.context.defaultValue === 'object'
+				? template.context.defaultValue ?? {}
+				: {};
+
+			const scopeValue: Record<string, unknown> = typeof template.context.scopeValue === 'object'
+				? template.context.scopeValue ?? {}
+				: {};
+
+			const newValue: Record<string, unknown> = { ...template.context.scopeValue }; // Initialize with scoped values as removed default values are not rendered
+			const newItems: IBoolObjectDataItem[] = [];
+
+			if (e.type !== 'change') {
+				console.warn('Unexpected event type', e.type, 'for bool object setting', template.context.setting.key);
+				return;
+			}
+
+			widget.items.forEach((item, idx) => {
+				// Item was updated
+				if (e.targetIndex === idx) {
+					newValue[e.newItem.key.data] = e.newItem.value.data;
+					newItems.push(e.newItem);
+				}
+				// All remaining items, but skip the one that we just updated
+				else if (e.newItem.key.data !== item.key.data) {
+					newValue[item.key.data] = item.value.data;
+					newItems.push(item);
+				}
+			});
+
+			Object.entries(newValue).forEach(([key, value]) => {
+				// value from the scope has changed back to the default
+				if (scopeValue[key] !== value && defaultValue[key] === value) {
+					delete newValue[key];
+				}
+			});
+
+			const newObject = Object.keys(newValue).length === 0 ? undefined : newValue;
+			template.objectCheckboxWidget!.setValue(newItems);
+			template.onChange?.(newObject);
 
 			// Focus this setting explicitly, in case we were previously
 			// focused on another setting and clicked a checkbox/value container
@@ -1425,7 +1529,7 @@ class SettingBoolObjectRenderer extends AbstractSettingObjectRenderer implements
 	}
 
 	protected renderValue(dataElement: SettingsTreeSettingElement, template: ISettingObjectItemTemplate, onChange: (value: Record<string, unknown> | undefined) => void): void {
-		const items = getObjectDisplayValue(dataElement);
+		const items = getBoolObjectDisplayValue(dataElement);
 		const { key } = dataElement.setting;
 
 		template.objectCheckboxWidget!.setValue(items, {
@@ -1462,25 +1566,27 @@ abstract class SettingIncludeExcludeRenderer extends AbstractSettingRenderer imp
 		return template;
 	}
 
-	private onDidChangeIncludeExclude(template: ISettingIncludeExcludeItemTemplate, e: ISettingListChangeEvent<IListDataItem>): void {
+	private onDidChangeIncludeExclude(template: ISettingIncludeExcludeItemTemplate, e: SettingListEvent<IListDataItem>): void {
 		if (template.context) {
 			const newValue = { ...template.context.scopeValue };
 
 			// first delete the existing entry, if present
-			if (e.originalItem.value.data.toString() in template.context.defaultValue) {
-				// delete a default by overriding it
-				newValue[e.originalItem.value.data.toString()] = false;
-			} else {
-				delete newValue[e.originalItem.value.data.toString()];
+			if (e.type !== 'add') {
+				if (e.originalItem.value.data.toString() in template.context.defaultValue) {
+					// delete a default by overriding it
+					newValue[e.originalItem.value.data.toString()] = false;
+				} else {
+					delete newValue[e.originalItem.value.data.toString()];
+				}
 			}
 
 			// then add the new or updated entry, if present
-			if (e.item?.value) {
-				if (e.item.value.data.toString() in template.context.defaultValue && !e.item.sibling) {
+			if (e.type === 'change' || e.type === 'add' || e.type === 'move') {
+				if (e.newItem.value.data.toString() in template.context.defaultValue && !e.newItem.sibling) {
 					// add a default by deleting its override
-					delete newValue[e.item.value.data.toString()];
+					delete newValue[e.newItem.value.data.toString()];
 				} else {
-					newValue[e.item.value.data.toString()] = e.item.sibling ? { when: e.item.sibling } : true;
+					newValue[e.newItem.value.data.toString()] = e.newItem.sibling ? { when: e.newItem.sibling } : true;
 				}
 			}
 
@@ -1519,7 +1625,7 @@ abstract class SettingIncludeExcludeRenderer extends AbstractSettingRenderer imp
 	}
 }
 
-export class SettingExcludeRenderer extends SettingIncludeExcludeRenderer {
+class SettingExcludeRenderer extends SettingIncludeExcludeRenderer {
 	templateId = SETTINGS_EXCLUDE_TEMPLATE_ID;
 
 	protected override isExclude(): boolean {
@@ -1527,7 +1633,7 @@ export class SettingExcludeRenderer extends SettingIncludeExcludeRenderer {
 	}
 }
 
-export class SettingIncludeRenderer extends SettingIncludeExcludeRenderer {
+class SettingIncludeRenderer extends SettingIncludeExcludeRenderer {
 	templateId = SETTINGS_INCLUDE_TEMPLATE_ID;
 
 	protected override isExclude(): boolean {
@@ -1642,7 +1748,7 @@ class SettingMultilineTextRenderer extends AbstractSettingTextRenderer implement
 	}
 }
 
-export class SettingEnumRenderer extends AbstractSettingRenderer implements ITreeRenderer<SettingsTreeSettingElement, never, ISettingEnumItemTemplate> {
+class SettingEnumRenderer extends AbstractSettingRenderer implements ITreeRenderer<SettingsTreeSettingElement, never, ISettingEnumItemTemplate> {
 	templateId = SETTINGS_ENUM_TEMPLATE_ID;
 
 	renderTemplate(container: HTMLElement): ISettingEnumItemTemplate {
@@ -1698,7 +1804,7 @@ export class SettingEnumRenderer extends AbstractSettingRenderer implements ITre
 		const enumDescriptionsAreMarkdown = dataElement.setting.enumDescriptionsAreMarkdown;
 
 		const disposables = new DisposableStore();
-		template.toDispose.add(disposables);
+		template.elementDisposables.add(disposables);
 
 		let createdDefault = false;
 		if (!settingEnum.includes(dataElement.defaultValue)) {
@@ -1759,7 +1865,7 @@ const settingsNumberInputBoxStyles = getInputBoxStyle({
 	inputBorder: settingsNumberInputBorder
 });
 
-export class SettingNumberRenderer extends AbstractSettingRenderer implements ITreeRenderer<SettingsTreeSettingElement, never, ISettingNumberItemTemplate> {
+class SettingNumberRenderer extends AbstractSettingRenderer implements ITreeRenderer<SettingsTreeSettingElement, never, ISettingNumberItemTemplate> {
 	templateId = SETTINGS_NUMBER_TEMPLATE_ID;
 
 	renderTemplate(_container: HTMLElement): ISettingNumberItemTemplate {
@@ -1813,7 +1919,7 @@ export class SettingNumberRenderer extends AbstractSettingRenderer implements IT
 	}
 }
 
-export class SettingBoolRenderer extends AbstractSettingRenderer implements ITreeRenderer<SettingsTreeSettingElement, never, ISettingBoolItemTemplate> {
+class SettingBoolRenderer extends AbstractSettingRenderer implements ITreeRenderer<SettingsTreeSettingElement, never, ISettingBoolItemTemplate> {
 	templateId = SETTINGS_BOOL_TEMPLATE_ID;
 
 	renderTemplate(_container: HTMLElement): ISettingBoolItemTemplate {
@@ -1905,12 +2011,15 @@ export class SettingBoolRenderer extends AbstractSettingRenderer implements ITre
 type ManageExtensionClickTelemetryClassification = {
 	extensionId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The extension the user went to manage.' };
 	owner: 'rzhao271';
-	comment: 'Event used to gain insights into when users are using an experimental extension management setting';
+	comment: 'Event used to gain insights into when users interact with an extension management setting';
 };
 
-export class SettingsExtensionToggleRenderer extends AbstractSettingRenderer implements ITreeRenderer<SettingsTreeSettingElement, never, ISettingExtensionToggleItemTemplate> {
+class SettingsExtensionToggleRenderer extends AbstractSettingRenderer implements ITreeRenderer<SettingsTreeSettingElement, never, ISettingExtensionToggleItemTemplate> {
 	templateId = SETTINGS_EXTENSION_TOGGLE_TEMPLATE_ID;
 
+	private readonly _onDidDismissExtensionSetting = this._register(new Emitter<string>());
+	readonly onDidDismissExtensionSetting = this._onDidDismissExtensionSetting.event;
+
 	renderTemplate(_container: HTMLElement): ISettingExtensionToggleItemTemplate {
 		const common = super.renderCommonTemplate(null, _container, 'extension-toggle');
 
@@ -1921,9 +2030,18 @@ export class SettingsExtensionToggleRenderer extends AbstractSettingRenderer imp
 		actionButton.element.classList.add('setting-item-extension-toggle-button');
 		actionButton.label = localize('showExtension', "Show Extension");
 
+		const dismissButton = new Button(common.containerElement, {
+			title: false,
+			secondary: true,
+			...defaultButtonStyles
+		});
+		dismissButton.element.classList.add('setting-item-extension-dismiss-button');
+		dismissButton.label = localize('dismiss', "Dismiss");
+
 		const template: ISettingExtensionToggleItemTemplate = {
 			...common,
-			actionButton
+			actionButton,
+			dismissButton
 		};
 
 		this.addSettingElementFocusHandler(template);
@@ -1943,15 +2061,22 @@ export class SettingsExtensionToggleRenderer extends AbstractSettingRenderer imp
 			this._telemetryService.publicLog2<{ extensionId: String }, ManageExtensionClickTelemetryClassification>('ManageExtensionClick', { extensionId });
 			this._commandService.executeCommand('extension.open', extensionId);
 		}));
+
+		template.elementDisposables.add(template.dismissButton.onDidClick(async () => {
+			this._telemetryService.publicLog2<{ extensionId: String }, ManageExtensionClickTelemetryClassification>('DismissExtensionClick', { extensionId });
+			this._onDidDismissExtensionSetting.fire(extensionId);
+		}));
 	}
 }
 
-export class SettingTreeRenderers {
+export class SettingTreeRenderers extends Disposable {
 	readonly onDidClickOverrideElement: Event<ISettingOverrideClickEvent>;
 
-	private readonly _onDidChangeSetting = new Emitter<ISettingChangeEvent>();
+	private readonly _onDidChangeSetting = this._register(new Emitter<ISettingChangeEvent>());
 	readonly onDidChangeSetting: Event<ISettingChangeEvent>;
 
+	readonly onDidDismissExtensionSetting: Event<string>;
+
 	readonly onDidOpenSettings: Event<string>;
 
 	readonly onDidClickSettingLink: Event<ISettingLinkClickEvent>;
@@ -1973,6 +2098,7 @@ export class SettingTreeRenderers {
 		@IUserDataProfilesService private readonly _userDataProfilesService: IUserDataProfilesService,
 		@IUserDataSyncEnablementService private readonly _userDataSyncEnablementService: IUserDataSyncEnablementService,
 	) {
+		super();
 		this.settingActions = [
 			new Action('settings.resetSetting', localize('resetSettingLabel', "Reset Setting"), undefined, undefined, async context => {
 				if (context instanceof SettingsTreeSettingElement) {
@@ -1990,10 +2116,12 @@ export class SettingTreeRenderers {
 			new Separator(),
 			this._instantiationService.createInstance(CopySettingIdAction),
 			this._instantiationService.createInstance(CopySettingAsJSONAction),
+			this._instantiationService.createInstance(CopySettingAsURLAction),
 		];
 
 		const actionFactory = (setting: ISetting, settingTarget: SettingsTarget) => this.getActionsForSetting(setting, settingTarget);
 		const emptyActionFactory = (_: ISetting) => [];
+		const extensionRenderer = this._instantiationService.createInstance(SettingsExtensionToggleRenderer, [], emptyActionFactory);
 		const settingRenderers = [
 			this._instantiationService.createInstance(SettingBoolRenderer, this.settingActions, actionFactory),
 			this._instantiationService.createInstance(SettingNumberRenderer, this.settingActions, actionFactory),
@@ -2006,7 +2134,7 @@ export class SettingTreeRenderers {
 			this._instantiationService.createInstance(SettingEnumRenderer, this.settingActions, actionFactory),
 			this._instantiationService.createInstance(SettingObjectRenderer, this.settingActions, actionFactory),
 			this._instantiationService.createInstance(SettingBoolObjectRenderer, this.settingActions, actionFactory),
-			this._instantiationService.createInstance(SettingsExtensionToggleRenderer, [], emptyActionFactory)
+			extensionRenderer
 		];
 
 		this.onDidClickOverrideElement = Event.any(...settingRenderers.map(r => r.onDidClickOverrideElement));
@@ -2014,6 +2142,7 @@ export class SettingTreeRenderers {
 			...settingRenderers.map(r => r.onDidChangeSetting),
 			this._onDidChangeSetting.event
 		);
+		this.onDidDismissExtensionSetting = extensionRenderer.onDidDismissExtensionSetting;
 		this.onDidOpenSettings = Event.any(...settingRenderers.map(r => r.onDidOpenSettings));
 		this.onDidClickSettingLink = Event.any(...settingRenderers.map(r => r.onDidClickSettingLink));
 		this.onDidFocusSetting = Event.any(...settingRenderers.map(r => r.onDidFocusSetting));
@@ -2078,6 +2207,20 @@ export class SettingTreeRenderers {
 		const settingElement = this.getSettingDOMElementForDOMElement(element);
 		return settingElement && settingElement.getAttribute(AbstractSettingRenderer.SETTING_ID_ATTR);
 	}
+
+	override dispose(): void {
+		super.dispose();
+		this.settingActions.forEach(action => {
+			if (isDisposable(action)) {
+				action.dispose();
+			}
+		});
+		this.allRenderers.forEach(renderer => {
+			if (isDisposable(renderer)) {
+				renderer.dispose();
+			}
+		});
+	}
 }
 
 /**
@@ -2415,8 +2558,8 @@ export class SettingsTree extends WorkbenchObjectTree<SettingsTreeElement> {
 		}));
 	}
 
-	protected override createModel(user: string, view: IList<ITreeNode<SettingsTreeGroupChild>>, options: IObjectTreeOptions<SettingsTreeGroupChild>): ITreeModel<SettingsTreeGroupChild | null, void, SettingsTreeGroupChild | null> {
-		return new NonCollapsibleObjectTreeModel<SettingsTreeGroupChild>(user, view, options);
+	protected override createModel(user: string, options: IObjectTreeOptions<SettingsTreeGroupChild>): ITreeModel<SettingsTreeGroupChild | null, void, SettingsTreeGroupChild | null> {
+		return new NonCollapsibleObjectTreeModel<SettingsTreeGroupChild>(user, options);
 	}
 }
 
@@ -2459,6 +2602,29 @@ class CopySettingAsJSONAction extends Action {
 	}
 }
 
+class CopySettingAsURLAction extends Action {
+	static readonly ID = 'settings.copySettingAsURL';
+	static readonly LABEL = localize('copySettingAsURLLabel', "Copy Setting as URL");
+
+	constructor(
+		@IClipboardService private readonly clipboardService: IClipboardService,
+		@IProductService private readonly productService: IProductService,
+	) {
+		super(CopySettingAsURLAction.ID, CopySettingAsURLAction.LABEL);
+	}
+
+	override async run(context: SettingsTreeSettingElement): Promise<void> {
+		if (context) {
+			const settingKey = context.setting.key;
+			const product = this.productService.urlProtocol;
+			const uri = URI.from({ scheme: product, authority: SETTINGS_AUTHORITY, path: `/${settingKey}` }, true);
+			await this.clipboardService.writeText(uri.toString());
+		}
+
+		return Promise.resolve(undefined);
+	}
+}
+
 class SyncSettingAction extends Action {
 	static readonly ID = 'settings.stopSyncingSetting';
 	static readonly LABEL = localize('stopSyncingSetting', "Sync This Setting");
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts b/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts
index e30c3bb549a..b201be134bf 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as arrays from 'vs/base/common/arrays';
-import { escapeRegExpCharacters, isFalsyOrWhitespace } from 'vs/base/common/strings';
-import { isUndefinedOrNull } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { ConfigurationTarget, IConfigurationValue } from 'vs/platform/configuration/common/configuration';
-import { SettingsTarget } from 'vs/workbench/contrib/preferences/browser/preferencesWidgets';
-import { ITOCEntry, knownAcronyms, knownTermMappings, tocData } from 'vs/workbench/contrib/preferences/browser/settingsLayout';
-import { ENABLE_EXTENSION_TOGGLE_SETTINGS, ENABLE_LANGUAGE_FILTER, MODIFIED_SETTING_TAG, POLICY_SETTING_TAG, REQUIRE_TRUSTED_WORKSPACE_SETTING_TAG, compareTwoNullableNumbers } from 'vs/workbench/contrib/preferences/common/preferences';
-import { IExtensionSetting, ISearchResult, ISetting, ISettingMatch, SettingMatchType, SettingValueType } from 'vs/workbench/services/preferences/common/preferences';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { FOLDER_SCOPES, WORKSPACE_SCOPES, REMOTE_MACHINE_SCOPES, LOCAL_MACHINE_SCOPES, IWorkbenchConfigurationService, APPLICATION_SCOPES } from 'vs/workbench/services/configuration/common/configuration';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Emitter } from 'vs/base/common/event';
-import { ConfigurationScope, EditPresentationTypes, Extensions, IConfigurationRegistry, IExtensionInfo } from 'vs/platform/configuration/common/configurationRegistry';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { IProductService } from 'vs/platform/product/common/productService';
+import * as arrays from '../../../../base/common/arrays.js';
+import { escapeRegExpCharacters, isFalsyOrWhitespace } from '../../../../base/common/strings.js';
+import { isUndefinedOrNull } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ConfigurationTarget, IConfigurationValue } from '../../../../platform/configuration/common/configuration.js';
+import { SettingsTarget } from './preferencesWidgets.js';
+import { ITOCEntry, knownAcronyms, knownTermMappings, tocData } from './settingsLayout.js';
+import { ENABLE_EXTENSION_TOGGLE_SETTINGS, ENABLE_LANGUAGE_FILTER, MODIFIED_SETTING_TAG, POLICY_SETTING_TAG, REQUIRE_TRUSTED_WORKSPACE_SETTING_TAG, compareTwoNullableNumbers } from '../common/preferences.js';
+import { IExtensionSetting, ISearchResult, ISetting, ISettingMatch, SettingMatchType, SettingValueType } from '../../../services/preferences/common/preferences.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { FOLDER_SCOPES, WORKSPACE_SCOPES, REMOTE_MACHINE_SCOPES, LOCAL_MACHINE_SCOPES, IWorkbenchConfigurationService, APPLICATION_SCOPES } from '../../../services/configuration/common/configuration.js';
+import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { ConfigurationDefaultValueSource, ConfigurationScope, EditPresentationTypes, Extensions, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IUserDataProfileService } from '../../../services/userDataProfile/common/userDataProfile.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
 
 export const ONLINE_SERVICES_SETTING_TAG = 'usesOnlineServices';
 
@@ -135,7 +135,7 @@ export class SettingsTreeSettingElement extends SettingsTreeElement {
 	 * The source of the default value to display.
 	 * This value also accounts for extension-contributed language-specific default value overrides.
 	 */
-	defaultValueSource: string | IExtensionInfo | undefined;
+	defaultValueSource: ConfigurationDefaultValueSource | undefined;
 
 	/**
 	 * Whether the setting is configured in the selected scope.
@@ -203,7 +203,7 @@ export class SettingsTreeSettingElement extends SettingsTreeElement {
 	private initLabels(): void {
 		if (this.setting.title) {
 			this._displayLabel = this.setting.title;
-			this._displayCategory = '';
+			this._displayCategory = this.setting.categoryLabel ?? null;
 			return;
 		}
 		const displayKeyFormat = settingKeyToDisplayFormat(this.setting.key, this.parent!.id, this.setting.isLanguageTagSetting);
@@ -351,7 +351,8 @@ export class SettingsTreeSettingElement extends SettingsTreeElement {
 			this.defaultValue = overrideValues.defaultValue ?? inspected.defaultValue;
 
 			const registryValues = Registry.as<IConfigurationRegistry>(Extensions.Configuration).getConfigurationDefaultsOverrides();
-			const overrideValueSource = registryValues.get(`[${languageSelector}]`)?.valuesSources?.get(this.setting.key);
+			const source = registryValues.get(`[${languageSelector}]`)?.source;
+			const overrideValueSource = source instanceof Map ? source.get(this.setting.key) : undefined;
 			if (overrideValueSource) {
 				this.defaultValueSource = overrideValueSource;
 			}
@@ -792,11 +793,25 @@ function isIncludeSetting(setting: ISetting): boolean {
 	return setting.key === 'files.readonlyInclude';
 }
 
-function isObjectRenderableSchema({ type }: IJSONSchema): boolean {
-	return type === 'string' || type === 'boolean' || type === 'integer' || type === 'number';
+// The values of the following settings when a default values has been removed
+export function objectSettingSupportsRemoveDefaultValue(key: string): boolean {
+	return key === 'workbench.editor.customLabels.patterns';
+}
+
+function isObjectRenderableSchema({ type }: IJSONSchema, key: string): boolean {
+	if (type === 'string' || type === 'boolean' || type === 'integer' || type === 'number') {
+		return true;
+	}
+
+	if (objectSettingSupportsRemoveDefaultValue(key) && Array.isArray(type) && type.length === 2) {
+		return type.includes('null') && (type.includes('string') || type.includes('boolean') || type.includes('integer') || type.includes('number'));
+	}
+
+	return false;
 }
 
 function isObjectSetting({
+	key,
 	type,
 	objectProperties,
 	objectPatternProperties,
@@ -838,7 +853,7 @@ function isObjectSetting({
 		return [schema];
 	}).flat();
 
-	return flatSchemas.every(isObjectRenderableSchema);
+	return flatSchemas.every((schema) => isObjectRenderableSchema(schema, key));
 }
 
 function settingTypeEnumRenderable(_type: string | string[]) {
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsWidgets.ts b/src/vs/workbench/contrib/preferences/browser/settingsWidgets.ts
index 5021036167b..14a0dec4a1e 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsWidgets.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsWidgets.ts
@@ -3,32 +3,35 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BrowserFeatures } from 'vs/base/browser/canIUse';
-import * as DOM from 'vs/base/browser/dom';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { Button } from 'vs/base/browser/ui/button/button';
-import { Toggle, unthemedToggleStyles } from 'vs/base/browser/ui/toggle/toggle';
-import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox';
-import { SelectBox } from 'vs/base/browser/ui/selectBox/selectBox';
-import { IAction } from 'vs/base/common/actions';
-import { disposableTimeout } from 'vs/base/common/async';
-import { Codicon } from 'vs/base/common/codicons';
-import { Emitter, Event } from 'vs/base/common/event';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { isIOS } from 'vs/base/common/platform';
-import { isDefined, isUndefinedOrNull } from 'vs/base/common/types';
-import 'vs/css!./media/settingsWidgets';
-import { localize } from 'vs/nls';
-import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { settingsDiscardIcon, settingsEditIcon, settingsRemoveIcon } from 'vs/workbench/contrib/preferences/browser/preferencesIcons';
-import { settingsSelectBackground, settingsSelectBorder, settingsSelectForeground, settingsSelectListBorder, settingsTextInputBackground, settingsTextInputBorder, settingsTextInputForeground } from 'vs/workbench/contrib/preferences/common/settingsEditorColorRegistry';
-import { defaultButtonStyles, getInputBoxStyle, getSelectBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import { BrowserFeatures } from '../../../../base/browser/canIUse.js';
+import * as DOM from '../../../../base/browser/dom.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { Button } from '../../../../base/browser/ui/button/button.js';
+import { Toggle, unthemedToggleStyles } from '../../../../base/browser/ui/toggle/toggle.js';
+import { InputBox } from '../../../../base/browser/ui/inputbox/inputBox.js';
+import { SelectBox } from '../../../../base/browser/ui/selectBox/selectBox.js';
+import { IAction } from '../../../../base/common/actions.js';
+import { disposableTimeout } from '../../../../base/common/async.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { isIOS } from '../../../../base/common/platform.js';
+import { isDefined, isUndefinedOrNull } from '../../../../base/common/types.js';
+import './media/settingsWidgets.css';
+import { localize } from '../../../../nls.js';
+import { IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { settingsDiscardIcon, settingsEditIcon, settingsRemoveIcon } from './preferencesIcons.js';
+import { settingsSelectBackground, settingsSelectBorder, settingsSelectForeground, settingsSelectListBorder, settingsTextInputBackground, settingsTextInputBorder, settingsTextInputForeground } from '../common/settingsEditorColorRegistry.js';
+import { defaultButtonStyles, getInputBoxStyle, getSelectBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { IManagedHoverTooltipMarkdownString } from '../../../../base/browser/ui/hover/hover.js';
+import { SettingValueType } from '../../../services/preferences/common/preferences.js';
 
 const $ = DOM.$;
 
@@ -110,21 +113,49 @@ export class ListSettingListModel<TDataItem extends object> {
 }
 
 export interface ISettingListChangeEvent<TDataItem extends object> {
+	type: 'change';
 	originalItem: TDataItem;
-	item?: TDataItem;
-	targetIndex?: number;
-	sourceIndex?: number;
+	newItem: TDataItem;
+	targetIndex: number;
 }
 
+export interface ISettingListAddEvent<TDataItem extends object> {
+	type: 'add';
+	newItem: TDataItem;
+	targetIndex: number;
+}
+
+export interface ISettingListMoveEvent<TDataItem extends object> {
+	type: 'move';
+	originalItem: TDataItem;
+	newItem: TDataItem;
+	targetIndex: number;
+	sourceIndex: number;
+}
+
+export interface ISettingListRemoveEvent<TDataItem extends object> {
+	type: 'remove';
+	originalItem: TDataItem;
+	targetIndex: number;
+}
+
+export interface ISettingListResetEvent<TDataItem extends object> {
+	type: 'reset';
+	originalItem: TDataItem;
+	targetIndex: number;
+}
+
+export type SettingListEvent<TDataItem extends object> = ISettingListChangeEvent<TDataItem> | ISettingListAddEvent<TDataItem> | ISettingListMoveEvent<TDataItem> | ISettingListRemoveEvent<TDataItem> | ISettingListResetEvent<TDataItem>;
+
 export abstract class AbstractListSettingWidget<TDataItem extends object> extends Disposable {
 	private listElement: HTMLElement;
 	private rowElements: HTMLElement[] = [];
 
-	protected readonly _onDidChangeList = this._register(new Emitter<ISettingListChangeEvent<TDataItem>>());
+	protected readonly _onDidChangeList = this._register(new Emitter<SettingListEvent<TDataItem>>());
 	protected readonly model = new ListSettingListModel<TDataItem>(this.getEmptyItem());
 	protected readonly listDisposables = this._register(new DisposableStore());
 
-	readonly onDidChangeList: Event<ISettingListChangeEvent<TDataItem>> = this._onDidChangeList.event;
+	readonly onDidChangeList: Event<SettingListEvent<TDataItem>> = this._onDidChangeList.event;
 
 	get domNode(): HTMLElement {
 		return this.listElement;
@@ -217,6 +248,7 @@ export abstract class AbstractListSettingWidget<TDataItem extends object> extend
 
 		this.rowElements = this.model.items.map((item, i) => this.renderDataOrEditItem(item, i, focused));
 		this.rowElements.forEach(rowElement => this.listElement.appendChild(rowElement));
+
 	}
 
 	protected createBasicSelectBox(value: IObjectEnumData): SelectBox {
@@ -250,11 +282,20 @@ export abstract class AbstractListSettingWidget<TDataItem extends object> extend
 	protected handleItemChange(originalItem: TDataItem, changedItem: TDataItem, idx: number) {
 		this.model.setEditKey('none');
 
-		this._onDidChangeList.fire({
-			originalItem,
-			item: changedItem,
-			targetIndex: idx,
-		});
+		if (this.isItemNew(originalItem)) {
+			this._onDidChangeList.fire({
+				type: 'add',
+				newItem: changedItem,
+				targetIndex: idx,
+			});
+		} else {
+			this._onDidChangeList.fire({
+				type: 'change',
+				originalItem,
+				newItem: changedItem,
+				targetIndex: idx,
+			});
+		}
 
 		this.renderList();
 	}
@@ -396,17 +437,17 @@ export interface IListDataItem {
 	sibling?: string;
 }
 
-interface ListSettingWidgetDragDetails {
+interface ListSettingWidgetDragDetails<TListDataItem extends IListDataItem> {
 	element: HTMLElement;
-	item: IListDataItem;
+	item: TListDataItem;
 	itemIndex: number;
 }
 
-export class ListSettingWidget extends AbstractListSettingWidget<IListDataItem> {
+export class ListSettingWidget<TListDataItem extends IListDataItem> extends AbstractListSettingWidget<TListDataItem> {
 	private keyValueSuggester: IObjectKeySuggester | undefined;
 	private showAddButton: boolean = true;
 
-	override setValue(listData: IListDataItem[], options?: IListSetValueOptions) {
+	override setValue(listData: TListDataItem[], options?: IListSetValueOptions) {
 		this.keyValueSuggester = options?.keySuggester;
 		this.showAddButton = options?.showAddButton ?? true;
 		super.setValue(listData);
@@ -421,13 +462,13 @@ export class ListSettingWidget extends AbstractListSettingWidget<IListDataItem>
 		super(container, themeService, contextViewService);
 	}
 
-	protected getEmptyItem(): IListDataItem {
+	protected getEmptyItem(): TListDataItem {
 		return {
 			value: {
 				type: 'string',
 				data: ''
 			}
-		};
+		} as TListDataItem;
 	}
 
 	protected override isAddButtonVisible(): boolean {
@@ -438,7 +479,7 @@ export class ListSettingWidget extends AbstractListSettingWidget<IListDataItem>
 		return ['setting-list-widget'];
 	}
 
-	protected getActionsForItem(item: IListDataItem, idx: number): IAction[] {
+	protected getActionsForItem(item: TListDataItem, idx: number): IAction[] {
 		return [
 			{
 				class: ThemeIcon.asClassName(settingsEditIcon),
@@ -452,20 +493,20 @@ export class ListSettingWidget extends AbstractListSettingWidget<IListDataItem>
 				enabled: true,
 				id: 'workbench.action.removeListItem',
 				tooltip: this.getLocalizedStrings().deleteActionTooltip,
-				run: () => this._onDidChangeList.fire({ originalItem: item, item: undefined, targetIndex: idx })
+				run: () => this._onDidChangeList.fire({ type: 'remove', originalItem: item, targetIndex: idx })
 			}
 		] as IAction[];
 	}
 
-	private dragDetails: ListSettingWidgetDragDetails | undefined;
+	private dragDetails: ListSettingWidgetDragDetails<TListDataItem> | undefined;
 
-	private getDragImage(item: IListDataItem): HTMLElement {
+	private getDragImage(item: TListDataItem): HTMLElement {
 		const dragImage = $('.monaco-drag-image');
 		dragImage.textContent = item.value.data;
 		return dragImage;
 	}
 
-	protected renderItem(item: IListDataItem, idx: number): RowElementGroup {
+	protected renderItem(item: TListDataItem, idx: number): RowElementGroup {
 		const rowElement = $('.setting-list-row');
 		const valueElement = DOM.append(rowElement, $('.setting-list-value'));
 		const siblingElement = DOM.append(rowElement, $('.setting-list-sibling'));
@@ -477,7 +518,7 @@ export class ListSettingWidget extends AbstractListSettingWidget<IListDataItem>
 		return { rowElement, keyElement: valueElement, valueElement: siblingElement };
 	}
 
-	protected addDragAndDrop(rowElement: HTMLElement, item: IListDataItem, idx: number) {
+	protected addDragAndDrop(rowElement: HTMLElement, item: TListDataItem, idx: number) {
 		if (this.inReadMode) {
 			rowElement.draggable = true;
 			rowElement.classList.add('draggable');
@@ -530,9 +571,10 @@ export class ListSettingWidget extends AbstractListSettingWidget<IListDataItem>
 			counter = 0;
 			if (this.dragDetails.element !== rowElement) {
 				this._onDidChangeList.fire({
+					type: 'move',
 					originalItem: this.dragDetails.item,
 					sourceIndex: this.dragDetails.itemIndex,
-					item,
+					newItem: item,
 					targetIndex: idx
 				});
 			}
@@ -548,7 +590,7 @@ export class ListSettingWidget extends AbstractListSettingWidget<IListDataItem>
 		}));
 	}
 
-	protected renderEdit(item: IListDataItem, idx: number): HTMLElement {
+	protected renderEdit(item: TListDataItem, idx: number): HTMLElement {
 		const rowElement = $('.setting-list-edit-row');
 		let valueInput: InputBox | SelectBox;
 		let currentDisplayValue: string;
@@ -580,7 +622,7 @@ export class ListSettingWidget extends AbstractListSettingWidget<IListDataItem>
 				break;
 		}
 
-		const updatedInputBoxItem = (): IListDataItem => {
+		const updatedInputBoxItem = (): TListDataItem => {
 			const inputBox = valueInput as InputBox;
 			return {
 				value: {
@@ -588,16 +630,16 @@ export class ListSettingWidget extends AbstractListSettingWidget<IListDataItem>
 					data: inputBox.value
 				},
 				sibling: siblingInput?.value
-			};
+			} as TListDataItem;
 		};
-		const updatedSelectBoxItem = (selectedValue: string): IListDataItem => {
+		const updatedSelectBoxItem = (selectedValue: string): TListDataItem => {
 			return {
 				value: {
 					type: 'enum',
 					data: selectedValue,
 					options: currentEnumOptions ?? []
 				}
-			};
+			} as TListDataItem;
 		};
 		const onKeyDown = (e: StandardKeyboardEvent) => {
 			if (e.equals(KeyCode.Enter)) {
@@ -644,7 +686,7 @@ export class ListSettingWidget extends AbstractListSettingWidget<IListDataItem>
 			valueInput.element.classList.add('no-sibling');
 		}
 
-		const okButton = this._register(new Button(rowElement, defaultButtonStyles));
+		const okButton = this.listDisposables.add(new Button(rowElement, defaultButtonStyles));
 		okButton.label = localize('okButton', "OK");
 		okButton.element.classList.add('setting-list-ok-button');
 
@@ -656,7 +698,7 @@ export class ListSettingWidget extends AbstractListSettingWidget<IListDataItem>
 			}
 		}));
 
-		const cancelButton = this._register(new Button(rowElement, { secondary: true, ...defaultButtonStyles }));
+		const cancelButton = this.listDisposables.add(new Button(rowElement, { secondary: true, ...defaultButtonStyles }));
 		cancelButton.label = localize('cancelButton', "Cancel");
 		cancelButton.element.classList.add('setting-list-cancel-button');
 
@@ -674,11 +716,11 @@ export class ListSettingWidget extends AbstractListSettingWidget<IListDataItem>
 		return rowElement;
 	}
 
-	override isItemNew(item: IListDataItem): boolean {
+	override isItemNew(item: TListDataItem): boolean {
 		return item.value.data === '';
 	}
 
-	protected addTooltipsToRow(rowElementGroup: RowElementGroup, { value, sibling }: IListDataItem) {
+	protected addTooltipsToRow(rowElementGroup: RowElementGroup, { value, sibling }: TListDataItem) {
 		const title = isUndefinedOrNull(sibling)
 			? localize('listValueHintLabel', "List item `{0}`", value.data)
 			: localize('listSiblingHintLabel', "List item `{0}` with sibling `${1}`", value.data, sibling);
@@ -729,22 +771,28 @@ export class ListSettingWidget extends AbstractListSettingWidget<IListDataItem>
 	}
 }
 
-export class ExcludeSettingWidget extends ListSettingWidget {
+export class ExcludeSettingWidget extends ListSettingWidget<IIncludeExcludeDataItem> {
 	protected override getContainerClasses() {
 		return ['setting-list-include-exclude-widget'];
 	}
 
-	protected override addDragAndDrop(rowElement: HTMLElement, item: IListDataItem, idx: number) {
+	protected override addDragAndDrop(rowElement: HTMLElement, item: IIncludeExcludeDataItem, idx: number) {
 		return;
 	}
 
-	protected override addTooltipsToRow(rowElementGroup: RowElementGroup, { value, sibling }: IListDataItem): void {
-		const title = isUndefinedOrNull(sibling)
-			? localize('excludePatternHintLabel', "Exclude files matching `{0}`", value.data)
-			: localize('excludeSiblingHintLabel', "Exclude files matching `{0}`, only when a file matching `{1}` is present", value.data, sibling);
+	protected override addTooltipsToRow(rowElementGroup: RowElementGroup, item: IIncludeExcludeDataItem): void {
+		let title = isUndefinedOrNull(item.sibling)
+			? localize('excludePatternHintLabel', "Exclude files matching `{0}`", item.value.data)
+			: localize('excludeSiblingHintLabel', "Exclude files matching `{0}`, only when a file matching `{1}` is present", item.value.data, item.sibling);
+
+		if (item.source) {
+			title += localize('excludeIncludeSource', ". Default value provided by `{0}`", item.source);
+		}
+
+		const markdownTitle = new MarkdownString().appendMarkdown(title);
 
 		const { rowElement } = rowElementGroup;
-		this.listDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), rowElement, title));
+		this.listDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), rowElement, { markdown: markdownTitle, markdownNotSupportedFallback: title }));
 		rowElement.setAttribute('aria-label', title);
 	}
 
@@ -759,22 +807,28 @@ export class ExcludeSettingWidget extends ListSettingWidget {
 	}
 }
 
-export class IncludeSettingWidget extends ListSettingWidget {
+export class IncludeSettingWidget extends ListSettingWidget<IIncludeExcludeDataItem> {
 	protected override getContainerClasses() {
 		return ['setting-list-include-exclude-widget'];
 	}
 
-	protected override addDragAndDrop(rowElement: HTMLElement, item: IListDataItem, idx: number) {
+	protected override addDragAndDrop(rowElement: HTMLElement, item: IIncludeExcludeDataItem, idx: number) {
 		return;
 	}
 
-	protected override addTooltipsToRow(rowElementGroup: RowElementGroup, { value, sibling }: IListDataItem): void {
-		const title = isUndefinedOrNull(sibling)
-			? localize('includePatternHintLabel', "Include files matching `{0}`", value.data)
-			: localize('includeSiblingHintLabel', "Include files matching `{0}`, only when a file matching `{1}` is present", value.data, sibling);
+	protected override addTooltipsToRow(rowElementGroup: RowElementGroup, item: IIncludeExcludeDataItem): void {
+		let title = isUndefinedOrNull(item.sibling)
+			? localize('includePatternHintLabel', "Include files matching `{0}`", item.value.data)
+			: localize('includeSiblingHintLabel', "Include files matching `{0}`, only when a file matching `{1}` is present", item.value.data, item.sibling);
+
+		if (item.source) {
+			title += localize('excludeIncludeSource', ". Default value provided by `{0}`", item.source);
+		}
+
+		const markdownTitle = new MarkdownString().appendMarkdown(title);
 
 		const { rowElement } = rowElementGroup;
-		this.listDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), rowElement, title));
+		this.listDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), rowElement, { markdown: markdownTitle, markdownNotSupportedFallback: title }));
 		rowElement.setAttribute('aria-label', title);
 	}
 
@@ -818,7 +872,16 @@ export interface IObjectDataItem {
 	key: ObjectKey;
 	value: ObjectValue;
 	keyDescription?: string;
+	source?: string;
 	removable: boolean;
+	resetable: boolean;
+}
+
+export interface IIncludeExcludeDataItem {
+	value: ObjectKey;
+	elementType: SettingValueType;
+	sibling?: string;
+	source?: string;
 }
 
 export interface IObjectValueSuggester {
@@ -886,6 +949,7 @@ export class ObjectSettingDropdownWidget extends AbstractListSettingWidget<IObje
 			key: { type: 'string', data: '' },
 			value: { type: 'string', data: '' },
 			removable: true,
+			resetable: false
 		};
 	}
 
@@ -905,6 +969,17 @@ export class ObjectSettingDropdownWidget extends AbstractListSettingWidget<IObje
 			},
 		];
 
+		if (item.resetable) {
+			actions.push({
+				class: ThemeIcon.asClassName(settingsDiscardIcon),
+				enabled: true,
+				id: 'workbench.action.resetListItem',
+				label: '',
+				tooltip: this.getLocalizedStrings().resetActionTooltip,
+				run: () => this._onDidChangeList.fire({ type: 'reset', originalItem: item, targetIndex: idx })
+			});
+		}
+
 		if (item.removable) {
 			actions.push({
 				class: ThemeIcon.asClassName(settingsRemoveIcon),
@@ -912,16 +987,7 @@ export class ObjectSettingDropdownWidget extends AbstractListSettingWidget<IObje
 				id: 'workbench.action.removeListItem',
 				label: '',
 				tooltip: this.getLocalizedStrings().deleteActionTooltip,
-				run: () => this._onDidChangeList.fire({ originalItem: item, item: undefined, targetIndex: idx })
-			});
-		} else {
-			actions.push({
-				class: ThemeIcon.asClassName(settingsDiscardIcon),
-				enabled: true,
-				id: 'workbench.action.resetListItem',
-				label: '',
-				tooltip: this.getLocalizedStrings().resetActionTooltip,
-				run: () => this._onDidChangeList.fire({ originalItem: item, item: undefined, targetIndex: idx })
+				run: () => this._onDidChangeList.fire({ type: 'remove', originalItem: item, targetIndex: idx })
 			});
 		}
 
@@ -1022,14 +1088,14 @@ export class ObjectSettingDropdownWidget extends AbstractListSettingWidget<IObje
 
 		rowElement.append(keyElement, valueContainer);
 
-		const okButton = this._register(new Button(rowElement, defaultButtonStyles));
+		const okButton = this.listDisposables.add(new Button(rowElement, defaultButtonStyles));
 		okButton.enabled = changedItem.key.data !== '';
 		okButton.label = localize('okButton', "OK");
 		okButton.element.classList.add('setting-list-ok-button');
 
 		this.listDisposables.add(okButton.onDidClick(() => this.handleItemChange(item, changedItem, idx)));
 
-		const cancelButton = this._register(new Button(rowElement, { secondary: true, ...defaultButtonStyles }));
+		const cancelButton = this.listDisposables.add(new Button(rowElement, { secondary: true, ...defaultButtonStyles }));
 		cancelButton.label = localize('cancelButton', "Cancel");
 		cancelButton.element.classList.add('setting-list-cancel-button');
 
@@ -1181,12 +1247,20 @@ export class ObjectSettingDropdownWidget extends AbstractListSettingWidget<IObje
 
 	protected addTooltipsToRow(rowElementGroup: RowElementGroup, item: IObjectDataItem): void {
 		const { keyElement, valueElement, rowElement } = rowElementGroup;
-		const accessibleDescription = localize('objectPairHintLabel', "The property `{0}` is set to `{1}`.", item.key.data, item.value.data);
 
-		const keyDescription = this.getEnumDescription(item.key) ?? item.keyDescription ?? accessibleDescription;
+		let accessibleDescription;
+		if (item.source) {
+			accessibleDescription = localize('objectPairHintLabelWithSource', "The property `{0}` is set to `{1}` by `{2}`.", item.key.data, item.value.data, item.source);
+		} else {
+			accessibleDescription = localize('objectPairHintLabel', "The property `{0}` is set to `{1}`.", item.key.data, item.value.data);
+		}
+
+		const markdownString = { markdown: new MarkdownString().appendMarkdown(accessibleDescription), markdownNotSupportedFallback: accessibleDescription };
+
+		const keyDescription: string | IManagedHoverTooltipMarkdownString = this.getEnumDescription(item.key) ?? item.keyDescription ?? markdownString;
 		this.listDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), keyElement, keyDescription));
 
-		const valueDescription = this.getEnumDescription(item.value) ?? accessibleDescription;
+		const valueDescription: string | IManagedHoverTooltipMarkdownString = this.getEnumDescription(item.value) ?? markdownString;
 		this.listDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), valueElement!, valueDescription));
 
 		rowElement.setAttribute('aria-label', accessibleDescription);
@@ -1215,7 +1289,16 @@ interface IBoolObjectSetValueOptions {
 	settingKey: string;
 }
 
-export class ObjectSettingCheckboxWidget extends AbstractListSettingWidget<IObjectDataItem> {
+export interface IBoolObjectDataItem {
+	key: IObjectStringData;
+	value: IObjectBoolData;
+	keyDescription?: string;
+	source?: string;
+	removable: false;
+	resetable: boolean;
+}
+
+export class ObjectSettingCheckboxWidget extends AbstractListSettingWidget<IBoolObjectDataItem> {
 	private currentSettingKey: string = '';
 
 	constructor(
@@ -1227,7 +1310,7 @@ export class ObjectSettingCheckboxWidget extends AbstractListSettingWidget<IObje
 		super(container, themeService, contextViewService);
 	}
 
-	override setValue(listData: IObjectDataItem[], options?: IBoolObjectSetValueOptions): void {
+	override setValue(listData: IBoolObjectDataItem[], options?: IBoolObjectSetValueOptions): void {
 		if (isDefined(options) && options.settingKey !== this.currentSettingKey) {
 			this.model.setEditKey('none');
 			this.model.select(null);
@@ -1237,15 +1320,16 @@ export class ObjectSettingCheckboxWidget extends AbstractListSettingWidget<IObje
 		super.setValue(listData);
 	}
 
-	override isItemNew(item: IObjectDataItem): boolean {
+	override isItemNew(item: IBoolObjectDataItem): boolean {
 		return !item.key.data && !item.value.data;
 	}
 
-	protected getEmptyItem(): IObjectDataItem {
+	protected getEmptyItem(): IBoolObjectDataItem {
 		return {
 			key: { type: 'string', data: '' },
 			value: { type: 'boolean', data: false },
-			removable: false
+			removable: false,
+			resetable: true
 		};
 	}
 
@@ -1253,7 +1337,7 @@ export class ObjectSettingCheckboxWidget extends AbstractListSettingWidget<IObje
 		return ['setting-list-object-widget'];
 	}
 
-	protected getActionsForItem(item: IObjectDataItem, idx: number): IAction[] {
+	protected getActionsForItem(item: IBoolObjectDataItem, idx: number): IAction[] {
 		return [];
 	}
 
@@ -1265,20 +1349,20 @@ export class ObjectSettingCheckboxWidget extends AbstractListSettingWidget<IObje
 		return undefined;
 	}
 
-	protected override renderDataOrEditItem(item: IListViewItem<IObjectDataItem>, idx: number, listFocused: boolean): HTMLElement {
+	protected override renderDataOrEditItem(item: IListViewItem<IBoolObjectDataItem>, idx: number, listFocused: boolean): HTMLElement {
 		const rowElement = this.renderEdit(item, idx);
 		rowElement.setAttribute('role', 'listitem');
 		return rowElement;
 	}
 
-	protected renderItem(item: IObjectDataItem, idx: number): RowElementGroup {
+	protected renderItem(item: IBoolObjectDataItem, idx: number): RowElementGroup {
 		// Return just the containers, since we always render in edit mode anyway
 		const rowElement = $('.blank-row');
 		const keyElement = $('.blank-row-key');
 		return { rowElement, keyElement };
 	}
 
-	protected renderEdit(item: IObjectDataItem, idx: number): HTMLElement {
+	protected renderEdit(item: IBoolObjectDataItem, idx: number): HTMLElement {
 		const rowElement = $('.setting-list-edit-row.setting-list-object-row.setting-item-bool');
 
 		const changedItem = { ...item };
@@ -1342,7 +1426,7 @@ export class ObjectSettingCheckboxWidget extends AbstractListSettingWidget<IObje
 		return { widget: checkbox, element: wrapper };
 	}
 
-	protected addTooltipsToRow(rowElementGroup: RowElementGroup, item: IObjectDataItem): void {
+	protected addTooltipsToRow(rowElementGroup: RowElementGroup, item: IBoolObjectDataItem): void {
 		const accessibleDescription = localize('objectPairHintLabel', "The property `{0}` is set to `{1}`.", item.key.data, item.value.data);
 		const title = item.keyDescription ?? accessibleDescription;
 		const { rowElement, keyElement, valueElement } = rowElementGroup;
diff --git a/src/vs/workbench/contrib/preferences/browser/tocTree.ts b/src/vs/workbench/contrib/preferences/browser/tocTree.ts
index 33751f3e2f1..6acbee7ca68 100644
--- a/src/vs/workbench/contrib/preferences/browser/tocTree.ts
+++ b/src/vs/workbench/contrib/preferences/browser/tocTree.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { DefaultStyleController, IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
-import { RenderIndentGuides } from 'vs/base/browser/ui/tree/abstractTree';
-import { ITreeElement, ITreeNode, ITreeRenderer } from 'vs/base/browser/ui/tree/tree';
-import { Iterable } from 'vs/base/common/iterator';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { localize } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IListService, IWorkbenchObjectTreeOptions, WorkbenchObjectTree } from 'vs/platform/list/browser/listService';
-import { getListStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { editorBackground, focusBorder } from 'vs/platform/theme/common/colorRegistry';
-import { SettingsTreeFilter } from 'vs/workbench/contrib/preferences/browser/settingsTree';
-import { ISettingsEditorViewState, SearchResultModel, SettingsTreeElement, SettingsTreeGroupElement, SettingsTreeSettingElement } from 'vs/workbench/contrib/preferences/browser/settingsTreeModels';
-import { settingsHeaderForeground, settingsHeaderHoverForeground } from 'vs/workbench/contrib/preferences/common/settingsEditorColorRegistry';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
+import * as DOM from '../../../../base/browser/dom.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
+import { DefaultStyleController, IListAccessibilityProvider } from '../../../../base/browser/ui/list/listWidget.js';
+import { RenderIndentGuides } from '../../../../base/browser/ui/tree/abstractTree.js';
+import { ITreeElement, ITreeNode, ITreeRenderer } from '../../../../base/browser/ui/tree/tree.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { localize } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IListService, IWorkbenchObjectTreeOptions, WorkbenchObjectTree } from '../../../../platform/list/browser/listService.js';
+import { getListStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { editorBackground, focusBorder } from '../../../../platform/theme/common/colorRegistry.js';
+import { SettingsTreeFilter } from './settingsTree.js';
+import { ISettingsEditorViewState, SearchResultModel, SettingsTreeElement, SettingsTreeGroupElement, SettingsTreeSettingElement } from './settingsTreeModels.js';
+import { settingsHeaderForeground, settingsHeaderHoverForeground } from '../common/settingsEditorColorRegistry.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
 
 const $ = DOM.$;
 
diff --git a/src/vs/workbench/contrib/preferences/common/preferences.ts b/src/vs/workbench/contrib/preferences/common/preferences.ts
index 7288bbc4fc4..7a86efc76d9 100644
--- a/src/vs/workbench/contrib/preferences/common/preferences.ts
+++ b/src/vs/workbench/contrib/preferences/common/preferences.ts
@@ -3,14 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { IExtensionRecommendations } from 'vs/base/common/product';
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IExtensionGalleryService, IGalleryExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ISearchResult, ISettingsEditorModel } from 'vs/workbench/services/preferences/common/preferences';
+import { raceTimeout } from '../../../../base/common/async.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IStringDictionary } from '../../../../base/common/collections.js';
+import { IExtensionRecommendations } from '../../../../base/common/product.js';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IExtensionGalleryService, IGalleryExtension } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { ISearchResult, ISettingsEditorModel } from '../../../services/preferences/common/preferences.js';
 
 export interface IWorkbenchSettingsConfiguration {
 	workbench: {
@@ -97,6 +98,7 @@ export const KEYBOARD_LAYOUT_OPEN_PICKER = 'workbench.action.openKeyboardLayoutP
 export const ENABLE_LANGUAGE_FILTER = true;
 
 export const ENABLE_EXTENSION_TOGGLE_SETTINGS = true;
+export const EXTENSION_FETCH_TIMEOUT_MS = 1000;
 
 export type ExtensionToggleData = {
 	settingsEditorRecommendedExtensions: IStringDictionary<IExtensionRecommendations>;
@@ -134,9 +136,9 @@ export async function getExperimentalExtensionToggleData(extensionGalleryService
 			// Recommend prerelease if not on Stable.
 			const isStable = productService.quality === 'stable';
 			try {
-				const [extension] = await extensionGalleryService.getExtensions([{ id: extensionId, preRelease: !isStable }], CancellationToken.None);
-				if (extension) {
-					recommendedExtensionsGalleryInfo[key] = extension;
+				const extensions = await raceTimeout(extensionGalleryService.getExtensions([{ id: extensionId, preRelease: !isStable }], CancellationToken.None), EXTENSION_FETCH_TIMEOUT_MS);
+				if (extensions?.length === 1) {
+					recommendedExtensionsGalleryInfo[key] = extensions[0];
 				} else {
 					// same as network connection fail. we do not want a blank settings page: https://github.com/microsoft/vscode/issues/195722
 					// so instead of returning partial data we return undefined here
diff --git a/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts b/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
index 877d449605c..a020d871b14 100644
--- a/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
+++ b/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
@@ -3,56 +3,51 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DisposableStore, dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { isEqual } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { ITextModel } from 'vs/editor/common/model';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import * as nls from 'vs/nls';
-import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ConfigurationScope, Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import * as JSONContributionRegistry from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { workbenchConfigurationNodeBase } from 'vs/workbench/common/configuration';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { EditorInputWithOptions } from 'vs/workbench/common/editor';
-import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditorInput';
-import { RegisteredEditorPriority, IEditorResolverService } from 'vs/workbench/services/editor/common/editorResolverService';
-import { ITextEditorService } from 'vs/workbench/services/textfile/common/textEditorService';
-import { DEFAULT_SETTINGS_EDITOR_SETTING, FOLDER_SETTINGS_PATH, IPreferencesService, USE_SPLIT_JSON_SETTING } from 'vs/workbench/services/preferences/common/preferences';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
+import { Disposable, dispose, IDisposable } from '../../../../base/common/lifecycle.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import * as nls from '../../../../nls.js';
+import { ConfigurationTarget, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ConfigurationScope, Extensions, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IWorkspaceContextService, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { workbenchConfigurationNodeBase } from '../../../common/configuration.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { EditorInputWithOptions } from '../../../common/editor.js';
+import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
+import { RegisteredEditorPriority, IEditorResolverService } from '../../../services/editor/common/editorResolverService.js';
+import { ITextEditorService } from '../../../services/textfile/common/textEditorService.js';
+import { DEFAULT_SETTINGS_EDITOR_SETTING, FOLDER_SETTINGS_PATH, IPreferencesService, USE_SPLIT_JSON_SETTING } from '../../../services/preferences/common/preferences.js';
+import { IUserDataProfileService } from '../../../services/userDataProfile/common/userDataProfile.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { SettingsFileSystemProvider } from './settingsFilesystemProvider.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 
-const schemaRegistry = Registry.as<JSONContributionRegistry.IJSONContributionRegistry>(JSONContributionRegistry.Extensions.JSONContribution);
-
-export class PreferencesContribution implements IWorkbenchContribution {
+export class PreferencesContribution extends Disposable implements IWorkbenchContribution {
 
 	static readonly ID = 'workbench.contrib.preferences';
 
 	private editorOpeningListener: IDisposable | undefined;
-	private settingsListener: IDisposable;
 
 	constructor(
-		@IModelService private readonly modelService: IModelService,
-		@ITextModelService private readonly textModelResolverService: ITextModelService,
+		@IFileService fileService: IFileService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IPreferencesService private readonly preferencesService: IPreferencesService,
-		@ILanguageService private readonly languageService: ILanguageService,
 		@IUserDataProfileService private readonly userDataProfileService: IUserDataProfileService,
 		@IWorkspaceContextService private readonly workspaceService: IWorkspaceContextService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IEditorResolverService private readonly editorResolverService: IEditorResolverService,
-		@ITextEditorService private readonly textEditorService: ITextEditorService
+		@ITextEditorService private readonly textEditorService: ITextEditorService,
 	) {
-		this.settingsListener = this.configurationService.onDidChangeConfiguration(e => {
+		super();
+		this._register(this.configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration(USE_SPLIT_JSON_SETTING) || e.affectsConfiguration(DEFAULT_SETTINGS_EDITOR_SETTING)) {
 				this.handleSettingsEditorRegistration();
 			}
-		});
+		}));
 		this.handleSettingsEditorRegistration();
 
-		this.start();
+		const fileSystemProvider = this._register(this.instantiationService.createInstance(SettingsFileSystemProvider));
+		this._register(fileService.registerProvider(SettingsFileSystemProvider.SCHEMA, fileSystemProvider));
 	}
 
 	private handleSettingsEditorRegistration(): void {
@@ -102,44 +97,13 @@ export class PreferencesContribution implements IWorkbenchContribution {
 			);
 		}
 	}
-
-	private start(): void {
-
-		this.textModelResolverService.registerTextModelContentProvider('vscode', {
-			provideTextContent: async (uri: URI): Promise<ITextModel | null> => {
-				if (uri.scheme !== 'vscode') {
-					return null;
-				}
-				if (uri.authority === 'schemas') {
-					return this.getSchemaModel(uri);
-				}
-				return this.preferencesService.resolveModel(uri);
-			}
-		});
-	}
-
-	private getSchemaModel(uri: URI): ITextModel {
-		let schema = schemaRegistry.getSchemaContributions().schemas[uri.toString()] ?? {} /* Use empty schema if not yet registered */;
-		const modelContent = JSON.stringify(schema);
-		const languageSelection = this.languageService.createById('jsonc');
-		const model = this.modelService.createModel(modelContent, languageSelection, uri);
-		const disposables = new DisposableStore();
-		disposables.add(schemaRegistry.onDidChangeSchema(schemaUri => {
-			if (schemaUri === uri.toString()) {
-				schema = schemaRegistry.getSchemaContributions().schemas[uri.toString()];
-				model.setValue(JSON.stringify(schema));
-			}
-		}));
-		disposables.add(model.onWillDispose(() => disposables.dispose()));
-		return model;
-	}
-
-	dispose(): void {
+	override dispose(): void {
 		dispose(this.editorOpeningListener);
-		dispose(this.settingsListener);
+		super.dispose();
 	}
 }
 
+
 const registry = Registry.as<IConfigurationRegistry>(Extensions.Configuration);
 registry.registerConfiguration({
 	...workbenchConfigurationNodeBase,
diff --git a/src/vs/workbench/contrib/preferences/common/settingsEditorColorRegistry.ts b/src/vs/workbench/contrib/preferences/common/settingsEditorColorRegistry.ts
index 29841a28248..8034b07a4b6 100644
--- a/src/vs/workbench/contrib/preferences/common/settingsEditorColorRegistry.ts
+++ b/src/vs/workbench/contrib/preferences/common/settingsEditorColorRegistry.ts
@@ -3,43 +3,43 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Color, RGBA } from 'vs/base/common/color';
-import { localize } from 'vs/nls';
-import { editorWidgetBorder, focusBorder, inputBackground, inputBorder, inputForeground, listHoverBackground, registerColor, selectBackground, selectBorder, selectForeground, checkboxBackground, checkboxBorder, checkboxForeground, transparent } from 'vs/platform/theme/common/colorRegistry';
-import { PANEL_BORDER } from 'vs/workbench/common/theme';
+import { Color, RGBA } from '../../../../base/common/color.js';
+import { localize } from '../../../../nls.js';
+import { editorWidgetBorder, focusBorder, inputBackground, inputBorder, inputForeground, listHoverBackground, registerColor, selectBackground, selectBorder, selectForeground, checkboxBackground, checkboxBorder, checkboxForeground, transparent } from '../../../../platform/theme/common/colorRegistry.js';
+import { PANEL_BORDER } from '../../../common/theme.js';
 
 // General setting colors
 export const settingsHeaderForeground = registerColor('settings.headerForeground', { light: '#444444', dark: '#e7e7e7', hcDark: '#ffffff', hcLight: '#292929' }, localize('headerForeground', "The foreground color for a section header or active title."));
-export const settingsHeaderHoverForeground = registerColor('settings.settingsHeaderHoverForeground', { light: transparent(settingsHeaderForeground, 0.7), dark: transparent(settingsHeaderForeground, 0.7), hcDark: transparent(settingsHeaderForeground, 0.7), hcLight: transparent(settingsHeaderForeground, 0.7) }, localize('settingsHeaderHoverForeground', "The foreground color for a section header or hovered title."));
+export const settingsHeaderHoverForeground = registerColor('settings.settingsHeaderHoverForeground', transparent(settingsHeaderForeground, 0.7), localize('settingsHeaderHoverForeground', "The foreground color for a section header or hovered title."));
 export const modifiedItemIndicator = registerColor('settings.modifiedItemIndicator', {
 	light: new Color(new RGBA(102, 175, 224)),
 	dark: new Color(new RGBA(12, 125, 157)),
 	hcDark: new Color(new RGBA(0, 73, 122)),
 	hcLight: new Color(new RGBA(102, 175, 224)),
 }, localize('modifiedItemForeground', "The color of the modified setting indicator."));
-export const settingsHeaderBorder = registerColor('settings.headerBorder', { dark: PANEL_BORDER, light: PANEL_BORDER, hcDark: PANEL_BORDER, hcLight: PANEL_BORDER }, localize('settingsHeaderBorder', "The color of the header container border."));
-export const settingsSashBorder = registerColor('settings.sashBorder', { dark: PANEL_BORDER, light: PANEL_BORDER, hcDark: PANEL_BORDER, hcLight: PANEL_BORDER }, localize('settingsSashBorder', "The color of the Settings editor splitview sash border."));
+export const settingsHeaderBorder = registerColor('settings.headerBorder', PANEL_BORDER, localize('settingsHeaderBorder', "The color of the header container border."));
+export const settingsSashBorder = registerColor('settings.sashBorder', PANEL_BORDER, localize('settingsSashBorder', "The color of the Settings editor splitview sash border."));
 
 // Enum control colors
-export const settingsSelectBackground = registerColor(`settings.dropdownBackground`, { dark: selectBackground, light: selectBackground, hcDark: selectBackground, hcLight: selectBackground }, localize('settingsDropdownBackground', "Settings editor dropdown background."));
-export const settingsSelectForeground = registerColor('settings.dropdownForeground', { dark: selectForeground, light: selectForeground, hcDark: selectForeground, hcLight: selectForeground }, localize('settingsDropdownForeground', "Settings editor dropdown foreground."));
-export const settingsSelectBorder = registerColor('settings.dropdownBorder', { dark: selectBorder, light: selectBorder, hcDark: selectBorder, hcLight: selectBorder }, localize('settingsDropdownBorder', "Settings editor dropdown border."));
-export const settingsSelectListBorder = registerColor('settings.dropdownListBorder', { dark: editorWidgetBorder, light: editorWidgetBorder, hcDark: editorWidgetBorder, hcLight: editorWidgetBorder }, localize('settingsDropdownListBorder', "Settings editor dropdown list border. This surrounds the options and separates the options from the description."));
+export const settingsSelectBackground = registerColor(`settings.dropdownBackground`, selectBackground, localize('settingsDropdownBackground', "Settings editor dropdown background."));
+export const settingsSelectForeground = registerColor('settings.dropdownForeground', selectForeground, localize('settingsDropdownForeground', "Settings editor dropdown foreground."));
+export const settingsSelectBorder = registerColor('settings.dropdownBorder', selectBorder, localize('settingsDropdownBorder', "Settings editor dropdown border."));
+export const settingsSelectListBorder = registerColor('settings.dropdownListBorder', editorWidgetBorder, localize('settingsDropdownListBorder', "Settings editor dropdown list border. This surrounds the options and separates the options from the description."));
 
 // Bool control colors
-export const settingsCheckboxBackground = registerColor('settings.checkboxBackground', { dark: checkboxBackground, light: checkboxBackground, hcDark: checkboxBackground, hcLight: checkboxBackground }, localize('settingsCheckboxBackground', "Settings editor checkbox background."));
-export const settingsCheckboxForeground = registerColor('settings.checkboxForeground', { dark: checkboxForeground, light: checkboxForeground, hcDark: checkboxForeground, hcLight: checkboxForeground }, localize('settingsCheckboxForeground', "Settings editor checkbox foreground."));
-export const settingsCheckboxBorder = registerColor('settings.checkboxBorder', { dark: checkboxBorder, light: checkboxBorder, hcDark: checkboxBorder, hcLight: checkboxBorder }, localize('settingsCheckboxBorder', "Settings editor checkbox border."));
+export const settingsCheckboxBackground = registerColor('settings.checkboxBackground', checkboxBackground, localize('settingsCheckboxBackground', "Settings editor checkbox background."));
+export const settingsCheckboxForeground = registerColor('settings.checkboxForeground', checkboxForeground, localize('settingsCheckboxForeground', "Settings editor checkbox foreground."));
+export const settingsCheckboxBorder = registerColor('settings.checkboxBorder', checkboxBorder, localize('settingsCheckboxBorder', "Settings editor checkbox border."));
 
 // Text control colors
-export const settingsTextInputBackground = registerColor('settings.textInputBackground', { dark: inputBackground, light: inputBackground, hcDark: inputBackground, hcLight: inputBackground }, localize('textInputBoxBackground', "Settings editor text input box background."));
-export const settingsTextInputForeground = registerColor('settings.textInputForeground', { dark: inputForeground, light: inputForeground, hcDark: inputForeground, hcLight: inputForeground }, localize('textInputBoxForeground', "Settings editor text input box foreground."));
-export const settingsTextInputBorder = registerColor('settings.textInputBorder', { dark: inputBorder, light: inputBorder, hcDark: inputBorder, hcLight: inputBorder }, localize('textInputBoxBorder', "Settings editor text input box border."));
+export const settingsTextInputBackground = registerColor('settings.textInputBackground', inputBackground, localize('textInputBoxBackground', "Settings editor text input box background."));
+export const settingsTextInputForeground = registerColor('settings.textInputForeground', inputForeground, localize('textInputBoxForeground', "Settings editor text input box foreground."));
+export const settingsTextInputBorder = registerColor('settings.textInputBorder', inputBorder, localize('textInputBoxBorder', "Settings editor text input box border."));
 
 // Number control colors
-export const settingsNumberInputBackground = registerColor('settings.numberInputBackground', { dark: inputBackground, light: inputBackground, hcDark: inputBackground, hcLight: inputBackground }, localize('numberInputBoxBackground', "Settings editor number input box background."));
-export const settingsNumberInputForeground = registerColor('settings.numberInputForeground', { dark: inputForeground, light: inputForeground, hcDark: inputForeground, hcLight: inputForeground }, localize('numberInputBoxForeground', "Settings editor number input box foreground."));
-export const settingsNumberInputBorder = registerColor('settings.numberInputBorder', { dark: inputBorder, light: inputBorder, hcDark: inputBorder, hcLight: inputBorder }, localize('numberInputBoxBorder', "Settings editor number input box border."));
+export const settingsNumberInputBackground = registerColor('settings.numberInputBackground', inputBackground, localize('numberInputBoxBackground', "Settings editor number input box background."));
+export const settingsNumberInputForeground = registerColor('settings.numberInputForeground', inputForeground, localize('numberInputBoxForeground', "Settings editor number input box foreground."));
+export const settingsNumberInputBorder = registerColor('settings.numberInputBorder', inputBorder, localize('numberInputBoxBorder', "Settings editor number input box border."));
 
 export const focusedRowBackground = registerColor('settings.focusedRowBackground', {
 	dark: transparent(listHoverBackground, .6),
@@ -55,9 +55,4 @@ export const rowHoverBackground = registerColor('settings.rowHoverBackground', {
 	hcLight: null
 }, localize('settings.rowHoverBackground', "The background color of a settings row when hovered."));
 
-export const focusedRowBorder = registerColor('settings.focusedRowBorder', {
-	dark: focusBorder,
-	light: focusBorder,
-	hcDark: focusBorder,
-	hcLight: focusBorder
-}, localize('settings.focusedRowBorder', "The color of the row's top and bottom border when the row is focused."));
+export const focusedRowBorder = registerColor('settings.focusedRowBorder', focusBorder, localize('settings.focusedRowBorder', "The color of the row's top and bottom border when the row is focused."));
diff --git a/src/vs/workbench/contrib/preferences/common/settingsFilesystemProvider.ts b/src/vs/workbench/contrib/preferences/common/settingsFilesystemProvider.ts
new file mode 100644
index 00000000000..b57328baabf
--- /dev/null
+++ b/src/vs/workbench/contrib/preferences/common/settingsFilesystemProvider.ts
@@ -0,0 +1,98 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { NotSupportedError } from '../../../../base/common/errors.js';
+import { IDisposable, Disposable } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { URI } from '../../../../base/common/uri.js';
+import { FileChangeType, FilePermission, FileSystemProviderCapabilities, FileSystemProviderErrorCode, FileType, IFileChange, IFileDeleteOptions, IFileOverwriteOptions, IFileSystemProviderWithFileReadWriteCapability, IStat, IWatchOptions } from '../../../../platform/files/common/files.js';
+import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import * as JSONContributionRegistry from '../../../../platform/jsonschemas/common/jsonContributionRegistry.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { ILogService, LogLevel } from '../../../../platform/log/common/log.js';
+
+const schemaRegistry = Registry.as<JSONContributionRegistry.IJSONContributionRegistry>(JSONContributionRegistry.Extensions.JSONContribution);
+
+
+export class SettingsFileSystemProvider extends Disposable implements IFileSystemProviderWithFileReadWriteCapability {
+
+	static readonly SCHEMA = Schemas.vscode;
+
+	protected readonly _onDidChangeFile = this._register(new Emitter<readonly IFileChange[]>());
+	readonly onDidChangeFile = this._onDidChangeFile.event;
+
+	constructor(
+		@IPreferencesService private readonly preferencesService: IPreferencesService,
+		@ILogService private readonly logService: ILogService
+	) {
+		super();
+		this._register(schemaRegistry.onDidChangeSchema(schemaUri => {
+			this._onDidChangeFile.fire([{ resource: URI.parse(schemaUri), type: FileChangeType.UPDATED }]);
+		}));
+		this._register(preferencesService.onDidDefaultSettingsContentChanged(uri => {
+			this._onDidChangeFile.fire([{ resource: uri, type: FileChangeType.UPDATED }]);
+		}));
+	}
+
+	readonly capabilities: FileSystemProviderCapabilities = FileSystemProviderCapabilities.Readonly + FileSystemProviderCapabilities.FileReadWrite;
+
+	async readFile(uri: URI): Promise<Uint8Array> {
+		if (uri.scheme !== SettingsFileSystemProvider.SCHEMA) {
+			throw new NotSupportedError();
+		}
+		let content: string | undefined;
+		if (uri.authority === 'schemas') {
+			content = this.getSchemaContent(uri);
+		} else if (uri.authority === 'defaultsettings') {
+			content = this.preferencesService.getDefaultSettingsContent(uri);
+		}
+		if (content) {
+			return VSBuffer.fromString(content).buffer;
+		}
+		throw FileSystemProviderErrorCode.FileNotFound;
+	}
+
+	async stat(uri: URI): Promise<IStat> {
+		if (schemaRegistry.hasSchemaContent(uri.toString()) || this.preferencesService.hasDefaultSettingsContent(uri)) {
+			const currentTime = Date.now();
+			return {
+				type: FileType.File,
+				permissions: FilePermission.Readonly,
+				mtime: currentTime,
+				ctime: currentTime,
+				size: 0
+			};
+		}
+		throw FileSystemProviderErrorCode.FileNotFound;
+	}
+
+	readonly onDidChangeCapabilities = Event.None;
+
+	watch(resource: URI, opts: IWatchOptions): IDisposable { return Disposable.None; }
+
+	async mkdir(resource: URI): Promise<void> { }
+	async readdir(resource: URI): Promise<[string, FileType][]> { return []; }
+
+	async rename(from: URI, to: URI, opts: IFileOverwriteOptions): Promise<void> { }
+	async delete(resource: URI, opts: IFileDeleteOptions): Promise<void> { }
+
+	async writeFile() {
+		throw new NotSupportedError();
+	}
+
+	private getSchemaContent(uri: URI): string {
+		const startTime = Date.now();
+		const content = schemaRegistry.getSchemaContent(uri.toString()) ?? '{}' /* Use empty schema if not yet registered */;
+		const logLevel = this.logService.getLevel();
+		if (logLevel === LogLevel.Debug || logLevel === LogLevel.Trace) {
+			const endTime = Date.now();
+			const uncompressed = JSON.stringify(schemaRegistry.getSchemaContributions().schemas[uri.toString()]);
+			this.logService.debug(`${uri.toString()}: ${uncompressed.length} -> ${content.length} (${Math.round((uncompressed.length - content.length) / uncompressed.length * 100)}%) Took ${endTime - startTime}ms`);
+		}
+		return content;
+	}
+}
diff --git a/src/vs/workbench/contrib/preferences/common/smartSnippetInserter.ts b/src/vs/workbench/contrib/preferences/common/smartSnippetInserter.ts
index 188ddea4d3e..9240aaada83 100644
--- a/src/vs/workbench/contrib/preferences/common/smartSnippetInserter.ts
+++ b/src/vs/workbench/contrib/preferences/common/smartSnippetInserter.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { JSONScanner, createScanner as createJSONScanner, SyntaxKind as JSONSyntaxKind } from 'vs/base/common/json';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { ITextModel } from 'vs/editor/common/model';
+import { JSONScanner, createScanner as createJSONScanner, SyntaxKind as JSONSyntaxKind } from '../../../../base/common/json.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { ITextModel } from '../../../../editor/common/model.js';
 
 export interface InsertSnippetResult {
 	position: Position;
diff --git a/src/vs/workbench/contrib/preferences/test/browser/keybindingsEditorContribution.test.ts b/src/vs/workbench/contrib/preferences/test/browser/keybindingsEditorContribution.test.ts
index 55c3c4dba66..a2e56f6400a 100644
--- a/src/vs/workbench/contrib/preferences/test/browser/keybindingsEditorContribution.test.ts
+++ b/src/vs/workbench/contrib/preferences/test/browser/keybindingsEditorContribution.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { KeybindingEditorDecorationsRenderer } from 'vs/workbench/contrib/preferences/browser/keybindingsEditorContribution';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { KeybindingEditorDecorationsRenderer } from '../../browser/keybindingsEditorContribution.js';
 
 suite('KeybindingsEditorContribution', () => {
 
diff --git a/src/vs/workbench/contrib/preferences/test/browser/settingsTreeModels.test.ts b/src/vs/workbench/contrib/preferences/test/browser/settingsTreeModels.test.ts
index c465c0472e1..98421c6ea63 100644
--- a/src/vs/workbench/contrib/preferences/test/browser/settingsTreeModels.test.ts
+++ b/src/vs/workbench/contrib/preferences/test/browser/settingsTreeModels.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { settingKeyToDisplayFormat, parseQuery, IParsedQuery } from 'vs/workbench/contrib/preferences/browser/settingsTreeModels';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { settingKeyToDisplayFormat, parseQuery, IParsedQuery } from '../../browser/settingsTreeModels.js';
 
 suite('SettingsTree', () => {
 	test('settingKeyToDisplayFormat', () => {
diff --git a/src/vs/workbench/contrib/preferences/test/common/smartSnippetInserter.test.ts b/src/vs/workbench/contrib/preferences/test/common/smartSnippetInserter.test.ts
index d8d614fb7d2..0c365321b34 100644
--- a/src/vs/workbench/contrib/preferences/test/common/smartSnippetInserter.test.ts
+++ b/src/vs/workbench/contrib/preferences/test/common/smartSnippetInserter.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { SmartSnippetInserter } from 'vs/workbench/contrib/preferences/common/smartSnippetInserter';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
-import { Position } from 'vs/editor/common/core/position';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { SmartSnippetInserter } from '../../common/smartSnippetInserter.js';
+import { createTextModel } from '../../../../../editor/test/common/testTextModel.js';
+import { Position } from '../../../../../editor/common/core/position.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('SmartSnippetInserter', () => {
 
diff --git a/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts b/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts
index 17b7b7ac490..3ab1684b9ac 100644
--- a/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts
+++ b/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts
@@ -3,47 +3,46 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isFirefox } from 'vs/base/browser/browser';
-import { raceTimeout, timeout } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Codicon } from 'vs/base/common/codicons';
-import { stripIcons } from 'vs/base/common/iconLabels';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Language } from 'vs/base/common/platform';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IEditor } from 'vs/editor/common/editorCommon';
-import { AbstractEditorCommandsQuickAccessProvider } from 'vs/editor/contrib/quickAccess/browser/commandsQuickAccess';
-import { localize, localize2 } from 'vs/nls';
-import { isLocalizedString } from 'vs/platform/action/common/action';
-import { Action2, IMenuService, MenuId, MenuItemAction, SubmenuItemAction } from 'vs/platform/actions/common/actions';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationChangeEvent, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { CommandsHistory, ICommandQuickPick } from 'vs/platform/quickinput/browser/commandsQuickAccess';
-import { TriggerAction } from 'vs/platform/quickinput/browser/pickerQuickAccess';
-import { DefaultQuickAccessFilterValue } from 'vs/platform/quickinput/common/quickAccess';
-import { IQuickInputService, IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IWorkbenchQuickAccessConfiguration } from 'vs/workbench/browser/quickaccess';
-import { CHAT_OPEN_ACTION_ID } from 'vs/workbench/contrib/chat/browser/actions/chatActions';
-import { ASK_QUICK_QUESTION_ACTION_ID } from 'vs/workbench/contrib/chat/browser/actions/chatQuickInputActions';
-import { ChatAgentLocation, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { CommandInformationResult, IAiRelatedInformationService, RelatedInformationType } from 'vs/workbench/services/aiRelatedInformation/common/aiRelatedInformation';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { createKeybindingCommandQuery } from 'vs/workbench/services/preferences/browser/keybindingsEditorModel';
-import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
+import { isFirefox } from '../../../../base/browser/browser.js';
+import { raceTimeout, timeout } from '../../../../base/common/async.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { stripIcons } from '../../../../base/common/iconLabels.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { Language } from '../../../../base/common/platform.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { IEditor } from '../../../../editor/common/editorCommon.js';
+import { AbstractEditorCommandsQuickAccessProvider } from '../../../../editor/contrib/quickAccess/browser/commandsQuickAccess.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { isLocalizedString } from '../../../../platform/action/common/action.js';
+import { Action2, IMenuService, MenuId, MenuItemAction, SubmenuItemAction } from '../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IConfigurationChangeEvent, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { CommandsHistory, ICommandQuickPick } from '../../../../platform/quickinput/browser/commandsQuickAccess.js';
+import { TriggerAction } from '../../../../platform/quickinput/browser/pickerQuickAccess.js';
+import { DefaultQuickAccessFilterValue } from '../../../../platform/quickinput/common/quickAccess.js';
+import { IQuickInputService, IQuickPickSeparator } from '../../../../platform/quickinput/common/quickInput.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IWorkbenchQuickAccessConfiguration } from '../../../browser/quickaccess.js';
+import { CHAT_OPEN_ACTION_ID } from '../../chat/browser/actions/chatActions.js';
+import { ASK_QUICK_QUESTION_ACTION_ID } from '../../chat/browser/actions/chatQuickInputActions.js';
+import { ChatAgentLocation, IChatAgentService } from '../../chat/common/chatAgents.js';
+import { CommandInformationResult, IAiRelatedInformationService, RelatedInformationType } from '../../../services/aiRelatedInformation/common/aiRelatedInformation.js';
+import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { createKeybindingCommandQuery } from '../../../services/preferences/browser/keybindingsEditorModel.js';
+import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
 
 export class CommandsQuickAccessProvider extends AbstractEditorCommandsQuickAccessProvider {
 
 	private static AI_RELATED_INFORMATION_MAX_PICKS = 5;
-	private static AI_RELATED_INFORMATION_THRESHOLD = 0.8;
 	private static AI_RELATED_INFORMATION_DEBOUNCE = 200;
 
 	// If extensions are not yet registered, we wait for a little moment to give them
@@ -199,7 +198,7 @@ export class CommandsQuickAccessProvider extends AbstractEditorCommandsQuickAcce
 		const additionalPicks = new Array<ICommandQuickPick | IQuickPickSeparator>();
 
 		for (const info of relatedInformation) {
-			if (info.weight < CommandsQuickAccessProvider.AI_RELATED_INFORMATION_THRESHOLD || additionalPicks.length === CommandsQuickAccessProvider.AI_RELATED_INFORMATION_MAX_PICKS) {
+			if (additionalPicks.length === CommandsQuickAccessProvider.AI_RELATED_INFORMATION_MAX_PICKS) {
 				break;
 			}
 			const pick = allPicks.find(p => p.commandId === info.command && !setOfPicksSoFar.has(p.commandId));
@@ -214,8 +213,8 @@ export class CommandsQuickAccessProvider extends AbstractEditorCommandsQuickAcce
 	private getGlobalCommandPicks(): ICommandQuickPick[] {
 		const globalCommandPicks: ICommandQuickPick[] = [];
 		const scopedContextKeyService = this.editorService.activeEditorPane?.scopedContextKeyService || this.editorGroupService.activeGroup.scopedContextKeyService;
-		const globalCommandsMenu = this.menuService.createMenu(MenuId.CommandPalette, scopedContextKeyService);
-		const globalCommandsMenuActions = globalCommandsMenu.getActions()
+		const globalCommandsMenu = this.menuService.getMenuActions(MenuId.CommandPalette, scopedContextKeyService);
+		const globalCommandsMenuActions = globalCommandsMenu
 			.reduce((r, [, actions]) => [...r, ...actions], <Array<MenuItemAction | SubmenuItemAction | string>>[])
 			.filter(action => action instanceof MenuItemAction && action.enabled) as MenuItemAction[];
 
@@ -251,9 +250,6 @@ export class CommandsQuickAccessProvider extends AbstractEditorCommandsQuickAcce
 			});
 		}
 
-		// Cleanup
-		globalCommandsMenu.dispose();
-
 		return globalCommandPicks;
 	}
 }
diff --git a/src/vs/workbench/contrib/quickaccess/browser/quickAccess.contribution.ts b/src/vs/workbench/contrib/quickaccess/browser/quickAccess.contribution.ts
index 61a4af6eac8..051836b9bcb 100644
--- a/src/vs/workbench/contrib/quickaccess/browser/quickAccess.contribution.ts
+++ b/src/vs/workbench/contrib/quickaccess/browser/quickAccess.contribution.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { IQuickAccessRegistry, Extensions } from 'vs/platform/quickinput/common/quickAccess';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { HelpQuickAccessProvider } from 'vs/platform/quickinput/browser/helpQuickAccess';
-import { ViewQuickAccessProvider, OpenViewPickerAction, QuickAccessViewPickerAction } from 'vs/workbench/contrib/quickaccess/browser/viewQuickAccess';
-import { CommandsQuickAccessProvider, ShowAllCommandsAction, ClearCommandHistoryAction } from 'vs/workbench/contrib/quickaccess/browser/commandsQuickAccess';
-import { MenuRegistry, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { KeyMod } from 'vs/base/common/keyCodes';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { inQuickPickContext, getQuickNavigateHandler } from 'vs/workbench/browser/quickaccess';
-import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
+import { localize } from '../../../../nls.js';
+import { IQuickAccessRegistry, Extensions } from '../../../../platform/quickinput/common/quickAccess.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { HelpQuickAccessProvider } from '../../../../platform/quickinput/browser/helpQuickAccess.js';
+import { ViewQuickAccessProvider, OpenViewPickerAction, QuickAccessViewPickerAction } from './viewQuickAccess.js';
+import { CommandsQuickAccessProvider, ShowAllCommandsAction, ClearCommandHistoryAction } from './commandsQuickAccess.js';
+import { MenuRegistry, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { KeyMod } from '../../../../base/common/keyCodes.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { inQuickPickContext, getQuickNavigateHandler } from '../../../browser/quickaccess.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
 
 //#region Quick Access Proviers
 
diff --git a/src/vs/workbench/contrib/quickaccess/browser/viewQuickAccess.ts b/src/vs/workbench/contrib/quickaccess/browser/viewQuickAccess.ts
index e234858bf6f..164b2e9821c 100644
--- a/src/vs/workbench/contrib/quickaccess/browser/viewQuickAccess.ts
+++ b/src/vs/workbench/contrib/quickaccess/browser/viewQuickAccess.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize, localize2 } from 'vs/nls';
-import { IQuickPickSeparator, IQuickInputService, ItemActivation } from 'vs/platform/quickinput/common/quickInput';
-import { IPickerQuickAccessItem, PickerQuickAccessProvider } from 'vs/platform/quickinput/browser/pickerQuickAccess';
-import { IViewDescriptorService, ViewContainer, ViewContainerLocation } from 'vs/workbench/common/views';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { IOutputService } from 'vs/workbench/services/output/common/output';
-import { ITerminalGroupService, ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { PaneCompositeDescriptor } from 'vs/workbench/browser/panecomposite';
-import { matchesFuzzy } from 'vs/base/common/filters';
-import { fuzzyContains } from 'vs/base/common/strings';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { Action2 } from 'vs/platform/actions/common/actions';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { IDebugService, REPL_VIEW_ID } from 'vs/workbench/contrib/debug/common/debug';
+import { localize, localize2 } from '../../../../nls.js';
+import { IQuickPickSeparator, IQuickInputService, ItemActivation } from '../../../../platform/quickinput/common/quickInput.js';
+import { IPickerQuickAccessItem, PickerQuickAccessProvider } from '../../../../platform/quickinput/browser/pickerQuickAccess.js';
+import { IViewDescriptorService, ViewContainer, ViewContainerLocation } from '../../../common/views.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { IOutputService } from '../../../services/output/common/output.js';
+import { ITerminalGroupService, ITerminalService } from '../../terminal/browser/terminal.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { PaneCompositeDescriptor } from '../../../browser/panecomposite.js';
+import { matchesFuzzy } from '../../../../base/common/filters.js';
+import { fuzzyContains } from '../../../../base/common/strings.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { Action2 } from '../../../../platform/actions/common/actions.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeyMod, KeyCode } from '../../../../base/common/keyCodes.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.js';
+import { IDebugService, REPL_VIEW_ID } from '../../debug/common/debug.js';
 
 interface IViewQuickPickItem extends IPickerQuickAccessItem {
 	containerLabel: string;
diff --git a/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts b/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts
index a75a1b4b09b..3cb188be749 100644
--- a/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts
+++ b/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts
@@ -3,23 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable, dispose, Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IWorkbenchContributionsRegistry, IWorkbenchContribution, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IWindowsConfiguration, IWindowSettings, TitleBarSetting, TitlebarStyle } from 'vs/platform/window/common/window';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { ConfigurationTarget, IConfigurationChangeEvent, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { localize } from 'vs/nls';
-import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { URI } from 'vs/base/common/uri';
-import { isEqual } from 'vs/base/common/resources';
-import { isMacintosh, isNative, isLinux } from 'vs/base/common/platform';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IProductService } from 'vs/platform/product/common/productService';
+import { IDisposable, dispose, Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { IWorkbenchContributionsRegistry, IWorkbenchContribution, Extensions as WorkbenchExtensions } from '../../../common/contributions.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IWindowsConfiguration, IWindowSettings, TitleBarSetting, TitlebarStyle } from '../../../../platform/window/common/window.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { ConfigurationTarget, IConfigurationChangeEvent, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { localize } from '../../../../nls.js';
+import { IWorkspaceContextService, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { URI } from '../../../../base/common/uri.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { isMacintosh, isNative, isLinux } from '../../../../base/common/platform.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IUserDataSyncEnablementService, IUserDataSyncService, SyncStatus } from '../../../../platform/userDataSync/common/userDataSync.js';
+import { IUserDataSyncWorkbenchService } from '../../../services/userDataSync/common/userDataSync.js';
 
 interface IConfiguration extends IWindowsConfiguration {
 	update?: { mode?: string };
@@ -29,6 +31,7 @@ interface IConfiguration extends IWindowsConfiguration {
 	window: IWindowSettings;
 	workbench?: { enableExperiments?: boolean };
 	_extensionsGallery?: { enablePPE?: boolean };
+	accessibility?: { verbosity?: { debug?: boolean } };
 }
 
 export class SettingsChangeRelauncher extends Disposable implements IWorkbenchContribution {
@@ -38,43 +41,63 @@ export class SettingsChangeRelauncher extends Disposable implements IWorkbenchCo
 		'window.nativeTabs',
 		'window.nativeFullScreen',
 		'window.clickThroughInactive',
+		'window.experimentalControlOverlay',
 		'update.mode',
 		'editor.accessibilitySupport',
 		'security.workspace.trust.enabled',
 		'workbench.enableExperiments',
 		'_extensionsGallery.enablePPE',
-		'security.restrictUNCAccess'
+		'security.restrictUNCAccess',
+		'accessibility.verbosity.debug'
 	];
 
 	private readonly titleBarStyle = new ChangeObserver<TitlebarStyle>('string');
 	private readonly nativeTabs = new ChangeObserver('boolean');
 	private readonly nativeFullScreen = new ChangeObserver('boolean');
 	private readonly clickThroughInactive = new ChangeObserver('boolean');
+	private readonly linuxWindowControlOverlay = new ChangeObserver('boolean');
 	private readonly updateMode = new ChangeObserver('string');
 	private accessibilitySupport: 'on' | 'off' | 'auto' | undefined;
 	private readonly workspaceTrustEnabled = new ChangeObserver('boolean');
 	private readonly experimentsEnabled = new ChangeObserver('boolean');
 	private readonly enablePPEExtensionsGallery = new ChangeObserver('boolean');
 	private readonly restrictUNCAccess = new ChangeObserver('boolean');
+	private readonly accessibilityVerbosityDebug = new ChangeObserver('boolean');
 
 	constructor(
 		@IHostService private readonly hostService: IHostService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IUserDataSyncService private readonly userDataSyncService: IUserDataSyncService,
+		@IUserDataSyncEnablementService private readonly userDataSyncEnablementService: IUserDataSyncEnablementService,
+		@IUserDataSyncWorkbenchService userDataSyncWorkbenchService: IUserDataSyncWorkbenchService,
 		@IProductService private readonly productService: IProductService,
 		@IDialogService private readonly dialogService: IDialogService
 	) {
 		super();
 
-		this.onConfigurationChange(undefined);
+		this.update(false);
 		this._register(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationChange(e)));
+		this._register(userDataSyncWorkbenchService.onDidTurnOnSync(e => this.update(true)));
 	}
 
-	private onConfigurationChange(e: IConfigurationChangeEvent | undefined): void {
+	private onConfigurationChange(e: IConfigurationChangeEvent): void {
 		if (e && !SettingsChangeRelauncher.SETTINGS.some(key => e.affectsConfiguration(key))) {
 			return;
 		}
 
+		// Skip if turning on sync is in progress
+		if (this.isTurningOnSyncInProgress()) {
+			return;
+		}
 
+		this.update(e.source !== ConfigurationTarget.DEFAULT /* do not ask to relaunch if defaults changed */);
+	}
+
+	private isTurningOnSyncInProgress(): boolean {
+		return !this.userDataSyncEnablementService.isEnabled() && this.userDataSyncService.status === SyncStatus.Syncing;
+	}
+
+	private update(askToRelaunch: boolean): void {
 		let changed = false;
 
 		function processChanged(didChange: boolean) {
@@ -96,6 +119,9 @@ export class SettingsChangeRelauncher extends Disposable implements IWorkbenchCo
 			// macOS: Click through (accept first mouse)
 			processChanged(isMacintosh && this.clickThroughInactive.handleChange(config.window?.clickThroughInactive));
 
+			// Linux: WCO
+			processChanged(isLinux && this.linuxWindowControlOverlay.handleChange(config.window?.experimentalControlOverlay));
+
 			// Update mode
 			processChanged(this.updateMode.handleChange(config.update?.mode));
 
@@ -112,6 +138,9 @@ export class SettingsChangeRelauncher extends Disposable implements IWorkbenchCo
 
 			// UNC host access restrictions
 			processChanged(this.restrictUNCAccess.handleChange(config?.security?.restrictUNCAccess));
+
+			// Debug accessibility verbosity
+			processChanged(this.accessibilityVerbosityDebug.handleChange(config?.accessibility?.verbosity?.debug));
 		}
 
 		// Experiments
@@ -120,9 +149,7 @@ export class SettingsChangeRelauncher extends Disposable implements IWorkbenchCo
 		// Profiles
 		processChanged(this.productService.quality !== 'stable' && this.enablePPEExtensionsGallery.handleChange(config._extensionsGallery?.enablePPE));
 
-		// Notify only when changed from an event and the change
-		// was not triggerd programmatically (e.g. from experiments)
-		if (changed && e && e.source !== ConfigurationTarget.DEFAULT) {
+		if (askToRelaunch && changed && this.hostService.hasFocus) {
 			this.doConfirm(
 				isNative ?
 					localize('relaunchSettingMessage', "A setting has changed that requires a restart to take effect.") :
@@ -139,11 +166,9 @@ export class SettingsChangeRelauncher extends Disposable implements IWorkbenchCo
 	}
 
 	private async doConfirm(message: string, detail: string, primaryButton: string, confirmedFn: () => void): Promise<void> {
-		if (this.hostService.hasFocus) {
-			const { confirmed } = await this.dialogService.confirm({ message, detail, primaryButton });
-			if (confirmed) {
-				confirmedFn();
-			}
+		const { confirmed } = await this.dialogService.confirm({ message, detail, primaryButton });
+		if (confirmed) {
+			confirmedFn();
 		}
 	}
 }
diff --git a/src/vs/workbench/contrib/remote/browser/explorerViewItems.ts b/src/vs/workbench/contrib/remote/browser/explorerViewItems.ts
index 1951afb77ba..4746a7653aa 100644
--- a/src/vs/workbench/contrib/remote/browser/explorerViewItems.ts
+++ b/src/vs/workbench/contrib/remote/browser/explorerViewItems.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { IRemoteExplorerService, REMOTE_EXPLORER_TYPE_KEY } from 'vs/workbench/services/remote/common/remoteExplorerService';
-import { ISelectOptionItem } from 'vs/base/browser/ui/selectBox/selectBox';
-import { IViewDescriptor } from 'vs/workbench/common/views';
-import { isStringArray } from 'vs/base/common/types';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
-import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { Action2, MenuId, MenuRegistry, registerAction2 } from 'vs/platform/actions/common/actions';
-import { VIEWLET_ID } from 'vs/workbench/contrib/remote/browser/remoteExplorer';
-import { getVirtualWorkspaceLocation } from 'vs/platform/workspace/common/virtualWorkspace';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { Disposable, DisposableMap } from 'vs/base/common/lifecycle';
+import * as nls from '../../../../nls.js';
+import { IRemoteExplorerService, REMOTE_EXPLORER_TYPE_KEY } from '../../../services/remote/common/remoteExplorerService.js';
+import { ISelectOptionItem } from '../../../../base/browser/ui/selectBox/selectBox.js';
+import { IViewDescriptor } from '../../../common/views.js';
+import { isStringArray } from '../../../../base/common/types.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { IStorageService, StorageScope } from '../../../../platform/storage/common/storage.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { Action2, MenuId, MenuRegistry, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { VIEWLET_ID } from './remoteExplorer.js';
+import { getVirtualWorkspaceLocation } from '../../../../platform/workspace/common/virtualWorkspace.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { Disposable, DisposableMap } from '../../../../base/common/lifecycle.js';
 
 interface IRemoteSelectItem extends ISelectOptionItem {
 	authority: string[];
diff --git a/src/vs/workbench/contrib/remote/browser/media/tunnelView.css b/src/vs/workbench/contrib/remote/browser/media/tunnelView.css
index 70a8ba93492..b52d115425c 100644
--- a/src/vs/workbench/contrib/remote/browser/media/tunnelView.css
+++ b/src/vs/workbench/contrib/remote/browser/media/tunnelView.css
@@ -44,6 +44,11 @@
 	margin-top: -40px;
 }
 
+.ports-view .monaco-list .monaco-list-row .ports-view-actionbar-cell .ports-view-actionbar-cell-localaddress {
+	color: var(--vscode-textLink-foreground);
+	text-decoration: var(--text-link-decoration);
+}
+
 .ports-view .monaco-list .monaco-list-row .ports-view-actionbar-cell .ports-view-actionbar-cell-localaddress:hover {
 	text-decoration: underline;
 }
diff --git a/src/vs/workbench/contrib/remote/browser/remote.contribution.ts b/src/vs/workbench/contrib/remote/browser/remote.contribution.ts
index 4689c816624..95960da2b62 100644
--- a/src/vs/workbench/contrib/remote/browser/remote.contribution.ts
+++ b/src/vs/workbench/contrib/remote/browser/remote.contribution.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IWorkbenchContributionsRegistry, WorkbenchPhase, Extensions as WorkbenchExtensions, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { ShowCandidateContribution } from 'vs/workbench/contrib/remote/browser/showCandidate';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { TunnelFactoryContribution } from 'vs/workbench/contrib/remote/browser/tunnelFactory';
-import { RemoteAgentConnectionStatusListener, RemoteMarkers } from 'vs/workbench/contrib/remote/browser/remote';
-import { RemoteStatusIndicator } from 'vs/workbench/contrib/remote/browser/remoteIndicator';
-import { AutomaticPortForwarding, ForwardedPortsView, PortRestore } from 'vs/workbench/contrib/remote/browser/remoteExplorer';
-import { InitialRemoteConnectionHealthContribution } from 'vs/workbench/contrib/remote/browser/remoteConnectionHealth';
+import { IWorkbenchContributionsRegistry, WorkbenchPhase, Extensions as WorkbenchExtensions, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { ShowCandidateContribution } from './showCandidate.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { TunnelFactoryContribution } from './tunnelFactory.js';
+import { RemoteAgentConnectionStatusListener, RemoteMarkers } from './remote.js';
+import { RemoteStatusIndicator } from './remoteIndicator.js';
+import { AutomaticPortForwarding, ForwardedPortsView, PortRestore } from './remoteExplorer.js';
+import { InitialRemoteConnectionHealthContribution } from './remoteConnectionHealth.js';
 
 const workbenchContributionsRegistry = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
 registerWorkbenchContribution2(ShowCandidateContribution.ID, ShowCandidateContribution, WorkbenchPhase.BlockRestore);
diff --git a/src/vs/workbench/contrib/remote/browser/remote.ts b/src/vs/workbench/contrib/remote/browser/remote.ts
index 13ee310b79c..631812de9d5 100644
--- a/src/vs/workbench/contrib/remote/browser/remote.ts
+++ b/src/vs/workbench/contrib/remote/browser/remote.ts
@@ -3,58 +3,58 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/remoteViewlet';
-import * as nls from 'vs/nls';
-import * as dom from 'vs/base/browser/dom';
-import { URI } from 'vs/base/common/uri';
-import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IExtensionService, isProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
-import { FilterViewPaneContainer } from 'vs/workbench/browser/parts/views/viewsViewlet';
-import { VIEWLET_ID } from 'vs/workbench/contrib/remote/browser/remoteExplorer';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IViewDescriptor, IViewsRegistry, Extensions, ViewContainerLocation, IViewContainersRegistry, IViewDescriptorService } from 'vs/workbench/common/views';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IExtensionDescription, IRelaxedExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IProgress, IProgressStep, IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { ReconnectionWaitEvent, PersistentConnectionEventType } from 'vs/platform/remote/common/remoteAgentConnection';
-import Severity from 'vs/base/common/severity';
-import { ReloadWindowAction } from 'vs/workbench/browser/actions/windowActions';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { SwitchRemoteViewItem } from 'vs/workbench/contrib/remote/browser/explorerViewItems';
-import { isStringArray } from 'vs/base/common/types';
-import { HelpInformation, IRemoteExplorerService } from 'vs/workbench/services/remote/common/remoteExplorerService';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPane';
-import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { ITreeRenderer, ITreeNode, IAsyncDataSource } from 'vs/base/browser/ui/tree/tree';
-import { WorkbenchAsyncDataTree } from 'vs/platform/list/browser/listService';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { Event, Emitter } from 'vs/base/common/event';
-import { IExtensionPointUser } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import * as icons from 'vs/workbench/contrib/remote/browser/remoteIcons';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ITimerService } from 'vs/workbench/services/timer/browser/timerService';
-import { getRemoteName } from 'vs/platform/remote/common/remoteHosts';
-import { getVirtualWorkspaceLocation } from 'vs/platform/workspace/common/virtualWorkspace';
-import { IWalkthroughsService } from 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService';
-import { Schemas } from 'vs/base/common/network';
-import { mainWindow } from 'vs/base/browser/window';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import './media/remoteViewlet.css';
+import * as nls from '../../../../nls.js';
+import * as dom from '../../../../base/browser/dom.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IExtensionService, isProposedApiEnabled } from '../../../services/extensions/common/extensions.js';
+import { FilterViewPaneContainer } from '../../../browser/parts/views/viewsViewlet.js';
+import { VIEWLET_ID } from './remoteExplorer.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IViewDescriptor, IViewsRegistry, Extensions, ViewContainerLocation, IViewContainersRegistry, IViewDescriptorService } from '../../../common/views.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IProgress, IProgressStep, IProgressService, ProgressLocation } from '../../../../platform/progress/common/progress.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { ReconnectionWaitEvent, PersistentConnectionEventType } from '../../../../platform/remote/common/remoteAgentConnection.js';
+import Severity from '../../../../base/common/severity.js';
+import { ReloadWindowAction } from '../../../browser/actions/windowActions.js';
+import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
+import { SwitchRemoteViewItem } from './explorerViewItems.js';
+import { isStringArray } from '../../../../base/common/types.js';
+import { HelpInformation, IRemoteExplorerService } from '../../../services/remote/common/remoteExplorerService.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { ViewPane, IViewPaneOptions } from '../../../browser/parts/views/viewPane.js';
+import { IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
+import { ITreeRenderer, ITreeNode, IAsyncDataSource } from '../../../../base/browser/ui/tree/tree.js';
+import { WorkbenchAsyncDataTree } from '../../../../platform/list/browser/listService.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { IExtensionPointUser } from '../../../services/extensions/common/extensionsRegistry.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import * as icons from './remoteIcons.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { ITimerService } from '../../../services/timer/browser/timerService.js';
+import { getRemoteName } from '../../../../platform/remote/common/remoteHosts.js';
+import { getVirtualWorkspaceLocation } from '../../../../platform/workspace/common/virtualWorkspace.js';
+import { IWalkthroughsService } from '../../welcomeGettingStarted/browser/gettingStartedService.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 
 interface IViewModel {
 	onDidChangeHelpInformation: Event<void>;
@@ -290,7 +290,7 @@ abstract class HelpItemBase implements IHelpItem {
 		label: string;
 		url: string;
 		description: string;
-		extensionDescription: Readonly<IRelaxedExtensionDescription>;
+		extensionDescription: IExtensionDescription;
 	}[]> {
 		return (await Promise.all(this.values.map(async (value) => {
 			return {
@@ -419,7 +419,7 @@ class IssueReporterItem extends HelpItemBase {
 		label: string;
 		description: string;
 		url: string;
-		extensionDescription: Readonly<IRelaxedExtensionDescription>;
+		extensionDescription: IExtensionDescription;
 	}[]> {
 		return Promise.all(this.values.map(async (value) => {
 			return {
@@ -799,8 +799,8 @@ export class RemoteAgentConnectionStatusListener extends Disposable implements I
 		const connection = remoteAgentService.getConnection();
 		if (connection) {
 			let quickInputVisible = false;
-			quickInputService.onShow(() => quickInputVisible = true);
-			quickInputService.onHide(() => quickInputVisible = false);
+			this._register(quickInputService.onShow(() => quickInputVisible = true));
+			this._register(quickInputService.onHide(() => quickInputVisible = false));
 
 			let visibleProgress: VisibleProgress | null = null;
 			let reconnectWaitEvent: ReconnectionWaitEvent | null = null;
diff --git a/src/vs/workbench/contrib/remote/browser/remoteConnectionHealth.ts b/src/vs/workbench/contrib/remote/browser/remoteConnectionHealth.ts
index 337ed1d2560..a71bcec9350 100644
--- a/src/vs/workbench/contrib/remote/browser/remoteConnectionHealth.ts
+++ b/src/vs/workbench/contrib/remote/browser/remoteConnectionHealth.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IRemoteAgentService, remoteConnectionLatencyMeasurer } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { localize } from 'vs/nls';
-import { isWeb } from 'vs/base/common/platform';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { getRemoteName } from 'vs/platform/remote/common/remoteHosts';
-import { IBannerService } from 'vs/workbench/services/banner/browser/bannerService';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { Codicon } from 'vs/base/common/codicons';
-import Severity from 'vs/base/common/severity';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IRemoteAgentService, remoteConnectionLatencyMeasurer } from '../../../services/remote/common/remoteAgentService.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { localize } from '../../../../nls.js';
+import { isWeb } from '../../../../base/common/platform.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { getRemoteName } from '../../../../platform/remote/common/remoteHosts.js';
+import { IBannerService } from '../../../services/banner/browser/bannerService.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import Severity from '../../../../base/common/severity.js';
 
 
 const REMOTE_UNSUPPORTED_CONNECTION_CHOICE_KEY = 'remote.unsupportedConnectionChoice';
diff --git a/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts b/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts
index 39636afde89..86b499519a3 100644
--- a/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts
+++ b/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts
@@ -2,41 +2,41 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import * as nls from 'vs/nls';
-import { Disposable, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { Extensions, IViewContainersRegistry, IViewsRegistry, ViewContainer, ViewContainerLocation } from 'vs/workbench/common/views';
-import { IRemoteExplorerService, PORT_AUTO_FALLBACK_SETTING, PORT_AUTO_FORWARD_SETTING, PORT_AUTO_SOURCE_SETTING, PORT_AUTO_SOURCE_SETTING_HYBRID, PORT_AUTO_SOURCE_SETTING_OUTPUT, PORT_AUTO_SOURCE_SETTING_PROCESS, TUNNEL_VIEW_CONTAINER_ID, TUNNEL_VIEW_ID } from 'vs/workbench/services/remote/common/remoteExplorerService';
-import { Attributes, AutoTunnelSource, forwardedPortsViewEnabled, makeAddress, mapHasAddressLocalhostOrAllInterfaces, OnPortForward, Tunnel, TunnelCloseReason, TunnelSource } from 'vs/workbench/services/remote/common/tunnelModel';
-import { ForwardPortAction, OpenPortInBrowserAction, TunnelPanel, TunnelPanelDescriptor, TunnelViewModel, OpenPortInPreviewAction, openPreviewEnabledContext } from 'vs/workbench/contrib/remote/browser/tunnelView';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment } from 'vs/workbench/services/statusbar/browser/statusbar';
-import { UrlFinder } from 'vs/workbench/contrib/remote/browser/urlFinder';
-import Severity from 'vs/base/common/severity';
-import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { INotificationHandle, INotificationService, IPromptChoice } from 'vs/platform/notification/common/notification';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { IDebugService } from 'vs/workbench/contrib/debug/common/debug';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { isWeb, OperatingSystem } from 'vs/base/common/platform';
-import { ITunnelService, RemoteTunnel, TunnelPrivacyId } from 'vs/platform/tunnel/common/tunnel';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
-import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity';
-import { portsViewIcon } from 'vs/workbench/contrib/remote/browser/remoteIcons';
-import { Event } from 'vs/base/common/event';
-import { IExternalUriOpenerService } from 'vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IWorkbenchConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
-import { IRemoteAgentEnvironment } from 'vs/platform/remote/common/remoteAgentEnvironment';
-import { Action } from 'vs/base/common/actions';
-import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
-import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
+import * as nls from '../../../../nls.js';
+import { Disposable, IDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { Extensions, IViewContainersRegistry, IViewsRegistry, ViewContainer, ViewContainerLocation } from '../../../common/views.js';
+import { IRemoteExplorerService, PORT_AUTO_FALLBACK_SETTING, PORT_AUTO_FORWARD_SETTING, PORT_AUTO_SOURCE_SETTING, PORT_AUTO_SOURCE_SETTING_HYBRID, PORT_AUTO_SOURCE_SETTING_OUTPUT, PORT_AUTO_SOURCE_SETTING_PROCESS, PortsEnablement, TUNNEL_VIEW_CONTAINER_ID, TUNNEL_VIEW_ID } from '../../../services/remote/common/remoteExplorerService.js';
+import { Attributes, AutoTunnelSource, forwardedPortsFeaturesEnabled, forwardedPortsViewEnabled, makeAddress, mapHasAddressLocalhostOrAllInterfaces, OnPortForward, Tunnel, TunnelCloseReason, TunnelSource } from '../../../services/remote/common/tunnelModel.js';
+import { ForwardPortAction, OpenPortInBrowserAction, TunnelPanel, TunnelPanelDescriptor, TunnelViewModel, OpenPortInPreviewAction, openPreviewEnabledContext } from './tunnelView.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment } from '../../../services/statusbar/browser/statusbar.js';
+import { UrlFinder } from './urlFinder.js';
+import Severity from '../../../../base/common/severity.js';
+import { ConfigurationTarget, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { INotificationHandle, INotificationService, IPromptChoice } from '../../../../platform/notification/common/notification.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { ITerminalService } from '../../terminal/browser/terminal.js';
+import { IDebugService } from '../../debug/common/debug.js';
+import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';
+import { isWeb, OperatingSystem } from '../../../../base/common/platform.js';
+import { ITunnelService, RemoteTunnel, TunnelPrivacyId } from '../../../../platform/tunnel/common/tunnel.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { ViewPaneContainer } from '../../../browser/parts/views/viewPaneContainer.js';
+import { IActivityService, NumberBadge } from '../../../services/activity/common/activity.js';
+import { portsViewIcon } from './remoteIcons.js';
+import { Event } from '../../../../base/common/event.js';
+import { IExternalUriOpenerService } from '../../externalUriOpener/common/externalUriOpenerService.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IWorkbenchConfigurationService } from '../../../services/configuration/common/configuration.js';
+import { IRemoteAgentEnvironment } from '../../../../platform/remote/common/remoteAgentEnvironment.js';
+import { Action } from '../../../../base/common/actions.js';
+import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
+import { IStorageService, StorageScope } from '../../../../platform/storage/common/storage.js';
 
 export const VIEWLET_ID = 'workbench.view.remote';
 
@@ -59,7 +59,7 @@ export class ForwardedPortsView extends Disposable implements IWorkbenchContribu
 				: nls.localize('noRemoteNoPorts', "No forwarded ports. Forward a port to access your locally running services over the internet.\n[Forward a Port]({0})", `command:${ForwardPortAction.INLINE_ID}`),
 		}));
 		this.enableBadgeAndStatusBar();
-		this.enableForwardedPortsView();
+		this.enableForwardedPortsFeatures();
 	}
 
 	private async getViewContainer(): Promise<ViewContainer | null> {
@@ -74,23 +74,28 @@ export class ForwardedPortsView extends Disposable implements IWorkbenchContribu
 		}, ViewContainerLocation.Panel);
 	}
 
-	private async enableForwardedPortsView() {
+	private async enableForwardedPortsFeatures() {
 		this.contextKeyListener.clear();
 
+		const featuresEnabled: boolean = !!forwardedPortsFeaturesEnabled.getValue(this.contextKeyService);
 		const viewEnabled: boolean = !!forwardedPortsViewEnabled.getValue(this.contextKeyService);
 
-		if (viewEnabled) {
+		if (featuresEnabled || viewEnabled) {
+			// Also enable the view if it isn't already.
+			if (!viewEnabled) {
+				this.contextKeyService.createKey(forwardedPortsViewEnabled.key, true);
+			}
 			const viewContainer = await this.getViewContainer();
 			const tunnelPanelDescriptor = new TunnelPanelDescriptor(new TunnelViewModel(this.remoteExplorerService, this.tunnelService), this.environmentService);
 			const viewsRegistry = Registry.as<IViewsRegistry>(Extensions.ViewsRegistry);
 			if (viewContainer) {
-				this.remoteExplorerService.enablePortsFeatures();
+				this.remoteExplorerService.enablePortsFeatures(!featuresEnabled);
 				viewsRegistry.registerViews([tunnelPanelDescriptor], viewContainer);
 			}
 		} else {
 			this.contextKeyListener.value = this.contextKeyService.onDidChangeContext(e => {
-				if (e.affectsSome(new Set(forwardedPortsViewEnabled.keys()))) {
-					this.enableForwardedPortsView();
+				if (e.affectsSome(new Set([...forwardedPortsFeaturesEnabled.keys(), ...forwardedPortsViewEnabled.keys()]))) {
+					this.enableForwardedPortsFeatures();
 				}
 			});
 		}
@@ -569,7 +574,7 @@ class OutputAutomaticPortForwarding extends Disposable {
 	}
 
 	private startUrlFinder() {
-		if (!this.urlFinder && !this.remoteExplorerService.portsFeaturesEnabled) {
+		if (!this.urlFinder && (this.remoteExplorerService.portsFeaturesEnabled !== PortsEnablement.AdditionalFeatures)) {
 			return;
 		}
 		this.portsFeatures?.dispose();
@@ -666,7 +671,7 @@ class ProcAutomaticPortForwarding extends Disposable {
 	}
 
 	private async startCandidateListener() {
-		if (this.candidateListener || !this.remoteExplorerService.portsFeaturesEnabled) {
+		if (this.candidateListener || (this.remoteExplorerService.portsFeaturesEnabled !== PortsEnablement.AdditionalFeatures)) {
 			return;
 		}
 		this.portsFeatures?.dispose();
diff --git a/src/vs/workbench/contrib/remote/browser/remoteIcons.ts b/src/vs/workbench/contrib/remote/browser/remoteIcons.ts
index f808ebdf9c3..5ec6654bc5c 100644
--- a/src/vs/workbench/contrib/remote/browser/remoteIcons.ts
+++ b/src/vs/workbench/contrib/remote/browser/remoteIcons.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
+import * as nls from '../../../../nls.js';
 
-import { Codicon } from 'vs/base/common/codicons';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 
 export const getStartedIcon = registerIcon('remote-explorer-get-started', Codicon.star, nls.localize('getStartedIcon', 'Getting started icon in the remote explorer view.'));
 export const documentationIcon = registerIcon('remote-explorer-documentation', Codicon.book, nls.localize('documentationIcon', 'Documentation icon in the remote explorer view.'));
diff --git a/src/vs/workbench/contrib/remote/browser/remoteIndicator.ts b/src/vs/workbench/contrib/remote/browser/remoteIndicator.ts
index 08dd88b0fae..101650b7dbd 100644
--- a/src/vs/workbench/contrib/remote/browser/remoteIndicator.ts
+++ b/src/vs/workbench/contrib/remote/browser/remoteIndicator.ts
@@ -3,56 +3,54 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { IRemoteAgentService, remoteConnectionLatencyMeasurer } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { RunOnceScheduler, retry } from 'vs/base/common/async';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { MenuId, IMenuService, MenuItemAction, MenuRegistry, registerAction2, Action2, SubmenuItemAction } from 'vs/platform/actions/common/actions';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { StatusbarAlignment, IStatusbarService, IStatusbarEntryAccessor, IStatusbarEntry } from 'vs/workbench/services/statusbar/browser/statusbar';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { ContextKeyExpr, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { Schemas } from 'vs/base/common/network';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { QuickPickItem, IQuickInputService, IQuickInputButton } from 'vs/platform/quickinput/common/quickInput';
-import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { PersistentConnectionEventType } from 'vs/platform/remote/common/remoteAgentConnection';
-import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { PlatformName, PlatformToString, isWeb, platform } from 'vs/base/common/platform';
-import { truncate } from 'vs/base/common/strings';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { getRemoteName } from 'vs/platform/remote/common/remoteHosts';
-import { getVirtualWorkspaceLocation } from 'vs/platform/workspace/common/virtualWorkspace';
-import { getCodiconAriaLabel } from 'vs/base/common/iconLabels';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ReloadWindowAction } from 'vs/workbench/browser/actions/windowActions';
-import { EXTENSION_INSTALL_SKIP_WALKTHROUGH_CONTEXT, IExtensionGalleryService, IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IExtensionsViewPaneContainer, LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID, VIEWLET_ID } from 'vs/workbench/contrib/extensions/common/extensions';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IMarkdownString, MarkdownString } from 'vs/base/common/htmlContent';
-import { RemoteNameContext, VirtualWorkspaceContext } from 'vs/workbench/common/contextkeys';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { ViewContainerLocation } from 'vs/workbench/common/views';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from 'vs/base/common/actions';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { DomEmitter } from 'vs/base/browser/event';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { infoIcon } from 'vs/workbench/contrib/extensions/browser/extensionsIcons';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { URI } from 'vs/base/common/uri';
-import { mainWindow } from 'vs/base/browser/window';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
-import { workbenchConfigurationNodeBase } from 'vs/workbench/common/configuration';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import * as nls from '../../../../nls.js';
+import { IRemoteAgentService, remoteConnectionLatencyMeasurer } from '../../../services/remote/common/remoteAgentService.js';
+import { RunOnceScheduler, retry } from '../../../../base/common/async.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { MenuId, IMenuService, MenuItemAction, MenuRegistry, registerAction2, Action2, SubmenuItemAction } from '../../../../platform/actions/common/actions.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { StatusbarAlignment, IStatusbarService, IStatusbarEntryAccessor, IStatusbarEntry } from '../../../services/statusbar/browser/statusbar.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { ContextKeyExpr, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { QuickPickItem, IQuickInputService, IQuickInputButton } from '../../../../platform/quickinput/common/quickInput.js';
+import { IBrowserWorkbenchEnvironmentService } from '../../../services/environment/browser/environmentService.js';
+import { PersistentConnectionEventType } from '../../../../platform/remote/common/remoteAgentConnection.js';
+import { IRemoteAuthorityResolverService } from '../../../../platform/remote/common/remoteAuthorityResolver.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { PlatformName, PlatformToString, isWeb, platform } from '../../../../base/common/platform.js';
+import { truncate } from '../../../../base/common/strings.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { getRemoteName } from '../../../../platform/remote/common/remoteHosts.js';
+import { getVirtualWorkspaceLocation } from '../../../../platform/workspace/common/virtualWorkspace.js';
+import { getCodiconAriaLabel } from '../../../../base/common/iconLabels.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { ReloadWindowAction } from '../../../browser/actions/windowActions.js';
+import { EXTENSION_INSTALL_SKIP_WALKTHROUGH_CONTEXT, IExtensionGalleryService, IExtensionManagementService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { IExtensionsWorkbenchService, LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID } from '../../extensions/common/extensions.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IMarkdownString, MarkdownString } from '../../../../base/common/htmlContent.js';
+import { RemoteNameContext, VirtualWorkspaceContext } from '../../../common/contextkeys.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from '../../../../base/common/actions.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { DomEmitter } from '../../../../base/browser/event.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { infoIcon } from '../../extensions/browser/extensionsIcons.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { URI } from '../../../../base/common/uri.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { workbenchConfigurationNodeBase } from '../../../common/configuration.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 
 type ActionGroup = [string, Array<MenuItemAction | SubmenuItemAction>];
 
@@ -227,13 +225,8 @@ export class RemoteStatusIndicator extends Disposable implements IWorkbenchContr
 					});
 				}
 				run = (accessor: ServicesAccessor, input: string) => {
-					const paneCompositeService = accessor.get(IPaneCompositePartService);
-					return paneCompositeService.openPaneComposite(VIEWLET_ID, ViewContainerLocation.Sidebar, true).then(viewlet => {
-						if (viewlet) {
-							(viewlet?.getViewPaneContainer() as IExtensionsViewPaneContainer).search(`@recommended:remotes`);
-							viewlet.focus();
-						}
-					});
+					const extensionsWorkbenchService = accessor.get(IExtensionsWorkbenchService);
+					return extensionsWorkbenchService.openSearch(`@recommended:remotes`);
 				};
 			}));
 		}
@@ -778,12 +771,13 @@ export class RemoteStatusIndicator extends Disposable implements IWorkbenchContr
 			return items;
 		};
 
-		const quickPick = this.quickInputService.createQuickPick();
+		const disposables = new DisposableStore();
+		const quickPick = disposables.add(this.quickInputService.createQuickPick({ useSeparators: true }));
 		quickPick.placeholder = nls.localize('remoteActions', "Select an option to open a Remote Window");
 		quickPick.items = computeItems();
 		quickPick.sortByLabel = false;
 		quickPick.canSelectMany = false;
-		Event.once(quickPick.onDidAccept)((async _ => {
+		disposables.add(Event.once(quickPick.onDidAccept)((async _ => {
 			const selectedItems = quickPick.selectedItems;
 			if (selectedItems.length === 1) {
 				const commandId = selectedItems[0].id!;
@@ -806,21 +800,20 @@ export class RemoteStatusIndicator extends Disposable implements IWorkbenchContr
 					quickPick.hide();
 				}
 			}
-		}));
+		})));
 
-		Event.once(quickPick.onDidTriggerItemButton)(async (e) => {
+		disposables.add(Event.once(quickPick.onDidTriggerItemButton)(async (e) => {
 			const remoteExtension = this.remoteExtensionMetadata.find(value => ExtensionIdentifier.equals(value.id, e.item.id));
 			if (remoteExtension) {
 				await this.openerService.open(URI.parse(remoteExtension.helpLink));
 			}
-		});
+		}));
 
 		// refresh the items when actions change
-		const legacyItemUpdater = this.legacyIndicatorMenu.onDidChange(() => quickPick.items = computeItems());
-		quickPick.onDidHide(legacyItemUpdater.dispose);
+		disposables.add(this.legacyIndicatorMenu.onDidChange(() => quickPick.items = computeItems()));
+		disposables.add(this.remoteIndicatorMenu.onDidChange(() => quickPick.items = computeItems()));
 
-		const itemUpdater = this.remoteIndicatorMenu.onDidChange(() => quickPick.items = computeItems());
-		quickPick.onDidHide(itemUpdater.dispose);
+		disposables.add(quickPick.onDidHide(() => disposables.dispose()));
 
 		if (!this.remoteMetadataInitialized) {
 			quickPick.busy = true;
diff --git a/src/vs/workbench/contrib/remote/browser/remoteStartEntry.contribution.ts b/src/vs/workbench/contrib/remote/browser/remoteStartEntry.contribution.ts
index b8acd882e8e..237bb52c983 100644
--- a/src/vs/workbench/contrib/remote/browser/remoteStartEntry.contribution.ts
+++ b/src/vs/workbench/contrib/remote/browser/remoteStartEntry.contribution.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { RemoteStartEntry } from 'vs/workbench/contrib/remote/browser/remoteStartEntry';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry } from '../../../common/contributions.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { RemoteStartEntry } from './remoteStartEntry.js';
 
 Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench)
 	.registerWorkbenchContribution(RemoteStartEntry, LifecyclePhase.Restored);
diff --git a/src/vs/workbench/contrib/remote/browser/remoteStartEntry.ts b/src/vs/workbench/contrib/remote/browser/remoteStartEntry.ts
index 551a983f173..c21a608a5ae 100644
--- a/src/vs/workbench/contrib/remote/browser/remoteStartEntry.ts
+++ b/src/vs/workbench/contrib/remote/browser/remoteStartEntry.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { IWorkbenchExtensionEnablementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from 'vs/base/common/actions';
+import * as nls from '../../../../nls.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { IExtensionManagementService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { IWorkbenchExtensionEnablementService } from '../../../services/extensionManagement/common/extensionManagement.js';
+import { IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from '../../../../base/common/actions.js';
 
 export const showStartEntryInWeb = new RawContextKey<boolean>('showRemoteStartEntryInWeb', false);
 export class RemoteStartEntry extends Disposable implements IWorkbenchContribution {
diff --git a/src/vs/workbench/contrib/remote/browser/showCandidate.ts b/src/vs/workbench/contrib/remote/browser/showCandidate.ts
index fdb6c6ee007..d9bd79c17a0 100644
--- a/src/vs/workbench/contrib/remote/browser/showCandidate.ts
+++ b/src/vs/workbench/contrib/remote/browser/showCandidate.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { IRemoteExplorerService } from 'vs/workbench/services/remote/common/remoteExplorerService';
-import { CandidatePort } from 'vs/workbench/services/remote/common/tunnelModel';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IBrowserWorkbenchEnvironmentService } from '../../../services/environment/browser/environmentService.js';
+import { IRemoteExplorerService } from '../../../services/remote/common/remoteExplorerService.js';
+import { CandidatePort } from '../../../services/remote/common/tunnelModel.js';
 
 export class ShowCandidateContribution extends Disposable implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/contrib/remote/browser/tunnelFactory.ts b/src/vs/workbench/contrib/remote/browser/tunnelFactory.ts
index 0447f1a07b7..e739e27f5e1 100644
--- a/src/vs/workbench/contrib/remote/browser/tunnelFactory.ts
+++ b/src/vs/workbench/contrib/remote/browser/tunnelFactory.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { ITunnelService, TunnelOptions, RemoteTunnel, TunnelCreationOptions, ITunnel, TunnelProtocol, TunnelPrivacyId } from 'vs/platform/tunnel/common/tunnel';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { URI } from 'vs/base/common/uri';
-import { IRemoteExplorerService } from 'vs/workbench/services/remote/common/remoteExplorerService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { forwardedPortsViewEnabled } from 'vs/workbench/services/remote/common/tunnelModel';
+import * as nls from '../../../../nls.js';
+import { ITunnelService, TunnelOptions, RemoteTunnel, TunnelCreationOptions, ITunnel, TunnelProtocol, TunnelPrivacyId } from '../../../../platform/tunnel/common/tunnel.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IBrowserWorkbenchEnvironmentService } from '../../../services/environment/browser/environmentService.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IRemoteExplorerService } from '../../../services/remote/common/remoteExplorerService.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { forwardedPortsFeaturesEnabled } from '../../../services/remote/common/tunnelModel.js';
 
 export class TunnelFactoryContribution extends Disposable implements IWorkbenchContribution {
 
@@ -31,7 +31,7 @@ export class TunnelFactoryContribution extends Disposable implements IWorkbenchC
 		const tunnelFactory = environmentService.options?.tunnelProvider?.tunnelFactory;
 		if (tunnelFactory) {
 			// At this point we clearly want the ports view/features since we have a tunnel factory
-			contextKeyService.createKey(forwardedPortsViewEnabled.key, true);
+			contextKeyService.createKey(forwardedPortsFeaturesEnabled.key, true);
 			let privacyOptions = environmentService.options?.tunnelProvider?.features?.privacyOptions ?? [];
 			if (environmentService.options?.tunnelProvider?.features?.public
 				&& (privacyOptions.length === 0)) {
diff --git a/src/vs/workbench/contrib/remote/browser/tunnelView.ts b/src/vs/workbench/contrib/remote/browser/tunnelView.ts
index aa8ce0ff514..3ea82ad3a41 100644
--- a/src/vs/workbench/contrib/remote/browser/tunnelView.ts
+++ b/src/vs/workbench/contrib/remote/browser/tunnelView.ts
@@ -3,61 +3,61 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/tunnelView';
-import * as nls from 'vs/nls';
-import * as dom from 'vs/base/browser/dom';
-import { IViewDescriptor, IEditableData, IViewDescriptorService } from 'vs/workbench/common/views';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IContextKeyService, IContextKey, RawContextKey, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IQuickInputService, IQuickPickItem, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
-import { ICommandService, ICommandHandler, CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { Event } from 'vs/base/common/event';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { Disposable, IDisposable, toDisposable, dispose, DisposableStore } from 'vs/base/common/lifecycle';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { IconLabel } from 'vs/base/browser/ui/iconLabel/iconLabel';
-import { ActionRunner, IAction } from 'vs/base/common/actions';
-import { IMenuService, MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
-import { ILocalizedString } from 'vs/platform/action/common/action';
-import { createAndFillInActionBarActions, createActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IRemoteExplorerService, TunnelType, ITunnelItem, TUNNEL_VIEW_ID, TunnelEditId } from 'vs/workbench/services/remote/common/remoteExplorerService';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { InputBox, MessageType } from 'vs/base/browser/ui/inputbox/inputBox';
-import { createSingleCallFunction } from 'vs/base/common/functional';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPane';
-import { URI } from 'vs/base/common/uri';
-import { isAllInterfaces, isLocalhost, ITunnelService, RemoteTunnel, TunnelPrivacyId, TunnelProtocol } from 'vs/platform/tunnel/common/tunnel';
-import { TunnelPrivacy } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { ActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { copyAddressIcon, forwardedPortWithoutProcessIcon, forwardedPortWithProcessIcon, forwardPortIcon, labelPortIcon, openBrowserIcon, openPreviewIcon, portsViewIcon, privatePortIcon, stopForwardIcon } from 'vs/workbench/contrib/remote/browser/remoteIcons';
-import { IExternalUriOpenerService } from 'vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { isMacintosh } from 'vs/base/common/platform';
-import { ITableColumn, ITableContextMenuEvent, ITableEvent, ITableMouseEvent, ITableRenderer, ITableVirtualDelegate } from 'vs/base/browser/ui/table/table';
-import { WorkbenchTable } from 'vs/platform/list/browser/listService';
-import { Button } from 'vs/base/browser/ui/button/button';
-import { registerColor } from 'vs/platform/theme/common/colorRegistry';
-import { IMarkdownString, MarkdownString } from 'vs/base/common/htmlContent';
-import { IHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate';
-import { STATUS_BAR_REMOTE_ITEM_BACKGROUND } from 'vs/workbench/common/theme';
-import { Codicon } from 'vs/base/common/codicons';
-import { defaultButtonStyles, defaultInputBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { Attributes, CandidatePort, Tunnel, TunnelCloseReason, TunnelModel, TunnelSource, forwardedPortsViewEnabled, makeAddress, mapHasAddressLocalhostOrAllInterfaces, parseAddress } from 'vs/workbench/services/remote/common/tunnelModel';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import './media/tunnelView.css';
+import * as nls from '../../../../nls.js';
+import * as dom from '../../../../base/browser/dom.js';
+import { IViewDescriptor, IEditableData, IViewDescriptorService } from '../../../common/views.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IContextMenuService, IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { IContextKeyService, IContextKey, RawContextKey, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { ConfigurationTarget, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IQuickInputService, IQuickPickItem, QuickPickInput } from '../../../../platform/quickinput/common/quickInput.js';
+import { ICommandService, ICommandHandler, CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { Event } from '../../../../base/common/event.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { Disposable, IDisposable, toDisposable, dispose, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { IconLabel } from '../../../../base/browser/ui/iconLabel/iconLabel.js';
+import { ActionRunner, IAction } from '../../../../base/common/actions.js';
+import { IMenuService, MenuId, MenuRegistry } from '../../../../platform/actions/common/actions.js';
+import { ILocalizedString } from '../../../../platform/action/common/action.js';
+import { createAndFillInActionBarActions, createActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IRemoteExplorerService, TunnelType, ITunnelItem, TUNNEL_VIEW_ID, TunnelEditId } from '../../../services/remote/common/remoteExplorerService.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { InputBox, MessageType } from '../../../../base/browser/ui/inputbox/inputBox.js';
+import { createSingleCallFunction } from '../../../../base/common/functional.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { IKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { ViewPane, IViewPaneOptions } from '../../../browser/parts/views/viewPane.js';
+import { URI } from '../../../../base/common/uri.js';
+import { isAllInterfaces, isLocalhost, ITunnelService, RemoteTunnel, TunnelPrivacyId, TunnelProtocol } from '../../../../platform/tunnel/common/tunnel.js';
+import { TunnelPrivacy } from '../../../../platform/remote/common/remoteAuthorityResolver.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { ActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { copyAddressIcon, forwardedPortWithoutProcessIcon, forwardedPortWithProcessIcon, forwardPortIcon, labelPortIcon, openBrowserIcon, openPreviewIcon, portsViewIcon, privatePortIcon, stopForwardIcon } from './remoteIcons.js';
+import { IExternalUriOpenerService } from '../../externalUriOpener/common/externalUriOpenerService.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { isMacintosh } from '../../../../base/common/platform.js';
+import { ITableColumn, ITableContextMenuEvent, ITableEvent, ITableMouseEvent, ITableRenderer, ITableVirtualDelegate } from '../../../../base/browser/ui/table/table.js';
+import { WorkbenchTable } from '../../../../platform/list/browser/listService.js';
+import { Button } from '../../../../base/browser/ui/button/button.js';
+import { registerColor } from '../../../../platform/theme/common/colorRegistry.js';
+import { IMarkdownString, MarkdownString } from '../../../../base/common/htmlContent.js';
+import { IHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegate.js';
+import { STATUS_BAR_REMOTE_ITEM_BACKGROUND } from '../../../common/theme.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { defaultButtonStyles, defaultInputBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { Attributes, CandidatePort, Tunnel, TunnelCloseReason, TunnelModel, TunnelSource, forwardedPortsViewEnabled, makeAddress, mapHasAddressLocalhostOrAllInterfaces, parseAddress } from '../../../services/remote/common/tunnelModel.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 
 export const openPreviewEnabledContext = new RawContextKey<boolean>('openPreviewEnabled', false);
 
@@ -1818,10 +1818,5 @@ MenuRegistry.appendMenuItem(MenuId.TunnelLocalAddressInline, ({
 	when: isForwardedOrDetectedExpr
 }));
 
-registerColor('ports.iconRunningProcessForeground', {
-	light: STATUS_BAR_REMOTE_ITEM_BACKGROUND,
-	dark: STATUS_BAR_REMOTE_ITEM_BACKGROUND,
-	hcDark: STATUS_BAR_REMOTE_ITEM_BACKGROUND,
-	hcLight: STATUS_BAR_REMOTE_ITEM_BACKGROUND
-}, nls.localize('portWithRunningProcess.foreground', "The color of the icon for a port that has an associated running process."));
+registerColor('ports.iconRunningProcessForeground', STATUS_BAR_REMOTE_ITEM_BACKGROUND, nls.localize('portWithRunningProcess.foreground', "The color of the icon for a port that has an associated running process."));
 
diff --git a/src/vs/workbench/contrib/remote/browser/urlFinder.ts b/src/vs/workbench/contrib/remote/browser/urlFinder.ts
index e2995bb5f2d..6fec8f59774 100644
--- a/src/vs/workbench/contrib/remote/browser/urlFinder.ts
+++ b/src/vs/workbench/contrib/remote/browser/urlFinder.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ITerminalInstance, ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { IDebugService, IDebugSession, IReplElement } from 'vs/workbench/contrib/debug/common/debug';
-import { removeAnsiEscapeCodes } from 'vs/base/common/strings';
+import { ITerminalInstance, ITerminalService } from '../../terminal/browser/terminal.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
+import { IDebugService, IDebugSession, IReplElement } from '../../debug/common/debug.js';
+import { removeAnsiEscapeCodes } from '../../../../base/common/strings.js';
 
 export class UrlFinder extends Disposable {
 	/**
diff --git a/src/vs/workbench/contrib/remote/common/remote.contribution.ts b/src/vs/workbench/contrib/remote/common/remote.contribution.ts
index 446aef1fc36..f7c3020d89a 100644
--- a/src/vs/workbench/contrib/remote/common/remote.contribution.ts
+++ b/src/vs/workbench/contrib/remote/common/remote.contribution.ts
@@ -3,30 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IWorkbenchContribution, IWorkbenchContributionsRegistry, WorkbenchPhase, Extensions as WorkbenchExtensions, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { ILabelService, ResourceLabelFormatting } from 'vs/platform/label/common/label';
-import { OperatingSystem, isWeb, OS } from 'vs/base/common/platform';
-import { Schemas } from 'vs/base/common/network';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { ILoggerService } from 'vs/platform/log/common/log';
-import { localize, localize2 } from 'vs/nls';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IDialogService, IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { firstOrDefault } from 'vs/base/common/arrays';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { PersistentConnection } from 'vs/platform/remote/common/remoteAgentConnection';
-import { IDownloadService } from 'vs/platform/download/common/download';
-import { DownloadServiceChannel } from 'vs/platform/download/common/downloadIpc';
-import { RemoteLoggerChannelClient } from 'vs/platform/log/common/logIpc';
+import { IWorkbenchContribution, IWorkbenchContributionsRegistry, WorkbenchPhase, Extensions as WorkbenchExtensions, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { ILabelService, ResourceLabelFormatting } from '../../../../platform/label/common/label.js';
+import { OperatingSystem, isWeb, OS } from '../../../../base/common/platform.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';
+import { ILoggerService } from '../../../../platform/log/common/log.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IDialogService, IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { PersistentConnection } from '../../../../platform/remote/common/remoteAgentConnection.js';
+import { IDownloadService } from '../../../../platform/download/common/download.js';
+import { DownloadServiceChannel } from '../../../../platform/download/common/downloadIpc.js';
+import { RemoteLoggerChannelClient } from '../../../../platform/log/common/logIpc.js';
 
 export class LabelContribution implements IWorkbenchContribution {
 
@@ -112,7 +111,7 @@ class RemoteInvalidWorkspaceDetector extends Disposable implements IWorkbenchCon
 
 	private async validateRemoteWorkspace(): Promise<void> {
 		const workspace = this.contextService.getWorkspace();
-		const workspaceUriToStat = workspace.configuration ?? firstOrDefault(workspace.folders)?.uri;
+		const workspaceUriToStat = workspace.configuration ?? workspace.folders.at(0)?.uri;
 		if (!workspaceUriToStat) {
 			return; // only when in workspace
 		}
@@ -222,12 +221,12 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
 			},
 			'remote.autoForwardPorts': {
 				type: 'boolean',
-				markdownDescription: localize('remote.autoForwardPorts', "When enabled, new running processes are detected and ports that they listen on are automatically forwarded. Disabling this setting will not prevent all ports from being forwarded. Even when disabled, extensions will still be able to cause ports to be forwarded, and opening some URLs will still cause ports to forwarded."),
+				markdownDescription: localize('remote.autoForwardPorts', "When enabled, new running processes are detected and ports that they listen on are automatically forwarded. Disabling this setting will not prevent all ports from being forwarded. Even when disabled, extensions will still be able to cause ports to be forwarded, and opening some URLs will still cause ports to forwarded. Also see {0}.", '`#remote.autoForwardPortsSource#`'),
 				default: true
 			},
 			'remote.autoForwardPortsSource': {
 				type: 'string',
-				markdownDescription: localize('remote.autoForwardPortsSource', "Sets the source from which ports are automatically forwarded when {0} is true. On Windows and macOS remotes, the `process` and `hybrid` options have no effect and `output` will be used.", '`#remote.autoForwardPorts#`'),
+				markdownDescription: localize('remote.autoForwardPortsSource', "Sets the source from which ports are automatically forwarded when {0} is true. When {0} is false, {1} will be used to find information about ports that have already been forwarded. On Windows and macOS remotes, the `process` and `hybrid` options have no effect and `output` will be used.", '`#remote.autoForwardPorts#`', '`#remote.autoForwardPortsSource#`'),
 				enum: ['process', 'output', 'hybrid'],
 				enumDescriptions: [
 					localize('remote.autoForwardPortsSource.process', "Ports will be automatically forwarded when discovered by watching for processes that are started and include a port."),
diff --git a/src/vs/workbench/contrib/remote/electron-sandbox/remote.contribution.ts b/src/vs/workbench/contrib/remote/electron-sandbox/remote.contribution.ts
index 735d5d3b5f9..2050b67a921 100644
--- a/src/vs/workbench/contrib/remote/electron-sandbox/remote.contribution.ts
+++ b/src/vs/workbench/contrib/remote/electron-sandbox/remote.contribution.ts
@@ -3,33 +3,33 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IRemoteAgentService, remoteConnectionLatencyMeasurer } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { isMacintosh, isWindows } from 'vs/base/common/platform';
-import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes';
-import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { IWorkbenchContribution, IWorkbenchContributionsRegistry, WorkbenchPhase, Extensions as WorkbenchContributionsExtensions, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { ILifecycleService, LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { Schemas } from 'vs/base/common/network';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { ipcRenderer } from 'vs/base/parts/sandbox/electron-sandbox/globals';
-import { IDiagnosticInfoOptions, IRemoteDiagnosticInfo } from 'vs/platform/diagnostics/common/diagnostics';
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
-import { PersistentConnectionEventType } from 'vs/platform/remote/common/remoteAgentConnection';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
-import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { OpenLocalFileFolderCommand, OpenLocalFileCommand, OpenLocalFolderCommand, SaveLocalFileCommand, RemoteFileDialogContext } from 'vs/workbench/services/dialogs/browser/simpleFileDialog';
-import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { TELEMETRY_SETTING_ID } from 'vs/platform/telemetry/common/telemetry';
-import { getTelemetryLevel } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
+import * as nls from '../../../../nls.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IRemoteAgentService, remoteConnectionLatencyMeasurer } from '../../../services/remote/common/remoteAgentService.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { isMacintosh, isWindows } from '../../../../base/common/platform.js';
+import { KeyMod, KeyChord, KeyCode } from '../../../../base/common/keyCodes.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IWorkbenchContribution, IWorkbenchContributionsRegistry, WorkbenchPhase, Extensions as WorkbenchContributionsExtensions, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { ILifecycleService, LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { ipcRenderer } from '../../../../base/parts/sandbox/electron-sandbox/globals.js';
+import { IDiagnosticInfoOptions, IRemoteDiagnosticInfo } from '../../../../platform/diagnostics/common/diagnostics.js';
+import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-sandbox/environmentService.js';
+import { PersistentConnectionEventType } from '../../../../platform/remote/common/remoteAgentConnection.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { IRemoteAuthorityResolverService } from '../../../../platform/remote/common/remoteAuthorityResolver.js';
+import { OpenLocalFileFolderCommand, OpenLocalFileCommand, OpenLocalFolderCommand, SaveLocalFileCommand, RemoteFileDialogContext } from '../../../services/dialogs/browser/simpleFileDialog.js';
+import { IWorkspaceContextService, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { TELEMETRY_SETTING_ID } from '../../../../platform/telemetry/common/telemetry.js';
+import { getTelemetryLevel } from '../../../../platform/telemetry/common/telemetryUtils.js';
+import { IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 
 class RemoteAgentDiagnosticListener implements IWorkbenchContribution {
 	constructor(
diff --git a/src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts b/src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts
index 0f750170457..b716bcd1d0c 100644
--- a/src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts
+++ b/src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts
@@ -3,38 +3,38 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Action } from 'vs/base/common/actions';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { ITunnelApplicationConfig } from 'vs/base/common/product';
-import { joinPath } from 'vs/base/common/resources';
-import { isNumber, isObject, isString } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { localize, localize2 } from 'vs/nls';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { Extensions as ConfigurationExtensions, ConfigurationScope, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ILogger, ILoggerService } from 'vs/platform/log/common/log';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IProgress, IProgressService, IProgressStep, ProgressLocation } from 'vs/platform/progress/common/progress';
-import { IQuickInputService, IQuickPickItem, IQuickPickSeparator, QuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { CONFIGURATION_KEY_HOST_NAME, CONFIGURATION_KEY_PREFIX, CONFIGURATION_KEY_PREVENT_SLEEP, ConnectionInfo, INACTIVE_TUNNEL_MODE, IRemoteTunnelService, IRemoteTunnelSession, LOGGER_NAME, LOG_ID, TunnelStatus } from 'vs/platform/remoteTunnel/common/remoteTunnel';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IWorkspaceContextService, isUntitledWorkspace } from 'vs/platform/workspace/common/workspace';
-import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
-import { AuthenticationSession, IAuthenticationService } from 'vs/workbench/services/authentication/common/authentication';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IOutputService } from 'vs/workbench/services/output/common/output';
-import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
+import { Action } from '../../../../base/common/actions.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { ITunnelApplicationConfig } from '../../../../base/common/product.js';
+import { joinPath } from '../../../../base/common/resources.js';
+import { isNumber, isObject, isString } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { Extensions as ConfigurationExtensions, ConfigurationScope, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { INativeEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogger, ILoggerService } from '../../../../platform/log/common/log.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IProgress, IProgressService, IProgressStep, ProgressLocation } from '../../../../platform/progress/common/progress.js';
+import { IQuickInputService, IQuickPickItem, IQuickPickSeparator, QuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { CONFIGURATION_KEY_HOST_NAME, CONFIGURATION_KEY_PREFIX, CONFIGURATION_KEY_PREVENT_SLEEP, ConnectionInfo, INACTIVE_TUNNEL_MODE, IRemoteTunnelService, IRemoteTunnelSession, LOGGER_NAME, LOG_ID, TunnelStatus } from '../../../../platform/remoteTunnel/common/remoteTunnel.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IWorkspaceContextService, isUntitledWorkspace } from '../../../../platform/workspace/common/workspace.js';
+import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from '../../../common/contributions.js';
+import { AuthenticationSession, IAuthenticationService } from '../../../services/authentication/common/authentication.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { IOutputService } from '../../../services/output/common/output.js';
+import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
 
 export const REMOTE_TUNNEL_CATEGORY = localize2('remoteTunnel.category', 'Remote Tunnels');
 
@@ -363,19 +363,20 @@ export class RemoteTunnelWorkbenchContribution extends Disposable implements IWo
 
 	private async getAuthenticationSession(): Promise<ExistingSessionItem | undefined> {
 		const sessions = await this.getAllSessions();
-		const quickpick = this.quickInputService.createQuickPick<ExistingSessionItem | AuthenticationProviderOption | IQuickPickItem>();
+		const disposables = new DisposableStore();
+		const quickpick = disposables.add(this.quickInputService.createQuickPick<ExistingSessionItem | AuthenticationProviderOption | IQuickPickItem>({ useSeparators: true }));
 		quickpick.ok = false;
 		quickpick.placeholder = localize('accountPreference.placeholder', "Sign in to an account to enable remote access");
 		quickpick.ignoreFocusOut = true;
 		quickpick.items = await this.createQuickpickItems(sessions);
 
 		return new Promise((resolve, reject) => {
-			quickpick.onDidHide((e) => {
+			disposables.add(quickpick.onDidHide((e) => {
 				resolve(undefined);
-				quickpick.dispose();
-			});
+				disposables.dispose();
+			}));
 
-			quickpick.onDidAccept(async (e) => {
+			disposables.add(quickpick.onDidAccept(async (e) => {
 				const selection = quickpick.selectedItems[0];
 				if ('provider' in selection) {
 					const session = await this.authenticationService.createSession(selection.provider.id, selection.provider.scopes);
@@ -386,7 +387,7 @@ export class RemoteTunnelWorkbenchContribution extends Disposable implements IWo
 					resolve(undefined);
 				}
 				quickpick.hide();
-			});
+			}));
 
 			quickpick.show();
 		});
@@ -750,7 +751,7 @@ export class RemoteTunnelWorkbenchContribution extends Disposable implements IWo
 
 		return new Promise<void>((c, e) => {
 			const disposables = new DisposableStore();
-			const quickPick = this.quickInputService.createQuickPick();
+			const quickPick = this.quickInputService.createQuickPick({ useSeparators: true });
 			quickPick.placeholder = localize('manage.placeholder', 'Select a command to invoke');
 			disposables.add(quickPick);
 			const items: Array<QuickPickItem> = [];
diff --git a/src/vs/workbench/contrib/replNotebook/browser/interactiveEditor.css b/src/vs/workbench/contrib/replNotebook/browser/interactiveEditor.css
new file mode 100644
index 00000000000..b34478d5eac
--- /dev/null
+++ b/src/vs/workbench/contrib/replNotebook/browser/interactiveEditor.css
@@ -0,0 +1,21 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.interactive-editor .input-cell-container:focus-within .input-editor-container>.monaco-editor {
+	outline: solid 1px var(--vscode-notebook-focusedCellBorder);
+}
+
+.interactive-editor .input-cell-container .input-editor-container>.monaco-editor {
+	outline: solid 1px var(--vscode-notebook-inactiveFocusedCellBorder);
+}
+
+.interactive-editor .input-cell-container .input-focus-indicator {
+	top: 8px;
+}
+
+.interactive-editor .input-cell-container .monaco-editor-background,
+.interactive-editor .input-cell-container .margin-view-overlays {
+	background-color: var(--vscode-notebook-cellEditorBackground, var(--vscode-editor-background));
+}
diff --git a/src/vs/workbench/contrib/replNotebook/browser/media/interactive.css b/src/vs/workbench/contrib/replNotebook/browser/media/interactive.css
new file mode 100644
index 00000000000..f0f5cd4821e
--- /dev/null
+++ b/src/vs/workbench/contrib/replNotebook/browser/media/interactive.css
@@ -0,0 +1,36 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.interactive-editor .input-cell-container {
+	box-sizing: border-box;
+}
+
+.interactive-editor .input-cell-container .input-focus-indicator {
+	position: absolute;
+	left: 0px;
+	height: 19px;
+}
+
+.interactive-editor .input-cell-container .input-focus-indicator::before {
+	border-left: 3px solid transparent;
+	border-radius: 2px;
+	margin-left: 4px;
+	content: "";
+	position: absolute;
+	width: 0px;
+	height: 100%;
+	z-index: 10;
+	left: 0px;
+	top: 0px;
+	height: 100%;
+}
+
+.interactive-editor .input-cell-container .run-button-container {
+	position: absolute;
+}
+
+.interactive-editor .input-cell-container .run-button-container .monaco-toolbar .actions-container {
+	justify-content: center;
+}
diff --git a/src/vs/workbench/contrib/replNotebook/browser/repl.contribution.ts b/src/vs/workbench/contrib/replNotebook/browser/repl.contribution.ts
new file mode 100644
index 00000000000..d07f9c9447c
--- /dev/null
+++ b/src/vs/workbench/contrib/replNotebook/browser/repl.contribution.ts
@@ -0,0 +1,354 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { EditorPaneDescriptor, IEditorPaneRegistry } from '../../../browser/editor.js';
+import { EditorExtensions, IEditorControl, IEditorFactoryRegistry, IEditorSerializer } from '../../../common/editor.js';
+import { parse } from '../../../../base/common/marshalling.js';
+import { assertType } from '../../../../base/common/types.js';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { CellEditType, CellKind, NotebookSetting, NotebookWorkingCopyTypeIdentifier, REPL_EDITOR_ID } from '../../notebook/common/notebookCommon.js';
+import { NotebookEditorInputOptions } from '../../notebook/common/notebookEditorInput.js';
+import { isReplEditorControl, ReplEditor, ReplEditorControl } from './replEditor.js';
+import { ReplEditorInput } from './replEditorInput.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IWorkingCopyIdentifier } from '../../../services/workingCopy/common/workingCopy.js';
+import { IWorkingCopyEditorHandler, IWorkingCopyEditorService } from '../../../services/workingCopy/common/workingCopyEditorService.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { INotebookService } from '../../notebook/common/notebookService.js';
+import { IEditorResolverService, RegisteredEditorPriority } from '../../../services/editor/common/editorResolverService.js';
+import { INotebookEditorModelResolverService } from '../../notebook/common/notebookEditorModelResolverService.js';
+import { isFalsyOrWhitespace } from '../../../../base/common/strings.js';
+import { IBulkEditService } from '../../../../editor/browser/services/bulkEditService.js';
+import { CodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../../../../editor/common/languages/modesRegistry.js';
+import { ResourceNotebookCellEdit } from '../../bulkEdit/browser/bulkCellEdits.js';
+import { IInteractiveHistoryService } from '../../interactive/browser/interactiveHistoryService.js';
+import { NotebookEditorWidget } from '../../notebook/browser/notebookEditorWidget.js';
+import { INotebookEditorService } from '../../notebook/browser/services/notebookEditorService.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { getReplView } from '../../debug/browser/repl.js';
+import { REPL_VIEW_ID } from '../../debug/common/debug.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { localize2 } from '../../../../nls.js';
+import { NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT } from '../../notebook/browser/controller/coreActions.js';
+import * as icons from '../../notebook/browser/notebookIcons.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { INotebookEditorOptions } from '../../notebook/browser/notebookBrowser.js';
+import { InlineChatController } from '../../inlineChat/browser/inlineChatController.js';
+import { ReplEditorAccessibilityHelp } from './replEditorAccessibilityHelp.js';
+import { AccessibleViewRegistry } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
+
+type SerializedNotebookEditorData = { resource: URI; preferredResource: URI; viewType: string; options?: NotebookEditorInputOptions; label?: string };
+class ReplEditorSerializer implements IEditorSerializer {
+	canSerialize(input: EditorInput): boolean {
+		return input.typeId === ReplEditorInput.ID;
+	}
+	serialize(input: EditorInput): string {
+		assertType(input instanceof ReplEditorInput);
+		const data: SerializedNotebookEditorData = {
+			resource: input.resource,
+			preferredResource: input.preferredResource,
+			viewType: input.viewType,
+			options: input.options,
+			label: input.getName()
+		};
+		return JSON.stringify(data);
+	}
+	deserialize(instantiationService: IInstantiationService, raw: string) {
+		const data = <SerializedNotebookEditorData>parse(raw);
+		if (!data) {
+			return undefined;
+		}
+		const { resource, viewType } = data;
+		if (!data || !URI.isUri(resource) || typeof viewType !== 'string') {
+			return undefined;
+		}
+
+		const input = instantiationService.createInstance(ReplEditorInput, resource, data.label);
+		return input;
+	}
+}
+
+Registry.as<IEditorPaneRegistry>(EditorExtensions.EditorPane).registerEditorPane(
+	EditorPaneDescriptor.create(
+		ReplEditor,
+		REPL_EDITOR_ID,
+		'REPL Editor'
+	),
+	[
+		new SyncDescriptor(ReplEditorInput)
+	]
+);
+
+Registry.as<IEditorFactoryRegistry>(EditorExtensions.EditorFactory).registerEditorSerializer(
+	ReplEditorInput.ID,
+	ReplEditorSerializer
+);
+
+export class ReplDocumentContribution extends Disposable implements IWorkbenchContribution {
+
+	static readonly ID = 'workbench.contrib.replDocument';
+
+	constructor(
+		@INotebookService notebookService: INotebookService,
+		@IEditorResolverService editorResolverService: IEditorResolverService,
+		@INotebookEditorModelResolverService private readonly notebookEditorModelResolverService: INotebookEditorModelResolverService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IConfigurationService private readonly configurationService: IConfigurationService
+	) {
+		super();
+
+		editorResolverService.registerEditor(
+			// don't match anything, we don't need to support re-opening files as REPL editor at this point
+			` `,
+			{
+				id: 'repl',
+				label: 'repl Editor',
+				priority: RegisteredEditorPriority.option
+			},
+			{
+				// We want to support all notebook types which could have any file extension,
+				// so we just check if the resource corresponds to a notebook
+				canSupportResource: uri => notebookService.getNotebookTextModel(uri) !== undefined,
+				singlePerResource: true
+			},
+			{
+				createUntitledEditorInput: async ({ resource, options }) => {
+					const scratchpad = this.configurationService.getValue<boolean>(NotebookSetting.InteractiveWindowPromptToSave) !== true;
+					const ref = await this.notebookEditorModelResolverService.resolve({ untitledResource: resource }, 'jupyter-notebook', { scratchpad, viewType: 'repl' });
+
+					// untitled notebooks are disposed when they get saved. we should not hold a reference
+					// to such a disposed notebook and therefore dispose the reference as well
+					ref.object.notebook.onWillDispose(() => {
+						ref.dispose();
+					});
+					const label = (options as INotebookEditorOptions)?.label ?? undefined;
+					return { editor: this.instantiationService.createInstance(ReplEditorInput, resource!, label), options };
+				},
+				createEditorInput: async ({ resource, options }) => {
+					const label = (options as INotebookEditorOptions)?.label ?? undefined;
+					return { editor: this.instantiationService.createInstance(ReplEditorInput, resource, label), options };
+				}
+			}
+		);
+	}
+}
+
+class ReplWindowWorkingCopyEditorHandler extends Disposable implements IWorkbenchContribution, IWorkingCopyEditorHandler {
+
+	static readonly ID = 'workbench.contrib.replWorkingCopyEditorHandler';
+
+	constructor(
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IWorkingCopyEditorService private readonly workingCopyEditorService: IWorkingCopyEditorService,
+		@IExtensionService private readonly extensionService: IExtensionService,
+		@INotebookService private readonly notebookService: INotebookService
+	) {
+		super();
+
+		this._installHandler();
+	}
+
+	async handles(workingCopy: IWorkingCopyIdentifier) {
+		const notebookType = this._getNotebookType(workingCopy);
+		if (!notebookType) {
+			return false;
+		}
+
+		return !!notebookType && notebookType.viewType === 'repl' && await this.notebookService.canResolve(notebookType.notebookType);
+	}
+
+	isOpen(workingCopy: IWorkingCopyIdentifier, editor: EditorInput): boolean {
+		if (!this.handles(workingCopy)) {
+			return false;
+		}
+
+		return editor instanceof ReplEditorInput && isEqual(workingCopy.resource, editor.resource);
+	}
+
+	createEditor(workingCopy: IWorkingCopyIdentifier): EditorInput {
+		return this.instantiationService.createInstance(ReplEditorInput, workingCopy.resource, undefined);
+	}
+
+	private async _installHandler(): Promise<void> {
+		await this.extensionService.whenInstalledExtensionsRegistered();
+
+		this._register(this.workingCopyEditorService.registerHandler(this));
+	}
+
+	private _getNotebookType(workingCopy: IWorkingCopyIdentifier) {
+		return NotebookWorkingCopyTypeIdentifier.parse(workingCopy.typeId);
+	}
+}
+
+registerWorkbenchContribution2(ReplWindowWorkingCopyEditorHandler.ID, ReplWindowWorkingCopyEditorHandler, WorkbenchPhase.BlockRestore);
+registerWorkbenchContribution2(ReplDocumentContribution.ID, ReplDocumentContribution, WorkbenchPhase.BlockRestore);
+
+AccessibleViewRegistry.register(new ReplEditorAccessibilityHelp());
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'repl.execute',
+			title: localize2('repl.execute', 'Execute REPL input'),
+			category: 'REPL',
+			keybinding: [{
+				when: ContextKeyExpr.equals('activeEditor', 'workbench.editor.repl'),
+				primary: KeyMod.CtrlCmd | KeyCode.Enter,
+				weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
+			}, {
+				when: ContextKeyExpr.and(
+					ContextKeyExpr.equals('activeEditor', 'workbench.editor.repl'),
+					ContextKeyExpr.equals('config.interactiveWindow.executeWithShiftEnter', true)
+				),
+				primary: KeyMod.Shift | KeyCode.Enter,
+				weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
+			}, {
+				when: ContextKeyExpr.and(
+					ContextKeyExpr.equals('activeEditor', 'workbench.editor.repl'),
+					ContextKeyExpr.equals('config.interactiveWindow.executeWithShiftEnter', false)
+				),
+				primary: KeyCode.Enter,
+				weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
+			}],
+			menu: [
+				{
+					id: MenuId.ReplInputExecute
+				}
+			],
+			icon: icons.executeIcon,
+			f1: false,
+			metadata: {
+				description: 'Execute the Contents of the Input Box',
+				args: [
+					{
+						name: 'resource',
+						description: 'Interactive resource Uri',
+						isOptional: true
+					}
+				]
+			}
+		});
+	}
+
+	async run(accessor: ServicesAccessor, context?: UriComponents): Promise<void> {
+		const editorService = accessor.get(IEditorService);
+		const bulkEditService = accessor.get(IBulkEditService);
+		const historyService = accessor.get(IInteractiveHistoryService);
+		const notebookEditorService = accessor.get(INotebookEditorService);
+		let editorControl: IEditorControl | undefined;
+		if (context) {
+			const resourceUri = URI.revive(context);
+			const editors = editorService.findEditors(resourceUri);
+			for (const found of editors) {
+				if (found.editor.typeId === ReplEditorInput.ID) {
+					const editor = await editorService.openEditor(found.editor, found.groupId);
+					editorControl = editor?.getControl();
+					break;
+				}
+			}
+		}
+		else {
+			editorControl = editorService.activeEditorPane?.getControl() as { notebookEditor: NotebookEditorWidget | undefined; codeEditor: CodeEditorWidget } | undefined;
+		}
+
+		if (isReplEditorControl(editorControl)) {
+			executeReplInput(bulkEditService, historyService, notebookEditorService, editorControl);
+		}
+	}
+});
+
+async function executeReplInput(
+	bulkEditService: IBulkEditService,
+	historyService: IInteractiveHistoryService,
+	notebookEditorService: INotebookEditorService,
+	editorControl: ReplEditorControl) {
+
+	if (editorControl && editorControl.notebookEditor && editorControl.activeCodeEditor) {
+		const notebookDocument = editorControl.notebookEditor.textModel;
+		const textModel = editorControl.activeCodeEditor.getModel();
+		const activeKernel = editorControl.notebookEditor.activeKernel;
+		const language = activeKernel?.supportedLanguages[0] ?? PLAINTEXT_LANGUAGE_ID;
+
+		if (notebookDocument && textModel) {
+			const index = notebookDocument.length - 1;
+			const value = textModel.getValue();
+
+			if (isFalsyOrWhitespace(value)) {
+				return;
+			}
+
+			// Just accept any existing inline chat hunk
+			const ctrl = InlineChatController.get(editorControl.activeCodeEditor);
+			if (ctrl) {
+				ctrl.acceptHunk();
+			}
+
+			historyService.replaceLast(notebookDocument.uri, value);
+			historyService.addToHistory(notebookDocument.uri, '');
+			textModel.setValue('');
+			notebookDocument.cells[index].resetTextBuffer(textModel.getTextBuffer());
+
+			const collapseState = editorControl.notebookEditor.notebookOptions.getDisplayOptions().interactiveWindowCollapseCodeCells === 'fromEditor' ?
+				{
+					inputCollapsed: false,
+					outputCollapsed: false
+				} :
+				undefined;
+
+			await bulkEditService.apply([
+				new ResourceNotebookCellEdit(notebookDocument.uri,
+					{
+						editType: CellEditType.Replace,
+						index: index,
+						count: 0,
+						cells: [{
+							cellKind: CellKind.Code,
+							mime: undefined,
+							language,
+							source: value,
+							outputs: [],
+							metadata: {},
+							collapseState
+						}]
+					}
+				)
+			]);
+
+			// reveal the cell into view first
+			const range = { start: index, end: index + 1 };
+			editorControl.notebookEditor.revealCellRangeInView(range);
+			await editorControl.notebookEditor.executeNotebookCells(editorControl.notebookEditor.getCellsInRange({ start: index, end: index + 1 }));
+
+			// update the selection and focus in the extension host model
+			const editor = notebookEditorService.getNotebookEditor(editorControl.notebookEditor.getId());
+			if (editor) {
+				editor.setSelections([range]);
+				editor.setFocus(range);
+			}
+		}
+	}
+}
+
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: 'list.find.replInputFocus',
+	weight: KeybindingWeight.WorkbenchContrib + 1,
+	when: ContextKeyExpr.equals('view', REPL_VIEW_ID),
+	primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyF,
+	secondary: [KeyCode.F3],
+	handler: (accessor) => {
+		getReplView(accessor.get(IViewsService))?.openFind();
+	}
+});
diff --git a/src/vs/workbench/contrib/replNotebook/browser/replEditor.ts b/src/vs/workbench/contrib/replNotebook/browser/replEditor.ts
new file mode 100644
index 00000000000..1a2349e46a4
--- /dev/null
+++ b/src/vs/workbench/contrib/replNotebook/browser/replEditor.ts
@@ -0,0 +1,725 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import './media/interactive.css';
+import * as DOM from '../../../../base/browser/dom.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { CodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { ICodeEditorViewState, ICompositeCodeEditor } from '../../../../editor/common/editorCommon.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { EditorPane } from '../../../browser/parts/editor/editorPane.js';
+import { EditorPaneSelectionChangeReason, IEditorMemento, IEditorOpenContext, IEditorPaneScrollPosition, IEditorPaneSelectionChangeEvent, IEditorPaneWithScrolling } from '../../../common/editor.js';
+import { getSimpleEditorOptions } from '../../codeEditor/browser/simpleEditorOptions.js';
+import { ICellViewModel, INotebookEditorOptions, INotebookEditorViewState } from '../../notebook/browser/notebookBrowser.js';
+import { NotebookEditorExtensionsRegistry } from '../../notebook/browser/notebookEditorExtensions.js';
+import { IBorrowValue, INotebookEditorService } from '../../notebook/browser/services/notebookEditorService.js';
+import { getDefaultNotebookCreationOptions, NotebookEditorWidget } from '../../notebook/browser/notebookEditorWidget.js';
+import { GroupsOrder, IEditorGroup, IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { ExecutionStateCellStatusBarContrib, TimerCellStatusBarContrib } from '../../notebook/browser/contrib/cellStatusBar/executionStatusBarItemController.js';
+import { INotebookKernelService } from '../../notebook/common/notebookKernelService.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { IMenuService, MenuId } from '../../../../platform/actions/common/actions.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { InteractiveWindowSetting, INTERACTIVE_INPUT_CURSOR_BOUNDARY } from '../../interactive/browser/interactiveCommon.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { NotebookOptions } from '../../notebook/browser/notebookOptions.js';
+import { ToolBar } from '../../../../base/browser/ui/toolbar/toolbar.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { createActionViewItem, createAndFillInActionBarActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IAction } from '../../../../base/common/actions.js';
+import { EditorExtensionsRegistry } from '../../../../editor/browser/editorExtensions.js';
+import { SelectionClipboardContributionID } from '../../codeEditor/browser/selectionClipboard.js';
+import { ContextMenuController } from '../../../../editor/contrib/contextmenu/browser/contextmenu.js';
+import { SuggestController } from '../../../../editor/contrib/suggest/browser/suggestController.js';
+import { MarkerController } from '../../../../editor/contrib/gotoError/browser/gotoError.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { ITextEditorOptions, TextEditorSelectionSource } from '../../../../platform/editor/common/editor.js';
+import { INotebookExecutionStateService, NotebookExecutionType } from '../../notebook/common/notebookExecutionStateService.js';
+import { NOTEBOOK_KERNEL } from '../../notebook/common/notebookContextKeys.js';
+import { ICursorPositionChangedEvent } from '../../../../editor/common/cursorEvents.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { NotebookFindContrib } from '../../notebook/browser/contrib/find/notebookFindWidget.js';
+import { REPL_EDITOR_ID } from '../../notebook/common/notebookCommon.js';
+import './interactiveEditor.css';
+import { IEditorOptions } from '../../../../editor/common/config/editorOptions.js';
+import { deepClone } from '../../../../base/common/objects.js';
+import { GlyphHoverController } from '../../../../editor/contrib/hover/browser/glyphHoverController.js';
+import { ContentHoverController } from '../../../../editor/contrib/hover/browser/contentHoverController.js';
+import { ReplEditorInput } from './replEditorInput.js';
+import { ReplInputHintContentWidget } from '../../interactive/browser/replInputHintContentWidget.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+
+const INTERACTIVE_EDITOR_VIEW_STATE_PREFERENCE_KEY = 'InteractiveEditorViewState';
+
+const INPUT_CELL_VERTICAL_PADDING = 8;
+const INPUT_CELL_HORIZONTAL_PADDING_RIGHT = 10;
+const INPUT_EDITOR_PADDING = 8;
+
+export interface InteractiveEditorViewState {
+	readonly notebook?: INotebookEditorViewState;
+	readonly input?: ICodeEditorViewState | null;
+}
+
+export interface InteractiveEditorOptions extends ITextEditorOptions {
+	readonly viewState?: InteractiveEditorViewState;
+}
+
+export class ReplEditor extends EditorPane implements IEditorPaneWithScrolling {
+	private _rootElement!: HTMLElement;
+	private _styleElement!: HTMLStyleElement;
+	private _notebookEditorContainer!: HTMLElement;
+	private _notebookWidget: IBorrowValue<NotebookEditorWidget> = { value: undefined };
+	private _inputCellContainer!: HTMLElement;
+	private _inputFocusIndicator!: HTMLElement;
+	private _inputRunButtonContainer!: HTMLElement;
+	private _inputEditorContainer!: HTMLElement;
+	private _codeEditorWidget!: CodeEditorWidget;
+	private _notebookWidgetService: INotebookEditorService;
+	private _instantiationService: IInstantiationService;
+	private _languageService: ILanguageService;
+	private _contextKeyService: IContextKeyService;
+	private _configurationService: IConfigurationService;
+	private _notebookKernelService: INotebookKernelService;
+	private _keybindingService: IKeybindingService;
+	private _menuService: IMenuService;
+	private _contextMenuService: IContextMenuService;
+	private _editorGroupService: IEditorGroupsService;
+	private _extensionService: IExtensionService;
+	private readonly _widgetDisposableStore: DisposableStore = this._register(new DisposableStore());
+	private _lastLayoutDimensions?: { readonly dimension: DOM.Dimension; readonly position: DOM.IDomPosition };
+	private _editorOptions: IEditorOptions;
+	private _notebookOptions: NotebookOptions;
+	private _editorMemento: IEditorMemento<InteractiveEditorViewState>;
+	private readonly _groupListener = this._register(new MutableDisposable());
+	private _runbuttonToolbar: ToolBar | undefined;
+	private _hintElement: ReplInputHintContentWidget | undefined;
+
+	private _onDidFocusWidget = this._register(new Emitter<void>());
+	override get onDidFocus(): Event<void> { return this._onDidFocusWidget.event; }
+	private _onDidChangeSelection = this._register(new Emitter<IEditorPaneSelectionChangeEvent>());
+	readonly onDidChangeSelection = this._onDidChangeSelection.event;
+	private _onDidChangeScroll = this._register(new Emitter<void>());
+	readonly onDidChangeScroll = this._onDidChangeScroll.event;
+
+	constructor(
+		group: IEditorGroup,
+		@ITelemetryService telemetryService: ITelemetryService,
+		@IThemeService themeService: IThemeService,
+		@IStorageService storageService: IStorageService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@INotebookEditorService notebookWidgetService: INotebookEditorService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@ICodeEditorService codeEditorService: ICodeEditorService,
+		@INotebookKernelService notebookKernelService: INotebookKernelService,
+		@ILanguageService languageService: ILanguageService,
+		@IKeybindingService keybindingService: IKeybindingService,
+		@IConfigurationService configurationService: IConfigurationService,
+		@IMenuService menuService: IMenuService,
+		@IContextMenuService contextMenuService: IContextMenuService,
+		@IEditorGroupsService editorGroupService: IEditorGroupsService,
+		@ITextResourceConfigurationService textResourceConfigurationService: ITextResourceConfigurationService,
+		@INotebookExecutionStateService notebookExecutionStateService: INotebookExecutionStateService,
+		@IExtensionService extensionService: IExtensionService,
+	) {
+		super(
+			REPL_EDITOR_ID,
+			group,
+			telemetryService,
+			themeService,
+			storageService
+		);
+		this._notebookWidgetService = notebookWidgetService;
+		this._configurationService = configurationService;
+		this._notebookKernelService = notebookKernelService;
+		this._languageService = languageService;
+		this._keybindingService = keybindingService;
+		this._menuService = menuService;
+		this._contextMenuService = contextMenuService;
+		this._editorGroupService = editorGroupService;
+		this._extensionService = extensionService;
+
+		this._rootElement = DOM.$('.interactive-editor');
+		this._contextKeyService = this._register(contextKeyService.createScoped(this._rootElement));
+		this._contextKeyService.createKey('isCompositeNotebook', true);
+		this._instantiationService = this._register(instantiationService.createChild(new ServiceCollection([IContextKeyService, this._contextKeyService])));
+
+		this._editorOptions = this._computeEditorOptions();
+		this._register(this._configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration('editor') || e.affectsConfiguration('notebook')) {
+				this._editorOptions = this._computeEditorOptions();
+			}
+		}));
+		this._notebookOptions = instantiationService.createInstance(NotebookOptions, this.window, true, { cellToolbarInteraction: 'hover', globalToolbar: true, stickyScrollEnabled: false, dragAndDropEnabled: false });
+		this._editorMemento = this.getEditorMemento<InteractiveEditorViewState>(editorGroupService, textResourceConfigurationService, INTERACTIVE_EDITOR_VIEW_STATE_PREFERENCE_KEY);
+
+		this._register(this._keybindingService.onDidUpdateKeybindings(this._updateInputHint, this));
+		this._register(notebookExecutionStateService.onDidChangeExecution((e) => {
+			if (e.type === NotebookExecutionType.cell && isEqual(e.notebook, this._notebookWidget.value?.viewModel?.notebookDocument.uri)) {
+				const cell = this._notebookWidget.value?.getCellByHandle(e.cellHandle);
+				if (cell && e.changed?.state) {
+					this._scrollIfNecessary(cell);
+				}
+			}
+		}));
+	}
+
+	private get inputCellContainerHeight() {
+		return 19 + 2 + INPUT_CELL_VERTICAL_PADDING * 2 + INPUT_EDITOR_PADDING * 2;
+	}
+
+	private get inputCellEditorHeight() {
+		return 19 + INPUT_EDITOR_PADDING * 2;
+	}
+
+	protected createEditor(parent: HTMLElement): void {
+		DOM.append(parent, this._rootElement);
+		this._rootElement.style.position = 'relative';
+		this._notebookEditorContainer = DOM.append(this._rootElement, DOM.$('.notebook-editor-container'));
+		this._inputCellContainer = DOM.append(this._rootElement, DOM.$('.input-cell-container'));
+		this._inputCellContainer.style.position = 'absolute';
+		this._inputCellContainer.style.height = `${this.inputCellContainerHeight}px`;
+		this._inputFocusIndicator = DOM.append(this._inputCellContainer, DOM.$('.input-focus-indicator'));
+		this._inputRunButtonContainer = DOM.append(this._inputCellContainer, DOM.$('.run-button-container'));
+		this._setupRunButtonToolbar(this._inputRunButtonContainer);
+		this._inputEditorContainer = DOM.append(this._inputCellContainer, DOM.$('.input-editor-container'));
+		this._createLayoutStyles();
+	}
+
+	private _setupRunButtonToolbar(runButtonContainer: HTMLElement) {
+		const menu = this._register(this._menuService.createMenu(MenuId.ReplInputExecute, this._contextKeyService));
+		this._runbuttonToolbar = this._register(new ToolBar(runButtonContainer, this._contextMenuService, {
+			getKeyBinding: action => this._keybindingService.lookupKeybinding(action.id),
+			actionViewItemProvider: (action, options) => {
+				return createActionViewItem(this._instantiationService, action, options);
+			},
+			renderDropdownAsChildElement: true
+		}));
+
+		const primary: IAction[] = [];
+		const secondary: IAction[] = [];
+		const result = { primary, secondary };
+
+		createAndFillInActionBarActions(menu, { shouldForwardArgs: true }, result);
+		this._runbuttonToolbar.setActions([...primary, ...secondary]);
+	}
+
+	private _createLayoutStyles(): void {
+		this._styleElement = DOM.createStyleSheet(this._rootElement);
+		const styleSheets: string[] = [];
+
+		const {
+			codeCellLeftMargin,
+			cellRunGutter
+		} = this._notebookOptions.getLayoutConfiguration();
+		const {
+			focusIndicator
+		} = this._notebookOptions.getDisplayOptions();
+		const leftMargin = this._notebookOptions.getCellEditorContainerLeftMargin();
+
+		styleSheets.push(`
+			.interactive-editor .input-cell-container {
+				padding: ${INPUT_CELL_VERTICAL_PADDING}px ${INPUT_CELL_HORIZONTAL_PADDING_RIGHT}px ${INPUT_CELL_VERTICAL_PADDING}px ${leftMargin}px;
+			}
+		`);
+		if (focusIndicator === 'gutter') {
+			styleSheets.push(`
+				.interactive-editor .input-cell-container:focus-within .input-focus-indicator::before {
+					border-color: var(--vscode-notebook-focusedCellBorder) !important;
+				}
+				.interactive-editor .input-focus-indicator::before {
+					border-color: var(--vscode-notebook-inactiveFocusedCellBorder) !important;
+				}
+				.interactive-editor .input-cell-container .input-focus-indicator {
+					display: block;
+					top: ${INPUT_CELL_VERTICAL_PADDING}px;
+				}
+				.interactive-editor .input-cell-container {
+					border-top: 1px solid var(--vscode-notebook-inactiveFocusedCellBorder);
+				}
+			`);
+		} else {
+			// border
+			styleSheets.push(`
+				.interactive-editor .input-cell-container {
+					border-top: 1px solid var(--vscode-notebook-inactiveFocusedCellBorder);
+				}
+				.interactive-editor .input-cell-container .input-focus-indicator {
+					display: none;
+				}
+			`);
+		}
+
+		styleSheets.push(`
+			.interactive-editor .input-cell-container .run-button-container {
+				width: ${cellRunGutter}px;
+				left: ${codeCellLeftMargin}px;
+				margin-top: ${INPUT_EDITOR_PADDING - 2}px;
+			}
+		`);
+
+		this._styleElement.textContent = styleSheets.join('\n');
+	}
+
+	private _computeEditorOptions(): IEditorOptions {
+		let overrideIdentifier: string | undefined = undefined;
+		if (this._codeEditorWidget) {
+			overrideIdentifier = this._codeEditorWidget.getModel()?.getLanguageId();
+		}
+		const editorOptions = deepClone(this._configurationService.getValue<IEditorOptions>('editor', { overrideIdentifier }));
+		const editorOptionsOverride = getSimpleEditorOptions(this._configurationService);
+		const computed = Object.freeze({
+			...editorOptions,
+			...editorOptionsOverride,
+			...{
+				glyphMargin: true,
+				padding: {
+					top: INPUT_EDITOR_PADDING,
+					bottom: INPUT_EDITOR_PADDING
+				},
+				hover: {
+					enabled: true
+				}
+			}
+		});
+
+		return computed;
+	}
+
+	protected override saveState(): void {
+		this._saveEditorViewState(this.input);
+		super.saveState();
+	}
+
+	override getViewState(): InteractiveEditorViewState | undefined {
+		const input = this.input;
+		if (!(input instanceof ReplEditorInput)) {
+			return undefined;
+		}
+
+		this._saveEditorViewState(input);
+		return this._loadNotebookEditorViewState(input);
+	}
+
+	private _saveEditorViewState(input: EditorInput | undefined): void {
+		if (this._notebookWidget.value && input instanceof ReplEditorInput) {
+			if (this._notebookWidget.value.isDisposed) {
+				return;
+			}
+
+			const state = this._notebookWidget.value.getEditorViewState();
+			const editorState = this._codeEditorWidget.saveViewState();
+			this._editorMemento.saveEditorState(this.group, input.resource, {
+				notebook: state,
+				input: editorState
+			});
+		}
+	}
+
+	private _loadNotebookEditorViewState(input: ReplEditorInput): InteractiveEditorViewState | undefined {
+		const result = this._editorMemento.loadEditorState(this.group, input.resource);
+		if (result) {
+			return result;
+		}
+		// when we don't have a view state for the group/input-tuple then we try to use an existing
+		// editor for the same resource.
+		for (const group of this._editorGroupService.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE)) {
+			if (group.activeEditorPane !== this && group.activeEditorPane === this && group.activeEditor?.matches(input)) {
+				const notebook = this._notebookWidget.value?.getEditorViewState();
+				const input = this._codeEditorWidget.saveViewState();
+				return {
+					notebook,
+					input
+				};
+			}
+		}
+		return;
+	}
+
+	override async setInput(input: ReplEditorInput, options: InteractiveEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void> {
+		// there currently is a widget which we still own so
+		// we need to hide it before getting a new widget
+		this._notebookWidget.value?.onWillHide();
+
+		this._codeEditorWidget?.dispose();
+
+		this._widgetDisposableStore.clear();
+
+		this._notebookWidget = <IBorrowValue<NotebookEditorWidget>>this._instantiationService.invokeFunction(this._notebookWidgetService.retrieveWidget, this.group.id, input, {
+			isReplHistory: true,
+			isReadOnly: true,
+			contributions: NotebookEditorExtensionsRegistry.getSomeEditorContributions([
+				ExecutionStateCellStatusBarContrib.id,
+				TimerCellStatusBarContrib.id,
+				NotebookFindContrib.id
+			]),
+			menuIds: {
+				notebookToolbar: MenuId.InteractiveToolbar,
+				cellTitleToolbar: MenuId.InteractiveCellTitle,
+				cellDeleteToolbar: MenuId.InteractiveCellDelete,
+				cellInsertToolbar: MenuId.NotebookCellBetween,
+				cellTopInsertToolbar: MenuId.NotebookCellListTop,
+				cellExecuteToolbar: MenuId.InteractiveCellExecute,
+				cellExecutePrimary: undefined
+			},
+			cellEditorContributions: EditorExtensionsRegistry.getSomeEditorContributions([
+				SelectionClipboardContributionID,
+				ContextMenuController.ID,
+				ContentHoverController.ID,
+				GlyphHoverController.ID,
+				MarkerController.ID
+			]),
+			options: this._notebookOptions,
+			codeWindow: this.window
+		}, undefined, this.window);
+
+		this._codeEditorWidget = this._instantiationService.createInstance(CodeEditorWidget, this._inputEditorContainer, this._editorOptions, {
+			...{
+				isSimpleWidget: false,
+				contributions: getDefaultNotebookCreationOptions().cellEditorContributions
+			}
+		});
+
+		if (this._lastLayoutDimensions) {
+			this._notebookEditorContainer.style.height = `${this._lastLayoutDimensions.dimension.height - this.inputCellContainerHeight}px`;
+			this._notebookWidget.value!.layout(new DOM.Dimension(this._lastLayoutDimensions.dimension.width, this._lastLayoutDimensions.dimension.height - this.inputCellContainerHeight), this._notebookEditorContainer);
+			const leftMargin = this._notebookOptions.getCellEditorContainerLeftMargin();
+			const maxHeight = Math.min(this._lastLayoutDimensions.dimension.height / 2, this.inputCellEditorHeight);
+			this._codeEditorWidget.layout(this._validateDimension(this._lastLayoutDimensions.dimension.width - leftMargin - INPUT_CELL_HORIZONTAL_PADDING_RIGHT, maxHeight));
+			this._inputFocusIndicator.style.height = `${this.inputCellEditorHeight}px`;
+			this._inputCellContainer.style.top = `${this._lastLayoutDimensions.dimension.height - this.inputCellContainerHeight}px`;
+			this._inputCellContainer.style.width = `${this._lastLayoutDimensions.dimension.width}px`;
+		}
+
+		await super.setInput(input, options, context, token);
+		const model = await input.resolve();
+		if (this._runbuttonToolbar) {
+			this._runbuttonToolbar.context = input.resource;
+		}
+
+		if (model === null) {
+			throw new Error('The REPL model could not be resolved');
+		}
+
+		this._notebookWidget.value?.setParentContextKeyService(this._contextKeyService);
+
+		const viewState = options?.viewState ?? this._loadNotebookEditorViewState(input);
+		await this._extensionService.whenInstalledExtensionsRegistered();
+		await this._notebookWidget.value!.setModel(model.notebook, viewState?.notebook, undefined, 'repl');
+		model.notebook.setCellCollapseDefault(this._notebookOptions.getCellCollapseDefault());
+		this._notebookWidget.value!.setOptions({
+			isReadOnly: true
+		});
+		this._widgetDisposableStore.add(this._notebookWidget.value!.onDidResizeOutput((cvm) => {
+			this._scrollIfNecessary(cvm);
+		}));
+		this._widgetDisposableStore.add(this._notebookWidget.value!.onDidFocusWidget(() => this._onDidFocusWidget.fire()));
+		this._widgetDisposableStore.add(this._notebookOptions.onDidChangeOptions(e => {
+			if (e.compactView || e.focusIndicator) {
+				// update the styling
+				this._styleElement?.remove();
+				this._createLayoutStyles();
+			}
+
+			if (this._lastLayoutDimensions && this.isVisible()) {
+				this.layout(this._lastLayoutDimensions.dimension, this._lastLayoutDimensions.position);
+			}
+
+			if (e.interactiveWindowCollapseCodeCells) {
+				model.notebook.setCellCollapseDefault(this._notebookOptions.getCellCollapseDefault());
+			}
+		}));
+
+		const editorModel = await input.resolveInput(model.notebook);
+		this._codeEditorWidget.setModel(editorModel);
+		if (viewState?.input) {
+			this._codeEditorWidget.restoreViewState(viewState.input);
+		}
+		this._editorOptions = this._computeEditorOptions();
+		this._codeEditorWidget.updateOptions(this._editorOptions);
+
+		this._widgetDisposableStore.add(this._codeEditorWidget.onDidFocusEditorWidget(() => this._onDidFocusWidget.fire()));
+		this._widgetDisposableStore.add(this._codeEditorWidget.onDidContentSizeChange(e => {
+			if (!e.contentHeightChanged) {
+				return;
+			}
+
+			if (this._lastLayoutDimensions) {
+				this._layoutWidgets(this._lastLayoutDimensions.dimension, this._lastLayoutDimensions.position);
+			}
+		}));
+
+		this._widgetDisposableStore.add(this._codeEditorWidget.onDidChangeCursorPosition(e => this._onDidChangeSelection.fire({ reason: this._toEditorPaneSelectionChangeReason(e) })));
+		this._widgetDisposableStore.add(this._codeEditorWidget.onDidChangeModelContent(() => this._onDidChangeSelection.fire({ reason: EditorPaneSelectionChangeReason.EDIT })));
+
+
+		this._widgetDisposableStore.add(this._notebookKernelService.onDidChangeNotebookAffinity(this._syncWithKernel, this));
+		this._widgetDisposableStore.add(this._notebookKernelService.onDidChangeSelectedNotebooks(this._syncWithKernel, this));
+
+		this._widgetDisposableStore.add(this.themeService.onDidColorThemeChange(() => {
+			if (this.isVisible()) {
+				this._updateInputHint();
+			}
+		}));
+
+		this._widgetDisposableStore.add(this._codeEditorWidget.onDidChangeModelContent(() => {
+			if (this.isVisible()) {
+				this._updateInputHint();
+			}
+		}));
+
+		this._codeEditorWidget.onDidChangeModelDecorations(() => {
+			if (this.isVisible()) {
+				this._updateInputHint();
+			}
+		});
+
+		const cursorAtBoundaryContext = INTERACTIVE_INPUT_CURSOR_BOUNDARY.bindTo(this._contextKeyService);
+		if (input.resource && input.historyService.has(input.resource)) {
+			cursorAtBoundaryContext.set('top');
+		} else {
+			cursorAtBoundaryContext.set('none');
+		}
+
+		this._widgetDisposableStore.add(this._codeEditorWidget.onDidChangeCursorPosition(({ position }) => {
+			const viewModel = this._codeEditorWidget._getViewModel()!;
+			const lastLineNumber = viewModel.getLineCount();
+			const lastLineCol = viewModel.getLineLength(lastLineNumber) + 1;
+			const viewPosition = viewModel.coordinatesConverter.convertModelPositionToViewPosition(position);
+			const firstLine = viewPosition.lineNumber === 1 && viewPosition.column === 1;
+			const lastLine = viewPosition.lineNumber === lastLineNumber && viewPosition.column === lastLineCol;
+
+			if (firstLine) {
+				if (lastLine) {
+					cursorAtBoundaryContext.set('both');
+				} else {
+					cursorAtBoundaryContext.set('top');
+				}
+			} else {
+				if (lastLine) {
+					cursorAtBoundaryContext.set('bottom');
+				} else {
+					cursorAtBoundaryContext.set('none');
+				}
+			}
+		}));
+
+		this._widgetDisposableStore.add(editorModel.onDidChangeContent(() => {
+			const value = editorModel.getValue();
+			if (this.input?.resource && value !== '') {
+				const historyService = (this.input as ReplEditorInput).historyService;
+				if (!historyService.matchesCurrent(this.input.resource, value)) {
+					historyService.replaceLast(this.input.resource, value);
+				}
+			}
+		}));
+
+		this._widgetDisposableStore.add(this._notebookWidget.value!.onDidScroll(() => this._onDidChangeScroll.fire()));
+
+		this._updateInputHint();
+		this._syncWithKernel();
+	}
+
+	override setOptions(options: INotebookEditorOptions | undefined): void {
+		this._notebookWidget.value?.setOptions(options);
+		super.setOptions(options);
+	}
+
+	private _toEditorPaneSelectionChangeReason(e: ICursorPositionChangedEvent): EditorPaneSelectionChangeReason {
+		switch (e.source) {
+			case TextEditorSelectionSource.PROGRAMMATIC: return EditorPaneSelectionChangeReason.PROGRAMMATIC;
+			case TextEditorSelectionSource.NAVIGATION: return EditorPaneSelectionChangeReason.NAVIGATION;
+			case TextEditorSelectionSource.JUMP: return EditorPaneSelectionChangeReason.JUMP;
+			default: return EditorPaneSelectionChangeReason.USER;
+		}
+	}
+
+	private _cellAtBottom(cell: ICellViewModel): boolean {
+		const visibleRanges = this._notebookWidget.value?.visibleRanges || [];
+		const cellIndex = this._notebookWidget.value?.getCellIndex(cell);
+		if (cellIndex === Math.max(...visibleRanges.map(range => range.end - 1))) {
+			return true;
+		}
+		return false;
+	}
+
+	private _scrollIfNecessary(cvm: ICellViewModel) {
+		const index = this._notebookWidget.value!.getCellIndex(cvm);
+		if (index === this._notebookWidget.value!.getLength() - 1) {
+			// If we're already at the bottom or auto scroll is enabled, scroll to the bottom
+			if (this._configurationService.getValue<boolean>(InteractiveWindowSetting.interactiveWindowAlwaysScrollOnNewCell) || this._cellAtBottom(cvm)) {
+				this._notebookWidget.value!.scrollToBottom();
+			}
+		}
+	}
+
+	private _syncWithKernel() {
+		const notebook = this._notebookWidget.value?.textModel;
+		const textModel = this._codeEditorWidget.getModel();
+
+		if (notebook && textModel) {
+			const info = this._notebookKernelService.getMatchingKernel(notebook);
+			const selectedOrSuggested = info.selected
+				?? (info.suggestions.length === 1 ? info.suggestions[0] : undefined)
+				?? (info.all.length === 1 ? info.all[0] : undefined);
+
+			if (selectedOrSuggested) {
+				const language = selectedOrSuggested.supportedLanguages[0];
+				// All kernels will initially list plaintext as the supported language before they properly initialized.
+				if (language && language !== 'plaintext') {
+					const newMode = this._languageService.createById(language).languageId;
+					textModel.setLanguage(newMode);
+				}
+
+				NOTEBOOK_KERNEL.bindTo(this._contextKeyService).set(selectedOrSuggested.id);
+			}
+		}
+	}
+
+	layout(dimension: DOM.Dimension, position: DOM.IDomPosition): void {
+		this._rootElement.classList.toggle('mid-width', dimension.width < 1000 && dimension.width >= 600);
+		this._rootElement.classList.toggle('narrow-width', dimension.width < 600);
+		const editorHeightChanged = dimension.height !== this._lastLayoutDimensions?.dimension.height;
+		this._lastLayoutDimensions = { dimension, position };
+
+		if (!this._notebookWidget.value) {
+			return;
+		}
+
+		if (editorHeightChanged && this._codeEditorWidget) {
+			SuggestController.get(this._codeEditorWidget)?.cancelSuggestWidget();
+		}
+
+		this._notebookEditorContainer.style.height = `${this._lastLayoutDimensions.dimension.height - this.inputCellContainerHeight}px`;
+		this._layoutWidgets(dimension, position);
+	}
+
+	private _layoutWidgets(dimension: DOM.Dimension, position: DOM.IDomPosition) {
+		const contentHeight = this._codeEditorWidget.hasModel() ? this._codeEditorWidget.getContentHeight() : this.inputCellEditorHeight;
+		const maxHeight = Math.min(dimension.height / 2, contentHeight);
+		const leftMargin = this._notebookOptions.getCellEditorContainerLeftMargin();
+
+		const inputCellContainerHeight = maxHeight + INPUT_CELL_VERTICAL_PADDING * 2;
+		this._notebookEditorContainer.style.height = `${dimension.height - inputCellContainerHeight}px`;
+
+		this._notebookWidget.value!.layout(dimension.with(dimension.width, dimension.height - inputCellContainerHeight), this._notebookEditorContainer, position);
+		this._codeEditorWidget.layout(this._validateDimension(dimension.width - leftMargin - INPUT_CELL_HORIZONTAL_PADDING_RIGHT, maxHeight));
+		this._inputFocusIndicator.style.height = `${contentHeight}px`;
+		this._inputCellContainer.style.top = `${dimension.height - inputCellContainerHeight}px`;
+		this._inputCellContainer.style.width = `${dimension.width}px`;
+	}
+
+	private _validateDimension(width: number, height: number) {
+		return new DOM.Dimension(Math.max(0, width), Math.max(0, height));
+	}
+
+	private _hasConflictingDecoration() {
+		return Boolean(this._codeEditorWidget.getLineDecorations(1)?.find((d) =>
+			d.options.beforeContentClassName
+			|| d.options.afterContentClassName
+			|| d.options.before?.content
+			|| d.options.after?.content
+		));
+	}
+
+	private _updateInputHint(): void {
+		if (!this._codeEditorWidget) {
+			return;
+		}
+
+		const shouldHide =
+			!this._codeEditorWidget.hasModel() ||
+			this._configurationService.getValue<boolean>(InteractiveWindowSetting.showExecutionHint) === false ||
+			this._codeEditorWidget.getModel()!.getValueLength() !== 0 ||
+			this._hasConflictingDecoration();
+
+		if (!this._hintElement && !shouldHide) {
+			this._hintElement = this._instantiationService.createInstance(ReplInputHintContentWidget, this._codeEditorWidget);
+		} else if (this._hintElement && shouldHide) {
+			this._hintElement.dispose();
+			this._hintElement = undefined;
+		}
+	}
+
+	getScrollPosition(): IEditorPaneScrollPosition {
+		return {
+			scrollTop: this._notebookWidget.value?.scrollTop ?? 0,
+			scrollLeft: 0
+		};
+	}
+
+	setScrollPosition(position: IEditorPaneScrollPosition): void {
+		this._notebookWidget.value?.setScrollTop(position.scrollTop);
+	}
+
+	override focus() {
+		super.focus();
+
+		this._notebookWidget.value?.onShow();
+		this._codeEditorWidget.focus();
+	}
+
+	focusHistory() {
+		this._notebookWidget.value!.focus();
+	}
+
+	protected override setEditorVisible(visible: boolean): void {
+		super.setEditorVisible(visible);
+		this._groupListener.value = this.group.onWillCloseEditor(e => this._saveEditorViewState(e.editor));
+
+		if (!visible) {
+			this._saveEditorViewState(this.input);
+			if (this.input && this._notebookWidget.value) {
+				this._notebookWidget.value.onWillHide();
+			}
+		}
+
+		this._updateInputHint();
+	}
+
+	override clearInput() {
+		if (this._notebookWidget.value) {
+			this._saveEditorViewState(this.input);
+			this._notebookWidget.value.onWillHide();
+		}
+
+		this._codeEditorWidget?.dispose();
+
+		this._notebookWidget = { value: undefined };
+		this._widgetDisposableStore.clear();
+
+		super.clearInput();
+	}
+
+	override getControl(): ReplEditorControl & ICompositeCodeEditor {
+		return {
+			notebookEditor: this._notebookWidget.value,
+			activeCodeEditor: this.getActiveCodeEditor(),
+			onDidChangeActiveEditor: Event.None
+		};
+	}
+
+	private getActiveCodeEditor(): ICodeEditor {
+		return this._codeEditorWidget.hasWidgetFocus() || !this._notebookWidget.value?.activeCodeEditor ?
+			this._codeEditorWidget :
+			this._notebookWidget.value?.activeCodeEditor;
+	}
+}
+
+export type ReplEditorControl = { activeCodeEditor: ICodeEditor; notebookEditor: NotebookEditorWidget | undefined };
+
+export function isReplEditorControl(control: unknown): control is ReplEditorControl {
+	const candidate = control as ReplEditorControl;
+	return candidate?.activeCodeEditor instanceof CodeEditorWidget && candidate?.notebookEditor instanceof NotebookEditorWidget;
+}
diff --git a/src/vs/workbench/contrib/replNotebook/browser/replEditorAccessibilityHelp.ts b/src/vs/workbench/contrib/replNotebook/browser/replEditorAccessibilityHelp.ts
new file mode 100644
index 00000000000..b23d6492dd9
--- /dev/null
+++ b/src/vs/workbench/contrib/replNotebook/browser/replEditorAccessibilityHelp.ts
@@ -0,0 +1,53 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IAccessibleViewImplentation } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
+import { localize } from '../../../../nls.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { AccessibleViewProviderId, AccessibleViewType, AccessibleContentProvider } from '../../../../platform/accessibility/browser/accessibleView.js';
+import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IVisibleEditorPane } from '../../../common/editor.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { IS_COMPOSITE_NOTEBOOK } from '../../notebook/common/notebookContextKeys.js';
+
+export class ReplEditorAccessibilityHelp implements IAccessibleViewImplentation {
+	readonly priority = 105;
+	readonly name = 'REPL Editor';
+	readonly when = IS_COMPOSITE_NOTEBOOK;
+	readonly type: AccessibleViewType = AccessibleViewType.Help;
+	getProvider(accessor: ServicesAccessor) {
+		const activeEditor = accessor.get(ICodeEditorService).getActiveCodeEditor()
+			|| accessor.get(ICodeEditorService).getFocusedCodeEditor()
+			|| accessor.get(IEditorService).activeEditorPane;
+
+		if (!activeEditor) {
+			return;
+		}
+		return getAccessibilityHelpProvider(accessor, activeEditor);
+	}
+}
+
+function getAccessibilityHelpText(): string {
+	return [
+		localize('replEditor.overview', 'You are in a REPL Editor which contains in input box to evaluate expressions and a list of previously executed expressions and their output.'),
+		localize('replEditor.execute', 'The Execute command{0} will evaluate the expression in the input box.', '<keybinding:repl.execute>'),
+		localize('replEditor.focusHistory', 'The Focus History command{0} will move focus to the list of previously executed items.', '<keybinding:interactive.history.focus>'),
+		localize('replEditor.focusReplInput', 'The Focus Input Editor command{0} will move focus to the REPL input box.', '<keybinding:interactive.input.focus>'),
+		localize('replEditor.cellNavigation', 'The up and down arrows will also move focus between previously executed items.'),
+		localize('replEditor.focusInOutput', 'The Focus Output command{0} will set focus on the output when focused on a previously executed item.', '<keybinding:notebook.cell.focusInOutput>'),
+	].join('\n');
+}
+
+function getAccessibilityHelpProvider(accessor: ServicesAccessor, editor: ICodeEditor | IVisibleEditorPane) {
+	const helpText = getAccessibilityHelpText();
+	return new AccessibleContentProvider(
+		AccessibleViewProviderId.ReplEditor,
+		{ type: AccessibleViewType.Help },
+		() => helpText,
+		() => editor.focus(),
+		AccessibilityVerbositySettingId.ReplEditor,
+	);
+}
diff --git a/src/vs/workbench/contrib/replNotebook/browser/replEditorInput.ts b/src/vs/workbench/contrib/replNotebook/browser/replEditorInput.ts
new file mode 100644
index 00000000000..35ef8208542
--- /dev/null
+++ b/src/vs/workbench/contrib/replNotebook/browser/replEditorInput.ts
@@ -0,0 +1,160 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IReference } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IResolvedTextEditorModel, ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { EditorInputCapabilities } from '../../../common/editor.js';
+import { IInteractiveHistoryService } from '../../interactive/browser/interactiveHistoryService.js';
+import { NotebookTextModel } from '../../notebook/common/model/notebookTextModel.js';
+import { CellEditType, CellKind, NotebookSetting } from '../../notebook/common/notebookCommon.js';
+import { ICompositeNotebookEditorInput, NotebookEditorInput } from '../../notebook/common/notebookEditorInput.js';
+import { INotebookEditorModelResolverService } from '../../notebook/common/notebookEditorModelResolverService.js';
+import { INotebookService } from '../../notebook/common/notebookService.js';
+import { ICustomEditorLabelService } from '../../../services/editor/common/customEditorLabelService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { localize } from '../../../../nls.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+
+const replTabIcon = registerIcon('repl-editor-label-icon', Codicon.debugLineByLine, localize('replEditorLabelIcon', 'Icon of the REPL editor label.'));
+
+export class ReplEditorInput extends NotebookEditorInput implements ICompositeNotebookEditorInput {
+	static override ID: string = 'workbench.editorinputs.replEditorInput';
+
+	private inputModelRef: IReference<IResolvedTextEditorModel> | undefined;
+	private isScratchpad: boolean;
+	private label: string;
+	private isDisposing = false;
+
+	constructor(
+		resource: URI,
+		label: string | undefined,
+		@INotebookService _notebookService: INotebookService,
+		@INotebookEditorModelResolverService _notebookModelResolverService: INotebookEditorModelResolverService,
+		@IFileDialogService _fileDialogService: IFileDialogService,
+		@ILabelService labelService: ILabelService,
+		@IFileService fileService: IFileService,
+		@IFilesConfigurationService filesConfigurationService: IFilesConfigurationService,
+		@IExtensionService extensionService: IExtensionService,
+		@IEditorService editorService: IEditorService,
+		@ITextResourceConfigurationService textResourceConfigurationService: ITextResourceConfigurationService,
+		@ICustomEditorLabelService customEditorLabelService: ICustomEditorLabelService,
+		@IInteractiveHistoryService public readonly historyService: IInteractiveHistoryService,
+		@ITextModelService private readonly _textModelService: ITextModelService,
+		@IConfigurationService configurationService: IConfigurationService
+	) {
+		super(resource, undefined, 'jupyter-notebook', {}, _notebookService, _notebookModelResolverService, _fileDialogService, labelService, fileService, filesConfigurationService, extensionService, editorService, textResourceConfigurationService, customEditorLabelService);
+		this.isScratchpad = resource.scheme === 'untitled' && configurationService.getValue<boolean>(NotebookSetting.InteractiveWindowPromptToSave) !== true;
+		this.label = label ?? this.createEditorLabel(resource);
+	}
+
+	override getIcon(): ThemeIcon | undefined {
+		return replTabIcon;
+	}
+
+	private createEditorLabel(resource: URI | undefined): string {
+		if (!resource) {
+			return 'REPL';
+		}
+
+		if (resource.scheme === 'untitled') {
+			const match = new RegExp('Untitled-(\\d+)\.').exec(resource.path);
+			if (match?.length === 2) {
+				return `REPL - ${match[1]}`;
+			}
+		}
+
+		const filename = resource.path.split('/').pop();
+		return filename ? `REPL - ${filename}` : 'REPL';
+	}
+
+	override get typeId(): string {
+		return ReplEditorInput.ID;
+	}
+
+	override get editorId(): string | undefined {
+		return 'repl';
+	}
+
+	override getName() {
+		return this.label;
+	}
+
+	get editorInputs() {
+		return [this];
+	}
+
+	override get capabilities() {
+		const capabilities = super.capabilities;
+		const scratchPad = this.isScratchpad ? EditorInputCapabilities.Scratchpad : 0;
+
+		return capabilities
+			| EditorInputCapabilities.Readonly
+			| scratchPad;
+	}
+
+	override async resolve() {
+		const model = await super.resolve();
+		if (model) {
+			await this.ensureInputBoxCell(model.notebook);
+		}
+
+		return model;
+	}
+
+	private async ensureInputBoxCell(notebook: NotebookTextModel) {
+		const lastCell = notebook.cells[notebook.cells.length - 1];
+
+		if (!lastCell || lastCell.cellKind === CellKind.Markup || lastCell.outputs.length > 0 || lastCell.internalMetadata.executionOrder !== undefined) {
+			notebook.applyEdits([
+				{
+					editType: CellEditType.Replace,
+					index: notebook.cells.length,
+					count: 0,
+					cells: [
+						{
+							cellKind: CellKind.Code,
+							language: 'python',
+							mime: undefined,
+							outputs: [],
+							source: ''
+						}
+					]
+				}
+			], true, undefined, () => undefined, undefined, false);
+		}
+	}
+
+	async resolveInput(notebook: NotebookTextModel) {
+		if (this.inputModelRef) {
+			return this.inputModelRef.object.textEditorModel;
+		}
+		const lastCell = notebook.cells[notebook.cells.length - 1];
+		if (!lastCell) {
+			throw new Error('The REPL editor requires at least one cell for the input box.');
+		}
+
+		this.inputModelRef = await this._textModelService.createModelReference(lastCell.uri);
+		return this.inputModelRef.object.textEditorModel;
+	}
+
+	override dispose() {
+		if (!this.isDisposing) {
+			this.isDisposing = true;
+			this.editorModelReference?.object.revert({ soft: true });
+			this.inputModelRef?.dispose();
+			super.dispose();
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/sash/browser/sash.contribution.ts b/src/vs/workbench/contrib/sash/browser/sash.contribution.ts
index 74593875a3e..a7679a8dc65 100644
--- a/src/vs/workbench/contrib/sash/browser/sash.contribution.ts
+++ b/src/vs/workbench/contrib/sash/browser/sash.contribution.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { workbenchConfigurationNodeBase } from 'vs/workbench/common/configuration';
-import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
-import { SashSettingsController } from 'vs/workbench/contrib/sash/browser/sash';
-import { isIOS } from 'vs/base/common/platform';
+import { localize } from '../../../../nls.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { workbenchConfigurationNodeBase } from '../../../common/configuration.js';
+import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from '../../../common/contributions.js';
+import { SashSettingsController } from './sash.js';
+import { isIOS } from '../../../../base/common/platform.js';
 
 // Sash size contribution
 Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench)
diff --git a/src/vs/workbench/contrib/sash/browser/sash.ts b/src/vs/workbench/contrib/sash/browser/sash.ts
index f15b0e26d87..eaf2d23cdbe 100644
--- a/src/vs/workbench/contrib/sash/browser/sash.ts
+++ b/src/vs/workbench/contrib/sash/browser/sash.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { clamp } from 'vs/base/common/numbers';
-import { setGlobalSashSize, setGlobalHoverDelay } from 'vs/base/browser/ui/sash/sash';
-import { Event } from 'vs/base/common/event';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
+import { clamp } from '../../../../base/common/numbers.js';
+import { setGlobalSashSize, setGlobalHoverDelay } from '../../../../base/browser/ui/sash/sash.js';
+import { Event } from '../../../../base/common/event.js';
+import { DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { ILayoutService } from '../../../../platform/layout/browser/layoutService.js';
 
 export const minSize = 1;
 export const maxSize = 20; // see also https://ux.stackexchange.com/questions/39023/what-is-the-optimum-button-size-of-touch-screen-applications
diff --git a/src/vs/workbench/contrib/scm/browser/activity.ts b/src/vs/workbench/contrib/scm/browser/activity.ts
index a2feda972bb..a5d9ca5adde 100644
--- a/src/vs/workbench/contrib/scm/browser/activity.ts
+++ b/src/vs/workbench/contrib/scm/browser/activity.ts
@@ -3,75 +3,56 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { basename } from 'vs/base/common/resources';
-import { IDisposable, dispose, Disposable, DisposableStore, combinedDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { Emitter, Event } from 'vs/base/common/event';
-import { VIEW_PANE_ID, ISCMService, ISCMRepository, ISCMViewService } from 'vs/workbench/contrib/scm/common/scm';
-import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IStatusbarEntry, IStatusbarService, StatusbarAlignment as MainThreadStatusBarAlignment } from 'vs/workbench/services/statusbar/browser/statusbar';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { EditorResourceAccessor } from 'vs/workbench/common/editor';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { Schemas } from 'vs/base/common/network';
-import { Iterable } from 'vs/base/common/iterator';
-import { ITitleService } from 'vs/workbench/services/title/browser/titleService';
-import { IEditorGroupContextKeyProvider, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { getRepositoryResourceCount } from 'vs/workbench/contrib/scm/browser/util';
-import { autorunWithStore, derived, derivedObservableWithCache, IObservable, observableFromEvent } from 'vs/base/common/observable';
-import { observableConfigValue } from 'vs/platform/observable/common/platformObservableUtils';
+import { localize } from '../../../../nls.js';
+import { basename } from '../../../../base/common/resources.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { VIEW_PANE_ID, ISCMService, ISCMRepository, ISCMViewService } from '../common/scm.js';
+import { IActivityService, NumberBadge } from '../../../services/activity/common/activity.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IStatusbarEntry, IStatusbarService, StatusbarAlignment as MainThreadStatusBarAlignment } from '../../../services/statusbar/browser/statusbar.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { EditorResourceAccessor } from '../../../common/editor.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { ITitleService } from '../../../services/title/browser/titleService.js';
+import { IEditorGroupContextKeyProvider, IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { getRepositoryResourceCount } from './util.js';
+import { autorun, autorunWithStore, derived, IObservable, observableFromEvent } from '../../../../base/common/observable.js';
+import { observableConfigValue } from '../../../../platform/observable/common/platformObservableUtils.js';
+import { Command } from '../../../../editor/common/languages.js';
 
-export class SCMActivityCountBadgeController extends Disposable implements IWorkbenchContribution {
+const ActiveRepositoryContextKeys = {
+	ActiveRepositoryName: new RawContextKey<string>('scmActiveRepositoryName', ''),
+	ActiveRepositoryBranchName: new RawContextKey<string>('scmActiveRepositoryBranchName', ''),
+};
+
+export class SCMActiveRepositoryController extends Disposable implements IWorkbenchContribution {
 	private readonly _countBadgeConfig = observableConfigValue<'all' | 'focused' | 'off'>('scm.countBadge', 'all', this.configurationService);
 
-	private readonly _repositories = observableFromEvent(
+	private readonly _repositories = observableFromEvent(this,
 		Event.any(this.scmService.onDidAddRepository, this.scmService.onDidRemoveRepository),
 		() => this.scmService.repositories);
 
-	private readonly _focusedRepository = observableFromEvent(
-		this.scmViewService.onDidFocusRepository,
-		() => this.scmViewService.focusedRepository ? Object.create(this.scmViewService.focusedRepository) : undefined);
+	private readonly _activeRepositoryHistoryItemRefName = derived(reader => {
+		const repository = this.scmViewService.activeRepository.read(reader);
+		const historyProvider = repository?.provider.historyProvider.read(reader);
+		const historyItemRef = historyProvider?.historyItemRef.read(reader);
 
-	private readonly _activeEditor = observableFromEvent(
-		this.editorService.onDidActiveEditorChange,
-		() => this.editorService.activeEditor);
-
-	private readonly _activeEditorRepository = derived(reader => {
-		const activeResource = EditorResourceAccessor.getOriginalUri(this._activeEditor.read(reader));
-		if (!activeResource) {
-			return undefined;
-		}
-
-		return this.scmService.getRepository(activeResource);
+		return historyItemRef?.name;
 	});
 
-	private readonly _activeRepository = derivedObservableWithCache<ISCMRepository | undefined>(this, (reader, lastValue) => {
-		const focusedRepository = this._focusedRepository.read(reader);
-		if (focusedRepository && focusedRepository.id !== lastValue?.id) {
-			return focusedRepository;
-		}
-
-		const activeEditorRepository = this._activeEditorRepository.read(reader);
-		if (activeEditorRepository && activeEditorRepository.id !== lastValue?.id) {
-			return activeEditorRepository;
-		}
-
-		return lastValue;
-	});
-
-	private readonly _countBadgeRepositories = derived(reader => {
+	private readonly _countBadgeRepositories = derived(this, reader => {
 		switch (this._countBadgeConfig.read(reader)) {
 			case 'all': {
 				const repositories = this._repositories.read(reader);
-				return [...Iterable.map(repositories, r => ({ ...r.provider, resourceCount: this._getRepositoryResourceCount(r) }))];
+				return [...Iterable.map(repositories, r => ({ provider: r.provider, resourceCount: this._getRepositoryResourceCount(r) }))];
 			}
 			case 'focused': {
-				const repository = this._activeRepository.read(reader);
-				return repository ? [{ ...repository.provider, resourceCount: this._getRepositoryResourceCount(repository) }] : [];
+				const repository = this.scmViewService.activeRepository.read(reader);
+				return repository ? [{ provider: repository.provider, resourceCount: this._getRepositoryResourceCount(repository) }] : [];
 			}
 			case 'off':
 				return [];
@@ -80,11 +61,11 @@ export class SCMActivityCountBadgeController extends Disposable implements IWork
 		}
 	});
 
-	private readonly _countBadge = derived(reader => {
+	private readonly _countBadge = derived(this, reader => {
 		let total = 0;
 
 		for (const repository of this._countBadgeRepositories.read(reader)) {
-			const count = repository.count?.read(reader);
+			const count = repository.provider.count?.read(reader);
 			const resourceCount = repository.resourceCount.read(reader);
 
 			total = total + (count ?? resourceCount);
@@ -93,25 +74,52 @@ export class SCMActivityCountBadgeController extends Disposable implements IWork
 		return total;
 	});
 
+	private _activeRepositoryNameContextKey: IContextKey<string>;
+	private _activeRepositoryBranchNameContextKey: IContextKey<string>;
+
 	constructor(
 		@IActivityService private readonly activityService: IActivityService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@IEditorService private readonly editorService: IEditorService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@ISCMService private readonly scmService: ISCMService,
-		@ISCMViewService private readonly scmViewService: ISCMViewService
+		@ISCMViewService private readonly scmViewService: ISCMViewService,
+		@IStatusbarService private readonly statusbarService: IStatusbarService,
+		@ITitleService private readonly titleService: ITitleService
 	) {
 		super();
 
+		this._activeRepositoryNameContextKey = ActiveRepositoryContextKeys.ActiveRepositoryName.bindTo(this.contextKeyService);
+		this._activeRepositoryBranchNameContextKey = ActiveRepositoryContextKeys.ActiveRepositoryBranchName.bindTo(this.contextKeyService);
+
+		this.titleService.registerVariables([
+			{ name: 'activeRepositoryName', contextKey: ActiveRepositoryContextKeys.ActiveRepositoryName.key },
+			{ name: 'activeRepositoryBranchName', contextKey: ActiveRepositoryContextKeys.ActiveRepositoryBranchName.key, }
+		]);
+
 		this._register(autorunWithStore((reader, store) => {
-			this._renderActivityCount(this._countBadge.read(reader), store);
+			this._updateActivityCountBadge(this._countBadge.read(reader), store);
+		}));
+
+		this._register(autorunWithStore((reader, store) => {
+			const repository = this.scmViewService.activeRepository.read(reader);
+			const commands = repository?.provider.statusBarCommands.read(reader);
+
+			this._updateStatusBar(repository, commands ?? [], store);
+		}));
+
+		this._register(autorun(reader => {
+			const repository = this.scmViewService.activeRepository.read(reader);
+			const historyItemRefName = this._activeRepositoryHistoryItemRefName.read(reader);
+
+			this._updateActiveRepositoryContextKeys(repository?.provider.name, historyItemRefName);
 		}));
 	}
 
 	private _getRepositoryResourceCount(repository: ISCMRepository): IObservable<number> {
-		return observableFromEvent(repository.provider.onDidChangeResources, () => getRepositoryResourceCount(repository.provider));
+		return observableFromEvent(this, repository.provider.onDidChangeResources, () => /** @description repositoryResourceCount */ getRepositoryResourceCount(repository.provider));
 	}
 
-	private _renderActivityCount(count: number, store: DisposableStore): void {
+	private _updateActivityCountBadge(count: number, store: DisposableStore): void {
 		if (count === 0) {
 			return;
 		}
@@ -119,101 +127,16 @@ export class SCMActivityCountBadgeController extends Disposable implements IWork
 		const badge = new NumberBadge(count, num => localize('scmPendingChangesBadge', '{0} pending changes', num));
 		store.add(this.activityService.showViewActivity(VIEW_PANE_ID, { badge }));
 	}
-}
-
-export class SCMStatusController implements IWorkbenchContribution {
-
-	private statusBarDisposable: IDisposable = Disposable.None;
-	private focusDisposable: IDisposable = Disposable.None;
-	private focusedRepository: ISCMRepository | undefined = undefined;
-	private readonly badgeDisposable = new MutableDisposable<IDisposable>();
-	private readonly disposables = new DisposableStore();
-	private repositoryDisposables = new Set<IDisposable>();
-
-	constructor(
-		@ISCMService private readonly scmService: ISCMService,
-		@ISCMViewService private readonly scmViewService: ISCMViewService,
-		@IStatusbarService private readonly statusbarService: IStatusbarService,
-		@IEditorService private readonly editorService: IEditorService
-	) {
-		this.scmService.onDidAddRepository(this.onDidAddRepository, this, this.disposables);
-		this.scmService.onDidRemoveRepository(this.onDidRemoveRepository, this, this.disposables);
-
-		for (const repository of this.scmService.repositories) {
-			this.onDidAddRepository(repository);
-		}
-
-		this.scmViewService.onDidFocusRepository(this.focusRepository, this, this.disposables);
-		this.focusRepository(this.scmViewService.focusedRepository);
-
-		editorService.onDidActiveEditorChange(() => this.tryFocusRepositoryBasedOnActiveEditor(), this, this.disposables);
-	}
-
-	private tryFocusRepositoryBasedOnActiveEditor(repositories: Iterable<ISCMRepository> = this.scmService.repositories): boolean {
-		const resource = EditorResourceAccessor.getOriginalUri(this.editorService.activeEditor);
-
-		if (!resource) {
-			return false;
-		}
-
-		const repository = this.scmService.getRepository(resource);
-		if (!repository) {
-			return false;
-		}
-
-		this.focusRepository(repository);
-		return true;
-	}
-
-	private onDidAddRepository(repository: ISCMRepository): void {
-		const onDidRemove = Event.filter(this.scmService.onDidRemoveRepository, e => e === repository);
-		const removeDisposable = onDidRemove(() => {
-			disposable.dispose();
-			this.repositoryDisposables.delete(disposable);
-		});
-
-		const disposable = combinedDisposable(removeDisposable);
-		this.repositoryDisposables.add(disposable);
-
-		this.tryFocusRepositoryBasedOnActiveEditor(Iterable.single(repository));
-	}
-
-	private onDidRemoveRepository(repository: ISCMRepository): void {
-		if (this.focusedRepository !== repository) {
-			return;
-		}
-
-		this.focusRepository(Iterable.first(this.scmService.repositories));
-	}
-
-	private focusRepository(repository: ISCMRepository | undefined): void {
-		if (this.focusedRepository === repository) {
-			return;
-		}
-
-		this.focusDisposable.dispose();
-		this.focusedRepository = repository;
-
-		if (repository && repository.provider.onDidChangeStatusBarCommands) {
-			this.focusDisposable = repository.provider.onDidChangeStatusBarCommands(() => this.renderStatusBar(repository));
-		}
-
-		this.renderStatusBar(repository);
-	}
-
-	private renderStatusBar(repository: ISCMRepository | undefined): void {
-		this.statusBarDisposable.dispose();
 
+	private _updateStatusBar(repository: ISCMRepository | undefined, commands: readonly Command[], store: DisposableStore): void {
 		if (!repository) {
 			return;
 		}
 
-		const commands = repository.provider.statusBarCommands || [];
 		const label = repository.provider.rootUri
 			? `${basename(repository.provider.rootUri)} (${repository.provider.label})`
 			: repository.provider.label;
 
-		const disposables = new DisposableStore();
 		for (let index = 0; index < commands.length; index++) {
 			const command = commands[index];
 			const tooltip = `${label}${command.tooltip ? ` - ${command.tooltip}` : ''}`;
@@ -240,189 +163,91 @@ export class SCMStatusController implements IWorkbenchContribution {
 				command: command.id ? command : undefined
 			};
 
-			disposables.add(index === 0 ?
+			store.add(index === 0 ?
 				this.statusbarService.addEntry(statusbarEntry, `status.scm.${index}`, MainThreadStatusBarAlignment.LEFT, 10000) :
 				this.statusbarService.addEntry(statusbarEntry, `status.scm.${index}`, MainThreadStatusBarAlignment.LEFT, { id: `status.scm.${index - 1}`, alignment: MainThreadStatusBarAlignment.RIGHT, compact: true })
 			);
 		}
-
-		this.statusBarDisposable = disposables;
 	}
 
-	dispose(): void {
-		this.focusDisposable.dispose();
-		this.statusBarDisposable.dispose();
-		this.badgeDisposable.dispose();
-		this.disposables.dispose();
-		dispose(this.repositoryDisposables.values());
-		this.repositoryDisposables.clear();
+	private _updateActiveRepositoryContextKeys(repositoryName: string | undefined, branchName: string | undefined): void {
+		this._activeRepositoryNameContextKey.set(repositoryName ?? '');
+		this._activeRepositoryBranchNameContextKey.set(branchName ?? '');
 	}
 }
 
-const ActiveRepositoryContextKeys = {
-	ActiveRepositoryName: new RawContextKey<string>('scmActiveRepositoryName', ''),
-	ActiveRepositoryBranchName: new RawContextKey<string>('scmActiveRepositoryBranchName', ''),
-};
+export class SCMActiveResourceContextKeyController extends Disposable implements IWorkbenchContribution {
+	private readonly _repositories = observableFromEvent(this,
+		Event.any(this.scmService.onDidAddRepository, this.scmService.onDidRemoveRepository),
+		() => this.scmService.repositories);
 
-export class SCMActiveRepositoryContextKeyController implements IWorkbenchContribution {
-
-	private activeRepositoryNameContextKey: IContextKey<string>;
-	private activeRepositoryBranchNameContextKey: IContextKey<string>;
-
-	private focusedRepository: ISCMRepository | undefined = undefined;
-	private focusDisposable: IDisposable = Disposable.None;
-	private readonly disposables = new DisposableStore();
-
-	constructor(
-		@IContextKeyService contextKeyService: IContextKeyService,
-		@IEditorService private readonly editorService: IEditorService,
-		@ISCMViewService scmViewService: ISCMViewService,
-		@ISCMService private readonly scmService: ISCMService,
-		@ITitleService titleService: ITitleService
-	) {
-		this.activeRepositoryNameContextKey = ActiveRepositoryContextKeys.ActiveRepositoryName.bindTo(contextKeyService);
-		this.activeRepositoryBranchNameContextKey = ActiveRepositoryContextKeys.ActiveRepositoryBranchName.bindTo(contextKeyService);
-
-		titleService.registerVariables([
-			{ name: 'activeRepositoryName', contextKey: ActiveRepositoryContextKeys.ActiveRepositoryName.key },
-			{ name: 'activeRepositoryBranchName', contextKey: ActiveRepositoryContextKeys.ActiveRepositoryBranchName.key, }
-		]);
-
-		editorService.onDidActiveEditorChange(this.onDidActiveEditorChange, this, this.disposables);
-		scmViewService.onDidFocusRepository(this.onDidFocusRepository, this, this.disposables);
-		this.onDidFocusRepository(scmViewService.focusedRepository);
-	}
-
-	private onDidActiveEditorChange(): void {
-		const activeResource = EditorResourceAccessor.getOriginalUri(this.editorService.activeEditor);
-		if (!activeResource) {
-			return;
-		}
-
-		const repository = this.scmService.getRepository(activeResource);
-		this.onDidFocusRepository(repository);
-	}
-
-	private onDidFocusRepository(repository: ISCMRepository | undefined): void {
-		if (!repository || this.focusedRepository === repository) {
-			return;
-		}
-
-		this.focusDisposable.dispose();
-		this.focusedRepository = repository;
-
-		if (repository && repository.provider.onDidChangeStatusBarCommands) {
-			this.focusDisposable = repository.provider.onDidChangeStatusBarCommands(() => this.updateContextKeys(repository));
-		}
-
-		this.updateContextKeys(repository);
-	}
-
-	private updateContextKeys(repository: ISCMRepository | undefined): void {
-		this.activeRepositoryNameContextKey.set(repository?.provider.name ?? '');
-		this.activeRepositoryBranchNameContextKey.set(repository?.provider.historyProvider?.currentHistoryItemGroup?.name ?? '');
-	}
-
-	dispose(): void {
-		this.focusDisposable.dispose();
-		this.disposables.dispose();
-	}
-}
-
-export class SCMActiveResourceContextKeyController implements IWorkbenchContribution {
-
-	private readonly disposables = new DisposableStore();
-	private repositoryDisposables = new Set<IDisposable>();
-	private onDidRepositoryChange = new Emitter<void>();
+	private readonly _onDidRepositoryChange = new Emitter<void>();
 
 	constructor(
 		@IEditorGroupsService editorGroupsService: IEditorGroupsService,
 		@ISCMService private readonly scmService: ISCMService,
 		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService
 	) {
+		super();
+
 		const activeResourceHasChangesContextKey = new RawContextKey<boolean>('scmActiveResourceHasChanges', false, localize('scmActiveResourceHasChanges', "Whether the active resource has changes"));
 		const activeResourceRepositoryContextKey = new RawContextKey<string | undefined>('scmActiveResourceRepository', undefined, localize('scmActiveResourceRepository', "The active resource's repository"));
 
-		this.scmService.onDidAddRepository(this.onDidAddRepository, this, this.disposables);
-
-		for (const repository of this.scmService.repositories) {
-			this.onDidAddRepository(repository);
-		}
+		this._store.add(autorunWithStore((reader, store) => {
+			for (const repository of this._repositories.read(reader)) {
+				store.add(Event.runAndSubscribe(repository.provider.onDidChangeResources, () => {
+					this._onDidRepositoryChange.fire();
+				}));
+			}
+		}));
 
 		// Create context key providers which will update the context keys based on each groups active editor
 		const hasChangesContextKeyProvider: IEditorGroupContextKeyProvider<boolean> = {
 			contextKey: activeResourceHasChangesContextKey,
-			getGroupContextKeyValue: (group) => this.getEditorHasChanges(group.activeEditor),
-			onDidChange: this.onDidRepositoryChange.event
+			getGroupContextKeyValue: (group) => this._getEditorHasChanges(group.activeEditor),
+			onDidChange: this._onDidRepositoryChange.event
 		};
 
 		const repositoryContextKeyProvider: IEditorGroupContextKeyProvider<string | undefined> = {
 			contextKey: activeResourceRepositoryContextKey,
-			getGroupContextKeyValue: (group) => this.getEditorRepositoryId(group.activeEditor),
-			onDidChange: this.onDidRepositoryChange.event
+			getGroupContextKeyValue: (group) => this._getEditorRepositoryId(group.activeEditor),
+			onDidChange: this._onDidRepositoryChange.event
 		};
 
-		this.disposables.add(editorGroupsService.registerContextKeyProvider(hasChangesContextKeyProvider));
-		this.disposables.add(editorGroupsService.registerContextKeyProvider(repositoryContextKeyProvider));
+		this._store.add(editorGroupsService.registerContextKeyProvider(hasChangesContextKeyProvider));
+		this._store.add(editorGroupsService.registerContextKeyProvider(repositoryContextKeyProvider));
 	}
 
-	private onDidAddRepository(repository: ISCMRepository): void {
-		const onDidChange = Event.any(repository.provider.onDidChange, repository.provider.onDidChangeResources);
-		const changeDisposable = onDidChange(() => {
-			this.onDidRepositoryChange.fire();
-		});
-
-		const onDidRemove = Event.filter(this.scmService.onDidRemoveRepository, e => e === repository);
-		const removeDisposable = onDidRemove(() => {
-			disposable.dispose();
-			this.repositoryDisposables.delete(disposable);
-			this.onDidRepositoryChange.fire();
-		});
-
-		const disposable = combinedDisposable(changeDisposable, removeDisposable);
-		this.repositoryDisposables.add(disposable);
-	}
-
-	private getEditorRepositoryId(activeEditor: EditorInput | null): string | undefined {
+	private _getEditorHasChanges(activeEditor: EditorInput | null): boolean {
 		const activeResource = EditorResourceAccessor.getOriginalUri(activeEditor);
-
-		if (activeResource?.scheme === Schemas.file || activeResource?.scheme === Schemas.vscodeRemote) {
-			const activeResourceRepository = Iterable.find(
-				this.scmService.repositories,
-				r => Boolean(r.provider.rootUri && this.uriIdentityService.extUri.isEqualOrParent(activeResource, r.provider.rootUri))
-			);
-
-			return activeResourceRepository?.id;
+		if (!activeResource) {
+			return false;
 		}
 
-		return undefined;
-	}
-
-	private getEditorHasChanges(activeEditor: EditorInput | null): boolean {
-		const activeResource = EditorResourceAccessor.getOriginalUri(activeEditor);
-
-		if (activeResource?.scheme === Schemas.file || activeResource?.scheme === Schemas.vscodeRemote) {
-			const activeResourceRepository = Iterable.find(
-				this.scmService.repositories,
-				r => Boolean(r.provider.rootUri && this.uriIdentityService.extUri.isEqualOrParent(activeResource, r.provider.rootUri))
-			);
-
-			for (const resourceGroup of activeResourceRepository?.provider.groups ?? []) {
-				if (resourceGroup.resources
-					.some(scmResource =>
-						this.uriIdentityService.extUri.isEqual(activeResource, scmResource.sourceUri))) {
-					return true;
-				}
+		const activeResourceRepository = this.scmService.getRepository(activeResource);
+		for (const resourceGroup of activeResourceRepository?.provider.groups ?? []) {
+			if (resourceGroup.resources
+				.some(scmResource =>
+					this.uriIdentityService.extUri.isEqual(activeResource, scmResource.sourceUri))) {
+				return true;
 			}
 		}
 
 		return false;
 	}
 
-	dispose(): void {
-		this.disposables.dispose();
-		dispose(this.repositoryDisposables.values());
-		this.repositoryDisposables.clear();
-		this.onDidRepositoryChange.dispose();
+	private _getEditorRepositoryId(activeEditor: EditorInput | null): string | undefined {
+		const activeResource = EditorResourceAccessor.getOriginalUri(activeEditor);
+		if (!activeResource) {
+			return undefined;
+		}
+
+		const activeResourceRepository = this.scmService.getRepository(activeResource);
+		return activeResourceRepository?.id;
+	}
+
+	override dispose(): void {
+		this._onDidRepositoryChange.dispose();
+		super.dispose();
 	}
 }
diff --git a/src/vs/workbench/contrib/scm/browser/dirtyDiffSwitcher.ts b/src/vs/workbench/contrib/scm/browser/dirtyDiffSwitcher.ts
index 8cc5b7d8527..cf2d4469049 100644
--- a/src/vs/workbench/contrib/scm/browser/dirtyDiffSwitcher.ts
+++ b/src/vs/workbench/contrib/scm/browser/dirtyDiffSwitcher.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { Action, IAction } from 'vs/base/common/actions';
-import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { ISelectOptionItem } from 'vs/base/browser/ui/selectBox/selectBox';
-import { SelectActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { defaultSelectBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { peekViewTitleBackground } from 'vs/editor/contrib/peekView/browser/peekView';
-import { editorBackground } from 'vs/platform/theme/common/colorRegistry';
+import * as nls from '../../../../nls.js';
+import { Action, IAction } from '../../../../base/common/actions.js';
+import { IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { ISelectOptionItem } from '../../../../base/browser/ui/selectBox/selectBox.js';
+import { SelectActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { defaultSelectBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { peekViewTitleBackground } from '../../../../editor/contrib/peekView/browser/peekView.js';
+import { editorBackground } from '../../../../platform/theme/common/colorRegistry.js';
 
 export interface IQuickDiffSelectItem extends ISelectOptionItem {
 	provider: string;
diff --git a/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts b/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts
index 7537f80f534..17a6f1a85fb 100644
--- a/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts
+++ b/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts
@@ -3,61 +3,61 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
+import * as nls from '../../../../nls.js';
 
-import 'vs/css!./media/dirtydiffDecorator';
-import { ThrottledDelayer } from 'vs/base/common/async';
-import { IDisposable, dispose, toDisposable, Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { Event, Emitter } from 'vs/base/common/event';
-import * as ext from 'vs/workbench/common/contributions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IResolvedTextEditorModel, ITextModelService } from 'vs/editor/common/services/resolverService';
-import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { URI } from 'vs/base/common/uri';
-import { ISCMService, ISCMRepository } from 'vs/workbench/contrib/scm/common/scm';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { IColorTheme, themeColorFromId, IThemeService } from 'vs/platform/theme/common/themeService';
-import { editorErrorForeground, registerColor, transparent } from 'vs/platform/theme/common/colorRegistry';
-import { ICodeEditor, IEditorMouseEvent, isCodeEditor, MouseTargetType } from 'vs/editor/browser/editorBrowser';
-import { registerEditorAction, registerEditorContribution, ServicesAccessor, EditorAction, EditorContributionInstantiation } from 'vs/editor/browser/editorExtensions';
-import { PeekViewWidget, getOuterEditor, peekViewBorder, peekViewTitleBackground, peekViewTitleForeground, peekViewTitleInfoForeground } from 'vs/editor/contrib/peekView/browser/peekView';
-import { IContextKeyService, IContextKey, ContextKeyExpr, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { rot } from 'vs/base/common/numbers';
-import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { EmbeddedDiffEditorWidget } from 'vs/editor/browser/widget/diffEditor/embeddedDiffEditorWidget';
-import { IDiffEditorOptions, EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Action, IAction, ActionRunner } from 'vs/base/common/actions';
-import { IActionBarOptions } from 'vs/base/browser/ui/actionbar/actionbar';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { basename } from 'vs/base/common/resources';
-import { MenuId, IMenuService, IMenu, MenuItemAction, MenuRegistry } from 'vs/platform/actions/common/actions';
-import { createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { ScrollType, IEditorContribution, IDiffEditorModel, IEditorModel, IEditorDecorationsCollection } from 'vs/editor/common/editorCommon';
-import { OverviewRulerLane, ITextModel, IModelDecorationOptions, MinimapPosition, shouldSynchronizeModel } from 'vs/editor/common/model';
-import { equals, sortedDiff } from 'vs/base/common/arrays';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { ISplice } from 'vs/base/common/sequence';
-import * as dom from 'vs/base/browser/dom';
-import { EncodingMode, ITextFileEditorModel, IResolvedTextFileEditorModel, ITextFileService, isTextFileEditorModel } from 'vs/workbench/services/textfile/common/textfiles';
-import { gotoNextLocation, gotoPreviousLocation } from 'vs/platform/theme/common/iconRegistry';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { TextCompareEditorActiveContext } from 'vs/workbench/common/contextkeys';
-import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
-import { IChange } from 'vs/editor/common/diff/legacyLinesDiffComputer';
-import { Color } from 'vs/base/common/color';
-import { ResourceMap } from 'vs/base/common/map';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { AccessibilitySignal, IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { IQuickDiffService, QuickDiff } from 'vs/workbench/contrib/scm/common/quickDiff';
-import { IQuickDiffSelectItem, SwitchQuickDiffBaseAction, SwitchQuickDiffViewItem } from 'vs/workbench/contrib/scm/browser/dirtyDiffSwitcher';
+import './media/dirtydiffDecorator.css';
+import { ThrottledDelayer } from '../../../../base/common/async.js';
+import { IDisposable, dispose, toDisposable, Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import * as ext from '../../../common/contributions.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IResolvedTextEditorModel, ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { IEditorWorkerService } from '../../../../editor/common/services/editorWorker.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ISCMService, ISCMRepository } from '../common/scm.js';
+import { ModelDecorationOptions } from '../../../../editor/common/model/textModel.js';
+import { IColorTheme, themeColorFromId, IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { editorErrorForeground, registerColor, transparent } from '../../../../platform/theme/common/colorRegistry.js';
+import { ICodeEditor, IEditorMouseEvent, isCodeEditor, MouseTargetType } from '../../../../editor/browser/editorBrowser.js';
+import { registerEditorAction, registerEditorContribution, ServicesAccessor, EditorAction, EditorContributionInstantiation } from '../../../../editor/browser/editorExtensions.js';
+import { PeekViewWidget, getOuterEditor, peekViewBorder, peekViewTitleBackground, peekViewTitleForeground, peekViewTitleInfoForeground } from '../../../../editor/contrib/peekView/browser/peekView.js';
+import { IContextKeyService, IContextKey, ContextKeyExpr, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { rot } from '../../../../base/common/numbers.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { EmbeddedDiffEditorWidget } from '../../../../editor/browser/widget/diffEditor/embeddedDiffEditorWidget.js';
+import { IDiffEditorOptions, EditorOption } from '../../../../editor/common/config/editorOptions.js';
+import { Action, IAction, ActionRunner } from '../../../../base/common/actions.js';
+import { IActionBarOptions } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { basename } from '../../../../base/common/resources.js';
+import { MenuId, IMenuService, IMenu, MenuItemAction, MenuRegistry } from '../../../../platform/actions/common/actions.js';
+import { createAndFillInActionBarActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { ScrollType, IEditorContribution, IDiffEditorModel, IEditorModel, IEditorDecorationsCollection } from '../../../../editor/common/editorCommon.js';
+import { OverviewRulerLane, ITextModel, IModelDecorationOptions, MinimapPosition, shouldSynchronizeModel } from '../../../../editor/common/model.js';
+import { equals, sortedDiff } from '../../../../base/common/arrays.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { ISplice } from '../../../../base/common/sequence.js';
+import * as dom from '../../../../base/browser/dom.js';
+import { EncodingMode, ITextFileEditorModel, IResolvedTextFileEditorModel, ITextFileService, isTextFileEditorModel } from '../../../services/textfile/common/textfiles.js';
+import { gotoNextLocation, gotoPreviousLocation } from '../../../../platform/theme/common/iconRegistry.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { TextCompareEditorActiveContext } from '../../../common/contextkeys.js';
+import { IProgressService, ProgressLocation } from '../../../../platform/progress/common/progress.js';
+import { IChange } from '../../../../editor/common/diff/legacyLinesDiffComputer.js';
+import { Color } from '../../../../base/common/color.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { IQuickDiffService, QuickDiff } from '../common/quickDiff.js';
+import { IQuickDiffSelectItem, SwitchQuickDiffBaseAction, SwitchQuickDiffViewItem } from './dirtyDiffSwitcher.js';
 
 class DiffActionRunner extends ActionRunner {
 
@@ -787,7 +787,7 @@ export class DirtyDiffController extends Disposable implements DirtyDiffContribu
 		if (this.editor.hasModel() && (typeof lineNumber === 'number' || !this.widget.provider)) {
 			index = this.model.findNextClosestChange(typeof lineNumber === 'number' ? lineNumber : this.editor.getPosition().lineNumber, true, this.widget.provider);
 		} else {
-			const providerChanges: number[] = this.model.mapChanges.get(this.widget.provider) ?? this.model.mapChanges.values().next().value;
+			const providerChanges: number[] = this.model.mapChanges.get(this.widget.provider) ?? this.model.mapChanges.values().next().value!;
 			const mapIndex = providerChanges.findIndex(value => value === this.widget!.index);
 			index = providerChanges[rot(mapIndex + 1, providerChanges.length)];
 		}
@@ -807,7 +807,7 @@ export class DirtyDiffController extends Disposable implements DirtyDiffContribu
 		if (this.editor.hasModel() && (typeof lineNumber === 'number')) {
 			index = this.model.findPreviousClosestChange(typeof lineNumber === 'number' ? lineNumber : this.editor.getPosition().lineNumber, true, this.widget.provider);
 		} else {
-			const providerChanges: number[] = this.model.mapChanges.get(this.widget.provider) ?? this.model.mapChanges.values().next().value;
+			const providerChanges: number[] = this.model.mapChanges.get(this.widget.provider) ?? this.model.mapChanges.values().next().value!;
 			const mapIndex = providerChanges.findIndex(value => value === this.widget!.index);
 			index = providerChanges[rot(mapIndex - 1, providerChanges.length)];
 		}
@@ -1013,37 +1013,17 @@ const editorGutterAddedBackground = registerColor('editorGutter.addedBackground'
 	hcLight: '#48985D'
 }, nls.localize('editorGutterAddedBackground', "Editor gutter background color for lines that are added."));
 
-const editorGutterDeletedBackground = registerColor('editorGutter.deletedBackground', {
-	dark: editorErrorForeground,
-	light: editorErrorForeground,
-	hcDark: editorErrorForeground,
-	hcLight: editorErrorForeground
-}, nls.localize('editorGutterDeletedBackground', "Editor gutter background color for lines that are deleted."));
+const editorGutterDeletedBackground = registerColor('editorGutter.deletedBackground', editorErrorForeground, nls.localize('editorGutterDeletedBackground', "Editor gutter background color for lines that are deleted."));
 
-const minimapGutterModifiedBackground = registerColor('minimapGutter.modifiedBackground', {
-	dark: editorGutterModifiedBackground,
-	light: editorGutterModifiedBackground,
-	hcDark: editorGutterModifiedBackground,
-	hcLight: editorGutterModifiedBackground
-}, nls.localize('minimapGutterModifiedBackground', "Minimap gutter background color for lines that are modified."));
+const minimapGutterModifiedBackground = registerColor('minimapGutter.modifiedBackground', editorGutterModifiedBackground, nls.localize('minimapGutterModifiedBackground', "Minimap gutter background color for lines that are modified."));
 
-const minimapGutterAddedBackground = registerColor('minimapGutter.addedBackground', {
-	dark: editorGutterAddedBackground,
-	light: editorGutterAddedBackground,
-	hcDark: editorGutterAddedBackground,
-	hcLight: editorGutterAddedBackground
-}, nls.localize('minimapGutterAddedBackground', "Minimap gutter background color for lines that are added."));
+const minimapGutterAddedBackground = registerColor('minimapGutter.addedBackground', editorGutterAddedBackground, nls.localize('minimapGutterAddedBackground', "Minimap gutter background color for lines that are added."));
 
-const minimapGutterDeletedBackground = registerColor('minimapGutter.deletedBackground', {
-	dark: editorGutterDeletedBackground,
-	light: editorGutterDeletedBackground,
-	hcDark: editorGutterDeletedBackground,
-	hcLight: editorGutterDeletedBackground
-}, nls.localize('minimapGutterDeletedBackground', "Minimap gutter background color for lines that are deleted."));
+const minimapGutterDeletedBackground = registerColor('minimapGutter.deletedBackground', editorGutterDeletedBackground, nls.localize('minimapGutterDeletedBackground', "Minimap gutter background color for lines that are deleted."));
 
-const overviewRulerModifiedForeground = registerColor('editorOverviewRuler.modifiedForeground', { dark: transparent(editorGutterModifiedBackground, 0.6), light: transparent(editorGutterModifiedBackground, 0.6), hcDark: transparent(editorGutterModifiedBackground, 0.6), hcLight: transparent(editorGutterModifiedBackground, 0.6) }, nls.localize('overviewRulerModifiedForeground', 'Overview ruler marker color for modified content.'));
-const overviewRulerAddedForeground = registerColor('editorOverviewRuler.addedForeground', { dark: transparent(editorGutterAddedBackground, 0.6), light: transparent(editorGutterAddedBackground, 0.6), hcDark: transparent(editorGutterAddedBackground, 0.6), hcLight: transparent(editorGutterAddedBackground, 0.6) }, nls.localize('overviewRulerAddedForeground', 'Overview ruler marker color for added content.'));
-const overviewRulerDeletedForeground = registerColor('editorOverviewRuler.deletedForeground', { dark: transparent(editorGutterDeletedBackground, 0.6), light: transparent(editorGutterDeletedBackground, 0.6), hcDark: transparent(editorGutterDeletedBackground, 0.6), hcLight: transparent(editorGutterDeletedBackground, 0.6) }, nls.localize('overviewRulerDeletedForeground', 'Overview ruler marker color for deleted content.'));
+const overviewRulerModifiedForeground = registerColor('editorOverviewRuler.modifiedForeground', transparent(editorGutterModifiedBackground, 0.6), nls.localize('overviewRulerModifiedForeground', 'Overview ruler marker color for modified content.'));
+const overviewRulerAddedForeground = registerColor('editorOverviewRuler.addedForeground', transparent(editorGutterAddedBackground, 0.6), nls.localize('overviewRulerAddedForeground', 'Overview ruler marker color for added content.'));
+const overviewRulerDeletedForeground = registerColor('editorOverviewRuler.deletedForeground', transparent(editorGutterDeletedBackground, 0.6), nls.localize('overviewRulerDeletedForeground', 'Overview ruler marker color for deleted content.'));
 
 class DirtyDiffDecorator extends Disposable {
 
@@ -1309,8 +1289,7 @@ export class DirtyDiffModel extends Disposable {
 		this.repositoryDisposables.add(disposables);
 		disposables.add(toDisposable(() => this.repositoryDisposables.delete(disposables)));
 
-		const onDidChange = Event.any(repository.provider.onDidChange, repository.provider.onDidChangeResources);
-		disposables.add(onDidChange(this.triggerDiff, this));
+		disposables.add(repository.provider.onDidChangeResources(this.triggerDiff, this));
 
 		const onDidRemoveThis = Event.filter(this.scmService.onDidRemoveRepository, r => r === repository);
 		disposables.add(onDidRemoveThis(() => dispose(disposables), null));
@@ -1318,9 +1297,9 @@ export class DirtyDiffModel extends Disposable {
 		this.triggerDiff();
 	}
 
-	private triggerDiff(): Promise<any> {
+	private triggerDiff(): Promise<void> {
 		if (!this.diffDelayer) {
-			return Promise.resolve(null);
+			return Promise.resolve();
 		}
 
 		return this.diffDelayer
diff --git a/src/vs/workbench/contrib/scm/browser/media/scm.css b/src/vs/workbench/contrib/scm/browser/media/scm.css
index ca6716b258e..4ba122fa370 100644
--- a/src/vs/workbench/contrib/scm/browser/media/scm.css
+++ b/src/vs/workbench/contrib/scm/browser/media/scm.css
@@ -110,6 +110,10 @@
 	line-height: 22px;
 }
 
+.scm-view .monaco-list-row .monaco-icon-label-container {
+	height: 22px;
+}
+
 .scm-view .monaco-list-row .history,
 .scm-view .monaco-list-row .history-item-group,
 .scm-view .monaco-list-row .resource-group {
@@ -129,49 +133,66 @@
 	align-items: center;
 }
 
-.scm-view .monaco-list-row .history-item .stats-container {
+.scm-view .monaco-list-row .history-item > .graph-container {
 	display: flex;
-	font-size: 11px;
-	line-height: 11px;
-	margin-left: 6px;
+	flex-shrink: 0;
+	height: 22px;
+}
+
+.scm-view .monaco-list-row .history-item > .graph-container.current > .graph > circle:last-child {
+	fill: var(--vscode-sideBar-background);
+}
+
+.scm-view .monaco-list-row:hover .history-item > .graph-container.current > .graph > circle:last-child {
+	fill: var(--vscode-list-hoverBackground);
+}
+
+.scm-view .monaco-list-row .history-item > .graph-container > .graph > circle {
+	stroke: var(--vscode-sideBar-background);
+}
+
+.scm-view .monaco-list-row:hover .history-item > .graph-container > .graph > circle {
+	stroke: var(--vscode-list-hoverBackground);
+}
+
+.scm-view .monaco-list-row .history-item > .label-container {
+	display: flex;
+	flex-shrink: 0;
 	gap: 4px;
 }
 
-.scm-view .monaco-list-row .history-item .stats-container {
-	min-height: 18px;
-	padding: 0 4px;
-	border-radius: 2px;
-	border: 1px solid var(--vscode-scm-historyItemStatisticsBorder);
-}
-
-.scm-view .monaco-list-row.focused .history-item .stats-container,
-.scm-view .monaco-list-row.selected .history-item .stats-container {
-	border: 1px solid var(--vscode-scm-historyItemSelectedStatisticsBorder);
-}
-
-.scm-view .monaco-list-row .history-item .stats-container > .files-label,
-.scm-view .monaco-list-row .history-item .stats-container > .insertions-label,
-.scm-view .monaco-list-row .history-item .stats-container > .deletions-label {
+.scm-view .monaco-list-row .history-item > .label-container > .label {
 	display: flex;
 	align-items: center;
-	opacity: 0.75;
+	border-radius: 10px;
+	line-height: 18px;
 }
 
-.scm-view .monaco-list-row .history-item .stats-container > .insertions-label {
-	color: var(--vscode-scm-historyItemAdditionsForeground);
+.scm-view .monaco-list-row .history-item > .label-container > .label > .count {
+	font-size: 12px;
+	margin-left: 0;
+	padding-left: 4px;
 }
 
-.scm-view .monaco-list-row .history-item .stats-container > .deletions-label {
-	color: var(--vscode-scm-historyItemDeletionsForeground);
+.scm-view .monaco-list-row .history-item > .label-container > .label > .codicon {
+	font-size: 14px;
+	color: inherit !important;
+	padding: 2px;
 }
 
-.scm-view .monaco-list-row .history-item .stats-container.hidden,
-.scm-view .monaco-list-row .history-item .stats-container > .insertions-label.hidden,
-.scm-view .monaco-list-row .history-item .stats-container > .deletions-label.hidden {
-	display: none;
+.scm-view .monaco-list-row .history-item > .label-container > .label > .codicon.codicon-git-branch {
+	font-size: 12px;
+	padding: 3px;
+}
+
+.scm-view .monaco-list-row .history-item > .label-container > .label > .description {
+	font-size: 12px;
+	padding-right: 4px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	max-width: 100px;
 }
 
-.scm-view .monaco-list-row .history-item-group .monaco-icon-label .icon-container,
 .scm-view .monaco-list-row .history-item .monaco-icon-label .icon-container {
 	display: flex;
 	padding-right: 4px;
@@ -183,35 +204,15 @@
 	border-radius: 14px;
 }
 
-.scm-view .monaco-list-row .separator-container {
-	display: flex;
-	align-items: center;
-	padding-left: 11px;
+.scm-view .monaco-list-row .history-item .monaco-icon-label.history-item-current .label-name {
+	font-weight: 600;
 }
 
-.scm-view .monaco-list-row .separator-container .label-name {
-	font-size: 10px;
-}
-
-.scm-view .monaco-list-row.focused .separator-container .label-name,
-.scm-view .monaco-list-row.selected .separator-container .label-name {
-	color: var(--vscode-foreground);
-}
-
-.scm-view .monaco-list-row .separator-container .separator {
-	display: flex;
-	flex-grow: 1;
-	height: 0;
-	margin-left: 6px;
-	border-top: 1px solid var(--vscode-sideBar-border);
-}
-
-.scm-view .monaco-list-row .separator-container .actions {
-	padding-left: 6px;
+.scm-view .monaco-list-row .history-item .monaco-icon-label.history-item-current .label-description {
+	font-weight: 500;
 }
 
 .scm-view .monaco-list-row .history > .name,
-.scm-view .monaco-list-row .history-item-group > .name,
 .scm-view .monaco-list-row .resource-group > .name {
 	flex: 1;
 	overflow: hidden;
@@ -255,8 +256,6 @@
 
 .scm-view .monaco-list .monaco-list-row .resource-group > .actions,
 .scm-view .monaco-list .monaco-list-row .resource > .name > .monaco-icon-label > .actions,
-.scm-view .monaco-list .monaco-list-row .separator-container > .actions,
-.scm-view .monaco-list .monaco-list-row .history-item-group > .actions,
 .scm-view .monaco-list .monaco-list-row .history-item > .actions {
 	display: none;
 	max-width: fit-content;
@@ -267,10 +266,6 @@
 .scm-view .monaco-list .monaco-list-row:hover .resource > .name > .monaco-icon-label > .actions,
 .scm-view .monaco-list .monaco-list-row.focused .resource > .name > .monaco-icon-label > .actions,
 .scm-view .monaco-list:not(.selection-multiple) .monaco-list-row .resource:hover > .actions,
-.scm-view .monaco-list .monaco-list-row:hover .separator-container > .actions,
-.scm-view .monaco-list .monaco-list-row.focused .separator-container > .actions,
-.scm-view .monaco-list .monaco-list-row:hover .history-item-group > .actions,
-.scm-view .monaco-list .monaco-list-row.focused .history-item-group > .actions,
 .scm-view .monaco-list .monaco-list-row:hover .history-item > .actions,
 .scm-view .monaco-list .monaco-list-row.focused .history-item > .actions {
 	display: block;
@@ -291,8 +286,6 @@
 .scm-view.show-actions > .monaco-list .monaco-list-row .scm-input > .scm-editor > .actions,
 .scm-view.show-actions > .monaco-list .monaco-list-row .resource-group > .actions,
 .scm-view.show-actions > .monaco-list .monaco-list-row .resource > .name > .monaco-icon-label > .actions,
-.scm-view.show-actions > .monaco-list .monaco-list-row .separator-container > .actions,
-.scm-view.show-actions > .monaco-list .monaco-list-row .history-item-group > .actions,
 .scm-view.show-actions > .monaco-list .monaco-list-row .history-item > .actions {
 	display: block;
 }
@@ -328,23 +321,6 @@
 	border-radius: 2px;
 }
 
-.scm-view .scm-editor-container .monaco-editor .selected-text {
-	background-color: rgba(var(--vscode-input-background), 0.4);
-	border-radius: 0;
-}
-
-.scm-view .scm-editor-container .monaco-editor .focused .selected-text {
-	background-color: var(--vscode-selection-background, var(--vscode-editor-selectionBackground));
-}
-
-.scm-view .scm-editor-container .monaco-editor .view-line span.inline-selected-text {
-	color: var(--vscode-input-foreground);
-}
-
-.scm-view .scm-editor-container .monaco-editor-background {
-	background-color: var(--vscode-input-background);
-}
-
 .scm-view .scm-editor {
 	box-sizing: border-box;
 	width: 100%;
@@ -484,22 +460,6 @@
 	margin-top: 1px;
 }
 
-.scm-view .scm-editor-placeholder {
-	position: absolute;
-	pointer-events: none;
-	z-index: 1;
-	padding: 2px 6px;
-	box-sizing: border-box;
-	overflow: hidden;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-	color: var(--vscode-input-placeholderForeground);
-}
-
-.scm-view .scm-editor-placeholder.hidden {
-	display: none;
-}
-
 .scm-view .scm-editor-container .monaco-editor-background,
 .scm-view .scm-editor-container .monaco-editor,
 .scm-view .scm-editor-container .monaco-editor .margin,
@@ -514,6 +474,10 @@
 	color: var(--vscode-input-foreground);
 }
 
+.scm-view .scm-editor-container .placeholder-text.mtk1 {
+	color: var(--vscode-input-placeholderForeground);
+}
+
 /* Repositories */
 
 .scm-repositories-view .scm-provider {
@@ -524,3 +488,161 @@
 .scm-repositories-view .scm-provider > .label > .name {
 	font-weight: normal;
 }
+
+/* History item hover */
+
+.monaco-hover.history-item-hover p:first-child {
+	margin-top: 4px;
+}
+
+.monaco-hover.history-item-hover p:last-child {
+	margin-bottom: 0;
+}
+
+.monaco-hover.history-item-hover p:last-child span:not(.codicon) {
+	margin-bottom: 2px !important;
+}
+
+.monaco-hover.history-item-hover hr {
+	margin-top: 4px;
+	margin-bottom: 4px;
+}
+
+.monaco-hover.history-item-hover hr + p {
+	margin: 4px 0;
+}
+
+.monaco-hover.history-item-hover span:not(.codicon) {
+	margin-bottom: 0 !important;
+}
+
+.monaco-hover.history-item-hover p > span > span.codicon.codicon-git-branch {
+	font-size: 12px;
+	margin-bottom: 2px !important;
+}
+
+.monaco-hover.history-item-hover p > span > span.codicon.codicon-tag,
+.monaco-hover.history-item-hover p > span > span.codicon.codicon-target {
+	font-size: 14px;
+	margin-bottom: 2px !important;
+}
+
+.monaco-hover.history-item-hover p > span > span.codicon.codicon-cloud {
+	font-size: 14px;
+	margin-bottom: 1px !important;
+}
+
+.monaco-hover.history-item-hover .hover-row.status-bar .action {
+	display: flex;
+	align-items: center;
+}
+
+.monaco-hover.history-item-hover .hover-row.status-bar .action .codicon {
+	color: inherit;
+	font-size: 12px;
+}
+
+/* Graph */
+
+.pane-header .scm-graph-view-badge-container {
+	display: flex;
+	align-items: center;
+	min-width: fit-content;
+}
+
+.pane-header .scm-graph-view-badge-container > .scm-graph-view-badge.monaco-count-badge.long {
+	background-color: var(--vscode-badge-background);
+	color: var(--vscode-badge-foreground);
+	border: 1px solid var(--vscode-contrastBorder);
+	margin: 0 6px;
+	padding: 2px 4px;
+}
+
+.monaco-workbench .part.auxiliarybar > .title > .title-actions .action-label.scm-graph-repository-picker,
+.monaco-workbench .part.auxiliarybar > .title > .title-actions .action-label.scm-graph-history-item-picker {
+	display: flex;
+}
+
+.monaco-toolbar .action-item > .action-label.scm-graph-repository-picker,
+.monaco-toolbar .action-item > .action-label.scm-graph-history-item-picker {
+	color: var(--vscode-icon-foreground);
+	align-items: center;
+	font-weight: normal;
+	line-height: 16px;
+}
+
+.monaco-toolbar .action-item.disabled > .action-label.scm-graph-repository-picker,
+.monaco-toolbar .action-item.disabled > .action-label.scm-graph-history-item-picker {
+	color: var(--vscode-disabledForeground);
+}
+
+.monaco-toolbar .action-label.scm-graph-repository-picker .codicon,
+.monaco-toolbar .action-label.scm-graph-history-item-picker .codicon {
+	font-size: 14px;
+	color: inherit;
+}
+
+.monaco-toolbar .action-label.scm-graph-repository-picker > .name,
+.monaco-toolbar .action-label.scm-graph-history-item-picker > .name {
+	max-width: 100px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+.scm-history-view .scm-provider .label-name {
+	font-weight: bold;
+}
+
+.scm-history-view .scm-provider .monaco-icon-label {
+	align-items: center;
+}
+
+.scm-history-view .scm-provider .state-label.monaco-count-badge.long {
+	display: flex;
+	font-size: 0.8em;
+	margin: 0 10px;
+	color: var(--vscode-debugView-stateLabelForeground);
+	background: var(--vscode-debugView-stateLabelBackground);
+	border-radius: 2px;
+}
+
+.scm-history-view .scm-provider .actions {
+	display: flex;
+	flex-grow: 1;
+}
+
+.scm-history-view .history-item-load-more {
+	display: flex;
+	height: 22px;
+}
+
+.scm-history-view .history-item-load-more .graph-placeholder {
+	mask-image: linear-gradient(black, transparent);
+}
+
+.scm-history-view .history-item-load-more .history-item-placeholder {
+	flex-grow: 1;
+}
+
+.scm-history-view .history-item-load-more .history-item-placeholder .monaco-highlighted-label {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	color: var(--vscode-textLink-foreground)
+}
+
+.scm-history-view .history-item-load-more .history-item-placeholder .monaco-highlighted-label .codicon {
+	font-size: 12px;
+	color: var(--vscode-textLink-foreground)
+}
+
+.scm-history-view .history-item-load-more .history-item-placeholder.shimmer {
+	padding: 2px 0;
+}
+
+.scm-history-view .history-item-load-more .history-item-placeholder.shimmer .monaco-icon-label-container {
+	height: 18px;
+	background: var(--vscode-scmGraph-historyItemHoverDefaultLabelBackground);
+	border-radius: 2px;
+	opacity: 0.5;
+}
diff --git a/src/vs/workbench/contrib/scm/browser/menus.ts b/src/vs/workbench/contrib/scm/browser/menus.ts
index 915abcb3e32..3056b36f57d 100644
--- a/src/vs/workbench/contrib/scm/browser/menus.ts
+++ b/src/vs/workbench/contrib/scm/browser/menus.ts
@@ -3,19 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IAction } from 'vs/base/common/actions';
-import { equals } from 'vs/base/common/arrays';
-import { Emitter } from 'vs/base/common/event';
-import { DisposableStore, IDisposable, dispose } from 'vs/base/common/lifecycle';
-import 'vs/css!./media/scm';
-import { localize } from 'vs/nls';
-import { createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IMenu, IMenuService, MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { ISCMHistoryProviderMenus, SCMHistoryItemGroupTreeElement, SCMHistoryItemTreeElement } from 'vs/workbench/contrib/scm/common/history';
-import { ISCMMenus, ISCMProvider, ISCMRepository, ISCMRepositoryMenus, ISCMResource, ISCMResourceGroup, ISCMService } from 'vs/workbench/contrib/scm/common/scm';
+import { IAction } from '../../../../base/common/actions.js';
+import { equals } from '../../../../base/common/arrays.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { DisposableStore, IDisposable, dispose } from '../../../../base/common/lifecycle.js';
+import './media/scm.css';
+import { localize } from '../../../../nls.js';
+import { createAndFillInActionBarActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IMenu, IMenuService, MenuId, MenuRegistry } from '../../../../platform/actions/common/actions.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { ISCMMenus, ISCMProvider, ISCMRepository, ISCMRepositoryMenus, ISCMResource, ISCMResourceGroup, ISCMService } from '../common/scm.js';
 
 function actionEquals(a: IAction, b: IAction): boolean {
 	return a.id === b.id;
@@ -174,16 +173,6 @@ export class SCMRepositoryMenus implements ISCMRepositoryMenus, IDisposable {
 		return this._repositoryContextMenu;
 	}
 
-	private _historyProviderMenu: SCMHistoryProviderMenus | undefined;
-	get historyProviderMenu(): SCMHistoryProviderMenus | undefined {
-		if (this.provider.historyProvider && !this._historyProviderMenu) {
-			this._historyProviderMenu = new SCMHistoryProviderMenus(this.contextKeyService, this.menuService);
-			this.disposables.add(this._historyProviderMenu);
-		}
-
-		return this._historyProviderMenu;
-	}
-
 	private readonly disposables = new DisposableStore();
 
 	constructor(
@@ -253,70 +242,6 @@ export class SCMRepositoryMenus implements ISCMRepositoryMenus, IDisposable {
 	}
 }
 
-export class SCMHistoryProviderMenus implements ISCMHistoryProviderMenus, IDisposable {
-
-	private readonly historyItemMenus = new Map<SCMHistoryItemTreeElement, IMenu>();
-	private readonly disposables = new DisposableStore();
-
-	constructor(
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
-		@IMenuService private readonly menuService: IMenuService) { }
-
-	getHistoryItemMenu(historyItem: SCMHistoryItemTreeElement): IMenu {
-		return this.getOrCreateHistoryItemMenu(historyItem);
-	}
-
-	getHistoryItemGroupMenu(historyItemGroup: SCMHistoryItemGroupTreeElement): IMenu {
-		return historyItemGroup.direction === 'incoming' ?
-			this.menuService.createMenu(MenuId.SCMIncomingChanges, this.contextKeyService) :
-			this.getOutgoingHistoryItemGroupMenu(MenuId.SCMOutgoingChanges, historyItemGroup);
-	}
-
-	getHistoryItemGroupContextMenu(historyItemGroup: SCMHistoryItemGroupTreeElement): IMenu {
-		return historyItemGroup.direction === 'incoming' ?
-			this.menuService.createMenu(MenuId.SCMIncomingChangesContext, this.contextKeyService) :
-			this.getOutgoingHistoryItemGroupMenu(MenuId.SCMOutgoingChangesContext, historyItemGroup);
-	}
-
-	private getOrCreateHistoryItemMenu(historyItem: SCMHistoryItemTreeElement): IMenu {
-		let result = this.historyItemMenus.get(historyItem);
-
-		if (!result) {
-			let menuId: MenuId;
-			if (historyItem.historyItemGroup.direction === 'incoming') {
-				menuId = historyItem.type === 'allChanges' ?
-					MenuId.SCMIncomingChangesAllChangesContext :
-					MenuId.SCMIncomingChangesHistoryItemContext;
-			} else {
-				menuId = historyItem.type === 'allChanges' ?
-					MenuId.SCMOutgoingChangesAllChangesContext :
-					MenuId.SCMOutgoingChangesHistoryItemContext;
-			}
-
-			const contextKeyService = this.contextKeyService.createOverlay([
-				['scmHistoryItemFileCount', historyItem.statistics?.files ?? 0],
-			]);
-
-			result = this.menuService.createMenu(menuId, contextKeyService);
-			this.historyItemMenus.set(historyItem, result);
-		}
-
-		return result;
-	}
-
-	private getOutgoingHistoryItemGroupMenu(menuId: MenuId, historyItemGroup: SCMHistoryItemGroupTreeElement): IMenu {
-		const contextKeyService = this.contextKeyService.createOverlay([
-			['scmHistoryItemGroupHasUpstream', !!historyItemGroup.repository.provider.historyProvider?.currentHistoryItemGroup?.base],
-		]);
-
-		return this.menuService.createMenu(menuId, contextKeyService);
-	}
-
-	dispose(): void {
-		this.disposables.dispose();
-	}
-}
-
 export class SCMMenus implements ISCMMenus, IDisposable {
 
 	readonly titleMenu: SCMTitleMenu;
diff --git a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
index bb51dd22748..152b8f2ad0e 100644
--- a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
+++ b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
@@ -3,38 +3,43 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize, localize2 } from 'vs/nls';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IWorkbenchContributionsRegistry, registerWorkbenchContribution2, Extensions as WorkbenchExtensions, WorkbenchPhase } from 'vs/workbench/common/contributions';
-import { DirtyDiffWorkbenchController } from './dirtydiffDecorator';
-import { VIEWLET_ID, ISCMService, VIEW_PANE_ID, ISCMProvider, ISCMViewService, REPOSITORIES_VIEW_PANE_ID } from 'vs/workbench/contrib/scm/common/scm';
-import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
-import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
-import { SCMActiveRepositoryContextKeyController, SCMActiveResourceContextKeyController, SCMActivityCountBadgeController, SCMStatusController } from './activity';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
-import { IContextKeyService, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
-import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { SCMService } from 'vs/workbench/contrib/scm/common/scmService';
-import { IViewContainersRegistry, ViewContainerLocation, Extensions as ViewContainerExtensions, IViewsRegistry } from 'vs/workbench/common/views';
-import { SCMViewPaneContainer } from 'vs/workbench/contrib/scm/browser/scmViewPaneContainer';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { ModesRegistry } from 'vs/editor/common/languages/modesRegistry';
-import { Codicon } from 'vs/base/common/codicons';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { ContextKeys, SCMViewPane } from 'vs/workbench/contrib/scm/browser/scmViewPane';
-import { SCMViewService } from 'vs/workbench/contrib/scm/browser/scmViewService';
-import { SCMRepositoriesViewPane } from 'vs/workbench/contrib/scm/browser/scmRepositoriesViewPane';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { Context as SuggestContext } from 'vs/editor/contrib/suggest/browser/suggest';
-import { MANAGE_TRUST_COMMAND_ID, WorkspaceTrustContext } from 'vs/workbench/contrib/workspace/common/workspace';
-import { IQuickDiffService } from 'vs/workbench/contrib/scm/common/quickDiff';
-import { QuickDiffService } from 'vs/workbench/contrib/scm/common/quickDiffService';
-import { getActiveElement } from 'vs/base/browser/dom';
-import { SCMWorkingSetController } from 'vs/workbench/contrib/scm/browser/workingSet';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
+import { localize, localize2 } from '../../../../nls.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IWorkbenchContributionsRegistry, registerWorkbenchContribution2, Extensions as WorkbenchExtensions, WorkbenchPhase } from '../../../common/contributions.js';
+import { DirtyDiffWorkbenchController } from './dirtydiffDecorator.js';
+import { VIEWLET_ID, ISCMService, VIEW_PANE_ID, ISCMProvider, ISCMViewService, REPOSITORIES_VIEW_PANE_ID, HISTORY_VIEW_PANE_ID } from '../common/scm.js';
+import { KeyMod, KeyCode } from '../../../../base/common/keyCodes.js';
+import { MenuRegistry, MenuId } from '../../../../platform/actions/common/actions.js';
+import { SCMActiveResourceContextKeyController, SCMActiveRepositoryController } from './activity.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { IContextKeyService, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { CommandsRegistry, ICommandService } from '../../../../platform/commands/common/commands.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { SCMService } from '../common/scmService.js';
+import { IViewContainersRegistry, ViewContainerLocation, Extensions as ViewContainerExtensions, IViewsRegistry } from '../../../common/views.js';
+import { SCMViewPaneContainer } from './scmViewPaneContainer.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { ModesRegistry } from '../../../../editor/common/languages/modesRegistry.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { ContextKeys, SCMViewPane } from './scmViewPane.js';
+import { SCMViewService } from './scmViewService.js';
+import { SCMRepositoriesViewPane } from './scmRepositoriesViewPane.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { Context as SuggestContext } from '../../../../editor/contrib/suggest/browser/suggest.js';
+import { MANAGE_TRUST_COMMAND_ID, WorkspaceTrustContext } from '../../workspace/common/workspace.js';
+import { IQuickDiffService } from '../common/quickDiff.js';
+import { QuickDiffService } from '../common/quickDiffService.js';
+import { getActiveElement, isActiveElement } from '../../../../base/browser/dom.js';
+import { SCMWorkingSetController } from './workingSet.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { IListService, WorkbenchList } from '../../../../platform/list/browser/listService.js';
+import { isSCMRepository } from './util.js';
+import { SCMHistoryViewPane } from './scmHistoryViewPane.js';
+import { IsWebContext } from '../../../../platform/contextkey/common/contextkeys.js';
+import { RemoteNameContext } from '../../../common/contextkeys.js';
 
 ModesRegistry.registerLanguage({
 	id: 'scminput',
@@ -76,14 +81,33 @@ viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
 	when: ContextKeyExpr.and(ContextKeyExpr.equals('scm.providerCount', 0), WorkspaceTrustContext.IsEnabled, WorkspaceTrustContext.IsTrusted.toNegated())
 });
 
+viewsRegistry.registerViewWelcomeContent(HISTORY_VIEW_PANE_ID, {
+	content: localize('no history items', "The selected source control provider does not have any source control history items."),
+	when: ContextKeys.SCMHistoryItemCount.isEqualTo(0)
+});
+
+viewsRegistry.registerViews([{
+	id: REPOSITORIES_VIEW_PANE_ID,
+	name: localize2('source control repositories', "Source Control Repositories"),
+	ctorDescriptor: new SyncDescriptor(SCMRepositoriesViewPane),
+	canToggleVisibility: true,
+	hideByDefault: true,
+	canMoveView: true,
+	weight: 20,
+	order: 0,
+	when: ContextKeyExpr.and(ContextKeyExpr.has('scm.providerCount'), ContextKeyExpr.notEquals('scm.providerCount', 0)),
+	// readonly when = ContextKeyExpr.or(ContextKeyExpr.equals('config.scm.alwaysShowProviders', true), ContextKeyExpr.and(ContextKeyExpr.notEquals('scm.providerCount', 0), ContextKeyExpr.notEquals('scm.providerCount', 1)));
+	containerIcon: sourceControlViewIcon
+}], viewContainer);
+
 viewsRegistry.registerViews([{
 	id: VIEW_PANE_ID,
 	name: localize2('source control', 'Source Control'),
 	ctorDescriptor: new SyncDescriptor(SCMViewPane),
 	canToggleVisibility: true,
 	canMoveView: true,
-	weight: 80,
-	order: -999,
+	weight: 40,
+	order: 1,
 	containerIcon: sourceControlViewIcon,
 	openCommandActionDescriptor: {
 		id: viewContainer.id,
@@ -99,31 +123,32 @@ viewsRegistry.registerViews([{
 }], viewContainer);
 
 viewsRegistry.registerViews([{
-	id: REPOSITORIES_VIEW_PANE_ID,
-	name: localize2('source control repositories', "Source Control Repositories"),
-	ctorDescriptor: new SyncDescriptor(SCMRepositoriesViewPane),
+	id: HISTORY_VIEW_PANE_ID,
+	name: localize2('source control history', "Source Control Graph"),
+	ctorDescriptor: new SyncDescriptor(SCMHistoryViewPane),
 	canToggleVisibility: true,
-	hideByDefault: true,
 	canMoveView: true,
-	weight: 20,
-	order: -1000,
-	when: ContextKeyExpr.and(ContextKeyExpr.has('scm.providerCount'), ContextKeyExpr.notEquals('scm.providerCount', 0)),
-	// readonly when = ContextKeyExpr.or(ContextKeyExpr.equals('config.scm.alwaysShowProviders', true), ContextKeyExpr.and(ContextKeyExpr.notEquals('scm.providerCount', 0), ContextKeyExpr.notEquals('scm.providerCount', 1)));
+	weight: 40,
+	order: 2,
+	when: ContextKeyExpr.and(
+		// Repository Count
+		ContextKeyExpr.and(
+			ContextKeyExpr.has('scm.providerCount'),
+			ContextKeyExpr.notEquals('scm.providerCount', 0)),
+		// Not Serverless
+		ContextKeyExpr.and(
+			IsWebContext,
+			RemoteNameContext.isEqualTo(''))?.negate()
+	),
 	containerIcon: sourceControlViewIcon
 }], viewContainer);
 
 Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench)
-	.registerWorkbenchContribution(SCMActivityCountBadgeController, LifecyclePhase.Restored);
+	.registerWorkbenchContribution(SCMActiveRepositoryController, LifecyclePhase.Restored);
 
 Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench)
 	.registerWorkbenchContribution(SCMActiveResourceContextKeyController, LifecyclePhase.Restored);
 
-Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench)
-	.registerWorkbenchContribution(SCMActiveRepositoryContextKeyController, LifecyclePhase.Restored);
-
-Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench)
-	.registerWorkbenchContribution(SCMStatusController, LifecyclePhase.Restored);
-
 registerWorkbenchContribution2(
 	SCMWorkingSetController.ID,
 	SCMWorkingSetController,
@@ -314,33 +339,6 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).regis
 			markdownDescription: localize('showInputActionButton', "Controls whether an action button can be shown in the Source Control input."),
 			default: true
 		},
-		'scm.showIncomingChanges': {
-			type: 'string',
-			enum: ['always', 'never', 'auto'],
-			enumDescriptions: [
-				localize('scm.showIncomingChanges.always', "Always show incoming changes in the Source Control view."),
-				localize('scm.showIncomingChanges.never', "Never show incoming changes in the Source Control view."),
-				localize('scm.showIncomingChanges.auto', "Only show incoming changes in the Source Control view when any exist."),
-			],
-			description: localize('scm.showIncomingChanges', "Controls whether incoming changes are shown in the Source Control view."),
-			default: 'auto'
-		},
-		'scm.showOutgoingChanges': {
-			type: 'string',
-			enum: ['always', 'never', 'auto'],
-			enumDescriptions: [
-				localize('scm.showOutgoingChanges.always', "Always show outgoing changes in the Source Control view."),
-				localize('scm.showOutgoingChanges.never', "Never show outgoing changes in the Source Control view."),
-				localize('scm.showOutgoingChanges.auto', "Only show outgoing changes in the Source Control view when any exist."),
-			],
-			description: localize('scm.showOutgoingChanges', "Controls whether outgoing changes are shown in the Source Control view."),
-			default: 'auto'
-		},
-		'scm.showChangesSummary': {
-			type: 'boolean',
-			description: localize('scm.showChangesSummary', "Controls whether the All Changes entry is shown for incoming/outgoing changes in the Source Control view."),
-			default: true
-		},
 		'scm.workingSets.enabled': {
 			type: 'boolean',
 			description: localize('scm.workingSets.enabled', "Controls whether to store editor working sets when switching between source control history item groups."),
@@ -355,6 +353,33 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).regis
 			],
 			description: localize('scm.workingSets.default', "Controls the default working set to use when switching to a source control history item group that does not have a working set."),
 			default: 'current'
+		},
+		'scm.compactFolders': {
+			type: 'boolean',
+			description: localize('scm.compactFolders', "Controls whether the Source Control view should render folders in a compact form. In such a form, single child folders will be compressed in a combined tree element."),
+			default: true
+		},
+		'scm.graph.pageOnScroll': {
+			type: 'boolean',
+			description: localize('scm.graph.pageOnScroll', "Controls whether the Source Control Graph view will load the next page of items when you scroll to the end of the list."),
+			default: true
+		},
+		'scm.graph.pageSize': {
+			type: 'number',
+			description: localize('scm.graph.pageSize', "The number of items to show in the Source Control Graph view by default and when loading more items."),
+			minimum: 1,
+			maximum: 1000,
+			default: 50
+		},
+		'scm.graph.badges': {
+			type: 'string',
+			enum: ['all', 'filter'],
+			enumDescriptions: [
+				localize('scm.graph.badges.all', "Show badges of all history item groups in the Source Control Graph view."),
+				localize('scm.graph.badges.filter', "Show only the badges of history item groups used as a filter in the Source Control Graph view.")
+			],
+			description: localize('scm.graph.badges', "Controls which badges are shown in the Source Control Graph view. The badges are shown on the right side of the graph indicating the names of history item groups."),
+			default: 'filter'
 		}
 	}
 });
@@ -392,7 +417,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: 'scm.clearInput',
 	weight: KeybindingWeight.WorkbenchContrib,
-	when: ContextKeyExpr.has('scmRepository'),
+	when: ContextKeyExpr.and(ContextKeyExpr.has('scmRepository'), SuggestContext.Visible.toNegated()),
 	primary: KeyCode.Escape,
 	handler: async (accessor) => {
 		const scmService = accessor.get(ISCMService);
@@ -459,12 +484,35 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	primary: KeyMod.Alt | KeyCode.UpArrow
 });
 
-CommandsRegistry.registerCommand('scm.openInIntegratedTerminal', async (accessor, provider: ISCMProvider) => {
-	if (!provider || !provider.rootUri) {
+CommandsRegistry.registerCommand('scm.openInIntegratedTerminal', async (accessor, ...providers: ISCMProvider[]) => {
+	if (!providers || providers.length === 0) {
 		return;
 	}
 
 	const commandService = accessor.get(ICommandService);
+	const listService = accessor.get(IListService);
+
+	let provider = providers.length === 1 ? providers[0] : undefined;
+
+	if (!provider) {
+		const list = listService.lastFocusedList;
+		const element = list?.getHTMLElement();
+
+		if (list instanceof WorkbenchList && element && isActiveElement(element)) {
+			const [index] = list.getFocus();
+			const focusedElement = list.element(index);
+
+			// Source Control Repositories
+			if (isSCMRepository(focusedElement)) {
+				provider = focusedElement.provider;
+			}
+		}
+	}
+
+	if (!provider?.rootUri) {
+		return;
+	}
+
 	await commandService.executeCommand('openInIntegratedTerminal', provider.rootUri);
 });
 
diff --git a/src/vs/workbench/contrib/scm/browser/scmHistory.ts b/src/vs/workbench/contrib/scm/browser/scmHistory.ts
new file mode 100644
index 00000000000..4b73b9c27ec
--- /dev/null
+++ b/src/vs/workbench/contrib/scm/browser/scmHistory.ts
@@ -0,0 +1,355 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { localize } from '../../../../nls.js';
+import { deepClone } from '../../../../base/common/objects.js';
+import { badgeBackground, buttonForeground, chartsBlue, chartsPurple, foreground } from '../../../../platform/theme/common/colorRegistry.js';
+import { asCssVariable, ColorIdentifier, registerColor } from '../../../../platform/theme/common/colorUtils.js';
+import { ISCMHistoryItem, ISCMHistoryItemGraphNode, ISCMHistoryItemRef, ISCMHistoryItemViewModel } from '../common/history.js';
+import { rot } from '../../../../base/common/numbers.js';
+import { svgElem } from '../../../../base/browser/dom.js';
+import { compareHistoryItemRefs } from './util.js';
+
+export const SWIMLANE_HEIGHT = 22;
+export const SWIMLANE_WIDTH = 11;
+const SWIMLANE_CURVE_RADIUS = 5;
+const CIRCLE_RADIUS = 4;
+const CIRCLE_STROKE_WIDTH = 2;
+
+/**
+ * History item reference colors (local, remote, base)
+ */
+export const historyItemRefColor = registerColor('scmGraph.historyItemRefColor', chartsBlue, localize('scmGraphHistoryItemRefColor', "History item reference color."));
+export const historyItemRemoteRefColor = registerColor('scmGraph.historyItemRemoteRefColor', chartsPurple, localize('scmGraphHistoryItemRemoteRefColor', "History item remote reference color."));
+export const historyItemBaseRefColor = registerColor('scmGraph.historyItemBaseRefColor', '#EA5C00', localize('scmGraphHistoryItemBaseRefColor', "History item base reference color."));
+
+/**
+ * History item hover color
+ */
+export const historyItemHoverDefaultLabelForeground = registerColor('scmGraph.historyItemHoverDefaultLabelForeground', foreground, localize('scmGraphHistoryItemHoverDefaultLabelForeground', "History item hover default label foreground color."));
+export const historyItemHoverDefaultLabelBackground = registerColor('scmGraph.historyItemHoverDefaultLabelBackground', badgeBackground, localize('scmGraphHistoryItemHoverDefaultLabelBackground', "History item hover default label background color."));
+export const historyItemHoverLabelForeground = registerColor('scmGraph.historyItemHoverLabelForeground', buttonForeground, localize('scmGraphHistoryItemHoverLabelForeground', "History item hover label foreground color."));
+export const historyItemHoverAdditionsForeground = registerColor('scmGraph.historyItemHoverAdditionsForeground', { light: '#587C0C', dark: '#81B88B', hcDark: '#A1E3AD', hcLight: '#374E06' }, localize('scmGraph.HistoryItemHoverAdditionsForeground', "History item hover additions foreground color."));
+export const historyItemHoverDeletionsForeground = registerColor('scmGraph.historyItemHoverDeletionsForeground', { light: '#AD0707', dark: '#C74E39', hcDark: '#C74E39', hcLight: '#AD0707' }, localize('scmGraph.HistoryItemHoverDeletionsForeground', "History item hover deletions foreground color."));
+
+/**
+ * History graph color registry
+ */
+export const colorRegistry: ColorIdentifier[] = [
+	registerColor('scmGraph.foreground1', '#FFB000', localize('scmGraphForeground1', "Source control graph foreground color (1).")),
+	registerColor('scmGraph.foreground2', '#DC267F', localize('scmGraphForeground2', "Source control graph foreground color (2).")),
+	registerColor('scmGraph.foreground3', '#994F00', localize('scmGraphForeground3', "Source control graph foreground color (3).")),
+	registerColor('scmGraph.foreground4', '#40B0A6', localize('scmGraphForeground4', "Source control graph foreground color (4).")),
+	registerColor('scmGraph.foreground5', '#B66DFF', localize('scmGraphForeground5', "Source control graph foreground color (5).")),
+];
+
+function getLabelColorIdentifier(historyItem: ISCMHistoryItem, colorMap: Map<string, ColorIdentifier | undefined>): ColorIdentifier | undefined {
+	for (const ref of historyItem.references ?? []) {
+		const colorIdentifier = colorMap.get(ref.id);
+		if (colorIdentifier !== undefined) {
+			return colorIdentifier;
+		}
+	}
+
+	return undefined;
+}
+
+function createPath(colorIdentifier: string): SVGPathElement {
+	const path = document.createElementNS('http://www.w3.org/2000/svg', 'path');
+	path.setAttribute('fill', 'none');
+	path.setAttribute('stroke-width', '1px');
+	path.setAttribute('stroke-linecap', 'round');
+	path.style.stroke = asCssVariable(colorIdentifier);
+
+	return path;
+}
+
+function drawCircle(index: number, radius: number, strokeWidth: number, colorIdentifier?: string): SVGCircleElement {
+	const circle = document.createElementNS('http://www.w3.org/2000/svg', 'circle');
+	circle.setAttribute('cx', `${SWIMLANE_WIDTH * (index + 1)}`);
+	circle.setAttribute('cy', `${SWIMLANE_WIDTH}`);
+	circle.setAttribute('r', `${radius}`);
+
+	circle.style.strokeWidth = `${strokeWidth}px`;
+	if (colorIdentifier) {
+		circle.style.fill = asCssVariable(colorIdentifier);
+	}
+
+	return circle;
+}
+
+function drawVerticalLine(x1: number, y1: number, y2: number, color: string): SVGPathElement {
+	const path = createPath(color);
+	path.setAttribute('d', `M ${x1} ${y1} V ${y2}`);
+
+	return path;
+}
+
+function findLastIndex(nodes: ISCMHistoryItemGraphNode[], id: string): number {
+	for (let i = nodes.length - 1; i >= 0; i--) {
+		if (nodes[i].id === id) {
+			return i;
+		}
+	}
+
+	return -1;
+}
+
+export function renderSCMHistoryItemGraph(historyItemViewModel: ISCMHistoryItemViewModel): SVGElement {
+	const svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
+	svg.classList.add('graph');
+
+	const historyItem = historyItemViewModel.historyItem;
+	const inputSwimlanes = historyItemViewModel.inputSwimlanes;
+	const outputSwimlanes = historyItemViewModel.outputSwimlanes;
+
+	// Find the history item in the input swimlanes
+	const inputIndex = inputSwimlanes.findIndex(node => node.id === historyItem.id);
+
+	// Circle index - use the input swimlane index if present, otherwise add it to the end
+	const circleIndex = inputIndex !== -1 ? inputIndex : inputSwimlanes.length;
+
+	// Circle color - use the output swimlane color if present, otherwise the input swimlane color
+	const circleColor = circleIndex < outputSwimlanes.length ? outputSwimlanes[circleIndex].color :
+		circleIndex < inputSwimlanes.length ? inputSwimlanes[circleIndex].color : historyItemRefColor;
+
+	let outputSwimlaneIndex = 0;
+	for (let index = 0; index < inputSwimlanes.length; index++) {
+		const color = inputSwimlanes[index].color;
+
+		// Current commit
+		if (inputSwimlanes[index].id === historyItem.id) {
+			// Base commit
+			if (index !== circleIndex) {
+				const d: string[] = [];
+				const path = createPath(color);
+
+				// Draw /
+				d.push(`M ${SWIMLANE_WIDTH * (index + 1)} 0`);
+				d.push(`A ${SWIMLANE_WIDTH} ${SWIMLANE_WIDTH} 0 0 1 ${SWIMLANE_WIDTH * (index)} ${SWIMLANE_WIDTH}`);
+
+				// Draw -
+				d.push(`H ${SWIMLANE_WIDTH * (circleIndex + 1)}`);
+
+				path.setAttribute('d', d.join(' '));
+				svg.append(path);
+			} else {
+				outputSwimlaneIndex++;
+			}
+		} else {
+			// Not the current commit
+			if (outputSwimlaneIndex < outputSwimlanes.length &&
+				inputSwimlanes[index].id === outputSwimlanes[outputSwimlaneIndex].id) {
+				if (index === outputSwimlaneIndex) {
+					// Draw |
+					const path = drawVerticalLine(SWIMLANE_WIDTH * (index + 1), 0, SWIMLANE_HEIGHT, color);
+					svg.append(path);
+				} else {
+					const d: string[] = [];
+					const path = createPath(color);
+
+					// Draw |
+					d.push(`M ${SWIMLANE_WIDTH * (index + 1)} 0`);
+					d.push(`V 6`);
+
+					// Draw /
+					d.push(`A ${SWIMLANE_CURVE_RADIUS} ${SWIMLANE_CURVE_RADIUS} 0 0 1 ${(SWIMLANE_WIDTH * (index + 1)) - SWIMLANE_CURVE_RADIUS} ${SWIMLANE_HEIGHT / 2}`);
+
+					// Draw -
+					d.push(`H ${(SWIMLANE_WIDTH * (outputSwimlaneIndex + 1)) + SWIMLANE_CURVE_RADIUS}`);
+
+					// Draw /
+					d.push(`A ${SWIMLANE_CURVE_RADIUS} ${SWIMLANE_CURVE_RADIUS} 0 0 0 ${SWIMLANE_WIDTH * (outputSwimlaneIndex + 1)} ${(SWIMLANE_HEIGHT / 2) + SWIMLANE_CURVE_RADIUS}`);
+
+					// Draw |
+					d.push(`V ${SWIMLANE_HEIGHT}`);
+
+					path.setAttribute('d', d.join(' '));
+					svg.append(path);
+				}
+
+				outputSwimlaneIndex++;
+			}
+		}
+	}
+
+	// Add remaining parent(s)
+	for (let i = 1; i < historyItem.parentIds.length; i++) {
+		const parentOutputIndex = findLastIndex(outputSwimlanes, historyItem.parentIds[i]);
+		if (parentOutputIndex === -1) {
+			continue;
+		}
+
+		// Draw -\
+		const d: string[] = [];
+		const path = createPath(outputSwimlanes[parentOutputIndex].color);
+
+		// Draw \
+		d.push(`M ${SWIMLANE_WIDTH * parentOutputIndex} ${SWIMLANE_HEIGHT / 2}`);
+		d.push(`A ${SWIMLANE_WIDTH} ${SWIMLANE_WIDTH} 0 0 1 ${SWIMLANE_WIDTH * (parentOutputIndex + 1)} ${SWIMLANE_HEIGHT}`);
+
+		// Draw -
+		d.push(`M ${SWIMLANE_WIDTH * parentOutputIndex} ${SWIMLANE_HEIGHT / 2}`);
+		d.push(`H ${SWIMLANE_WIDTH * (circleIndex + 1)} `);
+
+		path.setAttribute('d', d.join(' '));
+		svg.append(path);
+	}
+
+	// Draw | to *
+	if (inputIndex !== -1) {
+		const path = drawVerticalLine(SWIMLANE_WIDTH * (circleIndex + 1), 0, SWIMLANE_HEIGHT / 2, inputSwimlanes[inputIndex].color);
+		svg.append(path);
+	}
+
+	// Draw | from *
+	if (historyItem.parentIds.length > 0) {
+		const path = drawVerticalLine(SWIMLANE_WIDTH * (circleIndex + 1), SWIMLANE_HEIGHT / 2, SWIMLANE_HEIGHT, circleColor);
+		svg.append(path);
+	}
+
+	// Draw *
+	if (historyItemViewModel.isCurrent) {
+		// HEAD
+		const outerCircle = drawCircle(circleIndex, CIRCLE_RADIUS + 3, CIRCLE_STROKE_WIDTH, circleColor);
+		svg.append(outerCircle);
+
+		const innerCircle = drawCircle(circleIndex, CIRCLE_STROKE_WIDTH, CIRCLE_RADIUS);
+		svg.append(innerCircle);
+	} else {
+		if (historyItem.parentIds.length > 1) {
+			// Multi-parent node
+			const circleOuter = drawCircle(circleIndex, CIRCLE_RADIUS + 2, CIRCLE_STROKE_WIDTH, circleColor);
+			svg.append(circleOuter);
+
+			const circleInner = drawCircle(circleIndex, CIRCLE_RADIUS - 1, CIRCLE_STROKE_WIDTH, circleColor);
+			svg.append(circleInner);
+		} else {
+			// Node
+			const circle = drawCircle(circleIndex, CIRCLE_RADIUS + 1, CIRCLE_STROKE_WIDTH, circleColor);
+			svg.append(circle);
+		}
+	}
+
+	// Set dimensions
+	svg.style.height = `${SWIMLANE_HEIGHT}px`;
+	svg.style.width = `${SWIMLANE_WIDTH * (Math.max(inputSwimlanes.length, outputSwimlanes.length, 1) + 1)}px`;
+
+	return svg;
+}
+
+export function renderSCMHistoryGraphPlaceholder(columns: ISCMHistoryItemGraphNode[]): HTMLElement {
+	const elements = svgElem('svg', {
+		style: { height: `${SWIMLANE_HEIGHT}px`, width: `${SWIMLANE_WIDTH * (columns.length + 1)}px`, }
+	});
+
+	// Draw |
+	for (let index = 0; index < columns.length; index++) {
+		const path = drawVerticalLine(SWIMLANE_WIDTH * (index + 1), 0, SWIMLANE_HEIGHT, columns[index].color);
+		elements.root.append(path);
+	}
+
+	return elements.root;
+}
+
+export function toISCMHistoryItemViewModelArray(
+	historyItems: ISCMHistoryItem[],
+	colorMap = new Map<string, ColorIdentifier | undefined>(),
+	currentHistoryItemRef?: ISCMHistoryItemRef,
+	currentHistoryItemRemoteRef?: ISCMHistoryItemRef,
+	currentHistoryItemBaseRef?: ISCMHistoryItemRef
+): ISCMHistoryItemViewModel[] {
+	let colorIndex = -1;
+	const viewModels: ISCMHistoryItemViewModel[] = [];
+
+	for (let index = 0; index < historyItems.length; index++) {
+		const historyItem = historyItems[index];
+
+		const isCurrent = historyItem.id === currentHistoryItemRef?.revision;
+		const outputSwimlanesFromPreviousItem = viewModels.at(-1)?.outputSwimlanes ?? [];
+		const inputSwimlanes = outputSwimlanesFromPreviousItem.map(i => deepClone(i));
+		const outputSwimlanes: ISCMHistoryItemGraphNode[] = [];
+
+		let firstParentAdded = false;
+
+		// Add first parent to the output
+		if (historyItem.parentIds.length > 0) {
+			for (const node of inputSwimlanes) {
+				if (node.id === historyItem.id) {
+					if (!firstParentAdded) {
+						outputSwimlanes.push({
+							id: historyItem.parentIds[0],
+							color: getLabelColorIdentifier(historyItem, colorMap) ?? node.color
+						});
+						firstParentAdded = true;
+					}
+
+					continue;
+				}
+
+				outputSwimlanes.push(deepClone(node));
+			}
+		}
+
+		// Add unprocessed parent(s) to the output
+		for (let i = firstParentAdded ? 1 : 0; i < historyItem.parentIds.length; i++) {
+			// Color index (label -> next color)
+			let colorIdentifier: string | undefined;
+
+			if (!firstParentAdded) {
+				colorIdentifier = getLabelColorIdentifier(historyItem, colorMap);
+			} else {
+				const historyItemParent = historyItems
+					.find(h => h.id === historyItem.parentIds[i]);
+				colorIdentifier = historyItemParent ? getLabelColorIdentifier(historyItemParent, colorMap) : undefined;
+			}
+
+			if (!colorIdentifier) {
+				colorIndex = rot(colorIndex + 1, colorRegistry.length);
+				colorIdentifier = colorRegistry[colorIndex];
+			}
+
+			outputSwimlanes.push({
+				id: historyItem.parentIds[i],
+				color: colorIdentifier
+			});
+		}
+
+		// Add colors to references
+		const references = (historyItem.references ?? [])
+			.map(ref => {
+				let color = colorMap.get(ref.id);
+				if (colorMap.has(ref.id) && color === undefined) {
+					// Find the history item in the input swimlanes
+					const inputIndex = inputSwimlanes.findIndex(node => node.id === historyItem.id);
+
+					// Circle index - use the input swimlane index if present, otherwise add it to the end
+					const circleIndex = inputIndex !== -1 ? inputIndex : inputSwimlanes.length;
+
+					// Circle color - use the output swimlane color if present, otherwise the input swimlane color
+					color = circleIndex < outputSwimlanes.length ? outputSwimlanes[circleIndex].color :
+						circleIndex < inputSwimlanes.length ? inputSwimlanes[circleIndex].color : historyItemRefColor;
+				}
+
+				return { ...ref, color };
+			});
+
+		// Sort references
+		references.sort((ref1, ref2) =>
+			compareHistoryItemRefs(ref1, ref2, currentHistoryItemRef, currentHistoryItemRemoteRef, currentHistoryItemBaseRef));
+
+		viewModels.push({
+			historyItem: {
+				...historyItem,
+				references
+			},
+			isCurrent,
+			inputSwimlanes,
+			outputSwimlanes,
+		});
+	}
+
+	return viewModels;
+}
diff --git a/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts
new file mode 100644
index 00000000000..037a2e40c4d
--- /dev/null
+++ b/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts
@@ -0,0 +1,1594 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import './media/scm.css';
+import * as platform from '../../../../base/common/platform.js';
+import { $, append, h, reset } from '../../../../base/browser/dom.js';
+import { IHoverOptions, IManagedHoverTooltipMarkdownString } from '../../../../base/browser/ui/hover/hover.js';
+import { IHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegate.js';
+import { IconLabel } from '../../../../base/browser/ui/iconLabel/iconLabel.js';
+import { IIdentityProvider, IKeyboardNavigationLabelProvider, IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
+import { LabelFuzzyScore } from '../../../../base/browser/ui/tree/abstractTree.js';
+import { IAsyncDataSource, ITreeContextMenuEvent, ITreeNode, ITreeRenderer } from '../../../../base/browser/ui/tree/tree.js';
+import { fromNow } from '../../../../base/common/date.js';
+import { createMatches, FuzzyScore, IMatch } from '../../../../base/common/filters.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import { autorun, autorunWithStore, derived, IObservable, observableValue, waitForState, constObservable, latestChangedValue, observableFromEvent, runOnChange, observableSignal } from '../../../../base/common/observable.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { localize } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IHoverService, WorkbenchHoverDelegate } from '../../../../platform/hover/browser/hover.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IOpenEvent, WorkbenchAsyncDataTree } from '../../../../platform/list/browser/listService.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { asCssVariable, ColorIdentifier, foreground } from '../../../../platform/theme/common/colorRegistry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IViewPaneOptions, ViewAction, ViewPane, ViewPaneShowActions } from '../../../browser/parts/views/viewPane.js';
+import { IViewDescriptorService, ViewContainerLocation } from '../../../common/views.js';
+import { renderSCMHistoryItemGraph, toISCMHistoryItemViewModelArray, SWIMLANE_WIDTH, renderSCMHistoryGraphPlaceholder, historyItemHoverDeletionsForeground, historyItemHoverLabelForeground, historyItemHoverAdditionsForeground, historyItemHoverDefaultLabelForeground, historyItemHoverDefaultLabelBackground } from './scmHistory.js';
+import { getHistoryItemEditorTitle, getProviderKey, isSCMHistoryItemLoadMoreTreeElement, isSCMHistoryItemViewModelTreeElement, isSCMRepository } from './util.js';
+import { ISCMHistoryItem, ISCMHistoryItemRef, ISCMHistoryItemViewModel, ISCMHistoryProvider, SCMHistoryItemLoadMoreTreeElement, SCMHistoryItemViewModelTreeElement } from '../common/history.js';
+import { HISTORY_VIEW_PANE_ID, ISCMProvider, ISCMRepository, ISCMService, ISCMViewService } from '../common/scm.js';
+import { IListAccessibilityProvider } from '../../../../base/browser/ui/list/listWidget.js';
+import { stripIcons } from '../../../../base/common/iconLabels.js';
+import { IWorkbenchLayoutService, Position } from '../../../services/layout/browser/layoutService.js';
+import { HoverPosition } from '../../../../base/browser/ui/hover/hoverWidget.js';
+import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { Sequencer, Throttler } from '../../../../base/common/async.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { ActionRunner, IAction, IActionRunner } from '../../../../base/common/actions.js';
+import { delta, groupBy, tail } from '../../../../base/common/arrays.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { IProgressService } from '../../../../platform/progress/common/progress.js';
+import { ContextKeys } from './scmViewPane.js';
+import { IActionViewItem } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { IDropdownMenuActionViewItemOptions } from '../../../../base/browser/ui/dropdown/dropdownActionViewItem.js';
+import { ActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from '../../../../platform/quickinput/common/quickInput.js';
+import { Event } from '../../../../base/common/event.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { clamp } from '../../../../base/common/numbers.js';
+import { observableConfigValue } from '../../../../platform/observable/common/platformObservableUtils.js';
+import { compare } from '../../../../base/common/strings.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { groupBy as groupBy2 } from '../../../../base/common/collections.js';
+
+const PICK_REPOSITORY_ACTION_ID = 'workbench.scm.action.graph.pickRepository';
+const PICK_HISTORY_ITEM_REFS_ACTION_ID = 'workbench.scm.action.graph.pickHistoryItemRefs';
+
+type TreeElement = SCMHistoryItemViewModelTreeElement | SCMHistoryItemLoadMoreTreeElement;
+
+class SCMRepositoryActionViewItem extends ActionViewItem {
+	constructor(private readonly _repository: ISCMRepository, action: IAction, options?: IDropdownMenuActionViewItemOptions) {
+		super(null, action, { ...options, icon: false, label: true });
+	}
+
+	protected override updateLabel(): void {
+		if (this.options.label && this.label) {
+			this.label.classList.add('scm-graph-repository-picker');
+
+			const icon = $('.icon');
+			icon.classList.add(...ThemeIcon.asClassNameArray(Codicon.repo));
+
+			const name = $('.name');
+			name.textContent = this._repository.provider.name;
+
+
+			reset(this.label, icon, name);
+		}
+	}
+
+	protected override getTooltip(): string | undefined {
+		return this._repository.provider.name;
+	}
+}
+
+class SCMHistoryItemRefsActionViewItem extends ActionViewItem {
+	constructor(
+		private readonly _repository: ISCMRepository,
+		private readonly _historyItemsFilter: 'all' | 'auto' | ISCMHistoryItemRef[],
+		action: IAction,
+		options?: IDropdownMenuActionViewItemOptions
+	) {
+		super(null, action, { ...options, icon: false, label: true });
+	}
+
+	protected override updateLabel(): void {
+		if (this.options.label && this.label) {
+			this.label.classList.add('scm-graph-history-item-picker');
+
+			const icon = $('.icon');
+			icon.classList.add(...ThemeIcon.asClassNameArray(Codicon.gitBranch));
+
+			const name = $('.name');
+			if (this._historyItemsFilter === 'all') {
+				name.textContent = localize('all', "All");
+			} else if (this._historyItemsFilter === 'auto') {
+				name.textContent = localize('auto', "Auto");
+			} else if (this._historyItemsFilter.length === 1) {
+				name.textContent = this._historyItemsFilter[0].name;
+			} else {
+				name.textContent = localize('items', "{0} Items", this._historyItemsFilter.length);
+			}
+
+			reset(this.label, icon, name);
+		}
+	}
+
+	protected override getTooltip(): string | undefined {
+		if (this._historyItemsFilter === 'all') {
+			return localize('allHistoryItemRefs', "All history item references");
+		} else if (this._historyItemsFilter === 'auto') {
+			const historyProvider = this._repository.provider.historyProvider.get();
+
+			return [
+				historyProvider?.historyItemRef.get()?.name,
+				historyProvider?.historyItemRemoteRef.get()?.name,
+				historyProvider?.historyItemBaseRef.get()?.name
+			].filter(ref => !!ref).join(', ');
+		} else if (this._historyItemsFilter.length === 1) {
+			return this._historyItemsFilter[0].name;
+		} else {
+			return this._historyItemsFilter.map(ref => ref.name).join(', ');
+		}
+	}
+}
+
+registerAction2(class extends ViewAction<SCMHistoryViewPane> {
+	constructor() {
+		super({
+			id: PICK_REPOSITORY_ACTION_ID,
+			title: localize('repositoryPicker', "Repository Picker"),
+			viewId: HISTORY_VIEW_PANE_ID,
+			f1: false,
+			menu: {
+				id: MenuId.SCMHistoryTitle,
+				when: ContextKeyExpr.and(ContextKeyExpr.has('scm.providerCount'), ContextKeyExpr.greater('scm.providerCount', 1)),
+				group: 'navigation',
+				order: 0
+			}
+		});
+	}
+
+	async runInView(_: ServicesAccessor, view: SCMHistoryViewPane): Promise<void> {
+		view.pickRepository();
+	}
+});
+
+registerAction2(class extends ViewAction<SCMHistoryViewPane> {
+	constructor() {
+		super({
+			id: PICK_HISTORY_ITEM_REFS_ACTION_ID,
+			title: localize('referencePicker', "History Item Reference Picker"),
+			icon: Codicon.gitBranch,
+			viewId: HISTORY_VIEW_PANE_ID,
+			precondition: ContextKeys.SCMHistoryItemCount.notEqualsTo(0),
+			f1: false,
+			menu: {
+				id: MenuId.SCMHistoryTitle,
+				group: 'navigation',
+				order: 1
+			}
+		});
+	}
+
+	async runInView(_: ServicesAccessor, view: SCMHistoryViewPane): Promise<void> {
+		view.pickHistoryItemRef();
+	}
+});
+
+registerAction2(class extends ViewAction<SCMHistoryViewPane> {
+	constructor() {
+		super({
+			id: 'workbench.scm.action.graph.revealCurrentHistoryItem',
+			title: localize('goToCurrentHistoryItem', "Go to Current History Item"),
+			icon: Codicon.target,
+			viewId: HISTORY_VIEW_PANE_ID,
+			precondition: ContextKeys.SCMHistoryItemCount.notEqualsTo(0),
+			f1: false,
+			menu: {
+				id: MenuId.SCMHistoryTitle,
+				group: 'navigation',
+				order: 2
+			}
+		});
+	}
+
+	async runInView(_: ServicesAccessor, view: SCMHistoryViewPane): Promise<void> {
+		view.revealCurrentHistoryItem();
+	}
+});
+
+registerAction2(class extends ViewAction<SCMHistoryViewPane> {
+	constructor() {
+		super({
+			id: 'workbench.scm.action.graph.refresh',
+			title: localize('refreshGraph', "Refresh"),
+			viewId: HISTORY_VIEW_PANE_ID,
+			f1: false,
+			icon: Codicon.refresh,
+			menu: {
+				id: MenuId.SCMHistoryTitle,
+				group: 'navigation',
+				order: 1000
+			}
+		});
+	}
+
+	async runInView(_: ServicesAccessor, view: SCMHistoryViewPane): Promise<void> {
+		view.refresh();
+	}
+});
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'workbench.scm.action.graph.viewChanges',
+			title: localize('viewChanges', "View Changes"),
+			f1: false,
+			menu: [
+				{
+					id: MenuId.SCMChangesContext,
+					group: '0_view',
+					when: ContextKeyExpr.equals('config.multiDiffEditor.experimental.enabled', true)
+				}
+			]
+		});
+	}
+
+	override async run(accessor: ServicesAccessor, provider: ISCMProvider, ...historyItems: ISCMHistoryItem[]) {
+		const commandService = accessor.get(ICommandService);
+
+		if (!provider || historyItems.length === 0) {
+			return;
+		}
+
+		const historyItem = historyItems[0];
+		const historyItemLast = historyItems[historyItems.length - 1];
+		const historyProvider = provider.historyProvider.get();
+
+		if (historyItems.length > 1) {
+			const ancestor = await historyProvider?.resolveHistoryItemRefsCommonAncestor([historyItem.id, historyItemLast.id]);
+			if (!ancestor || (ancestor !== historyItem.id && ancestor !== historyItemLast.id)) {
+				return;
+			}
+		}
+
+		const historyItemParentId = historyItemLast.parentIds.length > 0 ? historyItemLast.parentIds[0] : undefined;
+		const historyItemChanges = await historyProvider?.provideHistoryItemChanges(historyItem.id, historyItemParentId);
+
+		if (!historyItemChanges?.length) {
+			return;
+		}
+
+		const title = historyItems.length === 1 ?
+			getHistoryItemEditorTitle(historyItem) :
+			localize('historyItemChangesEditorTitle', "All Changes ({0} ↔ {1})", historyItemLast.displayId ?? historyItemLast.id, historyItem.displayId ?? historyItem.id);
+
+		const rootUri = provider.rootUri;
+		const path = rootUri ? rootUri.path : provider.label;
+		const multiDiffSourceUri = URI.from({ scheme: 'scm-history-item', path: `${path}/${historyItemParentId}..${historyItem.id}` }, true);
+
+		commandService.executeCommand('_workbench.openMultiDiffEditor', { title, multiDiffSourceUri, resources: historyItemChanges });
+	}
+});
+
+class ListDelegate implements IListVirtualDelegate<TreeElement> {
+
+	getHeight(): number {
+		return 22;
+	}
+
+	getTemplateId(element: TreeElement): string {
+		if (isSCMHistoryItemViewModelTreeElement(element)) {
+			return HistoryItemRenderer.TEMPLATE_ID;
+		} else if (isSCMHistoryItemLoadMoreTreeElement(element)) {
+			return HistoryItemLoadMoreRenderer.TEMPLATE_ID;
+		} else {
+			throw new Error('Unknown element');
+		}
+	}
+}
+
+interface HistoryItemTemplate {
+	readonly element: HTMLElement;
+	readonly label: IconLabel;
+	readonly graphContainer: HTMLElement;
+	readonly labelContainer: HTMLElement;
+	readonly elementDisposables: DisposableStore;
+	readonly disposables: IDisposable;
+}
+
+class HistoryItemRenderer implements ITreeRenderer<SCMHistoryItemViewModelTreeElement, LabelFuzzyScore, HistoryItemTemplate> {
+
+	static readonly TEMPLATE_ID = 'history-item';
+	get templateId(): string { return HistoryItemRenderer.TEMPLATE_ID; }
+
+	private readonly _badgesConfig = observableConfigValue<'all' | 'filter'>('scm.graph.badges', 'filter', this._configurationService);
+
+	constructor(
+		private readonly hoverDelegate: IHoverDelegate,
+		@IClipboardService private readonly _clipboardService: IClipboardService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IHoverService private readonly _hoverService: IHoverService,
+		@IThemeService private readonly _themeService: IThemeService
+	) { }
+
+	renderTemplate(container: HTMLElement): HistoryItemTemplate {
+		// hack
+		(container.parentElement!.parentElement!.querySelector('.monaco-tl-twistie')! as HTMLElement).classList.add('force-no-twistie');
+
+		const element = append(container, $('.history-item'));
+		const graphContainer = append(element, $('.graph-container'));
+		const iconLabel = new IconLabel(element, { supportIcons: true, supportHighlights: true, supportDescriptionHighlights: true });
+
+		const labelContainer = append(element, $('.label-container'));
+		element.appendChild(labelContainer);
+
+		return { element, graphContainer, label: iconLabel, labelContainer, elementDisposables: new DisposableStore(), disposables: new DisposableStore() };
+	}
+
+	renderElement(node: ITreeNode<SCMHistoryItemViewModelTreeElement, LabelFuzzyScore>, index: number, templateData: HistoryItemTemplate, height: number | undefined): void {
+		const historyItemViewModel = node.element.historyItemViewModel;
+		const historyItem = historyItemViewModel.historyItem;
+
+		const historyItemHover = this._hoverService.setupManagedHover(this.hoverDelegate, templateData.element, this._getHoverContent(node.element), {
+			actions: this._getHoverActions(historyItem),
+		});
+		templateData.elementDisposables.add(historyItemHover);
+
+		templateData.graphContainer.textContent = '';
+		templateData.graphContainer.classList.toggle('current', historyItemViewModel.isCurrent);
+		templateData.graphContainer.appendChild(renderSCMHistoryItemGraph(historyItemViewModel));
+
+		const provider = node.element.repository.provider;
+		const historyItemRef = provider.historyProvider.get()?.historyItemRef?.get();
+		const extraClasses = historyItemRef?.revision === historyItem.id ? ['history-item-current'] : [];
+		const [matches, descriptionMatches] = this._processMatches(historyItemViewModel, node.filterData);
+		templateData.label.setLabel(historyItem.subject, historyItem.author, { matches, descriptionMatches, extraClasses });
+
+		this._renderBadges(historyItem, templateData);
+	}
+
+	private _renderBadges(historyItem: ISCMHistoryItem, templateData: HistoryItemTemplate): void {
+		templateData.elementDisposables.add(autorun(reader => {
+			const labelConfig = this._badgesConfig.read(reader);
+
+			templateData.labelContainer.textContent = '';
+
+			const references = historyItem.references ?
+				historyItem.references.slice(0) : [];
+
+			// If the first reference is colored, we render it
+			// separately since we have to show the description
+			// for the first colored reference.
+			if (references.length > 0 && references[0].color) {
+				this._renderBadge([references[0]], true, templateData);
+
+				// Remove the rendered reference from the collection
+				references.splice(0, 1);
+			}
+
+			// Group history item references by color
+			const historyItemRefsByColor = groupBy2(references, ref => ref.color ? ref.color : '');
+
+			for (const [key, historyItemRefs] of Object.entries(historyItemRefsByColor)) {
+				// If needed skip badges without a color
+				if (key === '' && labelConfig !== 'all') {
+					continue;
+				}
+
+				// Group history item references by icon
+				const historyItemRefByIconId = groupBy2(historyItemRefs, ref => ThemeIcon.isThemeIcon(ref.icon) ? ref.icon.id : '');
+				for (const [key, historyItemRefs] of Object.entries(historyItemRefByIconId)) {
+					// Skip badges without an icon
+					if (key === '') {
+						continue;
+					}
+
+					this._renderBadge(historyItemRefs, false, templateData);
+				}
+			}
+		}));
+	}
+
+	private _renderBadge(historyItemRefs: ISCMHistoryItemRef[], showDescription: boolean, templateData: HistoryItemTemplate): void {
+		if (historyItemRefs.length === 0 || !ThemeIcon.isThemeIcon(historyItemRefs[0].icon)) {
+			return;
+		}
+
+		const elements = h('div.label', {
+			style: {
+				color: historyItemRefs[0].color ? asCssVariable(historyItemHoverLabelForeground) : asCssVariable(foreground),
+				backgroundColor: historyItemRefs[0].color ? asCssVariable(historyItemRefs[0].color) : asCssVariable(historyItemHoverDefaultLabelBackground)
+			}
+		}, [
+			h('div.count@count', {
+				style: {
+					display: historyItemRefs.length > 1 ? '' : 'none'
+				}
+			}),
+			h('div.icon@icon'),
+			h('div.description@description', {
+				style: {
+					display: showDescription ? '' : 'none'
+				}
+			})
+		]);
+
+		elements.count.textContent = historyItemRefs.length > 1 ? historyItemRefs.length.toString() : '';
+		elements.icon.classList.add(...ThemeIcon.asClassNameArray(historyItemRefs[0].icon));
+		elements.description.textContent = showDescription ? historyItemRefs[0].name : '';
+
+		append(templateData.labelContainer, elements.root);
+	}
+
+	private _getHoverActions(historyItem: ISCMHistoryItem) {
+		return [
+			{
+				commandId: 'workbench.scm.action.graph.copyHistoryItemId',
+				iconClass: 'codicon.codicon-copy',
+				label: historyItem.displayId ?? historyItem.id,
+				run: () => this._clipboardService.writeText(historyItem.id)
+			},
+			{
+				commandId: 'workbench.scm.action.graph.copyHistoryItemMessage',
+				iconClass: 'codicon.codicon-copy',
+				label: localize('historyItemMessage', "Message"),
+				run: () => this._clipboardService.writeText(historyItem.message)
+			}
+		];
+	}
+
+	private _getHoverContent(element: SCMHistoryItemViewModelTreeElement): IManagedHoverTooltipMarkdownString {
+		const colorTheme = this._themeService.getColorTheme();
+		const historyItem = element.historyItemViewModel.historyItem;
+
+		const markdown = new MarkdownString('', { isTrusted: true, supportThemeIcons: true });
+		// markdown.appendMarkdown(`$(git-commit) \`${historyItem.displayId ?? historyItem.id}\`\n\n`);
+
+		if (historyItem.author) {
+			markdown.appendMarkdown(`$(account) **${historyItem.author}**`);
+
+			if (historyItem.timestamp) {
+				const dateFormatter = new Intl.DateTimeFormat(platform.language, { year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', minute: 'numeric' });
+				markdown.appendMarkdown(`, $(history) ${fromNow(historyItem.timestamp, true, true)} (${dateFormatter.format(historyItem.timestamp)})`);
+			}
+
+			markdown.appendMarkdown('\n\n');
+		}
+
+		markdown.appendMarkdown(`${historyItem.message}\n\n`);
+
+		if (historyItem.statistics) {
+			markdown.appendMarkdown(`---\n\n`);
+
+			markdown.appendMarkdown(`<span>${historyItem.statistics.files === 1 ?
+				localize('fileChanged', "{0} file changed", historyItem.statistics.files) :
+				localize('filesChanged', "{0} files changed", historyItem.statistics.files)}</span>`);
+
+			if (historyItem.statistics.insertions) {
+				const additionsForegroundColor = colorTheme.getColor(historyItemHoverAdditionsForeground);
+				markdown.appendMarkdown(`,&nbsp;<span style="color:${additionsForegroundColor};">${historyItem.statistics.insertions === 1 ?
+					localize('insertion', "{0} insertion{1}", historyItem.statistics.insertions, '(+)') :
+					localize('insertions', "{0} insertions{1}", historyItem.statistics.insertions, '(+)')}</span>`);
+			}
+
+			if (historyItem.statistics.deletions) {
+				const deletionsForegroundColor = colorTheme.getColor(historyItemHoverDeletionsForeground);
+				markdown.appendMarkdown(`,&nbsp;<span style="color:${deletionsForegroundColor};">${historyItem.statistics.deletions === 1 ?
+					localize('deletion', "{0} deletion{1}", historyItem.statistics.deletions, '(-)') :
+					localize('deletions', "{0} deletions{1}", historyItem.statistics.deletions, '(-)')}</span>`);
+			}
+		}
+
+		if ((historyItem.references ?? []).length > 0) {
+			markdown.appendMarkdown(`\n\n---\n\n`);
+			markdown.appendMarkdown((historyItem.references ?? []).map(ref => {
+				const labelIconId = ThemeIcon.isThemeIcon(ref.icon) ? ref.icon.id : '';
+
+				const labelBackgroundColor = ref.color ? asCssVariable(ref.color) : asCssVariable(historyItemHoverDefaultLabelBackground);
+				const labelForegroundColor = ref.color ? asCssVariable(historyItemHoverLabelForeground) : asCssVariable(historyItemHoverDefaultLabelForeground);
+
+				return `<span style="color:${labelForegroundColor};background-color:${labelBackgroundColor};border-radius:10px;">&nbsp;$(${labelIconId})&nbsp;${ref.name}&nbsp;&nbsp;</span>`;
+			}).join('&nbsp;&nbsp;'));
+		}
+
+		return { markdown, markdownNotSupportedFallback: historyItem.message };
+	}
+
+	private _processMatches(historyItemViewModel: ISCMHistoryItemViewModel, filterData: LabelFuzzyScore | undefined): [IMatch[] | undefined, IMatch[] | undefined] {
+		if (!filterData) {
+			return [undefined, undefined];
+		}
+
+		return [
+			historyItemViewModel.historyItem.message === filterData.label ? createMatches(filterData.score) : undefined,
+			historyItemViewModel.historyItem.author === filterData.label ? createMatches(filterData.score) : undefined
+		];
+	}
+
+	disposeElement(element: ITreeNode<SCMHistoryItemViewModelTreeElement, LabelFuzzyScore>, index: number, templateData: HistoryItemTemplate, height: number | undefined): void {
+		templateData.elementDisposables.clear();
+	}
+
+	disposeTemplate(templateData: HistoryItemTemplate): void {
+		templateData.disposables.dispose();
+	}
+}
+
+interface LoadMoreTemplate {
+	readonly element: HTMLElement;
+	readonly graphPlaceholder: HTMLElement;
+	readonly historyItemPlaceholderContainer: HTMLElement;
+	readonly historyItemPlaceholderLabel: IconLabel;
+	readonly elementDisposables: DisposableStore;
+	readonly disposables: IDisposable;
+}
+
+class HistoryItemLoadMoreRenderer implements ITreeRenderer<SCMHistoryItemLoadMoreTreeElement, void, LoadMoreTemplate> {
+
+	static readonly TEMPLATE_ID = 'historyItemLoadMore';
+	get templateId(): string { return HistoryItemLoadMoreRenderer.TEMPLATE_ID; }
+
+	constructor(
+		private readonly _isLoadingMore: IObservable<boolean>,
+		private readonly _loadMoreCallback: () => void,
+		@IConfigurationService private readonly _configurationService: IConfigurationService
+	) { }
+
+	renderTemplate(container: HTMLElement): LoadMoreTemplate {
+		// hack
+		(container.parentElement!.parentElement!.querySelector('.monaco-tl-twistie')! as HTMLElement).classList.add('force-no-twistie');
+
+		const element = append(container, $('.history-item-load-more'));
+		const graphPlaceholder = append(element, $('.graph-placeholder'));
+		const historyItemPlaceholderContainer = append(element, $('.history-item-placeholder'));
+		const historyItemPlaceholderLabel = new IconLabel(historyItemPlaceholderContainer, { supportIcons: true });
+
+		return { element, graphPlaceholder, historyItemPlaceholderContainer, historyItemPlaceholderLabel, elementDisposables: new DisposableStore(), disposables: new DisposableStore() };
+	}
+
+	renderElement(element: ITreeNode<SCMHistoryItemLoadMoreTreeElement, void>, index: number, templateData: LoadMoreTemplate, height: number | undefined): void {
+		templateData.graphPlaceholder.textContent = '';
+		templateData.graphPlaceholder.style.width = `${SWIMLANE_WIDTH * (element.element.graphColumns.length + 1)}px`;
+		templateData.graphPlaceholder.appendChild(renderSCMHistoryGraphPlaceholder(element.element.graphColumns));
+
+		const pageOnScroll = this._configurationService.getValue<boolean>('scm.graph.pageOnScroll') === true;
+		templateData.historyItemPlaceholderContainer.classList.toggle('shimmer', pageOnScroll);
+
+		if (pageOnScroll) {
+			templateData.historyItemPlaceholderLabel.setLabel('');
+			this._loadMoreCallback();
+		} else {
+			templateData.elementDisposables.add(autorun(reader => {
+				const isLoadingMore = this._isLoadingMore.read(reader);
+				const icon = `$(${isLoadingMore ? 'loading~spin' : 'fold-down'})`;
+
+				templateData.historyItemPlaceholderLabel.setLabel(localize('loadMore', "{0} Load More...", icon));
+			}));
+		}
+	}
+
+	disposeElement(element: ITreeNode<SCMHistoryItemLoadMoreTreeElement, void>, index: number, templateData: LoadMoreTemplate, height: number | undefined): void {
+		templateData.elementDisposables.clear();
+	}
+
+	disposeTemplate(templateData: LoadMoreTemplate): void {
+		templateData.disposables.dispose();
+	}
+}
+
+class HistoryItemHoverDelegate extends WorkbenchHoverDelegate {
+	constructor(
+		private readonly _viewContainerLocation: ViewContainerLocation | null,
+		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService,
+		@IConfigurationService configurationService: IConfigurationService,
+		@IHoverService hoverService: IHoverService,
+
+	) {
+		super('element', true, () => this.getHoverOptions(), configurationService, hoverService);
+	}
+
+	private getHoverOptions(): Partial<IHoverOptions> {
+		const sideBarPosition = this.layoutService.getSideBarPosition();
+
+		let hoverPosition: HoverPosition;
+		if (this._viewContainerLocation === ViewContainerLocation.Sidebar) {
+			hoverPosition = sideBarPosition === Position.LEFT ? HoverPosition.RIGHT : HoverPosition.LEFT;
+		} else if (this._viewContainerLocation === ViewContainerLocation.AuxiliaryBar) {
+			hoverPosition = sideBarPosition === Position.LEFT ? HoverPosition.LEFT : HoverPosition.RIGHT;
+		} else {
+			hoverPosition = HoverPosition.RIGHT;
+		}
+
+		return { additionalClasses: ['history-item-hover'], position: { hoverPosition, forcePosition: true } };
+	}
+}
+
+class SCMHistoryViewPaneActionRunner extends ActionRunner {
+	constructor(@IProgressService private readonly _progressService: IProgressService) {
+		super();
+	}
+
+	protected override runAction(action: IAction, context?: unknown): Promise<void> {
+		return this._progressService.withProgress({ location: HISTORY_VIEW_PANE_ID },
+			async () => await super.runAction(action, context));
+	}
+}
+
+class SCMHistoryTreeAccessibilityProvider implements IListAccessibilityProvider<TreeElement> {
+
+	getWidgetAriaLabel(): string {
+		return localize('scm history', "Source Control History");
+	}
+
+	getAriaLabel(element: TreeElement): string {
+		if (isSCMRepository(element)) {
+			return `${element.provider.name} ${element.provider.label}`;
+		} else if (isSCMHistoryItemViewModelTreeElement(element)) {
+			const historyItem = element.historyItemViewModel.historyItem;
+			return `${stripIcons(historyItem.message).trim()}${historyItem.author ? `, ${historyItem.author}` : ''}`;
+		} else {
+			return '';
+		}
+	}
+}
+
+class SCMHistoryTreeIdentityProvider implements IIdentityProvider<TreeElement> {
+
+	getId(element: TreeElement): string {
+		if (isSCMRepository(element)) {
+			const provider = element.provider;
+			return `repo:${provider.id}`;
+		} else if (isSCMHistoryItemViewModelTreeElement(element)) {
+			const provider = element.repository.provider;
+			const historyItem = element.historyItemViewModel.historyItem;
+			return `historyItem:${provider.id}/${historyItem.id}/${historyItem.parentIds.join(',')}`;
+		} else if (isSCMHistoryItemLoadMoreTreeElement(element)) {
+			const provider = element.repository.provider;
+			return `historyItemLoadMore:${provider.id}}`;
+		} else {
+			throw new Error('Invalid tree element');
+		}
+	}
+}
+
+class SCMHistoryTreeKeyboardNavigationLabelProvider implements IKeyboardNavigationLabelProvider<TreeElement> {
+	getKeyboardNavigationLabel(element: TreeElement): { toString(): string } | { toString(): string }[] | undefined {
+		if (isSCMRepository(element)) {
+			return undefined;
+		} else if (isSCMHistoryItemViewModelTreeElement(element)) {
+			// For a history item we want to match both the message and
+			// the author. A match in the message takes precedence over
+			// a match in the author.
+			return [element.historyItemViewModel.historyItem.message, element.historyItemViewModel.historyItem.author];
+		} else if (isSCMHistoryItemLoadMoreTreeElement(element)) {
+			// We don't want to match the load more element
+			return '';
+		} else {
+			throw new Error('Invalid tree element');
+		}
+	}
+}
+
+class SCMHistoryTreeDataSource extends Disposable implements IAsyncDataSource<SCMHistoryViewModel, TreeElement> {
+
+	async getChildren(inputOrElement: SCMHistoryViewModel | TreeElement): Promise<Iterable<TreeElement>> {
+		if (!(inputOrElement instanceof SCMHistoryViewModel)) {
+			return [];
+		}
+
+		// History items
+		const children: TreeElement[] = [];
+		const historyItems = await inputOrElement.getHistoryItems();
+		children.push(...historyItems);
+
+		// Load More element
+		const repository = inputOrElement.repository.get();
+		const lastHistoryItem = tail(historyItems);
+		if (repository && lastHistoryItem && lastHistoryItem.historyItemViewModel.outputSwimlanes.length > 0) {
+			children.push({
+				repository,
+				graphColumns: lastHistoryItem.historyItemViewModel.outputSwimlanes,
+				type: 'historyItemLoadMore'
+			} satisfies SCMHistoryItemLoadMoreTreeElement);
+		}
+
+		return children;
+	}
+
+	hasChildren(inputOrElement: SCMHistoryViewModel | TreeElement): boolean {
+		return inputOrElement instanceof SCMHistoryViewModel;
+	}
+}
+
+type HistoryItemRefsFilter = 'all' | 'auto' | string[];
+
+type RepositoryState = {
+	viewModels: SCMHistoryItemViewModelTreeElement[];
+	historyItemsFilter: ISCMHistoryItemRef[];
+	loadMore: boolean | string;
+};
+
+class SCMHistoryViewModel extends Disposable {
+
+	private readonly _closedRepository = observableFromEvent(
+		this,
+		this._scmService.onDidRemoveRepository,
+		repository => repository);
+
+	private readonly _firstRepository = this._scmService.repositoryCount > 0 ?
+		constObservable(Iterable.first(this._scmService.repositories)) :
+		observableFromEvent(
+			this,
+			Event.once(this._scmService.onDidAddRepository),
+			repository => repository
+		);
+
+	private readonly _selectedRepository = observableValue<'auto' | ISCMRepository>(this, 'auto');
+
+	private readonly _graphRepository = derived(reader => {
+		const selectedRepository = this._selectedRepository.read(reader);
+		if (selectedRepository !== 'auto') {
+			return selectedRepository;
+		}
+
+		return this._scmViewService.activeRepository.read(reader);
+	});
+
+	/**
+	 * The active | selected repository takes precedence over the first repository when the observable
+	 * values are updated in the same transaction (or during the initial read of the observable value).
+	 */
+	readonly repository = latestChangedValue(this, [this._firstRepository, this._graphRepository]);
+	readonly onDidChangeHistoryItemsFilter = observableSignal(this);
+	readonly isViewModelEmpty = observableValue(this, false);
+
+	private readonly _repositoryState = new Map<ISCMRepository, RepositoryState>();
+	private readonly _repositoryFilterState = new Map<string, HistoryItemRefsFilter>();
+
+	private readonly _scmHistoryItemCountCtx: IContextKey<number>;
+
+	constructor(
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
+		@IExtensionService private readonly _extensionService: IExtensionService,
+		@ISCMService private readonly _scmService: ISCMService,
+		@ISCMViewService private readonly _scmViewService: ISCMViewService,
+		@IStorageService private readonly _storageService: IStorageService
+	) {
+		super();
+
+		this._repositoryFilterState = this._loadHistoryItemsFilterState();
+
+		this._extensionService.onWillStop(this._saveHistoryItemsFilterState, this, this._store);
+		this._storageService.onWillSaveState(this._saveHistoryItemsFilterState, this, this._store);
+
+		this._scmHistoryItemCountCtx = ContextKeys.SCMHistoryItemCount.bindTo(this._contextKeyService);
+
+		// Closed repository cleanup
+		this._register(autorun(reader => {
+			const repository = this._closedRepository.read(reader);
+			if (!repository) {
+				return;
+			}
+
+			if (this.repository.get() === repository) {
+				this._selectedRepository.set(Iterable.first(this._scmService.repositories) ?? 'auto', undefined);
+			}
+
+			this._repositoryState.delete(repository);
+		}));
+	}
+
+	clearRepositoryState(): void {
+		const repository = this.repository.get();
+		if (!repository) {
+			return;
+		}
+
+		this._repositoryState.delete(repository);
+	}
+
+	getHistoryItemsFilter(): 'all' | 'auto' | ISCMHistoryItemRef[] | undefined {
+		const repository = this.repository.get();
+		if (!repository) {
+			return;
+		}
+
+		const filterState = this._repositoryFilterState.get(getProviderKey(repository.provider)) ?? 'auto';
+		if (filterState === 'all' || filterState === 'auto') {
+			return filterState;
+		}
+
+		const repositoryState = this._repositoryState.get(repository);
+		return repositoryState?.historyItemsFilter;
+	}
+
+	getCurrentHistoryItemTreeElement(): SCMHistoryItemViewModelTreeElement | undefined {
+		const repository = this.repository.get();
+		if (!repository) {
+			return undefined;
+		}
+
+		const state = this._repositoryState.get(repository);
+		if (!state) {
+			return undefined;
+		}
+
+		const historyProvider = repository?.provider.historyProvider.get();
+		const historyItemRef = historyProvider?.historyItemRef.get();
+
+		return state.viewModels
+			.find(viewModel => viewModel.historyItemViewModel.historyItem.id === historyItemRef?.revision);
+	}
+
+	loadMore(cursor?: string): void {
+		const repository = this.repository.get();
+		if (!repository) {
+			return;
+		}
+
+		const state = this._repositoryState.get(repository);
+		if (!state) {
+			return;
+		}
+
+		this._repositoryState.set(repository, { ...state, loadMore: cursor ?? true });
+	}
+
+	async getHistoryItems(): Promise<SCMHistoryItemViewModelTreeElement[]> {
+		const repository = this.repository.get();
+		const historyProvider = repository?.provider.historyProvider.get();
+
+		if (!repository || !historyProvider) {
+			this._scmHistoryItemCountCtx.set(0);
+			this.isViewModelEmpty.set(true, undefined);
+			return [];
+		}
+
+		let state = this._repositoryState.get(repository);
+
+		if (!state || state.loadMore !== false) {
+			const historyItems = state?.viewModels
+				.map(vm => vm.historyItemViewModel.historyItem) ?? [];
+
+			const historyItemRefs = state?.historyItemsFilter ??
+				await this._resolveHistoryItemFilter(repository, historyProvider);
+
+			const limit = clamp(this._configurationService.getValue<number>('scm.graph.pageSize'), 1, 1000);
+			const historyItemRefIds = historyItemRefs.map(ref => ref.revision ?? ref.id);
+
+			do {
+				// Fetch the next page of history items
+				historyItems.push(...(await historyProvider.provideHistoryItems({
+					historyItemRefs: historyItemRefIds, limit, skip: historyItems.length
+				}) ?? []));
+			} while (typeof state?.loadMore === 'string' && !historyItems.find(item => item.id === state?.loadMore));
+
+			// Create the color map
+			const colorMap = this._getGraphColorMap(historyItemRefs);
+
+			const viewModels = toISCMHistoryItemViewModelArray(historyItems, colorMap, historyProvider.historyItemRef.get())
+				.map(historyItemViewModel => ({
+					repository,
+					historyItemViewModel,
+					type: 'historyItemViewModel'
+				}) satisfies SCMHistoryItemViewModelTreeElement);
+
+			state = { historyItemsFilter: historyItemRefs, viewModels, loadMore: false };
+			this._repositoryState.set(repository, state);
+
+			this._scmHistoryItemCountCtx.set(viewModels.length);
+			this.isViewModelEmpty.set(viewModels.length === 0, undefined);
+		}
+
+		return state.viewModels;
+	}
+
+	setRepository(repository: ISCMRepository | 'auto'): void {
+		this._selectedRepository.set(repository, undefined);
+	}
+
+	setHistoryItemsFilter(filter: HistoryItemRefsFilter): void {
+		const repository = this.repository.get();
+		if (!repository) {
+			return;
+		}
+
+		if (filter !== 'auto') {
+			this._repositoryFilterState.set(getProviderKey(repository.provider), filter);
+		} else {
+			this._repositoryFilterState.delete(getProviderKey(repository.provider));
+		}
+		this._saveHistoryItemsFilterState();
+
+		this.onDidChangeHistoryItemsFilter.trigger(undefined);
+	}
+
+	private _getGraphColorMap(historyItemRefs: ISCMHistoryItemRef[]): Map<string, ColorIdentifier | undefined> {
+		const repository = this.repository.get();
+		const historyProvider = repository?.provider.historyProvider.get();
+		const historyItemRef = historyProvider?.historyItemRef.get();
+		const historyItemRemoteRef = historyProvider?.historyItemRemoteRef.get();
+		const historyItemBaseRef = historyProvider?.historyItemBaseRef.get();
+
+		const colorMap = new Map<string, ColorIdentifier | undefined>();
+
+		if (historyItemRef) {
+			colorMap.set(historyItemRef.id, historyItemRef.color);
+
+			if (historyItemRemoteRef) {
+				colorMap.set(historyItemRemoteRef.id, historyItemRemoteRef.color);
+			}
+			if (historyItemBaseRef) {
+				colorMap.set(historyItemBaseRef.id, historyItemBaseRef.color);
+			}
+		}
+
+		// Add the remaining history item references to the color map
+		// if not already present. These history item references will
+		// be colored using the color of the history item to which they
+		// point to.
+		for (const ref of historyItemRefs) {
+			if (!colorMap.has(ref.id)) {
+				colorMap.set(ref.id, undefined);
+			}
+		}
+
+		return colorMap;
+	}
+
+	private async _resolveHistoryItemFilter(repository: ISCMRepository, historyProvider: ISCMHistoryProvider): Promise<ISCMHistoryItemRef[]> {
+		const historyItemRefs: ISCMHistoryItemRef[] = [];
+		const historyItemsFilter = this._repositoryFilterState.get(getProviderKey(repository.provider)) ?? 'auto';
+
+		switch (historyItemsFilter) {
+			case 'all':
+				historyItemRefs.push(...(await historyProvider.provideHistoryItemRefs() ?? []));
+				break;
+			case 'auto':
+				historyItemRefs.push(...[
+					historyProvider.historyItemRef.get(),
+					historyProvider.historyItemRemoteRef.get(),
+					historyProvider.historyItemBaseRef.get(),
+				].filter(ref => !!ref));
+				break;
+			default: {
+				// Get the latest revisions for the history items references in the filer
+				const refs = (await historyProvider.provideHistoryItemRefs(historyItemsFilter) ?? [])
+					.filter(ref => historyItemsFilter.some(filter => filter === ref.id));
+
+				if (refs.length === 0) {
+					// Reset the filter
+					historyItemRefs.push(...[
+						historyProvider.historyItemRef.get(),
+						historyProvider.historyItemRemoteRef.get(),
+						historyProvider.historyItemBaseRef.get(),
+					].filter(ref => !!ref));
+					this._repositoryFilterState.delete(getProviderKey(repository.provider));
+				} else {
+					// Update filter
+					historyItemRefs.push(...refs);
+					this._repositoryFilterState.set(getProviderKey(repository.provider), refs.map(ref => ref.id));
+				}
+
+				this._saveHistoryItemsFilterState();
+
+				break;
+			}
+		}
+
+		return historyItemRefs;
+	}
+
+	private _loadHistoryItemsFilterState() {
+		try {
+			const filterData = this._storageService.get('scm.graphView.referencesFilter', StorageScope.WORKSPACE);
+			if (filterData) {
+				return new Map<string, HistoryItemRefsFilter>(JSON.parse(filterData));
+			}
+		} catch { }
+
+		return new Map<string, HistoryItemRefsFilter>();
+	}
+
+	private _saveHistoryItemsFilterState(): void {
+		const filter = Array.from(this._repositoryFilterState.entries());
+		this._storageService.store('scm.graphView.referencesFilter', JSON.stringify(filter), StorageScope.WORKSPACE, StorageTarget.USER);
+	}
+
+	override dispose(): void {
+		this._repositoryState.clear();
+		super.dispose();
+	}
+}
+
+type RepositoryQuickPickItem = IQuickPickItem & { repository: 'auto' | ISCMRepository };
+
+class RepositoryPicker extends Disposable {
+	private readonly _autoQuickPickItem: RepositoryQuickPickItem = {
+		label: localize('auto', "Auto"),
+		description: localize('activeRepository', "Show the source control graph for the active repository"),
+		repository: 'auto'
+	};
+
+	constructor(
+		@IQuickInputService private readonly _quickInputService: IQuickInputService,
+		@ISCMViewService private readonly _scmViewService: ISCMViewService
+	) {
+		super();
+	}
+
+	async pickRepository(): Promise<RepositoryQuickPickItem | undefined> {
+		const picks: (RepositoryQuickPickItem | IQuickPickSeparator)[] = [
+			this._autoQuickPickItem,
+			{ type: 'separator' }];
+
+		picks.push(...this._scmViewService.repositories.map(r => ({
+			label: r.provider.name,
+			description: r.provider.rootUri?.fsPath,
+			iconClass: ThemeIcon.asClassName(Codicon.repo),
+			repository: r
+		})));
+
+		return this._quickInputService.pick(picks, {
+			placeHolder: localize('scmGraphRepository', "Select the repository to view, type to filter all repositories")
+		});
+	}
+}
+
+type HistoryItemRefQuickPickItem = IQuickPickItem & { historyItemRef: 'all' | 'auto' | ISCMHistoryItemRef };
+
+class HistoryItemRefPicker extends Disposable {
+	private readonly _allQuickPickItem: HistoryItemRefQuickPickItem = {
+		id: 'all',
+		label: localize('all', "All"),
+		description: localize('allHistoryItemRefs', "All history item references"),
+		historyItemRef: 'all'
+	};
+
+	private readonly _autoQuickPickItem: HistoryItemRefQuickPickItem = {
+		id: 'auto',
+		label: localize('auto', "Auto"),
+		description: localize('currentHistoryItemRef', "Current history item reference(s)"),
+		historyItemRef: 'auto'
+	};
+
+	constructor(
+		private readonly _historyProvider: ISCMHistoryProvider,
+		private readonly _historyItemsFilter: 'all' | 'auto' | ISCMHistoryItemRef[],
+		@IQuickInputService private readonly _quickInputService: IQuickInputService,
+	) {
+		super();
+	}
+
+	async pickHistoryItemRef(): Promise<HistoryItemRefsFilter | undefined> {
+		const quickPick = this._quickInputService.createQuickPick<HistoryItemRefQuickPickItem>({ useSeparators: true });
+		this._store.add(quickPick);
+
+		quickPick.placeholder = localize('scmGraphHistoryItemRef', "Select one/more history item references to view, type to filter");
+		quickPick.canSelectMany = true;
+		quickPick.hideCheckAll = true;
+		quickPick.busy = true;
+		quickPick.show();
+
+		const items = await this._createQuickPickItems();
+
+		// Set initial selection
+		let selectedItems: HistoryItemRefQuickPickItem[] = [];
+		if (this._historyItemsFilter === 'all') {
+			selectedItems.push(this._allQuickPickItem);
+		} else if (this._historyItemsFilter === 'auto') {
+			selectedItems.push(this._autoQuickPickItem);
+		} else {
+			let index = 0;
+			while (index < items.length) {
+				if (items[index].type === 'separator') {
+					index++;
+					continue;
+				}
+
+				if (this._historyItemsFilter.some(ref => ref.id === items[index].id)) {
+					const item = items.splice(index, 1) as HistoryItemRefQuickPickItem[];
+					selectedItems.push(...item);
+				} else {
+					index++;
+				}
+			}
+
+			// Insert the selected items after `All` and `Auto`
+			items.splice(2, 0, { type: 'separator' }, ...selectedItems);
+		}
+
+		quickPick.items = items;
+		quickPick.selectedItems = selectedItems;
+		quickPick.busy = false;
+
+		return new Promise<HistoryItemRefsFilter | undefined>(resolve => {
+			this._store.add(quickPick.onDidChangeSelection(items => {
+				const { added } = delta(selectedItems, items, (a, b) => compare(a.id ?? '', b.id ?? ''));
+				if (added.length > 0) {
+					if (added[0].historyItemRef === 'all' || added[0].historyItemRef === 'auto') {
+						quickPick.selectedItems = [added[0]];
+					} else {
+						// Remove 'all' and 'auto' items if present
+						quickPick.selectedItems = [...quickPick.selectedItems
+							.filter(i => i.historyItemRef !== 'all' && i.historyItemRef !== 'auto')];
+					}
+				}
+
+				selectedItems = [...quickPick.selectedItems];
+			}));
+
+			this._store.add(quickPick.onDidAccept(() => {
+				if (selectedItems.length === 0) {
+					resolve(undefined);
+				} else if (selectedItems.length === 1 && selectedItems[0].historyItemRef === 'all') {
+					resolve('all');
+				} else if (selectedItems.length === 1 && selectedItems[0].historyItemRef === 'auto') {
+					resolve('auto');
+				} else {
+					resolve(selectedItems.map(item => (item.historyItemRef as ISCMHistoryItemRef).id));
+				}
+
+				quickPick.hide();
+			}));
+
+			this._store.add(quickPick.onDidHide(() => {
+				resolve(undefined);
+				this.dispose();
+			}));
+		});
+	}
+
+	private async _createQuickPickItems(): Promise<(HistoryItemRefQuickPickItem | IQuickPickSeparator)[]> {
+		const picks: (HistoryItemRefQuickPickItem | IQuickPickSeparator)[] = [
+			this._allQuickPickItem, this._autoQuickPickItem
+		];
+
+		const historyItemRefs = await this._historyProvider.provideHistoryItemRefs() ?? [];
+		const historyItemRefsByCategory = groupBy(historyItemRefs, (a, b) => compare(a.category ?? '', b.category ?? ''));
+
+		for (const refs of historyItemRefsByCategory) {
+			if (refs.length === 0) {
+				continue;
+			}
+
+			picks.push({ type: 'separator', label: refs[0].category });
+
+			picks.push(...refs.map(ref => {
+				return {
+					id: ref.id,
+					label: ref.name,
+					description: ref.description,
+					iconClass: ThemeIcon.isThemeIcon(ref.icon) ?
+						ThemeIcon.asClassName(ref.icon) : undefined,
+					historyItemRef: ref
+				};
+			}));
+		}
+
+		return picks;
+	}
+}
+
+export class SCMHistoryViewPane extends ViewPane {
+
+	private _treeContainer!: HTMLElement;
+	private _tree!: WorkbenchAsyncDataTree<SCMHistoryViewModel, TreeElement, FuzzyScore>;
+	private _treeViewModel!: SCMHistoryViewModel;
+	private _treeDataSource!: SCMHistoryTreeDataSource;
+	private _treeIdentityProvider!: SCMHistoryTreeIdentityProvider;
+
+	private readonly _repositoryIsLoadingMore = observableValue(this, false);
+	private readonly _repositoryOutdated = observableValue(this, false);
+
+	private readonly _actionRunner: IActionRunner;
+	private readonly _visibilityDisposables = new DisposableStore();
+
+	private readonly _treeOperationSequencer = new Sequencer();
+	private readonly _treeLoadMoreSequencer = new Sequencer();
+	private readonly _updateChildrenThrottler = new Throttler();
+
+	private readonly _scmProviderCtx: IContextKey<string | undefined>;
+
+	constructor(
+		options: IViewPaneOptions,
+		@ICommandService private readonly _commandService: ICommandService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@INotificationService private readonly _notificationService: INotificationService,
+		@IProgressService private readonly _progressService: IProgressService,
+		@IConfigurationService configurationService: IConfigurationService,
+		@IContextMenuService contextMenuService: IContextMenuService,
+		@IKeybindingService keybindingService: IKeybindingService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IOpenerService openerService: IOpenerService,
+		@IThemeService themeService: IThemeService,
+		@ITelemetryService telemetryService: ITelemetryService,
+		@IHoverService hoverService: IHoverService
+	) {
+		super({
+			...options,
+			titleMenuId: MenuId.SCMHistoryTitle,
+			showActions: ViewPaneShowActions.WhenExpanded
+		}, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
+
+		this._scmProviderCtx = ContextKeys.SCMProvider.bindTo(this.scopedContextKeyService);
+
+		this._actionRunner = this.instantiationService.createInstance(SCMHistoryViewPaneActionRunner);
+		this._register(this._actionRunner);
+
+		this._register(this._updateChildrenThrottler);
+	}
+
+	protected override renderHeaderTitle(container: HTMLElement): void {
+		super.renderHeaderTitle(container, this.title);
+
+		const element = h('div.scm-graph-view-badge-container', [
+			h('div.scm-graph-view-badge.monaco-count-badge.long@badge')
+		]);
+
+		element.badge.textContent = 'Outdated';
+		container.appendChild(element.root);
+
+		this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), element.root, {
+			markdown: {
+				value: localize('scmGraphViewOutdated', "Please refresh the graph using the refresh action ($(refresh))."),
+				supportThemeIcons: true
+			},
+			markdownNotSupportedFallback: undefined
+		}));
+
+		this._register(autorun(reader => {
+			const outdated = this._repositoryOutdated.read(reader);
+			element.root.style.display = outdated ? '' : 'none';
+		}));
+	}
+
+	protected override renderBody(container: HTMLElement): void {
+		super.renderBody(container);
+
+		this._treeContainer = append(container, $('.scm-view.scm-history-view'));
+		this._treeContainer.classList.add('file-icon-themable-tree');
+
+		this._createTree(this._treeContainer);
+
+		this.onDidChangeBodyVisibility(async visible => {
+			if (!visible) {
+				this._visibilityDisposables.clear();
+				return;
+			}
+
+			// Create view model
+			this._treeViewModel = this.instantiationService.createInstance(SCMHistoryViewModel);
+			this._visibilityDisposables.add(this._treeViewModel);
+
+			// Initial rendering
+			await this._progressService.withProgress({ location: this.id }, async () => {
+				const firstRepositoryInitialized = derived(this, reader => {
+					const repository = this._treeViewModel.repository.read(reader);
+					const historyProvider = repository?.provider.historyProvider.read(reader);
+					const historyItemRef = historyProvider?.historyItemRef.read(reader);
+
+					return historyItemRef !== undefined ? true : undefined;
+				});
+
+				// Wait for first repository to be initialized
+				await waitForState(firstRepositoryInitialized);
+
+				// Set tree input
+				await this._treeOperationSequencer.queue(async () => {
+					await this._tree.setInput(this._treeViewModel);
+					this._tree.scrollTop = 0;
+				});
+			});
+
+			this._visibilityDisposables.add(autorun(reader => {
+				this._treeViewModel.isViewModelEmpty.read(reader);
+				this._onDidChangeViewWelcomeState.fire();
+			}));
+
+			// Repository change
+			let isFirstRun = true;
+			this._visibilityDisposables.add(autorunWithStore((reader, store) => {
+				const repository = this._treeViewModel.repository.read(reader);
+				const historyProvider = repository?.provider.historyProvider.read(reader);
+				if (!repository || !historyProvider) {
+					return;
+				}
+
+				// Update context
+				this._scmProviderCtx.set(repository.provider.contextValue);
+
+				// HistoryItemId changed (checkout)
+				const historyItemRefId = derived(reader => {
+					return historyProvider.historyItemRef.read(reader)?.id;
+				});
+				store.add(runOnChange(historyItemRefId, () => {
+					this.refresh();
+				}));
+
+				// HistoryItemRefs changed
+				store.add(runOnChange(historyProvider.historyItemRefChanges, changes => {
+					if (changes.silent) {
+						// The history item reference changes occurred in the background (ex: Auto Fetch)
+						// If tree is scrolled to the top, we can safely refresh the tree, otherwise we
+						// will show a visual cue that the view is outdated.
+						if (this._tree.scrollTop === 0) {
+							this.refresh();
+							return;
+						}
+
+						// Show the "Outdated" badge on the view
+						this._repositoryOutdated.set(true, undefined);
+						return;
+					}
+
+					this.refresh();
+				}));
+
+				// HistoryItemRefs filter changed
+				store.add(runOnChange(this._treeViewModel.onDidChangeHistoryItemsFilter, () => {
+					this.refresh();
+				}));
+
+				// We skip refreshing the graph on the first execution of the autorun
+				// since the graph for the first repository is rendered when the tree
+				// input is set.
+				if (!isFirstRun) {
+					this.refresh();
+				}
+				isFirstRun = false;
+			}));
+		});
+	}
+
+	protected override layoutBody(height: number, width: number): void {
+		super.layoutBody(height, width);
+		this._tree.layout(height, width);
+	}
+
+	override getActionRunner(): IActionRunner | undefined {
+		return this._actionRunner;
+	}
+
+	override getActionsContext(): ISCMProvider | undefined {
+		return this._treeViewModel?.repository.get()?.provider;
+	}
+
+	override getActionViewItem(action: IAction, options?: IDropdownMenuActionViewItemOptions): IActionViewItem | undefined {
+		if (action.id === PICK_REPOSITORY_ACTION_ID) {
+			const repository = this._treeViewModel?.repository.get();
+			if (repository) {
+				return new SCMRepositoryActionViewItem(repository, action, options);
+			}
+		} else if (action.id === PICK_HISTORY_ITEM_REFS_ACTION_ID) {
+			const repository = this._treeViewModel?.repository.get();
+			const historyItemsFilter = this._treeViewModel?.getHistoryItemsFilter();
+			if (repository && historyItemsFilter) {
+				return new SCMHistoryItemRefsActionViewItem(repository, historyItemsFilter, action, options);
+			}
+		}
+
+		return super.getActionViewItem(action, options);
+	}
+
+	override focus(): void {
+		super.focus();
+
+		const fakeKeyboardEvent = new KeyboardEvent('keydown');
+		this._tree.focusFirst(fakeKeyboardEvent);
+		this._tree.domFocus();
+	}
+
+	override shouldShowWelcome(): boolean {
+		return this._treeViewModel?.isViewModelEmpty.get() === true;
+	}
+
+	async refresh(): Promise<void> {
+		this._treeViewModel.clearRepositoryState();
+		await this._updateChildren();
+
+		this.updateActions();
+		this._repositoryOutdated.set(false, undefined);
+		this._tree.scrollTop = 0;
+	}
+
+	async pickRepository(): Promise<void> {
+		const picker = this._instantiationService.createInstance(RepositoryPicker);
+		const result = await picker.pickRepository();
+
+		if (result) {
+			this._treeViewModel.setRepository(result.repository);
+		}
+	}
+
+	async pickHistoryItemRef(): Promise<void> {
+		const repository = this._treeViewModel.repository.get();
+		const historyProvider = repository?.provider.historyProvider.get();
+		const historyItemsFilter = this._treeViewModel.getHistoryItemsFilter();
+
+		if (!historyProvider || !historyItemsFilter) {
+			return;
+		}
+
+		const picker = this._instantiationService.createInstance(HistoryItemRefPicker, historyProvider, historyItemsFilter);
+		const result = await picker.pickHistoryItemRef();
+
+		if (result) {
+			this._treeViewModel.setHistoryItemsFilter(result);
+		}
+	}
+
+	async revealCurrentHistoryItem(): Promise<void> {
+		const repository = this._treeViewModel.repository.get();
+		const historyProvider = repository?.provider.historyProvider.get();
+		const historyItemRef = historyProvider?.historyItemRef.get();
+		const historyItemFilter = this._treeViewModel.getHistoryItemsFilter();
+
+		if (!repository || !historyItemRef?.revision || !historyItemFilter) {
+			return;
+		}
+
+		// Filter set to `all`, `auto` or it contains the current history item
+		if (Array.isArray(historyItemFilter) &&
+			!historyItemFilter.find(ref => ref.id === historyItemRef.id)) {
+			this._notificationService.info(localize('scmGraphViewRevealCurrentHistoryItem', "The current history item is not present in the source control graph. Please use the history item references picker to expand the set of history items in the graph."));
+			return;
+		}
+
+		const revealTreeNode = (): boolean => {
+			const historyItemTreeElement = this._treeViewModel.getCurrentHistoryItemTreeElement();
+
+			if (historyItemTreeElement && this._tree.hasNode(historyItemTreeElement)) {
+				this._tree.reveal(historyItemTreeElement, 0.5);
+
+				this._tree.setSelection([historyItemTreeElement]);
+				this._tree.setFocus([historyItemTreeElement]);
+				return true;
+			}
+
+			return false;
+		};
+
+		if (revealTreeNode()) {
+			return;
+		}
+
+		// Fetch current history item
+		await this._loadMore(historyItemRef.revision);
+
+		// Reveal node
+		revealTreeNode();
+	}
+
+	private _createTree(container: HTMLElement): void {
+		this._treeIdentityProvider = new SCMHistoryTreeIdentityProvider();
+
+		const historyItemHoverDelegate = this.instantiationService.createInstance(HistoryItemHoverDelegate, this.viewDescriptorService.getViewLocationById(this.id));
+		this._register(historyItemHoverDelegate);
+
+		this._treeDataSource = this.instantiationService.createInstance(SCMHistoryTreeDataSource);
+		this._register(this._treeDataSource);
+
+		this._tree = this.instantiationService.createInstance(
+			WorkbenchAsyncDataTree,
+			'SCM History Tree',
+			container,
+			new ListDelegate(),
+			[
+				this.instantiationService.createInstance(HistoryItemRenderer, historyItemHoverDelegate),
+				this.instantiationService.createInstance(
+					HistoryItemLoadMoreRenderer,
+					this._repositoryIsLoadingMore,
+					() => this._loadMore()),
+			],
+			this._treeDataSource,
+			{
+				accessibilityProvider: new SCMHistoryTreeAccessibilityProvider(),
+				identityProvider: this._treeIdentityProvider,
+				collapseByDefault: (e: unknown) => false,
+				keyboardNavigationLabelProvider: new SCMHistoryTreeKeyboardNavigationLabelProvider(),
+				horizontalScrolling: false,
+				multipleSelectionSupport: false,
+			}
+		) as WorkbenchAsyncDataTree<SCMHistoryViewModel, TreeElement, FuzzyScore>;
+		this._register(this._tree);
+
+		this._tree.onDidOpen(this._onDidOpen, this, this._store);
+		this._tree.onContextMenu(this._onContextMenu, this, this._store);
+	}
+
+	private async _onDidOpen(e: IOpenEvent<TreeElement | undefined>): Promise<void> {
+		if (!e.element) {
+			return;
+		} else if (isSCMHistoryItemViewModelTreeElement(e.element)) {
+			const historyItem = e.element.historyItemViewModel.historyItem;
+			const historyItemParentId = historyItem.parentIds.length > 0 ? historyItem.parentIds[0] : undefined;
+
+			const historyProvider = e.element.repository.provider.historyProvider.get();
+			const historyItemChanges = await historyProvider?.provideHistoryItemChanges(historyItem.id, historyItemParentId);
+			if (historyItemChanges) {
+				const title = getHistoryItemEditorTitle(historyItem);
+				const rootUri = e.element.repository.provider.rootUri;
+				const path = rootUri ? rootUri.path : e.element.repository.provider.label;
+				const multiDiffSourceUri = URI.from({ scheme: 'scm-history-item', path: `${path}/${historyItemParentId}..${historyItem.id}` }, true);
+
+				await this._commandService.executeCommand('_workbench.openMultiDiffEditor', { title, multiDiffSourceUri, resources: historyItemChanges });
+			}
+		} else if (isSCMHistoryItemLoadMoreTreeElement(e.element)) {
+			const pageOnScroll = this.configurationService.getValue<boolean>('scm.graph.pageOnScroll') === true;
+			if (!pageOnScroll) {
+				this._loadMore();
+				this._tree.setSelection([]);
+			}
+		}
+	}
+
+	private _onContextMenu(e: ITreeContextMenuEvent<TreeElement | null>): void {
+		const element = e.element;
+
+		if (!element || !isSCMHistoryItemViewModelTreeElement(element)) {
+			return;
+		}
+
+		this.contextMenuService.showContextMenu({
+			contextKeyService: this.scopedContextKeyService,
+			menuId: MenuId.SCMChangesContext,
+			menuActionOptions: {
+				arg: element.repository.provider,
+				shouldForwardArgs: true
+			},
+			getAnchor: () => e.anchor,
+			getActionsContext: () => element.historyItemViewModel.historyItem
+		});
+	}
+
+	private async _loadMore(cursor?: string): Promise<void> {
+		return this._treeLoadMoreSequencer.queue(async () => {
+			if (this._repositoryIsLoadingMore.get()) {
+				return;
+			}
+
+			this._repositoryIsLoadingMore.set(true, undefined);
+			this._treeViewModel.loadMore(cursor);
+
+			await this._updateChildren();
+			this._repositoryIsLoadingMore.set(false, undefined);
+		});
+	}
+
+	private _updateChildren(): Promise<void> {
+		return this._updateChildrenThrottler.queue(
+			() => this._treeOperationSequencer.queue(
+				async () => {
+					await this._progressService.withProgress({ location: this.id },
+						async () => {
+							await this._tree.updateChildren(undefined, undefined, undefined, {
+								// diffIdentityProvider: this._treeIdentityProvider
+							});
+						});
+				}));
+	}
+
+	override dispose(): void {
+		this._visibilityDisposables.dispose();
+		super.dispose();
+	}
+}
diff --git a/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.ts
index 890e39b459f..d1311889aad 100644
--- a/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.ts
@@ -3,31 +3,30 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/scm';
-import { localize } from 'vs/nls';
-import { Event } from 'vs/base/common/event';
-import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPane';
-import { append, $ } from 'vs/base/browser/dom';
-import { IListVirtualDelegate, IListContextMenuEvent, IListEvent } from 'vs/base/browser/ui/list/list';
-import { ISCMRepository, ISCMViewService } from 'vs/workbench/contrib/scm/common/scm';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { WorkbenchList } from 'vs/platform/list/browser/listService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IViewDescriptorService } from 'vs/workbench/common/views';
-import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { RepositoryActionRunner, RepositoryRenderer } from 'vs/workbench/contrib/scm/browser/scmRepositoryRenderer';
-import { collectContextMenuActions, getActionViewItemProvider } from 'vs/workbench/contrib/scm/browser/util';
-import { Orientation } from 'vs/base/browser/ui/sash/sash';
-import { Iterable } from 'vs/base/common/iterator';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import './media/scm.css';
+import { localize } from '../../../../nls.js';
+import { Event } from '../../../../base/common/event.js';
+import { ViewPane, IViewPaneOptions } from '../../../browser/parts/views/viewPane.js';
+import { append, $ } from '../../../../base/browser/dom.js';
+import { IListVirtualDelegate, IListContextMenuEvent, IListEvent } from '../../../../base/browser/ui/list/list.js';
+import { ISCMRepository, ISCMViewService } from '../common/scm.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { WorkbenchList } from '../../../../platform/list/browser/listService.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IViewDescriptorService } from '../../../common/views.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { RepositoryActionRunner, RepositoryRenderer } from './scmRepositoryRenderer.js';
+import { collectContextMenuActions, getActionViewItemProvider } from './util.js';
+import { Orientation } from '../../../../base/browser/ui/sash/sash.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 
 class ListDelegate implements IListVirtualDelegate<ISCMRepository> {
 
@@ -82,9 +81,7 @@ export class SCMRepositoriesViewPane extends ViewPane {
 		this.list = this.instantiationService.createInstance(WorkbenchList, `SCM Main`, listContainer, delegate, [renderer], {
 			identityProvider,
 			horizontalScrolling: false,
-			overrideStyles: {
-				listBackground: SIDE_BAR_BACKGROUND
-			},
+			overrideStyles: this.getLocationBasedColors().listOverrideStyles,
 			accessibilityProvider: {
 				getAriaLabel(r: ISCMRepository) {
 					return r.provider.label;
diff --git a/src/vs/workbench/contrib/scm/browser/scmRepositoryRenderer.ts b/src/vs/workbench/contrib/scm/browser/scmRepositoryRenderer.ts
index d09d5db8440..fc71e81e0fb 100644
--- a/src/vs/workbench/contrib/scm/browser/scmRepositoryRenderer.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmRepositoryRenderer.ts
@@ -3,27 +3,30 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/scm';
-import { IDisposable, DisposableStore, combinedDisposable } from 'vs/base/common/lifecycle';
-import { autorun } from 'vs/base/common/observable';
-import { append, $ } from 'vs/base/browser/dom';
-import { ISCMProvider, ISCMRepository, ISCMViewService } from 'vs/workbench/contrib/scm/common/scm';
-import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { ActionRunner, IAction } from 'vs/base/common/actions';
-import { connectPrimaryMenu, getRepositoryResourceCount, isSCMRepository, StatusBarAction } from './util';
-import { ITreeNode } from 'vs/base/browser/ui/tree/tree';
-import { ICompressibleTreeRenderer } from 'vs/base/browser/ui/tree/objectTree';
-import { FuzzyScore } from 'vs/base/common/filters';
-import { IListRenderer } from 'vs/base/browser/ui/list/list';
-import { IActionViewItemProvider } from 'vs/base/browser/ui/actionbar/actionbar';
-import { defaultCountBadgeStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { WorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
-import { IMenuService, MenuId, MenuItemAction } from 'vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import './media/scm.css';
+import { IDisposable, DisposableStore, combinedDisposable } from '../../../../base/common/lifecycle.js';
+import { autorun } from '../../../../base/common/observable.js';
+import { append, $ } from '../../../../base/browser/dom.js';
+import { ISCMProvider, ISCMRepository, ISCMViewService } from '../common/scm.js';
+import { CountBadge } from '../../../../base/browser/ui/countBadge/countBadge.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { ActionRunner, IAction } from '../../../../base/common/actions.js';
+import { connectPrimaryMenu, getRepositoryResourceCount, isSCMRepository, StatusBarAction } from './util.js';
+import { ITreeNode } from '../../../../base/browser/ui/tree/tree.js';
+import { ICompressibleTreeRenderer } from '../../../../base/browser/ui/tree/objectTree.js';
+import { FuzzyScore } from '../../../../base/common/filters.js';
+import { IListRenderer } from '../../../../base/browser/ui/list/list.js';
+import { IActionViewItemProvider } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { defaultCountBadgeStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { WorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
+import { IMenuService, MenuId, MenuItemAction } from '../../../../platform/actions/common/actions.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IManagedHover } from '../../../../base/browser/ui/hover/hover.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 
 export class RepositoryActionRunner extends ActionRunner {
 	constructor(private readonly getSelectedRepositories: () => ISCMRepository[]) {
@@ -44,6 +47,7 @@ export class RepositoryActionRunner extends ActionRunner {
 
 interface RepositoryTemplate {
 	readonly label: HTMLElement;
+	readonly labelCustomHover: IManagedHover;
 	readonly name: HTMLElement;
 	readonly description: HTMLElement;
 	readonly countContainer: HTMLElement;
@@ -61,12 +65,13 @@ export class RepositoryRenderer implements ICompressibleTreeRenderer<ISCMReposit
 	constructor(
 		private readonly toolbarMenuId: MenuId,
 		private readonly actionViewItemProvider: IActionViewItemProvider,
-		@ISCMViewService private scmViewService: ISCMViewService,
 		@ICommandService private commandService: ICommandService,
 		@IContextKeyService private contextKeyService: IContextKeyService,
 		@IContextMenuService private contextMenuService: IContextMenuService,
+		@IHoverService private hoverService: IHoverService,
 		@IKeybindingService private keybindingService: IKeybindingService,
 		@IMenuService private menuService: IMenuService,
+		@ISCMViewService private scmViewService: ISCMViewService,
 		@ITelemetryService private telemetryService: ITelemetryService
 	) { }
 
@@ -78,6 +83,7 @@ export class RepositoryRenderer implements ICompressibleTreeRenderer<ISCMReposit
 
 		const provider = append(container, $('.scm-provider'));
 		const label = append(provider, $('.label'));
+		const labelCustomHover = this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), label, '', {});
 		const name = append(label, $('span.name'));
 		const description = append(label, $('span.description'));
 		const actions = append(provider, $('.actions'));
@@ -86,9 +92,9 @@ export class RepositoryRenderer implements ICompressibleTreeRenderer<ISCMReposit
 		const count = new CountBadge(countContainer, {}, defaultCountBadgeStyles);
 		const visibilityDisposable = toolBar.onDidChangeDropdownVisibility(e => provider.classList.toggle('active', e));
 
-		const templateDisposable = combinedDisposable(visibilityDisposable, toolBar);
+		const templateDisposable = combinedDisposable(labelCustomHover, visibilityDisposable, toolBar);
 
-		return { label, name, description, countContainer, count, toolBar, elementDisposables: new DisposableStore(), templateDisposable };
+		return { label, labelCustomHover, name, description, countContainer, count, toolBar, elementDisposables: new DisposableStore(), templateDisposable };
 	}
 
 	renderElement(arg: ISCMRepository | ITreeNode<ISCMRepository, FuzzyScore>, index: number, templateData: RepositoryTemplate, height: number | undefined): void {
@@ -96,10 +102,10 @@ export class RepositoryRenderer implements ICompressibleTreeRenderer<ISCMReposit
 
 		templateData.name.textContent = repository.provider.name;
 		if (repository.provider.rootUri) {
-			templateData.label.title = `${repository.provider.label}: ${repository.provider.rootUri.fsPath}`;
+			templateData.labelCustomHover.update(`${repository.provider.label}: ${repository.provider.rootUri.fsPath}`);
 			templateData.description.textContent = repository.provider.label;
 		} else {
-			templateData.label.title = repository.provider.label;
+			templateData.labelCustomHover.update(repository.provider.label);
 			templateData.description.textContent = '';
 		}
 
@@ -111,7 +117,7 @@ export class RepositoryRenderer implements ICompressibleTreeRenderer<ISCMReposit
 		};
 
 		templateData.elementDisposables.add(autorun(reader => {
-			const commands = repository.provider.statusBarCommandsObs.read(reader) ?? [];
+			const commands = repository.provider.statusBarCommands.read(reader) ?? [];
 			statusPrimaryActions = commands.map(c => new StatusBarAction(c, this.commandService));
 			updateToolbar();
 		}));
@@ -129,6 +135,7 @@ export class RepositoryRenderer implements ICompressibleTreeRenderer<ISCMReposit
 			menuSecondaryActions = secondary;
 			updateToolbar();
 		}));
+
 		templateData.toolBar.context = repository.provider;
 	}
 
diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
index 98090e654ee..57350808cc0 100644
--- a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
@@ -3,158 +3,109 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/scm';
-import { Event, Emitter } from 'vs/base/common/event';
-import { basename, dirname } from 'vs/base/common/resources';
-import { IDisposable, Disposable, DisposableStore, combinedDisposable, dispose, toDisposable, MutableDisposable, DisposableMap } from 'vs/base/common/lifecycle';
-import { ViewPane, IViewPaneOptions, ViewAction } from 'vs/workbench/browser/parts/views/viewPane';
-import { append, $, Dimension, asCSSUrl, trackFocus, clearNode, prepend, isPointerEvent, isActiveElement } from 'vs/base/browser/dom';
-import { IListVirtualDelegate, IIdentityProvider } from 'vs/base/browser/ui/list/list';
-import { ISCMHistoryItem, ISCMHistoryItemChange, ISCMHistoryProviderCacheEntry, SCMHistoryItemChangeTreeElement, SCMHistoryItemGroupTreeElement, SCMHistoryItemTreeElement, SCMViewSeparatorElement } from 'vs/workbench/contrib/scm/common/history';
-import { ISCMResourceGroup, ISCMResource, InputValidationType, ISCMRepository, ISCMInput, IInputValidation, ISCMViewService, ISCMViewVisibleRepositoryChangeEvent, ISCMService, SCMInputChangeReason, VIEW_PANE_ID, ISCMActionButton, ISCMActionButtonDescriptor, ISCMRepositorySortKey, ISCMInputValueProviderContext, ISCMProvider } from 'vs/workbench/contrib/scm/common/scm';
-import { ResourceLabels, IResourceLabel, IFileLabelOptions } from 'vs/workbench/browser/labels';
-import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IContextViewService, IContextMenuService, IOpenContextView } from 'vs/platform/contextview/browser/contextView';
-import { IContextKeyService, IContextKey, ContextKeyExpr, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { MenuItemAction, IMenuService, registerAction2, MenuId, IAction2Options, MenuRegistry, Action2, IMenu } from 'vs/platform/actions/common/actions';
-import { IAction, ActionRunner, Action, Separator, IActionRunner } from 'vs/base/common/actions';
-import { ActionBar, IActionViewItemProvider } from 'vs/base/browser/ui/actionbar/actionbar';
-import { IThemeService, IFileIconTheme } from 'vs/platform/theme/common/themeService';
-import { isSCMResource, isSCMResourceGroup, connectPrimaryMenuToInlineActionBar, isSCMRepository, isSCMInput, collectContextMenuActions, getActionViewItemProvider, isSCMActionButton, isSCMViewService, isSCMHistoryItemGroupTreeElement, isSCMHistoryItemTreeElement, isSCMHistoryItemChangeTreeElement, toDiffEditorArguments, isSCMResourceNode, isSCMHistoryItemChangeNode, isSCMViewSeparator, connectPrimaryMenu } from './util';
-import { WorkbenchCompressibleAsyncDataTree, IOpenEvent } from 'vs/platform/list/browser/listService';
-import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
-import { disposableTimeout, Sequencer, ThrottledDelayer, Throttler } from 'vs/base/common/async';
-import { ITreeNode, ITreeFilter, ITreeSorter, ITreeContextMenuEvent, ITreeDragAndDrop, ITreeDragOverReaction, IAsyncDataSource } from 'vs/base/browser/ui/tree/tree';
-import { ResourceTree, IResourceNode } from 'vs/base/common/resourceTree';
-import { ICompressibleTreeRenderer, ICompressibleKeyboardNavigationLabelProvider } from 'vs/base/browser/ui/tree/objectTree';
-import { Iterable } from 'vs/base/common/iterator';
-import { ICompressedTreeNode } from 'vs/base/browser/ui/tree/compressedObjectTreeModel';
-import { URI } from 'vs/base/common/uri';
-import { FileKind } from 'vs/platform/files/common/files';
-import { compareFileNames, comparePaths } from 'vs/base/common/comparers';
-import { FuzzyScore, createMatches, IMatch } from 'vs/base/common/filters';
-import { IViewDescriptorService, ViewContainerLocation } from 'vs/workbench/common/views';
-import { localize } from 'vs/nls';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { EditorResourceAccessor, SideBySideEditor } from 'vs/workbench/common/editor';
-import { SIDE_BAR_BACKGROUND, PANEL_BACKGROUND } from 'vs/workbench/common/theme';
-import { CodeEditorWidget, ICodeEditorWidgetOptions } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { IEditorConstructionOptions } from 'vs/editor/browser/config/editorConfiguration';
-import { getSimpleEditorOptions } from 'vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
-import { IModelService } from 'vs/editor/common/services/model';
-import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
-import { MenuPreventer } from 'vs/workbench/contrib/codeEditor/browser/menuPreventer';
-import { SelectionClipboardContributionID } from 'vs/workbench/contrib/codeEditor/browser/selectionClipboard';
-import { EditorDictation } from 'vs/workbench/contrib/codeEditor/browser/dictation/editorDictation';
-import { ContextMenuController } from 'vs/editor/contrib/contextmenu/browser/contextmenu';
-import * as platform from 'vs/base/common/platform';
-import { compare, format } from 'vs/base/common/strings';
-import { SuggestController } from 'vs/editor/contrib/suggest/browser/suggestController';
-import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { ColorDetector } from 'vs/editor/contrib/colorPicker/browser/colorDetector';
-import { LinkDetector } from 'vs/editor/contrib/links/browser/links';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { DEFAULT_FONT_FAMILY } from 'vs/base/browser/fonts';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { AnchorAlignment } from 'vs/base/browser/ui/contextview/contextview';
-import { RepositoryActionRunner, RepositoryRenderer } from 'vs/workbench/contrib/scm/browser/scmRepositoryRenderer';
-import { ColorScheme } from 'vs/platform/theme/common/theme';
-import { LabelFuzzyScore } from 'vs/base/browser/ui/tree/abstractTree';
-import { Selection } from 'vs/editor/common/core/selection';
-import { API_OPEN_DIFF_EDITOR_COMMAND_ID, API_OPEN_EDITOR_COMMAND_ID } from 'vs/workbench/browser/parts/editor/editorCommands';
-import { createActionViewItem, createAndFillInActionBarActions, createAndFillInContextMenuActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { MarkdownRenderer, openLinkFromMarkdown } from 'vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
-import { Button, ButtonWithDescription, ButtonWithDropdown } from 'vs/base/browser/ui/button/button';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { RepositoryContextKeys } from 'vs/workbench/contrib/scm/browser/scmViewService';
-import { DragAndDropController } from 'vs/editor/contrib/dnd/browser/dnd';
-import { CopyPasteController } from 'vs/editor/contrib/dropOrPasteInto/browser/copyPasteController';
-import { DropIntoEditorController } from 'vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorController';
-import { MessageController } from 'vs/editor/contrib/message/browser/messageController';
-import { defaultButtonStyles, defaultCountBadgeStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController';
-import { CodeActionController } from 'vs/editor/contrib/codeAction/browser/codeActionController';
-import { Schemas } from 'vs/base/common/network';
-import { IDragAndDropData } from 'vs/base/browser/dnd';
-import { fillEditorsDragData } from 'vs/workbench/browser/dnd';
-import { ElementsDragAndDropData, ListViewTargetSector } from 'vs/base/browser/ui/list/listView';
-import { CodeDataTransfers } from 'vs/platform/dnd/browser/dnd';
-import { FormatOnType } from 'vs/editor/contrib/format/browser/formatActions';
-import { EditorOption, EditorOptions, IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { IAsyncDataTreeViewState, ITreeCompressionDelegate } from 'vs/base/browser/ui/tree/asyncDataTree';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { EditOperation } from 'vs/editor/common/core/editOperation';
-import { stripIcons } from 'vs/base/common/iconLabels';
-import { IconLabel } from 'vs/base/browser/ui/iconLabel/iconLabel';
-import { foreground, listActiveSelectionForeground, registerColor, transparent } from 'vs/platform/theme/common/colorRegistry';
-import { IMenuWorkbenchToolBarOptions, MenuWorkbenchToolBar, WorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { DropdownWithPrimaryActionViewItem } from 'vs/platform/actions/browser/dropdownWithPrimaryActionViewItem';
-import { clamp, rot } from 'vs/base/common/numbers';
-import { ILogService } from 'vs/platform/log/common/log';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import type { IManagedHover, IManagedHoverTooltipMarkdownString } from 'vs/base/browser/ui/hover/hover';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { OpenScmGroupAction } from 'vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver';
-import { HoverController } from 'vs/editor/contrib/hover/browser/hoverController';
-import { ITextModel } from 'vs/editor/common/model';
-import { autorun } from 'vs/base/common/observable';
+import './media/scm.css';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { basename, dirname } from '../../../../base/common/resources.js';
+import { IDisposable, Disposable, DisposableStore, combinedDisposable, dispose, toDisposable, MutableDisposable, DisposableMap } from '../../../../base/common/lifecycle.js';
+import { ViewPane, IViewPaneOptions, ViewAction } from '../../../browser/parts/views/viewPane.js';
+import { append, $, Dimension, asCSSUrl, trackFocus, clearNode, isPointerEvent, isActiveElement } from '../../../../base/browser/dom.js';
+import { IListVirtualDelegate, IIdentityProvider } from '../../../../base/browser/ui/list/list.js';
+import { ISCMResourceGroup, ISCMResource, InputValidationType, ISCMRepository, ISCMInput, IInputValidation, ISCMViewService, ISCMViewVisibleRepositoryChangeEvent, ISCMService, SCMInputChangeReason, VIEW_PANE_ID, ISCMActionButton, ISCMActionButtonDescriptor, ISCMRepositorySortKey, ISCMInputValueProviderContext } from '../common/scm.js';
+import { ResourceLabels, IResourceLabel, IFileLabelOptions } from '../../../browser/labels.js';
+import { CountBadge } from '../../../../base/browser/ui/countBadge/countBadge.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IContextViewService, IContextMenuService, IOpenContextView } from '../../../../platform/contextview/browser/contextView.js';
+import { IContextKeyService, IContextKey, ContextKeyExpr, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { MenuItemAction, IMenuService, registerAction2, MenuId, IAction2Options, MenuRegistry, Action2, IMenu } from '../../../../platform/actions/common/actions.js';
+import { IAction, ActionRunner, Action, Separator, IActionRunner } from '../../../../base/common/actions.js';
+import { ActionBar, IActionViewItemProvider } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { IThemeService, IFileIconTheme } from '../../../../platform/theme/common/themeService.js';
+import { isSCMResource, isSCMResourceGroup, connectPrimaryMenuToInlineActionBar, isSCMRepository, isSCMInput, collectContextMenuActions, getActionViewItemProvider, isSCMActionButton, isSCMViewService, isSCMResourceNode } from './util.js';
+import { WorkbenchCompressibleAsyncDataTree, IOpenEvent } from '../../../../platform/list/browser/listService.js';
+import { IConfigurationService, ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
+import { disposableTimeout, Sequencer, ThrottledDelayer, Throttler } from '../../../../base/common/async.js';
+import { ITreeNode, ITreeFilter, ITreeSorter, ITreeContextMenuEvent, ITreeDragAndDrop, ITreeDragOverReaction, IAsyncDataSource } from '../../../../base/browser/ui/tree/tree.js';
+import { ResourceTree, IResourceNode } from '../../../../base/common/resourceTree.js';
+import { ICompressibleTreeRenderer, ICompressibleKeyboardNavigationLabelProvider } from '../../../../base/browser/ui/tree/objectTree.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { ICompressedTreeNode } from '../../../../base/browser/ui/tree/compressedObjectTreeModel.js';
+import { URI } from '../../../../base/common/uri.js';
+import { FileKind } from '../../../../platform/files/common/files.js';
+import { compareFileNames, comparePaths } from '../../../../base/common/comparers.js';
+import { FuzzyScore, createMatches, IMatch } from '../../../../base/common/filters.js';
+import { IViewDescriptorService } from '../../../common/views.js';
+import { localize } from '../../../../nls.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
+import { CodeEditorWidget, ICodeEditorWidgetOptions } from '../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { IEditorConstructionOptions } from '../../../../editor/browser/config/editorConfiguration.js';
+import { getSimpleEditorOptions, setupSimpleEditorSelectionStyling } from '../../codeEditor/browser/simpleEditorOptions.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { EditorExtensionsRegistry } from '../../../../editor/browser/editorExtensions.js';
+import { MenuPreventer } from '../../codeEditor/browser/menuPreventer.js';
+import { SelectionClipboardContributionID } from '../../codeEditor/browser/selectionClipboard.js';
+import { EditorDictation } from '../../codeEditor/browser/dictation/editorDictation.js';
+import { ContextMenuController } from '../../../../editor/contrib/contextmenu/browser/contextmenu.js';
+import * as platform from '../../../../base/common/platform.js';
+import { compare, format } from '../../../../base/common/strings.js';
+import { SuggestController } from '../../../../editor/contrib/suggest/browser/suggestController.js';
+import { SnippetController2 } from '../../../../editor/contrib/snippet/browser/snippetController2.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { ColorDetector } from '../../../../editor/contrib/colorPicker/browser/colorDetector.js';
+import { LinkDetector } from '../../../../editor/contrib/links/browser/links.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IListAccessibilityProvider } from '../../../../base/browser/ui/list/listWidget.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { DEFAULT_FONT_FAMILY } from '../../../../base/browser/fonts.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { AnchorAlignment } from '../../../../base/browser/ui/contextview/contextview.js';
+import { RepositoryActionRunner, RepositoryRenderer } from './scmRepositoryRenderer.js';
+import { ColorScheme } from '../../../../platform/theme/common/theme.js';
+import { LabelFuzzyScore } from '../../../../base/browser/ui/tree/abstractTree.js';
+import { Selection } from '../../../../editor/common/core/selection.js';
+import { API_OPEN_DIFF_EDITOR_COMMAND_ID, API_OPEN_EDITOR_COMMAND_ID } from '../../../browser/parts/editor/editorCommands.js';
+import { createActionViewItem, createAndFillInActionBarActions, createAndFillInContextMenuActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { MarkdownRenderer, openLinkFromMarkdown } from '../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import { Button, ButtonWithDescription, ButtonWithDropdown } from '../../../../base/browser/ui/button/button.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { RepositoryContextKeys } from './scmViewService.js';
+import { DragAndDropController } from '../../../../editor/contrib/dnd/browser/dnd.js';
+import { CopyPasteController } from '../../../../editor/contrib/dropOrPasteInto/browser/copyPasteController.js';
+import { DropIntoEditorController } from '../../../../editor/contrib/dropOrPasteInto/browser/dropIntoEditorController.js';
+import { MessageController } from '../../../../editor/contrib/message/browser/messageController.js';
+import { defaultButtonStyles, defaultCountBadgeStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { InlineCompletionsController } from '../../../../editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.js';
+import { CodeActionController } from '../../../../editor/contrib/codeAction/browser/codeActionController.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { IDragAndDropData } from '../../../../base/browser/dnd.js';
+import { fillEditorsDragData } from '../../../browser/dnd.js';
+import { ElementsDragAndDropData, ListViewTargetSector } from '../../../../base/browser/ui/list/listView.js';
+import { CodeDataTransfers } from '../../../../platform/dnd/browser/dnd.js';
+import { FormatOnType } from '../../../../editor/contrib/format/browser/formatActions.js';
+import { EditorOption, EditorOptions, IEditorOptions } from '../../../../editor/common/config/editorOptions.js';
+import { IAsyncDataTreeViewState, ITreeCompressionDelegate } from '../../../../base/browser/ui/tree/asyncDataTree.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { EditOperation } from '../../../../editor/common/core/editOperation.js';
+import { IMenuWorkbenchToolBarOptions, WorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { DropdownWithPrimaryActionViewItem } from '../../../../platform/actions/browser/dropdownWithPrimaryActionViewItem.js';
+import { clamp, rot } from '../../../../base/common/numbers.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { OpenScmGroupAction } from '../../multiDiffEditor/browser/scmMultiDiffSourceResolver.js';
+import { ContentHoverController } from '../../../../editor/contrib/hover/browser/contentHoverController.js';
+import { GlyphHoverController } from '../../../../editor/contrib/hover/browser/glyphHoverController.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { autorun } from '../../../../base/common/observable.js';
+import { PlaceholderTextContribution } from '../../../../editor/contrib/placeholderText/browser/placeholderTextContribution.js';
+import { observableConfigValue } from '../../../../platform/observable/common/platformObservableUtils.js';
 
-// type SCMResourceTreeNode = IResourceNode<ISCMResource, ISCMResourceGroup>;
-// type SCMHistoryItemChangeResourceTreeNode = IResourceNode<SCMHistoryItemChangeTreeElement, SCMHistoryItemTreeElement>;
-type TreeElement =
-	ISCMRepository |
-	ISCMInput |
-	ISCMActionButton |
-	ISCMResourceGroup |
-	ISCMResource |
-	IResourceNode<ISCMResource, ISCMResourceGroup> |
-	SCMHistoryItemGroupTreeElement |
-	SCMHistoryItemTreeElement |
-	SCMHistoryItemChangeTreeElement |
-	IResourceNode<SCMHistoryItemChangeTreeElement, SCMHistoryItemTreeElement> |
-	SCMViewSeparatorElement;
-
-type ShowChangesSetting = 'always' | 'never' | 'auto';
-
-registerColor('scm.historyItemAdditionsForeground', {
-	dark: 'gitDecoration.addedResourceForeground',
-	light: 'gitDecoration.addedResourceForeground',
-	hcDark: 'gitDecoration.addedResourceForeground',
-	hcLight: 'gitDecoration.addedResourceForeground'
-}, localize('scm.historyItemAdditionsForeground', "History item additions foreground color."));
-
-registerColor('scm.historyItemDeletionsForeground', {
-	dark: 'gitDecoration.deletedResourceForeground',
-	light: 'gitDecoration.deletedResourceForeground',
-	hcDark: 'gitDecoration.deletedResourceForeground',
-	hcLight: 'gitDecoration.deletedResourceForeground'
-}, localize('scm.historyItemDeletionsForeground', "History item deletions foreground color."));
-
-registerColor('scm.historyItemStatisticsBorder', {
-	dark: transparent(foreground, 0.2),
-	light: transparent(foreground, 0.2),
-	hcDark: transparent(foreground, 0.2),
-	hcLight: transparent(foreground, 0.2)
-}, localize('scm.historyItemStatisticsBorder', "History item statistics border color."));
-
-registerColor('scm.historyItemSelectedStatisticsBorder', {
-	dark: transparent(listActiveSelectionForeground, 0.2),
-	light: transparent(listActiveSelectionForeground, 0.2),
-	hcDark: transparent(listActiveSelectionForeground, 0.2),
-	hcLight: transparent(listActiveSelectionForeground, 0.2)
-}, localize('scm.historyItemSelectedStatisticsBorder', "History item selected statistics border color."));
+type TreeElement = ISCMRepository | ISCMInput | ISCMActionButton | ISCMResourceGroup | ISCMResource | IResourceNode<ISCMResource, ISCMResourceGroup>;
 
 function processResourceFilterData(uri: URI, filterData: FuzzyScore | LabelFuzzyScore | undefined): [IMatch[] | undefined, IMatch[] | undefined] {
 	if (!filterData) {
@@ -736,391 +687,6 @@ class ResourceRenderer implements ICompressibleTreeRenderer<ISCMResource | IReso
 	}
 }
 
-
-class HistoryItemGroupActionRunner extends ActionRunner {
-
-	protected override runAction(action: IAction, context: SCMHistoryItemGroupTreeElement): Promise<void> {
-		if (!(action instanceof MenuItemAction)) {
-			return super.runAction(action, context);
-		}
-
-		return action.run(context.repository.provider, context.id);
-	}
-}
-
-interface HistoryItemGroupTemplate {
-	readonly iconContainer: HTMLElement;
-	readonly label: IconLabel;
-	readonly toolBar: WorkbenchToolBar;
-	readonly count: CountBadge;
-	readonly elementDisposables: DisposableStore;
-	readonly templateDisposables: DisposableStore;
-}
-
-class HistoryItemGroupRenderer implements ICompressibleTreeRenderer<SCMHistoryItemGroupTreeElement, void, HistoryItemGroupTemplate> {
-
-	static readonly TEMPLATE_ID = 'history-item-group';
-	get templateId(): string { return HistoryItemGroupRenderer.TEMPLATE_ID; }
-
-	constructor(
-		readonly actionRunner: ActionRunner,
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
-		@IContextMenuService private readonly contextMenuService: IContextMenuService,
-		@IKeybindingService private readonly keybindingService: IKeybindingService,
-		@ICommandService private readonly commandService: ICommandService,
-		@IMenuService private readonly menuService: IMenuService,
-		@ISCMViewService private readonly scmViewService: ISCMViewService,
-		@ITelemetryService private readonly telemetryService: ITelemetryService
-	) { }
-
-	renderTemplate(container: HTMLElement) {
-		// hack
-		(container.parentElement!.parentElement!.querySelector('.monaco-tl-twistie')! as HTMLElement).classList.add('force-twistie');
-
-		const element = append(container, $('.history-item-group'));
-
-		const label = new IconLabel(element, { supportIcons: true });
-		const iconContainer = prepend(label.element, $('.icon-container'));
-
-		const templateDisposables = new DisposableStore();
-		const toolBar = new WorkbenchToolBar(append(element, $('.actions')), { actionRunner: this.actionRunner, menuOptions: { shouldForwardArgs: true } }, this.menuService, this.contextKeyService, this.contextMenuService, this.keybindingService, this.commandService, this.telemetryService);
-		templateDisposables.add(toolBar);
-
-		const countContainer = append(element, $('.count'));
-		const count = new CountBadge(countContainer, {}, defaultCountBadgeStyles);
-
-		return { iconContainer, label, toolBar, count, elementDisposables: new DisposableStore(), templateDisposables };
-	}
-
-	renderElement(node: ITreeNode<SCMHistoryItemGroupTreeElement>, index: number, templateData: HistoryItemGroupTemplate, height: number | undefined): void {
-		const historyItemGroup = node.element;
-
-		templateData.iconContainer.className = 'icon-container';
-		if (historyItemGroup.icon && ThemeIcon.isThemeIcon(historyItemGroup.icon)) {
-			templateData.iconContainer.classList.add(...ThemeIcon.asClassNameArray(historyItemGroup.icon));
-		}
-
-		templateData.label.setLabel(historyItemGroup.label, historyItemGroup.description, { title: historyItemGroup.ariaLabel });
-		templateData.count.setCount(historyItemGroup.count ?? 0);
-
-		const repositoryMenus = this.scmViewService.menus.getRepositoryMenus(historyItemGroup.repository.provider);
-		const historyProviderMenu = repositoryMenus.historyProviderMenu;
-
-		if (historyProviderMenu) {
-			const menu = historyProviderMenu.getHistoryItemGroupMenu(historyItemGroup);
-			const resetMenuId = historyItemGroup.direction === 'incoming' ? MenuId.SCMIncomingChanges : MenuId.SCMOutgoingChanges;
-
-			templateData.elementDisposables.add(connectPrimaryMenu(menu, (primary, secondary) => {
-				templateData.toolBar.setActions(primary, secondary, [resetMenuId]);
-			}));
-
-			templateData.toolBar.context = historyItemGroup;
-		} else {
-			templateData.toolBar.setActions([], []);
-			templateData.toolBar.context = undefined;
-		}
-	}
-
-	renderCompressedElements(node: ITreeNode<ICompressedTreeNode<SCMHistoryItemGroupTreeElement>, void>, index: number, templateData: HistoryItemGroupTemplate, height: number | undefined): void {
-		throw new Error('Should never happen since node is incompressible');
-	}
-
-	disposeElement(node: ITreeNode<SCMHistoryItemGroupTreeElement>, index: number, templateData: HistoryItemGroupTemplate, height: number | undefined): void {
-		templateData.elementDisposables.clear();
-	}
-
-	disposeTemplate(templateData: HistoryItemGroupTemplate): void {
-		templateData.elementDisposables.dispose();
-		templateData.templateDisposables.dispose();
-	}
-}
-
-class HistoryItemActionRunner extends ActionRunner {
-
-	protected override async runAction(action: IAction, context: SCMHistoryItemTreeElement): Promise<any> {
-		if (!(action instanceof MenuItemAction)) {
-			return super.runAction(action, context);
-		}
-
-		const args: (ISCMProvider | ISCMHistoryItem)[] = [];
-		args.push(context.historyItemGroup.repository.provider);
-		args.push({
-			id: context.id,
-			parentIds: context.parentIds,
-			message: context.message,
-			author: context.author,
-			icon: context.icon,
-			timestamp: context.timestamp,
-			statistics: context.statistics,
-		} satisfies ISCMHistoryItem);
-
-		await action.run(...args);
-	}
-}
-
-interface HistoryItemTemplate {
-	readonly iconContainer: HTMLElement;
-	readonly label: IconLabel;
-	readonly statsContainer: HTMLElement;
-	readonly statsCustomHover: IManagedHover;
-	readonly filesLabel: HTMLElement;
-	readonly insertionsLabel: HTMLElement;
-	readonly deletionsLabel: HTMLElement;
-	readonly actionBar: ActionBar;
-	readonly elementDisposables: DisposableStore;
-	readonly disposables: IDisposable;
-}
-
-class HistoryItemRenderer implements ICompressibleTreeRenderer<SCMHistoryItemTreeElement, LabelFuzzyScore, HistoryItemTemplate> {
-
-	static readonly TEMPLATE_ID = 'history-item';
-	get templateId(): string { return HistoryItemRenderer.TEMPLATE_ID; }
-
-	constructor(
-		private actionRunner: IActionRunner,
-		private actionViewItemProvider: IActionViewItemProvider,
-		@IHoverService private hoverService: IHoverService,
-		@ISCMViewService private scmViewService: ISCMViewService
-	) { }
-
-	renderTemplate(container: HTMLElement): HistoryItemTemplate {
-		// hack
-		(container.parentElement!.parentElement!.querySelector('.monaco-tl-twistie')! as HTMLElement).classList.add('force-twistie');
-
-		const element = append(container, $('.history-item'));
-
-		const iconLabel = new IconLabel(element, { supportIcons: true, supportHighlights: true, supportDescriptionHighlights: true });
-		const iconContainer = prepend(iconLabel.element, $('.icon-container'));
-
-		const disposables = new DisposableStore();
-		const actionsContainer = append(element, $('.actions'));
-		const actionBar = new ActionBar(actionsContainer, { actionRunner: this.actionRunner, actionViewItemProvider: this.actionViewItemProvider });
-		disposables.add(actionBar);
-
-		const statsContainer = append(element, $('.stats-container'));
-		const filesLabel = append(statsContainer, $('.files-label'));
-		const insertionsLabel = append(statsContainer, $('.insertions-label'));
-		const deletionsLabel = append(statsContainer, $('.deletions-label'));
-
-		const statsCustomHover = this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), statsContainer, '');
-		disposables.add(statsCustomHover);
-
-		return { iconContainer, label: iconLabel, actionBar, statsContainer, statsCustomHover, filesLabel, insertionsLabel, deletionsLabel, elementDisposables: new DisposableStore(), disposables };
-	}
-
-	renderElement(node: ITreeNode<SCMHistoryItemTreeElement, LabelFuzzyScore>, index: number, templateData: HistoryItemTemplate, height: number | undefined): void {
-		const historyItem = node.element;
-
-		templateData.iconContainer.className = 'icon-container';
-		if (historyItem.icon && ThemeIcon.isThemeIcon(historyItem.icon)) {
-			templateData.iconContainer.classList.add(...ThemeIcon.asClassNameArray(historyItem.icon));
-		}
-
-		const title = this.getTooltip(historyItem);
-		const [matches, descriptionMatches] = this.processMatches(historyItem, node.filterData);
-		templateData.label.setLabel(historyItem.message, historyItem.author, { matches, descriptionMatches, title });
-
-		templateData.actionBar.clear();
-		templateData.actionBar.context = historyItem;
-
-		const menus = this.scmViewService.menus.getRepositoryMenus(historyItem.historyItemGroup.repository.provider);
-		if (menus.historyProviderMenu) {
-			const historyItemMenu = menus.historyProviderMenu.getHistoryItemMenu(historyItem);
-			templateData.elementDisposables.add(connectPrimaryMenuToInlineActionBar(historyItemMenu, templateData.actionBar));
-		}
-
-		this.renderStatistics(node, index, templateData, height);
-	}
-
-	renderCompressedElements(node: ITreeNode<ICompressedTreeNode<SCMHistoryItemTreeElement>, LabelFuzzyScore>, index: number, templateData: HistoryItemTemplate, height: number | undefined): void {
-		throw new Error('Should never happen since node is incompressible');
-	}
-
-	private getTooltip(historyItem: SCMHistoryItemTreeElement): IManagedHoverTooltipMarkdownString {
-		const markdown = new MarkdownString('', { isTrusted: true, supportThemeIcons: true });
-
-		if (historyItem.author) {
-			markdown.appendMarkdown(`$(account) **${historyItem.author}**\n\n`);
-		}
-
-		if (historyItem.timestamp) {
-			const dateFormatter = new Intl.DateTimeFormat(platform.language, { year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', minute: 'numeric' });
-			markdown.appendMarkdown(`$(history) ${dateFormatter.format(historyItem.timestamp)}\n\n`);
-		}
-
-		markdown.appendMarkdown(historyItem.message);
-
-		return { markdown, markdownNotSupportedFallback: historyItem.message };
-	}
-
-	private processMatches(historyItem: SCMHistoryItemTreeElement, filterData: LabelFuzzyScore | undefined): [IMatch[] | undefined, IMatch[] | undefined] {
-		if (!filterData) {
-			return [undefined, undefined];
-		}
-
-		return [
-			historyItem.message === filterData.label ? createMatches(filterData.score) : undefined,
-			historyItem.author === filterData.label ? createMatches(filterData.score) : undefined
-		];
-	}
-
-	private renderStatistics(node: ITreeNode<SCMHistoryItemTreeElement, LabelFuzzyScore>, index: number, templateData: HistoryItemTemplate, height: number | undefined): void {
-		const historyItem = node.element;
-
-		if (historyItem.statistics) {
-			const statsAriaLabel: string[] = [
-				historyItem.statistics.files === 1 ?
-					localize('fileChanged', "{0} file changed", historyItem.statistics.files) :
-					localize('filesChanged', "{0} files changed", historyItem.statistics.files),
-				historyItem.statistics.insertions === 1 ? localize('insertion', "{0} insertion{1}", historyItem.statistics.insertions, '(+)') :
-					historyItem.statistics.insertions > 1 ? localize('insertions', "{0} insertions{1}", historyItem.statistics.insertions, '(+)') : '',
-				historyItem.statistics.deletions === 1 ? localize('deletion', "{0} deletion{1}", historyItem.statistics.deletions, '(-)') :
-					historyItem.statistics.deletions > 1 ? localize('deletions', "{0} deletions{1}", historyItem.statistics.deletions, '(-)') : ''
-			];
-
-			const statsTitle = statsAriaLabel.filter(l => l !== '').join(', ');
-			templateData.statsContainer.setAttribute('aria-label', statsTitle);
-			templateData.statsCustomHover.update(statsTitle);
-
-			templateData.filesLabel.textContent = historyItem.statistics.files.toString();
-
-			templateData.insertionsLabel.textContent = historyItem.statistics.insertions > 0 ? `+${historyItem.statistics.insertions}` : '';
-			templateData.insertionsLabel.classList.toggle('hidden', historyItem.statistics.insertions === 0);
-
-			templateData.deletionsLabel.textContent = historyItem.statistics.deletions > 0 ? `-${historyItem.statistics.deletions}` : '';
-			templateData.deletionsLabel.classList.toggle('hidden', historyItem.statistics.deletions === 0);
-		}
-
-		templateData.statsContainer.classList.toggle('hidden', historyItem.statistics === undefined);
-	}
-
-	disposeElement(element: ITreeNode<SCMHistoryItemTreeElement, LabelFuzzyScore>, index: number, templateData: HistoryItemTemplate, height: number | undefined): void {
-		templateData.elementDisposables.clear();
-	}
-
-	disposeTemplate(templateData: HistoryItemTemplate): void {
-		templateData.disposables.dispose();
-	}
-}
-
-interface HistoryItemChangeTemplate {
-	readonly element: HTMLElement;
-	readonly name: HTMLElement;
-	readonly fileLabel: IResourceLabel;
-	readonly decorationIcon: HTMLElement;
-	readonly disposables: IDisposable;
-}
-
-class HistoryItemChangeRenderer implements ICompressibleTreeRenderer<SCMHistoryItemChangeTreeElement | IResourceNode<SCMHistoryItemChangeTreeElement, SCMHistoryItemTreeElement>, FuzzyScore | LabelFuzzyScore, HistoryItemChangeTemplate> {
-
-	static readonly TEMPLATE_ID = 'historyItemChange';
-	get templateId(): string { return HistoryItemChangeRenderer.TEMPLATE_ID; }
-
-	constructor(
-		private readonly viewMode: () => ViewMode,
-		private readonly labels: ResourceLabels,
-		@ILabelService private labelService: ILabelService) { }
-
-	renderTemplate(container: HTMLElement): HistoryItemChangeTemplate {
-		const element = append(container, $('.change'));
-		const name = append(element, $('.name'));
-		const fileLabel = this.labels.create(name, { supportDescriptionHighlights: true, supportHighlights: true });
-		const decorationIcon = append(element, $('.decoration-icon'));
-
-		return { element, name, fileLabel, decorationIcon, disposables: new DisposableStore() };
-	}
-
-	renderElement(node: ITreeNode<SCMHistoryItemChangeTreeElement | IResourceNode<SCMHistoryItemChangeTreeElement, SCMHistoryItemTreeElement>, FuzzyScore | LabelFuzzyScore>, index: number, templateData: HistoryItemChangeTemplate, height: number | undefined): void {
-		const historyItemChangeOrFolder = node.element;
-		const uri = ResourceTree.isResourceNode(historyItemChangeOrFolder) ? historyItemChangeOrFolder.element?.uri ?? historyItemChangeOrFolder.uri : historyItemChangeOrFolder.uri;
-		const fileKind = ResourceTree.isResourceNode(historyItemChangeOrFolder) ? FileKind.FOLDER : FileKind.FILE;
-		const hidePath = this.viewMode() === ViewMode.Tree;
-
-		let matches: IMatch[] | undefined;
-		let descriptionMatches: IMatch[] | undefined;
-
-		if (ResourceTree.isResourceNode(historyItemChangeOrFolder)) {
-			if (!historyItemChangeOrFolder.element) {
-				matches = createMatches(node.filterData as FuzzyScore | undefined);
-			}
-		} else {
-			[matches, descriptionMatches] = processResourceFilterData(uri, node.filterData);
-		}
-
-		templateData.fileLabel.setFile(uri, { fileDecorations: { colors: false, badges: true }, fileKind, hidePath, matches, descriptionMatches });
-	}
-
-	renderCompressedElements(node: ITreeNode<ICompressedTreeNode<SCMHistoryItemChangeTreeElement | IResourceNode<SCMHistoryItemChangeTreeElement, SCMHistoryItemTreeElement>>, FuzzyScore | LabelFuzzyScore>, index: number, templateData: HistoryItemChangeTemplate, height: number | undefined): void {
-		const compressed = node.element as ICompressedTreeNode<IResourceNode<SCMHistoryItemChangeTreeElement, SCMHistoryItemTreeElement>>;
-
-		const folder = compressed.elements[compressed.elements.length - 1];
-		const label = compressed.elements.map(e => e.name);
-		const matches = createMatches(node.filterData as FuzzyScore | undefined);
-
-		templateData.fileLabel.setResource({ resource: folder.uri, name: label }, {
-			fileDecorations: { colors: false, badges: true },
-			fileKind: FileKind.FOLDER,
-			matches,
-			separator: this.labelService.getSeparator(folder.uri.scheme)
-		});
-	}
-
-	disposeTemplate(templateData: HistoryItemChangeTemplate): void {
-		templateData.disposables.dispose();
-	}
-}
-
-interface SeparatorTemplate {
-	readonly label: IconLabel;
-	readonly disposables: DisposableStore;
-}
-
-class SeparatorRenderer implements ICompressibleTreeRenderer<SCMViewSeparatorElement, void, SeparatorTemplate> {
-
-	static readonly TEMPLATE_ID = 'separator';
-	get templateId(): string { return SeparatorRenderer.TEMPLATE_ID; }
-
-	constructor(
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
-		@IContextMenuService private readonly contextMenuService: IContextMenuService,
-		@IKeybindingService private readonly keybindingService: IKeybindingService,
-		@ICommandService private readonly commandService: ICommandService,
-		@IMenuService private readonly menuService: IMenuService,
-		@ITelemetryService private readonly telemetryService: ITelemetryService
-	) { }
-
-	renderTemplate(container: HTMLElement): SeparatorTemplate {
-		// hack
-		(container.parentElement!.parentElement!.querySelector('.monaco-tl-twistie')! as HTMLElement).classList.add('force-no-twistie');
-
-		// Use default cursor & disable hover for list item
-		container.parentElement!.parentElement!.classList.add('cursor-default', 'force-no-hover');
-
-		const disposables = new DisposableStore();
-		const element = append(container, $('.separator-container'));
-		const label = new IconLabel(element, { supportIcons: true, });
-		append(element, $('.separator'));
-		disposables.add(label);
-
-		const toolBar = new MenuWorkbenchToolBar(append(element, $('.actions')), MenuId.SCMChangesSeparator, { moreIcon: Codicon.gear }, this.menuService, this.contextKeyService, this.contextMenuService, this.keybindingService, this.commandService, this.telemetryService);
-		disposables.add(toolBar);
-
-		return { label, disposables };
-	}
-	renderElement(element: ITreeNode<SCMViewSeparatorElement, void>, index: number, templateData: SeparatorTemplate, height: number | undefined): void {
-		templateData.label.setLabel(element.element.label, undefined, { title: element.element.ariaLabel });
-	}
-
-	renderCompressedElements(node: ITreeNode<ICompressedTreeNode<SCMViewSeparatorElement>, void>, index: number, templateData: SeparatorTemplate, height: number | undefined): void {
-		throw new Error('Should never happen since node is incompressible');
-	}
-
-	disposeTemplate(templateData: SeparatorTemplate): void {
-		templateData.disposables.dispose();
-	}
-
-}
-
 class ListDelegate implements IListVirtualDelegate<TreeElement> {
 
 	constructor(private readonly inputRenderer: InputRenderer) { }
@@ -1146,14 +712,6 @@ class ListDelegate implements IListVirtualDelegate<TreeElement> {
 			return ResourceGroupRenderer.TEMPLATE_ID;
 		} else if (isSCMResource(element) || isSCMResourceNode(element)) {
 			return ResourceRenderer.TEMPLATE_ID;
-		} else if (isSCMHistoryItemGroupTreeElement(element)) {
-			return HistoryItemGroupRenderer.TEMPLATE_ID;
-		} else if (isSCMHistoryItemTreeElement(element)) {
-			return HistoryItemRenderer.TEMPLATE_ID;
-		} else if (isSCMHistoryItemChangeTreeElement(element) || isSCMHistoryItemChangeNode(element)) {
-			return HistoryItemChangeRenderer.TEMPLATE_ID;
-		} else if (isSCMViewSeparator(element)) {
-			return SeparatorRenderer.TEMPLATE_ID;
 		} else {
 			throw new Error('Unknown element');
 		}
@@ -1214,43 +772,6 @@ export class SCMTreeSorter implements ITreeSorter<TreeElement> {
 			return isSCMResourceGroup(other) ? 0 : -1;
 		}
 
-		if (isSCMViewSeparator(one)) {
-			return isSCMResourceGroup(other) ? 1 : -1;
-		}
-
-		if (isSCMHistoryItemGroupTreeElement(one)) {
-			return isSCMHistoryItemGroupTreeElement(other) ? 0 : 1;
-		}
-
-		if (isSCMHistoryItemTreeElement(one)) {
-			if (!isSCMHistoryItemTreeElement(other)) {
-				throw new Error('Invalid comparison');
-			}
-
-			return 0;
-		}
-
-		if (isSCMHistoryItemChangeTreeElement(one) || isSCMHistoryItemChangeNode(one)) {
-			// List
-			if (this.viewMode() === ViewMode.List) {
-				if (!isSCMHistoryItemChangeTreeElement(other)) {
-					throw new Error('Invalid comparison');
-				}
-
-				return comparePaths(one.uri.fsPath, other.uri.fsPath);
-			}
-
-			// Tree
-			if (!isSCMHistoryItemChangeTreeElement(other) && !isSCMHistoryItemChangeNode(other)) {
-				throw new Error('Invalid comparison');
-			}
-
-			const oneName = isSCMHistoryItemChangeNode(one) ? one.name : basename(one.uri);
-			const otherName = isSCMHistoryItemChangeNode(other) ? other.name : basename(other.uri);
-
-			return compareFileNames(oneName, otherName);
-		}
-
 		// Resource (List)
 		if (this.viewMode() === ViewMode.List) {
 			// FileName
@@ -1307,26 +828,19 @@ export class SCMTreeKeyboardNavigationLabelProvider implements ICompressibleKeyb
 			return undefined;
 		} else if (isSCMResourceGroup(element)) {
 			return element.label;
-		} else if (isSCMHistoryItemGroupTreeElement(element)) {
-			return element.label;
-		} else if (isSCMHistoryItemTreeElement(element)) {
-			// For a history item we want to match both the message and
-			// the author. A match in the message takes precedence over
-			// a match in the author.
-			return [element.message, element.author];
-		} else if (isSCMViewSeparator(element)) {
-			return element.label;
 		} else {
 			if (this.viewMode() === ViewMode.List) {
 				// In List mode match using the file name and the path.
 				// Since we want to match both on the file name and the
 				// full path we return an array of labels. A match in the
 				// file name takes precedence over a match in the path.
-				const uri = isSCMResource(element) ? element.sourceUri : element.uri;
-				return [basename(uri), this.labelService.getUriLabel(uri, { relative: true })];
+				const fileName = basename(element.sourceUri);
+				const filePath = this.labelService.getUriLabel(element.sourceUri, { relative: true });
+
+				return [fileName, filePath];
 			} else {
 				// In Tree mode only match using the file name
-				return basename(isSCMResource(element) ? element.sourceUri : element.uri);
+				return basename(element.sourceUri);
 			}
 		}
 	}
@@ -1357,26 +871,6 @@ function getSCMResourceId(element: TreeElement): string {
 	} else if (isSCMResourceNode(element)) {
 		const group = element.context;
 		return `folder:${group.provider.id}/${group.id}/$FOLDER/${element.uri.toString()}`;
-	} else if (isSCMHistoryItemGroupTreeElement(element)) {
-		const provider = element.repository.provider;
-		return `historyItemGroup:${provider.id}/${element.id}`;
-	} else if (isSCMHistoryItemTreeElement(element)) {
-		const historyItemGroup = element.historyItemGroup;
-		const provider = historyItemGroup.repository.provider;
-		return `historyItem:${provider.id}/${historyItemGroup.id}/${element.id}/${element.parentIds.join(',')}`;
-	} else if (isSCMHistoryItemChangeTreeElement(element)) {
-		const historyItem = element.historyItem;
-		const historyItemGroup = historyItem.historyItemGroup;
-		const provider = historyItemGroup.repository.provider;
-		return `historyItemChange:${provider.id}/${historyItemGroup.id}/${historyItem.id}/${element.uri.toString()}`;
-	} else if (isSCMHistoryItemChangeNode(element)) {
-		const historyItem = element.context;
-		const historyItemGroup = historyItem.historyItemGroup;
-		const provider = historyItemGroup.repository.provider;
-		return `folder:${provider.id}/${historyItemGroup.id}/${historyItem.id}/$FOLDER/${element.uri.toString()}`;
-	} else if (isSCMViewSeparator(element)) {
-		const provider = element.repository.provider;
-		return `separator:${provider.id}`;
 	} else {
 		throw new Error('Invalid tree element');
 	}
@@ -1410,21 +904,6 @@ export class SCMAccessibilityProvider implements IListAccessibilityProvider<Tree
 			return element.button?.command.title ?? '';
 		} else if (isSCMResourceGroup(element)) {
 			return element.label;
-		} else if (isSCMHistoryItemGroupTreeElement(element)) {
-			return element.ariaLabel ?? `${element.label.trim()}${element.description ? `, ${element.description}` : ''}`;
-		} else if (isSCMHistoryItemTreeElement(element)) {
-			return `${stripIcons(element.message).trim()}${element.author ? `, ${element.author}` : ''}`;
-		} else if (isSCMHistoryItemChangeTreeElement(element)) {
-			const result = [basename(element.uri)];
-			const path = this.labelService.getUriLabel(dirname(element.uri), { relative: true, noPrefix: true });
-
-			if (path) {
-				result.push(path);
-			}
-
-			return result.join(', ');
-		} else if (isSCMViewSeparator(element)) {
-			return element.ariaLabel ?? element.label;
 		} else {
 			const result: string[] = [];
 
@@ -1470,6 +949,7 @@ export const ContextKeys = {
 	SCMProvider: new RawContextKey<string | undefined>('scmProvider', undefined),
 	SCMProviderRootUri: new RawContextKey<string | undefined>('scmProviderRootUri', undefined),
 	SCMProviderHasRootUri: new RawContextKey<boolean>('scmProviderHasRootUri', undefined),
+	SCMHistoryItemCount: new RawContextKey<number>('scmHistoryItemCount', 0),
 	RepositoryCount: new RawContextKey<number>('scmRepositoryCount', 0),
 	RepositoryVisibilityCount: new RawContextKey<number>('scmRepositoryVisibleCount', 0),
 	RepositoryVisibility(repository: ISCMRepository) {
@@ -1485,14 +965,6 @@ MenuRegistry.appendMenuItem(MenuId.SCMTitle, {
 	order: 1
 });
 
-MenuRegistry.appendMenuItem(MenuId.SCMTitle, {
-	title: localize('scmChanges', "Incoming & Outgoing"),
-	submenu: Menus.ChangesSettings,
-	when: ContextKeyExpr.and(ContextKeyExpr.equals('view', VIEW_PANE_ID), ContextKeys.RepositoryCount.notEqualsTo(0)),
-	group: '0_view&sort',
-	order: 2
-});
-
 MenuRegistry.appendMenuItem(Menus.ViewSort, {
 	title: localize('repositories', "Repositories"),
 	submenu: Menus.Repositories,
@@ -1500,150 +972,6 @@ MenuRegistry.appendMenuItem(Menus.ViewSort, {
 	group: '0_repositories'
 });
 
-abstract class SCMChangesSettingAction extends Action2 {
-	constructor(
-		private readonly settingKey: string,
-		private readonly settingValue: 'always' | 'auto' | 'never',
-		desc: Readonly<IAction2Options>) {
-		super({
-			...desc,
-			f1: false,
-			toggled: ContextKeyExpr.equals(`config.${settingKey}`, settingValue),
-		});
-	}
-
-	override run(accessor: ServicesAccessor): void {
-		const configurationService = accessor.get(IConfigurationService);
-		configurationService.updateValue(this.settingKey, this.settingValue);
-	}
-}
-
-MenuRegistry.appendMenuItem(MenuId.SCMChangesSeparator, {
-	title: localize('incomingChanges', "Show Incoming Changes"),
-	submenu: MenuId.SCMIncomingChangesSetting,
-	group: '1_incoming&outgoing',
-	order: 1
-});
-
-MenuRegistry.appendMenuItem(Menus.ChangesSettings, {
-	title: localize('incomingChanges', "Show Incoming Changes"),
-	submenu: MenuId.SCMIncomingChangesSetting,
-	group: '1_incoming&outgoing',
-	order: 1
-});
-
-registerAction2(class extends SCMChangesSettingAction {
-	constructor() {
-		super('scm.showIncomingChanges', 'always',
-			{
-				id: 'workbench.scm.action.showIncomingChanges.always',
-				title: localize('always', "Always"),
-				menu: { id: MenuId.SCMIncomingChangesSetting },
-			});
-	}
-});
-
-registerAction2(class extends SCMChangesSettingAction {
-	constructor() {
-		super('scm.showIncomingChanges', 'auto',
-			{
-				id: 'workbench.scm.action.showIncomingChanges.auto',
-				title: localize('auto', "Auto"),
-				menu: {
-					id: MenuId.SCMIncomingChangesSetting,
-				}
-			});
-	}
-});
-
-registerAction2(class extends SCMChangesSettingAction {
-	constructor() {
-		super('scm.showIncomingChanges', 'never',
-			{
-				id: 'workbench.scm.action.showIncomingChanges.never',
-				title: localize('never', "Never"),
-				menu: {
-					id: MenuId.SCMIncomingChangesSetting,
-				}
-			});
-	}
-});
-
-MenuRegistry.appendMenuItem(MenuId.SCMChangesSeparator, {
-	title: localize('outgoingChanges', "Show Outgoing Changes"),
-	submenu: MenuId.SCMOutgoingChangesSetting,
-	group: '1_incoming&outgoing',
-	order: 2
-});
-
-MenuRegistry.appendMenuItem(Menus.ChangesSettings, {
-	title: localize('outgoingChanges', "Show Outgoing Changes"),
-	submenu: MenuId.SCMOutgoingChangesSetting,
-	group: '1_incoming&outgoing',
-	order: 2
-});
-
-registerAction2(class extends SCMChangesSettingAction {
-	constructor() {
-		super('scm.showOutgoingChanges', 'always',
-			{
-				id: 'workbench.scm.action.showOutgoingChanges.always',
-				title: localize('always', "Always"),
-				menu: {
-					id: MenuId.SCMOutgoingChangesSetting,
-
-				}
-			});
-	}
-});
-
-registerAction2(class extends SCMChangesSettingAction {
-	constructor() {
-		super('scm.showOutgoingChanges', 'auto',
-			{
-				id: 'workbench.scm.action.showOutgoingChanges.auto',
-				title: localize('auto', "Auto"),
-				menu: {
-					id: MenuId.SCMOutgoingChangesSetting,
-				}
-			});
-	}
-});
-
-registerAction2(class extends SCMChangesSettingAction {
-	constructor() {
-		super('scm.showOutgoingChanges', 'never',
-			{
-				id: 'workbench.scm.action.showOutgoingChanges.never',
-				title: localize('never', "Never"),
-				menu: {
-					id: MenuId.SCMOutgoingChangesSetting,
-				}
-			});
-	}
-});
-
-registerAction2(class extends Action2 {
-	constructor() {
-		super({
-			id: 'workbench.scm.action.scm.showChangesSummary',
-			title: localize('showChangesSummary', "Show Changes Summary"),
-			f1: false,
-			toggled: ContextKeyExpr.equals('config.scm.showChangesSummary', true),
-			menu: [
-				{ id: MenuId.SCMChangesSeparator, order: 3 },
-				{ id: Menus.ChangesSettings, order: 3 },
-			]
-		});
-	}
-
-	override run(accessor: ServicesAccessor) {
-		const configurationService = accessor.get(IConfigurationService);
-		const configValue = configurationService.getValue('scm.showChangesSummary') === true;
-		configurationService.updateValue('scm.showChangesSummary', !configValue);
-	}
-});
-
 class RepositoryVisibilityAction extends Action2 {
 
 	private repository: ISCMRepository;
@@ -2029,7 +1357,7 @@ class SCMInputWidgetToolbar extends WorkbenchToolBar {
 	private _onDidChange = new Emitter<void>();
 	readonly onDidChange: Event<void> = this._onDidChange.event;
 
-	private readonly repositoryDisposables = new DisposableStore();
+	private readonly _disposables = this._register(new MutableDisposable<DisposableStore>());
 
 	constructor(
 		container: HTMLElement,
@@ -2057,7 +1385,7 @@ class SCMInputWidgetToolbar extends WorkbenchToolBar {
 	}
 
 	public setInput(input: ISCMInput): void {
-		this.repositoryDisposables.clear();
+		this._disposables.value = new DisposableStore();
 
 		const contextKeyService = this.contextKeyService.createOverlay([
 			['scmProvider', input.repository.provider.contextValue],
@@ -2065,7 +1393,7 @@ class SCMInputWidgetToolbar extends WorkbenchToolBar {
 			['scmProviderHasRootUri', !!input.repository.provider.rootUri]
 		]);
 
-		const menu = this.repositoryDisposables.add(this.menuService.createMenu(MenuId.SCMInputBox, contextKeyService, { emitEventsForSubmenuChanges: true }));
+		const menu = this._disposables.value.add(this.menuService.createMenu(MenuId.SCMInputBox, contextKeyService, { emitEventsForSubmenuChanges: true }));
 
 		const isEnabled = (): boolean => {
 			return input.repository.provider.groups.some(g => g.resources.length > 0);
@@ -2095,18 +1423,18 @@ class SCMInputWidgetToolbar extends WorkbenchToolBar {
 			this._onDidChange.fire();
 		};
 
-		this.repositoryDisposables.add(menu.onDidChange(() => updateToolbar()));
-		this.repositoryDisposables.add(input.repository.provider.onDidChangeResources(() => updateToolbar()));
-		this.repositoryDisposables.add(this.storageService.onDidChangeValue(StorageScope.PROFILE, SCMInputWidgetStorageKey.LastActionId, this.repositoryDisposables)(() => updateToolbar()));
+		this._disposables.value.add(menu.onDidChange(() => updateToolbar()));
+		this._disposables.value.add(input.repository.provider.onDidChangeResources(() => updateToolbar()));
+		this._disposables.value.add(this.storageService.onDidChangeValue(StorageScope.PROFILE, SCMInputWidgetStorageKey.LastActionId, this._disposables.value)(() => updateToolbar()));
 
 		this.actionRunner = new SCMInputWidgetActionRunner(input, this.storageService);
-		this.repositoryDisposables.add(this.actionRunner.onWillRun(e => {
+		this._disposables.value.add(this.actionRunner.onWillRun(e => {
 			if ((this.actionRunner as SCMInputWidgetActionRunner).runningActions.size === 0) {
 				super.setActions([this._cancelAction], []);
 				this._onDidChange.fire();
 			}
 		}));
-		this.repositoryDisposables.add(this.actionRunner.onDidRun(e => {
+		this._disposables.value.add(this.actionRunner.onDidRun(e => {
 			if ((this.actionRunner as SCMInputWidgetActionRunner).runningActions.size === 0) {
 				updateToolbar();
 			}
@@ -2114,7 +1442,6 @@ class SCMInputWidgetToolbar extends WorkbenchToolBar {
 
 		updateToolbar();
 	}
-
 }
 
 class SCMInputWidgetEditorOptions {
@@ -2238,7 +1565,6 @@ class SCMInputWidget {
 
 	private element: HTMLElement;
 	private editorContainer: HTMLElement;
-	private placeholderTextContainer: HTMLElement;
 	private readonly inputEditor: CodeEditorWidget;
 	private readonly inputEditorOptions: SCMInputWidgetEditorOptions;
 	private toolbarContainer: HTMLElement;
@@ -2329,14 +1655,11 @@ class SCMInputWidget {
 		this.repositoryDisposables.add(input.onDidChangeValidationMessage((e) => this.setValidation(e, { focus: true, timeout: true })));
 		this.repositoryDisposables.add(input.onDidChangeValidateInput((e) => triggerValidation()));
 
-		// Keep API in sync with model, update placeholder visibility and validate
-		const updatePlaceholderVisibility = () => this.placeholderTextContainer.classList.toggle('hidden', textModel.getValueLength() > 0);
+		// Keep API in sync with model and validate
 		this.repositoryDisposables.add(textModel.onDidChangeContent(() => {
 			input.setValue(textModel.getValue(), true);
-			updatePlaceholderVisibility();
 			triggerValidation();
 		}));
-		updatePlaceholderVisibility();
 
 		// Update placeholder text
 		const updatePlaceholderText = () => {
@@ -2344,8 +1667,7 @@ class SCMInputWidget {
 			const label = binding ? binding.getLabel() : (platform.isMacintosh ? 'Cmd+Enter' : 'Ctrl+Enter');
 			const placeholderText = format(input.placeholder, label);
 
-			this.inputEditor.updateOptions({ ariaLabel: placeholderText });
-			this.placeholderTextContainer.textContent = placeholderText;
+			this.inputEditor.updateOptions({ placeholder: placeholderText });
 		};
 		this.repositoryDisposables.add(input.onDidChangePlaceholder(updatePlaceholderText));
 		this.repositoryDisposables.add(this.keybindingService.onDidUpdateKeybindings(updatePlaceholderText));
@@ -2422,11 +1744,9 @@ class SCMInputWidget {
 		@ISCMViewService private readonly scmViewService: ISCMViewService,
 		@IContextViewService private readonly contextViewService: IContextViewService,
 		@IOpenerService private readonly openerService: IOpenerService,
-		@IContextMenuService private readonly contextMenuService: IContextMenuService
 	) {
 		this.element = append(container, $('.scm-editor'));
 		this.editorContainer = append(this.element, $('.scm-editor-container'));
-		this.placeholderTextContainer = append(this.editorContainer, $('.scm-editor-placeholder'));
 		this.toolbarContainer = append(this.element, $('.scm-editor-toolbar'));
 
 		this.contextKeyService = contextKeyService.createScoped(this.element);
@@ -2436,33 +1756,33 @@ class SCMInputWidget {
 		this.disposables.add(this.inputEditorOptions.onDidChange(this.onDidChangeEditorOptions, this));
 		this.disposables.add(this.inputEditorOptions);
 
-		const editorConstructionOptions = this.inputEditorOptions.getEditorConstructionOptions();
-		this.setPlaceholderFontStyles(editorConstructionOptions.fontFamily!, editorConstructionOptions.fontSize!, editorConstructionOptions.lineHeight!);
-
 		const codeEditorWidgetOptions: ICodeEditorWidgetOptions = {
-			isSimpleWidget: true,
 			contributions: EditorExtensionsRegistry.getSomeEditorContributions([
+				CodeActionController.ID,
 				ColorDetector.ID,
 				ContextMenuController.ID,
-				DragAndDropController.ID,
 				CopyPasteController.ID,
+				DragAndDropController.ID,
 				DropIntoEditorController.ID,
+				EditorDictation.ID,
+				FormatOnType.ID,
+				ContentHoverController.ID,
+				GlyphHoverController.ID,
+				InlineCompletionsController.ID,
 				LinkDetector.ID,
 				MenuPreventer.ID,
 				MessageController.ID,
-				HoverController.ID,
+				PlaceholderTextContribution.ID,
 				SelectionClipboardContributionID,
 				SnippetController2.ID,
-				SuggestController.ID,
-				InlineCompletionsController.ID,
-				CodeActionController.ID,
-				FormatOnType.ID,
-				EditorDictation.ID,
-			])
+				SuggestController.ID
+			]),
+			isSimpleWidget: true
 		};
 
 		const services = new ServiceCollection([IContextKeyService, this.contextKeyService]);
 		const instantiationService2 = instantiationService.createChild(services, this.disposables);
+		const editorConstructionOptions = this.inputEditorOptions.getEditorConstructionOptions();
 		this.inputEditor = instantiationService2.createInstance(CodeEditorWidget, this.editorContainer, editorConstructionOptions, codeEditorWidgetOptions);
 		this.disposables.add(this.inputEditor);
 
@@ -2512,7 +1832,7 @@ class SCMInputWidget {
 		this.toolbar = instantiationService2.createInstance(SCMInputWidgetToolbar, this.toolbarContainer, {
 			actionViewItemProvider: (action, options) => {
 				if (action instanceof MenuItemAction && this.toolbar.dropdownActions.length > 1) {
-					return instantiationService.createInstance(DropdownWithPrimaryActionViewItem, action, this.toolbar.dropdownAction, this.toolbar.dropdownActions, '', this.contextMenuService, { actionRunner: this.toolbar.actionRunner, hoverDelegate: options.hoverDelegate });
+					return instantiationService.createInstance(DropdownWithPrimaryActionViewItem, action, this.toolbar.dropdownAction, this.toolbar.dropdownActions, '', { actionRunner: this.toolbar.actionRunner, hoverDelegate: options.hoverDelegate });
 				}
 
 				return createActionViewItem(instantiationService, action, options);
@@ -2552,7 +1872,6 @@ class SCMInputWidget {
 
 		this.lastLayoutWasTrash = false;
 		this.inputEditor.layout(dimension);
-		this.placeholderTextContainer.style.width = `${dimension.width}px`;
 		this.renderValidation();
 
 		const showInputActionButton = this.configurationService.getValue<boolean>('scm.showInputActionButton') === true;
@@ -2580,10 +1899,7 @@ class SCMInputWidget {
 	}
 
 	private onDidChangeEditorOptions(): void {
-		const editorOptions = this.inputEditorOptions.getEditorOptions();
-
-		this.inputEditor.updateOptions(editorOptions);
-		this.setPlaceholderFontStyles(editorOptions.fontFamily!, editorOptions.fontSize!, editorOptions.lineHeight!);
+		this.inputEditor.updateOptions(this.inputEditorOptions.getEditorOptions());
 	}
 
 	private renderValidation(): void {
@@ -2673,11 +1989,6 @@ class SCMInputWidget {
 			26 /* 22px action + 4px margin */ :
 			39 /* 35px action + 4px margin */;
 	}
-	private setPlaceholderFontStyles(fontFamily: string, fontSize: number, lineHeight: number): void {
-		this.placeholderTextContainer.style.fontFamily = fontFamily;
-		this.placeholderTextContainer.style.fontSize = `${fontSize}px`;
-		this.placeholderTextContainer.style.lineHeight = `${lineHeight}px`;
-	}
 
 	clearValidation(): void {
 		this.validationContextView?.close();
@@ -2773,7 +2084,6 @@ export class SCMViewPane extends ViewPane {
 		options: IViewPaneOptions,
 		@ICommandService private readonly commandService: ICommandService,
 		@IEditorService private readonly editorService: IEditorService,
-		@ILogService private readonly logService: ILogService,
 		@IMenuService private readonly menuService: IMenuService,
 		@ISCMService private readonly scmService: ISCMService,
 		@ISCMViewService private readonly scmViewService: ISCMViewService,
@@ -2892,10 +2202,7 @@ export class SCMViewPane extends ViewPane {
 						e =>
 							e.affectsConfiguration('scm.inputMinLineCount') ||
 							e.affectsConfiguration('scm.inputMaxLineCount') ||
-							e.affectsConfiguration('scm.showActionButton') ||
-							e.affectsConfiguration('scm.showChangesSummary') ||
-							e.affectsConfiguration('scm.showIncomingChanges') ||
-							e.affectsConfiguration('scm.showOutgoingChanges'),
+							e.affectsConfiguration('scm.showActionButton'),
 						this.visibilityDisposables)
 						(() => this.updateChildren(), this, this.visibilityDisposables);
 
@@ -2948,17 +2255,11 @@ export class SCMViewPane extends ViewPane {
 		resourceActionRunner.onWillRun(() => this.tree.domFocus(), this, this.disposables);
 		this.disposables.add(resourceActionRunner);
 
-		const historyItemGroupActionRunner = new HistoryItemGroupActionRunner();
-		historyItemGroupActionRunner.onWillRun(() => this.tree.domFocus(), this, this.disposables);
-		this.disposables.add(historyItemGroupActionRunner);
-
-		const historyItemActionRunner = new HistoryItemActionRunner();
-		historyItemActionRunner.onWillRun(() => this.tree.domFocus(), this, this.disposables);
-		this.disposables.add(historyItemActionRunner);
-
 		const treeDataSource = this.instantiationService.createInstance(SCMTreeDataSource, () => this.viewMode);
 		this.disposables.add(treeDataSource);
 
+		const compressionEnabled = observableConfigValue('scm.compactFolders', true, this.configurationService);
+
 		this.tree = this.instantiationService.createInstance(
 			WorkbenchCompressibleAsyncDataTree,
 			'SCM Tree Repo',
@@ -2970,11 +2271,7 @@ export class SCMViewPane extends ViewPane {
 				this.actionButtonRenderer,
 				this.instantiationService.createInstance(RepositoryRenderer, MenuId.SCMTitle, getActionViewItemProvider(this.instantiationService)),
 				this.instantiationService.createInstance(ResourceGroupRenderer, getActionViewItemProvider(this.instantiationService)),
-				this.instantiationService.createInstance(ResourceRenderer, () => this.viewMode, this.listLabels, getActionViewItemProvider(this.instantiationService), resourceActionRunner),
-				this.instantiationService.createInstance(HistoryItemGroupRenderer, historyItemGroupActionRunner),
-				this.instantiationService.createInstance(HistoryItemRenderer, historyItemActionRunner, getActionViewItemProvider(this.instantiationService)),
-				this.instantiationService.createInstance(HistoryItemChangeRenderer, () => this.viewMode, this.listLabels),
-				this.instantiationService.createInstance(SeparatorRenderer)
+				this.instantiationService.createInstance(ResourceRenderer, () => this.viewMode, this.listLabels, getActionViewItemProvider(this.instantiationService), resourceActionRunner)
 			],
 			treeDataSource,
 			{
@@ -2986,12 +2283,11 @@ export class SCMViewPane extends ViewPane {
 				identityProvider: new SCMResourceIdentityProvider(),
 				sorter: new SCMTreeSorter(() => this.viewMode, () => this.viewSortKey),
 				keyboardNavigationLabelProvider: this.instantiationService.createInstance(SCMTreeKeyboardNavigationLabelProvider, () => this.viewMode),
-				overrideStyles: {
-					listBackground: this.viewDescriptorService.getViewLocationById(this.id) === ViewContainerLocation.Panel ? PANEL_BACKGROUND : SIDE_BAR_BACKGROUND
-				},
+				overrideStyles: this.getLocationBasedColors().listOverrideStyles,
+				compressionEnabled: compressionEnabled.get(),
 				collapseByDefault: (e: unknown) => {
-					// Repository, Resource Group, Resource Folder (Tree), History Item Change Folder (Tree)
-					if (isSCMRepository(e) || isSCMResourceGroup(e) || isSCMResourceNode(e) || isSCMHistoryItemChangeNode(e)) {
+					// Repository, Resource Group, Resource Folder (Tree)
+					if (isSCMRepository(e) || isSCMResourceGroup(e) || isSCMResourceNode(e)) {
 						return false;
 					}
 
@@ -3008,6 +2304,12 @@ export class SCMViewPane extends ViewPane {
 		this.tree.onDidScroll(this.inputRenderer.clearValidation, this.inputRenderer, this.disposables);
 		Event.filter(this.tree.onDidChangeCollapseState, e => isSCMRepository(e.node.element?.element), this.disposables)(this.updateRepositoryCollapseAllContextKeys, this, this.disposables);
 
+		this.disposables.add(autorun(reader => {
+			this.tree.updateOptions({
+				compressionEnabled: compressionEnabled.read(reader)
+			});
+		}));
+
 		append(container, overflowWidgetsDomNode);
 	}
 
@@ -3092,22 +2394,6 @@ export class SCMViewPane extends ViewPane {
 				this.scmViewService.focus(repository);
 			}
 			return;
-		} else if (isSCMHistoryItemGroupTreeElement(e.element)) {
-			this.scmViewService.focus(e.element.repository);
-			return;
-		} else if (isSCMHistoryItemTreeElement(e.element)) {
-			this.scmViewService.focus(e.element.historyItemGroup.repository);
-			return;
-		} else if (isSCMHistoryItemChangeTreeElement(e.element)) {
-			if (e.element.originalUri && e.element.modifiedUri) {
-				await this.commandService.executeCommand(API_OPEN_DIFF_EDITOR_COMMAND_ID, ...toDiffEditorArguments(e.element.uri, e.element.originalUri, e.element.modifiedUri), e);
-			}
-
-			this.scmViewService.focus(e.element.historyItem.historyItemGroup.repository);
-			return;
-		} else if (isSCMHistoryItemChangeNode(e.element)) {
-			this.scmViewService.focus(e.element.context.historyItemGroup.repository);
-			return;
 		}
 	}
 
@@ -3163,24 +2449,15 @@ export class SCMViewPane extends ViewPane {
 		for (const repository of added) {
 			const repositoryDisposables = new DisposableStore();
 
-			repositoryDisposables.add(repository.provider.onDidChange(() => this.updateChildren(repository)));
+			repositoryDisposables.add(autorun(reader => {
+				/** @description action button */
+				repository.provider.actionButton.read(reader);
+				this.updateChildren(repository);
+			}));
+
 			repositoryDisposables.add(repository.input.onDidChangeVisibility(() => this.updateChildren(repository)));
 			repositoryDisposables.add(repository.provider.onDidChangeResourceGroups(() => this.updateChildren(repository)));
 
-			repositoryDisposables.add(Event.runAndSubscribe(repository.provider.onDidChangeHistoryProvider, () => {
-				if (!repository.provider.historyProvider) {
-					this.logService.debug('SCMViewPane:onDidChangeVisibleRepositories - no history provider present');
-					return;
-				}
-
-				repositoryDisposables.add(repository.provider.historyProvider.onDidChangeCurrentHistoryItemGroup(() => {
-					this.updateChildren(repository);
-					this.logService.debug('SCMViewPane:onDidChangeCurrentHistoryItemGroup - update children');
-				}));
-
-				this.logService.debug('SCMViewPane:onDidChangeVisibleRepositories - onDidChangeCurrentHistoryItemGroup listener added');
-			}));
-
 			const resourceGroupDisposables = repositoryDisposables.add(new DisposableMap<ISCMResourceGroup, IDisposable>());
 
 			const onDidChangeResourceGroups = () => {
@@ -3218,16 +2495,14 @@ export class SCMViewPane extends ViewPane {
 
 	private onListContextMenu(e: ITreeContextMenuEvent<TreeElement | null>): void {
 		if (!e.element) {
-			const menu = this.menuService.createMenu(Menus.ViewSort, this.contextKeyService);
+			const menu = this.menuService.getMenuActions(Menus.ViewSort, this.contextKeyService);
 			const actions: IAction[] = [];
-			createAndFillInContextMenuActions(menu, undefined, actions);
+			createAndFillInContextMenuActions(menu, actions);
 
 			return this.contextMenuService.showContextMenu({
 				getAnchor: () => e.anchor,
 				getActions: () => actions,
-				onHide: () => {
-					menu.dispose();
-				}
+				onHide: () => { }
 			});
 		}
 
@@ -3262,21 +2537,6 @@ export class SCMViewPane extends ViewPane {
 				const menu = menus.getResourceFolderMenu(element.context);
 				actions = collectContextMenuActions(menu);
 			}
-		} else if (isSCMHistoryItemGroupTreeElement(element)) {
-			const menus = this.scmViewService.menus.getRepositoryMenus(element.repository.provider);
-			const menu = menus.historyProviderMenu?.getHistoryItemGroupContextMenu(element);
-
-			if (menu) {
-				actionRunner = new HistoryItemGroupActionRunner();
-				createAndFillInContextMenuActions(menu, { shouldForwardArgs: true }, actions);
-			}
-		} else if (isSCMHistoryItemTreeElement(element)) {
-			const menus = this.scmViewService.menus.getRepositoryMenus(element.historyItemGroup.repository.provider);
-			const menu = menus.historyProviderMenu?.getHistoryItemMenu(element);
-			if (menu) {
-				actionRunner = new HistoryItemActionRunner();
-				actions = collectContextMenuActions(menu);
-			}
 		}
 
 		actionRunner.onWillRun(() => this.tree.domFocus());
@@ -3559,68 +2819,28 @@ export class SCMViewPane extends ViewPane {
 	}
 }
 
-class SCMTreeDataSource implements IAsyncDataSource<ISCMViewService, TreeElement> {
-
-	private readonly historyProviderCache = new Map<ISCMRepository, ISCMHistoryProviderCacheEntry>();
-	private readonly repositoryDisposables = new DisposableMap<ISCMRepository, IDisposable>();
-	private readonly disposables = new DisposableStore();
-
+class SCMTreeDataSource extends Disposable implements IAsyncDataSource<ISCMViewService, TreeElement> {
 	constructor(
 		private readonly viewMode: () => ViewMode,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@ILogService private readonly logService: ILogService,
-		@ISCMViewService private readonly scmViewService: ISCMViewService,
-		@IUriIdentityService private uriIdentityService: IUriIdentityService,
+		@ISCMViewService private readonly scmViewService: ISCMViewService
 	) {
-		const onDidChangeConfiguration = Event.filter(
-			this.configurationService.onDidChangeConfiguration,
-			e => e.affectsConfiguration('scm.showChangesSummary'),
-			this.disposables);
-		this.disposables.add(onDidChangeConfiguration(() => this.historyProviderCache.clear()));
-
-		this.scmViewService.onDidChangeVisibleRepositories(this.onDidChangeVisibleRepositories, this, this.disposables);
-		this.onDidChangeVisibleRepositories({ added: this.scmViewService.visibleRepositories, removed: Iterable.empty() });
-	}
-
-	hasChildren(inputOrElement: ISCMViewService | TreeElement): boolean {
-		if (isSCMViewService(inputOrElement)) {
-			return this.scmViewService.visibleRepositories.length !== 0;
-		} else if (isSCMRepository(inputOrElement)) {
-			return true;
-		} else if (isSCMInput(inputOrElement)) {
-			return false;
-		} else if (isSCMActionButton(inputOrElement)) {
-			return false;
-		} else if (isSCMResourceGroup(inputOrElement)) {
-			return true;
-		} else if (isSCMResource(inputOrElement)) {
-			return false;
-		} else if (ResourceTree.isResourceNode(inputOrElement)) {
-			return inputOrElement.childrenCount > 0;
-		} else if (isSCMHistoryItemGroupTreeElement(inputOrElement)) {
-			return true;
-		} else if (isSCMHistoryItemTreeElement(inputOrElement)) {
-			return true;
-		} else if (isSCMHistoryItemChangeTreeElement(inputOrElement)) {
-			return false;
-		} else if (isSCMViewSeparator(inputOrElement)) {
-			return false;
-		} else {
-			throw new Error('hasChildren not implemented.');
-		}
+		super();
 	}
 
 	async getChildren(inputOrElement: ISCMViewService | TreeElement): Promise<Iterable<TreeElement>> {
-		const { alwaysShowRepositories, showActionButton } = this.getConfiguration();
 		const repositoryCount = this.scmViewService.visibleRepositories.length;
 
+		const showActionButton = this.configurationService.getValue<boolean>('scm.showActionButton') === true;
+		const alwaysShowRepositories = this.configurationService.getValue<boolean>('scm.alwaysShowRepositories') === true;
+
 		if (isSCMViewService(inputOrElement) && (repositoryCount > 1 || alwaysShowRepositories)) {
 			return this.scmViewService.visibleRepositories;
 		} else if ((isSCMViewService(inputOrElement) && repositoryCount === 1 && !alwaysShowRepositories) || isSCMRepository(inputOrElement)) {
 			const children: TreeElement[] = [];
 
 			inputOrElement = isSCMRepository(inputOrElement) ? inputOrElement : this.scmViewService.visibleRepositories[0];
-			const actionButton = inputOrElement.provider.actionButton;
+			const actionButton = inputOrElement.provider.actionButton.get();
 			const resourceGroups = inputOrElement.provider.groups;
 
 			// SCM Input
@@ -3643,30 +2863,6 @@ class SCMTreeDataSource implements IAsyncDataSource<ISCMViewService, TreeElement
 				children.push(...resourceGroups);
 			}
 
-			// History item groups
-			const historyItemGroups = await this.getHistoryItemGroups(inputOrElement);
-
-			// Incoming/Outgoing Separator
-			if (historyItemGroups.length > 0) {
-				let label = localize('syncSeparatorHeader', "Incoming/Outgoing");
-				let ariaLabel = localize('syncSeparatorHeaderAriaLabel', "Incoming and outgoing changes");
-
-				const incomingHistoryItems = historyItemGroups.find(g => g.direction === 'incoming');
-				const outgoingHistoryItems = historyItemGroups.find(g => g.direction === 'outgoing');
-
-				if (incomingHistoryItems && !outgoingHistoryItems) {
-					label = localize('syncIncomingSeparatorHeader', "Incoming");
-					ariaLabel = localize('syncIncomingSeparatorHeaderAriaLabel', "Incoming changes");
-				} else if (!incomingHistoryItems && outgoingHistoryItems) {
-					label = localize('syncOutgoingSeparatorHeader', "Outgoing");
-					ariaLabel = localize('syncOutgoingSeparatorHeaderAriaLabel', "Outgoing changes");
-				}
-
-				children.push({ label, ariaLabel, repository: inputOrElement, type: 'separator' } satisfies SCMViewSeparatorElement);
-			}
-
-			children.push(...historyItemGroups);
-
 			return children;
 		} else if (isSCMResourceGroup(inputOrElement)) {
 			if (this.viewMode() === ViewMode.List) {
@@ -3681,7 +2877,7 @@ class SCMTreeDataSource implements IAsyncDataSource<ISCMViewService, TreeElement
 
 				return children;
 			}
-		} else if (isSCMResourceNode(inputOrElement) || isSCMHistoryItemChangeNode(inputOrElement)) {
+		} else if (isSCMResourceNode(inputOrElement)) {
 			// Resources (Tree), History item changes (Tree)
 			const children: TreeElement[] = [];
 			for (const node of inputOrElement.children) {
@@ -3689,190 +2885,11 @@ class SCMTreeDataSource implements IAsyncDataSource<ISCMViewService, TreeElement
 			}
 
 			return children;
-		} else if (isSCMHistoryItemGroupTreeElement(inputOrElement)) {
-			// History item group
-			return this.getHistoryItems(inputOrElement);
-		} else if (isSCMHistoryItemTreeElement(inputOrElement)) {
-			// History item changes (List/Tree)
-			return this.getHistoryItemChanges(inputOrElement);
 		}
 
 		return [];
 	}
 
-	private async getHistoryItemGroups(element: ISCMRepository): Promise<SCMHistoryItemGroupTreeElement[]> {
-		const { showIncomingChanges, showOutgoingChanges } = this.getConfiguration();
-
-		const scmProvider = element.provider;
-		const historyProvider = scmProvider.historyProvider;
-		const currentHistoryItemGroup = historyProvider?.currentHistoryItemGroup;
-
-		if (!historyProvider || !currentHistoryItemGroup || (showIncomingChanges === 'never' && showOutgoingChanges === 'never')) {
-			return [];
-		}
-
-		const children: SCMHistoryItemGroupTreeElement[] = [];
-		const historyProviderCacheEntry = this.getHistoryProviderCacheEntry(element);
-
-		let incomingHistoryItemGroup = historyProviderCacheEntry?.incomingHistoryItemGroup;
-		let outgoingHistoryItemGroup = historyProviderCacheEntry?.outgoingHistoryItemGroup;
-
-		if (!incomingHistoryItemGroup && !outgoingHistoryItemGroup) {
-			// Common ancestor, ahead, behind
-			const ancestor = await historyProvider.resolveHistoryItemGroupCommonAncestor(currentHistoryItemGroup.id, currentHistoryItemGroup.base?.id);
-			if (!ancestor) {
-				return [];
-			}
-
-			// Only show "Incoming" node if there is a base branch
-			incomingHistoryItemGroup = currentHistoryItemGroup.base ? {
-				id: currentHistoryItemGroup.base.id,
-				label: currentHistoryItemGroup.base.name,
-				ariaLabel: localize('incomingChangesAriaLabel', "Incoming changes from {0}", currentHistoryItemGroup.base.name),
-				icon: Codicon.arrowCircleDown,
-				direction: 'incoming',
-				ancestor: ancestor.id,
-				count: ancestor.behind,
-				repository: element,
-				type: 'historyItemGroup'
-			} : undefined;
-
-			outgoingHistoryItemGroup = {
-				id: currentHistoryItemGroup.id,
-				label: currentHistoryItemGroup.name,
-				ariaLabel: localize('outgoingChangesAriaLabel', "Outgoing changes to {0}", currentHistoryItemGroup.name),
-				icon: Codicon.arrowCircleUp,
-				direction: 'outgoing',
-				ancestor: ancestor.id,
-				count: ancestor.ahead,
-				repository: element,
-				type: 'historyItemGroup'
-			};
-
-			this.historyProviderCache.set(element, {
-				...historyProviderCacheEntry,
-				incomingHistoryItemGroup,
-				outgoingHistoryItemGroup
-			});
-		}
-
-		// Incoming
-		if (incomingHistoryItemGroup &&
-			(showIncomingChanges === 'always' ||
-				(showIncomingChanges === 'auto' && (incomingHistoryItemGroup.count ?? 0) > 0))) {
-			children.push(incomingHistoryItemGroup);
-		}
-
-		// Outgoing
-		if (outgoingHistoryItemGroup &&
-			(showOutgoingChanges === 'always' ||
-				(showOutgoingChanges === 'auto' && (outgoingHistoryItemGroup.count ?? 0) > 0))) {
-			children.push(outgoingHistoryItemGroup);
-		}
-
-		return children;
-	}
-
-	private async getHistoryItems(element: SCMHistoryItemGroupTreeElement): Promise<SCMHistoryItemTreeElement[]> {
-		const repository = element.repository;
-		const historyProvider = repository.provider.historyProvider;
-
-		if (!historyProvider) {
-			return [];
-		}
-
-		const historyProviderCacheEntry = this.getHistoryProviderCacheEntry(repository);
-		const historyItemsMap = historyProviderCacheEntry.historyItems;
-		let historyItemsElement = historyProviderCacheEntry.historyItems.get(element.id);
-
-		if (!historyItemsElement) {
-			const historyItems = await historyProvider.provideHistoryItems(element.id, { limit: { id: element.ancestor } }) ?? [];
-
-			// All Changes
-			const { showChangesSummary } = this.getConfiguration();
-			const allChanges = showChangesSummary && historyItems.length >= 2 ?
-				await historyProvider.provideHistoryItemSummary(historyItems[0].id, element.ancestor) : undefined;
-
-			historyItemsElement = [allChanges, historyItems];
-
-			this.historyProviderCache.set(repository, {
-				...historyProviderCacheEntry,
-				historyItems: historyItemsMap.set(element.id, historyItemsElement)
-			});
-		}
-
-		const children: SCMHistoryItemTreeElement[] = [];
-		if (historyItemsElement[0]) {
-			children.push({
-				...historyItemsElement[0],
-				icon: historyItemsElement[0].icon ?? Codicon.files,
-				message: localize('allChanges', "All Changes"),
-				historyItemGroup: element,
-				type: 'allChanges'
-			} satisfies SCMHistoryItemTreeElement);
-		}
-
-		children.push(...historyItemsElement[1]
-			.map(historyItem => ({
-				...historyItem,
-				historyItemGroup: element,
-				type: 'historyItem'
-			} satisfies SCMHistoryItemTreeElement)));
-
-		return children;
-	}
-
-	private async getHistoryItemChanges(element: SCMHistoryItemTreeElement): Promise<(SCMHistoryItemChangeTreeElement | IResourceNode<SCMHistoryItemChangeTreeElement, SCMHistoryItemTreeElement>)[]> {
-		const repository = element.historyItemGroup.repository;
-		const historyProvider = repository.provider.historyProvider;
-
-		if (!historyProvider) {
-			return [];
-		}
-
-		const historyProviderCacheEntry = this.getHistoryProviderCacheEntry(repository);
-		const historyItemChangesMap = historyProviderCacheEntry.historyItemChanges;
-
-		const historyItemParentId = element.parentIds.length > 0 ? element.parentIds[0] : undefined;
-		let historyItemChanges = historyItemChangesMap.get(`${element.id}/${historyItemParentId}`);
-
-		if (!historyItemChanges) {
-			const historyItemParentId = element.parentIds.length > 0 ? element.parentIds[0] : undefined;
-			historyItemChanges = await historyProvider.provideHistoryItemChanges(element.id, historyItemParentId) ?? [];
-
-			this.historyProviderCache.set(repository, {
-				...historyProviderCacheEntry,
-				historyItemChanges: historyItemChangesMap.set(`${element.id}/${historyItemParentId}`, historyItemChanges)
-			});
-		}
-
-		if (this.viewMode() === ViewMode.List) {
-			// List
-			return historyItemChanges.map(change => ({
-				...change,
-				historyItem: element,
-				type: 'historyItemChange'
-			}));
-		}
-
-		// Tree
-		const tree = new ResourceTree<SCMHistoryItemChangeTreeElement, SCMHistoryItemTreeElement>(element, repository.provider.rootUri ?? URI.file('/'), this.uriIdentityService.extUri);
-		for (const change of historyItemChanges) {
-			tree.add(change.uri, {
-				...change,
-				historyItem: element,
-				type: 'historyItemChange'
-			});
-		}
-
-		const children: (SCMHistoryItemChangeTreeElement | IResourceNode<SCMHistoryItemChangeTreeElement, SCMHistoryItemTreeElement>)[] = [];
-		for (const node of tree.root.children) {
-			children.push(node.element ?? node);
-		}
-
-		return children;
-	}
-
 	getParent(element: TreeElement): ISCMViewService | TreeElement {
 		if (isSCMResourceNode(element)) {
 			if (element.parent === element.context.resourceTree.root) {
@@ -3913,63 +2930,24 @@ class SCMTreeDataSource implements IAsyncDataSource<ISCMViewService, TreeElement
 		}
 	}
 
-	private getConfiguration(): {
-		alwaysShowRepositories: boolean;
-		showActionButton: boolean;
-		showChangesSummary: boolean;
-		showIncomingChanges: ShowChangesSetting;
-		showOutgoingChanges: ShowChangesSetting;
-	} {
-		return {
-			alwaysShowRepositories: this.configurationService.getValue<boolean>('scm.alwaysShowRepositories'),
-			showActionButton: this.configurationService.getValue<boolean>('scm.showActionButton'),
-			showChangesSummary: this.configurationService.getValue<boolean>('scm.showChangesSummary'),
-			showIncomingChanges: this.configurationService.getValue<ShowChangesSetting>('scm.showIncomingChanges'),
-			showOutgoingChanges: this.configurationService.getValue<ShowChangesSetting>('scm.showOutgoingChanges')
-		};
-	}
-
-	private onDidChangeVisibleRepositories({ added, removed }: ISCMViewVisibleRepositoryChangeEvent): void {
-		// Added repositories
-		for (const repository of added) {
-			const repositoryDisposables = new DisposableStore();
-
-			repositoryDisposables.add(Event.runAndSubscribe(repository.provider.onDidChangeHistoryProvider, () => {
-				if (!repository.provider.historyProvider) {
-					this.logService.debug('SCMTreeDataSource:onDidChangeVisibleRepositories - no history provider present');
-					return;
-				}
-
-				repositoryDisposables.add(repository.provider.historyProvider.onDidChangeCurrentHistoryItemGroup(() => {
-					this.historyProviderCache.delete(repository);
-					this.logService.debug('SCMTreeDataSource:onDidChangeCurrentHistoryItemGroup - cache cleared');
-				}));
-
-				this.logService.debug('SCMTreeDataSource:onDidChangeVisibleRepositories - onDidChangeCurrentHistoryItemGroup listener added');
-			}));
-
-			this.repositoryDisposables.set(repository, repositoryDisposables);
+	hasChildren(inputOrElement: ISCMViewService | TreeElement): boolean {
+		if (isSCMViewService(inputOrElement)) {
+			return this.scmViewService.visibleRepositories.length !== 0;
+		} else if (isSCMRepository(inputOrElement)) {
+			return true;
+		} else if (isSCMInput(inputOrElement)) {
+			return false;
+		} else if (isSCMActionButton(inputOrElement)) {
+			return false;
+		} else if (isSCMResourceGroup(inputOrElement)) {
+			return true;
+		} else if (isSCMResource(inputOrElement)) {
+			return false;
+		} else if (ResourceTree.isResourceNode(inputOrElement)) {
+			return inputOrElement.childrenCount > 0;
+		} else {
+			throw new Error('hasChildren not implemented.');
 		}
-
-		// Removed repositories
-		for (const repository of removed) {
-			this.repositoryDisposables.deleteAndDispose(repository);
-			this.historyProviderCache.delete(repository);
-		}
-	}
-
-	private getHistoryProviderCacheEntry(repository: ISCMRepository): ISCMHistoryProviderCacheEntry {
-		return this.historyProviderCache.get(repository) ?? {
-			incomingHistoryItemGroup: undefined,
-			outgoingHistoryItemGroup: undefined,
-			historyItems: new Map<string, [ISCMHistoryItem | undefined, ISCMHistoryItem[]]>(),
-			historyItemChanges: new Map<string, ISCMHistoryItemChange[]>()
-		};
-	}
-
-	dispose(): void {
-		this.repositoryDisposables.dispose();
-		this.disposables.dispose();
 	}
 }
 
@@ -4021,13 +2999,13 @@ export class SCMActionButton implements IDisposable {
 			});
 		} else {
 			// Button
-			this.button = new Button(this.container, { supportIcons: true, supportShortLabel: !!button.description, title: button.command.tooltip, ...defaultButtonStyles });
+			this.button = new Button(this.container, { supportIcons: true, supportShortLabel: !!button.command.shortTitle, title: button.command.tooltip, ...defaultButtonStyles });
 		}
 
 		this.button.enabled = button.enabled;
 		this.button.label = button.command.title;
-		if (this.button instanceof Button && button.description) {
-			this.button.labelShort = button.description;
+		if (this.button instanceof Button && button.command.shortTitle) {
+			this.button.labelShort = button.command.shortTitle;
 		}
 		this.button.onDidClick(async () => await this.executeCommand(button.command.id, ...(button.command.arguments || [])), null, this.disposables.value);
 
@@ -4052,3 +3030,5 @@ export class SCMActionButton implements IDisposable {
 		}
 	}
 }
+
+setupSimpleEditorSelectionStyling('.scm-view .scm-editor-container');
diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPaneContainer.ts b/src/vs/workbench/contrib/scm/browser/scmViewPaneContainer.ts
index c603d810d2b..6f6fccf828b 100644
--- a/src/vs/workbench/contrib/scm/browser/scmViewPaneContainer.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmViewPaneContainer.ts
@@ -3,25 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/scm';
-import { localize } from 'vs/nls';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { ISCMViewService, VIEWLET_ID } from 'vs/workbench/contrib/scm/common/scm';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IViewDescriptorService } from 'vs/workbench/common/views';
-import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import './media/scm.css';
+import { localize } from '../../../../nls.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { HISTORY_VIEW_PANE_ID, REPOSITORIES_VIEW_PANE_ID, VIEW_PANE_ID, VIEWLET_ID } from '../common/scm.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { IViewDescriptorService } from '../../../common/views.js';
+import { ViewPaneContainer } from '../../../browser/parts/views/viewPaneContainer.js';
 
 export class SCMViewPaneContainer extends ViewPaneContainer {
 
 	constructor(
-		@ISCMViewService private readonly scmViewService: ISCMViewService,
 		@IWorkbenchLayoutService layoutService: IWorkbenchLayoutService,
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IInstantiationService instantiationService: IInstantiationService,
@@ -46,11 +45,17 @@ export class SCMViewPaneContainer extends ViewPaneContainer {
 	}
 
 	override getTitle(): string {
+		if (this.panes.length === 1) {
+			if (this.panes[0].id === VIEW_PANE_ID ||
+				this.panes[0].id === REPOSITORIES_VIEW_PANE_ID ||
+				this.panes[0].id === HISTORY_VIEW_PANE_ID) {
+				return this.panes[0].title;
+			} else {
+				return super.getTitle();
+			}
+		}
+
 		return localize('source control', "Source Control");
 	}
 
-	override getActionsContext(): unknown {
-		return this.scmViewService.visibleRepositories.length === 1 ? this.scmViewService.visibleRepositories[0].provider : undefined;
-	}
-
 }
diff --git a/src/vs/workbench/contrib/scm/browser/scmViewService.ts b/src/vs/workbench/contrib/scm/browser/scmViewService.ts
index 3e1eaf72d90..38c0119b7de 100644
--- a/src/vs/workbench/contrib/scm/browser/scmViewService.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmViewService.ts
@@ -3,21 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { Emitter, Event } from 'vs/base/common/event';
-import { ISCMViewService, ISCMRepository, ISCMService, ISCMViewVisibleRepositoryChangeEvent, ISCMMenus, ISCMProvider, ISCMRepositorySortKey } from 'vs/workbench/contrib/scm/common/scm';
-import { Iterable } from 'vs/base/common/iterator';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { SCMMenus } from 'vs/workbench/contrib/scm/browser/menus';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { debounce } from 'vs/base/common/decorators';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { compareFileNames, comparePaths } from 'vs/base/common/comparers';
-import { basename } from 'vs/base/common/resources';
-import { binarySearch } from 'vs/base/common/arrays';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { ISCMViewService, ISCMRepository, ISCMService, ISCMViewVisibleRepositoryChangeEvent, ISCMMenus, ISCMProvider, ISCMRepositorySortKey } from '../common/scm.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { SCMMenus } from './menus.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { debounce } from '../../../../base/common/decorators.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { compareFileNames, comparePaths } from '../../../../base/common/comparers.js';
+import { basename } from '../../../../base/common/resources.js';
+import { binarySearch } from '../../../../base/common/arrays.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { derivedObservableWithCache, latestChangedValue, observableFromEventOpts } from '../../../../base/common/observable.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { EditorResourceAccessor } from '../../../common/editor.js';
 
 function getProviderStorageKey(provider: ISCMProvider): string {
 	return `${provider.contextValue}:${provider.label}${provider.rootUri ? `:${provider.rootUri.toString()}` : ''}`;
@@ -154,12 +157,44 @@ export class SCMViewService implements ISCMViewService {
 	private _onDidFocusRepository = new Emitter<ISCMRepository | undefined>();
 	readonly onDidFocusRepository = this._onDidFocusRepository.event;
 
+	private readonly _focusedRepository = observableFromEventOpts<ISCMRepository | undefined>(
+		{ owner: this, equalsFn: () => false },
+		this.onDidFocusRepository,
+		() => this.focusedRepository);
+
+	private readonly _activeEditor = observableFromEventOpts(
+		{ owner: this, equalsFn: () => false },
+		this.editorService.onDidActiveEditorChange,
+		() => this.editorService.activeEditor);
+
+	private readonly _activeEditorRepository = derivedObservableWithCache<ISCMRepository | undefined>(this,
+		(reader, lastValue) => {
+			const activeResource = EditorResourceAccessor.getOriginalUri(this._activeEditor.read(reader));
+			if (!activeResource) {
+				return lastValue;
+			}
+
+			const repository = this.scmService.getRepository(activeResource);
+			if (!repository) {
+				return lastValue;
+			}
+
+			return Object.create(repository);
+		});
+
+	/**
+	 * The focused repository takes precedence over the active editor repository when the observable
+	 * values are updated in the same transaction (or during the initial read of the observable value).
+	 */
+	readonly activeRepository = latestChangedValue(this, [this._activeEditorRepository, this._focusedRepository]);
+
 	private _repositoriesSortKey: ISCMRepositorySortKey;
 	private _sortKeyContextKey: IContextKey<ISCMRepositorySortKey>;
 
 	constructor(
-		@ISCMService scmService: ISCMService,
+		@ISCMService private readonly scmService: ISCMService,
 		@IContextKeyService contextKeyService: IContextKeyService,
+		@IEditorService private readonly editorService: IEditorService,
 		@IExtensionService extensionService: IExtensionService,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
diff --git a/src/vs/workbench/contrib/scm/browser/util.ts b/src/vs/workbench/contrib/scm/browser/util.ts
index 7ff93156220..61a063c1931 100644
--- a/src/vs/workbench/contrib/scm/browser/util.ts
+++ b/src/vs/workbench/contrib/scm/browser/util.ts
@@ -3,27 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as path from 'vs/base/common/path';
-import { SCMHistoryItemChangeTreeElement, SCMHistoryItemGroupTreeElement, SCMHistoryItemTreeElement, SCMViewSeparatorElement } from 'vs/workbench/contrib/scm/common/history';
-import { ISCMResource, ISCMRepository, ISCMResourceGroup, ISCMInput, ISCMActionButton, ISCMViewService, ISCMProvider } from 'vs/workbench/contrib/scm/common/scm';
-import { IMenu, MenuItemAction } from 'vs/platform/actions/common/actions';
-import { ActionBar, IActionViewItemProvider } from 'vs/base/browser/ui/actionbar/actionbar';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { Action, IAction } from 'vs/base/common/actions';
-import { createActionViewItem, createAndFillInActionBarActions, createAndFillInContextMenuActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { equals } from 'vs/base/common/arrays';
-import { ActionViewItem, IBaseActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { Command } from 'vs/editor/common/languages';
-import { reset } from 'vs/base/browser/dom';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { URI } from 'vs/base/common/uri';
-import { IResourceNode, ResourceTree } from 'vs/base/common/resourceTree';
-
-export function isSCMRepositoryArray(element: any): element is ISCMRepository[] {
-	return Array.isArray(element) && element.every(r => isSCMRepository(r));
-}
+import { ISCMHistoryItem, ISCMHistoryItemRef, SCMHistoryItemLoadMoreTreeElement, SCMHistoryItemViewModelTreeElement } from '../common/history.js';
+import { ISCMResource, ISCMRepository, ISCMResourceGroup, ISCMInput, ISCMActionButton, ISCMViewService, ISCMProvider } from '../common/scm.js';
+import { IMenu, MenuItemAction } from '../../../../platform/actions/common/actions.js';
+import { ActionBar, IActionViewItemProvider } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { Action, IAction } from '../../../../base/common/actions.js';
+import { createActionViewItem, createAndFillInActionBarActions, createAndFillInContextMenuActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { equals } from '../../../../base/common/arrays.js';
+import { ActionViewItem, IBaseActionViewItemOptions } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { Command } from '../../../../editor/common/languages.js';
+import { reset } from '../../../../base/browser/dom.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IResourceNode, ResourceTree } from '../../../../base/common/resourceTree.js';
 
 export function isSCMViewService(element: any): element is ISCMViewService {
 	return Array.isArray((element as ISCMViewService).repositories) && Array.isArray((element as ISCMViewService).visibleRepositories);
@@ -53,36 +47,12 @@ export function isSCMResourceNode(element: any): element is IResourceNode<ISCMRe
 	return ResourceTree.isResourceNode(element) && isSCMResourceGroup(element.context);
 }
 
-export function isSCMHistoryItemGroupTreeElement(element: any): element is SCMHistoryItemGroupTreeElement {
-	return (element as SCMHistoryItemGroupTreeElement).type === 'historyItemGroup';
+export function isSCMHistoryItemViewModelTreeElement(element: any): element is SCMHistoryItemViewModelTreeElement {
+	return (element as SCMHistoryItemViewModelTreeElement).type === 'historyItemViewModel';
 }
 
-export function isSCMHistoryItemTreeElement(element: any): element is SCMHistoryItemTreeElement {
-	return (element as SCMHistoryItemTreeElement).type === 'allChanges' ||
-		(element as SCMHistoryItemTreeElement).type === 'historyItem';
-}
-
-export function isSCMHistoryItemChangeTreeElement(element: any): element is SCMHistoryItemChangeTreeElement {
-	return (element as SCMHistoryItemChangeTreeElement).type === 'historyItemChange';
-}
-
-export function isSCMHistoryItemChangeNode(element: any): element is IResourceNode<SCMHistoryItemChangeTreeElement, SCMHistoryItemTreeElement> {
-	return ResourceTree.isResourceNode(element) && isSCMHistoryItemTreeElement(element.context);
-}
-
-export function isSCMViewSeparator(element: any): element is SCMViewSeparatorElement {
-	return (element as SCMViewSeparatorElement).type === 'separator';
-}
-
-export function toDiffEditorArguments(uri: URI, originalUri: URI, modifiedUri: URI): unknown[] {
-	const basename = path.basename(uri.fsPath);
-	const originalQuery = JSON.parse(originalUri.query) as { path: string; ref: string };
-	const modifiedQuery = JSON.parse(modifiedUri.query) as { path: string; ref: string };
-
-	const originalShortRef = originalQuery.ref.substring(0, 8).concat(originalQuery.ref.endsWith('^') ? '^' : '');
-	const modifiedShortRef = modifiedQuery.ref.substring(0, 8).concat(modifiedQuery.ref.endsWith('^') ? '^' : '');
-
-	return [originalUri, modifiedUri, `${basename} (${originalShortRef}) ↔ ${basename} (${modifiedShortRef})`, null];
+export function isSCMHistoryItemLoadMoreTreeElement(element: any): element is SCMHistoryItemLoadMoreTreeElement {
+	return (element as SCMHistoryItemLoadMoreTreeElement).type === 'historyItemLoadMore';
 }
 
 const compareActions = (a: IAction, b: IAction) => {
@@ -177,3 +147,38 @@ export function getProviderKey(provider: ISCMProvider): string {
 export function getRepositoryResourceCount(provider: ISCMProvider): number {
 	return provider.groups.reduce<number>((r, g) => r + g.resources.length, 0);
 }
+
+export function getHistoryItemEditorTitle(historyItem: ISCMHistoryItem, maxLength = 20): string {
+	const title = historyItem.subject.length <= maxLength ?
+		historyItem.subject : `${historyItem.subject.substring(0, maxLength)}\u2026`;
+
+	return `${historyItem.displayId ?? historyItem.id} - ${title}`;
+}
+
+export function compareHistoryItemRefs(
+	ref1: ISCMHistoryItemRef,
+	ref2: ISCMHistoryItemRef,
+	currentHistoryItemRef?: ISCMHistoryItemRef,
+	currentHistoryItemRemoteRef?: ISCMHistoryItemRef,
+	currentHistoryItemBaseRef?: ISCMHistoryItemRef
+): number {
+	const getHistoryItemRefOrder = (ref: ISCMHistoryItemRef) => {
+		if (ref.id === currentHistoryItemRef?.id) {
+			return 1;
+		} else if (ref.id === currentHistoryItemRemoteRef?.id) {
+			return 2;
+		} else if (ref.id === currentHistoryItemBaseRef?.id) {
+			return 3;
+		} else if (ref.color !== undefined) {
+			return 4;
+		}
+
+		return 99;
+	};
+
+	// Assign order (current > remote > base > color)
+	const ref1Order = getHistoryItemRefOrder(ref1);
+	const ref2Order = getHistoryItemRefOrder(ref2);
+
+	return ref1Order - ref2Order;
+}
diff --git a/src/vs/workbench/contrib/scm/browser/workingSet.ts b/src/vs/workbench/contrib/scm/browser/workingSet.ts
index 3a023470ea2..1185f8de20a 100644
--- a/src/vs/workbench/contrib/scm/browser/workingSet.ts
+++ b/src/vs/workbench/contrib/scm/browser/workingSet.ts
@@ -3,15 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { DisposableMap, DisposableStore } from 'vs/base/common/lifecycle';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { getProviderKey } from 'vs/workbench/contrib/scm/browser/util';
-import { ISCMRepository, ISCMService } from 'vs/workbench/contrib/scm/common/scm';
-import { IEditorGroupsService, IEditorWorkingSet } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/browser/layoutService';
+import { Disposable, DisposableMap, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { autorun, autorunWithStore, derived } from '../../../../base/common/observable.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { observableConfigValue } from '../../../../platform/observable/common/platformObservableUtils.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { getProviderKey } from './util.js';
+import { ISCMRepository, ISCMService } from '../common/scm.js';
+import { IEditorGroupsService, IEditorWorkingSet } from '../../../services/editor/common/editorGroupsService.js';
+import { IWorkbenchLayoutService, Parts } from '../../../services/layout/browser/layoutService.js';
 
 type ISCMSerializedWorkingSet = {
 	readonly providerKey: string;
@@ -24,13 +25,13 @@ interface ISCMRepositoryWorkingSet {
 	readonly editorWorkingSets: Map<string, IEditorWorkingSet>;
 }
 
-export class SCMWorkingSetController implements IWorkbenchContribution {
+export class SCMWorkingSetController extends Disposable implements IWorkbenchContribution {
 	static readonly ID = 'workbench.contrib.scmWorkingSets';
 
 	private _workingSets!: Map<string, ISCMRepositoryWorkingSet>;
+	private _enabledConfig = observableConfigValue<boolean>('scm.workingSets.enabled', false, this.configurationService);
+
 	private readonly _repositoryDisposables = new DisposableMap<ISCMRepository>();
-	private readonly _scmServiceDisposables = new DisposableStore();
-	private readonly _disposables = new DisposableStore();
 
 	constructor(
 		@IConfigurationService private readonly configurationService: IConfigurationService,
@@ -39,69 +40,67 @@ export class SCMWorkingSetController implements IWorkbenchContribution {
 		@IStorageService private readonly storageService: IStorageService,
 		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService
 	) {
-		const onDidChangeConfiguration = Event.filter(configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.workingSets.enabled'), this._disposables);
-		this._disposables.add(Event.runAndSubscribe(onDidChangeConfiguration, () => this._onDidChangeConfiguration()));
-	}
+		super();
 
-	private _onDidChangeConfiguration(): void {
-		if (!this.configurationService.getValue<boolean>('scm.workingSets.enabled')) {
-			this.storageService.remove('scm.workingSets', StorageScope.WORKSPACE);
+		this._store.add(autorunWithStore((reader, store) => {
+			if (!this._enabledConfig.read(reader)) {
+				this.storageService.remove('scm.workingSets', StorageScope.WORKSPACE);
+				this._repositoryDisposables.clearAndDisposeAll();
+				return;
+			}
 
-			this._scmServiceDisposables.clear();
-			this._repositoryDisposables.clearAndDisposeAll();
+			this._workingSets = this._loadWorkingSets();
 
-			return;
-		}
+			this.scmService.onDidAddRepository(this._onDidAddRepository, this, store);
+			this.scmService.onDidRemoveRepository(this._onDidRemoveRepository, this, store);
 
-		this._workingSets = this._loadWorkingSets();
-
-		this.scmService.onDidAddRepository(this._onDidAddRepository, this, this._scmServiceDisposables);
-		this.scmService.onDidRemoveRepository(this._onDidRemoveRepository, this, this._scmServiceDisposables);
-
-		for (const repository of this.scmService.repositories) {
-			this._onDidAddRepository(repository);
-		}
+			for (const repository of this.scmService.repositories) {
+				this._onDidAddRepository(repository);
+			}
+		}));
 	}
 
 	private _onDidAddRepository(repository: ISCMRepository): void {
 		const disposables = new DisposableStore();
 
-		disposables.add(Event.runAndSubscribe(repository.provider.onDidChangeHistoryProvider, () => {
-			if (!repository.provider.historyProvider) {
+		const historyItemRefId = derived(reader => {
+			const historyProvider = repository.provider.historyProvider.read(reader);
+			const historyItemRef = historyProvider?.historyItemRef.read(reader);
+
+			return historyItemRef?.id;
+		});
+
+		disposables.add(autorun(async reader => {
+			const historyItemRefIdValue = historyItemRefId.read(reader);
+
+			if (!historyItemRefIdValue) {
 				return;
 			}
 
-			disposables.add(Event.runAndSubscribe(repository.provider.historyProvider.onDidChangeCurrentHistoryItemGroup, async () => {
-				if (!repository.provider.historyProvider?.currentHistoryItemGroup?.id) {
-					return;
-				}
+			const providerKey = getProviderKey(repository.provider);
+			const repositoryWorkingSets = this._workingSets.get(providerKey);
 
-				const providerKey = getProviderKey(repository.provider);
-				const currentHistoryItemGroupId = repository.provider.historyProvider.currentHistoryItemGroup.id;
-				const repositoryWorkingSets = this._workingSets.get(providerKey);
+			if (!repositoryWorkingSets) {
+				this._workingSets.set(providerKey, { currentHistoryItemGroupId: historyItemRefIdValue, editorWorkingSets: new Map() });
+				return;
+			}
 
-				if (!repositoryWorkingSets) {
-					this._workingSets.set(providerKey, { currentHistoryItemGroupId, editorWorkingSets: new Map() });
-					return;
-				}
+			// Editors for the current working set are automatically restored
+			if (repositoryWorkingSets.currentHistoryItemGroupId === historyItemRefIdValue) {
+				return;
+			}
 
-				if (repositoryWorkingSets.currentHistoryItemGroupId === currentHistoryItemGroupId) {
-					return;
-				}
+			// Save the working set
+			this._saveWorkingSet(providerKey, historyItemRefIdValue, repositoryWorkingSets);
 
-				// Save the working set
-				this._saveWorkingSet(providerKey, currentHistoryItemGroupId, repositoryWorkingSets);
-
-				// Restore the working set
-				await this._restoreWorkingSet(providerKey, currentHistoryItemGroupId);
-			}));
+			// Restore the working set
+			await this._restoreWorkingSet(providerKey, historyItemRefIdValue);
 		}));
 
 		this._repositoryDisposables.set(repository, disposables);
 	}
 
 	private _onDidRemoveRepository(repository: ISCMRepository): void {
-		this._workingSets.delete(getProviderKey(repository.provider));
 		this._repositoryDisposables.deleteAndDispose(repository);
 	}
 
@@ -159,9 +158,8 @@ export class SCMWorkingSetController implements IWorkbenchContribution {
 		}
 	}
 
-	dispose(): void {
+	override dispose(): void {
 		this._repositoryDisposables.dispose();
-		this._scmServiceDisposables.dispose();
-		this._disposables.dispose();
+		super.dispose();
 	}
 }
diff --git a/src/vs/workbench/contrib/scm/common/history.ts b/src/vs/workbench/contrib/scm/common/history.ts
index 2cb81effd91..2cdf25f2b99 100644
--- a/src/vs/workbench/contrib/scm/common/history.ts
+++ b/src/vs/workbench/contrib/scm/common/history.ts
@@ -3,61 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { URI } from 'vs/base/common/uri';
-import { IMenu } from 'vs/platform/actions/common/actions';
-import { ISCMRepository } from 'vs/workbench/contrib/scm/common/scm';
+import { IObservable } from '../../../../base/common/observable.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IMenu } from '../../../../platform/actions/common/actions.js';
+import { ColorIdentifier } from '../../../../platform/theme/common/colorUtils.js';
+import { ISCMRepository } from './scm.js';
 
 export interface ISCMHistoryProviderMenus {
-	getHistoryItemGroupMenu(historyItemGroup: SCMHistoryItemGroupTreeElement): IMenu;
-	getHistoryItemGroupContextMenu(historyItemGroup: SCMHistoryItemGroupTreeElement): IMenu;
-
-	getHistoryItemMenu(historyItem: SCMHistoryItemTreeElement): IMenu;
+	getHistoryItemMenu(historyItem: SCMHistoryItemViewModelTreeElement): IMenu;
 }
 
 export interface ISCMHistoryProvider {
+	readonly historyItemRef: IObservable<ISCMHistoryItemRef | undefined>;
+	readonly historyItemRemoteRef: IObservable<ISCMHistoryItemRef | undefined>;
+	readonly historyItemBaseRef: IObservable<ISCMHistoryItemRef | undefined>;
 
-	readonly onDidChangeCurrentHistoryItemGroup: Event<void>;
+	readonly historyItemRefChanges: IObservable<ISCMHistoryItemRefsChangeEvent>;
 
-	get currentHistoryItemGroup(): ISCMHistoryItemGroup | undefined;
-	set currentHistoryItemGroup(historyItemGroup: ISCMHistoryItemGroup | undefined);
-
-	provideHistoryItems(historyItemGroupId: string, options: ISCMHistoryOptions): Promise<ISCMHistoryItem[] | undefined>;
-	provideHistoryItemSummary(historyItemId: string, historyItemParentId: string | undefined): Promise<ISCMHistoryItem | undefined>;
+	provideHistoryItemRefs(historyItemsRefs?: string[]): Promise<ISCMHistoryItemRef[] | undefined>;
+	provideHistoryItems(options: ISCMHistoryOptions): Promise<ISCMHistoryItem[] | undefined>;
 	provideHistoryItemChanges(historyItemId: string, historyItemParentId: string | undefined): Promise<ISCMHistoryItemChange[] | undefined>;
-	resolveHistoryItemGroupCommonAncestor(historyItemGroupId1: string, historyItemGroupId2: string | undefined): Promise<{ id: string; ahead: number; behind: number } | undefined>;
-}
-
-export interface ISCMHistoryProviderCacheEntry {
-	readonly incomingHistoryItemGroup: SCMHistoryItemGroupTreeElement | undefined;
-	readonly outgoingHistoryItemGroup: SCMHistoryItemGroupTreeElement | undefined;
-	readonly historyItems: Map<string, [ISCMHistoryItem | undefined, ISCMHistoryItem[]]>;
-	readonly historyItemChanges: Map<string, ISCMHistoryItemChange[]>;
+	resolveHistoryItemRefsCommonAncestor(historyItemRefs: string[]): Promise<string | undefined>;
 }
 
 export interface ISCMHistoryOptions {
-	readonly cursor?: string;
+	readonly skip?: number;
 	readonly limit?: number | { id?: string };
-}
-
-export interface ISCMHistoryItemGroup {
-	readonly id: string;
-	readonly name: string;
-	readonly base?: Omit<ISCMHistoryItemGroup, 'base'>;
-}
-
-export interface SCMHistoryItemGroupTreeElement {
-	readonly id: string;
-	readonly label: string;
-	readonly ariaLabel?: string;
-	readonly icon?: URI | { light: URI; dark: URI } | ThemeIcon;
-	readonly description?: string;
-	readonly direction: 'incoming' | 'outgoing';
-	readonly ancestor?: string;
-	readonly count?: number;
-	readonly repository: ISCMRepository;
-	readonly type: 'historyItemGroup';
+	readonly historyItemRefs?: readonly string[];
 }
 
 export interface ISCMHistoryItemStatistics {
@@ -66,19 +39,57 @@ export interface ISCMHistoryItemStatistics {
 	readonly deletions: number;
 }
 
+export interface ISCMHistoryItemRef {
+	readonly id: string;
+	readonly name: string;
+	readonly revision?: string;
+	readonly category?: string;
+	readonly description?: string;
+	readonly color?: ColorIdentifier;
+	readonly icon?: URI | { light: URI; dark: URI } | ThemeIcon;
+}
+
+export interface ISCMHistoryItemRefsChangeEvent {
+	readonly added: readonly ISCMHistoryItemRef[];
+	readonly removed: readonly ISCMHistoryItemRef[];
+	readonly modified: readonly ISCMHistoryItemRef[];
+	readonly silent: boolean;
+}
+
 export interface ISCMHistoryItem {
 	readonly id: string;
 	readonly parentIds: string[];
+	readonly subject: string;
 	readonly message: string;
+	readonly displayId?: string;
 	readonly author?: string;
-	readonly icon?: URI | { light: URI; dark: URI } | ThemeIcon;
 	readonly timestamp?: number;
 	readonly statistics?: ISCMHistoryItemStatistics;
+	readonly references?: ISCMHistoryItemRef[];
 }
 
-export interface SCMHistoryItemTreeElement extends ISCMHistoryItem {
-	readonly historyItemGroup: SCMHistoryItemGroupTreeElement;
-	readonly type: 'allChanges' | 'historyItem';
+export interface ISCMHistoryItemGraphNode {
+	readonly id: string;
+	readonly color: ColorIdentifier;
+}
+
+export interface ISCMHistoryItemViewModel {
+	readonly historyItem: ISCMHistoryItem;
+	readonly isCurrent: boolean;
+	readonly inputSwimlanes: ISCMHistoryItemGraphNode[];
+	readonly outputSwimlanes: ISCMHistoryItemGraphNode[];
+}
+
+export interface SCMHistoryItemViewModelTreeElement {
+	readonly repository: ISCMRepository;
+	readonly historyItemViewModel: ISCMHistoryItemViewModel;
+	readonly type: 'historyItemViewModel';
+}
+
+export interface SCMHistoryItemLoadMoreTreeElement {
+	readonly repository: ISCMRepository;
+	readonly graphColumns: ISCMHistoryItemGraphNode[];
+	readonly type: 'historyItemLoadMore';
 }
 
 export interface ISCMHistoryItemChange {
@@ -87,15 +98,3 @@ export interface ISCMHistoryItemChange {
 	readonly modifiedUri?: URI;
 	readonly renameUri?: URI;
 }
-
-export interface SCMHistoryItemChangeTreeElement extends ISCMHistoryItemChange {
-	readonly historyItem: SCMHistoryItemTreeElement;
-	readonly type: 'historyItemChange';
-}
-
-export interface SCMViewSeparatorElement {
-	readonly label: string;
-	readonly ariaLabel?: string;
-	readonly repository: ISCMRepository;
-	readonly type: 'separator';
-}
diff --git a/src/vs/workbench/contrib/scm/common/quickDiff.ts b/src/vs/workbench/contrib/scm/common/quickDiff.ts
index eec1b2ae86d..65142c9a4c8 100644
--- a/src/vs/workbench/contrib/scm/common/quickDiff.ts
+++ b/src/vs/workbench/contrib/scm/common/quickDiff.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { LanguageSelector } from 'vs/editor/common/languageSelector';
-import { Event } from 'vs/base/common/event';
+import { URI } from '../../../../base/common/uri.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { LanguageSelector } from '../../../../editor/common/languageSelector.js';
+import { Event } from '../../../../base/common/event.js';
 
 export const IQuickDiffService = createDecorator<IQuickDiffService>('quickDiff');
 
diff --git a/src/vs/workbench/contrib/scm/common/quickDiffService.ts b/src/vs/workbench/contrib/scm/common/quickDiffService.ts
index 137913c91b3..99bcd00d8c8 100644
--- a/src/vs/workbench/contrib/scm/common/quickDiffService.ts
+++ b/src/vs/workbench/contrib/scm/common/quickDiffService.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { IQuickDiffService, QuickDiff, QuickDiffProvider } from 'vs/workbench/contrib/scm/common/quickDiff';
-import { isEqualOrParent } from 'vs/base/common/resources';
-import { score } from 'vs/editor/common/languageSelector';
-import { Emitter } from 'vs/base/common/event';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
+import { URI } from '../../../../base/common/uri.js';
+import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
+import { IQuickDiffService, QuickDiff, QuickDiffProvider } from './quickDiff.js';
+import { isEqualOrParent } from '../../../../base/common/resources.js';
+import { score } from '../../../../editor/common/languageSelector.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
 
 function createProviderComparer(uri: URI): (a: QuickDiffProvider, b: QuickDiffProvider) => number {
 	return (a, b) => {
diff --git a/src/vs/workbench/contrib/scm/common/scm.ts b/src/vs/workbench/contrib/scm/common/scm.ts
index 47bd0637217..74623463fa5 100644
--- a/src/vs/workbench/contrib/scm/common/scm.ts
+++ b/src/vs/workbench/contrib/scm/common/scm.ts
@@ -3,23 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { Event } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { Command } from 'vs/editor/common/languages';
-import { IAction } from 'vs/base/common/actions';
-import { IMenu } from 'vs/platform/actions/common/actions';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { ResourceTree } from 'vs/base/common/resourceTree';
-import { ISCMHistoryProvider, ISCMHistoryProviderMenus } from 'vs/workbench/contrib/scm/common/history';
-import { ITextModel } from 'vs/editor/common/model';
-import { IObservable } from 'vs/base/common/observable';
+import { URI } from '../../../../base/common/uri.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { Event } from '../../../../base/common/event.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { Command } from '../../../../editor/common/languages.js';
+import { IAction } from '../../../../base/common/actions.js';
+import { IMenu } from '../../../../platform/actions/common/actions.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { IMarkdownString } from '../../../../base/common/htmlContent.js';
+import { ResourceTree } from '../../../../base/common/resourceTree.js';
+import { ISCMHistoryProvider } from './history.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { IObservable } from '../../../../base/common/observable.js';
 
 export const VIEWLET_ID = 'workbench.view.scm';
 export const VIEW_PANE_ID = 'workbench.scm';
 export const REPOSITORIES_VIEW_PANE_ID = 'workbench.scm.repositories';
+export const HISTORY_VIEW_PANE_ID = 'workbench.scm.history';
 
 export interface IBaselineResourceProvider {
 	getBaselineResource(resource: URI): Promise<URI>;
@@ -75,14 +76,10 @@ export interface ISCMProvider extends IDisposable {
 	readonly inputBoxTextModel: ITextModel;
 	readonly count: IObservable<number | undefined>;
 	readonly commitTemplate: IObservable<string>;
-	readonly historyProvider?: ISCMHistoryProvider;
-	readonly onDidChangeHistoryProvider: Event<void>;
-	readonly onDidChangeStatusBarCommands?: Event<readonly Command[]>;
+	readonly historyProvider: IObservable<ISCMHistoryProvider | undefined>;
 	readonly acceptInputCommand?: Command;
-	readonly actionButton?: ISCMActionButtonDescriptor;
-	readonly statusBarCommands?: readonly Command[];
-	readonly statusBarCommandsObs: IObservable<readonly Command[] | undefined>;
-	readonly onDidChange: Event<void>;
+	readonly actionButton: IObservable<ISCMActionButtonDescriptor | undefined>;
+	readonly statusBarCommands: IObservable<readonly Command[] | undefined>;
 
 	getOriginalResource(uri: URI): Promise<URI | null>;
 }
@@ -118,16 +115,15 @@ export interface ISCMInputChangeEvent {
 }
 
 export interface ISCMActionButtonDescriptor {
-	command: Command;
+	command: Command & { shortTitle?: string };
 	secondaryCommands?: Command[][];
-	description?: string;
 	enabled: boolean;
 }
 
 export interface ISCMActionButton {
 	readonly type: 'actionButton';
 	readonly repository: ISCMRepository;
-	readonly button?: ISCMActionButtonDescriptor;
+	readonly button: ISCMActionButtonDescriptor;
 }
 
 export interface ISCMInput {
@@ -188,7 +184,6 @@ export interface ISCMTitleMenu {
 
 export interface ISCMRepositoryMenus {
 	readonly titleMenu: ISCMTitleMenu;
-	readonly historyProviderMenu: ISCMHistoryProviderMenus | undefined;
 	readonly repositoryMenu: IMenu;
 	readonly repositoryContextMenu: IMenu;
 	getResourceGroupMenu(group: ISCMResourceGroup): IMenu;
@@ -232,6 +227,11 @@ export interface ISCMViewService {
 	readonly focusedRepository: ISCMRepository | undefined;
 	readonly onDidFocusRepository: Event<ISCMRepository | undefined>;
 	focus(repository: ISCMRepository): void;
+
+	/**
+	 * Focused repository or the repository for the active editor
+	 */
+	readonly activeRepository: IObservable<ISCMRepository | undefined>;
 }
 
 export const SCM_CHANGES_EDITOR_ID = 'workbench.editor.scmChangesEditor';
diff --git a/src/vs/workbench/contrib/scm/common/scmService.ts b/src/vs/workbench/contrib/scm/common/scmService.ts
index 7dfd1ea6f2c..c9af734400a 100644
--- a/src/vs/workbench/contrib/scm/common/scmService.ts
+++ b/src/vs/workbench/contrib/scm/common/scmService.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { Event, Emitter } from 'vs/base/common/event';
-import { ISCMService, ISCMProvider, ISCMInput, ISCMRepository, IInputValidator, ISCMInputChangeEvent, SCMInputChangeReason, InputValidationType, IInputValidation } from './scm';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { HistoryNavigator2 } from 'vs/base/common/history';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { ResourceMap } from 'vs/base/common/map';
-import { URI } from 'vs/base/common/uri';
-import { Iterable } from 'vs/base/common/iterator';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { Schemas } from 'vs/base/common/network';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { ISCMService, ISCMProvider, ISCMInput, ISCMRepository, IInputValidator, ISCMInputChangeEvent, SCMInputChangeReason, InputValidationType, IInputValidation } from './scm.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { HistoryNavigator2 } from '../../../../base/common/history.js';
+import { IMarkdownString } from '../../../../base/common/htmlContent.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
 
 class SCMInput extends Disposable implements ISCMInput {
 
@@ -134,7 +134,7 @@ class SCMInput extends Disposable implements ISCMInput {
 		}
 
 		if (!transient) {
-			this.historyNavigator.add(this._value);
+			this.historyNavigator.replaceLast(this._value);
 			this.historyNavigator.add(value);
 			this.didChangeHistory = true;
 		}
diff --git a/src/vs/workbench/contrib/scm/test/browser/scmHistory.test.ts b/src/vs/workbench/contrib/scm/test/browser/scmHistory.test.ts
new file mode 100644
index 00000000000..d322704bd79
--- /dev/null
+++ b/src/vs/workbench/contrib/scm/test/browser/scmHistory.test.ts
@@ -0,0 +1,596 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { ColorIdentifier } from '../../../../../platform/theme/common/colorUtils.js';
+import { colorRegistry, historyItemBaseRefColor, historyItemRefColor, historyItemRemoteRefColor, toISCMHistoryItemViewModelArray } from '../../browser/scmHistory.js';
+import { ISCMHistoryItem, ISCMHistoryItemRef } from '../../common/history.js';
+
+function toSCMHistoryItem(id: string, parentIds: string[], references?: ISCMHistoryItemRef[]): ISCMHistoryItem {
+	return { id, parentIds, subject: '', message: '', references } satisfies ISCMHistoryItem;
+}
+
+suite('toISCMHistoryItemViewModelArray', () => {
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('empty graph', () => {
+		const viewModels = toISCMHistoryItemViewModelArray([]);
+
+		assert.strictEqual(viewModels.length, 0);
+	});
+
+
+	/**
+	 *	* a
+	 */
+
+	test('single commit', () => {
+		const models = [
+			toSCMHistoryItem('a', []),
+		];
+
+		const viewModels = toISCMHistoryItemViewModelArray(models);
+
+		assert.strictEqual(viewModels.length, 1);
+
+		assert.strictEqual(viewModels[0].inputSwimlanes.length, 0);
+		assert.strictEqual(viewModels[0].outputSwimlanes.length, 0);
+	});
+
+	/**
+	 *	* a(b)
+	 *	* b(c)
+	 *	* c(d)
+	 *	* d(e)
+	 *	* e
+	 */
+	test('linear graph', () => {
+		const models = [
+			toSCMHistoryItem('a', ['b']),
+			toSCMHistoryItem('b', ['c']),
+			toSCMHistoryItem('c', ['d']),
+			toSCMHistoryItem('d', ['e']),
+			toSCMHistoryItem('e', []),
+		];
+
+		const viewModels = toISCMHistoryItemViewModelArray(models);
+
+		assert.strictEqual(viewModels.length, 5);
+
+		// node a
+		assert.strictEqual(viewModels[0].inputSwimlanes.length, 0);
+
+		assert.strictEqual(viewModels[0].outputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[0].outputSwimlanes[0].id, 'b');
+		assert.strictEqual(viewModels[0].outputSwimlanes[0].color, colorRegistry[0]);
+
+		// node b
+		assert.strictEqual(viewModels[1].inputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[1].inputSwimlanes[0].id, 'b');
+		assert.strictEqual(viewModels[1].inputSwimlanes[0].color, colorRegistry[0]);
+
+		assert.strictEqual(viewModels[1].outputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[1].outputSwimlanes[0].id, 'c');
+		assert.strictEqual(viewModels[1].outputSwimlanes[0].color, colorRegistry[0]);
+
+		// node c
+		assert.strictEqual(viewModels[2].inputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[2].inputSwimlanes[0].id, 'c');
+		assert.strictEqual(viewModels[2].inputSwimlanes[0].color, colorRegistry[0]);
+
+		assert.strictEqual(viewModels[2].outputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[2].outputSwimlanes[0].id, 'd');
+		assert.strictEqual(viewModels[2].outputSwimlanes[0].color, colorRegistry[0]);
+
+		// node d
+		assert.strictEqual(viewModels[3].inputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[3].inputSwimlanes[0].id, 'd');
+		assert.strictEqual(viewModels[3].inputSwimlanes[0].color, colorRegistry[0]);
+
+		assert.strictEqual(viewModels[3].outputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[3].outputSwimlanes[0].id, 'e');
+		assert.strictEqual(viewModels[3].outputSwimlanes[0].color, colorRegistry[0]);
+
+		// node e
+		assert.strictEqual(viewModels[4].inputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[4].inputSwimlanes[0].id, 'e');
+		assert.strictEqual(viewModels[4].inputSwimlanes[0].color, colorRegistry[0]);
+
+		assert.strictEqual(viewModels[4].outputSwimlanes.length, 0);
+	});
+
+	/**
+	 *	* a(b)
+	 *	*   b(c,d)
+	 *	|\
+	 *	| * d(c)
+	 *	|/
+	 *	* c(e)
+	 *	* e(f)
+	 */
+	test('merge commit (single commit in topic branch)', () => {
+		const models = [
+			toSCMHistoryItem('a', ['b']),
+			toSCMHistoryItem('b', ['c', 'd']),
+			toSCMHistoryItem('d', ['c']),
+			toSCMHistoryItem('c', ['e']),
+			toSCMHistoryItem('e', ['f']),
+		];
+
+		const viewModels = toISCMHistoryItemViewModelArray(models);
+
+		assert.strictEqual(viewModels.length, 5);
+
+		// node a
+		assert.strictEqual(viewModels[0].inputSwimlanes.length, 0);
+
+		assert.strictEqual(viewModels[0].outputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[0].outputSwimlanes[0].id, 'b');
+		assert.strictEqual(viewModels[0].outputSwimlanes[0].color, colorRegistry[0]);
+
+		// node b
+		assert.strictEqual(viewModels[1].inputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[1].inputSwimlanes[0].id, 'b');
+		assert.strictEqual(viewModels[1].inputSwimlanes[0].color, colorRegistry[0]);
+
+		assert.strictEqual(viewModels[1].outputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[1].outputSwimlanes[0].id, 'c');
+		assert.strictEqual(viewModels[1].outputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[1].outputSwimlanes[1].id, 'd');
+		assert.strictEqual(viewModels[1].outputSwimlanes[1].color, colorRegistry[1]);
+
+		// node d
+		assert.strictEqual(viewModels[2].inputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[2].inputSwimlanes[0].id, 'c');
+		assert.strictEqual(viewModels[2].inputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[2].inputSwimlanes[1].id, 'd');
+		assert.strictEqual(viewModels[2].inputSwimlanes[1].color, colorRegistry[1]);
+
+		assert.strictEqual(viewModels[2].outputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[2].outputSwimlanes[0].id, 'c');
+		assert.strictEqual(viewModels[2].outputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[2].outputSwimlanes[1].id, 'c');
+		assert.strictEqual(viewModels[2].outputSwimlanes[1].color, colorRegistry[1]);
+
+		// node c
+		assert.strictEqual(viewModels[3].inputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[3].inputSwimlanes[0].id, 'c');
+		assert.strictEqual(viewModels[3].inputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[3].inputSwimlanes[1].id, 'c');
+		assert.strictEqual(viewModels[3].inputSwimlanes[1].color, colorRegistry[1]);
+
+		assert.strictEqual(viewModels[3].outputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[3].outputSwimlanes[0].id, 'e');
+		assert.strictEqual(viewModels[3].outputSwimlanes[0].color, colorRegistry[0]);
+
+		// node e
+		assert.strictEqual(viewModels[4].inputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[4].inputSwimlanes[0].id, 'e');
+		assert.strictEqual(viewModels[4].inputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[4].outputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[4].outputSwimlanes[0].id, 'f');
+		assert.strictEqual(viewModels[4].outputSwimlanes[0].color, colorRegistry[0]);
+	});
+
+	/**
+	 *	* a(b,c)
+	 *	|\
+	 *	| * c(d)
+	 *	* | b(e)
+	 *	* | e(f)
+	 *	* | f(d)
+	 *	|/
+	 *	* d(g)
+	 */
+	test('merge commit (multiple commits in topic branch)', () => {
+		const models = [
+			toSCMHistoryItem('a', ['b', 'c']),
+			toSCMHistoryItem('c', ['d']),
+			toSCMHistoryItem('b', ['e']),
+			toSCMHistoryItem('e', ['f']),
+			toSCMHistoryItem('f', ['d']),
+			toSCMHistoryItem('d', ['g']),
+		];
+
+		const viewModels = toISCMHistoryItemViewModelArray(models);
+
+		assert.strictEqual(viewModels.length, 6);
+
+		// node a
+		assert.strictEqual(viewModels[0].inputSwimlanes.length, 0);
+
+		assert.strictEqual(viewModels[0].outputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[0].outputSwimlanes[0].id, 'b');
+		assert.strictEqual(viewModels[0].outputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[0].outputSwimlanes[1].id, 'c');
+		assert.strictEqual(viewModels[0].outputSwimlanes[1].color, colorRegistry[1]);
+
+		// node c
+		assert.strictEqual(viewModels[1].inputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[1].inputSwimlanes[0].id, 'b');
+		assert.strictEqual(viewModels[1].inputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[1].inputSwimlanes[1].id, 'c');
+		assert.strictEqual(viewModels[1].inputSwimlanes[1].color, colorRegistry[1]);
+
+		assert.strictEqual(viewModels[1].outputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[1].outputSwimlanes[0].id, 'b');
+		assert.strictEqual(viewModels[1].outputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[1].outputSwimlanes[1].id, 'd');
+		assert.strictEqual(viewModels[1].outputSwimlanes[1].color, colorRegistry[1]);
+
+		// node b
+		assert.strictEqual(viewModels[2].inputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[2].inputSwimlanes[0].id, 'b');
+		assert.strictEqual(viewModels[2].inputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[2].inputSwimlanes[1].id, 'd');
+		assert.strictEqual(viewModels[2].inputSwimlanes[1].color, colorRegistry[1]);
+
+		assert.strictEqual(viewModels[2].outputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[2].outputSwimlanes[0].id, 'e');
+		assert.strictEqual(viewModels[2].outputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[2].outputSwimlanes[1].id, 'd');
+		assert.strictEqual(viewModels[2].outputSwimlanes[1].color, colorRegistry[1]);
+
+		// node e
+		assert.strictEqual(viewModels[3].inputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[3].inputSwimlanes[0].id, 'e');
+		assert.strictEqual(viewModels[3].inputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[3].inputSwimlanes[1].id, 'd');
+		assert.strictEqual(viewModels[3].inputSwimlanes[1].color, colorRegistry[1]);
+
+		assert.strictEqual(viewModels[3].outputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[3].outputSwimlanes[0].id, 'f');
+		assert.strictEqual(viewModels[3].outputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[3].outputSwimlanes[1].id, 'd');
+		assert.strictEqual(viewModels[3].outputSwimlanes[1].color, colorRegistry[1]);
+
+		// node f
+		assert.strictEqual(viewModels[4].inputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[4].inputSwimlanes[0].id, 'f');
+		assert.strictEqual(viewModels[4].inputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[4].inputSwimlanes[1].id, 'd');
+		assert.strictEqual(viewModels[4].inputSwimlanes[1].color, colorRegistry[1]);
+
+		assert.strictEqual(viewModels[4].outputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[4].outputSwimlanes[0].id, 'd');
+		assert.strictEqual(viewModels[4].outputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[4].outputSwimlanes[1].id, 'd');
+		assert.strictEqual(viewModels[4].outputSwimlanes[1].color, colorRegistry[1]);
+
+		// node d
+		assert.strictEqual(viewModels[5].inputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[5].inputSwimlanes[0].id, 'd');
+		assert.strictEqual(viewModels[5].inputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[5].inputSwimlanes[1].id, 'd');
+		assert.strictEqual(viewModels[5].inputSwimlanes[1].color, colorRegistry[1]);
+
+		assert.strictEqual(viewModels[5].outputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[5].outputSwimlanes[0].id, 'g');
+		assert.strictEqual(viewModels[5].outputSwimlanes[0].color, colorRegistry[0]);
+	});
+
+	/**
+	 * 	* a(b,c)
+	 * 	|\
+	 * 	| * c(b)
+	 * 	|/
+	 * 	* b(d,e)
+	 * 	|\
+	 * 	| * e(f)
+	 * 	| * f(g)
+	 * 	* | d(h)
+	 */
+	test('create brach from merge commit', () => {
+		const models = [
+			toSCMHistoryItem('a', ['b', 'c']),
+			toSCMHistoryItem('c', ['b']),
+			toSCMHistoryItem('b', ['d', 'e']),
+			toSCMHistoryItem('e', ['f']),
+			toSCMHistoryItem('f', ['g']),
+			toSCMHistoryItem('d', ['h']),
+		];
+
+		const viewModels = toISCMHistoryItemViewModelArray(models);
+
+		assert.strictEqual(viewModels.length, 6);
+
+		// node a
+		assert.strictEqual(viewModels[0].inputSwimlanes.length, 0);
+
+		assert.strictEqual(viewModels[0].outputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[0].outputSwimlanes[0].id, 'b');
+		assert.strictEqual(viewModels[0].outputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[0].outputSwimlanes[1].id, 'c');
+		assert.strictEqual(viewModels[0].outputSwimlanes[1].color, colorRegistry[1]);
+
+		// node c
+		assert.strictEqual(viewModels[1].inputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[1].inputSwimlanes[0].id, 'b');
+		assert.strictEqual(viewModels[1].inputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[1].inputSwimlanes[1].id, 'c');
+		assert.strictEqual(viewModels[1].inputSwimlanes[1].color, colorRegistry[1]);
+
+		assert.strictEqual(viewModels[1].outputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[1].outputSwimlanes[0].id, 'b');
+		assert.strictEqual(viewModels[1].outputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[1].outputSwimlanes[1].id, 'b');
+		assert.strictEqual(viewModels[1].outputSwimlanes[1].color, colorRegistry[1]);
+
+		// node b
+		assert.strictEqual(viewModels[2].inputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[2].inputSwimlanes[0].id, 'b');
+		assert.strictEqual(viewModels[2].inputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[2].inputSwimlanes[1].id, 'b');
+		assert.strictEqual(viewModels[2].inputSwimlanes[1].color, colorRegistry[1]);
+
+		assert.strictEqual(viewModels[2].outputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[2].outputSwimlanes[0].id, 'd');
+		assert.strictEqual(viewModels[2].outputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[2].outputSwimlanes[1].id, 'e');
+		assert.strictEqual(viewModels[2].outputSwimlanes[1].color, colorRegistry[2]);
+
+		// node e
+		assert.strictEqual(viewModels[3].inputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[3].inputSwimlanes[0].id, 'd');
+		assert.strictEqual(viewModels[3].inputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[3].inputSwimlanes[1].id, 'e');
+		assert.strictEqual(viewModels[3].inputSwimlanes[1].color, colorRegistry[2]);
+
+		assert.strictEqual(viewModels[3].outputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[3].outputSwimlanes[0].id, 'd');
+		assert.strictEqual(viewModels[3].outputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[3].outputSwimlanes[1].id, 'f');
+		assert.strictEqual(viewModels[3].outputSwimlanes[1].color, colorRegistry[2]);
+
+		// node f
+		assert.strictEqual(viewModels[4].inputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[4].inputSwimlanes[0].id, 'd');
+		assert.strictEqual(viewModels[4].inputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[4].inputSwimlanes[1].id, 'f');
+		assert.strictEqual(viewModels[4].inputSwimlanes[1].color, colorRegistry[2]);
+
+		assert.strictEqual(viewModels[4].outputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[4].outputSwimlanes[0].id, 'd');
+		assert.strictEqual(viewModels[4].outputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[4].outputSwimlanes[1].id, 'g');
+		assert.strictEqual(viewModels[4].outputSwimlanes[1].color, colorRegistry[2]);
+
+		// node d
+		assert.strictEqual(viewModels[5].inputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[5].inputSwimlanes[0].id, 'd');
+		assert.strictEqual(viewModels[5].inputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[5].inputSwimlanes[1].id, 'g');
+		assert.strictEqual(viewModels[5].inputSwimlanes[1].color, colorRegistry[2]);
+
+		assert.strictEqual(viewModels[5].outputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[5].outputSwimlanes[0].id, 'h');
+		assert.strictEqual(viewModels[5].outputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[5].outputSwimlanes[1].id, 'g');
+		assert.strictEqual(viewModels[5].outputSwimlanes[1].color, colorRegistry[2]);
+	});
+
+
+	/**
+	 * 	* a(b,c)
+	 * 	|\
+	 * 	| * c(d)
+	 * 	* | b(e,f)
+	 * 	|\|
+	 * 	| |\
+	 * 	| | * f(g)
+	 * 	* | | e(g)
+	 * 	| * | d(g)
+	 * 	|/ /
+	 * 	| /
+	 * 	|/
+	 * 	* g(h)
+	 */
+	test('create multiple branches from a commit', () => {
+		const models = [
+			toSCMHistoryItem('a', ['b', 'c']),
+			toSCMHistoryItem('c', ['d']),
+			toSCMHistoryItem('b', ['e', 'f']),
+			toSCMHistoryItem('f', ['g']),
+			toSCMHistoryItem('e', ['g']),
+			toSCMHistoryItem('d', ['g']),
+			toSCMHistoryItem('g', ['h']),
+		] satisfies ISCMHistoryItem[];
+
+		const viewModels = toISCMHistoryItemViewModelArray(models);
+
+		assert.strictEqual(viewModels.length, 7);
+
+		// node a
+		assert.strictEqual(viewModels[0].inputSwimlanes.length, 0);
+
+		assert.strictEqual(viewModels[0].outputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[0].outputSwimlanes[0].id, 'b');
+		assert.strictEqual(viewModels[0].outputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[0].outputSwimlanes[1].id, 'c');
+		assert.strictEqual(viewModels[0].outputSwimlanes[1].color, colorRegistry[1]);
+
+		// node c
+		assert.strictEqual(viewModels[1].inputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[1].inputSwimlanes[0].id, 'b');
+		assert.strictEqual(viewModels[1].inputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[1].inputSwimlanes[1].id, 'c');
+		assert.strictEqual(viewModels[1].inputSwimlanes[1].color, colorRegistry[1]);
+
+		assert.strictEqual(viewModels[1].outputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[1].outputSwimlanes[0].id, 'b');
+		assert.strictEqual(viewModels[1].outputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[1].outputSwimlanes[1].id, 'd');
+		assert.strictEqual(viewModels[1].outputSwimlanes[1].color, colorRegistry[1]);
+
+		// node b
+		assert.strictEqual(viewModels[2].inputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[2].inputSwimlanes[0].id, 'b');
+		assert.strictEqual(viewModels[2].inputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[2].inputSwimlanes[1].id, 'd');
+		assert.strictEqual(viewModels[2].inputSwimlanes[1].color, colorRegistry[1]);
+
+		assert.strictEqual(viewModels[2].outputSwimlanes.length, 3);
+		assert.strictEqual(viewModels[2].outputSwimlanes[0].id, 'e');
+		assert.strictEqual(viewModels[2].outputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[2].outputSwimlanes[1].id, 'd');
+		assert.strictEqual(viewModels[2].outputSwimlanes[1].color, colorRegistry[1]);
+		assert.strictEqual(viewModels[2].outputSwimlanes[2].id, 'f');
+		assert.strictEqual(viewModels[2].outputSwimlanes[2].color, colorRegistry[2]);
+
+		// node f
+		assert.strictEqual(viewModels[3].inputSwimlanes.length, 3);
+		assert.strictEqual(viewModels[3].inputSwimlanes[0].id, 'e');
+		assert.strictEqual(viewModels[3].inputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[3].inputSwimlanes[1].id, 'd');
+		assert.strictEqual(viewModels[3].inputSwimlanes[1].color, colorRegistry[1]);
+		assert.strictEqual(viewModels[3].inputSwimlanes[2].id, 'f');
+		assert.strictEqual(viewModels[3].inputSwimlanes[2].color, colorRegistry[2]);
+
+		assert.strictEqual(viewModels[3].outputSwimlanes.length, 3);
+		assert.strictEqual(viewModels[3].outputSwimlanes[0].id, 'e');
+		assert.strictEqual(viewModels[3].outputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[3].outputSwimlanes[1].id, 'd');
+		assert.strictEqual(viewModels[3].outputSwimlanes[1].color, colorRegistry[1]);
+		assert.strictEqual(viewModels[3].outputSwimlanes[2].id, 'g');
+		assert.strictEqual(viewModels[3].outputSwimlanes[2].color, colorRegistry[2]);
+
+		// node e
+		assert.strictEqual(viewModels[4].inputSwimlanes.length, 3);
+		assert.strictEqual(viewModels[4].inputSwimlanes[0].id, 'e');
+		assert.strictEqual(viewModels[4].inputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[4].inputSwimlanes[1].id, 'd');
+		assert.strictEqual(viewModels[4].inputSwimlanes[1].color, colorRegistry[1]);
+		assert.strictEqual(viewModels[4].inputSwimlanes[2].id, 'g');
+		assert.strictEqual(viewModels[4].inputSwimlanes[2].color, colorRegistry[2]);
+
+		assert.strictEqual(viewModels[4].outputSwimlanes.length, 3);
+		assert.strictEqual(viewModels[4].outputSwimlanes[0].id, 'g');
+		assert.strictEqual(viewModels[4].outputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[4].outputSwimlanes[1].id, 'd');
+		assert.strictEqual(viewModels[4].outputSwimlanes[1].color, colorRegistry[1]);
+		assert.strictEqual(viewModels[4].outputSwimlanes[2].id, 'g');
+		assert.strictEqual(viewModels[4].outputSwimlanes[2].color, colorRegistry[2]);
+
+		// node d
+		assert.strictEqual(viewModels[5].inputSwimlanes.length, 3);
+		assert.strictEqual(viewModels[5].inputSwimlanes[0].id, 'g');
+		assert.strictEqual(viewModels[5].inputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[5].inputSwimlanes[1].id, 'd');
+		assert.strictEqual(viewModels[5].inputSwimlanes[1].color, colorRegistry[1]);
+		assert.strictEqual(viewModels[5].inputSwimlanes[2].id, 'g');
+		assert.strictEqual(viewModels[5].inputSwimlanes[2].color, colorRegistry[2]);
+
+		assert.strictEqual(viewModels[5].outputSwimlanes.length, 3);
+		assert.strictEqual(viewModels[5].outputSwimlanes[0].id, 'g');
+		assert.strictEqual(viewModels[5].outputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[5].outputSwimlanes[1].id, 'g');
+		assert.strictEqual(viewModels[5].outputSwimlanes[1].color, colorRegistry[1]);
+		assert.strictEqual(viewModels[5].outputSwimlanes[2].id, 'g');
+		assert.strictEqual(viewModels[5].outputSwimlanes[2].color, colorRegistry[2]);
+
+		// node g
+		assert.strictEqual(viewModels[6].inputSwimlanes.length, 3);
+		assert.strictEqual(viewModels[6].inputSwimlanes[0].id, 'g');
+		assert.strictEqual(viewModels[6].inputSwimlanes[0].color, colorRegistry[0]);
+		assert.strictEqual(viewModels[6].inputSwimlanes[1].id, 'g');
+		assert.strictEqual(viewModels[6].inputSwimlanes[1].color, colorRegistry[1]);
+		assert.strictEqual(viewModels[6].inputSwimlanes[2].id, 'g');
+		assert.strictEqual(viewModels[6].inputSwimlanes[2].color, colorRegistry[2]);
+
+		assert.strictEqual(viewModels[6].outputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[6].outputSwimlanes[0].id, 'h');
+		assert.strictEqual(viewModels[6].outputSwimlanes[0].color, colorRegistry[0]);
+	});
+
+	/**
+	 * 	* a(b) [topic]
+	 * 	* b(c)
+	 * 	* c(d) [origin/topic]
+	 * 	* d(e)
+	 * 	* e(f,g)
+	 * 	|\
+	 * 	| * g(h) [origin/main]
+	 */
+	test('graph with color map', () => {
+		const models = [
+			toSCMHistoryItem('a', ['b'], [{ id: 'topic', name: 'topic' }]),
+			toSCMHistoryItem('b', ['c']),
+			toSCMHistoryItem('c', ['d'], [{ id: 'origin/topic', name: 'origin/topic' }]),
+			toSCMHistoryItem('d', ['e']),
+			toSCMHistoryItem('e', ['f', 'g']),
+			toSCMHistoryItem('g', ['h'], [{ id: 'origin/main', name: 'origin/main' }])
+		];
+
+		const colorMap = new Map<string, ColorIdentifier>([
+			['topic', historyItemRefColor],
+			['origin/topic', historyItemRemoteRefColor],
+			['origin/main', historyItemBaseRefColor],
+		]);
+
+		const viewModels = toISCMHistoryItemViewModelArray(models, colorMap);
+
+		assert.strictEqual(viewModels.length, 6);
+
+		// node a
+		assert.strictEqual(viewModels[0].inputSwimlanes.length, 0);
+
+		assert.strictEqual(viewModels[0].outputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[0].outputSwimlanes[0].id, 'b');
+		assert.strictEqual(viewModels[0].outputSwimlanes[0].color, historyItemRefColor);
+
+		// node b
+		assert.strictEqual(viewModels[1].inputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[1].inputSwimlanes[0].id, 'b');
+		assert.strictEqual(viewModels[1].inputSwimlanes[0].color, historyItemRefColor);
+
+		assert.strictEqual(viewModels[1].outputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[1].outputSwimlanes[0].id, 'c');
+		assert.strictEqual(viewModels[1].outputSwimlanes[0].color, historyItemRefColor);
+
+		// node c
+		assert.strictEqual(viewModels[2].inputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[2].inputSwimlanes[0].id, 'c');
+		assert.strictEqual(viewModels[2].inputSwimlanes[0].color, historyItemRefColor);
+
+		assert.strictEqual(viewModels[2].outputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[2].outputSwimlanes[0].id, 'd');
+		assert.strictEqual(viewModels[2].outputSwimlanes[0].color, historyItemRemoteRefColor);
+
+		// node d
+		assert.strictEqual(viewModels[3].inputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[3].inputSwimlanes[0].id, 'd');
+		assert.strictEqual(viewModels[3].inputSwimlanes[0].color, historyItemRemoteRefColor);
+
+		assert.strictEqual(viewModels[3].outputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[3].outputSwimlanes[0].id, 'e');
+		assert.strictEqual(viewModels[3].outputSwimlanes[0].color, historyItemRemoteRefColor);
+
+		// node e
+		assert.strictEqual(viewModels[4].inputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[4].inputSwimlanes[0].id, 'e');
+		assert.strictEqual(viewModels[4].inputSwimlanes[0].color, historyItemRemoteRefColor);
+
+		assert.strictEqual(viewModels[4].outputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[4].outputSwimlanes[0].id, 'f');
+		assert.strictEqual(viewModels[4].outputSwimlanes[0].color, historyItemRemoteRefColor);
+		assert.strictEqual(viewModels[4].outputSwimlanes[1].id, 'g');
+		assert.strictEqual(viewModels[4].outputSwimlanes[1].color, historyItemBaseRefColor);
+
+		// node g
+		assert.strictEqual(viewModels[5].inputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[5].inputSwimlanes[0].id, 'f');
+		assert.strictEqual(viewModels[5].inputSwimlanes[0].color, historyItemRemoteRefColor);
+		assert.strictEqual(viewModels[5].inputSwimlanes[1].id, 'g');
+		assert.strictEqual(viewModels[5].inputSwimlanes[1].color, historyItemBaseRefColor);
+
+		assert.strictEqual(viewModels[5].outputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[5].outputSwimlanes[0].id, 'f');
+		assert.strictEqual(viewModels[5].outputSwimlanes[0].color, historyItemRemoteRefColor);
+		assert.strictEqual(viewModels[5].outputSwimlanes[1].id, 'h');
+		assert.strictEqual(viewModels[5].outputSwimlanes[1].color, historyItemBaseRefColor);
+	});
+});
diff --git a/src/vs/workbench/contrib/scrollLocking/browser/scrollLocking.contribution.ts b/src/vs/workbench/contrib/scrollLocking/browser/scrollLocking.contribution.ts
index ad8bc56733b..6b94e69b4e4 100644
--- a/src/vs/workbench/contrib/scrollLocking/browser/scrollLocking.contribution.ts
+++ b/src/vs/workbench/contrib/scrollLocking/browser/scrollLocking.contribution.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { SyncScroll as ScrollLocking } from 'vs/workbench/contrib/scrollLocking/browser/scrollLocking';
+import { WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { SyncScroll as ScrollLocking } from './scrollLocking.js';
 
 registerWorkbenchContribution2(
 	ScrollLocking.ID,
diff --git a/src/vs/workbench/contrib/scrollLocking/browser/scrollLocking.ts b/src/vs/workbench/contrib/scrollLocking/browser/scrollLocking.ts
index c8e01cc2ef1..35b3076a111 100644
--- a/src/vs/workbench/contrib/scrollLocking/browser/scrollLocking.ts
+++ b/src/vs/workbench/contrib/scrollLocking/browser/scrollLocking.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { localize, localize2 } from 'vs/nls';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { SideBySideEditor } from 'vs/workbench/browser/parts/editor/sideBySideEditor';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IEditorPane, IEditorPaneScrollPosition, isEditorPaneWithScrolling } from 'vs/workbench/common/editor';
-import { ReentrancyBarrier } from 'vs/base/common/controlFlow';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment } from 'vs/workbench/services/statusbar/browser/statusbar';
+import { Disposable, DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { SideBySideEditor } from '../../../browser/parts/editor/sideBySideEditor.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IEditorPane, IEditorPaneScrollPosition, isEditorPaneWithScrolling } from '../../../common/editor.js';
+import { ReentrancyBarrier } from '../../../../base/common/controlFlow.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment } from '../../../services/statusbar/browser/statusbar.js';
 
 export class SyncScroll extends Disposable implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts b/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts
index 74f304ba7a3..9d50072998d 100644
--- a/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts
+++ b/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts
@@ -3,60 +3,60 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/anythingQuickAccess';
-import { IQuickInputButton, IKeyMods, quickPickItemScorerAccessor, QuickPickItemScorerAccessor, IQuickPick, IQuickPickItemWithResource, QuickInputHideReason, IQuickInputService, IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
-import { IPickerQuickAccessItem, PickerQuickAccessProvider, TriggerAction, FastAndSlowPicks, Picks, PicksWithActive } from 'vs/platform/quickinput/browser/pickerQuickAccess';
-import { prepareQuery, IPreparedQuery, compareItemsByFuzzyScore, scoreItemFuzzy, FuzzyScorerCache } from 'vs/base/common/fuzzyScorer';
-import { IFileQueryBuilderOptions, QueryBuilder } from 'vs/workbench/services/search/common/queryBuilder';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { getOutOfWorkspaceEditorResources, extractRangeFromFilter, IWorkbenchSearchConfiguration } from 'vs/workbench/contrib/search/common/search';
-import { ISearchService, ISearchComplete } from 'vs/workbench/services/search/common/search';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { untildify } from 'vs/base/common/labels';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { URI } from 'vs/base/common/uri';
-import { toLocalResource, dirname, basenameOrAuthority } from 'vs/base/common/resources';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IFileService } from 'vs/platform/files/common/files';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { DisposableStore, IDisposable, toDisposable, MutableDisposable, Disposable } from 'vs/base/common/lifecycle';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { getIconClasses } from 'vs/editor/common/services/getIconClasses';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { localize } from 'vs/nls';
-import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IWorkbenchEditorConfiguration, EditorResourceAccessor, isEditorInput } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { Range, IRange } from 'vs/editor/common/core/range';
-import { ThrottledDelayer } from 'vs/base/common/async';
-import { top } from 'vs/base/common/arrays';
-import { FileQueryCacheState } from 'vs/workbench/contrib/search/common/cacheState';
-import { IHistoryService } from 'vs/workbench/services/history/common/history';
-import { IResourceEditorInput, ITextEditorOptions } from 'vs/platform/editor/common/editor';
-import { Schemas } from 'vs/base/common/network';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { ResourceMap } from 'vs/base/common/map';
-import { SymbolsQuickAccessProvider } from 'vs/workbench/contrib/search/browser/symbolsQuickAccess';
-import { AnythingQuickAccessProviderRunOptions, DefaultQuickAccessFilterValue, Extensions, IQuickAccessRegistry } from 'vs/platform/quickinput/common/quickAccess';
-import { PickerEditorState, IWorkbenchQuickAccessConfiguration } from 'vs/workbench/browser/quickaccess';
-import { GotoSymbolQuickAccessProvider } from 'vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { ScrollType, IEditor } from 'vs/editor/common/editorCommon';
-import { Event } from 'vs/base/common/event';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { stripIcons } from 'vs/base/common/iconLabels';
-import { Lazy } from 'vs/base/common/lazy';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { ASK_QUICK_QUESTION_ACTION_ID } from 'vs/workbench/contrib/chat/browser/actions/chatQuickInputActions';
-import { IQuickChatService } from 'vs/workbench/contrib/chat/browser/chat';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ICustomEditorLabelService } from 'vs/workbench/services/editor/common/customEditorLabelService';
+import './media/anythingQuickAccess.css';
+import { IQuickInputButton, IKeyMods, quickPickItemScorerAccessor, QuickPickItemScorerAccessor, IQuickPick, IQuickPickItemWithResource, QuickInputHideReason, IQuickInputService, IQuickPickSeparator } from '../../../../platform/quickinput/common/quickInput.js';
+import { IPickerQuickAccessItem, PickerQuickAccessProvider, TriggerAction, FastAndSlowPicks, Picks, PicksWithActive } from '../../../../platform/quickinput/browser/pickerQuickAccess.js';
+import { prepareQuery, IPreparedQuery, compareItemsByFuzzyScore, scoreItemFuzzy, FuzzyScorerCache } from '../../../../base/common/fuzzyScorer.js';
+import { IFileQueryBuilderOptions, QueryBuilder } from '../../../services/search/common/queryBuilder.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { getOutOfWorkspaceEditorResources, extractRangeFromFilter, IWorkbenchSearchConfiguration } from '../common/search.js';
+import { ISearchService, ISearchComplete } from '../../../services/search/common/search.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { untildify } from '../../../../base/common/labels.js';
+import { IPathService } from '../../../services/path/common/pathService.js';
+import { URI } from '../../../../base/common/uri.js';
+import { toLocalResource, dirname, basenameOrAuthority } from '../../../../base/common/resources.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { DisposableStore, IDisposable, toDisposable, MutableDisposable, Disposable } from '../../../../base/common/lifecycle.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { getIconClasses } from '../../../../editor/common/services/getIconClasses.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { localize } from '../../../../nls.js';
+import { IWorkingCopyService } from '../../../services/workingCopy/common/workingCopyService.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IWorkbenchEditorConfiguration, EditorResourceAccessor, isEditorInput } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from '../../../services/editor/common/editorService.js';
+import { Range, IRange } from '../../../../editor/common/core/range.js';
+import { ThrottledDelayer } from '../../../../base/common/async.js';
+import { top } from '../../../../base/common/arrays.js';
+import { FileQueryCacheState } from '../common/cacheState.js';
+import { IHistoryService } from '../../../services/history/common/history.js';
+import { IResourceEditorInput, ITextEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { SymbolsQuickAccessProvider } from './symbolsQuickAccess.js';
+import { AnythingQuickAccessProviderRunOptions, DefaultQuickAccessFilterValue, Extensions, IQuickAccessRegistry } from '../../../../platform/quickinput/common/quickAccess.js';
+import { PickerEditorState, IWorkbenchQuickAccessConfiguration } from '../../../browser/quickaccess.js';
+import { GotoSymbolQuickAccessProvider } from '../../codeEditor/browser/quickaccess/gotoSymbolQuickAccess.js';
+import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { ScrollType, IEditor } from '../../../../editor/common/editorCommon.js';
+import { Event } from '../../../../base/common/event.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { stripIcons } from '../../../../base/common/iconLabels.js';
+import { Lazy } from '../../../../base/common/lazy.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { ASK_QUICK_QUESTION_ACTION_ID } from '../../chat/browser/actions/chatQuickInputActions.js';
+import { IQuickChatService } from '../../chat/browser/chat.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { ICustomEditorLabelService } from '../../../services/editor/common/customEditorLabelService.js';
 
 interface IAnythingQuickPickItem extends IPickerQuickAccessItem, IQuickPickItemWithResource { }
 
@@ -87,7 +87,7 @@ export class AnythingQuickAccessProvider extends PickerQuickAccessProvider<IAnyt
 
 	private readonly pickState = this._register(new class extends Disposable {
 
-		picker: IQuickPick<IAnythingQuickPickItem> | undefined = undefined;
+		picker: IQuickPick<IAnythingQuickPickItem, { useSeparators: true }> | undefined = undefined;
 
 		editorViewState = this._register(this.instantiationService.createInstance(PickerEditorState));
 
@@ -109,7 +109,7 @@ export class AnythingQuickAccessProvider extends PickerQuickAccessProvider<IAnyt
 			super();
 		}
 
-		set(picker: IQuickPick<IAnythingQuickPickItem>): void {
+		set(picker: IQuickPick<IAnythingQuickPickItem, { useSeparators: true }>): void {
 
 			// Picker for this run
 			this.picker = picker;
@@ -188,7 +188,7 @@ export class AnythingQuickAccessProvider extends PickerQuickAccessProvider<IAnyt
 		};
 	}
 
-	override provide(picker: IQuickPick<IAnythingQuickPickItem>, token: CancellationToken, runOptions?: AnythingQuickAccessProviderRunOptions): IDisposable {
+	override provide(picker: IQuickPick<IAnythingQuickPickItem, { useSeparators: true }>, token: CancellationToken, runOptions?: AnythingQuickAccessProviderRunOptions): IDisposable {
 		const disposables = new DisposableStore();
 
 		// Update the pick state for this run
diff --git a/src/vs/workbench/contrib/search/browser/notebookSearch/notebookSearchContributions.ts b/src/vs/workbench/contrib/search/browser/notebookSearch/notebookSearchContributions.ts
index 2fe6e0d39d0..9d1a15e913b 100644
--- a/src/vs/workbench/contrib/search/browser/notebookSearch/notebookSearchContributions.ts
+++ b/src/vs/workbench/contrib/search/browser/notebookSearch/notebookSearchContributions.ts
@@ -2,9 +2,9 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { INotebookSearchService } from 'vs/workbench/contrib/search/common/notebookSearch';
-import { NotebookSearchService } from 'vs/workbench/contrib/search/browser/notebookSearch/notebookSearchService';
+import { InstantiationType, registerSingleton } from '../../../../../platform/instantiation/common/extensions.js';
+import { INotebookSearchService } from '../../common/notebookSearch.js';
+import { NotebookSearchService } from './notebookSearchService.js';
 
 export function registerContributions(): void {
 	registerSingleton(INotebookSearchService, NotebookSearchService, InstantiationType.Delayed);
diff --git a/src/vs/workbench/contrib/search/browser/notebookSearch/notebookSearchService.ts b/src/vs/workbench/contrib/search/browser/notebookSearch/notebookSearchService.ts
index 4ef1cdae76e..cbac8a05a66 100644
--- a/src/vs/workbench/contrib/search/browser/notebookSearch/notebookSearchService.ts
+++ b/src/vs/workbench/contrib/search/browser/notebookSearch/notebookSearchService.ts
@@ -2,27 +2,27 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { CancellationToken } from 'vs/base/common/cancellation';
-import * as glob from 'vs/base/common/glob';
-import { ResourceSet, ResourceMap } from 'vs/base/common/map';
-import { URI } from 'vs/base/common/uri';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { NotebookEditorWidget } from 'vs/workbench/contrib/notebook/browser/notebookEditorWidget';
-import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
-import { INotebookSearchService } from 'vs/workbench/contrib/search/common/notebookSearch';
-import { INotebookCellMatchWithModel, INotebookFileMatchWithModel, contentMatchesToTextSearchMatches, webviewMatchesToTextSearchMatches } from 'vs/workbench/contrib/search/browser/notebookSearch/searchNotebookHelpers';
-import { ITextQuery, QueryType, ISearchProgressItem, ISearchComplete, ISearchConfigurationProperties, pathIncludedInQuery, ISearchService, IFolderQuery, DEFAULT_MAX_SEARCH_RESULTS } from 'vs/workbench/services/search/common/search';
-import * as arrays from 'vs/base/common/arrays';
-import { isNumber } from 'vs/base/common/types';
-import { IEditorResolverService } from 'vs/workbench/services/editor/common/editorResolverService';
-import { INotebookFileMatchNoModel } from 'vs/workbench/contrib/search/common/searchNotebookHelpers';
-import { INotebookEditorService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorService';
-import { NotebookPriorityInfo } from 'vs/workbench/contrib/search/common/search';
-import { INotebookExclusiveDocumentFilter } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { QueryBuilder } from 'vs/workbench/services/search/common/queryBuilder';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import * as glob from '../../../../../base/common/glob.js';
+import { ResourceSet, ResourceMap } from '../../../../../base/common/map.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { ILogService } from '../../../../../platform/log/common/log.js';
+import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.js';
+import { NotebookEditorWidget } from '../../../notebook/browser/notebookEditorWidget.js';
+import { INotebookService } from '../../../notebook/common/notebookService.js';
+import { INotebookSearchService } from '../../common/notebookSearch.js';
+import { INotebookCellMatchWithModel, INotebookFileMatchWithModel, contentMatchesToTextSearchMatches, webviewMatchesToTextSearchMatches } from './searchNotebookHelpers.js';
+import { ITextQuery, QueryType, ISearchProgressItem, ISearchComplete, ISearchConfigurationProperties, pathIncludedInQuery, ISearchService, IFolderQuery, DEFAULT_MAX_SEARCH_RESULTS } from '../../../../services/search/common/search.js';
+import * as arrays from '../../../../../base/common/arrays.js';
+import { isNumber } from '../../../../../base/common/types.js';
+import { IEditorResolverService } from '../../../../services/editor/common/editorResolverService.js';
+import { INotebookFileMatchNoModel } from '../../common/searchNotebookHelpers.js';
+import { INotebookEditorService } from '../../../notebook/browser/services/notebookEditorService.js';
+import { NotebookPriorityInfo } from '../../common/search.js';
+import { INotebookExclusiveDocumentFilter } from '../../../notebook/common/notebookCommon.js';
+import { QueryBuilder } from '../../../../services/search/common/queryBuilder.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 
 interface IOpenNotebookSearchResults {
 	results: ResourceMap<INotebookFileMatchWithModel | null>;
@@ -117,22 +117,21 @@ export class NotebookSearchService implements INotebookSearchService {
 	}
 
 	private async doesFileExist(includes: string[], folderQueries: IFolderQuery<URI>[], token: CancellationToken): Promise<boolean> {
-		const promises: Promise<void>[] = includes.map(async includePattern => {
+		const promises: Promise<boolean>[] = includes.map(async includePattern => {
 			const query = this.queryBuilder.file(folderQueries.map(e => e.folder), {
 				includePattern: includePattern.startsWith('/') ? includePattern : '**/' + includePattern, // todo: find cleaner way to ensure that globs match all appropriate filetypes
-				exists: true
+				exists: true,
+				onlyFileScheme: true,
 			});
 			return this.searchService.fileSearch(
 				query,
 				token
 			).then((ret) => {
-				if (!ret.limitHit) {
-					throw Error('File not found');
-				}
+				return !!ret.limitHit;
 			});
 		});
 
-		return Promise.any(promises).then(() => true).catch(() => false);
+		return Promise.any(promises);
 	}
 
 	private async getClosedNotebookResults(textQuery: ITextQuery, scannedFiles: ResourceSet, token: CancellationToken): Promise<IClosedNotebookSearchResults> {
diff --git a/src/vs/workbench/contrib/search/browser/notebookSearch/searchNotebookHelpers.ts b/src/vs/workbench/contrib/search/browser/notebookSearch/searchNotebookHelpers.ts
index 1211c0c35b3..4ad4b7e61dd 100644
--- a/src/vs/workbench/contrib/search/browser/notebookSearch/searchNotebookHelpers.ts
+++ b/src/vs/workbench/contrib/search/browser/notebookSearch/searchNotebookHelpers.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { FindMatch } from 'vs/editor/common/model';
-import { IFileMatch, ITextSearchMatch, TextSearchMatch } from 'vs/workbench/services/search/common/search';
-import { Range } from 'vs/editor/common/core/range';
-import { INotebookCellMatchNoModel, INotebookFileMatchNoModel, genericCellMatchesToTextSearchMatches, rawCellPrefix } from 'vs/workbench/contrib/search/common/searchNotebookHelpers';
-import { CellWebviewFindMatch, ICellViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { URI } from 'vs/base/common/uri';
+import { FindMatch } from '../../../../../editor/common/model.js';
+import { IFileMatch, ITextSearchMatch, TextSearchMatch } from '../../../../services/search/common/search.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { INotebookCellMatchNoModel, INotebookFileMatchNoModel, genericCellMatchesToTextSearchMatches, rawCellPrefix } from '../../common/searchNotebookHelpers.js';
+import { CellWebviewFindMatch, ICellViewModel } from '../../../notebook/browser/notebookBrowser.js';
+import { URI } from '../../../../../base/common/uri.js';
 
 export type INotebookCellMatch = INotebookCellMatchWithModel | INotebookCellMatchNoModel;
 export type INotebookFileMatch = INotebookFileMatchWithModel | INotebookFileMatchNoModel;
@@ -52,5 +52,5 @@ export function webviewMatchesToTextSearchMatches(webviewMatches: CellWebviewFin
 					new Range(0, rawMatch.searchPreviewInfo.range.start, 0, rawMatch.searchPreviewInfo.range.end),
 					undefined,
 					rawMatch.index) : undefined
-		).filter((e): e is ITextSearchMatch => !!e);
+		).filter((e): e is TextSearchMatch => !!e);
 }
diff --git a/src/vs/workbench/contrib/search/browser/patternInputWidget.ts b/src/vs/workbench/contrib/search/browser/patternInputWidget.ts
index d12c8269212..04e908abef1 100644
--- a/src/vs/workbench/contrib/search/browser/patternInputWidget.ts
+++ b/src/vs/workbench/contrib/search/browser/patternInputWidget.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { Toggle } from 'vs/base/browser/ui/toggle/toggle';
-import { IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview';
-import { HistoryInputBox, IInputBoxStyles } from 'vs/base/browser/ui/inputbox/inputBox';
-import { Widget } from 'vs/base/browser/ui/widget';
-import { Codicon } from 'vs/base/common/codicons';
-import { Emitter, Event as CommonEvent } from 'vs/base/common/event';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import * as nls from 'vs/nls';
-import { ContextScopedHistoryInputBox } from 'vs/platform/history/browser/contextScopedHistoryWidget';
-import { showHistoryKeybindingHint } from 'vs/platform/history/browser/historyWidgetKeybindingHint';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { defaultToggleStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
+import * as dom from '../../../../base/browser/dom.js';
+import { IKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { Toggle } from '../../../../base/browser/ui/toggle/toggle.js';
+import { IContextViewProvider } from '../../../../base/browser/ui/contextview/contextview.js';
+import { HistoryInputBox, IInputBoxStyles } from '../../../../base/browser/ui/inputbox/inputBox.js';
+import { Widget } from '../../../../base/browser/ui/widget.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Emitter, Event as CommonEvent } from '../../../../base/common/event.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import * as nls from '../../../../nls.js';
+import { ContextScopedHistoryInputBox } from '../../../../platform/history/browser/contextScopedHistoryWidget.js';
+import { showHistoryKeybindingHint } from '../../../../platform/history/browser/historyWidgetKeybindingHint.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { defaultToggleStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 
 export interface IOptions {
 	placeholder?: string;
diff --git a/src/vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess.ts b/src/vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess.ts
index aa71685ae21..c5f7f4e9651 100644
--- a/src/vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess.ts
+++ b/src/vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess.ts
@@ -2,36 +2,37 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { IMatch } from 'vs/base/common/filters';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { ResourceSet } from 'vs/base/common/map';
-import { basenameOrAuthority, dirname } from 'vs/base/common/resources';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IRange } from 'vs/editor/common/core/range';
-import { localize } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ITextEditorSelection } from 'vs/platform/editor/common/editor';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { WorkbenchCompressibleObjectTree, getSelectionKeyboardEvent } from 'vs/platform/list/browser/listService';
-import { FastAndSlowPicks, IPickerQuickAccessItem, IPickerQuickAccessSeparator, PickerQuickAccessProvider, Picks, TriggerAction } from 'vs/platform/quickinput/browser/pickerQuickAccess';
-import { DefaultQuickAccessFilterValue, IQuickAccessProviderRunOptions } from 'vs/platform/quickinput/common/quickAccess';
-import { IKeyMods, IQuickPick, IQuickPickItem, QuickInputHideReason } from 'vs/platform/quickinput/common/quickInput';
-import { IWorkspaceContextService, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { IWorkbenchEditorConfiguration } from 'vs/workbench/common/editor';
-import { searchDetailsIcon, searchOpenInFileIcon, searchActivityBarIcon } from 'vs/workbench/contrib/search/browser/searchIcons';
-import { FileMatch, Match, RenderableMatch, SearchModel, SearchModelLocation, searchComparer } from 'vs/workbench/contrib/search/browser/searchModel';
-import { SearchView, getEditorSelectionFromMatch } from 'vs/workbench/contrib/search/browser/searchView';
-import { IWorkbenchSearchConfiguration, getOutOfWorkspaceEditorResources } from 'vs/workbench/contrib/search/common/search';
-import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { ITextQueryBuilderOptions, QueryBuilder } from 'vs/workbench/services/search/common/queryBuilder';
-import { IPatternInfo, ISearchComplete, ITextQuery, VIEW_ID } from 'vs/workbench/services/search/common/search';
-import { Event } from 'vs/base/common/event';
-import { PickerEditorState } from 'vs/workbench/browser/quickaccess';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { Sequencer } from 'vs/base/common/async';
-import { URI } from 'vs/base/common/uri';
+import { CancellationToken, CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { IMatch } from '../../../../../base/common/filters.js';
+import { DisposableStore, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { ResourceSet } from '../../../../../base/common/map.js';
+import { basenameOrAuthority, dirname } from '../../../../../base/common/resources.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { IRange } from '../../../../../editor/common/core/range.js';
+import { localize } from '../../../../../nls.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { ITextEditorSelection } from '../../../../../platform/editor/common/editor.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ILabelService } from '../../../../../platform/label/common/label.js';
+import { WorkbenchCompressibleAsyncDataTree, getSelectionKeyboardEvent } from '../../../../../platform/list/browser/listService.js';
+import { FastAndSlowPicks, IPickerQuickAccessItem, IPickerQuickAccessSeparator, PickerQuickAccessProvider, Picks, TriggerAction } from '../../../../../platform/quickinput/browser/pickerQuickAccess.js';
+import { DefaultQuickAccessFilterValue, IQuickAccessProviderRunOptions } from '../../../../../platform/quickinput/common/quickAccess.js';
+import { IKeyMods, IQuickPick, IQuickPickItem, QuickInputButtonLocation, QuickInputHideReason } from '../../../../../platform/quickinput/common/quickInput.js';
+import { IWorkspaceContextService, IWorkspaceFolder } from '../../../../../platform/workspace/common/workspace.js';
+import { IWorkbenchEditorConfiguration } from '../../../../common/editor.js';
+import { searchDetailsIcon, searchOpenInFileIcon, searchActivityBarIcon } from '../searchIcons.js';
+import { FileMatch, Match, RenderableMatch, SearchModel, SearchModelLocation, SearchResult, searchComparer } from '../searchModel.js';
+import { SearchView, getEditorSelectionFromMatch } from '../searchView.js';
+import { IWorkbenchSearchConfiguration, getOutOfWorkspaceEditorResources } from '../../common/search.js';
+import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } from '../../../../services/editor/common/editorService.js';
+import { ITextQueryBuilderOptions, QueryBuilder } from '../../../../services/search/common/queryBuilder.js';
+import { IPatternInfo, ISearchComplete, ITextQuery, VIEW_ID } from '../../../../services/search/common/search.js';
+import { Event } from '../../../../../base/common/event.js';
+import { PickerEditorState } from '../../../../browser/quickaccess.js';
+import { IViewsService } from '../../../../services/views/common/viewsService.js';
+import { Sequencer } from '../../../../../base/common/async.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
 
 export const TEXT_SEARCH_QUICK_ACCESS_PREFIX = '%';
 
@@ -99,17 +100,20 @@ export class TextSearchQuickAccess extends PickerQuickAccessProvider<ITextSearch
 		super.dispose();
 	}
 
-	override provide(picker: IQuickPick<ITextSearchQuickAccessItem>, token: CancellationToken, runOptions?: IQuickAccessProviderRunOptions): IDisposable {
+	override provide(picker: IQuickPick<ITextSearchQuickAccessItem, { useSeparators: true }>, token: CancellationToken, runOptions?: IQuickAccessProviderRunOptions): IDisposable {
 		const disposables = new DisposableStore();
 		if (TEXT_SEARCH_QUICK_ACCESS_PREFIX.length < picker.value.length) {
 			picker.valueSelection = [TEXT_SEARCH_QUICK_ACCESS_PREFIX.length, picker.value.length];
 		}
-		picker.customButton = true;
-		picker.customLabel = '$(go-to-search)';
+		picker.buttons = [{
+			location: QuickInputButtonLocation.Inline,
+			iconClass: ThemeIcon.asClassName(Codicon.goToSearch),
+			tooltip: localize('goToSearch', "See in Search Panel")
+		}];
 		this.editorViewState.reset();
-		disposables.add(picker.onDidCustom(() => {
+		disposables.add(picker.onDidTriggerButton(async () => {
 			if (this.searchModel.searchResult.count() > 0) {
-				this.moveToSearchViewlet(undefined);
+				await this.moveToSearchViewlet(undefined);
 			} else {
 				this._viewsService.openView(VIEW_ID, true);
 			}
@@ -196,25 +200,25 @@ export class TextSearchQuickAccess extends PickerQuickAccessProvider<ITextSearch
 			this.currentAsyncSearch = result.asyncResults;
 			await result.asyncResults;
 			const syncResultURIs = new ResourceSet(result.syncResults.map(e => e.resource));
-			return this.searchModel.searchResult.matches().filter(e => !syncResultURIs.has(e.resource));
+			return this.searchModel.searchResult.matches(false).filter(e => !syncResultURIs.has(e.resource));
 		};
 		return {
-			syncResults: this.searchModel.searchResult.matches(),
+			syncResults: this.searchModel.searchResult.matches(false),
 			asyncResults: getAsyncResults()
 		};
 	}
 
-	private moveToSearchViewlet(currentElem: RenderableMatch | undefined) {
+	private async moveToSearchViewlet(currentElem: RenderableMatch | undefined) {
 		// this function takes this._searchModel and moves it to the search viewlet's search model.
 		// then, this._searchModel will construct a new (empty) SearchModel.
 		this._viewsService.openView(VIEW_ID, false);
 		const viewlet: SearchView | undefined = this._viewsService.getActiveViewWithId(VIEW_ID) as SearchView;
-		viewlet.replaceSearchModel(this.searchModel, this.currentAsyncSearch);
+		await viewlet.replaceSearchModel(this.searchModel, this.currentAsyncSearch);
 
 		this.searchModel = this._instantiationService.createInstance(SearchModel);
 		this.searchModel.location = SearchModelLocation.QUICK_ACCESS;
 
-		const viewer: WorkbenchCompressibleObjectTree<RenderableMatch> | undefined = viewlet?.getControl();
+		const viewer: WorkbenchCompressibleAsyncDataTree<SearchResult, RenderableMatch> | undefined = viewlet?.getControl();
 		if (currentElem) {
 			viewer.setFocus([currentElem], getSelectionKeyboardEvent());
 			viewer.setSelection([currentElem], getSelectionKeyboardEvent());
@@ -251,7 +255,7 @@ export class TextSearchQuickAccess extends PickerQuickAccessProvider<ITextSearch
 					label: localize('QuickSearchSeeMoreFiles', "See More Files"),
 					iconClass: ThemeIcon.asClassName(searchDetailsIcon),
 					accept: async () => {
-						this.moveToSearchViewlet(matches[limit]);
+						await this.moveToSearchViewlet(matches[limit]);
 					}
 				});
 				break;
@@ -286,7 +290,7 @@ export class TextSearchQuickAccess extends PickerQuickAccessProvider<ITextSearch
 						label: localize('QuickSearchMore', "More"),
 						iconClass: ThemeIcon.asClassName(searchDetailsIcon),
 						accept: async () => {
-							this.moveToSearchViewlet(element);
+							await this.moveToSearchViewlet(element);
 						}
 					});
 					break;
@@ -316,8 +320,8 @@ export class TextSearchQuickAccess extends PickerQuickAccessProvider<ITextSearch
 							forcePinned: event.inBackground
 						});
 					},
-					trigger: (): TriggerAction => {
-						this.moveToSearchViewlet(element);
+					trigger: async (): Promise<TriggerAction> => {
+						await this.moveToSearchViewlet(element);
 						return TriggerAction.CLOSE_PICKER;
 					},
 					match: element
diff --git a/src/vs/workbench/contrib/search/browser/replace.ts b/src/vs/workbench/contrib/search/browser/replace.ts
index 4c9949259ec..baaec2924d5 100644
--- a/src/vs/workbench/contrib/search/browser/replace.ts
+++ b/src/vs/workbench/contrib/search/browser/replace.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Match, FileMatch, FileMatchOrMatch } from 'vs/workbench/contrib/search/browser/searchModel';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IProgress, IProgressStep } from 'vs/platform/progress/common/progress';
+import { Match, FileMatch, FileMatchOrMatch } from './searchModel.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IProgress, IProgressStep } from '../../../../platform/progress/common/progress.js';
 
 export const IReplaceService = createDecorator<IReplaceService>('replaceService');
 
diff --git a/src/vs/workbench/contrib/search/browser/replaceContributions.ts b/src/vs/workbench/contrib/search/browser/replaceContributions.ts
index f129a5bfc47..c8f9d11c00e 100644
--- a/src/vs/workbench/contrib/search/browser/replaceContributions.ts
+++ b/src/vs/workbench/contrib/search/browser/replaceContributions.ts
@@ -2,10 +2,10 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IReplaceService } from 'vs/workbench/contrib/search/browser/replace';
-import { ReplaceService, ReplacePreviewContentProvider } from 'vs/workbench/contrib/search/browser/replaceService';
-import { WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IReplaceService } from './replace.js';
+import { ReplaceService, ReplacePreviewContentProvider } from './replaceService.js';
+import { WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
 
 export function registerContributions(): void {
 	registerSingleton(IReplaceService, ReplaceService, InstantiationType.Delayed);
diff --git a/src/vs/workbench/contrib/search/browser/replaceService.ts b/src/vs/workbench/contrib/search/browser/replaceService.ts
index 186983b5a8a..8808c8cab92 100644
--- a/src/vs/workbench/contrib/search/browser/replaceService.ts
+++ b/src/vs/workbench/contrib/search/browser/replaceService.ts
@@ -3,32 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { URI } from 'vs/base/common/uri';
-import * as network from 'vs/base/common/network';
-import { Disposable, IReference } from 'vs/base/common/lifecycle';
-import { IReplaceService } from 'vs/workbench/contrib/search/browser/replace';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { Match, FileMatch, FileMatchOrMatch, ISearchViewModelWorkbenchService, MatchInNotebook } from 'vs/workbench/contrib/search/browser/searchModel';
-import { IProgress, IProgressStep } from 'vs/platform/progress/common/progress';
-import { ITextModelService, ITextModelContentProvider } from 'vs/editor/common/services/resolverService';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { ScrollType } from 'vs/editor/common/editorCommon';
-import { ITextModel } from 'vs/editor/common/model';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { createTextBufferFactoryFromSnapshot } from 'vs/editor/common/model/textModel';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { IBulkEditService, ResourceTextEdit } from 'vs/editor/browser/services/bulkEditService';
-import { Range } from 'vs/editor/common/core/range';
-import { EditOperation, ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { dirname } from 'vs/base/common/resources';
-import { Promises } from 'vs/base/common/async';
-import { SaveSourceRegistry } from 'vs/workbench/common/editor';
-import { CellUri, IResolvedNotebookEditorModel } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotebookEditorModelResolverService } from 'vs/workbench/contrib/notebook/common/notebookEditorModelResolverService';
+import * as nls from '../../../../nls.js';
+import { URI } from '../../../../base/common/uri.js';
+import * as network from '../../../../base/common/network.js';
+import { Disposable, IReference } from '../../../../base/common/lifecycle.js';
+import { IReplaceService } from './replace.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { Match, FileMatch, FileMatchOrMatch, ISearchViewModelWorkbenchService, MatchInNotebook } from './searchModel.js';
+import { IProgress, IProgressStep } from '../../../../platform/progress/common/progress.js';
+import { ITextModelService, ITextModelContentProvider } from '../../../../editor/common/services/resolverService.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { ScrollType } from '../../../../editor/common/editorCommon.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { createTextBufferFactoryFromSnapshot } from '../../../../editor/common/model/textModel.js';
+import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
+import { IBulkEditService, ResourceTextEdit } from '../../../../editor/browser/services/bulkEditService.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { EditOperation, ISingleEditOperation } from '../../../../editor/common/core/editOperation.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { dirname } from '../../../../base/common/resources.js';
+import { Promises } from '../../../../base/common/async.js';
+import { SaveSourceRegistry } from '../../../common/editor.js';
+import { CellUri, IResolvedNotebookEditorModel } from '../../notebook/common/notebookCommon.js';
+import { INotebookEditorModelResolverService } from '../../notebook/common/notebookEditorModelResolverService.js';
 
 const REPLACE_PREVIEW = 'replacePreview';
 
@@ -72,7 +72,7 @@ class ReplacePreviewModel extends Disposable {
 
 	async resolve(replacePreviewUri: URI): Promise<ITextModel> {
 		const fileResource = toFileResource(replacePreviewUri);
-		const fileMatch = <FileMatch>this.searchWorkbenchService.searchModel.searchResult.matches().filter(match => match.resource.toString() === fileResource.toString())[0];
+		const fileMatch = <FileMatch>this.searchWorkbenchService.searchModel.searchResult.matches(false).filter(match => match.resource.toString() === fileResource.toString())[0];
 		const ref = this._register(await this.textModelResolverService.createModelReference(fileResource));
 		const sourceModel = ref.object.textEditorModel;
 		const sourceModelLanguageId = sourceModel.getLanguageId();
@@ -200,15 +200,15 @@ export class ReplaceService implements IReplaceService {
 		const edits: ResourceTextEdit[] = [];
 
 		if (arg instanceof Match) {
-			if (arg instanceof MatchInNotebook) {
-				if (!arg.isReadonly()) {
+			if (!arg.isReadonly()) {
+				if (arg instanceof MatchInNotebook) {
 					// only apply edits if it's not a webview match, since webview matches are read-only
 					const match = <MatchInNotebook>arg;
 					edits.push(this.createEdit(match, match.replaceString, match.cell?.uri));
+				} else {
+					const match = <Match>arg;
+					edits.push(this.createEdit(match, match.replaceString, resource));
 				}
-			} else {
-				const match = <Match>arg;
-				edits.push(this.createEdit(match, match.replaceString, resource));
 			}
 		}
 
diff --git a/src/vs/workbench/contrib/search/browser/search.contribution.ts b/src/vs/workbench/contrib/search/browser/search.contribution.ts
index 1da6d744da9..d81f0cf5273 100644
--- a/src/vs/workbench/contrib/search/browser/search.contribution.ts
+++ b/src/vs/workbench/contrib/search/browser/search.contribution.ts
@@ -3,44 +3,44 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import * as platform from 'vs/base/common/platform';
-import { AbstractGotoLineQuickAccessProvider } from 'vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess';
-import * as nls from 'vs/nls';
-import { ConfigurationScope, Extensions as ConfigurationExtensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { Extensions as QuickAccessExtensions, IQuickAccessRegistry } from 'vs/platform/quickinput/common/quickAccess';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
-import { defaultQuickAccessContextKeyValue } from 'vs/workbench/browser/quickaccess';
-import { Extensions as ViewExtensions, IViewContainersRegistry, IViewDescriptor, IViewsRegistry, ViewContainerLocation } from 'vs/workbench/common/views';
-import { GotoSymbolQuickAccessProvider } from 'vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess';
-import { AnythingQuickAccessProvider } from 'vs/workbench/contrib/search/browser/anythingQuickAccess';
-import { registerContributions as replaceContributions } from 'vs/workbench/contrib/search/browser/replaceContributions';
-import { registerContributions as notebookSearchContributions } from 'vs/workbench/contrib/search/browser/notebookSearch/notebookSearchContributions';
-import { searchViewIcon } from 'vs/workbench/contrib/search/browser/searchIcons';
-import { SearchView } from 'vs/workbench/contrib/search/browser/searchView';
-import { registerContributions as searchWidgetContributions } from 'vs/workbench/contrib/search/browser/searchWidget';
-import { SymbolsQuickAccessProvider } from 'vs/workbench/contrib/search/browser/symbolsQuickAccess';
-import { ISearchHistoryService, SearchHistoryService } from 'vs/workbench/contrib/search/common/searchHistoryService';
-import { ISearchViewModelWorkbenchService, SearchViewModelWorkbenchService } from 'vs/workbench/contrib/search/browser/searchModel';
-import { SearchSortOrder, SEARCH_EXCLUDE_CONFIG, VIEWLET_ID, ViewMode, VIEW_ID, DEFAULT_MAX_SEARCH_RESULTS } from 'vs/workbench/services/search/common/search';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { assertType } from 'vs/base/common/types';
-import { getWorkspaceSymbols, IWorkspaceSymbol } from 'vs/workbench/contrib/search/common/search';
-import * as Constants from 'vs/workbench/contrib/search/common/constants';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import * as platform from '../../../../base/common/platform.js';
+import { AbstractGotoLineQuickAccessProvider } from '../../../../editor/contrib/quickAccess/browser/gotoLineQuickAccess.js';
+import * as nls from '../../../../nls.js';
+import { ConfigurationScope, Extensions as ConfigurationExtensions, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { Extensions as QuickAccessExtensions, IQuickAccessRegistry } from '../../../../platform/quickinput/common/quickAccess.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { ViewPaneContainer } from '../../../browser/parts/views/viewPaneContainer.js';
+import { defaultQuickAccessContextKeyValue } from '../../../browser/quickaccess.js';
+import { Extensions as ViewExtensions, IViewContainersRegistry, IViewDescriptor, IViewsRegistry, ViewContainerLocation } from '../../../common/views.js';
+import { GotoSymbolQuickAccessProvider } from '../../codeEditor/browser/quickaccess/gotoSymbolQuickAccess.js';
+import { AnythingQuickAccessProvider } from './anythingQuickAccess.js';
+import { registerContributions as replaceContributions } from './replaceContributions.js';
+import { registerContributions as notebookSearchContributions } from './notebookSearch/notebookSearchContributions.js';
+import { searchViewIcon } from './searchIcons.js';
+import { SearchView } from './searchView.js';
+import { registerContributions as searchWidgetContributions } from './searchWidget.js';
+import { SymbolsQuickAccessProvider } from './symbolsQuickAccess.js';
+import { ISearchHistoryService, SearchHistoryService } from '../common/searchHistoryService.js';
+import { ISearchViewModelWorkbenchService, SearchViewModelWorkbenchService } from './searchModel.js';
+import { SearchSortOrder, SEARCH_EXCLUDE_CONFIG, VIEWLET_ID, ViewMode, VIEW_ID, DEFAULT_MAX_SEARCH_RESULTS } from '../../../services/search/common/search.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { assertType } from '../../../../base/common/types.js';
+import { getWorkspaceSymbols, IWorkspaceSymbol } from '../common/search.js';
+import * as Constants from '../common/constants.js';
 
-import 'vs/workbench/contrib/search/browser/searchActionsCopy';
-import 'vs/workbench/contrib/search/browser/searchActionsFind';
-import 'vs/workbench/contrib/search/browser/searchActionsNav';
-import 'vs/workbench/contrib/search/browser/searchActionsRemoveReplace';
-import 'vs/workbench/contrib/search/browser/searchActionsSymbol';
-import 'vs/workbench/contrib/search/browser/searchActionsTopBar';
-import 'vs/workbench/contrib/search/browser/searchActionsTextQuickAccess';
-import { TEXT_SEARCH_QUICK_ACCESS_PREFIX, TextSearchQuickAccess } from 'vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess';
-import { Extensions, IConfigurationMigrationRegistry } from 'vs/workbench/common/configuration';
+import './searchActionsCopy.js';
+import './searchActionsFind.js';
+import './searchActionsNav.js';
+import './searchActionsRemoveReplace.js';
+import './searchActionsSymbol.js';
+import './searchActionsTopBar.js';
+import './searchActionsTextQuickAccess.js';
+import { TEXT_SEARCH_QUICK_ACCESS_PREFIX, TextSearchQuickAccess } from './quickTextSearch/textSearchQuickAccess.js';
+import { Extensions, IConfigurationMigrationRegistry } from '../../../common/configuration.js';
 
 registerSingleton(ISearchViewModelWorkbenchService, SearchViewModelWorkbenchService, InstantiationType.Delayed);
 registerSingleton(ISearchHistoryService, SearchHistoryService, InstantiationType.Delayed);
@@ -334,6 +334,11 @@ configurationRegistry.registerConfiguration({
 			default: 1,
 			markdownDescription: nls.localize('search.searchEditor.defaultNumberOfContextLines', "The default number of surrounding context lines to use when creating new Search Editors. If using `#search.searchEditor.reusePriorSearchConfiguration#`, this can be set to `null` (empty) to use the prior Search Editor's configuration.")
 		},
+		'search.searchEditor.focusResultsOnSearch': {
+			type: 'boolean',
+			default: false,
+			markdownDescription: nls.localize('search.searchEditor.focusResultsOnSearch', "When a search is triggered, focus the Search Editor results instead of the Search Editor input.")
+		},
 		'search.sortOrder': {
 			type: 'string',
 			enum: [SearchSortOrder.Default, SearchSortOrder.FileNames, SearchSortOrder.Type, SearchSortOrder.Modified, SearchSortOrder.CountDescending, SearchSortOrder.CountAscending],
diff --git a/src/vs/workbench/contrib/search/browser/searchActionsBase.ts b/src/vs/workbench/contrib/search/browser/searchActionsBase.ts
index 20ae11b9dab..04a57c0212a 100644
--- a/src/vs/workbench/contrib/search/browser/searchActionsBase.ts
+++ b/src/vs/workbench/contrib/search/browser/searchActionsBase.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { ResolvedKeybinding } from 'vs/base/common/keybindings';
-import * as nls from 'vs/nls';
-import { WorkbenchCompressibleObjectTree } from 'vs/platform/list/browser/listService';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { SearchView } from 'vs/workbench/contrib/search/browser/searchView';
-import { FileMatch, FolderMatch, Match, RenderableMatch, searchComparer } from 'vs/workbench/contrib/search/browser/searchModel';
-import { ISearchConfigurationProperties, VIEW_ID } from 'vs/workbench/services/search/common/search';
+import * as DOM from '../../../../base/browser/dom.js';
+import { ResolvedKeybinding } from '../../../../base/common/keybindings.js';
+import * as nls from '../../../../nls.js';
+import { WorkbenchCompressibleAsyncDataTree } from '../../../../platform/list/browser/listService.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { SearchView } from './searchView.js';
+import { FileMatch, FolderMatch, Match, RenderableMatch, searchComparer, SearchResult } from './searchModel.js';
+import { ISearchConfigurationProperties, VIEW_ID } from '../../../services/search/common/search.js';
 
 export const category = nls.localize2('search', "Search");
 
@@ -27,7 +27,7 @@ export function getSearchView(viewsService: IViewsService): SearchView | undefin
 	return viewsService.getActiveViewWithId(VIEW_ID) as SearchView;
 }
 
-export function getElementsToOperateOn(viewer: WorkbenchCompressibleObjectTree<RenderableMatch, void>, currElement: RenderableMatch | undefined, sortConfig: ISearchConfigurationProperties): RenderableMatch[] {
+export function getElementsToOperateOn(viewer: WorkbenchCompressibleAsyncDataTree<SearchResult, RenderableMatch, void>, currElement: RenderableMatch | undefined, sortConfig: ISearchConfigurationProperties): RenderableMatch[] {
 	let elements: RenderableMatch[] = viewer.getSelection().filter((x): x is RenderableMatch => x !== null).sort((a, b) => searchComparer(a, b, sortConfig.sortOrder));
 
 	// if selection doesn't include multiple elements, just return current focus element.
diff --git a/src/vs/workbench/contrib/search/browser/searchActionsCopy.ts b/src/vs/workbench/contrib/search/browser/searchActionsCopy.ts
index 1d1c64f6ca5..b1c6a03eb62 100644
--- a/src/vs/workbench/contrib/search/browser/searchActionsCopy.ts
+++ b/src/vs/workbench/contrib/search/browser/searchActionsCopy.ts
@@ -2,18 +2,18 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import * as nls from 'vs/nls';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import * as Constants from 'vs/workbench/contrib/search/common/constants';
-import { FileMatch, FolderMatch, FolderMatchWithResource, Match, RenderableMatch, searchMatchComparer } from 'vs/workbench/contrib/search/browser/searchModel';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { category, getSearchView } from 'vs/workbench/contrib/search/browser/searchActionsBase';
-import { isWindows } from 'vs/base/common/platform';
+import * as nls from '../../../../nls.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import * as Constants from '../common/constants.js';
+import { FileMatch, FolderMatch, FolderMatchWithResource, Match, RenderableMatch, searchMatchComparer } from './searchModel.js';
+import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { category, getSearchView } from './searchActionsBase.js';
+import { isWindows } from '../../../../base/common/platform.js';
 
 //#region Actions
 registerAction2(class CopyMatchCommandAction extends Action2 {
diff --git a/src/vs/workbench/contrib/search/browser/searchActionsFind.ts b/src/vs/workbench/contrib/search/browser/searchActionsFind.ts
index a16f5a19f44..11a124ad323 100644
--- a/src/vs/workbench/contrib/search/browser/searchActionsFind.ts
+++ b/src/vs/workbench/contrib/search/browser/searchActionsFind.ts
@@ -2,38 +2,38 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { dirname } from 'vs/base/common/resources';
-import * as nls from 'vs/nls';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IListService, WorkbenchCompressibleObjectTree } from 'vs/platform/list/browser/listService';
-import { ViewContainerLocation } from 'vs/workbench/common/views';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import * as Constants from 'vs/workbench/contrib/search/common/constants';
-import * as SearchEditorConstants from 'vs/workbench/contrib/searchEditor/browser/constants';
-import { FileMatch, FolderMatchWithResource, Match, RenderableMatch } from 'vs/workbench/contrib/search/browser/searchModel';
-import { OpenSearchEditorArgs } from 'vs/workbench/contrib/searchEditor/browser/searchEditor.contribution';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ISearchConfiguration, ISearchConfigurationProperties } from 'vs/workbench/services/search/common/search';
-import { URI } from 'vs/base/common/uri';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { resolveResourcesForSearchIncludes } from 'vs/workbench/services/search/common/queryBuilder';
-import { getMultiSelectedResources, IExplorerService } from 'vs/workbench/contrib/files/browser/files';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { ExplorerFolderContext, ExplorerRootContext, FilesExplorerFocusCondition, VIEWLET_ID as VIEWLET_ID_FILES } from 'vs/workbench/contrib/files/common/files';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { ExplorerViewPaneContainer } from 'vs/workbench/contrib/files/browser/explorerViewlet';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { category, getElementsToOperateOn, getSearchView, openSearchView } from 'vs/workbench/contrib/search/browser/searchActionsBase';
-import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
-import { IHistoryService } from 'vs/workbench/services/history/common/history';
-import { Schemas } from 'vs/base/common/network';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
+import { dirname } from '../../../../base/common/resources.js';
+import * as nls from '../../../../nls.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IListService, WorkbenchCompressibleAsyncDataTree } from '../../../../platform/list/browser/listService.js';
+import { ViewContainerLocation } from '../../../common/views.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import * as Constants from '../common/constants.js';
+import * as SearchEditorConstants from '../../searchEditor/browser/constants.js';
+import { FileMatch, FolderMatchWithResource, Match, RenderableMatch, SearchResult } from './searchModel.js';
+import { OpenSearchEditorArgs } from '../../searchEditor/browser/searchEditor.contribution.js';
+import { ISearchConfiguration, ISearchConfigurationProperties } from '../../../services/search/common/search.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { resolveResourcesForSearchIncludes } from '../../../services/search/common/queryBuilder.js';
+import { getMultiSelectedResources, IExplorerService } from '../../files/browser/files.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { ExplorerFolderContext, ExplorerRootContext, FilesExplorerFocusCondition, VIEWLET_ID as VIEWLET_ID_FILES } from '../../files/common/files.js';
+import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.js';
+import { ExplorerViewPaneContainer } from '../../files/browser/explorerViewlet.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { category, getElementsToOperateOn, getSearchView, openSearchView } from './searchActionsBase.js';
+import { IConfigurationResolverService } from '../../../services/configurationResolver/common/configurationResolver.js';
+import { IHistoryService } from '../../../services/history/common/history.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
 
 
 //#region Interfaces
@@ -99,8 +99,8 @@ registerAction2(class ExpandSelectedTreeCommandAction extends Action2 {
 		});
 	}
 
-	override run(accessor: any) {
-		expandSelectSubtree(accessor);
+	override async run(accessor: any) {
+		return expandSelectSubtree(accessor);
 	}
 });
 
@@ -298,18 +298,17 @@ registerAction2(class FindInWorkspaceAction extends Action2 {
 });
 
 //#region Helpers
-function expandSelectSubtree(accessor: ServicesAccessor) {
+async function expandSelectSubtree(accessor: ServicesAccessor) {
 	const viewsService = accessor.get(IViewsService);
 	const searchView = getSearchView(viewsService);
 	if (searchView) {
 		const viewer = searchView.getControl();
 		const selected = viewer.getFocus()[0];
-		viewer.expand(selected, true);
+		await viewer.expand(selected, true);
 	}
 }
 
 async function searchWithFolderCommand(accessor: ServicesAccessor, isFromExplorer: boolean, isIncludes: boolean, resource?: URI, folderMatch?: FolderMatchWithResource) {
-	const listService = accessor.get(IListService);
 	const fileService = accessor.get(IFileService);
 	const viewsService = accessor.get(IViewsService);
 	const contextService = accessor.get(IWorkspaceContextService);
@@ -320,9 +319,9 @@ async function searchWithFolderCommand(accessor: ServicesAccessor, isFromExplore
 	let resources: URI[];
 
 	if (isFromExplorer) {
-		resources = getMultiSelectedResources(resource, listService, accessor.get(IEditorService), accessor.get(IEditorGroupsService), accessor.get(IExplorerService));
+		resources = getMultiSelectedResources(resource, accessor.get(IListService), accessor.get(IEditorService), accessor.get(IEditorGroupsService), accessor.get(IExplorerService));
 	} else {
-		const searchView = getSearchView(accessor.get(IViewsService));
+		const searchView = getSearchView(viewsService);
 		if (!searchView) {
 			return;
 		}
@@ -367,7 +366,7 @@ async function searchWithFolderCommand(accessor: ServicesAccessor, isFromExplore
 	}
 }
 
-function getMultiSelectedSearchResources(viewer: WorkbenchCompressibleObjectTree<RenderableMatch, void>, currElement: RenderableMatch | undefined, sortConfig: ISearchConfigurationProperties): URI[] {
+function getMultiSelectedSearchResources(viewer: WorkbenchCompressibleAsyncDataTree<SearchResult, RenderableMatch, void>, currElement: RenderableMatch | undefined, sortConfig: ISearchConfigurationProperties): URI[] {
 	return getElementsToOperateOn(viewer, currElement, sortConfig)
 		.map((renderableMatch) => ((renderableMatch instanceof Match) ? null : renderableMatch.resource))
 		.filter((renderableMatch): renderableMatch is URI => (renderableMatch !== null));
diff --git a/src/vs/workbench/contrib/search/browser/searchActionsNav.ts b/src/vs/workbench/contrib/search/browser/searchActionsNav.ts
index 3ae42ec2945..06e4ed85025 100644
--- a/src/vs/workbench/contrib/search/browser/searchActionsNav.ts
+++ b/src/vs/workbench/contrib/search/browser/searchActionsNav.ts
@@ -3,28 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isMacintosh } from 'vs/base/common/platform';
-import * as nls from 'vs/nls';
-import { ICommandHandler } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { WorkbenchCompressibleObjectTree } from 'vs/platform/list/browser/listService';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import * as Constants from 'vs/workbench/contrib/search/common/constants';
-import * as SearchEditorConstants from 'vs/workbench/contrib/searchEditor/browser/constants';
-import { FileMatchOrMatch, FolderMatch, RenderableMatch } from 'vs/workbench/contrib/search/browser/searchModel';
-import { SearchEditor } from 'vs/workbench/contrib/searchEditor/browser/searchEditor';
-import { SearchEditorInput } from 'vs/workbench/contrib/searchEditor/browser/searchEditorInput';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { assertIsDefined } from 'vs/base/common/types';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { ToggleCaseSensitiveKeybinding, TogglePreserveCaseKeybinding, ToggleRegexKeybinding, ToggleWholeWordKeybinding } from 'vs/editor/contrib/find/browser/findModel';
-import { category, getSearchView, openSearchView } from 'vs/workbench/contrib/search/browser/searchActionsBase';
-import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from 'vs/platform/accessibility/common/accessibility';
-import { getActiveElement } from 'vs/base/browser/dom';
+import { isMacintosh } from '../../../../base/common/platform.js';
+import * as nls from '../../../../nls.js';
+import { ICommandHandler } from '../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { WorkbenchCompressibleAsyncDataTree } from '../../../../platform/list/browser/listService.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import * as Constants from '../common/constants.js';
+import * as SearchEditorConstants from '../../searchEditor/browser/constants.js';
+import { FileMatchOrMatch, FolderMatch, RenderableMatch, SearchResult } from './searchModel.js';
+import { SearchEditor } from '../../searchEditor/browser/searchEditor.js';
+import { SearchEditorInput } from '../../searchEditor/browser/searchEditorInput.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { assertIsDefined } from '../../../../base/common/types.js';
+import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { ToggleCaseSensitiveKeybinding, TogglePreserveCaseKeybinding, ToggleRegexKeybinding, ToggleWholeWordKeybinding } from '../../../../editor/contrib/find/browser/findModel.js';
+import { category, getSearchView, openSearchView } from './searchActionsBase.js';
+import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from '../../../../platform/accessibility/common/accessibility.js';
+import { getActiveElement } from '../../../../base/browser/dom.js';
 
 //#region Actions: Changing Search Input Options
 registerAction2(class ToggleQueryDetailsAction extends Action2 {
@@ -174,7 +174,7 @@ registerAction2(class OpenMatchAction extends Action2 {
 	run(accessor: ServicesAccessor) {
 		const searchView = getSearchView(accessor.get(IViewsService));
 		if (searchView) {
-			const tree: WorkbenchCompressibleObjectTree<RenderableMatch> = searchView.getControl();
+			const tree: WorkbenchCompressibleAsyncDataTree<SearchResult, RenderableMatch> = searchView.getControl();
 			const viewer = searchView.getControl();
 			const focus = tree.getFocus()[0];
 
@@ -206,7 +206,7 @@ registerAction2(class OpenMatchToSideAction extends Action2 {
 	run(accessor: ServicesAccessor) {
 		const searchView = getSearchView(accessor.get(IViewsService));
 		if (searchView) {
-			const tree: WorkbenchCompressibleObjectTree<RenderableMatch> = searchView.getControl();
+			const tree: WorkbenchCompressibleAsyncDataTree<SearchResult, RenderableMatch> = searchView.getControl();
 			searchView.open(<FileMatchOrMatch>tree.getFocus()[0], false, true, true);
 		}
 	}
@@ -229,7 +229,7 @@ registerAction2(class AddCursorsAtSearchResultsAction extends Action2 {
 	override async run(accessor: ServicesAccessor): Promise<any> {
 		const searchView = getSearchView(accessor.get(IViewsService));
 		if (searchView) {
-			const tree: WorkbenchCompressibleObjectTree<RenderableMatch> = searchView.getControl();
+			const tree: WorkbenchCompressibleAsyncDataTree<SearchResult, RenderableMatch> = searchView.getControl();
 			searchView.openEditorWithMultiCursor(<FileMatchOrMatch>tree.getFocus()[0]);
 		}
 	}
@@ -453,9 +453,7 @@ async function focusNextSearchResult(accessor: ServicesAccessor): Promise<any> {
 		return (editorService.activeEditorPane as SearchEditor).focusNextResult();
 	}
 
-	return openSearchView(accessor.get(IViewsService)).then(searchView => {
-		searchView?.selectNextMatch();
-	});
+	return openSearchView(accessor.get(IViewsService)).then(searchView => searchView?.selectNextMatch());
 }
 
 async function focusPreviousSearchResult(accessor: ServicesAccessor): Promise<any> {
@@ -466,9 +464,7 @@ async function focusPreviousSearchResult(accessor: ServicesAccessor): Promise<an
 		return (editorService.activeEditorPane as SearchEditor).focusPreviousResult();
 	}
 
-	return openSearchView(accessor.get(IViewsService)).then(searchView => {
-		searchView?.selectPreviousMatch();
-	});
+	return openSearchView(accessor.get(IViewsService)).then(searchView => searchView?.selectPreviousMatch());
 }
 
 async function findOrReplaceInFiles(accessor: ServicesAccessor, expandSearchReplaceWidget: boolean): Promise<any> {
diff --git a/src/vs/workbench/contrib/search/browser/searchActionsRemoveReplace.ts b/src/vs/workbench/contrib/search/browser/searchActionsRemoveReplace.ts
index fff773645a5..81e7d344b33 100644
--- a/src/vs/workbench/contrib/search/browser/searchActionsRemoveReplace.ts
+++ b/src/vs/workbench/contrib/search/browser/searchActionsRemoveReplace.ts
@@ -3,31 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ITreeNavigator } from 'vs/base/browser/ui/tree/tree';
-import * as nls from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { getSelectionKeyboardEvent, WorkbenchCompressibleObjectTree } from 'vs/platform/list/browser/listService';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { searchRemoveIcon, searchReplaceIcon } from 'vs/workbench/contrib/search/browser/searchIcons';
-import { SearchView } from 'vs/workbench/contrib/search/browser/searchView';
-import * as Constants from 'vs/workbench/contrib/search/common/constants';
-import { IReplaceService } from 'vs/workbench/contrib/search/browser/replace';
-import { arrayContainsElementOrParent, FileMatch, FolderMatch, Match, MatchInNotebook, RenderableMatch, SearchResult } from 'vs/workbench/contrib/search/browser/searchModel';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ISearchConfiguration, ISearchConfigurationProperties } from 'vs/workbench/services/search/common/search';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { category, getElementsToOperateOn, getSearchView, shouldRefocus } from 'vs/workbench/contrib/search/browser/searchActionsBase';
-import { equals } from 'vs/base/common/arrays';
+import { ITreeNavigator } from '../../../../base/browser/ui/tree/tree.js';
+import * as nls from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { getSelectionKeyboardEvent, WorkbenchCompressibleAsyncDataTree } from '../../../../platform/list/browser/listService.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { searchRemoveIcon, searchReplaceIcon } from './searchIcons.js';
+import { SearchView } from './searchView.js';
+import * as Constants from '../common/constants.js';
+import { IReplaceService } from './replace.js';
+import { arrayContainsElementOrParent, FileMatch, FolderMatch, Match, MatchInNotebook, RenderableMatch, SearchResult, TextSearchResult } from './searchModel.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { ISearchConfiguration, ISearchConfigurationProperties } from '../../../services/search/common/search.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { category, getElementsToOperateOn, getSearchView, shouldRefocus } from './searchActionsBase.js';
+import { equals } from '../../../../base/common/arrays.js';
 
 
 //#region Interfaces
 export interface ISearchActionContext {
-	readonly viewer: WorkbenchCompressibleObjectTree<RenderableMatch>;
+	readonly viewer: WorkbenchCompressibleAsyncDataTree<SearchResult, RenderableMatch>;
 	readonly element: RenderableMatch;
 }
 
@@ -81,7 +81,7 @@ registerAction2(class RemoveAction extends Action2 {
 		});
 	}
 
-	run(accessor: ServicesAccessor, context: ISearchActionContext | undefined): void {
+	async run(accessor: ServicesAccessor, context: ISearchActionContext | undefined): Promise<void> {
 		const viewsService = accessor.get(IViewsService);
 		const configurationService = accessor.get(IConfigurationService);
 		const searchView = getSearchView(viewsService);
@@ -113,7 +113,7 @@ registerAction2(class RemoveAction extends Action2 {
 		let nextFocusElement;
 		const shouldRefocusMatch = shouldRefocus(elementsToRemove, focusElement);
 		if (focusElement && shouldRefocusMatch) {
-			nextFocusElement = getElementToFocusAfterRemoved(viewer, focusElement, elementsToRemove);
+			nextFocusElement = await getElementToFocusAfterRemoved(viewer, focusElement, elementsToRemove);
 		}
 
 		const searchResult = searchView.searchResult;
@@ -122,9 +122,11 @@ registerAction2(class RemoveAction extends Action2 {
 			searchResult.batchRemove(elementsToRemove);
 		}
 
+		await searchView.refreshTreePromiseSerializer; // wait for refreshTree to finish
+
 		if (focusElement && shouldRefocusMatch) {
 			if (!nextFocusElement) {
-				nextFocusElement = getLastNodeFromSameType(viewer, focusElement);
+				nextFocusElement = await getLastNodeFromSameType(viewer, focusElement);
 			}
 
 			if (nextFocusElement && !arrayContainsElementOrParent(nextFocusElement, elementsToRemove)) {
@@ -253,13 +255,13 @@ registerAction2(class ReplaceAllInFolderAction extends Action2 {
 
 //#region Helpers
 
-function performReplace(accessor: ServicesAccessor,
-	context: ISearchActionContext | undefined): void {
+async function performReplace(accessor: ServicesAccessor,
+	context: ISearchActionContext | undefined) {
 	const configurationService = accessor.get(IConfigurationService);
 	const viewsService = accessor.get(IViewsService);
 
 	const viewlet: SearchView | undefined = getSearchView(viewsService);
-	const viewer: WorkbenchCompressibleObjectTree<RenderableMatch> | undefined = context?.viewer ?? viewlet?.getControl();
+	const viewer: WorkbenchCompressibleAsyncDataTree<SearchResult, RenderableMatch> | undefined = context?.viewer ?? viewlet?.getControl();
 
 	if (!viewer) {
 		return;
@@ -279,18 +281,20 @@ function performReplace(accessor: ServicesAccessor,
 	}
 	let nextFocusElement;
 	if (focusElement) {
-		nextFocusElement = getElementToFocusAfterRemoved(viewer, focusElement, elementsToReplace);
+		nextFocusElement = await getElementToFocusAfterRemoved(viewer, focusElement, elementsToReplace);
 	}
 
 	const searchResult = viewlet?.searchResult;
 
 	if (searchResult) {
-		searchResult.batchReplace(elementsToReplace);
+		await searchResult.batchReplace(elementsToReplace);
 	}
 
+	await viewlet?.refreshTreePromiseSerializer; // wait for refreshTree to finish
+
 	if (focusElement) {
 		if (!nextFocusElement) {
-			nextFocusElement = getLastNodeFromSameType(viewer, focusElement);
+			nextFocusElement = await getLastNodeFromSameType(viewer, focusElement);
 		}
 
 		if (nextFocusElement) {
@@ -344,9 +348,18 @@ function compareLevels(elem1: RenderableMatch, elem2: RenderableMatch) {
 			return -1;
 		}
 
-	} else {
+	} else if (elem2 instanceof FolderMatch) {
 		// FolderMatch
-		if (elem2 instanceof FolderMatch) {
+		if (elem2 instanceof TextSearchResult) {
+			return -1;
+		} else if (elem2 instanceof FolderMatch) {
+			return 0;
+		} else {
+			return 1;
+		}
+	} else {
+		// textSearchResult
+		if (elem2 instanceof TextSearchResult) {
 			return 0;
 		} else {
 			return 1;
@@ -357,17 +370,17 @@ function compareLevels(elem1: RenderableMatch, elem2: RenderableMatch) {
 /**
  * Returns element to focus after removing the given element
  */
-export function getElementToFocusAfterRemoved(viewer: WorkbenchCompressibleObjectTree<RenderableMatch>, element: RenderableMatch, elementsToRemove: RenderableMatch[]): RenderableMatch | undefined {
+export async function getElementToFocusAfterRemoved(viewer: WorkbenchCompressibleAsyncDataTree<SearchResult, RenderableMatch>, element: RenderableMatch, elementsToRemove: RenderableMatch[]): Promise<RenderableMatch | undefined> {
 	const navigator: ITreeNavigator<any> = viewer.navigate(element);
 	if (element instanceof FolderMatch) {
 		while (!!navigator.next() && (!(navigator.current() instanceof FolderMatch) || arrayContainsElementOrParent(navigator.current(), elementsToRemove))) { }
 	} else if (element instanceof FileMatch) {
 		while (!!navigator.next() && (!(navigator.current() instanceof FileMatch) || arrayContainsElementOrParent(navigator.current(), elementsToRemove))) {
-			viewer.expand(navigator.current());
+			await viewer.expand(navigator.current());
 		}
 	} else {
 		while (navigator.next() && (!(navigator.current() instanceof Match) || arrayContainsElementOrParent(navigator.current(), elementsToRemove))) {
-			viewer.expand(navigator.current());
+			await viewer.expand(navigator.current());
 		}
 	}
 	return navigator.current();
@@ -376,16 +389,24 @@ export function getElementToFocusAfterRemoved(viewer: WorkbenchCompressibleObjec
 /***
  * Finds the last element in the tree with the same type as `element`
  */
-export function getLastNodeFromSameType(viewer: WorkbenchCompressibleObjectTree<RenderableMatch>, element: RenderableMatch): RenderableMatch | undefined {
+export async function getLastNodeFromSameType(viewer: WorkbenchCompressibleAsyncDataTree<SearchResult, RenderableMatch>, element: RenderableMatch): Promise<RenderableMatch | undefined> {
 	let lastElem: RenderableMatch | null = viewer.lastVisibleElement ?? null;
 
 	while (lastElem) {
 		const compareVal = compareLevels(element, lastElem);
 		if (compareVal === -1) {
-			viewer.expand(lastElem);
+			const expanded = await viewer.expand(lastElem);
+			if (!expanded) {
+				return lastElem;
+			}
 			lastElem = viewer.lastVisibleElement;
 		} else if (compareVal === 1) {
-			lastElem = viewer.getParentElement(lastElem);
+			const potentialLastElem = viewer.getParentElement(lastElem);
+			if (potentialLastElem instanceof SearchResult) {
+				break;
+			} else {
+				lastElem = potentialLastElem;
+			}
 		} else {
 			return lastElem;
 		}
diff --git a/src/vs/workbench/contrib/search/browser/searchActionsSymbol.ts b/src/vs/workbench/contrib/search/browser/searchActionsSymbol.ts
index 68c527ade4a..8be969e0788 100644
--- a/src/vs/workbench/contrib/search/browser/searchActionsSymbol.ts
+++ b/src/vs/workbench/contrib/search/browser/searchActionsSymbol.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import * as Constants from 'vs/workbench/contrib/search/common/constants';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
+import * as nls from '../../../../nls.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import * as Constants from '../common/constants.js';
+import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
 
 //#region Actions
 registerAction2(class ShowAllSymbolsAction extends Action2 {
diff --git a/src/vs/workbench/contrib/search/browser/searchActionsTextQuickAccess.ts b/src/vs/workbench/contrib/search/browser/searchActionsTextQuickAccess.ts
index 0c7ef978ced..5098b7d0c70 100644
--- a/src/vs/workbench/contrib/search/browser/searchActionsTextQuickAccess.ts
+++ b/src/vs/workbench/contrib/search/browser/searchActionsTextQuickAccess.ts
@@ -2,18 +2,18 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import * as nls from 'vs/nls';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import * as Constants from 'vs/workbench/contrib/search/common/constants';
-import { RenderableMatch } from 'vs/workbench/contrib/search/browser/searchModel';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { category } from 'vs/workbench/contrib/search/browser/searchActionsBase';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { TEXT_SEARCH_QUICK_ACCESS_PREFIX } from 'vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IEditor } from 'vs/editor/common/editorCommon';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { getSelectionTextFromEditor } from 'vs/workbench/contrib/search/browser/searchView';
+import * as nls from '../../../../nls.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import * as Constants from '../common/constants.js';
+import { RenderableMatch } from './searchModel.js';
+import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { category } from './searchActionsBase.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { TEXT_SEARCH_QUICK_ACCESS_PREFIX } from './quickTextSearch/textSearchQuickAccess.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IEditor } from '../../../../editor/common/editorCommon.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { getSelectionTextFromEditor } from './searchView.js';
 
 registerAction2(class TextSearchQuickAccessAction extends Action2 {
 
diff --git a/src/vs/workbench/contrib/search/browser/searchActionsTopBar.ts b/src/vs/workbench/contrib/search/browser/searchActionsTopBar.ts
index a253cc2738b..64aed442421 100644
--- a/src/vs/workbench/contrib/search/browser/searchActionsTopBar.ts
+++ b/src/vs/workbench/contrib/search/browser/searchActionsTopBar.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { ICommandHandler } from 'vs/platform/commands/common/commands';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { WorkbenchListFocusContextKey } from 'vs/platform/list/browser/listService';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { searchClearIcon, searchCollapseAllIcon, searchExpandAllIcon, searchRefreshIcon, searchShowAsList, searchShowAsTree, searchStopIcon } from 'vs/workbench/contrib/search/browser/searchIcons';
-import * as Constants from 'vs/workbench/contrib/search/common/constants';
-import { ISearchHistoryService } from 'vs/workbench/contrib/search/common/searchHistoryService';
-import { FileMatch, FolderMatch, FolderMatchNoRoot, FolderMatchWorkspaceRoot, Match, SearchResult } from 'vs/workbench/contrib/search/browser/searchModel';
-import { VIEW_ID } from 'vs/workbench/services/search/common/search';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { SearchStateKey, SearchUIState } from 'vs/workbench/contrib/search/common/search';
-import { category, getSearchView } from 'vs/workbench/contrib/search/browser/searchActionsBase';
+import * as nls from '../../../../nls.js';
+import { ICommandHandler } from '../../../../platform/commands/common/commands.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { WorkbenchListFocusContextKey } from '../../../../platform/list/browser/listService.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { searchClearIcon, searchCollapseAllIcon, searchExpandAllIcon, searchRefreshIcon, searchShowAsList, searchShowAsTree, searchStopIcon } from './searchIcons.js';
+import * as Constants from '../common/constants.js';
+import { ISearchHistoryService } from '../common/searchHistoryService.js';
+import { FileMatch, FolderMatch, FolderMatchNoRoot, FolderMatchWorkspaceRoot, Match, SearchResult } from './searchModel.js';
+import { VIEW_ID } from '../../../services/search/common/search.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { SearchStateKey, SearchUIState } from '../common/search.js';
+import { category, getSearchView } from './searchActionsBase.js';
 
 //#region Actions
 registerAction2(class ClearSearchHistoryCommandAction extends Action2 {
@@ -127,7 +127,7 @@ registerAction2(class ExpandAllAction extends Action2 {
 			}]
 		});
 	}
-	run(accessor: ServicesAccessor, ...args: any[]) {
+	async run(accessor: ServicesAccessor, ...args: any[]) {
 		return expandAll(accessor);
 	}
 });
@@ -172,10 +172,10 @@ registerAction2(class ViewAsTreeAction extends Action2 {
 			}]
 		});
 	}
-	run(accessor: ServicesAccessor, ...args: any[]) {
+	async run(accessor: ServicesAccessor, ...args: any[]) {
 		const searchView = getSearchView(accessor.get(IViewsService));
 		if (searchView) {
-			searchView.setTreeView(true);
+			await searchView.setTreeView(true);
 		}
 	}
 });
@@ -197,10 +197,10 @@ registerAction2(class ViewAsListAction extends Action2 {
 			}]
 		});
 	}
-	run(accessor: ServicesAccessor, ...args: any[]) {
+	async run(accessor: ServicesAccessor, ...args: any[]) {
 		const searchView = getSearchView(accessor.get(IViewsService));
 		if (searchView) {
-			searchView.setTreeView(false);
+			await searchView.setTreeView(false);
 		}
 	}
 });
@@ -214,12 +214,21 @@ const clearHistoryCommand: ICommandHandler = accessor => {
 	searchHistoryService.clearHistory();
 };
 
-function expandAll(accessor: ServicesAccessor) {
+async function expandAll(accessor: ServicesAccessor) {
 	const viewsService = accessor.get(IViewsService);
 	const searchView = getSearchView(viewsService);
 	if (searchView) {
 		const viewer = searchView.getControl();
-		viewer.expandAll();
+
+		if (searchView.shouldShowAIResults()) {
+			if (searchView.model.hasAIResults) {
+				viewer.expandAll();
+			} else {
+				await viewer.expand(searchView.model.searchResult.plainTextSearchResult, true);
+			}
+		} else {
+			viewer.expandAll();
+		}
 	}
 }
 
@@ -267,9 +276,9 @@ function collapseDeepestExpandedLevel(accessor: ServicesAccessor) {
 					let nodeToTest = node;
 
 					if (node instanceof FolderMatch) {
-						const compressionStartNode = viewer.getCompressedTreeNode(node).element?.elements[0];
+						const compressionStartNode = viewer.getCompressedTreeNode(node)?.elements[0].element;
 						// Match elements should never be compressed, so !(compressionStartNode instanceof Match) should always be true here
-						nodeToTest = (compressionStartNode && !(compressionStartNode instanceof Match)) ? compressionStartNode : node;
+						nodeToTest = (compressionStartNode && !(compressionStartNode instanceof Match) && !(compressionStartNode instanceof SearchResult)) ? compressionStartNode : node;
 					}
 
 					const immediateParent = nodeToTest.parent();
@@ -296,14 +305,14 @@ function collapseDeepestExpandedLevel(accessor: ServicesAccessor) {
 					let nodeToTest = node;
 
 					if (node instanceof FolderMatch) {
-						const compressionStartNode = viewer.getCompressedTreeNode(node).element?.elements[0];
+						const compressionStartNode = viewer.getCompressedTreeNode(node)?.elements[0].element;
 						// Match elements should never be compressed, so !(compressionStartNode instanceof Match) should always be true here
-						nodeToTest = (compressionStartNode && !(compressionStartNode instanceof Match)) ? compressionStartNode : node;
+						nodeToTest = (compressionStartNode && !(compressionStartNode instanceof Match) && !(compressionStartNode instanceof SearchResult)) ? compressionStartNode : node;
 					}
 					const immediateParent = nodeToTest.parent();
 
 					if (immediateParent instanceof FolderMatchWorkspaceRoot || immediateParent instanceof FolderMatchNoRoot) {
-						if (viewer.hasElement(node)) {
+						if (viewer.hasNode(node)) {
 							viewer.collapse(node, true);
 						} else {
 							viewer.collapseAll();
@@ -318,7 +327,7 @@ function collapseDeepestExpandedLevel(accessor: ServicesAccessor) {
 		const firstFocusParent = viewer.getFocus()[0]?.parent();
 
 		if (firstFocusParent && (firstFocusParent instanceof FolderMatch || firstFocusParent instanceof FileMatch) &&
-			viewer.hasElement(firstFocusParent) && viewer.isCollapsed(firstFocusParent)) {
+			viewer.hasNode(firstFocusParent) && viewer.isCollapsed(firstFocusParent)) {
 			viewer.domFocus();
 			viewer.focusFirst();
 			viewer.setSelection(viewer.getFocus());
diff --git a/src/vs/workbench/contrib/search/browser/searchFindInput.ts b/src/vs/workbench/contrib/search/browser/searchFindInput.ts
index 06d6a7ab240..a823eacea8a 100644
--- a/src/vs/workbench/contrib/search/browser/searchFindInput.ts
+++ b/src/vs/workbench/contrib/search/browser/searchFindInput.ts
@@ -3,30 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview';
-import { IFindInputOptions } from 'vs/base/browser/ui/findinput/findInput';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { ContextScopedFindInput } from 'vs/platform/history/browser/contextScopedHistoryWidget';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { NotebookFindFilters } from 'vs/workbench/contrib/notebook/browser/contrib/find/findFilters';
-import { NotebookFindInputFilterButton } from 'vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget';
-import * as nls from 'vs/nls';
-import { IFindInputToggleOpts } from 'vs/base/browser/ui/findinput/findInputToggles';
-import { Codicon } from 'vs/base/common/codicons';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { Toggle } from 'vs/base/browser/ui/toggle/toggle';
-import { Emitter } from 'vs/base/common/event';
+import { IContextViewProvider } from '../../../../base/browser/ui/contextview/contextview.js';
+import { IFindInputOptions } from '../../../../base/browser/ui/findinput/findInput.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { ContextScopedFindInput } from '../../../../platform/history/browser/contextScopedHistoryWidget.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { NotebookFindFilters } from '../../notebook/browser/contrib/find/findFilters.js';
+import { NotebookFindInputFilterButton } from '../../notebook/browser/contrib/find/notebookFindReplaceWidget.js';
+import * as nls from '../../../../nls.js';
+import { Emitter } from '../../../../base/common/event.js';
 
-const NLS_AI_TOGGLE_LABEL = nls.localize('aiDescription', "Use AI");
 
 export class SearchFindInput extends ContextScopedFindInput {
 	private _findFilter: NotebookFindInputFilterButton;
-	private _aiButton: AIToggle;
 	private _filterChecked: boolean = false;
 	private readonly _onDidChangeAIToggle = this._register(new Emitter<boolean>());
 	public readonly onDidChangeAIToggle = this._onDidChangeAIToggle.event;
-	private shouldNotebookFilterBeVisible: boolean = false; // followed, but overriden by the whether aiToggle is visible
 
 	constructor(
 		container: HTMLElement | null,
@@ -36,7 +29,6 @@ export class SearchFindInput extends ContextScopedFindInput {
 		readonly contextMenuService: IContextMenuService,
 		readonly instantiationService: IInstantiationService,
 		readonly filters: NotebookFindFilters,
-		shouldShowAIButton: boolean, // caller responsible for updating this when it changes,
 		filterStartVisiblitity: boolean
 	) {
 		super(container, contextViewProvider, options, contextKeyService);
@@ -49,41 +41,12 @@ export class SearchFindInput extends ContextScopedFindInput {
 				nls.localize('searchFindInputNotebookFilter.label', "Notebook Find Filters")
 			));
 
-		this._aiButton = this._register(
-			new AIToggle({
-				appendTitle: '',
-				isChecked: false,
-				...options.toggleStyles
-			}));
-
-		this.setAdditionalToggles([this._aiButton]);
 
 		this._updatePadding();
 
 		this.controls.appendChild(this._findFilter.container);
 		this._findFilter.container.classList.add('monaco-custom-toggle');
 		this.filterVisible = filterStartVisiblitity;
-		// ensure that ai button is visible if it should be
-		this.sparkleVisible = shouldShowAIButton;
-
-		this._register(this._aiButton.onChange(() => {
-			if (this.regex) {
-				this.regex.visible = !this._aiButton.checked;
-			}
-			if (this.wholeWords) {
-				this.wholeWords.visible = !this._aiButton.checked;
-			}
-			if (this.caseSensitive) {
-				this.caseSensitive.visible = !this._aiButton.checked;
-			}
-			if (this._aiButton.checked) {
-				this._findFilter.visible = false;
-			} else {
-				this.filterVisible = this.shouldNotebookFilterBeVisible;
-			}
-			this._updatePadding();
-
-		}));
 	}
 
 	private _updatePadding() {
@@ -91,20 +54,10 @@ export class SearchFindInput extends ContextScopedFindInput {
 			(this.caseSensitive?.visible ? this.caseSensitive.width() : 0) +
 			(this.wholeWords?.visible ? this.wholeWords.width() : 0) +
 			(this.regex?.visible ? this.regex.width() : 0) +
-			(this._findFilter.visible ? this._findFilter.width() : 0) +
-			(this._aiButton.visible ? this._aiButton.width() : 0);
-	}
-
-	set sparkleVisible(visible: boolean) {
-		this._aiButton.visible = visible;
-		this._updatePadding();
+			(this._findFilter.visible ? this._findFilter.width() : 0);
 	}
 
 	set filterVisible(visible: boolean) {
-		this.shouldNotebookFilterBeVisible = visible;
-		if (this._aiButton.visible && this._aiButton.checked) {
-			return;
-		}
 		this._findFilter.visible = visible;
 		this.updateFilterStyles();
 		this._updatePadding();
@@ -130,22 +83,4 @@ export class SearchFindInput extends ContextScopedFindInput {
 		// TODO: find a way to express that searching notebook output and markdown preview don't support regex.
 		this._findFilter.applyStyles(this._filterChecked);
 	}
-
-	get isAIEnabled() {
-		return this._aiButton.checked;
-	}
-}
-
-class AIToggle extends Toggle {
-	constructor(opts: IFindInputToggleOpts) {
-		super({
-			icon: Codicon.sparkle,
-			title: NLS_AI_TOGGLE_LABEL + opts.appendTitle,
-			isChecked: opts.isChecked,
-			hoverDelegate: opts.hoverDelegate ?? getDefaultHoverDelegate('element'),
-			inputActiveOptionBorder: opts.inputActiveOptionBorder,
-			inputActiveOptionForeground: opts.inputActiveOptionForeground,
-			inputActiveOptionBackground: opts.inputActiveOptionBackground
-		});
-	}
 }
diff --git a/src/vs/workbench/contrib/search/browser/searchIcons.ts b/src/vs/workbench/contrib/search/browser/searchIcons.ts
index 4ea152c5a8e..09e09d71465 100644
--- a/src/vs/workbench/contrib/search/browser/searchIcons.ts
+++ b/src/vs/workbench/contrib/search/browser/searchIcons.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from 'vs/base/common/codicons';
-import { localize } from 'vs/nls';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { localize } from '../../../../nls.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 
 export const searchDetailsIcon = registerIcon('search-details', Codicon.ellipsis, localize('searchDetailsIcon', 'Icon to make search details visible.'));
 export const searchActivityBarIcon = registerIcon('search-see-more', Codicon.goToSearch, localize('searchSeeMoreIcon', 'Icon to view more context in the search view.'));
diff --git a/src/vs/workbench/contrib/search/browser/searchMessage.ts b/src/vs/workbench/contrib/search/browser/searchMessage.ts
index 869e622637c..37a03f28a89 100644
--- a/src/vs/workbench/contrib/search/browser/searchMessage.ts
+++ b/src/vs/workbench/contrib/search/browser/searchMessage.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import * as dom from 'vs/base/browser/dom';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { parseLinkedText } from 'vs/base/common/linkedText';
-import Severity from 'vs/base/common/severity';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { SeverityIcon } from 'vs/platform/severityIcon/browser/severityIcon';
-import { TextSearchCompleteMessage, TextSearchCompleteMessageType } from 'vs/workbench/services/search/common/searchExtTypes';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { Schemas } from 'vs/base/common/network';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { Link } from 'vs/platform/opener/browser/link';
-import { URI } from 'vs/base/common/uri';
+import * as nls from '../../../../nls.js';
+import * as dom from '../../../../base/browser/dom.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { parseLinkedText } from '../../../../base/common/linkedText.js';
+import Severity from '../../../../base/common/severity.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { SeverityIcon } from '../../../../platform/severityIcon/browser/severityIcon.js';
+import { TextSearchCompleteMessage, TextSearchCompleteMessageType } from '../../../services/search/common/searchExtTypes.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { Link } from '../../../../platform/opener/browser/link.js';
+import { URI } from '../../../../base/common/uri.js';
 
 export const renderSearchMessage = (
 	message: TextSearchCompleteMessage,
diff --git a/src/vs/workbench/contrib/search/browser/searchModel.ts b/src/vs/workbench/contrib/search/browser/searchModel.ts
index 764f8966664..0f84f29b0cf 100644
--- a/src/vs/workbench/contrib/search/browser/searchModel.ts
+++ b/src/vs/workbench/contrib/search/browser/searchModel.ts
@@ -4,48 +4,48 @@
  *--------------------------------------------------------------------------------------------*/
 
 
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { compareFileExtensions, compareFileNames, comparePaths } from 'vs/base/common/comparers';
-import { memoize } from 'vs/base/common/decorators';
-import * as errors from 'vs/base/common/errors';
-import { Emitter, Event, PauseableEmitter } from 'vs/base/common/event';
-import { Lazy } from 'vs/base/common/lazy';
-import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { ResourceMap } from 'vs/base/common/map';
-import { Schemas } from 'vs/base/common/network';
-import { lcut } from 'vs/base/common/strings';
-import { TernarySearchTree } from 'vs/base/common/ternarySearchTree';
-import { URI } from 'vs/base/common/uri';
-import { Range } from 'vs/editor/common/core/range';
-import { FindMatch, IModelDeltaDecoration, ITextModel, MinimapPosition, OverviewRulerLane, TrackedRangeStickiness } from 'vs/editor/common/model';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { IModelService } from 'vs/editor/common/services/model';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IFileService, IFileStatWithPartialMetadata } from 'vs/platform/files/common/files';
-import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProgress, IProgressService, IProgressStep, ProgressLocation } from 'vs/platform/progress/common/progress';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { minimapFindMatch, overviewRulerFindMatchForeground } from 'vs/platform/theme/common/colorRegistry';
-import { themeColorFromId } from 'vs/platform/theme/common/themeService';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { FindMatchDecorationModel } from 'vs/workbench/contrib/notebook/browser/contrib/find/findMatchDecorationModel';
-import { CellFindMatchWithIndex, CellWebviewFindMatch, ICellViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NotebookEditorWidget } from 'vs/workbench/contrib/notebook/browser/notebookEditorWidget';
-import { INotebookEditorService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorService';
-import { NotebookCellsChangeType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { IReplaceService } from 'vs/workbench/contrib/search/browser/replace';
-import { contentMatchesToTextSearchMatches, webviewMatchesToTextSearchMatches, INotebookCellMatchWithModel, isINotebookFileMatchWithModel, isINotebookCellMatchWithModel, getIDFromINotebookCellMatch } from 'vs/workbench/contrib/search/browser/notebookSearch/searchNotebookHelpers';
-import { INotebookSearchService } from 'vs/workbench/contrib/search/common/notebookSearch';
-import { rawCellPrefix, INotebookCellMatchNoModel, isINotebookFileMatchNoModel } from 'vs/workbench/contrib/search/common/searchNotebookHelpers';
-import { ReplacePattern } from 'vs/workbench/services/search/common/replace';
-import { DEFAULT_MAX_SEARCH_RESULTS, IAITextQuery, IFileMatch, IPatternInfo, ISearchComplete, ISearchConfigurationProperties, ISearchProgressItem, ISearchRange, ISearchService, ITextQuery, ITextSearchContext, ITextSearchMatch, ITextSearchPreviewOptions, ITextSearchResult, ITextSearchStats, OneLineRange, QueryType, resultIsMatch, SearchCompletionExitCode, SearchSortOrder } from 'vs/workbench/services/search/common/search';
-import { getTextSearchMatchWithModelContext, editorMatchesToTextSearchResults } from 'vs/workbench/services/search/common/searchHelpers';
-import { CellSearchModel } from 'vs/workbench/contrib/search/common/cellSearchModel';
-import { CellFindMatchModel } from 'vs/workbench/contrib/notebook/browser/contrib/find/findModel';
-import { coalesce } from 'vs/base/common/arrays';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { compareFileExtensions, compareFileNames, comparePaths } from '../../../../base/common/comparers.js';
+import { memoize } from '../../../../base/common/decorators.js';
+import * as errors from '../../../../base/common/errors.js';
+import { Emitter, Event, PauseableEmitter } from '../../../../base/common/event.js';
+import { Lazy } from '../../../../base/common/lazy.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { lcut } from '../../../../base/common/strings.js';
+import { TernarySearchTree } from '../../../../base/common/ternarySearchTree.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { FindMatch, IModelDeltaDecoration, ITextModel, MinimapPosition, OverviewRulerLane, TrackedRangeStickiness } from '../../../../editor/common/model.js';
+import { ModelDecorationOptions } from '../../../../editor/common/model/textModel.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IFileService, IFileStatWithPartialMetadata } from '../../../../platform/files/common/files.js';
+import { createDecorator, IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IProgress, IProgressStep } from '../../../../platform/progress/common/progress.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { minimapFindMatch, overviewRulerFindMatchForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import { themeColorFromId } from '../../../../platform/theme/common/themeService.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { FindMatchDecorationModel } from '../../notebook/browser/contrib/find/findMatchDecorationModel.js';
+import { CellFindMatchWithIndex, CellWebviewFindMatch, ICellViewModel } from '../../notebook/browser/notebookBrowser.js';
+import { NotebookEditorWidget } from '../../notebook/browser/notebookEditorWidget.js';
+import { INotebookEditorService } from '../../notebook/browser/services/notebookEditorService.js';
+import { NotebookCellsChangeType } from '../../notebook/common/notebookCommon.js';
+import { IReplaceService } from './replace.js';
+import { contentMatchesToTextSearchMatches, webviewMatchesToTextSearchMatches, INotebookCellMatchWithModel, isINotebookFileMatchWithModel, isINotebookCellMatchWithModel, getIDFromINotebookCellMatch } from './notebookSearch/searchNotebookHelpers.js';
+import { INotebookSearchService } from '../common/notebookSearch.js';
+import { rawCellPrefix, INotebookCellMatchNoModel, isINotebookFileMatchNoModel } from '../common/searchNotebookHelpers.js';
+import { ReplacePattern } from '../../../services/search/common/replace.js';
+import { DEFAULT_MAX_SEARCH_RESULTS, IAITextQuery, IFileMatch, IPatternInfo, ISearchComplete, ISearchConfigurationProperties, ISearchProgressItem, ISearchRange, ISearchService, ITextQuery, ITextSearchContext, ITextSearchMatch, ITextSearchPreviewOptions, ITextSearchResult, ITextSearchStats, OneLineRange, QueryType, resultIsMatch, SearchCompletionExitCode, SearchSortOrder } from '../../../services/search/common/search.js';
+import { getTextSearchMatchWithModelContext, editorMatchesToTextSearchResults } from '../../../services/search/common/searchHelpers.js';
+import { CellSearchModel } from '../common/cellSearchModel.js';
+import { CellFindMatchModel } from '../../notebook/browser/contrib/find/findModel.js';
+import { coalesce } from '../../../../base/common/arrays.js';
 
 export class Match {
 
@@ -182,6 +182,10 @@ export class Match {
 	getMatchString(): string {
 		return this._oneLinePreviewText.substring(this._rangeInPreviewText.startColumn - 1, this._rangeInPreviewText.endColumn - 1);
 	}
+
+	public isReadonly() {
+		return this.aiContributed;
+	}
 }
 
 export class CellMatch {
@@ -312,8 +316,8 @@ export class MatchInNotebook extends Match {
 		return this._webviewIndex !== undefined;
 	}
 
-	public isReadonly() {
-		return (!this._cellParent.hasCellViewModel()) || this.isWebviewMatch();
+	public override isReadonly() {
+		return super.isReadonly() || (!this._cellParent.hasCellViewModel()) || this.isWebviewMatch();
 	}
 
 	get cellIndex() {
@@ -460,7 +464,7 @@ export class FileMatch extends Disposable implements IFileMatch {
 	}
 
 	hasReadonlyMatches(): boolean {
-		return this.matches().some(m => m instanceof MatchInNotebook && m.isReadonly());
+		return this.matches().some(m => m.isReadonly());
 	}
 
 	createMatches(isAiContributed: boolean): void {
@@ -603,6 +607,10 @@ export class FileMatch extends Disposable implements IFileMatch {
 		return this._parent;
 	}
 
+	get hasChildren(): boolean {
+		return this._textMatches.size > 0 || this._cellMatches.size > 0;
+	}
+
 	matches(): Match[] {
 		const cellMatches: MatchInNotebook[] = Array.from(this._cellMatches.values()).flatMap((e) => e.matches());
 		return [...this._textMatches.values(), ...cellMatches];
@@ -736,7 +744,7 @@ export class FileMatch extends Disposable implements IFileMatch {
 	}
 
 	hasOnlyReadOnlyMatches(): boolean {
-		return this.matches().every(match => (match instanceof MatchInNotebook && match.isReadonly()));
+		return this.matches().every(match => match.isReadonly());
 	}
 
 	// #region strictly notebook methods
@@ -950,7 +958,7 @@ export class FolderMatch extends Disposable {
 		private _id: string,
 		protected _index: number,
 		protected _query: ITextQuery,
-		private _parent: SearchResult | FolderMatch,
+		private _parent: TextSearchResult | FolderMatch,
 		private _searchResult: SearchResult,
 		private _closestRoot: FolderMatchWorkspaceRoot | null,
 		@IReplaceService private readonly replaceService: IReplaceService,
@@ -999,10 +1007,14 @@ export class FolderMatch extends Disposable {
 		return this._name.value;
 	}
 
-	parent(): SearchResult | FolderMatch {
+	parent(): TextSearchResult | FolderMatch {
 		return this._parent;
 	}
 
+	get hasChildren(): boolean {
+		return this._fileMatches.size > 0 || this._folderMatches.size > 0;
+	}
+
 	bindModel(model: ITextModel): void {
 		const fileMatch = this._fileMatches.get(model.uri);
 
@@ -1213,7 +1225,7 @@ export class FolderMatch extends Disposable {
 
 	private isInParentChain(folderMatch: FolderMatchWithResource) {
 
-		let matchItem: FolderMatch | SearchResult = this;
+		let matchItem: FolderMatch | TextSearchResult = this;
 		while (matchItem instanceof FolderMatch) {
 			if (matchItem.id() === folderMatch.id()) {
 				return true;
@@ -1329,7 +1341,7 @@ export class FolderMatchWithResource extends FolderMatch {
 
 	protected _normalizedResource: Lazy<URI>;
 
-	constructor(_resource: URI, _id: string, _index: number, _query: ITextQuery, _parent: SearchResult | FolderMatch, _searchResult: SearchResult, _closestRoot: FolderMatchWorkspaceRoot | null,
+	constructor(_resource: URI, _id: string, _index: number, _query: ITextQuery, _parent: TextSearchResult | FolderMatch, _searchResult: SearchResult, _closestRoot: FolderMatchWorkspaceRoot | null,
 		@IReplaceService replaceService: IReplaceService,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@ILabelService labelService: ILabelService,
@@ -1353,13 +1365,13 @@ export class FolderMatchWithResource extends FolderMatch {
  * FolderMatchWorkspaceRoot => folder for workspace root
  */
 export class FolderMatchWorkspaceRoot extends FolderMatchWithResource {
-	constructor(_resource: URI, _id: string, _index: number, _query: ITextQuery, _parent: SearchResult, private readonly _ai: boolean,
+	constructor(_resource: URI, _id: string, _index: number, _query: ITextQuery, _parent: TextSearchResult, private readonly _ai: boolean,
 		@IReplaceService replaceService: IReplaceService,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@ILabelService labelService: ILabelService,
 		@IUriIdentityService uriIdentityService: IUriIdentityService
 	) {
-		super(_resource, _id, _index, _query, _parent, _parent, null, replaceService, instantiationService, labelService, uriIdentityService);
+		super(_resource, _id, _index, _query, _parent, _parent.parent(), null, replaceService, instantiationService, labelService, uriIdentityService);
 	}
 
 	private normalizedUriParent(uri: URI): URI {
@@ -1426,14 +1438,14 @@ export class FolderMatchWorkspaceRoot extends FolderMatchWithResource {
  * FolderMatch => required resource (normal folder node)
  */
 export class FolderMatchNoRoot extends FolderMatch {
-	constructor(_id: string, _index: number, _query: ITextQuery, _parent: SearchResult,
+	constructor(_id: string, _index: number, _query: ITextQuery, _parent: TextSearchResult,
 		@IReplaceService replaceService: IReplaceService,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@ILabelService labelService: ILabelService,
 		@IUriIdentityService uriIdentityService: IUriIdentityService,
 
 	) {
-		super(null, _id, _index, _query, _parent, _parent, null, replaceService, instantiationService, labelService, uriIdentityService);
+		super(null, _id, _index, _query, _parent, _parent.parent(), null, replaceService, instantiationService, labelService, uriIdentityService);
 	}
 
 	createAndConfigureFileMatch(rawFileMatch: IFileMatch, searchInstanceID: string): FileMatch {
@@ -1453,6 +1465,324 @@ export class FolderMatchNoRoot extends FolderMatch {
 	}
 }
 
+export class TextSearchResult extends Disposable {
+	private _onChange = this._register(new Emitter<IChangeEvent>());
+	readonly onChange: Event<IChangeEvent> = this._onChange.event;
+	private _isDirty = false;
+	private _showHighlights: boolean = false;
+
+	private _query: ITextQuery | null = null;
+	private _rangeHighlightDecorations: RangeHighlightDecorations;
+	private disposePastResults: () => Promise<void> = () => Promise.resolve();
+
+	private _folderMatches: FolderMatchWorkspaceRoot[] = [];
+	private _otherFilesMatch: FolderMatch | null = null;
+	private _folderMatchesMap: TernarySearchTree<URI, FolderMatchWithResource> = TernarySearchTree.forUris<FolderMatchWorkspaceRoot>(key => this.uriIdentityService.extUri.ignorePathCasing(key));
+	public resource = null;
+	public hidden = false;
+
+	public cachedSearchComplete: ISearchComplete | undefined;
+
+	constructor(
+		private _allowOtherResults: boolean,
+		private _parent: SearchResult,
+		private _id: string,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService
+	) {
+		super();
+		this._rangeHighlightDecorations = this.instantiationService.createInstance(RangeHighlightDecorations);
+
+		this._register(this.onChange(e => {
+			if (e.removed) {
+				this._isDirty = !this.isEmpty();
+			}
+		}));
+	}
+
+	hide() {
+		this.hidden = true;
+		this.clear();
+	}
+
+	get isAIContributed() {
+		return this.id() === AI_TEXT_SEARCH_RESULT_ID;
+	}
+	id() {
+		return this._id;
+	}
+	parent() {
+		return this._parent;
+	}
+
+	get hasChildren(): boolean {
+		return this._folderMatches.length > 0;
+	}
+
+	name(): string {
+		return this._id === AI_TEXT_SEARCH_RESULT_ID ? 'AI' : 'Text';
+	}
+
+	get isDirty(): boolean {
+		return this._isDirty;
+	}
+
+	public getFolderMatch(resource: URI): FolderMatchWorkspaceRoot | FolderMatch | undefined {
+		const folderMatch = this._folderMatchesMap.findSubstr(resource);
+
+		if (!folderMatch && this._allowOtherResults && this._otherFilesMatch) {
+			return this._otherFilesMatch;
+		}
+		return folderMatch;
+	}
+
+	add(allRaw: IFileMatch[], searchInstanceID: string, ai: boolean, silent: boolean = false): void {
+		// Split up raw into a list per folder so we can do a batch add per folder.
+
+		const { byFolder, other } = this.groupFilesByFolder(allRaw);
+		byFolder.forEach(raw => {
+			if (!raw.length) {
+				return;
+			}
+
+			// ai results go into the respective folder
+			const folderMatch = this.getFolderMatch(raw[0].resource);
+			folderMatch?.addFileMatch(raw, silent, searchInstanceID, this.isAIContributed);
+		});
+
+		if (!ai) {
+			this._otherFilesMatch?.addFileMatch(other, silent, searchInstanceID, false);
+		}
+		this.disposePastResults();
+	}
+
+	remove(matches: FileMatch | FolderMatch | (FileMatch | FolderMatch)[], ai = false): void {
+		if (!Array.isArray(matches)) {
+			matches = [matches];
+		}
+
+		matches.forEach(m => {
+			if (m instanceof FolderMatch) {
+				m.clear();
+			}
+		});
+
+		const fileMatches: FileMatch[] = matches.filter(m => m instanceof FileMatch) as FileMatch[];
+
+		const { byFolder, other } = this.groupFilesByFolder(fileMatches);
+		byFolder.forEach(matches => {
+			if (!matches.length) {
+				return;
+			}
+
+			this.getFolderMatch(matches[0].resource)?.remove(<FileMatch[]>matches);
+		});
+
+		if (other.length) {
+			this.getFolderMatch(other[0].resource)?.remove(<FileMatch[]>other);
+		}
+	}
+
+	groupFilesByFolder(fileMatches: IFileMatch[]): { byFolder: ResourceMap<IFileMatch[]>; other: IFileMatch[] } {
+		const rawPerFolder = new ResourceMap<IFileMatch[]>();
+		const otherFileMatches: IFileMatch[] = [];
+		this._folderMatches.forEach(fm => rawPerFolder.set(fm.resource, []));
+
+		fileMatches.forEach(rawFileMatch => {
+			const folderMatch = this.getFolderMatch(rawFileMatch.resource);
+			if (!folderMatch) {
+				// foldermatch was previously removed by user or disposed for some reason
+				return;
+			}
+
+			const resource = folderMatch.resource;
+			if (resource) {
+				rawPerFolder.get(resource)!.push(rawFileMatch);
+			} else {
+				otherFileMatches.push(rawFileMatch);
+			}
+		});
+
+		return {
+			byFolder: rawPerFolder,
+			other: otherFileMatches
+		};
+	}
+	isEmpty(): boolean {
+		return this.folderMatches().every((folderMatch) => folderMatch.isEmpty());
+	}
+
+	findFolderSubstr(resource: URI) {
+		return this._folderMatchesMap.findSubstr(resource);
+	}
+
+	get query(): ITextQuery | null {
+		return this._query;
+	}
+
+	set query(query: ITextQuery | null) {
+		// When updating the query we could change the roots, so keep a reference to them to clean up when we trigger `disposePastResults`
+		const oldFolderMatches = this.folderMatches();
+		this.disposePastResults = async () => {
+			oldFolderMatches.forEach(match => match.clear());
+			oldFolderMatches.forEach(match => match.dispose());
+			this._isDirty = false;
+		};
+
+		this.cachedSearchComplete = undefined;
+
+		this._rangeHighlightDecorations.removeHighlightRange();
+		this._folderMatchesMap = TernarySearchTree.forUris<FolderMatchWithResource>(key => this.uriIdentityService.extUri.ignorePathCasing(key));
+		if (!query) {
+			return;
+		}
+
+		this._folderMatches = (query && query.folderQueries || [])
+			.map(fq => fq.folder)
+			.map((resource, index) => <FolderMatchWorkspaceRoot>this._createBaseFolderMatch(resource, resource.toString(), index, query, this.isAIContributed));
+
+		this._folderMatches.forEach(fm => this._folderMatchesMap.set(fm.resource, fm));
+
+		if (this._allowOtherResults) {
+			this._otherFilesMatch = <FolderMatchNoRoot>this._createBaseFolderMatch(null, 'otherFiles', this._folderMatches.length + 1, query, this.isAIContributed);
+		}
+
+		this._query = query;
+	}
+	private _createBaseFolderMatch(resource: URI | null, id: string, index: number, query: ITextQuery, ai: boolean): FolderMatch {
+		let folderMatch: FolderMatch;
+		if (resource) {
+			folderMatch = this._register(this.instantiationService.createInstance(FolderMatchWorkspaceRoot, resource, id, index, query, this, ai));
+		} else {
+			folderMatch = this._register(this.instantiationService.createInstance(FolderMatchNoRoot, id, index, query, this));
+		}
+		const disposable = folderMatch.onChange((event) => this._onChange.fire(event));
+		this._register(folderMatch.onDispose(() => disposable.dispose()));
+		return folderMatch;
+	}
+
+
+	folderMatches(): FolderMatch[] {
+		return this._otherFilesMatch && this._allowOtherResults ?
+			[
+				...this._folderMatches,
+				this._otherFilesMatch,
+			] :
+			this._folderMatches;
+	}
+
+	private disposeMatches(): void {
+		this.folderMatches().forEach(folderMatch => folderMatch.dispose());
+
+		this._folderMatches = [];
+
+		this._folderMatchesMap = TernarySearchTree.forUris<FolderMatchWithResource>(key => this.uriIdentityService.extUri.ignorePathCasing(key));
+
+		this._rangeHighlightDecorations.removeHighlightRange();
+	}
+
+	matches(): FileMatch[] {
+		const matches: FileMatch[][] = [];
+		this.folderMatches().forEach(folderMatch => {
+			matches.push(folderMatch.allDownstreamFileMatches());
+		});
+
+		return (<FileMatch[]>[]).concat(...matches);
+	}
+
+	get showHighlights(): boolean {
+		return this._showHighlights;
+	}
+
+	toggleHighlights(value: boolean): void {
+		if (this._showHighlights === value) {
+			return;
+		}
+		this._showHighlights = value;
+		let selectedMatch: Match | null = null;
+		this.matches().forEach((fileMatch: FileMatch) => {
+			fileMatch.updateHighlights();
+			fileMatch.updateNotebookHighlights();
+			if (!selectedMatch) {
+				selectedMatch = fileMatch.getSelectedMatch();
+			}
+		});
+		if (this._showHighlights && selectedMatch) {
+			// TS?
+			this._rangeHighlightDecorations.highlightRange(
+				(<Match>selectedMatch).parent().resource,
+				(<Match>selectedMatch).range()
+			);
+		} else {
+			this._rangeHighlightDecorations.removeHighlightRange();
+		}
+	}
+
+	get rangeHighlightDecorations(): RangeHighlightDecorations {
+		return this._rangeHighlightDecorations;
+	}
+
+	fileCount(): number {
+		return this.folderMatches().reduce<number>((prev, match) => prev + match.recursiveFileCount(), 0);
+	}
+
+	count(): number {
+		return this.matches().reduce<number>((prev, match) => prev + match.count(), 0);
+	}
+
+	clear(): void {
+		this.folderMatches().forEach((folderMatch) => folderMatch.clear(true));
+		this.disposeMatches();
+		this._folderMatches = [];
+		this._otherFilesMatch = null;
+		this.cachedSearchComplete = undefined;
+	}
+
+	override async dispose(): Promise<void> {
+		this._rangeHighlightDecorations.dispose();
+		this.disposeMatches();
+		super.dispose();
+		await this.disposePastResults();
+	}
+}
+
+export class ReplaceableTextSearchResult extends TextSearchResult {
+	constructor(
+		_allowOtherResults: boolean,
+		parent: SearchResult,
+		id: string,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IUriIdentityService uriIdentityService: IUriIdentityService,
+		@IReplaceService private readonly replaceService: IReplaceService,
+	) {
+		super(_allowOtherResults, parent, id, instantiationService, uriIdentityService);
+
+	}
+
+	replace(match: FileMatch): Promise<any> {
+		return this.getFolderMatch(match.resource)?.replace(match) ?? Promise.resolve();
+	}
+
+	replaceAll(progress: IProgress<IProgressStep>): Promise<any> {
+		this.replacingAll = true;
+
+		const promise = this.replaceService.replace(this.matches(), progress);
+
+		return promise.then(() => {
+			this.replacingAll = false;
+			this.clear();
+		}, () => {
+			this.replacingAll = false;
+		});
+	}
+
+	private set replacingAll(running: boolean) {
+		this.folderMatches().forEach((folderMatch) => {
+			folderMatch.replacingAll = running;
+		});
+	}
+}
+
 let elemAIndex: number = -1;
 let elemBIndex: number = -1;
 /**
@@ -1576,9 +1906,9 @@ export function searchComparer(elementA: RenderableMatch, elementB: RenderableMa
 
 function createParentList(element: RenderableMatch): RenderableMatch[] {
 	const parentArray: RenderableMatch[] = [];
-	let currElement: RenderableMatch | SearchResult = element;
+	let currElement: RenderableMatch | TextSearchResult = element;
 
-	while (!(currElement instanceof SearchResult)) {
+	while (!(currElement instanceof TextSearchResult)) {
 		parentArray.push(currElement);
 		currElement = currElement.parent();
 	}
@@ -1586,38 +1916,33 @@ function createParentList(element: RenderableMatch): RenderableMatch[] {
 	return parentArray;
 }
 
+export const PLAIN_TEXT_SEARCH__RESULT_ID = 'plainTextSearch';
+export const AI_TEXT_SEARCH_RESULT_ID = 'aiTextSearch';
+
 export class SearchResult extends Disposable {
 
 	private _onChange = this._register(new PauseableEmitter<IChangeEvent>({
 		merge: mergeSearchResultEvents
 	}));
 	readonly onChange: Event<IChangeEvent> = this._onChange.event;
-	private _folderMatches: FolderMatchWorkspaceRoot[] = [];
-	private _aiFolderMatches: FolderMatchWorkspaceRoot[] = [];
-	private _otherFilesMatch: FolderMatch | null = null;
-	private _folderMatchesMap: TernarySearchTree<URI, FolderMatchWithResource> = TernarySearchTree.forUris<FolderMatchWorkspaceRoot>(key => this.uriIdentityService.extUri.ignorePathCasing(key));
-	private _aiFolderMatchesMap: TernarySearchTree<URI, FolderMatchWithResource> = TernarySearchTree.forUris<FolderMatchWorkspaceRoot>(key => this.uriIdentityService.extUri.ignorePathCasing(key));
-	private _showHighlights: boolean = false;
-	private _query: ITextQuery | null = null;
-	private _rangeHighlightDecorations: RangeHighlightDecorations;
-	private disposePastResults: () => Promise<void> = () => Promise.resolve();
-	private _isDirty = false;
 	private _onWillChangeModelListener: IDisposable | undefined;
 	private _onDidChangeModelListener: IDisposable | undefined;
-
-	private _cachedSearchComplete: ISearchComplete | undefined;
-	private _aiCachedSearchComplete: ISearchComplete | undefined;
+	private _plainTextSearchResult: ReplaceableTextSearchResult;
+	private _aiTextSearchResult: TextSearchResult;
 
 	constructor(
 		public readonly searchModel: SearchModel,
-		@IReplaceService private readonly replaceService: IReplaceService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IModelService private readonly modelService: IModelService,
-		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
 		@INotebookEditorService private readonly notebookEditorService: INotebookEditorService,
 	) {
 		super();
-		this._rangeHighlightDecorations = this.instantiationService.createInstance(RangeHighlightDecorations);
+		this._plainTextSearchResult = this._register(this.instantiationService.createInstance(ReplaceableTextSearchResult, true, this, PLAIN_TEXT_SEARCH__RESULT_ID));
+		this._aiTextSearchResult = this._register(this.instantiationService.createInstance(TextSearchResult, true, this, AI_TEXT_SEARCH_RESULT_ID));
+
+		this._register(this._plainTextSearchResult.onChange((e) => this._onChange.fire(e)));
+		this._register(this._aiTextSearchResult.onChange((e) => this._onChange.fire(e)));
+
 		this.modelService.getModels().forEach(model => this.onModelAdded(model));
 		this._register(this.modelService.onModelAdded(model => this.onModelAdded(model)));
 
@@ -1627,11 +1952,25 @@ export class SearchResult extends Disposable {
 			}
 		}));
 
-		this._register(this.onChange(e => {
-			if (e.removed) {
-				this._isDirty = !this.isEmpty() || !this.isEmpty(true);
-			}
-		}));
+	}
+
+	get plainTextSearchResult(): ReplaceableTextSearchResult {
+		return this._plainTextSearchResult;
+	}
+
+	get aiTextSearchResult(): TextSearchResult {
+		return this._aiTextSearchResult;
+	}
+
+	get children() {
+		return this.textSearchResults;
+	}
+
+	get hasChildren(): boolean {
+		return true; // should always have a Text Search Result for plain results.
+	}
+	get textSearchResults(): TextSearchResult[] {
+		return [this._plainTextSearchResult, this._aiTextSearchResult];
 	}
 
 	async batchReplace(elementsToReplace: RenderableMatch[]) {
@@ -1666,8 +2005,12 @@ export class SearchResult extends Disposable {
 			this._onChange.pause();
 			elementsToRemove.forEach((currentElement) => {
 				if (!arrayContainsElementOrParent(currentElement, removedElems)) {
-					currentElement.parent().remove(<(FolderMatch | FileMatch)[] & Match & FileMatch[]>currentElement);
-					removedElems.push(currentElement);
+					if (currentElement instanceof TextSearchResult) {
+						currentElement.hide();
+					} else {
+						currentElement.parent().remove(<(FolderMatch | FileMatch)[] & Match & FileMatch[]>currentElement);
+						removedElems.push(currentElement);
+					}
 				}
 			}
 			);
@@ -1677,60 +2020,16 @@ export class SearchResult extends Disposable {
 	}
 
 	get isDirty(): boolean {
-		return this._isDirty;
+		return this._aiTextSearchResult.isDirty || this._plainTextSearchResult.isDirty;
 	}
 
 	get query(): ITextQuery | null {
-		return this._query;
+		return this._plainTextSearchResult.query;
 	}
 
 	set query(query: ITextQuery | null) {
-		// When updating the query we could change the roots, so keep a reference to them to clean up when we trigger `disposePastResults`
-		const oldFolderMatches = this.folderMatches();
-		this.disposePastResults = async () => {
-			oldFolderMatches.forEach(match => match.clear());
-			oldFolderMatches.forEach(match => match.dispose());
-			this._isDirty = false;
-		};
-
-		this._cachedSearchComplete = undefined;
-		this._aiCachedSearchComplete = undefined;
-
-		this._rangeHighlightDecorations.removeHighlightRange();
-		this._folderMatchesMap = TernarySearchTree.forUris<FolderMatchWithResource>(key => this.uriIdentityService.extUri.ignorePathCasing(key));
-		this._aiFolderMatchesMap = TernarySearchTree.forUris<FolderMatchWithResource>(key => this.uriIdentityService.extUri.ignorePathCasing(key));
-
-		if (!query) {
-			return;
-		}
-
-		this._folderMatches = (query && query.folderQueries || [])
-			.map(fq => fq.folder)
-			.map((resource, index) => <FolderMatchWorkspaceRoot>this._createBaseFolderMatch(resource, resource.toString(), index, query, false));
-
-		this._folderMatches.forEach(fm => this._folderMatchesMap.set(fm.resource, fm));
-
-		this._aiFolderMatches = (query && query.folderQueries || [])
-			.map(fq => fq.folder)
-			.map((resource, index) => <FolderMatchWorkspaceRoot>this._createBaseFolderMatch(resource, resource.toString(), index, query, true));
-
-		this._aiFolderMatches.forEach(fm => this._aiFolderMatchesMap.set(fm.resource, fm));
-
-		this._otherFilesMatch = <FolderMatchNoRoot>this._createBaseFolderMatch(null, 'otherFiles', this._folderMatches.length + this._aiFolderMatches.length + 1, query, false);
-
-		this._query = query;
-	}
-
-	setCachedSearchComplete(cachedSearchComplete: ISearchComplete | undefined, ai: boolean) {
-		if (ai) {
-			this._aiCachedSearchComplete = cachedSearchComplete;
-		} else {
-			this._cachedSearchComplete = cachedSearchComplete;
-		}
-	}
-
-	getCachedSearchComplete(ai: boolean) {
-		return ai ? this._aiCachedSearchComplete : this._cachedSearchComplete;
+		this._plainTextSearchResult.query = query;
+		this._aiTextSearchResult.query = query;
 	}
 
 	private onDidAddNotebookEditorWidget(widget: NotebookEditorWidget): void {
@@ -1755,236 +2054,118 @@ export class SearchResult extends Disposable {
 		);
 	}
 
+	folderMatches(ai: boolean = false): FolderMatch[] {
+		if (ai) {
+			return this._aiTextSearchResult.folderMatches();
+		}
+		return this._plainTextSearchResult.folderMatches();
+	}
+
 	private onModelAdded(model: ITextModel): void {
-		const folderMatch = this._folderMatchesMap.findSubstr(model.uri);
+		const folderMatch = this._plainTextSearchResult.findFolderSubstr(model.uri);
 		folderMatch?.bindModel(model);
 	}
 
 	private async onNotebookEditorWidgetAdded(editor: NotebookEditorWidget, resource: URI): Promise<void> {
-		const folderMatch = this._folderMatchesMap.findSubstr(resource);
+		const folderMatch = this._plainTextSearchResult.findFolderSubstr(resource);
 		await folderMatch?.bindNotebookEditorWidget(editor, resource);
 	}
 
 	private onNotebookEditorWidgetRemoved(editor: NotebookEditorWidget, resource: URI): void {
-		const folderMatch = this._folderMatchesMap.findSubstr(resource);
+		const folderMatch = this._plainTextSearchResult.findFolderSubstr(resource);
 		folderMatch?.unbindNotebookEditorWidget(editor, resource);
 	}
 
-	private _createBaseFolderMatch(resource: URI | null, id: string, index: number, query: ITextQuery, ai: boolean): FolderMatch {
-		let folderMatch: FolderMatch;
-		if (resource) {
-			folderMatch = this._register(this.instantiationService.createInstance(FolderMatchWorkspaceRoot, resource, id, index, query, this, ai));
-		} else {
-			folderMatch = this._register(this.instantiationService.createInstance(FolderMatchNoRoot, id, index, query, this));
-		}
-		const disposable = folderMatch.onChange((event) => this._onChange.fire(event));
-		this._register(folderMatch.onDispose(() => disposable.dispose()));
-		return folderMatch;
-	}
-
 
 	add(allRaw: IFileMatch[], searchInstanceID: string, ai: boolean, silent: boolean = false): void {
-		// Split up raw into a list per folder so we can do a batch add per folder.
+		this._plainTextSearchResult.hidden = false;
+		this._aiTextSearchResult.hidden = false;
 
-		const { byFolder, other } = this.groupFilesByFolder(allRaw, ai);
-		byFolder.forEach(raw => {
-			if (!raw.length) {
-				return;
-			}
-
-			// ai results go into the respective folder
-			const folderMatch = ai ? this.getAIFolderMatch(raw[0].resource) : this.getFolderMatch(raw[0].resource);
-			folderMatch?.addFileMatch(raw, silent, searchInstanceID, ai);
-		});
-
-		if (!ai) {
-			this._otherFilesMatch?.addFileMatch(other, silent, searchInstanceID, false);
+		if (ai) {
+			this._aiTextSearchResult.add(allRaw, searchInstanceID, ai, silent);
+		} else {
+			this._plainTextSearchResult.add(allRaw, searchInstanceID, ai, silent);
 		}
-		this.disposePastResults();
 	}
 
 	clear(): void {
-		this.folderMatches().forEach((folderMatch) => folderMatch.clear(true));
-		this.folderMatches(true);
-		this.disposeMatches();
-		this._folderMatches = [];
-		this._aiFolderMatches = [];
-		this._otherFilesMatch = null;
+		this._aiTextSearchResult.clear();
+		this._plainTextSearchResult.clear();
 	}
 
 	remove(matches: FileMatch | FolderMatch | (FileMatch | FolderMatch)[], ai = false): void {
-		if (!Array.isArray(matches)) {
-			matches = [matches];
+		if (ai) {
+			this._aiTextSearchResult.remove(matches, ai);
 		}
+		this._plainTextSearchResult.remove(matches, ai);
 
-		matches.forEach(m => {
-			if (m instanceof FolderMatch) {
-				m.clear();
-			}
-		});
-
-		const fileMatches: FileMatch[] = matches.filter(m => m instanceof FileMatch) as FileMatch[];
-
-		const { byFolder, other } = this.groupFilesByFolder(fileMatches, ai);
-		byFolder.forEach(matches => {
-			if (!matches.length) {
-				return;
-			}
-
-			this.getFolderMatch(matches[0].resource).remove(<FileMatch[]>matches);
-		});
-
-		if (other.length) {
-			this.getFolderMatch(other[0].resource).remove(<FileMatch[]>other);
-		}
 	}
 
 	replace(match: FileMatch): Promise<any> {
-		return this.getFolderMatch(match.resource).replace(match);
+		return this._plainTextSearchResult.replace(match);
+	}
+
+	matches(ai?: boolean): FileMatch[] {
+		if (ai === undefined) {
+			return this._plainTextSearchResult.matches().concat(this._aiTextSearchResult.matches());
+		} else if (ai === true) {
+			return this._aiTextSearchResult.matches();
+		}
+		return this._plainTextSearchResult.matches();
+	}
+
+	isEmpty(): boolean {
+		return this._plainTextSearchResult.isEmpty() && this._aiTextSearchResult.isEmpty();
+	}
+
+	fileCount(): number {
+		return this._plainTextSearchResult.fileCount() + this._aiTextSearchResult.fileCount();
+	}
+
+	count(): number {
+		return this._plainTextSearchResult.count() + this._aiTextSearchResult.count();
+	}
+
+	setCachedSearchComplete(cachedSearchComplete: ISearchComplete | undefined, ai: boolean) {
+		if (ai) {
+			this._aiTextSearchResult.cachedSearchComplete = cachedSearchComplete;
+		} else {
+			this._plainTextSearchResult.cachedSearchComplete = cachedSearchComplete;
+		}
+	}
+
+	getCachedSearchComplete(ai: boolean): ISearchComplete | undefined {
+		if (ai) {
+			return this._aiTextSearchResult.cachedSearchComplete;
+		}
+		return this._plainTextSearchResult.cachedSearchComplete;
+	}
+
+	toggleHighlights(value: boolean, ai: boolean = false): void {
+		if (ai) {
+			this._aiTextSearchResult.toggleHighlights(value);
+		} else {
+			this._plainTextSearchResult.toggleHighlights(value);
+		}
+	}
+
+	getRangeHighlightDecorations(ai: boolean = false): RangeHighlightDecorations {
+		if (ai) {
+			return this._aiTextSearchResult.rangeHighlightDecorations;
+		}
+		return this._plainTextSearchResult.rangeHighlightDecorations;
 	}
 
 	replaceAll(progress: IProgress<IProgressStep>): Promise<any> {
-		this.replacingAll = true;
-
-		const promise = this.replaceService.replace(this.matches(), progress);
-
-		return promise.then(() => {
-			this.replacingAll = false;
-			this.clear();
-		}, () => {
-			this.replacingAll = false;
-		});
-	}
-
-	folderMatches(ai = false): FolderMatch[] {
-		if (ai) {
-			return this._aiFolderMatches;
-		}
-		return this._otherFilesMatch ?
-			[
-				...this._folderMatches,
-				this._otherFilesMatch
-			] :
-			[
-				...this._folderMatches
-			];
-	}
-
-	matches(ai = false): FileMatch[] {
-		const matches: FileMatch[][] = [];
-		this.folderMatches(ai).forEach(folderMatch => {
-			matches.push(folderMatch.allDownstreamFileMatches());
-		});
-
-		return (<FileMatch[]>[]).concat(...matches);
-	}
-
-	isEmpty(ai = false): boolean {
-		return this.folderMatches(ai).every((folderMatch) => folderMatch.isEmpty());
-	}
-
-	fileCount(ai = false): number {
-		return this.folderMatches(ai).reduce<number>((prev, match) => prev + match.recursiveFileCount(), 0);
-	}
-
-	count(ai = false): number {
-		return this.matches(ai).reduce<number>((prev, match) => prev + match.count(), 0);
-	}
-
-	get showHighlights(): boolean {
-		return this._showHighlights;
-	}
-
-	toggleHighlights(value: boolean): void {
-		if (this._showHighlights === value) {
-			return;
-		}
-		this._showHighlights = value;
-		let selectedMatch: Match | null = null;
-		this.matches().forEach((fileMatch: FileMatch) => {
-			fileMatch.updateHighlights();
-			fileMatch.updateNotebookHighlights();
-			if (!selectedMatch) {
-				selectedMatch = fileMatch.getSelectedMatch();
-			}
-		});
-		if (this._showHighlights && selectedMatch) {
-			// TS?
-			this._rangeHighlightDecorations.highlightRange(
-				(<Match>selectedMatch).parent().resource,
-				(<Match>selectedMatch).range()
-			);
-		} else {
-			this._rangeHighlightDecorations.removeHighlightRange();
-		}
-	}
-
-	get rangeHighlightDecorations(): RangeHighlightDecorations {
-		return this._rangeHighlightDecorations;
-	}
-
-	private getFolderMatch(resource: URI): FolderMatchWorkspaceRoot | FolderMatch {
-		const folderMatch = this._folderMatchesMap.findSubstr(resource);
-		return folderMatch ? folderMatch : this._otherFilesMatch!;
-	}
-
-	private getAIFolderMatch(resource: URI): FolderMatchWorkspaceRoot | FolderMatch | undefined {
-		const folderMatch = this._aiFolderMatchesMap.findSubstr(resource);
-		return folderMatch;
-	}
-
-	private set replacingAll(running: boolean) {
-		this.folderMatches().forEach((folderMatch) => {
-			folderMatch.replacingAll = running;
-		});
-	}
-
-	private groupFilesByFolder(fileMatches: IFileMatch[], ai: boolean): { byFolder: ResourceMap<IFileMatch[]>; other: IFileMatch[] } {
-		const rawPerFolder = new ResourceMap<IFileMatch[]>();
-		const otherFileMatches: IFileMatch[] = [];
-		(ai ? this._aiFolderMatches : this._folderMatches).forEach(fm => rawPerFolder.set(fm.resource, []));
-
-		fileMatches.forEach(rawFileMatch => {
-			const folderMatch = ai ? this.getAIFolderMatch(rawFileMatch.resource) : this.getFolderMatch(rawFileMatch.resource);
-			if (!folderMatch) {
-				// foldermatch was previously removed by user or disposed for some reason
-				return;
-			}
-
-			const resource = folderMatch.resource;
-			if (resource) {
-				rawPerFolder.get(resource)!.push(rawFileMatch);
-			} else {
-				otherFileMatches.push(rawFileMatch);
-			}
-		});
-
-		return {
-			byFolder: rawPerFolder,
-			other: otherFileMatches
-		};
-	}
-
-	private disposeMatches(): void {
-		this.folderMatches().forEach(folderMatch => folderMatch.dispose());
-		this.folderMatches(true).forEach(folderMatch => folderMatch.dispose());
-
-		this._folderMatches = [];
-		this._aiFolderMatches = [];
-
-		this._folderMatchesMap = TernarySearchTree.forUris<FolderMatchWithResource>(key => this.uriIdentityService.extUri.ignorePathCasing(key));
-		this._aiFolderMatchesMap = TernarySearchTree.forUris<FolderMatchWithResource>(key => this.uriIdentityService.extUri.ignorePathCasing(key));
-
-		this._rangeHighlightDecorations.removeHighlightRange();
+		return this._plainTextSearchResult.replaceAll(progress);
 	}
 
 	override async dispose(): Promise<void> {
+		this._aiTextSearchResult?.dispose();
+		this._plainTextSearchResult?.dispose();
 		this._onWillChangeModelListener?.dispose();
 		this._onDidChangeModelListener?.dispose();
-		this._rangeHighlightDecorations.dispose();
-		this.disposeMatches();
 		super.dispose();
-		await this.disposePastResults();
 	}
 }
 
@@ -2018,6 +2199,7 @@ export class SearchModel extends Disposable {
 	private searchCancelledForNewSearch: boolean = false;
 	private aiSearchCancelledForNewSearch: boolean = false;
 	public location: SearchModelLocation = SearchModelLocation.PANEL;
+	private readonly _aiTextResultProviderName: Lazy<Promise<string | undefined>>;
 
 	constructor(
 		@ISearchService private readonly searchService: ISearchService,
@@ -2026,11 +2208,20 @@ export class SearchModel extends Disposable {
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@ILogService private readonly logService: ILogService,
 		@INotebookSearchService private readonly notebookSearchService: INotebookSearchService,
-		@IProgressService private readonly progressService: IProgressService,
 	) {
 		super();
 		this._searchResult = this.instantiationService.createInstance(SearchResult, this);
 		this._register(this._searchResult.onChange((e) => this._onSearchResultChanged.fire(e)));
+
+		this._aiTextResultProviderName = new Lazy(async () => this.searchService.getAIName());
+	}
+
+	async getAITextResultProviderName(): Promise<string> {
+		const result = await this._aiTextResultProviderName.value;
+		if (!result) {
+			throw Error('Fetching AI name when no provider present.');
+		}
+		return result;
 	}
 
 	isReplaceActive(): boolean {
@@ -2069,47 +2260,37 @@ export class SearchModel extends Disposable {
 		return this._searchResult;
 	}
 
-	async addAIResults(onProgress?: (result: ISearchProgressItem) => void) {
-		if (this.searchResult.count(true)) {
-			// already has matches
-			return;
+	async addAIResults(onProgress?: (result: ISearchProgressItem) => void): Promise<ISearchComplete> {
+		if (this.hasAIResults) {
+			// already has matches or pending matches
+			throw Error('AI results already exist');
 		} else {
 			if (this._searchQuery) {
-				await this.aiSearch(
+				return this.aiSearch(
 					{ ...this._searchQuery, contentPattern: this._searchQuery.contentPattern.pattern, type: QueryType.aiText },
 					onProgress,
-					this.currentCancelTokenSource?.token,
 				);
+			} else {
+				throw Error('No search query');
 			}
 		}
 	}
 
-	private async doAISearchWithModal(searchQuery: IAITextQuery, searchInstanceID: string, token?: CancellationToken, onProgress?: (result: ISearchProgressItem) => void): Promise<ISearchComplete> {
-		const promise = this.searchService.aiTextSearch(
-			searchQuery,
-			token, async (p: ISearchProgressItem) => {
-				this.onSearchProgress(p, searchInstanceID, false, true);
-				onProgress?.(p);
-			});
-		return this.progressService.withProgress<ISearchComplete>({
-			location: ProgressLocation.Notification,
-			type: 'syncing',
-			title: 'Searching for AI results...',
-		}, async (_) => promise);
-	}
-
-	aiSearch(query: IAITextQuery, onProgress?: (result: ISearchProgressItem) => void, callerToken?: CancellationToken): Promise<ISearchComplete> {
+	aiSearch(query: IAITextQuery, onProgress?: (result: ISearchProgressItem) => void): Promise<ISearchComplete> {
 
 		const searchInstanceID = Date.now().toString();
-		const tokenSource = this.currentAICancelTokenSource = new CancellationTokenSource(callerToken);
+		const tokenSource = new CancellationTokenSource();
+		this.currentAICancelTokenSource = tokenSource;
 		const start = Date.now();
-		const asyncAIResults = this.doAISearchWithModal(query,
-			searchInstanceID,
-			this.currentAICancelTokenSource.token, async (p: ISearchProgressItem) => {
+		const asyncAIResults = this.searchService.aiTextSearch(
+			query,
+			tokenSource.token,
+			async (p: ISearchProgressItem) => {
 				this.onSearchProgress(p, searchInstanceID, false, true);
 				onProgress?.(p);
-			})
-			.then(
+			}).finally(() => {
+				tokenSource.dispose(true);
+			}).then(
 				value => {
 					this.onSearchCompleted(value, Date.now() - start, searchInstanceID, true);
 					return value;
@@ -2117,7 +2298,7 @@ export class SearchModel extends Disposable {
 				e => {
 					this.onSearchError(e, Date.now() - start, true);
 					throw e;
-				}).finally(() => tokenSource.dispose());
+				});
 		return asyncAIResults;
 	}
 
@@ -2141,7 +2322,7 @@ export class SearchModel extends Disposable {
 		const notebookResult = this.notebookSearchService.notebookSearch(query, tokenSource.token, searchInstanceID, asyncGenerateOnProgress);
 		const textResult = this.searchService.textSearchSplitSyncAsync(
 			searchQuery,
-			this.currentCancelTokenSource.token, asyncGenerateOnProgress,
+			tokenSource.token, asyncGenerateOnProgress,
 			notebookResult.openFilesToScan,
 			notebookResult.allScannedFiles,
 		);
@@ -2155,7 +2336,6 @@ export class SearchModel extends Disposable {
 			// resolve async parts of search
 			const allClosedEditorResults = await textResult.asyncResults;
 			const resolvedNotebookResults = await notebookResult.completeData;
-			tokenSource.dispose();
 			const searchLength = Date.now() - searchStart;
 			const resolvedResult: ISearchComplete = {
 				results: [...allClosedEditorResults.results, ...resolvedNotebookResults.results],
@@ -2168,11 +2348,20 @@ export class SearchModel extends Disposable {
 			return resolvedResult;
 		};
 		return {
-			asyncResults: getAsyncResults(),
+			asyncResults: getAsyncResults()
+				.finally(() => tokenSource.dispose(true)),
 			syncResults
 		};
 	}
 
+	get hasAIResults(): boolean {
+		return !!(this.searchResult.getCachedSearchComplete(true)) || (!!this.currentAICancelTokenSource && !this.currentAICancelTokenSource.token.isCancellationRequested);
+	}
+
+	get hasPlainResults(): boolean {
+		return !!(this.searchResult.getCachedSearchComplete(false)) || (!!this.currentCancelTokenSource && !this.currentCancelTokenSource.token.isCancellationRequested);
+	}
+
 	search(query: ITextQuery, onProgress?: (result: ISearchProgressItem) => void, callerToken?: CancellationToken): {
 		asyncResults: Promise<ISearchComplete>;
 		syncResults: IFileMatch<URI>[];
@@ -2365,7 +2554,7 @@ export class SearchModel extends Disposable {
 
 export type FileMatchOrMatch = FileMatch | Match;
 
-export type RenderableMatch = FolderMatch | FolderMatchWithResource | FileMatch | Match;
+export type RenderableMatch = TextSearchResult | FolderMatch | FileMatch | Match;
 
 export class SearchViewModelWorkbenchService implements ISearchViewModelWorkbenchService {
 
@@ -2479,20 +2668,12 @@ export class RangeHighlightDecorations implements IDisposable {
 	});
 }
 
-
-
 function textSearchResultToMatches(rawMatch: ITextSearchMatch, fileMatch: FileMatch, isAiContributed: boolean): Match[] {
-	const previewLines = rawMatch.preview.text.split('\n');
-	if (Array.isArray(rawMatch.ranges)) {
-		return rawMatch.ranges.map((r, i) => {
-			const previewRange: ISearchRange = (<ISearchRange[]>rawMatch.preview.matches)[i];
-			return new Match(fileMatch, previewLines, previewRange, r, isAiContributed);
-		});
-	} else {
-		const previewRange = <ISearchRange>rawMatch.preview.matches;
-		const match = new Match(fileMatch, previewLines, previewRange, rawMatch.ranges, isAiContributed);
-		return [match];
-	}
+	const previewLines = rawMatch.previewText.split('\n');
+	return rawMatch.rangeLocations.map((rangeLocation) => {
+		const previewRange: ISearchRange = rangeLocation.preview;
+		return new Match(fileMatch, previewLines, previewRange, rangeLocation.source, isAiContributed);
+	});
 }
 
 // text search to notebook matches
@@ -2500,18 +2681,12 @@ function textSearchResultToMatches(rawMatch: ITextSearchMatch, fileMatch: FileMa
 export function textSearchMatchesToNotebookMatches(textSearchMatches: ITextSearchMatch[], cell: CellMatch): MatchInNotebook[] {
 	const notebookMatches: MatchInNotebook[] = [];
 	textSearchMatches.forEach((textSearchMatch) => {
-		const previewLines = textSearchMatch.preview.text.split('\n');
-		if (Array.isArray(textSearchMatch.ranges)) {
-			textSearchMatch.ranges.forEach((r, i) => {
-				const previewRange: ISearchRange = (<ISearchRange[]>textSearchMatch.preview.matches)[i];
-				const match = new MatchInNotebook(cell, previewLines, previewRange, r, textSearchMatch.webviewIndex);
-				notebookMatches.push(match);
-			});
-		} else {
-			const previewRange = <ISearchRange>textSearchMatch.preview.matches;
-			const match = new MatchInNotebook(cell, previewLines, previewRange, textSearchMatch.ranges, textSearchMatch.webviewIndex);
+		const previewLines = textSearchMatch.previewText.split('\n');
+		textSearchMatch.rangeLocations.map((rangeLocation) => {
+			const previewRange: ISearchRange = rangeLocation.preview;
+			const match = new MatchInNotebook(cell, previewLines, previewRange, rangeLocation.source, textSearchMatch.webviewIndex);
 			notebookMatches.push(match);
-		}
+		});
 	});
 	return notebookMatches;
 }
@@ -2541,8 +2716,6 @@ function getFileMatches(matches: (FileMatch | FolderMatchWithResource)[]): FileM
 	return fileMatches.concat(folderMatches.map(e => e.allDownstreamFileMatches()).flat());
 }
 
-
-
 function mergeSearchResultEvents(events: IChangeEvent[]): IChangeEvent {
 	const retEvent: IChangeEvent = {
 		elements: [],
diff --git a/src/vs/workbench/contrib/search/browser/searchResultsView.ts b/src/vs/workbench/contrib/search/browser/searchResultsView.ts
index 121512e94be..fe60b11eb14 100644
--- a/src/vs/workbench/contrib/search/browser/searchResultsView.ts
+++ b/src/vs/workbench/contrib/search/browser/searchResultsView.ts
@@ -3,35 +3,35 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge';
-import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
-import { ITreeNode } from 'vs/base/browser/ui/tree/tree';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import * as paths from 'vs/base/common/path';
-import * as nls from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { FileKind } from 'vs/platform/files/common/files';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { ISearchConfigurationProperties } from 'vs/workbench/services/search/common/search';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IResourceLabel, ResourceLabels } from 'vs/workbench/browser/labels';
-import { SearchView } from 'vs/workbench/contrib/search/browser/searchView';
-import { FileMatch, Match, RenderableMatch, SearchModel, FolderMatch, FolderMatchNoRoot, FolderMatchWorkspaceRoot, MatchInNotebook } from 'vs/workbench/contrib/search/browser/searchModel';
-import { isEqual } from 'vs/base/common/resources';
-import { ICompressibleTreeRenderer } from 'vs/base/browser/ui/tree/objectTree';
-import { ICompressedTreeNode } from 'vs/base/browser/ui/tree/compressedObjectTreeModel';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { HiddenItemStrategy, MenuWorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
-import { ISearchActionContext } from 'vs/workbench/contrib/search/browser/searchActionsRemoveReplace';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { defaultCountBadgeStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { SearchContext } from 'vs/workbench/contrib/search/common/constants';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import * as DOM from '../../../../base/browser/dom.js';
+import { CountBadge } from '../../../../base/browser/ui/countBadge/countBadge.js';
+import { IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
+import { IListAccessibilityProvider } from '../../../../base/browser/ui/list/listWidget.js';
+import { ITreeNode } from '../../../../base/browser/ui/tree/tree.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import * as paths from '../../../../base/common/path.js';
+import * as nls from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { FileKind } from '../../../../platform/files/common/files.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { ISearchConfigurationProperties } from '../../../services/search/common/search.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { IResourceLabel, ResourceLabels } from '../../../browser/labels.js';
+import { SearchView } from './searchView.js';
+import { FileMatch, Match, RenderableMatch, SearchModel, FolderMatch, FolderMatchNoRoot, FolderMatchWorkspaceRoot, TextSearchResult, AI_TEXT_SEARCH_RESULT_ID } from './searchModel.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { ICompressibleTreeRenderer } from '../../../../base/browser/ui/tree/objectTree.js';
+import { ICompressedTreeNode } from '../../../../base/browser/ui/tree/compressedObjectTreeModel.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { HiddenItemStrategy, MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
+import { ISearchActionContext } from './searchActionsRemoveReplace.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { defaultCountBadgeStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { SearchContext } from '../common/constants.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 
 interface IFolderMatchTemplate {
 	label: IResourceLabel;
@@ -42,6 +42,11 @@ interface IFolderMatchTemplate {
 	contextKeyService: IContextKeyService;
 }
 
+interface ITextSearchResultTemplate {
+	label: IResourceLabel;
+	disposables: DisposableStore;
+}
+
 interface IFileMatchTemplate {
 	el: HTMLElement;
 	label: IResourceLabel;
@@ -79,12 +84,57 @@ export class SearchDelegate implements IListVirtualDelegate<RenderableMatch> {
 			return FileMatchRenderer.TEMPLATE_ID;
 		} else if (element instanceof Match) {
 			return MatchRenderer.TEMPLATE_ID;
+		} else if (element instanceof TextSearchResult) {
+			return TextSearchResultRenderer.TEMPLATE_ID;
 		}
 
 		console.error('Invalid search tree element', element);
 		throw new Error('Invalid search tree element');
 	}
 }
+
+export class TextSearchResultRenderer extends Disposable implements ICompressibleTreeRenderer<TextSearchResult, any, ITextSearchResultTemplate> {
+	static readonly TEMPLATE_ID = 'textResultMatch';
+
+	readonly templateId = TextSearchResultRenderer.TEMPLATE_ID;
+
+	constructor(
+		private labels: ResourceLabels,
+		@IWorkspaceContextService protected contextService: IWorkspaceContextService
+	) {
+		super();
+	}
+	disposeCompressedElements?(node: ITreeNode<ICompressedTreeNode<TextSearchResult>, any>, index: number, templateData: ITextSearchResultTemplate, height: number | undefined): void {
+
+	}
+	renderTemplate(container: HTMLElement): ITextSearchResultTemplate {
+		const disposables = new DisposableStore();
+		const textSearchResultElement = DOM.append(container, DOM.$('.textsearchresult'));
+		const label = this.labels.create(textSearchResultElement, { supportDescriptionHighlights: true, supportHighlights: true });
+		disposables.add(label);
+		return { label, disposables };
+	}
+
+	async renderElement(node: ITreeNode<TextSearchResult, any>, index: number, templateData: IFolderMatchTemplate, height: number | undefined): Promise<void> {
+		if (node.element.id() === AI_TEXT_SEARCH_RESULT_ID) {
+			const aiName = await node.element.parent().searchModel.getAITextResultProviderName();
+			templateData.label.setLabel(nls.localize({
+				key: 'searchFolderMatch.aiText.label',
+				comment: ['This is displayed before the AI text search results, where {0} will be in the place of the AI name (ie: Copilot)']
+			}, '{0} Results', aiName));
+		} else {
+			templateData.label.setLabel(nls.localize('searchFolderMatch.plainText.label', "Text Results"));
+		}
+	}
+
+	disposeTemplate(templateData: IFolderMatchTemplate): void {
+		templateData.disposables.dispose();
+	}
+
+	renderCompressedElements(node: ITreeNode<ICompressedTreeNode<TextSearchResult>, any>, index: number, templateData: ITextSearchResultTemplate, height: number | undefined): void {
+	}
+
+}
 export class FolderMatchRenderer extends Disposable implements ICompressibleTreeRenderer<FolderMatch, any, IFolderMatchTemplate> {
 	static readonly TEMPLATE_ID = 'folderMatch';
 
@@ -235,7 +285,7 @@ export class FileMatchRenderer extends Disposable implements ICompressibleTreeRe
 		SearchContext.FileFocusKey.bindTo(contextKeyServiceMain).set(true);
 		SearchContext.FolderFocusKey.bindTo(contextKeyServiceMain).set(false);
 
-		const instantiationService = this.instantiationService.createChild(new ServiceCollection([IContextKeyService, contextKeyServiceMain]));
+		const instantiationService = this._register(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, contextKeyServiceMain])));
 		const actions = disposables.add(instantiationService.createInstance(MenuWorkbenchToolBar, actionBarContainer, MenuId.SearchActionMenu, {
 			menuOptions: {
 				shouldForwardArgs: true
@@ -327,7 +377,7 @@ export class MatchRenderer extends Disposable implements ICompressibleTreeRender
 		SearchContext.FileFocusKey.bindTo(contextKeyServiceMain).set(false);
 		SearchContext.FolderFocusKey.bindTo(contextKeyServiceMain).set(false);
 
-		const instantiationService = this.instantiationService.createChild(new ServiceCollection([IContextKeyService, contextKeyServiceMain]));
+		const instantiationService = this._register(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, contextKeyServiceMain])));
 		const actions = disposables.add(instantiationService.createInstance(MenuWorkbenchToolBar, actionBarContainer, MenuId.SearchActionMenu, {
 			menuOptions: {
 				shouldForwardArgs: true
@@ -356,7 +406,7 @@ export class MatchRenderer extends Disposable implements ICompressibleTreeRender
 		const preview = match.preview();
 		const replace = this.searchView.model.isReplaceActive() &&
 			!!this.searchView.model.replaceString &&
-			!(match instanceof MatchInNotebook && match.isReadonly());
+			!match.isReadonly();
 
 		templateData.before.textContent = preview.before;
 		templateData.match.textContent = preview.inside;
@@ -367,7 +417,7 @@ export class MatchRenderer extends Disposable implements ICompressibleTreeRender
 		const title = (preview.fullBefore + (replace ? match.replaceString : preview.inside) + preview.after).trim().substr(0, 999);
 		templateData.disposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), templateData.parent, title));
 
-		SearchContext.IsEditableItemKey.bindTo(templateData.contextKeyService).set(!(match instanceof MatchInNotebook && match.isReadonly()));
+		SearchContext.IsEditableItemKey.bindTo(templateData.contextKeyService).set(!match.isReadonly());
 
 		const numLines = match.range().endLineNumber - match.range().startLineNumber;
 		const extraLinesStr = numLines > 0 ? `+${numLines}` : '';
diff --git a/src/vs/workbench/contrib/search/browser/searchView.ts b/src/vs/workbench/contrib/search/browser/searchView.ts
index c2644fe66ee..0b70373878f 100644
--- a/src/vs/workbench/contrib/search/browser/searchView.ts
+++ b/src/vs/workbench/contrib/search/browser/searchView.ts
@@ -3,86 +3,84 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import * as aria from 'vs/base/browser/ui/aria/aria';
-import { MessageType } from 'vs/base/browser/ui/inputbox/inputBox';
-import { IIdentityProvider } from 'vs/base/browser/ui/list/list';
-import { ICompressedTreeElement } from 'vs/base/browser/ui/tree/compressedObjectTreeModel';
-import { ITreeContextMenuEvent, ObjectTreeElementCollapseState } from 'vs/base/browser/ui/tree/tree';
-import { Delayer, RunOnceScheduler } from 'vs/base/common/async';
-import * as errors from 'vs/base/common/errors';
-import { Event } from 'vs/base/common/event';
-import { Iterable } from 'vs/base/common/iterator';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import * as env from 'vs/base/common/platform';
-import * as strings from 'vs/base/common/strings';
-import { URI } from 'vs/base/common/uri';
-import * as network from 'vs/base/common/network';
-import 'vs/css!./media/searchview';
-import { getCodeEditor, isCodeEditor, isDiffEditor } from 'vs/editor/browser/editorBrowser';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget';
-import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { Selection } from 'vs/editor/common/core/selection';
-import { IEditor } from 'vs/editor/common/editorCommon';
-import { CommonFindController } from 'vs/editor/contrib/find/browser/findController';
-import { MultiCursorSelectionController } from 'vs/editor/contrib/multicursor/browser/multicursor';
-import * as nls from 'vs/nls';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationChangeEvent, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IConfirmation, IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { FileChangesEvent, FileChangeType, IFileService } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { getSelectionKeyboardEvent, WorkbenchCompressibleObjectTree } from 'vs/platform/list/browser/listService';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IOpenerService, withSelection } from 'vs/platform/opener/common/opener';
-import { IProgress, IProgressService, IProgressStep } from 'vs/platform/progress/common/progress';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { defaultInputBoxStyles, defaultToggleStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { IFileIconTheme, IThemeService } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { OpenFileFolderAction, OpenFolderAction } from 'vs/workbench/browser/actions/workspaceActions';
-import { ResourceListDnDHandler } from 'vs/workbench/browser/dnd';
-import { ResourceLabels } from 'vs/workbench/browser/labels';
-import { IViewPaneOptions, ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
-import { IEditorPane } from 'vs/workbench/common/editor';
-import { Memento, MementoObject } from 'vs/workbench/common/memento';
-import { IViewDescriptorService } from 'vs/workbench/common/views';
-import { NotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookEditor';
-import { ExcludePatternInputWidget, IncludePatternInputWidget } from 'vs/workbench/contrib/search/browser/patternInputWidget';
-import { appendKeyBindingLabel } from 'vs/workbench/contrib/search/browser/searchActionsBase';
-import { IFindInFilesArgs } from 'vs/workbench/contrib/search/browser/searchActionsFind';
-import { searchDetailsIcon } from 'vs/workbench/contrib/search/browser/searchIcons';
-import { renderSearchMessage } from 'vs/workbench/contrib/search/browser/searchMessage';
-import { FileMatchRenderer, FolderMatchRenderer, MatchRenderer, SearchAccessibilityProvider, SearchDelegate } from 'vs/workbench/contrib/search/browser/searchResultsView';
-import { SearchWidget } from 'vs/workbench/contrib/search/browser/searchWidget';
-import * as Constants from 'vs/workbench/contrib/search/common/constants';
-import { IReplaceService } from 'vs/workbench/contrib/search/browser/replace';
-import { getOutOfWorkspaceEditorResources, SearchStateKey, SearchUIState } from 'vs/workbench/contrib/search/common/search';
-import { ISearchHistoryService, ISearchHistoryValues, SearchHistoryService } from 'vs/workbench/contrib/search/common/searchHistoryService';
-import { FileMatch, FileMatchOrMatch, FolderMatch, FolderMatchWithResource, IChangeEvent, ISearchViewModelWorkbenchService, Match, MatchInNotebook, RenderableMatch, searchMatchComparer, SearchModel, SearchModelLocation, SearchResult } from 'vs/workbench/contrib/search/browser/searchModel';
-import { createEditorFromSearchResult } from 'vs/workbench/contrib/searchEditor/browser/searchEditorActions';
-import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { IPreferencesService, ISettingsEditorOptions } from 'vs/workbench/services/preferences/common/preferences';
-import { ITextQueryBuilderOptions, QueryBuilder } from 'vs/workbench/services/search/common/queryBuilder';
-import { IPatternInfo, ISearchComplete, ISearchConfiguration, ISearchConfigurationProperties, ITextQuery, QueryType, SearchCompletionExitCode, SearchSortOrder, TextSearchCompleteMessageType, ViewMode } from 'vs/workbench/services/search/common/search';
-import { TextSearchCompleteMessage } from 'vs/workbench/services/search/common/searchExtTypes';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { AccessibilitySignal, IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import * as dom from '../../../../base/browser/dom.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import * as aria from '../../../../base/browser/ui/aria/aria.js';
+import { MessageType } from '../../../../base/browser/ui/inputbox/inputBox.js';
+import { IIdentityProvider } from '../../../../base/browser/ui/list/list.js';
+import { IAsyncDataSource, ITreeContextMenuEvent, ObjectTreeElementCollapseState } from '../../../../base/browser/ui/tree/tree.js';
+import { Delayer, RunOnceScheduler } from '../../../../base/common/async.js';
+import * as errors from '../../../../base/common/errors.js';
+import { Event } from '../../../../base/common/event.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import * as env from '../../../../base/common/platform.js';
+import * as strings from '../../../../base/common/strings.js';
+import { URI } from '../../../../base/common/uri.js';
+import * as network from '../../../../base/common/network.js';
+import './media/searchview.css';
+import { getCodeEditor, isCodeEditor, isDiffEditor } from '../../../../editor/browser/editorBrowser.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { EmbeddedCodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/embeddedCodeEditorWidget.js';
+import { IEditorOptions } from '../../../../editor/common/config/editorOptions.js';
+import { Selection } from '../../../../editor/common/core/selection.js';
+import { IEditor } from '../../../../editor/common/editorCommon.js';
+import { CommonFindController } from '../../../../editor/contrib/find/browser/findController.js';
+import { MultiCursorSelectionController } from '../../../../editor/contrib/multicursor/browser/multicursor.js';
+import * as nls from '../../../../nls.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IConfigurationChangeEvent, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService, IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { IConfirmation, IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { FileChangesEvent, FileChangeType, IFileService } from '../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { getSelectionKeyboardEvent, WorkbenchCompressibleAsyncDataTree } from '../../../../platform/list/browser/listService.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IOpenerService, withSelection } from '../../../../platform/opener/common/opener.js';
+import { IProgress, IProgressService, IProgressStep } from '../../../../platform/progress/common/progress.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { defaultInputBoxStyles, defaultToggleStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { IFileIconTheme, IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { IWorkspaceContextService, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { OpenFileFolderAction, OpenFolderAction } from '../../../browser/actions/workspaceActions.js';
+import { ResourceListDnDHandler } from '../../../browser/dnd.js';
+import { ResourceLabels } from '../../../browser/labels.js';
+import { IViewPaneOptions, ViewPane } from '../../../browser/parts/views/viewPane.js';
+import { IEditorPane } from '../../../common/editor.js';
+import { Memento, MementoObject } from '../../../common/memento.js';
+import { IViewDescriptorService } from '../../../common/views.js';
+import { NotebookEditor } from '../../notebook/browser/notebookEditor.js';
+import { ExcludePatternInputWidget, IncludePatternInputWidget } from './patternInputWidget.js';
+import { appendKeyBindingLabel } from './searchActionsBase.js';
+import { IFindInFilesArgs } from './searchActionsFind.js';
+import { searchDetailsIcon } from './searchIcons.js';
+import { renderSearchMessage } from './searchMessage.js';
+import { FileMatchRenderer, FolderMatchRenderer, MatchRenderer, SearchAccessibilityProvider, SearchDelegate, TextSearchResultRenderer } from './searchResultsView.js';
+import { SearchWidget } from './searchWidget.js';
+import * as Constants from '../common/constants.js';
+import { IReplaceService } from './replace.js';
+import { getOutOfWorkspaceEditorResources, SearchStateKey, SearchUIState } from '../common/search.js';
+import { ISearchHistoryService, ISearchHistoryValues, SearchHistoryService } from '../common/searchHistoryService.js';
+import { AI_TEXT_SEARCH_RESULT_ID, FileMatch, FileMatchOrMatch, FolderMatch, FolderMatchNoRoot, FolderMatchWithResource, FolderMatchWorkspaceRoot, IChangeEvent, ISearchViewModelWorkbenchService, Match, MatchInNotebook, RenderableMatch, searchMatchComparer, SearchModel, SearchModelLocation, SearchResult, TextSearchResult } from './searchModel.js';
+import { createEditorFromSearchResult } from '../../searchEditor/browser/searchEditorActions.js';
+import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } from '../../../services/editor/common/editorService.js';
+import { IPreferencesService, ISettingsEditorOptions } from '../../../services/preferences/common/preferences.js';
+import { ITextQueryBuilderOptions, QueryBuilder } from '../../../services/search/common/queryBuilder.js';
+import { IPatternInfo, ISearchComplete, ISearchConfiguration, ISearchConfigurationProperties, ITextQuery, SearchCompletionExitCode, SearchSortOrder, TextSearchCompleteMessageType, ViewMode } from '../../../services/search/common/search.js';
+import { TextSearchCompleteMessage } from '../../../services/search/common/searchExtTypes.js';
+import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
+import { INotebookService } from '../../notebook/common/notebookService.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 
 const $ = dom.$;
 
@@ -126,7 +124,7 @@ export class SearchView extends ViewPane {
 	private hasFilePatternKey: IContextKey<boolean>;
 	private hasSomeCollapsibleResultKey: IContextKey<boolean>;
 
-	private tree!: WorkbenchCompressibleObjectTree<RenderableMatch>;
+	private tree!: WorkbenchCompressibleAsyncDataTree<SearchResult, RenderableMatch>;
 	private treeLabels!: ResourceLabels;
 	private viewletState: MementoObject;
 	private messagesElement!: HTMLElement;
@@ -143,7 +141,7 @@ export class SearchView extends ViewPane {
 	private currentSelectedFileMatch: FileMatch | undefined;
 
 	private delayedRefresh: Delayer<void>;
-	private changedWhileHidden: boolean = false;
+	private changedWhileHidden: boolean;
 
 	private searchWithoutFolderMessageElement: HTMLElement | undefined;
 
@@ -158,7 +156,6 @@ export class SearchView extends ViewPane {
 	private treeAccessibilityProvider: SearchAccessibilityProvider;
 
 	private treeViewKey: IContextKey<boolean>;
-	private aiResultsVisibleKey: IContextKey<boolean>;
 
 	private _visibleMatches: number = 0;
 
@@ -166,6 +163,8 @@ export class SearchView extends ViewPane {
 
 	private _onSearchResultChangedDisposable: IDisposable | undefined;
 
+	private searchDataSource: SearchViewDataSource | undefined;
+
 	constructor(
 		options: IViewPaneOptions,
 		@IFileService private readonly fileService: IFileService,
@@ -220,7 +219,6 @@ export class SearchView extends ViewPane {
 		this.hasFilePatternKey = Constants.SearchContext.ViewHasFilePatternKey.bindTo(this.contextKeyService);
 		this.hasSomeCollapsibleResultKey = Constants.SearchContext.ViewHasSomeCollapsibleKey.bindTo(this.contextKeyService);
 		this.treeViewKey = Constants.SearchContext.InTreeViewKey.bindTo(this.contextKeyService);
-		this.aiResultsVisibleKey = Constants.SearchContext.AIResultsVisibleKey.bindTo(this.contextKeyService);
 
 		this._register(this.contextKeyService.onDidChangeContext(e => {
 			const keys = Constants.SearchContext.hasAIResultProvider.keys();
@@ -240,20 +238,18 @@ export class SearchView extends ViewPane {
 		this.instantiationService = this._register(this.instantiationService.createChild(
 			new ServiceCollection([IContextKeyService, this.contextKeyService])));
 
-		this._register(this.configurationService.onDidChangeConfiguration(e => {
+		this._register(this.configurationService.onDidChangeConfiguration(async e => {
 			if (e.affectsConfiguration('search.sortOrder')) {
 				if (this.searchConfig.sortOrder === SearchSortOrder.Modified) {
 					// If changing away from modified, remove all fileStats
 					// so that updated files are re-retrieved next time.
 					this.removeFileStats();
 				}
-				this.refreshTree();
-			} else if (e.affectsConfiguration('search.aiResults')) {
-				this.refreshHasAISetting();
+				await this.refreshTree();
 			}
 		}));
 
-		this.viewModel = this._register(this.searchViewModelWorkbenchService.searchModel);
+		this.viewModel = this.searchViewModelWorkbenchService.searchModel;
 		this.queryBuilder = this.instantiationService.createInstance(QueryBuilder);
 		this.memento = new Memento(this.id, storageService);
 		this.viewletState = this.memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
@@ -296,6 +292,8 @@ export class SearchView extends ViewPane {
 				this.searchWidget.prependReplaceHistory(restoredHistory.replace);
 			}
 		}));
+
+		this.changedWhileHidden = this.hasSearchResults();
 	}
 
 	get isTreeLayoutViewVisible(): boolean {
@@ -306,41 +304,13 @@ export class SearchView extends ViewPane {
 		this.treeViewKey.set(visible);
 	}
 
-	get aiResultsVisible(): boolean {
-		return this.aiResultsVisibleKey.get() ?? false;
-	}
-
-	private set aiResultsVisible(visible: boolean) {
-		this.aiResultsVisibleKey.set(visible);
-	}
-
-	setTreeView(visible: boolean): void {
+	async setTreeView(visible: boolean): Promise<void> {
 		if (visible === this.isTreeLayoutViewVisible) {
 			return;
 		}
 		this.isTreeLayoutViewVisible = visible;
 		this.updateIndentStyles(this.themeService.getFileIconTheme());
-		this.refreshTree();
-	}
-
-	async setAIResultsVisible(visible: boolean): Promise<void> {
-		if (visible === this.aiResultsVisible) {
-			return;
-		}
-		this.aiResultsVisible = visible;
-		if (this.viewModel.searchResult.isEmpty()) {
-			return;
-		}
-
-		// in each case, we want to cancel our current AI search because it is no longer valid
-		this.model.cancelAISearch();
-		if (visible) {
-			await this.model.addAIResults();
-		} else {
-			this.searchWidget.toggleReplace(false);
-		}
-		this.onSearchResultsChanged();
-		this.onSearchComplete(() => { }, undefined, undefined, this.viewModel.searchResult.getCachedSearchComplete(visible));
+		return this.refreshTree();
 	}
 
 	private get state(): SearchUIState {
@@ -363,12 +333,20 @@ export class SearchView extends ViewPane {
 		return this.viewModel;
 	}
 
-	private refreshHasAISetting() {
-		const val = this.shouldShowAIButton();
-		if (val && this.searchWidget.searchInput) {
-			this.searchWidget.searchInput.sparkleVisible = val;
+	private async refreshHasAISetting(): Promise<void> {
+		const shouldShowAI = this.shouldShowAIResults();
+		if (!this.tree.hasNode(this.searchResult)) {
+			return;
+		}
+		if (shouldShowAI && !this.tree.hasNode(this.searchResult.aiTextSearchResult)) {
+			if (this.model.searchResult.getCachedSearchComplete(false)) {
+				return this.refreshAndUpdateCount();
+			}
+		} else if (!shouldShowAI && this.tree.hasNode(this.searchResult.aiTextSearchResult)) {
+			return this.refreshAndUpdateCount();
 		}
 	}
+
 	private onDidChangeWorkbenchState(): void {
 		if (this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY && this.searchWithoutFolderMessageElement) {
 			dom.hide(this.searchWithoutFolderMessageElement);
@@ -404,28 +382,29 @@ export class SearchView extends ViewPane {
 		searchModel.replaceActive = this.viewModel.isReplaceActive();
 		searchModel.replaceString = this.searchWidget.getReplaceValue();
 		this._onSearchResultChangedDisposable?.dispose();
-		this._onSearchResultChangedDisposable = this._register(searchModel.onSearchResultChanged((event) => this.onSearchResultsChanged(event)));
+		this._onSearchResultChangedDisposable = this._register(searchModel.onSearchResultChanged(async (event) => this.onSearchResultsChanged(event)));
 
 		// this call will also dispose of the old model
 		this.searchViewModelWorkbenchService.searchModel = searchModel;
 		this.viewModel = searchModel;
+		this.tree.setInput(this.viewModel.searchResult);
 
-		this.onSearchResultsChanged();
+		await this.onSearchResultsChanged();
 		this.refreshInputs();
 
 		asyncResults.then((complete) => {
 			clearTimeout(slowTimer);
-			this.onSearchComplete(progressComplete, undefined, undefined, complete);
+			return this.onSearchComplete(progressComplete, undefined, undefined, complete);
 		}, (e) => {
 			clearTimeout(slowTimer);
-			this.onSearchError(e, progressComplete, undefined, undefined);
+			return this.onSearchError(e, progressComplete, undefined, undefined);
 		});
 
 		const collapseResults = this.searchConfig.collapseResults;
-		if (collapseResults !== 'alwaysCollapse' && this.viewModel.searchResult.matches(this.aiResultsVisible).length === 1) {
-			const onlyMatch = this.viewModel.searchResult.matches(this.aiResultsVisible)[0];
+		if (collapseResults !== 'alwaysCollapse' && this.viewModel.searchResult.matches().length === 1) {
+			const onlyMatch = this.viewModel.searchResult.matches()[0];
 			if (onlyMatch.count() < 50) {
-				this.tree.expand(onlyMatch);
+				await this.tree.expand(onlyMatch);
 			}
 		}
 	}
@@ -436,7 +415,6 @@ export class SearchView extends ViewPane {
 
 		this.searchWidgetsContainerElement = dom.append(this.container, $('.search-widgets-container'));
 		this.createSearchWidget(this.searchWidgetsContainerElement);
-		this.refreshHasAISetting();
 
 		const history = this.searchHistoryService.load();
 		const filePatterns = this.viewletState['query.filePatterns'] || '';
@@ -453,9 +431,10 @@ export class SearchView extends ViewPane {
 		this.queryDetails = dom.append(this.searchWidgetsContainerElement, $('.query-details'));
 
 		// Toggle query details button
+		const toggleQueryDetailsLabel = nls.localize('moreSearch', "Toggle Search Details");
 		this.toggleQueryDetailsButton = dom.append(this.queryDetails,
-			$('.more' + ThemeIcon.asCSSSelector(searchDetailsIcon), { tabindex: 0, role: 'button' }));
-		this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), this.toggleQueryDetailsButton, nls.localize('moreSearch', "Toggle Search Details")));
+			$('.more' + ThemeIcon.asCSSSelector(searchDetailsIcon), { tabindex: 0, role: 'button', 'aria-label': toggleQueryDetailsLabel }));
+		this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), this.toggleQueryDetailsButton, toggleQueryDetailsLabel));
 
 		this._register(dom.addDisposableListener(this.toggleQueryDetailsButton, dom.EventType.CLICK, e => {
 			dom.EventHelper.stop(e);
@@ -544,7 +523,7 @@ export class SearchView extends ViewPane {
 			this.toggleQueryDetails(true, true, true);
 		}
 
-		this._onSearchResultChangedDisposable = this._register(this.viewModel.onSearchResultChanged((event) => this.onSearchResultsChanged(event)));
+		this._onSearchResultChangedDisposable = this._register(this.viewModel.onSearchResultChanged(async (event) => await this.onSearchResultsChanged(event)));
 
 		this._register(this.onDidChangeBodyVisibility(visible => this.onVisibilityChanged(visible)));
 
@@ -556,12 +535,12 @@ export class SearchView extends ViewPane {
 		this.resultsElement.classList.toggle('hide-arrows', this.isTreeLayoutViewVisible && theme.hidesExplorerArrows);
 	}
 
-	private onVisibilityChanged(visible: boolean): void {
+	private async onVisibilityChanged(visible: boolean): Promise<void> {
 		this.viewletVisible.set(visible);
 		if (visible) {
 			if (this.changedWhileHidden) {
 				// Render if results changed while viewlet was hidden - #37818
-				this.refreshAndUpdateCount();
+				await this.refreshAndUpdateCount();
 				this.changedWhileHidden = false;
 			}
 		} else {
@@ -619,8 +598,7 @@ export class SearchView extends ViewPane {
 				isInNotebookMarkdownPreview,
 				isInNotebookCellInput,
 				isInNotebookCellOutput,
-			},
-			initialAIButtonVisibility: this.shouldShowAIButton()
+			}
 		}));
 
 		if (!this.searchWidget.searchInput || !this.searchWidget.replaceInput) {
@@ -635,11 +613,7 @@ export class SearchView extends ViewPane {
 		this._register(this.searchWidget.onSearchSubmit(options => this.triggerQueryChange(options)));
 		this._register(this.searchWidget.onSearchCancel(({ focus }) => this.cancelSearch(focus)));
 		this._register(this.searchWidget.searchInput.onDidOptionChange(() => {
-			if (this.searchWidget.searchInput && this.searchWidget.searchInput.isAIEnabled !== this.aiResultsVisible) {
-				this.setAIResultsVisible(this.searchWidget.searchInput.isAIEnabled);
-			} else {
-				this.triggerQueryChange();
-			}
+			this.triggerQueryChange();
 		}));
 
 		this._register(this.searchWidget.getNotebookFilters().onDidChange(() => this.triggerQueryChange()));
@@ -655,19 +629,19 @@ export class SearchView extends ViewPane {
 		this._register(this.searchWidget.onDidHeightChange(() => this.reLayout()));
 
 		this._register(this.searchWidget.onReplaceToggled(() => this.reLayout()));
-		this._register(this.searchWidget.onReplaceStateChange((state) => {
+		this._register(this.searchWidget.onReplaceStateChange(async (state) => {
 			this.viewModel.replaceActive = state;
-			this.refreshTree();
+			await this.refreshTree();
 		}));
 
-		this._register(this.searchWidget.onPreserveCaseChange((state) => {
+		this._register(this.searchWidget.onPreserveCaseChange(async (state) => {
 			this.viewModel.preserveCase = state;
-			this.refreshTree();
+			await this.refreshTree();
 		}));
 
 		this._register(this.searchWidget.onReplaceValueChanged(() => {
 			this.viewModel.replaceString = this.searchWidget.getReplaceValue();
-			this.delayedRefresh.trigger(() => this.refreshTree());
+			this.delayedRefresh.trigger(async () => this.refreshTree());
 		}));
 
 		this._register(this.searchWidget.onBlur(() => {
@@ -680,13 +654,13 @@ export class SearchView extends ViewPane {
 		this.trackInputBox(this.searchWidget.replaceInputFocusTracker);
 	}
 
-	private shouldShowAIButton(): boolean {
+	public shouldShowAIResults(): boolean {
 		const hasProvider = Constants.SearchContext.hasAIResultProvider.getValue(this.contextKeyService);
-		return !!(this.configurationService.getValue<boolean>('search.aiResults') && hasProvider);
+		return !!hasProvider;
 	}
-	private onConfigurationUpdated(event?: IConfigurationChangeEvent): void {
+	private async onConfigurationUpdated(event?: IConfigurationChangeEvent): Promise<void> {
 		if (event && (event.affectsConfiguration('search.decorations.colors') || event.affectsConfiguration('search.decorations.badges'))) {
-			this.refreshTree();
+			return this.refreshTree();
 		}
 	}
 
@@ -709,7 +683,7 @@ export class SearchView extends ViewPane {
 		}));
 	}
 
-	private onSearchResultsChanged(event?: IChangeEvent): void {
+	private async onSearchResultsChanged(event?: IChangeEvent): Promise<void> {
 		if (this.isVisible()) {
 			return this.refreshAndUpdateCount(event);
 		} else {
@@ -717,86 +691,55 @@ export class SearchView extends ViewPane {
 		}
 	}
 
-	private refreshAndUpdateCount(event?: IChangeEvent): void {
-		this.searchWidget.setReplaceAllActionState(!this.viewModel.searchResult.isEmpty(this.aiResultsVisible));
+	public refreshTreePromiseSerializer: Promise<void> = Promise.resolve();
+	private async refreshAndUpdateCount(event?: IChangeEvent): Promise<void> {
+		this.searchWidget.setReplaceAllActionState(!this.viewModel.searchResult.isEmpty());
 		this.updateSearchResultCount(this.viewModel.searchResult.query!.userDisabledExcludesAndIgnoreFiles, this.viewModel.searchResult.query?.onlyOpenEditors, event?.clearingAll);
 		return this.refreshTree(event);
 	}
 
-	refreshTree(event?: IChangeEvent): void {
+	private async refreshTree(event?: IChangeEvent): Promise<void> {
+		this.refreshTreePromiseSerializer = this.refreshTreePromiseSerializer.then(async () => {
+			if (!event || event.added || event.removed) {
+				// Refresh whole tree
+				if (this.searchConfig.sortOrder === SearchSortOrder.Modified) {
+					// Ensure all matches have retrieved their file stat
+					await this.retrieveFileStats()
+						.then(() => this.tree.updateChildren(undefined));
+				} else {
+					await this.tree.updateChildren(undefined);
+				}
+			} else {
+				// If updated counts affect our search order, re-sort the view.
+				if (this.searchConfig.sortOrder === SearchSortOrder.CountAscending ||
+					this.searchConfig.sortOrder === SearchSortOrder.CountDescending) {
+
+					await this.tree.updateChildren(undefined);
+				} else {
+					// FileMatch modified, refresh those elements
+					await Promise.all(event.elements.map(async element => {
+						await this.tree.updateChildren(element);
+						this.tree.rerender(element);
+					}));
+				}
+			}
+		});
+		return this.refreshTreePromiseSerializer;
+	}
+
+	private originalShouldCollapse(match: RenderableMatch) {
 		const collapseResults = this.searchConfig.collapseResults;
-		if (!event || event.added || event.removed) {
-			// Refresh whole tree
-			if (this.searchConfig.sortOrder === SearchSortOrder.Modified) {
-				// Ensure all matches have retrieved their file stat
-				this.retrieveFileStats()
-					.then(() => this.tree.setChildren(null, this.createResultIterator(collapseResults)));
-			} else {
-				this.tree.setChildren(null, this.createResultIterator(collapseResults));
-			}
-		} else {
-			// If updated counts affect our search order, re-sort the view.
-			if (this.searchConfig.sortOrder === SearchSortOrder.CountAscending ||
-				this.searchConfig.sortOrder === SearchSortOrder.CountDescending) {
-				this.tree.setChildren(null, this.createResultIterator(collapseResults));
-			} else {
-				// FileMatch modified, refresh those elements
-				event.elements.forEach(element => {
-					this.tree.setChildren(element, this.createIterator(element, collapseResults));
-					this.tree.rerender(element);
-				});
-			}
+		return (collapseResults === 'alwaysCollapse' ||
+			(!(match instanceof Match) && match.count() > 10 && collapseResults !== 'alwaysExpand')) ?
+			ObjectTreeElementCollapseState.PreserveOrCollapsed : ObjectTreeElementCollapseState.PreserveOrExpanded;
+	}
+
+	private shouldCollapse(match: RenderableMatch): boolean {
+		const collapseResults = this.originalShouldCollapse(match);
+		if (collapseResults === ObjectTreeElementCollapseState.PreserveOrCollapsed) {
+			return true;
 		}
-	}
-
-	private createResultIterator(collapseResults: ISearchConfigurationProperties['collapseResults']): Iterable<ICompressedTreeElement<RenderableMatch>> {
-		const folderMatches = this.searchResult.folderMatches(this.aiResultsVisible)
-			.filter(fm => !fm.isEmpty())
-			.sort(searchMatchComparer);
-
-		if (folderMatches.length === 1) {
-			return this.createFolderIterator(folderMatches[0], collapseResults, true);
-		}
-
-		return Iterable.map(folderMatches, (folderMatch): ICompressedTreeElement<RenderableMatch> => {
-			const children = this.createFolderIterator(folderMatch, collapseResults, true);
-			return { element: folderMatch, children, incompressible: true }; // roots should always be incompressible
-		});
-	}
-
-	private createFolderIterator(folderMatch: FolderMatch, collapseResults: ISearchConfigurationProperties['collapseResults'], childFolderIncompressible: boolean): Iterable<ICompressedTreeElement<RenderableMatch>> {
-		const sortOrder = this.searchConfig.sortOrder;
-
-		const matchArray = this.isTreeLayoutViewVisible ? folderMatch.matches() : folderMatch.allDownstreamFileMatches();
-		const matches = matchArray.sort((a, b) => searchMatchComparer(a, b, sortOrder));
-
-		return Iterable.map(matches, (match): ICompressedTreeElement<RenderableMatch> => {
-			let children;
-			if (match instanceof FileMatch) {
-				children = this.createFileIterator(match);
-			} else {
-				children = this.createFolderIterator(match, collapseResults, false);
-			}
-
-			const collapsed = (collapseResults === 'alwaysCollapse' || (match.count() > 10 && collapseResults !== 'alwaysExpand')) ? ObjectTreeElementCollapseState.PreserveOrCollapsed : ObjectTreeElementCollapseState.PreserveOrExpanded;
-
-			return { element: match, children, collapsed, incompressible: (match instanceof FileMatch) ? true : childFolderIncompressible };
-		});
-	}
-
-	private createFileIterator(fileMatch: FileMatch): Iterable<ICompressedTreeElement<RenderableMatch>> {
-		let matches = fileMatch.matches().sort(searchMatchComparer);
-
-		if (!this.aiResultsVisible) {
-			matches = matches.filter(e => !e.aiContributed);
-		}
-		return Iterable.map(matches, (r): ICompressedTreeElement<RenderableMatch> => ({ element: r, incompressible: true }));
-	}
-
-	private createIterator(match: FolderMatch | FileMatch | SearchResult, collapseResults: ISearchConfigurationProperties['collapseResults']): Iterable<ICompressedTreeElement<RenderableMatch>> {
-		return match instanceof SearchResult ? this.createResultIterator(collapseResults) :
-			match instanceof FolderMatch ? this.createFolderIterator(match, collapseResults, false) :
-				this.createFileIterator(match);
+		return false;
 	}
 
 	private replaceAll(): void {
@@ -933,16 +876,28 @@ export class SearchView extends ViewPane {
 			}
 		};
 
+		this.searchDataSource = this.instantiationService.createInstance(SearchViewDataSource, this);
 		this.treeLabels = this._register(this.instantiationService.createInstance(ResourceLabels, { onDidChangeVisibility: this.onDidChangeBodyVisibility }));
-		this.tree = this._register(<WorkbenchCompressibleObjectTree<RenderableMatch>>this.instantiationService.createInstance(WorkbenchCompressibleObjectTree,
+		this.tree = this._register(this.instantiationService.createInstance(WorkbenchCompressibleAsyncDataTree<SearchResult, RenderableMatch>,
 			'SearchView',
 			this.resultsElement,
 			delegate,
+			{
+				isIncompressible: (element: RenderableMatch) => {
+
+					if (element instanceof FolderMatch && !(element.parent() instanceof TextSearchResult) && !(element.parent() instanceof FolderMatchWorkspaceRoot) && !(element.parent() instanceof FolderMatchNoRoot)) {
+						return false;
+					}
+					return true;
+				}
+			},
 			[
 				this._register(this.instantiationService.createInstance(FolderMatchRenderer, this, this.treeLabels)),
 				this._register(this.instantiationService.createInstance(FileMatchRenderer, this, this.treeLabels)),
+				this._register(this.instantiationService.createInstance(TextSearchResultRenderer, this.treeLabels)),
 				this._register(this.instantiationService.createInstance(MatchRenderer, this)),
 			],
+			this.searchDataSource,
 			{
 				identityProvider,
 				accessibilityProvider: this.treeAccessibilityProvider,
@@ -958,8 +913,17 @@ export class SearchView extends ViewPane {
 				multipleSelectionSupport: true,
 				selectionNavigation: true,
 				overrideStyles: this.getLocationBasedColors().listOverrideStyles,
-				paddingBottom: SearchDelegate.ITEM_HEIGHT
+				paddingBottom: SearchDelegate.ITEM_HEIGHT,
+				collapseByDefault: (e: RenderableMatch) => {
+					if (e.id() === AI_TEXT_SEARCH_RESULT_ID) {
+						// always collapse the ai text search result
+						return true;
+					}
+					return this.shouldCollapse(e);
+				}
 			}));
+
+		this.tree.setInput(this.viewModel.searchResult);
 		this._register(this.tree.onContextMenu(e => this.onContextMenu(e)));
 		const updateHasSomeCollapsible = () => this.toggleCollapseStateDelayer.trigger(() => this.hasSomeCollapsibleResultKey.set(this.hasSomeCollapsible()));
 		updateHasSomeCollapsible();
@@ -989,7 +953,8 @@ export class SearchView extends ViewPane {
 			const focus = this.tree.getFocus()[0];
 
 			if (this.tree.isDOMFocused()) {
-				this.firstMatchFocused.set(this.tree.navigate().first() === focus);
+				const firstElem = this.tree.getFirstElementChild(this.tree.getInput());
+				this.firstMatchFocused.set(firstElem === focus);
 				this.fileMatchOrMatchFocused.set(!!focus);
 				this.fileMatchFocused.set(focus instanceof FileMatch);
 				this.folderMatchFocused.set(focus instanceof FolderMatch);
@@ -1002,7 +967,7 @@ export class SearchView extends ViewPane {
 
 			let editable = false;
 			if (focus instanceof Match) {
-				editable = (focus instanceof MatchInNotebook) ? !focus.isReadonly() : true;
+				editable = !focus.isReadonly();
 			} else if (focus instanceof FileMatch) {
 				editable = !focus.hasOnlyReadOnlyMatches();
 			} else if (focus instanceof FolderMatch) {
@@ -1043,7 +1008,8 @@ export class SearchView extends ViewPane {
 		const navigator = viewer.navigate();
 		let node = navigator.first();
 		do {
-			if (!viewer.isCollapsed(node)) {
+			if (node && !viewer.isCollapsed(node) && (this.viewModel.hasAIResults || node.id() !== AI_TEXT_SEARCH_RESULT_ID)) {
+				// ignore the ai text search result id
 				return true;
 			}
 		} while (node = navigator.next());
@@ -1051,7 +1017,7 @@ export class SearchView extends ViewPane {
 		return false;
 	}
 
-	selectNextMatch(): void {
+	async selectNextMatch(): Promise<void> {
 		if (!this.hasSearchResults()) {
 			return;
 		}
@@ -1061,7 +1027,7 @@ export class SearchView extends ViewPane {
 		// Expand the initial selected node, if needed
 		if (selected && !(selected instanceof Match)) {
 			if (this.tree.isCollapsed(selected)) {
-				this.tree.expand(selected);
+				await this.tree.expand(selected);
 			}
 		}
 
@@ -1075,7 +1041,7 @@ export class SearchView extends ViewPane {
 		// Expand until first child is a Match
 		while (next && !(next instanceof Match)) {
 			if (this.tree.isCollapsed(next)) {
-				this.tree.expand(next);
+				await this.tree.expand(next);
 			}
 
 			// Select the first child
@@ -1096,7 +1062,7 @@ export class SearchView extends ViewPane {
 		}
 	}
 
-	selectPreviousMatch(): void {
+	async selectPreviousMatch(): Promise<void> {
 		if (!this.hasSearchResults()) {
 			return;
 		}
@@ -1118,9 +1084,12 @@ export class SearchView extends ViewPane {
 		}
 
 		// Expand until last child is a Match
-		while (!(prev instanceof Match)) {
+		while (prev && !(prev instanceof Match)) {
 			const nextItem = navigator.next();
-			this.tree.expand(prev);
+			if (!nextItem) {
+				break;
+			}
+			await this.tree.expand(prev);
 			navigator = this.tree.navigate(nextItem); // recreate navigator because modifying the tree can invalidate it
 			prev = nextItem ? navigator.previous() : navigator.last(); // select last child
 		}
@@ -1325,7 +1294,7 @@ export class SearchView extends ViewPane {
 	}
 
 	hasSearchResults(): boolean {
-		return !this.viewModel.searchResult.isEmpty(this.aiResultsVisible);
+		return !this.viewModel.searchResult.isEmpty();
 	}
 
 	clearSearchResults(clearInput = true): void {
@@ -1361,7 +1330,7 @@ export class SearchView extends ViewPane {
 	}
 
 	private selectTreeIfNotSelected(): void {
-		if (this.tree.getNode(null)) {
+		if (this.tree.getNode(undefined)) {
 			this.tree.domFocus();
 			const selection = this.tree.getSelection();
 			if (selection.length === 0) {
@@ -1520,11 +1489,23 @@ export class SearchView extends ViewPane {
 		}
 	}
 
+	private _getExcludePattern(): string {
+		return this.inputPatternExcludes.getValue().trim();
+	}
+
+	private _getIncludePattern(): string {
+		return this.inputPatternIncludes.getValue().trim();
+	}
+
 	private _onQueryChanged(preserveFocus: boolean, triggeredOnType = false): void {
 		if (!(this.searchWidget.searchInput?.inputBox.isInputValid())) {
 			return;
 		}
 
+		// ensure that the node is closed when a new search is triggered
+		if (this.tree.hasNode(this.searchResult.aiTextSearchResult)) {
+			this.tree.collapse(this.searchResult.aiTextSearchResult);
+		}
 		const isRegex = this.searchWidget.searchInput.getRegex();
 		const isInNotebookMarkdownInput = this.searchWidget.getNotebookFilters().markupInput;
 		const isInNotebookMarkdownPreview = this.searchWidget.getNotebookFilters().markupPreview;
@@ -1534,8 +1515,8 @@ export class SearchView extends ViewPane {
 		const isWholeWords = this.searchWidget.searchInput.getWholeWords();
 		const isCaseSensitive = this.searchWidget.searchInput.getCaseSensitive();
 		const contentPattern = this.searchWidget.searchInput.getValue();
-		const excludePatternText = this.inputPatternExcludes.getValue().trim();
-		const includePatternText = this.inputPatternIncludes.getValue().trim();
+		const excludePatternText = this._getExcludePattern();
+		const includePatternText = this._getIncludePattern();
 		const useExcludesAndIgnoreFiles = this.inputPatternExcludes.useExcludesAndIgnoreFiles();
 		const onlySearchInOpenEditors = this.inputPatternIncludes.onlySearchInOpenEditors();
 
@@ -1558,7 +1539,7 @@ export class SearchView extends ViewPane {
 			}
 		};
 
-		const excludePattern = this.inputPatternExcludes.getValue();
+		const excludePattern = [{ pattern: this.inputPatternExcludes.getValue() }];
 		const includePattern = this.inputPatternIncludes.getValue();
 
 		// Need the full match line to correctly calculate replace text, if this is a search/replace with regex group references ($1, $2, ...).
@@ -1644,16 +1625,16 @@ export class SearchView extends ViewPane {
 	}
 
 
-	private _updateResults() {
+	private async _updateResults() {
 		if (this.state === SearchUIState.Idle) {
 			return;
 		}
 		try {
 			// Search result tree update
-			const fileCount = this.viewModel.searchResult.fileCount(this.aiResultsVisible);
+			const fileCount = this.viewModel.searchResult.fileCount();
 			if (this._visibleMatches !== fileCount) {
 				this._visibleMatches = fileCount;
-				this.refreshAndUpdateCount();
+				await this.refreshAndUpdateCount();
 			}
 		} finally {
 			// show frequent progress and results by scheduling updates 80 ms after the last one
@@ -1661,7 +1642,7 @@ export class SearchView extends ViewPane {
 		}
 	}
 
-	private onSearchComplete(progressComplete: () => void, excludePatternText?: string, includePatternText?: string, completed?: ISearchComplete) {
+	private async onSearchComplete(progressComplete: () => void, excludePatternText?: string, includePatternText?: string, completed?: ISearchComplete) {
 
 		this.state = SearchUIState.Idle;
 
@@ -1672,14 +1653,14 @@ export class SearchView extends ViewPane {
 		this.onSearchResultsChanged();
 
 		const collapseResults = this.searchConfig.collapseResults;
-		if (collapseResults !== 'alwaysCollapse' && this.viewModel.searchResult.matches(this.aiResultsVisible).length === 1) {
-			const onlyMatch = this.viewModel.searchResult.matches(this.aiResultsVisible)[0];
+		if (collapseResults !== 'alwaysCollapse' && this.viewModel.searchResult.matches().length === 1) {
+			const onlyMatch = this.viewModel.searchResult.matches()[0];
 			if (onlyMatch.count() < 50) {
-				this.tree.expand(onlyMatch);
+				await this.tree.expand(onlyMatch);
 			}
 		}
 
-		const hasResults = !this.viewModel.searchResult.isEmpty(this.aiResultsVisible);
+		const hasResults = !this.viewModel.searchResult.isEmpty();
 		if (completed?.exit === SearchCompletionExitCode.NewSearchStarted) {
 			return;
 		}
@@ -1747,7 +1728,7 @@ export class SearchView extends ViewPane {
 			this.viewModel.searchResult.toggleHighlights(this.isVisible()); // show highlights
 
 			// Indicate final search result count for ARIA
-			aria.status(nls.localize('ariaSearchResultsStatus', "Search returned {0} results in {1} files", this.viewModel.searchResult.count(this.aiResultsVisible), this.viewModel.searchResult.fileCount()));
+			aria.status(nls.localize('ariaSearchResultsStatus', "Search returned {0} results in {1} files", this.viewModel.searchResult.count(), this.viewModel.searchResult.fileCount()));
 		}
 
 
@@ -1764,7 +1745,7 @@ export class SearchView extends ViewPane {
 		this.reLayout();
 	}
 
-	private onSearchError(e: any, progressComplete: () => void, excludePatternText?: string, includePatternText?: string, completed?: ISearchComplete) {
+	private async onSearchError(e: any, progressComplete: () => void, excludePatternText?: string, includePatternText?: string, completed?: ISearchComplete) {
 		this.state = SearchUIState.Idle;
 		if (errors.isCancellationError(e)) {
 			return this.onSearchComplete(progressComplete, excludePatternText, includePatternText, completed);
@@ -1777,6 +1758,43 @@ export class SearchView extends ViewPane {
 		}
 	}
 
+	public async addAIResults() {
+		const excludePatternText = this._getExcludePattern();
+		const includePatternText = this._getIncludePattern();
+		let progressComplete: () => void;
+		this.progressService.withProgress({ location: this.getProgressLocation(), delay: 0 }, _progress => {
+			return new Promise<void>(resolve => progressComplete = resolve);
+		});
+
+		this.searchWidget.searchInput?.clearMessage();
+		this.state = SearchUIState.Searching;
+		this.showEmptyStage();
+
+		const slowTimer = setTimeout(() => {
+			this.state = SearchUIState.SlowSearch;
+		}, 2000);
+
+		this._visibleMatches = 0;
+
+		this._refreshResultsScheduler.schedule();
+
+		this.searchWidget.setReplaceAllActionState(false);
+
+		this.tree.setSelection([]);
+		this.tree.setFocus([]);
+
+		this.viewModel.replaceString = this.searchWidget.getReplaceValue();
+		const result = this.viewModel.addAIResults();
+		return result.then((complete) => {
+			clearTimeout(slowTimer);
+			return this.onSearchComplete(progressComplete, excludePatternText, includePatternText, complete);
+		}, (e) => {
+			clearTimeout(slowTimer);
+			return this.onSearchError(e, progressComplete, excludePatternText, includePatternText);
+		});
+
+	}
+
 	private doSearch(query: ITextQuery, excludePatternText: string, includePatternText: string, triggeredOnType: boolean): Thenable<void> {
 		let progressComplete: () => void;
 		this.progressService.withProgress({ location: this.getProgressLocation(), delay: triggeredOnType ? 300 : 0 }, _progress => {
@@ -1802,26 +1820,12 @@ export class SearchView extends ViewPane {
 
 		this.viewModel.replaceString = this.searchWidget.getReplaceValue();
 		const result = this.viewModel.search(query);
-		if (this.aiResultsVisible) {
-			const aiResult = this.viewModel.aiSearch({ ...query, contentPattern: query.contentPattern.pattern, type: QueryType.aiText });
-			return result.asyncResults.then(
-				() => aiResult.then(
-					(complete) => {
-						clearTimeout(slowTimer);
-						this.onSearchComplete(progressComplete, excludePatternText, includePatternText, complete);
-					}, (e) => {
-						clearTimeout(slowTimer);
-						this.onSearchError(e, progressComplete, excludePatternText, includePatternText);
-					}
-				)
-			);
-		}
 		return result.asyncResults.then((complete) => {
 			clearTimeout(slowTimer);
-			this.onSearchComplete(progressComplete, excludePatternText, includePatternText, complete);
+			return this.onSearchComplete(progressComplete, excludePatternText, includePatternText, complete);
 		}, (e) => {
 			clearTimeout(slowTimer);
-			this.onSearchError(e, progressComplete, excludePatternText, includePatternText);
+			return this.onSearchError(e, progressComplete, excludePatternText, includePatternText);
 		});
 	}
 
@@ -1860,8 +1864,8 @@ export class SearchView extends ViewPane {
 	}
 
 	private updateSearchResultCount(disregardExcludesAndIgnores?: boolean, onlyOpenEditors?: boolean, clear: boolean = false): void {
-		const fileCount = this.viewModel.searchResult.fileCount(this.aiResultsVisible);
-		const resultCount = this.viewModel.searchResult.count(this.aiResultsVisible);
+		const fileCount = this.viewModel.searchResult.fileCount();
+		const resultCount = this.viewModel.searchResult.count();
 		this.hasSearchResultsKey.set(fileCount > 0);
 
 		const msgWasHidden = this.messagesElement.style.display === 'none';
@@ -1983,12 +1987,12 @@ export class SearchView extends ViewPane {
 
 			const editorControl = editor?.getControl();
 			if (element instanceof Match && preserveFocus && isCodeEditor(editorControl)) {
-				this.viewModel.searchResult.rangeHighlightDecorations.highlightRange(
+				this.viewModel.searchResult.getRangeHighlightDecorations().highlightRange(
 					editorControl.getModel()!,
 					element.range()
 				);
 			} else {
-				this.viewModel.searchResult.rangeHighlightDecorations.removeHighlightRange();
+				this.viewModel.searchResult.getRangeHighlightDecorations().removeHighlightRange();
 			}
 		} catch (err) {
 			errors.onUnexpectedError(err);
@@ -2053,7 +2057,7 @@ export class SearchView extends ViewPane {
 					}
 				}
 			}
-			this.viewModel.searchResult.rangeHighlightDecorations.removeHighlightRange();
+			this.viewModel.searchResult.getRangeHighlightDecorations().removeHighlightRange();
 		}, errors.onUnexpectedError);
 	}
 
@@ -2092,7 +2096,7 @@ export class SearchView extends ViewPane {
 			const changedMatches = matches.filter(m => e.contains(m.resource));
 			if (changedMatches.length && this.searchConfig.sortOrder === SearchSortOrder.Modified) {
 				// No matches need to be removed, but modified files need to have their file stat updated.
-				this.updateFileStats(changedMatches).then(() => this.refreshTree());
+				this.updateFileStats(changedMatches).then(async () => this.refreshTree());
 			}
 		}
 	}
@@ -2190,7 +2194,7 @@ export class SearchView extends ViewPane {
 	}
 
 	private async retrieveFileStats(): Promise<void> {
-		const files = this.searchResult.matches(this.aiResultsVisible).filter(f => !f.fileStat).map(f => f.resolveFileStat(this.fileService));
+		const files = this.searchResult.matches().filter(f => !f.fileStat).map(f => f.resolveFileStat(this.fileService));
 		await Promise.all(files);
 	}
 
@@ -2244,7 +2248,7 @@ class SearchLinkButton extends Disposable {
 	}
 }
 
-export function getEditorSelectionFromMatch(element: FileMatchOrMatch, viewModel: SearchModel): any {
+export function getEditorSelectionFromMatch(element: FileMatchOrMatch, viewModel: SearchModel) {
 	let match: Match | null = null;
 	if (element instanceof Match) {
 		match = element;
@@ -2318,3 +2322,100 @@ export function getSelectionTextFromEditor(allowUnselectedWord: boolean, activeE
 
 	return searchText;
 }
+
+class SearchViewDataSource implements IAsyncDataSource<SearchResult, RenderableMatch> {
+
+	constructor(
+		private searchView: SearchView,
+		@IConfigurationService private configurationService: IConfigurationService,
+	) { }
+
+
+	private get searchConfig(): ISearchConfigurationProperties {
+		return this.configurationService.getValue<ISearchConfigurationProperties>('search');
+	}
+
+	private createSearchResultIterator(searchResult: SearchResult): Iterable<RenderableMatch> {
+
+		const ret: TextSearchResult[] = [];
+
+		if (!searchResult.plainTextSearchResult.isEmpty()) {
+			if (!this.searchView.shouldShowAIResults()) {
+				// only one root, so just return the children
+				return this.createTextSearchResultIterator(searchResult.plainTextSearchResult);
+			}
+			ret.push(searchResult.plainTextSearchResult);
+
+		}
+
+		if (this.searchView.shouldShowAIResults() && searchResult.searchModel.hasPlainResults && !searchResult.aiTextSearchResult.hidden) {
+			// as long as there is a query present, we can load AI results
+			ret.push(searchResult.aiTextSearchResult);
+		}
+
+		return ret;
+
+	}
+
+	private createTextSearchResultIterator(textSearchResult: TextSearchResult): Iterable<FolderMatch | FileMatch> {
+		const folderMatches = textSearchResult.folderMatches()
+			.filter(fm => !fm.isEmpty())
+			.sort(searchMatchComparer);
+
+		if (folderMatches.length === 1) {
+			return this.createFolderIterator(folderMatches[0]);
+		}
+		return folderMatches;
+	}
+
+	private createFolderIterator(folderMatch: FolderMatch): Iterable<FolderMatch | FileMatch> {
+
+		const matchArray = this.searchView.isTreeLayoutViewVisible ? folderMatch.matches() : folderMatch.allDownstreamFileMatches();
+		const matches = matchArray.sort((a, b) => searchMatchComparer(a, b, this.searchConfig.sortOrder));
+
+		return matches;
+	}
+
+	private createFileIterator(fileMatch: FileMatch): Iterable<Match> {
+		const matches = fileMatch.matches().sort(searchMatchComparer);
+		return matches;
+	}
+
+	hasChildren(element: RenderableMatch): boolean {
+		if (element instanceof Match) {
+			return false;
+		}
+
+		if (element instanceof TextSearchResult && element.id() === AI_TEXT_SEARCH_RESULT_ID) {
+			return true;
+		}
+
+		const hasChildren = element.hasChildren;
+		return hasChildren;
+	}
+
+	getChildren(element: RenderableMatch | SearchResult): Iterable<RenderableMatch> | Promise<Iterable<RenderableMatch>> {
+		if (element instanceof SearchResult) {
+			return this.createSearchResultIterator(element);
+		} else if (element instanceof TextSearchResult) {
+			if (element.id() === AI_TEXT_SEARCH_RESULT_ID && !this.searchView.model.hasAIResults) {
+				return this.searchView.addAIResults().then(() => this.createTextSearchResultIterator(element));
+			}
+			return this.createTextSearchResultIterator(element);
+		} else if (element instanceof FolderMatch) {
+			return this.createFolderIterator(element);
+		} else if (element instanceof FileMatch) {
+			return this.createFileIterator(element);
+		}
+
+		return [];
+
+	}
+	getParent(element: RenderableMatch): RenderableMatch {
+		const parent = element.parent();
+		if (parent instanceof SearchResult) {
+			throw new Error('Invalid element passed to getParent');
+		}
+		return parent;
+	}
+}
diff --git a/src/vs/workbench/contrib/search/browser/searchWidget.ts b/src/vs/workbench/contrib/search/browser/searchWidget.ts
index 52daf5fda2d..7ff1a4b23ac 100644
--- a/src/vs/workbench/contrib/search/browser/searchWidget.ts
+++ b/src/vs/workbench/contrib/search/browser/searchWidget.ts
@@ -3,47 +3,48 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { Button, IButtonOptions } from 'vs/base/browser/ui/button/button';
-import { IFindInputOptions } from 'vs/base/browser/ui/findinput/findInput';
-import { ReplaceInput } from 'vs/base/browser/ui/findinput/replaceInput';
-import { IInputBoxStyles, IMessage, InputBox } from 'vs/base/browser/ui/inputbox/inputBox';
-import { Widget } from 'vs/base/browser/ui/widget';
-import { Action } from 'vs/base/common/actions';
-import { Delayer } from 'vs/base/common/async';
-import { Emitter, Event } from 'vs/base/common/event';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { CONTEXT_FIND_WIDGET_NOT_VISIBLE } from 'vs/editor/contrib/find/browser/findModel';
-import * as nls from 'vs/nls';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ISearchConfigurationProperties } from 'vs/workbench/services/search/common/search';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { ContextScopedReplaceInput } from 'vs/platform/history/browser/contextScopedHistoryWidget';
-import { appendKeyBindingLabel, isSearchViewFocused, getSearchView } from 'vs/workbench/contrib/search/browser/searchActionsBase';
-import * as Constants from 'vs/workbench/contrib/search/common/constants';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { isMacintosh } from 'vs/base/common/platform';
-import { IToggleStyles, Toggle } from 'vs/base/browser/ui/toggle/toggle';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { searchReplaceAllIcon, searchHideReplaceIcon, searchShowContextIcon, searchShowReplaceIcon } from 'vs/workbench/contrib/search/browser/searchIcons';
-import { ToggleSearchEditorContextLinesCommandId } from 'vs/workbench/contrib/searchEditor/browser/constants';
-import { showHistoryKeybindingHint } from 'vs/platform/history/browser/historyWidgetKeybindingHint';
-import { defaultInputBoxStyles, defaultToggleStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { NotebookFindFilters } from 'vs/workbench/contrib/notebook/browser/contrib/find/findFilters';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { NotebookEditorInput } from 'vs/workbench/contrib/notebook/common/notebookEditorInput';
-import { GroupModelChangeKind } from 'vs/workbench/common/editor';
-import { SearchFindInput } from 'vs/workbench/contrib/search/browser/searchFindInput';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
+import * as nls from '../../../../nls.js';
+import * as dom from '../../../../base/browser/dom.js';
+import { IKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { Button, IButtonOptions } from '../../../../base/browser/ui/button/button.js';
+import { IFindInputOptions } from '../../../../base/browser/ui/findinput/findInput.js';
+import { ReplaceInput } from '../../../../base/browser/ui/findinput/replaceInput.js';
+import { IInputBoxStyles, IMessage, InputBox } from '../../../../base/browser/ui/inputbox/inputBox.js';
+import { Widget } from '../../../../base/browser/ui/widget.js';
+import { Action } from '../../../../base/common/actions.js';
+import { Delayer } from '../../../../base/common/async.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { CONTEXT_FIND_WIDGET_NOT_VISIBLE } from '../../../../editor/contrib/find/browser/findModel.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService, IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ISearchConfigurationProperties } from '../../../services/search/common/search.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { ContextScopedReplaceInput } from '../../../../platform/history/browser/contextScopedHistoryWidget.js';
+import { appendKeyBindingLabel, isSearchViewFocused, getSearchView } from './searchActionsBase.js';
+import * as Constants from '../common/constants.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { isMacintosh } from '../../../../base/common/platform.js';
+import { IToggleStyles, Toggle } from '../../../../base/browser/ui/toggle/toggle.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { searchReplaceAllIcon, searchHideReplaceIcon, searchShowContextIcon, searchShowReplaceIcon } from './searchIcons.js';
+import { ToggleSearchEditorContextLinesCommandId } from '../../searchEditor/browser/constants.js';
+import { showHistoryKeybindingHint } from '../../../../platform/history/browser/historyWidgetKeybindingHint.js';
+import { defaultInputBoxStyles, defaultToggleStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { NotebookFindFilters } from '../../notebook/browser/contrib/find/findFilters.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { NotebookEditorInput } from '../../notebook/common/notebookEditorInput.js';
+import { GroupModelChangeKind } from '../../../common/editor.js';
+import { SearchFindInput } from './searchFindInput.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { IDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { NotebookFindScopeType } from '../../notebook/common/notebookCommon.js';
 
 /** Specified in searchview.css */
 const SingleLineInputHeight = 26;
@@ -62,7 +63,6 @@ export interface ISearchWidgetOptions {
 	inputBoxStyles: IInputBoxStyles;
 	toggleStyles: IToggleStyles;
 	notebookOptions?: NotebookToggleState;
-	initialAIButtonVisibility?: boolean;
 }
 
 interface NotebookToggleState {
@@ -205,8 +205,7 @@ export class SearchWidget extends Widget {
 				notebookOptions.isInNotebookMarkdownPreview,
 				notebookOptions.isInNotebookCellInput,
 				notebookOptions.isInNotebookCellOutput,
-				false,
-				[]
+				{ findScopeType: NotebookFindScopeType.None }
 			));
 
 		this._register(
@@ -352,6 +351,12 @@ export class SearchWidget extends Widget {
 		this.searchInput?.focusOnRegex();
 	}
 
+	set replaceButtonVisibility(val: boolean) {
+		if (this.toggleReplaceButton) {
+			this.toggleReplaceButton.element.style.display = val ? '' : 'none';
+		}
+	}
+
 	private render(container: HTMLElement, options: ISearchWidgetOptions): void {
 		this.domNode = dom.append(container, dom.$('.search-widget'));
 		this.domNode.style.position = 'relative';
@@ -416,7 +421,6 @@ export class SearchWidget extends Widget {
 				this.contextMenuService,
 				this.instantiationService,
 				this._notebookFilters,
-				options.initialAIButtonVisibility ?? false,
 				this._hasNotebookOpen()
 			)
 		);
@@ -602,7 +606,6 @@ export class SearchWidget extends Widget {
 		this.setReplaceAllActionState(false);
 
 		if (this.searchConfiguration.searchOnType) {
-			const delayMultiplierFromAISearch = (this.searchInput && this.searchInput.isAIEnabled) ? 5 : 1; // expand debounce period to multiple by 5 if AI is enabled
 			if (this.searchInput?.getRegex()) {
 				try {
 					const regex = new RegExp(this.searchInput.getValue(), 'ug');
@@ -622,12 +625,12 @@ export class SearchWidget extends Widget {
 								10; // only things matching empty string
 
 
-					this.submitSearch(true, this.searchConfiguration.searchOnTypeDebouncePeriod * delayMultiplier * delayMultiplierFromAISearch);
+					this.submitSearch(true, this.searchConfiguration.searchOnTypeDebouncePeriod * delayMultiplier);
 				} catch {
 					// pass
 				}
 			} else {
-				this.submitSearch(true, this.searchConfiguration.searchOnTypeDebouncePeriod * delayMultiplierFromAISearch);
+				this.submitSearch(true, this.searchConfiguration.searchOnTypeDebouncePeriod);
 			}
 		}
 	}
diff --git a/src/vs/workbench/contrib/search/browser/symbolsQuickAccess.ts b/src/vs/workbench/contrib/search/browser/symbolsQuickAccess.ts
index 3ec70181227..e11f2203cda 100644
--- a/src/vs/workbench/contrib/search/browser/symbolsQuickAccess.ts
+++ b/src/vs/workbench/contrib/search/browser/symbolsQuickAccess.ts
@@ -3,27 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { IPickerQuickAccessItem, PickerQuickAccessProvider, TriggerAction } from 'vs/platform/quickinput/browser/pickerQuickAccess';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ThrottledDelayer } from 'vs/base/common/async';
-import { getWorkspaceSymbols, IWorkspaceSymbol, IWorkspaceSymbolProvider } from 'vs/workbench/contrib/search/common/search';
-import { SymbolKinds, SymbolTag, SymbolKind } from 'vs/editor/common/languages';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { Schemas } from 'vs/base/common/network';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { Range } from 'vs/editor/common/core/range';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IWorkbenchEditorConfiguration } from 'vs/workbench/common/editor';
-import { IKeyMods, IQuickPickItemWithResource } from 'vs/platform/quickinput/common/quickInput';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { getSelectionSearchString } from 'vs/editor/contrib/find/browser/findController';
-import { prepareQuery, IPreparedQuery, scoreFuzzy2, pieceToQuery } from 'vs/base/common/fuzzyScorer';
-import { IMatch } from 'vs/base/common/filters';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
+import { localize } from '../../../../nls.js';
+import { IPickerQuickAccessItem, PickerQuickAccessProvider, TriggerAction } from '../../../../platform/quickinput/browser/pickerQuickAccess.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { ThrottledDelayer } from '../../../../base/common/async.js';
+import { getWorkspaceSymbols, IWorkspaceSymbol, IWorkspaceSymbolProvider } from '../common/search.js';
+import { SymbolKinds, SymbolTag, SymbolKind } from '../../../../editor/common/languages.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from '../../../services/editor/common/editorService.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IWorkbenchEditorConfiguration } from '../../../common/editor.js';
+import { IKeyMods, IQuickPickItemWithResource } from '../../../../platform/quickinput/common/quickInput.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { getSelectionSearchString } from '../../../../editor/contrib/find/browser/findController.js';
+import { prepareQuery, IPreparedQuery, scoreFuzzy2, pieceToQuery } from '../../../../base/common/fuzzyScorer.js';
+import { IMatch } from '../../../../base/common/filters.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
 
 export interface ISymbolQuickPickItem extends IPickerQuickAccessItem, IQuickPickItemWithResource {
 	score?: number;
diff --git a/src/vs/workbench/contrib/search/common/cacheState.ts b/src/vs/workbench/contrib/search/common/cacheState.ts
index 9e1c4ceb738..3d7aa51da36 100644
--- a/src/vs/workbench/contrib/search/common/cacheState.ts
+++ b/src/vs/workbench/contrib/search/common/cacheState.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { defaultGenerator } from 'vs/base/common/idGenerator';
-import { IFileQuery } from 'vs/workbench/services/search/common/search';
-import { equals } from 'vs/base/common/objects';
+import { defaultGenerator } from '../../../../base/common/idGenerator.js';
+import { IFileQuery } from '../../../services/search/common/search.js';
+import { equals } from '../../../../base/common/objects.js';
 
 enum LoadingPhase {
 	Created = 1,
diff --git a/src/vs/workbench/contrib/search/common/cellSearchModel.ts b/src/vs/workbench/contrib/search/common/cellSearchModel.ts
index d95e923c456..202daaed036 100644
--- a/src/vs/workbench/contrib/search/common/cellSearchModel.ts
+++ b/src/vs/workbench/contrib/search/common/cellSearchModel.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Range } from 'vs/editor/common/core/range';
-import { DefaultEndOfLine, FindMatch, IReadonlyTextBuffer } from 'vs/editor/common/model';
-import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder';
-import { SearchParams } from 'vs/editor/common/model/textModelSearch';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { DefaultEndOfLine, FindMatch, IReadonlyTextBuffer } from '../../../../editor/common/model.js';
+import { PieceTreeTextBufferBuilder } from '../../../../editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder.js';
+import { SearchParams } from '../../../../editor/common/model/textModelSearch.js';
 
 interface RawOutputFindMatch {
 	textBuffer: IReadonlyTextBuffer;
diff --git a/src/vs/workbench/contrib/search/common/constants.ts b/src/vs/workbench/contrib/search/common/constants.ts
index 4464a9f6580..d3d521aed2d 100644
--- a/src/vs/workbench/contrib/search/common/constants.ts
+++ b/src/vs/workbench/contrib/search/common/constants.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 
 export const enum SearchCommandIds {
 	FindInFilesActionId = 'workbench.action.findInFiles',
@@ -77,6 +77,5 @@ export const SearchContext = {
 	ViewHasFilePatternKey: new RawContextKey<boolean>('viewHasFilePattern', false),
 	ViewHasSomeCollapsibleKey: new RawContextKey<boolean>('viewHasSomeCollapsibleResult', false),
 	InTreeViewKey: new RawContextKey<boolean>('inTreeView', false),
-	AIResultsVisibleKey: new RawContextKey<boolean>('AIResultsVisibleKey', false),
 	hasAIResultProvider: new RawContextKey<boolean>('hasAIResultProviderKey', false),
 };
diff --git a/src/vs/workbench/contrib/search/common/notebookSearch.ts b/src/vs/workbench/contrib/search/common/notebookSearch.ts
index 5237c1bd03c..0ec29b8951a 100644
--- a/src/vs/workbench/contrib/search/common/notebookSearch.ts
+++ b/src/vs/workbench/contrib/search/common/notebookSearch.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { ResourceSet } from 'vs/base/common/map';
-import { ITextQuery, ISearchProgressItem, ISearchComplete } from 'vs/workbench/services/search/common/search';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { ResourceSet } from '../../../../base/common/map.js';
+import { ITextQuery, ISearchProgressItem, ISearchComplete } from '../../../services/search/common/search.js';
 
 export const INotebookSearchService = createDecorator<INotebookSearchService>('notebookSearchService');
 
diff --git a/src/vs/workbench/contrib/search/common/search.ts b/src/vs/workbench/contrib/search/common/search.ts
index 74e2dedc5de..e7a24b32a0d 100644
--- a/src/vs/workbench/contrib/search/common/search.ts
+++ b/src/vs/workbench/contrib/search/common/search.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { onUnexpectedExternalError } from 'vs/base/common/errors';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { ISearchConfiguration, ISearchConfigurationProperties } from 'vs/workbench/services/search/common/search';
-import { SymbolKind, Location, ProviderResult, SymbolTag } from 'vs/editor/common/languages';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { URI } from 'vs/base/common/uri';
-import { EditorResourceAccessor, SideBySideEditor } from 'vs/workbench/common/editor';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { isNumber } from 'vs/base/common/types';
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { compare } from 'vs/base/common/strings';
-import { groupBy } from 'vs/base/common/arrays';
+import { onUnexpectedExternalError } from '../../../../base/common/errors.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { ISearchConfiguration, ISearchConfigurationProperties } from '../../../services/search/common/search.js';
+import { SymbolKind, Location, ProviderResult, SymbolTag } from '../../../../editor/common/languages.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { URI } from '../../../../base/common/uri.js';
+import { EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IRange, Range } from '../../../../editor/common/core/range.js';
+import { isNumber } from '../../../../base/common/types.js';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { compare } from '../../../../base/common/strings.js';
+import { groupBy } from '../../../../base/common/arrays.js';
 
 export interface IWorkspaceSymbol {
 	name: string;
diff --git a/src/vs/workbench/contrib/search/common/searchHistoryService.ts b/src/vs/workbench/contrib/search/common/searchHistoryService.ts
index 1c6640363af..49d85fdf4b8 100644
--- a/src/vs/workbench/contrib/search/common/searchHistoryService.ts
+++ b/src/vs/workbench/contrib/search/common/searchHistoryService.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { isEmptyObject } from 'vs/base/common/types';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { isEmptyObject } from '../../../../base/common/types.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 
 export interface ISearchHistoryService {
 	readonly _serviceBrand: undefined;
diff --git a/src/vs/workbench/contrib/search/common/searchNotebookHelpers.ts b/src/vs/workbench/contrib/search/common/searchNotebookHelpers.ts
index d991f46a1ff..f85c87838c1 100644
--- a/src/vs/workbench/contrib/search/common/searchNotebookHelpers.ts
+++ b/src/vs/workbench/contrib/search/common/searchNotebookHelpers.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 
-import { FindMatch, IReadonlyTextBuffer } from 'vs/editor/common/model';
-import { TextSearchMatch, IFileMatch, ITextSearchMatch } from 'vs/workbench/services/search/common/search';
-import { Range } from 'vs/editor/common/core/range';
-import { URI, UriComponents } from 'vs/base/common/uri';
+import { FindMatch, IReadonlyTextBuffer } from '../../../../editor/common/model.js';
+import { TextSearchMatch, IFileMatch, ITextSearchMatch } from '../../../services/search/common/search.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
 
 export type IRawClosedNotebookFileMatch = INotebookFileMatchNoModel<UriComponents>;
 
diff --git a/src/vs/workbench/contrib/search/test/browser/mockSearchTree.ts b/src/vs/workbench/contrib/search/test/browser/mockSearchTree.ts
index 31effdd2358..d6438a094c6 100644
--- a/src/vs/workbench/contrib/search/test/browser/mockSearchTree.ts
+++ b/src/vs/workbench/contrib/search/test/browser/mockSearchTree.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ITreeNavigator } from 'vs/base/browser/ui/tree/tree';
-import { Emitter } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { RenderableMatch } from 'vs/workbench/contrib/search/browser/searchModel';
+import { ITreeNavigator } from '../../../../../base/browser/ui/tree/tree.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { IDisposable } from '../../../../../base/common/lifecycle.js';
+import { RenderableMatch } from '../../browser/searchModel.js';
 
 const someEvent = new Emitter().event;
 
diff --git a/src/vs/workbench/contrib/search/test/browser/searchActions.test.ts b/src/vs/workbench/contrib/search/test/browser/searchActions.test.ts
index 2e98bb36cb6..975aaecc41c 100644
--- a/src/vs/workbench/contrib/search/test/browser/searchActions.test.ts
+++ b/src/vs/workbench/contrib/search/test/browser/searchActions.test.ts
@@ -4,21 +4,21 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Keybinding } from 'vs/base/common/keybindings';
-import { OS } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { IModelService } from 'vs/editor/common/services/model';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayoutResolvedKeybinding';
-import { IFileMatch, QueryType } from 'vs/workbench/services/search/common/search';
-import { getElementToFocusAfterRemoved, getLastNodeFromSameType } from 'vs/workbench/contrib/search/browser/searchActionsRemoveReplace';
-import { FileMatch, FileMatchOrMatch, FolderMatch, Match, SearchModel } from 'vs/workbench/contrib/search/browser/searchModel';
-import { MockObjectTree } from 'vs/workbench/contrib/search/test/browser/mockSearchTree';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { INotebookEditorService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorService';
-import { createFileUriFromPathFromRoot, stubModelService, stubNotebookEditorService } from 'vs/workbench/contrib/search/test/browser/searchTestCommon';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { Keybinding } from '../../../../../base/common/keybindings.js';
+import { OS } from '../../../../../base/common/platform.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { IModelService } from '../../../../../editor/common/services/model.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { USLayoutResolvedKeybinding } from '../../../../../platform/keybinding/common/usLayoutResolvedKeybinding.js';
+import { IFileMatch, QueryType } from '../../../../services/search/common/search.js';
+import { getElementToFocusAfterRemoved, getLastNodeFromSameType } from '../../browser/searchActionsRemoveReplace.js';
+import { FileMatch, FileMatchOrMatch, FolderMatch, Match, SearchModel } from '../../browser/searchModel.js';
+import { MockObjectTree } from './mockSearchTree.js';
+import { ILabelService } from '../../../../../platform/label/common/label.js';
+import { INotebookEditorService } from '../../../notebook/browser/services/notebookEditorService.js';
+import { createFileUriFromPathFromRoot, stubModelService, stubNotebookEditorService } from './searchTestCommon.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('Search Actions', () => {
 
@@ -42,28 +42,28 @@ suite('Search Actions', () => {
 		instantiationService.dispose();
 	});
 
-	test('get next element to focus after removing a match when it has next sibling file', function () {
+	test('get next element to focus after removing a match when it has next sibling file', async function () {
 		const fileMatch1 = aFileMatch();
 		const fileMatch2 = aFileMatch();
 		const data = [fileMatch1, aMatch(fileMatch1), aMatch(fileMatch1), fileMatch2, aMatch(fileMatch2), aMatch(fileMatch2)];
 		const tree = aTree(data);
 		const target = data[2];
 
-		const actual = getElementToFocusAfterRemoved(tree, target, [target]);
+		const actual = await getElementToFocusAfterRemoved(tree, target, [target]);
 		assert.strictEqual(data[4], actual);
 	});
 
-	test('get next element to focus after removing a match when it is the only match', function () {
+	test('get next element to focus after removing a match when it is the only match', async function () {
 		const fileMatch1 = aFileMatch();
 		const data = [fileMatch1, aMatch(fileMatch1)];
 		const tree = aTree(data);
 		const target = data[1];
 
-		const actual = getElementToFocusAfterRemoved(tree, target, [target]);
+		const actual = await getElementToFocusAfterRemoved(tree, target, [target]);
 		assert.strictEqual(undefined, actual);
 	});
 
-	test('get next element to focus after removing a file match when it has next sibling', function () {
+	test('get next element to focus after removing a file match when it has next sibling', async function () {
 		const fileMatch1 = aFileMatch();
 		const fileMatch2 = aFileMatch();
 		const fileMatch3 = aFileMatch();
@@ -71,40 +71,40 @@ suite('Search Actions', () => {
 		const tree = aTree(data);
 		const target = data[2];
 
-		const actual = getElementToFocusAfterRemoved(tree, target, []);
+		const actual = await getElementToFocusAfterRemoved(tree, target, []);
 		assert.strictEqual(data[4], actual);
 	});
 
-	test('Find last FileMatch in Tree', function () {
+	test('Find last FileMatch in Tree', async function () {
 		const fileMatch1 = aFileMatch();
 		const fileMatch2 = aFileMatch();
 		const fileMatch3 = aFileMatch();
 		const data = [fileMatch1, aMatch(fileMatch1), fileMatch2, aMatch(fileMatch2), fileMatch3, aMatch(fileMatch3)];
 		const tree = aTree(data);
 
-		const actual = getLastNodeFromSameType(tree, fileMatch1);
+		const actual = await getLastNodeFromSameType(tree, fileMatch1);
 		assert.strictEqual(fileMatch3, actual);
 	});
 
-	test('Find last Match in Tree', function () {
+	test('Find last Match in Tree', async function () {
 		const fileMatch1 = aFileMatch();
 		const fileMatch2 = aFileMatch();
 		const fileMatch3 = aFileMatch();
 		const data = [fileMatch1, aMatch(fileMatch1), fileMatch2, aMatch(fileMatch2), fileMatch3, aMatch(fileMatch3)];
 		const tree = aTree(data);
 
-		const actual = getLastNodeFromSameType(tree, aMatch(fileMatch1));
+		const actual = await getLastNodeFromSameType(tree, aMatch(fileMatch1));
 		assert.strictEqual(data[5], actual);
 	});
 
-	test('get next element to focus after removing a file match when it is only match', function () {
+	test('get next element to focus after removing a file match when it is only match', async function () {
 		const fileMatch1 = aFileMatch();
 		const data = [fileMatch1, aMatch(fileMatch1)];
 		const tree = aTree(data);
 		const target = data[0];
 		// const testObject: ReplaceAction = instantiationService.createInstance(ReplaceAction, tree, target, null);
 
-		const actual = getElementToFocusAfterRemoved(tree, target, []);
+		const actual = await getElementToFocusAfterRemoved(tree, target, []);
 		assert.strictEqual(undefined, actual);
 	});
 
@@ -120,7 +120,7 @@ suite('Search Actions', () => {
 			type: QueryType.Text, folderQueries: [{ folder: createFileUriFromPathFromRoot() }], contentPattern: {
 				pattern: ''
 			}
-		}, searchModel.searchResult, searchModel.searchResult, null);
+		}, searchModel.searchResult.plainTextSearchResult, searchModel.searchResult, null);
 		store.add(folderMatch);
 		const fileMatch = instantiationService.createInstance(FileMatch, {
 			pattern: ''
diff --git a/src/vs/workbench/contrib/search/test/browser/searchModel.test.ts b/src/vs/workbench/contrib/search/test/browser/searchModel.test.ts
index 5c79a6d8046..328cf71d3a6 100644
--- a/src/vs/workbench/contrib/search/test/browser/searchModel.test.ts
+++ b/src/vs/workbench/contrib/search/test/browser/searchModel.test.ts
@@ -4,43 +4,43 @@
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
 import * as sinon from 'sinon';
-import * as arrays from 'vs/base/common/arrays';
-import { DeferredPromise, timeout } from 'vs/base/common/async';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { URI } from 'vs/base/common/uri';
-import { Range } from 'vs/editor/common/core/range';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ModelService } from 'vs/editor/common/services/modelService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { IAITextQuery, IFileMatch, IFileQuery, IFileSearchStats, IFolderQuery, ISearchComplete, ISearchProgressItem, ISearchQuery, ISearchService, ITextQuery, ITextSearchMatch, OneLineRange, QueryType, TextSearchMatch } from 'vs/workbench/services/search/common/search';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
-import { CellMatch, MatchInNotebook, SearchModel } from 'vs/workbench/contrib/search/browser/searchModel';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { ILogService, NullLogService } from 'vs/platform/log/common/log';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { INotebookEditorService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorService';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { TestEditorGroupsService, TestEditorService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { NotebookEditorWidgetService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl';
-import { createFileUriFromPathFromRoot, getRootName } from 'vs/workbench/contrib/search/test/browser/searchTestCommon';
-import { INotebookCellMatchWithModel, INotebookFileMatchWithModel, contentMatchesToTextSearchMatches, webviewMatchesToTextSearchMatches } from 'vs/workbench/contrib/search/browser/notebookSearch/searchNotebookHelpers';
-import { CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { ICellViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { FindMatch, IReadonlyTextBuffer } from 'vs/editor/common/model';
-import { ResourceMap, ResourceSet } from 'vs/base/common/map';
-import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
-import { INotebookSearchService } from 'vs/workbench/contrib/search/common/notebookSearch';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import * as arrays from '../../../../../base/common/arrays.js';
+import { DeferredPromise, timeout } from '../../../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { IModelService } from '../../../../../editor/common/services/model.js';
+import { ModelService } from '../../../../../editor/common/services/modelService.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { IAITextQuery, IFileMatch, IFileQuery, IFileSearchStats, IFolderQuery, ISearchComplete, ISearchProgressItem, ISearchQuery, ISearchService, ITextQuery, ITextSearchMatch, OneLineRange, QueryType, TextSearchMatch } from '../../../../services/search/common/search.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { NullTelemetryService } from '../../../../../platform/telemetry/common/telemetryUtils.js';
+import { CellMatch, MatchInNotebook, SearchModel } from '../../browser/searchModel.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { TestThemeService } from '../../../../../platform/theme/test/common/testThemeService.js';
+import { FileService } from '../../../../../platform/files/common/fileService.js';
+import { ILogService, NullLogService } from '../../../../../platform/log/common/log.js';
+import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.js';
+import { UriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentityService.js';
+import { ILabelService } from '../../../../../platform/label/common/label.js';
+import { INotebookEditorService } from '../../../notebook/browser/services/notebookEditorService.js';
+import { IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
+import { TestEditorGroupsService, TestEditorService } from '../../../../test/browser/workbenchTestServices.js';
+import { NotebookEditorWidgetService } from '../../../notebook/browser/services/notebookEditorServiceImpl.js';
+import { createFileUriFromPathFromRoot, getRootName } from './searchTestCommon.js';
+import { INotebookCellMatchWithModel, INotebookFileMatchWithModel, contentMatchesToTextSearchMatches, webviewMatchesToTextSearchMatches } from '../../browser/notebookSearch/searchNotebookHelpers.js';
+import { CellKind } from '../../../notebook/common/notebookCommon.js';
+import { ICellViewModel } from '../../../notebook/browser/notebookBrowser.js';
+import { FindMatch, IReadonlyTextBuffer } from '../../../../../editor/common/model.js';
+import { ResourceMap, ResourceSet } from '../../../../../base/common/map.js';
+import { INotebookService } from '../../../notebook/common/notebookService.js';
+import { INotebookSearchService } from '../../common/notebookSearch.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { MockContextKeyService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 const nullEvent = new class {
 	id: number = -1;
diff --git a/src/vs/workbench/contrib/search/test/browser/searchNotebookHelpers.test.ts b/src/vs/workbench/contrib/search/test/browser/searchNotebookHelpers.test.ts
index f30dcaf0de3..fdf698aa2bf 100644
--- a/src/vs/workbench/contrib/search/test/browser/searchNotebookHelpers.test.ts
+++ b/src/vs/workbench/contrib/search/test/browser/searchNotebookHelpers.test.ts
@@ -4,20 +4,20 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Range } from 'vs/editor/common/core/range';
-import { FindMatch, IReadonlyTextBuffer } from 'vs/editor/common/model';
-import { IFileMatch, ISearchRange, ITextSearchMatch, QueryType } from 'vs/workbench/services/search/common/search';
-import { ICellViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { contentMatchesToTextSearchMatches, webviewMatchesToTextSearchMatches } from 'vs/workbench/contrib/search/browser/notebookSearch/searchNotebookHelpers';
-import { CellFindMatchModel } from 'vs/workbench/contrib/notebook/browser/contrib/find/findModel';
-import { CellMatch, FileMatch, FolderMatch, SearchModel, textSearchMatchesToNotebookMatches } from 'vs/workbench/contrib/search/browser/searchModel';
-import { URI } from 'vs/base/common/uri';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { createFileUriFromPathFromRoot, stubModelService, stubNotebookEditorService } from 'vs/workbench/contrib/search/test/browser/searchTestCommon';
-import { IModelService } from 'vs/editor/common/services/model';
-import { INotebookEditorService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorService';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { FindMatch, IReadonlyTextBuffer } from '../../../../../editor/common/model.js';
+import { IFileMatch, ISearchRange, ITextSearchMatch, QueryType } from '../../../../services/search/common/search.js';
+import { ICellViewModel } from '../../../notebook/browser/notebookBrowser.js';
+import { CellKind } from '../../../notebook/common/notebookCommon.js';
+import { contentMatchesToTextSearchMatches, webviewMatchesToTextSearchMatches } from '../../browser/notebookSearch/searchNotebookHelpers.js';
+import { CellFindMatchModel } from '../../../notebook/browser/contrib/find/findModel.js';
+import { CellMatch, FileMatch, FolderMatch, SearchModel, textSearchMatchesToNotebookMatches } from '../../browser/searchModel.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { createFileUriFromPathFromRoot, stubModelService, stubNotebookEditorService } from './searchTestCommon.js';
+import { IModelService } from '../../../../../editor/common/services/model.js';
+import { INotebookEditorService } from '../../../notebook/browser/services/notebookEditorService.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('searchNotebookHelpers', () => {
 	let instantiationService: TestInstantiationService;
@@ -149,28 +149,28 @@ suite('searchNotebookHelpers', () => {
 			codeWebviewResults = webviewMatchesToTextSearchMatches(codeCellFindMatch.webviewMatches);
 
 			assert.strictEqual(markdownContentResults.length, 1);
-			assert.strictEqual(markdownContentResults[0].preview.text, '# Hello World Test\n');
-			assertRangesEqual(markdownContentResults[0].preview.matches, [new Range(0, 14, 0, 18)]);
-			assertRangesEqual(markdownContentResults[0].ranges, [new Range(0, 14, 0, 18)]);
+			assert.strictEqual(markdownContentResults[0].previewText, '# Hello World Test\n');
+			assertRangesEqual(markdownContentResults[0].rangeLocations.map(e => e.preview), [new Range(0, 14, 0, 18)]);
+			assertRangesEqual(markdownContentResults[0].rangeLocations.map(e => e.source), [new Range(0, 14, 0, 18)]);
 
 
 			assert.strictEqual(codeContentResults.length, 2);
-			assert.strictEqual(codeContentResults[0].preview.text, 'print("test! testing!!")\n');
-			assert.strictEqual(codeContentResults[1].preview.text, 'print("this is a Test")\n');
-			assertRangesEqual(codeContentResults[0].preview.matches, [new Range(0, 7, 0, 11), new Range(0, 13, 0, 17)]);
-			assertRangesEqual(codeContentResults[0].ranges, [new Range(0, 7, 0, 11), new Range(0, 13, 0, 17)]);
+			assert.strictEqual(codeContentResults[0].previewText, 'print("test! testing!!")\n');
+			assert.strictEqual(codeContentResults[1].previewText, 'print("this is a Test")\n');
+			assertRangesEqual(codeContentResults[0].rangeLocations.map(e => e.preview), [new Range(0, 7, 0, 11), new Range(0, 13, 0, 17)]);
+			assertRangesEqual(codeContentResults[0].rangeLocations.map(e => e.source), [new Range(0, 7, 0, 11), new Range(0, 13, 0, 17)]);
 
 			assert.strictEqual(codeWebviewResults.length, 3);
-			assert.strictEqual(codeWebviewResults[0].preview.text, 'test! testing!!');
-			assert.strictEqual(codeWebviewResults[1].preview.text, 'test! testing!!');
-			assert.strictEqual(codeWebviewResults[2].preview.text, 'this is a Test');
+			assert.strictEqual(codeWebviewResults[0].previewText, 'test! testing!!');
+			assert.strictEqual(codeWebviewResults[1].previewText, 'test! testing!!');
+			assert.strictEqual(codeWebviewResults[2].previewText, 'this is a Test');
 
-			assertRangesEqual(codeWebviewResults[0].preview.matches, [new Range(0, 1, 0, 5)]);
-			assertRangesEqual(codeWebviewResults[1].preview.matches, [new Range(0, 7, 0, 11)]);
-			assertRangesEqual(codeWebviewResults[2].preview.matches, [new Range(0, 11, 0, 15)]);
-			assertRangesEqual(codeWebviewResults[0].ranges, [new Range(0, 1, 0, 5)]);
-			assertRangesEqual(codeWebviewResults[1].ranges, [new Range(0, 7, 0, 11)]);
-			assertRangesEqual(codeWebviewResults[2].ranges, [new Range(0, 11, 0, 15)]);
+			assertRangesEqual(codeWebviewResults[0].rangeLocations.map(e => e.preview), [new Range(0, 1, 0, 5)]);
+			assertRangesEqual(codeWebviewResults[1].rangeLocations.map(e => e.preview), [new Range(0, 7, 0, 11)]);
+			assertRangesEqual(codeWebviewResults[2].rangeLocations.map(e => e.preview), [new Range(0, 11, 0, 15)]);
+			assertRangesEqual(codeWebviewResults[0].rangeLocations.map(e => e.source), [new Range(0, 1, 0, 5)]);
+			assertRangesEqual(codeWebviewResults[1].rangeLocations.map(e => e.source), [new Range(0, 7, 0, 11)]);
+			assertRangesEqual(codeWebviewResults[2].rangeLocations.map(e => e.source), [new Range(0, 11, 0, 15)]);
 		});
 
 		test('convert ITextSearchMatch to MatchInNotebook', () => {
@@ -213,7 +213,7 @@ suite('searchNotebookHelpers', () => {
 				type: QueryType.Text, folderQueries: [{ folder: createFileUriFromPathFromRoot() }], contentPattern: {
 					pattern: ''
 				}
-			}, searchModel.searchResult, searchModel.searchResult, null);
+			}, searchModel.searchResult.plainTextSearchResult, searchModel.searchResult, null);
 			const fileMatch = instantiationService.createInstance(FileMatch, {
 				pattern: ''
 			}, undefined, undefined, folderMatch, rawMatch, null, '');
diff --git a/src/vs/workbench/contrib/search/test/browser/searchResult.test.ts b/src/vs/workbench/contrib/search/test/browser/searchResult.test.ts
index 600cc67f97a..d5cff4f8c54 100644
--- a/src/vs/workbench/contrib/search/test/browser/searchResult.test.ts
+++ b/src/vs/workbench/contrib/search/test/browser/searchResult.test.ts
@@ -4,38 +4,38 @@
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
 import * as sinon from 'sinon';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { Match, FileMatch, SearchResult, SearchModel, FolderMatch, CellMatch } from 'vs/workbench/contrib/search/browser/searchModel';
-import { URI } from 'vs/base/common/uri';
-import { IFileMatch, TextSearchMatch, OneLineRange, ITextSearchMatch, QueryType } from 'vs/workbench/services/search/common/search';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
-import { Range } from 'vs/editor/common/core/range';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { ModelService } from 'vs/editor/common/services/modelService';
-import { IModelService } from 'vs/editor/common/services/model';
-import { IReplaceService } from 'vs/workbench/contrib/search/browser/replace';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { ILogService, NullLogService } from 'vs/platform/log/common/log';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { MockLabelService } from 'vs/workbench/services/label/test/common/mockLabelService';
-import { INotebookEditorService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorService';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { TestEditorGroupsService, TestEditorService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { NotebookEditorWidgetService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl';
-import { ICellViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { addToSearchResult, createFileUriFromPathFromRoot, getRootName } from 'vs/workbench/contrib/search/test/browser/searchTestCommon';
-import { INotebookCellMatchWithModel, INotebookFileMatchWithModel } from 'vs/workbench/contrib/search/browser/notebookSearch/searchNotebookHelpers';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { Match, FileMatch, SearchResult, SearchModel, FolderMatch, CellMatch } from '../../browser/searchModel.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { IFileMatch, TextSearchMatch, OneLineRange, ITextSearchMatch, QueryType } from '../../../../services/search/common/search.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { NullTelemetryService } from '../../../../../platform/telemetry/common/telemetryUtils.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { ModelService } from '../../../../../editor/common/services/modelService.js';
+import { IModelService } from '../../../../../editor/common/services/model.js';
+import { IReplaceService } from '../../browser/replace.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { TestThemeService } from '../../../../../platform/theme/test/common/testThemeService.js';
+import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.js';
+import { UriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentityService.js';
+import { FileService } from '../../../../../platform/files/common/fileService.js';
+import { ILogService, NullLogService } from '../../../../../platform/log/common/log.js';
+import { ILabelService } from '../../../../../platform/label/common/label.js';
+import { MockLabelService } from '../../../../services/label/test/common/mockLabelService.js';
+import { INotebookEditorService } from '../../../notebook/browser/services/notebookEditorService.js';
+import { IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
+import { TestEditorGroupsService, TestEditorService } from '../../../../test/browser/workbenchTestServices.js';
+import { NotebookEditorWidgetService } from '../../../notebook/browser/services/notebookEditorServiceImpl.js';
+import { ICellViewModel } from '../../../notebook/browser/notebookBrowser.js';
+import { CellKind } from '../../../notebook/common/notebookCommon.js';
+import { addToSearchResult, createFileUriFromPathFromRoot, getRootName } from './searchTestCommon.js';
+import { INotebookCellMatchWithModel, INotebookFileMatchWithModel } from '../../browser/notebookSearch/searchNotebookHelpers.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { MockContextKeyService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 const lineOneRange = new OneLineRange(1, 0, 1);
 
diff --git a/src/vs/workbench/contrib/search/test/browser/searchTestCommon.ts b/src/vs/workbench/contrib/search/test/browser/searchTestCommon.ts
index b6e7dc04bbb..fcdb50495e7 100644
--- a/src/vs/workbench/contrib/search/test/browser/searchTestCommon.ts
+++ b/src/vs/workbench/contrib/search/test/browser/searchTestCommon.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { isWindows } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ModelService } from 'vs/editor/common/services/modelService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
-import { INotebookEditorService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorService';
-import { NotebookEditorWidgetService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl';
-import { SearchResult } from 'vs/workbench/contrib/search/browser/searchModel';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IFileMatch } from 'vs/workbench/services/search/common/search';
-import { TestEditorGroupsService, TestEditorService } from 'vs/workbench/test/browser/workbenchTestServices';
+import { IDisposable } from '../../../../../base/common/lifecycle.js';
+import { isWindows } from '../../../../../base/common/platform.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { IModelService } from '../../../../../editor/common/services/model.js';
+import { ModelService } from '../../../../../editor/common/services/modelService.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { MockContextKeyService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { TestThemeService } from '../../../../../platform/theme/test/common/testThemeService.js';
+import { INotebookEditorService } from '../../../notebook/browser/services/notebookEditorService.js';
+import { NotebookEditorWidgetService } from '../../../notebook/browser/services/notebookEditorServiceImpl.js';
+import { SearchResult } from '../../browser/searchModel.js';
+import { IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { IFileMatch } from '../../../../services/search/common/search.js';
+import { TestEditorGroupsService, TestEditorService } from '../../../../test/browser/workbenchTestServices.js';
 
 export function createFileUriFromPathFromRoot(path?: string): URI {
 	const rootName = getRootName();
diff --git a/src/vs/workbench/contrib/search/test/browser/searchViewlet.test.ts b/src/vs/workbench/contrib/search/test/browser/searchViewlet.test.ts
index c35d9b87da6..593366db6f8 100644
--- a/src/vs/workbench/contrib/search/test/browser/searchViewlet.test.ts
+++ b/src/vs/workbench/contrib/search/test/browser/searchViewlet.test.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { IModelService } from 'vs/editor/common/services/model';
-import { TestLanguageConfigurationService } from 'vs/editor/test/common/modes/testLanguageConfigurationService';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { ILogService, NullLogService } from 'vs/platform/log/common/log';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { TestWorkspace } from 'vs/platform/workspace/test/common/testWorkspace';
-import { FileMatch, FolderMatch, Match, searchComparer, searchMatchComparer, SearchModel, SearchResult } from 'vs/workbench/contrib/search/browser/searchModel';
-import { MockLabelService } from 'vs/workbench/services/label/test/common/mockLabelService';
-import { IFileMatch, ITextSearchMatch, OneLineRange, QueryType, SearchSortOrder } from 'vs/workbench/services/search/common/search';
-import { TestContextService } from 'vs/workbench/test/common/workbenchTestServices';
-import { INotebookEditorService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorService';
-import { createFileUriFromPathFromRoot, getRootName, stubModelService, stubNotebookEditorService } from 'vs/workbench/contrib/search/test/browser/searchTestCommon';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { URI } from '../../../../../base/common/uri.js';
+import { ILanguageConfigurationService } from '../../../../../editor/common/languages/languageConfigurationRegistry.js';
+import { IModelService } from '../../../../../editor/common/services/model.js';
+import { TestLanguageConfigurationService } from '../../../../../editor/test/common/modes/testLanguageConfigurationService.js';
+import { FileService } from '../../../../../platform/files/common/fileService.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { ILabelService } from '../../../../../platform/label/common/label.js';
+import { ILogService, NullLogService } from '../../../../../platform/log/common/log.js';
+import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.js';
+import { UriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentityService.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { TestWorkspace } from '../../../../../platform/workspace/test/common/testWorkspace.js';
+import { FileMatch, FolderMatch, Match, searchComparer, searchMatchComparer, SearchModel, SearchResult, TextSearchResult } from '../../browser/searchModel.js';
+import { MockLabelService } from '../../../../services/label/test/common/mockLabelService.js';
+import { IFileMatch, ITextSearchMatch, OneLineRange, QueryType, SearchSortOrder } from '../../../../services/search/common/search.js';
+import { TestContextService } from '../../../../test/common/workbenchTestServices.js';
+import { INotebookEditorService } from '../../../notebook/browser/services/notebookEditorService.js';
+import { createFileUriFromPathFromRoot, getRootName, stubModelService, stubNotebookEditorService } from './searchTestCommon.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('Search - Viewlet', () => {
 	let instantiation: TestInstantiationService;
@@ -60,21 +60,24 @@ suite('Search - Viewlet', () => {
 		result.add([{
 			resource: createFileUriFromPathFromRoot('/foo'),
 			results: [{
-				preview: {
-					text: 'bar',
-					matches: {
-						startLineNumber: 0,
-						startColumn: 0,
-						endLineNumber: 0,
-						endColumn: 1
+
+				previewText: 'bar',
+				rangeLocations: [
+					{
+						preview: {
+							startLineNumber: 0,
+							startColumn: 0,
+							endLineNumber: 0,
+							endColumn: 1
+						},
+						source: {
+							startLineNumber: 1,
+							startColumn: 0,
+							endLineNumber: 1,
+							endColumn: 1
+						}
 					}
-				},
-				ranges: {
-					startLineNumber: 1,
-					startColumn: 0,
-					endLineNumber: 1,
-					endColumn: 1
-				}
+				]
 			}]
 		}], '', false);
 
@@ -120,8 +123,8 @@ suite('Search - Viewlet', () => {
 	test('Cross-type Comparer', () => {
 
 		const searchResult = aSearchResult();
-		const folderMatch1 = aFolderMatch('/voo', 0, searchResult);
-		const folderMatch2 = aFolderMatch('/with', 1, searchResult);
+		const folderMatch1 = aFolderMatch('/voo', 0, searchResult.plainTextSearchResult);
+		const folderMatch2 = aFolderMatch('/with', 1, searchResult.plainTextSearchResult);
 
 		const fileMatch1 = aFileMatch('/voo/foo.a', folderMatch1);
 		const fileMatch2 = aFileMatch('/with/path.c', folderMatch2);
@@ -185,7 +188,7 @@ suite('Search - Viewlet', () => {
 		return fileMatch;
 	}
 
-	function aFolderMatch(path: string, index: number, parent?: SearchResult): FolderMatch {
+	function aFolderMatch(path: string, index: number, parent?: TextSearchResult): FolderMatch {
 		const searchModel = instantiation.createInstance(SearchModel);
 		store.add(searchModel);
 		const folderMatch = instantiation.createInstance(FolderMatch, createFileUriFromPathFromRoot(path), path, index, {
diff --git a/src/vs/workbench/contrib/search/test/common/cacheState.test.ts b/src/vs/workbench/contrib/search/test/common/cacheState.test.ts
index ea1241bed90..f0295f2ec48 100644
--- a/src/vs/workbench/contrib/search/test/common/cacheState.test.ts
+++ b/src/vs/workbench/contrib/search/test/common/cacheState.test.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import * as errors from 'vs/base/common/errors';
-import { QueryType, IFileQuery } from 'vs/workbench/services/search/common/search';
-import { FileQueryCacheState } from 'vs/workbench/contrib/search/common/cacheState';
-import { DeferredPromise } from 'vs/base/common/async';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import * as errors from '../../../../../base/common/errors.js';
+import { QueryType, IFileQuery } from '../../../../services/search/common/search.js';
+import { FileQueryCacheState } from '../../common/cacheState.js';
+import { DeferredPromise } from '../../../../../base/common/async.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('FileQueryCacheState', () => {
 
diff --git a/src/vs/workbench/contrib/search/test/common/extractRange.test.ts b/src/vs/workbench/contrib/search/test/common/extractRange.test.ts
index 0758b486cf6..9072b36cdac 100644
--- a/src/vs/workbench/contrib/search/test/common/extractRange.test.ts
+++ b/src/vs/workbench/contrib/search/test/common/extractRange.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { extractRangeFromFilter } from 'vs/workbench/contrib/search/common/search';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { extractRangeFromFilter } from '../../common/search.js';
 
 suite('extractRangeFromFilter', () => {
 
diff --git a/src/vs/workbench/contrib/searchEditor/browser/constants.ts b/src/vs/workbench/contrib/searchEditor/browser/constants.ts
index affaf09e8b9..826585c9aaf 100644
--- a/src/vs/workbench/contrib/searchEditor/browser/constants.ts
+++ b/src/vs/workbench/contrib/searchEditor/browser/constants.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 
 export const InSearchEditor = new RawContextKey<boolean>('inSearchEditor', false);
 
diff --git a/src/vs/workbench/contrib/searchEditor/browser/searchEditor.contribution.ts b/src/vs/workbench/contrib/searchEditor/browser/searchEditor.contribution.ts
index e317bec897d..91cd753860b 100644
--- a/src/vs/workbench/contrib/searchEditor/browser/searchEditor.contribution.ts
+++ b/src/vs/workbench/contrib/searchEditor/browser/searchEditor.contribution.ts
@@ -3,40 +3,40 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { extname, isEqual } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { Range } from 'vs/editor/common/core/range';
-import { ToggleCaseSensitiveKeybinding, ToggleRegexKeybinding, ToggleWholeWordKeybinding } from 'vs/editor/contrib/find/browser/findModel';
-import { localize, localize2 } from 'vs/nls';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { EditorPaneDescriptor, IEditorPaneRegistry } from 'vs/workbench/browser/editor';
-import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { IEditorSerializer, IEditorFactoryRegistry, EditorExtensions, DEFAULT_EDITOR_ASSOCIATION } from 'vs/workbench/common/editor';
-import { ActiveEditorContext } from 'vs/workbench/common/contextkeys';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { getSearchView } from 'vs/workbench/contrib/search/browser/searchActionsBase';
-import { searchNewEditorIcon, searchRefreshIcon } from 'vs/workbench/contrib/search/browser/searchIcons';
-import * as SearchConstants from 'vs/workbench/contrib/search/common/constants';
-import * as SearchEditorConstants from 'vs/workbench/contrib/searchEditor/browser/constants';
-import { SearchEditor } from 'vs/workbench/contrib/searchEditor/browser/searchEditor';
-import { createEditorFromSearchResult, modifySearchEditorContextLinesCommand, openNewSearchEditor, openSearchEditor, selectAllSearchEditorMatchesCommand, toggleSearchEditorCaseSensitiveCommand, toggleSearchEditorContextLinesCommand, toggleSearchEditorRegexCommand, toggleSearchEditorWholeWordCommand } from 'vs/workbench/contrib/searchEditor/browser/searchEditorActions';
-import { getOrMakeSearchEditorInput, SearchConfiguration, SearchEditorInput, SEARCH_EDITOR_EXT } from 'vs/workbench/contrib/searchEditor/browser/searchEditorInput';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { VIEW_ID } from 'vs/workbench/services/search/common/search';
-import { RegisteredEditorPriority, IEditorResolverService } from 'vs/workbench/services/editor/common/editorResolverService';
-import { IWorkingCopyEditorHandler, IWorkingCopyEditorService } from 'vs/workbench/services/workingCopy/common/workingCopyEditorService';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IWorkingCopyIdentifier } from 'vs/workbench/services/workingCopy/common/workingCopy';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { getActiveElement } from 'vs/base/browser/dom';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { extname, isEqual } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { ToggleCaseSensitiveKeybinding, ToggleRegexKeybinding, ToggleWholeWordKeybinding } from '../../../../editor/contrib/find/browser/findModel.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { EditorPaneDescriptor, IEditorPaneRegistry } from '../../../browser/editor.js';
+import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { IEditorSerializer, IEditorFactoryRegistry, EditorExtensions, DEFAULT_EDITOR_ASSOCIATION } from '../../../common/editor.js';
+import { ActiveEditorContext } from '../../../common/contextkeys.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { getSearchView } from '../../search/browser/searchActionsBase.js';
+import { searchNewEditorIcon, searchRefreshIcon } from '../../search/browser/searchIcons.js';
+import * as SearchConstants from '../../search/common/constants.js';
+import * as SearchEditorConstants from './constants.js';
+import { SearchEditor } from './searchEditor.js';
+import { createEditorFromSearchResult, modifySearchEditorContextLinesCommand, openNewSearchEditor, openSearchEditor, selectAllSearchEditorMatchesCommand, toggleSearchEditorCaseSensitiveCommand, toggleSearchEditorContextLinesCommand, toggleSearchEditorRegexCommand, toggleSearchEditorWholeWordCommand } from './searchEditorActions.js';
+import { getOrMakeSearchEditorInput, SearchConfiguration, SearchEditorInput, SEARCH_EDITOR_EXT } from './searchEditorInput.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { VIEW_ID } from '../../../services/search/common/search.js';
+import { RegisteredEditorPriority, IEditorResolverService } from '../../../services/editor/common/editorResolverService.js';
+import { IWorkingCopyEditorHandler, IWorkingCopyEditorService } from '../../../services/workingCopy/common/workingCopyEditorService.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IWorkingCopyIdentifier } from '../../../services/workingCopy/common/workingCopy.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { getActiveElement } from '../../../../base/browser/dom.js';
 
 
 const OpenInEditorCommandId = 'search.action.openInEditor';
diff --git a/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts b/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts
index 5bf122311af..00e6dd2fab7 100644
--- a/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts
+++ b/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts
@@ -3,67 +3,67 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { alert } from 'vs/base/browser/ui/aria/aria';
-import { Delayer } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { assertIsDefined } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import 'vs/css!./media/searchEditor';
-import { ICodeEditorWidgetOptions } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ICodeEditorViewState } from 'vs/editor/common/editorCommon';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { ReferencesController } from 'vs/editor/contrib/gotoSymbol/browser/peek/referencesController';
-import { localize } from 'vs/nls';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { IEditorProgressService, LongRunningOperation } from 'vs/platform/progress/common/progress';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { inputBorder, registerColor } from 'vs/platform/theme/common/colorRegistry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { AbstractTextCodeEditor } from 'vs/workbench/browser/parts/editor/textCodeEditor';
-import { EditorInputCapabilities, IEditorOpenContext } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { ExcludePatternInputWidget, IncludePatternInputWidget } from 'vs/workbench/contrib/search/browser/patternInputWidget';
-import { SearchWidget } from 'vs/workbench/contrib/search/browser/searchWidget';
-import { ITextQueryBuilderOptions, QueryBuilder } from 'vs/workbench/services/search/common/queryBuilder';
-import { getOutOfWorkspaceEditorResources } from 'vs/workbench/contrib/search/common/search';
-import { SearchModel, SearchResult } from 'vs/workbench/contrib/search/browser/searchModel';
-import { InSearchEditor, SearchEditorID, SearchEditorInputTypeId } from 'vs/workbench/contrib/searchEditor/browser/constants';
-import type { SearchConfiguration, SearchEditorInput } from 'vs/workbench/contrib/searchEditor/browser/searchEditorInput';
-import { serializeSearchResultForEditor } from 'vs/workbench/contrib/searchEditor/browser/searchEditorSerialization';
-import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IPatternInfo, ISearchComplete, ISearchConfigurationProperties, ITextQuery, SearchSortOrder } from 'vs/workbench/services/search/common/search';
-import { searchDetailsIcon } from 'vs/workbench/contrib/search/browser/searchIcons';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { TextSearchCompleteMessage } from 'vs/workbench/services/search/common/searchExtTypes';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IEditorOptions } from 'vs/platform/editor/common/editor';
-import { renderSearchMessage } from 'vs/workbench/contrib/search/browser/searchMessage';
-import { EditorExtensionsRegistry, IEditorContributionDescription } from 'vs/editor/browser/editorExtensions';
-import { UnusualLineTerminatorsDetector } from 'vs/editor/contrib/unusualLineTerminators/browser/unusualLineTerminators';
-import { defaultToggleStyles, getInputBoxStyle } from 'vs/platform/theme/browser/defaultStyles';
-import { ILogService } from 'vs/platform/log/common/log';
-import { SearchContext } from 'vs/workbench/contrib/search/common/constants';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import * as DOM from '../../../../base/browser/dom.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { alert } from '../../../../base/browser/ui/aria/aria.js';
+import { Delayer } from '../../../../base/common/async.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { assertIsDefined } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import './media/searchEditor.css';
+import { ICodeEditorWidgetOptions } from '../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { Selection } from '../../../../editor/common/core/selection.js';
+import { ICodeEditorViewState } from '../../../../editor/common/editorCommon.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { ReferencesController } from '../../../../editor/contrib/gotoSymbol/browser/peek/referencesController.js';
+import { localize } from '../../../../nls.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { IEditorProgressService, LongRunningOperation } from '../../../../platform/progress/common/progress.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { inputBorder, registerColor } from '../../../../platform/theme/common/colorRegistry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { AbstractTextCodeEditor } from '../../../browser/parts/editor/textCodeEditor.js';
+import { EditorInputCapabilities, IEditorOpenContext } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { ExcludePatternInputWidget, IncludePatternInputWidget } from '../../search/browser/patternInputWidget.js';
+import { SearchWidget } from '../../search/browser/searchWidget.js';
+import { ITextQueryBuilderOptions, QueryBuilder } from '../../../services/search/common/queryBuilder.js';
+import { getOutOfWorkspaceEditorResources } from '../../search/common/search.js';
+import { SearchModel, SearchResult } from '../../search/browser/searchModel.js';
+import { InSearchEditor, SearchEditorID, SearchEditorInputTypeId } from './constants.js';
+import type { SearchConfiguration, SearchEditorInput } from './searchEditorInput.js';
+import { serializeSearchResultForEditor } from './searchEditorSerialization.js';
+import { IEditorGroup, IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IPatternInfo, ISearchComplete, ISearchConfigurationProperties, ITextQuery, SearchSortOrder } from '../../../services/search/common/search.js';
+import { searchDetailsIcon } from '../../search/browser/searchIcons.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { TextSearchCompleteMessage } from '../../../services/search/common/searchExtTypes.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { renderSearchMessage } from '../../search/browser/searchMessage.js';
+import { EditorExtensionsRegistry, IEditorContributionDescription } from '../../../../editor/browser/editorExtensions.js';
+import { UnusualLineTerminatorsDetector } from '../../../../editor/contrib/unusualLineTerminators/browser/unusualLineTerminators.js';
+import { defaultToggleStyles, getInputBoxStyle } from '../../../../platform/theme/browser/defaultStyles.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { SearchContext } from '../../search/common/constants.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 
 const RESULT_LINE_REGEX = /^(\s+)(\d+)(: |  )(\s*)(.*)$/;
 const FILE_LINE_REGEX = /^(\S.*):$/;
@@ -165,8 +165,9 @@ export class SearchEditor extends AbstractTextCodeEditor<SearchEditorViewState>
 		this.includesExcludesContainer = DOM.append(container, DOM.$('.includes-excludes'));
 
 		// Toggle query details button
-		this.toggleQueryDetailsButton = DOM.append(this.includesExcludesContainer, DOM.$('.expand' + ThemeIcon.asCSSSelector(searchDetailsIcon), { tabindex: 0, role: 'button' }));
-		this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), this.toggleQueryDetailsButton, localize('moreSearch', "Toggle Search Details")));
+		const toggleQueryDetailsLabel = localize('moreSearch', "Toggle Search Details");
+		this.toggleQueryDetailsButton = DOM.append(this.includesExcludesContainer, DOM.$('.expand' + ThemeIcon.asCSSSelector(searchDetailsIcon), { tabindex: 0, role: 'button', 'aria-label': toggleQueryDetailsLabel }));
+		this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), this.toggleQueryDetailsButton, toggleQueryDetailsLabel));
 		this._register(DOM.addDisposableListener(this.toggleQueryDetailsButton, DOM.EventType.CLICK, e => {
 			DOM.EventHelper.stop(e);
 			this.toggleIncludesExcludes();
@@ -483,8 +484,21 @@ export class SearchEditor extends AbstractTextCodeEditor<SearchEditorViewState>
 	}
 
 	async triggerSearch(_options?: { resetCursor?: boolean; delay?: number; focusResults?: boolean }) {
+		const focusResults = this.searchConfig.searchEditor.focusResultsOnSearch;
+
+		// If _options don't define focusResult field, then use the setting
+		if (_options === undefined) {
+			_options = { focusResults: focusResults };
+		} else if (_options.focusResults === undefined) {
+			_options.focusResults = focusResults;
+		}
+
 		const options = { resetCursor: true, delay: 0, ..._options };
 
+		if (!(this.queryEditorWidget.searchInput?.inputBox.isInputValid())) {
+			return;
+		}
+
 		if (!this.pauseSearching) {
 			await this.runSearchDelayer.trigger(async () => {
 				this.toggleRunAgainMessage(false);
@@ -550,15 +564,14 @@ export class SearchEditor extends AbstractTextCodeEditor<SearchEditorViewState>
 			maxResults: this.searchConfig.maxResults ?? undefined,
 			disregardIgnoreFiles: !config.useExcludeSettingsAndIgnoreFiles || undefined,
 			disregardExcludeSettings: !config.useExcludeSettingsAndIgnoreFiles || undefined,
-			excludePattern: config.filesToExclude,
+			excludePattern: [{ pattern: config.filesToExclude }],
 			includePattern: config.filesToInclude,
 			onlyOpenEditors: config.onlyOpenEditors,
 			previewOptions: {
 				matchLines: 1,
 				charsPerLine: 1000
 			},
-			afterContext: config.contextLines,
-			beforeContext: config.contextLines,
+			surroundingContext: config.contextLines,
 			isSmartCase: this.searchConfig.smartCase,
 			expandPatterns: true,
 			notebookSearchConfig: {
@@ -776,7 +789,7 @@ export class SearchEditor extends AbstractTextCodeEditor<SearchEditorViewState>
 	}
 }
 
-const searchEditorTextInputBorder = registerColor('searchEditor.textInputBorder', { dark: inputBorder, light: inputBorder, hcDark: inputBorder, hcLight: inputBorder }, localize('textInputBoxBorder', "Search editor text input box border."));
+const searchEditorTextInputBorder = registerColor('searchEditor.textInputBorder', inputBorder, localize('textInputBoxBorder', "Search editor text input box border."));
 
 function findNextRange(matchRanges: Range[], currentPosition: Position) {
 	for (const matchRange of matchRanges) {
diff --git a/src/vs/workbench/contrib/searchEditor/browser/searchEditorActions.ts b/src/vs/workbench/contrib/searchEditor/browser/searchEditorActions.ts
index 5ab5da3f9e6..2123fb55d82 100644
--- a/src/vs/workbench/contrib/searchEditor/browser/searchEditorActions.ts
+++ b/src/vs/workbench/contrib/searchEditor/browser/searchEditorActions.ts
@@ -3,29 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import 'vs/css!./media/searchEditor';
-import { ICodeEditor, isDiffEditor } from 'vs/editor/browser/editorBrowser';
-import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { EditorsOrder } from 'vs/workbench/common/editor';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { getSearchView } from 'vs/workbench/contrib/search/browser/searchActionsBase';
-import { SearchResult } from 'vs/workbench/contrib/search/browser/searchModel';
-import { SearchEditor } from 'vs/workbench/contrib/searchEditor/browser/searchEditor';
-import { OpenSearchEditorArgs } from 'vs/workbench/contrib/searchEditor/browser/searchEditor.contribution';
-import { getOrMakeSearchEditorInput, SearchEditorInput } from 'vs/workbench/contrib/searchEditor/browser/searchEditorInput';
-import { serializeSearchResultForEditor } from 'vs/workbench/contrib/searchEditor/browser/searchEditorSerialization';
-import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { IHistoryService } from 'vs/workbench/services/history/common/history';
-import { ISearchConfigurationProperties } from 'vs/workbench/services/search/common/search';
+import { Schemas } from '../../../../base/common/network.js';
+import { URI } from '../../../../base/common/uri.js';
+import './media/searchEditor.css';
+import { ICodeEditor, isDiffEditor } from '../../../../editor/browser/editorBrowser.js';
+import { IEditorOptions } from '../../../../editor/common/config/editorOptions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { EditorsOrder } from '../../../common/editor.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { getSearchView } from '../../search/browser/searchActionsBase.js';
+import { SearchResult } from '../../search/browser/searchModel.js';
+import { SearchEditor } from './searchEditor.js';
+import { OpenSearchEditorArgs } from './searchEditor.contribution.js';
+import { getOrMakeSearchEditorInput, SearchEditorInput } from './searchEditorInput.js';
+import { serializeSearchResultForEditor } from './searchEditorSerialization.js';
+import { IConfigurationResolverService } from '../../../services/configurationResolver/common/configurationResolver.js';
+import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } from '../../../services/editor/common/editorService.js';
+import { IHistoryService } from '../../../services/history/common/history.js';
+import { ISearchConfigurationProperties } from '../../../services/search/common/search.js';
 
 export const toggleSearchEditorCaseSensitiveCommand = (accessor: ServicesAccessor) => {
 	const editorService = accessor.get(IEditorService);
@@ -219,6 +219,6 @@ export const createEditorFromSearchResult =
 		} else {
 			const input = instantiationService.invokeFunction(getOrMakeSearchEditorInput, { from: 'rawData', resultsContents: '', config: { ...config, contextLines } });
 			const editor = await editorService.openEditor(input, { pinned: true }) as SearchEditor;
-			editor.triggerSearch({ focusResults: true });
+			editor.triggerSearch();
 		}
 	};
diff --git a/src/vs/workbench/contrib/searchEditor/browser/searchEditorInput.ts b/src/vs/workbench/contrib/searchEditor/browser/searchEditorInput.ts
index 2085c52e041..88a4304220c 100644
--- a/src/vs/workbench/contrib/searchEditor/browser/searchEditorInput.ts
+++ b/src/vs/workbench/contrib/searchEditor/browser/searchEditorInput.ts
@@ -3,38 +3,38 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/searchEditor';
-import { Emitter, Event } from 'vs/base/common/event';
-import { basename } from 'vs/base/common/path';
-import { extname, isEqual, joinPath } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { Range } from 'vs/editor/common/core/range';
-import { ITextModel, TrackedRangeStickiness } from 'vs/editor/common/model';
-import { IModelService } from 'vs/editor/common/services/model';
-import { localize } from 'vs/nls';
-import { IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { GroupIdentifier, IRevertOptions, ISaveOptions, EditorResourceAccessor, IMoveResult, EditorInputCapabilities, IUntypedEditorInput } from 'vs/workbench/common/editor';
-import { Memento } from 'vs/workbench/common/memento';
-import { SearchEditorFindMatchClass, SearchEditorInputTypeId, SearchEditorScheme, SearchEditorWorkingCopyTypeId } from 'vs/workbench/contrib/searchEditor/browser/constants';
-import { SearchConfigurationModel, SearchEditorModel, searchEditorModelFactory } from 'vs/workbench/contrib/searchEditor/browser/searchEditorModel';
-import { defaultSearchConfig, parseSavedSearchEditor, serializeSearchConfiguration } from 'vs/workbench/contrib/searchEditor/browser/searchEditorSerialization';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { ITextFileSaveOptions, ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
-import { IWorkingCopy, IWorkingCopyBackup, IWorkingCopySaveEvent, WorkingCopyCapabilities } from 'vs/workbench/services/workingCopy/common/workingCopy';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ISearchComplete, ISearchConfigurationProperties } from 'vs/workbench/services/search/common/search';
-import { bufferToReadable, VSBuffer } from 'vs/base/common/buffer';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { IResourceEditorInput } from 'vs/platform/editor/common/editor';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
+import './media/searchEditor.css';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { basename } from '../../../../base/common/path.js';
+import { extname, isEqual, joinPath } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { ITextModel, TrackedRangeStickiness } from '../../../../editor/common/model.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { localize } from '../../../../nls.js';
+import { IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { GroupIdentifier, IRevertOptions, ISaveOptions, EditorResourceAccessor, IMoveResult, EditorInputCapabilities, IUntypedEditorInput } from '../../../common/editor.js';
+import { Memento } from '../../../common/memento.js';
+import { SearchEditorFindMatchClass, SearchEditorInputTypeId, SearchEditorScheme, SearchEditorWorkingCopyTypeId } from './constants.js';
+import { SearchConfigurationModel, SearchEditorModel, searchEditorModelFactory } from './searchEditorModel.js';
+import { defaultSearchConfig, parseSavedSearchEditor, serializeSearchConfiguration } from './searchEditorSerialization.js';
+import { IPathService } from '../../../services/path/common/pathService.js';
+import { ITextFileSaveOptions, ITextFileService } from '../../../services/textfile/common/textfiles.js';
+import { IWorkingCopyService } from '../../../services/workingCopy/common/workingCopyService.js';
+import { IWorkingCopy, IWorkingCopyBackup, IWorkingCopySaveEvent, WorkingCopyCapabilities } from '../../../services/workingCopy/common/workingCopy.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ISearchComplete, ISearchConfigurationProperties } from '../../../services/search/common/search.js';
+import { bufferToReadable, VSBuffer } from '../../../../base/common/buffer.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { IResourceEditorInput } from '../../../../platform/editor/common/editor.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 
 export type SearchConfiguration = {
 	query: string;
@@ -128,7 +128,7 @@ export class SearchEditorInput extends EditorInput {
 		}
 
 		this.memento = new Memento(SearchEditorInput.ID, storageService);
-		storageService.onWillSaveState(() => this.memento.saveMemento());
+		this._register(storageService.onWillSaveState(() => this.memento.saveMemento()));
 
 		const input = this;
 		const workingCopyAdapter = new class implements IWorkingCopy {
diff --git a/src/vs/workbench/contrib/searchEditor/browser/searchEditorModel.ts b/src/vs/workbench/contrib/searchEditor/browser/searchEditorModel.ts
index 39b51590658..40a14ce8405 100644
--- a/src/vs/workbench/contrib/searchEditor/browser/searchEditorModel.ts
+++ b/src/vs/workbench/contrib/searchEditor/browser/searchEditorModel.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { ITextModel } from 'vs/editor/common/model';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { parseSavedSearchEditor, parseSerializedSearchEditor } from 'vs/workbench/contrib/searchEditor/browser/searchEditorSerialization';
-import { IWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackup';
-import { SearchConfiguration } from './searchEditorInput';
-import { assertIsDefined } from 'vs/base/common/types';
-import { createTextBufferFactoryFromStream } from 'vs/editor/common/model/textModel';
-import { SearchEditorWorkingCopyTypeId } from 'vs/workbench/contrib/searchEditor/browser/constants';
-import { Emitter } from 'vs/base/common/event';
-import { ResourceMap } from 'vs/base/common/map';
-import { SEARCH_RESULT_LANGUAGE_ID } from 'vs/workbench/services/search/common/search';
+import { URI } from '../../../../base/common/uri.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { parseSavedSearchEditor, parseSerializedSearchEditor } from './searchEditorSerialization.js';
+import { IWorkingCopyBackupService } from '../../../services/workingCopy/common/workingCopyBackup.js';
+import { SearchConfiguration } from './searchEditorInput.js';
+import { assertIsDefined } from '../../../../base/common/types.js';
+import { createTextBufferFactoryFromStream } from '../../../../editor/common/model/textModel.js';
+import { SearchEditorWorkingCopyTypeId } from './constants.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { SEARCH_RESULT_LANGUAGE_ID } from '../../../services/search/common/search.js';
 
 export type SearchEditorData = { resultsModel: ITextModel; configurationModel: SearchConfigurationModel };
 
diff --git a/src/vs/workbench/contrib/searchEditor/browser/searchEditorSerialization.ts b/src/vs/workbench/contrib/searchEditor/browser/searchEditorSerialization.ts
index 62bbb3386a5..cb451b2ab53 100644
--- a/src/vs/workbench/contrib/searchEditor/browser/searchEditorSerialization.ts
+++ b/src/vs/workbench/contrib/searchEditor/browser/searchEditorSerialization.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { coalesce } from 'vs/base/common/arrays';
-import { URI } from 'vs/base/common/uri';
-import 'vs/css!./media/searchEditor';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { Range } from 'vs/editor/common/core/range';
-import type { ITextModel } from 'vs/editor/common/model';
-import { localize } from 'vs/nls';
-import { FileMatch, Match, searchMatchComparer, SearchResult, FolderMatch, CellMatch } from 'vs/workbench/contrib/search/browser/searchModel';
-import type { SearchConfiguration } from 'vs/workbench/contrib/searchEditor/browser/searchEditorInput';
-import { ITextQuery, SearchSortOrder } from 'vs/workbench/services/search/common/search';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
+import { coalesce } from '../../../../base/common/arrays.js';
+import { URI } from '../../../../base/common/uri.js';
+import './media/searchEditor.css';
+import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import type { ITextModel } from '../../../../editor/common/model.js';
+import { localize } from '../../../../nls.js';
+import { FileMatch, Match, searchMatchComparer, SearchResult, FolderMatch, CellMatch } from '../../search/browser/searchModel.js';
+import type { SearchConfiguration } from './searchEditorInput.js';
+import { ITextQuery, SearchSortOrder } from '../../../services/search/common/search.js';
+import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
 
 // Using \r\n on Windows inserts an extra newline between results.
 const lineDelimiter = '\n';
diff --git a/src/vs/workbench/contrib/share/browser/share.contribution.ts b/src/vs/workbench/contrib/share/browser/share.contribution.ts
index 5bdf93d7236..cd1cfc176e0 100644
--- a/src/vs/workbench/contrib/share/browser/share.contribution.ts
+++ b/src/vs/workbench/contrib/share/browser/share.contribution.ts
@@ -3,36 +3,36 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./share';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Codicon } from 'vs/base/common/codicons';
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { localize, localize2 } from 'vs/nls';
-import { Action2, MenuId, MenuRegistry, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { EditorResourceAccessor, SideBySideEditor } from 'vs/workbench/common/editor';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { Severity } from 'vs/platform/notification/common/notification';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { WorkspaceFolderCountContext } from 'vs/workbench/common/contextkeys';
-import { Extensions, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
-import { ShareProviderCountContext, ShareService } from 'vs/workbench/contrib/share/browser/shareService';
-import { IShareService } from 'vs/workbench/contrib/share/common/share';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
-import { workbenchConfigurationNodeBase } from 'vs/workbench/common/configuration';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import './share.css';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { Action2, MenuId, MenuRegistry, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { Severity } from '../../../../platform/notification/common/notification.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { WorkspaceFolderCountContext } from '../../../common/contextkeys.js';
+import { Extensions, IWorkbenchContributionsRegistry } from '../../../common/contributions.js';
+import { ShareProviderCountContext, ShareService } from './shareService.js';
+import { IShareService } from '../common/share.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IProgressService, ProgressLocation } from '../../../../platform/progress/common/progress.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { workbenchConfigurationNodeBase } from '../../../common/configuration.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
 
 const targetMenus = [
 	MenuId.EditorContextShare,
diff --git a/src/vs/workbench/contrib/share/browser/shareService.ts b/src/vs/workbench/contrib/share/browser/shareService.ts
index fd5d93cd25e..0d684acf736 100644
--- a/src/vs/workbench/contrib/share/browser/shareService.ts
+++ b/src/vs/workbench/contrib/share/browser/shareService.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { score } from 'vs/editor/common/languageSelector';
-import { localize } from 'vs/nls';
-import { ISubmenuItem } from 'vs/platform/actions/common/actions';
-import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IShareProvider, IShareService, IShareableItem } from 'vs/workbench/contrib/share/common/share';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { score } from '../../../../editor/common/languageSelector.js';
+import { localize } from '../../../../nls.js';
+import { ISubmenuItem } from '../../../../platform/actions/common/actions.js';
+import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { IQuickInputService, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IShareProvider, IShareService, IShareableItem } from '../common/share.js';
 
 export const ShareProviderCountContext = new RawContextKey<number>('shareProviderCount', 0, localize('shareProviderCount', "The number of available share providers"));
 
diff --git a/src/vs/workbench/contrib/share/common/share.ts b/src/vs/workbench/contrib/share/common/share.ts
index 28f97630f60..eb0b3becf7d 100644
--- a/src/vs/workbench/contrib/share/common/share.ts
+++ b/src/vs/workbench/contrib/share/common/share.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { Selection } from 'vs/editor/common/core/selection';
-import { LanguageSelector } from 'vs/editor/common/languageSelector';
-import { ISubmenuItem } from 'vs/platform/actions/common/actions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Selection } from '../../../../editor/common/core/selection.js';
+import { LanguageSelector } from '../../../../editor/common/languageSelector.js';
+import { ISubmenuItem } from '../../../../platform/actions/common/actions.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 
 export interface IShareableItem {
 	resourceUri: URI;
diff --git a/src/vs/workbench/contrib/snippets/browser/commands/abstractSnippetsActions.ts b/src/vs/workbench/contrib/snippets/browser/commands/abstractSnippetsActions.ts
index c41f912b673..08769a7ff59 100644
--- a/src/vs/workbench/contrib/snippets/browser/commands/abstractSnippetsActions.ts
+++ b/src/vs/workbench/contrib/snippets/browser/commands/abstractSnippetsActions.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { EditorAction2 } from 'vs/editor/browser/editorExtensions';
-import { localize2 } from 'vs/nls';
-import { Action2, IAction2Options } from 'vs/platform/actions/common/actions';
+import { EditorAction2 } from '../../../../../editor/browser/editorExtensions.js';
+import { localize2 } from '../../../../../nls.js';
+import { Action2, IAction2Options } from '../../../../../platform/actions/common/actions.js';
 
 const defaultOptions = {
 	category: localize2('snippets', "Snippets"),
diff --git a/src/vs/workbench/contrib/snippets/browser/commands/configureSnippets.ts b/src/vs/workbench/contrib/snippets/browser/commands/configureSnippets.ts
index 77dad6efa4a..c579cace7e4 100644
--- a/src/vs/workbench/contrib/snippets/browser/commands/configureSnippets.ts
+++ b/src/vs/workbench/contrib/snippets/browser/commands/configureSnippets.ts
@@ -3,24 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isValidBasename } from 'vs/base/common/extpath';
-import { extname } from 'vs/base/common/path';
-import { basename, joinPath } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import * as nls from 'vs/nls';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { IFileService } from 'vs/platform/files/common/files';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IQuickInputService, IQuickPickItem, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { SnippetsAction } from 'vs/workbench/contrib/snippets/browser/commands/abstractSnippetsActions';
-import { ISnippetsService } from 'vs/workbench/contrib/snippets/browser/snippets';
-import { SnippetSource } from 'vs/workbench/contrib/snippets/browser/snippetsFile';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
+import { isValidBasename } from '../../../../../base/common/extpath.js';
+import { extname } from '../../../../../base/common/path.js';
+import { basename, joinPath } from '../../../../../base/common/resources.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
+import { getIconClassesForLanguageId } from '../../../../../editor/common/services/getIconClasses.js';
+import * as nls from '../../../../../nls.js';
+import { MenuId } from '../../../../../platform/actions/common/actions.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ILabelService } from '../../../../../platform/label/common/label.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
+import { IQuickInputService, IQuickPickItem, QuickPickInput } from '../../../../../platform/quickinput/common/quickInput.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { SnippetsAction } from './abstractSnippetsActions.js';
+import { ISnippetsService } from '../snippets.js';
+import { SnippetSource } from '../snippetsFile.js';
+import { ITextFileService } from '../../../../services/textfile/common/textfiles.js';
+import { IUserDataProfileService } from '../../../../services/userDataProfile/common/userDataProfile.js';
 
 namespace ISnippetPick {
 	export function is(thing: object | undefined): thing is ISnippetPick {
@@ -115,7 +116,8 @@ async function computePicks(snippetService: ISnippetsService, userDataProfileSer
 				label: languageId,
 				description: `(${label})`,
 				filepath: joinPath(dir, `${languageId}.json`),
-				hint: true
+				hint: true,
+				iconClasses: getIconClassesForLanguageId(languageId)
 			});
 		}
 	}
@@ -225,10 +227,10 @@ export class ConfigureSnippetsAction extends SnippetsAction {
 	constructor() {
 		super({
 			id: 'workbench.action.openSnippets',
-			title: nls.localize2('openSnippet.label', "Configure User Snippets"),
+			title: nls.localize2('openSnippet.label', "Configure Snippets"),
 			shortTitle: {
-				...nls.localize2('userSnippets', "User Snippets"),
-				mnemonicTitle: nls.localize({ key: 'miOpenSnippets', comment: ['&& denotes a mnemonic'] }, "User &&Snippets"),
+				...nls.localize2('userSnippets', "Snippets"),
+				mnemonicTitle: nls.localize({ key: 'miOpenSnippets', comment: ['&& denotes a mnemonic'] }, "&&Snippets"),
 			},
 			f1: true,
 			menu: [
diff --git a/src/vs/workbench/contrib/snippets/browser/commands/fileTemplateSnippets.ts b/src/vs/workbench/contrib/snippets/browser/commands/fileTemplateSnippets.ts
index 90b3e92d04c..beea5ed367d 100644
--- a/src/vs/workbench/contrib/snippets/browser/commands/fileTemplateSnippets.ts
+++ b/src/vs/workbench/contrib/snippets/browser/commands/fileTemplateSnippets.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { groupBy, isFalsyOrEmpty } from 'vs/base/common/arrays';
-import { compare } from 'vs/base/common/strings';
-import { getCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2';
-import { localize, localize2 } from 'vs/nls';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
-import { SnippetsAction } from 'vs/workbench/contrib/snippets/browser/commands/abstractSnippetsActions';
-import { ISnippetsService } from 'vs/workbench/contrib/snippets/browser/snippets';
-import { Snippet } from 'vs/workbench/contrib/snippets/browser/snippetsFile';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { groupBy, isFalsyOrEmpty } from '../../../../../base/common/arrays.js';
+import { compare } from '../../../../../base/common/strings.js';
+import { getCodeEditor } from '../../../../../editor/browser/editorBrowser.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
+import { SnippetController2 } from '../../../../../editor/contrib/snippet/browser/snippetController2.js';
+import { localize, localize2 } from '../../../../../nls.js';
+import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from '../../../../../platform/quickinput/common/quickInput.js';
+import { SnippetsAction } from './abstractSnippetsActions.js';
+import { ISnippetsService } from '../snippets.js';
+import { Snippet } from '../snippetsFile.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
 
 export class ApplyFileSnippetAction extends SnippetsAction {
 
diff --git a/src/vs/workbench/contrib/snippets/browser/commands/insertSnippet.ts b/src/vs/workbench/contrib/snippets/browser/commands/insertSnippet.ts
index b0eb865ee92..5d71cf5e8cf 100644
--- a/src/vs/workbench/contrib/snippets/browser/commands/insertSnippet.ts
+++ b/src/vs/workbench/contrib/snippets/browser/commands/insertSnippet.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2';
-import * as nls from 'vs/nls';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { SnippetEditorAction } from 'vs/workbench/contrib/snippets/browser/commands/abstractSnippetsActions';
-import { pickSnippet } from 'vs/workbench/contrib/snippets/browser/snippetPicker';
-import { ISnippetsService } from 'vs/workbench/contrib/snippets/browser/snippets';
-import { Snippet, SnippetSource } from 'vs/workbench/contrib/snippets/browser/snippetsFile';
+import { ICodeEditor } from '../../../../../editor/browser/editorBrowser.js';
+import { ServicesAccessor } from '../../../../../editor/browser/editorExtensions.js';
+import { EditorContextKeys } from '../../../../../editor/common/editorContextKeys.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
+import { SnippetController2 } from '../../../../../editor/contrib/snippet/browser/snippetController2.js';
+import * as nls from '../../../../../nls.js';
+import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { SnippetEditorAction } from './abstractSnippetsActions.js';
+import { pickSnippet } from '../snippetPicker.js';
+import { ISnippetsService } from '../snippets.js';
+import { Snippet, SnippetSource } from '../snippetsFile.js';
 
 class Args {
 
diff --git a/src/vs/workbench/contrib/snippets/browser/commands/surroundWithSnippet.ts b/src/vs/workbench/contrib/snippets/browser/commands/surroundWithSnippet.ts
index 8486ac3dad6..e9f9a63d98a 100644
--- a/src/vs/workbench/contrib/snippets/browser/commands/surroundWithSnippet.ts
+++ b/src/vs/workbench/contrib/snippets/browser/commands/surroundWithSnippet.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { Position } from 'vs/editor/common/core/position';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { ITextModel } from 'vs/editor/common/model';
-import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { SnippetEditorAction } from 'vs/workbench/contrib/snippets/browser/commands/abstractSnippetsActions';
-import { pickSnippet } from 'vs/workbench/contrib/snippets/browser/snippetPicker';
-import { Snippet } from 'vs/workbench/contrib/snippets/browser/snippetsFile';
-import { ISnippetsService } from '../snippets';
-import { localize2 } from 'vs/nls';
+import { ICodeEditor } from '../../../../../editor/browser/editorBrowser.js';
+import { Position } from '../../../../../editor/common/core/position.js';
+import { EditorContextKeys } from '../../../../../editor/common/editorContextKeys.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
+import { SnippetController2 } from '../../../../../editor/contrib/snippet/browser/snippetController2.js';
+import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { SnippetEditorAction } from './abstractSnippetsActions.js';
+import { pickSnippet } from '../snippetPicker.js';
+import { Snippet } from '../snippetsFile.js';
+import { ISnippetsService } from '../snippets.js';
+import { localize2 } from '../../../../../nls.js';
 
 export async function getSurroundableSnippets(snippetsService: ISnippetsService, model: ITextModel, position: Position, includeDisabledSnippets: boolean): Promise<Snippet[]> {
 
diff --git a/src/vs/workbench/contrib/snippets/browser/snippetCodeActionProvider.ts b/src/vs/workbench/contrib/snippets/browser/snippetCodeActionProvider.ts
index a061cca5593..53802851eca 100644
--- a/src/vs/workbench/contrib/snippets/browser/snippetCodeActionProvider.ts
+++ b/src/vs/workbench/contrib/snippets/browser/snippetCodeActionProvider.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { CodeAction, CodeActionList, CodeActionProvider, WorkspaceEdit } from 'vs/editor/common/languages';
-import { ITextModel } from 'vs/editor/common/model';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { CodeActionKind } from 'vs/editor/contrib/codeAction/common/types';
-import { localize } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { ApplyFileSnippetAction } from 'vs/workbench/contrib/snippets/browser/commands/fileTemplateSnippets';
-import { getSurroundableSnippets, SurroundWithSnippetEditorAction } from 'vs/workbench/contrib/snippets/browser/commands/surroundWithSnippet';
-import { Snippet } from 'vs/workbench/contrib/snippets/browser/snippetsFile';
-import { ISnippetsService } from './snippets';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { IRange, Range } from '../../../../editor/common/core/range.js';
+import { Selection } from '../../../../editor/common/core/selection.js';
+import { CodeAction, CodeActionList, CodeActionProvider, WorkspaceEdit } from '../../../../editor/common/languages.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
+import { CodeActionKind } from '../../../../editor/contrib/codeAction/common/types.js';
+import { localize } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { ApplyFileSnippetAction } from './commands/fileTemplateSnippets.js';
+import { getSurroundableSnippets, SurroundWithSnippetEditorAction } from './commands/surroundWithSnippet.js';
+import { Snippet } from './snippetsFile.js';
+import { ISnippetsService } from './snippets.js';
 
 class SurroundWithSnippetCodeActionProvider implements CodeActionProvider {
 
diff --git a/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.ts b/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.ts
index 47def86b140..4bd9ab73446 100644
--- a/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.ts
+++ b/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { compare, compareSubstring } from 'vs/base/common/strings';
-import { Position } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { ITextModel } from 'vs/editor/common/model';
-import { CompletionItem, CompletionItemKind, CompletionItemProvider, CompletionList, CompletionItemInsertTextRule, CompletionContext, CompletionTriggerKind, CompletionItemLabel, Command } from 'vs/editor/common/languages';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { SnippetParser } from 'vs/editor/contrib/snippet/browser/snippetParser';
-import { localize } from 'vs/nls';
-import { ISnippetsService } from 'vs/workbench/contrib/snippets/browser/snippets';
-import { Snippet, SnippetSource } from 'vs/workbench/contrib/snippets/browser/snippetsFile';
-import { isPatternInWord } from 'vs/base/common/filters';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { IWordAtPosition } from 'vs/editor/common/core/wordHelper';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { compare, compareSubstring } from '../../../../base/common/strings.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { IRange, Range } from '../../../../editor/common/core/range.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { CompletionItem, CompletionItemKind, CompletionItemProvider, CompletionList, CompletionItemInsertTextRule, CompletionContext, CompletionTriggerKind, CompletionItemLabel, Command } from '../../../../editor/common/languages.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { SnippetParser } from '../../../../editor/contrib/snippet/browser/snippetParser.js';
+import { localize } from '../../../../nls.js';
+import { ISnippetsService } from './snippets.js';
+import { Snippet, SnippetSource } from './snippetsFile.js';
+import { isPatternInWord } from '../../../../base/common/filters.js';
+import { StopWatch } from '../../../../base/common/stopwatch.js';
+import { ILanguageConfigurationService } from '../../../../editor/common/languages/languageConfigurationRegistry.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { IWordAtPosition } from '../../../../editor/common/core/wordHelper.js';
 
 
 const markSnippetAsUsed = '_snippet.markAsUsed';
diff --git a/src/vs/workbench/contrib/snippets/browser/snippetPicker.ts b/src/vs/workbench/contrib/snippets/browser/snippetPicker.ts
index 192845aa528..205fd707021 100644
--- a/src/vs/workbench/contrib/snippets/browser/snippetPicker.ts
+++ b/src/vs/workbench/contrib/snippets/browser/snippetPicker.ts
@@ -3,14 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { ISnippetsService } from 'vs/workbench/contrib/snippets/browser/snippets';
-import { Snippet, SnippetSource } from 'vs/workbench/contrib/snippets/browser/snippetsFile';
-import { IQuickPickItem, IQuickInputService, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { Event } from 'vs/base/common/event';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import * as nls from '../../../../nls.js';
+import { ISnippetsService } from './snippets.js';
+import { Snippet, SnippetSource } from './snippetsFile.js';
+import { IQuickPickItem, IQuickInputService, QuickPickInput } from '../../../../platform/quickinput/common/quickInput.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { Event } from '../../../../base/common/event.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
 
 export async function pickSnippet(accessor: ServicesAccessor, languageIdOrSnippets: string | Snippet[]): Promise<Snippet | undefined> {
 
@@ -77,16 +78,17 @@ export async function pickSnippet(accessor: ServicesAccessor, languageIdOrSnippe
 		return result;
 	};
 
-	const picker = quickInputService.createQuickPick<ISnippetPick>();
+	const disposables = new DisposableStore();
+	const picker = disposables.add(quickInputService.createQuickPick<ISnippetPick>({ useSeparators: true }));
 	picker.placeholder = nls.localize('pick.placeholder', "Select a snippet");
 	picker.matchOnDetail = true;
 	picker.ignoreFocusOut = false;
 	picker.keepScrollPosition = true;
-	picker.onDidTriggerItemButton(ctx => {
+	disposables.add(picker.onDidTriggerItemButton(ctx => {
 		const isEnabled = snippetService.isEnabled(ctx.item.snippet);
 		snippetService.updateEnablement(ctx.item.snippet, !isEnabled);
 		picker.items = makeSnippetPicks();
-	});
+	}));
 	picker.items = makeSnippetPicks();
 	if (!picker.items.length) {
 		picker.validationMessage = nls.localize('pick.noSnippetAvailable', "No snippet available");
@@ -96,6 +98,6 @@ export async function pickSnippet(accessor: ServicesAccessor, languageIdOrSnippe
 	// wait for an item to be picked or the picker to become hidden
 	await Promise.race([Event.toPromise(picker.onDidAccept), Event.toPromise(picker.onDidHide)]);
 	const result = picker.selectedItems[0]?.snippet;
-	picker.dispose();
+	disposables.dispose();
 	return result;
 }
diff --git a/src/vs/workbench/contrib/snippets/browser/snippets.contribution.ts b/src/vs/workbench/contrib/snippets/browser/snippets.contribution.ts
index 0ad6445077f..226fccbff8e 100644
--- a/src/vs/workbench/contrib/snippets/browser/snippets.contribution.ts
+++ b/src/vs/workbench/contrib/snippets/browser/snippets.contribution.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IJSONSchema, IJSONSchemaMap } from 'vs/base/common/jsonSchema';
-import * as nls from 'vs/nls';
-import { registerAction2 } from 'vs/platform/actions/common/actions';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import * as JSONContributionRegistry from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
-import { ConfigureSnippetsAction } from 'vs/workbench/contrib/snippets/browser/commands/configureSnippets';
-import { ApplyFileSnippetAction } from 'vs/workbench/contrib/snippets/browser/commands/fileTemplateSnippets';
-import { InsertSnippetAction } from 'vs/workbench/contrib/snippets/browser/commands/insertSnippet';
-import { SurroundWithSnippetEditorAction } from 'vs/workbench/contrib/snippets/browser/commands/surroundWithSnippet';
-import { SnippetCodeActions } from 'vs/workbench/contrib/snippets/browser/snippetCodeActionProvider';
-import { ISnippetsService } from 'vs/workbench/contrib/snippets/browser/snippets';
-import { SnippetsService } from 'vs/workbench/contrib/snippets/browser/snippetsService';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
+import { IJSONSchema, IJSONSchemaMap } from '../../../../base/common/jsonSchema.js';
+import * as nls from '../../../../nls.js';
+import { registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import * as JSONContributionRegistry from '../../../../platform/jsonschemas/common/jsonContributionRegistry.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry } from '../../../common/contributions.js';
+import { ConfigureSnippetsAction } from './commands/configureSnippets.js';
+import { ApplyFileSnippetAction } from './commands/fileTemplateSnippets.js';
+import { InsertSnippetAction } from './commands/insertSnippet.js';
+import { SurroundWithSnippetEditorAction } from './commands/surroundWithSnippet.js';
+import { SnippetCodeActions } from './snippetCodeActionProvider.js';
+import { ISnippetsService } from './snippets.js';
+import { SnippetsService } from './snippetsService.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { Extensions, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
 
-import 'vs/workbench/contrib/snippets/browser/tabCompletion';
-import { editorConfigurationBaseNode } from 'vs/editor/common/config/editorConfigurationSchema';
+import './tabCompletion.js';
+import { editorConfigurationBaseNode } from '../../../../editor/common/config/editorConfigurationSchema.js';
 
 // service
 registerSingleton(ISnippetsService, SnippetsService, InstantiationType.Delayed);
diff --git a/src/vs/workbench/contrib/snippets/browser/snippets.ts b/src/vs/workbench/contrib/snippets/browser/snippets.ts
index a11c4ccf6a8..ae096afb2a6 100644
--- a/src/vs/workbench/contrib/snippets/browser/snippets.ts
+++ b/src/vs/workbench/contrib/snippets/browser/snippets.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { SnippetFile, Snippet } from 'vs/workbench/contrib/snippets/browser/snippetsFile';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { SnippetFile, Snippet } from './snippetsFile.js';
 
 export const ISnippetsService = createDecorator<ISnippetsService>('snippetService');
 
diff --git a/src/vs/workbench/contrib/snippets/browser/snippetsFile.ts b/src/vs/workbench/contrib/snippets/browser/snippetsFile.ts
index e734b015004..1ebc253173c 100644
--- a/src/vs/workbench/contrib/snippets/browser/snippetsFile.ts
+++ b/src/vs/workbench/contrib/snippets/browser/snippetsFile.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { parse as jsonParse, getNodeType } from 'vs/base/common/json';
-import { localize } from 'vs/nls';
-import { extname, basename } from 'vs/base/common/path';
-import { SnippetParser, Variable, Placeholder, Text } from 'vs/editor/contrib/snippet/browser/snippetParser';
-import { KnownSnippetVariableNames } from 'vs/editor/contrib/snippet/browser/snippetVariables';
-import { URI } from 'vs/base/common/uri';
-import { IFileService } from 'vs/platform/files/common/files';
-import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { IExtensionResourceLoaderService } from 'vs/platform/extensionResourceLoader/common/extensionResourceLoader';
-import { relativePath } from 'vs/base/common/resources';
-import { isObject } from 'vs/base/common/types';
-import { tail } from 'vs/base/common/arrays';
-import { Iterable } from 'vs/base/common/iterator';
-import { WindowIdleValue, getActiveWindow } from 'vs/base/browser/dom';
+import { parse as jsonParse, getNodeType } from '../../../../base/common/json.js';
+import { localize } from '../../../../nls.js';
+import { extname, basename } from '../../../../base/common/path.js';
+import { SnippetParser, Variable, Placeholder, Text } from '../../../../editor/contrib/snippet/browser/snippetParser.js';
+import { KnownSnippetVariableNames } from '../../../../editor/contrib/snippet/browser/snippetVariables.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { ExtensionIdentifier, IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
+import { IExtensionResourceLoaderService } from '../../../../platform/extensionResourceLoader/common/extensionResourceLoader.js';
+import { relativePath } from '../../../../base/common/resources.js';
+import { isObject } from '../../../../base/common/types.js';
+import { tail } from '../../../../base/common/arrays.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { WindowIdleValue, getActiveWindow } from '../../../../base/browser/dom.js';
 
 class SnippetBodyInsights {
 
diff --git a/src/vs/workbench/contrib/snippets/browser/snippetsService.ts b/src/vs/workbench/contrib/snippets/browser/snippetsService.ts
index 2253acd37e8..187615df1de 100644
--- a/src/vs/workbench/contrib/snippets/browser/snippetsService.ts
+++ b/src/vs/workbench/contrib/snippets/browser/snippetsService.ts
@@ -3,34 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import { combinedDisposable, IDisposable, DisposableStore } from 'vs/base/common/lifecycle';
-import * as resources from 'vs/base/common/resources';
-import { isFalsyOrWhitespace } from 'vs/base/common/strings';
-import { URI } from 'vs/base/common/uri';
-import { Position } from 'vs/editor/common/core/position';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { setSnippetSuggestSupport } from 'vs/editor/contrib/suggest/browser/suggest';
-import { localize } from 'vs/nls';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { FileChangeType, IFileService } from 'vs/platform/files/common/files';
-import { ILifecycleService, LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IWorkspace, IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { ISnippetGetOptions, ISnippetsService } from 'vs/workbench/contrib/snippets/browser/snippets';
-import { Snippet, SnippetFile, SnippetSource } from 'vs/workbench/contrib/snippets/browser/snippetsFile';
-import { ExtensionsRegistry, IExtensionPointUser } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { languagesExtPoint } from 'vs/workbench/services/language/common/languageService';
-import { SnippetCompletionProvider } from './snippetCompletionProvider';
-import { IExtensionResourceLoaderService } from 'vs/platform/extensionResourceLoader/common/extensionResourceLoader';
-import { ResourceMap } from 'vs/base/common/map';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { isStringArray } from 'vs/base/common/types';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { insertInto } from 'vs/base/common/arrays';
+import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
+import { combinedDisposable, IDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import * as resources from '../../../../base/common/resources.js';
+import { isFalsyOrWhitespace } from '../../../../base/common/strings.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { setSnippetSuggestSupport } from '../../../../editor/contrib/suggest/browser/suggest.js';
+import { localize } from '../../../../nls.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { FileChangeType, IFileService } from '../../../../platform/files/common/files.js';
+import { ILifecycleService, LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IWorkspace, IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { ISnippetGetOptions, ISnippetsService } from './snippets.js';
+import { Snippet, SnippetFile, SnippetSource } from './snippetsFile.js';
+import { ExtensionsRegistry, IExtensionPointUser } from '../../../services/extensions/common/extensionsRegistry.js';
+import { languagesExtPoint } from '../../../services/language/common/languageService.js';
+import { SnippetCompletionProvider } from './snippetCompletionProvider.js';
+import { IExtensionResourceLoaderService } from '../../../../platform/extensionResourceLoader/common/extensionResourceLoader.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { isStringArray } from '../../../../base/common/types.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
+import { ILanguageConfigurationService } from '../../../../editor/common/languages/languageConfigurationRegistry.js';
+import { IUserDataProfileService } from '../../../services/userDataProfile/common/userDataProfile.js';
+import { insertInto } from '../../../../base/common/arrays.js';
 
 namespace snippetExt {
 
@@ -118,7 +118,7 @@ namespace snippetExt {
 	});
 }
 
-function watch(service: IFileService, resource: URI, callback: () => any): IDisposable {
+function watch(service: IFileService, resource: URI, callback: () => unknown): IDisposable {
 	return combinedDisposable(
 		service.watch(resource),
 		service.onDidFilesChange(e => {
diff --git a/src/vs/workbench/contrib/snippets/browser/tabCompletion.ts b/src/vs/workbench/contrib/snippets/browser/tabCompletion.ts
index b268b26a489..43dd710d128 100644
--- a/src/vs/workbench/contrib/snippets/browser/tabCompletion.ts
+++ b/src/vs/workbench/contrib/snippets/browser/tabCompletion.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { RawContextKey, IContextKeyService, ContextKeyExpr, IContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ISnippetsService } from './snippets';
-import { getNonWhitespacePrefix } from './snippetsService';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { Range } from 'vs/editor/common/core/range';
-import { registerEditorContribution, EditorCommand, registerEditorCommand, EditorContributionInstantiation } from 'vs/editor/browser/editorExtensions';
-import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2';
-import { showSimpleSuggestions } from 'vs/editor/contrib/suggest/browser/suggest';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { Snippet } from './snippetsFile';
-import { SnippetCompletion } from './snippetCompletionProvider';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { EditorState, CodeEditorStateFlag } from 'vs/editor/contrib/editorState/browser/editorState';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { CompletionItemProvider } from 'vs/editor/common/languages';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { RawContextKey, IContextKeyService, ContextKeyExpr, IContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ISnippetsService } from './snippets.js';
+import { getNonWhitespacePrefix } from './snippetsService.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { IEditorContribution } from '../../../../editor/common/editorCommon.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { registerEditorContribution, EditorCommand, registerEditorCommand, EditorContributionInstantiation } from '../../../../editor/browser/editorExtensions.js';
+import { SnippetController2 } from '../../../../editor/contrib/snippet/browser/snippetController2.js';
+import { showSimpleSuggestions } from '../../../../editor/contrib/suggest/browser/suggest.js';
+import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { Snippet } from './snippetsFile.js';
+import { SnippetCompletion } from './snippetCompletionProvider.js';
+import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { EditorState, CodeEditorStateFlag } from '../../../../editor/contrib/editorState/browser/editorState.js';
+import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
+import { CompletionItemProvider } from '../../../../editor/common/languages.js';
 
 export class TabCompletionController implements IEditorContribution {
 
diff --git a/src/vs/workbench/contrib/snippets/test/browser/snippetFile.test.ts b/src/vs/workbench/contrib/snippets/test/browser/snippetFile.test.ts
index 6b5bef90c2a..8274299f3da 100644
--- a/src/vs/workbench/contrib/snippets/test/browser/snippetFile.test.ts
+++ b/src/vs/workbench/contrib/snippets/test/browser/snippetFile.test.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { SnippetFile, Snippet, SnippetSource } from 'vs/workbench/contrib/snippets/browser/snippetsFile';
-import { URI } from 'vs/base/common/uri';
-import { SnippetParser } from 'vs/editor/contrib/snippet/browser/snippetParser';
-import { generateUuid } from 'vs/base/common/uuid';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { SnippetFile, Snippet, SnippetSource } from '../../browser/snippetsFile.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { SnippetParser } from '../../../../../editor/contrib/snippet/browser/snippetParser.js';
+import { generateUuid } from '../../../../../base/common/uuid.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('Snippets', function () {
 
diff --git a/src/vs/workbench/contrib/snippets/test/browser/snippetsRegistry.test.ts b/src/vs/workbench/contrib/snippets/test/browser/snippetsRegistry.test.ts
index d4824fdf3b9..a70814867f7 100644
--- a/src/vs/workbench/contrib/snippets/test/browser/snippetsRegistry.test.ts
+++ b/src/vs/workbench/contrib/snippets/test/browser/snippetsRegistry.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { getNonWhitespacePrefix } from 'vs/workbench/contrib/snippets/browser/snippetsService';
-import { Position } from 'vs/editor/common/core/position';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { getNonWhitespacePrefix } from '../../browser/snippetsService.js';
+import { Position } from '../../../../../editor/common/core/position.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('getNonWhitespacePrefix', () => {
 
diff --git a/src/vs/workbench/contrib/snippets/test/browser/snippetsRewrite.test.ts b/src/vs/workbench/contrib/snippets/test/browser/snippetsRewrite.test.ts
index 39b490f2fe3..7816e8bb578 100644
--- a/src/vs/workbench/contrib/snippets/test/browser/snippetsRewrite.test.ts
+++ b/src/vs/workbench/contrib/snippets/test/browser/snippetsRewrite.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { generateUuid } from 'vs/base/common/uuid';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Snippet, SnippetSource } from 'vs/workbench/contrib/snippets/browser/snippetsFile';
+import { generateUuid } from '../../../../../base/common/uuid.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Snippet, SnippetSource } from '../../browser/snippetsFile.js';
 
 suite('SnippetRewrite', function () {
 
diff --git a/src/vs/workbench/contrib/snippets/test/browser/snippetsService.test.ts b/src/vs/workbench/contrib/snippets/test/browser/snippetsService.test.ts
index 297836af6c8..bb8b5f8f700 100644
--- a/src/vs/workbench/contrib/snippets/test/browser/snippetsService.test.ts
+++ b/src/vs/workbench/contrib/snippets/test/browser/snippetsService.test.ts
@@ -4,24 +4,24 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { SnippetCompletion, SnippetCompletionProvider } from 'vs/workbench/contrib/snippets/browser/snippetCompletionProvider';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { createModelServices, instantiateTextModel } from 'vs/editor/test/common/testTextModel';
-import { ISnippetsService } from 'vs/workbench/contrib/snippets/browser/snippets';
-import { Snippet, SnippetSource } from 'vs/workbench/contrib/snippets/browser/snippetsFile';
-import { CompletionContext, CompletionItemLabel, CompletionItemRanges, CompletionTriggerKind } from 'vs/editor/common/languages';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { TestLanguageConfigurationService } from 'vs/editor/test/common/modes/testLanguageConfigurationService';
-import { EditOperation } from 'vs/editor/common/core/editOperation';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { generateUuid } from 'vs/base/common/uuid';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ITextModel } from 'vs/editor/common/model';
-import { CompletionModel } from 'vs/editor/contrib/suggest/browser/completionModel';
-import { CompletionItem } from 'vs/editor/contrib/suggest/browser/suggest';
-import { WordDistance } from 'vs/editor/contrib/suggest/browser/wordDistance';
-import { EditorOptions } from 'vs/editor/common/config/editorOptions';
+import { SnippetCompletion, SnippetCompletionProvider } from '../../browser/snippetCompletionProvider.js';
+import { IPosition, Position } from '../../../../../editor/common/core/position.js';
+import { createModelServices, instantiateTextModel } from '../../../../../editor/test/common/testTextModel.js';
+import { ISnippetsService } from '../../browser/snippets.js';
+import { Snippet, SnippetSource } from '../../browser/snippetsFile.js';
+import { CompletionContext, CompletionItemLabel, CompletionItemRanges, CompletionTriggerKind } from '../../../../../editor/common/languages.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { TestLanguageConfigurationService } from '../../../../../editor/test/common/modes/testLanguageConfigurationService.js';
+import { EditOperation } from '../../../../../editor/common/core/editOperation.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
+import { generateUuid } from '../../../../../base/common/uuid.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
+import { CompletionModel } from '../../../../../editor/contrib/suggest/browser/completionModel.js';
+import { CompletionItem } from '../../../../../editor/contrib/suggest/browser/suggest.js';
+import { WordDistance } from '../../../../../editor/contrib/suggest/browser/wordDistance.js';
+import { EditorOptions } from '../../../../../editor/common/config/editorOptions.js';
 
 class SimpleSnippetService implements ISnippetsService {
 	declare readonly _serviceBrand: undefined;
diff --git a/src/vs/workbench/contrib/speech/browser/speech.contribution.ts b/src/vs/workbench/contrib/speech/browser/speech.contribution.ts
index 7184018cd98..092ac7bad74 100644
--- a/src/vs/workbench/contrib/speech/browser/speech.contribution.ts
+++ b/src/vs/workbench/contrib/speech/browser/speech.contribution.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ISpeechService } from 'vs/workbench/contrib/speech/common/speechService';
-import { SpeechService } from 'vs/workbench/contrib/speech/browser/speechService';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ISpeechService } from '../common/speechService.js';
+import { SpeechService } from './speechService.js';
 
 registerSingleton(ISpeechService, SpeechService, InstantiationType.Eager /* Reads Extension Points */);
diff --git a/src/vs/workbench/contrib/speech/browser/speechAccessibilitySignal.ts b/src/vs/workbench/contrib/speech/browser/speechAccessibilitySignal.ts
index 7bc183df9ed..e0200aaff5d 100644
--- a/src/vs/workbench/contrib/speech/browser/speechAccessibilitySignal.ts
+++ b/src/vs/workbench/contrib/speech/browser/speechAccessibilitySignal.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { AccessibilitySignal, IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { ISpeechService } from 'vs/workbench/contrib/speech/common/speechService';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { ISpeechService } from '../common/speechService.js';
 
 export class SpeechAccessibilitySignalContribution extends Disposable implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/contrib/speech/browser/speechService.ts b/src/vs/workbench/contrib/speech/browser/speechService.ts
index 0306b35c7d4..8529260f59a 100644
--- a/src/vs/workbench/contrib/speech/browser/speechService.ts
+++ b/src/vs/workbench/contrib/speech/browser/speechService.ts
@@ -3,20 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { firstOrDefault } from 'vs/base/common/arrays';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { DeferredPromise } from 'vs/base/common/async';
-import { ISpeechService, ISpeechProvider, HasSpeechProvider, ISpeechToTextSession, SpeechToTextInProgress, KeywordRecognitionStatus, SpeechToTextStatus, speechLanguageConfigToLanguage, SPEECH_LANGUAGE_CONFIG, ITextToSpeechSession, TextToSpeechInProgress, TextToSpeechStatus } from 'vs/workbench/contrib/speech/common/speechService';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { localize } from '../../../../nls.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { DeferredPromise } from '../../../../base/common/async.js';
+import { ISpeechService, ISpeechProvider, HasSpeechProvider, ISpeechToTextSession, SpeechToTextInProgress, KeywordRecognitionStatus, SpeechToTextStatus, speechLanguageConfigToLanguage, SPEECH_LANGUAGE_CONFIG, ITextToSpeechSession, TextToSpeechInProgress, TextToSpeechStatus } from '../common/speechService.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ExtensionsRegistry } from '../../../services/extensions/common/extensionsRegistry.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 
 export interface ISpeechProviderDescriptor {
 	readonly name: string;
@@ -227,7 +226,7 @@ export class SpeechService extends Disposable implements ISpeechService {
 		// Send out extension activation to ensure providers can register
 		await this.extensionService.activateByEvent('onSpeech');
 
-		const provider = firstOrDefault(Array.from(this.providers.values()));
+		const provider = Array.from(this.providers.values()).at(0);
 		if (!provider) {
 			throw new Error(`No Speech provider is registered.`);
 		} else if (this.providers.size > 1) {
diff --git a/src/vs/workbench/contrib/speech/common/speechService.ts b/src/vs/workbench/contrib/speech/common/speechService.ts
index 0b99c46ac57..4df439533b5 100644
--- a/src/vs/workbench/contrib/speech/common/speechService.ts
+++ b/src/vs/workbench/contrib/speech/common/speechService.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Event } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { language } from 'vs/base/common/platform';
+import { localize } from '../../../../nls.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Event } from '../../../../base/common/event.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { language } from '../../../../base/common/platform.js';
 
 export const ISpeechService = createDecorator<ISpeechService>('speechService');
 
diff --git a/src/vs/workbench/contrib/speech/test/common/speechService.test.ts b/src/vs/workbench/contrib/speech/test/common/speechService.test.ts
index 16a4f0d9b77..81897469a1e 100644
--- a/src/vs/workbench/contrib/speech/test/common/speechService.test.ts
+++ b/src/vs/workbench/contrib/speech/test/common/speechService.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { speechLanguageConfigToLanguage } from 'vs/workbench/contrib/speech/common/speechService';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { speechLanguageConfigToLanguage } from '../../common/speechService.js';
 
 suite('SpeechService', () => {
 
diff --git a/src/vs/workbench/contrib/splash/browser/partsSplash.ts b/src/vs/workbench/contrib/splash/browser/partsSplash.ts
index 8b2dd0dcdd1..d410339e5ad 100644
--- a/src/vs/workbench/contrib/splash/browser/partsSplash.ts
+++ b/src/vs/workbench/contrib/splash/browser/partsSplash.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { onDidChangeFullscreen, isFullscreen } from 'vs/base/browser/browser';
-import * as dom from 'vs/base/browser/dom';
-import { Color } from 'vs/base/common/color';
-import { Event } from 'vs/base/common/event';
-import { DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
-import { editorBackground, foreground } from 'vs/platform/theme/common/colorRegistry';
-import { getThemeTypeSelector, IThemeService } from 'vs/platform/theme/common/themeService';
-import { DEFAULT_EDITOR_MIN_DIMENSIONS } from 'vs/workbench/browser/parts/editor/editor';
-import * as themes from 'vs/workbench/common/theme';
-import { IWorkbenchLayoutService, Parts, Position } from 'vs/workbench/services/layout/browser/layoutService';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import * as perf from 'vs/base/common/performance';
-import { assertIsDefined } from 'vs/base/common/types';
-import { ISplashStorageService } from 'vs/workbench/contrib/splash/browser/splash';
-import { mainWindow } from 'vs/base/browser/window';
-import { ILifecycleService, LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { TitleBarSetting } from 'vs/platform/window/common/window';
+import { onDidChangeFullscreen, isFullscreen } from '../../../../base/browser/browser.js';
+import * as dom from '../../../../base/browser/dom.js';
+import { Color } from '../../../../base/common/color.js';
+import { Event } from '../../../../base/common/event.js';
+import { DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { editorBackground, foreground } from '../../../../platform/theme/common/colorRegistry.js';
+import { getThemeTypeSelector, IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { DEFAULT_EDITOR_MIN_DIMENSIONS } from '../../../browser/parts/editor/editor.js';
+import * as themes from '../../../common/theme.js';
+import { IWorkbenchLayoutService, Parts, Position } from '../../../services/layout/browser/layoutService.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import * as perf from '../../../../base/common/performance.js';
+import { assertIsDefined } from '../../../../base/common/types.js';
+import { ISplashStorageService } from './splash.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { ILifecycleService, LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { TitleBarSetting } from '../../../../platform/window/common/window.js';
 
 export class PartsSplash {
 
@@ -79,9 +79,13 @@ export class PartsSplash {
 				background: Color.Format.CSS.formatHex(theme.getColor(editorBackground) || themes.WORKBENCH_BACKGROUND(theme)),
 				editorBackground: theme.getColor(editorBackground)?.toString(),
 				titleBarBackground: theme.getColor(themes.TITLE_BAR_ACTIVE_BACKGROUND)?.toString(),
+				titleBarBorder: theme.getColor(themes.TITLE_BAR_BORDER)?.toString(),
 				activityBarBackground: theme.getColor(themes.ACTIVITY_BAR_BACKGROUND)?.toString(),
+				activityBarBorder: theme.getColor(themes.ACTIVITY_BAR_BORDER)?.toString(),
 				sideBarBackground: theme.getColor(themes.SIDE_BAR_BACKGROUND)?.toString(),
+				sideBarBorder: theme.getColor(themes.SIDE_BAR_BORDER)?.toString(),
 				statusBarBackground: theme.getColor(themes.STATUS_BAR_BACKGROUND)?.toString(),
+				statusBarBorder: theme.getColor(themes.STATUS_BAR_BORDER)?.toString(),
 				statusBarNoFolderBackground: theme.getColor(themes.STATUS_BAR_NO_FOLDER_BACKGROUND)?.toString(),
 				windowBorder: theme.getColor(themes.WINDOW_ACTIVE_BORDER)?.toString() ?? theme.getColor(themes.WINDOW_INACTIVE_BORDER)?.toString()
 			},
diff --git a/src/vs/workbench/contrib/splash/browser/splash.contribution.ts b/src/vs/workbench/contrib/splash/browser/splash.contribution.ts
index 93d2428edee..e690968bb84 100644
--- a/src/vs/workbench/contrib/splash/browser/splash.contribution.ts
+++ b/src/vs/workbench/contrib/splash/browser/splash.contribution.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { ISplashStorageService } from 'vs/workbench/contrib/splash/browser/splash';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { PartsSplash } from 'vs/workbench/contrib/splash/browser/partsSplash';
-import { IPartsSplash } from 'vs/platform/theme/common/themeService';
+import { WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { ISplashStorageService } from './splash.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { PartsSplash } from './partsSplash.js';
+import { IPartsSplash } from '../../../../platform/theme/common/themeService.js';
 
 registerSingleton(ISplashStorageService, class SplashStorageService implements ISplashStorageService {
 	_serviceBrand: undefined;
diff --git a/src/vs/workbench/contrib/splash/browser/splash.ts b/src/vs/workbench/contrib/splash/browser/splash.ts
index 79f677fa070..7492e2d1f86 100644
--- a/src/vs/workbench/contrib/splash/browser/splash.ts
+++ b/src/vs/workbench/contrib/splash/browser/splash.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IPartsSplash } from 'vs/platform/theme/common/themeService';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IPartsSplash } from '../../../../platform/theme/common/themeService.js';
 
 export const ISplashStorageService = createDecorator<ISplashStorageService>('ISplashStorageService');
 
diff --git a/src/vs/workbench/contrib/splash/electron-sandbox/splash.contribution.ts b/src/vs/workbench/contrib/splash/electron-sandbox/splash.contribution.ts
index c8fa8a6a604..7081bd0c6c2 100644
--- a/src/vs/workbench/contrib/splash/electron-sandbox/splash.contribution.ts
+++ b/src/vs/workbench/contrib/splash/electron-sandbox/splash.contribution.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { ISplashStorageService } from 'vs/workbench/contrib/splash/browser/splash';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { PartsSplash } from 'vs/workbench/contrib/splash/browser/partsSplash';
-import { IPartsSplash } from 'vs/platform/theme/common/themeService';
+import { WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { ISplashStorageService } from '../browser/splash.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { PartsSplash } from '../browser/partsSplash.js';
+import { IPartsSplash } from '../../../../platform/theme/common/themeService.js';
 
 class SplashStorageService implements ISplashStorageService {
 	_serviceBrand: undefined;
diff --git a/src/vs/workbench/contrib/surveys/browser/ces.contribution.ts b/src/vs/workbench/contrib/surveys/browser/ces.contribution.ts
deleted file mode 100644
index b24d91f8da3..00000000000
--- a/src/vs/workbench/contrib/surveys/browser/ces.contribution.ts
+++ /dev/null
@@ -1,161 +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 nls from 'vs/nls';
-import { language } from 'vs/base/common/platform';
-import { IWorkbenchContributionsRegistry, IWorkbenchContribution, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { Severity, INotificationService } from 'vs/platform/notification/common/notification';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IWorkbenchAssignmentService } from 'vs/workbench/services/assignment/common/assignmentService';
-import { URI } from 'vs/base/common/uri';
-import { platform } from 'vs/base/common/process';
-import { ThrottledDelayer } from 'vs/base/common/async';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Event } from 'vs/base/common/event';
-
-const WAIT_TIME_TO_SHOW_SURVEY = 1000 * 60 * 60; // 1 hour
-const MIN_WAIT_TIME_TO_SHOW_SURVEY = 1000 * 60 * 2; // 2 minutes
-const MAX_INSTALL_AGE = 1000 * 60 * 60 * 24; // 24 hours
-const REMIND_LATER_DELAY = 1000 * 60 * 60 * 4; // 4 hours
-const SKIP_SURVEY_KEY = 'ces/skipSurvey';
-const REMIND_LATER_DATE_KEY = 'ces/remindLaterDate';
-
-class CESContribution extends Disposable implements IWorkbenchContribution {
-
-	private promptDelayer = this._register(new ThrottledDelayer<void>(0));
-	private readonly tasExperimentService: IWorkbenchAssignmentService | undefined;
-
-	constructor(
-		@IStorageService private readonly storageService: IStorageService,
-		@INotificationService private readonly notificationService: INotificationService,
-		@ITelemetryService private readonly telemetryService: ITelemetryService,
-		@IOpenerService private readonly openerService: IOpenerService,
-		@IProductService private readonly productService: IProductService,
-		@IWorkbenchAssignmentService tasExperimentService: IWorkbenchAssignmentService,
-	) {
-		super();
-
-		this.tasExperimentService = tasExperimentService;
-
-		if (!productService.cesSurveyUrl) {
-			return;
-		}
-
-		const skipSurvey = storageService.get(SKIP_SURVEY_KEY, StorageScope.APPLICATION, '');
-		if (skipSurvey) {
-			return;
-		}
-
-		this.schedulePrompt();
-	}
-
-	private async promptUser() {
-		const isCandidate = await this.tasExperimentService?.getTreatment<boolean>('CESSurvey');
-		if (!isCandidate) {
-			this.skipSurvey();
-			return;
-		}
-
-		const sendTelemetry = (userReaction: 'accept' | 'remindLater' | 'neverShowAgain' | 'cancelled') => {
-			/* __GDPR__
-			"cesSurvey:popup" : {
-				"owner": "digitarald",
-				"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-			}
-			*/
-			this.telemetryService.publicLog('cesSurvey:popup', { userReaction });
-		};
-
-		const message = await this.tasExperimentService?.getTreatment<string>('CESSurveyMessage') ?? nls.localize('cesSurveyQuestion', 'Got a moment to help the VS Code team? Please tell us about your experience with VS Code so far.');
-		const button = await this.tasExperimentService?.getTreatment<string>('CESSurveyButton') ?? nls.localize('giveFeedback', "Give Feedback");
-
-		const notification = this.notificationService.prompt(
-			Severity.Info,
-			message,
-			[{
-				label: button,
-				run: () => {
-					sendTelemetry('accept');
-					let surveyUrl = `${this.productService.cesSurveyUrl}?o=${encodeURIComponent(platform)}&v=${encodeURIComponent(this.productService.version)}&m=${encodeURIComponent(this.telemetryService.machineId)}`;
-
-					const usedParams = this.productService.surveys
-						?.filter(surveyData => surveyData.surveyId && surveyData.languageId)
-						// Counts provided by contrib/surveys/browser/languageSurveys
-						.filter(surveyData => this.storageService.getNumber(`${surveyData.surveyId}.editedCount`, StorageScope.APPLICATION, 0) > 0)
-						.map(surveyData => `${encodeURIComponent(surveyData.languageId)}Lang=1`)
-						.join('&');
-					if (usedParams) {
-						surveyUrl += `&${usedParams}`;
-					}
-					this.openerService.open(URI.parse(surveyUrl));
-					this.skipSurvey();
-				}
-			}, {
-				label: nls.localize('remindLater', "Remind Me Later"),
-				run: () => {
-					sendTelemetry('remindLater');
-					this.storageService.store(REMIND_LATER_DATE_KEY, new Date().toUTCString(), StorageScope.APPLICATION, StorageTarget.USER);
-					this.schedulePrompt();
-				}
-			}],
-			{
-				sticky: true,
-				onCancel: () => {
-					sendTelemetry('cancelled');
-					this.skipSurvey();
-				}
-			}
-		);
-
-		await Event.toPromise(notification.onDidClose);
-	}
-
-	private async schedulePrompt(): Promise<void> {
-		let waitTimeToShowSurvey = 0;
-		const remindLaterDate = this.storageService.get(REMIND_LATER_DATE_KEY, StorageScope.APPLICATION, '');
-		if (remindLaterDate) {
-			const timeToRemind = new Date(remindLaterDate).getTime() + REMIND_LATER_DELAY - Date.now();
-			if (timeToRemind > 0) {
-				waitTimeToShowSurvey = timeToRemind;
-			}
-		} else {
-			const timeFromInstall = Date.now() - new Date(this.telemetryService.firstSessionDate).getTime();
-			const isNewInstall = !isNaN(timeFromInstall) && timeFromInstall < MAX_INSTALL_AGE;
-
-			// Installation is older than MAX_INSTALL_AGE
-			if (!isNewInstall) {
-				this.skipSurvey();
-				return;
-			}
-			if (timeFromInstall < WAIT_TIME_TO_SHOW_SURVEY) {
-				waitTimeToShowSurvey = WAIT_TIME_TO_SHOW_SURVEY - timeFromInstall;
-			}
-		}
-		/* __GDPR__
-		"cesSurvey:schedule" : {
-			"owner": "digitarald"
-		}
-		*/
-		this.telemetryService.publicLog('cesSurvey:schedule');
-
-		this.promptDelayer.trigger(async () => {
-			await this.promptUser();
-		}, Math.max(waitTimeToShowSurvey, MIN_WAIT_TIME_TO_SHOW_SURVEY));
-	}
-
-	private skipSurvey(): void {
-		this.storageService.store(SKIP_SURVEY_KEY, this.productService.version, StorageScope.APPLICATION, StorageTarget.USER);
-	}
-}
-
-if (language === 'en') {
-	const workbenchRegistry = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
-	workbenchRegistry.registerWorkbenchContribution(CESContribution, LifecyclePhase.Restored);
-}
diff --git a/src/vs/workbench/contrib/surveys/browser/languageSurveys.contribution.ts b/src/vs/workbench/contrib/surveys/browser/languageSurveys.contribution.ts
index b72e929518a..e7df0b22037 100644
--- a/src/vs/workbench/contrib/surveys/browser/languageSurveys.contribution.ts
+++ b/src/vs/workbench/contrib/surveys/browser/languageSurveys.contribution.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { language } from 'vs/base/common/platform';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IWorkbenchContributionsRegistry, IWorkbenchContribution, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ISurveyData } from 'vs/base/common/product';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { Severity, INotificationService } from 'vs/platform/notification/common/notification';
-import { ITextFileService, ITextFileEditorModel } from 'vs/workbench/services/textfile/common/textfiles';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { URI } from 'vs/base/common/uri';
-import { platform } from 'vs/base/common/process';
-import { RunOnceWorker } from 'vs/base/common/async';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { localize } from '../../../../nls.js';
+import { language } from '../../../../base/common/platform.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { IWorkbenchContributionsRegistry, IWorkbenchContribution, Extensions as WorkbenchExtensions } from '../../../common/contributions.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { ISurveyData } from '../../../../base/common/product.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { Severity, INotificationService } from '../../../../platform/notification/common/notification.js';
+import { ITextFileService, ITextFileEditorModel } from '../../../services/textfile/common/textfiles.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { URI } from '../../../../base/common/uri.js';
+import { platform } from '../../../../base/common/process.js';
+import { RunOnceWorker } from '../../../../base/common/async.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 
 class LanguageSurvey extends Disposable {
 
diff --git a/src/vs/workbench/contrib/surveys/browser/nps.contribution.ts b/src/vs/workbench/contrib/surveys/browser/nps.contribution.ts
index 170b8e82ff0..ba0e35ef849 100644
--- a/src/vs/workbench/contrib/surveys/browser/nps.contribution.ts
+++ b/src/vs/workbench/contrib/surveys/browser/nps.contribution.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { language } from 'vs/base/common/platform';
-import { IWorkbenchContributionsRegistry, IWorkbenchContribution, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { Severity, INotificationService, NotificationPriority } from 'vs/platform/notification/common/notification';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { URI } from 'vs/base/common/uri';
-import { platform } from 'vs/base/common/process';
+import * as nls from '../../../../nls.js';
+import { language } from '../../../../base/common/platform.js';
+import { IWorkbenchContributionsRegistry, IWorkbenchContribution, Extensions as WorkbenchExtensions } from '../../../common/contributions.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { Severity, INotificationService, NotificationPriority } from '../../../../platform/notification/common/notification.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { URI } from '../../../../base/common/uri.js';
+import { platform } from '../../../../base/common/process.js';
 
 const PROBABILITY = 0.15;
 const SESSION_COUNT_KEY = 'nps/sessionCount';
diff --git a/src/vs/workbench/contrib/tags/browser/workspaceTagsService.ts b/src/vs/workbench/contrib/tags/browser/workspaceTagsService.ts
index a955a05b091..be4faf2c59a 100644
--- a/src/vs/workbench/contrib/tags/browser/workspaceTagsService.ts
+++ b/src/vs/workbench/contrib/tags/browser/workspaceTagsService.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { WorkbenchState, IWorkspace } from 'vs/platform/workspace/common/workspace';
-import { URI } from 'vs/base/common/uri';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IWorkspaceTagsService, Tags } from 'vs/workbench/contrib/tags/common/workspaceTags';
+import { WorkbenchState, IWorkspace } from '../../../../platform/workspace/common/workspace.js';
+import { URI } from '../../../../base/common/uri.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IWorkspaceTagsService, Tags } from '../common/workspaceTags.js';
 
 export class NoOpWorkspaceTagsService implements IWorkspaceTagsService {
 
diff --git a/src/vs/workbench/contrib/tags/common/javaWorkspaceTags.ts b/src/vs/workbench/contrib/tags/common/javaWorkspaceTags.ts
index 5e20a341739..5f2f1064da0 100644
--- a/src/vs/workbench/contrib/tags/common/javaWorkspaceTags.ts
+++ b/src/vs/workbench/contrib/tags/common/javaWorkspaceTags.ts
@@ -55,6 +55,25 @@ export const JavaLibrariesToLookFor: { predicate: (groupId: string, artifactId:
 	// event hubs
 	{ 'predicate': (groupId, artifactId) => groupId === 'com.azure' && artifactId.startsWith('azure-messaging-eventhubs'), 'tag': 'azure-eventhubs' },
 	{ 'predicate': (groupId, artifactId) => groupId === 'com.azure.spring' && artifactId.includes('eventhubs'), 'tag': 'azure-eventhubs' },
+	// ai related libraries
+	{ 'predicate': (groupId, artifactId) => groupId === 'dev.langchain4j', 'tag': 'langchain4j' },
+	{ 'predicate': (groupId, artifactId) => groupId === 'io.springboot.ai', 'tag': 'springboot-ai' },
+	{ 'predicate': (groupId, artifactId) => groupId === 'com.microsoft.semantic-kernel', 'tag': 'semantic-kernel' },
+	{ 'predicate': (groupId, artifactId) => groupId === 'com.azure' && artifactId === 'azure-ai-anomalydetector', 'tag': 'azure-ai-anomalydetector' },
+	{ 'predicate': (groupId, artifactId) => groupId === 'com.azure' && artifactId === 'azure-ai-formrecognizer', 'tag': 'azure-ai-formrecognizer' },
+	{ 'predicate': (groupId, artifactId) => groupId === 'com.azure' && artifactId === 'azure-ai-documentintelligence', 'tag': 'azure-ai-documentintelligence' },
+	{ 'predicate': (groupId, artifactId) => groupId === 'com.azure' && artifactId === 'azure-ai-translation-document', 'tag': 'azure-ai-translation-document' },
+	{ 'predicate': (groupId, artifactId) => groupId === 'com.azure' && artifactId === 'azure-ai-personalizer', 'tag': 'azure-ai-personalizer' },
+	{ 'predicate': (groupId, artifactId) => groupId === 'com.azure' && artifactId === 'azure-ai-translation-text', 'tag': 'azure-ai-translation-text' },
+	{ 'predicate': (groupId, artifactId) => groupId === 'com.azure' && artifactId === 'azure-ai-contentsafety', 'tag': 'azure-ai-contentsafety' },
+	{ 'predicate': (groupId, artifactId) => groupId === 'com.azure' && artifactId === 'azure-ai-vision-imageanalysis', 'tag': 'azure-ai-vision-imageanalysis' },
+	{ 'predicate': (groupId, artifactId) => groupId === 'com.azure' && artifactId === 'azure-ai-textanalytics', 'tag': 'azure-ai-textanalytics' },
+	{ 'predicate': (groupId, artifactId) => groupId === 'com.azure' && artifactId === 'azure-search-documents', 'tag': 'azure-search-documents' },
+	{ 'predicate': (groupId, artifactId) => groupId === 'com.azure' && artifactId === 'azure-ai-documenttranslator', 'tag': 'azure-ai-documenttranslator' },
+	{ 'predicate': (groupId, artifactId) => groupId === 'com.azure' && artifactId === 'azure-ai-vision-face', 'tag': 'azure-ai-vision-face' },
+	{ 'predicate': (groupId, artifactId) => groupId === 'com.azure' && artifactId === 'azure-ai-openai-assistants', 'tag': 'azure-ai-openai-assistants' },
+	{ 'predicate': (groupId, artifactId) => groupId === 'com.microsoft.azure.cognitiveservices', 'tag': 'azure-cognitiveservices' },
+	{ 'predicate': (groupId, artifactId) => groupId === 'com.microsoft.cognitiveservices.speech', 'tag': 'azure-cognitiveservices-speech' },
 	// open ai
 	{ 'predicate': (groupId, artifactId) => groupId === 'com.theokanning.openai-gpt3-java', 'tag': 'openai' },
 	// azure open ai
diff --git a/src/vs/workbench/contrib/tags/common/workspaceTags.ts b/src/vs/workbench/contrib/tags/common/workspaceTags.ts
index 9fa39efcb20..b1bcab52f5f 100644
--- a/src/vs/workbench/contrib/tags/common/workspaceTags.ts
+++ b/src/vs/workbench/contrib/tags/common/workspaceTags.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { WorkbenchState, IWorkspace } from 'vs/platform/workspace/common/workspace';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { URI } from 'vs/base/common/uri';
-import { getRemotes } from 'vs/platform/extensionManagement/common/configRemotes';
+import { WorkbenchState, IWorkspace } from '../../../../platform/workspace/common/workspace.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { URI } from '../../../../base/common/uri.js';
+import { getRemotes } from '../../../../platform/extensionManagement/common/configRemotes.js';
 
 export type Tags = { [index: string]: boolean | number | string | undefined };
 
diff --git a/src/vs/workbench/contrib/tags/electron-sandbox/tags.contribution.ts b/src/vs/workbench/contrib/tags/electron-sandbox/tags.contribution.ts
index 887b429b74c..01e8d10a700 100644
--- a/src/vs/workbench/contrib/tags/electron-sandbox/tags.contribution.ts
+++ b/src/vs/workbench/contrib/tags/electron-sandbox/tags.contribution.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
-import { WorkspaceTags } from 'vs/workbench/contrib/tags/electron-sandbox/workspaceTags';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from '../../../common/contributions.js';
+import { WorkspaceTags } from './workspaceTags.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
 
 // Register Workspace Tags Contribution
 Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(WorkspaceTags, LifecyclePhase.Eventually);
diff --git a/src/vs/workbench/contrib/tags/electron-sandbox/workspaceTags.ts b/src/vs/workbench/contrib/tags/electron-sandbox/workspaceTags.ts
index 1a74f3ecbc3..4b8ebee5e95 100644
--- a/src/vs/workbench/contrib/tags/electron-sandbox/workspaceTags.ts
+++ b/src/vs/workbench/contrib/tags/electron-sandbox/workspaceTags.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { sha1Hex } from 'vs/base/browser/hash';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { URI } from 'vs/base/common/uri';
-import { IFileService, IFileStat } from 'vs/platform/files/common/files';
-import { ITelemetryService, TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { ITextFileService, } from 'vs/workbench/services/textfile/common/textfiles';
-import { IWorkspaceTagsService, Tags, getHashedRemotesFromConfig as baseGetHashedRemotesFromConfig } from 'vs/workbench/contrib/tags/common/workspaceTags';
-import { IDiagnosticsService, IWorkspaceInformation } from 'vs/platform/diagnostics/common/diagnostics';
-import { IRequestService } from 'vs/platform/request/common/request';
-import { isWindows } from 'vs/base/common/platform';
-import { AllowedSecondLevelDomains, getDomainsOfRemotes } from 'vs/platform/extensionManagement/common/configRemotes';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { IProductService } from 'vs/platform/product/common/productService';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IFileService, IFileStat } from '../../../../platform/files/common/files.js';
+import { ITelemetryService, TelemetryLevel } from '../../../../platform/telemetry/common/telemetry.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { ITextFileService, } from '../../../services/textfile/common/textfiles.js';
+import { IWorkspaceTagsService, Tags, getHashedRemotesFromConfig as baseGetHashedRemotesFromConfig } from '../common/workspaceTags.js';
+import { IDiagnosticsService, IWorkspaceInformation } from '../../../../platform/diagnostics/common/diagnostics.js';
+import { IRequestService } from '../../../../platform/request/common/request.js';
+import { isWindows } from '../../../../base/common/platform.js';
+import { AllowedSecondLevelDomains, getDomainsOfRemotes } from '../../../../platform/extensionManagement/common/configRemotes.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { hashAsync } from '../../../../base/common/hash.js';
 
 export async function getHashedRemotesFromConfig(text: string, stripEndingDotGit: boolean = false): Promise<string[]> {
-	return baseGetHashedRemotesFromConfig(text, stripEndingDotGit, remote => sha1Hex(remote));
+	return baseGetHashedRemotesFromConfig(text, stripEndingDotGit, hashAsync);
 }
 
 export class WorkspaceTags implements IWorkbenchContribution {
diff --git a/src/vs/workbench/contrib/tags/electron-sandbox/workspaceTagsService.ts b/src/vs/workbench/contrib/tags/electron-sandbox/workspaceTagsService.ts
index b560ed8999b..a38705cd01a 100644
--- a/src/vs/workbench/contrib/tags/electron-sandbox/workspaceTagsService.ts
+++ b/src/vs/workbench/contrib/tags/electron-sandbox/workspaceTagsService.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { sha1Hex } from 'vs/base/browser/hash';
-import { IFileService, IFileStatResult, IFileStat } from 'vs/platform/files/common/files';
-import { IWorkspaceContextService, WorkbenchState, IWorkspace } from 'vs/platform/workspace/common/workspace';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { ITextFileService, ITextFileContent } from 'vs/workbench/services/textfile/common/textfiles';
-import { URI } from 'vs/base/common/uri';
-import { Schemas } from 'vs/base/common/network';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IWorkspaceTagsService, Tags } from 'vs/workbench/contrib/tags/common/workspaceTags';
-import { getHashedRemotesFromConfig } from 'vs/workbench/contrib/tags/electron-sandbox/workspaceTags';
-import { splitLines } from 'vs/base/common/strings';
-import { MavenArtifactIdRegex, MavenDependenciesRegex, MavenDependencyRegex, GradleDependencyCompactRegex, GradleDependencyLooseRegex, MavenGroupIdRegex, JavaLibrariesToLookFor } from 'vs/workbench/contrib/tags/common/javaWorkspaceTags';
+import { IFileService, IFileStatResult, IFileStat } from '../../../../platform/files/common/files.js';
+import { IWorkspaceContextService, WorkbenchState, IWorkspace } from '../../../../platform/workspace/common/workspace.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { ITextFileService, ITextFileContent } from '../../../services/textfile/common/textfiles.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IWorkspaceTagsService, Tags } from '../common/workspaceTags.js';
+import { getHashedRemotesFromConfig } from './workspaceTags.js';
+import { splitLines } from '../../../../base/common/strings.js';
+import { MavenArtifactIdRegex, MavenDependenciesRegex, MavenDependencyRegex, GradleDependencyCompactRegex, GradleDependencyLooseRegex, MavenGroupIdRegex, JavaLibrariesToLookFor } from '../common/javaWorkspaceTags.js';
+import { hashAsync } from '../../../../base/common/hash.js';
 
 const MetaModulesToLookFor = [
 	// Azure packages
@@ -160,6 +160,7 @@ const ModulesToLookFor = [
 	'@azure/attestation',
 	'@azure/data-tables',
 	'@azure/arm-appservice',
+	'@azure-rest/ai-inference',
 	'@azure-rest/arm-appservice',
 	'@azure/arm-appcontainers',
 	'@azure/arm-rediscache',
@@ -178,7 +179,60 @@ const ModulesToLookFor = [
 	'@azure/web-pubsub-express',
 	'@azure/openai',
 	'@azure/arm-hybridkubernetes',
-	'@azure/arm-kubernetesconfiguration'
+	'@azure/arm-kubernetesconfiguration',
+	//AI and vector db dev packages
+	'@anthropic-ai/sdk',
+	'@anthropic-ai/tokenizer',
+	'@arizeai/openinference-instrumentation-langchain',
+	'@arizeai/openinference-instrumentation-openai',
+	'@aws-sdk-client-bedrock-runtime',
+	'@aws-sdk/client-bedrock',
+	'@datastax/astra-db-ts',
+	'fireworks-js',
+	'@google-cloud/aiplatform',
+	'@huggingface/inference',
+	'humanloop',
+	'@langchain/anthropic',
+	'langsmith',
+	'llamaindex',
+	'@mistralai/mistralai',
+	'mongodb',
+	'neo4j-driver',
+	'ollama',
+	'onnxruntime-node',
+	'onnxruntime-web',
+	'pg',
+	'postgresql',
+	'redis',
+	'@supabase/supabase-js',
+	'@tensorflow/tfjs',
+	'@xenova/transformers',
+	'tika',
+	'weaviate-client',
+	'@zilliz/milvus2-sdk-node',
+	//Azure AI
+	'@azure-rest/ai-anomaly-detector',
+	'@azure-rest/ai-content-safety',
+	'@azure-rest/ai-document-intelligence',
+	'@azure-rest/ai-document-translator',
+	'@azure-rest/ai-personalizer',
+	'@azure-rest/ai-translation-text',
+	'@azure-rest/ai-vision-image-analysis',
+	'@azure/ai-anomaly-detector',
+	'@azure/ai-form-recognizer',
+	'@azure/ai-language-conversations',
+	'@azure/ai-language-text',
+	'@azure/ai-text-analytics',
+	'@azure/arm-botservice',
+	'@azure/arm-cognitiveservices',
+	'@azure/arm-machinelearning',
+	'@azure/cognitiveservices-contentmoderator',
+	'@azure/cognitiveservices-customvision-prediction',
+	'@azure/cognitiveservices-customvision-training',
+	'@azure/cognitiveservices-face',
+	'@azure/cognitiveservices-translatortext',
+	'microsoft-cognitiveservices-speech-sdk',
+	'@google/generative-ai'
 ];
 
 const PyMetaModulesToLookFor = [
@@ -197,6 +251,7 @@ const PyMetaModulesToLookFor = [
 
 const PyModulesToLookFor = [
 	'azure',
+	'azure-ai-inference',
 	'azure-ai-language-conversations',
 	'azure-ai-language-questionanswering',
 	'azure-ai-ml',
@@ -311,7 +366,39 @@ const PyModulesToLookFor = [
 	'guidance',
 	'openai',
 	'semantic-kernel',
-	'sentence-transformers'
+	'sentence-transformers',
+	// AI and vector db dev packages
+	'anthropic',
+	'aporia',
+	'arize',
+	'deepchecks',
+	'fireworks-ai',
+	'langchain-fireworks',
+	'humanloop',
+	'pymongo',
+	'langchain-anthropic',
+	'langchain-huggingface',
+	'langchain-fireworks',
+	'ollama',
+	'onnxruntime',
+	'pgvector',
+	'sentence-transformers',
+	'tika',
+	'trulens',
+	'trulens-eval',
+	'wandb',
+	// Azure AI Services
+	'azure-ai-contentsafety',
+	'azure-ai-documentintelligence',
+	'azure-ai-translation-text',
+	'azure-ai-vision',
+	'azure-cognitiveservices-language-luis',
+	'azure-cognitiveservices-speech',
+	'azure-cognitiveservices-vision-contentmoderator',
+	'azure-cognitiveservices-vision-face',
+	'azure-mgmt-cognitiveservices',
+	'azure-mgmt-search',
+	'google-generativeai'
 ];
 
 const GoModulesToLookFor = [
@@ -360,7 +447,7 @@ export class WorkspaceTagsService implements IWorkspaceTagsService {
 
 	async getTelemetryWorkspaceId(workspace: IWorkspace, state: WorkbenchState): Promise<string | undefined> {
 		function createHash(uri: URI): Promise<string> {
-			return sha1Hex(uri.scheme === Schemas.file ? uri.fsPath : uri.toString());
+			return hashAsync(uri.scheme === Schemas.file ? uri.fsPath : uri.toString());
 		}
 
 		let workspaceId: string | undefined;
@@ -428,6 +515,12 @@ export class WorkspaceTagsService implements IWorkspaceTagsService {
 			"workspace.npm.react" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.@angular/core" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.vue" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@anthropic-ai/sdk" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@anthropic-ai/tokenizer" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@arizeai/openinference-instrumentation-langchain" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@arizeai/openinference-instrumentation-openai" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@aws-sdk-client-bedrock-runtime" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@aws-sdk/client-bedrock" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.aws-sdk" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.aws-amplify-sdk" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.@azure" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
@@ -439,11 +532,13 @@ export class WorkspaceTagsService implements IWorkspaceTagsService {
 			"workspace.npm.@azure/keyvault" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.@azure/search" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.@azure/storage" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@google-cloud/aiplatform" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.azure" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.azure-storage" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.@google-cloud/common" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.firebase" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.heroku-cli" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@huggingface/inference" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.@microsoft/teams-js" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.@microsoft/office-js" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.@microsoft/office-js-helpers" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
@@ -470,15 +565,36 @@ export class WorkspaceTagsService implements IWorkspaceTagsService {
 			"workspace.npm.cypress" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.chroma" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.faiss" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.fireworks-js" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@datastax/astra-db-ts" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.humanloop" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.langchain" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@langchain/anthropic" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.langsmith" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.llamaindex" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@mistralai/mistralai" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.milvus" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.mongodb" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.neo4j-driver" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.ollama" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.onnxruntime-node" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.onnxruntime-web" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.openai" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.pinecone" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.postgresql" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.pg" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.qdrant" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.redis" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@supabase/supabase-js" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@tensorflow/tfjs" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@xenova/transformers" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.weaviate-client" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@zilliz/milvus2-sdk-node" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.nightwatch" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.protractor" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.puppeteer" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.selenium-webdriver" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.tika" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.webdriverio" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.gherkin" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.@azure/app-configuration" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
@@ -490,6 +606,27 @@ export class WorkspaceTagsService implements IWorkspaceTagsService {
 			"workspace.npm.@azure/synapse-artifacts" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.@azure/synapse-access-control" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.@azure/ai-metrics-advisor" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@azure-rest/ai-anomaly-detector" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@azure-rest/ai-content-safety" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@azure-rest/ai-document-intelligence" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@azure-rest/ai-document-translator" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@azure-rest/ai-personalizer" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@azure-rest/ai-translation-text" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@azure-rest/ai-vision-image-analysis" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@azure/ai-anomaly-detector" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@azure/ai-form-recognizer" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@azure/ai-language-conversations" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@azure/ai-language-text" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@azure/ai-text-analytics" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@azure/arm-botservice" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@azure/arm-cognitiveservices" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@azure/arm-machinelearning" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@azure/cognitiveservices-contentmoderator" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@azure/cognitiveservices-customvision-prediction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@azure/cognitiveservices-customvision-training" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@azure/cognitiveservices-face" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@azure/cognitiveservices-translatortext" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.microsoft-cognitiveservices-speech-sdk" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.@azure/service-bus" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.@azure/keyvault-secrets" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.@azure/keyvault-keys" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
@@ -538,6 +675,7 @@ export class WorkspaceTagsService implements IWorkspaceTagsService {
 			"workspace.npm.@azure/communication-administration" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.@azure/attestation" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.@azure/data-tables" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@azure-rest/ai-inference" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.@azure-rest/arm-appservice" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.@azure/arm-appservice" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.@azure/arm-appcontainers" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
@@ -559,6 +697,7 @@ export class WorkspaceTagsService implements IWorkspaceTagsService {
 			"workspace.npm.@azure/arm-kubernetesconfiguration" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.react-native-macos" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.react-native-windows" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@google/generative-ai" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.bower" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.yeoman.code.ext" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.cordova.high" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
@@ -586,6 +725,24 @@ export class WorkspaceTagsService implements IWorkspaceTagsService {
 			"workspace.gradle.azure-storage" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.gradle.azure-servicebus" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.gradle.azure-eventhubs" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.gradle.langchain4j" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.gradle.springboot-ai" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.gradle.semantic-kernel" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.gradle.azure-ai-anomalydetector" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.gradle.azure-ai-formrecognizer" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.gradle.azure-ai-documentintelligence" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.gradle.azure-ai-translation-document" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.gradle.azure-ai-personalizer" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.gradle.azure-ai-translation-text" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.gradle.azure-ai-contentsafety" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.gradle.azure-ai-vision-imageanalysis" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.gradle.azure-ai-textanalytics" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.gradle.azure-search-documents" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.gradle.azure-ai-documenttranslator" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.gradle.azure-ai-vision-face" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.gradle.azure-ai-openai-assistants" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.gradle.azure-cognitiveservices" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.gradle.azure-cognitiveservices-speech" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.gradle.openai" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.gradle.azure-openai" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.gradle.azure-functions" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
@@ -607,6 +764,24 @@ export class WorkspaceTagsService implements IWorkspaceTagsService {
 			"workspace.pom.azure-storage" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.pom.azure-servicebus" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.pom.azure-eventhubs" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.pom.langchain4j" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.pom.springboot-ai" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.pom.semantic-kernel" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.pom.azure-ai-anomalydetector" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.pom.azure-ai-formrecognizer" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.pom.azure-ai-documentintelligence" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.pom.azure-ai-translation-document" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.pom.azure-ai-personalizer" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.pom.azure-ai-translation-text" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.pom.azure-ai-contentsafety" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.pom.azure-ai-vision-imageanalysis" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.pom.azure-ai-textanalytics" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.pom.azure-search-documents" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.pom.azure-ai-documenttranslator" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.pom.azure-ai-vision-face" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.pom.azure-ai-openai-assistants" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.pom.azure-cognitiveservices" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.pom.azure-cognitiveservices-speech" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.pom.openai" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.pom.azure-openai" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.pom.azure-functions" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
@@ -627,9 +802,20 @@ export class WorkspaceTagsService implements IWorkspaceTagsService {
 			"workspace.py.pulumi-azure" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.py.azure" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.py.azure-ai" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.azure-ai-inference" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.py.azure-ai-language-conversations" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.py.azure-ai-language-questionanswering" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.py.azure-ai-ml" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.azure-ai-contentsafety" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.azure-ai-documentintelligence" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.azure-ai-translation-text" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.azure-ai-vision" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.azure-cognitiveservices-language-luis" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.azure-cognitiveservices-speech" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.azure-cognitiveservices-vision-contentmoderator" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.azure-cognitiveservices-vision-face" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.azure-mgmt-cognitiveservices" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.azure-mgmt-search" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.py.azure-ai-translation-document" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.py.azure-cognitiveservices" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.py.azure-core" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
@@ -745,13 +931,31 @@ export class WorkspaceTagsService implements IWorkspaceTagsService {
 			"workspace.py.azure-messaging-webpubsubservice" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.py.azure-data-nspkg" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.py.azure-data-tables" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.arize" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.aporia" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.anthropic" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.deepchecks" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.fireworks-ai" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.py.transformers" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.humanloop" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.py.langchain" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.langchain-anthropic" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.langchain-fireworks" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.langchain-huggingface" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.py.llama-index" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.py.guidance" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.ollama" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.onnxruntime" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.py.openai" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.pymongo" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.pgvector" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.py.semantic-kernel" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.py.sentence-transformers" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.tika" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.trulens" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.trulens-eval" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.wandb" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.google-generativeai" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.go.mod.github.com/Azure/azure-sdk-for-go/sdk/storage/azblob" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.go.mod.github.com/Azure/azure-sdk-for-go/sdk/storage/azfile" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.go.mod.github.com/Azure/azure-sdk-for-go/sdk/storage/azqueue" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
diff --git a/src/vs/workbench/contrib/tags/test/node/workspaceTags.test.ts b/src/vs/workbench/contrib/tags/test/node/workspaceTags.test.ts
index d166a151900..24c74e21916 100644
--- a/src/vs/workbench/contrib/tags/test/node/workspaceTags.test.ts
+++ b/src/vs/workbench/contrib/tags/test/node/workspaceTags.test.ts
@@ -5,8 +5,8 @@
 
 import assert from 'assert';
 import * as crypto from 'crypto';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { getHashedRemotesFromConfig as baseGetHashedRemotesFromConfig } from 'vs/workbench/contrib/tags/common/workspaceTags';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { getHashedRemotesFromConfig as baseGetHashedRemotesFromConfig } from '../../common/workspaceTags.js';
 
 function hash(value: string): string {
 	return crypto.createHash('sha1').update(value.toString()).digest('hex'); // CodeQL [SM04514] Using SHA1 to convert a URL to a fixed length
diff --git a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
index 0e9b7879ba0..f3ade8acfbc 100644
--- a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
+++ b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
@@ -3,86 +3,86 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Action } from 'vs/base/common/actions';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { Emitter, Event } from 'vs/base/common/event';
-import * as glob from 'vs/base/common/glob';
-import * as json from 'vs/base/common/json';
-import { Disposable, dispose, IDisposable, IReference } from 'vs/base/common/lifecycle';
-import { LRUCache, Touch } from 'vs/base/common/map';
-import * as Objects from 'vs/base/common/objects';
-import { ValidationState, ValidationStatus } from 'vs/base/common/parsers';
-import * as Platform from 'vs/base/common/platform';
-import { TerminateResponseCode } from 'vs/base/common/processes';
-import * as resources from 'vs/base/common/resources';
-import Severity from 'vs/base/common/severity';
-import * as Types from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import * as UUID from 'vs/base/common/uuid';
-import * as nls from 'vs/nls';
-import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
-import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IFileService, IFileStatWithPartialMetadata } from 'vs/platform/files/common/files';
-import { IMarkerService } from 'vs/platform/markers/common/markers';
-import { IProgressOptions, IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { INamedProblemMatcher, ProblemMatcherRegistry } from 'vs/workbench/contrib/tasks/common/problemMatcher';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { Action } from '../../../../base/common/actions.js';
+import { IStringDictionary } from '../../../../base/common/collections.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import * as glob from '../../../../base/common/glob.js';
+import * as json from '../../../../base/common/json.js';
+import { Disposable, dispose, IDisposable, IReference } from '../../../../base/common/lifecycle.js';
+import { LRUCache, Touch } from '../../../../base/common/map.js';
+import * as Objects from '../../../../base/common/objects.js';
+import { ValidationState, ValidationStatus } from '../../../../base/common/parsers.js';
+import * as Platform from '../../../../base/common/platform.js';
+import { TerminateResponseCode } from '../../../../base/common/processes.js';
+import * as resources from '../../../../base/common/resources.js';
+import Severity from '../../../../base/common/severity.js';
+import * as Types from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import * as UUID from '../../../../base/common/uuid.js';
+import * as nls from '../../../../nls.js';
+import { CommandsRegistry, ICommandService } from '../../../../platform/commands/common/commands.js';
+import { ConfigurationTarget, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IFileService, IFileStatWithPartialMetadata } from '../../../../platform/files/common/files.js';
+import { IMarkerService } from '../../../../platform/markers/common/markers.js';
+import { IProgressOptions, IProgressService, ProgressLocation } from '../../../../platform/progress/common/progress.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { INamedProblemMatcher, ProblemMatcherRegistry } from '../common/problemMatcher.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 
-import { IModelService } from 'vs/editor/common/services/model';
+import { IModelService } from '../../../../editor/common/services/model.js';
 
-import { IWorkspace, IWorkspaceContextService, IWorkspaceFolder, WorkbenchState, WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { Markers } from 'vs/workbench/contrib/markers/common/markers';
-import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IWorkspace, IWorkspaceContextService, IWorkspaceFolder, WorkbenchState, WorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
+import { Markers } from '../../markers/common/markers.js';
+import { IConfigurationResolverService } from '../../../services/configurationResolver/common/configurationResolver.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
 
-import { IOutputChannel, IOutputService } from 'vs/workbench/services/output/common/output';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
+import { IOutputChannel, IOutputService } from '../../../services/output/common/output.js';
+import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
 
-import { ITerminalGroupService, ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { ITerminalProfileResolverService } from 'vs/workbench/contrib/terminal/common/terminal';
+import { ITerminalGroupService, ITerminalService } from '../../terminal/browser/terminal.js';
+import { ITerminalProfileResolverService } from '../../terminal/common/terminal.js';
 
-import { ConfiguringTask, ContributedTask, CustomTask, ExecutionEngine, InMemoryTask, ITaskEvent, ITaskIdentifier, ITaskSet, JsonSchemaVersion, KeyedTaskIdentifier, RuntimeType, Task, TASK_RUNNING_STATE, TaskDefinition, TaskEventKind, TaskGroup, TaskRunSource, TaskSettingId, TaskSorter, TaskSourceKind, TasksSchemaProperties, USER_TASKS_GROUP_KEY } from 'vs/workbench/contrib/tasks/common/tasks';
-import { CustomExecutionSupportedContext, ICustomizationProperties, IProblemMatcherRunOptions, ITaskFilter, ITaskProvider, ITaskService, IWorkspaceFolderTaskResult, ProcessExecutionSupportedContext, ServerlessWebContext, ShellExecutionSupportedContext, TaskCommandsRegistered, TaskExecutionSupportedContext } from 'vs/workbench/contrib/tasks/common/taskService';
-import { ITaskExecuteResult, ITaskResolver, ITaskSummary, ITaskSystem, ITaskSystemInfo, ITaskTerminateResponse, TaskError, TaskErrors, TaskExecuteKind } from 'vs/workbench/contrib/tasks/common/taskSystem';
-import { getTemplates as getTaskTemplates } from 'vs/workbench/contrib/tasks/common/taskTemplates';
+import { ConfiguringTask, ContributedTask, CustomTask, ExecutionEngine, InMemoryTask, ITaskEvent, ITaskIdentifier, ITaskSet, JsonSchemaVersion, KeyedTaskIdentifier, RuntimeType, Task, TASK_RUNNING_STATE, TaskDefinition, TaskEventKind, TaskGroup, TaskRunSource, TaskSettingId, TaskSorter, TaskSourceKind, TasksSchemaProperties, USER_TASKS_GROUP_KEY } from '../common/tasks.js';
+import { CustomExecutionSupportedContext, ICustomizationProperties, IProblemMatcherRunOptions, ITaskFilter, ITaskProvider, ITaskService, IWorkspaceFolderTaskResult, ProcessExecutionSupportedContext, ServerlessWebContext, ShellExecutionSupportedContext, TaskCommandsRegistered, TaskExecutionSupportedContext } from '../common/taskService.js';
+import { ITaskExecuteResult, ITaskResolver, ITaskSummary, ITaskSystem, ITaskSystemInfo, ITaskTerminateResponse, TaskError, TaskErrors, TaskExecuteKind } from '../common/taskSystem.js';
+import { getTemplates as getTaskTemplates } from '../common/taskTemplates.js';
 
-import * as TaskConfig from '../common/taskConfiguration';
-import { TerminalTaskSystem } from './terminalTaskSystem';
+import * as TaskConfig from '../common/taskConfiguration.js';
+import { TerminalTaskSystem } from './terminalTaskSystem.js';
 
-import { IQuickInputService, IQuickPick, IQuickPickItem, IQuickPickSeparator, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
+import { IQuickInputService, IQuickPickItem, IQuickPickSeparator, QuickPickInput } from '../../../../platform/quickinput/common/quickInput.js';
 
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { TaskDefinitionRegistry } from 'vs/workbench/contrib/tasks/common/taskDefinitionRegistry';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { TaskDefinitionRegistry } from '../common/taskDefinitionRegistry.js';
 
-import { raceTimeout } from 'vs/base/common/async';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { toFormattedString } from 'vs/base/common/jsonFormatter';
-import { Schemas } from 'vs/base/common/network';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IResolvedTextEditorModel, ITextModelService } from 'vs/editor/common/services/resolverService';
-import { TextEditorSelectionRevealType } from 'vs/platform/editor/common/editor';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { TerminalExitReason } from 'vs/platform/terminal/common/terminal';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IWorkspaceTrustManagementService, IWorkspaceTrustRequestService } from 'vs/platform/workspace/common/workspaceTrust';
-import { VirtualWorkspaceContext } from 'vs/workbench/common/contextkeys';
-import { EditorResourceAccessor, SaveReason } from 'vs/workbench/common/editor';
-import { IViewDescriptorService } from 'vs/workbench/common/views';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { configureTaskIcon, isWorkspaceFolder, ITaskQuickPickEntry, QUICKOPEN_DETAIL_CONFIG, QUICKOPEN_SKIP_CONFIG, TaskQuickPick } from 'vs/workbench/contrib/tasks/browser/taskQuickPick';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { ILifecycleService, ShutdownReason, StartupKind } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
+import { raceTimeout } from '../../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { toFormattedString } from '../../../../base/common/jsonFormatter.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { IResolvedTextEditorModel, ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { TextEditorSelectionRevealType } from '../../../../platform/editor/common/editor.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { TerminalExitReason } from '../../../../platform/terminal/common/terminal.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IWorkspaceTrustManagementService, IWorkspaceTrustRequestService } from '../../../../platform/workspace/common/workspaceTrust.js';
+import { VirtualWorkspaceContext } from '../../../common/contextkeys.js';
+import { EditorResourceAccessor, SaveReason } from '../../../common/editor.js';
+import { IViewDescriptorService } from '../../../common/views.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { configureTaskIcon, isWorkspaceFolder, ITaskQuickPickEntry, QUICKOPEN_DETAIL_CONFIG, QUICKOPEN_SKIP_CONFIG, TaskQuickPick } from './taskQuickPick.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { ILifecycleService, ShutdownReason, StartupKind } from '../../../services/lifecycle/common/lifecycle.js';
+import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.js';
+import { IPathService } from '../../../services/path/common/pathService.js';
+import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
+import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';
 
 const QUICKOPEN_HISTORY_LIMIT_CONFIG = 'task.quickOpen.history';
 const PROBLEM_MATCHER_NEVER_CONFIG = 'task.problemMatchers.neverPrompt';
@@ -234,6 +234,8 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 	private _onDidChangeTaskConfig: Emitter<void> = new Emitter();
 	public onDidChangeTaskConfig: Event<void> = this._onDidChangeTaskConfig.event;
 	public get isReconnected(): boolean { return this._tasksReconnected; }
+	private _onDidChangeTaskProviders = this._register(new Emitter<void>());
+	public onDidChangeTaskProviders = this._onDidChangeTaskProviders.event;
 
 	constructor(
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
@@ -316,15 +318,22 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		this._registerCommands().then(() => TaskCommandsRegistered.bindTo(this._contextKeyService).set(true));
 		ServerlessWebContext.bindTo(this._contextKeyService).set(Platform.isWeb && !remoteAgentService.getConnection()?.remoteAuthority);
 		this._configurationResolverService.contributeVariable('defaultBuildTask', async (): Promise<string | undefined> => {
-			let tasks = await this._getTasksForGroup(TaskGroup.Build);
+			// delay provider activation, we might find a single default build task in the tasks.json file
+			let tasks = await this._getTasksForGroup(TaskGroup.Build, true);
 			if (tasks.length > 0) {
 				const defaults = this._getDefaultTasks(tasks);
 				if (defaults.length === 1) {
 					return defaults[0]._label;
-				} else if (defaults.length) {
-					tasks = defaults;
 				}
 			}
+			// activate all providers, we haven't found the default build task in the tasks.json file
+			tasks = await this._getTasksForGroup(TaskGroup.Build);
+			const defaults = this._getDefaultTasks(tasks);
+			if (defaults.length === 1) {
+				return defaults[0]._label;
+			} else if (defaults.length) {
+				tasks = defaults;
+			}
 
 			let entry: ITaskQuickPickEntry | null | undefined;
 			if (tasks && tasks.length > 0) {
@@ -608,6 +617,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		// We need to first wait for extensions to be registered because we might read
 		// the `TaskDefinitionRegistry` in case `type` is `undefined`
 		await this._extensionService.whenInstalledExtensionsRegistered();
+		this._log('Activating task providers ' + (type ?? 'all'));
 		await raceTimeout(
 			Promise.all(this._getActivationEvents(type).map(activationEvent => this._extensionService.activateByEvent(activationEvent))),
 			5000,
@@ -672,10 +682,12 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		const handle = AbstractTaskService._nextHandle++;
 		this._providers.set(handle, provider);
 		this._providerTypes.set(handle, type);
+		this._onDidChangeTaskProviders.fire();
 		return {
 			dispose: () => {
 				this._providers.delete(handle);
 				this._providerTypes.delete(handle);
+				this._onDidChangeTaskProviders.fire();
 			}
 		};
 	}
@@ -870,29 +882,15 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		if (!this._versionAndEngineCompatible(filter)) {
 			return Promise.resolve<Task[]>([]);
 		}
-		return this._getGroupedTasks(filter).then((map) => {
-			if (!filter || !filter.type) {
-				return map.all();
-			}
-			const result: Task[] = [];
-			map.forEach((tasks) => {
-				for (const task of tasks) {
-					if (ContributedTask.is(task) && ((task.defines.type === filter.type) || (task._source.label === filter.type))) {
-						result.push(task);
-					} else if (CustomTask.is(task)) {
-						if (task.type === filter.type) {
-							result.push(task);
-						} else {
-							const customizes = task.customizes();
-							if (customizes && customizes.type === filter.type) {
-								result.push(task);
-							}
-						}
-					}
-				}
-			});
-			return result;
-		});
+		return this._getGroupedTasks(filter).then((map) => this.applyFilterToTaskMap(filter, map));
+	}
+
+	public async getKnownTasks(filter?: ITaskFilter): Promise<Task[]> {
+		if (!this._versionAndEngineCompatible(filter)) {
+			return Promise.resolve<Task[]>([]);
+		}
+
+		return this._getGroupedTasks(filter, true, true).then((map) => this.applyFilterToTaskMap(filter, map));
 	}
 
 	public taskTypes(): string[] {
@@ -955,6 +953,30 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		return this._recentlyUsedTasksV1;
 	}
 
+	private applyFilterToTaskMap(filter: ITaskFilter | undefined, map: TaskMap): Task[] {
+		if (!filter || !filter.type) {
+			return map.all();
+		}
+		const result: Task[] = [];
+		map.forEach((tasks) => {
+			for (const task of tasks) {
+				if (ContributedTask.is(task) && ((task.defines.type === filter.type) || (task._source.label === filter.type))) {
+					result.push(task);
+				} else if (CustomTask.is(task)) {
+					if (task.type === filter.type) {
+						result.push(task);
+					} else {
+						const customizes = task.customizes();
+						if (customizes && customizes.type === filter.type) {
+							result.push(task);
+						}
+					}
+				}
+			}
+		});
+		return result;
+	}
+
 	private _getTasksFromStorage(type: 'persistent' | 'historical'): LRUCache<string, string> {
 		return type === 'persistent' ? this._getPersistentTasks() : this._getRecentTasks();
 	}
@@ -1418,8 +1440,8 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		return task;
 	}
 
-	private async _getTasksForGroup(group: TaskGroup): Promise<Task[]> {
-		const groups = await this._getGroupedTasks();
+	private async _getTasksForGroup(group: TaskGroup, waitToActivate?: boolean): Promise<Task[]> {
+		const groups = await this._getGroupedTasks(undefined, waitToActivate);
 		const result: Task[] = [];
 		groups.forEach(tasks => {
 			for (const task of tasks) {
@@ -2001,11 +2023,13 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		return !definition || !definition.when || this._contextKeyService.contextMatchesRules(definition.when);
 	}
 
-	private async _getGroupedTasks(filter?: ITaskFilter): Promise<TaskMap> {
+	private async _getGroupedTasks(filter?: ITaskFilter, waitToActivate?: boolean, knownOnlyOrTrusted?: boolean): Promise<TaskMap> {
 		await this._waitForAllSupportedExecutions;
 		const type = filter?.type;
 		const needsRecentTasksMigration = this._needsRecentTasksMigration();
-		await this._activateTaskProviders(filter?.type);
+		if (!waitToActivate) {
+			await this._activateTaskProviders(filter?.type);
+		}
 		const validTypes: IStringDictionary<boolean> = Object.create(null);
 		TaskDefinitionRegistry.all().forEach(definition => validTypes[definition.taskType] = true);
 		validTypes['shell'] = true;
@@ -2086,123 +2110,12 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		}
 
 		try {
-			const customTasks = await this.getWorkspaceTasks();
-			const customTasksKeyValuePairs = Array.from(customTasks);
-			const customTasksPromises = customTasksKeyValuePairs.map(async ([key, folderTasks]) => {
-				const contributed = contributedTasks.get(key);
-				if (!folderTasks.set) {
-					if (contributed) {
-						result.add(key, ...contributed);
-					}
-					return;
-				}
-
-				if (this._contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
-					result.add(key, ...folderTasks.set.tasks);
-				} else {
-					const configurations = folderTasks.configurations;
-					const legacyTaskConfigurations = folderTasks.set ? this._getLegacyTaskConfigurations(folderTasks.set) : undefined;
-					const customTasksToDelete: Task[] = [];
-					if (configurations || legacyTaskConfigurations) {
-						const unUsedConfigurations: Set<string> = new Set<string>();
-						if (configurations) {
-							Object.keys(configurations.byIdentifier).forEach(key => unUsedConfigurations.add(key));
-						}
-						for (const task of contributed) {
-							if (!ContributedTask.is(task)) {
-								continue;
-							}
-							if (configurations) {
-								const configuringTask = configurations.byIdentifier[task.defines._key];
-								if (configuringTask) {
-									unUsedConfigurations.delete(task.defines._key);
-									result.add(key, TaskConfig.createCustomTask(task, configuringTask));
-								} else {
-									result.add(key, task);
-								}
-							} else if (legacyTaskConfigurations) {
-								const configuringTask = legacyTaskConfigurations[task.defines._key];
-								if (configuringTask) {
-									result.add(key, TaskConfig.createCustomTask(task, configuringTask));
-									customTasksToDelete.push(configuringTask);
-								} else {
-									result.add(key, task);
-								}
-							} else {
-								result.add(key, task);
-							}
-						}
-						if (customTasksToDelete.length > 0) {
-							const toDelete = customTasksToDelete.reduce<IStringDictionary<boolean>>((map, task) => {
-								map[task._id] = true;
-								return map;
-							}, Object.create(null));
-							for (const task of folderTasks.set.tasks) {
-								if (toDelete[task._id]) {
-									continue;
-								}
-								result.add(key, task);
-							}
-						} else {
-							result.add(key, ...folderTasks.set.tasks);
-						}
-
-						const unUsedConfigurationsAsArray = Array.from(unUsedConfigurations);
-
-						const unUsedConfigurationPromises = unUsedConfigurationsAsArray.map(async (value) => {
-							const configuringTask = configurations!.byIdentifier[value];
-							if (type && (type !== configuringTask.configures.type)) {
-								return;
-							}
-
-							let requiredTaskProviderUnavailable: boolean = false;
-
-							for (const [handle, provider] of this._providers) {
-								const providerType = this._providerTypes.get(handle);
-								if (configuringTask.type === providerType) {
-									if (providerType && !this._isTaskProviderEnabled(providerType)) {
-										requiredTaskProviderUnavailable = true;
-										continue;
-									}
-
-									try {
-										const resolvedTask = await provider.resolveTask(configuringTask);
-										if (resolvedTask && (resolvedTask._id === configuringTask._id)) {
-											result.add(key, TaskConfig.createCustomTask(resolvedTask, configuringTask));
-											return;
-										}
-									} catch (error) {
-										// Ignore errors. The task could not be provided by any of the providers.
-									}
-								}
-							}
-
-							if (requiredTaskProviderUnavailable) {
-								this._log(nls.localize(
-									'TaskService.providerUnavailable',
-									'Warning: {0} tasks are unavailable in the current environment.',
-									configuringTask.configures.type
-								));
-							} else {
-								this._log(nls.localize(
-									'TaskService.noConfiguration',
-									'Error: The {0} task detection didn\'t contribute a task for the following configuration:\n{1}\nThe task will be ignored.',
-									configuringTask.configures.type,
-									JSON.stringify(configuringTask._source.config.element, undefined, 4)
-								));
-								this._showOutput();
-							}
-						});
-
-						await Promise.all(unUsedConfigurationPromises);
-					} else {
-						result.add(key, ...folderTasks.set.tasks);
-						result.add(key, ...contributed);
-					}
-				}
-			});
-
-			await Promise.all(customTasksPromises);
+			let tasks: [string, IWorkspaceFolderTaskResult][] = [];
+			// prevent workspace trust dialog from being shown in unexpected cases #224881
+			if (!knownOnlyOrTrusted || this._workspaceTrustManagementService.isWorkspaceTrusted()) {
+				tasks = Array.from(await this.getWorkspaceTasks());
+			}
+			await Promise.all(this._getCustomTaskPromises(tasks, filter, result, contributedTasks, waitToActivate));
 			if (needsRecentTasksMigration) {
 				// At this point we have all the tasks and can migrate the recently used tasks.
 				await this._migrateRecentTasks(result.all());
@@ -2222,6 +2135,120 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 			return result;
 		}
 	}
+	private _getCustomTaskPromises(customTasksKeyValuePairs: [string, IWorkspaceFolderTaskResult][], filter: ITaskFilter | undefined, result: TaskMap, contributedTasks: TaskMap, waitToActivate: boolean | undefined) {
+		return customTasksKeyValuePairs.map(async ([key, folderTasks]) => {
+			const contributed = contributedTasks.get(key);
+			if (!folderTasks.set) {
+				if (contributed) {
+					result.add(key, ...contributed);
+				}
+				return;
+			}
+
+			if (this._contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
+				result.add(key, ...folderTasks.set.tasks);
+			} else {
+				const configurations = folderTasks.configurations;
+				const legacyTaskConfigurations = folderTasks.set ? this._getLegacyTaskConfigurations(folderTasks.set) : undefined;
+				const customTasksToDelete: Task[] = [];
+				if (configurations || legacyTaskConfigurations) {
+					const unUsedConfigurations: Set<string> = new Set<string>();
+					if (configurations) {
+						Object.keys(configurations.byIdentifier).forEach(key => unUsedConfigurations.add(key));
+					}
+					for (const task of contributed) {
+						if (!ContributedTask.is(task)) {
+							continue;
+						}
+						if (configurations) {
+							const configuringTask = configurations.byIdentifier[task.defines._key];
+							if (configuringTask) {
+								unUsedConfigurations.delete(task.defines._key);
+								result.add(key, TaskConfig.createCustomTask(task, configuringTask));
+							} else {
+								result.add(key, task);
+							}
+						} else if (legacyTaskConfigurations) {
+							const configuringTask = legacyTaskConfigurations[task.defines._key];
+							if (configuringTask) {
+								result.add(key, TaskConfig.createCustomTask(task, configuringTask));
+								customTasksToDelete.push(configuringTask);
+							} else {
+								result.add(key, task);
+							}
+						} else {
+							result.add(key, task);
+						}
+					}
+					if (customTasksToDelete.length > 0) {
+						const toDelete = customTasksToDelete.reduce<IStringDictionary<boolean>>((map, task) => {
+							map[task._id] = true;
+							return map;
+						}, Object.create(null));
+						for (const task of folderTasks.set.tasks) {
+							if (toDelete[task._id]) {
+								continue;
+							}
+							result.add(key, task);
+						}
+					} else {
+						result.add(key, ...folderTasks.set.tasks);
+					}
+
+					const unUsedConfigurationsAsArray = Array.from(unUsedConfigurations);
+
+					const unUsedConfigurationPromises = unUsedConfigurationsAsArray.map(async (value) => {
+						const configuringTask = configurations!.byIdentifier[value];
+						if (filter?.type && (filter.type !== configuringTask.configures.type)) {
+							return;
+						}
+
+						let requiredTaskProviderUnavailable: boolean = false;
+
+						for (const [handle, provider] of this._providers) {
+							const providerType = this._providerTypes.get(handle);
+							if (configuringTask.type === providerType) {
+								if (providerType && !this._isTaskProviderEnabled(providerType)) {
+									requiredTaskProviderUnavailable = true;
+									continue;
+								}
+
+								try {
+									const resolvedTask = await provider.resolveTask(configuringTask);
+									if (resolvedTask && (resolvedTask._id === configuringTask._id)) {
+										result.add(key, TaskConfig.createCustomTask(resolvedTask, configuringTask));
+										return;
+									}
+								} catch (error) {
+									// Ignore errors. The task could not be provided by any of the providers.
+								}
+							}
+						}
+						if (requiredTaskProviderUnavailable) {
+							this._log(nls.localize(
+								'TaskService.providerUnavailable',
+								'Warning: {0} tasks are unavailable in the current environment.',
+								configuringTask.configures.type
+							));
+						} else if (!waitToActivate) {
+							this._log(nls.localize(
+								'TaskService.noConfiguration',
+								'Error: The {0} task detection didn\'t contribute a task for the following configuration:\n{1}\nThe task will be ignored.',
+								configuringTask.configures.type,
+								JSON.stringify(configuringTask._source.config.element, undefined, 4)
+							));
+							this._showOutput();
+						}
+					});
+
+					await Promise.all(unUsedConfigurationPromises);
+				} else {
+					result.add(key, ...folderTasks.set.tasks);
+					result.add(key, ...contributed);
+				}
+			}
+		});
+	}
 
 	private _getLegacyTaskConfigurations(workspaceTasks: ITaskSet): IStringDictionary<CustomTask> | undefined {
 		let result: IStringDictionary<CustomTask> | undefined;
@@ -2718,34 +2745,22 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 			entries.push(additionalEntries[0]);
 		}
 
-		const picker: IQuickPick<ITaskQuickPickEntry> = this._quickInputService.createQuickPick();
-		picker.placeholder = placeHolder;
-		picker.matchOnDescription = true;
-		if (name) {
-			picker.value = name;
-		}
-		picker.onDidTriggerItemButton(context => {
-			const task = context.item.task;
-			this._quickInputService.cancel();
-			if (ContributedTask.is(task)) {
-				this.customize(task, undefined, true);
-			} else if (CustomTask.is(task)) {
-				this.openConfig(task);
-			}
-		});
-		picker.items = entries;
-		picker.show();
-
-		return new Promise<ITaskQuickPickEntry | undefined | null>(resolve => {
-			this._register(picker.onDidAccept(async () => {
-				const selectedEntry = picker.selectedItems ? picker.selectedItems[0] : undefined;
-				picker.dispose();
-				if (!selectedEntry) {
-					resolve(undefined);
-				}
-				resolve(selectedEntry);
-			}));
-		});
+		return this._quickInputService.pick<ITaskQuickPickEntry>(
+			entries,
+			{
+				value: name,
+				placeHolder,
+				matchOnDescription: true,
+				onDidTriggerItemButton: context => {
+					const task = context.item.task;
+					this._quickInputService.cancel();
+					if (ContributedTask.is(task)) {
+						this.customize(task, undefined, true);
+					} else if (CustomTask.is(task)) {
+						this.openConfig(task);
+					}
+				},
+			});
 	}
 
 	private _needsRecentTasksMigration(): boolean {
@@ -3241,7 +3256,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		let configFileCreated = false;
 		this._fileService.stat(resource).then((stat) => stat, () => undefined).then(async (stat) => {
 			const fileExists: boolean = !!stat;
-			const configValue = this._configurationService.inspect<TaskConfig.IExternalTaskRunnerConfiguration>('tasks');
+			const configValue = this._configurationService.inspect<TaskConfig.IExternalTaskRunnerConfiguration>('tasks', { resource });
 			let tasksExistInFile: boolean;
 			let target: ConfigurationTarget;
 			switch (taskSource) {
diff --git a/src/vs/workbench/contrib/tasks/browser/runAutomaticTasks.ts b/src/vs/workbench/contrib/tasks/browser/runAutomaticTasks.ts
index 086b48bf096..854bfb93576 100644
--- a/src/vs/workbench/contrib/tasks/browser/runAutomaticTasks.ts
+++ b/src/vs/workbench/contrib/tasks/browser/runAutomaticTasks.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import * as resources from 'vs/base/common/resources';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { ITaskService, IWorkspaceFolderTaskResult } from 'vs/workbench/contrib/tasks/common/taskService';
-import { RunOnOptions, Task, TaskRunSource, TaskSource, TaskSourceKind, TASKS_CATEGORY, WorkspaceFileTaskSource, IWorkspaceTaskSource } from 'vs/workbench/contrib/tasks/common/tasks';
-import { IQuickPickItem, IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { Action2 } from 'vs/platform/actions/common/actions';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IWorkspaceTrustManagementService } from 'vs/platform/workspace/common/workspaceTrust';
-import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { URI } from 'vs/base/common/uri';
-import { Event } from 'vs/base/common/event';
-import { ILogService } from 'vs/platform/log/common/log';
+import * as nls from '../../../../nls.js';
+import * as resources from '../../../../base/common/resources.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { ITaskService, IWorkspaceFolderTaskResult } from '../common/taskService.js';
+import { RunOnOptions, Task, TaskRunSource, TaskSource, TaskSourceKind, TASKS_CATEGORY, WorkspaceFileTaskSource, IWorkspaceTaskSource } from '../common/tasks.js';
+import { IQuickPickItem, IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { Action2 } from '../../../../platform/actions/common/actions.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IWorkspaceTrustManagementService } from '../../../../platform/workspace/common/workspaceTrust.js';
+import { ConfigurationTarget, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Event } from '../../../../base/common/event.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
 
 const ALLOW_AUTOMATIC_TASKS = 'task.allowAutomaticTasks';
 
diff --git a/src/vs/workbench/contrib/tasks/browser/task.contribution.ts b/src/vs/workbench/contrib/tasks/browser/task.contribution.ts
index ac6fdcba385..e67184c7958 100644
--- a/src/vs/workbench/contrib/tasks/browser/task.contribution.ts
+++ b/src/vs/workbench/contrib/tasks/browser/task.contribution.ts
@@ -3,43 +3,43 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
+import * as nls from '../../../../nls.js';
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { MenuRegistry, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { MenuRegistry, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
 
-import { ProblemMatcherRegistry } from 'vs/workbench/contrib/tasks/common/problemMatcher';
-import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
+import { ProblemMatcherRegistry } from '../common/problemMatcher.js';
+import { IProgressService, ProgressLocation } from '../../../../platform/progress/common/progress.js';
 
-import * as jsonContributionRegistry from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
+import * as jsonContributionRegistry from '../../../../platform/jsonschemas/common/jsonContributionRegistry.js';
+import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
 
-import { StatusbarAlignment, IStatusbarService, IStatusbarEntryAccessor, IStatusbarEntry } from 'vs/workbench/services/statusbar/browser/statusbar';
+import { StatusbarAlignment, IStatusbarService, IStatusbarEntryAccessor, IStatusbarEntry } from '../../../services/statusbar/browser/statusbar.js';
 
-import { IOutputChannelRegistry, Extensions as OutputExt } from 'vs/workbench/services/output/common/output';
+import { IOutputChannelRegistry, Extensions as OutputExt } from '../../../services/output/common/output.js';
 
-import { ITaskEvent, TaskEventKind, TaskGroup, TaskSettingId, TASKS_CATEGORY, TASK_RUNNING_STATE } from 'vs/workbench/contrib/tasks/common/tasks';
-import { ITaskService, TaskCommandsRegistered, TaskExecutionSupportedContext } from 'vs/workbench/contrib/tasks/common/taskService';
+import { ITaskEvent, TaskEventKind, TaskGroup, TaskSettingId, TASKS_CATEGORY, TASK_RUNNING_STATE } from '../common/tasks.js';
+import { ITaskService, TaskCommandsRegistered, TaskExecutionSupportedContext } from '../common/taskService.js';
 
-import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry, IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { RunAutomaticTasks, ManageAutomaticTaskRunning } from 'vs/workbench/contrib/tasks/browser/runAutomaticTasks';
-import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
-import schemaVersion1 from '../common/jsonSchema_v1';
-import schemaVersion2, { updateProblemMatchers, updateTaskDefinitions } from '../common/jsonSchema_v2';
-import { AbstractTaskService, ConfigureTaskAction } from 'vs/workbench/contrib/tasks/browser/abstractTaskService';
-import { tasksSchemaId } from 'vs/workbench/services/configuration/common/configuration';
-import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { WorkbenchStateContext } from 'vs/workbench/common/contextkeys';
-import { IQuickAccessRegistry, Extensions as QuickAccessExtensions } from 'vs/platform/quickinput/common/quickAccess';
-import { TasksQuickAccessProvider } from 'vs/workbench/contrib/tasks/browser/tasksQuickAccess';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { TaskDefinitionRegistry } from 'vs/workbench/contrib/tasks/common/taskDefinitionRegistry';
-import { TerminalMenuBarGroup } from 'vs/workbench/contrib/terminal/browser/terminalMenus';
-import { isString } from 'vs/base/common/types';
-import { promiseWithResolvers } from 'vs/base/common/async';
+import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry, IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { RunAutomaticTasks, ManageAutomaticTaskRunning } from './runAutomaticTasks.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeyMod, KeyCode } from '../../../../base/common/keyCodes.js';
+import schemaVersion1 from '../common/jsonSchema_v1.js';
+import schemaVersion2, { updateProblemMatchers, updateTaskDefinitions } from '../common/jsonSchema_v2.js';
+import { AbstractTaskService, ConfigureTaskAction } from './abstractTaskService.js';
+import { tasksSchemaId } from '../../../services/configuration/common/configuration.js';
+import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { WorkbenchStateContext } from '../../../common/contextkeys.js';
+import { IQuickAccessRegistry, Extensions as QuickAccessExtensions } from '../../../../platform/quickinput/common/quickAccess.js';
+import { TasksQuickAccessProvider } from './tasksQuickAccess.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { TaskDefinitionRegistry } from '../common/taskDefinitionRegistry.js';
+import { TerminalMenuBarGroup } from '../../terminal/browser/terminalMenus.js';
+import { isString } from '../../../../base/common/types.js';
+import { promiseWithResolvers } from '../../../../base/common/async.js';
 
 const workbenchRegistry = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
 workbenchRegistry.registerWorkbenchContribution(RunAutomaticTasks, LifecyclePhase.Eventually);
@@ -347,7 +347,7 @@ class UserTasksGlobalActionContribution extends Disposable implements IWorkbench
 
 	private registerActions() {
 		const id = 'workbench.action.tasks.openUserTasks';
-		const title = nls.localize('userTasks', "User Tasks");
+		const title = nls.localize('tasks', "Tasks");
 		this._register(MenuRegistry.appendMenuItem(MenuId.GlobalActivity, {
 			command: {
 				id,
diff --git a/src/vs/workbench/contrib/tasks/browser/taskQuickPick.ts b/src/vs/workbench/contrib/tasks/browser/taskQuickPick.ts
index fe0e1641dc1..b10f117bc6e 100644
--- a/src/vs/workbench/contrib/tasks/browser/taskQuickPick.ts
+++ b/src/vs/workbench/contrib/tasks/browser/taskQuickPick.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import * as Objects from 'vs/base/common/objects';
-import { Task, ContributedTask, CustomTask, ConfiguringTask, TaskSorter, KeyedTaskIdentifier } from 'vs/workbench/contrib/tasks/common/tasks';
-import { IWorkspace, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import * as Types from 'vs/base/common/types';
-import { ITaskService, IWorkspaceFolderTaskResult } from 'vs/workbench/contrib/tasks/common/taskService';
-import { IQuickPickItem, QuickPickInput, IQuickPick, IQuickInputButton, IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { Event } from 'vs/base/common/event';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { Codicon } from 'vs/base/common/codicons';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { getColorClass, createColorStyleElement } from 'vs/workbench/contrib/terminal/browser/terminalIcon';
-import { TaskQuickPickEntryType } from 'vs/workbench/contrib/tasks/browser/abstractTaskService';
-import { showWithPinnedItems } from 'vs/platform/quickinput/browser/quickPickPin';
-import { IStorageService } from 'vs/platform/storage/common/storage';
+import * as nls from '../../../../nls.js';
+import * as Objects from '../../../../base/common/objects.js';
+import { Task, ContributedTask, CustomTask, ConfiguringTask, TaskSorter, KeyedTaskIdentifier } from '../common/tasks.js';
+import { IWorkspace, IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
+import * as Types from '../../../../base/common/types.js';
+import { ITaskService, IWorkspaceFolderTaskResult } from '../common/taskService.js';
+import { IQuickPickItem, QuickPickInput, IQuickPick, IQuickInputButton, IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import { Event } from '../../../../base/common/event.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { getColorClass, createColorStyleElement } from '../../terminal/browser/terminalIcon.js';
+import { TaskQuickPickEntryType } from './abstractTaskService.js';
+import { showWithPinnedItems } from '../../../../platform/quickinput/browser/quickPickPin.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
 
 export const QUICKOPEN_DETAIL_CONFIG = 'task.quickOpen.detail';
 export const QUICKOPEN_SKIP_CONFIG = 'task.quickOpen.skip';
@@ -229,11 +229,12 @@ export class TaskQuickPick extends Disposable {
 	}
 
 	public async show(placeHolder: string, defaultEntry?: ITaskQuickPickEntry, startAtType?: string, name?: string): Promise<Task | undefined | null> {
-		const picker: IQuickPick<ITaskTwoLevelQuickPickEntry> = this._quickInputService.createQuickPick();
+		const disposables = new DisposableStore();
+		const picker = disposables.add(this._quickInputService.createQuickPick<ITaskTwoLevelQuickPickEntry>({ useSeparators: true }));
 		picker.placeholder = placeHolder;
 		picker.matchOnDescription = true;
 		picker.ignoreFocusOut = false;
-		picker.onDidTriggerItemButton(async (context) => {
+		disposables.add(picker.onDidTriggerItemButton(async (context) => {
 			const task = context.item.task;
 			if (context.button.iconClass === ThemeIcon.asClassName(removeTaskIcon)) {
 				const key = (task && !Types.isString(task)) ? task.getKey() : undefined;
@@ -260,7 +261,7 @@ export class TaskQuickPick extends Disposable {
 					}
 				}
 			}
-		});
+		}));
 		if (name) {
 			picker.value = name;
 		}
@@ -269,37 +270,37 @@ export class TaskQuickPick extends Disposable {
 			// First show recent tasks configured tasks. Other tasks will be available at a second level
 			const topLevelEntriesResult = await this.getTopLevelEntries(defaultEntry);
 			if (topLevelEntriesResult.isSingleConfigured && this._configurationService.getValue<boolean>(QUICKOPEN_SKIP_CONFIG)) {
-				picker.dispose();
+				disposables.dispose();
 				return this._toTask(topLevelEntriesResult.isSingleConfigured);
 			}
 			const taskQuickPickEntries: QuickPickInput<ITaskTwoLevelQuickPickEntry>[] = topLevelEntriesResult.entries;
-			firstLevelTask = await this._doPickerFirstLevel(picker, taskQuickPickEntries);
+			firstLevelTask = await this._doPickerFirstLevel(picker, taskQuickPickEntries, disposables);
 		}
 		do {
 			if (Types.isString(firstLevelTask)) {
 				if (name) {
-					await this._doPickerFirstLevel(picker, (await this.getTopLevelEntries(defaultEntry)).entries);
-					picker.dispose();
+					await this._doPickerFirstLevel(picker, (await this.getTopLevelEntries(defaultEntry)).entries, disposables);
+					disposables.dispose();
 					return undefined;
 				}
-				const selectedEntry = await this.doPickerSecondLevel(picker, firstLevelTask);
+				const selectedEntry = await this.doPickerSecondLevel(picker, disposables, firstLevelTask);
 				// Proceed to second level of quick pick
 				if (selectedEntry && !selectedEntry.settingType && selectedEntry.task === null) {
 					// The user has chosen to go back to the first level
 					picker.value = '';
-					firstLevelTask = await this._doPickerFirstLevel(picker, (await this.getTopLevelEntries(defaultEntry)).entries);
+					firstLevelTask = await this._doPickerFirstLevel(picker, (await this.getTopLevelEntries(defaultEntry)).entries, disposables);
 				} else if (selectedEntry && Types.isString(selectedEntry.settingType)) {
-					picker.dispose();
+					disposables.dispose();
 					return this.handleSettingOption(selectedEntry.settingType);
 				} else {
-					picker.dispose();
+					disposables.dispose();
 					return (selectedEntry?.task && !Types.isString(selectedEntry?.task)) ? this._toTask(selectedEntry?.task) : undefined;
 				}
 			} else if (firstLevelTask) {
-				picker.dispose();
+				disposables.dispose();
 				return this._toTask(firstLevelTask);
 			} else {
-				picker.dispose();
+				disposables.dispose();
 				return firstLevelTask;
 			}
 		} while (1);
@@ -308,18 +309,18 @@ export class TaskQuickPick extends Disposable {
 
 
 
-	private async _doPickerFirstLevel(picker: IQuickPick<ITaskTwoLevelQuickPickEntry>, taskQuickPickEntries: QuickPickInput<ITaskTwoLevelQuickPickEntry>[]): Promise<Task | ConfiguringTask | string | null | undefined> {
+	private async _doPickerFirstLevel(picker: IQuickPick<ITaskTwoLevelQuickPickEntry, { useSeparators: true }>, taskQuickPickEntries: QuickPickInput<ITaskTwoLevelQuickPickEntry>[], disposables: DisposableStore): Promise<Task | ConfiguringTask | string | null | undefined> {
 		picker.items = taskQuickPickEntries;
-		showWithPinnedItems(this._storageService, runTaskStorageKey, picker, true);
+		disposables.add(showWithPinnedItems(this._storageService, runTaskStorageKey, picker, true));
 		const firstLevelPickerResult = await new Promise<ITaskTwoLevelQuickPickEntry | undefined | null>(resolve => {
-			Event.once(picker.onDidAccept)(async () => {
+			disposables.add(Event.once(picker.onDidAccept)(async () => {
 				resolve(picker.selectedItems ? picker.selectedItems[0] : undefined);
-			});
+			}));
 		});
 		return firstLevelPickerResult?.task;
 	}
 
-	public async doPickerSecondLevel(picker: IQuickPick<ITaskTwoLevelQuickPickEntry>, type: string, name?: string) {
+	public async doPickerSecondLevel(picker: IQuickPick<ITaskTwoLevelQuickPickEntry, { useSeparators: true }>, disposables: DisposableStore, type: string, name?: string) {
 		picker.busy = true;
 		if (type === SHOW_ALL) {
 			const items = (await this._taskService.tasks()).filter(t => !t.configurationProperties.hide).sort((a, b) => this._sorter.compare(a, b)).map(task => this._createTaskEntry(task));
@@ -332,9 +333,9 @@ export class TaskQuickPick extends Disposable {
 		await picker.show();
 		picker.busy = false;
 		const secondLevelPickerResult = await new Promise<ITaskTwoLevelQuickPickEntry | undefined | null>(resolve => {
-			Event.once(picker.onDidAccept)(async () => {
+			disposables.add(Event.once(picker.onDidAccept)(async () => {
 				resolve(picker.selectedItems ? picker.selectedItems[0] : undefined);
-			});
+			}));
 		});
 		return secondLevelPickerResult;
 	}
diff --git a/src/vs/workbench/contrib/tasks/browser/taskService.ts b/src/vs/workbench/contrib/tasks/browser/taskService.ts
index 112a688a4c2..98677366386 100644
--- a/src/vs/workbench/contrib/tasks/browser/taskService.ts
+++ b/src/vs/workbench/contrib/tasks/browser/taskService.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { ITaskSystem } from 'vs/workbench/contrib/tasks/common/taskSystem';
-import { ExecutionEngine } from 'vs/workbench/contrib/tasks/common/tasks';
-import { AbstractTaskService, IWorkspaceFolderConfigurationResult } from 'vs/workbench/contrib/tasks/browser/abstractTaskService';
-import { ITaskFilter, ITaskService } from 'vs/workbench/contrib/tasks/common/taskService';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import * as nls from '../../../../nls.js';
+import { IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
+import { ITaskSystem } from '../common/taskSystem.js';
+import { ExecutionEngine } from '../common/tasks.js';
+import { AbstractTaskService, IWorkspaceFolderConfigurationResult } from './abstractTaskService.js';
+import { ITaskFilter, ITaskService } from '../common/taskService.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
 
 export class TaskService extends AbstractTaskService {
 	private static readonly ProcessTaskSystemSupportMessage = nls.localize('taskService.processTaskSystem', 'Process task system is not support in the web.');
diff --git a/src/vs/workbench/contrib/tasks/browser/taskTerminalStatus.ts b/src/vs/workbench/contrib/tasks/browser/taskTerminalStatus.ts
index 12767f599ae..4781331772e 100644
--- a/src/vs/workbench/contrib/tasks/browser/taskTerminalStatus.ts
+++ b/src/vs/workbench/contrib/tasks/browser/taskTerminalStatus.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { Codicon } from 'vs/base/common/codicons';
-import { Disposable, IDisposable, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import Severity from 'vs/base/common/severity';
-import { AbstractProblemCollector, StartStopProblemCollector } from 'vs/workbench/contrib/tasks/common/problemCollectors';
-import { ITaskGeneralEvent, ITaskProcessEndedEvent, ITaskProcessStartedEvent, TaskEventKind, TaskRunType } from 'vs/workbench/contrib/tasks/common/tasks';
-import { ITaskService, Task } from 'vs/workbench/contrib/tasks/common/taskService';
-import { ITerminalInstance } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { MarkerSeverity } from 'vs/platform/markers/common/markers';
-import { spinningLoading } from 'vs/platform/theme/common/iconRegistry';
-import { IMarker } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { AccessibilitySignal, IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { ITerminalStatus } from 'vs/workbench/contrib/terminal/common/terminal';
+import * as nls from '../../../../nls.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Disposable, IDisposable, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import Severity from '../../../../base/common/severity.js';
+import { AbstractProblemCollector, StartStopProblemCollector } from '../common/problemCollectors.js';
+import { ITaskGeneralEvent, ITaskProcessEndedEvent, ITaskProcessStartedEvent, TaskEventKind, TaskRunType } from '../common/tasks.js';
+import { ITaskService, Task } from '../common/taskService.js';
+import { ITerminalInstance } from '../../terminal/browser/terminal.js';
+import { MarkerSeverity } from '../../../../platform/markers/common/markers.js';
+import { spinningLoading } from '../../../../platform/theme/common/iconRegistry.js';
+import { IMarker } from '../../../../platform/terminal/common/capabilities/capabilities.js';
+import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { ITerminalStatus } from '../../terminal/common/terminal.js';
 
 interface ITerminalData {
 	terminal: ITerminalInstance;
diff --git a/src/vs/workbench/contrib/tasks/browser/tasksQuickAccess.ts b/src/vs/workbench/contrib/tasks/browser/tasksQuickAccess.ts
index 51e6ae001b0..f2572bea651 100644
--- a/src/vs/workbench/contrib/tasks/browser/tasksQuickAccess.ts
+++ b/src/vs/workbench/contrib/tasks/browser/tasksQuickAccess.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { IQuickPickSeparator, IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { IPickerQuickAccessItem, PickerQuickAccessProvider, TriggerAction } from 'vs/platform/quickinput/browser/pickerQuickAccess';
-import { matchesFuzzy } from 'vs/base/common/filters';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { ITaskService, Task } from 'vs/workbench/contrib/tasks/common/taskService';
-import { CustomTask, ContributedTask, ConfiguringTask } from 'vs/workbench/contrib/tasks/common/tasks';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { TaskQuickPick, ITaskTwoLevelQuickPickEntry } from 'vs/workbench/contrib/tasks/browser/taskQuickPick';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { isString } from 'vs/base/common/types';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IStorageService } from 'vs/platform/storage/common/storage';
+import { localize } from '../../../../nls.js';
+import { IQuickPickSeparator, IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { IPickerQuickAccessItem, PickerQuickAccessProvider, TriggerAction } from '../../../../platform/quickinput/browser/pickerQuickAccess.js';
+import { matchesFuzzy } from '../../../../base/common/filters.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { ITaskService, Task } from '../common/taskService.js';
+import { CustomTask, ContributedTask, ConfiguringTask } from '../common/tasks.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { TaskQuickPick, ITaskTwoLevelQuickPickEntry } from './taskQuickPick.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { isString } from '../../../../base/common/types.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
 
 export class TasksQuickAccessProvider extends PickerQuickAccessProvider<IPickerQuickAccessItem> {
 
diff --git a/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts b/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
index 12ed79506ab..db362d7fb92 100644
--- a/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
+++ b/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
@@ -3,53 +3,53 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { asArray } from 'vs/base/common/arrays';
-import * as Async from 'vs/base/common/async';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { Emitter, Event } from 'vs/base/common/event';
-import { isUNC } from 'vs/base/common/extpath';
-import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { LinkedMap, Touch } from 'vs/base/common/map';
-import * as Objects from 'vs/base/common/objects';
-import * as path from 'vs/base/common/path';
-import * as Platform from 'vs/base/common/platform';
-import * as resources from 'vs/base/common/resources';
-import Severity from 'vs/base/common/severity';
-import * as Types from 'vs/base/common/types';
-import * as nls from 'vs/nls';
+import { asArray } from '../../../../base/common/arrays.js';
+import * as Async from '../../../../base/common/async.js';
+import { IStringDictionary } from '../../../../base/common/collections.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { isUNC } from '../../../../base/common/extpath.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import { LinkedMap, Touch } from '../../../../base/common/map.js';
+import * as Objects from '../../../../base/common/objects.js';
+import * as path from '../../../../base/common/path.js';
+import * as Platform from '../../../../base/common/platform.js';
+import * as resources from '../../../../base/common/resources.js';
+import Severity from '../../../../base/common/severity.js';
+import * as Types from '../../../../base/common/types.js';
+import * as nls from '../../../../nls.js';
 
-import { IModelService } from 'vs/editor/common/services/model';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IMarkerService, MarkerSeverity } from 'vs/platform/markers/common/markers';
-import { IWorkspaceContextService, IWorkspaceFolder, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { Markers } from 'vs/workbench/contrib/markers/common/markers';
-import { ProblemMatcher, ProblemMatcherRegistry /*, ProblemPattern, getResource */ } from 'vs/workbench/contrib/tasks/common/problemMatcher';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IMarkerService, MarkerSeverity } from '../../../../platform/markers/common/markers.js';
+import { IWorkspaceContextService, IWorkspaceFolder, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { Markers } from '../../markers/common/markers.js';
+import { ProblemMatcher, ProblemMatcherRegistry /*, ProblemPattern, getResource */ } from '../common/problemMatcher.js';
 
-import { Codicon } from 'vs/base/common/codicons';
-import { Schemas } from 'vs/base/common/network';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { URI } from 'vs/base/common/uri';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IShellLaunchConfig, WaitOnExitValue } from 'vs/platform/terminal/common/terminal';
-import { formatMessageForTerminal } from 'vs/platform/terminal/common/terminalStrings';
-import { IViewDescriptorService, ViewContainerLocation } from 'vs/workbench/common/views';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { TaskTerminalStatus } from 'vs/workbench/contrib/tasks/browser/taskTerminalStatus';
-import { ProblemCollectorEventKind, ProblemHandlingStrategy, StartStopProblemCollector, WatchingProblemCollector } from 'vs/workbench/contrib/tasks/common/problemCollectors';
-import { GroupKind } from 'vs/workbench/contrib/tasks/common/taskConfiguration';
-import { IResolveSet, IResolvedVariables, ITaskExecuteResult, ITaskResolver, ITaskSummary, ITaskSystem, ITaskSystemInfo, ITaskSystemInfoResolver, ITaskTerminateResponse, TaskError, TaskErrors, TaskExecuteKind, Triggers } from 'vs/workbench/contrib/tasks/common/taskSystem';
-import { CommandOptions, CommandString, ContributedTask, CustomTask, DependsOrder, ICommandConfiguration, IConfigurationProperties, IExtensionTaskSource, IPresentationOptions, IShellConfiguration, IShellQuotingOptions, ITaskEvent, InMemoryTask, PanelKind, RevealKind, RevealProblemKind, RuntimeType, ShellQuoting, Task, TaskEvent, TaskEventKind, TaskScope, TaskSourceKind } from 'vs/workbench/contrib/tasks/common/tasks';
-import { ITerminalGroupService, ITerminalInstance, ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { VSCodeOscProperty, VSCodeOscPt, VSCodeSequence } from 'vs/workbench/contrib/terminal/browser/terminalEscapeSequences';
-import { TerminalProcessExtHostProxy } from 'vs/workbench/contrib/terminal/browser/terminalProcessExtHostProxy';
-import { ITerminalProfileResolverService, TERMINAL_VIEW_ID } from 'vs/workbench/contrib/terminal/common/terminal';
-import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IOutputService } from 'vs/workbench/services/output/common/output';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IShellLaunchConfig, WaitOnExitValue } from '../../../../platform/terminal/common/terminal.js';
+import { formatMessageForTerminal } from '../../../../platform/terminal/common/terminalStrings.js';
+import { IViewDescriptorService, ViewContainerLocation } from '../../../common/views.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { TaskTerminalStatus } from './taskTerminalStatus.js';
+import { ProblemCollectorEventKind, ProblemHandlingStrategy, StartStopProblemCollector, WatchingProblemCollector } from '../common/problemCollectors.js';
+import { GroupKind } from '../common/taskConfiguration.js';
+import { IResolveSet, IResolvedVariables, ITaskExecuteResult, ITaskResolver, ITaskSummary, ITaskSystem, ITaskSystemInfo, ITaskSystemInfoResolver, ITaskTerminateResponse, TaskError, TaskErrors, TaskExecuteKind, Triggers } from '../common/taskSystem.js';
+import { CommandOptions, CommandString, ContributedTask, CustomTask, DependsOrder, ICommandConfiguration, IConfigurationProperties, IExtensionTaskSource, IPresentationOptions, IShellConfiguration, IShellQuotingOptions, ITaskEvent, InMemoryTask, PanelKind, RevealKind, RevealProblemKind, RuntimeType, ShellQuoting, Task, TaskEvent, TaskEventKind, TaskScope, TaskSourceKind } from '../common/tasks.js';
+import { ITerminalGroupService, ITerminalInstance, ITerminalService } from '../../terminal/browser/terminal.js';
+import { VSCodeOscProperty, VSCodeOscPt, VSCodeSequence } from '../../terminal/browser/terminalEscapeSequences.js';
+import { TerminalProcessExtHostProxy } from '../../terminal/browser/terminalProcessExtHostProxy.js';
+import { ITerminalProfileResolverService, TERMINAL_VIEW_ID } from '../../terminal/common/terminal.js';
+import { IConfigurationResolverService } from '../../../services/configurationResolver/common/configurationResolver.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { IOutputService } from '../../../services/output/common/output.js';
+import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.js';
+import { IPathService } from '../../../services/path/common/pathService.js';
 
 interface ITerminalData {
 	terminal: ITerminalInstance;
@@ -562,9 +562,7 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 				return { exitCode: 0 };
 			});
 		}).finally(() => {
-			if (this._activeTasks[mapKey] === activeTask) {
-				delete this._activeTasks[mapKey];
-			}
+			delete this._activeTasks[mapKey];
 		});
 		const lastInstance = this._getInstances(task).pop();
 		const count = lastInstance?.count ?? { count: 0 };
@@ -1046,9 +1044,9 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 			this._viewsService.openView(Markers.MARKERS_VIEW_ID);
 		} else if (task.command.presentation && (task.command.presentation.focus || task.command.presentation.reveal === RevealKind.Always)) {
 			this._terminalService.setActiveInstance(terminal);
-			await this._terminalService.revealActiveTerminal();
+			await this._terminalService.revealTerminal(terminal);
 			if (task.command.presentation.focus) {
-				this._terminalService.focusActiveInstance();
+				this._terminalService.focusInstance(terminal);
 			}
 		}
 		this._activeTasks[task.getMapKey()].terminal = terminal;
diff --git a/src/vs/workbench/contrib/tasks/common/jsonSchemaCommon.ts b/src/vs/workbench/contrib/tasks/common/jsonSchemaCommon.ts
index 9cae427159b..9db6b8adfec 100644
--- a/src/vs/workbench/contrib/tasks/common/jsonSchemaCommon.ts
+++ b/src/vs/workbench/contrib/tasks/common/jsonSchemaCommon.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
+import * as nls from '../../../../nls.js';
+import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
 
-import { Schemas } from 'vs/workbench/contrib/tasks/common/problemMatcher';
+import { Schemas } from './problemMatcher.js';
 
 const schema: IJSONSchema = {
 	definitions: {
diff --git a/src/vs/workbench/contrib/tasks/common/jsonSchema_v1.ts b/src/vs/workbench/contrib/tasks/common/jsonSchema_v1.ts
index de1ff5244cf..67017b41d2e 100644
--- a/src/vs/workbench/contrib/tasks/common/jsonSchema_v1.ts
+++ b/src/vs/workbench/contrib/tasks/common/jsonSchema_v1.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import * as Objects from 'vs/base/common/objects';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
+import * as nls from '../../../../nls.js';
+import * as Objects from '../../../../base/common/objects.js';
+import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
 
-import { ProblemMatcherRegistry } from 'vs/workbench/contrib/tasks/common/problemMatcher';
+import { ProblemMatcherRegistry } from './problemMatcher.js';
 
-import commonSchema from './jsonSchemaCommon';
+import commonSchema from './jsonSchemaCommon.js';
 
 const schema: IJSONSchema = {
 	oneOf: [
diff --git a/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts b/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts
index 658cb5fba1b..42df6dbc164 100644
--- a/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts
+++ b/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import * as Objects from 'vs/base/common/objects';
-import { IJSONSchema, IJSONSchemaMap } from 'vs/base/common/jsonSchema';
+import * as nls from '../../../../nls.js';
+import * as Objects from '../../../../base/common/objects.js';
+import { IJSONSchema, IJSONSchemaMap } from '../../../../base/common/jsonSchema.js';
 
-import commonSchema from './jsonSchemaCommon';
+import commonSchema from './jsonSchemaCommon.js';
 
-import { ProblemMatcherRegistry } from 'vs/workbench/contrib/tasks/common/problemMatcher';
-import { TaskDefinitionRegistry } from './taskDefinitionRegistry';
-import * as ConfigurationResolverUtils from 'vs/workbench/services/configurationResolver/common/configurationResolverUtils';
-import { inputsSchema } from 'vs/workbench/services/configurationResolver/common/configurationResolverSchema';
-import { getAllCodicons } from 'vs/base/common/codicons';
+import { ProblemMatcherRegistry } from './problemMatcher.js';
+import { TaskDefinitionRegistry } from './taskDefinitionRegistry.js';
+import * as ConfigurationResolverUtils from '../../../services/configurationResolver/common/configurationResolverUtils.js';
+import { inputsSchema } from '../../../services/configurationResolver/common/configurationResolverSchema.js';
+import { getAllCodicons } from '../../../../base/common/codicons.js';
 
 function fixReferences(literal: any) {
 	if (Array.isArray(literal)) {
diff --git a/src/vs/workbench/contrib/tasks/common/problemCollectors.ts b/src/vs/workbench/contrib/tasks/common/problemCollectors.ts
index 9f47ca8564e..f9aabbce56c 100644
--- a/src/vs/workbench/contrib/tasks/common/problemCollectors.ts
+++ b/src/vs/workbench/contrib/tasks/common/problemCollectors.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IStringDictionary, INumberDictionary } from 'vs/base/common/collections';
-import { URI } from 'vs/base/common/uri';
-import { Event, Emitter } from 'vs/base/common/event';
-import { IDisposable, DisposableStore, Disposable } from 'vs/base/common/lifecycle';
+import { IStringDictionary, INumberDictionary } from '../../../../base/common/collections.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { IDisposable, DisposableStore, Disposable } from '../../../../base/common/lifecycle.js';
 
-import { IModelService } from 'vs/editor/common/services/model';
+import { IModelService } from '../../../../editor/common/services/model.js';
 
-import { ILineMatcher, createLineMatcher, ProblemMatcher, IProblemMatch, ApplyToKind, IWatchingPattern, getResource } from 'vs/workbench/contrib/tasks/common/problemMatcher';
-import { IMarkerService, IMarkerData, MarkerSeverity } from 'vs/platform/markers/common/markers';
-import { generateUuid } from 'vs/base/common/uuid';
-import { IFileService } from 'vs/platform/files/common/files';
-import { isWindows } from 'vs/base/common/platform';
+import { ILineMatcher, createLineMatcher, ProblemMatcher, IProblemMatch, ApplyToKind, IWatchingPattern, getResource } from './problemMatcher.js';
+import { IMarkerService, IMarkerData, MarkerSeverity } from '../../../../platform/markers/common/markers.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { isWindows } from '../../../../base/common/platform.js';
 
 export const enum ProblemCollectorEventKind {
 	BackgroundProcessingBegins = 'backgroundProcessingBegins',
diff --git a/src/vs/workbench/contrib/tasks/common/problemMatcher.ts b/src/vs/workbench/contrib/tasks/common/problemMatcher.ts
index 0bb6027fcb2..f302f2517b1 100644
--- a/src/vs/workbench/contrib/tasks/common/problemMatcher.ts
+++ b/src/vs/workbench/contrib/tasks/common/problemMatcher.ts
@@ -3,27 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
+import { localize } from '../../../../nls.js';
 
-import * as Objects from 'vs/base/common/objects';
-import * as Strings from 'vs/base/common/strings';
-import * as Assert from 'vs/base/common/assert';
-import { join, normalize } from 'vs/base/common/path';
-import * as Types from 'vs/base/common/types';
-import * as UUID from 'vs/base/common/uuid';
-import * as Platform from 'vs/base/common/platform';
-import Severity from 'vs/base/common/severity';
-import { URI } from 'vs/base/common/uri';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import { ValidationStatus, ValidationState, IProblemReporter, Parser } from 'vs/base/common/parsers';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { asArray } from 'vs/base/common/arrays';
-import { Schemas as NetworkSchemas } from 'vs/base/common/network';
+import * as Objects from '../../../../base/common/objects.js';
+import * as Strings from '../../../../base/common/strings.js';
+import * as Assert from '../../../../base/common/assert.js';
+import { join, normalize } from '../../../../base/common/path.js';
+import * as Types from '../../../../base/common/types.js';
+import * as UUID from '../../../../base/common/uuid.js';
+import * as Platform from '../../../../base/common/platform.js';
+import Severity from '../../../../base/common/severity.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
+import { ValidationStatus, ValidationState, IProblemReporter, Parser } from '../../../../base/common/parsers.js';
+import { IStringDictionary } from '../../../../base/common/collections.js';
+import { asArray } from '../../../../base/common/arrays.js';
+import { Schemas as NetworkSchemas } from '../../../../base/common/network.js';
 
-import { IMarkerData, MarkerSeverity } from 'vs/platform/markers/common/markers';
-import { ExtensionsRegistry, ExtensionMessageCollector } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { Event, Emitter } from 'vs/base/common/event';
-import { FileType, IFileService, IFileStatWithPartialMetadata, IFileSystemProvider } from 'vs/platform/files/common/files';
+import { IMarkerData, MarkerSeverity } from '../../../../platform/markers/common/markers.js';
+import { ExtensionsRegistry, ExtensionMessageCollector } from '../../../services/extensions/common/extensionsRegistry.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { FileType, IFileService, IFileStatWithPartialMetadata, IFileSystemProvider } from '../../../../platform/files/common/files.js';
 
 export enum FileLocationKind {
 	Default,
@@ -1195,6 +1195,212 @@ export namespace Schemas {
 			}
 		}
 	};
+
+	export const WatchingPattern: IJSONSchema = {
+		type: 'object',
+		additionalProperties: false,
+		properties: {
+			regexp: {
+				type: 'string',
+				description: localize('WatchingPatternSchema.regexp', 'The regular expression to detect the begin or end of a background task.')
+			},
+			file: {
+				type: 'integer',
+				description: localize('WatchingPatternSchema.file', 'The match group index of the filename. Can be omitted.')
+			},
+		}
+	};
+
+	export const PatternType: IJSONSchema = {
+		anyOf: [
+			{
+				type: 'string',
+				description: localize('PatternTypeSchema.name', 'The name of a contributed or predefined pattern')
+			},
+			Schemas.ProblemPattern,
+			Schemas.MultiLineProblemPattern
+		],
+		description: localize('PatternTypeSchema.description', 'A problem pattern or the name of a contributed or predefined problem pattern. Can be omitted if base is specified.')
+	};
+
+	export const ProblemMatcher: IJSONSchema = {
+		type: 'object',
+		additionalProperties: false,
+		properties: {
+			base: {
+				type: 'string',
+				description: localize('ProblemMatcherSchema.base', 'The name of a base problem matcher to use.')
+			},
+			owner: {
+				type: 'string',
+				description: localize('ProblemMatcherSchema.owner', 'The owner of the problem inside Code. Can be omitted if base is specified. Defaults to \'external\' if omitted and base is not specified.')
+			},
+			source: {
+				type: 'string',
+				description: localize('ProblemMatcherSchema.source', 'A human-readable string describing the source of this diagnostic, e.g. \'typescript\' or \'super lint\'.')
+			},
+			severity: {
+				type: 'string',
+				enum: ['error', 'warning', 'info'],
+				description: localize('ProblemMatcherSchema.severity', 'The default severity for captures problems. Is used if the pattern doesn\'t define a match group for severity.')
+			},
+			applyTo: {
+				type: 'string',
+				enum: ['allDocuments', 'openDocuments', 'closedDocuments'],
+				description: localize('ProblemMatcherSchema.applyTo', 'Controls if a problem reported on a text document is applied only to open, closed or all documents.')
+			},
+			pattern: PatternType,
+			fileLocation: {
+				oneOf: [
+					{
+						type: 'string',
+						enum: ['absolute', 'relative', 'autoDetect', 'search']
+					},
+					{
+						type: 'array',
+						prefixItems: [
+							{
+								type: 'string',
+								enum: ['absolute', 'relative', 'autoDetect', 'search']
+							},
+						],
+						minItems: 1,
+						maxItems: 1,
+						additionalItems: false
+					},
+					{
+						type: 'array',
+						prefixItems: [
+							{ type: 'string', enum: ['relative', 'autoDetect'] },
+							{ type: 'string' },
+						],
+						minItems: 2,
+						maxItems: 2,
+						additionalItems: false,
+						examples: [
+							['relative', '${workspaceFolder}'],
+							['autoDetect', '${workspaceFolder}'],
+						]
+					},
+					{
+						type: 'array',
+						prefixItems: [
+							{ type: 'string', enum: ['search'] },
+							{
+								type: 'object',
+								properties: {
+									'include': {
+										oneOf: [
+											{ type: 'string' },
+											{ type: 'array', items: { type: 'string' } }
+										]
+									},
+									'exclude': {
+										oneOf: [
+											{ type: 'string' },
+											{ type: 'array', items: { type: 'string' } }
+										]
+									},
+								},
+								required: ['include']
+							}
+						],
+						minItems: 2,
+						maxItems: 2,
+						additionalItems: false,
+						examples: [
+							['search', { 'include': ['${workspaceFolder}'] }],
+							['search', { 'include': ['${workspaceFolder}'], 'exclude': [] }]
+						],
+					}
+				],
+				description: localize('ProblemMatcherSchema.fileLocation', 'Defines how file names reported in a problem pattern should be interpreted. A relative fileLocation may be an array, where the second element of the array is the path of the relative file location. The search fileLocation mode, performs a deep (and, possibly, heavy) file system search within the directories specified by the include/exclude properties of the second element (or the current workspace directory if not specified).')
+			},
+			background: {
+				type: 'object',
+				additionalProperties: false,
+				description: localize('ProblemMatcherSchema.background', 'Patterns to track the begin and end of a matcher active on a background task.'),
+				properties: {
+					activeOnStart: {
+						type: 'boolean',
+						description: localize('ProblemMatcherSchema.background.activeOnStart', 'If set to true the background monitor is in active mode when the task starts. This is equals of issuing a line that matches the beginsPattern')
+					},
+					beginsPattern: {
+						oneOf: [
+							{
+								type: 'string'
+							},
+							Schemas.WatchingPattern
+						],
+						description: localize('ProblemMatcherSchema.background.beginsPattern', 'If matched in the output the start of a background task is signaled.')
+					},
+					endsPattern: {
+						oneOf: [
+							{
+								type: 'string'
+							},
+							Schemas.WatchingPattern
+						],
+						description: localize('ProblemMatcherSchema.background.endsPattern', 'If matched in the output the end of a background task is signaled.')
+					}
+				}
+			},
+			watching: {
+				type: 'object',
+				additionalProperties: false,
+				deprecationMessage: localize('ProblemMatcherSchema.watching.deprecated', 'The watching property is deprecated. Use background instead.'),
+				description: localize('ProblemMatcherSchema.watching', 'Patterns to track the begin and end of a watching matcher.'),
+				properties: {
+					activeOnStart: {
+						type: 'boolean',
+						description: localize('ProblemMatcherSchema.watching.activeOnStart', 'If set to true the watcher is in active mode when the task starts. This is equals of issuing a line that matches the beginPattern')
+					},
+					beginsPattern: {
+						oneOf: [
+							{
+								type: 'string'
+							},
+							Schemas.WatchingPattern
+						],
+						description: localize('ProblemMatcherSchema.watching.beginsPattern', 'If matched in the output the start of a watching task is signaled.')
+					},
+					endsPattern: {
+						oneOf: [
+							{
+								type: 'string'
+							},
+							Schemas.WatchingPattern
+						],
+						description: localize('ProblemMatcherSchema.watching.endsPattern', 'If matched in the output the end of a watching task is signaled.')
+					}
+				}
+			}
+		}
+	};
+
+	export const LegacyProblemMatcher: IJSONSchema = Objects.deepClone(ProblemMatcher);
+	LegacyProblemMatcher.properties = Objects.deepClone(LegacyProblemMatcher.properties) || {};
+	LegacyProblemMatcher.properties['watchedTaskBeginsRegExp'] = {
+		type: 'string',
+		deprecationMessage: localize('LegacyProblemMatcherSchema.watchedBegin.deprecated', 'This property is deprecated. Use the watching property instead.'),
+		description: localize('LegacyProblemMatcherSchema.watchedBegin', 'A regular expression signaling that a watched tasks begins executing triggered through file watching.')
+	};
+	LegacyProblemMatcher.properties['watchedTaskEndsRegExp'] = {
+		type: 'string',
+		deprecationMessage: localize('LegacyProblemMatcherSchema.watchedEnd.deprecated', 'This property is deprecated. Use the watching property instead.'),
+		description: localize('LegacyProblemMatcherSchema.watchedEnd', 'A regular expression signaling that a watched tasks ends executing.')
+	};
+
+	export const NamedProblemMatcher: IJSONSchema = Objects.deepClone(ProblemMatcher);
+	NamedProblemMatcher.properties = Objects.deepClone(NamedProblemMatcher.properties) || {};
+	NamedProblemMatcher.properties.name = {
+		type: 'string',
+		description: localize('NamedProblemMatcherSchema.name', 'The name of the problem matcher used to refer to it.')
+	};
+	NamedProblemMatcher.properties.label = {
+		type: 'string',
+		description: localize('NamedProblemMatcherSchema.label', 'A human readable label of the problem matcher.')
+	};
 }
 
 const problemPatternExtPoint = ExtensionsRegistry.registerExtensionPoint<Config.NamedProblemPatterns>({
@@ -1630,216 +1836,6 @@ export class ProblemMatcherParser extends Parser {
 	}
 }
 
-export namespace Schemas {
-
-	export const WatchingPattern: IJSONSchema = {
-		type: 'object',
-		additionalProperties: false,
-		properties: {
-			regexp: {
-				type: 'string',
-				description: localize('WatchingPatternSchema.regexp', 'The regular expression to detect the begin or end of a background task.')
-			},
-			file: {
-				type: 'integer',
-				description: localize('WatchingPatternSchema.file', 'The match group index of the filename. Can be omitted.')
-			},
-		}
-	};
-
-
-	export const PatternType: IJSONSchema = {
-		anyOf: [
-			{
-				type: 'string',
-				description: localize('PatternTypeSchema.name', 'The name of a contributed or predefined pattern')
-			},
-			Schemas.ProblemPattern,
-			Schemas.MultiLineProblemPattern
-		],
-		description: localize('PatternTypeSchema.description', 'A problem pattern or the name of a contributed or predefined problem pattern. Can be omitted if base is specified.')
-	};
-
-	export const ProblemMatcher: IJSONSchema = {
-		type: 'object',
-		additionalProperties: false,
-		properties: {
-			base: {
-				type: 'string',
-				description: localize('ProblemMatcherSchema.base', 'The name of a base problem matcher to use.')
-			},
-			owner: {
-				type: 'string',
-				description: localize('ProblemMatcherSchema.owner', 'The owner of the problem inside Code. Can be omitted if base is specified. Defaults to \'external\' if omitted and base is not specified.')
-			},
-			source: {
-				type: 'string',
-				description: localize('ProblemMatcherSchema.source', 'A human-readable string describing the source of this diagnostic, e.g. \'typescript\' or \'super lint\'.')
-			},
-			severity: {
-				type: 'string',
-				enum: ['error', 'warning', 'info'],
-				description: localize('ProblemMatcherSchema.severity', 'The default severity for captures problems. Is used if the pattern doesn\'t define a match group for severity.')
-			},
-			applyTo: {
-				type: 'string',
-				enum: ['allDocuments', 'openDocuments', 'closedDocuments'],
-				description: localize('ProblemMatcherSchema.applyTo', 'Controls if a problem reported on a text document is applied only to open, closed or all documents.')
-			},
-			pattern: PatternType,
-			fileLocation: {
-				oneOf: [
-					{
-						type: 'string',
-						enum: ['absolute', 'relative', 'autoDetect', 'search']
-					},
-					{
-						type: 'array',
-						prefixItems: [
-							{
-								type: 'string',
-								enum: ['absolute', 'relative', 'autoDetect', 'search']
-							},
-						],
-						minItems: 1,
-						maxItems: 1,
-						additionalItems: false
-					},
-					{
-						type: 'array',
-						prefixItems: [
-							{ type: 'string', enum: ['relative', 'autoDetect'] },
-							{ type: 'string' },
-						],
-						minItems: 2,
-						maxItems: 2,
-						additionalItems: false,
-						examples: [
-							['relative', '${workspaceFolder}'],
-							['autoDetect', '${workspaceFolder}'],
-						]
-					},
-					{
-						type: 'array',
-						prefixItems: [
-							{ type: 'string', enum: ['search'] },
-							{
-								type: 'object',
-								properties: {
-									'include': {
-										oneOf: [
-											{ type: 'string' },
-											{ type: 'array', items: { type: 'string' } }
-										]
-									},
-									'exclude': {
-										oneOf: [
-											{ type: 'string' },
-											{ type: 'array', items: { type: 'string' } }
-										]
-									},
-								},
-								required: ['include']
-							}
-						],
-						minItems: 2,
-						maxItems: 2,
-						additionalItems: false,
-						examples: [
-							['search', { 'include': ['${workspaceFolder}'] }],
-							['search', { 'include': ['${workspaceFolder}'], 'exclude': [] }]
-						],
-					}
-				],
-				description: localize('ProblemMatcherSchema.fileLocation', 'Defines how file names reported in a problem pattern should be interpreted. A relative fileLocation may be an array, where the second element of the array is the path of the relative file location. The search fileLocation mode, performs a deep (and, possibly, heavy) file system search within the directories specified by the include/exclude properties of the second element (or the current workspace directory if not specified).')
-			},
-			background: {
-				type: 'object',
-				additionalProperties: false,
-				description: localize('ProblemMatcherSchema.background', 'Patterns to track the begin and end of a matcher active on a background task.'),
-				properties: {
-					activeOnStart: {
-						type: 'boolean',
-						description: localize('ProblemMatcherSchema.background.activeOnStart', 'If set to true the background monitor is in active mode when the task starts. This is equals of issuing a line that matches the beginsPattern')
-					},
-					beginsPattern: {
-						oneOf: [
-							{
-								type: 'string'
-							},
-							Schemas.WatchingPattern
-						],
-						description: localize('ProblemMatcherSchema.background.beginsPattern', 'If matched in the output the start of a background task is signaled.')
-					},
-					endsPattern: {
-						oneOf: [
-							{
-								type: 'string'
-							},
-							Schemas.WatchingPattern
-						],
-						description: localize('ProblemMatcherSchema.background.endsPattern', 'If matched in the output the end of a background task is signaled.')
-					}
-				}
-			},
-			watching: {
-				type: 'object',
-				additionalProperties: false,
-				deprecationMessage: localize('ProblemMatcherSchema.watching.deprecated', 'The watching property is deprecated. Use background instead.'),
-				description: localize('ProblemMatcherSchema.watching', 'Patterns to track the begin and end of a watching matcher.'),
-				properties: {
-					activeOnStart: {
-						type: 'boolean',
-						description: localize('ProblemMatcherSchema.watching.activeOnStart', 'If set to true the watcher is in active mode when the task starts. This is equals of issuing a line that matches the beginPattern')
-					},
-					beginsPattern: {
-						oneOf: [
-							{
-								type: 'string'
-							},
-							Schemas.WatchingPattern
-						],
-						description: localize('ProblemMatcherSchema.watching.beginsPattern', 'If matched in the output the start of a watching task is signaled.')
-					},
-					endsPattern: {
-						oneOf: [
-							{
-								type: 'string'
-							},
-							Schemas.WatchingPattern
-						],
-						description: localize('ProblemMatcherSchema.watching.endsPattern', 'If matched in the output the end of a watching task is signaled.')
-					}
-				}
-			}
-		}
-	};
-
-	export const LegacyProblemMatcher: IJSONSchema = Objects.deepClone(ProblemMatcher);
-	LegacyProblemMatcher.properties = Objects.deepClone(LegacyProblemMatcher.properties) || {};
-	LegacyProblemMatcher.properties['watchedTaskBeginsRegExp'] = {
-		type: 'string',
-		deprecationMessage: localize('LegacyProblemMatcherSchema.watchedBegin.deprecated', 'This property is deprecated. Use the watching property instead.'),
-		description: localize('LegacyProblemMatcherSchema.watchedBegin', 'A regular expression signaling that a watched tasks begins executing triggered through file watching.')
-	};
-	LegacyProblemMatcher.properties['watchedTaskEndsRegExp'] = {
-		type: 'string',
-		deprecationMessage: localize('LegacyProblemMatcherSchema.watchedEnd.deprecated', 'This property is deprecated. Use the watching property instead.'),
-		description: localize('LegacyProblemMatcherSchema.watchedEnd', 'A regular expression signaling that a watched tasks ends executing.')
-	};
-
-	export const NamedProblemMatcher: IJSONSchema = Objects.deepClone(ProblemMatcher);
-	NamedProblemMatcher.properties = Objects.deepClone(NamedProblemMatcher.properties) || {};
-	NamedProblemMatcher.properties.name = {
-		type: 'string',
-		description: localize('NamedProblemMatcherSchema.name', 'The name of the problem matcher used to refer to it.')
-	};
-	NamedProblemMatcher.properties.label = {
-		type: 'string',
-		description: localize('NamedProblemMatcherSchema.label', 'A human readable label of the problem matcher.')
-	};
-}
-
 const problemMatchersExtPoint = ExtensionsRegistry.registerExtensionPoint<Config.INamedProblemMatcher[]>({
 	extensionPoint: 'problemMatchers',
 	deps: [problemPatternExtPoint],
diff --git a/src/vs/workbench/contrib/tasks/common/taskConfiguration.ts b/src/vs/workbench/contrib/tasks/common/taskConfiguration.ts
index 0de3b0a3839..25ebf8130b4 100644
--- a/src/vs/workbench/contrib/tasks/common/taskConfiguration.ts
+++ b/src/vs/workbench/contrib/tasks/common/taskConfiguration.ts
@@ -3,28 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
+import * as nls from '../../../../nls.js';
 
-import * as Objects from 'vs/base/common/objects';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { IJSONSchemaMap } from 'vs/base/common/jsonSchema';
-import { Platform } from 'vs/base/common/platform';
-import * as Types from 'vs/base/common/types';
-import * as UUID from 'vs/base/common/uuid';
+import * as Objects from '../../../../base/common/objects.js';
+import { IStringDictionary } from '../../../../base/common/collections.js';
+import { IJSONSchemaMap } from '../../../../base/common/jsonSchema.js';
+import { Platform } from '../../../../base/common/platform.js';
+import * as Types from '../../../../base/common/types.js';
+import * as UUID from '../../../../base/common/uuid.js';
 
-import { ValidationStatus, IProblemReporter as IProblemReporterBase } from 'vs/base/common/parsers';
+import { ValidationStatus, IProblemReporter as IProblemReporterBase } from '../../../../base/common/parsers.js';
 import {
 	INamedProblemMatcher, ProblemMatcherParser, Config as ProblemMatcherConfig,
 	isNamedProblemMatcher, ProblemMatcherRegistry, ProblemMatcher
-} from 'vs/workbench/contrib/tasks/common/problemMatcher';
+} from './problemMatcher.js';
 
-import { IWorkspaceFolder, IWorkspace } from 'vs/platform/workspace/common/workspace';
-import * as Tasks from './tasks';
-import { ITaskDefinitionRegistry, TaskDefinitionRegistry } from './taskDefinitionRegistry';
-import { ConfiguredInput } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
-import { URI } from 'vs/base/common/uri';
-import { ShellExecutionSupportedContext, ProcessExecutionSupportedContext } from 'vs/workbench/contrib/tasks/common/taskService';
-import { IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { IWorkspaceFolder, IWorkspace } from '../../../../platform/workspace/common/workspace.js';
+import * as Tasks from './tasks.js';
+import { ITaskDefinitionRegistry, TaskDefinitionRegistry } from './taskDefinitionRegistry.js';
+import { ConfiguredInput } from '../../../services/configurationResolver/common/configurationResolver.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ShellExecutionSupportedContext, ProcessExecutionSupportedContext } from './taskService.js';
+import { IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 
 export const enum ShellQuoting {
 	/**
@@ -133,6 +133,7 @@ export interface IPresentationOptionsConfig {
 
 	/**
 	 * Controls whether the terminal that the task runs in is closed when the task completes.
+	 * Note that if the terminal process exits with a non-zero exit code, it will not close.
 	 */
 	close?: boolean;
 }
diff --git a/src/vs/workbench/contrib/tasks/common/taskDefinitionRegistry.ts b/src/vs/workbench/contrib/tasks/common/taskDefinitionRegistry.ts
index 369164137f0..b44773c7dce 100644
--- a/src/vs/workbench/contrib/tasks/common/taskDefinitionRegistry.ts
+++ b/src/vs/workbench/contrib/tasks/common/taskDefinitionRegistry.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { IJSONSchema, IJSONSchemaMap } from 'vs/base/common/jsonSchema';
-import { IStringDictionary } from 'vs/base/common/collections';
-import * as Types from 'vs/base/common/types';
-import * as Objects from 'vs/base/common/objects';
+import * as nls from '../../../../nls.js';
+import { IJSONSchema, IJSONSchemaMap } from '../../../../base/common/jsonSchema.js';
+import { IStringDictionary } from '../../../../base/common/collections.js';
+import * as Types from '../../../../base/common/types.js';
+import * as Objects from '../../../../base/common/objects.js';
 
-import { ExtensionsRegistry, ExtensionMessageCollector } from 'vs/workbench/services/extensions/common/extensionsRegistry';
+import { ExtensionsRegistry, ExtensionMessageCollector } from '../../../services/extensions/common/extensionsRegistry.js';
 
-import * as Tasks from 'vs/workbench/contrib/tasks/common/tasks';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { Emitter, Event } from 'vs/base/common/event';
+import * as Tasks from './tasks.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
 
 
 const taskDefinitionSchema: IJSONSchema = {
diff --git a/src/vs/workbench/contrib/tasks/common/taskService.ts b/src/vs/workbench/contrib/tasks/common/taskService.ts
index 3db39c2267d..37cb20ffba3 100644
--- a/src/vs/workbench/contrib/tasks/common/taskService.ts
+++ b/src/vs/workbench/contrib/tasks/common/taskService.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { Action } from 'vs/base/common/actions';
-import { Event } from 'vs/base/common/event';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IDisposable } from 'vs/base/common/lifecycle';
+import * as nls from '../../../../nls.js';
+import { Action } from '../../../../base/common/actions.js';
+import { Event } from '../../../../base/common/event.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
 
-import { IWorkspaceFolder, IWorkspace } from 'vs/platform/workspace/common/workspace';
-import { Task, ContributedTask, CustomTask, ITaskSet, TaskSorter, ITaskEvent, ITaskIdentifier, ConfiguringTask, TaskRunSource } from 'vs/workbench/contrib/tasks/common/tasks';
-import { ITaskSummary, ITaskTerminateResponse, ITaskSystemInfo } from 'vs/workbench/contrib/tasks/common/taskSystem';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { RawContextKey, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
+import { IWorkspaceFolder, IWorkspace } from '../../../../platform/workspace/common/workspace.js';
+import { Task, ContributedTask, CustomTask, ITaskSet, TaskSorter, ITaskEvent, ITaskIdentifier, ConfiguringTask, TaskRunSource } from './tasks.js';
+import { ITaskSummary, ITaskTerminateResponse, ITaskSystemInfo } from './taskSystem.js';
+import { IStringDictionary } from '../../../../base/common/collections.js';
+import { RawContextKey, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 
 export type { ITaskSummary, Task, ITaskTerminateResponse as TaskTerminateResponse };
 
@@ -64,6 +64,8 @@ export interface IWorkspaceFolderTaskResult extends IWorkspaceTaskResult {
 export interface ITaskService {
 	readonly _serviceBrand: undefined;
 	onDidStateChange: Event<ITaskEvent>;
+	/** Fired when task providers are registered or unregistered */
+	onDidChangeTaskProviders: Event<void>;
 	isReconnected: boolean;
 	onDidReconnectToTasks: Event<void>;
 	supportsMultipleTaskExecutions: boolean;
@@ -75,6 +77,11 @@ export interface ITaskService {
 	getBusyTasks(): Promise<Task[]>;
 	terminate(task: Task): Promise<ITaskTerminateResponse>;
 	tasks(filter?: ITaskFilter): Promise<Task[]>;
+	/**
+	 * Gets tasks currently known to the task system. Unlike {@link tasks},
+	 * this does not activate extensions or prompt for workspace trust.
+	 */
+	getKnownTasks(filter?: ITaskFilter): Promise<Task[]>;
 	taskTypes(): string[];
 	getWorkspaceTasks(runSource?: TaskRunSource): Promise<Map<string, IWorkspaceFolderTaskResult>>;
 	getSavedTasks(type: 'persistent' | 'historical'): Promise<(Task | ConfiguringTask)[]>;
diff --git a/src/vs/workbench/contrib/tasks/common/taskSystem.ts b/src/vs/workbench/contrib/tasks/common/taskSystem.ts
index 570252ef92c..f12d8bee5e9 100644
--- a/src/vs/workbench/contrib/tasks/common/taskSystem.ts
+++ b/src/vs/workbench/contrib/tasks/common/taskSystem.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import Severity from 'vs/base/common/severity';
-import { TerminateResponse } from 'vs/base/common/processes';
-import { Event } from 'vs/base/common/event';
-import { Platform } from 'vs/base/common/platform';
-import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { Task, ITaskEvent, KeyedTaskIdentifier } from './tasks';
-import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
+import { URI } from '../../../../base/common/uri.js';
+import Severity from '../../../../base/common/severity.js';
+import { TerminateResponse } from '../../../../base/common/processes.js';
+import { Event } from '../../../../base/common/event.js';
+import { Platform } from '../../../../base/common/platform.js';
+import { IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
+import { Task, ITaskEvent, KeyedTaskIdentifier } from './tasks.js';
+import { ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
 
 export const enum TaskErrors {
 	NotConfigured,
diff --git a/src/vs/workbench/contrib/tasks/common/taskTemplates.ts b/src/vs/workbench/contrib/tasks/common/taskTemplates.ts
index a53c07420d7..32feb2e2254 100644
--- a/src/vs/workbench/contrib/tasks/common/taskTemplates.ts
+++ b/src/vs/workbench/contrib/tasks/common/taskTemplates.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
+import * as nls from '../../../../nls.js';
 
-import { IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
+import { IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
 
 export interface ITaskEntry extends IQuickPickItem {
 	sort?: string;
diff --git a/src/vs/workbench/contrib/tasks/common/tasks.ts b/src/vs/workbench/contrib/tasks/common/tasks.ts
index 8795bee3f33..02892ca03e8 100644
--- a/src/vs/workbench/contrib/tasks/common/tasks.ts
+++ b/src/vs/workbench/contrib/tasks/common/tasks.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import * as Types from 'vs/base/common/types';
-import * as resources from 'vs/base/common/resources';
-import { IJSONSchemaMap } from 'vs/base/common/jsonSchema';
-import * as Objects from 'vs/base/common/objects';
-import { UriComponents, URI } from 'vs/base/common/uri';
+import * as nls from '../../../../nls.js';
+import * as Types from '../../../../base/common/types.js';
+import * as resources from '../../../../base/common/resources.js';
+import { IJSONSchemaMap } from '../../../../base/common/jsonSchema.js';
+import * as Objects from '../../../../base/common/objects.js';
+import { UriComponents, URI } from '../../../../base/common/uri.js';
 
-import { ProblemMatcher } from 'vs/workbench/contrib/tasks/common/problemMatcher';
-import { IWorkspaceFolder, IWorkspace } from 'vs/platform/workspace/common/workspace';
-import { RawContextKey, ContextKeyExpression } from 'vs/platform/contextkey/common/contextkey';
-import { TaskDefinitionRegistry } from 'vs/workbench/contrib/tasks/common/taskDefinitionRegistry';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
-import { TerminalExitReason } from 'vs/platform/terminal/common/terminal';
+import { ProblemMatcher } from './problemMatcher.js';
+import { IWorkspaceFolder, IWorkspace } from '../../../../platform/workspace/common/workspace.js';
+import { RawContextKey, ContextKeyExpression } from '../../../../platform/contextkey/common/contextkey.js';
+import { TaskDefinitionRegistry } from './taskDefinitionRegistry.js';
+import { IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
+import { ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
+import { TerminalExitReason } from '../../../../platform/terminal/common/terminal.js';
 
 
 
diff --git a/src/vs/workbench/contrib/tasks/electron-sandbox/taskService.ts b/src/vs/workbench/contrib/tasks/electron-sandbox/taskService.ts
index 9efbc2ac32d..6a5728c05e8 100644
--- a/src/vs/workbench/contrib/tasks/electron-sandbox/taskService.ts
+++ b/src/vs/workbench/contrib/tasks/electron-sandbox/taskService.ts
@@ -3,51 +3,51 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import * as semver from 'vs/base/common/semver/semver';
-import { IWorkspaceFolder, IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { ITaskSystem } from 'vs/workbench/contrib/tasks/common/taskSystem';
-import { ExecutionEngine } from 'vs/workbench/contrib/tasks/common/tasks';
-import * as TaskConfig from '../common/taskConfiguration';
-import { AbstractTaskService } from 'vs/workbench/contrib/tasks/browser/abstractTaskService';
-import { ITaskFilter, ITaskService } from 'vs/workbench/contrib/tasks/common/taskService';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { TerminalTaskSystem } from 'vs/workbench/contrib/tasks/browser/terminalTaskSystem';
-import { IConfirmationResult, IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { TerminateResponseCode } from 'vs/base/common/processes';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IFileService } from 'vs/platform/files/common/files';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IMarkerService } from 'vs/platform/markers/common/markers';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IProgressService } from 'vs/platform/progress/common/progress';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IViewDescriptorService } from 'vs/workbench/common/views';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { IOutputService } from 'vs/workbench/services/output/common/output';
-import { ITerminalGroupService, ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { IWorkspaceTrustManagementService, IWorkspaceTrustRequestService } from 'vs/platform/workspace/common/workspaceTrust';
-import { ITerminalProfileResolverService } from 'vs/workbench/contrib/terminal/common/terminal';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
+import * as nls from '../../../../nls.js';
+import * as semver from '../../../../base/common/semver/semver.js';
+import { IWorkspaceFolder, IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { ITaskSystem } from '../common/taskSystem.js';
+import { ExecutionEngine } from '../common/tasks.js';
+import * as TaskConfig from '../common/taskConfiguration.js';
+import { AbstractTaskService } from '../browser/abstractTaskService.js';
+import { ITaskFilter, ITaskService } from '../common/taskService.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { TerminalTaskSystem } from '../browser/terminalTaskSystem.js';
+import { IConfirmationResult, IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { TerminateResponseCode } from '../../../../base/common/processes.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IMarkerService } from '../../../../platform/markers/common/markers.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IProgressService } from '../../../../platform/progress/common/progress.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IViewDescriptorService } from '../../../common/views.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { IOutputService } from '../../../services/output/common/output.js';
+import { ITerminalGroupService, ITerminalService } from '../../terminal/browser/terminal.js';
+import { IConfigurationResolverService } from '../../../services/configurationResolver/common/configurationResolver.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.js';
+import { IPathService } from '../../../services/path/common/pathService.js';
+import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
+import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
+import { IWorkspaceTrustManagementService, IWorkspaceTrustRequestService } from '../../../../platform/workspace/common/workspaceTrust.js';
+import { ITerminalProfileResolverService } from '../../terminal/common/terminal.js';
+import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';
+import { IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
 
 interface IWorkspaceFolderConfigurationResult {
 	workspaceFolder: IWorkspaceFolder;
diff --git a/src/vs/workbench/contrib/tasks/test/browser/taskTerminalStatus.test.ts b/src/vs/workbench/contrib/tasks/test/browser/taskTerminalStatus.test.ts
index c3bf26252fd..6dc52fe4c86 100644
--- a/src/vs/workbench/contrib/tasks/test/browser/taskTerminalStatus.test.ts
+++ b/src/vs/workbench/contrib/tasks/test/browser/taskTerminalStatus.test.ts
@@ -4,19 +4,19 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ok } from 'assert';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { AccessibilitySignal, IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { ACTIVE_TASK_STATUS, FAILED_TASK_STATUS, SUCCEEDED_TASK_STATUS, TaskTerminalStatus } from 'vs/workbench/contrib/tasks/browser/taskTerminalStatus';
-import { AbstractProblemCollector } from 'vs/workbench/contrib/tasks/common/problemCollectors';
-import { CommonTask, ITaskEvent, TaskEventKind, TaskRunType } from 'vs/workbench/contrib/tasks/common/tasks';
-import { ITaskService, Task } from 'vs/workbench/contrib/tasks/common/taskService';
-import { ITerminalInstance } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { ITerminalStatusList, TerminalStatusList } from 'vs/workbench/contrib/terminal/browser/terminalStatusList';
-import { ITerminalStatus } from 'vs/workbench/contrib/terminal/common/terminal';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { ACTIVE_TASK_STATUS, FAILED_TASK_STATUS, SUCCEEDED_TASK_STATUS, TaskTerminalStatus } from '../../browser/taskTerminalStatus.js';
+import { AbstractProblemCollector } from '../../common/problemCollectors.js';
+import { CommonTask, ITaskEvent, TaskEventKind, TaskRunType } from '../../common/tasks.js';
+import { ITaskService, Task } from '../../common/taskService.js';
+import { ITerminalInstance } from '../../../terminal/browser/terminal.js';
+import { ITerminalStatusList, TerminalStatusList } from '../../../terminal/browser/terminalStatusList.js';
+import { ITerminalStatus } from '../../../terminal/common/terminal.js';
 
 class TestTaskService implements Partial<ITaskService> {
 	private readonly _onDidStateChange: Emitter<ITaskEvent> = new Emitter();
diff --git a/src/vs/workbench/contrib/tasks/test/common/problemMatcher.test.ts b/src/vs/workbench/contrib/tasks/test/common/problemMatcher.test.ts
index eba74599af7..5ab26d05b2f 100644
--- a/src/vs/workbench/contrib/tasks/test/common/problemMatcher.test.ts
+++ b/src/vs/workbench/contrib/tasks/test/common/problemMatcher.test.ts
@@ -2,10 +2,10 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import * as matchers from 'vs/workbench/contrib/tasks/common/problemMatcher';
+import * as matchers from '../../common/problemMatcher.js';
 
 import assert from 'assert';
-import { ValidationState, IProblemReporter, ValidationStatus } from 'vs/base/common/parsers';
+import { ValidationState, IProblemReporter, ValidationStatus } from '../../../../../base/common/parsers.js';
 
 class ProblemReporter implements IProblemReporter {
 	private _validationStatus: ValidationStatus;
diff --git a/src/vs/workbench/contrib/tasks/test/common/taskConfiguration.test.ts b/src/vs/workbench/contrib/tasks/test/common/taskConfiguration.test.ts
index 7aad1e55307..49cf44a0c31 100644
--- a/src/vs/workbench/contrib/tasks/test/common/taskConfiguration.test.ts
+++ b/src/vs/workbench/contrib/tasks/test/common/taskConfiguration.test.ts
@@ -2,24 +2,24 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { URI } from 'vs/base/common/uri';
+import { URI } from '../../../../../base/common/uri.js';
 import assert from 'assert';
-import Severity from 'vs/base/common/severity';
-import * as UUID from 'vs/base/common/uuid';
+import Severity from '../../../../../base/common/severity.js';
+import * as UUID from '../../../../../base/common/uuid.js';
 
-import * as Types from 'vs/base/common/types';
-import * as Platform from 'vs/base/common/platform';
-import { ValidationStatus } from 'vs/base/common/parsers';
-import { ProblemMatcher, FileLocationKind, IProblemPattern, ApplyToKind, INamedProblemMatcher } from 'vs/workbench/contrib/tasks/common/problemMatcher';
-import { WorkspaceFolder, IWorkspace } from 'vs/platform/workspace/common/workspace';
+import * as Types from '../../../../../base/common/types.js';
+import * as Platform from '../../../../../base/common/platform.js';
+import { ValidationStatus } from '../../../../../base/common/parsers.js';
+import { ProblemMatcher, FileLocationKind, IProblemPattern, ApplyToKind, INamedProblemMatcher } from '../../common/problemMatcher.js';
+import { WorkspaceFolder, IWorkspace } from '../../../../../platform/workspace/common/workspace.js';
 
-import * as Tasks from 'vs/workbench/contrib/tasks/common/tasks';
-import { parse, IParseResult, IProblemReporter, IExternalTaskRunnerConfiguration, ICustomTask, TaskConfigSource, IParseContext, ProblemMatcherConverter, IGlobals, ITaskParseResult, UUIDMap, TaskParser } from 'vs/workbench/contrib/tasks/common/taskConfiguration';
-import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { IContext } from 'vs/platform/contextkey/common/contextkey';
-import { Workspace } from 'vs/platform/workspace/test/common/testWorkspace';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { ITaskDefinitionRegistry } from 'vs/workbench/contrib/tasks/common/taskDefinitionRegistry';
+import * as Tasks from '../../common/tasks.js';
+import { parse, IParseResult, IProblemReporter, IExternalTaskRunnerConfiguration, ICustomTask, TaskConfigSource, IParseContext, ProblemMatcherConverter, IGlobals, ITaskParseResult, UUIDMap, TaskParser } from '../../common/taskConfiguration.js';
+import { MockContextKeyService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { IContext } from '../../../../../platform/contextkey/common/contextkey.js';
+import { Workspace } from '../../../../../platform/workspace/test/common/testWorkspace.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { ITaskDefinitionRegistry } from '../../common/taskDefinitionRegistry.js';
 
 const workspaceFolder: WorkspaceFolder = new WorkspaceFolder({
 	uri: URI.file('/workspace/folderOne'),
diff --git a/src/vs/workbench/contrib/telemetry/browser/telemetry.contribution.ts b/src/vs/workbench/contrib/telemetry/browser/telemetry.contribution.ts
index c397b896093..daca57d8a74 100644
--- a/src/vs/workbench/contrib/telemetry/browser/telemetry.contribution.ts
+++ b/src/vs/workbench/contrib/telemetry/browser/telemetry.contribution.ts
@@ -3,37 +3,37 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry, IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { LifecyclePhase, ILifecycleService, StartupKind } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { language } from 'vs/base/common/platform';
-import { Disposable } from 'vs/base/common/lifecycle';
-import ErrorTelemetry from 'vs/platform/telemetry/browser/errorTelemetry';
-import { TelemetryTrustedValue } from 'vs/platform/telemetry/common/telemetryUtils';
-import { ConfigurationTarget, ConfigurationTargetToString, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ITextFileService, ITextFileSaveEvent, ITextFileResolveEvent } from 'vs/workbench/services/textfile/common/textfiles';
-import { extname, basename, isEqual, isEqualOrParent } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { Event } from 'vs/base/common/event';
-import { Schemas } from 'vs/base/common/network';
-import { getMimeTypes } from 'vs/editor/common/services/languagesAssociations';
-import { hash } from 'vs/base/common/hash';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { ViewContainerLocation } from 'vs/workbench/common/views';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { mainWindow } from 'vs/base/browser/window';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
-import { isBoolean, isNumber, isString } from 'vs/base/common/types';
-import { LayoutSettings } from 'vs/workbench/services/layout/browser/layoutService';
-import { AutoUpdateConfigurationKey } from 'vs/workbench/contrib/extensions/common/extensions';
-import { KEYWORD_ACTIVIATION_SETTING_ID } from 'vs/workbench/contrib/chat/common/chatService';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry, IWorkbenchContribution } from '../../../common/contributions.js';
+import { LifecyclePhase, ILifecycleService, StartupKind } from '../../../services/lifecycle/common/lifecycle.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IWorkspaceContextService, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IWorkbenchThemeService } from '../../../services/themes/common/workbenchThemeService.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { language } from '../../../../base/common/platform.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import ErrorTelemetry from '../../../../platform/telemetry/browser/errorTelemetry.js';
+import { TelemetryTrustedValue } from '../../../../platform/telemetry/common/telemetryUtils.js';
+import { ConfigurationTarget, ConfigurationTargetToString, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ITextFileService, ITextFileSaveEvent, ITextFileResolveEvent } from '../../../services/textfile/common/textfiles.js';
+import { extname, basename, isEqual, isEqualOrParent } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Event } from '../../../../base/common/event.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { getMimeTypes } from '../../../../editor/common/services/languagesAssociations.js';
+import { hash } from '../../../../base/common/hash.js';
+import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.js';
+import { ViewContainerLocation } from '../../../common/views.js';
+import { IUserDataProfileService } from '../../../services/userDataProfile/common/userDataProfile.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { isBoolean, isNumber, isString } from '../../../../base/common/types.js';
+import { LayoutSettings } from '../../../services/layout/browser/layoutService.js';
+import { AutoRestartConfigurationKey, AutoUpdateConfigurationKey } from '../../extensions/common/extensions.js';
+import { KEYWORD_ACTIVIATION_SETTING_ID } from '../../chat/common/chatService.js';
+import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
 
 type TelemetryData = {
 	mimeType: TelemetryTrustedValue<string>;
@@ -431,13 +431,22 @@ class ConfigurationTelemetryContribution extends Disposable implements IWorkbenc
 								? 'default'
 								: 'custom';
 					this.telemetryService.publicLog2<UpdatedSettingEvent, {
-						owner: 'bpasero';
+						owner: 'sandy081';
 						comment: 'This is used to know the new window profile that is being used';
 						settingValue: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'if the profile is default or not' };
 						source: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'source of the setting' };
-					}>('window.systemColorTheme', { settingValue, source });
+					}>('window.newWindowProfile', { settingValue, source });
 					return;
 				}
+
+			case AutoRestartConfigurationKey:
+				this.telemetryService.publicLog2<UpdatedSettingEvent, {
+					owner: 'sandy081';
+					comment: 'This is used to know if extensions are getting auto restarted or not';
+					settingValue: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'value of the setting' };
+					source: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'source of the setting' };
+				}>('extensions.autoRestart', { settingValue: this.getValueToReport(key, target), source });
+				return;
 		}
 	}
 
diff --git a/src/vs/workbench/contrib/terminal/browser/baseTerminalBackend.ts b/src/vs/workbench/contrib/terminal/browser/baseTerminalBackend.ts
index d375636a4c9..70ff99db0cf 100644
--- a/src/vs/workbench/contrib/terminal/browser/baseTerminalBackend.ts
+++ b/src/vs/workbench/contrib/terminal/browser/baseTerminalBackend.ts
@@ -3,19 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { localize } from 'vs/nls';
-import { ICrossVersionSerializedTerminalState, IPtyHostController, ISerializedTerminalState, ITerminalLogService } from 'vs/platform/terminal/common/terminal';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
-import { IHistoryService } from 'vs/workbench/services/history/common/history';
-import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment } from 'vs/workbench/services/statusbar/browser/statusbar';
-
-// HACK: This file should not depend on terminalContrib
-// eslint-disable-next-line local/code-import-patterns
-import { TerminalDeveloperCommandId } from 'vs/workbench/contrib/terminalContrib/developer/common/terminal.developer';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { localize } from '../../../../nls.js';
+import { ICrossVersionSerializedTerminalState, IPtyHostController, ISerializedTerminalState, ITerminalLogService } from '../../../../platform/terminal/common/terminal.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { IConfigurationResolverService } from '../../../services/configurationResolver/common/configurationResolver.js';
+import { IHistoryService } from '../../../services/history/common/history.js';
+import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment } from '../../../services/statusbar/browser/statusbar.js';
+import { TerminalContribCommandId } from '../terminalContribExports.js';
 
 export abstract class BaseTerminalBackend extends Disposable {
 	private _isPtyHostUnresponsive: boolean = false;
@@ -68,7 +65,7 @@ export abstract class BaseTerminalBackend extends Disposable {
 					text: `$(debug-disconnect) ${localize('ptyHostStatus.short', 'Pty Host')}`,
 					tooltip: localize('nonResponsivePtyHost', "The connection to the terminal's pty host process is unresponsive, terminals may stop working. Click to manually restart the pty host."),
 					ariaLabel: localize('ptyHostStatus.ariaLabel', 'Pty Host is unresponsive'),
-					command: TerminalDeveloperCommandId.RestartPtyHost,
+					command: TerminalContribCommandId.DeveloperRestartPtyHost,
 					kind: 'warning'
 				};
 			}
diff --git a/src/vs/workbench/contrib/terminal/browser/detachedTerminal.ts b/src/vs/workbench/contrib/terminal/browser/detachedTerminal.ts
index d8b53f3989f..250021d2ffa 100644
--- a/src/vs/workbench/contrib/terminal/browser/detachedTerminal.ts
+++ b/src/vs/workbench/contrib/terminal/browser/detachedTerminal.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { Delayer } from 'vs/base/common/async';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { OperatingSystem } from 'vs/base/common/platform';
-import { MicrotaskDelay } from 'vs/base/common/symbols';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { TerminalCapabilityStore } from 'vs/platform/terminal/common/capabilities/terminalCapabilityStore';
-import { IMergedEnvironmentVariableCollection } from 'vs/platform/terminal/common/environmentVariable';
-import { ITerminalBackend } from 'vs/platform/terminal/common/terminal';
-import { IDetachedTerminalInstance, IDetachedXTermOptions, IDetachedXtermTerminal, ITerminalContribution, IXtermAttachToElementOptions } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { TerminalExtensionsRegistry } from 'vs/workbench/contrib/terminal/browser/terminalExtensions';
-import { TerminalWidgetManager } from 'vs/workbench/contrib/terminal/browser/widgets/widgetManager';
-import { XtermTerminal } from 'vs/workbench/contrib/terminal/browser/xterm/xtermTerminal';
-import { IEnvironmentVariableInfo } from 'vs/workbench/contrib/terminal/common/environmentVariable';
-import { ITerminalProcessInfo, ProcessState } from 'vs/workbench/contrib/terminal/common/terminal';
+import * as dom from '../../../../base/browser/dom.js';
+import { Delayer } from '../../../../base/common/async.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { OperatingSystem } from '../../../../base/common/platform.js';
+import { MicrotaskDelay } from '../../../../base/common/symbols.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { TerminalCapabilityStore } from '../../../../platform/terminal/common/capabilities/terminalCapabilityStore.js';
+import { IMergedEnvironmentVariableCollection } from '../../../../platform/terminal/common/environmentVariable.js';
+import { ITerminalBackend } from '../../../../platform/terminal/common/terminal.js';
+import { IDetachedTerminalInstance, IDetachedXTermOptions, IDetachedXtermTerminal, ITerminalContribution, IXtermAttachToElementOptions } from './terminal.js';
+import { TerminalExtensionsRegistry } from './terminalExtensions.js';
+import { TerminalWidgetManager } from './widgets/widgetManager.js';
+import { XtermTerminal } from './xterm/xtermTerminal.js';
+import { IEnvironmentVariableInfo } from '../common/environmentVariable.js';
+import { ITerminalProcessInfo, ProcessState } from '../common/terminal.js';
 
 export class DetachedTerminal extends Disposable implements IDetachedTerminalInstance {
 	private readonly _widgets = this._register(new TerminalWidgetManager());
@@ -52,7 +52,11 @@ export class DetachedTerminal extends Disposable implements IDetachedTerminalIns
 
 			let contribution: ITerminalContribution;
 			try {
-				contribution = instantiationService.createInstance(desc.ctor, this, options.processInfo, this._widgets);
+				contribution = instantiationService.createInstance(desc.ctor, {
+					instance: this,
+					processManager: options.processInfo,
+					widgetManager: this._widgets
+				});
 				this._contributions.set(desc.id, contribution);
 				this._register(contribution);
 			} catch (err) {
diff --git a/src/vs/workbench/contrib/terminal/browser/environmentVariableInfo.ts b/src/vs/workbench/contrib/terminal/browser/environmentVariableInfo.ts
index e355b287f63..1ec81c70b9f 100644
--- a/src/vs/workbench/contrib/terminal/browser/environmentVariableInfo.ts
+++ b/src/vs/workbench/contrib/terminal/browser/environmentVariableInfo.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IEnvironmentVariableInfo } from 'vs/workbench/contrib/terminal/common/environmentVariable';
-import { ITerminalStatus, ITerminalStatusHoverAction, TerminalCommandId } from 'vs/workbench/contrib/terminal/common/terminal';
-import { ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { localize } from 'vs/nls';
-import { Codicon } from 'vs/base/common/codicons';
-import { EnvironmentVariableScope, IExtensionOwnedEnvironmentVariableMutator, IMergedEnvironmentVariableCollection, IMergedEnvironmentVariableCollectionDiff } from 'vs/platform/terminal/common/environmentVariable';
-import { TerminalStatus } from 'vs/workbench/contrib/terminal/browser/terminalStatusList';
-import Severity from 'vs/base/common/severity';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { IEnvironmentVariableInfo } from '../common/environmentVariable.js';
+import { ITerminalStatus, ITerminalStatusHoverAction, TerminalCommandId } from '../common/terminal.js';
+import { ITerminalService } from './terminal.js';
+import { localize } from '../../../../nls.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { EnvironmentVariableScope, IExtensionOwnedEnvironmentVariableMutator, IMergedEnvironmentVariableCollection, IMergedEnvironmentVariableCollectionDiff } from '../../../../platform/terminal/common/environmentVariable.js';
+import { TerminalStatus } from './terminalStatusList.js';
+import Severity from '../../../../base/common/severity.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 
 export class EnvironmentVariableInfoStale implements IEnvironmentVariableInfo {
 	readonly requiresAction = true;
@@ -39,7 +39,7 @@ export class EnvironmentVariableInfoStale implements IEnvironmentVariableInfo {
 
 	private _getActions(): ITerminalStatusHoverAction[] {
 		return [{
-			label: localize('relaunchTerminalLabel', "Relaunch terminal"),
+			label: localize('relaunchTerminalLabel', "Relaunch Terminal"),
 			run: () => this._terminalService.getInstanceFromId(this._terminalId)?.relaunch(),
 			commandId: TerminalCommandId.Relaunch
 		}];
@@ -77,7 +77,7 @@ export class EnvironmentVariableInfoChangesActive implements IEnvironmentVariabl
 
 	private _getActions(scope: EnvironmentVariableScope | undefined): ITerminalStatusHoverAction[] {
 		return [{
-			label: localize('showEnvironmentContributions', "Show environment contributions"),
+			label: localize('showEnvironmentContributions', "Show Environment Contributions"),
 			run: () => this._commandService.executeCommand(TerminalCommandId.ShowEnvironmentContributions, scope),
 			commandId: TerminalCommandId.ShowEnvironmentContributions
 		}];
diff --git a/src/vs/workbench/contrib/terminal/browser/media/scrollbar.css b/src/vs/workbench/contrib/terminal/browser/media/scrollbar.css
deleted file mode 100644
index 2a1f155fc8e..00000000000
--- a/src/vs/workbench/contrib/terminal/browser/media/scrollbar.css
+++ /dev/null
@@ -1,45 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-.monaco-workbench .xterm-viewport {
-	/* Use the hack presented in https://stackoverflow.com/a/38748186/1156119 to get opacity transitions working on the scrollbar */
-	-webkit-background-clip: text;
-	background-clip: text;
-	-webkit-text-fill-color: transparent;
-	transition: background-color 800ms linear;
-}
-
-.monaco-workbench .xterm-viewport {
-	scrollbar-width: thin;
-}
-
-.monaco-workbench .xterm-viewport::-webkit-scrollbar {
-	width: 10px;
-}
-
-.monaco-workbench .xterm-viewport::-webkit-scrollbar-track {
-	opacity: 0;
-}
-
-.monaco-workbench .xterm-viewport::-webkit-scrollbar-thumb {
-	min-height: 20px;
-	background-color: inherit;
-}
-
-.monaco-workbench .force-scrollbar .xterm .xterm-viewport,
-.monaco-workbench .xterm.focus .xterm-viewport,
-.monaco-workbench .xterm:focus .xterm-viewport,
-.monaco-workbench .xterm:hover .xterm-viewport {
-	transition: opacity 100ms linear;
-	cursor: default;
-}
-
-.monaco-workbench .xterm .xterm-viewport::-webkit-scrollbar-thumb:hover {
-	transition: opacity 0ms linear;
-}
-
-.monaco-workbench .xterm .xterm-viewport::-webkit-scrollbar-thumb:window-inactive {
-	background-color: inherit;
-}
diff --git a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration.ps1 b/src/vs/workbench/contrib/terminal/browser/media/shellIntegration.ps1
deleted file mode 100644
index c2971c0de2a..00000000000
--- a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration.ps1
+++ /dev/null
@@ -1,238 +0,0 @@
-# ---------------------------------------------------------------------------------------------
-#   Copyright (c) Microsoft Corporation. All rights reserved.
-#   Licensed under the MIT License. See License.txt in the project root for license information.
-# ---------------------------------------------------------------------------------------------
-
-# Prevent installing more than once per session
-if (Test-Path variable:global:__VSCodeOriginalPrompt) {
-	return;
-}
-
-# Disable shell integration when the language mode is restricted
-if ($ExecutionContext.SessionState.LanguageMode -ne "FullLanguage") {
-	return;
-}
-
-$Global:__VSCodeOriginalPrompt = $function:Prompt
-
-$Global:__LastHistoryId = -1
-
-# Store the nonce in script scope and unset the global
-$Nonce = $env:VSCODE_NONCE
-$env:VSCODE_NONCE = $null
-
-$osVersion = [System.Environment]::OSVersion.Version
-$isWindows10 = $IsWindows -and $osVersion.Major -eq 10 -and $osVersion.Minor -eq 0 -and $osVersion.Build -lt 22000
-
-if ($env:VSCODE_ENV_REPLACE) {
-	$Split = $env:VSCODE_ENV_REPLACE.Split(":")
-	foreach ($Item in $Split) {
-		$Inner = $Item.Split('=', 2)
-		[Environment]::SetEnvironmentVariable($Inner[0], $Inner[1].Replace('\x3a', ':'))
-	}
-	$env:VSCODE_ENV_REPLACE = $null
-}
-if ($env:VSCODE_ENV_PREPEND) {
-	$Split = $env:VSCODE_ENV_PREPEND.Split(":")
-	foreach ($Item in $Split) {
-		$Inner = $Item.Split('=', 2)
-		[Environment]::SetEnvironmentVariable($Inner[0], $Inner[1].Replace('\x3a', ':') + [Environment]::GetEnvironmentVariable($Inner[0]))
-	}
-	$env:VSCODE_ENV_PREPEND = $null
-}
-if ($env:VSCODE_ENV_APPEND) {
-	$Split = $env:VSCODE_ENV_APPEND.Split(":")
-	foreach ($Item in $Split) {
-		$Inner = $Item.Split('=', 2)
-		[Environment]::SetEnvironmentVariable($Inner[0], [Environment]::GetEnvironmentVariable($Inner[0]) + $Inner[1].Replace('\x3a', ':'))
-	}
-	$env:VSCODE_ENV_APPEND = $null
-}
-
-function Global:__VSCode-Escape-Value([string]$value) {
-	# NOTE: In PowerShell v6.1+, this can be written `$value -replace '…', { … }` instead of `[regex]::Replace`.
-	# Replace any non-alphanumeric characters.
-	[regex]::Replace($value, "[$([char]0x1b)\\\n;]", { param($match)
-			# Encode the (ascii) matches as `\x<hex>`
-			-Join (
-				[System.Text.Encoding]::UTF8.GetBytes($match.Value) | ForEach-Object { '\x{0:x2}' -f $_ }
-			)
-		})
-}
-
-function Global:Prompt() {
-	$FakeCode = [int]!$global:?
-	# NOTE: We disable strict mode for the scope of this function because it unhelpfully throws an
-	# error when $LastHistoryEntry is null, and is not otherwise useful.
-	Set-StrictMode -Off
-	$LastHistoryEntry = Get-History -Count 1
-	$Result = ""
-	# Skip finishing the command if the first command has not yet started
-	if ($Global:__LastHistoryId -ne -1) {
-		if ($LastHistoryEntry.Id -eq $Global:__LastHistoryId) {
-			# Don't provide a command line or exit code if there was no history entry (eg. ctrl+c, enter on no command)
-			$Result += "$([char]0x1b)]633;D`a"
-		}
-		else {
-			# Command finished exit code
-			# OSC 633 ; D [; <ExitCode>] ST
-			$Result += "$([char]0x1b)]633;D;$FakeCode`a"
-		}
-	}
-	# Prompt started
-	# OSC 633 ; A ST
-	$Result += "$([char]0x1b)]633;A`a"
-	# Current working directory
-	# OSC 633 ; <Property>=<Value> ST
-	$Result += if ($pwd.Provider.Name -eq 'FileSystem') { "$([char]0x1b)]633;P;Cwd=$(__VSCode-Escape-Value $pwd.ProviderPath)`a" }
-	# Before running the original prompt, put $? back to what it was:
-	if ($FakeCode -ne 0) {
-		Write-Error "failure" -ea ignore
-	}
-	# Run the original prompt
-	$OriginalPrompt += $Global:__VSCodeOriginalPrompt.Invoke()
-	$Result += $OriginalPrompt
-
-	# Prompt
-	# OSC 633 ; <Property>=<Value> ST
-	$Result += "$([char]0x1b)]633;P;Prompt=$(__VSCode-Escape-Value $OriginalPrompt)`a"
-
-	# Write command started
-	$Result += "$([char]0x1b)]633;B`a"
-	$Global:__LastHistoryId = $LastHistoryEntry.Id
-	return $Result
-}
-
-# Only send the command executed sequence when PSReadLine is loaded, if not shell integration should
-# still work thanks to the command line sequence
-if (Get-Module -Name PSReadLine) {
-	$__VSCodeOriginalPSConsoleHostReadLine = $function:PSConsoleHostReadLine
-	function Global:PSConsoleHostReadLine {
-		$CommandLine = $__VSCodeOriginalPSConsoleHostReadLine.Invoke()
-
-		# Command line
-		# OSC 633 ; E ; <CommandLine?> ; <Nonce?> ST
-		$Result = "$([char]0x1b)]633;E;"
-		$Result += $(__VSCode-Escape-Value $CommandLine)
-		# Only send the nonce if the OS is not Windows 10 as it seems to echo to the terminal
-		# sometimes
-		if ($IsWindows10 -eq $false) {
-			$Result += ";$Nonce"
-		}
-		$Result += "`a"
-
-		# Command executed
-		# OSC 633 ; C ST
-		$Result += "$([char]0x1b)]633;C`a"
-
-		# Write command executed sequence directly to Console to avoid the new line from Write-Host
-		[Console]::Write($Result)
-
-		$CommandLine
-	}
-}
-
-# Set IsWindows property
-if ($PSVersionTable.PSVersion -lt "6.0") {
-	# Windows PowerShell is only available on Windows
-	[Console]::Write("$([char]0x1b)]633;P;IsWindows=$true`a")
-}
-else {
-	[Console]::Write("$([char]0x1b)]633;P;IsWindows=$IsWindows`a")
-}
-
-# Set ContinuationPrompt property
-$ContinuationPrompt = (Get-PSReadLineOption).ContinuationPrompt
-if ($ContinuationPrompt) {
-	[Console]::Write("$([char]0x1b)]633;P;ContinuationPrompt=$(__VSCode-Escape-Value $ContinuationPrompt)`a")
-}
-
-# Set always on key handlers which map to default VS Code keybindings
-function Set-MappedKeyHandler {
-	param ([string[]] $Chord, [string[]]$Sequence)
-	try {
-		$Handler = Get-PSReadLineKeyHandler -Chord $Chord | Select-Object -First 1
-	}
- catch [System.Management.Automation.ParameterBindingException] {
-		# PowerShell 5.1 ships with PSReadLine 2.0.0 which does not have -Chord,
-		# so we check what's bound and filter it.
-		$Handler = Get-PSReadLineKeyHandler -Bound | Where-Object -FilterScript { $_.Key -eq $Chord } | Select-Object -First 1
-	}
-	if ($Handler) {
-		Set-PSReadLineKeyHandler -Chord $Sequence -Function $Handler.Function
-	}
-}
-
-function Set-MappedKeyHandlers {
-	Set-MappedKeyHandler -Chord Ctrl+Spacebar -Sequence 'F12,a'
-	Set-MappedKeyHandler -Chord Alt+Spacebar -Sequence 'F12,b'
-	Set-MappedKeyHandler -Chord Shift+Enter -Sequence 'F12,c'
-	Set-MappedKeyHandler -Chord Shift+End -Sequence 'F12,d'
-
-	# Conditionally enable suggestions
-	if ($env:VSCODE_SUGGEST -eq '1') {
-		Remove-Item Env:VSCODE_SUGGEST
-
-		# VS Code send completions request (may override Ctrl+Spacebar)
-		Set-PSReadLineKeyHandler -Chord 'F12,e' -ScriptBlock {
-			Send-Completions
-		}
-
-		# TODO: When does this invalidate? Installing a new module could add new commands. We could expose a command to update? Track `(Get-Module).Count`?
-		# Commands are expensive to complete and send over, do this once for the empty string so we
-		# don't need to do it each time the user requests. Additionally we also want to do filtering
-		# and ranking on the client side with the full list of results.
-		$result = "$([char]0x1b)]633;CompletionsPwshCommands;commands;"
-		$result += [System.Management.Automation.CompletionCompleters]::CompleteCommand('') | ConvertTo-Json -Compress
-		$result += "`a"
-		Write-Host -NoNewLine $result
-	}
-}
-
-function Send-Completions {
-	$commandLine = ""
-	$cursorIndex = 0
-	[Microsoft.PowerShell.PSConsoleReadLine]::GetBufferState([ref]$commandLine, [ref]$cursorIndex)
-	$completionPrefix = $commandLine
-
-	# Start completions sequence
-	$result = "$([char]0x1b)]633;Completions"
-
-	# If there is a space in the input, defer to TabExpansion2 as it's more complicated to
-	# determine what type of completions to use
-	# `[` is included here as namespace commands are not included in CompleteCommand(''),
-	# additionally for some reason CompleteVariable('[') causes the prompt to clear and reprint
-	# multiple times
-	if ($completionPrefix.Contains(' ') -or $completionPrefix.Contains('[') -or $PSVersionTable.PSVersion -lt "6.0") {
-		$completions = TabExpansion2 -inputScript $completionPrefix -cursorColumn $cursorIndex
-		if ($null -ne $completions.CompletionMatches) {
-			$result += ";$($completions.ReplacementIndex);$($completions.ReplacementLength);$($cursorIndex);"
-			$result += $completions.CompletionMatches | ConvertTo-Json -Compress
-		}
-	}
-	# If there is no space, get completions using CompletionCompleters as it gives us more
-	# control and works on the empty string
-	else {
-		# Note that CompleteCommand isn't included here as it's expensive
-		$completions = $(
-			([System.Management.Automation.CompletionCompleters]::CompleteFilename($completionPrefix));
-			([System.Management.Automation.CompletionCompleters]::CompleteVariable($completionPrefix));
-		)
-		if ($null -ne $completions) {
-			$result += ";$($completions.ReplacementIndex);$($completions.ReplacementLength);$($cursorIndex);"
-			$result += $completions | ConvertTo-Json -Compress
-		} else {
-			$result += ";0;$($completionPrefix.Length);$($completionPrefix.Length);[]"
-		}
-	}
-
-	# End completions sequence
-	$result += "`a"
-
-	Write-Host -NoNewLine $result
-}
-
-# Register key handlers if PSReadLine is available
-if (Get-Module -Name PSReadLine) {
-	Set-MappedKeyHandlers
-}
diff --git a/src/vs/workbench/contrib/terminal/browser/media/terminal.css b/src/vs/workbench/contrib/terminal/browser/media/terminal.css
index c3ee3fb42d7..6e0dc24cbf9 100644
--- a/src/vs/workbench/contrib/terminal/browser/media/terminal.css
+++ b/src/vs/workbench/contrib/terminal/browser/media/terminal.css
@@ -73,8 +73,16 @@
 }
 
 .monaco-workbench .xterm {
-	/* All terminals have at least 10px left/right edge padding and 2 padding on the bottom (so underscores on last line are visible */
-	padding: 0 10px 2px;
+	/* All terminals have at least 20px left padding for the gutter */
+	padding-left: 20px;
+}
+
+.monaco-workbench .xterm .xterm-scrollable-element {
+	/* Offset the scrollable element such that:
+	 * - The terminal grid will be positioned to the right of the gutter
+	 * - Elements are not hidden in the gutter */
+	margin-left: -20px;
+	padding-left: 20px;
 }
 
 .monaco-workbench .terminal-editor .xterm,
@@ -130,20 +138,6 @@
 .xterm.xterm-cursor-pointer .xterm-screen { cursor: pointer; }
 .xterm.column-select.focus .xterm-screen  { cursor: crosshair; }
 
-.monaco-workbench .terminal-editor .xterm {
-	padding-left: 20px !important;
-}
-
-.monaco-workbench .pane-body.integrated-terminal .terminal-group .monaco-split-view2.horizontal .split-view-view:first-child .xterm,
-.integrated-terminal.shell-integration .xterm {
-	padding-left: 20px !important;
-}
-
-.monaco-workbench .terminal-editor .terminal-group .monaco-split-view2.horizontal .split-view-view:last-child .xterm,
-.monaco-workbench .pane-body.integrated-terminal .terminal-group .monaco-split-view2.horizontal .split-view-view:last-child .xterm {
-	padding-right: 20px;
-}
-
 .monaco-workbench .terminal-editor .xterm a:not(.xterm-invalid-link),
 .monaco-workbench .pane-body.integrated-terminal .xterm a:not(.xterm-invalid-link) {
 	/* To support message box sizing */
@@ -168,8 +162,8 @@
 
 .monaco-workbench .terminal-editor .terminal-wrapper:not(.fixed-dims) .xterm-viewport,
 .monaco-workbench .pane-body.integrated-terminal .terminal-wrapper:not(.fixed-dims) .xterm-viewport {
-	/* Override xterm.js' width as we want to size the viewport to fill the panel so the scrollbar is on the right edge */
-	width: auto !important;
+	/* Override xterm.js' position so the area that accepts mouse events extends to the edge of the scroll bar */
+	right: 14px;
 }
 
 .monaco-workbench .pane-body.integrated-terminal {
@@ -483,7 +477,7 @@
 	left: 0;
 	border: 1.5px solid #ffffff;
 	width: 0px !important;
-	border-color: var(--vscode-notebook-inactiveFocusedCellBorder);
+	border-color: var(--vscode-terminalCommandGuide-foreground);
 	box-sizing: border-box;
 	transform: translateX(3px);
 	pointer-events: none;
@@ -529,29 +523,6 @@
 	background-color: var(--vscode-terminal-hoverHighlightBackground);
 }
 
-.force-scrollbar .xterm .xterm-viewport,
-.monaco-workbench .xterm.focus .xterm-viewport,
-.monaco-workbench .xterm:focus .xterm-viewport,
-.monaco-workbench .xterm:hover .xterm-viewport {
-	background-color: var(--vscode-scrollbarSlider-background) !important;
-}
-
-.monaco-workbench .xterm-viewport {
-	scrollbar-color: var(--vscode-scrollbarSlider-background) transparent;
-}
-
-.monaco-workbench .xterm .xterm-viewport::-webkit-scrollbar-thumb:hover {
-	background-color: var(--vscode-scrollbarSlider-hoverBackground);
-}
-
-.monaco-workbench .xterm-viewport:hover {
-	scrollbar-color: var(--vscode-scrollbarSlider-hoverBackground) transparent;
-}
-
-.monaco-workbench .xterm .xterm-viewport::-webkit-scrollbar-thumb:active {
-	background-color: var(--vscode-scrollbarSlider-activeBackground);
-}
-
 .monaco-workbench .xterm.terminal.hide {
 	visibility: hidden;
 }
diff --git a/src/vs/workbench/contrib/terminal/browser/media/xterm.css b/src/vs/workbench/contrib/terminal/browser/media/xterm.css
index a7b1dbaa1c4..f85a3bab078 100644
--- a/src/vs/workbench/contrib/terminal/browser/media/xterm.css
+++ b/src/vs/workbench/contrib/terminal/browser/media/xterm.css
@@ -95,10 +95,6 @@
 }
 
 .xterm .xterm-viewport {
-	/* On OS X this is required in order for the scroll bar to appear fully opaque */
-	background-color: #000;
-	overflow-y: scroll;
-	cursor: default;
 	position: absolute;
 	right: 0;
 	left: 0;
@@ -116,10 +112,6 @@
 	top: 0;
 }
 
-.xterm .xterm-scroll-area {
-	visibility: hidden;
-}
-
 .xterm-char-measure-element {
 	display: inline-block;
 	visibility: hidden;
@@ -144,7 +136,7 @@
 	cursor: crosshair;
 }
 
-.xterm .xterm-accessibility,
+.xterm .xterm-accessibility:not(.debug),
 .xterm .xterm-message {
 	position: absolute;
 	left: 0;
@@ -156,6 +148,21 @@
 	pointer-events: none;
 }
 
+.xterm .xterm-accessibility-tree:not(.debug) *::selection {
+	color: transparent;
+}
+
+.xterm .xterm-accessibility-tree {
+	font-family: monospace;
+	user-select: text;
+	white-space: pre;
+}
+
+.xterm .xterm-accessibility-tree > div {
+	transform-origin: left;
+	width: fit-content;
+}
+
 .xterm .live-region {
 	position: absolute;
 	left: -9999px;
@@ -239,3 +246,74 @@
 	z-index: 2;
 	position: relative;
 }
+
+
+
+/* Derived from vs/base/browser/ui/scrollbar/media/scrollbar.css */
+
+/* xterm.js customization: Override xterm's cursor style */
+.xterm .xterm-scrollable-element > .scrollbar {
+	cursor: default;
+}
+
+/* Arrows */
+.xterm .xterm-scrollable-element > .scrollbar > .scra {
+	cursor: pointer;
+	font-size: 11px !important;
+}
+
+.xterm .xterm-scrollable-element > .visible {
+	opacity: 1;
+
+	/* Background rule added for IE9 - to allow clicks on dom node */
+	background: rgba(0, 0, 0, 0);
+
+	transition: opacity 100ms linear;
+	/* In front of peek view */
+	z-index: 11;
+}
+
+.xterm .xterm-scrollable-element > .invisible {
+	opacity: 0;
+	pointer-events: none;
+}
+
+.xterm .xterm-scrollable-element > .invisible.fade {
+	transition: opacity 800ms linear;
+}
+
+/* Scrollable Content Inset Shadow */
+.xterm .xterm-scrollable-element > .shadow {
+	position: absolute;
+	display: none;
+}
+
+.xterm .xterm-scrollable-element > .shadow.top {
+	display: block;
+	top: 0;
+	left: 3px;
+	height: 3px;
+	width: 100%;
+	box-shadow: var(--vscode-scrollbar-shadow, #000) 0 6px 6px -6px inset;
+}
+
+.xterm .xterm-scrollable-element > .shadow.left {
+	display: block;
+	top: 3px;
+	left: 0;
+	height: 100%;
+	width: 3px;
+	box-shadow: var(--vscode-scrollbar-shadow, #000) 6px 0 6px -6px inset;
+}
+
+.xterm .xterm-scrollable-element > .shadow.top-left-corner {
+	display: block;
+	top: 0;
+	left: 0;
+	height: 3px;
+	width: 3px;
+}
+
+.xterm .xterm-scrollable-element > .shadow.top.left {
+	box-shadow: var(--vscode-scrollbar-shadow, #000) 6px 0 6px -6px inset;
+}
diff --git a/src/vs/workbench/contrib/terminal/browser/remotePty.ts b/src/vs/workbench/contrib/terminal/browser/remotePty.ts
index f48e808a45e..6dcda309192 100644
--- a/src/vs/workbench/contrib/terminal/browser/remotePty.ts
+++ b/src/vs/workbench/contrib/terminal/browser/remotePty.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Barrier } from 'vs/base/common/async';
-import { IProcessPropertyMap, ITerminalChildProcess, ITerminalLaunchError, ITerminalLogService, ProcessPropertyType } from 'vs/platform/terminal/common/terminal';
-import { BasePty } from 'vs/workbench/contrib/terminal/common/basePty';
-import { RemoteTerminalChannelClient } from 'vs/workbench/contrib/terminal/common/remote/remoteTerminalChannel';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
+import { Barrier } from '../../../../base/common/async.js';
+import { IProcessPropertyMap, ITerminalChildProcess, ITerminalLaunchError, ITerminalLogService, ProcessPropertyType } from '../../../../platform/terminal/common/terminal.js';
+import { BasePty } from '../common/basePty.js';
+import { RemoteTerminalChannelClient } from '../common/remote/remoteTerminalChannel.js';
+import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';
 
 export class RemotePty extends BasePty implements ITerminalChildProcess {
 	private readonly _startBarrier: Barrier;
diff --git a/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts b/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts
index 7841d76d329..b0e472d6e54 100644
--- a/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts
+++ b/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts
@@ -3,33 +3,33 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DeferredPromise } from 'vs/base/common/async';
-import { Emitter } from 'vs/base/common/event';
-import { revive } from 'vs/base/common/marshalling';
-import { PerformanceMark, mark } from 'vs/base/common/performance';
-import { IProcessEnvironment, OperatingSystem } from 'vs/base/common/platform';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ISerializedTerminalCommand } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { IPtyHostLatencyMeasurement, IShellLaunchConfig, IShellLaunchConfigDto, ITerminalBackend, ITerminalBackendRegistry, ITerminalChildProcess, ITerminalEnvironment, ITerminalLogService, ITerminalProcessOptions, ITerminalProfile, ITerminalsLayoutInfo, ITerminalsLayoutInfoById, ProcessPropertyType, TerminalExtensions, TerminalIcon, TerminalSettingId, TitleEventSource } from 'vs/platform/terminal/common/terminal';
-import { IProcessDetails } from 'vs/platform/terminal/common/terminalProcess';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { BaseTerminalBackend } from 'vs/workbench/contrib/terminal/browser/baseTerminalBackend';
-import { RemotePty } from 'vs/workbench/contrib/terminal/browser/remotePty';
-import { ITerminalInstanceService } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { RemoteTerminalChannelClient, REMOTE_TERMINAL_CHANNEL_NAME } from 'vs/workbench/contrib/terminal/common/remote/remoteTerminalChannel';
-import { ICompleteTerminalConfiguration, ITerminalConfiguration, TERMINAL_CONFIG_SECTION } from 'vs/workbench/contrib/terminal/common/terminal';
-import { TerminalStorageKeys } from 'vs/workbench/contrib/terminal/common/terminalStorageKeys';
-import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
-import { IHistoryService } from 'vs/workbench/services/history/common/history';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { IStatusbarService } from 'vs/workbench/services/statusbar/browser/statusbar';
+import { DeferredPromise } from '../../../../base/common/async.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { revive } from '../../../../base/common/marshalling.js';
+import { PerformanceMark, mark } from '../../../../base/common/performance.js';
+import { IProcessEnvironment, OperatingSystem } from '../../../../base/common/platform.js';
+import { StopWatch } from '../../../../base/common/stopwatch.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IRemoteAuthorityResolverService } from '../../../../platform/remote/common/remoteAuthorityResolver.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { ISerializedTerminalCommand } from '../../../../platform/terminal/common/capabilities/capabilities.js';
+import { IPtyHostLatencyMeasurement, IShellLaunchConfig, IShellLaunchConfigDto, ITerminalBackend, ITerminalBackendRegistry, ITerminalChildProcess, ITerminalEnvironment, ITerminalLogService, ITerminalProcessOptions, ITerminalProfile, ITerminalsLayoutInfo, ITerminalsLayoutInfoById, ProcessPropertyType, TerminalExtensions, TerminalIcon, TerminalSettingId, TitleEventSource } from '../../../../platform/terminal/common/terminal.js';
+import { IProcessDetails } from '../../../../platform/terminal/common/terminalProcess.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { BaseTerminalBackend } from './baseTerminalBackend.js';
+import { RemotePty } from './remotePty.js';
+import { ITerminalInstanceService } from './terminal.js';
+import { RemoteTerminalChannelClient, REMOTE_TERMINAL_CHANNEL_NAME } from '../common/remote/remoteTerminalChannel.js';
+import { ICompleteTerminalConfiguration, ITerminalConfiguration, TERMINAL_CONFIG_SECTION } from '../common/terminal.js';
+import { TerminalStorageKeys } from '../common/terminalStorageKeys.js';
+import { IConfigurationResolverService } from '../../../services/configurationResolver/common/configurationResolver.js';
+import { IHistoryService } from '../../../services/history/common/history.js';
+import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';
+import { IStatusbarService } from '../../../services/statusbar/browser/statusbar.js';
 
 export class RemoteTerminalBackendContribution implements IWorkbenchContribution {
 	static ID = 'remoteTerminalBackend';
@@ -44,7 +44,7 @@ export class RemoteTerminalBackendContribution implements IWorkbenchContribution
 			const channel = instantiationService.createInstance(RemoteTerminalChannelClient, connection.remoteAuthority, connection.getChannel(REMOTE_TERMINAL_CHANNEL_NAME));
 			const backend = instantiationService.createInstance(RemoteTerminalBackend, connection.remoteAuthority, channel);
 			Registry.as<ITerminalBackendRegistry>(TerminalExtensions.Backend).registerTerminalBackend(backend);
-			terminalInstanceService.didRegisterBackend(backend.remoteAuthority);
+			terminalInstanceService.didRegisterBackend(backend);
 		}
 	}
 }
@@ -119,30 +119,6 @@ class RemoteTerminalBackend extends BaseTerminalBackend implements ITerminalBack
 			}
 		});
 
-		// Listen for config changes
-		const initialConfig = this._configurationService.getValue<ITerminalConfiguration>(TERMINAL_CONFIG_SECTION);
-		for (const match of Object.keys(initialConfig.autoReplies)) {
-			// Ensure the value is truthy
-			const reply = initialConfig.autoReplies[match];
-			if (reply) {
-				this._remoteTerminalChannel.installAutoReply(match, reply);
-			}
-		}
-		// TODO: Could simplify update to a single call
-		this._register(this._configurationService.onDidChangeConfiguration(async e => {
-			if (e.affectsConfiguration(TerminalSettingId.AutoReplies)) {
-				this._remoteTerminalChannel.uninstallAllAutoReplies();
-				const config = this._configurationService.getValue<ITerminalConfiguration>(TERMINAL_CONFIG_SECTION);
-				for (const match of Object.keys(config.autoReplies)) {
-					// Ensure the value is truthy
-					const reply = config.autoReplies[match];
-					if (reply) {
-						await this._remoteTerminalChannel.installAutoReply(match, reply);
-					}
-				}
-			}
-		}));
-
 		this._onPtyHostConnected.fire();
 	}
 
@@ -372,4 +348,12 @@ class RemoteTerminalBackend extends BaseTerminalBackend implements ITerminalBack
 	async getPerformanceMarks(): Promise<PerformanceMark[]> {
 		return this._remoteTerminalChannel.getPerformanceMarks();
 	}
+
+	installAutoReply(match: string, reply: string): Promise<void> {
+		return this._remoteTerminalChannel.installAutoReply(match, reply);
+	}
+
+	uninstallAllAutoReplies(): Promise<void> {
+		return this._remoteTerminalChannel.uninstallAllAutoReplies();
+	}
 }
diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts
index 6da9fc7e3c2..9fff11fea70 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts
@@ -4,62 +4,52 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { getFontSnippets } from 'vs/base/browser/fonts';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Schemas } from 'vs/base/common/network';
-import { isIOS, isWindows } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import 'vs/css!./media/scrollbar';
-import 'vs/css!./media/terminal';
-import 'vs/css!./media/terminalVoice';
-import 'vs/css!./media/widgets';
-import 'vs/css!./media/xterm';
-import * as nls from 'vs/nls';
-import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from 'vs/platform/accessibility/common/accessibility';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { ContextKeyExpr, ContextKeyExpression } from 'vs/platform/contextkey/common/contextkey';
-import { Extensions as DragAndDropExtensions, IDragAndDropContributionRegistry, IDraggedResourceEditorInput } from 'vs/platform/dnd/browser/dnd';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IKeybindings, KeybindingWeight, KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { IQuickAccessRegistry, Extensions as QuickAccessExtensions } from 'vs/platform/quickinput/common/quickAccess';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { ITerminalLogService, WindowsShellType } from 'vs/platform/terminal/common/terminal';
-import { TerminalLogService } from 'vs/platform/terminal/common/terminalLogService';
-import { registerTerminalPlatformConfiguration } from 'vs/platform/terminal/common/terminalPlatformConfiguration';
-import { EditorPaneDescriptor, IEditorPaneRegistry } from 'vs/workbench/browser/editor';
-import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
-import { getQuickNavigateHandler } from 'vs/workbench/browser/quickaccess';
-import { WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { EditorExtensions, IEditorFactoryRegistry } from 'vs/workbench/common/editor';
-import { IViewContainersRegistry, IViewsRegistry, Extensions as ViewContainerExtensions, ViewContainerLocation } from 'vs/workbench/common/views';
-import { RemoteTerminalBackendContribution } from 'vs/workbench/contrib/terminal/browser/remoteTerminalBackend';
-import { ITerminalConfigurationService, ITerminalEditorService, ITerminalGroupService, ITerminalInstanceService, ITerminalService, TerminalDataTransfers, terminalEditorId } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { registerTerminalActions, terminalSendSequenceCommand } from 'vs/workbench/contrib/terminal/browser/terminalActions';
-import { setupTerminalCommands } from 'vs/workbench/contrib/terminal/browser/terminalCommands';
-import { TerminalConfigurationService } from 'vs/workbench/contrib/terminal/browser/terminalConfigurationService';
-import { TerminalEditor } from 'vs/workbench/contrib/terminal/browser/terminalEditor';
-import { TerminalEditorInput } from 'vs/workbench/contrib/terminal/browser/terminalEditorInput';
-import { TerminalInputSerializer } from 'vs/workbench/contrib/terminal/browser/terminalEditorSerializer';
-import { TerminalEditorService } from 'vs/workbench/contrib/terminal/browser/terminalEditorService';
-import { TerminalGroupService } from 'vs/workbench/contrib/terminal/browser/terminalGroupService';
-import { terminalViewIcon } from 'vs/workbench/contrib/terminal/browser/terminalIcons';
-import { TerminalInstanceService } from 'vs/workbench/contrib/terminal/browser/terminalInstanceService';
-import { TerminalMainContribution } from 'vs/workbench/contrib/terminal/browser/terminalMainContribution';
-import { setupTerminalMenus } from 'vs/workbench/contrib/terminal/browser/terminalMenus';
-import { TerminalProfileService } from 'vs/workbench/contrib/terminal/browser/terminalProfileService';
-import { TerminalQuickAccessProvider } from 'vs/workbench/contrib/terminal/browser/terminalQuickAccess';
-import { TerminalService } from 'vs/workbench/contrib/terminal/browser/terminalService';
-import { TerminalViewPane } from 'vs/workbench/contrib/terminal/browser/terminalView';
-import { TerminalWslRecommendationContribution } from 'vs/workbench/contrib/terminal/browser/terminalWslRecommendationContribution';
-import { ITerminalProfileService, TERMINAL_VIEW_ID, TerminalCommandId } from 'vs/workbench/contrib/terminal/common/terminal';
-import { registerColors } from 'vs/workbench/contrib/terminal/common/terminalColorRegistry';
-import { registerTerminalConfiguration } from 'vs/workbench/contrib/terminal/common/terminalConfiguration';
-import { TerminalContextKeyStrings, TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey';
-import { terminalStrings } from 'vs/workbench/contrib/terminal/common/terminalStrings';
-
-// HACK: This file should not depend on terminalContrib
-// eslint-disable-next-line local/code-import-patterns
-import { TerminalSuggestSettingId } from 'vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { isIOS, isWindows } from '../../../../base/common/platform.js';
+import { URI } from '../../../../base/common/uri.js';
+import './media/terminal.css';
+import './media/terminalVoice.css';
+import './media/widgets.css';
+import './media/xterm.css';
+import * as nls from '../../../../nls.js';
+import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from '../../../../platform/accessibility/common/accessibility.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { Extensions as DragAndDropExtensions, IDragAndDropContributionRegistry, IDraggedResourceEditorInput } from '../../../../platform/dnd/browser/dnd.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { GeneralShellType, ITerminalLogService, WindowsShellType } from '../../../../platform/terminal/common/terminal.js';
+import { TerminalLogService } from '../../../../platform/terminal/common/terminalLogService.js';
+import { registerTerminalPlatformConfiguration } from '../../../../platform/terminal/common/terminalPlatformConfiguration.js';
+import { EditorPaneDescriptor, IEditorPaneRegistry } from '../../../browser/editor.js';
+import { ViewPaneContainer } from '../../../browser/parts/views/viewPaneContainer.js';
+import { WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { EditorExtensions, IEditorFactoryRegistry } from '../../../common/editor.js';
+import { IViewContainersRegistry, IViewsRegistry, Extensions as ViewContainerExtensions, ViewContainerLocation } from '../../../common/views.js';
+import { RemoteTerminalBackendContribution } from './remoteTerminalBackend.js';
+import { ITerminalConfigurationService, ITerminalEditorService, ITerminalGroupService, ITerminalInstanceService, ITerminalService, TerminalDataTransfers, terminalEditorId } from './terminal.js';
+import { registerTerminalActions } from './terminalActions.js';
+import { setupTerminalCommands } from './terminalCommands.js';
+import { TerminalConfigurationService } from './terminalConfigurationService.js';
+import { TerminalEditor } from './terminalEditor.js';
+import { TerminalEditorInput } from './terminalEditorInput.js';
+import { TerminalInputSerializer } from './terminalEditorSerializer.js';
+import { TerminalEditorService } from './terminalEditorService.js';
+import { TerminalGroupService } from './terminalGroupService.js';
+import { terminalViewIcon } from './terminalIcons.js';
+import { TerminalInstanceService } from './terminalInstanceService.js';
+import { TerminalMainContribution } from './terminalMainContribution.js';
+import { setupTerminalMenus } from './terminalMenus.js';
+import { TerminalProfileService } from './terminalProfileService.js';
+import { TerminalService } from './terminalService.js';
+import { TerminalViewPane } from './terminalView.js';
+import { ITerminalProfileService, TERMINAL_VIEW_ID, TerminalCommandId } from '../common/terminal.js';
+import { registerColors } from '../common/terminalColorRegistry.js';
+import { registerTerminalConfiguration } from '../common/terminalConfiguration.js';
+import { TerminalContextKeyStrings, TerminalContextKeys } from '../common/terminalContextKey.js';
+import { terminalStrings } from '../common/terminalStrings.js';
+import { registerSendSequenceKeybinding } from './terminalKeybindings.js';
 
 // Register services
 registerSingleton(ITerminalLogService, TerminalLogService, InstantiationType.Delayed);
@@ -70,26 +60,10 @@ registerSingleton(ITerminalGroupService, TerminalGroupService, InstantiationType
 registerSingleton(ITerminalInstanceService, TerminalInstanceService, InstantiationType.Delayed);
 registerSingleton(ITerminalProfileService, TerminalProfileService, InstantiationType.Delayed);
 
-// Register quick accesses
-const quickAccessRegistry = (Registry.as<IQuickAccessRegistry>(QuickAccessExtensions.Quickaccess));
-const inTerminalsPicker = 'inTerminalPicker';
-quickAccessRegistry.registerQuickAccessProvider({
-	ctor: TerminalQuickAccessProvider,
-	prefix: TerminalQuickAccessProvider.PREFIX,
-	contextKey: inTerminalsPicker,
-	placeholder: nls.localize('tasksQuickAccessPlaceholder', "Type the name of a terminal to open."),
-	helpEntries: [{ description: nls.localize('tasksQuickAccessHelp', "Show All Opened Terminals"), commandId: TerminalCommandId.QuickOpenTerm }]
-});
-const quickAccessNavigateNextInTerminalPickerId = 'workbench.action.quickOpenNavigateNextInTerminalPicker';
-CommandsRegistry.registerCommand({ id: quickAccessNavigateNextInTerminalPickerId, handler: getQuickNavigateHandler(quickAccessNavigateNextInTerminalPickerId, true) });
-const quickAccessNavigatePreviousInTerminalPickerId = 'workbench.action.quickOpenNavigatePreviousInTerminalPicker';
-CommandsRegistry.registerCommand({ id: quickAccessNavigatePreviousInTerminalPickerId, handler: getQuickNavigateHandler(quickAccessNavigatePreviousInTerminalPickerId, false) });
-
 // Register workbench contributions
 // This contribution blocks startup as it's critical to enable the web embedder window.createTerminal API
 registerWorkbenchContribution2(TerminalMainContribution.ID, TerminalMainContribution, WorkbenchPhase.BlockStartup);
 registerWorkbenchContribution2(RemoteTerminalBackendContribution.ID, RemoteTerminalBackendContribution, WorkbenchPhase.AfterRestored);
-registerWorkbenchContribution2(TerminalWslRecommendationContribution.ID, TerminalWslRecommendationContribution, WorkbenchPhase.Eventually);
 
 // Register configurations
 registerTerminalPlatformConfiguration();
@@ -160,20 +134,6 @@ Registry.as<IViewsRegistry>(ViewContainerExtensions.ViewsRegistry).registerViews
 // Register actions
 registerTerminalActions();
 
-function registerSendSequenceKeybinding(text: string, rule: { when?: ContextKeyExpression } & IKeybindings): void {
-	KeybindingsRegistry.registerCommandAndKeybindingRule({
-		id: TerminalCommandId.SendSequence,
-		weight: KeybindingWeight.WorkbenchContrib,
-		when: rule.when || TerminalContextKeys.focus,
-		primary: rule.primary,
-		mac: rule.mac,
-		linux: rule.linux,
-		win: rule.win,
-		handler: terminalSendSequenceCommand,
-		args: { text }
-	});
-}
-
 const enum Constants {
 	/** The text representation of `^<letter>` is `'A'.charCodeAt(0) + 1`. */
 	CtrlLetterOffset = 64
@@ -185,7 +145,7 @@ const enum Constants {
 // reader. This works even when clipboard.readText is not supported.
 if (isWindows) {
 	registerSendSequenceKeybinding(String.fromCharCode('V'.charCodeAt(0) - Constants.CtrlLetterOffset), { // ctrl+v
-		when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, WindowsShellType.PowerShell), CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
+		when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, GeneralShellType.PowerShell), CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
 		primary: KeyMod.CtrlCmd | KeyCode.KeyV
 	});
 }
@@ -194,31 +154,26 @@ if (isWindows) {
 // shell integration script. This allows keystrokes that cannot be sent via VT sequences to work.
 // See https://github.com/microsoft/terminal/issues/879#issuecomment-497775007
 registerSendSequenceKeybinding('\x1b[24~a', { // F12,a -> ctrl+space (MenuComplete)
-	when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, WindowsShellType.PowerShell), TerminalContextKeys.terminalShellIntegrationEnabled, CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
+	when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, GeneralShellType.PowerShell), TerminalContextKeys.terminalShellIntegrationEnabled, CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
 	primary: KeyMod.CtrlCmd | KeyCode.Space,
 	mac: { primary: KeyMod.WinCtrl | KeyCode.Space }
 });
 registerSendSequenceKeybinding('\x1b[24~b', { // F12,b -> alt+space (SetMark)
-	when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, WindowsShellType.PowerShell), TerminalContextKeys.terminalShellIntegrationEnabled, CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
+	when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, GeneralShellType.PowerShell), TerminalContextKeys.terminalShellIntegrationEnabled, CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
 	primary: KeyMod.Alt | KeyCode.Space
 });
 registerSendSequenceKeybinding('\x1b[24~c', { // F12,c -> shift+enter (AddLine)
-	when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, WindowsShellType.PowerShell), TerminalContextKeys.terminalShellIntegrationEnabled, CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
+	when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, GeneralShellType.PowerShell), TerminalContextKeys.terminalShellIntegrationEnabled, CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
 	primary: KeyMod.Shift | KeyCode.Enter
 });
 registerSendSequenceKeybinding('\x1b[24~d', { // F12,d -> shift+end (SelectLine) - HACK: \x1b[1;2F is supposed to work but it doesn't
-	when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, WindowsShellType.PowerShell), TerminalContextKeys.terminalShellIntegrationEnabled, CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
+	when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, GeneralShellType.PowerShell), TerminalContextKeys.terminalShellIntegrationEnabled, CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
 	mac: { primary: KeyMod.Shift | KeyMod.CtrlCmd | KeyCode.RightArrow }
 });
-registerSendSequenceKeybinding('\x1b[24~e', { // F12,e -> ctrl+space (Native suggest)
-	when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, WindowsShellType.PowerShell), TerminalContextKeys.terminalShellIntegrationEnabled, CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate(), ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.Enabled}`, true)),
-	primary: KeyMod.CtrlCmd | KeyCode.Space,
-	mac: { primary: KeyMod.WinCtrl | KeyCode.Space }
-});
 
 // Always on pwsh keybindings
 registerSendSequenceKeybinding('\x1b[1;2H', { // Shift+home
-	when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, WindowsShellType.PowerShell)),
+	when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, GeneralShellType.PowerShell)),
 	mac: { primary: KeyMod.Shift | KeyMod.CtrlCmd | KeyCode.LeftArrow }
 });
 
diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.ts b/src/vs/workbench/contrib/terminal/browser/terminal.ts
index 1dcaecd333a..6b4c6d4cf16 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminal.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminal.ts
@@ -3,32 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDimension } from 'vs/base/browser/dom';
-import { Orientation } from 'vs/base/browser/ui/splitview/splitview';
-import { Color } from 'vs/base/common/color';
-import { Event, IDynamicListEventMultiplexer, type DynamicListEventMultiplexer } from 'vs/base/common/event';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { OperatingSystem } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IKeyMods } from 'vs/platform/quickinput/common/quickInput';
-import { IMarkProperties, ITerminalCapabilityImplMap, ITerminalCapabilityStore, ITerminalCommand, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { IMergedEnvironmentVariableCollection } from 'vs/platform/terminal/common/environmentVariable';
-import { IExtensionTerminalProfile, IReconnectionProperties, IShellIntegration, IShellLaunchConfig, ITerminalBackend, ITerminalDimensions, ITerminalLaunchError, ITerminalProfile, ITerminalTabLayoutInfoById, TerminalExitReason, TerminalIcon, TerminalLocation, TerminalShellType, TerminalType, TitleEventSource, WaitOnExitValue } from 'vs/platform/terminal/common/terminal';
-import { IColorTheme } from 'vs/platform/theme/common/themeService';
-import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { IEditableData } from 'vs/workbench/common/views';
-import { ITerminalStatusList } from 'vs/workbench/contrib/terminal/browser/terminalStatusList';
-import { XtermTerminal } from 'vs/workbench/contrib/terminal/browser/xterm/xtermTerminal';
-import { IRegisterContributedProfileArgs, IRemoteTerminalAttachTarget, IStartExtensionTerminalRequest, ITerminalConfiguration, ITerminalFont, ITerminalProcessExtHostProxy, ITerminalProcessInfo } from 'vs/workbench/contrib/terminal/common/terminal';
+import { IDimension } from '../../../../base/browser/dom.js';
+import { Orientation } from '../../../../base/browser/ui/splitview/splitview.js';
+import { Color } from '../../../../base/common/color.js';
+import { Event, IDynamicListEventMultiplexer, type DynamicListEventMultiplexer } from '../../../../base/common/event.js';
+import { DisposableStore, IDisposable, type IReference } from '../../../../base/common/lifecycle.js';
+import { OperatingSystem } from '../../../../base/common/platform.js';
+import { URI } from '../../../../base/common/uri.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeyMods } from '../../../../platform/quickinput/common/quickInput.js';
+import { IMarkProperties, ITerminalCapabilityImplMap, ITerminalCapabilityStore, ITerminalCommand, TerminalCapability } from '../../../../platform/terminal/common/capabilities/capabilities.js';
+import { IMergedEnvironmentVariableCollection } from '../../../../platform/terminal/common/environmentVariable.js';
+import { IExtensionTerminalProfile, IReconnectionProperties, IShellIntegration, IShellLaunchConfig, ITerminalBackend, ITerminalDimensions, ITerminalLaunchError, ITerminalProfile, ITerminalTabLayoutInfoById, TerminalExitReason, TerminalIcon, TerminalLocation, TerminalShellType, TerminalType, TitleEventSource, WaitOnExitValue } from '../../../../platform/terminal/common/terminal.js';
+import { IColorTheme } from '../../../../platform/theme/common/themeService.js';
+import { IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { IEditableData } from '../../../common/views.js';
+import { ITerminalStatusList } from './terminalStatusList.js';
+import { XtermTerminal } from './xterm/xtermTerminal.js';
+import { IRegisterContributedProfileArgs, IRemoteTerminalAttachTarget, IStartExtensionTerminalRequest, ITerminalConfiguration, ITerminalFont, ITerminalProcessExtHostProxy, ITerminalProcessInfo } from '../common/terminal.js';
 import type { IMarker, ITheme, Terminal as RawXtermTerminal, IBufferRange } from '@xterm/xterm';
-import { ScrollPosition } from 'vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { GroupIdentifier } from 'vs/workbench/common/editor';
-import { ACTIVE_GROUP_TYPE, AUX_WINDOW_GROUP_TYPE, SIDE_GROUP_TYPE } from 'vs/workbench/services/editor/common/editorService';
-import type { ICurrentPartialCommand } from 'vs/platform/terminal/common/capabilities/commandDetection/terminalCommand';
-import type { IXtermCore } from 'vs/workbench/contrib/terminal/browser/xterm-private';
+import { ScrollPosition } from './xterm/markNavigationAddon.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { GroupIdentifier } from '../../../common/editor.js';
+import { ACTIVE_GROUP_TYPE, AUX_WINDOW_GROUP_TYPE, SIDE_GROUP_TYPE } from '../../../services/editor/common/editorService.js';
+import type { ICurrentPartialCommand } from '../../../../platform/terminal/common/capabilities/commandDetection/terminalCommand.js';
+import type { IXtermCore } from './xterm-private.js';
+import type { IMenu } from '../../../../platform/actions/common/actions.js';
+import type { Barrier } from '../../../../base/common/async.js';
 
 export const ITerminalService = createDecorator<ITerminalService>('terminalService');
 export const ITerminalConfigurationService = createDecorator<ITerminalConfigurationService>('terminalConfigurationService');
@@ -61,6 +63,11 @@ export interface ITerminalInstanceService {
 	 */
 	onDidCreateInstance: Event<ITerminalInstance>;
 
+	/**
+	 * An event that's fired when a new backend is registered.
+	 */
+	onDidRegisterBackend: Event<ITerminalBackend>;
+
 	/**
 	 * Helper function to convert a shell launch config, a profile or undefined into its equivalent
 	 * shell launch config.
@@ -84,7 +91,7 @@ export interface ITerminalInstanceService {
 	getBackend(remoteAuthority?: string): Promise<ITerminalBackend | undefined>;
 
 	getRegisteredBackends(): IterableIterator<ITerminalBackend>;
-	didRegisterBackend(remoteAuthority?: string): void;
+	didRegisterBackend(backend: ITerminalBackend): void;
 }
 
 export const enum Direction {
@@ -137,7 +144,7 @@ export interface ITerminalGroup {
 	attachToElement(element: HTMLElement): void;
 	addInstance(instance: ITerminalInstance): void;
 	removeInstance(instance: ITerminalInstance): void;
-	moveInstance(instance: ITerminalInstance, index: number): void;
+	moveInstance(instances: ITerminalInstance | ITerminalInstance[], index: number, position: 'before' | 'after'): void;
 	setVisible(visible: boolean): void;
 	layout(width: number, height: number): void;
 	addDisposable(disposable: IDisposable): void;
@@ -294,6 +301,7 @@ export interface ITerminalService extends ITerminalInstanceHost {
 	getReconnectedTerminals(reconnectionOwner: string): ITerminalInstance[] | undefined;
 
 	getActiveOrCreateInstance(options?: { acceptsInput?: boolean }): Promise<ITerminalInstance>;
+	revealTerminal(source: ITerminalInstance, preserveFocus?: boolean): Promise<void>;
 	revealActiveTerminal(preserveFocus?: boolean): Promise<void>;
 	moveToEditor(source: ITerminalInstance, group?: GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE | AUX_WINDOW_GROUP_TYPE): void;
 	moveIntoNewEditor(source: ITerminalInstance): void;
@@ -484,8 +492,8 @@ export interface ITerminalGroupService extends ITerminalInstanceHost {
 	 * @param source The source instance to move.
 	 * @param target The target instance to move the source instance to.
 	 */
-	moveGroup(source: ITerminalInstance, target: ITerminalInstance): void;
-	moveGroupToEnd(source: ITerminalInstance): void;
+	moveGroup(source: ITerminalInstance | ITerminalInstance[], target: ITerminalInstance): void;
+	moveGroupToEnd(source: ITerminalInstance | ITerminalInstance[]): void;
 
 	moveInstance(source: ITerminalInstance, target: ITerminalInstance, side: 'before' | 'after'): void;
 	unsplitInstance(instance: ITerminalInstance): void;
@@ -523,6 +531,10 @@ export interface ITerminalInstanceHost {
 	readonly onDidChangeInstanceCapability: Event<ITerminalInstance>;
 
 	setActiveInstance(instance: ITerminalInstance): void;
+	/**
+	 * Reveal and focus the instance, regardless of its location.
+	 */
+	focusInstance(instance: ITerminalInstance): void;
 	/**
 	 * Reveal and focus the active instance, regardless of its location.
 	 */
@@ -621,7 +633,8 @@ export interface ITerminalInstance extends IBaseTerminalInstance {
 	/**
 	 * The position of the terminal.
 	 */
-	target?: TerminalLocation;
+	target: TerminalLocation | undefined;
+	targetRef: IReference<TerminalLocation | undefined>;
 
 	/**
 	 * The id of a persistent process. This is defined if this is a terminal created by a pty host
@@ -691,6 +704,10 @@ export interface ITerminalInstance extends IBaseTerminalInstance {
 	onDidChangeTarget: Event<TerminalLocation | undefined>;
 	onDidSendText: Event<string>;
 	onDidChangeShellType: Event<TerminalShellType>;
+	onDidChangeVisibility: Event<boolean>;
+
+	onWillPaste: Event<string>;
+	onDidPaste: Event<string>;
 
 	/**
 	 * An event that fires when a terminal is dropped on this instance via drag and drop.
@@ -1018,12 +1035,6 @@ export interface ITerminalInstance extends IBaseTerminalInstance {
 	 */
 	changeColor(color?: string, skipQuickPick?: boolean): Promise<string | undefined>;
 
-	/**
-	 * Triggers a quick pick that displays recent commands or cwds. Selecting one will
-	 * rerun it in the active terminal.
-	 */
-	runRecent(type: 'command' | 'cwd'): Promise<void>;
-
 	/**
 	 * Attempts to detect and kill the process listening on specified port.
 	 * If successful, places commandToRun on the command line
@@ -1034,6 +1045,21 @@ export interface ITerminalInstance extends IBaseTerminalInstance {
 	 * Update the parent context key service to use for this terminal instance.
 	 */
 	setParentContextKeyService(parentContextKeyService: IContextKeyService): void;
+
+	/**
+	 * Handles a mouse event for the terminal, this may happen on an anscestor of the terminal
+	 * instance's element.
+	 * @param event The mouse event.
+	 * @param contextMenu The context menu to show if needed.
+	 * @returns Whether the context menu should be suppressed.
+	 */
+	handleMouseEvent(event: MouseEvent, contextMenu: IMenu): Promise<{ cancelContextMenu: boolean } | void>;
+
+	/**
+	 * Pause input events until the provided barrier is resolved.
+	 * @param barrier The barrier to wait for until input events can continue.
+	 */
+	pauseInputEvents(barrier: Barrier): void;
 }
 
 export const enum XtermTerminalConstants {
diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.web.contribution.ts b/src/vs/workbench/contrib/terminal/browser/terminal.web.contribution.ts
index ba94df376a0..31f5fd1b0a1 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminal.web.contribution.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminal.web.contribution.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { KeybindingWeight, KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ITerminalProfileResolverService, TerminalCommandId } from 'vs/workbench/contrib/terminal/common/terminal';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { BrowserTerminalProfileResolverService } from 'vs/workbench/contrib/terminal/browser/terminalProfileResolverService';
-import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { KeybindingWeight, KeybindingsRegistry } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ITerminalProfileResolverService, TerminalCommandId } from '../common/terminal.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { BrowserTerminalProfileResolverService } from './terminalProfileResolverService.js';
+import { TerminalContextKeys } from '../common/terminalContextKey.js';
 
 registerSingleton(ITerminalProfileResolverService, BrowserTerminalProfileResolverService, InstantiationType.Delayed);
 
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalActions.ts b/src/vs/workbench/contrib/terminal/browser/terminalActions.ts
index 11401eecf70..ab76ef338b2 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalActions.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalActions.ts
@@ -3,68 +3,66 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BrowserFeatures } from 'vs/base/browser/canIUse';
-import { Action } from 'vs/base/common/actions';
-import { Codicon } from 'vs/base/common/codicons';
-import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Schemas } from 'vs/base/common/network';
-import { isLinux, isWindows } from 'vs/base/common/platform';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { isObject, isString } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { EndOfLinePreference } from 'vs/editor/common/model';
-import { localize, localize2 } from 'vs/nls';
-import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from 'vs/platform/accessibility/common/accessibility';
-import { Action2, registerAction2, IAction2Options, MenuId } from 'vs/platform/actions/common/actions';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { IListService } from 'vs/platform/list/browser/listService';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IPickOptions, IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { ITerminalProfile, TerminalExitReason, TerminalIcon, TerminalLocation, TerminalSettingId } from 'vs/platform/terminal/common/terminal';
-import { IWorkspaceContextService, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { PICK_WORKSPACE_FOLDER_COMMAND_ID } from 'vs/workbench/browser/actions/workspaceCommands';
-import { CLOSE_EDITOR_COMMAND_ID } from 'vs/workbench/browser/parts/editor/editorCommands';
-import { Direction, ICreateTerminalOptions, IDetachedTerminalInstance, ITerminalConfigurationService, ITerminalEditorService, ITerminalGroupService, ITerminalInstance, ITerminalInstanceService, ITerminalService, IXtermTerminal } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { TerminalQuickAccessProvider } from 'vs/workbench/contrib/terminal/browser/terminalQuickAccess';
-import { IRemoteTerminalAttachTarget, ITerminalProfileResolverService, ITerminalProfileService, TERMINAL_VIEW_ID, TerminalCommandId } from 'vs/workbench/contrib/terminal/common/terminal';
-import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey';
-import { createProfileSchemaEnums } from 'vs/platform/terminal/common/terminalProfiles';
-import { terminalStrings } from 'vs/workbench/contrib/terminal/common/terminalStrings';
-import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IHistoryService } from 'vs/workbench/services/history/common/history';
-import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { isAbsolute } from 'vs/base/common/path';
-import { AbstractVariableResolverService } from 'vs/workbench/services/configurationResolver/common/variableResolver';
-import { ITerminalQuickPickItem } from 'vs/workbench/contrib/terminal/browser/terminalProfileQuickpick';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { getIconId, getColorClass, getUriClasses } from 'vs/workbench/contrib/terminal/browser/terminalIcon';
-import { clearShellFileHistory, getCommandHistory } from 'vs/workbench/contrib/terminal/common/history';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { dirname } from 'vs/base/common/resources';
-import { getIconClasses } from 'vs/editor/common/services/getIconClasses';
-import { FileKind } from 'vs/platform/files/common/files';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { killTerminalIcon, newTerminalIcon } from 'vs/workbench/contrib/terminal/browser/terminalIcons';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { Iterable } from 'vs/base/common/iterator';
-import { accessibleViewCurrentProviderId, accessibleViewIsShown, accessibleViewOnLastLine } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { isKeyboardEvent, isMouseEvent, isPointerEvent } from 'vs/base/browser/dom';
-import { editorGroupToColumn } from 'vs/workbench/services/editor/common/editorGroupColumn';
-import { InstanceContext } from 'vs/workbench/contrib/terminal/browser/terminalContextMenu';
-import { AccessibleViewProviderId } from 'vs/platform/accessibility/browser/accessibleView';
+import { BrowserFeatures } from '../../../../base/browser/canIUse.js';
+import { Action } from '../../../../base/common/actions.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { KeyChord, KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { isLinux, isWindows } from '../../../../base/common/platform.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { isObject, isString } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { EndOfLinePreference } from '../../../../editor/common/model.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from '../../../../platform/accessibility/common/accessibility.js';
+import { Action2, registerAction2, IAction2Options, MenuId } from '../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { IListService } from '../../../../platform/list/browser/listService.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IPickOptions, IQuickInputService, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
+import { ITerminalProfile, TerminalExitReason, TerminalIcon, TerminalLocation, TerminalSettingId } from '../../../../platform/terminal/common/terminal.js';
+import { IWorkspaceContextService, IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
+import { PICK_WORKSPACE_FOLDER_COMMAND_ID } from '../../../browser/actions/workspaceCommands.js';
+import { CLOSE_EDITOR_COMMAND_ID } from '../../../browser/parts/editor/editorCommands.js';
+import { Direction, ICreateTerminalOptions, IDetachedTerminalInstance, ITerminalConfigurationService, ITerminalEditorService, ITerminalGroupService, ITerminalInstance, ITerminalInstanceService, ITerminalService, IXtermTerminal } from './terminal.js';
+import { IRemoteTerminalAttachTarget, ITerminalProfileResolverService, ITerminalProfileService, TERMINAL_VIEW_ID, TerminalCommandId } from '../common/terminal.js';
+import { TerminalContextKeys } from '../common/terminalContextKey.js';
+import { createProfileSchemaEnums } from '../../../../platform/terminal/common/terminalProfiles.js';
+import { terminalStrings } from '../common/terminalStrings.js';
+import { IConfigurationResolverService } from '../../../services/configurationResolver/common/configurationResolver.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { IHistoryService } from '../../../services/history/common/history.js';
+import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
+import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';
+import { SIDE_GROUP } from '../../../services/editor/common/editorService.js';
+import { isAbsolute } from '../../../../base/common/path.js';
+import { AbstractVariableResolverService } from '../../../services/configurationResolver/common/variableResolver.js';
+import { ITerminalQuickPickItem } from './terminalProfileQuickpick.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { getIconId, getColorClass, getUriClasses } from './terminalIcon.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { dirname } from '../../../../base/common/resources.js';
+import { getIconClasses } from '../../../../editor/common/services/getIconClasses.js';
+import { FileKind } from '../../../../platform/files/common/files.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { TerminalCapability } from '../../../../platform/terminal/common/capabilities/capabilities.js';
+import { killTerminalIcon, newTerminalIcon } from './terminalIcons.js';
+import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { accessibleViewCurrentProviderId, accessibleViewIsShown, accessibleViewOnLastLine } from '../../accessibility/browser/accessibilityConfiguration.js';
+import { isKeyboardEvent, isMouseEvent, isPointerEvent } from '../../../../base/browser/dom.js';
+import { editorGroupToColumn } from '../../../services/editor/common/editorGroupColumn.js';
+import { InstanceContext } from './terminalContextMenu.js';
+import { AccessibleViewProviderId } from '../../../../platform/accessibility/browser/accessibleView.js';
 
 export const switchTerminalActionViewItemSeparator = '\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500';
 export const switchTerminalShowTabsTitle = localize('showTerminalTabs', "Show Tabs");
@@ -434,33 +432,6 @@ export function registerTerminalActions() {
 		}
 	});
 
-	registerActiveInstanceAction({
-		id: TerminalCommandId.RunRecentCommand,
-		title: localize2('workbench.action.terminal.runRecentCommand', 'Run Recent Command...'),
-		precondition: sharedWhenClause.terminalAvailable,
-		keybinding: [
-			{
-				primary: KeyMod.CtrlCmd | KeyCode.KeyR,
-				when: ContextKeyExpr.and(CONTEXT_ACCESSIBILITY_MODE_ENABLED, ContextKeyExpr.or(TerminalContextKeys.focus, ContextKeyExpr.and(accessibleViewIsShown, accessibleViewCurrentProviderId.isEqualTo(AccessibleViewProviderId.Terminal)))),
-				weight: KeybindingWeight.WorkbenchContrib
-			},
-			{
-				primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyR,
-				mac: { primary: KeyMod.WinCtrl | KeyMod.Alt | KeyCode.KeyR },
-				when: ContextKeyExpr.and(TerminalContextKeys.focus, CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
-				weight: KeybindingWeight.WorkbenchContrib
-			}
-		],
-		run: async (activeInstance, c) => {
-			await activeInstance.runRecent('command');
-			if (activeInstance?.target === TerminalLocation.Editor) {
-				await c.editorService.revealActiveEditor();
-			} else {
-				await c.groupService.showPanel(false);
-			}
-		}
-	});
-
 	registerActiveInstanceAction({
 		id: TerminalCommandId.CopyLastCommand,
 		title: localize2('workbench.action.terminal.copyLastCommand', "Copy Last Command"),
@@ -521,29 +492,6 @@ export function registerTerminalActions() {
 		}
 	});
 
-
-	registerActiveInstanceAction({
-		id: TerminalCommandId.GoToRecentDirectory,
-		title: localize2('workbench.action.terminal.goToRecentDirectory', 'Go to Recent Directory...'),
-		metadata: {
-			description: localize2('goToRecentDirectory.metadata', 'Goes to a recent folder'),
-		},
-		precondition: sharedWhenClause.terminalAvailable,
-		keybinding: {
-			primary: KeyMod.CtrlCmd | KeyCode.KeyG,
-			when: TerminalContextKeys.focus,
-			weight: KeybindingWeight.WorkbenchContrib
-		},
-		run: async (activeInstance, c) => {
-			await activeInstance.runRecent('cwd');
-			if (activeInstance?.target === TerminalLocation.Editor) {
-				await c.editorService.revealActiveEditor();
-			} else {
-				await c.groupService.showPanel(false);
-			}
-		}
-	});
-
 	registerTerminalAction({
 		id: TerminalCommandId.ResizePaneLeft,
 		title: localize2('workbench.action.terminal.resizePaneLeft', 'Resize Terminal Left'),
@@ -969,13 +917,6 @@ export function registerTerminalActions() {
 		}
 	});
 
-	registerTerminalAction({
-		id: TerminalCommandId.QuickOpenTerm,
-		title: localize2('quickAccessTerminal', 'Switch Active Terminal'),
-		precondition: sharedWhenClause.terminalAvailable,
-		run: (c, accessor) => accessor.get(IQuickInputService).quickAccess.show(TerminalQuickAccessProvider.PREFIX)
-	});
-
 	registerActiveInstanceAction({
 		id: TerminalCommandId.ScrollToPreviousCommand,
 		title: terminalStrings.scrollToPreviousCommand,
@@ -1510,17 +1451,6 @@ export function registerTerminalActions() {
 		},
 		run: (instance) => instance.toggleSizeToContentWidth()
 	});
-
-	registerTerminalAction({
-		id: TerminalCommandId.ClearPreviousSessionHistory,
-		title: localize2('workbench.action.terminal.clearPreviousSessionHistory', 'Clear Previous Session History'),
-		precondition: sharedWhenClause.terminalAvailable,
-		run: async (c, accessor) => {
-			getCommandHistory(accessor).clear();
-			clearShellFileHistory();
-		}
-	});
-
 	// Some commands depend on platform features
 	if (BrowserFeatures.clipboard.writeText) {
 		registerActiveXtermAction({
@@ -1851,7 +1781,7 @@ async function pickTerminalCwd(accessor: ServicesAccessor, cancel?: Cancellation
 		return;
 	}
 
-	const folderCwdPairs = await Promise.all(folders.map(x => resolveWorkspaceFolderCwd(x, configurationService, configurationResolverService)));
+	const folderCwdPairs = await Promise.all(folders.map(e => resolveWorkspaceFolderCwd(e, configurationService, configurationResolverService)));
 	const shrinkedPairs = shrinkWorkspaceFolderCwdPairs(folderCwdPairs);
 
 	if (shrinkedPairs.length === 1) {
@@ -1891,7 +1821,7 @@ async function resolveWorkspaceFolderCwd(folder: IWorkspaceFolder, configuration
 
 	const resolvedCwdConfig = await configurationResolverService.resolveAsync(folder, cwdConfig);
 	return isAbsolute(resolvedCwdConfig) || resolvedCwdConfig.startsWith(AbstractVariableResolverService.VARIABLE_LHS)
-		? { folder, isAbsolute: true, isOverridden: true, cwd: URI.from({ scheme: folder.uri.scheme, path: resolvedCwdConfig }) }
+		? { folder, isAbsolute: true, isOverridden: true, cwd: URI.from({ ...folder.uri, path: resolvedCwdConfig }) }
 		: { folder, isAbsolute: false, isOverridden: true, cwd: URI.joinPath(folder.uri, resolvedCwdConfig) };
 }
 
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalCommands.ts b/src/vs/workbench/contrib/terminal/browser/terminalCommands.ts
index 075e866f36d..248fa9a5d9c 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalCommands.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalCommands.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ITerminalGroupService } from 'vs/workbench/contrib/terminal/browser/terminal';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ITerminalGroupService } from './terminal.js';
 
 export function setupTerminalCommands(): void {
 	registerOpenTerminalAtIndexCommands();
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalConfigurationService.ts b/src/vs/workbench/contrib/terminal/browser/terminalConfigurationService.ts
index 68f404ddad8..538d9982983 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalConfigurationService.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalConfigurationService.ts
@@ -3,13 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { EDITOR_FONT_DEFAULTS, type IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ITerminalConfigurationService, LinuxDistro } from 'vs/workbench/contrib/terminal/browser/terminal';
-import type { IXtermCore } from 'vs/workbench/contrib/terminal/browser/xterm-private';
-import { DEFAULT_BOLD_FONT_WEIGHT, DEFAULT_FONT_WEIGHT, DEFAULT_LETTER_SPACING, DEFAULT_LINE_HEIGHT, FontWeight, ITerminalConfiguration, MAXIMUM_FONT_WEIGHT, MINIMUM_FONT_WEIGHT, MINIMUM_LETTER_SPACING, TERMINAL_CONFIG_SECTION, type ITerminalFont } from 'vs/workbench/contrib/terminal/common/terminal';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { EDITOR_FONT_DEFAULTS, type IEditorOptions } from '../../../../editor/common/config/editorOptions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ITerminalConfigurationService, LinuxDistro } from './terminal.js';
+import type { IXtermCore } from './xterm-private.js';
+import { DEFAULT_BOLD_FONT_WEIGHT, DEFAULT_FONT_WEIGHT, DEFAULT_LETTER_SPACING, DEFAULT_LINE_HEIGHT, FontWeight, ITerminalConfiguration, MAXIMUM_FONT_WEIGHT, MINIMUM_FONT_WEIGHT, MINIMUM_LETTER_SPACING, TERMINAL_CONFIG_SECTION, type ITerminalFont } from '../common/terminal.js';
+import { isMacintosh } from '../../../../base/common/platform.js';
 
 // #region TerminalConfigurationService
 
@@ -18,7 +19,7 @@ export class TerminalConfigurationService extends Disposable implements ITermina
 
 	protected _fontMetrics: TerminalFontMetrics;
 
-	private _config!: Readonly<ITerminalConfiguration>;
+	protected _config!: Readonly<ITerminalConfiguration>;
 	get config() { return this._config; }
 
 	private readonly _onConfigChanged = new Emitter<void>();
@@ -29,7 +30,7 @@ export class TerminalConfigurationService extends Disposable implements ITermina
 	) {
 		super();
 
-		this._fontMetrics = this._register(new TerminalFontMetrics(this, _configurationService));
+		this._fontMetrics = this._register(new TerminalFontMetrics(this, this._configurationService));
 
 		this._register(Event.runAndSubscribe(this._configurationService.onDidChangeConfiguration, e => {
 			if (!e || e.affectsConfiguration(TERMINAL_CONFIG_SECTION)) {
@@ -67,7 +68,7 @@ const enum FontConstants {
 	MaximumFontSize = 100,
 }
 
-class TerminalFontMetrics extends Disposable {
+export class TerminalFontMetrics extends Disposable {
 	private _panelContainer: HTMLElement | undefined;
 	private _charMeasureElement: HTMLElement | undefined;
 	private _lastFontMeasurement: ITerminalFont | undefined;
@@ -107,7 +108,7 @@ class TerminalFontMetrics extends Disposable {
 	getFont(w: Window, xtermCore?: IXtermCore, excludeDimensions?: boolean): ITerminalFont {
 		const editorConfig = this._configurationService.getValue<IEditorOptions>('editor');
 
-		let fontFamily = this._terminalConfigurationService.config.fontFamily || editorConfig.fontFamily || EDITOR_FONT_DEFAULTS.fontFamily;
+		let fontFamily = this._terminalConfigurationService.config.fontFamily || editorConfig.fontFamily || EDITOR_FONT_DEFAULTS.fontFamily || 'monospace';
 		let fontSize = clampInt(this._terminalConfigurationService.config.fontSize, FontConstants.MinimumFontSize, FontConstants.MaximumFontSize, EDITOR_FONT_DEFAULTS.fontSize);
 
 		// Work around bad font on Fedora/Ubuntu
@@ -126,6 +127,13 @@ class TerminalFontMetrics extends Disposable {
 		// Always fallback to monospace, otherwise a proportional font may become the default
 		fontFamily += ', monospace';
 
+		// Always fallback to AppleBraille on macOS, otherwise braille will render with filled and
+		// empty circles in all 8 positions, instead of just filled circles
+		// See https://github.com/microsoft/vscode/issues/174521
+		if (isMacintosh) {
+			fontFamily += ', AppleBraille';
+		}
+
 		const letterSpacing = this._terminalConfigurationService.config.letterSpacing ? Math.max(Math.floor(this._terminalConfigurationService.config.letterSpacing), MINIMUM_LETTER_SPACING) : DEFAULT_LETTER_SPACING;
 		const lineHeight = this._terminalConfigurationService.config.lineHeight ? Math.max(this._terminalConfigurationService.config.lineHeight, 1) : DEFAULT_LINE_HEIGHT;
 
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalContextMenu.ts b/src/vs/workbench/contrib/terminal/browser/terminalContextMenu.ts
index 6a8b0097e43..eb3eab78e93 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalContextMenu.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalContextMenu.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { ActionRunner, IAction } from 'vs/base/common/actions';
-import { asArray } from 'vs/base/common/arrays';
-import { MarshalledId } from 'vs/base/common/marshallingIds';
-import { SingleOrMany } from 'vs/base/common/types';
-import { createAndFillInContextMenuActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IMenu } from 'vs/platform/actions/common/actions';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { ITerminalInstance } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { ISerializedTerminalInstanceContext } from 'vs/workbench/contrib/terminal/common/terminal';
+import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
+import { ActionRunner, IAction } from '../../../../base/common/actions.js';
+import { asArray } from '../../../../base/common/arrays.js';
+import { MarshalledId } from '../../../../base/common/marshallingIds.js';
+import { SingleOrMany } from '../../../../base/common/types.js';
+import { createAndFillInContextMenuActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IMenu } from '../../../../platform/actions/common/actions.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { ITerminalInstance } from './terminal.js';
+import { ISerializedTerminalInstanceContext } from '../common/terminal.js';
 
 /**
  * A context that is passed to actions as arguments to represent the terminal instance(s) being
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalContribExports.ts b/src/vs/workbench/contrib/terminal/browser/terminalContribExports.ts
deleted file mode 100644
index 3f8dd46a31a..00000000000
--- a/src/vs/workbench/contrib/terminal/browser/terminalContribExports.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-// This is a one-off/safe import, to expose to outside contfibs as in general we don't want them
-// to touch terminalContrib either.
-// eslint-disable-next-line local/code-import-patterns
-export { TerminalChatController } from 'vs/workbench/contrib/terminalContrib/chat/browser/terminalChatController';
-// eslint-disable-next-line local/code-import-patterns
-export { TerminalChatContextKeys } from 'vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalEditor.ts b/src/vs/workbench/contrib/terminal/browser/terminalEditor.ts
index 06e6be5305e..78c426e364a 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalEditor.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalEditor.ts
@@ -3,34 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { IActionViewItem } from 'vs/base/browser/ui/actionbar/actionbar';
-import { Action, IAction } from 'vs/base/common/actions';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { DropdownWithPrimaryActionViewItem } from 'vs/platform/actions/browser/dropdownWithPrimaryActionViewItem';
-import { IMenu, IMenuService, MenuId, MenuItemAction } from 'vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IEditorOptions } from 'vs/platform/editor/common/editor';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
-import { IEditorOpenContext } from 'vs/workbench/common/editor';
-import { ITerminalConfigurationService, ITerminalEditorService, ITerminalService, terminalEditorId } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { TerminalEditorInput } from 'vs/workbench/contrib/terminal/browser/terminalEditorInput';
-import { getTerminalActionBarArgs } from 'vs/workbench/contrib/terminal/browser/terminalMenus';
-import { ITerminalProfileResolverService, ITerminalProfileService, TerminalCommandId } from 'vs/workbench/contrib/terminal/common/terminal';
-import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { isMacintosh } from 'vs/base/common/platform';
-import { BrowserFeatures } from 'vs/base/browser/canIUse';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { openContextMenu } from 'vs/workbench/contrib/terminal/browser/terminalContextMenu';
-import { ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/browser/layoutService';
-import { IBaseActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import * as dom from '../../../../base/browser/dom.js';
+import { IActionViewItem } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { Action, IAction } from '../../../../base/common/actions.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { DropdownWithPrimaryActionViewItem } from '../../../../platform/actions/browser/dropdownWithPrimaryActionViewItem.js';
+import { IMenu, IMenuService, MenuId, MenuItemAction } from '../../../../platform/actions/common/actions.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { EditorPane } from '../../../browser/parts/editor/editorPane.js';
+import { IEditorOpenContext } from '../../../common/editor.js';
+import { ITerminalConfigurationService, ITerminalEditorService, ITerminalService, terminalEditorId } from './terminal.js';
+import { TerminalEditorInput } from './terminalEditorInput.js';
+import { getTerminalActionBarArgs } from './terminalMenus.js';
+import { ITerminalProfileResolverService, ITerminalProfileService, TerminalCommandId } from '../common/terminal.js';
+import { IEditorGroup } from '../../../services/editor/common/editorGroupsService.js';
+import { openContextMenu } from './terminalContextMenu.js';
+import { ACTIVE_GROUP } from '../../../services/editor/common/editorService.js';
+import { IWorkbenchLayoutService, Parts } from '../../../services/layout/browser/layoutService.js';
+import { IBaseActionViewItemOptions } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
 
 export class TerminalEditor extends EditorPane {
 
@@ -62,7 +59,6 @@ export class TerminalEditor extends EditorPane {
 		@IMenuService menuService: IMenuService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IContextMenuService private readonly _contextMenuService: IContextMenuService,
-		@INotificationService private readonly _notificationService: INotificationService,
 		@ITerminalProfileService private readonly _terminalProfileService: ITerminalProfileService,
 		@IWorkbenchLayoutService private readonly _workbenchLayoutService: IWorkbenchLayoutService
 	) {
@@ -124,56 +120,9 @@ export class TerminalEditor extends EditorPane {
 		}
 		this._register(dom.addDisposableListener(this._editorInstanceElement, 'mousedown', async (event: MouseEvent) => {
 			const terminal = this._terminalEditorService.activeInstance;
-			if (this._terminalEditorService.instances.length === 0 || !terminal) {
-				return;
-			}
-
-			if (event.which === 2) {
-				switch (this._terminalConfigurationService.config.middleClickBehavior) {
-					case 'paste':
-						terminal.paste();
-						break;
-					case 'default':
-					default:
-						// Drop selection and focus terminal on Linux to enable middle button paste
-						// when click occurs on the selection itself.
-						terminal.focus();
-						break;
-				}
-			} else if (event.which === 3) {
-				const rightClickBehavior = this._terminalConfigurationService.config.rightClickBehavior;
-				if (rightClickBehavior === 'nothing') {
-					if (!event.shiftKey) {
-						this._cancelContextMenu = true;
-					}
-					return;
-				}
-				else if (rightClickBehavior === 'copyPaste' || rightClickBehavior === 'paste') {
-					// copyPaste: Shift+right click should open context menu
-					if (rightClickBehavior === 'copyPaste' && event.shiftKey) {
-						openContextMenu(this.window, event, this._editorInput?.terminalInstance, this._instanceMenu, this._contextMenuService);
-						return;
-					}
-
-					if (rightClickBehavior === 'copyPaste' && terminal.hasSelection()) {
-						await terminal.copySelection();
-						terminal.clearSelection();
-					} else {
-						if (BrowserFeatures.clipboard.readText) {
-							terminal.paste();
-						} else {
-							this._notificationService.info(`This browser doesn't support the clipboard.readText API needed to trigger a paste, try ${isMacintosh ? '⌘' : 'Ctrl'}+V instead.`);
-						}
-					}
-					// Clear selection after all click event bubbling is finished on Mac to prevent
-					// right-click selecting a word which is seemed cannot be disabled. There is a
-					// flicker when pasting but this appears to give the best experience if the
-					// setting is enabled.
-					if (isMacintosh) {
-						setTimeout(() => {
-							terminal.clearSelection();
-						}, 0);
-					}
+			if (this._terminalEditorService.instances.length > 0 && terminal) {
+				const result = await terminal.handleMouseEvent(event, this._instanceMenu);
+				if (typeof result === 'object' && result.cancelContextMenu) {
 					this._cancelContextMenu = true;
 				}
 			}
@@ -219,7 +168,7 @@ export class TerminalEditor extends EditorPane {
 					const location = { viewColumn: ACTIVE_GROUP };
 					const actions = getTerminalActionBarArgs(location, this._terminalProfileService.availableProfiles, this._getDefaultProfileName(), this._terminalProfileService.contributedProfiles, this._terminalService, this._dropdownMenu);
 					this._registerDisposableActions(actions.dropdownAction, actions.dropdownMenuActions);
-					const button = this._instantiationService.createInstance(DropdownWithPrimaryActionViewItem, action, actions.dropdownAction, actions.dropdownMenuActions, actions.className, this._contextMenuService, { hoverDelegate: options.hoverDelegate });
+					const button = this._instantiationService.createInstance(DropdownWithPrimaryActionViewItem, action, actions.dropdownAction, actions.dropdownMenuActions, actions.className, { hoverDelegate: options.hoverDelegate });
 					return button;
 				}
 			}
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalEditorInput.ts b/src/vs/workbench/contrib/terminal/browser/terminalEditorInput.ts
index 1203a986668..55d42e4da9e 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalEditorInput.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalEditorInput.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import Severity from 'vs/base/common/severity';
-import { dispose, toDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { EditorInputCapabilities, IEditorIdentifier, IUntypedEditorInput } from 'vs/workbench/common/editor';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { EditorInput, IEditorCloseHandler } from 'vs/workbench/common/editor/editorInput';
-import { ITerminalInstance, ITerminalInstanceService, terminalEditorId } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { getColorClass, getUriClasses } from 'vs/workbench/contrib/terminal/browser/terminalIcon';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IShellLaunchConfig, TerminalExitReason, TerminalLocation, TerminalSettingId } from 'vs/platform/terminal/common/terminal';
-import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { ILifecycleService, ShutdownReason, WillShutdownEvent } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { ConfirmOnKill } from 'vs/workbench/contrib/terminal/common/terminal';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey';
-import { ConfirmResult, IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { Emitter } from 'vs/base/common/event';
+import { localize } from '../../../../nls.js';
+import Severity from '../../../../base/common/severity.js';
+import { dispose, toDisposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { EditorInputCapabilities, IEditorIdentifier, IUntypedEditorInput } from '../../../common/editor.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { EditorInput, IEditorCloseHandler } from '../../../common/editor/editorInput.js';
+import { ITerminalInstance, ITerminalInstanceService, terminalEditorId } from './terminal.js';
+import { getColorClass, getUriClasses } from './terminalIcon.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IShellLaunchConfig, TerminalExitReason, TerminalLocation, TerminalSettingId } from '../../../../platform/terminal/common/terminal.js';
+import { IEditorGroup } from '../../../services/editor/common/editorGroupsService.js';
+import { ILifecycleService, ShutdownReason, WillShutdownEvent } from '../../../services/lifecycle/common/lifecycle.js';
+import { ConfirmOnKill } from '../common/terminal.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { TerminalContextKeys } from '../common/terminalContextKey.js';
+import { ConfirmResult, IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { Emitter } from '../../../../base/common/event.js';
 
 export class TerminalEditorInput extends EditorInput implements IEditorCloseHandler {
 
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalEditorSerializer.ts b/src/vs/workbench/contrib/terminal/browser/terminalEditorSerializer.ts
index 72200823f2e..d59f618e611 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalEditorSerializer.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalEditorSerializer.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IEditorSerializer } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { ISerializedTerminalEditorInput, ITerminalEditorService, ITerminalInstance } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { TerminalEditorInput } from 'vs/workbench/contrib/terminal/browser/terminalEditorInput';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IEditorSerializer } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { ISerializedTerminalEditorInput, ITerminalEditorService, ITerminalInstance } from './terminal.js';
+import { TerminalEditorInput } from './terminalEditorInput.js';
 
 export class TerminalInputSerializer implements IEditorSerializer {
 	constructor(
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalEditorService.ts b/src/vs/workbench/contrib/terminal/browser/terminalEditorService.ts
index bc78184a8d9..8ded5d4bd03 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalEditorService.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalEditorService.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { Disposable, dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { EditorActivation } from 'vs/platform/editor/common/editor';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IShellLaunchConfig, TerminalLocation } from 'vs/platform/terminal/common/terminal';
-import { IEditorPane } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { IDeserializedTerminalEditorInput, ITerminalEditorService, ITerminalInstance, ITerminalInstanceService, TerminalEditorLocation } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { TerminalEditorInput } from 'vs/workbench/contrib/terminal/browser/terminalEditorInput';
-import { getInstanceFromResource } from 'vs/workbench/contrib/terminal/browser/terminalUri';
-import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorService, ACTIVE_GROUP, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable, dispose, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { EditorActivation } from '../../../../platform/editor/common/editor.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IShellLaunchConfig, TerminalLocation } from '../../../../platform/terminal/common/terminal.js';
+import { IEditorPane } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { IDeserializedTerminalEditorInput, ITerminalEditorService, ITerminalInstance, ITerminalInstanceService, TerminalEditorLocation } from './terminal.js';
+import { TerminalEditorInput } from './terminalEditorInput.js';
+import { getInstanceFromResource } from './terminalUri.js';
+import { TerminalContextKeys } from '../common/terminalContextKey.js';
+import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { IEditorService, ACTIVE_GROUP, SIDE_GROUP } from '../../../services/editor/common/editorService.js';
+import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.js';
 
 export class TerminalEditorService extends Disposable implements ITerminalEditorService {
 	declare _serviceBrand: undefined;
@@ -124,6 +124,10 @@ export class TerminalEditorService extends Disposable implements ITerminalEditor
 		this._onDidChangeActiveInstance.fire(this.activeInstance);
 	}
 
+	async focusInstance(instance: ITerminalInstance): Promise<void> {
+		return instance.focusWhenReady(true);
+	}
+
 	async focusActiveInstance(): Promise<void> {
 		return this.activeInstance?.focusWhenReady(true);
 	}
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalEvents.ts b/src/vs/workbench/contrib/terminal/browser/terminalEvents.ts
index dc1d7a2c515..46b4481f968 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalEvents.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalEvents.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ITerminalInstance } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { DynamicListEventMultiplexer, Event, EventMultiplexer, IDynamicListEventMultiplexer } from 'vs/base/common/event';
-import { DisposableMap, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { ITerminalCapabilityImplMap, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
+import { ITerminalInstance } from './terminal.js';
+import { DynamicListEventMultiplexer, Event, EventMultiplexer, IDynamicListEventMultiplexer } from '../../../../base/common/event.js';
+import { DisposableMap, DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import { ITerminalCapabilityImplMap, TerminalCapability } from '../../../../platform/terminal/common/capabilities/capabilities.js';
 
 export function createInstanceCapabilityEventMultiplexer<T extends TerminalCapability, K>(
 	currentInstances: ITerminalInstance[],
@@ -17,14 +17,19 @@ export function createInstanceCapabilityEventMultiplexer<T extends TerminalCapab
 ): IDynamicListEventMultiplexer<{ instance: ITerminalInstance; data: K }> {
 	const store = new DisposableStore();
 	const multiplexer = store.add(new EventMultiplexer<{ instance: ITerminalInstance; data: K }>());
-	const capabilityListeners = store.add(new DisposableMap<ITerminalCapabilityImplMap[T], IDisposable>());
+	const capabilityListeners = store.add(new DisposableMap<number, DisposableMap<ITerminalCapabilityImplMap[T], IDisposable>>());
 
 	function addCapability(instance: ITerminalInstance, capability: ITerminalCapabilityImplMap[T]) {
 		const listener = multiplexer.add(Event.map(getEvent(capability), data => ({ instance, data })));
-		capabilityListeners.set(capability, listener);
+		let instanceCapabilityListeners = capabilityListeners.get(instance.instanceId);
+		if (!instanceCapabilityListeners) {
+			instanceCapabilityListeners = new DisposableMap<ITerminalCapabilityImplMap[T], IDisposable>();
+			capabilityListeners.set(instance.instanceId, instanceCapabilityListeners);
+		}
+		instanceCapabilityListeners.set(capability, listener);
 	}
 
-	// Existing capabilities
+	// Existing instances
 	for (const instance of currentInstances) {
 		const capability = instance.capabilities.get(capabilityId);
 		if (capability) {
@@ -32,6 +37,11 @@ export function createInstanceCapabilityEventMultiplexer<T extends TerminalCapab
 		}
 	}
 
+	// Removed instances
+	store.add(onRemoveInstance(instance => {
+		capabilityListeners.deleteAndDispose(instance.instanceId);
+	}));
+
 	// Added capabilities
 	const addCapabilityMultiplexer = store.add(new DynamicListEventMultiplexer(
 		currentInstances,
@@ -50,11 +60,11 @@ export function createInstanceCapabilityEventMultiplexer<T extends TerminalCapab
 		currentInstances,
 		onAddInstance,
 		onRemoveInstance,
-		instance => instance.capabilities.onDidRemoveCapability
+		instance => Event.map(instance.capabilities.onDidRemoveCapability, changeEvent => ({ instance, changeEvent }))
 	));
 	store.add(removeCapabilityMultiplexer.event(e => {
-		if (e.id === capabilityId) {
-			capabilityListeners.deleteAndDispose(e.capability);
+		if (e.changeEvent.id === capabilityId) {
+			capabilityListeners.get(e.instance.instanceId)?.deleteAndDispose(e.changeEvent.id);
 		}
 	}));
 
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalExtensions.ts b/src/vs/workbench/contrib/terminal/browser/terminalExtensions.ts
index fef25abd326..80dc9f7c9b9 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalExtensions.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalExtensions.ts
@@ -3,29 +3,54 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BrandedService, IConstructorSignature } from 'vs/platform/instantiation/common/instantiation';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IDetachedTerminalInstance, ITerminalContribution, ITerminalInstance } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { TerminalWidgetManager } from 'vs/workbench/contrib/terminal/browser/widgets/widgetManager';
-import { ITerminalProcessInfo, ITerminalProcessManager } from 'vs/workbench/contrib/terminal/common/terminal';
+import { BrandedService, IConstructorSignature } from '../../../../platform/instantiation/common/instantiation.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IDetachedTerminalInstance, ITerminalContribution, ITerminalInstance } from './terminal.js';
+import { TerminalWidgetManager } from './widgets/widgetManager.js';
+import { ITerminalProcessInfo, ITerminalProcessManager } from '../common/terminal.js';
+
+export interface ITerminalContributionContext {
+	instance: ITerminalInstance;
+	processManager: ITerminalProcessManager;
+	widgetManager: TerminalWidgetManager;
+}
+export interface IDetachedCompatibleTerminalContributionContext {
+	instance: IDetachedTerminalInstance;
+	processManager: ITerminalProcessInfo;
+	widgetManager: TerminalWidgetManager;
+}
 
 /** Constructor compatible with full terminal instances, is assignable to {@link DetachedCompatibleTerminalContributionCtor} */
-export type TerminalContributionCtor = IConstructorSignature<ITerminalContribution, [ITerminalInstance, ITerminalProcessManager, TerminalWidgetManager]>;
+export type TerminalContributionCtor = IConstructorSignature<ITerminalContribution, [ITerminalContributionContext]>;
 /** Constructor compatible with detached terminals */
-export type DetachedCompatibleTerminalContributionCtor = IConstructorSignature<ITerminalContribution, [IDetachedTerminalInstance, ITerminalProcessInfo, TerminalWidgetManager]>;
+export type DetachedCompatibleTerminalContributionCtor = IConstructorSignature<ITerminalContribution, [IDetachedCompatibleTerminalContributionContext]>;
 
 export type ITerminalContributionDescription = { readonly id: string } & (
 	| { readonly canRunInDetachedTerminals: false; readonly ctor: TerminalContributionCtor }
 	| { readonly canRunInDetachedTerminals: true; readonly ctor: DetachedCompatibleTerminalContributionCtor }
 );
 
-export function registerTerminalContribution<Services extends BrandedService[]>(id: string, ctor: { new(instance: ITerminalInstance, processManager: ITerminalProcessManager, widgetManager: TerminalWidgetManager, ...services: Services): ITerminalContribution }, canRunInDetachedTerminals?: false): void;
-export function registerTerminalContribution<Services extends BrandedService[]>(id: string, ctor: { new(instance: ITerminalInstance, processManager: ITerminalProcessInfo, widgetManager: TerminalWidgetManager, ...services: Services): ITerminalContribution }, canRunInDetachedTerminals: true): void;
-export function registerTerminalContribution<Services extends BrandedService[]>(id: string, ctor: { new(instance: ITerminalInstance, processManager: ITerminalProcessManager, widgetManager: TerminalWidgetManager, ...services: Services): ITerminalContribution }, canRunInDetachedTerminals = false): void {
-	// eslint-disable-next-line local/code-no-dangerous-type-assertions
+/**
+ * A terminal contribution is a method for extending _each_ terminal created, providing the terminal
+ * instance when it becomes ready and various convenient hooks for xterm.js like when it's opened in
+ * the DOM.
+ * @param id The unique ID of the terminal contribution.
+ * @param ctor The constructor of the terminal contribution.
+ * @param canRunInDetachedTerminals Whether the terminal contribution should be run in detecthed
+ * terminals. Defaults to false.
+ */
+export function registerTerminalContribution<Services extends BrandedService[]>(id: string, ctor: { new(ctx: ITerminalContributionContext, ...services: Services): ITerminalContribution }, canRunInDetachedTerminals?: false): void;
+export function registerTerminalContribution<Services extends BrandedService[]>(id: string, ctor: { new(ctx: IDetachedCompatibleTerminalContributionContext, ...services: Services): ITerminalContribution }, canRunInDetachedTerminals: true): void;
+export function registerTerminalContribution<Services extends BrandedService[]>(id: string, ctor: { new(ctx: any, ...services: Services): ITerminalContribution }, canRunInDetachedTerminals: boolean = false): void {
 	TerminalContributionRegistry.INSTANCE.registerTerminalContribution({ id, ctor, canRunInDetachedTerminals } as ITerminalContributionDescription);
 }
 
+/**
+ * The registry of terminal contributions.
+ *
+ * **WARNING**: This is internal and should only be used by core terminal code that activates the
+ * contributions.
+ */
 export namespace TerminalExtensionsRegistry {
 	export function getTerminalContributions(): ITerminalContributionDescription[] {
 		return TerminalContributionRegistry.INSTANCE.getTerminalContributions();
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalGroup.ts b/src/vs/workbench/contrib/terminal/browser/terminalGroup.ts
index 57848596b73..b8f346ec36d 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalGroup.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalGroup.ts
@@ -3,18 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { TERMINAL_VIEW_ID } from 'vs/workbench/contrib/terminal/common/terminal';
-import { Event, Emitter } from 'vs/base/common/event';
-import { IDisposable, Disposable, DisposableStore, dispose, toDisposable } from 'vs/base/common/lifecycle';
-import { SplitView, Orientation, IView, Sizing } from 'vs/base/browser/ui/splitview/splitview';
-import { IWorkbenchLayoutService, Position } from 'vs/workbench/services/layout/browser/layoutService';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ITerminalInstance, Direction, ITerminalGroup, ITerminalInstanceService, ITerminalConfigurationService } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { ViewContainerLocation, IViewDescriptorService } from 'vs/workbench/common/views';
-import { IShellLaunchConfig, ITerminalTabLayoutInfoById, TerminalLocation } from 'vs/platform/terminal/common/terminal';
-import { TerminalStatus } from 'vs/workbench/contrib/terminal/browser/terminalStatusList';
-import { getWindow } from 'vs/base/browser/dom';
-import { getPartByLocation } from 'vs/workbench/services/views/browser/viewsService';
+import { TERMINAL_VIEW_ID } from '../common/terminal.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { IDisposable, Disposable, DisposableStore, dispose, toDisposable } from '../../../../base/common/lifecycle.js';
+import { SplitView, Orientation, IView, Sizing } from '../../../../base/browser/ui/splitview/splitview.js';
+import { isHorizontal, IWorkbenchLayoutService, Position } from '../../../services/layout/browser/layoutService.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ITerminalInstance, Direction, ITerminalGroup, ITerminalInstanceService, ITerminalConfigurationService } from './terminal.js';
+import { ViewContainerLocation, IViewDescriptorService } from '../../../common/views.js';
+import { IShellLaunchConfig, ITerminalTabLayoutInfoById, TerminalLocation } from '../../../../platform/terminal/common/terminal.js';
+import { TerminalStatus } from './terminalStatusList.js';
+import { getWindow } from '../../../../base/browser/dom.js';
+import { getPartByLocation } from '../../../services/views/browser/viewsService.js';
+import { asArray } from '../../../../base/common/arrays.js';
 
 const enum Constants {
 	/**
@@ -285,7 +286,7 @@ export class TerminalGroup extends Disposable implements ITerminalGroup {
 		if (this._container) {
 			this.attachToElement(this._container);
 		}
-		this._onPanelOrientationChanged.fire(this._terminalLocation === ViewContainerLocation.Panel && this._panelPosition === Position.BOTTOM ? Orientation.HORIZONTAL : Orientation.VERTICAL);
+		this._onPanelOrientationChanged.fire(this._terminalLocation === ViewContainerLocation.Panel && isHorizontal(this._panelPosition) ? Orientation.HORIZONTAL : Orientation.VERTICAL);
 		this._register(toDisposable(() => {
 			if (this._container && this._groupElement) {
 				this._groupElement.remove();
@@ -408,16 +409,24 @@ export class TerminalGroup extends Disposable implements ITerminalGroup {
 		}
 	}
 
-	moveInstance(instance: ITerminalInstance, index: number): void {
-		const sourceIndex = this.terminalInstances.indexOf(instance);
-		if (sourceIndex === -1) {
+	moveInstance(instances: ITerminalInstance | ITerminalInstance[], index: number, position: 'before' | 'after'): void {
+		instances = asArray(instances);
+		const hasInvalidInstance = instances.some(instance => !this.terminalInstances.includes(instance));
+		if (hasInvalidInstance) {
 			return;
 		}
-		this._terminalInstances.splice(sourceIndex, 1);
-		this._terminalInstances.splice(index, 0, instance);
+		const insertIndex = position === 'before' ? index : index + 1;
+		this._terminalInstances.splice(insertIndex, 0, ...instances);
+		for (const item of instances) {
+			const originSourceGroupIndex = position === 'after' ? this._terminalInstances.indexOf(item) : this._terminalInstances.lastIndexOf(item);
+			this._terminalInstances.splice(originSourceGroupIndex, 1);
+		}
 		if (this._splitPaneContainer) {
-			this._splitPaneContainer.remove(instance);
-			this._splitPaneContainer.split(instance, index);
+			for (let i = 0; i < instances.length; i++) {
+				const item = instances[i];
+				this._splitPaneContainer.remove(item);
+				this._splitPaneContainer.split(item, index + (position === 'before' ? i : 0));
+			}
 		}
 		this._onInstancesChanged.fire();
 	}
@@ -466,7 +475,7 @@ export class TerminalGroup extends Disposable implements ITerminalGroup {
 		if (!this._splitPaneContainer) {
 			this._panelPosition = this._layoutService.getPanelPosition();
 			this._terminalLocation = this._viewDescriptorService.getViewLocationById(TERMINAL_VIEW_ID)!;
-			const orientation = this._terminalLocation === ViewContainerLocation.Panel && this._panelPosition === Position.BOTTOM ? Orientation.HORIZONTAL : Orientation.VERTICAL;
+			const orientation = this._terminalLocation === ViewContainerLocation.Panel && isHorizontal(this._panelPosition) ? Orientation.HORIZONTAL : Orientation.VERTICAL;
 			this._splitPaneContainer = this._instantiationService.createInstance(SplitPaneContainer, this._groupElement, orientation);
 			this.terminalInstances.forEach(instance => this._splitPaneContainer!.split(instance, this._activeInstanceIndex + 1));
 		}
@@ -527,7 +536,7 @@ export class TerminalGroup extends Disposable implements ITerminalGroup {
 			const newTerminalLocation = this._viewDescriptorService.getViewLocationById(TERMINAL_VIEW_ID)!;
 			const terminalPositionChanged = newPanelPosition !== this._panelPosition || newTerminalLocation !== this._terminalLocation;
 			if (terminalPositionChanged) {
-				const newOrientation = newTerminalLocation === ViewContainerLocation.Panel && newPanelPosition === Position.BOTTOM ? Orientation.HORIZONTAL : Orientation.VERTICAL;
+				const newOrientation = newTerminalLocation === ViewContainerLocation.Panel && isHorizontal(newPanelPosition) ? Orientation.HORIZONTAL : Orientation.VERTICAL;
 				this._splitPaneContainer.setOrientation(newOrientation);
 				this._panelPosition = newPanelPosition;
 				this._terminalLocation = newTerminalLocation;
@@ -563,7 +572,7 @@ export class TerminalGroup extends Disposable implements ITerminalGroup {
 	}
 
 	private _getOrientation(): Orientation {
-		return this._getPosition() === Position.BOTTOM ? Orientation.HORIZONTAL : Orientation.VERTICAL;
+		return isHorizontal(this._getPosition()) ? Orientation.HORIZONTAL : Orientation.VERTICAL;
 	}
 
 	resizePane(direction: Direction): void {
@@ -588,10 +597,12 @@ export class TerminalGroup extends Disposable implements ITerminalGroup {
 
 			if (shouldResizePart) {
 
+				const position = this._getPosition();
 				const shouldShrink =
-					(this._getPosition() === Position.LEFT && direction === Direction.Left) ||
-					(this._getPosition() === Position.RIGHT && direction === Direction.Right) ||
-					(this._getPosition() === Position.BOTTOM && direction === Direction.Down);
+					(position === Position.LEFT && direction === Direction.Left) ||
+					(position === Position.RIGHT && direction === Direction.Right) ||
+					(position === Position.BOTTOM && direction === Direction.Down) ||
+					(position === Position.TOP && direction === Direction.Up);
 
 				if (shouldShrink) {
 					resizeAmount *= -1;
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalGroupService.ts b/src/vs/workbench/contrib/terminal/browser/terminalGroupService.ts
index e2fefaf2a79..ff4c4103eba 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalGroupService.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalGroupService.ts
@@ -3,22 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Orientation } from 'vs/base/browser/ui/sash/sash';
-import { timeout } from 'vs/base/common/async';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IShellLaunchConfig } from 'vs/platform/terminal/common/terminal';
-import { IViewDescriptorService } from 'vs/workbench/common/views';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { ITerminalGroup, ITerminalGroupService, ITerminalInstance } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { TerminalGroup } from 'vs/workbench/contrib/terminal/browser/terminalGroup';
-import { getInstanceFromResource } from 'vs/workbench/contrib/terminal/browser/terminalUri';
-import { TerminalViewPane } from 'vs/workbench/contrib/terminal/browser/terminalView';
-import { TERMINAL_VIEW_ID } from 'vs/workbench/contrib/terminal/common/terminal';
-import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey';
+import { Orientation } from '../../../../base/browser/ui/sash/sash.js';
+import { timeout } from '../../../../base/common/async.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IShellLaunchConfig } from '../../../../platform/terminal/common/terminal.js';
+import { IViewDescriptorService } from '../../../common/views.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { ITerminalGroup, ITerminalGroupService, ITerminalInstance } from './terminal.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { TerminalGroup } from './terminalGroup.js';
+import { getInstanceFromResource } from './terminalUri.js';
+import { TerminalViewPane } from './terminalView.js';
+import { TERMINAL_VIEW_ID } from '../common/terminal.js';
+import { TerminalContextKeys } from '../common/terminalContextKey.js';
+import { asArray } from '../../../../base/common/arrays.js';
 
 export class TerminalGroupService extends Disposable implements ITerminalGroupService {
 	declare _serviceBrand: undefined;
@@ -35,6 +37,8 @@ export class TerminalGroupService extends Disposable implements ITerminalGroupSe
 
 	private _container: HTMLElement | undefined;
 
+	private _isQuickInputOpened: boolean = false;
+
 	private readonly _onDidChangeActiveGroup = this._register(new Emitter<ITerminalGroup | undefined>());
 	readonly onDidChangeActiveGroup = this._onDidChangeActiveGroup.event;
 	private readonly _onDidDisposeGroup = this._register(new Emitter<ITerminalGroup>());
@@ -62,7 +66,8 @@ export class TerminalGroupService extends Disposable implements ITerminalGroupSe
 		@IContextKeyService private _contextKeyService: IContextKeyService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IViewsService private readonly _viewsService: IViewsService,
-		@IViewDescriptorService private readonly _viewDescriptorService: IViewDescriptorService
+		@IViewDescriptorService private readonly _viewDescriptorService: IViewDescriptorService,
+		@IQuickInputService private readonly _quickInputService: IQuickInputService
 	) {
 		super();
 
@@ -71,6 +76,8 @@ export class TerminalGroupService extends Disposable implements ITerminalGroupSe
 		this._register(this.onDidDisposeGroup(group => this._removeGroup(group)));
 		this._register(this.onDidChangeGroups(() => this._terminalGroupCountContextKey.set(this.groups.length)));
 		this._register(Event.any(this.onDidChangeActiveGroup, this.onDidChangeInstances)(() => this.updateVisibility()));
+		this._register(this._quickInputService.onShow(() => this._isQuickInputOpened = true));
+		this._register(this._quickInputService.onHide(() => this._isQuickInputOpened = false));
 	}
 
 	hidePanel(): void {
@@ -136,25 +143,28 @@ export class TerminalGroupService extends Disposable implements ITerminalGroupSe
 		pane?.terminalTabbedView?.focusHover();
 	}
 
+	async focusInstance(_: ITerminalInstance): Promise<void> {
+		return this.showPanel(true);
+	}
+
 	async focusActiveInstance(): Promise<void> {
 		return this.showPanel(true);
 	}
 
 	createGroup(slcOrInstance?: IShellLaunchConfig | ITerminalInstance): ITerminalGroup {
 		const group = this._instantiationService.createInstance(TerminalGroup, this._container, slcOrInstance);
-		// TODO: Move panel orientation change into this file so it's not fired many times
-		group.onPanelOrientationChanged((orientation) => this._onDidChangePanelOrientation.fire(orientation));
 		this.groups.push(group);
-		group.addDisposable(group.onDidDisposeInstance(this._onDidDisposeInstance.fire, this._onDidDisposeInstance));
-		group.addDisposable(group.onDidFocusInstance(this._onDidFocusInstance.fire, this._onDidFocusInstance));
+		group.addDisposable(Event.forward(group.onPanelOrientationChanged, this._onDidChangePanelOrientation));
+		group.addDisposable(Event.forward(group.onDidDisposeInstance, this._onDidDisposeInstance));
+		group.addDisposable(Event.forward(group.onDidFocusInstance, this._onDidFocusInstance));
+		group.addDisposable(Event.forward(group.onDidChangeInstanceCapability, this._onDidChangeInstanceCapability));
+		group.addDisposable(Event.forward(group.onInstancesChanged, this._onDidChangeInstances));
+		group.addDisposable(Event.forward(group.onDisposed, this._onDidDisposeGroup));
 		group.addDisposable(group.onDidChangeActiveInstance(e => {
 			if (group === this.activeGroup) {
 				this._onDidChangeActiveInstance.fire(e);
 			}
 		}));
-		group.addDisposable(group.onDidChangeInstanceCapability(this._onDidChangeInstanceCapability.fire, this._onDidChangeInstanceCapability));
-		group.addDisposable(group.onInstancesChanged(this._onDidChangeInstances.fire, this._onDidChangeInstances));
-		group.addDisposable(group.onDisposed(this._onDidDisposeGroup.fire, this._onDidDisposeGroup));
 		if (group.terminalInstances.length > 0) {
 			this._onDidChangeInstances.fire();
 		}
@@ -205,7 +215,7 @@ export class TerminalGroupService extends Disposable implements ITerminalGroupSe
 
 		if (wasActiveGroup) {
 			// Adjust focus if the group was active
-			if (this.groups.length > 0) {
+			if (this.groups.length > 0 && !this._isQuickInputOpened) {
 				const newIndex = index < this.groups.length ? index : this.groups.length - 1;
 				this.setActiveGroupByIndex(newIndex, true);
 				this.activeInstance?.focus(true);
@@ -315,40 +325,66 @@ export class TerminalGroupService extends Disposable implements ITerminalGroupSe
 		this.setActiveGroupByIndex(newIndex);
 	}
 
-	moveGroup(source: ITerminalInstance, target: ITerminalInstance) {
-		const sourceGroup = this.getGroupForInstance(source);
-		const targetGroup = this.getGroupForInstance(target);
+	private _getValidTerminalGroups = (sources: ITerminalInstance[]): Set<ITerminalGroup> => {
+		return new Set(
+			sources
+				.map(source => this.getGroupForInstance(source))
+				.filter((group) => group !== undefined)
+		);
+	};
 
-		// Something went wrong
-		if (!sourceGroup || !targetGroup) {
+	moveGroup(source: ITerminalInstance | ITerminalInstance[], target: ITerminalInstance) {
+		source = asArray(source);
+		const sourceGroups = this._getValidTerminalGroups(source);
+		const targetGroup = this.getGroupForInstance(target);
+		if (!targetGroup || sourceGroups.size === 0) {
 			return;
 		}
 
 		// The groups are the same, rearrange within the group
-		if (sourceGroup === targetGroup) {
-			const index = sourceGroup.terminalInstances.indexOf(target);
-			if (index !== -1) {
-				sourceGroup.moveInstance(source, index);
-			}
+		if (sourceGroups.size === 1 && sourceGroups.has(targetGroup)) {
+			const targetIndex = targetGroup.terminalInstances.indexOf(target);
+			const sortedSources = source.sort((a, b) => {
+				return targetGroup.terminalInstances.indexOf(a) - targetGroup.terminalInstances.indexOf(b);
+			});
+			const firstTargetIndex = targetGroup.terminalInstances.indexOf(sortedSources[0]);
+			const position: 'before' | 'after' = firstTargetIndex < targetIndex ? 'after' : 'before';
+			targetGroup.moveInstance(sortedSources, targetIndex, position);
+			this._onDidChangeInstances.fire();
 			return;
 		}
 
 		// The groups differ, rearrange groups
-		const sourceGroupIndex = this.groups.indexOf(sourceGroup);
 		const targetGroupIndex = this.groups.indexOf(targetGroup);
-		this.groups.splice(sourceGroupIndex, 1);
-		this.groups.splice(targetGroupIndex, 0, sourceGroup);
+		const sortedSourceGroups = Array.from(sourceGroups).sort((a, b) => {
+			return this.groups.indexOf(a) - this.groups.indexOf(b);
+		});
+		const firstSourceGroupIndex = this.groups.indexOf(sortedSourceGroups[0]);
+		const position: 'before' | 'after' = firstSourceGroupIndex < targetGroupIndex ? 'after' : 'before';
+		const insertIndex = position === 'after' ? targetGroupIndex + 1 : targetGroupIndex;
+		this.groups.splice(insertIndex, 0, ...sortedSourceGroups);
+		for (const sourceGroup of sortedSourceGroups) {
+			const originSourceGroupIndex = position === 'after' ? this.groups.indexOf(sourceGroup) : this.groups.lastIndexOf(sourceGroup);
+			this.groups.splice(originSourceGroupIndex, 1);
+		}
 		this._onDidChangeInstances.fire();
 	}
 
-	moveGroupToEnd(source: ITerminalInstance): void {
-		const sourceGroup = this.getGroupForInstance(source);
-		if (!sourceGroup) {
+	moveGroupToEnd(source: ITerminalInstance | ITerminalInstance[]): void {
+		source = asArray(source);
+		const sourceGroups = this._getValidTerminalGroups(source);
+		if (sourceGroups.size === 0) {
 			return;
 		}
-		const sourceGroupIndex = this.groups.indexOf(sourceGroup);
-		this.groups.splice(sourceGroupIndex, 1);
-		this.groups.push(sourceGroup);
+		const lastInstanceIndex = this.groups.length - 1;
+		const sortedSourceGroups = Array.from(sourceGroups).sort((a, b) => {
+			return this.groups.indexOf(a) - this.groups.indexOf(b);
+		});
+		this.groups.splice(lastInstanceIndex + 1, 0, ...sortedSourceGroups);
+		for (const sourceGroup of sortedSourceGroups) {
+			const sourceGroupIndex = this.groups.indexOf(sourceGroup);
+			this.groups.splice(sourceGroupIndex, 1);
+		}
 		this._onDidChangeInstances.fire();
 	}
 
@@ -368,7 +404,7 @@ export class TerminalGroupService extends Disposable implements ITerminalGroupSe
 
 		// Rearrange within the target group
 		const index = targetGroup.terminalInstances.indexOf(target) + (side === 'after' ? 1 : 0);
-		targetGroup.moveInstance(source, index);
+		targetGroup.moveInstance(source, index, side);
 	}
 
 	unsplitInstance(instance: ITerminalInstance) {
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalIcon.ts b/src/vs/workbench/contrib/terminal/browser/terminalIcon.ts
index ea676544830..fedb7cd9821 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalIcon.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalIcon.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { hash } from 'vs/base/common/hash';
-import { URI } from 'vs/base/common/uri';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IExtensionTerminalProfile, ITerminalProfile } from 'vs/platform/terminal/common/terminal';
-import { getIconRegistry } from 'vs/platform/theme/common/iconRegistry';
-import { ColorScheme } from 'vs/platform/theme/common/theme';
-import { IColorTheme } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { ITerminalInstance } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { ITerminalProfileResolverService } from 'vs/workbench/contrib/terminal/common/terminal';
-import { ansiColorMap } from 'vs/workbench/contrib/terminal/common/terminalColorRegistry';
-import { createStyleSheet } from 'vs/base/browser/dom';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
+import { hash } from '../../../../base/common/hash.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IExtensionTerminalProfile, ITerminalProfile } from '../../../../platform/terminal/common/terminal.js';
+import { getIconRegistry } from '../../../../platform/theme/common/iconRegistry.js';
+import { ColorScheme } from '../../../../platform/theme/common/theme.js';
+import { IColorTheme } from '../../../../platform/theme/common/themeService.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { ITerminalInstance } from './terminal.js';
+import { ITerminalProfileResolverService } from '../common/terminal.js';
+import { ansiColorMap } from '../common/terminalColorRegistry.js';
+import { createStyleSheet } from '../../../../base/browser/dom.js';
+import { DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
 
 
 export function getColorClass(colorKey: string): string;
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalIconPicker.ts b/src/vs/workbench/contrib/terminal/browser/terminalIconPicker.ts
index b4316d3bad8..4e295a44f37 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalIconPicker.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalIconPicker.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Dimension, getActiveDocument } from 'vs/base/browser/dom';
-import { HoverPosition } from 'vs/base/browser/ui/hover/hoverWidget';
-import { codiconsLibrary } from 'vs/base/common/codiconsLibrary';
-import { Lazy } from 'vs/base/common/lazy';
-import { Disposable } from 'vs/base/common/lifecycle';
-import type { ThemeIcon } from 'vs/base/common/themables';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { defaultInputBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { getIconRegistry, IconContribution } from 'vs/platform/theme/common/iconRegistry';
-import { WorkbenchIconSelectBox } from 'vs/workbench/services/userDataProfile/browser/iconSelectBox';
+import { Dimension, getActiveDocument } from '../../../../base/browser/dom.js';
+import { HoverPosition } from '../../../../base/browser/ui/hover/hoverWidget.js';
+import { codiconsLibrary } from '../../../../base/common/codiconsLibrary.js';
+import { Lazy } from '../../../../base/common/lazy.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import type { ThemeIcon } from '../../../../base/common/themables.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { defaultInputBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { getIconRegistry, IconContribution } from '../../../../platform/theme/common/iconRegistry.js';
+import { WorkbenchIconSelectBox } from '../../../services/userDataProfile/browser/iconSelectBox.js';
 
 const icons = new Lazy<IconContribution[]>(() => {
 	const iconDefinitions = getIconRegistry().getIcons();
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalIcons.ts b/src/vs/workbench/contrib/terminal/browser/terminalIcons.ts
index 319bd19d57d..128ffba2e27 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalIcons.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalIcons.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from 'vs/base/common/codicons';
-import { localize } from 'vs/nls';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { localize } from '../../../../nls.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 
 export const terminalViewIcon = registerIcon('terminal-view-icon', Codicon.terminal, localize('terminalViewIcon', 'View icon of the terminal view.'));
 
-export const renameTerminalIcon = registerIcon('terminal-rename', Codicon.gear, localize('renameTerminalIcon', 'Icon for rename in the terminal quick menu.'));
+export const renameTerminalIcon = registerIcon('terminal-rename', Codicon.edit, localize('renameTerminalIcon', 'Icon for rename in the terminal quick menu.'));
 export const killTerminalIcon = registerIcon('terminal-kill', Codicon.trash, localize('killTerminalIcon', 'Icon for killing a terminal instance.'));
 export const newTerminalIcon = registerIcon('terminal-new', Codicon.add, localize('newTerminalIcon', 'Icon for creating a new terminal instance.'));
 
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
index 9445777d848..0ce1d42d9ee 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
@@ -3,96 +3,95 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isFirefox } from 'vs/base/browser/browser';
-import { BrowserFeatures } from 'vs/base/browser/canIUse';
-import { DataTransfers } from 'vs/base/browser/dnd';
-import * as dom from 'vs/base/browser/dom';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { Orientation } from 'vs/base/browser/ui/sash/sash';
-import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
-import { AutoOpenBarrier, Promises, disposableTimeout, timeout } from 'vs/base/common/async';
-import { Codicon } from 'vs/base/common/codicons';
-import { debounce } from 'vs/base/common/decorators';
-import { ErrorNoTelemetry, onUnexpectedError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { ISeparator, template } from 'vs/base/common/labels';
-import { Disposable, DisposableStore, IDisposable, MutableDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import * as path from 'vs/base/common/path';
-import { OS, OperatingSystem, isMacintosh, isWindows } from 'vs/base/common/platform';
-import { ScrollbarVisibility } from 'vs/base/common/scrollable';
-import { URI } from 'vs/base/common/uri';
-import { TabFocus } from 'vs/editor/browser/config/tabFocus';
-import * as nls from 'vs/nls';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { AccessibilitySignal, IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { CodeDataTransfers, containsDragType } from 'vs/platform/dnd/browser/dnd';
-import { FileSystemProviderCapabilities, IFileService } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ResultKind } from 'vs/platform/keybinding/common/keybindingResolver';
-import { INotificationService, IPromptChoice, Severity } from 'vs/platform/notification/common/notification';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IQuickInputService, IQuickPickItem, QuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IMarkProperties, ITerminalCommand, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { TerminalCapabilityStoreMultiplexer } from 'vs/platform/terminal/common/capabilities/terminalCapabilityStore';
-import { IEnvironmentVariableCollection, IMergedEnvironmentVariableCollection } from 'vs/platform/terminal/common/environmentVariable';
-import { deserializeEnvironmentVariableCollections } from 'vs/platform/terminal/common/environmentVariableShared';
-import { IProcessDataEvent, IProcessPropertyMap, IReconnectionProperties, IShellLaunchConfig, ITerminalDimensionsOverride, ITerminalLaunchError, ITerminalLogService, PosixShellType, ProcessPropertyType, ShellIntegrationStatus, TerminalExitReason, TerminalIcon, TerminalLocation, TerminalSettingId, TerminalShellType, TitleEventSource, WindowsShellType } from 'vs/platform/terminal/common/terminal';
-import { formatMessageForTerminal } from 'vs/platform/terminal/common/terminalStrings';
-import { editorBackground } from 'vs/platform/theme/common/colorRegistry';
-import { getIconRegistry } from 'vs/platform/theme/common/iconRegistry';
-import { IColorTheme, IThemeService } from 'vs/platform/theme/common/themeService';
-import { IWorkspaceContextService, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { IWorkspaceTrustRequestService } from 'vs/platform/workspace/common/workspaceTrust';
-import { PANEL_BACKGROUND, SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
-import { IViewDescriptorService, ViewContainerLocation } from 'vs/workbench/common/views';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { IRequestAddInstanceToGroupEvent, ITerminalConfigurationService, ITerminalContribution, ITerminalInstance, IXtermColorProvider, TerminalDataTransfers } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { TerminalLaunchHelpAction } from 'vs/workbench/contrib/terminal/browser/terminalActions';
-import { TerminalEditorInput } from 'vs/workbench/contrib/terminal/browser/terminalEditorInput';
-import { TerminalExtensionsRegistry } from 'vs/workbench/contrib/terminal/browser/terminalExtensions';
-import { getColorClass, createColorStyleElement, getStandardColors } from 'vs/workbench/contrib/terminal/browser/terminalIcon';
-import { TerminalProcessManager } from 'vs/workbench/contrib/terminal/browser/terminalProcessManager';
-import { showRunRecentQuickPick } from 'vs/workbench/contrib/terminal/browser/terminalRunRecentQuickPick';
-import { ITerminalStatusList, TerminalStatus, TerminalStatusList } from 'vs/workbench/contrib/terminal/browser/terminalStatusList';
-import { getTerminalResourcesFromDragEvent, getTerminalUri } from 'vs/workbench/contrib/terminal/browser/terminalUri';
-import { TerminalWidgetManager } from 'vs/workbench/contrib/terminal/browser/widgets/widgetManager';
-import { LineDataEventAddon } from 'vs/workbench/contrib/terminal/browser/xterm/lineDataEventAddon';
-import { XtermTerminal, getXtermScaledDimensions } from 'vs/workbench/contrib/terminal/browser/xterm/xtermTerminal';
-import { IEnvironmentVariableInfo } from 'vs/workbench/contrib/terminal/common/environmentVariable';
-import { getCommandHistory, getDirectoryHistory } from 'vs/workbench/contrib/terminal/common/history';
-import { DEFAULT_COMMANDS_TO_SKIP_SHELL, ITerminalProcessManager, ITerminalProfileResolverService, ProcessState, TERMINAL_CREATION_COMMANDS, TERMINAL_VIEW_ID, TerminalCommandId } from 'vs/workbench/contrib/terminal/common/terminal';
-import { TERMINAL_BACKGROUND_COLOR } from 'vs/workbench/contrib/terminal/common/terminalColorRegistry';
-import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey';
-import { getWorkspaceForTerminal, preparePathForShell } from 'vs/workbench/contrib/terminal/common/terminalEnvironment';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IHistoryService } from 'vs/workbench/services/history/common/history';
-import { IWorkbenchLayoutService, Position } from 'vs/workbench/services/layout/browser/layoutService';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
-import { importAMDNodeModule } from 'vs/amdX';
+import { isFirefox } from '../../../../base/browser/browser.js';
+import { BrowserFeatures } from '../../../../base/browser/canIUse.js';
+import { DataTransfers } from '../../../../base/browser/dnd.js';
+import * as dom from '../../../../base/browser/dom.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { Orientation } from '../../../../base/browser/ui/sash/sash.js';
+import { DomScrollableElement } from '../../../../base/browser/ui/scrollbar/scrollableElement.js';
+import { AutoOpenBarrier, Barrier, Promises, disposableTimeout, timeout } from '../../../../base/common/async.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { debounce } from '../../../../base/common/decorators.js';
+import { ErrorNoTelemetry, onUnexpectedError } from '../../../../base/common/errors.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { ISeparator, template } from '../../../../base/common/labels.js';
+import { Disposable, DisposableStore, IDisposable, ImmortalReference, MutableDisposable, dispose, toDisposable, type IReference } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import * as path from '../../../../base/common/path.js';
+import { OS, OperatingSystem, isMacintosh, isWindows } from '../../../../base/common/platform.js';
+import { ScrollbarVisibility } from '../../../../base/common/scrollable.js';
+import { URI } from '../../../../base/common/uri.js';
+import { TabFocus } from '../../../../editor/browser/config/tabFocus.js';
+import * as nls from '../../../../nls.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { CodeDataTransfers, containsDragType } from '../../../../platform/dnd/browser/dnd.js';
+import { FileSystemProviderCapabilities, IFileService } from '../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { ResultKind } from '../../../../platform/keybinding/common/keybindingResolver.js';
+import { INotificationService, IPromptChoice, Severity } from '../../../../platform/notification/common/notification.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IQuickInputService, IQuickPickItem, QuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IMarkProperties, ITerminalCommand, TerminalCapability } from '../../../../platform/terminal/common/capabilities/capabilities.js';
+import { TerminalCapabilityStoreMultiplexer } from '../../../../platform/terminal/common/capabilities/terminalCapabilityStore.js';
+import { IEnvironmentVariableCollection, IMergedEnvironmentVariableCollection } from '../../../../platform/terminal/common/environmentVariable.js';
+import { deserializeEnvironmentVariableCollections } from '../../../../platform/terminal/common/environmentVariableShared.js';
+import { GeneralShellType, IProcessDataEvent, IProcessPropertyMap, IReconnectionProperties, IShellLaunchConfig, ITerminalDimensionsOverride, ITerminalLaunchError, ITerminalLogService, PosixShellType, ProcessPropertyType, ShellIntegrationStatus, TerminalExitReason, TerminalIcon, TerminalLocation, TerminalSettingId, TerminalShellType, TitleEventSource, WindowsShellType } from '../../../../platform/terminal/common/terminal.js';
+import { formatMessageForTerminal } from '../../../../platform/terminal/common/terminalStrings.js';
+import { editorBackground } from '../../../../platform/theme/common/colorRegistry.js';
+import { getIconRegistry } from '../../../../platform/theme/common/iconRegistry.js';
+import { IColorTheme, IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IWorkspaceContextService, IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
+import { IWorkspaceTrustRequestService } from '../../../../platform/workspace/common/workspaceTrust.js';
+import { PANEL_BACKGROUND, SIDE_BAR_BACKGROUND } from '../../../common/theme.js';
+import { IViewDescriptorService, ViewContainerLocation } from '../../../common/views.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
+import { IRequestAddInstanceToGroupEvent, ITerminalConfigurationService, ITerminalContribution, ITerminalInstance, IXtermColorProvider, TerminalDataTransfers } from './terminal.js';
+import { TerminalLaunchHelpAction } from './terminalActions.js';
+import { TerminalEditorInput } from './terminalEditorInput.js';
+import { TerminalExtensionsRegistry } from './terminalExtensions.js';
+import { getColorClass, createColorStyleElement, getStandardColors } from './terminalIcon.js';
+import { TerminalProcessManager } from './terminalProcessManager.js';
+import { ITerminalStatusList, TerminalStatus, TerminalStatusList } from './terminalStatusList.js';
+import { getTerminalResourcesFromDragEvent, getTerminalUri } from './terminalUri.js';
+import { TerminalWidgetManager } from './widgets/widgetManager.js';
+import { LineDataEventAddon } from './xterm/lineDataEventAddon.js';
+import { XtermTerminal, getXtermScaledDimensions } from './xterm/xtermTerminal.js';
+import { IEnvironmentVariableInfo } from '../common/environmentVariable.js';
+import { DEFAULT_COMMANDS_TO_SKIP_SHELL, ITerminalProcessManager, ITerminalProfileResolverService, ProcessState, TERMINAL_CREATION_COMMANDS, TERMINAL_VIEW_ID, TerminalCommandId } from '../common/terminal.js';
+import { TERMINAL_BACKGROUND_COLOR } from '../common/terminalColorRegistry.js';
+import { TerminalContextKeys } from '../common/terminalContextKey.js';
+import { getWorkspaceForTerminal, preparePathForShell } from '../common/terminalEnvironment.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { IHistoryService } from '../../../services/history/common/history.js';
+import { isHorizontal, IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
+import { IPathService } from '../../../services/path/common/pathService.js';
+import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
+import { importAMDNodeModule } from '../../../../amdX.js';
 import type { IMarker, Terminal as XTermTerminal } from '@xterm/xterm';
-import { AccessibilityCommandId } from 'vs/workbench/contrib/accessibility/common/accessibilityCommands';
-import { terminalStrings } from 'vs/workbench/contrib/terminal/common/terminalStrings';
-import { shouldPasteTerminalText } from 'vs/workbench/contrib/terminal/common/terminalClipboard';
-import { TerminalIconPicker } from 'vs/workbench/contrib/terminal/browser/terminalIconPicker';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-
-// HACK: This file should not depend on terminalContrib
-// eslint-disable-next-line local/code-import-patterns
-import { TerminalAccessibilityCommandId } from 'vs/workbench/contrib/terminalContrib/accessibility/common/terminal.accessibility';
+import { AccessibilityCommandId } from '../../accessibility/common/accessibilityCommands.js';
+import { terminalStrings } from '../common/terminalStrings.js';
+import { shouldPasteTerminalText } from '../common/terminalClipboard.js';
+import { TerminalIconPicker } from './terminalIconPicker.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { TerminalResizeDebouncer } from './terminalResizeDebouncer.js';
+import { openContextMenu } from './terminalContextMenu.js';
+import type { IMenu } from '../../../../platform/actions/common/actions.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { TerminalContribCommandId } from '../terminalContribExports.js';
 
 const enum Constants {
 	/**
@@ -119,12 +118,11 @@ interface IGridDimensions {
 	rows: number;
 }
 
-const shellIntegrationSupportedShellTypes = [
+const shellIntegrationSupportedShellTypes: (PosixShellType | GeneralShellType | WindowsShellType)[] = [
 	PosixShellType.Bash,
 	PosixShellType.Zsh,
-	PosixShellType.PowerShell,
-	PosixShellType.Python,
-	WindowsShellType.PowerShell
+	GeneralShellType.PowerShell,
+	GeneralShellType.Python,
 ];
 
 export class TerminalInstance extends Disposable implements ITerminalInstance {
@@ -188,11 +186,15 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 	private _labelComputer?: TerminalLabelComputer;
 	private _userHome?: string;
 	private _hasScrollBar?: boolean;
-	private _target?: TerminalLocation | undefined;
 	private _usedShellIntegrationInjection: boolean = false;
 	get usedShellIntegrationInjection(): boolean { return this._usedShellIntegrationInjection; }
 	private _lineDataEventAddon: LineDataEventAddon | undefined;
 	private readonly _scopedContextKeyService: IContextKeyService;
+	private _resizeDebouncer?: TerminalResizeDebouncer;
+	private _pauseInputEventBarrier: Barrier | undefined;
+	pauseInputEvents(barrier: Barrier): void {
+		this._pauseInputEventBarrier = barrier;
+	}
 
 	readonly capabilities = this._register(new TerminalCapabilityStoreMultiplexer());
 	readonly statusList: ITerminalStatusList;
@@ -211,9 +213,12 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		this._shellLaunchConfig.waitOnExit = value;
 	}
 
-	get target(): TerminalLocation | undefined { return this._target; }
+	private _targetRef: ImmortalReference<TerminalLocation | undefined> = new ImmortalReference(undefined);
+	get targetRef(): IReference<TerminalLocation | undefined> { return this._targetRef; }
+
+	get target(): TerminalLocation | undefined { return this._targetRef.object; }
 	set target(value: TerminalLocation | undefined) {
-		this._target = value;
+		this._targetRef.object = value;
 		this._onDidChangeTarget.fire(value);
 	}
 
@@ -312,10 +317,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 	readonly onData = this._onData.event;
 	private readonly _onBinary = this._register(new Emitter<string>());
 	readonly onBinary = this._onBinary.event;
-	private readonly _onLineData = this._register(new Emitter<string>({
-		onDidAddFirstListener: () => this._onLineDataSetup()
-	}));
-	readonly onLineData = this._onLineData.event;
 	private readonly _onRequestExtHostProcess = this._register(new Emitter<ITerminalInstance>());
 	readonly onRequestExtHostProcess = this._onRequestExtHostProcess.event;
 	private readonly _onDimensionsChanged = this._register(new Emitter<void>());
@@ -344,12 +345,24 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 	readonly onDidSendText = this._onDidSendText.event;
 	private readonly _onDidChangeShellType = this._register(new Emitter<TerminalShellType>());
 	readonly onDidChangeShellType = this._onDidChangeShellType.event;
+	private readonly _onDidChangeVisibility = this._register(new Emitter<boolean>());
+	readonly onDidChangeVisibility = this._onDidChangeVisibility.event;
+
+	private readonly _onWillPaste = this._register(new Emitter<string>());
+	readonly onWillPaste = this._onWillPaste.event;
+	private readonly _onDidPaste = this._register(new Emitter<string>());
+	readonly onDidPaste = this._onDidPaste.event;
+
+	private readonly _onLineData = this._register(new Emitter<string>({
+		onDidAddFirstListener: async () => (this.xterm ?? await this._xtermReadyPromise).raw.loadAddon(this._lineDataEventAddon!)
+	}));
+	readonly onLineData = this._onLineData.event;
 
 	constructor(
 		private readonly _terminalShellTypeContextKey: IContextKey<string>,
-		private readonly _terminalInRunCommandPicker: IContextKey<boolean>,
 		private _shellLaunchConfig: IShellLaunchConfig,
 		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
+		@IContextMenuService private readonly _contextMenuService: IContextMenuService,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@ITerminalConfigurationService private readonly _terminalConfigurationService: ITerminalConfigurationService,
 		@ITerminalProfileResolverService private readonly _terminalProfileResolverService: ITerminalProfileResolverService,
@@ -423,9 +436,9 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 
 		const scopedContextKeyService = this._register(_contextKeyService.createScoped(this._wrapperElement));
 		this._scopedContextKeyService = scopedContextKeyService;
-		this._scopedInstantiationService = instantiationService.createChild(new ServiceCollection(
+		this._scopedInstantiationService = this._register(instantiationService.createChild(new ServiceCollection(
 			[IContextKeyService, scopedContextKeyService]
-		));
+		)));
 
 		this._terminalFocusContextKey = TerminalContextKeys.focus.bindTo(scopedContextKeyService);
 		this._terminalHasFixedWidth = TerminalContextKeys.terminalHasFixedWidth.bindTo(scopedContextKeyService);
@@ -434,24 +447,16 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		this._terminalShellIntegrationEnabledContextKey = TerminalContextKeys.terminalShellIntegrationEnabled.bindTo(scopedContextKeyService);
 
 		this._logService.trace(`terminalInstance#ctor (instanceId: ${this.instanceId})`, this._shellLaunchConfig);
+		this._register(this.capabilities.onDidAddCapabilityType(e => this._logService.debug('terminalInstance added capability', e)));
+		this._register(this.capabilities.onDidRemoveCapabilityType(e => this._logService.debug('terminalInstance removed capability', e)));
 		this._register(this.capabilities.onDidAddCapabilityType(e => {
-			this._logService.debug('terminalInstance added capability', e);
 			if (e === TerminalCapability.CwdDetection) {
 				this.capabilities.get(TerminalCapability.CwdDetection)?.onDidChangeCwd(e => {
 					this._cwd = e;
 					this._setTitle(this.title, TitleEventSource.Config);
-					this._scopedInstantiationService.invokeFunction(getDirectoryHistory)?.add(e, { remoteAuthority: this.remoteAuthority });
-				});
-			} else if (e === TerminalCapability.CommandDetection) {
-				const commandCapability = this.capabilities.get(TerminalCapability.CommandDetection);
-				commandCapability?.onCommandFinished(e => {
-					if (e.command.trim().length > 0) {
-						this._scopedInstantiationService.invokeFunction(getCommandHistory)?.add(e.command, { shellType: this._shellType });
-					}
 				});
 			}
 		}));
-		this._register(this.capabilities.onDidRemoveCapabilityType(e => this._logService.debug('terminalInstance removed capability', e)));
 
 		// Resolve just the icon ahead of time so that it shows up immediately in the tabs. This is
 		// disabled in remote because this needs to be sync and the OS may differ on the remote
@@ -577,7 +582,11 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 			}
 			let contribution: ITerminalContribution;
 			try {
-				contribution = this._register(this._scopedInstantiationService.createInstance(desc.ctor, this, this._processManager, this._widgetManager));
+				contribution = this._register(this._scopedInstantiationService.createInstance(desc.ctor, {
+					instance: this,
+					processManager: this._processManager,
+					widgetManager: this._widgetManager
+				}));
 				this._contributions.set(desc.id, contribution);
 			} catch (err) {
 				onUnexpectedError(err);
@@ -699,11 +708,11 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 			return undefined;
 		}
 		const computedStyle = dom.getWindow(this.xterm.raw.element).getComputedStyle(this.xterm.raw.element);
-		const horizontalPadding = parseInt(computedStyle.paddingLeft) + parseInt(computedStyle.paddingRight);
+		const horizontalPadding = parseInt(computedStyle.paddingLeft) + parseInt(computedStyle.paddingRight) + 14/*scroll bar padding*/;
 		const verticalPadding = parseInt(computedStyle.paddingTop) + parseInt(computedStyle.paddingBottom);
 		TerminalInstance._lastKnownCanvasDimensions = new dom.Dimension(
 			Math.min(Constants.MaxCanvasWidth, width - horizontalPadding),
-			height + (this._hasScrollBar && !this._horizontalScrollbar ? -5/* scroll bar height */ : 0) - 2/* bottom padding */ - verticalPadding);
+			height - verticalPadding + (this._hasScrollBar && this._horizontalScrollbar ? -5/* scroll bar height */ : 0));
 		return TerminalInstance._lastKnownCanvasDimensions;
 	}
 
@@ -711,7 +720,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 	get shouldPersist(): boolean { return this._processManager.shouldPersist && !this.shellLaunchConfig.isTransient && (!this.reconnectionProperties || this._configurationService.getValue('task.reconnection') === true); }
 
 	public static getXtermConstructor(keybindingService: IKeybindingService, contextKeyService: IContextKeyService) {
-		const keybinding = keybindingService.lookupKeybinding(TerminalAccessibilityCommandId.FocusAccessibleBuffer, contextKeyService);
+		const keybinding = keybindingService.lookupKeybinding(TerminalContribCommandId.A11yFocusAccessibleBuffer, contextKeyService);
 		if (xtermConstructor) {
 			return xtermConstructor;
 		}
@@ -735,17 +744,32 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		}
 
 		const disableShellIntegrationReporting = (this.shellLaunchConfig.executable === undefined || this.shellType === undefined) || !shellIntegrationSupportedShellTypes.includes(this.shellType);
-		const xterm = this._scopedInstantiationService.createInstance(
-			XtermTerminal,
-			Terminal,
-			this._cols,
-			this._rows,
-			this._scopedInstantiationService.createInstance(TerminalInstanceColorProvider, this),
-			this.capabilities,
-			this._processManager.shellIntegrationNonce,
-			disableShellIntegrationReporting
-		);
+		const xterm = this._scopedInstantiationService.createInstance(XtermTerminal, Terminal, {
+			cols: this._cols,
+			rows: this._rows,
+			xtermColorProvider: this._scopedInstantiationService.createInstance(TerminalInstanceColorProvider, this._targetRef),
+			capabilities: this.capabilities,
+			shellIntegrationNonce: this._processManager.shellIntegrationNonce,
+			disableShellIntegrationReporting,
+		});
 		this.xterm = xterm;
+		this._resizeDebouncer = this._register(new TerminalResizeDebouncer(
+			() => this._isVisible,
+			() => xterm,
+			async (cols, rows) => {
+				xterm.raw.resize(cols, rows);
+				await this._updatePtyDimensions(xterm.raw);
+			},
+			async (cols) => {
+				xterm.raw.resize(cols, xterm.raw.rows);
+				await this._updatePtyDimensions(xterm.raw);
+			},
+			async (rows) => {
+				xterm.raw.resize(xterm.raw.cols, rows);
+				await this._updatePtyDimensions(xterm.raw);
+			}
+		));
+		this._register(toDisposable(() => this._resizeDebouncer = undefined));
 		this.updateAccessibilitySupport();
 		this._register(this.xterm.onDidRequestRunCommand(e => {
 			if (e.copyAsHtml) {
@@ -754,8 +778,11 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 				this.sendText(e.command.command, e.noNewLine ? false : true);
 			}
 		}));
-		this._register(this.xterm.onDidRequestFocus(() => this.focus()));
-		this._register(this.xterm.onDidRequestSendText(e => this.sendText(e, false)));
+		this._register(this.xterm.onDidRequestRefreshDimensions(() => {
+			if (this._lastLayoutDimensions) {
+				this.layout(this._lastLayoutDimensions);
+			}
+		}));
 		// Write initial text, deferring onLineFeed listener when applicable to avoid firing
 		// onLineData events containing initialText
 		const initialTextWrittenPromise = this._shellLaunchConfig.initialText ? new Promise<void>(r => this._writeInitialText(xterm, r)) : undefined;
@@ -782,6 +809,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 
 		this._register(this._processManager.onProcessData(e => this._onProcessData(e)));
 		this._register(xterm.raw.onData(async data => {
+			await this._pauseInputEventBarrier?.wait();
 			await this._processManager.write(data);
 			this._onDidInputData.fire(data);
 		}));
@@ -830,11 +858,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		return xterm;
 	}
 
-	private async _onLineDataSetup(): Promise<void> {
-		const xterm = this.xterm || await this._xtermReadyPromise;
-		xterm.raw.loadAddon(this._lineDataEventAddon!);
-	}
-
 	async runCommand(commandLine: string, shouldExecute: boolean): Promise<void> {
 		let commandDetection = this.capabilities.get(TerminalCapability.CommandDetection);
 
@@ -868,12 +891,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		await this.sendText(commandLine, shouldExecute, !shouldExecute);
 	}
 
-	async runRecent(type: 'command' | 'cwd', filterMode?: 'fuzzy' | 'contiguous', value?: string): Promise<void> {
-		return this._scopedInstantiationService.invokeFunction(
-			showRunRecentQuickPick, this, this._terminalInRunCommandPicker, type, filterMode, value
-		);
-	}
-
 	detachFromElement(): void {
 		this._wrapperElement.remove();
 		this._container = undefined;
@@ -885,7 +902,9 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 			return;
 		}
 
-		this._attachBarrier.open();
+		if (!this._attachBarrier.isOpen()) {
+			this._attachBarrier.open();
+		}
 
 		// The container changed, reattach
 		this._container = container;
@@ -1134,6 +1153,9 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 	}
 
 	override dispose(reason?: TerminalExitReason): void {
+		if (this.shellLaunchConfig.type === 'Task' && reason === TerminalExitReason.Process && this._exitCode !== 0 && !this.shellLaunchConfig.waitOnExit) {
+			return;
+		}
 		if (this.isDisposed) {
 			return;
 		}
@@ -1234,7 +1256,10 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		}
 
 		this.focus();
+
+		this._onWillPaste.fire(currentText);
 		this.xterm.raw.paste(currentText);
+		this._onDidPaste.fire(currentText);
 	}
 
 	async sendText(text: string, shouldExecute: boolean, bracketedPasteMode?: boolean): Promise<void> {
@@ -1272,21 +1297,20 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 	}
 
 	setVisible(visible: boolean): void {
+		const didChange = this._isVisible !== visible;
 		this._isVisible = visible;
 		this._wrapperElement.classList.toggle('active', visible);
 		if (visible && this.xterm) {
 			this._open();
+			// Flush any pending resizes
+			this._resizeDebouncer?.flush();
 			// Resize to re-evaluate dimensions, this will ensure when switching to a terminal it is
 			// using the most up to date dimensions (eg. when terminal is created in the background
 			// using cached dimensions of a split terminal).
 			this._resize();
-			// HACK: Trigger a forced refresh of the viewport to sync the viewport and scroll bar.
-			// This is necessary if the number of rows in the terminal has decreased while it was in
-			// the background since scrollTop changes take no effect but the terminal's position
-			// does change since the number of visible rows decreases.
-			// This can likely be removed after https://github.com/xtermjs/xterm.js/issues/291 is
-			// fixed upstream.
-			setTimeout(() => this.xterm!.forceRefresh(), 0);
+		}
+		if (didChange) {
+			this._onDidChangeVisibility.fire(visible);
 		}
 	}
 
@@ -1578,7 +1602,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 				}
 			});
 		} else {
-			this.dispose(TerminalExitReason.Process);
 			if (exitMessage) {
 				const failedDuringLaunch = this._processManager.processState === ProcessState.KilledDuringLaunch;
 				if (failedDuringLaunch || this._terminalConfigurationService.config.showExitAlert) {
@@ -1594,6 +1617,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 					this._logService.warn(exitMessage);
 				}
 			}
+			this.dispose(TerminalExitReason.Process);
 		}
 
 		// First onExit to consumers, this can happen after the terminal has already been disposed.
@@ -1612,7 +1636,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 			id: TerminalStatus.ShellIntegrationAttentionNeeded,
 			severity: Severity.Warning,
 			icon: Codicon.warning,
-			tooltip: (`${exitMessage} ` ?? '') + nls.localize('launchFailed.exitCodeOnlyShellIntegration', 'Disabling shell integration in user settings might help.'),
+			tooltip: `${exitMessage} ` + nls.localize('launchFailed.exitCodeOnlyShellIntegration', 'Disabling shell integration in user settings might help.'),
 			hoverActions: [{
 				commandId: TerminalCommandId.ShellIntegrationLearnMore,
 				label: nls.localize('shellIntegration.learnMore', "Learn more about shell integration"),
@@ -1832,7 +1856,9 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		this._resize();
 
 		// Signal the container is ready
-		this._containerReadyBarrier.open();
+		if (!this._containerReadyBarrier.isOpen()) {
+			this._containerReadyBarrier.open();
+		}
 
 		// Layout all contributions
 		for (const contribution of this._contributions.values()) {
@@ -1844,58 +1870,52 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		}
 	}
 
-	@debounce(50)
-	private async _resize(): Promise<void> {
-		this._resizeNow(false);
-	}
+	private async _resize(immediate?: boolean): Promise<void> {
+		if (!this.xterm) {
+			return;
+		}
 
-	private async _resizeNow(immediate: boolean): Promise<void> {
 		let cols = this.cols;
 		let rows = this.rows;
 
-		if (this.xterm) {
-			// Only apply these settings when the terminal is visible so that
-			// the characters are measured correctly.
-			if (this._isVisible && this._layoutSettingsChanged) {
-				const font = this.xterm.getFont();
-				const config = this._terminalConfigurationService.config;
-				this.xterm.raw.options.letterSpacing = font.letterSpacing;
-				this.xterm.raw.options.lineHeight = font.lineHeight;
-				this.xterm.raw.options.fontSize = font.fontSize;
-				this.xterm.raw.options.fontFamily = font.fontFamily;
-				this.xterm.raw.options.fontWeight = config.fontWeight;
-				this.xterm.raw.options.fontWeightBold = config.fontWeightBold;
+		// Only apply these settings when the terminal is visible so that
+		// the characters are measured correctly.
+		if (this._isVisible && this._layoutSettingsChanged) {
+			const font = this.xterm.getFont();
+			const config = this._terminalConfigurationService.config;
+			this.xterm.raw.options.letterSpacing = font.letterSpacing;
+			this.xterm.raw.options.lineHeight = font.lineHeight;
+			this.xterm.raw.options.fontSize = font.fontSize;
+			this.xterm.raw.options.fontFamily = font.fontFamily;
+			this.xterm.raw.options.fontWeight = config.fontWeight;
+			this.xterm.raw.options.fontWeightBold = config.fontWeightBold;
 
-				// Any of the above setting changes could have changed the dimensions of the
-				// terminal, re-evaluate now.
-				this._initDimensions();
-				cols = this.cols;
-				rows = this.rows;
+			// Any of the above setting changes could have changed the dimensions of the
+			// terminal, re-evaluate now.
+			this._initDimensions();
+			cols = this.cols;
+			rows = this.rows;
 
-				this._layoutSettingsChanged = false;
-			}
-
-			if (isNaN(cols) || isNaN(rows)) {
-				return;
-			}
-
-			if (cols !== this.xterm.raw.cols || rows !== this.xterm.raw.rows) {
-				if (this._fixedRows || this._fixedCols) {
-					await this._updateProperty(ProcessPropertyType.FixedDimensions, { cols: this._fixedCols, rows: this._fixedRows });
-				}
-				this._onDimensionsChanged.fire();
-			}
-
-			this.xterm.raw.resize(cols, rows);
-			TerminalInstance._lastKnownGridDimensions = { cols, rows };
+			this._layoutSettingsChanged = false;
 		}
 
-		if (immediate) {
-			// do not await, call setDimensions synchronously
-			this._processManager.setDimensions(cols, rows, true);
-		} else {
-			await this._processManager.setDimensions(cols, rows);
+		if (isNaN(cols) || isNaN(rows)) {
+			return;
 		}
+
+		if (cols !== this.xterm.raw.cols || rows !== this.xterm.raw.rows) {
+			if (this._fixedRows || this._fixedCols) {
+				await this._updateProperty(ProcessPropertyType.FixedDimensions, { cols: this._fixedCols, rows: this._fixedRows });
+			}
+			this._onDimensionsChanged.fire();
+		}
+
+		TerminalInstance._lastKnownGridDimensions = { cols, rows };
+		this._resizeDebouncer!.resize(cols, rows, immediate ?? false);
+	}
+
+	private async _updatePtyDimensions(rawXterm: XTermTerminal): Promise<void> {
+		await this._processManager.setDimensions(rawXterm.cols, rawXterm.rows);
 	}
 
 	setShellType(shellType: TerminalShellType | undefined) {
@@ -1977,7 +1997,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		}
 		this._dimensionsOverride = dimensions;
 		if (immediate) {
-			this._resizeNow(true);
+			this._resize(true);
 		} else {
 			this._resize();
 		}
@@ -2063,8 +2083,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		this._wrapperElement.classList.add('fixed-dims');
 		this._hasScrollBar = true;
 		this._initDimensions();
-		// Always remove a row to make room for the scroll bar
-		this._fixedRows = this._rows - 1;
 		await this._resize();
 		this._terminalHasFixedWidth.set(true);
 		if (!this._horizontalScrollbar) {
@@ -2242,12 +2260,13 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		const showAllColorsItem = { label: 'Reset to default' };
 		items.push(showAllColorsItem);
 
-		const quickPick = this._quickInputService.createQuickPick();
+		const disposables: IDisposable[] = [];
+		const quickPick = this._quickInputService.createQuickPick({ useSeparators: true });
+		disposables.push(quickPick);
 		quickPick.items = items;
 		quickPick.matchOnDescription = true;
 		quickPick.placeholder = nls.localize('changeColor', 'Select a color for the terminal');
 		quickPick.show();
-		const disposables: IDisposable[] = [];
 		const result = await new Promise<IQuickPickItem | undefined>(r => {
 			disposables.push(quickPick.onDidHide(() => r(undefined)));
 			disposables.push(quickPick.onDidAccept(() => r(quickPick.selectedItems[0])));
@@ -2275,6 +2294,66 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 	setParentContextKeyService(parentContextKeyService: IContextKeyService): void {
 		this._scopedContextKeyService.updateParent(parentContextKeyService);
 	}
+
+	async handleMouseEvent(event: MouseEvent, contextMenu: IMenu): Promise<{ cancelContextMenu: boolean } | void> {
+		// Don't handle mouse event if it was on the scroll bar
+		if (dom.isHTMLElement(event.target) && (event.target.classList.contains('scrollbar') || event.target.classList.contains('slider'))) {
+			return { cancelContextMenu: true };
+		}
+
+		// Middle click
+		if (event.which === 2) {
+			switch (this._terminalConfigurationService.config.middleClickBehavior) {
+				case 'paste':
+					this.paste();
+					break;
+				case 'default':
+				default:
+					// Drop selection and focus terminal on Linux to enable middle button paste
+					// when click occurs on the selection itself.
+					this.focus();
+					break;
+			}
+			return;
+		}
+
+		// Right click
+		if (event.which === 3) {
+			const rightClickBehavior = this._terminalConfigurationService.config.rightClickBehavior;
+			if (rightClickBehavior === 'nothing') {
+				if (!event.shiftKey) {
+					return { cancelContextMenu: true };
+				}
+				return;
+			}
+			else if (rightClickBehavior === 'copyPaste' || rightClickBehavior === 'paste') {
+				// copyPaste: Shift+right click should open context menu
+				if (rightClickBehavior === 'copyPaste' && event.shiftKey) {
+					openContextMenu(dom.getActiveWindow(), event, this, contextMenu, this._contextMenuService);
+					return;
+				}
+
+				if (rightClickBehavior === 'copyPaste' && this.hasSelection()) {
+					await this.copySelection();
+					this.clearSelection();
+				} else {
+					if (BrowserFeatures.clipboard.readText) {
+						this.paste();
+					} else {
+						this._notificationService.info(`This browser doesn't support the clipboard.readText API needed to trigger a paste, try ${isMacintosh ? '⌘' : 'Ctrl'}+V instead.`);
+					}
+				}
+				// Clear selection after all click event bubbling is finished on Mac to prevent
+				// right-click selecting a word which is seemed cannot be disabled. There is a
+				// flicker when pasting but this appears to give the best experience if the
+				// setting is enabled.
+				if (isMacintosh) {
+					setTimeout(() => this.clearSelection(), 0);
+				}
+				return { cancelContextMenu: true };
+			}
+		}
+	}
 }
 
 class TerminalInstanceDragAndDropController extends Disposable implements dom.IDragAndDropObserverCallbacks {
@@ -2399,7 +2478,7 @@ class TerminalInstanceDragAndDropController extends Disposable implements dom.ID
 	private _getViewOrientation(): Orientation {
 		const panelPosition = this._layoutService.getPanelPosition();
 		const terminalLocation = this._viewDescriptorService.getViewLocationById(TERMINAL_VIEW_ID);
-		return terminalLocation === ViewContainerLocation.Panel && panelPosition === Position.BOTTOM
+		return terminalLocation === ViewContainerLocation.Panel && isHorizontal(panelPosition)
 			? Orientation.HORIZONTAL
 			: Orientation.VERTICAL;
 	}
@@ -2408,6 +2487,7 @@ class TerminalInstanceDragAndDropController extends Disposable implements dom.ID
 interface ITerminalLabelTemplateProperties {
 	cwd?: string | null | undefined;
 	cwdFolder?: string | null | undefined;
+	workspaceFolderName?: string | null | undefined;
 	workspaceFolder?: string | null | undefined;
 	local?: string | null | undefined;
 	process?: string | null | undefined;
@@ -2457,6 +2537,7 @@ export class TerminalLabelComputer extends Disposable {
 		const templateProperties: ITerminalLabelTemplateProperties = {
 			cwd: instance.cwd || instance.initialCwd || '',
 			cwdFolder: '',
+			workspaceFolderName: instance.workspaceFolder?.name,
 			workspaceFolder: instance.workspaceFolder ? path.basename(instance.workspaceFolder.uri.fsPath) : undefined,
 			local: type === 'Local' ? terminalStrings.typeLocal : undefined,
 			process: instance.processName,
@@ -2467,6 +2548,7 @@ export class TerminalLabelComputer extends Disposable {
 				: (instance.fixedRows ? `\u2195${instance.fixedRows}` : ''),
 			separator: { label: this._terminalConfigurationService.config.tabs.separator }
 		};
+		templateProperties.workspaceFolderName = instance.workspaceFolder?.name ?? templateProperties.workspaceFolder;
 		labelTemplate = labelTemplate.trim();
 		if (!labelTemplate) {
 			return labelType === TerminalLabelType.Title ? (instance.processName || '') : '';
@@ -2494,7 +2576,6 @@ export class TerminalLabelComputer extends Disposable {
 				showCwd = cwdUri.fsPath.localeCompare(instance.workspaceFolder.uri.fsPath, undefined, { sensitivity: caseSensitive ? 'case' : 'base' }) !== 0;
 			}
 			if (showCwd) {
-
 				templateProperties.cwdFolder = path.basename(templateProperties.cwd);
 			}
 		}
@@ -2579,7 +2660,7 @@ export function parseExitResult(
 
 export class TerminalInstanceColorProvider implements IXtermColorProvider {
 	constructor(
-		private readonly _instance: ITerminalInstance,
+		private readonly _target: IReference<TerminalLocation | undefined>,
 		@IViewDescriptorService private readonly _viewDescriptorService: IViewDescriptorService,
 	) {
 	}
@@ -2589,7 +2670,7 @@ export class TerminalInstanceColorProvider implements IXtermColorProvider {
 		if (terminalBackground) {
 			return terminalBackground;
 		}
-		if (this._instance.target === TerminalLocation.Editor) {
+		if (this._target.object === TerminalLocation.Editor) {
 			return theme.getColor(editorBackground);
 		}
 		const location = this._viewDescriptorService.getViewLocationById(TERMINAL_VIEW_ID)!;
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstanceService.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstanceService.ts
index 6fa966735e4..d1f7b5d8adc 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalInstanceService.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalInstanceService.ts
@@ -3,29 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ITerminalInstance, ITerminalInstanceService } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IShellLaunchConfig, ITerminalBackend, ITerminalBackendRegistry, ITerminalProfile, TerminalExtensions, TerminalLocation } from 'vs/platform/terminal/common/terminal';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { TerminalInstance } from 'vs/workbench/contrib/terminal/browser/terminalInstance';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { URI } from 'vs/base/common/uri';
-import { Emitter, Event } from 'vs/base/common/event';
-import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { promiseWithResolvers } from 'vs/base/common/async';
+import { ITerminalInstance, ITerminalInstanceService } from './terminal.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IShellLaunchConfig, ITerminalBackend, ITerminalBackendRegistry, ITerminalProfile, TerminalExtensions, TerminalLocation } from '../../../../platform/terminal/common/terminal.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { TerminalInstance } from './terminalInstance.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { TerminalContextKeys } from '../common/terminalContextKey.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { promiseWithResolvers } from '../../../../base/common/async.js';
 
 export class TerminalInstanceService extends Disposable implements ITerminalInstanceService {
 	declare _serviceBrand: undefined;
 	private _terminalShellTypeContextKey: IContextKey<string>;
-	private _terminalInRunCommandPicker: IContextKey<boolean>;
 	private _backendRegistration = new Map<string | undefined, { promise: Promise<void>; resolve: () => void }>();
 
 	private readonly _onDidCreateInstance = this._register(new Emitter<ITerminalInstance>());
 	get onDidCreateInstance(): Event<ITerminalInstance> { return this._onDidCreateInstance.event; }
 
+	private readonly _onDidRegisterBackend = this._register(new Emitter<ITerminalBackend>());
+	get onDidRegisterBackend(): Event<ITerminalBackend> { return this._onDidRegisterBackend.event; }
+
 	constructor(
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
@@ -33,7 +35,6 @@ export class TerminalInstanceService extends Disposable implements ITerminalInst
 	) {
 		super();
 		this._terminalShellTypeContextKey = TerminalContextKeys.shellType.bindTo(this._contextKeyService);
-		this._terminalInRunCommandPicker = TerminalContextKeys.inTerminalRunCommandPicker.bindTo(this._contextKeyService);
 
 		for (const remoteAuthority of [undefined, environmentService.remoteAuthority]) {
 			const { promise, resolve } = promiseWithResolvers<void>();
@@ -45,11 +46,7 @@ export class TerminalInstanceService extends Disposable implements ITerminalInst
 	createInstance(shellLaunchConfig: IShellLaunchConfig, target: TerminalLocation): ITerminalInstance;
 	createInstance(config: IShellLaunchConfig | ITerminalProfile, target: TerminalLocation): ITerminalInstance {
 		const shellLaunchConfig = this.convertProfileToShellLaunchConfig(config);
-		const instance = this._instantiationService.createInstance(TerminalInstance,
-			this._terminalShellTypeContextKey,
-			this._terminalInRunCommandPicker,
-			shellLaunchConfig
-		);
+		const instance = this._instantiationService.createInstance(TerminalInstance, this._terminalShellTypeContextKey, shellLaunchConfig);
 		instance.target = target;
 		this._onDidCreateInstance.fire(instance);
 		return instance;
@@ -99,8 +96,9 @@ export class TerminalInstanceService extends Disposable implements ITerminalInst
 		return Registry.as<ITerminalBackendRegistry>(TerminalExtensions.Backend).backends.values();
 	}
 
-	didRegisterBackend(remoteAuthority?: string) {
-		this._backendRegistration.get(remoteAuthority)?.resolve();
+	didRegisterBackend(backend: ITerminalBackend) {
+		this._backendRegistration.get(backend.remoteAuthority)?.resolve();
+		this._onDidRegisterBackend.fire(backend);
 	}
 }
 
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalKeybindings.ts b/src/vs/workbench/contrib/terminal/browser/terminalKeybindings.ts
new file mode 100644
index 00000000000..39aad28d17d
--- /dev/null
+++ b/src/vs/workbench/contrib/terminal/browser/terminalKeybindings.ts
@@ -0,0 +1,24 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ContextKeyExpression } from '../../../../platform/contextkey/common/contextkey.js';
+import { IKeybindings, KeybindingWeight, KeybindingsRegistry } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { TerminalCommandId } from '../common/terminal.js';
+import { TerminalContextKeys } from '../common/terminalContextKey.js';
+import { terminalSendSequenceCommand } from './terminalActions.js';
+
+export function registerSendSequenceKeybinding(text: string, rule: { when?: ContextKeyExpression } & IKeybindings): void {
+	KeybindingsRegistry.registerCommandAndKeybindingRule({
+		id: TerminalCommandId.SendSequence,
+		weight: KeybindingWeight.WorkbenchContrib,
+		when: rule.when || TerminalContextKeys.focus,
+		primary: rule.primary,
+		mac: rule.mac,
+		linux: rule.linux,
+		win: rule.win,
+		handler: terminalSendSequenceCommand,
+		args: { text }
+	});
+}
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalMainContribution.ts b/src/vs/workbench/contrib/terminal/browser/terminalMainContribution.ts
index 06ba21f0289..50a19905ea5 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalMainContribution.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalMainContribution.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { TerminalLocation } from 'vs/platform/terminal/common/terminal';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { ITerminalEditorService, ITerminalGroupService, ITerminalInstanceService, ITerminalService, terminalEditorId } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { parseTerminalUri } from 'vs/workbench/contrib/terminal/browser/terminalUri';
-import { terminalStrings } from 'vs/workbench/contrib/terminal/common/terminalStrings';
-import { IEditorResolverService, RegisteredEditorPriority } from 'vs/workbench/services/editor/common/editorResolverService';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { ILifecycleService, LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IEmbedderTerminalService } from 'vs/workbench/services/terminal/common/embedderTerminalService';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { TerminalLocation } from '../../../../platform/terminal/common/terminal.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { ITerminalEditorService, ITerminalGroupService, ITerminalInstanceService, ITerminalService, terminalEditorId } from './terminal.js';
+import { parseTerminalUri } from './terminalUri.js';
+import { terminalStrings } from '../common/terminalStrings.js';
+import { IEditorResolverService, RegisteredEditorPriority } from '../../../services/editor/common/editorResolverService.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { ILifecycleService, LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { IEmbedderTerminalService } from '../../../services/terminal/common/embedderTerminalService.js';
 
 /**
  * The main contribution for the terminal contrib. This contains calls to other components necessary
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalMenus.ts b/src/vs/workbench/contrib/terminal/browser/terminalMenus.ts
index 73e72755f3e..09cfa17ba27 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalMenus.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalMenus.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Action, IAction, Separator, SubmenuAction } from 'vs/base/common/actions';
-import { Codicon } from 'vs/base/common/codicons';
-import { Schemas } from 'vs/base/common/network';
-import { localize, localize2 } from 'vs/nls';
-import { IMenu, MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IExtensionTerminalProfile, ITerminalProfile, TerminalLocation, TerminalSettingId } from 'vs/platform/terminal/common/terminal';
-import { ResourceContextKey } from 'vs/workbench/common/contextkeys';
-import { TaskExecutionSupportedContext } from 'vs/workbench/contrib/tasks/common/taskService';
-import { ICreateTerminalOptions, ITerminalLocationOptions, ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { TerminalCommandId, TERMINAL_VIEW_ID } from 'vs/workbench/contrib/terminal/common/terminal';
-import { TerminalContextKeys, TerminalContextKeyStrings } from 'vs/workbench/contrib/terminal/common/terminalContextKey';
-import { terminalStrings } from 'vs/workbench/contrib/terminal/common/terminalStrings';
-import { ACTIVE_GROUP, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
+import { Action, IAction, Separator, SubmenuAction } from '../../../../base/common/actions.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { IMenu, MenuId, MenuRegistry } from '../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { IExtensionTerminalProfile, ITerminalProfile, TerminalLocation, TerminalSettingId } from '../../../../platform/terminal/common/terminal.js';
+import { ResourceContextKey } from '../../../common/contextkeys.js';
+import { TaskExecutionSupportedContext } from '../../tasks/common/taskService.js';
+import { ICreateTerminalOptions, ITerminalLocationOptions, ITerminalService } from './terminal.js';
+import { TerminalCommandId, TERMINAL_VIEW_ID } from '../common/terminal.js';
+import { TerminalContextKeys, TerminalContextKeyStrings } from '../common/terminalContextKey.js';
+import { terminalStrings } from '../common/terminalStrings.js';
+import { ACTIVE_GROUP, SIDE_GROUP } from '../../../services/editor/common/editorService.js';
 
 const enum ContextMenuGroup {
 	Create = '1_create',
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalProcessExtHostProxy.ts b/src/vs/workbench/contrib/terminal/browser/terminalProcessExtHostProxy.ts
index 2fc4c40f94c..ade719bd981 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalProcessExtHostProxy.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalProcessExtHostProxy.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IProcessReadyEvent, IShellLaunchConfig, ITerminalChildProcess, ITerminalDimensions, ITerminalLaunchError, IProcessProperty, ProcessPropertyType, IProcessPropertyMap } from 'vs/platform/terminal/common/terminal';
-import { ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { ITerminalProcessExtHostProxy } from 'vs/workbench/contrib/terminal/common/terminal';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IProcessReadyEvent, IShellLaunchConfig, ITerminalChildProcess, ITerminalDimensions, ITerminalLaunchError, IProcessProperty, ProcessPropertyType, IProcessPropertyMap } from '../../../../platform/terminal/common/terminal.js';
+import { ITerminalService } from './terminal.js';
+import { ITerminalProcessExtHostProxy } from '../common/terminal.js';
 
 export class TerminalProcessExtHostProxy extends Disposable implements ITerminalChildProcess, ITerminalProcessExtHostProxy {
 	readonly id = 0;
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts b/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts
index 22204b7a88e..ab4dab9a7ed 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts
@@ -3,48 +3,45 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { IProcessEnvironment, isMacintosh, isWindows, OperatingSystem, OS } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { formatMessageForTerminal } from 'vs/platform/terminal/common/terminalStrings';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { getRemoteAuthority } from 'vs/platform/remote/common/remoteHosts';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { ISerializedCommandDetectionCapability, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { NaiveCwdDetectionCapability } from 'vs/platform/terminal/common/capabilities/naiveCwdDetectionCapability';
-import { TerminalCapabilityStore } from 'vs/platform/terminal/common/capabilities/terminalCapabilityStore';
-import { FlowControlConstants, IProcessDataEvent, IProcessProperty, IProcessPropertyMap, IProcessReadyEvent, IReconnectionProperties, IShellLaunchConfig, ITerminalBackend, ITerminalChildProcess, ITerminalDimensions, ITerminalEnvironment, ITerminalLaunchError, ITerminalLogService, ITerminalProcessOptions, ProcessPropertyType, TerminalSettingId } from 'vs/platform/terminal/common/terminal';
-import { TerminalRecorder } from 'vs/platform/terminal/common/terminalRecorder';
-import { IWorkspaceContextService, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { EnvironmentVariableInfoChangesActive, EnvironmentVariableInfoStale } from 'vs/workbench/contrib/terminal/browser/environmentVariableInfo';
-import { ITerminalConfigurationService, ITerminalInstanceService } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { IEnvironmentVariableInfo, IEnvironmentVariableService } from 'vs/workbench/contrib/terminal/common/environmentVariable';
-import { MergedEnvironmentVariableCollection } from 'vs/platform/terminal/common/environmentVariableCollection';
-import { serializeEnvironmentVariableCollections } from 'vs/platform/terminal/common/environmentVariableShared';
-import { IBeforeProcessDataEvent, ITerminalProcessManager, ITerminalProfileResolverService, ProcessState } from 'vs/workbench/contrib/terminal/common/terminal';
-import * as terminalEnvironment from 'vs/workbench/contrib/terminal/common/terminalEnvironment';
-import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IHistoryService } from 'vs/workbench/services/history/common/history';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { TaskSettingId } from 'vs/workbench/contrib/tasks/common/tasks';
-import Severity from 'vs/base/common/severity';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IEnvironmentVariableCollection, IMergedEnvironmentVariableCollection } from 'vs/platform/terminal/common/environmentVariable';
-import { generateUuid } from 'vs/base/common/uuid';
-import { getActiveWindow, runWhenWindowIdle } from 'vs/base/browser/dom';
-import { mainWindow } from 'vs/base/browser/window';
-import { shouldUseEnvironmentVariableCollection } from 'vs/platform/terminal/common/terminalEnvironment';
-
-// HACK: This file should not depend on terminalContrib
-// eslint-disable-next-line local/code-import-patterns
-import { TerminalSuggestSettingId } from 'vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, dispose, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { IProcessEnvironment, isMacintosh, isWindows, OperatingSystem, OS } from '../../../../base/common/platform.js';
+import { URI } from '../../../../base/common/uri.js';
+import { localize } from '../../../../nls.js';
+import { formatMessageForTerminal } from '../../../../platform/terminal/common/terminalStrings.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { getRemoteAuthority } from '../../../../platform/remote/common/remoteHosts.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { ISerializedCommandDetectionCapability, TerminalCapability } from '../../../../platform/terminal/common/capabilities/capabilities.js';
+import { NaiveCwdDetectionCapability } from '../../../../platform/terminal/common/capabilities/naiveCwdDetectionCapability.js';
+import { TerminalCapabilityStore } from '../../../../platform/terminal/common/capabilities/terminalCapabilityStore.js';
+import { FlowControlConstants, IProcessDataEvent, IProcessProperty, IProcessPropertyMap, IProcessReadyEvent, IReconnectionProperties, IShellLaunchConfig, ITerminalBackend, ITerminalChildProcess, ITerminalDimensions, ITerminalEnvironment, ITerminalLaunchError, ITerminalLogService, ITerminalProcessOptions, ProcessPropertyType, TerminalSettingId } from '../../../../platform/terminal/common/terminal.js';
+import { TerminalRecorder } from '../../../../platform/terminal/common/terminalRecorder.js';
+import { IWorkspaceContextService, IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
+import { EnvironmentVariableInfoChangesActive, EnvironmentVariableInfoStale } from './environmentVariableInfo.js';
+import { ITerminalConfigurationService, ITerminalInstanceService } from './terminal.js';
+import { IEnvironmentVariableInfo, IEnvironmentVariableService } from '../common/environmentVariable.js';
+import { MergedEnvironmentVariableCollection } from '../../../../platform/terminal/common/environmentVariableCollection.js';
+import { serializeEnvironmentVariableCollections } from '../../../../platform/terminal/common/environmentVariableShared.js';
+import { IBeforeProcessDataEvent, ITerminalProcessManager, ITerminalProfileResolverService, ProcessState } from '../common/terminal.js';
+import * as terminalEnvironment from '../common/terminalEnvironment.js';
+import { IConfigurationResolverService } from '../../../services/configurationResolver/common/configurationResolver.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { IHistoryService } from '../../../services/history/common/history.js';
+import { IPathService } from '../../../services/path/common/pathService.js';
+import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';
+import { TaskSettingId } from '../../tasks/common/tasks.js';
+import Severity from '../../../../base/common/severity.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IEnvironmentVariableCollection, IMergedEnvironmentVariableCollection } from '../../../../platform/terminal/common/environmentVariable.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { getActiveWindow, runWhenWindowIdle } from '../../../../base/browser/dom.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { shouldUseEnvironmentVariableCollection } from '../../../../platform/terminal/common/terminalEnvironment.js';
+import { TerminalContribSettingId } from '../terminalContribExports.js';
 
 const enum ProcessConstants {
 	/**
@@ -289,10 +286,11 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
 					const options: ITerminalProcessOptions = {
 						shellIntegration: {
 							enabled: this._configurationService.getValue(TerminalSettingId.ShellIntegrationEnabled),
-							suggestEnabled: this._configurationService.getValue(TerminalSuggestSettingId.Enabled),
+							suggestEnabled: this._configurationService.getValue(TerminalContribSettingId.SuggestEnabled),
 							nonce: this.shellIntegrationNonce
 						},
 						windowsEnableConpty: this._terminalConfigurationService.config.windowsEnableConpty,
+						windowsUseConptyDll: this._terminalConfigurationService.config.experimental?.windowsUseConptyDll ?? false,
 						environmentVariableCollections: this._extEnvironmentVariableCollection?.collections ? serializeEnvironmentVariableCollections(this._extEnvironmentVariableCollection.collections) : undefined,
 						workspaceFolder: this._cwdWorkspaceFolder,
 					};
@@ -489,10 +487,11 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
 		const options: ITerminalProcessOptions = {
 			shellIntegration: {
 				enabled: this._configurationService.getValue(TerminalSettingId.ShellIntegrationEnabled),
-				suggestEnabled: this._configurationService.getValue(TerminalSuggestSettingId.Enabled),
+				suggestEnabled: this._configurationService.getValue(TerminalContribSettingId.SuggestEnabled),
 				nonce: this.shellIntegrationNonce
 			},
 			windowsEnableConpty: this._terminalConfigurationService.config.windowsEnableConpty,
+			windowsUseConptyDll: this._terminalConfigurationService.config.experimental?.windowsUseConptyDll ?? false,
 			environmentVariableCollections: this._extEnvironmentVariableCollection ? serializeEnvironmentVariableCollections(this._extEnvironmentVariableCollection.collections) : undefined,
 			workspaceFolder: this._cwdWorkspaceFolder,
 		};
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalProfileQuickpick.ts b/src/vs/workbench/contrib/terminal/browser/terminalProfileQuickpick.ts
index 20fd702cd14..eff79840baf 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalProfileQuickpick.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalProfileQuickpick.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from 'vs/base/common/codicons';
-import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IQuickInputService, IKeyMods, IPickOptions, IQuickPickSeparator, IQuickInputButton, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { IExtensionTerminalProfile, ITerminalProfile, ITerminalProfileObject, TerminalSettingPrefix, type ITerminalExecutable } from 'vs/platform/terminal/common/terminal';
-import { getUriClasses, getColorClass, createColorStyleElement } from 'vs/workbench/contrib/terminal/browser/terminalIcon';
-import { configureTerminalProfileIcon } from 'vs/workbench/contrib/terminal/browser/terminalIcons';
-import * as nls from 'vs/nls';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { ITerminalProfileResolverService, ITerminalProfileService } from 'vs/workbench/contrib/terminal/common/terminal';
-import { IQuickPickTerminalObject, ITerminalInstance } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { IPickerQuickAccessItem } from 'vs/platform/quickinput/browser/pickerQuickAccess';
-import { getIconRegistry } from 'vs/platform/theme/common/iconRegistry';
-import { basename } from 'vs/base/common/path';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { ConfigurationTarget, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IQuickInputService, IKeyMods, IPickOptions, IQuickPickSeparator, IQuickInputButton, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
+import { IExtensionTerminalProfile, ITerminalProfile, ITerminalProfileObject, TerminalSettingPrefix, type ITerminalExecutable } from '../../../../platform/terminal/common/terminal.js';
+import { getUriClasses, getColorClass, createColorStyleElement } from './terminalIcon.js';
+import { configureTerminalProfileIcon } from './terminalIcons.js';
+import * as nls from '../../../../nls.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { ITerminalProfileResolverService, ITerminalProfileService } from '../common/terminal.js';
+import { IQuickPickTerminalObject, ITerminalInstance } from './terminal.js';
+import { IPickerQuickAccessItem } from '../../../../platform/quickinput/browser/pickerQuickAccess.js';
+import { getIconRegistry } from '../../../../platform/theme/common/iconRegistry.js';
+import { basename } from '../../../../base/common/path.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
 
 
 type DefaultProfileName = string;
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalProfileResolverService.ts b/src/vs/workbench/contrib/terminal/browser/terminalProfileResolverService.ts
index a4b662a065c..6208cfc0413 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalProfileResolverService.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalProfileResolverService.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Schemas } from 'vs/base/common/network';
-import { env } from 'vs/base/common/process';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IWorkspaceContextService, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
-import { IHistoryService } from 'vs/workbench/services/history/common/history';
-import { IProcessEnvironment, OperatingSystem, OS } from 'vs/base/common/platform';
-import { IShellLaunchConfig, ITerminalLogService, ITerminalProfile, TerminalIcon, TerminalSettingId } from 'vs/platform/terminal/common/terminal';
-import { IShellLaunchConfigResolveOptions, ITerminalProfileResolverService, ITerminalProfileService } from 'vs/workbench/contrib/terminal/common/terminal';
-import * as path from 'vs/base/common/path';
-import { Codicon } from 'vs/base/common/codicons';
-import { getIconRegistry, IIconRegistry } from 'vs/platform/theme/common/iconRegistry';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { debounce } from 'vs/base/common/decorators';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { URI } from 'vs/base/common/uri';
-import { deepClone } from 'vs/base/common/objects';
-import { isUriComponents } from 'vs/platform/terminal/common/terminalProfiles';
-import { ITerminalInstanceService } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { Disposable } from 'vs/base/common/lifecycle';
+import { Schemas } from '../../../../base/common/network.js';
+import { env } from '../../../../base/common/process.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IWorkspaceContextService, IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
+import { IConfigurationResolverService } from '../../../services/configurationResolver/common/configurationResolver.js';
+import { IHistoryService } from '../../../services/history/common/history.js';
+import { IProcessEnvironment, OperatingSystem, OS } from '../../../../base/common/platform.js';
+import { IShellLaunchConfig, ITerminalLogService, ITerminalProfile, TerminalIcon, TerminalSettingId } from '../../../../platform/terminal/common/terminal.js';
+import { IShellLaunchConfigResolveOptions, ITerminalProfileResolverService, ITerminalProfileService } from '../common/terminal.js';
+import * as path from '../../../../base/common/path.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { getIconRegistry, IIconRegistry } from '../../../../platform/theme/common/iconRegistry.js';
+import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';
+import { debounce } from '../../../../base/common/decorators.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { URI } from '../../../../base/common/uri.js';
+import { deepClone } from '../../../../base/common/objects.js';
+import { isUriComponents } from '../../../../platform/terminal/common/terminalProfiles.js';
+import { ITerminalInstanceService } from './terminal.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
 
 export interface IProfileContextProvider {
 	getDefaultSystemShell(remoteAuthority: string | undefined, os: OperatingSystem): Promise<string>;
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalProfileService.ts b/src/vs/workbench/contrib/terminal/browser/terminalProfileService.ts
index ce5bf14c23c..0a7f1950e25 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalProfileService.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalProfileService.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as arrays from 'vs/base/common/arrays';
-import * as objects from 'vs/base/common/objects';
-import { AutoOpenBarrier } from 'vs/base/common/async';
-import { throttle } from 'vs/base/common/decorators';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, IDisposable, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { isMacintosh, isWeb, isWindows, OperatingSystem, OS } from 'vs/base/common/platform';
-import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ITerminalProfile, IExtensionTerminalProfile, TerminalSettingPrefix, TerminalSettingId, ITerminalProfileObject, IShellLaunchConfig, ITerminalExecutable } from 'vs/platform/terminal/common/terminal';
-import { registerTerminalDefaultProfileConfiguration } from 'vs/platform/terminal/common/terminalPlatformConfiguration';
-import { terminalIconsEqual, terminalProfileArgsMatch } from 'vs/platform/terminal/common/terminalProfiles';
-import { ITerminalInstanceService } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { refreshTerminalActions } from 'vs/workbench/contrib/terminal/browser/terminalActions';
-import { IRegisterContributedProfileArgs, ITerminalProfileProvider, ITerminalProfileService } from 'vs/workbench/contrib/terminal/common/terminal';
-import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey';
-import { ITerminalContributionService } from 'vs/workbench/contrib/terminal/common/terminalExtensionPoints';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
+import * as arrays from '../../../../base/common/arrays.js';
+import * as objects from '../../../../base/common/objects.js';
+import { AutoOpenBarrier } from '../../../../base/common/async.js';
+import { throttle } from '../../../../base/common/decorators.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, IDisposable, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { isMacintosh, isWeb, isWindows, OperatingSystem, OS } from '../../../../base/common/platform.js';
+import { ConfigurationTarget, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { ITerminalProfile, IExtensionTerminalProfile, TerminalSettingPrefix, TerminalSettingId, ITerminalProfileObject, IShellLaunchConfig, ITerminalExecutable } from '../../../../platform/terminal/common/terminal.js';
+import { registerTerminalDefaultProfileConfiguration } from '../../../../platform/terminal/common/terminalPlatformConfiguration.js';
+import { terminalIconsEqual, terminalProfileArgsMatch } from '../../../../platform/terminal/common/terminalProfiles.js';
+import { ITerminalInstanceService } from './terminal.js';
+import { refreshTerminalActions } from './terminalActions.js';
+import { IRegisterContributedProfileArgs, ITerminalProfileProvider, ITerminalProfileService } from '../common/terminal.js';
+import { TerminalContextKeys } from '../common/terminalContextKey.js';
+import { ITerminalContributionService } from '../common/terminalExtensionPoints.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';
 
 /*
  * Links TerminalService with TerminalProfileResolverService
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalResizeDebouncer.ts b/src/vs/workbench/contrib/terminal/browser/terminalResizeDebouncer.ts
new file mode 100644
index 00000000000..8afe11348cc
--- /dev/null
+++ b/src/vs/workbench/contrib/terminal/browser/terminalResizeDebouncer.ts
@@ -0,0 +1,84 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { getWindow, runWhenWindowIdle } from '../../../../base/browser/dom.js';
+import { debounce } from '../../../../base/common/decorators.js';
+import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import type { XtermTerminal } from './xterm/xtermTerminal.js';
+
+const enum Constants {
+	/**
+	 * The _normal_ buffer length threshold at which point resizing starts being debounced.
+	 */
+	StartDebouncingThreshold = 200,
+}
+
+export class TerminalResizeDebouncer extends Disposable {
+	private _latestX: number = 0;
+	private _latestY: number = 0;
+
+	private readonly _resizeXJob = this._register(new MutableDisposable());
+	private readonly _resizeYJob = this._register(new MutableDisposable());
+
+	constructor(
+		private readonly _isVisible: () => boolean,
+		private readonly _getXterm: () => XtermTerminal | undefined,
+		private readonly _resizeBothCallback: (cols: number, rows: number) => void,
+		private readonly _resizeXCallback: (cols: number) => void,
+		private readonly _resizeYCallback: (rows: number) => void,
+	) {
+		super();
+	}
+
+	async resize(cols: number, rows: number, immediate: boolean): Promise<void> {
+		this._latestX = cols;
+		this._latestY = rows;
+
+		// Resize immediately if requested explicitly or if the buffer is small
+		if (immediate || this._getXterm()!.raw.buffer.normal.length < Constants.StartDebouncingThreshold) {
+			this._resizeXJob.clear();
+			this._resizeYJob.clear();
+			this._resizeBothCallback(cols, rows);
+			return;
+		}
+
+		// Resize in an idle callback if the terminal is not visible
+		const win = getWindow(this._getXterm()!.raw.element);
+		if (win && !this._isVisible()) {
+			if (!this._resizeXJob.value) {
+				this._resizeXJob.value = runWhenWindowIdle(win, async () => {
+					this._resizeXCallback(this._latestX);
+					this._resizeXJob.clear();
+				});
+			}
+			if (!this._resizeYJob.value) {
+				this._resizeYJob.value = runWhenWindowIdle(win, async () => {
+					this._resizeYCallback(this._latestY);
+					this._resizeYJob.clear();
+				});
+			}
+			return;
+		}
+
+		// Update dimensions independently as vertical resize is cheap and horizontal resize is
+		// expensive due to reflow.
+		this._resizeYCallback(rows);
+		this._latestX = cols;
+		this._debounceResizeX(cols);
+	}
+
+	flush(): void {
+		if (this._resizeXJob.value || this._resizeYJob.value) {
+			this._resizeXJob.clear();
+			this._resizeYJob.clear();
+			this._resizeBothCallback(this._latestX, this._latestY);
+		}
+	}
+
+	@debounce(100)
+	private _debounceResizeX(cols: number) {
+		this._resizeXCallback(cols);
+	}
+}
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalService.ts b/src/vs/workbench/contrib/terminal/browser/terminalService.ts
index e2edac02afd..d98416649fe 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalService.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalService.ts
@@ -3,60 +3,60 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { DeferredPromise, timeout } from 'vs/base/common/async';
-import { debounce, memoize } from 'vs/base/common/decorators';
-import { DynamicListEventMultiplexer, Emitter, Event, IDynamicListEventMultiplexer } from 'vs/base/common/event';
-import { Disposable, dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { isMacintosh, isWeb } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { IKeyMods } from 'vs/platform/quickinput/common/quickInput';
-import * as nls from 'vs/nls';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { ICreateContributedTerminalProfileOptions, IExtensionTerminalProfile, IPtyHostAttachTarget, IRawTerminalInstanceLayoutInfo, IRawTerminalTabLayoutInfo, IShellLaunchConfig, ITerminalBackend, ITerminalLaunchError, ITerminalLogService, ITerminalsLayoutInfo, ITerminalsLayoutInfoById, TerminalExitReason, TerminalLocation, TerminalLocationString, TitleEventSource } from 'vs/platform/terminal/common/terminal';
-import { formatMessageForTerminal } from 'vs/platform/terminal/common/terminalStrings';
-import { iconForeground } from 'vs/platform/theme/common/colorRegistry';
-import { getIconRegistry } from 'vs/platform/theme/common/iconRegistry';
-import { ColorScheme } from 'vs/platform/theme/common/theme';
-import { IThemeService, Themable } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { VirtualWorkspaceContext } from 'vs/workbench/common/contextkeys';
-import { IEditableData } from 'vs/workbench/common/views';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { ICreateTerminalOptions, IDetachedTerminalInstance, IDetachedXTermOptions, IRequestAddInstanceToGroupEvent, ITerminalConfigurationService, ITerminalEditorService, ITerminalGroup, ITerminalGroupService, ITerminalInstance, ITerminalInstanceHost, ITerminalInstanceService, ITerminalLocationOptions, ITerminalService, ITerminalServiceNativeDelegate, TerminalConnectionState, TerminalEditorLocation } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { getCwdForSplit } from 'vs/workbench/contrib/terminal/browser/terminalActions';
-import { TerminalEditorInput } from 'vs/workbench/contrib/terminal/browser/terminalEditorInput';
-import { getColorStyleContent, getUriClasses } from 'vs/workbench/contrib/terminal/browser/terminalIcon';
-import { TerminalProfileQuickpick } from 'vs/workbench/contrib/terminal/browser/terminalProfileQuickpick';
-import { getInstanceFromResource, getTerminalUri, parseTerminalUri } from 'vs/workbench/contrib/terminal/browser/terminalUri';
-import { TerminalViewPane } from 'vs/workbench/contrib/terminal/browser/terminalView';
-import { IRemoteTerminalAttachTarget, IStartExtensionTerminalRequest, ITerminalProcessExtHostProxy, ITerminalProfileService, TERMINAL_VIEW_ID } from 'vs/workbench/contrib/terminal/common/terminal';
-import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey';
-import { columnToEditorGroup } from 'vs/workbench/services/editor/common/editorGroupColumn';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { ACTIVE_GROUP_TYPE, AUX_WINDOW_GROUP, AUX_WINDOW_GROUP_TYPE, IEditorService, SIDE_GROUP, SIDE_GROUP_TYPE } from 'vs/workbench/services/editor/common/editorService';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { ILifecycleService, ShutdownReason, StartupKind, WillShutdownEvent } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { XtermTerminal } from 'vs/workbench/contrib/terminal/browser/xterm/xtermTerminal';
-import { TerminalInstance } from 'vs/workbench/contrib/terminal/browser/terminalInstance';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { TerminalCapabilityStore } from 'vs/platform/terminal/common/capabilities/terminalCapabilityStore';
-import { ITimerService } from 'vs/workbench/services/timer/browser/timerService';
-import { mark } from 'vs/base/common/performance';
-import { DetachedTerminal } from 'vs/workbench/contrib/terminal/browser/detachedTerminal';
-import { ITerminalCapabilityImplMap, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { createInstanceCapabilityEventMultiplexer } from 'vs/workbench/contrib/terminal/browser/terminalEvents';
-import { mainWindow } from 'vs/base/browser/window';
-import { GroupIdentifier } from 'vs/workbench/common/editor';
+import * as dom from '../../../../base/browser/dom.js';
+import { DeferredPromise, timeout } from '../../../../base/common/async.js';
+import { debounce, memoize } from '../../../../base/common/decorators.js';
+import { DynamicListEventMultiplexer, Emitter, Event, IDynamicListEventMultiplexer } from '../../../../base/common/event.js';
+import { Disposable, dispose, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { isMacintosh, isWeb } from '../../../../base/common/platform.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IKeyMods } from '../../../../platform/quickinput/common/quickInput.js';
+import * as nls from '../../../../nls.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { ICreateContributedTerminalProfileOptions, IExtensionTerminalProfile, IPtyHostAttachTarget, IRawTerminalInstanceLayoutInfo, IRawTerminalTabLayoutInfo, IShellLaunchConfig, ITerminalBackend, ITerminalLaunchError, ITerminalLogService, ITerminalsLayoutInfo, ITerminalsLayoutInfoById, TerminalExitReason, TerminalLocation, TerminalLocationString, TitleEventSource } from '../../../../platform/terminal/common/terminal.js';
+import { formatMessageForTerminal } from '../../../../platform/terminal/common/terminalStrings.js';
+import { iconForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import { getIconRegistry } from '../../../../platform/theme/common/iconRegistry.js';
+import { ColorScheme } from '../../../../platform/theme/common/theme.js';
+import { IThemeService, Themable } from '../../../../platform/theme/common/themeService.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { VirtualWorkspaceContext } from '../../../common/contextkeys.js';
+import { IEditableData } from '../../../common/views.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { ICreateTerminalOptions, IDetachedTerminalInstance, IDetachedXTermOptions, IRequestAddInstanceToGroupEvent, ITerminalConfigurationService, ITerminalEditorService, ITerminalGroup, ITerminalGroupService, ITerminalInstance, ITerminalInstanceHost, ITerminalInstanceService, ITerminalLocationOptions, ITerminalService, ITerminalServiceNativeDelegate, TerminalConnectionState, TerminalEditorLocation } from './terminal.js';
+import { getCwdForSplit } from './terminalActions.js';
+import { TerminalEditorInput } from './terminalEditorInput.js';
+import { getColorStyleContent, getUriClasses } from './terminalIcon.js';
+import { TerminalProfileQuickpick } from './terminalProfileQuickpick.js';
+import { getInstanceFromResource, getTerminalUri, parseTerminalUri } from './terminalUri.js';
+import { TerminalViewPane } from './terminalView.js';
+import { IRemoteTerminalAttachTarget, IStartExtensionTerminalRequest, ITerminalProcessExtHostProxy, ITerminalProfileService, TERMINAL_VIEW_ID } from '../common/terminal.js';
+import { TerminalContextKeys } from '../common/terminalContextKey.js';
+import { columnToEditorGroup } from '../../../services/editor/common/editorGroupColumn.js';
+import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { ACTIVE_GROUP_TYPE, AUX_WINDOW_GROUP, AUX_WINDOW_GROUP_TYPE, IEditorService, SIDE_GROUP, SIDE_GROUP_TYPE } from '../../../services/editor/common/editorService.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { ILifecycleService, ShutdownReason, StartupKind, WillShutdownEvent } from '../../../services/lifecycle/common/lifecycle.js';
+import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';
+import { XtermTerminal } from './xterm/xtermTerminal.js';
+import { TerminalInstance } from './terminalInstance.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { TerminalCapabilityStore } from '../../../../platform/terminal/common/capabilities/terminalCapabilityStore.js';
+import { ITimerService } from '../../../services/timer/browser/timerService.js';
+import { mark } from '../../../../base/common/performance.js';
+import { DetachedTerminal } from './detachedTerminal.js';
+import { ITerminalCapabilityImplMap, TerminalCapability } from '../../../../platform/terminal/common/capabilities/capabilities.js';
+import { createInstanceCapabilityEventMultiplexer } from './terminalEvents.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { GroupIdentifier } from '../../../common/editor.js';
 
 export class TerminalService extends Disposable implements ITerminalService {
 	declare _serviceBrand: undefined;
@@ -208,7 +208,7 @@ export class TerminalService extends Disposable implements ITerminalService {
 			}
 			if (instance?.shellType) {
 				this._terminalShellTypeContextKey.set(instance.shellType.toString());
-			} else if (!instance) {
+			} else if (!instance || !(instance.shellType)) {
 				this._terminalShellTypeContextKey.reset();
 			}
 		}));
@@ -380,14 +380,18 @@ export class TerminalService extends Disposable implements ITerminalService {
 		}
 	}
 
+	async focusInstance(instance: ITerminalInstance): Promise<void> {
+		if (instance.target === TerminalLocation.Editor) {
+			return this._terminalEditorService.focusInstance(instance);
+		}
+		return this._terminalGroupService.focusInstance(instance);
+	}
+
 	async focusActiveInstance(): Promise<void> {
 		if (!this._activeInstance) {
 			return;
 		}
-		if (this._activeInstance.target === TerminalLocation.Editor) {
-			return this._terminalEditorService.focusActiveInstance();
-		}
-		return this._terminalGroupService.focusActiveInstance();
+		return this.focusInstance(this._activeInstance);
 	}
 
 	async createContributedTerminalProfile(extensionIdentifier: string, id: string, options: ICreateContributedTerminalProfileOptions): Promise<void> {
@@ -558,16 +562,20 @@ export class TerminalService extends Disposable implements ITerminalService {
 		return instance;
 	}
 
+	async revealTerminal(source: ITerminalInstance, preserveFocus?: boolean): Promise<void> {
+		if (source.target === TerminalLocation.Editor) {
+			await this._terminalEditorService.revealActiveEditor(preserveFocus);
+		} else {
+			await this._terminalGroupService.showPanel();
+		}
+	}
+
 	async revealActiveTerminal(preserveFocus?: boolean): Promise<void> {
 		const instance = this.activeInstance;
 		if (!instance) {
 			return;
 		}
-		if (instance.target === TerminalLocation.Editor) {
-			await this._terminalEditorService.revealActiveEditor(preserveFocus);
-		} else {
-			await this._terminalGroupService.showPanel();
-		}
+		await this.revealTerminal(instance, preserveFocus);
 	}
 
 	setEditable(instance: ITerminalInstance, data?: IEditableData | null): void {
@@ -815,7 +823,7 @@ export class TerminalService extends Disposable implements ITerminalService {
 
 		if (target && side) {
 			const index = group.terminalInstances.indexOf(target) + (side === 'after' ? 1 : 0);
-			group.moveInstance(source, index);
+			group.moveInstance(source, index, side);
 		}
 
 		// Fire events
@@ -1015,16 +1023,12 @@ export class TerminalService extends Disposable implements ITerminalService {
 
 	async createDetachedTerminal(options: IDetachedXTermOptions): Promise<IDetachedTerminalInstance> {
 		const ctor = await TerminalInstance.getXtermConstructor(this._keybindingService, this._contextKeyService);
-		const xterm = this._instantiationService.createInstance(
-			XtermTerminal,
-			ctor,
-			options.cols,
-			options.rows,
-			options.colorProvider,
-			options.capabilities || new TerminalCapabilityStore(),
-			'',
-			false,
-		);
+		const xterm = this._instantiationService.createInstance(XtermTerminal, ctor, {
+			cols: options.cols,
+			rows: options.rows,
+			xtermColorProvider: options.colorProvider,
+			capabilities: options.capabilities || new TerminalCapabilityStore(),
+		});
 
 		if (options.readonly) {
 			xterm.raw.attachCustomKeyEventHandler(() => false);
@@ -1073,7 +1077,7 @@ export class TerminalService extends Disposable implements ITerminalService {
 		} else {
 			const group = this._terminalGroupService.getGroupForInstance(parent);
 			if (!group) {
-				throw new Error(`Cannot split a terminal without a group ${parent}`);
+				throw new Error(`Cannot split a terminal without a group (instanceId: ${parent.instanceId}, title: ${parent.title})`);
 			}
 			shellLaunchConfig.parentTerminalId = parent.instanceId;
 			instance = group.split(shellLaunchConfig);
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalStatusList.ts b/src/vs/workbench/contrib/terminal/browser/terminalStatusList.ts
index 6f04b00d7f8..ecc8d38258b 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalStatusList.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalStatusList.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from 'vs/base/common/codicons';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import Severity from 'vs/base/common/severity';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TerminalSettingId } from 'vs/platform/terminal/common/terminal';
-import { listErrorForeground, listWarningForeground } from 'vs/platform/theme/common/colorRegistry';
-import { spinningLoading } from 'vs/platform/theme/common/iconRegistry';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { ITerminalStatus } from 'vs/workbench/contrib/terminal/common/terminal';
-import { mainWindow } from 'vs/base/browser/window';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import Severity from '../../../../base/common/severity.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { TerminalSettingId } from '../../../../platform/terminal/common/terminal.js';
+import { listErrorForeground, listWarningForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import { spinningLoading } from '../../../../platform/theme/common/iconRegistry.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { ITerminalStatus } from '../common/terminal.js';
+import { mainWindow } from '../../../../base/browser/window.js';
 
 /**
  * The set of _internal_ terminal statuses, other components building on the terminal should put
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts b/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts
index 285c7a72ec1..33c584f8586 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts
@@ -3,28 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { LayoutPriority, Orientation, Sizing, SplitView } from 'vs/base/browser/ui/splitview/splitview';
-import { Disposable, dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ITerminalConfigurationService, ITerminalGroupService, ITerminalInstance, ITerminalService, TerminalConnectionState } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { TerminalTabsListSizes, TerminalTabList } from 'vs/workbench/contrib/terminal/browser/terminalTabsList';
-import { isMacintosh } from 'vs/base/common/platform';
-import * as dom from 'vs/base/browser/dom';
-import { BrowserFeatures } from 'vs/base/browser/canIUse';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { Action, IAction, Separator } from 'vs/base/common/actions';
-import { IMenu, IMenuService, MenuId } from 'vs/platform/actions/common/actions';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { TerminalSettingId } from 'vs/platform/terminal/common/terminal';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { localize } from 'vs/nls';
-import { openContextMenu } from 'vs/workbench/contrib/terminal/browser/terminalContextMenu';
-import { TerminalStorageKeys } from 'vs/workbench/contrib/terminal/common/terminalStorageKeys';
-import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey';
-import { getInstanceHoverInfo } from 'vs/workbench/contrib/terminal/browser/terminalTooltip';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import { LayoutPriority, Orientation, Sizing, SplitView } from '../../../../base/browser/ui/splitview/splitview.js';
+import { Disposable, dispose, IDisposable } from '../../../../base/common/lifecycle.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ITerminalConfigurationService, ITerminalGroupService, ITerminalInstance, ITerminalService, TerminalConnectionState } from './terminal.js';
+import { TerminalTabsListSizes, TerminalTabList } from './terminalTabsList.js';
+import * as dom from '../../../../base/browser/dom.js';
+import { Action, IAction, Separator } from '../../../../base/common/actions.js';
+import { IMenu, IMenuService, MenuId } from '../../../../platform/actions/common/actions.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { TerminalSettingId } from '../../../../platform/terminal/common/terminal.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { localize } from '../../../../nls.js';
+import { openContextMenu } from './terminalContextMenu.js';
+import { TerminalStorageKeys } from '../common/terminalStorageKeys.js';
+import { TerminalContextKeys } from '../common/terminalContextKey.js';
+import { getInstanceHoverInfo } from './terminalTooltip.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 
 const $ = dom.$;
 
@@ -73,7 +70,6 @@ export class TerminalTabbedView extends Disposable {
 		@ITerminalConfigurationService private readonly _terminalConfigurationService: ITerminalConfigurationService,
 		@ITerminalGroupService private readonly _terminalGroupService: ITerminalGroupService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-		@INotificationService private readonly _notificationService: INotificationService,
 		@IContextMenuService private readonly _contextMenuService: IContextMenuService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@IMenuService menuService: IMenuService,
@@ -332,57 +328,9 @@ export class TerminalTabbedView extends Disposable {
 		}));
 		this._register(dom.addDisposableListener(terminalContainer, 'mousedown', async (event: MouseEvent) => {
 			const terminal = this._terminalGroupService.activeInstance;
-			if (this._terminalGroupService.instances.length === 0 || !terminal) {
-				this._cancelContextMenu = true;
-				return;
-			}
-
-			if (event.which === 2) {
-				switch (this._terminalConfigurationService.config.middleClickBehavior) {
-					case 'paste':
-						terminal.paste();
-						break;
-					case 'default':
-					default:
-						// Drop selection and focus terminal on Linux to enable middle button paste
-						// when click occurs on the selection itself.
-						terminal.focus();
-						break;
-				}
-			} else if (event.which === 3) {
-				const rightClickBehavior = this._terminalConfigurationService.config.rightClickBehavior;
-				if (rightClickBehavior === 'nothing') {
-					if (!event.shiftKey) {
-						this._cancelContextMenu = true;
-					}
-					return;
-				}
-				else if (rightClickBehavior === 'copyPaste' || rightClickBehavior === 'paste') {
-					// copyPaste: Shift+right click should open context menu
-					if (rightClickBehavior === 'copyPaste' && event.shiftKey) {
-						openContextMenu(dom.getWindow(terminalContainer), event, terminal, this._instanceMenu, this._contextMenuService);
-						return;
-					}
-
-					if (rightClickBehavior === 'copyPaste' && terminal.hasSelection()) {
-						await terminal.copySelection();
-						terminal.clearSelection();
-					} else {
-						if (BrowserFeatures.clipboard.readText) {
-							terminal.paste();
-						} else {
-							this._notificationService.info(`This browser doesn't support the clipboard.readText API needed to trigger a paste, try ${isMacintosh ? '⌘' : 'Ctrl'}+V instead.`);
-						}
-					}
-					// Clear selection after all click event bubbling is finished on Mac to prevent
-					// right-click selecting a word which is seemed cannot be disabled. There is a
-					// flicker when pasting but this appears to give the best experience if the
-					// setting is enabled.
-					if (isMacintosh) {
-						setTimeout(() => {
-							terminal.clearSelection();
-						}, 0);
-					}
+			if (this._terminalGroupService.instances.length > 0 && terminal) {
+				const result = await terminal.handleMouseEvent(event, this._instanceMenu);
+				if (typeof result === 'object' && result.cancelContextMenu) {
 					this._cancelContextMenu = true;
 				}
 			}
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts b/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts
index b81f20a1e7d..8583251b7eb 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts
@@ -3,55 +3,56 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IListService, WorkbenchList } from 'vs/platform/list/browser/listService';
-import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { ITerminalGroupService, ITerminalInstance, ITerminalService, TerminalDataTransfers } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { localize } from 'vs/nls';
-import * as DOM from 'vs/base/browser/dom';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { MenuItemAction } from 'vs/platform/actions/common/actions';
-import { MenuEntryActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { TerminalCommandId } from 'vs/workbench/contrib/terminal/common/terminal';
-import { ITerminalBackend, TerminalLocation, TerminalSettingId } from 'vs/platform/terminal/common/terminal';
-import { Codicon } from 'vs/base/common/codicons';
-import { Action } from 'vs/base/common/actions';
-import { DEFAULT_LABELS_CONTAINER, IResourceLabel, ResourceLabels } from 'vs/workbench/browser/labels';
-import { IDecorationData, IDecorationsProvider, IDecorationsService } from 'vs/workbench/services/decorations/common/decorations';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import Severity from 'vs/base/common/severity';
-import { Disposable, DisposableStore, dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IListDragAndDrop, IListDragOverReaction, IListRenderer, ListDragOverEffectPosition, ListDragOverEffectType } from 'vs/base/browser/ui/list/list';
-import { DataTransfers, IDragAndDropData } from 'vs/base/browser/dnd';
-import { disposableTimeout } from 'vs/base/common/async';
-import { ElementsDragAndDropData, ListViewTargetSector, NativeDragAndDropData } from 'vs/base/browser/ui/list/listView';
-import { URI } from 'vs/base/common/uri';
-import { getColorClass, getIconId, getUriClasses } from 'vs/workbench/contrib/terminal/browser/terminalIcon';
-import { IEditableData } from 'vs/workbench/common/views';
-import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { InputBox, MessageType } from 'vs/base/browser/ui/inputbox/inputBox';
-import { createSingleCallFunction } from 'vs/base/common/functional';
-import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { CodeDataTransfers, containsDragType } from 'vs/platform/dnd/browser/dnd';
-import { terminalStrings } from 'vs/workbench/contrib/terminal/common/terminalStrings';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IProcessDetails } from 'vs/platform/terminal/common/terminalProcess';
-import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey';
-import { getTerminalResourcesFromDragEvent, parseTerminalUri } from 'vs/workbench/contrib/terminal/browser/terminalUri';
-import { getInstanceHoverInfo } from 'vs/workbench/contrib/terminal/browser/terminalTooltip';
-import { defaultInputBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { Emitter } from 'vs/base/common/event';
-import { Schemas } from 'vs/base/common/network';
-import { getColorForSeverity } from 'vs/workbench/contrib/terminal/browser/terminalStatusList';
-import { TerminalContextActionRunner } from 'vs/workbench/contrib/terminal/browser/terminalContextMenu';
-import type { IHoverAction } from 'vs/base/browser/ui/hover/hover';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
+import { IListService, WorkbenchList } from '../../../../platform/list/browser/listService.js';
+import { IListAccessibilityProvider } from '../../../../base/browser/ui/list/listWidget.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { ITerminalConfigurationService, ITerminalGroupService, ITerminalInstance, ITerminalService, TerminalDataTransfers } from './terminal.js';
+import { localize } from '../../../../nls.js';
+import * as DOM from '../../../../base/browser/dom.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { MenuItemAction } from '../../../../platform/actions/common/actions.js';
+import { MenuEntryActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { TerminalCommandId } from '../common/terminal.js';
+import { ITerminalBackend, TerminalLocation, TerminalSettingId } from '../../../../platform/terminal/common/terminal.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Action } from '../../../../base/common/actions.js';
+import { DEFAULT_LABELS_CONTAINER, IResourceLabel, ResourceLabels } from '../../../browser/labels.js';
+import { IDecorationData, IDecorationsProvider, IDecorationsService } from '../../../services/decorations/common/decorations.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import Severity from '../../../../base/common/severity.js';
+import { Disposable, DisposableStore, dispose, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { IListDragAndDrop, IListDragOverReaction, IListRenderer, ListDragOverEffectPosition, ListDragOverEffectType } from '../../../../base/browser/ui/list/list.js';
+import { DataTransfers, IDragAndDropData } from '../../../../base/browser/dnd.js';
+import { disposableTimeout } from '../../../../base/common/async.js';
+import { ElementsDragAndDropData, ListViewTargetSector, NativeDragAndDropData } from '../../../../base/browser/ui/list/listView.js';
+import { URI } from '../../../../base/common/uri.js';
+import { getColorClass, getIconId, getUriClasses } from './terminalIcon.js';
+import { IEditableData } from '../../../common/views.js';
+import { IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { InputBox, MessageType } from '../../../../base/browser/ui/inputbox/inputBox.js';
+import { createSingleCallFunction } from '../../../../base/common/functional.js';
+import { IKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { CodeDataTransfers, containsDragType } from '../../../../platform/dnd/browser/dnd.js';
+import { terminalStrings } from '../common/terminalStrings.js';
+import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.js';
+import { IProcessDetails } from '../../../../platform/terminal/common/terminalProcess.js';
+import { TerminalContextKeys } from '../common/terminalContextKey.js';
+import { getTerminalResourcesFromDragEvent, parseTerminalUri } from './terminalUri.js';
+import { getInstanceHoverInfo } from './terminalTooltip.js';
+import { defaultInputBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { getColorForSeverity } from './terminalStatusList.js';
+import { TerminalContextActionRunner } from './terminalContextMenu.js';
+import type { IHoverAction } from '../../../../base/browser/ui/hover/hover.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { HoverPosition } from '../../../../base/browser/ui/hover/hoverWidget.js';
 
 const $ = DOM.$;
 
@@ -250,6 +251,7 @@ class TerminalTabsRenderer implements IListRenderer<ITerminalInstance, ITerminal
 		private readonly _labels: ResourceLabels,
 		private readonly _getSelection: () => ITerminalInstance[],
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@ITerminalConfigurationService private readonly _terminalConfigurationService: ITerminalConfigurationService,
 		@ITerminalService private readonly _terminalService: ITerminalService,
 		@ITerminalGroupService private readonly _terminalGroupService: ITerminalGroupService,
 		@IHoverService private readonly _hoverService: IHoverService,
@@ -274,8 +276,15 @@ class TerminalTabsRenderer implements IListRenderer<ITerminalInstance, ITerminal
 					return this._hoverService.showHover({
 						...options,
 						actions: context.hoverActions,
+						target: element,
 						persistence: {
 							hideOnHover: true
+						},
+						appearance: {
+							showPointer: true
+						},
+						position: {
+							hoverPosition: this._terminalConfigurationService.config.tabs.location === 'left' ? HoverPosition.RIGHT : HoverPosition.LEFT
 						}
 					});
 				}
@@ -579,6 +588,7 @@ class TerminalTabsDragAndDrop extends Disposable implements IListDragAndDrop<ITe
 		@ITerminalService private readonly _terminalService: ITerminalService,
 		@ITerminalGroupService private readonly _terminalGroupService: ITerminalGroupService,
 		@IHostService private readonly _hostService: IHostService,
+		@IListService private readonly _listService: IListService,
 	) {
 		super();
 		this._primaryBackend = this._terminalService.getPrimaryBackend();
@@ -659,7 +669,11 @@ class TerminalTabsDragAndDrop extends Disposable implements IListDragAndDrop<ITe
 			for (const uri of resources) {
 				const instance = this._terminalService.getInstanceFromResource(uri);
 				if (instance) {
-					sourceInstances = [instance];
+					if (Array.isArray(sourceInstances)) {
+						sourceInstances.push(instance);
+					} else {
+						sourceInstances = [instance];
+					}
 					this._terminalService.moveToTerminalView(instance);
 				} else if (this._primaryBackend) {
 					const terminalIdentifier = parseTerminalUri(uri);
@@ -703,18 +717,22 @@ class TerminalTabsDragAndDrop extends Disposable implements IListDragAndDrop<ITe
 		}
 
 		if (!targetInstance) {
-			this._terminalGroupService.moveGroupToEnd(sourceInstances[0]);
+			this._terminalGroupService.moveGroupToEnd(sourceInstances);
 			this._terminalService.setActiveInstance(sourceInstances[0]);
+			const targetGroup = this._terminalGroupService.getGroupForInstance(sourceInstances[0]);
+			if (targetGroup) {
+				const index = this._terminalGroupService.groups.indexOf(targetGroup);
+				this._listService.lastFocusedList?.setSelection([index]);
+			}
 			return;
 		}
 
-		let focused = false;
-		for (const instance of sourceInstances) {
-			this._terminalGroupService.moveGroup(instance, targetInstance);
-			if (!focused) {
-				this._terminalService.setActiveInstance(instance);
-				focused = true;
-			}
+		this._terminalGroupService.moveGroup(sourceInstances, targetInstance);
+		this._terminalService.setActiveInstance(sourceInstances[0]);
+		const targetGroup = this._terminalGroupService.getGroupForInstance(sourceInstances[0]);
+		if (targetGroup) {
+			const index = this._terminalGroupService.groups.indexOf(targetGroup);
+			this._listService.lastFocusedList?.setSelection([index]);
 		}
 	}
 
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalTestHelpers.ts b/src/vs/workbench/contrib/terminal/browser/terminalTestHelpers.ts
index c0fb9b5e0e4..606e19be3b0 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalTestHelpers.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalTestHelpers.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { timeout } from 'vs/base/common/async';
+import { timeout } from '../../../../base/common/async.js';
 import type { Terminal } from '@xterm/xterm';
 
 export async function writeP(terminal: Terminal, data: string): Promise<void> {
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalTooltip.ts b/src/vs/workbench/contrib/terminal/browser/terminalTooltip.ts
index e1d6086cd0d..fd934009947 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalTooltip.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalTooltip.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { ITerminalInstance } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { asArray } from 'vs/base/common/arrays';
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import type { IHoverAction } from 'vs/base/browser/ui/hover/hover';
+import { localize } from '../../../../nls.js';
+import { ITerminalInstance } from './terminal.js';
+import { TerminalCapability } from '../../../../platform/terminal/common/capabilities/capabilities.js';
+import { asArray } from '../../../../base/common/arrays.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import type { IHoverAction } from '../../../../base/browser/ui/hover/hover.js';
 
 export function getInstanceHoverInfo(instance: ITerminalInstance): { content: MarkdownString; actions: IHoverAction[] } {
 	let statusString = '';
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalUri.ts b/src/vs/workbench/contrib/terminal/browser/terminalUri.ts
index 9a04a07b3c2..123f258b5e2 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalUri.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalUri.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { ITerminalInstance, TerminalDataTransfers } from 'vs/workbench/contrib/terminal/browser/terminal';
+import { Schemas } from '../../../../base/common/network.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ITerminalInstance, TerminalDataTransfers } from './terminal.js';
 
 export function parseTerminalUri(resource: URI): ITerminalIdentifier {
 	const [, workspaceId, instanceId] = resource.path.split('/');
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalView.ts b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
index 3cf3c286a93..13d0821a9ec 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalView.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
@@ -3,58 +3,59 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import * as dom from 'vs/base/browser/dom';
-import { Action, IAction } from 'vs/base/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IThemeService, Themable } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { switchTerminalActionViewItemSeparator, switchTerminalShowTabsTitle } from 'vs/workbench/contrib/terminal/browser/terminalActions';
-import { INotificationService, IPromptChoice, Severity } from 'vs/platform/notification/common/notification';
-import { ICreateTerminalOptions, ITerminalConfigurationService, ITerminalGroupService, ITerminalInstance, ITerminalService, TerminalConnectionState, TerminalDataTransfers } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPane';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IViewDescriptorService } from 'vs/workbench/common/views';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IMenu, IMenuService, MenuId, MenuItemAction } from 'vs/platform/actions/common/actions';
-import { ITerminalProfileResolverService, ITerminalProfileService, TerminalCommandId } from 'vs/workbench/contrib/terminal/common/terminal';
-import { TerminalSettingId, ITerminalProfile, TerminalLocation } from 'vs/platform/terminal/common/terminal';
-import { ActionViewItem, IBaseActionViewItemOptions, SelectActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { asCssVariable, selectBorder } from 'vs/platform/theme/common/colorRegistry';
-import { ISelectOptionItem } from 'vs/base/browser/ui/selectBox/selectBox';
-import { IActionViewItem } from 'vs/base/browser/ui/actionbar/actionbar';
-import { TerminalTabbedView } from 'vs/workbench/contrib/terminal/browser/terminalTabbedView';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
-import { getColorForSeverity } from 'vs/workbench/contrib/terminal/browser/terminalStatusList';
-import { createAndFillInContextMenuActions, MenuEntryActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { DropdownWithPrimaryActionViewItem } from 'vs/platform/actions/browser/dropdownWithPrimaryActionViewItem';
-import { DisposableStore, dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { ColorScheme } from 'vs/platform/theme/common/theme';
-import { getColorClass, getUriClasses } from 'vs/workbench/contrib/terminal/browser/terminalIcon';
-import { getTerminalActionBarArgs } from 'vs/workbench/contrib/terminal/browser/terminalMenus';
-import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey';
-import { getInstanceHoverInfo } from 'vs/workbench/contrib/terminal/browser/terminalTooltip';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { defaultSelectBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { Event } from 'vs/base/common/event';
-import { IHoverDelegate, IHoverDelegateOptions } from 'vs/base/browser/ui/hover/hoverDelegate';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { InstanceContext, TerminalContextActionRunner } from 'vs/workbench/contrib/terminal/browser/terminalContextMenu';
+import * as nls from '../../../../nls.js';
+import * as dom from '../../../../base/browser/dom.js';
+import { Action, IAction } from '../../../../base/common/actions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextMenuService, IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IThemeService, Themable } from '../../../../platform/theme/common/themeService.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { switchTerminalActionViewItemSeparator, switchTerminalShowTabsTitle } from './terminalActions.js';
+import { INotificationService, IPromptChoice, Severity } from '../../../../platform/notification/common/notification.js';
+import { ICreateTerminalOptions, ITerminalConfigurationService, ITerminalGroupService, ITerminalInstance, ITerminalService, TerminalConnectionState, TerminalDataTransfers } from './terminal.js';
+import { ViewPane, IViewPaneOptions } from '../../../browser/parts/views/viewPane.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IViewDescriptorService } from '../../../common/views.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IMenu, IMenuService, MenuId, MenuItemAction } from '../../../../platform/actions/common/actions.js';
+import { ITerminalProfileResolverService, ITerminalProfileService, TerminalCommandId } from '../common/terminal.js';
+import { TerminalSettingId, ITerminalProfile, TerminalLocation } from '../../../../platform/terminal/common/terminal.js';
+import { ActionViewItem, IBaseActionViewItemOptions, SelectActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { asCssVariable, selectBorder } from '../../../../platform/theme/common/colorRegistry.js';
+import { ISelectOptionItem } from '../../../../base/browser/ui/selectBox/selectBox.js';
+import { IActionViewItem } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { TerminalTabbedView } from './terminalTabbedView.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { getColorForSeverity } from './terminalStatusList.js';
+import { createAndFillInContextMenuActions, MenuEntryActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { DropdownWithPrimaryActionViewItem } from '../../../../platform/actions/browser/dropdownWithPrimaryActionViewItem.js';
+import { DisposableStore, dispose, IDisposable, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ColorScheme } from '../../../../platform/theme/common/theme.js';
+import { getColorClass, getUriClasses } from './terminalIcon.js';
+import { getTerminalActionBarArgs } from './terminalMenus.js';
+import { TerminalContextKeys } from '../common/terminalContextKey.js';
+import { getInstanceHoverInfo } from './terminalTooltip.js';
+import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
+import { TerminalCapability } from '../../../../platform/terminal/common/capabilities/capabilities.js';
+import { defaultSelectBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { Event } from '../../../../base/common/event.js';
+import { IHoverDelegate, IHoverDelegateOptions } from '../../../../base/browser/ui/hover/hoverDelegate.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { InstanceContext, TerminalContextActionRunner } from './terminalContextMenu.js';
+import { MicrotaskDelay } from '../../../../base/common/symbols.js';
 
 export class TerminalViewPane extends ViewPane {
 	private _parentDomElement: HTMLElement | undefined;
 	private _terminalTabbedView?: TerminalTabbedView;
 	get terminalTabbedView(): TerminalTabbedView | undefined { return this._terminalTabbedView; }
 	private _isInitialized: boolean = false;
-	private _newDropdown: DropdownWithPrimaryActionViewItem | undefined;
+	private readonly _newDropdown: MutableDisposable<DropdownWithPrimaryActionViewItem> = this._register(new MutableDisposable());
 	private readonly _dropdownMenu: IMenu;
 	private readonly _singleTabMenu: IMenu;
 	private _viewShowing: IContextKey<boolean>;
@@ -229,7 +230,7 @@ export class TerminalViewPane extends ViewPane {
 		if (!this._parentDomElement) {
 			return;
 		}
-		this._terminalTabbedView = this.instantiationService.createInstance(TerminalTabbedView, this._parentDomElement);
+		this._terminalTabbedView = this._register(this.instantiationService.createInstance(TerminalTabbedView, this._parentDomElement));
 	}
 
 	// eslint-disable-next-line @typescript-eslint/naming-convention
@@ -275,10 +276,9 @@ export class TerminalViewPane extends ViewPane {
 				if (action instanceof MenuItemAction) {
 					const actions = getTerminalActionBarArgs(TerminalLocation.Panel, this._terminalProfileService.availableProfiles, this._getDefaultProfileName(), this._terminalProfileService.contributedProfiles, this._terminalService, this._dropdownMenu);
 					this._registerDisposableActions(actions.dropdownAction, actions.dropdownMenuActions);
-					this._newDropdown?.dispose();
-					this._newDropdown = new DropdownWithPrimaryActionViewItem(action, actions.dropdownAction, actions.dropdownMenuActions, actions.className, this._contextMenuService, { hoverDelegate: options.hoverDelegate }, this._keybindingService, this._notificationService, this._contextKeyService, this._themeService, this._accessibilityService);
-					this._updateTabActionBar(this._terminalProfileService.availableProfiles);
-					return this._newDropdown;
+					this._newDropdown.value = new DropdownWithPrimaryActionViewItem(action, actions.dropdownAction, actions.dropdownMenuActions, actions.className, { hoverDelegate: options.hoverDelegate }, this._contextMenuService, this._keybindingService, this._notificationService, this._contextKeyService, this._themeService, this._accessibilityService);
+					this._newDropdown.value?.update(actions.dropdownAction, actions.dropdownMenuActions);
+					return this._newDropdown.value;
 				}
 			}
 		}
@@ -313,7 +313,7 @@ export class TerminalViewPane extends ViewPane {
 	private _updateTabActionBar(profiles: ITerminalProfile[]): void {
 		const actions = getTerminalActionBarArgs(TerminalLocation.Panel, profiles, this._getDefaultProfileName(), this._terminalProfileService.contributedProfiles, this._terminalService, this._dropdownMenu);
 		this._registerDisposableActions(actions.dropdownAction, actions.dropdownMenuActions);
-		this._newDropdown?.update(actions.dropdownAction, actions.dropdownMenuActions);
+		this._newDropdown.value?.update(actions.dropdownAction, actions.dropdownMenuActions);
 	}
 
 	override focus() {
@@ -433,7 +433,7 @@ class SingleTerminalTabActionViewItem extends MenuEntryActionViewItem {
 				last.add(e);
 			}
 			return last;
-		})(merged => {
+		}, MicrotaskDelay)(merged => {
 			for (const e of merged) {
 				this.updateLabel(e);
 			}
diff --git a/src/vs/workbench/contrib/terminal/browser/widgets/terminalHoverWidget.ts b/src/vs/workbench/contrib/terminal/browser/widgets/terminalHoverWidget.ts
index 57eabad7669..235a4586fb8 100644
--- a/src/vs/workbench/contrib/terminal/browser/widgets/terminalHoverWidget.ts
+++ b/src/vs/workbench/contrib/terminal/browser/widgets/terminalHoverWidget.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { Widget } from 'vs/base/browser/ui/widget';
-import { ITerminalWidget } from 'vs/workbench/contrib/terminal/browser/widgets/widgets';
-import * as dom from 'vs/base/browser/dom';
+import { Disposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { IMarkdownString } from '../../../../../base/common/htmlContent.js';
+import { Widget } from '../../../../../base/browser/ui/widget.js';
+import { ITerminalWidget } from './widgets.js';
+import * as dom from '../../../../../base/browser/dom.js';
 import type { IViewportRange } from '@xterm/xterm';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TerminalSettingId } from 'vs/platform/terminal/common/terminal';
-import type { IHoverAction, IHoverTarget } from 'vs/base/browser/ui/hover/hover';
+import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { TerminalSettingId } from '../../../../../platform/terminal/common/terminal.js';
+import type { IHoverAction, IHoverTarget } from '../../../../../base/browser/ui/hover/hover.js';
 
 const $ = dom.$;
 
@@ -31,7 +31,7 @@ export class TerminalHover extends Disposable implements ITerminalWidget {
 		private readonly _targetOptions: ILinkHoverTargetOptions,
 		private readonly _text: IMarkdownString,
 		private readonly _actions: IHoverAction[] | undefined,
-		private readonly _linkHandler: (url: string) => any,
+		private readonly _linkHandler: (url: string) => unknown,
 		@IHoverService private readonly _hoverService: IHoverService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService
 	) {
diff --git a/src/vs/workbench/contrib/terminal/browser/widgets/widgetManager.ts b/src/vs/workbench/contrib/terminal/browser/widgets/widgetManager.ts
index 63283a6a76b..d1141f3d6f0 100644
--- a/src/vs/workbench/contrib/terminal/browser/widgets/widgetManager.ts
+++ b/src/vs/workbench/contrib/terminal/browser/widgets/widgetManager.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { ITerminalWidget } from 'vs/workbench/contrib/terminal/browser/widgets/widgets';
+import { IDisposable } from '../../../../../base/common/lifecycle.js';
+import { ITerminalWidget } from './widgets.js';
 
 export class TerminalWidgetManager implements IDisposable {
 	private _container: HTMLElement | undefined;
diff --git a/src/vs/workbench/contrib/terminal/browser/widgets/widgets.ts b/src/vs/workbench/contrib/terminal/browser/widgets/widgets.ts
index 50bc2ee7e5e..edffaa68003 100644
--- a/src/vs/workbench/contrib/terminal/browser/widgets/widgets.ts
+++ b/src/vs/workbench/contrib/terminal/browser/widgets/widgets.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable } from '../../../../../base/common/lifecycle.js';
 
 export interface ITerminalWidget extends IDisposable {
 	/**
diff --git a/src/vs/workbench/contrib/terminal/browser/xterm/decorationAddon.ts b/src/vs/workbench/contrib/terminal/browser/xterm/decorationAddon.ts
index ed4925cadf6..2e979d69346 100644
--- a/src/vs/workbench/contrib/terminal/browser/xterm/decorationAddon.ts
+++ b/src/vs/workbench/contrib/terminal/browser/xterm/decorationAddon.ts
@@ -4,28 +4,28 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type { IDecoration, ITerminalAddon, Terminal } from '@xterm/xterm';
-import * as dom from 'vs/base/browser/dom';
-import { IAction, Separator } from 'vs/base/common/actions';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable, DisposableStore, IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { localize } from 'vs/nls';
-import { AccessibilitySignal, IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { CommandInvalidationReason, ICommandDetectionCapability, IMarkProperties, ITerminalCapabilityStore, ITerminalCommand, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { TerminalSettingId } from 'vs/platform/terminal/common/terminal';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { terminalDecorationError, terminalDecorationIncomplete, terminalDecorationMark, terminalDecorationSuccess } from 'vs/workbench/contrib/terminal/browser/terminalIcons';
-import { DecorationSelector, TerminalDecorationHoverManager, updateLayout } from 'vs/workbench/contrib/terminal/browser/xterm/decorationStyles';
-import { TERMINAL_COMMAND_DECORATION_DEFAULT_BACKGROUND_COLOR, TERMINAL_COMMAND_DECORATION_ERROR_BACKGROUND_COLOR, TERMINAL_COMMAND_DECORATION_SUCCESS_BACKGROUND_COLOR } from 'vs/workbench/contrib/terminal/common/terminalColorRegistry';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import * as dom from '../../../../../base/browser/dom.js';
+import { IAction, Separator } from '../../../../../base/common/actions.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { Disposable, DisposableStore, IDisposable, dispose, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { localize } from '../../../../../nls.js';
+import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { INotificationService, Severity } from '../../../../../platform/notification/common/notification.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
+import { IQuickInputService, IQuickPickItem } from '../../../../../platform/quickinput/common/quickInput.js';
+import { CommandInvalidationReason, ICommandDetectionCapability, IMarkProperties, ITerminalCapabilityStore, ITerminalCommand, TerminalCapability } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
+import { TerminalSettingId } from '../../../../../platform/terminal/common/terminal.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { terminalDecorationError, terminalDecorationIncomplete, terminalDecorationMark, terminalDecorationSuccess } from '../terminalIcons.js';
+import { DecorationSelector, TerminalDecorationHoverManager, updateLayout } from './decorationStyles.js';
+import { TERMINAL_COMMAND_DECORATION_DEFAULT_BACKGROUND_COLOR, TERMINAL_COMMAND_DECORATION_ERROR_BACKGROUND_COLOR, TERMINAL_COMMAND_DECORATION_SUCCESS_BACKGROUND_COLOR } from '../../common/terminalColorRegistry.js';
+import { ILifecycleService } from '../../../../services/lifecycle/common/lifecycle.js';
 
 interface IDisposableDecoration { decoration: IDecoration; disposables: IDisposable[]; exitCode?: number; markProperties?: IMarkProperties }
 
@@ -468,7 +468,7 @@ export class DecorationAddon extends Disposable implements ITerminalAddon {
 	}
 
 	private _showToggleVisibilityQuickPick() {
-		const quickPick = this._quickInputService.createQuickPick();
+		const quickPick = this._register(this._quickInputService.createQuickPick());
 		quickPick.hideInput = true;
 		quickPick.hideCheckAll = true;
 		quickPick.canSelectMany = true;
@@ -493,7 +493,7 @@ export class DecorationAddon extends Disposable implements ITerminalAddon {
 			}
 		}
 		quickPick.selectedItems = selectedItems;
-		quickPick.onDidChangeSelection(async e => {
+		this._register(quickPick.onDidChangeSelection(async e => {
 			let newValue: 'both' | 'gutter' | 'overviewRuler' | 'never' = 'never';
 			if (e.includes(gutterIcon)) {
 				if (e.includes(overviewRulerIcon)) {
@@ -505,7 +505,7 @@ export class DecorationAddon extends Disposable implements ITerminalAddon {
 				newValue = 'overviewRuler';
 			}
 			await this._configurationService.updateValue(TerminalSettingId.ShellIntegrationDecorationsEnabled, newValue);
-		});
+		}));
 		quickPick.ok = false;
 		quickPick.show();
 	}
diff --git a/src/vs/workbench/contrib/terminal/browser/xterm/decorationStyles.ts b/src/vs/workbench/contrib/terminal/browser/xterm/decorationStyles.ts
index 1e82b5badc3..044987585d1 100644
--- a/src/vs/workbench/contrib/terminal/browser/xterm/decorationStyles.ts
+++ b/src/vs/workbench/contrib/terminal/browser/xterm/decorationStyles.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { Delayer } from 'vs/base/common/async';
-import { fromNow, getDurationString } from 'vs/base/common/date';
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { combinedDisposable, Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { localize } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { ITerminalCommand } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { TerminalSettingId } from 'vs/platform/terminal/common/terminal';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import * as dom from '../../../../../base/browser/dom.js';
+import { Delayer } from '../../../../../base/common/async.js';
+import { fromNow, getDurationString } from '../../../../../base/common/date.js';
+import { MarkdownString } from '../../../../../base/common/htmlContent.js';
+import { combinedDisposable, Disposable, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { localize } from '../../../../../nls.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
+import { ITerminalCommand } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
+import { TerminalSettingId } from '../../../../../platform/terminal/common/terminal.js';
+import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
 
 const enum DecorationStyles {
 	DefaultDimension = 16,
diff --git a/src/vs/workbench/contrib/terminal/browser/xterm/lineDataEventAddon.ts b/src/vs/workbench/contrib/terminal/browser/xterm/lineDataEventAddon.ts
index 5512d15c6fb..67f4c8bcce4 100644
--- a/src/vs/workbench/contrib/terminal/browser/xterm/lineDataEventAddon.ts
+++ b/src/vs/workbench/contrib/terminal/browser/xterm/lineDataEventAddon.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { OperatingSystem } from 'vs/base/common/platform';
+import { Emitter } from '../../../../../base/common/event.js';
+import { Disposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { OperatingSystem } from '../../../../../base/common/platform.js';
 import type { Terminal as XTermTerminal, IBuffer, ITerminalAddon } from '@xterm/xterm';
 
 /**
@@ -26,12 +26,14 @@ export class LineDataEventAddon extends Disposable implements ITerminalAddon {
 	async activate(xterm: XTermTerminal) {
 		this._xterm = xterm;
 
+		// IMPORTANT: Instantiate the buffer namespace object here before it's disposed.
+		const buffer = xterm.buffer;
+
 		// If there is an initialization promise, wait for it before registering the event
 		await this._initializationPromise;
 
 		// Fire onLineData when a line feed occurs, taking into account wrapped lines
 		this._register(xterm.onLineFeed(() => {
-			const buffer = xterm.buffer;
 			const newLine = buffer.active.getLine(buffer.active.baseY + buffer.active.cursorY);
 			if (newLine && !newLine.isWrapped) {
 				this._sendLineData(buffer.active, buffer.active.baseY + buffer.active.cursorY - 1);
@@ -40,7 +42,6 @@ export class LineDataEventAddon extends Disposable implements ITerminalAddon {
 
 		// Fire onLineData when disposing object to flush last line
 		this._register(toDisposable(() => {
-			const buffer = xterm.buffer;
 			this._sendLineData(buffer.active, buffer.active.baseY + buffer.active.cursorY);
 		}));
 	}
diff --git a/src/vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon.ts b/src/vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon.ts
index 0c0048cc757..f308a522277 100644
--- a/src/vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon.ts
+++ b/src/vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon.ts
@@ -3,21 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { coalesce } from 'vs/base/common/arrays';
-import { Disposable, DisposableStore, MutableDisposable, dispose } from 'vs/base/common/lifecycle';
-import { IMarkTracker } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { ITerminalCapabilityStore, ITerminalCommand, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
+import { coalesce } from '../../../../../base/common/arrays.js';
+import { Disposable, DisposableStore, MutableDisposable, dispose } from '../../../../../base/common/lifecycle.js';
+import { IMarkTracker } from '../terminal.js';
+import { ITerminalCapabilityStore, ITerminalCommand, TerminalCapability } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
 import type { Terminal, IMarker, ITerminalAddon, IDecoration, IBufferRange } from '@xterm/xterm';
-import { timeout } from 'vs/base/common/async';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { TERMINAL_OVERVIEW_RULER_CURSOR_FOREGROUND_COLOR } from 'vs/workbench/contrib/terminal/common/terminalColorRegistry';
-import { getWindow } from 'vs/base/browser/dom';
-import { ICurrentPartialCommand } from 'vs/platform/terminal/common/capabilities/commandDetection/terminalCommand';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-
-// HACK: Mark navigation currently depends on terminalContrib/stickyScroll
-// eslint-disable-next-line local/code-import-patterns
-import { TerminalStickyScrollSettingId } from 'vs/workbench/contrib/terminalContrib/stickyScroll/common/terminalStickyScrollConfiguration';
+import { timeout } from '../../../../../base/common/async.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { TERMINAL_OVERVIEW_RULER_CURSOR_FOREGROUND_COLOR } from '../../common/terminalColorRegistry.js';
+import { getWindow } from '../../../../../base/browser/dom.js';
+import { ICurrentPartialCommand } from '../../../../../platform/terminal/common/capabilities/commandDetection/terminalCommand.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { TerminalContribSettingId } from '../../terminalContribExports.js';
 
 enum Boundary {
 	Top,
@@ -285,7 +282,7 @@ export class MarkNavigationAddon extends Disposable implements IMarkTracker, ITe
 			{
 				bufferRange: range,
 				// Ensure scroll shows the line when sticky scroll is enabled
-				forceScroll: !!this._configurationService.getValue(TerminalStickyScrollSettingId.Enabled)
+				forceScroll: !!this._configurationService.getValue(TerminalContribSettingId.StickyScrollEnabled)
 			}
 		);
 	}
@@ -313,7 +310,7 @@ export class MarkNavigationAddon extends Disposable implements IMarkTracker, ITe
 			const startLine = command.marker.line - (command.getPromptRowCount() - 1);
 			const decorationCount = toLineIndex(command.endMarker) - startLine;
 			// Abort if the command is excessively long to avoid performance on hover/leave
-			if (decorationCount > 20000) {
+			if (decorationCount > 200) {
 				return;
 			}
 			for (let i = 0; i < decorationCount; i++) {
diff --git a/src/vs/workbench/contrib/terminal/browser/xterm/xtermAddonImporter.ts b/src/vs/workbench/contrib/terminal/browser/xterm/xtermAddonImporter.ts
new file mode 100644
index 00000000000..b78debc63c2
--- /dev/null
+++ b/src/vs/workbench/contrib/terminal/browser/xterm/xtermAddonImporter.ts
@@ -0,0 +1,54 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import type { ClipboardAddon as ClipboardAddonType } from '@xterm/addon-clipboard';
+import type { ImageAddon as ImageAddonType } from '@xterm/addon-image';
+import type { SearchAddon as SearchAddonType } from '@xterm/addon-search';
+import type { SerializeAddon as SerializeAddonType } from '@xterm/addon-serialize';
+import type { Unicode11Addon as Unicode11AddonType } from '@xterm/addon-unicode11';
+import type { WebglAddon as WebglAddonType } from '@xterm/addon-webgl';
+import { importAMDNodeModule } from '../../../../../amdX.js';
+
+export interface IXtermAddonNameToCtor {
+	clipboard: typeof ClipboardAddonType;
+	image: typeof ImageAddonType;
+	search: typeof SearchAddonType;
+	serialize: typeof SerializeAddonType;
+	unicode11: typeof Unicode11AddonType;
+	webgl: typeof WebglAddonType;
+}
+
+// This interface lets a maps key and value be linked with generics
+interface IImportedXtermAddonMap extends Map<keyof IXtermAddonNameToCtor, IXtermAddonNameToCtor[keyof IXtermAddonNameToCtor]> {
+	get<K extends keyof IXtermAddonNameToCtor>(name: K): IXtermAddonNameToCtor[K] | undefined;
+	set<K extends keyof IXtermAddonNameToCtor>(name: K, value: IXtermAddonNameToCtor[K]): this;
+}
+
+const importedAddons: IImportedXtermAddonMap = new Map();
+
+/**
+ * Exposes a simple interface to consumers, encapsulating the messy import xterm
+ * addon import and caching logic.
+ */
+export class XtermAddonImporter {
+	async importAddon<T extends keyof IXtermAddonNameToCtor>(name: T): Promise<IXtermAddonNameToCtor[T]> {
+		let addon = importedAddons.get(name);
+		if (!addon) {
+			switch (name) {
+				case 'clipboard': addon = (await importAMDNodeModule<typeof import('@xterm/addon-clipboard')>('@xterm/addon-clipboard', 'lib/addon-clipboard.js')).ClipboardAddon as IXtermAddonNameToCtor[T]; break;
+				case 'image': addon = (await importAMDNodeModule<typeof import('@xterm/addon-image')>('@xterm/addon-image', 'lib/addon-image.js')).ImageAddon as IXtermAddonNameToCtor[T]; break;
+				case 'search': addon = (await importAMDNodeModule<typeof import('@xterm/addon-search')>('@xterm/addon-search', 'lib/addon-search.js')).SearchAddon as IXtermAddonNameToCtor[T]; break;
+				case 'serialize': addon = (await importAMDNodeModule<typeof import('@xterm/addon-serialize')>('@xterm/addon-serialize', 'lib/addon-serialize.js')).SerializeAddon as IXtermAddonNameToCtor[T]; break;
+				case 'unicode11': addon = (await importAMDNodeModule<typeof import('@xterm/addon-unicode11')>('@xterm/addon-unicode11', 'lib/addon-unicode11.js')).Unicode11Addon as IXtermAddonNameToCtor[T]; break;
+				case 'webgl': addon = (await importAMDNodeModule<typeof import('@xterm/addon-webgl')>('@xterm/addon-webgl', 'lib/addon-webgl.js')).WebglAddon as IXtermAddonNameToCtor[T]; break;
+			}
+			if (!addon) {
+				throw new Error(`Could not load addon ${name}`);
+			}
+			importedAddons.set(name, addon);
+		}
+		return addon as IXtermAddonNameToCtor[T];
+	}
+}
diff --git a/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts b/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts
index 8d14cc3a245..4d45fef651a 100644
--- a/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts
+++ b/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts
@@ -10,47 +10,42 @@ import type { WebglAddon as WebglAddonType } from '@xterm/addon-webgl';
 import type { SerializeAddon as SerializeAddonType } from '@xterm/addon-serialize';
 import type { ImageAddon as ImageAddonType } from '@xterm/addon-image';
 import type { ClipboardAddon as ClipboardAddonType, ClipboardSelectionType } from '@xterm/addon-clipboard';
-import * as dom from 'vs/base/browser/dom';
-import { IXtermCore } from 'vs/workbench/contrib/terminal/browser/xterm-private';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { IShellIntegration, ITerminalLogService, TerminalSettingId } from 'vs/platform/terminal/common/terminal';
-import { ITerminalFont, ITerminalConfiguration } from 'vs/workbench/contrib/terminal/common/terminal';
-import { IMarkTracker, IInternalXtermTerminal, IXtermTerminal, IXtermColorProvider, XtermTerminalConstants, IXtermAttachToElementOptions, IDetachedXtermTerminal, ITerminalConfigurationService } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { LogLevel } from 'vs/platform/log/common/log';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { MarkNavigationAddon, ScrollPosition } from 'vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon';
-import { localize } from 'vs/nls';
-import { IColorTheme, IThemeService } from 'vs/platform/theme/common/themeService';
-import { PANEL_BACKGROUND } from 'vs/workbench/common/theme';
-import { TERMINAL_FOREGROUND_COLOR, TERMINAL_BACKGROUND_COLOR, TERMINAL_CURSOR_FOREGROUND_COLOR, TERMINAL_CURSOR_BACKGROUND_COLOR, ansiColorIdentifiers, TERMINAL_SELECTION_BACKGROUND_COLOR, TERMINAL_FIND_MATCH_BACKGROUND_COLOR, TERMINAL_FIND_MATCH_HIGHLIGHT_BACKGROUND_COLOR, TERMINAL_FIND_MATCH_BORDER_COLOR, TERMINAL_OVERVIEW_RULER_FIND_MATCH_FOREGROUND_COLOR, TERMINAL_FIND_MATCH_HIGHLIGHT_BORDER_COLOR, TERMINAL_OVERVIEW_RULER_CURSOR_FOREGROUND_COLOR, TERMINAL_SELECTION_FOREGROUND_COLOR, TERMINAL_INACTIVE_SELECTION_BACKGROUND_COLOR } from 'vs/workbench/contrib/terminal/common/terminalColorRegistry';
-import { ShellIntegrationAddon } from 'vs/platform/terminal/common/xterm/shellIntegrationAddon';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { DecorationAddon } from 'vs/workbench/contrib/terminal/browser/xterm/decorationAddon';
-import { ITerminalCapabilityStore, ITerminalCommand, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { Emitter } from 'vs/base/common/event';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { importAMDNodeModule } from 'vs/amdX';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { debounce } from 'vs/base/common/decorators';
-import { MouseWheelClassifier } from 'vs/base/browser/ui/scrollbar/scrollableElement';
-import { IMouseWheelEvent, StandardWheelEvent } from 'vs/base/browser/mouseEvent';
-import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
-import { AccessibilitySignal, IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
+import * as dom from '../../../../../base/browser/dom.js';
+import { IXtermCore } from '../xterm-private.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { IEditorOptions } from '../../../../../editor/common/config/editorOptions.js';
+import { IShellIntegration, ITerminalLogService, TerminalSettingId } from '../../../../../platform/terminal/common/terminal.js';
+import { ITerminalFont, ITerminalConfiguration } from '../../common/terminal.js';
+import { IMarkTracker, IInternalXtermTerminal, IXtermTerminal, IXtermColorProvider, XtermTerminalConstants, IXtermAttachToElementOptions, IDetachedXtermTerminal, ITerminalConfigurationService } from '../terminal.js';
+import { LogLevel } from '../../../../../platform/log/common/log.js';
+import { INotificationService } from '../../../../../platform/notification/common/notification.js';
+import { MarkNavigationAddon, ScrollPosition } from './markNavigationAddon.js';
+import { localize } from '../../../../../nls.js';
+import { IColorTheme, IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { PANEL_BACKGROUND } from '../../../../common/theme.js';
+import { TERMINAL_FOREGROUND_COLOR, TERMINAL_BACKGROUND_COLOR, TERMINAL_CURSOR_FOREGROUND_COLOR, TERMINAL_CURSOR_BACKGROUND_COLOR, ansiColorIdentifiers, TERMINAL_SELECTION_BACKGROUND_COLOR, TERMINAL_FIND_MATCH_BACKGROUND_COLOR, TERMINAL_FIND_MATCH_HIGHLIGHT_BACKGROUND_COLOR, TERMINAL_FIND_MATCH_BORDER_COLOR, TERMINAL_OVERVIEW_RULER_FIND_MATCH_FOREGROUND_COLOR, TERMINAL_FIND_MATCH_HIGHLIGHT_BORDER_COLOR, TERMINAL_OVERVIEW_RULER_CURSOR_FOREGROUND_COLOR, TERMINAL_SELECTION_FOREGROUND_COLOR, TERMINAL_INACTIVE_SELECTION_BACKGROUND_COLOR, TERMINAL_OVERVIEW_RULER_BORDER_COLOR } from '../../common/terminalColorRegistry.js';
+import { ShellIntegrationAddon } from '../../../../../platform/terminal/common/xterm/shellIntegrationAddon.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { DecorationAddon } from './decorationAddon.js';
+import { ITerminalCapabilityStore, ITerminalCommand, TerminalCapability } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { IContextKey, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { TerminalContextKeys } from '../../common/terminalContextKey.js';
+import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js';
+import { debounce } from '../../../../../base/common/decorators.js';
+import { MouseWheelClassifier } from '../../../../../base/browser/ui/scrollbar/scrollableElement.js';
+import { IMouseWheelEvent, StandardWheelEvent } from '../../../../../base/browser/mouseEvent.js';
+import { ILayoutService } from '../../../../../platform/layout/browser/layoutService.js';
+import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { scrollbarSliderActiveBackground, scrollbarSliderBackground, scrollbarSliderHoverBackground } from '../../../../../platform/theme/common/colorRegistry.js';
+import { XtermAddonImporter } from './xtermAddonImporter.js';
 
 const enum RenderConstants {
 	SmoothScrollDuration = 125
 }
 
-let ClipboardAddon: typeof ClipboardAddonType;
-let ImageAddon: typeof ImageAddonType;
-let SearchAddon: typeof SearchAddonType;
-let SerializeAddon: typeof SerializeAddonType;
-let Unicode11Addon: typeof Unicode11AddonType;
-let WebglAddon: typeof WebglAddonType;
 
 function getFullBufferLineAsString(lineIndex: number, buffer: IBuffer): { lineData: string | undefined; lineIndex: number } {
 	let line = buffer.getLine(lineIndex);
@@ -68,39 +63,22 @@ function getFullBufferLineAsString(lineIndex: number, buffer: IBuffer): { lineDa
 	return { lineData, lineIndex };
 }
 
-
-// DEBUG: This helper can be used to draw image data to the console, it's commented out as we don't
-//        want to ship it, but this is very useful for investigating texture atlas issues.
-// (console as any).image = (source: ImageData | HTMLCanvasElement, scale: number = 1) => {
-// 	function getBox(width: number, height: number) {
-// 		return {
-// 			string: '+',
-// 			style: 'font-size: 1px; padding: ' + Math.floor(height/2) + 'px ' + Math.floor(width/2) + 'px; line-height: ' + height + 'px;'
-// 		};
-// 	}
-// 	if (source instanceof HTMLCanvasElement) {
-// 		source = source.getContext('2d')?.getImageData(0, 0, source.width, source.height)!;
-// 	}
-// 	const canvas = document.createElement('canvas');
-// 	canvas.width = source.width;
-// 	canvas.height = source.height;
-// 	const ctx = canvas.getContext('2d')!;
-// 	ctx.putImageData(source, 0, 0);
-
-// 	const sw = source.width * scale;
-// 	const sh = source.height * scale;
-// 	const dim = getBox(sw, sh);
-// 	console.log(
-// 		`Image: ${source.width} x ${source.height}\n%c${dim.string}`,
-// 		`${dim.style}background: url(${canvas.toDataURL()}); background-size: ${sw}px ${sh}px; background-repeat: no-repeat; color: transparent;`
-// 	);
-// 	console.groupCollapsed('Zoomed');
-// 	console.log(
-// 		`%c${dim.string}`,
-// 		`${getBox(sw * 10, sh * 10).style}background: url(${canvas.toDataURL()}); background-size: ${sw * 10}px ${sh * 10}px; background-repeat: no-repeat; color: transparent; image-rendering: pixelated;-ms-interpolation-mode: nearest-neighbor;`
-// 	);
-// 	console.groupEnd();
-// };
+export interface IXtermTerminalOptions {
+	/** The columns to initialize the terminal with. */
+	cols: number;
+	/** The rows to initialize the terminal with. */
+	rows: number;
+	/** The color provider for the terminal. */
+	xtermColorProvider: IXtermColorProvider;
+	/** The capabilities of the terminal. */
+	capabilities: ITerminalCapabilityStore;
+	/** The shell integration nonce to verify data coming from SI is trustworthy. */
+	shellIntegrationNonce?: string;
+	/** Whether to disable shell integration telemetry reporting. */
+	disableShellIntegrationReporting?: boolean;
+	/** The object that imports xterm addons, set this to inject an importer in tests. */
+	xtermAddonImpoter?: XtermAddonImporter;
+}
 
 /**
  * Wraps the xterm object with additional functionality. Interaction with the backing process is out
@@ -110,6 +88,10 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 	/** The raw xterm.js instance */
 	readonly raw: RawXtermTerminal;
 	private _core: IXtermCore;
+	private readonly _xtermAddonLoader: XtermAddonImporter;
+	private readonly _xtermColorProvider: IXtermColorProvider;
+	private readonly _capabilities: ITerminalCapabilityStore;
+
 	private static _suggestedRendererType: 'dom' | undefined = undefined;
 	private static _checkedWebglCompatible = false;
 	private _attached?: { container: HTMLElement; options: IXtermAttachToElementOptions };
@@ -142,12 +124,8 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 
 	private readonly _onDidRequestRunCommand = this._register(new Emitter<{ command: ITerminalCommand; copyAsHtml?: boolean; noNewLine?: boolean }>());
 	readonly onDidRequestRunCommand = this._onDidRequestRunCommand.event;
-	private readonly _onDidRequestFocus = this._register(new Emitter<void>());
-	readonly onDidRequestFocus = this._onDidRequestFocus.event;
-	private readonly _onDidRequestSendText = this._register(new Emitter<string>());
-	readonly onDidRequestSendText = this._onDidRequestSendText.event;
-	private readonly _onDidRequestFreePort = this._register(new Emitter<string>());
-	readonly onDidRequestFreePort = this._onDidRequestFreePort.event;
+	private readonly _onDidRequestRefreshDimensions = this._register(new Emitter<void>());
+	readonly onDidRequestRefreshDimensions = this._onDidRequestRefreshDimensions.event;
 	private readonly _onDidChangeFindResults = this._register(new Emitter<{ resultIndex: number; resultCount: number }>());
 	readonly onDidChangeFindResults = this._onDidChangeFindResults.event;
 	private readonly _onDidChangeSelection = this._register(new Emitter<void>());
@@ -181,12 +159,7 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 	 */
 	constructor(
 		xtermCtor: typeof RawXtermTerminal,
-		cols: number,
-		rows: number,
-		private readonly _xtermColorProvider: IXtermColorProvider,
-		private readonly _capabilities: ITerminalCapabilityStore,
-		shellIntegrationNonce: string,
-		disableShellIntegrationReporting: boolean,
+		options: IXtermTerminalOptions,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@ITerminalLogService private readonly _logService: ITerminalLogService,
@@ -200,14 +173,19 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 		@ILayoutService layoutService: ILayoutService
 	) {
 		super();
+
+		this._xtermAddonLoader = options.xtermAddonImpoter ?? new XtermAddonImporter();
+		this._xtermColorProvider = options.xtermColorProvider;
+		this._capabilities = options.capabilities;
+
 		const font = this._terminalConfigurationService.getFont(dom.getActiveWindow(), undefined, true);
 		const config = this._terminalConfigurationService.config;
 		const editorOptions = this._configurationService.getValue<IEditorOptions>('editor');
 
 		this.raw = this._register(new xtermCtor({
 			allowProposedApi: true,
-			cols,
-			rows,
+			cols: options.cols,
+			rows: options.rows,
 			documentOverride: layoutService.mainContainer.ownerDocument,
 			altClickMovesCursor: config.altClickMovesCursor && editorOptions.multiCursorModifier === 'alt',
 			scrollback: config.scrollback,
@@ -234,7 +212,10 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 			fastScrollSensitivity: config.fastScrollSensitivity,
 			scrollSensitivity: config.mouseWheelScrollSensitivity,
 			wordSeparator: config.wordSeparators,
-			overviewRulerWidth: 10,
+			overviewRuler: {
+				width: 14,
+				showTopBorder: true,
+			},
 			ignoreBracketedPasteMode: config.ignoreBracketedPasteMode,
 			rescaleOverlappingGlyphs: config.rescaleOverlappingGlyphs,
 			windowOptions: {
@@ -256,6 +237,9 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 			if (e.affectsConfiguration(TerminalSettingId.UnicodeVersion)) {
 				this._updateUnicodeVersion();
 			}
+			if (e.affectsConfiguration(TerminalSettingId.ShellIntegrationDecorationsEnabled)) {
+				this._updateTheme();
+			}
 		}));
 
 		this._register(this._themeService.onDidColorThemeChange(theme => this._updateTheme(theme)));
@@ -271,14 +255,14 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 
 		// Load addons
 		this._updateUnicodeVersion();
-		this._markNavigationAddon = this._instantiationService.createInstance(MarkNavigationAddon, _capabilities);
+		this._markNavigationAddon = this._instantiationService.createInstance(MarkNavigationAddon, options.capabilities);
 		this.raw.loadAddon(this._markNavigationAddon);
 		this._decorationAddon = this._instantiationService.createInstance(DecorationAddon, this._capabilities);
 		this._register(this._decorationAddon.onDidRequestRunCommand(e => this._onDidRequestRunCommand.fire(e)));
 		this.raw.loadAddon(this._decorationAddon);
-		this._shellIntegrationAddon = new ShellIntegrationAddon(shellIntegrationNonce, disableShellIntegrationReporting, this._telemetryService, this._logService);
+		this._shellIntegrationAddon = new ShellIntegrationAddon(options.shellIntegrationNonce ?? '', options.disableShellIntegrationReporting, this._telemetryService, this._logService);
 		this.raw.loadAddon(this._shellIntegrationAddon);
-		this._getClipboardAddonConstructor().then(ClipboardAddon => {
+		this._xtermAddonLoader.importAddon('clipboard').then(ClipboardAddon => {
 			this._clipboardAddon = this._instantiationService.createInstance(ClipboardAddon, undefined, {
 				async readText(type: ClipboardSelectionType): Promise<string> {
 					return _clipboardService.readText(type === 'p' ? 'selection' : 'clipboard');
@@ -306,7 +290,7 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 
 	async getContentsAsHtml(): Promise<string> {
 		if (!this._serializeAddon) {
-			const Addon = await this._getSerializeAddonConstructor();
+			const Addon = await this._xtermAddonLoader.importAddon('serialize');
 			this._serializeAddon = new Addon();
 			this.raw.loadAddon(this._serializeAddon);
 		}
@@ -316,7 +300,7 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 
 	async getSelectionAsHtml(command?: ITerminalCommand): Promise<string> {
 		if (!this._serializeAddon) {
-			const Addon = await this._getSerializeAddonConstructor();
+			const Addon = await this._xtermAddonLoader.importAddon('serialize');
 			this._serializeAddon = new Addon();
 			this.raw.loadAddon(this._serializeAddon);
 		}
@@ -411,6 +395,10 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 		this.raw.options.customGlyphs = config.customGlyphs;
 		this.raw.options.ignoreBracketedPasteMode = config.ignoreBracketedPasteMode;
 		this.raw.options.rescaleOverlappingGlyphs = config.rescaleOverlappingGlyphs;
+		this.raw.options.overviewRuler = {
+			width: 14,
+			showTopBorder: true,
+		};
 		this._updateSmoothScrolling();
 		if (this._attached?.options.enableGpu) {
 			if (this._shouldLoadWebgl()) {
@@ -478,7 +466,7 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 	private _searchAddonPromise: Promise<SearchAddonType> | undefined;
 	private _getSearchAddon(): Promise<SearchAddonType> {
 		if (!this._searchAddonPromise) {
-			this._searchAddonPromise = this._getSearchAddonConstructor().then((AddonCtor) => {
+			this._searchAddonPromise = this._xtermAddonLoader.importAddon('search').then((AddonCtor) => {
 				this._searchAddon = new AddonCtor({ highlightLimit: XtermTerminalConstants.SearchHighlightLimit });
 				this.raw.loadAddon(this._searchAddon);
 				this._searchAddon.onDidChangeResults((results: { resultIndex: number; resultCount: number }) => {
@@ -680,7 +668,7 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 			}
 		}
 
-		const Addon = await this._getWebglAddonConstructor();
+		const Addon = await this._xtermAddonLoader.importAddon('webgl');
 		this._webglAddon = new Addon();
 		try {
 			this.raw.loadAddon(this._webglAddon);
@@ -690,6 +678,9 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 				this._disposeOfWebglRenderer();
 			});
 			this._refreshImageAddon();
+			// WebGL renderer cell dimensions differ from the DOM renderer, make sure the terminal
+			// gets resized after the webgl addon is loaded
+			this._onDidRequestRefreshDimensions.fire();
 			// Uncomment to add the texture atlas to the DOM
 			// setTimeout(() => {
 			// 	if (this._webglAddon?.textureAtlas) {
@@ -712,7 +703,7 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 		// Only allow the image addon when webgl is being used to avoid possible GPU issues
 		if (this._terminalConfigurationService.config.enableImages && this._webglAddon) {
 			if (!this._imageAddon) {
-				const AddonCtor = await this._getImageAddonConstructor();
+				const AddonCtor = await this._xtermAddonLoader.importAddon('image');
 				this._imageAddon = new AddonCtor();
 				this.raw.loadAddon(this._imageAddon);
 			}
@@ -726,48 +717,6 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 		}
 	}
 
-	protected async _getClipboardAddonConstructor(): Promise<typeof ClipboardAddonType> {
-		if (!ClipboardAddon) {
-			ClipboardAddon = (await importAMDNodeModule<typeof import('@xterm/addon-clipboard')>('@xterm/addon-clipboard', 'lib/addon-clipboard.js')).ClipboardAddon;
-		}
-		return ClipboardAddon;
-	}
-
-	protected async _getImageAddonConstructor(): Promise<typeof ImageAddonType> {
-		if (!ImageAddon) {
-			ImageAddon = (await importAMDNodeModule<typeof import('@xterm/addon-image')>('@xterm/addon-image', 'lib/addon-image.js')).ImageAddon;
-		}
-		return ImageAddon;
-	}
-
-	protected async _getSearchAddonConstructor(): Promise<typeof SearchAddonType> {
-		if (!SearchAddon) {
-			SearchAddon = (await importAMDNodeModule<typeof import('@xterm/addon-search')>('@xterm/addon-search', 'lib/addon-search.js')).SearchAddon;
-		}
-		return SearchAddon;
-	}
-
-	protected async _getUnicode11Constructor(): Promise<typeof Unicode11AddonType> {
-		if (!Unicode11Addon) {
-			Unicode11Addon = (await importAMDNodeModule<typeof import('@xterm/addon-unicode11')>('@xterm/addon-unicode11', 'lib/addon-unicode11.js')).Unicode11Addon;
-		}
-		return Unicode11Addon;
-	}
-
-	protected async _getWebglAddonConstructor(): Promise<typeof WebglAddonType> {
-		if (!WebglAddon) {
-			WebglAddon = (await importAMDNodeModule<typeof import('@xterm/addon-webgl')>('@xterm/addon-webgl', 'lib/addon-webgl.js')).WebglAddon;
-		}
-		return WebglAddon;
-	}
-
-	protected async _getSerializeAddonConstructor(): Promise<typeof SerializeAddonType> {
-		if (!SerializeAddon) {
-			SerializeAddon = (await importAMDNodeModule<typeof import('@xterm/addon-serialize')>('@xterm/addon-serialize', 'lib/addon-serialize.js')).SerializeAddon;
-		}
-		return SerializeAddon;
-	}
-
 	private _disposeOfWebglRenderer(): void {
 		try {
 			this._webglAddon?.dispose();
@@ -776,6 +725,9 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 		}
 		this._webglAddon = undefined;
 		this._refreshImageAddon();
+		// WebGL renderer cell dimensions differ from the DOM renderer, make sure the terminal
+		// gets resized after the webgl addon is disposed
+		this._onDidRequestRefreshDimensions.fire();
 	}
 
 	getXtermTheme(theme?: IColorTheme): ITheme {
@@ -783,6 +735,9 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 			theme = this._themeService.getColorTheme();
 		}
 
+		const config = this._terminalConfigurationService.config;
+		const hideOverviewRuler = ['never', 'gutter'].includes(config.shellIntegration?.decorationsEnabled ?? '');
+
 		const foregroundColor = theme.getColor(TERMINAL_FOREGROUND_COLOR);
 		const backgroundColor = this._xtermColorProvider.getBackgroundColor(theme);
 		const cursorColor = theme.getColor(TERMINAL_CURSOR_FOREGROUND_COLOR) || foregroundColor;
@@ -799,6 +754,10 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 			selectionBackground: selectionBackgroundColor?.toString(),
 			selectionInactiveBackground: selectionInactiveBackgroundColor?.toString(),
 			selectionForeground: selectionForegroundColor?.toString(),
+			overviewRulerBorder: hideOverviewRuler ? '#0000' : theme.getColor(TERMINAL_OVERVIEW_RULER_BORDER_COLOR)?.toString(),
+			scrollbarSliderActiveBackground: theme.getColor(scrollbarSliderActiveBackground)?.toString(),
+			scrollbarSliderBackground: theme.getColor(scrollbarSliderBackground)?.toString(),
+			scrollbarSliderHoverBackground: theme.getColor(scrollbarSliderHoverBackground)?.toString(),
 			black: theme.getColor(ansiColorIdentifiers[0])?.toString(),
 			red: theme.getColor(ansiColorIdentifiers[1])?.toString(),
 			green: theme.getColor(ansiColorIdentifiers[2])?.toString(),
@@ -829,7 +788,7 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 
 	private async _updateUnicodeVersion(): Promise<void> {
 		if (!this._unicode11Addon && this._terminalConfigurationService.config.unicodeVersion === '11') {
-			const Addon = await this._getUnicode11Constructor();
+			const Addon = await this._xtermAddonLoader.importAddon('unicode11');
 			this._unicode11Addon = new Addon();
 			this.raw.loadAddon(this._unicode11Addon);
 		}
@@ -851,7 +810,7 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 	}
 }
 
-export function getXtermScaledDimensions(w: Window, font: ITerminalFont, width: number, height: number) {
+export function getXtermScaledDimensions(w: Window, font: ITerminalFont, width: number, height: number): { rows: number; cols: number } | null {
 	if (!font.charWidth || !font.charHeight) {
 		return null;
 	}
diff --git a/src/vs/workbench/contrib/terminal/common/basePty.ts b/src/vs/workbench/contrib/terminal/common/basePty.ts
index 3680b1ff1ff..9a8c11ce3ff 100644
--- a/src/vs/workbench/contrib/terminal/common/basePty.ts
+++ b/src/vs/workbench/contrib/terminal/common/basePty.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { mark } from 'vs/base/common/performance';
-import { URI } from 'vs/base/common/uri';
-import type { IPtyHostProcessReplayEvent, ISerializedCommandDetectionCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { ProcessPropertyType, type IProcessDataEvent, type IProcessProperty, type IProcessPropertyMap, type IProcessReadyEvent, type ITerminalChildProcess } from 'vs/platform/terminal/common/terminal';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { mark } from '../../../../base/common/performance.js';
+import { URI } from '../../../../base/common/uri.js';
+import type { IPtyHostProcessReplayEvent, ISerializedCommandDetectionCapability } from '../../../../platform/terminal/common/capabilities/capabilities.js';
+import { ProcessPropertyType, type IProcessDataEvent, type IProcessProperty, type IProcessPropertyMap, type IProcessReadyEvent, type ITerminalChildProcess } from '../../../../platform/terminal/common/terminal.js';
 
 /**
  * Responsible for establishing and maintaining a connection with an existing terminal process
diff --git a/src/vs/workbench/contrib/terminal/common/environmentVariable.contribution.ts b/src/vs/workbench/contrib/terminal/common/environmentVariable.contribution.ts
index 3897ed68693..de7bac3889e 100644
--- a/src/vs/workbench/contrib/terminal/common/environmentVariable.contribution.ts
+++ b/src/vs/workbench/contrib/terminal/common/environmentVariable.contribution.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { EnvironmentVariableService } from 'vs/workbench/contrib/terminal/common/environmentVariableService';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IEnvironmentVariableService } from 'vs/workbench/contrib/terminal/common/environmentVariable';
+import { EnvironmentVariableService } from './environmentVariableService.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IEnvironmentVariableService } from './environmentVariable.js';
 
 registerSingleton(IEnvironmentVariableService, EnvironmentVariableService, InstantiationType.Delayed);
diff --git a/src/vs/workbench/contrib/terminal/common/environmentVariable.ts b/src/vs/workbench/contrib/terminal/common/environmentVariable.ts
index 6d879f6d20e..32b1e45c4da 100644
--- a/src/vs/workbench/contrib/terminal/common/environmentVariable.ts
+++ b/src/vs/workbench/contrib/terminal/common/environmentVariable.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { Event } from 'vs/base/common/event';
-import { EnvironmentVariableScope, IEnvironmentVariableCollection, IMergedEnvironmentVariableCollection } from 'vs/platform/terminal/common/environmentVariable';
-import { ITerminalStatus } from 'vs/workbench/contrib/terminal/common/terminal';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { Event } from '../../../../base/common/event.js';
+import { EnvironmentVariableScope, IEnvironmentVariableCollection, IMergedEnvironmentVariableCollection } from '../../../../platform/terminal/common/environmentVariable.js';
+import { ITerminalStatus } from './terminal.js';
 
 export const IEnvironmentVariableService = createDecorator<IEnvironmentVariableService>('environmentVariableService');
 
diff --git a/src/vs/workbench/contrib/terminal/common/environmentVariableService.ts b/src/vs/workbench/contrib/terminal/common/environmentVariableService.ts
index ddb64c1f0b8..0e5a7436dc8 100644
--- a/src/vs/workbench/contrib/terminal/common/environmentVariableService.ts
+++ b/src/vs/workbench/contrib/terminal/common/environmentVariableService.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event, Emitter } from 'vs/base/common/event';
-import { debounce, throttle } from 'vs/base/common/decorators';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { MergedEnvironmentVariableCollection } from 'vs/platform/terminal/common/environmentVariableCollection';
-import { deserializeEnvironmentDescriptionMap, deserializeEnvironmentVariableCollection, serializeEnvironmentDescriptionMap, serializeEnvironmentVariableCollection } from 'vs/platform/terminal/common/environmentVariableShared';
-import { IEnvironmentVariableCollectionWithPersistence, IEnvironmentVariableService } from 'vs/workbench/contrib/terminal/common/environmentVariable';
-import { TerminalStorageKeys } from 'vs/workbench/contrib/terminal/common/terminalStorageKeys';
-import { IMergedEnvironmentVariableCollection, ISerializableEnvironmentDescriptionMap, ISerializableEnvironmentVariableCollection } from 'vs/platform/terminal/common/environmentVariable';
-import { Disposable } from 'vs/base/common/lifecycle';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { debounce, throttle } from '../../../../base/common/decorators.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { MergedEnvironmentVariableCollection } from '../../../../platform/terminal/common/environmentVariableCollection.js';
+import { deserializeEnvironmentDescriptionMap, deserializeEnvironmentVariableCollection, serializeEnvironmentDescriptionMap, serializeEnvironmentVariableCollection } from '../../../../platform/terminal/common/environmentVariableShared.js';
+import { IEnvironmentVariableCollectionWithPersistence, IEnvironmentVariableService } from './environmentVariable.js';
+import { TerminalStorageKeys } from './terminalStorageKeys.js';
+import { IMergedEnvironmentVariableCollection, ISerializableEnvironmentDescriptionMap, ISerializableEnvironmentVariableCollection } from '../../../../platform/terminal/common/environmentVariable.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
 
 interface ISerializableExtensionEnvironmentVariableCollection {
 	extensionIdentifier: string;
diff --git a/src/vs/workbench/contrib/terminal/common/remote/remoteTerminalChannel.ts b/src/vs/workbench/contrib/terminal/common/remote/remoteTerminalChannel.ts
index ab1c7d898c7..8def96e44b1 100644
--- a/src/vs/workbench/contrib/terminal/common/remote/remoteTerminalChannel.ts
+++ b/src/vs/workbench/contrib/terminal/common/remote/remoteTerminalChannel.ts
@@ -3,27 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { IChannel } from 'vs/base/parts/ipc/common/ipc';
-import { IWorkbenchConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
-import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { serializeEnvironmentDescriptionMap, serializeEnvironmentVariableCollection } from 'vs/platform/terminal/common/environmentVariableShared';
-import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
-import { SideBySideEditor, EditorResourceAccessor } from 'vs/workbench/common/editor';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { Schemas } from 'vs/base/common/network';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { IEnvironmentVariableService } from 'vs/workbench/contrib/terminal/common/environmentVariable';
-import { IProcessDataEvent, IRequestResolveVariablesEvent, IShellLaunchConfigDto, ITerminalLaunchError, ITerminalProfile, ITerminalsLayoutInfo, ITerminalsLayoutInfoById, TerminalIcon, IProcessProperty, ProcessPropertyType, IProcessPropertyMap, TitleEventSource, ISerializedTerminalState, IPtyHostController, ITerminalProcessOptions, IProcessReadyEvent, ITerminalLogService, IPtyHostLatencyMeasurement } from 'vs/platform/terminal/common/terminal';
-import { IGetTerminalLayoutInfoArgs, IProcessDetails, ISetTerminalLayoutInfoArgs } from 'vs/platform/terminal/common/terminalProcess';
-import { IProcessEnvironment, OperatingSystem } from 'vs/base/common/platform';
-import { ICompleteTerminalConfiguration } from 'vs/workbench/contrib/terminal/common/terminal';
-import { IPtyHostProcessReplayEvent } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { ISerializableEnvironmentDescriptionMap as ISerializableEnvironmentDescriptionMap, ISerializableEnvironmentVariableCollection } from 'vs/platform/terminal/common/environmentVariable';
-import type * as performance from 'vs/base/common/performance';
-import { RemoteTerminalChannelEvent, RemoteTerminalChannelRequest } from 'vs/workbench/contrib/terminal/common/remote/terminal';
+import { Event } from '../../../../../base/common/event.js';
+import { URI, UriComponents } from '../../../../../base/common/uri.js';
+import { IChannel } from '../../../../../base/parts/ipc/common/ipc.js';
+import { IWorkbenchConfigurationService } from '../../../../services/configuration/common/configuration.js';
+import { IRemoteAuthorityResolverService } from '../../../../../platform/remote/common/remoteAuthorityResolver.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { serializeEnvironmentDescriptionMap, serializeEnvironmentVariableCollection } from '../../../../../platform/terminal/common/environmentVariableShared.js';
+import { IConfigurationResolverService } from '../../../../services/configurationResolver/common/configurationResolver.js';
+import { SideBySideEditor, EditorResourceAccessor } from '../../../../common/editor.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { ILabelService } from '../../../../../platform/label/common/label.js';
+import { IEnvironmentVariableService } from '../environmentVariable.js';
+import { IProcessDataEvent, IRequestResolveVariablesEvent, IShellLaunchConfigDto, ITerminalLaunchError, ITerminalProfile, ITerminalsLayoutInfo, ITerminalsLayoutInfoById, TerminalIcon, IProcessProperty, ProcessPropertyType, IProcessPropertyMap, TitleEventSource, ISerializedTerminalState, IPtyHostController, ITerminalProcessOptions, IProcessReadyEvent, ITerminalLogService, IPtyHostLatencyMeasurement } from '../../../../../platform/terminal/common/terminal.js';
+import { IGetTerminalLayoutInfoArgs, IProcessDetails, ISetTerminalLayoutInfoArgs } from '../../../../../platform/terminal/common/terminalProcess.js';
+import { IProcessEnvironment, OperatingSystem } from '../../../../../base/common/platform.js';
+import { ICompleteTerminalConfiguration } from '../terminal.js';
+import { IPtyHostProcessReplayEvent } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
+import { ISerializableEnvironmentDescriptionMap as ISerializableEnvironmentDescriptionMap, ISerializableEnvironmentVariableCollection } from '../../../../../platform/terminal/common/environmentVariable.js';
+import type * as performance from '../../../../../base/common/performance.js';
+import { RemoteTerminalChannelEvent, RemoteTerminalChannelRequest } from './terminal.js';
 
 export const REMOTE_TERMINAL_CHANNEL_NAME = 'remoteterminal';
 
@@ -250,12 +250,6 @@ export class RemoteTerminalChannelClient implements IPtyHostController {
 	freePortKillProcess(port: string): Promise<{ port: string; processId: string }> {
 		return this._channel.call(RemoteTerminalChannelRequest.FreePortKillProcess, [port]);
 	}
-	installAutoReply(match: string, reply: string): Promise<void> {
-		return this._channel.call(RemoteTerminalChannelRequest.InstallAutoReply, [match, reply]);
-	}
-	uninstallAllAutoReplies(): Promise<void> {
-		return this._channel.call(RemoteTerminalChannelRequest.UninstallAllAutoReplies, []);
-	}
 	getDefaultSystemShell(osOverride?: OperatingSystem): Promise<string> {
 		return this._channel.call(RemoteTerminalChannelRequest.GetDefaultSystemShell, [osOverride]);
 	}
@@ -318,4 +312,15 @@ export class RemoteTerminalChannelClient implements IPtyHostController {
 	serializeTerminalState(ids: number[]): Promise<string> {
 		return this._channel.call(RemoteTerminalChannelRequest.SerializeTerminalState, [ids]);
 	}
+
+	// #region Pty service contribution RPC calls
+
+	installAutoReply(match: string, reply: string): Promise<void> {
+		return this._channel.call(RemoteTerminalChannelRequest.InstallAutoReply, [match, reply]);
+	}
+	uninstallAllAutoReplies(): Promise<void> {
+		return this._channel.call(RemoteTerminalChannelRequest.UninstallAllAutoReplies, []);
+	}
+
+	// #endregion
 }
diff --git a/src/vs/workbench/contrib/terminal/common/remote/terminal.ts b/src/vs/workbench/contrib/terminal/common/remote/terminal.ts
index 54498e30cff..5e649e86a51 100644
--- a/src/vs/workbench/contrib/terminal/common/remote/terminal.ts
+++ b/src/vs/workbench/contrib/terminal/common/remote/terminal.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { UriComponents } from 'vs/base/common/uri';
-import { IShellLaunchConfigDto, ITerminalProcessOptions } from 'vs/platform/terminal/common/terminal';
-import { ICompleteTerminalConfiguration } from 'vs/workbench/contrib/terminal/common/terminal';
-import { ISerializableEnvironmentDescriptionMap as ISerializableEnvironmentDescriptionMap, ISerializableEnvironmentVariableCollection } from 'vs/platform/terminal/common/environmentVariable';
+import { UriComponents } from '../../../../../base/common/uri.js';
+import { IShellLaunchConfigDto, ITerminalProcessOptions } from '../../../../../platform/terminal/common/terminal.js';
+import { ICompleteTerminalConfiguration } from '../terminal.js';
+import { ISerializableEnvironmentDescriptionMap as ISerializableEnvironmentDescriptionMap, ISerializableEnvironmentVariableCollection } from '../../../../../platform/terminal/common/environmentVariable.js';
 
 export const REMOTE_TERMINAL_CHANNEL_NAME = 'remoteterminal';
 
diff --git a/src/vs/workbench/contrib/terminal/common/scripts/CodeTabExpansion.psm1 b/src/vs/workbench/contrib/terminal/common/scripts/CodeTabExpansion.psm1
new file mode 100644
index 00000000000..559c9d3c76b
--- /dev/null
+++ b/src/vs/workbench/contrib/terminal/common/scripts/CodeTabExpansion.psm1
@@ -0,0 +1,62 @@
+# ---------------------------------------------------------------------------------------------
+#   Copyright (c) Microsoft Corporation. All rights reserved.
+#   Licensed under the MIT License. See License.txt in the project root for license information.
+# ---------------------------------------------------------------------------------------------
+
+# TODO: Dynamically enable depending on quality?
+Microsoft.PowerShell.Core\Register-ArgumentCompleter -CommandName "code","code-insiders" -Native -ScriptBlock {
+	param($wordToComplete, $commandAst, $cursorPosition)
+
+	# TODO: These tooltips could be localized?
+	# TODO: Context aware suggestions
+	# TODO: Auto-generate this
+	# TODO: Subcommands
+	@(
+		[System.Management.Automation.CompletionResult]::new("--add", "--add", 'ParameterName', 'Add folder(s) to the last active window.'),
+		[System.Management.Automation.CompletionResult]::new("--category", "--category", 'ParameterName', 'Filters installed extensions by provided category, when using --list-extensions.'),
+		[System.Management.Automation.CompletionResult]::new("--diff", "--diff", 'ParameterName', 'Compare two files with each other.'),
+		[System.Management.Automation.CompletionResult]::new("--disable-chromium-sandbox", "--disable-chromium-sandbox", 'ParameterName', 'Use this option only when there is requirement to launch the application as sudo user on Linux or when running as an elevated user in an applocker environment on Windows.'),
+		[System.Management.Automation.CompletionResult]::new("--disable-extension", "--disable-extension", 'ParameterName', 'Disable the provided extension. This option is not persisted and is effective only when the command opens a new window.'),
+		[System.Management.Automation.CompletionResult]::new("--disable-extensions", "--disable-extensions", 'ParameterName', 'Disable all installed extensions. This option is not persisted and is effective only when the command opens a new window.'),
+		[System.Management.Automation.CompletionResult]::new("--disable-gpu", "--disable-gpu", 'ParameterName', 'Disable GPU hardware acceleration.'),
+		[System.Management.Automation.CompletionResult]::new("--disable-lcd-text", "--disable-lcd-text", 'ParameterName', 'Disable LCD font rendering.'),
+		[System.Management.Automation.CompletionResult]::new("--enable-proposed-api", "--enable-proposed-api", 'ParameterName', 'Enables proposed API features for extensions. Can receive one or more extension IDs to enable individually.'),
+		[System.Management.Automation.CompletionResult]::new("--extensions-dir", "--extensions-dir", 'ParameterName', 'Set the root path for extensions.'),
+		[System.Management.Automation.CompletionResult]::new("--goto", "--goto", 'ParameterName', 'Open a file at the path on the specified line and character position.'),
+		[System.Management.Automation.CompletionResult]::new("--help", "--help", 'ParameterName', 'Print usage.'),
+		[System.Management.Automation.CompletionResult]::new("--inspect-brk-extensions", "--inspect-brk-extensions", 'ParameterName', 'Allow debugging and profiling of extensions with the extension host being paused after start. Check the developer tools for the connection URI.'),
+		[System.Management.Automation.CompletionResult]::new("--inspect-extensions", "--inspect-extensions", 'ParameterName', 'Allow debugging and profiling of extensions. Check the developer tools for the connection URI.'),
+		[System.Management.Automation.CompletionResult]::new("--install-extension", "--install-extension", 'ParameterName', 'Installs or updates an extension. The argument is either an extension id or a path to a VSIX. The identifier of an extension is ''${publisher}.${name}''. Use ''--force'' argument to update to latest version. To install a specific version provide ''@${version}''. For example: ''vscode.csharp@1.2.3''.'),
+		[System.Management.Automation.CompletionResult]::new("--list-extensions", "--list-extensions", 'ParameterName', 'List the installed extensions.'),
+		[System.Management.Automation.CompletionResult]::new("--locale", "--locale", 'ParameterName', 'The locale to use (e.g. en-US or zh-TW).'),
+		[System.Management.Automation.CompletionResult]::new("--log", "--log", 'ParameterName', 'Log level to use. Default is ''info''. Allowed values are ''critical'', ''error'', ''warn'', ''info'', ''debug'', ''trace'', ''off''. You can also configure the log level of an extension by passing extension id and log level in the following format:\n\n ''${publisher}.${name}:${logLevel}''. For example: ''vscode.csharp:trace''. Can receive one or more such entries.'),
+		[System.Management.Automation.CompletionResult]::new("--merge", "--merge", 'ParameterName', 'Perform a three-way merge by providing paths for two modified versions of a file, the common origin of both modified versions and the output file to save merge results.'),
+		[System.Management.Automation.CompletionResult]::new("--new-window", "--new-window", 'ParameterName', 'Force to open a new window.'),
+		[System.Management.Automation.CompletionResult]::new("--pre-release", "--pre-release", 'ParameterName', 'Installs the pre-release version of the extension, when using'),
+		[System.Management.Automation.CompletionResult]::new("--prof-startup", "--prof-startup", 'ParameterName', 'Run CPU profiler during startup.'),
+		[System.Management.Automation.CompletionResult]::new("--profile", "--profile", 'ParameterName', 'Opens the provided folder or workspace with the given profile and associates the profile with the workspace. If the profile does not exist, a new empty one is created.'),
+		[System.Management.Automation.CompletionResult]::new("--reuse-window", "--reuse-window", 'ParameterName', 'Force to open a file or folder in an already opened window.'),
+		[System.Management.Automation.CompletionResult]::new("--show-versions", "--show-versions", 'ParameterName', 'Show versions of installed extensions, when using --list-extensions.'),
+		[System.Management.Automation.CompletionResult]::new("--status", "--status", 'ParameterName', 'Print process usage and diagnostics information.'),
+		[System.Management.Automation.CompletionResult]::new("--sync", "--sync", 'ParameterName', 'Turn sync on or off.'),
+		[System.Management.Automation.CompletionResult]::new("--telemetry", "--telemetry", 'ParameterName', 'Shows all telemetry events which VS code collects.'),
+		[System.Management.Automation.CompletionResult]::new("--uninstall-extension", "--uninstall-extension", 'ParameterName', 'Uninstalls an extension.'),
+		[System.Management.Automation.CompletionResult]::new("--update-extensions", "--update-extensions", 'ParameterName', 'Update the installed extensions.'),
+		[System.Management.Automation.CompletionResult]::new("--user-data-dir", "--user-data-dir", 'ParameterName', 'Specifies the directory that user data is kept in. Can be used to open multiple distinct instances of Code.'),
+		[System.Management.Automation.CompletionResult]::new("--verbose", "--verbose", 'ParameterName', 'Print verbose output (implies --wait).'),
+		[System.Management.Automation.CompletionResult]::new("--version", "--version", 'ParameterName', 'Print version.'),
+		[System.Management.Automation.CompletionResult]::new("--wait", "--wait", 'ParameterName', 'Wait for the files to be closed before returning.'),
+		[System.Management.Automation.CompletionResult]::new("-a", "-a", 'ParameterName', 'Add folder(s) to the last active window.'),
+		[System.Management.Automation.CompletionResult]::new("-d", "-d", 'ParameterName', 'Compare two files with each other.'),
+		[System.Management.Automation.CompletionResult]::new("-g", "-g", 'ParameterName', 'Open a file at the path on the specified line and character position.'),
+		[System.Management.Automation.CompletionResult]::new("-h", "-h", 'ParameterName', 'Print usage.'),
+		[System.Management.Automation.CompletionResult]::new("-m", "-m", 'ParameterName', 'Perform a three-way merge by providing paths for two modified versions of a file, the common origin of both modified versions and the output file to save merge results.'),
+		[System.Management.Automation.CompletionResult]::new("-n", "-n", 'ParameterName', 'Force to open a new window.'),
+		[System.Management.Automation.CompletionResult]::new("-r", "-r", 'ParameterName', 'Force to open a file or folder in an already opened window.'),
+		[System.Management.Automation.CompletionResult]::new("-s", "-s", 'ParameterName', 'Print process usage and diagnostics information.'),
+		[System.Management.Automation.CompletionResult]::new("-v", "-v", 'ParameterName', 'Print version.'),
+		[System.Management.Automation.CompletionResult]::new("-w", "-w", 'ParameterName', 'Wait for the files to be closed before returning.'),
+		[System.Management.Automation.CompletionResult]::new("serve-web", "serve-web", 'Command', 'Run a server that displays the editor UI in browsers.')
+		[System.Management.Automation.CompletionResult]::new("tunnel", "tunnel", 'Command', 'Make the current machine accessible from vscode.dev or other machines through a secure tunnel')
+	)
+}
diff --git a/src/vs/workbench/contrib/terminal/common/scripts/GitTabExpansion.psm1 b/src/vs/workbench/contrib/terminal/common/scripts/GitTabExpansion.psm1
new file mode 100644
index 00000000000..ad61806ab5e
--- /dev/null
+++ b/src/vs/workbench/contrib/terminal/common/scripts/GitTabExpansion.psm1
@@ -0,0 +1,666 @@
+# ---------------------------------------------------------------------------------------------
+#   Copyright (c) Microsoft Corporation. All rights reserved.
+#   Licensed under the MIT License. See License.txt in the project root for license information.
+# ---------------------------------------------------------------------------------------------
+
+# This is a fork of posh-git that has been modified to add additional features and custom VS Code
+# specific integrations.
+#
+# Copyright (c) 2010-2018 Keith Dahlby, Keith Hill, and contributors
+#
+# 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.
+
+function dbg($Message, [Diagnostics.Stopwatch]$Stopwatch) {
+	if ($Stopwatch) {
+		Write-Verbose ('{0:00000}:{1}' -f $Stopwatch.ElapsedMilliseconds,$Message) -Verbose # -ForegroundColor Yellow
+	}
+}
+
+function Get-AliasPattern($cmd) {
+	$aliases = @($cmd) + @(Get-Alias | Where-Object { $_.Definition -match "^$cmd(\.exe)?$" } | Foreach-Object Name)
+	"($($aliases -join '|'))"
+}
+
+$Global:GitTabSettings = New-Object PSObject -Property @{
+	AllCommands = $false
+	KnownAliases = @{
+		'!f() { exec vsts code pr "$@"; }; f' = 'vsts.pr'
+	}
+	EnableLogging = $false
+	LogPath = Join-Path ([System.IO.Path]::GetTempPath()) posh-git_tabexp.log
+	RegisteredCommands = ""
+}
+
+$subcommands = @{
+	bisect = "start bad good skip reset visualize replay log run"
+	notes = 'add append copy edit get-ref list merge prune remove show'
+	'vsts.pr' = 'create update show list complete abandon reactivate reviewers work-items set-vote policies'
+	reflog = "show delete expire"
+	remote = "
+		add rename remove set-head set-branches
+		get-url set-url show prune update
+		"
+	rerere = "clear forget diff remaining status gc"
+	stash = 'push save list show apply clear drop pop create branch'
+	submodule = "add status init deinit update summary foreach sync"
+	svn = "
+		init fetch clone rebase dcommit log find-rev
+		set-tree commit-diff info create-ignore propget
+		proplist show-ignore show-externals branch tag blame
+		migrate mkdirs reset gc
+		"
+	tfs = "
+		list-remote-branches clone quick-clone bootstrap init
+		clone fetch pull quick-clone unshelve shelve-list labels
+		rcheckin checkin checkintool shelve shelve-delete
+		branch
+		info cleanup cleanup-workspaces help verify autotag subtree reset-remote checkout
+		"
+	flow = "init feature bugfix release hotfix support help version"
+	worktree = "add list lock move prune remove unlock"
+}
+
+$gitflowsubcommands = @{
+	init = 'help'
+	feature = 'list start finish publish track diff rebase checkout pull help delete'
+	bugfix = 'list start finish publish track diff rebase checkout pull help delete'
+	release = 'list start finish track publish help delete'
+	hotfix = 'list start finish track publish help delete'
+	support = 'list start help'
+	config = 'list set base'
+}
+
+function script:gitCmdOperations($commands, $command, $filter) {
+	$commands[$command].Trim() -split '\s+' | Where-Object { $_ -like "$filter*" }
+}
+
+$script:someCommands = @(
+	'add','am','annotate','archive','bisect','blame','branch','bundle','checkout','cherry',
+	'cherry-pick','citool','clean','clone','commit','config','describe','diff','difftool','fetch',
+	'format-patch','gc','grep','gui','help','init','instaweb','log','merge','mergetool','mv',
+	'notes','prune','pull','push','rebase','reflog','remote','rerere','reset','restore','revert','rm',
+	'shortlog','show','stash','status','submodule','svn','switch','tag','whatchanged', 'worktree'
+)
+
+# Based on git help -a output
+$script:someCommandsDescriptions =  @{
+	# Main Porcelain Commands"
+	add = "Add file contents to the index"
+	am = "Apply a series of patches from a mailbox"
+	archive = "Create an archive of files from a named tree"
+	bisect = "Use binary search to find the commit that introduced a bug"
+	branch = "List, create, or delete branches"
+	bundle = "Move objects and refs by archive"
+	checkout = "Switch branches or restore working tree files"
+	"cherry-pick" = "Apply the changes introduced by some existing commits"
+	citool = "Graphical alternative to git-commit"
+	clean = "Remove untracked files from the working tree"
+	clone = "Clone a repository into a new directory"
+	commit = "Record changes to the repository"
+	describe = "Give an object a human readable name based on an available ref"
+	diff = "Show changes between commits, commit and working tree, etc"
+	fetch = "Download objects and refs from another repository"
+	"format-patch" = "Prepare patches for e-mail submission"
+	gc = "Cleanup unnecessary files and optimize the local repository"
+	grep = "Print lines matching a pattern"
+	gui = "A portable graphical interface to Git"
+	init = "Create an empty Git repository or reinitialize an existing one"
+	log = "Show commit logs"
+	merge = "Join two or more development histories together"
+	mv = "Move or rename a file, a directory, or a symlink"
+	notes = "Add or inspect object notes"
+	pull = "Fetch from and integrate with another repository or a local branch"
+	push = "Update remote refs along with associated objects"
+	rebase = "Reapply commits on top of another base tip"
+	reset = "Reset current HEAD to the specified state"
+	restore = "Restore working tree files"
+	revert = "Revert some existing commits"
+	rm = "Remove files from the working tree and from the index"
+	shortlog = "Summarize 'git log' output"
+	show = "Show various types of objects"
+	stash = "Stash the changes in a dirty working directory away"
+	status = "Show the working tree status"
+	submodule = "Initialize, update or inspect submodules"
+	switch = "Switch branches"
+	tag = "Create, list, delete or verify a tag object signed with GPG"
+	worktree = "Manage multiple working trees"
+
+	# Ancillary Commands / Manipulators
+	config = "Get and set repository or global options"
+	mergetool = "Run merge conflict resolution tools to resolve merge conflicts"
+	"pack-refs" = "Pack heads and tags for efficient repository access"
+	prune = "Prune all unreachable objects from the object database"
+	reflog = "Manage reflog information"
+	remote = "Manage set of tracked repositories"
+
+	# Ancillary Commands / Interrogators
+	annotate = "Annotate file lines with commit information"
+	blame = "Show what revision and author last modified each line of a file"
+	difftool = "Show changes using common diff tools"
+	help = "Display help information about Git"
+	rerere = "Reuse recorded resolution of conflicted merges"
+	whatchanged = "Show logs with differences each commit introduces"
+
+	# Low-level Commands / Interrogators
+	cherry = "Find commits yet to be applied to upstream"
+}
+
+
+
+if ((($PSVersionTable.PSVersion.Major -eq 5) -or $IsWindows) -and ($script:GitVersion -ge [System.Version]'2.16.2')) {
+	$script:someCommands += 'update-git-for-windows'
+}
+
+$script:gitCommandsWithLongParams = $longGitParams.Keys -join '|'
+$script:gitCommandsWithShortParams = $shortGitParams.Keys -join '|'
+$script:gitCommandsWithParamValues = $gitParamValues.Keys -join '|'
+$script:vstsCommandsWithShortParams = $shortVstsParams.Keys -join '|'
+$script:vstsCommandsWithLongParams = $longVstsParams.Keys -join '|'
+
+try {
+	if ($null -ne (git help -a 2>&1 | Select-String flow)) {
+		$script:someCommands += 'flow'
+	}
+}
+catch {
+	Write-Debug "Search for 'flow' in 'git help' output failed with error: $_"
+}
+
+filter quoteStringWithSpecialChars {
+	if ($_ -and ($_ -match '\s+|#|@|\$|;|,|''|\{|\}|\(|\)')) {
+		$str = $_ -replace "'", "''"
+		"'$str'"
+	}
+	else {
+		$_
+	}
+}
+
+function script:gitCommands($filter, $includeAliases) {
+	$cmdList = @()
+	if (-not $global:GitTabSettings.AllCommands) {
+		$cmdList += $someCommands -like "$filter*"
+	}
+	else {
+		$cmdList += git help --all |
+			Where-Object { $_ -match '^\s{2,}\S.*' } |
+			ForEach-Object { $_.Split(' ', [StringSplitOptions]::RemoveEmptyEntries) } |
+			Where-Object { $_ -like "$filter*" }
+	}
+
+	$completions = $cmdList | Sort-Object | ForEach-Object {
+		$command = $_
+		if ($script:someCommandsDescriptions.ContainsKey($command)) {
+			[System.Management.Automation.CompletionResult]::new($command, $command, 'Method', $script:someCommandsDescriptions[$command])
+		} else {
+			[System.Management.Automation.CompletionResult]::new($command, $command, 'Method', $command)
+		}
+	}
+
+	if ($includeAliases) {
+		$completions += gitAliases $filter
+	}
+
+	$completions
+}
+
+function script:gitRemotes($filter) {
+	git remote |
+		Where-Object { $_ -like "$filter*" } |
+		quoteStringWithSpecialChars
+}
+
+function script:gitBranches($filter, $includeHEAD = $false, $prefix = '') {
+	if ($filter -match "^(?<from>\S*\.{2,3})(?<to>.*)") {
+		$prefix += $matches['from']
+		$filter = $matches['to']
+	}
+
+	$branches = @(git branch --no-color | ForEach-Object { if (($_ -notmatch "^\* \(HEAD detached .+\)$") -and ($_ -match "^[\*\+]?\s*(?<ref>\S+)(?: -> .+)?")) { $matches['ref'] } }) +
+				@(git branch --no-color -r | ForEach-Object { if ($_ -match "^  (?<ref>\S+)(?: -> .+)?") { $matches['ref'] } }) +
+				@(if ($includeHEAD) { 'HEAD','FETCH_HEAD','ORIG_HEAD','MERGE_HEAD' })
+
+	$branches |
+		Where-Object { $_ -ne '(no branch)' -and $_ -like "$filter*" } |
+		ForEach-Object { $prefix + $_ } |
+		quoteStringWithSpecialChars
+}
+
+function script:gitRemoteUniqueBranches($filter) {
+	git branch --no-color -r |
+		ForEach-Object { if ($_ -match "^  (?<remote>[^/]+)/(?<branch>\S+)(?! -> .+)?$") { $matches['branch'] } } |
+		Group-Object -NoElement |
+		Where-Object { $_.Count -eq 1 } |
+		Select-Object -ExpandProperty Name |
+		Where-Object { $_ -like "$filter*" } |
+		quoteStringWithSpecialChars
+}
+
+function script:gitConfigKeys($section, $filter, $defaultOptions = '') {
+	$completions = @($defaultOptions -split ' ')
+
+	git config --name-only --get-regexp ^$section\..* |
+		ForEach-Object { $completions += ($_ -replace "$section\.","") }
+
+	return $completions |
+		Where-Object { $_ -like "$filter*" } |
+		Sort-Object |
+		quoteStringWithSpecialChars
+}
+
+function script:gitTags($filter, $prefix = '') {
+	git tag |
+		Where-Object { $_ -like "$filter*" } |
+		ForEach-Object { $prefix + $_ } |
+		quoteStringWithSpecialChars
+}
+
+function script:gitFeatures($filter, $command) {
+	$featurePrefix = git config --local --get "gitflow.prefix.$command"
+	$branches = @(git branch --no-color | ForEach-Object { if ($_ -match "^\*?\s*$featurePrefix(?<ref>.*)") { $matches['ref'] } })
+	$branches |
+		Where-Object { $_ -ne '(no branch)' -and $_ -like "$filter*" } |
+		ForEach-Object { $featurePrefix + $_ } |
+		quoteStringWithSpecialChars
+}
+
+function script:gitRemoteBranches($remote, $ref, $filter, $prefix = '') {
+	git branch --no-color -r |
+		Where-Object { $_ -like "  $remote/$filter*" } |
+		ForEach-Object { $prefix + $ref + ($_ -replace "  $remote/","") } |
+		quoteStringWithSpecialChars
+}
+
+function script:gitStashes($filter) {
+	(git stash list) -replace ':.*','' |
+		Where-Object { $_ -like "$filter*" } |
+		quoteStringWithSpecialChars
+}
+
+function script:gitTfsShelvesets($filter) {
+	(git tfs shelve-list) |
+		Where-Object { $_ -like "$filter*" } |
+		quoteStringWithSpecialChars
+}
+
+function script:gitFiles($filter, $files) {
+	$files | Sort-Object |
+		Where-Object { $_ -like "$filter*" } |
+		quoteStringWithSpecialChars
+}
+
+function script:gitIndex($GitStatus, $filter) {
+	gitFiles $filter $GitStatus.Index
+}
+
+function script:gitAddFiles($GitStatus, $filter) {
+	gitFiles $filter (@($GitStatus.Working.Unmerged) + @($GitStatus.Working.Modified) + @($GitStatus.Working.Added))
+}
+
+function script:gitCheckoutFiles($GitStatus, $filter) {
+	gitFiles $filter (@($GitStatus.Working.Unmerged) + @($GitStatus.Working.Modified) + @($GitStatus.Working.Deleted))
+}
+
+function script:gitDeleted($GitStatus, $filter) {
+	gitFiles $filter $GitStatus.Working.Deleted
+}
+
+function script:gitDiffFiles($GitStatus, $filter, $staged) {
+	if ($staged) {
+		gitFiles $filter $GitStatus.Index.Modified
+	}
+	else {
+		gitFiles $filter (@($GitStatus.Working.Unmerged) + @($GitStatus.Working.Modified) + @($GitStatus.Index.Modified))
+	}
+}
+
+function script:gitMergeFiles($GitStatus, $filter) {
+	gitFiles $filter $GitStatus.Working.Unmerged
+}
+
+function script:gitRestoreFiles($GitStatus, $filter, $staged) {
+	if ($staged) {
+		gitFiles $filter (@($GitStatus.Index.Added) + @($GitStatus.Index.Modified) + @($GitStatus.Index.Deleted))
+	}
+	else {
+		gitFiles $filter (@($GitStatus.Working.Unmerged) + @($GitStatus.Working.Modified) + @($GitStatus.Working.Deleted))
+	}
+}
+
+function script:gitAliases($filter) {
+	git config --get-regexp ^alias\. | ForEach-Object {
+		if ($_ -match "^alias\.(?<alias>\S+) (?<expanded>.+)") {
+			$alias = $Matches['alias']
+			$expanded = $Matches['expanded']
+			if ($alias -like "$filter*") {
+				[System.Management.Automation.CompletionResult]::new($alias, $alias, 'Variable', $expanded)
+			}
+		}
+	}
+}
+
+function script:expandGitAlias($cmd, $rest) {
+	$alias = git config "alias.$cmd"
+
+	if ($alias) {
+		$known = $Global:GitTabSettings.KnownAliases[$alias]
+		if ($known) {
+			return "git $known$rest"
+		}
+
+		return "git $alias$rest"
+	}
+	else {
+		return "git $cmd$rest"
+	}
+}
+
+function script:expandLongParams($hash, $cmd, $filter) {
+	$hash[$cmd].Trim() -split ' ' |
+		Where-Object { $_ -like "$filter*" } |
+		Sort-Object |
+		ForEach-Object { -join ("--", $_) }
+}
+
+function script:expandShortParams($hash, $cmd, $filter) {
+	$hash[$cmd].Trim() -split ' ' |
+		Where-Object { $_ -like "$filter*" } |
+		Sort-Object |
+		ForEach-Object { -join ("-", $_) }
+}
+
+function script:expandParamValues($cmd, $param, $filter) {
+	$paramValues = $gitParamValues[$cmd][$param]
+
+	$completions = if ($paramValues -is [scriptblock]) {
+		& $paramValues $filter
+	}
+	else {
+		$paramValues.Trim() -split ' ' | Where-Object { $_ -like "$filter*" } | Sort-Object
+	}
+
+	$completions | ForEach-Object { -join ("--", $param, "=", $_) }
+}
+
+function Expand-GitCommand($Command) {
+	# Parse all Git output as UTF8, including tab completion output - https://github.com/dahlbyk/posh-git/pull/359
+	$res = GitTabExpansionInternal $Command $Global:GitStatus
+	$res
+}
+
+function GitTabExpansionInternal($lastBlock, $GitStatus = $null) {
+	$ignoreGitParams = '(?<params>\s+-(?:[aA-zZ0-9]+|-[aA-zZ0-9][aA-zZ0-9-]*)(?:=\S+)?)*'
+
+	if ($lastBlock -match "^$(Get-AliasPattern git) (?<cmd>\S+)(?<args> .*)$") {
+		$lastBlock = expandGitAlias $Matches['cmd'] $Matches['args']
+	}
+
+	# Handles tgit <command> (tortoisegit)
+	if ($lastBlock -match "^$(Get-AliasPattern tgit) (?<cmd>\S*)$") {
+		# Need return statement to prevent fall-through.
+		return $Global:TortoiseGitSettings.TortoiseGitCommands.Keys.GetEnumerator() | Sort-Object | Where-Object { $_ -like "$($matches['cmd'])*" }
+	}
+
+	# Handles gitk
+	if ($lastBlock -match "^$(Get-AliasPattern gitk).* (?<ref>\S*)$") {
+		return gitBranches $matches['ref'] $true
+	}
+
+	switch -regex ($lastBlock -replace "^$(Get-AliasPattern git) ","") {
+
+		# Handles git <cmd> <op>
+		"^(?<cmd>$($subcommands.Keys -join '|'))\s+(?<op>\S*)$" {
+			gitCmdOperations $subcommands $matches['cmd'] $matches['op']
+		}
+
+		# Handles git flow <cmd> <op>
+		"^flow (?<cmd>$($gitflowsubcommands.Keys -join '|'))\s+(?<op>\S*)$" {
+			gitCmdOperations $gitflowsubcommands $matches['cmd'] $matches['op']
+		}
+
+		# Handles git flow <command> <op> <name>
+		"^flow (?<command>\S*)\s+(?<op>\S*)\s+(?<name>\S*)$" {
+			gitFeatures $matches['name'] $matches['command']
+		}
+
+		# Handles git remote (rename|rm|remove|set-head|set-branches|set-url|show|prune) <stash>
+		"^remote.* (?:rename|rm|remove|set-head|set-branches|set-url|show|prune).* (?<remote>\S*)$" {
+			gitRemotes $matches['remote'] | ConvertTo-VscodeCompletion -Type 'remote'
+		}
+
+		# Handles git stash (show|apply|drop|pop|branch) <stash>
+		"^stash (?:show|apply|drop|pop|branch).* (?<stash>\S*)$" {
+			gitStashes $matches['stash'] | ConvertTo-VscodeCompletion -Type 'stash'
+		}
+
+		# Handles git bisect (bad|good|reset|skip) <ref>
+		"^bisect (?:bad|good|reset|skip).* (?<ref>\S*)$" {
+			gitBranches $matches['ref'] $true | ConvertTo-VscodeCompletion -Type 'branch'
+		}
+
+		# Handles git tfs unshelve <shelveset>
+		"^tfs +unshelve.* (?<shelveset>\S*)$" {
+			gitTfsShelvesets $matches['shelveset']
+		}
+
+		# Handles git branch -d|-D|-m|-M <branch name>
+		# Handles git branch <branch name> <start-point>
+		"^branch.* (?<branch>\S*)$" {
+			gitBranches $matches['branch'] | ConvertTo-VscodeCompletion -Type 'branch'
+		}
+
+		# Handles git <cmd> (commands & aliases)
+		"^(?<cmd>\S*)$" {
+			gitCommands $matches['cmd'] $TRUE
+		}
+
+		# Handles git help <cmd> (commands only)
+		"^help (?<cmd>\S*)$" {
+			gitCommands $matches['cmd'] $FALSE
+		}
+
+		# Handles git push remote <ref>:<branch>
+		# Handles git push remote +<ref>:<branch>
+		"^push${ignoreGitParams}\s+(?<remote>[^\s-]\S*).*\s+(?<force>\+?)(?<ref>[^\s\:]*\:)(?<branch>\S*)$" {
+			gitRemoteBranches $matches['remote'] $matches['ref'] $matches['branch'] -prefix $matches['force'] | ConvertTo-VscodeCompletion -Type 'branch'
+		}
+
+		# Handles git push remote <ref>
+		# Handles git push remote +<ref>
+		# Handles git pull remote <ref>
+		"^(?:push|pull)${ignoreGitParams}\s+(?<remote>[^\s-]\S*).*\s+(?<force>\+?)(?<ref>[^\s\:]*)$" {
+			gitBranches $matches['ref'] -prefix $matches['force'] | ConvertTo-VscodeCompletion -Type 'branch'
+			gitTags $matches['ref'] -prefix $matches['force'] | ConvertTo-VscodeCompletion -Type 'tag'
+		}
+
+		# Handles git pull <remote>
+		# Handles git push <remote>
+		# Handles git fetch <remote>
+		"^(?:push|pull|fetch)${ignoreGitParams}\s+(?<remote>\S*)$" {
+			gitRemotes $matches['remote'] | ConvertTo-VscodeCompletion -Type 'remote'
+		}
+
+		# Handles git reset HEAD <path>
+		# Handles git reset HEAD -- <path>
+		"^reset.* HEAD(?:\s+--)? (?<path>\S*)$" {
+			gitIndex $GitStatus $matches['path']
+		}
+
+		# Handles git <cmd> <ref>
+		"^commit.*-C\s+(?<ref>\S*)$" {
+			gitBranches $matches['ref'] $true | ConvertTo-VscodeCompletion -Type 'branch'
+		}
+
+		# Handles git add <path>
+		"^add.* (?<files>\S*)$" {
+			gitAddFiles $GitStatus $matches['files']
+		}
+
+		# Handles git checkout -- <path>
+		"^checkout.* -- (?<files>\S*)$" {
+			gitCheckoutFiles $GitStatus $matches['files']
+		}
+
+		# Handles git restore -s <ref> / --source=<ref> - must come before the next regex case
+		"^restore.* (?-i)(-s\s*|(?<source>--source=))(?<ref>\S*)$" {
+			gitBranches $matches['ref'] $true $matches['source']
+			gitTags $matches['ref']
+			break
+		}
+
+		# Handles git restore <path>
+		"^restore(?:.* (?<staged>(?:(?-i)-S|--staged))|.*) (?<files>\S*)$" {
+			gitRestoreFiles $GitStatus $matches['files'] $matches['staged']
+		}
+
+		# Handles git rm <path>
+		"^rm.* (?<index>\S*)$" {
+			gitDeleted $GitStatus $matches['index']
+		}
+
+		# Handles git diff/difftool <path>
+		"^(?:diff|difftool)(?:.* (?<staged>(?:--cached|--staged))|.*) (?<files>\S*)$" {
+			gitDiffFiles $GitStatus $matches['files'] $matches['staged']
+		}
+
+		# Handles git merge/mergetool <path>
+		"^(?:merge|mergetool).* (?<files>\S*)$" {
+			gitMergeFiles $GitStatus $matches['files']
+		}
+
+		# Handles git checkout|switch <ref>
+		"^(?:checkout|switch).* (?<ref>\S*)$" {
+			if ($lastBlock -match "-b\s[^\s]*$") {
+				$null # Force zero results
+			} else {
+				[System.Management.Automation.CompletionResult]::new('.', '.', 'ParameterName', "Discard changes in working directory")
+				$lastCheckout = [System.Management.Automation.CompletionResult]::new('-', '-', 'ParameterName', "The last branch or commit that was checked out")
+				$lastCheckout | Add-Member -NotePropertyName 'CustomIcon' -NotePropertyValue 'gitBranch'
+				$lastCheckout
+				gitBranches $matches['ref'] $true | ConvertTo-VscodeCompletion -Type 'branch'
+				gitRemoteUniqueBranches $matches['ref'] | ConvertTo-VscodeCompletion -Type 'branch'
+				gitTags $matches['ref'] | ConvertTo-VscodeCompletion -Type 'tag'
+			}
+		}
+
+		# Handles git worktree add <path> <ref>
+		"^worktree add.* (?<files>\S+) (?<ref>\S*)$" {
+			gitBranches $matches['ref'] | ConvertTo-VscodeCompletion -Type 'branch'
+		}
+
+		# Handles git <cmd> <ref>
+		"^(?:cherry|cherry-pick|diff|difftool|log|merge|rebase|reflog\s+show|reset|revert|show).* (?<ref>\S*)$" {
+			gitBranches $matches['ref'] $true | ConvertTo-VscodeCompletion -Type 'branch'
+			gitTags $matches['ref'] | ConvertTo-VscodeCompletion -Type 'tag'
+		}
+
+		# Handles git <cmd> --<param>=<value>
+		"^(?<cmd>$gitCommandsWithParamValues).* --(?<param>[^=]+)=(?<value>\S*)$" {
+			expandParamValues $matches['cmd'] $matches['param'] $matches['value']
+		}
+
+		# Handles git <cmd> --<param>
+		"^(?<cmd>$gitCommandsWithLongParams).* --(?<param>\S*)$" {
+			expandLongParams $longGitParams $matches['cmd'] $matches['param']
+		}
+
+		# Handles git <cmd> -<shortparam>
+		"^(?<cmd>$gitCommandsWithShortParams).* -(?<shortparam>\S*)$" {
+			expandShortParams $shortGitParams $matches['cmd'] $matches['shortparam']
+		}
+
+		# Handles git pr alias
+		"vsts\.pr\s+(?<op>\S*)$" {
+			gitCmdOperations $subcommands 'vsts.pr' $matches['op']
+		}
+
+		# Handles git pr <cmd> --<param>
+		"vsts\.pr\s+(?<cmd>$vstsCommandsWithLongParams).*--(?<param>\S*)$"
+		{
+			expandLongParams $longVstsParams $matches['cmd'] $matches['param']
+		}
+
+		# Handles git pr <cmd> -<shortparam>
+		"vsts\.pr\s+(?<cmd>$vstsCommandsWithShortParams).*-(?<shortparam>\S*)$"
+		{
+			expandShortParams $shortVstsParams $matches['cmd'] $matches['shortparam']
+		}
+	}
+}
+
+function ConvertTo-VscodeCompletion {
+	Param(
+		[Parameter(ValueFromPipeline=$true)]
+		$CompletionText,
+		[string]
+		$Type,
+		[string]
+		$CustomIcon
+	)
+
+	Process {
+		$completionMappings = @{
+			"branch" = "gitBranch"
+			"stash" = "gitStash"
+			"remote" = "remote"
+			"tag" = "tag"
+		}
+		$CompletionText | ForEach-Object {
+			$result = [System.Management.Automation.CompletionResult]::new($_, $_, [System.Management.Automation.CompletionResultType]::DynamicKeyword, "$Type $_")
+			$result | Add-Member -NotePropertyName 'CustomIcon' -NotePropertyValue $completionMappings[$Type]
+			$result
+		}
+	}
+}
+
+function WriteTabExpLog([string] $Message) {
+	if (!$global:GitTabSettings.EnableLogging) { return }
+
+	$timestamp = Get-Date -Format HH:mm:ss
+	"[$timestamp] $Message" | Out-File -Append $global:GitTabSettings.LogPath
+}
+
+# if ($PSVersionTable.PSVersion.Major -ge 6) {
+$cmdNames = "git","tgit","gitk"
+
+# Create regex pattern from $cmdNames: ^(git|git\.exe|tgit|tgit\.exe|gitk|gitk\.exe)$
+$cmdNamesPattern = "^($($cmdNames -join '|'))(\.exe)?$"
+$cmdNames += Get-Alias | Where-Object { $_.Definition -match $cmdNamesPattern } | Foreach-Object Name
+
+$global:GitTabSettings.RegisteredCommands = $cmdNames -join ", "
+
+Microsoft.PowerShell.Core\Register-ArgumentCompleter -CommandName $cmdNames -Native -ScriptBlock {
+	param($wordToComplete, $commandAst, $cursorPosition)
+
+	# The PowerShell completion has a habit of stripping the trailing space when completing:
+	# git checkout <tab>
+	# The Expand-GitCommand expects this trailing space, so pad with a space if necessary.
+	$padLength = $cursorPosition - $commandAst.Extent.StartOffset
+	$textToComplete = $commandAst.ToString().PadRight($padLength, ' ').Substring(0, $padLength)
+
+	WriteTabExpLog "Expand: command: '$($commandAst.Extent.Text)', padded: '$textToComplete', padlen: $padLength"
+	$result = Expand-GitCommand $textToComplete
+	if ($null -eq $result) {
+		,@()
+	} else {
+		$result
+	}
+}
+
+
diff --git a/src/vs/workbench/contrib/terminal/common/scripts/cgmanifest.json b/src/vs/workbench/contrib/terminal/common/scripts/cgmanifest.json
new file mode 100644
index 00000000000..0d773545f20
--- /dev/null
+++ b/src/vs/workbench/contrib/terminal/common/scripts/cgmanifest.json
@@ -0,0 +1,48 @@
+{
+	"registrations": [
+		{
+			"component": {
+				"type": "other",
+				"other": {
+					"name": "posh-git",
+					"downloadUrl": "https://github.com/dahlbyk/posh-git",
+					"version": "70e44dc0c2cdaf10c0cc8eb9ef5a9ca65ab63dcf"
+				}
+			},
+			"licenseDetail": [
+				"Oniguruma LICENSE",
+				"-----------------",
+				"",
+				"Copyright (c) 2002-2020  K.Kosako  <kkosako0@gmail.com>",
+				"All rights reserved.",
+				"",
+				"The BSD License",
+				"",
+				"Redistribution and use in source and binary forms, with or without",
+				"modification, are permitted provided that the following conditions",
+				"are met:",
+				"1. Redistributions of source code must retain the above copyright",
+				"   notice, this list of conditions and the following disclaimer.",
+				"2. Redistributions in binary form must reproduce the above copyright",
+				"   notice, this list of conditions and the following disclaimer in the",
+				"   documentation and/or other materials provided with the distribution.",
+				"",
+				"THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND",
+				"ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE",
+				"IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE",
+				"ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE",
+				"FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL",
+				"DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS",
+				"OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)",
+				"HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT",
+				"LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY",
+				"OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF",
+				"SUCH DAMAGE."
+			],
+			"isOnlyProductionDependency": true,
+			"license": "MIT",
+			"version": "70e44dc0c2cdaf10c0cc8eb9ef5a9ca65ab63dcf"
+		}
+	],
+	"version": 1
+}
diff --git a/src/vs/workbench/contrib/terminal/browser/media/fish_xdg_data/fish/vendor_conf.d/shellIntegration.fish b/src/vs/workbench/contrib/terminal/common/scripts/fish_xdg_data/fish/vendor_conf.d/shellIntegration.fish
similarity index 97%
rename from src/vs/workbench/contrib/terminal/browser/media/fish_xdg_data/fish/vendor_conf.d/shellIntegration.fish
rename to src/vs/workbench/contrib/terminal/common/scripts/fish_xdg_data/fish/vendor_conf.d/shellIntegration.fish
index a771735ae52..bc4549e337e 100644
--- a/src/vs/workbench/contrib/terminal/browser/media/fish_xdg_data/fish/vendor_conf.d/shellIntegration.fish
+++ b/src/vs/workbench/contrib/terminal/common/scripts/fish_xdg_data/fish/vendor_conf.d/shellIntegration.fish
@@ -24,7 +24,7 @@ set --global VSCODE_SHELL_INTEGRATION 1
 
 # Apply any explicit path prefix (see #99878)
 if status --is-login; and set -q VSCODE_PATH_PREFIX
-	fish_add_path -p $VSCODE_PATH_PREFIX
+	set -gx PATH "$VSCODE_PATH_PREFIX$PATH"
 end
 set -e VSCODE_PATH_PREFIX
 
@@ -38,7 +38,7 @@ function __vsc_apply_env_vars
 	if test -n "$VSCODE_ENV_REPLACE"
 		set ITEMS (string split : $VSCODE_ENV_REPLACE)
 		for B in $ITEMS
-			set split (string split = $B)
+			set split (string split -m1 = $B)
 			set -gx "$split[1]" (echo -e "$split[2]")
 		end
 		set -e VSCODE_ENV_REPLACE
@@ -46,7 +46,7 @@ function __vsc_apply_env_vars
 	if test -n "$VSCODE_ENV_PREPEND"
 		set ITEMS (string split : $VSCODE_ENV_PREPEND)
 		for B in $ITEMS
-			set split (string split = $B)
+			set split (string split -m1 = $B)
 			set -gx "$split[1]" (echo -e "$split[2]")"$$split[1]" # avoid -p as it adds a space
 		end
 		set -e VSCODE_ENV_PREPEND
@@ -54,7 +54,7 @@ function __vsc_apply_env_vars
 	if test -n "$VSCODE_ENV_APPEND"
 		set ITEMS (string split : $VSCODE_ENV_APPEND)
 		for B in $ITEMS
-			set split (string split = $B)
+			set split (string split -m1 = $B)
 			set -gx "$split[1]" "$$split[1]"(echo -e "$split[2]") # avoid -a as it adds a space
 		end
 		set -e VSCODE_ENV_APPEND
diff --git a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-bash.sh
old mode 100755
new mode 100644
similarity index 79%
rename from src/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh
rename to src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-bash.sh
index 69e0630da4e..fbeaa22f90a
--- a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh
+++ b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-bash.sh
@@ -34,7 +34,7 @@ if [ "$VSCODE_INJECTION" == "1" ]; then
 
 		# Apply any explicit path prefix (see #99878)
 		if [ -n "${VSCODE_PATH_PREFIX:-}" ]; then
-			export PATH=$VSCODE_PATH_PREFIX$PATH
+			export PATH="$VSCODE_PATH_PREFIX$PATH"
 			builtin unset VSCODE_PATH_PREFIX
 		fi
 	fi
@@ -112,48 +112,26 @@ __vsc_escape_value() {
 	fi
 
 	# Process text byte by byte, not by codepoint.
-	builtin local LC_ALL=C str="${1}" i byte token out=''
+	builtin local -r LC_ALL=C
+	builtin local -r str="${1}"
+	builtin local -ir len="${#str}"
+
+	builtin local -i i
+	builtin local -i val
+	builtin local byte
+	builtin local token
+	builtin local out=''
 
 	for (( i=0; i < "${#str}"; ++i )); do
-		byte="${str:$i:1}"
 		# Escape backslashes, semi-colons specially, then special ASCII chars below space (0x20).
-		# This is done in an unwrapped loop instead of using printf as the latter is very slow.
-		if [ "$byte" = "\\" ]; then
+		byte="${str:$i:1}"
+		builtin printf -v val '%d' "'$byte"
+		if  (( val < 31 )); then
+			builtin printf -v token '\\x%02x' "'$byte"
+		elif (( val == 92 )); then # \
 			token="\\\\"
-		elif [ "$byte" = ";" ]; then
+		elif (( val == 59 )); then # ;
 			token="\\x3b"
-		elif [ "$byte" = $'\x00' ]; then token="\\x00"
-		elif [ "$byte" = $'\x01' ]; then token="\\x01"
-		elif [ "$byte" = $'\x02' ]; then token="\\x02"
-		elif [ "$byte" = $'\x03' ]; then token="\\x03"
-		elif [ "$byte" = $'\x04' ]; then token="\\x04"
-		elif [ "$byte" = $'\x05' ]; then token="\\x05"
-		elif [ "$byte" = $'\x06' ]; then token="\\x06"
-		elif [ "$byte" = $'\x07' ]; then token="\\x07"
-		elif [ "$byte" = $'\x08' ]; then token="\\x08"
-		elif [ "$byte" = $'\x09' ]; then token="\\x09"
-		elif [ "$byte" = $'\x0a' ]; then token="\\x0a"
-		elif [ "$byte" = $'\x0b' ]; then token="\\x0b"
-		elif [ "$byte" = $'\x0c' ]; then token="\\x0c"
-		elif [ "$byte" = $'\x0d' ]; then token="\\x0d"
-		elif [ "$byte" = $'\x0e' ]; then token="\\x0e"
-		elif [ "$byte" = $'\x0f' ]; then token="\\x0f"
-		elif [ "$byte" = $'\x10' ]; then token="\\x10"
-		elif [ "$byte" = $'\x11' ]; then token="\\x11"
-		elif [ "$byte" = $'\x12' ]; then token="\\x12"
-		elif [ "$byte" = $'\x13' ]; then token="\\x13"
-		elif [ "$byte" = $'\x14' ]; then token="\\x14"
-		elif [ "$byte" = $'\x15' ]; then token="\\x15"
-		elif [ "$byte" = $'\x16' ]; then token="\\x16"
-		elif [ "$byte" = $'\x17' ]; then token="\\x17"
-		elif [ "$byte" = $'\x18' ]; then token="\\x18"
-		elif [ "$byte" = $'\x19' ]; then token="\\x19"
-		elif [ "$byte" = $'\x1a' ]; then token="\\x1a"
-		elif [ "$byte" = $'\x1b' ]; then token="\\x1b"
-		elif [ "$byte" = $'\x1c' ]; then token="\\x1c"
-		elif [ "$byte" = $'\x1d' ]; then token="\\x1d"
-		elif [ "$byte" = $'\x1e' ]; then token="\\x1e"
-		elif [ "$byte" = $'\x1f' ]; then token="\\x1f"
 		else
 			token="$byte"
 		fi
@@ -161,11 +139,12 @@ __vsc_escape_value() {
 		out+="$token"
 	done
 
-	builtin printf '%s\n' "${out}"
+	builtin printf '%s\n' "$out"
 }
 
 # Send the IsWindows property if the environment looks like Windows
-if [[ "$(uname -s)" =~ ^CYGWIN*|MINGW*|MSYS* ]]; then
+__vsc_regex_environment="^CYGWIN*|MINGW*|MSYS*"
+if [[ "$(uname -s)" =~ $__vsc_regex_environment ]]; then
 	builtin printf '\e]633;P;IsWindows=True\a'
 	__vsc_is_windows=1
 else
@@ -174,12 +153,16 @@ fi
 
 # Allow verifying $BASH_COMMAND doesn't have aliases resolved via history when the right HISTCONTROL
 # configuration is used
-if [[ "$HISTCONTROL" =~ .*(erasedups|ignoreboth|ignoredups).* ]]; then
+__vsc_regex_histcontrol=".*(erasedups|ignoreboth|ignoredups).*"
+if [[ "$HISTCONTROL" =~ $__vsc_regex_histcontrol ]]; then
 	__vsc_history_verify=0
 else
 	__vsc_history_verify=1
 fi
 
+builtin unset __vsc_regex_environment
+builtin unset __vsc_regex_histcontrol
+
 __vsc_initialized=0
 __vsc_original_PS1="$PS1"
 __vsc_original_PS2="$PS2"
@@ -192,15 +175,16 @@ __vsc_current_command=""
 __vsc_nonce="$VSCODE_NONCE"
 unset VSCODE_NONCE
 
+# Some features should only work in Insiders
+__vsc_stable="$VSCODE_STABLE"
+unset VSCODE_STABLE
+
 # Report continuation prompt
-builtin printf "\e]633;P;ContinuationPrompt=$(echo "$PS2" | sed 's/\x1b/\\\\x1b/g')\a"
+if [ "$__vsc_stable" = "0" ]; then
+	builtin printf "\e]633;P;ContinuationPrompt=$(echo "$PS2" | sed 's/\x1b/\\\\x1b/g')\a"
+fi
 
 __vsc_report_prompt() {
-	# HACK: Git bash is too slow at reporting the prompt, so skip for now
-	if [ "$__vsc_is_windows" = "1" ]; then
-		return
-	fi
-
 	# Expand the original PS1 similarly to how bash would normally
 	# See https://stackoverflow.com/a/37137981 for technique
 	if ((BASH_VERSINFO[0] >= 5 || (BASH_VERSINFO[0] == 4 && BASH_VERSINFO[1] >= 4))); then
@@ -231,7 +215,7 @@ __vsc_update_cwd() {
 }
 
 __vsc_command_output_start() {
-	if [[ -z "$__vsc_first_prompt" ]]; then
+	if [[ -z "${__vsc_first_prompt-}" ]]; then
 		builtin return
 	fi
 	builtin printf '\e]633;E;%s;%s\a' "$(__vsc_escape_value "${__vsc_current_command}")" $__vsc_nonce
@@ -247,7 +231,7 @@ __vsc_continuation_end() {
 }
 
 __vsc_command_complete() {
-	if [[ -z "$__vsc_first_prompt" ]]; then
+	if [[ -z "${__vsc_first_prompt-}" ]]; then
 		builtin return
 	fi
 	if [ "$__vsc_current_command" = "" ]; then
@@ -279,7 +263,10 @@ __vsc_update_prompt() {
 __vsc_precmd() {
 	__vsc_command_complete "$__vsc_status"
 	__vsc_current_command=""
-	__vsc_report_prompt
+	# Report prompt is a work in progress, currently encoding is too slow
+	if [ "$__vsc_stable" = "0" ]; then
+		__vsc_report_prompt
+	fi
 	__vsc_first_prompt=1
 	__vsc_update_prompt
 }
@@ -341,10 +328,10 @@ __vsc_restore_exit_code() {
 
 __vsc_prompt_cmd_original() {
 	__vsc_status="$?"
+	builtin local cmd
 	__vsc_restore_exit_code "${__vsc_status}"
 	# Evaluate the original PROMPT_COMMAND similarly to how bash would normally
 	# See https://unix.stackexchange.com/a/672843 for technique
-	local cmd
 	for cmd in "${__vsc_original_prompt_command[@]}"; do
 		eval "${cmd:-}"
 	done
diff --git a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-env.zsh b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-env.zsh
similarity index 100%
rename from src/vs/workbench/contrib/terminal/browser/media/shellIntegration-env.zsh
rename to src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-env.zsh
diff --git a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-login.zsh b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-login.zsh
similarity index 100%
rename from src/vs/workbench/contrib/terminal/browser/media/shellIntegration-login.zsh
rename to src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-login.zsh
diff --git a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-profile.zsh b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-profile.zsh
similarity index 66%
rename from src/vs/workbench/contrib/terminal/browser/media/shellIntegration-profile.zsh
rename to src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-profile.zsh
index 5a45b076b22..c25ded3d7eb 100644
--- a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-profile.zsh
+++ b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-profile.zsh
@@ -2,15 +2,17 @@
 #   Copyright (c) Microsoft Corporation. All rights reserved.
 #   Licensed under the MIT License. See License.txt in the project root for license information.
 # ---------------------------------------------------------------------------------------------
-if [[ $options[norcs] = off && -o "login" &&  -f $USER_ZDOTDIR/.zprofile ]]; then
-	VSCODE_ZDOTDIR=$ZDOTDIR
-	ZDOTDIR=$USER_ZDOTDIR
-	. $USER_ZDOTDIR/.zprofile
-	ZDOTDIR=$VSCODE_ZDOTDIR
+if [[ $options[norcs] = off && -o "login" ]]; then
+	if [[ -f $USER_ZDOTDIR/.zprofile ]]; then
+		VSCODE_ZDOTDIR=$ZDOTDIR
+		ZDOTDIR=$USER_ZDOTDIR
+		. $USER_ZDOTDIR/.zprofile
+		ZDOTDIR=$VSCODE_ZDOTDIR
+	fi
 
 	# Apply any explicit path prefix (see #99878)
 	if (( ${+VSCODE_PATH_PREFIX} )); then
-		export PATH=$VSCODE_PATH_PREFIX$PATH
+		export PATH="$VSCODE_PATH_PREFIX$PATH"
 	fi
 	builtin unset VSCODE_PATH_PREFIX
 fi
diff --git a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-rc.zsh b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh
similarity index 99%
rename from src/vs/workbench/contrib/terminal/browser/media/shellIntegration-rc.zsh
rename to src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh
index c555d1ac157..54a13d575f1 100644
--- a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-rc.zsh
+++ b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh
@@ -159,7 +159,7 @@ __vsc_update_prompt() {
 }
 
 __vsc_precmd() {
-	local __vsc_status="$?"
+	builtin local __vsc_status="$?"
 	if [ -z "${__vsc_in_command_execution-}" ]; then
 		# not in command execution
 		__vsc_command_output_start
diff --git a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1 b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1
new file mode 100644
index 00000000000..22c4c6d2e6c
--- /dev/null
+++ b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1
@@ -0,0 +1,482 @@
+# ---------------------------------------------------------------------------------------------
+#   Copyright (c) Microsoft Corporation. All rights reserved.
+#   Licensed under the MIT License. See License.txt in the project root for license information.
+# ---------------------------------------------------------------------------------------------
+
+# Prevent installing more than once per session
+if (Test-Path variable:global:__VSCodeOriginalPrompt) {
+	return;
+}
+
+# Disable shell integration when the language mode is restricted
+if ($ExecutionContext.SessionState.LanguageMode -ne "FullLanguage") {
+	return;
+}
+
+$Global:__VSCodeOriginalPrompt = $function:Prompt
+
+$Global:__LastHistoryId = -1
+
+# Store the nonce in script scope and unset the global
+$Nonce = $env:VSCODE_NONCE
+$env:VSCODE_NONCE = $null
+
+$isStable = $env:VSCODE_STABLE
+$env:VSCODE_STABLE = $null
+
+$osVersion = [System.Environment]::OSVersion.Version
+$isWindows10 = $IsWindows -and $osVersion.Major -eq 10 -and $osVersion.Minor -eq 0 -and $osVersion.Build -lt 22000
+
+if ($env:VSCODE_ENV_REPLACE) {
+	$Split = $env:VSCODE_ENV_REPLACE.Split(":")
+	foreach ($Item in $Split) {
+		$Inner = $Item.Split('=', 2)
+		[Environment]::SetEnvironmentVariable($Inner[0], $Inner[1].Replace('\x3a', ':'))
+	}
+	$env:VSCODE_ENV_REPLACE = $null
+}
+if ($env:VSCODE_ENV_PREPEND) {
+	$Split = $env:VSCODE_ENV_PREPEND.Split(":")
+	foreach ($Item in $Split) {
+		$Inner = $Item.Split('=', 2)
+		[Environment]::SetEnvironmentVariable($Inner[0], $Inner[1].Replace('\x3a', ':') + [Environment]::GetEnvironmentVariable($Inner[0]))
+	}
+	$env:VSCODE_ENV_PREPEND = $null
+}
+if ($env:VSCODE_ENV_APPEND) {
+	$Split = $env:VSCODE_ENV_APPEND.Split(":")
+	foreach ($Item in $Split) {
+		$Inner = $Item.Split('=', 2)
+		[Environment]::SetEnvironmentVariable($Inner[0], [Environment]::GetEnvironmentVariable($Inner[0]) + $Inner[1].Replace('\x3a', ':'))
+	}
+	$env:VSCODE_ENV_APPEND = $null
+}
+
+function Global:__VSCode-Escape-Value([string]$value) {
+	# NOTE: In PowerShell v6.1+, this can be written `$value -replace '…', { … }` instead of `[regex]::Replace`.
+	# Replace any non-alphanumeric characters.
+	[regex]::Replace($value, "[$([char]0x00)-$([char]0x1f)\\\n;]", { param($match)
+			# Encode the (ascii) matches as `\x<hex>`
+			-Join (
+				[System.Text.Encoding]::UTF8.GetBytes($match.Value) | ForEach-Object { '\x{0:x2}' -f $_ }
+			)
+		})
+}
+
+function Global:Prompt() {
+	$FakeCode = [int]!$global:?
+	# NOTE: We disable strict mode for the scope of this function because it unhelpfully throws an
+	# error when $LastHistoryEntry is null, and is not otherwise useful.
+	Set-StrictMode -Off
+	$LastHistoryEntry = Get-History -Count 1
+	$Result = ""
+	# Skip finishing the command if the first command has not yet started
+	if ($Global:__LastHistoryId -ne -1) {
+		if ($LastHistoryEntry.Id -eq $Global:__LastHistoryId) {
+			# Don't provide a command line or exit code if there was no history entry (eg. ctrl+c, enter on no command)
+			$Result += "$([char]0x1b)]633;D`a"
+		}
+		else {
+			# Command finished exit code
+			# OSC 633 ; D [; <ExitCode>] ST
+			$Result += "$([char]0x1b)]633;D;$FakeCode`a"
+		}
+	}
+	# Prompt started
+	# OSC 633 ; A ST
+	$Result += "$([char]0x1b)]633;A`a"
+	# Current working directory
+	# OSC 633 ; <Property>=<Value> ST
+	$Result += if ($pwd.Provider.Name -eq 'FileSystem') { "$([char]0x1b)]633;P;Cwd=$(__VSCode-Escape-Value $pwd.ProviderPath)`a" }
+	# Before running the original prompt, put $? back to what it was:
+	if ($FakeCode -ne 0) {
+		Write-Error "failure" -ea ignore
+	}
+	# Run the original prompt
+	$OriginalPrompt += $Global:__VSCodeOriginalPrompt.Invoke()
+	$Result += $OriginalPrompt
+
+	# Prompt
+	# OSC 633 ; <Property>=<Value> ST
+	if ($isStable -eq "0") {
+		$Result += "$([char]0x1b)]633;P;Prompt=$(__VSCode-Escape-Value $OriginalPrompt)`a"
+	}
+
+	# Write command started
+	$Result += "$([char]0x1b)]633;B`a"
+	$Global:__LastHistoryId = $LastHistoryEntry.Id
+	return $Result
+}
+
+# Only send the command executed sequence when PSReadLine is loaded, if not shell integration should
+# still work thanks to the command line sequence
+if (Get-Module -Name PSReadLine) {
+	$__VSCodeOriginalPSConsoleHostReadLine = $function:PSConsoleHostReadLine
+	function Global:PSConsoleHostReadLine {
+		$CommandLine = $__VSCodeOriginalPSConsoleHostReadLine.Invoke()
+
+		# Command line
+		# OSC 633 ; E ; <CommandLine?> ; <Nonce?> ST
+		$Result = "$([char]0x1b)]633;E;"
+		$Result += $(__VSCode-Escape-Value $CommandLine)
+		# Only send the nonce if the OS is not Windows 10 as it seems to echo to the terminal
+		# sometimes
+		if ($IsWindows10 -eq $false) {
+			$Result += ";$Nonce"
+		}
+		$Result += "`a"
+
+		# Command executed
+		# OSC 633 ; C ST
+		$Result += "$([char]0x1b)]633;C`a"
+
+		# Write command executed sequence directly to Console to avoid the new line from Write-Host
+		[Console]::Write($Result)
+
+		$CommandLine
+	}
+}
+
+# Set IsWindows property
+if ($PSVersionTable.PSVersion -lt "6.0") {
+	# Windows PowerShell is only available on Windows
+	[Console]::Write("$([char]0x1b)]633;P;IsWindows=$true`a")
+}
+else {
+	[Console]::Write("$([char]0x1b)]633;P;IsWindows=$IsWindows`a")
+}
+
+# Set ContinuationPrompt property
+if ($isStable -eq "0") {
+	$ContinuationPrompt = (Get-PSReadLineOption).ContinuationPrompt
+	if ($ContinuationPrompt) {
+		[Console]::Write("$([char]0x1b)]633;P;ContinuationPrompt=$(__VSCode-Escape-Value $ContinuationPrompt)`a")
+	}
+}
+
+# Set always on key handlers which map to default VS Code keybindings
+function Set-MappedKeyHandler {
+	param ([string[]] $Chord, [string[]]$Sequence)
+	try {
+		$Handler = Get-PSReadLineKeyHandler -Chord $Chord | Select-Object -First 1
+	}
+ catch [System.Management.Automation.ParameterBindingException] {
+		# PowerShell 5.1 ships with PSReadLine 2.0.0 which does not have -Chord,
+		# so we check what's bound and filter it.
+		$Handler = Get-PSReadLineKeyHandler -Bound | Where-Object -FilterScript { $_.Key -eq $Chord } | Select-Object -First 1
+	}
+	if ($Handler) {
+		Set-PSReadLineKeyHandler -Chord $Sequence -Function $Handler.Function
+	}
+}
+
+function Get-KeywordCompletionResult {
+	param ($Keyword, $Description = $Keyword)
+	[System.Management.Automation.CompletionResult]::new($Keyword, $Keyword, [System.Management.Automation.CompletionResultType]::Keyword, $Description)
+}
+
+function Set-MappedKeyHandlers {
+	Set-MappedKeyHandler -Chord Ctrl+Spacebar -Sequence 'F12,a'
+	Set-MappedKeyHandler -Chord Alt+Spacebar -Sequence 'F12,b'
+	Set-MappedKeyHandler -Chord Shift+Enter -Sequence 'F12,c'
+	Set-MappedKeyHandler -Chord Shift+End -Sequence 'F12,d'
+
+	# Enable suggestions if the environment variable is set and Windows PowerShell is not being used
+	# as APIs are not available to support this feature
+	if ($env:VSCODE_SUGGEST -eq '1' -and $PSVersionTable.PSVersion -ge "7.0") {
+		Remove-Item Env:VSCODE_SUGGEST
+
+		# VS Code send completions request (may override Ctrl+Spacebar)
+		Set-PSReadLineKeyHandler -Chord 'F12,e' -ScriptBlock {
+			Send-Completions
+		}
+
+		# VS Code send global completions request
+		Set-PSReadLineKeyHandler -Chord 'F12,f' -ScriptBlock {
+			# Get commands, convert to string array to reduce the payload size and send as JSON
+			$commands = @(
+				[System.Management.Automation.CompletionCompleters]::CompleteCommand('')
+				Get-KeywordCompletionResult -Keyword 'begin'
+				Get-KeywordCompletionResult -Keyword 'break'
+				Get-KeywordCompletionResult -Keyword 'catch' -Description "catch [[<error type>][',' <error type>]*] {<statement list>}"
+				Get-KeywordCompletionResult -Keyword 'class' -Description @"
+class <class-name> [: [<base-class>][,<interface-list>]] {
+    [[<attribute>] [hidden] [static] <property-definition> ...]
+    [<class-name>([<constructor-argument-list>])
+      {<constructor-statement-list>} ...]
+    [[<attribute>] [hidden] [static] <method-definition> ...]
+}
+"@
+				Get-KeywordCompletionResult -Keyword 'clean'
+				Get-KeywordCompletionResult -Keyword 'continue'
+				Get-KeywordCompletionResult -Keyword 'data' -Description @"
+data [<variable-name>] [-supportedCommand <cmdlet-name>] {
+    <Permitted content>
+}
+"@
+				Get-KeywordCompletionResult -Keyword 'do' -Description @"
+do {<statement list>} while (<condition>)
+do {<statement list>} until (<condition>)
+"@
+				Get-KeywordCompletionResult -Keyword 'dynamicparam' -Description "dynamicparam {<statement-list>}"
+				Get-KeywordCompletionResult -Keyword 'else' -Description @"
+if (<test1>)
+    {<statement list 1>}
+[elseif (<test2>)
+    {<statement list 2>}]
+[else
+    {<statement list 3>}]
+"@
+				Get-KeywordCompletionResult -Keyword 'elseif' -Description @"
+if (<test1>)
+    {<statement list 1>}
+[elseif (<test2>)
+    {<statement list 2>}]
+[else
+    {<statement list 3>}]
+"@
+				Get-KeywordCompletionResult -Keyword 'end'
+				Get-KeywordCompletionResult -Keyword 'enum' -Description @"
+[[<attribute>]...] [Flag()] enum <enum-name>[ : <underlying-type-name>] {
+    <label 0> [= 1]
+    <label 1> [= 2]
+    <label 2> [= 4]
+    <label 3> [= 8]
+    ...
+}
+"@
+				Get-KeywordCompletionResult -Keyword 'exit' -Description "exit [<exitcode>]"
+				Get-KeywordCompletionResult -Keyword 'filter' -Description "filter [<scope:>]<name> {<statement list>}"
+				Get-KeywordCompletionResult -Keyword 'finally' -Description "finally {<statement list>}"
+				Get-KeywordCompletionResult -Keyword 'for' -Description @"
+for (<Init>; <Condition>; <Repeat>)
+{
+    <Statement list>
+}
+"@
+				Get-KeywordCompletionResult -Keyword 'foreach' -Description "foreach ($<item> in $<collection>){<statement list>}"
+				Get-KeywordCompletionResult -Keyword 'function' -Description @"
+function [<scope:>]<name> [([type]`$parameter1[,[type]`$parameter2])]
+{
+  begin {<statement list>}
+  process {<statement list>}
+  end {<statement list>}
+  clean {<statement list>}
+}
+"@
+				Get-KeywordCompletionResult -Keyword 'hidden'
+				Get-KeywordCompletionResult -Keyword 'if' -Description @"
+if (<test1>)
+	{<statement list 1>}
+[elseif (<test2>)
+	{<statement list 2>}]
+[else
+	{<statement list 3>}]
+"@
+				Get-KeywordCompletionResult -Keyword 'in' -Description "foreach (`$<item> in `$<collection>){<statement list>}"
+				Get-KeywordCompletionResult -Keyword 'param' -Description "param (`$Parameter1)"
+				Get-KeywordCompletionResult -Keyword 'process'
+				Get-KeywordCompletionResult -Keyword 'return' -Description "return [<expression>]"
+				Get-KeywordCompletionResult -Keyword 'static' -Description @"
+class <class-name> [: [<base-class>][,<interface-list>]] {
+    [[<attribute>] [hidden] [static] <property-definition> ...]
+    [<class-name>([<constructor-argument-list>])
+      {<constructor-statement-list>} ...]
+    [[<attribute>] [hidden] [static] <method-definition> ...]
+}
+"@
+				Get-KeywordCompletionResult -Keyword 'switch' -Description @"
+Switch (<test-expression>)
+{
+    <result1-to-be-matched> {<action>}
+    <result2-to-be-matched> {<action>}
+}
+"@
+				Get-KeywordCompletionResult -Keyword 'throw' -Description "throw [<expression>]"
+				Get-KeywordCompletionResult -Keyword 'trap' -Description "trap [[<error type>]] {<statement list>}"
+				Get-KeywordCompletionResult -Keyword 'try' -Description "try {<statement list>}"
+				Get-KeywordCompletionResult -Keyword 'until' -Description "do {<statement list>} until (<condition>)"
+				Get-KeywordCompletionResult -Keyword 'using' -Description @"
+using module <module-name>
+
+using assembly <.NET-assembly-path>
+"@
+				Get-KeywordCompletionResult -Keyword 'while' -Description "while (<condition>){<statement list>}"
+			)
+			$mappedCommands = Compress-Completions($commands)
+			$result = "$([char]0x1b)]633;CompletionsPwshCommands;commands;"
+			$result += $mappedCommands | ConvertTo-Json -Compress
+			$result += "`a"
+			Write-Host -NoNewLine $result
+		}
+
+		Set-PSReadLineKeyHandler -Chord 'F12,g' -ScriptBlock {
+			Import-Module "$PSScriptRoot\GitTabExpansion.psm1"
+			Remove-PSReadLineKeyHandler -Chord 'F12,g'
+		}
+		Set-PSReadLineKeyHandler -Chord 'F12,h' -ScriptBlock {
+			Import-Module "$PSScriptRoot\CodeTabExpansion.psm1"
+			Remove-PSReadLineKeyHandler -Chord 'F12,h'
+		}
+	}
+}
+
+function Send-Completions {
+	$commandLine = ""
+	$cursorIndex = 0
+	$prefixCursorDelta = 0
+	[Microsoft.PowerShell.PSConsoleReadLine]::GetBufferState([ref]$commandLine, [ref]$cursorIndex)
+	$completionPrefix = $commandLine
+
+	# Start completions sequence
+	$result = "$([char]0x1b)]633;Completions"
+
+	# If there is a space in the input, defer to TabExpansion2 as it's more complicated to
+	# determine what type of completions to use.
+	# `[` is included here as namespace commands are not included in CompleteCommand(''),
+	# additionally for some reason CompleteVariable('[') causes the prompt to clear and reprint
+	# multiple times
+	if ($completionPrefix.Contains(' ') -or $completionPrefix.Contains('[') -or $PSVersionTable.PSVersion -lt "6.0") {
+
+		# Adjust the completion prefix and cursor index such that tab expansion will be requested
+		# immediately after the last whitespace. This allows the client to perform fuzzy filtering
+		# such that requesting completions in the middle of a word should show the same completions
+		# as at the start. This only happens when the last word does not include special characters:
+		# - `/` and `\`: Completions change when navigating directories.
+		# - `$`: Completions change when variables.
+		$lastWhitespaceIndex = $completionPrefix.LastIndexOf(' ')
+		$lastWord = $completionPrefix.Substring($lastWhitespaceIndex + 1)
+		if ($lastWord -notmatch '[/\\$]') {
+			if ($lastWhitespaceIndex -ne -1 -and $lastWhitespaceIndex -lt $cursorIndex) {
+				$newCursorIndex = $lastWhitespaceIndex + 1
+				$completionPrefix = $completionPrefix.Substring(0, $newCursorIndex)
+				$prefixCursorDelta = $cursorIndex - $newCursorIndex
+				$cursorIndex = $newCursorIndex
+			}
+		}
+		# If it contains `/` or `\`, get completions from the nearest `/` or `\` such that file
+		# completions are consistent regardless of where it was requested
+		elseif ($lastWord -match '[/\\]') {
+			$lastSlashIndex = $completionPrefix.LastIndexOfAny(@('/', '\'))
+			if ($lastSlashIndex -ne -1 -and $lastSlashIndex -lt $cursorIndex) {
+				$newCursorIndex = $lastSlashIndex + 1
+				$completionPrefix = $completionPrefix.Substring(0, $newCursorIndex)
+				$prefixCursorDelta = $cursorIndex - $newCursorIndex
+				$cursorIndex = $newCursorIndex
+			}
+		}
+
+		# Get completions using TabExpansion2
+		$completions = $null
+		try
+		{
+			$completions = TabExpansion2 -inputScript $completionPrefix -cursorColumn $cursorIndex
+		}
+		catch
+		{
+			# TabExpansion2 may throw when there are no completions, in this case return an empty
+			# list to prevent falling back to file path completions
+		}
+		if ($null -eq $completions -or $null -eq $completions.CompletionMatches) {
+			$result += ";0;$($completionPrefix.Length);$($completionPrefix.Length);[]"
+		} else {
+			$result += ";$($completions.ReplacementIndex);$($completions.ReplacementLength + $prefixCursorDelta);$($cursorIndex - $prefixCursorDelta);"
+			$json = [System.Collections.ArrayList]@($completions.CompletionMatches)
+			# Relative directory completions
+			if ($completions.CompletionMatches.Count -gt 0 -and $completions.CompletionMatches.Where({ $_.ResultType -eq 3 -or $_.ResultType -eq 4 })) {
+				# Add `../ relative to the top completion
+				$firstCompletion = $completions.CompletionMatches[0]
+				if ($firstCompletion.CompletionText -match "^\.\.[\/\\]") {
+					if ($completionPrefix -match "(\.\.[\/\\])+") {
+						$normalizedPrefix = $matches[0] -replace '[\\/]', [System.IO.Path]::DirectorySeparatorChar
+						$parentDir = "$($normalizedPrefix)..$([System.IO.Path]::DirectorySeparatorChar)"
+						$currentPath = Split-Path -Parent $firstCompletion.ToolTip
+						try {
+							$parentDirPath = Split-Path -Parent $currentPath
+							$json.Add([System.Management.Automation.CompletionResult]::new(
+								$parentDir, $parentDir, [System.Management.Automation.CompletionResultType]::ProviderContainer, $parentDirPath)
+							)
+						} catch { }
+					}
+				}
+				# Add `.` and `..` to the completions list for results that only contain files and dirs
+				else {
+					$json.Add([System.Management.Automation.CompletionResult]::new(
+						'.', '.', [System.Management.Automation.CompletionResultType]::ProviderContainer, (Get-Location).Path)
+					)
+					$json.Add([System.Management.Automation.CompletionResult]::new(
+						'..', '..', [System.Management.Automation.CompletionResultType]::ProviderContainer, (Split-Path (Get-Location) -Parent))
+					)
+				}
+			}
+			# Add `-` and `+` as a completion for move backwards in location history. Unfortunately
+			# we don't set the path it will navigate to since the Set-Location stack is not public
+			# API https://github.com/PowerShell/PowerShell/issues/23860
+			if ($completionPrefix -eq "cd -") {
+				$json.Add([System.Management.Automation.CompletionResult]::new('-', '-', [System.Management.Automation.CompletionResultType]::ProviderContainer, "Navigate backwards in location history"))
+			}
+			if ($completionPrefix -eq "cd +") {
+				$json.Add([System.Management.Automation.CompletionResult]::new('+', '+', [System.Management.Automation.CompletionResultType]::ProviderContainer, "Navigate forwards in location history"))
+			}
+			$mappedCommands = Compress-Completions($json)
+			$result += $mappedCommands | ConvertTo-Json -Compress
+		}
+	}
+	# If there is no space, get completions using CompletionCompleters as it gives us more
+	# control and works on the empty string
+	else {
+		# If it contains `/` or `\`, get completions from the nearest `/` or `\` such that file
+		# completions are consistent regardless of where it was requested
+		if ($completionPrefix -match '[/\\]') {
+			$lastSlashIndex = $completionPrefix.LastIndexOfAny(@('/', '\'))
+			if ($lastSlashIndex -ne -1 -and $lastSlashIndex -lt $cursorIndex) {
+				$newCursorIndex = $lastSlashIndex + 1
+				$completionPrefix = $completionPrefix.Substring(0, $newCursorIndex)
+				$prefixCursorDelta = $cursorIndex - $newCursorIndex
+				$cursorIndex = $newCursorIndex
+			}
+		}
+		# Note that CompleteCommand isn't included here as it's expensive
+		$completions = $(
+			# Add trailing \ for directories so behavior aligns with TabExpansion2
+			[System.Management.Automation.CompletionCompleters]::CompleteFilename($completionPrefix) | ForEach-Object {
+				if ($_.ResultType -eq [System.Management.Automation.CompletionResultType]::ProviderContainer) {
+					[System.Management.Automation.CompletionResult]::new("$($_.CompletionText)$([System.IO.Path]::DirectorySeparatorChar)", "$($_.CompletionText)$([System.IO.Path]::DirectorySeparatorChar)", $_.ResultType, $_.ToolTip)
+				} else {
+					$_
+				}
+			}
+			([System.Management.Automation.CompletionCompleters]::CompleteVariable(''))
+		)
+		if ($null -ne $completions) {
+			$result += ";$($completions.ReplacementIndex);$($completions.ReplacementLength + $prefixCursorDelta);$($cursorIndex - $prefixCursorDelta);"
+			$mappedCommands = Compress-Completions($completions)
+			$result += $mappedCommands | ConvertTo-Json -Compress
+		} else {
+			$result += ";0;$($completionPrefix.Length);$($completionPrefix.Length);[]"
+		}
+	}
+
+	# End completions sequence
+	$result += "`a"
+
+	Write-Host -NoNewLine $result
+}
+
+function Compress-Completions($completions) {
+	$completions | ForEach-Object {
+		if ($_.CustomIcon) {
+			,@($_.CompletionText, $_.ResultType, $_.ToolTip, $_.CustomIcon)
+		}
+		elseif ($_.CompletionText -eq $_.ToolTip) {
+			,@($_.CompletionText, $_.ResultType)
+		} else {
+			,@($_.CompletionText, $_.ResultType, $_.ToolTip)
+		}
+	}
+}
+
+# Register key handlers if PSReadLine is available
+if (Get-Module -Name PSReadLine) {
+	Set-MappedKeyHandlers
+}
diff --git a/src/vs/workbench/contrib/terminal/common/terminal.ts b/src/vs/workbench/contrib/terminal/common/terminal.ts
index 81ccf23927f..6ed4c2422f3 100644
--- a/src/vs/workbench/contrib/terminal/common/terminal.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminal.ts
@@ -3,27 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { MarshalledId } from 'vs/base/common/marshallingIds';
-import { IProcessEnvironment, isLinux, OperatingSystem } from 'vs/base/common/platform';
-import Severity from 'vs/base/common/severity';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { URI } from 'vs/base/common/uri';
-import * as nls from 'vs/nls';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ISerializedCommandDetectionCapability, ITerminalCapabilityStore } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { IMergedEnvironmentVariableCollection } from 'vs/platform/terminal/common/environmentVariable';
-import { ICreateContributedTerminalProfileOptions, IExtensionTerminalProfile, IFixedTerminalDimensions, IProcessDataEvent, IProcessProperty, IProcessPropertyMap, IProcessReadyEvent, IProcessReadyWindowsPty, IShellLaunchConfig, ITerminalBackend, ITerminalContributions, ITerminalEnvironment, ITerminalLaunchError, ITerminalProfile, ITerminalProfileObject, ProcessPropertyType, TerminalIcon, TerminalLocationString, TitleEventSource } from 'vs/platform/terminal/common/terminal';
-import { AccessibilityCommandId } from 'vs/workbench/contrib/accessibility/common/accessibilityCommands';
-import { IEnvironmentVariableInfo } from 'vs/workbench/contrib/terminal/common/environmentVariable';
-import { IExtensionPointDescriptor } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-
-// Import commands to skip shell from terminalContrib - this is an exception to the eslint rule
-// since they need to be included in the terminal module
-import { defaultTerminalAccessibilityCommandsToSkipShell } from 'vs/workbench/contrib/terminalContrib/accessibility/common/terminal.accessibility'; // eslint-disable-line local/code-import-patterns
-import { defaultTerminalFindCommandToSkipShell } from 'vs/workbench/contrib/terminalContrib/find/common/terminal.find'; // eslint-disable-line local/code-import-patterns
-import { defaultTerminalSuggestCommandsToSkipShell } from 'vs/workbench/contrib/terminalContrib/suggest/common/terminal.suggest'; // eslint-disable-line local/code-import-patterns
+import { Event } from '../../../../base/common/event.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { MarshalledId } from '../../../../base/common/marshallingIds.js';
+import { IProcessEnvironment, isLinux, OperatingSystem } from '../../../../base/common/platform.js';
+import Severity from '../../../../base/common/severity.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { URI } from '../../../../base/common/uri.js';
+import * as nls from '../../../../nls.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { ISerializedCommandDetectionCapability, ITerminalCapabilityStore } from '../../../../platform/terminal/common/capabilities/capabilities.js';
+import { IMergedEnvironmentVariableCollection } from '../../../../platform/terminal/common/environmentVariable.js';
+import { ICreateContributedTerminalProfileOptions, IExtensionTerminalProfile, IFixedTerminalDimensions, IProcessDataEvent, IProcessProperty, IProcessPropertyMap, IProcessReadyEvent, IProcessReadyWindowsPty, IShellLaunchConfig, ITerminalBackend, ITerminalContributions, ITerminalEnvironment, ITerminalLaunchError, ITerminalProfile, ITerminalProfileObject, ProcessPropertyType, TerminalIcon, TerminalLocationString, TitleEventSource } from '../../../../platform/terminal/common/terminal.js';
+import { AccessibilityCommandId } from '../../accessibility/common/accessibilityCommands.js';
+import { IEnvironmentVariableInfo } from './environmentVariable.js';
+import { IExtensionPointDescriptor } from '../../../services/extensions/common/extensionsRegistry.js';
+import { defaultTerminalContribCommandsToSkipShell } from '../terminalContribExports.js';
 
 export const TERMINAL_VIEW_ID = 'terminal';
 
@@ -205,15 +200,17 @@ export interface ITerminalConfiguration {
 	customGlyphs: boolean;
 	persistentSessionReviveProcess: 'onExit' | 'onExitAndWindowClose' | 'never';
 	ignoreProcessNames: string[];
-	autoReplies: { [key: string]: string };
 	shellIntegration?: {
 		enabled: boolean;
-		decorationsEnabled: boolean;
+		decorationsEnabled: 'both' | 'gutter' | 'overviewRuler' | 'never';
 	};
 	enableImages: boolean;
 	smoothScrolling: boolean;
 	ignoreBracketedPasteMode: boolean;
 	rescaleOverlappingGlyphs: boolean;
+	experimental?: {
+		windowsUseConptyDll?: boolean;
+	};
 }
 
 export interface ITerminalFont {
@@ -399,11 +396,9 @@ export const enum TerminalCommandId {
 	QuickKill = 'workbench.action.terminal.quickKill',
 	ConfigureTerminalSettings = 'workbench.action.terminal.openSettings',
 	ShellIntegrationLearnMore = 'workbench.action.terminal.learnMore',
-	RunRecentCommand = 'workbench.action.terminal.runRecentCommand',
 	CopyLastCommand = 'workbench.action.terminal.copyLastCommand',
 	CopyLastCommandOutput = 'workbench.action.terminal.copyLastCommandOutput',
 	CopyLastCommandAndLastCommandOutput = 'workbench.action.terminal.copyLastCommandAndLastCommandOutput',
-	GoToRecentDirectory = 'workbench.action.terminal.goToRecentDirectory',
 	CopyAndClearSelection = 'workbench.action.terminal.copyAndClearSelection',
 	CopySelection = 'workbench.action.terminal.copySelection',
 	CopySelectionAsHtml = 'workbench.action.terminal.copySelectionAsHtml',
@@ -461,7 +456,6 @@ export const enum TerminalCommandId {
 	Rename = 'workbench.action.terminal.rename',
 	RenameActiveTab = 'workbench.action.terminal.renameActiveTab',
 	RenameWithArgs = 'workbench.action.terminal.renameWithArg',
-	QuickOpenTerm = 'workbench.action.quickOpenTerm',
 	ScrollToPreviousCommand = 'workbench.action.terminal.scrollToPreviousCommand',
 	ScrollToNextCommand = 'workbench.action.terminal.scrollToNextCommand',
 	SelectToPreviousCommand = 'workbench.action.terminal.selectToPreviousCommand',
@@ -475,7 +469,6 @@ export const enum TerminalCommandId {
 	MoveToTerminalPanel = 'workbench.action.terminal.moveToTerminalPanel',
 	MoveIntoNewWindow = 'workbench.action.terminal.moveIntoNewWindow',
 	SetDimensions = 'workbench.action.terminal.setDimensions',
-	ClearPreviousSessionHistory = 'workbench.action.terminal.clearPreviousSessionHistory',
 	FocusHover = 'workbench.action.terminal.focusHover',
 	ShowEnvironmentContributions = 'workbench.action.terminal.showEnvironmentContributions',
 	StartVoice = 'workbench.action.terminal.startVoice',
@@ -494,7 +487,6 @@ export const DEFAULT_COMMANDS_TO_SKIP_SHELL: string[] = [
 	TerminalCommandId.DeleteToLineStart,
 	TerminalCommandId.DeleteWordLeft,
 	TerminalCommandId.DeleteWordRight,
-	TerminalCommandId.GoToRecentDirectory,
 	TerminalCommandId.FocusNextPane,
 	TerminalCommandId.FocusNext,
 	TerminalCommandId.FocusPreviousPane,
@@ -517,7 +509,6 @@ export const DEFAULT_COMMANDS_TO_SKIP_SHELL: string[] = [
 	TerminalCommandId.ResizePaneUp,
 	TerminalCommandId.RunActiveFile,
 	TerminalCommandId.RunSelectedText,
-	TerminalCommandId.RunRecentCommand,
 	TerminalCommandId.ScrollDownLine,
 	TerminalCommandId.ScrollDownPage,
 	TerminalCommandId.ScrollToBottom,
@@ -621,9 +612,7 @@ export const DEFAULT_COMMANDS_TO_SKIP_SHELL: string[] = [
 	'workbench.action.terminal.chat.runCommand',
 	'workbench.action.terminal.chat.insertCommand',
 	'workbench.action.terminal.chat.viewInChat',
-	...defaultTerminalAccessibilityCommandsToSkipShell,
-	...defaultTerminalFindCommandToSkipShell,
-	...defaultTerminalSuggestCommandsToSkipShell,
+	...defaultTerminalContribCommandsToSkipShell,
 ];
 
 export const terminalContributionsDescriptor: IExtensionPointDescriptor<ITerminalContributions> = {
diff --git a/src/vs/workbench/contrib/terminal/common/terminalClipboard.ts b/src/vs/workbench/contrib/terminal/common/terminalClipboard.ts
index 2e4bad6a827..87065f4b9d1 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalClipboard.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalClipboard.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { TerminalSettingId } from 'vs/platform/terminal/common/terminal';
+import { localize } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { TerminalSettingId } from '../../../../platform/terminal/common/terminal.js';
 
 export async function shouldPasteTerminalText(accessor: ServicesAccessor, text: string, bracketedPasteMode: boolean | undefined): Promise<boolean | { modifiedText: string }> {
 	const configurationService = accessor.get(IConfigurationService);
diff --git a/src/vs/workbench/contrib/terminal/common/terminalColorRegistry.ts b/src/vs/workbench/contrib/terminal/common/terminalColorRegistry.ts
index 0750923f614..267cb5ef998 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalColorRegistry.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalColorRegistry.ts
@@ -3,10 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
+import { editorOverviewRulerBorder } from '../../../../editor/common/core/editorColorRegistry.js';
+import * as nls from '../../../../nls.js';
 
-import { registerColor, ColorIdentifier, ColorDefaults, editorFindMatch, editorFindMatchHighlight, overviewRulerFindMatchForeground, editorSelectionBackground, transparent, editorHoverHighlight } from 'vs/platform/theme/common/colorRegistry';
-import { EDITOR_DRAG_AND_DROP_BACKGROUND, PANEL_BORDER, TAB_ACTIVE_BORDER } from 'vs/workbench/common/theme';
+import { registerColor, ColorIdentifier, ColorDefaults, editorFindMatch, editorFindMatchHighlight, overviewRulerFindMatchForeground, editorSelectionBackground, transparent, editorHoverHighlight } from '../../../../platform/theme/common/colorRegistry.js';
+import { EDITOR_DRAG_AND_DROP_BACKGROUND, PANEL_BORDER, TAB_ACTIVE_BORDER } from '../../../common/theme.js';
 
 /**
  * The color identifiers for the terminal's ansi colors. The index in the array corresponds to the index
@@ -23,12 +24,7 @@ export const TERMINAL_FOREGROUND_COLOR = registerColor('terminal.foreground', {
 }, nls.localize('terminal.foreground', 'The foreground color of the terminal.'));
 export const TERMINAL_CURSOR_FOREGROUND_COLOR = registerColor('terminalCursor.foreground', null, nls.localize('terminalCursor.foreground', 'The foreground color of the terminal cursor.'));
 export const TERMINAL_CURSOR_BACKGROUND_COLOR = registerColor('terminalCursor.background', null, nls.localize('terminalCursor.background', 'The background color of the terminal cursor. Allows customizing the color of a character overlapped by a block cursor.'));
-export const TERMINAL_SELECTION_BACKGROUND_COLOR = registerColor('terminal.selectionBackground', {
-	light: editorSelectionBackground,
-	dark: editorSelectionBackground,
-	hcDark: editorSelectionBackground,
-	hcLight: editorSelectionBackground
-}, nls.localize('terminal.selectionBackground', 'The selection background color of the terminal.'));
+export const TERMINAL_SELECTION_BACKGROUND_COLOR = registerColor('terminal.selectionBackground', editorSelectionBackground, nls.localize('terminal.selectionBackground', 'The selection background color of the terminal.'));
 export const TERMINAL_INACTIVE_SELECTION_BACKGROUND_COLOR = registerColor('terminal.inactiveSelectionBackground', {
 	light: transparent(TERMINAL_SELECTION_BACKGROUND_COLOR, 0.5),
 	dark: transparent(TERMINAL_SELECTION_BACKGROUND_COLOR, 0.5),
@@ -59,18 +55,9 @@ export const TERMINAL_COMMAND_DECORATION_ERROR_BACKGROUND_COLOR = registerColor(
 	hcDark: '#F14C4C',
 	hcLight: '#B5200D'
 }, nls.localize('terminalCommandDecoration.errorBackground', 'The terminal command decoration background color for error commands.'));
-export const TERMINAL_OVERVIEW_RULER_CURSOR_FOREGROUND_COLOR = registerColor('terminalOverviewRuler.cursorForeground', {
-	dark: '#A0A0A0CC',
-	light: '#A0A0A0CC',
-	hcDark: '#A0A0A0CC',
-	hcLight: '#A0A0A0CC'
-}, nls.localize('terminalOverviewRuler.cursorForeground', 'The overview ruler cursor color.'));
-export const TERMINAL_BORDER_COLOR = registerColor('terminal.border', {
-	dark: PANEL_BORDER,
-	light: PANEL_BORDER,
-	hcDark: PANEL_BORDER,
-	hcLight: PANEL_BORDER
-}, nls.localize('terminal.border', 'The color of the border that separates split panes within the terminal. This defaults to panel.border.'));
+export const TERMINAL_OVERVIEW_RULER_CURSOR_FOREGROUND_COLOR = registerColor('terminalOverviewRuler.cursorForeground', '#A0A0A0CC', nls.localize('terminalOverviewRuler.cursorForeground', 'The overview ruler cursor color.'));
+export const TERMINAL_BORDER_COLOR = registerColor('terminal.border', PANEL_BORDER, nls.localize('terminal.border', 'The color of the border that separates split panes within the terminal. This defaults to panel.border.'));
+export const TERMINAL_OVERVIEW_RULER_BORDER_COLOR = registerColor('terminalOverviewRuler.border', editorOverviewRulerBorder, nls.localize('terminalOverviewRuler.border', 'The overview ruler left-side border color.'));
 export const TERMINAL_FIND_MATCH_BACKGROUND_COLOR = registerColor('terminal.findMatchBackground', {
 	dark: editorFindMatch,
 	light: editorFindMatch,
@@ -78,12 +65,7 @@ export const TERMINAL_FIND_MATCH_BACKGROUND_COLOR = registerColor('terminal.find
 	hcDark: null,
 	hcLight: '#0F4A85'
 }, nls.localize('terminal.findMatchBackground', 'Color of the current search match in the terminal. The color must not be opaque so as not to hide underlying terminal content.'), true);
-export const TERMINAL_HOVER_HIGHLIGHT_BACKGROUND_COLOR = registerColor('terminal.hoverHighlightBackground', {
-	dark: transparent(editorHoverHighlight, 0.5),
-	light: transparent(editorHoverHighlight, 0.5),
-	hcDark: transparent(editorHoverHighlight, 0.5),
-	hcLight: transparent(editorHoverHighlight, 0.5)
-}, nls.localize('terminal.findMatchHighlightBorder', 'Border color of the other search matches in the terminal.'));
+export const TERMINAL_HOVER_HIGHLIGHT_BACKGROUND_COLOR = registerColor('terminal.hoverHighlightBackground', transparent(editorHoverHighlight, 0.5), nls.localize('terminal.findMatchHighlightBorder', 'Border color of the other search matches in the terminal.'));
 export const TERMINAL_FIND_MATCH_BORDER_COLOR = registerColor('terminal.findMatchBorder', {
 	dark: null,
 	light: null,
@@ -108,18 +90,8 @@ export const TERMINAL_OVERVIEW_RULER_FIND_MATCH_FOREGROUND_COLOR = registerColor
 	hcDark: '#f38518',
 	hcLight: '#0F4A85'
 }, nls.localize('terminalOverviewRuler.findMatchHighlightForeground', 'Overview ruler marker color for find matches in the terminal.'));
-export const TERMINAL_DRAG_AND_DROP_BACKGROUND = registerColor('terminal.dropBackground', {
-	dark: EDITOR_DRAG_AND_DROP_BACKGROUND,
-	light: EDITOR_DRAG_AND_DROP_BACKGROUND,
-	hcDark: EDITOR_DRAG_AND_DROP_BACKGROUND,
-	hcLight: EDITOR_DRAG_AND_DROP_BACKGROUND
-}, nls.localize('terminal.dragAndDropBackground', "Background color when dragging on top of terminals. The color should have transparency so that the terminal contents can still shine through."), true);
-export const TERMINAL_TAB_ACTIVE_BORDER = registerColor('terminal.tab.activeBorder', {
-	dark: TAB_ACTIVE_BORDER,
-	light: TAB_ACTIVE_BORDER,
-	hcDark: TAB_ACTIVE_BORDER,
-	hcLight: TAB_ACTIVE_BORDER
-}, nls.localize('terminal.tab.activeBorder', 'Border on the side of the terminal tab in the panel. This defaults to tab.activeBorder.'));
+export const TERMINAL_DRAG_AND_DROP_BACKGROUND = registerColor('terminal.dropBackground', EDITOR_DRAG_AND_DROP_BACKGROUND, nls.localize('terminal.dragAndDropBackground', "Background color when dragging on top of terminals. The color should have transparency so that the terminal contents can still shine through."), true);
+export const TERMINAL_TAB_ACTIVE_BORDER = registerColor('terminal.tab.activeBorder', TAB_ACTIVE_BORDER, nls.localize('terminal.tab.activeBorder', 'Border on the side of the terminal tab in the panel. This defaults to tab.activeBorder.'));
 export const TERMINAL_INITIAL_HINT_FOREGROUND = registerColor('terminal.initialHintForeground', {
 	dark: '#ffffff56',
 	light: '#0007',
diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
index 4b423b2d02f..36422383973 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
@@ -3,30 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ConfigurationScope, Extensions, IConfigurationNode, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { localize } from 'vs/nls';
-import { DEFAULT_LETTER_SPACING, DEFAULT_LINE_HEIGHT, DEFAULT_COMMANDS_TO_SKIP_SHELL, SUGGESTIONS_FONT_WEIGHT, MINIMUM_FONT_WEIGHT, MAXIMUM_FONT_WEIGHT } from 'vs/workbench/contrib/terminal/common/terminal';
-import { TerminalLocationString, TerminalSettingId } from 'vs/platform/terminal/common/terminal';
-import { isMacintosh, isWindows } from 'vs/base/common/platform';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Codicon } from 'vs/base/common/codicons';
-import { terminalColorSchema, terminalIconSchema } from 'vs/platform/terminal/common/terminalPlatformConfiguration';
-import { Extensions as WorkbenchExtensions, IConfigurationMigrationRegistry, ConfigurationKeyValuePairs } from 'vs/workbench/common/configuration';
-
-// Import configuration schemes from terminalContrib - this is an exception to the eslint rule since
-// they need to be declared at part of the rest of the terminal configuration
-import { terminalAccessibilityConfiguration } from 'vs/workbench/contrib/terminalContrib/accessibility/common/terminalAccessibilityConfiguration'; // eslint-disable-line local/code-import-patterns
-import { terminalStickyScrollConfiguration } from 'vs/workbench/contrib/terminalContrib/stickyScroll/common/terminalStickyScrollConfiguration'; // eslint-disable-line local/code-import-patterns
-import { terminalTypeAheadConfiguration } from 'vs/workbench/contrib/terminalContrib/typeAhead/common/terminalTypeAheadConfiguration'; // eslint-disable-line local/code-import-patterns
-import { terminalZoomConfiguration } from 'vs/workbench/contrib/terminalContrib/zoom/common/terminal.zoom'; // eslint-disable-line local/code-import-patterns
-import { terminalSuggestConfiguration } from 'vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration'; // eslint-disable-line local/code-import-patterns
-import { terminalInitialHintConfiguration } from 'vs/workbench/contrib/terminalContrib/chat/common/terminalInitialHintConfiguration';  // eslint-disable-line local/code-import-patterns
+import { Codicon } from '../../../../base/common/codicons.js';
+import { isMacintosh, isWindows } from '../../../../base/common/platform.js';
+import { localize } from '../../../../nls.js';
+import { ConfigurationScope, Extensions, IConfigurationNode, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { TerminalLocationString, TerminalSettingId } from '../../../../platform/terminal/common/terminal.js';
+import { terminalColorSchema, terminalIconSchema } from '../../../../platform/terminal/common/terminalPlatformConfiguration.js';
+import { ConfigurationKeyValuePairs, IConfigurationMigrationRegistry, Extensions as WorkbenchExtensions } from '../../../common/configuration.js';
+import { terminalContribConfiguration } from '../terminalContribExports.js';
+import { DEFAULT_COMMANDS_TO_SKIP_SHELL, DEFAULT_LETTER_SPACING, DEFAULT_LINE_HEIGHT, MAXIMUM_FONT_WEIGHT, MINIMUM_FONT_WEIGHT, SUGGESTIONS_FONT_WEIGHT } from './terminal.js';
 import type { IJSONSchemaSnippet } from 'vs/base/common/jsonSchema';
 
 const terminalDescriptors = '\n- ' + [
 	'`\${cwd}`: ' + localize("cwd", "the terminal's current working directory"),
 	'`\${cwdFolder}`: ' + localize('cwdFolder', "the terminal's current working directory, displayed for multi-root workspaces or in a single root workspace when the value differs from the initial working directory. On Windows, this will only be displayed when shell integration is enabled."),
 	'`\${workspaceFolder}`: ' + localize('workspaceFolder', "the workspace in which the terminal was launched"),
+	'`\${workspaceFolderName}`: ' + localize('workspaceFolderName', "the `name` of the workspace in which the terminal was launched"),
 	'`\${local}`: ' + localize('local', "indicates a local terminal in a remote workspace"),
 	'`\${process}`: ' + localize('process', "the name of the terminal process"),
 	'`\${separator}`: ' + localize('separator', "a conditional separator {0} that only shows when surrounded by variables with values or static text.", '(` - `)'),
@@ -464,6 +457,11 @@ const terminalConfiguration: IConfigurationNode = {
 			type: 'boolean',
 			default: true
 		},
+		[TerminalSettingId.ExperimentalWindowsUseConptyDll]: {
+			markdownDescription: localize('terminal.integrated.experimentalWindowsUseConptyDll', "Whether to use the experimental conpty.dll shipped with VS Code, instead of the one bundled with Windows."),
+			type: 'boolean',
+			default: false
+		},
 		[TerminalSettingId.SplitCwd]: {
 			description: localize('terminal.integrated.splitCwd', "Controls the working directory a split terminal starts with."),
 			type: 'string',
@@ -559,18 +557,6 @@ const terminalConfiguration: IConfigurationNode = {
 			type: 'boolean',
 			default: true
 		},
-		[TerminalSettingId.AutoReplies]: {
-			markdownDescription: localize('terminal.integrated.autoReplies', "A set of messages that, when encountered in the terminal, will be automatically responded to. Provided the message is specific enough, this can help automate away common responses.\n\nRemarks:\n\n- Use {0} to automatically respond to the terminate batch job prompt on Windows.\n- The message includes escape sequences so the reply might not happen with styled text.\n- Each reply can only happen once every second.\n- Use {1} in the reply to mean the enter key.\n- To unset a default key, set the value to null.\n- Restart VS Code if new don't apply.", '`"Terminate batch job (Y/N)": "Y\\r"`', '`"\\r"`'),
-			type: 'object',
-			additionalProperties: {
-				oneOf: [{
-					type: 'string',
-					description: localize('terminal.integrated.autoReplies.reply', "The reply to send to the process.")
-				},
-				{ type: 'null' }]
-			},
-			default: {}
-		},
 		[TerminalSettingId.ShellIntegrationEnabled]: {
 			restricted: true,
 			markdownDescription: localize('terminal.integrated.shellIntegration.enabled', "Determines whether or not shell integration is auto-injected to support features like enhanced command tracking and current working directory detection. \n\nShell integration works by injecting the shell with a startup script. The script gives VS Code insight into what is happening within the terminal.\n\nSupported shells:\n\n- Linux/macOS: bash, fish, pwsh, zsh\n - Windows: pwsh, git bash\n\nThis setting applies only when terminals are created, so you will need to restart your terminals for it to take effect.\n\n Note that the script injection may not work if you have custom arguments defined in the terminal profile, have enabled {1}, have a [complex bash `PROMPT_COMMAND`](https://code.visualstudio.com/docs/editor/integrated-terminal#_complex-bash-promptcommand), or other unsupported setup. To disable decorations, see {0}", '`#terminal.integrated.shellIntegrations.decorationsEnabled#`', '`#editor.accessibilitySupport#`'),
@@ -590,12 +576,6 @@ const terminalConfiguration: IConfigurationNode = {
 			],
 			default: 'both'
 		},
-		[TerminalSettingId.ShellIntegrationCommandHistory]: {
-			restricted: true,
-			markdownDescription: localize('terminal.integrated.shellIntegration.history', "Controls the number of recently used commands to keep in the terminal command history. Set to 0 to disable terminal command history."),
-			type: 'number',
-			default: 100
-		},
 		[TerminalSettingId.SmoothScrolling]: {
 			markdownDescription: localize('terminal.integrated.smoothScrolling', "Controls whether the terminal will scroll using an animation."),
 			type: 'boolean',
@@ -623,12 +603,7 @@ const terminalConfiguration: IConfigurationNode = {
 				localize('terminal.integrated.focusAfterRun.none', "Do nothing."),
 			]
 		},
-		...terminalAccessibilityConfiguration,
-		...terminalInitialHintConfiguration,
-		...terminalStickyScrollConfiguration,
-		...terminalSuggestConfiguration,
-		...terminalTypeAheadConfiguration,
-		...terminalZoomConfiguration,
+		...terminalContribConfiguration,
 	}
 };
 
diff --git a/src/vs/workbench/contrib/terminal/common/terminalContextKey.ts b/src/vs/workbench/contrib/terminal/common/terminalContextKey.ts
index 72335480aee..fc20ba7cf34 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalContextKey.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalContextKey.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { ContextKeyExpr, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { TerminalSettingId } from 'vs/platform/terminal/common/terminal';
-import { TERMINAL_VIEW_ID } from 'vs/workbench/contrib/terminal/common/terminal';
+import { localize } from '../../../../nls.js';
+import { ContextKeyExpr, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { TerminalSettingId } from '../../../../platform/terminal/common/terminal.js';
+import { TERMINAL_VIEW_ID } from './terminal.js';
 
 export const enum TerminalContextKeyStrings {
 	IsOpen = 'terminalIsOpen',
@@ -81,8 +81,8 @@ export namespace TerminalContextKeys {
 	/** Whether the mouse is within the terminal tabs list. */
 	export const tabsMouse = new RawContextKey<boolean>(TerminalContextKeyStrings.TabsMouse, false, true);
 
-	/** The shell type of the active terminal, this is set to the last known value when no terminals exist. */
-	export const shellType = new RawContextKey<string>(TerminalContextKeyStrings.ShellType, undefined, { type: 'string', description: localize('terminalShellTypeContextKey', "The shell type of the active terminal, this is set to the last known value when no terminals exist.") });
+	/** The shell type of the active terminal, this is set if the type can be detected. */
+	export const shellType = new RawContextKey<string>(TerminalContextKeyStrings.ShellType, undefined, { type: 'string', description: localize('terminalShellTypeContextKey', "The shell type of the active terminal, this is set if the type can be detected.") });
 
 	/** Whether the terminal's alt buffer is active. */
 	export const altBufferActive = new RawContextKey<boolean>(TerminalContextKeyStrings.AltBufferActive, false, localize('terminalAltBufferActive', "Whether the terminal's alt buffer is active."));
diff --git a/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts b/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts
index 27ccb9cb61f..2c3559d9d5e 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts
@@ -7,17 +7,17 @@
  * This module contains utility functions related to the environment, cwd and paths.
  */
 
-import * as path from 'vs/base/common/path';
-import { URI } from 'vs/base/common/uri';
-import { IWorkspaceContextService, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
-import { sanitizeProcessEnvironment } from 'vs/base/common/processes';
-import { IShellLaunchConfig, ITerminalBackend, ITerminalEnvironment, TerminalShellType, WindowsShellType } from 'vs/platform/terminal/common/terminal';
-import { IProcessEnvironment, isWindows, isMacintosh, language, OperatingSystem } from 'vs/base/common/platform';
-import { escapeNonWindowsPath, sanitizeCwd } from 'vs/platform/terminal/common/terminalEnvironment';
-import { isString } from 'vs/base/common/types';
-import { IHistoryService } from 'vs/workbench/services/history/common/history';
-import { ILogService } from 'vs/platform/log/common/log';
+import * as path from '../../../../base/common/path.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IWorkspaceContextService, IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
+import { IConfigurationResolverService } from '../../../services/configurationResolver/common/configurationResolver.js';
+import { sanitizeProcessEnvironment } from '../../../../base/common/processes.js';
+import { IShellLaunchConfig, ITerminalBackend, ITerminalEnvironment, TerminalShellType, WindowsShellType } from '../../../../platform/terminal/common/terminal.js';
+import { IProcessEnvironment, isWindows, isMacintosh, language, OperatingSystem } from '../../../../base/common/platform.js';
+import { escapeNonWindowsPath, sanitizeCwd } from '../../../../platform/terminal/common/terminalEnvironment.js';
+import { isString } from '../../../../base/common/types.js';
+import { IHistoryService } from '../../../services/history/common/history.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
 
 export function mergeEnvironments(parent: IProcessEnvironment, other: ITerminalEnvironment | undefined): void {
 	if (!other) {
diff --git a/src/vs/workbench/contrib/terminal/common/terminalExtensionPoints.contribution.ts b/src/vs/workbench/contrib/terminal/common/terminalExtensionPoints.contribution.ts
index a705e6fc45f..5e107239ecc 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalExtensionPoints.contribution.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalExtensionPoints.contribution.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ITerminalContributionService, TerminalContributionService } from 'vs/workbench/contrib/terminal/common/terminalExtensionPoints';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ITerminalContributionService, TerminalContributionService } from './terminalExtensionPoints.js';
 
 registerSingleton(ITerminalContributionService, TerminalContributionService, InstantiationType.Delayed);
diff --git a/src/vs/workbench/contrib/terminal/common/terminalExtensionPoints.ts b/src/vs/workbench/contrib/terminal/common/terminalExtensionPoints.ts
index 9bde6a72714..87e61347d37 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalExtensionPoints.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalExtensionPoints.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as extensionsRegistry from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { terminalContributionsDescriptor } from 'vs/workbench/contrib/terminal/common/terminal';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IExtensionTerminalProfile, ITerminalContributions, ITerminalProfileContribution } from 'vs/platform/terminal/common/terminal';
-import { URI } from 'vs/base/common/uri';
+import * as extensionsRegistry from '../../../services/extensions/common/extensionsRegistry.js';
+import { terminalContributionsDescriptor } from './terminal.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IExtensionTerminalProfile, ITerminalContributions, ITerminalProfileContribution } from '../../../../platform/terminal/common/terminal.js';
+import { URI } from '../../../../base/common/uri.js';
 
 // terminal extension point
 const terminalsExtPoint = extensionsRegistry.ExtensionsRegistry.registerExtensionPoint<ITerminalContributions>(terminalContributionsDescriptor);
diff --git a/src/vs/workbench/contrib/terminal/common/terminalStrings.ts b/src/vs/workbench/contrib/terminal/common/terminalStrings.ts
index 7b726a7c1d8..101fb7f7e99 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalStrings.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalStrings.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize, localize2 } from 'vs/nls';
+import { localize, localize2 } from '../../../../nls.js';
 
 /**
  * An object holding strings shared by multiple parts of the terminal
diff --git a/src/vs/workbench/contrib/terminal/electron-sandbox/localPty.ts b/src/vs/workbench/contrib/terminal/electron-sandbox/localPty.ts
index 340f958856c..ed397a35984 100644
--- a/src/vs/workbench/contrib/terminal/electron-sandbox/localPty.ts
+++ b/src/vs/workbench/contrib/terminal/electron-sandbox/localPty.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IProcessPropertyMap, IPtyService, ITerminalChildProcess, ITerminalLaunchError, ProcessPropertyType } from 'vs/platform/terminal/common/terminal';
-import { BasePty } from 'vs/workbench/contrib/terminal/common/basePty';
+import { IProcessPropertyMap, IPtyService, ITerminalChildProcess, ITerminalLaunchError, ProcessPropertyType } from '../../../../platform/terminal/common/terminal.js';
+import { BasePty } from '../common/basePty.js';
 
 /**
  * Responsible for establishing and maintaining a connection with an existing terminal process
diff --git a/src/vs/workbench/contrib/terminal/electron-sandbox/localTerminalBackend.ts b/src/vs/workbench/contrib/terminal/electron-sandbox/localTerminalBackend.ts
index 7f40100cf84..b457434de29 100644
--- a/src/vs/workbench/contrib/terminal/electron-sandbox/localTerminalBackend.ts
+++ b/src/vs/workbench/contrib/terminal/electron-sandbox/localTerminalBackend.ts
@@ -3,41 +3,41 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { IProcessEnvironment, isMacintosh, isWindows, OperatingSystem } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ILocalPtyService, IProcessPropertyMap, IPtyHostLatencyMeasurement, IPtyService, IShellLaunchConfig, ITerminalBackend, ITerminalBackendRegistry, ITerminalChildProcess, ITerminalEnvironment, ITerminalLogService, ITerminalProcessOptions, ITerminalsLayoutInfo, ITerminalsLayoutInfoById, ProcessPropertyType, TerminalExtensions, TerminalIpcChannels, TerminalSettingId, TitleEventSource } from 'vs/platform/terminal/common/terminal';
-import { IGetTerminalLayoutInfoArgs, IProcessDetails, ISetTerminalLayoutInfoArgs } from 'vs/platform/terminal/common/terminalProcess';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { ITerminalInstanceService } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { ITerminalConfiguration, ITerminalProfileResolverService, TERMINAL_CONFIG_SECTION } from 'vs/workbench/contrib/terminal/common/terminal';
-import { TerminalStorageKeys } from 'vs/workbench/contrib/terminal/common/terminalStorageKeys';
-import { LocalPty } from 'vs/workbench/contrib/terminal/electron-sandbox/localPty';
-import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
-import { IShellEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/shellEnvironmentService';
-import { IHistoryService } from 'vs/workbench/services/history/common/history';
-import * as terminalEnvironment from 'vs/workbench/contrib/terminal/common/terminalEnvironment';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IEnvironmentVariableService } from 'vs/workbench/contrib/terminal/common/environmentVariable';
-import { BaseTerminalBackend } from 'vs/workbench/contrib/terminal/browser/baseTerminalBackend';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { Client as MessagePortClient } from 'vs/base/parts/ipc/common/ipc.mp';
-import { acquirePort } from 'vs/base/parts/ipc/electron-sandbox/ipc.mp';
-import { getDelayedChannel, ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
-import { mark, PerformanceMark } from 'vs/base/common/performance';
-import { ILifecycleService, LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { DeferredPromise } from 'vs/base/common/async';
-import { IStatusbarService } from 'vs/workbench/services/statusbar/browser/statusbar';
-import { memoize } from 'vs/base/common/decorators';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { shouldUseEnvironmentVariableCollection } from 'vs/platform/terminal/common/terminalEnvironment';
+import { Emitter } from '../../../../base/common/event.js';
+import { IProcessEnvironment, isMacintosh, isWindows, OperatingSystem } from '../../../../base/common/platform.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { ILocalPtyService, IProcessPropertyMap, IPtyHostLatencyMeasurement, IPtyService, IShellLaunchConfig, ITerminalBackend, ITerminalBackendRegistry, ITerminalChildProcess, ITerminalEnvironment, ITerminalLogService, ITerminalProcessOptions, ITerminalsLayoutInfo, ITerminalsLayoutInfoById, ProcessPropertyType, TerminalExtensions, TerminalIpcChannels, TerminalSettingId, TitleEventSource } from '../../../../platform/terminal/common/terminal.js';
+import { IGetTerminalLayoutInfoArgs, IProcessDetails, ISetTerminalLayoutInfoArgs } from '../../../../platform/terminal/common/terminalProcess.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { ITerminalInstanceService } from '../browser/terminal.js';
+import { ITerminalProfileResolverService } from '../common/terminal.js';
+import { TerminalStorageKeys } from '../common/terminalStorageKeys.js';
+import { LocalPty } from './localPty.js';
+import { IConfigurationResolverService } from '../../../services/configurationResolver/common/configurationResolver.js';
+import { IShellEnvironmentService } from '../../../services/environment/electron-sandbox/shellEnvironmentService.js';
+import { IHistoryService } from '../../../services/history/common/history.js';
+import * as terminalEnvironment from '../common/terminalEnvironment.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IEnvironmentVariableService } from '../common/environmentVariable.js';
+import { BaseTerminalBackend } from '../browser/baseTerminalBackend.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { Client as MessagePortClient } from '../../../../base/parts/ipc/common/ipc.mp.js';
+import { acquirePort } from '../../../../base/parts/ipc/electron-sandbox/ipc.mp.js';
+import { getDelayedChannel, ProxyChannel } from '../../../../base/parts/ipc/common/ipc.js';
+import { mark, PerformanceMark } from '../../../../base/common/performance.js';
+import { ILifecycleService, LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { DeferredPromise } from '../../../../base/common/async.js';
+import { IStatusbarService } from '../../../services/statusbar/browser/statusbar.js';
+import { memoize } from '../../../../base/common/decorators.js';
+import { StopWatch } from '../../../../base/common/stopwatch.js';
+import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';
+import { shouldUseEnvironmentVariableCollection } from '../../../../platform/terminal/common/terminalEnvironment.js';
 
 export class LocalTerminalBackendContribution implements IWorkbenchContribution {
 
@@ -49,7 +49,7 @@ export class LocalTerminalBackendContribution implements IWorkbenchContribution
 	) {
 		const backend = instantiationService.createInstance(LocalTerminalBackend);
 		Registry.as<ITerminalBackendRegistry>(TerminalExtensions.Backend).registerTerminalBackend(backend);
-		terminalInstanceService.didRegisterBackend(backend.remoteAuthority);
+		terminalInstanceService.didRegisterBackend(backend);
 	}
 }
 
@@ -152,30 +152,6 @@ class LocalTerminalBackend extends BaseTerminalBackend implements ITerminalBacke
 			directProxy.onProcessOrphanQuestion(e => this._ptys.get(e.id)?.handleOrphanQuestion());
 			directProxy.onDidRequestDetach(e => this._onDidRequestDetach.fire(e));
 
-			// Listen for config changes
-			const initialConfig = this._configurationService.getValue<ITerminalConfiguration>(TERMINAL_CONFIG_SECTION);
-			for (const match of Object.keys(initialConfig.autoReplies)) {
-				// Ensure the reply is value
-				const reply = initialConfig.autoReplies[match] as string | null;
-				if (reply) {
-					directProxy.installAutoReply(match, reply);
-				}
-			}
-			// TODO: Could simplify update to a single call
-			this._register(this._configurationService.onDidChangeConfiguration(async e => {
-				if (e.affectsConfiguration(TerminalSettingId.AutoReplies)) {
-					directProxy.uninstallAllAutoReplies();
-					const config = this._configurationService.getValue<ITerminalConfiguration>(TERMINAL_CONFIG_SECTION);
-					for (const match of Object.keys(config.autoReplies)) {
-						// Ensure the reply is value
-						const reply = config.autoReplies[match] as string | null;
-						if (reply) {
-							this._proxy.installAutoReply(match, reply);
-						}
-					}
-				}
-			}));
-
 			// Eagerly fetch the backend's environment for memoization
 			this.getEnvironment();
 		});
@@ -384,4 +360,15 @@ class LocalTerminalBackend extends BaseTerminalBackend implements ITerminalBacke
 	private _getWorkspaceName(): string {
 		return this._labelService.getWorkspaceLabel(this._workspaceContextService.getWorkspace());
 	}
+
+	// #region Pty service contribution RPC calls
+
+	installAutoReply(match: string, reply: string): Promise<void> {
+		return this._proxy.installAutoReply(match, reply);
+	}
+	uninstallAllAutoReplies(): Promise<void> {
+		return this._proxy.uninstallAllAutoReplies();
+	}
+
+	// #endregion
 }
diff --git a/src/vs/workbench/contrib/terminal/electron-sandbox/terminal.contribution.ts b/src/vs/workbench/contrib/terminal/electron-sandbox/terminal.contribution.ts
index 4bdad738e60..381db45fa4a 100644
--- a/src/vs/workbench/contrib/terminal/electron-sandbox/terminal.contribution.ts
+++ b/src/vs/workbench/contrib/terminal/electron-sandbox/terminal.contribution.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { registerMainProcessRemoteService } from 'vs/platform/ipc/electron-sandbox/services';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { ILocalPtyService, TerminalIpcChannels } from 'vs/platform/terminal/common/terminal';
-import { IWorkbenchContributionsRegistry, WorkbenchPhase, Extensions as WorkbenchExtensions, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { ITerminalProfileResolverService } from 'vs/workbench/contrib/terminal/common/terminal';
-import { TerminalNativeContribution } from 'vs/workbench/contrib/terminal/electron-sandbox/terminalNativeContribution';
-import { ElectronTerminalProfileResolverService } from 'vs/workbench/contrib/terminal/electron-sandbox/terminalProfileResolverService';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { LocalTerminalBackendContribution } from 'vs/workbench/contrib/terminal/electron-sandbox/localTerminalBackend';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { registerMainProcessRemoteService } from '../../../../platform/ipc/electron-sandbox/services.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { ILocalPtyService, TerminalIpcChannels } from '../../../../platform/terminal/common/terminal.js';
+import { IWorkbenchContributionsRegistry, WorkbenchPhase, Extensions as WorkbenchExtensions, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { ITerminalProfileResolverService } from '../common/terminal.js';
+import { TerminalNativeContribution } from './terminalNativeContribution.js';
+import { ElectronTerminalProfileResolverService } from './terminalProfileResolverService.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { LocalTerminalBackendContribution } from './localTerminalBackend.js';
 
 // Register services
 registerMainProcessRemoteService(ILocalPtyService, TerminalIpcChannels.LocalPty);
diff --git a/src/vs/workbench/contrib/terminal/electron-sandbox/terminalNativeContribution.ts b/src/vs/workbench/contrib/terminal/electron-sandbox/terminalNativeContribution.ts
index 6e953d933d1..c3132312b08 100644
--- a/src/vs/workbench/contrib/terminal/electron-sandbox/terminalNativeContribution.ts
+++ b/src/vs/workbench/contrib/terminal/electron-sandbox/terminalNativeContribution.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ipcRenderer } from 'vs/base/parts/sandbox/electron-sandbox/globals';
-import { INativeOpenFileRequest } from 'vs/platform/window/common/window';
-import { URI } from 'vs/base/common/uri';
-import { IFileService } from 'vs/platform/files/common/files';
-import { registerRemoteContributions } from 'vs/workbench/contrib/terminal/electron-sandbox/terminalRemote';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { disposableWindowInterval, getActiveWindow } from 'vs/base/browser/dom';
+import { ipcRenderer } from '../../../../base/parts/sandbox/electron-sandbox/globals.js';
+import { INativeOpenFileRequest } from '../../../../platform/window/common/window.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { registerRemoteContributions } from './terminalRemote.js';
+import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ITerminalService } from '../browser/terminal.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { disposableWindowInterval, getActiveWindow } from '../../../../base/browser/dom.js';
 
 export class TerminalNativeContribution extends Disposable implements IWorkbenchContribution {
 	declare _serviceBrand: undefined;
diff --git a/src/vs/workbench/contrib/terminal/electron-sandbox/terminalProfileResolverService.ts b/src/vs/workbench/contrib/terminal/electron-sandbox/terminalProfileResolverService.ts
index 602b47386ba..2fe5d5fbdc9 100644
--- a/src/vs/workbench/contrib/terminal/electron-sandbox/terminalProfileResolverService.ts
+++ b/src/vs/workbench/contrib/terminal/electron-sandbox/terminalProfileResolverService.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ErrorNoTelemetry } from 'vs/base/common/errors';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ITerminalLogService } from 'vs/platform/terminal/common/terminal';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { ITerminalInstanceService } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { BaseTerminalProfileResolverService } from 'vs/workbench/contrib/terminal/browser/terminalProfileResolverService';
-import { ITerminalProfileService } from 'vs/workbench/contrib/terminal/common/terminal';
-import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
-import { IHistoryService } from 'vs/workbench/services/history/common/history';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
+import { ErrorNoTelemetry } from '../../../../base/common/errors.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ITerminalLogService } from '../../../../platform/terminal/common/terminal.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { ITerminalInstanceService } from '../browser/terminal.js';
+import { BaseTerminalProfileResolverService } from '../browser/terminalProfileResolverService.js';
+import { ITerminalProfileService } from '../common/terminal.js';
+import { IConfigurationResolverService } from '../../../services/configurationResolver/common/configurationResolver.js';
+import { IHistoryService } from '../../../services/history/common/history.js';
+import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';
 
 export class ElectronTerminalProfileResolverService extends BaseTerminalProfileResolverService {
 
diff --git a/src/vs/workbench/contrib/terminal/electron-sandbox/terminalRemote.ts b/src/vs/workbench/contrib/terminal/electron-sandbox/terminalRemote.ts
index 43edcf91365..1a11a3fa56a 100644
--- a/src/vs/workbench/contrib/terminal/electron-sandbox/terminalRemote.ts
+++ b/src/vs/workbench/contrib/terminal/electron-sandbox/terminalRemote.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { localize2 } from 'vs/nls';
-import { INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { registerTerminalAction } from 'vs/workbench/contrib/terminal/browser/terminalActions';
-import { TerminalCommandId } from 'vs/workbench/contrib/terminal/common/terminal';
-import { IHistoryService } from 'vs/workbench/services/history/common/history';
+import { Schemas } from '../../../../base/common/network.js';
+import { URI } from '../../../../base/common/uri.js';
+import { localize2 } from '../../../../nls.js';
+import { INativeEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { IRemoteAuthorityResolverService } from '../../../../platform/remote/common/remoteAuthorityResolver.js';
+import { registerTerminalAction } from '../browser/terminalActions.js';
+import { TerminalCommandId } from '../common/terminal.js';
+import { IHistoryService } from '../../../services/history/common/history.js';
 
 export function registerRemoteContributions() {
 	registerTerminalAction({
diff --git a/src/vs/workbench/contrib/terminal/terminal.all.ts b/src/vs/workbench/contrib/terminal/terminal.all.ts
index 18877870bc2..69ba6694072 100644
--- a/src/vs/workbench/contrib/terminal/terminal.all.ts
+++ b/src/vs/workbench/contrib/terminal/terminal.all.ts
@@ -4,26 +4,29 @@
  *--------------------------------------------------------------------------------------------*/
 
 // Primary workbench contribution
-import 'vs/workbench/contrib/terminal/browser/terminal.contribution';
+import './browser/terminal.contribution.js';
 
 // Misc extensions to the workbench contribution
-import 'vs/workbench/contrib/terminal/common/environmentVariable.contribution';
-import 'vs/workbench/contrib/terminal/common/terminalExtensionPoints.contribution';
-import 'vs/workbench/contrib/terminal/browser/terminalView';
+import './common/environmentVariable.contribution.js';
+import './common/terminalExtensionPoints.contribution.js';
+import './browser/terminalView.js';
 
 // Terminal contributions - Standalone extensions to the terminal, these cannot be imported from the
 // primary workbench contribution)
-import 'vs/workbench/contrib/terminalContrib/accessibility/browser/terminal.accessibility.contribution';
-import 'vs/workbench/contrib/terminalContrib/developer/browser/terminal.developer.contribution';
-import 'vs/workbench/contrib/terminalContrib/environmentChanges/browser/terminal.environmentChanges.contribution';
-import 'vs/workbench/contrib/terminalContrib/find/browser/terminal.find.contribution';
-import 'vs/workbench/contrib/terminalContrib/chat/browser/terminal.chat.contribution';
-import 'vs/workbench/contrib/terminalContrib/highlight/browser/terminal.highlight.contribution';
-import 'vs/workbench/contrib/terminalContrib/links/browser/terminal.links.contribution';
-import 'vs/workbench/contrib/terminalContrib/zoom/browser/terminal.zoom.contribution';
-import 'vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminal.stickyScroll.contribution';
-import 'vs/workbench/contrib/terminalContrib/quickFix/browser/terminal.quickFix.contribution';
-import 'vs/workbench/contrib/terminalContrib/typeAhead/browser/terminal.typeAhead.contribution';
-import 'vs/workbench/contrib/terminalContrib/suggest/browser/terminal.suggest.contribution';
-import 'vs/workbench/contrib/terminalContrib/chat/browser/terminal.initialHint.contribution';
-
+import '../terminalContrib/accessibility/browser/terminal.accessibility.contribution.js';
+import '../terminalContrib/autoReplies/browser/terminal.autoReplies.contribution.js';
+import '../terminalContrib/developer/browser/terminal.developer.contribution.js';
+import '../terminalContrib/environmentChanges/browser/terminal.environmentChanges.contribution.js';
+import '../terminalContrib/find/browser/terminal.find.contribution.js';
+import '../terminalContrib/chat/browser/terminal.chat.contribution.js';
+import '../terminalContrib/commandGuide/browser/terminal.commandGuide.contribution.js';
+import '../terminalContrib/history/browser/terminal.history.contribution.js';
+import '../terminalContrib/links/browser/terminal.links.contribution.js';
+import '../terminalContrib/zoom/browser/terminal.zoom.contribution.js';
+import '../terminalContrib/stickyScroll/browser/terminal.stickyScroll.contribution.js';
+import '../terminalContrib/quickAccess/browser/terminal.quickAccess.contribution.js';
+import '../terminalContrib/quickFix/browser/terminal.quickFix.contribution.js';
+import '../terminalContrib/typeAhead/browser/terminal.typeAhead.contribution.js';
+import '../terminalContrib/suggest/browser/terminal.suggest.contribution.js';
+import '../terminalContrib/chat/browser/terminal.initialHint.contribution.js';
+import '../terminalContrib/wslRecommendation/browser/terminal.wslRecommendation.contribution.js';
diff --git a/src/vs/workbench/contrib/terminal/terminalContribChatExports.ts b/src/vs/workbench/contrib/terminal/terminalContribChatExports.ts
new file mode 100644
index 00000000000..edd22bbfdc5
--- /dev/null
+++ b/src/vs/workbench/contrib/terminal/terminalContribChatExports.ts
@@ -0,0 +1,10 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// HACK: Export chat parts as it's only partially encapsulated within the contrib. This file only
+// exists because including it into terminalContribExports would cause a circular dependency on
+// startup
+export { TerminalChatContextKeys } from '../terminalContrib/chat/browser/terminalChat.js';
+export { TerminalChatController } from '../terminalContrib/chat/browser/terminalChatController.js';
diff --git a/src/vs/workbench/contrib/terminal/terminalContribExports.ts b/src/vs/workbench/contrib/terminal/terminalContribExports.ts
new file mode 100644
index 00000000000..665aa7bc3f9
--- /dev/null
+++ b/src/vs/workbench/contrib/terminal/terminalContribExports.ts
@@ -0,0 +1,58 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import type { IConfigurationNode } from '../../../platform/configuration/common/configurationRegistry.js';
+import { TerminalAccessibilityCommandId, defaultTerminalAccessibilityCommandsToSkipShell } from '../terminalContrib/accessibility/common/terminal.accessibility.js';
+import { terminalAccessibilityConfiguration } from '../terminalContrib/accessibility/common/terminalAccessibilityConfiguration.js';
+import { terminalAutoRepliesConfiguration } from '../terminalContrib/autoReplies/common/terminalAutoRepliesConfiguration.js';
+import { terminalInitialHintConfiguration } from '../terminalContrib/chat/common/terminalInitialHintConfiguration.js';
+import { terminalCommandGuideConfiguration } from '../terminalContrib/commandGuide/common/terminalCommandGuideConfiguration.js';
+import { TerminalDeveloperCommandId } from '../terminalContrib/developer/common/terminal.developer.js';
+import { defaultTerminalFindCommandToSkipShell } from '../terminalContrib/find/common/terminal.find.js';
+import { defaultTerminalHistoryCommandsToSkipShell, terminalHistoryConfiguration } from '../terminalContrib/history/common/terminal.history.js';
+import { TerminalStickyScrollSettingId, terminalStickyScrollConfiguration } from '../terminalContrib/stickyScroll/common/terminalStickyScrollConfiguration.js';
+import { defaultTerminalSuggestCommandsToSkipShell } from '../terminalContrib/suggest/common/terminal.suggest.js';
+import { TerminalSuggestSettingId, terminalSuggestConfiguration } from '../terminalContrib/suggest/common/terminalSuggestConfiguration.js';
+import { terminalTypeAheadConfiguration } from '../terminalContrib/typeAhead/common/terminalTypeAheadConfiguration.js';
+import { terminalZoomConfiguration } from '../terminalContrib/zoom/common/terminal.zoom.js';
+
+// HACK: Export some commands from `terminalContrib/` that are depended upon elsewhere. These are
+// soft layer breakers between `terminal/` and `terminalContrib/` but there are difficulties in
+// removing the dependency. These are explicitly defined here to avoid an eslint line override.
+export const enum TerminalContribCommandId {
+	A11yFocusAccessibleBuffer = TerminalAccessibilityCommandId.FocusAccessibleBuffer,
+	DeveloperRestartPtyHost = TerminalDeveloperCommandId.RestartPtyHost,
+}
+
+// HACK: Export some settings from `terminalContrib/` that are depended upon elsewhere. These are
+// soft layer breakers between `terminal/` and `terminalContrib/` but there are difficulties in
+// removing the dependency. These are explicitly defined here to avoid an eslint line override.
+export const enum TerminalContribSettingId {
+	SuggestEnabled = TerminalSuggestSettingId.Enabled,
+	StickyScrollEnabled = TerminalStickyScrollSettingId.Enabled,
+}
+
+// Export configuration schemes from terminalContrib - this is an exception to the eslint rule since
+// they need to be declared at part of the rest of the terminal configuration
+export const terminalContribConfiguration: IConfigurationNode['properties'] = {
+	...terminalAccessibilityConfiguration,
+	...terminalAutoRepliesConfiguration,
+	...terminalInitialHintConfiguration,
+	...terminalCommandGuideConfiguration,
+	...terminalHistoryConfiguration,
+	...terminalStickyScrollConfiguration,
+	...terminalSuggestConfiguration,
+	...terminalTypeAheadConfiguration,
+	...terminalZoomConfiguration,
+};
+
+// Export commands to skip shell from terminalContrib - this is an exception to the eslint rule
+// since they need to be included in the terminal module
+export const defaultTerminalContribCommandsToSkipShell = [
+	...defaultTerminalAccessibilityCommandsToSkipShell,
+	...defaultTerminalFindCommandToSkipShell,
+	...defaultTerminalHistoryCommandsToSkipShell,
+	...defaultTerminalSuggestCommandsToSkipShell,
+];
diff --git a/src/vs/workbench/contrib/terminal/test/browser/capabilities/commandDetectionCapability.test.ts b/src/vs/workbench/contrib/terminal/test/browser/capabilities/commandDetectionCapability.test.ts
index 9d9518e3f59..e3ec0059794 100644
--- a/src/vs/workbench/contrib/terminal/test/browser/capabilities/commandDetectionCapability.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/browser/capabilities/commandDetectionCapability.test.ts
@@ -5,12 +5,12 @@
 
 import type { Terminal } from '@xterm/xterm';
 import { deepStrictEqual, ok } from 'assert';
-import { importAMDNodeModule } from 'vs/amdX';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ITerminalCommand } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { CommandDetectionCapability } from 'vs/platform/terminal/common/capabilities/commandDetectionCapability';
-import { writeP } from 'vs/workbench/contrib/terminal/browser/terminalTestHelpers';
-import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
+import { importAMDNodeModule } from '../../../../../../amdX.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { ITerminalCommand } from '../../../../../../platform/terminal/common/capabilities/capabilities.js';
+import { CommandDetectionCapability } from '../../../../../../platform/terminal/common/capabilities/commandDetectionCapability.js';
+import { writeP } from '../../../browser/terminalTestHelpers.js';
+import { workbenchInstantiationService } from '../../../../../test/browser/workbenchTestServices.js';
 
 type TestTerminalCommandMatch = Pick<ITerminalCommand, 'command' | 'cwd' | 'exitCode'> & { marker: { line: number } };
 
diff --git a/src/vs/workbench/contrib/terminal/test/browser/capabilities/partialCommandDetectionCapability.test.ts b/src/vs/workbench/contrib/terminal/test/browser/capabilities/partialCommandDetectionCapability.test.ts
index 7f0f7f9fff0..d9abbb20bde 100644
--- a/src/vs/workbench/contrib/terminal/test/browser/capabilities/partialCommandDetectionCapability.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/browser/capabilities/partialCommandDetectionCapability.test.ts
@@ -5,10 +5,10 @@
 
 import type { IMarker, Terminal } from '@xterm/xterm';
 import { deepStrictEqual } from 'assert';
-import { importAMDNodeModule } from 'vs/amdX';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { PartialCommandDetectionCapability } from 'vs/platform/terminal/common/capabilities/partialCommandDetectionCapability';
-import { writeP } from 'vs/workbench/contrib/terminal/browser/terminalTestHelpers';
+import { importAMDNodeModule } from '../../../../../../amdX.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { PartialCommandDetectionCapability } from '../../../../../../platform/terminal/common/capabilities/partialCommandDetectionCapability.js';
+import { writeP } from '../../../browser/terminalTestHelpers.js';
 
 suite('PartialCommandDetectionCapability', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/contrib/terminal/test/browser/capabilities/terminalCapabilityStore.test.ts b/src/vs/workbench/contrib/terminal/test/browser/capabilities/terminalCapabilityStore.test.ts
index cb1444eb4b7..813129c08e1 100644
--- a/src/vs/workbench/contrib/terminal/test/browser/capabilities/terminalCapabilityStore.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/browser/capabilities/terminalCapabilityStore.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { deepStrictEqual } from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { TerminalCapabilityStore, TerminalCapabilityStoreMultiplexer } from 'vs/platform/terminal/common/capabilities/terminalCapabilityStore';
+import { DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { TerminalCapability } from '../../../../../../platform/terminal/common/capabilities/capabilities.js';
+import { TerminalCapabilityStore, TerminalCapabilityStoreMultiplexer } from '../../../../../../platform/terminal/common/capabilities/terminalCapabilityStore.js';
 
 suite('TerminalCapabilityStore', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/contrib/terminal/test/browser/terminalActions.test.ts b/src/vs/workbench/contrib/terminal/test/browser/terminalActions.test.ts
index 615f5b6c174..466cf0c963a 100644
--- a/src/vs/workbench/contrib/terminal/test/browser/terminalActions.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/browser/terminalActions.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { deepStrictEqual } from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { WorkspaceFolderCwdPair, shrinkWorkspaceFolderCwdPairs } from 'vs/workbench/contrib/terminal/browser/terminalActions';
+import { URI } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IWorkspaceFolder } from '../../../../../platform/workspace/common/workspace.js';
+import { WorkspaceFolderCwdPair, shrinkWorkspaceFolderCwdPairs } from '../../browser/terminalActions.js';
 
 function makeFakeFolder(name: string, uri: URI): IWorkspaceFolder {
 	return {
diff --git a/src/vs/workbench/contrib/terminal/test/browser/terminalConfigurationService.test.ts b/src/vs/workbench/contrib/terminal/test/browser/terminalConfigurationService.test.ts
index 9564cb8df6a..8b5f8985004 100644
--- a/src/vs/workbench/contrib/terminal/test/browser/terminalConfigurationService.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/browser/terminalConfigurationService.test.ts
@@ -3,22 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { notStrictEqual, strictEqual } from 'assert';
-import { getActiveWindow } from 'vs/base/browser/dom';
-import { mainWindow } from 'vs/base/browser/window';
-import { isLinux } from 'vs/base/common/platform';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { EDITOR_FONT_DEFAULTS } from 'vs/editor/common/config/editorOptions';
-import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { ITerminalConfigurationService, LinuxDistro } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { TerminalConfigurationService } from 'vs/workbench/contrib/terminal/browser/terminalConfigurationService';
-import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
-
-class TestTerminalConfigurationService extends TerminalConfigurationService {
-	get fontMetrics() { return this._fontMetrics; }
-}
+import { notStrictEqual, ok, strictEqual } from 'assert';
+import { getActiveWindow } from '../../../../../base/browser/dom.js';
+import { mainWindow } from '../../../../../base/browser/window.js';
+import { isLinux } from '../../../../../base/common/platform.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { EDITOR_FONT_DEFAULTS } from '../../../../../editor/common/config/editorOptions.js';
+import { ConfigurationTarget, IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { ITerminalConfigurationService, LinuxDistro } from '../../browser/terminal.js';
+import { TestTerminalConfigurationService, workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
 
 suite('Workbench - TerminalConfigurationService', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
@@ -77,7 +72,7 @@ suite('Workbench - TerminalConfigurationService', () => {
 				editor: { fontFamily: 'foo' },
 				terminal: { integrated: { fontFamily: 'bar' } }
 			});
-			strictEqual(terminalConfigurationService.getFont(getActiveWindow()).fontFamily, 'bar, monospace', 'terminal.integrated.fontFamily should be selected over editor.fontFamily');
+			ok(terminalConfigurationService.getFont(getActiveWindow()).fontFamily.startsWith('bar'), 'terminal.integrated.fontFamily should be selected over editor.fontFamily');
 		});
 
 		test('fontFamily (Linux Fedora)', () => {
@@ -85,7 +80,7 @@ suite('Workbench - TerminalConfigurationService', () => {
 				editor: { fontFamily: 'foo' },
 				terminal: { integrated: { fontFamily: null } }
 			}, LinuxDistro.Fedora);
-			strictEqual(terminalConfigurationService.getFont(getActiveWindow()).fontFamily, '\'DejaVu Sans Mono\', monospace', 'Fedora should have its font overridden when terminal.integrated.fontFamily not set');
+			ok(terminalConfigurationService.getFont(getActiveWindow()).fontFamily.startsWith('\'DejaVu Sans Mono\''), 'Fedora should have its font overridden when terminal.integrated.fontFamily not set');
 		});
 
 		test('fontFamily (Linux Ubuntu)', () => {
@@ -93,7 +88,7 @@ suite('Workbench - TerminalConfigurationService', () => {
 				editor: { fontFamily: 'foo' },
 				terminal: { integrated: { fontFamily: null } }
 			}, LinuxDistro.Ubuntu);
-			strictEqual(terminalConfigurationService.getFont(getActiveWindow()).fontFamily, '\'Ubuntu Mono\', monospace', 'Ubuntu should have its font overridden when terminal.integrated.fontFamily not set');
+			ok(terminalConfigurationService.getFont(getActiveWindow()).fontFamily.startsWith('\'Ubuntu Mono\''), 'Ubuntu should have its font overridden when terminal.integrated.fontFamily not set');
 		});
 
 		test('fontFamily (Linux Unknown)', () => {
@@ -101,7 +96,7 @@ suite('Workbench - TerminalConfigurationService', () => {
 				editor: { fontFamily: 'foo' },
 				terminal: { integrated: { fontFamily: null } }
 			});
-			strictEqual(terminalConfigurationService.getFont(getActiveWindow()).fontFamily, 'foo, monospace', 'editor.fontFamily should be the fallback when terminal.integrated.fontFamily not set');
+			ok(terminalConfigurationService.getFont(getActiveWindow()).fontFamily.startsWith('foo'), 'editor.fontFamily should be the fallback when terminal.integrated.fontFamily not set');
 		});
 
 		test('fontSize 10', () => {
diff --git a/src/vs/workbench/contrib/terminal/test/browser/terminalInstance.test.ts b/src/vs/workbench/contrib/terminal/test/browser/terminalInstance.test.ts
index 4d7c61fec55..7302c21440e 100644
--- a/src/vs/workbench/contrib/terminal/test/browser/terminalInstance.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/browser/terminalInstance.test.ts
@@ -4,29 +4,29 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { deepStrictEqual, strictEqual } from 'assert';
-import { Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { isWindows } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { TerminalCapabilityStore } from 'vs/platform/terminal/common/capabilities/terminalCapabilityStore';
-import { ITerminalChildProcess, ITerminalProfile } from 'vs/platform/terminal/common/terminal';
-import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { IViewDescriptorService } from 'vs/workbench/common/views';
-import { ITerminalConfigurationService, ITerminalInstance, ITerminalInstanceService } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { TerminalConfigurationService } from 'vs/workbench/contrib/terminal/browser/terminalConfigurationService';
-import { parseExitResult, TerminalInstance, TerminalLabelComputer } from 'vs/workbench/contrib/terminal/browser/terminalInstance';
-import { IEnvironmentVariableService } from 'vs/workbench/contrib/terminal/common/environmentVariable';
-import { EnvironmentVariableService } from 'vs/workbench/contrib/terminal/common/environmentVariableService';
-import { ITerminalProfileResolverService, ProcessState } from 'vs/workbench/contrib/terminal/common/terminal';
-import { TestViewDescriptorService } from 'vs/workbench/contrib/terminal/test/browser/xterm/xtermTerminal.test';
-import { fixPath } from 'vs/workbench/services/search/test/browser/queryBuilder.test';
-import { TestTerminalProfileResolverService, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
+import { Event } from '../../../../../base/common/event.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { isWindows } from '../../../../../base/common/platform.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { TerminalCapability } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
+import { TerminalCapabilityStore } from '../../../../../platform/terminal/common/capabilities/terminalCapabilityStore.js';
+import { ITerminalChildProcess, ITerminalProfile } from '../../../../../platform/terminal/common/terminal.js';
+import { IWorkspaceFolder } from '../../../../../platform/workspace/common/workspace.js';
+import { IViewDescriptorService } from '../../../../common/views.js';
+import { ITerminalConfigurationService, ITerminalInstance, ITerminalInstanceService } from '../../browser/terminal.js';
+import { TerminalConfigurationService } from '../../browser/terminalConfigurationService.js';
+import { parseExitResult, TerminalInstance, TerminalLabelComputer } from '../../browser/terminalInstance.js';
+import { IEnvironmentVariableService } from '../../common/environmentVariable.js';
+import { EnvironmentVariableService } from '../../common/environmentVariableService.js';
+import { ITerminalProfileResolverService, ProcessState } from '../../common/terminal.js';
+import { TestViewDescriptorService } from './xterm/xtermTerminal.test.js';
+import { fixPath } from '../../../../services/search/test/browser/queryBuilder.test.js';
+import { TestTerminalProfileResolverService, workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
 
 const root1 = '/foo/root1';
 const ROOT_1 = fixPath(root1);
@@ -58,12 +58,6 @@ const terminalShellTypeContextKey = {
 	get: () => undefined
 };
 
-const terminalInRunCommandPicker = {
-	set: () => { },
-	reset: () => { },
-	get: () => undefined
-};
-
 class TestTerminalChildProcess extends Disposable implements ITerminalChildProcess {
 	id: number = 0;
 	get capabilities() { return []; }
@@ -141,7 +135,7 @@ suite('Workbench - TerminalInstance', () => {
 							unicodeVersion: '6',
 							shellIntegration: {
 								enabled: true
-							},
+							}
 						}
 					},
 				})
@@ -150,7 +144,7 @@ suite('Workbench - TerminalInstance', () => {
 			instantiationService.stub(IViewDescriptorService, new TestViewDescriptorService());
 			instantiationService.stub(IEnvironmentVariableService, store.add(instantiationService.createInstance(EnvironmentVariableService)));
 			instantiationService.stub(ITerminalInstanceService, store.add(new TestTerminalInstanceService()));
-			terminalInstance = store.add(instantiationService.createInstance(TerminalInstance, terminalShellTypeContextKey, terminalInRunCommandPicker, {}));
+			terminalInstance = store.add(instantiationService.createInstance(TerminalInstance, terminalShellTypeContextKey, {}));
 			// //Wait for the teminalInstance._xtermReadyPromise to resolve
 			await new Promise(resolve => setTimeout(resolve, 100));
 			deepStrictEqual(terminalInstance.shellLaunchConfig.env, { TEST: 'TEST' });
diff --git a/src/vs/workbench/contrib/terminal/test/browser/terminalInstanceService.test.ts b/src/vs/workbench/contrib/terminal/test/browser/terminalInstanceService.test.ts
index 62e98a761c0..ee081930f6c 100644
--- a/src/vs/workbench/contrib/terminal/test/browser/terminalInstanceService.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/browser/terminalInstanceService.test.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { deepStrictEqual } from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ITerminalProfile } from 'vs/platform/terminal/common/terminal';
-import { ITerminalInstanceService } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { TerminalInstanceService } from 'vs/workbench/contrib/terminal/browser/terminalInstanceService';
-import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
+import { URI } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { ITerminalProfile } from '../../../../../platform/terminal/common/terminal.js';
+import { ITerminalInstanceService } from '../../browser/terminal.js';
+import { TerminalInstanceService } from '../../browser/terminalInstanceService.js';
+import { workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
 
 suite('Workbench - TerminalInstanceService', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/contrib/terminal/test/browser/terminalProcessManager.test.ts b/src/vs/workbench/contrib/terminal/test/browser/terminalProcessManager.test.ts
index 9b146b26c6b..85af56a0c6e 100644
--- a/src/vs/workbench/contrib/terminal/test/browser/terminalProcessManager.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/browser/terminalProcessManager.test.ts
@@ -4,16 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { strictEqual } from 'assert';
-import { Event } from 'vs/base/common/event';
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { ITerminalChildProcess } from 'vs/platform/terminal/common/terminal';
-import { ITerminalInstanceService } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { TerminalProcessManager } from 'vs/workbench/contrib/terminal/browser/terminalProcessManager';
-import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
+import { Event } from '../../../../../base/common/event.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { ITerminalChildProcess } from '../../../../../platform/terminal/common/terminal.js';
+import { ITerminalInstanceService } from '../../browser/terminal.js';
+import { TerminalProcessManager } from '../../browser/terminalProcessManager.js';
+import { workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
 
 class TestTerminalChildProcess implements ITerminalChildProcess {
 	id: number = 0;
diff --git a/src/vs/workbench/contrib/terminal/test/browser/terminalProfileService.integrationTest.ts b/src/vs/workbench/contrib/terminal/test/browser/terminalProfileService.integrationTest.ts
index 6146cc6b63c..db33dcddd14 100644
--- a/src/vs/workbench/contrib/terminal/test/browser/terminalProfileService.integrationTest.ts
+++ b/src/vs/workbench/contrib/terminal/test/browser/terminalProfileService.integrationTest.ts
@@ -4,29 +4,29 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { deepStrictEqual } from 'assert';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Codicon } from 'vs/base/common/codicons';
-import { Emitter } from 'vs/base/common/event';
-import { isLinux, isWindows, OperatingSystem } from 'vs/base/common/platform';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { IPickOptions, IQuickInputService, Omit, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
-import { IRemoteAgentEnvironment } from 'vs/platform/remote/common/remoteAgentEnvironment';
-import { IExtensionTerminalProfile, ITerminalBackend, ITerminalProfile } from 'vs/platform/terminal/common/terminal';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
-import { ITerminalInstanceService } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { IProfileQuickPickItem, TerminalProfileQuickpick } from 'vs/workbench/contrib/terminal/browser/terminalProfileQuickpick';
-import { TerminalProfileService } from 'vs/workbench/contrib/terminal/browser/terminalProfileService';
-import { ITerminalConfiguration, ITerminalProfileService } from 'vs/workbench/contrib/terminal/common/terminal';
-import { ITerminalContributionService } from 'vs/workbench/contrib/terminal/common/terminalExtensionPoints';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { TestExtensionService } from 'vs/workbench/test/common/workbenchTestServices';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { isLinux, isWindows, OperatingSystem } from '../../../../../base/common/platform.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { ConfigurationTarget, IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { IPickOptions, IQuickInputService, Omit, QuickPickInput } from '../../../../../platform/quickinput/common/quickInput.js';
+import { IRemoteAgentEnvironment } from '../../../../../platform/remote/common/remoteAgentEnvironment.js';
+import { IExtensionTerminalProfile, ITerminalBackend, ITerminalProfile } from '../../../../../platform/terminal/common/terminal.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { TestThemeService } from '../../../../../platform/theme/test/common/testThemeService.js';
+import { ITerminalInstanceService } from '../../browser/terminal.js';
+import { IProfileQuickPickItem, TerminalProfileQuickpick } from '../../browser/terminalProfileQuickpick.js';
+import { TerminalProfileService } from '../../browser/terminalProfileService.js';
+import { ITerminalConfiguration, ITerminalProfileService } from '../../common/terminal.js';
+import { ITerminalContributionService } from '../../common/terminalExtensionPoints.js';
+import { IWorkbenchEnvironmentService } from '../../../../services/environment/common/environmentService.js';
+import { IExtensionService } from '../../../../services/extensions/common/extensions.js';
+import { IRemoteAgentService } from '../../../../services/remote/common/remoteAgentService.js';
+import { workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
+import { TestExtensionService } from '../../../../test/common/workbenchTestServices.js';
 
 class TestTerminalProfileService extends TerminalProfileService implements Partial<ITerminalProfileService> {
 	hasRefreshedProfiles: Promise<void> | undefined;
diff --git a/src/vs/workbench/contrib/terminal/test/browser/terminalService.test.ts b/src/vs/workbench/contrib/terminal/test/browser/terminalService.test.ts
index ee0af550fa1..419bd7af001 100644
--- a/src/vs/workbench/contrib/terminal/test/browser/terminalService.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/browser/terminalService.test.ts
@@ -4,17 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { fail } from 'assert';
-import { Emitter } from 'vs/base/common/event';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { TestDialogService } from 'vs/platform/dialogs/test/common/testDialogService';
-import { TerminalLocation } from 'vs/platform/terminal/common/terminal';
-import { ITerminalInstance, ITerminalInstanceService, ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { TerminalService } from 'vs/workbench/contrib/terminal/browser/terminalService';
-import { TERMINAL_CONFIG_SECTION } from 'vs/workbench/contrib/terminal/common/terminal';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
+import { Emitter } from '../../../../../base/common/event.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
+import { TestDialogService } from '../../../../../platform/dialogs/test/common/testDialogService.js';
+import { TerminalLocation } from '../../../../../platform/terminal/common/terminal.js';
+import { ITerminalInstance, ITerminalInstanceService, ITerminalService } from '../../browser/terminal.js';
+import { TerminalService } from '../../browser/terminalService.js';
+import { TERMINAL_CONFIG_SECTION } from '../../common/terminal.js';
+import { IRemoteAgentService } from '../../../../services/remote/common/remoteAgentService.js';
+import { workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
 
 suite('Workbench - TerminalService', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/contrib/terminal/test/browser/terminalStatusList.test.ts b/src/vs/workbench/contrib/terminal/test/browser/terminalStatusList.test.ts
index a72dd12f03c..40db674185f 100644
--- a/src/vs/workbench/contrib/terminal/test/browser/terminalStatusList.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/browser/terminalStatusList.test.ts
@@ -4,14 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { deepStrictEqual, strictEqual } from 'assert';
-import { Codicon } from 'vs/base/common/codicons';
-import Severity from 'vs/base/common/severity';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { spinningLoading } from 'vs/platform/theme/common/iconRegistry';
-import { TerminalStatusList } from 'vs/workbench/contrib/terminal/browser/terminalStatusList';
-import { ITerminalStatus } from 'vs/workbench/contrib/terminal/common/terminal';
-import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import Severity from '../../../../../base/common/severity.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { spinningLoading } from '../../../../../platform/theme/common/iconRegistry.js';
+import { TerminalStatusList } from '../../browser/terminalStatusList.js';
+import { ITerminalStatus } from '../../common/terminal.js';
+import { workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
 
 function statusesEqual(list: TerminalStatusList, expected: [string, Severity][]) {
 	deepStrictEqual(list.statuses.map(e => [e.id, e.severity]), expected);
diff --git a/src/vs/workbench/contrib/terminal/test/browser/terminalUri.test.ts b/src/vs/workbench/contrib/terminal/test/browser/terminalUri.test.ts
index 2b01688244c..8da7c8713f5 100644
--- a/src/vs/workbench/contrib/terminal/test/browser/terminalUri.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/browser/terminalUri.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { deepStrictEqual, strictEqual } from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { getInstanceFromResource, getTerminalResourcesFromDragEvent, getTerminalUri, IPartialDragEvent } from 'vs/workbench/contrib/terminal/browser/terminalUri';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { getInstanceFromResource, getTerminalResourcesFromDragEvent, getTerminalUri, IPartialDragEvent } from '../../browser/terminalUri.js';
 
 function fakeDragEvent(data: string): IPartialDragEvent {
 	return {
diff --git a/src/vs/workbench/contrib/terminal/test/browser/xterm/decorationAddon.test.ts b/src/vs/workbench/contrib/terminal/test/browser/xterm/decorationAddon.test.ts
index 2bfeab64453..326796dce01 100644
--- a/src/vs/workbench/contrib/terminal/test/browser/xterm/decorationAddon.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/browser/xterm/decorationAddon.test.ts
@@ -5,14 +5,14 @@
 
 import type { IDecoration, IDecorationOptions, Terminal as RawXtermTerminal } from '@xterm/xterm';
 import { notEqual, strictEqual, throws } from 'assert';
-import { importAMDNodeModule } from 'vs/amdX';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { ITerminalCommand, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { CommandDetectionCapability } from 'vs/platform/terminal/common/capabilities/commandDetectionCapability';
-import { TerminalCapabilityStore } from 'vs/platform/terminal/common/capabilities/terminalCapabilityStore';
-import { DecorationAddon } from 'vs/workbench/contrib/terminal/browser/xterm/decorationAddon';
-import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
+import { importAMDNodeModule } from '../../../../../../amdX.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { TestConfigurationService } from '../../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { ITerminalCommand, TerminalCapability } from '../../../../../../platform/terminal/common/capabilities/capabilities.js';
+import { CommandDetectionCapability } from '../../../../../../platform/terminal/common/capabilities/commandDetectionCapability.js';
+import { TerminalCapabilityStore } from '../../../../../../platform/terminal/common/capabilities/terminalCapabilityStore.js';
+import { DecorationAddon } from '../../../browser/xterm/decorationAddon.js';
+import { workbenchInstantiationService } from '../../../../../test/browser/workbenchTestServices.js';
 
 suite('DecorationAddon', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/contrib/terminal/test/browser/xterm/lineDataEventAddon.test.ts b/src/vs/workbench/contrib/terminal/test/browser/xterm/lineDataEventAddon.test.ts
index f470f91386c..b8821513844 100644
--- a/src/vs/workbench/contrib/terminal/test/browser/xterm/lineDataEventAddon.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/browser/xterm/lineDataEventAddon.test.ts
@@ -5,11 +5,11 @@
 
 import type { Terminal } from '@xterm/xterm';
 import { deepStrictEqual } from 'assert';
-import { importAMDNodeModule } from 'vs/amdX';
-import { OperatingSystem } from 'vs/base/common/platform';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { writeP } from 'vs/workbench/contrib/terminal/browser/terminalTestHelpers';
-import { LineDataEventAddon } from 'vs/workbench/contrib/terminal/browser/xterm/lineDataEventAddon';
+import { importAMDNodeModule } from '../../../../../../amdX.js';
+import { OperatingSystem } from '../../../../../../base/common/platform.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { writeP } from '../../../browser/terminalTestHelpers.js';
+import { LineDataEventAddon } from '../../../browser/xterm/lineDataEventAddon.js';
 
 suite('LineDataEventAddon', () => {
 	let xterm: Terminal;
diff --git a/src/vs/workbench/contrib/terminal/test/browser/xterm/shellIntegrationAddon.test.ts b/src/vs/workbench/contrib/terminal/test/browser/xterm/shellIntegrationAddon.test.ts
index 453cbe03358..74c18f3557b 100644
--- a/src/vs/workbench/contrib/terminal/test/browser/xterm/shellIntegrationAddon.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/browser/xterm/shellIntegrationAddon.test.ts
@@ -6,12 +6,12 @@
 import type { Terminal } from '@xterm/xterm';
 import { deepEqual, deepStrictEqual, strictEqual } from 'assert';
 import * as sinon from 'sinon';
-import { importAMDNodeModule } from 'vs/amdX';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { ITerminalCapabilityStore, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { deserializeMessage, parseKeyValueAssignment, parseMarkSequence, ShellIntegrationAddon } from 'vs/platform/terminal/common/xterm/shellIntegrationAddon';
-import { writeP } from 'vs/workbench/contrib/terminal/browser/terminalTestHelpers';
+import { importAMDNodeModule } from '../../../../../../amdX.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { NullLogService } from '../../../../../../platform/log/common/log.js';
+import { ITerminalCapabilityStore, TerminalCapability } from '../../../../../../platform/terminal/common/capabilities/capabilities.js';
+import { deserializeMessage, parseKeyValueAssignment, parseMarkSequence, ShellIntegrationAddon } from '../../../../../../platform/terminal/common/xterm/shellIntegrationAddon.js';
+import { writeP } from '../../../browser/terminalTestHelpers.js';
 
 class TestShellIntegrationAddon extends ShellIntegrationAddon {
 	getCommandDetectionMock(terminal: Terminal): sinon.SinonMock {
diff --git a/src/vs/workbench/contrib/terminal/test/browser/xterm/xtermTerminal.test.ts b/src/vs/workbench/contrib/terminal/test/browser/xterm/xtermTerminal.test.ts
index d4b6a6314fd..af599c1c0ba 100644
--- a/src/vs/workbench/contrib/terminal/test/browser/xterm/xtermTerminal.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/browser/xterm/xtermTerminal.test.ts
@@ -6,23 +6,23 @@
 import type { WebglAddon } from '@xterm/addon-webgl';
 import type { IEvent, Terminal } from '@xterm/xterm';
 import { deepStrictEqual, strictEqual } from 'assert';
-import { importAMDNodeModule } from 'vs/amdX';
-import { isSafari } from 'vs/base/browser/browser';
-import { Color, RGBA } from 'vs/base/common/color';
-import { Emitter } from 'vs/base/common/event';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { TerminalCapabilityStore } from 'vs/platform/terminal/common/capabilities/terminalCapabilityStore';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { TestColorTheme, TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
-import { PANEL_BACKGROUND, SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
-import { IViewDescriptor, IViewDescriptorService, ViewContainerLocation } from 'vs/workbench/common/views';
-import { XtermTerminal } from 'vs/workbench/contrib/terminal/browser/xterm/xtermTerminal';
-import { ITerminalConfiguration, TERMINAL_VIEW_ID } from 'vs/workbench/contrib/terminal/common/terminal';
-import { registerColors, TERMINAL_BACKGROUND_COLOR, TERMINAL_CURSOR_BACKGROUND_COLOR, TERMINAL_CURSOR_FOREGROUND_COLOR, TERMINAL_FOREGROUND_COLOR, TERMINAL_INACTIVE_SELECTION_BACKGROUND_COLOR, TERMINAL_SELECTION_BACKGROUND_COLOR, TERMINAL_SELECTION_FOREGROUND_COLOR } from 'vs/workbench/contrib/terminal/common/terminalColorRegistry';
-import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
+import { importAMDNodeModule } from '../../../../../../amdX.js';
+import { Color, RGBA } from '../../../../../../base/common/color.js';
+import { Emitter } from '../../../../../../base/common/event.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { IEditorOptions } from '../../../../../../editor/common/config/editorOptions.js';
+import { TestConfigurationService } from '../../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { TerminalCapabilityStore } from '../../../../../../platform/terminal/common/capabilities/terminalCapabilityStore.js';
+import { IThemeService } from '../../../../../../platform/theme/common/themeService.js';
+import { TestColorTheme, TestThemeService } from '../../../../../../platform/theme/test/common/testThemeService.js';
+import { PANEL_BACKGROUND, SIDE_BAR_BACKGROUND } from '../../../../../common/theme.js';
+import { IViewDescriptor, IViewDescriptorService, ViewContainerLocation } from '../../../../../common/views.js';
+import { XtermTerminal } from '../../../browser/xterm/xtermTerminal.js';
+import { ITerminalConfiguration, TERMINAL_VIEW_ID } from '../../../common/terminal.js';
+import { registerColors, TERMINAL_BACKGROUND_COLOR, TERMINAL_CURSOR_BACKGROUND_COLOR, TERMINAL_CURSOR_FOREGROUND_COLOR, TERMINAL_FOREGROUND_COLOR, TERMINAL_INACTIVE_SELECTION_BACKGROUND_COLOR, TERMINAL_SELECTION_BACKGROUND_COLOR, TERMINAL_SELECTION_FOREGROUND_COLOR } from '../../../common/terminalColorRegistry.js';
+import { workbenchInstantiationService } from '../../../../../test/browser/workbenchTestServices.js';
+import { IXtermAddonNameToCtor, XtermAddonImporter } from '../../../browser/xterm/xtermAddonImporter.js';
 
 registerColors();
 
@@ -31,6 +31,7 @@ class TestWebglAddon implements WebglAddon {
 	static isEnabled = false;
 	readonly onChangeTextureAtlas = new Emitter().event as IEvent<HTMLCanvasElement>;
 	readonly onAddTextureAtlasCanvas = new Emitter().event as IEvent<HTMLCanvasElement>;
+	readonly onRemoveTextureAtlasCanvas = new Emitter().event as IEvent<HTMLCanvasElement, void>;
 	readonly onContextLoss = new Emitter().event as IEvent<void>;
 	activate() {
 		TestWebglAddon.isEnabled = !TestWebglAddon.shouldThrow;
@@ -44,11 +45,12 @@ class TestWebglAddon implements WebglAddon {
 	clearTextureAtlas() { }
 }
 
-class TestXtermTerminal extends XtermTerminal {
-	webglAddonPromise: Promise<typeof WebglAddon> = Promise.resolve(TestWebglAddon);
-	// Force synchronous to avoid async when activating the addon
-	protected override _getWebglAddonConstructor() {
-		return this.webglAddonPromise;
+class TestXtermAddonImporter extends XtermAddonImporter {
+	override async importAddon<T extends keyof IXtermAddonNameToCtor>(name: T): Promise<IXtermAddonNameToCtor[T]> {
+		if (name === 'webgl') {
+			return Promise.resolve(TestWebglAddon) as any;
+		}
+		return super.importAddon(name);
 	}
 }
 
@@ -89,7 +91,7 @@ suite('XtermTerminal', () => {
 	let instantiationService: TestInstantiationService;
 	let configurationService: TestConfigurationService;
 	let themeService: TestThemeService;
-	let xterm: TestXtermTerminal;
+	let xterm: XtermTerminal;
 	let XTermBaseCtor: typeof Terminal;
 
 	setup(async () => {
@@ -112,7 +114,14 @@ suite('XtermTerminal', () => {
 		XTermBaseCtor = (await importAMDNodeModule<typeof import('@xterm/xterm')>('@xterm/xterm', 'lib/xterm.js')).Terminal;
 
 		const capabilityStore = store.add(new TerminalCapabilityStore());
-		xterm = store.add(instantiationService.createInstance(TestXtermTerminal, XTermBaseCtor, 80, 30, { getBackgroundColor: () => undefined }, capabilityStore, '', true));
+		xterm = store.add(instantiationService.createInstance(XtermTerminal, XTermBaseCtor, {
+			cols: 80,
+			rows: 30,
+			xtermColorProvider: { getBackgroundColor: () => undefined },
+			capabilities: capabilityStore,
+			disableShellIntegrationReporting: true,
+			xtermAddonImpoter: new TestXtermAddonImporter(),
+		}));
 
 		TestWebglAddon.shouldThrow = false;
 		TestWebglAddon.isEnabled = false;
@@ -129,7 +138,14 @@ suite('XtermTerminal', () => {
 				[PANEL_BACKGROUND]: '#ff0000',
 				[SIDE_BAR_BACKGROUND]: '#00ff00'
 			}));
-			xterm = store.add(instantiationService.createInstance(XtermTerminal, XTermBaseCtor, 80, 30, { getBackgroundColor: () => new Color(new RGBA(255, 0, 0)) }, store.add(new TerminalCapabilityStore()), '', true));
+			xterm = store.add(instantiationService.createInstance(XtermTerminal, XTermBaseCtor, {
+				cols: 80,
+				rows: 30,
+				xtermAddonImpoter: new TestXtermAddonImporter(),
+				xtermColorProvider: { getBackgroundColor: () => new Color(new RGBA(255, 0, 0)) },
+				capabilities: store.add(new TerminalCapabilityStore()),
+				disableShellIntegrationReporting: true,
+			}));
 			strictEqual(xterm.raw.options.theme?.background, '#ff0000');
 		});
 		test('should react to and apply theme changes', () => {
@@ -158,7 +174,14 @@ suite('XtermTerminal', () => {
 				'terminal.ansiBrightCyan': '#150000',
 				'terminal.ansiBrightWhite': '#160000',
 			}));
-			xterm = store.add(instantiationService.createInstance(XtermTerminal, XTermBaseCtor, 80, 30, { getBackgroundColor: () => undefined }, store.add(new TerminalCapabilityStore()), '', true));
+			xterm = store.add(instantiationService.createInstance(XtermTerminal, XTermBaseCtor, {
+				cols: 80,
+				rows: 30,
+				xtermAddonImpoter: new TestXtermAddonImporter(),
+				xtermColorProvider: { getBackgroundColor: () => undefined },
+				capabilities: store.add(new TerminalCapabilityStore()),
+				disableShellIntegrationReporting: true
+			}));
 			deepStrictEqual(xterm.raw.options.theme, {
 				background: undefined,
 				foreground: '#000200',
@@ -167,6 +190,10 @@ suite('XtermTerminal', () => {
 				selectionBackground: '#000500',
 				selectionInactiveBackground: '#000600',
 				selectionForeground: undefined,
+				overviewRulerBorder: undefined,
+				scrollbarSliderActiveBackground: undefined,
+				scrollbarSliderBackground: undefined,
+				scrollbarSliderHoverBackground: undefined,
 				black: '#010000',
 				green: '#030000',
 				red: '#020000',
@@ -217,6 +244,10 @@ suite('XtermTerminal', () => {
 				selectionBackground: '#00050f',
 				selectionInactiveBackground: '#00060f',
 				selectionForeground: '#00070f',
+				overviewRulerBorder: undefined,
+				scrollbarSliderActiveBackground: undefined,
+				scrollbarSliderBackground: undefined,
+				scrollbarSliderHoverBackground: undefined,
 				black: '#01000f',
 				green: '#03000f',
 				red: '#02000f',
@@ -236,40 +267,4 @@ suite('XtermTerminal', () => {
 			});
 		});
 	});
-
-	suite('renderers', () => {
-		// This is skipped until the webgl renderer bug is fixed in Chromium
-		// https://bugs.chromium.org/p/chromium/issues/detail?id=1476475
-		test.skip('should re-evaluate gpu acceleration auto when the setting is changed', async () => {
-			// Check initial state
-			strictEqual(TestWebglAddon.isEnabled, false);
-
-			// Open xterm as otherwise the webgl addon won't activate
-			const container = document.createElement('div');
-			xterm.attachToElement(container);
-
-			// Auto should activate the webgl addon
-			await configurationService.setUserConfiguration('terminal', { integrated: { ...defaultTerminalConfig, gpuAcceleration: 'auto' } });
-			configurationService.onDidChangeConfigurationEmitter.fire({ affectsConfiguration: () => true } as any);
-			await xterm.webglAddonPromise; // await addon activate
-			if (isSafari) {
-				strictEqual(TestWebglAddon.isEnabled, false, 'The webgl renderer is always disabled on Safari');
-			} else {
-				strictEqual(TestWebglAddon.isEnabled, true);
-			}
-
-			// Turn off to reset state
-			await configurationService.setUserConfiguration('terminal', { integrated: { ...defaultTerminalConfig, gpuAcceleration: 'off' } });
-			configurationService.onDidChangeConfigurationEmitter.fire({ affectsConfiguration: () => true } as any);
-			await xterm.webglAddonPromise; // await addon activate
-			strictEqual(TestWebglAddon.isEnabled, false);
-
-			// Set to auto again but throw when activating the webgl addon
-			TestWebglAddon.shouldThrow = true;
-			await configurationService.setUserConfiguration('terminal', { integrated: { ...defaultTerminalConfig, gpuAcceleration: 'auto' } });
-			configurationService.onDidChangeConfigurationEmitter.fire({ affectsConfiguration: () => true } as any);
-			await xterm.webglAddonPromise; // await addon activate
-			strictEqual(TestWebglAddon.isEnabled, false);
-		});
-	});
 });
diff --git a/src/vs/workbench/contrib/terminal/test/common/environmentVariableCollection.test.ts b/src/vs/workbench/contrib/terminal/test/common/environmentVariableCollection.test.ts
index 3367f87854f..c68cd23b8a8 100644
--- a/src/vs/workbench/contrib/terminal/test/common/environmentVariableCollection.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/common/environmentVariableCollection.test.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { deepStrictEqual, strictEqual } from 'assert';
-import { EnvironmentVariableMutatorType } from 'vs/platform/terminal/common/environmentVariable';
-import { IProcessEnvironment, isWindows } from 'vs/base/common/platform';
-import { MergedEnvironmentVariableCollection } from 'vs/platform/terminal/common/environmentVariableCollection';
-import { deserializeEnvironmentDescriptionMap, deserializeEnvironmentVariableCollection } from 'vs/platform/terminal/common/environmentVariableShared';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { EnvironmentVariableMutatorType } from '../../../../../platform/terminal/common/environmentVariable.js';
+import { IProcessEnvironment, isWindows } from '../../../../../base/common/platform.js';
+import { MergedEnvironmentVariableCollection } from '../../../../../platform/terminal/common/environmentVariableCollection.js';
+import { deserializeEnvironmentDescriptionMap, deserializeEnvironmentVariableCollection } from '../../../../../platform/terminal/common/environmentVariableShared.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('EnvironmentVariable - MergedEnvironmentVariableCollection', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/contrib/terminal/test/common/environmentVariableService.test.ts b/src/vs/workbench/contrib/terminal/test/common/environmentVariableService.test.ts
index e90095b1d48..738dde85d98 100644
--- a/src/vs/workbench/contrib/terminal/test/common/environmentVariableService.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/common/environmentVariableService.test.ts
@@ -4,17 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { deepStrictEqual } from 'assert';
-import { TestExtensionService, TestHistoryService, TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
-import { EnvironmentVariableService } from 'vs/workbench/contrib/terminal/common/environmentVariableService';
-import { EnvironmentVariableMutatorType, IEnvironmentVariableMutator } from 'vs/platform/terminal/common/environmentVariable';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { Emitter } from 'vs/base/common/event';
-import { IProcessEnvironment } from 'vs/base/common/platform';
-import { IHistoryService } from 'vs/workbench/services/history/common/history';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { TestExtensionService, TestHistoryService, TestStorageService } from '../../../../test/common/workbenchTestServices.js';
+import { EnvironmentVariableService } from '../../common/environmentVariableService.js';
+import { EnvironmentVariableMutatorType, IEnvironmentVariableMutator } from '../../../../../platform/terminal/common/environmentVariable.js';
+import { IStorageService } from '../../../../../platform/storage/common/storage.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { IExtensionService } from '../../../../services/extensions/common/extensions.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { IProcessEnvironment } from '../../../../../base/common/platform.js';
+import { IHistoryService } from '../../../../services/history/common/history.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 class TestEnvironmentVariableService extends EnvironmentVariableService {
 	persistCollections(): void { this._persistCollections(); }
diff --git a/src/vs/workbench/contrib/terminal/test/common/environmentVariableShared.test.ts b/src/vs/workbench/contrib/terminal/test/common/environmentVariableShared.test.ts
index ba72290399b..9d04a584cc7 100644
--- a/src/vs/workbench/contrib/terminal/test/common/environmentVariableShared.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/common/environmentVariableShared.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { deepStrictEqual } from 'assert';
-import { deserializeEnvironmentVariableCollection, serializeEnvironmentVariableCollection } from 'vs/platform/terminal/common/environmentVariableShared';
-import { EnvironmentVariableMutatorType, IEnvironmentVariableMutator } from 'vs/platform/terminal/common/environmentVariable';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { deserializeEnvironmentVariableCollection, serializeEnvironmentVariableCollection } from '../../../../../platform/terminal/common/environmentVariableShared.js';
+import { EnvironmentVariableMutatorType, IEnvironmentVariableMutator } from '../../../../../platform/terminal/common/environmentVariable.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('EnvironmentVariable - deserializeEnvironmentVariableCollection', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/contrib/terminal/test/common/terminalClipboard.test.ts b/src/vs/workbench/contrib/terminal/test/common/terminalClipboard.test.ts
index d49cde5fa2b..bb78cefe5c8 100644
--- a/src/vs/workbench/contrib/terminal/test/common/terminalClipboard.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/common/terminalClipboard.test.ts
@@ -4,14 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { strictEqual } from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { TestDialogService } from 'vs/platform/dialogs/test/common/testDialogService';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { TerminalSettingId } from 'vs/platform/terminal/common/terminal';
-import { shouldPasteTerminalText } from 'vs/workbench/contrib/terminal/common/terminalClipboard';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
+import { TestDialogService } from '../../../../../platform/dialogs/test/common/testDialogService.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { TerminalSettingId } from '../../../../../platform/terminal/common/terminal.js';
+import { shouldPasteTerminalText } from '../../common/terminalClipboard.js';
 
 suite('TerminalClipboard', function () {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/contrib/terminal/test/common/terminalColorRegistry.test.ts b/src/vs/workbench/contrib/terminal/test/common/terminalColorRegistry.test.ts
index a15a395d9d8..865ea509b49 100644
--- a/src/vs/workbench/contrib/terminal/test/common/terminalColorRegistry.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/common/terminalColorRegistry.test.ts
@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Extensions as ThemeingExtensions, IColorRegistry, ColorIdentifier } from 'vs/platform/theme/common/colorRegistry';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { ansiColorIdentifiers, registerColors } from 'vs/workbench/contrib/terminal/common/terminalColorRegistry';
-import { IColorTheme } from 'vs/platform/theme/common/themeService';
-import { Color } from 'vs/base/common/color';
-import { ColorScheme } from 'vs/platform/theme/common/theme';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { Extensions as ThemeingExtensions, IColorRegistry, ColorIdentifier } from '../../../../../platform/theme/common/colorRegistry.js';
+import { Registry } from '../../../../../platform/registry/common/platform.js';
+import { ansiColorIdentifiers, registerColors } from '../../common/terminalColorRegistry.js';
+import { IColorTheme } from '../../../../../platform/theme/common/themeService.js';
+import { Color } from '../../../../../base/common/color.js';
+import { ColorScheme } from '../../../../../platform/theme/common/theme.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 registerColors();
 
diff --git a/src/vs/workbench/contrib/terminal/test/common/terminalDataBuffering.test.ts b/src/vs/workbench/contrib/terminal/test/common/terminalDataBuffering.test.ts
index 5aa97b16452..1ae0a82b5ca 100644
--- a/src/vs/workbench/contrib/terminal/test/common/terminalDataBuffering.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/common/terminalDataBuffering.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Emitter } from 'vs/base/common/event';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { TerminalDataBufferer } from 'vs/platform/terminal/common/terminalDataBuffering';
+import { Emitter } from '../../../../../base/common/event.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { TerminalDataBufferer } from '../../../../../platform/terminal/common/terminalDataBuffering.js';
 
 const wait = (ms: number) => new Promise(resolve => setTimeout(resolve, ms));
 
diff --git a/src/vs/workbench/contrib/terminal/test/common/terminalEnvironment.test.ts b/src/vs/workbench/contrib/terminal/test/common/terminalEnvironment.test.ts
index 6c7ae16402a..40c28ed10ae 100644
--- a/src/vs/workbench/contrib/terminal/test/common/terminalEnvironment.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/common/terminalEnvironment.test.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { deepStrictEqual, strictEqual } from 'assert';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { isWindows, OperatingSystem } from 'vs/base/common/platform';
-import { URI as Uri } from 'vs/base/common/uri';
-import { addTerminalEnvironmentKeys, createTerminalEnvironment, getCwd, getLangEnvVariable, mergeEnvironments, preparePathForShell, shouldSetLangEnvVariable } from 'vs/workbench/contrib/terminal/common/terminalEnvironment';
-import { PosixShellType, WindowsShellType } from 'vs/platform/terminal/common/terminal';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { IStringDictionary } from '../../../../../base/common/collections.js';
+import { isWindows, OperatingSystem } from '../../../../../base/common/platform.js';
+import { URI as Uri } from '../../../../../base/common/uri.js';
+import { addTerminalEnvironmentKeys, createTerminalEnvironment, getCwd, getLangEnvVariable, mergeEnvironments, preparePathForShell, shouldSetLangEnvVariable } from '../../common/terminalEnvironment.js';
+import { GeneralShellType, PosixShellType, WindowsShellType } from '../../../../../platform/terminal/common/terminal.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('Workbench - TerminalEnvironment', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
@@ -239,9 +239,9 @@ suite('Workbench - TerminalEnvironment', () => {
 				strictEqual(await preparePathForShell('c:\\foo\\bar$(echo evil)baz', 'cmd', 'cmd', WindowsShellType.CommandPrompt, wslPathBackend, OperatingSystem.Windows, true), `"c:\\foo\\bar$(echo evil)baz"`);
 			});
 			test('PowerShell', async () => {
-				strictEqual(await preparePathForShell('c:\\foo\\bar', 'pwsh', 'pwsh', WindowsShellType.PowerShell, wslPathBackend, OperatingSystem.Windows, true), `c:\\foo\\bar`);
-				strictEqual(await preparePathForShell('c:\\foo\\bar\'baz', 'pwsh', 'pwsh', WindowsShellType.PowerShell, wslPathBackend, OperatingSystem.Windows, true), `& 'c:\\foo\\bar''baz'`);
-				strictEqual(await preparePathForShell('c:\\foo\\bar$(echo evil)baz', 'pwsh', 'pwsh', WindowsShellType.PowerShell, wslPathBackend, OperatingSystem.Windows, true), `& 'c:\\foo\\bar$(echo evil)baz'`);
+				strictEqual(await preparePathForShell('c:\\foo\\bar', 'pwsh', 'pwsh', GeneralShellType.PowerShell, wslPathBackend, OperatingSystem.Windows, true), `c:\\foo\\bar`);
+				strictEqual(await preparePathForShell('c:\\foo\\bar\'baz', 'pwsh', 'pwsh', GeneralShellType.PowerShell, wslPathBackend, OperatingSystem.Windows, true), `& 'c:\\foo\\bar''baz'`);
+				strictEqual(await preparePathForShell('c:\\foo\\bar$(echo evil)baz', 'pwsh', 'pwsh', GeneralShellType.PowerShell, wslPathBackend, OperatingSystem.Windows, true), `& 'c:\\foo\\bar$(echo evil)baz'`);
 			});
 			test('Git Bash', async () => {
 				strictEqual(await preparePathForShell('c:\\foo\\bar', 'bash', 'bash', WindowsShellType.GitBash, wslPathBackend, OperatingSystem.Windows, true), `'c:/foo/bar'`);
@@ -265,9 +265,9 @@ suite('Workbench - TerminalEnvironment', () => {
 				strictEqual(await preparePathForShell('c:\\foo\\bar$(echo evil)baz', 'cmd', 'cmd', WindowsShellType.CommandPrompt, wslPathBackend, OperatingSystem.Windows, false), `"c:\\foo\\bar$(echo evil)baz"`);
 			});
 			test('PowerShell', async () => {
-				strictEqual(await preparePathForShell('c:\\foo\\bar', 'pwsh', 'pwsh', WindowsShellType.PowerShell, wslPathBackend, OperatingSystem.Windows, false), `c:\\foo\\bar`);
-				strictEqual(await preparePathForShell('c:\\foo\\bar\'baz', 'pwsh', 'pwsh', WindowsShellType.PowerShell, wslPathBackend, OperatingSystem.Windows, false), `& 'c:\\foo\\bar''baz'`);
-				strictEqual(await preparePathForShell('c:\\foo\\bar$(echo evil)baz', 'pwsh', 'pwsh', WindowsShellType.PowerShell, wslPathBackend, OperatingSystem.Windows, false), `& 'c:\\foo\\bar$(echo evil)baz'`);
+				strictEqual(await preparePathForShell('c:\\foo\\bar', 'pwsh', 'pwsh', GeneralShellType.PowerShell, wslPathBackend, OperatingSystem.Windows, false), `c:\\foo\\bar`);
+				strictEqual(await preparePathForShell('c:\\foo\\bar\'baz', 'pwsh', 'pwsh', GeneralShellType.PowerShell, wslPathBackend, OperatingSystem.Windows, false), `& 'c:\\foo\\bar''baz'`);
+				strictEqual(await preparePathForShell('c:\\foo\\bar$(echo evil)baz', 'pwsh', 'pwsh', GeneralShellType.PowerShell, wslPathBackend, OperatingSystem.Windows, false), `& 'c:\\foo\\bar$(echo evil)baz'`);
 			});
 			test('Git Bash', async () => {
 				strictEqual(await preparePathForShell('c:\\foo\\bar', 'bash', 'bash', WindowsShellType.GitBash, wslPathBackend, OperatingSystem.Windows, false), `'c:/foo/bar'`);
diff --git a/src/vs/workbench/contrib/terminal/test/node/terminalProfiles.test.ts b/src/vs/workbench/contrib/terminal/test/node/terminalProfiles.test.ts
index d86818ff870..7a8eb03fcd2 100644
--- a/src/vs/workbench/contrib/terminal/test/node/terminalProfiles.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/node/terminalProfiles.test.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { deepStrictEqual, fail, ok, strictEqual } from 'assert';
-import { isWindows } from 'vs/base/common/platform';
-import { ITerminalProfile, ProfileSource } from 'vs/platform/terminal/common/terminal';
-import { ITerminalConfiguration, ITerminalProfiles } from 'vs/workbench/contrib/terminal/common/terminal';
-import { detectAvailableProfiles, IFsProvider } from 'vs/platform/terminal/node/terminalProfiles';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { isWindows } from '../../../../../base/common/platform.js';
+import { ITerminalProfile, ProfileSource } from '../../../../../platform/terminal/common/terminal.js';
+import { ITerminalConfiguration, ITerminalProfiles } from '../../common/terminal.js';
+import { detectAvailableProfiles, IFsProvider } from '../../../../../platform/terminal/node/terminalProfiles.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 /**
  * Assets that two profiles objects are equal, this will treat explicit undefined and unset
diff --git a/src/vs/workbench/contrib/terminalContrib/README.md b/src/vs/workbench/contrib/terminalContrib/README.md
new file mode 100644
index 00000000000..7a2efd38b26
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/README.md
@@ -0,0 +1,5 @@
+_Terminal contribs_ are a way of splitting out standalone terminal features into their own components that build upon the main terminal code. The `terminalContrib/` folder can only import from `terminal/`, not the other way around. There are eslint rules to prevent this circular dependencies.
+
+Having the entire feature and its tests in the same place makes not only the contrib easier to maintain and understand, but also the core terminal code as it's less interspersed with feature code. Sometimes it's not possible without bigger changes to make the feature totally standalone, in this case the goal is to get as close as possible.
+
+This should not be confused with the similar `ITerminalContribution` which is a parallel to `IEditorContribution` and is used for decorating each individual terminal with additional functionality. An entry in `terminalContrib/` may use `ITerminalContribution`s to add its features.
diff --git a/src/vs/workbench/contrib/terminalContrib/accessibility/browser/bufferContentTracker.ts b/src/vs/workbench/contrib/terminalContrib/accessibility/browser/bufferContentTracker.ts
index 963b0c9d9f5..3dd1e3d691a 100644
--- a/src/vs/workbench/contrib/terminalContrib/accessibility/browser/bufferContentTracker.ts
+++ b/src/vs/workbench/contrib/terminalContrib/accessibility/browser/bufferContentTracker.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ITerminalLogService, TerminalSettingId } from 'vs/platform/terminal/common/terminal';
-import { IXtermTerminal } from 'vs/workbench/contrib/terminal/browser/terminal';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { ITerminalLogService, TerminalSettingId } from '../../../../../platform/terminal/common/terminal.js';
+import { IXtermTerminal } from '../../../terminal/browser/terminal.js';
 import type { IMarker, Terminal } from '@xterm/xterm';
 
 export class BufferContentTracker extends Disposable {
diff --git a/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminal.accessibility.contribution.ts b/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminal.accessibility.contribution.ts
index c2b8198873a..81c34bbaffe 100644
--- a/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminal.accessibility.contribution.ts
+++ b/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminal.accessibility.contribution.ts
@@ -3,38 +3,36 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Disposable, DisposableStore, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { localize2 } from 'vs/nls';
-import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from 'vs/platform/accessibility/common/accessibility';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ITerminalCommand, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { AccessibilityHelpAction, AccessibleViewAction } from 'vs/workbench/contrib/accessibility/browser/accessibleViewActions';
-import { ITerminalContribution, ITerminalInstance, ITerminalService, IXtermTerminal } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { registerTerminalAction } from 'vs/workbench/contrib/terminal/browser/terminalActions';
-import { registerTerminalContribution } from 'vs/workbench/contrib/terminal/browser/terminalExtensions';
-import { TerminalWidgetManager } from 'vs/workbench/contrib/terminal/browser/widgets/widgetManager';
-import { ITerminalProcessManager } from 'vs/workbench/contrib/terminal/common/terminal';
-import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey';
-import { BufferContentTracker } from 'vs/workbench/contrib/terminalContrib/accessibility/browser/bufferContentTracker';
-import { TerminalAccessibilityHelpProvider } from 'vs/workbench/contrib/terminalContrib/accessibility/browser/terminalAccessibilityHelp';
-import { TextAreaSyncAddon } from 'vs/workbench/contrib/terminalContrib/accessibility/browser/textAreaSyncAddon';
 import type { Terminal } from '@xterm/xterm';
-import { Position } from 'vs/editor/common/core/position';
-import { ICommandWithEditorLine, TerminalAccessibleBufferProvider } from 'vs/workbench/contrib/terminalContrib/accessibility/browser/terminalAccessibleBufferProvider';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TerminalSettingId } from 'vs/platform/terminal/common/terminal';
-import { Event } from 'vs/base/common/event';
-import { ICurrentPartialCommand } from 'vs/platform/terminal/common/capabilities/commandDetection/terminalCommand';
-import { AccessibilitySignal, IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { alert } from 'vs/base/browser/ui/aria/aria';
-import { TerminalAccessibilitySettingId } from 'vs/workbench/contrib/terminalContrib/accessibility/common/terminalAccessibilityConfiguration';
-import { TerminalAccessibilityCommandId } from 'vs/workbench/contrib/terminalContrib/accessibility/common/terminal.accessibility';
-import { IAccessibleViewService, AccessibleViewProviderId, NavigationType } from 'vs/platform/accessibility/browser/accessibleView';
-import { accessibleViewCurrentProviderId, accessibleViewIsShown } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
+import { Event } from '../../../../../base/common/event.js';
+import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore, IDisposable, MutableDisposable } from '../../../../../base/common/lifecycle.js';
+import { isWindows } from '../../../../../base/common/platform.js';
+import { Position } from '../../../../../editor/common/core/position.js';
+import { localize2 } from '../../../../../nls.js';
+import { AccessibleViewProviderId, IAccessibleViewService, NavigationType } from '../../../../../platform/accessibility/browser/accessibleView.js';
+import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from '../../../../../platform/accessibility/common/accessibility.js';
+import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { Action2, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ITerminalCommand, TerminalCapability } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
+import { ICurrentPartialCommand } from '../../../../../platform/terminal/common/capabilities/commandDetection/terminalCommand.js';
+import { TerminalSettingId } from '../../../../../platform/terminal/common/terminal.js';
+import { accessibleViewCurrentProviderId, accessibleViewIsShown } from '../../../accessibility/browser/accessibilityConfiguration.js';
+import { AccessibilityHelpAction, AccessibleViewAction } from '../../../accessibility/browser/accessibleViewActions.js';
+import { ITerminalContribution, ITerminalInstance, ITerminalService, IXtermTerminal } from '../../../terminal/browser/terminal.js';
+import { registerTerminalAction } from '../../../terminal/browser/terminalActions.js';
+import { registerTerminalContribution, type ITerminalContributionContext } from '../../../terminal/browser/terminalExtensions.js';
+import { TerminalContextKeys } from '../../../terminal/common/terminalContextKey.js';
+import { TerminalAccessibilityCommandId } from '../common/terminal.accessibility.js';
+import { TerminalAccessibilitySettingId } from '../common/terminalAccessibilityConfiguration.js';
+import { BufferContentTracker } from './bufferContentTracker.js';
+import { TerminalAccessibilityHelpProvider } from './terminalAccessibilityHelp.js';
+import { ICommandWithEditorLine, TerminalAccessibleBufferProvider } from './terminalAccessibleBufferProvider.js';
+import { TextAreaSyncAddon } from './textAreaSyncAddon.js';
 
 // #region Terminal Contributions
 
@@ -45,9 +43,7 @@ class TextAreaSyncContribution extends DisposableStore implements ITerminalContr
 	}
 	private _addon: TextAreaSyncAddon | undefined;
 	constructor(
-		private readonly _instance: ITerminalInstance,
-		processManager: ITerminalProcessManager,
-		widgetManager: TerminalWidgetManager,
+		private readonly _ctx: ITerminalContributionContext,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService
 	) {
 		super();
@@ -56,7 +52,7 @@ class TextAreaSyncContribution extends DisposableStore implements ITerminalContr
 		if (this._addon) {
 			return;
 		}
-		this._addon = this.add(this._instantiationService.createInstance(TextAreaSyncAddon, this._instance.capabilities));
+		this._addon = this.add(this._instantiationService.createInstance(TextAreaSyncAddon, this._ctx.instance.capabilities));
 		xterm.raw.loadAddon(this._addon);
 		this._addon.activate(xterm.raw);
 	}
@@ -74,9 +70,7 @@ export class TerminalAccessibleViewContribution extends Disposable implements IT
 	private readonly _onDidRunCommand: MutableDisposable<IDisposable> = new MutableDisposable();
 
 	constructor(
-		private readonly _instance: ITerminalInstance,
-		processManager: ITerminalProcessManager,
-		widgetManager: TerminalWidgetManager,
+		private readonly _ctx: ITerminalContributionContext,
 		@IAccessibleViewService private readonly _accessibleViewService: IAccessibleViewService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@ITerminalService private readonly _terminalService: ITerminalService,
@@ -85,16 +79,16 @@ export class TerminalAccessibleViewContribution extends Disposable implements IT
 		@IAccessibilitySignalService private readonly _accessibilitySignalService: IAccessibilitySignalService) {
 		super();
 		this._register(AccessibleViewAction.addImplementation(90, 'terminal', () => {
-			if (this._terminalService.activeInstance !== this._instance) {
+			if (this._terminalService.activeInstance !== this._ctx.instance) {
 				return false;
 			}
 			this.show();
 			return true;
 		}, TerminalContextKeys.focus));
-		this._register(_instance.onDidExecuteText(() => {
+		this._register(this._ctx.instance.onDidExecuteText(() => {
 			const focusAfterRun = _configurationService.getValue(TerminalSettingId.FocusAfterRun);
 			if (focusAfterRun === 'terminal') {
-				_instance.focus(true);
+				this._ctx.instance.focus(true);
 			} else if (focusAfterRun === 'accessible-buffer') {
 				this.show();
 			}
@@ -104,7 +98,7 @@ export class TerminalAccessibleViewContribution extends Disposable implements IT
 				this._updateCommandExecutedListener();
 			}
 		}));
-		this._register(this._instance.capabilities.onDidAddCapability(e => {
+		this._register(this._ctx.instance.capabilities.onDidAddCapability(e => {
 			if (e.capability.type === TerminalCapability.CommandDetection) {
 				this._updateCommandExecutedListener();
 			}
@@ -112,12 +106,12 @@ export class TerminalAccessibleViewContribution extends Disposable implements IT
 	}
 
 	xtermReady(xterm: IXtermTerminal & { raw: Terminal }): void {
-		const addon = this._instantiationService.createInstance(TextAreaSyncAddon, this._instance.capabilities);
+		const addon = this._instantiationService.createInstance(TextAreaSyncAddon, this._ctx.instance.capabilities);
 		xterm.raw.loadAddon(addon);
 		addon.activate(xterm.raw);
 		this._xterm = xterm;
 		this._register(this._xterm.raw.onWriteParsed(async () => {
-			if (this._terminalService.activeInstance !== this._instance) {
+			if (this._terminalService.activeInstance !== this._ctx.instance) {
 				return;
 			}
 			if (this._isTerminalAccessibleViewOpen() && this._xterm!.raw.buffer.active.baseY === 0) {
@@ -127,7 +121,7 @@ export class TerminalAccessibleViewContribution extends Disposable implements IT
 
 		const onRequestUpdateEditor = Event.latch(this._xterm.raw.onScroll);
 		this._register(onRequestUpdateEditor(() => {
-			if (this._terminalService.activeInstance !== this._instance) {
+			if (this._terminalService.activeInstance !== this._ctx.instance) {
 				return;
 			}
 			if (this._isTerminalAccessibleViewOpen()) {
@@ -137,7 +131,7 @@ export class TerminalAccessibleViewContribution extends Disposable implements IT
 	}
 
 	private _updateCommandExecutedListener(): void {
-		if (!this._instance.capabilities.has(TerminalCapability.CommandDetection)) {
+		if (!this._ctx.instance.capabilities.has(TerminalCapability.CommandDetection)) {
 			return;
 		}
 		if (!this._configurationService.getValue(TerminalAccessibilitySettingId.AccessibleViewFocusOnCommandExecution)) {
@@ -147,9 +141,9 @@ export class TerminalAccessibleViewContribution extends Disposable implements IT
 			return;
 		}
 
-		const capability = this._instance.capabilities.get(TerminalCapability.CommandDetection)!;
+		const capability = this._ctx.instance.capabilities.get(TerminalCapability.CommandDetection)!;
 		this._onDidRunCommand.value = this._register(capability.onCommandExecuted(() => {
-			if (this._instance.hasFocus) {
+			if (this._ctx.instance.hasFocus) {
 				this.show();
 			}
 		}));
@@ -167,8 +161,8 @@ export class TerminalAccessibleViewContribution extends Disposable implements IT
 			this._bufferTracker = this._register(this._instantiationService.createInstance(BufferContentTracker, this._xterm));
 		}
 		if (!this._bufferProvider) {
-			this._bufferProvider = this._register(this._instantiationService.createInstance(TerminalAccessibleBufferProvider, this._instance, this._bufferTracker, () => {
-				return this._register(this._instantiationService.createInstance(TerminalAccessibilityHelpProvider, this._instance, this._xterm!)).provideContent();
+			this._bufferProvider = this._register(this._instantiationService.createInstance(TerminalAccessibleBufferProvider, this._ctx.instance, this._bufferTracker, () => {
+				return this._register(this._instantiationService.createInstance(TerminalAccessibilityHelpProvider, this._ctx.instance, this._xterm!)).provideContent();
 			}));
 		}
 		const position = this._configurationService.getValue(TerminalAccessibilitySettingId.AccessibleViewPreserveCursorPosition) ? this._accessibleViewService.getPosition(AccessibleViewProviderId.Terminal) : undefined;
@@ -186,11 +180,14 @@ export class TerminalAccessibleViewContribution extends Disposable implements IT
 			return;
 		}
 		const command = filteredCommands[0];
-		this._accessibleViewService.setPosition(new Position(command.lineNumber, 1), true);
 		const commandLine = command.command.command;
-		if (commandLine) {
+		if (!isWindows && commandLine) {
+			this._accessibleViewService.setPosition(new Position(command.lineNumber, 1), true);
 			alert(commandLine);
+		} else {
+			this._accessibleViewService.setPosition(new Position(command.lineNumber, 1), true, true);
 		}
+
 		if (command.exitCode) {
 			this._accessibilitySignalService.playSignal(AccessibilitySignal.terminalCommandFailed);
 		} else {
@@ -199,7 +196,7 @@ export class TerminalAccessibleViewContribution extends Disposable implements IT
 	}
 
 	private _getCommandsWithEditorLine(): ICommandWithEditorLine[] | undefined {
-		const capability = this._instance.capabilities.get(TerminalCapability.CommandDetection);
+		const capability = this._ctx.instance.capabilities.get(TerminalCapability.CommandDetection);
 		const commands = capability?.commands;
 		const currentCommand = capability?.currentCommand;
 		if (!commands?.length) {
diff --git a/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminalAccessibilityHelp.ts b/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminalAccessibilityHelp.ts
index cd33345cc89..e9134e56c5e 100644
--- a/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminalAccessibilityHelp.ts
+++ b/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminalAccessibilityHelp.ts
@@ -3,22 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { localize } from 'vs/nls';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ShellIntegrationStatus, TerminalSettingId, WindowsShellType } from 'vs/platform/terminal/common/terminal';
-import { AccessibilityCommandId } from 'vs/workbench/contrib/accessibility/common/accessibilityCommands';
-import { ITerminalInstance, IXtermTerminal } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { TerminalCommandId } from 'vs/workbench/contrib/terminal/common/terminal';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { localize } from '../../../../../nls.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { ContextKeyExpr, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ShellIntegrationStatus, TerminalSettingId, WindowsShellType } from '../../../../../platform/terminal/common/terminal.js';
+import { AccessibilityCommandId } from '../../../accessibility/common/accessibilityCommands.js';
+import { ITerminalInstance, IXtermTerminal } from '../../../terminal/browser/terminal.js';
+import { TerminalCommandId } from '../../../terminal/common/terminal.js';
 import type { Terminal } from '@xterm/xterm';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TerminalAccessibilitySettingId } from 'vs/workbench/contrib/terminalContrib/accessibility/common/terminalAccessibilityConfiguration';
-import { TerminalAccessibilityCommandId } from 'vs/workbench/contrib/terminalContrib/accessibility/common/terminal.accessibility';
-import { TerminalLinksCommandId } from 'vs/workbench/contrib/terminalContrib/links/common/terminal.links';
-import { IAccessibleViewContentProvider, AccessibleViewProviderId, IAccessibleViewOptions, AccessibleViewType } from 'vs/platform/accessibility/browser/accessibleView';
-import { accessibleViewIsShown, accessibleViewCurrentProviderId, AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { TerminalAccessibilitySettingId } from '../common/terminalAccessibilityConfiguration.js';
+import { TerminalAccessibilityCommandId } from '../common/terminal.accessibility.js';
+import { TerminalLinksCommandId } from '../../links/common/terminal.links.js';
+import { IAccessibleViewContentProvider, AccessibleViewProviderId, IAccessibleViewOptions, AccessibleViewType } from '../../../../../platform/accessibility/browser/accessibleView.js';
+import { accessibleViewIsShown, accessibleViewCurrentProviderId, AccessibilityVerbositySettingId } from '../../../accessibility/browser/accessibilityConfiguration.js';
+import { TerminalHistoryCommandId } from '../../history/common/terminal.history.js';
 
 export const enum ClassName {
 	Active = 'active',
@@ -55,30 +56,33 @@ export class TerminalAccessibilityHelpProvider extends Disposable implements IAc
 		this._hasShellIntegration = _xterm.shellIntegration.status === ShellIntegrationStatus.VSCode;
 	}
 	provideContent(): string {
-		const content = [];
-		content.push(localize('focusAccessibleTerminalView', 'The Focus Accessible Terminal View command<keybinding:{0}> enables screen readers to read terminal contents.', TerminalAccessibilityCommandId.FocusAccessibleBuffer));
-		content.push(localize('preserveCursor', 'Customize the behavior of the cursor when toggling between the terminal and accessible view with `terminal.integrated.accessibleViewPreserveCursorPosition.`'));
+		const content = [
+			localize('focusAccessibleTerminalView', 'The Focus Accessible Terminal View command<keybinding:{0}> enables screen readers to read terminal contents.', TerminalAccessibilityCommandId.FocusAccessibleBuffer),
+			localize('preserveCursor', 'Customize the behavior of the cursor when toggling between the terminal and accessible view with `terminal.integrated.accessibleViewPreserveCursorPosition.`'),
+			localize('openDetectedLink', 'The Open Detected Link command<keybinding:{0}> enables screen readers to easily open links found in the terminal.', TerminalLinksCommandId.OpenDetectedLink),
+			localize('newWithProfile', 'The Create New Terminal (With Profile) command<keybinding:{0}> allows for easy terminal creation using a specific profile.', TerminalCommandId.NewWithProfile),
+			localize('focusAfterRun', 'Configure what gets focused after running selected text in the terminal with `{0}`.', TerminalSettingId.FocusAfterRun)
+		];
+
 		if (!this._configurationService.getValue(TerminalAccessibilitySettingId.AccessibleViewFocusOnCommandExecution)) {
 			content.push(localize('focusViewOnExecution', 'Enable `terminal.integrated.accessibleViewFocusOnCommandExecution` to automatically focus the terminal accessible view when a command is executed in the terminal.'));
 		}
+
 		if (this._instance.shellType === WindowsShellType.CommandPrompt) {
 			content.push(localize('commandPromptMigration', "Consider using powershell instead of command prompt for an improved experience"));
 		}
+
 		if (this._hasShellIntegration) {
-			const shellIntegrationCommandList = [];
-			shellIntegrationCommandList.push(localize('shellIntegration', "The terminal has a feature called shell integration that offers an enhanced experience and provides useful commands for screen readers such as:"));
-			shellIntegrationCommandList.push('- ' + localize('goToNextCommand', 'Go to Next Command<keybinding:{0}> in the accessible view', TerminalAccessibilityCommandId.AccessibleBufferGoToNextCommand));
-			shellIntegrationCommandList.push('- ' + localize('goToPreviousCommand', 'Go to Previous Command<keybinding:{0}> in the accessible view', TerminalAccessibilityCommandId.AccessibleBufferGoToPreviousCommand));
-			shellIntegrationCommandList.push('- ' + localize('goToSymbol', 'Go to Symbol<keybinding:{0}>', AccessibilityCommandId.GoToSymbol));
-			shellIntegrationCommandList.push('- ' + localize('runRecentCommand', 'Run Recent Command<keybinding:{0}>', TerminalCommandId.RunRecentCommand));
-			shellIntegrationCommandList.push('- ' + localize('goToRecentDirectory', 'Go to Recent Directory<keybinding:{0}>', TerminalCommandId.GoToRecentDirectory));
-			content.push(shellIntegrationCommandList.join('\n'));
+			content.push(localize('shellIntegration', "The terminal has a feature called shell integration that offers an enhanced experience and provides useful commands for screen readers such as:"));
+			content.push('- ' + localize('goToNextCommand', 'Go to Next Command<keybinding:{0}> in the accessible view', TerminalAccessibilityCommandId.AccessibleBufferGoToNextCommand));
+			content.push('- ' + localize('goToPreviousCommand', 'Go to Previous Command<keybinding:{0}> in the accessible view', TerminalAccessibilityCommandId.AccessibleBufferGoToPreviousCommand));
+			content.push('- ' + localize('goToSymbol', 'Go to Symbol<keybinding:{0}>', AccessibilityCommandId.GoToSymbol));
+			content.push('- ' + localize('runRecentCommand', 'Run Recent Command<keybinding:{0}>', TerminalHistoryCommandId.RunRecentCommand));
+			content.push('- ' + localize('goToRecentDirectory', 'Go to Recent Directory<keybinding:{0}>', TerminalHistoryCommandId.GoToRecentDirectory));
 		} else {
-			content.push(localize('goToRecentDirectoryNoShellIntegration', 'The Go to Recent Directory command<keybinding:{0}> enables screen readers to easily navigate to a directory that has been used in the terminal.', TerminalCommandId.RunRecentCommand));
+			content.push(localize('noShellIntegration', 'Shell integration is not enabled. Some accessibility features may not be available.'));
 		}
-		content.push(localize('openDetectedLink', 'The Open Detected Link command<keybinding:{0}> enables screen readers to easily open links found in the terminal.', TerminalLinksCommandId.OpenDetectedLink));
-		content.push(localize('newWithProfile', 'The Create New Terminal (With Profile) command<keybinding:{0}> allows for easy terminal creation using a specific profile.', TerminalCommandId.NewWithProfile));
-		content.push(localize('focusAfterRun', 'Configure what gets focused after running selected text in the terminal with `{0}`.', TerminalSettingId.FocusAfterRun));
-		return content.join('\n\n');
+
+		return content.join('\n');
 	}
 }
diff --git a/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminalAccessibleBufferProvider.ts b/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminalAccessibleBufferProvider.ts
index 329b73e2a31..6d7215d0cc2 100644
--- a/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminalAccessibleBufferProvider.ts
+++ b/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminalAccessibleBufferProvider.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { IModelService } from 'vs/editor/common/services/model';
-import { IAccessibleViewContentProvider, AccessibleViewProviderId, IAccessibleViewOptions, AccessibleViewType, IAccessibleViewSymbol } from 'vs/platform/accessibility/browser/accessibleView';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { TerminalCapability, ITerminalCommand } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { ICurrentPartialCommand } from 'vs/platform/terminal/common/capabilities/commandDetection/terminalCommand';
-import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { ITerminalInstance, ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { BufferContentTracker } from 'vs/workbench/contrib/terminalContrib/accessibility/browser/bufferContentTracker';
-import { TerminalAccessibilitySettingId } from 'vs/workbench/contrib/terminalContrib/accessibility/common/terminalAccessibilityConfiguration';
+import { Emitter } from '../../../../../base/common/event.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { IModelService } from '../../../../../editor/common/services/model.js';
+import { IAccessibleViewContentProvider, AccessibleViewProviderId, IAccessibleViewOptions, AccessibleViewType, IAccessibleViewSymbol } from '../../../../../platform/accessibility/browser/accessibleView.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { TerminalCapability, ITerminalCommand } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
+import { ICurrentPartialCommand } from '../../../../../platform/terminal/common/capabilities/commandDetection/terminalCommand.js';
+import { AccessibilityVerbositySettingId } from '../../../accessibility/browser/accessibilityConfiguration.js';
+import { ITerminalInstance, ITerminalService } from '../../../terminal/browser/terminal.js';
+import { BufferContentTracker } from './bufferContentTracker.js';
+import { TerminalAccessibilitySettingId } from '../common/terminalAccessibilityConfiguration.js';
 
-export class TerminalAccessibleBufferProvider extends DisposableStore implements IAccessibleViewContentProvider {
+export class TerminalAccessibleBufferProvider extends Disposable implements IAccessibleViewContentProvider {
 	id = AccessibleViewProviderId.Terminal;
 	options: IAccessibleViewOptions = { type: AccessibleViewType.View, language: 'terminal', id: AccessibleViewProviderId.Terminal };
 	verbositySettingKey = AccessibilityVerbositySettingId.Terminal;
@@ -35,14 +35,14 @@ export class TerminalAccessibleBufferProvider extends DisposableStore implements
 		super();
 		this.options.customHelp = customHelp;
 		this.options.position = configurationService.getValue(TerminalAccessibilitySettingId.AccessibleViewPreserveCursorPosition) ? 'initial-bottom' : 'bottom';
-		this.add(this._instance.onDisposed(() => this._onDidRequestClearProvider.fire(AccessibleViewProviderId.Terminal)));
-		this.add(configurationService.onDidChangeConfiguration(e => {
+		this._register(this._instance.onDisposed(() => this._onDidRequestClearProvider.fire(AccessibleViewProviderId.Terminal)));
+		this._register(configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration(TerminalAccessibilitySettingId.AccessibleViewPreserveCursorPosition)) {
 				this.options.position = configurationService.getValue(TerminalAccessibilitySettingId.AccessibleViewPreserveCursorPosition) ? 'initial-bottom' : 'bottom';
 			}
 		}));
 		this._focusedInstance = _terminalService.activeInstance;
-		this.add(_terminalService.onDidChangeActiveInstance(() => {
+		this._register(_terminalService.onDidChangeActiveInstance(() => {
 			if (_terminalService.activeInstance && this._focusedInstance?.instanceId !== _terminalService.activeInstance?.instanceId) {
 				this._onDidRequestClearProvider.fire(AccessibleViewProviderId.Terminal);
 				this._focusedInstance = _terminalService.activeInstance;
diff --git a/src/vs/workbench/contrib/terminalContrib/accessibility/browser/textAreaSyncAddon.ts b/src/vs/workbench/contrib/terminalContrib/accessibility/browser/textAreaSyncAddon.ts
index 5c8c693190f..d1eff94ce31 100644
--- a/src/vs/workbench/contrib/terminalContrib/accessibility/browser/textAreaSyncAddon.ts
+++ b/src/vs/workbench/contrib/terminalContrib/accessibility/browser/textAreaSyncAddon.ts
@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type { ITerminalAddon, Terminal } from '@xterm/xterm';
-import { debounce } from 'vs/base/common/decorators';
-import { Event } from 'vs/base/common/event';
-import { Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ITerminalCapabilityStore, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { ITerminalLogService, TerminalSettingId } from 'vs/platform/terminal/common/terminal';
+import { debounce } from '../../../../../base/common/decorators.js';
+import { Event } from '../../../../../base/common/event.js';
+import { Disposable, MutableDisposable } from '../../../../../base/common/lifecycle.js';
+import { IAccessibilityService } from '../../../../../platform/accessibility/common/accessibility.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { ITerminalCapabilityStore, TerminalCapability } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
+import { ITerminalLogService, TerminalSettingId } from '../../../../../platform/terminal/common/terminal.js';
 
 export class TextAreaSyncAddon extends Disposable implements ITerminalAddon {
 	private _terminal: Terminal | undefined;
diff --git a/src/vs/workbench/contrib/terminalContrib/accessibility/common/terminalAccessibilityConfiguration.ts b/src/vs/workbench/contrib/terminalContrib/accessibility/common/terminalAccessibilityConfiguration.ts
index 29d5be506d5..6a809a99500 100644
--- a/src/vs/workbench/contrib/terminalContrib/accessibility/common/terminalAccessibilityConfiguration.ts
+++ b/src/vs/workbench/contrib/terminalContrib/accessibility/common/terminalAccessibilityConfiguration.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import type { IStringDictionary } from 'vs/base/common/collections';
-import { localize } from 'vs/nls';
-import type { IConfigurationPropertySchema } from 'vs/platform/configuration/common/configurationRegistry';
+import type { IStringDictionary } from '../../../../../base/common/collections.js';
+import { localize } from '../../../../../nls.js';
+import type { IConfigurationPropertySchema } from '../../../../../platform/configuration/common/configurationRegistry.js';
 
 export const enum TerminalAccessibilitySettingId {
 	AccessibleViewPreserveCursorPosition = 'terminal.integrated.accessibleViewPreserveCursorPosition',
diff --git a/src/vs/workbench/contrib/terminalContrib/accessibility/test/browser/bufferContentTracker.test.ts b/src/vs/workbench/contrib/terminalContrib/accessibility/test/browser/bufferContentTracker.test.ts
index a547d3f68ae..add5939721e 100644
--- a/src/vs/workbench/contrib/terminalContrib/accessibility/test/browser/bufferContentTracker.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/accessibility/test/browser/bufferContentTracker.test.ts
@@ -4,34 +4,34 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { importAMDNodeModule } from 'vs/amdX';
-import { isWindows } from 'vs/base/common/platform';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ContextMenuService } from 'vs/platform/contextview/browser/contextMenuService';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
-import { ILoggerService, NullLogService } from 'vs/platform/log/common/log';
-import { TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { TerminalCapabilityStore } from 'vs/platform/terminal/common/capabilities/terminalCapabilityStore';
-import { ITerminalLogService } from 'vs/platform/terminal/common/terminal';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
-import { writeP } from 'vs/workbench/contrib/terminal/browser/terminalTestHelpers';
-import { XtermTerminal } from 'vs/workbench/contrib/terminal/browser/xterm/xtermTerminal';
-import { ITerminalConfiguration } from 'vs/workbench/contrib/terminal/common/terminal';
-import { BufferContentTracker } from 'vs/workbench/contrib/terminalContrib/accessibility/browser/bufferContentTracker';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { TestLayoutService, TestLifecycleService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { TestLoggerService } from 'vs/workbench/test/common/workbenchTestServices';
+import { importAMDNodeModule } from '../../../../../../amdX.js';
+import { isWindows } from '../../../../../../base/common/platform.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { ContextMenuService } from '../../../../../../platform/contextview/browser/contextMenuService.js';
+import { IContextMenuService } from '../../../../../../platform/contextview/browser/contextView.js';
+import { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { MockContextKeyService } from '../../../../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { ILayoutService } from '../../../../../../platform/layout/browser/layoutService.js';
+import { ILoggerService, NullLogService } from '../../../../../../platform/log/common/log.js';
+import { TerminalCapability } from '../../../../../../platform/terminal/common/capabilities/capabilities.js';
+import { TerminalCapabilityStore } from '../../../../../../platform/terminal/common/capabilities/terminalCapabilityStore.js';
+import { ITerminalLogService } from '../../../../../../platform/terminal/common/terminal.js';
+import { IThemeService } from '../../../../../../platform/theme/common/themeService.js';
+import { TestThemeService } from '../../../../../../platform/theme/test/common/testThemeService.js';
+import { writeP } from '../../../../terminal/browser/terminalTestHelpers.js';
+import { XtermTerminal } from '../../../../terminal/browser/xterm/xtermTerminal.js';
+import { ITerminalConfiguration } from '../../../../terminal/common/terminal.js';
+import { BufferContentTracker } from '../../browser/bufferContentTracker.js';
+import { ILifecycleService } from '../../../../../services/lifecycle/common/lifecycle.js';
+import { TestLayoutService, TestLifecycleService } from '../../../../../test/browser/workbenchTestServices.js';
+import { TestLoggerService } from '../../../../../test/common/workbenchTestServices.js';
 import type { Terminal } from '@xterm/xterm';
-import { IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { ITerminalConfigurationService } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { TerminalConfigurationService } from 'vs/workbench/contrib/terminal/browser/terminalConfigurationService';
+import { IAccessibilitySignalService } from '../../../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { ITerminalConfigurationService } from '../../../../terminal/browser/terminal.js';
+import { TerminalConfigurationService } from '../../../../terminal/browser/terminalConfigurationService.js';
 
 const defaultTerminalConfig: Partial<ITerminalConfiguration> = {
 	fontFamily: 'monospace',
@@ -79,7 +79,13 @@ suite('Buffer Content Tracker', () => {
 			capabilities.add(TerminalCapability.NaiveCwdDetection, null!);
 		}
 		const TerminalCtor = (await importAMDNodeModule<typeof import('@xterm/xterm')>('@xterm/xterm', 'lib/xterm.js')).Terminal;
-		xterm = store.add(instantiationService.createInstance(XtermTerminal, TerminalCtor, 80, 30, { getBackgroundColor: () => undefined }, capabilities, '', true));
+		xterm = store.add(instantiationService.createInstance(XtermTerminal, TerminalCtor, {
+			cols: 80,
+			rows: 30,
+			xtermColorProvider: { getBackgroundColor: () => undefined },
+			capabilities,
+			disableShellIntegrationReporting: true
+		}));
 		const container = document.createElement('div');
 		xterm.raw.open(container);
 		configurationService = new TestConfigurationService({ terminal: { integrated: { tabs: { separator: ' - ', title: '${cwd}', description: '${cwd}' } } } });
diff --git a/src/vs/workbench/contrib/terminalContrib/autoReplies/browser/terminal.autoReplies.contribution.ts b/src/vs/workbench/contrib/terminalContrib/autoReplies/browser/terminal.autoReplies.contribution.ts
new file mode 100644
index 00000000000..bf23f18f66e
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/autoReplies/browser/terminal.autoReplies.contribution.ts
@@ -0,0 +1,60 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { type ITerminalBackend } from '../../../../../platform/terminal/common/terminal.js';
+import { registerWorkbenchContribution2, WorkbenchPhase, type IWorkbenchContribution } from '../../../../common/contributions.js';
+import { ITerminalInstanceService } from '../../../terminal/browser/terminal.js';
+import { TERMINAL_CONFIG_SECTION } from '../../../terminal/common/terminal.js';
+import { TerminalAutoRepliesSettingId, type ITerminalAutoRepliesConfiguration } from '../common/terminalAutoRepliesConfiguration.js';
+
+// #region Workbench contributions
+
+export class TerminalAutoRepliesContribution extends Disposable implements IWorkbenchContribution {
+	static ID = 'terminalAutoReplies';
+
+	constructor(
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@ITerminalInstanceService terminalInstanceService: ITerminalInstanceService
+	) {
+		super();
+
+		for (const backend of terminalInstanceService.getRegisteredBackends()) {
+			this._installListenersOnBackend(backend);
+		}
+		this._register(terminalInstanceService.onDidRegisterBackend(async e => this._installListenersOnBackend(e)));
+	}
+
+	private _installListenersOnBackend(backend: ITerminalBackend): void {
+		// Listen for config changes
+		const initialConfig = this._configurationService.getValue<ITerminalAutoRepliesConfiguration>(TERMINAL_CONFIG_SECTION);
+		for (const match of Object.keys(initialConfig.autoReplies)) {
+			// Ensure the reply is valid
+			const reply = initialConfig.autoReplies[match] as string | null;
+			if (reply) {
+				backend.installAutoReply(match, reply);
+			}
+		}
+
+		this._register(this._configurationService.onDidChangeConfiguration(async e => {
+			if (e.affectsConfiguration(TerminalAutoRepliesSettingId.AutoReplies)) {
+				backend.uninstallAllAutoReplies();
+				const config = this._configurationService.getValue<ITerminalAutoRepliesConfiguration>(TERMINAL_CONFIG_SECTION);
+				for (const match of Object.keys(config.autoReplies)) {
+					// Ensure the reply is valid
+					const reply = config.autoReplies[match] as string | null;
+					if (reply) {
+						backend.installAutoReply(match, reply);
+					}
+				}
+			}
+		}));
+	}
+}
+
+registerWorkbenchContribution2(TerminalAutoRepliesContribution.ID, TerminalAutoRepliesContribution, WorkbenchPhase.AfterRestored);
+
+// #endregion Contributions
diff --git a/src/vs/workbench/contrib/terminalContrib/autoReplies/common/terminalAutoRepliesConfiguration.ts b/src/vs/workbench/contrib/terminalContrib/autoReplies/common/terminalAutoRepliesConfiguration.ts
new file mode 100644
index 00000000000..4979520e356
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/autoReplies/common/terminalAutoRepliesConfiguration.ts
@@ -0,0 +1,31 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import type { IStringDictionary } from '../../../../../base/common/collections.js';
+import { localize } from '../../../../../nls.js';
+import type { IConfigurationPropertySchema } from '../../../../../platform/configuration/common/configurationRegistry.js';
+
+export const enum TerminalAutoRepliesSettingId {
+	AutoReplies = 'terminal.integrated.autoReplies',
+}
+
+export interface ITerminalAutoRepliesConfiguration {
+	autoReplies: { [key: string]: string };
+}
+
+export const terminalAutoRepliesConfiguration: IStringDictionary<IConfigurationPropertySchema> = {
+	[TerminalAutoRepliesSettingId.AutoReplies]: {
+		markdownDescription: localize('terminal.integrated.autoReplies', "A set of messages that, when encountered in the terminal, will be automatically responded to. Provided the message is specific enough, this can help automate away common responses.\n\nRemarks:\n\n- Use {0} to automatically respond to the terminate batch job prompt on Windows.\n- The message includes escape sequences so the reply might not happen with styled text.\n- Each reply can only happen once every second.\n- Use {1} in the reply to mean the enter key.\n- To unset a default key, set the value to null.\n- Restart VS Code if new don't apply.", '`"Terminate batch job (Y/N)": "Y\\r"`', '`"\\r"`'),
+		type: 'object',
+		additionalProperties: {
+			oneOf: [{
+				type: 'string',
+				description: localize('terminal.integrated.autoReplies.reply', "The reply to send to the process.")
+			},
+			{ type: 'null' }]
+		},
+		default: {}
+	},
+};
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminal.chat.contribution.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminal.chat.contribution.ts
index a2c974a0baa..af00d422d48 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminal.chat.contribution.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminal.chat.contribution.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { registerTerminalContribution } from 'vs/workbench/contrib/terminal/browser/terminalExtensions';
-import { TerminalInlineChatAccessibleView } from 'vs/workbench/contrib/terminalContrib/chat/browser/terminalChatAccessibleView';
-import { TerminalChatController } from 'vs/workbench/contrib/terminalContrib/chat/browser/terminalChatController';
+import { registerTerminalContribution } from '../../../terminal/browser/terminalExtensions.js';
+import { TerminalInlineChatAccessibleView } from './terminalChatAccessibleView.js';
+import { TerminalChatController } from './terminalChatController.js';
 
 // #region Terminal Contributions
 
@@ -18,12 +18,16 @@ registerTerminalContribution(TerminalChatController.ID, TerminalChatController,
 AccessibleViewRegistry.register(new TerminalInlineChatAccessibleView());
 AccessibleViewRegistry.register(new TerminalChatAccessibilityHelp());
 
+registerWorkbenchContribution2(TerminalChatEnabler.Id, TerminalChatEnabler, WorkbenchPhase.AfterRestored);
+
 // #endregion
 
 // #region Actions
 
-import 'vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions';
-import { AccessibleViewRegistry } from 'vs/platform/accessibility/browser/accessibleViewRegistry';
-import { TerminalChatAccessibilityHelp } from 'vs/workbench/contrib/terminalContrib/chat/browser/terminalChatAccessibilityHelp';
+import './terminalChatActions.js';
+import { AccessibleViewRegistry } from '../../../../../platform/accessibility/browser/accessibleViewRegistry.js';
+import { TerminalChatAccessibilityHelp } from './terminalChatAccessibilityHelp.js';
+import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../../common/contributions.js';
+import { TerminalChatEnabler } from './terminalChatEnabler.js';
 
 // #endregion
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminal.initialHint.contribution.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminal.initialHint.contribution.ts
index 4e32cf42636..e1396533b1d 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminal.initialHint.contribution.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminal.initialHint.contribution.ts
@@ -2,34 +2,34 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { Disposable, DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
-import { IDetachedTerminalInstance, ITerminalContribution, ITerminalEditorService, ITerminalGroupService, ITerminalInstance, ITerminalService, IXtermTerminal } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { registerTerminalContribution } from 'vs/workbench/contrib/terminal/browser/terminalExtensions';
-import type { Terminal as RawXtermTerminal, IDecoration, ITerminalAddon } from '@xterm/xterm';
-import { TerminalWidgetManager } from 'vs/workbench/contrib/terminal/browser/widgets/widgetManager';
-import { ITerminalProcessManager, ITerminalProcessInfo } from 'vs/workbench/contrib/terminal/common/terminal';
-import { ITerminalCapabilityStore, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { localize } from 'vs/nls';
-import { Emitter, Event } from 'vs/base/common/event';
-import { OS } from 'vs/base/common/platform';
-import { KeybindingLabel } from 'vs/base/browser/ui/keybindingLabel/keybindingLabel';
-import { IContentActionHandler, renderFormattedText } from 'vs/base/browser/formattedTextRenderer';
-import { WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from 'vs/base/common/actions';
-import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { status } from 'vs/base/browser/ui/aria/aria';
-import * as dom from 'vs/base/browser/dom';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { TerminalChatCommandId } from 'vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
-import { TerminalInstance } from 'vs/workbench/contrib/terminal/browser/terminalInstance';
-import 'vs/css!./media/terminalInitialHint';
-import { TerminalInitialHintSettingId } from 'vs/workbench/contrib/terminalContrib/chat/common/terminalInitialHintConfiguration';
-import { ChatAgentLocation, IChatAgent, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
+import type { IDecoration, ITerminalAddon, Terminal as RawXtermTerminal } from '@xterm/xterm';
+import * as dom from '../../../../../base/browser/dom.js';
+import { IContentActionHandler, renderFormattedText } from '../../../../../base/browser/formattedTextRenderer.js';
+import { StandardMouseEvent } from '../../../../../base/browser/mouseEvent.js';
+import { status } from '../../../../../base/browser/ui/aria/aria.js';
+import { KeybindingLabel } from '../../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
+import { WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from '../../../../../base/common/actions.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { Disposable, DisposableStore, MutableDisposable } from '../../../../../base/common/lifecycle.js';
+import { OS } from '../../../../../base/common/platform.js';
+import { localize } from '../../../../../nls.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { IProductService } from '../../../../../platform/product/common/productService.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { ITerminalCapabilityStore, TerminalCapability } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
+import { AccessibilityVerbositySettingId } from '../../../accessibility/browser/accessibilityConfiguration.js';
+import { ChatAgentLocation, IChatAgent, IChatAgentService } from '../../../chat/common/chatAgents.js';
+import { IDetachedTerminalInstance, ITerminalContribution, ITerminalEditorService, ITerminalGroupService, ITerminalInstance, ITerminalService, IXtermTerminal } from '../../../terminal/browser/terminal.js';
+import { registerTerminalContribution, type IDetachedCompatibleTerminalContributionContext, type ITerminalContributionContext } from '../../../terminal/browser/terminalExtensions.js';
+import { TerminalInstance } from '../../../terminal/browser/terminalInstance.js';
+import { TerminalInitialHintSettingId } from '../common/terminalInitialHintConfiguration.js';
+import './media/terminalInitialHint.css';
+import { TerminalChatCommandId } from './terminalChat.js';
 
 const $ = dom.$;
 
@@ -87,9 +87,7 @@ export class TerminalInitialHintContribution extends Disposable implements ITerm
 	private _xterm: IXtermTerminal & { raw: RawXtermTerminal } | undefined;
 
 	constructor(
-		private readonly _instance: Pick<ITerminalInstance, 'capabilities'> | IDetachedTerminalInstance,
-		processManager: ITerminalProcessManager | ITerminalProcessInfo | undefined,
-		widgetManager: TerminalWidgetManager | undefined,
+		private readonly _ctx: ITerminalContributionContext | IDetachedCompatibleTerminalContributionContext,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@ITerminalGroupService private readonly _terminalGroupService: ITerminalGroupService,
@@ -108,21 +106,26 @@ export class TerminalInitialHintContribution extends Disposable implements ITerm
 	}
 
 	xtermOpen(xterm: IXtermTerminal & { raw: RawXtermTerminal }): void {
+		// Don't show is the terminal was launched by an extension or a feature like debug
+		if ('shellLaunchConfig' in this._ctx.instance && (this._ctx.instance.shellLaunchConfig.isExtensionOwnedTerminal || this._ctx.instance.shellLaunchConfig.isFeatureTerminal)) {
+			return;
+		}
+		// Don't show if disabled
 		if (this._storageService.getBoolean(Constants.InitialHintHideStorageKey, StorageScope.APPLICATION, false)) {
 			return;
 		}
+		// Only show for the first terminal
 		if (this._terminalGroupService.instances.length + this._terminalEditorService.instances.length !== 1) {
-			// only show for the first terminal
 			return;
 		}
 		this._xterm = xterm;
-		this._addon = this._register(this._instantiationService.createInstance(InitialHintAddon, this._instance.capabilities, this._chatAgentService.onDidChangeAgents));
+		this._addon = this._register(this._instantiationService.createInstance(InitialHintAddon, this._ctx.instance.capabilities, this._chatAgentService.onDidChangeAgents));
 		this._xterm.raw.loadAddon(this._addon);
 		this._register(this._addon.onDidRequestCreateHint(() => this._createHint()));
 	}
 
 	private _createHint(): void {
-		const instance = this._instance instanceof TerminalInstance ? this._instance : undefined;
+		const instance = this._ctx.instance instanceof TerminalInstance ? this._ctx.instance : undefined;
 		const commandDetectionCapability = instance?.capabilities.get(TerminalCapability.CommandDetection);
 		if (!instance || !this._xterm || this._hintWidget || !commandDetectionCapability || commandDetectionCapability.promptInputModel.value || !!instance.shellLaunchConfig.attachPersistentProcess) {
 			return;
@@ -202,8 +205,6 @@ export class TerminalInitialHintContribution extends Disposable implements ITerm
 }
 registerTerminalContribution(TerminalInitialHintContribution.ID, TerminalInitialHintContribution, false);
 
-
-
 class TerminalInitialHintWidget extends Disposable {
 
 
@@ -221,7 +222,8 @@ class TerminalInitialHintWidget extends Disposable {
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@IProductService private readonly productService: IProductService,
 		@ITerminalService private readonly terminalService: ITerminalService,
-		@IStorageService private readonly _storageService: IStorageService
+		@IStorageService private readonly _storageService: IStorageService,
+		@IContextMenuService private readonly contextMenuService: IContextMenuService
 	) {
 		super();
 		this.toDispose.add(_instance.onDidFocus(() => {
@@ -260,6 +262,7 @@ class TerminalInitialHintWidget extends Disposable {
 		};
 		this.toDispose.add(this.commandService.onDidExecuteCommand(e => {
 			if (e.commandId === TerminalChatCommandId.Start) {
+				this._storageService.store(Constants.InitialHintHideStorageKey, true, StorageScope.APPLICATION, StorageTarget.USER);
 				this.dispose();
 			}
 		}));
@@ -335,8 +338,23 @@ class TerminalInitialHintWidget extends Disposable {
 				this.domNode = undefined;
 			}));
 
+			this.toDispose.add(dom.addDisposableListener(this.domNode, dom.EventType.CONTEXT_MENU, (e) => {
+				this.contextMenuService.showContextMenu({
+					getAnchor: () => { return new StandardMouseEvent(dom.getActiveWindow(), e); },
+					getActions: () => {
+						return [{
+							id: 'workench.action.disableTerminalInitialHint',
+							label: localize('disableInitialHint', "Disable Initial Hint"),
+							tooltip: localize('disableInitialHint', "Disable Initial Hint"),
+							enabled: true,
+							class: undefined,
+							run: () => this.configurationService.updateValue(TerminalInitialHintSettingId.Enabled, false)
+						}
+						];
+					}
+				});
+			}));
 		}
-
 		return this.domNode;
 	}
 
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat.ts
index bf95499ee32..ed60f5ae11a 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { localize } from '../../../../../nls.js';
+import { MenuId } from '../../../../../platform/actions/common/actions.js';
+import { RawContextKey } from '../../../../../platform/contextkey/common/contextkey.js';
 
 export const enum TerminalChatCommandId {
 	Start = 'workbench.action.terminal.chat.start',
@@ -15,9 +15,6 @@ export const enum TerminalChatCommandId {
 	Discard = 'workbench.action.terminal.chat.discard',
 	MakeRequest = 'workbench.action.terminal.chat.makeRequest',
 	Cancel = 'workbench.action.terminal.chat.cancel',
-	FeedbackHelpful = 'workbench.action.terminal.chat.feedbackHelpful',
-	FeedbackUnhelpful = 'workbench.action.terminal.chat.feedbackUnhelpful',
-	FeedbackReportIssue = 'workbench.action.terminal.chat.feedbackReportIssue',
 	RunCommand = 'workbench.action.terminal.chat.runCommand',
 	RunFirstCommand = 'workbench.action.terminal.chat.runFirstCommand',
 	InsertCommand = 'workbench.action.terminal.chat.insertCommand',
@@ -30,7 +27,6 @@ export const enum TerminalChatCommandId {
 export const MENU_TERMINAL_CHAT_INPUT = MenuId.for('terminalChatInput');
 export const MENU_TERMINAL_CHAT_WIDGET = MenuId.for('terminalChatWidget');
 export const MENU_TERMINAL_CHAT_WIDGET_STATUS = MenuId.for('terminalChatWidget.status');
-export const MENU_TERMINAL_CHAT_WIDGET_FEEDBACK = MenuId.for('terminalChatWidget.feedback');
 export const MENU_TERMINAL_CHAT_WIDGET_TOOLBAR = MenuId.for('terminalChatWidget.toolbar');
 
 export const enum TerminalChatContextKeyStrings {
@@ -61,18 +57,12 @@ export namespace TerminalChatContextKeys {
 	/** Whether the chat input has text */
 	export const inputHasText = new RawContextKey<boolean>(TerminalChatContextKeyStrings.ChatInputHasText, false, localize('chatInputHasTextContextKey', "Whether the chat input has text."));
 
-	/** Whether the terminal chat agent has been registered */
-	export const agentRegistered = new RawContextKey<boolean>(TerminalChatContextKeyStrings.ChatAgentRegistered, false, localize('chatAgentRegisteredContextKey', "Whether the terminal chat agent has been registered."));
-
 	/** The chat response contains at least one code block */
 	export const responseContainsCodeBlock = new RawContextKey<boolean>(TerminalChatContextKeyStrings.ChatResponseContainsCodeBlock, false, localize('chatResponseContainsCodeBlockContextKey', "Whether the chat response contains a code block."));
 
 	/** The chat response contains multiple code blocks */
 	export const responseContainsMultipleCodeBlocks = new RawContextKey<boolean>(TerminalChatContextKeyStrings.ChatResponseContainsMultipleCodeBlocks, false, localize('chatResponseContainsMultipleCodeBlocksContextKey', "Whether the chat response contains multiple code blocks."));
 
-	/** Whether the response supports issue reporting */
-	export const responseSupportsIssueReporting = new RawContextKey<boolean>(TerminalChatContextKeyStrings.ChatResponseSupportsIssueReporting, false, localize('chatResponseSupportsIssueReportingContextKey', "Whether the response supports issue reporting"));
-
-	/** The chat vote, if any for the response, if any */
-	export const sessionResponseVote = new RawContextKey<string>(TerminalChatContextKeyStrings.ChatSessionResponseVote, undefined, { type: 'string', description: localize('interactiveSessionResponseVote', "When the response has been voted up, is set to 'up'. When voted down, is set to 'down'. Otherwise an empty string.") });
+	/** A chat agent exists for the terminal location */
+	export const hasChatAgent = new RawContextKey<boolean>(TerminalChatContextKeyStrings.ChatAgentRegistered, false, localize('chatAgentRegisteredContextKey', "Whether a chat agent is registered for the terminal location."));
 }
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatAccessibilityHelp.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatAccessibilityHelp.ts
index 35fcdd0410c..fb898eb750d 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatAccessibilityHelp.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatAccessibilityHelp.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { AccessibleViewProviderId, AccessibleViewType } from 'vs/platform/accessibility/browser/accessibleView';
-import { IAccessibleViewImplentation } from 'vs/platform/accessibility/browser/accessibleViewRegistry';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { TerminalChatCommandId, TerminalChatContextKeys } from 'vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
-import { TerminalChatController } from 'vs/workbench/contrib/terminalContrib/chat/browser/terminalChatController';
+import { localize } from '../../../../../nls.js';
+import { AccessibleViewProviderId, AccessibleViewType, AccessibleContentProvider } from '../../../../../platform/accessibility/browser/accessibleView.js';
+import { IAccessibleViewImplentation } from '../../../../../platform/accessibility/browser/accessibleViewRegistry.js';
+import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { AccessibilityVerbositySettingId } from '../../../accessibility/browser/accessibilityConfiguration.js';
+import { ITerminalService } from '../../../terminal/browser/terminal.js';
+import { TerminalChatCommandId, TerminalChatContextKeys } from './terminalChat.js';
+import { TerminalChatController } from './terminalChatController.js';
 
 export class TerminalChatAccessibilityHelp implements IAccessibleViewImplentation {
 	readonly priority = 110;
@@ -27,15 +27,14 @@ export class TerminalChatAccessibilityHelp implements IAccessibleViewImplentatio
 		}
 
 		const helpText = getAccessibilityHelpText(accessor);
-		return {
-			id: AccessibleViewProviderId.TerminalChat,
-			verbositySettingKey: AccessibilityVerbositySettingId.TerminalChat,
-			provideContent: () => helpText,
-			onClose: () => TerminalChatController.get(instance)?.focus(),
-			options: { type: AccessibleViewType.Help }
-		};
+		return new AccessibleContentProvider(
+			AccessibleViewProviderId.TerminalChat,
+			{ type: AccessibleViewType.Help },
+			() => helpText,
+			() => TerminalChatController.get(instance)?.focus(),
+			AccessibilityVerbositySettingId.TerminalChat,
+		);
 	}
-	dispose() { }
 }
 
 export function getAccessibilityHelpText(accessor: ServicesAccessor): string {
@@ -58,5 +57,5 @@ export function getAccessibilityHelpText(accessor: ServicesAccessor): string {
 	content.push(insertCommandKeybinding ? localize('inlineChat.insertCommand', 'With focus in the input box command editor, the Terminal: Insert Chat Command ({0}) action.', insertCommandKeybinding) : localize('inlineChat.insertCommandNoKb', 'Insert a command by tabbing to the button as the action is currently not triggerable by a keybinding.'));
 	content.push(localize('inlineChat.toolbar', "Use tab to reach conditional parts like commands, status, message responses and more."));
 	content.push(localize('chat.signals', "Accessibility Signals can be changed via settings with a prefix of signals.chat. By default, if a request takes more than 4 seconds, you will hear a sound indicating that progress is still occurring."));
-	return content.join('\n\n');
+	return content.join('\n');
 }
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatAccessibleView.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatAccessibleView.ts
index 2898dfde41c..8d6a645e6e0 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatAccessibleView.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatAccessibleView.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { AccessibleViewProviderId, AccessibleViewType } from 'vs/platform/accessibility/browser/accessibleView';
-import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { TerminalChatController } from 'vs/workbench/contrib/terminalContrib/chat/browser/terminalChatController';
-import { IAccessibleViewImplentation } from 'vs/platform/accessibility/browser/accessibleViewRegistry';
-import { TerminalChatContextKeys } from 'vs/workbench/contrib/terminal/browser/terminalContribExports';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { AccessibleViewProviderId, AccessibleViewType, AccessibleContentProvider } from '../../../../../platform/accessibility/browser/accessibleView.js';
+import { AccessibilityVerbositySettingId } from '../../../accessibility/browser/accessibilityConfiguration.js';
+import { ITerminalService } from '../../../terminal/browser/terminal.js';
+import { TerminalChatController } from './terminalChatController.js';
+import { IAccessibleViewImplentation } from '../../../../../platform/accessibility/browser/accessibleViewRegistry.js';
+import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { TerminalChatContextKeys } from './terminalChat.js';
 
 export class TerminalInlineChatAccessibleView implements IAccessibleViewImplentation {
 	readonly priority = 105;
@@ -23,15 +23,14 @@ export class TerminalInlineChatAccessibleView implements IAccessibleViewImplenta
 			return;
 		}
 		const responseContent = controller.lastResponseContent;
-		return {
-			id: AccessibleViewProviderId.TerminalChat,
-			verbositySettingKey: AccessibilityVerbositySettingId.InlineChat,
-			provideContent(): string { return responseContent; },
-			onClose() {
+		return new AccessibleContentProvider(
+			AccessibleViewProviderId.TerminalChat,
+			{ type: AccessibleViewType.View },
+			() => { return responseContent; },
+			() => {
 				controller.focus();
 			},
-			options: { type: AccessibleViewType.View }
-		};
+			AccessibilityVerbositySettingId.InlineChat,
+		);
 	}
-	dispose() { }
 }
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts
index 6b04dac4c54..82809d421e6 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from 'vs/base/common/codicons';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { localize2 } from 'vs/nls';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { AbstractInlineChatAction } from 'vs/workbench/contrib/inlineChat/browser/inlineChatActions';
-import { CTX_INLINE_CHAT_EMPTY, CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_HAS_AGENT } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
-import { isDetachedTerminalInstance } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { registerActiveXtermAction } from 'vs/workbench/contrib/terminal/browser/terminalActions';
-import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey';
-import { MENU_TERMINAL_CHAT_INPUT, MENU_TERMINAL_CHAT_WIDGET, MENU_TERMINAL_CHAT_WIDGET_FEEDBACK, MENU_TERMINAL_CHAT_WIDGET_STATUS, TerminalChatCommandId, TerminalChatContextKeys } from 'vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
-import { TerminalChatController } from 'vs/workbench/contrib/terminalContrib/chat/browser/terminalChatController';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
+import { localize2 } from '../../../../../nls.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { AbstractInlineChatAction } from '../../../inlineChat/browser/inlineChatActions.js';
+import { CTX_INLINE_CHAT_EMPTY, CTX_INLINE_CHAT_FOCUSED } from '../../../inlineChat/common/inlineChat.js';
+import { isDetachedTerminalInstance } from '../../../terminal/browser/terminal.js';
+import { registerActiveXtermAction } from '../../../terminal/browser/terminalActions.js';
+import { TerminalContextKeys } from '../../../terminal/common/terminalContextKey.js';
+import { MENU_TERMINAL_CHAT_INPUT, MENU_TERMINAL_CHAT_WIDGET, MENU_TERMINAL_CHAT_WIDGET_STATUS, TerminalChatCommandId, TerminalChatContextKeys } from './terminalChat.js';
+import { TerminalChatController } from './terminalChatController.js';
 
 registerActiveXtermAction({
 	id: TerminalChatCommandId.Start,
@@ -29,15 +29,14 @@ registerActiveXtermAction({
 	category: AbstractInlineChatAction.category,
 	precondition: ContextKeyExpr.and(
 		ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated),
-		// TODO: This needs to change to check for a terminal location capable agent
-		CTX_INLINE_CHAT_HAS_AGENT
+		TerminalChatContextKeys.hasChatAgent
 	),
 	run: (_xterm, _accessor, activeInstance, opts?: unknown) => {
 		if (isDetachedTerminalInstance(activeInstance)) {
 			return;
 		}
 
-		const contr = TerminalChatController.activeChatWidget || TerminalChatController.get(activeInstance);
+		const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance);
 
 		if (opts) {
 			opts = typeof opts === 'string' ? { query: opts } : opts;
@@ -77,7 +76,7 @@ registerActiveXtermAction({
 		if (isDetachedTerminalInstance(activeInstance)) {
 			return;
 		}
-		const contr = TerminalChatController.activeChatWidget || TerminalChatController.get(activeInstance);
+		const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance);
 		contr?.clear();
 	}
 });
@@ -99,8 +98,8 @@ registerActiveXtermAction({
 		if (isDetachedTerminalInstance(activeInstance)) {
 			return;
 		}
-		const contr = TerminalChatController.activeChatWidget || TerminalChatController.get(activeInstance);
-		contr?.chatWidget?.inlineChatWidget.chatWidget.focusLastMessage();
+		const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance);
+		contr?.chatWidget?.focusLastMessage();
 	}
 });
 
@@ -122,8 +121,8 @@ registerActiveXtermAction({
 		if (isDetachedTerminalInstance(activeInstance)) {
 			return;
 		}
-		const contr = TerminalChatController.activeChatWidget || TerminalChatController.get(activeInstance);
-		contr?.chatWidget?.focus();
+		const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance);
+		contr?.terminalChatWidget?.focus();
 	}
 });
 
@@ -151,7 +150,7 @@ registerActiveXtermAction({
 		if (isDetachedTerminalInstance(activeInstance)) {
 			return;
 		}
-		const contr = TerminalChatController.activeChatWidget || TerminalChatController.get(activeInstance);
+		const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance);
 		contr?.clear();
 	}
 });
@@ -164,7 +163,6 @@ registerActiveXtermAction({
 	precondition: ContextKeyExpr.and(
 		ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated),
 		TerminalChatContextKeys.requestActive.negate(),
-		TerminalChatContextKeys.agentRegistered,
 		TerminalChatContextKeys.responseContainsCodeBlock,
 		TerminalChatContextKeys.responseContainsMultipleCodeBlocks.negate()
 	),
@@ -184,7 +182,7 @@ registerActiveXtermAction({
 		if (isDetachedTerminalInstance(activeInstance)) {
 			return;
 		}
-		const contr = TerminalChatController.activeChatWidget || TerminalChatController.get(activeInstance);
+		const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance);
 		contr?.acceptCommand(true);
 	}
 });
@@ -196,7 +194,6 @@ registerActiveXtermAction({
 	precondition: ContextKeyExpr.and(
 		ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated),
 		TerminalChatContextKeys.requestActive.negate(),
-		TerminalChatContextKeys.agentRegistered,
 		TerminalChatContextKeys.responseContainsMultipleCodeBlocks
 	),
 	icon: Codicon.play,
@@ -215,7 +212,7 @@ registerActiveXtermAction({
 		if (isDetachedTerminalInstance(activeInstance)) {
 			return;
 		}
-		const contr = TerminalChatController.activeChatWidget || TerminalChatController.get(activeInstance);
+		const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance);
 		contr?.acceptCommand(true);
 	}
 });
@@ -227,7 +224,6 @@ registerActiveXtermAction({
 	precondition: ContextKeyExpr.and(
 		ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated),
 		TerminalChatContextKeys.requestActive.negate(),
-		TerminalChatContextKeys.agentRegistered,
 		TerminalChatContextKeys.responseContainsCodeBlock,
 		TerminalChatContextKeys.responseContainsMultipleCodeBlocks.negate()
 	),
@@ -247,7 +243,7 @@ registerActiveXtermAction({
 		if (isDetachedTerminalInstance(activeInstance)) {
 			return;
 		}
-		const contr = TerminalChatController.activeChatWidget || TerminalChatController.get(activeInstance);
+		const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance);
 		contr?.acceptCommand(false);
 	}
 });
@@ -259,7 +255,6 @@ registerActiveXtermAction({
 	precondition: ContextKeyExpr.and(
 		ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated),
 		TerminalChatContextKeys.requestActive.negate(),
-		TerminalChatContextKeys.agentRegistered,
 		TerminalChatContextKeys.responseContainsMultipleCodeBlocks
 	),
 	keybinding: {
@@ -278,7 +273,7 @@ registerActiveXtermAction({
 		if (isDetachedTerminalInstance(activeInstance)) {
 			return;
 		}
-		const contr = TerminalChatController.activeChatWidget || TerminalChatController.get(activeInstance);
+		const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance);
 		contr?.acceptCommand(false);
 	}
 });
@@ -289,14 +284,13 @@ registerActiveXtermAction({
 	precondition: ContextKeyExpr.and(
 		ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated),
 		TerminalChatContextKeys.requestActive.negate(),
-		TerminalChatContextKeys.agentRegistered,
 	),
 	icon: Codicon.commentDiscussion,
 	menu: [{
 		id: MENU_TERMINAL_CHAT_WIDGET_STATUS,
 		group: '0_main',
 		order: 1,
-		when: ContextKeyExpr.and(TerminalChatContextKeys.responseContainsCodeBlock.negate(), TerminalChatContextKeys.requestActive.negate()),
+		when: ContextKeyExpr.and(TerminalChatContextKeys.responseContainsCodeBlock, TerminalChatContextKeys.requestActive.negate()),
 	},
 	{
 		id: MENU_TERMINAL_CHAT_WIDGET,
@@ -308,7 +302,7 @@ registerActiveXtermAction({
 		if (isDetachedTerminalInstance(activeInstance)) {
 			return;
 		}
-		const contr = TerminalChatController.activeChatWidget || TerminalChatController.get(activeInstance);
+		const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance);
 		contr?.viewInChat();
 	}
 });
@@ -319,12 +313,11 @@ registerActiveXtermAction({
 	precondition: ContextKeyExpr.and(
 		ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated),
 		TerminalChatContextKeys.requestActive.negate(),
-		TerminalChatContextKeys.agentRegistered,
 		CTX_INLINE_CHAT_EMPTY.negate()
 	),
 	icon: Codicon.send,
 	keybinding: {
-		when: ContextKeyExpr.and(CTX_INLINE_CHAT_FOCUSED, TerminalChatContextKeys.requestActive.negate()),
+		when: ContextKeyExpr.and(TerminalChatContextKeys.focused, TerminalChatContextKeys.requestActive.negate()),
 		weight: KeybindingWeight.WorkbenchContrib,
 		primary: KeyCode.Enter
 	},
@@ -338,7 +331,7 @@ registerActiveXtermAction({
 		if (isDetachedTerminalInstance(activeInstance)) {
 			return;
 		}
-		const contr = TerminalChatController.activeChatWidget || TerminalChatController.get(activeInstance);
+		const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance);
 		contr?.acceptInput();
 	}
 });
@@ -348,7 +341,6 @@ registerActiveXtermAction({
 	title: localize2('cancelChat', 'Cancel Chat'),
 	precondition: ContextKeyExpr.and(
 		TerminalChatContextKeys.requestActive,
-		TerminalChatContextKeys.agentRegistered
 	),
 	icon: Codicon.debugStop,
 	menu: {
@@ -360,31 +352,45 @@ registerActiveXtermAction({
 		if (isDetachedTerminalInstance(activeInstance)) {
 			return;
 		}
-		const contr = TerminalChatController.activeChatWidget || TerminalChatController.get(activeInstance);
+		const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance);
 		contr?.cancel();
 	}
 });
 
 registerActiveXtermAction({
-	id: TerminalChatCommandId.FeedbackReportIssue,
-	title: localize2('reportIssue', 'Report Issue'),
-	precondition: ContextKeyExpr.and(
-		TerminalChatContextKeys.requestActive.negate(),
-		TerminalChatContextKeys.responseContainsCodeBlock.notEqualsTo(undefined),
-		TerminalChatContextKeys.responseSupportsIssueReporting
-	),
-	icon: Codicon.report,
-	menu: [{
-		id: MENU_TERMINAL_CHAT_WIDGET_FEEDBACK,
-		when: ContextKeyExpr.and(TerminalChatContextKeys.responseContainsCodeBlock.notEqualsTo(undefined), TerminalChatContextKeys.responseSupportsIssueReporting),
-		group: 'inline',
-		order: 3
-	}],
+	id: TerminalChatCommandId.PreviousFromHistory,
+	title: localize2('previousFromHitory', 'Previous From History'),
+	precondition: TerminalChatContextKeys.focused,
+	keybinding: {
+		when: TerminalChatContextKeys.focused,
+		weight: KeybindingWeight.WorkbenchContrib,
+		primary: KeyCode.UpArrow,
+	},
+
 	run: (_xterm, _accessor, activeInstance) => {
 		if (isDetachedTerminalInstance(activeInstance)) {
 			return;
 		}
-		const contr = TerminalChatController.activeChatWidget || TerminalChatController.get(activeInstance);
-		contr?.acceptFeedback();
+		const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance);
+		contr?.populateHistory(true);
+	}
+});
+
+registerActiveXtermAction({
+	id: TerminalChatCommandId.NextFromHistory,
+	title: localize2('nextFromHitory', 'Next From History'),
+	precondition: TerminalChatContextKeys.focused,
+	keybinding: {
+		when: TerminalChatContextKeys.focused,
+		weight: KeybindingWeight.WorkbenchContrib,
+		primary: KeyCode.DownArrow,
+	},
+
+	run: (_xterm, _accessor, activeInstance) => {
+		if (isDetachedTerminalInstance(activeInstance)) {
+			return;
+		}
+		const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance);
+		contr?.populateHistory(false);
 	}
 });
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatController.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatController.ts
index 5734afb1b87..3713e0cb780 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatController.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatController.ts
@@ -4,26 +4,25 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type { Terminal as RawXtermTerminal } from '@xterm/xterm';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Lazy } from 'vs/base/common/lazy';
-import { Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { GeneratingPhrase, IChatAccessibilityService, IChatCodeBlockContextProviderService, showChatView } from 'vs/workbench/contrib/chat/browser/chat';
-import { ChatAgentLocation, IChatAgentRequest, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { IParsedChatRequest } from 'vs/workbench/contrib/chat/common/chatParserTypes';
-import { ChatUserAction, IChatProgress, IChatService, ChatAgentVoteDirection } from 'vs/workbench/contrib/chat/common/chatService';
-import { ITerminalContribution, ITerminalInstance, ITerminalService, IXtermTerminal, isDetachedTerminalInstance } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { TerminalWidgetManager } from 'vs/workbench/contrib/terminal/browser/widgets/widgetManager';
-import { ITerminalProcessManager } from 'vs/workbench/contrib/terminal/common/terminal';
-import { TerminalChatWidget } from 'vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget';
+import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { Lazy } from '../../../../../base/common/lazy.js';
+import { Disposable, DisposableStore, MutableDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { IContextKey, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IChatCodeBlockContextProviderService, IChatWidget, showChatView } from '../../../chat/browser/chat.js';
+import { IChatProgress, IChatService } from '../../../chat/common/chatService.js';
+import { isDetachedTerminalInstance, ITerminalContribution, ITerminalInstance, ITerminalService, IXtermTerminal } from '../../../terminal/browser/terminal.js';
+import { TerminalChatWidget } from './terminalChatWidget.js';
 
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { ChatModel, ChatRequestModel, IChatRequestVariableData, IChatResponseModel, getHistoryEntriesFromModel } from 'vs/workbench/contrib/chat/common/chatModel';
-import { TerminalChatContextKeys } from 'vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { DeferredPromise } from 'vs/base/common/async';
+import { CancelablePromise, createCancelablePromise, DeferredPromise } from '../../../../../base/common/async.js';
+import { assertType } from '../../../../../base/common/types.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { IViewsService } from '../../../../services/views/common/viewsService.js';
+import { ChatAgentLocation } from '../../../chat/common/chatAgents.js';
+import { ChatModel, IChatResponseModel } from '../../../chat/common/chatModel.js';
+import type { ITerminalContributionContext } from '../../../terminal/browser/terminalExtensions.js';
+import { TerminalChatContextKeys } from './terminalChat.js';
 
 const enum Message {
 	NONE = 0,
@@ -43,80 +42,81 @@ export class TerminalChatController extends Disposable implements ITerminalContr
 		return instance.getContribution<TerminalChatController>(TerminalChatController.ID);
 	}
 	/**
-	 * Currently focused chat widget. This is used to track action context since 'active terminals'
+	 * The controller for the currently focused chat widget. This is used to track action context since 'active terminals'
 	 * are only tracked for non-detached terminal instanecs.
 	 */
-	static activeChatWidget?: TerminalChatController;
+	static activeChatController?: TerminalChatController;
+
+	private static _storageKey = 'terminal-inline-chat-history';
+	private static _promptHistory: string[] = [];
 
 	/**
 	 * The chat widget for the controller, this is lazy as we don't want to instantiate it until
 	 * both it's required and xterm is ready.
 	 */
-	private _chatWidget: Lazy<TerminalChatWidget> | undefined;
+	private _terminalChatWidget: Lazy<TerminalChatWidget> | undefined;
 
 	/**
-	 * The chat widget for the controller, this will be undefined if xterm is not ready yet (ie. the
+	 * The terminal chat widget for the controller, this will be undefined if xterm is not ready yet (ie. the
+	 * terminal is still initializing). This wraps the inline chat widget.
+	 */
+	get terminalChatWidget(): TerminalChatWidget | undefined { return this._terminalChatWidget?.value; }
+
+	/**
+	 * The base chat widget for the controller, this will be undefined if xterm is not ready yet (ie. the
 	 * terminal is still initializing).
 	 */
-	get chatWidget(): TerminalChatWidget | undefined { return this._chatWidget?.value; }
+	get chatWidget(): IChatWidget | undefined { return this._terminalChatWidget?.value.inlineChatWidget?.chatWidget; }
 
 	private readonly _requestActiveContextKey: IContextKey<boolean>;
-	private readonly _terminalAgentRegisteredContextKey: IContextKey<boolean>;
 	private readonly _responseContainsCodeBlockContextKey: IContextKey<boolean>;
 	private readonly _responseContainsMulitpleCodeBlocksContextKey: IContextKey<boolean>;
-	private readonly _responseSupportsIssueReportingContextKey: IContextKey<boolean>;
-	private readonly _sessionResponseVoteContextKey: IContextKey<string | undefined>;
 
 	private _messages = this._store.add(new Emitter<Message>());
 
-	private _currentRequest: ChatRequestModel | undefined;
-
-	private _lastInput: string | undefined;
 	private _lastResponseContent: string | undefined;
 	get lastResponseContent(): string | undefined {
 		return this._lastResponseContent;
 	}
 
 	readonly onDidAcceptInput = Event.filter(this._messages.event, m => m === Message.ACCEPT_INPUT, this._store);
-	get onDidHide() { return this.chatWidget?.onDidHide ?? Event.None; }
+	get onDidHide() { return this.terminalChatWidget?.onDidHide ?? Event.None; }
 
 	private _terminalAgentName = 'terminal';
-	private _terminalAgentId: string | undefined;
 
 	private readonly _model: MutableDisposable<ChatModel> = this._register(new MutableDisposable());
 
 	get scopedContextKeyService(): IContextKeyService {
-		return this._chatWidget?.value.inlineChatWidget.scopedContextKeyService ?? this._contextKeyService;
+		return this._terminalChatWidget?.value.inlineChatWidget.scopedContextKeyService ?? this._contextKeyService;
 	}
 
+	private _sessionCtor: CancelablePromise<void> | undefined;
+	private _historyOffset: number = -1;
+	private _historyCandidate: string = '';
+	private _historyUpdate: (prompt: string) => void;
+
+	private _currentRequestId: string | undefined;
+	private _activeRequestCts?: CancellationTokenSource;
+
 	constructor(
-		private readonly _instance: ITerminalInstance,
-		processManager: ITerminalProcessManager,
-		widgetManager: TerminalWidgetManager,
+		private readonly _ctx: ITerminalContributionContext,
 		@ITerminalService private readonly _terminalService: ITerminalService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-		@IChatAgentService private readonly _chatAgentService: IChatAgentService,
 		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
-		@IChatAccessibilityService private readonly _chatAccessibilityService: IChatAccessibilityService,
 		@IChatService private readonly _chatService: IChatService,
 		@IChatCodeBlockContextProviderService private readonly _chatCodeBlockContextProviderService: IChatCodeBlockContextProviderService,
 		@IViewsService private readonly _viewsService: IViewsService,
+		@IStorageService private readonly _storageService: IStorageService,
 	) {
 		super();
 
 		this._requestActiveContextKey = TerminalChatContextKeys.requestActive.bindTo(this._contextKeyService);
-		this._terminalAgentRegisteredContextKey = TerminalChatContextKeys.agentRegistered.bindTo(this._contextKeyService);
 		this._responseContainsCodeBlockContextKey = TerminalChatContextKeys.responseContainsCodeBlock.bindTo(this._contextKeyService);
 		this._responseContainsMulitpleCodeBlocksContextKey = TerminalChatContextKeys.responseContainsMultipleCodeBlocks.bindTo(this._contextKeyService);
-		this._responseSupportsIssueReportingContextKey = TerminalChatContextKeys.responseSupportsIssueReporting.bindTo(this._contextKeyService);
-		this._sessionResponseVoteContextKey = TerminalChatContextKeys.sessionResponseVote.bindTo(this._contextKeyService);
 
-		if (!this.initTerminalAgent()) {
-			this._register(this._chatAgentService.onDidChangeAgents(() => this.initTerminalAgent()));
-		}
 		this._register(this._chatCodeBlockContextProviderService.registerProvider({
 			getCodeBlockContext: (editor) => {
-				if (!editor || !this._chatWidget?.hasValue || !this.hasFocus()) {
+				if (!editor || !this._terminalChatWidget?.hasValue || !this.hasFocus()) {
 					return;
 				}
 				return {
@@ -128,97 +128,56 @@ export class TerminalChatController extends Disposable implements ITerminalContr
 			}
 		}, 'terminal'));
 
-		// TODO
-		// This is glue/debt that's needed while ChatModel isn't yet adopted. The chat model uses
-		// a default chat model (unless configured) and feedback is reported against that one. This
-		// code forwards the feedback to an actual registered provider
-		this._register(this._chatService.onDidPerformUserAction(e => {
-			// only forward feedback from the inline chat widget default model
-			if (
-				this._chatWidget?.rawValue?.inlineChatWidget.usesDefaultChatModel
-				&& e.sessionId === this._chatWidget?.rawValue?.inlineChatWidget.getChatModel().sessionId
-			) {
-				if (e.action.kind === 'bug') {
-					this.acceptFeedback(undefined);
-				} else if (e.action.kind === 'vote') {
-					this.acceptFeedback(e.action.direction === ChatAgentVoteDirection.Up);
-				}
+		TerminalChatController._promptHistory = JSON.parse(this._storageService.get(TerminalChatController._storageKey, StorageScope.PROFILE, '[]'));
+		this._historyUpdate = (prompt: string) => {
+			const idx = TerminalChatController._promptHistory.indexOf(prompt);
+			if (idx >= 0) {
+				TerminalChatController._promptHistory.splice(idx, 1);
 			}
-		}));
-	}
-
-	private initTerminalAgent(): boolean {
-		const terminalAgent = this._chatAgentService.getAgentsByName(this._terminalAgentName)[0];
-		if (terminalAgent) {
-			this._terminalAgentId = terminalAgent.id;
-			this._terminalAgentRegisteredContextKey.set(true);
-			return true;
-		}
-
-		return false;
+			TerminalChatController._promptHistory.unshift(prompt);
+			this._historyOffset = -1;
+			this._historyCandidate = '';
+			this._storageService.store(TerminalChatController._storageKey, JSON.stringify(TerminalChatController._promptHistory), StorageScope.PROFILE, StorageTarget.USER);
+		};
 	}
 
 	xtermReady(xterm: IXtermTerminal & { raw: RawXtermTerminal }): void {
-		this._chatWidget = new Lazy(() => {
-			const chatWidget = this._register(this._instantiationService.createInstance(TerminalChatWidget, this._instance.domElement!, this._instance, xterm));
+		this._terminalChatWidget = new Lazy(() => {
+			const chatWidget = this._register(this._instantiationService.createInstance(TerminalChatWidget, this._ctx.instance.domElement!, this._ctx.instance, xterm));
 			this._register(chatWidget.focusTracker.onDidFocus(() => {
-				TerminalChatController.activeChatWidget = this;
-				if (!isDetachedTerminalInstance(this._instance)) {
-					this._terminalService.setActiveInstance(this._instance);
+				TerminalChatController.activeChatController = this;
+				if (!isDetachedTerminalInstance(this._ctx.instance)) {
+					this._terminalService.setActiveInstance(this._ctx.instance);
 				}
 			}));
 			this._register(chatWidget.focusTracker.onDidBlur(() => {
-				TerminalChatController.activeChatWidget = undefined;
-				this._instance.resetScrollbarVisibility();
+				TerminalChatController.activeChatController = undefined;
+				this._ctx.instance.resetScrollbarVisibility();
 			}));
-			if (!this._instance.domElement) {
+			if (!this._ctx.instance.domElement) {
 				throw new Error('FindWidget expected terminal DOM to be initialized');
 			}
 			return chatWidget;
 		});
 	}
 
-	acceptFeedback(helpful?: boolean): void {
-		const model = this._model.value;
-		if (!this._currentRequest || !model) {
-			return;
-		}
-		let action: ChatUserAction;
-		if (helpful === undefined) {
-			action = { kind: 'bug' };
-		} else {
-			this._sessionResponseVoteContextKey.set(helpful ? 'up' : 'down');
-			action = { kind: 'vote', direction: helpful ? ChatAgentVoteDirection.Up : ChatAgentVoteDirection.Down };
-		}
-		// TODO:extract into helper method
-		for (const request of model.getRequests()) {
-			if (request.response?.response.value || request.response?.result) {
-				this._chatService.notifyUserAction({
-					sessionId: request.session.sessionId,
-					requestId: request.id,
-					agentId: request.response?.agent?.id,
-					result: request.response?.result,
-					action
-				});
-			}
-		}
-		this._chatWidget?.value.inlineChatWidget.updateStatus('Thank you for your feedback!', { resetAfter: 1250 });
-	}
+	private async _createSession(): Promise<void> {
+		this._sessionCtor = createCancelablePromise<void>(async token => {
+			if (!this._model.value) {
+				this._model.value = this._chatService.startSession(ChatAgentLocation.Terminal, token);
 
-	cancel(): void {
-		if (this._currentRequest) {
-			this._model.value?.cancelRequest(this._currentRequest);
-		}
-		this._requestActiveContextKey.set(false);
-		this._chatWidget?.value.inlineChatWidget.updateProgress(false);
-		this._chatWidget?.value.inlineChatWidget.updateInfo('');
-		this._chatWidget?.value.inlineChatWidget.updateToolbar(true);
+				if (!this._model.value) {
+					throw new Error('Failed to start chat session');
+				}
+			}
+		});
+		this._register(toDisposable(() => this._sessionCtor?.cancel()));
 	}
 
 	private _forcedPlaceholder: string | undefined = undefined;
 
 	private _updatePlaceholder(): void {
-		const inlineChatWidget = this._chatWidget?.value.inlineChatWidget;
+		const inlineChatWidget = this._terminalChatWidget?.value.inlineChatWidget;
 		if (inlineChatWidget) {
 			inlineChatWidget.placeholder = this._getPlaceholderText();
 		}
@@ -239,116 +198,68 @@ export class TerminalChatController extends Disposable implements ITerminalContr
 	}
 
 	clear(): void {
-		if (this._currentRequest) {
-			this._model.value?.cancelRequest(this._currentRequest);
-		}
+		this.cancel();
 		this._model.clear();
-		this._chatWidget?.rawValue?.hide();
-		this._chatWidget?.rawValue?.setValue(undefined);
 		this._responseContainsCodeBlockContextKey.reset();
-		this._sessionResponseVoteContextKey.reset();
 		this._requestActiveContextKey.reset();
+		this._terminalChatWidget?.value.hide();
+		this._terminalChatWidget?.value.setValue(undefined);
 	}
 
-	async acceptInput(): Promise<IChatResponseModel | undefined> {
+	async acceptInput(isVoiceInput?: boolean): Promise<IChatResponseModel | undefined> {
+		assertType(this._terminalChatWidget);
 		if (!this._model.value) {
-			this._model.value = this._chatService.startSession(ChatAgentLocation.Terminal, CancellationToken.None);
-			if (!this._model.value) {
-				throw new Error('Could not start chat session');
-			}
+			await this.reveal();
 		}
-		this._messages.fire(Message.ACCEPT_INPUT);
-		const model = this._model.value;
-
-		this._lastInput = this._chatWidget?.value?.input();
-		if (!this._lastInput) {
+		assertType(this._model.value);
+		const lastInput = this._terminalChatWidget.value.inlineChatWidget.value;
+		if (!lastInput) {
 			return;
 		}
-
-		const responseCreated = new DeferredPromise<IChatResponseModel>();
-		let responseCreatedComplete = false;
-		const completeResponseCreated = () => {
-			if (!responseCreatedComplete && this._currentRequest?.response) {
-				responseCreated.complete(this._currentRequest.response);
-				responseCreatedComplete = true;
-			}
-		};
-
-		const accessibilityRequestId = this._chatAccessibilityService.acceptRequest();
+		const model = this._model.value;
+		this._terminalChatWidget.value.inlineChatWidget.setChatModel(model);
+		this._historyUpdate(lastInput);
+		this._activeRequestCts?.cancel();
+		this._activeRequestCts = new CancellationTokenSource();
+		const store = new DisposableStore();
 		this._requestActiveContextKey.set(true);
-		const cancellationToken = new CancellationTokenSource().token;
 		let responseContent = '';
-		const progressCallback = (progress: IChatProgress) => {
-			if (cancellationToken.isCancellationRequested) {
-				return;
-			}
-
-			if (progress.kind === 'markdownContent') {
-				responseContent += progress.content.value;
-			}
-			if (this._currentRequest) {
-				model.acceptResponseProgress(this._currentRequest, progress);
-				completeResponseCreated();
-			}
-		};
-
-		await model.waitForInitialization();
-		this._chatWidget?.value.addToHistory(this._lastInput);
-		const request: IParsedChatRequest = {
-			text: this._lastInput,
-			parts: []
-		};
-		const requestVarData: IChatRequestVariableData = {
-			variables: []
-		};
-		this._currentRequest = model.addRequest(request, requestVarData, 0);
-		completeResponseCreated();
-		const requestProps: IChatAgentRequest = {
-			sessionId: model.sessionId,
-			requestId: this._currentRequest!.id,
-			agentId: this._terminalAgentId!,
-			message: this._lastInput,
-			variables: { variables: [] },
-			location: ChatAgentLocation.Terminal
-		};
+		const response = await this._terminalChatWidget.value.inlineChatWidget.chatWidget.acceptInput(lastInput, isVoiceInput);
+		this._currentRequestId = response?.requestId;
+		const responsePromise = new DeferredPromise<IChatResponseModel | undefined>();
 		try {
-			const task = this._chatAgentService.invokeAgent(this._terminalAgentId!, requestProps, progressCallback, getHistoryEntriesFromModel(model, this._terminalAgentId!), cancellationToken);
-			this._chatWidget?.value.inlineChatWidget.updateChatMessage(undefined);
-			this._chatWidget?.value.inlineChatWidget.updateProgress(true);
-			this._chatWidget?.value.inlineChatWidget.updateInfo(GeneratingPhrase + '\u2026');
-			await task;
-		} catch (e) {
-
+			this._requestActiveContextKey.set(true);
+			if (response) {
+				store.add(response.onDidChange(async () => {
+					responseContent += response.response.value;
+					if (response.isCanceled) {
+						this._requestActiveContextKey.set(false);
+						responsePromise.complete(undefined);
+						return;
+					}
+					if (response.isComplete) {
+						this._requestActiveContextKey.set(false);
+						this._requestActiveContextKey.set(false);
+						const firstCodeBlock = await this.terminalChatWidget?.inlineChatWidget.getCodeBlockInfo(0);
+						const secondCodeBlock = await this.terminalChatWidget?.inlineChatWidget.getCodeBlockInfo(1);
+						this._responseContainsCodeBlockContextKey.set(!!firstCodeBlock);
+						this._responseContainsMulitpleCodeBlocksContextKey.set(!!secondCodeBlock);
+						this._terminalChatWidget?.value.inlineChatWidget.updateToolbar(true);
+						responsePromise.complete(response);
+					}
+				}));
+			}
+			await responsePromise.p;
+			return response;
+		} catch {
+			return;
 		} finally {
-			this._requestActiveContextKey.set(false);
-			this._chatWidget?.value.inlineChatWidget.updateProgress(false);
-			this._chatWidget?.value.inlineChatWidget.updateInfo('');
-			this._chatWidget?.value.inlineChatWidget.updateToolbar(true);
-			if (this._currentRequest) {
-				model.completeResponse(this._currentRequest);
-				completeResponseCreated();
-			}
-			this._lastResponseContent = responseContent;
-			if (this._currentRequest) {
-				this._chatAccessibilityService.acceptResponse(responseContent, accessibilityRequestId);
-				const containsCode = responseContent.includes('```');
-				this._chatWidget?.value.inlineChatWidget.updateChatMessage({ message: new MarkdownString(responseContent), requestId: this._currentRequest.id }, false, containsCode);
-				const firstCodeBlock = await this.chatWidget?.inlineChatWidget.getCodeBlockInfo(0);
-				const secondCodeBlock = await this.chatWidget?.inlineChatWidget.getCodeBlockInfo(1);
-				this._responseContainsCodeBlockContextKey.set(!!firstCodeBlock);
-				this._responseContainsMulitpleCodeBlocksContextKey.set(!!secondCodeBlock);
-				this._chatWidget?.value.inlineChatWidget.updateToolbar(true);
-			}
-			const supportIssueReporting = this._currentRequest?.response?.agent?.metadata?.supportIssueReporting;
-			if (supportIssueReporting !== undefined) {
-				this._responseSupportsIssueReportingContextKey.set(supportIssueReporting);
-			}
+			store.dispose();
 		}
-		return responseCreated.p;
 	}
 
 	updateInput(text: string, selectAll = true): void {
-		const widget = this._chatWidget?.value.inlineChatWidget;
+		const widget = this._terminalChatWidget?.value.inlineChatWidget;
 		if (widget) {
 			widget.value = text;
 			if (selectAll) {
@@ -358,37 +269,87 @@ export class TerminalChatController extends Disposable implements ITerminalContr
 	}
 
 	getInput(): string {
-		return this._chatWidget?.value.input() ?? '';
+		return this._terminalChatWidget?.value.input() ?? '';
 	}
 
 	focus(): void {
-		this._chatWidget?.value.focus();
+		this._terminalChatWidget?.value.focus();
 	}
 
 	hasFocus(): boolean {
-		return !!this._chatWidget?.rawValue?.hasFocus() ?? false;
+		return this._terminalChatWidget?.rawValue?.hasFocus() ?? false;
+	}
+
+	populateHistory(up: boolean) {
+		if (!this._terminalChatWidget?.value) {
+			return;
+		}
+
+		const len = TerminalChatController._promptHistory.length;
+		if (len === 0) {
+			return;
+		}
+
+		if (this._historyOffset === -1) {
+			// remember the current value
+			this._historyCandidate = this._terminalChatWidget.value.inlineChatWidget.value;
+		}
+
+		const newIdx = this._historyOffset + (up ? 1 : -1);
+		if (newIdx >= len) {
+			// reached the end
+			return;
+		}
+
+		let entry: string;
+		if (newIdx < 0) {
+			entry = this._historyCandidate;
+			this._historyOffset = -1;
+		} else {
+			entry = TerminalChatController._promptHistory[newIdx];
+			this._historyOffset = newIdx;
+		}
+
+		this._terminalChatWidget.value.inlineChatWidget.value = entry;
+		this._terminalChatWidget.value.inlineChatWidget.selectAll();
+	}
+
+	cancel(): void {
+		this._sessionCtor?.cancel();
+		this._sessionCtor = undefined;
+		this._activeRequestCts?.cancel();
+		this._requestActiveContextKey.set(false);
+		const model = this._terminalChatWidget?.value.inlineChatWidget.getChatModel();
+		if (!model?.sessionId) {
+			return;
+		}
+		this._chatService.cancelCurrentRequestForSession(model?.sessionId);
 	}
 
 	async acceptCommand(shouldExecute: boolean): Promise<void> {
-		const code = await this.chatWidget?.inlineChatWidget.getCodeBlockInfo(0);
+		const code = await this.terminalChatWidget?.inlineChatWidget.getCodeBlockInfo(0);
 		if (!code) {
 			return;
 		}
-		this._chatWidget?.value.acceptCommand(code.textEditorModel.getValue(), shouldExecute);
+		this._terminalChatWidget?.value.acceptCommand(code.textEditorModel.getValue(), shouldExecute);
 	}
 
-	reveal(): void {
-		this._chatWidget?.value.reveal();
+	async reveal(): Promise<void> {
+		await this._createSession();
+		this._terminalChatWidget?.value.reveal();
+		this._terminalChatWidget?.value.focus();
 	}
 
 	async viewInChat(): Promise<void> {
+		//TODO: is this necessary? better way?
 		const widget = await showChatView(this._viewsService);
-		const request = this._currentRequest;
-		if (!widget || !request?.response) {
+		const currentRequest = this.terminalChatWidget?.inlineChatWidget.chatWidget.viewModel?.model.getRequests().find(r => r.id === this._currentRequestId);
+		if (!widget || !currentRequest?.response) {
 			return;
 		}
+
 		const message: IChatProgress[] = [];
-		for (const item of request.response.response.value) {
+		for (const item of currentRequest.response.response.value) {
 			if (item.kind === 'textEditGroup') {
 				for (const group of item.edits) {
 					message.push({
@@ -404,24 +365,15 @@ export class TerminalChatController extends Disposable implements ITerminalContr
 
 		this._chatService.addCompleteRequest(widget!.viewModel!.sessionId,
 			// DEBT: Add hardcoded agent name until its removed
-			`@${this._terminalAgentName} ${request.message.text}`,
-			request.variableData,
-			request.attempt,
+			`@${this._terminalAgentName} ${currentRequest.message.text}`,
+			currentRequest.variableData,
+			currentRequest.attempt,
 			{
 				message,
-				result: request.response!.result,
-				followups: request.response!.followups
+				result: currentRequest.response!.result,
+				followups: currentRequest.response!.followups
 			});
 		widget.focusLastMessage();
-		this._chatWidget?.rawValue?.hide();
-	}
-
-	// TODO: Move to register calls, don't override
-	override dispose() {
-		if (this._currentRequest) {
-			this._model.value?.cancelRequest(this._currentRequest);
-		}
-		super.dispose();
-		this.clear();
+		this._terminalChatWidget?.rawValue?.hide();
 	}
 }
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatEnabler.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatEnabler.ts
new file mode 100644
index 00000000000..f1a92b2981b
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatEnabler.ts
@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { IContextKey, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IChatAgentService, ChatAgentLocation } from '../../../chat/common/chatAgents.js';
+import { TerminalChatContextKeys } from './terminalChat.js';
+
+
+export class TerminalChatEnabler {
+
+	static Id = 'terminalChat.enabler';
+
+	private readonly _ctxHasProvider: IContextKey<boolean>;
+
+	private readonly _store = new DisposableStore();
+
+	constructor(
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IChatAgentService chatAgentService: IChatAgentService
+	) {
+		this._ctxHasProvider = TerminalChatContextKeys.hasChatAgent.bindTo(contextKeyService);
+		this._store.add(chatAgentService.onDidChangeAgents(() => {
+			const hasTerminalAgent = Boolean(chatAgentService.getDefaultAgent(ChatAgentLocation.Terminal));
+			this._ctxHasProvider.set(hasTerminalAgent);
+		}));
+	}
+
+	dispose() {
+		this._ctxHasProvider.reset();
+		this._store.dispose();
+	}
+}
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.ts
index 8b9aedb6bc9..6aac826a903 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.ts
@@ -4,23 +4,24 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type { Terminal as RawXtermTerminal } from '@xterm/xterm';
-import { Dimension, getActiveWindow, IFocusTracker, trackFocus } from 'vs/base/browser/dom';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { MicrotaskDelay } from 'vs/base/common/symbols';
-import 'vs/css!./media/terminalChatWidget';
-import { localize } from 'vs/nls';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ChatAgentLocation } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { IChatProgress } from 'vs/workbench/contrib/chat/common/chatService';
-import { InlineChatWidget } from 'vs/workbench/contrib/inlineChat/browser/inlineChatWidget';
-import { ITerminalInstance, type IXtermTerminal } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { MENU_TERMINAL_CHAT_INPUT, MENU_TERMINAL_CHAT_WIDGET, MENU_TERMINAL_CHAT_WIDGET_FEEDBACK, MENU_TERMINAL_CHAT_WIDGET_STATUS, TerminalChatCommandId, TerminalChatContextKeys } from 'vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
-import { TerminalStickyScrollContribution } from 'vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollContribution';
+import { Dimension, getActiveWindow, IFocusTracker, trackFocus } from '../../../../../base/browser/dom.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { Disposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { MicrotaskDelay } from '../../../../../base/common/symbols.js';
+import './media/terminalChatWidget.css';
+import { localize } from '../../../../../nls.js';
+import { IContextKey, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ChatAgentLocation } from '../../../chat/common/chatAgents.js';
+import { InlineChatWidget } from '../../../inlineChat/browser/inlineChatWidget.js';
+import { ITerminalInstance, type IXtermTerminal } from '../../../terminal/browser/terminal.js';
+import { MENU_TERMINAL_CHAT_INPUT, MENU_TERMINAL_CHAT_WIDGET, MENU_TERMINAL_CHAT_WIDGET_STATUS, TerminalChatCommandId, TerminalChatContextKeys } from './terminalChat.js';
+import { TerminalStickyScrollContribution } from '../../stickyScroll/browser/terminalStickyScrollContribution.js';
+import { MENU_INLINE_CHAT_WIDGET_SECONDARY } from '../../../inlineChat/common/inlineChat.js';
 
 const enum Constants {
-	HorizontalMargin = 10
+	HorizontalMargin = 10,
+	VerticalMargin = 30
 }
 
 export class TerminalChatWidget extends Disposable {
@@ -56,10 +57,14 @@ export class TerminalChatWidget extends Disposable {
 
 		this._inlineChatWidget = this._instantiationService.createInstance(
 			InlineChatWidget,
-			ChatAgentLocation.Terminal,
 			{
-				inputMenuId: MENU_TERMINAL_CHAT_INPUT,
-				widgetMenuId: MENU_TERMINAL_CHAT_WIDGET,
+				location: ChatAgentLocation.Terminal,
+				resolveData: () => {
+					// TODO@meganrogge return something that identifies this terminal
+					return undefined;
+				}
+			},
+			{
 				statusMenuId: {
 					menu: MENU_TERMINAL_CHAT_WIDGET_STATUS,
 					options: {
@@ -72,14 +77,21 @@ export class TerminalChatWidget extends Disposable {
 						}
 					}
 				},
-				feedbackMenuId: MENU_TERMINAL_CHAT_WIDGET_FEEDBACK,
-				telemetrySource: 'terminal-inline-chat',
-				rendererOptions: { editableCodeBlock: true }
+				secondaryMenuId: MENU_INLINE_CHAT_WIDGET_SECONDARY,
+				chatWidgetViewOptions: {
+					rendererOptions: { editableCodeBlock: true },
+					menus: {
+						telemetrySource: 'terminal-inline-chat',
+						executeToolbar: MENU_TERMINAL_CHAT_INPUT,
+						inputSideToolbar: MENU_TERMINAL_CHAT_WIDGET,
+					}
+				}
 			}
 		);
 		this._register(Event.any(
 			this._inlineChatWidget.onDidChangeHeight,
 			this._instance.onDimensionsChanged,
+			this._inlineChatWidget.chatWidget.onDidChangeContentHeight,
 			Event.debounce(this._xterm.raw.onCursorMove, () => void 0, MicrotaskDelay),
 		)(() => this._relayout()));
 
@@ -91,11 +103,9 @@ export class TerminalChatWidget extends Disposable {
 		this._container.appendChild(this._inlineChatWidget.domNode);
 
 		this._focusTracker = this._register(trackFocus(this._container));
-		this._register(this._focusTracker.onDidBlur(() => {
-			if (!this.inlineChatWidget.responseContent) {
-				this.hide();
-			}
-		}));
+		this._register(this._focusTracker.onDidFocus(() => this._focusedContextKey.set(true)));
+		this._register(this._focusTracker.onDidBlur(() => this._focusedContextKey.set(false)));
+
 		this.hide();
 	}
 
@@ -115,15 +125,26 @@ export class TerminalChatWidget extends Disposable {
 		const style = getActiveWindow().getComputedStyle(xtermElement);
 		const xtermPadding = parseInt(style.paddingLeft) + parseInt(style.paddingRight);
 		const width = Math.min(640, xtermElement.clientWidth - 12/* padding */ - 2/* border */ - Constants.HorizontalMargin - xtermPadding);
-		const height = Math.min(480, heightInPixel, this._getTerminalWrapperHeight() ?? Number.MAX_SAFE_INTEGER);
+		const terminalWrapperHeight = this._getTerminalWrapperHeight() ?? Number.MAX_SAFE_INTEGER;
+		let height = Math.min(480, heightInPixel, terminalWrapperHeight);
+		const top = this._getTop() ?? 0;
 		if (width === 0 || height === 0) {
 			return;
 		}
+
+		let adjustedHeight = undefined;
+		if (height < this._inlineChatWidget.contentHeight) {
+			if (height - top > 0) {
+				height = height - top - Constants.VerticalMargin;
+			} else {
+				height = height - Constants.VerticalMargin;
+				adjustedHeight = height;
+			}
+		}
 		this._container.style.paddingLeft = style.paddingLeft;
 		this._dimension = new Dimension(width, height);
 		this._inlineChatWidget.layout(this._dimension);
-
-		this._updateVerticalPosition();
+		this._updateVerticalPosition(adjustedHeight);
 	}
 
 	private _reset() {
@@ -134,13 +155,12 @@ export class TerminalChatWidget extends Disposable {
 	reveal(): void {
 		this._doLayout(this._inlineChatWidget.contentHeight);
 		this._container.classList.remove('hide');
-		this._focusedContextKey.set(true);
 		this._visibleContextKey.set(true);
 		this._inlineChatWidget.focus();
 		this._instance.scrollToBottom();
 	}
 
-	private _updateVerticalPosition(): void {
+	private _getTop(): number | undefined {
 		const font = this._instance.xterm?.getFont();
 		if (!font?.charHeight) {
 			return;
@@ -149,14 +169,24 @@ export class TerminalChatWidget extends Disposable {
 		const cellHeight = font.charHeight * font.lineHeight;
 		const topPadding = terminalWrapperHeight - (this._instance.rows * cellHeight);
 		const cursorY = (this._instance.xterm?.raw.buffer.active.cursorY ?? 0) + 1;
-		const top = topPadding + cursorY * cellHeight;
+		return topPadding + cursorY * cellHeight;
+	}
+
+	private _updateVerticalPosition(adjustedHeight?: number): void {
+		const top = this._getTop();
+		if (!top) {
+			return;
+		}
 		this._container.style.top = `${top}px`;
 		const widgetHeight = this._inlineChatWidget.contentHeight;
+		const terminalWrapperHeight = this._getTerminalWrapperHeight();
 		if (!terminalWrapperHeight) {
 			return;
 		}
-		if (top > terminalWrapperHeight - widgetHeight) {
+		if (top > terminalWrapperHeight - widgetHeight && terminalWrapperHeight - widgetHeight > 0) {
 			this._setTerminalOffset(top - (terminalWrapperHeight - widgetHeight));
+		} else if (adjustedHeight) {
+			this._setTerminalOffset(adjustedHeight);
 		} else {
 			this._setTerminalOffset(undefined);
 		}
@@ -168,12 +198,9 @@ export class TerminalChatWidget extends Disposable {
 
 	hide(): void {
 		this._container.classList.add('hide');
-		this._reset();
-		this._inlineChatWidget.updateChatMessage(undefined);
-		this._inlineChatWidget.updateProgress(false);
-		this._inlineChatWidget.updateToolbar(false);
 		this._inlineChatWidget.reset();
-		this._focusedContextKey.set(false);
+		this._reset();
+		this._inlineChatWidget.updateToolbar(false);
 		this._visibleContextKey.set(false);
 		this._inlineChatWidget.value = '';
 		this._instance.focus();
@@ -200,12 +227,6 @@ export class TerminalChatWidget extends Disposable {
 	input(): string {
 		return this._inlineChatWidget.value;
 	}
-	addToHistory(input: string): void {
-		this._inlineChatWidget.addToHistory(input);
-		this._inlineChatWidget.saveState();
-		this._inlineChatWidget.value = input;
-		this._inlineChatWidget.selectAll(true);
-	}
 	setValue(value?: string) {
 		this._inlineChatWidget.value = value ?? '';
 	}
@@ -213,10 +234,6 @@ export class TerminalChatWidget extends Disposable {
 		this._instance.runCommand(code, shouldExecute);
 		this.hide();
 	}
-
-	updateProgress(progress?: IChatProgress): void {
-		this._inlineChatWidget.updateProgress(progress?.kind === 'markdownContent');
-	}
 	public get focusTracker(): IFocusTracker {
 		return this._focusTracker;
 	}
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/common/terminalInitialHintConfiguration.ts b/src/vs/workbench/contrib/terminalContrib/chat/common/terminalInitialHintConfiguration.ts
index 711ebbb18fe..4823f419f2b 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/common/terminalInitialHintConfiguration.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chat/common/terminalInitialHintConfiguration.ts
@@ -3,10 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IStringDictionary } from 'vs/base/common/collections';
-import { localize } from 'vs/nls';
-import { IConfigurationPropertySchema } from 'vs/platform/configuration/common/configurationRegistry';
-import product from 'vs/platform/product/common/product';
+import { IStringDictionary } from '../../../../../base/common/collections.js';
+import { localize } from '../../../../../nls.js';
+import { IConfigurationPropertySchema } from '../../../../../platform/configuration/common/configurationRegistry.js';
 
 export const enum TerminalInitialHintSettingId {
 	Enabled = 'terminal.integrated.initialHint'
@@ -17,6 +16,6 @@ export const terminalInitialHintConfiguration: IStringDictionary<IConfigurationP
 		restricted: true,
 		markdownDescription: localize('terminal.integrated.initialHint', "Controls if the first terminal without input will show a hint about available actions when it is focused."),
 		type: 'boolean',
-		default: product.quality !== 'stable'
+		default: true
 	}
 };
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/test/browser/terminalInitialHint.test.ts b/src/vs/workbench/contrib/terminalContrib/chat/test/browser/terminalInitialHint.test.ts
index d3a1a8a0b11..afd3be536a5 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/test/browser/terminalInitialHint.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chat/test/browser/terminalInitialHint.test.ts
@@ -2,18 +2,19 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-// eslint-disable-next-line local/code-import-patterns, local/code-amd-node-module
-import { Terminal } from '@xterm/xterm';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ShellIntegrationAddon } from 'vs/platform/terminal/common/xterm/shellIntegrationAddon';
-import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { InitialHintAddon } from 'vs/workbench/contrib/terminalContrib/chat/browser/terminal.initialHint.contribution';
-import { getActiveDocument } from 'vs/base/browser/dom';
-import { Emitter } from 'vs/base/common/event';
+
+import type { Terminal } from '@xterm/xterm';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { ShellIntegrationAddon } from '../../../../../../platform/terminal/common/xterm/shellIntegrationAddon.js';
+import { workbenchInstantiationService } from '../../../../../test/browser/workbenchTestServices.js';
+import { NullLogService } from '../../../../../../platform/log/common/log.js';
+import { InitialHintAddon } from '../../browser/terminal.initialHint.contribution.js';
+import { getActiveDocument } from '../../../../../../base/browser/dom.js';
+import { Emitter } from '../../../../../../base/common/event.js';
 import { strictEqual } from 'assert';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { ChatAgentLocation, IChatAgent } from 'vs/workbench/contrib/chat/common/chatAgents';
+import { ExtensionIdentifier } from '../../../../../../platform/extensions/common/extensions.js';
+import { ChatAgentLocation, IChatAgent } from '../../../../chat/common/chatAgents.js';
+import { importAMDNodeModule } from '../../../../../../amdX.js';
 
 // Test TerminalInitialHintAddon
 
@@ -32,6 +33,7 @@ suite('Terminal Initial Hint Addon', () => {
 		extensionDisplayName: 'test',
 		metadata: {},
 		slashCommands: [{ name: 'test', description: 'test' }],
+		disambiguation: [],
 		locations: [ChatAgentLocation.fromRaw('terminal')],
 		invoke: async () => { return {}; }
 	};
@@ -44,11 +46,13 @@ suite('Terminal Initial Hint Addon', () => {
 		metadata: {},
 		slashCommands: [{ name: 'test', description: 'test' }],
 		locations: [ChatAgentLocation.fromRaw('editor')],
+		disambiguation: [],
 		invoke: async () => { return {}; }
 	};
-	setup(() => {
+	setup(async () => {
 		const instantiationService = workbenchInstantiationService({}, store);
-		xterm = store.add(new Terminal());
+		const TerminalCtor = (await importAMDNodeModule<typeof import('@xterm/xterm')>('@xterm/xterm', 'lib/xterm.js')).Terminal;
+		xterm = store.add(new TerminalCtor());
 		const shellIntegrationAddon = store.add(new ShellIntegrationAddon('', true, undefined, new NullLogService));
 		initialHintAddon = store.add(instantiationService.createInstance(InitialHintAddon, shellIntegrationAddon.capabilities, onDidChangeAgents));
 		store.add(initialHintAddon.onDidRequestCreateHint(() => eventCount++));
diff --git a/src/vs/workbench/contrib/terminalContrib/commandGuide/browser/terminal.commandGuide.contribution.ts b/src/vs/workbench/contrib/terminalContrib/commandGuide/browser/terminal.commandGuide.contribution.ts
new file mode 100644
index 00000000000..d3ad00e0016
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/commandGuide/browser/terminal.commandGuide.contribution.ts
@@ -0,0 +1,98 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import type { Terminal as RawXtermTerminal } from '@xterm/xterm';
+import { addDisposableListener } from '../../../../../base/browser/dom.js';
+import { combinedDisposable, Disposable, MutableDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { localize } from '../../../../../nls.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { TerminalCapability } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
+import { listInactiveSelectionBackground } from '../../../../../platform/theme/common/colorRegistry.js';
+import { registerColor, transparent } from '../../../../../platform/theme/common/colorUtils.js';
+import { PANEL_BORDER } from '../../../../common/theme.js';
+import { IDetachedTerminalInstance, ITerminalContribution, ITerminalInstance, IXtermTerminal } from '../../../terminal/browser/terminal.js';
+import { registerTerminalContribution, type IDetachedCompatibleTerminalContributionContext, type ITerminalContributionContext } from '../../../terminal/browser/terminalExtensions.js';
+import { terminalCommandGuideConfigSection, TerminalCommandGuideSettingId, type ITerminalCommandGuideConfiguration } from '../common/terminalCommandGuideConfiguration.js';
+
+// #region Terminal Contributions
+
+class TerminalCommandGuideContribution extends Disposable implements ITerminalContribution {
+	static readonly ID = 'terminal.highlight';
+
+	static get(instance: ITerminalInstance | IDetachedTerminalInstance): TerminalCommandGuideContribution | null {
+		return instance.getContribution<TerminalCommandGuideContribution>(TerminalCommandGuideContribution.ID);
+	}
+
+	private _xterm: IXtermTerminal & { raw: RawXtermTerminal } | undefined;
+	private readonly _activeCommandGuide = this._register(new MutableDisposable());
+
+	constructor(
+		private readonly _ctx: ITerminalContributionContext | IDetachedCompatibleTerminalContributionContext,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+	) {
+		super();
+	}
+
+	xtermOpen(xterm: IXtermTerminal & { raw: RawXtermTerminal }): void {
+		this._xterm = xterm;
+		this._refreshActivatedState();
+		this._register(this._configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(TerminalCommandGuideSettingId.ShowCommandGuide)) {
+				this._refreshActivatedState();
+			}
+		}));
+	}
+
+	private _refreshActivatedState() {
+		const xterm = this._xterm;
+		if (!xterm) {
+			return;
+		}
+
+		const showCommandGuide = this._configurationService.getValue<ITerminalCommandGuideConfiguration>(terminalCommandGuideConfigSection).showCommandGuide;
+		if (!!this._activeCommandGuide.value === showCommandGuide) {
+			return;
+		}
+
+		if (!showCommandGuide) {
+			this._activeCommandGuide.clear();
+		} else {
+			const screenElement = xterm.raw.element!.querySelector('.xterm-screen')!;
+			const viewportElement = xterm.raw.element!.querySelector('.xterm-viewport')!;
+			this._activeCommandGuide.value = combinedDisposable(
+				addDisposableListener(screenElement, 'mousemove', (e: MouseEvent) => this._tryShowHighlight(screenElement, xterm, e)),
+				addDisposableListener(viewportElement, 'mousemove', (e: MouseEvent) => this._tryShowHighlight(screenElement, xterm, e)),
+				addDisposableListener(xterm.raw.element!, 'mouseout', () => xterm.markTracker.showCommandGuide(undefined)),
+				xterm.raw.onData(() => xterm.markTracker.showCommandGuide(undefined)),
+				toDisposable(() => xterm.markTracker.showCommandGuide(undefined)),
+			);
+		}
+	}
+
+	private _tryShowHighlight(element: Element, xterm: IXtermTerminal & { raw: RawXtermTerminal }, e: MouseEvent) {
+		const rect = element.getBoundingClientRect();
+		if (!rect) {
+			return;
+		}
+		const mouseCursorY = Math.floor((e.clientY - rect.top) / (rect.height / xterm.raw.rows));
+		const command = this._ctx.instance.capabilities.get(TerminalCapability.CommandDetection)?.getCommandForLine(xterm.raw.buffer.active.viewportY + mouseCursorY);
+		if (command && 'getOutput' in command) {
+			xterm.markTracker.showCommandGuide(command);
+		} else {
+			xterm.markTracker.showCommandGuide(undefined);
+		}
+	}
+}
+
+registerTerminalContribution(TerminalCommandGuideContribution.ID, TerminalCommandGuideContribution, false);
+
+export const TERMINAL_COMMAND_GUIDE_COLOR = registerColor('terminalCommandGuide.foreground', {
+	dark: transparent(listInactiveSelectionBackground, 1),
+	light: transparent(listInactiveSelectionBackground, 1),
+	hcDark: PANEL_BORDER,
+	hcLight: PANEL_BORDER
+}, localize('terminalCommandGuide.foreground', 'The foreground color of the terminal command guide that appears to the left of a command and its output on hover.'));
+
+// #endregion
diff --git a/src/vs/workbench/contrib/terminalContrib/commandGuide/common/terminalCommandGuideConfiguration.ts b/src/vs/workbench/contrib/terminalContrib/commandGuide/common/terminalCommandGuideConfiguration.ts
new file mode 100644
index 00000000000..b02e9033c2b
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/commandGuide/common/terminalCommandGuideConfiguration.ts
@@ -0,0 +1,27 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import type { IStringDictionary } from '../../../../../base/common/collections.js';
+import { localize } from '../../../../../nls.js';
+import type { IConfigurationPropertySchema } from '../../../../../platform/configuration/common/configurationRegistry.js';
+
+export const enum TerminalCommandGuideSettingId {
+	ShowCommandGuide = 'terminal.integrated.shellIntegration.showCommandGuide',
+}
+
+export const terminalCommandGuideConfigSection = 'terminal.integrated.shellIntegration';
+
+export interface ITerminalCommandGuideConfiguration {
+	showCommandGuide: boolean;
+}
+
+export const terminalCommandGuideConfiguration: IStringDictionary<IConfigurationPropertySchema> = {
+	[TerminalCommandGuideSettingId.ShowCommandGuide]: {
+		restricted: true,
+		markdownDescription: localize('showCommandGuide', "Whether to show the command guide when hovering over a command in the terminal."),
+		type: 'boolean',
+		default: true,
+	},
+};
diff --git a/src/vs/workbench/contrib/terminalContrib/developer/browser/media/developer.css b/src/vs/workbench/contrib/terminalContrib/developer/browser/media/developer.css
index fc05193d986..e8c34f9bdd7 100644
--- a/src/vs/workbench/contrib/terminalContrib/developer/browser/media/developer.css
+++ b/src/vs/workbench/contrib/terminalContrib/developer/browser/media/developer.css
@@ -5,10 +5,10 @@
 
 .monaco-workbench .xterm.dev-mode .xterm-sequence-decoration {
 	background-color: var(--vscode-terminal-background, var(--vscode-panel-background));
-	display: none !important;
+	visibility: hidden;
 }
 .monaco-workbench .xterm.dev-mode:hover .xterm-sequence-decoration {
-	display: block !important;
+	visibility: visible !important;
 }
 .monaco-workbench .xterm.dev-mode .xterm-sequence-decoration.left {
 	direction: rtl;
diff --git a/src/vs/workbench/contrib/terminalContrib/developer/browser/terminal.developer.contribution.ts b/src/vs/workbench/contrib/terminalContrib/developer/browser/terminal.developer.contribution.ts
index 2321f8edb96..df7a7917d7d 100644
--- a/src/vs/workbench/contrib/terminalContrib/developer/browser/terminal.developer.contribution.ts
+++ b/src/vs/workbench/contrib/terminalContrib/developer/browser/terminal.developer.contribution.ts
@@ -4,32 +4,30 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type { Terminal } from '@xterm/xterm';
-import { Delayer } from 'vs/base/common/async';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore, IDisposable, MutableDisposable, combinedDisposable, dispose } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import 'vs/css!./media/developer';
-import { localize, localize2 } from 'vs/nls';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { ITerminalCommand, TerminalCapability, type ICommandDetectionCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { ITerminalLogService, TerminalSettingId } from 'vs/platform/terminal/common/terminal';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IInternalXtermTerminal, ITerminalContribution, ITerminalInstance, IXtermTerminal } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { registerTerminalAction } from 'vs/workbench/contrib/terminal/browser/terminalActions';
-import { registerTerminalContribution } from 'vs/workbench/contrib/terminal/browser/terminalExtensions';
-import { TerminalWidgetManager } from 'vs/workbench/contrib/terminal/browser/widgets/widgetManager';
-import { ITerminalProcessManager } from 'vs/workbench/contrib/terminal/common/terminal';
-import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey';
-import { TerminalDeveloperCommandId } from 'vs/workbench/contrib/terminalContrib/developer/common/terminal.developer';
-import { IStatusbarService, StatusbarAlignment, type IStatusbarEntry, type IStatusbarEntryAccessor } from 'vs/workbench/services/statusbar/browser/statusbar';
+import { Delayer } from '../../../../../base/common/async.js';
+import { VSBuffer } from '../../../../../base/common/buffer.js';
+import { Event } from '../../../../../base/common/event.js';
+import { Disposable, DisposableMap, DisposableStore, IDisposable, MutableDisposable, combinedDisposable, dispose } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { localize, localize2 } from '../../../../../nls.js';
+import { Categories } from '../../../../../platform/action/common/actionCommonCategories.js';
+import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
+import { IQuickInputService } from '../../../../../platform/quickinput/common/quickInput.js';
+import { ITerminalCommand, TerminalCapability, type ICommandDetectionCapability } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
+import { ITerminalLogService, TerminalSettingId } from '../../../../../platform/terminal/common/terminal.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { IStatusbarService, StatusbarAlignment, type IStatusbarEntry, type IStatusbarEntryAccessor } from '../../../../services/statusbar/browser/statusbar.js';
+import { IInternalXtermTerminal, ITerminalContribution, ITerminalInstance, IXtermTerminal } from '../../../terminal/browser/terminal.js';
+import { registerTerminalAction } from '../../../terminal/browser/terminalActions.js';
+import { registerTerminalContribution, type ITerminalContributionContext } from '../../../terminal/browser/terminalExtensions.js';
+import { TerminalContextKeys } from '../../../terminal/common/terminalContextKey.js';
+import { TerminalDeveloperCommandId } from '../common/terminal.developer.js';
+import './media/developer.css';
 
 registerTerminalAction({
 	id: TerminalDeveloperCommandId.ShowTextureAtlas,
@@ -230,9 +228,7 @@ class DevModeContribution extends Disposable implements ITerminalContribution {
 	private readonly _statusbarEntryAccessor: MutableDisposable<IStatusbarEntryAccessor> = this._register(new MutableDisposable());
 
 	constructor(
-		private readonly _instance: ITerminalInstance,
-		processManager: ITerminalProcessManager,
-		widgetManager: TerminalWidgetManager,
+		private readonly _ctx: ITerminalContributionContext,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@IStatusbarService private readonly _statusbarService: IStatusbarService,
 	) {
@@ -253,68 +249,71 @@ class DevModeContribution extends Disposable implements ITerminalContribution {
 		const devMode: boolean = this._isEnabled();
 		this._xterm?.raw.element?.classList.toggle('dev-mode', devMode);
 
-		const commandDetection = this._instance.capabilities.get(TerminalCapability.CommandDetection);
+		const commandDetection = this._ctx.instance.capabilities.get(TerminalCapability.CommandDetection);
 		if (devMode) {
 			if (commandDetection) {
-				const commandDecorations = new Map<ITerminalCommand, IDisposable[]>();
+				const commandDecorations = new DisposableMap<ITerminalCommand, IDisposable>();
+				const otherDisposables = new DisposableStore();
 				this._activeDevModeDisposables.value = combinedDisposable(
+					commandDecorations,
+					otherDisposables,
 					// Prompt input
-					this._instance.onDidBlur(() => this._updateDevMode()),
-					this._instance.onDidFocus(() => this._updateDevMode()),
+					this._ctx.instance.onDidBlur(() => this._updateDevMode()),
+					this._ctx.instance.onDidFocus(() => this._updateDevMode()),
 					commandDetection.promptInputModel.onDidChangeInput(() => this._updateDevMode()),
 					// Sequence markers
 					commandDetection.onCommandFinished(command => {
 						const colorClass = `color-${this._currentColor}`;
 						const decorations: IDisposable[] = [];
-						commandDecorations.set(command, decorations);
+						commandDecorations.set(command, combinedDisposable(...decorations));
 						if (command.promptStartMarker) {
-							const d = this._instance.xterm!.raw?.registerDecoration({
+							const d = this._ctx.instance.xterm!.raw?.registerDecoration({
 								marker: command.promptStartMarker
 							});
 							if (d) {
 								decorations.push(d);
-								d.onRender(e => {
+								otherDisposables.add(d.onRender(e => {
 									e.textContent = 'A';
 									e.classList.add('xterm-sequence-decoration', 'top', 'left', colorClass);
-								});
+								}));
 							}
 						}
 						if (command.marker) {
-							const d = this._instance.xterm!.raw?.registerDecoration({
+							const d = this._ctx.instance.xterm!.raw?.registerDecoration({
 								marker: command.marker,
 								x: command.startX
 							});
 							if (d) {
 								decorations.push(d);
-								d.onRender(e => {
+								otherDisposables.add(d.onRender(e => {
 									e.textContent = 'B';
 									e.classList.add('xterm-sequence-decoration', 'top', 'right', colorClass);
-								});
+								}));
 							}
 						}
 						if (command.executedMarker) {
-							const d = this._instance.xterm!.raw?.registerDecoration({
+							const d = this._ctx.instance.xterm!.raw?.registerDecoration({
 								marker: command.executedMarker,
 								x: command.executedX
 							});
 							if (d) {
 								decorations.push(d);
-								d.onRender(e => {
+								otherDisposables.add(d.onRender(e => {
 									e.textContent = 'C';
 									e.classList.add('xterm-sequence-decoration', 'bottom', 'left', colorClass);
-								});
+								}));
 							}
 						}
 						if (command.endMarker) {
-							const d = this._instance.xterm!.raw?.registerDecoration({
+							const d = this._ctx.instance.xterm!.raw?.registerDecoration({
 								marker: command.endMarker
 							});
 							if (d) {
 								decorations.push(d);
-								d.onRender(e => {
+								otherDisposables.add(d.onRender(e => {
 									e.textContent = 'D';
 									e.classList.add('xterm-sequence-decoration', 'bottom', 'right', colorClass);
-								});
+								}));
 							}
 						}
 						this._currentColor = (this._currentColor + 1) % 2;
@@ -325,14 +324,14 @@ class DevModeContribution extends Disposable implements ITerminalContribution {
 							if (decorations) {
 								dispose(decorations);
 							}
-							commandDecorations.delete(c);
+							commandDecorations.deleteAndDispose(c);
 						}
 					})
 				);
 
 				this._updatePromptInputStatusBar(commandDetection);
 			} else {
-				this._activeDevModeDisposables.value = this._instance.capabilities.onDidAddCapabilityType(e => {
+				this._activeDevModeDisposables.value = this._ctx.instance.capabilities.onDidAddCapabilityType(e => {
 					if (e === TerminalCapability.CommandDetection) {
 						this._updateDevMode();
 					}
@@ -360,11 +359,11 @@ class DevModeContribution extends Disposable implements ITerminalContribution {
 				kind: 'prominent'
 			};
 			if (!this._statusbarEntryAccessor.value) {
-				this._statusbarEntryAccessor.value = this._statusbarService.addEntry(this._statusbarEntry, `terminal.promptInput.${this._instance.instanceId}`, StatusbarAlignment.LEFT);
+				this._statusbarEntryAccessor.value = this._statusbarService.addEntry(this._statusbarEntry, `terminal.promptInput.${this._ctx.instance.instanceId}`, StatusbarAlignment.LEFT);
 			} else {
 				this._statusbarEntryAccessor.value.update(this._statusbarEntry);
 			}
-			this._statusbarService.updateEntryVisibility(`terminal.promptInput.${this._instance.instanceId}`, this._instance.hasFocus);
+			this._statusbarService.updateEntryVisibility(`terminal.promptInput.${this._ctx.instance.instanceId}`, this._ctx.instance.hasFocus);
 		}
 	}
 }
diff --git a/src/vs/workbench/contrib/terminalContrib/environmentChanges/browser/terminal.environmentChanges.contribution.ts b/src/vs/workbench/contrib/terminalContrib/environmentChanges/browser/terminal.environmentChanges.contribution.ts
index faf67e93615..1a413fef1bf 100644
--- a/src/vs/workbench/contrib/terminalContrib/environmentChanges/browser/terminal.environmentChanges.contribution.ts
+++ b/src/vs/workbench/contrib/terminalContrib/environmentChanges/browser/terminal.environmentChanges.contribution.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { Event } from 'vs/base/common/event';
-import { ITextModel } from 'vs/editor/common/model';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ITextModelContentProvider, ITextModelService } from 'vs/editor/common/services/resolverService';
-import { localize, localize2 } from 'vs/nls';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { EnvironmentVariableMutatorType, EnvironmentVariableScope, IEnvironmentVariableMutator, IMergedEnvironmentVariableCollection } from 'vs/platform/terminal/common/environmentVariable';
-import { registerActiveInstanceAction } from 'vs/workbench/contrib/terminal/browser/terminalActions';
-import { TerminalCommandId } from 'vs/workbench/contrib/terminal/common/terminal';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { URI } from '../../../../../base/common/uri.js';
+import { Event } from '../../../../../base/common/event.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
+import { IModelService } from '../../../../../editor/common/services/model.js';
+import { ITextModelContentProvider, ITextModelService } from '../../../../../editor/common/services/resolverService.js';
+import { localize, localize2 } from '../../../../../nls.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { EnvironmentVariableMutatorType, EnvironmentVariableScope, IEnvironmentVariableMutator, IMergedEnvironmentVariableCollection } from '../../../../../platform/terminal/common/environmentVariable.js';
+import { registerActiveInstanceAction } from '../../../terminal/browser/terminalActions.js';
+import { TerminalCommandId } from '../../../terminal/common/terminal.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
 
 // TODO: The rest of the terminal environment changes feature should move here https://github.com/microsoft/vscode/issues/177241
 
diff --git a/src/vs/workbench/contrib/terminalContrib/find/browser/terminal.find.contribution.ts b/src/vs/workbench/contrib/terminalContrib/find/browser/terminal.find.contribution.ts
index c93f1236a78..32bfa9f7fa7 100644
--- a/src/vs/workbench/contrib/terminalContrib/find/browser/terminal.find.contribution.ts
+++ b/src/vs/workbench/contrib/terminalContrib/find/browser/terminal.find.contribution.ts
@@ -3,25 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDimension } from 'vs/base/browser/dom';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Lazy } from 'vs/base/common/lazy';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { localize2 } from 'vs/nls';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { findInFilesCommand } from 'vs/workbench/contrib/search/browser/searchActionsFind';
-import { IDetachedTerminalInstance, ITerminalContribution, ITerminalInstance, ITerminalService, IXtermTerminal, isDetachedTerminalInstance } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { registerActiveInstanceAction, registerActiveXtermAction } from 'vs/workbench/contrib/terminal/browser/terminalActions';
-import { registerTerminalContribution } from 'vs/workbench/contrib/terminal/browser/terminalExtensions';
-import { TerminalWidgetManager } from 'vs/workbench/contrib/terminal/browser/widgets/widgetManager';
-import { ITerminalProcessInfo, ITerminalProcessManager } from 'vs/workbench/contrib/terminal/common/terminal';
-import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey';
-import { TerminalFindWidget } from 'vs/workbench/contrib/terminalContrib/find/browser/terminalFindWidget';
 import type { Terminal as RawXtermTerminal } from '@xterm/xterm';
-import { TerminalFindCommandId } from 'vs/workbench/contrib/terminalContrib/find/common/terminal.find';
-import 'vs/css!./media/terminalFind';
+import { IDimension } from '../../../../../base/browser/dom.js';
+import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
+import { Lazy } from '../../../../../base/common/lazy.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { localize2 } from '../../../../../nls.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { findInFilesCommand } from '../../../search/browser/searchActionsFind.js';
+import { IDetachedTerminalInstance, ITerminalContribution, ITerminalInstance, ITerminalService, IXtermTerminal, isDetachedTerminalInstance } from '../../../terminal/browser/terminal.js';
+import { registerActiveInstanceAction, registerActiveXtermAction } from '../../../terminal/browser/terminalActions.js';
+import { registerTerminalContribution, type IDetachedCompatibleTerminalContributionContext, type ITerminalContributionContext } from '../../../terminal/browser/terminalExtensions.js';
+import { TerminalContextKeys } from '../../../terminal/common/terminalContextKey.js';
+import { TerminalFindCommandId } from '../common/terminal.find.js';
+import './media/terminalFind.css';
+import { TerminalFindWidget } from './terminalFindWidget.js';
 
 // #region Terminal Contributions
 
@@ -44,35 +42,33 @@ class TerminalFindContribution extends Disposable implements ITerminalContributi
 	get findWidget(): TerminalFindWidget { return this._findWidget.value; }
 
 	constructor(
-		private readonly _instance: ITerminalInstance | IDetachedTerminalInstance,
-		processManager: ITerminalProcessManager | ITerminalProcessInfo,
-		widgetManager: TerminalWidgetManager,
+		ctx: ITerminalContributionContext | IDetachedCompatibleTerminalContributionContext,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@ITerminalService terminalService: ITerminalService
 	) {
 		super();
 
 		this._findWidget = new Lazy(() => {
-			const findWidget = instantiationService.createInstance(TerminalFindWidget, this._instance);
+			const findWidget = instantiationService.createInstance(TerminalFindWidget, ctx.instance);
 
 			// Track focus and set state so we can force the scroll bar to be visible
 			findWidget.focusTracker.onDidFocus(() => {
 				TerminalFindContribution.activeFindWidget = this;
-				this._instance.forceScrollbarVisibility();
-				if (!isDetachedTerminalInstance(this._instance)) {
-					terminalService.setActiveInstance(this._instance);
+				ctx.instance.forceScrollbarVisibility();
+				if (!isDetachedTerminalInstance(ctx.instance)) {
+					terminalService.setActiveInstance(ctx.instance);
 				}
 			});
 			findWidget.focusTracker.onDidBlur(() => {
 				TerminalFindContribution.activeFindWidget = undefined;
-				this._instance.resetScrollbarVisibility();
+				ctx.instance.resetScrollbarVisibility();
 			});
 
-			if (!this._instance.domElement) {
+			if (!ctx.instance.domElement) {
 				throw new Error('FindWidget expected terminal DOM to be initialized');
 			}
 
-			this._instance.domElement?.appendChild(findWidget.getDomNode());
+			ctx.instance.domElement?.appendChild(findWidget.getDomNode());
 			if (this._lastLayoutDimensions) {
 				findWidget.layout(this._lastLayoutDimensions.width);
 			}
diff --git a/src/vs/workbench/contrib/terminalContrib/find/browser/terminalFindWidget.ts b/src/vs/workbench/contrib/terminalContrib/find/browser/terminalFindWidget.ts
index eec3455a765..e6cda9baf7e 100644
--- a/src/vs/workbench/contrib/terminalContrib/find/browser/terminalFindWidget.ts
+++ b/src/vs/workbench/contrib/terminalContrib/find/browser/terminalFindWidget.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { SimpleFindWidget } from 'vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget';
-import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IDetachedTerminalInstance, ITerminalInstance, IXtermTerminal, XtermTerminalConstants } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { Event } from 'vs/base/common/event';
+import * as dom from '../../../../../base/browser/dom.js';
+import { SimpleFindWidget } from '../../../codeEditor/browser/find/simpleFindWidget.js';
+import { IContextMenuService, IContextViewService } from '../../../../../platform/contextview/browser/contextView.js';
+import { IContextKeyService, IContextKey } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IDetachedTerminalInstance, ITerminalInstance, IXtermTerminal, XtermTerminalConstants } from '../../../terminal/browser/terminal.js';
+import { TerminalContextKeys } from '../../../terminal/common/terminalContextKey.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { Event } from '../../../../../base/common/event.js';
 import type { ISearchOptions } from '@xterm/addon-search';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { openContextMenu } from 'vs/workbench/contrib/terminalContrib/find/browser/textInputContextMenu';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { TerminalFindCommandId } from 'vs/workbench/contrib/terminalContrib/find/common/terminal.find';
+import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js';
+import { openContextMenu } from './textInputContextMenu.js';
+import { IDisposable } from '../../../../../base/common/lifecycle.js';
+import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
+import { TerminalFindCommandId } from '../common/terminal.find.js';
 
 const TERMINAL_FIND_WIDGET_INITIAL_WIDTH = 419;
 
diff --git a/src/vs/workbench/contrib/terminalContrib/find/browser/textInputContextMenu.ts b/src/vs/workbench/contrib/terminalContrib/find/browser/textInputContextMenu.ts
index d63dd7c113c..d0ba875c3a7 100644
--- a/src/vs/workbench/contrib/terminalContrib/find/browser/textInputContextMenu.ts
+++ b/src/vs/workbench/contrib/terminalContrib/find/browser/textInputContextMenu.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getActiveWindow, isHTMLInputElement, isHTMLTextAreaElement } from 'vs/base/browser/dom';
-import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { Action, IAction, Separator } from 'vs/base/common/actions';
-import { isNative } from 'vs/base/common/platform';
-import { localize } from 'vs/nls';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
+import { getActiveWindow, isHTMLInputElement, isHTMLTextAreaElement } from '../../../../../base/browser/dom.js';
+import { StandardMouseEvent } from '../../../../../base/browser/mouseEvent.js';
+import { Action, IAction, Separator } from '../../../../../base/common/actions.js';
+import { isNative } from '../../../../../base/common/platform.js';
+import { localize } from '../../../../../nls.js';
+import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js';
+import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
 
 export function openContextMenu(targetWindow: Window, event: MouseEvent, clipboardService: IClipboardService, contextMenuService: IContextMenuService): void {
 	const standardEvent = new StandardMouseEvent(targetWindow, event);
diff --git a/src/vs/workbench/contrib/terminalContrib/highlight/browser/terminal.highlight.contribution.ts b/src/vs/workbench/contrib/terminalContrib/highlight/browser/terminal.highlight.contribution.ts
deleted file mode 100644
index 2217fb1aed1..00000000000
--- a/src/vs/workbench/contrib/terminalContrib/highlight/browser/terminal.highlight.contribution.ts
+++ /dev/null
@@ -1,59 +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 type { Terminal as RawXtermTerminal } from '@xterm/xterm';
-import { addDisposableListener } from 'vs/base/browser/dom';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { IDetachedTerminalInstance, ITerminalContribution, ITerminalInstance, IXtermTerminal } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { registerTerminalContribution } from 'vs/workbench/contrib/terminal/browser/terminalExtensions';
-import { TerminalWidgetManager } from 'vs/workbench/contrib/terminal/browser/widgets/widgetManager';
-import { ITerminalProcessInfo, ITerminalProcessManager } from 'vs/workbench/contrib/terminal/common/terminal';
-
-// #region Terminal Contributions
-class TerminalHighlightContribution extends Disposable implements ITerminalContribution {
-	static readonly ID = 'terminal.highlight';
-
-	static get(instance: ITerminalInstance | IDetachedTerminalInstance): TerminalHighlightContribution | null {
-		return instance.getContribution<TerminalHighlightContribution>(TerminalHighlightContribution.ID);
-	}
-
-	constructor(
-		private readonly _instance: ITerminalInstance | IDetachedTerminalInstance,
-		processManager: ITerminalProcessManager | ITerminalProcessInfo,
-		widgetManager: TerminalWidgetManager,
-	) {
-		super();
-	}
-
-	xtermOpen(xterm: IXtermTerminal & { raw: RawXtermTerminal }): void {
-		const screenElement = xterm.raw.element!.querySelector('.xterm-screen')!;
-		this._register(addDisposableListener(screenElement, 'mousemove', (e: MouseEvent) => this._tryShowHighlight(screenElement, xterm, e)));
-
-		const viewportElement = xterm.raw.element!.querySelector('.xterm-viewport')!;
-		this._register(addDisposableListener(viewportElement, 'mousemove', (e: MouseEvent) => this._tryShowHighlight(screenElement, xterm, e)));
-
-		this._register(addDisposableListener(xterm.raw.element!, 'mouseout', () => xterm.markTracker.showCommandGuide(undefined)));
-		this._register(xterm.raw.onData(() => xterm.markTracker.showCommandGuide(undefined)));
-	}
-
-	private _tryShowHighlight(element: Element, xterm: IXtermTerminal & { raw: RawXtermTerminal }, e: MouseEvent) {
-		const rect = element.getBoundingClientRect();
-		if (!rect) {
-			return;
-		}
-		const mouseCursorY = Math.floor(e.offsetY / (rect.height / xterm.raw.rows));
-		const command = this._instance.capabilities.get(TerminalCapability.CommandDetection)?.getCommandForLine(xterm.raw.buffer.active.viewportY + mouseCursorY);
-		if (command && 'getOutput' in command) {
-			xterm.markTracker.showCommandGuide(command);
-		} else {
-			xterm.markTracker.showCommandGuide(undefined);
-		}
-	}
-}
-
-registerTerminalContribution(TerminalHighlightContribution.ID, TerminalHighlightContribution, false);
-
-// #endregion
diff --git a/src/vs/workbench/contrib/terminalContrib/history/browser/terminal.history.contribution.ts b/src/vs/workbench/contrib/terminalContrib/history/browser/terminal.history.contribution.ts
new file mode 100644
index 00000000000..8ca1555f49b
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/history/browser/terminal.history.contribution.ts
@@ -0,0 +1,155 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { localize2 } from '../../../../../nls.js';
+import { AccessibleViewProviderId } from '../../../../../platform/accessibility/browser/accessibleView.js';
+import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from '../../../../../platform/accessibility/common/accessibility.js';
+import { ContextKeyExpr, IContextKeyService, type IContextKey } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { TerminalCapability } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
+import { TerminalLocation } from '../../../../../platform/terminal/common/terminal.js';
+import { accessibleViewCurrentProviderId, accessibleViewIsShown } from '../../../accessibility/browser/accessibilityConfiguration.js';
+import type { ITerminalContribution, ITerminalInstance } from '../../../terminal/browser/terminal.js';
+import { registerActiveInstanceAction, registerTerminalAction } from '../../../terminal/browser/terminalActions.js';
+import { registerTerminalContribution, type ITerminalContributionContext } from '../../../terminal/browser/terminalExtensions.js';
+import { TerminalContextKeys } from '../../../terminal/common/terminalContextKey.js';
+import { clearShellFileHistory, getCommandHistory, getDirectoryHistory } from '../common/history.js';
+import { TerminalHistoryCommandId } from '../common/terminal.history.js';
+import { showRunRecentQuickPick } from './terminalRunRecentQuickPick.js';
+
+// #region Terminal Contributions
+
+class TerminalHistoryContribution extends Disposable implements ITerminalContribution {
+	static readonly ID = 'terminal.history';
+
+	static get(instance: ITerminalInstance): TerminalHistoryContribution | null {
+		return instance.getContribution<TerminalHistoryContribution>(TerminalHistoryContribution.ID);
+	}
+
+	private _terminalInRunCommandPicker: IContextKey<boolean>;
+
+	constructor(
+		private readonly _ctx: ITerminalContributionContext,
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+	) {
+		super();
+
+		this._terminalInRunCommandPicker = TerminalContextKeys.inTerminalRunCommandPicker.bindTo(this._contextKeyService);
+
+		this._register(_ctx.instance.capabilities.onDidAddCapabilityType(e => {
+			switch (e) {
+				case TerminalCapability.CwdDetection: {
+					_ctx.instance.capabilities.get(TerminalCapability.CwdDetection)?.onDidChangeCwd(e => {
+						this._instantiationService.invokeFunction(getDirectoryHistory)?.add(e, { remoteAuthority: _ctx.instance.remoteAuthority });
+					});
+					break;
+				}
+				case TerminalCapability.CommandDetection: {
+					_ctx.instance.capabilities.get(TerminalCapability.CommandDetection)?.onCommandFinished(e => {
+						if (e.command.trim().length > 0) {
+							this._instantiationService.invokeFunction(getCommandHistory)?.add(e.command, { shellType: _ctx.instance.shellType });
+						}
+					});
+					break;
+				}
+			}
+		}));
+	}
+
+	/**
+	 * Triggers a quick pick that displays recent commands or cwds. Selecting one will
+	 * rerun it in the active terminal.
+	 */
+	async runRecent(type: 'command' | 'cwd', filterMode?: 'fuzzy' | 'contiguous', value?: string): Promise<void> {
+		return this._instantiationService.invokeFunction(showRunRecentQuickPick,
+			this._ctx.instance,
+			this._terminalInRunCommandPicker,
+			type,
+			filterMode,
+			value
+		);
+	}
+}
+
+registerTerminalContribution(TerminalHistoryContribution.ID, TerminalHistoryContribution);
+
+// #endregion
+
+// #region Actions
+
+const precondition = ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated);
+
+registerTerminalAction({
+	id: TerminalHistoryCommandId.ClearPreviousSessionHistory,
+	title: localize2('workbench.action.terminal.clearPreviousSessionHistory', 'Clear Previous Session History'),
+	precondition,
+	run: async (c, accessor) => {
+		getCommandHistory(accessor).clear();
+		clearShellFileHistory();
+	}
+});
+
+registerActiveInstanceAction({
+	id: TerminalHistoryCommandId.GoToRecentDirectory,
+	title: localize2('workbench.action.terminal.goToRecentDirectory', 'Go to Recent Directory...'),
+	metadata: {
+		description: localize2('goToRecentDirectory.metadata', 'Goes to a recent folder'),
+	},
+	precondition,
+	keybinding: {
+		primary: KeyMod.CtrlCmd | KeyCode.KeyG,
+		when: TerminalContextKeys.focus,
+		weight: KeybindingWeight.WorkbenchContrib
+	},
+	run: async (activeInstance, c) => {
+		const history = TerminalHistoryContribution.get(activeInstance);
+		if (!history) {
+			return;
+		}
+		await history.runRecent('cwd');
+		if (activeInstance?.target === TerminalLocation.Editor) {
+			await c.editorService.revealActiveEditor();
+		} else {
+			await c.groupService.showPanel(false);
+		}
+	}
+});
+
+registerActiveInstanceAction({
+	id: TerminalHistoryCommandId.RunRecentCommand,
+	title: localize2('workbench.action.terminal.runRecentCommand', 'Run Recent Command...'),
+	precondition,
+	keybinding: [
+		{
+			primary: KeyMod.CtrlCmd | KeyCode.KeyR,
+			when: ContextKeyExpr.and(CONTEXT_ACCESSIBILITY_MODE_ENABLED, ContextKeyExpr.or(TerminalContextKeys.focus, ContextKeyExpr.and(accessibleViewIsShown, accessibleViewCurrentProviderId.isEqualTo(AccessibleViewProviderId.Terminal)))),
+			weight: KeybindingWeight.WorkbenchContrib
+		},
+		{
+			primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyR,
+			mac: { primary: KeyMod.WinCtrl | KeyMod.Alt | KeyCode.KeyR },
+			when: ContextKeyExpr.and(TerminalContextKeys.focus, CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
+			weight: KeybindingWeight.WorkbenchContrib
+		}
+	],
+	run: async (activeInstance, c) => {
+		const history = TerminalHistoryContribution.get(activeInstance);
+		if (!history) {
+			return;
+		}
+		await history.runRecent('command');
+		if (activeInstance?.target === TerminalLocation.Editor) {
+			await c.editorService.revealActiveEditor();
+		} else {
+			await c.groupService.showPanel(false);
+		}
+	}
+});
+
+// #endregion
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalRunRecentQuickPick.ts b/src/vs/workbench/contrib/terminalContrib/history/browser/terminalRunRecentQuickPick.ts
similarity index 77%
rename from src/vs/workbench/contrib/terminal/browser/terminalRunRecentQuickPick.ts
rename to src/vs/workbench/contrib/terminalContrib/history/browser/terminalRunRecentQuickPick.ts
index b795f91f201..74e85786e38 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalRunRecentQuickPick.ts
+++ b/src/vs/workbench/contrib/terminalContrib/history/browser/terminalRunRecentQuickPick.ts
@@ -3,30 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Toggle } from 'vs/base/browser/ui/toggle/toggle';
-import { isMacintosh, OperatingSystem } from 'vs/base/common/platform';
-import { ITextModel } from 'vs/editor/common/model';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ITextModelContentProvider, ITextModelService } from 'vs/editor/common/services/resolverService';
-import { localize } from 'vs/nls';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IQuickInputButton, IQuickInputService, IQuickPickItem, IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
-import { ITerminalCommand, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { collapseTildePath } from 'vs/platform/terminal/common/terminalEnvironment';
-import { asCssVariable, inputActiveOptionBackground, inputActiveOptionBorder, inputActiveOptionForeground } from 'vs/platform/theme/common/colorRegistry';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { ITerminalInstance } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { commandHistoryFuzzySearchIcon, commandHistoryOutputIcon, commandHistoryRemoveIcon } from 'vs/workbench/contrib/terminal/browser/terminalIcons';
-import { getCommandHistory, getDirectoryHistory, getShellFileHistory } from 'vs/workbench/contrib/terminal/common/history';
-import { TerminalStorageKeys } from 'vs/workbench/contrib/terminal/common/terminalStorageKeys';
-import { terminalStrings } from 'vs/workbench/contrib/terminal/common/terminalStrings';
-import { URI } from 'vs/base/common/uri';
-import { fromNow } from 'vs/base/common/date';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { showWithPinnedItems } from 'vs/platform/quickinput/browser/quickPickPin';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { IContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { AccessibleViewProviderId, IAccessibleViewService } from 'vs/platform/accessibility/browser/accessibleView';
+import { Toggle } from '../../../../../base/browser/ui/toggle/toggle.js';
+import { isMacintosh, OperatingSystem } from '../../../../../base/common/platform.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
+import { IModelService } from '../../../../../editor/common/services/model.js';
+import { ITextModelContentProvider, ITextModelService } from '../../../../../editor/common/services/resolverService.js';
+import { localize } from '../../../../../nls.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IQuickInputButton, IQuickInputService, IQuickPickItem, IQuickPickSeparator } from '../../../../../platform/quickinput/common/quickInput.js';
+import { ITerminalCommand, TerminalCapability } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
+import { collapseTildePath } from '../../../../../platform/terminal/common/terminalEnvironment.js';
+import { asCssVariable, inputActiveOptionBackground, inputActiveOptionBorder, inputActiveOptionForeground } from '../../../../../platform/theme/common/colorRegistry.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { ITerminalInstance } from '../../../terminal/browser/terminal.js';
+import { commandHistoryFuzzySearchIcon, commandHistoryOutputIcon, commandHistoryRemoveIcon } from '../../../terminal/browser/terminalIcons.js';
+import { TerminalStorageKeys } from '../../../terminal/common/terminalStorageKeys.js';
+import { terminalStrings } from '../../../terminal/common/terminalStrings.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { fromNow } from '../../../../../base/common/date.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { showWithPinnedItems } from '../../../../../platform/quickinput/browser/quickPickPin.js';
+import { IStorageService } from '../../../../../platform/storage/common/storage.js';
+import { IContextKey } from '../../../../../platform/contextkey/common/contextkey.js';
+import { AccessibleViewProviderId, IAccessibleViewService } from '../../../../../platform/accessibility/browser/accessibleView.js';
+import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { getCommandHistory, getDirectoryHistory, getShellFileHistory } from '../common/history.js';
 
 export async function showRunRecentQuickPick(
 	accessor: ServicesAccessor,
@@ -205,26 +206,27 @@ export async function showRunRecentQuickPick(
 	if (items.length === 0) {
 		return;
 	}
-	const fuzzySearchToggle = new Toggle({
+	const disposables = new DisposableStore();
+	const fuzzySearchToggle = disposables.add(new Toggle({
 		title: 'Fuzzy search',
 		icon: commandHistoryFuzzySearchIcon,
 		isChecked: filterMode === 'fuzzy',
 		inputActiveOptionBorder: asCssVariable(inputActiveOptionBorder),
 		inputActiveOptionForeground: asCssVariable(inputActiveOptionForeground),
 		inputActiveOptionBackground: asCssVariable(inputActiveOptionBackground)
-	});
-	fuzzySearchToggle.onChange(() => {
+	}));
+	disposables.add(fuzzySearchToggle.onChange(() => {
 		instantiationService.invokeFunction(showRunRecentQuickPick, instance, terminalInRunCommandPicker, type, fuzzySearchToggle.checked ? 'fuzzy' : 'contiguous', quickPick.value);
-	});
-	const outputProvider = instantiationService.createInstance(TerminalOutputProvider);
-	const quickPick = quickInputService.createQuickPick<Item | IQuickPickItem & { rawLabel: string }>();
+	}));
+	const outputProvider = disposables.add(instantiationService.createInstance(TerminalOutputProvider));
+	const quickPick = disposables.add(quickInputService.createQuickPick<Item | IQuickPickItem & { rawLabel: string }>({ useSeparators: true }));
 	const originalItems = items;
 	quickPick.items = [...originalItems];
 	quickPick.sortByLabel = false;
 	quickPick.placeholder = placeholder;
 	quickPick.matchOnLabelMode = filterMode || 'contiguous';
 	quickPick.toggles = [fuzzySearchToggle];
-	quickPick.onDidTriggerItemButton(async e => {
+	disposables.add(quickPick.onDidTriggerItemButton(async e => {
 		if (e.button === removeFromCommandHistoryButton) {
 			if (type === 'command') {
 				instantiationService.invokeFunction(getCommandHistory)?.remove(e.item.label);
@@ -250,20 +252,19 @@ export async function showRunRecentQuickPick(
 			}
 		}
 		await instantiationService.invokeFunction(showRunRecentQuickPick, instance, terminalInRunCommandPicker, type, filterMode, value);
-	}
-	);
-	quickPick.onDidChangeValue(async value => {
+	}));
+	disposables.add(quickPick.onDidChangeValue(async value => {
 		if (!value) {
 			await instantiationService.invokeFunction(showRunRecentQuickPick, instance, terminalInRunCommandPicker, type, filterMode, value);
 		}
-	});
+	}));
 	let terminalScrollStateSaved = false;
 	function restoreScrollState() {
 		terminalScrollStateSaved = false;
 		instance.xterm?.markTracker.restoreScrollState();
 		instance.xterm?.markTracker.clear();
 	}
-	quickPick.onDidChangeActive(async () => {
+	disposables.add(quickPick.onDidChangeActive(async () => {
 		const xterm = instance.xterm;
 		if (!xterm) {
 			return;
@@ -292,8 +293,8 @@ export async function showRunRecentQuickPick(
 		} else {
 			restoreScrollState();
 		}
-	});
-	quickPick.onDidAccept(async () => {
+	}));
+	disposables.add(quickPick.onDidAccept(async () => {
 		const result = quickPick.activeItems[0];
 		let text: string;
 		if (type === 'cwd') {
@@ -307,30 +308,32 @@ export async function showRunRecentQuickPick(
 			instance.focus();
 		}
 		restoreScrollState();
-	});
-	quickPick.onDidHide(() => restoreScrollState());
+	}));
+	disposables.add(quickPick.onDidHide(() => restoreScrollState()));
 	if (value) {
 		quickPick.value = value;
 	}
 	return new Promise<void>(r => {
 		terminalInRunCommandPicker.set(true);
-		showWithPinnedItems(storageService, runRecentStorageKey, quickPick, true);
-		quickPick.onDidHide(() => {
+		disposables.add(showWithPinnedItems(storageService, runRecentStorageKey, quickPick, true));
+		disposables.add(quickPick.onDidHide(() => {
 			terminalInRunCommandPicker.set(false);
 			accessibleViewService.showLastProvider(AccessibleViewProviderId.Terminal);
 			r();
-		});
+			disposables.dispose();
+		}));
 	});
 }
 
-class TerminalOutputProvider implements ITextModelContentProvider {
+class TerminalOutputProvider extends Disposable implements ITextModelContentProvider {
 	static scheme = 'TERMINAL_OUTPUT';
 
 	constructor(
 		@ITextModelService textModelResolverService: ITextModelService,
 		@IModelService private readonly _modelService: IModelService
 	) {
-		textModelResolverService.registerTextModelContentProvider(TerminalOutputProvider.scheme, this);
+		super();
+		this._register(textModelResolverService.registerTextModelContentProvider(TerminalOutputProvider.scheme, this));
 	}
 
 	async provideTextContent(resource: URI): Promise<ITextModel | null> {
diff --git a/src/vs/workbench/contrib/terminal/common/history.ts b/src/vs/workbench/contrib/terminalContrib/history/common/history.ts
similarity index 90%
rename from src/vs/workbench/contrib/terminal/common/history.ts
rename to src/vs/workbench/contrib/terminalContrib/history/common/history.ts
index ca2588453d2..c60c0cf513f 100644
--- a/src/vs/workbench/contrib/terminal/common/history.ts
+++ b/src/vs/workbench/contrib/terminalContrib/history/common/history.ts
@@ -3,19 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { env } from 'vs/base/common/process';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { LRUCache } from 'vs/base/common/map';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { FileOperationError, FileOperationResult, IFileContent, IFileService } from 'vs/platform/files/common/files';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { PosixShellType, TerminalSettingId, TerminalShellType } from 'vs/platform/terminal/common/terminal';
-import { URI } from 'vs/base/common/uri';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { Schemas } from 'vs/base/common/network';
-import { isWindows, OperatingSystem } from 'vs/base/common/platform';
-import { posix, win32 } from 'vs/base/common/path';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { LRUCache } from '../../../../../base/common/map.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { join } from '../../../../../base/common/path.js';
+import { isWindows, OperatingSystem } from '../../../../../base/common/platform.js';
+import { env } from '../../../../../base/common/process.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { FileOperationError, FileOperationResult, IFileContent, IFileService } from '../../../../../platform/files/common/files.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { GeneralShellType, PosixShellType, TerminalShellType } from '../../../../../platform/terminal/common/terminal.js';
+import { IRemoteAgentService } from '../../../../services/remote/common/remoteAgentService.js';
+import { TerminalHistorySettingId } from './terminal.history.js';
 
 /**
  * Tracks a list of generic entries.
@@ -52,14 +53,6 @@ const enum StorageKeys {
 	Timestamp = 'terminal.history.timestamp'
 }
 
-let commandHistory: ITerminalPersistedHistory<{ shellType: TerminalShellType }> | undefined = undefined;
-export function getCommandHistory(accessor: ServicesAccessor): ITerminalPersistedHistory<{ shellType: TerminalShellType | undefined }> {
-	if (!commandHistory) {
-		commandHistory = accessor.get(IInstantiationService).createInstance(TerminalPersistedHistory, 'commands') as TerminalPersistedHistory<{ shellType: TerminalShellType }>;
-	}
-	return commandHistory;
-}
-
 let directoryHistory: ITerminalPersistedHistory<{ remoteAuthority?: string }> | undefined = undefined;
 export function getDirectoryHistory(accessor: ServicesAccessor): ITerminalPersistedHistory<{ remoteAuthority?: string }> {
 	if (!directoryHistory) {
@@ -68,45 +61,12 @@ export function getDirectoryHistory(accessor: ServicesAccessor): ITerminalPersis
 	return directoryHistory;
 }
 
-// Shell file history loads once per shell per window
-const shellFileHistory: Map<TerminalShellType | undefined, string[] | null> = new Map();
-export async function getShellFileHistory(accessor: ServicesAccessor, shellType: TerminalShellType | undefined): Promise<string[]> {
-	const cached = shellFileHistory.get(shellType);
-	if (cached === null) {
-		return [];
+let commandHistory: ITerminalPersistedHistory<{ shellType: TerminalShellType }> | undefined = undefined;
+export function getCommandHistory(accessor: ServicesAccessor): ITerminalPersistedHistory<{ shellType: TerminalShellType | undefined }> {
+	if (!commandHistory) {
+		commandHistory = accessor.get(IInstantiationService).createInstance(TerminalPersistedHistory, 'commands') as TerminalPersistedHistory<{ shellType: TerminalShellType }>;
 	}
-	if (cached !== undefined) {
-		return cached;
-	}
-	let result: IterableIterator<string> | undefined;
-	switch (shellType) {
-		case PosixShellType.Bash:
-			result = await fetchBashHistory(accessor);
-			break;
-		case PosixShellType.PowerShell: // WindowsShellType.PowerShell has the same value
-			result = await fetchPwshHistory(accessor);
-			break;
-		case PosixShellType.Zsh:
-			result = await fetchZshHistory(accessor);
-			break;
-		case PosixShellType.Fish:
-			result = await fetchFishHistory(accessor);
-			break;
-		case PosixShellType.Python:
-			result = await fetchPythonHistory(accessor);
-			break;
-		default: return [];
-	}
-	if (result === undefined) {
-		shellFileHistory.set(shellType, null);
-		return [];
-	}
-	const array = Array.from(result);
-	shellFileHistory.set(shellType, array);
-	return array;
-}
-export function clearShellFileHistory() {
-	shellFileHistory.clear();
+	return commandHistory;
 }
 
 export class TerminalPersistedHistory<T> extends Disposable implements ITerminalPersistedHistory<T> {
@@ -132,7 +92,7 @@ export class TerminalPersistedHistory<T> extends Disposable implements ITerminal
 
 		// Listen for config changes to set history limit
 		this._register(this._configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration(TerminalSettingId.ShellIntegrationCommandHistory)) {
+			if (e.affectsConfiguration(TerminalHistorySettingId.ShellIntegrationCommandHistory)) {
 				this._entries.limit = this._getHistoryLimit();
 			}
 		}));
@@ -216,7 +176,7 @@ export class TerminalPersistedHistory<T> extends Disposable implements ITerminal
 	}
 
 	private _getHistoryLimit() {
-		const historyLimit = this._configurationService.getValue(TerminalSettingId.ShellIntegrationCommandHistory);
+		const historyLimit = this._configurationService.getValue(TerminalHistorySettingId.ShellIntegrationCommandHistory);
 		return typeof historyLimit === 'number' ? historyLimit : Constants.DefaultHistoryLimit;
 	}
 
@@ -229,6 +189,47 @@ export class TerminalPersistedHistory<T> extends Disposable implements ITerminal
 	}
 }
 
+// Shell file history loads once per shell per window
+const shellFileHistory: Map<TerminalShellType | undefined, string[] | null> = new Map();
+export async function getShellFileHistory(accessor: ServicesAccessor, shellType: TerminalShellType | undefined): Promise<string[]> {
+	const cached = shellFileHistory.get(shellType);
+	if (cached === null) {
+		return [];
+	}
+	if (cached !== undefined) {
+		return cached;
+	}
+	let result: IterableIterator<string> | undefined;
+	switch (shellType) {
+		case PosixShellType.Bash:
+			result = await fetchBashHistory(accessor);
+			break;
+		case GeneralShellType.PowerShell:
+			result = await fetchPwshHistory(accessor);
+			break;
+		case PosixShellType.Zsh:
+			result = await fetchZshHistory(accessor);
+			break;
+		case PosixShellType.Fish:
+			result = await fetchFishHistory(accessor);
+			break;
+		case GeneralShellType.Python:
+			result = await fetchPythonHistory(accessor);
+			break;
+		default: return [];
+	}
+	if (result === undefined) {
+		shellFileHistory.set(shellType, null);
+		return [];
+	}
+	const array = Array.from(result);
+	shellFileHistory.set(shellType, array);
+	return array;
+}
+export function clearShellFileHistory() {
+	shellFileHistory.clear();
+}
+
 export async function fetchBashHistory(accessor: ServicesAccessor): Promise<IterableIterator<string> | undefined> {
 	const fileService = accessor.get(IFileService);
 	const remoteAgentService = accessor.get(IRemoteAgentService);
@@ -331,7 +332,7 @@ export async function fetchPwshHistory(accessor: ServicesAccessor) {
 	const isFileWindows = remoteEnvironment?.os === OperatingSystem.Windows || !remoteEnvironment && isWindows;
 	if (isFileWindows) {
 		folderPrefix = env['APPDATA'];
-		filePath = '\\Microsoft\\Windows\\PowerShell\\PSReadLine\\ConsoleHost_history.txt';
+		filePath = 'Microsoft\\Windows\\PowerShell\\PSReadLine\\ConsoleHost_history.txt';
 	} else {
 		folderPrefix = env['HOME'];
 		filePath = '.local/share/powershell/PSReadline/ConsoleHost_history.txt';
@@ -484,10 +485,12 @@ async function fetchFileContents(
 	if (!folderPrefix) {
 		return undefined;
 	}
-	const isRemote = !!remoteAgentService.getConnection()?.remoteAuthority;
+	const connection = remoteAgentService.getConnection();
+	const isRemote = !!connection?.remoteAuthority;
 	const historyFileUri = URI.from({
 		scheme: isRemote ? Schemas.vscodeRemote : Schemas.file,
-		path: (isFileWindows ? win32.join : posix.join)(folderPrefix, filePath)
+		authority: isRemote ? connection.remoteAuthority : undefined,
+		path: URI.file(join(folderPrefix, filePath)).path
 	});
 	let content: IFileContent;
 	try {
diff --git a/src/vs/workbench/contrib/terminalContrib/history/common/terminal.history.ts b/src/vs/workbench/contrib/terminalContrib/history/common/terminal.history.ts
new file mode 100644
index 00000000000..9c490e27abf
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/history/common/terminal.history.ts
@@ -0,0 +1,32 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import type { IStringDictionary } from '../../../../../base/common/collections.js';
+import { localize } from '../../../../../nls.js';
+import type { IConfigurationPropertySchema } from '../../../../../platform/configuration/common/configurationRegistry.js';
+
+export const enum TerminalHistoryCommandId {
+	ClearPreviousSessionHistory = 'workbench.action.terminal.clearPreviousSessionHistory',
+	GoToRecentDirectory = 'workbench.action.terminal.goToRecentDirectory',
+	RunRecentCommand = 'workbench.action.terminal.runRecentCommand',
+}
+
+export const defaultTerminalHistoryCommandsToSkipShell = [
+	TerminalHistoryCommandId.GoToRecentDirectory,
+	TerminalHistoryCommandId.RunRecentCommand
+];
+
+export const enum TerminalHistorySettingId {
+	ShellIntegrationCommandHistory = 'terminal.integrated.shellIntegration.history',
+}
+
+export const terminalHistoryConfiguration: IStringDictionary<IConfigurationPropertySchema> = {
+	[TerminalHistorySettingId.ShellIntegrationCommandHistory]: {
+		restricted: true,
+		markdownDescription: localize('terminal.integrated.shellIntegration.history', "Controls the number of recently used commands to keep in the terminal command history. Set to 0 to disable terminal command history."),
+		type: 'number',
+		default: 100
+	},
+};
diff --git a/src/vs/workbench/contrib/terminal/test/common/history.test.ts b/src/vs/workbench/contrib/terminalContrib/history/test/common/history.test.ts
similarity index 91%
rename from src/vs/workbench/contrib/terminal/test/common/history.test.ts
rename to src/vs/workbench/contrib/terminalContrib/history/test/common/history.test.ts
index 1a416e83e3e..30b2a91dcbc 100644
--- a/src/vs/workbench/contrib/terminal/test/common/history.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/history/test/common/history.test.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { deepStrictEqual, fail, strictEqual, ok } from 'assert';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { Schemas } from 'vs/base/common/network';
-import { join } from 'vs/base/common/path';
-import { isWindows, OperatingSystem } from 'vs/base/common/platform';
-import { env } from 'vs/base/common/process';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { IFileService } from 'vs/platform/files/common/files';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { IRemoteAgentEnvironment } from 'vs/platform/remote/common/remoteAgentEnvironment';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { fetchBashHistory, fetchFishHistory, fetchPwshHistory, fetchZshHistory, ITerminalPersistedHistory, sanitizeFishHistoryCmd, TerminalPersistedHistory } from 'vs/workbench/contrib/terminal/common/history';
-import { IRemoteAgentConnection, IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
+import { deepStrictEqual, strictEqual, ok } from 'assert';
+import { VSBuffer } from '../../../../../../base/common/buffer.js';
+import { Schemas } from '../../../../../../base/common/network.js';
+import { join } from '../../../../../../base/common/path.js';
+import { isWindows, OperatingSystem } from '../../../../../../base/common/platform.js';
+import { env } from '../../../../../../base/common/process.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { IFileService } from '../../../../../../platform/files/common/files.js';
+import { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { IRemoteAgentEnvironment } from '../../../../../../platform/remote/common/remoteAgentEnvironment.js';
+import { IStorageService } from '../../../../../../platform/storage/common/storage.js';
+import { IRemoteAgentConnection, IRemoteAgentService } from '../../../../../services/remote/common/remoteAgentService.js';
+import { TestStorageService } from '../../../../../test/common/workbenchTestServices.js';
+import { fetchBashHistory, fetchFishHistory, fetchPwshHistory, fetchZshHistory, sanitizeFishHistoryCmd, TerminalPersistedHistory, type ITerminalPersistedHistory } from '../../common/history.js';
 
 function getConfig(limit: number) {
 	return {
@@ -328,10 +328,13 @@ suite('Terminal history', () => {
 			instantiationService = new TestInstantiationService();
 			instantiationService.stub(IFileService, {
 				async readFile(resource: URI) {
-					const expected = URI.from({ scheme: fileScheme, path: filePath });
-					if (resource.scheme !== expected.scheme || resource.fsPath !== expected.fsPath) {
-						fail(`Unexpected file scheme/path ${resource.scheme} ${resource.fsPath}`);
-					}
+					const expected = URI.from({
+						scheme: fileScheme,
+						authority: remoteConnection?.remoteAuthority,
+						path: URI.file(filePath).path
+					});
+					// Sanitize the encoded `/` chars as they don't impact behavior
+					strictEqual(resource.toString().replaceAll('%5C', '/'), expected.toString().replaceAll('%5C', '/'));
 					return { value: VSBuffer.fromString(fileContent) };
 				}
 			} as Pick<IFileService, 'readFile'>);
diff --git a/src/vs/workbench/contrib/terminalContrib/links/browser/links.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/links.ts
index 9ddd423a1d0..84b4ddfdf11 100644
--- a/src/vs/workbench/contrib/terminalContrib/links/browser/links.ts
+++ b/src/vs/workbench/contrib/terminalContrib/links/browser/links.ts
@@ -4,16 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type { IBufferLine, IBufferRange, Terminal } from '@xterm/xterm';
-import { URI } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ITerminalProcessManager } from 'vs/workbench/contrib/terminal/common/terminal';
-import { IParsedLink } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkParsing';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { ITerminalExternalLinkProvider } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { Event } from 'vs/base/common/event';
-import { ITerminalBackend } from 'vs/platform/terminal/common/terminal';
-import { ITextEditorSelection } from 'vs/platform/editor/common/editor';
-import type { IHoverAction } from 'vs/base/browser/ui/hover/hover';
+import { URI } from '../../../../../base/common/uri.js';
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ITerminalProcessManager } from '../../../terminal/common/terminal.js';
+import { IParsedLink } from './terminalLinkParsing.js';
+import { IDisposable } from '../../../../../base/common/lifecycle.js';
+import { ITerminalExternalLinkProvider } from '../../../terminal/browser/terminal.js';
+import { Event } from '../../../../../base/common/event.js';
+import { ITerminalBackend } from '../../../../../platform/terminal/common/terminal.js';
+import { ITextEditorSelection } from '../../../../../platform/editor/common/editor.js';
+import type { IHoverAction } from '../../../../../base/browser/ui/hover/hover.js';
 
 export const ITerminalLinkProviderService = createDecorator<ITerminalLinkProviderService>('terminalLinkProviderService');
 export interface ITerminalLinkProviderService {
diff --git a/src/vs/workbench/contrib/terminalContrib/links/browser/terminal.links.contribution.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/terminal.links.contribution.ts
index c6064901930..7d44bd24605 100644
--- a/src/vs/workbench/contrib/terminalContrib/links/browser/terminal.links.contribution.ts
+++ b/src/vs/workbench/contrib/terminalContrib/links/browser/terminal.links.contribution.ts
@@ -3,30 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { localize2 } from 'vs/nls';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { accessibleViewCurrentProviderId, accessibleViewIsShown } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { IDetachedTerminalInstance, ITerminalContribution, ITerminalInstance, IXtermTerminal, isDetachedTerminalInstance } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { registerActiveInstanceAction } from 'vs/workbench/contrib/terminal/browser/terminalActions';
-import { registerTerminalContribution } from 'vs/workbench/contrib/terminal/browser/terminalExtensions';
-import { TerminalWidgetManager } from 'vs/workbench/contrib/terminal/browser/widgets/widgetManager';
-import { ITerminalProcessInfo, ITerminalProcessManager, isTerminalProcessManager } from 'vs/workbench/contrib/terminal/common/terminal';
-import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey';
-import { terminalStrings } from 'vs/workbench/contrib/terminal/common/terminalStrings';
-import { ITerminalLinkProviderService } from 'vs/workbench/contrib/terminalContrib/links/browser/links';
-import { IDetectedLinks, TerminalLinkManager } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkManager';
-import { TerminalLinkProviderService } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkProviderService';
-import { TerminalLinkQuickpick } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkQuickpick';
-import { TerminalLinkResolver } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkResolver';
 import type { Terminal as RawXtermTerminal } from '@xterm/xterm';
-import { TerminalLinksCommandId } from 'vs/workbench/contrib/terminalContrib/links/common/terminal.links';
-import { AccessibleViewProviderId } from 'vs/platform/accessibility/browser/accessibleView';
+import { Event } from '../../../../../base/common/event.js';
+import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { localize2 } from '../../../../../nls.js';
+import { AccessibleViewProviderId } from '../../../../../platform/accessibility/browser/accessibleView.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { InstantiationType, registerSingleton } from '../../../../../platform/instantiation/common/extensions.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { accessibleViewCurrentProviderId, accessibleViewIsShown } from '../../../accessibility/browser/accessibilityConfiguration.js';
+import { ITerminalContribution, ITerminalInstance, IXtermTerminal, isDetachedTerminalInstance } from '../../../terminal/browser/terminal.js';
+import { registerActiveInstanceAction } from '../../../terminal/browser/terminalActions.js';
+import { registerTerminalContribution, type IDetachedCompatibleTerminalContributionContext, type ITerminalContributionContext } from '../../../terminal/browser/terminalExtensions.js';
+import { isTerminalProcessManager } from '../../../terminal/common/terminal.js';
+import { TerminalContextKeys } from '../../../terminal/common/terminalContextKey.js';
+import { terminalStrings } from '../../../terminal/common/terminalStrings.js';
+import { TerminalLinksCommandId } from '../common/terminal.links.js';
+import { ITerminalLinkProviderService } from './links.js';
+import { IDetectedLinks, TerminalLinkManager } from './terminalLinkManager.js';
+import { TerminalLinkProviderService } from './terminalLinkProviderService.js';
+import { TerminalLinkQuickpick } from './terminalLinkQuickpick.js';
+import { TerminalLinkResolver } from './terminalLinkResolver.js';
 
 // #region Services
 
@@ -48,9 +47,7 @@ class TerminalLinkContribution extends DisposableStore implements ITerminalContr
 	private _linkResolver: TerminalLinkResolver;
 
 	constructor(
-		private readonly _instance: ITerminalInstance | IDetachedTerminalInstance,
-		private readonly _processManager: ITerminalProcessManager | ITerminalProcessInfo,
-		private readonly _widgetManager: TerminalWidgetManager,
+		private readonly _ctx: ITerminalContributionContext | IDetachedCompatibleTerminalContributionContext,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@ITerminalLinkProviderService private readonly _terminalLinkProviderService: ITerminalLinkProviderService
 	) {
@@ -59,25 +56,25 @@ class TerminalLinkContribution extends DisposableStore implements ITerminalContr
 	}
 
 	xtermReady(xterm: IXtermTerminal & { raw: RawXtermTerminal }): void {
-		const linkManager = this._linkManager = this.add(this._instantiationService.createInstance(TerminalLinkManager, xterm.raw, this._processManager, this._instance.capabilities, this._linkResolver));
+		const linkManager = this._linkManager = this.add(this._instantiationService.createInstance(TerminalLinkManager, xterm.raw, this._ctx.processManager, this._ctx.instance.capabilities, this._linkResolver));
 
 		// Set widget manager
-		if (isTerminalProcessManager(this._processManager)) {
-			const disposable = linkManager.add(Event.once(this._processManager.onProcessReady)(() => {
-				linkManager.setWidgetManager(this._widgetManager);
+		if (isTerminalProcessManager(this._ctx.processManager)) {
+			const disposable = linkManager.add(Event.once(this._ctx.processManager.onProcessReady)(() => {
+				linkManager.setWidgetManager(this._ctx.widgetManager);
 				this.delete(disposable);
 			}));
 		} else {
-			linkManager.setWidgetManager(this._widgetManager);
+			linkManager.setWidgetManager(this._ctx.widgetManager);
 		}
 
 		// Attach the external link provider to the instance and listen for changes
-		if (!isDetachedTerminalInstance(this._instance)) {
+		if (!isDetachedTerminalInstance(this._ctx.instance)) {
 			for (const linkProvider of this._terminalLinkProviderService.linkProviders) {
-				linkManager.externalProvideLinksCb = linkProvider.provideLinks.bind(linkProvider, this._instance);
+				linkManager.externalProvideLinksCb = linkProvider.provideLinks.bind(linkProvider, this._ctx.instance);
 			}
 			linkManager.add(this._terminalLinkProviderService.onDidAddLinkProvider(e => {
-				linkManager.externalProvideLinksCb = e.provideLinks.bind(e, this._instance as ITerminalInstance);
+				linkManager.externalProvideLinksCb = e.provideLinks.bind(e, this._ctx.instance as ITerminalInstance);
 			}));
 		}
 		linkManager.add(this._terminalLinkProviderService.onDidRemoveLinkProvider(() => linkManager.externalProvideLinksCb = undefined));
@@ -91,7 +88,7 @@ class TerminalLinkContribution extends DisposableStore implements ITerminalContr
 			});
 		}
 		const links = await this._getLinks();
-		return await this._terminalLinkQuickpick.show(this._instance, links);
+		return await this._terminalLinkQuickpick.show(this._ctx.instance, links);
 	}
 
 	private async _getLinks(): Promise<{ viewport: IDetectedLinks; all: Promise<IDetectedLinks> }> {
diff --git a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalExternalLinkDetector.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalExternalLinkDetector.ts
index 328f8543e65..8032bc321a2 100644
--- a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalExternalLinkDetector.ts
+++ b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalExternalLinkDetector.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ITerminalLinkDetector, ITerminalSimpleLink, OmitFirstArg } from 'vs/workbench/contrib/terminalContrib/links/browser/links';
-import { convertLinkRangeToBuffer, getXtermLineContent } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkHelpers';
-import { ITerminalExternalLinkProvider } from 'vs/workbench/contrib/terminal/browser/terminal';
+import { ITerminalLinkDetector, ITerminalSimpleLink, OmitFirstArg } from './links.js';
+import { convertLinkRangeToBuffer, getXtermLineContent } from './terminalLinkHelpers.js';
+import { ITerminalExternalLinkProvider } from '../../../terminal/browser/terminal.js';
 import type { IBufferLine, Terminal } from '@xterm/xterm';
 
 export class TerminalExternalLinkDetector implements ITerminalLinkDetector {
diff --git a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLink.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLink.ts
index 338b09dcc07..228d047f4b2 100644
--- a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLink.ts
+++ b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLink.ts
@@ -4,24 +4,23 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type { IViewportRange, IBufferRange, ILink, ILinkDecorations, Terminal } from '@xterm/xterm';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import * as dom from 'vs/base/browser/dom';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { convertBufferRangeToViewport } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkHelpers';
-import { isMacintosh } from 'vs/base/common/platform';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TerminalLinkType } from 'vs/workbench/contrib/terminalContrib/links/browser/links';
-import type { URI } from 'vs/base/common/uri';
-import type { IParsedLink } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkParsing';
-import type { IHoverAction } from 'vs/base/browser/ui/hover/hover';
+import { Disposable, DisposableStore, MutableDisposable } from '../../../../../base/common/lifecycle.js';
+import * as dom from '../../../../../base/browser/dom.js';
+import { RunOnceScheduler } from '../../../../../base/common/async.js';
+import { convertBufferRangeToViewport } from './terminalLinkHelpers.js';
+import { isMacintosh } from '../../../../../base/common/platform.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { TerminalLinkType } from './links.js';
+import type { URI } from '../../../../../base/common/uri.js';
+import type { IParsedLink } from './terminalLinkParsing.js';
+import type { IHoverAction } from '../../../../../base/browser/ui/hover/hover.js';
 
-export class TerminalLink extends DisposableStore implements ILink {
+export class TerminalLink extends Disposable implements ILink {
 	decorations: ILinkDecorations;
-	asyncActivate: Promise<void> | undefined;
 
-	private _tooltipScheduler: RunOnceScheduler | undefined;
-	private _hoverListeners: DisposableStore | undefined;
+	private readonly _tooltipScheduler: MutableDisposable<RunOnceScheduler> = this._register(new MutableDisposable());
+	private readonly _hoverListeners = this._register(new MutableDisposable());
 
 	private readonly _onInvalidated = new Emitter<void>();
 	get onInvalidated(): Event<void> { return this._onInvalidated.event; }
@@ -50,38 +49,28 @@ export class TerminalLink extends DisposableStore implements ILink {
 		};
 	}
 
-	override dispose(): void {
-		super.dispose();
-		this._hoverListeners?.dispose();
-		this._hoverListeners = undefined;
-		this._tooltipScheduler?.dispose();
-		this._tooltipScheduler = undefined;
-	}
-
 	activate(event: MouseEvent | undefined, text: string): void {
-		// Trigger the xterm.js callback synchronously but track the promise resolution so we can
-		// use it in tests
-		this.asyncActivate = this._activateCallback(event, text);
+		this._activateCallback(event, text);
 	}
 
 	hover(event: MouseEvent, text: string): void {
 		const w = dom.getWindow(event);
 		const d = w.document;
 		// Listen for modifier before handing it off to the hover to handle so it gets disposed correctly
-		this._hoverListeners = new DisposableStore();
-		this._hoverListeners.add(dom.addDisposableListener(d, 'keydown', e => {
+		const hoverListeners = this._hoverListeners.value = new DisposableStore();
+		hoverListeners.add(dom.addDisposableListener(d, 'keydown', e => {
 			if (!e.repeat && this._isModifierDown(e)) {
 				this._enableDecorations();
 			}
 		}));
-		this._hoverListeners.add(dom.addDisposableListener(d, 'keyup', e => {
+		hoverListeners.add(dom.addDisposableListener(d, 'keyup', e => {
 			if (!e.repeat && !this._isModifierDown(e)) {
 				this._disableDecorations();
 			}
 		}));
 
 		// Listen for when the terminal renders on the same line as the link
-		this._hoverListeners.add(this._xterm.onRender(e => {
+		hoverListeners.add(this._xterm.onRender(e => {
 			const viewportRangeY = this.range.start.y - this._viewportY;
 			if (viewportRangeY >= e.start && viewportRangeY <= e.end) {
 				this._onInvalidated.fire();
@@ -91,7 +80,7 @@ export class TerminalLink extends DisposableStore implements ILink {
 		// Only show the tooltip and highlight for high confidence links (not word/search workspace
 		// links). Feedback was that this makes using the terminal overly noisy.
 		if (this._isHighConfidenceLink) {
-			this._tooltipScheduler = new RunOnceScheduler(() => {
+			this._tooltipScheduler.value = new RunOnceScheduler(() => {
 				this._tooltipCallback(
 					this,
 					convertBufferRangeToViewport(this.range, this._viewportY),
@@ -99,15 +88,13 @@ export class TerminalLink extends DisposableStore implements ILink {
 					this._isHighConfidenceLink ? () => this._disableDecorations() : undefined
 				);
 				// Clear out scheduler until next hover event
-				this._tooltipScheduler?.dispose();
-				this._tooltipScheduler = undefined;
+				this._tooltipScheduler.clear();
 			}, this._configurationService.getValue('workbench.hover.delay'));
-			this.add(this._tooltipScheduler);
-			this._tooltipScheduler.schedule();
+			this._tooltipScheduler.value.schedule();
 		}
 
 		const origin = { x: event.pageX, y: event.pageY };
-		this._hoverListeners.add(dom.addDisposableListener(d, dom.EventType.MOUSE_MOVE, e => {
+		hoverListeners.add(dom.addDisposableListener(d, dom.EventType.MOUSE_MOVE, e => {
 			// Update decorations
 			if (this._isModifierDown(e)) {
 				this._enableDecorations();
@@ -119,16 +106,14 @@ export class TerminalLink extends DisposableStore implements ILink {
 			if (Math.abs(e.pageX - origin.x) > w.devicePixelRatio * 2 || Math.abs(e.pageY - origin.y) > w.devicePixelRatio * 2) {
 				origin.x = e.pageX;
 				origin.y = e.pageY;
-				this._tooltipScheduler?.schedule();
+				this._tooltipScheduler.value?.schedule();
 			}
 		}));
 	}
 
 	leave(): void {
-		this._hoverListeners?.dispose();
-		this._hoverListeners = undefined;
-		this._tooltipScheduler?.dispose();
-		this._tooltipScheduler = undefined;
+		this._hoverListeners.clear();
+		this._tooltipScheduler.clear();
 	}
 
 	private _enableDecorations(): void {
diff --git a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkDetectorAdapter.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkDetectorAdapter.ts
index 26c047ea42d..29bb3e3df3d 100644
--- a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkDetectorAdapter.ts
+++ b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkDetectorAdapter.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { localize } from 'vs/nls';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ITerminalLinkDetector, ITerminalSimpleLink, TerminalBuiltinLinkType, TerminalLinkType } from 'vs/workbench/contrib/terminalContrib/links/browser/links';
-import { TerminalLink } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLink';
-import { XtermLinkMatcherHandler } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkManager';
+import { Emitter } from '../../../../../base/common/event.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { localize } from '../../../../../nls.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ITerminalLinkDetector, ITerminalSimpleLink, TerminalBuiltinLinkType, TerminalLinkType } from './links.js';
+import { TerminalLink } from './terminalLink.js';
+import { XtermLinkMatcherHandler } from './terminalLinkManager.js';
 import type { IBufferLine, ILink, ILinkProvider, IViewportRange } from '@xterm/xterm';
 
 export interface IActivateLinkEvent {
@@ -76,7 +76,8 @@ export class TerminalLinkDetectorAdapter extends Disposable implements ILinkProv
 		// Cap the maximum context on either side of the line being provided, by taking the context
 		// around the line being provided for this ensures the line the pointer is on will have
 		// links provided.
-		const maxLineContext = Math.max(this._detector.maxLinkLength, this._detector.xterm.cols);
+		const maxCharacterContext = Math.max(this._detector.maxLinkLength, this._detector.xterm.cols);
+		const maxLineContext = Math.ceil(maxCharacterContext / this._detector.xterm.cols);
 		const minStartLine = Math.max(startLine - maxLineContext, 0);
 		const maxEndLine = Math.min(endLine + maxLineContext, this._detector.xterm.buffer.active.length);
 
diff --git a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkHelpers.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkHelpers.ts
index 9da96dcc7cb..90fc7d444e3 100644
--- a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkHelpers.ts
+++ b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkHelpers.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type { IViewportRange, IBufferRange, IBufferLine, IBuffer, IBufferCellPosition } from '@xterm/xterm';
-import { IRange } from 'vs/editor/common/core/range';
-import { OperatingSystem } from 'vs/base/common/platform';
-import { IPath, posix, win32 } from 'vs/base/common/path';
-import { ITerminalCapabilityStore, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { ITerminalLogService } from 'vs/platform/terminal/common/terminal';
+import { IRange } from '../../../../../editor/common/core/range.js';
+import { OperatingSystem } from '../../../../../base/common/platform.js';
+import { IPath, posix, win32 } from '../../../../../base/common/path.js';
+import { ITerminalCapabilityStore, TerminalCapability } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
+import { ITerminalLogService } from '../../../../../platform/terminal/common/terminal.js';
 
 /**
  * Converts a possibly wrapped link's range (comprised of string indices) into a buffer range that plays nicely with xterm.js
diff --git a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkManager.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkManager.ts
index 4cd78b913f4..b70b6e859e4 100644
--- a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkManager.ts
+++ b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkManager.ts
@@ -3,36 +3,36 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { EventType } from 'vs/base/browser/dom';
-import { IMarkdownString, MarkdownString } from 'vs/base/common/htmlContent';
-import { DisposableStore, dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { isMacintosh, OS } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import * as nls from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ITunnelService } from 'vs/platform/tunnel/common/tunnel';
-import { ITerminalLinkDetector, ITerminalLinkOpener, ITerminalLinkResolver, ITerminalSimpleLink, OmitFirstArg, TerminalBuiltinLinkType, TerminalLinkType } from 'vs/workbench/contrib/terminalContrib/links/browser/links';
-import { TerminalExternalLinkDetector } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalExternalLinkDetector';
-import { TerminalLink } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLink';
-import { TerminalLinkDetectorAdapter } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkDetectorAdapter';
-import { TerminalLocalFileLinkOpener, TerminalLocalFolderInWorkspaceLinkOpener, TerminalLocalFolderOutsideWorkspaceLinkOpener, TerminalSearchLinkOpener, TerminalUrlLinkOpener } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkOpeners';
-import { TerminalLocalLinkDetector } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLocalLinkDetector';
-import { TerminalUriLinkDetector } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalUriLinkDetector';
-import { TerminalWordLinkDetector } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalWordLinkDetector';
-import { ITerminalConfigurationService, ITerminalExternalLinkProvider, TerminalLinkQuickPickEvent } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { ILinkHoverTargetOptions, TerminalHover } from 'vs/workbench/contrib/terminal/browser/widgets/terminalHoverWidget';
-import { TerminalWidgetManager } from 'vs/workbench/contrib/terminal/browser/widgets/widgetManager';
-import { IXtermCore } from 'vs/workbench/contrib/terminal/browser/xterm-private';
-import { ITerminalCapabilityStore } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { ITerminalConfiguration, ITerminalProcessInfo, TERMINAL_CONFIG_SECTION } from 'vs/workbench/contrib/terminal/common/terminal';
+import { EventType } from '../../../../../base/browser/dom.js';
+import { IMarkdownString, MarkdownString } from '../../../../../base/common/htmlContent.js';
+import { DisposableStore, dispose, IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { isMacintosh, OS } from '../../../../../base/common/platform.js';
+import { URI } from '../../../../../base/common/uri.js';
+import * as nls from '../../../../../nls.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ITunnelService } from '../../../../../platform/tunnel/common/tunnel.js';
+import { ITerminalLinkDetector, ITerminalLinkOpener, ITerminalLinkResolver, ITerminalSimpleLink, OmitFirstArg, TerminalBuiltinLinkType, TerminalLinkType } from './links.js';
+import { TerminalExternalLinkDetector } from './terminalExternalLinkDetector.js';
+import { TerminalLink } from './terminalLink.js';
+import { TerminalLinkDetectorAdapter } from './terminalLinkDetectorAdapter.js';
+import { TerminalLocalFileLinkOpener, TerminalLocalFolderInWorkspaceLinkOpener, TerminalLocalFolderOutsideWorkspaceLinkOpener, TerminalSearchLinkOpener, TerminalUrlLinkOpener } from './terminalLinkOpeners.js';
+import { TerminalLocalLinkDetector } from './terminalLocalLinkDetector.js';
+import { TerminalUriLinkDetector } from './terminalUriLinkDetector.js';
+import { TerminalWordLinkDetector } from './terminalWordLinkDetector.js';
+import { ITerminalConfigurationService, ITerminalExternalLinkProvider, TerminalLinkQuickPickEvent } from '../../../terminal/browser/terminal.js';
+import { ILinkHoverTargetOptions, TerminalHover } from '../../../terminal/browser/widgets/terminalHoverWidget.js';
+import { TerminalWidgetManager } from '../../../terminal/browser/widgets/widgetManager.js';
+import { IXtermCore } from '../../../terminal/browser/xterm-private.js';
+import { ITerminalCapabilityStore } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
+import { ITerminalConfiguration, ITerminalProcessInfo, TERMINAL_CONFIG_SECTION } from '../../../terminal/common/terminal.js';
 import type { ILink, ILinkProvider, IViewportRange, Terminal } from '@xterm/xterm';
-import { convertBufferRangeToViewport } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkHelpers';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { ITerminalLogService } from 'vs/platform/terminal/common/terminal';
-import { TerminalMultiLineLinkDetector } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalMultiLineLinkDetector';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import type { IHoverAction } from 'vs/base/browser/ui/hover/hover';
+import { convertBufferRangeToViewport } from './terminalLinkHelpers.js';
+import { RunOnceScheduler } from '../../../../../base/common/async.js';
+import { ITerminalLogService } from '../../../../../platform/terminal/common/terminal.js';
+import { TerminalMultiLineLinkDetector } from './terminalMultiLineLinkDetector.js';
+import { INotificationService, Severity } from '../../../../../platform/notification/common/notification.js';
+import type { IHoverAction } from '../../../../../base/browser/ui/hover/hover.js';
 
 export type XtermLinkMatcherHandler = (event: MouseEvent | undefined, link: string) => Promise<void>;
 
diff --git a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkOpeners.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkOpeners.ts
index d4247bbd835..4162c49014a 100644
--- a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkOpeners.ts
+++ b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkOpeners.ts
@@ -3,27 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Schemas } from 'vs/base/common/network';
-import { OperatingSystem } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { ITextEditorSelection } from 'vs/platform/editor/common/editor';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { ITerminalLinkOpener, ITerminalSimpleLink } from 'vs/workbench/contrib/terminalContrib/links/browser/links';
-import { osPathModule, updateLinkWithRelativeCwd } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkHelpers';
-import { ITerminalCapabilityStore, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { QueryBuilder } from 'vs/workbench/services/search/common/queryBuilder';
-import { ISearchService } from 'vs/workbench/services/search/common/search';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { detectLinks, getLinkSuffix } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkParsing';
-import { ITerminalLogService } from 'vs/platform/terminal/common/terminal';
+import { Schemas } from '../../../../../base/common/network.js';
+import { OperatingSystem } from '../../../../../base/common/platform.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { ITextEditorSelection } from '../../../../../platform/editor/common/editor.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
+import { IQuickInputService } from '../../../../../platform/quickinput/common/quickInput.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { ITerminalLinkOpener, ITerminalSimpleLink } from './links.js';
+import { osPathModule, updateLinkWithRelativeCwd } from './terminalLinkHelpers.js';
+import { ITerminalCapabilityStore, TerminalCapability } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { IWorkbenchEnvironmentService } from '../../../../services/environment/common/environmentService.js';
+import { IHostService } from '../../../../services/host/browser/host.js';
+import { QueryBuilder } from '../../../../services/search/common/queryBuilder.js';
+import { ISearchService } from '../../../../services/search/common/search.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { detectLinks, getLinkSuffix } from './terminalLinkParsing.js';
+import { ITerminalLogService } from '../../../../../platform/terminal/common/terminal.js';
 
 export class TerminalLocalFileLinkOpener implements ITerminalLinkOpener {
 	constructor(
@@ -106,11 +106,17 @@ export class TerminalSearchLinkOpener implements ITerminalLinkOpener {
 		// Try extract any trailing line and column numbers by matching the text against parsed
 		// links. This will give a search link `foo` on a line like `"foo", line 10` to open the
 		// quick pick with `foo:10` as the contents.
+		//
+		// This also normalizes the path to remove suffixes like :10 or :5.0-4
 		if (link.contextLine) {
 			const parsedLinks = detectLinks(link.contextLine, this._getOS());
-			const matchingParsedLink = parsedLinks.find(parsedLink => parsedLink.suffix && link.text === parsedLink.path.text);
+			// Optimistically check that the link _starts with_ the parsed link text. If so,
+			// continue to use the parsed link
+			const matchingParsedLink = parsedLinks.find(parsedLink => parsedLink.suffix && link.text.startsWith(parsedLink.path.text));
 			if (matchingParsedLink) {
 				if (matchingParsedLink.suffix?.row !== undefined) {
+					// Normalize the path based on the parsed link
+					text = matchingParsedLink.path.text;
 					text += `:${matchingParsedLink.suffix.row}`;
 					if (matchingParsedLink.suffix?.col !== undefined) {
 						text += `:${matchingParsedLink.suffix.col}`;
diff --git a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkParsing.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkParsing.ts
index 94dbbd2f5cd..4ff47d600d3 100644
--- a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkParsing.ts
+++ b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkParsing.ts
@@ -9,8 +9,8 @@
  * exist.
  */
 
-import { Lazy } from 'vs/base/common/lazy';
-import { OperatingSystem } from 'vs/base/common/platform';
+import { Lazy } from '../../../../../base/common/lazy.js';
+import { OperatingSystem } from '../../../../../base/common/platform.js';
 
 export interface IParsedLink {
 	path: ILinkPartialRange;
@@ -109,14 +109,19 @@ function generateLinkSuffixRegex(eolOnly: boolean) {
 		// "foo", lines 339-341                    [#171880]
 		// "foo", lines 339-341, characters 12-789 [#178287]
 		`['"]?(?:,? |: ?| on )lines? ${r()}(?:-${re()})?(?:,? (?:col(?:umn)?|characters?) ${c()}(?:-${ce()})?)?` + eolSuffix,
+		// () and [] are interchangeable
 		// foo(339)
 		// foo(339,12)
 		// foo(339, 12)
 		// foo (339)
-		//   ...
+		// foo (339,12)
+		// foo (339, 12)
 		// foo: (339)
-		//   ...
-		`:? ?[\\[\\(]${r()}(?:, ?${c()})?[\\]\\)]` + eolSuffix,
+		// foo: (339,12)
+		// foo: (339, 12)
+		// foo(339:12)                             [#229842]
+		// foo (339:12)                            [#229842]
+		`:? ?[\\[\\(]${r()}(?:(?:, ?|:)${c()})?[\\]\\)]` + eolSuffix,
 	];
 
 	const suffixClause = lineAndColumnRegexClauses
diff --git a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkProviderService.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkProviderService.ts
index 7c48f9c926e..4748463f049 100644
--- a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkProviderService.ts
+++ b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkProviderService.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ITerminalExternalLinkProvider } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { ITerminalLinkProviderService } from 'vs/workbench/contrib/terminalContrib/links/browser/links';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
+import { ITerminalExternalLinkProvider } from '../../../terminal/browser/terminal.js';
+import { ITerminalLinkProviderService } from './links.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { IDisposable } from '../../../../../base/common/lifecycle.js';
 
 export class TerminalLinkProviderService implements ITerminalLinkProviderService {
 	declare _serviceBrand: undefined;
diff --git a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkQuickpick.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkQuickpick.ts
index 0eee6b948a9..53032b377e8 100644
--- a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkQuickpick.ts
+++ b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkQuickpick.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { EventType } from 'vs/base/browser/dom';
-import { Emitter, Event } from 'vs/base/common/event';
-import { localize } from 'vs/nls';
-import { QuickPickItem, IQuickInputService, IQuickPickItem, QuickInputHideReason } from 'vs/platform/quickinput/common/quickInput';
-import { IDetectedLinks } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkManager';
-import { TerminalLinkQuickPickEvent, type IDetachedTerminalInstance, type ITerminalInstance } from 'vs/workbench/contrib/terminal/browser/terminal';
+import { EventType } from '../../../../../base/browser/dom.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { localize } from '../../../../../nls.js';
+import { QuickPickItem, IQuickInputService, IQuickPickItem, QuickInputHideReason } from '../../../../../platform/quickinput/common/quickInput.js';
+import { IDetectedLinks } from './terminalLinkManager.js';
+import { TerminalLinkQuickPickEvent, type IDetachedTerminalInstance, type ITerminalInstance } from '../../../terminal/browser/terminal.js';
 import type { ILink } from '@xterm/xterm';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import type { TerminalLink } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLink';
-import { Sequencer, timeout } from 'vs/base/common/async';
-import { PickerEditorState } from 'vs/workbench/browser/quickaccess';
-import { getLinkSuffix } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkParsing';
-import { TerminalBuiltinLinkType } from 'vs/workbench/contrib/terminalContrib/links/browser/links';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { basenameOrAuthority, dirname } from 'vs/base/common/resources';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { AccessibleViewProviderId, IAccessibleViewService } from 'vs/platform/accessibility/browser/accessibleView';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import type { TerminalLink } from './terminalLink.js';
+import { Sequencer, timeout } from '../../../../../base/common/async.js';
+import { PickerEditorState } from '../../../../browser/quickaccess.js';
+import { getLinkSuffix } from './terminalLinkParsing.js';
+import { TerminalBuiltinLinkType } from './links.js';
+import { ILabelService } from '../../../../../platform/label/common/label.js';
+import { basenameOrAuthority, dirname } from '../../../../../base/common/resources.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { AccessibleViewProviderId, IAccessibleViewService } from '../../../../../platform/accessibility/browser/accessibleView.js';
 
 export class TerminalLinkQuickpick extends DisposableStore {
 
@@ -75,7 +75,9 @@ export class TerminalLinkQuickpick extends DisposableStore {
 		}
 
 		// Create and show quick pick
-		const pick = this._quickInputService.createQuickPick<IQuickPickItem | ITerminalLinkQuickPickItem>();
+		const pick = this._quickInputService.createQuickPick<IQuickPickItem | ITerminalLinkQuickPickItem>({ useSeparators: true });
+		const disposables = new DisposableStore();
+		disposables.add(pick);
 		pick.items = picks;
 		pick.placeholder = localize('terminal.integrated.openDetectedLink', "Select the link to open, type to filter all links");
 		pick.sortByLabel = false;
@@ -87,7 +89,6 @@ export class TerminalLinkQuickpick extends DisposableStore {
 		// Show all results only when filtering begins, this is done so the quick pick will show up
 		// ASAP with only the viewport entries.
 		let accepted = false;
-		const disposables = new DisposableStore();
 		if (!usingAllLinks) {
 			disposables.add(Event.once(pick.onDidChangeValue)(async () => {
 				const allLinks = await links.all;
diff --git a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkResolver.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkResolver.ts
index c3315837a51..b9d6f165872 100644
--- a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkResolver.ts
+++ b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkResolver.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ITerminalLinkResolver, ResolvedLink } from 'vs/workbench/contrib/terminalContrib/links/browser/links';
-import { removeLinkSuffix, removeLinkQueryString, winDrivePrefix } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkParsing';
-import { URI } from 'vs/base/common/uri';
-import { ITerminalProcessManager } from 'vs/workbench/contrib/terminal/common/terminal';
-import { Schemas } from 'vs/base/common/network';
-import { isWindows, OperatingSystem, OS } from 'vs/base/common/platform';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IPath, posix, win32 } from 'vs/base/common/path';
-import { ITerminalBackend } from 'vs/platform/terminal/common/terminal';
-import { mainWindow } from 'vs/base/browser/window';
+import { ITerminalLinkResolver, ResolvedLink } from './links.js';
+import { removeLinkSuffix, removeLinkQueryString, winDrivePrefix } from './terminalLinkParsing.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ITerminalProcessManager } from '../../../terminal/common/terminal.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { isWindows, OperatingSystem, OS } from '../../../../../base/common/platform.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { IPath, posix, win32 } from '../../../../../base/common/path.js';
+import { ITerminalBackend } from '../../../../../platform/terminal/common/terminal.js';
+import { mainWindow } from '../../../../../base/browser/window.js';
 
 export class TerminalLinkResolver implements ITerminalLinkResolver {
 	// Link cache could be shared across all terminals, but that could lead to weird results when
diff --git a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLocalLinkDetector.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLocalLinkDetector.ts
index adee3ee9f1f..3cfea79b814 100644
--- a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLocalLinkDetector.ts
+++ b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLocalLinkDetector.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { OS } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { ITerminalLinkDetector, ITerminalLinkResolver, ITerminalSimpleLink, ResolvedLink, TerminalBuiltinLinkType } from 'vs/workbench/contrib/terminalContrib/links/browser/links';
-import { convertLinkRangeToBuffer, getXtermLineContent, getXtermRangesByAttr, osPathModule, updateLinkWithRelativeCwd } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkHelpers';
-import { ITerminalCapabilityStore, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
+import { OS } from '../../../../../base/common/platform.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { ITerminalLinkDetector, ITerminalLinkResolver, ITerminalSimpleLink, ResolvedLink, TerminalBuiltinLinkType } from './links.js';
+import { convertLinkRangeToBuffer, getXtermLineContent, getXtermRangesByAttr, osPathModule, updateLinkWithRelativeCwd } from './terminalLinkHelpers.js';
+import { ITerminalCapabilityStore, TerminalCapability } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
 import type { IBufferLine, IBufferRange, Terminal } from '@xterm/xterm';
-import { ITerminalProcessManager } from 'vs/workbench/contrib/terminal/common/terminal';
-import { detectLinks } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkParsing';
-import { ITerminalBackend, ITerminalLogService } from 'vs/platform/terminal/common/terminal';
+import { ITerminalProcessManager } from '../../../terminal/common/terminal.js';
+import { detectLinks } from './terminalLinkParsing.js';
+import { ITerminalBackend, ITerminalLogService } from '../../../../../platform/terminal/common/terminal.js';
 
 const enum Constants {
 	/**
diff --git a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalMultiLineLinkDetector.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalMultiLineLinkDetector.ts
index cb93cee241b..25d7f77ea64 100644
--- a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalMultiLineLinkDetector.ts
+++ b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalMultiLineLinkDetector.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { ITerminalLinkDetector, ITerminalLinkResolver, ITerminalSimpleLink, TerminalBuiltinLinkType } from 'vs/workbench/contrib/terminalContrib/links/browser/links';
-import { convertLinkRangeToBuffer, getXtermLineContent } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkHelpers';
+import { URI } from '../../../../../base/common/uri.js';
+import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { ITerminalLinkDetector, ITerminalLinkResolver, ITerminalSimpleLink, TerminalBuiltinLinkType } from './links.js';
+import { convertLinkRangeToBuffer, getXtermLineContent } from './terminalLinkHelpers.js';
 import type { IBufferLine, Terminal } from '@xterm/xterm';
-import { ITerminalProcessManager } from 'vs/workbench/contrib/terminal/common/terminal';
-import { ITerminalBackend, ITerminalLogService } from 'vs/platform/terminal/common/terminal';
+import { ITerminalProcessManager } from '../../../terminal/common/terminal.js';
+import { ITerminalBackend, ITerminalLogService } from '../../../../../platform/terminal/common/terminal.js';
 
 const enum Constants {
 	/**
diff --git a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalUriLinkDetector.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalUriLinkDetector.ts
index 186280faf60..07a80598c5e 100644
--- a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalUriLinkDetector.ts
+++ b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalUriLinkDetector.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { ILinkComputerTarget, LinkComputer } from 'vs/editor/common/languages/linkComputer';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { ITerminalLinkDetector, ITerminalLinkResolver, ITerminalSimpleLink, TerminalBuiltinLinkType } from 'vs/workbench/contrib/terminalContrib/links/browser/links';
-import { convertLinkRangeToBuffer, getXtermLineContent } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkHelpers';
-import { ITerminalProcessManager } from 'vs/workbench/contrib/terminal/common/terminal';
+import { Schemas } from '../../../../../base/common/network.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ILinkComputerTarget, LinkComputer } from '../../../../../editor/common/languages/linkComputer.js';
+import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { ITerminalLinkDetector, ITerminalLinkResolver, ITerminalSimpleLink, TerminalBuiltinLinkType } from './links.js';
+import { convertLinkRangeToBuffer, getXtermLineContent } from './terminalLinkHelpers.js';
+import { ITerminalProcessManager } from '../../../terminal/common/terminal.js';
 import type { IBufferLine, Terminal } from '@xterm/xterm';
-import { ITerminalBackend, ITerminalLogService } from 'vs/platform/terminal/common/terminal';
+import { ITerminalBackend, ITerminalLogService } from '../../../../../platform/terminal/common/terminal.js';
 
 const enum Constants {
 	/**
diff --git a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalWordLinkDetector.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalWordLinkDetector.ts
index 02a9b2cc39f..feb1584e6c7 100644
--- a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalWordLinkDetector.ts
+++ b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalWordLinkDetector.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { escapeRegExpCharacters } from 'vs/base/common/strings';
-import { URI } from 'vs/base/common/uri';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { matchesScheme } from 'vs/base/common/network';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { TerminalSettingId } from 'vs/platform/terminal/common/terminal';
-import { ITerminalSimpleLink, ITerminalLinkDetector, TerminalBuiltinLinkType } from 'vs/workbench/contrib/terminalContrib/links/browser/links';
-import { convertLinkRangeToBuffer, getXtermLineContent } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkHelpers';
-import { ITerminalConfiguration, TERMINAL_CONFIG_SECTION } from 'vs/workbench/contrib/terminal/common/terminal';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { escapeRegExpCharacters } from '../../../../../base/common/strings.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { matchesScheme } from '../../../../../base/common/network.js';
+import { IProductService } from '../../../../../platform/product/common/productService.js';
+import { TerminalSettingId } from '../../../../../platform/terminal/common/terminal.js';
+import { ITerminalSimpleLink, ITerminalLinkDetector, TerminalBuiltinLinkType } from './links.js';
+import { convertLinkRangeToBuffer, getXtermLineContent } from './terminalLinkHelpers.js';
+import { ITerminalConfiguration, TERMINAL_CONFIG_SECTION } from '../../../terminal/common/terminal.js';
 import type { IBufferLine, Terminal } from '@xterm/xterm';
 
 const enum Constants {
diff --git a/src/vs/workbench/contrib/terminalContrib/links/test/browser/linkTestUtils.ts b/src/vs/workbench/contrib/terminalContrib/links/test/browser/linkTestUtils.ts
index 9e7fb9f5cbe..ce8108e722f 100644
--- a/src/vs/workbench/contrib/terminalContrib/links/test/browser/linkTestUtils.ts
+++ b/src/vs/workbench/contrib/terminalContrib/links/test/browser/linkTestUtils.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { deepStrictEqual } from 'assert';
-import { ITerminalLinkDetector, TerminalLinkType } from 'vs/workbench/contrib/terminalContrib/links/browser/links';
-import { URI } from 'vs/base/common/uri';
+import { ITerminalLinkDetector, TerminalLinkType } from '../../browser/links.js';
+import { URI } from '../../../../../../base/common/uri.js';
 import type { IBufferLine } from '@xterm/xterm';
 
 export async function assertLinkHelper(
diff --git a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkHelpers.test.ts b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkHelpers.test.ts
index 80c28af6297..a572e7d2c11 100644
--- a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkHelpers.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkHelpers.test.ts
@@ -5,8 +5,8 @@
 
 import assert from 'assert';
 import type { IBufferLine, IBufferCell } from '@xterm/xterm';
-import { convertLinkRangeToBuffer } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkHelpers';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { convertLinkRangeToBuffer } from '../../browser/terminalLinkHelpers.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
 
 suite('Workbench - Terminal Link Helpers', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkManager.test.ts b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkManager.test.ts
index 8f976834e4c..36819e26b7b 100644
--- a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkManager.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkManager.test.ts
@@ -4,27 +4,27 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { deepStrictEqual, strictEqual } from 'assert';
-import { equals } from 'vs/base/common/arrays';
-import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { ContextMenuService } from 'vs/platform/contextview/browser/contextMenuService';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { ILogService, NullLogService } from 'vs/platform/log/common/log';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
-import { IViewDescriptorService } from 'vs/workbench/common/views';
-import { IDetectedLinks, TerminalLinkManager } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkManager';
-import { ITerminalCapabilityImplMap, ITerminalCapabilityStore, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { ITerminalConfiguration, ITerminalProcessManager } from 'vs/workbench/contrib/terminal/common/terminal';
-import { TestViewDescriptorService } from 'vs/workbench/contrib/terminal/test/browser/xterm/xtermTerminal.test';
-import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
+import { equals } from '../../../../../../base/common/arrays.js';
+import { IEditorOptions } from '../../../../../../editor/common/config/editorOptions.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { ContextMenuService } from '../../../../../../platform/contextview/browser/contextMenuService.js';
+import { IContextMenuService } from '../../../../../../platform/contextview/browser/contextView.js';
+import { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { ILogService, NullLogService } from '../../../../../../platform/log/common/log.js';
+import { IStorageService } from '../../../../../../platform/storage/common/storage.js';
+import { IThemeService } from '../../../../../../platform/theme/common/themeService.js';
+import { TestThemeService } from '../../../../../../platform/theme/test/common/testThemeService.js';
+import { IViewDescriptorService } from '../../../../../common/views.js';
+import { IDetectedLinks, TerminalLinkManager } from '../../browser/terminalLinkManager.js';
+import { ITerminalCapabilityImplMap, ITerminalCapabilityStore, TerminalCapability } from '../../../../../../platform/terminal/common/capabilities/capabilities.js';
+import { ITerminalConfiguration, ITerminalProcessManager } from '../../../../terminal/common/terminal.js';
+import { TestViewDescriptorService } from '../../../../terminal/test/browser/xterm/xtermTerminal.test.js';
+import { TestStorageService } from '../../../../../test/common/workbenchTestServices.js';
 import type { ILink, Terminal } from '@xterm/xterm';
-import { TerminalLinkResolver } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkResolver';
-import { importAMDNodeModule } from 'vs/amdX';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { TerminalLinkResolver } from '../../browser/terminalLinkResolver.js';
+import { importAMDNodeModule } from '../../../../../../amdX.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
 
 const defaultTerminalConfig: Partial<ITerminalConfiguration> = {
 	fontFamily: 'monospace',
diff --git a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkOpeners.test.ts b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkOpeners.test.ts
index f5032e258ac..d2e7a0ee776 100644
--- a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkOpeners.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkOpeners.test.ts
@@ -4,31 +4,31 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { deepStrictEqual } from 'assert';
-import { Schemas } from 'vs/base/common/network';
-import { OperatingSystem } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { ITextEditorSelection, ITextResourceEditorInput } from 'vs/platform/editor/common/editor';
-import { IFileService, IFileStatWithPartialMetadata } from 'vs/platform/files/common/files';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { ILogService, NullLogService } from 'vs/platform/log/common/log';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { CommandDetectionCapability } from 'vs/platform/terminal/common/capabilities/commandDetectionCapability';
-import { TerminalBuiltinLinkType } from 'vs/workbench/contrib/terminalContrib/links/browser/links';
-import { TerminalLocalFileLinkOpener, TerminalLocalFolderInWorkspaceLinkOpener, TerminalSearchLinkOpener } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkOpeners';
-import { TerminalCapability, IXtermMarker } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { TerminalCapabilityStore } from 'vs/platform/terminal/common/capabilities/terminalCapabilityStore';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { TestContextService } from 'vs/workbench/test/common/workbenchTestServices';
+import { Schemas } from '../../../../../../base/common/network.js';
+import { OperatingSystem } from '../../../../../../base/common/platform.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { ITextEditorSelection, ITextResourceEditorInput } from '../../../../../../platform/editor/common/editor.js';
+import { IFileService, IFileStatWithPartialMetadata } from '../../../../../../platform/files/common/files.js';
+import { FileService } from '../../../../../../platform/files/common/fileService.js';
+import { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { ILogService, NullLogService } from '../../../../../../platform/log/common/log.js';
+import { IQuickInputService } from '../../../../../../platform/quickinput/common/quickInput.js';
+import { IWorkspaceContextService } from '../../../../../../platform/workspace/common/workspace.js';
+import { CommandDetectionCapability } from '../../../../../../platform/terminal/common/capabilities/commandDetectionCapability.js';
+import { TerminalBuiltinLinkType } from '../../browser/links.js';
+import { TerminalLocalFileLinkOpener, TerminalLocalFolderInWorkspaceLinkOpener, TerminalSearchLinkOpener } from '../../browser/terminalLinkOpeners.js';
+import { TerminalCapability, IXtermMarker } from '../../../../../../platform/terminal/common/capabilities/capabilities.js';
+import { TerminalCapabilityStore } from '../../../../../../platform/terminal/common/capabilities/terminalCapabilityStore.js';
+import { IEditorService } from '../../../../../services/editor/common/editorService.js';
+import { IWorkbenchEnvironmentService } from '../../../../../services/environment/common/environmentService.js';
+import { TestContextService } from '../../../../../test/common/workbenchTestServices.js';
 import type { Terminal } from '@xterm/xterm';
-import { IFileQuery, ISearchComplete, ISearchService } from 'vs/workbench/services/search/common/search';
-import { SearchService } from 'vs/workbench/services/search/common/searchService';
-import { ITerminalLogService } from 'vs/platform/terminal/common/terminal';
-import { importAMDNodeModule } from 'vs/amdX';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { TerminalCommand } from 'vs/platform/terminal/common/capabilities/commandDetection/terminalCommand';
+import { IFileQuery, ISearchComplete, ISearchService } from '../../../../../services/search/common/search.js';
+import { SearchService } from '../../../../../services/search/common/searchService.js';
+import { ITerminalLogService } from '../../../../../../platform/terminal/common/terminal.js';
+import { importAMDNodeModule } from '../../../../../../amdX.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { TerminalCommand } from '../../../../../../platform/terminal/common/capabilities/commandDetection/terminalCommand.js';
 
 interface ITerminalLinkActivationResult {
 	source: 'editor' | 'search';
diff --git a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkParsing.test.ts b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkParsing.test.ts
index 04e4aeb5e9b..099e639ee82 100644
--- a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkParsing.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkParsing.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { deepStrictEqual, ok, strictEqual } from 'assert';
-import { OperatingSystem } from 'vs/base/common/platform';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { detectLinks, detectLinkSuffixes, getLinkSuffix, IParsedLink, removeLinkQueryString, removeLinkSuffix } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkParsing';
+import { OperatingSystem } from '../../../../../../base/common/platform.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { detectLinks, detectLinkSuffixes, getLinkSuffix, IParsedLink, removeLinkQueryString, removeLinkSuffix } from '../../browser/terminalLinkParsing.js';
 
 interface ITestLink {
 	link: string;
@@ -125,6 +125,8 @@ const testLinks: ITestLink[] = [
 	{ link: 'foo: (339)', prefix: undefined, suffix: ': (339)', hasRow: true, hasCol: false },
 	{ link: 'foo: (339,12)', prefix: undefined, suffix: ': (339,12)', hasRow: true, hasCol: true },
 	{ link: 'foo: (339, 12)', prefix: undefined, suffix: ': (339, 12)', hasRow: true, hasCol: true },
+	{ link: 'foo(339:12)', prefix: undefined, suffix: '(339:12)', hasRow: true, hasCol: true },
+	{ link: 'foo (339:12)', prefix: undefined, suffix: ' (339:12)', hasRow: true, hasCol: true },
 
 	// Square brackets
 	{ link: 'foo[339]', prefix: undefined, suffix: '[339]', hasRow: true, hasCol: false },
@@ -136,6 +138,8 @@ const testLinks: ITestLink[] = [
 	{ link: 'foo: [339]', prefix: undefined, suffix: ': [339]', hasRow: true, hasCol: false },
 	{ link: 'foo: [339,12]', prefix: undefined, suffix: ': [339,12]', hasRow: true, hasCol: true },
 	{ link: 'foo: [339, 12]', prefix: undefined, suffix: ': [339, 12]', hasRow: true, hasCol: true },
+	{ link: 'foo[339:12]', prefix: undefined, suffix: '[339:12]', hasRow: true, hasCol: true },
+	{ link: 'foo [339:12]', prefix: undefined, suffix: ' [339:12]', hasRow: true, hasCol: true },
 
 	// OCaml-style
 	{ link: '"foo", line 339, character 12', prefix: '"', suffix: '", line 339, character 12', hasRow: true, hasCol: true },
diff --git a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLocalLinkDetector.test.ts b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLocalLinkDetector.test.ts
index 785ad9658ab..df3d642769a 100644
--- a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLocalLinkDetector.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLocalLinkDetector.test.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isWindows, OperatingSystem } from 'vs/base/common/platform';
-import { format } from 'vs/base/common/strings';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { TerminalBuiltinLinkType } from 'vs/workbench/contrib/terminalContrib/links/browser/links';
-import { TerminalLocalLinkDetector } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLocalLinkDetector';
-import { TerminalCapabilityStore } from 'vs/platform/terminal/common/capabilities/terminalCapabilityStore';
-import { assertLinkHelper } from 'vs/workbench/contrib/terminalContrib/links/test/browser/linkTestUtils';
+import { isWindows, OperatingSystem } from '../../../../../../base/common/platform.js';
+import { format } from '../../../../../../base/common/strings.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { TerminalBuiltinLinkType } from '../../browser/links.js';
+import { TerminalLocalLinkDetector } from '../../browser/terminalLocalLinkDetector.js';
+import { TerminalCapabilityStore } from '../../../../../../platform/terminal/common/capabilities/terminalCapabilityStore.js';
+import { assertLinkHelper } from './linkTestUtils.js';
 import type { Terminal } from '@xterm/xterm';
-import { timeout } from 'vs/base/common/async';
+import { timeout } from '../../../../../../base/common/async.js';
 import { strictEqual } from 'assert';
-import { TerminalLinkResolver } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkResolver';
-import { IFileService } from 'vs/platform/files/common/files';
-import { createFileStat } from 'vs/workbench/test/common/workbenchTestServices';
-import { URI } from 'vs/base/common/uri';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { ITerminalLogService } from 'vs/platform/terminal/common/terminal';
-import { importAMDNodeModule } from 'vs/amdX';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { TerminalLinkResolver } from '../../browser/terminalLinkResolver.js';
+import { IFileService } from '../../../../../../platform/files/common/files.js';
+import { createFileStat } from '../../../../../test/common/workbenchTestServices.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { NullLogService } from '../../../../../../platform/log/common/log.js';
+import { ITerminalLogService } from '../../../../../../platform/terminal/common/terminal.js';
+import { importAMDNodeModule } from '../../../../../../amdX.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
 
 const unixLinks: (string | { link: string; resource: URI })[] = [
 	// Absolute
@@ -110,6 +110,8 @@ const supportedLinkFormats: LinkFormatInfo[] = [
 	{ urlFormat: '{0}({1}, {2})', line: '5', column: '3' },
 	{ urlFormat: '{0} ({1}, {2})', line: '5', column: '3' },
 	{ urlFormat: '{0}: ({1}, {2})', line: '5', column: '3' },
+	{ urlFormat: '{0}({1}:{2})', line: '5', column: '3' },
+	{ urlFormat: '{0} ({1}:{2})', line: '5', column: '3' },
 	{ urlFormat: '{0}:{1}', line: '5' },
 	{ urlFormat: '{0}:{1}:{2}', line: '5', column: '3' },
 	{ urlFormat: '{0} {1}:{2}', line: '5', column: '3' },
@@ -121,6 +123,8 @@ const supportedLinkFormats: LinkFormatInfo[] = [
 	{ urlFormat: '{0}[{1}, {2}]', line: '5', column: '3' },
 	{ urlFormat: '{0} [{1}, {2}]', line: '5', column: '3' },
 	{ urlFormat: '{0}: [{1}, {2}]', line: '5', column: '3' },
+	{ urlFormat: '{0}[{1}:{2}]', line: '5', column: '3' },
+	{ urlFormat: '{0} [{1}:{2}]', line: '5', column: '3' },
 	{ urlFormat: '{0}",{1}', line: '5' },
 	{ urlFormat: '{0}\',{1}', line: '5' },
 	{ urlFormat: '{0}#{1}', line: '5' },
diff --git a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalMultiLineLinkDetector.test.ts b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalMultiLineLinkDetector.test.ts
index bfb219e2fec..0f0c3df7dba 100644
--- a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalMultiLineLinkDetector.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalMultiLineLinkDetector.test.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isWindows, OperatingSystem } from 'vs/base/common/platform';
-import { format } from 'vs/base/common/strings';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { TerminalBuiltinLinkType } from 'vs/workbench/contrib/terminalContrib/links/browser/links';
-import { assertLinkHelper } from 'vs/workbench/contrib/terminalContrib/links/test/browser/linkTestUtils';
+import { isWindows, OperatingSystem } from '../../../../../../base/common/platform.js';
+import { format } from '../../../../../../base/common/strings.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { TerminalBuiltinLinkType } from '../../browser/links.js';
+import { assertLinkHelper } from './linkTestUtils.js';
 import type { Terminal } from '@xterm/xterm';
-import { timeout } from 'vs/base/common/async';
+import { timeout } from '../../../../../../base/common/async.js';
 import { strictEqual } from 'assert';
-import { TerminalLinkResolver } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkResolver';
-import { IFileService } from 'vs/platform/files/common/files';
-import { createFileStat } from 'vs/workbench/test/common/workbenchTestServices';
-import { URI } from 'vs/base/common/uri';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { ITerminalLogService } from 'vs/platform/terminal/common/terminal';
-import { TerminalMultiLineLinkDetector } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalMultiLineLinkDetector';
-import { importAMDNodeModule } from 'vs/amdX';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { TerminalLinkResolver } from '../../browser/terminalLinkResolver.js';
+import { IFileService } from '../../../../../../platform/files/common/files.js';
+import { createFileStat } from '../../../../../test/common/workbenchTestServices.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { NullLogService } from '../../../../../../platform/log/common/log.js';
+import { ITerminalLogService } from '../../../../../../platform/terminal/common/terminal.js';
+import { TerminalMultiLineLinkDetector } from '../../browser/terminalMultiLineLinkDetector.js';
+import { importAMDNodeModule } from '../../../../../../amdX.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
 
 const unixLinks: (string | { link: string; resource: URI })[] = [
 	// Absolute
diff --git a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalUriLinkDetector.test.ts b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalUriLinkDetector.test.ts
index 7d66e369634..51cd9ac3937 100644
--- a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalUriLinkDetector.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalUriLinkDetector.test.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { IFileService } from 'vs/platform/files/common/files';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { TerminalBuiltinLinkType } from 'vs/workbench/contrib/terminalContrib/links/browser/links';
-import { TerminalLinkResolver } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkResolver';
-import { TerminalUriLinkDetector } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalUriLinkDetector';
-import { assertLinkHelper } from 'vs/workbench/contrib/terminalContrib/links/test/browser/linkTestUtils';
-import { createFileStat } from 'vs/workbench/test/common/workbenchTestServices';
-import { URI } from 'vs/base/common/uri';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { IFileService } from '../../../../../../platform/files/common/files.js';
+import { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { TerminalBuiltinLinkType } from '../../browser/links.js';
+import { TerminalLinkResolver } from '../../browser/terminalLinkResolver.js';
+import { TerminalUriLinkDetector } from '../../browser/terminalUriLinkDetector.js';
+import { assertLinkHelper } from './linkTestUtils.js';
+import { createFileStat } from '../../../../../test/common/workbenchTestServices.js';
+import { URI } from '../../../../../../base/common/uri.js';
 import type { Terminal } from '@xterm/xterm';
-import { OperatingSystem } from 'vs/base/common/platform';
-import { importAMDNodeModule } from 'vs/amdX';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { ITerminalLogService } from 'vs/platform/terminal/common/terminal';
+import { OperatingSystem } from '../../../../../../base/common/platform.js';
+import { importAMDNodeModule } from '../../../../../../amdX.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { NullLogService } from '../../../../../../platform/log/common/log.js';
+import { ITerminalLogService } from '../../../../../../platform/terminal/common/terminal.js';
 
 suite('Workbench - TerminalUriLinkDetector', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalWordLinkDetector.test.ts b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalWordLinkDetector.test.ts
index a12ddf68158..b546b5418e5 100644
--- a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalWordLinkDetector.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalWordLinkDetector.test.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { importAMDNodeModule } from 'vs/amdX';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ITerminalSimpleLink, TerminalBuiltinLinkType } from 'vs/workbench/contrib/terminalContrib/links/browser/links';
-import { TerminalWordLinkDetector } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalWordLinkDetector';
-import { assertLinkHelper } from 'vs/workbench/contrib/terminalContrib/links/test/browser/linkTestUtils';
-import { TestProductService } from 'vs/workbench/test/common/workbenchTestServices';
+import { importAMDNodeModule } from '../../../../../../amdX.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { IProductService } from '../../../../../../platform/product/common/productService.js';
+import { ITerminalSimpleLink, TerminalBuiltinLinkType } from '../../browser/links.js';
+import { TerminalWordLinkDetector } from '../../browser/terminalWordLinkDetector.js';
+import { assertLinkHelper } from './linkTestUtils.js';
+import { TestProductService } from '../../../../../test/common/workbenchTestServices.js';
 import type { Terminal } from '@xterm/xterm';
 
 suite('Workbench - TerminalWordLinkDetector', () => {
diff --git a/src/vs/workbench/contrib/terminalContrib/quickAccess/browser/terminal.quickAccess.contribution.ts b/src/vs/workbench/contrib/terminalContrib/quickAccess/browser/terminal.quickAccess.contribution.ts
new file mode 100644
index 00000000000..7729eada81a
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/quickAccess/browser/terminal.quickAccess.contribution.ts
@@ -0,0 +1,40 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as nls from '../../../../../nls.js';
+import { CommandsRegistry } from '../../../../../platform/commands/common/commands.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IQuickAccessRegistry, Extensions as QuickAccessExtensions } from '../../../../../platform/quickinput/common/quickAccess.js';
+import { IQuickInputService } from '../../../../../platform/quickinput/common/quickInput.js';
+import { Registry } from '../../../../../platform/registry/common/platform.js';
+import { getQuickNavigateHandler } from '../../../../browser/quickaccess.js';
+import { registerTerminalAction } from '../../../terminal/browser/terminalActions.js';
+import { TerminalContextKeys } from '../../../terminal/common/terminalContextKey.js';
+import { TerminalQuickAccessProvider } from '../../../terminalContrib/quickAccess/browser/terminalQuickAccess.js';
+
+const enum TerminalQuickAccessCommandId {
+	QuickOpenTerm = 'workbench.action.quickOpenTerm',
+}
+
+const quickAccessRegistry = (Registry.as<IQuickAccessRegistry>(QuickAccessExtensions.Quickaccess));
+const inTerminalsPicker = 'inTerminalPicker';
+quickAccessRegistry.registerQuickAccessProvider({
+	ctor: TerminalQuickAccessProvider,
+	prefix: TerminalQuickAccessProvider.PREFIX,
+	contextKey: inTerminalsPicker,
+	placeholder: nls.localize('tasksQuickAccessPlaceholder', "Type the name of a terminal to open."),
+	helpEntries: [{ description: nls.localize('tasksQuickAccessHelp', "Show All Opened Terminals"), commandId: TerminalQuickAccessCommandId.QuickOpenTerm }]
+});
+const quickAccessNavigateNextInTerminalPickerId = 'workbench.action.quickOpenNavigateNextInTerminalPicker';
+CommandsRegistry.registerCommand({ id: quickAccessNavigateNextInTerminalPickerId, handler: getQuickNavigateHandler(quickAccessNavigateNextInTerminalPickerId, true) });
+const quickAccessNavigatePreviousInTerminalPickerId = 'workbench.action.quickOpenNavigatePreviousInTerminalPicker';
+CommandsRegistry.registerCommand({ id: quickAccessNavigatePreviousInTerminalPickerId, handler: getQuickNavigateHandler(quickAccessNavigatePreviousInTerminalPickerId, false) });
+
+registerTerminalAction({
+	id: TerminalQuickAccessCommandId.QuickOpenTerm,
+	title: nls.localize2('quickAccessTerminal', 'Switch Active Terminal'),
+	precondition: ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated),
+	run: (c, accessor) => accessor.get(IQuickInputService).quickAccess.show(TerminalQuickAccessProvider.PREFIX)
+});
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalQuickAccess.ts b/src/vs/workbench/contrib/terminalContrib/quickAccess/browser/terminalQuickAccess.ts
similarity index 81%
rename from src/vs/workbench/contrib/terminal/browser/terminalQuickAccess.ts
rename to src/vs/workbench/contrib/terminalContrib/quickAccess/browser/terminalQuickAccess.ts
index 6aa5ee283dd..a95a6c85e02 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalQuickAccess.ts
+++ b/src/vs/workbench/contrib/terminalContrib/quickAccess/browser/terminalQuickAccess.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
-import { IPickerQuickAccessItem, PickerQuickAccessProvider, TriggerAction } from 'vs/platform/quickinput/browser/pickerQuickAccess';
-import { matchesFuzzy } from 'vs/base/common/filters';
-import { ITerminalEditorService, ITerminalGroupService, ITerminalInstance, ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { TerminalCommandId } from 'vs/workbench/contrib/terminal/common/terminal';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { killTerminalIcon, renameTerminalIcon } from 'vs/workbench/contrib/terminal/browser/terminalIcons';
-import { getColorClass, getIconId, getUriClasses } from 'vs/workbench/contrib/terminal/browser/terminalIcon';
-import { terminalStrings } from 'vs/workbench/contrib/terminal/common/terminalStrings';
-import { TerminalLocation } from 'vs/platform/terminal/common/terminal';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { localize } from '../../../../../nls.js';
+import { IQuickPickSeparator } from '../../../../../platform/quickinput/common/quickInput.js';
+import { IPickerQuickAccessItem, PickerQuickAccessProvider, TriggerAction } from '../../../../../platform/quickinput/browser/pickerQuickAccess.js';
+import { matchesFuzzy } from '../../../../../base/common/filters.js';
+import { ITerminalEditorService, ITerminalGroupService, ITerminalInstance, ITerminalService } from '../../../terminal/browser/terminal.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { TerminalCommandId } from '../../../terminal/common/terminal.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { killTerminalIcon, renameTerminalIcon } from '../../../terminal/browser/terminalIcons.js';
+import { getColorClass, getIconId, getUriClasses } from '../../../terminal/browser/terminalIcon.js';
+import { terminalStrings } from '../../../terminal/common/terminalStrings.js';
+import { TerminalLocation } from '../../../../../platform/terminal/common/terminal.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 let terminalPicks: Array<IPickerQuickAccessItem | IQuickPickSeparator> = [];
 
 export class TerminalQuickAccessProvider extends PickerQuickAccessProvider<IPickerQuickAccessItem> {
diff --git a/src/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix.ts b/src/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix.ts
index 96c2fec0593..98153d2eac8 100644
--- a/src/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix.ts
+++ b/src/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { Event } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { IAction } from 'vs/base/common/actions';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { URI } from 'vs/base/common/uri';
-import { ITerminalCommandSelector, ITerminalOutputMatch, ITerminalOutputMatcher } from 'vs/platform/terminal/common/terminal';
-import { ITerminalCommand } from 'vs/platform/terminal/common/capabilities/capabilities';
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
+import { Event } from '../../../../../base/common/event.js';
+import { IDisposable } from '../../../../../base/common/lifecycle.js';
+import { IAction } from '../../../../../base/common/actions.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ITerminalCommandSelector, ITerminalOutputMatch, ITerminalOutputMatcher } from '../../../../../platform/terminal/common/terminal.js';
+import { ITerminalCommand } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
 
 export const ITerminalQuickFixService = createDecorator<ITerminalQuickFixService>('terminalQuickFixService');
 export interface ITerminalQuickFixService {
diff --git a/src/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFixAddon.ts b/src/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFixAddon.ts
index 2122ab42b13..c117ec17544 100644
--- a/src/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFixAddon.ts
+++ b/src/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFixAddon.ts
@@ -3,38 +3,36 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-// Importing types is safe in any layer
-// eslint-disable-next-line local/code-import-patterns
 import type { ITerminalAddon } from '@xterm/headless';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ITerminalCapabilityStore, ITerminalCommand, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
-import * as dom from 'vs/base/browser/dom';
-import { IAction } from 'vs/base/common/actions';
-import { asArray } from 'vs/base/common/arrays';
-import { localize } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { DecorationSelector, updateLayout } from 'vs/workbench/contrib/terminal/browser/xterm/decorationStyles';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { ITerminalCapabilityStore, ITerminalCommand, TerminalCapability } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
+import * as dom from '../../../../../base/browser/dom.js';
+import { IAction } from '../../../../../base/common/actions.js';
+import { asArray } from '../../../../../base/common/arrays.js';
+import { localize } from '../../../../../nls.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
+import { DecorationSelector, updateLayout } from '../../../terminal/browser/xterm/decorationStyles.js';
 import type { IDecoration, Terminal } from '@xterm/xterm';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { AccessibilitySignal, IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { IActionWidgetService } from 'vs/platform/actionWidget/browser/actionWidget';
-import { ActionSet } from 'vs/platform/actionWidget/common/actionWidget';
-import { getLinesForCommand } from 'vs/platform/terminal/common/capabilities/commandDetectionCapability';
-import { IAnchor } from 'vs/base/browser/ui/contextview/contextview';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { ITerminalQuickFixInternalOptions, ITerminalQuickFixResolvedExtensionOptions, ITerminalQuickFix, ITerminalQuickFixTerminalCommandAction, ITerminalQuickFixOpenerAction, ITerminalQuickFixOptions, ITerminalQuickFixProviderSelector, ITerminalQuickFixService, ITerminalQuickFixUnresolvedExtensionOptions, TerminalQuickFixType, ITerminalQuickFixCommandAction } from 'vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix';
-import { ITerminalCommandSelector } from 'vs/platform/terminal/common/terminal';
-import { ActionListItemKind, IActionListItem } from 'vs/platform/actionWidget/browser/actionList';
-import { CodeActionKind } from 'vs/editor/contrib/codeAction/common/types';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { ICommandService } from 'vs/platform/commands/common/commands';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { IExtensionService } from '../../../../services/extensions/common/extensions.js';
+import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { IActionWidgetService } from '../../../../../platform/actionWidget/browser/actionWidget.js';
+import { ActionSet } from '../../../../../platform/actionWidget/common/actionWidget.js';
+import { getLinesForCommand } from '../../../../../platform/terminal/common/capabilities/commandDetectionCapability.js';
+import { IAnchor } from '../../../../../base/browser/ui/contextview/contextview.js';
+import { ILabelService } from '../../../../../platform/label/common/label.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ITerminalQuickFixInternalOptions, ITerminalQuickFixResolvedExtensionOptions, ITerminalQuickFix, ITerminalQuickFixTerminalCommandAction, ITerminalQuickFixOpenerAction, ITerminalQuickFixOptions, ITerminalQuickFixProviderSelector, ITerminalQuickFixService, ITerminalQuickFixUnresolvedExtensionOptions, TerminalQuickFixType, ITerminalQuickFixCommandAction } from './quickFix.js';
+import { ITerminalCommandSelector } from '../../../../../platform/terminal/common/terminal.js';
+import { ActionListItemKind, IActionListItem } from '../../../../../platform/actionWidget/browser/actionList.js';
+import { CodeActionKind } from '../../../../../editor/contrib/codeAction/common/types.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
 
 const enum QuickFixDecorationSelector {
 	QuickFix = 'quick-fix'
@@ -249,7 +247,7 @@ export class TerminalQuickFixAddon extends Disposable implements ITerminalAddon,
 		if (!marker) {
 			return;
 		}
-		const decoration = this._terminal.registerDecoration({ marker, layer: 'top' });
+		const decoration = this._terminal.registerDecoration({ marker, width: 2, layer: 'top' });
 		if (!decoration) {
 			return;
 		}
@@ -286,7 +284,7 @@ export class TerminalQuickFixAddon extends Disposable implements ITerminalAddon,
 			updateLayout(this._configurationService, e);
 			this._accessibilitySignalService.playSignal(AccessibilitySignal.terminalQuickFix);
 
-			const parentElement = (e.closest('.xterm') as HTMLElement).parentElement;
+			const parentElement = e.closest('.xterm')?.parentElement;
 			if (!parentElement) {
 				return;
 			}
diff --git a/src/vs/workbench/contrib/terminalContrib/quickFix/browser/terminal.quickFix.contribution.ts b/src/vs/workbench/contrib/terminalContrib/quickFix/browser/terminal.quickFix.contribution.ts
index 9533aa208d5..783e9107c14 100644
--- a/src/vs/workbench/contrib/terminalContrib/quickFix/browser/terminal.quickFix.contribution.ts
+++ b/src/vs/workbench/contrib/terminalContrib/quickFix/browser/terminal.quickFix.contribution.ts
@@ -3,24 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/terminalQuickFix';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { localize2 } from 'vs/nls';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ITerminalContribution, ITerminalInstance, IXtermTerminal } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { registerActiveInstanceAction } from 'vs/workbench/contrib/terminal/browser/terminalActions';
-import { registerTerminalContribution } from 'vs/workbench/contrib/terminal/browser/terminalExtensions';
-import { TerminalWidgetManager } from 'vs/workbench/contrib/terminal/browser/widgets/widgetManager';
-import { ITerminalProcessManager } from 'vs/workbench/contrib/terminal/common/terminal';
-import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey';
-import { ITerminalQuickFixService } from 'vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix';
-import { TerminalQuickFixAddon } from 'vs/workbench/contrib/terminalContrib/quickFix/browser/quickFixAddon';
-import { freePort, gitCreatePr, gitPull, gitPushSetUpstream, gitSimilar, gitTwoDashes, pwshGeneralError, pwshUnixCommandNotFoundError } from 'vs/workbench/contrib/terminalContrib/quickFix/browser/terminalQuickFixBuiltinActions';
-import { TerminalQuickFixService } from 'vs/workbench/contrib/terminalContrib/quickFix/browser/terminalQuickFixService';
 import type { Terminal as RawXtermTerminal } from '@xterm/xterm';
+import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { localize2 } from '../../../../../nls.js';
+import { InstantiationType, registerSingleton } from '../../../../../platform/instantiation/common/extensions.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ITerminalContribution, ITerminalInstance, IXtermTerminal } from '../../../terminal/browser/terminal.js';
+import { registerActiveInstanceAction } from '../../../terminal/browser/terminalActions.js';
+import { registerTerminalContribution, type ITerminalContributionContext } from '../../../terminal/browser/terminalExtensions.js';
+import { TerminalContextKeys } from '../../../terminal/common/terminalContextKey.js';
+import './media/terminalQuickFix.css';
+import { ITerminalQuickFixService } from './quickFix.js';
+import { TerminalQuickFixAddon } from './quickFixAddon.js';
+import { freePort, gitCreatePr, gitFastForwardPull, gitPushSetUpstream, gitSimilar, gitTwoDashes, pwshGeneralError, pwshUnixCommandNotFoundError } from './terminalQuickFixBuiltinActions.js';
+import { TerminalQuickFixService } from './terminalQuickFixService.js';
 
 // #region Services
 
@@ -41,9 +39,7 @@ class TerminalQuickFixContribution extends DisposableStore implements ITerminalC
 	get addon(): TerminalQuickFixAddon | undefined { return this._addon; }
 
 	constructor(
-		private readonly _instance: ITerminalInstance,
-		processManager: ITerminalProcessManager,
-		widgetManager: TerminalWidgetManager,
+		private readonly _ctx: ITerminalContributionContext,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 	) {
 		super();
@@ -51,17 +47,17 @@ class TerminalQuickFixContribution extends DisposableStore implements ITerminalC
 
 	xtermReady(xterm: IXtermTerminal & { raw: RawXtermTerminal }): void {
 		// Create addon
-		this._addon = this._instantiationService.createInstance(TerminalQuickFixAddon, undefined, this._instance.capabilities);
+		this._addon = this._instantiationService.createInstance(TerminalQuickFixAddon, undefined, this._ctx.instance.capabilities);
 		xterm.raw.loadAddon(this._addon);
 
 		// Hook up listeners
-		this.add(this._addon.onDidRequestRerunCommand((e) => this._instance.runCommand(e.command, e.shouldExecute || false)));
+		this.add(this._addon.onDidRequestRerunCommand((e) => this._ctx.instance.runCommand(e.command, e.shouldExecute || false)));
 
 		// Register quick fixes
 		for (const actionOption of [
 			gitTwoDashes(),
-			gitPull(),
-			freePort((port: string, command: string) => this._instance.freePortKillProcess(port, command)),
+			gitFastForwardPull(),
+			freePort((port: string, command: string) => this._ctx.instance.freePortKillProcess(port, command)),
 			gitSimilar(),
 			gitPushSetUpstream(),
 			gitCreatePr(),
diff --git a/src/vs/workbench/contrib/terminalContrib/quickFix/browser/terminalQuickFixBuiltinActions.ts b/src/vs/workbench/contrib/terminalContrib/quickFix/browser/terminalQuickFixBuiltinActions.ts
index f17970dd14b..8ae5a01f2e4 100644
--- a/src/vs/workbench/contrib/terminalContrib/quickFix/browser/terminalQuickFixBuiltinActions.ts
+++ b/src/vs/workbench/contrib/terminalContrib/quickFix/browser/terminalQuickFixBuiltinActions.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { ITerminalQuickFixInternalOptions, ITerminalCommandMatchResult, ITerminalQuickFixTerminalCommandAction, TerminalQuickFixActionInternal, TerminalQuickFixType } from 'vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix';
+import { URI } from '../../../../../base/common/uri.js';
+import { localize } from '../../../../../nls.js';
+import { ITerminalQuickFixInternalOptions, ITerminalCommandMatchResult, ITerminalQuickFixTerminalCommandAction, TerminalQuickFixActionInternal, TerminalQuickFixType } from './quickFix.js';
 
 export const GitCommandLineRegex = /git/;
-export const GitPullOutputRegex = /and can be fast-forwarded/;
+export const GitFastForwardPullOutputRegex = /and can be fast-forwarded/;
 export const GitPushCommandLineRegex = /git\s+push/;
 export const GitTwoDashesRegex = /error: did you mean `--(.+)` \(with two dashes\)\?/;
 export const GitSimilarOutputRegex = /(?:(most similar commands? (is|are)))/;
@@ -61,13 +61,13 @@ export function gitSimilar(): ITerminalQuickFixInternalOptions {
 	};
 }
 
-export function gitPull(): ITerminalQuickFixInternalOptions {
+export function gitFastForwardPull(): ITerminalQuickFixInternalOptions {
 	return {
-		id: 'Git Pull',
+		id: 'Git Fast Forward Pull',
 		type: 'internal',
 		commandLineMatcher: GitCommandLineRegex,
 		outputMatcher: {
-			lineMatcher: GitPullOutputRegex,
+			lineMatcher: GitFastForwardPullOutputRegex,
 			anchor: 'bottom',
 			offset: 0,
 			length: 8
@@ -76,7 +76,7 @@ export function gitPull(): ITerminalQuickFixInternalOptions {
 		getQuickFixes: (matchResult: ITerminalCommandMatchResult) => {
 			return {
 				type: TerminalQuickFixType.TerminalCommand,
-				id: 'Git Pull',
+				id: 'Git Fast Forward Pull',
 				terminalCommand: `git pull`,
 				shouldExecute: true,
 				source: QuickFixSource.Builtin
diff --git a/src/vs/workbench/contrib/terminalContrib/quickFix/browser/terminalQuickFixService.ts b/src/vs/workbench/contrib/terminalContrib/quickFix/browser/terminalQuickFixService.ts
index 35851c4137e..55ff138f7ff 100644
--- a/src/vs/workbench/contrib/terminalContrib/quickFix/browser/terminalQuickFixService.ts
+++ b/src/vs/workbench/contrib/terminalContrib/quickFix/browser/terminalQuickFixService.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { localize } from 'vs/nls';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ITerminalCommandSelector } from 'vs/platform/terminal/common/terminal';
-import { ITerminalQuickFixService, ITerminalQuickFixProvider, ITerminalQuickFixProviderSelector } from 'vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix';
-import { isProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
-import { ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
+import { Emitter } from '../../../../../base/common/event.js';
+import { IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { localize } from '../../../../../nls.js';
+import { ILogService } from '../../../../../platform/log/common/log.js';
+import { ITerminalCommandSelector } from '../../../../../platform/terminal/common/terminal.js';
+import { ITerminalQuickFixService, ITerminalQuickFixProvider, ITerminalQuickFixProviderSelector } from './quickFix.js';
+import { isProposedApiEnabled } from '../../../../services/extensions/common/extensions.js';
+import { ExtensionsRegistry } from '../../../../services/extensions/common/extensionsRegistry.js';
 
 export class TerminalQuickFixService implements ITerminalQuickFixService {
 	declare _serviceBrand: undefined;
diff --git a/src/vs/workbench/contrib/terminalContrib/quickFix/test/browser/quickFixAddon.test.ts b/src/vs/workbench/contrib/terminalContrib/quickFix/test/browser/quickFixAddon.test.ts
index 0607960f0d4..80de4ef823c 100644
--- a/src/vs/workbench/contrib/terminalContrib/quickFix/test/browser/quickFixAddon.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/quickFix/test/browser/quickFixAddon.test.ts
@@ -3,34 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { strictEqual } from 'assert';
-import { IAction } from 'vs/base/common/actions';
-import { isWindows } from 'vs/base/common/platform';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { ContextMenuService } from 'vs/platform/contextview/browser/contextMenuService';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { ILogService, NullLogService } from 'vs/platform/log/common/log';
-import { ITerminalCommand, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { CommandDetectionCapability } from 'vs/platform/terminal/common/capabilities/commandDetectionCapability';
-import { TerminalCapabilityStore } from 'vs/platform/terminal/common/capabilities/terminalCapabilityStore';
-import { gitSimilar, freePort, FreePortOutputRegex, gitCreatePr, GitCreatePrOutputRegex, GitPushOutputRegex, gitPushSetUpstream, GitSimilarOutputRegex, gitTwoDashes, GitTwoDashesRegex, pwshUnixCommandNotFoundError, PwshUnixCommandNotFoundErrorOutputRegex, pwshGeneralError, PwshGeneralErrorOutputRegex, gitPull, GitPullOutputRegex } from 'vs/workbench/contrib/terminalContrib/quickFix/browser/terminalQuickFixBuiltinActions';
-import { TerminalQuickFixAddon, getQuickFixesForCommand } from 'vs/workbench/contrib/terminalContrib/quickFix/browser/quickFixAddon';
-import { URI } from 'vs/base/common/uri';
 import type { Terminal } from '@xterm/xterm';
-import { Event } from 'vs/base/common/event';
-import { LabelService } from 'vs/workbench/services/label/common/labelService';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { OpenerService } from 'vs/editor/browser/services/openerService';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
-import { ITerminalQuickFixService } from 'vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix';
-import { ITerminalOutputMatcher } from 'vs/platform/terminal/common/terminal';
-import { importAMDNodeModule } from 'vs/amdX';
-import { TestCommandService } from 'vs/editor/test/browser/editorTestServices';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { strictEqual } from 'assert';
+import { importAMDNodeModule } from '../../../../../../amdX.js';
+import { IAction } from '../../../../../../base/common/actions.js';
+import { Event } from '../../../../../../base/common/event.js';
+import { isWindows } from '../../../../../../base/common/platform.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { TestCommandService } from '../../../../../../editor/test/browser/editorTestServices.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { ContextMenuService } from '../../../../../../platform/contextview/browser/contextMenuService.js';
+import { IContextMenuService } from '../../../../../../platform/contextview/browser/contextView.js';
+import { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { ILabelService } from '../../../../../../platform/label/common/label.js';
+import { ILogService, NullLogService } from '../../../../../../platform/log/common/log.js';
+import { IOpenerService } from '../../../../../../platform/opener/common/opener.js';
+import { IStorageService } from '../../../../../../platform/storage/common/storage.js';
+import { ITerminalCommand, TerminalCapability } from '../../../../../../platform/terminal/common/capabilities/capabilities.js';
+import { CommandDetectionCapability } from '../../../../../../platform/terminal/common/capabilities/commandDetectionCapability.js';
+import { TerminalCapabilityStore } from '../../../../../../platform/terminal/common/capabilities/terminalCapabilityStore.js';
+import { ITerminalOutputMatcher } from '../../../../../../platform/terminal/common/terminal.js';
+import { ITerminalQuickFixService } from '../../browser/quickFix.js';
+import { getQuickFixesForCommand, TerminalQuickFixAddon } from '../../browser/quickFixAddon.js';
+import { freePort, FreePortOutputRegex, gitCreatePr, GitCreatePrOutputRegex, gitFastForwardPull, GitFastForwardPullOutputRegex, GitPushOutputRegex, gitPushSetUpstream, gitSimilar, GitSimilarOutputRegex, gitTwoDashes, GitTwoDashesRegex, pwshGeneralError, PwshGeneralErrorOutputRegex, pwshUnixCommandNotFoundError, PwshUnixCommandNotFoundErrorOutputRegex } from '../../browser/terminalQuickFixBuiltinActions.js';
+import { TestStorageService } from '../../../../../test/common/workbenchTestServices.js';
 
 suite('QuickFixAddon', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
@@ -38,8 +36,8 @@ suite('QuickFixAddon', () => {
 	let quickFixAddon: TerminalQuickFixAddon;
 	let commandDetection: CommandDetectionCapability;
 	let commandService: TestCommandService;
-	let openerService: OpenerService;
-	let labelService: LabelService;
+	let openerService: IOpenerService;
+	let labelService: ILabelService;
 	let terminal: Terminal;
 	let instantiationService: TestInstantiationService;
 
@@ -59,13 +57,13 @@ suite('QuickFixAddon', () => {
 			extensionQuickFixes: Promise.resolve([])
 		} as Partial<ITerminalQuickFixService>);
 		instantiationService.stub(IConfigurationService, new TestConfigurationService());
-		instantiationService.stub(ILabelService, {} as Partial<ILabelService>);
+		labelService = instantiationService.stub(ILabelService, {} as Partial<ILabelService>);
 		const capabilities = store.add(new TerminalCapabilityStore());
 		instantiationService.stub(ILogService, new NullLogService());
 		commandDetection = store.add(instantiationService.createInstance(CommandDetectionCapability, terminal));
 		capabilities.add(TerminalCapability.CommandDetection, commandDetection);
 		instantiationService.stub(IContextMenuService, store.add(instantiationService.createInstance(ContextMenuService)));
-		instantiationService.stub(IOpenerService, {} as Partial<IOpenerService>);
+		openerService = instantiationService.stub(IOpenerService, {} as Partial<IOpenerService>);
 		commandService = new TestCommandService(instantiationService);
 
 		quickFixAddon = instantiationService.createInstance(TerminalQuickFixAddon, [], capabilities);
@@ -183,37 +181,37 @@ suite('QuickFixAddon', () => {
 				});
 			});
 		});
-		suite('gitPull', () => {
+		suite('gitFastForwardPull', () => {
 			const expectedMap = new Map();
 			const command = `git checkout vnext`;
 			const output = 'Already on \'vnext\' \n Your branch is behind \'origin/vnext\' by 1 commit, and can be fast-forwarded.';
 			const exitCode = 0;
 			const actions = [{
-				id: 'Git Pull',
+				id: 'Git Fast Forward Pull',
 				enabled: true,
 				label: 'Run: git pull',
 				tooltip: 'Run: git pull',
 				command: 'git pull'
 			}];
 			setup(() => {
-				const command = gitPull();
+				const command = gitFastForwardPull();
 				expectedMap.set(command.commandLineMatcher.toString(), [command]);
 				quickFixAddon.registerCommandFinishedListener(command);
 			});
 			suite('returns undefined when', () => {
 				test('output does not match', async () => {
-					strictEqual((await getQuickFixesForCommand([], terminal, createCommand(command, `invalid output`, GitPullOutputRegex, exitCode), expectedMap, commandService, openerService, labelService)), undefined);
+					strictEqual((await getQuickFixesForCommand([], terminal, createCommand(command, `invalid output`, GitFastForwardPullOutputRegex, exitCode), expectedMap, commandService, openerService, labelService)), undefined);
 				});
 				test('command does not match', async () => {
-					strictEqual((await getQuickFixesForCommand([], terminal, createCommand(`gt add`, output, GitPullOutputRegex, exitCode), expectedMap, commandService, openerService, labelService)), undefined);
+					strictEqual((await getQuickFixesForCommand([], terminal, createCommand(`gt add`, output, GitFastForwardPullOutputRegex, exitCode), expectedMap, commandService, openerService, labelService)), undefined);
 				});
 				test('exit code does not match', async () => {
-					strictEqual((await getQuickFixesForCommand([], terminal, createCommand(command, output, GitPullOutputRegex, 2), expectedMap, commandService, openerService, labelService)), undefined);
+					strictEqual((await getQuickFixesForCommand([], terminal, createCommand(command, output, GitFastForwardPullOutputRegex, 2), expectedMap, commandService, openerService, labelService)), undefined);
 				});
 			});
 			suite('returns actions when', () => {
 				test('matching exit status, command, ouput', async () => {
-					assertMatchOptions((await getQuickFixesForCommand([], terminal, createCommand(command, output, GitPullOutputRegex, exitCode), expectedMap, commandService, openerService, labelService)), actions);
+					assertMatchOptions((await getQuickFixesForCommand([], terminal, createCommand(command, output, GitFastForwardPullOutputRegex, exitCode), expectedMap, commandService, openerService, labelService)), actions);
 				});
 			});
 		});
diff --git a/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/media/stickyScroll.css b/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/media/stickyScroll.css
index bc8e99fb00f..f9ce76efa79 100644
--- a/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/media/stickyScroll.css
+++ b/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/media/stickyScroll.css
@@ -7,10 +7,11 @@
 	display: none;
 	position: absolute;
 	left: 0;
-	right: 0;
-	z-index: 32; /* Must be higher than .xterm-viewport and decorations */
+	right: 14px; /* Don't overlap terminal scroll bar */
+	z-index: 32; /* Must be higher than decorations */
 	background: var(--vscode-terminalStickyScroll-background, var(--vscode-terminal-background, var(--vscode-panel-background)));
 	box-shadow: var(--vscode-scrollbar-shadow) 0 3px 2px -2px;
+	border-bottom: 1px solid var(--vscode-terminalStickyScroll-border, transparent);
 }
 .part.sidebar .terminal-sticky-scroll,
 .part.auxiliarybar .terminal-sticky-scroll {
diff --git a/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminal.stickyScroll.contribution.ts b/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminal.stickyScroll.contribution.ts
index 6f6b7193334..08683e2b142 100644
--- a/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminal.stickyScroll.contribution.ts
+++ b/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminal.stickyScroll.contribution.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/stickyScroll';
-import { localize, localize2 } from 'vs/nls';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { registerTerminalAction } from 'vs/workbench/contrib/terminal/browser/terminalActions';
-import { registerTerminalContribution } from 'vs/workbench/contrib/terminal/browser/terminalExtensions';
-import { TerminalStickyScrollContribution } from 'vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollContribution';
-import { TerminalStickyScrollSettingId } from 'vs/workbench/contrib/terminalContrib/stickyScroll/common/terminalStickyScrollConfiguration';
+import './media/stickyScroll.css';
+import { localize, localize2 } from '../../../../../nls.js';
+import { MenuId } from '../../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { registerTerminalAction } from '../../../terminal/browser/terminalActions.js';
+import { registerTerminalContribution } from '../../../terminal/browser/terminalExtensions.js';
+import { TerminalStickyScrollContribution } from './terminalStickyScrollContribution.js';
+import { TerminalStickyScrollSettingId } from '../common/terminalStickyScrollConfiguration.js';
 
 // #region Terminal Contributions
 
-registerTerminalContribution(TerminalStickyScrollContribution.ID, TerminalStickyScrollContribution, true);
+registerTerminalContribution(TerminalStickyScrollContribution.ID, TerminalStickyScrollContribution);
 
 // #endregion
 
@@ -47,6 +47,6 @@ registerTerminalAction({
 
 // #region Colors
 
-import './terminalStickyScrollColorRegistry';
+import './terminalStickyScrollColorRegistry.js';
 
 // #endregion
diff --git a/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollColorRegistry.ts b/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollColorRegistry.ts
index 5ab1af0d0eb..ff2bc8285f2 100644
--- a/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollColorRegistry.ts
+++ b/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollColorRegistry.ts
@@ -3,20 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Color } from 'vs/base/common/color';
-import { localize } from 'vs/nls';
-import { registerColor } from 'vs/platform/theme/common/colorUtils';
+import { localize } from '../../../../../nls.js';
+import { registerColor } from '../../../../../platform/theme/common/colorUtils.js';
 
-export const terminalStickyScrollBackground = registerColor('terminalStickyScroll.background', {
-	light: null,
-	dark: null,
-	hcDark: null,
-	hcLight: null
-}, localize('terminalStickyScroll.background', 'The background color of the sticky scroll overlay in the terminal.'));
+export const terminalStickyScrollBackground = registerColor('terminalStickyScroll.background', null, localize('terminalStickyScroll.background', 'The background color of the sticky scroll overlay in the terminal.'));
 
 export const terminalStickyScrollHoverBackground = registerColor('terminalStickyScrollHover.background', {
 	dark: '#2A2D2E',
 	light: '#F0F0F0',
-	hcDark: null,
-	hcLight: Color.fromHex('#0F4A85').transparent(0.1)
+	hcDark: '#E48B39',
+	hcLight: '#0f4a85'
 }, localize('terminalStickyScrollHover.background', 'The background color of the sticky scroll overlay in the terminal when hovered.'));
+
+registerColor('terminalStickyScroll.border', {
+	dark: null,
+	light: null,
+	hcDark: '#6fc3df',
+	hcLight: '#0f4a85'
+}, localize('terminalStickyScroll.border', 'The border of the sticky scroll overlay in the terminal.'));
diff --git a/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollContribution.ts b/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollContribution.ts
index 69a38b8142e..9d2b55ea406 100644
--- a/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollContribution.ts
+++ b/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollContribution.ts
@@ -4,20 +4,19 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type { Terminal as RawXtermTerminal } from '@xterm/xterm';
-import { Event } from 'vs/base/common/event';
-import { Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import 'vs/css!./media/stickyScroll';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { ITerminalContribution, ITerminalInstance, IXtermTerminal } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { TerminalInstance, TerminalInstanceColorProvider } from 'vs/workbench/contrib/terminal/browser/terminalInstance';
-import { TerminalWidgetManager } from 'vs/workbench/contrib/terminal/browser/widgets/widgetManager';
-import { ITerminalProcessInfo, ITerminalProcessManager } from 'vs/workbench/contrib/terminal/common/terminal';
-import { TerminalStickyScrollSettingId } from 'vs/workbench/contrib/terminalContrib/stickyScroll/common/terminalStickyScrollConfiguration';
-import { TerminalStickyScrollOverlay } from 'vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay';
+import { Event } from '../../../../../base/common/event.js';
+import { Disposable, MutableDisposable } from '../../../../../base/common/lifecycle.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { TerminalCapability } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
+import { ITerminalContribution, ITerminalInstance, IXtermTerminal } from '../../../terminal/browser/terminal.js';
+import type { ITerminalContributionContext } from '../../../terminal/browser/terminalExtensions.js';
+import { TerminalInstance, TerminalInstanceColorProvider } from '../../../terminal/browser/terminalInstance.js';
+import { TerminalStickyScrollSettingId } from '../common/terminalStickyScrollConfiguration.js';
+import './media/stickyScroll.css';
+import { TerminalStickyScrollOverlay } from './terminalStickyScrollOverlay.js';
 
 export class TerminalStickyScrollContribution extends Disposable implements ITerminalContribution {
 	static readonly ID = 'terminal.stickyScroll';
@@ -34,9 +33,7 @@ export class TerminalStickyScrollContribution extends Disposable implements ITer
 	private readonly _disableListeners = this._register(new MutableDisposable());
 
 	constructor(
-		private readonly _instance: ITerminalInstance,
-		processManager: ITerminalProcessManager | ITerminalProcessInfo,
-		widgetManager: TerminalWidgetManager,
+		private readonly _ctx: ITerminalContributionContext,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
@@ -78,7 +75,7 @@ export class TerminalStickyScrollContribution extends Disposable implements ITer
 		if (this._overlay.value) {
 			this._enableListeners.clear();
 			if (!this._disableListeners.value) {
-				this._disableListeners.value = this._instance.capabilities.onDidRemoveCapability(e => {
+				this._disableListeners.value = this._ctx.instance.capabilities.onDidRemoveCapability(e => {
 					if (e.id === TerminalCapability.CommandDetection) {
 						this._refreshState();
 					}
@@ -87,7 +84,7 @@ export class TerminalStickyScrollContribution extends Disposable implements ITer
 		} else {
 			this._disableListeners.clear();
 			if (!this._enableListeners.value) {
-				this._enableListeners.value = this._instance.capabilities.onDidAddCapability(e => {
+				this._enableListeners.value = this._ctx.instance.capabilities.onDidAddCapability(e => {
 					if (e.id === TerminalCapability.CommandDetection) {
 						this._refreshState();
 					}
@@ -101,10 +98,10 @@ export class TerminalStickyScrollContribution extends Disposable implements ITer
 			const xtermCtorEventually = TerminalInstance.getXtermConstructor(this._keybindingService, this._contextKeyService);
 			this._overlay.value = this._instantiationService.createInstance(
 				TerminalStickyScrollOverlay,
-				this._instance,
+				this._ctx.instance,
 				this._xterm!,
-				this._instantiationService.createInstance(TerminalInstanceColorProvider, this._instance),
-				this._instance.capabilities.get(TerminalCapability.CommandDetection)!,
+				this._instantiationService.createInstance(TerminalInstanceColorProvider, this._ctx.instance.targetRef),
+				this._ctx.instance.capabilities.get(TerminalCapability.CommandDetection)!,
 				xtermCtorEventually
 			);
 		}
@@ -117,7 +114,7 @@ export class TerminalStickyScrollContribution extends Disposable implements ITer
 	}
 
 	private _shouldBeEnabled(): boolean {
-		const capability = this._instance.capabilities.get(TerminalCapability.CommandDetection);
+		const capability = this._ctx.instance.capabilities.get(TerminalCapability.CommandDetection);
 		return !!(this._configurationService.getValue(TerminalStickyScrollSettingId.Enabled) && capability && this._xterm?.raw?.element);
 	}
 }
diff --git a/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.ts b/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.ts
index 194ee23694e..c85159b3b8b 100644
--- a/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.ts
+++ b/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.ts
@@ -4,30 +4,31 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type { SerializeAddon as SerializeAddonType } from '@xterm/addon-serialize';
+import type { WebglAddon as WebglAddonType } from '@xterm/addon-webgl';
 import type { IBufferLine, IMarker, ITerminalOptions, ITheme, Terminal as RawXtermTerminal, Terminal as XTermTerminal } from '@xterm/xterm';
-import { importAMDNodeModule } from 'vs/amdX';
-import { $, addDisposableListener, addStandardDisposableListener, getWindow } from 'vs/base/browser/dom';
-import { memoize, throttle } from 'vs/base/common/decorators';
-import { Event } from 'vs/base/common/event';
-import { Disposable, MutableDisposable, combinedDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { removeAnsiEscapeCodes } from 'vs/base/common/strings';
-import 'vs/css!./media/stickyScroll';
-import { localize } from 'vs/nls';
-import { IMenu, IMenuService, MenuId } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ICommandDetectionCapability, ITerminalCommand } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { ICurrentPartialCommand } from 'vs/platform/terminal/common/capabilities/commandDetection/terminalCommand';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ITerminalInstance, IXtermColorProvider, IXtermTerminal } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { openContextMenu } from 'vs/workbench/contrib/terminal/browser/terminalContextMenu';
-import { IXtermCore } from 'vs/workbench/contrib/terminal/browser/xterm-private';
-import { TERMINAL_CONFIG_SECTION, TerminalCommandId } from 'vs/workbench/contrib/terminal/common/terminal';
-import { terminalStrings } from 'vs/workbench/contrib/terminal/common/terminalStrings';
-import { TerminalStickyScrollSettingId } from 'vs/workbench/contrib/terminalContrib/stickyScroll/common/terminalStickyScrollConfiguration';
-import { terminalStickyScrollBackground, terminalStickyScrollHoverBackground } from 'vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollColorRegistry';
+import { importAMDNodeModule } from '../../../../../amdX.js';
+import { $, addDisposableListener, addStandardDisposableListener, getWindow } from '../../../../../base/browser/dom.js';
+import { memoize, throttle } from '../../../../../base/common/decorators.js';
+import { Event } from '../../../../../base/common/event.js';
+import { Disposable, MutableDisposable, combinedDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { removeAnsiEscapeCodes } from '../../../../../base/common/strings.js';
+import './media/stickyScroll.css';
+import { localize } from '../../../../../nls.js';
+import { IMenu, IMenuService, MenuId } from '../../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { ICommandDetectionCapability, ITerminalCommand } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
+import { ICurrentPartialCommand } from '../../../../../platform/terminal/common/capabilities/commandDetection/terminalCommand.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { ITerminalConfigurationService, ITerminalInstance, IXtermColorProvider, IXtermTerminal } from '../../../terminal/browser/terminal.js';
+import { openContextMenu } from '../../../terminal/browser/terminalContextMenu.js';
+import { IXtermCore } from '../../../terminal/browser/xterm-private.js';
+import { TERMINAL_CONFIG_SECTION, TerminalCommandId } from '../../../terminal/common/terminal.js';
+import { terminalStrings } from '../../../terminal/common/terminalStrings.js';
+import { TerminalStickyScrollSettingId } from '../common/terminalStickyScrollConfiguration.js';
+import { terminalStickyScrollBackground, terminalStickyScrollHoverBackground } from './terminalStickyScrollColorRegistry.js';
 
 const enum OverlayState {
 	/** Initial state/disabled by the alt buffer. */
@@ -46,6 +47,7 @@ const enum Constants {
 export class TerminalStickyScrollOverlay extends Disposable {
 	private _stickyScrollOverlay?: RawXtermTerminal;
 	private _serializeAddon?: SerializeAddonType;
+	private _webglAddon?: WebglAddonType;
 
 	private _element?: HTMLElement;
 	private _currentStickyCommand?: ITerminalCommand | ICurrentPartialCommand;
@@ -69,6 +71,7 @@ export class TerminalStickyScrollOverlay extends Disposable {
 		@IContextMenuService private readonly _contextMenuService: IContextMenuService,
 		@IKeybindingService private readonly _keybindingService: IKeybindingService,
 		@IMenuService menuService: IMenuService,
+		@ITerminalConfigurationService private readonly _terminalConfigurationService: ITerminalConfigurationService,
 		@IThemeService private readonly _themeService: IThemeService,
 	) {
 		super();
@@ -101,6 +104,7 @@ export class TerminalStickyScrollOverlay extends Disposable {
 				allowProposedApi: true,
 				...this._getOptions()
 			}));
+			this._refreshGpuAcceleration();
 			this._register(configurationService.onDidChangeConfiguration(e => {
 				if (e.affectsConfiguration(TERMINAL_CONFIG_SECTION)) {
 					this._syncOptions();
@@ -113,6 +117,11 @@ export class TerminalStickyScrollOverlay extends Disposable {
 				this._syncOptions();
 				this._refresh();
 			}));
+			this._register(this._instance.onDidChangeVisibility(isVisible => {
+				if (isVisible) {
+					this._refresh();
+				}
+			}));
 
 			this._getSerializeAddonConstructor().then(SerializeAddon => {
 				if (this._store.isDisposed) {
@@ -312,20 +321,24 @@ export class TerminalStickyScrollOverlay extends Disposable {
 			// initialized.
 			if (this._element) {
 				const termBox = xterm.element.getBoundingClientRect();
-				const rowHeight = termBox.height / xterm.rows;
-				const overlayHeight = stickyScrollLineCount * rowHeight;
+				// Only try reposition if the element is visible, if not a refresh will occur when
+				// it becomes visible
+				if (termBox.height > 0) {
+					const rowHeight = termBox.height / xterm.rows;
+					const overlayHeight = stickyScrollLineCount * rowHeight;
 
-				// Adjust sticky scroll content if it would below the end of the command, obscuring the
-				// following command.
-				let endMarkerOffset = 0;
-				if (!isPartialCommand && command.endMarker && command.endMarker.line !== -1) {
-					if (buffer.viewportY + stickyScrollLineCount > command.endMarker.line) {
-						const diff = buffer.viewportY + stickyScrollLineCount - command.endMarker.line;
-						endMarkerOffset = diff * rowHeight;
+					// Adjust sticky scroll content if it would below the end of the command, obscuring the
+					// following command.
+					let endMarkerOffset = 0;
+					if (!isPartialCommand && command.endMarker && command.endMarker.line !== -1) {
+						if (buffer.viewportY + stickyScrollLineCount > command.endMarker.line) {
+							const diff = buffer.viewportY + stickyScrollLineCount - command.endMarker.line;
+							endMarkerOffset = diff * rowHeight;
+						}
 					}
-				}
 
-				this._element.style.bottom = `${termBox.height - overlayHeight + 1 + endMarkerOffset}px`;
+					this._element.style.bottom = `${termBox.height - overlayHeight + 1 + endMarkerOffset}px`;
+				}
 			}
 		} else {
 			this._setVisible(false);
@@ -413,12 +426,12 @@ export class TerminalStickyScrollOverlay extends Disposable {
 		}
 		this._stickyScrollOverlay.resize(this._xterm.raw.cols, this._stickyScrollOverlay.rows);
 		this._stickyScrollOverlay.options = this._getOptions();
+		this._refreshGpuAcceleration();
 	}
 
 	private _getOptions(): ITerminalOptions {
 		const o = this._xterm.raw.options;
 		return {
-			allowTransparency: true,
 			cursorInactiveStyle: 'none',
 			scrollback: 0,
 			logLevel: 'off',
@@ -434,10 +447,29 @@ export class TerminalStickyScrollOverlay extends Disposable {
 			drawBoldTextInBrightColors: o.drawBoldTextInBrightColors,
 			minimumContrastRatio: o.minimumContrastRatio,
 			tabStopWidth: o.tabStopWidth,
-			overviewRulerWidth: o.overviewRulerWidth,
+			customGlyphs: o.customGlyphs,
 		};
 	}
 
+	@throttle(0)
+	private async _refreshGpuAcceleration() {
+		if (this._shouldLoadWebgl() && !this._webglAddon) {
+			const WebglAddon = await this._getWebglAddonConstructor();
+			if (this._store.isDisposed) {
+				return;
+			}
+			this._webglAddon = this._register(new WebglAddon());
+			this._stickyScrollOverlay?.loadAddon(this._webglAddon);
+		} else if (!this._shouldLoadWebgl() && this._webglAddon) {
+			this._webglAddon.dispose();
+			this._webglAddon = undefined;
+		}
+	}
+
+	private _shouldLoadWebgl(): boolean {
+		return this._terminalConfigurationService.config.gpuAcceleration === 'auto' || this._terminalConfigurationService.config.gpuAcceleration === 'on';
+	}
+
 	private _getTheme(isHovering: boolean): ITheme {
 		const theme = this._themeService.getColorTheme();
 		return {
@@ -452,8 +484,12 @@ export class TerminalStickyScrollOverlay extends Disposable {
 
 	@memoize
 	private async _getSerializeAddonConstructor(): Promise<typeof SerializeAddonType> {
-		const m = await importAMDNodeModule<typeof import('@xterm/addon-serialize')>('@xterm/addon-serialize', 'lib/addon-serialize.js');
-		return m.SerializeAddon;
+		return (await importAMDNodeModule<typeof import('@xterm/addon-serialize')>('@xterm/addon-serialize', 'lib/addon-serialize.js')).SerializeAddon;
+	}
+
+	@memoize
+	private async _getWebglAddonConstructor(): Promise<typeof WebglAddonType> {
+		return (await importAMDNodeModule<typeof import('@xterm/addon-webgl')>('@xterm/addon-webgl', 'lib/addon-webgl.js')).WebglAddon;
 	}
 }
 
diff --git a/src/vs/workbench/contrib/terminalContrib/stickyScroll/common/terminalStickyScrollConfiguration.ts b/src/vs/workbench/contrib/terminalContrib/stickyScroll/common/terminalStickyScrollConfiguration.ts
index 8e9c34d32f4..9a12add2442 100644
--- a/src/vs/workbench/contrib/terminalContrib/stickyScroll/common/terminalStickyScrollConfiguration.ts
+++ b/src/vs/workbench/contrib/terminalContrib/stickyScroll/common/terminalStickyScrollConfiguration.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import type { IStringDictionary } from 'vs/base/common/collections';
-import { localize } from 'vs/nls';
-import type { IConfigurationPropertySchema } from 'vs/platform/configuration/common/configurationRegistry';
-import product from 'vs/platform/product/common/product';
+import type { IStringDictionary } from '../../../../../base/common/collections.js';
+import { localize } from '../../../../../nls.js';
+import type { IConfigurationPropertySchema } from '../../../../../platform/configuration/common/configurationRegistry.js';
+import product from '../../../../../platform/product/common/product.js';
 
 export const enum TerminalStickyScrollSettingId {
 	Enabled = 'terminal.integrated.stickyScroll.enabled',
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminal.suggest.contribution.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminal.suggest.contribution.ts
index ab39f57b9e9..89ae30e3fa4 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminal.suggest.contribution.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminal.suggest.contribution.ts
@@ -4,24 +4,35 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type { Terminal as RawXtermTerminal } from '@xterm/xterm';
-import * as dom from 'vs/base/browser/dom';
-import { Event } from 'vs/base/common/event';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { DisposableStore, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { localize2 } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr, IContextKey, IContextKeyService, IReadableSet } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { TerminalSettingId } from 'vs/platform/terminal/common/terminal';
-import { ITerminalContribution, ITerminalInstance, IXtermTerminal } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { registerActiveInstanceAction } from 'vs/workbench/contrib/terminal/browser/terminalActions';
-import { registerTerminalContribution } from 'vs/workbench/contrib/terminal/browser/terminalExtensions';
-import { TerminalWidgetManager } from 'vs/workbench/contrib/terminal/browser/widgets/widgetManager';
-import { ITerminalConfiguration, ITerminalProcessManager, TERMINAL_CONFIG_SECTION } from 'vs/workbench/contrib/terminal/common/terminal';
-import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey';
-import { SuggestAddon } from 'vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon';
-import { TerminalSuggestCommandId } from 'vs/workbench/contrib/terminalContrib/suggest/common/terminal.suggest';
+import * as dom from '../../../../../base/browser/dom.js';
+import { AutoOpenBarrier } from '../../../../../base/common/async.js';
+import { Event } from '../../../../../base/common/event.js';
+import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
+import { DisposableStore, MutableDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { isWindows } from '../../../../../base/common/platform.js';
+import { localize2 } from '../../../../../nls.js';
+import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from '../../../../../platform/accessibility/common/accessibility.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService, IReadableSet } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { GeneralShellType, TerminalLocation, TerminalSettingId } from '../../../../../platform/terminal/common/terminal.js';
+import { ShellIntegrationOscPs } from '../../../../../platform/terminal/common/xterm/shellIntegrationAddon.js';
+import { SimpleCompletionItem } from '../../../../services/suggest/browser/simpleCompletionItem.js';
+import { ITerminalContribution, ITerminalInstance, IXtermTerminal } from '../../../terminal/browser/terminal.js';
+import { registerActiveInstanceAction } from '../../../terminal/browser/terminalActions.js';
+import { registerTerminalContribution, type ITerminalContributionContext } from '../../../terminal/browser/terminalExtensions.js';
+import { registerSendSequenceKeybinding } from '../../../terminal/browser/terminalKeybindings.js';
+import { TERMINAL_CONFIG_SECTION, type ITerminalConfiguration } from '../../../terminal/common/terminal.js';
+import { TerminalContextKeys, TerminalContextKeyStrings } from '../../../terminal/common/terminalContextKey.js';
+import { TerminalSuggestCommandId } from '../common/terminal.suggest.js';
+import { terminalSuggestConfigSection, TerminalSuggestSettingId, type ITerminalSuggestConfiguration } from '../common/terminalSuggestConfiguration.js';
+import { parseCompletionsFromShell, SuggestAddon, VSCodeSuggestOscPt, type CompressedPwshCompletion, type PwshCompletion } from './terminalSuggestAddon.js';
+
+const enum Constants {
+	CachedPwshCommandsStorageKey = 'terminal.suggest.pwshCommands'
+}
 
 // #region Terminal Contributions
 
@@ -32,27 +43,100 @@ class TerminalSuggestContribution extends DisposableStore implements ITerminalCo
 		return instance.getContribution<TerminalSuggestContribution>(TerminalSuggestContribution.ID);
 	}
 
+	private _xterm?: RawXtermTerminal;
 	private readonly _addon: MutableDisposable<SuggestAddon> = new MutableDisposable();
 	private _terminalSuggestWidgetContextKeys: IReadableSet<string> = new Set(TerminalContextKeys.suggestWidgetVisible.key);
 	private _terminalSuggestWidgetVisibleContextKey: IContextKey<boolean>;
 
 	get addon(): SuggestAddon | undefined { return this._addon.value; }
 
+	private static readonly _cachedPwshCommands: Set<SimpleCompletionItem> = new Set();
+
 	constructor(
-		private readonly _instance: ITerminalInstance,
-		processManager: ITerminalProcessManager,
-		widgetManager: TerminalWidgetManager,
+		private readonly _ctx: ITerminalContributionContext,
 		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
-		@IInstantiationService private readonly _instantiationService: IInstantiationService
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IStorageService private readonly _storageService: IStorageService,
 	) {
 		super();
 		this.add(toDisposable(() => this._addon?.dispose()));
 		this._terminalSuggestWidgetVisibleContextKey = TerminalContextKeys.suggestWidgetVisible.bindTo(this._contextKeyService);
+
+		// Attempt to load cached pwsh commands if not already loaded
+		if (TerminalSuggestContribution._cachedPwshCommands.size === 0) {
+			const config = this._storageService.get(Constants.CachedPwshCommandsStorageKey, StorageScope.APPLICATION, undefined);
+			if (config !== undefined) {
+				const completions = JSON.parse(config);
+				for (const c of completions) {
+					TerminalSuggestContribution._cachedPwshCommands.add(c);
+				}
+			}
+		}
+
+		this.add(this._configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(TerminalSuggestSettingId.Enabled)) {
+				this.clearSuggestCache();
+			}
+		}));
+	}
+
+	xtermReady(xterm: IXtermTerminal & { raw: RawXtermTerminal }): void {
+		this._xterm = xterm.raw;
+		const config = this._configurationService.getValue<ITerminalSuggestConfiguration>(terminalSuggestConfigSection);
+		const enabled = config.enabled;
+		if (!enabled) {
+			return;
+		}
+		this.add(xterm.raw.parser.registerOscHandler(ShellIntegrationOscPs.VSCode, data => {
+			return this._handleVSCodeSequence(data);
+		}));
+	}
+
+	private _handleVSCodeSequence(data: string): boolean | Promise<boolean> {
+		if (!this._xterm) {
+			return false;
+		}
+
+		// Pass the sequence along to the capability
+		const [command, ...args] = data.split(';');
+		switch (command) {
+			case VSCodeSuggestOscPt.CompletionsPwshCommands:
+				return this._handleCompletionsPwshCommandsSequence(this._xterm, data, command, args);
+		}
+
+		// Unrecognized sequence
+		return false;
+	}
+
+	private async _handleCompletionsPwshCommandsSequence(terminal: RawXtermTerminal, data: string, command: string, args: string[]): Promise<boolean> {
+		const type = args[0];
+		const rawCompletions: PwshCompletion | PwshCompletion[] | CompressedPwshCompletion[] | CompressedPwshCompletion = JSON.parse(data.slice(command.length + type.length + 2/*semi-colons*/));
+		const completions = parseCompletionsFromShell(rawCompletions);
+
+		const set = TerminalSuggestContribution._cachedPwshCommands;
+		set.clear();
+		for (const c of completions) {
+			set.add(c);
+		}
+
+		this._storageService.store(Constants.CachedPwshCommandsStorageKey, JSON.stringify(Array.from(set.values())), StorageScope.APPLICATION, StorageTarget.MACHINE);
+
+		return true;
+	}
+
+	clearSuggestCache(): void {
+		TerminalSuggestContribution._cachedPwshCommands.clear();
+		this._storageService.remove(Constants.CachedPwshCommandsStorageKey, StorageScope.APPLICATION);
 	}
 
 	xtermOpen(xterm: IXtermTerminal & { raw: RawXtermTerminal }): void {
-		this.add(Event.runAndSubscribe(this._instance.onDidChangeShellType, async () => {
+		const config = this._configurationService.getValue<ITerminalSuggestConfiguration>(terminalSuggestConfigSection);
+		const enabled = config.enabled;
+		if (!enabled) {
+			return;
+		}
+		this.add(Event.runAndSubscribe(this._ctx.instance.onDidChangeShellType, async () => {
 			this._loadSuggestAddon(xterm.raw);
 		}));
 		this.add(this._contextKeyService.onDidChangeContext(e => {
@@ -69,21 +153,46 @@ class TerminalSuggestContribution extends DisposableStore implements ITerminalCo
 
 	private _loadSuggestAddon(xterm: RawXtermTerminal): void {
 		const sendingKeybindingsToShell = this._configurationService.getValue<ITerminalConfiguration>(TERMINAL_CONFIG_SECTION).sendKeybindingsToShell;
-		if (sendingKeybindingsToShell || this._instance.shellType !== 'pwsh') {
+		if (sendingKeybindingsToShell || this._ctx.instance.shellType !== 'pwsh') {
 			this._addon.clear();
 			return;
 		}
 		if (this._terminalSuggestWidgetVisibleContextKey) {
-			this._addon.value = this._instantiationService.createInstance(SuggestAddon, this._instance.capabilities, this._terminalSuggestWidgetVisibleContextKey);
-			xterm.loadAddon(this._addon.value);
-			this._addon.value.setPanel(dom.findParentWithClass(xterm.element!, 'panel')!);
-			this._addon.value.setScreen(xterm.element!.querySelector('.xterm-screen')!);
-			this.add(this._instance.onDidBlur(() => this._addon.value?.hideSuggestWidget()));
-			this.add(this._addon.value.onAcceptedCompletion(async text => {
-				this._instance.focus();
-				this._instance.sendText(text, false);
+			const addon = this._addon.value = this._instantiationService.createInstance(SuggestAddon, TerminalSuggestContribution._cachedPwshCommands, this._ctx.instance.capabilities, this._terminalSuggestWidgetVisibleContextKey);
+			xterm.loadAddon(addon);
+			if (this._ctx.instance.target === TerminalLocation.Editor) {
+				addon.setContainerWithOverflow(xterm.element!);
+			} else {
+				addon.setContainerWithOverflow(dom.findParentWithClass(xterm.element!, 'panel')!);
+			}
+			addon.setScreen(xterm.element!.querySelector('.xterm-screen')!);
+			this.add(this._ctx.instance.onDidBlur(() => addon.hideSuggestWidget()));
+			this.add(addon.onAcceptedCompletion(async text => {
+				this._ctx.instance.focus();
+				this._ctx.instance.sendText(text, false);
 			}));
-			this.add(this._instance.onDidSendText(() => this._addon.value?.hideSuggestWidget()));
+			this.add(this._ctx.instance.onWillPaste(() => addon.isPasting = true));
+			this.add(this._ctx.instance.onDidPaste(() => {
+				// Delay this slightly as synchronizing the prompt input is debounced
+				setTimeout(() => addon.isPasting = false, 100);
+			}));
+
+			// If completions are requested, pause and queue input events until completions are
+			// received. This fixing some problems in PowerShell, particularly enter not executing
+			// when typing quickly and some characters being printed twice. On Windows this isn't
+			// needed because inputs are _not_ echoed when not handled immediately.
+			// TODO: This should be based on the OS of the pty host, not the client
+			if (!isWindows) {
+				let barrier: AutoOpenBarrier | undefined;
+				this.add(addon.onDidRequestCompletions(() => {
+					barrier = new AutoOpenBarrier(2000);
+					this._ctx.instance.pauseInputEvents(barrier);
+				}));
+				this.add(addon.onDidReceiveCompletions(() => {
+					barrier?.open();
+					barrier = undefined;
+				}));
+			}
 		}
 	}
 }
@@ -92,6 +201,16 @@ registerTerminalContribution(TerminalSuggestContribution.ID, TerminalSuggestCont
 
 // #endregion
 
+// #region Keybindings
+
+registerSendSequenceKeybinding('\x1b[24~e', { // F12,e -> ctrl+space (Native suggest)
+	when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, GeneralShellType.PowerShell), TerminalContextKeys.terminalShellIntegrationEnabled, CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate(), ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.Enabled}`, true)),
+	primary: KeyMod.CtrlCmd | KeyCode.Space,
+	mac: { primary: KeyMod.WinCtrl | KeyCode.Space }
+});
+
+// #endregion
+
 // #region Actions
 
 registerActiveInstanceAction({
@@ -152,14 +271,27 @@ registerActiveInstanceAction({
 	f1: false,
 	precondition: ContextKeyExpr.and(ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated), TerminalContextKeys.focus, TerminalContextKeys.isOpen, TerminalContextKeys.suggestWidgetVisible),
 	keybinding: {
-		primary: KeyCode.Enter,
-		secondary: [KeyCode.Tab],
-		// Enter is bound to other workbench keybindings that this needs to beat
+		primary: KeyCode.Tab,
+		// Tab is bound to other workbench keybindings that this needs to beat
 		weight: KeybindingWeight.WorkbenchContrib + 1
 	},
 	run: (activeInstance) => TerminalSuggestContribution.get(activeInstance)?.addon?.acceptSelectedSuggestion()
 });
 
+registerActiveInstanceAction({
+	id: TerminalSuggestCommandId.AcceptSelectedSuggestionEnter,
+	title: localize2('workbench.action.terminal.acceptSelectedSuggestionEnter', 'Accept Selected Suggestion (Enter)'),
+	f1: false,
+	precondition: ContextKeyExpr.and(ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated), TerminalContextKeys.focus, TerminalContextKeys.isOpen, TerminalContextKeys.suggestWidgetVisible),
+	keybinding: {
+		primary: KeyCode.Enter,
+		// Enter is bound to other workbench keybindings that this needs to beat
+		weight: KeybindingWeight.WorkbenchContrib + 1,
+		when: ContextKeyExpr.notEquals(`config.${TerminalSuggestSettingId.RunOnEnter}`, 'ignore'),
+	},
+	run: (activeInstance) => TerminalSuggestContribution.get(activeInstance)?.addon?.acceptSelectedSuggestion(undefined, true)
+});
+
 registerActiveInstanceAction({
 	id: TerminalSuggestCommandId.HideSuggestWidget,
 	title: localize2('workbench.action.terminal.hideSuggestWidget', 'Hide Suggest Widget'),
@@ -173,4 +305,11 @@ registerActiveInstanceAction({
 	run: (activeInstance) => TerminalSuggestContribution.get(activeInstance)?.addon?.hideSuggestWidget()
 });
 
+registerActiveInstanceAction({
+	id: TerminalSuggestCommandId.ClearSuggestCache,
+	title: localize2('workbench.action.terminal.clearSuggestCache', 'Clear Suggest Cache'),
+	f1: true,
+	run: (activeInstance) => TerminalSuggestContribution.get(activeInstance)?.clearSuggestCache()
+});
+
 // #endregion
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
index 499b4a410d0..2897cc88612 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
@@ -3,37 +3,55 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { SimpleCompletionItem } from 'vs/workbench/services/suggest/browser/simpleCompletionItem';
-import { LineContext, SimpleCompletionModel } from 'vs/workbench/services/suggest/browser/simpleCompletionModel';
-import { ISimpleSelectedSuggestion, SimpleSuggestWidget } from 'vs/workbench/services/suggest/browser/simpleSuggestWidget';
-import { Codicon } from 'vs/base/common/codicons';
-import { Emitter, Event } from 'vs/base/common/event';
-import { combinedDisposable, Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { editorSuggestWidgetSelectedBackground } from 'vs/editor/contrib/suggest/browser/suggestWidget';
-import { IContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { activeContrastBorder } from 'vs/platform/theme/common/colorRegistry';
-import { TerminalStorageKeys } from 'vs/workbench/contrib/terminal/common/terminalStorageKeys';
 import type { ITerminalAddon, Terminal } from '@xterm/xterm';
+import * as dom from '../../../../../base/browser/dom.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { combinedDisposable, Disposable, MutableDisposable } from '../../../../../base/common/lifecycle.js';
+import { sep } from '../../../../../base/common/path.js';
+import { commonPrefixLength } from '../../../../../base/common/strings.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { editorSuggestWidgetSelectedBackground } from '../../../../../editor/contrib/suggest/browser/suggestWidget.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IContextKey } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { TerminalCapability, type ITerminalCapabilityStore } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
+import type { IPromptInputModel, IPromptInputModelState } from '../../../../../platform/terminal/common/capabilities/commandDetection/promptInputModel.js';
+import { ShellIntegrationOscPs } from '../../../../../platform/terminal/common/xterm/shellIntegrationAddon.js';
+import { getListStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
+import { activeContrastBorder } from '../../../../../platform/theme/common/colorRegistry.js';
+import { ITerminalConfigurationService } from '../../../terminal/browser/terminal.js';
+import type { IXtermCore } from '../../../terminal/browser/xterm-private.js';
+import { TerminalStorageKeys } from '../../../terminal/common/terminalStorageKeys.js';
+import { terminalSuggestConfigSection, type ITerminalSuggestConfiguration } from '../common/terminalSuggestConfiguration.js';
+import { SimpleCompletionItem, type ISimpleCompletion } from '../../../../services/suggest/browser/simpleCompletionItem.js';
+import { LineContext, SimpleCompletionModel } from '../../../../services/suggest/browser/simpleCompletionModel.js';
+import { ISimpleSelectedSuggestion, SimpleSuggestWidget } from '../../../../services/suggest/browser/simpleSuggestWidget.js';
+import type { ISimpleSuggestWidgetFontInfo } from '../../../../services/suggest/browser/simpleSuggestWidgetRenderer.js';
 
-import { getListStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { TerminalCapability, type ITerminalCapabilityStore } from 'vs/platform/terminal/common/capabilities/capabilities';
-import type { IPromptInputModel, IPromptInputModelState } from 'vs/platform/terminal/common/capabilities/commandDetection/promptInputModel';
-import { ShellIntegrationOscPs } from 'vs/platform/terminal/common/xterm/shellIntegrationAddon';
-import type { IXtermCore } from 'vs/workbench/contrib/terminal/browser/xterm-private';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { terminalSuggestConfigSection, type ITerminalSuggestConfiguration } from 'vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration';
-
-const enum VSCodeOscPt {
+export const enum VSCodeSuggestOscPt {
 	Completions = 'Completions',
 	CompletionsPwshCommands = 'CompletionsPwshCommands',
 	CompletionsBash = 'CompletionsBash',
 	CompletionsBashFirstWord = 'CompletionsBashFirstWord'
 }
 
+export type CompressedPwshCompletion = [
+	completionText: string,
+	resultType: number,
+	toolTip?: string,
+	customIcon?: string
+];
+
+export type PwshCompletion = {
+	CompletionText: string;
+	ResultType: number;
+	ToolTip?: string;
+	CustomIcon?: string;
+};
+
+
 /**
  * A map of the pwsh result type enum's value to the corresponding icon to use in completions.
  *
@@ -74,6 +92,7 @@ const pwshTypeToIconMap: { [type: string]: ThemeIcon | undefined } = {
 };
 
 export interface ISuggestController {
+	isPasting: boolean;
 	selectPreviousSuggestion(): void;
 	selectPreviousPageSuggestion(): void;
 	selectNextSuggestion(): void;
@@ -89,30 +108,51 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 	private readonly _promptInputModelSubscriptions = this._register(new MutableDisposable());
 
 	private _mostRecentPromptInputState?: IPromptInputModelState;
-	private _initialPromptInputState?: IPromptInputModelState;
 	private _currentPromptInputState?: IPromptInputModelState;
+	private _model?: SimpleCompletionModel;
 
-	private _panel?: HTMLElement;
+	private _container?: HTMLElement;
 	private _screen?: HTMLElement;
 	private _suggestWidget?: SimpleSuggestWidget;
 	private _enableWidget: boolean = true;
+	private _pathSeparator: string = sep;
+	private _isFilteringDirectories: boolean = false;
+	private _mostRecentCompletion?: ISimpleCompletion;
+
+	private _codeCompletionsRequested: boolean = false;
+	private _gitCompletionsRequested: boolean = false;
 
 	// TODO: Remove these in favor of prompt input state
 	private _leadingLineContent?: string;
 	private _cursorIndexDelta: number = 0;
 
+	private _lastUserDataTimestamp: number = 0;
+	private _lastAcceptedCompletionTimestamp: number = 0;
+	private _lastUserData?: string;
+
+	isPasting: boolean = false;
+
 	static requestCompletionsSequence = '\x1b[24~e'; // F12,e
+	static requestGlobalCompletionsSequence = '\x1b[24~f'; // F12,f
+	static requestEnableGitCompletionsSequence = '\x1b[24~g'; // F12,g
+	static requestEnableCodeCompletionsSequence = '\x1b[24~h'; // F12,h
 
 	private readonly _onBell = this._register(new Emitter<void>());
 	readonly onBell = this._onBell.event;
 	private readonly _onAcceptedCompletion = this._register(new Emitter<string>());
 	readonly onAcceptedCompletion = this._onAcceptedCompletion.event;
+	private readonly _onDidRequestCompletions = this._register(new Emitter<void>());
+	readonly onDidRequestCompletions = this._onDidRequestCompletions.event;
+	private readonly _onDidReceiveCompletions = this._register(new Emitter<void>());
+	readonly onDidReceiveCompletions = this._onDidReceiveCompletions.event;
 
 	constructor(
+		private readonly _cachedPwshCommands: Set<SimpleCompletionItem>,
 		private readonly _capabilities: ITerminalCapabilityStore,
 		private readonly _terminalSuggestWidgetVisibleContextKey: IContextKey<boolean>,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@ITerminalConfigurationService private readonly _terminalConfigurationService: ITerminalConfigurationService,
 	) {
 		super();
 
@@ -140,10 +180,14 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		this._register(xterm.parser.registerOscHandler(ShellIntegrationOscPs.VSCode, data => {
 			return this._handleVSCodeSequence(data);
 		}));
+		this._register(xterm.onData(e => {
+			this._lastUserData = e;
+			this._lastUserDataTimestamp = Date.now();
+		}));
 	}
 
-	setPanel(panel: HTMLElement): void {
-		this._panel = panel;
+	setContainerWithOverflow(container: HTMLElement): void {
+		this._container = container;
 	}
 
 	setScreen(screen: HTMLElement): void {
@@ -151,61 +195,107 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 	}
 
 	private _requestCompletions(): void {
-		// TODO: Debounce? Prevent this flooding the channel
-		this._onAcceptedCompletion.fire(SuggestAddon.requestCompletionsSequence);
+		if (!this._promptInputModel) {
+			return;
+		}
+
+		if (this.isPasting) {
+			return;
+		}
+
+		const builtinCompletionsConfig = this._configurationService.getValue<ITerminalSuggestConfiguration>(terminalSuggestConfigSection).builtinCompletions;
+		if (!this._codeCompletionsRequested && builtinCompletionsConfig.pwshCode) {
+			this._onAcceptedCompletion.fire(SuggestAddon.requestEnableCodeCompletionsSequence);
+			this._codeCompletionsRequested = true;
+		}
+		if (!this._gitCompletionsRequested && builtinCompletionsConfig.pwshGit) {
+			this._onAcceptedCompletion.fire(SuggestAddon.requestEnableGitCompletionsSequence);
+			this._gitCompletionsRequested = true;
+		}
+
+		// Request global completions if there are none cached
+		if (this._cachedPwshCommands.size === 0) {
+			this._requestGlobalCompletions();
+		}
+
+		// Ensure that a key has been pressed since the last accepted completion in order to prevent
+		// completions being requested again right after accepting a completion
+		if (this._lastUserDataTimestamp > this._lastAcceptedCompletionTimestamp) {
+			this._onAcceptedCompletion.fire(SuggestAddon.requestCompletionsSequence);
+			this._onDidRequestCompletions.fire();
+		}
+	}
+
+	private _requestGlobalCompletions(): void {
+		this._onAcceptedCompletion.fire(SuggestAddon.requestGlobalCompletionsSequence);
 	}
 
 	private _sync(promptInputState: IPromptInputModelState): void {
 		const config = this._configurationService.getValue<ITerminalSuggestConfiguration>(terminalSuggestConfigSection);
-		const enabled = config.enabled;
-		if (!enabled) {
-			return;
-		}
 
-		if (!this._terminalSuggestWidgetVisibleContextKey.get()) {
+		if (!this._mostRecentPromptInputState || promptInputState.cursorIndex > this._mostRecentPromptInputState.cursorIndex) {
 			// If input has been added
-			if (!this._mostRecentPromptInputState || promptInputState.cursorIndex > this._mostRecentPromptInputState.cursorIndex) {
-				let sent = false;
+			let sent = false;
 
-				// Quick suggestions
+			// Quick suggestions
+			if (!this._terminalSuggestWidgetVisibleContextKey.get()) {
 				if (config.quickSuggestions) {
-					const completionPrefix = promptInputState.value.substring(0, promptInputState.cursorIndex);
-					if (promptInputState.cursorIndex === 1 || completionPrefix.match(/([\s\[])[^\s]$/)) {
-						this._requestCompletions();
-						sent = true;
+					if (promptInputState.cursorIndex === 1 || promptInputState.prefix.match(/([\s\[])[^\s]$/)) {
+						// Never request completions if the last key sequence was up or down as the user was likely
+						// navigating history
+						if (!this._lastUserData?.match(/^\x1b[\[O]?[A-D]$/)) {
+							this._requestCompletions();
+							sent = true;
+						}
 					}
 				}
+			}
 
-				// Trigger characters
-				if (config.suggestOnTriggerCharacters && !sent) {
-					const lastChar = promptInputState.value.at(promptInputState.cursorIndex - 1);
-					if (lastChar?.match(/[\\\/\-]/)) {
-						this._requestCompletions();
-						sent = true;
-					}
+			// Trigger characters - this happens even if the widget is showing
+			if (config.suggestOnTriggerCharacters && !sent) {
+				const prefix = promptInputState.prefix;
+				if (
+					// Only trigger on `-` if it's after a space. This is required to not clear
+					// completions when typing the `-` in `git cherry-pick`
+					prefix?.match(/\s[\-]$/) ||
+					// Only trigger on `\` and `/` if it's a directory. Not doing so causes problems
+					// with git branches in particular
+					this._isFilteringDirectories && prefix?.match(/[\\\/]$/)
+				) {
+					this._requestCompletions();
+					sent = true;
 				}
 			}
 		}
 
 		this._mostRecentPromptInputState = promptInputState;
-		if (!this._promptInputModel || !this._terminal || !this._suggestWidget || !this._initialPromptInputState) {
+		if (!this._promptInputModel || !this._terminal || !this._suggestWidget || this._leadingLineContent === undefined) {
 			return;
 		}
 
 		this._currentPromptInputState = promptInputState;
 
+		// Hide the widget if the latest character was a space
+		if (this._currentPromptInputState.cursorIndex > 1 && this._currentPromptInputState.value.at(this._currentPromptInputState.cursorIndex - 1) === ' ') {
+			this.hideSuggestWidget();
+			return;
+		}
 
 		// Hide the widget if the cursor moves to the left of the initial position as the
 		// completions are no longer valid
-		if (this._currentPromptInputState.cursorIndex < this._initialPromptInputState.cursorIndex) {
+		if (this._currentPromptInputState.cursorIndex < this._replacementIndex + this._replacementLength) {
 			this.hideSuggestWidget();
 			return;
 		}
 
 		if (this._terminalSuggestWidgetVisibleContextKey.get()) {
-			const inputBeforeCursor = this._currentPromptInputState.value.substring(0, this._currentPromptInputState.cursorIndex);
-			this._cursorIndexDelta = this._currentPromptInputState.cursorIndex - this._initialPromptInputState.cursorIndex;
-			this._suggestWidget.setLineContext(new LineContext(inputBeforeCursor, this._cursorIndexDelta));
+			this._cursorIndexDelta = this._currentPromptInputState.cursorIndex - (this._replacementIndex + this._replacementLength);
+			let normalizedLeadingLineContent = this._currentPromptInputState.value.substring(this._replacementIndex, this._replacementIndex + this._replacementLength + this._cursorIndexDelta);
+			if (this._isFilteringDirectories) {
+				normalizedLeadingLineContent = normalizePathSeparator(normalizedLeadingLineContent, this._pathSeparator);
+			}
+			const lineContext = new LineContext(normalizedLeadingLineContent, this._cursorIndexDelta);
+			this._suggestWidget.setLineContext(lineContext);
 		}
 
 		// Hide and clear model if there are no more items
@@ -218,18 +308,15 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		if (!dimensions.width || !dimensions.height) {
 			return;
 		}
-		// TODO: What do frozen and auto do?
 		const xtermBox = this._screen!.getBoundingClientRect();
-		const panelBox = this._panel!.offsetParent!.getBoundingClientRect();
-
 		this._suggestWidget.showSuggestions(0, false, false, {
-			left: (xtermBox.left - panelBox.left) + this._terminal.buffer.active.cursorX * dimensions.width,
-			top: (xtermBox.top - panelBox.top) + this._terminal.buffer.active.cursorY * dimensions.height,
+			left: xtermBox.left + this._terminal.buffer.active.cursorX * dimensions.width,
+			top: xtermBox.top + this._terminal.buffer.active.cursorY * dimensions.height,
 			height: dimensions.height
 		});
 	}
 
-	private _handleVSCodeSequence(data: string): boolean {
+	private _handleVSCodeSequence(data: string): boolean | Promise<boolean> {
 		if (!this._terminal) {
 			return false;
 		}
@@ -237,86 +324,92 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		// Pass the sequence along to the capability
 		const [command, ...args] = data.split(';');
 		switch (command) {
-			case VSCodeOscPt.Completions:
+			case VSCodeSuggestOscPt.Completions:
 				this._handleCompletionsSequence(this._terminal, data, command, args);
 				return true;
-			case VSCodeOscPt.CompletionsPwshCommands:
-				this._handleCompletionsPwshCommandsSequence(this._terminal, data, command, args);
-			case VSCodeOscPt.CompletionsBash:
+			case VSCodeSuggestOscPt.CompletionsBash:
 				this._handleCompletionsBashSequence(this._terminal, data, command, args);
 				return true;
-			case VSCodeOscPt.CompletionsBashFirstWord:
+			case VSCodeSuggestOscPt.CompletionsBashFirstWord:
 				return this._handleCompletionsBashFirstWordSequence(this._terminal, data, command, args);
 		}
 
 		// Unrecognized sequence
 		return false;
 	}
+	private _replacementIndex: number = 0;
+	private _replacementLength: number = 0;
 
 	private _handleCompletionsSequence(terminal: Terminal, data: string, command: string, args: string[]): void {
+		this._onDidReceiveCompletions.fire();
+
 		// Nothing to handle if the terminal is not attached
 		if (!terminal.element || !this._enableWidget || !this._promptInputModel) {
 			return;
 		}
 
+		// Only show the suggest widget if the terminal is focused
+		if (!dom.isAncestorOfActiveElement(terminal.element)) {
+			return;
+		}
+
 		let replacementIndex = 0;
 		let replacementLength = this._promptInputModel.cursorIndex;
 
+		this._currentPromptInputState = {
+			value: this._promptInputModel.value,
+			prefix: this._promptInputModel.prefix,
+			suffix: this._promptInputModel.suffix,
+			cursorIndex: this._promptInputModel.cursorIndex,
+			ghostTextIndex: this._promptInputModel.ghostTextIndex
+		};
+
+		this._leadingLineContent = this._currentPromptInputState.prefix.substring(replacementIndex, replacementIndex + replacementLength + this._cursorIndexDelta);
+
 		const payload = data.slice(command.length + args[0].length + args[1].length + args[2].length + 4/*semi-colons*/);
-		let completionList: IPwshCompletion[] | IPwshCompletion = args.length === 0 || payload.length === 0 ? [] : JSON.parse(payload);
-		if (!Array.isArray(completionList)) {
-			completionList = [completionList];
-		}
-		const completions = completionList.map((e: any) => {
-			return new SimpleCompletionItem({
-				label: e.ListItemText,
-				completionText: e.CompletionText,
-				icon: pwshTypeToIconMap[e.ResultType],
-				detail: e.ToolTip
-			});
-		});
+		const rawCompletions: PwshCompletion | PwshCompletion[] | CompressedPwshCompletion[] | CompressedPwshCompletion = args.length === 0 || payload.length === 0 ? undefined : JSON.parse(payload);
+		const completions = parseCompletionsFromShell(rawCompletions);
 
-		this._leadingLineContent = this._promptInputModel.value.substring(0, this._promptInputModel.cursorIndex);
-
-		// If there's no space it means this is a command, add cached commands list to completions
 		const firstChar = this._leadingLineContent.length === 0 ? '' : this._leadingLineContent[0];
-		if (this._leadingLineContent.trim().includes(' ') || firstChar === '[') {
+		// This is a TabExpansion2 result
+		if (this._leadingLineContent.includes(' ') || firstChar === '[') {
 			replacementIndex = parseInt(args[0]);
 			replacementLength = parseInt(args[1]);
-			this._leadingLineContent = completions[0]?.completion.label.slice(0, replacementLength) ?? '';
-		} else {
+			this._leadingLineContent = this._promptInputModel.prefix;
+		}
+		// This is a global command, add cached commands list to completions
+		else {
 			completions.push(...this._cachedPwshCommands);
 		}
-		this._cursorIndexDelta = replacementIndex;
 
-		const model = new SimpleCompletionModel(completions, new LineContext(this._leadingLineContent, replacementIndex), replacementIndex, replacementLength);
+		this._replacementIndex = replacementIndex;
+		this._replacementLength = replacementLength;
+
+		if (this._mostRecentCompletion?.isDirectory && completions.every(e => e.completion.isDirectory)) {
+			completions.push(new SimpleCompletionItem(this._mostRecentCompletion));
+		}
+		this._mostRecentCompletion = undefined;
+
+		this._cursorIndexDelta = this._currentPromptInputState.cursorIndex - (replacementIndex + replacementLength);
+
+		let normalizedLeadingLineContent = this._leadingLineContent;
+
+		// If there is a single directory in the completions:
+		// - `\` and `/` are normalized such that either can be used
+		// - Using `\` or `/` will request new completions. It's important that this only occurs
+		//   when a directory is present, if not completions like git branches could be requested
+		//   which leads to flickering
+		this._isFilteringDirectories = completions.some(e => e.completion.isDirectory);
+		if (this._isFilteringDirectories) {
+			const firstDir = completions.find(e => e.completion.isDirectory);
+			this._pathSeparator = firstDir?.completion.label.match(/(?<sep>[\\\/])/)?.groups?.sep ?? sep;
+			normalizedLeadingLineContent = normalizePathSeparator(normalizedLeadingLineContent, this._pathSeparator);
+		}
+		const lineContext = new LineContext(normalizedLeadingLineContent, this._cursorIndexDelta);
+		const model = new SimpleCompletionModel(completions, lineContext, replacementIndex, replacementLength);
 		this._handleCompletionModel(model);
 	}
 
-	// TODO: These aren't persisted across reloads
-	private _cachedPwshCommands: Set<SimpleCompletionItem> = new Set();
-	private _handleCompletionsPwshCommandsSequence(terminal: Terminal, data: string, command: string, args: string[]): void {
-		const type = args[0];
-		let completionList: IPwshCompletion[] | IPwshCompletion = JSON.parse(data.slice(command.length + type.length + 2/*semi-colons*/));
-		if (!Array.isArray(completionList)) {
-			completionList = [completionList];
-		}
-		const set = this._cachedPwshCommands;
-		set.clear();
-
-		const completions = completionList.map((e: any) => {
-			return new SimpleCompletionItem({
-				label: e.ListItemText,
-				completionText: e.CompletionText,
-				icon: pwshTypeToIconMap[e.ResultType],
-				detail: e.ToolTip
-			});
-		});
-		for (const c of completions) {
-			set.add(c);
-		}
-	}
-
 	// TODO: These aren't persisted across reloads
 	// TODO: Allow triggering anywhere in the first word based on the cached completions
 	private _cachedBashAliases: Set<SimpleCompletionItem> = new Set();
@@ -423,26 +516,23 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 	}
 
 	private _handleCompletionModel(model: SimpleCompletionModel): void {
-		if (model.items.length === 0 || !this._terminal?.element || !this._promptInputModel) {
+		if (!this._terminal?.element) {
 			return;
 		}
 		const suggestWidget = this._ensureSuggestWidget(this._terminal);
+		suggestWidget.setCompletionModel(model);
+		if (model.items.length === 0 || !this._promptInputModel) {
+			return;
+		}
+		this._model = model;
 		const dimensions = this._getTerminalDimensions();
 		if (!dimensions.width || !dimensions.height) {
 			return;
 		}
-		// TODO: What do frozen and auto do?
 		const xtermBox = this._screen!.getBoundingClientRect();
-		const panelBox = this._panel!.offsetParent!.getBoundingClientRect();
-		this._initialPromptInputState = {
-			value: this._promptInputModel.value,
-			cursorIndex: this._promptInputModel.cursorIndex,
-			ghostTextIndex: this._promptInputModel.ghostTextIndex
-		};
-		suggestWidget.setCompletionModel(model);
 		suggestWidget.showSuggestions(0, false, false, {
-			left: (xtermBox.left - panelBox.left) + this._terminal.buffer.active.cursorX * dimensions.width,
-			top: (xtermBox.top - panelBox.top) + this._terminal.buffer.active.cursorY * dimensions.height,
+			left: xtermBox.left + this._terminal.buffer.active.cursorX * dimensions.width,
+			top: xtermBox.top + this._terminal.buffer.active.cursorY * dimensions.height,
 			height: dimensions.height
 		});
 	}
@@ -450,10 +540,20 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 	private _ensureSuggestWidget(terminal: Terminal): SimpleSuggestWidget {
 		this._terminalSuggestWidgetVisibleContextKey.set(true);
 		if (!this._suggestWidget) {
+			const c = this._terminalConfigurationService.config;
+			const font = this._terminalConfigurationService.getFont(dom.getActiveWindow());
+			const fontInfo: ISimpleSuggestWidgetFontInfo = {
+				fontFamily: font.fontFamily,
+				fontSize: font.fontSize,
+				lineHeight: Math.ceil(1.5 * font.fontSize),
+				fontWeight: c.fontWeight.toString(),
+				letterSpacing: font.letterSpacing
+			};
 			this._suggestWidget = this._register(this._instantiationService.createInstance(
 				SimpleSuggestWidget,
-				this._panel!,
+				this._container!,
 				this._instantiationService.createInstance(PersistedWidgetSize),
+				() => fontInfo,
 				{}
 			));
 			this._suggestWidget.list.style(getListStyles({
@@ -483,62 +583,103 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		this._suggestWidget?.selectNextPage();
 	}
 
-	acceptSelectedSuggestion(suggestion?: Pick<ISimpleSelectedSuggestion, 'item' | 'model'>): void {
+	acceptSelectedSuggestion(suggestion?: Pick<ISimpleSelectedSuggestion, 'item' | 'model'>, respectRunOnEnter?: boolean): void {
 		if (!suggestion) {
 			suggestion = this._suggestWidget?.getFocusedItem();
 		}
-		const initialPromptInputState = this._initialPromptInputState ?? this._mostRecentPromptInputState;
-		if (!suggestion || !initialPromptInputState) {
+		const initialPromptInputState = this._mostRecentPromptInputState;
+		if (!suggestion || !initialPromptInputState || !this._leadingLineContent || !this._model) {
 			return;
 		}
+		this._lastAcceptedCompletionTimestamp = Date.now();
 		this._suggestWidget?.hide();
 
 		const currentPromptInputState = this._currentPromptInputState ?? initialPromptInputState;
-		const additionalInput = currentPromptInputState.value.substring(initialPromptInputState.cursorIndex, currentPromptInputState.cursorIndex);
 
-		// Get the final completion on the right side of the cursor
-		const initialInput = initialPromptInputState.value.substring(0, (this._leadingLineContent?.length ?? 0));
-		const lastSpaceIndex = initialInput.lastIndexOf(' ');
+		// The replacement text is any text after the replacement index for the completions, this
+		// includes any text that was there before the completions were requested and any text added
+		// since to refine the completion.
+		const replacementText = currentPromptInputState.value.substring(this._model.replacementIndex, currentPromptInputState.cursorIndex);
+
+		// Right side of replacement text in the same word
+		let rightSideReplacementText = '';
+		if (
+			// The line didn't end with ghost text
+			(currentPromptInputState.ghostTextIndex === -1 || currentPromptInputState.ghostTextIndex > currentPromptInputState.cursorIndex) &&
+			// There is more than one charatcer
+			currentPromptInputState.value.length > currentPromptInputState.cursorIndex + 1 &&
+			// THe next character is not a space
+			currentPromptInputState.value.at(currentPromptInputState.cursorIndex) !== ' '
+		) {
+			const spaceIndex = currentPromptInputState.value.substring(currentPromptInputState.cursorIndex, currentPromptInputState.ghostTextIndex === -1 ? undefined : currentPromptInputState.ghostTextIndex).indexOf(' ');
+			rightSideReplacementText = currentPromptInputState.value.substring(currentPromptInputState.cursorIndex, spaceIndex === -1 ? undefined : currentPromptInputState.cursorIndex + spaceIndex);
+		}
+
 		const completion = suggestion.item.completion;
-		const completionText = completion.completionText ?? completion.label;
-		const finalCompletionRightSide = completionText.substring((this._leadingLineContent?.length ?? 0) - (lastSpaceIndex === -1 ? 0 : lastSpaceIndex + 1));
+		const completionText = completion.label;
 
-		// Get the final completion on the right side of the cursor if it differs from the initial
-		// propmt input state
-		let finalCompletionLeftSide = completionText.substring(0, (this._leadingLineContent?.length ?? 0) - (lastSpaceIndex === -1 ? 0 : lastSpaceIndex + 1));
-		if (initialInput.endsWith(finalCompletionLeftSide)) {
-			finalCompletionLeftSide = '';
+		let runOnEnter = false;
+		if (respectRunOnEnter) {
+			const runOnEnterConfig = this._configurationService.getValue<ITerminalSuggestConfiguration>(terminalSuggestConfigSection).runOnEnter;
+			switch (runOnEnterConfig) {
+				case 'always': {
+					runOnEnter = true;
+					break;
+				}
+				case 'exactMatch': {
+					runOnEnter = replacementText.toLowerCase() === completionText.toLowerCase();
+					break;
+				}
+				case 'exactMatchIgnoreExtension': {
+					runOnEnter = replacementText.toLowerCase() === completionText.toLowerCase();
+					if (completion.isFile) {
+						runOnEnter ||= replacementText.toLowerCase() === completionText.toLowerCase().replace(/\.[^\.]+$/, '');
+					}
+					break;
+				}
+			}
+		}
+
+		// For folders, allow the next completion request to get completions for that folder
+		if (completion.icon === Codicon.folder) {
+			this._lastAcceptedCompletionTimestamp = 0;
+		}
+
+		this._mostRecentCompletion = completion;
+
+		const commonPrefixLen = commonPrefixLength(replacementText, completion.label);
+		const commonPrefix = replacementText.substring(replacementText.length - 1 - commonPrefixLen, replacementText.length - 1);
+		const completionSuffix = completion.label.substring(commonPrefixLen);
+		let resultSequence: string;
+		if (currentPromptInputState.suffix.length > 0 && currentPromptInputState.prefix.endsWith(commonPrefix) && currentPromptInputState.suffix.startsWith(completionSuffix)) {
+			// Move right to the end of the completion
+			resultSequence = '\x1bOC'.repeat(completion.label.length - commonPrefixLen);
+		} else {
+			resultSequence = [
+				// Backspace (left) to remove all additional input
+				'\x7F'.repeat(replacementText.length - commonPrefixLen),
+				// Delete (right) to remove any additional text in the same word
+				'\x1b[3~'.repeat(rightSideReplacementText.length),
+				// Write the completion
+				completionSuffix,
+				// Run on enter if needed
+				runOnEnter ? '\r' : ''
+			].join('');
 		}
 
 		// Send the completion
-		this._onAcceptedCompletion.fire([
-			// Backspace to remove all additional input
-			'\x7F'.repeat(additionalInput.length),
-			// Backspace to remove left side of completion
-			'\x7F'.repeat(finalCompletionLeftSide.length),
-			// Write the left side of the completion if it differed
-			finalCompletionLeftSide,
-			// Write the completion
-			finalCompletionRightSide,
-		].join(''));
+		this._onAcceptedCompletion.fire(resultSequence);
 
 		this.hideSuggestWidget();
 	}
 
 	hideSuggestWidget(): void {
-		this._initialPromptInputState = undefined;
 		this._currentPromptInputState = undefined;
+		this._leadingLineContent = undefined;
 		this._suggestWidget?.hide();
 	}
 }
 
-interface IPwshCompletion {
-	CompletionText: string;
-	ListItemText: string;
-	ResultType: number;
-	ToolTip: string;
-}
-
 class PersistedWidgetSize {
 
 	private readonly _key = TerminalStorageKeys.TerminalSuggestSize;
@@ -569,3 +710,91 @@ class PersistedWidgetSize {
 		this._storageService.remove(this._key, StorageScope.PROFILE);
 	}
 }
+
+export function parseCompletionsFromShell(rawCompletions: PwshCompletion | PwshCompletion[] | CompressedPwshCompletion[] | CompressedPwshCompletion): SimpleCompletionItem[] {
+	if (!rawCompletions) {
+		return [];
+	}
+	let typedRawCompletions: PwshCompletion[];
+	if (!Array.isArray(rawCompletions)) {
+		typedRawCompletions = [rawCompletions];
+	} else {
+		if (rawCompletions.length === 0) {
+			return [];
+		}
+		if (typeof rawCompletions[0] === 'string') {
+			typedRawCompletions = [rawCompletions as CompressedPwshCompletion].map(e => ({
+				CompletionText: e[0],
+				ResultType: e[1],
+				ToolTip: e[2],
+				CustomIcon: e[3],
+			}));
+		} else if (Array.isArray(rawCompletions[0])) {
+			typedRawCompletions = (rawCompletions as CompressedPwshCompletion[]).map(e => ({
+				CompletionText: e[0],
+				ResultType: e[1],
+				ToolTip: e[2],
+				CustomIcon: e[3],
+			}));
+		} else {
+			typedRawCompletions = rawCompletions as PwshCompletion[];
+		}
+	}
+	return typedRawCompletions.map(e => rawCompletionToSimpleCompletionItem(e));
+}
+
+function rawCompletionToSimpleCompletionItem(rawCompletion: PwshCompletion): SimpleCompletionItem {
+	// HACK: Somewhere along the way from the powershell script to here, the path separator at the
+	// end of directories may go missing, likely because `\"` -> `"`. As a result, make sure there
+	// is a trailing separator at the end of all directory completions. This should not be done for
+	// `.` and `..` entries because they are optimized not for navigating to different directories
+	// but for passing as args.
+	let label = rawCompletion.CompletionText;
+	if (
+		rawCompletion.ResultType === 4 &&
+		!label.match(/^[\-+]$/) && // Don't add a `/` to `-` or `+` (navigate location history)
+		!label.match(/^\.\.?$/) &&
+		!label.match(/[\\\/]$/)
+	) {
+		const separator = label.match(/(?<sep>[\\\/])/)?.groups?.sep ?? sep;
+		label = label + separator;
+	}
+
+	// If tooltip is not present it means it's the same as label
+	const detail = rawCompletion.ToolTip ?? label;
+
+	// Pwsh gives executables a result type of 2, but we want to treat them as files wrt the sorting
+	// and file extension score boost. An example of where this improves the experience is typing
+	// `git`, `git.exe` should appear at the top and beat `git-lfs.exe`. Keep the same icon though.
+	const icon = getIcon(rawCompletion.ResultType, rawCompletion.CustomIcon);
+	const isExecutable = rawCompletion.ResultType === 2 && rawCompletion.CompletionText.match(/\.[a-z0-9]{2,4}$/i);
+	if (isExecutable) {
+		rawCompletion.ResultType = 3;
+	}
+
+	return new SimpleCompletionItem({
+		label,
+		icon,
+		detail,
+		isFile: rawCompletion.ResultType === 3,
+		isDirectory: rawCompletion.ResultType === 4,
+		isKeyword: rawCompletion.ResultType === 12,
+	});
+}
+
+function getIcon(resultType: number, customIconId?: string): ThemeIcon {
+	if (customIconId) {
+		const icon: ThemeIcon | undefined = customIconId in Codicon ? (Codicon as { [id: string]: ThemeIcon | undefined })[customIconId] : Codicon.symbolText;
+		if (icon) {
+			return icon;
+		}
+	}
+	return pwshTypeToIconMap[resultType] ?? Codicon.symbolText;
+}
+
+function normalizePathSeparator(path: string, sep: string): string {
+	if (sep === '/') {
+		return path.replaceAll('\\', '/');
+	}
+	return path.replaceAll('/', '\\');
+}
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/common/terminal.suggest.ts b/src/vs/workbench/contrib/terminalContrib/suggest/common/terminal.suggest.ts
index ab4b902ee65..99e137def03 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/common/terminal.suggest.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/common/terminal.suggest.ts
@@ -9,7 +9,9 @@ export const enum TerminalSuggestCommandId {
 	SelectNextSuggestion = 'workbench.action.terminal.selectNextSuggestion',
 	SelectNextPageSuggestion = 'workbench.action.terminal.selectNextPageSuggestion',
 	AcceptSelectedSuggestion = 'workbench.action.terminal.acceptSelectedSuggestion',
+	AcceptSelectedSuggestionEnter = 'workbench.action.terminal.acceptSelectedSuggestionEnter',
 	HideSuggestWidget = 'workbench.action.terminal.hideSuggestWidget',
+	ClearSuggestCache = 'workbench.action.terminal.clearSuggestCache',
 }
 
 export const defaultTerminalSuggestCommandsToSkipShell = [
@@ -18,5 +20,7 @@ export const defaultTerminalSuggestCommandsToSkipShell = [
 	TerminalSuggestCommandId.SelectNextSuggestion,
 	TerminalSuggestCommandId.SelectNextPageSuggestion,
 	TerminalSuggestCommandId.AcceptSelectedSuggestion,
+	TerminalSuggestCommandId.AcceptSelectedSuggestionEnter,
 	TerminalSuggestCommandId.HideSuggestWidget,
+	TerminalSuggestCommandId.ClearSuggestCache,
 ];
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts b/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts
index 357a6bbee60..c0a82e3e9e7 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts
@@ -3,15 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import type { IStringDictionary } from 'vs/base/common/collections';
-import { localize } from 'vs/nls';
-import type { IConfigurationPropertySchema } from 'vs/platform/configuration/common/configurationRegistry';
-import { TerminalSettingId } from 'vs/platform/terminal/common/terminal';
+import type { IStringDictionary } from '../../../../../base/common/collections.js';
+import { localize } from '../../../../../nls.js';
+import type { IConfigurationPropertySchema } from '../../../../../platform/configuration/common/configurationRegistry.js';
+import { TerminalSettingId } from '../../../../../platform/terminal/common/terminal.js';
 
 export const enum TerminalSuggestSettingId {
 	Enabled = 'terminal.integrated.suggest.enabled',
 	QuickSuggestions = 'terminal.integrated.suggest.quickSuggestions',
 	SuggestOnTriggerCharacters = 'terminal.integrated.suggest.suggestOnTriggerCharacters',
+	RunOnEnter = 'terminal.integrated.suggest.runOnEnter',
+	BuiltinCompletions = 'terminal.integrated.suggest.builtinCompletions',
 }
 
 export const terminalSuggestConfigSection = 'terminal.integrated.suggest';
@@ -20,12 +22,17 @@ export interface ITerminalSuggestConfiguration {
 	enabled: boolean;
 	quickSuggestions: boolean;
 	suggestOnTriggerCharacters: boolean;
+	runOnEnter: 'never' | 'exactMatch' | 'exactMatchIgnoreExtension' | 'always';
+	builtinCompletions: {
+		'pwshCode': boolean;
+		'pwshGit': boolean;
+	};
 }
 
 export const terminalSuggestConfiguration: IStringDictionary<IConfigurationPropertySchema> = {
 	[TerminalSuggestSettingId.Enabled]: {
 		restricted: true,
-		markdownDescription: localize('suggest.enabled', "Enables experimental terminal Intellisense suggestions for supported shells ({0}) when {1} is set to {2}.\n\nIf shell integration is installed manually, {3} needs to be set to {4} before calling the shell integration script.", 'PowerShell', `\`#${TerminalSettingId.ShellIntegrationEnabled}#\``, '`true`', '`VSCODE_SUGGEST`', '`1`'),
+		markdownDescription: localize('suggest.enabled', "Enables experimental terminal Intellisense suggestions for supported shells ({0}) when {1} is set to {2}.\n\nIf shell integration is installed manually, {3} needs to be set to {4} before calling the shell integration script.", 'PowerShell v7+', `\`#${TerminalSettingId.ShellIntegrationEnabled}#\``, '`true`', '`VSCODE_SUGGEST`', '`1`'),
 		type: 'boolean',
 		default: false,
 	},
@@ -41,4 +48,36 @@ export const terminalSuggestConfiguration: IStringDictionary<IConfigurationPrope
 		type: 'boolean',
 		default: true,
 	},
+	[TerminalSuggestSettingId.RunOnEnter]: {
+		restricted: true,
+		markdownDescription: localize('suggest.runOnEnter', "Controls whether suggestions should run immediately when `Enter` (not `Tab`) is used to accept the result."),
+		enum: ['ignore', 'never', 'exactMatch', 'exactMatchIgnoreExtension', 'always'],
+		markdownEnumDescriptions: [
+			localize('runOnEnter.ignore', "Ignore suggestions and send the enter directly to the shell without completing. This is used as the default value so the suggest widget is as unobtrusive as possible."),
+			localize('runOnEnter.never', "Never run on `Enter`."),
+			localize('runOnEnter.exactMatch', "Run on `Enter` when the suggestion is typed in its entirety."),
+			localize('runOnEnter.exactMatchIgnoreExtension', "Run on `Enter` when the suggestion is typed in its entirety or when a file is typed without its extension included."),
+			localize('runOnEnter.always', "Always run on `Enter`.")
+		],
+		default: 'ignore',
+	},
+	[TerminalSuggestSettingId.BuiltinCompletions]: {
+		restricted: true,
+		markdownDescription: localize('suggest.builtinCompletions', "Controls which built-in completions are activated. This setting can cause conflicts if custom shell completions are configured in the shell profile."),
+		type: 'object',
+		properties: {
+			'pwshCode': {
+				description: localize('suggest.builtinCompletions.pwshCode', 'Custom PowerShell argument completers will be registered for VS Code\'s `code` and `code-insiders` CLIs. This is currently very basic and always suggests flags and subcommands without checking context.'),
+				type: 'boolean'
+			},
+			'pwshGit': {
+				description: localize('suggest.builtinCompletions.pwshGit', 'Custom PowerShell argument completers will be registered for the `git` CLI.'),
+				type: 'boolean'
+			},
+		},
+		default: {
+			pwshCode: true,
+			pwshGit: true,
+		}
+	},
 };
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/recordings/windows11_pwsh_getcontent_file.ts b/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/recordings/windows11_pwsh_getcontent_file.ts
index d8e59e3655c..a2946b7bd12 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/recordings/windows11_pwsh_getcontent_file.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/recordings/windows11_pwsh_getcontent_file.ts
@@ -487,7 +487,7 @@ export const events = [
 	},
 	{
 		"type": "sendText",
-		"data": ".\\README.md"
+		"data": "ADME.md"
 	},
 	{
 		"type": "output",
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/recordings/windows11_pwsh_input_ls_complete_ls.ts b/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/recordings/windows11_pwsh_input_ls_complete_ls.ts
index 8153f026abc..41a77c74b3f 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/recordings/windows11_pwsh_input_ls_complete_ls.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/recordings/windows11_pwsh_input_ls_complete_ls.ts
@@ -81,10 +81,6 @@ export const events = [
 		"type": "command",
 		"id": "workbench.action.terminal.acceptSelectedSuggestion"
 	},
-	{
-		"type": "sendText",
-		"data": "s"
-	},
 	{
 		"type": "output",
 		"data": "\u001b[?25l\u001b[93m\u001b[3;3Hls\u001b[97m\u001b[2m\u001b[3ms\b\u001b[?25h"
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/recordings/windows11_pwsh_namespace_completion.ts b/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/recordings/windows11_pwsh_namespace_completion.ts
index 01dcca0141a..ee34782834a 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/recordings/windows11_pwsh_namespace_completion.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/recordings/windows11_pwsh_namespace_completion.ts
@@ -81,17 +81,25 @@ export const events = [
 		"type": "output",
 		"data": "\u001b]633;Completions;1;1;2;[{\"CompletionText\":\"ref\",\"ListItemText\":\"PSReference\",\"ResultType\":11,\"ToolTip\":\"Class System.Management.Automation.PSReference\"},{\"CompletionText\":\"System.Random\",\"ListItemText\":\"Random\",\"ResultType\":11,\"ToolTip\":\"System.Random\"},{\"CompletionText\":\"System.IO.RandomAccess\",\"ListItemText\":\"RandomAccess\",\"ResultType\":11,\"ToolTip\":\"System.IO.RandomAccess\"},{\"CompletionText\":\"System.Security.Cryptography.RandomNumberGenerator\",\"ListItemText\":\"RandomNumberGenerator\",\"ResultType\":11,\"ToolTip\":\"System.Security.Cryptography.RandomNumberGenerator\"},{\"CompletionText\":\"System.Range\",\"ListItemText\":\"Range\",\"ResultType\":11,\"ToolTip\":\"System.Range\"},{\"CompletionText\":\"System.ComponentModel.DataAnnotations.RangeAttribute\",\"ListItemText\":\"RangeAttribute\",\"ResultType\":11,\"ToolTip\":\"System.ComponentModel.DataAnnotations.RangeAttribute\"},{\"CompletionText\":\"System.Net.Http.Headers.RangeConditionHeaderValue\",\"ListItemText\":\"RangeConditionHeaderValue\",\"ResultType\":11,\"ToolTip\":\"System.Net.Http.Headers.RangeConditionHeaderValue\"},{\"CompletionText\":\"Microsoft.CodeAnalysis.CSharp.Syntax.RangeExpressionSyntax\",\"ListItemText\":\"RangeExpressionSyntax\",\"ResultType\":11,\"ToolTip\":\"Microsoft.CodeAnalysis.CSharp.Syntax.RangeExpressionSyntax\"},{\"CompletionText\":\"System.Net.Http.Headers.RangeHeaderValue\",\"ListItemText\":\"RangeHeaderValue\",\"ResultType\":11,\"ToolTip\":\"System.Net.Http.Headers.RangeHeaderValue\"},{\"CompletionText\":\"System.Net.Http.Headers.RangeItemHeaderValue\",\"ListItemText\":\"RangeItemHeaderValue\",\"ResultType\":11,\"ToolTip\":\"System.Net.Http.Headers.RangeItemHeaderValue\"},{\"CompletionText\":\"System.RankException\",\"ListItemText\":\"RankException\",\"ResultType\":11,\"ToolTip\":\"System.RankException\"},{\"CompletionText\":\".Interop+Gdi32+RasterOp\",\"ListItemText\":\"RasterOp\",\"ResultType\":11,\"ToolTip\":\".Interop+Gdi32+RasterOp\"},{\"CompletionText\":\"System.Security.AccessControl.RawAcl\",\"ListItemText\":\"RawAcl\",\"ResultType\":11,\"ToolTip\":\"System.Security.AccessControl.RawAcl\"},{\"CompletionText\":\"System.Security.AccessControl.RawSecurityDescriptor\",\"ListItemText\":\"RawSecurityDescriptor\",\"ResultType\":11,\"ToolTip\":\"System.Security.AccessControl.RawSecurityDescriptor\"},{\"CompletionText\":\"Microsoft.Cci.MetadataWriter+RawTokenEncoding\",\"ListItemText\":\"RawTokenEncoding\",\"ResultType\":11,\"ToolTip\":\"Microsoft.Cci.MetadataWriter+RawTokenEncoding\"},{\"CompletionText\":\"JetBrains.Annotations.RazorDirectiveAttribute\",\"ListItemText\":\"RazorDirectiveAttribute\",\"ResultType\":11,\"ToolTip\":\"JetBrains.Annotations.RazorDirectiveAttribute\"},{\"CompletionText\":\"JetBrains.Annotations.RazorHelperCommonAttribute\",\"ListItemText\":\"RazorHelperCommonAttribute\",\"ResultType\":11,\"ToolTip\":\"JetBrains.Annotations.RazorHelperCommonAttribute\"},{\"CompletionText\":\"JetBrains.Annotations.RazorImportNamespaceAttribute\",\"ListItemText\":\"RazorImportNamespaceAttribute\",\"ResultType\":11,\"ToolTip\":\"JetBrains.Annotations.RazorImportNamespaceAttribute\"},{\"CompletionText\":\"JetBrains.Annotations.RazorInjectionAttribute\",\"ListItemText\":\"RazorInjectionAttribute\",\"ResultType\":11,\"ToolTip\":\"JetBrains.Annotations.RazorInjectionAttribute\"},{\"CompletionText\":\"JetBrains.Annotations.RazorLayoutAttribute\",\"ListItemText\":\"RazorLayoutAttribute\",\"ResultType\":11,\"ToolTip\":\"JetBrains.Annotations.RazorLayoutAttribute\"},{\"CompletionText\":\"JetBrains.Annotations.RazorPageBaseTypeAttribute\",\"ListItemText\":\"RazorPageBaseTypeAttribute\",\"ResultType\":11,\"ToolTip\":\"JetBrains.Annotations.RazorPageBaseTypeAttribute\"},{\"CompletionText\":\"JetBrains.Annotations.RazorSectionAttribute\",\"ListItemText\":\"RazorSectionAttribute\",\"ResultType\":11,\"ToolTip\":\"JetBrains.Annotations.RazorSectionAttribute\"},{\"CompletionText\":\"JetBrains.Annotations.RazorWriteLiteralMethodAttribute\",\"ListItemText\":\"RazorWriteLiteralMethodAttribute\",\"ResultType\":11,\"ToolTip\":\"JetBrains.Annotations.RazorWriteLiteralMethodAttribute\"},{\"CompletionText\":\"JetBrains.Annotations.RazorWriteMethodAttribute\",\"ListItemText\":\"RazorWriteMethodAttribute\",\"ResultType\":11,\"ToolTip\":\"JetBrains.Annotations.RazorWriteMethodAttribute\"},{\"CompletionText\":\"JetBrains.Annotations.RazorWriteMethodParameterAttribute\",\"ListItemText\":\"RazorWriteMethodParameterAttribute\",\"ResultType\":11,\"ToolTip\":\"JetBrains.Annotations.RazorWriteMethodParameterAttribute\"},{\"CompletionText\":\"System.Security.Cryptography.RC2\",\"ListItemText\":\"RC2\",\"ResultType\":11,\"ToolTip\":\"System.Security.Cryptography.RC2\"},{\"CompletionText\":\"System.Security.Cryptography.RC2CryptoServiceProvider\",\"ListItemText\":\"RC2CryptoServiceProvider\",\"ResultType\":11,\"ToolTip\":\"System.Security.Cryptography.RC2CryptoServiceProvider\"},{\"CompletionText\":\"System.Runtime.Intrinsics.Arm.Rdm\",\"ListItemText\":\"Rdm\",\"ResultType\":11,\"ToolTip\":\"System.Runtime.Intrinsics.Arm.Rdm\"},{\"CompletionText\":\"System.Xml.Linq.ReaderOptions\",\"ListItemText\":\"ReaderOptions\",\"ResultType\":11,\"ToolTip\":\"System.Xml.Linq.ReaderOptions\"},{\"CompletionText\":\"System.Threading.ReaderWriterLock\",\"ListItemText\":\"ReaderWriterLock\",\"ResultType\":11,\"ToolTip\":\"System.Threading.ReaderWriterLock\"},{\"CompletionText\":\"System.Threading.ReaderWriterLockSlim\",\"ListItemText\":\"ReaderWriterLockSlim\",\"ResultType\":11,\"ToolTip\":\"System.Threading.ReaderWriterLockSlim\"},{\"CompletionText\":\"Microsoft.PowerShell.Commands.ReadHostCommand\",\"ListItemText\":\"ReadHostCommand\",\"ResultType\":11,\"ToolTip\":\"Class Microsoft.PowerShell.Commands.ReadHostCommand\"},{\"CompletionText\":\"System.Management.Automation.Host.ReadKeyOptions\",\"ListItemText\":\"ReadKeyOptions\",\"ResultType\":11,\"ToolTip\":\"Enum System.Management.Automation.Host.ReadKeyOptions\"},{\"CompletionText\":\"System.DirectoryServices.ActiveDirectory.ReadOnlyActiveDirectorySchemaClassCollection\",\"ListItemText\":\"ReadOnlyActiveDirectorySchemaClassCollection\",\"ResultType\":11,\"ToolTip\":\"System.DirectoryServices.ActiveDirectory.ReadOnlyActiveDirectorySchemaClassCollection\"},{\"CompletionText\":\"System.DirectoryServices.ActiveDirectory.ReadOnlyActiveDirectorySchemaPropertyCollection\",\"ListItemText\":\"ReadOnlyActiveDirectorySchemaPropertyCollection\",\"ResultType\":11,\"ToolTip\":\"System.DirectoryServices.ActiveDirectory.ReadOnlyActiveDirectorySchemaPropertyCollection\"},{\"CompletionText\":\"System.ComponentModel.ReadOnlyAttribute\",\"ListItemText\":\"ReadOnlyAttribute\",\"ResultType\":11,\"ToolTip\":\"System.ComponentModel.ReadOnlyAttribute\"},{\"CompletionText\":\"System.Collections.ObjectModel.ReadOnlyCollection\",\"ListItemText\":\"ReadOnlyCollection<>\",\"ResultType\":11,\"ToolTip\":\"System.Collections.ObjectModel.ReadOnlyCollection[T]\"},{\"CompletionText\":\"System.Collections.ReadOnlyCollectionBase\",\"ListItemText\":\"ReadOnlyCollectionBase\",\"ResultType\":11,\"ToolTip\":\"System.Collections.ReadOnlyCollectionBase\"},{\"CompletionText\":\"System.Runtime.CompilerServices.ReadOnlyCollectionBuilder\",\"ListItemText\":\"ReadOnlyCollectionBuilder<>\",\"ResultType\":11,\"ToolTip\":\"System.Runtime.CompilerServices.ReadOnlyCollectionBuilder[T]\"},{\"CompletionText\":\"System.Collections.ObjectModel.ReadOnlyDictionary\",\"ListItemText\":\"ReadOnlyDictionary<>\",\"ResultType\":11,\"ToolTip\":\"System.Collections.ObjectModel.ReadOnlyDictionary[T1, T2]\"},{\"CompletionText\":\"System.DirectoryServices.ActiveDirectory.ReadOnlyDirectoryServerCollection\",\"ListItemText\":\"ReadOnlyDirectoryServerCollection\",\"ResultType\":11,\"ToolTip\":\"System.DirectoryServices.ActiveDirectory.ReadOnlyDirectoryServerCollection\"},{\"CompletionText\":\"System.Data.ReadOnlyException\",\"ListItemText\":\"ReadOnlyException\",\"ResultType\":11,\"ToolTip\":\"System.Data.ReadOnlyException\"},{\"CompletionText\":\"Json.Schema.ReadOnlyKeyword\",\"ListItemText\":\"ReadOnlyKeyword\",\"ResultType\":11,\"ToolTip\":\"Json.Schema.ReadOnlyKeyword\"},{\"CompletionText\":\"System.ReadOnlyMemory\",\"ListItemText\":\"ReadOnlyMemory<>\",\"ResultType\":11,\"ToolTip\":\"System.ReadOnlyMemory[T]\"},{\"CompletionText\":\"System.Net.Http.ReadOnlyMemoryContent\",\"ListItemText\":\"ReadOnlyMemoryContent\",\"ResultType\":11,\"ToolTip\":\"System.Net.Http.ReadOnlyMemoryContent\"},{\"CompletionText\":\"System.Collections.ObjectModel.ReadOnlyObservableCollection\",\"ListItemText\":\"ReadOnlyObservableCollection<>\",\"ResultType\":11,\"ToolTip\":\"System.Collections.ObjectModel.ReadOnlyObservableCollection[T]\"},{\"CompletionText\":\"System.Management.Automation.ReadOnlyPSMemberInfoCollection\",\"ListItemText\":\"ReadOnlyPSMemberInfoCollection<>\",\"ResultType\":11,\"ToolTip\":\"Class System.Management.Automation.ReadOnlyPSMemberInfoCollection[T]\"},{\"CompletionText\":\"System.Buffers.ReadOnlySequence\",\"ListItemText\":\"ReadOnlySequence<>\",\"ResultType\":11,\"ToolTip\":\"System.Buffers.ReadOnlySequence[T]\"},{\"CompletionText\":\"System.Buffers.ReadOnlySequenceSegment\",\"ListItemText\":\"ReadOnlySequenceSegment<>\",\"ResultType\":11,\"ToolTip\":\"System.Buffers.ReadOnlySequenceSegment[T]\"},{\"CompletionText\":\"System.DirectoryServices.ActiveDirectory.ReadOnlySiteCollection\",\"ListItemText\":\"ReadOnlySiteCollection\",\"ResultType\":11,\"ToolTip\":\"System.DirectoryServices.ActiveDirectory.ReadOnlySiteCollection\"},{\"CompletionText\":\"System.DirectoryServices.ActiveDirectory.ReadOnlySiteLinkBridgeCollection\",\"ListItemText\":\"ReadOnlySiteLinkBridgeCollection\",\"ResultType\":11,\"ToolTip\":\"System.DirectoryServices.ActiveDirectory.ReadOnlySiteLinkBridgeCollection\"},{\"CompletionText\":\"System.DirectoryServices.ActiveDirectory.ReadOnlySiteLinkCollection\",\"ListItemText\":\"ReadOnlySiteLinkCollection\",\"ResultType\":11,\"ToolTip\":\"System.DirectoryServices.ActiveDirectory.ReadOnlySiteLinkCollection\"},{\"CompletionText\":\"System.ReadOnlySpan\",\"ListItemText\":\"ReadOnlySpan<>\",\"ResultType\":11,\"ToolTip\":\"System.ReadOnlySpan[T]\"},{\"CompletionText\":\"System.Buffers.ReadOnlySpanAction\",\"ListItemText\":\"ReadOnlySpanAction<>\",\"ResultType\":11,\"ToolTip\":\"System.Buffers.ReadOnlySpanAction[T1, T2]\"},{\"CompletionText\":\"System.Runtime.InteropServices.Marshalling.ReadOnlySpanMarshaller\",\"ListItemText\":\"ReadOnlySpanMarshaller<>\",\"ResultType\":11,\"ToolTip\":\"System.Runtime.InteropServices.Marshalling.ReadOnlySpanMarshaller[T1, T2]\"},{\"CompletionText\":\"System.DirectoryServices.ActiveDirectory.ReadOnlyStringCollection\",\"ListItemText\":\"ReadOnlyStringCollection\",\"ResultType\":11,\"ToolTip\":\"System.DirectoryServices.ActiveDirectory.ReadOnlyStringCollection\"},{\"CompletionText\":\"System.Xml.ReadState\",\"ListItemText\":\"ReadState\",\"ResultType\":11,\"ToolTip\":\"System.Xml.ReadState\"},{\"CompletionText\":\"Microsoft.PowerShell.Commands.ReceiveJobCommand\",\"ListItemText\":\"ReceiveJobCommand\",\"ResultType\":11,\"ToolTip\":\"Class Microsoft.PowerShell.Commands.ReceiveJobCommand\"},{\"CompletionText\":\"Microsoft.PowerShell.Commands.ReceivePSSessionCommand\",\"ListItemText\":\"ReceivePSSessionCommand\",\"ResultType\":11,\"ToolTip\":\"Class Microsoft.PowerShell.Commands.ReceivePSSessionCommand\"},{\"CompletionText\":\"System.Security.Cryptography.Pkcs.RecipientInfo\",\"ListItemText\":\"RecipientInfo\",\"ResultType\":11,\"ToolTip\":\"System.Security.Cryptography.Pkcs.RecipientInfo\"},{\"CompletionText\":\"System.Security.Cryptography.Pkcs.RecipientInfoCollection\",\"ListItemText\":\"RecipientInfoCollection\",\"ResultType\":11,\"ToolTip\":\"System.Security.Cryptography.Pkcs.RecipientInfoCollection\"},{\"CompletionText\":\"System.Security.Cryptography.Pkcs.RecipientInfoEnumerator\",\"ListItemText\":\"RecipientInfoEnumerator\",\"ResultType\":11,\"ToolTip\":\"System.Security.Cryptography.Pkcs.RecipientInfoEnumerator\"},{\"CompletionText\":\"System.Security.Cryptography.Pkcs.RecipientInfoType\",\"ListItemText\":\"RecipientInfoType\",\"ResultType\":11,\"ToolTip\":\"System.Security.Cryptography.Pkcs.RecipientInfoType\"},{\"CompletionText\":\"System.Speech.Recognition.RecognitionEventArgs\",\"ListItemText\":\"RecognitionEventArgs\",\"ResultType\":11,\"ToolTip\":\"System.Speech.Recognition.RecognitionEventArgs\"},{\"CompletionText\":\"System.Speech.Recognition.RecognitionResult\",\"ListItemText\":\"RecognitionResult\",\"ResultType\":11,\"ToolTip\":\"System.Speech.Recognition.RecognitionResult\"},{\"CompletionText\":\"System.Speech.Recognition.RecognizeCompletedEventArgs\",\"ListItemText\":\"RecognizeCompletedEventArgs\",\"ResultType\":11,\"ToolTip\":\"System.Speech.Recognition.RecognizeCompletedEventArgs\"},{\"CompletionText\":\"System.Speech.Recognition.RecognizedAudio\",\"ListItemText\":\"RecognizedAudio\",\"ResultType\":11,\"ToolTip\":\"System.Speech.Recognition.RecognizedAudio\"},{\"CompletionText\":\"System.Speech.Recognition.RecognizedPhrase\",\"ListItemText\":\"RecognizedPhrase\",\"ResultType\":11,\"ToolTip\":\"System.Speech.Recognition.RecognizedPhrase\"},{\"CompletionText\":\"System.Speech.Recognition.RecognizedWordUnit\",\"ListItemText\":\"RecognizedWordUnit\",\"ResultType\":11,\"ToolTip\":\"System.Speech.Recognition.RecognizedWordUnit\"},{\"CompletionText\":\"System.Speech.Recognition.RecognizeMode\",\"ListItemText\":\"RecognizeMode\",\"ResultType\":11,\"ToolTip\":\"System.Speech.Recognition.RecognizeMode\"},{\"CompletionText\":\"System.Speech.Recognition.RecognizerInfo\",\"ListItemText\":\"RecognizerInfo\",\"ResultType\":11,\"ToolTip\":\"System.Speech.Recognition.RecognizerInfo\"},{\"CompletionText\":\"System.Speech.Recognition.RecognizerState\",\"ListItemText\":\"RecognizerState\",\"ResultType\":11,\"ToolTip\":\"System.Speech.Recognition.RecognizerState\"},{\"CompletionText\":\"System.Speech.Recognition.RecognizerUpdateReachedEventArgs\",\"ListItemText\":\"RecognizerUpdateReachedEventArgs\",\"ResultType\":11,\"ToolTip\":\"System.Speech.Recognition.RecognizerUpdateReachedEventArgs\"},{\"CompletionText\":\"System.ComponentModel.RecommendedAsConfigurableAttribute\",\"ListItemText\":\"RecommendedAsConfigurableAttribute\",\"ResultType\":11,\"ToolTip\":\"System.ComponentModel.RecommendedAsConfigurableAttribute\"},{\"CompletionText\":\"Microsoft.CodeAnalysis.CSharp.Syntax.RecordDeclarationSyntax\",\"ListItemText\":\"RecordDeclarationSyntax\",\"ResultType\":11,\"ToolTip\":\"Microsoft.CodeAnalysis.CSharp.Syntax.RecordDeclarationSyntax\"},{\"CompletionText\":\".Interop+Gdi32+RECT\",\"ListItemText\":\"RECT\",\"ResultType\":11,\"ToolTip\":\".Interop+Gdi32+RECT\"},{\"CompletionText\":\"System.Drawing.Rectangle\",\"ListItemText\":\"Rectangle\",\"ResultType\":11,\"ToolTip\":\"System.Drawing.Rectangle\"},{\"CompletionText\":\"System.Management.Automation.Host.Rectangle\",\"ListItemText\":\"Rectangle\",\"ResultType\":11,\"ToolTip\":\"Struct System.Management.Automation.Host.Rectangle\"},{\"CompletionText\":\"System.Drawing.RectangleConverter\",\"ListItemText\":\"RectangleConverter\",\"ResultType\":11,\"ToolTip\":\"System.Drawing.RectangleConverter\"},{\"CompletionText\":\"System.Drawing.RectangleF\",\"ListItemText\":\"RectangleF\",\"ResultType\":11,\"ToolTip\":\"System.Drawing.RectangleF\"},{\"CompletionText\":\"Json.Schema.RecursiveAnchorKeyword\",\"ListItemText\":\"RecursiveAnchorKeyword\",\"ResultType\":11,\"ToolTip\":\"Json.Schema.RecursiveAnchorKeyword\"},{\"CompletionText\":\"Microsoft.CodeAnalysis.CSharp.Syntax.RecursivePatternSyntax\",\"ListItemText\":\"RecursivePatternSyntax\",\"ResultType\":11,\"ToolTip\":\"Microsoft.CodeAnalysis.CSharp.Syntax.RecursivePatternSyntax\"},{\"CompletionText\":\"Json.Schema.RecursiveRefKeyword\",\"ListItemText\":\"RecursiveRefKeyword\",\"ResultType\":11,\"ToolTip\":\"Json.Schema.RecursiveRefKeyword\"},{\"CompletionText\":\"Microsoft.VisualBasic.FileIO.RecycleOption\",\"ListItemText\":\"RecycleOption\",\"ResultType\":11,\"ToolTip\":\"Microsoft.VisualBasic.FileIO.RecycleOption\"},{\"CompletionText\":\"System.Management.Automation.RedirectedException\",\"ListItemText\":\"RedirectedException\",\"ResultType\":11,\"ToolTip\":\"Class System.Management.Automation.RedirectedException\"},{\"CompletionText\":\"System.Management.Automation.Language.RedirectionAst\",\"ListItemText\":\"RedirectionAst\",\"ResultType\":11,\"ToolTip\":\"Class System.Management.Automation.Language.RedirectionAst\"},{\"CompletionText\":\"System.Management.Automation.Language.RedirectionStream\",\"ListItemText\":\"RedirectionStream\",\"ResultType\":11,\"ToolTip\":\"Enum System.Management.Automation.Language.RedirectionStream\"},{\"CompletionText\":\"System.Management.Automation.Language.RedirectionToken\",\"ListItemText\":\"RedirectionToken\",\"ResultType\":11,\"ToolTip\":\"Class System.Management.Automation.Language.RedirectionToken\"},{\"CompletionText\":\"System.Security.Cryptography.Xml.Reference\",\"ListItemText\":\"Reference\",\"ResultType\":11,\"ToolTip\":\"System.Security.Cryptography.Xml.Reference\"},{\"CompletionText\":\"System.Runtime.CompilerServices.ReferenceAssemblyAttribute\",\"ListItemText\":\"ReferenceAssemblyAttribute\",\"ResultType\":11,\"ToolTip\":\"System.Runtime.CompilerServices.ReferenceAssemblyAttribute\"},{\"CompletionText\":\"System.ComponentModel.ReferenceConverter\",\"ListItemText\":\"ReferenceConverter\",\"ResultType\":11,\"ToolTip\":\"System.ComponentModel.ReferenceConverter\"},{\"CompletionText\":\"System.ServiceModel.Syndication.ReferencedCategoriesDocument\",\"ListItemText\":\"ReferencedCategoriesDocument\",\"ResultType\":11,\"ToolTip\":\"System.ServiceModel.Syndication.ReferencedCategoriesDocument\"},{\"CompletionText\":\"Microsoft.CodeAnalysis.CSharp.Syntax.ReferenceDirectiveTriviaSyntax\",\"ListItemText\":\"ReferenceDirectiveTriviaSyntax\",\"ResultType\":11,\"ToolTip\":\"Microsoft.CodeAnalysis.CSharp.Syntax.ReferenceDirectiveTriviaSyntax\"},{\"CompletionText\":\"System.Collections.Generic.ReferenceEqualityComparer\",\"ListItemText\":\"ReferenceEqualityComparer\",\"ResultType\":11,\"ToolTip\":\"System.Collections.Generic.ReferenceEqualityComparer\"},{\"CompletionText\":\"System.Text.Json.Serialization.ReferenceHandler\",\"ListItemText\":\"ReferenceHandler\",\"ResultType\":11,\"ToolTip\":\"System.Text.Json.Serialization.ReferenceHandler\"},{\"CompletionText\":\"System.Security.Cryptography.Xml.ReferenceList\",\"ListItemText\":\"ReferenceList\",\"ResultType\":11,\"ToolTip\":\"System.Security.Cryptography.Xml.ReferenceList\"},{\"CompletionText\":\"Newtonsoft.Json.ReferenceLoopHandling\",\"ListItemText\":\"ReferenceLoopHandling\",\"ResultType\":11,\"ToolTip\":\"Newtonsoft.Json.ReferenceLoopHandling\"},{\"CompletionText\":\"System.Text.Json.Serialization.ReferenceResolver\",\"ListItemText\":\"ReferenceResolver\",\"ResultType\":11,\"ToolTip\":\"System.Text.Json.Serialization.ReferenceResolver\"},{\"CompletionText\":\"System.DirectoryServices.Protocols.ReferralCallback\",\"ListItemText\":\"ReferralCallback\",\"ResultType\":11,\"ToolTip\":\"System.DirectoryServices.Protocols.ReferralCallback\"},{\"CompletionText\":\"System.DirectoryServices.ReferralChasingOption\",\"ListItemText\":\"ReferralChasingOption\",\"ResultType\":11,\"ToolTip\":\"System.DirectoryServices.ReferralChasingOption\"},{\"CompletionText\":\"System.DirectoryServices.Protocols.ReferralChasingOptions\",\"ListItemText\":\"ReferralChasingOptions\",\"ResultType\":11,\"ToolTip\":\"System.DirectoryServices.Protocols.ReferralChasingOptions\"},{\"CompletionText\":\"Markdig.Extensions.ReferralLinks.ReferralLinksExtension\",\"ListItemText\":\"ReferralLinksExtension\",\"ResultType\":11,\"ToolTip\":\"Markdig.Extensions.ReferralLinks.ReferralLinksExtension\"},{\"CompletionText\":\"Microsoft.CodeAnalysis.CSharp.Syntax.RefExpressionSyntax\",\"ListItemText\":\"RefExpressionSyntax\",\"ResultType\":11,\"ToolTip\":\"Microsoft.CodeAnalysis.CSharp.Syntax.RefExpressionSyntax\"},{\"CompletionText\":\"Json.Schema.RefKeyword\",\"ListItemText\":\"RefKeyword\",\"ResultType\":11,\"ToolTip\":\"Json.Schema.RefKeyword\"},{\"CompletionText\":\"Microsoft.CodeAnalysis.RefKind\",\"ListItemText\":\"RefKind\",\"ResultType\":11,\"ToolTip\":\"Microsoft.CodeAnalysis.RefKind\"},{\"CompletionText\":\"Newtonsoft.Json.Serialization.ReflectionAttributeProvider\",\"ListItemText\":\"ReflectionAttributeProvider\",\"ResultType\":11,\"ToolTip\":\"Newtonsoft.Json.Serialization.ReflectionAttributeProvider\"},{\"CompletionText\":\"System.Reflection.ReflectionContext\",\"ListItemText\":\"ReflectionContext\",\"ResultType\":11,\"ToolTip\":\"System.Reflection.ReflectionContext\"},{\"CompletionText\":\"System.ComponentModel.Composition.ReflectionModel.ReflectionModelServices\",\"ListItemText\":\"ReflectionModelServices\",\"ResultType\":11,\"ToolTip\":\"System.ComponentModel.Composition.ReflectionModel.ReflectionModelServices\"},{\"CompletionText\":\"System.Security.Permissions.ReflectionPermission\",\"ListItemText\":\"ReflectionPermission\",\"ResultType\":11,\"ToolTip\":\"System.Security.Permissions.ReflectionPermission\"},{\"CompletionText\":\"System.Security.Permissions.ReflectionPermissionAttribute\",\"ListItemText\":\"ReflectionPermissionAttribute\",\"ResultType\":11,\"ToolTip\":\"System.Security.Permissions.ReflectionPermissionAttribute\"},{\"CompletionText\":\"System.Security.Permissions.ReflectionPermissionFlag\",\"ListItemText\":\"ReflectionPermissionFlag\",\"ResultType\":11,\"ToolTip\":\"System.Security.Permissions.ReflectionPermissionFlag\"},{\"CompletionText\":\"System.Reflection.ReflectionTypeLoadException\",\"ListItemText\":\"ReflectionTypeLoadException\",\"ResultType\":11,\"ToolTip\":\"System.Reflection.ReflectionTypeLoadException\"},{\"CompletionText\":\"System.Management.Automation.Language.ReflectionTypeName\",\"ListItemText\":\"ReflectionTypeName\",\"ResultType\":11,\"ToolTip\":\"Class System.Management.Automation.Language.ReflectionTypeName\"},{\"CompletionText\":\"Newtonsoft.Json.Serialization.ReflectionValueProvider\",\"ListItemText\":\"ReflectionValueProvider\",\"ResultType\":11,\"ToolTip\":\"Newtonsoft.Json.Serialization.ReflectionValueProvider\"},{\"CompletionText\":\"System.ComponentModel.RefreshEventArgs\",\"ListItemText\":\"RefreshEventArgs\",\"ResultType\":11,\"ToolTip\":\"System.ComponentModel.RefreshEventArgs\"},{\"CompletionText\":\"System.ComponentModel.RefreshEventHandler\",\"ListItemText\":\"RefreshEventHandler\",\"ResultType\":11,\"ToolTip\":\"System.ComponentModel.RefreshEventHandler\"},{\"CompletionText\":\"System.ComponentModel.RefreshProperties\",\"ListItemText\":\"RefreshProperties\",\"ResultType\":11,\"ToolTip\":\"System.ComponentModel.RefreshProperties\"},{\"CompletionText\":\"System.ComponentModel.RefreshPropertiesAttribute\",\"ListItemText\":\"RefreshPropertiesAttribute\",\"ResultType\":11,\"ToolTip\":\"System.ComponentModel.RefreshPropertiesAttribute\"},{\"CompletionText\":\"System.Runtime.CompilerServices.RefSafetyRulesAttribute\",\"ListItemText\":\"RefSafetyRulesAttribute\",\"ResultType\":11,\"ToolTip\":\"System.Runtime.CompilerServices.RefSafetyRulesAttribute\"},{\"CompletionText\":\"Microsoft.CodeAnalysis.CSharp.Syntax.RefTypeExpressionSyntax\",\"ListItemText\":\"RefTypeExpressionSyntax\",\"ResultType\":11,\"ToolTip\":\"Microsoft.CodeAnalysis.CSharp.Syntax.RefTypeExpressionSyntax\"},{\"CompletionText\":\"Microsoft.CodeAnalysis.CSharp.Syntax.RefTypeSyntax\",\"ListItemText\":\"RefTypeSyntax\",\"ResultType\":11,\"ToolTip\":\"Microsoft.CodeAnalysis.CSharp.Syntax.RefTypeSyntax\"},{\"CompletionText\":\"Microsoft.CodeAnalysis.CSharp.Syntax.RefValueExpressionSyntax\",\"ListItemText\":\"RefValueExpressionSyntax\",\"ResultType\":11,\"ToolTip\":\"Microsoft.CodeAnalysis.CSharp.Syntax.RefValueExpressionSyntax\"},{\"CompletionText\":\"regex\",\"ListItemText\":\"Regex\",\"ResultType\":11,\"ToolTip\":\"Class System.Text.RegularExpressions.Regex\"},{\"CompletionText\":\"System.Text.RegularExpressions.RegexCompilationInfo\",\"ListItemText\":\"RegexCompilationInfo\",\"ResultType\":11,\"ToolTip\":\"System.Text.RegularExpressions.RegexCompilationInfo\"},{\"CompletionText\":\"Newtonsoft.Json.Converters.RegexConverter\",\"ListItemText\":\"RegexConverter\",\"ResultType\":11,\"ToolTip\":\"Newtonsoft.Json.Converters.RegexConverter\"},{\"CompletionText\":\"Json.Schema.RegexFormat\",\"ListItemText\":\"RegexFormat\",\"ResultType\":11,\"ToolTip\":\"Json.Schema.RegexFormat\"},{\"CompletionText\":\"System.Text.RegularExpressions.RegexMatchTimeoutException\",\"ListItemText\":\"RegexMatchTimeoutException\",\"ResultType\":11,\"ToolTip\":\"System.Text.RegularExpressions.RegexMatchTimeoutException\"},{\"CompletionText\":\"System.Text.RegularExpressions.RegexOptions\",\"ListItemText\":\"RegexOptions\",\"ResultType\":11,\"ToolTip\":\"System.Text.RegularExpressions.RegexOptions\"},{\"CompletionText\":\"System.Text.RegularExpressions.RegexParseError\",\"ListItemText\":\"RegexParseError\",\"ResultType\":11,\"ToolTip\":\"System.Text.RegularExpressions.RegexParseError\"},{\"CompletionText\":\"System.Text.RegularExpressions.RegexParseException\",\"ListItemText\":\"RegexParseException\",\"ResultType\":11,\"ToolTip\":\"System.Text.RegularExpressions.RegexParseException\"},{\"CompletionText\":\"JetBrains.Annotations.RegexPatternAttribute\",\"ListItemText\":\"RegexPatternAttribute\",\"ResultType\":11,\"ToolTip\":\"JetBrains.Annotations.RegexPatternAttribute\"},{\"CompletionText\":\"System.Text.RegularExpressions.RegexRunner\",\"ListItemText\":\"RegexRunner\",\"ResultType\":11,\"ToolTip\":\"System.Text.RegularExpressions.RegexRunner\"},{\"CompletionText\":\"System.Text.RegularExpressions.RegexRunnerFactory\",\"ListItemText\":\"RegexRunnerFactory\",\"ResultType\":11,\"ToolTip\":\"System.Text.RegularExpressions.RegexRunnerFactory\"},{\"CompletionText\":\"System.Configuration.RegexStringValidator\",\"ListItemText\":\"RegexStringValidator\",\"ResultType\":11,\"ToolTip\":\"System.Configuration.RegexStringValidator\"},{\"CompletionText\":\"System.Configuration.RegexStringValidatorAttribute\",\"ListItemText\":\"RegexStringValidatorAttribute\",\"ResultType\":11,\"ToolTip\":\"System.Configuration.RegexStringValidatorAttribute\"},{\"CompletionText\":\"System.Drawing.Region\",\"ListItemText\":\"Region\",\"ResultType\":11,\"ToolTip\":\"System.Drawing.Region\"},{\"CompletionText\":\"System.Drawing.Drawing2D.RegionData\",\"ListItemText\":\"RegionData\",\"ResultType\":11,\"ToolTip\":\"System.Drawing.Drawing2D.RegionData\"},{\"CompletionText\":\"Microsoft.CodeAnalysis.CSharp.Syntax.RegionDirectiveTriviaSyntax\",\"ListItemText\":\"RegionDirectiveTriviaSyntax\",\"ResultType\":11,\"ToolTip\":\"Microsoft.CodeAnalysis.CSharp.Syntax.RegionDirectiveTriviaSyntax\"},{\"CompletionText\":\"System.Globalization.RegionInfo\",\"ListItemText\":\"RegionInfo\",\"ResultType\":11,\"ToolTip\":\"System.Globalization.RegionInfo\"},{\"CompletionText\":\"System.Management.Automation.RegisterArgumentCompleterCommand\",\"ListItemText\":\"RegisterArgumentCompleterCommand\",\"ResultType\":11,\"ToolTip\":\"Class System.Management.Automation.RegisterArgumentCompleterCommand\"},{\"CompletionText\":\"System.Threading.RegisteredWaitHandle\",\"ListItemText\":\"RegisteredWaitHandle\",\"ResultType\":11,\"ToolTip\":\"System.Threading.RegisteredWaitHandle\"},{\"CompletionText\":\"Microsoft.PowerShell.Commands.RegisterEngineEventCommand\",\"ListItemText\":\"RegisterEngineEventCommand\",\"ResultType\":11,\"ToolTip\":\"Class Microsoft.PowerShell.Commands.RegisterEngineEventCommand\"},{\"CompletionText\":\"Microsoft.PowerShell.Commands.RegisterObjectEventCommand\",\"ListItemText\":\"RegisterObjectEventCommand\",\"ResultType\":11,\"ToolTip\":\"Class Microsoft.PowerShell.Commands.RegisterObjectEventCommand\"},{\"CompletionText\":\"Microsoft.PowerShell.Commands.RegisterPSSessionConfigurationCommand\",\"ListItemText\":\"RegisterPSSessionConfigurationCommand\",\"ResultType\":11,\"ToolTip\":\"Class Microsoft.PowerShell.Commands.RegisterPSSessionConfigurationCommand\"},{\"CompletionText\":\"System.ComponentModel.Composition.Registration.RegistrationBuilder\",\"ListItemText\":\"RegistrationBuilder\",\"ResultType\":11,\"ToolTip\":\"System.ComponentModel.Composition.Registration.RegistrationBuilder\"},{\"CompletionText\":\"Microsoft.Win32.Registry\",\"ListItemText\":\"Registry\",\"ResultType\":11,\"ToolTip\":\"Microsoft.Win32.Registry\"},{\"CompletionText\":\"System.Security.AccessControl.RegistryAccessRule\",\"ListItemText\":\"RegistryAccessRule\",\"ResultType\":11,\"ToolTip\":\"System.Security.AccessControl.RegistryAccessRule\"},{\"CompletionText\":\"Microsoft.Win32.RegistryAclExtensions\",\"ListItemText\":\"RegistryAclExtensions\",\"ResultType\":11,\"ToolTip\":\"Microsoft.Win32.RegistryAclExtensions\"},{\"CompletionText\":\"System.Security.AccessControl.RegistryAuditRule\",\"ListItemText\":\"RegistryAuditRule\",\"ResultType\":11,\"ToolTip\":\"System.Security.AccessControl.RegistryAuditRule\"},{\"CompletionText\":\"Microsoft.Win32.RegistryHive\",\"ListItemText\":\"RegistryHive\",\"ResultType\":11,\"ToolTip\":\"Microsoft.Win32.RegistryHive\"},{\"CompletionText\":\"Microsoft.Win32.RegistryKey\",\"ListItemText\":\"RegistryKey\",\"ResultType\":11,\"ToolTip\":\"Microsoft.Win32.RegistryKey\"},{\"CompletionText\":\"Microsoft.Win32.RegistryKeyPermissionCheck\",\"ListItemText\":\"RegistryKeyPermissionCheck\",\"ResultType\":11,\"ToolTip\":\"Microsoft.Win32.RegistryKeyPermissionCheck\"},{\"CompletionText\":\"Microsoft.Win32.RegistryOptions\",\"ListItemText\":\"RegistryOptions\",\"ResultType\":11,\"ToolTip\":\"Microsoft.Win32.RegistryOptions\"},{\"CompletionText\":\"System.Security.Permissions.RegistryPermission\",\"ListItemText\":\"RegistryPermission\",\"ResultType\":11,\"ToolTip\":\"System.Security.Permissions.RegistryPermission\"},{\"CompletionText\":\"System.Security.Permissions.RegistryPermissionAccess\",\"ListItemText\":\"RegistryPermissionAccess\",\"ResultType\":11,\"ToolTip\":\"System.Security.Permissions.RegistryPermissionAccess\"},{\"CompletionText\":\"System.Security.Permissions.RegistryPermissionAttribute\",\"ListItemText\":\"RegistryPermissionAttribute\",\"ResultType\":11,\"ToolTip\":\"System.Security.Permissions.RegistryPermissionAttribute\"},{\"CompletionText\":\"Microsoft.PowerShell.Commands.RegistryProvider\",\"ListItemText\":\"RegistryProvider\",\"ResultType\":11,\"ToolTip\":\"Class Microsoft.PowerShell.Commands.RegistryProvider\"},{\"CompletionText\":\"Microsoft.PowerShell.Commands.RegistryProviderSetItemDynamicParameter\",\"ListItemText\":\"RegistryProviderSetItemDynamicParameter\",\"ResultType\":11,\"ToolTip\":\"Class Microsoft.PowerShell.Commands.RegistryProviderSetItemDynamicParameter\"},{\"CompletionText\":\"System.Security.AccessControl.RegistryRights\",\"ListItemText\":\"RegistryRights\",\"ResultType\":11,\"ToolTip\":\"System.Security.AccessControl.RegistryRights\"},{\"CompletionText\":\"System.Security.AccessControl.RegistrySecurity\",\"ListItemText\":\"RegistrySecurity\",\"ResultType\":11,\"ToolTip\":\"System.Security.AccessControl.RegistrySecurity\"},{\"CompletionText\":\"Microsoft.Win32.RegistryValueKind\",\"ListItemText\":\"RegistryValueKind\",\"ResultType\":11,\"ToolTip\":\"Microsoft.Win32.RegistryValueKind\"},{\"CompletionText\":\"Microsoft.Win32.RegistryValueOptions\",\"ListItemText\":\"RegistryValueOptions\",\"ResultType\":11,\"ToolTip\":\"Microsoft.Win32.RegistryValueOptions\"},{\"CompletionText\":\"Microsoft.Win32.RegistryView\",\"ListItemText\":\"RegistryView\",\"ResultType\":11,\"ToolTip\":\"Microsoft.Win32.RegistryView\"},{\"CompletionText\":\"System.ComponentModel.DataAnnotations.RegularExpressionAttribute\",\"ListItemText\":\"RegularExpressionAttribute\",\"ResultType\":11,\"ToolTip\":\"System.ComponentModel.DataAnnotations.RegularExpressionAttribute\"},{\"CompletionText\":\"System.Management.RelatedObjectQuery\",\"ListItemText\":\"RelatedObjectQuery\",\"ResultType\":11,\"ToolTip\":\"System.Management.RelatedObjectQuery\"},{\"CompletionText\":\"Microsoft.CodeAnalysis.CSharp.Syntax.RelationalPatternSyntax\",\"ListItemText\":\"RelationalPatternSyntax\",\"ResultType\":11,\"ToolTip\":\"Microsoft.CodeAnalysis.CSharp.Syntax.RelationalPatternSyntax\"},{\"CompletionText\":\"System.Management.RelationshipQuery\",\"ListItemText\":\"RelationshipQuery\",\"ResultType\":11,\"ToolTip\":\"System.Management.RelationshipQuery\"},{\"CompletionText\":\"Json.Pointer.RelativeJsonPointer\",\"ListItemText\":\"RelativeJsonPointer\",\"ResultType\":11,\"ToolTip\":\"Json.Pointer.RelativeJsonPointer\"},{\"CompletionText\":\"Microsoft.CodeAnalysis.PooledObjects.PooledDelegates+Releaser\",\"ListItemText\":\"Releaser\",\"ResultType\":11,\"ToolTip\":\"Microsoft.CodeAnalysis.PooledObjects.PooledDelegates+Releaser\"},{\"CompletionText\":\"System.Runtime.ConstrainedExecution.ReliabilityContractAttribute\",\"ListItemText\":\"ReliabilityContractAttribute\",\"ResultType\":11,\"ToolTip\":\"System.Runtime.ConstrainedExecution.ReliabilityContractAttribute\"},{\"CompletionText\":\"System.ServiceModel.ReliableMessagingVersion\",\"ListItemText\":\"ReliableMessagingVersion\",\"ResultType\":11,\"ToolTip\":\"System.ServiceModel.ReliableMessagingVersion\"},{\"CompletionText\":\"System.ServiceModel.ReliableSession\",\"ListItemText\":\"ReliableSession\",\"ResultType\":11,\"ToolTip\":\"System.ServiceModel.ReliableSession\"},{\"CompletionText\":\"System.ServiceModel.Channels.ReliableSessionBindingElement\",\"ListItemText\":\"ReliableSessionBindingElement\",\"ResultType\":11,\"ToolTip\":\"System.ServiceModel.Channels.ReliableSessionBindingElement\"},{\"CompletionText\":\"System.Net.Security.RemoteCertificateValidationCallback\",\"ListItemText\":\"RemoteCertificateValidationCallback\",\"ResultType\":11,\"ToolTip\":\"System.Net.Security.RemoteCertificateValidationCallback\"},{\"CompletionText\":\"System.Management.Automation.RemoteCommandInfo\",\"ListItemText\":\"RemoteCommandInfo\",\"ResultType\":11,\"ToolTip\":\"Class System.Management.Automation.RemoteCommandInfo\"},{\"CompletionText\":\"System.Management.Automation.RemoteException\",\"ListItemText\":\"RemoteException\",\"ResultType\":11,\"ToolTip\":\"Class System.Management.Automation.RemoteException\"},{\"CompletionText\":\"System.Management.Automation.Remoting.RemoteSessionNamedPipeServer\",\"ListItemText\":\"RemoteSessionNamedPipeServer\",\"ResultType\":11,\"ToolTip\":\"Class System.Management.Automation.Remoting.RemoteSessionNamedPipeServer\"},{\"CompletionText\":\"System.Management.Automation.RemoteStreamOptions\",\"ListItemText\":\"RemoteStreamOptions\",\"ResultType\":11,\"ToolTip\":\"Enum System.Management.Automation.RemoteStreamOptions\"},{\"CompletionText\":\"System.Management.Automation.RemotingBehavior\",\"ListItemText\":\"RemotingBehavior\",\"ResultType\":11,\"ToolTip\":\"Enum System.Management.Automation.RemotingBehavior\"},{\"CompletionText\":\"System.Management.Automation.RemotingCapability\",\"ListItemText\":\"RemotingCapability\",\"ResultType\":11,\"ToolTip\":\"Enum System.Management.Automation.RemotingCapability\"},{\"CompletionText\":\"System.Management.Automation.Runspaces.RemotingDebugRecord\",\"ListItemText\":\"RemotingDebugRecord\",\"ResultType\":11,\"ToolTip\":\"Class System.Management.Automation.Runspaces.RemotingDebugRecord\"},{\"CompletionText\":\"System.Management.Automation.Runspaces.RemotingErrorRecord\",\"ListItemText\":\"RemotingErrorRecord\",\"ResultType\":11,\"ToolTip\":\"Class System.Management.Automation.Runspaces.RemotingErrorRecord\"},{\"CompletionText\":\"Microsoft.PowerShell.Commands.Internal.RemotingErrorResources\",\"ListItemText\":\"RemotingErrorResources\",\"ResultType\":11,\"ToolTip\":\"Class Microsoft.PowerShell.Commands.Internal.RemotingErrorResources\"},{\"CompletionText\":\"System.Management.Automation.Runspaces.RemotingInformationRecord\",\"ListItemText\":\"RemotingInformationRecord\",\"ResultType\":11,\"ToolTip\":\"Class System.Management.Automation.Runspaces.RemotingInformationRecord\"},{\"CompletionText\":\"System.Management.Automation.Runspaces.RemotingProgressRecord\",\"ListItemText\":\"RemotingProgressRecord\",\"ResultType\":11,\"ToolTip\":\"Class System.Management.Automation.Runspaces.RemotingProgressRecord\"},{\"CompletionText\":\"System.Management.Automation.Runspaces.RemotingVerboseRecord\",\"ListItemText\":\"RemotingVerboseRecord\",\"ResultType\":11,\"ToolTip\":\"Class System.Management.Automation.Runspaces.RemotingVerboseRecord\"},{\"CompletionText\":\"System.Management.Automation.Runspaces.RemotingWarningRecord\",\"ListItemText\":\"RemotingWarningRecord\",\"ResultType\":11,\"ToolTip\":\"Class System.Management.Automation.Runspaces.RemotingWarningRecord\"},{\"CompletionText\":\"Microsoft.PowerShell.Commands.RemoveAliasCommand\",\"ListItemText\":\"RemoveAliasCommand\",\"ResultType\":11,\"ToolTip\":\"Class Microsoft.PowerShell.Commands.RemoveAliasCommand\"},{\"CompletionText\":\"Microsoft.PowerShell.Commands.RemoveEventCommand\",\"ListItemText\":\"RemoveEventCommand\",\"ResultType\":11,\"ToolTip\":\"Class Microsoft.PowerShell.Commands.RemoveEventCommand\"},{\"CompletionText\":\"Microsoft.PowerShell.Commands.RemoveItemCommand\",\"ListItemText\":\"RemoveItemCommand\",\"ResultType\":11,\"ToolTip\":\"Class Microsoft.PowerShell.Commands.RemoveItemCommand\"},{\"CompletionText\":\"Microsoft.PowerShell.Commands.RemoveItemPropertyCommand\",\"ListItemText\":\"RemoveItemPropertyCommand\",\"ResultType\":11,\"ToolTip\":\"Class Microsoft.PowerShell.Commands.RemoveItemPropertyCommand\"},{\"CompletionText\":\"Microsoft.PowerShell.Commands.RemoveJobCommand\",\"ListItemText\":\"RemoveJobCommand\",\"ResultType\":11,\"ToolTip\":\"Class Microsoft.PowerShell.Commands.RemoveJobCommand\"},{\"CompletionText\":\"Microsoft.PowerShell.RemoveKeyHandlerCommand\",\"ListItemText\":\"RemoveKeyHandlerCommand\",\"ResultType\":11,\"ToolTip\":\"Class Microsoft.PowerShell.RemoveKeyHandlerCommand\"},{\"CompletionText\":\"Microsoft.PowerShell.Commands.RemoveModuleCommand\",\"ListItemText\":\"RemoveModuleCommand\",\"ResultType\":11,\"ToolTip\":\"Class Microsoft.PowerShell.Commands.RemoveModuleCommand\"},{\"CompletionText\":\"Microsoft.PowerShell.Commands.RemovePSBreakpointCommand\",\"ListItemText\":\"RemovePSBreakpointCommand\",\"ResultType\":11,\"ToolTip\":\"Class Microsoft.PowerShell.Commands.RemovePSBreakpointCommand\"},{\"CompletionText\":\"Microsoft.PowerShell.Commands.RemovePSDriveCommand\",\"ListItemText\":\"RemovePSDriveCommand\",\"ResultType\":11,\"ToolTip\":\"Class Microsoft.PowerShell.Commands.RemovePSDriveCommand\"},{\"CompletionText\":\"Microsoft.PowerShell.Commands.RemovePSSessionCommand\",\"ListItemText\":\"RemovePSSessionCommand\",\"ResultType\":11,\"ToolTip\":\"Class Microsoft.PowerShell.Commands.RemovePSSessionCommand\"},{\"CompletionText\":\"Microsoft.PowerShell.Commands.RemoveServiceCommand\",\"ListItemText\":\"RemoveServiceCommand\",\"ResultType\":11,\"ToolTip\":\"Class Microsoft.PowerShell.Commands.RemoveServiceCommand\"},{\"CompletionText\":\"Microsoft.PowerShell.Commands.RemoveTypeDataCommand\",\"ListItemText\":\"RemoveTypeDataCommand\",\"ResultType\":11,\"ToolTip\":\"Class Microsoft.PowerShell.Commands.RemoveTypeDataCommand\"},{\"CompletionText\":\"Microsoft.PowerShell.Commands.RemoveVariableCommand\",\"ListItemText\":\"RemoveVariableCommand\",\"ResultType\":11,\"ToolTip\":\"Class Microsoft.PowerShell.Commands.RemoveVariableCommand\"},{\"CompletionText\":\"Microsoft.PowerShell.Commands.RenameComputerChangeInfo\",\"ListItemText\":\"RenameComputerChangeInfo\",\"ResultType\":11,\"ToolTip\":\"Class Microsoft.PowerShell.Commands.RenameComputerChangeInfo\"},{\"CompletionText\":\"Microsoft.PowerShell.Commands.RenameComputerCommand\",\"ListItemText\":\"RenameComputerCommand\",\"ResultType\":11,\"ToolTip\":\"Class Microsoft.PowerShell.Commands.RenameComputerCommand\"},{\"CompletionText\":\"System.IO.RenamedEventArgs\",\"ListItemText\":\"RenamedEventArgs\",\"ResultType\":11,\"ToolTip\":\"System.IO.RenamedEventArgs\"},{\"CompletionText\":\"System.IO.RenamedEventHandler\",\"ListItemText\":\"RenamedEventHandler\",\"ResultType\":11,\"ToolTip\":\"System.IO.RenamedEventHandler\"},{\"CompletionText\":\"Microsoft.PowerShell.Commands.RenameItemCommand\",\"ListItemText\":\"RenameItemCommand\",\"ResultType\":11,\"ToolTip\":\"Class Microsoft.PowerShell.Commands.RenameItemCommand\"},{\"CompletionText\":\"Microsoft.PowerShell.Commands.RenameItemPropertyCommand\",\"ListItemText\":\"RenameItemPropertyCommand\",\"ResultType\":11,\"ToolTip\":\"Class Microsoft.PowerShell.Commands.RenameItemPropertyCommand\"},{\"CompletionText\":\"Markdig.Renderers.RendererBase\",\"ListItemText\":\"RendererBase\",\"ResultType\":11,\"ToolTip\":\"Markdig.Renderers.RendererBase\"},{\"CompletionText\":\"System.Speech.Recognition.ReplacementText\",\"ListItemText\":\"ReplacementText\",\"ResultType\":11,\"ToolTip\":\"System.Speech.Recognition.ReplacementText\"},{\"CompletionText\":\"System.DirectoryServices.ActiveDirectory.ReplicationConnection\",\"ListItemText\":\"ReplicationConnection\",\"ResultType\":11,\"ToolTip\":\"System.DirectoryServices.ActiveDirectory.ReplicationConnection\"},{\"CompletionText\":\"System.DirectoryServices.ActiveDirectory.ReplicationConnectionCollection\",\"ListItemText\":\"ReplicationConnectionCollection\",\"ResultType\":11,\"ToolTip\":\"System.DirectoryServices.ActiveDirectory.ReplicationConnectionCollection\"},{\"CompletionText\":\"System.DirectoryServices.ActiveDirectory.ReplicationCursor\",\"ListItemText\":\"ReplicationCursor\",\"ResultType\":11,\"ToolTip\":\"System.DirectoryServices.ActiveDirectory.ReplicationCursor\"},{\"CompletionText\":\"System.DirectoryServices.ActiveDirectory.ReplicationCursorCollection\",\"ListItemText\":\"ReplicationCursorCollection\",\"ResultType\":11,\"ToolTip\":\"System.DirectoryServices.ActiveDirectory.ReplicationCursorCollection\"},{\"CompletionText\":\"System.DirectoryServices.ActiveDirectory.ReplicationFailure\",\"ListItemText\":\"ReplicationFailure\",\"ResultType\":11,\"ToolTip\":\"System.DirectoryServices.ActiveDirectory.ReplicationFailure\"},{\"CompletionText\":\"System.DirectoryServices.ActiveDirectory.ReplicationFailureCollection\",\"ListItemText\":\"ReplicationFailureCollection\",\"ResultType\":11,\"ToolTip\":\"System.DirectoryServices.ActiveDirectory.ReplicationFailureCollection\"},{\"CompletionText\":\"System.DirectoryServices.ActiveDirectory.ReplicationNeighbor\",\"ListItemText\":\"ReplicationNeighbor\",\"ResultType\":11,\"ToolTip\":\"System.DirectoryServices.ActiveDirectory.ReplicationNeighbor\"},{\"CompletionText\":\"System.DirectoryServices.ActiveDirectory.ReplicationNeighborCollection\",\"ListItemText\":\"ReplicationNeighborCollection\",\"ResultType\":11,\"ToolTip\":\"System.DirectoryServices.ActiveDirectory.ReplicationNeighborCollection\"},{\"CompletionText\":\"System.DirectoryServices.ActiveDirectory.ReplicationNeighbor+ReplicationNeighborOptions\",\"ListItemText\":\"ReplicationNeighborOptions\",\"ResultType\":11,\"ToolTip\":\"System.DirectoryServices.ActiveDirectory.ReplicationNeighbor+ReplicationNeighborOptions\"},{\"CompletionText\":\"System.DirectoryServices.ActiveDirectory.ReplicationOperation\",\"ListItemText\":\"ReplicationOperation\",\"ResultType\":11,\"ToolTip\":\"System.DirectoryServices.ActiveDirectory.ReplicationOperation\"},{\"CompletionText\":\"System.DirectoryServices.ActiveDirectory.ReplicationOperationCollection\",\"ListItemText\":\"ReplicationOperationCollection\",\"ResultType\":11,\"ToolTip\":\"System.DirectoryServices.ActiveDirectory.ReplicationOperationCollection\"},{\"CompletionText\":\"System.DirectoryServices.ActiveDirectory.ReplicationOperationInformation\",\"ListItemText\":\"ReplicationOperationInformation\",\"ResultType\":11,\"ToolTip\":\"System.DirectoryServices.ActiveDirectory.ReplicationOperationInformation\"},{\"CompletionText\":\"System.DirectoryServices.ActiveDirectory.ReplicationOperationType\",\"ListItemText\":\"ReplicationOperationType\",\"ResultType\":11,\"ToolTip\":\"System.DirectoryServices.ActiveDirectory.ReplicationOperationType\"},{\"CompletionText\":\"System.DirectoryServices.ActiveDirectory.ReplicationSecurityLevel\",\"ListItemText\":\"ReplicationSecurityLevel\",\"ResultType\":11,\"ToolTip\":\"System.DirectoryServices.ActiveDirectory.ReplicationSecurityLevel\"},{\"CompletionText\":\"System.DirectoryServices.ActiveDirectory.ReplicationSpan\",\"ListItemText\":\"ReplicationSpan\",\"ResultType\":11,\"ToolTip\":\"System.DirectoryServices.ActiveDirectory.ReplicationSpan\"},{\"CompletionText\":\"Microsoft.CodeAnalysis.ReportDiagnostic\",\"ListItemText\":\"ReportDiagnostic\",\"ResultType\":11,\"ToolTip\":\"Microsoft.CodeAnalysis.ReportDiagnostic\"},{\"CompletionText\":\"System.Management.Automation.Repository\",\"ListItemText\":\"Repository<>\",\"ResultType\":11,\"ToolTip\":\"Class System.Management.Automation.Repository[T]\"},{\"CompletionText\":\"Microsoft.ApplicationInsights.Extensibility.Implementation.Metrics.MetricTerms+Autocollection+Request\",\"ListItemText\":\"Request\",\"ResultType\":11,\"ToolTip\":\"Microsoft.ApplicationInsights.Extensibility.Implementation.Metrics.MetricTerms+Autocollection+Request\"},{\"CompletionText\":\"System.Net.Cache.RequestCacheLevel\",\"ListItemText\":\"RequestCacheLevel\",\"ResultType\":11,\"ToolTip\":\"System.Net.Cache.RequestCacheLevel\"},{\"CompletionText\":\"System.Net.Cache.RequestCachePolicy\",\"ListItemText\":\"RequestCachePolicy\",\"ResultType\":11,\"ToolTip\":\"System.Net.Cache.RequestCachePolicy\"},{\"CompletionText\":\"System.ServiceModel.Channels.RequestContext\",\"ListItemText\":\"RequestContext\",\"ResultType\":11,\"ToolTip\":\"System.ServiceModel.Channels.RequestContext\"},{\"CompletionText\":\"Microsoft.ApplicationInsights.Extensibility.Implementation.Metrics.MetricTerms+Autocollection+Metric+RequestDuration\",\"ListItemText\":\"RequestDuration\",\"ResultType\":11,\"ToolTip\":\"Microsoft.ApplicationInsights.Extensibility.Implementation.Metrics.MetricTerms+Autocollection+Metric+RequestDuration\"},{\"CompletionText\":\"Microsoft.ApplicationInsights.DataContracts.RequestTelemetry\",\"ListItemText\":\"RequestTelemetry\",\"ResultType\":11,\"ToolTip\":\"Microsoft.ApplicationInsights.DataContracts.RequestTelemetry\"},{\"CompletionText\":\"Newtonsoft.Json.Required\",\"ListItemText\":\"Required\",\"ResultType\":11,\"ToolTip\":\"Newtonsoft.Json.Required\"},{\"CompletionText\":\"System.ComponentModel.DataAnnotations.RequiredAttribute\",\"ListItemText\":\"RequiredAttribute\",\"ResultType\":11,\"ToolTip\":\"System.ComponentModel.DataAnnotations.RequiredAttribute\"},{\"CompletionText\":\"System.Runtime.CompilerServices.RequiredAttributeAttribute\",\"ListItemText\":\"RequiredAttributeAttribute\",\"ResultType\":11,\"ToolTip\":\"System.Runtime.CompilerServices.RequiredAttributeAttribute\"},{\"CompletionText\":\"Json.Schema.RequiredKeyword\",\"ListItemText\":\"RequiredKeyword\",\"ResultType\":11,\"ToolTip\":\"Json.Schema.RequiredKeyword\"},{\"CompletionText\":\"System.Runtime.CompilerServices.RequiredMemberAttribute\",\"ListItemText\":\"RequiredMemberAttribute\",\"ResultType\":11,\"ToolTip\":\"System.Runtime.CompilerServices.RequiredMemberAttribute\"},{\"CompletionText\":\"System.Diagnostics.CodeAnalysis.RequiresAssemblyFilesAttribute\",\"ListItemText\":\"RequiresAssemblyFilesAttribute\",\"ResultType\":11,\"ToolTip\":\"System.Diagnostics.CodeAnalysis.RequiresAssemblyFilesAttribute\"},{\"CompletionText\":\"System.Diagnostics.CodeAnalysis.RequiresDynamicCodeAttribute\",\"ListItemText\":\"RequiresDynamicCodeAttribute\",\"ResultType\":11,\"ToolTip\":\"System.Diagnostics.CodeAnalysis.RequiresDynamicCodeAttribute\"},{\"CompletionText\":\"System.Runtime.CompilerServices.RequiresLocationAttribute\",\"ListItemText\":\"RequiresLocationAttribute\",\"ResultType\":11,\"ToolTip\":\"System.Runtime.CompilerServices.RequiresLocationAttribute\"},{\"CompletionText\":\"System.Runtime.Versioning.RequiresPreviewFeaturesAttribute\",\"ListItemText\":\"RequiresPreviewFeaturesAttribute\",\"ResultType\":11,\"ToolTip\":\"System.Runtime.Versioning.RequiresPreviewFeaturesAttribute\"},{\"CompletionText\":\"JetBrains.Annotations.RequireStaticDelegateAttribute\",\"ListItemText\":\"RequireStaticDelegateAttribute\",\"ResultType\":11,\"ToolTip\":\"JetBrains.Annotations.RequireStaticDelegateAttribute\"},{\"CompletionText\":\"System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute\",\"ListItemText\":\"RequiresUnreferencedCodeAttribute\",\"ResultType\":11,\"ToolTip\":\"System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute\"},{\"CompletionText\":\"System.Reflection.Metadata.ReservedBlob\",\"ListItemText\":\"ReservedBlob<>\",\"ResultType\":11,\"ToolTip\":\"System.Reflection.Metadata.ReservedBlob[T]\"},{\"CompletionText\":\"Microsoft.PowerShell.Commands.ResetCapability\",\"ListItemText\":\"ResetCapability\",\"ResultType\":11,\"ToolTip\":\"Enum Microsoft.PowerShell.Commands.ResetCapability\"},{\"CompletionText\":\"System.Management.Automation.ResolutionPurpose\",\"ListItemText\":\"ResolutionPurpose\",\"ResultType\":11,\"ToolTip\":\"Enum System.Management.Automation.ResolutionPurpose\"},{\"CompletionText\":\"System.ResolveEventArgs\",\"ListItemText\":\"ResolveEventArgs\",\"ResultType\":11,\"ToolTip\":\"System.ResolveEventArgs\"},{\"CompletionText\":\"System.ResolveEventHandler\",\"ListItemText\":\"ResolveEventHandler\",\"ResultType\":11,\"ToolTip\":\"System.ResolveEventHandler\"},{\"CompletionText\":\"System.ComponentModel.Design.Serialization.ResolveNameEventArgs\",\"ListItemText\":\"ResolveNameEventArgs\",\"ResultType\":11,\"ToolTip\":\"System.ComponentModel.Design.Serialization.ResolveNameEventArgs\"},{\"CompletionText\":\"System.ComponentModel.Design.Serialization.ResolveNameEventHandler\",\"ListItemText\":\"ResolveNameEventHandler\",\"ResultType\":11,\"ToolTip\":\"System.ComponentModel.Design.Serialization.ResolveNameEventHandler\"},{\"CompletionText\":\"Microsoft.PowerShell.Commands.ResolvePathCommand\",\"ListItemText\":\"ResolvePathCommand\",\"ResultType\":11,\"ToolTip\":\"Class Microsoft.PowerShell.Commands.ResolvePathCommand\"},{\"CompletionText\":\"System.Reflection.ResourceAttributes\",\"ListItemText\":\"ResourceAttributes\",\"ResultType\":11,\"ToolTip\":\"System.Reflection.ResourceAttributes\"},{\"CompletionText\":\"System.ServiceModel.Syndication.ResourceCollectionInfo\",\"ListItemText\":\"ResourceCollectionInfo\",\"ResultType\":11,\"ToolTip\":\"System.ServiceModel.Syndication.ResourceCollectionInfo\"},{\"CompletionText\":\"System.Runtime.Versioning.ResourceConsumptionAttribute\",\"ListItemText\":\"ResourceConsumptionAttribute\",\"ResultType\":11,\"ToolTip\":\"System.Runtime.Versioning.ResourceConsumptionAttribute\"},{\"CompletionText\":\"Microsoft.CodeAnalysis.ResourceDescription\",\"ListItemText\":\"ResourceDescription\",\"ResultType\":11,\"ToolTip\":\"Microsoft.CodeAnalysis.ResourceDescription\"},{\"CompletionText\":\"System.Runtime.Versioning.ResourceExposureAttribute\",\"ListItemText\":\"ResourceExposureAttribute\",\"ResultType\":11,\"ToolTip\":\"System.Runtime.Versioning.ResourceExposureAttribute\"},{\"CompletionText\":\"System.Reflection.ResourceLocation\",\"ListItemText\":\"ResourceLocation\",\"ResultType\":11,\"ToolTip\":\"System.Reflection.ResourceLocation\"},{\"CompletionText\":\"System.Resources.ResourceManager\",\"ListItemText\":\"ResourceManager\",\"ResultType\":11,\"ToolTip\":\"System.Resources.ResourceManager\"},{\"CompletionText\":\"System.Security.Permissions.ResourcePermissionBase\",\"ListItemText\":\"ResourcePermissionBase\",\"ResultType\":11,\"ToolTip\":\"System.Security.Permissions.ResourcePermissionBase\"},{\"CompletionText\":\"System.Security.Permissions.ResourcePermissionBaseEntry\",\"ListItemText\":\"ResourcePermissionBaseEntry\",\"ResultType\":11,\"ToolTip\":\"System.Security.Permissions.ResourcePermissionBaseEntry\"},{\"CompletionText\":\"System.Resources.ResourceReader\",\"ListItemText\":\"ResourceReader\",\"ResultType\":11,\"ToolTip\":\"System.Resources.ResourceReader\"},{\"CompletionText\":\"System.Runtime.Versioning.ResourceScope\",\"ListItemText\":\"ResourceScope\",\"ResultType\":11,\"ToolTip\":\"System.Runtime.Versioning.ResourceScope\"},{\"CompletionText\":\"System.Reflection.PortableExecutable.ResourceSectionBuilder\",\"ListItemText\":\"ResourceSectionBuilder\",\"ResultType\":11,\"ToolTip\":\"System.Reflection.PortableExecutable.ResourceSectionBuilder\"},{\"CompletionText\":\"System.Resources.ResourceSet\",\"ListItemText\":\"ResourceSet\",\"ResultType\":11,\"ToolTip\":\"System.Resources.ResourceSet\"},{\"CompletionText\":\"System.Security.AccessControl.ResourceType\",\"ListItemText\":\"ResourceType\",\"ResultType\":11,\"ToolTip\":\"System.Security.AccessControl.ResourceType\"},{\"CompletionText\":\"System.Resources.ResourceWriter\",\"ListItemText\":\"ResourceWriter\",\"ResultType\":11,\"ToolTip\":\"System.Resources.ResourceWriter\"},{\"CompletionText\":\"Microsoft.PowerShell.Commands.RestartComputerCommand\",\"ListItemText\":\"RestartComputerCommand\",\"ResultType\":11,\"ToolTip\":\"Class Microsoft.PowerShell.Commands.RestartComputerCommand\"},{\"CompletionText\":\"Microsoft.PowerShell.Commands.RestartComputerTimeoutException\",\"ListItemText\":\"RestartComputerTimeoutException\",\"ResultType\":11,\"ToolTip\":\"Class Microsoft.PowerShell.Commands.RestartComputerTimeoutException\"},{\"CompletionText\":\"Microsoft.PowerShell.Commands.RestartServiceCommand\",\"ListItemText\":\"RestartServiceCommand\",\"ResultType\":11,\"ToolTip\":\"Class Microsoft.PowerShell.Commands.RestartServiceCommand\"},{\"CompletionText\":\"Microsoft.PowerShell.Commands.InvokeRestMethodCommand+RestReturnType\",\"ListItemText\":\"RestReturnType\",\"ResultType\":11,\"ToolTip\":\"Enum Microsoft.PowerShell.Commands.InvokeRestMethodCommand+RestReturnType\"},{\"CompletionText\":\"System.DirectoryServices.Protocols.ResultCode\",\"ListItemText\":\"ResultCode\",\"ResultType\":11,\"ToolTip\":\"System.DirectoryServices.Protocols.ResultCode\"},{\"CompletionText\":\"System.DirectoryServices.ResultPropertyCollection\",\"ListItemText\":\"ResultPropertyCollection\",\"ResultType\":11,\"ToolTip\":\"System.DirectoryServices.ResultPropertyCollection\"},{\"CompletionText\":\"System.DirectoryServices.ResultPropertyValueCollection\",\"ListItemText\":\"ResultPropertyValueCollection\",\"ResultType\":11,\"ToolTip\":\"System.DirectoryServices.ResultPropertyValueCollection\"},{\"CompletionText\":\"Microsoft.PowerShell.Commands.ResumeServiceCommand\",\"ListItemText\":\"ResumeServiceCommand\",\"ResultType\":11,\"ToolTip\":\"Class Microsoft.PowerShell.Commands.ResumeServiceCommand\"},{\"CompletionText\":\"System.Data.Odbc.ODBC32+RETCODE\",\"ListItemText\":\"RETCODE\",\"ResultType\":11,\"ToolTip\":\"System.Data.Odbc.ODBC32+RETCODE\"},{\"CompletionText\":\"System.Net.Http.Headers.RetryConditionHeaderValue\",\"ListItemText\":\"RetryConditionHeaderValue\",\"ResultType\":11,\"ToolTip\":\"System.Net.Http.Headers.RetryConditionHeaderValue\"},{\"CompletionText\":\"System.Management.Automation.ReturnContainers\",\"ListItemText\":\"ReturnContainers\",\"ResultType\":11,\"ToolTip\":\"Enum System.Management.Automation.ReturnContainers\"},{\"CompletionText\":\"System.Management.Automation.Language.ReturnStatementAst\",\"ListItemText\":\"ReturnStatementAst\",\"ResultType\":11,\"ToolTip\":\"Class System.Management.Automation.Language.ReturnStatementAst\"},{\"CompletionText\":\"Microsoft.CodeAnalysis.CSharp.Syntax.ReturnStatementSyntax\",\"ListItemText\":\"ReturnStatementSyntax\",\"ResultType\":11,\"ToolTip\":\"Microsoft.CodeAnalysis.CSharp.Syntax.ReturnStatementSyntax\"},{\"CompletionText\":\"System.Reflection.Metadata.Ecma335.ReturnTypeEncoder\",\"ListItemText\":\"ReturnTypeEncoder\",\"ResultType\":11,\"ToolTip\":\"System.Reflection.Metadata.Ecma335.ReturnTypeEncoder\"},{\"CompletionText\":\"Microsoft.CodeAnalysis.IOperation+OperationList+Reversed\",\"ListItemText\":\"Reversed\",\"ResultType\":11,\"ToolTip\":\"Microsoft.CodeAnalysis.IOperation+OperationList+Reversed\"},{\"CompletionText\":\"Microsoft.CodeAnalysis.ChildSyntaxList+Reversed\",\"ListItemText\":\"Reversed\",\"ResultType\":11,\"ToolTip\":\"Microsoft.CodeAnalysis.ChildSyntaxList+Reversed\"},{\"CompletionText\":\"Microsoft.CodeAnalysis.SyntaxTriviaList+Reversed\",\"ListItemText\":\"Reversed\",\"ResultType\":11,\"ToolTip\":\"Microsoft.CodeAnalysis.SyntaxTriviaList+Reversed\"},{\"CompletionText\":\"Microsoft.CodeAnalysis.SyntaxTokenList+Reversed\",\"ListItemText\":\"Reversed\",\"ResultType\":11,\"ToolTip\":\"Microsoft.CodeAnalysis.SyntaxTokenList+Reversed\"},{\"CompletionText\":\"System.Security.Cryptography.Rfc2898DeriveBytes\",\"ListItemText\":\"Rfc2898DeriveBytes\",\"ResultType\":11,\"ToolTip\":\"System.Security.Cryptography.Rfc2898DeriveBytes\"},{\"CompletionText\":\"System.Security.Cryptography.Pkcs.Rfc3161TimestampRequest\",\"ListItemText\":\"Rfc3161TimestampRequest\",\"ResultType\":11,\"ToolTip\":\"System.Security.Cryptography.Pkcs.Rfc3161TimestampRequest\"},{\"CompletionText\":\"System.Security.Cryptography.Pkcs.Rfc3161TimestampToken\",\"ListItemText\":\"Rfc3161TimestampToken\",\"ResultType\":11,\"ToolTip\":\"System.Security.Cryptography.Pkcs.Rfc3161TimestampToken\"},{\"CompletionText\":\"System.Security.Cryptography.Pkcs.Rfc3161TimestampTokenInfo\",\"ListItemText\":\"Rfc3161TimestampTokenInfo\",\"ResultType\":11,\"ToolTip\":\"System.Security.Cryptography.Pkcs.Rfc3161TimestampTokenInfo\"},{\"CompletionText\":\"System.Security.Cryptography.Rijndael\",\"ListItemText\":\"Rijndael\",\"ResultType\":11,\"ToolTip\":\"System.Security.Cryptography.Rijndael\"},{\"CompletionText\":\"System.Security.Cryptography.RijndaelManaged\",\"ListItemText\":\"RijndaelManaged\",\"ResultType\":11,\"ToolTip\":\"System.Security.Cryptography.RijndaelManaged\"},{\"CompletionText\":\"System.Security.Cryptography.RNGCryptoServiceProvider\",\"ListItemText\":\"RNGCryptoServiceProvider\",\"ResultType\":11,\"ToolTip\":\"System.Security.Cryptography.RNGCryptoServiceProvider\"},{\"CompletionText\":\"System.Management.Automation.RollbackSeverity\",\"ListItemText\":\"RollbackSeverity\",\"ResultType\":11,\"ToolTip\":\"Enum System.Management.Automation.RollbackSeverity\"},{\"CompletionText\":\"System.ComponentModel.Design.Serialization.RootDesignerSerializerAttribute\",\"ListItemText\":\"RootDesignerSerializerAttribute\",\"ResultType\":11,\"ToolTip\":\"System.ComponentModel.Design.Serialization.RootDesignerSerializerAttribute\"},{\"CompletionText\":\"Roslyn\",\"ListItemText\":\"Roslyn\",\"ResultType\":10,\"ToolTip\":\"Namespace Roslyn\"},{\"CompletionText\":\"System.Drawing.RotateFlipType\",\"ListItemText\":\"RotateFlipType\",\"ResultType\":11,\"ToolTip\":\"System.Drawing.RotateFlipType\"},{\"CompletionText\":\"Markdig.Renderers.Roundtrip.Inlines.RoundtripHtmlEntityInlineRenderer\",\"ListItemText\":\"RoundtripHtmlEntityInlineRenderer\",\"ResultType\":11,\"ToolTip\":\"Markdig.Renderers.Roundtrip.Inlines.RoundtripHtmlEntityInlineRenderer\"},{\"CompletionText\":\"Markdig.Renderers.Roundtrip.Inlines.RoundtripHtmlInlineRenderer\",\"ListItemText\":\"RoundtripHtmlInlineRenderer\",\"ResultType\":11,\"ToolTip\":\"Markdig.Renderers.Roundtrip.Inlines.RoundtripHtmlInlineRenderer\"},{\"CompletionText\":\"Markdig.Renderers.Roundtrip.RoundtripObjectRenderer\",\"ListItemText\":\"RoundtripObjectRenderer<>\",\"ResultType\":11,\"ToolTip\":\"Markdig.Renderers.Roundtrip.RoundtripObjectRenderer[T]\"},{\"CompletionText\":\"Markdig.Renderers.Roundtrip.RoundtripRenderer\",\"ListItemText\":\"RoundtripRenderer\",\"ResultType\":11,\"ToolTip\":\"Markdig.Renderers.Roundtrip.RoundtripRenderer\"},{\"CompletionText\":\"JetBrains.Annotations.RouteParameterConstraintAttribute\",\"ListItemText\":\"RouteParameterConstraintAttribute\",\"ResultType\":11,\"ToolTip\":\"JetBrains.Annotations.RouteParameterConstraintAttribute\"},{\"CompletionText\":\"JetBrains.Annotations.RouteTemplateAttribute\",\"ListItemText\":\"RouteTemplateAttribute\",\"ResultType\":11,\"ToolTip\":\"JetBrains.Annotations.RouteTemplateAttribute\"},{\"CompletionText\":\"System.Data.RowNotInTableException\",\"ListItemText\":\"RowNotInTableException\",\"ResultType\":11,\"ToolTip\":\"System.Data.RowNotInTableException\"},{\"CompletionText\":\"System.Data.Common.RowUpdatedEventArgs\",\"ListItemText\":\"RowUpdatedEventArgs\",\"ResultType\":11,\"ToolTip\":\"System.Data.Common.RowUpdatedEventArgs\"},{\"CompletionText\":\"System.Data.Common.RowUpdatingEventArgs\",\"ListItemText\":\"RowUpdatingEventArgs\",\"ResultType\":11,\"ToolTip\":\"System.Data.Common.RowUpdatingEventArgs\"},{\"CompletionText\":\"System.Security.Cryptography.RSA\",\"ListItemText\":\"RSA\",\"ResultType\":11,\"ToolTip\":\"System.Security.Cryptography.RSA\"},{\"CompletionText\":\"System.Security.Cryptography.X509Certificates.RSACertificateExtensions\",\"ListItemText\":\"RSACertificateExtensions\",\"ResultType\":11,\"ToolTip\":\"System.Security.Cryptography.X509Certificates.RSACertificateExtensions\"},{\"CompletionText\":\"System.Security.Cryptography.RSACng\",\"ListItemText\":\"RSACng\",\"ResultType\":11,\"ToolTip\":\"System.Security.Cryptography.RSACng\"},{\"CompletionText\":\"System.Security.Cryptography.RSACryptoServiceProvider\",\"ListItemText\":\"RSACryptoServiceProvider\",\"ResultType\":11,\"ToolTip\":\"System.Security.Cryptography.RSACryptoServiceProvider\"},{\"CompletionText\":\"System.Security.Cryptography.RSAEncryptionPadding\",\"ListItemText\":\"RSAEncryptionPadding\",\"ResultType\":11,\"ToolTip\":\"System.Security.Cryptography.RSAEncryptionPadding\"},{\"CompletionText\":\"System.Security.Cryptography.RSAEncryptionPaddingMode\",\"ListItemText\":\"RSAEncryptionPaddingMode\",\"ResultType\":11,\"ToolTip\":\"System.Security.Cryptography.RSAEncryptionPaddingMode\"},{\"CompletionText\":\"System.Security.Cryptography.Xml.RSAKeyValue\",\"ListItemText\":\"RSAKeyValue\",\"ResultType\":11,\"ToolTip\":\"System.Security.Cryptography.Xml.RSAKeyValue\"},{\"CompletionText\":\"System.Security.Cryptography.RSAOAEPKeyExchangeDeformatter\",\"ListItemText\":\"RSAOAEPKeyExchangeDeformatter\",\"ResultType\":11,\"ToolTip\":\"System.Security.Cryptography.RSAOAEPKeyExchangeDeformatter\"},{\"CompletionText\":\"System.Security.Cryptography.RSAOAEPKeyExchangeFormatter\",\"ListItemText\":\"RSAOAEPKeyExchangeFormatter\",\"ResultType\":11,\"ToolTip\":\"System.Security.Cryptography.RSAOAEPKeyExchangeFormatter\"},{\"CompletionText\":\"System.Security.Cryptography.RSAOpenSsl\",\"ListItemText\":\"RSAOpenSsl\",\"ResultType\":11,\"ToolTip\":\"System.Security.Cryptography.RSAOpenSsl\"},{\"CompletionText\":\"System.Security.Cryptography.RSAParameters\",\"ListItemText\":\"RSAParameters\",\"ResultType\":11,\"ToolTip\":\"System.Security.Cryptography.RSAParameters\"},{\"CompletionText\":\"System.Security.Cryptography.RSAPKCS1KeyExchangeDeformatter\",\"ListItemText\":\"RSAPKCS1KeyExchangeDeformatter\",\"ResultType\":11,\"ToolTip\":\"System.Security.Cryptography.RSAPKCS1KeyExchangeDeformatter\"},{\"CompletionText\":\"System.Security.Cryptography.RSAPKCS1KeyExchangeFormatter\",\"ListItemText\":\"RSAPKCS1KeyExchangeFormatter\",\"ResultType\":11,\"ToolTip\":\"System.Security.Cryptography.RSAPKCS1KeyExchangeFormatter\"},{\"CompletionText\":\"System.Security.Cryptography.RSAPKCS1SignatureDeformatter\",\"ListItemText\":\"RSAPKCS1SignatureDeformatter\",\"ResultType\":11,\"ToolTip\":\"System.Security.Cryptography.RSAPKCS1SignatureDeformatter\"},{\"CompletionText\":\"System.Security.Cryptography.RSAPKCS1SignatureFormatter\",\"ListItemText\":\"RSAPKCS1SignatureFormatter\",\"ResultType\":11,\"ToolTip\":\"System.Security.Cryptography.RSAPKCS1SignatureFormatter\"},{\"CompletionText\":\"System.Configuration.RsaProtectedConfigurationProvider\",\"ListItemText\":\"RsaProtectedConfigurationProvider\",\"ResultType\":11,\"ToolTip\":\"System.Configuration.RsaProtectedConfigurationProvider\"},{\"CompletionText\":\"System.Security.Cryptography.RSASignaturePadding\",\"ListItemText\":\"RSASignaturePadding\",\"ResultType\":11,\"ToolTip\":\"System.Security.Cryptography.RSASignaturePadding\"},{\"CompletionText\":\"System.Security.Cryptography.RSASignaturePaddingMode\",\"ListItemText\":\"RSASignaturePaddingMode\",\"ResultType\":11,\"ToolTip\":\"System.Security.Cryptography.RSASignaturePaddingMode\"},{\"CompletionText\":\"System.ServiceModel.Syndication.Rss20FeedFormatter\",\"ListItemText\":\"Rss20FeedFormatter\",\"ResultType\":11,\"ToolTip\":\"System.ServiceModel.Syndication.Rss20FeedFormatter\"},{\"CompletionText\":\"System.ServiceModel.Syndication.Rss20ItemFormatter\",\"ListItemText\":\"Rss20ItemFormatter\",\"ResultType\":11,\"ToolTip\":\"System.ServiceModel.Syndication.Rss20ItemFormatter\"},{\"CompletionText\":\"System.Data.Rule\",\"ListItemText\":\"Rule\",\"ResultType\":11,\"ToolTip\":\"System.Data.Rule\"},{\"CompletionText\":\"System.Runtime.CompilerServices.RuleCache\",\"ListItemText\":\"RuleCache<>\",\"ResultType\":11,\"ToolTip\":\"System.Runtime.CompilerServices.RuleCache[T]\"},{\"CompletionText\":\"Microsoft.CodeAnalysis.RuleSet\",\"ListItemText\":\"RuleSet\",\"ResultType\":11,\"ToolTip\":\"Microsoft.CodeAnalysis.RuleSet\"},{\"CompletionText\":\"Microsoft.CodeAnalysis.RuleSetInclude\",\"ListItemText\":\"RuleSetInclude\",\"ResultType\":11,\"ToolTip\":\"Microsoft.CodeAnalysis.RuleSetInclude\"},{\"CompletionText\":\"System.Text.Rune\",\"ListItemText\":\"Rune\",\"ResultType\":11,\"ToolTip\":\"System.Text.Rune\"},{\"CompletionText\":\"System.ComponentModel.RunInstallerAttribute\",\"ListItemText\":\"RunInstallerAttribute\",\"ResultType\":11,\"ToolTip\":\"System.ComponentModel.RunInstallerAttribute\"},{\"CompletionText\":\"runspace\",\"ListItemText\":\"Runspace\",\"ResultType\":11,\"ToolTip\":\"Class System.Management.Automation.Runspaces.Runspace\"},{\"CompletionText\":\"System.Management.Automation.Runspaces.RunspaceAttribute\",\"ListItemText\":\"RunspaceAttribute\",\"ResultType\":11,\"ToolTip\":\"Class System.Management.Automation.Runspaces.RunspaceAttribute\"},{\"CompletionText\":\"System.Management.Automation.Runspaces.RunspaceAvailability\",\"ListItemText\":\"RunspaceAvailability\",\"ResultType\":11,\"ToolTip\":\"Enum System.Management.Automation.Runspaces.RunspaceAvailability\"},{\"CompletionText\":\"System.Management.Automation.Runspaces.RunspaceAvailabilityEventArgs\",\"ListItemText\":\"RunspaceAvailabilityEventArgs\",\"ResultType\":11,\"ToolTip\":\"Class System.Management.Automation.Runspaces.RunspaceAvailabilityEventArgs\"},{\"CompletionText\":\"System.Management.Automation.Runspaces.RunspaceCapability\",\"ListItemText\":\"RunspaceCapability\",\"ResultType\":11,\"ToolTip\":\"Enum System.Management.Automation.Runspaces.RunspaceCapability\"},{\"CompletionText\":\"System.Management.Automation.Runspaces.RunspaceConnectionInfo\",\"ListItemText\":\"RunspaceConnectionInfo\",\"ResultType\":11,\"ToolTip\":\"Class System.Management.Automation.Runspaces.RunspaceConnectionInfo\"},{\"CompletionText\":\"runspacefactory\",\"ListItemText\":\"RunspaceFactory\",\"ResultType\":11,\"ToolTip\":\"Class System.Management.Automation.Runspaces.RunspaceFactory\"},{\"CompletionText\":\"System.Management.Automation.RunspaceMode\",\"ListItemText\":\"RunspaceMode\",\"ResultType\":11,\"ToolTip\":\"Enum System.Management.Automation.RunspaceMode\"},{\"CompletionText\":\"System.Management.Automation.Runspaces.RunspaceOpenModuleLoadException\",\"ListItemText\":\"RunspaceOpenModuleLoadException\",\"ResultType\":11,\"ToolTip\":\"Class System.Management.Automation.Runspaces.RunspaceOpenModuleLoadException\"},{\"CompletionText\":\"System.Management.Automation.Runspaces.RunspacePool\",\"ListItemText\":\"RunspacePool\",\"ResultType\":11,\"ToolTip\":\"Class System.Management.Automation.Runspaces.RunspacePool\"},{\"CompletionText\":\"System.Management.Automation.Runspaces.RunspacePoolAvailability\",\"ListItemText\":\"RunspacePoolAvailability\",\"ResultType\":11,\"ToolTip\":\"Enum System.Management.Automation.Runspaces.RunspacePoolAvailability\"},{\"CompletionText\":\"System.Management.Automation.Runspaces.RunspacePoolCapability\",\"ListItemText\":\"RunspacePoolCapability\",\"ResultType\":11,\"ToolTip\":\"Enum System.Management.Automation.Runspaces.RunspacePoolCapability\"},{\"CompletionText\":\"System.Management.Automation.Runspaces.RunspacePoolState\",\"ListItemText\":\"RunspacePoolState\",\"ResultType\":11,\"ToolTip\":\"Enum System.Management.Automation.Runspaces.RunspacePoolState\"},{\"CompletionText\":\"System.Management.Automation.Runspaces.RunspacePoolStateChangedEventArgs\",\"ListItemText\":\"RunspacePoolStateChangedEventArgs\",\"ResultType\":11,\"ToolTip\":\"Class System.Management.Automation.Runspaces.RunspacePoolStateChangedEventArgs\"},{\"CompletionText\":\"System.Management.Automation.RunspacePoolStateInfo\",\"ListItemText\":\"RunspacePoolStateInfo\",\"ResultType\":11,\"ToolTip\":\"Class System.Management.Automation.RunspacePoolStateInfo\"},{\"CompletionText\":\"System.Management.Automation.RunspaceRepository\",\"ListItemText\":\"RunspaceRepository\",\"ResultType\":11,\"ToolTip\":\"Class System.Management.Automation.RunspaceRepository\"},{\"CompletionText\":\"System.Management.Automation.Runspaces.RunspaceState\",\"ListItemText\":\"RunspaceState\",\"ResultType\":11,\"ToolTip\":\"Enum System.Management.Automation.Runspaces.RunspaceState\"},{\"CompletionText\":\"System.Management.Automation.Runspaces.RunspaceStateEventArgs\",\"ListItemText\":\"RunspaceStateEventArgs\",\"ResultType\":11,\"ToolTip\":\"Class System.Management.Automation.Runspaces.RunspaceStateEventArgs\"},{\"CompletionText\":\"System.Management.Automation.Runspaces.RunspaceStateInfo\",\"ListItemText\":\"RunspaceStateInfo\",\"ResultType\":11,\"ToolTip\":\"Class System.Management.Automation.Runspaces.RunspaceStateInfo\"},{\"CompletionText\":\"System.RuntimeArgumentHandle\",\"ListItemText\":\"RuntimeArgumentHandle\",\"ResultType\":11,\"ToolTip\":\"System.RuntimeArgumentHandle\"},{\"CompletionText\":\"Microsoft.CSharp.RuntimeBinder.RuntimeBinderException\",\"ListItemText\":\"RuntimeBinderException\",\"ResultType\":11,\"ToolTip\":\"Microsoft.CSharp.RuntimeBinder.RuntimeBinderException\"},{\"CompletionText\":\"Microsoft.CSharp.RuntimeBinder.RuntimeBinderInternalCompilerException\",\"ListItemText\":\"RuntimeBinderInternalCompilerException\",\"ResultType\":11,\"ToolTip\":\"Microsoft.CSharp.RuntimeBinder.RuntimeBinderInternalCompilerException\"},{\"CompletionText\":\"Microsoft.CodeAnalysis.RuntimeCapability\",\"ListItemText\":\"RuntimeCapability\",\"ResultType\":11,\"ToolTip\":\"Microsoft.CodeAnalysis.RuntimeCapability\"},{\"CompletionText\":\"System.Runtime.CompilerServices.RuntimeCompatibilityAttribute\",\"ListItemText\":\"RuntimeCompatibilityAttribute\",\"ResultType\":11,\"ToolTip\":\"System.Runtime.CompilerServices.RuntimeCompatibilityAttribute\"},{\"CompletionText\":\"System.Management.Automation.RuntimeDefinedParameter\",\"ListItemText\":\"RuntimeDefinedParameter\",\"ResultType\":11,\"ToolTip\":\"Class System.Management.Automation.RuntimeDefinedParameter\"},{\"CompletionText\":\"System.Management.Automation.RuntimeDefinedParameterDictionary\",\"ListItemText\":\"RuntimeDefinedParameterDictionary\",\"ResultType\":11,\"ToolTip\":\"Class System.Management.Automation.RuntimeDefinedParameterDictionary\"},{\"CompletionText\":\"System.Runtime.InteropServices.RuntimeEnvironment\",\"ListItemText\":\"RuntimeEnvironment\",\"ResultType\":11,\"ToolTip\":\"System.Runtime.InteropServices.RuntimeEnvironment\"},{\"CompletionText\":\"System.Management.Automation.RuntimeException\",\"ListItemText\":\"RuntimeException\",\"ResultType\":11,\"ToolTip\":\"Class System.Management.Automation.RuntimeException\"},{\"CompletionText\":\"System.Runtime.CompilerServices.RuntimeFeature\",\"ListItemText\":\"RuntimeFeature\",\"ResultType\":11,\"ToolTip\":\"System.Runtime.CompilerServices.RuntimeFeature\"},{\"CompletionText\":\"System.RuntimeFieldHandle\",\"ListItemText\":\"RuntimeFieldHandle\",\"ResultType\":11,\"ToolTip\":\"System.RuntimeFieldHandle\"},{\"CompletionText\":\"System.Runtime.CompilerServices.RuntimeHelpers\",\"ListItemText\":\"RuntimeHelpers\",\"ResultType\":11,\"ToolTip\":\"System.Runtime.CompilerServices.RuntimeHelpers\"},{\"CompletionText\":\"System.Runtime.InteropServices.RuntimeInformation\",\"ListItemText\":\"RuntimeInformation\",\"ResultType\":11,\"ToolTip\":\"System.Runtime.InteropServices.RuntimeInformation\"},{\"CompletionText\":\"System.RuntimeMethodHandle\",\"ListItemText\":\"RuntimeMethodHandle\",\"ResultType\":11,\"ToolTip\":\"System.RuntimeMethodHandle\"},{\"CompletionText\":\"System.Reflection.RuntimeReflectionExtensions\",\"ListItemText\":\"RuntimeReflectionExtensions\",\"ResultType\":11,\"ToolTip\":\"System.Reflection.RuntimeReflectionExtensions\"},{\"CompletionText\":\"System.RuntimeTypeHandle\",\"ListItemText\":\"RuntimeTypeHandle\",\"ResultType\":11,\"ToolTip\":\"System.RuntimeTypeHandle\"},{\"CompletionText\":\"System.Linq.Expressions.RuntimeVariablesExpression\",\"ListItemText\":\"RuntimeVariablesExpression\",\"ResultType\":11,\"ToolTip\":\"System.Linq.Expressions.RuntimeVariablesExpression\"},{\"CompletionText\":\"System.Runtime.CompilerServices.RuntimeWrappedException\",\"ListItemText\":\"RuntimeWrappedException\",\"ResultType\":11,\"ToolTip\":\"System.Runtime.CompilerServices.RuntimeWrappedException\"},{\"CompletionText\":\"System.ComponentModel.RunWorkerCompletedEventArgs\",\"ListItemText\":\"RunWorkerCompletedEventArgs\",\"ResultType\":11,\"ToolTip\":\"System.ComponentModel.RunWorkerCompletedEventArgs\"},{\"CompletionText\":\"System.ComponentModel.RunWorkerCompletedEventHandler\",\"ListItemText\":\"RunWorkerCompletedEventHandler\",\"ResultType\":11,\"ToolTip\":\"System.ComponentModel.RunWorkerCompletedEventHandler\"}]\u0007"
 	},
+	{
+		"type": "input",
+		"data": "r"
+	},
 	{
 		"type": "input",
 		"data": "e"
 	},
+	{
+		"type": "input",
+		"data": "q"
+	},
 	{
 		"type": "output",
-		"data": "\u001b[?25l\u001b[3;3H[re\u001b[?25h"
+		"data": "\u001b[?25l\u001b[3;3H[req\u001b[?25h"
 	},
 	{
 		"type": "promptInputChange",
-		"data": "[re|"
+		"data": "[req|"
 	},
 	{
 		"type": "command",
@@ -99,14 +107,14 @@ export const events = [
 	},
 	{
 		"type": "sendText",
-		"data": "System.Xml.Linq.ReaderOptions"
+		"data": "Json.Schema.RequiredKeyword"
 	},
 	{
 		"type": "output",
-		"data": "\u001b[?25l\u001b[3;3H[System.Xml.Linq.ReaderOptions\u001b[?25h"
+		"data": "\u001b[?25l\u001b[3;3H[Json.Schema.RequiredKeyword\u001b[?25h"
 	},
 	{
 		"type": "promptInputChange",
-		"data": "[System.Xml.Linq.ReaderOptions|"
+		"data": "[Json.Schema.RequiredKeyword|"
 	}
 ];
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalSuggestAddon.integrationTest.ts b/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalSuggestAddon.integrationTest.ts
index 90c2efa5e75..119993e65cd 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalSuggestAddon.integrationTest.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalSuggestAddon.integrationTest.ts
@@ -3,33 +3,35 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-// eslint-disable-next-line local/code-import-patterns, local/code-amd-node-module
-import { Terminal } from '@xterm/xterm';
-
+import type { Terminal } from '@xterm/xterm';
 import { strictEqual } from 'assert';
-import { getActiveDocument } from 'vs/base/browser/dom';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { IContextKeyService, type IContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
-import type { TerminalCapabilityStore } from 'vs/platform/terminal/common/capabilities/terminalCapabilityStore';
-import { ShellIntegrationAddon } from 'vs/platform/terminal/common/xterm/shellIntegrationAddon';
-import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey';
-import { SuggestAddon } from 'vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon';
-import { TerminalSuggestCommandId } from 'vs/workbench/contrib/terminalContrib/suggest/common/terminal.suggest';
-import type { ITerminalSuggestConfiguration } from 'vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration';
-import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
+import { getActiveDocument } from '../../../../../../base/browser/dom.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { TestConfigurationService } from '../../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { IContextKeyService, type IContextKey } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { NullLogService } from '../../../../../../platform/log/common/log.js';
+import { TerminalCapability } from '../../../../../../platform/terminal/common/capabilities/capabilities.js';
+import type { TerminalCapabilityStore } from '../../../../../../platform/terminal/common/capabilities/terminalCapabilityStore.js';
+import { ShellIntegrationAddon } from '../../../../../../platform/terminal/common/xterm/shellIntegrationAddon.js';
+import { TerminalContextKeys } from '../../../../terminal/common/terminalContextKey.js';
+import { parseCompletionsFromShell, SuggestAddon } from '../../browser/terminalSuggestAddon.js';
+import { TerminalSuggestCommandId } from '../../common/terminal.suggest.js';
+import type { ITerminalSuggestConfiguration } from '../../common/terminalSuggestConfiguration.js';
+import { workbenchInstantiationService, type TestTerminalConfigurationService } from '../../../../../test/browser/workbenchTestServices.js';
 
-import { events as macos_bash_echo_simple } from 'vs/workbench/contrib/terminalContrib/suggest/test/browser/recordings/macos_bash_echo_simple';
-import { events as macos_bash_echo_multiline } from 'vs/workbench/contrib/terminalContrib/suggest/test/browser/recordings/macos_bash_echo_multiline';
-import { events as windows11_pwsh_getcontent_delete_ghost } from 'vs/workbench/contrib/terminalContrib/suggest/test/browser/recordings/windows11_pwsh_getcontent_delete_ghost';
-import { events as windows11_pwsh_getcontent_file } from 'vs/workbench/contrib/terminalContrib/suggest/test/browser/recordings/windows11_pwsh_getcontent_file';
-import { events as windows11_pwsh_input_ls_complete_ls } from 'vs/workbench/contrib/terminalContrib/suggest/test/browser/recordings/windows11_pwsh_input_ls_complete_ls';
-import { events as windows11_pwsh_namespace_completion } from 'vs/workbench/contrib/terminalContrib/suggest/test/browser/recordings/windows11_pwsh_namespace_completion';
-import { events as windows11_pwsh_type_before_prompt } from 'vs/workbench/contrib/terminalContrib/suggest/test/browser/recordings/windows11_pwsh_type_before_prompt';
-import { events as windows11_pwsh_writehost_multiline_nav_up } from 'vs/workbench/contrib/terminalContrib/suggest/test/browser/recordings/windows11_pwsh_writehost_multiline_nav_up';
-import { events as windows11_pwsh_writehost_multiline } from 'vs/workbench/contrib/terminalContrib/suggest/test/browser/recordings/windows11_pwsh_writehost_multiline';
+import { events as macos_bash_echo_simple } from './recordings/macos_bash_echo_simple.js';
+import { events as macos_bash_echo_multiline } from './recordings/macos_bash_echo_multiline.js';
+import { events as windows11_pwsh_getcontent_delete_ghost } from './recordings/windows11_pwsh_getcontent_delete_ghost.js';
+import { events as windows11_pwsh_getcontent_file } from './recordings/windows11_pwsh_getcontent_file.js';
+import { events as windows11_pwsh_input_ls_complete_ls } from './recordings/windows11_pwsh_input_ls_complete_ls.js';
+import { events as windows11_pwsh_namespace_completion } from './recordings/windows11_pwsh_namespace_completion.js';
+import { events as windows11_pwsh_type_before_prompt } from './recordings/windows11_pwsh_type_before_prompt.js';
+import { events as windows11_pwsh_writehost_multiline_nav_up } from './recordings/windows11_pwsh_writehost_multiline_nav_up.js';
+import { events as windows11_pwsh_writehost_multiline } from './recordings/windows11_pwsh_writehost_multiline.js';
+import { importAMDNodeModule } from '../../../../../../amdX.js';
+import { testRawPwshCompletions } from './testRawPwshCompletions.js';
+import { ITerminalConfigurationService } from '../../../../terminal/browser/terminal.js';
+import { timeout } from '../../../../../../base/common/async.js';
 
 const recordedTestCases: { name: string; events: RecordedSessionEvent[] }[] = [
 	{ name: 'macos_bash_echo_simple', events: macos_bash_echo_simple as any as RecordedSessionEvent[] },
@@ -69,35 +71,51 @@ suite('Terminal Contrib Suggest Recordings', () => {
 	let suggestWidgetVisibleContextKey: IContextKey<boolean>;
 	let suggestAddon: SuggestAddon;
 
-	setup(() => {
+	setup(async () => {
+		const terminalConfig = {
+			fontFamily: 'monospace',
+			fontSize: 12,
+			fontWeight: 'normal',
+			letterSpacing: 0,
+			lineHeight: 1,
+			integrated: {
+				suggest: {
+					enabled: true,
+					quickSuggestions: true,
+					suggestOnTriggerCharacters: true,
+					runOnEnter: 'never',
+					builtinCompletions: {
+						pwshCode: true,
+						pwshGit: true
+					}
+				} satisfies ITerminalSuggestConfiguration
+			}
+		};
 		const instantiationService = workbenchInstantiationService({
 			configurationService: () => new TestConfigurationService({
 				files: { autoSave: false },
-				terminal: {
-					integrated: {
-						suggest: {
-							enabled: true,
-							quickSuggestions: true,
-							suggestOnTriggerCharacters: true,
-						} satisfies ITerminalSuggestConfiguration
-					}
-				}
+				terminal: terminalConfig
 			})
 		}, store);
-		xterm = store.add(new Terminal({ allowProposedApi: true }));
+		const terminalConfigurationService = instantiationService.get(ITerminalConfigurationService) as TestTerminalConfigurationService;
+		terminalConfigurationService.setConfig(terminalConfig as any);
+		const TerminalCtor = (await importAMDNodeModule<typeof import('@xterm/xterm')>('@xterm/xterm', 'lib/xterm.js')).Terminal;
+		xterm = store.add(new TerminalCtor({ allowProposedApi: true }));
 		const shellIntegrationAddon = store.add(new ShellIntegrationAddon('', true, undefined, new NullLogService));
 		capabilities = shellIntegrationAddon.capabilities;
 		suggestWidgetVisibleContextKey = TerminalContextKeys.suggestWidgetVisible.bindTo(instantiationService.get(IContextKeyService));
-		suggestAddon = store.add(instantiationService.createInstance(SuggestAddon, shellIntegrationAddon.capabilities, suggestWidgetVisibleContextKey));
+		suggestAddon = store.add(instantiationService.createInstance(SuggestAddon, new Set(parseCompletionsFromShell(testRawPwshCompletions)), shellIntegrationAddon.capabilities, suggestWidgetVisibleContextKey));
 
 		const testContainer = document.createElement('div');
 		getActiveDocument().body.append(testContainer);
 		xterm.open(testContainer);
-		suggestAddon.setPanel(testContainer);
+		suggestAddon.setContainerWithOverflow(testContainer);
 		suggestAddon.setScreen(xterm.element!.querySelector('.xterm-screen')!);
 
 		xterm.loadAddon(shellIntegrationAddon);
 		xterm.loadAddon(suggestAddon);
+
+		xterm.focus();
 	});
 
 	for (const testCase of recordedTestCases) {
@@ -147,14 +165,17 @@ suite('Terminal Contrib Suggest Recordings', () => {
 					case 'promptInputChange': {
 						const promptInputModel = capabilities.get(TerminalCapability.CommandDetection)?.promptInputModel;
 						if (promptInputModel && promptInputModel.getCombinedString() !== event.data) {
-							await new Promise<void>(r => {
-								const d = promptInputModel.onDidChangeInput(() => {
-									if (promptInputModel.getCombinedString() === event.data) {
-										d.dispose();
-										r();
-									}
-								});
-							});
+							await Promise.race([
+								await timeout(1000).then(() => { throw new Error(`Prompt input change timed out current="${promptInputModel.getCombinedString()}", expected="${event.data}"`); }),
+								await new Promise<void>(r => {
+									const d = promptInputModel.onDidChangeInput(() => {
+										if (promptInputModel.getCombinedString() === event.data) {
+											d.dispose();
+											r();
+										}
+									});
+								})
+							]);
 						}
 						break;
 					}
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/testRawPwshCompletions.ts b/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/testRawPwshCompletions.ts
new file mode 100644
index 00000000000..06ba44bf967
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/testRawPwshCompletions.ts
@@ -0,0 +1,51571 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+export const testRawPwshCompletions = [
+	{
+		CompletionText: '%',
+		ListItemText: '%',
+		ResultType: 2,
+		ToolTip: 'ForEach-Object'
+	},
+	{
+		CompletionText: '?',
+		ListItemText: '?',
+		ResultType: 2,
+		ToolTip: 'Where-Object'
+	},
+	{
+		CompletionText: 'A:',
+		ListItemText: 'A:',
+		ResultType: 2,
+		ToolTip: '\\r\\nA: \\r\\n'
+	},
+	{
+		CompletionText: 'ac',
+		ListItemText: 'ac',
+		ResultType: 2,
+		ToolTip: 'Add-Content'
+	},
+	{
+		CompletionText: 'Add-AdlAnalyticsDataSource',
+		ListItemText: 'Add-AdlAnalyticsDataSource',
+		ResultType: 2,
+		ToolTip: 'Add-AdlAnalyticsDataSource'
+	},
+	{
+		CompletionText: 'Add-AdlAnalyticsFirewallRule',
+		ListItemText: 'Add-AdlAnalyticsFirewallRule',
+		ResultType: 2,
+		ToolTip: 'Add-AdlAnalyticsFirewallRule'
+	},
+	{
+		CompletionText: 'Add-AdlStoreFirewallRule',
+		ListItemText: 'Add-AdlStoreFirewallRule',
+		ResultType: 2,
+		ToolTip: 'Add-AdlStoreFirewallRule'
+	},
+	{
+		CompletionText: 'Add-AdlStoreItemContent',
+		ListItemText: 'Add-AdlStoreItemContent',
+		ResultType: 2,
+		ToolTip: 'Add-AdlStoreItemContent'
+	},
+	{
+		CompletionText: 'Add-AdlStoreTrustedIdProvider',
+		ListItemText: 'Add-AdlStoreTrustedIdProvider',
+		ResultType: 2,
+		ToolTip: 'Add-AdlStoreTrustedIdProvider'
+	},
+	{
+		CompletionText: 'Add-AdlStoreVirtualNetworkRule',
+		ListItemText: 'Add-AdlStoreVirtualNetworkRule',
+		ResultType: 2,
+		ToolTip: 'Add-AdlStoreVirtualNetworkRule'
+	},
+	{
+		CompletionText: 'Add-AppPackage',
+		ListItemText: 'Add-AppPackage',
+		ResultType: 2,
+		ToolTip: 'Add-AppPackage'
+	},
+	{
+		CompletionText: 'Add-AppPackageVolume',
+		ListItemText: 'Add-AppPackageVolume',
+		ResultType: 2,
+		ToolTip: 'Add-AppPackageVolume'
+	},
+	{
+		CompletionText: 'Add-AppProvisionedPackage',
+		ListItemText: 'Add-AppProvisionedPackage',
+		ResultType: 2,
+		ToolTip: 'Add-AppProvisionedPackage'
+	},
+	{
+		CompletionText: 'Add-AppProvisionedSharedPackageContainer',
+		ListItemText: 'Add-AppProvisionedSharedPackageContainer',
+		ResultType: 2,
+		ToolTip: 'Add-AppProvisionedSharedPackageContainer\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AppSharedPackageContainer',
+		ListItemText: 'Add-AppSharedPackageContainer',
+		ResultType: 2,
+		ToolTip: 'Add-AppSharedPackageContainer\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AppxPackage',
+		ListItemText: 'Add-AppxPackage',
+		ResultType: 2,
+		ToolTip: 'Add-AppxPackage\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AppxProvisionedPackage',
+		ListItemText: 'Add-AppxProvisionedPackage',
+		ResultType: 2,
+		ToolTip: 'Add-AppxProvisionedPackage\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AppxVolume',
+		ListItemText: 'Add-AppxVolume',
+		ResultType: 2,
+		ToolTip: 'Add-AppxVolume\\r\\n'
+	},
+	{
+		CompletionText: 'Add-ASRReplicationProtectedItemDisk',
+		ListItemText: 'Add-ASRReplicationProtectedItemDisk',
+		ResultType: 2,
+		ToolTip: 'Add-ASRReplicationProtectedItemDisk'
+	},
+	{
+		CompletionText: 'Add-AzAccount',
+		ListItemText: 'Add-AzAccount',
+		ResultType: 2,
+		ToolTip: 'Add-AzAccount'
+	},
+	{
+		CompletionText: 'Add-AzADAppPermission',
+		ListItemText: 'Add-AzADAppPermission',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-AzADAppPermission \\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzADGroupMember',
+		ListItemText: 'Add-AzADGroupMember',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-AzADGroupMember \\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzAnalysisServicesAccount',
+		ListItemText: 'Add-AzAnalysisServicesAccount',
+		ResultType: 2,
+		ToolTip: 'Add-AzAnalysisServicesAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzApiManagementApiToGateway',
+		ListItemText: 'Add-AzApiManagementApiToGateway',
+		ResultType: 2,
+		ToolTip: 'Add-AzApiManagementApiToGateway\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzApiManagementApiToProduct',
+		ListItemText: 'Add-AzApiManagementApiToProduct',
+		ResultType: 2,
+		ToolTip: 'Add-AzApiManagementApiToProduct\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzApiManagementProductToGroup',
+		ListItemText: 'Add-AzApiManagementProductToGroup',
+		ResultType: 2,
+		ToolTip: 'Add-AzApiManagementProductToGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzApiManagementRegion',
+		ListItemText: 'Add-AzApiManagementRegion',
+		ResultType: 2,
+		ToolTip: 'Add-AzApiManagementRegion\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzApiManagementUserToGroup',
+		ListItemText: 'Add-AzApiManagementUserToGroup',
+		ResultType: 2,
+		ToolTip: 'Add-AzApiManagementUserToGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzApplicationGatewayAuthenticationCertificate',
+		ListItemText: 'Add-AzApplicationGatewayAuthenticationCertificate',
+		ResultType: 2,
+		ToolTip: 'Add-AzApplicationGatewayAuthenticationCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzApplicationGatewayBackendAddressPool',
+		ListItemText: 'Add-AzApplicationGatewayBackendAddressPool',
+		ResultType: 2,
+		ToolTip: 'Add-AzApplicationGatewayBackendAddressPool\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzApplicationGatewayBackendHttpSetting',
+		ListItemText: 'Add-AzApplicationGatewayBackendHttpSetting',
+		ResultType: 2,
+		ToolTip: 'Add-AzApplicationGatewayBackendHttpSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzApplicationGatewayBackendHttpSettings',
+		ListItemText: 'Add-AzApplicationGatewayBackendHttpSettings',
+		ResultType: 2,
+		ToolTip: 'Add-AzApplicationGatewayBackendHttpSettings'
+	},
+	{
+		CompletionText: 'Add-AzApplicationGatewayBackendSetting',
+		ListItemText: 'Add-AzApplicationGatewayBackendSetting',
+		ResultType: 2,
+		ToolTip: 'Add-AzApplicationGatewayBackendSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzApplicationGatewayCustomError',
+		ListItemText: 'Add-AzApplicationGatewayCustomError',
+		ResultType: 2,
+		ToolTip: 'Add-AzApplicationGatewayCustomError\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzApplicationGatewayFrontendIPConfig',
+		ListItemText: 'Add-AzApplicationGatewayFrontendIPConfig',
+		ResultType: 2,
+		ToolTip: 'Add-AzApplicationGatewayFrontendIPConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzApplicationGatewayFrontendPort',
+		ListItemText: 'Add-AzApplicationGatewayFrontendPort',
+		ResultType: 2,
+		ToolTip: 'Add-AzApplicationGatewayFrontendPort\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzApplicationGatewayHttpListener',
+		ListItemText: 'Add-AzApplicationGatewayHttpListener',
+		ResultType: 2,
+		ToolTip: 'Add-AzApplicationGatewayHttpListener\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzApplicationGatewayHttpListenerCustomError',
+		ListItemText: 'Add-AzApplicationGatewayHttpListenerCustomError',
+		ResultType: 2,
+		ToolTip: 'Add-AzApplicationGatewayHttpListenerCustomError\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzApplicationGatewayIPConfiguration',
+		ListItemText: 'Add-AzApplicationGatewayIPConfiguration',
+		ResultType: 2,
+		ToolTip: 'Add-AzApplicationGatewayIPConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzApplicationGatewayListener',
+		ListItemText: 'Add-AzApplicationGatewayListener',
+		ResultType: 2,
+		ToolTip: 'Add-AzApplicationGatewayListener\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzApplicationGatewayPrivateLinkConfiguration',
+		ListItemText: 'Add-AzApplicationGatewayPrivateLinkConfiguration',
+		ResultType: 2,
+		ToolTip: 'Add-AzApplicationGatewayPrivateLinkConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzApplicationGatewayProbeConfig',
+		ListItemText: 'Add-AzApplicationGatewayProbeConfig',
+		ResultType: 2,
+		ToolTip: 'Add-AzApplicationGatewayProbeConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzApplicationGatewayRedirectConfiguration',
+		ListItemText: 'Add-AzApplicationGatewayRedirectConfiguration',
+		ResultType: 2,
+		ToolTip: 'Add-AzApplicationGatewayRedirectConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzApplicationGatewayRequestRoutingRule',
+		ListItemText: 'Add-AzApplicationGatewayRequestRoutingRule',
+		ResultType: 2,
+		ToolTip: 'Add-AzApplicationGatewayRequestRoutingRule\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzApplicationGatewayRewriteRuleSet',
+		ListItemText: 'Add-AzApplicationGatewayRewriteRuleSet',
+		ResultType: 2,
+		ToolTip: 'Add-AzApplicationGatewayRewriteRuleSet\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzApplicationGatewayRoutingRule',
+		ListItemText: 'Add-AzApplicationGatewayRoutingRule',
+		ResultType: 2,
+		ToolTip: 'Add-AzApplicationGatewayRoutingRule\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzApplicationGatewaySslCertificate',
+		ListItemText: 'Add-AzApplicationGatewaySslCertificate',
+		ResultType: 2,
+		ToolTip: 'Add-AzApplicationGatewaySslCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzApplicationGatewaySslProfile',
+		ListItemText: 'Add-AzApplicationGatewaySslProfile',
+		ResultType: 2,
+		ToolTip: 'Add-AzApplicationGatewaySslProfile\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzApplicationGatewayTrustedClientCertificate',
+		ListItemText: 'Add-AzApplicationGatewayTrustedClientCertificate',
+		ResultType: 2,
+		ToolTip: 'Add-AzApplicationGatewayTrustedClientCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzApplicationGatewayTrustedRootCertificate',
+		ListItemText: 'Add-AzApplicationGatewayTrustedRootCertificate',
+		ResultType: 2,
+		ToolTip: 'Add-AzApplicationGatewayTrustedRootCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzApplicationGatewayUrlPathMapConfig',
+		ListItemText: 'Add-AzApplicationGatewayUrlPathMapConfig',
+		ResultType: 2,
+		ToolTip: 'Add-AzApplicationGatewayUrlPathMapConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzAttestationPolicySigner',
+		ListItemText: 'Add-AzAttestationPolicySigner',
+		ResultType: 2,
+		ToolTip: 'Add-AzAttestationPolicySigner\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzCognitiveServicesAccountNetworkRule',
+		ListItemText: 'Add-AzCognitiveServicesAccountNetworkRule',
+		ResultType: 2,
+		ToolTip: 'Add-AzCognitiveServicesAccountNetworkRule\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzContainerInstanceOutput',
+		ListItemText: 'Add-AzContainerInstanceOutput',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-AzContainerInstanceOutput \\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzDataFactoryV2DataFlowDebugSessionPackage',
+		ListItemText: 'Add-AzDataFactoryV2DataFlowDebugSessionPackage',
+		ResultType: 2,
+		ToolTip: 'Add-AzDataFactoryV2DataFlowDebugSessionPackage\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzDataFactoryV2TriggerSubscription',
+		ListItemText: 'Add-AzDataFactoryV2TriggerSubscription',
+		ResultType: 2,
+		ToolTip: 'Add-AzDataFactoryV2TriggerSubscription\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzDataLakeAnalyticsDataSource',
+		ListItemText: 'Add-AzDataLakeAnalyticsDataSource',
+		ResultType: 2,
+		ToolTip: 'Add-AzDataLakeAnalyticsDataSource\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzDataLakeAnalyticsFirewallRule',
+		ListItemText: 'Add-AzDataLakeAnalyticsFirewallRule',
+		ResultType: 2,
+		ToolTip: 'Add-AzDataLakeAnalyticsFirewallRule\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzDataLakeStoreFirewallRule',
+		ListItemText: 'Add-AzDataLakeStoreFirewallRule',
+		ResultType: 2,
+		ToolTip: 'Add-AzDataLakeStoreFirewallRule\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzDataLakeStoreItemContent',
+		ListItemText: 'Add-AzDataLakeStoreItemContent',
+		ResultType: 2,
+		ToolTip: 'Add-AzDataLakeStoreItemContent\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzDataLakeStoreTrustedIdProvider',
+		ListItemText: 'Add-AzDataLakeStoreTrustedIdProvider',
+		ResultType: 2,
+		ToolTip: 'Add-AzDataLakeStoreTrustedIdProvider\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzDataLakeStoreVirtualNetworkRule',
+		ListItemText: 'Add-AzDataLakeStoreVirtualNetworkRule',
+		ResultType: 2,
+		ToolTip: 'Add-AzDataLakeStoreVirtualNetworkRule\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzDelegation',
+		ListItemText: 'Add-AzDelegation',
+		ResultType: 2,
+		ToolTip: 'Add-AzDelegation\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzDnsRecordConfig',
+		ListItemText: 'Add-AzDnsRecordConfig',
+		ResultType: 2,
+		ToolTip: 'Add-AzDnsRecordConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzEnvironment',
+		ListItemText: 'Add-AzEnvironment',
+		ResultType: 2,
+		ToolTip: 'Add-AzEnvironment\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzExpressRouteCircuitAuthorization',
+		ListItemText: 'Add-AzExpressRouteCircuitAuthorization',
+		ResultType: 2,
+		ToolTip: 'Add-AzExpressRouteCircuitAuthorization\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzExpressRouteCircuitConnectionConfig',
+		ListItemText: 'Add-AzExpressRouteCircuitConnectionConfig',
+		ResultType: 2,
+		ToolTip: 'Add-AzExpressRouteCircuitConnectionConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzExpressRouteCircuitPeeringConfig',
+		ListItemText: 'Add-AzExpressRouteCircuitPeeringConfig',
+		ResultType: 2,
+		ToolTip: 'Add-AzExpressRouteCircuitPeeringConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzExpressRouteCrossConnectionPeering',
+		ListItemText: 'Add-AzExpressRouteCrossConnectionPeering',
+		ResultType: 2,
+		ToolTip: 'Add-AzExpressRouteCrossConnectionPeering\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzExpressRoutePortAuthorization',
+		ListItemText: 'Add-AzExpressRoutePortAuthorization',
+		ResultType: 2,
+		ToolTip: 'Add-AzExpressRoutePortAuthorization\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzHDInsightClusterIdentity',
+		ListItemText: 'Add-AzHDInsightClusterIdentity',
+		ResultType: 2,
+		ToolTip: 'Add-AzHDInsightClusterIdentity\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzHDInsightComponentVersion',
+		ListItemText: 'Add-AzHDInsightComponentVersion',
+		ResultType: 2,
+		ToolTip: 'Add-AzHDInsightComponentVersion\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzHDInsightConfigValue',
+		ListItemText: 'Add-AzHDInsightConfigValue',
+		ResultType: 2,
+		ToolTip: 'Add-AzHDInsightConfigValue\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzHDInsightMetastore',
+		ListItemText: 'Add-AzHDInsightMetastore',
+		ResultType: 2,
+		ToolTip: 'Add-AzHDInsightMetastore\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzHDInsightScriptAction',
+		ListItemText: 'Add-AzHDInsightScriptAction',
+		ResultType: 2,
+		ToolTip: 'Add-AzHDInsightScriptAction\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzHDInsightSecurityProfile',
+		ListItemText: 'Add-AzHDInsightSecurityProfile',
+		ResultType: 2,
+		ToolTip: 'Add-AzHDInsightSecurityProfile\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzHDInsightStorage',
+		ListItemText: 'Add-AzHDInsightStorage',
+		ResultType: 2,
+		ToolTip: 'Add-AzHDInsightStorage\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzImageDataDisk',
+		ListItemText: 'Add-AzImageDataDisk',
+		ResultType: 2,
+		ToolTip: 'Add-AzImageDataDisk\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzIotHubCertificate',
+		ListItemText: 'Add-AzIotHubCertificate',
+		ResultType: 2,
+		ToolTip: 'Add-AzIotHubCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzIotHubConfiguration',
+		ListItemText: 'Add-AzIotHubConfiguration',
+		ResultType: 2,
+		ToolTip: 'Add-AzIotHubConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzIotHubDCL',
+		ListItemText: 'Add-AzIotHubDCL',
+		ResultType: 2,
+		ToolTip: 'Add-AzIotHubDCL'
+	},
+	{
+		CompletionText: 'Add-AzIotHubDeployment',
+		ListItemText: 'Add-AzIotHubDeployment',
+		ResultType: 2,
+		ToolTip: 'Add-AzIotHubDeployment\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzIotHubDevice',
+		ListItemText: 'Add-AzIotHubDevice',
+		ResultType: 2,
+		ToolTip: 'Add-AzIotHubDevice\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzIotHubDeviceChildren',
+		ListItemText: 'Add-AzIotHubDeviceChildren',
+		ResultType: 2,
+		ToolTip: 'Add-AzIotHubDeviceChildren\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzIotHubEHCG',
+		ListItemText: 'Add-AzIotHubEHCG',
+		ResultType: 2,
+		ToolTip: 'Add-AzIotHubEHCG'
+	},
+	{
+		CompletionText: 'Add-AzIotHubEventHubConsumerGroup',
+		ListItemText: 'Add-AzIotHubEventHubConsumerGroup',
+		ResultType: 2,
+		ToolTip: 'Add-AzIotHubEventHubConsumerGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzIotHubKey',
+		ListItemText: 'Add-AzIotHubKey',
+		ResultType: 2,
+		ToolTip: 'Add-AzIotHubKey\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzIotHubMessageEnrichment',
+		ListItemText: 'Add-AzIotHubMessageEnrichment',
+		ResultType: 2,
+		ToolTip: 'Add-AzIotHubMessageEnrichment\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzIotHubModule',
+		ListItemText: 'Add-AzIotHubModule',
+		ResultType: 2,
+		ToolTip: 'Add-AzIotHubModule\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzIotHubMsgEnrich',
+		ListItemText: 'Add-AzIotHubMsgEnrich',
+		ResultType: 2,
+		ToolTip: 'Add-AzIotHubMsgEnrich'
+	},
+	{
+		CompletionText: 'Add-AzIotHubRoute',
+		ListItemText: 'Add-AzIotHubRoute',
+		ResultType: 2,
+		ToolTip: 'Add-AzIotHubRoute\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzIotHubRoutingEndpoint',
+		ListItemText: 'Add-AzIotHubRoutingEndpoint',
+		ResultType: 2,
+		ToolTip: 'Add-AzIotHubRoutingEndpoint\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzKeyVaultCertificate',
+		ListItemText: 'Add-AzKeyVaultCertificate',
+		ResultType: 2,
+		ToolTip: 'Add-AzKeyVaultCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzKeyVaultCertificateContact',
+		ListItemText: 'Add-AzKeyVaultCertificateContact',
+		ResultType: 2,
+		ToolTip: 'Add-AzKeyVaultCertificateContact\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzKeyVaultKey',
+		ListItemText: 'Add-AzKeyVaultKey',
+		ResultType: 2,
+		ToolTip: 'Add-AzKeyVaultKey\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzKeyVaultManagedStorageAccount',
+		ListItemText: 'Add-AzKeyVaultManagedStorageAccount',
+		ResultType: 2,
+		ToolTip: 'Add-AzKeyVaultManagedStorageAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzKeyVaultNetworkRule',
+		ListItemText: 'Add-AzKeyVaultNetworkRule',
+		ResultType: 2,
+		ToolTip: 'Add-AzKeyVaultNetworkRule\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzKustoClusterLanguageExtension',
+		ListItemText: 'Add-AzKustoClusterLanguageExtension',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-AzKustoClusterLanguageExtension \\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzKustoDatabasePrincipal',
+		ListItemText: 'Add-AzKustoDatabasePrincipal',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-AzKustoDatabasePrincipal \\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzLoadBalancerBackendAddressPoolConfig',
+		ListItemText: 'Add-AzLoadBalancerBackendAddressPoolConfig',
+		ResultType: 2,
+		ToolTip: 'Add-AzLoadBalancerBackendAddressPoolConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzLoadBalancerFrontendIpConfig',
+		ListItemText: 'Add-AzLoadBalancerFrontendIpConfig',
+		ResultType: 2,
+		ToolTip: 'Add-AzLoadBalancerFrontendIpConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzLoadBalancerInboundNatPoolConfig',
+		ListItemText: 'Add-AzLoadBalancerInboundNatPoolConfig',
+		ResultType: 2,
+		ToolTip: 'Add-AzLoadBalancerInboundNatPoolConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzLoadBalancerInboundNatRuleConfig',
+		ListItemText: 'Add-AzLoadBalancerInboundNatRuleConfig',
+		ResultType: 2,
+		ToolTip: 'Add-AzLoadBalancerInboundNatRuleConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzLoadBalancerOutboundRuleConfig',
+		ListItemText: 'Add-AzLoadBalancerOutboundRuleConfig',
+		ResultType: 2,
+		ToolTip: 'Add-AzLoadBalancerOutboundRuleConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzLoadBalancerProbeConfig',
+		ListItemText: 'Add-AzLoadBalancerProbeConfig',
+		ResultType: 2,
+		ToolTip: 'Add-AzLoadBalancerProbeConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzLoadBalancerRuleConfig',
+		ListItemText: 'Add-AzLoadBalancerRuleConfig',
+		ResultType: 2,
+		ToolTip: 'Add-AzLoadBalancerRuleConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzLogProfile',
+		ListItemText: 'Add-AzLogProfile',
+		ResultType: 2,
+		ToolTip: 'Add-AzLogProfile\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzMetricAlertRule',
+		ListItemText: 'Add-AzMetricAlertRule',
+		ResultType: 2,
+		ToolTip: 'Add-AzMetricAlertRule\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzMetricAlertRuleV2',
+		ListItemText: 'Add-AzMetricAlertRuleV2',
+		ResultType: 2,
+		ToolTip: 'Add-AzMetricAlertRuleV2\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzMlWebServiceRegionalProperty',
+		ListItemText: 'Add-AzMlWebServiceRegionalProperty',
+		ResultType: 2,
+		ToolTip: 'Add-AzMlWebServiceRegionalProperty\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzNetworkInterfaceIpConfig',
+		ListItemText: 'Add-AzNetworkInterfaceIpConfig',
+		ResultType: 2,
+		ToolTip: 'Add-AzNetworkInterfaceIpConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzNetworkInterfaceTapConfig',
+		ListItemText: 'Add-AzNetworkInterfaceTapConfig',
+		ResultType: 2,
+		ToolTip: 'Add-AzNetworkInterfaceTapConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzNetworkSecurityRuleConfig',
+		ListItemText: 'Add-AzNetworkSecurityRuleConfig',
+		ResultType: 2,
+		ToolTip: 'Add-AzNetworkSecurityRuleConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzPrivateDnsRecordConfig',
+		ListItemText: 'Add-AzPrivateDnsRecordConfig',
+		ResultType: 2,
+		ToolTip: 'Add-AzPrivateDnsRecordConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzRecoveryServicesAsrReplicationProtectedItemDisk',
+		ListItemText: 'Add-AzRecoveryServicesAsrReplicationProtectedItemDisk',
+		ResultType: 2,
+		ToolTip: 'Add-AzRecoveryServicesAsrReplicationProtectedItemDisk\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzResourceMoverMoveResource',
+		ListItemText: 'Add-AzResourceMoverMoveResource',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-AzResourceMoverMoveResource \\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzRmStorageContainerLegalHold',
+		ListItemText: 'Add-AzRmStorageContainerLegalHold',
+		ResultType: 2,
+		ToolTip: 'Add-AzRmStorageContainerLegalHold\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzRouteConfig',
+		ListItemText: 'Add-AzRouteConfig',
+		ResultType: 2,
+		ToolTip: 'Add-AzRouteConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzRouteFilterRuleConfig',
+		ListItemText: 'Add-AzRouteFilterRuleConfig',
+		ResultType: 2,
+		ToolTip: 'Add-AzRouteFilterRuleConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzRouteServerPeer',
+		ListItemText: 'Add-AzRouteServerPeer',
+		ResultType: 2,
+		ToolTip: 'Add-AzRouteServerPeer\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzRoutingPolicy',
+		ListItemText: 'Add-AzRoutingPolicy',
+		ResultType: 2,
+		ToolTip: 'Add-AzRoutingPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzSecurityAdaptiveNetworkHardening',
+		ListItemText: 'Add-AzSecurityAdaptiveNetworkHardening',
+		ResultType: 2,
+		ToolTip: 'Add-AzSecurityAdaptiveNetworkHardening\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzSecuritySqlVulnerabilityAssessmentBaseline',
+		ListItemText: 'Add-AzSecuritySqlVulnerabilityAssessmentBaseline',
+		ResultType: 2,
+		ToolTip: 'Add-AzSecuritySqlVulnerabilityAssessmentBaseline\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzServiceEndpointPolicyDefinition',
+		ListItemText: 'Add-AzServiceEndpointPolicyDefinition',
+		ResultType: 2,
+		ToolTip: 'Add-AzServiceEndpointPolicyDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzServiceFabricClientCertificate',
+		ListItemText: 'Add-AzServiceFabricClientCertificate',
+		ResultType: 2,
+		ToolTip: 'Add-AzServiceFabricClientCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzServiceFabricManagedClusterClientCertificate',
+		ListItemText: 'Add-AzServiceFabricManagedClusterClientCertificate',
+		ResultType: 2,
+		ToolTip: 'Add-AzServiceFabricManagedClusterClientCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzServiceFabricManagedClusterNetworkSecurityRule',
+		ListItemText: 'Add-AzServiceFabricManagedClusterNetworkSecurityRule',
+		ResultType: 2,
+		ToolTip: 'Add-AzServiceFabricManagedClusterNetworkSecurityRule\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzServiceFabricManagedNodeTypeVMExtension',
+		ListItemText: 'Add-AzServiceFabricManagedNodeTypeVMExtension',
+		ResultType: 2,
+		ToolTip: 'Add-AzServiceFabricManagedNodeTypeVMExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzServiceFabricManagedNodeTypeVMSecret',
+		ListItemText: 'Add-AzServiceFabricManagedNodeTypeVMSecret',
+		ResultType: 2,
+		ToolTip: 'Add-AzServiceFabricManagedNodeTypeVMSecret\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzServiceFabricNode',
+		ListItemText: 'Add-AzServiceFabricNode',
+		ResultType: 2,
+		ToolTip: 'Add-AzServiceFabricNode\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzServiceFabricNodeType',
+		ListItemText: 'Add-AzServiceFabricNodeType',
+		ResultType: 2,
+		ToolTip: 'Add-AzServiceFabricNodeType\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzSqlDatabaseToFailoverGroup',
+		ListItemText: 'Add-AzSqlDatabaseToFailoverGroup',
+		ResultType: 2,
+		ToolTip: 'Add-AzSqlDatabaseToFailoverGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzSqlElasticJobStep',
+		ListItemText: 'Add-AzSqlElasticJobStep',
+		ResultType: 2,
+		ToolTip: 'Add-AzSqlElasticJobStep\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzSqlElasticJobTarget',
+		ListItemText: 'Add-AzSqlElasticJobTarget',
+		ResultType: 2,
+		ToolTip: 'Add-AzSqlElasticJobTarget\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzSqlInstanceKeyVaultKey',
+		ListItemText: 'Add-AzSqlInstanceKeyVaultKey',
+		ResultType: 2,
+		ToolTip: 'Add-AzSqlInstanceKeyVaultKey\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzSqlManagedInstanceTransparentDataEncryptionCertificate',
+		ListItemText: 'Add-AzSqlManagedInstanceTransparentDataEncryptionCertificate',
+		ResultType: 2,
+		ToolTip: 'Add-AzSqlManagedInstanceTransparentDataEncryptionCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzSqlServerKeyVaultKey',
+		ListItemText: 'Add-AzSqlServerKeyVaultKey',
+		ResultType: 2,
+		ToolTip: 'Add-AzSqlServerKeyVaultKey\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzSqlServerTransparentDataEncryptionCertificate',
+		ListItemText: 'Add-AzSqlServerTransparentDataEncryptionCertificate',
+		ResultType: 2,
+		ToolTip: 'Add-AzSqlServerTransparentDataEncryptionCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzStackHCIVMAttestation',
+		ListItemText: 'Add-AzStackHCIVMAttestation',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-AzStackHCIVMAttestation \\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzStorageAccountManagementPolicyAction',
+		ListItemText: 'Add-AzStorageAccountManagementPolicyAction',
+		ResultType: 2,
+		ToolTip: 'Add-AzStorageAccountManagementPolicyAction\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzStorageAccountNetworkRule',
+		ListItemText: 'Add-AzStorageAccountNetworkRule',
+		ResultType: 2,
+		ToolTip: 'Add-AzStorageAccountNetworkRule\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzSynapseDataFlowDebugSessionPackage',
+		ListItemText: 'Add-AzSynapseDataFlowDebugSessionPackage',
+		ResultType: 2,
+		ToolTip: 'Add-AzSynapseDataFlowDebugSessionPackage\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzSynapseKustoPoolLanguageExtension',
+		ListItemText: 'Add-AzSynapseKustoPoolLanguageExtension',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-AzSynapseKustoPoolLanguageExtension \\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzSynapseTriggerSubscription',
+		ListItemText: 'Add-AzSynapseTriggerSubscription',
+		ResultType: 2,
+		ToolTip: 'Add-AzSynapseTriggerSubscription\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzTrafficManagerCustomHeaderToEndpoint',
+		ListItemText: 'Add-AzTrafficManagerCustomHeaderToEndpoint',
+		ResultType: 2,
+		ToolTip: 'Add-AzTrafficManagerCustomHeaderToEndpoint\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzTrafficManagerCustomHeaderToProfile',
+		ListItemText: 'Add-AzTrafficManagerCustomHeaderToProfile',
+		ResultType: 2,
+		ToolTip: 'Add-AzTrafficManagerCustomHeaderToProfile\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzTrafficManagerEndpointConfig',
+		ListItemText: 'Add-AzTrafficManagerEndpointConfig',
+		ResultType: 2,
+		ToolTip: 'Add-AzTrafficManagerEndpointConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzTrafficManagerExpectedStatusCodeRange',
+		ListItemText: 'Add-AzTrafficManagerExpectedStatusCodeRange',
+		ResultType: 2,
+		ToolTip: 'Add-AzTrafficManagerExpectedStatusCodeRange\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzTrafficManagerIpAddressRange',
+		ListItemText: 'Add-AzTrafficManagerIpAddressRange',
+		ResultType: 2,
+		ToolTip: 'Add-AzTrafficManagerIpAddressRange\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzVhd',
+		ListItemText: 'Add-AzVhd',
+		ResultType: 2,
+		ToolTip: 'Add-AzVhd\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzVirtualHubRoute',
+		ListItemText: 'Add-AzVirtualHubRoute',
+		ResultType: 2,
+		ToolTip: 'Add-AzVirtualHubRoute\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzVirtualHubRouteTable',
+		ListItemText: 'Add-AzVirtualHubRouteTable',
+		ResultType: 2,
+		ToolTip: 'Add-AzVirtualHubRouteTable\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzVirtualNetworkGatewayIpConfig',
+		ListItemText: 'Add-AzVirtualNetworkGatewayIpConfig',
+		ResultType: 2,
+		ToolTip: 'Add-AzVirtualNetworkGatewayIpConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzVirtualNetworkPeering',
+		ListItemText: 'Add-AzVirtualNetworkPeering',
+		ResultType: 2,
+		ToolTip: 'Add-AzVirtualNetworkPeering\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzVirtualNetworkSubnetConfig',
+		ListItemText: 'Add-AzVirtualNetworkSubnetConfig',
+		ResultType: 2,
+		ToolTip: 'Add-AzVirtualNetworkSubnetConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzVirtualRouterPeer',
+		ListItemText: 'Add-AzVirtualRouterPeer',
+		ResultType: 2,
+		ToolTip: 'Add-AzVirtualRouterPeer\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzVMAdditionalUnattendContent',
+		ListItemText: 'Add-AzVMAdditionalUnattendContent',
+		ResultType: 2,
+		ToolTip: 'Add-AzVMAdditionalUnattendContent\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzVMDataDisk',
+		ListItemText: 'Add-AzVMDataDisk',
+		ResultType: 2,
+		ToolTip: 'Add-AzVMDataDisk\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzVmGalleryApplication',
+		ListItemText: 'Add-AzVmGalleryApplication',
+		ResultType: 2,
+		ToolTip: 'Add-AzVmGalleryApplication\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzVMNetworkInterface',
+		ListItemText: 'Add-AzVMNetworkInterface',
+		ResultType: 2,
+		ToolTip: 'Add-AzVMNetworkInterface\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzVMSecret',
+		ListItemText: 'Add-AzVMSecret',
+		ResultType: 2,
+		ToolTip: 'Add-AzVMSecret\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzVmssAdditionalUnattendContent',
+		ListItemText: 'Add-AzVmssAdditionalUnattendContent',
+		ResultType: 2,
+		ToolTip: 'Add-AzVmssAdditionalUnattendContent\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzVmssDataDisk',
+		ListItemText: 'Add-AzVmssDataDisk',
+		ResultType: 2,
+		ToolTip: 'Add-AzVmssDataDisk\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzVmssDiagnosticsExtension',
+		ListItemText: 'Add-AzVmssDiagnosticsExtension',
+		ResultType: 2,
+		ToolTip: 'Add-AzVmssDiagnosticsExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzVmssExtension',
+		ListItemText: 'Add-AzVmssExtension',
+		ResultType: 2,
+		ToolTip: 'Add-AzVmssExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzVmssGalleryApplication',
+		ListItemText: 'Add-AzVmssGalleryApplication',
+		ResultType: 2,
+		ToolTip: 'Add-AzVmssGalleryApplication\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzVMSshPublicKey',
+		ListItemText: 'Add-AzVMSshPublicKey',
+		ResultType: 2,
+		ToolTip: 'Add-AzVMSshPublicKey\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzVmssNetworkInterfaceConfiguration',
+		ListItemText: 'Add-AzVmssNetworkInterfaceConfiguration',
+		ResultType: 2,
+		ToolTip: 'Add-AzVmssNetworkInterfaceConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzVmssRunCommand',
+		ListItemText: 'Add-AzVmssRunCommand',
+		ResultType: 2,
+		ToolTip: 'Add-AzVmssRunCommand\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzVmssSecret',
+		ListItemText: 'Add-AzVmssSecret',
+		ResultType: 2,
+		ToolTip: 'Add-AzVmssSecret\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzVmssSshPublicKey',
+		ListItemText: 'Add-AzVmssSshPublicKey',
+		ResultType: 2,
+		ToolTip: 'Add-AzVmssSshPublicKey\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzVmssVMDataDisk',
+		ListItemText: 'Add-AzVmssVMDataDisk',
+		ResultType: 2,
+		ToolTip: 'Add-AzVmssVMDataDisk\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzVmssWinRMListener',
+		ListItemText: 'Add-AzVmssWinRMListener',
+		ResultType: 2,
+		ToolTip: 'Add-AzVmssWinRMListener\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzVpnClientRevokedCertificate',
+		ListItemText: 'Add-AzVpnClientRevokedCertificate',
+		ResultType: 2,
+		ToolTip: 'Add-AzVpnClientRevokedCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzVpnClientRootCertificate',
+		ListItemText: 'Add-AzVpnClientRootCertificate',
+		ResultType: 2,
+		ToolTip: 'Add-AzVpnClientRootCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzWebAppAccessRestrictionRule',
+		ListItemText: 'Add-AzWebAppAccessRestrictionRule',
+		ResultType: 2,
+		ToolTip: 'Add-AzWebAppAccessRestrictionRule\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzWebAppTrafficRouting',
+		ListItemText: 'Add-AzWebAppTrafficRouting',
+		ResultType: 2,
+		ToolTip: 'Add-AzWebAppTrafficRouting\\r\\n'
+	},
+	{
+		CompletionText: 'Add-AzWebtestAlertRule',
+		ListItemText: 'Add-AzWebtestAlertRule',
+		ResultType: 2,
+		ToolTip: 'Add-AzWebtestAlertRule\\r\\n'
+	},
+	{
+		CompletionText: 'Add-BCDataCacheExtension',
+		ListItemText: 'Add-BCDataCacheExtension',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-BCDataCacheExtension \\r\\n'
+	},
+	{
+		CompletionText: 'Add-BitLockerKeyProtector',
+		ListItemText: 'Add-BitLockerKeyProtector',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-BitLockerKeyProtector \\r\\n'
+	},
+	{
+		CompletionText: 'Add-BitsFile',
+		ListItemText: 'Add-BitsFile',
+		ResultType: 2,
+		ToolTip: 'Add-BitsFile\\r\\n'
+	},
+	{
+		CompletionText: 'Add-CertificateEnrollmentPolicyServer',
+		ListItemText: 'Add-CertificateEnrollmentPolicyServer',
+		ResultType: 2,
+		ToolTip: 'Add-CertificateEnrollmentPolicyServer\\r\\n'
+	},
+	{
+		CompletionText: 'Add-Content',
+		ListItemText: 'Add-Content',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-Content [-Path] <string[]> [-Value] <Object[]> [-PassThru] [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Force] [-Credential <pscredential>] [-WhatIf] [-Confirm] [-NoNewline] [-Encoding <Encoding>] [-AsByteStream] [-Stream <string>] [<CommonParameters>]\\r\\n\\r\\nAdd-Content [-Value] <Object[]> -LiteralPath <string[]> [-PassThru] [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Force] [-Credential <pscredential>] [-WhatIf] [-Confirm] [-NoNewline] [-Encoding <Encoding>] [-AsByteStream] [-Stream <string>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Add-DnsClientDohServerAddress',
+		ListItemText: 'Add-DnsClientDohServerAddress',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-DnsClientDohServerAddress \\r\\n'
+	},
+	{
+		CompletionText: 'Add-DnsClientNrptRule',
+		ListItemText: 'Add-DnsClientNrptRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-DnsClientNrptRule \\r\\n'
+	},
+	{
+		CompletionText: 'Add-DtcClusterTMMapping',
+		ListItemText: 'Add-DtcClusterTMMapping',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-DtcClusterTMMapping \\r\\n'
+	},
+	{
+		CompletionText: 'Add-EtwTraceProvider',
+		ListItemText: 'Add-EtwTraceProvider',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-EtwTraceProvider \\r\\n'
+	},
+	{
+		CompletionText: 'Add-History',
+		ListItemText: 'Add-History',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-History [[-InputObject] <psobject[]>] [-Passthru] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Add-InitiatorIdToMaskingSet',
+		ListItemText: 'Add-InitiatorIdToMaskingSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-InitiatorIdToMaskingSet \\r\\n'
+	},
+	{
+		CompletionText: 'Add-JobTrigger',
+		ListItemText: 'Add-JobTrigger',
+		ResultType: 2,
+		ToolTip: 'Add-JobTrigger\\r\\n'
+	},
+	{
+		CompletionText: 'Add-KdsRootKey',
+		ListItemText: 'Add-KdsRootKey',
+		ResultType: 2,
+		ToolTip: 'Add-KdsRootKey\\r\\n'
+	},
+	{
+		CompletionText: 'Add-LocalGroupMember',
+		ListItemText: 'Add-LocalGroupMember',
+		ResultType: 2,
+		ToolTip: 'Add-LocalGroupMember\\r\\n'
+	},
+	{
+		CompletionText: 'Add-Member',
+		ListItemText: 'Add-Member',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-Member -InputObject <psobject> -TypeName <string> [-PassThru] [<CommonParameters>]\\r\\n\\r\\nAdd-Member [-MemberType] <PSMemberTypes> [-Name] <string> [[-Value] <Object>] [[-SecondValue] <Object>] -InputObject <psobject> [-TypeName <string>] [-Force] [-PassThru] [<CommonParameters>]\\r\\n\\r\\nAdd-Member [-NotePropertyName] <string> [-NotePropertyValue] <Object> -InputObject <psobject> [-TypeName <string>] [-Force] [-PassThru] [<CommonParameters>]\\r\\n\\r\\nAdd-Member [-NotePropertyMembers] <IDictionary> -InputObject <psobject> [-TypeName <string>] [-Force] [-PassThru] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Add-MpPreference',
+		ListItemText: 'Add-MpPreference',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-MpPreference \\r\\n'
+	},
+	{
+		CompletionText: 'Add-NetEventNetworkAdapter',
+		ListItemText: 'Add-NetEventNetworkAdapter',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-NetEventNetworkAdapter \\r\\n'
+	},
+	{
+		CompletionText: 'Add-NetEventPacketCaptureProvider',
+		ListItemText: 'Add-NetEventPacketCaptureProvider',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-NetEventPacketCaptureProvider \\r\\n'
+	},
+	{
+		CompletionText: 'Add-NetEventProvider',
+		ListItemText: 'Add-NetEventProvider',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-NetEventProvider \\r\\n'
+	},
+	{
+		CompletionText: 'Add-NetEventVFPProvider',
+		ListItemText: 'Add-NetEventVFPProvider',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-NetEventVFPProvider \\r\\n'
+	},
+	{
+		CompletionText: 'Add-NetEventVmNetworkAdapter',
+		ListItemText: 'Add-NetEventVmNetworkAdapter',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-NetEventVmNetworkAdapter \\r\\n'
+	},
+	{
+		CompletionText: 'Add-NetEventVmSwitch',
+		ListItemText: 'Add-NetEventVmSwitch',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-NetEventVmSwitch \\r\\n'
+	},
+	{
+		CompletionText: 'Add-NetEventVmSwitchProvider',
+		ListItemText: 'Add-NetEventVmSwitchProvider',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-NetEventVmSwitchProvider \\r\\n'
+	},
+	{
+		CompletionText: 'Add-NetEventWFPCaptureProvider',
+		ListItemText: 'Add-NetEventWFPCaptureProvider',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-NetEventWFPCaptureProvider \\r\\n'
+	},
+	{
+		CompletionText: 'Add-NetIPHttpsCertBinding',
+		ListItemText: 'Add-NetIPHttpsCertBinding',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-NetIPHttpsCertBinding \\r\\n'
+	},
+	{
+		CompletionText: 'Add-NetLbfoTeamMember',
+		ListItemText: 'Add-NetLbfoTeamMember',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-NetLbfoTeamMember \\r\\n'
+	},
+	{
+		CompletionText: 'Add-NetLbfoTeamNic',
+		ListItemText: 'Add-NetLbfoTeamNic',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-NetLbfoTeamNic \\r\\n'
+	},
+	{
+		CompletionText: 'Add-NetNatExternalAddress',
+		ListItemText: 'Add-NetNatExternalAddress',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-NetNatExternalAddress \\r\\n'
+	},
+	{
+		CompletionText: 'Add-NetNatStaticMapping',
+		ListItemText: 'Add-NetNatStaticMapping',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-NetNatStaticMapping \\r\\n'
+	},
+	{
+		CompletionText: 'Add-NetSwitchTeamMember',
+		ListItemText: 'Add-NetSwitchTeamMember',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-NetSwitchTeamMember \\r\\n'
+	},
+	{
+		CompletionText: 'Add-OdbcDsn',
+		ListItemText: 'Add-OdbcDsn',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-OdbcDsn \\r\\n'
+	},
+	{
+		CompletionText: 'Add-PartitionAccessPath',
+		ListItemText: 'Add-PartitionAccessPath',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-PartitionAccessPath \\r\\n'
+	},
+	{
+		CompletionText: 'Add-PhysicalDisk',
+		ListItemText: 'Add-PhysicalDisk',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-PhysicalDisk \\r\\n'
+	},
+	{
+		CompletionText: 'Add-PoshGitToProfile',
+		ListItemText: 'Add-PoshGitToProfile',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-PoshGitToProfile \\r\\n'
+	},
+	{
+		CompletionText: 'Add-Printer',
+		ListItemText: 'Add-Printer',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-Printer \\r\\n'
+	},
+	{
+		CompletionText: 'Add-PrinterDriver',
+		ListItemText: 'Add-PrinterDriver',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-PrinterDriver \\r\\n'
+	},
+	{
+		CompletionText: 'Add-PrinterPort',
+		ListItemText: 'Add-PrinterPort',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-PrinterPort \\r\\n'
+	},
+	{
+		CompletionText: 'Add-ProvisionedAppPackage',
+		ListItemText: 'Add-ProvisionedAppPackage',
+		ResultType: 2,
+		ToolTip: 'Add-ProvisionedAppPackage'
+	},
+	{
+		CompletionText: 'Add-ProvisionedAppSharedPackageContainer',
+		ListItemText: 'Add-ProvisionedAppSharedPackageContainer',
+		ResultType: 2,
+		ToolTip: 'Add-ProvisionedAppSharedPackageContainer'
+	},
+	{
+		CompletionText: 'Add-ProvisionedAppxPackage',
+		ListItemText: 'Add-ProvisionedAppxPackage',
+		ResultType: 2,
+		ToolTip: 'Add-ProvisionedAppxPackage'
+	},
+	{
+		CompletionText: 'Add-ProvisioningPackage',
+		ListItemText: 'Add-ProvisioningPackage',
+		ResultType: 2,
+		ToolTip: 'Add-ProvisioningPackage'
+	},
+	{
+		CompletionText: 'Add-SignerRule',
+		ListItemText: 'Add-SignerRule',
+		ResultType: 2,
+		ToolTip: 'Add-SignerRule\\r\\n'
+	},
+	{
+		CompletionText: 'Add-StorageFaultDomain',
+		ListItemText: 'Add-StorageFaultDomain',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-StorageFaultDomain \\r\\n'
+	},
+	{
+		CompletionText: 'Add-TargetPortToMaskingSet',
+		ListItemText: 'Add-TargetPortToMaskingSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-TargetPortToMaskingSet \\r\\n'
+	},
+	{
+		CompletionText: 'Add-TrustedProvisioningCertificate',
+		ListItemText: 'Add-TrustedProvisioningCertificate',
+		ResultType: 2,
+		ToolTip: 'Add-TrustedProvisioningCertificate'
+	},
+	{
+		CompletionText: 'Add-Type',
+		ListItemText: 'Add-Type',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-Type [-TypeDefinition] <string> [-Language <Language>] [-ReferencedAssemblies <string[]>] [-OutputAssembly <string>] [-OutputType <OutputAssemblyType>] [-PassThru] [-IgnoreWarnings] [-CompilerOptions <string[]>] [<CommonParameters>]\\r\\n\\r\\nAdd-Type [-Name] <string> [-MemberDefinition] <string[]> [-Namespace <string>] [-UsingNamespace <string[]>] [-Language <Language>] [-ReferencedAssemblies <string[]>] [-OutputAssembly <string>] [-OutputType <OutputAssemblyType>] [-PassThru] [-IgnoreWarnings] [-CompilerOptions <string[]>] [<CommonParameters>]\\r\\n\\r\\nAdd-Type [-Path] <string[]> [-ReferencedAssemblies <string[]>] [-OutputAssembly <string>] [-OutputType <OutputAssemblyType>] [-PassThru] [-IgnoreWarnings] [-CompilerOptions <string[]>] [<CommonParameters>]\\r\\n\\r\\nAdd-Type -LiteralPath <string[]> [-ReferencedAssemblies <string[]>] [-OutputAssembly <string>] [-OutputType <OutputAssemblyType>] [-PassThru] [-IgnoreWarnings] [-CompilerOptions <string[]>] [<CommonParameters>]\\r\\n\\r\\nAdd-Type -AssemblyName <string[]> [-PassThru] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Add-VirtualDiskToMaskingSet',
+		ListItemText: 'Add-VirtualDiskToMaskingSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-VirtualDiskToMaskingSet \\r\\n'
+	},
+	{
+		CompletionText: 'Add-VMAssignableDevice',
+		ListItemText: 'Add-VMAssignableDevice',
+		ResultType: 2,
+		ToolTip: 'Add-VMAssignableDevice\\r\\n'
+	},
+	{
+		CompletionText: 'Add-VMDirectVirtualDisk',
+		ListItemText: 'Add-VMDirectVirtualDisk',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-VMDirectVirtualDisk \\r\\n'
+	},
+	{
+		CompletionText: 'Add-VMDvdDrive',
+		ListItemText: 'Add-VMDvdDrive',
+		ResultType: 2,
+		ToolTip: 'Add-VMDvdDrive\\r\\n'
+	},
+	{
+		CompletionText: 'Add-VMFibreChannelHba',
+		ListItemText: 'Add-VMFibreChannelHba',
+		ResultType: 2,
+		ToolTip: 'Add-VMFibreChannelHba\\r\\n'
+	},
+	{
+		CompletionText: 'Add-VMGpuPartitionAdapter',
+		ListItemText: 'Add-VMGpuPartitionAdapter',
+		ResultType: 2,
+		ToolTip: 'Add-VMGpuPartitionAdapter\\r\\n'
+	},
+	{
+		CompletionText: 'Add-VMGroupMember',
+		ListItemText: 'Add-VMGroupMember',
+		ResultType: 2,
+		ToolTip: 'Add-VMGroupMember\\r\\n'
+	},
+	{
+		CompletionText: 'Add-VMHardDiskDrive',
+		ListItemText: 'Add-VMHardDiskDrive',
+		ResultType: 2,
+		ToolTip: 'Add-VMHardDiskDrive\\r\\n'
+	},
+	{
+		CompletionText: 'Add-VMHostAssignableDevice',
+		ListItemText: 'Add-VMHostAssignableDevice',
+		ResultType: 2,
+		ToolTip: 'Add-VMHostAssignableDevice\\r\\n'
+	},
+	{
+		CompletionText: 'Add-VMKeyStorageDrive',
+		ListItemText: 'Add-VMKeyStorageDrive',
+		ResultType: 2,
+		ToolTip: 'Add-VMKeyStorageDrive\\r\\n'
+	},
+	{
+		CompletionText: 'Add-VMMigrationNetwork',
+		ListItemText: 'Add-VMMigrationNetwork',
+		ResultType: 2,
+		ToolTip: 'Add-VMMigrationNetwork\\r\\n'
+	},
+	{
+		CompletionText: 'Add-VMNetworkAdapter',
+		ListItemText: 'Add-VMNetworkAdapter',
+		ResultType: 2,
+		ToolTip: 'Add-VMNetworkAdapter\\r\\n'
+	},
+	{
+		CompletionText: 'Add-VMNetworkAdapterAcl',
+		ListItemText: 'Add-VMNetworkAdapterAcl',
+		ResultType: 2,
+		ToolTip: 'Add-VMNetworkAdapterAcl\\r\\n'
+	},
+	{
+		CompletionText: 'Add-VMNetworkAdapterExtendedAcl',
+		ListItemText: 'Add-VMNetworkAdapterExtendedAcl',
+		ResultType: 2,
+		ToolTip: 'Add-VMNetworkAdapterExtendedAcl\\r\\n'
+	},
+	{
+		CompletionText: 'Add-VMNetworkAdapterRoutingDomainMapping',
+		ListItemText: 'Add-VMNetworkAdapterRoutingDomainMapping',
+		ResultType: 2,
+		ToolTip: 'Add-VMNetworkAdapterRoutingDomainMapping\\r\\n'
+	},
+	{
+		CompletionText: 'Add-VMPmemController',
+		ListItemText: 'Add-VMPmemController',
+		ResultType: 2,
+		ToolTip: 'Add-VMPmemController\\r\\n'
+	},
+	{
+		CompletionText: 'Add-VMRemoteFx3dVideoAdapter',
+		ListItemText: 'Add-VMRemoteFx3dVideoAdapter',
+		ResultType: 2,
+		ToolTip: 'Add-VMRemoteFx3dVideoAdapter\\r\\n'
+	},
+	{
+		CompletionText: 'Add-VMScsiController',
+		ListItemText: 'Add-VMScsiController',
+		ResultType: 2,
+		ToolTip: 'Add-VMScsiController\\r\\n'
+	},
+	{
+		CompletionText: 'Add-VMStoragePath',
+		ListItemText: 'Add-VMStoragePath',
+		ResultType: 2,
+		ToolTip: 'Add-VMStoragePath\\r\\n'
+	},
+	{
+		CompletionText: 'Add-VMSwitch',
+		ListItemText: 'Add-VMSwitch',
+		ResultType: 2,
+		ToolTip: 'Add-VMSwitch\\r\\n'
+	},
+	{
+		CompletionText: 'Add-VMSwitchExtensionPortFeature',
+		ListItemText: 'Add-VMSwitchExtensionPortFeature',
+		ResultType: 2,
+		ToolTip: 'Add-VMSwitchExtensionPortFeature\\r\\n'
+	},
+	{
+		CompletionText: 'Add-VMSwitchExtensionSwitchFeature',
+		ListItemText: 'Add-VMSwitchExtensionSwitchFeature',
+		ResultType: 2,
+		ToolTip: 'Add-VMSwitchExtensionSwitchFeature\\r\\n'
+	},
+	{
+		CompletionText: 'Add-VMSwitchTeamMember',
+		ListItemText: 'Add-VMSwitchTeamMember',
+		ResultType: 2,
+		ToolTip: 'Add-VMSwitchTeamMember\\r\\n'
+	},
+	{
+		CompletionText: 'Add-VpnConnection',
+		ListItemText: 'Add-VpnConnection',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-VpnConnection \\r\\n'
+	},
+	{
+		CompletionText: 'Add-VpnConnectionRoute',
+		ListItemText: 'Add-VpnConnectionRoute',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-VpnConnectionRoute \\r\\n'
+	},
+	{
+		CompletionText: 'Add-VpnConnectionTriggerApplication',
+		ListItemText: 'Add-VpnConnectionTriggerApplication',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-VpnConnectionTriggerApplication \\r\\n'
+	},
+	{
+		CompletionText: 'Add-VpnConnectionTriggerDnsConfiguration',
+		ListItemText: 'Add-VpnConnectionTriggerDnsConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-VpnConnectionTriggerDnsConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Add-VpnConnectionTriggerTrustedNetwork',
+		ListItemText: 'Add-VpnConnectionTriggerTrustedNetwork',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-VpnConnectionTriggerTrustedNetwork \\r\\n'
+	},
+	{
+		CompletionText: 'Add-WindowsCapability',
+		ListItemText: 'Add-WindowsCapability',
+		ResultType: 2,
+		ToolTip: 'Add-WindowsCapability\\r\\n'
+	},
+	{
+		CompletionText: 'Add-WindowsDriver',
+		ListItemText: 'Add-WindowsDriver',
+		ResultType: 2,
+		ToolTip: 'Add-WindowsDriver\\r\\n'
+	},
+	{
+		CompletionText: 'Add-WindowsImage',
+		ListItemText: 'Add-WindowsImage',
+		ResultType: 2,
+		ToolTip: 'Add-WindowsImage\\r\\n'
+	},
+	{
+		CompletionText: 'Add-WindowsPackage',
+		ListItemText: 'Add-WindowsPackage',
+		ResultType: 2,
+		ToolTip: 'Add-WindowsPackage\\r\\n'
+	},
+	{
+		CompletionText: 'AfterAll',
+		ListItemText: 'AfterAll',
+		ResultType: 2,
+		ToolTip: '\\r\\nAfterAll \\r\\n'
+	},
+	{
+		CompletionText: 'AfterEach',
+		ListItemText: 'AfterEach',
+		ResultType: 2,
+		ToolTip: '\\r\\nAfterEach \\r\\n'
+	},
+	{
+		CompletionText: 'agentactivationruntimestarter.exe',
+		ListItemText: 'agentactivationruntimestarter.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\agentactivationruntimestarter.exe'
+	},
+	{
+		CompletionText: 'AgentService.exe',
+		ListItemText: 'AgentService.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\AgentService.exe'
+	},
+	{
+		CompletionText: 'AggregatorHost.exe',
+		ListItemText: 'AggregatorHost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\AggregatorHost.exe'
+	},
+	{
+		CompletionText: 'aitstatic.exe',
+		ListItemText: 'aitstatic.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\aitstatic.exe'
+	},
+	{
+		CompletionText: 'alg.exe',
+		ListItemText: 'alg.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\alg.exe'
+	},
+	{
+		CompletionText: 'algm',
+		ListItemText: 'algm',
+		ResultType: 2,
+		ToolTip: 'algm'
+	},
+	{
+		CompletionText: 'AppHostRegistrationVerifier.exe',
+		ListItemText: 'AppHostRegistrationVerifier.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\AppHostRegistrationVerifier.exe'
+	},
+	{
+		CompletionText: 'appidcertstorecheck.exe',
+		ListItemText: 'appidcertstorecheck.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\appidcertstorecheck.exe'
+	},
+	{
+		CompletionText: 'appidpolicyconverter.exe',
+		ListItemText: 'appidpolicyconverter.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\appidpolicyconverter.exe'
+	},
+	{
+		CompletionText: 'appidtel.exe',
+		ListItemText: 'appidtel.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\appidtel.exe'
+	},
+	{
+		CompletionText: 'AppInstallerBackgroundUpdate.exe',
+		ListItemText: 'AppInstallerBackgroundUpdate.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\AppInstallerBackgroundUpdate.exe'
+	},
+	{
+		CompletionText: 'appletviewer.exe',
+		ListItemText: 'appletviewer.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\appletviewer.exe'
+	},
+	{
+		CompletionText: 'ApplicationFrameHost.exe',
+		ListItemText: 'ApplicationFrameHost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\ApplicationFrameHost.exe'
+	},
+	{
+		CompletionText: 'Apply-WindowsUnattend',
+		ListItemText: 'Apply-WindowsUnattend',
+		ResultType: 2,
+		ToolTip: 'Apply-WindowsUnattend'
+	},
+	{
+		CompletionText: 'ApplySettingsTemplateCatalog.exe',
+		ListItemText: 'ApplySettingsTemplateCatalog.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\ApplySettingsTemplateCatalog.exe'
+	},
+	{
+		CompletionText: 'ApplyTrustOffline.exe',
+		ListItemText: 'ApplyTrustOffline.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\ApplyTrustOffline.exe'
+	},
+	{
+		CompletionText: 'Approve-AzEventHubPrivateEndpointConnection',
+		ListItemText: 'Approve-AzEventHubPrivateEndpointConnection',
+		ResultType: 2,
+		ToolTip: '\\r\\nApprove-AzEventHubPrivateEndpointConnection \\r\\n'
+	},
+	{
+		CompletionText: 'Approve-AzPrivateEndpointConnection',
+		ListItemText: 'Approve-AzPrivateEndpointConnection',
+		ResultType: 2,
+		ToolTip: 'Approve-AzPrivateEndpointConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Approve-AzServiceBusPrivateEndpointConnection',
+		ListItemText: 'Approve-AzServiceBusPrivateEndpointConnection',
+		ResultType: 2,
+		ToolTip: '\\r\\nApprove-AzServiceBusPrivateEndpointConnection \\r\\n'
+	},
+	{
+		CompletionText: 'ApproveChildRequest.exe',
+		ListItemText: 'ApproveChildRequest.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\ApproveChildRequest.exe'
+	},
+	{
+		CompletionText: 'AppVClient.exe',
+		ListItemText: 'AppVClient.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\AppVClient.exe'
+	},
+	{
+		CompletionText: 'AppVDllSurrogate.exe',
+		ListItemText: 'AppVDllSurrogate.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\AppVDllSurrogate.exe'
+	},
+	{
+		CompletionText: 'appverif.exe',
+		ListItemText: 'appverif.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\appverif.exe'
+	},
+	{
+		CompletionText: 'AppVNice.exe',
+		ListItemText: 'AppVNice.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\AppVNice.exe'
+	},
+	{
+		CompletionText: 'AppVShNotify.exe',
+		ListItemText: 'AppVShNotify.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\AppVShNotify.exe'
+	},
+	{
+		CompletionText: 'appwiz.cpl',
+		ListItemText: 'appwiz.cpl',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\appwiz.cpl'
+	},
+	{
+		CompletionText: 'ARP.EXE',
+		ListItemText: 'ARP.EXE',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\ARP.EXE'
+	},
+	{
+		CompletionText: 'aslr-manager.ps1',
+		ListItemText: 'aslr-manager.ps1',
+		ResultType: 2,
+		ToolTip: 'aslr-manager.ps1 [-Action] <string> [-paths] <string[]> [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Assert-MockCalled',
+		ListItemText: 'Assert-MockCalled',
+		ResultType: 2,
+		ToolTip: '\\r\\nAssert-MockCalled \\r\\n'
+	},
+	{
+		CompletionText: 'Assert-VerifiableMocks',
+		ListItemText: 'Assert-VerifiableMocks',
+		ResultType: 2,
+		ToolTip: '\\r\\nAssert-VerifiableMocks \\r\\n'
+	},
+	{
+		CompletionText: 'AssignedAccessGuard.exe',
+		ListItemText: 'AssignedAccessGuard.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\AssignedAccessGuard.exe'
+	},
+	{
+		CompletionText: 'AsusDownloadAgent.exe',
+		ListItemText: 'AsusDownloadAgent.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\AsusDownloadAgent.exe'
+	},
+	{
+		CompletionText: 'AsusDownLoadLicense.exe',
+		ListItemText: 'AsusDownLoadLicense.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\AsusDownLoadLicense.exe'
+	},
+	{
+		CompletionText: 'AsusUpdateCheck.exe',
+		ListItemText: 'AsusUpdateCheck.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\AsusUpdateCheck.exe'
+	},
+	{
+		CompletionText: 'at.exe',
+		ListItemText: 'at.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\at.exe'
+	},
+	{
+		CompletionText: 'AtBroker.exe',
+		ListItemText: 'AtBroker.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\AtBroker.exe'
+	},
+	{
+		CompletionText: 'attrib.exe',
+		ListItemText: 'attrib.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\attrib.exe'
+	},
+	{
+		CompletionText: 'audiodg.exe',
+		ListItemText: 'audiodg.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\audiodg.exe'
+	},
+	{
+		CompletionText: 'auditpol.exe',
+		ListItemText: 'auditpol.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\auditpol.exe'
+	},
+	{
+		CompletionText: 'AuthHost.exe',
+		ListItemText: 'AuthHost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\AuthHost.exe'
+	},
+	{
+		CompletionText: 'autochk.exe',
+		ListItemText: 'autochk.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\autochk.exe'
+	},
+	{
+		CompletionText: 'AxInstUI.exe',
+		ListItemText: 'AxInstUI.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\AxInstUI.exe'
+	},
+	{
+		CompletionText: 'az.cmd',
+		ListItemText: 'az.cmd',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Microsoft SDKs\\Azure\\CLI2\\wbin\\az.cmd'
+	},
+	{
+		CompletionText: 'azman.msc',
+		ListItemText: 'azman.msc',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\azman.msc'
+	},
+	{
+		CompletionText: 'azps.ps1',
+		ListItemText: 'azps.ps1',
+		ResultType: 2,
+		ToolTip: 'azps.ps1 \\r\\n'
+	},
+	{
+		CompletionText: 'B:',
+		ListItemText: 'B:',
+		ResultType: 2,
+		ToolTip: '\\r\\nB: \\r\\n'
+	},
+	{
+		CompletionText: 'baaupdate.exe',
+		ListItemText: 'baaupdate.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\baaupdate.exe'
+	},
+	{
+		CompletionText: 'backgroundTaskHost.exe',
+		ListItemText: 'backgroundTaskHost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\backgroundTaskHost.exe'
+	},
+	{
+		CompletionText: 'BackgroundTransferHost.exe',
+		ListItemText: 'BackgroundTransferHost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\BackgroundTransferHost.exe'
+	},
+	{
+		CompletionText: 'Backup-AzApiManagement',
+		ListItemText: 'Backup-AzApiManagement',
+		ResultType: 2,
+		ToolTip: 'Backup-AzApiManagement\\r\\n'
+	},
+	{
+		CompletionText: 'Backup-AzDataProtectionBackupInstanceAdhoc',
+		ListItemText: 'Backup-AzDataProtectionBackupInstanceAdhoc',
+		ResultType: 2,
+		ToolTip: '\\r\\nBackup-AzDataProtectionBackupInstanceAdhoc \\r\\n'
+	},
+	{
+		CompletionText: 'Backup-AzKeyVault',
+		ListItemText: 'Backup-AzKeyVault',
+		ResultType: 2,
+		ToolTip: 'Backup-AzKeyVault\\r\\n'
+	},
+	{
+		CompletionText: 'Backup-AzKeyVaultCertificate',
+		ListItemText: 'Backup-AzKeyVaultCertificate',
+		ResultType: 2,
+		ToolTip: 'Backup-AzKeyVaultCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Backup-AzKeyVaultKey',
+		ListItemText: 'Backup-AzKeyVaultKey',
+		ResultType: 2,
+		ToolTip: 'Backup-AzKeyVaultKey\\r\\n'
+	},
+	{
+		CompletionText: 'Backup-AzKeyVaultManagedStorageAccount',
+		ListItemText: 'Backup-AzKeyVaultManagedStorageAccount',
+		ResultType: 2,
+		ToolTip: 'Backup-AzKeyVaultManagedStorageAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Backup-AzKeyVaultSecret',
+		ListItemText: 'Backup-AzKeyVaultSecret',
+		ResultType: 2,
+		ToolTip: 'Backup-AzKeyVaultSecret\\r\\n'
+	},
+	{
+		CompletionText: 'Backup-AzRecoveryServicesBackupItem',
+		ListItemText: 'Backup-AzRecoveryServicesBackupItem',
+		ResultType: 2,
+		ToolTip: 'Backup-AzRecoveryServicesBackupItem\\r\\n'
+	},
+	{
+		CompletionText: 'Backup-BitLockerKeyProtector',
+		ListItemText: 'Backup-BitLockerKeyProtector',
+		ResultType: 2,
+		ToolTip: '\\r\\nBackup-BitLockerKeyProtector \\r\\n'
+	},
+	{
+		CompletionText: 'BackupToAAD-BitLockerKeyProtector',
+		ListItemText: 'BackupToAAD-BitLockerKeyProtector',
+		ResultType: 2,
+		ToolTip: '\\r\\nBackupToAAD-BitLockerKeyProtector \\r\\n'
+	},
+	{
+		CompletionText: 'bash.exe',
+		ListItemText: 'bash.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\bash.exe'
+	},
+	{
+		CompletionText: 'bcdboot.exe',
+		ListItemText: 'bcdboot.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\bcdboot.exe'
+	},
+	{
+		CompletionText: 'bcdedit.exe',
+		ListItemText: 'bcdedit.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\bcdedit.exe'
+	},
+	{
+		CompletionText: 'bdechangepin.exe',
+		ListItemText: 'bdechangepin.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\bdechangepin.exe'
+	},
+	{
+		CompletionText: 'BdeHdCfg.exe',
+		ListItemText: 'BdeHdCfg.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\BdeHdCfg.exe'
+	},
+	{
+		CompletionText: 'BdeUISrv.exe',
+		ListItemText: 'BdeUISrv.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\BdeUISrv.exe'
+	},
+	{
+		CompletionText: 'bdeunlock.exe',
+		ListItemText: 'bdeunlock.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\bdeunlock.exe'
+	},
+	{
+		CompletionText: 'BeforeAll',
+		ListItemText: 'BeforeAll',
+		ResultType: 2,
+		ToolTip: '\\r\\nBeforeAll \\r\\n'
+	},
+	{
+		CompletionText: 'BeforeEach',
+		ListItemText: 'BeforeEach',
+		ResultType: 2,
+		ToolTip: '\\r\\nBeforeEach \\r\\n'
+	},
+	{
+		CompletionText: 'bfsvc.exe',
+		ListItemText: 'bfsvc.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\bfsvc.exe'
+	},
+	{
+		CompletionText: 'BioIso.exe',
+		ListItemText: 'BioIso.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\BioIso.exe'
+	},
+	{
+		CompletionText: 'BitLockerDeviceEncryption.exe',
+		ListItemText: 'BitLockerDeviceEncryption.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\BitLockerDeviceEncryption.exe'
+	},
+	{
+		CompletionText: 'BitLockerWizard.exe',
+		ListItemText: 'BitLockerWizard.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\BitLockerWizard.exe'
+	},
+	{
+		CompletionText: 'BitLockerWizardElev.exe',
+		ListItemText: 'BitLockerWizardElev.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\BitLockerWizardElev.exe'
+	},
+	{
+		CompletionText: 'bitsadmin.exe',
+		ListItemText: 'bitsadmin.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\bitsadmin.exe'
+	},
+	{
+		CompletionText: 'Block-FileShareAccess',
+		ListItemText: 'Block-FileShareAccess',
+		ResultType: 2,
+		ToolTip: '\\r\\nBlock-FileShareAccess \\r\\n'
+	},
+	{
+		CompletionText: 'Block-SmbClientAccessToServer',
+		ListItemText: 'Block-SmbClientAccessToServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nBlock-SmbClientAccessToServer \\r\\n'
+	},
+	{
+		CompletionText: 'Block-SmbShareAccess',
+		ListItemText: 'Block-SmbShareAccess',
+		ResultType: 2,
+		ToolTip: '\\r\\nBlock-SmbShareAccess \\r\\n'
+	},
+	{
+		CompletionText: 'blsmba',
+		ListItemText: 'blsmba',
+		ResultType: 2,
+		ToolTip: 'blsmba'
+	},
+	{
+		CompletionText: 'blsmbclas',
+		ListItemText: 'blsmbclas',
+		ResultType: 2,
+		ToolTip: 'blsmbclas'
+	},
+	{
+		CompletionText: 'bootim.exe',
+		ListItemText: 'bootim.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\bootim.exe'
+	},
+	{
+		CompletionText: 'bootsect.exe',
+		ListItemText: 'bootsect.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\bootsect.exe'
+	},
+	{
+		CompletionText: 'bridgeunattend.exe',
+		ListItemText: 'bridgeunattend.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\bridgeunattend.exe'
+	},
+	{
+		CompletionText: 'browserexport.exe',
+		ListItemText: 'browserexport.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\browserexport.exe'
+	},
+	{
+		CompletionText: 'browser_broker.exe',
+		ListItemText: 'browser_broker.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\browser_broker.exe'
+	},
+	{
+		CompletionText: 'bthprops.cpl',
+		ListItemText: 'bthprops.cpl',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\bthprops.cpl'
+	},
+	{
+		CompletionText: 'bthudtask.exe',
+		ListItemText: 'bthudtask.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\bthudtask.exe'
+	},
+	{
+		CompletionText: 'ByteCodeGenerator.exe',
+		ListItemText: 'ByteCodeGenerator.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\ByteCodeGenerator.exe'
+	},
+	{
+		CompletionText: 'c',
+		ListItemText: 'c',
+		ResultType: 2,
+		ToolTip: 'code-insiders.cmd'
+	},
+	{
+		CompletionText: 'C:',
+		ListItemText: 'C:',
+		ResultType: 2,
+		ToolTip: '\\r\\nC: \\r\\n'
+	},
+	{
+		CompletionText: 'cacls.exe',
+		ListItemText: 'cacls.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\cacls.exe'
+	},
+	{
+		CompletionText: 'calc.exe',
+		ListItemText: 'calc.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\calc.exe'
+	},
+	{
+		CompletionText: 'CameraSettingsUIHost.exe',
+		ListItemText: 'CameraSettingsUIHost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\CameraSettingsUIHost.exe'
+	},
+	{
+		CompletionText: 'CastSrv.exe',
+		ListItemText: 'CastSrv.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\CastSrv.exe'
+	},
+	{
+		CompletionText: 'cat',
+		ListItemText: 'cat',
+		ResultType: 2,
+		ToolTip: 'Get-Content'
+	},
+	{
+		CompletionText: 'CCG.exe',
+		ListItemText: 'CCG.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\CCG.exe'
+	},
+	{
+		CompletionText: 'cd',
+		ListItemText: 'cd',
+		ResultType: 2,
+		ToolTip: 'Set-Location'
+	},
+	{
+		CompletionText: 'cd..',
+		ListItemText: 'cd..',
+		ResultType: 2,
+		ToolTip: '\\r\\ncd.. \\r\\n'
+	},
+	{
+		CompletionText: 'cd\\',
+		ListItemText: 'cd\\',
+		ResultType: 2,
+		ToolTip: '\\r\\ncd\\ \\r\\n'
+	},
+	{
+		CompletionText: 'cd~',
+		ListItemText: 'cd~',
+		ResultType: 2,
+		ToolTip: '\\r\\ncd~ \\r\\n'
+	},
+	{
+		CompletionText: 'CertEnrollCtrl.exe',
+		ListItemText: 'CertEnrollCtrl.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\CertEnrollCtrl.exe'
+	},
+	{
+		CompletionText: 'certlm.msc',
+		ListItemText: 'certlm.msc',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\certlm.msc'
+	},
+	{
+		CompletionText: 'certmgr.msc',
+		ListItemText: 'certmgr.msc',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\certmgr.msc'
+	},
+	{
+		CompletionText: 'certreq.exe',
+		ListItemText: 'certreq.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\certreq.exe'
+	},
+	{
+		CompletionText: 'certutil.exe',
+		ListItemText: 'certutil.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\certutil.exe'
+	},
+	{
+		CompletionText: 'cfy',
+		ListItemText: 'cfy',
+		ResultType: 2,
+		ToolTip: 'cfy'
+	},
+	{
+		CompletionText: 'change.exe',
+		ListItemText: 'change.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\change.exe'
+	},
+	{
+		CompletionText: 'changepk.exe',
+		ListItemText: 'changepk.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\changepk.exe'
+	},
+	{
+		CompletionText: 'charmap.exe',
+		ListItemText: 'charmap.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\charmap.exe'
+	},
+	{
+		CompletionText: 'chcp.com',
+		ListItemText: 'chcp.com',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\chcp.com'
+	},
+	{
+		CompletionText: 'chdir',
+		ListItemText: 'chdir',
+		ResultType: 2,
+		ToolTip: 'Set-Location'
+	},
+	{
+		CompletionText: 'CheckNetIsolation.exe',
+		ListItemText: 'CheckNetIsolation.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\CheckNetIsolation.exe'
+	},
+	{
+		CompletionText: 'Checkpoint-VM',
+		ListItemText: 'Checkpoint-VM',
+		ResultType: 2,
+		ToolTip: 'Checkpoint-VM\\r\\n'
+	},
+	{
+		CompletionText: 'chglogon.exe',
+		ListItemText: 'chglogon.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\chglogon.exe'
+	},
+	{
+		CompletionText: 'chgport.exe',
+		ListItemText: 'chgport.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\chgport.exe'
+	},
+	{
+		CompletionText: 'chgusr.exe',
+		ListItemText: 'chgusr.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\chgusr.exe'
+	},
+	{
+		CompletionText: 'chkdsk.exe',
+		ListItemText: 'chkdsk.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\chkdsk.exe'
+	},
+	{
+		CompletionText: 'chkntfs.exe',
+		ListItemText: 'chkntfs.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\chkntfs.exe'
+	},
+	{
+		CompletionText: 'choco.exe',
+		ListItemText: 'choco.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\ProgramData\\chocolatey\\bin\\choco.exe'
+	},
+	{
+		CompletionText: 'choice.exe',
+		ListItemText: 'choice.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\choice.exe'
+	},
+	{
+		CompletionText: 'CIDiag.exe',
+		ListItemText: 'CIDiag.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\CIDiag.exe'
+	},
+	{
+		CompletionText: 'cipher.exe',
+		ListItemText: 'cipher.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\cipher.exe'
+	},
+	{
+		CompletionText: 'CiTool.exe',
+		ListItemText: 'CiTool.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\CiTool.exe'
+	},
+	{
+		CompletionText: 'clc',
+		ListItemText: 'clc',
+		ResultType: 2,
+		ToolTip: 'Clear-Content'
+	},
+	{
+		CompletionText: 'cleanmgr.exe',
+		ListItemText: 'cleanmgr.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\cleanmgr.exe'
+	},
+	{
+		CompletionText: 'clear',
+		ListItemText: 'clear',
+		ResultType: 2,
+		ToolTip: 'Clear-Host'
+	},
+	{
+		CompletionText: 'Clear-AssignedAccess',
+		ListItemText: 'Clear-AssignedAccess',
+		ResultType: 2,
+		ToolTip: '\\r\\nClear-AssignedAccess \\r\\n'
+	},
+	{
+		CompletionText: 'Clear-AzAppConfigurationDeletedStore',
+		ListItemText: 'Clear-AzAppConfigurationDeletedStore',
+		ResultType: 2,
+		ToolTip: '\\r\\nClear-AzAppConfigurationDeletedStore \\r\\n'
+	},
+	{
+		CompletionText: 'Clear-AzCdnEndpointContent',
+		ListItemText: 'Clear-AzCdnEndpointContent',
+		ResultType: 2,
+		ToolTip: '\\r\\nClear-AzCdnEndpointContent \\r\\n'
+	},
+	{
+		CompletionText: 'Clear-AzConfig',
+		ListItemText: 'Clear-AzConfig',
+		ResultType: 2,
+		ToolTip: 'Clear-AzConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Clear-AzContext',
+		ListItemText: 'Clear-AzContext',
+		ResultType: 2,
+		ToolTip: 'Clear-AzContext\\r\\n'
+	},
+	{
+		CompletionText: 'Clear-AzDefault',
+		ListItemText: 'Clear-AzDefault',
+		ResultType: 2,
+		ToolTip: 'Clear-AzDefault\\r\\n'
+	},
+	{
+		CompletionText: 'Clear-AzFrontDoorCdnEndpointContent',
+		ListItemText: 'Clear-AzFrontDoorCdnEndpointContent',
+		ResultType: 2,
+		ToolTip: '\\r\\nClear-AzFrontDoorCdnEndpointContent \\r\\n'
+	},
+	{
+		CompletionText: 'Clear-AzSqlDatabaseVulnerabilityAssessmentRuleBaseline',
+		ListItemText: 'Clear-AzSqlDatabaseVulnerabilityAssessmentRuleBaseline',
+		ResultType: 2,
+		ToolTip: 'Clear-AzSqlDatabaseVulnerabilityAssessmentRuleBaseline\\r\\n'
+	},
+	{
+		CompletionText: 'Clear-AzSqlDatabaseVulnerabilityAssessmentSetting',
+		ListItemText: 'Clear-AzSqlDatabaseVulnerabilityAssessmentSetting',
+		ResultType: 2,
+		ToolTip: 'Clear-AzSqlDatabaseVulnerabilityAssessmentSetting'
+	},
+	{
+		CompletionText: 'Clear-AzSqlInstanceDatabaseVulnerabilityAssessmentRuleBaseline',
+		ListItemText: 'Clear-AzSqlInstanceDatabaseVulnerabilityAssessmentRuleBaseline',
+		ResultType: 2,
+		ToolTip: 'Clear-AzSqlInstanceDatabaseVulnerabilityAssessmentRuleBaseline\\r\\n'
+	},
+	{
+		CompletionText: 'Clear-AzSqlInstanceDatabaseVulnerabilityAssessmentSetting',
+		ListItemText: 'Clear-AzSqlInstanceDatabaseVulnerabilityAssessmentSetting',
+		ResultType: 2,
+		ToolTip: 'Clear-AzSqlInstanceDatabaseVulnerabilityAssessmentSetting'
+	},
+	{
+		CompletionText: 'Clear-AzSqlInstanceVulnerabilityAssessmentSetting',
+		ListItemText: 'Clear-AzSqlInstanceVulnerabilityAssessmentSetting',
+		ResultType: 2,
+		ToolTip: 'Clear-AzSqlInstanceVulnerabilityAssessmentSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Clear-AzSqlServerVulnerabilityAssessmentSetting',
+		ListItemText: 'Clear-AzSqlServerVulnerabilityAssessmentSetting',
+		ResultType: 2,
+		ToolTip: 'Clear-AzSqlServerVulnerabilityAssessmentSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Clear-AzSynapseSqlAdvancedThreatProtectionSetting',
+		ListItemText: 'Clear-AzSynapseSqlAdvancedThreatProtectionSetting',
+		ResultType: 2,
+		ToolTip: 'Clear-AzSynapseSqlAdvancedThreatProtectionSetting'
+	},
+	{
+		CompletionText: 'Clear-AzSynapseSqlPoolAdvancedThreatProtectionSetting',
+		ListItemText: 'Clear-AzSynapseSqlPoolAdvancedThreatProtectionSetting',
+		ResultType: 2,
+		ToolTip: 'Clear-AzSynapseSqlPoolAdvancedThreatProtectionSetting'
+	},
+	{
+		CompletionText: 'Clear-AzSynapseSqlPoolVulnerabilityAssessmentRuleBaseline',
+		ListItemText: 'Clear-AzSynapseSqlPoolVulnerabilityAssessmentRuleBaseline',
+		ResultType: 2,
+		ToolTip: 'Clear-AzSynapseSqlPoolVulnerabilityAssessmentRuleBaseline\\r\\n'
+	},
+	{
+		CompletionText: 'Clear-AzSynapseSqlPoolVulnerabilityAssessmentSetting',
+		ListItemText: 'Clear-AzSynapseSqlPoolVulnerabilityAssessmentSetting',
+		ResultType: 2,
+		ToolTip: 'Clear-AzSynapseSqlPoolVulnerabilityAssessmentSetting'
+	},
+	{
+		CompletionText: 'Clear-AzSynapseSqlVulnerabilityAssessmentSetting',
+		ListItemText: 'Clear-AzSynapseSqlVulnerabilityAssessmentSetting',
+		ResultType: 2,
+		ToolTip: 'Clear-AzSynapseSqlVulnerabilityAssessmentSetting'
+	},
+	{
+		CompletionText: 'Clear-BCCache',
+		ListItemText: 'Clear-BCCache',
+		ResultType: 2,
+		ToolTip: '\\r\\nClear-BCCache \\r\\n'
+	},
+	{
+		CompletionText: 'Clear-BitLockerAutoUnlock',
+		ListItemText: 'Clear-BitLockerAutoUnlock',
+		ResultType: 2,
+		ToolTip: '\\r\\nClear-BitLockerAutoUnlock \\r\\n'
+	},
+	{
+		CompletionText: 'Clear-Content',
+		ListItemText: 'Clear-Content',
+		ResultType: 2,
+		ToolTip: '\\r\\nClear-Content [-Path] <string[]> [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Force] [-Credential <pscredential>] [-WhatIf] [-Confirm] [-Stream <string>] [<CommonParameters>]\\r\\n\\r\\nClear-Content -LiteralPath <string[]> [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Force] [-Credential <pscredential>] [-WhatIf] [-Confirm] [-Stream <string>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Clear-Disk',
+		ListItemText: 'Clear-Disk',
+		ResultType: 2,
+		ToolTip: '\\r\\nClear-Disk \\r\\n'
+	},
+	{
+		CompletionText: 'Clear-DnsClientCache',
+		ListItemText: 'Clear-DnsClientCache',
+		ResultType: 2,
+		ToolTip: '\\r\\nClear-DnsClientCache \\r\\n'
+	},
+	{
+		CompletionText: 'Clear-FileStorageTier',
+		ListItemText: 'Clear-FileStorageTier',
+		ResultType: 2,
+		ToolTip: '\\r\\nClear-FileStorageTier \\r\\n'
+	},
+	{
+		CompletionText: 'Clear-History',
+		ListItemText: 'Clear-History',
+		ResultType: 2,
+		ToolTip: '\\r\\nClear-History [[-Id] <int[]>] [[-Count] <int>] [-Newest] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nClear-History [[-Count] <int>] [-CommandLine <string[]>] [-Newest] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Clear-Host',
+		ListItemText: 'Clear-Host',
+		ResultType: 2,
+		ToolTip: '\\r\\nClear-Host \\r\\n'
+	},
+	{
+		CompletionText: 'Clear-Item',
+		ListItemText: 'Clear-Item',
+		ResultType: 2,
+		ToolTip: '\\r\\nClear-Item [-Path] <string[]> [-Force] [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Credential <pscredential>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nClear-Item -LiteralPath <string[]> [-Force] [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Credential <pscredential>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Clear-ItemProperty',
+		ListItemText: 'Clear-ItemProperty',
+		ResultType: 2,
+		ToolTip: '\\r\\nClear-ItemProperty [-Path] <string[]> [-Name] <string> [-PassThru] [-Force] [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Credential <pscredential>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nClear-ItemProperty [-Name] <string> -LiteralPath <string[]> [-PassThru] [-Force] [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Credential <pscredential>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Clear-KdsCache',
+		ListItemText: 'Clear-KdsCache',
+		ResultType: 2,
+		ToolTip: 'Clear-KdsCache\\r\\n'
+	},
+	{
+		CompletionText: 'Clear-PcsvDeviceLog',
+		ListItemText: 'Clear-PcsvDeviceLog',
+		ResultType: 2,
+		ToolTip: '\\r\\nClear-PcsvDeviceLog \\r\\n'
+	},
+	{
+		CompletionText: 'Clear-RecycleBin',
+		ListItemText: 'Clear-RecycleBin',
+		ResultType: 2,
+		ToolTip: '\\r\\nClear-RecycleBin [[-DriveLetter] <string[]>] [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Clear-StorageBusDisk',
+		ListItemText: 'Clear-StorageBusDisk',
+		ResultType: 2,
+		ToolTip: '\\r\\nClear-StorageBusDisk \\r\\n'
+	},
+	{
+		CompletionText: 'Clear-StorageDiagnosticInfo',
+		ListItemText: 'Clear-StorageDiagnosticInfo',
+		ResultType: 2,
+		ToolTip: '\\r\\nClear-StorageDiagnosticInfo \\r\\n'
+	},
+	{
+		CompletionText: 'Clear-Tpm',
+		ListItemText: 'Clear-Tpm',
+		ResultType: 2,
+		ToolTip: 'Clear-Tpm\\r\\n'
+	},
+	{
+		CompletionText: 'Clear-Variable',
+		ListItemText: 'Clear-Variable',
+		ResultType: 2,
+		ToolTip: '\\r\\nClear-Variable [-Name] <string[]> [-Include <string[]>] [-Exclude <string[]>] [-Force] [-PassThru] [-Scope <string>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Clear-WindowsCorruptMountPoint',
+		ListItemText: 'Clear-WindowsCorruptMountPoint',
+		ResultType: 2,
+		ToolTip: 'Clear-WindowsCorruptMountPoint\\r\\n'
+	},
+	{
+		CompletionText: 'clhsdb.exe',
+		ListItemText: 'clhsdb.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\clhsdb.exe'
+	},
+	{
+		CompletionText: 'clhy',
+		ListItemText: 'clhy',
+		ResultType: 2,
+		ToolTip: 'Clear-History'
+	},
+	{
+		CompletionText: 'cli',
+		ListItemText: 'cli',
+		ResultType: 2,
+		ToolTip: 'Clear-Item'
+	},
+	{
+		CompletionText: 'cliconfg.exe',
+		ListItemText: 'cliconfg.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\cliconfg.exe'
+	},
+	{
+		CompletionText: 'clip.exe',
+		ListItemText: 'clip.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\clip.exe'
+	},
+	{
+		CompletionText: 'clipchamp.exe',
+		ListItemText: 'clipchamp.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\clipchamp.exe'
+	},
+	{
+		CompletionText: 'ClipDLS.exe',
+		ListItemText: 'ClipDLS.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\ClipDLS.exe'
+	},
+	{
+		CompletionText: 'ClipRenew.exe',
+		ListItemText: 'ClipRenew.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\ClipRenew.exe'
+	},
+	{
+		CompletionText: 'ClipUp.exe',
+		ListItemText: 'ClipUp.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\ClipUp.exe'
+	},
+	{
+		CompletionText: 'Close-AzStorageFileHandle',
+		ListItemText: 'Close-AzStorageFileHandle',
+		ResultType: 2,
+		ToolTip: 'Close-AzStorageFileHandle\\r\\n'
+	},
+	{
+		CompletionText: 'Close-SmbOpenFile',
+		ListItemText: 'Close-SmbOpenFile',
+		ResultType: 2,
+		ToolTip: '\\r\\nClose-SmbOpenFile \\r\\n'
+	},
+	{
+		CompletionText: 'Close-SmbSession',
+		ListItemText: 'Close-SmbSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nClose-SmbSession \\r\\n'
+	},
+	{
+		CompletionText: 'CloudExperienceHostBroker.exe',
+		ListItemText: 'CloudExperienceHostBroker.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\CloudExperienceHostBroker.exe'
+	},
+	{
+		CompletionText: 'CloudNotifications.exe',
+		ListItemText: 'CloudNotifications.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\CloudNotifications.exe'
+	},
+	{
+		CompletionText: 'clp',
+		ListItemText: 'clp',
+		ResultType: 2,
+		ToolTip: 'Clear-ItemProperty'
+	},
+	{
+		CompletionText: 'cls',
+		ListItemText: 'cls',
+		ResultType: 2,
+		ToolTip: 'Clear-Host'
+	},
+	{
+		CompletionText: 'clv',
+		ListItemText: 'clv',
+		ResultType: 2,
+		ToolTip: 'Clear-Variable'
+	},
+	{
+		CompletionText: 'cmd.exe',
+		ListItemText: 'cmd.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\cmd.exe'
+	},
+	{
+		CompletionText: 'cmdkey.exe',
+		ListItemText: 'cmdkey.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\cmdkey.exe'
+	},
+	{
+		CompletionText: 'cmdl32.exe',
+		ListItemText: 'cmdl32.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\cmdl32.exe'
+	},
+	{
+		CompletionText: 'cmmon32.exe',
+		ListItemText: 'cmmon32.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\cmmon32.exe'
+	},
+	{
+		CompletionText: 'cmpcfg',
+		ListItemText: 'cmpcfg',
+		ResultType: 2,
+		ToolTip: 'cmpcfg'
+	},
+	{
+		CompletionText: 'cmstp.exe',
+		ListItemText: 'cmstp.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\cmstp.exe'
+	},
+	{
+		CompletionText: 'cnsn',
+		ListItemText: 'cnsn',
+		ResultType: 2,
+		ToolTip: 'Connect-PSSession'
+	},
+	{
+		CompletionText: 'code-exploration.cmd',
+		ListItemText: 'code-exploration.cmd',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Programs\\Microsoft VS Code Exploration\\bin\\code-exploration.cmd'
+	},
+	{
+		CompletionText: 'code-insiders.cmd',
+		ListItemText: 'code-insiders.cmd',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Programs\\Microsoft VS Code Insiders\\bin\\code-insiders.cmd'
+	},
+	{
+		CompletionText: 'code-tunnel-exploration.exe',
+		ListItemText: 'code-tunnel-exploration.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Programs\\Microsoft VS Code Exploration\\bin\\code-tunnel-exploration.exe'
+	},
+	{
+		CompletionText: 'code-tunnel-insiders.exe',
+		ListItemText: 'code-tunnel-insiders.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Programs\\Microsoft VS Code Insiders\\bin\\code-tunnel-insiders.exe'
+	},
+	{
+		CompletionText: 'code-tunnel.exe',
+		ListItemText: 'code-tunnel.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Microsoft VS Code\\bin\\code-tunnel.exe'
+	},
+	{
+		CompletionText: 'code.cmd',
+		ListItemText: 'code.cmd',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Microsoft VS Code\\bin\\code.cmd'
+	},
+	{
+		CompletionText: 'cofire.exe',
+		ListItemText: 'cofire.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\cofire.exe'
+	},
+	{
+		CompletionText: 'colorcpl.exe',
+		ListItemText: 'colorcpl.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\colorcpl.exe'
+	},
+	{
+		CompletionText: 'com.docker.cli.exe',
+		ListItemText: 'com.docker.cli.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Docker\\Docker\\resources\\bin\\com.docker.cli.exe'
+	},
+	{
+		CompletionText: 'comexp.msc',
+		ListItemText: 'comexp.msc',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\comexp.msc'
+	},
+	{
+		CompletionText: 'comp.exe',
+		ListItemText: 'comp.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\comp.exe'
+	},
+	{
+		CompletionText: 'compact.exe',
+		ListItemText: 'compact.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\compact.exe'
+	},
+	{
+		CompletionText: 'compare',
+		ListItemText: 'compare',
+		ResultType: 2,
+		ToolTip: 'Compare-Object'
+	},
+	{
+		CompletionText: 'Compare-Object',
+		ListItemText: 'Compare-Object',
+		ResultType: 2,
+		ToolTip: '\\r\\nCompare-Object [-ReferenceObject] <psobject[]> [-DifferenceObject] <psobject[]> [-SyncWindow <int>] [-Property <Object[]>] [-ExcludeDifferent] [-IncludeEqual] [-PassThru] [-Culture <string>] [-CaseSensitive] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Compare-VM',
+		ListItemText: 'Compare-VM',
+		ResultType: 2,
+		ToolTip: 'Compare-VM\\r\\n'
+	},
+	{
+		CompletionText: 'CompatTelRunner.exe',
+		ListItemText: 'CompatTelRunner.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\CompatTelRunner.exe'
+	},
+	{
+		CompletionText: 'Complete-AzServiceBusMigration',
+		ListItemText: 'Complete-AzServiceBusMigration',
+		ResultType: 2,
+		ToolTip: '\\r\\nComplete-AzServiceBusMigration \\r\\n'
+	},
+	{
+		CompletionText: 'Complete-AzSqlInstanceDatabaseLogReplay',
+		ListItemText: 'Complete-AzSqlInstanceDatabaseLogReplay',
+		ResultType: 2,
+		ToolTip: 'Complete-AzSqlInstanceDatabaseLogReplay\\r\\n'
+	},
+	{
+		CompletionText: 'Complete-BitsTransfer',
+		ListItemText: 'Complete-BitsTransfer',
+		ResultType: 2,
+		ToolTip: 'Complete-BitsTransfer\\r\\n'
+	},
+	{
+		CompletionText: 'Complete-DtcDiagnosticTransaction',
+		ListItemText: 'Complete-DtcDiagnosticTransaction',
+		ResultType: 2,
+		ToolTip: 'Complete-DtcDiagnosticTransaction\\r\\n'
+	},
+	{
+		CompletionText: 'Complete-VMFailover',
+		ListItemText: 'Complete-VMFailover',
+		ResultType: 2,
+		ToolTip: 'Complete-VMFailover\\r\\n'
+	},
+	{
+		CompletionText: 'compmgmt.msc',
+		ListItemText: 'compmgmt.msc',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\compmgmt.msc'
+	},
+	{
+		CompletionText: 'CompMgmtLauncher.exe',
+		ListItemText: 'CompMgmtLauncher.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\CompMgmtLauncher.exe'
+	},
+	{
+		CompletionText: 'CompPkgSrv.exe',
+		ListItemText: 'CompPkgSrv.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\CompPkgSrv.exe'
+	},
+	{
+		CompletionText: 'Compress-Archive',
+		ListItemText: 'Compress-Archive',
+		ResultType: 2,
+		ToolTip: '\\r\\nCompress-Archive \\r\\n'
+	},
+	{
+		CompletionText: 'ComputerDefaults.exe',
+		ListItemText: 'ComputerDefaults.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\ComputerDefaults.exe'
+	},
+	{
+		CompletionText: 'Configuration',
+		ListItemText: 'Configuration',
+		ResultType: 2,
+		ToolTip: '\\r\\nConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Confirm-AzSecurityAutomation',
+		ListItemText: 'Confirm-AzSecurityAutomation',
+		ResultType: 2,
+		ToolTip: 'Confirm-AzSecurityAutomation\\r\\n'
+	},
+	{
+		CompletionText: 'Confirm-SecureBootUEFI',
+		ListItemText: 'Confirm-SecureBootUEFI',
+		ResultType: 2,
+		ToolTip: 'Confirm-SecureBootUEFI\\r\\n'
+	},
+	{
+		CompletionText: 'conhost.exe',
+		ListItemText: 'conhost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\conhost.exe'
+	},
+	{
+		CompletionText: 'Connect-AzAccount',
+		ListItemText: 'Connect-AzAccount',
+		ResultType: 2,
+		ToolTip: 'Connect-AzAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Connect-AzContainerRegistry',
+		ListItemText: 'Connect-AzContainerRegistry',
+		ResultType: 2,
+		ToolTip: 'Connect-AzContainerRegistry\\r\\n'
+	},
+	{
+		CompletionText: 'Connect-IscsiTarget',
+		ListItemText: 'Connect-IscsiTarget',
+		ResultType: 2,
+		ToolTip: '\\r\\nConnect-IscsiTarget \\r\\n'
+	},
+	{
+		CompletionText: 'Connect-PSSession',
+		ListItemText: 'Connect-PSSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nConnect-PSSession -Name <string[]> [-ThrottleLimit <int>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nConnect-PSSession [-Session] <PSSession[]> [-ThrottleLimit <int>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nConnect-PSSession [-ComputerName] <string[]> [-ApplicationName <string>] [-ConfigurationName <string>] [-Name <string[]>] [-Credential <pscredential>] [-Authentication <AuthenticationMechanism>] [-CertificateThumbprint <string>] [-Port <int>] [-UseSSL] [-SessionOption <PSSessionOption>] [-ThrottleLimit <int>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nConnect-PSSession -ComputerName <string[]> -InstanceId <guid[]> [-ApplicationName <string>] [-ConfigurationName <string>] [-Credential <pscredential>] [-Authentication <AuthenticationMechanism>] [-CertificateThumbprint <string>] [-Port <int>] [-UseSSL] [-SessionOption <PSSessionOption>] [-ThrottleLimit <int>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nConnect-PSSession [-ConnectionUri] <uri[]> [-ConfigurationName <string>] [-AllowRedirection] [-Name <string[]>] [-Credential <pscredential>] [-Authentication <AuthenticationMechanism>] [-CertificateThumbprint <string>] [-SessionOption <PSSessionOption>] [-ThrottleLimit <int>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nConnect-PSSession [-ConnectionUri] <uri[]> -InstanceId <guid[]> [-ConfigurationName <string>] [-AllowRedirection] [-Credential <pscredential>] [-Authentication <AuthenticationMechanism>] [-CertificateThumbprint <string>] [-SessionOption <PSSessionOption>] [-ThrottleLimit <int>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nConnect-PSSession -InstanceId <guid[]> [-ThrottleLimit <int>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nConnect-PSSession [-Id] <int[]> [-ThrottleLimit <int>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Connect-VirtualDisk',
+		ListItemText: 'Connect-VirtualDisk',
+		ResultType: 2,
+		ToolTip: '\\r\\nConnect-VirtualDisk \\r\\n'
+	},
+	{
+		CompletionText: 'Connect-VMNetworkAdapter',
+		ListItemText: 'Connect-VMNetworkAdapter',
+		ResultType: 2,
+		ToolTip: 'Connect-VMNetworkAdapter\\r\\n'
+	},
+	{
+		CompletionText: 'Connect-VMSan',
+		ListItemText: 'Connect-VMSan',
+		ResultType: 2,
+		ToolTip: 'Connect-VMSan\\r\\n'
+	},
+	{
+		CompletionText: 'Connect-WSMan',
+		ListItemText: 'Connect-WSMan',
+		ResultType: 2,
+		ToolTip: 'Connect-WSMan\\r\\n'
+	},
+	{
+		CompletionText: 'consent.exe',
+		ListItemText: 'consent.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\consent.exe'
+	},
+	{
+		CompletionText: 'Context',
+		ListItemText: 'Context',
+		ResultType: 2,
+		ToolTip: '\\r\\nContext \\r\\n'
+	},
+	{
+		CompletionText: 'control.exe',
+		ListItemText: 'control.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\control.exe'
+	},
+	{
+		CompletionText: 'Convert-AzSqlDatabaseVulnerabilityAssessmentScan',
+		ListItemText: 'Convert-AzSqlDatabaseVulnerabilityAssessmentScan',
+		ResultType: 2,
+		ToolTip: 'Convert-AzSqlDatabaseVulnerabilityAssessmentScan\\r\\n'
+	},
+	{
+		CompletionText: 'Convert-AzSqlInstanceDatabaseVulnerabilityAssessmentScan',
+		ListItemText: 'Convert-AzSqlInstanceDatabaseVulnerabilityAssessmentScan',
+		ResultType: 2,
+		ToolTip: 'Convert-AzSqlInstanceDatabaseVulnerabilityAssessmentScan\\r\\n'
+	},
+	{
+		CompletionText: 'Convert-AzSynapseSqlPoolVulnerabilityAssessmentScan',
+		ListItemText: 'Convert-AzSynapseSqlPoolVulnerabilityAssessmentScan',
+		ResultType: 2,
+		ToolTip: 'Convert-AzSynapseSqlPoolVulnerabilityAssessmentScan\\r\\n'
+	},
+	{
+		CompletionText: 'Convert-Path',
+		ListItemText: 'Convert-Path',
+		ResultType: 2,
+		ToolTip: '\\r\\nConvert-Path [-Path] <string[]> [<CommonParameters>]\\r\\n\\r\\nConvert-Path -LiteralPath <string[]> [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Convert-VHD',
+		ListItemText: 'Convert-VHD',
+		ResultType: 2,
+		ToolTip: 'Convert-VHD\\r\\n'
+	},
+	{
+		CompletionText: 'convert.exe',
+		ListItemText: 'convert.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\convert.exe'
+	},
+	{
+		CompletionText: 'ConvertFrom-CIPolicy',
+		ListItemText: 'ConvertFrom-CIPolicy',
+		ResultType: 2,
+		ToolTip: 'ConvertFrom-CIPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'ConvertFrom-Csv',
+		ListItemText: 'ConvertFrom-Csv',
+		ResultType: 2,
+		ToolTip: '\\r\\nConvertFrom-Csv [-InputObject] <psobject[]> [[-Delimiter] <char>] [-Header <string[]>] [<CommonParameters>]\\r\\n\\r\\nConvertFrom-Csv [-InputObject] <psobject[]> -UseCulture [-Header <string[]>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'ConvertFrom-Json',
+		ListItemText: 'ConvertFrom-Json',
+		ResultType: 2,
+		ToolTip: '\\r\\nConvertFrom-Json [-InputObject] <string> [-AsHashtable] [-Depth <int>] [-NoEnumerate] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'ConvertFrom-Markdown',
+		ListItemText: 'ConvertFrom-Markdown',
+		ResultType: 2,
+		ToolTip: '\\r\\nConvertFrom-Markdown [-Path] <string[]> [-AsVT100EncodedString] [<CommonParameters>]\\r\\n\\r\\nConvertFrom-Markdown -LiteralPath <string[]> [-AsVT100EncodedString] [<CommonParameters>]\\r\\n\\r\\nConvertFrom-Markdown -InputObject <psobject> [-AsVT100EncodedString] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'ConvertFrom-SddlString',
+		ListItemText: 'ConvertFrom-SddlString',
+		ResultType: 2,
+		ToolTip: '\\r\\nConvertFrom-SddlString [-Sddl] <string> [-Type <ConvertFromSddlStringCommand+AccessRightTypeNames>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'ConvertFrom-SecureString',
+		ListItemText: 'ConvertFrom-SecureString',
+		ResultType: 2,
+		ToolTip: 'ConvertFrom-SecureString\\r\\n'
+	},
+	{
+		CompletionText: 'ConvertFrom-StringData',
+		ListItemText: 'ConvertFrom-StringData',
+		ResultType: 2,
+		ToolTip: '\\r\\nConvertFrom-StringData [-StringData] <string> [[-Delimiter] <char>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'ConvertFrom-Yaml',
+		ListItemText: 'ConvertFrom-Yaml',
+		ResultType: 2,
+		ToolTip: '\\r\\nConvertFrom-Yaml \\r\\n'
+	},
+	{
+		CompletionText: 'ConvertTo-AzVMManagedDisk',
+		ListItemText: 'ConvertTo-AzVMManagedDisk',
+		ResultType: 2,
+		ToolTip: 'ConvertTo-AzVMManagedDisk\\r\\n'
+	},
+	{
+		CompletionText: 'ConvertTo-Csv',
+		ListItemText: 'ConvertTo-Csv',
+		ResultType: 2,
+		ToolTip: '\\r\\nConvertTo-Csv [-InputObject] <psobject> [[-Delimiter] <char>] [-IncludeTypeInformation] [-NoTypeInformation] [-QuoteFields <string[]>] [-UseQuotes <BaseCsvWritingCommand+QuoteKind>] [-NoHeader] [<CommonParameters>]\\r\\n\\r\\nConvertTo-Csv [-InputObject] <psobject> [-UseCulture] [-IncludeTypeInformation] [-NoTypeInformation] [-QuoteFields <string[]>] [-UseQuotes <BaseCsvWritingCommand+QuoteKind>] [-NoHeader] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'ConvertTo-HgsKeyProtector',
+		ListItemText: 'ConvertTo-HgsKeyProtector',
+		ResultType: 2,
+		ToolTip: '\\r\\nConvertTo-HgsKeyProtector \\r\\n'
+	},
+	{
+		CompletionText: 'ConvertTo-Html',
+		ListItemText: 'ConvertTo-Html',
+		ResultType: 2,
+		ToolTip: '\\r\\nConvertTo-Html [[-Property] <Object[]>] [[-Head] <string[]>] [[-Title] <string>] [[-Body] <string[]>] [-InputObject <psobject>] [-As <string>] [-CssUri <uri>] [-PostContent <string[]>] [-PreContent <string[]>] [-Meta <hashtable>] [-Charset <string>] [-Transitional] [<CommonParameters>]\\r\\n\\r\\nConvertTo-Html [[-Property] <Object[]>] [-InputObject <psobject>] [-As <string>] [-Fragment] [-PostContent <string[]>] [-PreContent <string[]>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'ConvertTo-Json',
+		ListItemText: 'ConvertTo-Json',
+		ResultType: 2,
+		ToolTip: '\\r\\nConvertTo-Json [-InputObject] <Object> [-Depth <int>] [-Compress] [-EnumsAsStrings] [-AsArray] [-EscapeHandling <StringEscapeHandling>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'ConvertTo-ProcessMitigationPolicy',
+		ListItemText: 'ConvertTo-ProcessMitigationPolicy',
+		ResultType: 2,
+		ToolTip: 'ConvertTo-ProcessMitigationPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'ConvertTo-SecureString',
+		ListItemText: 'ConvertTo-SecureString',
+		ResultType: 2,
+		ToolTip: 'ConvertTo-SecureString\\r\\n'
+	},
+	{
+		CompletionText: 'ConvertTo-TpmOwnerAuth',
+		ListItemText: 'ConvertTo-TpmOwnerAuth',
+		ResultType: 2,
+		ToolTip: 'ConvertTo-TpmOwnerAuth\\r\\n'
+	},
+	{
+		CompletionText: 'ConvertTo-Xml',
+		ListItemText: 'ConvertTo-Xml',
+		ResultType: 2,
+		ToolTip: '\\r\\nConvertTo-Xml [-InputObject] <psobject> [-Depth <int>] [-NoTypeInformation] [-As <string>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'ConvertTo-Yaml',
+		ListItemText: 'ConvertTo-Yaml',
+		ResultType: 2,
+		ToolTip: '\\r\\nConvertTo-Yaml \\r\\n'
+	},
+	{
+		CompletionText: 'convertvhd.exe',
+		ListItemText: 'convertvhd.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\convertvhd.exe'
+	},
+	{
+		CompletionText: 'copy',
+		ListItemText: 'copy',
+		ResultType: 2,
+		ToolTip: 'Copy-Item'
+	},
+	{
+		CompletionText: 'Copy-AzRecoveryServicesVault',
+		ListItemText: 'Copy-AzRecoveryServicesVault',
+		ResultType: 2,
+		ToolTip: 'Copy-AzRecoveryServicesVault\\r\\n'
+	},
+	{
+		CompletionText: 'Copy-AzSqlDatabaseLongTermRetentionBackup',
+		ListItemText: 'Copy-AzSqlDatabaseLongTermRetentionBackup',
+		ResultType: 2,
+		ToolTip: 'Copy-AzSqlDatabaseLongTermRetentionBackup\\r\\n'
+	},
+	{
+		CompletionText: 'Copy-AzStorageBlob',
+		ListItemText: 'Copy-AzStorageBlob',
+		ResultType: 2,
+		ToolTip: 'Copy-AzStorageBlob\\r\\n'
+	},
+	{
+		CompletionText: 'Copy-BcdEntry',
+		ListItemText: 'Copy-BcdEntry',
+		ResultType: 2,
+		ToolTip: 'Copy-BcdEntry\\r\\n'
+	},
+	{
+		CompletionText: 'Copy-Item',
+		ListItemText: 'Copy-Item',
+		ResultType: 2,
+		ToolTip: '\\r\\nCopy-Item [-Path] <string[]> [[-Destination] <string>] [-Container] [-Force] [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Recurse] [-PassThru] [-Credential <pscredential>] [-WhatIf] [-Confirm] [-FromSession <PSSession>] [-ToSession <PSSession>] [<CommonParameters>]\\r\\n\\r\\nCopy-Item [[-Destination] <string>] -LiteralPath <string[]> [-Container] [-Force] [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Recurse] [-PassThru] [-Credential <pscredential>] [-WhatIf] [-Confirm] [-FromSession <PSSession>] [-ToSession <PSSession>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Copy-ItemProperty',
+		ListItemText: 'Copy-ItemProperty',
+		ResultType: 2,
+		ToolTip: '\\r\\nCopy-ItemProperty [-Path] <string[]> [-Destination] <string> [-Name] <string> [-PassThru] [-Force] [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Credential <pscredential>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nCopy-ItemProperty [-Destination] <string> [-Name] <string> -LiteralPath <string[]> [-PassThru] [-Force] [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Credential <pscredential>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Copy-NetFirewallRule',
+		ListItemText: 'Copy-NetFirewallRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nCopy-NetFirewallRule \\r\\n'
+	},
+	{
+		CompletionText: 'Copy-NetIPsecMainModeCryptoSet',
+		ListItemText: 'Copy-NetIPsecMainModeCryptoSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nCopy-NetIPsecMainModeCryptoSet \\r\\n'
+	},
+	{
+		CompletionText: 'Copy-NetIPsecMainModeRule',
+		ListItemText: 'Copy-NetIPsecMainModeRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nCopy-NetIPsecMainModeRule \\r\\n'
+	},
+	{
+		CompletionText: 'Copy-NetIPsecPhase1AuthSet',
+		ListItemText: 'Copy-NetIPsecPhase1AuthSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nCopy-NetIPsecPhase1AuthSet \\r\\n'
+	},
+	{
+		CompletionText: 'Copy-NetIPsecPhase2AuthSet',
+		ListItemText: 'Copy-NetIPsecPhase2AuthSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nCopy-NetIPsecPhase2AuthSet \\r\\n'
+	},
+	{
+		CompletionText: 'Copy-NetIPsecQuickModeCryptoSet',
+		ListItemText: 'Copy-NetIPsecQuickModeCryptoSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nCopy-NetIPsecQuickModeCryptoSet \\r\\n'
+	},
+	{
+		CompletionText: 'Copy-NetIPsecRule',
+		ListItemText: 'Copy-NetIPsecRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nCopy-NetIPsecRule \\r\\n'
+	},
+	{
+		CompletionText: 'Copy-UserInternationalSettingsToSystem',
+		ListItemText: 'Copy-UserInternationalSettingsToSystem',
+		ResultType: 2,
+		ToolTip: 'Copy-UserInternationalSettingsToSystem\\r\\n'
+	},
+	{
+		CompletionText: 'Copy-VMFile',
+		ListItemText: 'Copy-VMFile',
+		ResultType: 2,
+		ToolTip: 'Copy-VMFile\\r\\n'
+	},
+	{
+		CompletionText: 'coredpussvr.exe',
+		ListItemText: 'coredpussvr.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\coredpussvr.exe'
+	},
+	{
+		CompletionText: 'corepack.cmd',
+		ListItemText: 'corepack.cmd',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\nodejs\\corepack.cmd'
+	},
+	{
+		CompletionText: 'cp',
+		ListItemText: 'cp',
+		ResultType: 2,
+		ToolTip: 'Copy-Item'
+	},
+	{
+		CompletionText: 'cpi',
+		ListItemText: 'cpi',
+		ResultType: 2,
+		ToolTip: 'Copy-Item'
+	},
+	{
+		CompletionText: 'cpp',
+		ListItemText: 'cpp',
+		ResultType: 2,
+		ToolTip: 'Copy-ItemProperty'
+	},
+	{
+		CompletionText: 'createdump.exe',
+		ListItemText: 'createdump.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\WindowsApps\\Microsoft.PowerShell_7.4.2.0_x64__8wekyb3d8bbwe\\createdump.exe'
+	},
+	{
+		CompletionText: 'CredentialEnrollmentManager.exe',
+		ListItemText: 'CredentialEnrollmentManager.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\CredentialEnrollmentManager.exe'
+	},
+	{
+		CompletionText: 'CredentialUIBroker.exe',
+		ListItemText: 'CredentialUIBroker.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\CredentialUIBroker.exe'
+	},
+	{
+		CompletionText: 'credwiz.exe',
+		ListItemText: 'credwiz.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\credwiz.exe'
+	},
+	{
+		CompletionText: 'cscript.exe',
+		ListItemText: 'cscript.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\cscript.exe'
+	},
+	{
+		CompletionText: 'csrss.exe',
+		ListItemText: 'csrss.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\csrss.exe'
+	},
+	{
+		CompletionText: 'cssmbo',
+		ListItemText: 'cssmbo',
+		ResultType: 2,
+		ToolTip: 'cssmbo'
+	},
+	{
+		CompletionText: 'cssmbse',
+		ListItemText: 'cssmbse',
+		ResultType: 2,
+		ToolTip: 'cssmbse'
+	},
+	{
+		CompletionText: 'ctfmon.exe',
+		ListItemText: 'ctfmon.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\ctfmon.exe'
+	},
+	{
+		CompletionText: 'cttune.exe',
+		ListItemText: 'cttune.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\cttune.exe'
+	},
+	{
+		CompletionText: 'cttunesvr.exe',
+		ListItemText: 'cttunesvr.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\cttunesvr.exe'
+	},
+	{
+		CompletionText: 'cty',
+		ListItemText: 'cty',
+		ResultType: 2,
+		ToolTip: 'cty'
+	},
+	{
+		CompletionText: 'curl.exe',
+		ListItemText: 'curl.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\curl.exe'
+	},
+	{
+		CompletionText: 'CustomInstallExec.exe',
+		ListItemText: 'CustomInstallExec.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\CustomInstallExec.exe'
+	},
+	{
+		CompletionText: 'CustomShellHost.exe',
+		ListItemText: 'CustomShellHost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\CustomShellHost.exe'
+	},
+	{
+		CompletionText: 'cvpa',
+		ListItemText: 'cvpa',
+		ResultType: 2,
+		ToolTip: 'Convert-Path'
+	},
+	{
+		CompletionText: 'd3dconfig.exe',
+		ListItemText: 'd3dconfig.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\d3dconfig.exe'
+	},
+	{
+		CompletionText: 'D:',
+		ListItemText: 'D:',
+		ResultType: 2,
+		ToolTip: '\\r\\nD: \\r\\n'
+	},
+	{
+		CompletionText: 'dasHost.exe',
+		ListItemText: 'dasHost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\dasHost.exe'
+	},
+	{
+		CompletionText: 'DataExchangeHost.exe',
+		ListItemText: 'DataExchangeHost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\DataExchangeHost.exe'
+	},
+	{
+		CompletionText: 'DataStoreCacheDumpTool.exe',
+		ListItemText: 'DataStoreCacheDumpTool.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\DataStoreCacheDumpTool.exe'
+	},
+	{
+		CompletionText: 'dbp',
+		ListItemText: 'dbp',
+		ResultType: 2,
+		ToolTip: 'Disable-PSBreakpoint'
+	},
+	{
+		CompletionText: 'dccw.exe',
+		ListItemText: 'dccw.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\dccw.exe'
+	},
+	{
+		CompletionText: 'dcomcnfg.exe',
+		ListItemText: 'dcomcnfg.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\dcomcnfg.exe'
+	},
+	{
+		CompletionText: 'ddodiag.exe',
+		ListItemText: 'ddodiag.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\ddodiag.exe'
+	},
+	{
+		CompletionText: 'debian.exe',
+		ListItemText: 'debian.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\debian.exe'
+	},
+	{
+		CompletionText: 'Debug-FileShare',
+		ListItemText: 'Debug-FileShare',
+		ResultType: 2,
+		ToolTip: '\\r\\nDebug-FileShare \\r\\n'
+	},
+	{
+		CompletionText: 'Debug-Job',
+		ListItemText: 'Debug-Job',
+		ResultType: 2,
+		ToolTip: '\\r\\nDebug-Job [-Job] <Job> [-BreakAll] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nDebug-Job [-Name] <string> [-BreakAll] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nDebug-Job [-Id] <int> [-BreakAll] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nDebug-Job [-InstanceId] <guid> [-BreakAll] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Debug-MMAppPrelaunch',
+		ListItemText: 'Debug-MMAppPrelaunch',
+		ResultType: 2,
+		ToolTip: '\\r\\nDebug-MMAppPrelaunch \\r\\n'
+	},
+	{
+		CompletionText: 'Debug-Process',
+		ListItemText: 'Debug-Process',
+		ResultType: 2,
+		ToolTip: '\\r\\nDebug-Process [-Name] <string[]> [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nDebug-Process [-Id] <int[]> [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nDebug-Process -InputObject <Process[]> [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Debug-Runspace',
+		ListItemText: 'Debug-Runspace',
+		ResultType: 2,
+		ToolTip: '\\r\\nDebug-Runspace [-Runspace] <runspace> [-BreakAll] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nDebug-Runspace [-Name] <string> [-BreakAll] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nDebug-Runspace [-Id] <int> [-BreakAll] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nDebug-Runspace [-InstanceId] <guid> [-BreakAll] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Debug-StorageSubSystem',
+		ListItemText: 'Debug-StorageSubSystem',
+		ResultType: 2,
+		ToolTip: '\\r\\nDebug-StorageSubSystem \\r\\n'
+	},
+	{
+		CompletionText: 'Debug-VM',
+		ListItemText: 'Debug-VM',
+		ResultType: 2,
+		ToolTip: 'Debug-VM\\r\\n'
+	},
+	{
+		CompletionText: 'Debug-Volume',
+		ListItemText: 'Debug-Volume',
+		ResultType: 2,
+		ToolTip: '\\r\\nDebug-Volume \\r\\n'
+	},
+	{
+		CompletionText: 'Defrag.exe',
+		ListItemText: 'Defrag.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\Defrag.exe'
+	},
+	{
+		CompletionText: 'del',
+		ListItemText: 'del',
+		ResultType: 2,
+		ToolTip: 'Remove-Item'
+	},
+	{
+		CompletionText: 'Delete-DeliveryOptimizationCache',
+		ListItemText: 'Delete-DeliveryOptimizationCache',
+		ResultType: 2,
+		ToolTip: '\\r\\nDelete-DeliveryOptimizationCache \\r\\n'
+	},
+	{
+		CompletionText: 'Deny-AzEventHubPrivateEndpointConnection',
+		ListItemText: 'Deny-AzEventHubPrivateEndpointConnection',
+		ResultType: 2,
+		ToolTip: '\\r\\nDeny-AzEventHubPrivateEndpointConnection \\r\\n'
+	},
+	{
+		CompletionText: 'Deny-AzPrivateEndpointConnection',
+		ListItemText: 'Deny-AzPrivateEndpointConnection',
+		ResultType: 2,
+		ToolTip: 'Deny-AzPrivateEndpointConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Deny-AzServiceBusPrivateEndpointConnection',
+		ListItemText: 'Deny-AzServiceBusPrivateEndpointConnection',
+		ResultType: 2,
+		ToolTip: '\\r\\nDeny-AzServiceBusPrivateEndpointConnection \\r\\n'
+	},
+	{
+		CompletionText: 'Deploy-AzNetworkManagerCommit',
+		ListItemText: 'Deploy-AzNetworkManagerCommit',
+		ResultType: 2,
+		ToolTip: 'Deploy-AzNetworkManagerCommit\\r\\n'
+	},
+	{
+		CompletionText: 'deploymentcsphelper.exe',
+		ListItemText: 'deploymentcsphelper.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\deploymentcsphelper.exe'
+	},
+	{
+		CompletionText: 'Describe',
+		ListItemText: 'Describe',
+		ResultType: 2,
+		ToolTip: '\\r\\nDescribe \\r\\n'
+	},
+	{
+		CompletionText: 'desk.cpl',
+		ListItemText: 'desk.cpl',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\desk.cpl'
+	},
+	{
+		CompletionText: 'desktopimgdownldr.exe',
+		ListItemText: 'desktopimgdownldr.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\desktopimgdownldr.exe'
+	},
+	{
+		CompletionText: 'DeviceCensus.exe',
+		ListItemText: 'DeviceCensus.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\DeviceCensus.exe'
+	},
+	{
+		CompletionText: 'DeviceCredentialDeployment.exe',
+		ListItemText: 'DeviceCredentialDeployment.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\DeviceCredentialDeployment.exe'
+	},
+	{
+		CompletionText: 'DeviceEject.exe',
+		ListItemText: 'DeviceEject.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\DeviceEject.exe'
+	},
+	{
+		CompletionText: 'DeviceEnroller.exe',
+		ListItemText: 'DeviceEnroller.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\DeviceEnroller.exe'
+	},
+	{
+		CompletionText: 'DevicePairingWizard.exe',
+		ListItemText: 'DevicePairingWizard.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\DevicePairingWizard.exe'
+	},
+	{
+		CompletionText: 'DeviceProperties.exe',
+		ListItemText: 'DeviceProperties.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\DeviceProperties.exe'
+	},
+	{
+		CompletionText: 'devmgmt.msc',
+		ListItemText: 'devmgmt.msc',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\devmgmt.msc'
+	},
+	{
+		CompletionText: 'DevModeRunAsUserConfig.msc',
+		ListItemText: 'DevModeRunAsUserConfig.msc',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\DevModeRunAsUserConfig.msc'
+	},
+	{
+		CompletionText: 'DFDWiz.exe',
+		ListItemText: 'DFDWiz.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\DFDWiz.exe'
+	},
+	{
+		CompletionText: 'dfrgui.exe',
+		ListItemText: 'dfrgui.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\dfrgui.exe'
+	},
+	{
+		CompletionText: 'dialer.exe',
+		ListItemText: 'dialer.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\dialer.exe'
+	},
+	{
+		CompletionText: 'diff',
+		ListItemText: 'diff',
+		ResultType: 2,
+		ToolTip: 'Compare-Object'
+	},
+	{
+		CompletionText: 'dir',
+		ListItemText: 'dir',
+		ResultType: 2,
+		ToolTip: 'Get-ChildItem'
+	},
+	{
+		CompletionText: 'directxdatabaseupdater.exe',
+		ListItemText: 'directxdatabaseupdater.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\directxdatabaseupdater.exe'
+	},
+	{
+		CompletionText: 'dirmngr.exe',
+		ListItemText: 'dirmngr.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files (x86)\\Gpg4win\\..\\GnuPG\\bin\\dirmngr.exe'
+	},
+	{
+		CompletionText: 'dirmngr_ldap.exe',
+		ListItemText: 'dirmngr_ldap.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files (x86)\\Gpg4win\\..\\GnuPG\\bin\\dirmngr_ldap.exe'
+	},
+	{
+		CompletionText: 'Disable-AppBackgroundTaskDiagnosticLog',
+		ListItemText: 'Disable-AppBackgroundTaskDiagnosticLog',
+		ResultType: 2,
+		ToolTip: 'Disable-AppBackgroundTaskDiagnosticLog\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzAdvisorRecommendation',
+		ListItemText: 'Disable-AzAdvisorRecommendation',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-AzAdvisorRecommendation \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzAksAddOn',
+		ListItemText: 'Disable-AzAksAddOn',
+		ResultType: 2,
+		ToolTip: 'Disable-AzAksAddOn\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzBatchAutoScale',
+		ListItemText: 'Disable-AzBatchAutoScale',
+		ResultType: 2,
+		ToolTip: 'Disable-AzBatchAutoScale\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzBatchComputeNodeScheduling',
+		ListItemText: 'Disable-AzBatchComputeNodeScheduling',
+		ResultType: 2,
+		ToolTip: 'Disable-AzBatchComputeNodeScheduling\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzBatchJob',
+		ListItemText: 'Disable-AzBatchJob',
+		ResultType: 2,
+		ToolTip: 'Disable-AzBatchJob\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzBatchJobSchedule',
+		ListItemText: 'Disable-AzBatchJobSchedule',
+		ResultType: 2,
+		ToolTip: 'Disable-AzBatchJobSchedule\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzCdnCustomDomainCustomHttps',
+		ListItemText: 'Disable-AzCdnCustomDomainCustomHttps',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-AzCdnCustomDomainCustomHttps \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzContextAutosave',
+		ListItemText: 'Disable-AzContextAutosave',
+		ResultType: 2,
+		ToolTip: 'Disable-AzContextAutosave\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzDataCollection',
+		ListItemText: 'Disable-AzDataCollection',
+		ResultType: 2,
+		ToolTip: 'Disable-AzDataCollection\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzFrontDoorCustomDomainHttps',
+		ListItemText: 'Disable-AzFrontDoorCustomDomainHttps',
+		ResultType: 2,
+		ToolTip: 'Disable-AzFrontDoorCustomDomainHttps\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzHDInsightAzureMonitor',
+		ListItemText: 'Disable-AzHDInsightAzureMonitor',
+		ResultType: 2,
+		ToolTip: 'Disable-AzHDInsightAzureMonitor\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzHDInsightMonitoring',
+		ListItemText: 'Disable-AzHDInsightMonitoring',
+		ResultType: 2,
+		ToolTip: 'Disable-AzHDInsightMonitoring\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzIotSecurityAnalyticsAggregatedAlert',
+		ListItemText: 'Disable-AzIotSecurityAnalyticsAggregatedAlert',
+		ResultType: 2,
+		ToolTip: 'Disable-AzIotSecurityAnalyticsAggregatedAlert\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzOperationalInsightsIISLogCollection',
+		ListItemText: 'Disable-AzOperationalInsightsIISLogCollection',
+		ResultType: 2,
+		ToolTip: 'Disable-AzOperationalInsightsIISLogCollection\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzOperationalInsightsLinuxCustomLogCollection',
+		ListItemText: 'Disable-AzOperationalInsightsLinuxCustomLogCollection',
+		ResultType: 2,
+		ToolTip: 'Disable-AzOperationalInsightsLinuxCustomLogCollection\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzOperationalInsightsLinuxPerformanceCollection',
+		ListItemText: 'Disable-AzOperationalInsightsLinuxPerformanceCollection',
+		ResultType: 2,
+		ToolTip: 'Disable-AzOperationalInsightsLinuxPerformanceCollection\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzOperationalInsightsLinuxSyslogCollection',
+		ListItemText: 'Disable-AzOperationalInsightsLinuxSyslogCollection',
+		ResultType: 2,
+		ToolTip: 'Disable-AzOperationalInsightsLinuxSyslogCollection\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzRecoveryServicesBackupAutoProtection',
+		ListItemText: 'Disable-AzRecoveryServicesBackupAutoProtection',
+		ResultType: 2,
+		ToolTip: 'Disable-AzRecoveryServicesBackupAutoProtection\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzRecoveryServicesBackupProtection',
+		ListItemText: 'Disable-AzRecoveryServicesBackupProtection',
+		ResultType: 2,
+		ToolTip: 'Disable-AzRecoveryServicesBackupProtection\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzRecoveryServicesBackupRPMountScript',
+		ListItemText: 'Disable-AzRecoveryServicesBackupRPMountScript',
+		ResultType: 2,
+		ToolTip: 'Disable-AzRecoveryServicesBackupRPMountScript\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzSecurityAdvancedThreatProtection',
+		ListItemText: 'Disable-AzSecurityAdvancedThreatProtection',
+		ResultType: 2,
+		ToolTip: 'Disable-AzSecurityAdvancedThreatProtection\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzSqlDatabaseLedgerDigestUpload',
+		ListItemText: 'Disable-AzSqlDatabaseLedgerDigestUpload',
+		ResultType: 2,
+		ToolTip: 'Disable-AzSqlDatabaseLedgerDigestUpload\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzSqlDatabaseSensitivityRecommendation',
+		ListItemText: 'Disable-AzSqlDatabaseSensitivityRecommendation',
+		ResultType: 2,
+		ToolTip: 'Disable-AzSqlDatabaseSensitivityRecommendation\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzSqlInstanceActiveDirectoryOnlyAuthentication',
+		ListItemText: 'Disable-AzSqlInstanceActiveDirectoryOnlyAuthentication',
+		ResultType: 2,
+		ToolTip: 'Disable-AzSqlInstanceActiveDirectoryOnlyAuthentication\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzSqlInstanceAdvancedDataSecurity',
+		ListItemText: 'Disable-AzSqlInstanceAdvancedDataSecurity',
+		ResultType: 2,
+		ToolTip: 'Disable-AzSqlInstanceAdvancedDataSecurity\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzSqlInstanceDatabaseLedgerDigestUpload',
+		ListItemText: 'Disable-AzSqlInstanceDatabaseLedgerDigestUpload',
+		ResultType: 2,
+		ToolTip: 'Disable-AzSqlInstanceDatabaseLedgerDigestUpload\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzSqlInstanceDatabaseSensitivityRecommendation',
+		ListItemText: 'Disable-AzSqlInstanceDatabaseSensitivityRecommendation',
+		ResultType: 2,
+		ToolTip: 'Disable-AzSqlInstanceDatabaseSensitivityRecommendation\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzSqlServerActiveDirectoryOnlyAuthentication',
+		ListItemText: 'Disable-AzSqlServerActiveDirectoryOnlyAuthentication',
+		ResultType: 2,
+		ToolTip: 'Disable-AzSqlServerActiveDirectoryOnlyAuthentication\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzSqlServerAdvancedDataSecurity',
+		ListItemText: 'Disable-AzSqlServerAdvancedDataSecurity',
+		ResultType: 2,
+		ToolTip: 'Disable-AzSqlServerAdvancedDataSecurity\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzStackHCIAttestation',
+		ListItemText: 'Disable-AzStackHCIAttestation',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-AzStackHCIAttestation \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzStackHCIRemoteSupport',
+		ListItemText: 'Disable-AzStackHCIRemoteSupport',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-AzStackHCIRemoteSupport \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzStorageBlobDeleteRetentionPolicy',
+		ListItemText: 'Disable-AzStorageBlobDeleteRetentionPolicy',
+		ResultType: 2,
+		ToolTip: 'Disable-AzStorageBlobDeleteRetentionPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzStorageBlobLastAccessTimeTracking',
+		ListItemText: 'Disable-AzStorageBlobLastAccessTimeTracking',
+		ResultType: 2,
+		ToolTip: 'Disable-AzStorageBlobLastAccessTimeTracking\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzStorageBlobRestorePolicy',
+		ListItemText: 'Disable-AzStorageBlobRestorePolicy',
+		ResultType: 2,
+		ToolTip: 'Disable-AzStorageBlobRestorePolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzStorageContainerDeleteRetentionPolicy',
+		ListItemText: 'Disable-AzStorageContainerDeleteRetentionPolicy',
+		ResultType: 2,
+		ToolTip: 'Disable-AzStorageContainerDeleteRetentionPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzStorageDeleteRetentionPolicy',
+		ListItemText: 'Disable-AzStorageDeleteRetentionPolicy',
+		ResultType: 2,
+		ToolTip: 'Disable-AzStorageDeleteRetentionPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzStorageSoftDelete',
+		ListItemText: 'Disable-AzStorageSoftDelete',
+		ResultType: 2,
+		ToolTip: 'Disable-AzStorageSoftDelete'
+	},
+	{
+		CompletionText: 'Disable-AzStorageStaticWebsite',
+		ListItemText: 'Disable-AzStorageStaticWebsite',
+		ResultType: 2,
+		ToolTip: 'Disable-AzStorageStaticWebsite\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzSynapseActiveDirectoryOnlyAuthentication',
+		ListItemText: 'Disable-AzSynapseActiveDirectoryOnlyAuthentication',
+		ResultType: 2,
+		ToolTip: 'Disable-AzSynapseActiveDirectoryOnlyAuthentication\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzSynapseSqlAdvancedDataSecurity',
+		ListItemText: 'Disable-AzSynapseSqlAdvancedDataSecurity',
+		ResultType: 2,
+		ToolTip: 'Disable-AzSynapseSqlAdvancedDataSecurity\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzSynapseSqlAdvancedThreatProtection',
+		ListItemText: 'Disable-AzSynapseSqlAdvancedThreatProtection',
+		ResultType: 2,
+		ToolTip: 'Disable-AzSynapseSqlAdvancedThreatProtection'
+	},
+	{
+		CompletionText: 'Disable-AzSynapseSqlPoolSensitivityRecommendation',
+		ListItemText: 'Disable-AzSynapseSqlPoolSensitivityRecommendation',
+		ResultType: 2,
+		ToolTip: 'Disable-AzSynapseSqlPoolSensitivityRecommendation\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzTrafficManagerEndpoint',
+		ListItemText: 'Disable-AzTrafficManagerEndpoint',
+		ResultType: 2,
+		ToolTip: 'Disable-AzTrafficManagerEndpoint\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzTrafficManagerProfile',
+		ListItemText: 'Disable-AzTrafficManagerProfile',
+		ResultType: 2,
+		ToolTip: 'Disable-AzTrafficManagerProfile\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzureRmAlias',
+		ListItemText: 'Disable-AzureRmAlias',
+		ResultType: 2,
+		ToolTip: 'Disable-AzureRmAlias\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzVMDiskEncryption',
+		ListItemText: 'Disable-AzVMDiskEncryption',
+		ResultType: 2,
+		ToolTip: 'Disable-AzVMDiskEncryption\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-AzVmssDiskEncryption',
+		ListItemText: 'Disable-AzVmssDiskEncryption',
+		ResultType: 2,
+		ToolTip: 'Disable-AzVmssDiskEncryption\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-BC',
+		ListItemText: 'Disable-BC',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-BC \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-BcdElementBootDebug',
+		ListItemText: 'Disable-BcdElementBootDebug',
+		ResultType: 2,
+		ToolTip: 'Disable-BcdElementBootDebug\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-BcdElementBootEms',
+		ListItemText: 'Disable-BcdElementBootEms',
+		ResultType: 2,
+		ToolTip: 'Disable-BcdElementBootEms\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-BcdElementDebug',
+		ListItemText: 'Disable-BcdElementDebug',
+		ResultType: 2,
+		ToolTip: 'Disable-BcdElementDebug\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-BcdElementEms',
+		ListItemText: 'Disable-BcdElementEms',
+		ResultType: 2,
+		ToolTip: 'Disable-BcdElementEms\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-BcdElementEventLogging',
+		ListItemText: 'Disable-BcdElementEventLogging',
+		ResultType: 2,
+		ToolTip: 'Disable-BcdElementEventLogging\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-BcdElementHypervisorDebug',
+		ListItemText: 'Disable-BcdElementHypervisorDebug',
+		ResultType: 2,
+		ToolTip: 'Disable-BcdElementHypervisorDebug\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-BCDowngrading',
+		ListItemText: 'Disable-BCDowngrading',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-BCDowngrading \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-BCServeOnBattery',
+		ListItemText: 'Disable-BCServeOnBattery',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-BCServeOnBattery \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-BitLocker',
+		ListItemText: 'Disable-BitLocker',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-BitLocker \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-BitLockerAutoUnlock',
+		ListItemText: 'Disable-BitLockerAutoUnlock',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-BitLockerAutoUnlock \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-DAManualEntryPointSelection',
+		ListItemText: 'Disable-DAManualEntryPointSelection',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-DAManualEntryPointSelection \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-DeliveryOptimizationVerboseLogs',
+		ListItemText: 'Disable-DeliveryOptimizationVerboseLogs',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-DeliveryOptimizationVerboseLogs \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-DscDebug',
+		ListItemText: 'Disable-DscDebug',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-DscDebug \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-ExperimentalFeature',
+		ListItemText: 'Disable-ExperimentalFeature',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-ExperimentalFeature [-Name] <string[]> [-Scope <ConfigScope>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-JobTrigger',
+		ListItemText: 'Disable-JobTrigger',
+		ResultType: 2,
+		ToolTip: 'Disable-JobTrigger\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-LocalUser',
+		ListItemText: 'Disable-LocalUser',
+		ResultType: 2,
+		ToolTip: 'Disable-LocalUser\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-MMAgent',
+		ListItemText: 'Disable-MMAgent',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-MMAgent \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-NetAdapter',
+		ListItemText: 'Disable-NetAdapter',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-NetAdapter \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-NetAdapterBinding',
+		ListItemText: 'Disable-NetAdapterBinding',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-NetAdapterBinding \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-NetAdapterChecksumOffload',
+		ListItemText: 'Disable-NetAdapterChecksumOffload',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-NetAdapterChecksumOffload \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-NetAdapterEncapsulatedPacketTaskOffload',
+		ListItemText: 'Disable-NetAdapterEncapsulatedPacketTaskOffload',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-NetAdapterEncapsulatedPacketTaskOffload \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-NetAdapterIPsecOffload',
+		ListItemText: 'Disable-NetAdapterIPsecOffload',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-NetAdapterIPsecOffload \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-NetAdapterLso',
+		ListItemText: 'Disable-NetAdapterLso',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-NetAdapterLso \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-NetAdapterPacketDirect',
+		ListItemText: 'Disable-NetAdapterPacketDirect',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-NetAdapterPacketDirect \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-NetAdapterPowerManagement',
+		ListItemText: 'Disable-NetAdapterPowerManagement',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-NetAdapterPowerManagement \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-NetAdapterQos',
+		ListItemText: 'Disable-NetAdapterQos',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-NetAdapterQos \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-NetAdapterRdma',
+		ListItemText: 'Disable-NetAdapterRdma',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-NetAdapterRdma \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-NetAdapterRsc',
+		ListItemText: 'Disable-NetAdapterRsc',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-NetAdapterRsc \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-NetAdapterRss',
+		ListItemText: 'Disable-NetAdapterRss',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-NetAdapterRss \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-NetAdapterSriov',
+		ListItemText: 'Disable-NetAdapterSriov',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-NetAdapterSriov \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-NetAdapterUso',
+		ListItemText: 'Disable-NetAdapterUso',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-NetAdapterUso \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-NetAdapterVmq',
+		ListItemText: 'Disable-NetAdapterVmq',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-NetAdapterVmq \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-NetDnsTransitionConfiguration',
+		ListItemText: 'Disable-NetDnsTransitionConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-NetDnsTransitionConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-NetFirewallHyperVRule',
+		ListItemText: 'Disable-NetFirewallHyperVRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-NetFirewallHyperVRule \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-NetFirewallRule',
+		ListItemText: 'Disable-NetFirewallRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-NetFirewallRule \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-NetIPHttpsProfile',
+		ListItemText: 'Disable-NetIPHttpsProfile',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-NetIPHttpsProfile \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-NetIPsecMainModeRule',
+		ListItemText: 'Disable-NetIPsecMainModeRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-NetIPsecMainModeRule \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-NetIPsecRule',
+		ListItemText: 'Disable-NetIPsecRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-NetIPsecRule \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-NetNatTransitionConfiguration',
+		ListItemText: 'Disable-NetNatTransitionConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-NetNatTransitionConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-NetworkSwitchEthernetPort',
+		ListItemText: 'Disable-NetworkSwitchEthernetPort',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-NetworkSwitchEthernetPort \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-NetworkSwitchFeature',
+		ListItemText: 'Disable-NetworkSwitchFeature',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-NetworkSwitchFeature \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-NetworkSwitchVlan',
+		ListItemText: 'Disable-NetworkSwitchVlan',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-NetworkSwitchVlan \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-OdbcPerfCounter',
+		ListItemText: 'Disable-OdbcPerfCounter',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-OdbcPerfCounter \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-PhysicalDiskIdentification',
+		ListItemText: 'Disable-PhysicalDiskIdentification',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-PhysicalDiskIdentification \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-PhysicalDiskIndication',
+		ListItemText: 'Disable-PhysicalDiskIndication',
+		ResultType: 2,
+		ToolTip: 'Disable-PhysicalDiskIndication'
+	},
+	{
+		CompletionText: 'Disable-PnpDevice',
+		ListItemText: 'Disable-PnpDevice',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-PnpDevice \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-PSBreakpoint',
+		ListItemText: 'Disable-PSBreakpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-PSBreakpoint [-Breakpoint] <Breakpoint[]> [-PassThru] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nDisable-PSBreakpoint [-Id] <int[]> [-PassThru] [-Runspace <runspace>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-PSRemoting',
+		ListItemText: 'Disable-PSRemoting',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-PSRemoting [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-PSSessionConfiguration',
+		ListItemText: 'Disable-PSSessionConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-PSSessionConfiguration [[-Name] <string[]>] [-Force] [-NoServiceRestart] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-PSTrace',
+		ListItemText: 'Disable-PSTrace',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-PSTrace \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-PSWSManCombinedTrace',
+		ListItemText: 'Disable-PSWSManCombinedTrace',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-PSWSManCombinedTrace \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-RunspaceDebug',
+		ListItemText: 'Disable-RunspaceDebug',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-RunspaceDebug [[-RunspaceName] <string[]>] [<CommonParameters>]\\r\\n\\r\\nDisable-RunspaceDebug [-Runspace] <runspace[]> [<CommonParameters>]\\r\\n\\r\\nDisable-RunspaceDebug [-RunspaceId] <int[]> [<CommonParameters>]\\r\\n\\r\\nDisable-RunspaceDebug [-RunspaceInstanceId] <guid[]> [<CommonParameters>]\\r\\n\\r\\nDisable-RunspaceDebug [[-ProcessName] <string>] [[-AppDomainName] <string[]>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-ScheduledJob',
+		ListItemText: 'Disable-ScheduledJob',
+		ResultType: 2,
+		ToolTip: 'Disable-ScheduledJob\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-ScheduledTask',
+		ListItemText: 'Disable-ScheduledTask',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-ScheduledTask \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-SmbDelegation',
+		ListItemText: 'Disable-SmbDelegation',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-SmbDelegation \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-StorageBusCache',
+		ListItemText: 'Disable-StorageBusCache',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-StorageBusCache \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-StorageBusDisk',
+		ListItemText: 'Disable-StorageBusDisk',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-StorageBusDisk \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-StorageDataCollection',
+		ListItemText: 'Disable-StorageDataCollection',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-StorageDataCollection \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-StorageDiagnosticLog',
+		ListItemText: 'Disable-StorageDiagnosticLog',
+		ResultType: 2,
+		ToolTip: 'Disable-StorageDiagnosticLog'
+	},
+	{
+		CompletionText: 'Disable-StorageEnclosureIdentification',
+		ListItemText: 'Disable-StorageEnclosureIdentification',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-StorageEnclosureIdentification \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-StorageEnclosurePower',
+		ListItemText: 'Disable-StorageEnclosurePower',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-StorageEnclosurePower \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-StorageHighAvailability',
+		ListItemText: 'Disable-StorageHighAvailability',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-StorageHighAvailability \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-StorageMaintenanceMode',
+		ListItemText: 'Disable-StorageMaintenanceMode',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-StorageMaintenanceMode \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-TlsCipherSuite',
+		ListItemText: 'Disable-TlsCipherSuite',
+		ResultType: 2,
+		ToolTip: 'Disable-TlsCipherSuite\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-TlsEccCurve',
+		ListItemText: 'Disable-TlsEccCurve',
+		ResultType: 2,
+		ToolTip: 'Disable-TlsEccCurve\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-TlsSessionTicketKey',
+		ListItemText: 'Disable-TlsSessionTicketKey',
+		ResultType: 2,
+		ToolTip: 'Disable-TlsSessionTicketKey\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-TpmAutoProvisioning',
+		ListItemText: 'Disable-TpmAutoProvisioning',
+		ResultType: 2,
+		ToolTip: 'Disable-TpmAutoProvisioning\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-VMConsoleSupport',
+		ListItemText: 'Disable-VMConsoleSupport',
+		ResultType: 2,
+		ToolTip: 'Disable-VMConsoleSupport\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-VMEventing',
+		ListItemText: 'Disable-VMEventing',
+		ResultType: 2,
+		ToolTip: 'Disable-VMEventing\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-VMIntegrationService',
+		ListItemText: 'Disable-VMIntegrationService',
+		ResultType: 2,
+		ToolTip: 'Disable-VMIntegrationService\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-VMMigration',
+		ListItemText: 'Disable-VMMigration',
+		ResultType: 2,
+		ToolTip: 'Disable-VMMigration\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-VMRemoteFXPhysicalVideoAdapter',
+		ListItemText: 'Disable-VMRemoteFXPhysicalVideoAdapter',
+		ResultType: 2,
+		ToolTip: 'Disable-VMRemoteFXPhysicalVideoAdapter\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-VMResourceMetering',
+		ListItemText: 'Disable-VMResourceMetering',
+		ResultType: 2,
+		ToolTip: 'Disable-VMResourceMetering\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-VMSwitchExtension',
+		ListItemText: 'Disable-VMSwitchExtension',
+		ResultType: 2,
+		ToolTip: 'Disable-VMSwitchExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-VMTPM',
+		ListItemText: 'Disable-VMTPM',
+		ResultType: 2,
+		ToolTip: 'Disable-VMTPM\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-WdacBidTrace',
+		ListItemText: 'Disable-WdacBidTrace',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-WdacBidTrace \\r\\n'
+	},
+	{
+		CompletionText: 'Disable-WindowsErrorReporting',
+		ListItemText: 'Disable-WindowsErrorReporting',
+		ResultType: 2,
+		ToolTip: 'Disable-WindowsErrorReporting\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-WindowsOptionalFeature',
+		ListItemText: 'Disable-WindowsOptionalFeature',
+		ResultType: 2,
+		ToolTip: 'Disable-WindowsOptionalFeature\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-WSManCredSSP',
+		ListItemText: 'Disable-WSManCredSSP',
+		ResultType: 2,
+		ToolTip: 'Disable-WSManCredSSP\\r\\n'
+	},
+	{
+		CompletionText: 'Disable-WSManTrace',
+		ListItemText: 'Disable-WSManTrace',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-WSManTrace \\r\\n'
+	},
+	{
+		CompletionText: 'Disconnect-AzAccount',
+		ListItemText: 'Disconnect-AzAccount',
+		ResultType: 2,
+		ToolTip: 'Disconnect-AzAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Disconnect-AzP2sVpnGatewayVpnConnection',
+		ListItemText: 'Disconnect-AzP2sVpnGatewayVpnConnection',
+		ResultType: 2,
+		ToolTip: 'Disconnect-AzP2sVpnGatewayVpnConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Disconnect-AzVirtualNetworkGatewayVpnConnection',
+		ListItemText: 'Disconnect-AzVirtualNetworkGatewayVpnConnection',
+		ResultType: 2,
+		ToolTip: 'Disconnect-AzVirtualNetworkGatewayVpnConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Disconnect-AzWvdUserSession',
+		ListItemText: 'Disconnect-AzWvdUserSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisconnect-AzWvdUserSession \\r\\n'
+	},
+	{
+		CompletionText: 'Disconnect-IscsiTarget',
+		ListItemText: 'Disconnect-IscsiTarget',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisconnect-IscsiTarget \\r\\n'
+	},
+	{
+		CompletionText: 'Disconnect-PSSession',
+		ListItemText: 'Disconnect-PSSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisconnect-PSSession [-Session] <PSSession[]> [-IdleTimeoutSec <int>] [-OutputBufferingMode <OutputBufferingMode>] [-ThrottleLimit <int>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nDisconnect-PSSession -Name <string[]> [-IdleTimeoutSec <int>] [-OutputBufferingMode <OutputBufferingMode>] [-ThrottleLimit <int>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nDisconnect-PSSession [-Id] <int[]> [-IdleTimeoutSec <int>] [-OutputBufferingMode <OutputBufferingMode>] [-ThrottleLimit <int>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nDisconnect-PSSession -InstanceId <guid[]> [-IdleTimeoutSec <int>] [-OutputBufferingMode <OutputBufferingMode>] [-ThrottleLimit <int>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Disconnect-VirtualDisk',
+		ListItemText: 'Disconnect-VirtualDisk',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisconnect-VirtualDisk \\r\\n'
+	},
+	{
+		CompletionText: 'Disconnect-VMNetworkAdapter',
+		ListItemText: 'Disconnect-VMNetworkAdapter',
+		ResultType: 2,
+		ToolTip: 'Disconnect-VMNetworkAdapter\\r\\n'
+	},
+	{
+		CompletionText: 'Disconnect-VMSan',
+		ListItemText: 'Disconnect-VMSan',
+		ResultType: 2,
+		ToolTip: 'Disconnect-VMSan\\r\\n'
+	},
+	{
+		CompletionText: 'Disconnect-WSMan',
+		ListItemText: 'Disconnect-WSMan',
+		ResultType: 2,
+		ToolTip: 'Disconnect-WSMan\\r\\n'
+	},
+	{
+		CompletionText: 'diskmgmt.msc',
+		ListItemText: 'diskmgmt.msc',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\diskmgmt.msc'
+	},
+	{
+		CompletionText: 'diskpart.exe',
+		ListItemText: 'diskpart.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\diskpart.exe'
+	},
+	{
+		CompletionText: 'diskperf.exe',
+		ListItemText: 'diskperf.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\diskperf.exe'
+	},
+	{
+		CompletionText: 'diskraid.exe',
+		ListItemText: 'diskraid.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\diskraid.exe'
+	},
+	{
+		CompletionText: 'DiskSnapshot.exe',
+		ListItemText: 'DiskSnapshot.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\DiskSnapshot.exe'
+	},
+	{
+		CompletionText: 'diskusage.exe',
+		ListItemText: 'diskusage.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\diskusage.exe'
+	},
+	{
+		CompletionText: 'Dism.exe',
+		ListItemText: 'Dism.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\Dism.exe'
+	},
+	{
+		CompletionText: 'Dismount-AppPackageVolume',
+		ListItemText: 'Dismount-AppPackageVolume',
+		ResultType: 2,
+		ToolTip: 'Dismount-AppPackageVolume'
+	},
+	{
+		CompletionText: 'Dismount-AppxVolume',
+		ListItemText: 'Dismount-AppxVolume',
+		ResultType: 2,
+		ToolTip: 'Dismount-AppxVolume\\r\\n'
+	},
+	{
+		CompletionText: 'Dismount-DiskImage',
+		ListItemText: 'Dismount-DiskImage',
+		ResultType: 2,
+		ToolTip: '\\r\\nDismount-DiskImage \\r\\n'
+	},
+	{
+		CompletionText: 'Dismount-VHD',
+		ListItemText: 'Dismount-VHD',
+		ResultType: 2,
+		ToolTip: 'Dismount-VHD\\r\\n'
+	},
+	{
+		CompletionText: 'Dismount-VMHostAssignableDevice',
+		ListItemText: 'Dismount-VMHostAssignableDevice',
+		ResultType: 2,
+		ToolTip: 'Dismount-VMHostAssignableDevice\\r\\n'
+	},
+	{
+		CompletionText: 'Dismount-WindowsImage',
+		ListItemText: 'Dismount-WindowsImage',
+		ResultType: 2,
+		ToolTip: 'Dismount-WindowsImage\\r\\n'
+	},
+	{
+		CompletionText: 'dispdiag.exe',
+		ListItemText: 'dispdiag.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\dispdiag.exe'
+	},
+	{
+		CompletionText: 'DisplaySwitch.exe',
+		ListItemText: 'DisplaySwitch.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\DisplaySwitch.exe'
+	},
+	{
+		CompletionText: 'djoin.exe',
+		ListItemText: 'djoin.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\djoin.exe'
+	},
+	{
+		CompletionText: 'dllhost.exe',
+		ListItemText: 'dllhost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\dllhost.exe'
+	},
+	{
+		CompletionText: 'dllhst3g.exe',
+		ListItemText: 'dllhst3g.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\dllhst3g.exe'
+	},
+	{
+		CompletionText: 'dlu',
+		ListItemText: 'dlu',
+		ResultType: 2,
+		ToolTip: 'dlu'
+	},
+	{
+		CompletionText: 'dmcertinst.exe',
+		ListItemText: 'dmcertinst.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\dmcertinst.exe'
+	},
+	{
+		CompletionText: 'dmcfghost.exe',
+		ListItemText: 'dmcfghost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\dmcfghost.exe'
+	},
+	{
+		CompletionText: 'dmclient.exe',
+		ListItemText: 'dmclient.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\dmclient.exe'
+	},
+	{
+		CompletionText: 'DmNotificationBroker.exe',
+		ListItemText: 'DmNotificationBroker.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\DmNotificationBroker.exe'
+	},
+	{
+		CompletionText: 'DmOmaCpMo.exe',
+		ListItemText: 'DmOmaCpMo.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\DmOmaCpMo.exe'
+	},
+	{
+		CompletionText: 'dnscacheugc.exe',
+		ListItemText: 'dnscacheugc.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\dnscacheugc.exe'
+	},
+	{
+		CompletionText: 'dnsn',
+		ListItemText: 'dnsn',
+		ResultType: 2,
+		ToolTip: 'Disconnect-PSSession'
+	},
+	{
+		CompletionText: 'docker-compose.exe',
+		ListItemText: 'docker-compose.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Docker\\Docker\\resources\\bin\\docker-compose.exe'
+	},
+	{
+		CompletionText: 'docker-credential-desktop.exe',
+		ListItemText: 'docker-credential-desktop.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Docker\\Docker\\resources\\bin\\docker-credential-desktop.exe'
+	},
+	{
+		CompletionText: 'docker-credential-ecr-login.exe',
+		ListItemText: 'docker-credential-ecr-login.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Docker\\Docker\\resources\\bin\\docker-credential-ecr-login.exe'
+	},
+	{
+		CompletionText: 'docker-credential-wincred.exe',
+		ListItemText: 'docker-credential-wincred.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Docker\\Docker\\resources\\bin\\docker-credential-wincred.exe'
+	},
+	{
+		CompletionText: 'docker-index.exe',
+		ListItemText: 'docker-index.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Docker\\Docker\\resources\\bin\\docker-index.exe'
+	},
+	{
+		CompletionText: 'docker.exe',
+		ListItemText: 'docker.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Docker\\Docker\\resources\\bin\\docker.exe'
+	},
+	{
+		CompletionText: 'doskey.exe',
+		ListItemText: 'doskey.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\doskey.exe'
+	},
+	{
+		CompletionText: 'dotnet.exe',
+		ListItemText: 'dotnet.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\dotnet\\dotnet.exe'
+	},
+	{
+		CompletionText: 'dpapimig.exe',
+		ListItemText: 'dpapimig.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\dpapimig.exe'
+	},
+	{
+		CompletionText: 'DpiScaling.exe',
+		ListItemText: 'DpiScaling.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\DpiScaling.exe'
+	},
+	{
+		CompletionText: 'dpnsvr.exe',
+		ListItemText: 'dpnsvr.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\dpnsvr.exe'
+	},
+	{
+		CompletionText: 'driverquery.exe',
+		ListItemText: 'driverquery.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\driverquery.exe'
+	},
+	{
+		CompletionText: 'drvinst.exe',
+		ListItemText: 'drvinst.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\drvinst.exe'
+	},
+	{
+		CompletionText: 'dsmbd',
+		ListItemText: 'dsmbd',
+		ResultType: 2,
+		ToolTip: 'dsmbd'
+	},
+	{
+		CompletionText: 'DsmUserTask.exe',
+		ListItemText: 'DsmUserTask.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\DsmUserTask.exe'
+	},
+	{
+		CompletionText: 'dsregcmd.exe',
+		ListItemText: 'dsregcmd.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\dsregcmd.exe'
+	},
+	{
+		CompletionText: 'dstokenclean.exe',
+		ListItemText: 'dstokenclean.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\dstokenclean.exe'
+	},
+	{
+		CompletionText: 'dtdump.exe',
+		ListItemText: 'dtdump.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\dtdump.exe'
+	},
+	{
+		CompletionText: 'DuckDuckGo.exe',
+		ListItemText: 'DuckDuckGo.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\DuckDuckGo.exe'
+	},
+	{
+		CompletionText: 'dusmtask.exe',
+		ListItemText: 'dusmtask.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\dusmtask.exe'
+	},
+	{
+		CompletionText: 'dvdplay.exe',
+		ListItemText: 'dvdplay.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\dvdplay.exe'
+	},
+	{
+		CompletionText: 'dwm.exe',
+		ListItemText: 'dwm.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\dwm.exe'
+	},
+	{
+		CompletionText: 'DWWIN.EXE',
+		ListItemText: 'DWWIN.EXE',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\DWWIN.EXE'
+	},
+	{
+		CompletionText: 'DXCap.exe',
+		ListItemText: 'DXCap.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\DXCap.exe'
+	},
+	{
+		CompletionText: 'DXCpl.exe',
+		ListItemText: 'DXCpl.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\DXCpl.exe'
+	},
+	{
+		CompletionText: 'dxdiag.exe',
+		ListItemText: 'dxdiag.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\dxdiag.exe'
+	},
+	{
+		CompletionText: 'dxgiadaptercache.exe',
+		ListItemText: 'dxgiadaptercache.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\dxgiadaptercache.exe'
+	},
+	{
+		CompletionText: 'Dxpserver.exe',
+		ListItemText: 'Dxpserver.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\Dxpserver.exe'
+	},
+	{
+		CompletionText: 'E:',
+		ListItemText: 'E:',
+		ResultType: 2,
+		ToolTip: '\\r\\nE: \\r\\n'
+	},
+	{
+		CompletionText: 'Eap3Host.exe',
+		ListItemText: 'Eap3Host.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\Eap3Host.exe'
+	},
+	{
+		CompletionText: 'EaseOfAccessDialog.exe',
+		ListItemText: 'EaseOfAccessDialog.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\EaseOfAccessDialog.exe'
+	},
+	{
+		CompletionText: 'easinvoker.exe',
+		ListItemText: 'easinvoker.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\easinvoker.exe'
+	},
+	{
+		CompletionText: 'EASPolicyManagerBrokerHost.exe',
+		ListItemText: 'EASPolicyManagerBrokerHost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\EASPolicyManagerBrokerHost.exe'
+	},
+	{
+		CompletionText: 'ebp',
+		ListItemText: 'ebp',
+		ResultType: 2,
+		ToolTip: 'Enable-PSBreakpoint'
+	},
+	{
+		CompletionText: 'echo',
+		ListItemText: 'echo',
+		ResultType: 2,
+		ToolTip: 'Write-Output'
+	},
+	{
+		CompletionText: 'Edit-ASRRecoveryPlan',
+		ListItemText: 'Edit-ASRRecoveryPlan',
+		ResultType: 2,
+		ToolTip: 'Edit-ASRRecoveryPlan'
+	},
+	{
+		CompletionText: 'Edit-ASRRP',
+		ListItemText: 'Edit-ASRRP',
+		ResultType: 2,
+		ToolTip: 'Edit-ASRRP'
+	},
+	{
+		CompletionText: 'Edit-AzDataProtectionPolicyRetentionRuleClientObject',
+		ListItemText: 'Edit-AzDataProtectionPolicyRetentionRuleClientObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nEdit-AzDataProtectionPolicyRetentionRuleClientObject \\r\\n'
+	},
+	{
+		CompletionText: 'Edit-AzDataProtectionPolicyTagClientObject',
+		ListItemText: 'Edit-AzDataProtectionPolicyTagClientObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nEdit-AzDataProtectionPolicyTagClientObject \\r\\n'
+	},
+	{
+		CompletionText: 'Edit-AzDataProtectionPolicyTriggerClientObject',
+		ListItemText: 'Edit-AzDataProtectionPolicyTriggerClientObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nEdit-AzDataProtectionPolicyTriggerClientObject \\r\\n'
+	},
+	{
+		CompletionText: 'Edit-AzRecoveryServicesAsrRecoveryPlan',
+		ListItemText: 'Edit-AzRecoveryServicesAsrRecoveryPlan',
+		ResultType: 2,
+		ToolTip: 'Edit-AzRecoveryServicesAsrRecoveryPlan\\r\\n'
+	},
+	{
+		CompletionText: 'Edit-AzWebAppBackupConfiguration',
+		ListItemText: 'Edit-AzWebAppBackupConfiguration',
+		ResultType: 2,
+		ToolTip: 'Edit-AzWebAppBackupConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Edit-CIPolicyRule',
+		ListItemText: 'Edit-CIPolicyRule',
+		ResultType: 2,
+		ToolTip: 'Edit-CIPolicyRule\\r\\n'
+	},
+	{
+		CompletionText: 'EDPCleanup.exe',
+		ListItemText: 'EDPCleanup.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\EDPCleanup.exe'
+	},
+	{
+		CompletionText: 'edpnotify.exe',
+		ListItemText: 'edpnotify.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\edpnotify.exe'
+	},
+	{
+		CompletionText: 'EduPrintProv.exe',
+		ListItemText: 'EduPrintProv.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\EduPrintProv.exe'
+	},
+	{
+		CompletionText: 'efsui.exe',
+		ListItemText: 'efsui.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\efsui.exe'
+	},
+	{
+		CompletionText: 'EhStorAuthn.exe',
+		ListItemText: 'EhStorAuthn.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\EhStorAuthn.exe'
+	},
+	{
+		CompletionText: 'elu',
+		ListItemText: 'elu',
+		ResultType: 2,
+		ToolTip: 'elu'
+	},
+	{
+		CompletionText: 'Enable-AdlStoreKeyVault',
+		ListItemText: 'Enable-AdlStoreKeyVault',
+		ResultType: 2,
+		ToolTip: 'Enable-AdlStoreKeyVault'
+	},
+	{
+		CompletionText: 'Enable-AppBackgroundTaskDiagnosticLog',
+		ListItemText: 'Enable-AppBackgroundTaskDiagnosticLog',
+		ResultType: 2,
+		ToolTip: 'Enable-AppBackgroundTaskDiagnosticLog\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzAdvisorRecommendation',
+		ListItemText: 'Enable-AzAdvisorRecommendation',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-AzAdvisorRecommendation \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzAksAddOn',
+		ListItemText: 'Enable-AzAksAddOn',
+		ResultType: 2,
+		ToolTip: 'Enable-AzAksAddOn\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzBatchAutoScale',
+		ListItemText: 'Enable-AzBatchAutoScale',
+		ResultType: 2,
+		ToolTip: 'Enable-AzBatchAutoScale\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzBatchComputeNodeScheduling',
+		ListItemText: 'Enable-AzBatchComputeNodeScheduling',
+		ResultType: 2,
+		ToolTip: 'Enable-AzBatchComputeNodeScheduling\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzBatchJob',
+		ListItemText: 'Enable-AzBatchJob',
+		ResultType: 2,
+		ToolTip: 'Enable-AzBatchJob\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzBatchJobSchedule',
+		ListItemText: 'Enable-AzBatchJobSchedule',
+		ResultType: 2,
+		ToolTip: 'Enable-AzBatchJobSchedule\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzBatchTask',
+		ListItemText: 'Enable-AzBatchTask',
+		ResultType: 2,
+		ToolTip: 'Enable-AzBatchTask\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzCdnCustomDomainCustomHttps',
+		ListItemText: 'Enable-AzCdnCustomDomainCustomHttps',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-AzCdnCustomDomainCustomHttps \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzContextAutosave',
+		ListItemText: 'Enable-AzContextAutosave',
+		ResultType: 2,
+		ToolTip: 'Enable-AzContextAutosave\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzDataCollection',
+		ListItemText: 'Enable-AzDataCollection',
+		ResultType: 2,
+		ToolTip: 'Enable-AzDataCollection\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzDataLakeStoreKeyVault',
+		ListItemText: 'Enable-AzDataLakeStoreKeyVault',
+		ResultType: 2,
+		ToolTip: 'Enable-AzDataLakeStoreKeyVault\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzEventGridPartnerTopic',
+		ListItemText: 'Enable-AzEventGridPartnerTopic',
+		ResultType: 2,
+		ToolTip: 'Enable-AzEventGridPartnerTopic\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzFrontDoorCdnProfileMigration',
+		ListItemText: 'Enable-AzFrontDoorCdnProfileMigration',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-AzFrontDoorCdnProfileMigration \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzFrontDoorCustomDomainHttps',
+		ListItemText: 'Enable-AzFrontDoorCustomDomainHttps',
+		ResultType: 2,
+		ToolTip: 'Enable-AzFrontDoorCustomDomainHttps\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzHDInsightAzureMonitor',
+		ListItemText: 'Enable-AzHDInsightAzureMonitor',
+		ResultType: 2,
+		ToolTip: 'Enable-AzHDInsightAzureMonitor\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzHDInsightMonitoring',
+		ListItemText: 'Enable-AzHDInsightMonitoring',
+		ResultType: 2,
+		ToolTip: 'Enable-AzHDInsightMonitoring\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzOperationalInsightsIISLogCollection',
+		ListItemText: 'Enable-AzOperationalInsightsIISLogCollection',
+		ResultType: 2,
+		ToolTip: 'Enable-AzOperationalInsightsIISLogCollection\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzOperationalInsightsLinuxCustomLogCollection',
+		ListItemText: 'Enable-AzOperationalInsightsLinuxCustomLogCollection',
+		ResultType: 2,
+		ToolTip: 'Enable-AzOperationalInsightsLinuxCustomLogCollection\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzOperationalInsightsLinuxPerformanceCollection',
+		ListItemText: 'Enable-AzOperationalInsightsLinuxPerformanceCollection',
+		ResultType: 2,
+		ToolTip: 'Enable-AzOperationalInsightsLinuxPerformanceCollection\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzOperationalInsightsLinuxSyslogCollection',
+		ListItemText: 'Enable-AzOperationalInsightsLinuxSyslogCollection',
+		ResultType: 2,
+		ToolTip: 'Enable-AzOperationalInsightsLinuxSyslogCollection\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzRecoveryServicesBackupAutoProtection',
+		ListItemText: 'Enable-AzRecoveryServicesBackupAutoProtection',
+		ResultType: 2,
+		ToolTip: 'Enable-AzRecoveryServicesBackupAutoProtection\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzRecoveryServicesBackupProtection',
+		ListItemText: 'Enable-AzRecoveryServicesBackupProtection',
+		ResultType: 2,
+		ToolTip: 'Enable-AzRecoveryServicesBackupProtection\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzSecurityAdvancedThreatProtection',
+		ListItemText: 'Enable-AzSecurityAdvancedThreatProtection',
+		ResultType: 2,
+		ToolTip: 'Enable-AzSecurityAdvancedThreatProtection\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzSqlDatabaseLedgerDigestUpload',
+		ListItemText: 'Enable-AzSqlDatabaseLedgerDigestUpload',
+		ResultType: 2,
+		ToolTip: 'Enable-AzSqlDatabaseLedgerDigestUpload\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzSqlDatabaseSensitivityRecommendation',
+		ListItemText: 'Enable-AzSqlDatabaseSensitivityRecommendation',
+		ResultType: 2,
+		ToolTip: 'Enable-AzSqlDatabaseSensitivityRecommendation\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzSqlInstanceActiveDirectoryOnlyAuthentication',
+		ListItemText: 'Enable-AzSqlInstanceActiveDirectoryOnlyAuthentication',
+		ResultType: 2,
+		ToolTip: 'Enable-AzSqlInstanceActiveDirectoryOnlyAuthentication\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzSqlInstanceAdvancedDataSecurity',
+		ListItemText: 'Enable-AzSqlInstanceAdvancedDataSecurity',
+		ResultType: 2,
+		ToolTip: 'Enable-AzSqlInstanceAdvancedDataSecurity\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzSqlInstanceDatabaseLedgerDigestUpload',
+		ListItemText: 'Enable-AzSqlInstanceDatabaseLedgerDigestUpload',
+		ResultType: 2,
+		ToolTip: 'Enable-AzSqlInstanceDatabaseLedgerDigestUpload\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzSqlInstanceDatabaseSensitivityRecommendation',
+		ListItemText: 'Enable-AzSqlInstanceDatabaseSensitivityRecommendation',
+		ResultType: 2,
+		ToolTip: 'Enable-AzSqlInstanceDatabaseSensitivityRecommendation\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzSqlServerActiveDirectoryOnlyAuthentication',
+		ListItemText: 'Enable-AzSqlServerActiveDirectoryOnlyAuthentication',
+		ResultType: 2,
+		ToolTip: 'Enable-AzSqlServerActiveDirectoryOnlyAuthentication\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzSqlServerAdvancedDataSecurity',
+		ListItemText: 'Enable-AzSqlServerAdvancedDataSecurity',
+		ResultType: 2,
+		ToolTip: 'Enable-AzSqlServerAdvancedDataSecurity\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzStackHCIAttestation',
+		ListItemText: 'Enable-AzStackHCIAttestation',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-AzStackHCIAttestation \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzStackHCIRemoteSupport',
+		ListItemText: 'Enable-AzStackHCIRemoteSupport',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-AzStackHCIRemoteSupport \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzStorageBlobDeleteRetentionPolicy',
+		ListItemText: 'Enable-AzStorageBlobDeleteRetentionPolicy',
+		ResultType: 2,
+		ToolTip: 'Enable-AzStorageBlobDeleteRetentionPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzStorageBlobLastAccessTimeTracking',
+		ListItemText: 'Enable-AzStorageBlobLastAccessTimeTracking',
+		ResultType: 2,
+		ToolTip: 'Enable-AzStorageBlobLastAccessTimeTracking\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzStorageBlobRestorePolicy',
+		ListItemText: 'Enable-AzStorageBlobRestorePolicy',
+		ResultType: 2,
+		ToolTip: 'Enable-AzStorageBlobRestorePolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzStorageContainerDeleteRetentionPolicy',
+		ListItemText: 'Enable-AzStorageContainerDeleteRetentionPolicy',
+		ResultType: 2,
+		ToolTip: 'Enable-AzStorageContainerDeleteRetentionPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzStorageDeleteRetentionPolicy',
+		ListItemText: 'Enable-AzStorageDeleteRetentionPolicy',
+		ResultType: 2,
+		ToolTip: 'Enable-AzStorageDeleteRetentionPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzStorageSoftDelete',
+		ListItemText: 'Enable-AzStorageSoftDelete',
+		ResultType: 2,
+		ToolTip: 'Enable-AzStorageSoftDelete'
+	},
+	{
+		CompletionText: 'Enable-AzStorageStaticWebsite',
+		ListItemText: 'Enable-AzStorageStaticWebsite',
+		ResultType: 2,
+		ToolTip: 'Enable-AzStorageStaticWebsite\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzSynapseActiveDirectoryOnlyAuthentication',
+		ListItemText: 'Enable-AzSynapseActiveDirectoryOnlyAuthentication',
+		ResultType: 2,
+		ToolTip: 'Enable-AzSynapseActiveDirectoryOnlyAuthentication\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzSynapseSqlAdvancedDataSecurity',
+		ListItemText: 'Enable-AzSynapseSqlAdvancedDataSecurity',
+		ResultType: 2,
+		ToolTip: 'Enable-AzSynapseSqlAdvancedDataSecurity\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzSynapseSqlAdvancedThreatProtection',
+		ListItemText: 'Enable-AzSynapseSqlAdvancedThreatProtection',
+		ResultType: 2,
+		ToolTip: 'Enable-AzSynapseSqlAdvancedThreatProtection'
+	},
+	{
+		CompletionText: 'Enable-AzSynapseSqlPoolSensitivityRecommendation',
+		ListItemText: 'Enable-AzSynapseSqlPoolSensitivityRecommendation',
+		ResultType: 2,
+		ToolTip: 'Enable-AzSynapseSqlPoolSensitivityRecommendation\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzSynapseWorkspace',
+		ListItemText: 'Enable-AzSynapseWorkspace',
+		ResultType: 2,
+		ToolTip: 'Enable-AzSynapseWorkspace\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzTrafficManagerEndpoint',
+		ListItemText: 'Enable-AzTrafficManagerEndpoint',
+		ResultType: 2,
+		ToolTip: 'Enable-AzTrafficManagerEndpoint\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzTrafficManagerProfile',
+		ListItemText: 'Enable-AzTrafficManagerProfile',
+		ResultType: 2,
+		ToolTip: 'Enable-AzTrafficManagerProfile\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-AzureRmAlias',
+		ListItemText: 'Enable-AzureRmAlias',
+		ResultType: 2,
+		ToolTip: 'Enable-AzureRmAlias\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-BcdElementBootDebug',
+		ListItemText: 'Enable-BcdElementBootDebug',
+		ResultType: 2,
+		ToolTip: 'Enable-BcdElementBootDebug\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-BcdElementBootEms',
+		ListItemText: 'Enable-BcdElementBootEms',
+		ResultType: 2,
+		ToolTip: 'Enable-BcdElementBootEms\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-BcdElementDebug',
+		ListItemText: 'Enable-BcdElementDebug',
+		ResultType: 2,
+		ToolTip: 'Enable-BcdElementDebug\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-BcdElementEms',
+		ListItemText: 'Enable-BcdElementEms',
+		ResultType: 2,
+		ToolTip: 'Enable-BcdElementEms\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-BcdElementEventLogging',
+		ListItemText: 'Enable-BcdElementEventLogging',
+		ResultType: 2,
+		ToolTip: 'Enable-BcdElementEventLogging\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-BcdElementHypervisorDebug',
+		ListItemText: 'Enable-BcdElementHypervisorDebug',
+		ResultType: 2,
+		ToolTip: 'Enable-BcdElementHypervisorDebug\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-BCDistributed',
+		ListItemText: 'Enable-BCDistributed',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-BCDistributed \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-BCDowngrading',
+		ListItemText: 'Enable-BCDowngrading',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-BCDowngrading \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-BCHostedClient',
+		ListItemText: 'Enable-BCHostedClient',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-BCHostedClient \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-BCHostedServer',
+		ListItemText: 'Enable-BCHostedServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-BCHostedServer \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-BCLocal',
+		ListItemText: 'Enable-BCLocal',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-BCLocal \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-BCServeOnBattery',
+		ListItemText: 'Enable-BCServeOnBattery',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-BCServeOnBattery \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-BitLocker',
+		ListItemText: 'Enable-BitLocker',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-BitLocker \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-BitLockerAutoUnlock',
+		ListItemText: 'Enable-BitLockerAutoUnlock',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-BitLockerAutoUnlock \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-DAManualEntryPointSelection',
+		ListItemText: 'Enable-DAManualEntryPointSelection',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-DAManualEntryPointSelection \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-DeliveryOptimizationVerboseLogs',
+		ListItemText: 'Enable-DeliveryOptimizationVerboseLogs',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-DeliveryOptimizationVerboseLogs \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-DscDebug',
+		ListItemText: 'Enable-DscDebug',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-DscDebug \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-ExperimentalFeature',
+		ListItemText: 'Enable-ExperimentalFeature',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-ExperimentalFeature [-Name] <string[]> [-Scope <ConfigScope>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-JobTrigger',
+		ListItemText: 'Enable-JobTrigger',
+		ResultType: 2,
+		ToolTip: 'Enable-JobTrigger\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-LocalUser',
+		ListItemText: 'Enable-LocalUser',
+		ResultType: 2,
+		ToolTip: 'Enable-LocalUser\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-MMAgent',
+		ListItemText: 'Enable-MMAgent',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-MMAgent \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-NetAdapter',
+		ListItemText: 'Enable-NetAdapter',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-NetAdapter \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-NetAdapterBinding',
+		ListItemText: 'Enable-NetAdapterBinding',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-NetAdapterBinding \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-NetAdapterChecksumOffload',
+		ListItemText: 'Enable-NetAdapterChecksumOffload',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-NetAdapterChecksumOffload \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-NetAdapterEncapsulatedPacketTaskOffload',
+		ListItemText: 'Enable-NetAdapterEncapsulatedPacketTaskOffload',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-NetAdapterEncapsulatedPacketTaskOffload \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-NetAdapterIPsecOffload',
+		ListItemText: 'Enable-NetAdapterIPsecOffload',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-NetAdapterIPsecOffload \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-NetAdapterLso',
+		ListItemText: 'Enable-NetAdapterLso',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-NetAdapterLso \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-NetAdapterPacketDirect',
+		ListItemText: 'Enable-NetAdapterPacketDirect',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-NetAdapterPacketDirect \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-NetAdapterPowerManagement',
+		ListItemText: 'Enable-NetAdapterPowerManagement',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-NetAdapterPowerManagement \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-NetAdapterQos',
+		ListItemText: 'Enable-NetAdapterQos',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-NetAdapterQos \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-NetAdapterRdma',
+		ListItemText: 'Enable-NetAdapterRdma',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-NetAdapterRdma \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-NetAdapterRsc',
+		ListItemText: 'Enable-NetAdapterRsc',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-NetAdapterRsc \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-NetAdapterRss',
+		ListItemText: 'Enable-NetAdapterRss',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-NetAdapterRss \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-NetAdapterSriov',
+		ListItemText: 'Enable-NetAdapterSriov',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-NetAdapterSriov \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-NetAdapterUso',
+		ListItemText: 'Enable-NetAdapterUso',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-NetAdapterUso \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-NetAdapterVmq',
+		ListItemText: 'Enable-NetAdapterVmq',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-NetAdapterVmq \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-NetDnsTransitionConfiguration',
+		ListItemText: 'Enable-NetDnsTransitionConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-NetDnsTransitionConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-NetFirewallHyperVRule',
+		ListItemText: 'Enable-NetFirewallHyperVRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-NetFirewallHyperVRule \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-NetFirewallRule',
+		ListItemText: 'Enable-NetFirewallRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-NetFirewallRule \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-NetIPHttpsProfile',
+		ListItemText: 'Enable-NetIPHttpsProfile',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-NetIPHttpsProfile \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-NetIPsecMainModeRule',
+		ListItemText: 'Enable-NetIPsecMainModeRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-NetIPsecMainModeRule \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-NetIPsecRule',
+		ListItemText: 'Enable-NetIPsecRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-NetIPsecRule \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-NetNatTransitionConfiguration',
+		ListItemText: 'Enable-NetNatTransitionConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-NetNatTransitionConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-NetworkSwitchEthernetPort',
+		ListItemText: 'Enable-NetworkSwitchEthernetPort',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-NetworkSwitchEthernetPort \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-NetworkSwitchFeature',
+		ListItemText: 'Enable-NetworkSwitchFeature',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-NetworkSwitchFeature \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-NetworkSwitchVlan',
+		ListItemText: 'Enable-NetworkSwitchVlan',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-NetworkSwitchVlan \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-OdbcPerfCounter',
+		ListItemText: 'Enable-OdbcPerfCounter',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-OdbcPerfCounter \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-PhysicalDiskIdentification',
+		ListItemText: 'Enable-PhysicalDiskIdentification',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-PhysicalDiskIdentification \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-PhysicalDiskIndication',
+		ListItemText: 'Enable-PhysicalDiskIndication',
+		ResultType: 2,
+		ToolTip: 'Enable-PhysicalDiskIndication'
+	},
+	{
+		CompletionText: 'Enable-PnpDevice',
+		ListItemText: 'Enable-PnpDevice',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-PnpDevice \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-PSBreakpoint',
+		ListItemText: 'Enable-PSBreakpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-PSBreakpoint [-Breakpoint] <Breakpoint[]> [-PassThru] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nEnable-PSBreakpoint [-Id] <int[]> [-PassThru] [-Runspace <runspace>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-PSRemoting',
+		ListItemText: 'Enable-PSRemoting',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-PSRemoting [-Force] [-SkipNetworkProfileCheck] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-PSSessionConfiguration',
+		ListItemText: 'Enable-PSSessionConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-PSSessionConfiguration [[-Name] <string[]>] [-Force] [-SecurityDescriptorSddl <string>] [-SkipNetworkProfileCheck] [-NoServiceRestart] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-PSTrace',
+		ListItemText: 'Enable-PSTrace',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-PSTrace \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-PSWSManCombinedTrace',
+		ListItemText: 'Enable-PSWSManCombinedTrace',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-PSWSManCombinedTrace \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-RunspaceDebug',
+		ListItemText: 'Enable-RunspaceDebug',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-RunspaceDebug [[-RunspaceName] <string[]>] [-BreakAll] [<CommonParameters>]\\r\\n\\r\\nEnable-RunspaceDebug [-Runspace] <runspace[]> [-BreakAll] [<CommonParameters>]\\r\\n\\r\\nEnable-RunspaceDebug [-RunspaceId] <int[]> [-BreakAll] [<CommonParameters>]\\r\\n\\r\\nEnable-RunspaceDebug [-RunspaceInstanceId] <guid[]> [<CommonParameters>]\\r\\n\\r\\nEnable-RunspaceDebug [[-ProcessName] <string>] [[-AppDomainName] <string[]>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-ScheduledJob',
+		ListItemText: 'Enable-ScheduledJob',
+		ResultType: 2,
+		ToolTip: 'Enable-ScheduledJob\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-ScheduledTask',
+		ListItemText: 'Enable-ScheduledTask',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-ScheduledTask \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-SmbDelegation',
+		ListItemText: 'Enable-SmbDelegation',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-SmbDelegation \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-StorageBusCache',
+		ListItemText: 'Enable-StorageBusCache',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-StorageBusCache \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-StorageBusDisk',
+		ListItemText: 'Enable-StorageBusDisk',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-StorageBusDisk \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-StorageDataCollection',
+		ListItemText: 'Enable-StorageDataCollection',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-StorageDataCollection \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-StorageDiagnosticLog',
+		ListItemText: 'Enable-StorageDiagnosticLog',
+		ResultType: 2,
+		ToolTip: 'Enable-StorageDiagnosticLog'
+	},
+	{
+		CompletionText: 'Enable-StorageEnclosureIdentification',
+		ListItemText: 'Enable-StorageEnclosureIdentification',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-StorageEnclosureIdentification \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-StorageEnclosurePower',
+		ListItemText: 'Enable-StorageEnclosurePower',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-StorageEnclosurePower \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-StorageHighAvailability',
+		ListItemText: 'Enable-StorageHighAvailability',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-StorageHighAvailability \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-StorageMaintenanceMode',
+		ListItemText: 'Enable-StorageMaintenanceMode',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-StorageMaintenanceMode \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-TlsCipherSuite',
+		ListItemText: 'Enable-TlsCipherSuite',
+		ResultType: 2,
+		ToolTip: 'Enable-TlsCipherSuite\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-TlsEccCurve',
+		ListItemText: 'Enable-TlsEccCurve',
+		ResultType: 2,
+		ToolTip: 'Enable-TlsEccCurve\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-TlsSessionTicketKey',
+		ListItemText: 'Enable-TlsSessionTicketKey',
+		ResultType: 2,
+		ToolTip: 'Enable-TlsSessionTicketKey\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-TpmAutoProvisioning',
+		ListItemText: 'Enable-TpmAutoProvisioning',
+		ResultType: 2,
+		ToolTip: 'Enable-TpmAutoProvisioning\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-VMConsoleSupport',
+		ListItemText: 'Enable-VMConsoleSupport',
+		ResultType: 2,
+		ToolTip: 'Enable-VMConsoleSupport\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-VMEventing',
+		ListItemText: 'Enable-VMEventing',
+		ResultType: 2,
+		ToolTip: 'Enable-VMEventing\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-VMIntegrationService',
+		ListItemText: 'Enable-VMIntegrationService',
+		ResultType: 2,
+		ToolTip: 'Enable-VMIntegrationService\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-VMMigration',
+		ListItemText: 'Enable-VMMigration',
+		ResultType: 2,
+		ToolTip: 'Enable-VMMigration\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-VMRemoteFXPhysicalVideoAdapter',
+		ListItemText: 'Enable-VMRemoteFXPhysicalVideoAdapter',
+		ResultType: 2,
+		ToolTip: 'Enable-VMRemoteFXPhysicalVideoAdapter\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-VMReplication',
+		ListItemText: 'Enable-VMReplication',
+		ResultType: 2,
+		ToolTip: 'Enable-VMReplication\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-VMResourceMetering',
+		ListItemText: 'Enable-VMResourceMetering',
+		ResultType: 2,
+		ToolTip: 'Enable-VMResourceMetering\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-VMSwitchExtension',
+		ListItemText: 'Enable-VMSwitchExtension',
+		ResultType: 2,
+		ToolTip: 'Enable-VMSwitchExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-VMTPM',
+		ListItemText: 'Enable-VMTPM',
+		ResultType: 2,
+		ToolTip: 'Enable-VMTPM\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-WdacBidTrace',
+		ListItemText: 'Enable-WdacBidTrace',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-WdacBidTrace \\r\\n'
+	},
+	{
+		CompletionText: 'Enable-WindowsErrorReporting',
+		ListItemText: 'Enable-WindowsErrorReporting',
+		ResultType: 2,
+		ToolTip: 'Enable-WindowsErrorReporting\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-WindowsOptionalFeature',
+		ListItemText: 'Enable-WindowsOptionalFeature',
+		ResultType: 2,
+		ToolTip: 'Enable-WindowsOptionalFeature\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-WSManCredSSP',
+		ListItemText: 'Enable-WSManCredSSP',
+		ResultType: 2,
+		ToolTip: 'Enable-WSManCredSSP\\r\\n'
+	},
+	{
+		CompletionText: 'Enable-WSManTrace',
+		ListItemText: 'Enable-WSManTrace',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-WSManTrace \\r\\n'
+	},
+	{
+		CompletionText: 'Enter-PSHostProcess',
+		ListItemText: 'Enter-PSHostProcess',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnter-PSHostProcess [-Id] <int> [[-AppDomainName] <string>] [<CommonParameters>]\\r\\n\\r\\nEnter-PSHostProcess [-Process] <Process> [[-AppDomainName] <string>] [<CommonParameters>]\\r\\n\\r\\nEnter-PSHostProcess [-Name] <string> [[-AppDomainName] <string>] [<CommonParameters>]\\r\\n\\r\\nEnter-PSHostProcess [-HostProcessInfo] <PSHostProcessInfo> [[-AppDomainName] <string>] [<CommonParameters>]\\r\\n\\r\\nEnter-PSHostProcess -CustomPipeName <string> [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Enter-PSSession',
+		ListItemText: 'Enter-PSSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnter-PSSession [-ComputerName] <string> [-EnableNetworkAccess] [-Credential <pscredential>] [-ConfigurationName <string>] [-Port <int>] [-UseSSL] [-ApplicationName <string>] [-SessionOption <PSSessionOption>] [-Authentication <AuthenticationMechanism>] [-CertificateThumbprint <string>] [<CommonParameters>]\\r\\n\\r\\nEnter-PSSession [-HostName] <string> [-Options <hashtable>] [-Port <int>] [-UserName <string>] [-KeyFilePath <string>] [-Subsystem <string>] [-ConnectingTimeout <int>] [-SSHTransport] [<CommonParameters>]\\r\\n\\r\\nEnter-PSSession [[-Session] <PSSession>] [<CommonParameters>]\\r\\n\\r\\nEnter-PSSession [[-ConnectionUri] <uri>] [-EnableNetworkAccess] [-Credential <pscredential>] [-ConfigurationName <string>] [-AllowRedirection] [-SessionOption <PSSessionOption>] [-Authentication <AuthenticationMechanism>] [-CertificateThumbprint <string>] [<CommonParameters>]\\r\\n\\r\\nEnter-PSSession [-InstanceId <guid>] [<CommonParameters>]\\r\\n\\r\\nEnter-PSSession [[-Id] <int>] [<CommonParameters>]\\r\\n\\r\\nEnter-PSSession [-Name <string>] [<CommonParameters>]\\r\\n\\r\\nEnter-PSSession [-VMId] <guid> [-Credential] <pscredential> [-ConfigurationName <string>] [<CommonParameters>]\\r\\n\\r\\nEnter-PSSession [-VMName] <string> [-Credential] <pscredential> [-ConfigurationName <string>] [<CommonParameters>]\\r\\n\\r\\nEnter-PSSession [-ContainerId] <string> [-ConfigurationName <string>] [-RunAsAdministrator] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'env',
+		ListItemText: 'env',
+		ResultType: 2,
+		ToolTip: '\\r\\nenv \\r\\n'
+	},
+	{
+		CompletionText: 'EoAExperiences.exe',
+		ListItemText: 'EoAExperiences.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\EoAExperiences.exe'
+	},
+	{
+		CompletionText: 'epal',
+		ListItemText: 'epal',
+		ResultType: 2,
+		ToolTip: 'Export-Alias'
+	},
+	{
+		CompletionText: 'epcsv',
+		ListItemText: 'epcsv',
+		ResultType: 2,
+		ToolTip: 'Export-Csv'
+	},
+	{
+		CompletionText: 'erase',
+		ListItemText: 'erase',
+		ResultType: 2,
+		ToolTip: 'Remove-Item'
+	},
+	{
+		CompletionText: 'esentutl.exe',
+		ListItemText: 'esentutl.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\esentutl.exe'
+	},
+	{
+		CompletionText: 'esimtool.exe',
+		ListItemText: 'esimtool.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\esimtool.exe'
+	},
+	{
+		CompletionText: 'esmbd',
+		ListItemText: 'esmbd',
+		ResultType: 2,
+		ToolTip: 'esmbd'
+	},
+	{
+		CompletionText: 'etsn',
+		ListItemText: 'etsn',
+		ResultType: 2,
+		ToolTip: 'Enter-PSSession'
+	},
+	{
+		CompletionText: 'eudcedit.exe',
+		ListItemText: 'eudcedit.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\eudcedit.exe'
+	},
+	{
+		CompletionText: 'eventcreate.exe',
+		ListItemText: 'eventcreate.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\eventcreate.exe'
+	},
+	{
+		CompletionText: 'eventvwr.exe',
+		ListItemText: 'eventvwr.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\eventvwr.exe'
+	},
+	{
+		CompletionText: 'eventvwr.msc',
+		ListItemText: 'eventvwr.msc',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\eventvwr.msc'
+	},
+	{
+		CompletionText: 'Exit-PSHostProcess',
+		ListItemText: 'Exit-PSHostProcess',
+		ResultType: 2,
+		ToolTip: '\\r\\nExit-PSHostProcess [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Exit-PSSession',
+		ListItemText: 'Exit-PSSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nExit-PSSession [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Expand-Archive',
+		ListItemText: 'Expand-Archive',
+		ResultType: 2,
+		ToolTip: '\\r\\nExpand-Archive \\r\\n'
+	},
+	{
+		CompletionText: 'Expand-AzWvdMsixImage',
+		ListItemText: 'Expand-AzWvdMsixImage',
+		ResultType: 2,
+		ToolTip: '\\r\\nExpand-AzWvdMsixImage \\r\\n'
+	},
+	{
+		CompletionText: 'Expand-GitCommand',
+		ListItemText: 'Expand-GitCommand',
+		ResultType: 2,
+		ToolTip: '\\r\\nExpand-GitCommand \\r\\n'
+	},
+	{
+		CompletionText: 'Expand-WindowsCustomDataImage',
+		ListItemText: 'Expand-WindowsCustomDataImage',
+		ResultType: 2,
+		ToolTip: 'Expand-WindowsCustomDataImage\\r\\n'
+	},
+	{
+		CompletionText: 'Expand-WindowsImage',
+		ListItemText: 'Expand-WindowsImage',
+		ResultType: 2,
+		ToolTip: 'Expand-WindowsImage\\r\\n'
+	},
+	{
+		CompletionText: 'expand.exe',
+		ListItemText: 'expand.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\expand.exe'
+	},
+	{
+		CompletionText: 'explorer.exe',
+		ListItemText: 'explorer.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\explorer.exe'
+	},
+	{
+		CompletionText: 'Export-AdlStoreChildItemProperties',
+		ListItemText: 'Export-AdlStoreChildItemProperties',
+		ResultType: 2,
+		ToolTip: 'Export-AdlStoreChildItemProperties'
+	},
+	{
+		CompletionText: 'Export-AdlStoreItem',
+		ListItemText: 'Export-AdlStoreItem',
+		ResultType: 2,
+		ToolTip: 'Export-AdlStoreItem'
+	},
+	{
+		CompletionText: 'Export-Alias',
+		ListItemText: 'Export-Alias',
+		ResultType: 2,
+		ToolTip: '\\r\\nExport-Alias [-Path] <string> [[-Name] <string[]>] [-PassThru] [-As <ExportAliasFormat>] [-Append] [-Force] [-NoClobber] [-Description <string>] [-Scope <string>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nExport-Alias [[-Name] <string[]>] -LiteralPath <string> [-PassThru] [-As <ExportAliasFormat>] [-Append] [-Force] [-NoClobber] [-Description <string>] [-Scope <string>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Export-AzAnalysisServicesInstanceLog',
+		ListItemText: 'Export-AzAnalysisServicesInstanceLog',
+		ResultType: 2,
+		ToolTip: 'Export-AzAnalysisServicesInstanceLog\\r\\n'
+	},
+	{
+		CompletionText: 'Export-AzApiManagementApi',
+		ListItemText: 'Export-AzApiManagementApi',
+		ResultType: 2,
+		ToolTip: 'Export-AzApiManagementApi\\r\\n'
+	},
+	{
+		CompletionText: 'Export-AzAsInstanceLog',
+		ListItemText: 'Export-AzAsInstanceLog',
+		ResultType: 2,
+		ToolTip: 'Export-AzAsInstanceLog'
+	},
+	{
+		CompletionText: 'Export-AzAutomationDscConfiguration',
+		ListItemText: 'Export-AzAutomationDscConfiguration',
+		ResultType: 2,
+		ToolTip: 'Export-AzAutomationDscConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Export-AzAutomationDscNodeReportContent',
+		ListItemText: 'Export-AzAutomationDscNodeReportContent',
+		ResultType: 2,
+		ToolTip: 'Export-AzAutomationDscNodeReportContent\\r\\n'
+	},
+	{
+		CompletionText: 'Export-AzAutomationRunbook',
+		ListItemText: 'Export-AzAutomationRunbook',
+		ResultType: 2,
+		ToolTip: 'Export-AzAutomationRunbook\\r\\n'
+	},
+	{
+		CompletionText: 'Export-AzConfig',
+		ListItemText: 'Export-AzConfig',
+		ResultType: 2,
+		ToolTip: 'Export-AzConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Export-AzDataLakeStoreChildItemProperties',
+		ListItemText: 'Export-AzDataLakeStoreChildItemProperties',
+		ResultType: 2,
+		ToolTip: 'Export-AzDataLakeStoreChildItemProperties'
+	},
+	{
+		CompletionText: 'Export-AzDataLakeStoreChildItemProperty',
+		ListItemText: 'Export-AzDataLakeStoreChildItemProperty',
+		ResultType: 2,
+		ToolTip: 'Export-AzDataLakeStoreChildItemProperty\\r\\n'
+	},
+	{
+		CompletionText: 'Export-AzDataLakeStoreItem',
+		ListItemText: 'Export-AzDataLakeStoreItem',
+		ResultType: 2,
+		ToolTip: 'Export-AzDataLakeStoreItem\\r\\n'
+	},
+	{
+		CompletionText: 'Export-AzKeyVaultSecurityDomain',
+		ListItemText: 'Export-AzKeyVaultSecurityDomain',
+		ResultType: 2,
+		ToolTip: 'Export-AzKeyVaultSecurityDomain\\r\\n'
+	},
+	{
+		CompletionText: 'Export-AzLogAnalyticRequestRateByInterval',
+		ListItemText: 'Export-AzLogAnalyticRequestRateByInterval',
+		ResultType: 2,
+		ToolTip: 'Export-AzLogAnalyticRequestRateByInterval\\r\\n'
+	},
+	{
+		CompletionText: 'Export-AzLogAnalyticThrottledRequest',
+		ListItemText: 'Export-AzLogAnalyticThrottledRequest',
+		ResultType: 2,
+		ToolTip: 'Export-AzLogAnalyticThrottledRequest\\r\\n'
+	},
+	{
+		CompletionText: 'Export-AzMlWebService',
+		ListItemText: 'Export-AzMlWebService',
+		ResultType: 2,
+		ToolTip: 'Export-AzMlWebService\\r\\n'
+	},
+	{
+		CompletionText: 'Export-AzRedisCache',
+		ListItemText: 'Export-AzRedisCache',
+		ResultType: 2,
+		ToolTip: 'Export-AzRedisCache\\r\\n'
+	},
+	{
+		CompletionText: 'Export-AzRedisEnterpriseCache',
+		ListItemText: 'Export-AzRedisEnterpriseCache',
+		ResultType: 2,
+		ToolTip: '\\r\\nExport-AzRedisEnterpriseCache \\r\\n'
+	},
+	{
+		CompletionText: 'Export-AzRedisEnterpriseCacheDatabase',
+		ListItemText: 'Export-AzRedisEnterpriseCacheDatabase',
+		ResultType: 2,
+		ToolTip: 'Export-AzRedisEnterpriseCacheDatabase'
+	},
+	{
+		CompletionText: 'Export-AzResourceGroup',
+		ListItemText: 'Export-AzResourceGroup',
+		ResultType: 2,
+		ToolTip: 'Export-AzResourceGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Export-AzSynapseKqlScript',
+		ListItemText: 'Export-AzSynapseKqlScript',
+		ResultType: 2,
+		ToolTip: 'Export-AzSynapseKqlScript\\r\\n'
+	},
+	{
+		CompletionText: 'Export-AzSynapseNotebook',
+		ListItemText: 'Export-AzSynapseNotebook',
+		ResultType: 2,
+		ToolTip: 'Export-AzSynapseNotebook\\r\\n'
+	},
+	{
+		CompletionText: 'Export-AzSynapseSparkConfiguration',
+		ListItemText: 'Export-AzSynapseSparkConfiguration',
+		ResultType: 2,
+		ToolTip: 'Export-AzSynapseSparkConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Export-AzSynapseSqlScript',
+		ListItemText: 'Export-AzSynapseSqlScript',
+		ResultType: 2,
+		ToolTip: 'Export-AzSynapseSqlScript\\r\\n'
+	},
+	{
+		CompletionText: 'Export-AzTemplateSpec',
+		ListItemText: 'Export-AzTemplateSpec',
+		ResultType: 2,
+		ToolTip: 'Export-AzTemplateSpec\\r\\n'
+	},
+	{
+		CompletionText: 'Export-AzureAsInstanceLog',
+		ListItemText: 'Export-AzureAsInstanceLog',
+		ResultType: 2,
+		ToolTip: 'Export-AzureAsInstanceLog'
+	},
+	{
+		CompletionText: 'Export-BCCachePackage',
+		ListItemText: 'Export-BCCachePackage',
+		ResultType: 2,
+		ToolTip: '\\r\\nExport-BCCachePackage \\r\\n'
+	},
+	{
+		CompletionText: 'Export-BcdStore',
+		ListItemText: 'Export-BcdStore',
+		ResultType: 2,
+		ToolTip: 'Export-BcdStore\\r\\n'
+	},
+	{
+		CompletionText: 'Export-BCSecretKey',
+		ListItemText: 'Export-BCSecretKey',
+		ResultType: 2,
+		ToolTip: '\\r\\nExport-BCSecretKey \\r\\n'
+	},
+	{
+		CompletionText: 'Export-BinaryMiLog',
+		ListItemText: 'Export-BinaryMiLog',
+		ResultType: 2,
+		ToolTip: 'Export-BinaryMiLog\\r\\n'
+	},
+	{
+		CompletionText: 'Export-Certificate',
+		ListItemText: 'Export-Certificate',
+		ResultType: 2,
+		ToolTip: 'Export-Certificate\\r\\n'
+	},
+	{
+		CompletionText: 'Export-Clixml',
+		ListItemText: 'Export-Clixml',
+		ResultType: 2,
+		ToolTip: '\\r\\nExport-Clixml [-Path] <string> -InputObject <psobject> [-Depth <int>] [-Force] [-NoClobber] [-Encoding <Encoding>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nExport-Clixml -LiteralPath <string> -InputObject <psobject> [-Depth <int>] [-Force] [-NoClobber] [-Encoding <Encoding>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Export-Counter',
+		ListItemText: 'Export-Counter',
+		ResultType: 2,
+		ToolTip: 'Export-Counter\\r\\n'
+	},
+	{
+		CompletionText: 'Export-Csv',
+		ListItemText: 'Export-Csv',
+		ResultType: 2,
+		ToolTip: '\\r\\nExport-Csv [[-Path] <string>] [[-Delimiter] <char>] -InputObject <psobject> [-LiteralPath <string>] [-Force] [-NoClobber] [-Encoding <Encoding>] [-Append] [-IncludeTypeInformation] [-NoTypeInformation] [-QuoteFields <string[]>] [-UseQuotes <BaseCsvWritingCommand+QuoteKind>] [-NoHeader] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nExport-Csv [[-Path] <string>] -InputObject <psobject> [-LiteralPath <string>] [-Force] [-NoClobber] [-Encoding <Encoding>] [-Append] [-UseCulture] [-IncludeTypeInformation] [-NoTypeInformation] [-QuoteFields <string[]>] [-UseQuotes <BaseCsvWritingCommand+QuoteKind>] [-NoHeader] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Export-FormatData',
+		ListItemText: 'Export-FormatData',
+		ResultType: 2,
+		ToolTip: '\\r\\nExport-FormatData -InputObject <ExtendedTypeDefinition[]> -Path <string> [-Force] [-NoClobber] [-IncludeScriptBlock] [<CommonParameters>]\\r\\n\\r\\nExport-FormatData -InputObject <ExtendedTypeDefinition[]> -LiteralPath <string> [-Force] [-NoClobber] [-IncludeScriptBlock] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Export-HgsGuardian',
+		ListItemText: 'Export-HgsGuardian',
+		ResultType: 2,
+		ToolTip: '\\r\\nExport-HgsGuardian \\r\\n'
+	},
+	{
+		CompletionText: 'Export-ModuleMember',
+		ListItemText: 'Export-ModuleMember',
+		ResultType: 2,
+		ToolTip: '\\r\\nExport-ModuleMember [[-Function] <string[]>] [-Cmdlet <string[]>] [-Variable <string[]>] [-Alias <string[]>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Export-ODataEndpointProxy',
+		ListItemText: 'Export-ODataEndpointProxy',
+		ResultType: 2,
+		ToolTip: '\\r\\nExport-ODataEndpointProxy \\r\\n'
+	},
+	{
+		CompletionText: 'Export-PfxCertificate',
+		ListItemText: 'Export-PfxCertificate',
+		ResultType: 2,
+		ToolTip: 'Export-PfxCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Export-ProvisioningPackage',
+		ListItemText: 'Export-ProvisioningPackage',
+		ResultType: 2,
+		ToolTip: 'Export-ProvisioningPackage\\r\\n'
+	},
+	{
+		CompletionText: 'Export-PSSession',
+		ListItemText: 'Export-PSSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nExport-PSSession [-Session] <PSSession> [-OutputModule] <string> [[-CommandName] <string[]>] [[-FormatTypeName] <string[]>] [-Force] [-Encoding <Encoding>] [-AllowClobber] [-ArgumentList <Object[]>] [-CommandType <CommandTypes>] [-Module <string[]>] [-FullyQualifiedModule <ModuleSpecification[]>] [-Certificate <X509Certificate2>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Export-ScheduledTask',
+		ListItemText: 'Export-ScheduledTask',
+		ResultType: 2,
+		ToolTip: '\\r\\nExport-ScheduledTask \\r\\n'
+	},
+	{
+		CompletionText: 'Export-StartLayout',
+		ListItemText: 'Export-StartLayout',
+		ResultType: 2,
+		ToolTip: 'Export-StartLayout\\r\\n'
+	},
+	{
+		CompletionText: 'Export-StartLayoutEdgeAssets',
+		ListItemText: 'Export-StartLayoutEdgeAssets',
+		ResultType: 2,
+		ToolTip: 'Export-StartLayoutEdgeAssets\\r\\n'
+	},
+	{
+		CompletionText: 'Export-TlsSessionTicketKey',
+		ListItemText: 'Export-TlsSessionTicketKey',
+		ResultType: 2,
+		ToolTip: 'Export-TlsSessionTicketKey\\r\\n'
+	},
+	{
+		CompletionText: 'Export-Trace',
+		ListItemText: 'Export-Trace',
+		ResultType: 2,
+		ToolTip: 'Export-Trace\\r\\n'
+	},
+	{
+		CompletionText: 'Export-VM',
+		ListItemText: 'Export-VM',
+		ResultType: 2,
+		ToolTip: 'Export-VM\\r\\n'
+	},
+	{
+		CompletionText: 'Export-VMCheckpoint',
+		ListItemText: 'Export-VMCheckpoint',
+		ResultType: 2,
+		ToolTip: 'Export-VMCheckpoint'
+	},
+	{
+		CompletionText: 'Export-VMSnapshot',
+		ListItemText: 'Export-VMSnapshot',
+		ResultType: 2,
+		ToolTip: 'Export-VMSnapshot\\r\\n'
+	},
+	{
+		CompletionText: 'Export-WindowsCapabilitySource',
+		ListItemText: 'Export-WindowsCapabilitySource',
+		ResultType: 2,
+		ToolTip: 'Export-WindowsCapabilitySource\\r\\n'
+	},
+	{
+		CompletionText: 'Export-WindowsDriver',
+		ListItemText: 'Export-WindowsDriver',
+		ResultType: 2,
+		ToolTip: 'Export-WindowsDriver\\r\\n'
+	},
+	{
+		CompletionText: 'Export-WindowsImage',
+		ListItemText: 'Export-WindowsImage',
+		ResultType: 2,
+		ToolTip: 'Export-WindowsImage\\r\\n'
+	},
+	{
+		CompletionText: 'Export-WinhttpProxy',
+		ListItemText: 'Export-WinhttpProxy',
+		ResultType: 2,
+		ToolTip: '\\r\\nExport-WinhttpProxy \\r\\n'
+	},
+	{
+		CompletionText: 'exsn',
+		ListItemText: 'exsn',
+		ResultType: 2,
+		ToolTip: 'Exit-PSSession'
+	},
+	{
+		CompletionText: 'extcheck.exe',
+		ListItemText: 'extcheck.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\extcheck.exe'
+	},
+	{
+		CompletionText: 'extension-admin.exe',
+		ListItemText: 'extension-admin.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Docker\\Docker\\resources\\bin\\extension-admin.exe'
+	},
+	{
+		CompletionText: 'extrac32.exe',
+		ListItemText: 'extrac32.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\extrac32.exe'
+	},
+	{
+		CompletionText: 'F:',
+		ListItemText: 'F:',
+		ResultType: 2,
+		ToolTip: '\\r\\nF: \\r\\n'
+	},
+	{
+		CompletionText: 'fc',
+		ListItemText: 'fc',
+		ResultType: 2,
+		ToolTip: 'Format-Custom'
+	},
+	{
+		CompletionText: 'fc.exe',
+		ListItemText: 'fc.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\fc.exe'
+	},
+	{
+		CompletionText: 'fclip.exe',
+		ListItemText: 'fclip.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\fclip.exe'
+	},
+	{
+		CompletionText: 'fdres',
+		ListItemText: 'fdres',
+		ResultType: 2,
+		ToolTip: 'fdres'
+	},
+	{
+		CompletionText: 'fhmanagew.exe',
+		ListItemText: 'fhmanagew.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\fhmanagew.exe'
+	},
+	{
+		CompletionText: 'fhx',
+		ListItemText: 'fhx',
+		ResultType: 2,
+		ToolTip: 'Format-Hex'
+	},
+	{
+		CompletionText: 'FileDialogBroker.exe',
+		ListItemText: 'FileDialogBroker.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\FileDialogBroker.exe'
+	},
+	{
+		CompletionText: 'FileHistory.exe',
+		ListItemText: 'FileHistory.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\FileHistory.exe'
+	},
+	{
+		CompletionText: 'fimo',
+		ListItemText: 'fimo',
+		ResultType: 2,
+		ToolTip: 'fimo'
+	},
+	{
+		CompletionText: 'Find-AzDataProtectionRestorableTimeRange',
+		ListItemText: 'Find-AzDataProtectionRestorableTimeRange',
+		ResultType: 2,
+		ToolTip: '\\r\\nFind-AzDataProtectionRestorableTimeRange \\r\\n'
+	},
+	{
+		CompletionText: 'Find-Command',
+		ListItemText: 'Find-Command',
+		ResultType: 2,
+		ToolTip: '\\r\\nFind-Command \\r\\n'
+	},
+	{
+		CompletionText: 'Find-DSCResource',
+		ListItemText: 'Find-DSCResource',
+		ResultType: 2,
+		ToolTip: '\\r\\nFind-DSCResource \\r\\n'
+	},
+	{
+		CompletionText: 'Find-LapsADExtendedRights',
+		ListItemText: 'Find-LapsADExtendedRights',
+		ResultType: 2,
+		ToolTip: 'Find-LapsADExtendedRights\\r\\n'
+	},
+	{
+		CompletionText: 'Find-Module',
+		ListItemText: 'Find-Module',
+		ResultType: 2,
+		ToolTip: '\\r\\nFind-Module \\r\\n'
+	},
+	{
+		CompletionText: 'Find-NetIPsecRule',
+		ListItemText: 'Find-NetIPsecRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nFind-NetIPsecRule \\r\\n'
+	},
+	{
+		CompletionText: 'Find-NetRoute',
+		ListItemText: 'Find-NetRoute',
+		ResultType: 2,
+		ToolTip: '\\r\\nFind-NetRoute \\r\\n'
+	},
+	{
+		CompletionText: 'Find-Package',
+		ListItemText: 'Find-Package',
+		ResultType: 2,
+		ToolTip: 'Find-Package\\r\\n'
+	},
+	{
+		CompletionText: 'Find-PackageProvider',
+		ListItemText: 'Find-PackageProvider',
+		ResultType: 2,
+		ToolTip: 'Find-PackageProvider\\r\\n'
+	},
+	{
+		CompletionText: 'Find-PSResource',
+		ListItemText: 'Find-PSResource',
+		ResultType: 2,
+		ToolTip: 'Find-PSResource\\r\\n'
+	},
+	{
+		CompletionText: 'Find-RoleCapability',
+		ListItemText: 'Find-RoleCapability',
+		ResultType: 2,
+		ToolTip: '\\r\\nFind-RoleCapability \\r\\n'
+	},
+	{
+		CompletionText: 'Find-Script',
+		ListItemText: 'Find-Script',
+		ResultType: 2,
+		ToolTip: '\\r\\nFind-Script \\r\\n'
+	},
+	{
+		CompletionText: 'find.exe',
+		ListItemText: 'find.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\find.exe'
+	},
+	{
+		CompletionText: 'findstr.exe',
+		ListItemText: 'findstr.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\findstr.exe'
+	},
+	{
+		CompletionText: 'finger.exe',
+		ListItemText: 'finger.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\finger.exe'
+	},
+	{
+		CompletionText: 'Firewall.cpl',
+		ListItemText: 'Firewall.cpl',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\Firewall.cpl'
+	},
+	{
+		CompletionText: 'fixmapi.exe',
+		ListItemText: 'fixmapi.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\fixmapi.exe'
+	},
+	{
+		CompletionText: 'fl',
+		ListItemText: 'fl',
+		ResultType: 2,
+		ToolTip: 'Format-List'
+	},
+	{
+		CompletionText: 'fleet.cmd',
+		ListItemText: 'fleet.cmd',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\JetBrains\\Toolbox\\scripts\\fleet.cmd'
+	},
+	{
+		CompletionText: 'fltMC.exe',
+		ListItemText: 'fltMC.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\fltMC.exe'
+	},
+	{
+		CompletionText: 'Flush-EtwTraceSession',
+		ListItemText: 'Flush-EtwTraceSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nFlush-EtwTraceSession \\r\\n'
+	},
+	{
+		CompletionText: 'Flush-Volume',
+		ListItemText: 'Flush-Volume',
+		ResultType: 2,
+		ToolTip: 'Flush-Volume'
+	},
+	{
+		CompletionText: 'fodhelper.exe',
+		ListItemText: 'fodhelper.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\fodhelper.exe'
+	},
+	{
+		CompletionText: 'Fondue.exe',
+		ListItemText: 'Fondue.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\Fondue.exe'
+	},
+	{
+		CompletionText: 'fontdrvhost.exe',
+		ListItemText: 'fontdrvhost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\fontdrvhost.exe'
+	},
+	{
+		CompletionText: 'fontview.exe',
+		ListItemText: 'fontview.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\fontview.exe'
+	},
+	{
+		CompletionText: 'foreach',
+		ListItemText: 'foreach',
+		ResultType: 2,
+		ToolTip: 'ForEach-Object'
+	},
+	{
+		CompletionText: 'ForEach-Object',
+		ListItemText: 'ForEach-Object',
+		ResultType: 2,
+		ToolTip: '\\r\\nForEach-Object [-Process] <scriptblock[]> [-InputObject <psobject>] [-Begin <scriptblock>] [-End <scriptblock>] [-RemainingScripts <scriptblock[]>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nForEach-Object [-MemberName] <string> [-InputObject <psobject>] [-ArgumentList <Object[]>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nForEach-Object -Parallel <scriptblock> [-InputObject <psobject>] [-ThrottleLimit <int>] [-TimeoutSeconds <int>] [-AsJob] [-UseNewRunspace] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'forfiles.exe',
+		ListItemText: 'forfiles.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\forfiles.exe'
+	},
+	{
+		CompletionText: 'Format-Custom',
+		ListItemText: 'Format-Custom',
+		ResultType: 2,
+		ToolTip: '\\r\\nFormat-Custom [[-Property] <Object[]>] [-Depth <int>] [-GroupBy <Object>] [-View <string>] [-ShowError] [-DisplayError] [-Force] [-Expand <string>] [-InputObject <psobject>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Format-GitBranchName',
+		ListItemText: 'Format-GitBranchName',
+		ResultType: 2,
+		ToolTip: '\\r\\nFormat-GitBranchName \\r\\n'
+	},
+	{
+		CompletionText: 'Format-Hex',
+		ListItemText: 'Format-Hex',
+		ResultType: 2,
+		ToolTip: '\\r\\nFormat-Hex [-Path] <string[]> [-Count <long>] [-Offset <long>] [<CommonParameters>]\\r\\n\\r\\nFormat-Hex -LiteralPath <string[]> [-Count <long>] [-Offset <long>] [<CommonParameters>]\\r\\n\\r\\nFormat-Hex -InputObject <psobject> [-Encoding <Encoding>] [-Count <long>] [-Offset <long>] [-Raw] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Format-List',
+		ListItemText: 'Format-List',
+		ResultType: 2,
+		ToolTip: '\\r\\nFormat-List [[-Property] <Object[]>] [-GroupBy <Object>] [-View <string>] [-ShowError] [-DisplayError] [-Force] [-Expand <string>] [-InputObject <psobject>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Format-SecureBootUEFI',
+		ListItemText: 'Format-SecureBootUEFI',
+		ResultType: 2,
+		ToolTip: 'Format-SecureBootUEFI\\r\\n'
+	},
+	{
+		CompletionText: 'Format-Table',
+		ListItemText: 'Format-Table',
+		ResultType: 2,
+		ToolTip: '\\r\\nFormat-Table [[-Property] <Object[]>] [-AutoSize] [-RepeatHeader] [-HideTableHeaders] [-Wrap] [-GroupBy <Object>] [-View <string>] [-ShowError] [-DisplayError] [-Force] [-Expand <string>] [-InputObject <psobject>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Format-Volume',
+		ListItemText: 'Format-Volume',
+		ResultType: 2,
+		ToolTip: '\\r\\nFormat-Volume \\r\\n'
+	},
+	{
+		CompletionText: 'Format-Wide',
+		ListItemText: 'Format-Wide',
+		ResultType: 2,
+		ToolTip: '\\r\\nFormat-Wide [[-Property] <Object>] [-AutoSize] [-Column <int>] [-GroupBy <Object>] [-View <string>] [-ShowError] [-DisplayError] [-Force] [-Expand <string>] [-InputObject <psobject>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'format.com',
+		ListItemText: 'format.com',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\format.com'
+	},
+	{
+		CompletionText: 'fsavailux.exe',
+		ListItemText: 'fsavailux.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\fsavailux.exe'
+	},
+	{
+		CompletionText: 'FsIso.exe',
+		ListItemText: 'FsIso.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\FsIso.exe'
+	},
+	{
+		CompletionText: 'fsmgmt.msc',
+		ListItemText: 'fsmgmt.msc',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\fsmgmt.msc'
+	},
+	{
+		CompletionText: 'fsquirt.exe',
+		ListItemText: 'fsquirt.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\fsquirt.exe'
+	},
+	{
+		CompletionText: 'fsutil.exe',
+		ListItemText: 'fsutil.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\fsutil.exe'
+	},
+	{
+		CompletionText: 'ft',
+		ListItemText: 'ft',
+		ResultType: 2,
+		ToolTip: 'Format-Table'
+	},
+	{
+		CompletionText: 'ftp.exe',
+		ListItemText: 'ftp.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\ftp.exe'
+	},
+	{
+		CompletionText: 'fvenotify.exe',
+		ListItemText: 'fvenotify.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\fvenotify.exe'
+	},
+	{
+		CompletionText: 'fveprompt.exe',
+		ListItemText: 'fveprompt.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\fveprompt.exe'
+	},
+	{
+		CompletionText: 'fw',
+		ListItemText: 'fw',
+		ResultType: 2,
+		ToolTip: 'Format-Wide'
+	},
+	{
+		CompletionText: 'FXSCOVER.exe',
+		ListItemText: 'FXSCOVER.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\FXSCOVER.exe'
+	},
+	{
+		CompletionText: 'FXSSVC.exe',
+		ListItemText: 'FXSSVC.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\FXSSVC.exe'
+	},
+	{
+		CompletionText: 'FXSUNATD.exe',
+		ListItemText: 'FXSUNATD.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\FXSUNATD.exe'
+	},
+	{
+		CompletionText: 'G:',
+		ListItemText: 'G:',
+		ResultType: 2,
+		ToolTip: '\\r\\nG: \\r\\n'
+	},
+	{
+		CompletionText: 'gal',
+		ListItemText: 'gal',
+		ResultType: 2,
+		ToolTip: 'Get-Alias'
+	},
+	{
+		CompletionText: 'GameBarElevatedFT_Alias.exe',
+		ListItemText: 'GameBarElevatedFT_Alias.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\GameBarElevatedFT_Alias.exe'
+	},
+	{
+		CompletionText: 'GameBarPresenceWriter.exe',
+		ListItemText: 'GameBarPresenceWriter.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\GameBarPresenceWriter.exe'
+	},
+	{
+		CompletionText: 'GameInputSvc.exe',
+		ListItemText: 'GameInputSvc.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\GameInputSvc.exe'
+	},
+	{
+		CompletionText: 'GamePanel.exe',
+		ListItemText: 'GamePanel.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\GamePanel.exe'
+	},
+	{
+		CompletionText: 'gatherNetworkInfo.vbs',
+		ListItemText: 'gatherNetworkInfo.vbs',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\gatherNetworkInfo.vbs'
+	},
+	{
+		CompletionText: 'gbp',
+		ListItemText: 'gbp',
+		ResultType: 2,
+		ToolTip: 'Get-PSBreakpoint'
+	},
+	{
+		CompletionText: 'gc',
+		ListItemText: 'gc',
+		ResultType: 2,
+		ToolTip: 'Get-Content'
+	},
+	{
+		CompletionText: 'gcai',
+		ListItemText: 'gcai',
+		ResultType: 2,
+		ToolTip: 'gcai'
+	},
+	{
+		CompletionText: 'gcb',
+		ListItemText: 'gcb',
+		ResultType: 2,
+		ToolTip: 'Get-Clipboard'
+	},
+	{
+		CompletionText: 'gcfg',
+		ListItemText: 'gcfg',
+		ResultType: 2,
+		ToolTip: 'gcfg'
+	},
+	{
+		CompletionText: 'gcfgs',
+		ListItemText: 'gcfgs',
+		ResultType: 2,
+		ToolTip: 'gcfgs'
+	},
+	{
+		CompletionText: 'gci',
+		ListItemText: 'gci',
+		ResultType: 2,
+		ToolTip: 'Get-ChildItem'
+	},
+	{
+		CompletionText: 'gcim',
+		ListItemText: 'gcim',
+		ResultType: 2,
+		ToolTip: 'gcim'
+	},
+	{
+		CompletionText: 'gcls',
+		ListItemText: 'gcls',
+		ResultType: 2,
+		ToolTip: 'gcls'
+	},
+	{
+		CompletionText: 'gcm',
+		ListItemText: 'gcm',
+		ResultType: 2,
+		ToolTip: 'Get-Command'
+	},
+	{
+		CompletionText: 'gcms',
+		ListItemText: 'gcms',
+		ResultType: 2,
+		ToolTip: 'gcms'
+	},
+	{
+		CompletionText: 'gcs',
+		ListItemText: 'gcs',
+		ResultType: 2,
+		ToolTip: 'Get-PSCallStack'
+	},
+	{
+		CompletionText: 'gdr',
+		ListItemText: 'gdr',
+		ResultType: 2,
+		ToolTip: 'Get-PSDrive'
+	},
+	{
+		CompletionText: 'GenValObj.exe',
+		ListItemText: 'GenValObj.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\GenValObj.exe'
+	},
+	{
+		CompletionText: 'gerr',
+		ListItemText: 'gerr',
+		ResultType: 2,
+		ToolTip: 'Get-Error'
+	},
+	{
+		CompletionText: 'Get-Acl',
+		ListItemText: 'Get-Acl',
+		ResultType: 2,
+		ToolTip: 'Get-Acl\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AdlAnalyticsAccount',
+		ListItemText: 'Get-AdlAnalyticsAccount',
+		ResultType: 2,
+		ToolTip: 'Get-AdlAnalyticsAccount'
+	},
+	{
+		CompletionText: 'Get-AdlAnalyticsComputePolicy',
+		ListItemText: 'Get-AdlAnalyticsComputePolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AdlAnalyticsComputePolicy'
+	},
+	{
+		CompletionText: 'Get-AdlAnalyticsDataSource',
+		ListItemText: 'Get-AdlAnalyticsDataSource',
+		ResultType: 2,
+		ToolTip: 'Get-AdlAnalyticsDataSource'
+	},
+	{
+		CompletionText: 'Get-AdlAnalyticsFirewallRule',
+		ListItemText: 'Get-AdlAnalyticsFirewallRule',
+		ResultType: 2,
+		ToolTip: 'Get-AdlAnalyticsFirewallRule'
+	},
+	{
+		CompletionText: 'Get-AdlCatalogItem',
+		ListItemText: 'Get-AdlCatalogItem',
+		ResultType: 2,
+		ToolTip: 'Get-AdlCatalogItem'
+	},
+	{
+		CompletionText: 'Get-AdlCatalogItemAclEntry',
+		ListItemText: 'Get-AdlCatalogItemAclEntry',
+		ResultType: 2,
+		ToolTip: 'Get-AdlCatalogItemAclEntry'
+	},
+	{
+		CompletionText: 'Get-AdlJob',
+		ListItemText: 'Get-AdlJob',
+		ResultType: 2,
+		ToolTip: 'Get-AdlJob'
+	},
+	{
+		CompletionText: 'Get-AdlJobPipeline',
+		ListItemText: 'Get-AdlJobPipeline',
+		ResultType: 2,
+		ToolTip: 'Get-AdlJobPipeline'
+	},
+	{
+		CompletionText: 'Get-AdlJobRecurrence',
+		ListItemText: 'Get-AdlJobRecurrence',
+		ResultType: 2,
+		ToolTip: 'Get-AdlJobRecurrence'
+	},
+	{
+		CompletionText: 'Get-AdlStore',
+		ListItemText: 'Get-AdlStore',
+		ResultType: 2,
+		ToolTip: 'Get-AdlStore'
+	},
+	{
+		CompletionText: 'Get-AdlStoreChildItem',
+		ListItemText: 'Get-AdlStoreChildItem',
+		ResultType: 2,
+		ToolTip: 'Get-AdlStoreChildItem'
+	},
+	{
+		CompletionText: 'Get-AdlStoreChildItemSummary',
+		ListItemText: 'Get-AdlStoreChildItemSummary',
+		ResultType: 2,
+		ToolTip: 'Get-AdlStoreChildItemSummary'
+	},
+	{
+		CompletionText: 'Get-AdlStoreDeletedItem',
+		ListItemText: 'Get-AdlStoreDeletedItem',
+		ResultType: 2,
+		ToolTip: 'Get-AdlStoreDeletedItem'
+	},
+	{
+		CompletionText: 'Get-AdlStoreFirewallRule',
+		ListItemText: 'Get-AdlStoreFirewallRule',
+		ResultType: 2,
+		ToolTip: 'Get-AdlStoreFirewallRule'
+	},
+	{
+		CompletionText: 'Get-AdlStoreItem',
+		ListItemText: 'Get-AdlStoreItem',
+		ResultType: 2,
+		ToolTip: 'Get-AdlStoreItem'
+	},
+	{
+		CompletionText: 'Get-AdlStoreItemAclEntry',
+		ListItemText: 'Get-AdlStoreItemAclEntry',
+		ResultType: 2,
+		ToolTip: 'Get-AdlStoreItemAclEntry'
+	},
+	{
+		CompletionText: 'Get-AdlStoreItemContent',
+		ListItemText: 'Get-AdlStoreItemContent',
+		ResultType: 2,
+		ToolTip: 'Get-AdlStoreItemContent'
+	},
+	{
+		CompletionText: 'Get-AdlStoreItemOwner',
+		ListItemText: 'Get-AdlStoreItemOwner',
+		ResultType: 2,
+		ToolTip: 'Get-AdlStoreItemOwner'
+	},
+	{
+		CompletionText: 'Get-AdlStoreItemPermission',
+		ListItemText: 'Get-AdlStoreItemPermission',
+		ResultType: 2,
+		ToolTip: 'Get-AdlStoreItemPermission'
+	},
+	{
+		CompletionText: 'Get-AdlStoreTrustedIdProvider',
+		ListItemText: 'Get-AdlStoreTrustedIdProvider',
+		ResultType: 2,
+		ToolTip: 'Get-AdlStoreTrustedIdProvider'
+	},
+	{
+		CompletionText: 'Get-AdlStoreVirtualNetworkRule',
+		ListItemText: 'Get-AdlStoreVirtualNetworkRule',
+		ResultType: 2,
+		ToolTip: 'Get-AdlStoreVirtualNetworkRule'
+	},
+	{
+		CompletionText: 'Get-Alias',
+		ListItemText: 'Get-Alias',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-Alias [[-Name] <string[]>] [-Exclude <string[]>] [-Scope <string>] [<CommonParameters>]\\r\\n\\r\\nGet-Alias [-Exclude <string[]>] [-Scope <string>] [-Definition <string[]>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AppBackgroundTask',
+		ListItemText: 'Get-AppBackgroundTask',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AppBackgroundTask \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AppLockerFileInformation',
+		ListItemText: 'Get-AppLockerFileInformation',
+		ResultType: 2,
+		ToolTip: 'Get-AppLockerFileInformation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AppLockerPolicy',
+		ListItemText: 'Get-AppLockerPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AppLockerPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AppPackage',
+		ListItemText: 'Get-AppPackage',
+		ResultType: 2,
+		ToolTip: 'Get-AppPackage'
+	},
+	{
+		CompletionText: 'Get-AppPackageAutoUpdateSettings',
+		ListItemText: 'Get-AppPackageAutoUpdateSettings',
+		ResultType: 2,
+		ToolTip: 'Get-AppPackageAutoUpdateSettings'
+	},
+	{
+		CompletionText: 'Get-AppPackageDefaultVolume',
+		ListItemText: 'Get-AppPackageDefaultVolume',
+		ResultType: 2,
+		ToolTip: 'Get-AppPackageDefaultVolume'
+	},
+	{
+		CompletionText: 'Get-AppPackageLastError',
+		ListItemText: 'Get-AppPackageLastError',
+		ResultType: 2,
+		ToolTip: 'Get-AppPackageLastError'
+	},
+	{
+		CompletionText: 'Get-AppPackageLog',
+		ListItemText: 'Get-AppPackageLog',
+		ResultType: 2,
+		ToolTip: 'Get-AppPackageLog'
+	},
+	{
+		CompletionText: 'Get-AppPackageManifest',
+		ListItemText: 'Get-AppPackageManifest',
+		ResultType: 2,
+		ToolTip: 'Get-AppPackageManifest'
+	},
+	{
+		CompletionText: 'Get-AppPackageVolume',
+		ListItemText: 'Get-AppPackageVolume',
+		ResultType: 2,
+		ToolTip: 'Get-AppPackageVolume'
+	},
+	{
+		CompletionText: 'Get-AppProvisionedPackage',
+		ListItemText: 'Get-AppProvisionedPackage',
+		ResultType: 2,
+		ToolTip: 'Get-AppProvisionedPackage'
+	},
+	{
+		CompletionText: 'Get-AppProvisionedSharedPackageContainer',
+		ListItemText: 'Get-AppProvisionedSharedPackageContainer',
+		ResultType: 2,
+		ToolTip: 'Get-AppProvisionedSharedPackageContainer\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AppSharedPackageContainer',
+		ListItemText: 'Get-AppSharedPackageContainer',
+		ResultType: 2,
+		ToolTip: 'Get-AppSharedPackageContainer\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AppvVirtualProcess',
+		ListItemText: 'Get-AppvVirtualProcess',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AppvVirtualProcess \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AppxDefaultVolume',
+		ListItemText: 'Get-AppxDefaultVolume',
+		ResultType: 2,
+		ToolTip: 'Get-AppxDefaultVolume\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AppxLastError',
+		ListItemText: 'Get-AppxLastError',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AppxLastError \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AppxLog',
+		ListItemText: 'Get-AppxLog',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AppxLog \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AppxPackage',
+		ListItemText: 'Get-AppxPackage',
+		ResultType: 2,
+		ToolTip: 'Get-AppxPackage\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AppxPackageAutoUpdateSettings',
+		ListItemText: 'Get-AppxPackageAutoUpdateSettings',
+		ResultType: 2,
+		ToolTip: 'Get-AppxPackageAutoUpdateSettings\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AppxPackageManifest',
+		ListItemText: 'Get-AppxPackageManifest',
+		ResultType: 2,
+		ToolTip: 'Get-AppxPackageManifest\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AppxProvisionedPackage',
+		ListItemText: 'Get-AppxProvisionedPackage',
+		ResultType: 2,
+		ToolTip: 'Get-AppxProvisionedPackage\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AppxVolume',
+		ListItemText: 'Get-AppxVolume',
+		ResultType: 2,
+		ToolTip: 'Get-AppxVolume\\r\\n'
+	},
+	{
+		CompletionText: 'Get-ASRAlertSetting',
+		ListItemText: 'Get-ASRAlertSetting',
+		ResultType: 2,
+		ToolTip: 'Get-ASRAlertSetting'
+	},
+	{
+		CompletionText: 'Get-ASREvent',
+		ListItemText: 'Get-ASREvent',
+		ResultType: 2,
+		ToolTip: 'Get-ASREvent'
+	},
+	{
+		CompletionText: 'Get-ASRFabric',
+		ListItemText: 'Get-ASRFabric',
+		ResultType: 2,
+		ToolTip: 'Get-ASRFabric'
+	},
+	{
+		CompletionText: 'Get-ASRJob',
+		ListItemText: 'Get-ASRJob',
+		ResultType: 2,
+		ToolTip: 'Get-ASRJob'
+	},
+	{
+		CompletionText: 'Get-ASRNetwork',
+		ListItemText: 'Get-ASRNetwork',
+		ResultType: 2,
+		ToolTip: 'Get-ASRNetwork'
+	},
+	{
+		CompletionText: 'Get-ASRNetworkMapping',
+		ListItemText: 'Get-ASRNetworkMapping',
+		ResultType: 2,
+		ToolTip: 'Get-ASRNetworkMapping'
+	},
+	{
+		CompletionText: 'Get-ASRNotificationSetting',
+		ListItemText: 'Get-ASRNotificationSetting',
+		ResultType: 2,
+		ToolTip: 'Get-ASRNotificationSetting'
+	},
+	{
+		CompletionText: 'Get-ASRPolicy',
+		ListItemText: 'Get-ASRPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-ASRPolicy'
+	},
+	{
+		CompletionText: 'Get-ASRProtectableItem',
+		ListItemText: 'Get-ASRProtectableItem',
+		ResultType: 2,
+		ToolTip: 'Get-ASRProtectableItem'
+	},
+	{
+		CompletionText: 'Get-ASRProtectionContainer',
+		ListItemText: 'Get-ASRProtectionContainer',
+		ResultType: 2,
+		ToolTip: 'Get-ASRProtectionContainer'
+	},
+	{
+		CompletionText: 'Get-ASRProtectionContainerMapping',
+		ListItemText: 'Get-ASRProtectionContainerMapping',
+		ResultType: 2,
+		ToolTip: 'Get-ASRProtectionContainerMapping'
+	},
+	{
+		CompletionText: 'Get-ASRRecoveryPlan',
+		ListItemText: 'Get-ASRRecoveryPlan',
+		ResultType: 2,
+		ToolTip: 'Get-ASRRecoveryPlan'
+	},
+	{
+		CompletionText: 'Get-ASRRecoveryPoint',
+		ListItemText: 'Get-ASRRecoveryPoint',
+		ResultType: 2,
+		ToolTip: 'Get-ASRRecoveryPoint'
+	},
+	{
+		CompletionText: 'Get-ASRReplicationProtectedItem',
+		ListItemText: 'Get-ASRReplicationProtectedItem',
+		ResultType: 2,
+		ToolTip: 'Get-ASRReplicationProtectedItem'
+	},
+	{
+		CompletionText: 'Get-ASRRP',
+		ListItemText: 'Get-ASRRP',
+		ResultType: 2,
+		ToolTip: 'Get-ASRRP'
+	},
+	{
+		CompletionText: 'Get-ASRServicesProvider',
+		ListItemText: 'Get-ASRServicesProvider',
+		ResultType: 2,
+		ToolTip: 'Get-ASRServicesProvider'
+	},
+	{
+		CompletionText: 'Get-ASRStorageClassification',
+		ListItemText: 'Get-ASRStorageClassification',
+		ResultType: 2,
+		ToolTip: 'Get-ASRStorageClassification'
+	},
+	{
+		CompletionText: 'Get-ASRStorageClassificationMapping',
+		ListItemText: 'Get-ASRStorageClassificationMapping',
+		ResultType: 2,
+		ToolTip: 'Get-ASRStorageClassificationMapping'
+	},
+	{
+		CompletionText: 'Get-ASRvCenter',
+		ListItemText: 'Get-ASRvCenter',
+		ResultType: 2,
+		ToolTip: 'Get-ASRvCenter'
+	},
+	{
+		CompletionText: 'Get-AssignedAccess',
+		ListItemText: 'Get-AssignedAccess',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AssignedAccess \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AuthenticodeSignature',
+		ListItemText: 'Get-AuthenticodeSignature',
+		ResultType: 2,
+		ToolTip: 'Get-AuthenticodeSignature\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AutologgerConfig',
+		ListItemText: 'Get-AutologgerConfig',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AutologgerConfig \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAccessToken',
+		ListItemText: 'Get-AzAccessToken',
+		ResultType: 2,
+		ToolTip: 'Get-AzAccessToken\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzActionGroup',
+		ListItemText: 'Get-AzActionGroup',
+		ResultType: 2,
+		ToolTip: 'Get-AzActionGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzActivityLog',
+		ListItemText: 'Get-AzActivityLog',
+		ResultType: 2,
+		ToolTip: 'Get-AzActivityLog\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzActivityLogAlert',
+		ListItemText: 'Get-AzActivityLogAlert',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzActivityLogAlert \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzADAppCredential',
+		ListItemText: 'Get-AzADAppCredential',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzADAppCredential \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzADAppFederatedCredential',
+		ListItemText: 'Get-AzADAppFederatedCredential',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzADAppFederatedCredential \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzADApplication',
+		ListItemText: 'Get-AzADApplication',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzADApplication \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzADAppPermission',
+		ListItemText: 'Get-AzADAppPermission',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzADAppPermission \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzADGroup',
+		ListItemText: 'Get-AzADGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzADGroup \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzADGroupMember',
+		ListItemText: 'Get-AzADGroupMember',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzADGroupMember \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzADOrganization',
+		ListItemText: 'Get-AzADOrganization',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzADOrganization \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzADServicePrincipal',
+		ListItemText: 'Get-AzADServicePrincipal',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzADServicePrincipal \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzADServicePrincipalCredential',
+		ListItemText: 'Get-AzADServicePrincipalCredential',
+		ResultType: 2,
+		ToolTip: 'Get-AzADServicePrincipalCredential'
+	},
+	{
+		CompletionText: 'Get-AzADSpCredential',
+		ListItemText: 'Get-AzADSpCredential',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzADSpCredential \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzADUser',
+		ListItemText: 'Get-AzADUser',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzADUser \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAdvisorConfiguration',
+		ListItemText: 'Get-AzAdvisorConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzAdvisorConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAdvisorRecommendation',
+		ListItemText: 'Get-AzAdvisorRecommendation',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzAdvisorRecommendation \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAksCluster',
+		ListItemText: 'Get-AzAksCluster',
+		ResultType: 2,
+		ToolTip: 'Get-AzAksCluster\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAksClusterUpgradeProfile',
+		ListItemText: 'Get-AzAksClusterUpgradeProfile',
+		ResultType: 2,
+		ToolTip: 'Get-AzAksClusterUpgradeProfile'
+	},
+	{
+		CompletionText: 'Get-AzAksMaintenanceConfiguration',
+		ListItemText: 'Get-AzAksMaintenanceConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzAksMaintenanceConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAksManagedClusterCommandResult',
+		ListItemText: 'Get-AzAksManagedClusterCommandResult',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzAksManagedClusterCommandResult \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAksManagedClusterOSOption',
+		ListItemText: 'Get-AzAksManagedClusterOSOption',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzAksManagedClusterOSOption \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAksManagedClusterOutboundNetworkDependencyEndpoint',
+		ListItemText: 'Get-AzAksManagedClusterOutboundNetworkDependencyEndpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzAksManagedClusterOutboundNetworkDependencyEndpoint \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAksNodePool',
+		ListItemText: 'Get-AzAksNodePool',
+		ResultType: 2,
+		ToolTip: 'Get-AzAksNodePool\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAksNodePoolUpgradeProfile',
+		ListItemText: 'Get-AzAksNodePoolUpgradeProfile',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzAksNodePoolUpgradeProfile \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAksSnapshot',
+		ListItemText: 'Get-AzAksSnapshot',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzAksSnapshot \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAksUpgradeProfile',
+		ListItemText: 'Get-AzAksUpgradeProfile',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzAksUpgradeProfile \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAksVersion',
+		ListItemText: 'Get-AzAksVersion',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzAksVersion \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAlertHistory',
+		ListItemText: 'Get-AzAlertHistory',
+		ResultType: 2,
+		ToolTip: 'Get-AzAlertHistory\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAlertRule',
+		ListItemText: 'Get-AzAlertRule',
+		ResultType: 2,
+		ToolTip: 'Get-AzAlertRule\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAlertsSuppressionRule',
+		ListItemText: 'Get-AzAlertsSuppressionRule',
+		ResultType: 2,
+		ToolTip: 'Get-AzAlertsSuppressionRule\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAllowedConnection',
+		ListItemText: 'Get-AzAllowedConnection',
+		ResultType: 2,
+		ToolTip: 'Get-AzAllowedConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAnalysisServicesServer',
+		ListItemText: 'Get-AzAnalysisServicesServer',
+		ResultType: 2,
+		ToolTip: 'Get-AzAnalysisServicesServer\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApiManagement',
+		ListItemText: 'Get-AzApiManagement',
+		ResultType: 2,
+		ToolTip: 'Get-AzApiManagement\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApiManagementApi',
+		ListItemText: 'Get-AzApiManagementApi',
+		ResultType: 2,
+		ToolTip: 'Get-AzApiManagementApi\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApiManagementApiRelease',
+		ListItemText: 'Get-AzApiManagementApiRelease',
+		ResultType: 2,
+		ToolTip: 'Get-AzApiManagementApiRelease\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApiManagementApiRevision',
+		ListItemText: 'Get-AzApiManagementApiRevision',
+		ResultType: 2,
+		ToolTip: 'Get-AzApiManagementApiRevision\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApiManagementApiSchema',
+		ListItemText: 'Get-AzApiManagementApiSchema',
+		ResultType: 2,
+		ToolTip: 'Get-AzApiManagementApiSchema\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApiManagementApiVersionSet',
+		ListItemText: 'Get-AzApiManagementApiVersionSet',
+		ResultType: 2,
+		ToolTip: 'Get-AzApiManagementApiVersionSet\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApiManagementAuthorizationServer',
+		ListItemText: 'Get-AzApiManagementAuthorizationServer',
+		ResultType: 2,
+		ToolTip: 'Get-AzApiManagementAuthorizationServer\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApiManagementAuthorizationServerClientSecret',
+		ListItemText: 'Get-AzApiManagementAuthorizationServerClientSecret',
+		ResultType: 2,
+		ToolTip: 'Get-AzApiManagementAuthorizationServerClientSecret\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApiManagementBackend',
+		ListItemText: 'Get-AzApiManagementBackend',
+		ResultType: 2,
+		ToolTip: 'Get-AzApiManagementBackend\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApiManagementCache',
+		ListItemText: 'Get-AzApiManagementCache',
+		ResultType: 2,
+		ToolTip: 'Get-AzApiManagementCache\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApiManagementCertificate',
+		ListItemText: 'Get-AzApiManagementCertificate',
+		ResultType: 2,
+		ToolTip: 'Get-AzApiManagementCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApiManagementDiagnostic',
+		ListItemText: 'Get-AzApiManagementDiagnostic',
+		ResultType: 2,
+		ToolTip: 'Get-AzApiManagementDiagnostic\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApiManagementGateway',
+		ListItemText: 'Get-AzApiManagementGateway',
+		ResultType: 2,
+		ToolTip: 'Get-AzApiManagementGateway\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApiManagementGatewayHostnameConfiguration',
+		ListItemText: 'Get-AzApiManagementGatewayHostnameConfiguration',
+		ResultType: 2,
+		ToolTip: 'Get-AzApiManagementGatewayHostnameConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApiManagementGatewayKey',
+		ListItemText: 'Get-AzApiManagementGatewayKey',
+		ResultType: 2,
+		ToolTip: 'Get-AzApiManagementGatewayKey\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApiManagementGroup',
+		ListItemText: 'Get-AzApiManagementGroup',
+		ResultType: 2,
+		ToolTip: 'Get-AzApiManagementGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApiManagementIdentityProvider',
+		ListItemText: 'Get-AzApiManagementIdentityProvider',
+		ResultType: 2,
+		ToolTip: 'Get-AzApiManagementIdentityProvider\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApiManagementIdentityProviderClientSecret',
+		ListItemText: 'Get-AzApiManagementIdentityProviderClientSecret',
+		ResultType: 2,
+		ToolTip: 'Get-AzApiManagementIdentityProviderClientSecret\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApiManagementLogger',
+		ListItemText: 'Get-AzApiManagementLogger',
+		ResultType: 2,
+		ToolTip: 'Get-AzApiManagementLogger\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApiManagementNamedValue',
+		ListItemText: 'Get-AzApiManagementNamedValue',
+		ResultType: 2,
+		ToolTip: 'Get-AzApiManagementNamedValue\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApiManagementNamedValueSecretValue',
+		ListItemText: 'Get-AzApiManagementNamedValueSecretValue',
+		ResultType: 2,
+		ToolTip: 'Get-AzApiManagementNamedValueSecretValue\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApiManagementNetworkStatus',
+		ListItemText: 'Get-AzApiManagementNetworkStatus',
+		ResultType: 2,
+		ToolTip: 'Get-AzApiManagementNetworkStatus\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApiManagementOpenIdConnectProvider',
+		ListItemText: 'Get-AzApiManagementOpenIdConnectProvider',
+		ResultType: 2,
+		ToolTip: 'Get-AzApiManagementOpenIdConnectProvider\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApiManagementOpenIdConnectProviderClientSecret',
+		ListItemText: 'Get-AzApiManagementOpenIdConnectProviderClientSecret',
+		ResultType: 2,
+		ToolTip: 'Get-AzApiManagementOpenIdConnectProviderClientSecret\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApiManagementOperation',
+		ListItemText: 'Get-AzApiManagementOperation',
+		ResultType: 2,
+		ToolTip: 'Get-AzApiManagementOperation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApiManagementPolicy',
+		ListItemText: 'Get-AzApiManagementPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzApiManagementPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApiManagementProduct',
+		ListItemText: 'Get-AzApiManagementProduct',
+		ResultType: 2,
+		ToolTip: 'Get-AzApiManagementProduct\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApiManagementSsoToken',
+		ListItemText: 'Get-AzApiManagementSsoToken',
+		ResultType: 2,
+		ToolTip: 'Get-AzApiManagementSsoToken\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApiManagementSubscription',
+		ListItemText: 'Get-AzApiManagementSubscription',
+		ResultType: 2,
+		ToolTip: 'Get-AzApiManagementSubscription\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApiManagementSubscriptionKey',
+		ListItemText: 'Get-AzApiManagementSubscriptionKey',
+		ResultType: 2,
+		ToolTip: 'Get-AzApiManagementSubscriptionKey\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApiManagementTenantAccess',
+		ListItemText: 'Get-AzApiManagementTenantAccess',
+		ResultType: 2,
+		ToolTip: 'Get-AzApiManagementTenantAccess\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApiManagementTenantAccessSecret',
+		ListItemText: 'Get-AzApiManagementTenantAccessSecret',
+		ResultType: 2,
+		ToolTip: 'Get-AzApiManagementTenantAccessSecret\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApiManagementTenantGitAccess',
+		ListItemText: 'Get-AzApiManagementTenantGitAccess',
+		ResultType: 2,
+		ToolTip: 'Get-AzApiManagementTenantGitAccess\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApiManagementTenantGitAccessSecret',
+		ListItemText: 'Get-AzApiManagementTenantGitAccessSecret',
+		ResultType: 2,
+		ToolTip: 'Get-AzApiManagementTenantGitAccessSecret\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApiManagementTenantSyncState',
+		ListItemText: 'Get-AzApiManagementTenantSyncState',
+		ResultType: 2,
+		ToolTip: 'Get-AzApiManagementTenantSyncState\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApiManagementUser',
+		ListItemText: 'Get-AzApiManagementUser',
+		ResultType: 2,
+		ToolTip: 'Get-AzApiManagementUser\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApiManagementUserSsoUrl',
+		ListItemText: 'Get-AzApiManagementUserSsoUrl',
+		ResultType: 2,
+		ToolTip: 'Get-AzApiManagementUserSsoUrl\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAppConfigurationDeletedStore',
+		ListItemText: 'Get-AzAppConfigurationDeletedStore',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzAppConfigurationDeletedStore \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAppConfigurationStore',
+		ListItemText: 'Get-AzAppConfigurationStore',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzAppConfigurationStore \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAppConfigurationStoreKey',
+		ListItemText: 'Get-AzAppConfigurationStoreKey',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzAppConfigurationStoreKey \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGateway',
+		ListItemText: 'Get-AzApplicationGateway',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGateway\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewayAuthenticationCertificate',
+		ListItemText: 'Get-AzApplicationGatewayAuthenticationCertificate',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewayAuthenticationCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewayAutoscaleConfiguration',
+		ListItemText: 'Get-AzApplicationGatewayAutoscaleConfiguration',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewayAutoscaleConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewayAvailableServerVariableAndHeader',
+		ListItemText: 'Get-AzApplicationGatewayAvailableServerVariableAndHeader',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewayAvailableServerVariableAndHeader\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewayAvailableSslOption',
+		ListItemText: 'Get-AzApplicationGatewayAvailableSslOption',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewayAvailableSslOption\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewayAvailableSslOptions',
+		ListItemText: 'Get-AzApplicationGatewayAvailableSslOptions',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewayAvailableSslOptions'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewayAvailableWafRuleSet',
+		ListItemText: 'Get-AzApplicationGatewayAvailableWafRuleSet',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewayAvailableWafRuleSet\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewayAvailableWafRuleSets',
+		ListItemText: 'Get-AzApplicationGatewayAvailableWafRuleSets',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewayAvailableWafRuleSets'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewayBackendAddressPool',
+		ListItemText: 'Get-AzApplicationGatewayBackendAddressPool',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewayBackendAddressPool\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewayBackendHealth',
+		ListItemText: 'Get-AzApplicationGatewayBackendHealth',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewayBackendHealth\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewayBackendHttpSetting',
+		ListItemText: 'Get-AzApplicationGatewayBackendHttpSetting',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewayBackendHttpSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewayBackendHttpSettings',
+		ListItemText: 'Get-AzApplicationGatewayBackendHttpSettings',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewayBackendHttpSettings'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewayBackendSetting',
+		ListItemText: 'Get-AzApplicationGatewayBackendSetting',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewayBackendSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewayClientAuthConfiguration',
+		ListItemText: 'Get-AzApplicationGatewayClientAuthConfiguration',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewayClientAuthConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewayConnectionDraining',
+		ListItemText: 'Get-AzApplicationGatewayConnectionDraining',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewayConnectionDraining\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewayCustomError',
+		ListItemText: 'Get-AzApplicationGatewayCustomError',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewayCustomError\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewayFirewallPolicy',
+		ListItemText: 'Get-AzApplicationGatewayFirewallPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewayFirewallPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewayFrontendIPConfig',
+		ListItemText: 'Get-AzApplicationGatewayFrontendIPConfig',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewayFrontendIPConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewayFrontendPort',
+		ListItemText: 'Get-AzApplicationGatewayFrontendPort',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewayFrontendPort\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewayHttpListener',
+		ListItemText: 'Get-AzApplicationGatewayHttpListener',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewayHttpListener\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewayHttpListenerCustomError',
+		ListItemText: 'Get-AzApplicationGatewayHttpListenerCustomError',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewayHttpListenerCustomError\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewayIdentity',
+		ListItemText: 'Get-AzApplicationGatewayIdentity',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewayIdentity\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewayIPConfiguration',
+		ListItemText: 'Get-AzApplicationGatewayIPConfiguration',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewayIPConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewayListener',
+		ListItemText: 'Get-AzApplicationGatewayListener',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewayListener\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewayPrivateLinkConfiguration',
+		ListItemText: 'Get-AzApplicationGatewayPrivateLinkConfiguration',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewayPrivateLinkConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewayProbeConfig',
+		ListItemText: 'Get-AzApplicationGatewayProbeConfig',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewayProbeConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewayRedirectConfiguration',
+		ListItemText: 'Get-AzApplicationGatewayRedirectConfiguration',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewayRedirectConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewayRequestRoutingRule',
+		ListItemText: 'Get-AzApplicationGatewayRequestRoutingRule',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewayRequestRoutingRule\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewayRewriteRuleSet',
+		ListItemText: 'Get-AzApplicationGatewayRewriteRuleSet',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewayRewriteRuleSet\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewayRoutingRule',
+		ListItemText: 'Get-AzApplicationGatewayRoutingRule',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewayRoutingRule\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewaySku',
+		ListItemText: 'Get-AzApplicationGatewaySku',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewaySku\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewaySslCertificate',
+		ListItemText: 'Get-AzApplicationGatewaySslCertificate',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewaySslCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewaySslPolicy',
+		ListItemText: 'Get-AzApplicationGatewaySslPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewaySslPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewaySslPredefinedPolicy',
+		ListItemText: 'Get-AzApplicationGatewaySslPredefinedPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewaySslPredefinedPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewaySslProfile',
+		ListItemText: 'Get-AzApplicationGatewaySslProfile',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewaySslProfile\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewaySslProfilePolicy',
+		ListItemText: 'Get-AzApplicationGatewaySslProfilePolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewaySslProfilePolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewayTrustedClientCertificate',
+		ListItemText: 'Get-AzApplicationGatewayTrustedClientCertificate',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewayTrustedClientCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewayTrustedRootCertificate',
+		ListItemText: 'Get-AzApplicationGatewayTrustedRootCertificate',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewayTrustedRootCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewayUrlPathMapConfig',
+		ListItemText: 'Get-AzApplicationGatewayUrlPathMapConfig',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewayUrlPathMapConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewayWafDynamicManifest',
+		ListItemText: 'Get-AzApplicationGatewayWafDynamicManifest',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewayWafDynamicManifest\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationGatewayWebApplicationFirewallConfiguration',
+		ListItemText: 'Get-AzApplicationGatewayWebApplicationFirewallConfiguration',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationGatewayWebApplicationFirewallConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationInsights',
+		ListItemText: 'Get-AzApplicationInsights',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzApplicationInsights \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationInsightsApiKey',
+		ListItemText: 'Get-AzApplicationInsightsApiKey',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzApplicationInsightsApiKey \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationInsightsContinuousExport',
+		ListItemText: 'Get-AzApplicationInsightsContinuousExport',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzApplicationInsightsContinuousExport \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationInsightsLinkedStorageAccount',
+		ListItemText: 'Get-AzApplicationInsightsLinkedStorageAccount',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzApplicationInsightsLinkedStorageAccount \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationInsightsMyWorkbook',
+		ListItemText: 'Get-AzApplicationInsightsMyWorkbook',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzApplicationInsightsMyWorkbook \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationInsightsWebTest',
+		ListItemText: 'Get-AzApplicationInsightsWebTest',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzApplicationInsightsWebTest \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationInsightsWorkbook',
+		ListItemText: 'Get-AzApplicationInsightsWorkbook',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzApplicationInsightsWorkbook \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationInsightsWorkbookRevision',
+		ListItemText: 'Get-AzApplicationInsightsWorkbookRevision',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzApplicationInsightsWorkbookRevision \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationInsightsWorkbookTemplate',
+		ListItemText: 'Get-AzApplicationInsightsWorkbookTemplate',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzApplicationInsightsWorkbookTemplate \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplicationSecurityGroup',
+		ListItemText: 'Get-AzApplicationSecurityGroup',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplicationSecurityGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzApplyUpdate',
+		ListItemText: 'Get-AzApplyUpdate',
+		ResultType: 2,
+		ToolTip: 'Get-AzApplyUpdate\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAppServiceEnvironment',
+		ListItemText: 'Get-AzAppServiceEnvironment',
+		ResultType: 2,
+		ToolTip: 'Get-AzAppServiceEnvironment\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAppServicePlan',
+		ListItemText: 'Get-AzAppServicePlan',
+		ResultType: 2,
+		ToolTip: 'Get-AzAppServicePlan\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAs',
+		ListItemText: 'Get-AzAs',
+		ResultType: 2,
+		ToolTip: 'Get-AzAs'
+	},
+	{
+		CompletionText: 'Get-AzAttestationDefaultProvider',
+		ListItemText: 'Get-AzAttestationDefaultProvider',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzAttestationDefaultProvider \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAttestationPolicy',
+		ListItemText: 'Get-AzAttestationPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzAttestationPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAttestationPolicySigners',
+		ListItemText: 'Get-AzAttestationPolicySigners',
+		ResultType: 2,
+		ToolTip: 'Get-AzAttestationPolicySigners\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAttestationProvider',
+		ListItemText: 'Get-AzAttestationProvider',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzAttestationProvider \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutoApprovedPrivateLinkService',
+		ListItemText: 'Get-AzAutoApprovedPrivateLinkService',
+		ResultType: 2,
+		ToolTip: 'Get-AzAutoApprovedPrivateLinkService\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomanageBestPractice',
+		ListItemText: 'Get-AzAutomanageBestPractice',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzAutomanageBestPractice \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomanageConfigProfile',
+		ListItemText: 'Get-AzAutomanageConfigProfile',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzAutomanageConfigProfile \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomanageConfigProfileAssignment',
+		ListItemText: 'Get-AzAutomanageConfigProfileAssignment',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzAutomanageConfigProfileAssignment \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomanageConfigProfileHciAssignment',
+		ListItemText: 'Get-AzAutomanageConfigProfileHciAssignment',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzAutomanageConfigProfileHciAssignment \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomanageConfigProfileHcrpAssignment',
+		ListItemText: 'Get-AzAutomanageConfigProfileHcrpAssignment',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzAutomanageConfigProfileHcrpAssignment \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomanageHciReport',
+		ListItemText: 'Get-AzAutomanageHciReport',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzAutomanageHciReport \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomanageHcrpReport',
+		ListItemText: 'Get-AzAutomanageHcrpReport',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzAutomanageHcrpReport \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomanageReport',
+		ListItemText: 'Get-AzAutomanageReport',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzAutomanageReport \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomationAccount',
+		ListItemText: 'Get-AzAutomationAccount',
+		ResultType: 2,
+		ToolTip: 'Get-AzAutomationAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomationCertificate',
+		ListItemText: 'Get-AzAutomationCertificate',
+		ResultType: 2,
+		ToolTip: 'Get-AzAutomationCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomationConnection',
+		ListItemText: 'Get-AzAutomationConnection',
+		ResultType: 2,
+		ToolTip: 'Get-AzAutomationConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomationCredential',
+		ListItemText: 'Get-AzAutomationCredential',
+		ResultType: 2,
+		ToolTip: 'Get-AzAutomationCredential\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomationDscCompilationJob',
+		ListItemText: 'Get-AzAutomationDscCompilationJob',
+		ResultType: 2,
+		ToolTip: 'Get-AzAutomationDscCompilationJob\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomationDscCompilationJobOutput',
+		ListItemText: 'Get-AzAutomationDscCompilationJobOutput',
+		ResultType: 2,
+		ToolTip: 'Get-AzAutomationDscCompilationJobOutput\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomationDscConfiguration',
+		ListItemText: 'Get-AzAutomationDscConfiguration',
+		ResultType: 2,
+		ToolTip: 'Get-AzAutomationDscConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomationDscNode',
+		ListItemText: 'Get-AzAutomationDscNode',
+		ResultType: 2,
+		ToolTip: 'Get-AzAutomationDscNode\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomationDscNodeConfiguration',
+		ListItemText: 'Get-AzAutomationDscNodeConfiguration',
+		ResultType: 2,
+		ToolTip: 'Get-AzAutomationDscNodeConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomationDscNodeConfigurationDeployment',
+		ListItemText: 'Get-AzAutomationDscNodeConfigurationDeployment',
+		ResultType: 2,
+		ToolTip: 'Get-AzAutomationDscNodeConfigurationDeployment\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomationDscNodeConfigurationDeploymentSchedule',
+		ListItemText: 'Get-AzAutomationDscNodeConfigurationDeploymentSchedule',
+		ResultType: 2,
+		ToolTip: 'Get-AzAutomationDscNodeConfigurationDeploymentSchedule\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomationDscNodeReport',
+		ListItemText: 'Get-AzAutomationDscNodeReport',
+		ResultType: 2,
+		ToolTip: 'Get-AzAutomationDscNodeReport\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomationDscOnboardingMetaconfig',
+		ListItemText: 'Get-AzAutomationDscOnboardingMetaconfig',
+		ResultType: 2,
+		ToolTip: 'Get-AzAutomationDscOnboardingMetaconfig\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomationHybridRunbookWorker',
+		ListItemText: 'Get-AzAutomationHybridRunbookWorker',
+		ResultType: 2,
+		ToolTip: 'Get-AzAutomationHybridRunbookWorker\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomationHybridRunbookWorkerGroup',
+		ListItemText: 'Get-AzAutomationHybridRunbookWorkerGroup',
+		ResultType: 2,
+		ToolTip: 'Get-AzAutomationHybridRunbookWorkerGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomationHybridWorkerGroup',
+		ListItemText: 'Get-AzAutomationHybridWorkerGroup',
+		ResultType: 2,
+		ToolTip: 'Get-AzAutomationHybridWorkerGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomationJob',
+		ListItemText: 'Get-AzAutomationJob',
+		ResultType: 2,
+		ToolTip: 'Get-AzAutomationJob\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomationJobOutput',
+		ListItemText: 'Get-AzAutomationJobOutput',
+		ResultType: 2,
+		ToolTip: 'Get-AzAutomationJobOutput\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomationJobOutputRecord',
+		ListItemText: 'Get-AzAutomationJobOutputRecord',
+		ResultType: 2,
+		ToolTip: 'Get-AzAutomationJobOutputRecord\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomationModule',
+		ListItemText: 'Get-AzAutomationModule',
+		ResultType: 2,
+		ToolTip: 'Get-AzAutomationModule\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomationPython3Package',
+		ListItemText: 'Get-AzAutomationPython3Package',
+		ResultType: 2,
+		ToolTip: 'Get-AzAutomationPython3Package\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomationRegistrationInfo',
+		ListItemText: 'Get-AzAutomationRegistrationInfo',
+		ResultType: 2,
+		ToolTip: 'Get-AzAutomationRegistrationInfo\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomationRunbook',
+		ListItemText: 'Get-AzAutomationRunbook',
+		ResultType: 2,
+		ToolTip: 'Get-AzAutomationRunbook\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomationSchedule',
+		ListItemText: 'Get-AzAutomationSchedule',
+		ResultType: 2,
+		ToolTip: 'Get-AzAutomationSchedule\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomationScheduledRunbook',
+		ListItemText: 'Get-AzAutomationScheduledRunbook',
+		ResultType: 2,
+		ToolTip: 'Get-AzAutomationScheduledRunbook\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomationSoftwareUpdateConfiguration',
+		ListItemText: 'Get-AzAutomationSoftwareUpdateConfiguration',
+		ResultType: 2,
+		ToolTip: 'Get-AzAutomationSoftwareUpdateConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomationSoftwareUpdateMachineRun',
+		ListItemText: 'Get-AzAutomationSoftwareUpdateMachineRun',
+		ResultType: 2,
+		ToolTip: 'Get-AzAutomationSoftwareUpdateMachineRun\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomationSoftwareUpdateRun',
+		ListItemText: 'Get-AzAutomationSoftwareUpdateRun',
+		ResultType: 2,
+		ToolTip: 'Get-AzAutomationSoftwareUpdateRun\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomationSourceControl',
+		ListItemText: 'Get-AzAutomationSourceControl',
+		ResultType: 2,
+		ToolTip: 'Get-AzAutomationSourceControl\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomationSourceControlSyncJob',
+		ListItemText: 'Get-AzAutomationSourceControlSyncJob',
+		ResultType: 2,
+		ToolTip: 'Get-AzAutomationSourceControlSyncJob\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomationSourceControlSyncJobOutput',
+		ListItemText: 'Get-AzAutomationSourceControlSyncJobOutput',
+		ResultType: 2,
+		ToolTip: 'Get-AzAutomationSourceControlSyncJobOutput\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomationVariable',
+		ListItemText: 'Get-AzAutomationVariable',
+		ResultType: 2,
+		ToolTip: 'Get-AzAutomationVariable\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutomationWebhook',
+		ListItemText: 'Get-AzAutomationWebhook',
+		ResultType: 2,
+		ToolTip: 'Get-AzAutomationWebhook\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutoscaleHistory',
+		ListItemText: 'Get-AzAutoscaleHistory',
+		ResultType: 2,
+		ToolTip: 'Get-AzAutoscaleHistory\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutoscalePredictiveMetric',
+		ListItemText: 'Get-AzAutoscalePredictiveMetric',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzAutoscalePredictiveMetric \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAutoscaleSetting',
+		ListItemText: 'Get-AzAutoscaleSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzAutoscaleSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAvailabilityGroupListener',
+		ListItemText: 'Get-AzAvailabilityGroupListener',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzAvailabilityGroupListener \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAvailabilitySet',
+		ListItemText: 'Get-AzAvailabilitySet',
+		ResultType: 2,
+		ToolTip: 'Get-AzAvailabilitySet\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAvailablePrivateEndpointType',
+		ListItemText: 'Get-AzAvailablePrivateEndpointType',
+		ResultType: 2,
+		ToolTip: 'Get-AzAvailablePrivateEndpointType\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAvailableServiceAlias',
+		ListItemText: 'Get-AzAvailableServiceAlias',
+		ResultType: 2,
+		ToolTip: 'Get-AzAvailableServiceAlias\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzAvailableServiceDelegation',
+		ListItemText: 'Get-AzAvailableServiceDelegation',
+		ResultType: 2,
+		ToolTip: 'Get-AzAvailableServiceDelegation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzBastion',
+		ListItemText: 'Get-AzBastion',
+		ResultType: 2,
+		ToolTip: 'Get-AzBastion\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzBatchAccount',
+		ListItemText: 'Get-AzBatchAccount',
+		ResultType: 2,
+		ToolTip: 'Get-AzBatchAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzBatchAccountKey',
+		ListItemText: 'Get-AzBatchAccountKey',
+		ResultType: 2,
+		ToolTip: 'Get-AzBatchAccountKey\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzBatchAccountKeys',
+		ListItemText: 'Get-AzBatchAccountKeys',
+		ResultType: 2,
+		ToolTip: 'Get-AzBatchAccountKeys'
+	},
+	{
+		CompletionText: 'Get-AzBatchApplication',
+		ListItemText: 'Get-AzBatchApplication',
+		ResultType: 2,
+		ToolTip: 'Get-AzBatchApplication\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzBatchApplicationPackage',
+		ListItemText: 'Get-AzBatchApplicationPackage',
+		ResultType: 2,
+		ToolTip: 'Get-AzBatchApplicationPackage\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzBatchCertificate',
+		ListItemText: 'Get-AzBatchCertificate',
+		ResultType: 2,
+		ToolTip: 'Get-AzBatchCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzBatchComputeNode',
+		ListItemText: 'Get-AzBatchComputeNode',
+		ResultType: 2,
+		ToolTip: 'Get-AzBatchComputeNode\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzBatchComputeNodeExtension',
+		ListItemText: 'Get-AzBatchComputeNodeExtension',
+		ResultType: 2,
+		ToolTip: 'Get-AzBatchComputeNodeExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzBatchJob',
+		ListItemText: 'Get-AzBatchJob',
+		ResultType: 2,
+		ToolTip: 'Get-AzBatchJob\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzBatchJobPreparationAndReleaseTaskStatus',
+		ListItemText: 'Get-AzBatchJobPreparationAndReleaseTaskStatus',
+		ResultType: 2,
+		ToolTip: 'Get-AzBatchJobPreparationAndReleaseTaskStatus\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzBatchJobSchedule',
+		ListItemText: 'Get-AzBatchJobSchedule',
+		ResultType: 2,
+		ToolTip: 'Get-AzBatchJobSchedule\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzBatchJobStatistic',
+		ListItemText: 'Get-AzBatchJobStatistic',
+		ResultType: 2,
+		ToolTip: 'Get-AzBatchJobStatistic\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzBatchJobStatistics',
+		ListItemText: 'Get-AzBatchJobStatistics',
+		ResultType: 2,
+		ToolTip: 'Get-AzBatchJobStatistics'
+	},
+	{
+		CompletionText: 'Get-AzBatchLocationQuota',
+		ListItemText: 'Get-AzBatchLocationQuota',
+		ResultType: 2,
+		ToolTip: 'Get-AzBatchLocationQuota\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzBatchLocationQuotas',
+		ListItemText: 'Get-AzBatchLocationQuotas',
+		ResultType: 2,
+		ToolTip: 'Get-AzBatchLocationQuotas'
+	},
+	{
+		CompletionText: 'Get-AzBatchNodeFile',
+		ListItemText: 'Get-AzBatchNodeFile',
+		ResultType: 2,
+		ToolTip: 'Get-AzBatchNodeFile\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzBatchNodeFileContent',
+		ListItemText: 'Get-AzBatchNodeFileContent',
+		ResultType: 2,
+		ToolTip: 'Get-AzBatchNodeFileContent\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzBatchPool',
+		ListItemText: 'Get-AzBatchPool',
+		ResultType: 2,
+		ToolTip: 'Get-AzBatchPool\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzBatchPoolNodeCount',
+		ListItemText: 'Get-AzBatchPoolNodeCount',
+		ResultType: 2,
+		ToolTip: 'Get-AzBatchPoolNodeCount\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzBatchPoolNodeCounts',
+		ListItemText: 'Get-AzBatchPoolNodeCounts',
+		ResultType: 2,
+		ToolTip: 'Get-AzBatchPoolNodeCounts'
+	},
+	{
+		CompletionText: 'Get-AzBatchPoolStatistic',
+		ListItemText: 'Get-AzBatchPoolStatistic',
+		ResultType: 2,
+		ToolTip: 'Get-AzBatchPoolStatistic\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzBatchPoolStatistics',
+		ListItemText: 'Get-AzBatchPoolStatistics',
+		ResultType: 2,
+		ToolTip: 'Get-AzBatchPoolStatistics'
+	},
+	{
+		CompletionText: 'Get-AzBatchPoolUsageMetric',
+		ListItemText: 'Get-AzBatchPoolUsageMetric',
+		ResultType: 2,
+		ToolTip: 'Get-AzBatchPoolUsageMetric\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzBatchPoolUsageMetrics',
+		ListItemText: 'Get-AzBatchPoolUsageMetrics',
+		ResultType: 2,
+		ToolTip: 'Get-AzBatchPoolUsageMetrics'
+	},
+	{
+		CompletionText: 'Get-AzBatchRemoteDesktopProtocolFile',
+		ListItemText: 'Get-AzBatchRemoteDesktopProtocolFile',
+		ResultType: 2,
+		ToolTip: 'Get-AzBatchRemoteDesktopProtocolFile\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzBatchRemoteLoginSetting',
+		ListItemText: 'Get-AzBatchRemoteLoginSetting',
+		ResultType: 2,
+		ToolTip: 'Get-AzBatchRemoteLoginSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzBatchRemoteLoginSettings',
+		ListItemText: 'Get-AzBatchRemoteLoginSettings',
+		ResultType: 2,
+		ToolTip: 'Get-AzBatchRemoteLoginSettings'
+	},
+	{
+		CompletionText: 'Get-AzBatchSubscriptionQuotas',
+		ListItemText: 'Get-AzBatchSubscriptionQuotas',
+		ResultType: 2,
+		ToolTip: 'Get-AzBatchSubscriptionQuotas'
+	},
+	{
+		CompletionText: 'Get-AzBatchSubtask',
+		ListItemText: 'Get-AzBatchSubtask',
+		ResultType: 2,
+		ToolTip: 'Get-AzBatchSubtask\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzBatchSupportedImage',
+		ListItemText: 'Get-AzBatchSupportedImage',
+		ResultType: 2,
+		ToolTip: 'Get-AzBatchSupportedImage\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzBatchSupportedVirtualMachineSku',
+		ListItemText: 'Get-AzBatchSupportedVirtualMachineSku',
+		ResultType: 2,
+		ToolTip: 'Get-AzBatchSupportedVirtualMachineSku\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzBatchSupportedVMSku',
+		ListItemText: 'Get-AzBatchSupportedVMSku',
+		ResultType: 2,
+		ToolTip: 'Get-AzBatchSupportedVMSku'
+	},
+	{
+		CompletionText: 'Get-AzBatchTask',
+		ListItemText: 'Get-AzBatchTask',
+		ResultType: 2,
+		ToolTip: 'Get-AzBatchTask\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzBatchTaskCount',
+		ListItemText: 'Get-AzBatchTaskCount',
+		ResultType: 2,
+		ToolTip: 'Get-AzBatchTaskCount\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzBatchTaskCounts',
+		ListItemText: 'Get-AzBatchTaskCounts',
+		ResultType: 2,
+		ToolTip: 'Get-AzBatchTaskCounts'
+	},
+	{
+		CompletionText: 'Get-AzBatchTaskSlotCount',
+		ListItemText: 'Get-AzBatchTaskSlotCount',
+		ResultType: 2,
+		ToolTip: 'Get-AzBatchTaskSlotCount\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzBgpServiceCommunity',
+		ListItemText: 'Get-AzBgpServiceCommunity',
+		ResultType: 2,
+		ToolTip: 'Get-AzBgpServiceCommunity\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzBillingAccount',
+		ListItemText: 'Get-AzBillingAccount',
+		ResultType: 2,
+		ToolTip: 'Get-AzBillingAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzBillingInvoice',
+		ListItemText: 'Get-AzBillingInvoice',
+		ResultType: 2,
+		ToolTip: 'Get-AzBillingInvoice\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzBillingPeriod',
+		ListItemText: 'Get-AzBillingPeriod',
+		ResultType: 2,
+		ToolTip: 'Get-AzBillingPeriod\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzBillingProfile',
+		ListItemText: 'Get-AzBillingProfile',
+		ResultType: 2,
+		ToolTip: 'Get-AzBillingProfile\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCapacityReservation',
+		ListItemText: 'Get-AzCapacityReservation',
+		ResultType: 2,
+		ToolTip: 'Get-AzCapacityReservation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCapacityReservationGroup',
+		ListItemText: 'Get-AzCapacityReservationGroup',
+		ResultType: 2,
+		ToolTip: 'Get-AzCapacityReservationGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCdnCustomDomain',
+		ListItemText: 'Get-AzCdnCustomDomain',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzCdnCustomDomain \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCdnEdgeNode',
+		ListItemText: 'Get-AzCdnEdgeNode',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzCdnEdgeNode \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCdnEndpoint',
+		ListItemText: 'Get-AzCdnEndpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzCdnEndpoint \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCdnEndpointResourceUsage',
+		ListItemText: 'Get-AzCdnEndpointResourceUsage',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzCdnEndpointResourceUsage \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCdnOrigin',
+		ListItemText: 'Get-AzCdnOrigin',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzCdnOrigin \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCdnOriginGroup',
+		ListItemText: 'Get-AzCdnOriginGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzCdnOriginGroup \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCdnProfile',
+		ListItemText: 'Get-AzCdnProfile',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzCdnProfile \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCdnProfileResourceUsage',
+		ListItemText: 'Get-AzCdnProfileResourceUsage',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzCdnProfileResourceUsage \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCdnProfileSupportedOptimizationType',
+		ListItemText: 'Get-AzCdnProfileSupportedOptimizationType',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzCdnProfileSupportedOptimizationType \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCdnSubscriptionResourceUsage',
+		ListItemText: 'Get-AzCdnSubscriptionResourceUsage',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzCdnSubscriptionResourceUsage \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCloudService',
+		ListItemText: 'Get-AzCloudService',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzCloudService \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCloudServiceInstanceView',
+		ListItemText: 'Get-AzCloudServiceInstanceView',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzCloudServiceInstanceView \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCloudServiceNetworkInterface',
+		ListItemText: 'Get-AzCloudServiceNetworkInterface',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzCloudServiceNetworkInterface \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCloudServiceOSFamily',
+		ListItemText: 'Get-AzCloudServiceOSFamily',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzCloudServiceOSFamily \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCloudServiceOSVersion',
+		ListItemText: 'Get-AzCloudServiceOSVersion',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzCloudServiceOSVersion \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCloudServicePublicIPAddress',
+		ListItemText: 'Get-AzCloudServicePublicIPAddress',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzCloudServicePublicIPAddress \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCloudServiceRoleInstance',
+		ListItemText: 'Get-AzCloudServiceRoleInstance',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzCloudServiceRoleInstance \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCloudServiceRoleInstanceRemoteDesktopFile',
+		ListItemText: 'Get-AzCloudServiceRoleInstanceRemoteDesktopFile',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzCloudServiceRoleInstanceRemoteDesktopFile \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCloudServiceRoleInstanceView',
+		ListItemText: 'Get-AzCloudServiceRoleInstanceView',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzCloudServiceRoleInstanceView \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCognitiveServicesAccount',
+		ListItemText: 'Get-AzCognitiveServicesAccount',
+		ResultType: 2,
+		ToolTip: 'Get-AzCognitiveServicesAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCognitiveServicesAccountCommitmentPlan',
+		ListItemText: 'Get-AzCognitiveServicesAccountCommitmentPlan',
+		ResultType: 2,
+		ToolTip: 'Get-AzCognitiveServicesAccountCommitmentPlan\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCognitiveServicesAccountDeployment',
+		ListItemText: 'Get-AzCognitiveServicesAccountDeployment',
+		ResultType: 2,
+		ToolTip: 'Get-AzCognitiveServicesAccountDeployment\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCognitiveServicesAccountKey',
+		ListItemText: 'Get-AzCognitiveServicesAccountKey',
+		ResultType: 2,
+		ToolTip: 'Get-AzCognitiveServicesAccountKey\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCognitiveServicesAccountModel',
+		ListItemText: 'Get-AzCognitiveServicesAccountModel',
+		ResultType: 2,
+		ToolTip: 'Get-AzCognitiveServicesAccountModel\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCognitiveServicesAccountNetworkRuleSet',
+		ListItemText: 'Get-AzCognitiveServicesAccountNetworkRuleSet',
+		ResultType: 2,
+		ToolTip: 'Get-AzCognitiveServicesAccountNetworkRuleSet\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCognitiveServicesAccountSku',
+		ListItemText: 'Get-AzCognitiveServicesAccountSku',
+		ResultType: 2,
+		ToolTip: 'Get-AzCognitiveServicesAccountSku\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCognitiveServicesAccountSkus',
+		ListItemText: 'Get-AzCognitiveServicesAccountSkus',
+		ResultType: 2,
+		ToolTip: 'Get-AzCognitiveServicesAccountSkus'
+	},
+	{
+		CompletionText: 'Get-AzCognitiveServicesAccountType',
+		ListItemText: 'Get-AzCognitiveServicesAccountType',
+		ResultType: 2,
+		ToolTip: 'Get-AzCognitiveServicesAccountType\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCognitiveServicesAccountUsage',
+		ListItemText: 'Get-AzCognitiveServicesAccountUsage',
+		ResultType: 2,
+		ToolTip: 'Get-AzCognitiveServicesAccountUsage\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCognitiveServicesCommitmentPlan',
+		ListItemText: 'Get-AzCognitiveServicesCommitmentPlan',
+		ResultType: 2,
+		ToolTip: 'Get-AzCognitiveServicesCommitmentPlan\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCognitiveServicesCommitmentPlanAssociation',
+		ListItemText: 'Get-AzCognitiveServicesCommitmentPlanAssociation',
+		ResultType: 2,
+		ToolTip: 'Get-AzCognitiveServicesCommitmentPlanAssociation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCognitiveServicesCommitmentTier',
+		ListItemText: 'Get-AzCognitiveServicesCommitmentTier',
+		ResultType: 2,
+		ToolTip: 'Get-AzCognitiveServicesCommitmentTier\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzComputeResourceSku',
+		ListItemText: 'Get-AzComputeResourceSku',
+		ResultType: 2,
+		ToolTip: 'Get-AzComputeResourceSku\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzConfidentialLedger',
+		ListItemText: 'Get-AzConfidentialLedger',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzConfidentialLedger \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzConfig',
+		ListItemText: 'Get-AzConfig',
+		ResultType: 2,
+		ToolTip: 'Get-AzConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzConfigurationAssignment',
+		ListItemText: 'Get-AzConfigurationAssignment',
+		ResultType: 2,
+		ToolTip: 'Get-AzConfigurationAssignment\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzConsumptionBudget',
+		ListItemText: 'Get-AzConsumptionBudget',
+		ResultType: 2,
+		ToolTip: 'Get-AzConsumptionBudget\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzConsumptionMarketplace',
+		ListItemText: 'Get-AzConsumptionMarketplace',
+		ResultType: 2,
+		ToolTip: 'Get-AzConsumptionMarketplace\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzConsumptionPriceSheet',
+		ListItemText: 'Get-AzConsumptionPriceSheet',
+		ResultType: 2,
+		ToolTip: 'Get-AzConsumptionPriceSheet\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzConsumptionReservationDetail',
+		ListItemText: 'Get-AzConsumptionReservationDetail',
+		ResultType: 2,
+		ToolTip: 'Get-AzConsumptionReservationDetail\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzConsumptionReservationSummary',
+		ListItemText: 'Get-AzConsumptionReservationSummary',
+		ResultType: 2,
+		ToolTip: 'Get-AzConsumptionReservationSummary\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzConsumptionUsageDetail',
+		ListItemText: 'Get-AzConsumptionUsageDetail',
+		ResultType: 2,
+		ToolTip: 'Get-AzConsumptionUsageDetail\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzContainerGroup',
+		ListItemText: 'Get-AzContainerGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzContainerGroup \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzContainerGroupOutboundNetworkDependencyEndpoint',
+		ListItemText: 'Get-AzContainerGroupOutboundNetworkDependencyEndpoint',
+		ResultType: 2,
+		ToolTip: 'Get-AzContainerGroupOutboundNetworkDependencyEndpoint'
+	},
+	{
+		CompletionText: 'Get-AzContainerInstanceCachedImage',
+		ListItemText: 'Get-AzContainerInstanceCachedImage',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzContainerInstanceCachedImage \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzContainerInstanceCapability',
+		ListItemText: 'Get-AzContainerInstanceCapability',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzContainerInstanceCapability \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzContainerInstanceContainerGroupOutboundNetworkDependencyEndpoint',
+		ListItemText: 'Get-AzContainerInstanceContainerGroupOutboundNetworkDependencyEndpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzContainerInstanceContainerGroupOutboundNetworkDependencyEndpoint \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzContainerInstanceLog',
+		ListItemText: 'Get-AzContainerInstanceLog',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzContainerInstanceLog \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzContainerInstanceUsage',
+		ListItemText: 'Get-AzContainerInstanceUsage',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzContainerInstanceUsage \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzContainerRegistry',
+		ListItemText: 'Get-AzContainerRegistry',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzContainerRegistry \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzContainerRegistryAgentPool',
+		ListItemText: 'Get-AzContainerRegistryAgentPool',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzContainerRegistryAgentPool \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzContainerRegistryAgentPoolQueueStatus',
+		ListItemText: 'Get-AzContainerRegistryAgentPoolQueueStatus',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzContainerRegistryAgentPoolQueueStatus \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzContainerRegistryCredential',
+		ListItemText: 'Get-AzContainerRegistryCredential',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzContainerRegistryCredential \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzContainerRegistryExportPipeline',
+		ListItemText: 'Get-AzContainerRegistryExportPipeline',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzContainerRegistryExportPipeline \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzContainerRegistryImportPipeline',
+		ListItemText: 'Get-AzContainerRegistryImportPipeline',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzContainerRegistryImportPipeline \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzContainerRegistryManifest',
+		ListItemText: 'Get-AzContainerRegistryManifest',
+		ResultType: 2,
+		ToolTip: 'Get-AzContainerRegistryManifest\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzContainerRegistryReplication',
+		ListItemText: 'Get-AzContainerRegistryReplication',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzContainerRegistryReplication \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzContainerRegistryRepository',
+		ListItemText: 'Get-AzContainerRegistryRepository',
+		ResultType: 2,
+		ToolTip: 'Get-AzContainerRegistryRepository\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzContainerRegistryScopeMap',
+		ListItemText: 'Get-AzContainerRegistryScopeMap',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzContainerRegistryScopeMap \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzContainerRegistryTag',
+		ListItemText: 'Get-AzContainerRegistryTag',
+		ResultType: 2,
+		ToolTip: 'Get-AzContainerRegistryTag\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzContainerRegistryToken',
+		ListItemText: 'Get-AzContainerRegistryToken',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzContainerRegistryToken \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzContainerRegistryUsage',
+		ListItemText: 'Get-AzContainerRegistryUsage',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzContainerRegistryUsage \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzContainerRegistryWebhook',
+		ListItemText: 'Get-AzContainerRegistryWebhook',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzContainerRegistryWebhook \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzContainerRegistryWebhookCallbackConfig',
+		ListItemText: 'Get-AzContainerRegistryWebhookCallbackConfig',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzContainerRegistryWebhookCallbackConfig \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzContainerRegistryWebhookEvent',
+		ListItemText: 'Get-AzContainerRegistryWebhookEvent',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzContainerRegistryWebhookEvent \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzContext',
+		ListItemText: 'Get-AzContext',
+		ResultType: 2,
+		ToolTip: 'Get-AzContext\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzContextAutosaveSetting',
+		ListItemText: 'Get-AzContextAutosaveSetting',
+		ResultType: 2,
+		ToolTip: 'Get-AzContextAutosaveSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBAccount',
+		ListItemText: 'Get-AzCosmosDBAccount',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBAccountKey',
+		ListItemText: 'Get-AzCosmosDBAccountKey',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBAccountKey\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBCassandraKeyspace',
+		ListItemText: 'Get-AzCosmosDBCassandraKeyspace',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBCassandraKeyspace\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBCassandraKeyspaceThroughput',
+		ListItemText: 'Get-AzCosmosDBCassandraKeyspaceThroughput',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBCassandraKeyspaceThroughput\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBCassandraTable',
+		ListItemText: 'Get-AzCosmosDBCassandraTable',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBCassandraTable\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBCassandraTableThroughput',
+		ListItemText: 'Get-AzCosmosDBCassandraTableThroughput',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBCassandraTableThroughput\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDbClientEncryptionKey',
+		ListItemText: 'Get-AzCosmosDbClientEncryptionKey',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDbClientEncryptionKey\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBGremlinDatabase',
+		ListItemText: 'Get-AzCosmosDBGremlinDatabase',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBGremlinDatabase\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBGremlinDatabaseThroughput',
+		ListItemText: 'Get-AzCosmosDBGremlinDatabaseThroughput',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBGremlinDatabaseThroughput\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBGremlinGraph',
+		ListItemText: 'Get-AzCosmosDBGremlinGraph',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBGremlinGraph\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBGremlinGraphBackupInformation',
+		ListItemText: 'Get-AzCosmosDBGremlinGraphBackupInformation',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBGremlinGraphBackupInformation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBGremlinGraphThroughput',
+		ListItemText: 'Get-AzCosmosDBGremlinGraphThroughput',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBGremlinGraphThroughput\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBGremlinRestorableDatabase',
+		ListItemText: 'Get-AzCosmosDBGremlinRestorableDatabase',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBGremlinRestorableDatabase\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBGremlinRestorableGraph',
+		ListItemText: 'Get-AzCosmosDBGremlinRestorableGraph',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBGremlinRestorableGraph\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBGremlinRestorableResource',
+		ListItemText: 'Get-AzCosmosDBGremlinRestorableResource',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBGremlinRestorableResource\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBLocation',
+		ListItemText: 'Get-AzCosmosDBLocation',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBLocation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBMongoDBCollection',
+		ListItemText: 'Get-AzCosmosDBMongoDBCollection',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBMongoDBCollection\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBMongoDBCollectionBackupInformation',
+		ListItemText: 'Get-AzCosmosDBMongoDBCollectionBackupInformation',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBMongoDBCollectionBackupInformation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBMongoDBCollectionThroughput',
+		ListItemText: 'Get-AzCosmosDBMongoDBCollectionThroughput',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBMongoDBCollectionThroughput\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBMongoDBDatabase',
+		ListItemText: 'Get-AzCosmosDBMongoDBDatabase',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBMongoDBDatabase\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBMongoDBDatabaseThroughput',
+		ListItemText: 'Get-AzCosmosDBMongoDBDatabaseThroughput',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBMongoDBDatabaseThroughput\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBMongoDBRestorableCollection',
+		ListItemText: 'Get-AzCosmosDBMongoDBRestorableCollection',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBMongoDBRestorableCollection\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBMongoDBRestorableDatabase',
+		ListItemText: 'Get-AzCosmosDBMongoDBRestorableDatabase',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBMongoDBRestorableDatabase\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBMongoDBRestorableResource',
+		ListItemText: 'Get-AzCosmosDBMongoDBRestorableResource',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBMongoDBRestorableResource\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBMongoDBRoleDefinition',
+		ListItemText: 'Get-AzCosmosDBMongoDBRoleDefinition',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBMongoDBRoleDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBMongoDBUserDefinition',
+		ListItemText: 'Get-AzCosmosDBMongoDBUserDefinition',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBMongoDBUserDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBRestorableDatabaseAccount',
+		ListItemText: 'Get-AzCosmosDBRestorableDatabaseAccount',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBRestorableDatabaseAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBService',
+		ListItemText: 'Get-AzCosmosDBService',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBService\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBSqlContainer',
+		ListItemText: 'Get-AzCosmosDBSqlContainer',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBSqlContainer\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBSqlContainerBackupInformation',
+		ListItemText: 'Get-AzCosmosDBSqlContainerBackupInformation',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBSqlContainerBackupInformation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBSqlContainerThroughput',
+		ListItemText: 'Get-AzCosmosDBSqlContainerThroughput',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBSqlContainerThroughput\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBSqlDatabase',
+		ListItemText: 'Get-AzCosmosDBSqlDatabase',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBSqlDatabase\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBSqlDatabaseThroughput',
+		ListItemText: 'Get-AzCosmosDBSqlDatabaseThroughput',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBSqlDatabaseThroughput\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBSqlRestorableContainer',
+		ListItemText: 'Get-AzCosmosDBSqlRestorableContainer',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBSqlRestorableContainer\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBSqlRestorableDatabase',
+		ListItemText: 'Get-AzCosmosDBSqlRestorableDatabase',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBSqlRestorableDatabase\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBSqlRestorableResource',
+		ListItemText: 'Get-AzCosmosDBSqlRestorableResource',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBSqlRestorableResource\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBSqlRoleAssignment',
+		ListItemText: 'Get-AzCosmosDBSqlRoleAssignment',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBSqlRoleAssignment\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBSqlRoleDefinition',
+		ListItemText: 'Get-AzCosmosDBSqlRoleDefinition',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBSqlRoleDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBSqlStoredProcedure',
+		ListItemText: 'Get-AzCosmosDBSqlStoredProcedure',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBSqlStoredProcedure\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBSqlTrigger',
+		ListItemText: 'Get-AzCosmosDBSqlTrigger',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBSqlTrigger\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBSqlUserDefinedFunction',
+		ListItemText: 'Get-AzCosmosDBSqlUserDefinedFunction',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBSqlUserDefinedFunction\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBTable',
+		ListItemText: 'Get-AzCosmosDBTable',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBTable\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBTableBackupInformation',
+		ListItemText: 'Get-AzCosmosDBTableBackupInformation',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBTableBackupInformation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBTableRestorableResource',
+		ListItemText: 'Get-AzCosmosDBTableRestorableResource',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBTableRestorableResource\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBTableRestorableTable',
+		ListItemText: 'Get-AzCosmosDBTableRestorableTable',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBTableRestorableTable\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCosmosDBTableThroughput',
+		ListItemText: 'Get-AzCosmosDBTableThroughput',
+		ResultType: 2,
+		ToolTip: 'Get-AzCosmosDBTableThroughput\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzCustomIpPrefix',
+		ListItemText: 'Get-AzCustomIpPrefix',
+		ResultType: 2,
+		ToolTip: 'Get-AzCustomIpPrefix\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataBoxEdgeBandwidthSchedule',
+		ListItemText: 'Get-AzDataBoxEdgeBandwidthSchedule',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataBoxEdgeBandwidthSchedule\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataBoxEdgeDevice',
+		ListItemText: 'Get-AzDataBoxEdgeDevice',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataBoxEdgeDevice\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataBoxEdgeJob',
+		ListItemText: 'Get-AzDataBoxEdgeJob',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataBoxEdgeJob\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataBoxEdgeOrder',
+		ListItemText: 'Get-AzDataBoxEdgeOrder',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataBoxEdgeOrder\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataBoxEdgeRole',
+		ListItemText: 'Get-AzDataBoxEdgeRole',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataBoxEdgeRole\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataBoxEdgeShare',
+		ListItemText: 'Get-AzDataBoxEdgeShare',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataBoxEdgeShare\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataBoxEdgeStorageAccount',
+		ListItemText: 'Get-AzDataBoxEdgeStorageAccount',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataBoxEdgeStorageAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataBoxEdgeStorageAccountCredential',
+		ListItemText: 'Get-AzDataBoxEdgeStorageAccountCredential',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataBoxEdgeStorageAccountCredential\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataBoxEdgeStorageContainer',
+		ListItemText: 'Get-AzDataBoxEdgeStorageContainer',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataBoxEdgeStorageContainer\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataBoxEdgeTrigger',
+		ListItemText: 'Get-AzDataBoxEdgeTrigger',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataBoxEdgeTrigger\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataBoxEdgeUser',
+		ListItemText: 'Get-AzDataBoxEdgeUser',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataBoxEdgeUser\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDatabricksAccessConnector',
+		ListItemText: 'Get-AzDatabricksAccessConnector',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzDatabricksAccessConnector \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDatabricksOutboundNetworkDependenciesEndpoint',
+		ListItemText: 'Get-AzDatabricksOutboundNetworkDependenciesEndpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzDatabricksOutboundNetworkDependenciesEndpoint \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDatabricksVNetPeering',
+		ListItemText: 'Get-AzDatabricksVNetPeering',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzDatabricksVNetPeering \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDatabricksWorkspace',
+		ListItemText: 'Get-AzDatabricksWorkspace',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzDatabricksWorkspace \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataCollectionRule',
+		ListItemText: 'Get-AzDataCollectionRule',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataCollectionRule\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataCollectionRuleAssociation',
+		ListItemText: 'Get-AzDataCollectionRuleAssociation',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataCollectionRuleAssociation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataFactory',
+		ListItemText: 'Get-AzDataFactory',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataFactory\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataFactoryActivityWindow',
+		ListItemText: 'Get-AzDataFactoryActivityWindow',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataFactoryActivityWindow\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataFactoryDataset',
+		ListItemText: 'Get-AzDataFactoryDataset',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataFactoryDataset\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataFactoryGateway',
+		ListItemText: 'Get-AzDataFactoryGateway',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataFactoryGateway\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataFactoryGatewayAuthkey',
+		ListItemText: 'Get-AzDataFactoryGatewayAuthkey',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataFactoryGatewayAuthkey\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataFactoryHub',
+		ListItemText: 'Get-AzDataFactoryHub',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataFactoryHub\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataFactoryLinkedService',
+		ListItemText: 'Get-AzDataFactoryLinkedService',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataFactoryLinkedService\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataFactoryPipeline',
+		ListItemText: 'Get-AzDataFactoryPipeline',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataFactoryPipeline\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataFactoryRun',
+		ListItemText: 'Get-AzDataFactoryRun',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataFactoryRun\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataFactorySlice',
+		ListItemText: 'Get-AzDataFactorySlice',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataFactorySlice\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataFactoryV2',
+		ListItemText: 'Get-AzDataFactoryV2',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataFactoryV2\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataFactoryV2ActivityRun',
+		ListItemText: 'Get-AzDataFactoryV2ActivityRun',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataFactoryV2ActivityRun\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataFactoryV2DataFlow',
+		ListItemText: 'Get-AzDataFactoryV2DataFlow',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataFactoryV2DataFlow\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataFactoryV2DataFlowDebugSession',
+		ListItemText: 'Get-AzDataFactoryV2DataFlowDebugSession',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataFactoryV2DataFlowDebugSession\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataFactoryV2Dataset',
+		ListItemText: 'Get-AzDataFactoryV2Dataset',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataFactoryV2Dataset\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataFactoryV2IntegrationRuntime',
+		ListItemText: 'Get-AzDataFactoryV2IntegrationRuntime',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataFactoryV2IntegrationRuntime\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataFactoryV2IntegrationRuntimeKey',
+		ListItemText: 'Get-AzDataFactoryV2IntegrationRuntimeKey',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataFactoryV2IntegrationRuntimeKey\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataFactoryV2IntegrationRuntimeMetric',
+		ListItemText: 'Get-AzDataFactoryV2IntegrationRuntimeMetric',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataFactoryV2IntegrationRuntimeMetric\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataFactoryV2IntegrationRuntimeNode',
+		ListItemText: 'Get-AzDataFactoryV2IntegrationRuntimeNode',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataFactoryV2IntegrationRuntimeNode\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataFactoryV2IntegrationRuntimeOutboundNetworkDependenciesEndpoint',
+		ListItemText: 'Get-AzDataFactoryV2IntegrationRuntimeOutboundNetworkDependenciesEndpoint',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataFactoryV2IntegrationRuntimeOutboundNetworkDependenciesEndpoint\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataFactoryV2LinkedService',
+		ListItemText: 'Get-AzDataFactoryV2LinkedService',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataFactoryV2LinkedService\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataFactoryV2Pipeline',
+		ListItemText: 'Get-AzDataFactoryV2Pipeline',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataFactoryV2Pipeline\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataFactoryV2PipelineRun',
+		ListItemText: 'Get-AzDataFactoryV2PipelineRun',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataFactoryV2PipelineRun\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataFactoryV2Trigger',
+		ListItemText: 'Get-AzDataFactoryV2Trigger',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataFactoryV2Trigger\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataFactoryV2TriggerRun',
+		ListItemText: 'Get-AzDataFactoryV2TriggerRun',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataFactoryV2TriggerRun\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataFactoryV2TriggerSubscriptionStatus',
+		ListItemText: 'Get-AzDataFactoryV2TriggerSubscriptionStatus',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataFactoryV2TriggerSubscriptionStatus\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataLakeAnalyticsAccount',
+		ListItemText: 'Get-AzDataLakeAnalyticsAccount',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataLakeAnalyticsAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataLakeAnalyticsCatalogItem',
+		ListItemText: 'Get-AzDataLakeAnalyticsCatalogItem',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataLakeAnalyticsCatalogItem\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataLakeAnalyticsCatalogItemAclEntry',
+		ListItemText: 'Get-AzDataLakeAnalyticsCatalogItemAclEntry',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataLakeAnalyticsCatalogItemAclEntry\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataLakeAnalyticsComputePolicy',
+		ListItemText: 'Get-AzDataLakeAnalyticsComputePolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataLakeAnalyticsComputePolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataLakeAnalyticsDataSource',
+		ListItemText: 'Get-AzDataLakeAnalyticsDataSource',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataLakeAnalyticsDataSource\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataLakeAnalyticsFirewallRule',
+		ListItemText: 'Get-AzDataLakeAnalyticsFirewallRule',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataLakeAnalyticsFirewallRule\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataLakeAnalyticsJob',
+		ListItemText: 'Get-AzDataLakeAnalyticsJob',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataLakeAnalyticsJob\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataLakeAnalyticsJobPipeline',
+		ListItemText: 'Get-AzDataLakeAnalyticsJobPipeline',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataLakeAnalyticsJobPipeline\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataLakeAnalyticsJobRecurrence',
+		ListItemText: 'Get-AzDataLakeAnalyticsJobRecurrence',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataLakeAnalyticsJobRecurrence\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataLakeGen2ChildItem',
+		ListItemText: 'Get-AzDataLakeGen2ChildItem',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataLakeGen2ChildItem\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataLakeGen2DeletedItem',
+		ListItemText: 'Get-AzDataLakeGen2DeletedItem',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataLakeGen2DeletedItem\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDatalakeGen2FileSystem',
+		ListItemText: 'Get-AzDatalakeGen2FileSystem',
+		ResultType: 2,
+		ToolTip: 'Get-AzDatalakeGen2FileSystem'
+	},
+	{
+		CompletionText: 'Get-AzDataLakeGen2Item',
+		ListItemText: 'Get-AzDataLakeGen2Item',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataLakeGen2Item\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataLakeGen2ItemContent',
+		ListItemText: 'Get-AzDataLakeGen2ItemContent',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataLakeGen2ItemContent\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataLakeStoreAccount',
+		ListItemText: 'Get-AzDataLakeStoreAccount',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataLakeStoreAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataLakeStoreChildItem',
+		ListItemText: 'Get-AzDataLakeStoreChildItem',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataLakeStoreChildItem\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataLakeStoreChildItemSummary',
+		ListItemText: 'Get-AzDataLakeStoreChildItemSummary',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataLakeStoreChildItemSummary\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataLakeStoreDeletedItem',
+		ListItemText: 'Get-AzDataLakeStoreDeletedItem',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataLakeStoreDeletedItem\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataLakeStoreFirewallRule',
+		ListItemText: 'Get-AzDataLakeStoreFirewallRule',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataLakeStoreFirewallRule\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataLakeStoreItem',
+		ListItemText: 'Get-AzDataLakeStoreItem',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataLakeStoreItem\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataLakeStoreItemAclEntry',
+		ListItemText: 'Get-AzDataLakeStoreItemAclEntry',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataLakeStoreItemAclEntry\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataLakeStoreItemContent',
+		ListItemText: 'Get-AzDataLakeStoreItemContent',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataLakeStoreItemContent\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataLakeStoreItemOwner',
+		ListItemText: 'Get-AzDataLakeStoreItemOwner',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataLakeStoreItemOwner\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataLakeStoreItemPermission',
+		ListItemText: 'Get-AzDataLakeStoreItemPermission',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataLakeStoreItemPermission\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataLakeStoreTrustedIdProvider',
+		ListItemText: 'Get-AzDataLakeStoreTrustedIdProvider',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataLakeStoreTrustedIdProvider\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataLakeStoreVirtualNetworkRule',
+		ListItemText: 'Get-AzDataLakeStoreVirtualNetworkRule',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataLakeStoreVirtualNetworkRule\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataProtectionBackupInstance',
+		ListItemText: 'Get-AzDataProtectionBackupInstance',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzDataProtectionBackupInstance \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataProtectionBackupPolicy',
+		ListItemText: 'Get-AzDataProtectionBackupPolicy',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzDataProtectionBackupPolicy \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataProtectionBackupVault',
+		ListItemText: 'Get-AzDataProtectionBackupVault',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzDataProtectionBackupVault \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataProtectionJob',
+		ListItemText: 'Get-AzDataProtectionJob',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzDataProtectionJob \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataProtectionOperation',
+		ListItemText: 'Get-AzDataProtectionOperation',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzDataProtectionOperation \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataProtectionOperationStatus',
+		ListItemText: 'Get-AzDataProtectionOperationStatus',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzDataProtectionOperationStatus \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataProtectionPolicyTemplate',
+		ListItemText: 'Get-AzDataProtectionPolicyTemplate',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzDataProtectionPolicyTemplate \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataProtectionRecoveryPoint',
+		ListItemText: 'Get-AzDataProtectionRecoveryPoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzDataProtectionRecoveryPoint \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataProtectionResourceGuard',
+		ListItemText: 'Get-AzDataProtectionResourceGuard',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzDataProtectionResourceGuard \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataShare',
+		ListItemText: 'Get-AzDataShare',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataShare\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataShareAccount',
+		ListItemText: 'Get-AzDataShareAccount',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataShareAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataShareDataSet',
+		ListItemText: 'Get-AzDataShareDataSet',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataShareDataSet\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataShareDataSetMapping',
+		ListItemText: 'Get-AzDataShareDataSetMapping',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataShareDataSetMapping\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataShareInvitation',
+		ListItemText: 'Get-AzDataShareInvitation',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataShareInvitation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataShareProviderShareSubscription',
+		ListItemText: 'Get-AzDataShareProviderShareSubscription',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataShareProviderShareSubscription\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataShareReceivedInvitation',
+		ListItemText: 'Get-AzDataShareReceivedInvitation',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataShareReceivedInvitation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataShareSourceDataSet',
+		ListItemText: 'Get-AzDataShareSourceDataSet',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataShareSourceDataSet\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataShareSubscription',
+		ListItemText: 'Get-AzDataShareSubscription',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataShareSubscription\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataShareSubscriptionSynchronization',
+		ListItemText: 'Get-AzDataShareSubscriptionSynchronization',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataShareSubscriptionSynchronization\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataShareSubscriptionSynchronizationDetail',
+		ListItemText: 'Get-AzDataShareSubscriptionSynchronizationDetail',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataShareSubscriptionSynchronizationDetail\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataShareSynchronization',
+		ListItemText: 'Get-AzDataShareSynchronization',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataShareSynchronization\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataShareSynchronizationDetail',
+		ListItemText: 'Get-AzDataShareSynchronizationDetail',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataShareSynchronizationDetail\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataShareSynchronizationSetting',
+		ListItemText: 'Get-AzDataShareSynchronizationSetting',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataShareSynchronizationSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDataShareTrigger',
+		ListItemText: 'Get-AzDataShareTrigger',
+		ResultType: 2,
+		ToolTip: 'Get-AzDataShareTrigger\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDdosProtectionPlan',
+		ListItemText: 'Get-AzDdosProtectionPlan',
+		ResultType: 2,
+		ToolTip: 'Get-AzDdosProtectionPlan\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDefault',
+		ListItemText: 'Get-AzDefault',
+		ResultType: 2,
+		ToolTip: 'Get-AzDefault\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDelegation',
+		ListItemText: 'Get-AzDelegation',
+		ResultType: 2,
+		ToolTip: 'Get-AzDelegation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDeletedWebApp',
+		ListItemText: 'Get-AzDeletedWebApp',
+		ResultType: 2,
+		ToolTip: 'Get-AzDeletedWebApp\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDenyAssignment',
+		ListItemText: 'Get-AzDenyAssignment',
+		ResultType: 2,
+		ToolTip: 'Get-AzDenyAssignment\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDeployment',
+		ListItemText: 'Get-AzDeployment',
+		ResultType: 2,
+		ToolTip: 'Get-AzDeployment\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDeploymentManagerArtifactSource',
+		ListItemText: 'Get-AzDeploymentManagerArtifactSource',
+		ResultType: 2,
+		ToolTip: 'Get-AzDeploymentManagerArtifactSource\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDeploymentManagerRollout',
+		ListItemText: 'Get-AzDeploymentManagerRollout',
+		ResultType: 2,
+		ToolTip: 'Get-AzDeploymentManagerRollout\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDeploymentManagerService',
+		ListItemText: 'Get-AzDeploymentManagerService',
+		ResultType: 2,
+		ToolTip: 'Get-AzDeploymentManagerService\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDeploymentManagerServiceTopology',
+		ListItemText: 'Get-AzDeploymentManagerServiceTopology',
+		ResultType: 2,
+		ToolTip: 'Get-AzDeploymentManagerServiceTopology\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDeploymentManagerServiceUnit',
+		ListItemText: 'Get-AzDeploymentManagerServiceUnit',
+		ResultType: 2,
+		ToolTip: 'Get-AzDeploymentManagerServiceUnit\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDeploymentManagerStep',
+		ListItemText: 'Get-AzDeploymentManagerStep',
+		ResultType: 2,
+		ToolTip: 'Get-AzDeploymentManagerStep\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDeploymentOperation',
+		ListItemText: 'Get-AzDeploymentOperation',
+		ResultType: 2,
+		ToolTip: 'Get-AzDeploymentOperation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDeploymentScript',
+		ListItemText: 'Get-AzDeploymentScript',
+		ResultType: 2,
+		ToolTip: 'Get-AzDeploymentScript\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDeploymentScriptLog',
+		ListItemText: 'Get-AzDeploymentScriptLog',
+		ResultType: 2,
+		ToolTip: 'Get-AzDeploymentScriptLog\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDeploymentWhatIfResult',
+		ListItemText: 'Get-AzDeploymentWhatIfResult',
+		ResultType: 2,
+		ToolTip: 'Get-AzDeploymentWhatIfResult\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDeviceSecurityGroup',
+		ListItemText: 'Get-AzDeviceSecurityGroup',
+		ResultType: 2,
+		ToolTip: 'Get-AzDeviceSecurityGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDiagnosticSetting',
+		ListItemText: 'Get-AzDiagnosticSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzDiagnosticSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDiagnosticSettingCategory',
+		ListItemText: 'Get-AzDiagnosticSettingCategory',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzDiagnosticSettingCategory \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDiscoveredSecuritySolution',
+		ListItemText: 'Get-AzDiscoveredSecuritySolution',
+		ResultType: 2,
+		ToolTip: 'Get-AzDiscoveredSecuritySolution\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDisk',
+		ListItemText: 'Get-AzDisk',
+		ResultType: 2,
+		ToolTip: 'Get-AzDisk\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDiskAccess',
+		ListItemText: 'Get-AzDiskAccess',
+		ResultType: 2,
+		ToolTip: 'Get-AzDiskAccess\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDiskEncryptionSet',
+		ListItemText: 'Get-AzDiskEncryptionSet',
+		ResultType: 2,
+		ToolTip: 'Get-AzDiskEncryptionSet\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDiskEncryptionSetAssociatedResource',
+		ListItemText: 'Get-AzDiskEncryptionSetAssociatedResource',
+		ResultType: 2,
+		ToolTip: 'Get-AzDiskEncryptionSetAssociatedResource\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDnsRecordSet',
+		ListItemText: 'Get-AzDnsRecordSet',
+		ResultType: 2,
+		ToolTip: 'Get-AzDnsRecordSet\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDnsZone',
+		ListItemText: 'Get-AzDnsZone',
+		ResultType: 2,
+		ToolTip: 'Get-AzDnsZone\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDomain',
+		ListItemText: 'Get-AzDomain',
+		ResultType: 2,
+		ToolTip: 'Get-AzDomain'
+	},
+	{
+		CompletionText: 'Get-AzDtlAllowedVMSizesPolicy',
+		ListItemText: 'Get-AzDtlAllowedVMSizesPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzDtlAllowedVMSizesPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDtlAutoShutdownPolicy',
+		ListItemText: 'Get-AzDtlAutoShutdownPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzDtlAutoShutdownPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDtlAutoStartPolicy',
+		ListItemText: 'Get-AzDtlAutoStartPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzDtlAutoStartPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDtlVMsPerLabPolicy',
+		ListItemText: 'Get-AzDtlVMsPerLabPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzDtlVMsPerLabPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzDtlVMsPerUserPolicy',
+		ListItemText: 'Get-AzDtlVMsPerUserPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzDtlVMsPerUserPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEffectiveNetworkSecurityGroup',
+		ListItemText: 'Get-AzEffectiveNetworkSecurityGroup',
+		ResultType: 2,
+		ToolTip: 'Get-AzEffectiveNetworkSecurityGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEffectiveRouteTable',
+		ListItemText: 'Get-AzEffectiveRouteTable',
+		ResultType: 2,
+		ToolTip: 'Get-AzEffectiveRouteTable\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEnrollmentAccount',
+		ListItemText: 'Get-AzEnrollmentAccount',
+		ResultType: 2,
+		ToolTip: 'Get-AzEnrollmentAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEnvironment',
+		ListItemText: 'Get-AzEnvironment',
+		ResultType: 2,
+		ToolTip: 'Get-AzEnvironment\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEventCategory',
+		ListItemText: 'Get-AzEventCategory',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzEventCategory \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEventGridChannel',
+		ListItemText: 'Get-AzEventGridChannel',
+		ResultType: 2,
+		ToolTip: 'Get-AzEventGridChannel\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEventGridDomain',
+		ListItemText: 'Get-AzEventGridDomain',
+		ResultType: 2,
+		ToolTip: 'Get-AzEventGridDomain\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEventGridDomainKey',
+		ListItemText: 'Get-AzEventGridDomainKey',
+		ResultType: 2,
+		ToolTip: 'Get-AzEventGridDomainKey\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEventGridDomainTopic',
+		ListItemText: 'Get-AzEventGridDomainTopic',
+		ResultType: 2,
+		ToolTip: 'Get-AzEventGridDomainTopic\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEventGridFullUrlForPartnerTopicEventSubscription',
+		ListItemText: 'Get-AzEventGridFullUrlForPartnerTopicEventSubscription',
+		ResultType: 2,
+		ToolTip: 'Get-AzEventGridFullUrlForPartnerTopicEventSubscription\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEventGridFullUrlForSystemTopicEventSubscription',
+		ListItemText: 'Get-AzEventGridFullUrlForSystemTopicEventSubscription',
+		ResultType: 2,
+		ToolTip: 'Get-AzEventGridFullUrlForSystemTopicEventSubscription\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEventGridPartnerConfiguration',
+		ListItemText: 'Get-AzEventGridPartnerConfiguration',
+		ResultType: 2,
+		ToolTip: 'Get-AzEventGridPartnerConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEventGridPartnerNamespace',
+		ListItemText: 'Get-AzEventGridPartnerNamespace',
+		ResultType: 2,
+		ToolTip: 'Get-AzEventGridPartnerNamespace\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEventGridPartnerNamespaceKey',
+		ListItemText: 'Get-AzEventGridPartnerNamespaceKey',
+		ResultType: 2,
+		ToolTip: 'Get-AzEventGridPartnerNamespaceKey\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEventGridPartnerRegistration',
+		ListItemText: 'Get-AzEventGridPartnerRegistration',
+		ResultType: 2,
+		ToolTip: 'Get-AzEventGridPartnerRegistration\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEventGridPartnerTopic',
+		ListItemText: 'Get-AzEventGridPartnerTopic',
+		ResultType: 2,
+		ToolTip: 'Get-AzEventGridPartnerTopic\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEventGridPartnerTopicEventSubscription',
+		ListItemText: 'Get-AzEventGridPartnerTopicEventSubscription',
+		ResultType: 2,
+		ToolTip: 'Get-AzEventGridPartnerTopicEventSubscription\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEventGridPartnerTopicEventSubscriptionDeliveryAttribute',
+		ListItemText: 'Get-AzEventGridPartnerTopicEventSubscriptionDeliveryAttribute',
+		ResultType: 2,
+		ToolTip: 'Get-AzEventGridPartnerTopicEventSubscriptionDeliveryAttribute\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEventGridSubscription',
+		ListItemText: 'Get-AzEventGridSubscription',
+		ResultType: 2,
+		ToolTip: 'Get-AzEventGridSubscription\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEventGridSystemTopic',
+		ListItemText: 'Get-AzEventGridSystemTopic',
+		ResultType: 2,
+		ToolTip: 'Get-AzEventGridSystemTopic\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEventGridSystemTopicEventSubscription',
+		ListItemText: 'Get-AzEventGridSystemTopicEventSubscription',
+		ResultType: 2,
+		ToolTip: 'Get-AzEventGridSystemTopicEventSubscription\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEventGridSystemTopicEventSubscriptionDeliveryAttribute',
+		ListItemText: 'Get-AzEventGridSystemTopicEventSubscriptionDeliveryAttribute',
+		ResultType: 2,
+		ToolTip: 'Get-AzEventGridSystemTopicEventSubscriptionDeliveryAttribute\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEventGridTopic',
+		ListItemText: 'Get-AzEventGridTopic',
+		ResultType: 2,
+		ToolTip: 'Get-AzEventGridTopic\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEventGridTopicKey',
+		ListItemText: 'Get-AzEventGridTopicKey',
+		ResultType: 2,
+		ToolTip: 'Get-AzEventGridTopicKey\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEventGridTopicType',
+		ListItemText: 'Get-AzEventGridTopicType',
+		ResultType: 2,
+		ToolTip: 'Get-AzEventGridTopicType\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEventGridVerifiedPartner',
+		ListItemText: 'Get-AzEventGridVerifiedPartner',
+		ResultType: 2,
+		ToolTip: 'Get-AzEventGridVerifiedPartner\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEventHub',
+		ListItemText: 'Get-AzEventHub',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzEventHub \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEventHubApplicationGroup',
+		ListItemText: 'Get-AzEventHubApplicationGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzEventHubApplicationGroup \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEventHubAuthorizationRule',
+		ListItemText: 'Get-AzEventHubAuthorizationRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzEventHubAuthorizationRule \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEventHubCluster',
+		ListItemText: 'Get-AzEventHubCluster',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzEventHubCluster \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEventHubClusterNamespace',
+		ListItemText: 'Get-AzEventHubClusterNamespace',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzEventHubClusterNamespace \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEventHubClustersAvailableRegion',
+		ListItemText: 'Get-AzEventHubClustersAvailableRegion',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzEventHubClustersAvailableRegion \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEventHubConsumerGroup',
+		ListItemText: 'Get-AzEventHubConsumerGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzEventHubConsumerGroup \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEventHubGeoDRConfiguration',
+		ListItemText: 'Get-AzEventHubGeoDRConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzEventHubGeoDRConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEventHubKey',
+		ListItemText: 'Get-AzEventHubKey',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzEventHubKey \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEventHubNamespace',
+		ListItemText: 'Get-AzEventHubNamespace',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzEventHubNamespace \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEventHubNamespaceV2',
+		ListItemText: 'Get-AzEventHubNamespaceV2',
+		ResultType: 2,
+		ToolTip: 'Get-AzEventHubNamespaceV2'
+	},
+	{
+		CompletionText: 'Get-AzEventHubNetworkRuleSet',
+		ListItemText: 'Get-AzEventHubNetworkRuleSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzEventHubNetworkRuleSet \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEventHubPrivateEndpointConnection',
+		ListItemText: 'Get-AzEventHubPrivateEndpointConnection',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzEventHubPrivateEndpointConnection \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEventHubPrivateLink',
+		ListItemText: 'Get-AzEventHubPrivateLink',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzEventHubPrivateLink \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzEventHubSchemaGroup',
+		ListItemText: 'Get-AzEventHubSchemaGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzEventHubSchemaGroup \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzExpressRouteCircuit',
+		ListItemText: 'Get-AzExpressRouteCircuit',
+		ResultType: 2,
+		ToolTip: 'Get-AzExpressRouteCircuit\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzExpressRouteCircuitARPTable',
+		ListItemText: 'Get-AzExpressRouteCircuitARPTable',
+		ResultType: 2,
+		ToolTip: 'Get-AzExpressRouteCircuitARPTable\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzExpressRouteCircuitAuthorization',
+		ListItemText: 'Get-AzExpressRouteCircuitAuthorization',
+		ResultType: 2,
+		ToolTip: 'Get-AzExpressRouteCircuitAuthorization\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzExpressRouteCircuitConnectionConfig',
+		ListItemText: 'Get-AzExpressRouteCircuitConnectionConfig',
+		ResultType: 2,
+		ToolTip: 'Get-AzExpressRouteCircuitConnectionConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzExpressRouteCircuitPeeringConfig',
+		ListItemText: 'Get-AzExpressRouteCircuitPeeringConfig',
+		ResultType: 2,
+		ToolTip: 'Get-AzExpressRouteCircuitPeeringConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzExpressRouteCircuitRouteTable',
+		ListItemText: 'Get-AzExpressRouteCircuitRouteTable',
+		ResultType: 2,
+		ToolTip: 'Get-AzExpressRouteCircuitRouteTable\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzExpressRouteCircuitRouteTableSummary',
+		ListItemText: 'Get-AzExpressRouteCircuitRouteTableSummary',
+		ResultType: 2,
+		ToolTip: 'Get-AzExpressRouteCircuitRouteTableSummary\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzExpressRouteCircuitStat',
+		ListItemText: 'Get-AzExpressRouteCircuitStat',
+		ResultType: 2,
+		ToolTip: 'Get-AzExpressRouteCircuitStat\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzExpressRouteCircuitStats',
+		ListItemText: 'Get-AzExpressRouteCircuitStats',
+		ResultType: 2,
+		ToolTip: 'Get-AzExpressRouteCircuitStats'
+	},
+	{
+		CompletionText: 'Get-AzExpressRouteConnection',
+		ListItemText: 'Get-AzExpressRouteConnection',
+		ResultType: 2,
+		ToolTip: 'Get-AzExpressRouteConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzExpressRouteCrossConnection',
+		ListItemText: 'Get-AzExpressRouteCrossConnection',
+		ResultType: 2,
+		ToolTip: 'Get-AzExpressRouteCrossConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzExpressRouteCrossConnectionArpTable',
+		ListItemText: 'Get-AzExpressRouteCrossConnectionArpTable',
+		ResultType: 2,
+		ToolTip: 'Get-AzExpressRouteCrossConnectionArpTable\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzExpressRouteCrossConnectionPeering',
+		ListItemText: 'Get-AzExpressRouteCrossConnectionPeering',
+		ResultType: 2,
+		ToolTip: 'Get-AzExpressRouteCrossConnectionPeering\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzExpressRouteCrossConnectionRouteTable',
+		ListItemText: 'Get-AzExpressRouteCrossConnectionRouteTable',
+		ResultType: 2,
+		ToolTip: 'Get-AzExpressRouteCrossConnectionRouteTable\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzExpressRouteCrossConnectionRouteTableSummary',
+		ListItemText: 'Get-AzExpressRouteCrossConnectionRouteTableSummary',
+		ResultType: 2,
+		ToolTip: 'Get-AzExpressRouteCrossConnectionRouteTableSummary\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzExpressRouteGateway',
+		ListItemText: 'Get-AzExpressRouteGateway',
+		ResultType: 2,
+		ToolTip: 'Get-AzExpressRouteGateway\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzExpressRoutePort',
+		ListItemText: 'Get-AzExpressRoutePort',
+		ResultType: 2,
+		ToolTip: 'Get-AzExpressRoutePort\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzExpressRoutePortAuthorization',
+		ListItemText: 'Get-AzExpressRoutePortAuthorization',
+		ResultType: 2,
+		ToolTip: 'Get-AzExpressRoutePortAuthorization\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzExpressRoutePortIdentity',
+		ListItemText: 'Get-AzExpressRoutePortIdentity',
+		ResultType: 2,
+		ToolTip: 'Get-AzExpressRoutePortIdentity\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzExpressRoutePortLinkConfig',
+		ListItemText: 'Get-AzExpressRoutePortLinkConfig',
+		ResultType: 2,
+		ToolTip: 'Get-AzExpressRoutePortLinkConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzExpressRoutePortsLocation',
+		ListItemText: 'Get-AzExpressRoutePortsLocation',
+		ResultType: 2,
+		ToolTip: 'Get-AzExpressRoutePortsLocation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzExpressRouteServiceProvider',
+		ListItemText: 'Get-AzExpressRouteServiceProvider',
+		ResultType: 2,
+		ToolTip: 'Get-AzExpressRouteServiceProvider\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzExternalSecuritySolution',
+		ListItemText: 'Get-AzExternalSecuritySolution',
+		ResultType: 2,
+		ToolTip: 'Get-AzExternalSecuritySolution\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzFederatedIdentityCredentials',
+		ListItemText: 'Get-AzFederatedIdentityCredentials',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzFederatedIdentityCredentials \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzFirewall',
+		ListItemText: 'Get-AzFirewall',
+		ResultType: 2,
+		ToolTip: 'Get-AzFirewall\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzFirewallFqdnTag',
+		ListItemText: 'Get-AzFirewallFqdnTag',
+		ResultType: 2,
+		ToolTip: 'Get-AzFirewallFqdnTag\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzFirewallLearnedIpPrefix',
+		ListItemText: 'Get-AzFirewallLearnedIpPrefix',
+		ResultType: 2,
+		ToolTip: 'Get-AzFirewallLearnedIpPrefix\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzFirewallPolicy',
+		ListItemText: 'Get-AzFirewallPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzFirewallPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzFirewallPolicyRuleCollectionGroup',
+		ListItemText: 'Get-AzFirewallPolicyRuleCollectionGroup',
+		ResultType: 2,
+		ToolTip: 'Get-AzFirewallPolicyRuleCollectionGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzFrontDoor',
+		ListItemText: 'Get-AzFrontDoor',
+		ResultType: 2,
+		ToolTip: 'Get-AzFrontDoor\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzFrontDoorCdnCustomDomain',
+		ListItemText: 'Get-AzFrontDoorCdnCustomDomain',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzFrontDoorCdnCustomDomain \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzFrontDoorCdnEndpoint',
+		ListItemText: 'Get-AzFrontDoorCdnEndpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzFrontDoorCdnEndpoint \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzFrontDoorCdnEndpointResourceUsage',
+		ListItemText: 'Get-AzFrontDoorCdnEndpointResourceUsage',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzFrontDoorCdnEndpointResourceUsage \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzFrontDoorCdnOrigin',
+		ListItemText: 'Get-AzFrontDoorCdnOrigin',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzFrontDoorCdnOrigin \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzFrontDoorCdnOriginGroup',
+		ListItemText: 'Get-AzFrontDoorCdnOriginGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzFrontDoorCdnOriginGroup \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzFrontDoorCdnOriginGroupResourceUsage',
+		ListItemText: 'Get-AzFrontDoorCdnOriginGroupResourceUsage',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzFrontDoorCdnOriginGroupResourceUsage \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzFrontDoorCdnProfile',
+		ListItemText: 'Get-AzFrontDoorCdnProfile',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzFrontDoorCdnProfile \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzFrontDoorCdnProfileResourceUsage',
+		ListItemText: 'Get-AzFrontDoorCdnProfileResourceUsage',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzFrontDoorCdnProfileResourceUsage \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzFrontDoorCdnRoute',
+		ListItemText: 'Get-AzFrontDoorCdnRoute',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzFrontDoorCdnRoute \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzFrontDoorCdnRule',
+		ListItemText: 'Get-AzFrontDoorCdnRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzFrontDoorCdnRule \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzFrontDoorCdnRuleSet',
+		ListItemText: 'Get-AzFrontDoorCdnRuleSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzFrontDoorCdnRuleSet \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzFrontDoorCdnRuleSetResourceUsage',
+		ListItemText: 'Get-AzFrontDoorCdnRuleSetResourceUsage',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzFrontDoorCdnRuleSetResourceUsage \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzFrontDoorCdnSecret',
+		ListItemText: 'Get-AzFrontDoorCdnSecret',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzFrontDoorCdnSecret \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzFrontDoorCdnSecurityPolicy',
+		ListItemText: 'Get-AzFrontDoorCdnSecurityPolicy',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzFrontDoorCdnSecurityPolicy \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzFrontDoorFrontendEndpoint',
+		ListItemText: 'Get-AzFrontDoorFrontendEndpoint',
+		ResultType: 2,
+		ToolTip: 'Get-AzFrontDoorFrontendEndpoint\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzFrontDoorRulesEngine',
+		ListItemText: 'Get-AzFrontDoorRulesEngine',
+		ResultType: 2,
+		ToolTip: 'Get-AzFrontDoorRulesEngine\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzFrontDoorWafManagedRuleSetDefinition',
+		ListItemText: 'Get-AzFrontDoorWafManagedRuleSetDefinition',
+		ResultType: 2,
+		ToolTip: 'Get-AzFrontDoorWafManagedRuleSetDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzFrontDoorWafPolicy',
+		ListItemText: 'Get-AzFrontDoorWafPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzFrontDoorWafPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzFunctionApp',
+		ListItemText: 'Get-AzFunctionApp',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzFunctionApp \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzFunctionAppAvailableLocation',
+		ListItemText: 'Get-AzFunctionAppAvailableLocation',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzFunctionAppAvailableLocation \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzFunctionAppPlan',
+		ListItemText: 'Get-AzFunctionAppPlan',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzFunctionAppPlan \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzFunctionAppSetting',
+		ListItemText: 'Get-AzFunctionAppSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzFunctionAppSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzGallery',
+		ListItemText: 'Get-AzGallery',
+		ResultType: 2,
+		ToolTip: 'Get-AzGallery\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzGalleryApplication',
+		ListItemText: 'Get-AzGalleryApplication',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzGalleryApplication \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzGalleryApplicationVersion',
+		ListItemText: 'Get-AzGalleryApplicationVersion',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzGalleryApplicationVersion \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzGalleryImageDefinition',
+		ListItemText: 'Get-AzGalleryImageDefinition',
+		ResultType: 2,
+		ToolTip: 'Get-AzGalleryImageDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzGalleryImageVersion',
+		ListItemText: 'Get-AzGalleryImageVersion',
+		ResultType: 2,
+		ToolTip: 'Get-AzGalleryImageVersion\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzHDInsightAzureMonitor',
+		ListItemText: 'Get-AzHDInsightAzureMonitor',
+		ResultType: 2,
+		ToolTip: 'Get-AzHDInsightAzureMonitor\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzHDInsightCluster',
+		ListItemText: 'Get-AzHDInsightCluster',
+		ResultType: 2,
+		ToolTip: 'Get-AzHDInsightCluster\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzHDInsightClusterAutoscaleConfiguration',
+		ListItemText: 'Get-AzHDInsightClusterAutoscaleConfiguration',
+		ResultType: 2,
+		ToolTip: 'Get-AzHDInsightClusterAutoscaleConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzHDInsightHost',
+		ListItemText: 'Get-AzHDInsightHost',
+		ResultType: 2,
+		ToolTip: 'Get-AzHDInsightHost\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzHDInsightJob',
+		ListItemText: 'Get-AzHDInsightJob',
+		ResultType: 2,
+		ToolTip: 'Get-AzHDInsightJob\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzHDInsightJobOutput',
+		ListItemText: 'Get-AzHDInsightJobOutput',
+		ResultType: 2,
+		ToolTip: 'Get-AzHDInsightJobOutput\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzHDInsightMonitoring',
+		ListItemText: 'Get-AzHDInsightMonitoring',
+		ResultType: 2,
+		ToolTip: 'Get-AzHDInsightMonitoring\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzHDInsightPersistedScriptAction',
+		ListItemText: 'Get-AzHDInsightPersistedScriptAction',
+		ResultType: 2,
+		ToolTip: 'Get-AzHDInsightPersistedScriptAction\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzHDInsightProperty',
+		ListItemText: 'Get-AzHDInsightProperty',
+		ResultType: 2,
+		ToolTip: 'Get-AzHDInsightProperty\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzHDInsightScriptActionHistory',
+		ListItemText: 'Get-AzHDInsightScriptActionHistory',
+		ResultType: 2,
+		ToolTip: 'Get-AzHDInsightScriptActionHistory\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzHealthcareApisService',
+		ListItemText: 'Get-AzHealthcareApisService',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzHealthcareApisService \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzHealthcareApisWorkspace',
+		ListItemText: 'Get-AzHealthcareApisWorkspace',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzHealthcareApisWorkspace \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzHealthcareDicomService',
+		ListItemText: 'Get-AzHealthcareDicomService',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzHealthcareDicomService \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzHealthcareFhirDestination',
+		ListItemText: 'Get-AzHealthcareFhirDestination',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzHealthcareFhirDestination \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzHealthcareFhirService',
+		ListItemText: 'Get-AzHealthcareFhirService',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzHealthcareFhirService \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzHealthcareIotConnector',
+		ListItemText: 'Get-AzHealthcareIotConnector',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzHealthcareIotConnector \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzHealthcareIotConnectorFhirDestination',
+		ListItemText: 'Get-AzHealthcareIotConnectorFhirDestination',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzHealthcareIotConnectorFhirDestination \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzHost',
+		ListItemText: 'Get-AzHost',
+		ResultType: 2,
+		ToolTip: 'Get-AzHost\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzHostGroup',
+		ListItemText: 'Get-AzHostGroup',
+		ResultType: 2,
+		ToolTip: 'Get-AzHostGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzImage',
+		ListItemText: 'Get-AzImage',
+		ResultType: 2,
+		ToolTip: 'Get-AzImage\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzInsightsPrivateLinkScope',
+		ListItemText: 'Get-AzInsightsPrivateLinkScope',
+		ResultType: 2,
+		ToolTip: 'Get-AzInsightsPrivateLinkScope\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzInsightsPrivateLinkScopedResource',
+		ListItemText: 'Get-AzInsightsPrivateLinkScopedResource',
+		ResultType: 2,
+		ToolTip: 'Get-AzInsightsPrivateLinkScopedResource\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIntegrationAccount',
+		ListItemText: 'Get-AzIntegrationAccount',
+		ResultType: 2,
+		ToolTip: 'Get-AzIntegrationAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIntegrationAccountAgreement',
+		ListItemText: 'Get-AzIntegrationAccountAgreement',
+		ResultType: 2,
+		ToolTip: 'Get-AzIntegrationAccountAgreement\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIntegrationAccountAssembly',
+		ListItemText: 'Get-AzIntegrationAccountAssembly',
+		ResultType: 2,
+		ToolTip: 'Get-AzIntegrationAccountAssembly\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIntegrationAccountBatchConfiguration',
+		ListItemText: 'Get-AzIntegrationAccountBatchConfiguration',
+		ResultType: 2,
+		ToolTip: 'Get-AzIntegrationAccountBatchConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIntegrationAccountCallbackUrl',
+		ListItemText: 'Get-AzIntegrationAccountCallbackUrl',
+		ResultType: 2,
+		ToolTip: 'Get-AzIntegrationAccountCallbackUrl\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIntegrationAccountCertificate',
+		ListItemText: 'Get-AzIntegrationAccountCertificate',
+		ResultType: 2,
+		ToolTip: 'Get-AzIntegrationAccountCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIntegrationAccountGeneratedIcn',
+		ListItemText: 'Get-AzIntegrationAccountGeneratedIcn',
+		ResultType: 2,
+		ToolTip: 'Get-AzIntegrationAccountGeneratedIcn\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIntegrationAccountMap',
+		ListItemText: 'Get-AzIntegrationAccountMap',
+		ResultType: 2,
+		ToolTip: 'Get-AzIntegrationAccountMap\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIntegrationAccountPartner',
+		ListItemText: 'Get-AzIntegrationAccountPartner',
+		ResultType: 2,
+		ToolTip: 'Get-AzIntegrationAccountPartner\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIntegrationAccountReceivedIcn',
+		ListItemText: 'Get-AzIntegrationAccountReceivedIcn',
+		ResultType: 2,
+		ToolTip: 'Get-AzIntegrationAccountReceivedIcn\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIntegrationAccountSchema',
+		ListItemText: 'Get-AzIntegrationAccountSchema',
+		ResultType: 2,
+		ToolTip: 'Get-AzIntegrationAccountSchema\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzInterfaceEndpoint',
+		ListItemText: 'Get-AzInterfaceEndpoint',
+		ResultType: 2,
+		ToolTip: 'Get-AzInterfaceEndpoint'
+	},
+	{
+		CompletionText: 'Get-AzInvoiceSection',
+		ListItemText: 'Get-AzInvoiceSection',
+		ResultType: 2,
+		ToolTip: 'Get-AzInvoiceSection\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIotHub',
+		ListItemText: 'Get-AzIotHub',
+		ResultType: 2,
+		ToolTip: 'Get-AzIotHub\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIotHubCertificate',
+		ListItemText: 'Get-AzIotHubCertificate',
+		ResultType: 2,
+		ToolTip: 'Get-AzIotHubCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIotHubCertificateVerificationCode',
+		ListItemText: 'Get-AzIotHubCertificateVerificationCode',
+		ResultType: 2,
+		ToolTip: 'Get-AzIotHubCertificateVerificationCode\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIotHubConfiguration',
+		ListItemText: 'Get-AzIotHubConfiguration',
+		ResultType: 2,
+		ToolTip: 'Get-AzIotHubConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIotHubConnectionString',
+		ListItemText: 'Get-AzIotHubConnectionString',
+		ResultType: 2,
+		ToolTip: 'Get-AzIotHubConnectionString\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIotHubCVC',
+		ListItemText: 'Get-AzIotHubCVC',
+		ResultType: 2,
+		ToolTip: 'Get-AzIotHubCVC'
+	},
+	{
+		CompletionText: 'Get-AzIotHubDCL',
+		ListItemText: 'Get-AzIotHubDCL',
+		ResultType: 2,
+		ToolTip: 'Get-AzIotHubDCL'
+	},
+	{
+		CompletionText: 'Get-AzIotHubDCS',
+		ListItemText: 'Get-AzIotHubDCS',
+		ResultType: 2,
+		ToolTip: 'Get-AzIotHubDCS'
+	},
+	{
+		CompletionText: 'Get-AzIotHubDeployment',
+		ListItemText: 'Get-AzIotHubDeployment',
+		ResultType: 2,
+		ToolTip: 'Get-AzIotHubDeployment\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIotHubDevice',
+		ListItemText: 'Get-AzIotHubDevice',
+		ResultType: 2,
+		ToolTip: 'Get-AzIotHubDevice\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIotHubDeviceChildren',
+		ListItemText: 'Get-AzIotHubDeviceChildren',
+		ResultType: 2,
+		ToolTip: 'Get-AzIotHubDeviceChildren\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIotHubDeviceConnectionString',
+		ListItemText: 'Get-AzIotHubDeviceConnectionString',
+		ResultType: 2,
+		ToolTip: 'Get-AzIotHubDeviceConnectionString\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIotHubDeviceParent',
+		ListItemText: 'Get-AzIotHubDeviceParent',
+		ResultType: 2,
+		ToolTip: 'Get-AzIotHubDeviceParent\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIotHubDeviceTwin',
+		ListItemText: 'Get-AzIotHubDeviceTwin',
+		ResultType: 2,
+		ToolTip: 'Get-AzIotHubDeviceTwin\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIotHubDistributedTracing',
+		ListItemText: 'Get-AzIotHubDistributedTracing',
+		ResultType: 2,
+		ToolTip: 'Get-AzIotHubDistributedTracing\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIotHubEHCG',
+		ListItemText: 'Get-AzIotHubEHCG',
+		ResultType: 2,
+		ToolTip: 'Get-AzIotHubEHCG'
+	},
+	{
+		CompletionText: 'Get-AzIotHubEventHubConsumerGroup',
+		ListItemText: 'Get-AzIotHubEventHubConsumerGroup',
+		ResultType: 2,
+		ToolTip: 'Get-AzIotHubEventHubConsumerGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIotHubJob',
+		ListItemText: 'Get-AzIotHubJob',
+		ResultType: 2,
+		ToolTip: 'Get-AzIotHubJob\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIotHubKey',
+		ListItemText: 'Get-AzIotHubKey',
+		ResultType: 2,
+		ToolTip: 'Get-AzIotHubKey\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIotHubMCS',
+		ListItemText: 'Get-AzIotHubMCS',
+		ResultType: 2,
+		ToolTip: 'Get-AzIotHubMCS'
+	},
+	{
+		CompletionText: 'Get-AzIotHubMessageEnrichment',
+		ListItemText: 'Get-AzIotHubMessageEnrichment',
+		ResultType: 2,
+		ToolTip: 'Get-AzIotHubMessageEnrichment\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIotHubModule',
+		ListItemText: 'Get-AzIotHubModule',
+		ResultType: 2,
+		ToolTip: 'Get-AzIotHubModule\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIotHubModuleConnectionString',
+		ListItemText: 'Get-AzIotHubModuleConnectionString',
+		ResultType: 2,
+		ToolTip: 'Get-AzIotHubModuleConnectionString\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIotHubModuleTwin',
+		ListItemText: 'Get-AzIotHubModuleTwin',
+		ResultType: 2,
+		ToolTip: 'Get-AzIotHubModuleTwin\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIotHubMsgEnrich',
+		ListItemText: 'Get-AzIotHubMsgEnrich',
+		ResultType: 2,
+		ToolTip: 'Get-AzIotHubMsgEnrich'
+	},
+	{
+		CompletionText: 'Get-AzIotHubQuotaMetric',
+		ListItemText: 'Get-AzIotHubQuotaMetric',
+		ResultType: 2,
+		ToolTip: 'Get-AzIotHubQuotaMetric\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIotHubRegistryStatistic',
+		ListItemText: 'Get-AzIotHubRegistryStatistic',
+		ResultType: 2,
+		ToolTip: 'Get-AzIotHubRegistryStatistic\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIotHubRoute',
+		ListItemText: 'Get-AzIotHubRoute',
+		ResultType: 2,
+		ToolTip: 'Get-AzIotHubRoute\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIotHubRoutingEndpoint',
+		ListItemText: 'Get-AzIotHubRoutingEndpoint',
+		ResultType: 2,
+		ToolTip: 'Get-AzIotHubRoutingEndpoint\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIotHubTracing',
+		ListItemText: 'Get-AzIotHubTracing',
+		ResultType: 2,
+		ToolTip: 'Get-AzIotHubTracing'
+	},
+	{
+		CompletionText: 'Get-AzIotHubValidSku',
+		ListItemText: 'Get-AzIotHubValidSku',
+		ResultType: 2,
+		ToolTip: 'Get-AzIotHubValidSku\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIotSecurityAnalytics',
+		ListItemText: 'Get-AzIotSecurityAnalytics',
+		ResultType: 2,
+		ToolTip: 'Get-AzIotSecurityAnalytics\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIotSecurityAnalyticsAggregatedAlert',
+		ListItemText: 'Get-AzIotSecurityAnalyticsAggregatedAlert',
+		ResultType: 2,
+		ToolTip: 'Get-AzIotSecurityAnalyticsAggregatedAlert\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIotSecurityAnalyticsAggregatedRecommendation',
+		ListItemText: 'Get-AzIotSecurityAnalyticsAggregatedRecommendation',
+		ResultType: 2,
+		ToolTip: 'Get-AzIotSecurityAnalyticsAggregatedRecommendation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIotSecuritySolution',
+		ListItemText: 'Get-AzIotSecuritySolution',
+		ResultType: 2,
+		ToolTip: 'Get-AzIotSecuritySolution\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIpAllocation',
+		ListItemText: 'Get-AzIpAllocation',
+		ResultType: 2,
+		ToolTip: 'Get-AzIpAllocation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzIpGroup',
+		ListItemText: 'Get-AzIpGroup',
+		ResultType: 2,
+		ToolTip: 'Get-AzIpGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzJitNetworkAccessPolicy',
+		ListItemText: 'Get-AzJitNetworkAccessPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzJitNetworkAccessPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzKeyVault',
+		ListItemText: 'Get-AzKeyVault',
+		ResultType: 2,
+		ToolTip: 'Get-AzKeyVault\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzKeyVaultCertificate',
+		ListItemText: 'Get-AzKeyVaultCertificate',
+		ResultType: 2,
+		ToolTip: 'Get-AzKeyVaultCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzKeyVaultCertificateContact',
+		ListItemText: 'Get-AzKeyVaultCertificateContact',
+		ResultType: 2,
+		ToolTip: 'Get-AzKeyVaultCertificateContact\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzKeyVaultCertificateIssuer',
+		ListItemText: 'Get-AzKeyVaultCertificateIssuer',
+		ResultType: 2,
+		ToolTip: 'Get-AzKeyVaultCertificateIssuer\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzKeyVaultCertificateOperation',
+		ListItemText: 'Get-AzKeyVaultCertificateOperation',
+		ResultType: 2,
+		ToolTip: 'Get-AzKeyVaultCertificateOperation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzKeyVaultCertificatePolicy',
+		ListItemText: 'Get-AzKeyVaultCertificatePolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzKeyVaultCertificatePolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzKeyVaultKey',
+		ListItemText: 'Get-AzKeyVaultKey',
+		ResultType: 2,
+		ToolTip: 'Get-AzKeyVaultKey\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzKeyVaultKeyRotationPolicy',
+		ListItemText: 'Get-AzKeyVaultKeyRotationPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzKeyVaultKeyRotationPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzKeyVaultManagedHsm',
+		ListItemText: 'Get-AzKeyVaultManagedHsm',
+		ResultType: 2,
+		ToolTip: 'Get-AzKeyVaultManagedHsm\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzKeyVaultManagedStorageAccount',
+		ListItemText: 'Get-AzKeyVaultManagedStorageAccount',
+		ResultType: 2,
+		ToolTip: 'Get-AzKeyVaultManagedStorageAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzKeyVaultManagedStorageSasDefinition',
+		ListItemText: 'Get-AzKeyVaultManagedStorageSasDefinition',
+		ResultType: 2,
+		ToolTip: 'Get-AzKeyVaultManagedStorageSasDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzKeyVaultRandomNumber',
+		ListItemText: 'Get-AzKeyVaultRandomNumber',
+		ResultType: 2,
+		ToolTip: 'Get-AzKeyVaultRandomNumber\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzKeyVaultRoleAssignment',
+		ListItemText: 'Get-AzKeyVaultRoleAssignment',
+		ResultType: 2,
+		ToolTip: 'Get-AzKeyVaultRoleAssignment\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzKeyVaultRoleDefinition',
+		ListItemText: 'Get-AzKeyVaultRoleDefinition',
+		ResultType: 2,
+		ToolTip: 'Get-AzKeyVaultRoleDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzKeyVaultSecret',
+		ListItemText: 'Get-AzKeyVaultSecret',
+		ResultType: 2,
+		ToolTip: 'Get-AzKeyVaultSecret\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzKustoAttachedDatabaseConfiguration',
+		ListItemText: 'Get-AzKustoAttachedDatabaseConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzKustoAttachedDatabaseConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzKustoCluster',
+		ListItemText: 'Get-AzKustoCluster',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzKustoCluster \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzKustoClusterFollowerDatabase',
+		ListItemText: 'Get-AzKustoClusterFollowerDatabase',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzKustoClusterFollowerDatabase \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzKustoClusterLanguageExtension',
+		ListItemText: 'Get-AzKustoClusterLanguageExtension',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzKustoClusterLanguageExtension \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzKustoClusterOutboundNetworkDependencyEndpoint',
+		ListItemText: 'Get-AzKustoClusterOutboundNetworkDependencyEndpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzKustoClusterOutboundNetworkDependencyEndpoint \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzKustoClusterPrincipalAssignment',
+		ListItemText: 'Get-AzKustoClusterPrincipalAssignment',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzKustoClusterPrincipalAssignment \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzKustoClusterSku',
+		ListItemText: 'Get-AzKustoClusterSku',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzKustoClusterSku \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzKustoDatabase',
+		ListItemText: 'Get-AzKustoDatabase',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzKustoDatabase \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzKustoDatabasePrincipal',
+		ListItemText: 'Get-AzKustoDatabasePrincipal',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzKustoDatabasePrincipal \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzKustoDatabasePrincipalAssignment',
+		ListItemText: 'Get-AzKustoDatabasePrincipalAssignment',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzKustoDatabasePrincipalAssignment \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzKustoDataConnection',
+		ListItemText: 'Get-AzKustoDataConnection',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzKustoDataConnection \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzKustoManagedPrivateEndpoint',
+		ListItemText: 'Get-AzKustoManagedPrivateEndpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzKustoManagedPrivateEndpoint \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzKustoOperationsResult',
+		ListItemText: 'Get-AzKustoOperationsResult',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzKustoOperationsResult \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzKustoOperationsResultLocation',
+		ListItemText: 'Get-AzKustoOperationsResultLocation',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzKustoOperationsResultLocation \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzKustoPrivateEndpointConnection',
+		ListItemText: 'Get-AzKustoPrivateEndpointConnection',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzKustoPrivateEndpointConnection \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzKustoPrivateLinkResource',
+		ListItemText: 'Get-AzKustoPrivateLinkResource',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzKustoPrivateLinkResource \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzKustoScript',
+		ListItemText: 'Get-AzKustoScript',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzKustoScript \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzKustoSku',
+		ListItemText: 'Get-AzKustoSku',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzKustoSku \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzLoad',
+		ListItemText: 'Get-AzLoad',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzLoad \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzLoadBalancer',
+		ListItemText: 'Get-AzLoadBalancer',
+		ResultType: 2,
+		ToolTip: 'Get-AzLoadBalancer\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzLoadBalancerBackendAddressInboundNatRulePortMapping',
+		ListItemText: 'Get-AzLoadBalancerBackendAddressInboundNatRulePortMapping',
+		ResultType: 2,
+		ToolTip: 'Get-AzLoadBalancerBackendAddressInboundNatRulePortMapping\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzLoadBalancerBackendAddressPool',
+		ListItemText: 'Get-AzLoadBalancerBackendAddressPool',
+		ResultType: 2,
+		ToolTip: 'Get-AzLoadBalancerBackendAddressPool\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzLoadBalancerBackendAddressPoolConfig',
+		ListItemText: 'Get-AzLoadBalancerBackendAddressPoolConfig',
+		ResultType: 2,
+		ToolTip: 'Get-AzLoadBalancerBackendAddressPoolConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzLoadBalancerFrontendIpConfig',
+		ListItemText: 'Get-AzLoadBalancerFrontendIpConfig',
+		ResultType: 2,
+		ToolTip: 'Get-AzLoadBalancerFrontendIpConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzLoadBalancerInboundNatPoolConfig',
+		ListItemText: 'Get-AzLoadBalancerInboundNatPoolConfig',
+		ResultType: 2,
+		ToolTip: 'Get-AzLoadBalancerInboundNatPoolConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzLoadBalancerInboundNatRuleConfig',
+		ListItemText: 'Get-AzLoadBalancerInboundNatRuleConfig',
+		ResultType: 2,
+		ToolTip: 'Get-AzLoadBalancerInboundNatRuleConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzLoadBalancerOutboundRuleConfig',
+		ListItemText: 'Get-AzLoadBalancerOutboundRuleConfig',
+		ResultType: 2,
+		ToolTip: 'Get-AzLoadBalancerOutboundRuleConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzLoadBalancerProbeConfig',
+		ListItemText: 'Get-AzLoadBalancerProbeConfig',
+		ResultType: 2,
+		ToolTip: 'Get-AzLoadBalancerProbeConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzLoadBalancerRuleConfig',
+		ListItemText: 'Get-AzLoadBalancerRuleConfig',
+		ResultType: 2,
+		ToolTip: 'Get-AzLoadBalancerRuleConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzLocalNetworkGateway',
+		ListItemText: 'Get-AzLocalNetworkGateway',
+		ResultType: 2,
+		ToolTip: 'Get-AzLocalNetworkGateway\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzLocation',
+		ListItemText: 'Get-AzLocation',
+		ResultType: 2,
+		ToolTip: 'Get-AzLocation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzLog',
+		ListItemText: 'Get-AzLog',
+		ResultType: 2,
+		ToolTip: 'Get-AzLog'
+	},
+	{
+		CompletionText: 'Get-AzLogicApp',
+		ListItemText: 'Get-AzLogicApp',
+		ResultType: 2,
+		ToolTip: 'Get-AzLogicApp\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzLogicAppRunAction',
+		ListItemText: 'Get-AzLogicAppRunAction',
+		ResultType: 2,
+		ToolTip: 'Get-AzLogicAppRunAction\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzLogicAppRunHistory',
+		ListItemText: 'Get-AzLogicAppRunHistory',
+		ResultType: 2,
+		ToolTip: 'Get-AzLogicAppRunHistory\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzLogicAppTrigger',
+		ListItemText: 'Get-AzLogicAppTrigger',
+		ResultType: 2,
+		ToolTip: 'Get-AzLogicAppTrigger\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzLogicAppTriggerCallbackUrl',
+		ListItemText: 'Get-AzLogicAppTriggerCallbackUrl',
+		ResultType: 2,
+		ToolTip: 'Get-AzLogicAppTriggerCallbackUrl\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzLogicAppTriggerHistory',
+		ListItemText: 'Get-AzLogicAppTriggerHistory',
+		ResultType: 2,
+		ToolTip: 'Get-AzLogicAppTriggerHistory\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzLogicAppUpgradedDefinition',
+		ListItemText: 'Get-AzLogicAppUpgradedDefinition',
+		ResultType: 2,
+		ToolTip: 'Get-AzLogicAppUpgradedDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzLogProfile',
+		ListItemText: 'Get-AzLogProfile',
+		ResultType: 2,
+		ToolTip: 'Get-AzLogProfile\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMaintenanceConfiguration',
+		ListItemText: 'Get-AzMaintenanceConfiguration',
+		ResultType: 2,
+		ToolTip: 'Get-AzMaintenanceConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMaintenancePublicConfiguration',
+		ListItemText: 'Get-AzMaintenancePublicConfiguration',
+		ResultType: 2,
+		ToolTip: 'Get-AzMaintenancePublicConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMaintenanceUpdate',
+		ListItemText: 'Get-AzMaintenanceUpdate',
+		ResultType: 2,
+		ToolTip: 'Get-AzMaintenanceUpdate\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzManagedApplication',
+		ListItemText: 'Get-AzManagedApplication',
+		ResultType: 2,
+		ToolTip: 'Get-AzManagedApplication\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzManagedApplicationDefinition',
+		ListItemText: 'Get-AzManagedApplicationDefinition',
+		ResultType: 2,
+		ToolTip: 'Get-AzManagedApplicationDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzManagedCassandraCluster',
+		ListItemText: 'Get-AzManagedCassandraCluster',
+		ResultType: 2,
+		ToolTip: 'Get-AzManagedCassandraCluster\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzManagedCassandraDataCenter',
+		ListItemText: 'Get-AzManagedCassandraDataCenter',
+		ResultType: 2,
+		ToolTip: 'Get-AzManagedCassandraDataCenter\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzManagedServicesAssignment',
+		ListItemText: 'Get-AzManagedServicesAssignment',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzManagedServicesAssignment \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzManagedServicesDefinition',
+		ListItemText: 'Get-AzManagedServicesDefinition',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzManagedServicesDefinition \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzManagedServicesMarketplaceDefinition',
+		ListItemText: 'Get-AzManagedServicesMarketplaceDefinition',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzManagedServicesMarketplaceDefinition \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzManagementGroup',
+		ListItemText: 'Get-AzManagementGroup',
+		ResultType: 2,
+		ToolTip: 'Get-AzManagementGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzManagementGroupDeployment',
+		ListItemText: 'Get-AzManagementGroupDeployment',
+		ResultType: 2,
+		ToolTip: 'Get-AzManagementGroupDeployment\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzManagementGroupDeploymentOperation',
+		ListItemText: 'Get-AzManagementGroupDeploymentOperation',
+		ResultType: 2,
+		ToolTip: 'Get-AzManagementGroupDeploymentOperation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzManagementGroupDeploymentWhatIfResult',
+		ListItemText: 'Get-AzManagementGroupDeploymentWhatIfResult',
+		ResultType: 2,
+		ToolTip: 'Get-AzManagementGroupDeploymentWhatIfResult\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzManagementGroupEntity',
+		ListItemText: 'Get-AzManagementGroupEntity',
+		ResultType: 2,
+		ToolTip: 'Get-AzManagementGroupEntity\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzManagementGroupHierarchySetting',
+		ListItemText: 'Get-AzManagementGroupHierarchySetting',
+		ResultType: 2,
+		ToolTip: 'Get-AzManagementGroupHierarchySetting\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzManagementGroupNameAvailability',
+		ListItemText: 'Get-AzManagementGroupNameAvailability',
+		ResultType: 2,
+		ToolTip: 'Get-AzManagementGroupNameAvailability\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzManagementGroupSubscription',
+		ListItemText: 'Get-AzManagementGroupSubscription',
+		ResultType: 2,
+		ToolTip: 'Get-AzManagementGroupSubscription\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMarketplaceTerms',
+		ListItemText: 'Get-AzMarketplaceTerms',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMarketplaceTerms \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMediaService',
+		ListItemText: 'Get-AzMediaService',
+		ResultType: 2,
+		ToolTip: 'Get-AzMediaService\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMediaServiceKey',
+		ListItemText: 'Get-AzMediaServiceKey',
+		ResultType: 2,
+		ToolTip: 'Get-AzMediaServiceKey\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMediaServiceKeys',
+		ListItemText: 'Get-AzMediaServiceKeys',
+		ResultType: 2,
+		ToolTip: 'Get-AzMediaServiceKeys'
+	},
+	{
+		CompletionText: 'Get-AzMediaServiceNameAvailability',
+		ListItemText: 'Get-AzMediaServiceNameAvailability',
+		ResultType: 2,
+		ToolTip: 'Get-AzMediaServiceNameAvailability\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMetric',
+		ListItemText: 'Get-AzMetric',
+		ResultType: 2,
+		ToolTip: 'Get-AzMetric\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMetricAlertRuleV2',
+		ListItemText: 'Get-AzMetricAlertRuleV2',
+		ResultType: 2,
+		ToolTip: 'Get-AzMetricAlertRuleV2\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMetricDefinition',
+		ListItemText: 'Get-AzMetricDefinition',
+		ResultType: 2,
+		ToolTip: 'Get-AzMetricDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMigrateDiscoveredServer',
+		ListItemText: 'Get-AzMigrateDiscoveredServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMigrateDiscoveredServer \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMigrateJob',
+		ListItemText: 'Get-AzMigrateJob',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMigrateJob \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMigrateProject',
+		ListItemText: 'Get-AzMigrateProject',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMigrateProject \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMigrateReplicationFabric',
+		ListItemText: 'Get-AzMigrateReplicationFabric',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMigrateReplicationFabric \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMigrateReplicationPolicy',
+		ListItemText: 'Get-AzMigrateReplicationPolicy',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMigrateReplicationPolicy \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMigrateReplicationProtectionContainer',
+		ListItemText: 'Get-AzMigrateReplicationProtectionContainer',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMigrateReplicationProtectionContainer \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMigrateReplicationProtectionContainerMapping',
+		ListItemText: 'Get-AzMigrateReplicationProtectionContainerMapping',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMigrateReplicationProtectionContainerMapping \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMigrateReplicationRecoveryServicesProvider',
+		ListItemText: 'Get-AzMigrateReplicationRecoveryServicesProvider',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMigrateReplicationRecoveryServicesProvider \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMigrateRunAsAccount',
+		ListItemText: 'Get-AzMigrateRunAsAccount',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMigrateRunAsAccount \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMigrateServerReplication',
+		ListItemText: 'Get-AzMigrateServerReplication',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMigrateServerReplication \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMigrateSite',
+		ListItemText: 'Get-AzMigrateSite',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMigrateSite \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMigrateSolution',
+		ListItemText: 'Get-AzMigrateSolution',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMigrateSolution \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMlCommitmentAssociation',
+		ListItemText: 'Get-AzMlCommitmentAssociation',
+		ResultType: 2,
+		ToolTip: 'Get-AzMlCommitmentAssociation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMlCommitmentPlan',
+		ListItemText: 'Get-AzMlCommitmentPlan',
+		ResultType: 2,
+		ToolTip: 'Get-AzMlCommitmentPlan\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMlCommitmentPlanUsageHistory',
+		ListItemText: 'Get-AzMlCommitmentPlanUsageHistory',
+		ResultType: 2,
+		ToolTip: 'Get-AzMlCommitmentPlanUsageHistory\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMLServiceQuota',
+		ListItemText: 'Get-AzMLServiceQuota',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMLServiceQuota \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMLServiceUsage',
+		ListItemText: 'Get-AzMLServiceUsage',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMLServiceUsage \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMLServiceVMSize',
+		ListItemText: 'Get-AzMLServiceVMSize',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMLServiceVMSize \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMlWebService',
+		ListItemText: 'Get-AzMlWebService',
+		ResultType: 2,
+		ToolTip: 'Get-AzMlWebService\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMlWebServiceKey',
+		ListItemText: 'Get-AzMlWebServiceKey',
+		ResultType: 2,
+		ToolTip: 'Get-AzMlWebServiceKey\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMlWebServiceKeys',
+		ListItemText: 'Get-AzMlWebServiceKeys',
+		ResultType: 2,
+		ToolTip: 'Get-AzMlWebServiceKeys'
+	},
+	{
+		CompletionText: 'Get-AzMLWorkspace',
+		ListItemText: 'Get-AzMLWorkspace',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMLWorkspace \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMLWorkspaceBatchDeployment',
+		ListItemText: 'Get-AzMLWorkspaceBatchDeployment',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMLWorkspaceBatchDeployment \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMLWorkspaceBatchEndpoint',
+		ListItemText: 'Get-AzMLWorkspaceBatchEndpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMLWorkspaceBatchEndpoint \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMLWorkspaceCodeVersion',
+		ListItemText: 'Get-AzMLWorkspaceCodeVersion',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMLWorkspaceCodeVersion \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMLWorkspaceComponentContainer',
+		ListItemText: 'Get-AzMLWorkspaceComponentContainer',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMLWorkspaceComponentContainer \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMLWorkspaceComponentVersion',
+		ListItemText: 'Get-AzMLWorkspaceComponentVersion',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMLWorkspaceComponentVersion \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMLWorkspaceCompute',
+		ListItemText: 'Get-AzMLWorkspaceCompute',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMLWorkspaceCompute \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMLWorkspaceComputeKey',
+		ListItemText: 'Get-AzMLWorkspaceComputeKey',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMLWorkspaceComputeKey \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMLWorkspaceComputeNode',
+		ListItemText: 'Get-AzMLWorkspaceComputeNode',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMLWorkspaceComputeNode \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMLWorkspaceConnection',
+		ListItemText: 'Get-AzMLWorkspaceConnection',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMLWorkspaceConnection \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMLWorkspaceDataContainer',
+		ListItemText: 'Get-AzMLWorkspaceDataContainer',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMLWorkspaceDataContainer \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMLWorkspaceDatastore',
+		ListItemText: 'Get-AzMLWorkspaceDatastore',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMLWorkspaceDatastore \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMLWorkspaceDatastoreSecret',
+		ListItemText: 'Get-AzMLWorkspaceDatastoreSecret',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMLWorkspaceDatastoreSecret \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMLWorkspaceDataVersion',
+		ListItemText: 'Get-AzMLWorkspaceDataVersion',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMLWorkspaceDataVersion \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMLWorkspaceEnvironmentContainer',
+		ListItemText: 'Get-AzMLWorkspaceEnvironmentContainer',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMLWorkspaceEnvironmentContainer \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMLWorkspaceEnvironmentVersion',
+		ListItemText: 'Get-AzMLWorkspaceEnvironmentVersion',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMLWorkspaceEnvironmentVersion \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMLWorkspaceFeature',
+		ListItemText: 'Get-AzMLWorkspaceFeature',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMLWorkspaceFeature \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMLWorkspaceJob',
+		ListItemText: 'Get-AzMLWorkspaceJob',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMLWorkspaceJob \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMLWorkspaceKey',
+		ListItemText: 'Get-AzMLWorkspaceKey',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMLWorkspaceKey \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMLWorkspaceModelContainer',
+		ListItemText: 'Get-AzMLWorkspaceModelContainer',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMLWorkspaceModelContainer \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMLWorkspaceModelVersion',
+		ListItemText: 'Get-AzMLWorkspaceModelVersion',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMLWorkspaceModelVersion \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMLWorkspaceNotebookAccessToken',
+		ListItemText: 'Get-AzMLWorkspaceNotebookAccessToken',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMLWorkspaceNotebookAccessToken \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMLWorkspaceNotebookKey',
+		ListItemText: 'Get-AzMLWorkspaceNotebookKey',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMLWorkspaceNotebookKey \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMLWorkspaceOnlineDeployment',
+		ListItemText: 'Get-AzMLWorkspaceOnlineDeployment',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMLWorkspaceOnlineDeployment \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMLWorkspaceOnlineDeploymentLog',
+		ListItemText: 'Get-AzMLWorkspaceOnlineDeploymentLog',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMLWorkspaceOnlineDeploymentLog \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMLWorkspaceOnlineDeploymentSku',
+		ListItemText: 'Get-AzMLWorkspaceOnlineDeploymentSku',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMLWorkspaceOnlineDeploymentSku \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMLWorkspaceOnlineEndpoint',
+		ListItemText: 'Get-AzMLWorkspaceOnlineEndpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMLWorkspaceOnlineEndpoint \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMLWorkspaceOnlineEndpointKey',
+		ListItemText: 'Get-AzMLWorkspaceOnlineEndpointKey',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMLWorkspaceOnlineEndpointKey \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMLWorkspaceOnlineEndpointToken',
+		ListItemText: 'Get-AzMLWorkspaceOnlineEndpointToken',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMLWorkspaceOnlineEndpointToken \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMLWorkspaceOutboundNetworkDependencyEndpoint',
+		ListItemText: 'Get-AzMLWorkspaceOutboundNetworkDependencyEndpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMLWorkspaceOutboundNetworkDependencyEndpoint \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMLWorkspaceStorageAccountKey',
+		ListItemText: 'Get-AzMLWorkspaceStorageAccountKey',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMLWorkspaceStorageAccountKey \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMonitorWorkspace',
+		ListItemText: 'Get-AzMonitorWorkspace',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMonitorWorkspace \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMySqlConfiguration',
+		ListItemText: 'Get-AzMySqlConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMySqlConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMySqlConnectionString',
+		ListItemText: 'Get-AzMySqlConnectionString',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMySqlConnectionString \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMySqlFirewallRule',
+		ListItemText: 'Get-AzMySqlFirewallRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMySqlFirewallRule \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMySqlFlexibleServer',
+		ListItemText: 'Get-AzMySqlFlexibleServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMySqlFlexibleServer \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMySqlFlexibleServerConfiguration',
+		ListItemText: 'Get-AzMySqlFlexibleServerConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMySqlFlexibleServerConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMySqlFlexibleServerConnectionString',
+		ListItemText: 'Get-AzMySqlFlexibleServerConnectionString',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMySqlFlexibleServerConnectionString \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMySqlFlexibleServerDatabase',
+		ListItemText: 'Get-AzMySqlFlexibleServerDatabase',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMySqlFlexibleServerDatabase \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMySqlFlexibleServerFirewallRule',
+		ListItemText: 'Get-AzMySqlFlexibleServerFirewallRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMySqlFlexibleServerFirewallRule \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMySqlFlexibleServerLocationBasedCapability',
+		ListItemText: 'Get-AzMySqlFlexibleServerLocationBasedCapability',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMySqlFlexibleServerLocationBasedCapability \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMySqlFlexibleServerReplica',
+		ListItemText: 'Get-AzMySqlFlexibleServerReplica',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMySqlFlexibleServerReplica \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMySqlReplica',
+		ListItemText: 'Get-AzMySqlReplica',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMySqlReplica \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMySqlServer',
+		ListItemText: 'Get-AzMySqlServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMySqlServer \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzMySqlVirtualNetworkRule',
+		ListItemText: 'Get-AzMySqlVirtualNetworkRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzMySqlVirtualNetworkRule \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNatGateway',
+		ListItemText: 'Get-AzNatGateway',
+		ResultType: 2,
+		ToolTip: 'Get-AzNatGateway\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNetworkInterface',
+		ListItemText: 'Get-AzNetworkInterface',
+		ResultType: 2,
+		ToolTip: 'Get-AzNetworkInterface\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNetworkInterfaceIpConfig',
+		ListItemText: 'Get-AzNetworkInterfaceIpConfig',
+		ResultType: 2,
+		ToolTip: 'Get-AzNetworkInterfaceIpConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNetworkInterfaceTapConfig',
+		ListItemText: 'Get-AzNetworkInterfaceTapConfig',
+		ResultType: 2,
+		ToolTip: 'Get-AzNetworkInterfaceTapConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNetworkManager',
+		ListItemText: 'Get-AzNetworkManager',
+		ResultType: 2,
+		ToolTip: 'Get-AzNetworkManager\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNetworkManagerActiveConnectivityConfiguration',
+		ListItemText: 'Get-AzNetworkManagerActiveConnectivityConfiguration',
+		ResultType: 2,
+		ToolTip: 'Get-AzNetworkManagerActiveConnectivityConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNetworkManagerActiveSecurityAdminRule',
+		ListItemText: 'Get-AzNetworkManagerActiveSecurityAdminRule',
+		ResultType: 2,
+		ToolTip: 'Get-AzNetworkManagerActiveSecurityAdminRule\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNetworkManagerConnectivityConfiguration',
+		ListItemText: 'Get-AzNetworkManagerConnectivityConfiguration',
+		ResultType: 2,
+		ToolTip: 'Get-AzNetworkManagerConnectivityConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNetworkManagerDeploymentStatus',
+		ListItemText: 'Get-AzNetworkManagerDeploymentStatus',
+		ResultType: 2,
+		ToolTip: 'Get-AzNetworkManagerDeploymentStatus\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNetworkManagerEffectiveConnectivityConfiguration',
+		ListItemText: 'Get-AzNetworkManagerEffectiveConnectivityConfiguration',
+		ResultType: 2,
+		ToolTip: 'Get-AzNetworkManagerEffectiveConnectivityConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNetworkManagerEffectiveSecurityAdminRule',
+		ListItemText: 'Get-AzNetworkManagerEffectiveSecurityAdminRule',
+		ResultType: 2,
+		ToolTip: 'Get-AzNetworkManagerEffectiveSecurityAdminRule\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNetworkManagerGroup',
+		ListItemText: 'Get-AzNetworkManagerGroup',
+		ResultType: 2,
+		ToolTip: 'Get-AzNetworkManagerGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNetworkManagerManagementGroupConnection',
+		ListItemText: 'Get-AzNetworkManagerManagementGroupConnection',
+		ResultType: 2,
+		ToolTip: 'Get-AzNetworkManagerManagementGroupConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNetworkManagerScopeConnection',
+		ListItemText: 'Get-AzNetworkManagerScopeConnection',
+		ResultType: 2,
+		ToolTip: 'Get-AzNetworkManagerScopeConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNetworkManagerSecurityAdminConfiguration',
+		ListItemText: 'Get-AzNetworkManagerSecurityAdminConfiguration',
+		ResultType: 2,
+		ToolTip: 'Get-AzNetworkManagerSecurityAdminConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNetworkManagerSecurityAdminRule',
+		ListItemText: 'Get-AzNetworkManagerSecurityAdminRule',
+		ResultType: 2,
+		ToolTip: 'Get-AzNetworkManagerSecurityAdminRule\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNetworkManagerSecurityAdminRuleCollection',
+		ListItemText: 'Get-AzNetworkManagerSecurityAdminRuleCollection',
+		ResultType: 2,
+		ToolTip: 'Get-AzNetworkManagerSecurityAdminRuleCollection\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNetworkManagerStaticMember',
+		ListItemText: 'Get-AzNetworkManagerStaticMember',
+		ResultType: 2,
+		ToolTip: 'Get-AzNetworkManagerStaticMember\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNetworkManagerSubscriptionConnection',
+		ListItemText: 'Get-AzNetworkManagerSubscriptionConnection',
+		ResultType: 2,
+		ToolTip: 'Get-AzNetworkManagerSubscriptionConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNetworkProfile',
+		ListItemText: 'Get-AzNetworkProfile',
+		ResultType: 2,
+		ToolTip: 'Get-AzNetworkProfile\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNetworkSecurityGroup',
+		ListItemText: 'Get-AzNetworkSecurityGroup',
+		ResultType: 2,
+		ToolTip: 'Get-AzNetworkSecurityGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNetworkSecurityRuleConfig',
+		ListItemText: 'Get-AzNetworkSecurityRuleConfig',
+		ResultType: 2,
+		ToolTip: 'Get-AzNetworkSecurityRuleConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNetworkServiceTag',
+		ListItemText: 'Get-AzNetworkServiceTag',
+		ResultType: 2,
+		ToolTip: 'Get-AzNetworkServiceTag\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNetworkUsage',
+		ListItemText: 'Get-AzNetworkUsage',
+		ResultType: 2,
+		ToolTip: 'Get-AzNetworkUsage\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNetworkVirtualAppliance',
+		ListItemText: 'Get-AzNetworkVirtualAppliance',
+		ResultType: 2,
+		ToolTip: 'Get-AzNetworkVirtualAppliance\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNetworkVirtualApplianceSku',
+		ListItemText: 'Get-AzNetworkVirtualApplianceSku',
+		ResultType: 2,
+		ToolTip: 'Get-AzNetworkVirtualApplianceSku\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNetworkWatcher',
+		ListItemText: 'Get-AzNetworkWatcher',
+		ResultType: 2,
+		ToolTip: 'Get-AzNetworkWatcher\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNetworkWatcherConnectionMonitor',
+		ListItemText: 'Get-AzNetworkWatcherConnectionMonitor',
+		ResultType: 2,
+		ToolTip: 'Get-AzNetworkWatcherConnectionMonitor\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNetworkWatcherConnectionMonitorReport',
+		ListItemText: 'Get-AzNetworkWatcherConnectionMonitorReport',
+		ResultType: 2,
+		ToolTip: 'Get-AzNetworkWatcherConnectionMonitorReport\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNetworkWatcherFlowLog',
+		ListItemText: 'Get-AzNetworkWatcherFlowLog',
+		ResultType: 2,
+		ToolTip: 'Get-AzNetworkWatcherFlowLog\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNetworkWatcherFlowLogStatus',
+		ListItemText: 'Get-AzNetworkWatcherFlowLogStatus',
+		ResultType: 2,
+		ToolTip: 'Get-AzNetworkWatcherFlowLogStatus\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNetworkWatcherNextHop',
+		ListItemText: 'Get-AzNetworkWatcherNextHop',
+		ResultType: 2,
+		ToolTip: 'Get-AzNetworkWatcherNextHop\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNetworkWatcherPacketCapture',
+		ListItemText: 'Get-AzNetworkWatcherPacketCapture',
+		ResultType: 2,
+		ToolTip: 'Get-AzNetworkWatcherPacketCapture\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNetworkWatcherReachabilityProvidersList',
+		ListItemText: 'Get-AzNetworkWatcherReachabilityProvidersList',
+		ResultType: 2,
+		ToolTip: 'Get-AzNetworkWatcherReachabilityProvidersList\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNetworkWatcherReachabilityReport',
+		ListItemText: 'Get-AzNetworkWatcherReachabilityReport',
+		ResultType: 2,
+		ToolTip: 'Get-AzNetworkWatcherReachabilityReport\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNetworkWatcherSecurityGroupView',
+		ListItemText: 'Get-AzNetworkWatcherSecurityGroupView',
+		ResultType: 2,
+		ToolTip: 'Get-AzNetworkWatcherSecurityGroupView\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNetworkWatcherTopology',
+		ListItemText: 'Get-AzNetworkWatcherTopology',
+		ResultType: 2,
+		ToolTip: 'Get-AzNetworkWatcherTopology\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNetworkWatcherTroubleshootingResult',
+		ListItemText: 'Get-AzNetworkWatcherTroubleshootingResult',
+		ResultType: 2,
+		ToolTip: 'Get-AzNetworkWatcherTroubleshootingResult\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNotificationHub',
+		ListItemText: 'Get-AzNotificationHub',
+		ResultType: 2,
+		ToolTip: 'Get-AzNotificationHub\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNotificationHubAuthorizationRule',
+		ListItemText: 'Get-AzNotificationHubAuthorizationRule',
+		ResultType: 2,
+		ToolTip: 'Get-AzNotificationHubAuthorizationRule\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNotificationHubAuthorizationRules',
+		ListItemText: 'Get-AzNotificationHubAuthorizationRules',
+		ResultType: 2,
+		ToolTip: 'Get-AzNotificationHubAuthorizationRules'
+	},
+	{
+		CompletionText: 'Get-AzNotificationHubListKey',
+		ListItemText: 'Get-AzNotificationHubListKey',
+		ResultType: 2,
+		ToolTip: 'Get-AzNotificationHubListKey\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNotificationHubListKeys',
+		ListItemText: 'Get-AzNotificationHubListKeys',
+		ResultType: 2,
+		ToolTip: 'Get-AzNotificationHubListKeys'
+	},
+	{
+		CompletionText: 'Get-AzNotificationHubPNSCredential',
+		ListItemText: 'Get-AzNotificationHubPNSCredential',
+		ResultType: 2,
+		ToolTip: 'Get-AzNotificationHubPNSCredential\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNotificationHubPNSCredentials',
+		ListItemText: 'Get-AzNotificationHubPNSCredentials',
+		ResultType: 2,
+		ToolTip: 'Get-AzNotificationHubPNSCredentials'
+	},
+	{
+		CompletionText: 'Get-AzNotificationHubsNamespace',
+		ListItemText: 'Get-AzNotificationHubsNamespace',
+		ResultType: 2,
+		ToolTip: 'Get-AzNotificationHubsNamespace\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNotificationHubsNamespaceAuthorizationRule',
+		ListItemText: 'Get-AzNotificationHubsNamespaceAuthorizationRule',
+		ResultType: 2,
+		ToolTip: 'Get-AzNotificationHubsNamespaceAuthorizationRule\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNotificationHubsNamespaceAuthorizationRules',
+		ListItemText: 'Get-AzNotificationHubsNamespaceAuthorizationRules',
+		ResultType: 2,
+		ToolTip: 'Get-AzNotificationHubsNamespaceAuthorizationRules'
+	},
+	{
+		CompletionText: 'Get-AzNotificationHubsNamespaceListKey',
+		ListItemText: 'Get-AzNotificationHubsNamespaceListKey',
+		ResultType: 2,
+		ToolTip: 'Get-AzNotificationHubsNamespaceListKey\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzNotificationHubsNamespaceListKeys',
+		ListItemText: 'Get-AzNotificationHubsNamespaceListKeys',
+		ResultType: 2,
+		ToolTip: 'Get-AzNotificationHubsNamespaceListKeys'
+	},
+	{
+		CompletionText: 'Get-AzOperationalInsightsAvailableServiceTier',
+		ListItemText: 'Get-AzOperationalInsightsAvailableServiceTier',
+		ResultType: 2,
+		ToolTip: 'Get-AzOperationalInsightsAvailableServiceTier\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzOperationalInsightsCluster',
+		ListItemText: 'Get-AzOperationalInsightsCluster',
+		ResultType: 2,
+		ToolTip: 'Get-AzOperationalInsightsCluster\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzOperationalInsightsDataExport',
+		ListItemText: 'Get-AzOperationalInsightsDataExport',
+		ResultType: 2,
+		ToolTip: 'Get-AzOperationalInsightsDataExport\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzOperationalInsightsDataSource',
+		ListItemText: 'Get-AzOperationalInsightsDataSource',
+		ResultType: 2,
+		ToolTip: 'Get-AzOperationalInsightsDataSource\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzOperationalInsightsDeletedWorkspace',
+		ListItemText: 'Get-AzOperationalInsightsDeletedWorkspace',
+		ResultType: 2,
+		ToolTip: 'Get-AzOperationalInsightsDeletedWorkspace\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzOperationalInsightsIntelligencePack',
+		ListItemText: 'Get-AzOperationalInsightsIntelligencePack',
+		ResultType: 2,
+		ToolTip: 'Get-AzOperationalInsightsIntelligencePack\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzOperationalInsightsIntelligencePacks',
+		ListItemText: 'Get-AzOperationalInsightsIntelligencePacks',
+		ResultType: 2,
+		ToolTip: 'Get-AzOperationalInsightsIntelligencePacks'
+	},
+	{
+		CompletionText: 'Get-AzOperationalInsightsLinkedService',
+		ListItemText: 'Get-AzOperationalInsightsLinkedService',
+		ResultType: 2,
+		ToolTip: 'Get-AzOperationalInsightsLinkedService\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzOperationalInsightsLinkedStorageAccount',
+		ListItemText: 'Get-AzOperationalInsightsLinkedStorageAccount',
+		ResultType: 2,
+		ToolTip: 'Get-AzOperationalInsightsLinkedStorageAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzOperationalInsightsOperation',
+		ListItemText: 'Get-AzOperationalInsightsOperation',
+		ResultType: 2,
+		ToolTip: 'Get-AzOperationalInsightsOperation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzOperationalInsightsOperationStatus',
+		ListItemText: 'Get-AzOperationalInsightsOperationStatus',
+		ResultType: 2,
+		ToolTip: 'Get-AzOperationalInsightsOperationStatus\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzOperationalInsightsPurgeWorkspaceStatus',
+		ListItemText: 'Get-AzOperationalInsightsPurgeWorkspaceStatus',
+		ResultType: 2,
+		ToolTip: 'Get-AzOperationalInsightsPurgeWorkspaceStatus\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzOperationalInsightsSavedSearch',
+		ListItemText: 'Get-AzOperationalInsightsSavedSearch',
+		ResultType: 2,
+		ToolTip: 'Get-AzOperationalInsightsSavedSearch\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzOperationalInsightsSchema',
+		ListItemText: 'Get-AzOperationalInsightsSchema',
+		ResultType: 2,
+		ToolTip: 'Get-AzOperationalInsightsSchema\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzOperationalInsightsStorageInsight',
+		ListItemText: 'Get-AzOperationalInsightsStorageInsight',
+		ResultType: 2,
+		ToolTip: 'Get-AzOperationalInsightsStorageInsight\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzOperationalInsightsTable',
+		ListItemText: 'Get-AzOperationalInsightsTable',
+		ResultType: 2,
+		ToolTip: 'Get-AzOperationalInsightsTable\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzOperationalInsightsWorkspace',
+		ListItemText: 'Get-AzOperationalInsightsWorkspace',
+		ResultType: 2,
+		ToolTip: 'Get-AzOperationalInsightsWorkspace\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzOperationalInsightsWorkspaceManagementGroup',
+		ListItemText: 'Get-AzOperationalInsightsWorkspaceManagementGroup',
+		ResultType: 2,
+		ToolTip: 'Get-AzOperationalInsightsWorkspaceManagementGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzOperationalInsightsWorkspaceManagementGroups',
+		ListItemText: 'Get-AzOperationalInsightsWorkspaceManagementGroups',
+		ResultType: 2,
+		ToolTip: 'Get-AzOperationalInsightsWorkspaceManagementGroups'
+	},
+	{
+		CompletionText: 'Get-AzOperationalInsightsWorkspaceSharedKey',
+		ListItemText: 'Get-AzOperationalInsightsWorkspaceSharedKey',
+		ResultType: 2,
+		ToolTip: 'Get-AzOperationalInsightsWorkspaceSharedKey\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzOperationalInsightsWorkspaceSharedKeys',
+		ListItemText: 'Get-AzOperationalInsightsWorkspaceSharedKeys',
+		ResultType: 2,
+		ToolTip: 'Get-AzOperationalInsightsWorkspaceSharedKeys'
+	},
+	{
+		CompletionText: 'Get-AzOperationalInsightsWorkspaceUsage',
+		ListItemText: 'Get-AzOperationalInsightsWorkspaceUsage',
+		ResultType: 2,
+		ToolTip: 'Get-AzOperationalInsightsWorkspaceUsage\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzP2sVpnGateway',
+		ListItemText: 'Get-AzP2sVpnGateway',
+		ResultType: 2,
+		ToolTip: 'Get-AzP2sVpnGateway\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzP2sVpnGatewayConnectionHealth',
+		ListItemText: 'Get-AzP2sVpnGatewayConnectionHealth',
+		ResultType: 2,
+		ToolTip: 'Get-AzP2sVpnGatewayConnectionHealth\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzP2sVpnGatewayDetailedConnectionHealth',
+		ListItemText: 'Get-AzP2sVpnGatewayDetailedConnectionHealth',
+		ResultType: 2,
+		ToolTip: 'Get-AzP2sVpnGatewayDetailedConnectionHealth\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzP2sVpnGatewayVpnProfile',
+		ListItemText: 'Get-AzP2sVpnGatewayVpnProfile',
+		ResultType: 2,
+		ToolTip: 'Get-AzP2sVpnGatewayVpnProfile\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPolicyAlias',
+		ListItemText: 'Get-AzPolicyAlias',
+		ResultType: 2,
+		ToolTip: 'Get-AzPolicyAlias\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPolicyAssignment',
+		ListItemText: 'Get-AzPolicyAssignment',
+		ResultType: 2,
+		ToolTip: 'Get-AzPolicyAssignment\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPolicyAttestation',
+		ListItemText: 'Get-AzPolicyAttestation',
+		ResultType: 2,
+		ToolTip: 'Get-AzPolicyAttestation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPolicyDefinition',
+		ListItemText: 'Get-AzPolicyDefinition',
+		ResultType: 2,
+		ToolTip: 'Get-AzPolicyDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPolicyEvent',
+		ListItemText: 'Get-AzPolicyEvent',
+		ResultType: 2,
+		ToolTip: 'Get-AzPolicyEvent\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPolicyExemption',
+		ListItemText: 'Get-AzPolicyExemption',
+		ResultType: 2,
+		ToolTip: 'Get-AzPolicyExemption\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPolicyMetadata',
+		ListItemText: 'Get-AzPolicyMetadata',
+		ResultType: 2,
+		ToolTip: 'Get-AzPolicyMetadata\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPolicyRemediation',
+		ListItemText: 'Get-AzPolicyRemediation',
+		ResultType: 2,
+		ToolTip: 'Get-AzPolicyRemediation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPolicySetDefinition',
+		ListItemText: 'Get-AzPolicySetDefinition',
+		ResultType: 2,
+		ToolTip: 'Get-AzPolicySetDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPolicyState',
+		ListItemText: 'Get-AzPolicyState',
+		ResultType: 2,
+		ToolTip: 'Get-AzPolicyState\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPolicyStateSummary',
+		ListItemText: 'Get-AzPolicyStateSummary',
+		ResultType: 2,
+		ToolTip: 'Get-AzPolicyStateSummary\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPostgreSqlConfiguration',
+		ListItemText: 'Get-AzPostgreSqlConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzPostgreSqlConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPostgreSqlConnectionString',
+		ListItemText: 'Get-AzPostgreSqlConnectionString',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzPostgreSqlConnectionString \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPostgreSqlFirewallRule',
+		ListItemText: 'Get-AzPostgreSqlFirewallRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzPostgreSqlFirewallRule \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPostgreSqlFlexibleServer',
+		ListItemText: 'Get-AzPostgreSqlFlexibleServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzPostgreSqlFlexibleServer \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPostgreSqlFlexibleServerConfiguration',
+		ListItemText: 'Get-AzPostgreSqlFlexibleServerConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzPostgreSqlFlexibleServerConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPostgreSqlFlexibleServerConnectionString',
+		ListItemText: 'Get-AzPostgreSqlFlexibleServerConnectionString',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzPostgreSqlFlexibleServerConnectionString \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPostgreSqlFlexibleServerDatabase',
+		ListItemText: 'Get-AzPostgreSqlFlexibleServerDatabase',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzPostgreSqlFlexibleServerDatabase \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPostgreSqlFlexibleServerFirewallRule',
+		ListItemText: 'Get-AzPostgreSqlFlexibleServerFirewallRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzPostgreSqlFlexibleServerFirewallRule \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPostgreSqlFlexibleServerLocationBasedCapability',
+		ListItemText: 'Get-AzPostgreSqlFlexibleServerLocationBasedCapability',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzPostgreSqlFlexibleServerLocationBasedCapability \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPostgreSqlReplica',
+		ListItemText: 'Get-AzPostgreSqlReplica',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzPostgreSqlReplica \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPostgreSqlServer',
+		ListItemText: 'Get-AzPostgreSqlServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzPostgreSqlServer \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPostgreSqlVirtualNetworkRule',
+		ListItemText: 'Get-AzPostgreSqlVirtualNetworkRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzPostgreSqlVirtualNetworkRule \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPowerBIEmbeddedCapacity',
+		ListItemText: 'Get-AzPowerBIEmbeddedCapacity',
+		ResultType: 2,
+		ToolTip: 'Get-AzPowerBIEmbeddedCapacity\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPowerBIWorkspace',
+		ListItemText: 'Get-AzPowerBIWorkspace',
+		ResultType: 2,
+		ToolTip: 'Get-AzPowerBIWorkspace\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPowerBIWorkspaceCollection',
+		ListItemText: 'Get-AzPowerBIWorkspaceCollection',
+		ResultType: 2,
+		ToolTip: 'Get-AzPowerBIWorkspaceCollection\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPowerBIWorkspaceCollectionAccessKey',
+		ListItemText: 'Get-AzPowerBIWorkspaceCollectionAccessKey',
+		ResultType: 2,
+		ToolTip: 'Get-AzPowerBIWorkspaceCollectionAccessKey\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPowerBIWorkspaceCollectionAccessKeys',
+		ListItemText: 'Get-AzPowerBIWorkspaceCollectionAccessKeys',
+		ResultType: 2,
+		ToolTip: 'Get-AzPowerBIWorkspaceCollectionAccessKeys'
+	},
+	{
+		CompletionText: 'Get-AzPrivateDnsRecordSet',
+		ListItemText: 'Get-AzPrivateDnsRecordSet',
+		ResultType: 2,
+		ToolTip: 'Get-AzPrivateDnsRecordSet\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPrivateDnsVirtualNetworkLink',
+		ListItemText: 'Get-AzPrivateDnsVirtualNetworkLink',
+		ResultType: 2,
+		ToolTip: 'Get-AzPrivateDnsVirtualNetworkLink\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPrivateDnsZone',
+		ListItemText: 'Get-AzPrivateDnsZone',
+		ResultType: 2,
+		ToolTip: 'Get-AzPrivateDnsZone\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPrivateDnsZoneGroup',
+		ListItemText: 'Get-AzPrivateDnsZoneGroup',
+		ResultType: 2,
+		ToolTip: 'Get-AzPrivateDnsZoneGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPrivateEndpoint',
+		ListItemText: 'Get-AzPrivateEndpoint',
+		ResultType: 2,
+		ToolTip: 'Get-AzPrivateEndpoint\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPrivateEndpointConnection',
+		ListItemText: 'Get-AzPrivateEndpointConnection',
+		ResultType: 2,
+		ToolTip: 'Get-AzPrivateEndpointConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPrivateLinkAssociation',
+		ListItemText: 'Get-AzPrivateLinkAssociation',
+		ResultType: 2,
+		ToolTip: 'Get-AzPrivateLinkAssociation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPrivateLinkResource',
+		ListItemText: 'Get-AzPrivateLinkResource',
+		ResultType: 2,
+		ToolTip: 'Get-AzPrivateLinkResource\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPrivateLinkService',
+		ListItemText: 'Get-AzPrivateLinkService',
+		ResultType: 2,
+		ToolTip: 'Get-AzPrivateLinkService\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzProviderFeature',
+		ListItemText: 'Get-AzProviderFeature',
+		ResultType: 2,
+		ToolTip: 'Get-AzProviderFeature\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzProviderOperation',
+		ListItemText: 'Get-AzProviderOperation',
+		ResultType: 2,
+		ToolTip: 'Get-AzProviderOperation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzProviderPreviewFeature',
+		ListItemText: 'Get-AzProviderPreviewFeature',
+		ResultType: 2,
+		ToolTip: 'Get-AzProviderPreviewFeature\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzProximityPlacementGroup',
+		ListItemText: 'Get-AzProximityPlacementGroup',
+		ResultType: 2,
+		ToolTip: 'Get-AzProximityPlacementGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPublicIpAddress',
+		ListItemText: 'Get-AzPublicIpAddress',
+		ResultType: 2,
+		ToolTip: 'Get-AzPublicIpAddress\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzPublicIpPrefix',
+		ListItemText: 'Get-AzPublicIpPrefix',
+		ResultType: 2,
+		ToolTip: 'Get-AzPublicIpPrefix\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesAsrAlertSetting',
+		ListItemText: 'Get-AzRecoveryServicesAsrAlertSetting',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesAsrAlertSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesAsrEvent',
+		ListItemText: 'Get-AzRecoveryServicesAsrEvent',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesAsrEvent\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesAsrFabric',
+		ListItemText: 'Get-AzRecoveryServicesAsrFabric',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesAsrFabric\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesAsrJob',
+		ListItemText: 'Get-AzRecoveryServicesAsrJob',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesAsrJob\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesAsrNetwork',
+		ListItemText: 'Get-AzRecoveryServicesAsrNetwork',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesAsrNetwork\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesAsrNetworkMapping',
+		ListItemText: 'Get-AzRecoveryServicesAsrNetworkMapping',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesAsrNetworkMapping\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesAsrNotificationSetting',
+		ListItemText: 'Get-AzRecoveryServicesAsrNotificationSetting',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesAsrNotificationSetting'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesAsrPolicy',
+		ListItemText: 'Get-AzRecoveryServicesAsrPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesAsrPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesAsrProtectableItem',
+		ListItemText: 'Get-AzRecoveryServicesAsrProtectableItem',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesAsrProtectableItem\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesAsrProtectionContainer',
+		ListItemText: 'Get-AzRecoveryServicesAsrProtectionContainer',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesAsrProtectionContainer\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesAsrProtectionContainerMapping',
+		ListItemText: 'Get-AzRecoveryServicesAsrProtectionContainerMapping',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesAsrProtectionContainerMapping\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesAsrRecoveryPlan',
+		ListItemText: 'Get-AzRecoveryServicesAsrRecoveryPlan',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesAsrRecoveryPlan\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesAsrRecoveryPoint',
+		ListItemText: 'Get-AzRecoveryServicesAsrRecoveryPoint',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesAsrRecoveryPoint\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesAsrReplicationProtectedItem',
+		ListItemText: 'Get-AzRecoveryServicesAsrReplicationProtectedItem',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesAsrReplicationProtectedItem\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesAsrServicesProvider',
+		ListItemText: 'Get-AzRecoveryServicesAsrServicesProvider',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesAsrServicesProvider\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesAsrStorageClassification',
+		ListItemText: 'Get-AzRecoveryServicesAsrStorageClassification',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesAsrStorageClassification\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesAsrStorageClassificationMapping',
+		ListItemText: 'Get-AzRecoveryServicesAsrStorageClassificationMapping',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesAsrStorageClassificationMapping\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesAsrVaultContext',
+		ListItemText: 'Get-AzRecoveryServicesAsrVaultContext',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesAsrVaultContext\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesAsrVaultSettings',
+		ListItemText: 'Get-AzRecoveryServicesAsrVaultSettings',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesAsrVaultSettings'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesAsrvCenter',
+		ListItemText: 'Get-AzRecoveryServicesAsrvCenter',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesAsrvCenter\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesBackupContainer',
+		ListItemText: 'Get-AzRecoveryServicesBackupContainer',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesBackupContainer\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesBackupItem',
+		ListItemText: 'Get-AzRecoveryServicesBackupItem',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesBackupItem\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesBackupJob',
+		ListItemText: 'Get-AzRecoveryServicesBackupJob',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesBackupJob\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesBackupJobDetail',
+		ListItemText: 'Get-AzRecoveryServicesBackupJobDetail',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesBackupJobDetail\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesBackupManagementServer',
+		ListItemText: 'Get-AzRecoveryServicesBackupManagementServer',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesBackupManagementServer\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesBackupProperties',
+		ListItemText: 'Get-AzRecoveryServicesBackupProperties',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesBackupProperties'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesBackupProperty',
+		ListItemText: 'Get-AzRecoveryServicesBackupProperty',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesBackupProperty\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesBackupProtectableItem',
+		ListItemText: 'Get-AzRecoveryServicesBackupProtectableItem',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesBackupProtectableItem\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesBackupProtectionPolicy',
+		ListItemText: 'Get-AzRecoveryServicesBackupProtectionPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesBackupProtectionPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesBackupRecommendedArchivableRPGroup',
+		ListItemText: 'Get-AzRecoveryServicesBackupRecommendedArchivableRPGroup',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesBackupRecommendedArchivableRPGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesBackupRecoveryLogChain',
+		ListItemText: 'Get-AzRecoveryServicesBackupRecoveryLogChain',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesBackupRecoveryLogChain\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesBackupRecoveryPoint',
+		ListItemText: 'Get-AzRecoveryServicesBackupRecoveryPoint',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesBackupRecoveryPoint\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesBackupRetentionPolicyObject',
+		ListItemText: 'Get-AzRecoveryServicesBackupRetentionPolicyObject',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesBackupRetentionPolicyObject\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesBackupRPMountScript',
+		ListItemText: 'Get-AzRecoveryServicesBackupRPMountScript',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesBackupRPMountScript\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesBackupSchedulePolicyObject',
+		ListItemText: 'Get-AzRecoveryServicesBackupSchedulePolicyObject',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesBackupSchedulePolicyObject\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesBackupStatus',
+		ListItemText: 'Get-AzRecoveryServicesBackupStatus',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesBackupStatus\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesBackupWorkloadRecoveryConfig',
+		ListItemText: 'Get-AzRecoveryServicesBackupWorkloadRecoveryConfig',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesBackupWorkloadRecoveryConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesResourceGuardMapping',
+		ListItemText: 'Get-AzRecoveryServicesResourceGuardMapping',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesResourceGuardMapping\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesVault',
+		ListItemText: 'Get-AzRecoveryServicesVault',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesVault\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesVaultProperty',
+		ListItemText: 'Get-AzRecoveryServicesVaultProperty',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesVaultProperty\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRecoveryServicesVaultSettingsFile',
+		ListItemText: 'Get-AzRecoveryServicesVaultSettingsFile',
+		ResultType: 2,
+		ToolTip: 'Get-AzRecoveryServicesVaultSettingsFile\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRedisCache',
+		ListItemText: 'Get-AzRedisCache',
+		ResultType: 2,
+		ToolTip: 'Get-AzRedisCache\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRedisCacheFirewallRule',
+		ListItemText: 'Get-AzRedisCacheFirewallRule',
+		ResultType: 2,
+		ToolTip: 'Get-AzRedisCacheFirewallRule\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRedisCacheKey',
+		ListItemText: 'Get-AzRedisCacheKey',
+		ResultType: 2,
+		ToolTip: 'Get-AzRedisCacheKey\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRedisCacheLink',
+		ListItemText: 'Get-AzRedisCacheLink',
+		ResultType: 2,
+		ToolTip: 'Get-AzRedisCacheLink\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRedisCachePatchSchedule',
+		ListItemText: 'Get-AzRedisCachePatchSchedule',
+		ResultType: 2,
+		ToolTip: 'Get-AzRedisCachePatchSchedule\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRedisEnterpriseCache',
+		ListItemText: 'Get-AzRedisEnterpriseCache',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzRedisEnterpriseCache \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRedisEnterpriseCacheAccessKey',
+		ListItemText: 'Get-AzRedisEnterpriseCacheAccessKey',
+		ResultType: 2,
+		ToolTip: 'Get-AzRedisEnterpriseCacheAccessKey'
+	},
+	{
+		CompletionText: 'Get-AzRedisEnterpriseCacheDatabase',
+		ListItemText: 'Get-AzRedisEnterpriseCacheDatabase',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzRedisEnterpriseCacheDatabase \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRedisEnterpriseCacheDatabaseKey',
+		ListItemText: 'Get-AzRedisEnterpriseCacheDatabaseKey',
+		ResultType: 2,
+		ToolTip: 'Get-AzRedisEnterpriseCacheDatabaseKey'
+	},
+	{
+		CompletionText: 'Get-AzRedisEnterpriseCacheKey',
+		ListItemText: 'Get-AzRedisEnterpriseCacheKey',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzRedisEnterpriseCacheKey \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRedisEnterpriseCacheOperationStatus',
+		ListItemText: 'Get-AzRedisEnterpriseCacheOperationStatus',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzRedisEnterpriseCacheOperationStatus \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRegulatoryComplainceAssessment',
+		ListItemText: 'Get-AzRegulatoryComplainceAssessment',
+		ResultType: 2,
+		ToolTip: 'Get-AzRegulatoryComplainceAssessment'
+	},
+	{
+		CompletionText: 'Get-AzRegulatoryComplianceAssessment',
+		ListItemText: 'Get-AzRegulatoryComplianceAssessment',
+		ResultType: 2,
+		ToolTip: 'Get-AzRegulatoryComplianceAssessment\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRegulatoryComplianceControl',
+		ListItemText: 'Get-AzRegulatoryComplianceControl',
+		ResultType: 2,
+		ToolTip: 'Get-AzRegulatoryComplianceControl\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRegulatoryComplianceStandard',
+		ListItemText: 'Get-AzRegulatoryComplianceStandard',
+		ResultType: 2,
+		ToolTip: 'Get-AzRegulatoryComplianceStandard\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRelayAuthorizationRule',
+		ListItemText: 'Get-AzRelayAuthorizationRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzRelayAuthorizationRule \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRelayHybridConnection',
+		ListItemText: 'Get-AzRelayHybridConnection',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzRelayHybridConnection \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRelayKey',
+		ListItemText: 'Get-AzRelayKey',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzRelayKey \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRelayNamespace',
+		ListItemText: 'Get-AzRelayNamespace',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzRelayNamespace \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRelayNamespaceNetworkRuleSet',
+		ListItemText: 'Get-AzRelayNamespaceNetworkRuleSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzRelayNamespaceNetworkRuleSet \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRemoteDesktopFile',
+		ListItemText: 'Get-AzRemoteDesktopFile',
+		ResultType: 2,
+		ToolTip: 'Get-AzRemoteDesktopFile\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzResource',
+		ListItemText: 'Get-AzResource',
+		ResultType: 2,
+		ToolTip: 'Get-AzResource\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzResourceGroup',
+		ListItemText: 'Get-AzResourceGroup',
+		ResultType: 2,
+		ToolTip: 'Get-AzResourceGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzResourceGroupDeployment',
+		ListItemText: 'Get-AzResourceGroupDeployment',
+		ResultType: 2,
+		ToolTip: 'Get-AzResourceGroupDeployment\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzResourceGroupDeploymentOperation',
+		ListItemText: 'Get-AzResourceGroupDeploymentOperation',
+		ResultType: 2,
+		ToolTip: 'Get-AzResourceGroupDeploymentOperation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzResourceGroupDeploymentWhatIfResult',
+		ListItemText: 'Get-AzResourceGroupDeploymentWhatIfResult',
+		ResultType: 2,
+		ToolTip: 'Get-AzResourceGroupDeploymentWhatIfResult\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzResourceLock',
+		ListItemText: 'Get-AzResourceLock',
+		ResultType: 2,
+		ToolTip: 'Get-AzResourceLock\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzResourceManagementPrivateLink',
+		ListItemText: 'Get-AzResourceManagementPrivateLink',
+		ResultType: 2,
+		ToolTip: 'Get-AzResourceManagementPrivateLink\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzResourceMoverMoveCollection',
+		ListItemText: 'Get-AzResourceMoverMoveCollection',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzResourceMoverMoveCollection \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzResourceMoverMoveResource',
+		ListItemText: 'Get-AzResourceMoverMoveResource',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzResourceMoverMoveResource \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzResourceMoverRequiredForResources',
+		ListItemText: 'Get-AzResourceMoverRequiredForResources',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzResourceMoverRequiredForResources \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzResourceMoverUnresolvedDependency',
+		ListItemText: 'Get-AzResourceMoverUnresolvedDependency',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzResourceMoverUnresolvedDependency \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzResourceProvider',
+		ListItemText: 'Get-AzResourceProvider',
+		ResultType: 2,
+		ToolTip: 'Get-AzResourceProvider\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzResourceProviderAction',
+		ListItemText: 'Get-AzResourceProviderAction',
+		ResultType: 2,
+		ToolTip: 'Get-AzResourceProviderAction'
+	},
+	{
+		CompletionText: 'Get-AzRestorePoint',
+		ListItemText: 'Get-AzRestorePoint',
+		ResultType: 2,
+		ToolTip: 'Get-AzRestorePoint\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRestorePointCollection',
+		ListItemText: 'Get-AzRestorePointCollection',
+		ResultType: 2,
+		ToolTip: 'Get-AzRestorePointCollection\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRmStorageContainer',
+		ListItemText: 'Get-AzRmStorageContainer',
+		ResultType: 2,
+		ToolTip: 'Get-AzRmStorageContainer\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRmStorageContainerImmutabilityPolicy',
+		ListItemText: 'Get-AzRmStorageContainerImmutabilityPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzRmStorageContainerImmutabilityPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRmStorageShare',
+		ListItemText: 'Get-AzRmStorageShare',
+		ResultType: 2,
+		ToolTip: 'Get-AzRmStorageShare\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRoleAssignment',
+		ListItemText: 'Get-AzRoleAssignment',
+		ResultType: 2,
+		ToolTip: 'Get-AzRoleAssignment\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRoleAssignmentSchedule',
+		ListItemText: 'Get-AzRoleAssignmentSchedule',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzRoleAssignmentSchedule \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRoleAssignmentScheduleInstance',
+		ListItemText: 'Get-AzRoleAssignmentScheduleInstance',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzRoleAssignmentScheduleInstance \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRoleAssignmentScheduleRequest',
+		ListItemText: 'Get-AzRoleAssignmentScheduleRequest',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzRoleAssignmentScheduleRequest \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRoleDefinition',
+		ListItemText: 'Get-AzRoleDefinition',
+		ResultType: 2,
+		ToolTip: 'Get-AzRoleDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRoleEligibilitySchedule',
+		ListItemText: 'Get-AzRoleEligibilitySchedule',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzRoleEligibilitySchedule \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRoleEligibilityScheduleInstance',
+		ListItemText: 'Get-AzRoleEligibilityScheduleInstance',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzRoleEligibilityScheduleInstance \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRoleEligibilityScheduleRequest',
+		ListItemText: 'Get-AzRoleEligibilityScheduleRequest',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzRoleEligibilityScheduleRequest \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRoleEligibleChildResource',
+		ListItemText: 'Get-AzRoleEligibleChildResource',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzRoleEligibleChildResource \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRoleManagementPolicy',
+		ListItemText: 'Get-AzRoleManagementPolicy',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzRoleManagementPolicy \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRoleManagementPolicyAssignment',
+		ListItemText: 'Get-AzRoleManagementPolicyAssignment',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzRoleManagementPolicyAssignment \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRouteConfig',
+		ListItemText: 'Get-AzRouteConfig',
+		ResultType: 2,
+		ToolTip: 'Get-AzRouteConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRouteFilter',
+		ListItemText: 'Get-AzRouteFilter',
+		ResultType: 2,
+		ToolTip: 'Get-AzRouteFilter\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRouteFilterRuleConfig',
+		ListItemText: 'Get-AzRouteFilterRuleConfig',
+		ResultType: 2,
+		ToolTip: 'Get-AzRouteFilterRuleConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRouteMap',
+		ListItemText: 'Get-AzRouteMap',
+		ResultType: 2,
+		ToolTip: 'Get-AzRouteMap\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRouteServer',
+		ListItemText: 'Get-AzRouteServer',
+		ResultType: 2,
+		ToolTip: 'Get-AzRouteServer\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRouteServerPeer',
+		ListItemText: 'Get-AzRouteServerPeer',
+		ResultType: 2,
+		ToolTip: 'Get-AzRouteServerPeer\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRouteServerPeerAdvertisedRoute',
+		ListItemText: 'Get-AzRouteServerPeerAdvertisedRoute',
+		ResultType: 2,
+		ToolTip: 'Get-AzRouteServerPeerAdvertisedRoute\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRouteServerPeerLearnedRoute',
+		ListItemText: 'Get-AzRouteServerPeerLearnedRoute',
+		ResultType: 2,
+		ToolTip: 'Get-AzRouteServerPeerLearnedRoute\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRouteTable',
+		ListItemText: 'Get-AzRouteTable',
+		ResultType: 2,
+		ToolTip: 'Get-AzRouteTable\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRoutingIntent',
+		ListItemText: 'Get-AzRoutingIntent',
+		ResultType: 2,
+		ToolTip: 'Get-AzRoutingIntent\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzRoutingPolicy',
+		ListItemText: 'Get-AzRoutingPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzRoutingPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzScheduledQueryRule',
+		ListItemText: 'Get-AzScheduledQueryRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzScheduledQueryRule \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSecurityAdaptiveApplicationControl',
+		ListItemText: 'Get-AzSecurityAdaptiveApplicationControl',
+		ResultType: 2,
+		ToolTip: 'Get-AzSecurityAdaptiveApplicationControl\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSecurityAdaptiveApplicationControlGroup',
+		ListItemText: 'Get-AzSecurityAdaptiveApplicationControlGroup',
+		ResultType: 2,
+		ToolTip: 'Get-AzSecurityAdaptiveApplicationControlGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSecurityAdaptiveNetworkHardening',
+		ListItemText: 'Get-AzSecurityAdaptiveNetworkHardening',
+		ResultType: 2,
+		ToolTip: 'Get-AzSecurityAdaptiveNetworkHardening\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSecurityAdvancedThreatProtection',
+		ListItemText: 'Get-AzSecurityAdvancedThreatProtection',
+		ResultType: 2,
+		ToolTip: 'Get-AzSecurityAdvancedThreatProtection\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSecurityAlert',
+		ListItemText: 'Get-AzSecurityAlert',
+		ResultType: 2,
+		ToolTip: 'Get-AzSecurityAlert\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSecurityAssessment',
+		ListItemText: 'Get-AzSecurityAssessment',
+		ResultType: 2,
+		ToolTip: 'Get-AzSecurityAssessment\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSecurityAssessmentMetadata',
+		ListItemText: 'Get-AzSecurityAssessmentMetadata',
+		ResultType: 2,
+		ToolTip: 'Get-AzSecurityAssessmentMetadata\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSecurityAutomation',
+		ListItemText: 'Get-AzSecurityAutomation',
+		ResultType: 2,
+		ToolTip: 'Get-AzSecurityAutomation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSecurityAutoProvisioningSetting',
+		ListItemText: 'Get-AzSecurityAutoProvisioningSetting',
+		ResultType: 2,
+		ToolTip: 'Get-AzSecurityAutoProvisioningSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSecurityCompliance',
+		ListItemText: 'Get-AzSecurityCompliance',
+		ResultType: 2,
+		ToolTip: 'Get-AzSecurityCompliance\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSecurityContact',
+		ListItemText: 'Get-AzSecurityContact',
+		ResultType: 2,
+		ToolTip: 'Get-AzSecurityContact\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSecurityLocation',
+		ListItemText: 'Get-AzSecurityLocation',
+		ResultType: 2,
+		ToolTip: 'Get-AzSecurityLocation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSecurityPartnerProvider',
+		ListItemText: 'Get-AzSecurityPartnerProvider',
+		ResultType: 2,
+		ToolTip: 'Get-AzSecurityPartnerProvider\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSecurityPricing',
+		ListItemText: 'Get-AzSecurityPricing',
+		ResultType: 2,
+		ToolTip: 'Get-AzSecurityPricing\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSecuritySecureScore',
+		ListItemText: 'Get-AzSecuritySecureScore',
+		ResultType: 2,
+		ToolTip: 'Get-AzSecuritySecureScore\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSecuritySecureScoreControl',
+		ListItemText: 'Get-AzSecuritySecureScoreControl',
+		ResultType: 2,
+		ToolTip: 'Get-AzSecuritySecureScoreControl\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSecuritySecureScoreControlDefinition',
+		ListItemText: 'Get-AzSecuritySecureScoreControlDefinition',
+		ResultType: 2,
+		ToolTip: 'Get-AzSecuritySecureScoreControlDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSecuritySetting',
+		ListItemText: 'Get-AzSecuritySetting',
+		ResultType: 2,
+		ToolTip: 'Get-AzSecuritySetting\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSecuritySolution',
+		ListItemText: 'Get-AzSecuritySolution',
+		ResultType: 2,
+		ToolTip: 'Get-AzSecuritySolution\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSecuritySolutionsReferenceData',
+		ListItemText: 'Get-AzSecuritySolutionsReferenceData',
+		ResultType: 2,
+		ToolTip: 'Get-AzSecuritySolutionsReferenceData\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSecuritySqlVulnerabilityAssessmentBaseline',
+		ListItemText: 'Get-AzSecuritySqlVulnerabilityAssessmentBaseline',
+		ResultType: 2,
+		ToolTip: 'Get-AzSecuritySqlVulnerabilityAssessmentBaseline\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSecuritySqlVulnerabilityAssessmentScanRecord',
+		ListItemText: 'Get-AzSecuritySqlVulnerabilityAssessmentScanRecord',
+		ResultType: 2,
+		ToolTip: 'Get-AzSecuritySqlVulnerabilityAssessmentScanRecord\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSecuritySqlVulnerabilityAssessmentScanResult',
+		ListItemText: 'Get-AzSecuritySqlVulnerabilityAssessmentScanResult',
+		ResultType: 2,
+		ToolTip: 'Get-AzSecuritySqlVulnerabilityAssessmentScanResult\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSecuritySubAssessment',
+		ListItemText: 'Get-AzSecuritySubAssessment',
+		ResultType: 2,
+		ToolTip: 'Get-AzSecuritySubAssessment\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSecurityTask',
+		ListItemText: 'Get-AzSecurityTask',
+		ResultType: 2,
+		ToolTip: 'Get-AzSecurityTask\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSecurityTopology',
+		ListItemText: 'Get-AzSecurityTopology',
+		ResultType: 2,
+		ToolTip: 'Get-AzSecurityTopology\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSecurityWorkspaceSetting',
+		ListItemText: 'Get-AzSecurityWorkspaceSetting',
+		ResultType: 2,
+		ToolTip: 'Get-AzSecurityWorkspaceSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSentinelAlertRule',
+		ListItemText: 'Get-AzSentinelAlertRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSentinelAlertRule \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSentinelAlertRuleAction',
+		ListItemText: 'Get-AzSentinelAlertRuleAction',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSentinelAlertRuleAction \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSentinelAlertRuleTemplate',
+		ListItemText: 'Get-AzSentinelAlertRuleTemplate',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSentinelAlertRuleTemplate \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSentinelAutomationRule',
+		ListItemText: 'Get-AzSentinelAutomationRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSentinelAutomationRule \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSentinelBookmark',
+		ListItemText: 'Get-AzSentinelBookmark',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSentinelBookmark \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSentinelBookmarkRelation',
+		ListItemText: 'Get-AzSentinelBookmarkRelation',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSentinelBookmarkRelation \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSentinelDataConnector',
+		ListItemText: 'Get-AzSentinelDataConnector',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSentinelDataConnector \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSentinelEnrichment',
+		ListItemText: 'Get-AzSentinelEnrichment',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSentinelEnrichment \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSentinelEntity',
+		ListItemText: 'Get-AzSentinelEntity',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSentinelEntity \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSentinelEntityActivity',
+		ListItemText: 'Get-AzSentinelEntityActivity',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSentinelEntityActivity \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSentinelEntityInsight',
+		ListItemText: 'Get-AzSentinelEntityInsight',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSentinelEntityInsight \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSentinelEntityQuery',
+		ListItemText: 'Get-AzSentinelEntityQuery',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSentinelEntityQuery \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSentinelEntityQueryTemplate',
+		ListItemText: 'Get-AzSentinelEntityQueryTemplate',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSentinelEntityQueryTemplate \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSentinelEntityRelation',
+		ListItemText: 'Get-AzSentinelEntityRelation',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSentinelEntityRelation \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSentinelEntityTimeline',
+		ListItemText: 'Get-AzSentinelEntityTimeline',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSentinelEntityTimeline \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSentinelIncident',
+		ListItemText: 'Get-AzSentinelIncident',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSentinelIncident \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSentinelIncidentAlert',
+		ListItemText: 'Get-AzSentinelIncidentAlert',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSentinelIncidentAlert \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSentinelIncidentBookmark',
+		ListItemText: 'Get-AzSentinelIncidentBookmark',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSentinelIncidentBookmark \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSentinelIncidentComment',
+		ListItemText: 'Get-AzSentinelIncidentComment',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSentinelIncidentComment \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSentinelIncidentEntity',
+		ListItemText: 'Get-AzSentinelIncidentEntity',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSentinelIncidentEntity \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSentinelIncidentRelation',
+		ListItemText: 'Get-AzSentinelIncidentRelation',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSentinelIncidentRelation \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSentinelMetadata',
+		ListItemText: 'Get-AzSentinelMetadata',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSentinelMetadata \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSentinelOnboardingState',
+		ListItemText: 'Get-AzSentinelOnboardingState',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSentinelOnboardingState \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSentinelSetting',
+		ListItemText: 'Get-AzSentinelSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSentinelSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSentinelThreatIntelligenceIndicator',
+		ListItemText: 'Get-AzSentinelThreatIntelligenceIndicator',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSentinelThreatIntelligenceIndicator \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSentinelThreatIntelligenceIndicatorMetric',
+		ListItemText: 'Get-AzSentinelThreatIntelligenceIndicatorMetric',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSentinelThreatIntelligenceIndicatorMetric \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzServiceBusAuthorizationRule',
+		ListItemText: 'Get-AzServiceBusAuthorizationRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzServiceBusAuthorizationRule \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzServiceBusGeoDRConfiguration',
+		ListItemText: 'Get-AzServiceBusGeoDRConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzServiceBusGeoDRConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzServiceBusKey',
+		ListItemText: 'Get-AzServiceBusKey',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzServiceBusKey \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzServiceBusMigration',
+		ListItemText: 'Get-AzServiceBusMigration',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzServiceBusMigration \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzServiceBusNamespace',
+		ListItemText: 'Get-AzServiceBusNamespace',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzServiceBusNamespace \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzServiceBusNamespaceV2',
+		ListItemText: 'Get-AzServiceBusNamespaceV2',
+		ResultType: 2,
+		ToolTip: 'Get-AzServiceBusNamespaceV2'
+	},
+	{
+		CompletionText: 'Get-AzServiceBusNetworkRuleSet',
+		ListItemText: 'Get-AzServiceBusNetworkRuleSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzServiceBusNetworkRuleSet \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzServiceBusPrivateEndpointConnection',
+		ListItemText: 'Get-AzServiceBusPrivateEndpointConnection',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzServiceBusPrivateEndpointConnection \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzServiceBusPrivateLink',
+		ListItemText: 'Get-AzServiceBusPrivateLink',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzServiceBusPrivateLink \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzServiceBusQueue',
+		ListItemText: 'Get-AzServiceBusQueue',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzServiceBusQueue \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzServiceBusRule',
+		ListItemText: 'Get-AzServiceBusRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzServiceBusRule \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzServiceBusSubscription',
+		ListItemText: 'Get-AzServiceBusSubscription',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzServiceBusSubscription \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzServiceBusTopic',
+		ListItemText: 'Get-AzServiceBusTopic',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzServiceBusTopic \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzServiceEndpointPolicy',
+		ListItemText: 'Get-AzServiceEndpointPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzServiceEndpointPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzServiceEndpointPolicyDefinition',
+		ListItemText: 'Get-AzServiceEndpointPolicyDefinition',
+		ResultType: 2,
+		ToolTip: 'Get-AzServiceEndpointPolicyDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzServiceFabricApplication',
+		ListItemText: 'Get-AzServiceFabricApplication',
+		ResultType: 2,
+		ToolTip: 'Get-AzServiceFabricApplication\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzServiceFabricApplicationType',
+		ListItemText: 'Get-AzServiceFabricApplicationType',
+		ResultType: 2,
+		ToolTip: 'Get-AzServiceFabricApplicationType\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzServiceFabricApplicationTypeVersion',
+		ListItemText: 'Get-AzServiceFabricApplicationTypeVersion',
+		ResultType: 2,
+		ToolTip: 'Get-AzServiceFabricApplicationTypeVersion\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzServiceFabricCluster',
+		ListItemText: 'Get-AzServiceFabricCluster',
+		ResultType: 2,
+		ToolTip: 'Get-AzServiceFabricCluster\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzServiceFabricManagedCluster',
+		ListItemText: 'Get-AzServiceFabricManagedCluster',
+		ResultType: 2,
+		ToolTip: 'Get-AzServiceFabricManagedCluster\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzServiceFabricManagedClusterApplication',
+		ListItemText: 'Get-AzServiceFabricManagedClusterApplication',
+		ResultType: 2,
+		ToolTip: 'Get-AzServiceFabricManagedClusterApplication\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzServiceFabricManagedClusterApplicationType',
+		ListItemText: 'Get-AzServiceFabricManagedClusterApplicationType',
+		ResultType: 2,
+		ToolTip: 'Get-AzServiceFabricManagedClusterApplicationType\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzServiceFabricManagedClusterApplicationTypeVersion',
+		ListItemText: 'Get-AzServiceFabricManagedClusterApplicationTypeVersion',
+		ResultType: 2,
+		ToolTip: 'Get-AzServiceFabricManagedClusterApplicationTypeVersion\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzServiceFabricManagedClusterService',
+		ListItemText: 'Get-AzServiceFabricManagedClusterService',
+		ResultType: 2,
+		ToolTip: 'Get-AzServiceFabricManagedClusterService\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzServiceFabricManagedNodeType',
+		ListItemText: 'Get-AzServiceFabricManagedNodeType',
+		ResultType: 2,
+		ToolTip: 'Get-AzServiceFabricManagedNodeType\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzServiceFabricService',
+		ListItemText: 'Get-AzServiceFabricService',
+		ResultType: 2,
+		ToolTip: 'Get-AzServiceFabricService\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzServiceLinkerConfigurationForContainerApp',
+		ListItemText: 'Get-AzServiceLinkerConfigurationForContainerApp',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzServiceLinkerConfigurationForContainerApp \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzServiceLinkerConfigurationForSpringCloud',
+		ListItemText: 'Get-AzServiceLinkerConfigurationForSpringCloud',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzServiceLinkerConfigurationForSpringCloud \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzServiceLinkerConfigurationForWebApp',
+		ListItemText: 'Get-AzServiceLinkerConfigurationForWebApp',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzServiceLinkerConfigurationForWebApp \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzServiceLinkerConfigurationName',
+		ListItemText: 'Get-AzServiceLinkerConfigurationName',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzServiceLinkerConfigurationName \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzServiceLinkerForContainerApp',
+		ListItemText: 'Get-AzServiceLinkerForContainerApp',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzServiceLinkerForContainerApp \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzServiceLinkerForSpringCloud',
+		ListItemText: 'Get-AzServiceLinkerForSpringCloud',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzServiceLinkerForSpringCloud \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzServiceLinkerForWebApp',
+		ListItemText: 'Get-AzServiceLinkerForWebApp',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzServiceLinkerForWebApp \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSignalR',
+		ListItemText: 'Get-AzSignalR',
+		ResultType: 2,
+		ToolTip: 'Get-AzSignalR\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSignalRKey',
+		ListItemText: 'Get-AzSignalRKey',
+		ResultType: 2,
+		ToolTip: 'Get-AzSignalRKey\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSignalRUsage',
+		ListItemText: 'Get-AzSignalRUsage',
+		ResultType: 2,
+		ToolTip: 'Get-AzSignalRUsage\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSnapshot',
+		ListItemText: 'Get-AzSnapshot',
+		ResultType: 2,
+		ToolTip: 'Get-AzSnapshot\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlCapability',
+		ListItemText: 'Get-AzSqlCapability',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlCapability\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlDatabase',
+		ListItemText: 'Get-AzSqlDatabase',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlDatabase\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlDatabaseActivity',
+		ListItemText: 'Get-AzSqlDatabaseActivity',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlDatabaseActivity\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlDatabaseAdvancedThreatProtectionSetting',
+		ListItemText: 'Get-AzSqlDatabaseAdvancedThreatProtectionSetting',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlDatabaseAdvancedThreatProtectionSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlDatabaseAdvisor',
+		ListItemText: 'Get-AzSqlDatabaseAdvisor',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlDatabaseAdvisor\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlDatabaseAudit',
+		ListItemText: 'Get-AzSqlDatabaseAudit',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlDatabaseAudit\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlDatabaseBackupLongTermRetentionPolicy',
+		ListItemText: 'Get-AzSqlDatabaseBackupLongTermRetentionPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlDatabaseBackupLongTermRetentionPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlDatabaseBackupShortTermRetentionPolicy',
+		ListItemText: 'Get-AzSqlDatabaseBackupShortTermRetentionPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlDatabaseBackupShortTermRetentionPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlDatabaseDataMaskingPolicy',
+		ListItemText: 'Get-AzSqlDatabaseDataMaskingPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlDatabaseDataMaskingPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlDatabaseDataMaskingRule',
+		ListItemText: 'Get-AzSqlDatabaseDataMaskingRule',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlDatabaseDataMaskingRule\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlDatabaseExpanded',
+		ListItemText: 'Get-AzSqlDatabaseExpanded',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlDatabaseExpanded\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlDatabaseFailoverGroup',
+		ListItemText: 'Get-AzSqlDatabaseFailoverGroup',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlDatabaseFailoverGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlDatabaseGeoBackup',
+		ListItemText: 'Get-AzSqlDatabaseGeoBackup',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlDatabaseGeoBackup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlDatabaseGeoBackupPolicy',
+		ListItemText: 'Get-AzSqlDatabaseGeoBackupPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlDatabaseGeoBackupPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlDatabaseImportExportStatus',
+		ListItemText: 'Get-AzSqlDatabaseImportExportStatus',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlDatabaseImportExportStatus\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlDatabaseIndexRecommendation',
+		ListItemText: 'Get-AzSqlDatabaseIndexRecommendation',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlDatabaseIndexRecommendation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlDatabaseInstanceFailoverGroup',
+		ListItemText: 'Get-AzSqlDatabaseInstanceFailoverGroup',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlDatabaseInstanceFailoverGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlDatabaseLedgerDigestUpload',
+		ListItemText: 'Get-AzSqlDatabaseLedgerDigestUpload',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlDatabaseLedgerDigestUpload\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlDatabaseLongTermRetentionBackup',
+		ListItemText: 'Get-AzSqlDatabaseLongTermRetentionBackup',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlDatabaseLongTermRetentionBackup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlDatabaseLongTermRetentionPolicy',
+		ListItemText: 'Get-AzSqlDatabaseLongTermRetentionPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlDatabaseLongTermRetentionPolicy'
+	},
+	{
+		CompletionText: 'Get-AzSqlDatabaseRecommendedAction',
+		ListItemText: 'Get-AzSqlDatabaseRecommendedAction',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlDatabaseRecommendedAction\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlDatabaseReplicationLink',
+		ListItemText: 'Get-AzSqlDatabaseReplicationLink',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlDatabaseReplicationLink\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlDatabaseRestorePoint',
+		ListItemText: 'Get-AzSqlDatabaseRestorePoint',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlDatabaseRestorePoint\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlDatabaseSensitivityClassification',
+		ListItemText: 'Get-AzSqlDatabaseSensitivityClassification',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlDatabaseSensitivityClassification\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlDatabaseSensitivityRecommendation',
+		ListItemText: 'Get-AzSqlDatabaseSensitivityRecommendation',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlDatabaseSensitivityRecommendation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlDatabaseServerAuditingPolicy',
+		ListItemText: 'Get-AzSqlDatabaseServerAuditingPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlDatabaseServerAuditingPolicy'
+	},
+	{
+		CompletionText: 'Get-AzSqlDatabaseTransparentDataEncryption',
+		ListItemText: 'Get-AzSqlDatabaseTransparentDataEncryption',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlDatabaseTransparentDataEncryption\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlDatabaseTransparentDataEncryptionActivity',
+		ListItemText: 'Get-AzSqlDatabaseTransparentDataEncryptionActivity',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlDatabaseTransparentDataEncryptionActivity\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlDatabaseUpgradeHint',
+		ListItemText: 'Get-AzSqlDatabaseUpgradeHint',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlDatabaseUpgradeHint\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlDatabaseVulnerabilityAssessmentRuleBaseline',
+		ListItemText: 'Get-AzSqlDatabaseVulnerabilityAssessmentRuleBaseline',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlDatabaseVulnerabilityAssessmentRuleBaseline\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlDatabaseVulnerabilityAssessmentScanRecord',
+		ListItemText: 'Get-AzSqlDatabaseVulnerabilityAssessmentScanRecord',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlDatabaseVulnerabilityAssessmentScanRecord\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlDatabaseVulnerabilityAssessmentSetting',
+		ListItemText: 'Get-AzSqlDatabaseVulnerabilityAssessmentSetting',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlDatabaseVulnerabilityAssessmentSetting'
+	},
+	{
+		CompletionText: 'Get-AzSqlDeletedDatabaseBackup',
+		ListItemText: 'Get-AzSqlDeletedDatabaseBackup',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlDeletedDatabaseBackup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlDeletedInstanceDatabaseBackup',
+		ListItemText: 'Get-AzSqlDeletedInstanceDatabaseBackup',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlDeletedInstanceDatabaseBackup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlElasticJob',
+		ListItemText: 'Get-AzSqlElasticJob',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlElasticJob\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlElasticJobAgent',
+		ListItemText: 'Get-AzSqlElasticJobAgent',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlElasticJobAgent\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlElasticJobCredential',
+		ListItemText: 'Get-AzSqlElasticJobCredential',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlElasticJobCredential\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlElasticJobExecution',
+		ListItemText: 'Get-AzSqlElasticJobExecution',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlElasticJobExecution\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlElasticJobStep',
+		ListItemText: 'Get-AzSqlElasticJobStep',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlElasticJobStep\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlElasticJobStepExecution',
+		ListItemText: 'Get-AzSqlElasticJobStepExecution',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlElasticJobStepExecution\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlElasticJobTargetExecution',
+		ListItemText: 'Get-AzSqlElasticJobTargetExecution',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlElasticJobTargetExecution\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlElasticJobTargetGroup',
+		ListItemText: 'Get-AzSqlElasticJobTargetGroup',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlElasticJobTargetGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlElasticPool',
+		ListItemText: 'Get-AzSqlElasticPool',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlElasticPool\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlElasticPoolActivity',
+		ListItemText: 'Get-AzSqlElasticPoolActivity',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlElasticPoolActivity\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlElasticPoolAdvisor',
+		ListItemText: 'Get-AzSqlElasticPoolAdvisor',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlElasticPoolAdvisor\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlElasticPoolDatabase',
+		ListItemText: 'Get-AzSqlElasticPoolDatabase',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlElasticPoolDatabase\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlElasticPoolRecommendation',
+		ListItemText: 'Get-AzSqlElasticPoolRecommendation',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlElasticPoolRecommendation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlElasticPoolRecommendedAction',
+		ListItemText: 'Get-AzSqlElasticPoolRecommendedAction',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlElasticPoolRecommendedAction\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlInformationProtectionPolicy',
+		ListItemText: 'Get-AzSqlInformationProtectionPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlInformationProtectionPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlInstance',
+		ListItemText: 'Get-AzSqlInstance',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlInstance\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlInstanceActiveDirectoryAdministrator',
+		ListItemText: 'Get-AzSqlInstanceActiveDirectoryAdministrator',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlInstanceActiveDirectoryAdministrator\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlInstanceActiveDirectoryOnlyAuthentication',
+		ListItemText: 'Get-AzSqlInstanceActiveDirectoryOnlyAuthentication',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlInstanceActiveDirectoryOnlyAuthentication\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlInstanceAdvancedDataSecurityPolicy',
+		ListItemText: 'Get-AzSqlInstanceAdvancedDataSecurityPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlInstanceAdvancedDataSecurityPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlInstanceAdvancedThreatProtectionSetting',
+		ListItemText: 'Get-AzSqlInstanceAdvancedThreatProtectionSetting',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlInstanceAdvancedThreatProtectionSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlInstanceDatabase',
+		ListItemText: 'Get-AzSqlInstanceDatabase',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlInstanceDatabase\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlInstanceDatabaseAdvancedThreatProtectionSetting',
+		ListItemText: 'Get-AzSqlInstanceDatabaseAdvancedThreatProtectionSetting',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlInstanceDatabaseAdvancedThreatProtectionSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlInstanceDatabaseBackupLongTermRetentionPolicy',
+		ListItemText: 'Get-AzSqlInstanceDatabaseBackupLongTermRetentionPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlInstanceDatabaseBackupLongTermRetentionPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlInstanceDatabaseBackupShortTermRetentionPolicy',
+		ListItemText: 'Get-AzSqlInstanceDatabaseBackupShortTermRetentionPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlInstanceDatabaseBackupShortTermRetentionPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlInstanceDatabaseGeoBackup',
+		ListItemText: 'Get-AzSqlInstanceDatabaseGeoBackup',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlInstanceDatabaseGeoBackup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlInstanceDatabaseLedgerDigestUpload',
+		ListItemText: 'Get-AzSqlInstanceDatabaseLedgerDigestUpload',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlInstanceDatabaseLedgerDigestUpload\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlInstanceDatabaseLogReplay',
+		ListItemText: 'Get-AzSqlInstanceDatabaseLogReplay',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlInstanceDatabaseLogReplay\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlInstanceDatabaseLongTermRetentionBackup',
+		ListItemText: 'Get-AzSqlInstanceDatabaseLongTermRetentionBackup',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlInstanceDatabaseLongTermRetentionBackup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlInstanceDatabaseSensitivityClassification',
+		ListItemText: 'Get-AzSqlInstanceDatabaseSensitivityClassification',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlInstanceDatabaseSensitivityClassification\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlInstanceDatabaseSensitivityRecommendation',
+		ListItemText: 'Get-AzSqlInstanceDatabaseSensitivityRecommendation',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlInstanceDatabaseSensitivityRecommendation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlInstanceDatabaseVulnerabilityAssessmentRuleBaseline',
+		ListItemText: 'Get-AzSqlInstanceDatabaseVulnerabilityAssessmentRuleBaseline',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlInstanceDatabaseVulnerabilityAssessmentRuleBaseline\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlInstanceDatabaseVulnerabilityAssessmentScanRecord',
+		ListItemText: 'Get-AzSqlInstanceDatabaseVulnerabilityAssessmentScanRecord',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlInstanceDatabaseVulnerabilityAssessmentScanRecord\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlInstanceDatabaseVulnerabilityAssessmentSetting',
+		ListItemText: 'Get-AzSqlInstanceDatabaseVulnerabilityAssessmentSetting',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlInstanceDatabaseVulnerabilityAssessmentSetting'
+	},
+	{
+		CompletionText: 'Get-AzSqlInstanceDtc',
+		ListItemText: 'Get-AzSqlInstanceDtc',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlInstanceDtc\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlInstanceEndpointCertificate',
+		ListItemText: 'Get-AzSqlInstanceEndpointCertificate',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlInstanceEndpointCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlInstanceKeyVaultKey',
+		ListItemText: 'Get-AzSqlInstanceKeyVaultKey',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlInstanceKeyVaultKey\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlInstanceLink',
+		ListItemText: 'Get-AzSqlInstanceLink',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlInstanceLink\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlInstanceOperation',
+		ListItemText: 'Get-AzSqlInstanceOperation',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlInstanceOperation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlInstancePool',
+		ListItemText: 'Get-AzSqlInstancePool',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlInstancePool\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlInstancePoolUsage',
+		ListItemText: 'Get-AzSqlInstancePoolUsage',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlInstancePoolUsage\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlInstanceServerTrustCertificate',
+		ListItemText: 'Get-AzSqlInstanceServerTrustCertificate',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlInstanceServerTrustCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlInstanceTDEProtector',
+		ListItemText: 'Get-AzSqlInstanceTDEProtector',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlInstanceTDEProtector'
+	},
+	{
+		CompletionText: 'Get-AzSqlInstanceTransparentDataEncryptionProtector',
+		ListItemText: 'Get-AzSqlInstanceTransparentDataEncryptionProtector',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlInstanceTransparentDataEncryptionProtector\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlInstanceVulnerabilityAssessmentSetting',
+		ListItemText: 'Get-AzSqlInstanceVulnerabilityAssessmentSetting',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlInstanceVulnerabilityAssessmentSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlServer',
+		ListItemText: 'Get-AzSqlServer',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlServer\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlServerActiveDirectoryAdministrator',
+		ListItemText: 'Get-AzSqlServerActiveDirectoryAdministrator',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlServerActiveDirectoryAdministrator\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlServerActiveDirectoryOnlyAuthentication',
+		ListItemText: 'Get-AzSqlServerActiveDirectoryOnlyAuthentication',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlServerActiveDirectoryOnlyAuthentication\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlServerAdvancedDataSecurityPolicy',
+		ListItemText: 'Get-AzSqlServerAdvancedDataSecurityPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlServerAdvancedDataSecurityPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlServerAdvancedThreatProtectionSetting',
+		ListItemText: 'Get-AzSqlServerAdvancedThreatProtectionSetting',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlServerAdvancedThreatProtectionSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlServerAdvisor',
+		ListItemText: 'Get-AzSqlServerAdvisor',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlServerAdvisor\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlServerAudit',
+		ListItemText: 'Get-AzSqlServerAudit',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlServerAudit\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlServerCommunicationLink',
+		ListItemText: 'Get-AzSqlServerCommunicationLink',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlServerCommunicationLink\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlServerConfigurationOption',
+		ListItemText: 'Get-AzSqlServerConfigurationOption',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlServerConfigurationOption\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlServerDisasterRecoveryConfiguration',
+		ListItemText: 'Get-AzSqlServerDisasterRecoveryConfiguration',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlServerDisasterRecoveryConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlServerDisasterRecoveryConfigurationActivity',
+		ListItemText: 'Get-AzSqlServerDisasterRecoveryConfigurationActivity',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlServerDisasterRecoveryConfigurationActivity\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlServerDnsAlias',
+		ListItemText: 'Get-AzSqlServerDnsAlias',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlServerDnsAlias\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlServerFirewallRule',
+		ListItemText: 'Get-AzSqlServerFirewallRule',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlServerFirewallRule\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlServerIpv6FirewallRule',
+		ListItemText: 'Get-AzSqlServerIpv6FirewallRule',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlServerIpv6FirewallRule\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlServerKeyVaultKey',
+		ListItemText: 'Get-AzSqlServerKeyVaultKey',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlServerKeyVaultKey\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlServerMSSupportAudit',
+		ListItemText: 'Get-AzSqlServerMSSupportAudit',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlServerMSSupportAudit\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlServerOutboundFirewallRule',
+		ListItemText: 'Get-AzSqlServerOutboundFirewallRule',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlServerOutboundFirewallRule\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlServerRecommendedAction',
+		ListItemText: 'Get-AzSqlServerRecommendedAction',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlServerRecommendedAction\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlServerServiceObjective',
+		ListItemText: 'Get-AzSqlServerServiceObjective',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlServerServiceObjective\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlServerTransparentDataEncryptionProtector',
+		ListItemText: 'Get-AzSqlServerTransparentDataEncryptionProtector',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlServerTransparentDataEncryptionProtector\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlServerTrustGroup',
+		ListItemText: 'Get-AzSqlServerTrustGroup',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlServerTrustGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlServerUpgradeHint',
+		ListItemText: 'Get-AzSqlServerUpgradeHint',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlServerUpgradeHint\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlServerVirtualNetworkRule',
+		ListItemText: 'Get-AzSqlServerVirtualNetworkRule',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlServerVirtualNetworkRule\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlServerVulnerabilityAssessmentSetting',
+		ListItemText: 'Get-AzSqlServerVulnerabilityAssessmentSetting',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlServerVulnerabilityAssessmentSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlSyncAgent',
+		ListItemText: 'Get-AzSqlSyncAgent',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlSyncAgent\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlSyncAgentLinkedDatabase',
+		ListItemText: 'Get-AzSqlSyncAgentLinkedDatabase',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlSyncAgentLinkedDatabase\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlSyncGroup',
+		ListItemText: 'Get-AzSqlSyncGroup',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlSyncGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlSyncGroupLog',
+		ListItemText: 'Get-AzSqlSyncGroupLog',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlSyncGroupLog\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlSyncMember',
+		ListItemText: 'Get-AzSqlSyncMember',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlSyncMember\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlSyncSchema',
+		ListItemText: 'Get-AzSqlSyncSchema',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlSyncSchema\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlVirtualCluster',
+		ListItemText: 'Get-AzSqlVirtualCluster',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlVirtualCluster\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlVM',
+		ListItemText: 'Get-AzSqlVM',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSqlVM \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSqlVMGroup',
+		ListItemText: 'Get-AzSqlVMGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSqlVMGroup \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSshKey',
+		ListItemText: 'Get-AzSshKey',
+		ResultType: 2,
+		ToolTip: 'Get-AzSshKey\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStackHciArcSetting',
+		ListItemText: 'Get-AzStackHciArcSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzStackHciArcSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStackHciCluster',
+		ListItemText: 'Get-AzStackHciCluster',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzStackHciCluster \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStackHciExtension',
+		ListItemText: 'Get-AzStackHciExtension',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzStackHciExtension \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStackHCIRemoteSupportAccess',
+		ListItemText: 'Get-AzStackHCIRemoteSupportAccess',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzStackHCIRemoteSupportAccess \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStackHCIRemoteSupportSessionHistory',
+		ListItemText: 'Get-AzStackHCIRemoteSupportSessionHistory',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzStackHCIRemoteSupportSessionHistory \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStackHCIVMAttestation',
+		ListItemText: 'Get-AzStackHCIVMAttestation',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzStackHCIVMAttestation \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStaticWebApp',
+		ListItemText: 'Get-AzStaticWebApp',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzStaticWebApp \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStaticWebAppBuild',
+		ListItemText: 'Get-AzStaticWebAppBuild',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzStaticWebAppBuild \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStaticWebAppBuildAppSetting',
+		ListItemText: 'Get-AzStaticWebAppBuildAppSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzStaticWebAppBuildAppSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStaticWebAppBuildFunction',
+		ListItemText: 'Get-AzStaticWebAppBuildFunction',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzStaticWebAppBuildFunction \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStaticWebAppBuildFunctionAppSetting',
+		ListItemText: 'Get-AzStaticWebAppBuildFunctionAppSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzStaticWebAppBuildFunctionAppSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStaticWebAppConfiguredRole',
+		ListItemText: 'Get-AzStaticWebAppConfiguredRole',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzStaticWebAppConfiguredRole \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStaticWebAppCustomDomain',
+		ListItemText: 'Get-AzStaticWebAppCustomDomain',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzStaticWebAppCustomDomain \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStaticWebAppFunction',
+		ListItemText: 'Get-AzStaticWebAppFunction',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzStaticWebAppFunction \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStaticWebAppFunctionAppSetting',
+		ListItemText: 'Get-AzStaticWebAppFunctionAppSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzStaticWebAppFunctionAppSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStaticWebAppSecret',
+		ListItemText: 'Get-AzStaticWebAppSecret',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzStaticWebAppSecret \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStaticWebAppSetting',
+		ListItemText: 'Get-AzStaticWebAppSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzStaticWebAppSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStaticWebAppUser',
+		ListItemText: 'Get-AzStaticWebAppUser',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzStaticWebAppUser \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStaticWebAppUserProvidedFunctionApp',
+		ListItemText: 'Get-AzStaticWebAppUserProvidedFunctionApp',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzStaticWebAppUserProvidedFunctionApp \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageAccount',
+		ListItemText: 'Get-AzStorageAccount',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageAccountKey',
+		ListItemText: 'Get-AzStorageAccountKey',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageAccountKey\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageAccountManagementPolicy',
+		ListItemText: 'Get-AzStorageAccountManagementPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageAccountManagementPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageAccountNameAvailability',
+		ListItemText: 'Get-AzStorageAccountNameAvailability',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageAccountNameAvailability\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageAccountNetworkRuleSet',
+		ListItemText: 'Get-AzStorageAccountNetworkRuleSet',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageAccountNetworkRuleSet\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageBlob',
+		ListItemText: 'Get-AzStorageBlob',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageBlob\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageBlobByTag',
+		ListItemText: 'Get-AzStorageBlobByTag',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageBlobByTag\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageBlobContent',
+		ListItemText: 'Get-AzStorageBlobContent',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageBlobContent\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageBlobCopyState',
+		ListItemText: 'Get-AzStorageBlobCopyState',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageBlobCopyState\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageBlobInventoryPolicy',
+		ListItemText: 'Get-AzStorageBlobInventoryPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageBlobInventoryPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageBlobQueryResult',
+		ListItemText: 'Get-AzStorageBlobQueryResult',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageBlobQueryResult\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageBlobServiceProperty',
+		ListItemText: 'Get-AzStorageBlobServiceProperty',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageBlobServiceProperty\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageBlobTag',
+		ListItemText: 'Get-AzStorageBlobTag',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageBlobTag\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageContainer',
+		ListItemText: 'Get-AzStorageContainer',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageContainer\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageContainerAcl',
+		ListItemText: 'Get-AzStorageContainerAcl',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageContainerAcl'
+	},
+	{
+		CompletionText: 'Get-AzStorageContainerStoredAccessPolicy',
+		ListItemText: 'Get-AzStorageContainerStoredAccessPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageContainerStoredAccessPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageCORSRule',
+		ListItemText: 'Get-AzStorageCORSRule',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageCORSRule\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageEncryptionScope',
+		ListItemText: 'Get-AzStorageEncryptionScope',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageEncryptionScope\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageFile',
+		ListItemText: 'Get-AzStorageFile',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageFile\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageFileContent',
+		ListItemText: 'Get-AzStorageFileContent',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageFileContent\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageFileCopyState',
+		ListItemText: 'Get-AzStorageFileCopyState',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageFileCopyState\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageFileHandle',
+		ListItemText: 'Get-AzStorageFileHandle',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageFileHandle\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageFileServiceProperty',
+		ListItemText: 'Get-AzStorageFileServiceProperty',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageFileServiceProperty\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageLocalUser',
+		ListItemText: 'Get-AzStorageLocalUser',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageLocalUser\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageLocalUserKey',
+		ListItemText: 'Get-AzStorageLocalUserKey',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageLocalUserKey\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageMover',
+		ListItemText: 'Get-AzStorageMover',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzStorageMover \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageMoverAgent',
+		ListItemText: 'Get-AzStorageMoverAgent',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzStorageMoverAgent \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageMoverEndpoint',
+		ListItemText: 'Get-AzStorageMoverEndpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzStorageMoverEndpoint \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageMoverJobDefinition',
+		ListItemText: 'Get-AzStorageMoverJobDefinition',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzStorageMoverJobDefinition \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageMoverJobRun',
+		ListItemText: 'Get-AzStorageMoverJobRun',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzStorageMoverJobRun \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageMoverProject',
+		ListItemText: 'Get-AzStorageMoverProject',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzStorageMoverProject \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageObjectReplicationPolicy',
+		ListItemText: 'Get-AzStorageObjectReplicationPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageObjectReplicationPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageQueue',
+		ListItemText: 'Get-AzStorageQueue',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageQueue\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageQueueStoredAccessPolicy',
+		ListItemText: 'Get-AzStorageQueueStoredAccessPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageQueueStoredAccessPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageServiceLoggingProperty',
+		ListItemText: 'Get-AzStorageServiceLoggingProperty',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageServiceLoggingProperty\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageServiceMetricsProperty',
+		ListItemText: 'Get-AzStorageServiceMetricsProperty',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageServiceMetricsProperty\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageServiceProperty',
+		ListItemText: 'Get-AzStorageServiceProperty',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageServiceProperty\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageShare',
+		ListItemText: 'Get-AzStorageShare',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageShare\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageShareStoredAccessPolicy',
+		ListItemText: 'Get-AzStorageShareStoredAccessPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageShareStoredAccessPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageSyncCloudEndpoint',
+		ListItemText: 'Get-AzStorageSyncCloudEndpoint',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageSyncCloudEndpoint\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageSyncGroup',
+		ListItemText: 'Get-AzStorageSyncGroup',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageSyncGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageSyncServer',
+		ListItemText: 'Get-AzStorageSyncServer',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageSyncServer\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageSyncServerEndpoint',
+		ListItemText: 'Get-AzStorageSyncServerEndpoint',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageSyncServerEndpoint\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageSyncService',
+		ListItemText: 'Get-AzStorageSyncService',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageSyncService\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageTable',
+		ListItemText: 'Get-AzStorageTable',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageTable\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageTableStoredAccessPolicy',
+		ListItemText: 'Get-AzStorageTableStoredAccessPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageTableStoredAccessPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStorageUsage',
+		ListItemText: 'Get-AzStorageUsage',
+		ResultType: 2,
+		ToolTip: 'Get-AzStorageUsage\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStreamAnalyticsCluster',
+		ListItemText: 'Get-AzStreamAnalyticsCluster',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzStreamAnalyticsCluster \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStreamAnalyticsClusterStreamingJob',
+		ListItemText: 'Get-AzStreamAnalyticsClusterStreamingJob',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzStreamAnalyticsClusterStreamingJob \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStreamAnalyticsDefaultFunctionDefinition',
+		ListItemText: 'Get-AzStreamAnalyticsDefaultFunctionDefinition',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzStreamAnalyticsDefaultFunctionDefinition \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStreamAnalyticsFunction',
+		ListItemText: 'Get-AzStreamAnalyticsFunction',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzStreamAnalyticsFunction \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStreamAnalyticsInput',
+		ListItemText: 'Get-AzStreamAnalyticsInput',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzStreamAnalyticsInput \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStreamAnalyticsJob',
+		ListItemText: 'Get-AzStreamAnalyticsJob',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzStreamAnalyticsJob \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStreamAnalyticsOutput',
+		ListItemText: 'Get-AzStreamAnalyticsOutput',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzStreamAnalyticsOutput \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStreamAnalyticsQuota',
+		ListItemText: 'Get-AzStreamAnalyticsQuota',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzStreamAnalyticsQuota \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzStreamAnalyticsTransformation',
+		ListItemText: 'Get-AzStreamAnalyticsTransformation',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzStreamAnalyticsTransformation \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSubscription',
+		ListItemText: 'Get-AzSubscription',
+		ResultType: 2,
+		ToolTip: 'Get-AzSubscription\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSubscriptionDeployment',
+		ListItemText: 'Get-AzSubscriptionDeployment',
+		ResultType: 2,
+		ToolTip: 'Get-AzSubscriptionDeployment'
+	},
+	{
+		CompletionText: 'Get-AzSubscriptionDeploymentOperation',
+		ListItemText: 'Get-AzSubscriptionDeploymentOperation',
+		ResultType: 2,
+		ToolTip: 'Get-AzSubscriptionDeploymentOperation'
+	},
+	{
+		CompletionText: 'Get-AzSubscriptionDeploymentWhatIfResult',
+		ListItemText: 'Get-AzSubscriptionDeploymentWhatIfResult',
+		ResultType: 2,
+		ToolTip: 'Get-AzSubscriptionDeploymentWhatIfResult'
+	},
+	{
+		CompletionText: 'Get-AzSubscriptionDiagnosticSetting',
+		ListItemText: 'Get-AzSubscriptionDiagnosticSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSubscriptionDiagnosticSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSupportProblemClassification',
+		ListItemText: 'Get-AzSupportProblemClassification',
+		ResultType: 2,
+		ToolTip: 'Get-AzSupportProblemClassification\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSupportService',
+		ListItemText: 'Get-AzSupportService',
+		ResultType: 2,
+		ToolTip: 'Get-AzSupportService\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSupportTicket',
+		ListItemText: 'Get-AzSupportTicket',
+		ResultType: 2,
+		ToolTip: 'Get-AzSupportTicket\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSupportTicketCommunication',
+		ListItemText: 'Get-AzSupportTicketCommunication',
+		ResultType: 2,
+		ToolTip: 'Get-AzSupportTicketCommunication\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseActiveDirectoryOnlyAuthentication',
+		ListItemText: 'Get-AzSynapseActiveDirectoryOnlyAuthentication',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseActiveDirectoryOnlyAuthentication\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseActivityRun',
+		ListItemText: 'Get-AzSynapseActivityRun',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseActivityRun\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseDataFlow',
+		ListItemText: 'Get-AzSynapseDataFlow',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseDataFlow\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseDataFlowDebugSession',
+		ListItemText: 'Get-AzSynapseDataFlowDebugSession',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseDataFlowDebugSession\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseDataset',
+		ListItemText: 'Get-AzSynapseDataset',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseDataset\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseDroppedSqlPool',
+		ListItemText: 'Get-AzSynapseDroppedSqlPool',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseDroppedSqlPool\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseFirewallRule',
+		ListItemText: 'Get-AzSynapseFirewallRule',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseFirewallRule\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseIntegrationRuntime',
+		ListItemText: 'Get-AzSynapseIntegrationRuntime',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseIntegrationRuntime\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseIntegrationRuntimeKey',
+		ListItemText: 'Get-AzSynapseIntegrationRuntimeKey',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseIntegrationRuntimeKey\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseIntegrationRuntimeMetric',
+		ListItemText: 'Get-AzSynapseIntegrationRuntimeMetric',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseIntegrationRuntimeMetric\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseIntegrationRuntimeNode',
+		ListItemText: 'Get-AzSynapseIntegrationRuntimeNode',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseIntegrationRuntimeNode\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseKqlScript',
+		ListItemText: 'Get-AzSynapseKqlScript',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseKqlScript\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseKustoPool',
+		ListItemText: 'Get-AzSynapseKustoPool',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSynapseKustoPool \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseKustoPoolAttachedDatabaseConfiguration',
+		ListItemText: 'Get-AzSynapseKustoPoolAttachedDatabaseConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSynapseKustoPoolAttachedDatabaseConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseKustoPoolDatabase',
+		ListItemText: 'Get-AzSynapseKustoPoolDatabase',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSynapseKustoPoolDatabase \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseKustoPoolDatabasePrincipalAssignment',
+		ListItemText: 'Get-AzSynapseKustoPoolDatabasePrincipalAssignment',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSynapseKustoPoolDatabasePrincipalAssignment \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseKustoPoolDataConnection',
+		ListItemText: 'Get-AzSynapseKustoPoolDataConnection',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSynapseKustoPoolDataConnection \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseKustoPoolFollowerDatabase',
+		ListItemText: 'Get-AzSynapseKustoPoolFollowerDatabase',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSynapseKustoPoolFollowerDatabase \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseKustoPoolLanguageExtension',
+		ListItemText: 'Get-AzSynapseKustoPoolLanguageExtension',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSynapseKustoPoolLanguageExtension \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseKustoPoolPrincipalAssignment',
+		ListItemText: 'Get-AzSynapseKustoPoolPrincipalAssignment',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSynapseKustoPoolPrincipalAssignment \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseKustoPoolSku',
+		ListItemText: 'Get-AzSynapseKustoPoolSku',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSynapseKustoPoolSku \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseLinkConnection',
+		ListItemText: 'Get-AzSynapseLinkConnection',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseLinkConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseLinkConnectionDetailedStatus',
+		ListItemText: 'Get-AzSynapseLinkConnectionDetailedStatus',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseLinkConnectionDetailedStatus\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseLinkConnectionLinkTable',
+		ListItemText: 'Get-AzSynapseLinkConnectionLinkTable',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseLinkConnectionLinkTable\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseLinkConnectionLinkTableStatus',
+		ListItemText: 'Get-AzSynapseLinkConnectionLinkTableStatus',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseLinkConnectionLinkTableStatus\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseLinkedService',
+		ListItemText: 'Get-AzSynapseLinkedService',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseLinkedService\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseManagedIdentitySqlControlSetting',
+		ListItemText: 'Get-AzSynapseManagedIdentitySqlControlSetting',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseManagedIdentitySqlControlSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseManagedPrivateEndpoint',
+		ListItemText: 'Get-AzSynapseManagedPrivateEndpoint',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseManagedPrivateEndpoint\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseNotebook',
+		ListItemText: 'Get-AzSynapseNotebook',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseNotebook\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapsePipeline',
+		ListItemText: 'Get-AzSynapsePipeline',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapsePipeline\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapsePipelineRun',
+		ListItemText: 'Get-AzSynapsePipelineRun',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapsePipelineRun\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseRoleAssignment',
+		ListItemText: 'Get-AzSynapseRoleAssignment',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseRoleAssignment\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseRoleDefinition',
+		ListItemText: 'Get-AzSynapseRoleDefinition',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseRoleDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseRoleScope',
+		ListItemText: 'Get-AzSynapseRoleScope',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseRoleScope\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseSparkConfiguration',
+		ListItemText: 'Get-AzSynapseSparkConfiguration',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseSparkConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseSparkJob',
+		ListItemText: 'Get-AzSynapseSparkJob',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseSparkJob\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseSparkJobDefinition',
+		ListItemText: 'Get-AzSynapseSparkJobDefinition',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseSparkJobDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseSparkPool',
+		ListItemText: 'Get-AzSynapseSparkPool',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseSparkPool\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseSparkSession',
+		ListItemText: 'Get-AzSynapseSparkSession',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseSparkSession\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseSparkStatement',
+		ListItemText: 'Get-AzSynapseSparkStatement',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseSparkStatement\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseSqlActiveDirectoryAdministrator',
+		ListItemText: 'Get-AzSynapseSqlActiveDirectoryAdministrator',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseSqlActiveDirectoryAdministrator\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseSqlAdvancedDataSecurityPolicy',
+		ListItemText: 'Get-AzSynapseSqlAdvancedDataSecurityPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseSqlAdvancedDataSecurityPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseSqlAdvancedThreatProtectionSetting',
+		ListItemText: 'Get-AzSynapseSqlAdvancedThreatProtectionSetting',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseSqlAdvancedThreatProtectionSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseSqlAudit',
+		ListItemText: 'Get-AzSynapseSqlAudit',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseSqlAudit'
+	},
+	{
+		CompletionText: 'Get-AzSynapseSqlAuditSetting',
+		ListItemText: 'Get-AzSynapseSqlAuditSetting',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseSqlAuditSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseSqlDatabase',
+		ListItemText: 'Get-AzSynapseSqlDatabase',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseSqlDatabase\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseSqlPool',
+		ListItemText: 'Get-AzSynapseSqlPool',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseSqlPool\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseSqlPoolAdvancedThreatProtectionSetting',
+		ListItemText: 'Get-AzSynapseSqlPoolAdvancedThreatProtectionSetting',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseSqlPoolAdvancedThreatProtectionSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseSqlPoolAudit',
+		ListItemText: 'Get-AzSynapseSqlPoolAudit',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseSqlPoolAudit'
+	},
+	{
+		CompletionText: 'Get-AzSynapseSqlPoolAuditSetting',
+		ListItemText: 'Get-AzSynapseSqlPoolAuditSetting',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseSqlPoolAuditSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseSqlPoolGeoBackup',
+		ListItemText: 'Get-AzSynapseSqlPoolGeoBackup',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseSqlPoolGeoBackup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseSqlPoolRestorePoint',
+		ListItemText: 'Get-AzSynapseSqlPoolRestorePoint',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseSqlPoolRestorePoint\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseSqlPoolSensitivityClassification',
+		ListItemText: 'Get-AzSynapseSqlPoolSensitivityClassification',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseSqlPoolSensitivityClassification\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseSqlPoolSensitivityRecommendation',
+		ListItemText: 'Get-AzSynapseSqlPoolSensitivityRecommendation',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseSqlPoolSensitivityRecommendation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseSqlPoolTransparentDataEncryption',
+		ListItemText: 'Get-AzSynapseSqlPoolTransparentDataEncryption',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseSqlPoolTransparentDataEncryption\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseSqlPoolVulnerabilityAssessmentRuleBaseline',
+		ListItemText: 'Get-AzSynapseSqlPoolVulnerabilityAssessmentRuleBaseline',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseSqlPoolVulnerabilityAssessmentRuleBaseline\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseSqlPoolVulnerabilityAssessmentScanRecord',
+		ListItemText: 'Get-AzSynapseSqlPoolVulnerabilityAssessmentScanRecord',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseSqlPoolVulnerabilityAssessmentScanRecord\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseSqlPoolVulnerabilityAssessmentSetting',
+		ListItemText: 'Get-AzSynapseSqlPoolVulnerabilityAssessmentSetting',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseSqlPoolVulnerabilityAssessmentSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseSqlScript',
+		ListItemText: 'Get-AzSynapseSqlScript',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseSqlScript\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseSqlVulnerabilityAssessmentSetting',
+		ListItemText: 'Get-AzSynapseSqlVulnerabilityAssessmentSetting',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseSqlVulnerabilityAssessmentSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseTrigger',
+		ListItemText: 'Get-AzSynapseTrigger',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseTrigger\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseTriggerRun',
+		ListItemText: 'Get-AzSynapseTriggerRun',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseTriggerRun\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseTriggerSubscriptionStatus',
+		ListItemText: 'Get-AzSynapseTriggerSubscriptionStatus',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseTriggerSubscriptionStatus\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseWorkspace',
+		ListItemText: 'Get-AzSynapseWorkspace',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseWorkspace\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseWorkspaceKey',
+		ListItemText: 'Get-AzSynapseWorkspaceKey',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseWorkspaceKey\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSynapseWorkspacePackage',
+		ListItemText: 'Get-AzSynapseWorkspacePackage',
+		ResultType: 2,
+		ToolTip: 'Get-AzSynapseWorkspacePackage\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzSystemAssignedIdentity',
+		ListItemText: 'Get-AzSystemAssignedIdentity',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzSystemAssignedIdentity \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzTag',
+		ListItemText: 'Get-AzTag',
+		ResultType: 2,
+		ToolTip: 'Get-AzTag\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzTemplateSpec',
+		ListItemText: 'Get-AzTemplateSpec',
+		ResultType: 2,
+		ToolTip: 'Get-AzTemplateSpec\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzTenant',
+		ListItemText: 'Get-AzTenant',
+		ResultType: 2,
+		ToolTip: 'Get-AzTenant\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzTenantBackfillStatus',
+		ListItemText: 'Get-AzTenantBackfillStatus',
+		ResultType: 2,
+		ToolTip: 'Get-AzTenantBackfillStatus\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzTenantDeployment',
+		ListItemText: 'Get-AzTenantDeployment',
+		ResultType: 2,
+		ToolTip: 'Get-AzTenantDeployment\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzTenantDeploymentOperation',
+		ListItemText: 'Get-AzTenantDeploymentOperation',
+		ResultType: 2,
+		ToolTip: 'Get-AzTenantDeploymentOperation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzTenantDeploymentWhatIfResult',
+		ListItemText: 'Get-AzTenantDeploymentWhatIfResult',
+		ResultType: 2,
+		ToolTip: 'Get-AzTenantDeploymentWhatIfResult\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzTrafficManagerEndpoint',
+		ListItemText: 'Get-AzTrafficManagerEndpoint',
+		ResultType: 2,
+		ToolTip: 'Get-AzTrafficManagerEndpoint\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzTrafficManagerProfile',
+		ListItemText: 'Get-AzTrafficManagerProfile',
+		ResultType: 2,
+		ToolTip: 'Get-AzTrafficManagerProfile\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzUserAssignedIdentity',
+		ListItemText: 'Get-AzUserAssignedIdentity',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzUserAssignedIdentity \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzUserAssignedIdentityAssociatedResource',
+		ListItemText: 'Get-AzUserAssignedIdentityAssociatedResource',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzUserAssignedIdentityAssociatedResource \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVHubEffectiveRoute',
+		ListItemText: 'Get-AzVHubEffectiveRoute',
+		ResultType: 2,
+		ToolTip: 'Get-AzVHubEffectiveRoute\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVHubInboundRoute',
+		ListItemText: 'Get-AzVHubInboundRoute',
+		ResultType: 2,
+		ToolTip: 'Get-AzVHubInboundRoute\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVHubOutboundRoute',
+		ListItemText: 'Get-AzVHubOutboundRoute',
+		ResultType: 2,
+		ToolTip: 'Get-AzVHubOutboundRoute\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVHubRouteTable',
+		ListItemText: 'Get-AzVHubRouteTable',
+		ResultType: 2,
+		ToolTip: 'Get-AzVHubRouteTable\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVirtualApplianceSite',
+		ListItemText: 'Get-AzVirtualApplianceSite',
+		ResultType: 2,
+		ToolTip: 'Get-AzVirtualApplianceSite\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVirtualHub',
+		ListItemText: 'Get-AzVirtualHub',
+		ResultType: 2,
+		ToolTip: 'Get-AzVirtualHub\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVirtualHubBgpConnection',
+		ListItemText: 'Get-AzVirtualHubBgpConnection',
+		ResultType: 2,
+		ToolTip: 'Get-AzVirtualHubBgpConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVirtualHubRouteTable',
+		ListItemText: 'Get-AzVirtualHubRouteTable',
+		ResultType: 2,
+		ToolTip: 'Get-AzVirtualHubRouteTable\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVirtualHubVnetConnection',
+		ListItemText: 'Get-AzVirtualHubVnetConnection',
+		ResultType: 2,
+		ToolTip: 'Get-AzVirtualHubVnetConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVirtualNetwork',
+		ListItemText: 'Get-AzVirtualNetwork',
+		ResultType: 2,
+		ToolTip: 'Get-AzVirtualNetwork\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVirtualNetworkAvailableEndpointService',
+		ListItemText: 'Get-AzVirtualNetworkAvailableEndpointService',
+		ResultType: 2,
+		ToolTip: 'Get-AzVirtualNetworkAvailableEndpointService\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVirtualNetworkGateway',
+		ListItemText: 'Get-AzVirtualNetworkGateway',
+		ResultType: 2,
+		ToolTip: 'Get-AzVirtualNetworkGateway\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVirtualNetworkGatewayAdvertisedRoute',
+		ListItemText: 'Get-AzVirtualNetworkGatewayAdvertisedRoute',
+		ResultType: 2,
+		ToolTip: 'Get-AzVirtualNetworkGatewayAdvertisedRoute\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVirtualNetworkGatewayBgpPeerStatus',
+		ListItemText: 'Get-AzVirtualNetworkGatewayBgpPeerStatus',
+		ResultType: 2,
+		ToolTip: 'Get-AzVirtualNetworkGatewayBgpPeerStatus\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVirtualNetworkGatewayConnection',
+		ListItemText: 'Get-AzVirtualNetworkGatewayConnection',
+		ResultType: 2,
+		ToolTip: 'Get-AzVirtualNetworkGatewayConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVirtualNetworkGatewayConnectionIkeSa',
+		ListItemText: 'Get-AzVirtualNetworkGatewayConnectionIkeSa',
+		ResultType: 2,
+		ToolTip: 'Get-AzVirtualNetworkGatewayConnectionIkeSa\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVirtualNetworkGatewayConnectionSharedKey',
+		ListItemText: 'Get-AzVirtualNetworkGatewayConnectionSharedKey',
+		ResultType: 2,
+		ToolTip: 'Get-AzVirtualNetworkGatewayConnectionSharedKey\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVirtualNetworkGatewayConnectionVpnDeviceConfigScript',
+		ListItemText: 'Get-AzVirtualNetworkGatewayConnectionVpnDeviceConfigScript',
+		ResultType: 2,
+		ToolTip: 'Get-AzVirtualNetworkGatewayConnectionVpnDeviceConfigScript\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVirtualNetworkGatewayLearnedRoute',
+		ListItemText: 'Get-AzVirtualNetworkGatewayLearnedRoute',
+		ResultType: 2,
+		ToolTip: 'Get-AzVirtualNetworkGatewayLearnedRoute\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVirtualNetworkGatewayNatRule',
+		ListItemText: 'Get-AzVirtualNetworkGatewayNatRule',
+		ResultType: 2,
+		ToolTip: 'Get-AzVirtualNetworkGatewayNatRule\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVirtualNetworkGatewaySupportedVpnDevice',
+		ListItemText: 'Get-AzVirtualNetworkGatewaySupportedVpnDevice',
+		ResultType: 2,
+		ToolTip: 'Get-AzVirtualNetworkGatewaySupportedVpnDevice\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVirtualNetworkGatewayVpnclientConnectionHealth',
+		ListItemText: 'Get-AzVirtualNetworkGatewayVpnclientConnectionHealth',
+		ResultType: 2,
+		ToolTip: 'Get-AzVirtualNetworkGatewayVpnclientConnectionHealth\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVirtualNetworkPeering',
+		ListItemText: 'Get-AzVirtualNetworkPeering',
+		ResultType: 2,
+		ToolTip: 'Get-AzVirtualNetworkPeering\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVirtualNetworkSubnetConfig',
+		ListItemText: 'Get-AzVirtualNetworkSubnetConfig',
+		ResultType: 2,
+		ToolTip: 'Get-AzVirtualNetworkSubnetConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVirtualNetworkTap',
+		ListItemText: 'Get-AzVirtualNetworkTap',
+		ResultType: 2,
+		ToolTip: 'Get-AzVirtualNetworkTap\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVirtualNetworkUsageList',
+		ListItemText: 'Get-AzVirtualNetworkUsageList',
+		ResultType: 2,
+		ToolTip: 'Get-AzVirtualNetworkUsageList\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVirtualRouter',
+		ListItemText: 'Get-AzVirtualRouter',
+		ResultType: 2,
+		ToolTip: 'Get-AzVirtualRouter\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVirtualRouterPeer',
+		ListItemText: 'Get-AzVirtualRouterPeer',
+		ResultType: 2,
+		ToolTip: 'Get-AzVirtualRouterPeer\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVirtualRouterPeerAdvertisedRoute',
+		ListItemText: 'Get-AzVirtualRouterPeerAdvertisedRoute',
+		ResultType: 2,
+		ToolTip: 'Get-AzVirtualRouterPeerAdvertisedRoute\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVirtualRouterPeerLearnedRoute',
+		ListItemText: 'Get-AzVirtualRouterPeerLearnedRoute',
+		ResultType: 2,
+		ToolTip: 'Get-AzVirtualRouterPeerLearnedRoute\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVirtualWan',
+		ListItemText: 'Get-AzVirtualWan',
+		ResultType: 2,
+		ToolTip: 'Get-AzVirtualWan\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVirtualWanVpnConfiguration',
+		ListItemText: 'Get-AzVirtualWanVpnConfiguration',
+		ResultType: 2,
+		ToolTip: 'Get-AzVirtualWanVpnConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVirtualWanVpnServerConfiguration',
+		ListItemText: 'Get-AzVirtualWanVpnServerConfiguration',
+		ResultType: 2,
+		ToolTip: 'Get-AzVirtualWanVpnServerConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVirtualWanVpnServerConfigurationVpnProfile',
+		ListItemText: 'Get-AzVirtualWanVpnServerConfigurationVpnProfile',
+		ResultType: 2,
+		ToolTip: 'Get-AzVirtualWanVpnServerConfigurationVpnProfile\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVM',
+		ListItemText: 'Get-AzVM',
+		ResultType: 2,
+		ToolTip: 'Get-AzVM\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVMAccessExtension',
+		ListItemText: 'Get-AzVMAccessExtension',
+		ResultType: 2,
+		ToolTip: 'Get-AzVMAccessExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVMADDomainExtension',
+		ListItemText: 'Get-AzVMADDomainExtension',
+		ResultType: 2,
+		ToolTip: 'Get-AzVMADDomainExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVMAEMExtension',
+		ListItemText: 'Get-AzVMAEMExtension',
+		ResultType: 2,
+		ToolTip: 'Get-AzVMAEMExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVMBootDiagnosticsData',
+		ListItemText: 'Get-AzVMBootDiagnosticsData',
+		ResultType: 2,
+		ToolTip: 'Get-AzVMBootDiagnosticsData\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVMChefExtension',
+		ListItemText: 'Get-AzVMChefExtension',
+		ResultType: 2,
+		ToolTip: 'Get-AzVMChefExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVMCustomScriptExtension',
+		ListItemText: 'Get-AzVMCustomScriptExtension',
+		ResultType: 2,
+		ToolTip: 'Get-AzVMCustomScriptExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVMDiagnosticsExtension',
+		ListItemText: 'Get-AzVMDiagnosticsExtension',
+		ResultType: 2,
+		ToolTip: 'Get-AzVMDiagnosticsExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVMDiskEncryptionStatus',
+		ListItemText: 'Get-AzVMDiskEncryptionStatus',
+		ResultType: 2,
+		ToolTip: 'Get-AzVMDiskEncryptionStatus\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVMDscExtension',
+		ListItemText: 'Get-AzVMDscExtension',
+		ResultType: 2,
+		ToolTip: 'Get-AzVMDscExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVMDscExtensionStatus',
+		ListItemText: 'Get-AzVMDscExtensionStatus',
+		ResultType: 2,
+		ToolTip: 'Get-AzVMDscExtensionStatus\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVMExtension',
+		ListItemText: 'Get-AzVMExtension',
+		ResultType: 2,
+		ToolTip: 'Get-AzVMExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVMExtensionImage',
+		ListItemText: 'Get-AzVMExtensionImage',
+		ResultType: 2,
+		ToolTip: 'Get-AzVMExtensionImage\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVMExtensionImageType',
+		ListItemText: 'Get-AzVMExtensionImageType',
+		ResultType: 2,
+		ToolTip: 'Get-AzVMExtensionImageType\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVMImage',
+		ListItemText: 'Get-AzVMImage',
+		ResultType: 2,
+		ToolTip: 'Get-AzVMImage\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVMImageOffer',
+		ListItemText: 'Get-AzVMImageOffer',
+		ResultType: 2,
+		ToolTip: 'Get-AzVMImageOffer\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVMImagePublisher',
+		ListItemText: 'Get-AzVMImagePublisher',
+		ResultType: 2,
+		ToolTip: 'Get-AzVMImagePublisher\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVMImageSku',
+		ListItemText: 'Get-AzVMImageSku',
+		ResultType: 2,
+		ToolTip: 'Get-AzVMImageSku\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVMRunCommand',
+		ListItemText: 'Get-AzVMRunCommand',
+		ResultType: 2,
+		ToolTip: 'Get-AzVMRunCommand\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVMRunCommandDocument',
+		ListItemText: 'Get-AzVMRunCommandDocument',
+		ResultType: 2,
+		ToolTip: 'Get-AzVMRunCommandDocument\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVMSize',
+		ListItemText: 'Get-AzVMSize',
+		ResultType: 2,
+		ToolTip: 'Get-AzVMSize\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVMSqlServerExtension',
+		ListItemText: 'Get-AzVMSqlServerExtension',
+		ResultType: 2,
+		ToolTip: 'Get-AzVMSqlServerExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVmss',
+		ListItemText: 'Get-AzVmss',
+		ResultType: 2,
+		ToolTip: 'Get-AzVmss\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVmssDiskEncryption',
+		ListItemText: 'Get-AzVmssDiskEncryption',
+		ResultType: 2,
+		ToolTip: 'Get-AzVmssDiskEncryption\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVmssDiskEncryptionStatus',
+		ListItemText: 'Get-AzVmssDiskEncryptionStatus',
+		ResultType: 2,
+		ToolTip: 'Get-AzVmssDiskEncryptionStatus'
+	},
+	{
+		CompletionText: 'Get-AzVmssRollingUpgrade',
+		ListItemText: 'Get-AzVmssRollingUpgrade',
+		ResultType: 2,
+		ToolTip: 'Get-AzVmssRollingUpgrade\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVmssSku',
+		ListItemText: 'Get-AzVmssSku',
+		ResultType: 2,
+		ToolTip: 'Get-AzVmssSku\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVmssVM',
+		ListItemText: 'Get-AzVmssVM',
+		ResultType: 2,
+		ToolTip: 'Get-AzVmssVM\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVmssVMDiskEncryption',
+		ListItemText: 'Get-AzVmssVMDiskEncryption',
+		ResultType: 2,
+		ToolTip: 'Get-AzVmssVMDiskEncryption\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVmssVMDiskEncryptionStatus',
+		ListItemText: 'Get-AzVmssVMDiskEncryptionStatus',
+		ResultType: 2,
+		ToolTip: 'Get-AzVmssVMDiskEncryptionStatus'
+	},
+	{
+		CompletionText: 'Get-AzVmssVMRunCommand',
+		ListItemText: 'Get-AzVmssVMRunCommand',
+		ResultType: 2,
+		ToolTip: 'Get-AzVmssVMRunCommand\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVMUsage',
+		ListItemText: 'Get-AzVMUsage',
+		ResultType: 2,
+		ToolTip: 'Get-AzVMUsage\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVpnClientConfiguration',
+		ListItemText: 'Get-AzVpnClientConfiguration',
+		ResultType: 2,
+		ToolTip: 'Get-AzVpnClientConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVpnClientIpsecParameter',
+		ListItemText: 'Get-AzVpnClientIpsecParameter',
+		ResultType: 2,
+		ToolTip: 'Get-AzVpnClientIpsecParameter\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVpnClientPackage',
+		ListItemText: 'Get-AzVpnClientPackage',
+		ResultType: 2,
+		ToolTip: 'Get-AzVpnClientPackage\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVpnClientRevokedCertificate',
+		ListItemText: 'Get-AzVpnClientRevokedCertificate',
+		ResultType: 2,
+		ToolTip: 'Get-AzVpnClientRevokedCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVpnClientRootCertificate',
+		ListItemText: 'Get-AzVpnClientRootCertificate',
+		ResultType: 2,
+		ToolTip: 'Get-AzVpnClientRootCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVpnConnection',
+		ListItemText: 'Get-AzVpnConnection',
+		ResultType: 2,
+		ToolTip: 'Get-AzVpnConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVpnGateway',
+		ListItemText: 'Get-AzVpnGateway',
+		ResultType: 2,
+		ToolTip: 'Get-AzVpnGateway\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVpnGatewayNatRule',
+		ListItemText: 'Get-AzVpnGatewayNatRule',
+		ResultType: 2,
+		ToolTip: 'Get-AzVpnGatewayNatRule\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVpnServerConfiguration',
+		ListItemText: 'Get-AzVpnServerConfiguration',
+		ResultType: 2,
+		ToolTip: 'Get-AzVpnServerConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVpnServerConfigurationPolicyGroup',
+		ListItemText: 'Get-AzVpnServerConfigurationPolicyGroup',
+		ResultType: 2,
+		ToolTip: 'Get-AzVpnServerConfigurationPolicyGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVpnSite',
+		ListItemText: 'Get-AzVpnSite',
+		ResultType: 2,
+		ToolTip: 'Get-AzVpnSite\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzVpnSiteLinkConnectionIkeSa',
+		ListItemText: 'Get-AzVpnSiteLinkConnectionIkeSa',
+		ResultType: 2,
+		ToolTip: 'Get-AzVpnSiteLinkConnectionIkeSa\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWcfRelay',
+		ListItemText: 'Get-AzWcfRelay',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzWcfRelay \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWebApp',
+		ListItemText: 'Get-AzWebApp',
+		ResultType: 2,
+		ToolTip: 'Get-AzWebApp\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWebAppAccessRestrictionConfig',
+		ListItemText: 'Get-AzWebAppAccessRestrictionConfig',
+		ResultType: 2,
+		ToolTip: 'Get-AzWebAppAccessRestrictionConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWebAppBackup',
+		ListItemText: 'Get-AzWebAppBackup',
+		ResultType: 2,
+		ToolTip: 'Get-AzWebAppBackup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWebAppBackupConfiguration',
+		ListItemText: 'Get-AzWebAppBackupConfiguration',
+		ResultType: 2,
+		ToolTip: 'Get-AzWebAppBackupConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWebAppBackupList',
+		ListItemText: 'Get-AzWebAppBackupList',
+		ResultType: 2,
+		ToolTip: 'Get-AzWebAppBackupList\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWebAppCertificate',
+		ListItemText: 'Get-AzWebAppCertificate',
+		ResultType: 2,
+		ToolTip: 'Get-AzWebAppCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWebAppContainerContinuousDeploymentUrl',
+		ListItemText: 'Get-AzWebAppContainerContinuousDeploymentUrl',
+		ResultType: 2,
+		ToolTip: 'Get-AzWebAppContainerContinuousDeploymentUrl\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWebAppContinuousWebJob',
+		ListItemText: 'Get-AzWebAppContinuousWebJob',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzWebAppContinuousWebJob \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWebAppPublishingProfile',
+		ListItemText: 'Get-AzWebAppPublishingProfile',
+		ResultType: 2,
+		ToolTip: 'Get-AzWebAppPublishingProfile\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWebAppSlot',
+		ListItemText: 'Get-AzWebAppSlot',
+		ResultType: 2,
+		ToolTip: 'Get-AzWebAppSlot\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWebAppSlotConfigName',
+		ListItemText: 'Get-AzWebAppSlotConfigName',
+		ResultType: 2,
+		ToolTip: 'Get-AzWebAppSlotConfigName\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWebAppSlotContinuousWebJob',
+		ListItemText: 'Get-AzWebAppSlotContinuousWebJob',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzWebAppSlotContinuousWebJob \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWebAppSlotPublishingProfile',
+		ListItemText: 'Get-AzWebAppSlotPublishingProfile',
+		ResultType: 2,
+		ToolTip: 'Get-AzWebAppSlotPublishingProfile\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWebAppSlotTriggeredWebJob',
+		ListItemText: 'Get-AzWebAppSlotTriggeredWebJob',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzWebAppSlotTriggeredWebJob \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWebAppSlotTriggeredWebJobHistory',
+		ListItemText: 'Get-AzWebAppSlotTriggeredWebJobHistory',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzWebAppSlotTriggeredWebJobHistory \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWebAppSlotWebJob',
+		ListItemText: 'Get-AzWebAppSlotWebJob',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzWebAppSlotWebJob \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWebAppSnapshot',
+		ListItemText: 'Get-AzWebAppSnapshot',
+		ResultType: 2,
+		ToolTip: 'Get-AzWebAppSnapshot\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWebAppSSLBinding',
+		ListItemText: 'Get-AzWebAppSSLBinding',
+		ResultType: 2,
+		ToolTip: 'Get-AzWebAppSSLBinding\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWebAppTrafficRouting',
+		ListItemText: 'Get-AzWebAppTrafficRouting',
+		ResultType: 2,
+		ToolTip: 'Get-AzWebAppTrafficRouting\\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWebAppTriggeredWebJob',
+		ListItemText: 'Get-AzWebAppTriggeredWebJob',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzWebAppTriggeredWebJob \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWebAppTriggeredWebJobHistory',
+		ListItemText: 'Get-AzWebAppTriggeredWebJobHistory',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzWebAppTriggeredWebJobHistory \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWebAppWebJob',
+		ListItemText: 'Get-AzWebAppWebJob',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzWebAppWebJob \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWebPubSub',
+		ListItemText: 'Get-AzWebPubSub',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzWebPubSub \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWebPubSubCustomCertificate',
+		ListItemText: 'Get-AzWebPubSubCustomCertificate',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzWebPubSubCustomCertificate \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWebPubSubCustomDomain',
+		ListItemText: 'Get-AzWebPubSubCustomDomain',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzWebPubSubCustomDomain \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWebPubSubHub',
+		ListItemText: 'Get-AzWebPubSubHub',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzWebPubSubHub \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWebPubSubKey',
+		ListItemText: 'Get-AzWebPubSubKey',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzWebPubSubKey \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWebPubSubSku',
+		ListItemText: 'Get-AzWebPubSubSku',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzWebPubSubSku \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWebPubSubUsage',
+		ListItemText: 'Get-AzWebPubSubUsage',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzWebPubSubUsage \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWvdApplication',
+		ListItemText: 'Get-AzWvdApplication',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzWvdApplication \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWvdApplicationGroup',
+		ListItemText: 'Get-AzWvdApplicationGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzWvdApplicationGroup \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWvdDesktop',
+		ListItemText: 'Get-AzWvdDesktop',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzWvdDesktop \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWvdHostPool',
+		ListItemText: 'Get-AzWvdHostPool',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzWvdHostPool \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWvdHostPoolRegistrationToken',
+		ListItemText: 'Get-AzWvdHostPoolRegistrationToken',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzWvdHostPoolRegistrationToken \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWvdMsixPackage',
+		ListItemText: 'Get-AzWvdMsixPackage',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzWvdMsixPackage \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWvdRegistrationInfo',
+		ListItemText: 'Get-AzWvdRegistrationInfo',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzWvdRegistrationInfo \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWvdScalingPlan',
+		ListItemText: 'Get-AzWvdScalingPlan',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzWvdScalingPlan \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWvdScalingPlanPooledSchedule',
+		ListItemText: 'Get-AzWvdScalingPlanPooledSchedule',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzWvdScalingPlanPooledSchedule \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWvdSessionHost',
+		ListItemText: 'Get-AzWvdSessionHost',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzWvdSessionHost \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWvdStartMenuItem',
+		ListItemText: 'Get-AzWvdStartMenuItem',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzWvdStartMenuItem \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWvdUserSession',
+		ListItemText: 'Get-AzWvdUserSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzWvdUserSession \\r\\n'
+	},
+	{
+		CompletionText: 'Get-AzWvdWorkspace',
+		ListItemText: 'Get-AzWvdWorkspace',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-AzWvdWorkspace \\r\\n'
+	},
+	{
+		CompletionText: 'Get-BCClientConfiguration',
+		ListItemText: 'Get-BCClientConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-BCClientConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Get-BCContentServerConfiguration',
+		ListItemText: 'Get-BCContentServerConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-BCContentServerConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Get-BCDataCache',
+		ListItemText: 'Get-BCDataCache',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-BCDataCache \\r\\n'
+	},
+	{
+		CompletionText: 'Get-BCDataCacheExtension',
+		ListItemText: 'Get-BCDataCacheExtension',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-BCDataCacheExtension \\r\\n'
+	},
+	{
+		CompletionText: 'Get-BcdEntry',
+		ListItemText: 'Get-BcdEntry',
+		ResultType: 2,
+		ToolTip: 'Get-BcdEntry\\r\\n'
+	},
+	{
+		CompletionText: 'Get-BcdEntryDebugSettings',
+		ListItemText: 'Get-BcdEntryDebugSettings',
+		ResultType: 2,
+		ToolTip: 'Get-BcdEntryDebugSettings\\r\\n'
+	},
+	{
+		CompletionText: 'Get-BcdEntryHypervisorSettings',
+		ListItemText: 'Get-BcdEntryHypervisorSettings',
+		ResultType: 2,
+		ToolTip: 'Get-BcdEntryHypervisorSettings\\r\\n'
+	},
+	{
+		CompletionText: 'Get-BcdStore',
+		ListItemText: 'Get-BcdStore',
+		ResultType: 2,
+		ToolTip: 'Get-BcdStore\\r\\n'
+	},
+	{
+		CompletionText: 'Get-BCHashCache',
+		ListItemText: 'Get-BCHashCache',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-BCHashCache \\r\\n'
+	},
+	{
+		CompletionText: 'Get-BCHostedCacheServerConfiguration',
+		ListItemText: 'Get-BCHostedCacheServerConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-BCHostedCacheServerConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Get-BCNetworkConfiguration',
+		ListItemText: 'Get-BCNetworkConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-BCNetworkConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Get-BCStatus',
+		ListItemText: 'Get-BCStatus',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-BCStatus \\r\\n'
+	},
+	{
+		CompletionText: 'Get-BitLockerVolume',
+		ListItemText: 'Get-BitLockerVolume',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-BitLockerVolume \\r\\n'
+	},
+	{
+		CompletionText: 'Get-BitsTransfer',
+		ListItemText: 'Get-BitsTransfer',
+		ResultType: 2,
+		ToolTip: 'Get-BitsTransfer\\r\\n'
+	},
+	{
+		CompletionText: 'Get-Certificate',
+		ListItemText: 'Get-Certificate',
+		ResultType: 2,
+		ToolTip: 'Get-Certificate\\r\\n'
+	},
+	{
+		CompletionText: 'Get-CertificateAutoEnrollmentPolicy',
+		ListItemText: 'Get-CertificateAutoEnrollmentPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-CertificateAutoEnrollmentPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-CertificateEnrollmentPolicyServer',
+		ListItemText: 'Get-CertificateEnrollmentPolicyServer',
+		ResultType: 2,
+		ToolTip: 'Get-CertificateEnrollmentPolicyServer\\r\\n'
+	},
+	{
+		CompletionText: 'Get-CertificateNotificationTask',
+		ListItemText: 'Get-CertificateNotificationTask',
+		ResultType: 2,
+		ToolTip: 'Get-CertificateNotificationTask\\r\\n'
+	},
+	{
+		CompletionText: 'Get-ChildItem',
+		ListItemText: 'Get-ChildItem',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-ChildItem [[-Path] <string[]>] [[-Filter] <string>] [-Include <string[]>] [-Exclude <string[]>] [-Recurse] [-Depth <uint>] [-Force] [-Name] [-Attributes <FlagsExpression[FileAttributes]>] [-FollowSymlink] [-Directory] [-File] [-Hidden] [-ReadOnly] [-System] [<CommonParameters>]\\r\\n\\r\\nGet-ChildItem [[-Filter] <string>] -LiteralPath <string[]> [-Include <string[]>] [-Exclude <string[]>] [-Recurse] [-Depth <uint>] [-Force] [-Name] [-Attributes <FlagsExpression[FileAttributes]>] [-FollowSymlink] [-Directory] [-File] [-Hidden] [-ReadOnly] [-System] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-CimAssociatedInstance',
+		ListItemText: 'Get-CimAssociatedInstance',
+		ResultType: 2,
+		ToolTip: 'Get-CimAssociatedInstance\\r\\n'
+	},
+	{
+		CompletionText: 'Get-CimClass',
+		ListItemText: 'Get-CimClass',
+		ResultType: 2,
+		ToolTip: 'Get-CimClass\\r\\n'
+	},
+	{
+		CompletionText: 'Get-CimInstance',
+		ListItemText: 'Get-CimInstance',
+		ResultType: 2,
+		ToolTip: 'Get-CimInstance\\r\\n'
+	},
+	{
+		CompletionText: 'Get-CimSession',
+		ListItemText: 'Get-CimSession',
+		ResultType: 2,
+		ToolTip: 'Get-CimSession\\r\\n'
+	},
+	{
+		CompletionText: 'Get-CIPolicy',
+		ListItemText: 'Get-CIPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-CIPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-CIPolicyIdInfo',
+		ListItemText: 'Get-CIPolicyIdInfo',
+		ResultType: 2,
+		ToolTip: 'Get-CIPolicyIdInfo\\r\\n'
+	},
+	{
+		CompletionText: 'Get-CIPolicyInfo',
+		ListItemText: 'Get-CIPolicyInfo',
+		ResultType: 2,
+		ToolTip: 'Get-CIPolicyInfo\\r\\n'
+	},
+	{
+		CompletionText: 'Get-Clipboard',
+		ListItemText: 'Get-Clipboard',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-Clipboard [-Raw] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-ClusteredScheduledTask',
+		ListItemText: 'Get-ClusteredScheduledTask',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-ClusteredScheduledTask \\r\\n'
+	},
+	{
+		CompletionText: 'Get-CmsMessage',
+		ListItemText: 'Get-CmsMessage',
+		ResultType: 2,
+		ToolTip: 'Get-CmsMessage\\r\\n'
+	},
+	{
+		CompletionText: 'Get-Command',
+		ListItemText: 'Get-Command',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-Command [[-ArgumentList] <Object[]>] [-Verb <string[]>] [-Noun <string[]>] [-Module <string[]>] [-FullyQualifiedModule <ModuleSpecification[]>] [-TotalCount <int>] [-Syntax] [-ShowCommandInfo] [-All] [-ListImported] [-ParameterName <string[]>] [-ParameterType <PSTypeName[]>] [<CommonParameters>]\\r\\n\\r\\nGet-Command [[-Name] <string[]>] [[-ArgumentList] <Object[]>] [-Module <string[]>] [-FullyQualifiedModule <ModuleSpecification[]>] [-CommandType <CommandTypes>] [-TotalCount <int>] [-Syntax] [-ShowCommandInfo] [-All] [-ListImported] [-ParameterName <string[]>] [-ParameterType <PSTypeName[]>] [-UseFuzzyMatching] [-FuzzyMinimumDistance <uint>] [-UseAbbreviationExpansion] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-ComputeProcess',
+		ListItemText: 'Get-ComputeProcess',
+		ResultType: 2,
+		ToolTip: 'Get-ComputeProcess\\r\\n'
+	},
+	{
+		CompletionText: 'Get-ComputerInfo',
+		ListItemText: 'Get-ComputerInfo',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-ComputerInfo [[-Property] <string[]>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-Content',
+		ListItemText: 'Get-Content',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-Content [-Path] <string[]> [-ReadCount <long>] [-TotalCount <long>] [-Tail <int>] [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Force] [-Credential <pscredential>] [-Delimiter <string>] [-Wait] [-Raw] [-Encoding <Encoding>] [-AsByteStream] [-Stream <string>] [<CommonParameters>]\\r\\n\\r\\nGet-Content -LiteralPath <string[]> [-ReadCount <long>] [-TotalCount <long>] [-Tail <int>] [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Force] [-Credential <pscredential>] [-Delimiter <string>] [-Wait] [-Raw] [-Encoding <Encoding>] [-AsByteStream] [-Stream <string>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-Counter',
+		ListItemText: 'Get-Counter',
+		ResultType: 2,
+		ToolTip: 'Get-Counter\\r\\n'
+	},
+	{
+		CompletionText: 'Get-Credential',
+		ListItemText: 'Get-Credential',
+		ResultType: 2,
+		ToolTip: 'Get-Credential\\r\\n'
+	},
+	{
+		CompletionText: 'Get-CredsFromCredentialProvider',
+		ListItemText: 'Get-CredsFromCredentialProvider',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-CredsFromCredentialProvider \\r\\n'
+	},
+	{
+		CompletionText: 'Get-Culture',
+		ListItemText: 'Get-Culture',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-Culture [-NoUserOverrides] [<CommonParameters>]\\r\\n\\r\\nGet-Culture [[-Name] <string[]>] [-NoUserOverrides] [<CommonParameters>]\\r\\n\\r\\nGet-Culture [-ListAvailable] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-DAClientExperienceConfiguration',
+		ListItemText: 'Get-DAClientExperienceConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-DAClientExperienceConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Get-DAConnectionStatus',
+		ListItemText: 'Get-DAConnectionStatus',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-DAConnectionStatus \\r\\n'
+	},
+	{
+		CompletionText: 'Get-DAEntryPointTableItem',
+		ListItemText: 'Get-DAEntryPointTableItem',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-DAEntryPointTableItem \\r\\n'
+	},
+	{
+		CompletionText: 'Get-DAPolicyChange',
+		ListItemText: 'Get-DAPolicyChange',
+		ResultType: 2,
+		ToolTip: 'Get-DAPolicyChange\\r\\n'
+	},
+	{
+		CompletionText: 'Get-Date',
+		ListItemText: 'Get-Date',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-Date [[-Date] <datetime>] [-Year <int>] [-Month <int>] [-Day <int>] [-Hour <int>] [-Minute <int>] [-Second <int>] [-Millisecond <int>] [-DisplayHint <DisplayHintType>] [-Format <string>] [-AsUTC] [<CommonParameters>]\\r\\n\\r\\nGet-Date [[-Date] <datetime>] -UFormat <string> [-Year <int>] [-Month <int>] [-Day <int>] [-Hour <int>] [-Minute <int>] [-Second <int>] [-Millisecond <int>] [-DisplayHint <DisplayHintType>] [-AsUTC] [<CommonParameters>]\\r\\n\\r\\nGet-Date -UnixTimeSeconds <long> [-Year <int>] [-Month <int>] [-Day <int>] [-Hour <int>] [-Minute <int>] [-Second <int>] [-Millisecond <int>] [-DisplayHint <DisplayHintType>] [-Format <string>] [-AsUTC] [<CommonParameters>]\\r\\n\\r\\nGet-Date -UnixTimeSeconds <long> -UFormat <string> [-Year <int>] [-Month <int>] [-Day <int>] [-Hour <int>] [-Minute <int>] [-Second <int>] [-Millisecond <int>] [-DisplayHint <DisplayHintType>] [-AsUTC] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-DedupProperties',
+		ListItemText: 'Get-DedupProperties',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-DedupProperties \\r\\n'
+	},
+	{
+		CompletionText: 'Get-DeliveryOptimizationLog',
+		ListItemText: 'Get-DeliveryOptimizationLog',
+		ResultType: 2,
+		ToolTip: 'Get-DeliveryOptimizationLog\\r\\n'
+	},
+	{
+		CompletionText: 'Get-DeliveryOptimizationLogAnalysis',
+		ListItemText: 'Get-DeliveryOptimizationLogAnalysis',
+		ResultType: 2,
+		ToolTip: 'Get-DeliveryOptimizationLogAnalysis\\r\\n'
+	},
+	{
+		CompletionText: 'Get-DeliveryOptimizationPerfSnap',
+		ListItemText: 'Get-DeliveryOptimizationPerfSnap',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-DeliveryOptimizationPerfSnap \\r\\n'
+	},
+	{
+		CompletionText: 'Get-DeliveryOptimizationPerfSnapThisMonth',
+		ListItemText: 'Get-DeliveryOptimizationPerfSnapThisMonth',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-DeliveryOptimizationPerfSnapThisMonth \\r\\n'
+	},
+	{
+		CompletionText: 'Get-DeliveryOptimizationStatus',
+		ListItemText: 'Get-DeliveryOptimizationStatus',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-DeliveryOptimizationStatus \\r\\n'
+	},
+	{
+		CompletionText: 'Get-Disk',
+		ListItemText: 'Get-Disk',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-Disk \\r\\n'
+	},
+	{
+		CompletionText: 'Get-DiskImage',
+		ListItemText: 'Get-DiskImage',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-DiskImage \\r\\n'
+	},
+	{
+		CompletionText: 'Get-DiskSNV',
+		ListItemText: 'Get-DiskSNV',
+		ResultType: 2,
+		ToolTip: 'Get-DiskSNV'
+	},
+	{
+		CompletionText: 'Get-DiskStorageNodeView',
+		ListItemText: 'Get-DiskStorageNodeView',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-DiskStorageNodeView \\r\\n'
+	},
+	{
+		CompletionText: 'Get-DnsClient',
+		ListItemText: 'Get-DnsClient',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-DnsClient \\r\\n'
+	},
+	{
+		CompletionText: 'Get-DnsClientCache',
+		ListItemText: 'Get-DnsClientCache',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-DnsClientCache \\r\\n'
+	},
+	{
+		CompletionText: 'Get-DnsClientDohServerAddress',
+		ListItemText: 'Get-DnsClientDohServerAddress',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-DnsClientDohServerAddress \\r\\n'
+	},
+	{
+		CompletionText: 'Get-DnsClientGlobalSetting',
+		ListItemText: 'Get-DnsClientGlobalSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-DnsClientGlobalSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Get-DnsClientNrptGlobal',
+		ListItemText: 'Get-DnsClientNrptGlobal',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-DnsClientNrptGlobal \\r\\n'
+	},
+	{
+		CompletionText: 'Get-DnsClientNrptPolicy',
+		ListItemText: 'Get-DnsClientNrptPolicy',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-DnsClientNrptPolicy \\r\\n'
+	},
+	{
+		CompletionText: 'Get-DnsClientNrptRule',
+		ListItemText: 'Get-DnsClientNrptRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-DnsClientNrptRule \\r\\n'
+	},
+	{
+		CompletionText: 'Get-DnsClientServerAddress',
+		ListItemText: 'Get-DnsClientServerAddress',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-DnsClientServerAddress \\r\\n'
+	},
+	{
+		CompletionText: 'Get-DOConfig',
+		ListItemText: 'Get-DOConfig',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-DOConfig \\r\\n'
+	},
+	{
+		CompletionText: 'Get-DODownloadMode',
+		ListItemText: 'Get-DODownloadMode',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-DODownloadMode \\r\\n'
+	},
+	{
+		CompletionText: 'Get-DOPercentageMaxBackgroundBandwidth',
+		ListItemText: 'Get-DOPercentageMaxBackgroundBandwidth',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-DOPercentageMaxBackgroundBandwidth \\r\\n'
+	},
+	{
+		CompletionText: 'Get-DOPercentageMaxForegroundBandwidth',
+		ListItemText: 'Get-DOPercentageMaxForegroundBandwidth',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-DOPercentageMaxForegroundBandwidth \\r\\n'
+	},
+	{
+		CompletionText: 'Get-DscConfiguration',
+		ListItemText: 'Get-DscConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-DscConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Get-DscConfigurationStatus',
+		ListItemText: 'Get-DscConfigurationStatus',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-DscConfigurationStatus \\r\\n'
+	},
+	{
+		CompletionText: 'Get-DscLocalConfigurationManager',
+		ListItemText: 'Get-DscLocalConfigurationManager',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-DscLocalConfigurationManager \\r\\n'
+	},
+	{
+		CompletionText: 'Get-DscResource',
+		ListItemText: 'Get-DscResource',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-DscResource \\r\\n'
+	},
+	{
+		CompletionText: 'Get-Dtc',
+		ListItemText: 'Get-Dtc',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-Dtc \\r\\n'
+	},
+	{
+		CompletionText: 'Get-DtcAdvancedHostSetting',
+		ListItemText: 'Get-DtcAdvancedHostSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-DtcAdvancedHostSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Get-DtcAdvancedSetting',
+		ListItemText: 'Get-DtcAdvancedSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-DtcAdvancedSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Get-DtcClusterDefault',
+		ListItemText: 'Get-DtcClusterDefault',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-DtcClusterDefault \\r\\n'
+	},
+	{
+		CompletionText: 'Get-DtcClusterTMMapping',
+		ListItemText: 'Get-DtcClusterTMMapping',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-DtcClusterTMMapping \\r\\n'
+	},
+	{
+		CompletionText: 'Get-DtcDefault',
+		ListItemText: 'Get-DtcDefault',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-DtcDefault \\r\\n'
+	},
+	{
+		CompletionText: 'Get-DtcLog',
+		ListItemText: 'Get-DtcLog',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-DtcLog \\r\\n'
+	},
+	{
+		CompletionText: 'Get-DtcNetworkSetting',
+		ListItemText: 'Get-DtcNetworkSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-DtcNetworkSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Get-DtcTransaction',
+		ListItemText: 'Get-DtcTransaction',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-DtcTransaction \\r\\n'
+	},
+	{
+		CompletionText: 'Get-DtcTransactionsStatistics',
+		ListItemText: 'Get-DtcTransactionsStatistics',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-DtcTransactionsStatistics \\r\\n'
+	},
+	{
+		CompletionText: 'Get-DtcTransactionsTraceSession',
+		ListItemText: 'Get-DtcTransactionsTraceSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-DtcTransactionsTraceSession \\r\\n'
+	},
+	{
+		CompletionText: 'Get-DtcTransactionsTraceSetting',
+		ListItemText: 'Get-DtcTransactionsTraceSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-DtcTransactionsTraceSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Get-Error',
+		ListItemText: 'Get-Error',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-Error [-Newest <int>] [<CommonParameters>]\\r\\n\\r\\nGet-Error [[-InputObject] <psobject>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-EtwTraceProvider',
+		ListItemText: 'Get-EtwTraceProvider',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-EtwTraceProvider \\r\\n'
+	},
+	{
+		CompletionText: 'Get-EtwTraceSession',
+		ListItemText: 'Get-EtwTraceSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-EtwTraceSession \\r\\n'
+	},
+	{
+		CompletionText: 'Get-Event',
+		ListItemText: 'Get-Event',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-Event [[-SourceIdentifier] <string>] [<CommonParameters>]\\r\\n\\r\\nGet-Event [-EventIdentifier] <int> [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-EventSubscriber',
+		ListItemText: 'Get-EventSubscriber',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-EventSubscriber [[-SourceIdentifier] <string>] [-Force] [<CommonParameters>]\\r\\n\\r\\nGet-EventSubscriber [-SubscriptionId] <int> [-Force] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-ExecutionPolicy',
+		ListItemText: 'Get-ExecutionPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-ExecutionPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-ExperimentalFeature',
+		ListItemText: 'Get-ExperimentalFeature',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-ExperimentalFeature [[-Name] <string[]>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-FileHash',
+		ListItemText: 'Get-FileHash',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-FileHash [-Path] <string[]> [[-Algorithm] <string>] [<CommonParameters>]\\r\\n\\r\\nGet-FileHash [-LiteralPath] <string[]> [[-Algorithm] <string>] [<CommonParameters>]\\r\\n\\r\\nGet-FileHash [-InputStream] <Stream> [[-Algorithm] <string>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-FileIntegrity',
+		ListItemText: 'Get-FileIntegrity',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-FileIntegrity \\r\\n'
+	},
+	{
+		CompletionText: 'Get-FileShare',
+		ListItemText: 'Get-FileShare',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-FileShare \\r\\n'
+	},
+	{
+		CompletionText: 'Get-FileShareAccessControlEntry',
+		ListItemText: 'Get-FileShareAccessControlEntry',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-FileShareAccessControlEntry \\r\\n'
+	},
+	{
+		CompletionText: 'Get-FileStorageTier',
+		ListItemText: 'Get-FileStorageTier',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-FileStorageTier \\r\\n'
+	},
+	{
+		CompletionText: 'Get-FormatData',
+		ListItemText: 'Get-FormatData',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-FormatData [[-TypeName] <string[]>] [-PowerShellVersion <version>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-GitBranchStatusColor',
+		ListItemText: 'Get-GitBranchStatusColor',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-GitBranchStatusColor \\r\\n'
+	},
+	{
+		CompletionText: 'Get-GitDirectory',
+		ListItemText: 'Get-GitDirectory',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-GitDirectory \\r\\n'
+	},
+	{
+		CompletionText: 'Get-GitStatus',
+		ListItemText: 'Get-GitStatus',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-GitStatus \\r\\n'
+	},
+	{
+		CompletionText: 'Get-Help',
+		ListItemText: 'Get-Help',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-Help [[-Name] <string>] [-Path <string>] [-Category <string[]>] [-Full] [-Component <string[]>] [-Functionality <string[]>] [-Role <string[]>] [<CommonParameters>]\\r\\n\\r\\nGet-Help [[-Name] <string>] -Detailed [-Path <string>] [-Category <string[]>] [-Component <string[]>] [-Functionality <string[]>] [-Role <string[]>] [<CommonParameters>]\\r\\n\\r\\nGet-Help [[-Name] <string>] -Examples [-Path <string>] [-Category <string[]>] [-Component <string[]>] [-Functionality <string[]>] [-Role <string[]>] [<CommonParameters>]\\r\\n\\r\\nGet-Help [[-Name] <string>] -Parameter <string[]> [-Path <string>] [-Category <string[]>] [-Component <string[]>] [-Functionality <string[]>] [-Role <string[]>] [<CommonParameters>]\\r\\n\\r\\nGet-Help [[-Name] <string>] -Online [-Path <string>] [-Category <string[]>] [-Component <string[]>] [-Functionality <string[]>] [-Role <string[]>] [<CommonParameters>]\\r\\n\\r\\nGet-Help [[-Name] <string>] -ShowWindow [-Path <string>] [-Category <string[]>] [-Component <string[]>] [-Functionality <string[]>] [-Role <string[]>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-HgsAttestationBaselinePolicy',
+		ListItemText: 'Get-HgsAttestationBaselinePolicy',
+		ResultType: 2,
+		ToolTip: 'Get-HgsAttestationBaselinePolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-HgsClientConfiguration',
+		ListItemText: 'Get-HgsClientConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-HgsClientConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Get-HgsClientHostKey',
+		ListItemText: 'Get-HgsClientHostKey',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-HgsClientHostKey \\r\\n'
+	},
+	{
+		CompletionText: 'Get-HgsGuardian',
+		ListItemText: 'Get-HgsGuardian',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-HgsGuardian \\r\\n'
+	},
+	{
+		CompletionText: 'Get-HgsTrace',
+		ListItemText: 'Get-HgsTrace',
+		ResultType: 2,
+		ToolTip: 'Get-HgsTrace\\r\\n'
+	},
+	{
+		CompletionText: 'Get-HgsTraceFileData',
+		ListItemText: 'Get-HgsTraceFileData',
+		ResultType: 2,
+		ToolTip: 'Get-HgsTraceFileData\\r\\n'
+	},
+	{
+		CompletionText: 'Get-History',
+		ListItemText: 'Get-History',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-History [[-Id] <long[]>] [[-Count] <int>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-HnsEndpoint',
+		ListItemText: 'Get-HnsEndpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-HnsEndpoint \\r\\n'
+	},
+	{
+		CompletionText: 'Get-HnsEndpointAddresses',
+		ListItemText: 'Get-HnsEndpointAddresses',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-HnsEndpointAddresses \\r\\n'
+	},
+	{
+		CompletionText: 'Get-HnsEndpointStats',
+		ListItemText: 'Get-HnsEndpointStats',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-HnsEndpointStats \\r\\n'
+	},
+	{
+		CompletionText: 'Get-HnsNamespace',
+		ListItemText: 'Get-HnsNamespace',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-HnsNamespace \\r\\n'
+	},
+	{
+		CompletionText: 'Get-HnsNetwork',
+		ListItemText: 'Get-HnsNetwork',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-HnsNetwork \\r\\n'
+	},
+	{
+		CompletionText: 'Get-HnsPolicyList',
+		ListItemText: 'Get-HnsPolicyList',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-HnsPolicyList \\r\\n'
+	},
+	{
+		CompletionText: 'Get-Host',
+		ListItemText: 'Get-Host',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-Host [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-HotFix',
+		ListItemText: 'Get-HotFix',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-HotFix [[-Id] <string[]>] [-ComputerName <string[]>] [-Credential <pscredential>] [<CommonParameters>]\\r\\n\\r\\nGet-HotFix [-Description <string[]>] [-ComputerName <string[]>] [-Credential <pscredential>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-InitiatorId',
+		ListItemText: 'Get-InitiatorId',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-InitiatorId \\r\\n'
+	},
+	{
+		CompletionText: 'Get-InitiatorPort',
+		ListItemText: 'Get-InitiatorPort',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-InitiatorPort \\r\\n'
+	},
+	{
+		CompletionText: 'Get-InstalledLanguage',
+		ListItemText: 'Get-InstalledLanguage',
+		ResultType: 2,
+		ToolTip: 'Get-InstalledLanguage\\r\\n'
+	},
+	{
+		CompletionText: 'Get-InstalledModule',
+		ListItemText: 'Get-InstalledModule',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-InstalledModule \\r\\n'
+	},
+	{
+		CompletionText: 'Get-InstalledPSResource',
+		ListItemText: 'Get-InstalledPSResource',
+		ResultType: 2,
+		ToolTip: 'Get-InstalledPSResource\\r\\n'
+	},
+	{
+		CompletionText: 'Get-InstalledScript',
+		ListItemText: 'Get-InstalledScript',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-InstalledScript \\r\\n'
+	},
+	{
+		CompletionText: 'Get-IscsiConnection',
+		ListItemText: 'Get-IscsiConnection',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-IscsiConnection \\r\\n'
+	},
+	{
+		CompletionText: 'Get-IscsiSession',
+		ListItemText: 'Get-IscsiSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-IscsiSession \\r\\n'
+	},
+	{
+		CompletionText: 'Get-IscsiTarget',
+		ListItemText: 'Get-IscsiTarget',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-IscsiTarget \\r\\n'
+	},
+	{
+		CompletionText: 'Get-IscsiTargetPortal',
+		ListItemText: 'Get-IscsiTargetPortal',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-IscsiTargetPortal \\r\\n'
+	},
+	{
+		CompletionText: 'Get-IseSnippet',
+		ListItemText: 'Get-IseSnippet',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-IseSnippet \\r\\n'
+	},
+	{
+		CompletionText: 'Get-Item',
+		ListItemText: 'Get-Item',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-Item [-Path] <string[]> [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Force] [-Credential <pscredential>] [-Stream <string[]>] [<CommonParameters>]\\r\\n\\r\\nGet-Item -LiteralPath <string[]> [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Force] [-Credential <pscredential>] [-Stream <string[]>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-ItemProperty',
+		ListItemText: 'Get-ItemProperty',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-ItemProperty [-Path] <string[]> [[-Name] <string[]>] [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Credential <pscredential>] [<CommonParameters>]\\r\\n\\r\\nGet-ItemProperty [[-Name] <string[]>] -LiteralPath <string[]> [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Credential <pscredential>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-ItemPropertyValue',
+		ListItemText: 'Get-ItemPropertyValue',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-ItemPropertyValue [[-Path] <string[]>] [-Name] <string[]> [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Credential <pscredential>] [<CommonParameters>]\\r\\n\\r\\nGet-ItemPropertyValue [-Name] <string[]> -LiteralPath <string[]> [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Credential <pscredential>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-Job',
+		ListItemText: 'Get-Job',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-Job [[-Id] <int[]>] [-IncludeChildJob] [-ChildJobState <JobState>] [-HasMoreData <bool>] [-Before <datetime>] [-After <datetime>] [-Newest <int>] [<CommonParameters>]\\r\\n\\r\\nGet-Job [-InstanceId] <guid[]> [-IncludeChildJob] [-ChildJobState <JobState>] [-HasMoreData <bool>] [-Before <datetime>] [-After <datetime>] [-Newest <int>] [<CommonParameters>]\\r\\n\\r\\nGet-Job [-Name] <string[]> [-IncludeChildJob] [-ChildJobState <JobState>] [-HasMoreData <bool>] [-Before <datetime>] [-After <datetime>] [-Newest <int>] [<CommonParameters>]\\r\\n\\r\\nGet-Job [-State] <JobState> [-IncludeChildJob] [-ChildJobState <JobState>] [-HasMoreData <bool>] [-Before <datetime>] [-After <datetime>] [-Newest <int>] [<CommonParameters>]\\r\\n\\r\\nGet-Job [-IncludeChildJob] [-ChildJobState <JobState>] [-HasMoreData <bool>] [-Before <datetime>] [-After <datetime>] [-Newest <int>] [-Command <string[]>] [<CommonParameters>]\\r\\n\\r\\nGet-Job [-Filter] <hashtable> [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-JobTrigger',
+		ListItemText: 'Get-JobTrigger',
+		ResultType: 2,
+		ToolTip: 'Get-JobTrigger\\r\\n'
+	},
+	{
+		CompletionText: 'Get-KdsConfiguration',
+		ListItemText: 'Get-KdsConfiguration',
+		ResultType: 2,
+		ToolTip: 'Get-KdsConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Get-KdsRootKey',
+		ListItemText: 'Get-KdsRootKey',
+		ResultType: 2,
+		ToolTip: 'Get-KdsRootKey\\r\\n'
+	},
+	{
+		CompletionText: 'Get-Language',
+		ListItemText: 'Get-Language',
+		ResultType: 2,
+		ToolTip: 'Get-Language'
+	},
+	{
+		CompletionText: 'Get-LapsAADPassword',
+		ListItemText: 'Get-LapsAADPassword',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-LapsAADPassword \\r\\n'
+	},
+	{
+		CompletionText: 'Get-LapsADPassword',
+		ListItemText: 'Get-LapsADPassword',
+		ResultType: 2,
+		ToolTip: 'Get-LapsADPassword\\r\\n'
+	},
+	{
+		CompletionText: 'Get-LapsDiagnostics',
+		ListItemText: 'Get-LapsDiagnostics',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-LapsDiagnostics \\r\\n'
+	},
+	{
+		CompletionText: 'Get-LocalGroup',
+		ListItemText: 'Get-LocalGroup',
+		ResultType: 2,
+		ToolTip: 'Get-LocalGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-LocalGroupMember',
+		ListItemText: 'Get-LocalGroupMember',
+		ResultType: 2,
+		ToolTip: 'Get-LocalGroupMember\\r\\n'
+	},
+	{
+		CompletionText: 'Get-LocalUser',
+		ListItemText: 'Get-LocalUser',
+		ResultType: 2,
+		ToolTip: 'Get-LocalUser\\r\\n'
+	},
+	{
+		CompletionText: 'Get-Location',
+		ListItemText: 'Get-Location',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-Location [-PSProvider <string[]>] [-PSDrive <string[]>] [<CommonParameters>]\\r\\n\\r\\nGet-Location [-Stack] [-StackName <string[]>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-LogProperties',
+		ListItemText: 'Get-LogProperties',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-LogProperties \\r\\n'
+	},
+	{
+		CompletionText: 'Get-MarkdownOption',
+		ListItemText: 'Get-MarkdownOption',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-MarkdownOption [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-MaskingSet',
+		ListItemText: 'Get-MaskingSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-MaskingSet \\r\\n'
+	},
+	{
+		CompletionText: 'Get-Member',
+		ListItemText: 'Get-Member',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-Member [[-Name] <string[]>] [-InputObject <psobject>] [-MemberType <PSMemberTypes>] [-View <PSMemberViewTypes>] [-Static] [-Force] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-MMAgent',
+		ListItemText: 'Get-MMAgent',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-MMAgent \\r\\n'
+	},
+	{
+		CompletionText: 'Get-MockDynamicParameters',
+		ListItemText: 'Get-MockDynamicParameters',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-MockDynamicParameters \\r\\n'
+	},
+	{
+		CompletionText: 'Get-Module',
+		ListItemText: 'Get-Module',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-Module [[-Name] <string[]>] [-FullyQualifiedName <ModuleSpecification[]>] [-All] [<CommonParameters>]\\r\\n\\r\\nGet-Module [[-Name] <string[]>] -ListAvailable [-FullyQualifiedName <ModuleSpecification[]>] [-All] [-PSEdition <string>] [-SkipEditionCheck] [-Refresh] [<CommonParameters>]\\r\\n\\r\\nGet-Module [[-Name] <string[]>] -PSSession <PSSession> [-FullyQualifiedName <ModuleSpecification[]>] [-ListAvailable] [-PSEdition <string>] [-SkipEditionCheck] [-Refresh] [<CommonParameters>]\\r\\n\\r\\nGet-Module [[-Name] <string[]>] -CimSession <CimSession> [-FullyQualifiedName <ModuleSpecification[]>] [-ListAvailable] [-SkipEditionCheck] [-Refresh] [-CimResourceUri <uri>] [-CimNamespace <string>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-MpComputerStatus',
+		ListItemText: 'Get-MpComputerStatus',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-MpComputerStatus \\r\\n'
+	},
+	{
+		CompletionText: 'Get-MpPerformanceReport',
+		ListItemText: 'Get-MpPerformanceReport',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-MpPerformanceReport \\r\\n'
+	},
+	{
+		CompletionText: 'Get-MpPreference',
+		ListItemText: 'Get-MpPreference',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-MpPreference \\r\\n'
+	},
+	{
+		CompletionText: 'Get-MpThreat',
+		ListItemText: 'Get-MpThreat',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-MpThreat \\r\\n'
+	},
+	{
+		CompletionText: 'Get-MpThreatCatalog',
+		ListItemText: 'Get-MpThreatCatalog',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-MpThreatCatalog \\r\\n'
+	},
+	{
+		CompletionText: 'Get-MpThreatDetection',
+		ListItemText: 'Get-MpThreatDetection',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-MpThreatDetection \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NCSIPolicyConfiguration',
+		ListItemText: 'Get-NCSIPolicyConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NCSIPolicyConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Get-Net6to4Configuration',
+		ListItemText: 'Get-Net6to4Configuration',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-Net6to4Configuration \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetAdapter',
+		ListItemText: 'Get-NetAdapter',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetAdapter \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetAdapterAdvancedProperty',
+		ListItemText: 'Get-NetAdapterAdvancedProperty',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetAdapterAdvancedProperty \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetAdapterBinding',
+		ListItemText: 'Get-NetAdapterBinding',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetAdapterBinding \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetAdapterChecksumOffload',
+		ListItemText: 'Get-NetAdapterChecksumOffload',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetAdapterChecksumOffload \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetAdapterDataPathConfiguration',
+		ListItemText: 'Get-NetAdapterDataPathConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetAdapterDataPathConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetAdapterEncapsulatedPacketTaskOffload',
+		ListItemText: 'Get-NetAdapterEncapsulatedPacketTaskOffload',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetAdapterEncapsulatedPacketTaskOffload \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetAdapterHardwareInfo',
+		ListItemText: 'Get-NetAdapterHardwareInfo',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetAdapterHardwareInfo \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetAdapterIPsecOffload',
+		ListItemText: 'Get-NetAdapterIPsecOffload',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetAdapterIPsecOffload \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetAdapterLso',
+		ListItemText: 'Get-NetAdapterLso',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetAdapterLso \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetAdapterPacketDirect',
+		ListItemText: 'Get-NetAdapterPacketDirect',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetAdapterPacketDirect \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetAdapterPowerManagement',
+		ListItemText: 'Get-NetAdapterPowerManagement',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetAdapterPowerManagement \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetAdapterQos',
+		ListItemText: 'Get-NetAdapterQos',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetAdapterQos \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetAdapterRdma',
+		ListItemText: 'Get-NetAdapterRdma',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetAdapterRdma \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetAdapterRsc',
+		ListItemText: 'Get-NetAdapterRsc',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetAdapterRsc \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetAdapterRss',
+		ListItemText: 'Get-NetAdapterRss',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetAdapterRss \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetAdapterSriov',
+		ListItemText: 'Get-NetAdapterSriov',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetAdapterSriov \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetAdapterSriovVf',
+		ListItemText: 'Get-NetAdapterSriovVf',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetAdapterSriovVf \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetAdapterStatistics',
+		ListItemText: 'Get-NetAdapterStatistics',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetAdapterStatistics \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetAdapterUso',
+		ListItemText: 'Get-NetAdapterUso',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetAdapterUso \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetAdapterVmq',
+		ListItemText: 'Get-NetAdapterVmq',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetAdapterVmq \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetAdapterVMQQueue',
+		ListItemText: 'Get-NetAdapterVMQQueue',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetAdapterVMQQueue \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetAdapterVPort',
+		ListItemText: 'Get-NetAdapterVPort',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetAdapterVPort \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetCompartment',
+		ListItemText: 'Get-NetCompartment',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetCompartment \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetConnectionProfile',
+		ListItemText: 'Get-NetConnectionProfile',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetConnectionProfile \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetDnsTransitionConfiguration',
+		ListItemText: 'Get-NetDnsTransitionConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetDnsTransitionConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetDnsTransitionMonitoring',
+		ListItemText: 'Get-NetDnsTransitionMonitoring',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetDnsTransitionMonitoring \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetEventNetworkAdapter',
+		ListItemText: 'Get-NetEventNetworkAdapter',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetEventNetworkAdapter \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetEventPacketCaptureProvider',
+		ListItemText: 'Get-NetEventPacketCaptureProvider',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetEventPacketCaptureProvider \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetEventProvider',
+		ListItemText: 'Get-NetEventProvider',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetEventProvider \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetEventSession',
+		ListItemText: 'Get-NetEventSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetEventSession \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetEventVFPProvider',
+		ListItemText: 'Get-NetEventVFPProvider',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetEventVFPProvider \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetEventVmNetworkAdapter',
+		ListItemText: 'Get-NetEventVmNetworkAdapter',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetEventVmNetworkAdapter \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetEventVmSwitch',
+		ListItemText: 'Get-NetEventVmSwitch',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetEventVmSwitch \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetEventVmSwitchProvider',
+		ListItemText: 'Get-NetEventVmSwitchProvider',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetEventVmSwitchProvider \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetEventWFPCaptureProvider',
+		ListItemText: 'Get-NetEventWFPCaptureProvider',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetEventWFPCaptureProvider \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetFirewallAddressFilter',
+		ListItemText: 'Get-NetFirewallAddressFilter',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetFirewallAddressFilter \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetFirewallApplicationFilter',
+		ListItemText: 'Get-NetFirewallApplicationFilter',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetFirewallApplicationFilter \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetFirewallDynamicKeywordAddress',
+		ListItemText: 'Get-NetFirewallDynamicKeywordAddress',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetFirewallDynamicKeywordAddress \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetFirewallHyperVPort',
+		ListItemText: 'Get-NetFirewallHyperVPort',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetFirewallHyperVPort \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetFirewallHyperVProfile',
+		ListItemText: 'Get-NetFirewallHyperVProfile',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetFirewallHyperVProfile \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetFirewallHyperVRule',
+		ListItemText: 'Get-NetFirewallHyperVRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetFirewallHyperVRule \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetFirewallHyperVVMCreator',
+		ListItemText: 'Get-NetFirewallHyperVVMCreator',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetFirewallHyperVVMCreator \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetFirewallHyperVVMSetting',
+		ListItemText: 'Get-NetFirewallHyperVVMSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetFirewallHyperVVMSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetFirewallInterfaceFilter',
+		ListItemText: 'Get-NetFirewallInterfaceFilter',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetFirewallInterfaceFilter \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetFirewallInterfaceTypeFilter',
+		ListItemText: 'Get-NetFirewallInterfaceTypeFilter',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetFirewallInterfaceTypeFilter \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetFirewallPortFilter',
+		ListItemText: 'Get-NetFirewallPortFilter',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetFirewallPortFilter \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetFirewallProfile',
+		ListItemText: 'Get-NetFirewallProfile',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetFirewallProfile \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetFirewallRule',
+		ListItemText: 'Get-NetFirewallRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetFirewallRule \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetFirewallSecurityFilter',
+		ListItemText: 'Get-NetFirewallSecurityFilter',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetFirewallSecurityFilter \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetFirewallServiceFilter',
+		ListItemText: 'Get-NetFirewallServiceFilter',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetFirewallServiceFilter \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetFirewallSetting',
+		ListItemText: 'Get-NetFirewallSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetFirewallSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetIPAddress',
+		ListItemText: 'Get-NetIPAddress',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetIPAddress \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetIPConfiguration',
+		ListItemText: 'Get-NetIPConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetIPConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetIPHttpsConfiguration',
+		ListItemText: 'Get-NetIPHttpsConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetIPHttpsConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetIPHttpsState',
+		ListItemText: 'Get-NetIPHttpsState',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetIPHttpsState \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetIPInterface',
+		ListItemText: 'Get-NetIPInterface',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetIPInterface \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetIPsecDospSetting',
+		ListItemText: 'Get-NetIPsecDospSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetIPsecDospSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetIPsecMainModeCryptoSet',
+		ListItemText: 'Get-NetIPsecMainModeCryptoSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetIPsecMainModeCryptoSet \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetIPsecMainModeRule',
+		ListItemText: 'Get-NetIPsecMainModeRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetIPsecMainModeRule \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetIPsecMainModeSA',
+		ListItemText: 'Get-NetIPsecMainModeSA',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetIPsecMainModeSA \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetIPsecPhase1AuthSet',
+		ListItemText: 'Get-NetIPsecPhase1AuthSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetIPsecPhase1AuthSet \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetIPsecPhase2AuthSet',
+		ListItemText: 'Get-NetIPsecPhase2AuthSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetIPsecPhase2AuthSet \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetIPsecQuickModeCryptoSet',
+		ListItemText: 'Get-NetIPsecQuickModeCryptoSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetIPsecQuickModeCryptoSet \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetIPsecQuickModeSA',
+		ListItemText: 'Get-NetIPsecQuickModeSA',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetIPsecQuickModeSA \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetIPsecRule',
+		ListItemText: 'Get-NetIPsecRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetIPsecRule \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetIPv4Protocol',
+		ListItemText: 'Get-NetIPv4Protocol',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetIPv4Protocol \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetIPv6Protocol',
+		ListItemText: 'Get-NetIPv6Protocol',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetIPv6Protocol \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetIsatapConfiguration',
+		ListItemText: 'Get-NetIsatapConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetIsatapConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetLbfoTeam',
+		ListItemText: 'Get-NetLbfoTeam',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetLbfoTeam \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetLbfoTeamMember',
+		ListItemText: 'Get-NetLbfoTeamMember',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetLbfoTeamMember \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetLbfoTeamNic',
+		ListItemText: 'Get-NetLbfoTeamNic',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetLbfoTeamNic \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetNat',
+		ListItemText: 'Get-NetNat',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetNat \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetNatExternalAddress',
+		ListItemText: 'Get-NetNatExternalAddress',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetNatExternalAddress \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetNatGlobal',
+		ListItemText: 'Get-NetNatGlobal',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetNatGlobal \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetNatSession',
+		ListItemText: 'Get-NetNatSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetNatSession \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetNatStaticMapping',
+		ListItemText: 'Get-NetNatStaticMapping',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetNatStaticMapping \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetNatTransitionConfiguration',
+		ListItemText: 'Get-NetNatTransitionConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetNatTransitionConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetNatTransitionMonitoring',
+		ListItemText: 'Get-NetNatTransitionMonitoring',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetNatTransitionMonitoring \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetNeighbor',
+		ListItemText: 'Get-NetNeighbor',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetNeighbor \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetOffloadGlobalSetting',
+		ListItemText: 'Get-NetOffloadGlobalSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetOffloadGlobalSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetPrefixPolicy',
+		ListItemText: 'Get-NetPrefixPolicy',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetPrefixPolicy \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetQosPolicy',
+		ListItemText: 'Get-NetQosPolicy',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetQosPolicy \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetRoute',
+		ListItemText: 'Get-NetRoute',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetRoute \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetSwitchTeam',
+		ListItemText: 'Get-NetSwitchTeam',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetSwitchTeam \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetSwitchTeamMember',
+		ListItemText: 'Get-NetSwitchTeamMember',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetSwitchTeamMember \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetTCPConnection',
+		ListItemText: 'Get-NetTCPConnection',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetTCPConnection \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetTCPSetting',
+		ListItemText: 'Get-NetTCPSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetTCPSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetTeredoConfiguration',
+		ListItemText: 'Get-NetTeredoConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetTeredoConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetTeredoState',
+		ListItemText: 'Get-NetTeredoState',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetTeredoState \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetTransportFilter',
+		ListItemText: 'Get-NetTransportFilter',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetTransportFilter \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetUDPEndpoint',
+		ListItemText: 'Get-NetUDPEndpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetUDPEndpoint \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetUDPSetting',
+		ListItemText: 'Get-NetUDPSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetUDPSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetView',
+		ListItemText: 'Get-NetView',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetView \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetworkSwitchEthernetPort',
+		ListItemText: 'Get-NetworkSwitchEthernetPort',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetworkSwitchEthernetPort \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetworkSwitchFeature',
+		ListItemText: 'Get-NetworkSwitchFeature',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetworkSwitchFeature \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetworkSwitchGlobalData',
+		ListItemText: 'Get-NetworkSwitchGlobalData',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetworkSwitchGlobalData \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NetworkSwitchVlan',
+		ListItemText: 'Get-NetworkSwitchVlan',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-NetworkSwitchVlan \\r\\n'
+	},
+	{
+		CompletionText: 'Get-NonRemovableAppsPolicy',
+		ListItemText: 'Get-NonRemovableAppsPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-NonRemovableAppsPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-OdbcDriver',
+		ListItemText: 'Get-OdbcDriver',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-OdbcDriver \\r\\n'
+	},
+	{
+		CompletionText: 'Get-OdbcDsn',
+		ListItemText: 'Get-OdbcDsn',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-OdbcDsn \\r\\n'
+	},
+	{
+		CompletionText: 'Get-OdbcPerfCounter',
+		ListItemText: 'Get-OdbcPerfCounter',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-OdbcPerfCounter \\r\\n'
+	},
+	{
+		CompletionText: 'Get-OffloadDataTransferSetting',
+		ListItemText: 'Get-OffloadDataTransferSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-OffloadDataTransferSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Get-OperationValidation',
+		ListItemText: 'Get-OperationValidation',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-OperationValidation \\r\\n'
+	},
+	{
+		CompletionText: 'Get-Package',
+		ListItemText: 'Get-Package',
+		ResultType: 2,
+		ToolTip: 'Get-Package\\r\\n'
+	},
+	{
+		CompletionText: 'Get-PackageProvider',
+		ListItemText: 'Get-PackageProvider',
+		ResultType: 2,
+		ToolTip: 'Get-PackageProvider\\r\\n'
+	},
+	{
+		CompletionText: 'Get-PackageSource',
+		ListItemText: 'Get-PackageSource',
+		ResultType: 2,
+		ToolTip: 'Get-PackageSource\\r\\n'
+	},
+	{
+		CompletionText: 'Get-Partition',
+		ListItemText: 'Get-Partition',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-Partition \\r\\n'
+	},
+	{
+		CompletionText: 'Get-PartitionSupportedSize',
+		ListItemText: 'Get-PartitionSupportedSize',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-PartitionSupportedSize \\r\\n'
+	},
+	{
+		CompletionText: 'Get-PcsvDevice',
+		ListItemText: 'Get-PcsvDevice',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-PcsvDevice \\r\\n'
+	},
+	{
+		CompletionText: 'Get-PcsvDeviceLog',
+		ListItemText: 'Get-PcsvDeviceLog',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-PcsvDeviceLog \\r\\n'
+	},
+	{
+		CompletionText: 'Get-PfxCertificate',
+		ListItemText: 'Get-PfxCertificate',
+		ResultType: 2,
+		ToolTip: 'Get-PfxCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Get-PfxData',
+		ListItemText: 'Get-PfxData',
+		ResultType: 2,
+		ToolTip: 'Get-PfxData\\r\\n'
+	},
+	{
+		CompletionText: 'Get-PhysicalDisk',
+		ListItemText: 'Get-PhysicalDisk',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-PhysicalDisk \\r\\n'
+	},
+	{
+		CompletionText: 'Get-PhysicalDiskSNV',
+		ListItemText: 'Get-PhysicalDiskSNV',
+		ResultType: 2,
+		ToolTip: 'Get-PhysicalDiskSNV'
+	},
+	{
+		CompletionText: 'Get-PhysicalDiskStorageNodeView',
+		ListItemText: 'Get-PhysicalDiskStorageNodeView',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-PhysicalDiskStorageNodeView \\r\\n'
+	},
+	{
+		CompletionText: 'Get-PhysicalExtent',
+		ListItemText: 'Get-PhysicalExtent',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-PhysicalExtent \\r\\n'
+	},
+	{
+		CompletionText: 'Get-PhysicalExtentAssociation',
+		ListItemText: 'Get-PhysicalExtentAssociation',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-PhysicalExtentAssociation \\r\\n'
+	},
+	{
+		CompletionText: 'Get-PmemDedicatedMemory',
+		ListItemText: 'Get-PmemDedicatedMemory',
+		ResultType: 2,
+		ToolTip: 'Get-PmemDedicatedMemory\\r\\n'
+	},
+	{
+		CompletionText: 'Get-PmemDisk',
+		ListItemText: 'Get-PmemDisk',
+		ResultType: 2,
+		ToolTip: 'Get-PmemDisk\\r\\n'
+	},
+	{
+		CompletionText: 'Get-PmemPhysicalDevice',
+		ListItemText: 'Get-PmemPhysicalDevice',
+		ResultType: 2,
+		ToolTip: 'Get-PmemPhysicalDevice\\r\\n'
+	},
+	{
+		CompletionText: 'Get-PmemUnusedRegion',
+		ListItemText: 'Get-PmemUnusedRegion',
+		ResultType: 2,
+		ToolTip: 'Get-PmemUnusedRegion\\r\\n'
+	},
+	{
+		CompletionText: 'Get-PnpDevice',
+		ListItemText: 'Get-PnpDevice',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-PnpDevice \\r\\n'
+	},
+	{
+		CompletionText: 'Get-PnpDeviceProperty',
+		ListItemText: 'Get-PnpDeviceProperty',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-PnpDeviceProperty \\r\\n'
+	},
+	{
+		CompletionText: 'Get-PreferredLanguage',
+		ListItemText: 'Get-PreferredLanguage',
+		ResultType: 2,
+		ToolTip: 'Get-PreferredLanguage'
+	},
+	{
+		CompletionText: 'Get-PrintConfiguration',
+		ListItemText: 'Get-PrintConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-PrintConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Get-Printer',
+		ListItemText: 'Get-Printer',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-Printer \\r\\n'
+	},
+	{
+		CompletionText: 'Get-PrinterDriver',
+		ListItemText: 'Get-PrinterDriver',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-PrinterDriver \\r\\n'
+	},
+	{
+		CompletionText: 'Get-PrinterPort',
+		ListItemText: 'Get-PrinterPort',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-PrinterPort \\r\\n'
+	},
+	{
+		CompletionText: 'Get-PrinterProperty',
+		ListItemText: 'Get-PrinterProperty',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-PrinterProperty \\r\\n'
+	},
+	{
+		CompletionText: 'Get-PrintJob',
+		ListItemText: 'Get-PrintJob',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-PrintJob \\r\\n'
+	},
+	{
+		CompletionText: 'Get-Process',
+		ListItemText: 'Get-Process',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-Process [[-Name] <string[]>] [-Module] [-FileVersionInfo] [<CommonParameters>]\\r\\n\\r\\nGet-Process [[-Name] <string[]>] -IncludeUserName [<CommonParameters>]\\r\\n\\r\\nGet-Process -Id <int[]> [-Module] [-FileVersionInfo] [<CommonParameters>]\\r\\n\\r\\nGet-Process -Id <int[]> -IncludeUserName [<CommonParameters>]\\r\\n\\r\\nGet-Process -InputObject <Process[]> [-Module] [-FileVersionInfo] [<CommonParameters>]\\r\\n\\r\\nGet-Process -InputObject <Process[]> -IncludeUserName [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-ProcessMitigation',
+		ListItemText: 'Get-ProcessMitigation',
+		ResultType: 2,
+		ToolTip: 'Get-ProcessMitigation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-PromptConnectionInfo',
+		ListItemText: 'Get-PromptConnectionInfo',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-PromptConnectionInfo \\r\\n'
+	},
+	{
+		CompletionText: 'Get-PromptPath',
+		ListItemText: 'Get-PromptPath',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-PromptPath \\r\\n'
+	},
+	{
+		CompletionText: 'Get-ProvisionedAppPackage',
+		ListItemText: 'Get-ProvisionedAppPackage',
+		ResultType: 2,
+		ToolTip: 'Get-ProvisionedAppPackage'
+	},
+	{
+		CompletionText: 'Get-ProvisionedAppSharedPackageContainer',
+		ListItemText: 'Get-ProvisionedAppSharedPackageContainer',
+		ResultType: 2,
+		ToolTip: 'Get-ProvisionedAppSharedPackageContainer'
+	},
+	{
+		CompletionText: 'Get-ProvisionedAppxPackage',
+		ListItemText: 'Get-ProvisionedAppxPackage',
+		ResultType: 2,
+		ToolTip: 'Get-ProvisionedAppxPackage'
+	},
+	{
+		CompletionText: 'Get-ProvisioningPackage',
+		ListItemText: 'Get-ProvisioningPackage',
+		ResultType: 2,
+		ToolTip: 'Get-ProvisioningPackage\\r\\n'
+	},
+	{
+		CompletionText: 'Get-PSBreakpoint',
+		ListItemText: 'Get-PSBreakpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-PSBreakpoint [[-Script] <string[]>] [-Runspace <runspace>] [<CommonParameters>]\\r\\n\\r\\nGet-PSBreakpoint -Command <string[]> [-Script <string[]>] [-Runspace <runspace>] [<CommonParameters>]\\r\\n\\r\\nGet-PSBreakpoint -Variable <string[]> [-Script <string[]>] [-Runspace <runspace>] [<CommonParameters>]\\r\\n\\r\\nGet-PSBreakpoint [-Type] <BreakpointType[]> [-Script <string[]>] [-Runspace <runspace>] [<CommonParameters>]\\r\\n\\r\\nGet-PSBreakpoint [-Id] <int[]> [-Runspace <runspace>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-PSCallStack',
+		ListItemText: 'Get-PSCallStack',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-PSCallStack [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-PSDrive',
+		ListItemText: 'Get-PSDrive',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-PSDrive [[-Name] <string[]>] [-Scope <string>] [-PSProvider <string[]>] [<CommonParameters>]\\r\\n\\r\\nGet-PSDrive [-LiteralName] <string[]> [-Scope <string>] [-PSProvider <string[]>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-PSHostProcessInfo',
+		ListItemText: 'Get-PSHostProcessInfo',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-PSHostProcessInfo [[-Name] <string[]>] [<CommonParameters>]\\r\\n\\r\\nGet-PSHostProcessInfo [-Process] <Process[]> [<CommonParameters>]\\r\\n\\r\\nGet-PSHostProcessInfo [-Id] <int[]> [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-PSProvider',
+		ListItemText: 'Get-PSProvider',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-PSProvider [[-PSProvider] <string[]>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-PSReadLineKeyHandler',
+		ListItemText: 'Get-PSReadLineKeyHandler',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-PSReadLineKeyHandler [-Bound] [-Unbound] [<CommonParameters>]\\r\\n\\r\\nGet-PSReadLineKeyHandler [-Chord] <string[]> [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-PSReadLineOption',
+		ListItemText: 'Get-PSReadLineOption',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-PSReadLineOption [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-PSRepository',
+		ListItemText: 'Get-PSRepository',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-PSRepository \\r\\n'
+	},
+	{
+		CompletionText: 'Get-PSResource',
+		ListItemText: 'Get-PSResource',
+		ResultType: 2,
+		ToolTip: 'Get-PSResource'
+	},
+	{
+		CompletionText: 'Get-PSResourceRepository',
+		ListItemText: 'Get-PSResourceRepository',
+		ResultType: 2,
+		ToolTip: 'Get-PSResourceRepository\\r\\n'
+	},
+	{
+		CompletionText: 'Get-PSScriptFileInfo',
+		ListItemText: 'Get-PSScriptFileInfo',
+		ResultType: 2,
+		ToolTip: 'Get-PSScriptFileInfo\\r\\n'
+	},
+	{
+		CompletionText: 'Get-PSSession',
+		ListItemText: 'Get-PSSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-PSSession [-Name <string[]>] [<CommonParameters>]\\r\\n\\r\\nGet-PSSession [-ComputerName] <string[]> [-ApplicationName <string>] [-ConfigurationName <string>] [-Name <string[]>] [-Credential <pscredential>] [-Authentication <AuthenticationMechanism>] [-CertificateThumbprint <string>] [-Port <int>] [-UseSSL] [-ThrottleLimit <int>] [-State <SessionFilterState>] [-SessionOption <PSSessionOption>] [<CommonParameters>]\\r\\n\\r\\nGet-PSSession [-ComputerName] <string[]> -InstanceId <guid[]> [-ApplicationName <string>] [-ConfigurationName <string>] [-Credential <pscredential>] [-Authentication <AuthenticationMechanism>] [-CertificateThumbprint <string>] [-Port <int>] [-UseSSL] [-ThrottleLimit <int>] [-State <SessionFilterState>] [-SessionOption <PSSessionOption>] [<CommonParameters>]\\r\\n\\r\\nGet-PSSession [-ConnectionUri] <uri[]> [-ConfigurationName <string>] [-AllowRedirection] [-Name <string[]>] [-Credential <pscredential>] [-Authentication <AuthenticationMechanism>] [-CertificateThumbprint <string>] [-ThrottleLimit <int>] [-State <SessionFilterState>] [-SessionOption <PSSessionOption>] [<CommonParameters>]\\r\\n\\r\\nGet-PSSession [-ConnectionUri] <uri[]> -InstanceId <guid[]> [-ConfigurationName <string>] [-AllowRedirection] [-Credential <pscredential>] [-Authentication <AuthenticationMechanism>] [-CertificateThumbprint <string>] [-ThrottleLimit <int>] [-State <SessionFilterState>] [-SessionOption <PSSessionOption>] [<CommonParameters>]\\r\\n\\r\\nGet-PSSession -ContainerId <string[]> [-ConfigurationName <string>] [-Name <string[]>] [-State <SessionFilterState>] [<CommonParameters>]\\r\\n\\r\\nGet-PSSession -InstanceId <guid[]> -ContainerId <string[]> [-ConfigurationName <string>] [-State <SessionFilterState>] [<CommonParameters>]\\r\\n\\r\\nGet-PSSession -VMId <guid[]> [-ConfigurationName <string>] [-Name <string[]>] [-State <SessionFilterState>] [<CommonParameters>]\\r\\n\\r\\nGet-PSSession -InstanceId <guid[]> -VMId <guid[]> [-ConfigurationName <string>] [-State <SessionFilterState>] [<CommonParameters>]\\r\\n\\r\\nGet-PSSession -VMName <string[]> [-ConfigurationName <string>] [-Name <string[]>] [-State <SessionFilterState>] [<CommonParameters>]\\r\\n\\r\\nGet-PSSession -InstanceId <guid[]> -VMName <string[]> [-ConfigurationName <string>] [-State <SessionFilterState>] [<CommonParameters>]\\r\\n\\r\\nGet-PSSession [-InstanceId <guid[]>] [<CommonParameters>]\\r\\n\\r\\nGet-PSSession [-Id] <int[]> [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-PSSessionCapability',
+		ListItemText: 'Get-PSSessionCapability',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-PSSessionCapability [-ConfigurationName] <string> [-Username] <string> [-Full] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-PSSessionConfiguration',
+		ListItemText: 'Get-PSSessionConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-PSSessionConfiguration [[-Name] <string[]>] [-Force] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-Random',
+		ListItemText: 'Get-Random',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-Random [[-Maximum] <Object>] [-SetSeed <int>] [-Minimum <Object>] [-Count <int>] [<CommonParameters>]\\r\\n\\r\\nGet-Random [-InputObject] <Object[]> [-SetSeed <int>] [-Count <int>] [<CommonParameters>]\\r\\n\\r\\nGet-Random [-InputObject] <Object[]> -Shuffle [-SetSeed <int>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-ResiliencySetting',
+		ListItemText: 'Get-ResiliencySetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-ResiliencySetting \\r\\n'
+	},
+	{
+		CompletionText: 'Get-Runspace',
+		ListItemText: 'Get-Runspace',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-Runspace [[-Name] <string[]>] [<CommonParameters>]\\r\\n\\r\\nGet-Runspace [-Id] <int[]> [<CommonParameters>]\\r\\n\\r\\nGet-Runspace [-InstanceId] <guid[]> [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-RunspaceDebug',
+		ListItemText: 'Get-RunspaceDebug',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-RunspaceDebug [[-RunspaceName] <string[]>] [<CommonParameters>]\\r\\n\\r\\nGet-RunspaceDebug [-Runspace] <runspace[]> [<CommonParameters>]\\r\\n\\r\\nGet-RunspaceDebug [-RunspaceId] <int[]> [<CommonParameters>]\\r\\n\\r\\nGet-RunspaceDebug [-RunspaceInstanceId] <guid[]> [<CommonParameters>]\\r\\n\\r\\nGet-RunspaceDebug [[-ProcessName] <string>] [[-AppDomainName] <string[]>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-ScheduledJob',
+		ListItemText: 'Get-ScheduledJob',
+		ResultType: 2,
+		ToolTip: 'Get-ScheduledJob\\r\\n'
+	},
+	{
+		CompletionText: 'Get-ScheduledJobOption',
+		ListItemText: 'Get-ScheduledJobOption',
+		ResultType: 2,
+		ToolTip: 'Get-ScheduledJobOption\\r\\n'
+	},
+	{
+		CompletionText: 'Get-ScheduledTask',
+		ListItemText: 'Get-ScheduledTask',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-ScheduledTask \\r\\n'
+	},
+	{
+		CompletionText: 'Get-ScheduledTaskInfo',
+		ListItemText: 'Get-ScheduledTaskInfo',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-ScheduledTaskInfo \\r\\n'
+	},
+	{
+		CompletionText: 'Get-SecureBootPolicy',
+		ListItemText: 'Get-SecureBootPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-SecureBootPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-SecureBootUEFI',
+		ListItemText: 'Get-SecureBootUEFI',
+		ResultType: 2,
+		ToolTip: 'Get-SecureBootUEFI\\r\\n'
+	},
+	{
+		CompletionText: 'Get-SecureRandom',
+		ListItemText: 'Get-SecureRandom',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-SecureRandom [[-Maximum] <Object>] [-Minimum <Object>] [-Count <int>] [<CommonParameters>]\\r\\n\\r\\nGet-SecureRandom [-InputObject] <Object[]> [-Count <int>] [<CommonParameters>]\\r\\n\\r\\nGet-SecureRandom [-InputObject] <Object[]> -Shuffle [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-Service',
+		ListItemText: 'Get-Service',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-Service [[-Name] <string[]>] [-DependentServices] [-RequiredServices] [-Include <string[]>] [-Exclude <string[]>] [<CommonParameters>]\\r\\n\\r\\nGet-Service -DisplayName <string[]> [-DependentServices] [-RequiredServices] [-Include <string[]>] [-Exclude <string[]>] [<CommonParameters>]\\r\\n\\r\\nGet-Service [-DependentServices] [-RequiredServices] [-Include <string[]>] [-Exclude <string[]>] [-InputObject <ServiceController[]>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-SmbBandWidthLimit',
+		ListItemText: 'Get-SmbBandWidthLimit',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-SmbBandWidthLimit \\r\\n'
+	},
+	{
+		CompletionText: 'Get-SmbClientAccessToServer',
+		ListItemText: 'Get-SmbClientAccessToServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-SmbClientAccessToServer \\r\\n'
+	},
+	{
+		CompletionText: 'Get-SmbClientCertificateMapping',
+		ListItemText: 'Get-SmbClientCertificateMapping',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-SmbClientCertificateMapping \\r\\n'
+	},
+	{
+		CompletionText: 'Get-SmbClientConfiguration',
+		ListItemText: 'Get-SmbClientConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-SmbClientConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Get-SmbClientNetworkInterface',
+		ListItemText: 'Get-SmbClientNetworkInterface',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-SmbClientNetworkInterface \\r\\n'
+	},
+	{
+		CompletionText: 'Get-SmbConnection',
+		ListItemText: 'Get-SmbConnection',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-SmbConnection \\r\\n'
+	},
+	{
+		CompletionText: 'Get-SmbDelegation',
+		ListItemText: 'Get-SmbDelegation',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-SmbDelegation \\r\\n'
+	},
+	{
+		CompletionText: 'Get-SmbGlobalMapping',
+		ListItemText: 'Get-SmbGlobalMapping',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-SmbGlobalMapping \\r\\n'
+	},
+	{
+		CompletionText: 'Get-SmbMapping',
+		ListItemText: 'Get-SmbMapping',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-SmbMapping \\r\\n'
+	},
+	{
+		CompletionText: 'Get-SmbMultichannelConnection',
+		ListItemText: 'Get-SmbMultichannelConnection',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-SmbMultichannelConnection \\r\\n'
+	},
+	{
+		CompletionText: 'Get-SmbMultichannelConstraint',
+		ListItemText: 'Get-SmbMultichannelConstraint',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-SmbMultichannelConstraint \\r\\n'
+	},
+	{
+		CompletionText: 'Get-SmbOpenFile',
+		ListItemText: 'Get-SmbOpenFile',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-SmbOpenFile \\r\\n'
+	},
+	{
+		CompletionText: 'Get-SmbServerCertificateMapping',
+		ListItemText: 'Get-SmbServerCertificateMapping',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-SmbServerCertificateMapping \\r\\n'
+	},
+	{
+		CompletionText: 'Get-SmbServerCertProps',
+		ListItemText: 'Get-SmbServerCertProps',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-SmbServerCertProps \\r\\n'
+	},
+	{
+		CompletionText: 'Get-SmbServerConfiguration',
+		ListItemText: 'Get-SmbServerConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-SmbServerConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Get-SmbServerNetworkInterface',
+		ListItemText: 'Get-SmbServerNetworkInterface',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-SmbServerNetworkInterface \\r\\n'
+	},
+	{
+		CompletionText: 'Get-SmbSession',
+		ListItemText: 'Get-SmbSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-SmbSession \\r\\n'
+	},
+	{
+		CompletionText: 'Get-SmbShare',
+		ListItemText: 'Get-SmbShare',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-SmbShare \\r\\n'
+	},
+	{
+		CompletionText: 'Get-SmbShareAccess',
+		ListItemText: 'Get-SmbShareAccess',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-SmbShareAccess \\r\\n'
+	},
+	{
+		CompletionText: 'Get-SmbWitnessClient',
+		ListItemText: 'Get-SmbWitnessClient',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-SmbWitnessClient \\r\\n'
+	},
+	{
+		CompletionText: 'Get-StartApps',
+		ListItemText: 'Get-StartApps',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-StartApps \\r\\n'
+	},
+	{
+		CompletionText: 'Get-StorageAdvancedProperty',
+		ListItemText: 'Get-StorageAdvancedProperty',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-StorageAdvancedProperty \\r\\n'
+	},
+	{
+		CompletionText: 'Get-StorageBusBinding',
+		ListItemText: 'Get-StorageBusBinding',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-StorageBusBinding \\r\\n'
+	},
+	{
+		CompletionText: 'Get-StorageBusCache',
+		ListItemText: 'Get-StorageBusCache',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-StorageBusCache \\r\\n'
+	},
+	{
+		CompletionText: 'Get-StorageBusClientDevice',
+		ListItemText: 'Get-StorageBusClientDevice',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-StorageBusClientDevice \\r\\n'
+	},
+	{
+		CompletionText: 'Get-StorageBusDisk',
+		ListItemText: 'Get-StorageBusDisk',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-StorageBusDisk \\r\\n'
+	},
+	{
+		CompletionText: 'Get-StorageBusTargetCacheStore',
+		ListItemText: 'Get-StorageBusTargetCacheStore',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-StorageBusTargetCacheStore \\r\\n'
+	},
+	{
+		CompletionText: 'Get-StorageBusTargetCacheStoresInstance',
+		ListItemText: 'Get-StorageBusTargetCacheStoresInstance',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-StorageBusTargetCacheStoresInstance \\r\\n'
+	},
+	{
+		CompletionText: 'Get-StorageBusTargetDevice',
+		ListItemText: 'Get-StorageBusTargetDevice',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-StorageBusTargetDevice \\r\\n'
+	},
+	{
+		CompletionText: 'Get-StorageBusTargetDeviceInstance',
+		ListItemText: 'Get-StorageBusTargetDeviceInstance',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-StorageBusTargetDeviceInstance \\r\\n'
+	},
+	{
+		CompletionText: 'Get-StorageChassis',
+		ListItemText: 'Get-StorageChassis',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-StorageChassis \\r\\n'
+	},
+	{
+		CompletionText: 'Get-StorageDataCollection',
+		ListItemText: 'Get-StorageDataCollection',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-StorageDataCollection \\r\\n'
+	},
+	{
+		CompletionText: 'Get-StorageDiagnosticInfo',
+		ListItemText: 'Get-StorageDiagnosticInfo',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-StorageDiagnosticInfo \\r\\n'
+	},
+	{
+		CompletionText: 'Get-StorageEnclosure',
+		ListItemText: 'Get-StorageEnclosure',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-StorageEnclosure \\r\\n'
+	},
+	{
+		CompletionText: 'Get-StorageEnclosureSNV',
+		ListItemText: 'Get-StorageEnclosureSNV',
+		ResultType: 2,
+		ToolTip: 'Get-StorageEnclosureSNV'
+	},
+	{
+		CompletionText: 'Get-StorageEnclosureStorageNodeView',
+		ListItemText: 'Get-StorageEnclosureStorageNodeView',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-StorageEnclosureStorageNodeView \\r\\n'
+	},
+	{
+		CompletionText: 'Get-StorageEnclosureVendorData',
+		ListItemText: 'Get-StorageEnclosureVendorData',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-StorageEnclosureVendorData \\r\\n'
+	},
+	{
+		CompletionText: 'Get-StorageExtendedStatus',
+		ListItemText: 'Get-StorageExtendedStatus',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-StorageExtendedStatus \\r\\n'
+	},
+	{
+		CompletionText: 'Get-StorageFaultDomain',
+		ListItemText: 'Get-StorageFaultDomain',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-StorageFaultDomain \\r\\n'
+	},
+	{
+		CompletionText: 'Get-StorageFileServer',
+		ListItemText: 'Get-StorageFileServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-StorageFileServer \\r\\n'
+	},
+	{
+		CompletionText: 'Get-StorageFirmwareInformation',
+		ListItemText: 'Get-StorageFirmwareInformation',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-StorageFirmwareInformation \\r\\n'
+	},
+	{
+		CompletionText: 'Get-StorageHealthAction',
+		ListItemText: 'Get-StorageHealthAction',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-StorageHealthAction \\r\\n'
+	},
+	{
+		CompletionText: 'Get-StorageHealthReport',
+		ListItemText: 'Get-StorageHealthReport',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-StorageHealthReport \\r\\n'
+	},
+	{
+		CompletionText: 'Get-StorageHealthSetting',
+		ListItemText: 'Get-StorageHealthSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-StorageHealthSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Get-StorageHistory',
+		ListItemText: 'Get-StorageHistory',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-StorageHistory \\r\\n'
+	},
+	{
+		CompletionText: 'Get-StorageJob',
+		ListItemText: 'Get-StorageJob',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-StorageJob \\r\\n'
+	},
+	{
+		CompletionText: 'Get-StorageNode',
+		ListItemText: 'Get-StorageNode',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-StorageNode \\r\\n'
+	},
+	{
+		CompletionText: 'Get-StoragePool',
+		ListItemText: 'Get-StoragePool',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-StoragePool \\r\\n'
+	},
+	{
+		CompletionText: 'Get-StorageProvider',
+		ListItemText: 'Get-StorageProvider',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-StorageProvider \\r\\n'
+	},
+	{
+		CompletionText: 'Get-StorageRack',
+		ListItemText: 'Get-StorageRack',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-StorageRack \\r\\n'
+	},
+	{
+		CompletionText: 'Get-StorageReliabilityCounter',
+		ListItemText: 'Get-StorageReliabilityCounter',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-StorageReliabilityCounter \\r\\n'
+	},
+	{
+		CompletionText: 'Get-StorageScaleUnit',
+		ListItemText: 'Get-StorageScaleUnit',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-StorageScaleUnit \\r\\n'
+	},
+	{
+		CompletionText: 'Get-StorageSetting',
+		ListItemText: 'Get-StorageSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-StorageSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Get-StorageSite',
+		ListItemText: 'Get-StorageSite',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-StorageSite \\r\\n'
+	},
+	{
+		CompletionText: 'Get-StorageSubSystem',
+		ListItemText: 'Get-StorageSubSystem',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-StorageSubSystem \\r\\n'
+	},
+	{
+		CompletionText: 'Get-StorageTier',
+		ListItemText: 'Get-StorageTier',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-StorageTier \\r\\n'
+	},
+	{
+		CompletionText: 'Get-StorageTierSupportedSize',
+		ListItemText: 'Get-StorageTierSupportedSize',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-StorageTierSupportedSize \\r\\n'
+	},
+	{
+		CompletionText: 'Get-SupportedClusterSizes',
+		ListItemText: 'Get-SupportedClusterSizes',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-SupportedClusterSizes \\r\\n'
+	},
+	{
+		CompletionText: 'Get-SupportedFileSystems',
+		ListItemText: 'Get-SupportedFileSystems',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-SupportedFileSystems \\r\\n'
+	},
+	{
+		CompletionText: 'Get-SystemDriver',
+		ListItemText: 'Get-SystemDriver',
+		ResultType: 2,
+		ToolTip: 'Get-SystemDriver\\r\\n'
+	},
+	{
+		CompletionText: 'Get-SystemLanguage',
+		ListItemText: 'Get-SystemLanguage',
+		ResultType: 2,
+		ToolTip: 'Get-SystemLanguage'
+	},
+	{
+		CompletionText: 'Get-SystemPreferredUILanguage',
+		ListItemText: 'Get-SystemPreferredUILanguage',
+		ResultType: 2,
+		ToolTip: 'Get-SystemPreferredUILanguage\\r\\n'
+	},
+	{
+		CompletionText: 'Get-TargetPort',
+		ListItemText: 'Get-TargetPort',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-TargetPort \\r\\n'
+	},
+	{
+		CompletionText: 'Get-TargetPortal',
+		ListItemText: 'Get-TargetPortal',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-TargetPortal \\r\\n'
+	},
+	{
+		CompletionText: 'Get-TestDriveItem',
+		ListItemText: 'Get-TestDriveItem',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-TestDriveItem \\r\\n'
+	},
+	{
+		CompletionText: 'Get-TimeZone',
+		ListItemText: 'Get-TimeZone',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-TimeZone [[-Name] <string[]>] [<CommonParameters>]\\r\\n\\r\\nGet-TimeZone -Id <string[]> [<CommonParameters>]\\r\\n\\r\\nGet-TimeZone -ListAvailable [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-TlsCipherSuite',
+		ListItemText: 'Get-TlsCipherSuite',
+		ResultType: 2,
+		ToolTip: 'Get-TlsCipherSuite\\r\\n'
+	},
+	{
+		CompletionText: 'Get-TlsEccCurve',
+		ListItemText: 'Get-TlsEccCurve',
+		ResultType: 2,
+		ToolTip: 'Get-TlsEccCurve\\r\\n'
+	},
+	{
+		CompletionText: 'Get-Tpm',
+		ListItemText: 'Get-Tpm',
+		ResultType: 2,
+		ToolTip: 'Get-Tpm\\r\\n'
+	},
+	{
+		CompletionText: 'Get-TpmEndorsementKeyInfo',
+		ListItemText: 'Get-TpmEndorsementKeyInfo',
+		ResultType: 2,
+		ToolTip: 'Get-TpmEndorsementKeyInfo\\r\\n'
+	},
+	{
+		CompletionText: 'Get-TpmSupportedFeature',
+		ListItemText: 'Get-TpmSupportedFeature',
+		ResultType: 2,
+		ToolTip: 'Get-TpmSupportedFeature\\r\\n'
+	},
+	{
+		CompletionText: 'Get-TraceSource',
+		ListItemText: 'Get-TraceSource',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-TraceSource [[-Name] <string[]>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-TroubleshootingPack',
+		ListItemText: 'Get-TroubleshootingPack',
+		ResultType: 2,
+		ToolTip: 'Get-TroubleshootingPack\\r\\n'
+	},
+	{
+		CompletionText: 'Get-TrustedProvisioningCertificate',
+		ListItemText: 'Get-TrustedProvisioningCertificate',
+		ResultType: 2,
+		ToolTip: 'Get-TrustedProvisioningCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Get-TypeData',
+		ListItemText: 'Get-TypeData',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-TypeData [[-TypeName] <string[]>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-UICulture',
+		ListItemText: 'Get-UICulture',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-UICulture [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-Unique',
+		ListItemText: 'Get-Unique',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-Unique [-InputObject <psobject>] [-AsString] [-CaseInsensitive] [<CommonParameters>]\\r\\n\\r\\nGet-Unique [-InputObject <psobject>] [-OnType] [-CaseInsensitive] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-Uptime',
+		ListItemText: 'Get-Uptime',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-Uptime [<CommonParameters>]\\r\\n\\r\\nGet-Uptime [-Since] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-UsageAggregates',
+		ListItemText: 'Get-UsageAggregates',
+		ResultType: 2,
+		ToolTip: 'Get-UsageAggregates\\r\\n'
+	},
+	{
+		CompletionText: 'Get-Variable',
+		ListItemText: 'Get-Variable',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-Variable [[-Name] <string[]>] [-ValueOnly] [-Include <string[]>] [-Exclude <string[]>] [-Scope <string>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-Verb',
+		ListItemText: 'Get-Verb',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-Verb [[-Verb] <string[]>] [[-Group] <string[]>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VHD',
+		ListItemText: 'Get-VHD',
+		ResultType: 2,
+		ToolTip: 'Get-VHD\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VHDSet',
+		ListItemText: 'Get-VHDSet',
+		ResultType: 2,
+		ToolTip: 'Get-VHDSet\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VHDSnapshot',
+		ListItemText: 'Get-VHDSnapshot',
+		ResultType: 2,
+		ToolTip: 'Get-VHDSnapshot\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VirtualDisk',
+		ListItemText: 'Get-VirtualDisk',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-VirtualDisk \\r\\n'
+	},
+	{
+		CompletionText: 'Get-VirtualDiskSupportedSize',
+		ListItemText: 'Get-VirtualDiskSupportedSize',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-VirtualDiskSupportedSize \\r\\n'
+	},
+	{
+		CompletionText: 'Get-VM',
+		ListItemText: 'Get-VM',
+		ResultType: 2,
+		ToolTip: 'Get-VM\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMAssignableDevice',
+		ListItemText: 'Get-VMAssignableDevice',
+		ResultType: 2,
+		ToolTip: 'Get-VMAssignableDevice\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMBios',
+		ListItemText: 'Get-VMBios',
+		ResultType: 2,
+		ToolTip: 'Get-VMBios\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMCheckpoint',
+		ListItemText: 'Get-VMCheckpoint',
+		ResultType: 2,
+		ToolTip: 'Get-VMCheckpoint'
+	},
+	{
+		CompletionText: 'Get-VMComPort',
+		ListItemText: 'Get-VMComPort',
+		ResultType: 2,
+		ToolTip: 'Get-VMComPort\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMConnectAccess',
+		ListItemText: 'Get-VMConnectAccess',
+		ResultType: 2,
+		ToolTip: 'Get-VMConnectAccess\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMDirectVirtualDisk',
+		ListItemText: 'Get-VMDirectVirtualDisk',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-VMDirectVirtualDisk \\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMDvdDrive',
+		ListItemText: 'Get-VMDvdDrive',
+		ResultType: 2,
+		ToolTip: 'Get-VMDvdDrive\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMFibreChannelHba',
+		ListItemText: 'Get-VMFibreChannelHba',
+		ResultType: 2,
+		ToolTip: 'Get-VMFibreChannelHba\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMFirmware',
+		ListItemText: 'Get-VMFirmware',
+		ResultType: 2,
+		ToolTip: 'Get-VMFirmware\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMFloppyDiskDrive',
+		ListItemText: 'Get-VMFloppyDiskDrive',
+		ResultType: 2,
+		ToolTip: 'Get-VMFloppyDiskDrive\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMGpuPartitionAdapter',
+		ListItemText: 'Get-VMGpuPartitionAdapter',
+		ResultType: 2,
+		ToolTip: 'Get-VMGpuPartitionAdapter\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMGroup',
+		ListItemText: 'Get-VMGroup',
+		ResultType: 2,
+		ToolTip: 'Get-VMGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMHardDiskDrive',
+		ListItemText: 'Get-VMHardDiskDrive',
+		ResultType: 2,
+		ToolTip: 'Get-VMHardDiskDrive\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMHost',
+		ListItemText: 'Get-VMHost',
+		ResultType: 2,
+		ToolTip: 'Get-VMHost\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMHostAssignableDevice',
+		ListItemText: 'Get-VMHostAssignableDevice',
+		ResultType: 2,
+		ToolTip: 'Get-VMHostAssignableDevice\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMHostCluster',
+		ListItemText: 'Get-VMHostCluster',
+		ResultType: 2,
+		ToolTip: 'Get-VMHostCluster\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMHostNumaNode',
+		ListItemText: 'Get-VMHostNumaNode',
+		ResultType: 2,
+		ToolTip: 'Get-VMHostNumaNode\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMHostNumaNodeStatus',
+		ListItemText: 'Get-VMHostNumaNodeStatus',
+		ResultType: 2,
+		ToolTip: 'Get-VMHostNumaNodeStatus\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMHostPartitionableGpu',
+		ListItemText: 'Get-VMHostPartitionableGpu',
+		ResultType: 2,
+		ToolTip: 'Get-VMHostPartitionableGpu\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMHostSupportedVersion',
+		ListItemText: 'Get-VMHostSupportedVersion',
+		ResultType: 2,
+		ToolTip: 'Get-VMHostSupportedVersion\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMIdeController',
+		ListItemText: 'Get-VMIdeController',
+		ResultType: 2,
+		ToolTip: 'Get-VMIdeController\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMIntegrationService',
+		ListItemText: 'Get-VMIntegrationService',
+		ResultType: 2,
+		ToolTip: 'Get-VMIntegrationService\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMKeyProtector',
+		ListItemText: 'Get-VMKeyProtector',
+		ResultType: 2,
+		ToolTip: 'Get-VMKeyProtector\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMKeyStorageDrive',
+		ListItemText: 'Get-VMKeyStorageDrive',
+		ResultType: 2,
+		ToolTip: 'Get-VMKeyStorageDrive\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMMemory',
+		ListItemText: 'Get-VMMemory',
+		ResultType: 2,
+		ToolTip: 'Get-VMMemory\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMMigrationNetwork',
+		ListItemText: 'Get-VMMigrationNetwork',
+		ResultType: 2,
+		ToolTip: 'Get-VMMigrationNetwork\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMNetworkAdapter',
+		ListItemText: 'Get-VMNetworkAdapter',
+		ResultType: 2,
+		ToolTip: 'Get-VMNetworkAdapter\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMNetworkAdapterAcl',
+		ListItemText: 'Get-VMNetworkAdapterAcl',
+		ResultType: 2,
+		ToolTip: 'Get-VMNetworkAdapterAcl\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMNetworkAdapterExtendedAcl',
+		ListItemText: 'Get-VMNetworkAdapterExtendedAcl',
+		ResultType: 2,
+		ToolTip: 'Get-VMNetworkAdapterExtendedAcl\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMNetworkAdapterFailoverConfiguration',
+		ListItemText: 'Get-VMNetworkAdapterFailoverConfiguration',
+		ResultType: 2,
+		ToolTip: 'Get-VMNetworkAdapterFailoverConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMNetworkAdapterIsolation',
+		ListItemText: 'Get-VMNetworkAdapterIsolation',
+		ResultType: 2,
+		ToolTip: 'Get-VMNetworkAdapterIsolation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMNetworkAdapterRdma',
+		ListItemText: 'Get-VMNetworkAdapterRdma',
+		ResultType: 2,
+		ToolTip: 'Get-VMNetworkAdapterRdma\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMNetworkAdapterRoutingDomainMapping',
+		ListItemText: 'Get-VMNetworkAdapterRoutingDomainMapping',
+		ResultType: 2,
+		ToolTip: 'Get-VMNetworkAdapterRoutingDomainMapping\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMNetworkAdapterTeamMapping',
+		ListItemText: 'Get-VMNetworkAdapterTeamMapping',
+		ResultType: 2,
+		ToolTip: 'Get-VMNetworkAdapterTeamMapping\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMNetworkAdapterVlan',
+		ListItemText: 'Get-VMNetworkAdapterVlan',
+		ResultType: 2,
+		ToolTip: 'Get-VMNetworkAdapterVlan\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMPartitionableGpu',
+		ListItemText: 'Get-VMPartitionableGpu',
+		ResultType: 2,
+		ToolTip: 'Get-VMPartitionableGpu\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMPmemController',
+		ListItemText: 'Get-VMPmemController',
+		ResultType: 2,
+		ToolTip: 'Get-VMPmemController\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMProcessor',
+		ListItemText: 'Get-VMProcessor',
+		ResultType: 2,
+		ToolTip: 'Get-VMProcessor\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMRemoteFx3dVideoAdapter',
+		ListItemText: 'Get-VMRemoteFx3dVideoAdapter',
+		ResultType: 2,
+		ToolTip: 'Get-VMRemoteFx3dVideoAdapter\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMRemoteFXPhysicalVideoAdapter',
+		ListItemText: 'Get-VMRemoteFXPhysicalVideoAdapter',
+		ResultType: 2,
+		ToolTip: 'Get-VMRemoteFXPhysicalVideoAdapter\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMReplication',
+		ListItemText: 'Get-VMReplication',
+		ResultType: 2,
+		ToolTip: 'Get-VMReplication\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMReplicationAuthorizationEntry',
+		ListItemText: 'Get-VMReplicationAuthorizationEntry',
+		ResultType: 2,
+		ToolTip: 'Get-VMReplicationAuthorizationEntry\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMReplicationServer',
+		ListItemText: 'Get-VMReplicationServer',
+		ResultType: 2,
+		ToolTip: 'Get-VMReplicationServer\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMResourcePool',
+		ListItemText: 'Get-VMResourcePool',
+		ResultType: 2,
+		ToolTip: 'Get-VMResourcePool\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMSan',
+		ListItemText: 'Get-VMSan',
+		ResultType: 2,
+		ToolTip: 'Get-VMSan\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMScsiController',
+		ListItemText: 'Get-VMScsiController',
+		ResultType: 2,
+		ToolTip: 'Get-VMScsiController\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMSecurity',
+		ListItemText: 'Get-VMSecurity',
+		ResultType: 2,
+		ToolTip: 'Get-VMSecurity\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMSnapshot',
+		ListItemText: 'Get-VMSnapshot',
+		ResultType: 2,
+		ToolTip: 'Get-VMSnapshot\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMStoragePath',
+		ListItemText: 'Get-VMStoragePath',
+		ResultType: 2,
+		ToolTip: 'Get-VMStoragePath\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMStorageSettings',
+		ListItemText: 'Get-VMStorageSettings',
+		ResultType: 2,
+		ToolTip: 'Get-VMStorageSettings\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMSwitch',
+		ListItemText: 'Get-VMSwitch',
+		ResultType: 2,
+		ToolTip: 'Get-VMSwitch\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMSwitchExtension',
+		ListItemText: 'Get-VMSwitchExtension',
+		ResultType: 2,
+		ToolTip: 'Get-VMSwitchExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMSwitchExtensionPortData',
+		ListItemText: 'Get-VMSwitchExtensionPortData',
+		ResultType: 2,
+		ToolTip: 'Get-VMSwitchExtensionPortData\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMSwitchExtensionPortFeature',
+		ListItemText: 'Get-VMSwitchExtensionPortFeature',
+		ResultType: 2,
+		ToolTip: 'Get-VMSwitchExtensionPortFeature\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMSwitchExtensionSwitchData',
+		ListItemText: 'Get-VMSwitchExtensionSwitchData',
+		ResultType: 2,
+		ToolTip: 'Get-VMSwitchExtensionSwitchData\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMSwitchExtensionSwitchFeature',
+		ListItemText: 'Get-VMSwitchExtensionSwitchFeature',
+		ResultType: 2,
+		ToolTip: 'Get-VMSwitchExtensionSwitchFeature\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMSwitchTeam',
+		ListItemText: 'Get-VMSwitchTeam',
+		ResultType: 2,
+		ToolTip: 'Get-VMSwitchTeam\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMSystemSwitchExtension',
+		ListItemText: 'Get-VMSystemSwitchExtension',
+		ResultType: 2,
+		ToolTip: 'Get-VMSystemSwitchExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMSystemSwitchExtensionPortFeature',
+		ListItemText: 'Get-VMSystemSwitchExtensionPortFeature',
+		ResultType: 2,
+		ToolTip: 'Get-VMSystemSwitchExtensionPortFeature\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMSystemSwitchExtensionSwitchFeature',
+		ListItemText: 'Get-VMSystemSwitchExtensionSwitchFeature',
+		ResultType: 2,
+		ToolTip: 'Get-VMSystemSwitchExtensionSwitchFeature\\r\\n'
+	},
+	{
+		CompletionText: 'Get-VMVideo',
+		ListItemText: 'Get-VMVideo',
+		ResultType: 2,
+		ToolTip: 'Get-VMVideo\\r\\n'
+	},
+	{
+		CompletionText: 'Get-Volume',
+		ListItemText: 'Get-Volume',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-Volume \\r\\n'
+	},
+	{
+		CompletionText: 'Get-VolumeCorruptionCount',
+		ListItemText: 'Get-VolumeCorruptionCount',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-VolumeCorruptionCount \\r\\n'
+	},
+	{
+		CompletionText: 'Get-VolumeScrubPolicy',
+		ListItemText: 'Get-VolumeScrubPolicy',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-VolumeScrubPolicy \\r\\n'
+	},
+	{
+		CompletionText: 'Get-VpnConnection',
+		ListItemText: 'Get-VpnConnection',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-VpnConnection \\r\\n'
+	},
+	{
+		CompletionText: 'Get-VpnConnectionTrigger',
+		ListItemText: 'Get-VpnConnectionTrigger',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-VpnConnectionTrigger \\r\\n'
+	},
+	{
+		CompletionText: 'Get-WdacBidTrace',
+		ListItemText: 'Get-WdacBidTrace',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-WdacBidTrace \\r\\n'
+	},
+	{
+		CompletionText: 'Get-WheaMemoryPolicy',
+		ListItemText: 'Get-WheaMemoryPolicy',
+		ResultType: 2,
+		ToolTip: 'Get-WheaMemoryPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Get-WIMBootEntry',
+		ListItemText: 'Get-WIMBootEntry',
+		ResultType: 2,
+		ToolTip: 'Get-WIMBootEntry\\r\\n'
+	},
+	{
+		CompletionText: 'Get-WinAcceptLanguageFromLanguageListOptOut',
+		ListItemText: 'Get-WinAcceptLanguageFromLanguageListOptOut',
+		ResultType: 2,
+		ToolTip: 'Get-WinAcceptLanguageFromLanguageListOptOut\\r\\n'
+	},
+	{
+		CompletionText: 'Get-WinCultureFromLanguageListOptOut',
+		ListItemText: 'Get-WinCultureFromLanguageListOptOut',
+		ResultType: 2,
+		ToolTip: 'Get-WinCultureFromLanguageListOptOut\\r\\n'
+	},
+	{
+		CompletionText: 'Get-WinDefaultInputMethodOverride',
+		ListItemText: 'Get-WinDefaultInputMethodOverride',
+		ResultType: 2,
+		ToolTip: 'Get-WinDefaultInputMethodOverride\\r\\n'
+	},
+	{
+		CompletionText: 'Get-WindowsCapability',
+		ListItemText: 'Get-WindowsCapability',
+		ResultType: 2,
+		ToolTip: 'Get-WindowsCapability\\r\\n'
+	},
+	{
+		CompletionText: 'Get-WindowsDeveloperLicense',
+		ListItemText: 'Get-WindowsDeveloperLicense',
+		ResultType: 2,
+		ToolTip: 'Get-WindowsDeveloperLicense\\r\\n'
+	},
+	{
+		CompletionText: 'Get-WindowsDriver',
+		ListItemText: 'Get-WindowsDriver',
+		ResultType: 2,
+		ToolTip: 'Get-WindowsDriver\\r\\n'
+	},
+	{
+		CompletionText: 'Get-WindowsEdition',
+		ListItemText: 'Get-WindowsEdition',
+		ResultType: 2,
+		ToolTip: 'Get-WindowsEdition\\r\\n'
+	},
+	{
+		CompletionText: 'Get-WindowsErrorReporting',
+		ListItemText: 'Get-WindowsErrorReporting',
+		ResultType: 2,
+		ToolTip: 'Get-WindowsErrorReporting\\r\\n'
+	},
+	{
+		CompletionText: 'Get-WindowsImage',
+		ListItemText: 'Get-WindowsImage',
+		ResultType: 2,
+		ToolTip: 'Get-WindowsImage\\r\\n'
+	},
+	{
+		CompletionText: 'Get-WindowsImageContent',
+		ListItemText: 'Get-WindowsImageContent',
+		ResultType: 2,
+		ToolTip: 'Get-WindowsImageContent\\r\\n'
+	},
+	{
+		CompletionText: 'Get-WindowsOptionalFeature',
+		ListItemText: 'Get-WindowsOptionalFeature',
+		ResultType: 2,
+		ToolTip: 'Get-WindowsOptionalFeature\\r\\n'
+	},
+	{
+		CompletionText: 'Get-WindowsPackage',
+		ListItemText: 'Get-WindowsPackage',
+		ResultType: 2,
+		ToolTip: 'Get-WindowsPackage\\r\\n'
+	},
+	{
+		CompletionText: 'Get-WindowsReservedStorageState',
+		ListItemText: 'Get-WindowsReservedStorageState',
+		ResultType: 2,
+		ToolTip: 'Get-WindowsReservedStorageState\\r\\n'
+	},
+	{
+		CompletionText: 'Get-WindowsSearchSetting',
+		ListItemText: 'Get-WindowsSearchSetting',
+		ResultType: 2,
+		ToolTip: 'Get-WindowsSearchSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Get-WindowsUpdateLog',
+		ListItemText: 'Get-WindowsUpdateLog',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-WindowsUpdateLog \\r\\n'
+	},
+	{
+		CompletionText: 'Get-WinEvent',
+		ListItemText: 'Get-WinEvent',
+		ResultType: 2,
+		ToolTip: 'Get-WinEvent\\r\\n'
+	},
+	{
+		CompletionText: 'Get-WinHomeLocation',
+		ListItemText: 'Get-WinHomeLocation',
+		ResultType: 2,
+		ToolTip: 'Get-WinHomeLocation\\r\\n'
+	},
+	{
+		CompletionText: 'Get-WinhttpProxy',
+		ListItemText: 'Get-WinhttpProxy',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-WinhttpProxy \\r\\n'
+	},
+	{
+		CompletionText: 'Get-WinLanguageBarOption',
+		ListItemText: 'Get-WinLanguageBarOption',
+		ResultType: 2,
+		ToolTip: 'Get-WinLanguageBarOption\\r\\n'
+	},
+	{
+		CompletionText: 'Get-WinSystemLocale',
+		ListItemText: 'Get-WinSystemLocale',
+		ResultType: 2,
+		ToolTip: 'Get-WinSystemLocale\\r\\n'
+	},
+	{
+		CompletionText: 'Get-WinUILanguageOverride',
+		ListItemText: 'Get-WinUILanguageOverride',
+		ResultType: 2,
+		ToolTip: 'Get-WinUILanguageOverride\\r\\n'
+	},
+	{
+		CompletionText: 'Get-WinUserLanguageList',
+		ListItemText: 'Get-WinUserLanguageList',
+		ResultType: 2,
+		ToolTip: 'Get-WinUserLanguageList\\r\\n'
+	},
+	{
+		CompletionText: 'Get-WSManCredSSP',
+		ListItemText: 'Get-WSManCredSSP',
+		ResultType: 2,
+		ToolTip: 'Get-WSManCredSSP\\r\\n'
+	},
+	{
+		CompletionText: 'Get-WSManInstance',
+		ListItemText: 'Get-WSManInstance',
+		ResultType: 2,
+		ToolTip: 'Get-WSManInstance\\r\\n'
+	},
+	{
+		CompletionText: 'getmac.exe',
+		ListItemText: 'getmac.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\getmac.exe'
+	},
+	{
+		CompletionText: 'gh.exe',
+		ListItemText: 'gh.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\GitHub CLI\\gh.exe'
+	},
+	{
+		CompletionText: 'ghy',
+		ListItemText: 'ghy',
+		ResultType: 2,
+		ToolTip: 'Get-History'
+	},
+	{
+		CompletionText: 'gi',
+		ListItemText: 'gi',
+		ResultType: 2,
+		ToolTip: 'Get-Item'
+	},
+	{
+		CompletionText: 'gin',
+		ListItemText: 'gin',
+		ResultType: 2,
+		ToolTip: 'Get-ComputerInfo'
+	},
+	{
+		CompletionText: 'gip',
+		ListItemText: 'gip',
+		ResultType: 2,
+		ToolTip: 'gip'
+	},
+	{
+		CompletionText: 'git-gui.exe',
+		ListItemText: 'git-gui.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Git\\cmd\\git-gui.exe'
+	},
+	{
+		CompletionText: 'git-lfs.exe',
+		ListItemText: 'git-lfs.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Git LFS\\git-lfs.exe'
+	},
+	{
+		CompletionText: 'git-receive-pack.exe',
+		ListItemText: 'git-receive-pack.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Git\\cmd\\git-receive-pack.exe'
+	},
+	{
+		CompletionText: 'git-upload-pack.exe',
+		ListItemText: 'git-upload-pack.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Git\\cmd\\git-upload-pack.exe'
+	},
+	{
+		CompletionText: 'git.exe',
+		ListItemText: 'git.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Git\\cmd\\git.exe'
+	},
+	{
+		CompletionText: 'gitk.exe',
+		ListItemText: 'gitk.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Git\\cmd\\gitk.exe'
+	},
+	{
+		CompletionText: 'gjb',
+		ListItemText: 'gjb',
+		ResultType: 2,
+		ToolTip: 'Get-Job'
+	},
+	{
+		CompletionText: 'gl',
+		ListItemText: 'gl',
+		ResultType: 2,
+		ToolTip: 'Get-Location'
+	},
+	{
+		CompletionText: 'glcm',
+		ListItemText: 'glcm',
+		ResultType: 2,
+		ToolTip: 'glcm'
+	},
+	{
+		CompletionText: 'glg',
+		ListItemText: 'glg',
+		ResultType: 2,
+		ToolTip: 'glg'
+	},
+	{
+		CompletionText: 'glgm',
+		ListItemText: 'glgm',
+		ResultType: 2,
+		ToolTip: 'glgm'
+	},
+	{
+		CompletionText: 'glu',
+		ListItemText: 'glu',
+		ResultType: 2,
+		ToolTip: 'glu'
+	},
+	{
+		CompletionText: 'gm',
+		ListItemText: 'gm',
+		ResultType: 2,
+		ToolTip: 'Get-Member'
+	},
+	{
+		CompletionText: 'gmo',
+		ListItemText: 'gmo',
+		ResultType: 2,
+		ToolTip: 'Get-Module'
+	},
+	{
+		CompletionText: 'gp',
+		ListItemText: 'gp',
+		ResultType: 2,
+		ToolTip: 'Get-ItemProperty'
+	},
+	{
+		CompletionText: 'gpedit.msc',
+		ListItemText: 'gpedit.msc',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\gpedit.msc'
+	},
+	{
+		CompletionText: 'gpg-agent.exe',
+		ListItemText: 'gpg-agent.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files (x86)\\Gpg4win\\..\\GnuPG\\bin\\gpg-agent.exe'
+	},
+	{
+		CompletionText: 'gpg-card.exe',
+		ListItemText: 'gpg-card.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files (x86)\\Gpg4win\\..\\GnuPG\\bin\\gpg-card.exe'
+	},
+	{
+		CompletionText: 'gpg-check-pattern.exe',
+		ListItemText: 'gpg-check-pattern.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files (x86)\\Gpg4win\\..\\GnuPG\\bin\\gpg-check-pattern.exe'
+	},
+	{
+		CompletionText: 'gpg-connect-agent.exe',
+		ListItemText: 'gpg-connect-agent.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files (x86)\\Gpg4win\\..\\GnuPG\\bin\\gpg-connect-agent.exe'
+	},
+	{
+		CompletionText: 'gpg-disable-keyboxd.bat',
+		ListItemText: 'gpg-disable-keyboxd.bat',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files (x86)\\Gpg4win\\..\\GnuPG\\bin\\gpg-disable-keyboxd.bat'
+	},
+	{
+		CompletionText: 'gpg-enable-keyboxd.bat',
+		ListItemText: 'gpg-enable-keyboxd.bat',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files (x86)\\Gpg4win\\..\\GnuPG\\bin\\gpg-enable-keyboxd.bat'
+	},
+	{
+		CompletionText: 'gpg-preset-passphrase.exe',
+		ListItemText: 'gpg-preset-passphrase.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files (x86)\\Gpg4win\\..\\GnuPG\\bin\\gpg-preset-passphrase.exe'
+	},
+	{
+		CompletionText: 'gpg-wks-client.exe',
+		ListItemText: 'gpg-wks-client.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files (x86)\\Gpg4win\\..\\GnuPG\\bin\\gpg-wks-client.exe'
+	},
+	{
+		CompletionText: 'gpg.exe',
+		ListItemText: 'gpg.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files (x86)\\Gpg4win\\..\\GnuPG\\bin\\gpg.exe'
+	},
+	{
+		CompletionText: 'gpgconf.exe',
+		ListItemText: 'gpgconf.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files (x86)\\Gpg4win\\..\\GnuPG\\bin\\gpgconf.exe'
+	},
+	{
+		CompletionText: 'gpgme-w32spawn.exe',
+		ListItemText: 'gpgme-w32spawn.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files (x86)\\Gpg4win\\..\\GnuPG\\bin\\gpgme-w32spawn.exe'
+	},
+	{
+		CompletionText: 'gpgsm.exe',
+		ListItemText: 'gpgsm.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files (x86)\\Gpg4win\\..\\GnuPG\\bin\\gpgsm.exe'
+	},
+	{
+		CompletionText: 'gpgtar.exe',
+		ListItemText: 'gpgtar.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files (x86)\\Gpg4win\\..\\GnuPG\\bin\\gpgtar.exe'
+	},
+	{
+		CompletionText: 'gpgv.exe',
+		ListItemText: 'gpgv.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files (x86)\\Gpg4win\\..\\GnuPG\\bin\\gpgv.exe'
+	},
+	{
+		CompletionText: 'gpresult.exe',
+		ListItemText: 'gpresult.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\gpresult.exe'
+	},
+	{
+		CompletionText: 'gps',
+		ListItemText: 'gps',
+		ResultType: 2,
+		ToolTip: 'Get-Process'
+	},
+	{
+		CompletionText: 'gpscript.exe',
+		ListItemText: 'gpscript.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\gpscript.exe'
+	},
+	{
+		CompletionText: 'gpupdate.exe',
+		ListItemText: 'gpupdate.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\gpupdate.exe'
+	},
+	{
+		CompletionText: 'gpv',
+		ListItemText: 'gpv',
+		ResultType: 2,
+		ToolTip: 'Get-ItemPropertyValue'
+	},
+	{
+		CompletionText: 'Grant-AzDataShareSubscriptionAccess',
+		ListItemText: 'Grant-AzDataShareSubscriptionAccess',
+		ResultType: 2,
+		ToolTip: 'Grant-AzDataShareSubscriptionAccess\\r\\n'
+	},
+	{
+		CompletionText: 'Grant-AzDiskAccess',
+		ListItemText: 'Grant-AzDiskAccess',
+		ResultType: 2,
+		ToolTip: 'Grant-AzDiskAccess\\r\\n'
+	},
+	{
+		CompletionText: 'Grant-AzEventGridPartnerConfiguration',
+		ListItemText: 'Grant-AzEventGridPartnerConfiguration',
+		ResultType: 2,
+		ToolTip: 'Grant-AzEventGridPartnerConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Grant-AzSnapshotAccess',
+		ListItemText: 'Grant-AzSnapshotAccess',
+		ResultType: 2,
+		ToolTip: 'Grant-AzSnapshotAccess\\r\\n'
+	},
+	{
+		CompletionText: 'Grant-FileShareAccess',
+		ListItemText: 'Grant-FileShareAccess',
+		ResultType: 2,
+		ToolTip: '\\r\\nGrant-FileShareAccess \\r\\n'
+	},
+	{
+		CompletionText: 'Grant-HgsKeyProtectorAccess',
+		ListItemText: 'Grant-HgsKeyProtectorAccess',
+		ResultType: 2,
+		ToolTip: '\\r\\nGrant-HgsKeyProtectorAccess \\r\\n'
+	},
+	{
+		CompletionText: 'Grant-SmbClientAccessToServer',
+		ListItemText: 'Grant-SmbClientAccessToServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nGrant-SmbClientAccessToServer \\r\\n'
+	},
+	{
+		CompletionText: 'Grant-SmbShareAccess',
+		ListItemText: 'Grant-SmbShareAccess',
+		ResultType: 2,
+		ToolTip: '\\r\\nGrant-SmbShareAccess \\r\\n'
+	},
+	{
+		CompletionText: 'Grant-VMConnectAccess',
+		ListItemText: 'Grant-VMConnectAccess',
+		ResultType: 2,
+		ToolTip: 'Grant-VMConnectAccess\\r\\n'
+	},
+	{
+		CompletionText: 'group',
+		ListItemText: 'group',
+		ResultType: 2,
+		ToolTip: 'Group-Object'
+	},
+	{
+		CompletionText: 'Group-Object',
+		ListItemText: 'Group-Object',
+		ResultType: 2,
+		ToolTip: '\\r\\nGroup-Object [[-Property] <Object[]>] [-NoElement] [-AsHashTable] [-AsString] [-InputObject <psobject>] [-Culture <string>] [-CaseSensitive] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'grpconv.exe',
+		ListItemText: 'grpconv.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\grpconv.exe'
+	},
+	{
+		CompletionText: 'grsmba',
+		ListItemText: 'grsmba',
+		ResultType: 2,
+		ToolTip: 'grsmba'
+	},
+	{
+		CompletionText: 'grsmbclas',
+		ListItemText: 'grsmbclas',
+		ResultType: 2,
+		ToolTip: 'grsmbclas'
+	},
+	{
+		CompletionText: 'gsmba',
+		ListItemText: 'gsmba',
+		ResultType: 2,
+		ToolTip: 'gsmba'
+	},
+	{
+		CompletionText: 'gsmbb',
+		ListItemText: 'gsmbb',
+		ResultType: 2,
+		ToolTip: 'gsmbb'
+	},
+	{
+		CompletionText: 'gsmbc',
+		ListItemText: 'gsmbc',
+		ResultType: 2,
+		ToolTip: 'gsmbc'
+	},
+	{
+		CompletionText: 'gsmbcc',
+		ListItemText: 'gsmbcc',
+		ResultType: 2,
+		ToolTip: 'gsmbcc'
+	},
+	{
+		CompletionText: 'gsmbccm',
+		ListItemText: 'gsmbccm',
+		ResultType: 2,
+		ToolTip: 'gsmbccm'
+	},
+	{
+		CompletionText: 'gsmbclas',
+		ListItemText: 'gsmbclas',
+		ResultType: 2,
+		ToolTip: 'gsmbclas'
+	},
+	{
+		CompletionText: 'gsmbcn',
+		ListItemText: 'gsmbcn',
+		ResultType: 2,
+		ToolTip: 'gsmbcn'
+	},
+	{
+		CompletionText: 'gsmbd',
+		ListItemText: 'gsmbd',
+		ResultType: 2,
+		ToolTip: 'gsmbd'
+	},
+	{
+		CompletionText: 'gsmbgm',
+		ListItemText: 'gsmbgm',
+		ResultType: 2,
+		ToolTip: 'gsmbgm'
+	},
+	{
+		CompletionText: 'gsmbm',
+		ListItemText: 'gsmbm',
+		ResultType: 2,
+		ToolTip: 'gsmbm'
+	},
+	{
+		CompletionText: 'gsmbmc',
+		ListItemText: 'gsmbmc',
+		ResultType: 2,
+		ToolTip: 'gsmbmc'
+	},
+	{
+		CompletionText: 'gsmbo',
+		ListItemText: 'gsmbo',
+		ResultType: 2,
+		ToolTip: 'gsmbo'
+	},
+	{
+		CompletionText: 'gsmbs',
+		ListItemText: 'gsmbs',
+		ResultType: 2,
+		ToolTip: 'gsmbs'
+	},
+	{
+		CompletionText: 'gsmbsc',
+		ListItemText: 'gsmbsc',
+		ResultType: 2,
+		ToolTip: 'gsmbsc'
+	},
+	{
+		CompletionText: 'gsmbscm',
+		ListItemText: 'gsmbscm',
+		ResultType: 2,
+		ToolTip: 'gsmbscm'
+	},
+	{
+		CompletionText: 'gsmbscp',
+		ListItemText: 'gsmbscp',
+		ResultType: 2,
+		ToolTip: 'gsmbscp'
+	},
+	{
+		CompletionText: 'gsmbse',
+		ListItemText: 'gsmbse',
+		ResultType: 2,
+		ToolTip: 'gsmbse'
+	},
+	{
+		CompletionText: 'gsmbsn',
+		ListItemText: 'gsmbsn',
+		ResultType: 2,
+		ToolTip: 'gsmbsn'
+	},
+	{
+		CompletionText: 'gsmbt',
+		ListItemText: 'gsmbt',
+		ResultType: 2,
+		ToolTip: 'gsmbt'
+	},
+	{
+		CompletionText: 'gsmbw',
+		ListItemText: 'gsmbw',
+		ResultType: 2,
+		ToolTip: 'gsmbw'
+	},
+	{
+		CompletionText: 'gsn',
+		ListItemText: 'gsn',
+		ResultType: 2,
+		ToolTip: 'Get-PSSession'
+	},
+	{
+		CompletionText: 'gsv',
+		ListItemText: 'gsv',
+		ResultType: 2,
+		ToolTip: 'Get-Service'
+	},
+	{
+		CompletionText: 'gtz',
+		ListItemText: 'gtz',
+		ResultType: 2,
+		ToolTip: 'Get-TimeZone'
+	},
+	{
+		CompletionText: 'gu',
+		ListItemText: 'gu',
+		ResultType: 2,
+		ToolTip: 'Get-Unique'
+	},
+	{
+		CompletionText: 'gv',
+		ListItemText: 'gv',
+		ResultType: 2,
+		ToolTip: 'Get-Variable'
+	},
+	{
+		CompletionText: 'gvm',
+		ListItemText: 'gvm',
+		ResultType: 2,
+		ToolTip: 'gvm'
+	},
+	{
+		CompletionText: 'gvmr',
+		ListItemText: 'gvmr',
+		ResultType: 2,
+		ToolTip: 'gvmr'
+	},
+	{
+		CompletionText: 'gvmrs',
+		ListItemText: 'gvmrs',
+		ResultType: 2,
+		ToolTip: 'gvmrs'
+	},
+	{
+		CompletionText: 'h',
+		ListItemText: 'h',
+		ResultType: 2,
+		ToolTip: 'Get-History'
+	},
+	{
+		CompletionText: 'H:',
+		ListItemText: 'H:',
+		ResultType: 2,
+		ToolTip: '\\r\\nH: \\r\\n'
+	},
+	{
+		CompletionText: 'handle.exe',
+		ListItemText: 'handle.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Tools\\Handle\\handle.exe'
+	},
+	{
+		CompletionText: 'handle64.exe',
+		ListItemText: 'handle64.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Tools\\Handle\\handle64.exe'
+	},
+	{
+		CompletionText: 'handle64a.exe',
+		ListItemText: 'handle64a.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Tools\\Handle\\handle64a.exe'
+	},
+	{
+		CompletionText: 'hatch.exe',
+		ListItemText: 'hatch.exe',
+		ResultType: 2,
+		ToolTip: 'c:\\users\\daniel\\.local\\bin\\hatch.exe'
+	},
+	{
+		CompletionText: 'hcsdiag.exe',
+		ListItemText: 'hcsdiag.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\hcsdiag.exe'
+	},
+	{
+		CompletionText: 'hdwwiz.cpl',
+		ListItemText: 'hdwwiz.cpl',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\hdwwiz.cpl'
+	},
+	{
+		CompletionText: 'hdwwiz.exe',
+		ListItemText: 'hdwwiz.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\hdwwiz.exe'
+	},
+	{
+		CompletionText: 'help',
+		ListItemText: 'help',
+		ResultType: 2,
+		ToolTip: '\\r\\nhelp [[-Name] <string>] [-Path <string>] [-Category <string[]>] [-Full] [-Component <string[]>] [-Functionality <string[]>] [-Role <string[]>] [<CommonParameters>]\\r\\n\\r\\nhelp [[-Name] <string>] -Detailed [-Path <string>] [-Category <string[]>] [-Component <string[]>] [-Functionality <string[]>] [-Role <string[]>] [<CommonParameters>]\\r\\n\\r\\nhelp [[-Name] <string>] -Examples [-Path <string>] [-Category <string[]>] [-Component <string[]>] [-Functionality <string[]>] [-Role <string[]>] [<CommonParameters>]\\r\\n\\r\\nhelp [[-Name] <string>] -Parameter <string[]> [-Path <string>] [-Category <string[]>] [-Component <string[]>] [-Functionality <string[]>] [-Role <string[]>] [<CommonParameters>]\\r\\n\\r\\nhelp [[-Name] <string>] -Online [-Path <string>] [-Category <string[]>] [-Component <string[]>] [-Functionality <string[]>] [-Role <string[]>] [<CommonParameters>]\\r\\n\\r\\nhelp [[-Name] <string>] -ShowWindow [-Path <string>] [-Category <string[]>] [-Component <string[]>] [-Functionality <string[]>] [-Role <string[]>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'help.exe',
+		ListItemText: 'help.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\help.exe'
+	},
+	{
+		CompletionText: 'HelpPane.exe',
+		ListItemText: 'HelpPane.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\HelpPane.exe'
+	},
+	{
+		CompletionText: 'hh.exe',
+		ListItemText: 'hh.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\hh.exe'
+	},
+	{
+		CompletionText: 'Hide-VirtualDisk',
+		ListItemText: 'Hide-VirtualDisk',
+		ResultType: 2,
+		ToolTip: '\\r\\nHide-VirtualDisk \\r\\n'
+	},
+	{
+		CompletionText: 'history',
+		ListItemText: 'history',
+		ResultType: 2,
+		ToolTip: 'Get-History'
+	},
+	{
+		CompletionText: 'hnsdiag.exe',
+		ListItemText: 'hnsdiag.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\hnsdiag.exe'
+	},
+	{
+		CompletionText: 'HOSTNAME.EXE',
+		ListItemText: 'HOSTNAME.EXE',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\HOSTNAME.EXE'
+	},
+	{
+		CompletionText: 'hsdb.exe',
+		ListItemText: 'hsdb.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\hsdb.exe'
+	},
+	{
+		CompletionText: 'hub-tool.exe',
+		ListItemText: 'hub-tool.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Docker\\Docker\\resources\\bin\\hub-tool.exe'
+	},
+	{
+		CompletionText: 'hvax64.exe',
+		ListItemText: 'hvax64.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\hvax64.exe'
+	},
+	{
+		CompletionText: 'hvc.exe',
+		ListItemText: 'hvc.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\hvc.exe'
+	},
+	{
+		CompletionText: 'hvix64.exe',
+		ListItemText: 'hvix64.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\hvix64.exe'
+	},
+	{
+		CompletionText: 'hvsievaluator.exe',
+		ListItemText: 'hvsievaluator.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\hvsievaluator.exe'
+	},
+	{
+		CompletionText: 'I:',
+		ListItemText: 'I:',
+		ResultType: 2,
+		ToolTip: '\\r\\nI: \\r\\n'
+	},
+	{
+		CompletionText: 'icacls.exe',
+		ListItemText: 'icacls.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\icacls.exe'
+	},
+	{
+		CompletionText: 'icim',
+		ListItemText: 'icim',
+		ResultType: 2,
+		ToolTip: 'icim'
+	},
+	{
+		CompletionText: 'icm',
+		ListItemText: 'icm',
+		ResultType: 2,
+		ToolTip: 'Invoke-Command'
+	},
+	{
+		CompletionText: 'IcsEntitlementHost.exe',
+		ListItemText: 'IcsEntitlementHost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\IcsEntitlementHost.exe'
+	},
+	{
+		CompletionText: 'icsunattend.exe',
+		ListItemText: 'icsunattend.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\icsunattend.exe'
+	},
+	{
+		CompletionText: 'idle.exe',
+		ListItemText: 'idle.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\idle.exe'
+	},
+	{
+		CompletionText: 'idle3.9.exe',
+		ListItemText: 'idle3.9.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\idle3.9.exe'
+	},
+	{
+		CompletionText: 'idle3.exe',
+		ListItemText: 'idle3.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\idle3.exe'
+	},
+	{
+		CompletionText: 'idlj.exe',
+		ListItemText: 'idlj.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\idlj.exe'
+	},
+	{
+		CompletionText: 'ie4uinit.exe',
+		ListItemText: 'ie4uinit.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\ie4uinit.exe'
+	},
+	{
+		CompletionText: 'ie4ushowIE.exe',
+		ListItemText: 'ie4ushowIE.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\ie4ushowIE.exe'
+	},
+	{
+		CompletionText: 'IESettingSync.exe',
+		ListItemText: 'IESettingSync.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\IESettingSync.exe'
+	},
+	{
+		CompletionText: 'ieUnatt.exe',
+		ListItemText: 'ieUnatt.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\ieUnatt.exe'
+	},
+	{
+		CompletionText: 'iex',
+		ListItemText: 'iex',
+		ResultType: 2,
+		ToolTip: 'Invoke-Expression'
+	},
+	{
+		CompletionText: 'iexpress.exe',
+		ListItemText: 'iexpress.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\iexpress.exe'
+	},
+	{
+		CompletionText: 'ihy',
+		ListItemText: 'ihy',
+		ResultType: 2,
+		ToolTip: 'Invoke-History'
+	},
+	{
+		CompletionText: 'ii',
+		ListItemText: 'ii',
+		ResultType: 2,
+		ToolTip: 'Invoke-Item'
+	},
+	{
+		CompletionText: 'immersivetpmvscmgrsvr.exe',
+		ListItemText: 'immersivetpmvscmgrsvr.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\immersivetpmvscmgrsvr.exe'
+	},
+	{
+		CompletionText: 'Import-AdlStoreItem',
+		ListItemText: 'Import-AdlStoreItem',
+		ResultType: 2,
+		ToolTip: 'Import-AdlStoreItem'
+	},
+	{
+		CompletionText: 'Import-Alias',
+		ListItemText: 'Import-Alias',
+		ResultType: 2,
+		ToolTip: '\\r\\nImport-Alias [-Path] <string> [-Scope <string>] [-PassThru] [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nImport-Alias -LiteralPath <string> [-Scope <string>] [-PassThru] [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Import-AzAksCredential',
+		ListItemText: 'Import-AzAksCredential',
+		ResultType: 2,
+		ToolTip: 'Import-AzAksCredential\\r\\n'
+	},
+	{
+		CompletionText: 'Import-AzApiManagementApi',
+		ListItemText: 'Import-AzApiManagementApi',
+		ResultType: 2,
+		ToolTip: 'Import-AzApiManagementApi\\r\\n'
+	},
+	{
+		CompletionText: 'Import-AzAutomationDscConfiguration',
+		ListItemText: 'Import-AzAutomationDscConfiguration',
+		ResultType: 2,
+		ToolTip: 'Import-AzAutomationDscConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Import-AzAutomationDscNodeConfiguration',
+		ListItemText: 'Import-AzAutomationDscNodeConfiguration',
+		ResultType: 2,
+		ToolTip: 'Import-AzAutomationDscNodeConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Import-AzAutomationModule',
+		ListItemText: 'Import-AzAutomationModule',
+		ResultType: 2,
+		ToolTip: 'Import-AzAutomationModule'
+	},
+	{
+		CompletionText: 'Import-AzAutomationRunbook',
+		ListItemText: 'Import-AzAutomationRunbook',
+		ResultType: 2,
+		ToolTip: 'Import-AzAutomationRunbook\\r\\n'
+	},
+	{
+		CompletionText: 'Import-AzCdnEndpointContent',
+		ListItemText: 'Import-AzCdnEndpointContent',
+		ResultType: 2,
+		ToolTip: '\\r\\nImport-AzCdnEndpointContent \\r\\n'
+	},
+	{
+		CompletionText: 'Import-AzConfig',
+		ListItemText: 'Import-AzConfig',
+		ResultType: 2,
+		ToolTip: 'Import-AzConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Import-AzContainerRegistryImage',
+		ListItemText: 'Import-AzContainerRegistryImage',
+		ResultType: 2,
+		ToolTip: '\\r\\nImport-AzContainerRegistryImage \\r\\n'
+	},
+	{
+		CompletionText: 'Import-AzContext',
+		ListItemText: 'Import-AzContext',
+		ResultType: 2,
+		ToolTip: 'Import-AzContext\\r\\n'
+	},
+	{
+		CompletionText: 'Import-AzDataLakeStoreItem',
+		ListItemText: 'Import-AzDataLakeStoreItem',
+		ResultType: 2,
+		ToolTip: 'Import-AzDataLakeStoreItem\\r\\n'
+	},
+	{
+		CompletionText: 'Import-AzKeyVaultCertificate',
+		ListItemText: 'Import-AzKeyVaultCertificate',
+		ResultType: 2,
+		ToolTip: 'Import-AzKeyVaultCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Import-AzKeyVaultSecurityDomain',
+		ListItemText: 'Import-AzKeyVaultSecurityDomain',
+		ResultType: 2,
+		ToolTip: 'Import-AzKeyVaultSecurityDomain\\r\\n'
+	},
+	{
+		CompletionText: 'Import-AzMlWebService',
+		ListItemText: 'Import-AzMlWebService',
+		ResultType: 2,
+		ToolTip: 'Import-AzMlWebService\\r\\n'
+	},
+	{
+		CompletionText: 'Import-AzRecoveryServicesAsrVaultSettingsFile',
+		ListItemText: 'Import-AzRecoveryServicesAsrVaultSettingsFile',
+		ResultType: 2,
+		ToolTip: 'Import-AzRecoveryServicesAsrVaultSettingsFile\\r\\n'
+	},
+	{
+		CompletionText: 'Import-AzRedisCache',
+		ListItemText: 'Import-AzRedisCache',
+		ResultType: 2,
+		ToolTip: 'Import-AzRedisCache\\r\\n'
+	},
+	{
+		CompletionText: 'Import-AzRedisEnterpriseCache',
+		ListItemText: 'Import-AzRedisEnterpriseCache',
+		ResultType: 2,
+		ToolTip: '\\r\\nImport-AzRedisEnterpriseCache \\r\\n'
+	},
+	{
+		CompletionText: 'Import-AzRedisEnterpriseCacheDatabase',
+		ListItemText: 'Import-AzRedisEnterpriseCacheDatabase',
+		ResultType: 2,
+		ToolTip: 'Import-AzRedisEnterpriseCacheDatabase'
+	},
+	{
+		CompletionText: 'Import-AzSynapseKqlScript',
+		ListItemText: 'Import-AzSynapseKqlScript',
+		ResultType: 2,
+		ToolTip: 'Import-AzSynapseKqlScript'
+	},
+	{
+		CompletionText: 'Import-AzSynapseNotebook',
+		ListItemText: 'Import-AzSynapseNotebook',
+		ResultType: 2,
+		ToolTip: 'Import-AzSynapseNotebook'
+	},
+	{
+		CompletionText: 'Import-AzSynapseSparkConfiguration',
+		ListItemText: 'Import-AzSynapseSparkConfiguration',
+		ResultType: 2,
+		ToolTip: 'Import-AzSynapseSparkConfiguration'
+	},
+	{
+		CompletionText: 'Import-AzSynapseSqlScript',
+		ListItemText: 'Import-AzSynapseSqlScript',
+		ResultType: 2,
+		ToolTip: 'Import-AzSynapseSqlScript'
+	},
+	{
+		CompletionText: 'Import-AzWebAppKeyVaultCertificate',
+		ListItemText: 'Import-AzWebAppKeyVaultCertificate',
+		ResultType: 2,
+		ToolTip: 'Import-AzWebAppKeyVaultCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Import-BCCachePackage',
+		ListItemText: 'Import-BCCachePackage',
+		ResultType: 2,
+		ToolTip: '\\r\\nImport-BCCachePackage \\r\\n'
+	},
+	{
+		CompletionText: 'Import-BcdStore',
+		ListItemText: 'Import-BcdStore',
+		ResultType: 2,
+		ToolTip: 'Import-BcdStore\\r\\n'
+	},
+	{
+		CompletionText: 'Import-BCSecretKey',
+		ListItemText: 'Import-BCSecretKey',
+		ResultType: 2,
+		ToolTip: '\\r\\nImport-BCSecretKey \\r\\n'
+	},
+	{
+		CompletionText: 'Import-BinaryMiLog',
+		ListItemText: 'Import-BinaryMiLog',
+		ResultType: 2,
+		ToolTip: 'Import-BinaryMiLog\\r\\n'
+	},
+	{
+		CompletionText: 'Import-Certificate',
+		ListItemText: 'Import-Certificate',
+		ResultType: 2,
+		ToolTip: 'Import-Certificate\\r\\n'
+	},
+	{
+		CompletionText: 'Import-Clixml',
+		ListItemText: 'Import-Clixml',
+		ResultType: 2,
+		ToolTip: '\\r\\nImport-Clixml [-Path] <string[]> [-IncludeTotalCount] [-Skip <ulong>] [-First <ulong>] [<CommonParameters>]\\r\\n\\r\\nImport-Clixml -LiteralPath <string[]> [-IncludeTotalCount] [-Skip <ulong>] [-First <ulong>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Import-Counter',
+		ListItemText: 'Import-Counter',
+		ResultType: 2,
+		ToolTip: 'Import-Counter\\r\\n'
+	},
+	{
+		CompletionText: 'Import-Csv',
+		ListItemText: 'Import-Csv',
+		ResultType: 2,
+		ToolTip: '\\r\\nImport-Csv [-Path] <string[]> [[-Delimiter] <char>] [-Header <string[]>] [-Encoding <Encoding>] [<CommonParameters>]\\r\\n\\r\\nImport-Csv [[-Delimiter] <char>] -LiteralPath <string[]> [-Header <string[]>] [-Encoding <Encoding>] [<CommonParameters>]\\r\\n\\r\\nImport-Csv [-Path] <string[]> -UseCulture [-Header <string[]>] [-Encoding <Encoding>] [<CommonParameters>]\\r\\n\\r\\nImport-Csv -LiteralPath <string[]> -UseCulture [-Header <string[]>] [-Encoding <Encoding>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Import-HgsGuardian',
+		ListItemText: 'Import-HgsGuardian',
+		ResultType: 2,
+		ToolTip: '\\r\\nImport-HgsGuardian \\r\\n'
+	},
+	{
+		CompletionText: 'Import-IseSnippet',
+		ListItemText: 'Import-IseSnippet',
+		ResultType: 2,
+		ToolTip: '\\r\\nImport-IseSnippet \\r\\n'
+	},
+	{
+		CompletionText: 'Import-LocalizedData',
+		ListItemText: 'Import-LocalizedData',
+		ResultType: 2,
+		ToolTip: '\\r\\nImport-LocalizedData [[-BindingVariable] <string>] [[-UICulture] <string>] [-BaseDirectory <string>] [-FileName <string>] [-SupportedCommand <string[]>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Import-Module',
+		ListItemText: 'Import-Module',
+		ResultType: 2,
+		ToolTip: '\\r\\nImport-Module [-Name] <string[]> [-Global] [-Prefix <string>] [-Function <string[]>] [-Cmdlet <string[]>] [-Variable <string[]>] [-Alias <string[]>] [-Force] [-SkipEditionCheck] [-PassThru] [-AsCustomObject] [-MinimumVersion <version>] [-MaximumVersion <string>] [-RequiredVersion <version>] [-ArgumentList <Object[]>] [-DisableNameChecking] [-NoClobber] [-Scope <string>] [<CommonParameters>]\\r\\n\\r\\nImport-Module [-Name] <string[]> -PSSession <PSSession> [-Global] [-Prefix <string>] [-Function <string[]>] [-Cmdlet <string[]>] [-Variable <string[]>] [-Alias <string[]>] [-Force] [-SkipEditionCheck] [-PassThru] [-AsCustomObject] [-MinimumVersion <version>] [-MaximumVersion <string>] [-RequiredVersion <version>] [-ArgumentList <Object[]>] [-DisableNameChecking] [-NoClobber] [-Scope <string>] [<CommonParameters>]\\r\\n\\r\\nImport-Module [-Name] <string[]> -CimSession <CimSession> [-Global] [-Prefix <string>] [-Function <string[]>] [-Cmdlet <string[]>] [-Variable <string[]>] [-Alias <string[]>] [-Force] [-SkipEditionCheck] [-PassThru] [-AsCustomObject] [-MinimumVersion <version>] [-MaximumVersion <string>] [-RequiredVersion <version>] [-ArgumentList <Object[]>] [-DisableNameChecking] [-NoClobber] [-Scope <string>] [-CimResourceUri <uri>] [-CimNamespace <string>] [<CommonParameters>]\\r\\n\\r\\nImport-Module [-Name] <string[]> -UseWindowsPowerShell [-Global] [-Prefix <string>] [-Function <string[]>] [-Cmdlet <string[]>] [-Variable <string[]>] [-Alias <string[]>] [-Force] [-PassThru] [-AsCustomObject] [-MinimumVersion <version>] [-MaximumVersion <string>] [-RequiredVersion <version>] [-ArgumentList <Object[]>] [-DisableNameChecking] [-NoClobber] [-Scope <string>] [<CommonParameters>]\\r\\n\\r\\nImport-Module [-FullyQualifiedName] <ModuleSpecification[]> [-Global] [-Prefix <string>] [-Function <string[]>] [-Cmdlet <string[]>] [-Variable <string[]>] [-Alias <string[]>] [-Force] [-SkipEditionCheck] [-PassThru] [-AsCustomObject] [-ArgumentList <Object[]>] [-DisableNameChecking] [-NoClobber] [-Scope <string>] [<CommonParameters>]\\r\\n\\r\\nImport-Module [-FullyQualifiedName] <ModuleSpecification[]> -PSSession <PSSession> [-Global] [-Prefix <string>] [-Function <string[]>] [-Cmdlet <string[]>] [-Variable <string[]>] [-Alias <string[]>] [-Force] [-SkipEditionCheck] [-PassThru] [-AsCustomObject] [-ArgumentList <Object[]>] [-DisableNameChecking] [-NoClobber] [-Scope <string>] [<CommonParameters>]\\r\\n\\r\\nImport-Module [-FullyQualifiedName] <ModuleSpecification[]> -UseWindowsPowerShell [-Global] [-Prefix <string>] [-Function <string[]>] [-Cmdlet <string[]>] [-Variable <string[]>] [-Alias <string[]>] [-Force] [-PassThru] [-AsCustomObject] [-ArgumentList <Object[]>] [-DisableNameChecking] [-NoClobber] [-Scope <string>] [<CommonParameters>]\\r\\n\\r\\nImport-Module [-Assembly] <Assembly[]> [-Global] [-Prefix <string>] [-Function <string[]>] [-Cmdlet <string[]>] [-Variable <string[]>] [-Alias <string[]>] [-Force] [-SkipEditionCheck] [-PassThru] [-AsCustomObject] [-ArgumentList <Object[]>] [-DisableNameChecking] [-NoClobber] [-Scope <string>] [<CommonParameters>]\\r\\n\\r\\nImport-Module [-ModuleInfo] <psmoduleinfo[]> [-Global] [-Prefix <string>] [-Function <string[]>] [-Cmdlet <string[]>] [-Variable <string[]>] [-Alias <string[]>] [-Force] [-SkipEditionCheck] [-PassThru] [-AsCustomObject] [-ArgumentList <Object[]>] [-DisableNameChecking] [-NoClobber] [-Scope <string>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Import-PackageProvider',
+		ListItemText: 'Import-PackageProvider',
+		ResultType: 2,
+		ToolTip: 'Import-PackageProvider\\r\\n'
+	},
+	{
+		CompletionText: 'Import-PfxCertificate',
+		ListItemText: 'Import-PfxCertificate',
+		ResultType: 2,
+		ToolTip: 'Import-PfxCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Import-PowerShellDataFile',
+		ListItemText: 'Import-PowerShellDataFile',
+		ResultType: 2,
+		ToolTip: '\\r\\nImport-PowerShellDataFile [-Path] <string[]> [-SkipLimitCheck] [<CommonParameters>]\\r\\n\\r\\nImport-PowerShellDataFile [-LiteralPath] <string[]> [-SkipLimitCheck] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Import-PSGetRepository',
+		ListItemText: 'Import-PSGetRepository',
+		ResultType: 2,
+		ToolTip: '\\r\\nImport-PSGetRepository \\r\\n'
+	},
+	{
+		CompletionText: 'Import-PSSession',
+		ListItemText: 'Import-PSSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nImport-PSSession [-Session] <PSSession> [[-CommandName] <string[]>] [[-FormatTypeName] <string[]>] [-Prefix <string>] [-DisableNameChecking] [-AllowClobber] [-ArgumentList <Object[]>] [-CommandType <CommandTypes>] [-Module <string[]>] [-FullyQualifiedModule <ModuleSpecification[]>] [-Certificate <X509Certificate2>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Import-StartLayout',
+		ListItemText: 'Import-StartLayout',
+		ResultType: 2,
+		ToolTip: 'Import-StartLayout\\r\\n'
+	},
+	{
+		CompletionText: 'Import-TpmOwnerAuth',
+		ListItemText: 'Import-TpmOwnerAuth',
+		ResultType: 2,
+		ToolTip: 'Import-TpmOwnerAuth\\r\\n'
+	},
+	{
+		CompletionText: 'Import-VM',
+		ListItemText: 'Import-VM',
+		ResultType: 2,
+		ToolTip: 'Import-VM\\r\\n'
+	},
+	{
+		CompletionText: 'Import-VMInitialReplication',
+		ListItemText: 'Import-VMInitialReplication',
+		ResultType: 2,
+		ToolTip: 'Import-VMInitialReplication\\r\\n'
+	},
+	{
+		CompletionText: 'Import-WinhttpProxy',
+		ListItemText: 'Import-WinhttpProxy',
+		ResultType: 2,
+		ToolTip: '\\r\\nImport-WinhttpProxy \\r\\n'
+	},
+	{
+		CompletionText: 'In',
+		ListItemText: 'In',
+		ResultType: 2,
+		ToolTip: '\\r\\nIn \\r\\n'
+	},
+	{
+		CompletionText: 'inetcpl.cpl',
+		ListItemText: 'inetcpl.cpl',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\inetcpl.cpl'
+	},
+	{
+		CompletionText: 'InfDefaultInstall.exe',
+		ListItemText: 'InfDefaultInstall.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\InfDefaultInstall.exe'
+	},
+	{
+		CompletionText: 'Initialize-AzDataProtectionBackupInstance',
+		ListItemText: 'Initialize-AzDataProtectionBackupInstance',
+		ResultType: 2,
+		ToolTip: '\\r\\nInitialize-AzDataProtectionBackupInstance \\r\\n'
+	},
+	{
+		CompletionText: 'Initialize-AzDataProtectionRestoreRequest',
+		ListItemText: 'Initialize-AzDataProtectionRestoreRequest',
+		ResultType: 2,
+		ToolTip: '\\r\\nInitialize-AzDataProtectionRestoreRequest \\r\\n'
+	},
+	{
+		CompletionText: 'Initialize-AzMigrateReplicationInfrastructure',
+		ListItemText: 'Initialize-AzMigrateReplicationInfrastructure',
+		ResultType: 2,
+		ToolTip: '\\r\\nInitialize-AzMigrateReplicationInfrastructure \\r\\n'
+	},
+	{
+		CompletionText: 'Initialize-AzRecoveryServicesBackupProtectableItem',
+		ListItemText: 'Initialize-AzRecoveryServicesBackupProtectableItem',
+		ResultType: 2,
+		ToolTip: 'Initialize-AzRecoveryServicesBackupProtectableItem\\r\\n'
+	},
+	{
+		CompletionText: 'Initialize-AzRecoveryServicesDSMove',
+		ListItemText: 'Initialize-AzRecoveryServicesDSMove',
+		ResultType: 2,
+		ToolTip: 'Initialize-AzRecoveryServicesDSMove\\r\\n'
+	},
+	{
+		CompletionText: 'Initialize-Disk',
+		ListItemText: 'Initialize-Disk',
+		ResultType: 2,
+		ToolTip: '\\r\\nInitialize-Disk \\r\\n'
+	},
+	{
+		CompletionText: 'Initialize-PmemPhysicalDevice',
+		ListItemText: 'Initialize-PmemPhysicalDevice',
+		ResultType: 2,
+		ToolTip: 'Initialize-PmemPhysicalDevice\\r\\n'
+	},
+	{
+		CompletionText: 'Initialize-Tpm',
+		ListItemText: 'Initialize-Tpm',
+		ResultType: 2,
+		ToolTip: 'Initialize-Tpm\\r\\n'
+	},
+	{
+		CompletionText: 'Initialize-Volume',
+		ListItemText: 'Initialize-Volume',
+		ResultType: 2,
+		ToolTip: 'Initialize-Volume'
+	},
+	{
+		CompletionText: 'inmo',
+		ListItemText: 'inmo',
+		ResultType: 2,
+		ToolTip: 'inmo'
+	},
+	{
+		CompletionText: 'InModuleScope',
+		ListItemText: 'InModuleScope',
+		ResultType: 2,
+		ToolTip: '\\r\\nInModuleScope \\r\\n'
+	},
+	{
+		CompletionText: 'InputSwitchToastHandler.exe',
+		ListItemText: 'InputSwitchToastHandler.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\InputSwitchToastHandler.exe'
+	},
+	{
+		CompletionText: 'Install-AzAksCliTool',
+		ListItemText: 'Install-AzAksCliTool',
+		ResultType: 2,
+		ToolTip: '\\r\\nInstall-AzAksCliTool \\r\\n'
+	},
+	{
+		CompletionText: 'Install-AzAksKubectl',
+		ListItemText: 'Install-AzAksKubectl',
+		ResultType: 2,
+		ToolTip: 'Install-AzAksKubectl'
+	},
+	{
+		CompletionText: 'Install-AzStackHCIRemoteSupport',
+		ListItemText: 'Install-AzStackHCIRemoteSupport',
+		ResultType: 2,
+		ToolTip: '\\r\\nInstall-AzStackHCIRemoteSupport \\r\\n'
+	},
+	{
+		CompletionText: 'Install-Dtc',
+		ListItemText: 'Install-Dtc',
+		ResultType: 2,
+		ToolTip: '\\r\\nInstall-Dtc \\r\\n'
+	},
+	{
+		CompletionText: 'Install-Language',
+		ListItemText: 'Install-Language',
+		ResultType: 2,
+		ToolTip: 'Install-Language\\r\\n'
+	},
+	{
+		CompletionText: 'Install-Module',
+		ListItemText: 'Install-Module',
+		ResultType: 2,
+		ToolTip: '\\r\\nInstall-Module \\r\\n'
+	},
+	{
+		CompletionText: 'Install-Package',
+		ListItemText: 'Install-Package',
+		ResultType: 2,
+		ToolTip: 'Install-Package\\r\\n'
+	},
+	{
+		CompletionText: 'Install-PackageProvider',
+		ListItemText: 'Install-PackageProvider',
+		ResultType: 2,
+		ToolTip: 'Install-PackageProvider\\r\\n'
+	},
+	{
+		CompletionText: 'Install-PowerShellRemoting.ps1',
+		ListItemText: 'Install-PowerShellRemoting.ps1',
+		ResultType: 2,
+		ToolTip: 'Install-PowerShellRemoting.ps1 [-PowerShellHome <string>] [<CommonParameters>]\\r\\nInstall-PowerShellRemoting.ps1 -Force [-PowerShellHome <string>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Install-ProvisioningPackage',
+		ListItemText: 'Install-ProvisioningPackage',
+		ResultType: 2,
+		ToolTip: 'Install-ProvisioningPackage\\r\\n'
+	},
+	{
+		CompletionText: 'Install-PSResource',
+		ListItemText: 'Install-PSResource',
+		ResultType: 2,
+		ToolTip: 'Install-PSResource\\r\\n'
+	},
+	{
+		CompletionText: 'Install-Script',
+		ListItemText: 'Install-Script',
+		ResultType: 2,
+		ToolTip: '\\r\\nInstall-Script \\r\\n'
+	},
+	{
+		CompletionText: 'Install-TrustedProvisioningCertificate',
+		ListItemText: 'Install-TrustedProvisioningCertificate',
+		ResultType: 2,
+		ToolTip: 'Install-TrustedProvisioningCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'InstallPSCorePolicyDefinitions.ps1',
+		ListItemText: 'InstallPSCorePolicyDefinitions.ps1',
+		ResultType: 2,
+		ToolTip: 'InstallPSCorePolicyDefinitions.ps1 [[-Path] <string>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'install_tools.bat',
+		ListItemText: 'install_tools.bat',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\nodejs\\install_tools.bat'
+	},
+	{
+		CompletionText: 'intl.cpl',
+		ListItemText: 'intl.cpl',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\intl.cpl'
+	},
+	{
+		CompletionText: 'Invoke-AsWorkflow',
+		ListItemText: 'Invoke-AsWorkflow',
+		ResultType: 2,
+		ToolTip: '\\r\\nInvoke-AsWorkflow \\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzAksAbortAgentPoolLatestOperation',
+		ListItemText: 'Invoke-AzAksAbortAgentPoolLatestOperation',
+		ResultType: 2,
+		ToolTip: '\\r\\nInvoke-AzAksAbortAgentPoolLatestOperation \\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzAksAbortManagedClusterLatestOperation',
+		ListItemText: 'Invoke-AzAksAbortManagedClusterLatestOperation',
+		ResultType: 2,
+		ToolTip: '\\r\\nInvoke-AzAksAbortManagedClusterLatestOperation \\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzAksRotateManagedClusterServiceAccountSigningKey',
+		ListItemText: 'Invoke-AzAksRotateManagedClusterServiceAccountSigningKey',
+		ResultType: 2,
+		ToolTip: '\\r\\nInvoke-AzAksRotateManagedClusterServiceAccountSigningKey \\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzAksRunCommand',
+		ListItemText: 'Invoke-AzAksRunCommand',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzAksRunCommand\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzCloudServiceRebuild',
+		ListItemText: 'Invoke-AzCloudServiceRebuild',
+		ResultType: 2,
+		ToolTip: '\\r\\nInvoke-AzCloudServiceRebuild \\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzCloudServiceReimage',
+		ListItemText: 'Invoke-AzCloudServiceReimage',
+		ResultType: 2,
+		ToolTip: '\\r\\nInvoke-AzCloudServiceReimage \\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzCloudServiceRoleInstanceRebuild',
+		ListItemText: 'Invoke-AzCloudServiceRoleInstanceRebuild',
+		ResultType: 2,
+		ToolTip: '\\r\\nInvoke-AzCloudServiceRoleInstanceRebuild \\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzCloudServiceRoleInstanceReimage',
+		ListItemText: 'Invoke-AzCloudServiceRoleInstanceReimage',
+		ResultType: 2,
+		ToolTip: '\\r\\nInvoke-AzCloudServiceRoleInstanceReimage \\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzContainerInstanceCommand',
+		ListItemText: 'Invoke-AzContainerInstanceCommand',
+		ResultType: 2,
+		ToolTip: '\\r\\nInvoke-AzContainerInstanceCommand \\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzCosmosDBCassandraKeyspaceThroughputMigration',
+		ListItemText: 'Invoke-AzCosmosDBCassandraKeyspaceThroughputMigration',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzCosmosDBCassandraKeyspaceThroughputMigration\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzCosmosDBCassandraTableThroughputMigration',
+		ListItemText: 'Invoke-AzCosmosDBCassandraTableThroughputMigration',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzCosmosDBCassandraTableThroughputMigration\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzCosmosDBGremlinDatabaseThroughputMigration',
+		ListItemText: 'Invoke-AzCosmosDBGremlinDatabaseThroughputMigration',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzCosmosDBGremlinDatabaseThroughputMigration\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzCosmosDBGremlinGraphThroughputMigration',
+		ListItemText: 'Invoke-AzCosmosDBGremlinGraphThroughputMigration',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzCosmosDBGremlinGraphThroughputMigration\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzCosmosDBMongoDBCollectionThroughputMigration',
+		ListItemText: 'Invoke-AzCosmosDBMongoDBCollectionThroughputMigration',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzCosmosDBMongoDBCollectionThroughputMigration\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzCosmosDBMongoDBDatabaseThroughputMigration',
+		ListItemText: 'Invoke-AzCosmosDBMongoDBDatabaseThroughputMigration',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzCosmosDBMongoDBDatabaseThroughputMigration\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzCosmosDBSqlContainerThroughputMigration',
+		ListItemText: 'Invoke-AzCosmosDBSqlContainerThroughputMigration',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzCosmosDBSqlContainerThroughputMigration\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzCosmosDBSqlDatabaseThroughputMigration',
+		ListItemText: 'Invoke-AzCosmosDBSqlDatabaseThroughputMigration',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzCosmosDBSqlDatabaseThroughputMigration\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzCosmosDBTableThroughputMigration',
+		ListItemText: 'Invoke-AzCosmosDBTableThroughputMigration',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzCosmosDBTableThroughputMigration\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzDataBoxEdgeDevice',
+		ListItemText: 'Invoke-AzDataBoxEdgeDevice',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzDataBoxEdgeDevice\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzDataBoxEdgeShare',
+		ListItemText: 'Invoke-AzDataBoxEdgeShare',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzDataBoxEdgeShare\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzDataBoxEdgeStorageContainer',
+		ListItemText: 'Invoke-AzDataBoxEdgeStorageContainer',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzDataBoxEdgeStorageContainer\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzDataFactoryV2DataFlowDebugSessionCommand',
+		ListItemText: 'Invoke-AzDataFactoryV2DataFlowDebugSessionCommand',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzDataFactoryV2DataFlowDebugSessionCommand\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzDataFactoryV2IntegrationRuntimeUpgrade',
+		ListItemText: 'Invoke-AzDataFactoryV2IntegrationRuntimeUpgrade',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzDataFactoryV2IntegrationRuntimeUpgrade\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzDataFactoryV2Pipeline',
+		ListItemText: 'Invoke-AzDataFactoryV2Pipeline',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzDataFactoryV2Pipeline\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzDataFactoryV2TriggerRun',
+		ListItemText: 'Invoke-AzDataFactoryV2TriggerRun',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzDataFactoryV2TriggerRun\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzHDInsightHiveJob',
+		ListItemText: 'Invoke-AzHDInsightHiveJob',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzHDInsightHiveJob\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzIotHubConfigMetric',
+		ListItemText: 'Invoke-AzIotHubConfigMetric',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzIotHubConfigMetric'
+	},
+	{
+		CompletionText: 'Invoke-AzIotHubConfigurationMetricsQuery',
+		ListItemText: 'Invoke-AzIotHubConfigurationMetricsQuery',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzIotHubConfigurationMetricsQuery\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzIotHubDeploymentMetricsQuery',
+		ListItemText: 'Invoke-AzIotHubDeploymentMetricsQuery',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzIotHubDeploymentMetricsQuery\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzIotHubDeployMetric',
+		ListItemText: 'Invoke-AzIotHubDeployMetric',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzIotHubDeployMetric'
+	},
+	{
+		CompletionText: 'Invoke-AzIotHubDeviceMethod',
+		ListItemText: 'Invoke-AzIotHubDeviceMethod',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzIotHubDeviceMethod\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzIotHubManualFailover',
+		ListItemText: 'Invoke-AzIotHubManualFailover',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzIotHubManualFailover\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzIotHubModuleMethod',
+		ListItemText: 'Invoke-AzIotHubModuleMethod',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzIotHubModuleMethod\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzIotHubQuery',
+		ListItemText: 'Invoke-AzIotHubQuery',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzIotHubQuery\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzKeyVaultKeyOperation',
+		ListItemText: 'Invoke-AzKeyVaultKeyOperation',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzKeyVaultKeyOperation\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzKeyVaultKeyRotation',
+		ListItemText: 'Invoke-AzKeyVaultKeyRotation',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzKeyVaultKeyRotation\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzKustoDataConnectionValidation',
+		ListItemText: 'Invoke-AzKustoDataConnectionValidation',
+		ResultType: 2,
+		ToolTip: '\\r\\nInvoke-AzKustoDataConnectionValidation \\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzKustoDetachClusterFollowerDatabase',
+		ListItemText: 'Invoke-AzKustoDetachClusterFollowerDatabase',
+		ResultType: 2,
+		ToolTip: '\\r\\nInvoke-AzKustoDetachClusterFollowerDatabase \\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzKustoDiagnoseClusterVirtualNetwork',
+		ListItemText: 'Invoke-AzKustoDiagnoseClusterVirtualNetwork',
+		ResultType: 2,
+		ToolTip: '\\r\\nInvoke-AzKustoDiagnoseClusterVirtualNetwork \\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzMarketplaceSignTerms',
+		ListItemText: 'Invoke-AzMarketplaceSignTerms',
+		ResultType: 2,
+		ToolTip: '\\r\\nInvoke-AzMarketplaceSignTerms \\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzMLWorkspaceDiagnose',
+		ListItemText: 'Invoke-AzMLWorkspaceDiagnose',
+		ResultType: 2,
+		ToolTip: '\\r\\nInvoke-AzMLWorkspaceDiagnose \\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzMLWorkspaceNotebook',
+		ListItemText: 'Invoke-AzMLWorkspaceNotebook',
+		ResultType: 2,
+		ToolTip: '\\r\\nInvoke-AzMLWorkspaceNotebook \\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzNetworkWatcherNetworkConfigurationDiagnostic',
+		ListItemText: 'Invoke-AzNetworkWatcherNetworkConfigurationDiagnostic',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzNetworkWatcherNetworkConfigurationDiagnostic\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzOperationalInsightsMigrateTable',
+		ListItemText: 'Invoke-AzOperationalInsightsMigrateTable',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzOperationalInsightsMigrateTable\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzOperationalInsightsQuery',
+		ListItemText: 'Invoke-AzOperationalInsightsQuery',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzOperationalInsightsQuery\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzRedeploySqlVM',
+		ListItemText: 'Invoke-AzRedeploySqlVM',
+		ResultType: 2,
+		ToolTip: '\\r\\nInvoke-AzRedeploySqlVM \\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzRedisEnterpriseCacheDatabaseFlush',
+		ListItemText: 'Invoke-AzRedisEnterpriseCacheDatabaseFlush',
+		ResultType: 2,
+		ToolTip: '\\r\\nInvoke-AzRedisEnterpriseCacheDatabaseFlush \\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzRedisEnterpriseCacheForceDatabaseUnlink',
+		ListItemText: 'Invoke-AzRedisEnterpriseCacheForceDatabaseUnlink',
+		ResultType: 2,
+		ToolTip: '\\r\\nInvoke-AzRedisEnterpriseCacheForceDatabaseUnlink \\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzResourceAction',
+		ListItemText: 'Invoke-AzResourceAction',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzResourceAction\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzResourceMoverBulkRemove',
+		ListItemText: 'Invoke-AzResourceMoverBulkRemove',
+		ResultType: 2,
+		ToolTip: '\\r\\nInvoke-AzResourceMoverBulkRemove \\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzResourceMoverCommit',
+		ListItemText: 'Invoke-AzResourceMoverCommit',
+		ResultType: 2,
+		ToolTip: '\\r\\nInvoke-AzResourceMoverCommit \\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzResourceMoverDiscard',
+		ListItemText: 'Invoke-AzResourceMoverDiscard',
+		ResultType: 2,
+		ToolTip: '\\r\\nInvoke-AzResourceMoverDiscard \\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzResourceMoverInitiateMove',
+		ListItemText: 'Invoke-AzResourceMoverInitiateMove',
+		ResultType: 2,
+		ToolTip: '\\r\\nInvoke-AzResourceMoverInitiateMove \\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzResourceMoverPrepare',
+		ListItemText: 'Invoke-AzResourceMoverPrepare',
+		ResultType: 2,
+		ToolTip: '\\r\\nInvoke-AzResourceMoverPrepare \\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzRest',
+		ListItemText: 'Invoke-AzRest',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzRest'
+	},
+	{
+		CompletionText: 'Invoke-AzRestMethod',
+		ListItemText: 'Invoke-AzRestMethod',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzRestMethod\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzRmStorageContainerImmutableStorageWithVersioningMigration',
+		ListItemText: 'Invoke-AzRmStorageContainerImmutableStorageWithVersioningMigration',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzRmStorageContainerImmutableStorageWithVersioningMigration\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzSentinelThreatIntelligenceIndicatorQuery',
+		ListItemText: 'Invoke-AzSentinelThreatIntelligenceIndicatorQuery',
+		ResultType: 2,
+		ToolTip: '\\r\\nInvoke-AzSentinelThreatIntelligenceIndicatorQuery \\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzSqlDatabaseFailover',
+		ListItemText: 'Invoke-AzSqlDatabaseFailover',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzSqlDatabaseFailover\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzSqlDatabaseTransparentDataEncryptionProtectorRevalidation',
+		ListItemText: 'Invoke-AzSqlDatabaseTransparentDataEncryptionProtectorRevalidation',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzSqlDatabaseTransparentDataEncryptionProtectorRevalidation\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzSqlDatabaseTransparentDataEncryptionProtectorRevert',
+		ListItemText: 'Invoke-AzSqlDatabaseTransparentDataEncryptionProtectorRevert',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzSqlDatabaseTransparentDataEncryptionProtectorRevert\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzSqlElasticPoolFailover',
+		ListItemText: 'Invoke-AzSqlElasticPoolFailover',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzSqlElasticPoolFailover\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzSqlInstanceFailover',
+		ListItemText: 'Invoke-AzSqlInstanceFailover',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzSqlInstanceFailover\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzSqlInstanceTransparentDataEncryptionProtectorRevalidation',
+		ListItemText: 'Invoke-AzSqlInstanceTransparentDataEncryptionProtectorRevalidation',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzSqlInstanceTransparentDataEncryptionProtectorRevalidation\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzSqlServerExternalGovernanceStatusRefresh',
+		ListItemText: 'Invoke-AzSqlServerExternalGovernanceStatusRefresh',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzSqlServerExternalGovernanceStatusRefresh\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzSqlServerTransparentDataEncryptionProtectorRevalidation',
+		ListItemText: 'Invoke-AzSqlServerTransparentDataEncryptionProtectorRevalidation',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzSqlServerTransparentDataEncryptionProtectorRevalidation\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzSqlVMTroubleshoot',
+		ListItemText: 'Invoke-AzSqlVMTroubleshoot',
+		ResultType: 2,
+		ToolTip: '\\r\\nInvoke-AzSqlVMTroubleshoot \\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzStorageAccountFailover',
+		ListItemText: 'Invoke-AzStorageAccountFailover',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzStorageAccountFailover\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzStorageAccountHierarchicalNamespaceUpgrade',
+		ListItemText: 'Invoke-AzStorageAccountHierarchicalNamespaceUpgrade',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzStorageAccountHierarchicalNamespaceUpgrade\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzStorageSyncChangeDetection',
+		ListItemText: 'Invoke-AzStorageSyncChangeDetection',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzStorageSyncChangeDetection\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzStorageSyncCompatibilityCheck',
+		ListItemText: 'Invoke-AzStorageSyncCompatibilityCheck',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzStorageSyncCompatibilityCheck\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzSynapseDataFlowDebugSessionCommand',
+		ListItemText: 'Invoke-AzSynapseDataFlowDebugSessionCommand',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzSynapseDataFlowDebugSessionCommand\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzSynapseDetachKustoPoolFollowerDatabase',
+		ListItemText: 'Invoke-AzSynapseDetachKustoPoolFollowerDatabase',
+		ResultType: 2,
+		ToolTip: '\\r\\nInvoke-AzSynapseDetachKustoPoolFollowerDatabase \\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzSynapseIntegrationRuntimeUpgrade',
+		ListItemText: 'Invoke-AzSynapseIntegrationRuntimeUpgrade',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzSynapseIntegrationRuntimeUpgrade\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzSynapsePipeline',
+		ListItemText: 'Invoke-AzSynapsePipeline',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzSynapsePipeline\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzSynapseSparkStatement',
+		ListItemText: 'Invoke-AzSynapseSparkStatement',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzSynapseSparkStatement\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzSynapseTriggerRun',
+		ListItemText: 'Invoke-AzSynapseTriggerRun',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzSynapseTriggerRun\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzVmAssessPatch',
+		ListItemText: 'Invoke-AzVmAssessPatch',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzVmAssessPatch'
+	},
+	{
+		CompletionText: 'Invoke-AzVmInstallPatch',
+		ListItemText: 'Invoke-AzVmInstallPatch',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzVmInstallPatch\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzVmPatchAssess',
+		ListItemText: 'Invoke-AzVmPatchAssess',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzVmPatchAssess'
+	},
+	{
+		CompletionText: 'Invoke-AzVmPatchAssessment',
+		ListItemText: 'Invoke-AzVmPatchAssessment',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzVmPatchAssessment\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzVMReimage',
+		ListItemText: 'Invoke-AzVMReimage',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzVMReimage\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzVMRunCommand',
+		ListItemText: 'Invoke-AzVMRunCommand',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzVMRunCommand\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-AzVmssVMRunCommand',
+		ListItemText: 'Invoke-AzVmssVMRunCommand',
+		ResultType: 2,
+		ToolTip: 'Invoke-AzVmssVMRunCommand\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-CimMethod',
+		ListItemText: 'Invoke-CimMethod',
+		ResultType: 2,
+		ToolTip: 'Invoke-CimMethod\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-Command',
+		ListItemText: 'Invoke-Command',
+		ResultType: 2,
+		ToolTip: '\\r\\nInvoke-Command [-ScriptBlock] <scriptblock> [-NoNewScope] [-InputObject <psobject>] [-ArgumentList <Object[]>] [<CommonParameters>]\\r\\n\\r\\nInvoke-Command [[-Session] <PSSession[]>] [-ScriptBlock] <scriptblock> [-ThrottleLimit <int>] [-AsJob] [-HideComputerName] [-JobName <string>] [-RemoteDebug] [-InputObject <psobject>] [-ArgumentList <Object[]>] [<CommonParameters>]\\r\\n\\r\\nInvoke-Command [[-Session] <PSSession[]>] [-FilePath] <string> [-ThrottleLimit <int>] [-AsJob] [-HideComputerName] [-JobName <string>] [-RemoteDebug] [-InputObject <psobject>] [-ArgumentList <Object[]>] [<CommonParameters>]\\r\\n\\r\\nInvoke-Command [[-ComputerName] <string[]>] [-ScriptBlock] <scriptblock> [-Credential <pscredential>] [-Port <int>] [-UseSSL] [-ConfigurationName <string>] [-ApplicationName <string>] [-ThrottleLimit <int>] [-AsJob] [-InDisconnectedSession] [-SessionName <string[]>] [-HideComputerName] [-JobName <string>] [-SessionOption <PSSessionOption>] [-Authentication <AuthenticationMechanism>] [-EnableNetworkAccess] [-RemoteDebug] [-InputObject <psobject>] [-ArgumentList <Object[]>] [-CertificateThumbprint <string>] [<CommonParameters>]\\r\\n\\r\\nInvoke-Command [[-ComputerName] <string[]>] [-FilePath] <string> [-Credential <pscredential>] [-Port <int>] [-UseSSL] [-ConfigurationName <string>] [-ApplicationName <string>] [-ThrottleLimit <int>] [-AsJob] [-InDisconnectedSession] [-SessionName <string[]>] [-HideComputerName] [-JobName <string>] [-SessionOption <PSSessionOption>] [-Authentication <AuthenticationMechanism>] [-EnableNetworkAccess] [-RemoteDebug] [-InputObject <psobject>] [-ArgumentList <Object[]>] [<CommonParameters>]\\r\\n\\r\\nInvoke-Command [[-ConnectionUri] <uri[]>] [-ScriptBlock] <scriptblock> [-Credential <pscredential>] [-ConfigurationName <string>] [-ThrottleLimit <int>] [-AsJob] [-InDisconnectedSession] [-HideComputerName] [-JobName <string>] [-AllowRedirection] [-SessionOption <PSSessionOption>] [-Authentication <AuthenticationMechanism>] [-EnableNetworkAccess] [-RemoteDebug] [-InputObject <psobject>] [-ArgumentList <Object[]>] [-CertificateThumbprint <string>] [<CommonParameters>]\\r\\n\\r\\nInvoke-Command [[-ConnectionUri] <uri[]>] [-FilePath] <string> [-Credential <pscredential>] [-ConfigurationName <string>] [-ThrottleLimit <int>] [-AsJob] [-InDisconnectedSession] [-HideComputerName] [-JobName <string>] [-AllowRedirection] [-SessionOption <PSSessionOption>] [-Authentication <AuthenticationMechanism>] [-EnableNetworkAccess] [-RemoteDebug] [-InputObject <psobject>] [-ArgumentList <Object[]>] [<CommonParameters>]\\r\\n\\r\\nInvoke-Command [-VMId] <guid[]> [-ScriptBlock] <scriptblock> -Credential <pscredential> [-ConfigurationName <string>] [-ThrottleLimit <int>] [-AsJob] [-HideComputerName] [-RemoteDebug] [-InputObject <psobject>] [-ArgumentList <Object[]>] [<CommonParameters>]\\r\\n\\r\\nInvoke-Command [-ScriptBlock] <scriptblock> -Credential <pscredential> -VMName <string[]> [-ConfigurationName <string>] [-ThrottleLimit <int>] [-AsJob] [-HideComputerName] [-RemoteDebug] [-InputObject <psobject>] [-ArgumentList <Object[]>] [<CommonParameters>]\\r\\n\\r\\nInvoke-Command [-VMId] <guid[]> [-FilePath] <string> -Credential <pscredential> [-ConfigurationName <string>] [-ThrottleLimit <int>] [-AsJob] [-HideComputerName] [-RemoteDebug] [-InputObject <psobject>] [-ArgumentList <Object[]>] [<CommonParameters>]\\r\\n\\r\\nInvoke-Command [-FilePath] <string> -Credential <pscredential> -VMName <string[]> [-ConfigurationName <string>] [-ThrottleLimit <int>] [-AsJob] [-HideComputerName] [-RemoteDebug] [-InputObject <psobject>] [-ArgumentList <Object[]>] [<CommonParameters>]\\r\\n\\r\\nInvoke-Command [-ScriptBlock] <scriptblock> -HostName <string[]> [-Port <int>] [-AsJob] [-HideComputerName] [-JobName <string>] [-UserName <string>] [-KeyFilePath <string>] [-Subsystem <string>] [-ConnectingTimeout <int>] [-SSHTransport] [-Options <hashtable>] [-RemoteDebug] [-InputObject <psobject>] [-ArgumentList <Object[]>] [<CommonParameters>]\\r\\n\\r\\nInvoke-Command [-ScriptBlock] <scriptblock> -ContainerId <string[]> [-ConfigurationName <string>] [-ThrottleLimit <int>] [-AsJob] [-HideComputerName] [-JobName <string>] [-RunAsAdministrator] [-RemoteDebug] [-InputObject <psobject>] [-ArgumentList <Object[]>] [<CommonParameters>]\\r\\n\\r\\nInvoke-Command [-FilePath] <string> -ContainerId <string[]> [-ConfigurationName <string>] [-ThrottleLimit <int>] [-AsJob] [-HideComputerName] [-JobName <string>] [-RunAsAdministrator] [-RemoteDebug] [-InputObject <psobject>] [-ArgumentList <Object[]>] [<CommonParameters>]\\r\\n\\r\\nInvoke-Command [-ScriptBlock] <scriptblock> -SSHConnection <hashtable[]> [-AsJob] [-HideComputerName] [-JobName <string>] [-RemoteDebug] [-InputObject <psobject>] [-ArgumentList <Object[]>] [<CommonParameters>]\\r\\n\\r\\nInvoke-Command -FilePath <string> -HostName <string[]> [-AsJob] [-HideComputerName] [-UserName <string>] [-KeyFilePath <string>] [-Subsystem <string>] [-ConnectingTimeout <int>] [-SSHTransport] [-Options <hashtable>] [-RemoteDebug] [-InputObject <psobject>] [-ArgumentList <Object[]>] [<CommonParameters>]\\r\\n\\r\\nInvoke-Command -FilePath <string> -SSHConnection <hashtable[]> [-AsJob] [-HideComputerName] [-RemoteDebug] [-InputObject <psobject>] [-ArgumentList <Object[]>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-CommandInDesktopPackage',
+		ListItemText: 'Invoke-CommandInDesktopPackage',
+		ResultType: 2,
+		ToolTip: 'Invoke-CommandInDesktopPackage\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-DscResource',
+		ListItemText: 'Invoke-DscResource',
+		ResultType: 2,
+		ToolTip: 'Invoke-DscResource\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-Expression',
+		ListItemText: 'Invoke-Expression',
+		ResultType: 2,
+		ToolTip: '\\r\\nInvoke-Expression [-Command] <string> [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-History',
+		ListItemText: 'Invoke-History',
+		ResultType: 2,
+		ToolTip: '\\r\\nInvoke-History [[-Id] <string>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-HnsRequest',
+		ListItemText: 'Invoke-HnsRequest',
+		ResultType: 2,
+		ToolTip: '\\r\\nInvoke-HnsRequest \\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-Item',
+		ListItemText: 'Invoke-Item',
+		ResultType: 2,
+		ToolTip: '\\r\\nInvoke-Item [-Path] <string[]> [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Credential <pscredential>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nInvoke-Item -LiteralPath <string[]> [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Credential <pscredential>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-LapsPolicyProcessing',
+		ListItemText: 'Invoke-LapsPolicyProcessing',
+		ResultType: 2,
+		ToolTip: 'Invoke-LapsPolicyProcessing\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-Mock',
+		ListItemText: 'Invoke-Mock',
+		ResultType: 2,
+		ToolTip: '\\r\\nInvoke-Mock \\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-OperationValidation',
+		ListItemText: 'Invoke-OperationValidation',
+		ResultType: 2,
+		ToolTip: '\\r\\nInvoke-OperationValidation \\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-Pester',
+		ListItemText: 'Invoke-Pester',
+		ResultType: 2,
+		ToolTip: '\\r\\nInvoke-Pester \\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-RestMethod',
+		ListItemText: 'Invoke-RestMethod',
+		ResultType: 2,
+		ToolTip: '\\r\\nInvoke-RestMethod [-Uri] <uri> [-FollowRelLink] [-MaximumFollowRelLink <int>] [-ResponseHeadersVariable <string>] [-StatusCodeVariable <string>] [-UseBasicParsing] [-HttpVersion <version>] [-WebSession <WebRequestSession>] [-SessionVariable <string>] [-AllowUnencryptedAuthentication] [-Authentication <WebAuthenticationType>] [-Credential <pscredential>] [-UseDefaultCredentials] [-CertificateThumbprint <string>] [-Certificate <X509Certificate>] [-SkipCertificateCheck] [-SslProtocol <WebSslProtocol>] [-Token <securestring>] [-UserAgent <string>] [-DisableKeepAlive] [-ConnectionTimeoutSeconds <int>] [-OperationTimeoutSeconds <int>] [-Headers <IDictionary>] [-SkipHeaderValidation] [-AllowInsecureRedirect] [-MaximumRedirection <int>] [-MaximumRetryCount <int>] [-PreserveAuthorizationOnRedirect] [-RetryIntervalSec <int>] [-Method <WebRequestMethod>] [-PreserveHttpMethodOnRedirect] [-UnixSocket <UnixDomainSocketEndPoint>] [-Proxy <uri>] [-ProxyCredential <pscredential>] [-ProxyUseDefaultCredentials] [-Body <Object>] [-Form <IDictionary>] [-ContentType <string>] [-TransferEncoding <string>] [-InFile <string>] [-OutFile <string>] [-PassThru] [-Resume] [-SkipHttpErrorCheck] [<CommonParameters>]\\r\\n\\r\\nInvoke-RestMethod [-Uri] <uri> -NoProxy [-FollowRelLink] [-MaximumFollowRelLink <int>] [-ResponseHeadersVariable <string>] [-StatusCodeVariable <string>] [-UseBasicParsing] [-HttpVersion <version>] [-WebSession <WebRequestSession>] [-SessionVariable <string>] [-AllowUnencryptedAuthentication] [-Authentication <WebAuthenticationType>] [-Credential <pscredential>] [-UseDefaultCredentials] [-CertificateThumbprint <string>] [-Certificate <X509Certificate>] [-SkipCertificateCheck] [-SslProtocol <WebSslProtocol>] [-Token <securestring>] [-UserAgent <string>] [-DisableKeepAlive] [-ConnectionTimeoutSeconds <int>] [-OperationTimeoutSeconds <int>] [-Headers <IDictionary>] [-SkipHeaderValidation] [-AllowInsecureRedirect] [-MaximumRedirection <int>] [-MaximumRetryCount <int>] [-PreserveAuthorizationOnRedirect] [-RetryIntervalSec <int>] [-Method <WebRequestMethod>] [-PreserveHttpMethodOnRedirect] [-UnixSocket <UnixDomainSocketEndPoint>] [-Body <Object>] [-Form <IDictionary>] [-ContentType <string>] [-TransferEncoding <string>] [-InFile <string>] [-OutFile <string>] [-PassThru] [-Resume] [-SkipHttpErrorCheck] [<CommonParameters>]\\r\\n\\r\\nInvoke-RestMethod [-Uri] <uri> -CustomMethod <string> [-FollowRelLink] [-MaximumFollowRelLink <int>] [-ResponseHeadersVariable <string>] [-StatusCodeVariable <string>] [-UseBasicParsing] [-HttpVersion <version>] [-WebSession <WebRequestSession>] [-SessionVariable <string>] [-AllowUnencryptedAuthentication] [-Authentication <WebAuthenticationType>] [-Credential <pscredential>] [-UseDefaultCredentials] [-CertificateThumbprint <string>] [-Certificate <X509Certificate>] [-SkipCertificateCheck] [-SslProtocol <WebSslProtocol>] [-Token <securestring>] [-UserAgent <string>] [-DisableKeepAlive] [-ConnectionTimeoutSeconds <int>] [-OperationTimeoutSeconds <int>] [-Headers <IDictionary>] [-SkipHeaderValidation] [-AllowInsecureRedirect] [-MaximumRedirection <int>] [-MaximumRetryCount <int>] [-PreserveAuthorizationOnRedirect] [-RetryIntervalSec <int>] [-PreserveHttpMethodOnRedirect] [-UnixSocket <UnixDomainSocketEndPoint>] [-Proxy <uri>] [-ProxyCredential <pscredential>] [-ProxyUseDefaultCredentials] [-Body <Object>] [-Form <IDictionary>] [-ContentType <string>] [-TransferEncoding <string>] [-InFile <string>] [-OutFile <string>] [-PassThru] [-Resume] [-SkipHttpErrorCheck] [<CommonParameters>]\\r\\n\\r\\nInvoke-RestMethod [-Uri] <uri> -CustomMethod <string> -NoProxy [-FollowRelLink] [-MaximumFollowRelLink <int>] [-ResponseHeadersVariable <string>] [-StatusCodeVariable <string>] [-UseBasicParsing] [-HttpVersion <version>] [-WebSession <WebRequestSession>] [-SessionVariable <string>] [-AllowUnencryptedAuthentication] [-Authentication <WebAuthenticationType>] [-Credential <pscredential>] [-UseDefaultCredentials] [-CertificateThumbprint <string>] [-Certificate <X509Certificate>] [-SkipCertificateCheck] [-SslProtocol <WebSslProtocol>] [-Token <securestring>] [-UserAgent <string>] [-DisableKeepAlive] [-ConnectionTimeoutSeconds <int>] [-OperationTimeoutSeconds <int>] [-Headers <IDictionary>] [-SkipHeaderValidation] [-AllowInsecureRedirect] [-MaximumRedirection <int>] [-MaximumRetryCount <int>] [-PreserveAuthorizationOnRedirect] [-RetryIntervalSec <int>] [-PreserveHttpMethodOnRedirect] [-UnixSocket <UnixDomainSocketEndPoint>] [-Body <Object>] [-Form <IDictionary>] [-ContentType <string>] [-TransferEncoding <string>] [-InFile <string>] [-OutFile <string>] [-PassThru] [-Resume] [-SkipHttpErrorCheck] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-TroubleshootingPack',
+		ListItemText: 'Invoke-TroubleshootingPack',
+		ResultType: 2,
+		ToolTip: 'Invoke-TroubleshootingPack\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-WebRequest',
+		ListItemText: 'Invoke-WebRequest',
+		ResultType: 2,
+		ToolTip: '\\r\\nInvoke-WebRequest [-Uri] <uri> [-UseBasicParsing] [-HttpVersion <version>] [-WebSession <WebRequestSession>] [-SessionVariable <string>] [-AllowUnencryptedAuthentication] [-Authentication <WebAuthenticationType>] [-Credential <pscredential>] [-UseDefaultCredentials] [-CertificateThumbprint <string>] [-Certificate <X509Certificate>] [-SkipCertificateCheck] [-SslProtocol <WebSslProtocol>] [-Token <securestring>] [-UserAgent <string>] [-DisableKeepAlive] [-ConnectionTimeoutSeconds <int>] [-OperationTimeoutSeconds <int>] [-Headers <IDictionary>] [-SkipHeaderValidation] [-AllowInsecureRedirect] [-MaximumRedirection <int>] [-MaximumRetryCount <int>] [-PreserveAuthorizationOnRedirect] [-RetryIntervalSec <int>] [-Method <WebRequestMethod>] [-PreserveHttpMethodOnRedirect] [-UnixSocket <UnixDomainSocketEndPoint>] [-Proxy <uri>] [-ProxyCredential <pscredential>] [-ProxyUseDefaultCredentials] [-Body <Object>] [-Form <IDictionary>] [-ContentType <string>] [-TransferEncoding <string>] [-InFile <string>] [-OutFile <string>] [-PassThru] [-Resume] [-SkipHttpErrorCheck] [<CommonParameters>]\\r\\n\\r\\nInvoke-WebRequest [-Uri] <uri> -NoProxy [-UseBasicParsing] [-HttpVersion <version>] [-WebSession <WebRequestSession>] [-SessionVariable <string>] [-AllowUnencryptedAuthentication] [-Authentication <WebAuthenticationType>] [-Credential <pscredential>] [-UseDefaultCredentials] [-CertificateThumbprint <string>] [-Certificate <X509Certificate>] [-SkipCertificateCheck] [-SslProtocol <WebSslProtocol>] [-Token <securestring>] [-UserAgent <string>] [-DisableKeepAlive] [-ConnectionTimeoutSeconds <int>] [-OperationTimeoutSeconds <int>] [-Headers <IDictionary>] [-SkipHeaderValidation] [-AllowInsecureRedirect] [-MaximumRedirection <int>] [-MaximumRetryCount <int>] [-PreserveAuthorizationOnRedirect] [-RetryIntervalSec <int>] [-Method <WebRequestMethod>] [-PreserveHttpMethodOnRedirect] [-UnixSocket <UnixDomainSocketEndPoint>] [-Body <Object>] [-Form <IDictionary>] [-ContentType <string>] [-TransferEncoding <string>] [-InFile <string>] [-OutFile <string>] [-PassThru] [-Resume] [-SkipHttpErrorCheck] [<CommonParameters>]\\r\\n\\r\\nInvoke-WebRequest [-Uri] <uri> -CustomMethod <string> [-UseBasicParsing] [-HttpVersion <version>] [-WebSession <WebRequestSession>] [-SessionVariable <string>] [-AllowUnencryptedAuthentication] [-Authentication <WebAuthenticationType>] [-Credential <pscredential>] [-UseDefaultCredentials] [-CertificateThumbprint <string>] [-Certificate <X509Certificate>] [-SkipCertificateCheck] [-SslProtocol <WebSslProtocol>] [-Token <securestring>] [-UserAgent <string>] [-DisableKeepAlive] [-ConnectionTimeoutSeconds <int>] [-OperationTimeoutSeconds <int>] [-Headers <IDictionary>] [-SkipHeaderValidation] [-AllowInsecureRedirect] [-MaximumRedirection <int>] [-MaximumRetryCount <int>] [-PreserveAuthorizationOnRedirect] [-RetryIntervalSec <int>] [-PreserveHttpMethodOnRedirect] [-UnixSocket <UnixDomainSocketEndPoint>] [-Proxy <uri>] [-ProxyCredential <pscredential>] [-ProxyUseDefaultCredentials] [-Body <Object>] [-Form <IDictionary>] [-ContentType <string>] [-TransferEncoding <string>] [-InFile <string>] [-OutFile <string>] [-PassThru] [-Resume] [-SkipHttpErrorCheck] [<CommonParameters>]\\r\\n\\r\\nInvoke-WebRequest [-Uri] <uri> -CustomMethod <string> -NoProxy [-UseBasicParsing] [-HttpVersion <version>] [-WebSession <WebRequestSession>] [-SessionVariable <string>] [-AllowUnencryptedAuthentication] [-Authentication <WebAuthenticationType>] [-Credential <pscredential>] [-UseDefaultCredentials] [-CertificateThumbprint <string>] [-Certificate <X509Certificate>] [-SkipCertificateCheck] [-SslProtocol <WebSslProtocol>] [-Token <securestring>] [-UserAgent <string>] [-DisableKeepAlive] [-ConnectionTimeoutSeconds <int>] [-OperationTimeoutSeconds <int>] [-Headers <IDictionary>] [-SkipHeaderValidation] [-AllowInsecureRedirect] [-MaximumRedirection <int>] [-MaximumRetryCount <int>] [-PreserveAuthorizationOnRedirect] [-RetryIntervalSec <int>] [-PreserveHttpMethodOnRedirect] [-UnixSocket <UnixDomainSocketEndPoint>] [-Body <Object>] [-Form <IDictionary>] [-ContentType <string>] [-TransferEncoding <string>] [-InFile <string>] [-OutFile <string>] [-PassThru] [-Resume] [-SkipHttpErrorCheck] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Invoke-WSManAction',
+		ListItemText: 'Invoke-WSManAction',
+		ResultType: 2,
+		ToolTip: 'Invoke-WSManAction\\r\\n'
+	},
+	{
+		CompletionText: 'iotstartup.exe',
+		ListItemText: 'iotstartup.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\iotstartup.exe'
+	},
+	{
+		CompletionText: 'ipal',
+		ListItemText: 'ipal',
+		ResultType: 2,
+		ToolTip: 'Import-Alias'
+	},
+	{
+		CompletionText: 'ipconfig.exe',
+		ListItemText: 'ipconfig.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\ipconfig.exe'
+	},
+	{
+		CompletionText: 'ipcsv',
+		ListItemText: 'ipcsv',
+		ResultType: 2,
+		ToolTip: 'Import-Csv'
+	},
+	{
+		CompletionText: 'ipmo',
+		ListItemText: 'ipmo',
+		ResultType: 2,
+		ToolTip: 'Import-Module'
+	},
+	{
+		CompletionText: 'irm',
+		ListItemText: 'irm',
+		ResultType: 2,
+		ToolTip: 'Invoke-RestMethod'
+	},
+	{
+		CompletionText: 'irprops.cpl',
+		ListItemText: 'irprops.cpl',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\irprops.cpl'
+	},
+	{
+		CompletionText: 'iru',
+		ListItemText: 'iru',
+		ResultType: 2,
+		ToolTip: 'iru'
+	},
+	{
+		CompletionText: 'iscsicli.exe',
+		ListItemText: 'iscsicli.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\iscsicli.exe'
+	},
+	{
+		CompletionText: 'iscsicpl.exe',
+		ListItemText: 'iscsicpl.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\iscsicpl.exe'
+	},
+	{
+		CompletionText: 'ISM.exe',
+		ListItemText: 'ISM.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\ISM.exe'
+	},
+	{
+		CompletionText: 'isoburn.exe',
+		ListItemText: 'isoburn.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\isoburn.exe'
+	},
+	{
+		CompletionText: 'isres',
+		ListItemText: 'isres',
+		ResultType: 2,
+		ToolTip: 'isres'
+	},
+	{
+		CompletionText: 'It',
+		ListItemText: 'It',
+		ResultType: 2,
+		ToolTip: '\\r\\nIt \\r\\n'
+	},
+	{
+		CompletionText: 'iwr',
+		ListItemText: 'iwr',
+		ResultType: 2,
+		ToolTip: 'Invoke-WebRequest'
+	},
+	{
+		CompletionText: 'J:',
+		ListItemText: 'J:',
+		ResultType: 2,
+		ToolTip: '\\r\\nJ: \\r\\n'
+	},
+	{
+		CompletionText: 'jabswitch.exe',
+		ListItemText: 'jabswitch.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\jabswitch.exe'
+	},
+	{
+		CompletionText: 'jar.exe',
+		ListItemText: 'jar.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\jar.exe'
+	},
+	{
+		CompletionText: 'jarsigner.exe',
+		ListItemText: 'jarsigner.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\jarsigner.exe'
+	},
+	{
+		CompletionText: 'java-rmi.exe',
+		ListItemText: 'java-rmi.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\java-rmi.exe'
+	},
+	{
+		CompletionText: 'java.exe',
+		ListItemText: 'java.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\java.exe'
+	},
+	{
+		CompletionText: 'javac.exe',
+		ListItemText: 'javac.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\javac.exe'
+	},
+	{
+		CompletionText: 'javadoc.exe',
+		ListItemText: 'javadoc.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\javadoc.exe'
+	},
+	{
+		CompletionText: 'javah.exe',
+		ListItemText: 'javah.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\javah.exe'
+	},
+	{
+		CompletionText: 'javap.exe',
+		ListItemText: 'javap.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\javap.exe'
+	},
+	{
+		CompletionText: 'javaw.exe',
+		ListItemText: 'javaw.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\javaw.exe'
+	},
+	{
+		CompletionText: 'jcmd.exe',
+		ListItemText: 'jcmd.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\jcmd.exe'
+	},
+	{
+		CompletionText: 'jconsole.exe',
+		ListItemText: 'jconsole.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\jconsole.exe'
+	},
+	{
+		CompletionText: 'jdb.exe',
+		ListItemText: 'jdb.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\jdb.exe'
+	},
+	{
+		CompletionText: 'jdeps.exe',
+		ListItemText: 'jdeps.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\jdeps.exe'
+	},
+	{
+		CompletionText: 'jfr.exe',
+		ListItemText: 'jfr.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\jfr.exe'
+	},
+	{
+		CompletionText: 'jhat.exe',
+		ListItemText: 'jhat.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\jhat.exe'
+	},
+	{
+		CompletionText: 'jinfo.exe',
+		ListItemText: 'jinfo.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\jinfo.exe'
+	},
+	{
+		CompletionText: 'jjs.exe',
+		ListItemText: 'jjs.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\jjs.exe'
+	},
+	{
+		CompletionText: 'jmap.exe',
+		ListItemText: 'jmap.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\jmap.exe'
+	},
+	{
+		CompletionText: 'Join-AdlStoreItem',
+		ListItemText: 'Join-AdlStoreItem',
+		ResultType: 2,
+		ToolTip: 'Join-AdlStoreItem'
+	},
+	{
+		CompletionText: 'Join-AzDataLakeStoreItem',
+		ListItemText: 'Join-AzDataLakeStoreItem',
+		ResultType: 2,
+		ToolTip: 'Join-AzDataLakeStoreItem\\r\\n'
+	},
+	{
+		CompletionText: 'Join-DtcDiagnosticResourceManager',
+		ListItemText: 'Join-DtcDiagnosticResourceManager',
+		ResultType: 2,
+		ToolTip: 'Join-DtcDiagnosticResourceManager\\r\\n'
+	},
+	{
+		CompletionText: 'Join-Path',
+		ListItemText: 'Join-Path',
+		ResultType: 2,
+		ToolTip: '\\r\\nJoin-Path [-Path] <string[]> [-ChildPath] <string> [[-AdditionalChildPath] <string[]>] [-Resolve] [-Credential <pscredential>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Join-String',
+		ListItemText: 'Join-String',
+		ResultType: 2,
+		ToolTip: '\\r\\nJoin-String [[-Property] <pspropertyexpression>] [[-Separator] <string>] [-OutputPrefix <string>] [-OutputSuffix <string>] [-UseCulture] [-InputObject <psobject[]>] [<CommonParameters>]\\r\\n\\r\\nJoin-String [[-Property] <pspropertyexpression>] [[-Separator] <string>] [-OutputPrefix <string>] [-OutputSuffix <string>] [-SingleQuote] [-UseCulture] [-InputObject <psobject[]>] [<CommonParameters>]\\r\\n\\r\\nJoin-String [[-Property] <pspropertyexpression>] [[-Separator] <string>] [-OutputPrefix <string>] [-OutputSuffix <string>] [-DoubleQuote] [-UseCulture] [-InputObject <psobject[]>] [<CommonParameters>]\\r\\n\\r\\nJoin-String [[-Property] <pspropertyexpression>] [[-Separator] <string>] [-OutputPrefix <string>] [-OutputSuffix <string>] [-FormatString <string>] [-UseCulture] [-InputObject <psobject[]>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'joy.cpl',
+		ListItemText: 'joy.cpl',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\joy.cpl'
+	},
+	{
+		CompletionText: 'jps.exe',
+		ListItemText: 'jps.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\jps.exe'
+	},
+	{
+		CompletionText: 'jrunscript.exe',
+		ListItemText: 'jrunscript.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\jrunscript.exe'
+	},
+	{
+		CompletionText: 'jsadebugd.exe',
+		ListItemText: 'jsadebugd.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\jsadebugd.exe'
+	},
+	{
+		CompletionText: 'jstack.exe',
+		ListItemText: 'jstack.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\jstack.exe'
+	},
+	{
+		CompletionText: 'jstat.exe',
+		ListItemText: 'jstat.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\jstat.exe'
+	},
+	{
+		CompletionText: 'jstatd.exe',
+		ListItemText: 'jstatd.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\jstatd.exe'
+	},
+	{
+		CompletionText: 'K:',
+		ListItemText: 'K:',
+		ResultType: 2,
+		ToolTip: '\\r\\nK: \\r\\n'
+	},
+	{
+		CompletionText: 'keyboxd.exe',
+		ListItemText: 'keyboxd.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files (x86)\\Gpg4win\\..\\GnuPG\\bin\\keyboxd.exe'
+	},
+	{
+		CompletionText: 'keytool.exe',
+		ListItemText: 'keytool.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\keytool.exe'
+	},
+	{
+		CompletionText: 'kill',
+		ListItemText: 'kill',
+		ResultType: 2,
+		ToolTip: 'Stop-Process'
+	},
+	{
+		CompletionText: 'kinit.exe',
+		ListItemText: 'kinit.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\kinit.exe'
+	},
+	{
+		CompletionText: 'klist.exe',
+		ListItemText: 'klist.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\klist.exe'
+	},
+	{
+		CompletionText: 'ksetup.exe',
+		ListItemText: 'ksetup.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\ksetup.exe'
+	},
+	{
+		CompletionText: 'ktab.exe',
+		ListItemText: 'ktab.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\ktab.exe'
+	},
+	{
+		CompletionText: 'ktmutil.exe',
+		ListItemText: 'ktmutil.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\ktmutil.exe'
+	},
+	{
+		CompletionText: 'kubectl.exe',
+		ListItemText: 'kubectl.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Docker\\Docker\\resources\\bin\\kubectl.exe'
+	},
+	{
+		CompletionText: 'L:',
+		ListItemText: 'L:',
+		ResultType: 2,
+		ToolTip: '\\r\\nL: \\r\\n'
+	},
+	{
+		CompletionText: 'la57setup.exe',
+		ListItemText: 'la57setup.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\la57setup.exe'
+	},
+	{
+		CompletionText: 'label.exe',
+		ListItemText: 'label.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\label.exe'
+	},
+	{
+		CompletionText: 'LanguageComponentsInstallerComHandler.exe',
+		ListItemText: 'LanguageComponentsInstallerComHandler.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\LanguageComponentsInstallerComHandler.exe'
+	},
+	{
+		CompletionText: 'LaunchTM.exe',
+		ListItemText: 'LaunchTM.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\LaunchTM.exe'
+	},
+	{
+		CompletionText: 'LaunchWinApp.exe',
+		ListItemText: 'LaunchWinApp.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\LaunchWinApp.exe'
+	},
+	{
+		CompletionText: 'LegacyNetUXHost.exe',
+		ListItemText: 'LegacyNetUXHost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\LegacyNetUXHost.exe'
+	},
+	{
+		CompletionText: 'less.exe',
+		ListItemText: 'less.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\nu\\bin\\less.exe'
+	},
+	{
+		CompletionText: 'LicenseManagerShellext.exe',
+		ListItemText: 'LicenseManagerShellext.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\LicenseManagerShellext.exe'
+	},
+	{
+		CompletionText: 'licensingdiag.exe',
+		ListItemText: 'licensingdiag.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\licensingdiag.exe'
+	},
+	{
+		CompletionText: 'LicensingUI.exe',
+		ListItemText: 'LicensingUI.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\LicensingUI.exe'
+	},
+	{
+		CompletionText: 'List-AzApplicationGatewayAvailableServerVariableAndHeader',
+		ListItemText: 'List-AzApplicationGatewayAvailableServerVariableAndHeader',
+		ResultType: 2,
+		ToolTip: 'List-AzApplicationGatewayAvailableServerVariableAndHeader'
+	},
+	{
+		CompletionText: 'List-AzApplicationGatewayAvailableSslOptions',
+		ListItemText: 'List-AzApplicationGatewayAvailableSslOptions',
+		ResultType: 2,
+		ToolTip: 'List-AzApplicationGatewayAvailableSslOptions'
+	},
+	{
+		CompletionText: 'List-AzApplicationGatewayAvailableWafRuleSets',
+		ListItemText: 'List-AzApplicationGatewayAvailableWafRuleSets',
+		ResultType: 2,
+		ToolTip: 'List-AzApplicationGatewayAvailableWafRuleSets'
+	},
+	{
+		CompletionText: 'List-AzApplicationGatewaySslPredefinedPolicy',
+		ListItemText: 'List-AzApplicationGatewaySslPredefinedPolicy',
+		ResultType: 2,
+		ToolTip: 'List-AzApplicationGatewaySslPredefinedPolicy'
+	},
+	{
+		CompletionText: 'LiveCaptions.exe',
+		ListItemText: 'LiveCaptions.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\LiveCaptions.exe'
+	},
+	{
+		CompletionText: 'LocationNotificationWindows.exe',
+		ListItemText: 'LocationNotificationWindows.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\LocationNotificationWindows.exe'
+	},
+	{
+		CompletionText: 'Locator.exe',
+		ListItemText: 'Locator.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\Locator.exe'
+	},
+	{
+		CompletionText: 'Lock-AzRmStorageContainerImmutabilityPolicy',
+		ListItemText: 'Lock-AzRmStorageContainerImmutabilityPolicy',
+		ResultType: 2,
+		ToolTip: 'Lock-AzRmStorageContainerImmutabilityPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Lock-BitLocker',
+		ListItemText: 'Lock-BitLocker',
+		ResultType: 2,
+		ToolTip: '\\r\\nLock-BitLocker \\r\\n'
+	},
+	{
+		CompletionText: 'LockAppHost.exe',
+		ListItemText: 'LockAppHost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\LockAppHost.exe'
+	},
+	{
+		CompletionText: 'LockScreenContentServer.exe',
+		ListItemText: 'LockScreenContentServer.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\LockScreenContentServer.exe'
+	},
+	{
+		CompletionText: 'lodctr.exe',
+		ListItemText: 'lodctr.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\lodctr.exe'
+	},
+	{
+		CompletionText: 'logagent.exe',
+		ListItemText: 'logagent.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\logagent.exe'
+	},
+	{
+		CompletionText: 'Login-AzAccount',
+		ListItemText: 'Login-AzAccount',
+		ResultType: 2,
+		ToolTip: 'Login-AzAccount'
+	},
+	{
+		CompletionText: 'Login-AzAsAccount',
+		ListItemText: 'Login-AzAsAccount',
+		ResultType: 2,
+		ToolTip: 'Login-AzAsAccount'
+	},
+	{
+		CompletionText: 'Login-AzureAsAccount',
+		ListItemText: 'Login-AzureAsAccount',
+		ResultType: 2,
+		ToolTip: 'Login-AzureAsAccount'
+	},
+	{
+		CompletionText: 'logman.exe',
+		ListItemText: 'logman.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\logman.exe'
+	},
+	{
+		CompletionText: 'logoff.exe',
+		ListItemText: 'logoff.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\logoff.exe'
+	},
+	{
+		CompletionText: 'LogonUI.exe',
+		ListItemText: 'LogonUI.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\LogonUI.exe'
+	},
+	{
+		CompletionText: 'Logout-AzAccount',
+		ListItemText: 'Logout-AzAccount',
+		ResultType: 2,
+		ToolTip: 'Logout-AzAccount'
+	},
+	{
+		CompletionText: 'lpkinstall.exe',
+		ListItemText: 'lpkinstall.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\lpkinstall.exe'
+	},
+	{
+		CompletionText: 'lpksetup.exe',
+		ListItemText: 'lpksetup.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\lpksetup.exe'
+	},
+	{
+		CompletionText: 'lpremove.exe',
+		ListItemText: 'lpremove.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\lpremove.exe'
+	},
+	{
+		CompletionText: 'ls',
+		ListItemText: 'ls',
+		ResultType: 2,
+		ToolTip: 'Get-ChildItem'
+	},
+	{
+		CompletionText: 'LsaIso.exe',
+		ListItemText: 'LsaIso.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\LsaIso.exe'
+	},
+	{
+		CompletionText: 'lsass.exe',
+		ListItemText: 'lsass.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\lsass.exe'
+	},
+	{
+		CompletionText: 'lusrmgr.msc',
+		ListItemText: 'lusrmgr.msc',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\lusrmgr.msc'
+	},
+	{
+		CompletionText: 'M:',
+		ListItemText: 'M:',
+		ResultType: 2,
+		ToolTip: '\\r\\nM: \\r\\n'
+	},
+	{
+		CompletionText: 'Magnify.exe',
+		ListItemText: 'Magnify.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\Magnify.exe'
+	},
+	{
+		CompletionText: 'main.cpl',
+		ListItemText: 'main.cpl',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\main.cpl'
+	},
+	{
+		CompletionText: 'makecab.exe',
+		ListItemText: 'makecab.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\makecab.exe'
+	},
+	{
+		CompletionText: 'man',
+		ListItemText: 'man',
+		ResultType: 2,
+		ToolTip: 'help'
+	},
+	{
+		CompletionText: 'manage-bde.exe',
+		ListItemText: 'manage-bde.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\manage-bde.exe'
+	},
+	{
+		CompletionText: 'manage-bde.wsf',
+		ListItemText: 'manage-bde.wsf',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\manage-bde.wsf'
+	},
+	{
+		CompletionText: 'markdown-it.exe',
+		ListItemText: 'markdown-it.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Programs\\Python\\Python310\\Scripts\\markdown-it.exe'
+	},
+	{
+		CompletionText: 'mavinject.exe',
+		ListItemText: 'mavinject.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\mavinject.exe'
+	},
+	{
+		CompletionText: 'mblctr.exe',
+		ListItemText: 'mblctr.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\mblctr.exe'
+	},
+	{
+		CompletionText: 'MBR2GPT.EXE',
+		ListItemText: 'MBR2GPT.EXE',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\MBR2GPT.EXE'
+	},
+	{
+		CompletionText: 'mcbuilder.exe',
+		ListItemText: 'mcbuilder.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\mcbuilder.exe'
+	},
+	{
+		CompletionText: 'MCU.exe',
+		ListItemText: 'MCU.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\MCU.exe'
+	},
+	{
+		CompletionText: 'md',
+		ListItemText: 'md',
+		ResultType: 2,
+		ToolTip: 'mkdir'
+	},
+	{
+		CompletionText: 'MDEServer.exe',
+		ListItemText: 'MDEServer.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\MDEServer.exe'
+	},
+	{
+		CompletionText: 'MDMAgent.exe',
+		ListItemText: 'MDMAgent.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\MDMAgent.exe'
+	},
+	{
+		CompletionText: 'MDMAppInstaller.exe',
+		ListItemText: 'MDMAppInstaller.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\MDMAppInstaller.exe'
+	},
+	{
+		CompletionText: 'MdmDiagnosticsTool.exe',
+		ListItemText: 'MdmDiagnosticsTool.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\MdmDiagnosticsTool.exe'
+	},
+	{
+		CompletionText: 'MdRes.exe',
+		ListItemText: 'MdRes.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\MdRes.exe'
+	},
+	{
+		CompletionText: 'MdSched.exe',
+		ListItemText: 'MdSched.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\MdSched.exe'
+	},
+	{
+		CompletionText: 'measure',
+		ListItemText: 'measure',
+		ResultType: 2,
+		ToolTip: 'Measure-Object'
+	},
+	{
+		CompletionText: 'Measure-Command',
+		ListItemText: 'Measure-Command',
+		ResultType: 2,
+		ToolTip: '\\r\\nMeasure-Command [-Expression] <scriptblock> [-InputObject <psobject>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Measure-Object',
+		ListItemText: 'Measure-Object',
+		ResultType: 2,
+		ToolTip: '\\r\\nMeasure-Object [[-Property] <pspropertyexpression[]>] [-InputObject <psobject>] [-StandardDeviation] [-Sum] [-AllStats] [-Average] [-Maximum] [-Minimum] [<CommonParameters>]\\r\\n\\r\\nMeasure-Object [[-Property] <pspropertyexpression[]>] [-InputObject <psobject>] [-Line] [-Word] [-Character] [-IgnoreWhiteSpace] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Measure-VM',
+		ListItemText: 'Measure-VM',
+		ResultType: 2,
+		ToolTip: 'Measure-VM\\r\\n'
+	},
+	{
+		CompletionText: 'Measure-VMReplication',
+		ListItemText: 'Measure-VMReplication',
+		ResultType: 2,
+		ToolTip: 'Measure-VMReplication\\r\\n'
+	},
+	{
+		CompletionText: 'Measure-VMResourcePool',
+		ListItemText: 'Measure-VMResourcePool',
+		ResultType: 2,
+		ToolTip: 'Measure-VMResourcePool\\r\\n'
+	},
+	{
+		CompletionText: 'MediaPlayer.exe',
+		ListItemText: 'MediaPlayer.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\MediaPlayer.exe'
+	},
+	{
+		CompletionText: 'Merge-CIPolicy',
+		ListItemText: 'Merge-CIPolicy',
+		ResultType: 2,
+		ToolTip: 'Merge-CIPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Merge-VHD',
+		ListItemText: 'Merge-VHD',
+		ResultType: 2,
+		ToolTip: 'Merge-VHD\\r\\n'
+	},
+	{
+		CompletionText: 'mfpmp.exe',
+		ListItemText: 'mfpmp.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\mfpmp.exe'
+	},
+	{
+		CompletionText: 'mi',
+		ListItemText: 'mi',
+		ResultType: 2,
+		ToolTip: 'Move-Item'
+	},
+	{
+		CompletionText: 'Microsoft.Uev.CscUnpinTool.exe',
+		ListItemText: 'Microsoft.Uev.CscUnpinTool.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\Microsoft.Uev.CscUnpinTool.exe'
+	},
+	{
+		CompletionText: 'Microsoft.Uev.SyncController.exe',
+		ListItemText: 'Microsoft.Uev.SyncController.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\Microsoft.Uev.SyncController.exe'
+	},
+	{
+		CompletionText: 'microsoft.windows.softwarelogo.showdesktop.exe',
+		ListItemText: 'microsoft.windows.softwarelogo.showdesktop.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\microsoft.windows.softwarelogo.showdesktop.exe'
+	},
+	{
+		CompletionText: 'MicrosoftEdgeBCHost.exe',
+		ListItemText: 'MicrosoftEdgeBCHost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\MicrosoftEdgeBCHost.exe'
+	},
+	{
+		CompletionText: 'MicrosoftEdgeCP.exe',
+		ListItemText: 'MicrosoftEdgeCP.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\MicrosoftEdgeCP.exe'
+	},
+	{
+		CompletionText: 'MicrosoftEdgeDevTools.exe',
+		ListItemText: 'MicrosoftEdgeDevTools.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\MicrosoftEdgeDevTools.exe'
+	},
+	{
+		CompletionText: 'MicrosoftEdgeSH.exe',
+		ListItemText: 'MicrosoftEdgeSH.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\MicrosoftEdgeSH.exe'
+	},
+	{
+		CompletionText: 'MicrosoftWindows.DesktopStickerEditorCentennial.exe',
+		ListItemText: 'MicrosoftWindows.DesktopStickerEditorCentennial.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\MicrosoftWindows.DesktopStickerEditorCentennial.exe'
+	},
+	{
+		CompletionText: 'mkdir',
+		ListItemText: 'mkdir',
+		ResultType: 2,
+		ToolTip: '\\r\\nmkdir [-Path] <string[]> [-Value <Object>] [-Force] [-Credential <pscredential>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nmkdir [[-Path] <string[]>] -Name <string> [-Value <Object>] [-Force] [-Credential <pscredential>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'mmc.exe',
+		ListItemText: 'mmc.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\mmc.exe'
+	},
+	{
+		CompletionText: 'mmgaserver.exe',
+		ListItemText: 'mmgaserver.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\mmgaserver.exe'
+	},
+	{
+		CompletionText: 'mmsys.cpl',
+		ListItemText: 'mmsys.cpl',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\mmsys.cpl'
+	},
+	{
+		CompletionText: 'mobsync.exe',
+		ListItemText: 'mobsync.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\mobsync.exe'
+	},
+	{
+		CompletionText: 'Mock',
+		ListItemText: 'Mock',
+		ResultType: 2,
+		ToolTip: '\\r\\nMock \\r\\n'
+	},
+	{
+		CompletionText: 'mode.com',
+		ListItemText: 'mode.com',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\mode.com'
+	},
+	{
+		CompletionText: 'mofcomp.exe',
+		ListItemText: 'mofcomp.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\System32\\Wbem\\mofcomp.exe'
+	},
+	{
+		CompletionText: 'MoNotificationUxStub.exe',
+		ListItemText: 'MoNotificationUxStub.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\MoNotificationUxStub.exe'
+	},
+	{
+		CompletionText: 'more.com',
+		ListItemText: 'more.com',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\more.com'
+	},
+	{
+		CompletionText: 'mount',
+		ListItemText: 'mount',
+		ResultType: 2,
+		ToolTip: 'New-PSDrive'
+	},
+	{
+		CompletionText: 'Mount-AppPackageVolume',
+		ListItemText: 'Mount-AppPackageVolume',
+		ResultType: 2,
+		ToolTip: 'Mount-AppPackageVolume'
+	},
+	{
+		CompletionText: 'Mount-AppxVolume',
+		ListItemText: 'Mount-AppxVolume',
+		ResultType: 2,
+		ToolTip: 'Mount-AppxVolume\\r\\n'
+	},
+	{
+		CompletionText: 'Mount-DiskImage',
+		ListItemText: 'Mount-DiskImage',
+		ResultType: 2,
+		ToolTip: '\\r\\nMount-DiskImage \\r\\n'
+	},
+	{
+		CompletionText: 'mount-sqlite',
+		ListItemText: 'mount-sqlite',
+		ResultType: 2,
+		ToolTip: '\\r\\nmount-sqlite \\r\\n'
+	},
+	{
+		CompletionText: 'Mount-VHD',
+		ListItemText: 'Mount-VHD',
+		ResultType: 2,
+		ToolTip: 'Mount-VHD\\r\\n'
+	},
+	{
+		CompletionText: 'Mount-VMHostAssignableDevice',
+		ListItemText: 'Mount-VMHostAssignableDevice',
+		ResultType: 2,
+		ToolTip: 'Mount-VMHostAssignableDevice\\r\\n'
+	},
+	{
+		CompletionText: 'Mount-WindowsImage',
+		ListItemText: 'Mount-WindowsImage',
+		ResultType: 2,
+		ToolTip: 'Mount-WindowsImage\\r\\n'
+	},
+	{
+		CompletionText: 'mountvol.exe',
+		ListItemText: 'mountvol.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\mountvol.exe'
+	},
+	{
+		CompletionText: 'move',
+		ListItemText: 'move',
+		ResultType: 2,
+		ToolTip: 'Move-Item'
+	},
+	{
+		CompletionText: 'Move-AdlStoreItem',
+		ListItemText: 'Move-AdlStoreItem',
+		ResultType: 2,
+		ToolTip: 'Move-AdlStoreItem'
+	},
+	{
+		CompletionText: 'Move-AppPackage',
+		ListItemText: 'Move-AppPackage',
+		ResultType: 2,
+		ToolTip: 'Move-AppPackage'
+	},
+	{
+		CompletionText: 'Move-AppxPackage',
+		ListItemText: 'Move-AppxPackage',
+		ResultType: 2,
+		ToolTip: 'Move-AppxPackage\\r\\n'
+	},
+	{
+		CompletionText: 'Move-AzAutomationHybridRunbookWorker',
+		ListItemText: 'Move-AzAutomationHybridRunbookWorker',
+		ResultType: 2,
+		ToolTip: 'Move-AzAutomationHybridRunbookWorker\\r\\n'
+	},
+	{
+		CompletionText: 'Move-AzDataLakeGen2Item',
+		ListItemText: 'Move-AzDataLakeGen2Item',
+		ResultType: 2,
+		ToolTip: 'Move-AzDataLakeGen2Item\\r\\n'
+	},
+	{
+		CompletionText: 'Move-AzDataLakeStoreItem',
+		ListItemText: 'Move-AzDataLakeStoreItem',
+		ResultType: 2,
+		ToolTip: 'Move-AzDataLakeStoreItem\\r\\n'
+	},
+	{
+		CompletionText: 'Move-AzExpressRouteCircuit',
+		ListItemText: 'Move-AzExpressRouteCircuit',
+		ResultType: 2,
+		ToolTip: 'Move-AzExpressRouteCircuit\\r\\n'
+	},
+	{
+		CompletionText: 'Move-AzMlCommitmentAssociation',
+		ListItemText: 'Move-AzMlCommitmentAssociation',
+		ResultType: 2,
+		ToolTip: 'Move-AzMlCommitmentAssociation\\r\\n'
+	},
+	{
+		CompletionText: 'Move-AzRecoveryServicesBackupRecoveryPoint',
+		ListItemText: 'Move-AzRecoveryServicesBackupRecoveryPoint',
+		ResultType: 2,
+		ToolTip: 'Move-AzRecoveryServicesBackupRecoveryPoint\\r\\n'
+	},
+	{
+		CompletionText: 'Move-AzResource',
+		ListItemText: 'Move-AzResource',
+		ResultType: 2,
+		ToolTip: 'Move-AzResource\\r\\n'
+	},
+	{
+		CompletionText: 'Move-Item',
+		ListItemText: 'Move-Item',
+		ResultType: 2,
+		ToolTip: '\\r\\nMove-Item [-Path] <string[]> [[-Destination] <string>] [-Force] [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-PassThru] [-Credential <pscredential>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nMove-Item [[-Destination] <string>] -LiteralPath <string[]> [-Force] [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-PassThru] [-Credential <pscredential>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Move-ItemProperty',
+		ListItemText: 'Move-ItemProperty',
+		ResultType: 2,
+		ToolTip: '\\r\\nMove-ItemProperty [-Path] <string[]> [-Destination] <string> [-Name] <string[]> [-PassThru] [-Force] [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Credential <pscredential>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nMove-ItemProperty [-Destination] <string> [-Name] <string[]> -LiteralPath <string[]> [-PassThru] [-Force] [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Credential <pscredential>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Move-SmbClient',
+		ListItemText: 'Move-SmbClient',
+		ResultType: 2,
+		ToolTip: 'Move-SmbClient'
+	},
+	{
+		CompletionText: 'Move-SmbWitnessClient',
+		ListItemText: 'Move-SmbWitnessClient',
+		ResultType: 2,
+		ToolTip: '\\r\\nMove-SmbWitnessClient \\r\\n'
+	},
+	{
+		CompletionText: 'Move-VM',
+		ListItemText: 'Move-VM',
+		ResultType: 2,
+		ToolTip: 'Move-VM\\r\\n'
+	},
+	{
+		CompletionText: 'Move-VMStorage',
+		ListItemText: 'Move-VMStorage',
+		ResultType: 2,
+		ToolTip: 'Move-VMStorage\\r\\n'
+	},
+	{
+		CompletionText: 'mp',
+		ListItemText: 'mp',
+		ResultType: 2,
+		ToolTip: 'Move-ItemProperty'
+	},
+	{
+		CompletionText: 'mpnotify.exe',
+		ListItemText: 'mpnotify.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\mpnotify.exe'
+	},
+	{
+		CompletionText: 'MpSigStub.exe',
+		ListItemText: 'MpSigStub.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\MpSigStub.exe'
+	},
+	{
+		CompletionText: 'MRINFO.EXE',
+		ListItemText: 'MRINFO.EXE',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\MRINFO.EXE'
+	},
+	{
+		CompletionText: 'MRT.exe',
+		ListItemText: 'MRT.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\MRT.exe'
+	},
+	{
+		CompletionText: 'ms-teams.exe',
+		ListItemText: 'ms-teams.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\ms-teams.exe'
+	},
+	{
+		CompletionText: 'ms-teamsupdate.exe',
+		ListItemText: 'ms-teamsupdate.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\ms-teamsupdate.exe'
+	},
+	{
+		CompletionText: 'ms-teams_autostarter.exe',
+		ListItemText: 'ms-teams_autostarter.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\ms-teams_autostarter.exe'
+	},
+	{
+		CompletionText: 'MSBuild.exe',
+		ListItemText: 'MSBuild.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\MSBuild\\15.0\\Bin\\MSBuild.exe'
+	},
+	{
+		CompletionText: 'MSBuildTaskHost.exe',
+		ListItemText: 'MSBuildTaskHost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\MSBuild\\15.0\\Bin\\MSBuildTaskHost.exe'
+	},
+	{
+		CompletionText: 'MSchedExe.exe',
+		ListItemText: 'MSchedExe.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\MSchedExe.exe'
+	},
+	{
+		CompletionText: 'msconfig.exe',
+		ListItemText: 'msconfig.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\msconfig.exe'
+	},
+	{
+		CompletionText: 'msdt.exe',
+		ListItemText: 'msdt.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\msdt.exe'
+	},
+	{
+		CompletionText: 'msdtc.exe',
+		ListItemText: 'msdtc.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\msdtc.exe'
+	},
+	{
+		CompletionText: 'msfeedssync.exe',
+		ListItemText: 'msfeedssync.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\msfeedssync.exe'
+	},
+	{
+		CompletionText: 'msg.exe',
+		ListItemText: 'msg.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\msg.exe'
+	},
+	{
+		CompletionText: 'mshta.exe',
+		ListItemText: 'mshta.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\mshta.exe'
+	},
+	{
+		CompletionText: 'msiexec.exe',
+		ListItemText: 'msiexec.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\msiexec.exe'
+	},
+	{
+		CompletionText: 'msinfo32.exe',
+		ListItemText: 'msinfo32.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\msinfo32.exe'
+	},
+	{
+		CompletionText: 'msmbw',
+		ListItemText: 'msmbw',
+		ResultType: 2,
+		ToolTip: 'msmbw'
+	},
+	{
+		CompletionText: 'mspaint.exe',
+		ListItemText: 'mspaint.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\mspaint.exe'
+	},
+	{
+		CompletionText: 'msra.exe',
+		ListItemText: 'msra.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\msra.exe'
+	},
+	{
+		CompletionText: 'msrdc.exe',
+		ListItemText: 'msrdc.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\msrdc.exe'
+	},
+	{
+		CompletionText: 'MsSpellCheckingHost.exe',
+		ListItemText: 'MsSpellCheckingHost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\MsSpellCheckingHost.exe'
+	},
+	{
+		CompletionText: 'msteams.exe',
+		ListItemText: 'msteams.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\msteams.exe'
+	},
+	{
+		CompletionText: 'msteamsupdate.exe',
+		ListItemText: 'msteamsupdate.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\msteamsupdate.exe'
+	},
+	{
+		CompletionText: 'msteams_autostarter.exe',
+		ListItemText: 'msteams_autostarter.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\msteams_autostarter.exe'
+	},
+	{
+		CompletionText: 'mstsc.exe',
+		ListItemText: 'mstsc.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\mstsc.exe'
+	},
+	{
+		CompletionText: 'mtstocom.exe',
+		ListItemText: 'mtstocom.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\mtstocom.exe'
+	},
+	{
+		CompletionText: 'MuiUnattend.exe',
+		ListItemText: 'MuiUnattend.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\MuiUnattend.exe'
+	},
+	{
+		CompletionText: 'MultiDigiMon.exe',
+		ListItemText: 'MultiDigiMon.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\MultiDigiMon.exe'
+	},
+	{
+		CompletionText: 'mv',
+		ListItemText: 'mv',
+		ResultType: 2,
+		ToolTip: 'Move-Item'
+	},
+	{
+		CompletionText: 'mvmr',
+		ListItemText: 'mvmr',
+		ResultType: 2,
+		ToolTip: 'mvmr'
+	},
+	{
+		CompletionText: 'N:',
+		ListItemText: 'N:',
+		ResultType: 2,
+		ToolTip: '\\r\\nN: \\r\\n'
+	},
+	{
+		CompletionText: 'nal',
+		ListItemText: 'nal',
+		ResultType: 2,
+		ToolTip: 'New-Alias'
+	},
+	{
+		CompletionText: 'Narrator.exe',
+		ListItemText: 'Narrator.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\Narrator.exe'
+	},
+	{
+		CompletionText: 'native2ascii.exe',
+		ListItemText: 'native2ascii.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\native2ascii.exe'
+	},
+	{
+		CompletionText: 'nbtstat.exe',
+		ListItemText: 'nbtstat.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\nbtstat.exe'
+	},
+	{
+		CompletionText: 'ncim',
+		ListItemText: 'ncim',
+		ResultType: 2,
+		ToolTip: 'ncim'
+	},
+	{
+		CompletionText: 'ncms',
+		ListItemText: 'ncms',
+		ResultType: 2,
+		ToolTip: 'ncms'
+	},
+	{
+		CompletionText: 'ncpa.cpl',
+		ListItemText: 'ncpa.cpl',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\ncpa.cpl'
+	},
+	{
+		CompletionText: 'ncso',
+		ListItemText: 'ncso',
+		ResultType: 2,
+		ToolTip: 'ncso'
+	},
+	{
+		CompletionText: 'ndadmin.exe',
+		ListItemText: 'ndadmin.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\ndadmin.exe'
+	},
+	{
+		CompletionText: 'NDKPerfCmd.exe',
+		ListItemText: 'NDKPerfCmd.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\NDKPerfCmd.exe'
+	},
+	{
+		CompletionText: 'NDKPing.exe',
+		ListItemText: 'NDKPing.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\NDKPing.exe'
+	},
+	{
+		CompletionText: 'ndr',
+		ListItemText: 'ndr',
+		ResultType: 2,
+		ToolTip: 'New-PSDrive'
+	},
+	{
+		CompletionText: 'net.exe',
+		ListItemText: 'net.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\net.exe'
+	},
+	{
+		CompletionText: 'net1.exe',
+		ListItemText: 'net1.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\net1.exe'
+	},
+	{
+		CompletionText: 'netbtugc.exe',
+		ListItemText: 'netbtugc.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\netbtugc.exe'
+	},
+	{
+		CompletionText: 'netcfg.exe',
+		ListItemText: 'netcfg.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\netcfg.exe'
+	},
+	{
+		CompletionText: 'NetCfgNotifyObjectHost.exe',
+		ListItemText: 'NetCfgNotifyObjectHost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\NetCfgNotifyObjectHost.exe'
+	},
+	{
+		CompletionText: 'NetEvtFwdr.exe',
+		ListItemText: 'NetEvtFwdr.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\NetEvtFwdr.exe'
+	},
+	{
+		CompletionText: 'NetHost.exe',
+		ListItemText: 'NetHost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\NetHost.exe'
+	},
+	{
+		CompletionText: 'netiougc.exe',
+		ListItemText: 'netiougc.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\netiougc.exe'
+	},
+	{
+		CompletionText: 'Netplwiz.exe',
+		ListItemText: 'Netplwiz.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\Netplwiz.exe'
+	},
+	{
+		CompletionText: 'netsh.exe',
+		ListItemText: 'netsh.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\netsh.exe'
+	},
+	{
+		CompletionText: 'NETSTAT.EXE',
+		ListItemText: 'NETSTAT.EXE',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\NETSTAT.EXE'
+	},
+	{
+		CompletionText: 'New-AdlAnalyticsAccount',
+		ListItemText: 'New-AdlAnalyticsAccount',
+		ResultType: 2,
+		ToolTip: 'New-AdlAnalyticsAccount'
+	},
+	{
+		CompletionText: 'New-AdlAnalyticsComputePolicy',
+		ListItemText: 'New-AdlAnalyticsComputePolicy',
+		ResultType: 2,
+		ToolTip: 'New-AdlAnalyticsComputePolicy'
+	},
+	{
+		CompletionText: 'New-AdlCatalogCredential',
+		ListItemText: 'New-AdlCatalogCredential',
+		ResultType: 2,
+		ToolTip: 'New-AdlCatalogCredential'
+	},
+	{
+		CompletionText: 'New-AdlCatalogSecret',
+		ListItemText: 'New-AdlCatalogSecret',
+		ResultType: 2,
+		ToolTip: 'New-AdlCatalogSecret'
+	},
+	{
+		CompletionText: 'New-AdlStore',
+		ListItemText: 'New-AdlStore',
+		ResultType: 2,
+		ToolTip: 'New-AdlStore'
+	},
+	{
+		CompletionText: 'New-AdlStoreItem',
+		ListItemText: 'New-AdlStoreItem',
+		ResultType: 2,
+		ToolTip: 'New-AdlStoreItem'
+	},
+	{
+		CompletionText: 'New-Alias',
+		ListItemText: 'New-Alias',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-Alias [-Name] <string> [-Value] <string> [-Description <string>] [-Option <ScopedItemOptions>] [-PassThru] [-Scope <string>] [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'New-AppLockerPolicy',
+		ListItemText: 'New-AppLockerPolicy',
+		ResultType: 2,
+		ToolTip: 'New-AppLockerPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'New-ASRFabric',
+		ListItemText: 'New-ASRFabric',
+		ResultType: 2,
+		ToolTip: 'New-ASRFabric'
+	},
+	{
+		CompletionText: 'New-AsrInMageAzureV2DiskInput',
+		ListItemText: 'New-AsrInMageAzureV2DiskInput',
+		ResultType: 2,
+		ToolTip: 'New-AsrInMageAzureV2DiskInput'
+	},
+	{
+		CompletionText: 'New-ASRInMageRcmDiskInput',
+		ListItemText: 'New-ASRInMageRcmDiskInput',
+		ResultType: 2,
+		ToolTip: 'New-ASRInMageRcmDiskInput'
+	},
+	{
+		CompletionText: 'New-ASRNetworkMapping',
+		ListItemText: 'New-ASRNetworkMapping',
+		ResultType: 2,
+		ToolTip: 'New-ASRNetworkMapping'
+	},
+	{
+		CompletionText: 'New-ASRPolicy',
+		ListItemText: 'New-ASRPolicy',
+		ResultType: 2,
+		ToolTip: 'New-ASRPolicy'
+	},
+	{
+		CompletionText: 'New-ASRProtectableItem',
+		ListItemText: 'New-ASRProtectableItem',
+		ResultType: 2,
+		ToolTip: 'New-ASRProtectableItem'
+	},
+	{
+		CompletionText: 'New-ASRProtectionContainerMapping',
+		ListItemText: 'New-ASRProtectionContainerMapping',
+		ResultType: 2,
+		ToolTip: 'New-ASRProtectionContainerMapping'
+	},
+	{
+		CompletionText: 'New-ASRRecoveryPlan',
+		ListItemText: 'New-ASRRecoveryPlan',
+		ResultType: 2,
+		ToolTip: 'New-ASRRecoveryPlan'
+	},
+	{
+		CompletionText: 'New-ASRReplicationProtectedItem',
+		ListItemText: 'New-ASRReplicationProtectedItem',
+		ResultType: 2,
+		ToolTip: 'New-ASRReplicationProtectedItem'
+	},
+	{
+		CompletionText: 'New-ASRRP',
+		ListItemText: 'New-ASRRP',
+		ResultType: 2,
+		ToolTip: 'New-ASRRP'
+	},
+	{
+		CompletionText: 'New-ASRStorageClassificationMapping',
+		ListItemText: 'New-ASRStorageClassificationMapping',
+		ResultType: 2,
+		ToolTip: 'New-ASRStorageClassificationMapping'
+	},
+	{
+		CompletionText: 'New-ASRvCenter',
+		ListItemText: 'New-ASRvCenter',
+		ResultType: 2,
+		ToolTip: 'New-ASRvCenter'
+	},
+	{
+		CompletionText: 'New-ASRVMNicConfig',
+		ListItemText: 'New-ASRVMNicConfig',
+		ResultType: 2,
+		ToolTip: 'New-ASRVMNicConfig'
+	},
+	{
+		CompletionText: 'New-AutologgerConfig',
+		ListItemText: 'New-AutologgerConfig',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AutologgerConfig \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzActionGroupReceiver',
+		ListItemText: 'New-AzActionGroupReceiver',
+		ResultType: 2,
+		ToolTip: 'New-AzActionGroupReceiver\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzActivityLogAlert',
+		ListItemText: 'New-AzActivityLogAlert',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzActivityLogAlert \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzActivityLogAlertActionGroupObject',
+		ListItemText: 'New-AzActivityLogAlertActionGroupObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzActivityLogAlertActionGroupObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzActivityLogAlertAlertRuleAnyOfOrLeafConditionObject',
+		ListItemText: 'New-AzActivityLogAlertAlertRuleAnyOfOrLeafConditionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzActivityLogAlertAlertRuleAnyOfOrLeafConditionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzActivityLogAlertAlertRuleLeafConditionObject',
+		ListItemText: 'New-AzActivityLogAlertAlertRuleLeafConditionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzActivityLogAlertAlertRuleLeafConditionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzADAppCredential',
+		ListItemText: 'New-AzADAppCredential',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzADAppCredential \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzADAppFederatedCredential',
+		ListItemText: 'New-AzADAppFederatedCredential',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzADAppFederatedCredential \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzADApplication',
+		ListItemText: 'New-AzADApplication',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzADApplication \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzADGroup',
+		ListItemText: 'New-AzADGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzADGroup \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzADServicePrincipal',
+		ListItemText: 'New-AzADServicePrincipal',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzADServicePrincipal \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzADServicePrincipalCredential',
+		ListItemText: 'New-AzADServicePrincipalCredential',
+		ResultType: 2,
+		ToolTip: 'New-AzADServicePrincipalCredential'
+	},
+	{
+		CompletionText: 'New-AzADSpCredential',
+		ListItemText: 'New-AzADSpCredential',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzADSpCredential \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzADUser',
+		ListItemText: 'New-AzADUser',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzADUser \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAksCluster',
+		ListItemText: 'New-AzAksCluster',
+		ResultType: 2,
+		ToolTip: 'New-AzAksCluster\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAksMaintenanceConfiguration',
+		ListItemText: 'New-AzAksMaintenanceConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzAksMaintenanceConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAksNodePool',
+		ListItemText: 'New-AzAksNodePool',
+		ResultType: 2,
+		ToolTip: 'New-AzAksNodePool\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAksSnapshot',
+		ListItemText: 'New-AzAksSnapshot',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzAksSnapshot \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAksTimeInWeekObject',
+		ListItemText: 'New-AzAksTimeInWeekObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzAksTimeInWeekObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAksTimeSpanObject',
+		ListItemText: 'New-AzAksTimeSpanObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzAksTimeSpanObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAlertRuleEmail',
+		ListItemText: 'New-AzAlertRuleEmail',
+		ResultType: 2,
+		ToolTip: 'New-AzAlertRuleEmail\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAlertRuleWebhook',
+		ListItemText: 'New-AzAlertRuleWebhook',
+		ResultType: 2,
+		ToolTip: 'New-AzAlertRuleWebhook\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAlertsSuppressionRuleScope',
+		ListItemText: 'New-AzAlertsSuppressionRuleScope',
+		ResultType: 2,
+		ToolTip: 'New-AzAlertsSuppressionRuleScope\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAnalysisServicesFirewallConfig',
+		ListItemText: 'New-AzAnalysisServicesFirewallConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzAnalysisServicesFirewallConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAnalysisServicesFirewallRule',
+		ListItemText: 'New-AzAnalysisServicesFirewallRule',
+		ResultType: 2,
+		ToolTip: 'New-AzAnalysisServicesFirewallRule\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAnalysisServicesServer',
+		ListItemText: 'New-AzAnalysisServicesServer',
+		ResultType: 2,
+		ToolTip: 'New-AzAnalysisServicesServer\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApiManagement',
+		ListItemText: 'New-AzApiManagement',
+		ResultType: 2,
+		ToolTip: 'New-AzApiManagement\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApiManagementApi',
+		ListItemText: 'New-AzApiManagementApi',
+		ResultType: 2,
+		ToolTip: 'New-AzApiManagementApi\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApiManagementApiRelease',
+		ListItemText: 'New-AzApiManagementApiRelease',
+		ResultType: 2,
+		ToolTip: 'New-AzApiManagementApiRelease\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApiManagementApiRevision',
+		ListItemText: 'New-AzApiManagementApiRevision',
+		ResultType: 2,
+		ToolTip: 'New-AzApiManagementApiRevision\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApiManagementApiSchema',
+		ListItemText: 'New-AzApiManagementApiSchema',
+		ResultType: 2,
+		ToolTip: 'New-AzApiManagementApiSchema\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApiManagementApiVersionSet',
+		ListItemText: 'New-AzApiManagementApiVersionSet',
+		ResultType: 2,
+		ToolTip: 'New-AzApiManagementApiVersionSet\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApiManagementAuthorizationServer',
+		ListItemText: 'New-AzApiManagementAuthorizationServer',
+		ResultType: 2,
+		ToolTip: 'New-AzApiManagementAuthorizationServer\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApiManagementBackend',
+		ListItemText: 'New-AzApiManagementBackend',
+		ResultType: 2,
+		ToolTip: 'New-AzApiManagementBackend\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApiManagementBackendCredential',
+		ListItemText: 'New-AzApiManagementBackendCredential',
+		ResultType: 2,
+		ToolTip: 'New-AzApiManagementBackendCredential\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApiManagementBackendProxy',
+		ListItemText: 'New-AzApiManagementBackendProxy',
+		ResultType: 2,
+		ToolTip: 'New-AzApiManagementBackendProxy\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApiManagementBackendServiceFabric',
+		ListItemText: 'New-AzApiManagementBackendServiceFabric',
+		ResultType: 2,
+		ToolTip: 'New-AzApiManagementBackendServiceFabric\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApiManagementCache',
+		ListItemText: 'New-AzApiManagementCache',
+		ResultType: 2,
+		ToolTip: 'New-AzApiManagementCache\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApiManagementCertificate',
+		ListItemText: 'New-AzApiManagementCertificate',
+		ResultType: 2,
+		ToolTip: 'New-AzApiManagementCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApiManagementContext',
+		ListItemText: 'New-AzApiManagementContext',
+		ResultType: 2,
+		ToolTip: 'New-AzApiManagementContext\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApiManagementCustomHostnameConfiguration',
+		ListItemText: 'New-AzApiManagementCustomHostnameConfiguration',
+		ResultType: 2,
+		ToolTip: 'New-AzApiManagementCustomHostnameConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApiManagementDiagnostic',
+		ListItemText: 'New-AzApiManagementDiagnostic',
+		ResultType: 2,
+		ToolTip: 'New-AzApiManagementDiagnostic\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApiManagementGateway',
+		ListItemText: 'New-AzApiManagementGateway',
+		ResultType: 2,
+		ToolTip: 'New-AzApiManagementGateway\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApiManagementGatewayHostnameConfiguration',
+		ListItemText: 'New-AzApiManagementGatewayHostnameConfiguration',
+		ResultType: 2,
+		ToolTip: 'New-AzApiManagementGatewayHostnameConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApiManagementGroup',
+		ListItemText: 'New-AzApiManagementGroup',
+		ResultType: 2,
+		ToolTip: 'New-AzApiManagementGroup\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApiManagementHttpMessageDiagnostic',
+		ListItemText: 'New-AzApiManagementHttpMessageDiagnostic',
+		ResultType: 2,
+		ToolTip: 'New-AzApiManagementHttpMessageDiagnostic\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApiManagementIdentityProvider',
+		ListItemText: 'New-AzApiManagementIdentityProvider',
+		ResultType: 2,
+		ToolTip: 'New-AzApiManagementIdentityProvider\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApiManagementKeyVaultObject',
+		ListItemText: 'New-AzApiManagementKeyVaultObject',
+		ResultType: 2,
+		ToolTip: 'New-AzApiManagementKeyVaultObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApiManagementLogger',
+		ListItemText: 'New-AzApiManagementLogger',
+		ResultType: 2,
+		ToolTip: 'New-AzApiManagementLogger\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApiManagementNamedValue',
+		ListItemText: 'New-AzApiManagementNamedValue',
+		ResultType: 2,
+		ToolTip: 'New-AzApiManagementNamedValue\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApiManagementOpenIdConnectProvider',
+		ListItemText: 'New-AzApiManagementOpenIdConnectProvider',
+		ResultType: 2,
+		ToolTip: 'New-AzApiManagementOpenIdConnectProvider\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApiManagementOperation',
+		ListItemText: 'New-AzApiManagementOperation',
+		ResultType: 2,
+		ToolTip: 'New-AzApiManagementOperation\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApiManagementPipelineDiagnosticSetting',
+		ListItemText: 'New-AzApiManagementPipelineDiagnosticSetting',
+		ResultType: 2,
+		ToolTip: 'New-AzApiManagementPipelineDiagnosticSetting\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApiManagementProduct',
+		ListItemText: 'New-AzApiManagementProduct',
+		ResultType: 2,
+		ToolTip: 'New-AzApiManagementProduct\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApiManagementRegion',
+		ListItemText: 'New-AzApiManagementRegion',
+		ResultType: 2,
+		ToolTip: 'New-AzApiManagementRegion\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApiManagementResourceLocationObject',
+		ListItemText: 'New-AzApiManagementResourceLocationObject',
+		ResultType: 2,
+		ToolTip: 'New-AzApiManagementResourceLocationObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApiManagementSamplingSetting',
+		ListItemText: 'New-AzApiManagementSamplingSetting',
+		ResultType: 2,
+		ToolTip: 'New-AzApiManagementSamplingSetting\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApiManagementSslSetting',
+		ListItemText: 'New-AzApiManagementSslSetting',
+		ResultType: 2,
+		ToolTip: 'New-AzApiManagementSslSetting\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApiManagementSubscription',
+		ListItemText: 'New-AzApiManagementSubscription',
+		ResultType: 2,
+		ToolTip: 'New-AzApiManagementSubscription\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApiManagementSystemCertificate',
+		ListItemText: 'New-AzApiManagementSystemCertificate',
+		ResultType: 2,
+		ToolTip: 'New-AzApiManagementSystemCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApiManagementUser',
+		ListItemText: 'New-AzApiManagementUser',
+		ResultType: 2,
+		ToolTip: 'New-AzApiManagementUser\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApiManagementUserToken',
+		ListItemText: 'New-AzApiManagementUserToken',
+		ResultType: 2,
+		ToolTip: 'New-AzApiManagementUserToken\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApiManagementVirtualNetwork',
+		ListItemText: 'New-AzApiManagementVirtualNetwork',
+		ResultType: 2,
+		ToolTip: 'New-AzApiManagementVirtualNetwork\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAppConfigurationStore',
+		ListItemText: 'New-AzAppConfigurationStore',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzAppConfigurationStore \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAppConfigurationStoreKey',
+		ListItemText: 'New-AzAppConfigurationStoreKey',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzAppConfigurationStoreKey \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGateway',
+		ListItemText: 'New-AzApplicationGateway',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGateway\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayAuthenticationCertificate',
+		ListItemText: 'New-AzApplicationGatewayAuthenticationCertificate',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayAuthenticationCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayAutoscaleConfiguration',
+		ListItemText: 'New-AzApplicationGatewayAutoscaleConfiguration',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayAutoscaleConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayBackendAddressPool',
+		ListItemText: 'New-AzApplicationGatewayBackendAddressPool',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayBackendAddressPool\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayBackendHttpSetting',
+		ListItemText: 'New-AzApplicationGatewayBackendHttpSetting',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayBackendHttpSetting\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayBackendHttpSettings',
+		ListItemText: 'New-AzApplicationGatewayBackendHttpSettings',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayBackendHttpSettings'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayBackendSetting',
+		ListItemText: 'New-AzApplicationGatewayBackendSetting',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayBackendSetting\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayClientAuthConfiguration',
+		ListItemText: 'New-AzApplicationGatewayClientAuthConfiguration',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayClientAuthConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayConnectionDraining',
+		ListItemText: 'New-AzApplicationGatewayConnectionDraining',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayConnectionDraining\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayCustomError',
+		ListItemText: 'New-AzApplicationGatewayCustomError',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayCustomError\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayFirewallCondition',
+		ListItemText: 'New-AzApplicationGatewayFirewallCondition',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayFirewallCondition\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayFirewallCustomRule',
+		ListItemText: 'New-AzApplicationGatewayFirewallCustomRule',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayFirewallCustomRule\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayFirewallCustomRuleGroupByUserSession',
+		ListItemText: 'New-AzApplicationGatewayFirewallCustomRuleGroupByUserSession',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayFirewallCustomRuleGroupByUserSession\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayFirewallCustomRuleGroupByVariable',
+		ListItemText: 'New-AzApplicationGatewayFirewallCustomRuleGroupByVariable',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayFirewallCustomRuleGroupByVariable\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayFirewallDisabledRuleGroupConfig',
+		ListItemText: 'New-AzApplicationGatewayFirewallDisabledRuleGroupConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayFirewallDisabledRuleGroupConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayFirewallExclusionConfig',
+		ListItemText: 'New-AzApplicationGatewayFirewallExclusionConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayFirewallExclusionConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayFirewallMatchVariable',
+		ListItemText: 'New-AzApplicationGatewayFirewallMatchVariable',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayFirewallMatchVariable\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayFirewallPolicy',
+		ListItemText: 'New-AzApplicationGatewayFirewallPolicy',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayFirewallPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayFirewallPolicyExclusion',
+		ListItemText: 'New-AzApplicationGatewayFirewallPolicyExclusion',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayFirewallPolicyExclusion\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayFirewallPolicyExclusionManagedRule',
+		ListItemText: 'New-AzApplicationGatewayFirewallPolicyExclusionManagedRule',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayFirewallPolicyExclusionManagedRule\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayFirewallPolicyExclusionManagedRuleGroup',
+		ListItemText: 'New-AzApplicationGatewayFirewallPolicyExclusionManagedRuleGroup',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayFirewallPolicyExclusionManagedRuleGroup\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayFirewallPolicyExclusionManagedRuleSet',
+		ListItemText: 'New-AzApplicationGatewayFirewallPolicyExclusionManagedRuleSet',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayFirewallPolicyExclusionManagedRuleSet\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayFirewallPolicyLogScrubbingConfiguration',
+		ListItemText: 'New-AzApplicationGatewayFirewallPolicyLogScrubbingConfiguration',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayFirewallPolicyLogScrubbingConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayFirewallPolicyLogScrubbingRule',
+		ListItemText: 'New-AzApplicationGatewayFirewallPolicyLogScrubbingRule',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayFirewallPolicyLogScrubbingRule\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayFirewallPolicyManagedRule',
+		ListItemText: 'New-AzApplicationGatewayFirewallPolicyManagedRule',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayFirewallPolicyManagedRule\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayFirewallPolicyManagedRuleGroupOverride',
+		ListItemText: 'New-AzApplicationGatewayFirewallPolicyManagedRuleGroupOverride',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayFirewallPolicyManagedRuleGroupOverride\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayFirewallPolicyManagedRuleOverride',
+		ListItemText: 'New-AzApplicationGatewayFirewallPolicyManagedRuleOverride',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayFirewallPolicyManagedRuleOverride\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayFirewallPolicyManagedRuleSet',
+		ListItemText: 'New-AzApplicationGatewayFirewallPolicyManagedRuleSet',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayFirewallPolicyManagedRuleSet\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayFirewallPolicySetting',
+		ListItemText: 'New-AzApplicationGatewayFirewallPolicySetting',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayFirewallPolicySetting\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayFrontendIPConfig',
+		ListItemText: 'New-AzApplicationGatewayFrontendIPConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayFrontendIPConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayFrontendPort',
+		ListItemText: 'New-AzApplicationGatewayFrontendPort',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayFrontendPort\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayHttpListener',
+		ListItemText: 'New-AzApplicationGatewayHttpListener',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayHttpListener\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayIdentity',
+		ListItemText: 'New-AzApplicationGatewayIdentity',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayIdentity\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayIPConfiguration',
+		ListItemText: 'New-AzApplicationGatewayIPConfiguration',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayIPConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayListener',
+		ListItemText: 'New-AzApplicationGatewayListener',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayListener\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayPathRuleConfig',
+		ListItemText: 'New-AzApplicationGatewayPathRuleConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayPathRuleConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayPrivateLinkConfiguration',
+		ListItemText: 'New-AzApplicationGatewayPrivateLinkConfiguration',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayPrivateLinkConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayPrivateLinkIpConfiguration',
+		ListItemText: 'New-AzApplicationGatewayPrivateLinkIpConfiguration',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayPrivateLinkIpConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayProbeConfig',
+		ListItemText: 'New-AzApplicationGatewayProbeConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayProbeConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayProbeHealthResponseMatch',
+		ListItemText: 'New-AzApplicationGatewayProbeHealthResponseMatch',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayProbeHealthResponseMatch\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayRedirectConfiguration',
+		ListItemText: 'New-AzApplicationGatewayRedirectConfiguration',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayRedirectConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayRequestRoutingRule',
+		ListItemText: 'New-AzApplicationGatewayRequestRoutingRule',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayRequestRoutingRule\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayRewriteRule',
+		ListItemText: 'New-AzApplicationGatewayRewriteRule',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayRewriteRule\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayRewriteRuleActionSet',
+		ListItemText: 'New-AzApplicationGatewayRewriteRuleActionSet',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayRewriteRuleActionSet\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayRewriteRuleCondition',
+		ListItemText: 'New-AzApplicationGatewayRewriteRuleCondition',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayRewriteRuleCondition\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayRewriteRuleHeaderConfiguration',
+		ListItemText: 'New-AzApplicationGatewayRewriteRuleHeaderConfiguration',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayRewriteRuleHeaderConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayRewriteRuleSet',
+		ListItemText: 'New-AzApplicationGatewayRewriteRuleSet',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayRewriteRuleSet\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayRewriteRuleUrlConfiguration',
+		ListItemText: 'New-AzApplicationGatewayRewriteRuleUrlConfiguration',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayRewriteRuleUrlConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayRoutingRule',
+		ListItemText: 'New-AzApplicationGatewayRoutingRule',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayRoutingRule\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewaySku',
+		ListItemText: 'New-AzApplicationGatewaySku',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewaySku\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewaySslCertificate',
+		ListItemText: 'New-AzApplicationGatewaySslCertificate',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewaySslCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewaySslPolicy',
+		ListItemText: 'New-AzApplicationGatewaySslPolicy',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewaySslPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewaySslProfile',
+		ListItemText: 'New-AzApplicationGatewaySslProfile',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewaySslProfile\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayTrustedClientCertificate',
+		ListItemText: 'New-AzApplicationGatewayTrustedClientCertificate',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayTrustedClientCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayTrustedRootCertificate',
+		ListItemText: 'New-AzApplicationGatewayTrustedRootCertificate',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayTrustedRootCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayUrlPathMapConfig',
+		ListItemText: 'New-AzApplicationGatewayUrlPathMapConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayUrlPathMapConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationGatewayWebApplicationFirewallConfiguration',
+		ListItemText: 'New-AzApplicationGatewayWebApplicationFirewallConfiguration',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationGatewayWebApplicationFirewallConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationInsights',
+		ListItemText: 'New-AzApplicationInsights',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzApplicationInsights \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationInsightsApiKey',
+		ListItemText: 'New-AzApplicationInsightsApiKey',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzApplicationInsightsApiKey \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationInsightsContinuousExport',
+		ListItemText: 'New-AzApplicationInsightsContinuousExport',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzApplicationInsightsContinuousExport \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationInsightsLinkedStorageAccount',
+		ListItemText: 'New-AzApplicationInsightsLinkedStorageAccount',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzApplicationInsightsLinkedStorageAccount \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationInsightsMyWorkbook',
+		ListItemText: 'New-AzApplicationInsightsMyWorkbook',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzApplicationInsightsMyWorkbook \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationInsightsWebTest',
+		ListItemText: 'New-AzApplicationInsightsWebTest',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzApplicationInsightsWebTest \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationInsightsWebTestGeolocationObject',
+		ListItemText: 'New-AzApplicationInsightsWebTestGeolocationObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzApplicationInsightsWebTestGeolocationObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationInsightsWebTestHeaderFieldObject',
+		ListItemText: 'New-AzApplicationInsightsWebTestHeaderFieldObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzApplicationInsightsWebTestHeaderFieldObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationInsightsWorkbook',
+		ListItemText: 'New-AzApplicationInsightsWorkbook',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzApplicationInsightsWorkbook \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationInsightsWorkbookTemplate',
+		ListItemText: 'New-AzApplicationInsightsWorkbookTemplate',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzApplicationInsightsWorkbookTemplate \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationInsightsWorkbookTemplateGalleryObject',
+		ListItemText: 'New-AzApplicationInsightsWorkbookTemplateGalleryObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzApplicationInsightsWorkbookTemplateGalleryObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplicationSecurityGroup',
+		ListItemText: 'New-AzApplicationSecurityGroup',
+		ResultType: 2,
+		ToolTip: 'New-AzApplicationSecurityGroup\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzApplyUpdate',
+		ListItemText: 'New-AzApplyUpdate',
+		ResultType: 2,
+		ToolTip: 'New-AzApplyUpdate\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAppServiceEnvironment',
+		ListItemText: 'New-AzAppServiceEnvironment',
+		ResultType: 2,
+		ToolTip: 'New-AzAppServiceEnvironment\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAppServiceEnvironmentInboundServices',
+		ListItemText: 'New-AzAppServiceEnvironmentInboundServices',
+		ResultType: 2,
+		ToolTip: 'New-AzAppServiceEnvironmentInboundServices\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAppServicePlan',
+		ListItemText: 'New-AzAppServicePlan',
+		ResultType: 2,
+		ToolTip: 'New-AzAppServicePlan\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAs',
+		ListItemText: 'New-AzAs',
+		ResultType: 2,
+		ToolTip: 'New-AzAs'
+	},
+	{
+		CompletionText: 'New-AzAttestationProvider',
+		ListItemText: 'New-AzAttestationProvider',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzAttestationProvider \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAutomanageConfigProfile',
+		ListItemText: 'New-AzAutomanageConfigProfile',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzAutomanageConfigProfile \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAutomanageConfigProfileAssignment',
+		ListItemText: 'New-AzAutomanageConfigProfileAssignment',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzAutomanageConfigProfileAssignment \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAutomanageConfigProfileHciAssignment',
+		ListItemText: 'New-AzAutomanageConfigProfileHciAssignment',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzAutomanageConfigProfileHciAssignment \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAutomanageConfigProfileHcrpAssignment',
+		ListItemText: 'New-AzAutomanageConfigProfileHcrpAssignment',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzAutomanageConfigProfileHcrpAssignment \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAutomationAccount',
+		ListItemText: 'New-AzAutomationAccount',
+		ResultType: 2,
+		ToolTip: 'New-AzAutomationAccount\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAutomationCertificate',
+		ListItemText: 'New-AzAutomationCertificate',
+		ResultType: 2,
+		ToolTip: 'New-AzAutomationCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAutomationConnection',
+		ListItemText: 'New-AzAutomationConnection',
+		ResultType: 2,
+		ToolTip: 'New-AzAutomationConnection\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAutomationCredential',
+		ListItemText: 'New-AzAutomationCredential',
+		ResultType: 2,
+		ToolTip: 'New-AzAutomationCredential\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAutomationHybridRunbookWorker',
+		ListItemText: 'New-AzAutomationHybridRunbookWorker',
+		ResultType: 2,
+		ToolTip: 'New-AzAutomationHybridRunbookWorker\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAutomationHybridRunbookWorkerGroup',
+		ListItemText: 'New-AzAutomationHybridRunbookWorkerGroup',
+		ResultType: 2,
+		ToolTip: 'New-AzAutomationHybridRunbookWorkerGroup\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAutomationKey',
+		ListItemText: 'New-AzAutomationKey',
+		ResultType: 2,
+		ToolTip: 'New-AzAutomationKey\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAutomationModule',
+		ListItemText: 'New-AzAutomationModule',
+		ResultType: 2,
+		ToolTip: 'New-AzAutomationModule\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAutomationPython3Package',
+		ListItemText: 'New-AzAutomationPython3Package',
+		ResultType: 2,
+		ToolTip: 'New-AzAutomationPython3Package\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAutomationRunbook',
+		ListItemText: 'New-AzAutomationRunbook',
+		ResultType: 2,
+		ToolTip: 'New-AzAutomationRunbook\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAutomationSchedule',
+		ListItemText: 'New-AzAutomationSchedule',
+		ResultType: 2,
+		ToolTip: 'New-AzAutomationSchedule\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAutomationSoftwareUpdateConfiguration',
+		ListItemText: 'New-AzAutomationSoftwareUpdateConfiguration',
+		ResultType: 2,
+		ToolTip: 'New-AzAutomationSoftwareUpdateConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAutomationSourceControl',
+		ListItemText: 'New-AzAutomationSourceControl',
+		ResultType: 2,
+		ToolTip: 'New-AzAutomationSourceControl\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAutomationUpdateManagementAzureQuery',
+		ListItemText: 'New-AzAutomationUpdateManagementAzureQuery',
+		ResultType: 2,
+		ToolTip: 'New-AzAutomationUpdateManagementAzureQuery\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAutomationVariable',
+		ListItemText: 'New-AzAutomationVariable',
+		ResultType: 2,
+		ToolTip: 'New-AzAutomationVariable\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAutomationWebhook',
+		ListItemText: 'New-AzAutomationWebhook',
+		ResultType: 2,
+		ToolTip: 'New-AzAutomationWebhook\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAutoscaleNotificationObject',
+		ListItemText: 'New-AzAutoscaleNotificationObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzAutoscaleNotificationObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAutoscaleProfileObject',
+		ListItemText: 'New-AzAutoscaleProfileObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzAutoscaleProfileObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAutoscaleScaleRuleMetricDimensionObject',
+		ListItemText: 'New-AzAutoscaleScaleRuleMetricDimensionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzAutoscaleScaleRuleMetricDimensionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAutoscaleScaleRuleObject',
+		ListItemText: 'New-AzAutoscaleScaleRuleObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzAutoscaleScaleRuleObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAutoscaleSetting',
+		ListItemText: 'New-AzAutoscaleSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzAutoscaleSetting \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAutoscaleWebhookNotificationObject',
+		ListItemText: 'New-AzAutoscaleWebhookNotificationObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzAutoscaleWebhookNotificationObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAvailabilityGroupListener',
+		ListItemText: 'New-AzAvailabilityGroupListener',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzAvailabilityGroupListener \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzAvailabilitySet',
+		ListItemText: 'New-AzAvailabilitySet',
+		ResultType: 2,
+		ToolTip: 'New-AzAvailabilitySet\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzBastion',
+		ListItemText: 'New-AzBastion',
+		ResultType: 2,
+		ToolTip: 'New-AzBastion\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzBatchAccount',
+		ListItemText: 'New-AzBatchAccount',
+		ResultType: 2,
+		ToolTip: 'New-AzBatchAccount\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzBatchAccountKey',
+		ListItemText: 'New-AzBatchAccountKey',
+		ResultType: 2,
+		ToolTip: 'New-AzBatchAccountKey\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzBatchApplication',
+		ListItemText: 'New-AzBatchApplication',
+		ResultType: 2,
+		ToolTip: 'New-AzBatchApplication\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzBatchApplicationPackage',
+		ListItemText: 'New-AzBatchApplicationPackage',
+		ResultType: 2,
+		ToolTip: 'New-AzBatchApplicationPackage\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzBatchCertificate',
+		ListItemText: 'New-AzBatchCertificate',
+		ResultType: 2,
+		ToolTip: 'New-AzBatchCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzBatchComputeNodeUser',
+		ListItemText: 'New-AzBatchComputeNodeUser',
+		ResultType: 2,
+		ToolTip: 'New-AzBatchComputeNodeUser\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzBatchJob',
+		ListItemText: 'New-AzBatchJob',
+		ResultType: 2,
+		ToolTip: 'New-AzBatchJob\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzBatchJobSchedule',
+		ListItemText: 'New-AzBatchJobSchedule',
+		ResultType: 2,
+		ToolTip: 'New-AzBatchJobSchedule\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzBatchPool',
+		ListItemText: 'New-AzBatchPool',
+		ResultType: 2,
+		ToolTip: 'New-AzBatchPool\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzBatchResourceFile',
+		ListItemText: 'New-AzBatchResourceFile',
+		ResultType: 2,
+		ToolTip: 'New-AzBatchResourceFile\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzBatchTask',
+		ListItemText: 'New-AzBatchTask',
+		ResultType: 2,
+		ToolTip: 'New-AzBatchTask\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCapacityReservation',
+		ListItemText: 'New-AzCapacityReservation',
+		ResultType: 2,
+		ToolTip: 'New-AzCapacityReservation\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCapacityReservationGroup',
+		ListItemText: 'New-AzCapacityReservationGroup',
+		ResultType: 2,
+		ToolTip: 'New-AzCapacityReservationGroup\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCdnCustomDomain',
+		ListItemText: 'New-AzCdnCustomDomain',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCdnCustomDomain \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCdnDeliveryRuleCacheExpirationActionObject',
+		ListItemText: 'New-AzCdnDeliveryRuleCacheExpirationActionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCdnDeliveryRuleCacheExpirationActionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCdnDeliveryRuleCacheKeyQueryStringActionObject',
+		ListItemText: 'New-AzCdnDeliveryRuleCacheKeyQueryStringActionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCdnDeliveryRuleCacheKeyQueryStringActionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCdnDeliveryRuleCookiesConditionObject',
+		ListItemText: 'New-AzCdnDeliveryRuleCookiesConditionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCdnDeliveryRuleCookiesConditionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCdnDeliveryRuleHttpVersionConditionObject',
+		ListItemText: 'New-AzCdnDeliveryRuleHttpVersionConditionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCdnDeliveryRuleHttpVersionConditionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCdnDeliveryRuleIsDeviceConditionObject',
+		ListItemText: 'New-AzCdnDeliveryRuleIsDeviceConditionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCdnDeliveryRuleIsDeviceConditionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCdnDeliveryRuleObject',
+		ListItemText: 'New-AzCdnDeliveryRuleObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCdnDeliveryRuleObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCdnDeliveryRulePostArgsConditionObject',
+		ListItemText: 'New-AzCdnDeliveryRulePostArgsConditionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCdnDeliveryRulePostArgsConditionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCdnDeliveryRuleQueryStringConditionObject',
+		ListItemText: 'New-AzCdnDeliveryRuleQueryStringConditionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCdnDeliveryRuleQueryStringConditionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCdnDeliveryRuleRemoteAddressConditionObject',
+		ListItemText: 'New-AzCdnDeliveryRuleRemoteAddressConditionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCdnDeliveryRuleRemoteAddressConditionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCdnDeliveryRuleRequestBodyConditionObject',
+		ListItemText: 'New-AzCdnDeliveryRuleRequestBodyConditionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCdnDeliveryRuleRequestBodyConditionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCdnDeliveryRuleRequestHeaderActionObject',
+		ListItemText: 'New-AzCdnDeliveryRuleRequestHeaderActionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCdnDeliveryRuleRequestHeaderActionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCdnDeliveryRuleRequestHeaderConditionObject',
+		ListItemText: 'New-AzCdnDeliveryRuleRequestHeaderConditionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCdnDeliveryRuleRequestHeaderConditionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCdnDeliveryRuleRequestMethodConditionObject',
+		ListItemText: 'New-AzCdnDeliveryRuleRequestMethodConditionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCdnDeliveryRuleRequestMethodConditionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCdnDeliveryRuleRequestSchemeConditionObject',
+		ListItemText: 'New-AzCdnDeliveryRuleRequestSchemeConditionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCdnDeliveryRuleRequestSchemeConditionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCdnDeliveryRuleRequestUriConditionObject',
+		ListItemText: 'New-AzCdnDeliveryRuleRequestUriConditionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCdnDeliveryRuleRequestUriConditionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCdnDeliveryRuleResponseHeaderActionObject',
+		ListItemText: 'New-AzCdnDeliveryRuleResponseHeaderActionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCdnDeliveryRuleResponseHeaderActionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCdnDeliveryRuleUrlFileExtensionConditionObject',
+		ListItemText: 'New-AzCdnDeliveryRuleUrlFileExtensionConditionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCdnDeliveryRuleUrlFileExtensionConditionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCdnDeliveryRuleUrlFileNameConditionObject',
+		ListItemText: 'New-AzCdnDeliveryRuleUrlFileNameConditionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCdnDeliveryRuleUrlFileNameConditionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCdnDeliveryRuleUrlPathConditionObject',
+		ListItemText: 'New-AzCdnDeliveryRuleUrlPathConditionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCdnDeliveryRuleUrlPathConditionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCdnEndpoint',
+		ListItemText: 'New-AzCdnEndpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCdnEndpoint \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCdnHealthProbeParametersObject',
+		ListItemText: 'New-AzCdnHealthProbeParametersObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCdnHealthProbeParametersObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCdnLoadParametersObject',
+		ListItemText: 'New-AzCdnLoadParametersObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCdnLoadParametersObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCdnManagedHttpsParametersObject',
+		ListItemText: 'New-AzCdnManagedHttpsParametersObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCdnManagedHttpsParametersObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCdnOrigin',
+		ListItemText: 'New-AzCdnOrigin',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCdnOrigin \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCdnOriginGroup',
+		ListItemText: 'New-AzCdnOriginGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCdnOriginGroup \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCdnOriginGroupOverrideActionObject',
+		ListItemText: 'New-AzCdnOriginGroupOverrideActionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCdnOriginGroupOverrideActionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCdnProfile',
+		ListItemText: 'New-AzCdnProfile',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCdnProfile \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCdnPurgeParametersObject',
+		ListItemText: 'New-AzCdnPurgeParametersObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCdnPurgeParametersObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCdnResourceReferenceObject',
+		ListItemText: 'New-AzCdnResourceReferenceObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCdnResourceReferenceObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCdnResponseBasedOriginErrorDetectionParametersObject',
+		ListItemText: 'New-AzCdnResponseBasedOriginErrorDetectionParametersObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCdnResponseBasedOriginErrorDetectionParametersObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCdnUrlRedirectActionObject',
+		ListItemText: 'New-AzCdnUrlRedirectActionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCdnUrlRedirectActionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCdnUrlRewriteActionObject',
+		ListItemText: 'New-AzCdnUrlRewriteActionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCdnUrlRewriteActionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCdnUrlSigningActionObject',
+		ListItemText: 'New-AzCdnUrlSigningActionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCdnUrlSigningActionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCdnUserManagedHttpsParametersObject',
+		ListItemText: 'New-AzCdnUserManagedHttpsParametersObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCdnUserManagedHttpsParametersObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCloudService',
+		ListItemText: 'New-AzCloudService',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCloudService \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCloudServiceDiagnosticsExtension',
+		ListItemText: 'New-AzCloudServiceDiagnosticsExtension',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCloudServiceDiagnosticsExtension \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCloudServiceExtensionObject',
+		ListItemText: 'New-AzCloudServiceExtensionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCloudServiceExtensionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCloudServiceLoadBalancerConfigurationObject',
+		ListItemText: 'New-AzCloudServiceLoadBalancerConfigurationObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCloudServiceLoadBalancerConfigurationObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCloudServiceLoadBalancerFrontendIPConfigurationObject',
+		ListItemText: 'New-AzCloudServiceLoadBalancerFrontendIPConfigurationObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCloudServiceLoadBalancerFrontendIPConfigurationObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCloudServiceRemoteDesktopExtensionObject',
+		ListItemText: 'New-AzCloudServiceRemoteDesktopExtensionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCloudServiceRemoteDesktopExtensionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCloudServiceRoleProfilePropertiesObject',
+		ListItemText: 'New-AzCloudServiceRoleProfilePropertiesObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCloudServiceRoleProfilePropertiesObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCloudServiceVaultSecretGroupObject',
+		ListItemText: 'New-AzCloudServiceVaultSecretGroupObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzCloudServiceVaultSecretGroupObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCognitiveServicesAccount',
+		ListItemText: 'New-AzCognitiveServicesAccount',
+		ResultType: 2,
+		ToolTip: 'New-AzCognitiveServicesAccount\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCognitiveServicesAccountApiProperty',
+		ListItemText: 'New-AzCognitiveServicesAccountApiProperty',
+		ResultType: 2,
+		ToolTip: 'New-AzCognitiveServicesAccountApiProperty\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCognitiveServicesAccountCommitmentPlan',
+		ListItemText: 'New-AzCognitiveServicesAccountCommitmentPlan',
+		ResultType: 2,
+		ToolTip: 'New-AzCognitiveServicesAccountCommitmentPlan\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCognitiveServicesAccountDeployment',
+		ListItemText: 'New-AzCognitiveServicesAccountDeployment',
+		ResultType: 2,
+		ToolTip: 'New-AzCognitiveServicesAccountDeployment\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCognitiveServicesAccountKey',
+		ListItemText: 'New-AzCognitiveServicesAccountKey',
+		ResultType: 2,
+		ToolTip: 'New-AzCognitiveServicesAccountKey\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCognitiveServicesCommitmentPlan',
+		ListItemText: 'New-AzCognitiveServicesCommitmentPlan',
+		ResultType: 2,
+		ToolTip: 'New-AzCognitiveServicesCommitmentPlan\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCognitiveServicesCommitmentPlanAssociation',
+		ListItemText: 'New-AzCognitiveServicesCommitmentPlanAssociation',
+		ResultType: 2,
+		ToolTip: 'New-AzCognitiveServicesCommitmentPlanAssociation\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCognitiveServicesObject',
+		ListItemText: 'New-AzCognitiveServicesObject',
+		ResultType: 2,
+		ToolTip: 'New-AzCognitiveServicesObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzConfidentialLedger',
+		ListItemText: 'New-AzConfidentialLedger',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzConfidentialLedger \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzConfidentialLedgerAADBasedSecurityPrincipalObject',
+		ListItemText: 'New-AzConfidentialLedgerAADBasedSecurityPrincipalObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzConfidentialLedgerAADBasedSecurityPrincipalObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzConfidentialLedgerCertBasedSecurityPrincipalObject',
+		ListItemText: 'New-AzConfidentialLedgerCertBasedSecurityPrincipalObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzConfidentialLedgerCertBasedSecurityPrincipalObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzConfigurationAssignment',
+		ListItemText: 'New-AzConfigurationAssignment',
+		ResultType: 2,
+		ToolTip: 'New-AzConfigurationAssignment\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzConsumptionBudget',
+		ListItemText: 'New-AzConsumptionBudget',
+		ResultType: 2,
+		ToolTip: 'New-AzConsumptionBudget\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzContainerGroup',
+		ListItemText: 'New-AzContainerGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzContainerGroup \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzContainerGroupImageRegistryCredentialObject',
+		ListItemText: 'New-AzContainerGroupImageRegistryCredentialObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzContainerGroupImageRegistryCredentialObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzContainerGroupPortObject',
+		ListItemText: 'New-AzContainerGroupPortObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzContainerGroupPortObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzContainerGroupVolumeObject',
+		ListItemText: 'New-AzContainerGroupVolumeObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzContainerGroupVolumeObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzContainerInstanceEnvironmentVariableObject',
+		ListItemText: 'New-AzContainerInstanceEnvironmentVariableObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzContainerInstanceEnvironmentVariableObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzContainerInstanceHttpHeaderObject',
+		ListItemText: 'New-AzContainerInstanceHttpHeaderObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzContainerInstanceHttpHeaderObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzContainerInstanceInitDefinitionObject',
+		ListItemText: 'New-AzContainerInstanceInitDefinitionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzContainerInstanceInitDefinitionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzContainerInstanceObject',
+		ListItemText: 'New-AzContainerInstanceObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzContainerInstanceObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzContainerInstancePortObject',
+		ListItemText: 'New-AzContainerInstancePortObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzContainerInstancePortObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzContainerInstanceVolumeMountObject',
+		ListItemText: 'New-AzContainerInstanceVolumeMountObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzContainerInstanceVolumeMountObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzContainerNicConfig',
+		ListItemText: 'New-AzContainerNicConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzContainerNicConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzContainerNicConfigIpConfig',
+		ListItemText: 'New-AzContainerNicConfigIpConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzContainerNicConfigIpConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzContainerRegistry',
+		ListItemText: 'New-AzContainerRegistry',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzContainerRegistry \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzContainerRegistryAgentPool',
+		ListItemText: 'New-AzContainerRegistryAgentPool',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzContainerRegistryAgentPool \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzContainerRegistryExportPipeline',
+		ListItemText: 'New-AzContainerRegistryExportPipeline',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzContainerRegistryExportPipeline \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzContainerRegistryImportPipeline',
+		ListItemText: 'New-AzContainerRegistryImportPipeline',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzContainerRegistryImportPipeline \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzContainerRegistryIPRuleObject',
+		ListItemText: 'New-AzContainerRegistryIPRuleObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzContainerRegistryIPRuleObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzContainerRegistryReplication',
+		ListItemText: 'New-AzContainerRegistryReplication',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzContainerRegistryReplication \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzContainerRegistryScopeMap',
+		ListItemText: 'New-AzContainerRegistryScopeMap',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzContainerRegistryScopeMap \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzContainerRegistryToken',
+		ListItemText: 'New-AzContainerRegistryToken',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzContainerRegistryToken \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzContainerRegistryWebhook',
+		ListItemText: 'New-AzContainerRegistryWebhook',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzContainerRegistryWebhook \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBAccount',
+		ListItemText: 'New-AzCosmosDBAccount',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBAccount\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBAccountKey',
+		ListItemText: 'New-AzCosmosDBAccountKey',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBAccountKey\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBCassandraClusterKey',
+		ListItemText: 'New-AzCosmosDBCassandraClusterKey',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBCassandraClusterKey\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBCassandraColumn',
+		ListItemText: 'New-AzCosmosDBCassandraColumn',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBCassandraColumn\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBCassandraKeyspace',
+		ListItemText: 'New-AzCosmosDBCassandraKeyspace',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBCassandraKeyspace\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBCassandraSchema',
+		ListItemText: 'New-AzCosmosDBCassandraSchema',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBCassandraSchema\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBCassandraTable',
+		ListItemText: 'New-AzCosmosDBCassandraTable',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBCassandraTable\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDbClientEncryptionKey',
+		ListItemText: 'New-AzCosmosDbClientEncryptionKey',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDbClientEncryptionKey\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBDatabaseToRestore',
+		ListItemText: 'New-AzCosmosDBDatabaseToRestore',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBDatabaseToRestore\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBGremlinCompositePath',
+		ListItemText: 'New-AzCosmosDBGremlinCompositePath',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBGremlinCompositePath\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBGremlinConflictResolutionPolicy',
+		ListItemText: 'New-AzCosmosDBGremlinConflictResolutionPolicy',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBGremlinConflictResolutionPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBGremlinDatabase',
+		ListItemText: 'New-AzCosmosDBGremlinDatabase',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBGremlinDatabase\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBGremlinDatabaseToRestore',
+		ListItemText: 'New-AzCosmosDBGremlinDatabaseToRestore',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBGremlinDatabaseToRestore\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBGremlinGraph',
+		ListItemText: 'New-AzCosmosDBGremlinGraph',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBGremlinGraph\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBGremlinIncludedPath',
+		ListItemText: 'New-AzCosmosDBGremlinIncludedPath',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBGremlinIncludedPath\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBGremlinIncludedPathIndex',
+		ListItemText: 'New-AzCosmosDBGremlinIncludedPathIndex',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBGremlinIncludedPathIndex\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBGremlinIndexingPolicy',
+		ListItemText: 'New-AzCosmosDBGremlinIndexingPolicy',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBGremlinIndexingPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBGremlinSpatialSpec',
+		ListItemText: 'New-AzCosmosDBGremlinSpatialSpec',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBGremlinSpatialSpec\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBGremlinUniqueKey',
+		ListItemText: 'New-AzCosmosDBGremlinUniqueKey',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBGremlinUniqueKey\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBGremlinUniqueKeyPolicy',
+		ListItemText: 'New-AzCosmosDBGremlinUniqueKeyPolicy',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBGremlinUniqueKeyPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBLocationObject',
+		ListItemText: 'New-AzCosmosDBLocationObject',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBLocationObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBMongoDBCollection',
+		ListItemText: 'New-AzCosmosDBMongoDBCollection',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBMongoDBCollection\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBMongoDBDatabase',
+		ListItemText: 'New-AzCosmosDBMongoDBDatabase',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBMongoDBDatabase\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBMongoDBIndex',
+		ListItemText: 'New-AzCosmosDBMongoDBIndex',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBMongoDBIndex\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBMongoDBPrivilege',
+		ListItemText: 'New-AzCosmosDBMongoDBPrivilege',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBMongoDBPrivilege\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBMongoDBPrivilegeResource',
+		ListItemText: 'New-AzCosmosDBMongoDBPrivilegeResource',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBMongoDBPrivilegeResource\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBMongoDBRole',
+		ListItemText: 'New-AzCosmosDBMongoDBRole',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBMongoDBRole\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBMongoDBRoleDefinition',
+		ListItemText: 'New-AzCosmosDBMongoDBRoleDefinition',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBMongoDBRoleDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBMongoDBUserDefinition',
+		ListItemText: 'New-AzCosmosDBMongoDBUserDefinition',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBMongoDBUserDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBPermission',
+		ListItemText: 'New-AzCosmosDBPermission',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBPermission\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBService',
+		ListItemText: 'New-AzCosmosDBService',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBService\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBSqlCompositePath',
+		ListItemText: 'New-AzCosmosDBSqlCompositePath',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBSqlCompositePath\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBSqlConflictResolutionPolicy',
+		ListItemText: 'New-AzCosmosDBSqlConflictResolutionPolicy',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBSqlConflictResolutionPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBSqlContainer',
+		ListItemText: 'New-AzCosmosDBSqlContainer',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBSqlContainer\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBSqlDatabase',
+		ListItemText: 'New-AzCosmosDBSqlDatabase',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBSqlDatabase\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBSqlIncludedPath',
+		ListItemText: 'New-AzCosmosDBSqlIncludedPath',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBSqlIncludedPath\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBSqlIncludedPathIndex',
+		ListItemText: 'New-AzCosmosDBSqlIncludedPathIndex',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBSqlIncludedPathIndex\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBSqlIndexingPolicy',
+		ListItemText: 'New-AzCosmosDBSqlIndexingPolicy',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBSqlIndexingPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBSqlRoleAssignment',
+		ListItemText: 'New-AzCosmosDBSqlRoleAssignment',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBSqlRoleAssignment\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBSqlRoleDefinition',
+		ListItemText: 'New-AzCosmosDBSqlRoleDefinition',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBSqlRoleDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBSqlSpatialSpec',
+		ListItemText: 'New-AzCosmosDBSqlSpatialSpec',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBSqlSpatialSpec\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBSqlStoredProcedure',
+		ListItemText: 'New-AzCosmosDBSqlStoredProcedure',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBSqlStoredProcedure\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBSqlTrigger',
+		ListItemText: 'New-AzCosmosDBSqlTrigger',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBSqlTrigger\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBSqlUniqueKey',
+		ListItemText: 'New-AzCosmosDBSqlUniqueKey',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBSqlUniqueKey\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBSqlUniqueKeyPolicy',
+		ListItemText: 'New-AzCosmosDBSqlUniqueKeyPolicy',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBSqlUniqueKeyPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBSqlUserDefinedFunction',
+		ListItemText: 'New-AzCosmosDBSqlUserDefinedFunction',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBSqlUserDefinedFunction\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBTable',
+		ListItemText: 'New-AzCosmosDBTable',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBTable\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBTableToRestore',
+		ListItemText: 'New-AzCosmosDBTableToRestore',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBTableToRestore\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCosmosDBVirtualNetworkRule',
+		ListItemText: 'New-AzCosmosDBVirtualNetworkRule',
+		ResultType: 2,
+		ToolTip: 'New-AzCosmosDBVirtualNetworkRule\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzCustomIpPrefix',
+		ListItemText: 'New-AzCustomIpPrefix',
+		ResultType: 2,
+		ToolTip: 'New-AzCustomIpPrefix\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataBoxEdgeBandwidthSchedule',
+		ListItemText: 'New-AzDataBoxEdgeBandwidthSchedule',
+		ResultType: 2,
+		ToolTip: 'New-AzDataBoxEdgeBandwidthSchedule\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataBoxEdgeDevice',
+		ListItemText: 'New-AzDataBoxEdgeDevice',
+		ResultType: 2,
+		ToolTip: 'New-AzDataBoxEdgeDevice\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataBoxEdgeOrder',
+		ListItemText: 'New-AzDataBoxEdgeOrder',
+		ResultType: 2,
+		ToolTip: 'New-AzDataBoxEdgeOrder\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataBoxEdgeRole',
+		ListItemText: 'New-AzDataBoxEdgeRole',
+		ResultType: 2,
+		ToolTip: 'New-AzDataBoxEdgeRole\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataBoxEdgeShare',
+		ListItemText: 'New-AzDataBoxEdgeShare',
+		ResultType: 2,
+		ToolTip: 'New-AzDataBoxEdgeShare\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataBoxEdgeStorageAccount',
+		ListItemText: 'New-AzDataBoxEdgeStorageAccount',
+		ResultType: 2,
+		ToolTip: 'New-AzDataBoxEdgeStorageAccount\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataBoxEdgeStorageAccountCredential',
+		ListItemText: 'New-AzDataBoxEdgeStorageAccountCredential',
+		ResultType: 2,
+		ToolTip: 'New-AzDataBoxEdgeStorageAccountCredential\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataBoxEdgeStorageContainer',
+		ListItemText: 'New-AzDataBoxEdgeStorageContainer',
+		ResultType: 2,
+		ToolTip: 'New-AzDataBoxEdgeStorageContainer\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataBoxEdgeTrigger',
+		ListItemText: 'New-AzDataBoxEdgeTrigger',
+		ResultType: 2,
+		ToolTip: 'New-AzDataBoxEdgeTrigger\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataBoxEdgeUser',
+		ListItemText: 'New-AzDataBoxEdgeUser',
+		ResultType: 2,
+		ToolTip: 'New-AzDataBoxEdgeUser\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDatabricksAccessConnector',
+		ListItemText: 'New-AzDatabricksAccessConnector',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzDatabricksAccessConnector \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDatabricksVNetPeering',
+		ListItemText: 'New-AzDatabricksVNetPeering',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzDatabricksVNetPeering \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDatabricksWorkspace',
+		ListItemText: 'New-AzDatabricksWorkspace',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzDatabricksWorkspace \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataCollectionRule',
+		ListItemText: 'New-AzDataCollectionRule',
+		ResultType: 2,
+		ToolTip: 'New-AzDataCollectionRule\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataCollectionRuleAssociation',
+		ListItemText: 'New-AzDataCollectionRuleAssociation',
+		ResultType: 2,
+		ToolTip: 'New-AzDataCollectionRuleAssociation\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataFactory',
+		ListItemText: 'New-AzDataFactory',
+		ResultType: 2,
+		ToolTip: 'New-AzDataFactory\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataFactoryDataset',
+		ListItemText: 'New-AzDataFactoryDataset',
+		ResultType: 2,
+		ToolTip: 'New-AzDataFactoryDataset\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataFactoryEncryptValue',
+		ListItemText: 'New-AzDataFactoryEncryptValue',
+		ResultType: 2,
+		ToolTip: 'New-AzDataFactoryEncryptValue\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataFactoryGateway',
+		ListItemText: 'New-AzDataFactoryGateway',
+		ResultType: 2,
+		ToolTip: 'New-AzDataFactoryGateway\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataFactoryGatewayAuthkey',
+		ListItemText: 'New-AzDataFactoryGatewayAuthkey',
+		ResultType: 2,
+		ToolTip: 'New-AzDataFactoryGatewayAuthkey\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataFactoryHub',
+		ListItemText: 'New-AzDataFactoryHub',
+		ResultType: 2,
+		ToolTip: 'New-AzDataFactoryHub\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataFactoryLinkedService',
+		ListItemText: 'New-AzDataFactoryLinkedService',
+		ResultType: 2,
+		ToolTip: 'New-AzDataFactoryLinkedService\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataFactoryPipeline',
+		ListItemText: 'New-AzDataFactoryPipeline',
+		ResultType: 2,
+		ToolTip: 'New-AzDataFactoryPipeline\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataFactoryV2',
+		ListItemText: 'New-AzDataFactoryV2',
+		ResultType: 2,
+		ToolTip: 'New-AzDataFactoryV2'
+	},
+	{
+		CompletionText: 'New-AzDataFactoryV2Dataset',
+		ListItemText: 'New-AzDataFactoryV2Dataset',
+		ResultType: 2,
+		ToolTip: 'New-AzDataFactoryV2Dataset'
+	},
+	{
+		CompletionText: 'New-AzDataFactoryV2IntegrationRuntimeKey',
+		ListItemText: 'New-AzDataFactoryV2IntegrationRuntimeKey',
+		ResultType: 2,
+		ToolTip: 'New-AzDataFactoryV2IntegrationRuntimeKey\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataFactoryV2LinkedService',
+		ListItemText: 'New-AzDataFactoryV2LinkedService',
+		ResultType: 2,
+		ToolTip: 'New-AzDataFactoryV2LinkedService'
+	},
+	{
+		CompletionText: 'New-AzDataFactoryV2LinkedServiceEncryptedCredential',
+		ListItemText: 'New-AzDataFactoryV2LinkedServiceEncryptedCredential',
+		ResultType: 2,
+		ToolTip: 'New-AzDataFactoryV2LinkedServiceEncryptedCredential\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataFactoryV2Pipeline',
+		ListItemText: 'New-AzDataFactoryV2Pipeline',
+		ResultType: 2,
+		ToolTip: 'New-AzDataFactoryV2Pipeline'
+	},
+	{
+		CompletionText: 'New-AzDataFactoryV2Trigger',
+		ListItemText: 'New-AzDataFactoryV2Trigger',
+		ResultType: 2,
+		ToolTip: 'New-AzDataFactoryV2Trigger'
+	},
+	{
+		CompletionText: 'New-AzDataLakeAnalyticsAccount',
+		ListItemText: 'New-AzDataLakeAnalyticsAccount',
+		ResultType: 2,
+		ToolTip: 'New-AzDataLakeAnalyticsAccount\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataLakeAnalyticsCatalogCredential',
+		ListItemText: 'New-AzDataLakeAnalyticsCatalogCredential',
+		ResultType: 2,
+		ToolTip: 'New-AzDataLakeAnalyticsCatalogCredential\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataLakeAnalyticsComputePolicy',
+		ListItemText: 'New-AzDataLakeAnalyticsComputePolicy',
+		ResultType: 2,
+		ToolTip: 'New-AzDataLakeAnalyticsComputePolicy\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDatalakeGen2FileSystem',
+		ListItemText: 'New-AzDatalakeGen2FileSystem',
+		ResultType: 2,
+		ToolTip: 'New-AzDatalakeGen2FileSystem'
+	},
+	{
+		CompletionText: 'New-AzDataLakeGen2Item',
+		ListItemText: 'New-AzDataLakeGen2Item',
+		ResultType: 2,
+		ToolTip: 'New-AzDataLakeGen2Item\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataLakeGen2ItemAclObject',
+		ListItemText: 'New-AzDataLakeGen2ItemAclObject',
+		ResultType: 2,
+		ToolTip: 'New-AzDataLakeGen2ItemAclObject'
+	},
+	{
+		CompletionText: 'New-AzDataLakeGen2SasToken',
+		ListItemText: 'New-AzDataLakeGen2SasToken',
+		ResultType: 2,
+		ToolTip: 'New-AzDataLakeGen2SasToken\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataLakeStoreAccount',
+		ListItemText: 'New-AzDataLakeStoreAccount',
+		ResultType: 2,
+		ToolTip: 'New-AzDataLakeStoreAccount\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataLakeStoreItem',
+		ListItemText: 'New-AzDataLakeStoreItem',
+		ResultType: 2,
+		ToolTip: 'New-AzDataLakeStoreItem\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataProtectionBackupConfigurationClientObject',
+		ListItemText: 'New-AzDataProtectionBackupConfigurationClientObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzDataProtectionBackupConfigurationClientObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataProtectionBackupInstance',
+		ListItemText: 'New-AzDataProtectionBackupInstance',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzDataProtectionBackupInstance \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataProtectionBackupPolicy',
+		ListItemText: 'New-AzDataProtectionBackupPolicy',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzDataProtectionBackupPolicy \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataProtectionBackupVault',
+		ListItemText: 'New-AzDataProtectionBackupVault',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzDataProtectionBackupVault \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataProtectionBackupVaultStorageSettingObject',
+		ListItemText: 'New-AzDataProtectionBackupVaultStorageSettingObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzDataProtectionBackupVaultStorageSettingObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataProtectionPolicyTagCriteriaClientObject',
+		ListItemText: 'New-AzDataProtectionPolicyTagCriteriaClientObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzDataProtectionPolicyTagCriteriaClientObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataProtectionPolicyTriggerScheduleClientObject',
+		ListItemText: 'New-AzDataProtectionPolicyTriggerScheduleClientObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzDataProtectionPolicyTriggerScheduleClientObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataProtectionResourceGuard',
+		ListItemText: 'New-AzDataProtectionResourceGuard',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzDataProtectionResourceGuard \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataProtectionRestoreConfigurationClientObject',
+		ListItemText: 'New-AzDataProtectionRestoreConfigurationClientObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzDataProtectionRestoreConfigurationClientObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataProtectionRetentionLifeCycleClientObject',
+		ListItemText: 'New-AzDataProtectionRetentionLifeCycleClientObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzDataProtectionRetentionLifeCycleClientObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataShare',
+		ListItemText: 'New-AzDataShare',
+		ResultType: 2,
+		ToolTip: 'New-AzDataShare\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataShareAccount',
+		ListItemText: 'New-AzDataShareAccount',
+		ResultType: 2,
+		ToolTip: 'New-AzDataShareAccount\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataShareDataSet',
+		ListItemText: 'New-AzDataShareDataSet',
+		ResultType: 2,
+		ToolTip: 'New-AzDataShareDataSet\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataShareDataSetMapping',
+		ListItemText: 'New-AzDataShareDataSetMapping',
+		ResultType: 2,
+		ToolTip: 'New-AzDataShareDataSetMapping\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataShareInvitation',
+		ListItemText: 'New-AzDataShareInvitation',
+		ResultType: 2,
+		ToolTip: 'New-AzDataShareInvitation\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataShareSubscription',
+		ListItemText: 'New-AzDataShareSubscription',
+		ResultType: 2,
+		ToolTip: 'New-AzDataShareSubscription\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataShareSynchronizationSetting',
+		ListItemText: 'New-AzDataShareSynchronizationSetting',
+		ResultType: 2,
+		ToolTip: 'New-AzDataShareSynchronizationSetting\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDataShareTrigger',
+		ListItemText: 'New-AzDataShareTrigger',
+		ResultType: 2,
+		ToolTip: 'New-AzDataShareTrigger\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDdosProtectionPlan',
+		ListItemText: 'New-AzDdosProtectionPlan',
+		ResultType: 2,
+		ToolTip: 'New-AzDdosProtectionPlan\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDelegation',
+		ListItemText: 'New-AzDelegation',
+		ResultType: 2,
+		ToolTip: 'New-AzDelegation\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDeployment',
+		ListItemText: 'New-AzDeployment',
+		ResultType: 2,
+		ToolTip: 'New-AzDeployment\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDeploymentManagerArtifactSource',
+		ListItemText: 'New-AzDeploymentManagerArtifactSource',
+		ResultType: 2,
+		ToolTip: 'New-AzDeploymentManagerArtifactSource\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDeploymentManagerService',
+		ListItemText: 'New-AzDeploymentManagerService',
+		ResultType: 2,
+		ToolTip: 'New-AzDeploymentManagerService\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDeploymentManagerServiceTopology',
+		ListItemText: 'New-AzDeploymentManagerServiceTopology',
+		ResultType: 2,
+		ToolTip: 'New-AzDeploymentManagerServiceTopology\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDeploymentManagerServiceUnit',
+		ListItemText: 'New-AzDeploymentManagerServiceUnit',
+		ResultType: 2,
+		ToolTip: 'New-AzDeploymentManagerServiceUnit\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDeploymentManagerStep',
+		ListItemText: 'New-AzDeploymentManagerStep',
+		ResultType: 2,
+		ToolTip: 'New-AzDeploymentManagerStep\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDeviceSecurityGroupAllowlistCustomAlertRuleObject',
+		ListItemText: 'New-AzDeviceSecurityGroupAllowlistCustomAlertRuleObject',
+		ResultType: 2,
+		ToolTip: 'New-AzDeviceSecurityGroupAllowlistCustomAlertRuleObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDeviceSecurityGroupDenylistCustomAlertRuleObject',
+		ListItemText: 'New-AzDeviceSecurityGroupDenylistCustomAlertRuleObject',
+		ResultType: 2,
+		ToolTip: 'New-AzDeviceSecurityGroupDenylistCustomAlertRuleObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDeviceSecurityGroupThresholdCustomAlertRuleObject',
+		ListItemText: 'New-AzDeviceSecurityGroupThresholdCustomAlertRuleObject',
+		ResultType: 2,
+		ToolTip: 'New-AzDeviceSecurityGroupThresholdCustomAlertRuleObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDeviceSecurityGroupTimeWindowRuleObject',
+		ListItemText: 'New-AzDeviceSecurityGroupTimeWindowRuleObject',
+		ResultType: 2,
+		ToolTip: 'New-AzDeviceSecurityGroupTimeWindowRuleObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDiagnosticSetting',
+		ListItemText: 'New-AzDiagnosticSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzDiagnosticSetting \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDiagnosticSettingLogSettingsObject',
+		ListItemText: 'New-AzDiagnosticSettingLogSettingsObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzDiagnosticSettingLogSettingsObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDiagnosticSettingMetricSettingsObject',
+		ListItemText: 'New-AzDiagnosticSettingMetricSettingsObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzDiagnosticSettingMetricSettingsObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDiagnosticSettingSubscriptionLogSettingsObject',
+		ListItemText: 'New-AzDiagnosticSettingSubscriptionLogSettingsObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzDiagnosticSettingSubscriptionLogSettingsObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDisk',
+		ListItemText: 'New-AzDisk',
+		ResultType: 2,
+		ToolTip: 'New-AzDisk\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDiskAccess',
+		ListItemText: 'New-AzDiskAccess',
+		ResultType: 2,
+		ToolTip: 'New-AzDiskAccess\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDiskConfig',
+		ListItemText: 'New-AzDiskConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzDiskConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDiskEncryptionSet',
+		ListItemText: 'New-AzDiskEncryptionSet',
+		ResultType: 2,
+		ToolTip: 'New-AzDiskEncryptionSet\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDiskEncryptionSetConfig',
+		ListItemText: 'New-AzDiskEncryptionSetConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzDiskEncryptionSetConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDiskPurchasePlanConfig',
+		ListItemText: 'New-AzDiskPurchasePlanConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzDiskPurchasePlanConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDiskUpdateConfig',
+		ListItemText: 'New-AzDiskUpdateConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzDiskUpdateConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDnsRecordConfig',
+		ListItemText: 'New-AzDnsRecordConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzDnsRecordConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDnsRecordSet',
+		ListItemText: 'New-AzDnsRecordSet',
+		ResultType: 2,
+		ToolTip: 'New-AzDnsRecordSet\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzDnsZone',
+		ListItemText: 'New-AzDnsZone',
+		ResultType: 2,
+		ToolTip: 'New-AzDnsZone\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzEventGridChannel',
+		ListItemText: 'New-AzEventGridChannel',
+		ResultType: 2,
+		ToolTip: 'New-AzEventGridChannel\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzEventGridDomain',
+		ListItemText: 'New-AzEventGridDomain',
+		ResultType: 2,
+		ToolTip: 'New-AzEventGridDomain\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzEventGridDomainKey',
+		ListItemText: 'New-AzEventGridDomainKey',
+		ResultType: 2,
+		ToolTip: 'New-AzEventGridDomainKey\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzEventGridDomainTopic',
+		ListItemText: 'New-AzEventGridDomainTopic',
+		ResultType: 2,
+		ToolTip: 'New-AzEventGridDomainTopic\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzEventGridPartnerConfiguration',
+		ListItemText: 'New-AzEventGridPartnerConfiguration',
+		ResultType: 2,
+		ToolTip: 'New-AzEventGridPartnerConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzEventGridPartnerNamespace',
+		ListItemText: 'New-AzEventGridPartnerNamespace',
+		ResultType: 2,
+		ToolTip: 'New-AzEventGridPartnerNamespace\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzEventGridPartnerNamespaceKey',
+		ListItemText: 'New-AzEventGridPartnerNamespaceKey',
+		ResultType: 2,
+		ToolTip: 'New-AzEventGridPartnerNamespaceKey\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzEventGridPartnerRegistration',
+		ListItemText: 'New-AzEventGridPartnerRegistration',
+		ResultType: 2,
+		ToolTip: 'New-AzEventGridPartnerRegistration\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzEventGridPartnerTopic',
+		ListItemText: 'New-AzEventGridPartnerTopic',
+		ResultType: 2,
+		ToolTip: 'New-AzEventGridPartnerTopic\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzEventGridPartnerTopicEventSubscription',
+		ListItemText: 'New-AzEventGridPartnerTopicEventSubscription',
+		ResultType: 2,
+		ToolTip: 'New-AzEventGridPartnerTopicEventSubscription\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzEventGridSubscription',
+		ListItemText: 'New-AzEventGridSubscription',
+		ResultType: 2,
+		ToolTip: 'New-AzEventGridSubscription\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzEventGridSystemTopic',
+		ListItemText: 'New-AzEventGridSystemTopic',
+		ResultType: 2,
+		ToolTip: 'New-AzEventGridSystemTopic\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzEventGridSystemTopicEventSubscription',
+		ListItemText: 'New-AzEventGridSystemTopicEventSubscription',
+		ResultType: 2,
+		ToolTip: 'New-AzEventGridSystemTopicEventSubscription\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzEventGridTopic',
+		ListItemText: 'New-AzEventGridTopic',
+		ResultType: 2,
+		ToolTip: 'New-AzEventGridTopic\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzEventGridTopicKey',
+		ListItemText: 'New-AzEventGridTopicKey',
+		ResultType: 2,
+		ToolTip: 'New-AzEventGridTopicKey\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzEventHub',
+		ListItemText: 'New-AzEventHub',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzEventHub \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzEventHubApplicationGroup',
+		ListItemText: 'New-AzEventHubApplicationGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzEventHubApplicationGroup \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzEventHubAuthorizationRule',
+		ListItemText: 'New-AzEventHubAuthorizationRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzEventHubAuthorizationRule \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzEventHubAuthorizationRuleSASToken',
+		ListItemText: 'New-AzEventHubAuthorizationRuleSASToken',
+		ResultType: 2,
+		ToolTip: 'New-AzEventHubAuthorizationRuleSASToken\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzEventHubCluster',
+		ListItemText: 'New-AzEventHubCluster',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzEventHubCluster \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzEventHubConsumerGroup',
+		ListItemText: 'New-AzEventHubConsumerGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzEventHubConsumerGroup \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzEventHubGeoDRConfiguration',
+		ListItemText: 'New-AzEventHubGeoDRConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzEventHubGeoDRConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzEventHubIPRuleConfig',
+		ListItemText: 'New-AzEventHubIPRuleConfig',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzEventHubIPRuleConfig \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzEventHubKey',
+		ListItemText: 'New-AzEventHubKey',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzEventHubKey \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzEventHubKeyVaultPropertiesObject',
+		ListItemText: 'New-AzEventHubKeyVaultPropertiesObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzEventHubKeyVaultPropertiesObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzEventHubNamespace',
+		ListItemText: 'New-AzEventHubNamespace',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzEventHubNamespace \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzEventHubNamespaceV2',
+		ListItemText: 'New-AzEventHubNamespaceV2',
+		ResultType: 2,
+		ToolTip: 'New-AzEventHubNamespaceV2'
+	},
+	{
+		CompletionText: 'New-AzEventHubSchemaGroup',
+		ListItemText: 'New-AzEventHubSchemaGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzEventHubSchemaGroup \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzEventHubThrottlingPolicyConfig',
+		ListItemText: 'New-AzEventHubThrottlingPolicyConfig',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzEventHubThrottlingPolicyConfig \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzEventHubVirtualNetworkRuleConfig',
+		ListItemText: 'New-AzEventHubVirtualNetworkRuleConfig',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzEventHubVirtualNetworkRuleConfig \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzExpressRouteCircuit',
+		ListItemText: 'New-AzExpressRouteCircuit',
+		ResultType: 2,
+		ToolTip: 'New-AzExpressRouteCircuit\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzExpressRouteCircuitAuthorization',
+		ListItemText: 'New-AzExpressRouteCircuitAuthorization',
+		ResultType: 2,
+		ToolTip: 'New-AzExpressRouteCircuitAuthorization\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzExpressRouteCircuitPeeringConfig',
+		ListItemText: 'New-AzExpressRouteCircuitPeeringConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzExpressRouteCircuitPeeringConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzExpressRouteConnection',
+		ListItemText: 'New-AzExpressRouteConnection',
+		ResultType: 2,
+		ToolTip: 'New-AzExpressRouteConnection\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzExpressRouteGateway',
+		ListItemText: 'New-AzExpressRouteGateway',
+		ResultType: 2,
+		ToolTip: 'New-AzExpressRouteGateway\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzExpressRoutePort',
+		ListItemText: 'New-AzExpressRoutePort',
+		ResultType: 2,
+		ToolTip: 'New-AzExpressRoutePort\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzExpressRoutePortIdentity',
+		ListItemText: 'New-AzExpressRoutePortIdentity',
+		ResultType: 2,
+		ToolTip: 'New-AzExpressRoutePortIdentity\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzExpressRoutePortLOA',
+		ListItemText: 'New-AzExpressRoutePortLOA',
+		ResultType: 2,
+		ToolTip: 'New-AzExpressRoutePortLOA\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFederatedIdentityCredentials',
+		ListItemText: 'New-AzFederatedIdentityCredentials',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFederatedIdentityCredentials \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFirewall',
+		ListItemText: 'New-AzFirewall',
+		ResultType: 2,
+		ToolTip: 'New-AzFirewall\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFirewallApplicationRule',
+		ListItemText: 'New-AzFirewallApplicationRule',
+		ResultType: 2,
+		ToolTip: 'New-AzFirewallApplicationRule\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFirewallApplicationRuleCollection',
+		ListItemText: 'New-AzFirewallApplicationRuleCollection',
+		ResultType: 2,
+		ToolTip: 'New-AzFirewallApplicationRuleCollection\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFirewallHubIpAddress',
+		ListItemText: 'New-AzFirewallHubIpAddress',
+		ResultType: 2,
+		ToolTip: 'New-AzFirewallHubIpAddress\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFirewallHubPublicIpAddress',
+		ListItemText: 'New-AzFirewallHubPublicIpAddress',
+		ResultType: 2,
+		ToolTip: 'New-AzFirewallHubPublicIpAddress\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFirewallNatRule',
+		ListItemText: 'New-AzFirewallNatRule',
+		ResultType: 2,
+		ToolTip: 'New-AzFirewallNatRule\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFirewallNatRuleCollection',
+		ListItemText: 'New-AzFirewallNatRuleCollection',
+		ResultType: 2,
+		ToolTip: 'New-AzFirewallNatRuleCollection\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFirewallNetworkRule',
+		ListItemText: 'New-AzFirewallNetworkRule',
+		ResultType: 2,
+		ToolTip: 'New-AzFirewallNetworkRule\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFirewallNetworkRuleCollection',
+		ListItemText: 'New-AzFirewallNetworkRuleCollection',
+		ResultType: 2,
+		ToolTip: 'New-AzFirewallNetworkRuleCollection\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFirewallPolicy',
+		ListItemText: 'New-AzFirewallPolicy',
+		ResultType: 2,
+		ToolTip: 'New-AzFirewallPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFirewallPolicyApplicationRule',
+		ListItemText: 'New-AzFirewallPolicyApplicationRule',
+		ResultType: 2,
+		ToolTip: 'New-AzFirewallPolicyApplicationRule\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFirewallPolicyApplicationRuleCustomHttpHeader',
+		ListItemText: 'New-AzFirewallPolicyApplicationRuleCustomHttpHeader',
+		ResultType: 2,
+		ToolTip: 'New-AzFirewallPolicyApplicationRuleCustomHttpHeader\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFirewallPolicyDnsSetting',
+		ListItemText: 'New-AzFirewallPolicyDnsSetting',
+		ResultType: 2,
+		ToolTip: 'New-AzFirewallPolicyDnsSetting\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFirewallPolicyExplicitProxy',
+		ListItemText: 'New-AzFirewallPolicyExplicitProxy',
+		ResultType: 2,
+		ToolTip: 'New-AzFirewallPolicyExplicitProxy\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFirewallPolicyFilterRuleCollection',
+		ListItemText: 'New-AzFirewallPolicyFilterRuleCollection',
+		ResultType: 2,
+		ToolTip: 'New-AzFirewallPolicyFilterRuleCollection\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFirewallPolicyIntrusionDetection',
+		ListItemText: 'New-AzFirewallPolicyIntrusionDetection',
+		ResultType: 2,
+		ToolTip: 'New-AzFirewallPolicyIntrusionDetection\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFirewallPolicyIntrusionDetectionBypassTraffic',
+		ListItemText: 'New-AzFirewallPolicyIntrusionDetectionBypassTraffic',
+		ResultType: 2,
+		ToolTip: 'New-AzFirewallPolicyIntrusionDetectionBypassTraffic\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFirewallPolicyIntrusionDetectionSignatureOverride',
+		ListItemText: 'New-AzFirewallPolicyIntrusionDetectionSignatureOverride',
+		ResultType: 2,
+		ToolTip: 'New-AzFirewallPolicyIntrusionDetectionSignatureOverride\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFirewallPolicyNatRule',
+		ListItemText: 'New-AzFirewallPolicyNatRule',
+		ResultType: 2,
+		ToolTip: 'New-AzFirewallPolicyNatRule\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFirewallPolicyNatRuleCollection',
+		ListItemText: 'New-AzFirewallPolicyNatRuleCollection',
+		ResultType: 2,
+		ToolTip: 'New-AzFirewallPolicyNatRuleCollection\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFirewallPolicyNetworkRule',
+		ListItemText: 'New-AzFirewallPolicyNetworkRule',
+		ResultType: 2,
+		ToolTip: 'New-AzFirewallPolicyNetworkRule\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFirewallPolicyRuleCollectionGroup',
+		ListItemText: 'New-AzFirewallPolicyRuleCollectionGroup',
+		ResultType: 2,
+		ToolTip: 'New-AzFirewallPolicyRuleCollectionGroup\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFirewallPolicySnat',
+		ListItemText: 'New-AzFirewallPolicySnat',
+		ResultType: 2,
+		ToolTip: 'New-AzFirewallPolicySnat\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFirewallPolicySqlSetting',
+		ListItemText: 'New-AzFirewallPolicySqlSetting',
+		ResultType: 2,
+		ToolTip: 'New-AzFirewallPolicySqlSetting\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFirewallPolicyThreatIntelWhitelist',
+		ListItemText: 'New-AzFirewallPolicyThreatIntelWhitelist',
+		ResultType: 2,
+		ToolTip: 'New-AzFirewallPolicyThreatIntelWhitelist\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFirewallPublicIpAddress',
+		ListItemText: 'New-AzFirewallPublicIpAddress',
+		ResultType: 2,
+		ToolTip: 'New-AzFirewallPublicIpAddress\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFirewallThreatIntelWhitelist',
+		ListItemText: 'New-AzFirewallThreatIntelWhitelist',
+		ResultType: 2,
+		ToolTip: 'New-AzFirewallThreatIntelWhitelist\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFirewallThreatIntelWhitelistObject',
+		ListItemText: 'New-AzFirewallThreatIntelWhitelistObject',
+		ResultType: 2,
+		ToolTip: 'New-AzFirewallThreatIntelWhitelistObject'
+	},
+	{
+		CompletionText: 'New-AzFrontDoor',
+		ListItemText: 'New-AzFrontDoor',
+		ResultType: 2,
+		ToolTip: 'New-AzFrontDoor\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorBackendObject',
+		ListItemText: 'New-AzFrontDoorBackendObject',
+		ResultType: 2,
+		ToolTip: 'New-AzFrontDoorBackendObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorBackendPoolObject',
+		ListItemText: 'New-AzFrontDoorBackendPoolObject',
+		ResultType: 2,
+		ToolTip: 'New-AzFrontDoorBackendPoolObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorBackendPoolsSettingObject',
+		ListItemText: 'New-AzFrontDoorBackendPoolsSettingObject',
+		ResultType: 2,
+		ToolTip: 'New-AzFrontDoorBackendPoolsSettingObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnCustomDomain',
+		ListItemText: 'New-AzFrontDoorCdnCustomDomain',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnCustomDomain \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnCustomDomainTlsSettingParametersObject',
+		ListItemText: 'New-AzFrontDoorCdnCustomDomainTlsSettingParametersObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnCustomDomainTlsSettingParametersObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnEndpoint',
+		ListItemText: 'New-AzFrontDoorCdnEndpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnEndpoint \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnMigrationParametersObject',
+		ListItemText: 'New-AzFrontDoorCdnMigrationParametersObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnMigrationParametersObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnMigrationWebApplicationFirewallMappingObject',
+		ListItemText: 'New-AzFrontDoorCdnMigrationWebApplicationFirewallMappingObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnMigrationWebApplicationFirewallMappingObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnOrigin',
+		ListItemText: 'New-AzFrontDoorCdnOrigin',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnOrigin \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnOriginGroup',
+		ListItemText: 'New-AzFrontDoorCdnOriginGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnOriginGroup \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnOriginGroupHealthProbeSettingObject',
+		ListItemText: 'New-AzFrontDoorCdnOriginGroupHealthProbeSettingObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnOriginGroupHealthProbeSettingObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnOriginGroupLoadBalancingSettingObject',
+		ListItemText: 'New-AzFrontDoorCdnOriginGroupLoadBalancingSettingObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnOriginGroupLoadBalancingSettingObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnProfile',
+		ListItemText: 'New-AzFrontDoorCdnProfile',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnProfile \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnProfileChangeSkuWafMappingObject',
+		ListItemText: 'New-AzFrontDoorCdnProfileChangeSkuWafMappingObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnProfileChangeSkuWafMappingObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnProfileUpgradeParametersObject',
+		ListItemText: 'New-AzFrontDoorCdnProfileUpgradeParametersObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnProfileUpgradeParametersObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnPurgeParametersObject',
+		ListItemText: 'New-AzFrontDoorCdnPurgeParametersObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnPurgeParametersObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnResourceReferenceObject',
+		ListItemText: 'New-AzFrontDoorCdnResourceReferenceObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnResourceReferenceObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnRoute',
+		ListItemText: 'New-AzFrontDoorCdnRoute',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnRoute \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnRule',
+		ListItemText: 'New-AzFrontDoorCdnRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnRule \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnRuleClientPortConditionObject',
+		ListItemText: 'New-AzFrontDoorCdnRuleClientPortConditionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnRuleClientPortConditionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnRuleCookiesConditionObject',
+		ListItemText: 'New-AzFrontDoorCdnRuleCookiesConditionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnRuleCookiesConditionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnRuleHostNameConditionObject',
+		ListItemText: 'New-AzFrontDoorCdnRuleHostNameConditionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnRuleHostNameConditionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnRuleHttpVersionConditionObject',
+		ListItemText: 'New-AzFrontDoorCdnRuleHttpVersionConditionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnRuleHttpVersionConditionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnRuleIsDeviceConditionObject',
+		ListItemText: 'New-AzFrontDoorCdnRuleIsDeviceConditionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnRuleIsDeviceConditionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnRulePostArgsConditionObject',
+		ListItemText: 'New-AzFrontDoorCdnRulePostArgsConditionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnRulePostArgsConditionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnRuleQueryStringConditionObject',
+		ListItemText: 'New-AzFrontDoorCdnRuleQueryStringConditionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnRuleQueryStringConditionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnRuleRemoteAddressConditionObject',
+		ListItemText: 'New-AzFrontDoorCdnRuleRemoteAddressConditionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnRuleRemoteAddressConditionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnRuleRequestBodyConditionObject',
+		ListItemText: 'New-AzFrontDoorCdnRuleRequestBodyConditionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnRuleRequestBodyConditionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnRuleRequestHeaderActionObject',
+		ListItemText: 'New-AzFrontDoorCdnRuleRequestHeaderActionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnRuleRequestHeaderActionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnRuleRequestHeaderConditionObject',
+		ListItemText: 'New-AzFrontDoorCdnRuleRequestHeaderConditionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnRuleRequestHeaderConditionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnRuleRequestMethodConditionObject',
+		ListItemText: 'New-AzFrontDoorCdnRuleRequestMethodConditionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnRuleRequestMethodConditionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnRuleRequestSchemeConditionObject',
+		ListItemText: 'New-AzFrontDoorCdnRuleRequestSchemeConditionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnRuleRequestSchemeConditionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnRuleRequestUriConditionObject',
+		ListItemText: 'New-AzFrontDoorCdnRuleRequestUriConditionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnRuleRequestUriConditionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnRuleResponseHeaderActionObject',
+		ListItemText: 'New-AzFrontDoorCdnRuleResponseHeaderActionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnRuleResponseHeaderActionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnRuleRouteConfigurationOverrideActionObject',
+		ListItemText: 'New-AzFrontDoorCdnRuleRouteConfigurationOverrideActionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnRuleRouteConfigurationOverrideActionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnRuleServerPortConditionObject',
+		ListItemText: 'New-AzFrontDoorCdnRuleServerPortConditionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnRuleServerPortConditionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnRuleSet',
+		ListItemText: 'New-AzFrontDoorCdnRuleSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnRuleSet \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnRuleSocketAddrConditionObject',
+		ListItemText: 'New-AzFrontDoorCdnRuleSocketAddrConditionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnRuleSocketAddrConditionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnRuleSslProtocolConditionObject',
+		ListItemText: 'New-AzFrontDoorCdnRuleSslProtocolConditionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnRuleSslProtocolConditionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnRuleUrlFileExtensionConditionObject',
+		ListItemText: 'New-AzFrontDoorCdnRuleUrlFileExtensionConditionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnRuleUrlFileExtensionConditionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnRuleUrlFileNameConditionObject',
+		ListItemText: 'New-AzFrontDoorCdnRuleUrlFileNameConditionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnRuleUrlFileNameConditionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnRuleUrlPathConditionObject',
+		ListItemText: 'New-AzFrontDoorCdnRuleUrlPathConditionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnRuleUrlPathConditionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnRuleUrlRedirectActionObject',
+		ListItemText: 'New-AzFrontDoorCdnRuleUrlRedirectActionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnRuleUrlRedirectActionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnRuleUrlRewriteActionObject',
+		ListItemText: 'New-AzFrontDoorCdnRuleUrlRewriteActionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnRuleUrlRewriteActionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnRuleUrlSigningActionObject',
+		ListItemText: 'New-AzFrontDoorCdnRuleUrlSigningActionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnRuleUrlSigningActionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnSecret',
+		ListItemText: 'New-AzFrontDoorCdnSecret',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnSecret \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnSecretCustomerCertificateParametersObject',
+		ListItemText: 'New-AzFrontDoorCdnSecretCustomerCertificateParametersObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnSecretCustomerCertificateParametersObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnSecretFirstPartyManagedCertificateParametersObject',
+		ListItemText: 'New-AzFrontDoorCdnSecretFirstPartyManagedCertificateParametersObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnSecretFirstPartyManagedCertificateParametersObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnSecretManagedCertificateParametersObject',
+		ListItemText: 'New-AzFrontDoorCdnSecretManagedCertificateParametersObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnSecretManagedCertificateParametersObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnSecretUrlSigningKeyParametersObject',
+		ListItemText: 'New-AzFrontDoorCdnSecretUrlSigningKeyParametersObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnSecretUrlSigningKeyParametersObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnSecurityPolicy',
+		ListItemText: 'New-AzFrontDoorCdnSecurityPolicy',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnSecurityPolicy \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnSecurityPolicyWebApplicationFirewallAssociationObject',
+		ListItemText: 'New-AzFrontDoorCdnSecurityPolicyWebApplicationFirewallAssociationObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnSecurityPolicyWebApplicationFirewallAssociationObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorCdnSecurityPolicyWebApplicationFirewallParametersObject',
+		ListItemText: 'New-AzFrontDoorCdnSecurityPolicyWebApplicationFirewallParametersObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFrontDoorCdnSecurityPolicyWebApplicationFirewallParametersObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorFrontendEndpointObject',
+		ListItemText: 'New-AzFrontDoorFrontendEndpointObject',
+		ResultType: 2,
+		ToolTip: 'New-AzFrontDoorFrontendEndpointObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorHeaderActionObject',
+		ListItemText: 'New-AzFrontDoorHeaderActionObject',
+		ResultType: 2,
+		ToolTip: 'New-AzFrontDoorHeaderActionObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorHealthProbeSettingObject',
+		ListItemText: 'New-AzFrontDoorHealthProbeSettingObject',
+		ResultType: 2,
+		ToolTip: 'New-AzFrontDoorHealthProbeSettingObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorLoadBalancingSettingObject',
+		ListItemText: 'New-AzFrontDoorLoadBalancingSettingObject',
+		ResultType: 2,
+		ToolTip: 'New-AzFrontDoorLoadBalancingSettingObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorRoutingRuleObject',
+		ListItemText: 'New-AzFrontDoorRoutingRuleObject',
+		ResultType: 2,
+		ToolTip: 'New-AzFrontDoorRoutingRuleObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorRulesEngine',
+		ListItemText: 'New-AzFrontDoorRulesEngine',
+		ResultType: 2,
+		ToolTip: 'New-AzFrontDoorRulesEngine\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorRulesEngineActionObject',
+		ListItemText: 'New-AzFrontDoorRulesEngineActionObject',
+		ResultType: 2,
+		ToolTip: 'New-AzFrontDoorRulesEngineActionObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorRulesEngineMatchConditionObject',
+		ListItemText: 'New-AzFrontDoorRulesEngineMatchConditionObject',
+		ResultType: 2,
+		ToolTip: 'New-AzFrontDoorRulesEngineMatchConditionObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorRulesEngineRuleObject',
+		ListItemText: 'New-AzFrontDoorRulesEngineRuleObject',
+		ResultType: 2,
+		ToolTip: 'New-AzFrontDoorRulesEngineRuleObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorWafCustomRuleObject',
+		ListItemText: 'New-AzFrontDoorWafCustomRuleObject',
+		ResultType: 2,
+		ToolTip: 'New-AzFrontDoorWafCustomRuleObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorWafManagedRuleExclusionObject',
+		ListItemText: 'New-AzFrontDoorWafManagedRuleExclusionObject',
+		ResultType: 2,
+		ToolTip: 'New-AzFrontDoorWafManagedRuleExclusionObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorWafManagedRuleObject',
+		ListItemText: 'New-AzFrontDoorWafManagedRuleObject',
+		ResultType: 2,
+		ToolTip: 'New-AzFrontDoorWafManagedRuleObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorWafManagedRuleOverrideObject',
+		ListItemText: 'New-AzFrontDoorWafManagedRuleOverrideObject',
+		ResultType: 2,
+		ToolTip: 'New-AzFrontDoorWafManagedRuleOverrideObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorWafMatchConditionObject',
+		ListItemText: 'New-AzFrontDoorWafMatchConditionObject',
+		ResultType: 2,
+		ToolTip: 'New-AzFrontDoorWafMatchConditionObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorWafPolicy',
+		ListItemText: 'New-AzFrontDoorWafPolicy',
+		ResultType: 2,
+		ToolTip: 'New-AzFrontDoorWafPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFrontDoorWafRuleGroupOverrideObject',
+		ListItemText: 'New-AzFrontDoorWafRuleGroupOverrideObject',
+		ResultType: 2,
+		ToolTip: 'New-AzFrontDoorWafRuleGroupOverrideObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFunctionApp',
+		ListItemText: 'New-AzFunctionApp',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFunctionApp \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzFunctionAppPlan',
+		ListItemText: 'New-AzFunctionAppPlan',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzFunctionAppPlan \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzGallery',
+		ListItemText: 'New-AzGallery',
+		ResultType: 2,
+		ToolTip: 'New-AzGallery\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzGalleryApplication',
+		ListItemText: 'New-AzGalleryApplication',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzGalleryApplication \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzGalleryApplicationVersion',
+		ListItemText: 'New-AzGalleryApplicationVersion',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzGalleryApplicationVersion \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzGalleryImageDefinition',
+		ListItemText: 'New-AzGalleryImageDefinition',
+		ResultType: 2,
+		ToolTip: 'New-AzGalleryImageDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzGalleryImageVersion',
+		ListItemText: 'New-AzGalleryImageVersion',
+		ResultType: 2,
+		ToolTip: 'New-AzGalleryImageVersion\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzGatewayCustomBgpIpConfigurationObject',
+		ListItemText: 'New-AzGatewayCustomBgpIpConfigurationObject',
+		ResultType: 2,
+		ToolTip: 'New-AzGatewayCustomBgpIpConfigurationObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzHDInsightCluster',
+		ListItemText: 'New-AzHDInsightCluster',
+		ResultType: 2,
+		ToolTip: 'New-AzHDInsightCluster\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzHDInsightClusterAutoscaleConfiguration',
+		ListItemText: 'New-AzHDInsightClusterAutoscaleConfiguration',
+		ResultType: 2,
+		ToolTip: 'New-AzHDInsightClusterAutoscaleConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzHDInsightClusterAutoscaleScheduleCondition',
+		ListItemText: 'New-AzHDInsightClusterAutoscaleScheduleCondition',
+		ResultType: 2,
+		ToolTip: 'New-AzHDInsightClusterAutoscaleScheduleCondition\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzHDInsightClusterConfig',
+		ListItemText: 'New-AzHDInsightClusterConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzHDInsightClusterConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzHDInsightHiveJobDefinition',
+		ListItemText: 'New-AzHDInsightHiveJobDefinition',
+		ResultType: 2,
+		ToolTip: 'New-AzHDInsightHiveJobDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzHDInsightIPConfiguration',
+		ListItemText: 'New-AzHDInsightIPConfiguration',
+		ResultType: 2,
+		ToolTip: 'New-AzHDInsightIPConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzHDInsightMapReduceJobDefinition',
+		ListItemText: 'New-AzHDInsightMapReduceJobDefinition',
+		ResultType: 2,
+		ToolTip: 'New-AzHDInsightMapReduceJobDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzHDInsightPigJobDefinition',
+		ListItemText: 'New-AzHDInsightPigJobDefinition',
+		ResultType: 2,
+		ToolTip: 'New-AzHDInsightPigJobDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzHDInsightPrivateLinkConfiguration',
+		ListItemText: 'New-AzHDInsightPrivateLinkConfiguration',
+		ResultType: 2,
+		ToolTip: 'New-AzHDInsightPrivateLinkConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzHDInsightSqoopJobDefinition',
+		ListItemText: 'New-AzHDInsightSqoopJobDefinition',
+		ResultType: 2,
+		ToolTip: 'New-AzHDInsightSqoopJobDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzHDInsightStreamingMapReduceJobDefinition',
+		ListItemText: 'New-AzHDInsightStreamingMapReduceJobDefinition',
+		ResultType: 2,
+		ToolTip: 'New-AzHDInsightStreamingMapReduceJobDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzHealthcareApisService',
+		ListItemText: 'New-AzHealthcareApisService',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzHealthcareApisService \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzHealthcareApisWorkspace',
+		ListItemText: 'New-AzHealthcareApisWorkspace',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzHealthcareApisWorkspace \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzHealthcareDicomService',
+		ListItemText: 'New-AzHealthcareDicomService',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzHealthcareDicomService \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzHealthcareFhirService',
+		ListItemText: 'New-AzHealthcareFhirService',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzHealthcareFhirService \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzHealthcareIotConnector',
+		ListItemText: 'New-AzHealthcareIotConnector',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzHealthcareIotConnector \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzHealthcareIotConnectorFhirDestination',
+		ListItemText: 'New-AzHealthcareIotConnectorFhirDestination',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzHealthcareIotConnectorFhirDestination \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzHost',
+		ListItemText: 'New-AzHost',
+		ResultType: 2,
+		ToolTip: 'New-AzHost\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzHostGroup',
+		ListItemText: 'New-AzHostGroup',
+		ResultType: 2,
+		ToolTip: 'New-AzHostGroup\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzImage',
+		ListItemText: 'New-AzImage',
+		ResultType: 2,
+		ToolTip: 'New-AzImage\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzImageConfig',
+		ListItemText: 'New-AzImageConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzImageConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzInsightsPrivateLinkScope',
+		ListItemText: 'New-AzInsightsPrivateLinkScope',
+		ResultType: 2,
+		ToolTip: 'New-AzInsightsPrivateLinkScope\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzInsightsPrivateLinkScopedResource',
+		ListItemText: 'New-AzInsightsPrivateLinkScopedResource',
+		ResultType: 2,
+		ToolTip: 'New-AzInsightsPrivateLinkScopedResource\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzIntegrationAccount',
+		ListItemText: 'New-AzIntegrationAccount',
+		ResultType: 2,
+		ToolTip: 'New-AzIntegrationAccount\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzIntegrationAccountAgreement',
+		ListItemText: 'New-AzIntegrationAccountAgreement',
+		ResultType: 2,
+		ToolTip: 'New-AzIntegrationAccountAgreement\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzIntegrationAccountAssembly',
+		ListItemText: 'New-AzIntegrationAccountAssembly',
+		ResultType: 2,
+		ToolTip: 'New-AzIntegrationAccountAssembly\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzIntegrationAccountBatchConfiguration',
+		ListItemText: 'New-AzIntegrationAccountBatchConfiguration',
+		ResultType: 2,
+		ToolTip: 'New-AzIntegrationAccountBatchConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzIntegrationAccountCertificate',
+		ListItemText: 'New-AzIntegrationAccountCertificate',
+		ResultType: 2,
+		ToolTip: 'New-AzIntegrationAccountCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzIntegrationAccountMap',
+		ListItemText: 'New-AzIntegrationAccountMap',
+		ResultType: 2,
+		ToolTip: 'New-AzIntegrationAccountMap\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzIntegrationAccountPartner',
+		ListItemText: 'New-AzIntegrationAccountPartner',
+		ResultType: 2,
+		ToolTip: 'New-AzIntegrationAccountPartner\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzIntegrationAccountSchema',
+		ListItemText: 'New-AzIntegrationAccountSchema',
+		ResultType: 2,
+		ToolTip: 'New-AzIntegrationAccountSchema\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzIotHub',
+		ListItemText: 'New-AzIotHub',
+		ResultType: 2,
+		ToolTip: 'New-AzIotHub\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzIotHubExportDevice',
+		ListItemText: 'New-AzIotHubExportDevice',
+		ResultType: 2,
+		ToolTip: 'New-AzIotHubExportDevice\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzIotHubImportDevice',
+		ListItemText: 'New-AzIotHubImportDevice',
+		ResultType: 2,
+		ToolTip: 'New-AzIotHubImportDevice\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzIotHubKey',
+		ListItemText: 'New-AzIotHubKey',
+		ResultType: 2,
+		ToolTip: 'New-AzIotHubKey\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzIotHubSasToken',
+		ListItemText: 'New-AzIotHubSasToken',
+		ResultType: 2,
+		ToolTip: 'New-AzIotHubSasToken\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzIotSecuritySolutionRecommendationConfigurationObject',
+		ListItemText: 'New-AzIotSecuritySolutionRecommendationConfigurationObject',
+		ResultType: 2,
+		ToolTip: 'New-AzIotSecuritySolutionRecommendationConfigurationObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzIotSecuritySolutionUserDefinedResourcesObject',
+		ListItemText: 'New-AzIotSecuritySolutionUserDefinedResourcesObject',
+		ResultType: 2,
+		ToolTip: 'New-AzIotSecuritySolutionUserDefinedResourcesObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzIpAllocation',
+		ListItemText: 'New-AzIpAllocation',
+		ResultType: 2,
+		ToolTip: 'New-AzIpAllocation\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzIpConfigurationBgpPeeringAddressObject',
+		ListItemText: 'New-AzIpConfigurationBgpPeeringAddressObject',
+		ResultType: 2,
+		ToolTip: 'New-AzIpConfigurationBgpPeeringAddressObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzIpGroup',
+		ListItemText: 'New-AzIpGroup',
+		ResultType: 2,
+		ToolTip: 'New-AzIpGroup\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzIpsecPolicy',
+		ListItemText: 'New-AzIpsecPolicy',
+		ResultType: 2,
+		ToolTip: 'New-AzIpsecPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzIpsecTrafficSelectorPolicy',
+		ListItemText: 'New-AzIpsecTrafficSelectorPolicy',
+		ResultType: 2,
+		ToolTip: 'New-AzIpsecTrafficSelectorPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzKeyVault',
+		ListItemText: 'New-AzKeyVault',
+		ResultType: 2,
+		ToolTip: 'New-AzKeyVault\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzKeyVaultCertificateAdministratorDetail',
+		ListItemText: 'New-AzKeyVaultCertificateAdministratorDetail',
+		ResultType: 2,
+		ToolTip: 'New-AzKeyVaultCertificateAdministratorDetail\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzKeyVaultCertificateOrganizationDetail',
+		ListItemText: 'New-AzKeyVaultCertificateOrganizationDetail',
+		ResultType: 2,
+		ToolTip: 'New-AzKeyVaultCertificateOrganizationDetail\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzKeyVaultCertificatePolicy',
+		ListItemText: 'New-AzKeyVaultCertificatePolicy',
+		ResultType: 2,
+		ToolTip: 'New-AzKeyVaultCertificatePolicy\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzKeyVaultManagedHsm',
+		ListItemText: 'New-AzKeyVaultManagedHsm',
+		ResultType: 2,
+		ToolTip: 'New-AzKeyVaultManagedHsm\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzKeyVaultNetworkRuleSetObject',
+		ListItemText: 'New-AzKeyVaultNetworkRuleSetObject',
+		ResultType: 2,
+		ToolTip: 'New-AzKeyVaultNetworkRuleSetObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzKeyVaultRoleAssignment',
+		ListItemText: 'New-AzKeyVaultRoleAssignment',
+		ResultType: 2,
+		ToolTip: 'New-AzKeyVaultRoleAssignment\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzKeyVaultRoleDefinition',
+		ListItemText: 'New-AzKeyVaultRoleDefinition',
+		ResultType: 2,
+		ToolTip: 'New-AzKeyVaultRoleDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzKustoAttachedDatabaseConfiguration',
+		ListItemText: 'New-AzKustoAttachedDatabaseConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzKustoAttachedDatabaseConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzKustoCluster',
+		ListItemText: 'New-AzKustoCluster',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzKustoCluster \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzKustoClusterPrincipalAssignment',
+		ListItemText: 'New-AzKustoClusterPrincipalAssignment',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzKustoClusterPrincipalAssignment \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzKustoDatabase',
+		ListItemText: 'New-AzKustoDatabase',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzKustoDatabase \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzKustoDatabasePrincipalAssignment',
+		ListItemText: 'New-AzKustoDatabasePrincipalAssignment',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzKustoDatabasePrincipalAssignment \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzKustoDataConnection',
+		ListItemText: 'New-AzKustoDataConnection',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzKustoDataConnection \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzKustoManagedPrivateEndpoint',
+		ListItemText: 'New-AzKustoManagedPrivateEndpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzKustoManagedPrivateEndpoint \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzKustoPrivateEndpointConnection',
+		ListItemText: 'New-AzKustoPrivateEndpointConnection',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzKustoPrivateEndpointConnection \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzKustoScript',
+		ListItemText: 'New-AzKustoScript',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzKustoScript \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzLoad',
+		ListItemText: 'New-AzLoad',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzLoad \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzLoadBalancer',
+		ListItemText: 'New-AzLoadBalancer',
+		ResultType: 2,
+		ToolTip: 'New-AzLoadBalancer\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzLoadBalancerBackendAddressConfig',
+		ListItemText: 'New-AzLoadBalancerBackendAddressConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzLoadBalancerBackendAddressConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzLoadBalancerBackendAddressPool',
+		ListItemText: 'New-AzLoadBalancerBackendAddressPool',
+		ResultType: 2,
+		ToolTip: 'New-AzLoadBalancerBackendAddressPool\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzLoadBalancerBackendAddressPoolConfig',
+		ListItemText: 'New-AzLoadBalancerBackendAddressPoolConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzLoadBalancerBackendAddressPoolConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzLoadBalancerBackendAddressPoolTunnelInterfaceConfig',
+		ListItemText: 'New-AzLoadBalancerBackendAddressPoolTunnelInterfaceConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzLoadBalancerBackendAddressPoolTunnelInterfaceConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzLoadBalancerFrontendIpConfig',
+		ListItemText: 'New-AzLoadBalancerFrontendIpConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzLoadBalancerFrontendIpConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzLoadBalancerInboundNatPoolConfig',
+		ListItemText: 'New-AzLoadBalancerInboundNatPoolConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzLoadBalancerInboundNatPoolConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzLoadBalancerInboundNatRuleConfig',
+		ListItemText: 'New-AzLoadBalancerInboundNatRuleConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzLoadBalancerInboundNatRuleConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzLoadBalancerOutboundRuleConfig',
+		ListItemText: 'New-AzLoadBalancerOutboundRuleConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzLoadBalancerOutboundRuleConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzLoadBalancerProbeConfig',
+		ListItemText: 'New-AzLoadBalancerProbeConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzLoadBalancerProbeConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzLoadBalancerRuleConfig',
+		ListItemText: 'New-AzLoadBalancerRuleConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzLoadBalancerRuleConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzLocalNetworkGateway',
+		ListItemText: 'New-AzLocalNetworkGateway',
+		ResultType: 2,
+		ToolTip: 'New-AzLocalNetworkGateway\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzLogicApp',
+		ListItemText: 'New-AzLogicApp',
+		ResultType: 2,
+		ToolTip: 'New-AzLogicApp\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMaintenanceConfiguration',
+		ListItemText: 'New-AzMaintenanceConfiguration',
+		ResultType: 2,
+		ToolTip: 'New-AzMaintenanceConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzManagedApplication',
+		ListItemText: 'New-AzManagedApplication',
+		ResultType: 2,
+		ToolTip: 'New-AzManagedApplication\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzManagedApplicationDefinition',
+		ListItemText: 'New-AzManagedApplicationDefinition',
+		ResultType: 2,
+		ToolTip: 'New-AzManagedApplicationDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzManagedCassandraCluster',
+		ListItemText: 'New-AzManagedCassandraCluster',
+		ResultType: 2,
+		ToolTip: 'New-AzManagedCassandraCluster\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzManagedCassandraDataCenter',
+		ListItemText: 'New-AzManagedCassandraDataCenter',
+		ResultType: 2,
+		ToolTip: 'New-AzManagedCassandraDataCenter\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzManagedServicesAssignment',
+		ListItemText: 'New-AzManagedServicesAssignment',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzManagedServicesAssignment \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzManagedServicesAuthorizationObject',
+		ListItemText: 'New-AzManagedServicesAuthorizationObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzManagedServicesAuthorizationObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzManagedServicesDefinition',
+		ListItemText: 'New-AzManagedServicesDefinition',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzManagedServicesDefinition \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzManagedServicesEligibleApproverObject',
+		ListItemText: 'New-AzManagedServicesEligibleApproverObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzManagedServicesEligibleApproverObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzManagedServicesEligibleAuthorizationObject',
+		ListItemText: 'New-AzManagedServicesEligibleAuthorizationObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzManagedServicesEligibleAuthorizationObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzManagementGroup',
+		ListItemText: 'New-AzManagementGroup',
+		ResultType: 2,
+		ToolTip: 'New-AzManagementGroup\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzManagementGroupDeployment',
+		ListItemText: 'New-AzManagementGroupDeployment',
+		ResultType: 2,
+		ToolTip: 'New-AzManagementGroupDeployment\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzManagementGroupHierarchySetting',
+		ListItemText: 'New-AzManagementGroupHierarchySetting',
+		ResultType: 2,
+		ToolTip: 'New-AzManagementGroupHierarchySetting\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzManagementGroupSubscription',
+		ListItemText: 'New-AzManagementGroupSubscription',
+		ResultType: 2,
+		ToolTip: 'New-AzManagementGroupSubscription\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMediaService',
+		ListItemText: 'New-AzMediaService',
+		ResultType: 2,
+		ToolTip: 'New-AzMediaService\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMediaServiceStorageConfig',
+		ListItemText: 'New-AzMediaServiceStorageConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzMediaServiceStorageConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMetricAlertRuleV2Criteria',
+		ListItemText: 'New-AzMetricAlertRuleV2Criteria',
+		ResultType: 2,
+		ToolTip: 'New-AzMetricAlertRuleV2Criteria\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMetricAlertRuleV2DimensionSelection',
+		ListItemText: 'New-AzMetricAlertRuleV2DimensionSelection',
+		ResultType: 2,
+		ToolTip: 'New-AzMetricAlertRuleV2DimensionSelection\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMetricFilter',
+		ListItemText: 'New-AzMetricFilter',
+		ResultType: 2,
+		ToolTip: 'New-AzMetricFilter\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMigrateDiskMapping',
+		ListItemText: 'New-AzMigrateDiskMapping',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMigrateDiskMapping \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMigrateNicMapping',
+		ListItemText: 'New-AzMigrateNicMapping',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMigrateNicMapping \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMigrateProject',
+		ListItemText: 'New-AzMigrateProject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMigrateProject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMigrateReplicationPolicy',
+		ListItemText: 'New-AzMigrateReplicationPolicy',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMigrateReplicationPolicy \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMigrateReplicationProtectionContainerMapping',
+		ListItemText: 'New-AzMigrateReplicationProtectionContainerMapping',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMigrateReplicationProtectionContainerMapping \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMigrateServerReplication',
+		ListItemText: 'New-AzMigrateServerReplication',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMigrateServerReplication \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMigrateTestNicMapping',
+		ListItemText: 'New-AzMigrateTestNicMapping',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMigrateTestNicMapping \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMlCommitmentPlan',
+		ListItemText: 'New-AzMlCommitmentPlan',
+		ResultType: 2,
+		ToolTip: 'New-AzMlCommitmentPlan\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMlWebService',
+		ListItemText: 'New-AzMlWebService',
+		ResultType: 2,
+		ToolTip: 'New-AzMlWebService\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspace',
+		ListItemText: 'New-AzMLWorkspace',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspace \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceAksObject',
+		ListItemText: 'New-AzMLWorkspaceAksObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceAksObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceAmlComputeObject',
+		ListItemText: 'New-AzMLWorkspaceAmlComputeObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceAmlComputeObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceBatchDeployment',
+		ListItemText: 'New-AzMLWorkspaceBatchDeployment',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceBatchDeployment \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceBatchEndpoint',
+		ListItemText: 'New-AzMLWorkspaceBatchEndpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceBatchEndpoint \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceCodeVersion',
+		ListItemText: 'New-AzMLWorkspaceCodeVersion',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceCodeVersion \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceCommandJobObject',
+		ListItemText: 'New-AzMLWorkspaceCommandJobObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceCommandJobObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceComponentContainer',
+		ListItemText: 'New-AzMLWorkspaceComponentContainer',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceComponentContainer \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceComponentVersion',
+		ListItemText: 'New-AzMLWorkspaceComponentVersion',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceComponentVersion \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceCompute',
+		ListItemText: 'New-AzMLWorkspaceCompute',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceCompute \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceComputeInstanceObject',
+		ListItemText: 'New-AzMLWorkspaceComputeInstanceObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceComputeInstanceObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceComputeStartStopScheduleObject',
+		ListItemText: 'New-AzMLWorkspaceComputeStartStopScheduleObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceComputeStartStopScheduleObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceConnection',
+		ListItemText: 'New-AzMLWorkspaceConnection',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceConnection \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceCustomModelJobInputObject',
+		ListItemText: 'New-AzMLWorkspaceCustomModelJobInputObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceCustomModelJobInputObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceCustomModelJobOutputObject',
+		ListItemText: 'New-AzMLWorkspaceCustomModelJobOutputObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceCustomModelJobOutputObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceDatabricksObject',
+		ListItemText: 'New-AzMLWorkspaceDatabricksObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceDatabricksObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceDataContainer',
+		ListItemText: 'New-AzMLWorkspaceDataContainer',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceDataContainer \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceDataFactoryObject',
+		ListItemText: 'New-AzMLWorkspaceDataFactoryObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceDataFactoryObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceDataLakeAnalyticsObject',
+		ListItemText: 'New-AzMLWorkspaceDataLakeAnalyticsObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceDataLakeAnalyticsObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceDatastore',
+		ListItemText: 'New-AzMLWorkspaceDatastore',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceDatastore \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceDatastoreBlobObject',
+		ListItemText: 'New-AzMLWorkspaceDatastoreBlobObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceDatastoreBlobObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceDatastoreCredentialObject',
+		ListItemText: 'New-AzMLWorkspaceDatastoreCredentialObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceDatastoreCredentialObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceDatastoreDataLakeGen1Object',
+		ListItemText: 'New-AzMLWorkspaceDatastoreDataLakeGen1Object',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceDatastoreDataLakeGen1Object \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceDatastoreDataLakeGen2Object',
+		ListItemText: 'New-AzMLWorkspaceDatastoreDataLakeGen2Object',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceDatastoreDataLakeGen2Object \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceDatastoreFileObject',
+		ListItemText: 'New-AzMLWorkspaceDatastoreFileObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceDatastoreFileObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceDatastoreKeyCredentialObject',
+		ListItemText: 'New-AzMLWorkspaceDatastoreKeyCredentialObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceDatastoreKeyCredentialObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceDatastoreNoneCredentialObject',
+		ListItemText: 'New-AzMLWorkspaceDatastoreNoneCredentialObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceDatastoreNoneCredentialObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceDatastoreSasCredentialObject',
+		ListItemText: 'New-AzMLWorkspaceDatastoreSasCredentialObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceDatastoreSasCredentialObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceDatastoreServicePrincipalCredentialObject',
+		ListItemText: 'New-AzMLWorkspaceDatastoreServicePrincipalCredentialObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceDatastoreServicePrincipalCredentialObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceDataVersion',
+		ListItemText: 'New-AzMLWorkspaceDataVersion',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceDataVersion \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceEnvironmentVersion',
+		ListItemText: 'New-AzMLWorkspaceEnvironmentVersion',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceEnvironmentVersion \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceHDInsightObject',
+		ListItemText: 'New-AzMLWorkspaceHDInsightObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceHDInsightObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceJob',
+		ListItemText: 'New-AzMLWorkspaceJob',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceJob \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceJobServiceObject',
+		ListItemText: 'New-AzMLWorkspaceJobServiceObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceJobServiceObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceKubernetesObject',
+		ListItemText: 'New-AzMLWorkspaceKubernetesObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceKubernetesObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceLiteralJobInputObject',
+		ListItemText: 'New-AzMLWorkspaceLiteralJobInputObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceLiteralJobInputObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceMLFlowModelJobInputObject',
+		ListItemText: 'New-AzMLWorkspaceMLFlowModelJobInputObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceMLFlowModelJobInputObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceMLFlowModelJobOutputObject',
+		ListItemText: 'New-AzMLWorkspaceMLFlowModelJobOutputObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceMLFlowModelJobOutputObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceMLTableJobInputObject',
+		ListItemText: 'New-AzMLWorkspaceMLTableJobInputObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceMLTableJobInputObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceMLTableJobOutputObject',
+		ListItemText: 'New-AzMLWorkspaceMLTableJobOutputObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceMLTableJobOutputObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceModelContainer',
+		ListItemText: 'New-AzMLWorkspaceModelContainer',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceModelContainer \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceModelVersion',
+		ListItemText: 'New-AzMLWorkspaceModelVersion',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceModelVersion \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceOnlineDeployment',
+		ListItemText: 'New-AzMLWorkspaceOnlineDeployment',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceOnlineDeployment \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceOnlineEndpoint',
+		ListItemText: 'New-AzMLWorkspaceOnlineEndpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceOnlineEndpoint \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceOnlineEndpointKey',
+		ListItemText: 'New-AzMLWorkspaceOnlineEndpointKey',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceOnlineEndpointKey \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspacePipelineJobObject',
+		ListItemText: 'New-AzMLWorkspacePipelineJobObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspacePipelineJobObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceQuotaPropertiesObject',
+		ListItemText: 'New-AzMLWorkspaceQuotaPropertiesObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceQuotaPropertiesObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceSharedPrivateLinkResourceObject',
+		ListItemText: 'New-AzMLWorkspaceSharedPrivateLinkResourceObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceSharedPrivateLinkResourceObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceSweepJobObject',
+		ListItemText: 'New-AzMLWorkspaceSweepJobObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceSweepJobObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceSynapseSparkObject',
+		ListItemText: 'New-AzMLWorkspaceSynapseSparkObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceSynapseSparkObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceTritonModelJobInputObject',
+		ListItemText: 'New-AzMLWorkspaceTritonModelJobInputObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceTritonModelJobInputObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceTritonModelJobOutputObject',
+		ListItemText: 'New-AzMLWorkspaceTritonModelJobOutputObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceTritonModelJobOutputObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceUriFileJobInputObject',
+		ListItemText: 'New-AzMLWorkspaceUriFileJobInputObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceUriFileJobInputObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceUriFileJobOutputObject',
+		ListItemText: 'New-AzMLWorkspaceUriFileJobOutputObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceUriFileJobOutputObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceUriFolderJobInputObject',
+		ListItemText: 'New-AzMLWorkspaceUriFolderJobInputObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceUriFolderJobInputObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceUriFolderJobOutputObject',
+		ListItemText: 'New-AzMLWorkspaceUriFolderJobOutputObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceUriFolderJobOutputObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMLWorkspaceVirtualMachineObject',
+		ListItemText: 'New-AzMLWorkspaceVirtualMachineObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMLWorkspaceVirtualMachineObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMonitorWorkspace',
+		ListItemText: 'New-AzMonitorWorkspace',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMonitorWorkspace \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMySqlFirewallRule',
+		ListItemText: 'New-AzMySqlFirewallRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMySqlFirewallRule \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMySqlFlexibleServer',
+		ListItemText: 'New-AzMySqlFlexibleServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMySqlFlexibleServer \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMySqlFlexibleServerDatabase',
+		ListItemText: 'New-AzMySqlFlexibleServerDatabase',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMySqlFlexibleServerDatabase \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMySqlFlexibleServerFirewallRule',
+		ListItemText: 'New-AzMySqlFlexibleServerFirewallRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMySqlFlexibleServerFirewallRule \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMySqlFlexibleServerReplica',
+		ListItemText: 'New-AzMySqlFlexibleServerReplica',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMySqlFlexibleServerReplica \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMySqlReplica',
+		ListItemText: 'New-AzMySqlReplica',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMySqlReplica \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMySqlServer',
+		ListItemText: 'New-AzMySqlServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMySqlServer \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzMySqlVirtualNetworkRule',
+		ListItemText: 'New-AzMySqlVirtualNetworkRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzMySqlVirtualNetworkRule \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNatGateway',
+		ListItemText: 'New-AzNatGateway',
+		ResultType: 2,
+		ToolTip: 'New-AzNatGateway\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNetworkInterface',
+		ListItemText: 'New-AzNetworkInterface',
+		ResultType: 2,
+		ToolTip: 'New-AzNetworkInterface\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNetworkInterfaceIpConfig',
+		ListItemText: 'New-AzNetworkInterfaceIpConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzNetworkInterfaceIpConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNetworkManager',
+		ListItemText: 'New-AzNetworkManager',
+		ResultType: 2,
+		ToolTip: 'New-AzNetworkManager\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNetworkManagerAddressPrefixItem',
+		ListItemText: 'New-AzNetworkManagerAddressPrefixItem',
+		ResultType: 2,
+		ToolTip: 'New-AzNetworkManagerAddressPrefixItem\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNetworkManagerConnectivityConfiguration',
+		ListItemText: 'New-AzNetworkManagerConnectivityConfiguration',
+		ResultType: 2,
+		ToolTip: 'New-AzNetworkManagerConnectivityConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNetworkManagerConnectivityGroupItem',
+		ListItemText: 'New-AzNetworkManagerConnectivityGroupItem',
+		ResultType: 2,
+		ToolTip: 'New-AzNetworkManagerConnectivityGroupItem\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNetworkManagerGroup',
+		ListItemText: 'New-AzNetworkManagerGroup',
+		ResultType: 2,
+		ToolTip: 'New-AzNetworkManagerGroup\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNetworkManagerHub',
+		ListItemText: 'New-AzNetworkManagerHub',
+		ResultType: 2,
+		ToolTip: 'New-AzNetworkManagerHub\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNetworkManagerManagementGroupConnection',
+		ListItemText: 'New-AzNetworkManagerManagementGroupConnection',
+		ResultType: 2,
+		ToolTip: 'New-AzNetworkManagerManagementGroupConnection\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNetworkManagerScope',
+		ListItemText: 'New-AzNetworkManagerScope',
+		ResultType: 2,
+		ToolTip: 'New-AzNetworkManagerScope\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNetworkManagerScopeConnection',
+		ListItemText: 'New-AzNetworkManagerScopeConnection',
+		ResultType: 2,
+		ToolTip: 'New-AzNetworkManagerScopeConnection\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNetworkManagerSecurityAdminConfiguration',
+		ListItemText: 'New-AzNetworkManagerSecurityAdminConfiguration',
+		ResultType: 2,
+		ToolTip: 'New-AzNetworkManagerSecurityAdminConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNetworkManagerSecurityAdminRule',
+		ListItemText: 'New-AzNetworkManagerSecurityAdminRule',
+		ResultType: 2,
+		ToolTip: 'New-AzNetworkManagerSecurityAdminRule\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNetworkManagerSecurityAdminRuleCollection',
+		ListItemText: 'New-AzNetworkManagerSecurityAdminRuleCollection',
+		ResultType: 2,
+		ToolTip: 'New-AzNetworkManagerSecurityAdminRuleCollection\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNetworkManagerSecurityGroupItem',
+		ListItemText: 'New-AzNetworkManagerSecurityGroupItem',
+		ResultType: 2,
+		ToolTip: 'New-AzNetworkManagerSecurityGroupItem\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNetworkManagerStaticMember',
+		ListItemText: 'New-AzNetworkManagerStaticMember',
+		ResultType: 2,
+		ToolTip: 'New-AzNetworkManagerStaticMember\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNetworkManagerSubscriptionConnection',
+		ListItemText: 'New-AzNetworkManagerSubscriptionConnection',
+		ResultType: 2,
+		ToolTip: 'New-AzNetworkManagerSubscriptionConnection\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNetworkProfile',
+		ListItemText: 'New-AzNetworkProfile',
+		ResultType: 2,
+		ToolTip: 'New-AzNetworkProfile\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNetworkSecurityGroup',
+		ListItemText: 'New-AzNetworkSecurityGroup',
+		ResultType: 2,
+		ToolTip: 'New-AzNetworkSecurityGroup\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNetworkSecurityRuleConfig',
+		ListItemText: 'New-AzNetworkSecurityRuleConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzNetworkSecurityRuleConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNetworkVirtualAppliance',
+		ListItemText: 'New-AzNetworkVirtualAppliance',
+		ResultType: 2,
+		ToolTip: 'New-AzNetworkVirtualAppliance\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNetworkWatcher',
+		ListItemText: 'New-AzNetworkWatcher',
+		ResultType: 2,
+		ToolTip: 'New-AzNetworkWatcher\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNetworkWatcherConnectionMonitor',
+		ListItemText: 'New-AzNetworkWatcherConnectionMonitor',
+		ResultType: 2,
+		ToolTip: 'New-AzNetworkWatcherConnectionMonitor\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNetworkWatcherConnectionMonitorEndpointObject',
+		ListItemText: 'New-AzNetworkWatcherConnectionMonitorEndpointObject',
+		ResultType: 2,
+		ToolTip: 'New-AzNetworkWatcherConnectionMonitorEndpointObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNetworkWatcherConnectionMonitorEndpointScopeItemObject',
+		ListItemText: 'New-AzNetworkWatcherConnectionMonitorEndpointScopeItemObject',
+		ResultType: 2,
+		ToolTip: 'New-AzNetworkWatcherConnectionMonitorEndpointScopeItemObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNetworkWatcherConnectionMonitorObject',
+		ListItemText: 'New-AzNetworkWatcherConnectionMonitorObject',
+		ResultType: 2,
+		ToolTip: 'New-AzNetworkWatcherConnectionMonitorObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNetworkWatcherConnectionMonitorOutputObject',
+		ListItemText: 'New-AzNetworkWatcherConnectionMonitorOutputObject',
+		ResultType: 2,
+		ToolTip: 'New-AzNetworkWatcherConnectionMonitorOutputObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNetworkWatcherConnectionMonitorProtocolConfigurationObject',
+		ListItemText: 'New-AzNetworkWatcherConnectionMonitorProtocolConfigurationObject',
+		ResultType: 2,
+		ToolTip: 'New-AzNetworkWatcherConnectionMonitorProtocolConfigurationObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNetworkWatcherConnectionMonitorTestConfigurationObject',
+		ListItemText: 'New-AzNetworkWatcherConnectionMonitorTestConfigurationObject',
+		ResultType: 2,
+		ToolTip: 'New-AzNetworkWatcherConnectionMonitorTestConfigurationObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNetworkWatcherConnectionMonitorTestGroupObject',
+		ListItemText: 'New-AzNetworkWatcherConnectionMonitorTestGroupObject',
+		ResultType: 2,
+		ToolTip: 'New-AzNetworkWatcherConnectionMonitorTestGroupObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNetworkWatcherFlowLog',
+		ListItemText: 'New-AzNetworkWatcherFlowLog',
+		ResultType: 2,
+		ToolTip: 'New-AzNetworkWatcherFlowLog\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNetworkWatcherNetworkConfigurationDiagnosticProfile',
+		ListItemText: 'New-AzNetworkWatcherNetworkConfigurationDiagnosticProfile',
+		ResultType: 2,
+		ToolTip: 'New-AzNetworkWatcherNetworkConfigurationDiagnosticProfile\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNetworkWatcherPacketCapture',
+		ListItemText: 'New-AzNetworkWatcherPacketCapture',
+		ResultType: 2,
+		ToolTip: 'New-AzNetworkWatcherPacketCapture\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNetworkWatcherPacketCaptureV2',
+		ListItemText: 'New-AzNetworkWatcherPacketCaptureV2',
+		ResultType: 2,
+		ToolTip: 'New-AzNetworkWatcherPacketCaptureV2\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNetworkWatcherProtocolConfiguration',
+		ListItemText: 'New-AzNetworkWatcherProtocolConfiguration',
+		ResultType: 2,
+		ToolTip: 'New-AzNetworkWatcherProtocolConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNotificationHub',
+		ListItemText: 'New-AzNotificationHub',
+		ResultType: 2,
+		ToolTip: 'New-AzNotificationHub\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNotificationHubAuthorizationRule',
+		ListItemText: 'New-AzNotificationHubAuthorizationRule',
+		ResultType: 2,
+		ToolTip: 'New-AzNotificationHubAuthorizationRule\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNotificationHubAuthorizationRules',
+		ListItemText: 'New-AzNotificationHubAuthorizationRules',
+		ResultType: 2,
+		ToolTip: 'New-AzNotificationHubAuthorizationRules'
+	},
+	{
+		CompletionText: 'New-AzNotificationHubKey',
+		ListItemText: 'New-AzNotificationHubKey',
+		ResultType: 2,
+		ToolTip: 'New-AzNotificationHubKey\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNotificationHubsNamespace',
+		ListItemText: 'New-AzNotificationHubsNamespace',
+		ResultType: 2,
+		ToolTip: 'New-AzNotificationHubsNamespace\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNotificationHubsNamespaceAuthorizationRule',
+		ListItemText: 'New-AzNotificationHubsNamespaceAuthorizationRule',
+		ResultType: 2,
+		ToolTip: 'New-AzNotificationHubsNamespaceAuthorizationRule\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzNotificationHubsNamespaceAuthorizationRules',
+		ListItemText: 'New-AzNotificationHubsNamespaceAuthorizationRules',
+		ResultType: 2,
+		ToolTip: 'New-AzNotificationHubsNamespaceAuthorizationRules'
+	},
+	{
+		CompletionText: 'New-AzNotificationHubsNamespaceKey',
+		ListItemText: 'New-AzNotificationHubsNamespaceKey',
+		ResultType: 2,
+		ToolTip: 'New-AzNotificationHubsNamespaceKey\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzO365PolicyProperty',
+		ListItemText: 'New-AzO365PolicyProperty',
+		ResultType: 2,
+		ToolTip: 'New-AzO365PolicyProperty\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzOffice365PolicyProperty',
+		ListItemText: 'New-AzOffice365PolicyProperty',
+		ResultType: 2,
+		ToolTip: 'New-AzOffice365PolicyProperty\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzOperationalInsightsApplicationInsightsDataSource',
+		ListItemText: 'New-AzOperationalInsightsApplicationInsightsDataSource',
+		ResultType: 2,
+		ToolTip: 'New-AzOperationalInsightsApplicationInsightsDataSource\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzOperationalInsightsAzureActivityLogDataSource',
+		ListItemText: 'New-AzOperationalInsightsAzureActivityLogDataSource',
+		ResultType: 2,
+		ToolTip: 'New-AzOperationalInsightsAzureActivityLogDataSource\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzOperationalInsightsAzureAuditDataSource',
+		ListItemText: 'New-AzOperationalInsightsAzureAuditDataSource',
+		ResultType: 2,
+		ToolTip: 'New-AzOperationalInsightsAzureAuditDataSource'
+	},
+	{
+		CompletionText: 'New-AzOperationalInsightsCluster',
+		ListItemText: 'New-AzOperationalInsightsCluster',
+		ResultType: 2,
+		ToolTip: 'New-AzOperationalInsightsCluster\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzOperationalInsightsComputerGroup',
+		ListItemText: 'New-AzOperationalInsightsComputerGroup',
+		ResultType: 2,
+		ToolTip: 'New-AzOperationalInsightsComputerGroup\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzOperationalInsightsCustomLogDataSource',
+		ListItemText: 'New-AzOperationalInsightsCustomLogDataSource',
+		ResultType: 2,
+		ToolTip: 'New-AzOperationalInsightsCustomLogDataSource\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzOperationalInsightsDataExport',
+		ListItemText: 'New-AzOperationalInsightsDataExport',
+		ResultType: 2,
+		ToolTip: 'New-AzOperationalInsightsDataExport\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzOperationalInsightsLinkedStorageAccount',
+		ListItemText: 'New-AzOperationalInsightsLinkedStorageAccount',
+		ResultType: 2,
+		ToolTip: 'New-AzOperationalInsightsLinkedStorageAccount\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzOperationalInsightsLinuxPerformanceObjectDataSource',
+		ListItemText: 'New-AzOperationalInsightsLinuxPerformanceObjectDataSource',
+		ResultType: 2,
+		ToolTip: 'New-AzOperationalInsightsLinuxPerformanceObjectDataSource\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzOperationalInsightsLinuxSyslogDataSource',
+		ListItemText: 'New-AzOperationalInsightsLinuxSyslogDataSource',
+		ResultType: 2,
+		ToolTip: 'New-AzOperationalInsightsLinuxSyslogDataSource\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzOperationalInsightsPurgeWorkspace',
+		ListItemText: 'New-AzOperationalInsightsPurgeWorkspace',
+		ResultType: 2,
+		ToolTip: 'New-AzOperationalInsightsPurgeWorkspace\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzOperationalInsightsRestoreTable',
+		ListItemText: 'New-AzOperationalInsightsRestoreTable',
+		ResultType: 2,
+		ToolTip: 'New-AzOperationalInsightsRestoreTable\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzOperationalInsightsSavedSearch',
+		ListItemText: 'New-AzOperationalInsightsSavedSearch',
+		ResultType: 2,
+		ToolTip: 'New-AzOperationalInsightsSavedSearch\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzOperationalInsightsSearchTable',
+		ListItemText: 'New-AzOperationalInsightsSearchTable',
+		ResultType: 2,
+		ToolTip: 'New-AzOperationalInsightsSearchTable\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzOperationalInsightsStorageInsight',
+		ListItemText: 'New-AzOperationalInsightsStorageInsight',
+		ResultType: 2,
+		ToolTip: 'New-AzOperationalInsightsStorageInsight\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzOperationalInsightsTable',
+		ListItemText: 'New-AzOperationalInsightsTable',
+		ResultType: 2,
+		ToolTip: 'New-AzOperationalInsightsTable\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzOperationalInsightsWindowsEventDataSource',
+		ListItemText: 'New-AzOperationalInsightsWindowsEventDataSource',
+		ResultType: 2,
+		ToolTip: 'New-AzOperationalInsightsWindowsEventDataSource\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzOperationalInsightsWindowsPerformanceCounterDataSource',
+		ListItemText: 'New-AzOperationalInsightsWindowsPerformanceCounterDataSource',
+		ResultType: 2,
+		ToolTip: 'New-AzOperationalInsightsWindowsPerformanceCounterDataSource\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzOperationalInsightsWorkspace',
+		ListItemText: 'New-AzOperationalInsightsWorkspace',
+		ResultType: 2,
+		ToolTip: 'New-AzOperationalInsightsWorkspace\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzP2sVpnGateway',
+		ListItemText: 'New-AzP2sVpnGateway',
+		ResultType: 2,
+		ToolTip: 'New-AzP2sVpnGateway\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzPacketCaptureFilterConfig',
+		ListItemText: 'New-AzPacketCaptureFilterConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzPacketCaptureFilterConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzPacketCaptureScopeConfig',
+		ListItemText: 'New-AzPacketCaptureScopeConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzPacketCaptureScopeConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzPolicyAssignment',
+		ListItemText: 'New-AzPolicyAssignment',
+		ResultType: 2,
+		ToolTip: 'New-AzPolicyAssignment\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzPolicyAttestation',
+		ListItemText: 'New-AzPolicyAttestation',
+		ResultType: 2,
+		ToolTip: 'New-AzPolicyAttestation\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzPolicyDefinition',
+		ListItemText: 'New-AzPolicyDefinition',
+		ResultType: 2,
+		ToolTip: 'New-AzPolicyDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzPolicyExemption',
+		ListItemText: 'New-AzPolicyExemption',
+		ResultType: 2,
+		ToolTip: 'New-AzPolicyExemption\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzPolicySetDefinition',
+		ListItemText: 'New-AzPolicySetDefinition',
+		ResultType: 2,
+		ToolTip: 'New-AzPolicySetDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzPostgreSqlFirewallRule',
+		ListItemText: 'New-AzPostgreSqlFirewallRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzPostgreSqlFirewallRule \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzPostgreSqlFlexibleServer',
+		ListItemText: 'New-AzPostgreSqlFlexibleServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzPostgreSqlFlexibleServer \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzPostgreSqlFlexibleServerDatabase',
+		ListItemText: 'New-AzPostgreSqlFlexibleServerDatabase',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzPostgreSqlFlexibleServerDatabase \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzPostgreSqlFlexibleServerFirewallRule',
+		ListItemText: 'New-AzPostgreSqlFlexibleServerFirewallRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzPostgreSqlFlexibleServerFirewallRule \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzPostgreSqlReplica',
+		ListItemText: 'New-AzPostgreSqlReplica',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzPostgreSqlReplica \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzPostgreSqlServer',
+		ListItemText: 'New-AzPostgreSqlServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzPostgreSqlServer \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzPostgreSqlVirtualNetworkRule',
+		ListItemText: 'New-AzPostgreSqlVirtualNetworkRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzPostgreSqlVirtualNetworkRule \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzPowerBIEmbeddedCapacity',
+		ListItemText: 'New-AzPowerBIEmbeddedCapacity',
+		ResultType: 2,
+		ToolTip: 'New-AzPowerBIEmbeddedCapacity\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzPowerBIWorkspaceCollection',
+		ListItemText: 'New-AzPowerBIWorkspaceCollection',
+		ResultType: 2,
+		ToolTip: 'New-AzPowerBIWorkspaceCollection\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzPrivateDnsRecordConfig',
+		ListItemText: 'New-AzPrivateDnsRecordConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzPrivateDnsRecordConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzPrivateDnsRecordSet',
+		ListItemText: 'New-AzPrivateDnsRecordSet',
+		ResultType: 2,
+		ToolTip: 'New-AzPrivateDnsRecordSet\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzPrivateDnsVirtualNetworkLink',
+		ListItemText: 'New-AzPrivateDnsVirtualNetworkLink',
+		ResultType: 2,
+		ToolTip: 'New-AzPrivateDnsVirtualNetworkLink\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzPrivateDnsZone',
+		ListItemText: 'New-AzPrivateDnsZone',
+		ResultType: 2,
+		ToolTip: 'New-AzPrivateDnsZone\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzPrivateDnsZoneConfig',
+		ListItemText: 'New-AzPrivateDnsZoneConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzPrivateDnsZoneConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzPrivateDnsZoneGroup',
+		ListItemText: 'New-AzPrivateDnsZoneGroup',
+		ResultType: 2,
+		ToolTip: 'New-AzPrivateDnsZoneGroup\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzPrivateEndpoint',
+		ListItemText: 'New-AzPrivateEndpoint',
+		ResultType: 2,
+		ToolTip: 'New-AzPrivateEndpoint\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzPrivateEndpointIpConfiguration',
+		ListItemText: 'New-AzPrivateEndpointIpConfiguration',
+		ResultType: 2,
+		ToolTip: 'New-AzPrivateEndpointIpConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzPrivateLinkAssociation',
+		ListItemText: 'New-AzPrivateLinkAssociation',
+		ResultType: 2,
+		ToolTip: 'New-AzPrivateLinkAssociation\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzPrivateLinkService',
+		ListItemText: 'New-AzPrivateLinkService',
+		ResultType: 2,
+		ToolTip: 'New-AzPrivateLinkService\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzPrivateLinkServiceConnection',
+		ListItemText: 'New-AzPrivateLinkServiceConnection',
+		ResultType: 2,
+		ToolTip: 'New-AzPrivateLinkServiceConnection\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzPrivateLinkServiceIpConfig',
+		ListItemText: 'New-AzPrivateLinkServiceIpConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzPrivateLinkServiceIpConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzProximityPlacementGroup',
+		ListItemText: 'New-AzProximityPlacementGroup',
+		ResultType: 2,
+		ToolTip: 'New-AzProximityPlacementGroup\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzPublicIpAddress',
+		ListItemText: 'New-AzPublicIpAddress',
+		ResultType: 2,
+		ToolTip: 'New-AzPublicIpAddress\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzPublicIpPrefix',
+		ListItemText: 'New-AzPublicIpPrefix',
+		ResultType: 2,
+		ToolTip: 'New-AzPublicIpPrefix\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzPublicIpTag',
+		ListItemText: 'New-AzPublicIpTag',
+		ResultType: 2,
+		ToolTip: 'New-AzPublicIpTag\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRadiusServer',
+		ListItemText: 'New-AzRadiusServer',
+		ResultType: 2,
+		ToolTip: 'New-AzRadiusServer\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRecoveryServicesAsrAzureToAzureDiskReplicationConfig',
+		ListItemText: 'New-AzRecoveryServicesAsrAzureToAzureDiskReplicationConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzRecoveryServicesAsrAzureToAzureDiskReplicationConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRecoveryServicesAsrFabric',
+		ListItemText: 'New-AzRecoveryServicesAsrFabric',
+		ResultType: 2,
+		ToolTip: 'New-AzRecoveryServicesAsrFabric\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRecoveryServicesAsrInMageAzureV2DiskInput',
+		ListItemText: 'New-AzRecoveryServicesAsrInMageAzureV2DiskInput',
+		ResultType: 2,
+		ToolTip: 'New-AzRecoveryServicesAsrInMageAzureV2DiskInput\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRecoveryServicesAsrInMageRcmDiskInput',
+		ListItemText: 'New-AzRecoveryServicesAsrInMageRcmDiskInput',
+		ResultType: 2,
+		ToolTip: 'New-AzRecoveryServicesAsrInMageRcmDiskInput\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRecoveryServicesAsrNetworkMapping',
+		ListItemText: 'New-AzRecoveryServicesAsrNetworkMapping',
+		ResultType: 2,
+		ToolTip: 'New-AzRecoveryServicesAsrNetworkMapping\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRecoveryServicesAsrPolicy',
+		ListItemText: 'New-AzRecoveryServicesAsrPolicy',
+		ResultType: 2,
+		ToolTip: 'New-AzRecoveryServicesAsrPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRecoveryServicesAsrProtectableItem',
+		ListItemText: 'New-AzRecoveryServicesAsrProtectableItem',
+		ResultType: 2,
+		ToolTip: 'New-AzRecoveryServicesAsrProtectableItem\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRecoveryServicesAsrProtectionContainer',
+		ListItemText: 'New-AzRecoveryServicesAsrProtectionContainer',
+		ResultType: 2,
+		ToolTip: 'New-AzRecoveryServicesAsrProtectionContainer\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRecoveryServicesAsrProtectionContainerMapping',
+		ListItemText: 'New-AzRecoveryServicesAsrProtectionContainerMapping',
+		ResultType: 2,
+		ToolTip: 'New-AzRecoveryServicesAsrProtectionContainerMapping\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRecoveryServicesAsrRecoveryPlan',
+		ListItemText: 'New-AzRecoveryServicesAsrRecoveryPlan',
+		ResultType: 2,
+		ToolTip: 'New-AzRecoveryServicesAsrRecoveryPlan\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRecoveryServicesAsrReplicationProtectedItem',
+		ListItemText: 'New-AzRecoveryServicesAsrReplicationProtectedItem',
+		ResultType: 2,
+		ToolTip: 'New-AzRecoveryServicesAsrReplicationProtectedItem\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRecoveryServicesAsrStorageClassificationMapping',
+		ListItemText: 'New-AzRecoveryServicesAsrStorageClassificationMapping',
+		ResultType: 2,
+		ToolTip: 'New-AzRecoveryServicesAsrStorageClassificationMapping\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRecoveryServicesAsrvCenter',
+		ListItemText: 'New-AzRecoveryServicesAsrvCenter',
+		ResultType: 2,
+		ToolTip: 'New-AzRecoveryServicesAsrvCenter\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRecoveryServicesAsrVMNicConfig',
+		ListItemText: 'New-AzRecoveryServicesAsrVMNicConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzRecoveryServicesAsrVMNicConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRecoveryServicesAsrVMNicIPConfig',
+		ListItemText: 'New-AzRecoveryServicesAsrVMNicIPConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzRecoveryServicesAsrVMNicIPConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRecoveryServicesBackupProtectionPolicy',
+		ListItemText: 'New-AzRecoveryServicesBackupProtectionPolicy',
+		ResultType: 2,
+		ToolTip: 'New-AzRecoveryServicesBackupProtectionPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRecoveryServicesVault',
+		ListItemText: 'New-AzRecoveryServicesVault',
+		ResultType: 2,
+		ToolTip: 'New-AzRecoveryServicesVault\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRedisCache',
+		ListItemText: 'New-AzRedisCache',
+		ResultType: 2,
+		ToolTip: 'New-AzRedisCache\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRedisCacheFirewallRule',
+		ListItemText: 'New-AzRedisCacheFirewallRule',
+		ResultType: 2,
+		ToolTip: 'New-AzRedisCacheFirewallRule\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRedisCacheKey',
+		ListItemText: 'New-AzRedisCacheKey',
+		ResultType: 2,
+		ToolTip: 'New-AzRedisCacheKey\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRedisCacheLink',
+		ListItemText: 'New-AzRedisCacheLink',
+		ResultType: 2,
+		ToolTip: 'New-AzRedisCacheLink\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRedisCachePatchSchedule',
+		ListItemText: 'New-AzRedisCachePatchSchedule',
+		ResultType: 2,
+		ToolTip: 'New-AzRedisCachePatchSchedule\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRedisCacheScheduleEntry',
+		ListItemText: 'New-AzRedisCacheScheduleEntry',
+		ResultType: 2,
+		ToolTip: 'New-AzRedisCacheScheduleEntry\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRedisEnterpriseCache',
+		ListItemText: 'New-AzRedisEnterpriseCache',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzRedisEnterpriseCache \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRedisEnterpriseCacheAccessKey',
+		ListItemText: 'New-AzRedisEnterpriseCacheAccessKey',
+		ResultType: 2,
+		ToolTip: 'New-AzRedisEnterpriseCacheAccessKey'
+	},
+	{
+		CompletionText: 'New-AzRedisEnterpriseCacheDatabase',
+		ListItemText: 'New-AzRedisEnterpriseCacheDatabase',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzRedisEnterpriseCacheDatabase \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRedisEnterpriseCacheDatabaseKey',
+		ListItemText: 'New-AzRedisEnterpriseCacheDatabaseKey',
+		ResultType: 2,
+		ToolTip: 'New-AzRedisEnterpriseCacheDatabaseKey'
+	},
+	{
+		CompletionText: 'New-AzRedisEnterpriseCacheKey',
+		ListItemText: 'New-AzRedisEnterpriseCacheKey',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzRedisEnterpriseCacheKey \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRelayAuthorizationRule',
+		ListItemText: 'New-AzRelayAuthorizationRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzRelayAuthorizationRule \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRelayHybridConnection',
+		ListItemText: 'New-AzRelayHybridConnection',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzRelayHybridConnection \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRelayKey',
+		ListItemText: 'New-AzRelayKey',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzRelayKey \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRelayNamespace',
+		ListItemText: 'New-AzRelayNamespace',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzRelayNamespace \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRelayNetworkRuleSetIPRuleObject',
+		ListItemText: 'New-AzRelayNetworkRuleSetIPRuleObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzRelayNetworkRuleSetIPRuleObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzResource',
+		ListItemText: 'New-AzResource',
+		ResultType: 2,
+		ToolTip: 'New-AzResource\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzResourceGroup',
+		ListItemText: 'New-AzResourceGroup',
+		ResultType: 2,
+		ToolTip: 'New-AzResourceGroup\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzResourceGroupDeployment',
+		ListItemText: 'New-AzResourceGroupDeployment',
+		ResultType: 2,
+		ToolTip: 'New-AzResourceGroupDeployment\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzResourceLock',
+		ListItemText: 'New-AzResourceLock',
+		ResultType: 2,
+		ToolTip: 'New-AzResourceLock\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzResourceManagementPrivateLink',
+		ListItemText: 'New-AzResourceManagementPrivateLink',
+		ResultType: 2,
+		ToolTip: 'New-AzResourceManagementPrivateLink\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzResourceMoverMoveCollection',
+		ListItemText: 'New-AzResourceMoverMoveCollection',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzResourceMoverMoveCollection \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRestorePoint',
+		ListItemText: 'New-AzRestorePoint',
+		ResultType: 2,
+		ToolTip: 'New-AzRestorePoint\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRestorePointCollection',
+		ListItemText: 'New-AzRestorePointCollection',
+		ResultType: 2,
+		ToolTip: 'New-AzRestorePointCollection\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRmStorageContainer',
+		ListItemText: 'New-AzRmStorageContainer',
+		ResultType: 2,
+		ToolTip: 'New-AzRmStorageContainer\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRmStorageShare',
+		ListItemText: 'New-AzRmStorageShare',
+		ResultType: 2,
+		ToolTip: 'New-AzRmStorageShare\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRoleAssignment',
+		ListItemText: 'New-AzRoleAssignment',
+		ResultType: 2,
+		ToolTip: 'New-AzRoleAssignment\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRoleAssignmentScheduleRequest',
+		ListItemText: 'New-AzRoleAssignmentScheduleRequest',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzRoleAssignmentScheduleRequest \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRoleDefinition',
+		ListItemText: 'New-AzRoleDefinition',
+		ResultType: 2,
+		ToolTip: 'New-AzRoleDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRoleEligibilityScheduleRequest',
+		ListItemText: 'New-AzRoleEligibilityScheduleRequest',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzRoleEligibilityScheduleRequest \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRoleManagementPolicyAssignment',
+		ListItemText: 'New-AzRoleManagementPolicyAssignment',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzRoleManagementPolicyAssignment \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRouteConfig',
+		ListItemText: 'New-AzRouteConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzRouteConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRouteFilter',
+		ListItemText: 'New-AzRouteFilter',
+		ResultType: 2,
+		ToolTip: 'New-AzRouteFilter\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRouteFilterRuleConfig',
+		ListItemText: 'New-AzRouteFilterRuleConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzRouteFilterRuleConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRouteMap',
+		ListItemText: 'New-AzRouteMap',
+		ResultType: 2,
+		ToolTip: 'New-AzRouteMap\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRouteMapRule',
+		ListItemText: 'New-AzRouteMapRule',
+		ResultType: 2,
+		ToolTip: 'New-AzRouteMapRule\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRouteMapRuleAction',
+		ListItemText: 'New-AzRouteMapRuleAction',
+		ResultType: 2,
+		ToolTip: 'New-AzRouteMapRuleAction\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRouteMapRuleActionParameter',
+		ListItemText: 'New-AzRouteMapRuleActionParameter',
+		ResultType: 2,
+		ToolTip: 'New-AzRouteMapRuleActionParameter\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRouteMapRuleCriterion',
+		ListItemText: 'New-AzRouteMapRuleCriterion',
+		ResultType: 2,
+		ToolTip: 'New-AzRouteMapRuleCriterion\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRouteServer',
+		ListItemText: 'New-AzRouteServer',
+		ResultType: 2,
+		ToolTip: 'New-AzRouteServer\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRouteTable',
+		ListItemText: 'New-AzRouteTable',
+		ResultType: 2,
+		ToolTip: 'New-AzRouteTable\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRoutingConfiguration',
+		ListItemText: 'New-AzRoutingConfiguration',
+		ResultType: 2,
+		ToolTip: 'New-AzRoutingConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRoutingIntent',
+		ListItemText: 'New-AzRoutingIntent',
+		ResultType: 2,
+		ToolTip: 'New-AzRoutingIntent\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzRoutingPolicy',
+		ListItemText: 'New-AzRoutingPolicy',
+		ResultType: 2,
+		ToolTip: 'New-AzRoutingPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzScheduledQueryRule',
+		ListItemText: 'New-AzScheduledQueryRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzScheduledQueryRule \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzScheduledQueryRuleConditionObject',
+		ListItemText: 'New-AzScheduledQueryRuleConditionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzScheduledQueryRuleConditionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzScheduledQueryRuleDimensionObject',
+		ListItemText: 'New-AzScheduledQueryRuleDimensionObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzScheduledQueryRuleDimensionObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSecurityAutomation',
+		ListItemText: 'New-AzSecurityAutomation',
+		ResultType: 2,
+		ToolTip: 'New-AzSecurityAutomation\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSecurityAutomationActionObject',
+		ListItemText: 'New-AzSecurityAutomationActionObject',
+		ResultType: 2,
+		ToolTip: 'New-AzSecurityAutomationActionObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSecurityAutomationRuleObject',
+		ListItemText: 'New-AzSecurityAutomationRuleObject',
+		ResultType: 2,
+		ToolTip: 'New-AzSecurityAutomationRuleObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSecurityAutomationRuleSetObject',
+		ListItemText: 'New-AzSecurityAutomationRuleSetObject',
+		ResultType: 2,
+		ToolTip: 'New-AzSecurityAutomationRuleSetObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSecurityAutomationScopeObject',
+		ListItemText: 'New-AzSecurityAutomationScopeObject',
+		ResultType: 2,
+		ToolTip: 'New-AzSecurityAutomationScopeObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSecurityAutomationSourceObject',
+		ListItemText: 'New-AzSecurityAutomationSourceObject',
+		ResultType: 2,
+		ToolTip: 'New-AzSecurityAutomationSourceObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSecurityPartnerProvider',
+		ListItemText: 'New-AzSecurityPartnerProvider',
+		ResultType: 2,
+		ToolTip: 'New-AzSecurityPartnerProvider\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSentinelAlertRule',
+		ListItemText: 'New-AzSentinelAlertRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzSentinelAlertRule \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSentinelAlertRuleAction',
+		ListItemText: 'New-AzSentinelAlertRuleAction',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzSentinelAlertRuleAction \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSentinelAutomationRule',
+		ListItemText: 'New-AzSentinelAutomationRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzSentinelAutomationRule \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSentinelBookmark',
+		ListItemText: 'New-AzSentinelBookmark',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzSentinelBookmark \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSentinelBookmarkRelation',
+		ListItemText: 'New-AzSentinelBookmarkRelation',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzSentinelBookmarkRelation \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSentinelDataConnector',
+		ListItemText: 'New-AzSentinelDataConnector',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzSentinelDataConnector \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSentinelEntityQuery',
+		ListItemText: 'New-AzSentinelEntityQuery',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzSentinelEntityQuery \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSentinelIncident',
+		ListItemText: 'New-AzSentinelIncident',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzSentinelIncident \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSentinelIncidentComment',
+		ListItemText: 'New-AzSentinelIncidentComment',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzSentinelIncidentComment \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSentinelIncidentRelation',
+		ListItemText: 'New-AzSentinelIncidentRelation',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzSentinelIncidentRelation \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSentinelIncidentTeam',
+		ListItemText: 'New-AzSentinelIncidentTeam',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzSentinelIncidentTeam \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSentinelOnboardingState',
+		ListItemText: 'New-AzSentinelOnboardingState',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzSentinelOnboardingState \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzServiceBusAuthorizationRule',
+		ListItemText: 'New-AzServiceBusAuthorizationRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzServiceBusAuthorizationRule \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzServiceBusAuthorizationRuleSASToken',
+		ListItemText: 'New-AzServiceBusAuthorizationRuleSASToken',
+		ResultType: 2,
+		ToolTip: 'New-AzServiceBusAuthorizationRuleSASToken\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzServiceBusGeoDRConfiguration',
+		ListItemText: 'New-AzServiceBusGeoDRConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzServiceBusGeoDRConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzServiceBusIPRuleConfig',
+		ListItemText: 'New-AzServiceBusIPRuleConfig',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzServiceBusIPRuleConfig \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzServiceBusKey',
+		ListItemText: 'New-AzServiceBusKey',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzServiceBusKey \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzServiceBusKeyVaultPropertiesObject',
+		ListItemText: 'New-AzServiceBusKeyVaultPropertiesObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzServiceBusKeyVaultPropertiesObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzServiceBusNamespace',
+		ListItemText: 'New-AzServiceBusNamespace',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzServiceBusNamespace \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzServiceBusNamespaceV2',
+		ListItemText: 'New-AzServiceBusNamespaceV2',
+		ResultType: 2,
+		ToolTip: 'New-AzServiceBusNamespaceV2'
+	},
+	{
+		CompletionText: 'New-AzServiceBusQueue',
+		ListItemText: 'New-AzServiceBusQueue',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzServiceBusQueue \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzServiceBusRule',
+		ListItemText: 'New-AzServiceBusRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzServiceBusRule \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzServiceBusSubscription',
+		ListItemText: 'New-AzServiceBusSubscription',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzServiceBusSubscription \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzServiceBusTopic',
+		ListItemText: 'New-AzServiceBusTopic',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzServiceBusTopic \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzServiceBusVirtualNetworkRuleConfig',
+		ListItemText: 'New-AzServiceBusVirtualNetworkRuleConfig',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzServiceBusVirtualNetworkRuleConfig \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzServiceEndpointPolicy',
+		ListItemText: 'New-AzServiceEndpointPolicy',
+		ResultType: 2,
+		ToolTip: 'New-AzServiceEndpointPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzServiceEndpointPolicyDefinition',
+		ListItemText: 'New-AzServiceEndpointPolicyDefinition',
+		ResultType: 2,
+		ToolTip: 'New-AzServiceEndpointPolicyDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzServiceFabricApplication',
+		ListItemText: 'New-AzServiceFabricApplication',
+		ResultType: 2,
+		ToolTip: 'New-AzServiceFabricApplication\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzServiceFabricApplicationType',
+		ListItemText: 'New-AzServiceFabricApplicationType',
+		ResultType: 2,
+		ToolTip: 'New-AzServiceFabricApplicationType\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzServiceFabricApplicationTypeVersion',
+		ListItemText: 'New-AzServiceFabricApplicationTypeVersion',
+		ResultType: 2,
+		ToolTip: 'New-AzServiceFabricApplicationTypeVersion\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzServiceFabricCluster',
+		ListItemText: 'New-AzServiceFabricCluster',
+		ResultType: 2,
+		ToolTip: 'New-AzServiceFabricCluster\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzServiceFabricManagedCluster',
+		ListItemText: 'New-AzServiceFabricManagedCluster',
+		ResultType: 2,
+		ToolTip: 'New-AzServiceFabricManagedCluster\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzServiceFabricManagedClusterApplication',
+		ListItemText: 'New-AzServiceFabricManagedClusterApplication',
+		ResultType: 2,
+		ToolTip: 'New-AzServiceFabricManagedClusterApplication\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzServiceFabricManagedClusterApplicationType',
+		ListItemText: 'New-AzServiceFabricManagedClusterApplicationType',
+		ResultType: 2,
+		ToolTip: 'New-AzServiceFabricManagedClusterApplicationType\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzServiceFabricManagedClusterApplicationTypeVersion',
+		ListItemText: 'New-AzServiceFabricManagedClusterApplicationTypeVersion',
+		ResultType: 2,
+		ToolTip: 'New-AzServiceFabricManagedClusterApplicationTypeVersion\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzServiceFabricManagedClusterService',
+		ListItemText: 'New-AzServiceFabricManagedClusterService',
+		ResultType: 2,
+		ToolTip: 'New-AzServiceFabricManagedClusterService\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzServiceFabricManagedNodeType',
+		ListItemText: 'New-AzServiceFabricManagedNodeType',
+		ResultType: 2,
+		ToolTip: 'New-AzServiceFabricManagedNodeType\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzServiceFabricService',
+		ListItemText: 'New-AzServiceFabricService',
+		ResultType: 2,
+		ToolTip: 'New-AzServiceFabricService\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzServiceLinkerAzureResourceObject',
+		ListItemText: 'New-AzServiceLinkerAzureResourceObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzServiceLinkerAzureResourceObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzServiceLinkerConfluentBootstrapServerObject',
+		ListItemText: 'New-AzServiceLinkerConfluentBootstrapServerObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzServiceLinkerConfluentBootstrapServerObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzServiceLinkerConfluentSchemaRegistryObject',
+		ListItemText: 'New-AzServiceLinkerConfluentSchemaRegistryObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzServiceLinkerConfluentSchemaRegistryObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzServiceLinkerForContainerApp',
+		ListItemText: 'New-AzServiceLinkerForContainerApp',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzServiceLinkerForContainerApp \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzServiceLinkerForSpringCloud',
+		ListItemText: 'New-AzServiceLinkerForSpringCloud',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzServiceLinkerForSpringCloud \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzServiceLinkerForWebApp',
+		ListItemText: 'New-AzServiceLinkerForWebApp',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzServiceLinkerForWebApp \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzServiceLinkerSecretAuthInfoObject',
+		ListItemText: 'New-AzServiceLinkerSecretAuthInfoObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzServiceLinkerSecretAuthInfoObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzServiceLinkerServicePrincipalSecretAuthInfoObject',
+		ListItemText: 'New-AzServiceLinkerServicePrincipalSecretAuthInfoObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzServiceLinkerServicePrincipalSecretAuthInfoObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzServiceLinkerSystemAssignedIdentityAuthInfoObject',
+		ListItemText: 'New-AzServiceLinkerSystemAssignedIdentityAuthInfoObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzServiceLinkerSystemAssignedIdentityAuthInfoObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzServiceLinkerUserAssignedIdentityAuthInfoObject',
+		ListItemText: 'New-AzServiceLinkerUserAssignedIdentityAuthInfoObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzServiceLinkerUserAssignedIdentityAuthInfoObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSignalR',
+		ListItemText: 'New-AzSignalR',
+		ResultType: 2,
+		ToolTip: 'New-AzSignalR\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSignalRKey',
+		ListItemText: 'New-AzSignalRKey',
+		ResultType: 2,
+		ToolTip: 'New-AzSignalRKey\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSnapshot',
+		ListItemText: 'New-AzSnapshot',
+		ResultType: 2,
+		ToolTip: 'New-AzSnapshot\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSnapshotConfig',
+		ListItemText: 'New-AzSnapshotConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzSnapshotConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSnapshotUpdateConfig',
+		ListItemText: 'New-AzSnapshotUpdateConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzSnapshotUpdateConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSqlDatabase',
+		ListItemText: 'New-AzSqlDatabase',
+		ResultType: 2,
+		ToolTip: 'New-AzSqlDatabase\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSqlDatabaseCopy',
+		ListItemText: 'New-AzSqlDatabaseCopy',
+		ResultType: 2,
+		ToolTip: 'New-AzSqlDatabaseCopy\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSqlDatabaseDataMaskingRule',
+		ListItemText: 'New-AzSqlDatabaseDataMaskingRule',
+		ResultType: 2,
+		ToolTip: 'New-AzSqlDatabaseDataMaskingRule\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSqlDatabaseExport',
+		ListItemText: 'New-AzSqlDatabaseExport',
+		ResultType: 2,
+		ToolTip: 'New-AzSqlDatabaseExport\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSqlDatabaseFailoverGroup',
+		ListItemText: 'New-AzSqlDatabaseFailoverGroup',
+		ResultType: 2,
+		ToolTip: 'New-AzSqlDatabaseFailoverGroup\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSqlDatabaseImport',
+		ListItemText: 'New-AzSqlDatabaseImport',
+		ResultType: 2,
+		ToolTip: 'New-AzSqlDatabaseImport\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSqlDatabaseInstanceFailoverGroup',
+		ListItemText: 'New-AzSqlDatabaseInstanceFailoverGroup',
+		ResultType: 2,
+		ToolTip: 'New-AzSqlDatabaseInstanceFailoverGroup\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSqlDatabaseRestorePoint',
+		ListItemText: 'New-AzSqlDatabaseRestorePoint',
+		ResultType: 2,
+		ToolTip: 'New-AzSqlDatabaseRestorePoint\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSqlDatabaseSecondary',
+		ListItemText: 'New-AzSqlDatabaseSecondary',
+		ResultType: 2,
+		ToolTip: 'New-AzSqlDatabaseSecondary\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSqlElasticJob',
+		ListItemText: 'New-AzSqlElasticJob',
+		ResultType: 2,
+		ToolTip: 'New-AzSqlElasticJob\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSqlElasticJobAgent',
+		ListItemText: 'New-AzSqlElasticJobAgent',
+		ResultType: 2,
+		ToolTip: 'New-AzSqlElasticJobAgent\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSqlElasticJobCredential',
+		ListItemText: 'New-AzSqlElasticJobCredential',
+		ResultType: 2,
+		ToolTip: 'New-AzSqlElasticJobCredential\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSqlElasticJobTargetGroup',
+		ListItemText: 'New-AzSqlElasticJobTargetGroup',
+		ResultType: 2,
+		ToolTip: 'New-AzSqlElasticJobTargetGroup\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSqlElasticPool',
+		ListItemText: 'New-AzSqlElasticPool',
+		ResultType: 2,
+		ToolTip: 'New-AzSqlElasticPool\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSqlInstance',
+		ListItemText: 'New-AzSqlInstance',
+		ResultType: 2,
+		ToolTip: 'New-AzSqlInstance\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSqlInstanceDatabase',
+		ListItemText: 'New-AzSqlInstanceDatabase',
+		ResultType: 2,
+		ToolTip: 'New-AzSqlInstanceDatabase\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSqlInstanceLink',
+		ListItemText: 'New-AzSqlInstanceLink',
+		ResultType: 2,
+		ToolTip: 'New-AzSqlInstanceLink\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSqlInstancePool',
+		ListItemText: 'New-AzSqlInstancePool',
+		ResultType: 2,
+		ToolTip: 'New-AzSqlInstancePool\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSqlInstanceServerTrustCertificate',
+		ListItemText: 'New-AzSqlInstanceServerTrustCertificate',
+		ResultType: 2,
+		ToolTip: 'New-AzSqlInstanceServerTrustCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSqlServer',
+		ListItemText: 'New-AzSqlServer',
+		ResultType: 2,
+		ToolTip: 'New-AzSqlServer\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSqlServerCommunicationLink',
+		ListItemText: 'New-AzSqlServerCommunicationLink',
+		ResultType: 2,
+		ToolTip: 'New-AzSqlServerCommunicationLink\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSqlServerDisasterRecoveryConfiguration',
+		ListItemText: 'New-AzSqlServerDisasterRecoveryConfiguration',
+		ResultType: 2,
+		ToolTip: 'New-AzSqlServerDisasterRecoveryConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSqlServerDnsAlias',
+		ListItemText: 'New-AzSqlServerDnsAlias',
+		ResultType: 2,
+		ToolTip: 'New-AzSqlServerDnsAlias\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSqlServerFirewallRule',
+		ListItemText: 'New-AzSqlServerFirewallRule',
+		ResultType: 2,
+		ToolTip: 'New-AzSqlServerFirewallRule\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSqlServerIpv6FirewallRule',
+		ListItemText: 'New-AzSqlServerIpv6FirewallRule',
+		ResultType: 2,
+		ToolTip: 'New-AzSqlServerIpv6FirewallRule\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSqlServerOutboundFirewallRule',
+		ListItemText: 'New-AzSqlServerOutboundFirewallRule',
+		ResultType: 2,
+		ToolTip: 'New-AzSqlServerOutboundFirewallRule\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSqlServerTrustGroup',
+		ListItemText: 'New-AzSqlServerTrustGroup',
+		ResultType: 2,
+		ToolTip: 'New-AzSqlServerTrustGroup\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSqlServerVirtualNetworkRule',
+		ListItemText: 'New-AzSqlServerVirtualNetworkRule',
+		ResultType: 2,
+		ToolTip: 'New-AzSqlServerVirtualNetworkRule\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSqlSyncAgent',
+		ListItemText: 'New-AzSqlSyncAgent',
+		ResultType: 2,
+		ToolTip: 'New-AzSqlSyncAgent\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSqlSyncAgentKey',
+		ListItemText: 'New-AzSqlSyncAgentKey',
+		ResultType: 2,
+		ToolTip: 'New-AzSqlSyncAgentKey\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSqlSyncGroup',
+		ListItemText: 'New-AzSqlSyncGroup',
+		ResultType: 2,
+		ToolTip: 'New-AzSqlSyncGroup\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSqlSyncMember',
+		ListItemText: 'New-AzSqlSyncMember',
+		ResultType: 2,
+		ToolTip: 'New-AzSqlSyncMember\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSqlVirtualMachineAgReplicaObject',
+		ListItemText: 'New-AzSqlVirtualMachineAgReplicaObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzSqlVirtualMachineAgReplicaObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSqlVirtualMachineMultiSubnetIPConfigurationObject',
+		ListItemText: 'New-AzSqlVirtualMachineMultiSubnetIPConfigurationObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzSqlVirtualMachineMultiSubnetIPConfigurationObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSqlVM',
+		ListItemText: 'New-AzSqlVM',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzSqlVM \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSqlVMGroup',
+		ListItemText: 'New-AzSqlVMGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzSqlVMGroup \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSshKey',
+		ListItemText: 'New-AzSshKey',
+		ResultType: 2,
+		ToolTip: 'New-AzSshKey\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStackHciArcSetting',
+		ListItemText: 'New-AzStackHciArcSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzStackHciArcSetting \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStackHciCluster',
+		ListItemText: 'New-AzStackHciCluster',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzStackHciCluster \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStackHciExtension',
+		ListItemText: 'New-AzStackHciExtension',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzStackHciExtension \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStaticRoute',
+		ListItemText: 'New-AzStaticRoute',
+		ResultType: 2,
+		ToolTip: 'New-AzStaticRoute\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStaticWebApp',
+		ListItemText: 'New-AzStaticWebApp',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzStaticWebApp \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStaticWebAppBuildAppSetting',
+		ListItemText: 'New-AzStaticWebAppBuildAppSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzStaticWebAppBuildAppSetting \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStaticWebAppBuildFunctionAppSetting',
+		ListItemText: 'New-AzStaticWebAppBuildFunctionAppSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzStaticWebAppBuildFunctionAppSetting \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStaticWebAppCustomDomain',
+		ListItemText: 'New-AzStaticWebAppCustomDomain',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzStaticWebAppCustomDomain \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStaticWebAppFunctionAppSetting',
+		ListItemText: 'New-AzStaticWebAppFunctionAppSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzStaticWebAppFunctionAppSetting \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStaticWebAppSetting',
+		ListItemText: 'New-AzStaticWebAppSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzStaticWebAppSetting \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStaticWebAppUserRoleInvitationLink',
+		ListItemText: 'New-AzStaticWebAppUserRoleInvitationLink',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzStaticWebAppUserRoleInvitationLink \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageAccount',
+		ListItemText: 'New-AzStorageAccount',
+		ResultType: 2,
+		ToolTip: 'New-AzStorageAccount\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageAccountKey',
+		ListItemText: 'New-AzStorageAccountKey',
+		ResultType: 2,
+		ToolTip: 'New-AzStorageAccountKey\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageAccountManagementPolicyBlobIndexMatchObject',
+		ListItemText: 'New-AzStorageAccountManagementPolicyBlobIndexMatchObject',
+		ResultType: 2,
+		ToolTip: 'New-AzStorageAccountManagementPolicyBlobIndexMatchObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageAccountManagementPolicyFilter',
+		ListItemText: 'New-AzStorageAccountManagementPolicyFilter',
+		ResultType: 2,
+		ToolTip: 'New-AzStorageAccountManagementPolicyFilter\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageAccountManagementPolicyRule',
+		ListItemText: 'New-AzStorageAccountManagementPolicyRule',
+		ResultType: 2,
+		ToolTip: 'New-AzStorageAccountManagementPolicyRule\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageAccountSASToken',
+		ListItemText: 'New-AzStorageAccountSASToken',
+		ResultType: 2,
+		ToolTip: 'New-AzStorageAccountSASToken\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageBlobInventoryPolicyRule',
+		ListItemText: 'New-AzStorageBlobInventoryPolicyRule',
+		ResultType: 2,
+		ToolTip: 'New-AzStorageBlobInventoryPolicyRule\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageBlobQueryConfig',
+		ListItemText: 'New-AzStorageBlobQueryConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzStorageBlobQueryConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageBlobRangeToRestore',
+		ListItemText: 'New-AzStorageBlobRangeToRestore',
+		ResultType: 2,
+		ToolTip: 'New-AzStorageBlobRangeToRestore\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageBlobSASToken',
+		ListItemText: 'New-AzStorageBlobSASToken',
+		ResultType: 2,
+		ToolTip: 'New-AzStorageBlobSASToken\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageContainer',
+		ListItemText: 'New-AzStorageContainer',
+		ResultType: 2,
+		ToolTip: 'New-AzStorageContainer\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageContainerSASToken',
+		ListItemText: 'New-AzStorageContainerSASToken',
+		ResultType: 2,
+		ToolTip: 'New-AzStorageContainerSASToken\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageContainerStoredAccessPolicy',
+		ListItemText: 'New-AzStorageContainerStoredAccessPolicy',
+		ResultType: 2,
+		ToolTip: 'New-AzStorageContainerStoredAccessPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageContext',
+		ListItemText: 'New-AzStorageContext',
+		ResultType: 2,
+		ToolTip: 'New-AzStorageContext\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageDirectory',
+		ListItemText: 'New-AzStorageDirectory',
+		ResultType: 2,
+		ToolTip: 'New-AzStorageDirectory\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageEncryptionScope',
+		ListItemText: 'New-AzStorageEncryptionScope',
+		ResultType: 2,
+		ToolTip: 'New-AzStorageEncryptionScope\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageFileSASToken',
+		ListItemText: 'New-AzStorageFileSASToken',
+		ResultType: 2,
+		ToolTip: 'New-AzStorageFileSASToken\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageLocalUserPermissionScope',
+		ListItemText: 'New-AzStorageLocalUserPermissionScope',
+		ResultType: 2,
+		ToolTip: 'New-AzStorageLocalUserPermissionScope\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageLocalUserSshPassword',
+		ListItemText: 'New-AzStorageLocalUserSshPassword',
+		ResultType: 2,
+		ToolTip: 'New-AzStorageLocalUserSshPassword\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageLocalUserSshPublicKey',
+		ListItemText: 'New-AzStorageLocalUserSshPublicKey',
+		ResultType: 2,
+		ToolTip: 'New-AzStorageLocalUserSshPublicKey\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageMover',
+		ListItemText: 'New-AzStorageMover',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzStorageMover \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageMoverAzStorageContainerEndpoint',
+		ListItemText: 'New-AzStorageMoverAzStorageContainerEndpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzStorageMoverAzStorageContainerEndpoint \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageMoverJobDefinition',
+		ListItemText: 'New-AzStorageMoverJobDefinition',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzStorageMoverJobDefinition \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageMoverNfsEndpoint',
+		ListItemText: 'New-AzStorageMoverNfsEndpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzStorageMoverNfsEndpoint \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageMoverProject',
+		ListItemText: 'New-AzStorageMoverProject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzStorageMoverProject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageObjectReplicationPolicyRule',
+		ListItemText: 'New-AzStorageObjectReplicationPolicyRule',
+		ResultType: 2,
+		ToolTip: 'New-AzStorageObjectReplicationPolicyRule\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageQueue',
+		ListItemText: 'New-AzStorageQueue',
+		ResultType: 2,
+		ToolTip: 'New-AzStorageQueue\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageQueueSASToken',
+		ListItemText: 'New-AzStorageQueueSASToken',
+		ResultType: 2,
+		ToolTip: 'New-AzStorageQueueSASToken\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageQueueStoredAccessPolicy',
+		ListItemText: 'New-AzStorageQueueStoredAccessPolicy',
+		ResultType: 2,
+		ToolTip: 'New-AzStorageQueueStoredAccessPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageShare',
+		ListItemText: 'New-AzStorageShare',
+		ResultType: 2,
+		ToolTip: 'New-AzStorageShare\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageShareSASToken',
+		ListItemText: 'New-AzStorageShareSASToken',
+		ResultType: 2,
+		ToolTip: 'New-AzStorageShareSASToken\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageShareStoredAccessPolicy',
+		ListItemText: 'New-AzStorageShareStoredAccessPolicy',
+		ResultType: 2,
+		ToolTip: 'New-AzStorageShareStoredAccessPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageSyncCloudEndpoint',
+		ListItemText: 'New-AzStorageSyncCloudEndpoint',
+		ResultType: 2,
+		ToolTip: 'New-AzStorageSyncCloudEndpoint\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageSyncGroup',
+		ListItemText: 'New-AzStorageSyncGroup',
+		ResultType: 2,
+		ToolTip: 'New-AzStorageSyncGroup\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageSyncServerEndpoint',
+		ListItemText: 'New-AzStorageSyncServerEndpoint',
+		ResultType: 2,
+		ToolTip: 'New-AzStorageSyncServerEndpoint\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageSyncService',
+		ListItemText: 'New-AzStorageSyncService',
+		ResultType: 2,
+		ToolTip: 'New-AzStorageSyncService\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageTable',
+		ListItemText: 'New-AzStorageTable',
+		ResultType: 2,
+		ToolTip: 'New-AzStorageTable\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageTableSASToken',
+		ListItemText: 'New-AzStorageTableSASToken',
+		ResultType: 2,
+		ToolTip: 'New-AzStorageTableSASToken\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStorageTableStoredAccessPolicy',
+		ListItemText: 'New-AzStorageTableStoredAccessPolicy',
+		ResultType: 2,
+		ToolTip: 'New-AzStorageTableStoredAccessPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStreamAnalyticsCluster',
+		ListItemText: 'New-AzStreamAnalyticsCluster',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzStreamAnalyticsCluster \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStreamAnalyticsFunction',
+		ListItemText: 'New-AzStreamAnalyticsFunction',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzStreamAnalyticsFunction \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStreamAnalyticsInput',
+		ListItemText: 'New-AzStreamAnalyticsInput',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzStreamAnalyticsInput \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStreamAnalyticsJob',
+		ListItemText: 'New-AzStreamAnalyticsJob',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzStreamAnalyticsJob \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStreamAnalyticsOutput',
+		ListItemText: 'New-AzStreamAnalyticsOutput',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzStreamAnalyticsOutput \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzStreamAnalyticsTransformation',
+		ListItemText: 'New-AzStreamAnalyticsTransformation',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzStreamAnalyticsTransformation \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSubscriptionDeployment',
+		ListItemText: 'New-AzSubscriptionDeployment',
+		ResultType: 2,
+		ToolTip: 'New-AzSubscriptionDeployment'
+	},
+	{
+		CompletionText: 'New-AzSubscriptionDiagnosticSetting',
+		ListItemText: 'New-AzSubscriptionDiagnosticSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzSubscriptionDiagnosticSetting \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSupportContactProfileObject',
+		ListItemText: 'New-AzSupportContactProfileObject',
+		ResultType: 2,
+		ToolTip: 'New-AzSupportContactProfileObject\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSupportTicket',
+		ListItemText: 'New-AzSupportTicket',
+		ResultType: 2,
+		ToolTip: 'New-AzSupportTicket\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSupportTicketCommunication',
+		ListItemText: 'New-AzSupportTicketCommunication',
+		ResultType: 2,
+		ToolTip: 'New-AzSupportTicketCommunication\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSynapseDataFlow',
+		ListItemText: 'New-AzSynapseDataFlow',
+		ResultType: 2,
+		ToolTip: 'New-AzSynapseDataFlow'
+	},
+	{
+		CompletionText: 'New-AzSynapseDataset',
+		ListItemText: 'New-AzSynapseDataset',
+		ResultType: 2,
+		ToolTip: 'New-AzSynapseDataset'
+	},
+	{
+		CompletionText: 'New-AzSynapseFirewallRule',
+		ListItemText: 'New-AzSynapseFirewallRule',
+		ResultType: 2,
+		ToolTip: 'New-AzSynapseFirewallRule\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSynapseGitRepositoryConfig',
+		ListItemText: 'New-AzSynapseGitRepositoryConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzSynapseGitRepositoryConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSynapseIntegrationRuntimeKey',
+		ListItemText: 'New-AzSynapseIntegrationRuntimeKey',
+		ResultType: 2,
+		ToolTip: 'New-AzSynapseIntegrationRuntimeKey\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSynapseKqlScript',
+		ListItemText: 'New-AzSynapseKqlScript',
+		ResultType: 2,
+		ToolTip: 'New-AzSynapseKqlScript\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSynapseKustoPool',
+		ListItemText: 'New-AzSynapseKustoPool',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzSynapseKustoPool \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSynapseKustoPoolAttachedDatabaseConfiguration',
+		ListItemText: 'New-AzSynapseKustoPoolAttachedDatabaseConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzSynapseKustoPoolAttachedDatabaseConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSynapseKustoPoolDatabase',
+		ListItemText: 'New-AzSynapseKustoPoolDatabase',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzSynapseKustoPoolDatabase \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSynapseKustoPoolDatabasePrincipalAssignment',
+		ListItemText: 'New-AzSynapseKustoPoolDatabasePrincipalAssignment',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzSynapseKustoPoolDatabasePrincipalAssignment \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSynapseKustoPoolDataConnection',
+		ListItemText: 'New-AzSynapseKustoPoolDataConnection',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzSynapseKustoPoolDataConnection \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSynapseKustoPoolPrincipalAssignment',
+		ListItemText: 'New-AzSynapseKustoPoolPrincipalAssignment',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzSynapseKustoPoolPrincipalAssignment \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSynapseLinkConnection',
+		ListItemText: 'New-AzSynapseLinkConnection',
+		ResultType: 2,
+		ToolTip: 'New-AzSynapseLinkConnection'
+	},
+	{
+		CompletionText: 'New-AzSynapseLinkedService',
+		ListItemText: 'New-AzSynapseLinkedService',
+		ResultType: 2,
+		ToolTip: 'New-AzSynapseLinkedService'
+	},
+	{
+		CompletionText: 'New-AzSynapseLinkedServiceEncryptedCredential',
+		ListItemText: 'New-AzSynapseLinkedServiceEncryptedCredential',
+		ResultType: 2,
+		ToolTip: 'New-AzSynapseLinkedServiceEncryptedCredential\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSynapseManagedPrivateEndpoint',
+		ListItemText: 'New-AzSynapseManagedPrivateEndpoint',
+		ResultType: 2,
+		ToolTip: 'New-AzSynapseManagedPrivateEndpoint\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSynapseManagedVirtualNetworkConfig',
+		ListItemText: 'New-AzSynapseManagedVirtualNetworkConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzSynapseManagedVirtualNetworkConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSynapseNotebook',
+		ListItemText: 'New-AzSynapseNotebook',
+		ResultType: 2,
+		ToolTip: 'New-AzSynapseNotebook'
+	},
+	{
+		CompletionText: 'New-AzSynapsePipeline',
+		ListItemText: 'New-AzSynapsePipeline',
+		ResultType: 2,
+		ToolTip: 'New-AzSynapsePipeline'
+	},
+	{
+		CompletionText: 'New-AzSynapseRoleAssignment',
+		ListItemText: 'New-AzSynapseRoleAssignment',
+		ResultType: 2,
+		ToolTip: 'New-AzSynapseRoleAssignment\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSynapseSparkConfiguration',
+		ListItemText: 'New-AzSynapseSparkConfiguration',
+		ResultType: 2,
+		ToolTip: 'New-AzSynapseSparkConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSynapseSparkJobDefinition',
+		ListItemText: 'New-AzSynapseSparkJobDefinition',
+		ResultType: 2,
+		ToolTip: 'New-AzSynapseSparkJobDefinition'
+	},
+	{
+		CompletionText: 'New-AzSynapseSparkPool',
+		ListItemText: 'New-AzSynapseSparkPool',
+		ResultType: 2,
+		ToolTip: 'New-AzSynapseSparkPool\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSynapseSqlDatabase',
+		ListItemText: 'New-AzSynapseSqlDatabase',
+		ResultType: 2,
+		ToolTip: 'New-AzSynapseSqlDatabase\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSynapseSqlPool',
+		ListItemText: 'New-AzSynapseSqlPool',
+		ResultType: 2,
+		ToolTip: 'New-AzSynapseSqlPool\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSynapseSqlPoolRestorePoint',
+		ListItemText: 'New-AzSynapseSqlPoolRestorePoint',
+		ResultType: 2,
+		ToolTip: 'New-AzSynapseSqlPoolRestorePoint\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSynapseSqlScript',
+		ListItemText: 'New-AzSynapseSqlScript',
+		ResultType: 2,
+		ToolTip: 'New-AzSynapseSqlScript'
+	},
+	{
+		CompletionText: 'New-AzSynapseTrigger',
+		ListItemText: 'New-AzSynapseTrigger',
+		ResultType: 2,
+		ToolTip: 'New-AzSynapseTrigger'
+	},
+	{
+		CompletionText: 'New-AzSynapseWorkspace',
+		ListItemText: 'New-AzSynapseWorkspace',
+		ResultType: 2,
+		ToolTip: 'New-AzSynapseWorkspace\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSynapseWorkspaceKey',
+		ListItemText: 'New-AzSynapseWorkspaceKey',
+		ResultType: 2,
+		ToolTip: 'New-AzSynapseWorkspaceKey\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzSynapseWorkspacePackage',
+		ListItemText: 'New-AzSynapseWorkspacePackage',
+		ResultType: 2,
+		ToolTip: 'New-AzSynapseWorkspacePackage\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzTag',
+		ListItemText: 'New-AzTag',
+		ResultType: 2,
+		ToolTip: 'New-AzTag\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzTemplateSpec',
+		ListItemText: 'New-AzTemplateSpec',
+		ResultType: 2,
+		ToolTip: 'New-AzTemplateSpec\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzTenantDeployment',
+		ListItemText: 'New-AzTenantDeployment',
+		ResultType: 2,
+		ToolTip: 'New-AzTenantDeployment\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzTrafficManagerEndpoint',
+		ListItemText: 'New-AzTrafficManagerEndpoint',
+		ResultType: 2,
+		ToolTip: 'New-AzTrafficManagerEndpoint\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzTrafficManagerProfile',
+		ListItemText: 'New-AzTrafficManagerProfile',
+		ResultType: 2,
+		ToolTip: 'New-AzTrafficManagerProfile\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzUserAssignedIdentity',
+		ListItemText: 'New-AzUserAssignedIdentity',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzUserAssignedIdentity \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVHubRoute',
+		ListItemText: 'New-AzVHubRoute',
+		ResultType: 2,
+		ToolTip: 'New-AzVHubRoute\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVHubRouteTable',
+		ListItemText: 'New-AzVHubRouteTable',
+		ResultType: 2,
+		ToolTip: 'New-AzVHubRouteTable\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVirtualApplianceAdditionalNicProperty',
+		ListItemText: 'New-AzVirtualApplianceAdditionalNicProperty',
+		ResultType: 2,
+		ToolTip: 'New-AzVirtualApplianceAdditionalNicProperty\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVirtualApplianceSite',
+		ListItemText: 'New-AzVirtualApplianceSite',
+		ResultType: 2,
+		ToolTip: 'New-AzVirtualApplianceSite\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVirtualApplianceSkuProperty',
+		ListItemText: 'New-AzVirtualApplianceSkuProperty',
+		ResultType: 2,
+		ToolTip: 'New-AzVirtualApplianceSkuProperty\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVirtualHub',
+		ListItemText: 'New-AzVirtualHub',
+		ResultType: 2,
+		ToolTip: 'New-AzVirtualHub\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVirtualHubBgpConnection',
+		ListItemText: 'New-AzVirtualHubBgpConnection',
+		ResultType: 2,
+		ToolTip: 'New-AzVirtualHubBgpConnection\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVirtualHubRoute',
+		ListItemText: 'New-AzVirtualHubRoute',
+		ResultType: 2,
+		ToolTip: 'New-AzVirtualHubRoute\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVirtualHubRouteTable',
+		ListItemText: 'New-AzVirtualHubRouteTable',
+		ResultType: 2,
+		ToolTip: 'New-AzVirtualHubRouteTable\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVirtualHubVnetConnection',
+		ListItemText: 'New-AzVirtualHubVnetConnection',
+		ResultType: 2,
+		ToolTip: 'New-AzVirtualHubVnetConnection\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVirtualNetwork',
+		ListItemText: 'New-AzVirtualNetwork',
+		ResultType: 2,
+		ToolTip: 'New-AzVirtualNetwork\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVirtualNetworkGateway',
+		ListItemText: 'New-AzVirtualNetworkGateway',
+		ResultType: 2,
+		ToolTip: 'New-AzVirtualNetworkGateway\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVirtualNetworkGatewayConnection',
+		ListItemText: 'New-AzVirtualNetworkGatewayConnection',
+		ResultType: 2,
+		ToolTip: 'New-AzVirtualNetworkGatewayConnection\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVirtualNetworkGatewayIpConfig',
+		ListItemText: 'New-AzVirtualNetworkGatewayIpConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzVirtualNetworkGatewayIpConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVirtualNetworkGatewayNatRule',
+		ListItemText: 'New-AzVirtualNetworkGatewayNatRule',
+		ResultType: 2,
+		ToolTip: 'New-AzVirtualNetworkGatewayNatRule\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVirtualNetworkGatewayPolicyGroup',
+		ListItemText: 'New-AzVirtualNetworkGatewayPolicyGroup',
+		ResultType: 2,
+		ToolTip: 'New-AzVirtualNetworkGatewayPolicyGroup\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVirtualNetworkGatewayPolicyGroupMember',
+		ListItemText: 'New-AzVirtualNetworkGatewayPolicyGroupMember',
+		ResultType: 2,
+		ToolTip: 'New-AzVirtualNetworkGatewayPolicyGroupMember\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVirtualNetworkSubnetConfig',
+		ListItemText: 'New-AzVirtualNetworkSubnetConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzVirtualNetworkSubnetConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVirtualNetworkTap',
+		ListItemText: 'New-AzVirtualNetworkTap',
+		ResultType: 2,
+		ToolTip: 'New-AzVirtualNetworkTap\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVirtualRouter',
+		ListItemText: 'New-AzVirtualRouter',
+		ResultType: 2,
+		ToolTip: 'New-AzVirtualRouter\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVirtualRouterAutoScaleConfiguration',
+		ListItemText: 'New-AzVirtualRouterAutoScaleConfiguration',
+		ResultType: 2,
+		ToolTip: 'New-AzVirtualRouterAutoScaleConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVirtualWan',
+		ListItemText: 'New-AzVirtualWan',
+		ResultType: 2,
+		ToolTip: 'New-AzVirtualWan\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVM',
+		ListItemText: 'New-AzVM',
+		ResultType: 2,
+		ToolTip: 'New-AzVM\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVMConfig',
+		ListItemText: 'New-AzVMConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzVMConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVMDataDisk',
+		ListItemText: 'New-AzVMDataDisk',
+		ResultType: 2,
+		ToolTip: 'New-AzVMDataDisk\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVmGalleryApplication',
+		ListItemText: 'New-AzVmGalleryApplication',
+		ResultType: 2,
+		ToolTip: 'New-AzVmGalleryApplication\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVMSqlServerAutoBackupConfig',
+		ListItemText: 'New-AzVMSqlServerAutoBackupConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzVMSqlServerAutoBackupConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVMSqlServerAutoPatchingConfig',
+		ListItemText: 'New-AzVMSqlServerAutoPatchingConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzVMSqlServerAutoPatchingConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVMSqlServerKeyVaultCredentialConfig',
+		ListItemText: 'New-AzVMSqlServerKeyVaultCredentialConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzVMSqlServerKeyVaultCredentialConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVmss',
+		ListItemText: 'New-AzVmss',
+		ResultType: 2,
+		ToolTip: 'New-AzVmss\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVmssConfig',
+		ListItemText: 'New-AzVmssConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzVmssConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVmssGalleryApplication',
+		ListItemText: 'New-AzVmssGalleryApplication',
+		ResultType: 2,
+		ToolTip: 'New-AzVmssGalleryApplication\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVmssIpConfig',
+		ListItemText: 'New-AzVmssIpConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzVmssIpConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVmssIpTagConfig',
+		ListItemText: 'New-AzVmssIpTagConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzVmssIpTagConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVmssVaultCertificateConfig',
+		ListItemText: 'New-AzVmssVaultCertificateConfig',
+		ResultType: 2,
+		ToolTip: 'New-AzVmssVaultCertificateConfig\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVpnClientConfiguration',
+		ListItemText: 'New-AzVpnClientConfiguration',
+		ResultType: 2,
+		ToolTip: 'New-AzVpnClientConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVpnClientConnectionConfiguration',
+		ListItemText: 'New-AzVpnClientConnectionConfiguration',
+		ResultType: 2,
+		ToolTip: 'New-AzVpnClientConnectionConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVpnClientIpsecParameter',
+		ListItemText: 'New-AzVpnClientIpsecParameter',
+		ResultType: 2,
+		ToolTip: 'New-AzVpnClientIpsecParameter\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVpnClientIpsecPolicy',
+		ListItemText: 'New-AzVpnClientIpsecPolicy',
+		ResultType: 2,
+		ToolTip: 'New-AzVpnClientIpsecPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVpnClientRevokedCertificate',
+		ListItemText: 'New-AzVpnClientRevokedCertificate',
+		ResultType: 2,
+		ToolTip: 'New-AzVpnClientRevokedCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVpnClientRootCertificate',
+		ListItemText: 'New-AzVpnClientRootCertificate',
+		ResultType: 2,
+		ToolTip: 'New-AzVpnClientRootCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVpnConnection',
+		ListItemText: 'New-AzVpnConnection',
+		ResultType: 2,
+		ToolTip: 'New-AzVpnConnection\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVpnGateway',
+		ListItemText: 'New-AzVpnGateway',
+		ResultType: 2,
+		ToolTip: 'New-AzVpnGateway\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVpnGatewayNatRule',
+		ListItemText: 'New-AzVpnGatewayNatRule',
+		ResultType: 2,
+		ToolTip: 'New-AzVpnGatewayNatRule\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVpnServerConfiguration',
+		ListItemText: 'New-AzVpnServerConfiguration',
+		ResultType: 2,
+		ToolTip: 'New-AzVpnServerConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVpnServerConfigurationPolicyGroup',
+		ListItemText: 'New-AzVpnServerConfigurationPolicyGroup',
+		ResultType: 2,
+		ToolTip: 'New-AzVpnServerConfigurationPolicyGroup\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVpnSite',
+		ListItemText: 'New-AzVpnSite',
+		ResultType: 2,
+		ToolTip: 'New-AzVpnSite\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVpnSiteLink',
+		ListItemText: 'New-AzVpnSiteLink',
+		ResultType: 2,
+		ToolTip: 'New-AzVpnSiteLink\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzVpnSiteLinkConnection',
+		ListItemText: 'New-AzVpnSiteLinkConnection',
+		ResultType: 2,
+		ToolTip: 'New-AzVpnSiteLinkConnection\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzWcfRelay',
+		ListItemText: 'New-AzWcfRelay',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzWcfRelay \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzWebApp',
+		ListItemText: 'New-AzWebApp',
+		ResultType: 2,
+		ToolTip: 'New-AzWebApp\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzWebAppAzureStoragePath',
+		ListItemText: 'New-AzWebAppAzureStoragePath',
+		ResultType: 2,
+		ToolTip: 'New-AzWebAppAzureStoragePath\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzWebAppBackup',
+		ListItemText: 'New-AzWebAppBackup',
+		ResultType: 2,
+		ToolTip: 'New-AzWebAppBackup\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzWebAppCertificate',
+		ListItemText: 'New-AzWebAppCertificate',
+		ResultType: 2,
+		ToolTip: 'New-AzWebAppCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzWebAppDatabaseBackupSetting',
+		ListItemText: 'New-AzWebAppDatabaseBackupSetting',
+		ResultType: 2,
+		ToolTip: 'New-AzWebAppDatabaseBackupSetting\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzWebAppSlot',
+		ListItemText: 'New-AzWebAppSlot',
+		ResultType: 2,
+		ToolTip: 'New-AzWebAppSlot\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzWebAppSSLBinding',
+		ListItemText: 'New-AzWebAppSSLBinding',
+		ResultType: 2,
+		ToolTip: 'New-AzWebAppSSLBinding\\r\\n'
+	},
+	{
+		CompletionText: 'New-AzWebPubSub',
+		ListItemText: 'New-AzWebPubSub',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzWebPubSub \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzWebPubSubCustomCertificate',
+		ListItemText: 'New-AzWebPubSubCustomCertificate',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzWebPubSubCustomCertificate \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzWebPubSubCustomDomain',
+		ListItemText: 'New-AzWebPubSubCustomDomain',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzWebPubSubCustomDomain \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzWebPubSubEventHubEndpointObject',
+		ListItemText: 'New-AzWebPubSubEventHubEndpointObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzWebPubSubEventHubEndpointObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzWebPubSubEventNameFilterObject',
+		ListItemText: 'New-AzWebPubSubEventNameFilterObject',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzWebPubSubEventNameFilterObject \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzWebPubSubHub',
+		ListItemText: 'New-AzWebPubSubHub',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzWebPubSubHub \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzWebPubSubKey',
+		ListItemText: 'New-AzWebPubSubKey',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzWebPubSubKey \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzWvdApplication',
+		ListItemText: 'New-AzWvdApplication',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzWvdApplication \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzWvdApplicationGroup',
+		ListItemText: 'New-AzWvdApplicationGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzWvdApplicationGroup \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzWvdHostPool',
+		ListItemText: 'New-AzWvdHostPool',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzWvdHostPool \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzWvdMsixPackage',
+		ListItemText: 'New-AzWvdMsixPackage',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzWvdMsixPackage \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzWvdRegistrationInfo',
+		ListItemText: 'New-AzWvdRegistrationInfo',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzWvdRegistrationInfo \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzWvdScalingPlan',
+		ListItemText: 'New-AzWvdScalingPlan',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzWvdScalingPlan \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzWvdScalingPlanPooledSchedule',
+		ListItemText: 'New-AzWvdScalingPlanPooledSchedule',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzWvdScalingPlanPooledSchedule \\r\\n'
+	},
+	{
+		CompletionText: 'New-AzWvdWorkspace',
+		ListItemText: 'New-AzWvdWorkspace',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-AzWvdWorkspace \\r\\n'
+	},
+	{
+		CompletionText: 'New-BcdEntry',
+		ListItemText: 'New-BcdEntry',
+		ResultType: 2,
+		ToolTip: 'New-BcdEntry\\r\\n'
+	},
+	{
+		CompletionText: 'New-BcdStore',
+		ListItemText: 'New-BcdStore',
+		ResultType: 2,
+		ToolTip: 'New-BcdStore\\r\\n'
+	},
+	{
+		CompletionText: 'New-CertificateNotificationTask',
+		ListItemText: 'New-CertificateNotificationTask',
+		ResultType: 2,
+		ToolTip: 'New-CertificateNotificationTask\\r\\n'
+	},
+	{
+		CompletionText: 'New-CimInstance',
+		ListItemText: 'New-CimInstance',
+		ResultType: 2,
+		ToolTip: 'New-CimInstance\\r\\n'
+	},
+	{
+		CompletionText: 'New-CimSession',
+		ListItemText: 'New-CimSession',
+		ResultType: 2,
+		ToolTip: 'New-CimSession\\r\\n'
+	},
+	{
+		CompletionText: 'New-CimSessionOption',
+		ListItemText: 'New-CimSessionOption',
+		ResultType: 2,
+		ToolTip: 'New-CimSessionOption\\r\\n'
+	},
+	{
+		CompletionText: 'New-CIPolicy',
+		ListItemText: 'New-CIPolicy',
+		ResultType: 2,
+		ToolTip: 'New-CIPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'New-CIPolicyRule',
+		ListItemText: 'New-CIPolicyRule',
+		ResultType: 2,
+		ToolTip: 'New-CIPolicyRule\\r\\n'
+	},
+	{
+		CompletionText: 'New-DAEntryPointTableItem',
+		ListItemText: 'New-DAEntryPointTableItem',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-DAEntryPointTableItem \\r\\n'
+	},
+	{
+		CompletionText: 'New-DscChecksum',
+		ListItemText: 'New-DscChecksum',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-DscChecksum \\r\\n'
+	},
+	{
+		CompletionText: 'New-DtcDiagnosticTransaction',
+		ListItemText: 'New-DtcDiagnosticTransaction',
+		ResultType: 2,
+		ToolTip: 'New-DtcDiagnosticTransaction\\r\\n'
+	},
+	{
+		CompletionText: 'New-EapConfiguration',
+		ListItemText: 'New-EapConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-EapConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'New-EtwTraceSession',
+		ListItemText: 'New-EtwTraceSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-EtwTraceSession \\r\\n'
+	},
+	{
+		CompletionText: 'New-Event',
+		ListItemText: 'New-Event',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-Event [-SourceIdentifier] <string> [[-Sender] <psobject>] [[-EventArguments] <psobject[]>] [[-MessageData] <psobject>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'New-FileCatalog',
+		ListItemText: 'New-FileCatalog',
+		ResultType: 2,
+		ToolTip: 'New-FileCatalog\\r\\n'
+	},
+	{
+		CompletionText: 'New-FileShare',
+		ListItemText: 'New-FileShare',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-FileShare \\r\\n'
+	},
+	{
+		CompletionText: 'New-Fixture',
+		ListItemText: 'New-Fixture',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-Fixture \\r\\n'
+	},
+	{
+		CompletionText: 'New-GitPromptSettings',
+		ListItemText: 'New-GitPromptSettings',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-GitPromptSettings \\r\\n'
+	},
+	{
+		CompletionText: 'New-Guid',
+		ListItemText: 'New-Guid',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-Guid [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'New-HgsGuardian',
+		ListItemText: 'New-HgsGuardian',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-HgsGuardian \\r\\n'
+	},
+	{
+		CompletionText: 'New-HgsKeyProtector',
+		ListItemText: 'New-HgsKeyProtector',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-HgsKeyProtector \\r\\n'
+	},
+	{
+		CompletionText: 'New-HgsTraceTarget',
+		ListItemText: 'New-HgsTraceTarget',
+		ResultType: 2,
+		ToolTip: 'New-HgsTraceTarget\\r\\n'
+	},
+	{
+		CompletionText: 'New-IscsiTargetPortal',
+		ListItemText: 'New-IscsiTargetPortal',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-IscsiTargetPortal \\r\\n'
+	},
+	{
+		CompletionText: 'New-IseSnippet',
+		ListItemText: 'New-IseSnippet',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-IseSnippet \\r\\n'
+	},
+	{
+		CompletionText: 'New-Item',
+		ListItemText: 'New-Item',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-Item [-Path] <string[]> [-ItemType <string>] [-Value <Object>] [-Force] [-Credential <pscredential>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nNew-Item [[-Path] <string[]>] -Name <string> [-ItemType <string>] [-Value <Object>] [-Force] [-Credential <pscredential>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'New-ItemProperty',
+		ListItemText: 'New-ItemProperty',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-ItemProperty [-Path] <string[]> [-Name] <string> [-PropertyType <string>] [-Value <Object>] [-Force] [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Credential <pscredential>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nNew-ItemProperty [-Name] <string> -LiteralPath <string[]> [-PropertyType <string>] [-Value <Object>] [-Force] [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Credential <pscredential>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'New-JobTrigger',
+		ListItemText: 'New-JobTrigger',
+		ResultType: 2,
+		ToolTip: 'New-JobTrigger\\r\\n'
+	},
+	{
+		CompletionText: 'New-LocalGroup',
+		ListItemText: 'New-LocalGroup',
+		ResultType: 2,
+		ToolTip: 'New-LocalGroup\\r\\n'
+	},
+	{
+		CompletionText: 'New-LocalUser',
+		ListItemText: 'New-LocalUser',
+		ResultType: 2,
+		ToolTip: 'New-LocalUser\\r\\n'
+	},
+	{
+		CompletionText: 'New-MaskingSet',
+		ListItemText: 'New-MaskingSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-MaskingSet \\r\\n'
+	},
+	{
+		CompletionText: 'New-Module',
+		ListItemText: 'New-Module',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-Module [-ScriptBlock] <scriptblock> [-Function <string[]>] [-Cmdlet <string[]>] [-ReturnResult] [-AsCustomObject] [-ArgumentList <Object[]>] [<CommonParameters>]\\r\\n\\r\\nNew-Module [-Name] <string> [-ScriptBlock] <scriptblock> [-Function <string[]>] [-Cmdlet <string[]>] [-ReturnResult] [-AsCustomObject] [-ArgumentList <Object[]>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'New-ModuleManifest',
+		ListItemText: 'New-ModuleManifest',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-ModuleManifest [-Path] <string> [-NestedModules <Object[]>] [-Guid <guid>] [-Author <string>] [-CompanyName <string>] [-Copyright <string>] [-RootModule <string>] [-ModuleVersion <version>] [-Description <string>] [-ProcessorArchitecture <ProcessorArchitecture>] [-PowerShellVersion <version>] [-ClrVersion <version>] [-DotNetFrameworkVersion <version>] [-PowerShellHostName <string>] [-PowerShellHostVersion <version>] [-RequiredModules <Object[]>] [-TypesToProcess <string[]>] [-FormatsToProcess <string[]>] [-ScriptsToProcess <string[]>] [-RequiredAssemblies <string[]>] [-FileList <string[]>] [-ModuleList <Object[]>] [-FunctionsToExport <string[]>] [-AliasesToExport <string[]>] [-VariablesToExport <string[]>] [-CmdletsToExport <string[]>] [-DscResourcesToExport <string[]>] [-CompatiblePSEditions <string[]>] [-PrivateData <Object>] [-Tags <string[]>] [-ProjectUri <uri>] [-LicenseUri <uri>] [-IconUri <uri>] [-ReleaseNotes <string>] [-Prerelease <string>] [-RequireLicenseAcceptance] [-ExternalModuleDependencies <string[]>] [-HelpInfoUri <string>] [-PassThru] [-DefaultCommandPrefix <string>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'New-MpPerformanceRecording',
+		ListItemText: 'New-MpPerformanceRecording',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-MpPerformanceRecording \\r\\n'
+	},
+	{
+		CompletionText: 'New-NetAdapterAdvancedProperty',
+		ListItemText: 'New-NetAdapterAdvancedProperty',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-NetAdapterAdvancedProperty \\r\\n'
+	},
+	{
+		CompletionText: 'New-NetEventSession',
+		ListItemText: 'New-NetEventSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-NetEventSession \\r\\n'
+	},
+	{
+		CompletionText: 'New-NetFirewallDynamicKeywordAddress',
+		ListItemText: 'New-NetFirewallDynamicKeywordAddress',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-NetFirewallDynamicKeywordAddress \\r\\n'
+	},
+	{
+		CompletionText: 'New-NetFirewallHyperVProfile',
+		ListItemText: 'New-NetFirewallHyperVProfile',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-NetFirewallHyperVProfile \\r\\n'
+	},
+	{
+		CompletionText: 'New-NetFirewallHyperVRule',
+		ListItemText: 'New-NetFirewallHyperVRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-NetFirewallHyperVRule \\r\\n'
+	},
+	{
+		CompletionText: 'New-NetFirewallHyperVVMSetting',
+		ListItemText: 'New-NetFirewallHyperVVMSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-NetFirewallHyperVVMSetting \\r\\n'
+	},
+	{
+		CompletionText: 'New-NetFirewallRule',
+		ListItemText: 'New-NetFirewallRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-NetFirewallRule \\r\\n'
+	},
+	{
+		CompletionText: 'New-NetIPAddress',
+		ListItemText: 'New-NetIPAddress',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-NetIPAddress \\r\\n'
+	},
+	{
+		CompletionText: 'New-NetIPHttpsConfiguration',
+		ListItemText: 'New-NetIPHttpsConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-NetIPHttpsConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'New-NetIPsecAuthProposal',
+		ListItemText: 'New-NetIPsecAuthProposal',
+		ResultType: 2,
+		ToolTip: 'New-NetIPsecAuthProposal\\r\\n'
+	},
+	{
+		CompletionText: 'New-NetIPsecDospSetting',
+		ListItemText: 'New-NetIPsecDospSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-NetIPsecDospSetting \\r\\n'
+	},
+	{
+		CompletionText: 'New-NetIPsecMainModeCryptoProposal',
+		ListItemText: 'New-NetIPsecMainModeCryptoProposal',
+		ResultType: 2,
+		ToolTip: 'New-NetIPsecMainModeCryptoProposal\\r\\n'
+	},
+	{
+		CompletionText: 'New-NetIPsecMainModeCryptoSet',
+		ListItemText: 'New-NetIPsecMainModeCryptoSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-NetIPsecMainModeCryptoSet \\r\\n'
+	},
+	{
+		CompletionText: 'New-NetIPsecMainModeRule',
+		ListItemText: 'New-NetIPsecMainModeRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-NetIPsecMainModeRule \\r\\n'
+	},
+	{
+		CompletionText: 'New-NetIPsecPhase1AuthSet',
+		ListItemText: 'New-NetIPsecPhase1AuthSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-NetIPsecPhase1AuthSet \\r\\n'
+	},
+	{
+		CompletionText: 'New-NetIPsecPhase2AuthSet',
+		ListItemText: 'New-NetIPsecPhase2AuthSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-NetIPsecPhase2AuthSet \\r\\n'
+	},
+	{
+		CompletionText: 'New-NetIPsecQuickModeCryptoProposal',
+		ListItemText: 'New-NetIPsecQuickModeCryptoProposal',
+		ResultType: 2,
+		ToolTip: 'New-NetIPsecQuickModeCryptoProposal\\r\\n'
+	},
+	{
+		CompletionText: 'New-NetIPsecQuickModeCryptoSet',
+		ListItemText: 'New-NetIPsecQuickModeCryptoSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-NetIPsecQuickModeCryptoSet \\r\\n'
+	},
+	{
+		CompletionText: 'New-NetIPsecRule',
+		ListItemText: 'New-NetIPsecRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-NetIPsecRule \\r\\n'
+	},
+	{
+		CompletionText: 'New-NetLbfoTeam',
+		ListItemText: 'New-NetLbfoTeam',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-NetLbfoTeam \\r\\n'
+	},
+	{
+		CompletionText: 'New-NetNat',
+		ListItemText: 'New-NetNat',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-NetNat \\r\\n'
+	},
+	{
+		CompletionText: 'New-NetNatTransitionConfiguration',
+		ListItemText: 'New-NetNatTransitionConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-NetNatTransitionConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'New-NetNeighbor',
+		ListItemText: 'New-NetNeighbor',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-NetNeighbor \\r\\n'
+	},
+	{
+		CompletionText: 'New-NetQosPolicy',
+		ListItemText: 'New-NetQosPolicy',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-NetQosPolicy \\r\\n'
+	},
+	{
+		CompletionText: 'New-NetRoute',
+		ListItemText: 'New-NetRoute',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-NetRoute \\r\\n'
+	},
+	{
+		CompletionText: 'New-NetSwitchTeam',
+		ListItemText: 'New-NetSwitchTeam',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-NetSwitchTeam \\r\\n'
+	},
+	{
+		CompletionText: 'New-NetTransportFilter',
+		ListItemText: 'New-NetTransportFilter',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-NetTransportFilter \\r\\n'
+	},
+	{
+		CompletionText: 'New-NetworkSwitchVlan',
+		ListItemText: 'New-NetworkSwitchVlan',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-NetworkSwitchVlan \\r\\n'
+	},
+	{
+		CompletionText: 'New-Object',
+		ListItemText: 'New-Object',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-Object [-TypeName] <string> [[-ArgumentList] <Object[]>] [-Property <IDictionary>] [<CommonParameters>]\\r\\n\\r\\nNew-Object [-ComObject] <string> [-Strict] [-Property <IDictionary>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'New-Partition',
+		ListItemText: 'New-Partition',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-Partition \\r\\n'
+	},
+	{
+		CompletionText: 'New-PesterOption',
+		ListItemText: 'New-PesterOption',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-PesterOption \\r\\n'
+	},
+	{
+		CompletionText: 'New-PmemDedicatedMemory',
+		ListItemText: 'New-PmemDedicatedMemory',
+		ResultType: 2,
+		ToolTip: 'New-PmemDedicatedMemory\\r\\n'
+	},
+	{
+		CompletionText: 'New-PmemDisk',
+		ListItemText: 'New-PmemDisk',
+		ResultType: 2,
+		ToolTip: 'New-PmemDisk\\r\\n'
+	},
+	{
+		CompletionText: 'New-ProvisioningRepro',
+		ListItemText: 'New-ProvisioningRepro',
+		ResultType: 2,
+		ToolTip: 'New-ProvisioningRepro\\r\\n'
+	},
+	{
+		CompletionText: 'New-PSDrive',
+		ListItemText: 'New-PSDrive',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-PSDrive [-Name] <string> [-PSProvider] <string> [-Root] <string> [-Description <string>] [-Scope <string>] [-Persist] [-Credential <pscredential>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'New-PSRoleCapabilityFile',
+		ListItemText: 'New-PSRoleCapabilityFile',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-PSRoleCapabilityFile [-Path] <string> [-Guid <guid>] [-Author <string>] [-Description <string>] [-CompanyName <string>] [-Copyright <string>] [-ModulesToImport <Object[]>] [-VisibleAliases <string[]>] [-VisibleCmdlets <Object[]>] [-VisibleFunctions <Object[]>] [-VisibleExternalCommands <string[]>] [-VisibleProviders <string[]>] [-ScriptsToProcess <string[]>] [-AliasDefinitions <IDictionary[]>] [-FunctionDefinitions <IDictionary[]>] [-VariableDefinitions <Object>] [-EnvironmentVariables <IDictionary>] [-TypesToProcess <string[]>] [-FormatsToProcess <string[]>] [-AssembliesToLoad <string[]>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'New-PSScriptFileInfo',
+		ListItemText: 'New-PSScriptFileInfo',
+		ResultType: 2,
+		ToolTip: 'New-PSScriptFileInfo\\r\\n'
+	},
+	{
+		CompletionText: 'New-PSSession',
+		ListItemText: 'New-PSSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-PSSession [[-ComputerName] <string[]>] [-Credential <pscredential>] [-Name <string[]>] [-EnableNetworkAccess] [-ConfigurationName <string>] [-Port <int>] [-UseSSL] [-ApplicationName <string>] [-ThrottleLimit <int>] [-SessionOption <PSSessionOption>] [-Authentication <AuthenticationMechanism>] [-CertificateThumbprint <string>] [<CommonParameters>]\\r\\n\\r\\nNew-PSSession [-ConnectionUri] <uri[]> [-Credential <pscredential>] [-Name <string[]>] [-EnableNetworkAccess] [-ConfigurationName <string>] [-ThrottleLimit <int>] [-AllowRedirection] [-SessionOption <PSSessionOption>] [-Authentication <AuthenticationMechanism>] [-CertificateThumbprint <string>] [<CommonParameters>]\\r\\n\\r\\nNew-PSSession [-VMId] <guid[]> -Credential <pscredential> [-Name <string[]>] [-ConfigurationName <string>] [-ThrottleLimit <int>] [<CommonParameters>]\\r\\n\\r\\nNew-PSSession -Credential <pscredential> -VMName <string[]> [-Name <string[]>] [-ConfigurationName <string>] [-ThrottleLimit <int>] [<CommonParameters>]\\r\\n\\r\\nNew-PSSession [[-Session] <PSSession[]>] [-Name <string[]>] [-EnableNetworkAccess] [-ThrottleLimit <int>] [<CommonParameters>]\\r\\n\\r\\nNew-PSSession -ContainerId <string[]> [-Name <string[]>] [-ConfigurationName <string>] [-RunAsAdministrator] [-ThrottleLimit <int>] [<CommonParameters>]\\r\\n\\r\\nNew-PSSession -UseWindowsPowerShell [-Name <string[]>] [<CommonParameters>]\\r\\n\\r\\nNew-PSSession [-HostName] <string[]> [-Name <string[]>] [-Port <int>] [-UserName <string>] [-KeyFilePath <string>] [-Subsystem <string>] [-ConnectingTimeout <int>] [-SSHTransport] [-Options <hashtable>] [<CommonParameters>]\\r\\n\\r\\nNew-PSSession -SSHConnection <hashtable[]> [-Name <string[]>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'New-PSSessionConfigurationFile',
+		ListItemText: 'New-PSSessionConfigurationFile',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-PSSessionConfigurationFile [-Path] <string> [-SchemaVersion <version>] [-Guid <guid>] [-Author <string>] [-Description <string>] [-CompanyName <string>] [-Copyright <string>] [-SessionType <SessionType>] [-TranscriptDirectory <string>] [-RunAsVirtualAccount] [-RunAsVirtualAccountGroups <string[]>] [-MountUserDrive] [-UserDriveMaximumSize <long>] [-GroupManagedServiceAccount <string>] [-ScriptsToProcess <string[]>] [-RoleDefinitions <IDictionary>] [-RequiredGroups <IDictionary>] [-LanguageMode <PSLanguageMode>] [-ExecutionPolicy <ExecutionPolicy>] [-PowerShellVersion <version>] [-ModulesToImport <Object[]>] [-VisibleAliases <string[]>] [-VisibleCmdlets <Object[]>] [-VisibleFunctions <Object[]>] [-VisibleExternalCommands <string[]>] [-VisibleProviders <string[]>] [-AliasDefinitions <IDictionary[]>] [-FunctionDefinitions <IDictionary[]>] [-VariableDefinitions <Object>] [-EnvironmentVariables <IDictionary>] [-TypesToProcess <string[]>] [-FormatsToProcess <string[]>] [-AssembliesToLoad <string[]>] [-Full] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'New-PSSessionOption',
+		ListItemText: 'New-PSSessionOption',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-PSSessionOption [-MaximumRedirection <int>] [-NoCompression] [-NoMachineProfile] [-Culture <cultureinfo>] [-UICulture <cultureinfo>] [-MaximumReceivedDataSizePerCommand <int>] [-MaximumReceivedObjectSize <int>] [-OutputBufferingMode <OutputBufferingMode>] [-MaxConnectionRetryCount <int>] [-ApplicationArguments <psprimitivedictionary>] [-OpenTimeout <int>] [-CancelTimeout <int>] [-IdleTimeout <int>] [-ProxyAccessType <ProxyAccessType>] [-ProxyAuthentication <AuthenticationMechanism>] [-ProxyCredential <pscredential>] [-SkipCACheck] [-SkipCNCheck] [-SkipRevocationCheck] [-OperationTimeout <int>] [-NoEncryption] [-UseUTF16] [-IncludePortInSPN] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'New-PSTransportOption',
+		ListItemText: 'New-PSTransportOption',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-PSTransportOption [-MaxIdleTimeoutSec <int>] [-ProcessIdleTimeoutSec <int>] [-MaxSessions <int>] [-MaxConcurrentCommandsPerSession <int>] [-MaxSessionsPerUser <int>] [-MaxMemoryPerSessionMB <int>] [-MaxProcessesPerSession <int>] [-MaxConcurrentUsers <int>] [-IdleTimeoutSec <int>] [-OutputBufferingMode <OutputBufferingMode>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'New-PSWorkflowExecutionOption',
+		ListItemText: 'New-PSWorkflowExecutionOption',
+		ResultType: 2,
+		ToolTip: 'New-PSWorkflowExecutionOption\\r\\n'
+	},
+	{
+		CompletionText: 'New-PSWorkflowSession',
+		ListItemText: 'New-PSWorkflowSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-PSWorkflowSession \\r\\n'
+	},
+	{
+		CompletionText: 'New-ScheduledJobOption',
+		ListItemText: 'New-ScheduledJobOption',
+		ResultType: 2,
+		ToolTip: 'New-ScheduledJobOption\\r\\n'
+	},
+	{
+		CompletionText: 'New-ScheduledTask',
+		ListItemText: 'New-ScheduledTask',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-ScheduledTask \\r\\n'
+	},
+	{
+		CompletionText: 'New-ScheduledTaskAction',
+		ListItemText: 'New-ScheduledTaskAction',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-ScheduledTaskAction \\r\\n'
+	},
+	{
+		CompletionText: 'New-ScheduledTaskPrincipal',
+		ListItemText: 'New-ScheduledTaskPrincipal',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-ScheduledTaskPrincipal \\r\\n'
+	},
+	{
+		CompletionText: 'New-ScheduledTaskSettingsSet',
+		ListItemText: 'New-ScheduledTaskSettingsSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-ScheduledTaskSettingsSet \\r\\n'
+	},
+	{
+		CompletionText: 'New-ScheduledTaskTrigger',
+		ListItemText: 'New-ScheduledTaskTrigger',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-ScheduledTaskTrigger \\r\\n'
+	},
+	{
+		CompletionText: 'New-ScriptFileInfo',
+		ListItemText: 'New-ScriptFileInfo',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-ScriptFileInfo \\r\\n'
+	},
+	{
+		CompletionText: 'New-SelfSignedCertificate',
+		ListItemText: 'New-SelfSignedCertificate',
+		ResultType: 2,
+		ToolTip: 'New-SelfSignedCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'New-Service',
+		ListItemText: 'New-Service',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-Service [-Name] <string> [-BinaryPathName] <string> [-DisplayName <string>] [-Description <string>] [-StartupType <ServiceStartupType>] [-Credential <pscredential>] [-SecurityDescriptorSddl <string>] [-DependsOn <string[]>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'New-SmbClientCertificateMapping',
+		ListItemText: 'New-SmbClientCertificateMapping',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-SmbClientCertificateMapping \\r\\n'
+	},
+	{
+		CompletionText: 'New-SmbGlobalMapping',
+		ListItemText: 'New-SmbGlobalMapping',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-SmbGlobalMapping \\r\\n'
+	},
+	{
+		CompletionText: 'New-SmbMapping',
+		ListItemText: 'New-SmbMapping',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-SmbMapping \\r\\n'
+	},
+	{
+		CompletionText: 'New-SmbMultichannelConstraint',
+		ListItemText: 'New-SmbMultichannelConstraint',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-SmbMultichannelConstraint \\r\\n'
+	},
+	{
+		CompletionText: 'New-SmbServerCertificateMapping',
+		ListItemText: 'New-SmbServerCertificateMapping',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-SmbServerCertificateMapping \\r\\n'
+	},
+	{
+		CompletionText: 'New-SmbShare',
+		ListItemText: 'New-SmbShare',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-SmbShare \\r\\n'
+	},
+	{
+		CompletionText: 'New-StorageBusBinding',
+		ListItemText: 'New-StorageBusBinding',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-StorageBusBinding \\r\\n'
+	},
+	{
+		CompletionText: 'New-StorageBusCacheStore',
+		ListItemText: 'New-StorageBusCacheStore',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-StorageBusCacheStore \\r\\n'
+	},
+	{
+		CompletionText: 'New-StorageFileServer',
+		ListItemText: 'New-StorageFileServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-StorageFileServer \\r\\n'
+	},
+	{
+		CompletionText: 'New-StoragePool',
+		ListItemText: 'New-StoragePool',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-StoragePool \\r\\n'
+	},
+	{
+		CompletionText: 'New-StorageSubsystemVirtualDisk',
+		ListItemText: 'New-StorageSubsystemVirtualDisk',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-StorageSubsystemVirtualDisk \\r\\n'
+	},
+	{
+		CompletionText: 'New-StorageTier',
+		ListItemText: 'New-StorageTier',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-StorageTier \\r\\n'
+	},
+	{
+		CompletionText: 'New-TemporaryFile',
+		ListItemText: 'New-TemporaryFile',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-TemporaryFile [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'New-TimeSpan',
+		ListItemText: 'New-TimeSpan',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-TimeSpan [[-Start] <datetime>] [[-End] <datetime>] [<CommonParameters>]\\r\\n\\r\\nNew-TimeSpan [-Days <int>] [-Hours <int>] [-Minutes <int>] [-Seconds <int>] [-Milliseconds <int>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'New-TlsSessionTicketKey',
+		ListItemText: 'New-TlsSessionTicketKey',
+		ResultType: 2,
+		ToolTip: 'New-TlsSessionTicketKey\\r\\n'
+	},
+	{
+		CompletionText: 'New-Variable',
+		ListItemText: 'New-Variable',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-Variable [-Name] <string> [[-Value] <Object>] [-Description <string>] [-Option <ScopedItemOptions>] [-Visibility <SessionStateEntryVisibility>] [-Force] [-PassThru] [-Scope <string>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'New-VFD',
+		ListItemText: 'New-VFD',
+		ResultType: 2,
+		ToolTip: 'New-VFD\\r\\n'
+	},
+	{
+		CompletionText: 'New-VHD',
+		ListItemText: 'New-VHD',
+		ResultType: 2,
+		ToolTip: 'New-VHD\\r\\n'
+	},
+	{
+		CompletionText: 'New-VirtualDisk',
+		ListItemText: 'New-VirtualDisk',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-VirtualDisk \\r\\n'
+	},
+	{
+		CompletionText: 'New-VirtualDiskClone',
+		ListItemText: 'New-VirtualDiskClone',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-VirtualDiskClone \\r\\n'
+	},
+	{
+		CompletionText: 'New-VirtualDiskSnapshot',
+		ListItemText: 'New-VirtualDiskSnapshot',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-VirtualDiskSnapshot \\r\\n'
+	},
+	{
+		CompletionText: 'New-VM',
+		ListItemText: 'New-VM',
+		ResultType: 2,
+		ToolTip: 'New-VM\\r\\n'
+	},
+	{
+		CompletionText: 'New-VMGroup',
+		ListItemText: 'New-VMGroup',
+		ResultType: 2,
+		ToolTip: 'New-VMGroup\\r\\n'
+	},
+	{
+		CompletionText: 'New-VMReplicationAuthorizationEntry',
+		ListItemText: 'New-VMReplicationAuthorizationEntry',
+		ResultType: 2,
+		ToolTip: 'New-VMReplicationAuthorizationEntry\\r\\n'
+	},
+	{
+		CompletionText: 'New-VMResourcePool',
+		ListItemText: 'New-VMResourcePool',
+		ResultType: 2,
+		ToolTip: 'New-VMResourcePool\\r\\n'
+	},
+	{
+		CompletionText: 'New-VMSan',
+		ListItemText: 'New-VMSan',
+		ResultType: 2,
+		ToolTip: 'New-VMSan\\r\\n'
+	},
+	{
+		CompletionText: 'New-VMSwitch',
+		ListItemText: 'New-VMSwitch',
+		ResultType: 2,
+		ToolTip: 'New-VMSwitch\\r\\n'
+	},
+	{
+		CompletionText: 'New-Volume',
+		ListItemText: 'New-Volume',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-Volume \\r\\n'
+	},
+	{
+		CompletionText: 'New-VpnServerAddress',
+		ListItemText: 'New-VpnServerAddress',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-VpnServerAddress \\r\\n'
+	},
+	{
+		CompletionText: 'New-WindowsCustomImage',
+		ListItemText: 'New-WindowsCustomImage',
+		ResultType: 2,
+		ToolTip: 'New-WindowsCustomImage\\r\\n'
+	},
+	{
+		CompletionText: 'New-WindowsImage',
+		ListItemText: 'New-WindowsImage',
+		ResultType: 2,
+		ToolTip: 'New-WindowsImage\\r\\n'
+	},
+	{
+		CompletionText: 'New-WinEvent',
+		ListItemText: 'New-WinEvent',
+		ResultType: 2,
+		ToolTip: 'New-WinEvent\\r\\n'
+	},
+	{
+		CompletionText: 'New-WinUserLanguageList',
+		ListItemText: 'New-WinUserLanguageList',
+		ResultType: 2,
+		ToolTip: 'New-WinUserLanguageList\\r\\n'
+	},
+	{
+		CompletionText: 'New-WSManInstance',
+		ListItemText: 'New-WSManInstance',
+		ResultType: 2,
+		ToolTip: 'New-WSManInstance\\r\\n'
+	},
+	{
+		CompletionText: 'New-WSManSessionOption',
+		ListItemText: 'New-WSManSessionOption',
+		ResultType: 2,
+		ToolTip: 'New-WSManSessionOption\\r\\n'
+	},
+	{
+		CompletionText: 'newdev.exe',
+		ListItemText: 'newdev.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\newdev.exe'
+	},
+	{
+		CompletionText: 'nf.cmd',
+		ListItemText: 'nf.cmd',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Roaming\\npm\\nf.cmd'
+	},
+	{
+		CompletionText: 'nf.ps1',
+		ListItemText: 'nf.ps1',
+		ResultType: 2,
+		ToolTip: 'nf.ps1 \\r\\n'
+	},
+	{
+		CompletionText: 'NgcIso.exe',
+		ListItemText: 'NgcIso.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\NgcIso.exe'
+	},
+	{
+		CompletionText: 'ni',
+		ListItemText: 'ni',
+		ResultType: 2,
+		ToolTip: 'New-Item'
+	},
+	{
+		CompletionText: 'nlg',
+		ListItemText: 'nlg',
+		ResultType: 2,
+		ToolTip: 'nlg'
+	},
+	{
+		CompletionText: 'nltest.exe',
+		ListItemText: 'nltest.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\nltest.exe'
+	},
+	{
+		CompletionText: 'nlu',
+		ListItemText: 'nlu',
+		ResultType: 2,
+		ToolTip: 'nlu'
+	},
+	{
+		CompletionText: 'nmbind.exe',
+		ListItemText: 'nmbind.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\nmbind.exe'
+	},
+	{
+		CompletionText: 'nmo',
+		ListItemText: 'nmo',
+		ResultType: 2,
+		ToolTip: 'New-Module'
+	},
+	{
+		CompletionText: 'nmscrub.exe',
+		ListItemText: 'nmscrub.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\nmscrub.exe'
+	},
+	{
+		CompletionText: 'node.exe',
+		ListItemText: 'node.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\nodejs\\node.exe'
+	},
+	{
+		CompletionText: 'nodevars.bat',
+		ListItemText: 'nodevars.bat',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\nodejs\\nodevars.bat'
+	},
+	{
+		CompletionText: 'normalizer.exe',
+		ListItemText: 'normalizer.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Programs\\Python\\Python310\\Scripts\\normalizer.exe'
+	},
+	{
+		CompletionText: 'notepad.exe',
+		ListItemText: 'notepad.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\notepad.exe'
+	},
+	{
+		CompletionText: 'npm.cmd',
+		ListItemText: 'npm.cmd',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\nodejs\\npm.cmd'
+	},
+	{
+		CompletionText: 'npx.cmd',
+		ListItemText: 'npx.cmd',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\nodejs\\npx.cmd'
+	},
+	{
+		CompletionText: 'nslookup.exe',
+		ListItemText: 'nslookup.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\nslookup.exe'
+	},
+	{
+		CompletionText: 'nsmbccm',
+		ListItemText: 'nsmbccm',
+		ResultType: 2,
+		ToolTip: 'nsmbccm'
+	},
+	{
+		CompletionText: 'nsmbgm',
+		ListItemText: 'nsmbgm',
+		ResultType: 2,
+		ToolTip: 'nsmbgm'
+	},
+	{
+		CompletionText: 'nsmbm',
+		ListItemText: 'nsmbm',
+		ResultType: 2,
+		ToolTip: 'nsmbm'
+	},
+	{
+		CompletionText: 'nsmbs',
+		ListItemText: 'nsmbs',
+		ResultType: 2,
+		ToolTip: 'nsmbs'
+	},
+	{
+		CompletionText: 'nsmbscm',
+		ListItemText: 'nsmbscm',
+		ResultType: 2,
+		ToolTip: 'nsmbscm'
+	},
+	{
+		CompletionText: 'nsmbt',
+		ListItemText: 'nsmbt',
+		ResultType: 2,
+		ToolTip: 'nsmbt'
+	},
+	{
+		CompletionText: 'nsn',
+		ListItemText: 'nsn',
+		ResultType: 2,
+		ToolTip: 'New-PSSession'
+	},
+	{
+		CompletionText: 'ntoskrnl.exe',
+		ListItemText: 'ntoskrnl.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\ntoskrnl.exe'
+	},
+	{
+		CompletionText: 'ntprint.exe',
+		ListItemText: 'ntprint.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\ntprint.exe'
+	},
+	{
+		CompletionText: 'nu.exe',
+		ListItemText: 'nu.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\nu\\bin\\nu.exe'
+	},
+	{
+		CompletionText: 'nu_plugin_gstat.exe',
+		ListItemText: 'nu_plugin_gstat.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\nu\\bin\\nu_plugin_gstat.exe'
+	},
+	{
+		CompletionText: 'nu_plugin_inc.exe',
+		ListItemText: 'nu_plugin_inc.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\nu\\bin\\nu_plugin_inc.exe'
+	},
+	{
+		CompletionText: 'nu_plugin_query.exe',
+		ListItemText: 'nu_plugin_query.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\nu\\bin\\nu_plugin_query.exe'
+	},
+	{
+		CompletionText: 'nv',
+		ListItemText: 'nv',
+		ResultType: 2,
+		ToolTip: 'New-Variable'
+	},
+	{
+		CompletionText: 'NvContainerRecovery.bat',
+		ListItemText: 'NvContainerRecovery.bat',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\NvContainerRecovery.bat'
+	},
+	{
+		CompletionText: 'nvdebugdump.exe',
+		ListItemText: 'nvdebugdump.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\nvdebugdump.exe'
+	},
+	{
+		CompletionText: 'nvdlisrwrapper.exe',
+		ListItemText: 'nvdlisrwrapper.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\NVIDIA Corporation\\NVIDIA NvDLISR\\nvdlisrwrapper.exe'
+	},
+	{
+		CompletionText: 'nvidia-smi.exe',
+		ListItemText: 'nvidia-smi.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\nvidia-smi.exe'
+	},
+	{
+		CompletionText: 'nvs.cmd',
+		ListItemText: 'nvs.cmd',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\nvs\\nvs.cmd'
+	},
+	{
+		CompletionText: 'nvs.ps1',
+		ListItemText: 'nvs.ps1',
+		ResultType: 2,
+		ToolTip: 'nvs.ps1 \\r\\n'
+	},
+	{
+		CompletionText: 'nvspinfo.exe',
+		ListItemText: 'nvspinfo.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\nvspinfo.exe'
+	},
+	{
+		CompletionText: 'nwsn',
+		ListItemText: 'nwsn',
+		ResultType: 2,
+		ToolTip: 'nwsn'
+	},
+	{
+		CompletionText: 'O:',
+		ListItemText: 'O:',
+		ResultType: 2,
+		ToolTip: '\\r\\nO: \\r\\n'
+	},
+	{
+		CompletionText: 'odbcad32.exe',
+		ListItemText: 'odbcad32.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\odbcad32.exe'
+	},
+	{
+		CompletionText: 'odbcconf.exe',
+		ListItemText: 'odbcconf.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\odbcconf.exe'
+	},
+	{
+		CompletionText: 'ofdeploy.exe',
+		ListItemText: 'ofdeploy.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\ofdeploy.exe'
+	},
+	{
+		CompletionText: 'ogv',
+		ListItemText: 'ogv',
+		ResultType: 2,
+		ToolTip: 'Out-GridView'
+	},
+	{
+		CompletionText: 'oh',
+		ListItemText: 'oh',
+		ResultType: 2,
+		ToolTip: 'Out-Host'
+	},
+	{
+		CompletionText: 'oh-my-posh.exe',
+		ListItemText: 'oh-my-posh.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Programs\\oh-my-posh\\bin\\oh-my-posh.exe'
+	},
+	{
+		CompletionText: 'olk.exe',
+		ListItemText: 'olk.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\olk.exe'
+	},
+	{
+		CompletionText: 'omadmclient.exe',
+		ListItemText: 'omadmclient.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\omadmclient.exe'
+	},
+	{
+		CompletionText: 'omadmprc.exe',
+		ListItemText: 'omadmprc.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\omadmprc.exe'
+	},
+	{
+		CompletionText: 'OneDriveSetup.exe',
+		ListItemText: 'OneDriveSetup.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\OneDriveSetup.exe'
+	},
+	{
+		CompletionText: 'OOBE-Maintenance.exe',
+		ListItemText: 'OOBE-Maintenance.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\OOBE-Maintenance.exe'
+	},
+	{
+		CompletionText: 'Open-AzSurveyLink',
+		ListItemText: 'Open-AzSurveyLink',
+		ResultType: 2,
+		ToolTip: 'Open-AzSurveyLink\\r\\n'
+	},
+	{
+		CompletionText: 'Open-NetGPO',
+		ListItemText: 'Open-NetGPO',
+		ResultType: 2,
+		ToolTip: '\\r\\nOpen-NetGPO \\r\\n'
+	},
+	{
+		CompletionText: 'openfiles.exe',
+		ListItemText: 'openfiles.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\openfiles.exe'
+	},
+	{
+		CompletionText: 'OpenWith.exe',
+		ListItemText: 'OpenWith.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\OpenWith.exe'
+	},
+	{
+		CompletionText: 'Optimize-AppProvisionedPackages',
+		ListItemText: 'Optimize-AppProvisionedPackages',
+		ResultType: 2,
+		ToolTip: 'Optimize-AppProvisionedPackages'
+	},
+	{
+		CompletionText: 'Optimize-AppxProvisionedPackages',
+		ListItemText: 'Optimize-AppxProvisionedPackages',
+		ResultType: 2,
+		ToolTip: 'Optimize-AppxProvisionedPackages\\r\\n'
+	},
+	{
+		CompletionText: 'Optimize-ProvisionedAppPackages',
+		ListItemText: 'Optimize-ProvisionedAppPackages',
+		ResultType: 2,
+		ToolTip: 'Optimize-ProvisionedAppPackages'
+	},
+	{
+		CompletionText: 'Optimize-ProvisionedAppxPackages',
+		ListItemText: 'Optimize-ProvisionedAppxPackages',
+		ResultType: 2,
+		ToolTip: 'Optimize-ProvisionedAppxPackages'
+	},
+	{
+		CompletionText: 'Optimize-StoragePool',
+		ListItemText: 'Optimize-StoragePool',
+		ResultType: 2,
+		ToolTip: '\\r\\nOptimize-StoragePool \\r\\n'
+	},
+	{
+		CompletionText: 'Optimize-VHD',
+		ListItemText: 'Optimize-VHD',
+		ResultType: 2,
+		ToolTip: 'Optimize-VHD\\r\\n'
+	},
+	{
+		CompletionText: 'Optimize-VHDSet',
+		ListItemText: 'Optimize-VHDSet',
+		ResultType: 2,
+		ToolTip: 'Optimize-VHDSet\\r\\n'
+	},
+	{
+		CompletionText: 'Optimize-Volume',
+		ListItemText: 'Optimize-Volume',
+		ResultType: 2,
+		ToolTip: '\\r\\nOptimize-Volume \\r\\n'
+	},
+	{
+		CompletionText: 'Optimize-WindowsImage',
+		ListItemText: 'Optimize-WindowsImage',
+		ResultType: 2,
+		ToolTip: 'Optimize-WindowsImage\\r\\n'
+	},
+	{
+		CompletionText: 'OptionalFeatures.exe',
+		ListItemText: 'OptionalFeatures.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\OptionalFeatures.exe'
+	},
+	{
+		CompletionText: 'orbd.exe',
+		ListItemText: 'orbd.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\orbd.exe'
+	},
+	{
+		CompletionText: 'osk.exe',
+		ListItemText: 'osk.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\osk.exe'
+	},
+	{
+		CompletionText: 'oss',
+		ListItemText: 'oss',
+		ResultType: 2,
+		ToolTip: '\\r\\noss [[-Width] <int>] [[-InputObject] <psobject>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Out-Default',
+		ListItemText: 'Out-Default',
+		ResultType: 2,
+		ToolTip: '\\r\\nOut-Default [-Transcript] [-InputObject <psobject>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Out-File',
+		ListItemText: 'Out-File',
+		ResultType: 2,
+		ToolTip: '\\r\\nOut-File [-FilePath] <string> [[-Encoding] <Encoding>] [-Append] [-Force] [-NoClobber] [-Width <int>] [-NoNewline] [-InputObject <psobject>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nOut-File [[-Encoding] <Encoding>] -LiteralPath <string> [-Append] [-Force] [-NoClobber] [-Width <int>] [-NoNewline] [-InputObject <psobject>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Out-GridView',
+		ListItemText: 'Out-GridView',
+		ResultType: 2,
+		ToolTip: '\\r\\nOut-GridView [-InputObject <psobject>] [-Title <string>] [-PassThru] [<CommonParameters>]\\r\\n\\r\\nOut-GridView [-InputObject <psobject>] [-Title <string>] [-Wait] [<CommonParameters>]\\r\\n\\r\\nOut-GridView [-InputObject <psobject>] [-Title <string>] [-OutputMode <OutputModeOption>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Out-Host',
+		ListItemText: 'Out-Host',
+		ResultType: 2,
+		ToolTip: '\\r\\nOut-Host [-Paging] [-InputObject <psobject>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Out-Null',
+		ListItemText: 'Out-Null',
+		ResultType: 2,
+		ToolTip: '\\r\\nOut-Null [-InputObject <psobject>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Out-Printer',
+		ListItemText: 'Out-Printer',
+		ResultType: 2,
+		ToolTip: '\\r\\nOut-Printer [[-Name] <string>] [-InputObject <psobject>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Out-String',
+		ListItemText: 'Out-String',
+		ResultType: 2,
+		ToolTip: '\\r\\nOut-String [-Width <int>] [-NoNewline] [-InputObject <psobject>] [<CommonParameters>]\\r\\n\\r\\nOut-String [-Stream] [-Width <int>] [-InputObject <psobject>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'P:',
+		ListItemText: 'P:',
+		ResultType: 2,
+		ToolTip: '\\r\\nP: \\r\\n'
+	},
+	{
+		CompletionText: 'pacjsworker.exe',
+		ListItemText: 'pacjsworker.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\pacjsworker.exe'
+	},
+	{
+		CompletionText: 'pack200.exe',
+		ListItemText: 'pack200.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\pack200.exe'
+	},
+	{
+		CompletionText: 'PackagedCWALauncher.exe',
+		ListItemText: 'PackagedCWALauncher.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\PackagedCWALauncher.exe'
+	},
+	{
+		CompletionText: 'PackageInspector.exe',
+		ListItemText: 'PackageInspector.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\PackageInspector.exe'
+	},
+	{
+		CompletionText: 'PasswordOnWakeSettingFlyout.exe',
+		ListItemText: 'PasswordOnWakeSettingFlyout.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\PasswordOnWakeSettingFlyout.exe'
+	},
+	{
+		CompletionText: 'PATHPING.EXE',
+		ListItemText: 'PATHPING.EXE',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\PATHPING.EXE'
+	},
+	{
+		CompletionText: 'Pause',
+		ListItemText: 'Pause',
+		ResultType: 2,
+		ToolTip: '\\r\\nPause \\r\\n'
+	},
+	{
+		CompletionText: 'pbcfg',
+		ListItemText: 'pbcfg',
+		ResultType: 2,
+		ToolTip: 'pbcfg'
+	},
+	{
+		CompletionText: 'pbres',
+		ListItemText: 'pbres',
+		ResultType: 2,
+		ToolTip: 'pbres'
+	},
+	{
+		CompletionText: 'pbrush.exe',
+		ListItemText: 'pbrush.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\pbrush.exe'
+	},
+	{
+		CompletionText: 'pcalua.exe',
+		ListItemText: 'pcalua.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\pcalua.exe'
+	},
+	{
+		CompletionText: 'pcaui.exe',
+		ListItemText: 'pcaui.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\pcaui.exe'
+	},
+	{
+		CompletionText: 'pcwrun.exe',
+		ListItemText: 'pcwrun.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\pcwrun.exe'
+	},
+	{
+		CompletionText: 'perfmon.exe',
+		ListItemText: 'perfmon.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\perfmon.exe'
+	},
+	{
+		CompletionText: 'perfmon.msc',
+		ListItemText: 'perfmon.msc',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\perfmon.msc'
+	},
+	{
+		CompletionText: 'pfn',
+		ListItemText: 'pfn',
+		ResultType: 2,
+		ToolTip: 'pfn'
+	},
+	{
+		CompletionText: 'phoneactivate.exe',
+		ListItemText: 'phoneactivate.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\phoneactivate.exe'
+	},
+	{
+		CompletionText: 'PickerHost.exe',
+		ListItemText: 'PickerHost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\PickerHost.exe'
+	},
+	{
+		CompletionText: 'PinEnrollmentBroker.exe',
+		ListItemText: 'PinEnrollmentBroker.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\PinEnrollmentBroker.exe'
+	},
+	{
+		CompletionText: 'pinentry-basic.exe',
+		ListItemText: 'pinentry-basic.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files (x86)\\Gpg4win\\..\\GnuPG\\bin\\pinentry-basic.exe'
+	},
+	{
+		CompletionText: 'PING.EXE',
+		ListItemText: 'PING.EXE',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\PING.EXE'
+	},
+	{
+		CompletionText: 'pip.exe',
+		ListItemText: 'pip.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Python312\\Scripts\\pip.exe'
+	},
+	{
+		CompletionText: 'pip3.10.exe',
+		ListItemText: 'pip3.10.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Programs\\Python\\Python310\\Scripts\\pip3.10.exe'
+	},
+	{
+		CompletionText: 'pip3.12.exe',
+		ListItemText: 'pip3.12.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Python312\\Scripts\\pip3.12.exe'
+	},
+	{
+		CompletionText: 'pip3.9.exe',
+		ListItemText: 'pip3.9.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\pip3.9.exe'
+	},
+	{
+		CompletionText: 'pip3.exe',
+		ListItemText: 'pip3.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Python312\\Scripts\\pip3.exe'
+	},
+	{
+		CompletionText: 'PkgMgr.exe',
+		ListItemText: 'PkgMgr.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\PkgMgr.exe'
+	},
+	{
+		CompletionText: 'PktMon.exe',
+		ListItemText: 'PktMon.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\PktMon.exe'
+	},
+	{
+		CompletionText: 'plasrv.exe',
+		ListItemText: 'plasrv.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\plasrv.exe'
+	},
+	{
+		CompletionText: 'PnPUnattend.exe',
+		ListItemText: 'PnPUnattend.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\PnPUnattend.exe'
+	},
+	{
+		CompletionText: 'pnputil.exe',
+		ListItemText: 'pnputil.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\pnputil.exe'
+	},
+	{
+		CompletionText: 'poetry.exe',
+		ListItemText: 'poetry.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Roaming\\Python\\Scripts\\poetry.exe'
+	},
+	{
+		CompletionText: 'policytool.exe',
+		ListItemText: 'policytool.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\policytool.exe'
+	},
+	{
+		CompletionText: 'Pop-Location',
+		ListItemText: 'Pop-Location',
+		ResultType: 2,
+		ToolTip: '\\r\\nPop-Location [-PassThru] [-StackName <string>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'popd',
+		ListItemText: 'popd',
+		ResultType: 2,
+		ToolTip: 'Pop-Location'
+	},
+	{
+		CompletionText: 'poqexec.exe',
+		ListItemText: 'poqexec.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\poqexec.exe'
+	},
+	{
+		CompletionText: 'pospaymentsworker.exe',
+		ListItemText: 'pospaymentsworker.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\pospaymentsworker.exe'
+	},
+	{
+		CompletionText: 'powercfg.cpl',
+		ListItemText: 'powercfg.cpl',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\powercfg.cpl'
+	},
+	{
+		CompletionText: 'powercfg.exe',
+		ListItemText: 'powercfg.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\powercfg.exe'
+	},
+	{
+		CompletionText: 'powershell.exe',
+		ListItemText: 'powershell.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\powershell.exe'
+	},
+	{
+		CompletionText: 'powershell_ise.exe',
+		ListItemText: 'powershell_ise.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\powershell_ise.exe'
+	},
+	{
+		CompletionText: 'PresentationHost.exe',
+		ListItemText: 'PresentationHost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\PresentationHost.exe'
+	},
+	{
+		CompletionText: 'PresentationSettings.exe',
+		ListItemText: 'PresentationSettings.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\PresentationSettings.exe'
+	},
+	{
+		CompletionText: 'prevhost.exe',
+		ListItemText: 'prevhost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\prevhost.exe'
+	},
+	{
+		CompletionText: 'print.exe',
+		ListItemText: 'print.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\print.exe'
+	},
+	{
+		CompletionText: 'PrintBrmUi.exe',
+		ListItemText: 'PrintBrmUi.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\PrintBrmUi.exe'
+	},
+	{
+		CompletionText: 'printfilterpipelinesvc.exe',
+		ListItemText: 'printfilterpipelinesvc.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\printfilterpipelinesvc.exe'
+	},
+	{
+		CompletionText: 'PrintIsolationHost.exe',
+		ListItemText: 'PrintIsolationHost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\PrintIsolationHost.exe'
+	},
+	{
+		CompletionText: 'printmanagement.msc',
+		ListItemText: 'printmanagement.msc',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\printmanagement.msc'
+	},
+	{
+		CompletionText: 'printui.exe',
+		ListItemText: 'printui.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\printui.exe'
+	},
+	{
+		CompletionText: 'prompt',
+		ListItemText: 'prompt',
+		ResultType: 2,
+		ToolTip: '\\r\\nprompt \\r\\n'
+	},
+	{
+		CompletionText: 'proquota.exe',
+		ListItemText: 'proquota.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\proquota.exe'
+	},
+	{
+		CompletionText: 'Protect-CmsMessage',
+		ListItemText: 'Protect-CmsMessage',
+		ResultType: 2,
+		ToolTip: 'Protect-CmsMessage\\r\\n'
+	},
+	{
+		CompletionText: 'provlaunch.exe',
+		ListItemText: 'provlaunch.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\provlaunch.exe'
+	},
+	{
+		CompletionText: 'provtool.exe',
+		ListItemText: 'provtool.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\provtool.exe'
+	},
+	{
+		CompletionText: 'ProximityUxHost.exe',
+		ListItemText: 'ProximityUxHost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\ProximityUxHost.exe'
+	},
+	{
+		CompletionText: 'prproc.exe',
+		ListItemText: 'prproc.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\prproc.exe'
+	},
+	{
+		CompletionText: 'ps',
+		ListItemText: 'ps',
+		ResultType: 2,
+		ToolTip: 'Get-Process'
+	},
+	{
+		CompletionText: 'PSConsoleHostReadLine',
+		ListItemText: 'PSConsoleHostReadLine',
+		ResultType: 2,
+		ToolTip: '\\r\\nPSConsoleHostReadLine \\r\\n'
+	},
+	{
+		CompletionText: 'psr.exe',
+		ListItemText: 'psr.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\psr.exe'
+	},
+	{
+		CompletionText: 'Publish-AzApiManagementTenantGitConfiguration',
+		ListItemText: 'Publish-AzApiManagementTenantGitConfiguration',
+		ResultType: 2,
+		ToolTip: 'Publish-AzApiManagementTenantGitConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Publish-AzAutomationRunbook',
+		ListItemText: 'Publish-AzAutomationRunbook',
+		ResultType: 2,
+		ToolTip: 'Publish-AzAutomationRunbook\\r\\n'
+	},
+	{
+		CompletionText: 'Publish-AzBicepModule',
+		ListItemText: 'Publish-AzBicepModule',
+		ResultType: 2,
+		ToolTip: 'Publish-AzBicepModule\\r\\n'
+	},
+	{
+		CompletionText: 'Publish-AzVMDscConfiguration',
+		ListItemText: 'Publish-AzVMDscConfiguration',
+		ResultType: 2,
+		ToolTip: 'Publish-AzVMDscConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Publish-AzWebApp',
+		ListItemText: 'Publish-AzWebApp',
+		ResultType: 2,
+		ToolTip: 'Publish-AzWebApp\\r\\n'
+	},
+	{
+		CompletionText: 'Publish-BCFileContent',
+		ListItemText: 'Publish-BCFileContent',
+		ResultType: 2,
+		ToolTip: '\\r\\nPublish-BCFileContent \\r\\n'
+	},
+	{
+		CompletionText: 'Publish-BCWebContent',
+		ListItemText: 'Publish-BCWebContent',
+		ResultType: 2,
+		ToolTip: '\\r\\nPublish-BCWebContent \\r\\n'
+	},
+	{
+		CompletionText: 'Publish-DscConfiguration',
+		ListItemText: 'Publish-DscConfiguration',
+		ResultType: 2,
+		ToolTip: 'Publish-DscConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Publish-Module',
+		ListItemText: 'Publish-Module',
+		ResultType: 2,
+		ToolTip: '\\r\\nPublish-Module \\r\\n'
+	},
+	{
+		CompletionText: 'Publish-PSResource',
+		ListItemText: 'Publish-PSResource',
+		ResultType: 2,
+		ToolTip: 'Publish-PSResource\\r\\n'
+	},
+	{
+		CompletionText: 'Publish-Script',
+		ListItemText: 'Publish-Script',
+		ResultType: 2,
+		ToolTip: '\\r\\nPublish-Script \\r\\n'
+	},
+	{
+		CompletionText: 'pumo',
+		ListItemText: 'pumo',
+		ResultType: 2,
+		ToolTip: 'pumo'
+	},
+	{
+		CompletionText: 'Push-Location',
+		ListItemText: 'Push-Location',
+		ResultType: 2,
+		ToolTip: '\\r\\nPush-Location [[-Path] <string>] [-PassThru] [-StackName <string>] [<CommonParameters>]\\r\\n\\r\\nPush-Location [-LiteralPath <string>] [-PassThru] [-StackName <string>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'pushd',
+		ListItemText: 'pushd',
+		ResultType: 2,
+		ToolTip: 'Push-Location'
+	},
+	{
+		CompletionText: 'pwd',
+		ListItemText: 'pwd',
+		ResultType: 2,
+		ToolTip: 'Get-Location'
+	},
+	{
+		CompletionText: 'pwlauncher.exe',
+		ListItemText: 'pwlauncher.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\pwlauncher.exe'
+	},
+	{
+		CompletionText: 'pwsh-preview.exe',
+		ListItemText: 'pwsh-preview.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\pwsh-preview.exe'
+	},
+	{
+		CompletionText: 'pwsh.exe',
+		ListItemText: 'pwsh.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\WindowsApps\\Microsoft.PowerShell_7.4.2.0_x64__8wekyb3d8bbwe\\pwsh.exe'
+	},
+	{
+		CompletionText: 'py.exe',
+		ListItemText: 'py.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\py.exe'
+	},
+	{
+		CompletionText: 'pygmentize.exe',
+		ListItemText: 'pygmentize.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Programs\\Python\\Python310\\Scripts\\pygmentize.exe'
+	},
+	{
+		CompletionText: 'python.exe',
+		ListItemText: 'python.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Python312\\python.exe'
+	},
+	{
+		CompletionText: 'python3.12.exe',
+		ListItemText: 'python3.12.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\ProgramData\\chocolatey\\bin\\python3.12.exe'
+	},
+	{
+		CompletionText: 'python3.9.exe',
+		ListItemText: 'python3.9.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\python3.9.exe'
+	},
+	{
+		CompletionText: 'python3.exe',
+		ListItemText: 'python3.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\python3.exe'
+	},
+	{
+		CompletionText: 'pythonw.exe',
+		ListItemText: 'pythonw.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Python312\\pythonw.exe'
+	},
+	{
+		CompletionText: 'pythonw3.9.exe',
+		ListItemText: 'pythonw3.9.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\pythonw3.9.exe'
+	},
+	{
+		CompletionText: 'pythonw3.exe',
+		ListItemText: 'pythonw3.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\pythonw3.exe'
+	},
+	{
+		CompletionText: 'pyw.exe',
+		ListItemText: 'pyw.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\pyw.exe'
+	},
+	{
+		CompletionText: 'Q:',
+		ListItemText: 'Q:',
+		ResultType: 2,
+		ToolTip: '\\r\\nQ: \\r\\n'
+	},
+	{
+		CompletionText: 'qappsrv.exe',
+		ListItemText: 'qappsrv.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\qappsrv.exe'
+	},
+	{
+		CompletionText: 'qprocess.exe',
+		ListItemText: 'qprocess.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\qprocess.exe'
+	},
+	{
+		CompletionText: 'query.exe',
+		ListItemText: 'query.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\query.exe'
+	},
+	{
+		CompletionText: 'quser.exe',
+		ListItemText: 'quser.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\quser.exe'
+	},
+	{
+		CompletionText: 'qwinsta.exe',
+		ListItemText: 'qwinsta.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\qwinsta.exe'
+	},
+	{
+		CompletionText: 'r',
+		ListItemText: 'r',
+		ResultType: 2,
+		ToolTip: 'Invoke-History'
+	},
+	{
+		CompletionText: 'R:',
+		ListItemText: 'R:',
+		ResultType: 2,
+		ToolTip: '\\r\\nR: \\r\\n'
+	},
+	{
+		CompletionText: 'rasautou.exe',
+		ListItemText: 'rasautou.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\rasautou.exe'
+	},
+	{
+		CompletionText: 'rasdial.exe',
+		ListItemText: 'rasdial.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\rasdial.exe'
+	},
+	{
+		CompletionText: 'raserver.exe',
+		ListItemText: 'raserver.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\raserver.exe'
+	},
+	{
+		CompletionText: 'rasphone.exe',
+		ListItemText: 'rasphone.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\rasphone.exe'
+	},
+	{
+		CompletionText: 'rbp',
+		ListItemText: 'rbp',
+		ResultType: 2,
+		ToolTip: 'Remove-PSBreakpoint'
+	},
+	{
+		CompletionText: 'rcie',
+		ListItemText: 'rcie',
+		ResultType: 2,
+		ToolTip: 'rcie'
+	},
+	{
+		CompletionText: 'rcim',
+		ListItemText: 'rcim',
+		ResultType: 2,
+		ToolTip: 'rcim'
+	},
+	{
+		CompletionText: 'rcjb',
+		ListItemText: 'rcjb',
+		ResultType: 2,
+		ToolTip: 'Receive-Job'
+	},
+	{
+		CompletionText: 'rcms',
+		ListItemText: 'rcms',
+		ResultType: 2,
+		ToolTip: 'rcms'
+	},
+	{
+		CompletionText: 'rcsn',
+		ListItemText: 'rcsn',
+		ResultType: 2,
+		ToolTip: 'Receive-PSSession'
+	},
+	{
+		CompletionText: 'rd',
+		ListItemText: 'rd',
+		ResultType: 2,
+		ToolTip: 'Remove-Item'
+	},
+	{
+		CompletionText: 'rdpclip.exe',
+		ListItemText: 'rdpclip.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\rdpclip.exe'
+	},
+	{
+		CompletionText: 'rdpinit.exe',
+		ListItemText: 'rdpinit.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\rdpinit.exe'
+	},
+	{
+		CompletionText: 'rdpinput.exe',
+		ListItemText: 'rdpinput.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\rdpinput.exe'
+	},
+	{
+		CompletionText: 'RdpSa.exe',
+		ListItemText: 'RdpSa.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\RdpSa.exe'
+	},
+	{
+		CompletionText: 'RdpSaProxy.exe',
+		ListItemText: 'RdpSaProxy.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\RdpSaProxy.exe'
+	},
+	{
+		CompletionText: 'RdpSaUacHelper.exe',
+		ListItemText: 'RdpSaUacHelper.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\RdpSaUacHelper.exe'
+	},
+	{
+		CompletionText: 'rdpshell.exe',
+		ListItemText: 'rdpshell.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\rdpshell.exe'
+	},
+	{
+		CompletionText: 'rdpsign.exe',
+		ListItemText: 'rdpsign.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\rdpsign.exe'
+	},
+	{
+		CompletionText: 'rdr',
+		ListItemText: 'rdr',
+		ResultType: 2,
+		ToolTip: 'Remove-PSDrive'
+	},
+	{
+		CompletionText: 'rdrleakdiag.exe',
+		ListItemText: 'rdrleakdiag.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\rdrleakdiag.exe'
+	},
+	{
+		CompletionText: 'Reactivate-AzBatchTask',
+		ListItemText: 'Reactivate-AzBatchTask',
+		ResultType: 2,
+		ToolTip: 'Reactivate-AzBatchTask'
+	},
+	{
+		CompletionText: 'Read-Host',
+		ListItemText: 'Read-Host',
+		ResultType: 2,
+		ToolTip: '\\r\\nRead-Host [[-Prompt] <Object>] [-MaskInput] [<CommonParameters>]\\r\\n\\r\\nRead-Host [[-Prompt] <Object>] [-AsSecureString] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Read-PrinterNfcTag',
+		ListItemText: 'Read-PrinterNfcTag',
+		ResultType: 2,
+		ToolTip: '\\r\\nRead-PrinterNfcTag \\r\\n'
+	},
+	{
+		CompletionText: 'readCloudDataSettings.exe',
+		ListItemText: 'readCloudDataSettings.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\readCloudDataSettings.exe'
+	},
+	{
+		CompletionText: 'ReAgentc.exe',
+		ListItemText: 'ReAgentc.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\ReAgentc.exe'
+	},
+	{
+		CompletionText: 'recdisc.exe',
+		ListItemText: 'recdisc.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\recdisc.exe'
+	},
+	{
+		CompletionText: 'Receive-DtcDiagnosticTransaction',
+		ListItemText: 'Receive-DtcDiagnosticTransaction',
+		ResultType: 2,
+		ToolTip: 'Receive-DtcDiagnosticTransaction\\r\\n'
+	},
+	{
+		CompletionText: 'Receive-Job',
+		ListItemText: 'Receive-Job',
+		ResultType: 2,
+		ToolTip: '\\r\\nReceive-Job [-Job] <Job[]> [[-Location] <string[]>] [-Keep] [-NoRecurse] [-Force] [-Wait] [-AutoRemoveJob] [-WriteEvents] [-WriteJobInResults] [<CommonParameters>]\\r\\n\\r\\nReceive-Job [-Job] <Job[]> [[-ComputerName] <string[]>] [-Keep] [-NoRecurse] [-Force] [-Wait] [-AutoRemoveJob] [-WriteEvents] [-WriteJobInResults] [<CommonParameters>]\\r\\n\\r\\nReceive-Job [-Job] <Job[]> [[-Session] <PSSession[]>] [-Keep] [-NoRecurse] [-Force] [-Wait] [-AutoRemoveJob] [-WriteEvents] [-WriteJobInResults] [<CommonParameters>]\\r\\n\\r\\nReceive-Job [-Name] <string[]> [-Keep] [-NoRecurse] [-Force] [-Wait] [-AutoRemoveJob] [-WriteEvents] [-WriteJobInResults] [<CommonParameters>]\\r\\n\\r\\nReceive-Job [-InstanceId] <guid[]> [-Keep] [-NoRecurse] [-Force] [-Wait] [-AutoRemoveJob] [-WriteEvents] [-WriteJobInResults] [<CommonParameters>]\\r\\n\\r\\nReceive-Job [-Id] <int[]> [-Keep] [-NoRecurse] [-Force] [-Wait] [-AutoRemoveJob] [-WriteEvents] [-WriteJobInResults] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Receive-PSSession',
+		ListItemText: 'Receive-PSSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nReceive-PSSession [-Session] <PSSession> [-OutTarget <OutTarget>] [-JobName <string>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nReceive-PSSession [-Id] <int> [-OutTarget <OutTarget>] [-JobName <string>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nReceive-PSSession [-ComputerName] <string> -Name <string> [-ApplicationName <string>] [-ConfigurationName <string>] [-OutTarget <OutTarget>] [-JobName <string>] [-Credential <pscredential>] [-Authentication <AuthenticationMechanism>] [-CertificateThumbprint <string>] [-Port <int>] [-UseSSL] [-SessionOption <PSSessionOption>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nReceive-PSSession [-ComputerName] <string> -InstanceId <guid> [-ApplicationName <string>] [-ConfigurationName <string>] [-OutTarget <OutTarget>] [-JobName <string>] [-Credential <pscredential>] [-Authentication <AuthenticationMechanism>] [-CertificateThumbprint <string>] [-Port <int>] [-UseSSL] [-SessionOption <PSSessionOption>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nReceive-PSSession [-ConnectionUri] <uri> -Name <string> [-ConfigurationName <string>] [-AllowRedirection] [-OutTarget <OutTarget>] [-JobName <string>] [-Credential <pscredential>] [-Authentication <AuthenticationMechanism>] [-CertificateThumbprint <string>] [-SessionOption <PSSessionOption>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nReceive-PSSession [-ConnectionUri] <uri> -InstanceId <guid> [-ConfigurationName <string>] [-AllowRedirection] [-OutTarget <OutTarget>] [-JobName <string>] [-Credential <pscredential>] [-Authentication <AuthenticationMechanism>] [-CertificateThumbprint <string>] [-SessionOption <PSSessionOption>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nReceive-PSSession [-InstanceId] <guid> [-OutTarget <OutTarget>] [-JobName <string>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nReceive-PSSession [-Name] <string> [-OutTarget <OutTarget>] [-JobName <string>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'recover.exe',
+		ListItemText: 'recover.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\recover.exe'
+	},
+	{
+		CompletionText: 'RecoveryDrive.exe',
+		ListItemText: 'RecoveryDrive.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\RecoveryDrive.exe'
+	},
+	{
+		CompletionText: 'RefreshEnv.cmd',
+		ListItemText: 'RefreshEnv.cmd',
+		ResultType: 2,
+		ToolTip: 'C:\\ProgramData\\chocolatey\\bin\\RefreshEnv.cmd'
+	},
+	{
+		CompletionText: 'refsutil.exe',
+		ListItemText: 'refsutil.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\refsutil.exe'
+	},
+	{
+		CompletionText: 'reg.exe',
+		ListItemText: 'reg.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\reg.exe'
+	},
+	{
+		CompletionText: 'regedit.exe',
+		ListItemText: 'regedit.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\regedit.exe'
+	},
+	{
+		CompletionText: 'regedt32.exe',
+		ListItemText: 'regedt32.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\regedt32.exe'
+	},
+	{
+		CompletionText: 'regini.exe',
+		ListItemText: 'regini.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\regini.exe'
+	},
+	{
+		CompletionText: 'Register-ArgumentCompleter',
+		ListItemText: 'Register-ArgumentCompleter',
+		ResultType: 2,
+		ToolTip: '\\r\\nRegister-ArgumentCompleter -CommandName <string[]> -ScriptBlock <scriptblock> [-Native] [<CommonParameters>]\\r\\n\\r\\nRegister-ArgumentCompleter -ParameterName <string> -ScriptBlock <scriptblock> [-CommandName <string[]>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Register-AzAutomationDscNode',
+		ListItemText: 'Register-AzAutomationDscNode',
+		ResultType: 2,
+		ToolTip: 'Register-AzAutomationDscNode\\r\\n'
+	},
+	{
+		CompletionText: 'Register-AzAutomationScheduledRunbook',
+		ListItemText: 'Register-AzAutomationScheduledRunbook',
+		ResultType: 2,
+		ToolTip: 'Register-AzAutomationScheduledRunbook\\r\\n'
+	},
+	{
+		CompletionText: 'Register-AzMigrateProjectTool',
+		ListItemText: 'Register-AzMigrateProjectTool',
+		ResultType: 2,
+		ToolTip: '\\r\\nRegister-AzMigrateProjectTool \\r\\n'
+	},
+	{
+		CompletionText: 'Register-AzModule',
+		ListItemText: 'Register-AzModule',
+		ResultType: 2,
+		ToolTip: 'Register-AzModule\\r\\n'
+	},
+	{
+		CompletionText: 'Register-AzProviderFeature',
+		ListItemText: 'Register-AzProviderFeature',
+		ResultType: 2,
+		ToolTip: 'Register-AzProviderFeature\\r\\n'
+	},
+	{
+		CompletionText: 'Register-AzProviderPreviewFeature',
+		ListItemText: 'Register-AzProviderPreviewFeature',
+		ResultType: 2,
+		ToolTip: 'Register-AzProviderPreviewFeature\\r\\n'
+	},
+	{
+		CompletionText: 'Register-AzRecoveryServicesBackupContainer',
+		ListItemText: 'Register-AzRecoveryServicesBackupContainer',
+		ResultType: 2,
+		ToolTip: 'Register-AzRecoveryServicesBackupContainer\\r\\n'
+	},
+	{
+		CompletionText: 'Register-AzResourceProvider',
+		ListItemText: 'Register-AzResourceProvider',
+		ResultType: 2,
+		ToolTip: 'Register-AzResourceProvider\\r\\n'
+	},
+	{
+		CompletionText: 'Register-AzStackHCI',
+		ListItemText: 'Register-AzStackHCI',
+		ResultType: 2,
+		ToolTip: '\\r\\nRegister-AzStackHCI \\r\\n'
+	},
+	{
+		CompletionText: 'Register-AzStaticWebAppUserProvidedFunctionApp',
+		ListItemText: 'Register-AzStaticWebAppUserProvidedFunctionApp',
+		ResultType: 2,
+		ToolTip: '\\r\\nRegister-AzStaticWebAppUserProvidedFunctionApp \\r\\n'
+	},
+	{
+		CompletionText: 'Register-AzStorageSyncServer',
+		ListItemText: 'Register-AzStorageSyncServer',
+		ResultType: 2,
+		ToolTip: 'Register-AzStorageSyncServer\\r\\n'
+	},
+	{
+		CompletionText: 'Register-AzWvdApplicationGroup',
+		ListItemText: 'Register-AzWvdApplicationGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nRegister-AzWvdApplicationGroup \\r\\n'
+	},
+	{
+		CompletionText: 'Register-CimIndicationEvent',
+		ListItemText: 'Register-CimIndicationEvent',
+		ResultType: 2,
+		ToolTip: 'Register-CimIndicationEvent\\r\\n'
+	},
+	{
+		CompletionText: 'Register-CimProvider.exe',
+		ListItemText: 'Register-CimProvider.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\Register-CimProvider.exe'
+	},
+	{
+		CompletionText: 'Register-ClusteredScheduledTask',
+		ListItemText: 'Register-ClusteredScheduledTask',
+		ResultType: 2,
+		ToolTip: '\\r\\nRegister-ClusteredScheduledTask \\r\\n'
+	},
+	{
+		CompletionText: 'Register-DnsClient',
+		ListItemText: 'Register-DnsClient',
+		ResultType: 2,
+		ToolTip: '\\r\\nRegister-DnsClient \\r\\n'
+	},
+	{
+		CompletionText: 'Register-EngineEvent',
+		ListItemText: 'Register-EngineEvent',
+		ResultType: 2,
+		ToolTip: '\\r\\nRegister-EngineEvent [-SourceIdentifier] <string> [[-Action] <scriptblock>] [-MessageData <psobject>] [-SupportEvent] [-Forward] [-MaxTriggerCount <int>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Register-IscsiSession',
+		ListItemText: 'Register-IscsiSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nRegister-IscsiSession \\r\\n'
+	},
+	{
+		CompletionText: 'Register-ObjectEvent',
+		ListItemText: 'Register-ObjectEvent',
+		ResultType: 2,
+		ToolTip: '\\r\\nRegister-ObjectEvent [-InputObject] <psobject> [-EventName] <string> [[-SourceIdentifier] <string>] [[-Action] <scriptblock>] [-MessageData <psobject>] [-SupportEvent] [-Forward] [-MaxTriggerCount <int>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Register-PackageSource',
+		ListItemText: 'Register-PackageSource',
+		ResultType: 2,
+		ToolTip: 'Register-PackageSource\\r\\n'
+	},
+	{
+		CompletionText: 'Register-PSRepository',
+		ListItemText: 'Register-PSRepository',
+		ResultType: 2,
+		ToolTip: '\\r\\nRegister-PSRepository \\r\\n'
+	},
+	{
+		CompletionText: 'Register-PSResourceRepository',
+		ListItemText: 'Register-PSResourceRepository',
+		ResultType: 2,
+		ToolTip: 'Register-PSResourceRepository\\r\\n'
+	},
+	{
+		CompletionText: 'Register-PSSessionConfiguration',
+		ListItemText: 'Register-PSSessionConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nRegister-PSSessionConfiguration [-Name] <string> [-ProcessorArchitecture <string>] [-ApplicationBase <string>] [-RunAsCredential <pscredential>] [-ThreadApartmentState <ApartmentState>] [-ThreadOptions <PSThreadOptions>] [-AccessMode <PSSessionConfigurationAccessMode>] [-UseSharedProcess] [-StartupScript <string>] [-MaximumReceivedDataSizePerCommandMB <double>] [-MaximumReceivedObjectSizeMB <double>] [-SecurityDescriptorSddl <string>] [-ShowSecurityDescriptorUI] [-Force] [-NoServiceRestart] [-PSVersion <version>] [-SessionTypeOption <PSSessionTypeOption>] [-TransportOption <PSTransportOption>] [-ModulesToImport <Object[]>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nRegister-PSSessionConfiguration [-Name] <string> [-AssemblyName] <string> [-ConfigurationTypeName] <string> [-ProcessorArchitecture <string>] [-ApplicationBase <string>] [-RunAsCredential <pscredential>] [-ThreadApartmentState <ApartmentState>] [-ThreadOptions <PSThreadOptions>] [-AccessMode <PSSessionConfigurationAccessMode>] [-UseSharedProcess] [-StartupScript <string>] [-MaximumReceivedDataSizePerCommandMB <double>] [-MaximumReceivedObjectSizeMB <double>] [-SecurityDescriptorSddl <string>] [-ShowSecurityDescriptorUI] [-Force] [-NoServiceRestart] [-PSVersion <version>] [-SessionTypeOption <PSSessionTypeOption>] [-TransportOption <PSTransportOption>] [-ModulesToImport <Object[]>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nRegister-PSSessionConfiguration [-Name] <string> -Path <string> [-ProcessorArchitecture <string>] [-RunAsCredential <pscredential>] [-ThreadApartmentState <ApartmentState>] [-ThreadOptions <PSThreadOptions>] [-AccessMode <PSSessionConfigurationAccessMode>] [-UseSharedProcess] [-StartupScript <string>] [-MaximumReceivedDataSizePerCommandMB <double>] [-MaximumReceivedObjectSizeMB <double>] [-SecurityDescriptorSddl <string>] [-ShowSecurityDescriptorUI] [-Force] [-NoServiceRestart] [-TransportOption <PSTransportOption>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Register-ScheduledJob',
+		ListItemText: 'Register-ScheduledJob',
+		ResultType: 2,
+		ToolTip: 'Register-ScheduledJob\\r\\n'
+	},
+	{
+		CompletionText: 'Register-ScheduledTask',
+		ListItemText: 'Register-ScheduledTask',
+		ResultType: 2,
+		ToolTip: '\\r\\nRegister-ScheduledTask \\r\\n'
+	},
+	{
+		CompletionText: 'Register-StorageSubsystem',
+		ListItemText: 'Register-StorageSubsystem',
+		ResultType: 2,
+		ToolTip: '\\r\\nRegister-StorageSubsystem \\r\\n'
+	},
+	{
+		CompletionText: 'RegisterManifest.ps1',
+		ListItemText: 'RegisterManifest.ps1',
+		ResultType: 2,
+		ToolTip: 'RegisterManifest.ps1 [[-Path] <string>] [-Unregister] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'RegisterMicrosoftUpdate.ps1',
+		ListItemText: 'RegisterMicrosoftUpdate.ps1',
+		ResultType: 2,
+		ToolTip: 'RegisterMicrosoftUpdate.ps1 [[-TestHook] <Object>]\\r\\n'
+	},
+	{
+		CompletionText: 'regsvr32.exe',
+		ListItemText: 'regsvr32.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\regsvr32.exe'
+	},
+	{
+		CompletionText: 'rekeywiz.exe',
+		ListItemText: 'rekeywiz.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\rekeywiz.exe'
+	},
+	{
+		CompletionText: 'relog.exe',
+		ListItemText: 'relog.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\relog.exe'
+	},
+	{
+		CompletionText: 'RelPost.exe',
+		ListItemText: 'RelPost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\RelPost.exe'
+	},
+	{
+		CompletionText: 'RemoteAppLifetimeManager.exe',
+		ListItemText: 'RemoteAppLifetimeManager.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\RemoteAppLifetimeManager.exe'
+	},
+	{
+		CompletionText: 'RemotePosWorker.exe',
+		ListItemText: 'RemotePosWorker.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\RemotePosWorker.exe'
+	},
+	{
+		CompletionText: 'Remove-AdlAnalyticsAccount',
+		ListItemText: 'Remove-AdlAnalyticsAccount',
+		ResultType: 2,
+		ToolTip: 'Remove-AdlAnalyticsAccount'
+	},
+	{
+		CompletionText: 'Remove-AdlAnalyticsComputePolicy',
+		ListItemText: 'Remove-AdlAnalyticsComputePolicy',
+		ResultType: 2,
+		ToolTip: 'Remove-AdlAnalyticsComputePolicy'
+	},
+	{
+		CompletionText: 'Remove-AdlAnalyticsDataSource',
+		ListItemText: 'Remove-AdlAnalyticsDataSource',
+		ResultType: 2,
+		ToolTip: 'Remove-AdlAnalyticsDataSource'
+	},
+	{
+		CompletionText: 'Remove-AdlAnalyticsFirewallRule',
+		ListItemText: 'Remove-AdlAnalyticsFirewallRule',
+		ResultType: 2,
+		ToolTip: 'Remove-AdlAnalyticsFirewallRule'
+	},
+	{
+		CompletionText: 'Remove-AdlCatalogCredential',
+		ListItemText: 'Remove-AdlCatalogCredential',
+		ResultType: 2,
+		ToolTip: 'Remove-AdlCatalogCredential'
+	},
+	{
+		CompletionText: 'Remove-AdlCatalogItemAclEntry',
+		ListItemText: 'Remove-AdlCatalogItemAclEntry',
+		ResultType: 2,
+		ToolTip: 'Remove-AdlCatalogItemAclEntry'
+	},
+	{
+		CompletionText: 'Remove-AdlCatalogSecret',
+		ListItemText: 'Remove-AdlCatalogSecret',
+		ResultType: 2,
+		ToolTip: 'Remove-AdlCatalogSecret'
+	},
+	{
+		CompletionText: 'Remove-AdlStore',
+		ListItemText: 'Remove-AdlStore',
+		ResultType: 2,
+		ToolTip: 'Remove-AdlStore'
+	},
+	{
+		CompletionText: 'Remove-AdlStoreFirewallRule',
+		ListItemText: 'Remove-AdlStoreFirewallRule',
+		ResultType: 2,
+		ToolTip: 'Remove-AdlStoreFirewallRule'
+	},
+	{
+		CompletionText: 'Remove-AdlStoreItem',
+		ListItemText: 'Remove-AdlStoreItem',
+		ResultType: 2,
+		ToolTip: 'Remove-AdlStoreItem'
+	},
+	{
+		CompletionText: 'Remove-AdlStoreItemAcl',
+		ListItemText: 'Remove-AdlStoreItemAcl',
+		ResultType: 2,
+		ToolTip: 'Remove-AdlStoreItemAcl'
+	},
+	{
+		CompletionText: 'Remove-AdlStoreItemAclEntry',
+		ListItemText: 'Remove-AdlStoreItemAclEntry',
+		ResultType: 2,
+		ToolTip: 'Remove-AdlStoreItemAclEntry'
+	},
+	{
+		CompletionText: 'Remove-AdlStoreTrustedIdProvider',
+		ListItemText: 'Remove-AdlStoreTrustedIdProvider',
+		ResultType: 2,
+		ToolTip: 'Remove-AdlStoreTrustedIdProvider'
+	},
+	{
+		CompletionText: 'Remove-AdlStoreVirtualNetworkRule',
+		ListItemText: 'Remove-AdlStoreVirtualNetworkRule',
+		ResultType: 2,
+		ToolTip: 'Remove-AdlStoreVirtualNetworkRule'
+	},
+	{
+		CompletionText: 'Remove-Alias',
+		ListItemText: 'Remove-Alias',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-Alias [-Name] <string[]> [-Scope <string>] [-Force] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AppPackage',
+		ListItemText: 'Remove-AppPackage',
+		ResultType: 2,
+		ToolTip: 'Remove-AppPackage'
+	},
+	{
+		CompletionText: 'Remove-AppPackageAutoUpdateSettings',
+		ListItemText: 'Remove-AppPackageAutoUpdateSettings',
+		ResultType: 2,
+		ToolTip: 'Remove-AppPackageAutoUpdateSettings'
+	},
+	{
+		CompletionText: 'Remove-AppPackageVolume',
+		ListItemText: 'Remove-AppPackageVolume',
+		ResultType: 2,
+		ToolTip: 'Remove-AppPackageVolume'
+	},
+	{
+		CompletionText: 'Remove-AppProvisionedPackage',
+		ListItemText: 'Remove-AppProvisionedPackage',
+		ResultType: 2,
+		ToolTip: 'Remove-AppProvisionedPackage'
+	},
+	{
+		CompletionText: 'Remove-AppProvisionedSharedPackageContainer',
+		ListItemText: 'Remove-AppProvisionedSharedPackageContainer',
+		ResultType: 2,
+		ToolTip: 'Remove-AppProvisionedSharedPackageContainer\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AppSharedPackageContainer',
+		ListItemText: 'Remove-AppSharedPackageContainer',
+		ResultType: 2,
+		ToolTip: 'Remove-AppSharedPackageContainer\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AppxPackage',
+		ListItemText: 'Remove-AppxPackage',
+		ResultType: 2,
+		ToolTip: 'Remove-AppxPackage\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AppxPackageAutoUpdateSettings',
+		ListItemText: 'Remove-AppxPackageAutoUpdateSettings',
+		ResultType: 2,
+		ToolTip: 'Remove-AppxPackageAutoUpdateSettings\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AppxProvisionedPackage',
+		ListItemText: 'Remove-AppxProvisionedPackage',
+		ResultType: 2,
+		ToolTip: 'Remove-AppxProvisionedPackage\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AppxVolume',
+		ListItemText: 'Remove-AppxVolume',
+		ResultType: 2,
+		ToolTip: 'Remove-AppxVolume\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-ASRFabric',
+		ListItemText: 'Remove-ASRFabric',
+		ResultType: 2,
+		ToolTip: 'Remove-ASRFabric'
+	},
+	{
+		CompletionText: 'Remove-ASRNetworkMapping',
+		ListItemText: 'Remove-ASRNetworkMapping',
+		ResultType: 2,
+		ToolTip: 'Remove-ASRNetworkMapping'
+	},
+	{
+		CompletionText: 'Remove-ASRPolicy',
+		ListItemText: 'Remove-ASRPolicy',
+		ResultType: 2,
+		ToolTip: 'Remove-ASRPolicy'
+	},
+	{
+		CompletionText: 'Remove-ASRProtectionContainerMapping',
+		ListItemText: 'Remove-ASRProtectionContainerMapping',
+		ResultType: 2,
+		ToolTip: 'Remove-ASRProtectionContainerMapping'
+	},
+	{
+		CompletionText: 'Remove-ASRRecoveryPlan',
+		ListItemText: 'Remove-ASRRecoveryPlan',
+		ResultType: 2,
+		ToolTip: 'Remove-ASRRecoveryPlan'
+	},
+	{
+		CompletionText: 'Remove-ASRReplicationProtectedItem',
+		ListItemText: 'Remove-ASRReplicationProtectedItem',
+		ResultType: 2,
+		ToolTip: 'Remove-ASRReplicationProtectedItem'
+	},
+	{
+		CompletionText: 'Remove-ASRReplicationProtectedItemDisk',
+		ListItemText: 'Remove-ASRReplicationProtectedItemDisk',
+		ResultType: 2,
+		ToolTip: 'Remove-ASRReplicationProtectedItemDisk'
+	},
+	{
+		CompletionText: 'Remove-ASRRP',
+		ListItemText: 'Remove-ASRRP',
+		ResultType: 2,
+		ToolTip: 'Remove-ASRRP'
+	},
+	{
+		CompletionText: 'Remove-ASRServicesProvider',
+		ListItemText: 'Remove-ASRServicesProvider',
+		ResultType: 2,
+		ToolTip: 'Remove-ASRServicesProvider'
+	},
+	{
+		CompletionText: 'Remove-ASRStorageClassificationMapping',
+		ListItemText: 'Remove-ASRStorageClassificationMapping',
+		ResultType: 2,
+		ToolTip: 'Remove-ASRStorageClassificationMapping'
+	},
+	{
+		CompletionText: 'Remove-ASRvCenter',
+		ListItemText: 'Remove-ASRvCenter',
+		ResultType: 2,
+		ToolTip: 'Remove-ASRvCenter'
+	},
+	{
+		CompletionText: 'Remove-AutologgerConfig',
+		ListItemText: 'Remove-AutologgerConfig',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AutologgerConfig \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAccount',
+		ListItemText: 'Remove-AzAccount',
+		ResultType: 2,
+		ToolTip: 'Remove-AzAccount'
+	},
+	{
+		CompletionText: 'Remove-AzActionGroup',
+		ListItemText: 'Remove-AzActionGroup',
+		ResultType: 2,
+		ToolTip: 'Remove-AzActionGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzActivityLogAlert',
+		ListItemText: 'Remove-AzActivityLogAlert',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzActivityLogAlert \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzADAppCredential',
+		ListItemText: 'Remove-AzADAppCredential',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzADAppCredential \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzADAppFederatedCredential',
+		ListItemText: 'Remove-AzADAppFederatedCredential',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzADAppFederatedCredential \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzADApplication',
+		ListItemText: 'Remove-AzADApplication',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzADApplication \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzADAppPermission',
+		ListItemText: 'Remove-AzADAppPermission',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzADAppPermission \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzADGroup',
+		ListItemText: 'Remove-AzADGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzADGroup \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzADGroupMember',
+		ListItemText: 'Remove-AzADGroupMember',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzADGroupMember \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzADServicePrincipal',
+		ListItemText: 'Remove-AzADServicePrincipal',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzADServicePrincipal \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzADServicePrincipalCredential',
+		ListItemText: 'Remove-AzADServicePrincipalCredential',
+		ResultType: 2,
+		ToolTip: 'Remove-AzADServicePrincipalCredential'
+	},
+	{
+		CompletionText: 'Remove-AzADSpCredential',
+		ListItemText: 'Remove-AzADSpCredential',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzADSpCredential \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzADUser',
+		ListItemText: 'Remove-AzADUser',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzADUser \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAksCluster',
+		ListItemText: 'Remove-AzAksCluster',
+		ResultType: 2,
+		ToolTip: 'Remove-AzAksCluster\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAksMaintenanceConfiguration',
+		ListItemText: 'Remove-AzAksMaintenanceConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzAksMaintenanceConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAksNodePool',
+		ListItemText: 'Remove-AzAksNodePool',
+		ResultType: 2,
+		ToolTip: 'Remove-AzAksNodePool\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAksSnapshot',
+		ListItemText: 'Remove-AzAksSnapshot',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzAksSnapshot \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAlertRule',
+		ListItemText: 'Remove-AzAlertRule',
+		ResultType: 2,
+		ToolTip: 'Remove-AzAlertRule\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAlertsSuppressionRule',
+		ListItemText: 'Remove-AzAlertsSuppressionRule',
+		ResultType: 2,
+		ToolTip: 'Remove-AzAlertsSuppressionRule\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAnalysisServicesServer',
+		ListItemText: 'Remove-AzAnalysisServicesServer',
+		ResultType: 2,
+		ToolTip: 'Remove-AzAnalysisServicesServer\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApiManagement',
+		ListItemText: 'Remove-AzApiManagement',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApiManagement\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApiManagementApi',
+		ListItemText: 'Remove-AzApiManagementApi',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApiManagementApi\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApiManagementApiFromGateway',
+		ListItemText: 'Remove-AzApiManagementApiFromGateway',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApiManagementApiFromGateway\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApiManagementApiFromProduct',
+		ListItemText: 'Remove-AzApiManagementApiFromProduct',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApiManagementApiFromProduct\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApiManagementApiRelease',
+		ListItemText: 'Remove-AzApiManagementApiRelease',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApiManagementApiRelease\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApiManagementApiRevision',
+		ListItemText: 'Remove-AzApiManagementApiRevision',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApiManagementApiRevision\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApiManagementApiSchema',
+		ListItemText: 'Remove-AzApiManagementApiSchema',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApiManagementApiSchema\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApiManagementApiVersionSet',
+		ListItemText: 'Remove-AzApiManagementApiVersionSet',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApiManagementApiVersionSet\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApiManagementAuthorizationServer',
+		ListItemText: 'Remove-AzApiManagementAuthorizationServer',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApiManagementAuthorizationServer\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApiManagementBackend',
+		ListItemText: 'Remove-AzApiManagementBackend',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApiManagementBackend\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApiManagementCache',
+		ListItemText: 'Remove-AzApiManagementCache',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApiManagementCache\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApiManagementCertificate',
+		ListItemText: 'Remove-AzApiManagementCertificate',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApiManagementCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApiManagementDiagnostic',
+		ListItemText: 'Remove-AzApiManagementDiagnostic',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApiManagementDiagnostic\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApiManagementGateway',
+		ListItemText: 'Remove-AzApiManagementGateway',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApiManagementGateway\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApiManagementGatewayHostnameConfiguration',
+		ListItemText: 'Remove-AzApiManagementGatewayHostnameConfiguration',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApiManagementGatewayHostnameConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApiManagementGroup',
+		ListItemText: 'Remove-AzApiManagementGroup',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApiManagementGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApiManagementIdentityProvider',
+		ListItemText: 'Remove-AzApiManagementIdentityProvider',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApiManagementIdentityProvider\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApiManagementLogger',
+		ListItemText: 'Remove-AzApiManagementLogger',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApiManagementLogger\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApiManagementNamedValue',
+		ListItemText: 'Remove-AzApiManagementNamedValue',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApiManagementNamedValue\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApiManagementOpenIdConnectProvider',
+		ListItemText: 'Remove-AzApiManagementOpenIdConnectProvider',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApiManagementOpenIdConnectProvider\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApiManagementOperation',
+		ListItemText: 'Remove-AzApiManagementOperation',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApiManagementOperation\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApiManagementPolicy',
+		ListItemText: 'Remove-AzApiManagementPolicy',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApiManagementPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApiManagementProduct',
+		ListItemText: 'Remove-AzApiManagementProduct',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApiManagementProduct\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApiManagementProductFromGroup',
+		ListItemText: 'Remove-AzApiManagementProductFromGroup',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApiManagementProductFromGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApiManagementRegion',
+		ListItemText: 'Remove-AzApiManagementRegion',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApiManagementRegion\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApiManagementSubscription',
+		ListItemText: 'Remove-AzApiManagementSubscription',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApiManagementSubscription\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApiManagementUser',
+		ListItemText: 'Remove-AzApiManagementUser',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApiManagementUser\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApiManagementUserFromGroup',
+		ListItemText: 'Remove-AzApiManagementUserFromGroup',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApiManagementUserFromGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAppConfigurationStore',
+		ListItemText: 'Remove-AzAppConfigurationStore',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzAppConfigurationStore \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationGateway',
+		ListItemText: 'Remove-AzApplicationGateway',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApplicationGateway\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationGatewayAuthenticationCertificate',
+		ListItemText: 'Remove-AzApplicationGatewayAuthenticationCertificate',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApplicationGatewayAuthenticationCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationGatewayAutoscaleConfiguration',
+		ListItemText: 'Remove-AzApplicationGatewayAutoscaleConfiguration',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApplicationGatewayAutoscaleConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationGatewayBackendAddressPool',
+		ListItemText: 'Remove-AzApplicationGatewayBackendAddressPool',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApplicationGatewayBackendAddressPool\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationGatewayBackendHttpSetting',
+		ListItemText: 'Remove-AzApplicationGatewayBackendHttpSetting',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApplicationGatewayBackendHttpSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationGatewayBackendHttpSettings',
+		ListItemText: 'Remove-AzApplicationGatewayBackendHttpSettings',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApplicationGatewayBackendHttpSettings'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationGatewayBackendSetting',
+		ListItemText: 'Remove-AzApplicationGatewayBackendSetting',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApplicationGatewayBackendSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationGatewayClientAuthConfiguration',
+		ListItemText: 'Remove-AzApplicationGatewayClientAuthConfiguration',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApplicationGatewayClientAuthConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationGatewayConnectionDraining',
+		ListItemText: 'Remove-AzApplicationGatewayConnectionDraining',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApplicationGatewayConnectionDraining\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationGatewayCustomError',
+		ListItemText: 'Remove-AzApplicationGatewayCustomError',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApplicationGatewayCustomError\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationGatewayFirewallPolicy',
+		ListItemText: 'Remove-AzApplicationGatewayFirewallPolicy',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApplicationGatewayFirewallPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationGatewayFrontendIPConfig',
+		ListItemText: 'Remove-AzApplicationGatewayFrontendIPConfig',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApplicationGatewayFrontendIPConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationGatewayFrontendPort',
+		ListItemText: 'Remove-AzApplicationGatewayFrontendPort',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApplicationGatewayFrontendPort\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationGatewayHttpListener',
+		ListItemText: 'Remove-AzApplicationGatewayHttpListener',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApplicationGatewayHttpListener\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationGatewayHttpListenerCustomError',
+		ListItemText: 'Remove-AzApplicationGatewayHttpListenerCustomError',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApplicationGatewayHttpListenerCustomError\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationGatewayIdentity',
+		ListItemText: 'Remove-AzApplicationGatewayIdentity',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApplicationGatewayIdentity\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationGatewayIPConfiguration',
+		ListItemText: 'Remove-AzApplicationGatewayIPConfiguration',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApplicationGatewayIPConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationGatewayListener',
+		ListItemText: 'Remove-AzApplicationGatewayListener',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApplicationGatewayListener\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationGatewayPrivateLinkConfiguration',
+		ListItemText: 'Remove-AzApplicationGatewayPrivateLinkConfiguration',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApplicationGatewayPrivateLinkConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationGatewayProbeConfig',
+		ListItemText: 'Remove-AzApplicationGatewayProbeConfig',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApplicationGatewayProbeConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationGatewayRedirectConfiguration',
+		ListItemText: 'Remove-AzApplicationGatewayRedirectConfiguration',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApplicationGatewayRedirectConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationGatewayRequestRoutingRule',
+		ListItemText: 'Remove-AzApplicationGatewayRequestRoutingRule',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApplicationGatewayRequestRoutingRule\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationGatewayRewriteRuleSet',
+		ListItemText: 'Remove-AzApplicationGatewayRewriteRuleSet',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApplicationGatewayRewriteRuleSet\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationGatewayRoutingRule',
+		ListItemText: 'Remove-AzApplicationGatewayRoutingRule',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApplicationGatewayRoutingRule\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationGatewaySslCertificate',
+		ListItemText: 'Remove-AzApplicationGatewaySslCertificate',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApplicationGatewaySslCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationGatewaySslPolicy',
+		ListItemText: 'Remove-AzApplicationGatewaySslPolicy',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApplicationGatewaySslPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationGatewaySslProfile',
+		ListItemText: 'Remove-AzApplicationGatewaySslProfile',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApplicationGatewaySslProfile\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationGatewaySslProfilePolicy',
+		ListItemText: 'Remove-AzApplicationGatewaySslProfilePolicy',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApplicationGatewaySslProfilePolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationGatewayTrustedClientCertificate',
+		ListItemText: 'Remove-AzApplicationGatewayTrustedClientCertificate',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApplicationGatewayTrustedClientCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationGatewayTrustedRootCertificate',
+		ListItemText: 'Remove-AzApplicationGatewayTrustedRootCertificate',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApplicationGatewayTrustedRootCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationGatewayUrlPathMapConfig',
+		ListItemText: 'Remove-AzApplicationGatewayUrlPathMapConfig',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApplicationGatewayUrlPathMapConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationInsights',
+		ListItemText: 'Remove-AzApplicationInsights',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzApplicationInsights \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationInsightsApiKey',
+		ListItemText: 'Remove-AzApplicationInsightsApiKey',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzApplicationInsightsApiKey \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationInsightsContinuousExport',
+		ListItemText: 'Remove-AzApplicationInsightsContinuousExport',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzApplicationInsightsContinuousExport \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationInsightsLinkedStorageAccount',
+		ListItemText: 'Remove-AzApplicationInsightsLinkedStorageAccount',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzApplicationInsightsLinkedStorageAccount \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationInsightsMyWorkbook',
+		ListItemText: 'Remove-AzApplicationInsightsMyWorkbook',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzApplicationInsightsMyWorkbook \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationInsightsWebTest',
+		ListItemText: 'Remove-AzApplicationInsightsWebTest',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzApplicationInsightsWebTest \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationInsightsWorkbook',
+		ListItemText: 'Remove-AzApplicationInsightsWorkbook',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzApplicationInsightsWorkbook \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationInsightsWorkbookTemplate',
+		ListItemText: 'Remove-AzApplicationInsightsWorkbookTemplate',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzApplicationInsightsWorkbookTemplate \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzApplicationSecurityGroup',
+		ListItemText: 'Remove-AzApplicationSecurityGroup',
+		ResultType: 2,
+		ToolTip: 'Remove-AzApplicationSecurityGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAppServiceEnvironment',
+		ListItemText: 'Remove-AzAppServiceEnvironment',
+		ResultType: 2,
+		ToolTip: 'Remove-AzAppServiceEnvironment\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAppServicePlan',
+		ListItemText: 'Remove-AzAppServicePlan',
+		ResultType: 2,
+		ToolTip: 'Remove-AzAppServicePlan\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAs',
+		ListItemText: 'Remove-AzAs',
+		ResultType: 2,
+		ToolTip: 'Remove-AzAs'
+	},
+	{
+		CompletionText: 'Remove-AzAttestationPolicySigner',
+		ListItemText: 'Remove-AzAttestationPolicySigner',
+		ResultType: 2,
+		ToolTip: 'Remove-AzAttestationPolicySigner\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAttestationProvider',
+		ListItemText: 'Remove-AzAttestationProvider',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzAttestationProvider \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAutomanageConfigProfile',
+		ListItemText: 'Remove-AzAutomanageConfigProfile',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzAutomanageConfigProfile \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAutomanageConfigProfileAssignment',
+		ListItemText: 'Remove-AzAutomanageConfigProfileAssignment',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzAutomanageConfigProfileAssignment \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAutomanageConfigProfileHciAssignment',
+		ListItemText: 'Remove-AzAutomanageConfigProfileHciAssignment',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzAutomanageConfigProfileHciAssignment \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAutomanageConfigProfileHcrpAssignment',
+		ListItemText: 'Remove-AzAutomanageConfigProfileHcrpAssignment',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzAutomanageConfigProfileHcrpAssignment \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAutomationAccount',
+		ListItemText: 'Remove-AzAutomationAccount',
+		ResultType: 2,
+		ToolTip: 'Remove-AzAutomationAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAutomationCertificate',
+		ListItemText: 'Remove-AzAutomationCertificate',
+		ResultType: 2,
+		ToolTip: 'Remove-AzAutomationCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAutomationConnection',
+		ListItemText: 'Remove-AzAutomationConnection',
+		ResultType: 2,
+		ToolTip: 'Remove-AzAutomationConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAutomationConnectionType',
+		ListItemText: 'Remove-AzAutomationConnectionType',
+		ResultType: 2,
+		ToolTip: 'Remove-AzAutomationConnectionType\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAutomationCredential',
+		ListItemText: 'Remove-AzAutomationCredential',
+		ResultType: 2,
+		ToolTip: 'Remove-AzAutomationCredential\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAutomationDscConfiguration',
+		ListItemText: 'Remove-AzAutomationDscConfiguration',
+		ResultType: 2,
+		ToolTip: 'Remove-AzAutomationDscConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAutomationDscNodeConfiguration',
+		ListItemText: 'Remove-AzAutomationDscNodeConfiguration',
+		ResultType: 2,
+		ToolTip: 'Remove-AzAutomationDscNodeConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAutomationHybridRunbookWorker',
+		ListItemText: 'Remove-AzAutomationHybridRunbookWorker',
+		ResultType: 2,
+		ToolTip: 'Remove-AzAutomationHybridRunbookWorker\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAutomationHybridRunbookWorkerGroup',
+		ListItemText: 'Remove-AzAutomationHybridRunbookWorkerGroup',
+		ResultType: 2,
+		ToolTip: 'Remove-AzAutomationHybridRunbookWorkerGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAutomationHybridWorkerGroup',
+		ListItemText: 'Remove-AzAutomationHybridWorkerGroup',
+		ResultType: 2,
+		ToolTip: 'Remove-AzAutomationHybridWorkerGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAutomationModule',
+		ListItemText: 'Remove-AzAutomationModule',
+		ResultType: 2,
+		ToolTip: 'Remove-AzAutomationModule\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAutomationPython3Package',
+		ListItemText: 'Remove-AzAutomationPython3Package',
+		ResultType: 2,
+		ToolTip: 'Remove-AzAutomationPython3Package\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAutomationRunbook',
+		ListItemText: 'Remove-AzAutomationRunbook',
+		ResultType: 2,
+		ToolTip: 'Remove-AzAutomationRunbook\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAutomationSchedule',
+		ListItemText: 'Remove-AzAutomationSchedule',
+		ResultType: 2,
+		ToolTip: 'Remove-AzAutomationSchedule\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAutomationSoftwareUpdateConfiguration',
+		ListItemText: 'Remove-AzAutomationSoftwareUpdateConfiguration',
+		ResultType: 2,
+		ToolTip: 'Remove-AzAutomationSoftwareUpdateConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAutomationSourceControl',
+		ListItemText: 'Remove-AzAutomationSourceControl',
+		ResultType: 2,
+		ToolTip: 'Remove-AzAutomationSourceControl\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAutomationVariable',
+		ListItemText: 'Remove-AzAutomationVariable',
+		ResultType: 2,
+		ToolTip: 'Remove-AzAutomationVariable\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAutomationWebhook',
+		ListItemText: 'Remove-AzAutomationWebhook',
+		ResultType: 2,
+		ToolTip: 'Remove-AzAutomationWebhook\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAutoscaleSetting',
+		ListItemText: 'Remove-AzAutoscaleSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzAutoscaleSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAvailabilityGroupListener',
+		ListItemText: 'Remove-AzAvailabilityGroupListener',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzAvailabilityGroupListener \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzAvailabilitySet',
+		ListItemText: 'Remove-AzAvailabilitySet',
+		ResultType: 2,
+		ToolTip: 'Remove-AzAvailabilitySet\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzBastion',
+		ListItemText: 'Remove-AzBastion',
+		ResultType: 2,
+		ToolTip: 'Remove-AzBastion\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzBatchAccount',
+		ListItemText: 'Remove-AzBatchAccount',
+		ResultType: 2,
+		ToolTip: 'Remove-AzBatchAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzBatchApplication',
+		ListItemText: 'Remove-AzBatchApplication',
+		ResultType: 2,
+		ToolTip: 'Remove-AzBatchApplication\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzBatchApplicationPackage',
+		ListItemText: 'Remove-AzBatchApplicationPackage',
+		ResultType: 2,
+		ToolTip: 'Remove-AzBatchApplicationPackage\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzBatchCertificate',
+		ListItemText: 'Remove-AzBatchCertificate',
+		ResultType: 2,
+		ToolTip: 'Remove-AzBatchCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzBatchComputeNode',
+		ListItemText: 'Remove-AzBatchComputeNode',
+		ResultType: 2,
+		ToolTip: 'Remove-AzBatchComputeNode\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzBatchComputeNodeUser',
+		ListItemText: 'Remove-AzBatchComputeNodeUser',
+		ResultType: 2,
+		ToolTip: 'Remove-AzBatchComputeNodeUser\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzBatchJob',
+		ListItemText: 'Remove-AzBatchJob',
+		ResultType: 2,
+		ToolTip: 'Remove-AzBatchJob\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzBatchJobSchedule',
+		ListItemText: 'Remove-AzBatchJobSchedule',
+		ResultType: 2,
+		ToolTip: 'Remove-AzBatchJobSchedule\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzBatchNodeFile',
+		ListItemText: 'Remove-AzBatchNodeFile',
+		ResultType: 2,
+		ToolTip: 'Remove-AzBatchNodeFile\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzBatchPool',
+		ListItemText: 'Remove-AzBatchPool',
+		ResultType: 2,
+		ToolTip: 'Remove-AzBatchPool\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzBatchTask',
+		ListItemText: 'Remove-AzBatchTask',
+		ResultType: 2,
+		ToolTip: 'Remove-AzBatchTask\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzCapacityReservation',
+		ListItemText: 'Remove-AzCapacityReservation',
+		ResultType: 2,
+		ToolTip: 'Remove-AzCapacityReservation\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzCapacityReservationGroup',
+		ListItemText: 'Remove-AzCapacityReservationGroup',
+		ResultType: 2,
+		ToolTip: 'Remove-AzCapacityReservationGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzCdnCustomDomain',
+		ListItemText: 'Remove-AzCdnCustomDomain',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzCdnCustomDomain \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzCdnEndpoint',
+		ListItemText: 'Remove-AzCdnEndpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzCdnEndpoint \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzCdnOrigin',
+		ListItemText: 'Remove-AzCdnOrigin',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzCdnOrigin \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzCdnOriginGroup',
+		ListItemText: 'Remove-AzCdnOriginGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzCdnOriginGroup \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzCdnProfile',
+		ListItemText: 'Remove-AzCdnProfile',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzCdnProfile \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzCloudService',
+		ListItemText: 'Remove-AzCloudService',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzCloudService \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzCloudServiceRoleInstance',
+		ListItemText: 'Remove-AzCloudServiceRoleInstance',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzCloudServiceRoleInstance \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzCognitiveServicesAccount',
+		ListItemText: 'Remove-AzCognitiveServicesAccount',
+		ResultType: 2,
+		ToolTip: 'Remove-AzCognitiveServicesAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzCognitiveServicesAccountCommitmentPlan',
+		ListItemText: 'Remove-AzCognitiveServicesAccountCommitmentPlan',
+		ResultType: 2,
+		ToolTip: 'Remove-AzCognitiveServicesAccountCommitmentPlan\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzCognitiveServicesAccountDeployment',
+		ListItemText: 'Remove-AzCognitiveServicesAccountDeployment',
+		ResultType: 2,
+		ToolTip: 'Remove-AzCognitiveServicesAccountDeployment\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzCognitiveServicesAccountNetworkRule',
+		ListItemText: 'Remove-AzCognitiveServicesAccountNetworkRule',
+		ResultType: 2,
+		ToolTip: 'Remove-AzCognitiveServicesAccountNetworkRule\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzCognitiveServicesCommitmentPlan',
+		ListItemText: 'Remove-AzCognitiveServicesCommitmentPlan',
+		ResultType: 2,
+		ToolTip: 'Remove-AzCognitiveServicesCommitmentPlan\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzCognitiveServicesCommitmentPlanAssociation',
+		ListItemText: 'Remove-AzCognitiveServicesCommitmentPlanAssociation',
+		ResultType: 2,
+		ToolTip: 'Remove-AzCognitiveServicesCommitmentPlanAssociation\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzConfidentialLedger',
+		ListItemText: 'Remove-AzConfidentialLedger',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzConfidentialLedger \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzConfigurationAssignment',
+		ListItemText: 'Remove-AzConfigurationAssignment',
+		ResultType: 2,
+		ToolTip: 'Remove-AzConfigurationAssignment\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzConsumptionBudget',
+		ListItemText: 'Remove-AzConsumptionBudget',
+		ResultType: 2,
+		ToolTip: 'Remove-AzConsumptionBudget\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzContainerGroup',
+		ListItemText: 'Remove-AzContainerGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzContainerGroup \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzContainerInstanceSubnetServiceAssociationLink',
+		ListItemText: 'Remove-AzContainerInstanceSubnetServiceAssociationLink',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzContainerInstanceSubnetServiceAssociationLink \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzContainerRegistry',
+		ListItemText: 'Remove-AzContainerRegistry',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzContainerRegistry \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzContainerRegistryAgentPool',
+		ListItemText: 'Remove-AzContainerRegistryAgentPool',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzContainerRegistryAgentPool \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzContainerRegistryExportPipeline',
+		ListItemText: 'Remove-AzContainerRegistryExportPipeline',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzContainerRegistryExportPipeline \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzContainerRegistryImportPipeline',
+		ListItemText: 'Remove-AzContainerRegistryImportPipeline',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzContainerRegistryImportPipeline \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzContainerRegistryManifest',
+		ListItemText: 'Remove-AzContainerRegistryManifest',
+		ResultType: 2,
+		ToolTip: 'Remove-AzContainerRegistryManifest\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzContainerRegistryReplication',
+		ListItemText: 'Remove-AzContainerRegistryReplication',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzContainerRegistryReplication \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzContainerRegistryRepository',
+		ListItemText: 'Remove-AzContainerRegistryRepository',
+		ResultType: 2,
+		ToolTip: 'Remove-AzContainerRegistryRepository\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzContainerRegistryScopeMap',
+		ListItemText: 'Remove-AzContainerRegistryScopeMap',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzContainerRegistryScopeMap \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzContainerRegistryTag',
+		ListItemText: 'Remove-AzContainerRegistryTag',
+		ResultType: 2,
+		ToolTip: 'Remove-AzContainerRegistryTag\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzContainerRegistryToken',
+		ListItemText: 'Remove-AzContainerRegistryToken',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzContainerRegistryToken \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzContainerRegistryWebhook',
+		ListItemText: 'Remove-AzContainerRegistryWebhook',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzContainerRegistryWebhook \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzContext',
+		ListItemText: 'Remove-AzContext',
+		ResultType: 2,
+		ToolTip: 'Remove-AzContext\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzCosmosDBAccount',
+		ListItemText: 'Remove-AzCosmosDBAccount',
+		ResultType: 2,
+		ToolTip: 'Remove-AzCosmosDBAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzCosmosDBCassandraKeyspace',
+		ListItemText: 'Remove-AzCosmosDBCassandraKeyspace',
+		ResultType: 2,
+		ToolTip: 'Remove-AzCosmosDBCassandraKeyspace\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzCosmosDBCassandraTable',
+		ListItemText: 'Remove-AzCosmosDBCassandraTable',
+		ResultType: 2,
+		ToolTip: 'Remove-AzCosmosDBCassandraTable\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzCosmosDBGremlinDatabase',
+		ListItemText: 'Remove-AzCosmosDBGremlinDatabase',
+		ResultType: 2,
+		ToolTip: 'Remove-AzCosmosDBGremlinDatabase\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzCosmosDBGremlinGraph',
+		ListItemText: 'Remove-AzCosmosDBGremlinGraph',
+		ResultType: 2,
+		ToolTip: 'Remove-AzCosmosDBGremlinGraph\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzCosmosDBMongoDBCollection',
+		ListItemText: 'Remove-AzCosmosDBMongoDBCollection',
+		ResultType: 2,
+		ToolTip: 'Remove-AzCosmosDBMongoDBCollection\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzCosmosDBMongoDBDatabase',
+		ListItemText: 'Remove-AzCosmosDBMongoDBDatabase',
+		ResultType: 2,
+		ToolTip: 'Remove-AzCosmosDBMongoDBDatabase\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzCosmosDBMongoDBRoleDefinition',
+		ListItemText: 'Remove-AzCosmosDBMongoDBRoleDefinition',
+		ResultType: 2,
+		ToolTip: 'Remove-AzCosmosDBMongoDBRoleDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzCosmosDBMongoDBUserDefinition',
+		ListItemText: 'Remove-AzCosmosDBMongoDBUserDefinition',
+		ResultType: 2,
+		ToolTip: 'Remove-AzCosmosDBMongoDBUserDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzCosmosDBService',
+		ListItemText: 'Remove-AzCosmosDBService',
+		ResultType: 2,
+		ToolTip: 'Remove-AzCosmosDBService\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzCosmosDBSqlContainer',
+		ListItemText: 'Remove-AzCosmosDBSqlContainer',
+		ResultType: 2,
+		ToolTip: 'Remove-AzCosmosDBSqlContainer\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzCosmosDBSqlDatabase',
+		ListItemText: 'Remove-AzCosmosDBSqlDatabase',
+		ResultType: 2,
+		ToolTip: 'Remove-AzCosmosDBSqlDatabase\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzCosmosDBSqlRoleAssignment',
+		ListItemText: 'Remove-AzCosmosDBSqlRoleAssignment',
+		ResultType: 2,
+		ToolTip: 'Remove-AzCosmosDBSqlRoleAssignment\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzCosmosDBSqlRoleDefinition',
+		ListItemText: 'Remove-AzCosmosDBSqlRoleDefinition',
+		ResultType: 2,
+		ToolTip: 'Remove-AzCosmosDBSqlRoleDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzCosmosDBSqlStoredProcedure',
+		ListItemText: 'Remove-AzCosmosDBSqlStoredProcedure',
+		ResultType: 2,
+		ToolTip: 'Remove-AzCosmosDBSqlStoredProcedure\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzCosmosDBSqlTrigger',
+		ListItemText: 'Remove-AzCosmosDBSqlTrigger',
+		ResultType: 2,
+		ToolTip: 'Remove-AzCosmosDBSqlTrigger\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzCosmosDBSqlUserDefinedFunction',
+		ListItemText: 'Remove-AzCosmosDBSqlUserDefinedFunction',
+		ResultType: 2,
+		ToolTip: 'Remove-AzCosmosDBSqlUserDefinedFunction\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzCosmosDBTable',
+		ListItemText: 'Remove-AzCosmosDBTable',
+		ResultType: 2,
+		ToolTip: 'Remove-AzCosmosDBTable\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzCustomIpPrefix',
+		ListItemText: 'Remove-AzCustomIpPrefix',
+		ResultType: 2,
+		ToolTip: 'Remove-AzCustomIpPrefix\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataBoxEdgeBandwidthSchedule',
+		ListItemText: 'Remove-AzDataBoxEdgeBandwidthSchedule',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataBoxEdgeBandwidthSchedule\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataBoxEdgeDevice',
+		ListItemText: 'Remove-AzDataBoxEdgeDevice',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataBoxEdgeDevice\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataBoxEdgeOrder',
+		ListItemText: 'Remove-AzDataBoxEdgeOrder',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataBoxEdgeOrder\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataBoxEdgeRole',
+		ListItemText: 'Remove-AzDataBoxEdgeRole',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataBoxEdgeRole\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataBoxEdgeShare',
+		ListItemText: 'Remove-AzDataBoxEdgeShare',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataBoxEdgeShare\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataBoxEdgeStorageAccount',
+		ListItemText: 'Remove-AzDataBoxEdgeStorageAccount',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataBoxEdgeStorageAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataBoxEdgeStorageAccountCredential',
+		ListItemText: 'Remove-AzDataBoxEdgeStorageAccountCredential',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataBoxEdgeStorageAccountCredential\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataBoxEdgeStorageContainer',
+		ListItemText: 'Remove-AzDataBoxEdgeStorageContainer',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataBoxEdgeStorageContainer\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataBoxEdgeTrigger',
+		ListItemText: 'Remove-AzDataBoxEdgeTrigger',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataBoxEdgeTrigger\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataBoxEdgeUser',
+		ListItemText: 'Remove-AzDataBoxEdgeUser',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataBoxEdgeUser\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDatabricksAccessConnector',
+		ListItemText: 'Remove-AzDatabricksAccessConnector',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzDatabricksAccessConnector \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDatabricksVNetPeering',
+		ListItemText: 'Remove-AzDatabricksVNetPeering',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzDatabricksVNetPeering \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDatabricksWorkspace',
+		ListItemText: 'Remove-AzDatabricksWorkspace',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzDatabricksWorkspace \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataCollectionRule',
+		ListItemText: 'Remove-AzDataCollectionRule',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataCollectionRule\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataCollectionRuleAssociation',
+		ListItemText: 'Remove-AzDataCollectionRuleAssociation',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataCollectionRuleAssociation\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataFactory',
+		ListItemText: 'Remove-AzDataFactory',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataFactory\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataFactoryDataset',
+		ListItemText: 'Remove-AzDataFactoryDataset',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataFactoryDataset\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataFactoryGateway',
+		ListItemText: 'Remove-AzDataFactoryGateway',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataFactoryGateway\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataFactoryHub',
+		ListItemText: 'Remove-AzDataFactoryHub',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataFactoryHub\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataFactoryLinkedService',
+		ListItemText: 'Remove-AzDataFactoryLinkedService',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataFactoryLinkedService\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataFactoryPipeline',
+		ListItemText: 'Remove-AzDataFactoryPipeline',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataFactoryPipeline\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataFactoryV2',
+		ListItemText: 'Remove-AzDataFactoryV2',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataFactoryV2\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataFactoryV2DataFlow',
+		ListItemText: 'Remove-AzDataFactoryV2DataFlow',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataFactoryV2DataFlow\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataFactoryV2Dataset',
+		ListItemText: 'Remove-AzDataFactoryV2Dataset',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataFactoryV2Dataset\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataFactoryV2IntegrationRuntime',
+		ListItemText: 'Remove-AzDataFactoryV2IntegrationRuntime',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataFactoryV2IntegrationRuntime\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataFactoryV2IntegrationRuntimeNode',
+		ListItemText: 'Remove-AzDataFactoryV2IntegrationRuntimeNode',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataFactoryV2IntegrationRuntimeNode\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataFactoryV2LinkedService',
+		ListItemText: 'Remove-AzDataFactoryV2LinkedService',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataFactoryV2LinkedService\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataFactoryV2Pipeline',
+		ListItemText: 'Remove-AzDataFactoryV2Pipeline',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataFactoryV2Pipeline\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataFactoryV2Trigger',
+		ListItemText: 'Remove-AzDataFactoryV2Trigger',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataFactoryV2Trigger\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataFactoryV2TriggerSubscription',
+		ListItemText: 'Remove-AzDataFactoryV2TriggerSubscription',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataFactoryV2TriggerSubscription\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataLakeAnalyticsAccount',
+		ListItemText: 'Remove-AzDataLakeAnalyticsAccount',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataLakeAnalyticsAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataLakeAnalyticsCatalogCredential',
+		ListItemText: 'Remove-AzDataLakeAnalyticsCatalogCredential',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataLakeAnalyticsCatalogCredential\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataLakeAnalyticsCatalogItemAclEntry',
+		ListItemText: 'Remove-AzDataLakeAnalyticsCatalogItemAclEntry',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataLakeAnalyticsCatalogItemAclEntry\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataLakeAnalyticsComputePolicy',
+		ListItemText: 'Remove-AzDataLakeAnalyticsComputePolicy',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataLakeAnalyticsComputePolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataLakeAnalyticsDataSource',
+		ListItemText: 'Remove-AzDataLakeAnalyticsDataSource',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataLakeAnalyticsDataSource\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataLakeAnalyticsFirewallRule',
+		ListItemText: 'Remove-AzDataLakeAnalyticsFirewallRule',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataLakeAnalyticsFirewallRule\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataLakeGen2AclRecursive',
+		ListItemText: 'Remove-AzDataLakeGen2AclRecursive',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataLakeGen2AclRecursive\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDatalakeGen2FileSystem',
+		ListItemText: 'Remove-AzDatalakeGen2FileSystem',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDatalakeGen2FileSystem'
+	},
+	{
+		CompletionText: 'Remove-AzDataLakeGen2Item',
+		ListItemText: 'Remove-AzDataLakeGen2Item',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataLakeGen2Item\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataLakeStoreAccount',
+		ListItemText: 'Remove-AzDataLakeStoreAccount',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataLakeStoreAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataLakeStoreFirewallRule',
+		ListItemText: 'Remove-AzDataLakeStoreFirewallRule',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataLakeStoreFirewallRule\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataLakeStoreItem',
+		ListItemText: 'Remove-AzDataLakeStoreItem',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataLakeStoreItem\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataLakeStoreItemAcl',
+		ListItemText: 'Remove-AzDataLakeStoreItemAcl',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataLakeStoreItemAcl\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataLakeStoreItemAclEntry',
+		ListItemText: 'Remove-AzDataLakeStoreItemAclEntry',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataLakeStoreItemAclEntry\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataLakeStoreTrustedIdProvider',
+		ListItemText: 'Remove-AzDataLakeStoreTrustedIdProvider',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataLakeStoreTrustedIdProvider\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataLakeStoreVirtualNetworkRule',
+		ListItemText: 'Remove-AzDataLakeStoreVirtualNetworkRule',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataLakeStoreVirtualNetworkRule\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataProtectionBackupInstance',
+		ListItemText: 'Remove-AzDataProtectionBackupInstance',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzDataProtectionBackupInstance \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataProtectionBackupPolicy',
+		ListItemText: 'Remove-AzDataProtectionBackupPolicy',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzDataProtectionBackupPolicy \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataProtectionBackupVault',
+		ListItemText: 'Remove-AzDataProtectionBackupVault',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzDataProtectionBackupVault \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataProtectionResourceGuard',
+		ListItemText: 'Remove-AzDataProtectionResourceGuard',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzDataProtectionResourceGuard \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataShare',
+		ListItemText: 'Remove-AzDataShare',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataShare\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataShareAccount',
+		ListItemText: 'Remove-AzDataShareAccount',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataShareAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataShareDataSet',
+		ListItemText: 'Remove-AzDataShareDataSet',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataShareDataSet\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataShareDataSetMapping',
+		ListItemText: 'Remove-AzDataShareDataSetMapping',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataShareDataSetMapping\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataShareInvitation',
+		ListItemText: 'Remove-AzDataShareInvitation',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataShareInvitation\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataShareSubscription',
+		ListItemText: 'Remove-AzDataShareSubscription',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataShareSubscription\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataShareSynchronizationSetting',
+		ListItemText: 'Remove-AzDataShareSynchronizationSetting',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataShareSynchronizationSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDataShareTrigger',
+		ListItemText: 'Remove-AzDataShareTrigger',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDataShareTrigger\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDdosProtectionPlan',
+		ListItemText: 'Remove-AzDdosProtectionPlan',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDdosProtectionPlan\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDelegation',
+		ListItemText: 'Remove-AzDelegation',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDelegation\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDeployment',
+		ListItemText: 'Remove-AzDeployment',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDeployment\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDeploymentManagerArtifactSource',
+		ListItemText: 'Remove-AzDeploymentManagerArtifactSource',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDeploymentManagerArtifactSource\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDeploymentManagerRollout',
+		ListItemText: 'Remove-AzDeploymentManagerRollout',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDeploymentManagerRollout\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDeploymentManagerService',
+		ListItemText: 'Remove-AzDeploymentManagerService',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDeploymentManagerService\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDeploymentManagerServiceTopology',
+		ListItemText: 'Remove-AzDeploymentManagerServiceTopology',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDeploymentManagerServiceTopology\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDeploymentManagerServiceUnit',
+		ListItemText: 'Remove-AzDeploymentManagerServiceUnit',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDeploymentManagerServiceUnit\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDeploymentManagerStep',
+		ListItemText: 'Remove-AzDeploymentManagerStep',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDeploymentManagerStep\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDeploymentScript',
+		ListItemText: 'Remove-AzDeploymentScript',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDeploymentScript\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDeviceSecurityGroup',
+		ListItemText: 'Remove-AzDeviceSecurityGroup',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDeviceSecurityGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDiagnosticSetting',
+		ListItemText: 'Remove-AzDiagnosticSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzDiagnosticSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDisk',
+		ListItemText: 'Remove-AzDisk',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDisk\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDiskAccess',
+		ListItemText: 'Remove-AzDiskAccess',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDiskAccess\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDiskEncryptionSet',
+		ListItemText: 'Remove-AzDiskEncryptionSet',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDiskEncryptionSet\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDnsRecordConfig',
+		ListItemText: 'Remove-AzDnsRecordConfig',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDnsRecordConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDnsRecordSet',
+		ListItemText: 'Remove-AzDnsRecordSet',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDnsRecordSet\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzDnsZone',
+		ListItemText: 'Remove-AzDnsZone',
+		ResultType: 2,
+		ToolTip: 'Remove-AzDnsZone\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzEnvironment',
+		ListItemText: 'Remove-AzEnvironment',
+		ResultType: 2,
+		ToolTip: 'Remove-AzEnvironment\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzEventGridChannel',
+		ListItemText: 'Remove-AzEventGridChannel',
+		ResultType: 2,
+		ToolTip: 'Remove-AzEventGridChannel\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzEventGridDomain',
+		ListItemText: 'Remove-AzEventGridDomain',
+		ResultType: 2,
+		ToolTip: 'Remove-AzEventGridDomain\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzEventGridDomainTopic',
+		ListItemText: 'Remove-AzEventGridDomainTopic',
+		ResultType: 2,
+		ToolTip: 'Remove-AzEventGridDomainTopic\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzEventGridPartnerConfiguration',
+		ListItemText: 'Remove-AzEventGridPartnerConfiguration',
+		ResultType: 2,
+		ToolTip: 'Remove-AzEventGridPartnerConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzEventGridPartnerNamespace',
+		ListItemText: 'Remove-AzEventGridPartnerNamespace',
+		ResultType: 2,
+		ToolTip: 'Remove-AzEventGridPartnerNamespace\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzEventGridPartnerRegistration',
+		ListItemText: 'Remove-AzEventGridPartnerRegistration',
+		ResultType: 2,
+		ToolTip: 'Remove-AzEventGridPartnerRegistration\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzEventGridPartnerTopic',
+		ListItemText: 'Remove-AzEventGridPartnerTopic',
+		ResultType: 2,
+		ToolTip: 'Remove-AzEventGridPartnerTopic\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzEventGridPartnerTopicEventSubscription',
+		ListItemText: 'Remove-AzEventGridPartnerTopicEventSubscription',
+		ResultType: 2,
+		ToolTip: 'Remove-AzEventGridPartnerTopicEventSubscription\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzEventGridSubscription',
+		ListItemText: 'Remove-AzEventGridSubscription',
+		ResultType: 2,
+		ToolTip: 'Remove-AzEventGridSubscription\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzEventGridSystemTopic',
+		ListItemText: 'Remove-AzEventGridSystemTopic',
+		ResultType: 2,
+		ToolTip: 'Remove-AzEventGridSystemTopic\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzEventGridSystemTopicEventSubscription',
+		ListItemText: 'Remove-AzEventGridSystemTopicEventSubscription',
+		ResultType: 2,
+		ToolTip: 'Remove-AzEventGridSystemTopicEventSubscription\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzEventGridTopic',
+		ListItemText: 'Remove-AzEventGridTopic',
+		ResultType: 2,
+		ToolTip: 'Remove-AzEventGridTopic\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzEventHub',
+		ListItemText: 'Remove-AzEventHub',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzEventHub \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzEventHubApplicationGroup',
+		ListItemText: 'Remove-AzEventHubApplicationGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzEventHubApplicationGroup \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzEventHubAuthorizationRule',
+		ListItemText: 'Remove-AzEventHubAuthorizationRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzEventHubAuthorizationRule \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzEventHubCluster',
+		ListItemText: 'Remove-AzEventHubCluster',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzEventHubCluster \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzEventHubConsumerGroup',
+		ListItemText: 'Remove-AzEventHubConsumerGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzEventHubConsumerGroup \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzEventHubGeoDRConfiguration',
+		ListItemText: 'Remove-AzEventHubGeoDRConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzEventHubGeoDRConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzEventHubNamespace',
+		ListItemText: 'Remove-AzEventHubNamespace',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzEventHubNamespace \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzEventHubNamespaceV2',
+		ListItemText: 'Remove-AzEventHubNamespaceV2',
+		ResultType: 2,
+		ToolTip: 'Remove-AzEventHubNamespaceV2'
+	},
+	{
+		CompletionText: 'Remove-AzEventHubPrivateEndpointConnection',
+		ListItemText: 'Remove-AzEventHubPrivateEndpointConnection',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzEventHubPrivateEndpointConnection \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzEventHubSchemaGroup',
+		ListItemText: 'Remove-AzEventHubSchemaGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzEventHubSchemaGroup \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzExpressRouteCircuit',
+		ListItemText: 'Remove-AzExpressRouteCircuit',
+		ResultType: 2,
+		ToolTip: 'Remove-AzExpressRouteCircuit\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzExpressRouteCircuitAuthorization',
+		ListItemText: 'Remove-AzExpressRouteCircuitAuthorization',
+		ResultType: 2,
+		ToolTip: 'Remove-AzExpressRouteCircuitAuthorization\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzExpressRouteCircuitConnectionConfig',
+		ListItemText: 'Remove-AzExpressRouteCircuitConnectionConfig',
+		ResultType: 2,
+		ToolTip: 'Remove-AzExpressRouteCircuitConnectionConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzExpressRouteCircuitPeeringConfig',
+		ListItemText: 'Remove-AzExpressRouteCircuitPeeringConfig',
+		ResultType: 2,
+		ToolTip: 'Remove-AzExpressRouteCircuitPeeringConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzExpressRouteConnection',
+		ListItemText: 'Remove-AzExpressRouteConnection',
+		ResultType: 2,
+		ToolTip: 'Remove-AzExpressRouteConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzExpressRouteCrossConnectionPeering',
+		ListItemText: 'Remove-AzExpressRouteCrossConnectionPeering',
+		ResultType: 2,
+		ToolTip: 'Remove-AzExpressRouteCrossConnectionPeering\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzExpressRouteGateway',
+		ListItemText: 'Remove-AzExpressRouteGateway',
+		ResultType: 2,
+		ToolTip: 'Remove-AzExpressRouteGateway\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzExpressRoutePort',
+		ListItemText: 'Remove-AzExpressRoutePort',
+		ResultType: 2,
+		ToolTip: 'Remove-AzExpressRoutePort\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzExpressRoutePortAuthorization',
+		ListItemText: 'Remove-AzExpressRoutePortAuthorization',
+		ResultType: 2,
+		ToolTip: 'Remove-AzExpressRoutePortAuthorization\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzExpressRoutePortIdentity',
+		ListItemText: 'Remove-AzExpressRoutePortIdentity',
+		ResultType: 2,
+		ToolTip: 'Remove-AzExpressRoutePortIdentity\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzFederatedIdentityCredentials',
+		ListItemText: 'Remove-AzFederatedIdentityCredentials',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzFederatedIdentityCredentials \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzFirewall',
+		ListItemText: 'Remove-AzFirewall',
+		ResultType: 2,
+		ToolTip: 'Remove-AzFirewall\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzFirewallPolicy',
+		ListItemText: 'Remove-AzFirewallPolicy',
+		ResultType: 2,
+		ToolTip: 'Remove-AzFirewallPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzFirewallPolicyRuleCollectionGroup',
+		ListItemText: 'Remove-AzFirewallPolicyRuleCollectionGroup',
+		ResultType: 2,
+		ToolTip: 'Remove-AzFirewallPolicyRuleCollectionGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzFrontDoor',
+		ListItemText: 'Remove-AzFrontDoor',
+		ResultType: 2,
+		ToolTip: 'Remove-AzFrontDoor\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzFrontDoorCdnCustomDomain',
+		ListItemText: 'Remove-AzFrontDoorCdnCustomDomain',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzFrontDoorCdnCustomDomain \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzFrontDoorCdnEndpoint',
+		ListItemText: 'Remove-AzFrontDoorCdnEndpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzFrontDoorCdnEndpoint \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzFrontDoorCdnOrigin',
+		ListItemText: 'Remove-AzFrontDoorCdnOrigin',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzFrontDoorCdnOrigin \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzFrontDoorCdnOriginGroup',
+		ListItemText: 'Remove-AzFrontDoorCdnOriginGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzFrontDoorCdnOriginGroup \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzFrontDoorCdnProfile',
+		ListItemText: 'Remove-AzFrontDoorCdnProfile',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzFrontDoorCdnProfile \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzFrontDoorCdnRoute',
+		ListItemText: 'Remove-AzFrontDoorCdnRoute',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzFrontDoorCdnRoute \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzFrontDoorCdnRule',
+		ListItemText: 'Remove-AzFrontDoorCdnRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzFrontDoorCdnRule \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzFrontDoorCdnRuleSet',
+		ListItemText: 'Remove-AzFrontDoorCdnRuleSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzFrontDoorCdnRuleSet \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzFrontDoorCdnSecret',
+		ListItemText: 'Remove-AzFrontDoorCdnSecret',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzFrontDoorCdnSecret \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzFrontDoorCdnSecurityPolicy',
+		ListItemText: 'Remove-AzFrontDoorCdnSecurityPolicy',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzFrontDoorCdnSecurityPolicy \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzFrontDoorContent',
+		ListItemText: 'Remove-AzFrontDoorContent',
+		ResultType: 2,
+		ToolTip: 'Remove-AzFrontDoorContent\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzFrontDoorRulesEngine',
+		ListItemText: 'Remove-AzFrontDoorRulesEngine',
+		ResultType: 2,
+		ToolTip: 'Remove-AzFrontDoorRulesEngine\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzFrontDoorWafPolicy',
+		ListItemText: 'Remove-AzFrontDoorWafPolicy',
+		ResultType: 2,
+		ToolTip: 'Remove-AzFrontDoorWafPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzFunctionApp',
+		ListItemText: 'Remove-AzFunctionApp',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzFunctionApp \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzFunctionAppPlan',
+		ListItemText: 'Remove-AzFunctionAppPlan',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzFunctionAppPlan \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzFunctionAppSetting',
+		ListItemText: 'Remove-AzFunctionAppSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzFunctionAppSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzGallery',
+		ListItemText: 'Remove-AzGallery',
+		ResultType: 2,
+		ToolTip: 'Remove-AzGallery\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzGalleryApplication',
+		ListItemText: 'Remove-AzGalleryApplication',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzGalleryApplication \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzGalleryApplicationVersion',
+		ListItemText: 'Remove-AzGalleryApplicationVersion',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzGalleryApplicationVersion \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzGalleryImageDefinition',
+		ListItemText: 'Remove-AzGalleryImageDefinition',
+		ResultType: 2,
+		ToolTip: 'Remove-AzGalleryImageDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzGalleryImageVersion',
+		ListItemText: 'Remove-AzGalleryImageVersion',
+		ResultType: 2,
+		ToolTip: 'Remove-AzGalleryImageVersion\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzHDInsightCluster',
+		ListItemText: 'Remove-AzHDInsightCluster',
+		ResultType: 2,
+		ToolTip: 'Remove-AzHDInsightCluster\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzHDInsightClusterAutoscaleConfiguration',
+		ListItemText: 'Remove-AzHDInsightClusterAutoscaleConfiguration',
+		ResultType: 2,
+		ToolTip: 'Remove-AzHDInsightClusterAutoscaleConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzHDInsightPersistedScriptAction',
+		ListItemText: 'Remove-AzHDInsightPersistedScriptAction',
+		ResultType: 2,
+		ToolTip: 'Remove-AzHDInsightPersistedScriptAction\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzHealthcareApisService',
+		ListItemText: 'Remove-AzHealthcareApisService',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzHealthcareApisService \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzHealthcareApisWorkspace',
+		ListItemText: 'Remove-AzHealthcareApisWorkspace',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzHealthcareApisWorkspace \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzHealthcareDicomService',
+		ListItemText: 'Remove-AzHealthcareDicomService',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzHealthcareDicomService \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzHealthcareFhirService',
+		ListItemText: 'Remove-AzHealthcareFhirService',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzHealthcareFhirService \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzHealthcareIotConnector',
+		ListItemText: 'Remove-AzHealthcareIotConnector',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzHealthcareIotConnector \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzHealthcareIotConnectorFhirDestination',
+		ListItemText: 'Remove-AzHealthcareIotConnectorFhirDestination',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzHealthcareIotConnectorFhirDestination \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzHost',
+		ListItemText: 'Remove-AzHost',
+		ResultType: 2,
+		ToolTip: 'Remove-AzHost\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzHostGroup',
+		ListItemText: 'Remove-AzHostGroup',
+		ResultType: 2,
+		ToolTip: 'Remove-AzHostGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzImage',
+		ListItemText: 'Remove-AzImage',
+		ResultType: 2,
+		ToolTip: 'Remove-AzImage\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzImageDataDisk',
+		ListItemText: 'Remove-AzImageDataDisk',
+		ResultType: 2,
+		ToolTip: 'Remove-AzImageDataDisk\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzInsightsPrivateLinkScope',
+		ListItemText: 'Remove-AzInsightsPrivateLinkScope',
+		ResultType: 2,
+		ToolTip: 'Remove-AzInsightsPrivateLinkScope\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzInsightsPrivateLinkScopedResource',
+		ListItemText: 'Remove-AzInsightsPrivateLinkScopedResource',
+		ResultType: 2,
+		ToolTip: 'Remove-AzInsightsPrivateLinkScopedResource\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzIntegrationAccount',
+		ListItemText: 'Remove-AzIntegrationAccount',
+		ResultType: 2,
+		ToolTip: 'Remove-AzIntegrationAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzIntegrationAccountAgreement',
+		ListItemText: 'Remove-AzIntegrationAccountAgreement',
+		ResultType: 2,
+		ToolTip: 'Remove-AzIntegrationAccountAgreement\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzIntegrationAccountAssembly',
+		ListItemText: 'Remove-AzIntegrationAccountAssembly',
+		ResultType: 2,
+		ToolTip: 'Remove-AzIntegrationAccountAssembly\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzIntegrationAccountBatchConfiguration',
+		ListItemText: 'Remove-AzIntegrationAccountBatchConfiguration',
+		ResultType: 2,
+		ToolTip: 'Remove-AzIntegrationAccountBatchConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzIntegrationAccountCertificate',
+		ListItemText: 'Remove-AzIntegrationAccountCertificate',
+		ResultType: 2,
+		ToolTip: 'Remove-AzIntegrationAccountCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzIntegrationAccountMap',
+		ListItemText: 'Remove-AzIntegrationAccountMap',
+		ResultType: 2,
+		ToolTip: 'Remove-AzIntegrationAccountMap\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzIntegrationAccountPartner',
+		ListItemText: 'Remove-AzIntegrationAccountPartner',
+		ResultType: 2,
+		ToolTip: 'Remove-AzIntegrationAccountPartner\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzIntegrationAccountReceivedIcn',
+		ListItemText: 'Remove-AzIntegrationAccountReceivedIcn',
+		ResultType: 2,
+		ToolTip: 'Remove-AzIntegrationAccountReceivedIcn\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzIntegrationAccountSchema',
+		ListItemText: 'Remove-AzIntegrationAccountSchema',
+		ResultType: 2,
+		ToolTip: 'Remove-AzIntegrationAccountSchema\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzIotHub',
+		ListItemText: 'Remove-AzIotHub',
+		ResultType: 2,
+		ToolTip: 'Remove-AzIotHub\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzIotHubCertificate',
+		ListItemText: 'Remove-AzIotHubCertificate',
+		ResultType: 2,
+		ToolTip: 'Remove-AzIotHubCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzIotHubConfiguration',
+		ListItemText: 'Remove-AzIotHubConfiguration',
+		ResultType: 2,
+		ToolTip: 'Remove-AzIotHubConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzIotHubDCL',
+		ListItemText: 'Remove-AzIotHubDCL',
+		ResultType: 2,
+		ToolTip: 'Remove-AzIotHubDCL'
+	},
+	{
+		CompletionText: 'Remove-AzIotHubDeployment',
+		ListItemText: 'Remove-AzIotHubDeployment',
+		ResultType: 2,
+		ToolTip: 'Remove-AzIotHubDeployment\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzIotHubDevice',
+		ListItemText: 'Remove-AzIotHubDevice',
+		ResultType: 2,
+		ToolTip: 'Remove-AzIotHubDevice\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzIotHubDeviceChildren',
+		ListItemText: 'Remove-AzIotHubDeviceChildren',
+		ResultType: 2,
+		ToolTip: 'Remove-AzIotHubDeviceChildren\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzIotHubEHCG',
+		ListItemText: 'Remove-AzIotHubEHCG',
+		ResultType: 2,
+		ToolTip: 'Remove-AzIotHubEHCG'
+	},
+	{
+		CompletionText: 'Remove-AzIotHubEventHubConsumerGroup',
+		ListItemText: 'Remove-AzIotHubEventHubConsumerGroup',
+		ResultType: 2,
+		ToolTip: 'Remove-AzIotHubEventHubConsumerGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzIotHubKey',
+		ListItemText: 'Remove-AzIotHubKey',
+		ResultType: 2,
+		ToolTip: 'Remove-AzIotHubKey\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzIotHubMessageEnrichment',
+		ListItemText: 'Remove-AzIotHubMessageEnrichment',
+		ResultType: 2,
+		ToolTip: 'Remove-AzIotHubMessageEnrichment\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzIotHubModule',
+		ListItemText: 'Remove-AzIotHubModule',
+		ResultType: 2,
+		ToolTip: 'Remove-AzIotHubModule\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzIotHubMsgEnrich',
+		ListItemText: 'Remove-AzIotHubMsgEnrich',
+		ResultType: 2,
+		ToolTip: 'Remove-AzIotHubMsgEnrich'
+	},
+	{
+		CompletionText: 'Remove-AzIotHubRoute',
+		ListItemText: 'Remove-AzIotHubRoute',
+		ResultType: 2,
+		ToolTip: 'Remove-AzIotHubRoute\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzIotHubRoutingEndpoint',
+		ListItemText: 'Remove-AzIotHubRoutingEndpoint',
+		ResultType: 2,
+		ToolTip: 'Remove-AzIotHubRoutingEndpoint\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzIotSecuritySolution',
+		ListItemText: 'Remove-AzIotSecuritySolution',
+		ResultType: 2,
+		ToolTip: 'Remove-AzIotSecuritySolution\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzIpAllocation',
+		ListItemText: 'Remove-AzIpAllocation',
+		ResultType: 2,
+		ToolTip: 'Remove-AzIpAllocation\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzIpGroup',
+		ListItemText: 'Remove-AzIpGroup',
+		ResultType: 2,
+		ToolTip: 'Remove-AzIpGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzJitNetworkAccessPolicy',
+		ListItemText: 'Remove-AzJitNetworkAccessPolicy',
+		ResultType: 2,
+		ToolTip: 'Remove-AzJitNetworkAccessPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzKeyVault',
+		ListItemText: 'Remove-AzKeyVault',
+		ResultType: 2,
+		ToolTip: 'Remove-AzKeyVault\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzKeyVaultAccessPolicy',
+		ListItemText: 'Remove-AzKeyVaultAccessPolicy',
+		ResultType: 2,
+		ToolTip: 'Remove-AzKeyVaultAccessPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzKeyVaultCertificate',
+		ListItemText: 'Remove-AzKeyVaultCertificate',
+		ResultType: 2,
+		ToolTip: 'Remove-AzKeyVaultCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzKeyVaultCertificateContact',
+		ListItemText: 'Remove-AzKeyVaultCertificateContact',
+		ResultType: 2,
+		ToolTip: 'Remove-AzKeyVaultCertificateContact\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzKeyVaultCertificateIssuer',
+		ListItemText: 'Remove-AzKeyVaultCertificateIssuer',
+		ResultType: 2,
+		ToolTip: 'Remove-AzKeyVaultCertificateIssuer\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzKeyVaultCertificateOperation',
+		ListItemText: 'Remove-AzKeyVaultCertificateOperation',
+		ResultType: 2,
+		ToolTip: 'Remove-AzKeyVaultCertificateOperation\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzKeyVaultKey',
+		ListItemText: 'Remove-AzKeyVaultKey',
+		ResultType: 2,
+		ToolTip: 'Remove-AzKeyVaultKey\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzKeyVaultManagedHsm',
+		ListItemText: 'Remove-AzKeyVaultManagedHsm',
+		ResultType: 2,
+		ToolTip: 'Remove-AzKeyVaultManagedHsm\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzKeyVaultManagedStorageAccount',
+		ListItemText: 'Remove-AzKeyVaultManagedStorageAccount',
+		ResultType: 2,
+		ToolTip: 'Remove-AzKeyVaultManagedStorageAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzKeyVaultManagedStorageSasDefinition',
+		ListItemText: 'Remove-AzKeyVaultManagedStorageSasDefinition',
+		ResultType: 2,
+		ToolTip: 'Remove-AzKeyVaultManagedStorageSasDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzKeyVaultNetworkRule',
+		ListItemText: 'Remove-AzKeyVaultNetworkRule',
+		ResultType: 2,
+		ToolTip: 'Remove-AzKeyVaultNetworkRule\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzKeyVaultRoleAssignment',
+		ListItemText: 'Remove-AzKeyVaultRoleAssignment',
+		ResultType: 2,
+		ToolTip: 'Remove-AzKeyVaultRoleAssignment\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzKeyVaultRoleDefinition',
+		ListItemText: 'Remove-AzKeyVaultRoleDefinition',
+		ResultType: 2,
+		ToolTip: 'Remove-AzKeyVaultRoleDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzKeyVaultSecret',
+		ListItemText: 'Remove-AzKeyVaultSecret',
+		ResultType: 2,
+		ToolTip: 'Remove-AzKeyVaultSecret\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzKustoAttachedDatabaseConfiguration',
+		ListItemText: 'Remove-AzKustoAttachedDatabaseConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzKustoAttachedDatabaseConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzKustoCluster',
+		ListItemText: 'Remove-AzKustoCluster',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzKustoCluster \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzKustoClusterLanguageExtension',
+		ListItemText: 'Remove-AzKustoClusterLanguageExtension',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzKustoClusterLanguageExtension \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzKustoClusterPrincipalAssignment',
+		ListItemText: 'Remove-AzKustoClusterPrincipalAssignment',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzKustoClusterPrincipalAssignment \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzKustoDatabase',
+		ListItemText: 'Remove-AzKustoDatabase',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzKustoDatabase \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzKustoDatabasePrincipal',
+		ListItemText: 'Remove-AzKustoDatabasePrincipal',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzKustoDatabasePrincipal \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzKustoDatabasePrincipalAssignment',
+		ListItemText: 'Remove-AzKustoDatabasePrincipalAssignment',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzKustoDatabasePrincipalAssignment \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzKustoDataConnection',
+		ListItemText: 'Remove-AzKustoDataConnection',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzKustoDataConnection \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzKustoManagedPrivateEndpoint',
+		ListItemText: 'Remove-AzKustoManagedPrivateEndpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzKustoManagedPrivateEndpoint \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzKustoPrivateEndpointConnection',
+		ListItemText: 'Remove-AzKustoPrivateEndpointConnection',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzKustoPrivateEndpointConnection \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzKustoScript',
+		ListItemText: 'Remove-AzKustoScript',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzKustoScript \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzLoad',
+		ListItemText: 'Remove-AzLoad',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzLoad \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzLoadBalancer',
+		ListItemText: 'Remove-AzLoadBalancer',
+		ResultType: 2,
+		ToolTip: 'Remove-AzLoadBalancer\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzLoadBalancerBackendAddressPool',
+		ListItemText: 'Remove-AzLoadBalancerBackendAddressPool',
+		ResultType: 2,
+		ToolTip: 'Remove-AzLoadBalancerBackendAddressPool\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzLoadBalancerBackendAddressPoolConfig',
+		ListItemText: 'Remove-AzLoadBalancerBackendAddressPoolConfig',
+		ResultType: 2,
+		ToolTip: 'Remove-AzLoadBalancerBackendAddressPoolConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzLoadBalancerFrontendIpConfig',
+		ListItemText: 'Remove-AzLoadBalancerFrontendIpConfig',
+		ResultType: 2,
+		ToolTip: 'Remove-AzLoadBalancerFrontendIpConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzLoadBalancerInboundNatPoolConfig',
+		ListItemText: 'Remove-AzLoadBalancerInboundNatPoolConfig',
+		ResultType: 2,
+		ToolTip: 'Remove-AzLoadBalancerInboundNatPoolConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzLoadBalancerInboundNatRuleConfig',
+		ListItemText: 'Remove-AzLoadBalancerInboundNatRuleConfig',
+		ResultType: 2,
+		ToolTip: 'Remove-AzLoadBalancerInboundNatRuleConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzLoadBalancerOutboundRuleConfig',
+		ListItemText: 'Remove-AzLoadBalancerOutboundRuleConfig',
+		ResultType: 2,
+		ToolTip: 'Remove-AzLoadBalancerOutboundRuleConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzLoadBalancerProbeConfig',
+		ListItemText: 'Remove-AzLoadBalancerProbeConfig',
+		ResultType: 2,
+		ToolTip: 'Remove-AzLoadBalancerProbeConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzLoadBalancerRuleConfig',
+		ListItemText: 'Remove-AzLoadBalancerRuleConfig',
+		ResultType: 2,
+		ToolTip: 'Remove-AzLoadBalancerRuleConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzLocalNetworkGateway',
+		ListItemText: 'Remove-AzLocalNetworkGateway',
+		ResultType: 2,
+		ToolTip: 'Remove-AzLocalNetworkGateway\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzLogicApp',
+		ListItemText: 'Remove-AzLogicApp',
+		ResultType: 2,
+		ToolTip: 'Remove-AzLogicApp\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzLogProfile',
+		ListItemText: 'Remove-AzLogProfile',
+		ResultType: 2,
+		ToolTip: 'Remove-AzLogProfile\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzMaintenanceConfiguration',
+		ListItemText: 'Remove-AzMaintenanceConfiguration',
+		ResultType: 2,
+		ToolTip: 'Remove-AzMaintenanceConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzManagedApplication',
+		ListItemText: 'Remove-AzManagedApplication',
+		ResultType: 2,
+		ToolTip: 'Remove-AzManagedApplication\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzManagedApplicationDefinition',
+		ListItemText: 'Remove-AzManagedApplicationDefinition',
+		ResultType: 2,
+		ToolTip: 'Remove-AzManagedApplicationDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzManagedCassandraCluster',
+		ListItemText: 'Remove-AzManagedCassandraCluster',
+		ResultType: 2,
+		ToolTip: 'Remove-AzManagedCassandraCluster\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzManagedCassandraDataCenter',
+		ListItemText: 'Remove-AzManagedCassandraDataCenter',
+		ResultType: 2,
+		ToolTip: 'Remove-AzManagedCassandraDataCenter\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzManagedServicesAssignment',
+		ListItemText: 'Remove-AzManagedServicesAssignment',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzManagedServicesAssignment \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzManagedServicesDefinition',
+		ListItemText: 'Remove-AzManagedServicesDefinition',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzManagedServicesDefinition \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzManagementGroup',
+		ListItemText: 'Remove-AzManagementGroup',
+		ResultType: 2,
+		ToolTip: 'Remove-AzManagementGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzManagementGroupDeployment',
+		ListItemText: 'Remove-AzManagementGroupDeployment',
+		ResultType: 2,
+		ToolTip: 'Remove-AzManagementGroupDeployment\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzManagementGroupHierarchySetting',
+		ListItemText: 'Remove-AzManagementGroupHierarchySetting',
+		ResultType: 2,
+		ToolTip: 'Remove-AzManagementGroupHierarchySetting\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzManagementGroupSubscription',
+		ListItemText: 'Remove-AzManagementGroupSubscription',
+		ResultType: 2,
+		ToolTip: 'Remove-AzManagementGroupSubscription\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzMediaService',
+		ListItemText: 'Remove-AzMediaService',
+		ResultType: 2,
+		ToolTip: 'Remove-AzMediaService\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzMetricAlertRuleV2',
+		ListItemText: 'Remove-AzMetricAlertRuleV2',
+		ResultType: 2,
+		ToolTip: 'Remove-AzMetricAlertRuleV2\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzMigrateProject',
+		ListItemText: 'Remove-AzMigrateProject',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzMigrateProject \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzMigrateServerReplication',
+		ListItemText: 'Remove-AzMigrateServerReplication',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzMigrateServerReplication \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzMlCommitmentPlan',
+		ListItemText: 'Remove-AzMlCommitmentPlan',
+		ResultType: 2,
+		ToolTip: 'Remove-AzMlCommitmentPlan\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzMlWebService',
+		ListItemText: 'Remove-AzMlWebService',
+		ResultType: 2,
+		ToolTip: 'Remove-AzMlWebService\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzMLWorkspace',
+		ListItemText: 'Remove-AzMLWorkspace',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzMLWorkspace \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzMLWorkspaceBatchDeployment',
+		ListItemText: 'Remove-AzMLWorkspaceBatchDeployment',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzMLWorkspaceBatchDeployment \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzMLWorkspaceBatchEndpoint',
+		ListItemText: 'Remove-AzMLWorkspaceBatchEndpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzMLWorkspaceBatchEndpoint \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzMLWorkspaceCodeVersion',
+		ListItemText: 'Remove-AzMLWorkspaceCodeVersion',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzMLWorkspaceCodeVersion \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzMLWorkspaceComponentContainer',
+		ListItemText: 'Remove-AzMLWorkspaceComponentContainer',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzMLWorkspaceComponentContainer \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzMLWorkspaceComponentVersion',
+		ListItemText: 'Remove-AzMLWorkspaceComponentVersion',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzMLWorkspaceComponentVersion \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzMLWorkspaceCompute',
+		ListItemText: 'Remove-AzMLWorkspaceCompute',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzMLWorkspaceCompute \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzMLWorkspaceConnection',
+		ListItemText: 'Remove-AzMLWorkspaceConnection',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzMLWorkspaceConnection \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzMLWorkspaceDataContainer',
+		ListItemText: 'Remove-AzMLWorkspaceDataContainer',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzMLWorkspaceDataContainer \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzMLWorkspaceDatastore',
+		ListItemText: 'Remove-AzMLWorkspaceDatastore',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzMLWorkspaceDatastore \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzMLWorkspaceDataVersion',
+		ListItemText: 'Remove-AzMLWorkspaceDataVersion',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzMLWorkspaceDataVersion \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzMLWorkspaceEnvironmentContainer',
+		ListItemText: 'Remove-AzMLWorkspaceEnvironmentContainer',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzMLWorkspaceEnvironmentContainer \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzMLWorkspaceEnvironmentVersion',
+		ListItemText: 'Remove-AzMLWorkspaceEnvironmentVersion',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzMLWorkspaceEnvironmentVersion \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzMLWorkspaceJob',
+		ListItemText: 'Remove-AzMLWorkspaceJob',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzMLWorkspaceJob \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzMLWorkspaceModelContainer',
+		ListItemText: 'Remove-AzMLWorkspaceModelContainer',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzMLWorkspaceModelContainer \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzMLWorkspaceModelVersion',
+		ListItemText: 'Remove-AzMLWorkspaceModelVersion',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzMLWorkspaceModelVersion \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzMLWorkspaceOnlineDeployment',
+		ListItemText: 'Remove-AzMLWorkspaceOnlineDeployment',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzMLWorkspaceOnlineDeployment \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzMLWorkspaceOnlineEndpoint',
+		ListItemText: 'Remove-AzMLWorkspaceOnlineEndpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzMLWorkspaceOnlineEndpoint \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzMonitorWorkspace',
+		ListItemText: 'Remove-AzMonitorWorkspace',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzMonitorWorkspace \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzMySqlFirewallRule',
+		ListItemText: 'Remove-AzMySqlFirewallRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzMySqlFirewallRule \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzMySqlFlexibleServer',
+		ListItemText: 'Remove-AzMySqlFlexibleServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzMySqlFlexibleServer \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzMySqlFlexibleServerDatabase',
+		ListItemText: 'Remove-AzMySqlFlexibleServerDatabase',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzMySqlFlexibleServerDatabase \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzMySqlFlexibleServerFirewallRule',
+		ListItemText: 'Remove-AzMySqlFlexibleServerFirewallRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzMySqlFlexibleServerFirewallRule \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzMySqlServer',
+		ListItemText: 'Remove-AzMySqlServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzMySqlServer \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzMySqlVirtualNetworkRule',
+		ListItemText: 'Remove-AzMySqlVirtualNetworkRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzMySqlVirtualNetworkRule \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzNatGateway',
+		ListItemText: 'Remove-AzNatGateway',
+		ResultType: 2,
+		ToolTip: 'Remove-AzNatGateway\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzNetworkInterface',
+		ListItemText: 'Remove-AzNetworkInterface',
+		ResultType: 2,
+		ToolTip: 'Remove-AzNetworkInterface\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzNetworkInterfaceIpConfig',
+		ListItemText: 'Remove-AzNetworkInterfaceIpConfig',
+		ResultType: 2,
+		ToolTip: 'Remove-AzNetworkInterfaceIpConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzNetworkInterfaceTapConfig',
+		ListItemText: 'Remove-AzNetworkInterfaceTapConfig',
+		ResultType: 2,
+		ToolTip: 'Remove-AzNetworkInterfaceTapConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzNetworkManager',
+		ListItemText: 'Remove-AzNetworkManager',
+		ResultType: 2,
+		ToolTip: 'Remove-AzNetworkManager\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzNetworkManagerConnectivityConfiguration',
+		ListItemText: 'Remove-AzNetworkManagerConnectivityConfiguration',
+		ResultType: 2,
+		ToolTip: 'Remove-AzNetworkManagerConnectivityConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzNetworkManagerGroup',
+		ListItemText: 'Remove-AzNetworkManagerGroup',
+		ResultType: 2,
+		ToolTip: 'Remove-AzNetworkManagerGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzNetworkManagerManagementGroupConnection',
+		ListItemText: 'Remove-AzNetworkManagerManagementGroupConnection',
+		ResultType: 2,
+		ToolTip: 'Remove-AzNetworkManagerManagementGroupConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzNetworkManagerScopeConnection',
+		ListItemText: 'Remove-AzNetworkManagerScopeConnection',
+		ResultType: 2,
+		ToolTip: 'Remove-AzNetworkManagerScopeConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzNetworkManagerSecurityAdminConfiguration',
+		ListItemText: 'Remove-AzNetworkManagerSecurityAdminConfiguration',
+		ResultType: 2,
+		ToolTip: 'Remove-AzNetworkManagerSecurityAdminConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzNetworkManagerSecurityAdminRule',
+		ListItemText: 'Remove-AzNetworkManagerSecurityAdminRule',
+		ResultType: 2,
+		ToolTip: 'Remove-AzNetworkManagerSecurityAdminRule\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzNetworkManagerSecurityAdminRuleCollection',
+		ListItemText: 'Remove-AzNetworkManagerSecurityAdminRuleCollection',
+		ResultType: 2,
+		ToolTip: 'Remove-AzNetworkManagerSecurityAdminRuleCollection\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzNetworkManagerStaticMember',
+		ListItemText: 'Remove-AzNetworkManagerStaticMember',
+		ResultType: 2,
+		ToolTip: 'Remove-AzNetworkManagerStaticMember\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzNetworkManagerSubscriptionConnection',
+		ListItemText: 'Remove-AzNetworkManagerSubscriptionConnection',
+		ResultType: 2,
+		ToolTip: 'Remove-AzNetworkManagerSubscriptionConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzNetworkProfile',
+		ListItemText: 'Remove-AzNetworkProfile',
+		ResultType: 2,
+		ToolTip: 'Remove-AzNetworkProfile\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzNetworkSecurityGroup',
+		ListItemText: 'Remove-AzNetworkSecurityGroup',
+		ResultType: 2,
+		ToolTip: 'Remove-AzNetworkSecurityGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzNetworkSecurityRuleConfig',
+		ListItemText: 'Remove-AzNetworkSecurityRuleConfig',
+		ResultType: 2,
+		ToolTip: 'Remove-AzNetworkSecurityRuleConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzNetworkVirtualAppliance',
+		ListItemText: 'Remove-AzNetworkVirtualAppliance',
+		ResultType: 2,
+		ToolTip: 'Remove-AzNetworkVirtualAppliance\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzNetworkWatcher',
+		ListItemText: 'Remove-AzNetworkWatcher',
+		ResultType: 2,
+		ToolTip: 'Remove-AzNetworkWatcher\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzNetworkWatcherConnectionMonitor',
+		ListItemText: 'Remove-AzNetworkWatcherConnectionMonitor',
+		ResultType: 2,
+		ToolTip: 'Remove-AzNetworkWatcherConnectionMonitor\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzNetworkWatcherFlowLog',
+		ListItemText: 'Remove-AzNetworkWatcherFlowLog',
+		ResultType: 2,
+		ToolTip: 'Remove-AzNetworkWatcherFlowLog\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzNetworkWatcherPacketCapture',
+		ListItemText: 'Remove-AzNetworkWatcherPacketCapture',
+		ResultType: 2,
+		ToolTip: 'Remove-AzNetworkWatcherPacketCapture\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzNotificationHub',
+		ListItemText: 'Remove-AzNotificationHub',
+		ResultType: 2,
+		ToolTip: 'Remove-AzNotificationHub\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzNotificationHubAuthorizationRule',
+		ListItemText: 'Remove-AzNotificationHubAuthorizationRule',
+		ResultType: 2,
+		ToolTip: 'Remove-AzNotificationHubAuthorizationRule\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzNotificationHubAuthorizationRules',
+		ListItemText: 'Remove-AzNotificationHubAuthorizationRules',
+		ResultType: 2,
+		ToolTip: 'Remove-AzNotificationHubAuthorizationRules'
+	},
+	{
+		CompletionText: 'Remove-AzNotificationHubsNamespace',
+		ListItemText: 'Remove-AzNotificationHubsNamespace',
+		ResultType: 2,
+		ToolTip: 'Remove-AzNotificationHubsNamespace\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzNotificationHubsNamespaceAuthorizationRule',
+		ListItemText: 'Remove-AzNotificationHubsNamespaceAuthorizationRule',
+		ResultType: 2,
+		ToolTip: 'Remove-AzNotificationHubsNamespaceAuthorizationRule\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzNotificationHubsNamespaceAuthorizationRules',
+		ListItemText: 'Remove-AzNotificationHubsNamespaceAuthorizationRules',
+		ResultType: 2,
+		ToolTip: 'Remove-AzNotificationHubsNamespaceAuthorizationRules'
+	},
+	{
+		CompletionText: 'Remove-AzOperationalInsightsCluster',
+		ListItemText: 'Remove-AzOperationalInsightsCluster',
+		ResultType: 2,
+		ToolTip: 'Remove-AzOperationalInsightsCluster\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzOperationalInsightsDataExport',
+		ListItemText: 'Remove-AzOperationalInsightsDataExport',
+		ResultType: 2,
+		ToolTip: 'Remove-AzOperationalInsightsDataExport\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzOperationalInsightsDataSource',
+		ListItemText: 'Remove-AzOperationalInsightsDataSource',
+		ResultType: 2,
+		ToolTip: 'Remove-AzOperationalInsightsDataSource\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzOperationalInsightsLinkedService',
+		ListItemText: 'Remove-AzOperationalInsightsLinkedService',
+		ResultType: 2,
+		ToolTip: 'Remove-AzOperationalInsightsLinkedService\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzOperationalInsightsLinkedStorageAccount',
+		ListItemText: 'Remove-AzOperationalInsightsLinkedStorageAccount',
+		ResultType: 2,
+		ToolTip: 'Remove-AzOperationalInsightsLinkedStorageAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzOperationalInsightsSavedSearch',
+		ListItemText: 'Remove-AzOperationalInsightsSavedSearch',
+		ResultType: 2,
+		ToolTip: 'Remove-AzOperationalInsightsSavedSearch\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzOperationalInsightsStorageInsight',
+		ListItemText: 'Remove-AzOperationalInsightsStorageInsight',
+		ResultType: 2,
+		ToolTip: 'Remove-AzOperationalInsightsStorageInsight\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzOperationalInsightsTable',
+		ListItemText: 'Remove-AzOperationalInsightsTable',
+		ResultType: 2,
+		ToolTip: 'Remove-AzOperationalInsightsTable\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzOperationalInsightsWorkspace',
+		ListItemText: 'Remove-AzOperationalInsightsWorkspace',
+		ResultType: 2,
+		ToolTip: 'Remove-AzOperationalInsightsWorkspace\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzP2sVpnGateway',
+		ListItemText: 'Remove-AzP2sVpnGateway',
+		ResultType: 2,
+		ToolTip: 'Remove-AzP2sVpnGateway\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzPolicyAssignment',
+		ListItemText: 'Remove-AzPolicyAssignment',
+		ResultType: 2,
+		ToolTip: 'Remove-AzPolicyAssignment\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzPolicyAttestation',
+		ListItemText: 'Remove-AzPolicyAttestation',
+		ResultType: 2,
+		ToolTip: 'Remove-AzPolicyAttestation\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzPolicyDefinition',
+		ListItemText: 'Remove-AzPolicyDefinition',
+		ResultType: 2,
+		ToolTip: 'Remove-AzPolicyDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzPolicyExemption',
+		ListItemText: 'Remove-AzPolicyExemption',
+		ResultType: 2,
+		ToolTip: 'Remove-AzPolicyExemption\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzPolicyRemediation',
+		ListItemText: 'Remove-AzPolicyRemediation',
+		ResultType: 2,
+		ToolTip: 'Remove-AzPolicyRemediation\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzPolicySetDefinition',
+		ListItemText: 'Remove-AzPolicySetDefinition',
+		ResultType: 2,
+		ToolTip: 'Remove-AzPolicySetDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzPostgreSqlFirewallRule',
+		ListItemText: 'Remove-AzPostgreSqlFirewallRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzPostgreSqlFirewallRule \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzPostgreSqlFlexibleServer',
+		ListItemText: 'Remove-AzPostgreSqlFlexibleServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzPostgreSqlFlexibleServer \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzPostgreSqlFlexibleServerDatabase',
+		ListItemText: 'Remove-AzPostgreSqlFlexibleServerDatabase',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzPostgreSqlFlexibleServerDatabase \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzPostgreSqlFlexibleServerFirewallRule',
+		ListItemText: 'Remove-AzPostgreSqlFlexibleServerFirewallRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzPostgreSqlFlexibleServerFirewallRule \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzPostgreSqlServer',
+		ListItemText: 'Remove-AzPostgreSqlServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzPostgreSqlServer \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzPostgreSqlVirtualNetworkRule',
+		ListItemText: 'Remove-AzPostgreSqlVirtualNetworkRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzPostgreSqlVirtualNetworkRule \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzPowerBIEmbeddedCapacity',
+		ListItemText: 'Remove-AzPowerBIEmbeddedCapacity',
+		ResultType: 2,
+		ToolTip: 'Remove-AzPowerBIEmbeddedCapacity\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzPowerBIWorkspaceCollection',
+		ListItemText: 'Remove-AzPowerBIWorkspaceCollection',
+		ResultType: 2,
+		ToolTip: 'Remove-AzPowerBIWorkspaceCollection\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzPrivateDnsRecordConfig',
+		ListItemText: 'Remove-AzPrivateDnsRecordConfig',
+		ResultType: 2,
+		ToolTip: 'Remove-AzPrivateDnsRecordConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzPrivateDnsRecordSet',
+		ListItemText: 'Remove-AzPrivateDnsRecordSet',
+		ResultType: 2,
+		ToolTip: 'Remove-AzPrivateDnsRecordSet\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzPrivateDnsVirtualNetworkLink',
+		ListItemText: 'Remove-AzPrivateDnsVirtualNetworkLink',
+		ResultType: 2,
+		ToolTip: 'Remove-AzPrivateDnsVirtualNetworkLink\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzPrivateDnsZone',
+		ListItemText: 'Remove-AzPrivateDnsZone',
+		ResultType: 2,
+		ToolTip: 'Remove-AzPrivateDnsZone\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzPrivateDnsZoneGroup',
+		ListItemText: 'Remove-AzPrivateDnsZoneGroup',
+		ResultType: 2,
+		ToolTip: 'Remove-AzPrivateDnsZoneGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzPrivateEndpoint',
+		ListItemText: 'Remove-AzPrivateEndpoint',
+		ResultType: 2,
+		ToolTip: 'Remove-AzPrivateEndpoint\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzPrivateEndpointConnection',
+		ListItemText: 'Remove-AzPrivateEndpointConnection',
+		ResultType: 2,
+		ToolTip: 'Remove-AzPrivateEndpointConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzPrivateLinkAssociation',
+		ListItemText: 'Remove-AzPrivateLinkAssociation',
+		ResultType: 2,
+		ToolTip: 'Remove-AzPrivateLinkAssociation\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzPrivateLinkService',
+		ListItemText: 'Remove-AzPrivateLinkService',
+		ResultType: 2,
+		ToolTip: 'Remove-AzPrivateLinkService\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzProximityPlacementGroup',
+		ListItemText: 'Remove-AzProximityPlacementGroup',
+		ResultType: 2,
+		ToolTip: 'Remove-AzProximityPlacementGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzPublicIpAddress',
+		ListItemText: 'Remove-AzPublicIpAddress',
+		ResultType: 2,
+		ToolTip: 'Remove-AzPublicIpAddress\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzPublicIpPrefix',
+		ListItemText: 'Remove-AzPublicIpPrefix',
+		ResultType: 2,
+		ToolTip: 'Remove-AzPublicIpPrefix\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRecoveryServicesAsrFabric',
+		ListItemText: 'Remove-AzRecoveryServicesAsrFabric',
+		ResultType: 2,
+		ToolTip: 'Remove-AzRecoveryServicesAsrFabric\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRecoveryServicesAsrNetworkMapping',
+		ListItemText: 'Remove-AzRecoveryServicesAsrNetworkMapping',
+		ResultType: 2,
+		ToolTip: 'Remove-AzRecoveryServicesAsrNetworkMapping\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRecoveryServicesAsrPolicy',
+		ListItemText: 'Remove-AzRecoveryServicesAsrPolicy',
+		ResultType: 2,
+		ToolTip: 'Remove-AzRecoveryServicesAsrPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRecoveryServicesAsrProtectionContainer',
+		ListItemText: 'Remove-AzRecoveryServicesAsrProtectionContainer',
+		ResultType: 2,
+		ToolTip: 'Remove-AzRecoveryServicesAsrProtectionContainer\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRecoveryServicesAsrProtectionContainerMapping',
+		ListItemText: 'Remove-AzRecoveryServicesAsrProtectionContainerMapping',
+		ResultType: 2,
+		ToolTip: 'Remove-AzRecoveryServicesAsrProtectionContainerMapping\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRecoveryServicesAsrRecoveryPlan',
+		ListItemText: 'Remove-AzRecoveryServicesAsrRecoveryPlan',
+		ResultType: 2,
+		ToolTip: 'Remove-AzRecoveryServicesAsrRecoveryPlan\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRecoveryServicesAsrReplicationProtectedItem',
+		ListItemText: 'Remove-AzRecoveryServicesAsrReplicationProtectedItem',
+		ResultType: 2,
+		ToolTip: 'Remove-AzRecoveryServicesAsrReplicationProtectedItem\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRecoveryServicesAsrReplicationProtectedItemDisk',
+		ListItemText: 'Remove-AzRecoveryServicesAsrReplicationProtectedItemDisk',
+		ResultType: 2,
+		ToolTip: 'Remove-AzRecoveryServicesAsrReplicationProtectedItemDisk\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRecoveryServicesAsrServicesProvider',
+		ListItemText: 'Remove-AzRecoveryServicesAsrServicesProvider',
+		ResultType: 2,
+		ToolTip: 'Remove-AzRecoveryServicesAsrServicesProvider\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRecoveryServicesAsrStorageClassificationMapping',
+		ListItemText: 'Remove-AzRecoveryServicesAsrStorageClassificationMapping',
+		ResultType: 2,
+		ToolTip: 'Remove-AzRecoveryServicesAsrStorageClassificationMapping\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRecoveryServicesAsrvCenter',
+		ListItemText: 'Remove-AzRecoveryServicesAsrvCenter',
+		ResultType: 2,
+		ToolTip: 'Remove-AzRecoveryServicesAsrvCenter\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRecoveryServicesBackupProtectionPolicy',
+		ListItemText: 'Remove-AzRecoveryServicesBackupProtectionPolicy',
+		ResultType: 2,
+		ToolTip: 'Remove-AzRecoveryServicesBackupProtectionPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRecoveryServicesResourceGuardMapping',
+		ListItemText: 'Remove-AzRecoveryServicesResourceGuardMapping',
+		ResultType: 2,
+		ToolTip: 'Remove-AzRecoveryServicesResourceGuardMapping\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRecoveryServicesVault',
+		ListItemText: 'Remove-AzRecoveryServicesVault',
+		ResultType: 2,
+		ToolTip: 'Remove-AzRecoveryServicesVault\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRedisCache',
+		ListItemText: 'Remove-AzRedisCache',
+		ResultType: 2,
+		ToolTip: 'Remove-AzRedisCache\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRedisCacheDiagnostic',
+		ListItemText: 'Remove-AzRedisCacheDiagnostic',
+		ResultType: 2,
+		ToolTip: 'Remove-AzRedisCacheDiagnostic\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRedisCacheDiagnostics',
+		ListItemText: 'Remove-AzRedisCacheDiagnostics',
+		ResultType: 2,
+		ToolTip: 'Remove-AzRedisCacheDiagnostics'
+	},
+	{
+		CompletionText: 'Remove-AzRedisCacheFirewallRule',
+		ListItemText: 'Remove-AzRedisCacheFirewallRule',
+		ResultType: 2,
+		ToolTip: 'Remove-AzRedisCacheFirewallRule\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRedisCacheLink',
+		ListItemText: 'Remove-AzRedisCacheLink',
+		ResultType: 2,
+		ToolTip: 'Remove-AzRedisCacheLink\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRedisCachePatchSchedule',
+		ListItemText: 'Remove-AzRedisCachePatchSchedule',
+		ResultType: 2,
+		ToolTip: 'Remove-AzRedisCachePatchSchedule\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRedisEnterpriseCache',
+		ListItemText: 'Remove-AzRedisEnterpriseCache',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzRedisEnterpriseCache \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRedisEnterpriseCacheDatabase',
+		ListItemText: 'Remove-AzRedisEnterpriseCacheDatabase',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzRedisEnterpriseCacheDatabase \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRelayAuthorizationRule',
+		ListItemText: 'Remove-AzRelayAuthorizationRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzRelayAuthorizationRule \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRelayHybridConnection',
+		ListItemText: 'Remove-AzRelayHybridConnection',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzRelayHybridConnection \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRelayNamespace',
+		ListItemText: 'Remove-AzRelayNamespace',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzRelayNamespace \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzResource',
+		ListItemText: 'Remove-AzResource',
+		ResultType: 2,
+		ToolTip: 'Remove-AzResource\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzResourceGroup',
+		ListItemText: 'Remove-AzResourceGroup',
+		ResultType: 2,
+		ToolTip: 'Remove-AzResourceGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzResourceGroupDeployment',
+		ListItemText: 'Remove-AzResourceGroupDeployment',
+		ResultType: 2,
+		ToolTip: 'Remove-AzResourceGroupDeployment\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzResourceLock',
+		ListItemText: 'Remove-AzResourceLock',
+		ResultType: 2,
+		ToolTip: 'Remove-AzResourceLock\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzResourceManagementPrivateLink',
+		ListItemText: 'Remove-AzResourceManagementPrivateLink',
+		ResultType: 2,
+		ToolTip: 'Remove-AzResourceManagementPrivateLink\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzResourceMoverMoveCollection',
+		ListItemText: 'Remove-AzResourceMoverMoveCollection',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzResourceMoverMoveCollection \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzResourceMoverMoveResource',
+		ListItemText: 'Remove-AzResourceMoverMoveResource',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzResourceMoverMoveResource \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRestorePoint',
+		ListItemText: 'Remove-AzRestorePoint',
+		ResultType: 2,
+		ToolTip: 'Remove-AzRestorePoint\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRestorePointCollection',
+		ListItemText: 'Remove-AzRestorePointCollection',
+		ResultType: 2,
+		ToolTip: 'Remove-AzRestorePointCollection\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRmStorageContainer',
+		ListItemText: 'Remove-AzRmStorageContainer',
+		ResultType: 2,
+		ToolTip: 'Remove-AzRmStorageContainer\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRmStorageContainerImmutabilityPolicy',
+		ListItemText: 'Remove-AzRmStorageContainerImmutabilityPolicy',
+		ResultType: 2,
+		ToolTip: 'Remove-AzRmStorageContainerImmutabilityPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRmStorageContainerLegalHold',
+		ListItemText: 'Remove-AzRmStorageContainerLegalHold',
+		ResultType: 2,
+		ToolTip: 'Remove-AzRmStorageContainerLegalHold\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRmStorageShare',
+		ListItemText: 'Remove-AzRmStorageShare',
+		ResultType: 2,
+		ToolTip: 'Remove-AzRmStorageShare\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRoleAssignment',
+		ListItemText: 'Remove-AzRoleAssignment',
+		ResultType: 2,
+		ToolTip: 'Remove-AzRoleAssignment\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRoleDefinition',
+		ListItemText: 'Remove-AzRoleDefinition',
+		ResultType: 2,
+		ToolTip: 'Remove-AzRoleDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRoleManagementPolicy',
+		ListItemText: 'Remove-AzRoleManagementPolicy',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzRoleManagementPolicy \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRoleManagementPolicyAssignment',
+		ListItemText: 'Remove-AzRoleManagementPolicyAssignment',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzRoleManagementPolicyAssignment \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRouteConfig',
+		ListItemText: 'Remove-AzRouteConfig',
+		ResultType: 2,
+		ToolTip: 'Remove-AzRouteConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRouteFilter',
+		ListItemText: 'Remove-AzRouteFilter',
+		ResultType: 2,
+		ToolTip: 'Remove-AzRouteFilter\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRouteFilterRuleConfig',
+		ListItemText: 'Remove-AzRouteFilterRuleConfig',
+		ResultType: 2,
+		ToolTip: 'Remove-AzRouteFilterRuleConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRouteMap',
+		ListItemText: 'Remove-AzRouteMap',
+		ResultType: 2,
+		ToolTip: 'Remove-AzRouteMap\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRouteServer',
+		ListItemText: 'Remove-AzRouteServer',
+		ResultType: 2,
+		ToolTip: 'Remove-AzRouteServer\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRouteServerPeer',
+		ListItemText: 'Remove-AzRouteServerPeer',
+		ResultType: 2,
+		ToolTip: 'Remove-AzRouteServerPeer\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRouteTable',
+		ListItemText: 'Remove-AzRouteTable',
+		ResultType: 2,
+		ToolTip: 'Remove-AzRouteTable\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRoutingIntent',
+		ListItemText: 'Remove-AzRoutingIntent',
+		ResultType: 2,
+		ToolTip: 'Remove-AzRoutingIntent\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzRoutingPolicy',
+		ListItemText: 'Remove-AzRoutingPolicy',
+		ResultType: 2,
+		ToolTip: 'Remove-AzRoutingPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzScheduledQueryRule',
+		ListItemText: 'Remove-AzScheduledQueryRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzScheduledQueryRule \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSecurityAssessment',
+		ListItemText: 'Remove-AzSecurityAssessment',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSecurityAssessment\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSecurityAssessmentMetadata',
+		ListItemText: 'Remove-AzSecurityAssessmentMetadata',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSecurityAssessmentMetadata\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSecurityAutomation',
+		ListItemText: 'Remove-AzSecurityAutomation',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSecurityAutomation\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSecurityContact',
+		ListItemText: 'Remove-AzSecurityContact',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSecurityContact\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSecurityPartnerProvider',
+		ListItemText: 'Remove-AzSecurityPartnerProvider',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSecurityPartnerProvider\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSecuritySqlVulnerabilityAssessmentBaseline',
+		ListItemText: 'Remove-AzSecuritySqlVulnerabilityAssessmentBaseline',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSecuritySqlVulnerabilityAssessmentBaseline\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSecurityWorkspaceSetting',
+		ListItemText: 'Remove-AzSecurityWorkspaceSetting',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSecurityWorkspaceSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSentinelAlertRule',
+		ListItemText: 'Remove-AzSentinelAlertRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzSentinelAlertRule \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSentinelAlertRuleAction',
+		ListItemText: 'Remove-AzSentinelAlertRuleAction',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzSentinelAlertRuleAction \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSentinelAutomationRule',
+		ListItemText: 'Remove-AzSentinelAutomationRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzSentinelAutomationRule \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSentinelBookmark',
+		ListItemText: 'Remove-AzSentinelBookmark',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzSentinelBookmark \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSentinelBookmarkRelation',
+		ListItemText: 'Remove-AzSentinelBookmarkRelation',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzSentinelBookmarkRelation \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSentinelDataConnector',
+		ListItemText: 'Remove-AzSentinelDataConnector',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzSentinelDataConnector \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSentinelEntityQuery',
+		ListItemText: 'Remove-AzSentinelEntityQuery',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzSentinelEntityQuery \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSentinelIncident',
+		ListItemText: 'Remove-AzSentinelIncident',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzSentinelIncident \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSentinelIncidentComment',
+		ListItemText: 'Remove-AzSentinelIncidentComment',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzSentinelIncidentComment \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSentinelIncidentRelation',
+		ListItemText: 'Remove-AzSentinelIncidentRelation',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzSentinelIncidentRelation \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSentinelOnboardingState',
+		ListItemText: 'Remove-AzSentinelOnboardingState',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzSentinelOnboardingState \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzServiceBusAuthorizationRule',
+		ListItemText: 'Remove-AzServiceBusAuthorizationRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzServiceBusAuthorizationRule \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzServiceBusGeoDRConfiguration',
+		ListItemText: 'Remove-AzServiceBusGeoDRConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzServiceBusGeoDRConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzServiceBusMigration',
+		ListItemText: 'Remove-AzServiceBusMigration',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzServiceBusMigration \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzServiceBusNamespace',
+		ListItemText: 'Remove-AzServiceBusNamespace',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzServiceBusNamespace \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzServiceBusNamespaceV2',
+		ListItemText: 'Remove-AzServiceBusNamespaceV2',
+		ResultType: 2,
+		ToolTip: 'Remove-AzServiceBusNamespaceV2'
+	},
+	{
+		CompletionText: 'Remove-AzServiceBusPrivateEndpointConnection',
+		ListItemText: 'Remove-AzServiceBusPrivateEndpointConnection',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzServiceBusPrivateEndpointConnection \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzServiceBusQueue',
+		ListItemText: 'Remove-AzServiceBusQueue',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzServiceBusQueue \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzServiceBusRule',
+		ListItemText: 'Remove-AzServiceBusRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzServiceBusRule \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzServiceBusSubscription',
+		ListItemText: 'Remove-AzServiceBusSubscription',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzServiceBusSubscription \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzServiceBusTopic',
+		ListItemText: 'Remove-AzServiceBusTopic',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzServiceBusTopic \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzServiceEndpointPolicy',
+		ListItemText: 'Remove-AzServiceEndpointPolicy',
+		ResultType: 2,
+		ToolTip: 'Remove-AzServiceEndpointPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzServiceEndpointPolicyDefinition',
+		ListItemText: 'Remove-AzServiceEndpointPolicyDefinition',
+		ResultType: 2,
+		ToolTip: 'Remove-AzServiceEndpointPolicyDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzServiceFabricApplication',
+		ListItemText: 'Remove-AzServiceFabricApplication',
+		ResultType: 2,
+		ToolTip: 'Remove-AzServiceFabricApplication\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzServiceFabricApplicationType',
+		ListItemText: 'Remove-AzServiceFabricApplicationType',
+		ResultType: 2,
+		ToolTip: 'Remove-AzServiceFabricApplicationType\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzServiceFabricApplicationTypeVersion',
+		ListItemText: 'Remove-AzServiceFabricApplicationTypeVersion',
+		ResultType: 2,
+		ToolTip: 'Remove-AzServiceFabricApplicationTypeVersion\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzServiceFabricClientCertificate',
+		ListItemText: 'Remove-AzServiceFabricClientCertificate',
+		ResultType: 2,
+		ToolTip: 'Remove-AzServiceFabricClientCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzServiceFabricManagedCluster',
+		ListItemText: 'Remove-AzServiceFabricManagedCluster',
+		ResultType: 2,
+		ToolTip: 'Remove-AzServiceFabricManagedCluster\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzServiceFabricManagedClusterApplication',
+		ListItemText: 'Remove-AzServiceFabricManagedClusterApplication',
+		ResultType: 2,
+		ToolTip: 'Remove-AzServiceFabricManagedClusterApplication\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzServiceFabricManagedClusterApplicationType',
+		ListItemText: 'Remove-AzServiceFabricManagedClusterApplicationType',
+		ResultType: 2,
+		ToolTip: 'Remove-AzServiceFabricManagedClusterApplicationType\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzServiceFabricManagedClusterApplicationTypeVersion',
+		ListItemText: 'Remove-AzServiceFabricManagedClusterApplicationTypeVersion',
+		ResultType: 2,
+		ToolTip: 'Remove-AzServiceFabricManagedClusterApplicationTypeVersion\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzServiceFabricManagedClusterClientCertificate',
+		ListItemText: 'Remove-AzServiceFabricManagedClusterClientCertificate',
+		ResultType: 2,
+		ToolTip: 'Remove-AzServiceFabricManagedClusterClientCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzServiceFabricManagedClusterService',
+		ListItemText: 'Remove-AzServiceFabricManagedClusterService',
+		ResultType: 2,
+		ToolTip: 'Remove-AzServiceFabricManagedClusterService\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzServiceFabricManagedNodeType',
+		ListItemText: 'Remove-AzServiceFabricManagedNodeType',
+		ResultType: 2,
+		ToolTip: 'Remove-AzServiceFabricManagedNodeType\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzServiceFabricManagedNodeTypeVMExtension',
+		ListItemText: 'Remove-AzServiceFabricManagedNodeTypeVMExtension',
+		ResultType: 2,
+		ToolTip: 'Remove-AzServiceFabricManagedNodeTypeVMExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzServiceFabricNode',
+		ListItemText: 'Remove-AzServiceFabricNode',
+		ResultType: 2,
+		ToolTip: 'Remove-AzServiceFabricNode\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzServiceFabricNodeType',
+		ListItemText: 'Remove-AzServiceFabricNodeType',
+		ResultType: 2,
+		ToolTip: 'Remove-AzServiceFabricNodeType\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzServiceFabricService',
+		ListItemText: 'Remove-AzServiceFabricService',
+		ResultType: 2,
+		ToolTip: 'Remove-AzServiceFabricService\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzServiceFabricSetting',
+		ListItemText: 'Remove-AzServiceFabricSetting',
+		ResultType: 2,
+		ToolTip: 'Remove-AzServiceFabricSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzServiceLinkerForContainerApp',
+		ListItemText: 'Remove-AzServiceLinkerForContainerApp',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzServiceLinkerForContainerApp \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzServiceLinkerForSpringCloud',
+		ListItemText: 'Remove-AzServiceLinkerForSpringCloud',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzServiceLinkerForSpringCloud \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzServiceLinkerForWebApp',
+		ListItemText: 'Remove-AzServiceLinkerForWebApp',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzServiceLinkerForWebApp \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSignalR',
+		ListItemText: 'Remove-AzSignalR',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSignalR\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSnapshot',
+		ListItemText: 'Remove-AzSnapshot',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSnapshot\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlDatabase',
+		ListItemText: 'Remove-AzSqlDatabase',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlDatabase\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlDatabaseAudit',
+		ListItemText: 'Remove-AzSqlDatabaseAudit',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlDatabaseAudit\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlDatabaseDataMaskingRule',
+		ListItemText: 'Remove-AzSqlDatabaseDataMaskingRule',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlDatabaseDataMaskingRule\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlDatabaseFailoverGroup',
+		ListItemText: 'Remove-AzSqlDatabaseFailoverGroup',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlDatabaseFailoverGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlDatabaseFromFailoverGroup',
+		ListItemText: 'Remove-AzSqlDatabaseFromFailoverGroup',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlDatabaseFromFailoverGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlDatabaseInstanceFailoverGroup',
+		ListItemText: 'Remove-AzSqlDatabaseInstanceFailoverGroup',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlDatabaseInstanceFailoverGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlDatabaseLongTermRetentionBackup',
+		ListItemText: 'Remove-AzSqlDatabaseLongTermRetentionBackup',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlDatabaseLongTermRetentionBackup\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlDatabaseRestorePoint',
+		ListItemText: 'Remove-AzSqlDatabaseRestorePoint',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlDatabaseRestorePoint\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlDatabaseSecondary',
+		ListItemText: 'Remove-AzSqlDatabaseSecondary',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlDatabaseSecondary\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlDatabaseSensitivityClassification',
+		ListItemText: 'Remove-AzSqlDatabaseSensitivityClassification',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlDatabaseSensitivityClassification\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlDatabaseServerAuditing',
+		ListItemText: 'Remove-AzSqlDatabaseServerAuditing',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlDatabaseServerAuditing'
+	},
+	{
+		CompletionText: 'Remove-AzSqlElasticJob',
+		ListItemText: 'Remove-AzSqlElasticJob',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlElasticJob\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlElasticJobAgent',
+		ListItemText: 'Remove-AzSqlElasticJobAgent',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlElasticJobAgent\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlElasticJobCredential',
+		ListItemText: 'Remove-AzSqlElasticJobCredential',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlElasticJobCredential\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlElasticJobStep',
+		ListItemText: 'Remove-AzSqlElasticJobStep',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlElasticJobStep\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlElasticJobTarget',
+		ListItemText: 'Remove-AzSqlElasticJobTarget',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlElasticJobTarget\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlElasticJobTargetGroup',
+		ListItemText: 'Remove-AzSqlElasticJobTargetGroup',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlElasticJobTargetGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlElasticPool',
+		ListItemText: 'Remove-AzSqlElasticPool',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlElasticPool\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlInstance',
+		ListItemText: 'Remove-AzSqlInstance',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlInstance\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlInstanceActiveDirectoryAdministrator',
+		ListItemText: 'Remove-AzSqlInstanceActiveDirectoryAdministrator',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlInstanceActiveDirectoryAdministrator\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlInstanceDatabase',
+		ListItemText: 'Remove-AzSqlInstanceDatabase',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlInstanceDatabase\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlInstanceDatabaseLongTermRetentionBackup',
+		ListItemText: 'Remove-AzSqlInstanceDatabaseLongTermRetentionBackup',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlInstanceDatabaseLongTermRetentionBackup\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlInstanceDatabaseSensitivityClassification',
+		ListItemText: 'Remove-AzSqlInstanceDatabaseSensitivityClassification',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlInstanceDatabaseSensitivityClassification\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlInstanceKeyVaultKey',
+		ListItemText: 'Remove-AzSqlInstanceKeyVaultKey',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlInstanceKeyVaultKey\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlInstanceLink',
+		ListItemText: 'Remove-AzSqlInstanceLink',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlInstanceLink\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlInstancePool',
+		ListItemText: 'Remove-AzSqlInstancePool',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlInstancePool\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlInstanceServerTrustCertificate',
+		ListItemText: 'Remove-AzSqlInstanceServerTrustCertificate',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlInstanceServerTrustCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlServer',
+		ListItemText: 'Remove-AzSqlServer',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlServer\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlServerActiveDirectoryAdministrator',
+		ListItemText: 'Remove-AzSqlServerActiveDirectoryAdministrator',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlServerActiveDirectoryAdministrator\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlServerAudit',
+		ListItemText: 'Remove-AzSqlServerAudit',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlServerAudit\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlServerCommunicationLink',
+		ListItemText: 'Remove-AzSqlServerCommunicationLink',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlServerCommunicationLink\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlServerDisasterRecoveryConfiguration',
+		ListItemText: 'Remove-AzSqlServerDisasterRecoveryConfiguration',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlServerDisasterRecoveryConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlServerDnsAlias',
+		ListItemText: 'Remove-AzSqlServerDnsAlias',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlServerDnsAlias\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlServerFirewallRule',
+		ListItemText: 'Remove-AzSqlServerFirewallRule',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlServerFirewallRule\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlServerIpv6FirewallRule',
+		ListItemText: 'Remove-AzSqlServerIpv6FirewallRule',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlServerIpv6FirewallRule\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlServerKeyVaultKey',
+		ListItemText: 'Remove-AzSqlServerKeyVaultKey',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlServerKeyVaultKey\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlServerMSSupportAudit',
+		ListItemText: 'Remove-AzSqlServerMSSupportAudit',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlServerMSSupportAudit\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlServerOutboundFirewallRule',
+		ListItemText: 'Remove-AzSqlServerOutboundFirewallRule',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlServerOutboundFirewallRule\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlServerTrustGroup',
+		ListItemText: 'Remove-AzSqlServerTrustGroup',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlServerTrustGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlServerVirtualNetworkRule',
+		ListItemText: 'Remove-AzSqlServerVirtualNetworkRule',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlServerVirtualNetworkRule\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlSyncAgent',
+		ListItemText: 'Remove-AzSqlSyncAgent',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlSyncAgent\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlSyncGroup',
+		ListItemText: 'Remove-AzSqlSyncGroup',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlSyncGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlSyncMember',
+		ListItemText: 'Remove-AzSqlSyncMember',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlSyncMember\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlVirtualCluster',
+		ListItemText: 'Remove-AzSqlVirtualCluster',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSqlVirtualCluster\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlVM',
+		ListItemText: 'Remove-AzSqlVM',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzSqlVM \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSqlVMGroup',
+		ListItemText: 'Remove-AzSqlVMGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzSqlVMGroup \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSshkey',
+		ListItemText: 'Remove-AzSshkey',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSshkey\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStackHciArcSetting',
+		ListItemText: 'Remove-AzStackHciArcSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzStackHciArcSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStackHciCluster',
+		ListItemText: 'Remove-AzStackHciCluster',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzStackHciCluster \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStackHciExtension',
+		ListItemText: 'Remove-AzStackHciExtension',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzStackHciExtension \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStackHCIRemoteSupport',
+		ListItemText: 'Remove-AzStackHCIRemoteSupport',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzStackHCIRemoteSupport \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStackHCIVMAttestation',
+		ListItemText: 'Remove-AzStackHCIVMAttestation',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzStackHCIVMAttestation \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStaticWebApp',
+		ListItemText: 'Remove-AzStaticWebApp',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzStaticWebApp \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStaticWebAppAttachedRepository',
+		ListItemText: 'Remove-AzStaticWebAppAttachedRepository',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzStaticWebAppAttachedRepository \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStaticWebAppBuild',
+		ListItemText: 'Remove-AzStaticWebAppBuild',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzStaticWebAppBuild \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStaticWebAppCustomDomain',
+		ListItemText: 'Remove-AzStaticWebAppCustomDomain',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzStaticWebAppCustomDomain \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStaticWebAppUser',
+		ListItemText: 'Remove-AzStaticWebAppUser',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzStaticWebAppUser \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStorageAccount',
+		ListItemText: 'Remove-AzStorageAccount',
+		ResultType: 2,
+		ToolTip: 'Remove-AzStorageAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStorageAccountManagementPolicy',
+		ListItemText: 'Remove-AzStorageAccountManagementPolicy',
+		ResultType: 2,
+		ToolTip: 'Remove-AzStorageAccountManagementPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStorageAccountNetworkRule',
+		ListItemText: 'Remove-AzStorageAccountNetworkRule',
+		ResultType: 2,
+		ToolTip: 'Remove-AzStorageAccountNetworkRule\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStorageBlob',
+		ListItemText: 'Remove-AzStorageBlob',
+		ResultType: 2,
+		ToolTip: 'Remove-AzStorageBlob\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStorageBlobImmutabilityPolicy',
+		ListItemText: 'Remove-AzStorageBlobImmutabilityPolicy',
+		ResultType: 2,
+		ToolTip: 'Remove-AzStorageBlobImmutabilityPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStorageBlobInventoryPolicy',
+		ListItemText: 'Remove-AzStorageBlobInventoryPolicy',
+		ResultType: 2,
+		ToolTip: 'Remove-AzStorageBlobInventoryPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStorageContainer',
+		ListItemText: 'Remove-AzStorageContainer',
+		ResultType: 2,
+		ToolTip: 'Remove-AzStorageContainer\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStorageContainerStoredAccessPolicy',
+		ListItemText: 'Remove-AzStorageContainerStoredAccessPolicy',
+		ResultType: 2,
+		ToolTip: 'Remove-AzStorageContainerStoredAccessPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStorageCORSRule',
+		ListItemText: 'Remove-AzStorageCORSRule',
+		ResultType: 2,
+		ToolTip: 'Remove-AzStorageCORSRule\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStorageDirectory',
+		ListItemText: 'Remove-AzStorageDirectory',
+		ResultType: 2,
+		ToolTip: 'Remove-AzStorageDirectory\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStorageFile',
+		ListItemText: 'Remove-AzStorageFile',
+		ResultType: 2,
+		ToolTip: 'Remove-AzStorageFile\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStorageLocalUser',
+		ListItemText: 'Remove-AzStorageLocalUser',
+		ResultType: 2,
+		ToolTip: 'Remove-AzStorageLocalUser\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStorageMover',
+		ListItemText: 'Remove-AzStorageMover',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzStorageMover \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStorageMoverEndpoint',
+		ListItemText: 'Remove-AzStorageMoverEndpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzStorageMoverEndpoint \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStorageMoverJobDefinition',
+		ListItemText: 'Remove-AzStorageMoverJobDefinition',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzStorageMoverJobDefinition \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStorageMoverProject',
+		ListItemText: 'Remove-AzStorageMoverProject',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzStorageMoverProject \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStorageObjectReplicationPolicy',
+		ListItemText: 'Remove-AzStorageObjectReplicationPolicy',
+		ResultType: 2,
+		ToolTip: 'Remove-AzStorageObjectReplicationPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStorageQueue',
+		ListItemText: 'Remove-AzStorageQueue',
+		ResultType: 2,
+		ToolTip: 'Remove-AzStorageQueue\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStorageQueueStoredAccessPolicy',
+		ListItemText: 'Remove-AzStorageQueueStoredAccessPolicy',
+		ResultType: 2,
+		ToolTip: 'Remove-AzStorageQueueStoredAccessPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStorageShare',
+		ListItemText: 'Remove-AzStorageShare',
+		ResultType: 2,
+		ToolTip: 'Remove-AzStorageShare\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStorageShareStoredAccessPolicy',
+		ListItemText: 'Remove-AzStorageShareStoredAccessPolicy',
+		ResultType: 2,
+		ToolTip: 'Remove-AzStorageShareStoredAccessPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStorageSyncCloudEndpoint',
+		ListItemText: 'Remove-AzStorageSyncCloudEndpoint',
+		ResultType: 2,
+		ToolTip: 'Remove-AzStorageSyncCloudEndpoint\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStorageSyncGroup',
+		ListItemText: 'Remove-AzStorageSyncGroup',
+		ResultType: 2,
+		ToolTip: 'Remove-AzStorageSyncGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStorageSyncServerEndpoint',
+		ListItemText: 'Remove-AzStorageSyncServerEndpoint',
+		ResultType: 2,
+		ToolTip: 'Remove-AzStorageSyncServerEndpoint\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStorageSyncService',
+		ListItemText: 'Remove-AzStorageSyncService',
+		ResultType: 2,
+		ToolTip: 'Remove-AzStorageSyncService\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStorageTable',
+		ListItemText: 'Remove-AzStorageTable',
+		ResultType: 2,
+		ToolTip: 'Remove-AzStorageTable\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStorageTableStoredAccessPolicy',
+		ListItemText: 'Remove-AzStorageTableStoredAccessPolicy',
+		ResultType: 2,
+		ToolTip: 'Remove-AzStorageTableStoredAccessPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStreamAnalyticsCluster',
+		ListItemText: 'Remove-AzStreamAnalyticsCluster',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzStreamAnalyticsCluster \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStreamAnalyticsFunction',
+		ListItemText: 'Remove-AzStreamAnalyticsFunction',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzStreamAnalyticsFunction \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStreamAnalyticsInput',
+		ListItemText: 'Remove-AzStreamAnalyticsInput',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzStreamAnalyticsInput \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStreamAnalyticsJob',
+		ListItemText: 'Remove-AzStreamAnalyticsJob',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzStreamAnalyticsJob \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzStreamAnalyticsOutput',
+		ListItemText: 'Remove-AzStreamAnalyticsOutput',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzStreamAnalyticsOutput \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSubscriptionDeployment',
+		ListItemText: 'Remove-AzSubscriptionDeployment',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSubscriptionDeployment'
+	},
+	{
+		CompletionText: 'Remove-AzSubscriptionDiagnosticSetting',
+		ListItemText: 'Remove-AzSubscriptionDiagnosticSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzSubscriptionDiagnosticSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSynapseDataFlow',
+		ListItemText: 'Remove-AzSynapseDataFlow',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSynapseDataFlow\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSynapseDataset',
+		ListItemText: 'Remove-AzSynapseDataset',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSynapseDataset\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSynapseFirewallRule',
+		ListItemText: 'Remove-AzSynapseFirewallRule',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSynapseFirewallRule\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSynapseIntegrationRuntime',
+		ListItemText: 'Remove-AzSynapseIntegrationRuntime',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSynapseIntegrationRuntime\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSynapseIntegrationRuntimeNode',
+		ListItemText: 'Remove-AzSynapseIntegrationRuntimeNode',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSynapseIntegrationRuntimeNode\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSynapseKqlScript',
+		ListItemText: 'Remove-AzSynapseKqlScript',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSynapseKqlScript\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSynapseKustoPool',
+		ListItemText: 'Remove-AzSynapseKustoPool',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzSynapseKustoPool \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSynapseKustoPoolAttachedDatabaseConfiguration',
+		ListItemText: 'Remove-AzSynapseKustoPoolAttachedDatabaseConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzSynapseKustoPoolAttachedDatabaseConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSynapseKustoPoolDatabase',
+		ListItemText: 'Remove-AzSynapseKustoPoolDatabase',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzSynapseKustoPoolDatabase \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSynapseKustoPoolDatabasePrincipalAssignment',
+		ListItemText: 'Remove-AzSynapseKustoPoolDatabasePrincipalAssignment',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzSynapseKustoPoolDatabasePrincipalAssignment \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSynapseKustoPoolDataConnection',
+		ListItemText: 'Remove-AzSynapseKustoPoolDataConnection',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzSynapseKustoPoolDataConnection \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSynapseKustoPoolLanguageExtension',
+		ListItemText: 'Remove-AzSynapseKustoPoolLanguageExtension',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzSynapseKustoPoolLanguageExtension \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSynapseKustoPoolPrincipalAssignment',
+		ListItemText: 'Remove-AzSynapseKustoPoolPrincipalAssignment',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzSynapseKustoPoolPrincipalAssignment \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSynapseLinkConnection',
+		ListItemText: 'Remove-AzSynapseLinkConnection',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSynapseLinkConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSynapseLinkedService',
+		ListItemText: 'Remove-AzSynapseLinkedService',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSynapseLinkedService\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSynapseManagedPrivateEndpoint',
+		ListItemText: 'Remove-AzSynapseManagedPrivateEndpoint',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSynapseManagedPrivateEndpoint\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSynapseNotebook',
+		ListItemText: 'Remove-AzSynapseNotebook',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSynapseNotebook\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSynapsePipeline',
+		ListItemText: 'Remove-AzSynapsePipeline',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSynapsePipeline\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSynapseRoleAssignment',
+		ListItemText: 'Remove-AzSynapseRoleAssignment',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSynapseRoleAssignment\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSynapseSparkConfiguration',
+		ListItemText: 'Remove-AzSynapseSparkConfiguration',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSynapseSparkConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSynapseSparkJobDefinition',
+		ListItemText: 'Remove-AzSynapseSparkJobDefinition',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSynapseSparkJobDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSynapseSparkPool',
+		ListItemText: 'Remove-AzSynapseSparkPool',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSynapseSparkPool\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSynapseSqlActiveDirectoryAdministrator',
+		ListItemText: 'Remove-AzSynapseSqlActiveDirectoryAdministrator',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSynapseSqlActiveDirectoryAdministrator\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSynapseSqlAudit',
+		ListItemText: 'Remove-AzSynapseSqlAudit',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSynapseSqlAudit'
+	},
+	{
+		CompletionText: 'Remove-AzSynapseSqlDatabase',
+		ListItemText: 'Remove-AzSynapseSqlDatabase',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSynapseSqlDatabase\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSynapseSqlPool',
+		ListItemText: 'Remove-AzSynapseSqlPool',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSynapseSqlPool\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSynapseSqlPoolAudit',
+		ListItemText: 'Remove-AzSynapseSqlPoolAudit',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSynapseSqlPoolAudit'
+	},
+	{
+		CompletionText: 'Remove-AzSynapseSqlPoolRestorePoint',
+		ListItemText: 'Remove-AzSynapseSqlPoolRestorePoint',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSynapseSqlPoolRestorePoint\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSynapseSqlPoolSensitivityClassification',
+		ListItemText: 'Remove-AzSynapseSqlPoolSensitivityClassification',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSynapseSqlPoolSensitivityClassification\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSynapseSqlScript',
+		ListItemText: 'Remove-AzSynapseSqlScript',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSynapseSqlScript\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSynapseTrigger',
+		ListItemText: 'Remove-AzSynapseTrigger',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSynapseTrigger\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSynapseTriggerSubscription',
+		ListItemText: 'Remove-AzSynapseTriggerSubscription',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSynapseTriggerSubscription\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSynapseWorkspace',
+		ListItemText: 'Remove-AzSynapseWorkspace',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSynapseWorkspace\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSynapseWorkspaceKey',
+		ListItemText: 'Remove-AzSynapseWorkspaceKey',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSynapseWorkspaceKey\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzSynapseWorkspacePackage',
+		ListItemText: 'Remove-AzSynapseWorkspacePackage',
+		ResultType: 2,
+		ToolTip: 'Remove-AzSynapseWorkspacePackage\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzTag',
+		ListItemText: 'Remove-AzTag',
+		ResultType: 2,
+		ToolTip: 'Remove-AzTag\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzTemplateSpec',
+		ListItemText: 'Remove-AzTemplateSpec',
+		ResultType: 2,
+		ToolTip: 'Remove-AzTemplateSpec\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzTenantDeployment',
+		ListItemText: 'Remove-AzTenantDeployment',
+		ResultType: 2,
+		ToolTip: 'Remove-AzTenantDeployment\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzTrafficManagerCustomHeaderFromEndpoint',
+		ListItemText: 'Remove-AzTrafficManagerCustomHeaderFromEndpoint',
+		ResultType: 2,
+		ToolTip: 'Remove-AzTrafficManagerCustomHeaderFromEndpoint\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzTrafficManagerCustomHeaderFromProfile',
+		ListItemText: 'Remove-AzTrafficManagerCustomHeaderFromProfile',
+		ResultType: 2,
+		ToolTip: 'Remove-AzTrafficManagerCustomHeaderFromProfile\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzTrafficManagerEndpoint',
+		ListItemText: 'Remove-AzTrafficManagerEndpoint',
+		ResultType: 2,
+		ToolTip: 'Remove-AzTrafficManagerEndpoint\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzTrafficManagerEndpointConfig',
+		ListItemText: 'Remove-AzTrafficManagerEndpointConfig',
+		ResultType: 2,
+		ToolTip: 'Remove-AzTrafficManagerEndpointConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzTrafficManagerExpectedStatusCodeRange',
+		ListItemText: 'Remove-AzTrafficManagerExpectedStatusCodeRange',
+		ResultType: 2,
+		ToolTip: 'Remove-AzTrafficManagerExpectedStatusCodeRange\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzTrafficManagerIpAddressRange',
+		ListItemText: 'Remove-AzTrafficManagerIpAddressRange',
+		ResultType: 2,
+		ToolTip: 'Remove-AzTrafficManagerIpAddressRange\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzTrafficManagerProfile',
+		ListItemText: 'Remove-AzTrafficManagerProfile',
+		ResultType: 2,
+		ToolTip: 'Remove-AzTrafficManagerProfile\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzUserAssignedIdentity',
+		ListItemText: 'Remove-AzUserAssignedIdentity',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzUserAssignedIdentity \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVHubRouteTable',
+		ListItemText: 'Remove-AzVHubRouteTable',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVHubRouteTable\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVirtualApplianceSite',
+		ListItemText: 'Remove-AzVirtualApplianceSite',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVirtualApplianceSite\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVirtualHub',
+		ListItemText: 'Remove-AzVirtualHub',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVirtualHub\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVirtualHubBgpConnection',
+		ListItemText: 'Remove-AzVirtualHubBgpConnection',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVirtualHubBgpConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVirtualHubRouteTable',
+		ListItemText: 'Remove-AzVirtualHubRouteTable',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVirtualHubRouteTable\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVirtualHubVnetConnection',
+		ListItemText: 'Remove-AzVirtualHubVnetConnection',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVirtualHubVnetConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVirtualNetwork',
+		ListItemText: 'Remove-AzVirtualNetwork',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVirtualNetwork\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVirtualNetworkGateway',
+		ListItemText: 'Remove-AzVirtualNetworkGateway',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVirtualNetworkGateway\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVirtualNetworkGatewayConnection',
+		ListItemText: 'Remove-AzVirtualNetworkGatewayConnection',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVirtualNetworkGatewayConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVirtualNetworkGatewayDefaultSite',
+		ListItemText: 'Remove-AzVirtualNetworkGatewayDefaultSite',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVirtualNetworkGatewayDefaultSite\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVirtualNetworkGatewayIpConfig',
+		ListItemText: 'Remove-AzVirtualNetworkGatewayIpConfig',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVirtualNetworkGatewayIpConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVirtualNetworkGatewayNatRule',
+		ListItemText: 'Remove-AzVirtualNetworkGatewayNatRule',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVirtualNetworkGatewayNatRule\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVirtualNetworkPeering',
+		ListItemText: 'Remove-AzVirtualNetworkPeering',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVirtualNetworkPeering\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVirtualNetworkSubnetConfig',
+		ListItemText: 'Remove-AzVirtualNetworkSubnetConfig',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVirtualNetworkSubnetConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVirtualNetworkTap',
+		ListItemText: 'Remove-AzVirtualNetworkTap',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVirtualNetworkTap\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVirtualRouter',
+		ListItemText: 'Remove-AzVirtualRouter',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVirtualRouter\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVirtualRouterPeer',
+		ListItemText: 'Remove-AzVirtualRouterPeer',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVirtualRouterPeer\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVirtualWan',
+		ListItemText: 'Remove-AzVirtualWan',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVirtualWan\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVM',
+		ListItemText: 'Remove-AzVM',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVM\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVMAccessExtension',
+		ListItemText: 'Remove-AzVMAccessExtension',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVMAccessExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVMAEMExtension',
+		ListItemText: 'Remove-AzVMAEMExtension',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVMAEMExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVMBackup',
+		ListItemText: 'Remove-AzVMBackup',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVMBackup\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVMChefExtension',
+		ListItemText: 'Remove-AzVMChefExtension',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVMChefExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVMCustomScriptExtension',
+		ListItemText: 'Remove-AzVMCustomScriptExtension',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVMCustomScriptExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVMDataDisk',
+		ListItemText: 'Remove-AzVMDataDisk',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVMDataDisk\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVMDiagnosticsExtension',
+		ListItemText: 'Remove-AzVMDiagnosticsExtension',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVMDiagnosticsExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVMDiskEncryptionExtension',
+		ListItemText: 'Remove-AzVMDiskEncryptionExtension',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVMDiskEncryptionExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVMDscExtension',
+		ListItemText: 'Remove-AzVMDscExtension',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVMDscExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVMExtension',
+		ListItemText: 'Remove-AzVMExtension',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVMExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVmGalleryApplication',
+		ListItemText: 'Remove-AzVmGalleryApplication',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVmGalleryApplication\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVMNetworkInterface',
+		ListItemText: 'Remove-AzVMNetworkInterface',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVMNetworkInterface\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVMRunCommand',
+		ListItemText: 'Remove-AzVMRunCommand',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzVMRunCommand \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVMSecret',
+		ListItemText: 'Remove-AzVMSecret',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVMSecret\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVMSqlServerExtension',
+		ListItemText: 'Remove-AzVMSqlServerExtension',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVMSqlServerExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVmss',
+		ListItemText: 'Remove-AzVmss',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVmss\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVmssDataDisk',
+		ListItemText: 'Remove-AzVmssDataDisk',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVmssDataDisk\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVmssDiagnosticsExtension',
+		ListItemText: 'Remove-AzVmssDiagnosticsExtension',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVmssDiagnosticsExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVmssExtension',
+		ListItemText: 'Remove-AzVmssExtension',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVmssExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVmssGalleryApplication',
+		ListItemText: 'Remove-AzVmssGalleryApplication',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVmssGalleryApplication\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVmssNetworkInterfaceConfiguration',
+		ListItemText: 'Remove-AzVmssNetworkInterfaceConfiguration',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVmssNetworkInterfaceConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVmssRunCommand',
+		ListItemText: 'Remove-AzVmssRunCommand',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVmssRunCommand\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVmssVMDataDisk',
+		ListItemText: 'Remove-AzVmssVMDataDisk',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVmssVMDataDisk\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVmssVMRunCommand',
+		ListItemText: 'Remove-AzVmssVMRunCommand',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzVmssVMRunCommand \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVpnClientIpsecParameter',
+		ListItemText: 'Remove-AzVpnClientIpsecParameter',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVpnClientIpsecParameter\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVpnClientRevokedCertificate',
+		ListItemText: 'Remove-AzVpnClientRevokedCertificate',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVpnClientRevokedCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVpnClientRootCertificate',
+		ListItemText: 'Remove-AzVpnClientRootCertificate',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVpnClientRootCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVpnConnection',
+		ListItemText: 'Remove-AzVpnConnection',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVpnConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVpnGateway',
+		ListItemText: 'Remove-AzVpnGateway',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVpnGateway\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVpnGatewayNatRule',
+		ListItemText: 'Remove-AzVpnGatewayNatRule',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVpnGatewayNatRule\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVpnServerConfiguration',
+		ListItemText: 'Remove-AzVpnServerConfiguration',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVpnServerConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVpnServerConfigurationPolicyGroup',
+		ListItemText: 'Remove-AzVpnServerConfigurationPolicyGroup',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVpnServerConfigurationPolicyGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzVpnSite',
+		ListItemText: 'Remove-AzVpnSite',
+		ResultType: 2,
+		ToolTip: 'Remove-AzVpnSite\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzWcfRelay',
+		ListItemText: 'Remove-AzWcfRelay',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzWcfRelay \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzWebApp',
+		ListItemText: 'Remove-AzWebApp',
+		ResultType: 2,
+		ToolTip: 'Remove-AzWebApp\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzWebAppAccessRestrictionRule',
+		ListItemText: 'Remove-AzWebAppAccessRestrictionRule',
+		ResultType: 2,
+		ToolTip: 'Remove-AzWebAppAccessRestrictionRule\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzWebAppBackup',
+		ListItemText: 'Remove-AzWebAppBackup',
+		ResultType: 2,
+		ToolTip: 'Remove-AzWebAppBackup\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzWebAppCertificate',
+		ListItemText: 'Remove-AzWebAppCertificate',
+		ResultType: 2,
+		ToolTip: 'Remove-AzWebAppCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzWebAppContinuousWebJob',
+		ListItemText: 'Remove-AzWebAppContinuousWebJob',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzWebAppContinuousWebJob \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzWebAppSlot',
+		ListItemText: 'Remove-AzWebAppSlot',
+		ResultType: 2,
+		ToolTip: 'Remove-AzWebAppSlot\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzWebAppSlotContinuousWebJob',
+		ListItemText: 'Remove-AzWebAppSlotContinuousWebJob',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzWebAppSlotContinuousWebJob \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzWebAppSlotTriggeredWebJob',
+		ListItemText: 'Remove-AzWebAppSlotTriggeredWebJob',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzWebAppSlotTriggeredWebJob \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzWebAppSSLBinding',
+		ListItemText: 'Remove-AzWebAppSSLBinding',
+		ResultType: 2,
+		ToolTip: 'Remove-AzWebAppSSLBinding\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzWebAppTrafficRouting',
+		ListItemText: 'Remove-AzWebAppTrafficRouting',
+		ResultType: 2,
+		ToolTip: 'Remove-AzWebAppTrafficRouting\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzWebAppTriggeredWebJob',
+		ListItemText: 'Remove-AzWebAppTriggeredWebJob',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzWebAppTriggeredWebJob \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzWebPubSub',
+		ListItemText: 'Remove-AzWebPubSub',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzWebPubSub \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzWebPubSubCustomCertificate',
+		ListItemText: 'Remove-AzWebPubSubCustomCertificate',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzWebPubSubCustomCertificate \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzWebPubSubCustomDomain',
+		ListItemText: 'Remove-AzWebPubSubCustomDomain',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzWebPubSubCustomDomain \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzWebPubSubHub',
+		ListItemText: 'Remove-AzWebPubSubHub',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzWebPubSubHub \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzWvdApplication',
+		ListItemText: 'Remove-AzWvdApplication',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzWvdApplication \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzWvdApplicationGroup',
+		ListItemText: 'Remove-AzWvdApplicationGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzWvdApplicationGroup \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzWvdHostPool',
+		ListItemText: 'Remove-AzWvdHostPool',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzWvdHostPool \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzWvdMsixPackage',
+		ListItemText: 'Remove-AzWvdMsixPackage',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzWvdMsixPackage \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzWvdRegistrationInfo',
+		ListItemText: 'Remove-AzWvdRegistrationInfo',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzWvdRegistrationInfo \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzWvdScalingPlan',
+		ListItemText: 'Remove-AzWvdScalingPlan',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzWvdScalingPlan \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzWvdScalingPlanPooledSchedule',
+		ListItemText: 'Remove-AzWvdScalingPlanPooledSchedule',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzWvdScalingPlanPooledSchedule \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzWvdSessionHost',
+		ListItemText: 'Remove-AzWvdSessionHost',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzWvdSessionHost \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzWvdUserSession',
+		ListItemText: 'Remove-AzWvdUserSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzWvdUserSession \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-AzWvdWorkspace',
+		ListItemText: 'Remove-AzWvdWorkspace',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-AzWvdWorkspace \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-BCDataCacheExtension',
+		ListItemText: 'Remove-BCDataCacheExtension',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-BCDataCacheExtension \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-BcdElement',
+		ListItemText: 'Remove-BcdElement',
+		ResultType: 2,
+		ToolTip: 'Remove-BcdElement\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-BcdEntry',
+		ListItemText: 'Remove-BcdEntry',
+		ResultType: 2,
+		ToolTip: 'Remove-BcdEntry\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-BitLockerKeyProtector',
+		ListItemText: 'Remove-BitLockerKeyProtector',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-BitLockerKeyProtector \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-BitsTransfer',
+		ListItemText: 'Remove-BitsTransfer',
+		ResultType: 2,
+		ToolTip: 'Remove-BitsTransfer\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-CertificateEnrollmentPolicyServer',
+		ListItemText: 'Remove-CertificateEnrollmentPolicyServer',
+		ResultType: 2,
+		ToolTip: 'Remove-CertificateEnrollmentPolicyServer\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-CertificateNotificationTask',
+		ListItemText: 'Remove-CertificateNotificationTask',
+		ResultType: 2,
+		ToolTip: 'Remove-CertificateNotificationTask\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-CimInstance',
+		ListItemText: 'Remove-CimInstance',
+		ResultType: 2,
+		ToolTip: 'Remove-CimInstance\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-CimSession',
+		ListItemText: 'Remove-CimSession',
+		ResultType: 2,
+		ToolTip: 'Remove-CimSession\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-CIPolicyRule',
+		ListItemText: 'Remove-CIPolicyRule',
+		ResultType: 2,
+		ToolTip: 'Remove-CIPolicyRule\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-DAEntryPointTableItem',
+		ListItemText: 'Remove-DAEntryPointTableItem',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-DAEntryPointTableItem \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-DnsClientDohServerAddress',
+		ListItemText: 'Remove-DnsClientDohServerAddress',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-DnsClientDohServerAddress \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-DnsClientNrptRule',
+		ListItemText: 'Remove-DnsClientNrptRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-DnsClientNrptRule \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-DscConfigurationDocument',
+		ListItemText: 'Remove-DscConfigurationDocument',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-DscConfigurationDocument \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-DtcClusterTMMapping',
+		ListItemText: 'Remove-DtcClusterTMMapping',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-DtcClusterTMMapping \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-EtwTraceProvider',
+		ListItemText: 'Remove-EtwTraceProvider',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-EtwTraceProvider \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-EtwTraceSession',
+		ListItemText: 'Remove-EtwTraceSession',
+		ResultType: 2,
+		ToolTip: 'Remove-EtwTraceSession'
+	},
+	{
+		CompletionText: 'Remove-Event',
+		ListItemText: 'Remove-Event',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-Event [-SourceIdentifier] <string> [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nRemove-Event [-EventIdentifier] <int> [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-FileShare',
+		ListItemText: 'Remove-FileShare',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-FileShare \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-GitBranch',
+		ListItemText: 'Remove-GitBranch',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-GitBranch \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-HgsClientHostKey',
+		ListItemText: 'Remove-HgsClientHostKey',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-HgsClientHostKey \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-HgsGuardian',
+		ListItemText: 'Remove-HgsGuardian',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-HgsGuardian \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-HnsEndpoint',
+		ListItemText: 'Remove-HnsEndpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-HnsEndpoint \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-HnsNamespace',
+		ListItemText: 'Remove-HnsNamespace',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-HnsNamespace \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-HnsNetwork',
+		ListItemText: 'Remove-HnsNetwork',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-HnsNetwork \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-HnsPolicyList',
+		ListItemText: 'Remove-HnsPolicyList',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-HnsPolicyList \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-InitiatorId',
+		ListItemText: 'Remove-InitiatorId',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-InitiatorId \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-InitiatorIdFromMaskingSet',
+		ListItemText: 'Remove-InitiatorIdFromMaskingSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-InitiatorIdFromMaskingSet \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-IscsiTargetPortal',
+		ListItemText: 'Remove-IscsiTargetPortal',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-IscsiTargetPortal \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-Item',
+		ListItemText: 'Remove-Item',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-Item [-Path] <string[]> [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Recurse] [-Force] [-Credential <pscredential>] [-WhatIf] [-Confirm] [-Stream <string[]>] [<CommonParameters>]\\r\\n\\r\\nRemove-Item -LiteralPath <string[]> [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Recurse] [-Force] [-Credential <pscredential>] [-WhatIf] [-Confirm] [-Stream <string[]>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-ItemProperty',
+		ListItemText: 'Remove-ItemProperty',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-ItemProperty [-Path] <string[]> [-Name] <string[]> [-Force] [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Credential <pscredential>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nRemove-ItemProperty [-Name] <string[]> -LiteralPath <string[]> [-Force] [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Credential <pscredential>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-Job',
+		ListItemText: 'Remove-Job',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-Job [-Id] <int[]> [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nRemove-Job [-Job] <Job[]> [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nRemove-Job [-InstanceId] <guid[]> [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nRemove-Job [-Name] <string[]> [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nRemove-Job [-Filter] <hashtable> [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nRemove-Job [-State] <JobState> [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nRemove-Job [-Command <string[]>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-JobTrigger',
+		ListItemText: 'Remove-JobTrigger',
+		ResultType: 2,
+		ToolTip: 'Remove-JobTrigger\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-LocalGroup',
+		ListItemText: 'Remove-LocalGroup',
+		ResultType: 2,
+		ToolTip: 'Remove-LocalGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-LocalGroupMember',
+		ListItemText: 'Remove-LocalGroupMember',
+		ResultType: 2,
+		ToolTip: 'Remove-LocalGroupMember\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-LocalUser',
+		ListItemText: 'Remove-LocalUser',
+		ResultType: 2,
+		ToolTip: 'Remove-LocalUser\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-MaskingSet',
+		ListItemText: 'Remove-MaskingSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-MaskingSet \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-Module',
+		ListItemText: 'Remove-Module',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-Module [-Name] <string[]> [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nRemove-Module [-FullyQualifiedName] <ModuleSpecification[]> [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nRemove-Module [-ModuleInfo] <psmoduleinfo[]> [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-MpPreference',
+		ListItemText: 'Remove-MpPreference',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-MpPreference \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-MpThreat',
+		ListItemText: 'Remove-MpThreat',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-MpThreat \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetAdapterAdvancedProperty',
+		ListItemText: 'Remove-NetAdapterAdvancedProperty',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetAdapterAdvancedProperty \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetEventNetworkAdapter',
+		ListItemText: 'Remove-NetEventNetworkAdapter',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetEventNetworkAdapter \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetEventPacketCaptureProvider',
+		ListItemText: 'Remove-NetEventPacketCaptureProvider',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetEventPacketCaptureProvider \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetEventProvider',
+		ListItemText: 'Remove-NetEventProvider',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetEventProvider \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetEventSession',
+		ListItemText: 'Remove-NetEventSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetEventSession \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetEventVFPProvider',
+		ListItemText: 'Remove-NetEventVFPProvider',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetEventVFPProvider \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetEventVmNetworkAdapter',
+		ListItemText: 'Remove-NetEventVmNetworkAdapter',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetEventVmNetworkAdapter \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetEventVmSwitch',
+		ListItemText: 'Remove-NetEventVmSwitch',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetEventVmSwitch \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetEventVmSwitchProvider',
+		ListItemText: 'Remove-NetEventVmSwitchProvider',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetEventVmSwitchProvider \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetEventWFPCaptureProvider',
+		ListItemText: 'Remove-NetEventWFPCaptureProvider',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetEventWFPCaptureProvider \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetFirewallDynamicKeywordAddress',
+		ListItemText: 'Remove-NetFirewallDynamicKeywordAddress',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetFirewallDynamicKeywordAddress \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetFirewallHyperVProfile',
+		ListItemText: 'Remove-NetFirewallHyperVProfile',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetFirewallHyperVProfile \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetFirewallHyperVRule',
+		ListItemText: 'Remove-NetFirewallHyperVRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetFirewallHyperVRule \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetFirewallHyperVVMSetting',
+		ListItemText: 'Remove-NetFirewallHyperVVMSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetFirewallHyperVVMSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetFirewallRule',
+		ListItemText: 'Remove-NetFirewallRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetFirewallRule \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetIPAddress',
+		ListItemText: 'Remove-NetIPAddress',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetIPAddress \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetIPHttpsCertBinding',
+		ListItemText: 'Remove-NetIPHttpsCertBinding',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetIPHttpsCertBinding \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetIPHttpsConfiguration',
+		ListItemText: 'Remove-NetIPHttpsConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetIPHttpsConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetIPsecDospSetting',
+		ListItemText: 'Remove-NetIPsecDospSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetIPsecDospSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetIPsecMainModeCryptoSet',
+		ListItemText: 'Remove-NetIPsecMainModeCryptoSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetIPsecMainModeCryptoSet \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetIPsecMainModeRule',
+		ListItemText: 'Remove-NetIPsecMainModeRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetIPsecMainModeRule \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetIPsecMainModeSA',
+		ListItemText: 'Remove-NetIPsecMainModeSA',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetIPsecMainModeSA \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetIPsecPhase1AuthSet',
+		ListItemText: 'Remove-NetIPsecPhase1AuthSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetIPsecPhase1AuthSet \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetIPsecPhase2AuthSet',
+		ListItemText: 'Remove-NetIPsecPhase2AuthSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetIPsecPhase2AuthSet \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetIPsecQuickModeCryptoSet',
+		ListItemText: 'Remove-NetIPsecQuickModeCryptoSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetIPsecQuickModeCryptoSet \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetIPsecQuickModeSA',
+		ListItemText: 'Remove-NetIPsecQuickModeSA',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetIPsecQuickModeSA \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetIPsecRule',
+		ListItemText: 'Remove-NetIPsecRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetIPsecRule \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetLbfoTeam',
+		ListItemText: 'Remove-NetLbfoTeam',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetLbfoTeam \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetLbfoTeamMember',
+		ListItemText: 'Remove-NetLbfoTeamMember',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetLbfoTeamMember \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetLbfoTeamNic',
+		ListItemText: 'Remove-NetLbfoTeamNic',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetLbfoTeamNic \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetNat',
+		ListItemText: 'Remove-NetNat',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetNat \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetNatExternalAddress',
+		ListItemText: 'Remove-NetNatExternalAddress',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetNatExternalAddress \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetNatStaticMapping',
+		ListItemText: 'Remove-NetNatStaticMapping',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetNatStaticMapping \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetNatTransitionConfiguration',
+		ListItemText: 'Remove-NetNatTransitionConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetNatTransitionConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetNeighbor',
+		ListItemText: 'Remove-NetNeighbor',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetNeighbor \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetQosPolicy',
+		ListItemText: 'Remove-NetQosPolicy',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetQosPolicy \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetRoute',
+		ListItemText: 'Remove-NetRoute',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetRoute \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetSwitchTeam',
+		ListItemText: 'Remove-NetSwitchTeam',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetSwitchTeam \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetSwitchTeamMember',
+		ListItemText: 'Remove-NetSwitchTeamMember',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetSwitchTeamMember \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetTransportFilter',
+		ListItemText: 'Remove-NetTransportFilter',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetTransportFilter \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetworkSwitchEthernetPortIPAddress',
+		ListItemText: 'Remove-NetworkSwitchEthernetPortIPAddress',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetworkSwitchEthernetPortIPAddress \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-NetworkSwitchVlan',
+		ListItemText: 'Remove-NetworkSwitchVlan',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-NetworkSwitchVlan \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-OdbcDsn',
+		ListItemText: 'Remove-OdbcDsn',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-OdbcDsn \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-Partition',
+		ListItemText: 'Remove-Partition',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-Partition \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-PartitionAccessPath',
+		ListItemText: 'Remove-PartitionAccessPath',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-PartitionAccessPath \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-PhysicalDisk',
+		ListItemText: 'Remove-PhysicalDisk',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-PhysicalDisk \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-PmemDedicatedMemory',
+		ListItemText: 'Remove-PmemDedicatedMemory',
+		ResultType: 2,
+		ToolTip: 'Remove-PmemDedicatedMemory\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-PmemDisk',
+		ListItemText: 'Remove-PmemDisk',
+		ResultType: 2,
+		ToolTip: 'Remove-PmemDisk\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-PoshGitFromProfile',
+		ListItemText: 'Remove-PoshGitFromProfile',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-PoshGitFromProfile \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-Printer',
+		ListItemText: 'Remove-Printer',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-Printer \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-PrinterDriver',
+		ListItemText: 'Remove-PrinterDriver',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-PrinterDriver \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-PrinterPort',
+		ListItemText: 'Remove-PrinterPort',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-PrinterPort \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-PrintJob',
+		ListItemText: 'Remove-PrintJob',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-PrintJob \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-ProvisionedAppPackage',
+		ListItemText: 'Remove-ProvisionedAppPackage',
+		ResultType: 2,
+		ToolTip: 'Remove-ProvisionedAppPackage'
+	},
+	{
+		CompletionText: 'Remove-ProvisionedAppSharedPackageContainer',
+		ListItemText: 'Remove-ProvisionedAppSharedPackageContainer',
+		ResultType: 2,
+		ToolTip: 'Remove-ProvisionedAppSharedPackageContainer'
+	},
+	{
+		CompletionText: 'Remove-ProvisionedAppxPackage',
+		ListItemText: 'Remove-ProvisionedAppxPackage',
+		ResultType: 2,
+		ToolTip: 'Remove-ProvisionedAppxPackage'
+	},
+	{
+		CompletionText: 'Remove-ProvisioningPackage',
+		ListItemText: 'Remove-ProvisioningPackage',
+		ResultType: 2,
+		ToolTip: 'Remove-ProvisioningPackage'
+	},
+	{
+		CompletionText: 'Remove-PSBreakpoint',
+		ListItemText: 'Remove-PSBreakpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-PSBreakpoint [-Breakpoint] <Breakpoint[]> [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nRemove-PSBreakpoint [-Id] <int[]> [-Runspace <runspace>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-PSDrive',
+		ListItemText: 'Remove-PSDrive',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-PSDrive [-Name] <string[]> [-PSProvider <string[]>] [-Scope <string>] [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nRemove-PSDrive [-LiteralName] <string[]> [-PSProvider <string[]>] [-Scope <string>] [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-PSReadLineKeyHandler',
+		ListItemText: 'Remove-PSReadLineKeyHandler',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-PSReadLineKeyHandler [-Chord] <string[]> [-ViMode <ViMode>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-PSSession',
+		ListItemText: 'Remove-PSSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-PSSession [-Id] <int[]> [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nRemove-PSSession [-Session] <PSSession[]> [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nRemove-PSSession -ContainerId <string[]> [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nRemove-PSSession -VMId <guid[]> [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nRemove-PSSession -VMName <string[]> [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nRemove-PSSession -InstanceId <guid[]> [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nRemove-PSSession -Name <string[]> [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nRemove-PSSession [-ComputerName] <string[]> [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-Service',
+		ListItemText: 'Remove-Service',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-Service [-Name] <string> [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nRemove-Service [-InputObject <ServiceController>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-SmbBandwidthLimit',
+		ListItemText: 'Remove-SmbBandwidthLimit',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-SmbBandwidthLimit \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-SmbClientCertificateMapping',
+		ListItemText: 'Remove-SmbClientCertificateMapping',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-SmbClientCertificateMapping \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-SMBComponent',
+		ListItemText: 'Remove-SMBComponent',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-SMBComponent \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-SmbGlobalMapping',
+		ListItemText: 'Remove-SmbGlobalMapping',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-SmbGlobalMapping \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-SmbMapping',
+		ListItemText: 'Remove-SmbMapping',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-SmbMapping \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-SmbMultichannelConstraint',
+		ListItemText: 'Remove-SmbMultichannelConstraint',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-SmbMultichannelConstraint \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-SmbServerCertificateMapping',
+		ListItemText: 'Remove-SmbServerCertificateMapping',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-SmbServerCertificateMapping \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-SmbShare',
+		ListItemText: 'Remove-SmbShare',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-SmbShare \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-StorageBusBinding',
+		ListItemText: 'Remove-StorageBusBinding',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-StorageBusBinding \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-StorageFaultDomain',
+		ListItemText: 'Remove-StorageFaultDomain',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-StorageFaultDomain \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-StorageFileServer',
+		ListItemText: 'Remove-StorageFileServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-StorageFileServer \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-StorageHealthIntent',
+		ListItemText: 'Remove-StorageHealthIntent',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-StorageHealthIntent \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-StorageHealthSetting',
+		ListItemText: 'Remove-StorageHealthSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-StorageHealthSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-StoragePool',
+		ListItemText: 'Remove-StoragePool',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-StoragePool \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-StorageTier',
+		ListItemText: 'Remove-StorageTier',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-StorageTier \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-TargetPortFromMaskingSet',
+		ListItemText: 'Remove-TargetPortFromMaskingSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-TargetPortFromMaskingSet \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-TrustedProvisioningCertificate',
+		ListItemText: 'Remove-TrustedProvisioningCertificate',
+		ResultType: 2,
+		ToolTip: 'Remove-TrustedProvisioningCertificate'
+	},
+	{
+		CompletionText: 'Remove-TypeData',
+		ListItemText: 'Remove-TypeData',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-TypeData -TypeData <TypeData> [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nRemove-TypeData [-TypeName] <string> [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nRemove-TypeData -Path <string[]> [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-Variable',
+		ListItemText: 'Remove-Variable',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-Variable [-Name] <string[]> [-Include <string[]>] [-Exclude <string[]>] [-Force] [-Scope <string>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VHDSnapshot',
+		ListItemText: 'Remove-VHDSnapshot',
+		ResultType: 2,
+		ToolTip: 'Remove-VHDSnapshot\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VirtualDisk',
+		ListItemText: 'Remove-VirtualDisk',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-VirtualDisk \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VirtualDiskFromMaskingSet',
+		ListItemText: 'Remove-VirtualDiskFromMaskingSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-VirtualDiskFromMaskingSet \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VM',
+		ListItemText: 'Remove-VM',
+		ResultType: 2,
+		ToolTip: 'Remove-VM\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VMAssignableDevice',
+		ListItemText: 'Remove-VMAssignableDevice',
+		ResultType: 2,
+		ToolTip: 'Remove-VMAssignableDevice\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VMCheckpoint',
+		ListItemText: 'Remove-VMCheckpoint',
+		ResultType: 2,
+		ToolTip: 'Remove-VMCheckpoint'
+	},
+	{
+		CompletionText: 'Remove-VMDirectVirtualDisk',
+		ListItemText: 'Remove-VMDirectVirtualDisk',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-VMDirectVirtualDisk \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VMDvdDrive',
+		ListItemText: 'Remove-VMDvdDrive',
+		ResultType: 2,
+		ToolTip: 'Remove-VMDvdDrive\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VMFibreChannelHba',
+		ListItemText: 'Remove-VMFibreChannelHba',
+		ResultType: 2,
+		ToolTip: 'Remove-VMFibreChannelHba\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VMGpuPartitionAdapter',
+		ListItemText: 'Remove-VMGpuPartitionAdapter',
+		ResultType: 2,
+		ToolTip: 'Remove-VMGpuPartitionAdapter\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VMGroup',
+		ListItemText: 'Remove-VMGroup',
+		ResultType: 2,
+		ToolTip: 'Remove-VMGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VMGroupMember',
+		ListItemText: 'Remove-VMGroupMember',
+		ResultType: 2,
+		ToolTip: 'Remove-VMGroupMember\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VMHardDiskDrive',
+		ListItemText: 'Remove-VMHardDiskDrive',
+		ResultType: 2,
+		ToolTip: 'Remove-VMHardDiskDrive\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VMHostAssignableDevice',
+		ListItemText: 'Remove-VMHostAssignableDevice',
+		ResultType: 2,
+		ToolTip: 'Remove-VMHostAssignableDevice\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VMKeyStorageDrive',
+		ListItemText: 'Remove-VMKeyStorageDrive',
+		ResultType: 2,
+		ToolTip: 'Remove-VMKeyStorageDrive\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VMMigrationNetwork',
+		ListItemText: 'Remove-VMMigrationNetwork',
+		ResultType: 2,
+		ToolTip: 'Remove-VMMigrationNetwork\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VMNetworkAdapter',
+		ListItemText: 'Remove-VMNetworkAdapter',
+		ResultType: 2,
+		ToolTip: 'Remove-VMNetworkAdapter\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VMNetworkAdapterAcl',
+		ListItemText: 'Remove-VMNetworkAdapterAcl',
+		ResultType: 2,
+		ToolTip: 'Remove-VMNetworkAdapterAcl\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VMNetworkAdapterExtendedAcl',
+		ListItemText: 'Remove-VMNetworkAdapterExtendedAcl',
+		ResultType: 2,
+		ToolTip: 'Remove-VMNetworkAdapterExtendedAcl\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VMNetworkAdapterRoutingDomainMapping',
+		ListItemText: 'Remove-VMNetworkAdapterRoutingDomainMapping',
+		ResultType: 2,
+		ToolTip: 'Remove-VMNetworkAdapterRoutingDomainMapping\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VMNetworkAdapterTeamMapping',
+		ListItemText: 'Remove-VMNetworkAdapterTeamMapping',
+		ResultType: 2,
+		ToolTip: 'Remove-VMNetworkAdapterTeamMapping\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VMPmemController',
+		ListItemText: 'Remove-VMPmemController',
+		ResultType: 2,
+		ToolTip: 'Remove-VMPmemController\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VMRemoteFx3dVideoAdapter',
+		ListItemText: 'Remove-VMRemoteFx3dVideoAdapter',
+		ResultType: 2,
+		ToolTip: 'Remove-VMRemoteFx3dVideoAdapter\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VMReplication',
+		ListItemText: 'Remove-VMReplication',
+		ResultType: 2,
+		ToolTip: 'Remove-VMReplication\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VMReplicationAuthorizationEntry',
+		ListItemText: 'Remove-VMReplicationAuthorizationEntry',
+		ResultType: 2,
+		ToolTip: 'Remove-VMReplicationAuthorizationEntry\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VMResourcePool',
+		ListItemText: 'Remove-VMResourcePool',
+		ResultType: 2,
+		ToolTip: 'Remove-VMResourcePool\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VMSan',
+		ListItemText: 'Remove-VMSan',
+		ResultType: 2,
+		ToolTip: 'Remove-VMSan\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VMSavedState',
+		ListItemText: 'Remove-VMSavedState',
+		ResultType: 2,
+		ToolTip: 'Remove-VMSavedState\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VMScsiController',
+		ListItemText: 'Remove-VMScsiController',
+		ResultType: 2,
+		ToolTip: 'Remove-VMScsiController\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VMSnapshot',
+		ListItemText: 'Remove-VMSnapshot',
+		ResultType: 2,
+		ToolTip: 'Remove-VMSnapshot\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VMStoragePath',
+		ListItemText: 'Remove-VMStoragePath',
+		ResultType: 2,
+		ToolTip: 'Remove-VMStoragePath\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VMSwitch',
+		ListItemText: 'Remove-VMSwitch',
+		ResultType: 2,
+		ToolTip: 'Remove-VMSwitch\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VMSwitchExtensionPortFeature',
+		ListItemText: 'Remove-VMSwitchExtensionPortFeature',
+		ResultType: 2,
+		ToolTip: 'Remove-VMSwitchExtensionPortFeature\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VMSwitchExtensionSwitchFeature',
+		ListItemText: 'Remove-VMSwitchExtensionSwitchFeature',
+		ResultType: 2,
+		ToolTip: 'Remove-VMSwitchExtensionSwitchFeature\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VMSwitchTeamMember',
+		ListItemText: 'Remove-VMSwitchTeamMember',
+		ResultType: 2,
+		ToolTip: 'Remove-VMSwitchTeamMember\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VpnConnection',
+		ListItemText: 'Remove-VpnConnection',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-VpnConnection \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VpnConnectionRoute',
+		ListItemText: 'Remove-VpnConnectionRoute',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-VpnConnectionRoute \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VpnConnectionTriggerApplication',
+		ListItemText: 'Remove-VpnConnectionTriggerApplication',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-VpnConnectionTriggerApplication \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VpnConnectionTriggerDnsConfiguration',
+		ListItemText: 'Remove-VpnConnectionTriggerDnsConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-VpnConnectionTriggerDnsConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-VpnConnectionTriggerTrustedNetwork',
+		ListItemText: 'Remove-VpnConnectionTriggerTrustedNetwork',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-VpnConnectionTriggerTrustedNetwork \\r\\n'
+	},
+	{
+		CompletionText: 'Remove-WindowsCapability',
+		ListItemText: 'Remove-WindowsCapability',
+		ResultType: 2,
+		ToolTip: 'Remove-WindowsCapability\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-WindowsDriver',
+		ListItemText: 'Remove-WindowsDriver',
+		ResultType: 2,
+		ToolTip: 'Remove-WindowsDriver\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-WindowsImage',
+		ListItemText: 'Remove-WindowsImage',
+		ResultType: 2,
+		ToolTip: 'Remove-WindowsImage\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-WindowsPackage',
+		ListItemText: 'Remove-WindowsPackage',
+		ResultType: 2,
+		ToolTip: 'Remove-WindowsPackage\\r\\n'
+	},
+	{
+		CompletionText: 'Remove-WSManInstance',
+		ListItemText: 'Remove-WSManInstance',
+		ResultType: 2,
+		ToolTip: 'Remove-WSManInstance\\r\\n'
+	},
+	{
+		CompletionText: 'ren',
+		ListItemText: 'ren',
+		ResultType: 2,
+		ToolTip: 'Rename-Item'
+	},
+	{
+		CompletionText: 'Rename-AzContext',
+		ListItemText: 'Rename-AzContext',
+		ResultType: 2,
+		ToolTip: 'Rename-AzContext\\r\\n'
+	},
+	{
+		CompletionText: 'Rename-AzStorageDirectory',
+		ListItemText: 'Rename-AzStorageDirectory',
+		ResultType: 2,
+		ToolTip: 'Rename-AzStorageDirectory\\r\\n'
+	},
+	{
+		CompletionText: 'Rename-AzStorageFile',
+		ListItemText: 'Rename-AzStorageFile',
+		ResultType: 2,
+		ToolTip: 'Rename-AzStorageFile\\r\\n'
+	},
+	{
+		CompletionText: 'Rename-Computer',
+		ListItemText: 'Rename-Computer',
+		ResultType: 2,
+		ToolTip: '\\r\\nRename-Computer [-NewName] <string> [-ComputerName <string>] [-PassThru] [-DomainCredential <pscredential>] [-LocalCredential <pscredential>] [-Force] [-Restart] [-WsmanAuthentication <string>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Rename-DAEntryPointTableItem',
+		ListItemText: 'Rename-DAEntryPointTableItem',
+		ResultType: 2,
+		ToolTip: '\\r\\nRename-DAEntryPointTableItem \\r\\n'
+	},
+	{
+		CompletionText: 'Rename-Item',
+		ListItemText: 'Rename-Item',
+		ResultType: 2,
+		ToolTip: '\\r\\nRename-Item [-Path] <string> [-NewName] <string> [-Force] [-PassThru] [-Credential <pscredential>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nRename-Item [-NewName] <string> -LiteralPath <string> [-Force] [-PassThru] [-Credential <pscredential>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Rename-ItemProperty',
+		ListItemText: 'Rename-ItemProperty',
+		ResultType: 2,
+		ToolTip: '\\r\\nRename-ItemProperty [-Path] <string> [-Name] <string> [-NewName] <string> [-PassThru] [-Force] [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Credential <pscredential>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nRename-ItemProperty [-Name] <string> [-NewName] <string> -LiteralPath <string> [-PassThru] [-Force] [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Credential <pscredential>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Rename-LocalGroup',
+		ListItemText: 'Rename-LocalGroup',
+		ResultType: 2,
+		ToolTip: 'Rename-LocalGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Rename-LocalUser',
+		ListItemText: 'Rename-LocalUser',
+		ResultType: 2,
+		ToolTip: 'Rename-LocalUser\\r\\n'
+	},
+	{
+		CompletionText: 'Rename-MaskingSet',
+		ListItemText: 'Rename-MaskingSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nRename-MaskingSet \\r\\n'
+	},
+	{
+		CompletionText: 'Rename-NetAdapter',
+		ListItemText: 'Rename-NetAdapter',
+		ResultType: 2,
+		ToolTip: '\\r\\nRename-NetAdapter \\r\\n'
+	},
+	{
+		CompletionText: 'Rename-NetFirewallHyperVRule',
+		ListItemText: 'Rename-NetFirewallHyperVRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nRename-NetFirewallHyperVRule \\r\\n'
+	},
+	{
+		CompletionText: 'Rename-NetFirewallRule',
+		ListItemText: 'Rename-NetFirewallRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nRename-NetFirewallRule \\r\\n'
+	},
+	{
+		CompletionText: 'Rename-NetIPHttpsConfiguration',
+		ListItemText: 'Rename-NetIPHttpsConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nRename-NetIPHttpsConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Rename-NetIPsecMainModeCryptoSet',
+		ListItemText: 'Rename-NetIPsecMainModeCryptoSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nRename-NetIPsecMainModeCryptoSet \\r\\n'
+	},
+	{
+		CompletionText: 'Rename-NetIPsecMainModeRule',
+		ListItemText: 'Rename-NetIPsecMainModeRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nRename-NetIPsecMainModeRule \\r\\n'
+	},
+	{
+		CompletionText: 'Rename-NetIPsecPhase1AuthSet',
+		ListItemText: 'Rename-NetIPsecPhase1AuthSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nRename-NetIPsecPhase1AuthSet \\r\\n'
+	},
+	{
+		CompletionText: 'Rename-NetIPsecPhase2AuthSet',
+		ListItemText: 'Rename-NetIPsecPhase2AuthSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nRename-NetIPsecPhase2AuthSet \\r\\n'
+	},
+	{
+		CompletionText: 'Rename-NetIPsecQuickModeCryptoSet',
+		ListItemText: 'Rename-NetIPsecQuickModeCryptoSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nRename-NetIPsecQuickModeCryptoSet \\r\\n'
+	},
+	{
+		CompletionText: 'Rename-NetIPsecRule',
+		ListItemText: 'Rename-NetIPsecRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nRename-NetIPsecRule \\r\\n'
+	},
+	{
+		CompletionText: 'Rename-NetLbfoTeam',
+		ListItemText: 'Rename-NetLbfoTeam',
+		ResultType: 2,
+		ToolTip: '\\r\\nRename-NetLbfoTeam \\r\\n'
+	},
+	{
+		CompletionText: 'Rename-NetSwitchTeam',
+		ListItemText: 'Rename-NetSwitchTeam',
+		ResultType: 2,
+		ToolTip: '\\r\\nRename-NetSwitchTeam \\r\\n'
+	},
+	{
+		CompletionText: 'Rename-Printer',
+		ListItemText: 'Rename-Printer',
+		ResultType: 2,
+		ToolTip: '\\r\\nRename-Printer \\r\\n'
+	},
+	{
+		CompletionText: 'Rename-VM',
+		ListItemText: 'Rename-VM',
+		ResultType: 2,
+		ToolTip: 'Rename-VM\\r\\n'
+	},
+	{
+		CompletionText: 'Rename-VMCheckpoint',
+		ListItemText: 'Rename-VMCheckpoint',
+		ResultType: 2,
+		ToolTip: 'Rename-VMCheckpoint'
+	},
+	{
+		CompletionText: 'Rename-VMGroup',
+		ListItemText: 'Rename-VMGroup',
+		ResultType: 2,
+		ToolTip: 'Rename-VMGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Rename-VMNetworkAdapter',
+		ListItemText: 'Rename-VMNetworkAdapter',
+		ResultType: 2,
+		ToolTip: 'Rename-VMNetworkAdapter\\r\\n'
+	},
+	{
+		CompletionText: 'Rename-VMResourcePool',
+		ListItemText: 'Rename-VMResourcePool',
+		ResultType: 2,
+		ToolTip: 'Rename-VMResourcePool\\r\\n'
+	},
+	{
+		CompletionText: 'Rename-VMSan',
+		ListItemText: 'Rename-VMSan',
+		ResultType: 2,
+		ToolTip: 'Rename-VMSan\\r\\n'
+	},
+	{
+		CompletionText: 'Rename-VMSnapshot',
+		ListItemText: 'Rename-VMSnapshot',
+		ResultType: 2,
+		ToolTip: 'Rename-VMSnapshot\\r\\n'
+	},
+	{
+		CompletionText: 'Rename-VMSwitch',
+		ListItemText: 'Rename-VMSwitch',
+		ResultType: 2,
+		ToolTip: 'Rename-VMSwitch\\r\\n'
+	},
+	{
+		CompletionText: 'Repair-AzVmssServiceFabricUD',
+		ListItemText: 'Repair-AzVmssServiceFabricUD',
+		ResultType: 2,
+		ToolTip: 'Repair-AzVmssServiceFabricUD'
+	},
+	{
+		CompletionText: 'Repair-AzVmssServiceFabricUpdateDomain',
+		ListItemText: 'Repair-AzVmssServiceFabricUpdateDomain',
+		ResultType: 2,
+		ToolTip: 'Repair-AzVmssServiceFabricUpdateDomain\\r\\n'
+	},
+	{
+		CompletionText: 'repair-bde.exe',
+		ListItemText: 'repair-bde.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\repair-bde.exe'
+	},
+	{
+		CompletionText: 'Repair-FileIntegrity',
+		ListItemText: 'Repair-FileIntegrity',
+		ResultType: 2,
+		ToolTip: '\\r\\nRepair-FileIntegrity \\r\\n'
+	},
+	{
+		CompletionText: 'Repair-VirtualDisk',
+		ListItemText: 'Repair-VirtualDisk',
+		ResultType: 2,
+		ToolTip: '\\r\\nRepair-VirtualDisk \\r\\n'
+	},
+	{
+		CompletionText: 'Repair-VM',
+		ListItemText: 'Repair-VM',
+		ResultType: 2,
+		ToolTip: 'Repair-VM\\r\\n'
+	},
+	{
+		CompletionText: 'Repair-Volume',
+		ListItemText: 'Repair-Volume',
+		ResultType: 2,
+		ToolTip: '\\r\\nRepair-Volume \\r\\n'
+	},
+	{
+		CompletionText: 'Repair-WindowsImage',
+		ListItemText: 'Repair-WindowsImage',
+		ResultType: 2,
+		ToolTip: 'Repair-WindowsImage\\r\\n'
+	},
+	{
+		CompletionText: 'replace.exe',
+		ListItemText: 'replace.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\replace.exe'
+	},
+	{
+		CompletionText: 'Reset-AppPackage',
+		ListItemText: 'Reset-AppPackage',
+		ResultType: 2,
+		ToolTip: 'Reset-AppPackage'
+	},
+	{
+		CompletionText: 'Reset-AppSharedPackageContainer',
+		ListItemText: 'Reset-AppSharedPackageContainer',
+		ResultType: 2,
+		ToolTip: 'Reset-AppSharedPackageContainer\\r\\n'
+	},
+	{
+		CompletionText: 'Reset-AppxPackage',
+		ListItemText: 'Reset-AppxPackage',
+		ResultType: 2,
+		ToolTip: 'Reset-AppxPackage\\r\\n'
+	},
+	{
+		CompletionText: 'Reset-AzAttestationPolicy',
+		ListItemText: 'Reset-AzAttestationPolicy',
+		ResultType: 2,
+		ToolTip: 'Reset-AzAttestationPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Reset-AzBatchComputeNode',
+		ListItemText: 'Reset-AzBatchComputeNode',
+		ResultType: 2,
+		ToolTip: 'Reset-AzBatchComputeNode\\r\\n'
+	},
+	{
+		CompletionText: 'Reset-AzHubRouter',
+		ListItemText: 'Reset-AzHubRouter',
+		ResultType: 2,
+		ToolTip: 'Reset-AzHubRouter\\r\\n'
+	},
+	{
+		CompletionText: 'Reset-AzP2sVpnGateway',
+		ListItemText: 'Reset-AzP2sVpnGateway',
+		ResultType: 2,
+		ToolTip: 'Reset-AzP2sVpnGateway\\r\\n'
+	},
+	{
+		CompletionText: 'Reset-AzPowerBIWorkspaceCollectionAccessKey',
+		ListItemText: 'Reset-AzPowerBIWorkspaceCollectionAccessKey',
+		ResultType: 2,
+		ToolTip: 'Reset-AzPowerBIWorkspaceCollectionAccessKey\\r\\n'
+	},
+	{
+		CompletionText: 'Reset-AzPowerBIWorkspaceCollectionAccessKeys',
+		ListItemText: 'Reset-AzPowerBIWorkspaceCollectionAccessKeys',
+		ResultType: 2,
+		ToolTip: 'Reset-AzPowerBIWorkspaceCollectionAccessKeys'
+	},
+	{
+		CompletionText: 'Reset-AzRedisCache',
+		ListItemText: 'Reset-AzRedisCache',
+		ResultType: 2,
+		ToolTip: 'Reset-AzRedisCache\\r\\n'
+	},
+	{
+		CompletionText: 'Reset-AzStaticWebAppApiKey',
+		ListItemText: 'Reset-AzStaticWebAppApiKey',
+		ResultType: 2,
+		ToolTip: '\\r\\nReset-AzStaticWebAppApiKey \\r\\n'
+	},
+	{
+		CompletionText: 'Reset-AzStorageSyncServerCertificate',
+		ListItemText: 'Reset-AzStorageSyncServerCertificate',
+		ResultType: 2,
+		ToolTip: 'Reset-AzStorageSyncServerCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Reset-AzSynapseSparkSessionTimeout',
+		ListItemText: 'Reset-AzSynapseSparkSessionTimeout',
+		ResultType: 2,
+		ToolTip: 'Reset-AzSynapseSparkSessionTimeout\\r\\n'
+	},
+	{
+		CompletionText: 'Reset-AzSynapseSqlAdvancedThreatProtectionSetting',
+		ListItemText: 'Reset-AzSynapseSqlAdvancedThreatProtectionSetting',
+		ResultType: 2,
+		ToolTip: 'Reset-AzSynapseSqlAdvancedThreatProtectionSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Reset-AzSynapseSqlAuditSetting',
+		ListItemText: 'Reset-AzSynapseSqlAuditSetting',
+		ResultType: 2,
+		ToolTip: 'Reset-AzSynapseSqlAuditSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Reset-AzSynapseSqlPoolAdvancedThreatProtectionSetting',
+		ListItemText: 'Reset-AzSynapseSqlPoolAdvancedThreatProtectionSetting',
+		ResultType: 2,
+		ToolTip: 'Reset-AzSynapseSqlPoolAdvancedThreatProtectionSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Reset-AzSynapseSqlPoolAuditSetting',
+		ListItemText: 'Reset-AzSynapseSqlPoolAuditSetting',
+		ResultType: 2,
+		ToolTip: 'Reset-AzSynapseSqlPoolAuditSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Reset-AzSynapseSqlPoolVulnerabilityAssessmentSetting',
+		ListItemText: 'Reset-AzSynapseSqlPoolVulnerabilityAssessmentSetting',
+		ResultType: 2,
+		ToolTip: 'Reset-AzSynapseSqlPoolVulnerabilityAssessmentSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Reset-AzSynapseSqlVulnerabilityAssessmentSetting',
+		ListItemText: 'Reset-AzSynapseSqlVulnerabilityAssessmentSetting',
+		ResultType: 2,
+		ToolTip: 'Reset-AzSynapseSqlVulnerabilityAssessmentSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Reset-AzVirtualNetworkGateway',
+		ListItemText: 'Reset-AzVirtualNetworkGateway',
+		ResultType: 2,
+		ToolTip: 'Reset-AzVirtualNetworkGateway\\r\\n'
+	},
+	{
+		CompletionText: 'Reset-AzVirtualNetworkGatewayConnection',
+		ListItemText: 'Reset-AzVirtualNetworkGatewayConnection',
+		ResultType: 2,
+		ToolTip: 'Reset-AzVirtualNetworkGatewayConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Reset-AzVirtualNetworkGatewayConnectionSharedKey',
+		ListItemText: 'Reset-AzVirtualNetworkGatewayConnectionSharedKey',
+		ResultType: 2,
+		ToolTip: 'Reset-AzVirtualNetworkGatewayConnectionSharedKey\\r\\n'
+	},
+	{
+		CompletionText: 'Reset-AzVpnGateway',
+		ListItemText: 'Reset-AzVpnGateway',
+		ResultType: 2,
+		ToolTip: 'Reset-AzVpnGateway\\r\\n'
+	},
+	{
+		CompletionText: 'Reset-AzVpnSiteLinkConnection',
+		ListItemText: 'Reset-AzVpnSiteLinkConnection',
+		ResultType: 2,
+		ToolTip: 'Reset-AzVpnSiteLinkConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Reset-AzWebAppPublishingProfile',
+		ListItemText: 'Reset-AzWebAppPublishingProfile',
+		ResultType: 2,
+		ToolTip: 'Reset-AzWebAppPublishingProfile\\r\\n'
+	},
+	{
+		CompletionText: 'Reset-AzWebAppSlotPublishingProfile',
+		ListItemText: 'Reset-AzWebAppSlotPublishingProfile',
+		ResultType: 2,
+		ToolTip: 'Reset-AzWebAppSlotPublishingProfile\\r\\n'
+	},
+	{
+		CompletionText: 'Reset-BC',
+		ListItemText: 'Reset-BC',
+		ResultType: 2,
+		ToolTip: '\\r\\nReset-BC \\r\\n'
+	},
+	{
+		CompletionText: 'Reset-DAClientExperienceConfiguration',
+		ListItemText: 'Reset-DAClientExperienceConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nReset-DAClientExperienceConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Reset-DAEntryPointTableItem',
+		ListItemText: 'Reset-DAEntryPointTableItem',
+		ResultType: 2,
+		ToolTip: '\\r\\nReset-DAEntryPointTableItem \\r\\n'
+	},
+	{
+		CompletionText: 'Reset-DtcLog',
+		ListItemText: 'Reset-DtcLog',
+		ResultType: 2,
+		ToolTip: '\\r\\nReset-DtcLog \\r\\n'
+	},
+	{
+		CompletionText: 'Reset-LapsPassword',
+		ListItemText: 'Reset-LapsPassword',
+		ResultType: 2,
+		ToolTip: 'Reset-LapsPassword\\r\\n'
+	},
+	{
+		CompletionText: 'Reset-NCSIPolicyConfiguration',
+		ListItemText: 'Reset-NCSIPolicyConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nReset-NCSIPolicyConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Reset-Net6to4Configuration',
+		ListItemText: 'Reset-Net6to4Configuration',
+		ResultType: 2,
+		ToolTip: '\\r\\nReset-Net6to4Configuration \\r\\n'
+	},
+	{
+		CompletionText: 'Reset-NetAdapterAdvancedProperty',
+		ListItemText: 'Reset-NetAdapterAdvancedProperty',
+		ResultType: 2,
+		ToolTip: '\\r\\nReset-NetAdapterAdvancedProperty \\r\\n'
+	},
+	{
+		CompletionText: 'Reset-NetDnsTransitionConfiguration',
+		ListItemText: 'Reset-NetDnsTransitionConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nReset-NetDnsTransitionConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Reset-NetIPHttpsConfiguration',
+		ListItemText: 'Reset-NetIPHttpsConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nReset-NetIPHttpsConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Reset-NetIsatapConfiguration',
+		ListItemText: 'Reset-NetIsatapConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nReset-NetIsatapConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Reset-NetTeredoConfiguration',
+		ListItemText: 'Reset-NetTeredoConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nReset-NetTeredoConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Reset-PhysicalDisk',
+		ListItemText: 'Reset-PhysicalDisk',
+		ResultType: 2,
+		ToolTip: '\\r\\nReset-PhysicalDisk \\r\\n'
+	},
+	{
+		CompletionText: 'Reset-SmbClientConfiguration',
+		ListItemText: 'Reset-SmbClientConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nReset-SmbClientConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Reset-SmbServerConfiguration',
+		ListItemText: 'Reset-SmbServerConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nReset-SmbServerConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Reset-StorageReliabilityCounter',
+		ListItemText: 'Reset-StorageReliabilityCounter',
+		ResultType: 2,
+		ToolTip: '\\r\\nReset-StorageReliabilityCounter \\r\\n'
+	},
+	{
+		CompletionText: 'Reset-VMReplicationStatistics',
+		ListItemText: 'Reset-VMReplicationStatistics',
+		ResultType: 2,
+		ToolTip: 'Reset-VMReplicationStatistics\\r\\n'
+	},
+	{
+		CompletionText: 'Reset-VMResourceMetering',
+		ListItemText: 'Reset-VMResourceMetering',
+		ResultType: 2,
+		ToolTip: 'Reset-VMResourceMetering\\r\\n'
+	},
+	{
+		CompletionText: 'Reset-WinhttpProxy',
+		ListItemText: 'Reset-WinhttpProxy',
+		ResultType: 2,
+		ToolTip: '\\r\\nReset-WinhttpProxy \\r\\n'
+	},
+	{
+		CompletionText: 'reset.exe',
+		ListItemText: 'reset.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\reset.exe'
+	},
+	{
+		CompletionText: 'ResetEngine.exe',
+		ListItemText: 'ResetEngine.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\ResetEngine.exe'
+	},
+	{
+		CompletionText: 'Resize-AzVirtualNetworkGateway',
+		ListItemText: 'Resize-AzVirtualNetworkGateway',
+		ResultType: 2,
+		ToolTip: 'Resize-AzVirtualNetworkGateway\\r\\n'
+	},
+	{
+		CompletionText: 'Resize-Partition',
+		ListItemText: 'Resize-Partition',
+		ResultType: 2,
+		ToolTip: '\\r\\nResize-Partition \\r\\n'
+	},
+	{
+		CompletionText: 'Resize-StorageTier',
+		ListItemText: 'Resize-StorageTier',
+		ResultType: 2,
+		ToolTip: '\\r\\nResize-StorageTier \\r\\n'
+	},
+	{
+		CompletionText: 'Resize-VHD',
+		ListItemText: 'Resize-VHD',
+		ResultType: 2,
+		ToolTip: 'Resize-VHD\\r\\n'
+	},
+	{
+		CompletionText: 'Resize-VirtualDisk',
+		ListItemText: 'Resize-VirtualDisk',
+		ResultType: 2,
+		ToolTip: '\\r\\nResize-VirtualDisk \\r\\n'
+	},
+	{
+		CompletionText: 'resmon.exe',
+		ListItemText: 'resmon.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\resmon.exe'
+	},
+	{
+		CompletionText: 'Resolve-AzError',
+		ListItemText: 'Resolve-AzError',
+		ResultType: 2,
+		ToolTip: 'Resolve-AzError\\r\\n'
+	},
+	{
+		CompletionText: 'Resolve-AzResourceMoverMoveCollectionDependency',
+		ListItemText: 'Resolve-AzResourceMoverMoveCollectionDependency',
+		ResultType: 2,
+		ToolTip: '\\r\\nResolve-AzResourceMoverMoveCollectionDependency \\r\\n'
+	},
+	{
+		CompletionText: 'Resolve-DnsName',
+		ListItemText: 'Resolve-DnsName',
+		ResultType: 2,
+		ToolTip: 'Resolve-DnsName\\r\\n'
+	},
+	{
+		CompletionText: 'Resolve-Error',
+		ListItemText: 'Resolve-Error',
+		ResultType: 2,
+		ToolTip: 'Resolve-Error'
+	},
+	{
+		CompletionText: 'Resolve-Path',
+		ListItemText: 'Resolve-Path',
+		ResultType: 2,
+		ToolTip: '\\r\\nResolve-Path [-Path] <string[]> [-Relative] [-RelativeBasePath <string>] [-Credential <pscredential>] [<CommonParameters>]\\r\\n\\r\\nResolve-Path -LiteralPath <string[]> [-Relative] [-RelativeBasePath <string>] [-Credential <pscredential>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Restart-ASRJob',
+		ListItemText: 'Restart-ASRJob',
+		ResultType: 2,
+		ToolTip: 'Restart-ASRJob'
+	},
+	{
+		CompletionText: 'Restart-AzAnalysisServicesInstance',
+		ListItemText: 'Restart-AzAnalysisServicesInstance',
+		ResultType: 2,
+		ToolTip: 'Restart-AzAnalysisServicesInstance\\r\\n'
+	},
+	{
+		CompletionText: 'Restart-AzAsInstance',
+		ListItemText: 'Restart-AzAsInstance',
+		ResultType: 2,
+		ToolTip: 'Restart-AzAsInstance'
+	},
+	{
+		CompletionText: 'Restart-AzBatchComputeNode',
+		ListItemText: 'Restart-AzBatchComputeNode',
+		ResultType: 2,
+		ToolTip: 'Restart-AzBatchComputeNode\\r\\n'
+	},
+	{
+		CompletionText: 'Restart-AzCloudService',
+		ListItemText: 'Restart-AzCloudService',
+		ResultType: 2,
+		ToolTip: '\\r\\nRestart-AzCloudService \\r\\n'
+	},
+	{
+		CompletionText: 'Restart-AzCloudServiceRoleInstance',
+		ListItemText: 'Restart-AzCloudServiceRoleInstance',
+		ResultType: 2,
+		ToolTip: '\\r\\nRestart-AzCloudServiceRoleInstance \\r\\n'
+	},
+	{
+		CompletionText: 'Restart-AzContainerGroup',
+		ListItemText: 'Restart-AzContainerGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nRestart-AzContainerGroup \\r\\n'
+	},
+	{
+		CompletionText: 'Restart-AzDeploymentManagerRollout',
+		ListItemText: 'Restart-AzDeploymentManagerRollout',
+		ResultType: 2,
+		ToolTip: 'Restart-AzDeploymentManagerRollout\\r\\n'
+	},
+	{
+		CompletionText: 'Restart-AzFunctionApp',
+		ListItemText: 'Restart-AzFunctionApp',
+		ResultType: 2,
+		ToolTip: '\\r\\nRestart-AzFunctionApp \\r\\n'
+	},
+	{
+		CompletionText: 'Restart-AzHDInsightHost',
+		ListItemText: 'Restart-AzHDInsightHost',
+		ResultType: 2,
+		ToolTip: 'Restart-AzHDInsightHost\\r\\n'
+	},
+	{
+		CompletionText: 'Restart-AzHost',
+		ListItemText: 'Restart-AzHost',
+		ResultType: 2,
+		ToolTip: 'Restart-AzHost\\r\\n'
+	},
+	{
+		CompletionText: 'Restart-AzMigrateServerReplication',
+		ListItemText: 'Restart-AzMigrateServerReplication',
+		ResultType: 2,
+		ToolTip: '\\r\\nRestart-AzMigrateServerReplication \\r\\n'
+	},
+	{
+		CompletionText: 'Restart-AzMLWorkspaceCompute',
+		ListItemText: 'Restart-AzMLWorkspaceCompute',
+		ResultType: 2,
+		ToolTip: '\\r\\nRestart-AzMLWorkspaceCompute \\r\\n'
+	},
+	{
+		CompletionText: 'Restart-AzMySqlFlexibleServer',
+		ListItemText: 'Restart-AzMySqlFlexibleServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nRestart-AzMySqlFlexibleServer \\r\\n'
+	},
+	{
+		CompletionText: 'Restart-AzMySqlServer',
+		ListItemText: 'Restart-AzMySqlServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nRestart-AzMySqlServer \\r\\n'
+	},
+	{
+		CompletionText: 'Restart-AzPostgreSqlFlexibleServer',
+		ListItemText: 'Restart-AzPostgreSqlFlexibleServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nRestart-AzPostgreSqlFlexibleServer \\r\\n'
+	},
+	{
+		CompletionText: 'Restart-AzPostgreSqlServer',
+		ListItemText: 'Restart-AzPostgreSqlServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nRestart-AzPostgreSqlServer \\r\\n'
+	},
+	{
+		CompletionText: 'Restart-AzRecoveryServicesAsrJob',
+		ListItemText: 'Restart-AzRecoveryServicesAsrJob',
+		ResultType: 2,
+		ToolTip: 'Restart-AzRecoveryServicesAsrJob\\r\\n'
+	},
+	{
+		CompletionText: 'Restart-AzServiceFabricManagedNodeType',
+		ListItemText: 'Restart-AzServiceFabricManagedNodeType',
+		ResultType: 2,
+		ToolTip: 'Restart-AzServiceFabricManagedNodeType\\r\\n'
+	},
+	{
+		CompletionText: 'Restart-AzSignalR',
+		ListItemText: 'Restart-AzSignalR',
+		ResultType: 2,
+		ToolTip: 'Restart-AzSignalR\\r\\n'
+	},
+	{
+		CompletionText: 'Restart-AzureAsInstance',
+		ListItemText: 'Restart-AzureAsInstance',
+		ResultType: 2,
+		ToolTip: 'Restart-AzureAsInstance'
+	},
+	{
+		CompletionText: 'Restart-AzVM',
+		ListItemText: 'Restart-AzVM',
+		ResultType: 2,
+		ToolTip: 'Restart-AzVM\\r\\n'
+	},
+	{
+		CompletionText: 'Restart-AzVmss',
+		ListItemText: 'Restart-AzVmss',
+		ResultType: 2,
+		ToolTip: 'Restart-AzVmss\\r\\n'
+	},
+	{
+		CompletionText: 'Restart-AzWebApp',
+		ListItemText: 'Restart-AzWebApp',
+		ResultType: 2,
+		ToolTip: 'Restart-AzWebApp\\r\\n'
+	},
+	{
+		CompletionText: 'Restart-AzWebAppSlot',
+		ListItemText: 'Restart-AzWebAppSlot',
+		ResultType: 2,
+		ToolTip: 'Restart-AzWebAppSlot\\r\\n'
+	},
+	{
+		CompletionText: 'Restart-AzWebPubSub',
+		ListItemText: 'Restart-AzWebPubSub',
+		ResultType: 2,
+		ToolTip: '\\r\\nRestart-AzWebPubSub \\r\\n'
+	},
+	{
+		CompletionText: 'Restart-Computer',
+		ListItemText: 'Restart-Computer',
+		ResultType: 2,
+		ToolTip: '\\r\\nRestart-Computer [[-ComputerName] <string[]>] [[-Credential] <pscredential>] [-WsmanAuthentication <string>] [-Force] [-Wait] [-Timeout <int>] [-For <WaitForServiceTypes>] [-Delay <short>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Restart-NetAdapter',
+		ListItemText: 'Restart-NetAdapter',
+		ResultType: 2,
+		ToolTip: '\\r\\nRestart-NetAdapter \\r\\n'
+	},
+	{
+		CompletionText: 'Restart-PcsvDevice',
+		ListItemText: 'Restart-PcsvDevice',
+		ResultType: 2,
+		ToolTip: '\\r\\nRestart-PcsvDevice \\r\\n'
+	},
+	{
+		CompletionText: 'Restart-PrintJob',
+		ListItemText: 'Restart-PrintJob',
+		ResultType: 2,
+		ToolTip: '\\r\\nRestart-PrintJob \\r\\n'
+	},
+	{
+		CompletionText: 'Restart-Service',
+		ListItemText: 'Restart-Service',
+		ResultType: 2,
+		ToolTip: '\\r\\nRestart-Service [-InputObject] <ServiceController[]> [-Force] [-PassThru] [-Include <string[]>] [-Exclude <string[]>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nRestart-Service [-Name] <string[]> [-Force] [-PassThru] [-Include <string[]>] [-Exclude <string[]>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nRestart-Service -DisplayName <string[]> [-Force] [-PassThru] [-Include <string[]>] [-Exclude <string[]>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Restart-VM',
+		ListItemText: 'Restart-VM',
+		ResultType: 2,
+		ToolTip: 'Restart-VM\\r\\n'
+	},
+	{
+		CompletionText: 'Restore-AdlStoreDeletedItem',
+		ListItemText: 'Restore-AdlStoreDeletedItem',
+		ResultType: 2,
+		ToolTip: 'Restore-AdlStoreDeletedItem'
+	},
+	{
+		CompletionText: 'Restore-AzApiManagement',
+		ListItemText: 'Restore-AzApiManagement',
+		ResultType: 2,
+		ToolTip: 'Restore-AzApiManagement\\r\\n'
+	},
+	{
+		CompletionText: 'Restore-AzCosmosDBAccount',
+		ListItemText: 'Restore-AzCosmosDBAccount',
+		ResultType: 2,
+		ToolTip: 'Restore-AzCosmosDBAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Restore-AzDataLakeGen2DeletedItem',
+		ListItemText: 'Restore-AzDataLakeGen2DeletedItem',
+		ResultType: 2,
+		ToolTip: 'Restore-AzDataLakeGen2DeletedItem\\r\\n'
+	},
+	{
+		CompletionText: 'Restore-AzDataLakeStoreDeletedItem',
+		ListItemText: 'Restore-AzDataLakeStoreDeletedItem',
+		ResultType: 2,
+		ToolTip: 'Restore-AzDataLakeStoreDeletedItem\\r\\n'
+	},
+	{
+		CompletionText: 'Restore-AzDeletedWebApp',
+		ListItemText: 'Restore-AzDeletedWebApp',
+		ResultType: 2,
+		ToolTip: 'Restore-AzDeletedWebApp\\r\\n'
+	},
+	{
+		CompletionText: 'Restore-AzKeyVault',
+		ListItemText: 'Restore-AzKeyVault',
+		ResultType: 2,
+		ToolTip: 'Restore-AzKeyVault\\r\\n'
+	},
+	{
+		CompletionText: 'Restore-AzKeyVaultCertificate',
+		ListItemText: 'Restore-AzKeyVaultCertificate',
+		ResultType: 2,
+		ToolTip: 'Restore-AzKeyVaultCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Restore-AzKeyVaultKey',
+		ListItemText: 'Restore-AzKeyVaultKey',
+		ResultType: 2,
+		ToolTip: 'Restore-AzKeyVaultKey\\r\\n'
+	},
+	{
+		CompletionText: 'Restore-AzKeyVaultManagedStorageAccount',
+		ListItemText: 'Restore-AzKeyVaultManagedStorageAccount',
+		ResultType: 2,
+		ToolTip: 'Restore-AzKeyVaultManagedStorageAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Restore-AzKeyVaultSecret',
+		ListItemText: 'Restore-AzKeyVaultSecret',
+		ResultType: 2,
+		ToolTip: 'Restore-AzKeyVaultSecret\\r\\n'
+	},
+	{
+		CompletionText: 'Restore-AzMySqlFlexibleServer',
+		ListItemText: 'Restore-AzMySqlFlexibleServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nRestore-AzMySqlFlexibleServer \\r\\n'
+	},
+	{
+		CompletionText: 'Restore-AzMySqlServer',
+		ListItemText: 'Restore-AzMySqlServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nRestore-AzMySqlServer \\r\\n'
+	},
+	{
+		CompletionText: 'Restore-AzOperationalInsightsWorkspace',
+		ListItemText: 'Restore-AzOperationalInsightsWorkspace',
+		ResultType: 2,
+		ToolTip: 'Restore-AzOperationalInsightsWorkspace\\r\\n'
+	},
+	{
+		CompletionText: 'Restore-AzPostgreSqlFlexibleServer',
+		ListItemText: 'Restore-AzPostgreSqlFlexibleServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nRestore-AzPostgreSqlFlexibleServer \\r\\n'
+	},
+	{
+		CompletionText: 'Restore-AzPostgreSqlServer',
+		ListItemText: 'Restore-AzPostgreSqlServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nRestore-AzPostgreSqlServer \\r\\n'
+	},
+	{
+		CompletionText: 'Restore-AzRecoveryServicesBackupItem',
+		ListItemText: 'Restore-AzRecoveryServicesBackupItem',
+		ResultType: 2,
+		ToolTip: 'Restore-AzRecoveryServicesBackupItem\\r\\n'
+	},
+	{
+		CompletionText: 'Restore-AzRmStorageShare',
+		ListItemText: 'Restore-AzRmStorageShare',
+		ResultType: 2,
+		ToolTip: 'Restore-AzRmStorageShare\\r\\n'
+	},
+	{
+		CompletionText: 'Restore-AzSqlDatabase',
+		ListItemText: 'Restore-AzSqlDatabase',
+		ResultType: 2,
+		ToolTip: 'Restore-AzSqlDatabase\\r\\n'
+	},
+	{
+		CompletionText: 'Restore-AzSqlInstanceDatabase',
+		ListItemText: 'Restore-AzSqlInstanceDatabase',
+		ResultType: 2,
+		ToolTip: 'Restore-AzSqlInstanceDatabase\\r\\n'
+	},
+	{
+		CompletionText: 'Restore-AzStorageBlobRange',
+		ListItemText: 'Restore-AzStorageBlobRange',
+		ResultType: 2,
+		ToolTip: 'Restore-AzStorageBlobRange\\r\\n'
+	},
+	{
+		CompletionText: 'Restore-AzStorageContainer',
+		ListItemText: 'Restore-AzStorageContainer',
+		ResultType: 2,
+		ToolTip: 'Restore-AzStorageContainer\\r\\n'
+	},
+	{
+		CompletionText: 'Restore-AzSynapseSqlPool',
+		ListItemText: 'Restore-AzSynapseSqlPool',
+		ResultType: 2,
+		ToolTip: 'Restore-AzSynapseSqlPool\\r\\n'
+	},
+	{
+		CompletionText: 'Restore-AzWebAppBackup',
+		ListItemText: 'Restore-AzWebAppBackup',
+		ResultType: 2,
+		ToolTip: 'Restore-AzWebAppBackup\\r\\n'
+	},
+	{
+		CompletionText: 'Restore-AzWebAppSnapshot',
+		ListItemText: 'Restore-AzWebAppSnapshot',
+		ResultType: 2,
+		ToolTip: 'Restore-AzWebAppSnapshot\\r\\n'
+	},
+	{
+		CompletionText: 'Restore-DscConfiguration',
+		ListItemText: 'Restore-DscConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nRestore-DscConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Restore-NetworkSwitchConfiguration',
+		ListItemText: 'Restore-NetworkSwitchConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nRestore-NetworkSwitchConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Restore-VMCheckpoint',
+		ListItemText: 'Restore-VMCheckpoint',
+		ResultType: 2,
+		ToolTip: 'Restore-VMCheckpoint'
+	},
+	{
+		CompletionText: 'Restore-VMSnapshot',
+		ListItemText: 'Restore-VMSnapshot',
+		ResultType: 2,
+		ToolTip: 'Restore-VMSnapshot\\r\\n'
+	},
+	{
+		CompletionText: 'Resume-ASRJob',
+		ListItemText: 'Resume-ASRJob',
+		ResultType: 2,
+		ToolTip: 'Resume-ASRJob'
+	},
+	{
+		CompletionText: 'Resume-AzAnalysisServicesServer',
+		ListItemText: 'Resume-AzAnalysisServicesServer',
+		ResultType: 2,
+		ToolTip: 'Resume-AzAnalysisServicesServer\\r\\n'
+	},
+	{
+		CompletionText: 'Resume-AzAs',
+		ListItemText: 'Resume-AzAs',
+		ResultType: 2,
+		ToolTip: 'Resume-AzAs'
+	},
+	{
+		CompletionText: 'Resume-AzAutomationJob',
+		ListItemText: 'Resume-AzAutomationJob',
+		ResultType: 2,
+		ToolTip: 'Resume-AzAutomationJob\\r\\n'
+	},
+	{
+		CompletionText: 'Resume-AzDataFactoryPipeline',
+		ListItemText: 'Resume-AzDataFactoryPipeline',
+		ResultType: 2,
+		ToolTip: 'Resume-AzDataFactoryPipeline\\r\\n'
+	},
+	{
+		CompletionText: 'Resume-AzDataProtectionBackupInstanceProtection',
+		ListItemText: 'Resume-AzDataProtectionBackupInstanceProtection',
+		ResultType: 2,
+		ToolTip: '\\r\\nResume-AzDataProtectionBackupInstanceProtection \\r\\n'
+	},
+	{
+		CompletionText: 'Resume-AzMigrateServerReplication',
+		ListItemText: 'Resume-AzMigrateServerReplication',
+		ResultType: 2,
+		ToolTip: '\\r\\nResume-AzMigrateServerReplication \\r\\n'
+	},
+	{
+		CompletionText: 'Resume-AzPowerBIEmbeddedCapacity',
+		ListItemText: 'Resume-AzPowerBIEmbeddedCapacity',
+		ResultType: 2,
+		ToolTip: 'Resume-AzPowerBIEmbeddedCapacity\\r\\n'
+	},
+	{
+		CompletionText: 'Resume-AzRecoveryServicesAsrJob',
+		ListItemText: 'Resume-AzRecoveryServicesAsrJob',
+		ResultType: 2,
+		ToolTip: 'Resume-AzRecoveryServicesAsrJob\\r\\n'
+	},
+	{
+		CompletionText: 'Resume-AzSqlDatabase',
+		ListItemText: 'Resume-AzSqlDatabase',
+		ResultType: 2,
+		ToolTip: 'Resume-AzSqlDatabase\\r\\n'
+	},
+	{
+		CompletionText: 'Resume-AzSynapseSqlPool',
+		ListItemText: 'Resume-AzSynapseSqlPool',
+		ResultType: 2,
+		ToolTip: 'Resume-AzSynapseSqlPool\\r\\n'
+	},
+	{
+		CompletionText: 'Resume-BitLocker',
+		ListItemText: 'Resume-BitLocker',
+		ResultType: 2,
+		ToolTip: '\\r\\nResume-BitLocker \\r\\n'
+	},
+	{
+		CompletionText: 'Resume-BitsTransfer',
+		ListItemText: 'Resume-BitsTransfer',
+		ResultType: 2,
+		ToolTip: 'Resume-BitsTransfer\\r\\n'
+	},
+	{
+		CompletionText: 'Resume-PrintJob',
+		ListItemText: 'Resume-PrintJob',
+		ResultType: 2,
+		ToolTip: '\\r\\nResume-PrintJob \\r\\n'
+	},
+	{
+		CompletionText: 'Resume-ProvisioningSession',
+		ListItemText: 'Resume-ProvisioningSession',
+		ResultType: 2,
+		ToolTip: 'Resume-ProvisioningSession\\r\\n'
+	},
+	{
+		CompletionText: 'Resume-Service',
+		ListItemText: 'Resume-Service',
+		ResultType: 2,
+		ToolTip: '\\r\\nResume-Service [-InputObject] <ServiceController[]> [-PassThru] [-Include <string[]>] [-Exclude <string[]>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nResume-Service [-Name] <string[]> [-PassThru] [-Include <string[]>] [-Exclude <string[]>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nResume-Service -DisplayName <string[]> [-PassThru] [-Include <string[]>] [-Exclude <string[]>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Resume-StorageBusDisk',
+		ListItemText: 'Resume-StorageBusDisk',
+		ResultType: 2,
+		ToolTip: '\\r\\nResume-StorageBusDisk \\r\\n'
+	},
+	{
+		CompletionText: 'Resume-VM',
+		ListItemText: 'Resume-VM',
+		ResultType: 2,
+		ToolTip: 'Resume-VM\\r\\n'
+	},
+	{
+		CompletionText: 'Resume-VMReplication',
+		ListItemText: 'Resume-VMReplication',
+		ResultType: 2,
+		ToolTip: 'Resume-VMReplication\\r\\n'
+	},
+	{
+		CompletionText: 'Revoke-AzDataShareSubscriptionAccess',
+		ListItemText: 'Revoke-AzDataShareSubscriptionAccess',
+		ResultType: 2,
+		ToolTip: 'Revoke-AzDataShareSubscriptionAccess\\r\\n'
+	},
+	{
+		CompletionText: 'Revoke-AzDiskAccess',
+		ListItemText: 'Revoke-AzDiskAccess',
+		ResultType: 2,
+		ToolTip: 'Revoke-AzDiskAccess\\r\\n'
+	},
+	{
+		CompletionText: 'Revoke-AzEventGridPartnerConfiguration',
+		ListItemText: 'Revoke-AzEventGridPartnerConfiguration',
+		ResultType: 2,
+		ToolTip: 'Revoke-AzEventGridPartnerConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Revoke-AzSnapshotAccess',
+		ListItemText: 'Revoke-AzSnapshotAccess',
+		ResultType: 2,
+		ToolTip: 'Revoke-AzSnapshotAccess\\r\\n'
+	},
+	{
+		CompletionText: 'Revoke-AzStorageAccountUserDelegationKeys',
+		ListItemText: 'Revoke-AzStorageAccountUserDelegationKeys',
+		ResultType: 2,
+		ToolTip: 'Revoke-AzStorageAccountUserDelegationKeys\\r\\n'
+	},
+	{
+		CompletionText: 'Revoke-FileShareAccess',
+		ListItemText: 'Revoke-FileShareAccess',
+		ResultType: 2,
+		ToolTip: '\\r\\nRevoke-FileShareAccess \\r\\n'
+	},
+	{
+		CompletionText: 'Revoke-HgsKeyProtectorAccess',
+		ListItemText: 'Revoke-HgsKeyProtectorAccess',
+		ResultType: 2,
+		ToolTip: '\\r\\nRevoke-HgsKeyProtectorAccess \\r\\n'
+	},
+	{
+		CompletionText: 'Revoke-SmbClientAccessToServer',
+		ListItemText: 'Revoke-SmbClientAccessToServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nRevoke-SmbClientAccessToServer \\r\\n'
+	},
+	{
+		CompletionText: 'Revoke-SmbShareAccess',
+		ListItemText: 'Revoke-SmbShareAccess',
+		ResultType: 2,
+		ToolTip: '\\r\\nRevoke-SmbShareAccess \\r\\n'
+	},
+	{
+		CompletionText: 'Revoke-VMConnectAccess',
+		ListItemText: 'Revoke-VMConnectAccess',
+		ResultType: 2,
+		ToolTip: 'Revoke-VMConnectAccess\\r\\n'
+	},
+	{
+		CompletionText: 'rg.exe',
+		ListItemText: 'rg.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WinGet\\Packages\\BurntSushi.ripgrep.MSVC_Microsoft.Winget.Source_8wekyb3d8bbwe\\ripgrep-13.0.0-x86_64-pc-windows-msvc\\rg.exe'
+	},
+	{
+		CompletionText: 'ri',
+		ListItemText: 'ri',
+		ResultType: 2,
+		ToolTip: 'Remove-Item'
+	},
+	{
+		CompletionText: 'rjb',
+		ListItemText: 'rjb',
+		ResultType: 2,
+		ToolTip: 'Remove-Job'
+	},
+	{
+		CompletionText: 'rksmba',
+		ListItemText: 'rksmba',
+		ResultType: 2,
+		ToolTip: 'rksmba'
+	},
+	{
+		CompletionText: 'rksmbclas',
+		ListItemText: 'rksmbclas',
+		ResultType: 2,
+		ToolTip: 'rksmbclas'
+	},
+	{
+		CompletionText: 'rlg',
+		ListItemText: 'rlg',
+		ResultType: 2,
+		ToolTip: 'rlg'
+	},
+	{
+		CompletionText: 'rlgm',
+		ListItemText: 'rlgm',
+		ResultType: 2,
+		ToolTip: 'rlgm'
+	},
+	{
+		CompletionText: 'rlu',
+		ListItemText: 'rlu',
+		ResultType: 2,
+		ToolTip: 'rlu'
+	},
+	{
+		CompletionText: 'rm',
+		ListItemText: 'rm',
+		ResultType: 2,
+		ToolTip: 'Remove-Item'
+	},
+	{
+		CompletionText: 'RMActivate.exe',
+		ListItemText: 'RMActivate.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\RMActivate.exe'
+	},
+	{
+		CompletionText: 'RMActivate_isv.exe',
+		ListItemText: 'RMActivate_isv.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\RMActivate_isv.exe'
+	},
+	{
+		CompletionText: 'RMActivate_ssp.exe',
+		ListItemText: 'RMActivate_ssp.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\RMActivate_ssp.exe'
+	},
+	{
+		CompletionText: 'RMActivate_ssp_isv.exe',
+		ListItemText: 'RMActivate_ssp_isv.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\RMActivate_ssp_isv.exe'
+	},
+	{
+		CompletionText: 'RmClient.exe',
+		ListItemText: 'RmClient.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\RmClient.exe'
+	},
+	{
+		CompletionText: 'rmdir',
+		ListItemText: 'rmdir',
+		ResultType: 2,
+		ToolTip: 'Remove-Item'
+	},
+	{
+		CompletionText: 'rmic.exe',
+		ListItemText: 'rmic.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\rmic.exe'
+	},
+	{
+		CompletionText: 'rmid.exe',
+		ListItemText: 'rmid.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\rmid.exe'
+	},
+	{
+		CompletionText: 'rmiregistry.exe',
+		ListItemText: 'rmiregistry.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\rmiregistry.exe'
+	},
+	{
+		CompletionText: 'rmo',
+		ListItemText: 'rmo',
+		ResultType: 2,
+		ToolTip: 'Remove-Module'
+	},
+	{
+		CompletionText: 'rmttpmvscmgrsvr.exe',
+		ListItemText: 'rmttpmvscmgrsvr.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\rmttpmvscmgrsvr.exe'
+	},
+	{
+		CompletionText: 'rni',
+		ListItemText: 'rni',
+		ResultType: 2,
+		ToolTip: 'Rename-Item'
+	},
+	{
+		CompletionText: 'rnlg',
+		ListItemText: 'rnlg',
+		ResultType: 2,
+		ToolTip: 'rnlg'
+	},
+	{
+		CompletionText: 'rnlu',
+		ListItemText: 'rnlu',
+		ResultType: 2,
+		ToolTip: 'rnlu'
+	},
+	{
+		CompletionText: 'rnp',
+		ListItemText: 'rnp',
+		ResultType: 2,
+		ToolTip: 'Rename-ItemProperty'
+	},
+	{
+		CompletionText: 'Robocopy.exe',
+		ListItemText: 'Robocopy.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\Robocopy.exe'
+	},
+	{
+		CompletionText: 'ROUTE.EXE',
+		ListItemText: 'ROUTE.EXE',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\ROUTE.EXE'
+	},
+	{
+		CompletionText: 'rp',
+		ListItemText: 'rp',
+		ResultType: 2,
+		ToolTip: 'Remove-ItemProperty'
+	},
+	{
+		CompletionText: 'RpcPing.exe',
+		ListItemText: 'RpcPing.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\RpcPing.exe'
+	},
+	{
+		CompletionText: 'rrinstaller.exe',
+		ListItemText: 'rrinstaller.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\rrinstaller.exe'
+	},
+	{
+		CompletionText: 'rsmbb',
+		ListItemText: 'rsmbb',
+		ResultType: 2,
+		ToolTip: 'rsmbb'
+	},
+	{
+		CompletionText: 'rsmbc',
+		ListItemText: 'rsmbc',
+		ResultType: 2,
+		ToolTip: 'rsmbc'
+	},
+	{
+		CompletionText: 'rsmbcc',
+		ListItemText: 'rsmbcc',
+		ResultType: 2,
+		ToolTip: 'rsmbcc'
+	},
+	{
+		CompletionText: 'rsmbccm',
+		ListItemText: 'rsmbccm',
+		ResultType: 2,
+		ToolTip: 'rsmbccm'
+	},
+	{
+		CompletionText: 'rsmbgm',
+		ListItemText: 'rsmbgm',
+		ResultType: 2,
+		ToolTip: 'rsmbgm'
+	},
+	{
+		CompletionText: 'rsmbm',
+		ListItemText: 'rsmbm',
+		ResultType: 2,
+		ToolTip: 'rsmbm'
+	},
+	{
+		CompletionText: 'rsmbs',
+		ListItemText: 'rsmbs',
+		ResultType: 2,
+		ToolTip: 'rsmbs'
+	},
+	{
+		CompletionText: 'rsmbsc',
+		ListItemText: 'rsmbsc',
+		ResultType: 2,
+		ToolTip: 'rsmbsc'
+	},
+	{
+		CompletionText: 'rsmbscm',
+		ListItemText: 'rsmbscm',
+		ResultType: 2,
+		ToolTip: 'rsmbscm'
+	},
+	{
+		CompletionText: 'rsmbt',
+		ListItemText: 'rsmbt',
+		ResultType: 2,
+		ToolTip: 'rsmbt'
+	},
+	{
+		CompletionText: 'rsn',
+		ListItemText: 'rsn',
+		ResultType: 2,
+		ToolTip: 'Remove-PSSession'
+	},
+	{
+		CompletionText: 'rsop.msc',
+		ListItemText: 'rsop.msc',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\rsop.msc'
+	},
+	{
+		CompletionText: 'rstrui.exe',
+		ListItemText: 'rstrui.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\rstrui.exe'
+	},
+	{
+		CompletionText: 'rtcfg',
+		ListItemText: 'rtcfg',
+		ResultType: 2,
+		ToolTip: 'rtcfg'
+	},
+	{
+		CompletionText: 'runas.exe',
+		ListItemText: 'runas.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\runas.exe'
+	},
+	{
+		CompletionText: 'rundll32.exe',
+		ListItemText: 'rundll32.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\rundll32.exe'
+	},
+	{
+		CompletionText: 'runexehelper.exe',
+		ListItemText: 'runexehelper.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\runexehelper.exe'
+	},
+	{
+		CompletionText: 'RunLegacyCPLElevated.exe',
+		ListItemText: 'RunLegacyCPLElevated.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\RunLegacyCPLElevated.exe'
+	},
+	{
+		CompletionText: 'runonce.exe',
+		ListItemText: 'runonce.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\runonce.exe'
+	},
+	{
+		CompletionText: 'RuntimeBroker.exe',
+		ListItemText: 'RuntimeBroker.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\RuntimeBroker.exe'
+	},
+	{
+		CompletionText: 'rv',
+		ListItemText: 'rv',
+		ResultType: 2,
+		ToolTip: 'Remove-Variable'
+	},
+	{
+		CompletionText: 'rvpa',
+		ListItemText: 'rvpa',
+		ResultType: 2,
+		ToolTip: 'Resolve-Path'
+	},
+	{
+		CompletionText: 'rwinsta.exe',
+		ListItemText: 'rwinsta.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\rwinsta.exe'
+	},
+	{
+		CompletionText: 'S:',
+		ListItemText: 'S:',
+		ResultType: 2,
+		ToolTip: '\\r\\nS: \\r\\n'
+	},
+	{
+		CompletionText: 'sacfg',
+		ListItemText: 'sacfg',
+		ResultType: 2,
+		ToolTip: 'sacfg'
+	},
+	{
+		CompletionText: 'SafeGetCommand',
+		ListItemText: 'SafeGetCommand',
+		ResultType: 2,
+		ToolTip: '\\r\\nSafeGetCommand \\r\\n'
+	},
+	{
+		CompletionText: 'sajb',
+		ListItemText: 'sajb',
+		ResultType: 2,
+		ToolTip: 'Start-Job'
+	},
+	{
+		CompletionText: 'sal',
+		ListItemText: 'sal',
+		ResultType: 2,
+		ToolTip: 'Set-Alias'
+	},
+	{
+		CompletionText: 'saps',
+		ListItemText: 'saps',
+		ResultType: 2,
+		ToolTip: 'Start-Process'
+	},
+	{
+		CompletionText: 'sasv',
+		ListItemText: 'sasv',
+		ResultType: 2,
+		ToolTip: 'Start-Service'
+	},
+	{
+		CompletionText: 'Save-AzApiManagementTenantGitConfiguration',
+		ListItemText: 'Save-AzApiManagementTenantGitConfiguration',
+		ResultType: 2,
+		ToolTip: 'Save-AzApiManagementTenantGitConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Save-AzContext',
+		ListItemText: 'Save-AzContext',
+		ResultType: 2,
+		ToolTip: 'Save-AzContext\\r\\n'
+	},
+	{
+		CompletionText: 'Save-AzDataFactoryLog',
+		ListItemText: 'Save-AzDataFactoryLog',
+		ResultType: 2,
+		ToolTip: 'Save-AzDataFactoryLog\\r\\n'
+	},
+	{
+		CompletionText: 'Save-AzDeploymentScriptLog',
+		ListItemText: 'Save-AzDeploymentScriptLog',
+		ResultType: 2,
+		ToolTip: 'Save-AzDeploymentScriptLog\\r\\n'
+	},
+	{
+		CompletionText: 'Save-AzDeploymentTemplate',
+		ListItemText: 'Save-AzDeploymentTemplate',
+		ResultType: 2,
+		ToolTip: 'Save-AzDeploymentTemplate\\r\\n'
+	},
+	{
+		CompletionText: 'Save-AzManagementGroupDeploymentTemplate',
+		ListItemText: 'Save-AzManagementGroupDeploymentTemplate',
+		ResultType: 2,
+		ToolTip: 'Save-AzManagementGroupDeploymentTemplate\\r\\n'
+	},
+	{
+		CompletionText: 'Save-AzProfile',
+		ListItemText: 'Save-AzProfile',
+		ResultType: 2,
+		ToolTip: 'Save-AzProfile'
+	},
+	{
+		CompletionText: 'Save-AzResourceGroupDeploymentTemplate',
+		ListItemText: 'Save-AzResourceGroupDeploymentTemplate',
+		ResultType: 2,
+		ToolTip: 'Save-AzResourceGroupDeploymentTemplate\\r\\n'
+	},
+	{
+		CompletionText: 'Save-AzSubscriptionDeploymentTemplate',
+		ListItemText: 'Save-AzSubscriptionDeploymentTemplate',
+		ResultType: 2,
+		ToolTip: 'Save-AzSubscriptionDeploymentTemplate'
+	},
+	{
+		CompletionText: 'Save-AzTenantDeploymentTemplate',
+		ListItemText: 'Save-AzTenantDeploymentTemplate',
+		ResultType: 2,
+		ToolTip: 'Save-AzTenantDeploymentTemplate\\r\\n'
+	},
+	{
+		CompletionText: 'Save-AzVhd',
+		ListItemText: 'Save-AzVhd',
+		ResultType: 2,
+		ToolTip: 'Save-AzVhd\\r\\n'
+	},
+	{
+		CompletionText: 'Save-AzVMImage',
+		ListItemText: 'Save-AzVMImage',
+		ResultType: 2,
+		ToolTip: 'Save-AzVMImage\\r\\n'
+	},
+	{
+		CompletionText: 'Save-EtwTraceSession',
+		ListItemText: 'Save-EtwTraceSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nSave-EtwTraceSession \\r\\n'
+	},
+	{
+		CompletionText: 'Save-Help',
+		ListItemText: 'Save-Help',
+		ResultType: 2,
+		ToolTip: '\\r\\nSave-Help [-DestinationPath] <string[]> [[-Module] <psmoduleinfo[]>] [[-UICulture] <cultureinfo[]>] [-FullyQualifiedModule <ModuleSpecification[]>] [-Credential <pscredential>] [-UseDefaultCredentials] [-Force] [-Scope <UpdateHelpScope>] [<CommonParameters>]\\r\\n\\r\\nSave-Help [[-Module] <psmoduleinfo[]>] [[-UICulture] <cultureinfo[]>] -LiteralPath <string[]> [-FullyQualifiedModule <ModuleSpecification[]>] [-Credential <pscredential>] [-UseDefaultCredentials] [-Force] [-Scope <UpdateHelpScope>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Save-Module',
+		ListItemText: 'Save-Module',
+		ResultType: 2,
+		ToolTip: '\\r\\nSave-Module \\r\\n'
+	},
+	{
+		CompletionText: 'Save-NetGPO',
+		ListItemText: 'Save-NetGPO',
+		ResultType: 2,
+		ToolTip: '\\r\\nSave-NetGPO \\r\\n'
+	},
+	{
+		CompletionText: 'Save-NetworkSwitchConfiguration',
+		ListItemText: 'Save-NetworkSwitchConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nSave-NetworkSwitchConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Save-Package',
+		ListItemText: 'Save-Package',
+		ResultType: 2,
+		ToolTip: 'Save-Package\\r\\n'
+	},
+	{
+		CompletionText: 'Save-PSResource',
+		ListItemText: 'Save-PSResource',
+		ResultType: 2,
+		ToolTip: 'Save-PSResource\\r\\n'
+	},
+	{
+		CompletionText: 'Save-Script',
+		ListItemText: 'Save-Script',
+		ResultType: 2,
+		ToolTip: '\\r\\nSave-Script \\r\\n'
+	},
+	{
+		CompletionText: 'Save-SoftwareInventory',
+		ListItemText: 'Save-SoftwareInventory',
+		ResultType: 2,
+		ToolTip: 'Save-SoftwareInventory\\r\\n'
+	},
+	{
+		CompletionText: 'Save-StorageDataCollection',
+		ListItemText: 'Save-StorageDataCollection',
+		ResultType: 2,
+		ToolTip: '\\r\\nSave-StorageDataCollection \\r\\n'
+	},
+	{
+		CompletionText: 'Save-VM',
+		ListItemText: 'Save-VM',
+		ResultType: 2,
+		ToolTip: 'Save-VM\\r\\n'
+	},
+	{
+		CompletionText: 'Save-WindowsImage',
+		ListItemText: 'Save-WindowsImage',
+		ResultType: 2,
+		ToolTip: 'Save-WindowsImage\\r\\n'
+	},
+	{
+		CompletionText: 'savm',
+		ListItemText: 'savm',
+		ResultType: 2,
+		ToolTip: 'savm'
+	},
+	{
+		CompletionText: 'sbp',
+		ListItemText: 'sbp',
+		ResultType: 2,
+		ToolTip: 'Set-PSBreakpoint'
+	},
+	{
+		CompletionText: 'sc.exe',
+		ListItemText: 'sc.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\sc.exe'
+	},
+	{
+		CompletionText: 'scalar.exe',
+		ListItemText: 'scalar.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Git\\cmd\\scalar.exe'
+	},
+	{
+		CompletionText: 'scb',
+		ListItemText: 'scb',
+		ResultType: 2,
+		ToolTip: 'Set-Clipboard'
+	},
+	{
+		CompletionText: 'scdaemon.exe',
+		ListItemText: 'scdaemon.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files (x86)\\Gpg4win\\..\\GnuPG\\bin\\scdaemon.exe'
+	},
+	{
+		CompletionText: 'schemagen.exe',
+		ListItemText: 'schemagen.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\schemagen.exe'
+	},
+	{
+		CompletionText: 'schtasks.exe',
+		ListItemText: 'schtasks.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\schtasks.exe'
+	},
+	{
+		CompletionText: 'scim',
+		ListItemText: 'scim',
+		ResultType: 2,
+		ToolTip: 'scim'
+	},
+	{
+		CompletionText: 'scp.exe',
+		ListItemText: 'scp.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\System32\\OpenSSH\\scp.exe'
+	},
+	{
+		CompletionText: 'scrcons.exe',
+		ListItemText: 'scrcons.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\System32\\Wbem\\scrcons.exe'
+	},
+	{
+		CompletionText: 'ScriptRunner.exe',
+		ListItemText: 'ScriptRunner.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\ScriptRunner.exe'
+	},
+	{
+		CompletionText: 'sdbinst.exe',
+		ListItemText: 'sdbinst.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\sdbinst.exe'
+	},
+	{
+		CompletionText: 'sdchange.exe',
+		ListItemText: 'sdchange.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\sdchange.exe'
+	},
+	{
+		CompletionText: 'sdclt.exe',
+		ListItemText: 'sdclt.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\sdclt.exe'
+	},
+	{
+		CompletionText: 'sdiagnhost.exe',
+		ListItemText: 'sdiagnhost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\sdiagnhost.exe'
+	},
+	{
+		CompletionText: 'Search-AzDataProtectionBackupInstanceInAzGraph',
+		ListItemText: 'Search-AzDataProtectionBackupInstanceInAzGraph',
+		ResultType: 2,
+		ToolTip: '\\r\\nSearch-AzDataProtectionBackupInstanceInAzGraph \\r\\n'
+	},
+	{
+		CompletionText: 'Search-AzDataProtectionJobInAzGraph',
+		ListItemText: 'Search-AzDataProtectionJobInAzGraph',
+		ResultType: 2,
+		ToolTip: '\\r\\nSearch-AzDataProtectionJobInAzGraph \\r\\n'
+	},
+	{
+		CompletionText: 'SearchFilterHost.exe',
+		ListItemText: 'SearchFilterHost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\SearchFilterHost.exe'
+	},
+	{
+		CompletionText: 'SearchIndexer.exe',
+		ListItemText: 'SearchIndexer.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\SearchIndexer.exe'
+	},
+	{
+		CompletionText: 'SearchProtocolHost.exe',
+		ListItemText: 'SearchProtocolHost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\SearchProtocolHost.exe'
+	},
+	{
+		CompletionText: 'SecEdit.exe',
+		ListItemText: 'SecEdit.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\SecEdit.exe'
+	},
+	{
+		CompletionText: 'secinit.exe',
+		ListItemText: 'secinit.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\secinit.exe'
+	},
+	{
+		CompletionText: 'secpol.msc',
+		ListItemText: 'secpol.msc',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\secpol.msc'
+	},
+	{
+		CompletionText: 'SecureBootEncodeUEFI.exe',
+		ListItemText: 'SecureBootEncodeUEFI.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\SecureBootEncodeUEFI.exe'
+	},
+	{
+		CompletionText: 'securekernel.exe',
+		ListItemText: 'securekernel.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\securekernel.exe'
+	},
+	{
+		CompletionText: 'SecurityHealthHost.exe',
+		ListItemText: 'SecurityHealthHost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\SecurityHealthHost.exe'
+	},
+	{
+		CompletionText: 'SecurityHealthService.exe',
+		ListItemText: 'SecurityHealthService.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\SecurityHealthService.exe'
+	},
+	{
+		CompletionText: 'SecurityHealthSystray.exe',
+		ListItemText: 'SecurityHealthSystray.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\SecurityHealthSystray.exe'
+	},
+	{
+		CompletionText: 'select',
+		ListItemText: 'select',
+		ResultType: 2,
+		ToolTip: 'Select-Object'
+	},
+	{
+		CompletionText: 'Select-AzContext',
+		ListItemText: 'Select-AzContext',
+		ResultType: 2,
+		ToolTip: 'Select-AzContext\\r\\n'
+	},
+	{
+		CompletionText: 'Select-AzSubscription',
+		ListItemText: 'Select-AzSubscription',
+		ResultType: 2,
+		ToolTip: 'Select-AzSubscription'
+	},
+	{
+		CompletionText: 'Select-Object',
+		ListItemText: 'Select-Object',
+		ResultType: 2,
+		ToolTip: '\\r\\nSelect-Object [[-Property] <Object[]>] [-InputObject <psobject>] [-ExcludeProperty <string[]>] [-ExpandProperty <string>] [-Unique] [-CaseInsensitive] [-Last <int>] [-First <int>] [-Skip <int>] [-Wait] [<CommonParameters>]\\r\\n\\r\\nSelect-Object [[-Property] <Object[]>] [-InputObject <psobject>] [-ExcludeProperty <string[]>] [-ExpandProperty <string>] [-Unique] [-CaseInsensitive] [-Skip <int>] [-SkipLast <int>] [<CommonParameters>]\\r\\n\\r\\nSelect-Object [-InputObject <psobject>] [-Unique] [-CaseInsensitive] [-Wait] [-Index <int[]>] [<CommonParameters>]\\r\\n\\r\\nSelect-Object [-InputObject <psobject>] [-Unique] [-CaseInsensitive] [-SkipIndex <int[]>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Select-String',
+		ListItemText: 'Select-String',
+		ResultType: 2,
+		ToolTip: '\\r\\nSelect-String [-Pattern] <string[]> [-Path] <string[]> [-Culture <string>] [-SimpleMatch] [-CaseSensitive] [-Quiet] [-List] [-NoEmphasis] [-Include <string[]>] [-Exclude <string[]>] [-NotMatch] [-AllMatches] [-Encoding <Encoding>] [-Context <int[]>] [<CommonParameters>]\\r\\n\\r\\nSelect-String [-Pattern] <string[]> -InputObject <psobject> [-Culture <string>] [-SimpleMatch] [-CaseSensitive] [-Quiet] [-List] [-NoEmphasis] [-Include <string[]>] [-Exclude <string[]>] [-NotMatch] [-AllMatches] [-Encoding <Encoding>] [-Context <int[]>] [<CommonParameters>]\\r\\n\\r\\nSelect-String [-Pattern] <string[]> -InputObject <psobject> -Raw [-Culture <string>] [-SimpleMatch] [-CaseSensitive] [-List] [-NoEmphasis] [-Include <string[]>] [-Exclude <string[]>] [-NotMatch] [-AllMatches] [-Encoding <Encoding>] [-Context <int[]>] [<CommonParameters>]\\r\\n\\r\\nSelect-String [-Pattern] <string[]> [-Path] <string[]> -Raw [-Culture <string>] [-SimpleMatch] [-CaseSensitive] [-List] [-NoEmphasis] [-Include <string[]>] [-Exclude <string[]>] [-NotMatch] [-AllMatches] [-Encoding <Encoding>] [-Context <int[]>] [<CommonParameters>]\\r\\n\\r\\nSelect-String [-Pattern] <string[]> -LiteralPath <string[]> [-Culture <string>] [-SimpleMatch] [-CaseSensitive] [-Quiet] [-List] [-NoEmphasis] [-Include <string[]>] [-Exclude <string[]>] [-NotMatch] [-AllMatches] [-Encoding <Encoding>] [-Context <int[]>] [<CommonParameters>]\\r\\n\\r\\nSelect-String [-Pattern] <string[]> -LiteralPath <string[]> -Raw [-Culture <string>] [-SimpleMatch] [-CaseSensitive] [-List] [-NoEmphasis] [-Include <string[]>] [-Exclude <string[]>] [-NotMatch] [-AllMatches] [-Encoding <Encoding>] [-Context <int[]>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Select-Xml',
+		ListItemText: 'Select-Xml',
+		ResultType: 2,
+		ToolTip: '\\r\\nSelect-Xml [-XPath] <string> [-Xml] <XmlNode[]> [-Namespace <hashtable>] [<CommonParameters>]\\r\\n\\r\\nSelect-Xml [-XPath] <string> [-Path] <string[]> [-Namespace <hashtable>] [<CommonParameters>]\\r\\n\\r\\nSelect-Xml [-XPath] <string> -LiteralPath <string[]> [-Namespace <hashtable>] [<CommonParameters>]\\r\\n\\r\\nSelect-Xml [-XPath] <string> -Content <string[]> [-Namespace <hashtable>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Send-AzIotHubD2CMessage',
+		ListItemText: 'Send-AzIotHubD2CMessage',
+		ResultType: 2,
+		ToolTip: 'Send-AzIotHubD2CMessage'
+	},
+	{
+		CompletionText: 'Send-AzIotHubDevice2CloudMessage',
+		ListItemText: 'Send-AzIotHubDevice2CloudMessage',
+		ResultType: 2,
+		ToolTip: 'Send-AzIotHubDevice2CloudMessage\\r\\n'
+	},
+	{
+		CompletionText: 'Send-AzWvdUserSessionMessage',
+		ListItemText: 'Send-AzWvdUserSessionMessage',
+		ResultType: 2,
+		ToolTip: '\\r\\nSend-AzWvdUserSessionMessage \\r\\n'
+	},
+	{
+		CompletionText: 'Send-Completions',
+		ListItemText: 'Send-Completions',
+		ResultType: 2,
+		ToolTip: '\\r\\nSend-Completions \\r\\n'
+	},
+	{
+		CompletionText: 'Send-DtcDiagnosticTransaction',
+		ListItemText: 'Send-DtcDiagnosticTransaction',
+		ResultType: 2,
+		ToolTip: 'Send-DtcDiagnosticTransaction\\r\\n'
+	},
+	{
+		CompletionText: 'Send-EtwTraceSession',
+		ListItemText: 'Send-EtwTraceSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nSend-EtwTraceSession \\r\\n'
+	},
+	{
+		CompletionText: 'Send-Feedback',
+		ListItemText: 'Send-Feedback',
+		ResultType: 2,
+		ToolTip: 'Send-Feedback\\r\\n'
+	},
+	{
+		CompletionText: 'Send-MailMessage',
+		ListItemText: 'Send-MailMessage',
+		ResultType: 2,
+		ToolTip: '\\r\\nSend-MailMessage [-To] <string[]> [[-Subject] <string>] [[-Body] <string>] [[-SmtpServer] <string>] -From <string> [-Attachments <string[]>] [-Bcc <string[]>] [-BodyAsHtml] [-Encoding <Encoding>] [-Cc <string[]>] [-DeliveryNotificationOption <DeliveryNotificationOptions>] [-Priority <MailPriority>] [-ReplyTo <string[]>] [-Credential <pscredential>] [-UseSsl] [-Port <int>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'SensorDataService.exe',
+		ListItemText: 'SensorDataService.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\SensorDataService.exe'
+	},
+	{
+		CompletionText: 'SensorRuntimeBroker.exe',
+		ListItemText: 'SensorRuntimeBroker.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\SensorRuntimeBroker.exe'
+	},
+	{
+		CompletionText: 'serialver.exe',
+		ListItemText: 'serialver.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\serialver.exe'
+	},
+	{
+		CompletionText: 'servertool.exe',
+		ListItemText: 'servertool.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\servertool.exe'
+	},
+	{
+		CompletionText: 'services.exe',
+		ListItemText: 'services.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\services.exe'
+	},
+	{
+		CompletionText: 'services.msc',
+		ListItemText: 'services.msc',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\services.msc'
+	},
+	{
+		CompletionText: 'sessionmsg.exe',
+		ListItemText: 'sessionmsg.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\sessionmsg.exe'
+	},
+	{
+		CompletionText: 'set',
+		ListItemText: 'set',
+		ResultType: 2,
+		ToolTip: 'Set-Variable'
+	},
+	{
+		CompletionText: 'Set-Acl',
+		ListItemText: 'Set-Acl',
+		ResultType: 2,
+		ToolTip: 'Set-Acl\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AdlAnalyticsAccount',
+		ListItemText: 'Set-AdlAnalyticsAccount',
+		ResultType: 2,
+		ToolTip: 'Set-AdlAnalyticsAccount'
+	},
+	{
+		CompletionText: 'Set-AdlAnalyticsDataSource',
+		ListItemText: 'Set-AdlAnalyticsDataSource',
+		ResultType: 2,
+		ToolTip: 'Set-AdlAnalyticsDataSource'
+	},
+	{
+		CompletionText: 'Set-AdlAnalyticsFirewallRule',
+		ListItemText: 'Set-AdlAnalyticsFirewallRule',
+		ResultType: 2,
+		ToolTip: 'Set-AdlAnalyticsFirewallRule'
+	},
+	{
+		CompletionText: 'Set-AdlCatalogCredential',
+		ListItemText: 'Set-AdlCatalogCredential',
+		ResultType: 2,
+		ToolTip: 'Set-AdlCatalogCredential'
+	},
+	{
+		CompletionText: 'Set-AdlCatalogItemAclEntry',
+		ListItemText: 'Set-AdlCatalogItemAclEntry',
+		ResultType: 2,
+		ToolTip: 'Set-AdlCatalogItemAclEntry'
+	},
+	{
+		CompletionText: 'Set-AdlCatalogSecret',
+		ListItemText: 'Set-AdlCatalogSecret',
+		ResultType: 2,
+		ToolTip: 'Set-AdlCatalogSecret'
+	},
+	{
+		CompletionText: 'Set-AdlStore',
+		ListItemText: 'Set-AdlStore',
+		ResultType: 2,
+		ToolTip: 'Set-AdlStore'
+	},
+	{
+		CompletionText: 'Set-AdlStoreFirewallRule',
+		ListItemText: 'Set-AdlStoreFirewallRule',
+		ResultType: 2,
+		ToolTip: 'Set-AdlStoreFirewallRule'
+	},
+	{
+		CompletionText: 'Set-AdlStoreItemAcl',
+		ListItemText: 'Set-AdlStoreItemAcl',
+		ResultType: 2,
+		ToolTip: 'Set-AdlStoreItemAcl'
+	},
+	{
+		CompletionText: 'Set-AdlStoreItemAclEntry',
+		ListItemText: 'Set-AdlStoreItemAclEntry',
+		ResultType: 2,
+		ToolTip: 'Set-AdlStoreItemAclEntry'
+	},
+	{
+		CompletionText: 'Set-AdlStoreItemExpiry',
+		ListItemText: 'Set-AdlStoreItemExpiry',
+		ResultType: 2,
+		ToolTip: 'Set-AdlStoreItemExpiry'
+	},
+	{
+		CompletionText: 'Set-AdlStoreItemOwner',
+		ListItemText: 'Set-AdlStoreItemOwner',
+		ResultType: 2,
+		ToolTip: 'Set-AdlStoreItemOwner'
+	},
+	{
+		CompletionText: 'Set-AdlStoreItemPermission',
+		ListItemText: 'Set-AdlStoreItemPermission',
+		ResultType: 2,
+		ToolTip: 'Set-AdlStoreItemPermission'
+	},
+	{
+		CompletionText: 'Set-AdlStoreTrustedIdProvider',
+		ListItemText: 'Set-AdlStoreTrustedIdProvider',
+		ResultType: 2,
+		ToolTip: 'Set-AdlStoreTrustedIdProvider'
+	},
+	{
+		CompletionText: 'Set-AdlStoreVirtualNetworkRule',
+		ListItemText: 'Set-AdlStoreVirtualNetworkRule',
+		ResultType: 2,
+		ToolTip: 'Set-AdlStoreVirtualNetworkRule'
+	},
+	{
+		CompletionText: 'Set-Alias',
+		ListItemText: 'Set-Alias',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-Alias [-Name] <string> [-Value] <string> [-Description <string>] [-Option <ScopedItemOptions>] [-PassThru] [-Scope <string>] [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AppBackgroundTaskResourcePolicy',
+		ListItemText: 'Set-AppBackgroundTaskResourcePolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AppBackgroundTaskResourcePolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AppLockerPolicy',
+		ListItemText: 'Set-AppLockerPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AppLockerPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AppPackageAutoUpdateSettings',
+		ListItemText: 'Set-AppPackageAutoUpdateSettings',
+		ResultType: 2,
+		ToolTip: 'Set-AppPackageAutoUpdateSettings'
+	},
+	{
+		CompletionText: 'Set-AppPackageDefaultVolume',
+		ListItemText: 'Set-AppPackageDefaultVolume',
+		ResultType: 2,
+		ToolTip: 'Set-AppPackageDefaultVolume'
+	},
+	{
+		CompletionText: 'Set-AppPackageProvisionedDataFile',
+		ListItemText: 'Set-AppPackageProvisionedDataFile',
+		ResultType: 2,
+		ToolTip: 'Set-AppPackageProvisionedDataFile'
+	},
+	{
+		CompletionText: 'Set-AppxDefaultVolume',
+		ListItemText: 'Set-AppxDefaultVolume',
+		ResultType: 2,
+		ToolTip: 'Set-AppxDefaultVolume\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AppxPackageAutoUpdateSettings',
+		ListItemText: 'Set-AppxPackageAutoUpdateSettings',
+		ResultType: 2,
+		ToolTip: 'Set-AppxPackageAutoUpdateSettings\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AppXProvisionedDataFile',
+		ListItemText: 'Set-AppXProvisionedDataFile',
+		ResultType: 2,
+		ToolTip: 'Set-AppXProvisionedDataFile\\r\\n'
+	},
+	{
+		CompletionText: 'Set-ASRAlertSetting',
+		ListItemText: 'Set-ASRAlertSetting',
+		ResultType: 2,
+		ToolTip: 'Set-ASRAlertSetting'
+	},
+	{
+		CompletionText: 'Set-ASRNotificationSetting',
+		ListItemText: 'Set-ASRNotificationSetting',
+		ResultType: 2,
+		ToolTip: 'Set-ASRNotificationSetting'
+	},
+	{
+		CompletionText: 'Set-ASRReplicationProtectedItem',
+		ListItemText: 'Set-ASRReplicationProtectedItem',
+		ResultType: 2,
+		ToolTip: 'Set-ASRReplicationProtectedItem'
+	},
+	{
+		CompletionText: 'Set-ASRVaultContext',
+		ListItemText: 'Set-ASRVaultContext',
+		ResultType: 2,
+		ToolTip: 'Set-ASRVaultContext'
+	},
+	{
+		CompletionText: 'Set-ASRVaultSettings',
+		ListItemText: 'Set-ASRVaultSettings',
+		ResultType: 2,
+		ToolTip: 'Set-ASRVaultSettings'
+	},
+	{
+		CompletionText: 'Set-AssignedAccess',
+		ListItemText: 'Set-AssignedAccess',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-AssignedAccess \\r\\n'
+	},
+	{
+		CompletionText: 'Set-AuthenticodeSignature',
+		ListItemText: 'Set-AuthenticodeSignature',
+		ResultType: 2,
+		ToolTip: 'Set-AuthenticodeSignature\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AutologgerConfig',
+		ListItemText: 'Set-AutologgerConfig',
+		ResultType: 2,
+		ToolTip: 'Set-AutologgerConfig'
+	},
+	{
+		CompletionText: 'Set-AzActionGroup',
+		ListItemText: 'Set-AzActionGroup',
+		ResultType: 2,
+		ToolTip: 'Set-AzActionGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzADApplication',
+		ListItemText: 'Set-AzADApplication',
+		ResultType: 2,
+		ToolTip: 'Set-AzADApplication'
+	},
+	{
+		CompletionText: 'Set-AzADServicePrincipal',
+		ListItemText: 'Set-AzADServicePrincipal',
+		ResultType: 2,
+		ToolTip: 'Set-AzADServicePrincipal'
+	},
+	{
+		CompletionText: 'Set-AzADUser',
+		ListItemText: 'Set-AzADUser',
+		ResultType: 2,
+		ToolTip: 'Set-AzADUser'
+	},
+	{
+		CompletionText: 'Set-AzAdvisorConfiguration',
+		ListItemText: 'Set-AzAdvisorConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-AzAdvisorConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzAksCluster',
+		ListItemText: 'Set-AzAksCluster',
+		ResultType: 2,
+		ToolTip: 'Set-AzAksCluster\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzAksClusterCredential',
+		ListItemText: 'Set-AzAksClusterCredential',
+		ResultType: 2,
+		ToolTip: 'Set-AzAksClusterCredential\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzAlertsSuppressionRule',
+		ListItemText: 'Set-AzAlertsSuppressionRule',
+		ResultType: 2,
+		ToolTip: 'Set-AzAlertsSuppressionRule\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzAnalysisServicesServer',
+		ListItemText: 'Set-AzAnalysisServicesServer',
+		ResultType: 2,
+		ToolTip: 'Set-AzAnalysisServicesServer\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApiManagement',
+		ListItemText: 'Set-AzApiManagement',
+		ResultType: 2,
+		ToolTip: 'Set-AzApiManagement\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApiManagementApi',
+		ListItemText: 'Set-AzApiManagementApi',
+		ResultType: 2,
+		ToolTip: 'Set-AzApiManagementApi\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApiManagementApiRevision',
+		ListItemText: 'Set-AzApiManagementApiRevision',
+		ResultType: 2,
+		ToolTip: 'Set-AzApiManagementApiRevision\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApiManagementApiSchema',
+		ListItemText: 'Set-AzApiManagementApiSchema',
+		ResultType: 2,
+		ToolTip: 'Set-AzApiManagementApiSchema\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApiManagementApiVersionSet',
+		ListItemText: 'Set-AzApiManagementApiVersionSet',
+		ResultType: 2,
+		ToolTip: 'Set-AzApiManagementApiVersionSet\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApiManagementAuthorizationServer',
+		ListItemText: 'Set-AzApiManagementAuthorizationServer',
+		ResultType: 2,
+		ToolTip: 'Set-AzApiManagementAuthorizationServer\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApiManagementBackend',
+		ListItemText: 'Set-AzApiManagementBackend',
+		ResultType: 2,
+		ToolTip: 'Set-AzApiManagementBackend\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApiManagementCertificate',
+		ListItemText: 'Set-AzApiManagementCertificate',
+		ResultType: 2,
+		ToolTip: 'Set-AzApiManagementCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApiManagementDiagnostic',
+		ListItemText: 'Set-AzApiManagementDiagnostic',
+		ResultType: 2,
+		ToolTip: 'Set-AzApiManagementDiagnostic\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApiManagementGroup',
+		ListItemText: 'Set-AzApiManagementGroup',
+		ResultType: 2,
+		ToolTip: 'Set-AzApiManagementGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApiManagementIdentityProvider',
+		ListItemText: 'Set-AzApiManagementIdentityProvider',
+		ResultType: 2,
+		ToolTip: 'Set-AzApiManagementIdentityProvider\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApiManagementLogger',
+		ListItemText: 'Set-AzApiManagementLogger',
+		ResultType: 2,
+		ToolTip: 'Set-AzApiManagementLogger\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApiManagementNamedValue',
+		ListItemText: 'Set-AzApiManagementNamedValue',
+		ResultType: 2,
+		ToolTip: 'Set-AzApiManagementNamedValue\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApiManagementOpenIdConnectProvider',
+		ListItemText: 'Set-AzApiManagementOpenIdConnectProvider',
+		ResultType: 2,
+		ToolTip: 'Set-AzApiManagementOpenIdConnectProvider\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApiManagementOperation',
+		ListItemText: 'Set-AzApiManagementOperation',
+		ResultType: 2,
+		ToolTip: 'Set-AzApiManagementOperation\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApiManagementPolicy',
+		ListItemText: 'Set-AzApiManagementPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AzApiManagementPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApiManagementProduct',
+		ListItemText: 'Set-AzApiManagementProduct',
+		ResultType: 2,
+		ToolTip: 'Set-AzApiManagementProduct\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApiManagementSubscription',
+		ListItemText: 'Set-AzApiManagementSubscription',
+		ResultType: 2,
+		ToolTip: 'Set-AzApiManagementSubscription\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApiManagementTenantAccess',
+		ListItemText: 'Set-AzApiManagementTenantAccess',
+		ResultType: 2,
+		ToolTip: 'Set-AzApiManagementTenantAccess\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApiManagementUser',
+		ListItemText: 'Set-AzApiManagementUser',
+		ResultType: 2,
+		ToolTip: 'Set-AzApiManagementUser\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApplicationGateway',
+		ListItemText: 'Set-AzApplicationGateway',
+		ResultType: 2,
+		ToolTip: 'Set-AzApplicationGateway\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApplicationGatewayAuthenticationCertificate',
+		ListItemText: 'Set-AzApplicationGatewayAuthenticationCertificate',
+		ResultType: 2,
+		ToolTip: 'Set-AzApplicationGatewayAuthenticationCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApplicationGatewayAutoscaleConfiguration',
+		ListItemText: 'Set-AzApplicationGatewayAutoscaleConfiguration',
+		ResultType: 2,
+		ToolTip: 'Set-AzApplicationGatewayAutoscaleConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApplicationGatewayBackendAddressPool',
+		ListItemText: 'Set-AzApplicationGatewayBackendAddressPool',
+		ResultType: 2,
+		ToolTip: 'Set-AzApplicationGatewayBackendAddressPool\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApplicationGatewayBackendHttpSetting',
+		ListItemText: 'Set-AzApplicationGatewayBackendHttpSetting',
+		ResultType: 2,
+		ToolTip: 'Set-AzApplicationGatewayBackendHttpSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApplicationGatewayBackendHttpSettings',
+		ListItemText: 'Set-AzApplicationGatewayBackendHttpSettings',
+		ResultType: 2,
+		ToolTip: 'Set-AzApplicationGatewayBackendHttpSettings'
+	},
+	{
+		CompletionText: 'Set-AzApplicationGatewayBackendSetting',
+		ListItemText: 'Set-AzApplicationGatewayBackendSetting',
+		ResultType: 2,
+		ToolTip: 'Set-AzApplicationGatewayBackendSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApplicationGatewayClientAuthConfiguration',
+		ListItemText: 'Set-AzApplicationGatewayClientAuthConfiguration',
+		ResultType: 2,
+		ToolTip: 'Set-AzApplicationGatewayClientAuthConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApplicationGatewayConnectionDraining',
+		ListItemText: 'Set-AzApplicationGatewayConnectionDraining',
+		ResultType: 2,
+		ToolTip: 'Set-AzApplicationGatewayConnectionDraining\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApplicationGatewayCustomError',
+		ListItemText: 'Set-AzApplicationGatewayCustomError',
+		ResultType: 2,
+		ToolTip: 'Set-AzApplicationGatewayCustomError\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApplicationGatewayFirewallPolicy',
+		ListItemText: 'Set-AzApplicationGatewayFirewallPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AzApplicationGatewayFirewallPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApplicationGatewayFrontendIPConfig',
+		ListItemText: 'Set-AzApplicationGatewayFrontendIPConfig',
+		ResultType: 2,
+		ToolTip: 'Set-AzApplicationGatewayFrontendIPConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApplicationGatewayFrontendPort',
+		ListItemText: 'Set-AzApplicationGatewayFrontendPort',
+		ResultType: 2,
+		ToolTip: 'Set-AzApplicationGatewayFrontendPort\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApplicationGatewayHttpListener',
+		ListItemText: 'Set-AzApplicationGatewayHttpListener',
+		ResultType: 2,
+		ToolTip: 'Set-AzApplicationGatewayHttpListener\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApplicationGatewayHttpListenerCustomError',
+		ListItemText: 'Set-AzApplicationGatewayHttpListenerCustomError',
+		ResultType: 2,
+		ToolTip: 'Set-AzApplicationGatewayHttpListenerCustomError\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApplicationGatewayIdentity',
+		ListItemText: 'Set-AzApplicationGatewayIdentity',
+		ResultType: 2,
+		ToolTip: 'Set-AzApplicationGatewayIdentity\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApplicationGatewayIPConfiguration',
+		ListItemText: 'Set-AzApplicationGatewayIPConfiguration',
+		ResultType: 2,
+		ToolTip: 'Set-AzApplicationGatewayIPConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApplicationGatewayListener',
+		ListItemText: 'Set-AzApplicationGatewayListener',
+		ResultType: 2,
+		ToolTip: 'Set-AzApplicationGatewayListener\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApplicationGatewayPrivateLinkConfiguration',
+		ListItemText: 'Set-AzApplicationGatewayPrivateLinkConfiguration',
+		ResultType: 2,
+		ToolTip: 'Set-AzApplicationGatewayPrivateLinkConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApplicationGatewayProbeConfig',
+		ListItemText: 'Set-AzApplicationGatewayProbeConfig',
+		ResultType: 2,
+		ToolTip: 'Set-AzApplicationGatewayProbeConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApplicationGatewayRedirectConfiguration',
+		ListItemText: 'Set-AzApplicationGatewayRedirectConfiguration',
+		ResultType: 2,
+		ToolTip: 'Set-AzApplicationGatewayRedirectConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApplicationGatewayRequestRoutingRule',
+		ListItemText: 'Set-AzApplicationGatewayRequestRoutingRule',
+		ResultType: 2,
+		ToolTip: 'Set-AzApplicationGatewayRequestRoutingRule\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApplicationGatewayRewriteRuleSet',
+		ListItemText: 'Set-AzApplicationGatewayRewriteRuleSet',
+		ResultType: 2,
+		ToolTip: 'Set-AzApplicationGatewayRewriteRuleSet\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApplicationGatewayRoutingRule',
+		ListItemText: 'Set-AzApplicationGatewayRoutingRule',
+		ResultType: 2,
+		ToolTip: 'Set-AzApplicationGatewayRoutingRule\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApplicationGatewaySku',
+		ListItemText: 'Set-AzApplicationGatewaySku',
+		ResultType: 2,
+		ToolTip: 'Set-AzApplicationGatewaySku\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApplicationGatewaySslCertificate',
+		ListItemText: 'Set-AzApplicationGatewaySslCertificate',
+		ResultType: 2,
+		ToolTip: 'Set-AzApplicationGatewaySslCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApplicationGatewaySslPolicy',
+		ListItemText: 'Set-AzApplicationGatewaySslPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AzApplicationGatewaySslPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApplicationGatewaySslProfile',
+		ListItemText: 'Set-AzApplicationGatewaySslProfile',
+		ResultType: 2,
+		ToolTip: 'Set-AzApplicationGatewaySslProfile\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApplicationGatewaySslProfilePolicy',
+		ListItemText: 'Set-AzApplicationGatewaySslProfilePolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AzApplicationGatewaySslProfilePolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApplicationGatewayTrustedClientCertificate',
+		ListItemText: 'Set-AzApplicationGatewayTrustedClientCertificate',
+		ResultType: 2,
+		ToolTip: 'Set-AzApplicationGatewayTrustedClientCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApplicationGatewayTrustedRootCertificate',
+		ListItemText: 'Set-AzApplicationGatewayTrustedRootCertificate',
+		ResultType: 2,
+		ToolTip: 'Set-AzApplicationGatewayTrustedRootCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApplicationGatewayUrlPathMapConfig',
+		ListItemText: 'Set-AzApplicationGatewayUrlPathMapConfig',
+		ResultType: 2,
+		ToolTip: 'Set-AzApplicationGatewayUrlPathMapConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApplicationGatewayWebApplicationFirewallConfiguration',
+		ListItemText: 'Set-AzApplicationGatewayWebApplicationFirewallConfiguration',
+		ResultType: 2,
+		ToolTip: 'Set-AzApplicationGatewayWebApplicationFirewallConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApplicationInsightsContinuousExport',
+		ListItemText: 'Set-AzApplicationInsightsContinuousExport',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-AzApplicationInsightsContinuousExport \\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApplicationInsightsDailyCap',
+		ListItemText: 'Set-AzApplicationInsightsDailyCap',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-AzApplicationInsightsDailyCap \\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzApplicationInsightsPricingPlan',
+		ListItemText: 'Set-AzApplicationInsightsPricingPlan',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-AzApplicationInsightsPricingPlan \\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzAppServicePlan',
+		ListItemText: 'Set-AzAppServicePlan',
+		ResultType: 2,
+		ToolTip: 'Set-AzAppServicePlan\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzAs',
+		ListItemText: 'Set-AzAs',
+		ResultType: 2,
+		ToolTip: 'Set-AzAs'
+	},
+	{
+		CompletionText: 'Set-AzAttestationPolicy',
+		ListItemText: 'Set-AzAttestationPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AzAttestationPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzAutomationAccount',
+		ListItemText: 'Set-AzAutomationAccount',
+		ResultType: 2,
+		ToolTip: 'Set-AzAutomationAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzAutomationCertificate',
+		ListItemText: 'Set-AzAutomationCertificate',
+		ResultType: 2,
+		ToolTip: 'Set-AzAutomationCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzAutomationConnectionFieldValue',
+		ListItemText: 'Set-AzAutomationConnectionFieldValue',
+		ResultType: 2,
+		ToolTip: 'Set-AzAutomationConnectionFieldValue\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzAutomationCredential',
+		ListItemText: 'Set-AzAutomationCredential',
+		ResultType: 2,
+		ToolTip: 'Set-AzAutomationCredential\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzAutomationDscNode',
+		ListItemText: 'Set-AzAutomationDscNode',
+		ResultType: 2,
+		ToolTip: 'Set-AzAutomationDscNode\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzAutomationHybridRunbookWorkerGroup',
+		ListItemText: 'Set-AzAutomationHybridRunbookWorkerGroup',
+		ResultType: 2,
+		ToolTip: 'Set-AzAutomationHybridRunbookWorkerGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzAutomationModule',
+		ListItemText: 'Set-AzAutomationModule',
+		ResultType: 2,
+		ToolTip: 'Set-AzAutomationModule\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzAutomationPython3Package',
+		ListItemText: 'Set-AzAutomationPython3Package',
+		ResultType: 2,
+		ToolTip: 'Set-AzAutomationPython3Package\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzAutomationRunbook',
+		ListItemText: 'Set-AzAutomationRunbook',
+		ResultType: 2,
+		ToolTip: 'Set-AzAutomationRunbook\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzAutomationSchedule',
+		ListItemText: 'Set-AzAutomationSchedule',
+		ResultType: 2,
+		ToolTip: 'Set-AzAutomationSchedule\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzAutomationVariable',
+		ListItemText: 'Set-AzAutomationVariable',
+		ResultType: 2,
+		ToolTip: 'Set-AzAutomationVariable\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzAutomationWebhook',
+		ListItemText: 'Set-AzAutomationWebhook',
+		ResultType: 2,
+		ToolTip: 'Set-AzAutomationWebhook\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzBastion',
+		ListItemText: 'Set-AzBastion',
+		ResultType: 2,
+		ToolTip: 'Set-AzBastion\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzBatchAccount',
+		ListItemText: 'Set-AzBatchAccount',
+		ResultType: 2,
+		ToolTip: 'Set-AzBatchAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzBatchApplication',
+		ListItemText: 'Set-AzBatchApplication',
+		ResultType: 2,
+		ToolTip: 'Set-AzBatchApplication\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzBatchComputeNodeUser',
+		ListItemText: 'Set-AzBatchComputeNodeUser',
+		ResultType: 2,
+		ToolTip: 'Set-AzBatchComputeNodeUser\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzBatchJob',
+		ListItemText: 'Set-AzBatchJob',
+		ResultType: 2,
+		ToolTip: 'Set-AzBatchJob\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzBatchJobSchedule',
+		ListItemText: 'Set-AzBatchJobSchedule',
+		ResultType: 2,
+		ToolTip: 'Set-AzBatchJobSchedule\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzBatchPool',
+		ListItemText: 'Set-AzBatchPool',
+		ResultType: 2,
+		ToolTip: 'Set-AzBatchPool\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzBatchTask',
+		ListItemText: 'Set-AzBatchTask',
+		ResultType: 2,
+		ToolTip: 'Set-AzBatchTask\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzCloudServiceUpdateDomain',
+		ListItemText: 'Set-AzCloudServiceUpdateDomain',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-AzCloudServiceUpdateDomain \\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzCognitiveServicesAccount',
+		ListItemText: 'Set-AzCognitiveServicesAccount',
+		ResultType: 2,
+		ToolTip: 'Set-AzCognitiveServicesAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzConsumptionBudget',
+		ListItemText: 'Set-AzConsumptionBudget',
+		ResultType: 2,
+		ToolTip: 'Set-AzConsumptionBudget\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzContext',
+		ListItemText: 'Set-AzContext',
+		ResultType: 2,
+		ToolTip: 'Set-AzContext\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzCurrentStorageAccount',
+		ListItemText: 'Set-AzCurrentStorageAccount',
+		ResultType: 2,
+		ToolTip: 'Set-AzCurrentStorageAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDataBoxEdgeBandwidthSchedule',
+		ListItemText: 'Set-AzDataBoxEdgeBandwidthSchedule',
+		ResultType: 2,
+		ToolTip: 'Set-AzDataBoxEdgeBandwidthSchedule\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDataBoxEdgeRole',
+		ListItemText: 'Set-AzDataBoxEdgeRole',
+		ResultType: 2,
+		ToolTip: 'Set-AzDataBoxEdgeRole\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDataBoxEdgeShare',
+		ListItemText: 'Set-AzDataBoxEdgeShare',
+		ResultType: 2,
+		ToolTip: 'Set-AzDataBoxEdgeShare\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDataBoxEdgeStorageAccountCredential',
+		ListItemText: 'Set-AzDataBoxEdgeStorageAccountCredential',
+		ResultType: 2,
+		ToolTip: 'Set-AzDataBoxEdgeStorageAccountCredential\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDataBoxEdgeUser',
+		ListItemText: 'Set-AzDataBoxEdgeUser',
+		ResultType: 2,
+		ToolTip: 'Set-AzDataBoxEdgeUser\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDataCollectionRule',
+		ListItemText: 'Set-AzDataCollectionRule',
+		ResultType: 2,
+		ToolTip: 'Set-AzDataCollectionRule\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDataFactoryGateway',
+		ListItemText: 'Set-AzDataFactoryGateway',
+		ResultType: 2,
+		ToolTip: 'Set-AzDataFactoryGateway\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDataFactoryPipelineActivePeriod',
+		ListItemText: 'Set-AzDataFactoryPipelineActivePeriod',
+		ResultType: 2,
+		ToolTip: 'Set-AzDataFactoryPipelineActivePeriod\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDataFactorySliceStatus',
+		ListItemText: 'Set-AzDataFactorySliceStatus',
+		ResultType: 2,
+		ToolTip: 'Set-AzDataFactorySliceStatus\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDataFactoryV2',
+		ListItemText: 'Set-AzDataFactoryV2',
+		ResultType: 2,
+		ToolTip: 'Set-AzDataFactoryV2\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDataFactoryV2DataFlow',
+		ListItemText: 'Set-AzDataFactoryV2DataFlow',
+		ResultType: 2,
+		ToolTip: 'Set-AzDataFactoryV2DataFlow\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDataFactoryV2Dataset',
+		ListItemText: 'Set-AzDataFactoryV2Dataset',
+		ResultType: 2,
+		ToolTip: 'Set-AzDataFactoryV2Dataset\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDataFactoryV2IntegrationRuntime',
+		ListItemText: 'Set-AzDataFactoryV2IntegrationRuntime',
+		ResultType: 2,
+		ToolTip: 'Set-AzDataFactoryV2IntegrationRuntime\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDataFactoryV2LinkedService',
+		ListItemText: 'Set-AzDataFactoryV2LinkedService',
+		ResultType: 2,
+		ToolTip: 'Set-AzDataFactoryV2LinkedService\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDataFactoryV2Pipeline',
+		ListItemText: 'Set-AzDataFactoryV2Pipeline',
+		ResultType: 2,
+		ToolTip: 'Set-AzDataFactoryV2Pipeline\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDataFactoryV2Trigger',
+		ListItemText: 'Set-AzDataFactoryV2Trigger',
+		ResultType: 2,
+		ToolTip: 'Set-AzDataFactoryV2Trigger\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDataLakeAnalyticsAccount',
+		ListItemText: 'Set-AzDataLakeAnalyticsAccount',
+		ResultType: 2,
+		ToolTip: 'Set-AzDataLakeAnalyticsAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDataLakeAnalyticsCatalogCredential',
+		ListItemText: 'Set-AzDataLakeAnalyticsCatalogCredential',
+		ResultType: 2,
+		ToolTip: 'Set-AzDataLakeAnalyticsCatalogCredential\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDataLakeAnalyticsCatalogItemAclEntry',
+		ListItemText: 'Set-AzDataLakeAnalyticsCatalogItemAclEntry',
+		ResultType: 2,
+		ToolTip: 'Set-AzDataLakeAnalyticsCatalogItemAclEntry\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDataLakeAnalyticsDataSource',
+		ListItemText: 'Set-AzDataLakeAnalyticsDataSource',
+		ResultType: 2,
+		ToolTip: 'Set-AzDataLakeAnalyticsDataSource\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDataLakeAnalyticsFirewallRule',
+		ListItemText: 'Set-AzDataLakeAnalyticsFirewallRule',
+		ResultType: 2,
+		ToolTip: 'Set-AzDataLakeAnalyticsFirewallRule\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDataLakeGen2AclRecursive',
+		ListItemText: 'Set-AzDataLakeGen2AclRecursive',
+		ResultType: 2,
+		ToolTip: 'Set-AzDataLakeGen2AclRecursive\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDataLakeGen2ItemAclObject',
+		ListItemText: 'Set-AzDataLakeGen2ItemAclObject',
+		ResultType: 2,
+		ToolTip: 'Set-AzDataLakeGen2ItemAclObject\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDataLakeStoreAccount',
+		ListItemText: 'Set-AzDataLakeStoreAccount',
+		ResultType: 2,
+		ToolTip: 'Set-AzDataLakeStoreAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDataLakeStoreFirewallRule',
+		ListItemText: 'Set-AzDataLakeStoreFirewallRule',
+		ResultType: 2,
+		ToolTip: 'Set-AzDataLakeStoreFirewallRule\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDataLakeStoreItemAcl',
+		ListItemText: 'Set-AzDataLakeStoreItemAcl',
+		ResultType: 2,
+		ToolTip: 'Set-AzDataLakeStoreItemAcl\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDataLakeStoreItemAclEntry',
+		ListItemText: 'Set-AzDataLakeStoreItemAclEntry',
+		ResultType: 2,
+		ToolTip: 'Set-AzDataLakeStoreItemAclEntry\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDataLakeStoreItemExpiry',
+		ListItemText: 'Set-AzDataLakeStoreItemExpiry',
+		ResultType: 2,
+		ToolTip: 'Set-AzDataLakeStoreItemExpiry\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDataLakeStoreItemOwner',
+		ListItemText: 'Set-AzDataLakeStoreItemOwner',
+		ResultType: 2,
+		ToolTip: 'Set-AzDataLakeStoreItemOwner\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDataLakeStoreItemPermission',
+		ListItemText: 'Set-AzDataLakeStoreItemPermission',
+		ResultType: 2,
+		ToolTip: 'Set-AzDataLakeStoreItemPermission\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDataLakeStoreTrustedIdProvider',
+		ListItemText: 'Set-AzDataLakeStoreTrustedIdProvider',
+		ResultType: 2,
+		ToolTip: 'Set-AzDataLakeStoreTrustedIdProvider\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDataLakeStoreVirtualNetworkRule',
+		ListItemText: 'Set-AzDataLakeStoreVirtualNetworkRule',
+		ResultType: 2,
+		ToolTip: 'Set-AzDataLakeStoreVirtualNetworkRule\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDataProtectionMSIPermission',
+		ListItemText: 'Set-AzDataProtectionMSIPermission',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-AzDataProtectionMSIPermission \\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDataShare',
+		ListItemText: 'Set-AzDataShare',
+		ResultType: 2,
+		ToolTip: 'Set-AzDataShare\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDefault',
+		ListItemText: 'Set-AzDefault',
+		ResultType: 2,
+		ToolTip: 'Set-AzDefault\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDeploymentManagerArtifactSource',
+		ListItemText: 'Set-AzDeploymentManagerArtifactSource',
+		ResultType: 2,
+		ToolTip: 'Set-AzDeploymentManagerArtifactSource\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDeploymentManagerService',
+		ListItemText: 'Set-AzDeploymentManagerService',
+		ResultType: 2,
+		ToolTip: 'Set-AzDeploymentManagerService\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDeploymentManagerServiceTopology',
+		ListItemText: 'Set-AzDeploymentManagerServiceTopology',
+		ResultType: 2,
+		ToolTip: 'Set-AzDeploymentManagerServiceTopology\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDeploymentManagerServiceUnit',
+		ListItemText: 'Set-AzDeploymentManagerServiceUnit',
+		ResultType: 2,
+		ToolTip: 'Set-AzDeploymentManagerServiceUnit\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDeploymentManagerStep',
+		ListItemText: 'Set-AzDeploymentManagerStep',
+		ResultType: 2,
+		ToolTip: 'Set-AzDeploymentManagerStep\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDeviceSecurityGroup',
+		ListItemText: 'Set-AzDeviceSecurityGroup',
+		ResultType: 2,
+		ToolTip: 'Set-AzDeviceSecurityGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDiskDiskEncryptionKey',
+		ListItemText: 'Set-AzDiskDiskEncryptionKey',
+		ResultType: 2,
+		ToolTip: 'Set-AzDiskDiskEncryptionKey\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDiskImageReference',
+		ListItemText: 'Set-AzDiskImageReference',
+		ResultType: 2,
+		ToolTip: 'Set-AzDiskImageReference\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDiskKeyEncryptionKey',
+		ListItemText: 'Set-AzDiskKeyEncryptionKey',
+		ResultType: 2,
+		ToolTip: 'Set-AzDiskKeyEncryptionKey\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDiskSecurityProfile',
+		ListItemText: 'Set-AzDiskSecurityProfile',
+		ResultType: 2,
+		ToolTip: 'Set-AzDiskSecurityProfile\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDiskUpdateDiskEncryptionKey',
+		ListItemText: 'Set-AzDiskUpdateDiskEncryptionKey',
+		ResultType: 2,
+		ToolTip: 'Set-AzDiskUpdateDiskEncryptionKey\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDiskUpdateKeyEncryptionKey',
+		ListItemText: 'Set-AzDiskUpdateKeyEncryptionKey',
+		ResultType: 2,
+		ToolTip: 'Set-AzDiskUpdateKeyEncryptionKey\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDnsRecordSet',
+		ListItemText: 'Set-AzDnsRecordSet',
+		ResultType: 2,
+		ToolTip: 'Set-AzDnsRecordSet\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDnsZone',
+		ListItemText: 'Set-AzDnsZone',
+		ResultType: 2,
+		ToolTip: 'Set-AzDnsZone\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDtlAllowedVMSizesPolicy',
+		ListItemText: 'Set-AzDtlAllowedVMSizesPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AzDtlAllowedVMSizesPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDtlAutoShutdownPolicy',
+		ListItemText: 'Set-AzDtlAutoShutdownPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AzDtlAutoShutdownPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDtlAutoStartPolicy',
+		ListItemText: 'Set-AzDtlAutoStartPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AzDtlAutoStartPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDtlVMsPerLabPolicy',
+		ListItemText: 'Set-AzDtlVMsPerLabPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AzDtlVMsPerLabPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzDtlVMsPerUserPolicy',
+		ListItemText: 'Set-AzDtlVMsPerUserPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AzDtlVMsPerUserPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzEnvironment',
+		ListItemText: 'Set-AzEnvironment',
+		ResultType: 2,
+		ToolTip: 'Set-AzEnvironment\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzEventGridTopic',
+		ListItemText: 'Set-AzEventGridTopic',
+		ResultType: 2,
+		ToolTip: 'Set-AzEventGridTopic\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzEventHub',
+		ListItemText: 'Set-AzEventHub',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-AzEventHub \\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzEventHubApplicationGroup',
+		ListItemText: 'Set-AzEventHubApplicationGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-AzEventHubApplicationGroup \\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzEventHubAuthorizationRule',
+		ListItemText: 'Set-AzEventHubAuthorizationRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-AzEventHubAuthorizationRule \\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzEventHubCluster',
+		ListItemText: 'Set-AzEventHubCluster',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-AzEventHubCluster \\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzEventHubConsumerGroup',
+		ListItemText: 'Set-AzEventHubConsumerGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-AzEventHubConsumerGroup \\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzEventHubGeoDRConfigurationBreakPair',
+		ListItemText: 'Set-AzEventHubGeoDRConfigurationBreakPair',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-AzEventHubGeoDRConfigurationBreakPair \\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzEventHubGeoDRConfigurationFailOver',
+		ListItemText: 'Set-AzEventHubGeoDRConfigurationFailOver',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-AzEventHubGeoDRConfigurationFailOver \\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzEventHubNamespace',
+		ListItemText: 'Set-AzEventHubNamespace',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-AzEventHubNamespace \\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzEventHubNamespaceV2',
+		ListItemText: 'Set-AzEventHubNamespaceV2',
+		ResultType: 2,
+		ToolTip: 'Set-AzEventHubNamespaceV2'
+	},
+	{
+		CompletionText: 'Set-AzEventHubNetworkRuleSet',
+		ListItemText: 'Set-AzEventHubNetworkRuleSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-AzEventHubNetworkRuleSet \\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzExpressRouteCircuit',
+		ListItemText: 'Set-AzExpressRouteCircuit',
+		ResultType: 2,
+		ToolTip: 'Set-AzExpressRouteCircuit\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzExpressRouteCircuitConnectionConfig',
+		ListItemText: 'Set-AzExpressRouteCircuitConnectionConfig',
+		ResultType: 2,
+		ToolTip: 'Set-AzExpressRouteCircuitConnectionConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzExpressRouteCircuitPeeringConfig',
+		ListItemText: 'Set-AzExpressRouteCircuitPeeringConfig',
+		ResultType: 2,
+		ToolTip: 'Set-AzExpressRouteCircuitPeeringConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzExpressRouteConnection',
+		ListItemText: 'Set-AzExpressRouteConnection',
+		ResultType: 2,
+		ToolTip: 'Set-AzExpressRouteConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzExpressRouteCrossConnection',
+		ListItemText: 'Set-AzExpressRouteCrossConnection',
+		ResultType: 2,
+		ToolTip: 'Set-AzExpressRouteCrossConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzExpressRouteGateway',
+		ListItemText: 'Set-AzExpressRouteGateway',
+		ResultType: 2,
+		ToolTip: 'Set-AzExpressRouteGateway\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzExpressRoutePort',
+		ListItemText: 'Set-AzExpressRoutePort',
+		ResultType: 2,
+		ToolTip: 'Set-AzExpressRoutePort\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzExpressRoutePortIdentity',
+		ListItemText: 'Set-AzExpressRoutePortIdentity',
+		ResultType: 2,
+		ToolTip: 'Set-AzExpressRoutePortIdentity\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzFirewall',
+		ListItemText: 'Set-AzFirewall',
+		ResultType: 2,
+		ToolTip: 'Set-AzFirewall\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzFirewallPolicy',
+		ListItemText: 'Set-AzFirewallPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AzFirewallPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzFirewallPolicyRuleCollectionGroup',
+		ListItemText: 'Set-AzFirewallPolicyRuleCollectionGroup',
+		ResultType: 2,
+		ToolTip: 'Set-AzFirewallPolicyRuleCollectionGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzFrontDoor',
+		ListItemText: 'Set-AzFrontDoor',
+		ResultType: 2,
+		ToolTip: 'Set-AzFrontDoor\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzFrontDoorRulesEngine',
+		ListItemText: 'Set-AzFrontDoorRulesEngine',
+		ResultType: 2,
+		ToolTip: 'Set-AzFrontDoorRulesEngine\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzHDInsightClusterAutoscaleConfiguration',
+		ListItemText: 'Set-AzHDInsightClusterAutoscaleConfiguration',
+		ResultType: 2,
+		ToolTip: 'Set-AzHDInsightClusterAutoscaleConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzHDInsightClusterDiskEncryptionKey',
+		ListItemText: 'Set-AzHDInsightClusterDiskEncryptionKey',
+		ResultType: 2,
+		ToolTip: 'Set-AzHDInsightClusterDiskEncryptionKey\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzHDInsightClusterSize',
+		ListItemText: 'Set-AzHDInsightClusterSize',
+		ResultType: 2,
+		ToolTip: 'Set-AzHDInsightClusterSize\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzHDInsightDefaultStorage',
+		ListItemText: 'Set-AzHDInsightDefaultStorage',
+		ResultType: 2,
+		ToolTip: 'Set-AzHDInsightDefaultStorage\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzHDInsightGatewayCredential',
+		ListItemText: 'Set-AzHDInsightGatewayCredential',
+		ResultType: 2,
+		ToolTip: 'Set-AzHDInsightGatewayCredential\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzHDInsightPersistedScriptAction',
+		ListItemText: 'Set-AzHDInsightPersistedScriptAction',
+		ResultType: 2,
+		ToolTip: 'Set-AzHDInsightPersistedScriptAction\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzImageOsDisk',
+		ListItemText: 'Set-AzImageOsDisk',
+		ResultType: 2,
+		ToolTip: 'Set-AzImageOsDisk\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzIntegrationAccount',
+		ListItemText: 'Set-AzIntegrationAccount',
+		ResultType: 2,
+		ToolTip: 'Set-AzIntegrationAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzIntegrationAccountAgreement',
+		ListItemText: 'Set-AzIntegrationAccountAgreement',
+		ResultType: 2,
+		ToolTip: 'Set-AzIntegrationAccountAgreement\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzIntegrationAccountAssembly',
+		ListItemText: 'Set-AzIntegrationAccountAssembly',
+		ResultType: 2,
+		ToolTip: 'Set-AzIntegrationAccountAssembly\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzIntegrationAccountBatchConfiguration',
+		ListItemText: 'Set-AzIntegrationAccountBatchConfiguration',
+		ResultType: 2,
+		ToolTip: 'Set-AzIntegrationAccountBatchConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzIntegrationAccountCertificate',
+		ListItemText: 'Set-AzIntegrationAccountCertificate',
+		ResultType: 2,
+		ToolTip: 'Set-AzIntegrationAccountCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzIntegrationAccountGeneratedIcn',
+		ListItemText: 'Set-AzIntegrationAccountGeneratedIcn',
+		ResultType: 2,
+		ToolTip: 'Set-AzIntegrationAccountGeneratedIcn\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzIntegrationAccountMap',
+		ListItemText: 'Set-AzIntegrationAccountMap',
+		ResultType: 2,
+		ToolTip: 'Set-AzIntegrationAccountMap\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzIntegrationAccountPartner',
+		ListItemText: 'Set-AzIntegrationAccountPartner',
+		ResultType: 2,
+		ToolTip: 'Set-AzIntegrationAccountPartner\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzIntegrationAccountReceivedIcn',
+		ListItemText: 'Set-AzIntegrationAccountReceivedIcn',
+		ResultType: 2,
+		ToolTip: 'Set-AzIntegrationAccountReceivedIcn\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzIntegrationAccountSchema',
+		ListItemText: 'Set-AzIntegrationAccountSchema',
+		ResultType: 2,
+		ToolTip: 'Set-AzIntegrationAccountSchema\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzIotHub',
+		ListItemText: 'Set-AzIotHub',
+		ResultType: 2,
+		ToolTip: 'Set-AzIotHub\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzIotHubConfiguration',
+		ListItemText: 'Set-AzIotHubConfiguration',
+		ResultType: 2,
+		ToolTip: 'Set-AzIotHubConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzIotHubDeployment',
+		ListItemText: 'Set-AzIotHubDeployment',
+		ResultType: 2,
+		ToolTip: 'Set-AzIotHubDeployment\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzIotHubDevice',
+		ListItemText: 'Set-AzIotHubDevice',
+		ResultType: 2,
+		ToolTip: 'Set-AzIotHubDevice\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzIotHubDeviceParent',
+		ListItemText: 'Set-AzIotHubDeviceParent',
+		ResultType: 2,
+		ToolTip: 'Set-AzIotHubDeviceParent\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzIotHubDistributedTracing',
+		ListItemText: 'Set-AzIotHubDistributedTracing',
+		ResultType: 2,
+		ToolTip: 'Set-AzIotHubDistributedTracing\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzIotHubEdgeModule',
+		ListItemText: 'Set-AzIotHubEdgeModule',
+		ResultType: 2,
+		ToolTip: 'Set-AzIotHubEdgeModule\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzIotHubMessageEnrichment',
+		ListItemText: 'Set-AzIotHubMessageEnrichment',
+		ResultType: 2,
+		ToolTip: 'Set-AzIotHubMessageEnrichment\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzIotHubModule',
+		ListItemText: 'Set-AzIotHubModule',
+		ResultType: 2,
+		ToolTip: 'Set-AzIotHubModule\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzIotHubMsgEnrich',
+		ListItemText: 'Set-AzIotHubMsgEnrich',
+		ResultType: 2,
+		ToolTip: 'Set-AzIotHubMsgEnrich'
+	},
+	{
+		CompletionText: 'Set-AzIotHubRoute',
+		ListItemText: 'Set-AzIotHubRoute',
+		ResultType: 2,
+		ToolTip: 'Set-AzIotHubRoute\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzIotHubTracing',
+		ListItemText: 'Set-AzIotHubTracing',
+		ResultType: 2,
+		ToolTip: 'Set-AzIotHubTracing'
+	},
+	{
+		CompletionText: 'Set-AzIotHubVC',
+		ListItemText: 'Set-AzIotHubVC',
+		ResultType: 2,
+		ToolTip: 'Set-AzIotHubVC'
+	},
+	{
+		CompletionText: 'Set-AzIotHubVerifiedCertificate',
+		ListItemText: 'Set-AzIotHubVerifiedCertificate',
+		ResultType: 2,
+		ToolTip: 'Set-AzIotHubVerifiedCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzIotSecuritySolution',
+		ListItemText: 'Set-AzIotSecuritySolution',
+		ResultType: 2,
+		ToolTip: 'Set-AzIotSecuritySolution\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzIpAllocation',
+		ListItemText: 'Set-AzIpAllocation',
+		ResultType: 2,
+		ToolTip: 'Set-AzIpAllocation\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzIpGroup',
+		ListItemText: 'Set-AzIpGroup',
+		ResultType: 2,
+		ToolTip: 'Set-AzIpGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzJitNetworkAccessPolicy',
+		ListItemText: 'Set-AzJitNetworkAccessPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AzJitNetworkAccessPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzKeyVaultAccessPolicy',
+		ListItemText: 'Set-AzKeyVaultAccessPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AzKeyVaultAccessPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzKeyVaultCertificateAttribute',
+		ListItemText: 'Set-AzKeyVaultCertificateAttribute',
+		ResultType: 2,
+		ToolTip: 'Set-AzKeyVaultCertificateAttribute'
+	},
+	{
+		CompletionText: 'Set-AzKeyVaultCertificateIssuer',
+		ListItemText: 'Set-AzKeyVaultCertificateIssuer',
+		ResultType: 2,
+		ToolTip: 'Set-AzKeyVaultCertificateIssuer\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzKeyVaultCertificatePolicy',
+		ListItemText: 'Set-AzKeyVaultCertificatePolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AzKeyVaultCertificatePolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzKeyVaultKey',
+		ListItemText: 'Set-AzKeyVaultKey',
+		ResultType: 2,
+		ToolTip: 'Set-AzKeyVaultKey'
+	},
+	{
+		CompletionText: 'Set-AzKeyVaultKeyAttribute',
+		ListItemText: 'Set-AzKeyVaultKeyAttribute',
+		ResultType: 2,
+		ToolTip: 'Set-AzKeyVaultKeyAttribute'
+	},
+	{
+		CompletionText: 'Set-AzKeyVaultKeyRotationPolicy',
+		ListItemText: 'Set-AzKeyVaultKeyRotationPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AzKeyVaultKeyRotationPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzKeyVaultManagedStorageSasDefinition',
+		ListItemText: 'Set-AzKeyVaultManagedStorageSasDefinition',
+		ResultType: 2,
+		ToolTip: 'Set-AzKeyVaultManagedStorageSasDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzKeyVaultRoleDefinition',
+		ListItemText: 'Set-AzKeyVaultRoleDefinition',
+		ResultType: 2,
+		ToolTip: 'Set-AzKeyVaultRoleDefinition'
+	},
+	{
+		CompletionText: 'Set-AzKeyVaultSecret',
+		ListItemText: 'Set-AzKeyVaultSecret',
+		ResultType: 2,
+		ToolTip: 'Set-AzKeyVaultSecret\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzKeyVaultSecretAttribute',
+		ListItemText: 'Set-AzKeyVaultSecretAttribute',
+		ResultType: 2,
+		ToolTip: 'Set-AzKeyVaultSecretAttribute'
+	},
+	{
+		CompletionText: 'Set-AzLoadBalancer',
+		ListItemText: 'Set-AzLoadBalancer',
+		ResultType: 2,
+		ToolTip: 'Set-AzLoadBalancer\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzLoadBalancerBackendAddressPool',
+		ListItemText: 'Set-AzLoadBalancerBackendAddressPool',
+		ResultType: 2,
+		ToolTip: 'Set-AzLoadBalancerBackendAddressPool\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzLoadBalancerFrontendIpConfig',
+		ListItemText: 'Set-AzLoadBalancerFrontendIpConfig',
+		ResultType: 2,
+		ToolTip: 'Set-AzLoadBalancerFrontendIpConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzLoadBalancerInboundNatPoolConfig',
+		ListItemText: 'Set-AzLoadBalancerInboundNatPoolConfig',
+		ResultType: 2,
+		ToolTip: 'Set-AzLoadBalancerInboundNatPoolConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzLoadBalancerInboundNatRuleConfig',
+		ListItemText: 'Set-AzLoadBalancerInboundNatRuleConfig',
+		ResultType: 2,
+		ToolTip: 'Set-AzLoadBalancerInboundNatRuleConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzLoadBalancerOutboundRuleConfig',
+		ListItemText: 'Set-AzLoadBalancerOutboundRuleConfig',
+		ResultType: 2,
+		ToolTip: 'Set-AzLoadBalancerOutboundRuleConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzLoadBalancerProbeConfig',
+		ListItemText: 'Set-AzLoadBalancerProbeConfig',
+		ResultType: 2,
+		ToolTip: 'Set-AzLoadBalancerProbeConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzLoadBalancerRuleConfig',
+		ListItemText: 'Set-AzLoadBalancerRuleConfig',
+		ResultType: 2,
+		ToolTip: 'Set-AzLoadBalancerRuleConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzLocalNetworkGateway',
+		ListItemText: 'Set-AzLocalNetworkGateway',
+		ResultType: 2,
+		ToolTip: 'Set-AzLocalNetworkGateway\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzLogicApp',
+		ListItemText: 'Set-AzLogicApp',
+		ResultType: 2,
+		ToolTip: 'Set-AzLogicApp\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzManagedApplication',
+		ListItemText: 'Set-AzManagedApplication',
+		ResultType: 2,
+		ToolTip: 'Set-AzManagedApplication\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzManagedApplicationDefinition',
+		ListItemText: 'Set-AzManagedApplicationDefinition',
+		ResultType: 2,
+		ToolTip: 'Set-AzManagedApplicationDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzMarketplaceTerms',
+		ListItemText: 'Set-AzMarketplaceTerms',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-AzMarketplaceTerms \\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzMediaService',
+		ListItemText: 'Set-AzMediaService',
+		ResultType: 2,
+		ToolTip: 'Set-AzMediaService\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzMediaServiceKey',
+		ListItemText: 'Set-AzMediaServiceKey',
+		ResultType: 2,
+		ToolTip: 'Set-AzMediaServiceKey\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzMigrateDiskMapping',
+		ListItemText: 'Set-AzMigrateDiskMapping',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-AzMigrateDiskMapping \\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzMigrateServerReplication',
+		ListItemText: 'Set-AzMigrateServerReplication',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-AzMigrateServerReplication \\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzNatGateway',
+		ListItemText: 'Set-AzNatGateway',
+		ResultType: 2,
+		ToolTip: 'Set-AzNatGateway\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzNetworkInterface',
+		ListItemText: 'Set-AzNetworkInterface',
+		ResultType: 2,
+		ToolTip: 'Set-AzNetworkInterface\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzNetworkInterfaceIpConfig',
+		ListItemText: 'Set-AzNetworkInterfaceIpConfig',
+		ResultType: 2,
+		ToolTip: 'Set-AzNetworkInterfaceIpConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzNetworkInterfaceTapConfig',
+		ListItemText: 'Set-AzNetworkInterfaceTapConfig',
+		ResultType: 2,
+		ToolTip: 'Set-AzNetworkInterfaceTapConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzNetworkManager',
+		ListItemText: 'Set-AzNetworkManager',
+		ResultType: 2,
+		ToolTip: 'Set-AzNetworkManager\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzNetworkManagerConnectivityConfiguration',
+		ListItemText: 'Set-AzNetworkManagerConnectivityConfiguration',
+		ResultType: 2,
+		ToolTip: 'Set-AzNetworkManagerConnectivityConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzNetworkManagerGroup',
+		ListItemText: 'Set-AzNetworkManagerGroup',
+		ResultType: 2,
+		ToolTip: 'Set-AzNetworkManagerGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzNetworkManagerManagementGroupConnection',
+		ListItemText: 'Set-AzNetworkManagerManagementGroupConnection',
+		ResultType: 2,
+		ToolTip: 'Set-AzNetworkManagerManagementGroupConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzNetworkManagerScopeConnection',
+		ListItemText: 'Set-AzNetworkManagerScopeConnection',
+		ResultType: 2,
+		ToolTip: 'Set-AzNetworkManagerScopeConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzNetworkManagerSecurityAdminConfiguration',
+		ListItemText: 'Set-AzNetworkManagerSecurityAdminConfiguration',
+		ResultType: 2,
+		ToolTip: 'Set-AzNetworkManagerSecurityAdminConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzNetworkManagerSecurityAdminRule',
+		ListItemText: 'Set-AzNetworkManagerSecurityAdminRule',
+		ResultType: 2,
+		ToolTip: 'Set-AzNetworkManagerSecurityAdminRule\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzNetworkManagerSecurityAdminRuleCollection',
+		ListItemText: 'Set-AzNetworkManagerSecurityAdminRuleCollection',
+		ResultType: 2,
+		ToolTip: 'Set-AzNetworkManagerSecurityAdminRuleCollection\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzNetworkManagerSubscriptionConnection',
+		ListItemText: 'Set-AzNetworkManagerSubscriptionConnection',
+		ResultType: 2,
+		ToolTip: 'Set-AzNetworkManagerSubscriptionConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzNetworkProfile',
+		ListItemText: 'Set-AzNetworkProfile',
+		ResultType: 2,
+		ToolTip: 'Set-AzNetworkProfile\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzNetworkSecurityGroup',
+		ListItemText: 'Set-AzNetworkSecurityGroup',
+		ResultType: 2,
+		ToolTip: 'Set-AzNetworkSecurityGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzNetworkSecurityRuleConfig',
+		ListItemText: 'Set-AzNetworkSecurityRuleConfig',
+		ResultType: 2,
+		ToolTip: 'Set-AzNetworkSecurityRuleConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzNetworkWatcherConfigFlowLog',
+		ListItemText: 'Set-AzNetworkWatcherConfigFlowLog',
+		ResultType: 2,
+		ToolTip: 'Set-AzNetworkWatcherConfigFlowLog\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzNetworkWatcherConnectionMonitor',
+		ListItemText: 'Set-AzNetworkWatcherConnectionMonitor',
+		ResultType: 2,
+		ToolTip: 'Set-AzNetworkWatcherConnectionMonitor\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzNetworkWatcherFlowLog',
+		ListItemText: 'Set-AzNetworkWatcherFlowLog',
+		ResultType: 2,
+		ToolTip: 'Set-AzNetworkWatcherFlowLog\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzNotificationHub',
+		ListItemText: 'Set-AzNotificationHub',
+		ResultType: 2,
+		ToolTip: 'Set-AzNotificationHub\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzNotificationHubAuthorizationRule',
+		ListItemText: 'Set-AzNotificationHubAuthorizationRule',
+		ResultType: 2,
+		ToolTip: 'Set-AzNotificationHubAuthorizationRule\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzNotificationHubAuthorizationRules',
+		ListItemText: 'Set-AzNotificationHubAuthorizationRules',
+		ResultType: 2,
+		ToolTip: 'Set-AzNotificationHubAuthorizationRules'
+	},
+	{
+		CompletionText: 'Set-AzNotificationHubsNamespace',
+		ListItemText: 'Set-AzNotificationHubsNamespace',
+		ResultType: 2,
+		ToolTip: 'Set-AzNotificationHubsNamespace\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzNotificationHubsNamespaceAuthorizationRule',
+		ListItemText: 'Set-AzNotificationHubsNamespaceAuthorizationRule',
+		ResultType: 2,
+		ToolTip: 'Set-AzNotificationHubsNamespaceAuthorizationRule\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzNotificationHubsNamespaceAuthorizationRules',
+		ListItemText: 'Set-AzNotificationHubsNamespaceAuthorizationRules',
+		ResultType: 2,
+		ToolTip: 'Set-AzNotificationHubsNamespaceAuthorizationRules'
+	},
+	{
+		CompletionText: 'Set-AzOperationalInsightsDataSource',
+		ListItemText: 'Set-AzOperationalInsightsDataSource',
+		ResultType: 2,
+		ToolTip: 'Set-AzOperationalInsightsDataSource\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzOperationalInsightsIntelligencePack',
+		ListItemText: 'Set-AzOperationalInsightsIntelligencePack',
+		ResultType: 2,
+		ToolTip: 'Set-AzOperationalInsightsIntelligencePack\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzOperationalInsightsLinkedService',
+		ListItemText: 'Set-AzOperationalInsightsLinkedService',
+		ResultType: 2,
+		ToolTip: 'Set-AzOperationalInsightsLinkedService\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzOperationalInsightsLinkedStorageAccount',
+		ListItemText: 'Set-AzOperationalInsightsLinkedStorageAccount',
+		ResultType: 2,
+		ToolTip: 'Set-AzOperationalInsightsLinkedStorageAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzOperationalInsightsSavedSearch',
+		ListItemText: 'Set-AzOperationalInsightsSavedSearch',
+		ResultType: 2,
+		ToolTip: 'Set-AzOperationalInsightsSavedSearch\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzOperationalInsightsStorageInsight',
+		ListItemText: 'Set-AzOperationalInsightsStorageInsight',
+		ResultType: 2,
+		ToolTip: 'Set-AzOperationalInsightsStorageInsight\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzOperationalInsightsWorkspace',
+		ListItemText: 'Set-AzOperationalInsightsWorkspace',
+		ResultType: 2,
+		ToolTip: 'Set-AzOperationalInsightsWorkspace\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzPolicyAssignment',
+		ListItemText: 'Set-AzPolicyAssignment',
+		ResultType: 2,
+		ToolTip: 'Set-AzPolicyAssignment\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzPolicyAttestation',
+		ListItemText: 'Set-AzPolicyAttestation',
+		ResultType: 2,
+		ToolTip: 'Set-AzPolicyAttestation\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzPolicyDefinition',
+		ListItemText: 'Set-AzPolicyDefinition',
+		ResultType: 2,
+		ToolTip: 'Set-AzPolicyDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzPolicyExemption',
+		ListItemText: 'Set-AzPolicyExemption',
+		ResultType: 2,
+		ToolTip: 'Set-AzPolicyExemption\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzPolicySetDefinition',
+		ListItemText: 'Set-AzPolicySetDefinition',
+		ResultType: 2,
+		ToolTip: 'Set-AzPolicySetDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzPrivateDnsRecordSet',
+		ListItemText: 'Set-AzPrivateDnsRecordSet',
+		ResultType: 2,
+		ToolTip: 'Set-AzPrivateDnsRecordSet\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzPrivateDnsVirtualNetworkLink',
+		ListItemText: 'Set-AzPrivateDnsVirtualNetworkLink',
+		ResultType: 2,
+		ToolTip: 'Set-AzPrivateDnsVirtualNetworkLink\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzPrivateDnsZone',
+		ListItemText: 'Set-AzPrivateDnsZone',
+		ResultType: 2,
+		ToolTip: 'Set-AzPrivateDnsZone\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzPrivateDnsZoneGroup',
+		ListItemText: 'Set-AzPrivateDnsZoneGroup',
+		ResultType: 2,
+		ToolTip: 'Set-AzPrivateDnsZoneGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzPrivateEndpoint',
+		ListItemText: 'Set-AzPrivateEndpoint',
+		ResultType: 2,
+		ToolTip: 'Set-AzPrivateEndpoint\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzPrivateEndpointConnection',
+		ListItemText: 'Set-AzPrivateEndpointConnection',
+		ResultType: 2,
+		ToolTip: 'Set-AzPrivateEndpointConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzPrivateLinkService',
+		ListItemText: 'Set-AzPrivateLinkService',
+		ResultType: 2,
+		ToolTip: 'Set-AzPrivateLinkService\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzPublicIpAddress',
+		ListItemText: 'Set-AzPublicIpAddress',
+		ResultType: 2,
+		ToolTip: 'Set-AzPublicIpAddress\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzPublicIpPrefix',
+		ListItemText: 'Set-AzPublicIpPrefix',
+		ResultType: 2,
+		ToolTip: 'Set-AzPublicIpPrefix\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzRecoveryServicesAsrAlertSetting',
+		ListItemText: 'Set-AzRecoveryServicesAsrAlertSetting',
+		ResultType: 2,
+		ToolTip: 'Set-AzRecoveryServicesAsrAlertSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzRecoveryServicesAsrNotificationSetting',
+		ListItemText: 'Set-AzRecoveryServicesAsrNotificationSetting',
+		ResultType: 2,
+		ToolTip: 'Set-AzRecoveryServicesAsrNotificationSetting'
+	},
+	{
+		CompletionText: 'Set-AzRecoveryServicesAsrReplicationProtectedItem',
+		ListItemText: 'Set-AzRecoveryServicesAsrReplicationProtectedItem',
+		ResultType: 2,
+		ToolTip: 'Set-AzRecoveryServicesAsrReplicationProtectedItem\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzRecoveryServicesAsrVaultContext',
+		ListItemText: 'Set-AzRecoveryServicesAsrVaultContext',
+		ResultType: 2,
+		ToolTip: 'Set-AzRecoveryServicesAsrVaultContext\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzRecoveryServicesAsrVaultSettings',
+		ListItemText: 'Set-AzRecoveryServicesAsrVaultSettings',
+		ResultType: 2,
+		ToolTip: 'Set-AzRecoveryServicesAsrVaultSettings'
+	},
+	{
+		CompletionText: 'Set-AzRecoveryServicesBackupProperty',
+		ListItemText: 'Set-AzRecoveryServicesBackupProperty',
+		ResultType: 2,
+		ToolTip: 'Set-AzRecoveryServicesBackupProperty\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzRecoveryServicesBackupProtectionPolicy',
+		ListItemText: 'Set-AzRecoveryServicesBackupProtectionPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AzRecoveryServicesBackupProtectionPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzRecoveryServicesResourceGuardMapping',
+		ListItemText: 'Set-AzRecoveryServicesResourceGuardMapping',
+		ResultType: 2,
+		ToolTip: 'Set-AzRecoveryServicesResourceGuardMapping\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzRecoveryServicesVaultContext',
+		ListItemText: 'Set-AzRecoveryServicesVaultContext',
+		ResultType: 2,
+		ToolTip: 'Set-AzRecoveryServicesVaultContext\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzRecoveryServicesVaultProperty',
+		ListItemText: 'Set-AzRecoveryServicesVaultProperty',
+		ResultType: 2,
+		ToolTip: 'Set-AzRecoveryServicesVaultProperty\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzRedisCache',
+		ListItemText: 'Set-AzRedisCache',
+		ResultType: 2,
+		ToolTip: 'Set-AzRedisCache\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzRedisCacheDiagnostic',
+		ListItemText: 'Set-AzRedisCacheDiagnostic',
+		ResultType: 2,
+		ToolTip: 'Set-AzRedisCacheDiagnostic\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzRedisCacheDiagnostics',
+		ListItemText: 'Set-AzRedisCacheDiagnostics',
+		ResultType: 2,
+		ToolTip: 'Set-AzRedisCacheDiagnostics'
+	},
+	{
+		CompletionText: 'Set-AzRelayAuthorizationRule',
+		ListItemText: 'Set-AzRelayAuthorizationRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-AzRelayAuthorizationRule \\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzRelayHybridConnection',
+		ListItemText: 'Set-AzRelayHybridConnection',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-AzRelayHybridConnection \\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzRelayNamespaceNetworkRuleSet',
+		ListItemText: 'Set-AzRelayNamespaceNetworkRuleSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-AzRelayNamespaceNetworkRuleSet \\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzResource',
+		ListItemText: 'Set-AzResource',
+		ResultType: 2,
+		ToolTip: 'Set-AzResource\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzResourceGroup',
+		ListItemText: 'Set-AzResourceGroup',
+		ResultType: 2,
+		ToolTip: 'Set-AzResourceGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzResourceLock',
+		ListItemText: 'Set-AzResourceLock',
+		ResultType: 2,
+		ToolTip: 'Set-AzResourceLock\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzRmStorageContainerImmutabilityPolicy',
+		ListItemText: 'Set-AzRmStorageContainerImmutabilityPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AzRmStorageContainerImmutabilityPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzRoleAssignment',
+		ListItemText: 'Set-AzRoleAssignment',
+		ResultType: 2,
+		ToolTip: 'Set-AzRoleAssignment\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzRoleDefinition',
+		ListItemText: 'Set-AzRoleDefinition',
+		ResultType: 2,
+		ToolTip: 'Set-AzRoleDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzRouteConfig',
+		ListItemText: 'Set-AzRouteConfig',
+		ResultType: 2,
+		ToolTip: 'Set-AzRouteConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzRouteFilter',
+		ListItemText: 'Set-AzRouteFilter',
+		ResultType: 2,
+		ToolTip: 'Set-AzRouteFilter\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzRouteFilterRuleConfig',
+		ListItemText: 'Set-AzRouteFilterRuleConfig',
+		ResultType: 2,
+		ToolTip: 'Set-AzRouteFilterRuleConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzRouteTable',
+		ListItemText: 'Set-AzRouteTable',
+		ResultType: 2,
+		ToolTip: 'Set-AzRouteTable\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzRoutingIntent',
+		ListItemText: 'Set-AzRoutingIntent',
+		ResultType: 2,
+		ToolTip: 'Set-AzRoutingIntent\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzRoutingPolicy',
+		ListItemText: 'Set-AzRoutingPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AzRoutingPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSecurityAlert',
+		ListItemText: 'Set-AzSecurityAlert',
+		ResultType: 2,
+		ToolTip: 'Set-AzSecurityAlert\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSecurityAssessment',
+		ListItemText: 'Set-AzSecurityAssessment',
+		ResultType: 2,
+		ToolTip: 'Set-AzSecurityAssessment\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSecurityAssessmentMetadata',
+		ListItemText: 'Set-AzSecurityAssessmentMetadata',
+		ResultType: 2,
+		ToolTip: 'Set-AzSecurityAssessmentMetadata\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSecurityAutomation',
+		ListItemText: 'Set-AzSecurityAutomation',
+		ResultType: 2,
+		ToolTip: 'Set-AzSecurityAutomation'
+	},
+	{
+		CompletionText: 'Set-AzSecurityAutoProvisioningSetting',
+		ListItemText: 'Set-AzSecurityAutoProvisioningSetting',
+		ResultType: 2,
+		ToolTip: 'Set-AzSecurityAutoProvisioningSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSecurityContact',
+		ListItemText: 'Set-AzSecurityContact',
+		ResultType: 2,
+		ToolTip: 'Set-AzSecurityContact\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSecurityPartnerProvider',
+		ListItemText: 'Set-AzSecurityPartnerProvider',
+		ResultType: 2,
+		ToolTip: 'Set-AzSecurityPartnerProvider\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSecurityPricing',
+		ListItemText: 'Set-AzSecurityPricing',
+		ResultType: 2,
+		ToolTip: 'Set-AzSecurityPricing\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSecuritySetting',
+		ListItemText: 'Set-AzSecuritySetting',
+		ResultType: 2,
+		ToolTip: 'Set-AzSecuritySetting\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSecuritySqlVulnerabilityAssessmentBaseline',
+		ListItemText: 'Set-AzSecuritySqlVulnerabilityAssessmentBaseline',
+		ResultType: 2,
+		ToolTip: 'Set-AzSecuritySqlVulnerabilityAssessmentBaseline\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSecurityWorkspaceSetting',
+		ListItemText: 'Set-AzSecurityWorkspaceSetting',
+		ResultType: 2,
+		ToolTip: 'Set-AzSecurityWorkspaceSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzServiceBusAuthorizationRule',
+		ListItemText: 'Set-AzServiceBusAuthorizationRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-AzServiceBusAuthorizationRule \\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzServiceBusGeoDRConfigurationBreakPair',
+		ListItemText: 'Set-AzServiceBusGeoDRConfigurationBreakPair',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-AzServiceBusGeoDRConfigurationBreakPair \\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzServiceBusGeoDRConfigurationFailOver',
+		ListItemText: 'Set-AzServiceBusGeoDRConfigurationFailOver',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-AzServiceBusGeoDRConfigurationFailOver \\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzServiceBusNamespace',
+		ListItemText: 'Set-AzServiceBusNamespace',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-AzServiceBusNamespace \\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzServiceBusNamespaceV2',
+		ListItemText: 'Set-AzServiceBusNamespaceV2',
+		ResultType: 2,
+		ToolTip: 'Set-AzServiceBusNamespaceV2'
+	},
+	{
+		CompletionText: 'Set-AzServiceBusNetworkRuleSet',
+		ListItemText: 'Set-AzServiceBusNetworkRuleSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-AzServiceBusNetworkRuleSet \\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzServiceBusQueue',
+		ListItemText: 'Set-AzServiceBusQueue',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-AzServiceBusQueue \\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzServiceBusRule',
+		ListItemText: 'Set-AzServiceBusRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-AzServiceBusRule \\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzServiceBusSubscription',
+		ListItemText: 'Set-AzServiceBusSubscription',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-AzServiceBusSubscription \\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzServiceBusTopic',
+		ListItemText: 'Set-AzServiceBusTopic',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-AzServiceBusTopic \\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzServiceEndpointPolicy',
+		ListItemText: 'Set-AzServiceEndpointPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AzServiceEndpointPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzServiceEndpointPolicyDefinition',
+		ListItemText: 'Set-AzServiceEndpointPolicyDefinition',
+		ResultType: 2,
+		ToolTip: 'Set-AzServiceEndpointPolicyDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzServiceFabricManagedCluster',
+		ListItemText: 'Set-AzServiceFabricManagedCluster',
+		ResultType: 2,
+		ToolTip: 'Set-AzServiceFabricManagedCluster\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzServiceFabricManagedClusterApplication',
+		ListItemText: 'Set-AzServiceFabricManagedClusterApplication',
+		ResultType: 2,
+		ToolTip: 'Set-AzServiceFabricManagedClusterApplication\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzServiceFabricManagedClusterApplicationType',
+		ListItemText: 'Set-AzServiceFabricManagedClusterApplicationType',
+		ResultType: 2,
+		ToolTip: 'Set-AzServiceFabricManagedClusterApplicationType\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzServiceFabricManagedClusterApplicationTypeVersion',
+		ListItemText: 'Set-AzServiceFabricManagedClusterApplicationTypeVersion',
+		ResultType: 2,
+		ToolTip: 'Set-AzServiceFabricManagedClusterApplicationTypeVersion\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzServiceFabricManagedClusterService',
+		ListItemText: 'Set-AzServiceFabricManagedClusterService',
+		ResultType: 2,
+		ToolTip: 'Set-AzServiceFabricManagedClusterService\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzServiceFabricManagedNodeType',
+		ListItemText: 'Set-AzServiceFabricManagedNodeType',
+		ResultType: 2,
+		ToolTip: 'Set-AzServiceFabricManagedNodeType\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzServiceFabricSetting',
+		ListItemText: 'Set-AzServiceFabricSetting',
+		ResultType: 2,
+		ToolTip: 'Set-AzServiceFabricSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzServiceFabricUpgradeType',
+		ListItemText: 'Set-AzServiceFabricUpgradeType',
+		ResultType: 2,
+		ToolTip: 'Set-AzServiceFabricUpgradeType\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSignalRUpstream',
+		ListItemText: 'Set-AzSignalRUpstream',
+		ResultType: 2,
+		ToolTip: 'Set-AzSignalRUpstream\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSnapshotDiskEncryptionKey',
+		ListItemText: 'Set-AzSnapshotDiskEncryptionKey',
+		ResultType: 2,
+		ToolTip: 'Set-AzSnapshotDiskEncryptionKey\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSnapshotImageReference',
+		ListItemText: 'Set-AzSnapshotImageReference',
+		ResultType: 2,
+		ToolTip: 'Set-AzSnapshotImageReference\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSnapshotKeyEncryptionKey',
+		ListItemText: 'Set-AzSnapshotKeyEncryptionKey',
+		ResultType: 2,
+		ToolTip: 'Set-AzSnapshotKeyEncryptionKey\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSnapshotUpdateDiskEncryptionKey',
+		ListItemText: 'Set-AzSnapshotUpdateDiskEncryptionKey',
+		ResultType: 2,
+		ToolTip: 'Set-AzSnapshotUpdateDiskEncryptionKey\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSnapshotUpdateKeyEncryptionKey',
+		ListItemText: 'Set-AzSnapshotUpdateKeyEncryptionKey',
+		ResultType: 2,
+		ToolTip: 'Set-AzSnapshotUpdateKeyEncryptionKey\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlDatabase',
+		ListItemText: 'Set-AzSqlDatabase',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlDatabase\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlDatabaseAdvisorAutoExecuteStatus',
+		ListItemText: 'Set-AzSqlDatabaseAdvisorAutoExecuteStatus',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlDatabaseAdvisorAutoExecuteStatus\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlDatabaseAudit',
+		ListItemText: 'Set-AzSqlDatabaseAudit',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlDatabaseAudit\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlDatabaseBackupLongTermRetentionPolicy',
+		ListItemText: 'Set-AzSqlDatabaseBackupLongTermRetentionPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlDatabaseBackupLongTermRetentionPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlDatabaseBackupShortTermRetentionPolicy',
+		ListItemText: 'Set-AzSqlDatabaseBackupShortTermRetentionPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlDatabaseBackupShortTermRetentionPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlDatabaseDataMaskingPolicy',
+		ListItemText: 'Set-AzSqlDatabaseDataMaskingPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlDatabaseDataMaskingPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlDatabaseDataMaskingRule',
+		ListItemText: 'Set-AzSqlDatabaseDataMaskingRule',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlDatabaseDataMaskingRule\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlDatabaseFailoverGroup',
+		ListItemText: 'Set-AzSqlDatabaseFailoverGroup',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlDatabaseFailoverGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlDatabaseGeoBackupPolicy',
+		ListItemText: 'Set-AzSqlDatabaseGeoBackupPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlDatabaseGeoBackupPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlDatabaseInstanceFailoverGroup',
+		ListItemText: 'Set-AzSqlDatabaseInstanceFailoverGroup',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlDatabaseInstanceFailoverGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlDatabaseLongTermRetentionPolicy',
+		ListItemText: 'Set-AzSqlDatabaseLongTermRetentionPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlDatabaseLongTermRetentionPolicy'
+	},
+	{
+		CompletionText: 'Set-AzSqlDatabaseRecommendedActionState',
+		ListItemText: 'Set-AzSqlDatabaseRecommendedActionState',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlDatabaseRecommendedActionState\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlDatabaseSecondary',
+		ListItemText: 'Set-AzSqlDatabaseSecondary',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlDatabaseSecondary\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlDatabaseSensitivityClassification',
+		ListItemText: 'Set-AzSqlDatabaseSensitivityClassification',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlDatabaseSensitivityClassification\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlDatabaseServerAuditingPolicy',
+		ListItemText: 'Set-AzSqlDatabaseServerAuditingPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlDatabaseServerAuditingPolicy'
+	},
+	{
+		CompletionText: 'Set-AzSqlDatabaseTransparentDataEncryption',
+		ListItemText: 'Set-AzSqlDatabaseTransparentDataEncryption',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlDatabaseTransparentDataEncryption\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlDatabaseVulnerabilityAssessmentRuleBaseline',
+		ListItemText: 'Set-AzSqlDatabaseVulnerabilityAssessmentRuleBaseline',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlDatabaseVulnerabilityAssessmentRuleBaseline\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlElasticJob',
+		ListItemText: 'Set-AzSqlElasticJob',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlElasticJob\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlElasticJobAgent',
+		ListItemText: 'Set-AzSqlElasticJobAgent',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlElasticJobAgent\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlElasticJobCredential',
+		ListItemText: 'Set-AzSqlElasticJobCredential',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlElasticJobCredential\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlElasticJobStep',
+		ListItemText: 'Set-AzSqlElasticJobStep',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlElasticJobStep\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlElasticPool',
+		ListItemText: 'Set-AzSqlElasticPool',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlElasticPool\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlElasticPoolAdvisorAutoExecuteStatus',
+		ListItemText: 'Set-AzSqlElasticPoolAdvisorAutoExecuteStatus',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlElasticPoolAdvisorAutoExecuteStatus\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlElasticPoolRecommendedActionState',
+		ListItemText: 'Set-AzSqlElasticPoolRecommendedActionState',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlElasticPoolRecommendedActionState\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlInformationProtectionPolicy',
+		ListItemText: 'Set-AzSqlInformationProtectionPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlInformationProtectionPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlInstance',
+		ListItemText: 'Set-AzSqlInstance',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlInstance\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlInstanceActiveDirectoryAdministrator',
+		ListItemText: 'Set-AzSqlInstanceActiveDirectoryAdministrator',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlInstanceActiveDirectoryAdministrator\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlInstanceDatabase',
+		ListItemText: 'Set-AzSqlInstanceDatabase',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlInstanceDatabase\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlInstanceDatabaseBackupLongTermRetentionPolicy',
+		ListItemText: 'Set-AzSqlInstanceDatabaseBackupLongTermRetentionPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlInstanceDatabaseBackupLongTermRetentionPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlInstanceDatabaseBackupShortTermRetentionPolicy',
+		ListItemText: 'Set-AzSqlInstanceDatabaseBackupShortTermRetentionPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlInstanceDatabaseBackupShortTermRetentionPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlInstanceDatabaseSensitivityClassification',
+		ListItemText: 'Set-AzSqlInstanceDatabaseSensitivityClassification',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlInstanceDatabaseSensitivityClassification\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlInstanceDatabaseVulnerabilityAssessmentRuleBaseline',
+		ListItemText: 'Set-AzSqlInstanceDatabaseVulnerabilityAssessmentRuleBaseline',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlInstanceDatabaseVulnerabilityAssessmentRuleBaseline\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlInstanceDtc',
+		ListItemText: 'Set-AzSqlInstanceDtc',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlInstanceDtc\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlInstanceLink',
+		ListItemText: 'Set-AzSqlInstanceLink',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlInstanceLink'
+	},
+	{
+		CompletionText: 'Set-AzSqlInstancePool',
+		ListItemText: 'Set-AzSqlInstancePool',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlInstancePool\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlInstanceTDEProtector',
+		ListItemText: 'Set-AzSqlInstanceTDEProtector',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlInstanceTDEProtector'
+	},
+	{
+		CompletionText: 'Set-AzSqlInstanceTransparentDataEncryptionProtector',
+		ListItemText: 'Set-AzSqlInstanceTransparentDataEncryptionProtector',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlInstanceTransparentDataEncryptionProtector\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlServer',
+		ListItemText: 'Set-AzSqlServer',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlServer\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlServerActiveDirectoryAdministrator',
+		ListItemText: 'Set-AzSqlServerActiveDirectoryAdministrator',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlServerActiveDirectoryAdministrator\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlServerAdvisorAutoExecuteStatus',
+		ListItemText: 'Set-AzSqlServerAdvisorAutoExecuteStatus',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlServerAdvisorAutoExecuteStatus\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlServerAudit',
+		ListItemText: 'Set-AzSqlServerAudit',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlServerAudit\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlServerConfigurationOption',
+		ListItemText: 'Set-AzSqlServerConfigurationOption',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlServerConfigurationOption\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlServerDisasterRecoveryConfiguration',
+		ListItemText: 'Set-AzSqlServerDisasterRecoveryConfiguration',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlServerDisasterRecoveryConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlServerDnsAlias',
+		ListItemText: 'Set-AzSqlServerDnsAlias',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlServerDnsAlias\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlServerFirewallRule',
+		ListItemText: 'Set-AzSqlServerFirewallRule',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlServerFirewallRule\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlServerIpv6FirewallRule',
+		ListItemText: 'Set-AzSqlServerIpv6FirewallRule',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlServerIpv6FirewallRule\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlServerMSSupportAudit',
+		ListItemText: 'Set-AzSqlServerMSSupportAudit',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlServerMSSupportAudit\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlServerRecommendedActionState',
+		ListItemText: 'Set-AzSqlServerRecommendedActionState',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlServerRecommendedActionState\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlServerTransparentDataEncryptionProtector',
+		ListItemText: 'Set-AzSqlServerTransparentDataEncryptionProtector',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlServerTransparentDataEncryptionProtector\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSqlServerTrustGroup',
+		ListItemText: 'Set-AzSqlServerTrustGroup',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlServerTrustGroup'
+	},
+	{
+		CompletionText: 'Set-AzSqlServerVirtualNetworkRule',
+		ListItemText: 'Set-AzSqlServerVirtualNetworkRule',
+		ResultType: 2,
+		ToolTip: 'Set-AzSqlServerVirtualNetworkRule\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzStackHCI',
+		ListItemText: 'Set-AzStackHCI',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-AzStackHCI \\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzStorageAccount',
+		ListItemText: 'Set-AzStorageAccount',
+		ResultType: 2,
+		ToolTip: 'Set-AzStorageAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzStorageAccountManagementPolicy',
+		ListItemText: 'Set-AzStorageAccountManagementPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AzStorageAccountManagementPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzStorageBlobContent',
+		ListItemText: 'Set-AzStorageBlobContent',
+		ResultType: 2,
+		ToolTip: 'Set-AzStorageBlobContent\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzStorageBlobImmutabilityPolicy',
+		ListItemText: 'Set-AzStorageBlobImmutabilityPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AzStorageBlobImmutabilityPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzStorageBlobInventoryPolicy',
+		ListItemText: 'Set-AzStorageBlobInventoryPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AzStorageBlobInventoryPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzStorageBlobLegalHold',
+		ListItemText: 'Set-AzStorageBlobLegalHold',
+		ResultType: 2,
+		ToolTip: 'Set-AzStorageBlobLegalHold\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzStorageBlobTag',
+		ListItemText: 'Set-AzStorageBlobTag',
+		ResultType: 2,
+		ToolTip: 'Set-AzStorageBlobTag\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzStorageContainerAcl',
+		ListItemText: 'Set-AzStorageContainerAcl',
+		ResultType: 2,
+		ToolTip: 'Set-AzStorageContainerAcl\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzStorageContainerStoredAccessPolicy',
+		ListItemText: 'Set-AzStorageContainerStoredAccessPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AzStorageContainerStoredAccessPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzStorageCORSRule',
+		ListItemText: 'Set-AzStorageCORSRule',
+		ResultType: 2,
+		ToolTip: 'Set-AzStorageCORSRule\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzStorageFileContent',
+		ListItemText: 'Set-AzStorageFileContent',
+		ResultType: 2,
+		ToolTip: 'Set-AzStorageFileContent\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzStorageLocalUser',
+		ListItemText: 'Set-AzStorageLocalUser',
+		ResultType: 2,
+		ToolTip: 'Set-AzStorageLocalUser\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzStorageObjectReplicationPolicy',
+		ListItemText: 'Set-AzStorageObjectReplicationPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AzStorageObjectReplicationPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzStorageQueueStoredAccessPolicy',
+		ListItemText: 'Set-AzStorageQueueStoredAccessPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AzStorageQueueStoredAccessPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzStorageServiceLoggingProperty',
+		ListItemText: 'Set-AzStorageServiceLoggingProperty',
+		ResultType: 2,
+		ToolTip: 'Set-AzStorageServiceLoggingProperty\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzStorageServiceMetricsProperty',
+		ListItemText: 'Set-AzStorageServiceMetricsProperty',
+		ResultType: 2,
+		ToolTip: 'Set-AzStorageServiceMetricsProperty\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzStorageShareQuota',
+		ListItemText: 'Set-AzStorageShareQuota',
+		ResultType: 2,
+		ToolTip: 'Set-AzStorageShareQuota\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzStorageShareStoredAccessPolicy',
+		ListItemText: 'Set-AzStorageShareStoredAccessPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AzStorageShareStoredAccessPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzStorageSyncServerEndpoint',
+		ListItemText: 'Set-AzStorageSyncServerEndpoint',
+		ResultType: 2,
+		ToolTip: 'Set-AzStorageSyncServerEndpoint\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzStorageSyncService',
+		ListItemText: 'Set-AzStorageSyncService',
+		ResultType: 2,
+		ToolTip: 'Set-AzStorageSyncService\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzStorageTableStoredAccessPolicy',
+		ListItemText: 'Set-AzStorageTableStoredAccessPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AzStorageTableStoredAccessPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSynapseDataFlow',
+		ListItemText: 'Set-AzSynapseDataFlow',
+		ResultType: 2,
+		ToolTip: 'Set-AzSynapseDataFlow\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSynapseDataset',
+		ListItemText: 'Set-AzSynapseDataset',
+		ResultType: 2,
+		ToolTip: 'Set-AzSynapseDataset\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSynapseIntegrationRuntime',
+		ListItemText: 'Set-AzSynapseIntegrationRuntime',
+		ResultType: 2,
+		ToolTip: 'Set-AzSynapseIntegrationRuntime\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSynapseKqlScript',
+		ListItemText: 'Set-AzSynapseKqlScript',
+		ResultType: 2,
+		ToolTip: 'Set-AzSynapseKqlScript'
+	},
+	{
+		CompletionText: 'Set-AzSynapseLinkConnection',
+		ListItemText: 'Set-AzSynapseLinkConnection',
+		ResultType: 2,
+		ToolTip: 'Set-AzSynapseLinkConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSynapseLinkConnectionLinkTable',
+		ListItemText: 'Set-AzSynapseLinkConnectionLinkTable',
+		ResultType: 2,
+		ToolTip: 'Set-AzSynapseLinkConnectionLinkTable\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSynapseLinkedService',
+		ListItemText: 'Set-AzSynapseLinkedService',
+		ResultType: 2,
+		ToolTip: 'Set-AzSynapseLinkedService\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSynapseManagedIdentitySqlControlSetting',
+		ListItemText: 'Set-AzSynapseManagedIdentitySqlControlSetting',
+		ResultType: 2,
+		ToolTip: 'Set-AzSynapseManagedIdentitySqlControlSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSynapseManagedPrivateEndpoint',
+		ListItemText: 'Set-AzSynapseManagedPrivateEndpoint',
+		ResultType: 2,
+		ToolTip: 'Set-AzSynapseManagedPrivateEndpoint'
+	},
+	{
+		CompletionText: 'Set-AzSynapseNotebook',
+		ListItemText: 'Set-AzSynapseNotebook',
+		ResultType: 2,
+		ToolTip: 'Set-AzSynapseNotebook\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSynapsePipeline',
+		ListItemText: 'Set-AzSynapsePipeline',
+		ResultType: 2,
+		ToolTip: 'Set-AzSynapsePipeline\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSynapseSparkConfiguration',
+		ListItemText: 'Set-AzSynapseSparkConfiguration',
+		ResultType: 2,
+		ToolTip: 'Set-AzSynapseSparkConfiguration'
+	},
+	{
+		CompletionText: 'Set-AzSynapseSparkJobDefinition',
+		ListItemText: 'Set-AzSynapseSparkJobDefinition',
+		ResultType: 2,
+		ToolTip: 'Set-AzSynapseSparkJobDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSynapseSqlActiveDirectoryAdministrator',
+		ListItemText: 'Set-AzSynapseSqlActiveDirectoryAdministrator',
+		ResultType: 2,
+		ToolTip: 'Set-AzSynapseSqlActiveDirectoryAdministrator\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSynapseSqlAudit',
+		ListItemText: 'Set-AzSynapseSqlAudit',
+		ResultType: 2,
+		ToolTip: 'Set-AzSynapseSqlAudit'
+	},
+	{
+		CompletionText: 'Set-AzSynapseSqlAuditSetting',
+		ListItemText: 'Set-AzSynapseSqlAuditSetting',
+		ResultType: 2,
+		ToolTip: 'Set-AzSynapseSqlAuditSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSynapseSqlPoolAudit',
+		ListItemText: 'Set-AzSynapseSqlPoolAudit',
+		ResultType: 2,
+		ToolTip: 'Set-AzSynapseSqlPoolAudit'
+	},
+	{
+		CompletionText: 'Set-AzSynapseSqlPoolAuditSetting',
+		ListItemText: 'Set-AzSynapseSqlPoolAuditSetting',
+		ResultType: 2,
+		ToolTip: 'Set-AzSynapseSqlPoolAuditSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSynapseSqlPoolSensitivityClassification',
+		ListItemText: 'Set-AzSynapseSqlPoolSensitivityClassification',
+		ResultType: 2,
+		ToolTip: 'Set-AzSynapseSqlPoolSensitivityClassification\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSynapseSqlPoolTransparentDataEncryption',
+		ListItemText: 'Set-AzSynapseSqlPoolTransparentDataEncryption',
+		ResultType: 2,
+		ToolTip: 'Set-AzSynapseSqlPoolTransparentDataEncryption\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSynapseSqlPoolVulnerabilityAssessmentRuleBaseline',
+		ListItemText: 'Set-AzSynapseSqlPoolVulnerabilityAssessmentRuleBaseline',
+		ResultType: 2,
+		ToolTip: 'Set-AzSynapseSqlPoolVulnerabilityAssessmentRuleBaseline\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSynapseSqlScript',
+		ListItemText: 'Set-AzSynapseSqlScript',
+		ResultType: 2,
+		ToolTip: 'Set-AzSynapseSqlScript\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzSynapseTrigger',
+		ListItemText: 'Set-AzSynapseTrigger',
+		ResultType: 2,
+		ToolTip: 'Set-AzSynapseTrigger\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzTemplateSpec',
+		ListItemText: 'Set-AzTemplateSpec',
+		ResultType: 2,
+		ToolTip: 'Set-AzTemplateSpec\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzTrafficManagerEndpoint',
+		ListItemText: 'Set-AzTrafficManagerEndpoint',
+		ResultType: 2,
+		ToolTip: 'Set-AzTrafficManagerEndpoint\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzTrafficManagerProfile',
+		ListItemText: 'Set-AzTrafficManagerProfile',
+		ResultType: 2,
+		ToolTip: 'Set-AzTrafficManagerProfile\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVirtualHub',
+		ListItemText: 'Set-AzVirtualHub',
+		ResultType: 2,
+		ToolTip: 'Set-AzVirtualHub\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVirtualNetwork',
+		ListItemText: 'Set-AzVirtualNetwork',
+		ResultType: 2,
+		ToolTip: 'Set-AzVirtualNetwork\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVirtualNetworkGateway',
+		ListItemText: 'Set-AzVirtualNetworkGateway',
+		ResultType: 2,
+		ToolTip: 'Set-AzVirtualNetworkGateway\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVirtualNetworkGatewayConnection',
+		ListItemText: 'Set-AzVirtualNetworkGatewayConnection',
+		ResultType: 2,
+		ToolTip: 'Set-AzVirtualNetworkGatewayConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVirtualNetworkGatewayConnectionSharedKey',
+		ListItemText: 'Set-AzVirtualNetworkGatewayConnectionSharedKey',
+		ResultType: 2,
+		ToolTip: 'Set-AzVirtualNetworkGatewayConnectionSharedKey\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVirtualNetworkGatewayDefaultSite',
+		ListItemText: 'Set-AzVirtualNetworkGatewayDefaultSite',
+		ResultType: 2,
+		ToolTip: 'Set-AzVirtualNetworkGatewayDefaultSite\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVirtualNetworkPeering',
+		ListItemText: 'Set-AzVirtualNetworkPeering',
+		ResultType: 2,
+		ToolTip: 'Set-AzVirtualNetworkPeering\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVirtualNetworkSubnetConfig',
+		ListItemText: 'Set-AzVirtualNetworkSubnetConfig',
+		ResultType: 2,
+		ToolTip: 'Set-AzVirtualNetworkSubnetConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVirtualNetworkTap',
+		ListItemText: 'Set-AzVirtualNetworkTap',
+		ResultType: 2,
+		ToolTip: 'Set-AzVirtualNetworkTap\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVM',
+		ListItemText: 'Set-AzVM',
+		ResultType: 2,
+		ToolTip: 'Set-AzVM\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVMAccessExtension',
+		ListItemText: 'Set-AzVMAccessExtension',
+		ResultType: 2,
+		ToolTip: 'Set-AzVMAccessExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVMADDomainExtension',
+		ListItemText: 'Set-AzVMADDomainExtension',
+		ResultType: 2,
+		ToolTip: 'Set-AzVMADDomainExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVMAEMExtension',
+		ListItemText: 'Set-AzVMAEMExtension',
+		ResultType: 2,
+		ToolTip: 'Set-AzVMAEMExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVMBackupExtension',
+		ListItemText: 'Set-AzVMBackupExtension',
+		ResultType: 2,
+		ToolTip: 'Set-AzVMBackupExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVMBginfoExtension',
+		ListItemText: 'Set-AzVMBginfoExtension',
+		ResultType: 2,
+		ToolTip: 'Set-AzVMBginfoExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVMBootDiagnostic',
+		ListItemText: 'Set-AzVMBootDiagnostic',
+		ResultType: 2,
+		ToolTip: 'Set-AzVMBootDiagnostic\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVMChefExtension',
+		ListItemText: 'Set-AzVMChefExtension',
+		ResultType: 2,
+		ToolTip: 'Set-AzVMChefExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVMCustomScriptExtension',
+		ListItemText: 'Set-AzVMCustomScriptExtension',
+		ResultType: 2,
+		ToolTip: 'Set-AzVMCustomScriptExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVMDataDisk',
+		ListItemText: 'Set-AzVMDataDisk',
+		ResultType: 2,
+		ToolTip: 'Set-AzVMDataDisk\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVMDiagnosticsExtension',
+		ListItemText: 'Set-AzVMDiagnosticsExtension',
+		ResultType: 2,
+		ToolTip: 'Set-AzVMDiagnosticsExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVMDiskEncryptionExtension',
+		ListItemText: 'Set-AzVMDiskEncryptionExtension',
+		ResultType: 2,
+		ToolTip: 'Set-AzVMDiskEncryptionExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVMDscExtension',
+		ListItemText: 'Set-AzVMDscExtension',
+		ResultType: 2,
+		ToolTip: 'Set-AzVMDscExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVMExtension',
+		ListItemText: 'Set-AzVMExtension',
+		ResultType: 2,
+		ToolTip: 'Set-AzVMExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVMOperatingSystem',
+		ListItemText: 'Set-AzVMOperatingSystem',
+		ResultType: 2,
+		ToolTip: 'Set-AzVMOperatingSystem\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVMOSDisk',
+		ListItemText: 'Set-AzVMOSDisk',
+		ResultType: 2,
+		ToolTip: 'Set-AzVMOSDisk\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVMPlan',
+		ListItemText: 'Set-AzVMPlan',
+		ResultType: 2,
+		ToolTip: 'Set-AzVMPlan\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVMRunCommand',
+		ListItemText: 'Set-AzVMRunCommand',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-AzVMRunCommand \\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVmSecurityProfile',
+		ListItemText: 'Set-AzVmSecurityProfile',
+		ResultType: 2,
+		ToolTip: 'Set-AzVmSecurityProfile\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVMSourceImage',
+		ListItemText: 'Set-AzVMSourceImage',
+		ResultType: 2,
+		ToolTip: 'Set-AzVMSourceImage\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVMSqlServerExtension',
+		ListItemText: 'Set-AzVMSqlServerExtension',
+		ResultType: 2,
+		ToolTip: 'Set-AzVMSqlServerExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVmss',
+		ListItemText: 'Set-AzVmss',
+		ResultType: 2,
+		ToolTip: 'Set-AzVmss\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVmssBootDiagnostic',
+		ListItemText: 'Set-AzVmssBootDiagnostic',
+		ResultType: 2,
+		ToolTip: 'Set-AzVmssBootDiagnostic\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVmssDiskEncryptionExtension',
+		ListItemText: 'Set-AzVmssDiskEncryptionExtension',
+		ResultType: 2,
+		ToolTip: 'Set-AzVmssDiskEncryptionExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVmssOrchestrationServiceState',
+		ListItemText: 'Set-AzVmssOrchestrationServiceState',
+		ResultType: 2,
+		ToolTip: 'Set-AzVmssOrchestrationServiceState\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVmssOsProfile',
+		ListItemText: 'Set-AzVmssOsProfile',
+		ResultType: 2,
+		ToolTip: 'Set-AzVmssOsProfile\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVmssRollingUpgradePolicy',
+		ListItemText: 'Set-AzVmssRollingUpgradePolicy',
+		ResultType: 2,
+		ToolTip: 'Set-AzVmssRollingUpgradePolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVmssSecurityProfile',
+		ListItemText: 'Set-AzVmssSecurityProfile',
+		ResultType: 2,
+		ToolTip: 'Set-AzVmssSecurityProfile\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVmssStorageProfile',
+		ListItemText: 'Set-AzVmssStorageProfile',
+		ResultType: 2,
+		ToolTip: 'Set-AzVmssStorageProfile\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVmssUefi',
+		ListItemText: 'Set-AzVmssUefi',
+		ResultType: 2,
+		ToolTip: 'Set-AzVmssUefi\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVmssVM',
+		ListItemText: 'Set-AzVmssVM',
+		ResultType: 2,
+		ToolTip: 'Set-AzVmssVM\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVmssVMRunCommand',
+		ListItemText: 'Set-AzVmssVMRunCommand',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-AzVmssVMRunCommand \\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVmUefi',
+		ListItemText: 'Set-AzVmUefi',
+		ResultType: 2,
+		ToolTip: 'Set-AzVmUefi\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzVpnClientIpsecParameter',
+		ListItemText: 'Set-AzVpnClientIpsecParameter',
+		ResultType: 2,
+		ToolTip: 'Set-AzVpnClientIpsecParameter\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzWcfRelay',
+		ListItemText: 'Set-AzWcfRelay',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-AzWcfRelay \\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzWebApp',
+		ListItemText: 'Set-AzWebApp',
+		ResultType: 2,
+		ToolTip: 'Set-AzWebApp\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzWebAppSlot',
+		ListItemText: 'Set-AzWebAppSlot',
+		ResultType: 2,
+		ToolTip: 'Set-AzWebAppSlot\\r\\n'
+	},
+	{
+		CompletionText: 'Set-AzWebAppSlotConfigName',
+		ListItemText: 'Set-AzWebAppSlotConfigName',
+		ResultType: 2,
+		ToolTip: 'Set-AzWebAppSlotConfigName\\r\\n'
+	},
+	{
+		CompletionText: 'Set-BCAuthentication',
+		ListItemText: 'Set-BCAuthentication',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-BCAuthentication \\r\\n'
+	},
+	{
+		CompletionText: 'Set-BCCache',
+		ListItemText: 'Set-BCCache',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-BCCache \\r\\n'
+	},
+	{
+		CompletionText: 'Set-BCDataCacheEntryMaxAge',
+		ListItemText: 'Set-BCDataCacheEntryMaxAge',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-BCDataCacheEntryMaxAge \\r\\n'
+	},
+	{
+		CompletionText: 'Set-BcdBootDefault',
+		ListItemText: 'Set-BcdBootDefault',
+		ResultType: 2,
+		ToolTip: 'Set-BcdBootDefault\\r\\n'
+	},
+	{
+		CompletionText: 'Set-BcdBootDisplayOrder',
+		ListItemText: 'Set-BcdBootDisplayOrder',
+		ResultType: 2,
+		ToolTip: 'Set-BcdBootDisplayOrder\\r\\n'
+	},
+	{
+		CompletionText: 'Set-BcdBootSequence',
+		ListItemText: 'Set-BcdBootSequence',
+		ResultType: 2,
+		ToolTip: 'Set-BcdBootSequence\\r\\n'
+	},
+	{
+		CompletionText: 'Set-BcdBootTimeout',
+		ListItemText: 'Set-BcdBootTimeout',
+		ResultType: 2,
+		ToolTip: 'Set-BcdBootTimeout\\r\\n'
+	},
+	{
+		CompletionText: 'Set-BcdBootToolsDisplayOrder',
+		ListItemText: 'Set-BcdBootToolsDisplayOrder',
+		ResultType: 2,
+		ToolTip: 'Set-BcdBootToolsDisplayOrder\\r\\n'
+	},
+	{
+		CompletionText: 'Set-BcdDebugSettings',
+		ListItemText: 'Set-BcdDebugSettings',
+		ResultType: 2,
+		ToolTip: 'Set-BcdDebugSettings\\r\\n'
+	},
+	{
+		CompletionText: 'Set-BcdElement',
+		ListItemText: 'Set-BcdElement',
+		ResultType: 2,
+		ToolTip: 'Set-BcdElement\\r\\n'
+	},
+	{
+		CompletionText: 'Set-BcdHypervisorSettings',
+		ListItemText: 'Set-BcdHypervisorSettings',
+		ResultType: 2,
+		ToolTip: 'Set-BcdHypervisorSettings\\r\\n'
+	},
+	{
+		CompletionText: 'Set-BCMinSMBLatency',
+		ListItemText: 'Set-BCMinSMBLatency',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-BCMinSMBLatency \\r\\n'
+	},
+	{
+		CompletionText: 'Set-BCSecretKey',
+		ListItemText: 'Set-BCSecretKey',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-BCSecretKey \\r\\n'
+	},
+	{
+		CompletionText: 'Set-BitsTransfer',
+		ListItemText: 'Set-BitsTransfer',
+		ResultType: 2,
+		ToolTip: 'Set-BitsTransfer\\r\\n'
+	},
+	{
+		CompletionText: 'Set-CertificateAutoEnrollmentPolicy',
+		ListItemText: 'Set-CertificateAutoEnrollmentPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-CertificateAutoEnrollmentPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-CimInstance',
+		ListItemText: 'Set-CimInstance',
+		ResultType: 2,
+		ToolTip: 'Set-CimInstance\\r\\n'
+	},
+	{
+		CompletionText: 'Set-CIPolicyIdInfo',
+		ListItemText: 'Set-CIPolicyIdInfo',
+		ResultType: 2,
+		ToolTip: 'Set-CIPolicyIdInfo\\r\\n'
+	},
+	{
+		CompletionText: 'Set-CIPolicySetting',
+		ListItemText: 'Set-CIPolicySetting',
+		ResultType: 2,
+		ToolTip: 'Set-CIPolicySetting\\r\\n'
+	},
+	{
+		CompletionText: 'Set-CIPolicyVersion',
+		ListItemText: 'Set-CIPolicyVersion',
+		ResultType: 2,
+		ToolTip: 'Set-CIPolicyVersion\\r\\n'
+	},
+	{
+		CompletionText: 'Set-Clipboard',
+		ListItemText: 'Set-Clipboard',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-Clipboard [-Value] <string[]> [-Append] [-PassThru] [-AsOSC52] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Set-ClusteredScheduledTask',
+		ListItemText: 'Set-ClusteredScheduledTask',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-ClusteredScheduledTask \\r\\n'
+	},
+	{
+		CompletionText: 'Set-Content',
+		ListItemText: 'Set-Content',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-Content [-Path] <string[]> [-Value] <Object[]> [-PassThru] [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Force] [-Credential <pscredential>] [-WhatIf] [-Confirm] [-NoNewline] [-Encoding <Encoding>] [-AsByteStream] [-Stream <string>] [<CommonParameters>]\\r\\n\\r\\nSet-Content [-Value] <Object[]> -LiteralPath <string[]> [-PassThru] [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Force] [-Credential <pscredential>] [-WhatIf] [-Confirm] [-NoNewline] [-Encoding <Encoding>] [-AsByteStream] [-Stream <string>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Set-Culture',
+		ListItemText: 'Set-Culture',
+		ResultType: 2,
+		ToolTip: 'Set-Culture\\r\\n'
+	},
+	{
+		CompletionText: 'Set-DAClientExperienceConfiguration',
+		ListItemText: 'Set-DAClientExperienceConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-DAClientExperienceConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Set-DAEntryPointTableItem',
+		ListItemText: 'Set-DAEntryPointTableItem',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-DAEntryPointTableItem \\r\\n'
+	},
+	{
+		CompletionText: 'Set-Date',
+		ListItemText: 'Set-Date',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-Date [-Date] <datetime> [-DisplayHint <DisplayHintType>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nSet-Date [-Adjust] <timespan> [-DisplayHint <DisplayHintType>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Set-DeliveryOptimizationStatus',
+		ListItemText: 'Set-DeliveryOptimizationStatus',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-DeliveryOptimizationStatus \\r\\n'
+	},
+	{
+		CompletionText: 'Set-Disk',
+		ListItemText: 'Set-Disk',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-Disk \\r\\n'
+	},
+	{
+		CompletionText: 'Set-DnsClient',
+		ListItemText: 'Set-DnsClient',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-DnsClient \\r\\n'
+	},
+	{
+		CompletionText: 'Set-DnsClientDohServerAddress',
+		ListItemText: 'Set-DnsClientDohServerAddress',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-DnsClientDohServerAddress \\r\\n'
+	},
+	{
+		CompletionText: 'Set-DnsClientGlobalSetting',
+		ListItemText: 'Set-DnsClientGlobalSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-DnsClientGlobalSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Set-DnsClientNrptGlobal',
+		ListItemText: 'Set-DnsClientNrptGlobal',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-DnsClientNrptGlobal \\r\\n'
+	},
+	{
+		CompletionText: 'Set-DnsClientNrptRule',
+		ListItemText: 'Set-DnsClientNrptRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-DnsClientNrptRule \\r\\n'
+	},
+	{
+		CompletionText: 'Set-DnsClientServerAddress',
+		ListItemText: 'Set-DnsClientServerAddress',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-DnsClientServerAddress \\r\\n'
+	},
+	{
+		CompletionText: 'Set-DODownloadMode',
+		ListItemText: 'Set-DODownloadMode',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-DODownloadMode \\r\\n'
+	},
+	{
+		CompletionText: 'Set-DOMaxBackgroundBandwidth',
+		ListItemText: 'Set-DOMaxBackgroundBandwidth',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-DOMaxBackgroundBandwidth \\r\\n'
+	},
+	{
+		CompletionText: 'Set-DOMaxForegroundBandwidth',
+		ListItemText: 'Set-DOMaxForegroundBandwidth',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-DOMaxForegroundBandwidth \\r\\n'
+	},
+	{
+		CompletionText: 'Set-DOPercentageMaxBackgroundBandwidth',
+		ListItemText: 'Set-DOPercentageMaxBackgroundBandwidth',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-DOPercentageMaxBackgroundBandwidth \\r\\n'
+	},
+	{
+		CompletionText: 'Set-DOPercentageMaxForegroundBandwidth',
+		ListItemText: 'Set-DOPercentageMaxForegroundBandwidth',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-DOPercentageMaxForegroundBandwidth \\r\\n'
+	},
+	{
+		CompletionText: 'Set-DscLocalConfigurationManager',
+		ListItemText: 'Set-DscLocalConfigurationManager',
+		ResultType: 2,
+		ToolTip: 'Set-DscLocalConfigurationManager\\r\\n'
+	},
+	{
+		CompletionText: 'Set-DtcAdvancedHostSetting',
+		ListItemText: 'Set-DtcAdvancedHostSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-DtcAdvancedHostSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Set-DtcAdvancedSetting',
+		ListItemText: 'Set-DtcAdvancedSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-DtcAdvancedSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Set-DtcClusterDefault',
+		ListItemText: 'Set-DtcClusterDefault',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-DtcClusterDefault \\r\\n'
+	},
+	{
+		CompletionText: 'Set-DtcClusterTMMapping',
+		ListItemText: 'Set-DtcClusterTMMapping',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-DtcClusterTMMapping \\r\\n'
+	},
+	{
+		CompletionText: 'Set-DtcDefault',
+		ListItemText: 'Set-DtcDefault',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-DtcDefault \\r\\n'
+	},
+	{
+		CompletionText: 'Set-DtcLog',
+		ListItemText: 'Set-DtcLog',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-DtcLog \\r\\n'
+	},
+	{
+		CompletionText: 'Set-DtcNetworkSetting',
+		ListItemText: 'Set-DtcNetworkSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-DtcNetworkSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Set-DtcTransaction',
+		ListItemText: 'Set-DtcTransaction',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-DtcTransaction \\r\\n'
+	},
+	{
+		CompletionText: 'Set-DtcTransactionsTraceSession',
+		ListItemText: 'Set-DtcTransactionsTraceSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-DtcTransactionsTraceSession \\r\\n'
+	},
+	{
+		CompletionText: 'Set-DtcTransactionsTraceSetting',
+		ListItemText: 'Set-DtcTransactionsTraceSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-DtcTransactionsTraceSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Set-DynamicParameterVariables',
+		ListItemText: 'Set-DynamicParameterVariables',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-DynamicParameterVariables \\r\\n'
+	},
+	{
+		CompletionText: 'Set-EtwTraceProvider',
+		ListItemText: 'Set-EtwTraceProvider',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-EtwTraceProvider \\r\\n'
+	},
+	{
+		CompletionText: 'Set-EtwTraceSession',
+		ListItemText: 'Set-EtwTraceSession',
+		ResultType: 2,
+		ToolTip: 'Set-EtwTraceSession'
+	},
+	{
+		CompletionText: 'Set-ExecutionPolicy',
+		ListItemText: 'Set-ExecutionPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-ExecutionPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-FileIntegrity',
+		ListItemText: 'Set-FileIntegrity',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-FileIntegrity \\r\\n'
+	},
+	{
+		CompletionText: 'Set-FileShare',
+		ListItemText: 'Set-FileShare',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-FileShare \\r\\n'
+	},
+	{
+		CompletionText: 'Set-FileStorageTier',
+		ListItemText: 'Set-FileStorageTier',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-FileStorageTier \\r\\n'
+	},
+	{
+		CompletionText: 'Set-HgsClientConfiguration',
+		ListItemText: 'Set-HgsClientConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-HgsClientConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Set-HgsClientHostKey',
+		ListItemText: 'Set-HgsClientHostKey',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-HgsClientHostKey \\r\\n'
+	},
+	{
+		CompletionText: 'Set-HVCIOptions',
+		ListItemText: 'Set-HVCIOptions',
+		ResultType: 2,
+		ToolTip: 'Set-HVCIOptions\\r\\n'
+	},
+	{
+		CompletionText: 'Set-InitiatorPort',
+		ListItemText: 'Set-InitiatorPort',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-InitiatorPort \\r\\n'
+	},
+	{
+		CompletionText: 'Set-IscsiChapSecret',
+		ListItemText: 'Set-IscsiChapSecret',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-IscsiChapSecret \\r\\n'
+	},
+	{
+		CompletionText: 'Set-Item',
+		ListItemText: 'Set-Item',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-Item [-Path] <string[]> [[-Value] <Object>] [-Force] [-PassThru] [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Credential <pscredential>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nSet-Item [[-Value] <Object>] -LiteralPath <string[]> [-Force] [-PassThru] [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Credential <pscredential>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Set-ItemProperty',
+		ListItemText: 'Set-ItemProperty',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-ItemProperty [-Path] <string[]> [-Name] <string> [-Value] <Object> [-PassThru] [-Force] [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Credential <pscredential>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nSet-ItemProperty [-Path] <string[]> -InputObject <psobject> [-PassThru] [-Force] [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Credential <pscredential>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nSet-ItemProperty [-Name] <string> [-Value] <Object> -LiteralPath <string[]> [-PassThru] [-Force] [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Credential <pscredential>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nSet-ItemProperty -LiteralPath <string[]> -InputObject <psobject> [-PassThru] [-Force] [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-Credential <pscredential>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Set-JobTrigger',
+		ListItemText: 'Set-JobTrigger',
+		ResultType: 2,
+		ToolTip: 'Set-JobTrigger\\r\\n'
+	},
+	{
+		CompletionText: 'Set-KdsConfiguration',
+		ListItemText: 'Set-KdsConfiguration',
+		ResultType: 2,
+		ToolTip: 'Set-KdsConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Set-LapsADAuditing',
+		ListItemText: 'Set-LapsADAuditing',
+		ResultType: 2,
+		ToolTip: 'Set-LapsADAuditing\\r\\n'
+	},
+	{
+		CompletionText: 'Set-LapsADComputerSelfPermission',
+		ListItemText: 'Set-LapsADComputerSelfPermission',
+		ResultType: 2,
+		ToolTip: 'Set-LapsADComputerSelfPermission\\r\\n'
+	},
+	{
+		CompletionText: 'Set-LapsADPasswordExpirationTime',
+		ListItemText: 'Set-LapsADPasswordExpirationTime',
+		ResultType: 2,
+		ToolTip: 'Set-LapsADPasswordExpirationTime\\r\\n'
+	},
+	{
+		CompletionText: 'Set-LapsADReadPasswordPermission',
+		ListItemText: 'Set-LapsADReadPasswordPermission',
+		ResultType: 2,
+		ToolTip: 'Set-LapsADReadPasswordPermission\\r\\n'
+	},
+	{
+		CompletionText: 'Set-LapsADResetPasswordPermission',
+		ListItemText: 'Set-LapsADResetPasswordPermission',
+		ResultType: 2,
+		ToolTip: 'Set-LapsADResetPasswordPermission\\r\\n'
+	},
+	{
+		CompletionText: 'Set-LocalGroup',
+		ListItemText: 'Set-LocalGroup',
+		ResultType: 2,
+		ToolTip: 'Set-LocalGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Set-LocalUser',
+		ListItemText: 'Set-LocalUser',
+		ResultType: 2,
+		ToolTip: 'Set-LocalUser\\r\\n'
+	},
+	{
+		CompletionText: 'Set-Location',
+		ListItemText: 'Set-Location',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-Location [[-Path] <string>] [-PassThru] [<CommonParameters>]\\r\\n\\r\\nSet-Location -LiteralPath <string> [-PassThru] [<CommonParameters>]\\r\\n\\r\\nSet-Location [-PassThru] [-StackName <string>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Set-LogProperties',
+		ListItemText: 'Set-LogProperties',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-LogProperties \\r\\n'
+	},
+	{
+		CompletionText: 'Set-MappedKeyHandler',
+		ListItemText: 'Set-MappedKeyHandler',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-MappedKeyHandler [[-Chord] <string[]>] [[-Sequence] <string[]>]\\r\\n'
+	},
+	{
+		CompletionText: 'Set-MappedKeyHandlers',
+		ListItemText: 'Set-MappedKeyHandlers',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-MappedKeyHandlers \\r\\n'
+	},
+	{
+		CompletionText: 'Set-MarkdownOption',
+		ListItemText: 'Set-MarkdownOption',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-MarkdownOption [-Header1Color <string>] [-Header2Color <string>] [-Header3Color <string>] [-Header4Color <string>] [-Header5Color <string>] [-Header6Color <string>] [-Code <string>] [-ImageAltTextForegroundColor <string>] [-LinkForegroundColor <string>] [-ItalicsForegroundColor <string>] [-BoldForegroundColor <string>] [-PassThru] [<CommonParameters>]\\r\\n\\r\\nSet-MarkdownOption -Theme <string> [-PassThru] [<CommonParameters>]\\r\\n\\r\\nSet-MarkdownOption [-InputObject] <psobject> [-PassThru] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Set-MMAgent',
+		ListItemText: 'Set-MMAgent',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-MMAgent \\r\\n'
+	},
+	{
+		CompletionText: 'Set-MpPreference',
+		ListItemText: 'Set-MpPreference',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-MpPreference \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NCSIPolicyConfiguration',
+		ListItemText: 'Set-NCSIPolicyConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NCSIPolicyConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Set-Net6to4Configuration',
+		ListItemText: 'Set-Net6to4Configuration',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-Net6to4Configuration \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetAdapter',
+		ListItemText: 'Set-NetAdapter',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetAdapter \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetAdapterAdvancedProperty',
+		ListItemText: 'Set-NetAdapterAdvancedProperty',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetAdapterAdvancedProperty \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetAdapterBinding',
+		ListItemText: 'Set-NetAdapterBinding',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetAdapterBinding \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetAdapterChecksumOffload',
+		ListItemText: 'Set-NetAdapterChecksumOffload',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetAdapterChecksumOffload \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetAdapterDataPathConfiguration',
+		ListItemText: 'Set-NetAdapterDataPathConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetAdapterDataPathConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetAdapterEncapsulatedPacketTaskOffload',
+		ListItemText: 'Set-NetAdapterEncapsulatedPacketTaskOffload',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetAdapterEncapsulatedPacketTaskOffload \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetAdapterIPsecOffload',
+		ListItemText: 'Set-NetAdapterIPsecOffload',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetAdapterIPsecOffload \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetAdapterLso',
+		ListItemText: 'Set-NetAdapterLso',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetAdapterLso \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetAdapterPacketDirect',
+		ListItemText: 'Set-NetAdapterPacketDirect',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetAdapterPacketDirect \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetAdapterPowerManagement',
+		ListItemText: 'Set-NetAdapterPowerManagement',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetAdapterPowerManagement \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetAdapterQos',
+		ListItemText: 'Set-NetAdapterQos',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetAdapterQos \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetAdapterRdma',
+		ListItemText: 'Set-NetAdapterRdma',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetAdapterRdma \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetAdapterRsc',
+		ListItemText: 'Set-NetAdapterRsc',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetAdapterRsc \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetAdapterRss',
+		ListItemText: 'Set-NetAdapterRss',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetAdapterRss \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetAdapterSriov',
+		ListItemText: 'Set-NetAdapterSriov',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetAdapterSriov \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetAdapterUso',
+		ListItemText: 'Set-NetAdapterUso',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetAdapterUso \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetAdapterVmq',
+		ListItemText: 'Set-NetAdapterVmq',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetAdapterVmq \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetConnectionProfile',
+		ListItemText: 'Set-NetConnectionProfile',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetConnectionProfile \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetDnsTransitionConfiguration',
+		ListItemText: 'Set-NetDnsTransitionConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetDnsTransitionConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetEventPacketCaptureProvider',
+		ListItemText: 'Set-NetEventPacketCaptureProvider',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetEventPacketCaptureProvider \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetEventProvider',
+		ListItemText: 'Set-NetEventProvider',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetEventProvider \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetEventSession',
+		ListItemText: 'Set-NetEventSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetEventSession \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetEventVFPProvider',
+		ListItemText: 'Set-NetEventVFPProvider',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetEventVFPProvider \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetEventVmSwitchProvider',
+		ListItemText: 'Set-NetEventVmSwitchProvider',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetEventVmSwitchProvider \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetEventWFPCaptureProvider',
+		ListItemText: 'Set-NetEventWFPCaptureProvider',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetEventWFPCaptureProvider \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetFirewallAddressFilter',
+		ListItemText: 'Set-NetFirewallAddressFilter',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetFirewallAddressFilter \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetFirewallApplicationFilter',
+		ListItemText: 'Set-NetFirewallApplicationFilter',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetFirewallApplicationFilter \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetFirewallHyperVProfile',
+		ListItemText: 'Set-NetFirewallHyperVProfile',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetFirewallHyperVProfile \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetFirewallHyperVRule',
+		ListItemText: 'Set-NetFirewallHyperVRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetFirewallHyperVRule \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetFirewallHyperVVMSetting',
+		ListItemText: 'Set-NetFirewallHyperVVMSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetFirewallHyperVVMSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetFirewallInterfaceFilter',
+		ListItemText: 'Set-NetFirewallInterfaceFilter',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetFirewallInterfaceFilter \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetFirewallInterfaceTypeFilter',
+		ListItemText: 'Set-NetFirewallInterfaceTypeFilter',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetFirewallInterfaceTypeFilter \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetFirewallPortFilter',
+		ListItemText: 'Set-NetFirewallPortFilter',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetFirewallPortFilter \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetFirewallProfile',
+		ListItemText: 'Set-NetFirewallProfile',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetFirewallProfile \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetFirewallRule',
+		ListItemText: 'Set-NetFirewallRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetFirewallRule \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetFirewallSecurityFilter',
+		ListItemText: 'Set-NetFirewallSecurityFilter',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetFirewallSecurityFilter \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetFirewallServiceFilter',
+		ListItemText: 'Set-NetFirewallServiceFilter',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetFirewallServiceFilter \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetFirewallSetting',
+		ListItemText: 'Set-NetFirewallSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetFirewallSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetIPAddress',
+		ListItemText: 'Set-NetIPAddress',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetIPAddress \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetIPHttpsConfiguration',
+		ListItemText: 'Set-NetIPHttpsConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetIPHttpsConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetIPInterface',
+		ListItemText: 'Set-NetIPInterface',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetIPInterface \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetIPsecDospSetting',
+		ListItemText: 'Set-NetIPsecDospSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetIPsecDospSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetIPsecMainModeCryptoSet',
+		ListItemText: 'Set-NetIPsecMainModeCryptoSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetIPsecMainModeCryptoSet \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetIPsecMainModeRule',
+		ListItemText: 'Set-NetIPsecMainModeRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetIPsecMainModeRule \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetIPsecPhase1AuthSet',
+		ListItemText: 'Set-NetIPsecPhase1AuthSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetIPsecPhase1AuthSet \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetIPsecPhase2AuthSet',
+		ListItemText: 'Set-NetIPsecPhase2AuthSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetIPsecPhase2AuthSet \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetIPsecQuickModeCryptoSet',
+		ListItemText: 'Set-NetIPsecQuickModeCryptoSet',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetIPsecQuickModeCryptoSet \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetIPsecRule',
+		ListItemText: 'Set-NetIPsecRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetIPsecRule \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetIPv4Protocol',
+		ListItemText: 'Set-NetIPv4Protocol',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetIPv4Protocol \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetIPv6Protocol',
+		ListItemText: 'Set-NetIPv6Protocol',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetIPv6Protocol \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetIsatapConfiguration',
+		ListItemText: 'Set-NetIsatapConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetIsatapConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetLbfoTeam',
+		ListItemText: 'Set-NetLbfoTeam',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetLbfoTeam \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetLbfoTeamMember',
+		ListItemText: 'Set-NetLbfoTeamMember',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetLbfoTeamMember \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetLbfoTeamNic',
+		ListItemText: 'Set-NetLbfoTeamNic',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetLbfoTeamNic \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetNat',
+		ListItemText: 'Set-NetNat',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetNat \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetNatGlobal',
+		ListItemText: 'Set-NetNatGlobal',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetNatGlobal \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetNatTransitionConfiguration',
+		ListItemText: 'Set-NetNatTransitionConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetNatTransitionConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetNeighbor',
+		ListItemText: 'Set-NetNeighbor',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetNeighbor \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetOffloadGlobalSetting',
+		ListItemText: 'Set-NetOffloadGlobalSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetOffloadGlobalSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetQosPolicy',
+		ListItemText: 'Set-NetQosPolicy',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetQosPolicy \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetRoute',
+		ListItemText: 'Set-NetRoute',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetRoute \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetTCPSetting',
+		ListItemText: 'Set-NetTCPSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetTCPSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetTeredoConfiguration',
+		ListItemText: 'Set-NetTeredoConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetTeredoConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetUDPSetting',
+		ListItemText: 'Set-NetUDPSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetUDPSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetworkSwitchEthernetPortIPAddress',
+		ListItemText: 'Set-NetworkSwitchEthernetPortIPAddress',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetworkSwitchEthernetPortIPAddress \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetworkSwitchPortMode',
+		ListItemText: 'Set-NetworkSwitchPortMode',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetworkSwitchPortMode \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetworkSwitchPortProperty',
+		ListItemText: 'Set-NetworkSwitchPortProperty',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetworkSwitchPortProperty \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NetworkSwitchVlanProperty',
+		ListItemText: 'Set-NetworkSwitchVlanProperty',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-NetworkSwitchVlanProperty \\r\\n'
+	},
+	{
+		CompletionText: 'Set-NonRemovableAppsPolicy',
+		ListItemText: 'Set-NonRemovableAppsPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-NonRemovableAppsPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-OdbcDriver',
+		ListItemText: 'Set-OdbcDriver',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-OdbcDriver \\r\\n'
+	},
+	{
+		CompletionText: 'Set-OdbcDsn',
+		ListItemText: 'Set-OdbcDsn',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-OdbcDsn \\r\\n'
+	},
+	{
+		CompletionText: 'Set-PackageSource',
+		ListItemText: 'Set-PackageSource',
+		ResultType: 2,
+		ToolTip: 'Set-PackageSource\\r\\n'
+	},
+	{
+		CompletionText: 'Set-Partition',
+		ListItemText: 'Set-Partition',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-Partition \\r\\n'
+	},
+	{
+		CompletionText: 'Set-PcsvDeviceBootConfiguration',
+		ListItemText: 'Set-PcsvDeviceBootConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-PcsvDeviceBootConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Set-PcsvDeviceNetworkConfiguration',
+		ListItemText: 'Set-PcsvDeviceNetworkConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-PcsvDeviceNetworkConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Set-PcsvDeviceUserPassword',
+		ListItemText: 'Set-PcsvDeviceUserPassword',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-PcsvDeviceUserPassword \\r\\n'
+	},
+	{
+		CompletionText: 'Set-PhysicalDisk',
+		ListItemText: 'Set-PhysicalDisk',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-PhysicalDisk \\r\\n'
+	},
+	{
+		CompletionText: 'Set-PreferredLanguage',
+		ListItemText: 'Set-PreferredLanguage',
+		ResultType: 2,
+		ToolTip: 'Set-PreferredLanguage'
+	},
+	{
+		CompletionText: 'Set-PrintConfiguration',
+		ListItemText: 'Set-PrintConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-PrintConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Set-Printer',
+		ListItemText: 'Set-Printer',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-Printer \\r\\n'
+	},
+	{
+		CompletionText: 'Set-PrinterProperty',
+		ListItemText: 'Set-PrinterProperty',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-PrinterProperty \\r\\n'
+	},
+	{
+		CompletionText: 'Set-ProcessMitigation',
+		ListItemText: 'Set-ProcessMitigation',
+		ResultType: 2,
+		ToolTip: 'Set-ProcessMitigation\\r\\n'
+	},
+	{
+		CompletionText: 'Set-ProvisionedAppPackageDataFile',
+		ListItemText: 'Set-ProvisionedAppPackageDataFile',
+		ResultType: 2,
+		ToolTip: 'Set-ProvisionedAppPackageDataFile'
+	},
+	{
+		CompletionText: 'Set-ProvisionedAppXDataFile',
+		ListItemText: 'Set-ProvisionedAppXDataFile',
+		ResultType: 2,
+		ToolTip: 'Set-ProvisionedAppXDataFile'
+	},
+	{
+		CompletionText: 'Set-PSBreakpoint',
+		ListItemText: 'Set-PSBreakpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-PSBreakpoint [-Script] <string[]> [-Line] <int[]> [[-Column] <int>] [-Action <scriptblock>] [-Runspace <runspace>] [<CommonParameters>]\\r\\n\\r\\nSet-PSBreakpoint [[-Script] <string[]>] -Command <string[]> [-Action <scriptblock>] [-Runspace <runspace>] [<CommonParameters>]\\r\\n\\r\\nSet-PSBreakpoint [[-Script] <string[]>] -Variable <string[]> [-Action <scriptblock>] [-Mode <VariableAccessMode>] [-Runspace <runspace>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Set-PSDebug',
+		ListItemText: 'Set-PSDebug',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-PSDebug [-Trace <int>] [-Step] [-Strict] [<CommonParameters>]\\r\\n\\r\\nSet-PSDebug [-Off] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Set-PSReadLineKeyHandler',
+		ListItemText: 'Set-PSReadLineKeyHandler',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-PSReadLineKeyHandler [-Chord] <string[]> [-ScriptBlock] <scriptblock> [-BriefDescription <string>] [-Description <string>] [-ViMode <ViMode>] [<CommonParameters>]\\r\\n\\r\\nSet-PSReadLineKeyHandler [-Chord] <string[]> [-Function] <string> [-ViMode <ViMode>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Set-PSReadLineOption',
+		ListItemText: 'Set-PSReadLineOption',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-PSReadLineOption [-EditMode <EditMode>] [-ContinuationPrompt <string>] [-HistoryNoDuplicates] [-AddToHistoryHandler <Func[string,Object]>] [-CommandValidationHandler <Action[CommandAst]>] [-HistorySearchCursorMovesToEnd] [-MaximumHistoryCount <int>] [-MaximumKillRingCount <int>] [-ShowToolTips] [-ExtraPromptLineCount <int>] [-DingTone <int>] [-DingDuration <int>] [-BellStyle <BellStyle>] [-CompletionQueryItems <int>] [-WordDelimiters <string>] [-HistorySearchCaseSensitive] [-HistorySaveStyle <HistorySaveStyle>] [-HistorySavePath <string>] [-AnsiEscapeTimeout <int>] [-PromptText <string[]>] [-ViModeIndicator <ViModeStyle>] [-ViModeChangeHandler <scriptblock>] [-PredictionSource <PredictionSource>] [-PredictionViewStyle <PredictionViewStyle>] [-Colors <hashtable>] [-TerminateOrphanedConsoleApps] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Set-PSRepository',
+		ListItemText: 'Set-PSRepository',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-PSRepository \\r\\n'
+	},
+	{
+		CompletionText: 'Set-PSResourceRepository',
+		ListItemText: 'Set-PSResourceRepository',
+		ResultType: 2,
+		ToolTip: 'Set-PSResourceRepository\\r\\n'
+	},
+	{
+		CompletionText: 'Set-PSSessionConfiguration',
+		ListItemText: 'Set-PSSessionConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-PSSessionConfiguration [-Name] <string> [-ApplicationBase <string>] [-RunAsCredential <pscredential>] [-ThreadApartmentState <ApartmentState>] [-ThreadOptions <PSThreadOptions>] [-AccessMode <PSSessionConfigurationAccessMode>] [-UseSharedProcess] [-StartupScript <string>] [-MaximumReceivedDataSizePerCommandMB <double>] [-MaximumReceivedObjectSizeMB <double>] [-SecurityDescriptorSddl <string>] [-ShowSecurityDescriptorUI] [-Force] [-NoServiceRestart] [-PSVersion <version>] [-SessionTypeOption <PSSessionTypeOption>] [-TransportOption <PSTransportOption>] [-ModulesToImport <Object[]>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nSet-PSSessionConfiguration [-Name] <string> [-AssemblyName] <string> [-ConfigurationTypeName] <string> [-ApplicationBase <string>] [-RunAsCredential <pscredential>] [-ThreadApartmentState <ApartmentState>] [-ThreadOptions <PSThreadOptions>] [-AccessMode <PSSessionConfigurationAccessMode>] [-UseSharedProcess] [-StartupScript <string>] [-MaximumReceivedDataSizePerCommandMB <double>] [-MaximumReceivedObjectSizeMB <double>] [-SecurityDescriptorSddl <string>] [-ShowSecurityDescriptorUI] [-Force] [-NoServiceRestart] [-PSVersion <version>] [-SessionTypeOption <PSSessionTypeOption>] [-TransportOption <PSTransportOption>] [-ModulesToImport <Object[]>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nSet-PSSessionConfiguration [-Name] <string> -Path <string> [-RunAsCredential <pscredential>] [-ThreadApartmentState <ApartmentState>] [-ThreadOptions <PSThreadOptions>] [-AccessMode <PSSessionConfigurationAccessMode>] [-UseSharedProcess] [-StartupScript <string>] [-MaximumReceivedDataSizePerCommandMB <double>] [-MaximumReceivedObjectSizeMB <double>] [-SecurityDescriptorSddl <string>] [-ShowSecurityDescriptorUI] [-Force] [-NoServiceRestart] [-TransportOption <PSTransportOption>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Set-ResiliencySetting',
+		ListItemText: 'Set-ResiliencySetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-ResiliencySetting \\r\\n'
+	},
+	{
+		CompletionText: 'Set-RuleOption',
+		ListItemText: 'Set-RuleOption',
+		ResultType: 2,
+		ToolTip: 'Set-RuleOption\\r\\n'
+	},
+	{
+		CompletionText: 'Set-ScheduledJob',
+		ListItemText: 'Set-ScheduledJob',
+		ResultType: 2,
+		ToolTip: 'Set-ScheduledJob\\r\\n'
+	},
+	{
+		CompletionText: 'Set-ScheduledJobOption',
+		ListItemText: 'Set-ScheduledJobOption',
+		ResultType: 2,
+		ToolTip: 'Set-ScheduledJobOption\\r\\n'
+	},
+	{
+		CompletionText: 'Set-ScheduledTask',
+		ListItemText: 'Set-ScheduledTask',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-ScheduledTask \\r\\n'
+	},
+	{
+		CompletionText: 'Set-SecureBootUEFI',
+		ListItemText: 'Set-SecureBootUEFI',
+		ResultType: 2,
+		ToolTip: 'Set-SecureBootUEFI\\r\\n'
+	},
+	{
+		CompletionText: 'Set-Service',
+		ListItemText: 'Set-Service',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-Service [-Name] <string> [-DisplayName <string>] [-Credential <pscredential>] [-Description <string>] [-StartupType <ServiceStartupType>] [-SecurityDescriptorSddl <string>] [-Status <string>] [-Force] [-PassThru] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nSet-Service [-InputObject] <ServiceController> [-DisplayName <string>] [-Credential <pscredential>] [-Description <string>] [-StartupType <ServiceStartupType>] [-SecurityDescriptorSddl <string>] [-Status <string>] [-Force] [-PassThru] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Set-SmbBandwidthLimit',
+		ListItemText: 'Set-SmbBandwidthLimit',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-SmbBandwidthLimit \\r\\n'
+	},
+	{
+		CompletionText: 'Set-SmbClientCertificateMapping',
+		ListItemText: 'Set-SmbClientCertificateMapping',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-SmbClientCertificateMapping \\r\\n'
+	},
+	{
+		CompletionText: 'Set-SmbClientConfiguration',
+		ListItemText: 'Set-SmbClientConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-SmbClientConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Set-SmbPathAcl',
+		ListItemText: 'Set-SmbPathAcl',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-SmbPathAcl \\r\\n'
+	},
+	{
+		CompletionText: 'Set-SmbServerCertificateMapping',
+		ListItemText: 'Set-SmbServerCertificateMapping',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-SmbServerCertificateMapping \\r\\n'
+	},
+	{
+		CompletionText: 'Set-SmbServerConfiguration',
+		ListItemText: 'Set-SmbServerConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-SmbServerConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Set-SmbShare',
+		ListItemText: 'Set-SmbShare',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-SmbShare \\r\\n'
+	},
+	{
+		CompletionText: 'Set-StorageBusCache',
+		ListItemText: 'Set-StorageBusCache',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-StorageBusCache \\r\\n'
+	},
+	{
+		CompletionText: 'Set-StorageBusProfile',
+		ListItemText: 'Set-StorageBusProfile',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-StorageBusProfile \\r\\n'
+	},
+	{
+		CompletionText: 'Set-StorageFileServer',
+		ListItemText: 'Set-StorageFileServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-StorageFileServer \\r\\n'
+	},
+	{
+		CompletionText: 'Set-StorageHealthSetting',
+		ListItemText: 'Set-StorageHealthSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-StorageHealthSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Set-StoragePool',
+		ListItemText: 'Set-StoragePool',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-StoragePool \\r\\n'
+	},
+	{
+		CompletionText: 'Set-StorageProvider',
+		ListItemText: 'Set-StorageProvider',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-StorageProvider \\r\\n'
+	},
+	{
+		CompletionText: 'Set-StorageSetting',
+		ListItemText: 'Set-StorageSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-StorageSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Set-StorageSubSystem',
+		ListItemText: 'Set-StorageSubSystem',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-StorageSubSystem \\r\\n'
+	},
+	{
+		CompletionText: 'Set-StorageTier',
+		ListItemText: 'Set-StorageTier',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-StorageTier \\r\\n'
+	},
+	{
+		CompletionText: 'Set-StrictMode',
+		ListItemText: 'Set-StrictMode',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-StrictMode -Version <version> [<CommonParameters>]\\r\\n\\r\\nSet-StrictMode -Off [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Set-SystemLanguage',
+		ListItemText: 'Set-SystemLanguage',
+		ResultType: 2,
+		ToolTip: 'Set-SystemLanguage'
+	},
+	{
+		CompletionText: 'Set-SystemPreferredUILanguage',
+		ListItemText: 'Set-SystemPreferredUILanguage',
+		ResultType: 2,
+		ToolTip: 'Set-SystemPreferredUILanguage\\r\\n'
+	},
+	{
+		CompletionText: 'Set-TestInconclusive',
+		ListItemText: 'Set-TestInconclusive',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-TestInconclusive \\r\\n'
+	},
+	{
+		CompletionText: 'Set-TimeZone',
+		ListItemText: 'Set-TimeZone',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-TimeZone [-Name] <string> [-PassThru] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nSet-TimeZone -Id <string> [-PassThru] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nSet-TimeZone [-InputObject] <TimeZoneInfo> [-PassThru] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Set-TpmOwnerAuth',
+		ListItemText: 'Set-TpmOwnerAuth',
+		ResultType: 2,
+		ToolTip: 'Set-TpmOwnerAuth\\r\\n'
+	},
+	{
+		CompletionText: 'Set-TraceSource',
+		ListItemText: 'Set-TraceSource',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-TraceSource [-Name] <string[]> [[-Option] <PSTraceSourceOptions>] [-ListenerOption <TraceOptions>] [-FilePath <string>] [-Force] [-Debugger] [-PSHost] [-PassThru] [<CommonParameters>]\\r\\n\\r\\nSet-TraceSource [-Name] <string[]> [-RemoveListener <string[]>] [<CommonParameters>]\\r\\n\\r\\nSet-TraceSource [-Name] <string[]> [-RemoveFileListener <string[]>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Set-Variable',
+		ListItemText: 'Set-Variable',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-Variable [-Name] <string[]> [[-Value] <Object>] [-Include <string[]>] [-Exclude <string[]>] [-Description <string>] [-Option <ScopedItemOptions>] [-Force] [-Visibility <SessionStateEntryVisibility>] [-PassThru] [-Scope <string>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VHD',
+		ListItemText: 'Set-VHD',
+		ResultType: 2,
+		ToolTip: 'Set-VHD\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VirtualDisk',
+		ListItemText: 'Set-VirtualDisk',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-VirtualDisk \\r\\n'
+	},
+	{
+		CompletionText: 'Set-VM',
+		ListItemText: 'Set-VM',
+		ResultType: 2,
+		ToolTip: 'Set-VM\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMBios',
+		ListItemText: 'Set-VMBios',
+		ResultType: 2,
+		ToolTip: 'Set-VMBios\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMComPort',
+		ListItemText: 'Set-VMComPort',
+		ResultType: 2,
+		ToolTip: 'Set-VMComPort\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMDvdDrive',
+		ListItemText: 'Set-VMDvdDrive',
+		ResultType: 2,
+		ToolTip: 'Set-VMDvdDrive\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMFibreChannelHba',
+		ListItemText: 'Set-VMFibreChannelHba',
+		ResultType: 2,
+		ToolTip: 'Set-VMFibreChannelHba\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMFirmware',
+		ListItemText: 'Set-VMFirmware',
+		ResultType: 2,
+		ToolTip: 'Set-VMFirmware\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMFloppyDiskDrive',
+		ListItemText: 'Set-VMFloppyDiskDrive',
+		ResultType: 2,
+		ToolTip: 'Set-VMFloppyDiskDrive\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMGpuPartitionAdapter',
+		ListItemText: 'Set-VMGpuPartitionAdapter',
+		ResultType: 2,
+		ToolTip: 'Set-VMGpuPartitionAdapter\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMHardDiskDrive',
+		ListItemText: 'Set-VMHardDiskDrive',
+		ResultType: 2,
+		ToolTip: 'Set-VMHardDiskDrive\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMHost',
+		ListItemText: 'Set-VMHost',
+		ResultType: 2,
+		ToolTip: 'Set-VMHost\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMHostCluster',
+		ListItemText: 'Set-VMHostCluster',
+		ResultType: 2,
+		ToolTip: 'Set-VMHostCluster\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMHostPartitionableGpu',
+		ListItemText: 'Set-VMHostPartitionableGpu',
+		ResultType: 2,
+		ToolTip: 'Set-VMHostPartitionableGpu\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMKeyProtector',
+		ListItemText: 'Set-VMKeyProtector',
+		ResultType: 2,
+		ToolTip: 'Set-VMKeyProtector\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMKeyStorageDrive',
+		ListItemText: 'Set-VMKeyStorageDrive',
+		ResultType: 2,
+		ToolTip: 'Set-VMKeyStorageDrive\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMMemory',
+		ListItemText: 'Set-VMMemory',
+		ResultType: 2,
+		ToolTip: 'Set-VMMemory\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMMigrationNetwork',
+		ListItemText: 'Set-VMMigrationNetwork',
+		ResultType: 2,
+		ToolTip: 'Set-VMMigrationNetwork\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMNetworkAdapter',
+		ListItemText: 'Set-VMNetworkAdapter',
+		ResultType: 2,
+		ToolTip: 'Set-VMNetworkAdapter\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMNetworkAdapterFailoverConfiguration',
+		ListItemText: 'Set-VMNetworkAdapterFailoverConfiguration',
+		ResultType: 2,
+		ToolTip: 'Set-VMNetworkAdapterFailoverConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMNetworkAdapterIsolation',
+		ListItemText: 'Set-VMNetworkAdapterIsolation',
+		ResultType: 2,
+		ToolTip: 'Set-VMNetworkAdapterIsolation\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMNetworkAdapterRdma',
+		ListItemText: 'Set-VMNetworkAdapterRdma',
+		ResultType: 2,
+		ToolTip: 'Set-VMNetworkAdapterRdma\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMNetworkAdapterRoutingDomainMapping',
+		ListItemText: 'Set-VMNetworkAdapterRoutingDomainMapping',
+		ResultType: 2,
+		ToolTip: 'Set-VMNetworkAdapterRoutingDomainMapping\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMNetworkAdapterTeamMapping',
+		ListItemText: 'Set-VMNetworkAdapterTeamMapping',
+		ResultType: 2,
+		ToolTip: 'Set-VMNetworkAdapterTeamMapping\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMNetworkAdapterVlan',
+		ListItemText: 'Set-VMNetworkAdapterVlan',
+		ResultType: 2,
+		ToolTip: 'Set-VMNetworkAdapterVlan\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMPartitionableGpu',
+		ListItemText: 'Set-VMPartitionableGpu',
+		ResultType: 2,
+		ToolTip: 'Set-VMPartitionableGpu\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMProcessor',
+		ListItemText: 'Set-VMProcessor',
+		ResultType: 2,
+		ToolTip: 'Set-VMProcessor\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMRemoteFx3dVideoAdapter',
+		ListItemText: 'Set-VMRemoteFx3dVideoAdapter',
+		ResultType: 2,
+		ToolTip: 'Set-VMRemoteFx3dVideoAdapter\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMReplication',
+		ListItemText: 'Set-VMReplication',
+		ResultType: 2,
+		ToolTip: 'Set-VMReplication\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMReplicationAuthorizationEntry',
+		ListItemText: 'Set-VMReplicationAuthorizationEntry',
+		ResultType: 2,
+		ToolTip: 'Set-VMReplicationAuthorizationEntry\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMReplicationServer',
+		ListItemText: 'Set-VMReplicationServer',
+		ResultType: 2,
+		ToolTip: 'Set-VMReplicationServer\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMResourcePool',
+		ListItemText: 'Set-VMResourcePool',
+		ResultType: 2,
+		ToolTip: 'Set-VMResourcePool\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMSan',
+		ListItemText: 'Set-VMSan',
+		ResultType: 2,
+		ToolTip: 'Set-VMSan\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMSecurity',
+		ListItemText: 'Set-VMSecurity',
+		ResultType: 2,
+		ToolTip: 'Set-VMSecurity\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMSecurityPolicy',
+		ListItemText: 'Set-VMSecurityPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-VMSecurityPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMStorageSettings',
+		ListItemText: 'Set-VMStorageSettings',
+		ResultType: 2,
+		ToolTip: 'Set-VMStorageSettings\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMSwitch',
+		ListItemText: 'Set-VMSwitch',
+		ResultType: 2,
+		ToolTip: 'Set-VMSwitch\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMSwitchExtensionPortFeature',
+		ListItemText: 'Set-VMSwitchExtensionPortFeature',
+		ResultType: 2,
+		ToolTip: 'Set-VMSwitchExtensionPortFeature\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMSwitchExtensionSwitchFeature',
+		ListItemText: 'Set-VMSwitchExtensionSwitchFeature',
+		ResultType: 2,
+		ToolTip: 'Set-VMSwitchExtensionSwitchFeature\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMSwitchTeam',
+		ListItemText: 'Set-VMSwitchTeam',
+		ResultType: 2,
+		ToolTip: 'Set-VMSwitchTeam\\r\\n'
+	},
+	{
+		CompletionText: 'Set-VMVideo',
+		ListItemText: 'Set-VMVideo',
+		ResultType: 2,
+		ToolTip: 'Set-VMVideo\\r\\n'
+	},
+	{
+		CompletionText: 'Set-Volume',
+		ListItemText: 'Set-Volume',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-Volume \\r\\n'
+	},
+	{
+		CompletionText: 'Set-VolumeScrubPolicy',
+		ListItemText: 'Set-VolumeScrubPolicy',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-VolumeScrubPolicy \\r\\n'
+	},
+	{
+		CompletionText: 'Set-VpnConnection',
+		ListItemText: 'Set-VpnConnection',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-VpnConnection \\r\\n'
+	},
+	{
+		CompletionText: 'Set-VpnConnectionIPsecConfiguration',
+		ListItemText: 'Set-VpnConnectionIPsecConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-VpnConnectionIPsecConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Set-VpnConnectionProxy',
+		ListItemText: 'Set-VpnConnectionProxy',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-VpnConnectionProxy \\r\\n'
+	},
+	{
+		CompletionText: 'Set-VpnConnectionTriggerDnsConfiguration',
+		ListItemText: 'Set-VpnConnectionTriggerDnsConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-VpnConnectionTriggerDnsConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Set-VpnConnectionTriggerTrustedNetwork',
+		ListItemText: 'Set-VpnConnectionTriggerTrustedNetwork',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-VpnConnectionTriggerTrustedNetwork \\r\\n'
+	},
+	{
+		CompletionText: 'Set-WheaMemoryPolicy',
+		ListItemText: 'Set-WheaMemoryPolicy',
+		ResultType: 2,
+		ToolTip: 'Set-WheaMemoryPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Set-WinAcceptLanguageFromLanguageListOptOut',
+		ListItemText: 'Set-WinAcceptLanguageFromLanguageListOptOut',
+		ResultType: 2,
+		ToolTip: 'Set-WinAcceptLanguageFromLanguageListOptOut\\r\\n'
+	},
+	{
+		CompletionText: 'Set-WinCultureFromLanguageListOptOut',
+		ListItemText: 'Set-WinCultureFromLanguageListOptOut',
+		ResultType: 2,
+		ToolTip: 'Set-WinCultureFromLanguageListOptOut\\r\\n'
+	},
+	{
+		CompletionText: 'Set-WinDefaultInputMethodOverride',
+		ListItemText: 'Set-WinDefaultInputMethodOverride',
+		ResultType: 2,
+		ToolTip: 'Set-WinDefaultInputMethodOverride\\r\\n'
+	},
+	{
+		CompletionText: 'Set-WindowsEdition',
+		ListItemText: 'Set-WindowsEdition',
+		ResultType: 2,
+		ToolTip: 'Set-WindowsEdition\\r\\n'
+	},
+	{
+		CompletionText: 'Set-WindowsProductKey',
+		ListItemText: 'Set-WindowsProductKey',
+		ResultType: 2,
+		ToolTip: 'Set-WindowsProductKey\\r\\n'
+	},
+	{
+		CompletionText: 'Set-WindowsReservedStorageState',
+		ListItemText: 'Set-WindowsReservedStorageState',
+		ResultType: 2,
+		ToolTip: 'Set-WindowsReservedStorageState\\r\\n'
+	},
+	{
+		CompletionText: 'Set-WindowsSearchSetting',
+		ListItemText: 'Set-WindowsSearchSetting',
+		ResultType: 2,
+		ToolTip: 'Set-WindowsSearchSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Set-WinHomeLocation',
+		ListItemText: 'Set-WinHomeLocation',
+		ResultType: 2,
+		ToolTip: 'Set-WinHomeLocation\\r\\n'
+	},
+	{
+		CompletionText: 'Set-WinhttpProxy',
+		ListItemText: 'Set-WinhttpProxy',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-WinhttpProxy \\r\\n'
+	},
+	{
+		CompletionText: 'Set-WinLanguageBarOption',
+		ListItemText: 'Set-WinLanguageBarOption',
+		ResultType: 2,
+		ToolTip: 'Set-WinLanguageBarOption\\r\\n'
+	},
+	{
+		CompletionText: 'Set-WinSystemLocale',
+		ListItemText: 'Set-WinSystemLocale',
+		ResultType: 2,
+		ToolTip: 'Set-WinSystemLocale\\r\\n'
+	},
+	{
+		CompletionText: 'Set-WinUILanguageOverride',
+		ListItemText: 'Set-WinUILanguageOverride',
+		ResultType: 2,
+		ToolTip: 'Set-WinUILanguageOverride\\r\\n'
+	},
+	{
+		CompletionText: 'Set-WinUserLanguageList',
+		ListItemText: 'Set-WinUserLanguageList',
+		ResultType: 2,
+		ToolTip: 'Set-WinUserLanguageList\\r\\n'
+	},
+	{
+		CompletionText: 'Set-WSManInstance',
+		ListItemText: 'Set-WSManInstance',
+		ResultType: 2,
+		ToolTip: 'Set-WSManInstance\\r\\n'
+	},
+	{
+		CompletionText: 'Set-WSManQuickConfig',
+		ListItemText: 'Set-WSManQuickConfig',
+		ResultType: 2,
+		ToolTip: 'Set-WSManQuickConfig\\r\\n'
+	},
+	{
+		CompletionText: 'sethc.exe',
+		ListItemText: 'sethc.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\sethc.exe'
+	},
+	{
+		CompletionText: 'setspn.exe',
+		ListItemText: 'setspn.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\setspn.exe'
+	},
+	{
+		CompletionText: 'Setup',
+		ListItemText: 'Setup',
+		ResultType: 2,
+		ToolTip: '\\r\\nSetup \\r\\n'
+	},
+	{
+		CompletionText: 'setupcl.exe',
+		ListItemText: 'setupcl.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\setupcl.exe'
+	},
+	{
+		CompletionText: 'setupugc.exe',
+		ListItemText: 'setupugc.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\setupugc.exe'
+	},
+	{
+		CompletionText: 'setx.exe',
+		ListItemText: 'setx.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\setx.exe'
+	},
+	{
+		CompletionText: 'sfc.exe',
+		ListItemText: 'sfc.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\sfc.exe'
+	},
+	{
+		CompletionText: 'sftp.exe',
+		ListItemText: 'sftp.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\System32\\OpenSSH\\sftp.exe'
+	},
+	{
+		CompletionText: 'shcm',
+		ListItemText: 'shcm',
+		ResultType: 2,
+		ToolTip: 'Show-Command'
+	},
+	{
+		CompletionText: 'ShellAppRuntime.exe',
+		ListItemText: 'ShellAppRuntime.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\ShellAppRuntime.exe'
+	},
+	{
+		CompletionText: 'Should',
+		ListItemText: 'Should',
+		ResultType: 2,
+		ToolTip: '\\r\\nShould \\r\\n'
+	},
+	{
+		CompletionText: 'Show-Command',
+		ListItemText: 'Show-Command',
+		ResultType: 2,
+		ToolTip: '\\r\\nShow-Command [[-Name] <string>] [-Height <double>] [-Width <double>] [-NoCommonParameter] [-ErrorPopup] [-PassThru] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Show-Markdown',
+		ListItemText: 'Show-Markdown',
+		ResultType: 2,
+		ToolTip: '\\r\\nShow-Markdown [-Path] <string[]> [-UseBrowser] [<CommonParameters>]\\r\\n\\r\\nShow-Markdown -InputObject <psobject> [-UseBrowser] [<CommonParameters>]\\r\\n\\r\\nShow-Markdown -LiteralPath <string[]> [-UseBrowser] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Show-NetFirewallRule',
+		ListItemText: 'Show-NetFirewallRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nShow-NetFirewallRule \\r\\n'
+	},
+	{
+		CompletionText: 'Show-NetIPsecRule',
+		ListItemText: 'Show-NetIPsecRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nShow-NetIPsecRule \\r\\n'
+	},
+	{
+		CompletionText: 'Show-StorageHistory',
+		ListItemText: 'Show-StorageHistory',
+		ResultType: 2,
+		ToolTip: '\\r\\nShow-StorageHistory \\r\\n'
+	},
+	{
+		CompletionText: 'Show-VirtualDisk',
+		ListItemText: 'Show-VirtualDisk',
+		ResultType: 2,
+		ToolTip: '\\r\\nShow-VirtualDisk \\r\\n'
+	},
+	{
+		CompletionText: 'Show-WindowsDeveloperLicenseRegistration',
+		ListItemText: 'Show-WindowsDeveloperLicenseRegistration',
+		ResultType: 2,
+		ToolTip: 'Show-WindowsDeveloperLicenseRegistration\\r\\n'
+	},
+	{
+		CompletionText: 'shrpubw.exe',
+		ListItemText: 'shrpubw.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\shrpubw.exe'
+	},
+	{
+		CompletionText: 'shutdown.exe',
+		ListItemText: 'shutdown.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\shutdown.exe'
+	},
+	{
+		CompletionText: 'si',
+		ListItemText: 'si',
+		ResultType: 2,
+		ToolTip: 'Set-Item'
+	},
+	{
+		CompletionText: 'sigverif.exe',
+		ListItemText: 'sigverif.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\sigverif.exe'
+	},
+	{
+		CompletionText: 'SIHClient.exe',
+		ListItemText: 'SIHClient.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\SIHClient.exe'
+	},
+	{
+		CompletionText: 'sihost.exe',
+		ListItemText: 'sihost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\sihost.exe'
+	},
+	{
+		CompletionText: 'sl',
+		ListItemText: 'sl',
+		ResultType: 2,
+		ToolTip: 'Set-Location'
+	},
+	{
+		CompletionText: 'Slack.exe',
+		ListItemText: 'Slack.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\Slack.exe'
+	},
+	{
+		CompletionText: 'slcm',
+		ListItemText: 'slcm',
+		ResultType: 2,
+		ToolTip: 'slcm'
+	},
+	{
+		CompletionText: 'sleep',
+		ListItemText: 'sleep',
+		ResultType: 2,
+		ToolTip: 'Start-Sleep'
+	},
+	{
+		CompletionText: 'slg',
+		ListItemText: 'slg',
+		ResultType: 2,
+		ToolTip: 'slg'
+	},
+	{
+		CompletionText: 'SlideToShutDown.exe',
+		ListItemText: 'SlideToShutDown.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\SlideToShutDown.exe'
+	},
+	{
+		CompletionText: 'slmgr.vbs',
+		ListItemText: 'slmgr.vbs',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\slmgr.vbs'
+	},
+	{
+		CompletionText: 'sls',
+		ListItemText: 'sls',
+		ResultType: 2,
+		ToolTip: 'Select-String'
+	},
+	{
+		CompletionText: 'slu',
+		ListItemText: 'slu',
+		ResultType: 2,
+		ToolTip: 'slu'
+	},
+	{
+		CompletionText: 'slui.exe',
+		ListItemText: 'slui.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\slui.exe'
+	},
+	{
+		CompletionText: 'smartscreen.exe',
+		ListItemText: 'smartscreen.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\smartscreen.exe'
+	},
+	{
+		CompletionText: 'smss.exe',
+		ListItemText: 'smss.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\smss.exe'
+	},
+	{
+		CompletionText: 'SndVol.exe',
+		ListItemText: 'SndVol.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\SndVol.exe'
+	},
+	{
+		CompletionText: 'SnippingTool.exe',
+		ListItemText: 'SnippingTool.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\SnippingTool.exe'
+	},
+	{
+		CompletionText: 'snmptrap.exe',
+		ListItemText: 'snmptrap.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\snmptrap.exe'
+	},
+	{
+		CompletionText: 'sort',
+		ListItemText: 'sort',
+		ResultType: 2,
+		ToolTip: 'Sort-Object'
+	},
+	{
+		CompletionText: 'Sort-Object',
+		ListItemText: 'Sort-Object',
+		ResultType: 2,
+		ToolTip: '\\r\\nSort-Object [[-Property] <Object[]>] [-Stable] [-Descending] [-Unique] [-InputObject <psobject>] [-Culture <string>] [-CaseSensitive] [<CommonParameters>]\\r\\n\\r\\nSort-Object [[-Property] <Object[]>] -Top <int> [-Descending] [-Unique] [-InputObject <psobject>] [-Culture <string>] [-CaseSensitive] [<CommonParameters>]\\r\\n\\r\\nSort-Object [[-Property] <Object[]>] -Bottom <int> [-Descending] [-Unique] [-InputObject <psobject>] [-Culture <string>] [-CaseSensitive] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'sort.exe',
+		ListItemText: 'sort.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\sort.exe'
+	},
+	{
+		CompletionText: 'sp',
+		ListItemText: 'sp',
+		ResultType: 2,
+		ToolTip: 'Set-ItemProperty'
+	},
+	{
+		CompletionText: 'SpaceAgent.exe',
+		ListItemText: 'SpaceAgent.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\SpaceAgent.exe'
+	},
+	{
+		CompletionText: 'spaceman.exe',
+		ListItemText: 'spaceman.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\spaceman.exe'
+	},
+	{
+		CompletionText: 'spaceutil.exe',
+		ListItemText: 'spaceutil.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\spaceutil.exe'
+	},
+	{
+		CompletionText: 'SpatialAudioLicenseSrv.exe',
+		ListItemText: 'SpatialAudioLicenseSrv.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\SpatialAudioLicenseSrv.exe'
+	},
+	{
+		CompletionText: 'Spectrum.exe',
+		ListItemText: 'Spectrum.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\Spectrum.exe'
+	},
+	{
+		CompletionText: 'spjb',
+		ListItemText: 'spjb',
+		ResultType: 2,
+		ToolTip: 'Stop-Job'
+	},
+	{
+		CompletionText: 'Split-Path',
+		ListItemText: 'Split-Path',
+		ResultType: 2,
+		ToolTip: '\\r\\nSplit-Path [-Path] <string[]> [-Parent] [-Resolve] [-Credential <pscredential>] [<CommonParameters>]\\r\\n\\r\\nSplit-Path [-Path] <string[]> -Leaf [-Resolve] [-Credential <pscredential>] [<CommonParameters>]\\r\\n\\r\\nSplit-Path [-Path] <string[]> -LeafBase [-Resolve] [-Credential <pscredential>] [<CommonParameters>]\\r\\n\\r\\nSplit-Path [-Path] <string[]> -Extension [-Resolve] [-Credential <pscredential>] [<CommonParameters>]\\r\\n\\r\\nSplit-Path [-Path] <string[]> -Qualifier [-Resolve] [-Credential <pscredential>] [<CommonParameters>]\\r\\n\\r\\nSplit-Path [-Path] <string[]> -NoQualifier [-Resolve] [-Credential <pscredential>] [<CommonParameters>]\\r\\n\\r\\nSplit-Path [-Path] <string[]> -IsAbsolute [-Resolve] [-Credential <pscredential>] [<CommonParameters>]\\r\\n\\r\\nSplit-Path -LiteralPath <string[]> [-Resolve] [-Credential <pscredential>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Split-WindowsImage',
+		ListItemText: 'Split-WindowsImage',
+		ResultType: 2,
+		ToolTip: 'Split-WindowsImage\\r\\n'
+	},
+	{
+		CompletionText: 'splwow64.exe',
+		ListItemText: 'splwow64.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\splwow64.exe'
+	},
+	{
+		CompletionText: 'spoolsv.exe',
+		ListItemText: 'spoolsv.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\spoolsv.exe'
+	},
+	{
+		CompletionText: 'SppExtComObj.Exe',
+		ListItemText: 'SppExtComObj.Exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\SppExtComObj.Exe'
+	},
+	{
+		CompletionText: 'spps',
+		ListItemText: 'spps',
+		ResultType: 2,
+		ToolTip: 'Stop-Process'
+	},
+	{
+		CompletionText: 'sppsvc.exe',
+		ListItemText: 'sppsvc.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\sppsvc.exe'
+	},
+	{
+		CompletionText: 'spsv',
+		ListItemText: 'spsv',
+		ResultType: 2,
+		ToolTip: 'Stop-Service'
+	},
+	{
+		CompletionText: 'spvm',
+		ListItemText: 'spvm',
+		ResultType: 2,
+		ToolTip: 'spvm'
+	},
+	{
+		CompletionText: 'srdelayed.exe',
+		ListItemText: 'srdelayed.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\srdelayed.exe'
+	},
+	{
+		CompletionText: 'SrTasks.exe',
+		ListItemText: 'SrTasks.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\SrTasks.exe'
+	},
+	{
+		CompletionText: 'ssh-add.exe',
+		ListItemText: 'ssh-add.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\System32\\OpenSSH\\ssh-add.exe'
+	},
+	{
+		CompletionText: 'ssh-agent.exe',
+		ListItemText: 'ssh-agent.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\System32\\OpenSSH\\ssh-agent.exe'
+	},
+	{
+		CompletionText: 'ssh-keygen.exe',
+		ListItemText: 'ssh-keygen.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\System32\\OpenSSH\\ssh-keygen.exe'
+	},
+	{
+		CompletionText: 'ssh-keyscan.exe',
+		ListItemText: 'ssh-keyscan.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\System32\\OpenSSH\\ssh-keyscan.exe'
+	},
+	{
+		CompletionText: 'ssh.exe',
+		ListItemText: 'ssh.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\System32\\OpenSSH\\ssh.exe'
+	},
+	{
+		CompletionText: 'ssmbb',
+		ListItemText: 'ssmbb',
+		ResultType: 2,
+		ToolTip: 'ssmbb'
+	},
+	{
+		CompletionText: 'ssmbcc',
+		ListItemText: 'ssmbcc',
+		ResultType: 2,
+		ToolTip: 'ssmbcc'
+	},
+	{
+		CompletionText: 'ssmbccm',
+		ListItemText: 'ssmbccm',
+		ResultType: 2,
+		ToolTip: 'ssmbccm'
+	},
+	{
+		CompletionText: 'ssmbp',
+		ListItemText: 'ssmbp',
+		ResultType: 2,
+		ToolTip: 'ssmbp'
+	},
+	{
+		CompletionText: 'ssmbs',
+		ListItemText: 'ssmbs',
+		ResultType: 2,
+		ToolTip: 'ssmbs'
+	},
+	{
+		CompletionText: 'ssmbsc',
+		ListItemText: 'ssmbsc',
+		ResultType: 2,
+		ToolTip: 'ssmbsc'
+	},
+	{
+		CompletionText: 'ssmbscm',
+		ListItemText: 'ssmbscm',
+		ResultType: 2,
+		ToolTip: 'ssmbscm'
+	},
+	{
+		CompletionText: 'starship.exe',
+		ListItemText: 'starship.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\starship\\bin\\starship.exe'
+	},
+	{
+		CompletionText: 'start',
+		ListItemText: 'start',
+		ResultType: 2,
+		ToolTip: 'Start-Process'
+	},
+	{
+		CompletionText: 'Start-AppBackgroundTask',
+		ListItemText: 'Start-AppBackgroundTask',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-AppBackgroundTask \\r\\n'
+	},
+	{
+		CompletionText: 'Start-AppvVirtualProcess',
+		ListItemText: 'Start-AppvVirtualProcess',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-AppvVirtualProcess \\r\\n'
+	},
+	{
+		CompletionText: 'Start-ASRApplyRecoveryPoint',
+		ListItemText: 'Start-ASRApplyRecoveryPoint',
+		ResultType: 2,
+		ToolTip: 'Start-ASRApplyRecoveryPoint'
+	},
+	{
+		CompletionText: 'Start-ASRCancelFailover',
+		ListItemText: 'Start-ASRCancelFailover',
+		ResultType: 2,
+		ToolTip: 'Start-ASRCancelFailover'
+	},
+	{
+		CompletionText: 'Start-ASRCancelFailoverJob',
+		ListItemText: 'Start-ASRCancelFailoverJob',
+		ResultType: 2,
+		ToolTip: 'Start-ASRCancelFailoverJob'
+	},
+	{
+		CompletionText: 'Start-ASRCommitFailover',
+		ListItemText: 'Start-ASRCommitFailover',
+		ResultType: 2,
+		ToolTip: 'Start-ASRCommitFailover'
+	},
+	{
+		CompletionText: 'Start-ASRCommitFailoverJob',
+		ListItemText: 'Start-ASRCommitFailoverJob',
+		ResultType: 2,
+		ToolTip: 'Start-ASRCommitFailoverJob'
+	},
+	{
+		CompletionText: 'Start-ASRFO',
+		ListItemText: 'Start-ASRFO',
+		ResultType: 2,
+		ToolTip: 'Start-ASRFO'
+	},
+	{
+		CompletionText: 'Start-ASRPFO',
+		ListItemText: 'Start-ASRPFO',
+		ResultType: 2,
+		ToolTip: 'Start-ASRPFO'
+	},
+	{
+		CompletionText: 'Start-ASRPlannedFailoverJob',
+		ListItemText: 'Start-ASRPlannedFailoverJob',
+		ResultType: 2,
+		ToolTip: 'Start-ASRPlannedFailoverJob'
+	},
+	{
+		CompletionText: 'Start-ASRResynchronizeReplicationJob',
+		ListItemText: 'Start-ASRResynchronizeReplicationJob',
+		ResultType: 2,
+		ToolTip: 'Start-ASRResynchronizeReplicationJob'
+	},
+	{
+		CompletionText: 'Start-ASRResyncJob',
+		ListItemText: 'Start-ASRResyncJob',
+		ResultType: 2,
+		ToolTip: 'Start-ASRResyncJob'
+	},
+	{
+		CompletionText: 'Start-ASRSwitchAppliance',
+		ListItemText: 'Start-ASRSwitchAppliance',
+		ResultType: 2,
+		ToolTip: 'Start-ASRSwitchAppliance'
+	},
+	{
+		CompletionText: 'Start-ASRSwitchProcessServerJob',
+		ListItemText: 'Start-ASRSwitchProcessServerJob',
+		ResultType: 2,
+		ToolTip: 'Start-ASRSwitchProcessServerJob'
+	},
+	{
+		CompletionText: 'Start-ASRTestFailoverCleanupJob',
+		ListItemText: 'Start-ASRTestFailoverCleanupJob',
+		ResultType: 2,
+		ToolTip: 'Start-ASRTestFailoverCleanupJob'
+	},
+	{
+		CompletionText: 'Start-ASRTestFailoverJob',
+		ListItemText: 'Start-ASRTestFailoverJob',
+		ResultType: 2,
+		ToolTip: 'Start-ASRTestFailoverJob'
+	},
+	{
+		CompletionText: 'Start-ASRTFO',
+		ListItemText: 'Start-ASRTFO',
+		ResultType: 2,
+		ToolTip: 'Start-ASRTFO'
+	},
+	{
+		CompletionText: 'Start-ASRTFOCleanupJob',
+		ListItemText: 'Start-ASRTFOCleanupJob',
+		ResultType: 2,
+		ToolTip: 'Start-ASRTFOCleanupJob'
+	},
+	{
+		CompletionText: 'Start-ASRUnplannedFailoverJob',
+		ListItemText: 'Start-ASRUnplannedFailoverJob',
+		ResultType: 2,
+		ToolTip: 'Start-ASRUnplannedFailoverJob'
+	},
+	{
+		CompletionText: 'Start-AutologgerConfig',
+		ListItemText: 'Start-AutologgerConfig',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-AutologgerConfig \\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzAksCluster',
+		ListItemText: 'Start-AzAksCluster',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-AzAksCluster \\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzAksDashboard',
+		ListItemText: 'Start-AzAksDashboard',
+		ResultType: 2,
+		ToolTip: 'Start-AzAksDashboard\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzAksManagedClusterCommand',
+		ListItemText: 'Start-AzAksManagedClusterCommand',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-AzAksManagedClusterCommand \\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzApplicationGateway',
+		ListItemText: 'Start-AzApplicationGateway',
+		ResultType: 2,
+		ToolTip: 'Start-AzApplicationGateway\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzAutomationDscCompilationJob',
+		ListItemText: 'Start-AzAutomationDscCompilationJob',
+		ResultType: 2,
+		ToolTip: 'Start-AzAutomationDscCompilationJob\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzAutomationDscNodeConfigurationDeployment',
+		ListItemText: 'Start-AzAutomationDscNodeConfigurationDeployment',
+		ResultType: 2,
+		ToolTip: 'Start-AzAutomationDscNodeConfigurationDeployment\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzAutomationRunbook',
+		ListItemText: 'Start-AzAutomationRunbook',
+		ResultType: 2,
+		ToolTip: 'Start-AzAutomationRunbook\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzAutomationSourceControlSyncJob',
+		ListItemText: 'Start-AzAutomationSourceControlSyncJob',
+		ResultType: 2,
+		ToolTip: 'Start-AzAutomationSourceControlSyncJob\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzBatchComputeNodeServiceLogUpload',
+		ListItemText: 'Start-AzBatchComputeNodeServiceLogUpload',
+		ResultType: 2,
+		ToolTip: 'Start-AzBatchComputeNodeServiceLogUpload\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzBatchPoolResize',
+		ListItemText: 'Start-AzBatchPoolResize',
+		ResultType: 2,
+		ToolTip: 'Start-AzBatchPoolResize\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzCdnEndpoint',
+		ListItemText: 'Start-AzCdnEndpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-AzCdnEndpoint \\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzCloudService',
+		ListItemText: 'Start-AzCloudService',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-AzCloudService \\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzContainerGroup',
+		ListItemText: 'Start-AzContainerGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-AzContainerGroup \\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzDataFactoryV2DataFlowDebugSession',
+		ListItemText: 'Start-AzDataFactoryV2DataFlowDebugSession',
+		ResultType: 2,
+		ToolTip: 'Start-AzDataFactoryV2DataFlowDebugSession\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzDataFactoryV2IntegrationRuntime',
+		ListItemText: 'Start-AzDataFactoryV2IntegrationRuntime',
+		ResultType: 2,
+		ToolTip: 'Start-AzDataFactoryV2IntegrationRuntime\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzDataFactoryV2Trigger',
+		ListItemText: 'Start-AzDataFactoryV2Trigger',
+		ResultType: 2,
+		ToolTip: 'Start-AzDataFactoryV2Trigger\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzDataProtectionBackupInstanceRestore',
+		ListItemText: 'Start-AzDataProtectionBackupInstanceRestore',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-AzDataProtectionBackupInstanceRestore \\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzDataShareSubscriptionSynchronization',
+		ListItemText: 'Start-AzDataShareSubscriptionSynchronization',
+		ResultType: 2,
+		ToolTip: 'Start-AzDataShareSubscriptionSynchronization\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzFrontDoorCdnProfilePrepareMigration',
+		ListItemText: 'Start-AzFrontDoorCdnProfilePrepareMigration',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-AzFrontDoorCdnProfilePrepareMigration \\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzFunctionApp',
+		ListItemText: 'Start-AzFunctionApp',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-AzFunctionApp \\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzHDInsightJob',
+		ListItemText: 'Start-AzHDInsightJob',
+		ResultType: 2,
+		ToolTip: 'Start-AzHDInsightJob\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzJitNetworkAccessPolicy',
+		ListItemText: 'Start-AzJitNetworkAccessPolicy',
+		ResultType: 2,
+		ToolTip: 'Start-AzJitNetworkAccessPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzKustoCluster',
+		ListItemText: 'Start-AzKustoCluster',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-AzKustoCluster \\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzLogicApp',
+		ListItemText: 'Start-AzLogicApp',
+		ResultType: 2,
+		ToolTip: 'Start-AzLogicApp\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzMigrateServerMigration',
+		ListItemText: 'Start-AzMigrateServerMigration',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-AzMigrateServerMigration \\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzMigrateTestMigration',
+		ListItemText: 'Start-AzMigrateTestMigration',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-AzMigrateTestMigration \\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzMigrateTestMigrationCleanup',
+		ListItemText: 'Start-AzMigrateTestMigrationCleanup',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-AzMigrateTestMigrationCleanup \\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzMLWorkspaceCompute',
+		ListItemText: 'Start-AzMLWorkspaceCompute',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-AzMLWorkspaceCompute \\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzMySqlFlexibleServer',
+		ListItemText: 'Start-AzMySqlFlexibleServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-AzMySqlFlexibleServer \\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzNetworkWatcherConnectionMonitor',
+		ListItemText: 'Start-AzNetworkWatcherConnectionMonitor',
+		ResultType: 2,
+		ToolTip: 'Start-AzNetworkWatcherConnectionMonitor\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzNetworkWatcherResourceTroubleshooting',
+		ListItemText: 'Start-AzNetworkWatcherResourceTroubleshooting',
+		ResultType: 2,
+		ToolTip: 'Start-AzNetworkWatcherResourceTroubleshooting\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzPolicyComplianceScan',
+		ListItemText: 'Start-AzPolicyComplianceScan',
+		ResultType: 2,
+		ToolTip: 'Start-AzPolicyComplianceScan\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzPolicyRemediation',
+		ListItemText: 'Start-AzPolicyRemediation',
+		ResultType: 2,
+		ToolTip: 'Start-AzPolicyRemediation\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzPostgreSqlFlexibleServer',
+		ListItemText: 'Start-AzPostgreSqlFlexibleServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-AzPostgreSqlFlexibleServer \\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzRecoveryServicesAsrApplyRecoveryPoint',
+		ListItemText: 'Start-AzRecoveryServicesAsrApplyRecoveryPoint',
+		ResultType: 2,
+		ToolTip: 'Start-AzRecoveryServicesAsrApplyRecoveryPoint\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzRecoveryServicesAsrCancelFailoverJob',
+		ListItemText: 'Start-AzRecoveryServicesAsrCancelFailoverJob',
+		ResultType: 2,
+		ToolTip: 'Start-AzRecoveryServicesAsrCancelFailoverJob\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzRecoveryServicesAsrCommitFailoverJob',
+		ListItemText: 'Start-AzRecoveryServicesAsrCommitFailoverJob',
+		ResultType: 2,
+		ToolTip: 'Start-AzRecoveryServicesAsrCommitFailoverJob\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzRecoveryServicesAsrPlannedFailoverJob',
+		ListItemText: 'Start-AzRecoveryServicesAsrPlannedFailoverJob',
+		ResultType: 2,
+		ToolTip: 'Start-AzRecoveryServicesAsrPlannedFailoverJob\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzRecoveryServicesAsrResynchronizeReplicationJob',
+		ListItemText: 'Start-AzRecoveryServicesAsrResynchronizeReplicationJob',
+		ResultType: 2,
+		ToolTip: 'Start-AzRecoveryServicesAsrResynchronizeReplicationJob\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzRecoveryServicesAsrSwitchAppliance',
+		ListItemText: 'Start-AzRecoveryServicesAsrSwitchAppliance',
+		ResultType: 2,
+		ToolTip: 'Start-AzRecoveryServicesAsrSwitchAppliance\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzRecoveryServicesAsrSwitchProcessServerJob',
+		ListItemText: 'Start-AzRecoveryServicesAsrSwitchProcessServerJob',
+		ResultType: 2,
+		ToolTip: 'Start-AzRecoveryServicesAsrSwitchProcessServerJob\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzRecoveryServicesAsrTestFailoverCleanupJob',
+		ListItemText: 'Start-AzRecoveryServicesAsrTestFailoverCleanupJob',
+		ResultType: 2,
+		ToolTip: 'Start-AzRecoveryServicesAsrTestFailoverCleanupJob\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzRecoveryServicesAsrTestFailoverJob',
+		ListItemText: 'Start-AzRecoveryServicesAsrTestFailoverJob',
+		ResultType: 2,
+		ToolTip: 'Start-AzRecoveryServicesAsrTestFailoverJob\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzRecoveryServicesAsrUnplannedFailoverJob',
+		ListItemText: 'Start-AzRecoveryServicesAsrUnplannedFailoverJob',
+		ResultType: 2,
+		ToolTip: 'Start-AzRecoveryServicesAsrUnplannedFailoverJob\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzServiceBusMigration',
+		ListItemText: 'Start-AzServiceBusMigration',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-AzServiceBusMigration \\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzSqlDatabaseExecuteIndexRecommendation',
+		ListItemText: 'Start-AzSqlDatabaseExecuteIndexRecommendation',
+		ResultType: 2,
+		ToolTip: 'Start-AzSqlDatabaseExecuteIndexRecommendation\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzSqlDatabaseVulnerabilityAssessmentScan',
+		ListItemText: 'Start-AzSqlDatabaseVulnerabilityAssessmentScan',
+		ResultType: 2,
+		ToolTip: 'Start-AzSqlDatabaseVulnerabilityAssessmentScan\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzSqlElasticJob',
+		ListItemText: 'Start-AzSqlElasticJob',
+		ResultType: 2,
+		ToolTip: 'Start-AzSqlElasticJob\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzSqlInstanceDatabaseLogReplay',
+		ListItemText: 'Start-AzSqlInstanceDatabaseLogReplay',
+		ResultType: 2,
+		ToolTip: 'Start-AzSqlInstanceDatabaseLogReplay\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzSqlInstanceDatabaseVulnerabilityAssessmentScan',
+		ListItemText: 'Start-AzSqlInstanceDatabaseVulnerabilityAssessmentScan',
+		ResultType: 2,
+		ToolTip: 'Start-AzSqlInstanceDatabaseVulnerabilityAssessmentScan\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzSqlSyncGroupSync',
+		ListItemText: 'Start-AzSqlSyncGroupSync',
+		ResultType: 2,
+		ToolTip: 'Start-AzSqlSyncGroupSync\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzSqlVMAssessment',
+		ListItemText: 'Start-AzSqlVMAssessment',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-AzSqlVMAssessment \\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzStorageBlobCopy',
+		ListItemText: 'Start-AzStorageBlobCopy',
+		ResultType: 2,
+		ToolTip: 'Start-AzStorageBlobCopy\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzStorageBlobIncrementalCopy',
+		ListItemText: 'Start-AzStorageBlobIncrementalCopy',
+		ResultType: 2,
+		ToolTip: 'Start-AzStorageBlobIncrementalCopy\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzStorageFileCopy',
+		ListItemText: 'Start-AzStorageFileCopy',
+		ResultType: 2,
+		ToolTip: 'Start-AzStorageFileCopy\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzStorageMoverJobDefinition',
+		ListItemText: 'Start-AzStorageMoverJobDefinition',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-AzStorageMoverJobDefinition \\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzStreamAnalyticsJob',
+		ListItemText: 'Start-AzStreamAnalyticsJob',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-AzStreamAnalyticsJob \\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzSynapseDataFlowDebugSession',
+		ListItemText: 'Start-AzSynapseDataFlowDebugSession',
+		ResultType: 2,
+		ToolTip: 'Start-AzSynapseDataFlowDebugSession\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzSynapseIntegrationRuntime',
+		ListItemText: 'Start-AzSynapseIntegrationRuntime',
+		ResultType: 2,
+		ToolTip: 'Start-AzSynapseIntegrationRuntime\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzSynapseKustoPool',
+		ListItemText: 'Start-AzSynapseKustoPool',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-AzSynapseKustoPool \\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzSynapseLinkConnection',
+		ListItemText: 'Start-AzSynapseLinkConnection',
+		ResultType: 2,
+		ToolTip: 'Start-AzSynapseLinkConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzSynapseSparkSession',
+		ListItemText: 'Start-AzSynapseSparkSession',
+		ResultType: 2,
+		ToolTip: 'Start-AzSynapseSparkSession\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzSynapseSqlPoolVulnerabilityAssessmentScan',
+		ListItemText: 'Start-AzSynapseSqlPoolVulnerabilityAssessmentScan',
+		ResultType: 2,
+		ToolTip: 'Start-AzSynapseSqlPoolVulnerabilityAssessmentScan\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzSynapseTrigger',
+		ListItemText: 'Start-AzSynapseTrigger',
+		ResultType: 2,
+		ToolTip: 'Start-AzSynapseTrigger\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzTenantBackfill',
+		ListItemText: 'Start-AzTenantBackfill',
+		ResultType: 2,
+		ToolTip: 'Start-AzTenantBackfill\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzVirtualNetworkGatewayConnectionPacketCapture',
+		ListItemText: 'Start-AzVirtualNetworkGatewayConnectionPacketCapture',
+		ResultType: 2,
+		ToolTip: 'Start-AzVirtualNetworkGatewayConnectionPacketCapture\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzVirtualNetworkGatewayPacketCapture',
+		ListItemText: 'Start-AzVirtualNetworkGatewayPacketCapture',
+		ResultType: 2,
+		ToolTip: 'Start-AzVirtualNetworkGatewayPacketCapture\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzVM',
+		ListItemText: 'Start-AzVM',
+		ResultType: 2,
+		ToolTip: 'Start-AzVM\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzVmss',
+		ListItemText: 'Start-AzVmss',
+		ResultType: 2,
+		ToolTip: 'Start-AzVmss\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzVmssRollingExtensionUpgrade',
+		ListItemText: 'Start-AzVmssRollingExtensionUpgrade',
+		ResultType: 2,
+		ToolTip: 'Start-AzVmssRollingExtensionUpgrade\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzVmssRollingOSUpgrade',
+		ListItemText: 'Start-AzVmssRollingOSUpgrade',
+		ResultType: 2,
+		ToolTip: 'Start-AzVmssRollingOSUpgrade\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzVpnConnectionPacketCapture',
+		ListItemText: 'Start-AzVpnConnectionPacketCapture',
+		ResultType: 2,
+		ToolTip: 'Start-AzVpnConnectionPacketCapture\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzVpnGatewayPacketCapture',
+		ListItemText: 'Start-AzVpnGatewayPacketCapture',
+		ResultType: 2,
+		ToolTip: 'Start-AzVpnGatewayPacketCapture\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzWebApp',
+		ListItemText: 'Start-AzWebApp',
+		ResultType: 2,
+		ToolTip: 'Start-AzWebApp\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzWebAppContinuousWebJob',
+		ListItemText: 'Start-AzWebAppContinuousWebJob',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-AzWebAppContinuousWebJob \\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzWebAppSlot',
+		ListItemText: 'Start-AzWebAppSlot',
+		ResultType: 2,
+		ToolTip: 'Start-AzWebAppSlot\\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzWebAppSlotContinuousWebJob',
+		ListItemText: 'Start-AzWebAppSlotContinuousWebJob',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-AzWebAppSlotContinuousWebJob \\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzWebAppSlotTriggeredWebJob',
+		ListItemText: 'Start-AzWebAppSlotTriggeredWebJob',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-AzWebAppSlotTriggeredWebJob \\r\\n'
+	},
+	{
+		CompletionText: 'Start-AzWebAppTriggeredWebJob',
+		ListItemText: 'Start-AzWebAppTriggeredWebJob',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-AzWebAppTriggeredWebJob \\r\\n'
+	},
+	{
+		CompletionText: 'Start-BitsTransfer',
+		ListItemText: 'Start-BitsTransfer',
+		ResultType: 2,
+		ToolTip: 'Start-BitsTransfer\\r\\n'
+	},
+	{
+		CompletionText: 'Start-CopyAzureStorageBlob',
+		ListItemText: 'Start-CopyAzureStorageBlob',
+		ResultType: 2,
+		ToolTip: 'Start-CopyAzureStorageBlob'
+	},
+	{
+		CompletionText: 'Start-DscConfiguration',
+		ListItemText: 'Start-DscConfiguration',
+		ResultType: 2,
+		ToolTip: 'Start-DscConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Start-Dtc',
+		ListItemText: 'Start-Dtc',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-Dtc \\r\\n'
+	},
+	{
+		CompletionText: 'Start-DtcDiagnosticResourceManager',
+		ListItemText: 'Start-DtcDiagnosticResourceManager',
+		ResultType: 2,
+		ToolTip: 'Start-DtcDiagnosticResourceManager\\r\\n'
+	},
+	{
+		CompletionText: 'Start-DtcTransactionsTraceSession',
+		ListItemText: 'Start-DtcTransactionsTraceSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-DtcTransactionsTraceSession \\r\\n'
+	},
+	{
+		CompletionText: 'Start-EtwTraceSession',
+		ListItemText: 'Start-EtwTraceSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-EtwTraceSession \\r\\n'
+	},
+	{
+		CompletionText: 'Start-Job',
+		ListItemText: 'Start-Job',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-Job [-ScriptBlock] <scriptblock> [[-InitializationScript] <scriptblock>] [-Name <string>] [-Credential <pscredential>] [-Authentication <AuthenticationMechanism>] [-WorkingDirectory <string>] [-RunAs32] [-PSVersion <version>] [-InputObject <psobject>] [-ArgumentList <Object[]>] [<CommonParameters>]\\r\\n\\r\\nStart-Job [-DefinitionName] <string> [[-DefinitionPath] <string>] [[-Type] <string>] [-WorkingDirectory <string>] [<CommonParameters>]\\r\\n\\r\\nStart-Job [-FilePath] <string> [[-InitializationScript] <scriptblock>] [-Name <string>] [-Credential <pscredential>] [-Authentication <AuthenticationMechanism>] [-WorkingDirectory <string>] [-RunAs32] [-PSVersion <version>] [-InputObject <psobject>] [-ArgumentList <Object[]>] [<CommonParameters>]\\r\\n\\r\\nStart-Job [[-InitializationScript] <scriptblock>] -LiteralPath <string> [-Name <string>] [-Credential <pscredential>] [-Authentication <AuthenticationMechanism>] [-WorkingDirectory <string>] [-RunAs32] [-PSVersion <version>] [-InputObject <psobject>] [-ArgumentList <Object[]>] [<CommonParameters>]\\r\\n\\r\\nStart-Job [-WorkingDirectory <string>] [-ConnectingTimeout <int>] [-Options <hashtable>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Start-MpRollback',
+		ListItemText: 'Start-MpRollback',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-MpRollback \\r\\n'
+	},
+	{
+		CompletionText: 'Start-MpScan',
+		ListItemText: 'Start-MpScan',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-MpScan \\r\\n'
+	},
+	{
+		CompletionText: 'Start-MpWDOScan',
+		ListItemText: 'Start-MpWDOScan',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-MpWDOScan \\r\\n'
+	},
+	{
+		CompletionText: 'Start-NetEventSession',
+		ListItemText: 'Start-NetEventSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-NetEventSession \\r\\n'
+	},
+	{
+		CompletionText: 'Start-OSUninstall',
+		ListItemText: 'Start-OSUninstall',
+		ResultType: 2,
+		ToolTip: 'Start-OSUninstall\\r\\n'
+	},
+	{
+		CompletionText: 'Start-PcsvDevice',
+		ListItemText: 'Start-PcsvDevice',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-PcsvDevice \\r\\n'
+	},
+	{
+		CompletionText: 'Start-Process',
+		ListItemText: 'Start-Process',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-Process [-FilePath] <string> [[-ArgumentList] <string[]>] [-Credential <pscredential>] [-WorkingDirectory <string>] [-LoadUserProfile] [-NoNewWindow] [-PassThru] [-RedirectStandardError <string>] [-RedirectStandardInput <string>] [-RedirectStandardOutput <string>] [-WindowStyle <ProcessWindowStyle>] [-Wait] [-UseNewEnvironment] [-Environment <hashtable>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nStart-Process [-FilePath] <string> [[-ArgumentList] <string[]>] [-WorkingDirectory <string>] [-PassThru] [-Verb <string>] [-WindowStyle <ProcessWindowStyle>] [-Wait] [-Environment <hashtable>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Start-ScheduledTask',
+		ListItemText: 'Start-ScheduledTask',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-ScheduledTask \\r\\n'
+	},
+	{
+		CompletionText: 'Start-Service',
+		ListItemText: 'Start-Service',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-Service [-InputObject] <ServiceController[]> [-PassThru] [-Include <string[]>] [-Exclude <string[]>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nStart-Service [-Name] <string[]> [-PassThru] [-Include <string[]>] [-Exclude <string[]>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nStart-Service -DisplayName <string[]> [-PassThru] [-Include <string[]>] [-Exclude <string[]>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Start-Sleep',
+		ListItemText: 'Start-Sleep',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-Sleep [-Seconds] <double> [<CommonParameters>]\\r\\n\\r\\nStart-Sleep -Milliseconds <int> [<CommonParameters>]\\r\\n\\r\\nStart-Sleep [-Duration] <timespan> [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'start-ssh-agent.cmd',
+		ListItemText: 'start-ssh-agent.cmd',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Git\\cmd\\start-ssh-agent.cmd'
+	},
+	{
+		CompletionText: 'start-ssh-pageant.cmd',
+		ListItemText: 'start-ssh-pageant.cmd',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Git\\cmd\\start-ssh-pageant.cmd'
+	},
+	{
+		CompletionText: 'Start-StorageDiagnosticLog',
+		ListItemText: 'Start-StorageDiagnosticLog',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-StorageDiagnosticLog \\r\\n'
+	},
+	{
+		CompletionText: 'Start-ThreadJob',
+		ListItemText: 'Start-ThreadJob',
+		ResultType: 2,
+		ToolTip: 'Start-ThreadJob\\r\\n'
+	},
+	{
+		CompletionText: 'Start-Trace',
+		ListItemText: 'Start-Trace',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-Trace \\r\\n'
+	},
+	{
+		CompletionText: 'Start-Transcript',
+		ListItemText: 'Start-Transcript',
+		ResultType: 2,
+		ToolTip: 'Start-Transcript\\r\\n'
+	},
+	{
+		CompletionText: 'Start-VM',
+		ListItemText: 'Start-VM',
+		ResultType: 2,
+		ToolTip: 'Start-VM\\r\\n'
+	},
+	{
+		CompletionText: 'Start-VMFailover',
+		ListItemText: 'Start-VMFailover',
+		ResultType: 2,
+		ToolTip: 'Start-VMFailover\\r\\n'
+	},
+	{
+		CompletionText: 'Start-VMInitialReplication',
+		ListItemText: 'Start-VMInitialReplication',
+		ResultType: 2,
+		ToolTip: 'Start-VMInitialReplication\\r\\n'
+	},
+	{
+		CompletionText: 'Start-VMTrace',
+		ListItemText: 'Start-VMTrace',
+		ResultType: 2,
+		ToolTip: 'Start-VMTrace\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AdlJob',
+		ListItemText: 'Stop-AdlJob',
+		ResultType: 2,
+		ToolTip: 'Stop-AdlJob'
+	},
+	{
+		CompletionText: 'Stop-ASRJob',
+		ListItemText: 'Stop-ASRJob',
+		ResultType: 2,
+		ToolTip: 'Stop-ASRJob'
+	},
+	{
+		CompletionText: 'Stop-AzAksCluster',
+		ListItemText: 'Stop-AzAksCluster',
+		ResultType: 2,
+		ToolTip: '\\r\\nStop-AzAksCluster \\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzAksDashboard',
+		ListItemText: 'Stop-AzAksDashboard',
+		ResultType: 2,
+		ToolTip: 'Stop-AzAksDashboard\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzApplicationGateway',
+		ListItemText: 'Stop-AzApplicationGateway',
+		ResultType: 2,
+		ToolTip: 'Stop-AzApplicationGateway\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzAutomationDscNodeConfigurationDeployment',
+		ListItemText: 'Stop-AzAutomationDscNodeConfigurationDeployment',
+		ResultType: 2,
+		ToolTip: 'Stop-AzAutomationDscNodeConfigurationDeployment\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzAutomationJob',
+		ListItemText: 'Stop-AzAutomationJob',
+		ResultType: 2,
+		ToolTip: 'Stop-AzAutomationJob\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzBatchCertificateDeletion',
+		ListItemText: 'Stop-AzBatchCertificateDeletion',
+		ResultType: 2,
+		ToolTip: 'Stop-AzBatchCertificateDeletion\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzBatchJob',
+		ListItemText: 'Stop-AzBatchJob',
+		ResultType: 2,
+		ToolTip: 'Stop-AzBatchJob\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzBatchJobSchedule',
+		ListItemText: 'Stop-AzBatchJobSchedule',
+		ResultType: 2,
+		ToolTip: 'Stop-AzBatchJobSchedule\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzBatchPoolResize',
+		ListItemText: 'Stop-AzBatchPoolResize',
+		ResultType: 2,
+		ToolTip: 'Stop-AzBatchPoolResize\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzBatchTask',
+		ListItemText: 'Stop-AzBatchTask',
+		ResultType: 2,
+		ToolTip: 'Stop-AzBatchTask\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzCdnEndpoint',
+		ListItemText: 'Stop-AzCdnEndpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nStop-AzCdnEndpoint \\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzCloudService',
+		ListItemText: 'Stop-AzCloudService',
+		ResultType: 2,
+		ToolTip: '\\r\\nStop-AzCloudService \\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzContainerGroup',
+		ListItemText: 'Stop-AzContainerGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nStop-AzContainerGroup \\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzDataFactoryV2DataFlowDebugSession',
+		ListItemText: 'Stop-AzDataFactoryV2DataFlowDebugSession',
+		ResultType: 2,
+		ToolTip: 'Stop-AzDataFactoryV2DataFlowDebugSession\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzDataFactoryV2IntegrationRuntime',
+		ListItemText: 'Stop-AzDataFactoryV2IntegrationRuntime',
+		ResultType: 2,
+		ToolTip: 'Stop-AzDataFactoryV2IntegrationRuntime\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzDataFactoryV2PipelineRun',
+		ListItemText: 'Stop-AzDataFactoryV2PipelineRun',
+		ResultType: 2,
+		ToolTip: 'Stop-AzDataFactoryV2PipelineRun\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzDataFactoryV2Trigger',
+		ListItemText: 'Stop-AzDataFactoryV2Trigger',
+		ResultType: 2,
+		ToolTip: 'Stop-AzDataFactoryV2Trigger\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzDataFactoryV2TriggerRun',
+		ListItemText: 'Stop-AzDataFactoryV2TriggerRun',
+		ResultType: 2,
+		ToolTip: 'Stop-AzDataFactoryV2TriggerRun\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzDataLakeAnalyticsJob',
+		ListItemText: 'Stop-AzDataLakeAnalyticsJob',
+		ResultType: 2,
+		ToolTip: 'Stop-AzDataLakeAnalyticsJob\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzDataProtectionBackupInstanceProtection',
+		ListItemText: 'Stop-AzDataProtectionBackupInstanceProtection',
+		ResultType: 2,
+		ToolTip: '\\r\\nStop-AzDataProtectionBackupInstanceProtection \\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzDataShareSubscriptionSynchronization',
+		ListItemText: 'Stop-AzDataShareSubscriptionSynchronization',
+		ResultType: 2,
+		ToolTip: 'Stop-AzDataShareSubscriptionSynchronization\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzDeployment',
+		ListItemText: 'Stop-AzDeployment',
+		ResultType: 2,
+		ToolTip: 'Stop-AzDeployment\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzDeploymentManagerRollout',
+		ListItemText: 'Stop-AzDeploymentManagerRollout',
+		ResultType: 2,
+		ToolTip: 'Stop-AzDeploymentManagerRollout\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzFrontDoorCdnProfileMigration',
+		ListItemText: 'Stop-AzFrontDoorCdnProfileMigration',
+		ResultType: 2,
+		ToolTip: '\\r\\nStop-AzFrontDoorCdnProfileMigration \\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzFunctionApp',
+		ListItemText: 'Stop-AzFunctionApp',
+		ResultType: 2,
+		ToolTip: '\\r\\nStop-AzFunctionApp \\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzHDInsightJob',
+		ListItemText: 'Stop-AzHDInsightJob',
+		ResultType: 2,
+		ToolTip: 'Stop-AzHDInsightJob\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzKeyVaultCertificateOperation',
+		ListItemText: 'Stop-AzKeyVaultCertificateOperation',
+		ResultType: 2,
+		ToolTip: 'Stop-AzKeyVaultCertificateOperation\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzKustoCluster',
+		ListItemText: 'Stop-AzKustoCluster',
+		ResultType: 2,
+		ToolTip: '\\r\\nStop-AzKustoCluster \\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzLogicAppRun',
+		ListItemText: 'Stop-AzLogicAppRun',
+		ResultType: 2,
+		ToolTip: 'Stop-AzLogicAppRun\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzManagementGroupDeployment',
+		ListItemText: 'Stop-AzManagementGroupDeployment',
+		ResultType: 2,
+		ToolTip: 'Stop-AzManagementGroupDeployment\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzMarketplaceTerms',
+		ListItemText: 'Stop-AzMarketplaceTerms',
+		ResultType: 2,
+		ToolTip: '\\r\\nStop-AzMarketplaceTerms \\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzMLWorkspaceCompute',
+		ListItemText: 'Stop-AzMLWorkspaceCompute',
+		ResultType: 2,
+		ToolTip: '\\r\\nStop-AzMLWorkspaceCompute \\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzMLWorkspaceJob',
+		ListItemText: 'Stop-AzMLWorkspaceJob',
+		ResultType: 2,
+		ToolTip: '\\r\\nStop-AzMLWorkspaceJob \\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzMySqlFlexibleServer',
+		ListItemText: 'Stop-AzMySqlFlexibleServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nStop-AzMySqlFlexibleServer \\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzNetworkWatcherConnectionMonitor',
+		ListItemText: 'Stop-AzNetworkWatcherConnectionMonitor',
+		ResultType: 2,
+		ToolTip: 'Stop-AzNetworkWatcherConnectionMonitor\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzNetworkWatcherPacketCapture',
+		ListItemText: 'Stop-AzNetworkWatcherPacketCapture',
+		ResultType: 2,
+		ToolTip: 'Stop-AzNetworkWatcherPacketCapture\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzPolicyRemediation',
+		ListItemText: 'Stop-AzPolicyRemediation',
+		ResultType: 2,
+		ToolTip: 'Stop-AzPolicyRemediation\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzPostgreSqlFlexibleServer',
+		ListItemText: 'Stop-AzPostgreSqlFlexibleServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nStop-AzPostgreSqlFlexibleServer \\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzRecoveryServicesAsrJob',
+		ListItemText: 'Stop-AzRecoveryServicesAsrJob',
+		ResultType: 2,
+		ToolTip: 'Stop-AzRecoveryServicesAsrJob\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzRecoveryServicesBackupJob',
+		ListItemText: 'Stop-AzRecoveryServicesBackupJob',
+		ResultType: 2,
+		ToolTip: 'Stop-AzRecoveryServicesBackupJob\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzResourceGroupDeployment',
+		ListItemText: 'Stop-AzResourceGroupDeployment',
+		ResultType: 2,
+		ToolTip: 'Stop-AzResourceGroupDeployment\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzRoleAssignmentScheduleRequest',
+		ListItemText: 'Stop-AzRoleAssignmentScheduleRequest',
+		ResultType: 2,
+		ToolTip: '\\r\\nStop-AzRoleAssignmentScheduleRequest \\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzRoleEligibilityScheduleRequest',
+		ListItemText: 'Stop-AzRoleEligibilityScheduleRequest',
+		ResultType: 2,
+		ToolTip: '\\r\\nStop-AzRoleEligibilityScheduleRequest \\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzServiceBusMigration',
+		ListItemText: 'Stop-AzServiceBusMigration',
+		ResultType: 2,
+		ToolTip: '\\r\\nStop-AzServiceBusMigration \\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzSqlDatabaseActivity',
+		ListItemText: 'Stop-AzSqlDatabaseActivity',
+		ResultType: 2,
+		ToolTip: 'Stop-AzSqlDatabaseActivity\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzSqlDatabaseExecuteIndexRecommendation',
+		ListItemText: 'Stop-AzSqlDatabaseExecuteIndexRecommendation',
+		ResultType: 2,
+		ToolTip: 'Stop-AzSqlDatabaseExecuteIndexRecommendation\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzSqlElasticJob',
+		ListItemText: 'Stop-AzSqlElasticJob',
+		ResultType: 2,
+		ToolTip: 'Stop-AzSqlElasticJob\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzSqlElasticPoolActivity',
+		ListItemText: 'Stop-AzSqlElasticPoolActivity',
+		ResultType: 2,
+		ToolTip: 'Stop-AzSqlElasticPoolActivity\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzSqlInstanceDatabaseLogReplay',
+		ListItemText: 'Stop-AzSqlInstanceDatabaseLogReplay',
+		ResultType: 2,
+		ToolTip: 'Stop-AzSqlInstanceDatabaseLogReplay\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzSqlInstanceOperation',
+		ListItemText: 'Stop-AzSqlInstanceOperation',
+		ResultType: 2,
+		ToolTip: 'Stop-AzSqlInstanceOperation\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzSqlSyncGroupSync',
+		ListItemText: 'Stop-AzSqlSyncGroupSync',
+		ResultType: 2,
+		ToolTip: 'Stop-AzSqlSyncGroupSync\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzStorageAccountHierarchicalNamespaceUpgrade',
+		ListItemText: 'Stop-AzStorageAccountHierarchicalNamespaceUpgrade',
+		ResultType: 2,
+		ToolTip: 'Stop-AzStorageAccountHierarchicalNamespaceUpgrade\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzStorageBlobCopy',
+		ListItemText: 'Stop-AzStorageBlobCopy',
+		ResultType: 2,
+		ToolTip: 'Stop-AzStorageBlobCopy\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzStorageFileCopy',
+		ListItemText: 'Stop-AzStorageFileCopy',
+		ResultType: 2,
+		ToolTip: 'Stop-AzStorageFileCopy\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzStorageMoverJobDefinition',
+		ListItemText: 'Stop-AzStorageMoverJobDefinition',
+		ResultType: 2,
+		ToolTip: '\\r\\nStop-AzStorageMoverJobDefinition \\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzStreamAnalyticsJob',
+		ListItemText: 'Stop-AzStreamAnalyticsJob',
+		ResultType: 2,
+		ToolTip: '\\r\\nStop-AzStreamAnalyticsJob \\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzSubscriptionDeployment',
+		ListItemText: 'Stop-AzSubscriptionDeployment',
+		ResultType: 2,
+		ToolTip: 'Stop-AzSubscriptionDeployment'
+	},
+	{
+		CompletionText: 'Stop-AzSynapseDataFlowDebugSession',
+		ListItemText: 'Stop-AzSynapseDataFlowDebugSession',
+		ResultType: 2,
+		ToolTip: 'Stop-AzSynapseDataFlowDebugSession\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzSynapseIntegrationRuntime',
+		ListItemText: 'Stop-AzSynapseIntegrationRuntime',
+		ResultType: 2,
+		ToolTip: 'Stop-AzSynapseIntegrationRuntime\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzSynapseKustoPool',
+		ListItemText: 'Stop-AzSynapseKustoPool',
+		ResultType: 2,
+		ToolTip: '\\r\\nStop-AzSynapseKustoPool \\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzSynapseLinkConnection',
+		ListItemText: 'Stop-AzSynapseLinkConnection',
+		ResultType: 2,
+		ToolTip: 'Stop-AzSynapseLinkConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzSynapsePipelineRun',
+		ListItemText: 'Stop-AzSynapsePipelineRun',
+		ResultType: 2,
+		ToolTip: 'Stop-AzSynapsePipelineRun\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzSynapseSparkJob',
+		ListItemText: 'Stop-AzSynapseSparkJob',
+		ResultType: 2,
+		ToolTip: 'Stop-AzSynapseSparkJob\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzSynapseSparkSession',
+		ListItemText: 'Stop-AzSynapseSparkSession',
+		ResultType: 2,
+		ToolTip: 'Stop-AzSynapseSparkSession\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzSynapseSparkStatement',
+		ListItemText: 'Stop-AzSynapseSparkStatement',
+		ResultType: 2,
+		ToolTip: 'Stop-AzSynapseSparkStatement\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzSynapseTrigger',
+		ListItemText: 'Stop-AzSynapseTrigger',
+		ResultType: 2,
+		ToolTip: 'Stop-AzSynapseTrigger\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzSynapseTriggerRun',
+		ListItemText: 'Stop-AzSynapseTriggerRun',
+		ResultType: 2,
+		ToolTip: 'Stop-AzSynapseTriggerRun\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzTenantDeployment',
+		ListItemText: 'Stop-AzTenantDeployment',
+		ResultType: 2,
+		ToolTip: 'Stop-AzTenantDeployment\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzVirtualNetworkGatewayConnectionPacketCapture',
+		ListItemText: 'Stop-AzVirtualNetworkGatewayConnectionPacketCapture',
+		ResultType: 2,
+		ToolTip: 'Stop-AzVirtualNetworkGatewayConnectionPacketCapture\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzVirtualNetworkGatewayPacketCapture',
+		ListItemText: 'Stop-AzVirtualNetworkGatewayPacketCapture',
+		ResultType: 2,
+		ToolTip: 'Stop-AzVirtualNetworkGatewayPacketCapture\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzVM',
+		ListItemText: 'Stop-AzVM',
+		ResultType: 2,
+		ToolTip: 'Stop-AzVM\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzVmss',
+		ListItemText: 'Stop-AzVmss',
+		ResultType: 2,
+		ToolTip: 'Stop-AzVmss\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzVmssRollingUpgrade',
+		ListItemText: 'Stop-AzVmssRollingUpgrade',
+		ResultType: 2,
+		ToolTip: 'Stop-AzVmssRollingUpgrade\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzVpnConnectionPacketCapture',
+		ListItemText: 'Stop-AzVpnConnectionPacketCapture',
+		ResultType: 2,
+		ToolTip: 'Stop-AzVpnConnectionPacketCapture\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzVpnGatewayPacketCapture',
+		ListItemText: 'Stop-AzVpnGatewayPacketCapture',
+		ResultType: 2,
+		ToolTip: 'Stop-AzVpnGatewayPacketCapture\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzWebApp',
+		ListItemText: 'Stop-AzWebApp',
+		ResultType: 2,
+		ToolTip: 'Stop-AzWebApp\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzWebAppContinuousWebJob',
+		ListItemText: 'Stop-AzWebAppContinuousWebJob',
+		ResultType: 2,
+		ToolTip: '\\r\\nStop-AzWebAppContinuousWebJob \\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzWebAppSlot',
+		ListItemText: 'Stop-AzWebAppSlot',
+		ResultType: 2,
+		ToolTip: 'Stop-AzWebAppSlot\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-AzWebAppSlotContinuousWebJob',
+		ListItemText: 'Stop-AzWebAppSlotContinuousWebJob',
+		ResultType: 2,
+		ToolTip: '\\r\\nStop-AzWebAppSlotContinuousWebJob \\r\\n'
+	},
+	{
+		CompletionText: 'Stop-ComputeProcess',
+		ListItemText: 'Stop-ComputeProcess',
+		ResultType: 2,
+		ToolTip: 'Stop-ComputeProcess\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-Computer',
+		ListItemText: 'Stop-Computer',
+		ResultType: 2,
+		ToolTip: '\\r\\nStop-Computer [[-ComputerName] <string[]>] [[-Credential] <pscredential>] [-WsmanAuthentication <string>] [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-CopyAzureStorageBlob',
+		ListItemText: 'Stop-CopyAzureStorageBlob',
+		ResultType: 2,
+		ToolTip: 'Stop-CopyAzureStorageBlob'
+	},
+	{
+		CompletionText: 'Stop-DscConfiguration',
+		ListItemText: 'Stop-DscConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nStop-DscConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Stop-Dtc',
+		ListItemText: 'Stop-Dtc',
+		ResultType: 2,
+		ToolTip: '\\r\\nStop-Dtc \\r\\n'
+	},
+	{
+		CompletionText: 'Stop-DtcDiagnosticResourceManager',
+		ListItemText: 'Stop-DtcDiagnosticResourceManager',
+		ResultType: 2,
+		ToolTip: 'Stop-DtcDiagnosticResourceManager\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-DtcTransactionsTraceSession',
+		ListItemText: 'Stop-DtcTransactionsTraceSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nStop-DtcTransactionsTraceSession \\r\\n'
+	},
+	{
+		CompletionText: 'Stop-EtwTraceSession',
+		ListItemText: 'Stop-EtwTraceSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nStop-EtwTraceSession \\r\\n'
+	},
+	{
+		CompletionText: 'Stop-Job',
+		ListItemText: 'Stop-Job',
+		ResultType: 2,
+		ToolTip: '\\r\\nStop-Job [-Id] <int[]> [-PassThru] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nStop-Job [-Job] <Job[]> [-PassThru] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nStop-Job [-Name] <string[]> [-PassThru] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nStop-Job [-InstanceId] <guid[]> [-PassThru] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nStop-Job [-State] <JobState> [-PassThru] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nStop-Job [-Filter] <hashtable> [-PassThru] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-NetEventSession',
+		ListItemText: 'Stop-NetEventSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nStop-NetEventSession \\r\\n'
+	},
+	{
+		CompletionText: 'Stop-PcsvDevice',
+		ListItemText: 'Stop-PcsvDevice',
+		ResultType: 2,
+		ToolTip: '\\r\\nStop-PcsvDevice \\r\\n'
+	},
+	{
+		CompletionText: 'Stop-Process',
+		ListItemText: 'Stop-Process',
+		ResultType: 2,
+		ToolTip: '\\r\\nStop-Process [-Id] <int[]> [-PassThru] [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nStop-Process -Name <string[]> [-PassThru] [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nStop-Process [-InputObject] <Process[]> [-PassThru] [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-ScheduledTask',
+		ListItemText: 'Stop-ScheduledTask',
+		ResultType: 2,
+		ToolTip: '\\r\\nStop-ScheduledTask \\r\\n'
+	},
+	{
+		CompletionText: 'Stop-Service',
+		ListItemText: 'Stop-Service',
+		ResultType: 2,
+		ToolTip: '\\r\\nStop-Service [-InputObject] <ServiceController[]> [-Force] [-NoWait] [-PassThru] [-Include <string[]>] [-Exclude <string[]>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nStop-Service [-Name] <string[]> [-Force] [-NoWait] [-PassThru] [-Include <string[]>] [-Exclude <string[]>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nStop-Service -DisplayName <string[]> [-Force] [-NoWait] [-PassThru] [-Include <string[]>] [-Exclude <string[]>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-StorageDiagnosticLog',
+		ListItemText: 'Stop-StorageDiagnosticLog',
+		ResultType: 2,
+		ToolTip: '\\r\\nStop-StorageDiagnosticLog \\r\\n'
+	},
+	{
+		CompletionText: 'Stop-StorageJob',
+		ListItemText: 'Stop-StorageJob',
+		ResultType: 2,
+		ToolTip: '\\r\\nStop-StorageJob \\r\\n'
+	},
+	{
+		CompletionText: 'Stop-Trace',
+		ListItemText: 'Stop-Trace',
+		ResultType: 2,
+		ToolTip: '\\r\\nStop-Trace \\r\\n'
+	},
+	{
+		CompletionText: 'Stop-Transcript',
+		ListItemText: 'Stop-Transcript',
+		ResultType: 2,
+		ToolTip: 'Stop-Transcript\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-VM',
+		ListItemText: 'Stop-VM',
+		ResultType: 2,
+		ToolTip: 'Stop-VM\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-VMFailover',
+		ListItemText: 'Stop-VMFailover',
+		ResultType: 2,
+		ToolTip: 'Stop-VMFailover\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-VMInitialReplication',
+		ListItemText: 'Stop-VMInitialReplication',
+		ResultType: 2,
+		ToolTip: 'Stop-VMInitialReplication\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-VMReplication',
+		ListItemText: 'Stop-VMReplication',
+		ResultType: 2,
+		ToolTip: 'Stop-VMReplication\\r\\n'
+	},
+	{
+		CompletionText: 'Stop-VMTrace',
+		ListItemText: 'Stop-VMTrace',
+		ResultType: 2,
+		ToolTip: 'Stop-VMTrace\\r\\n'
+	},
+	{
+		CompletionText: 'stordiag.exe',
+		ListItemText: 'stordiag.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\stordiag.exe'
+	},
+	{
+		CompletionText: 'stz',
+		ListItemText: 'stz',
+		ResultType: 2,
+		ToolTip: 'Set-TimeZone'
+	},
+	{
+		CompletionText: 'Submit-AdlJob',
+		ListItemText: 'Submit-AdlJob',
+		ResultType: 2,
+		ToolTip: 'Submit-AdlJob'
+	},
+	{
+		CompletionText: 'Submit-AzDataLakeAnalyticsJob',
+		ListItemText: 'Submit-AzDataLakeAnalyticsJob',
+		ResultType: 2,
+		ToolTip: 'Submit-AzDataLakeAnalyticsJob\\r\\n'
+	},
+	{
+		CompletionText: 'Submit-AzHDInsightScriptAction',
+		ListItemText: 'Submit-AzHDInsightScriptAction',
+		ResultType: 2,
+		ToolTip: 'Submit-AzHDInsightScriptAction\\r\\n'
+	},
+	{
+		CompletionText: 'Submit-AzSynapseSparkJob',
+		ListItemText: 'Submit-AzSynapseSparkJob',
+		ResultType: 2,
+		ToolTip: 'Submit-AzSynapseSparkJob\\r\\n'
+	},
+	{
+		CompletionText: 'subst.exe',
+		ListItemText: 'subst.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\subst.exe'
+	},
+	{
+		CompletionText: 'Suspend-AzAnalysisServicesServer',
+		ListItemText: 'Suspend-AzAnalysisServicesServer',
+		ResultType: 2,
+		ToolTip: 'Suspend-AzAnalysisServicesServer\\r\\n'
+	},
+	{
+		CompletionText: 'Suspend-AzAs',
+		ListItemText: 'Suspend-AzAs',
+		ResultType: 2,
+		ToolTip: 'Suspend-AzAs'
+	},
+	{
+		CompletionText: 'Suspend-AzAutomationJob',
+		ListItemText: 'Suspend-AzAutomationJob',
+		ResultType: 2,
+		ToolTip: 'Suspend-AzAutomationJob\\r\\n'
+	},
+	{
+		CompletionText: 'Suspend-AzDataFactoryPipeline',
+		ListItemText: 'Suspend-AzDataFactoryPipeline',
+		ResultType: 2,
+		ToolTip: 'Suspend-AzDataFactoryPipeline\\r\\n'
+	},
+	{
+		CompletionText: 'Suspend-AzDataProtectionBackupInstanceBackup',
+		ListItemText: 'Suspend-AzDataProtectionBackupInstanceBackup',
+		ResultType: 2,
+		ToolTip: '\\r\\nSuspend-AzDataProtectionBackupInstanceBackup \\r\\n'
+	},
+	{
+		CompletionText: 'Suspend-AzMigrateServerReplication',
+		ListItemText: 'Suspend-AzMigrateServerReplication',
+		ResultType: 2,
+		ToolTip: '\\r\\nSuspend-AzMigrateServerReplication \\r\\n'
+	},
+	{
+		CompletionText: 'Suspend-AzPowerBIEmbeddedCapacity',
+		ListItemText: 'Suspend-AzPowerBIEmbeddedCapacity',
+		ResultType: 2,
+		ToolTip: 'Suspend-AzPowerBIEmbeddedCapacity\\r\\n'
+	},
+	{
+		CompletionText: 'Suspend-AzSqlDatabase',
+		ListItemText: 'Suspend-AzSqlDatabase',
+		ResultType: 2,
+		ToolTip: 'Suspend-AzSqlDatabase\\r\\n'
+	},
+	{
+		CompletionText: 'Suspend-AzSynapseSqlPool',
+		ListItemText: 'Suspend-AzSynapseSqlPool',
+		ResultType: 2,
+		ToolTip: 'Suspend-AzSynapseSqlPool\\r\\n'
+	},
+	{
+		CompletionText: 'Suspend-BitLocker',
+		ListItemText: 'Suspend-BitLocker',
+		ResultType: 2,
+		ToolTip: '\\r\\nSuspend-BitLocker \\r\\n'
+	},
+	{
+		CompletionText: 'Suspend-BitsTransfer',
+		ListItemText: 'Suspend-BitsTransfer',
+		ResultType: 2,
+		ToolTip: 'Suspend-BitsTransfer\\r\\n'
+	},
+	{
+		CompletionText: 'Suspend-PrintJob',
+		ListItemText: 'Suspend-PrintJob',
+		ResultType: 2,
+		ToolTip: '\\r\\nSuspend-PrintJob \\r\\n'
+	},
+	{
+		CompletionText: 'Suspend-Service',
+		ListItemText: 'Suspend-Service',
+		ResultType: 2,
+		ToolTip: '\\r\\nSuspend-Service [-InputObject] <ServiceController[]> [-PassThru] [-Include <string[]>] [-Exclude <string[]>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nSuspend-Service [-Name] <string[]> [-PassThru] [-Include <string[]>] [-Exclude <string[]>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nSuspend-Service -DisplayName <string[]> [-PassThru] [-Include <string[]>] [-Exclude <string[]>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Suspend-StorageBusDisk',
+		ListItemText: 'Suspend-StorageBusDisk',
+		ResultType: 2,
+		ToolTip: '\\r\\nSuspend-StorageBusDisk \\r\\n'
+	},
+	{
+		CompletionText: 'Suspend-VM',
+		ListItemText: 'Suspend-VM',
+		ResultType: 2,
+		ToolTip: 'Suspend-VM\\r\\n'
+	},
+	{
+		CompletionText: 'Suspend-VMReplication',
+		ListItemText: 'Suspend-VMReplication',
+		ResultType: 2,
+		ToolTip: 'Suspend-VMReplication\\r\\n'
+	},
+	{
+		CompletionText: 'sv',
+		ListItemText: 'sv',
+		ResultType: 2,
+		ToolTip: 'Set-Variable'
+	},
+	{
+		CompletionText: 'svchost.exe',
+		ListItemText: 'svchost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\svchost.exe'
+	},
+	{
+		CompletionText: 'Swap-AzWebAppSlot',
+		ListItemText: 'Swap-AzWebAppSlot',
+		ResultType: 2,
+		ToolTip: 'Swap-AzWebAppSlot'
+	},
+	{
+		CompletionText: 'Switch-AzCloudService',
+		ListItemText: 'Switch-AzCloudService',
+		ResultType: 2,
+		ToolTip: '\\r\\nSwitch-AzCloudService \\r\\n'
+	},
+	{
+		CompletionText: 'Switch-AzSqlDatabaseFailoverGroup',
+		ListItemText: 'Switch-AzSqlDatabaseFailoverGroup',
+		ResultType: 2,
+		ToolTip: 'Switch-AzSqlDatabaseFailoverGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Switch-AzSqlDatabaseInstanceFailoverGroup',
+		ListItemText: 'Switch-AzSqlDatabaseInstanceFailoverGroup',
+		ResultType: 2,
+		ToolTip: 'Switch-AzSqlDatabaseInstanceFailoverGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Switch-AzWebAppSlot',
+		ListItemText: 'Switch-AzWebAppSlot',
+		ResultType: 2,
+		ToolTip: 'Switch-AzWebAppSlot\\r\\n'
+	},
+	{
+		CompletionText: 'Switch-Certificate',
+		ListItemText: 'Switch-Certificate',
+		ResultType: 2,
+		ToolTip: 'Switch-Certificate\\r\\n'
+	},
+	{
+		CompletionText: 'sxstrace.exe',
+		ListItemText: 'sxstrace.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\sxstrace.exe'
+	},
+	{
+		CompletionText: 'Sync-AzAnalysisServicesInstance',
+		ListItemText: 'Sync-AzAnalysisServicesInstance',
+		ResultType: 2,
+		ToolTip: 'Sync-AzAnalysisServicesInstance\\r\\n'
+	},
+	{
+		CompletionText: 'Sync-AzApiManagementKeyVaultSecret',
+		ListItemText: 'Sync-AzApiManagementKeyVaultSecret',
+		ResultType: 2,
+		ToolTip: 'Sync-AzApiManagementKeyVaultSecret\\r\\n'
+	},
+	{
+		CompletionText: 'Sync-AzAsInstance',
+		ListItemText: 'Sync-AzAsInstance',
+		ResultType: 2,
+		ToolTip: 'Sync-AzAsInstance'
+	},
+	{
+		CompletionText: 'Sync-AzDataFactoryV2IntegrationRuntimeCredential',
+		ListItemText: 'Sync-AzDataFactoryV2IntegrationRuntimeCredential',
+		ResultType: 2,
+		ToolTip: 'Sync-AzDataFactoryV2IntegrationRuntimeCredential\\r\\n'
+	},
+	{
+		CompletionText: 'Sync-AzDataProtectionBackupInstance',
+		ListItemText: 'Sync-AzDataProtectionBackupInstance',
+		ResultType: 2,
+		ToolTip: '\\r\\nSync-AzDataProtectionBackupInstance \\r\\n'
+	},
+	{
+		CompletionText: 'Sync-AzMediaServiceStorageKey',
+		ListItemText: 'Sync-AzMediaServiceStorageKey',
+		ResultType: 2,
+		ToolTip: 'Sync-AzMediaServiceStorageKey\\r\\n'
+	},
+	{
+		CompletionText: 'Sync-AzMediaServiceStorageKeys',
+		ListItemText: 'Sync-AzMediaServiceStorageKeys',
+		ResultType: 2,
+		ToolTip: 'Sync-AzMediaServiceStorageKeys'
+	},
+	{
+		CompletionText: 'Sync-AzMLWorkspaceKey',
+		ListItemText: 'Sync-AzMLWorkspaceKey',
+		ResultType: 2,
+		ToolTip: '\\r\\nSync-AzMLWorkspaceKey \\r\\n'
+	},
+	{
+		CompletionText: 'Sync-AzSynapseIntegrationRuntimeCredential',
+		ListItemText: 'Sync-AzSynapseIntegrationRuntimeCredential',
+		ResultType: 2,
+		ToolTip: 'Sync-AzSynapseIntegrationRuntimeCredential\\r\\n'
+	},
+	{
+		CompletionText: 'Sync-AzureAsInstance',
+		ListItemText: 'Sync-AzureAsInstance',
+		ResultType: 2,
+		ToolTip: 'Sync-AzureAsInstance'
+	},
+	{
+		CompletionText: 'Sync-AzVirtualNetworkPeering',
+		ListItemText: 'Sync-AzVirtualNetworkPeering',
+		ResultType: 2,
+		ToolTip: 'Sync-AzVirtualNetworkPeering\\r\\n'
+	},
+	{
+		CompletionText: 'Sync-NetIPsecRule',
+		ListItemText: 'Sync-NetIPsecRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nSync-NetIPsecRule \\r\\n'
+	},
+	{
+		CompletionText: 'SyncAppvPublishingServer.exe',
+		ListItemText: 'SyncAppvPublishingServer.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\SyncAppvPublishingServer.exe'
+	},
+	{
+		CompletionText: 'SyncAppvPublishingServer.vbs',
+		ListItemText: 'SyncAppvPublishingServer.vbs',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\SyncAppvPublishingServer.vbs'
+	},
+	{
+		CompletionText: 'SyncHost.exe',
+		ListItemText: 'SyncHost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\SyncHost.exe'
+	},
+	{
+		CompletionText: 'sysdm.cpl',
+		ListItemText: 'sysdm.cpl',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\sysdm.cpl'
+	},
+	{
+		CompletionText: 'SysResetErr.exe',
+		ListItemText: 'SysResetErr.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\SysResetErr.exe'
+	},
+	{
+		CompletionText: 'systeminfo.exe',
+		ListItemText: 'systeminfo.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\systeminfo.exe'
+	},
+	{
+		CompletionText: 'SystemPropertiesAdvanced.exe',
+		ListItemText: 'SystemPropertiesAdvanced.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\SystemPropertiesAdvanced.exe'
+	},
+	{
+		CompletionText: 'SystemPropertiesComputerName.exe',
+		ListItemText: 'SystemPropertiesComputerName.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\SystemPropertiesComputerName.exe'
+	},
+	{
+		CompletionText: 'SystemPropertiesDataExecutionPrevention.exe',
+		ListItemText: 'SystemPropertiesDataExecutionPrevention.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\SystemPropertiesDataExecutionPrevention.exe'
+	},
+	{
+		CompletionText: 'SystemPropertiesHardware.exe',
+		ListItemText: 'SystemPropertiesHardware.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\SystemPropertiesHardware.exe'
+	},
+	{
+		CompletionText: 'SystemPropertiesPerformance.exe',
+		ListItemText: 'SystemPropertiesPerformance.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\SystemPropertiesPerformance.exe'
+	},
+	{
+		CompletionText: 'SystemPropertiesProtection.exe',
+		ListItemText: 'SystemPropertiesProtection.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\SystemPropertiesProtection.exe'
+	},
+	{
+		CompletionText: 'SystemPropertiesRemote.exe',
+		ListItemText: 'SystemPropertiesRemote.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\SystemPropertiesRemote.exe'
+	},
+	{
+		CompletionText: 'systemreset.exe',
+		ListItemText: 'systemreset.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\systemreset.exe'
+	},
+	{
+		CompletionText: 'SystemSettingsAdminFlows.exe',
+		ListItemText: 'SystemSettingsAdminFlows.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\SystemSettingsAdminFlows.exe'
+	},
+	{
+		CompletionText: 'SystemSettingsBroker.exe',
+		ListItemText: 'SystemSettingsBroker.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\SystemSettingsBroker.exe'
+	},
+	{
+		CompletionText: 'SystemSettingsRemoveDevice.exe',
+		ListItemText: 'SystemSettingsRemoveDevice.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\SystemSettingsRemoveDevice.exe'
+	},
+	{
+		CompletionText: 'SystemUWPLauncher.exe',
+		ListItemText: 'SystemUWPLauncher.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\SystemUWPLauncher.exe'
+	},
+	{
+		CompletionText: 'systray.exe',
+		ListItemText: 'systray.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\systray.exe'
+	},
+	{
+		CompletionText: 'T:',
+		ListItemText: 'T:',
+		ResultType: 2,
+		ToolTip: '\\r\\nT: \\r\\n'
+	},
+	{
+		CompletionText: 'tabcal.exe',
+		ListItemText: 'tabcal.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\tabcal.exe'
+	},
+	{
+		CompletionText: 'TabExpansion',
+		ListItemText: 'TabExpansion',
+		ResultType: 2,
+		ToolTip: '\\r\\nTabExpansion \\r\\n'
+	},
+	{
+		CompletionText: 'TabExpansion2',
+		ListItemText: 'TabExpansion2',
+		ResultType: 2,
+		ToolTip: '\\r\\nTabExpansion2 [-inputScript] <string> [[-cursorColumn] <int>] [[-options] <hashtable>] [<CommonParameters>]\\r\\n\\r\\nTabExpansion2 [-ast] <Ast> [-tokens] <Token[]> [-positionOfCursor] <IScriptPosition> [[-options] <hashtable>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'TabletPC.cpl',
+		ListItemText: 'TabletPC.cpl',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\TabletPC.cpl'
+	},
+	{
+		CompletionText: 'takeown.exe',
+		ListItemText: 'takeown.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\takeown.exe'
+	},
+	{
+		CompletionText: 'TapiUnattend.exe',
+		ListItemText: 'TapiUnattend.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\TapiUnattend.exe'
+	},
+	{
+		CompletionText: 'tar.exe',
+		ListItemText: 'tar.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\tar.exe'
+	},
+	{
+		CompletionText: 'taskhostw.exe',
+		ListItemText: 'taskhostw.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\taskhostw.exe'
+	},
+	{
+		CompletionText: 'taskkill.exe',
+		ListItemText: 'taskkill.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\taskkill.exe'
+	},
+	{
+		CompletionText: 'tasklist.exe',
+		ListItemText: 'tasklist.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\tasklist.exe'
+	},
+	{
+		CompletionText: 'Taskmgr.exe',
+		ListItemText: 'Taskmgr.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\Taskmgr.exe'
+	},
+	{
+		CompletionText: 'taskschd.msc',
+		ListItemText: 'taskschd.msc',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\taskschd.msc'
+	},
+	{
+		CompletionText: 'tcblaunch.exe',
+		ListItemText: 'tcblaunch.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\tcblaunch.exe'
+	},
+	{
+		CompletionText: 'tcfg',
+		ListItemText: 'tcfg',
+		ResultType: 2,
+		ToolTip: 'tcfg'
+	},
+	{
+		CompletionText: 'tcmsetup.exe',
+		ListItemText: 'tcmsetup.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\tcmsetup.exe'
+	},
+	{
+		CompletionText: 'TCPSVCS.EXE',
+		ListItemText: 'TCPSVCS.EXE',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\TCPSVCS.EXE'
+	},
+	{
+		CompletionText: 'tee',
+		ListItemText: 'tee',
+		ResultType: 2,
+		ToolTip: 'Tee-Object'
+	},
+	{
+		CompletionText: 'Tee-Object',
+		ListItemText: 'Tee-Object',
+		ResultType: 2,
+		ToolTip: '\\r\\nTee-Object [-FilePath] <string> [-InputObject <psobject>] [-Append] [-Encoding <Encoding>] [<CommonParameters>]\\r\\n\\r\\nTee-Object -LiteralPath <string> [-InputObject <psobject>] [-Encoding <Encoding>] [<CommonParameters>]\\r\\n\\r\\nTee-Object -Variable <string> [-InputObject <psobject>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'telephon.cpl',
+		ListItemText: 'telephon.cpl',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\telephon.cpl'
+	},
+	{
+		CompletionText: 'test-64bit',
+		ListItemText: 'test-64bit',
+		ResultType: 2,
+		ToolTip: '\\r\\ntest-64bit \\r\\n'
+	},
+	{
+		CompletionText: 'Test-AdlAnalyticsAccount',
+		ListItemText: 'Test-AdlAnalyticsAccount',
+		ResultType: 2,
+		ToolTip: 'Test-AdlAnalyticsAccount'
+	},
+	{
+		CompletionText: 'Test-AdlCatalogItem',
+		ListItemText: 'Test-AdlCatalogItem',
+		ResultType: 2,
+		ToolTip: 'Test-AdlCatalogItem'
+	},
+	{
+		CompletionText: 'Test-AdlStore',
+		ListItemText: 'Test-AdlStore',
+		ResultType: 2,
+		ToolTip: 'Test-AdlStore'
+	},
+	{
+		CompletionText: 'Test-AdlStoreItem',
+		ListItemText: 'Test-AdlStoreItem',
+		ResultType: 2,
+		ToolTip: 'Test-AdlStoreItem'
+	},
+	{
+		CompletionText: 'Test-AppLockerPolicy',
+		ListItemText: 'Test-AppLockerPolicy',
+		ResultType: 2,
+		ToolTip: 'Test-AppLockerPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzActionGroup',
+		ListItemText: 'Test-AzActionGroup',
+		ResultType: 2,
+		ToolTip: 'Test-AzActionGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzAnalysisServicesServer',
+		ListItemText: 'Test-AzAnalysisServicesServer',
+		ResultType: 2,
+		ToolTip: 'Test-AzAnalysisServicesServer\\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzAppConfigurationStoreNameAvailability',
+		ListItemText: 'Test-AzAppConfigurationStoreNameAvailability',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-AzAppConfigurationStoreNameAvailability \\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzAs',
+		ListItemText: 'Test-AzAs',
+		ResultType: 2,
+		ToolTip: 'Test-AzAs'
+	},
+	{
+		CompletionText: 'Test-AzBatchAutoScale',
+		ListItemText: 'Test-AzBatchAutoScale',
+		ResultType: 2,
+		ToolTip: 'Test-AzBatchAutoScale\\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzCdnEndpointCustomDomain',
+		ListItemText: 'Test-AzCdnEndpointCustomDomain',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-AzCdnEndpointCustomDomain \\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzCdnNameAvailability',
+		ListItemText: 'Test-AzCdnNameAvailability',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-AzCdnNameAvailability \\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzCdnProbe',
+		ListItemText: 'Test-AzCdnProbe',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-AzCdnProbe \\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzConfidentialLedgerNameAvailability',
+		ListItemText: 'Test-AzConfidentialLedgerNameAvailability',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-AzConfidentialLedgerNameAvailability \\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzContainerRegistryNameAvailability',
+		ListItemText: 'Test-AzContainerRegistryNameAvailability',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-AzContainerRegistryNameAvailability \\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzContainerRegistryWebhook',
+		ListItemText: 'Test-AzContainerRegistryWebhook',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-AzContainerRegistryWebhook \\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzDataLakeAnalyticsAccount',
+		ListItemText: 'Test-AzDataLakeAnalyticsAccount',
+		ResultType: 2,
+		ToolTip: 'Test-AzDataLakeAnalyticsAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzDataLakeAnalyticsCatalogItem',
+		ListItemText: 'Test-AzDataLakeAnalyticsCatalogItem',
+		ResultType: 2,
+		ToolTip: 'Test-AzDataLakeAnalyticsCatalogItem\\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzDataLakeStoreAccount',
+		ListItemText: 'Test-AzDataLakeStoreAccount',
+		ResultType: 2,
+		ToolTip: 'Test-AzDataLakeStoreAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzDataLakeStoreItem',
+		ListItemText: 'Test-AzDataLakeStoreItem',
+		ResultType: 2,
+		ToolTip: 'Test-AzDataLakeStoreItem\\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzDataProtectionBackupInstanceReadiness',
+		ListItemText: 'Test-AzDataProtectionBackupInstanceReadiness',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-AzDataProtectionBackupInstanceReadiness \\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzDataProtectionBackupInstanceRestore',
+		ListItemText: 'Test-AzDataProtectionBackupInstanceRestore',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-AzDataProtectionBackupInstanceRestore \\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzDeployment',
+		ListItemText: 'Test-AzDeployment',
+		ResultType: 2,
+		ToolTip: 'Test-AzDeployment\\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzDnsAvailability',
+		ListItemText: 'Test-AzDnsAvailability',
+		ResultType: 2,
+		ToolTip: 'Test-AzDnsAvailability\\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzEventHubName',
+		ListItemText: 'Test-AzEventHubName',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-AzEventHubName \\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzFrontDoorCdnEndpointCustomDomain',
+		ListItemText: 'Test-AzFrontDoorCdnEndpointCustomDomain',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-AzFrontDoorCdnEndpointCustomDomain \\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzFrontDoorCdnEndpointNameAvailability',
+		ListItemText: 'Test-AzFrontDoorCdnEndpointNameAvailability',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-AzFrontDoorCdnEndpointNameAvailability \\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzFrontDoorCdnProfileHostNameAvailability',
+		ListItemText: 'Test-AzFrontDoorCdnProfileHostNameAvailability',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-AzFrontDoorCdnProfileHostNameAvailability \\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzFrontDoorCdnProfileMigration',
+		ListItemText: 'Test-AzFrontDoorCdnProfileMigration',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-AzFrontDoorCdnProfileMigration \\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzHealthcareServiceNameAvailability',
+		ListItemText: 'Test-AzHealthcareServiceNameAvailability',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-AzHealthcareServiceNameAvailability \\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzIotHubRoute',
+		ListItemText: 'Test-AzIotHubRoute',
+		ResultType: 2,
+		ToolTip: 'Test-AzIotHubRoute\\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzKustoAttachedDatabaseConfigurationNameAvailability',
+		ListItemText: 'Test-AzKustoAttachedDatabaseConfigurationNameAvailability',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-AzKustoAttachedDatabaseConfigurationNameAvailability \\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzKustoClusterNameAvailability',
+		ListItemText: 'Test-AzKustoClusterNameAvailability',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-AzKustoClusterNameAvailability \\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzKustoClusterPrincipalAssignmentNameAvailability',
+		ListItemText: 'Test-AzKustoClusterPrincipalAssignmentNameAvailability',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-AzKustoClusterPrincipalAssignmentNameAvailability \\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzKustoDatabaseNameAvailability',
+		ListItemText: 'Test-AzKustoDatabaseNameAvailability',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-AzKustoDatabaseNameAvailability \\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzKustoDatabasePrincipalAssignmentNameAvailability',
+		ListItemText: 'Test-AzKustoDatabasePrincipalAssignmentNameAvailability',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-AzKustoDatabasePrincipalAssignmentNameAvailability \\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzKustoDataConnectionNameAvailability',
+		ListItemText: 'Test-AzKustoDataConnectionNameAvailability',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-AzKustoDataConnectionNameAvailability \\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzKustoManagedPrivateEndpointNameAvailability',
+		ListItemText: 'Test-AzKustoManagedPrivateEndpointNameAvailability',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-AzKustoManagedPrivateEndpointNameAvailability \\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzKustoScriptNameAvailability',
+		ListItemText: 'Test-AzKustoScriptNameAvailability',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-AzKustoScriptNameAvailability \\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzLogicApp',
+		ListItemText: 'Test-AzLogicApp',
+		ResultType: 2,
+		ToolTip: 'Test-AzLogicApp\\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzManagementGroupDeployment',
+		ListItemText: 'Test-AzManagementGroupDeployment',
+		ResultType: 2,
+		ToolTip: 'Test-AzManagementGroupDeployment\\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzMySqlFlexibleServerConnect',
+		ListItemText: 'Test-AzMySqlFlexibleServerConnect',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-AzMySqlFlexibleServerConnect \\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzNetworkWatcherConnectivity',
+		ListItemText: 'Test-AzNetworkWatcherConnectivity',
+		ResultType: 2,
+		ToolTip: 'Test-AzNetworkWatcherConnectivity\\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzNetworkWatcherIPFlow',
+		ListItemText: 'Test-AzNetworkWatcherIPFlow',
+		ResultType: 2,
+		ToolTip: 'Test-AzNetworkWatcherIPFlow\\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzPostgreSqlFlexibleServerConnect',
+		ListItemText: 'Test-AzPostgreSqlFlexibleServerConnect',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-AzPostgreSqlFlexibleServerConnect \\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzPowerBIEmbeddedCapacity',
+		ListItemText: 'Test-AzPowerBIEmbeddedCapacity',
+		ResultType: 2,
+		ToolTip: 'Test-AzPowerBIEmbeddedCapacity\\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzPrivateIPAddressAvailability',
+		ListItemText: 'Test-AzPrivateIPAddressAvailability',
+		ResultType: 2,
+		ToolTip: 'Test-AzPrivateIPAddressAvailability\\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzPrivateLinkServiceVisibility',
+		ListItemText: 'Test-AzPrivateLinkServiceVisibility',
+		ResultType: 2,
+		ToolTip: 'Test-AzPrivateLinkServiceVisibility\\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzRecoveryServicesDSMove',
+		ListItemText: 'Test-AzRecoveryServicesDSMove',
+		ResultType: 2,
+		ToolTip: 'Test-AzRecoveryServicesDSMove\\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzRelayName',
+		ListItemText: 'Test-AzRelayName',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-AzRelayName \\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzResourceGroupDeployment',
+		ListItemText: 'Test-AzResourceGroupDeployment',
+		ResultType: 2,
+		ToolTip: 'Test-AzResourceGroupDeployment\\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzSentinelDataConnectorCheckRequirement',
+		ListItemText: 'Test-AzSentinelDataConnectorCheckRequirement',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-AzSentinelDataConnectorCheckRequirement \\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzServiceBusName',
+		ListItemText: 'Test-AzServiceBusName',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-AzServiceBusName \\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzServiceBusNameAvailability',
+		ListItemText: 'Test-AzServiceBusNameAvailability',
+		ResultType: 2,
+		ToolTip: 'Test-AzServiceBusNameAvailability\\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzServiceLinkerForContainerApp',
+		ListItemText: 'Test-AzServiceLinkerForContainerApp',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-AzServiceLinkerForContainerApp \\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzServiceLinkerForSpringCloud',
+		ListItemText: 'Test-AzServiceLinkerForSpringCloud',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-AzServiceLinkerForSpringCloud \\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzServiceLinkerForWebApp',
+		ListItemText: 'Test-AzServiceLinkerForWebApp',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-AzServiceLinkerForWebApp \\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzSignalR',
+		ListItemText: 'Test-AzSignalR',
+		ResultType: 2,
+		ToolTip: 'Test-AzSignalR'
+	},
+	{
+		CompletionText: 'Test-AzSignalRName',
+		ListItemText: 'Test-AzSignalRName',
+		ResultType: 2,
+		ToolTip: 'Test-AzSignalRName\\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzStaticWebAppCustomDomain',
+		ListItemText: 'Test-AzStaticWebAppCustomDomain',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-AzStaticWebAppCustomDomain \\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzStreamAnalyticsFunction',
+		ListItemText: 'Test-AzStreamAnalyticsFunction',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-AzStreamAnalyticsFunction \\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzStreamAnalyticsInput',
+		ListItemText: 'Test-AzStreamAnalyticsInput',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-AzStreamAnalyticsInput \\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzStreamAnalyticsOutput',
+		ListItemText: 'Test-AzStreamAnalyticsOutput',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-AzStreamAnalyticsOutput \\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzSubscriptionDeployment',
+		ListItemText: 'Test-AzSubscriptionDeployment',
+		ResultType: 2,
+		ToolTip: 'Test-AzSubscriptionDeployment'
+	},
+	{
+		CompletionText: 'Test-AzSynapseSparkPool',
+		ListItemText: 'Test-AzSynapseSparkPool',
+		ResultType: 2,
+		ToolTip: 'Test-AzSynapseSparkPool\\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzSynapseSqlDatabase',
+		ListItemText: 'Test-AzSynapseSqlDatabase',
+		ResultType: 2,
+		ToolTip: 'Test-AzSynapseSqlDatabase\\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzSynapseSqlPool',
+		ListItemText: 'Test-AzSynapseSqlPool',
+		ResultType: 2,
+		ToolTip: 'Test-AzSynapseSqlPool\\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzSynapseWorkspace',
+		ListItemText: 'Test-AzSynapseWorkspace',
+		ResultType: 2,
+		ToolTip: 'Test-AzSynapseWorkspace\\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzTenantDeployment',
+		ListItemText: 'Test-AzTenantDeployment',
+		ResultType: 2,
+		ToolTip: 'Test-AzTenantDeployment\\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzVMAEMExtension',
+		ListItemText: 'Test-AzVMAEMExtension',
+		ResultType: 2,
+		ToolTip: 'Test-AzVMAEMExtension\\r\\n'
+	},
+	{
+		CompletionText: 'Test-AzWebPubSubNameAvailability',
+		ListItemText: 'Test-AzWebPubSubNameAvailability',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-AzWebPubSubNameAvailability \\r\\n'
+	},
+	{
+		CompletionText: 'Test-Certificate',
+		ListItemText: 'Test-Certificate',
+		ResultType: 2,
+		ToolTip: 'Test-Certificate\\r\\n'
+	},
+	{
+		CompletionText: 'Test-Connection',
+		ListItemText: 'Test-Connection',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-Connection [-TargetName] <string[]> [-Ping] [-IPv4] [-IPv6] [-ResolveDestination] [-Source <string>] [-MaxHops <int>] [-Count <int>] [-Delay <int>] [-BufferSize <int>] [-DontFragment] [-Quiet] [-TimeoutSeconds <int>] [<CommonParameters>]\\r\\n\\r\\nTest-Connection [-TargetName] <string[]> -Repeat [-Ping] [-IPv4] [-IPv6] [-ResolveDestination] [-Source <string>] [-MaxHops <int>] [-Delay <int>] [-BufferSize <int>] [-DontFragment] [-Quiet] [-TimeoutSeconds <int>] [<CommonParameters>]\\r\\n\\r\\nTest-Connection [-TargetName] <string[]> -Traceroute [-IPv4] [-IPv6] [-ResolveDestination] [-Source <string>] [-MaxHops <int>] [-Quiet] [-TimeoutSeconds <int>] [<CommonParameters>]\\r\\n\\r\\nTest-Connection [-TargetName] <string[]> -MtuSize [-IPv4] [-IPv6] [-ResolveDestination] [-Quiet] [-TimeoutSeconds <int>] [<CommonParameters>]\\r\\n\\r\\nTest-Connection [-TargetName] <string[]> -TcpPort <int> [-IPv4] [-IPv6] [-ResolveDestination] [-Source <string>] [-Count <int>] [-Delay <int>] [-Repeat] [-Quiet] [-TimeoutSeconds <int>] [-Detailed] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Test-DscConfiguration',
+		ListItemText: 'Test-DscConfiguration',
+		ResultType: 2,
+		ToolTip: 'Test-DscConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Test-Dtc',
+		ListItemText: 'Test-Dtc',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-Dtc \\r\\n'
+	},
+	{
+		CompletionText: 'Test-FileCatalog',
+		ListItemText: 'Test-FileCatalog',
+		ResultType: 2,
+		ToolTip: 'Test-FileCatalog\\r\\n'
+	},
+	{
+		CompletionText: 'Test-HgsClientConfiguration',
+		ListItemText: 'Test-HgsClientConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-HgsClientConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Test-HgsTraceTarget',
+		ListItemText: 'Test-HgsTraceTarget',
+		ResultType: 2,
+		ToolTip: 'Test-HgsTraceTarget\\r\\n'
+	},
+	{
+		CompletionText: 'Test-Json',
+		ListItemText: 'Test-Json',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-Json [-Json] <string> [<CommonParameters>]\\r\\n\\r\\nTest-Json [-Json] <string> [-Schema] <string> [<CommonParameters>]\\r\\n\\r\\nTest-Json [-Json] <string> [-SchemaFile] <string> [<CommonParameters>]\\r\\n\\r\\nTest-Json [-Path] <string> [<CommonParameters>]\\r\\n\\r\\nTest-Json [-Path] <string> [-Schema] <string> [<CommonParameters>]\\r\\n\\r\\nTest-Json [-Path] <string> [-SchemaFile] <string> [<CommonParameters>]\\r\\n\\r\\nTest-Json [-LiteralPath] <string> [<CommonParameters>]\\r\\n\\r\\nTest-Json [-LiteralPath] <string> [-Schema] <string> [<CommonParameters>]\\r\\n\\r\\nTest-Json [-LiteralPath] <string> [-SchemaFile] <string> [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Test-KdsRootKey',
+		ListItemText: 'Test-KdsRootKey',
+		ResultType: 2,
+		ToolTip: 'Test-KdsRootKey\\r\\n'
+	},
+	{
+		CompletionText: 'Test-ModuleManifest',
+		ListItemText: 'Test-ModuleManifest',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-ModuleManifest [-Path] <string> [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Test-NetConnection',
+		ListItemText: 'Test-NetConnection',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-NetConnection \\r\\n'
+	},
+	{
+		CompletionText: 'Test-Path',
+		ListItemText: 'Test-Path',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-Path [-Path] <string[]> [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-PathType <TestPathType>] [-IsValid] [-Credential <pscredential>] [-OlderThan <datetime>] [-NewerThan <datetime>] [<CommonParameters>]\\r\\n\\r\\nTest-Path -LiteralPath <string[]> [-Filter <string>] [-Include <string[]>] [-Exclude <string[]>] [-PathType <TestPathType>] [-IsValid] [-Credential <pscredential>] [-OlderThan <datetime>] [-NewerThan <datetime>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Test-PSScriptFileInfo',
+		ListItemText: 'Test-PSScriptFileInfo',
+		ResultType: 2,
+		ToolTip: 'Test-PSScriptFileInfo\\r\\n'
+	},
+	{
+		CompletionText: 'Test-PSSessionConfigurationFile',
+		ListItemText: 'Test-PSSessionConfigurationFile',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-PSSessionConfigurationFile [-Path] <string> [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Test-ScriptFileInfo',
+		ListItemText: 'Test-ScriptFileInfo',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-ScriptFileInfo \\r\\n'
+	},
+	{
+		CompletionText: 'Test-VHD',
+		ListItemText: 'Test-VHD',
+		ResultType: 2,
+		ToolTip: 'Test-VHD\\r\\n'
+	},
+	{
+		CompletionText: 'Test-VMNetworkAdapter',
+		ListItemText: 'Test-VMNetworkAdapter',
+		ResultType: 2,
+		ToolTip: 'Test-VMNetworkAdapter\\r\\n'
+	},
+	{
+		CompletionText: 'Test-VMReplicationConnection',
+		ListItemText: 'Test-VMReplicationConnection',
+		ResultType: 2,
+		ToolTip: 'Test-VMReplicationConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Test-WSMan',
+		ListItemText: 'Test-WSMan',
+		ResultType: 2,
+		ToolTip: 'Test-WSMan\\r\\n'
+	},
+	{
+		CompletionText: 'textual.exe',
+		ListItemText: 'textual.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Programs\\Python\\Python310\\Scripts\\textual.exe'
+	},
+	{
+		CompletionText: 'tgit',
+		ListItemText: 'tgit',
+		ResultType: 2,
+		ToolTip: '\\r\\ntgit \\r\\n'
+	},
+	{
+		CompletionText: 'ThumbnailExtractionHost.exe',
+		ListItemText: 'ThumbnailExtractionHost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\ThumbnailExtractionHost.exe'
+	},
+	{
+		CompletionText: 'tid',
+		ListItemText: 'tid',
+		ResultType: 2,
+		ToolTip: 'tid'
+	},
+	{
+		CompletionText: 'TieringEngineService.exe',
+		ListItemText: 'TieringEngineService.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\TieringEngineService.exe'
+	},
+	{
+		CompletionText: 'tig.exe',
+		ListItemText: 'tig.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Git\\cmd\\tig.exe'
+	},
+	{
+		CompletionText: 'timedate.cpl',
+		ListItemText: 'timedate.cpl',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\timedate.cpl'
+	},
+	{
+		CompletionText: 'timeout.exe',
+		ListItemText: 'timeout.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\timeout.exe'
+	},
+	{
+		CompletionText: 'tnameserv.exe',
+		ListItemText: 'tnameserv.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\tnameserv.exe'
+	},
+	{
+		CompletionText: 'TNC',
+		ListItemText: 'TNC',
+		ResultType: 2,
+		ToolTip: 'TNC'
+	},
+	{
+		CompletionText: 'TokenBrokerCookies.exe',
+		ListItemText: 'TokenBrokerCookies.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\TokenBrokerCookies.exe'
+	},
+	{
+		CompletionText: 'tpm.msc',
+		ListItemText: 'tpm.msc',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\tpm.msc'
+	},
+	{
+		CompletionText: 'TpmInit.exe',
+		ListItemText: 'TpmInit.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\TpmInit.exe'
+	},
+	{
+		CompletionText: 'TpmTool.exe',
+		ListItemText: 'TpmTool.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\TpmTool.exe'
+	},
+	{
+		CompletionText: 'tpmvscmgr.exe',
+		ListItemText: 'tpmvscmgr.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\tpmvscmgr.exe'
+	},
+	{
+		CompletionText: 'tpmvscmgrsvr.exe',
+		ListItemText: 'tpmvscmgrsvr.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\tpmvscmgrsvr.exe'
+	},
+	{
+		CompletionText: 'Trace-Command',
+		ListItemText: 'Trace-Command',
+		ResultType: 2,
+		ToolTip: '\\r\\nTrace-Command [-Name] <string[]> [-Expression] <scriptblock> [[-Option] <PSTraceSourceOptions>] [-InputObject <psobject>] [-ListenerOption <TraceOptions>] [-FilePath <string>] [-Force] [-Debugger] [-PSHost] [<CommonParameters>]\\r\\n\\r\\nTrace-Command [-Name] <string[]> [-Command] <string> [[-Option] <PSTraceSourceOptions>] [-InputObject <psobject>] [-ArgumentList <Object[]>] [-ListenerOption <TraceOptions>] [-FilePath <string>] [-Force] [-Debugger] [-PSHost] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'tracerpt.exe',
+		ListItemText: 'tracerpt.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\tracerpt.exe'
+	},
+	{
+		CompletionText: 'TRACERT.EXE',
+		ListItemText: 'TRACERT.EXE',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\TRACERT.EXE'
+	},
+	{
+		CompletionText: 'Tracker.exe',
+		ListItemText: 'Tracker.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\MSBuild\\15.0\\Bin\\Tracker.exe'
+	},
+	{
+		CompletionText: 'tree.com',
+		ListItemText: 'tree.com',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\tree.com'
+	},
+	{
+		CompletionText: 'ts-node-cwd.cmd',
+		ListItemText: 'ts-node-cwd.cmd',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Roaming\\npm\\ts-node-cwd.cmd'
+	},
+	{
+		CompletionText: 'ts-node-cwd.ps1',
+		ListItemText: 'ts-node-cwd.ps1',
+		ResultType: 2,
+		ToolTip: 'ts-node-cwd.ps1 \\r\\n'
+	},
+	{
+		CompletionText: 'ts-node-esm.cmd',
+		ListItemText: 'ts-node-esm.cmd',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Roaming\\npm\\ts-node-esm.cmd'
+	},
+	{
+		CompletionText: 'ts-node-esm.ps1',
+		ListItemText: 'ts-node-esm.ps1',
+		ResultType: 2,
+		ToolTip: 'ts-node-esm.ps1 \\r\\n'
+	},
+	{
+		CompletionText: 'ts-node-script.cmd',
+		ListItemText: 'ts-node-script.cmd',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Roaming\\npm\\ts-node-script.cmd'
+	},
+	{
+		CompletionText: 'ts-node-script.ps1',
+		ListItemText: 'ts-node-script.ps1',
+		ResultType: 2,
+		ToolTip: 'ts-node-script.ps1 \\r\\n'
+	},
+	{
+		CompletionText: 'ts-node-transpile-only.cmd',
+		ListItemText: 'ts-node-transpile-only.cmd',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Roaming\\npm\\ts-node-transpile-only.cmd'
+	},
+	{
+		CompletionText: 'ts-node-transpile-only.ps1',
+		ListItemText: 'ts-node-transpile-only.ps1',
+		ResultType: 2,
+		ToolTip: 'ts-node-transpile-only.ps1 \\r\\n'
+	},
+	{
+		CompletionText: 'ts-node.cmd',
+		ListItemText: 'ts-node.cmd',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Roaming\\npm\\ts-node.cmd'
+	},
+	{
+		CompletionText: 'ts-node.ps1',
+		ListItemText: 'ts-node.ps1',
+		ResultType: 2,
+		ToolTip: 'ts-node.ps1 \\r\\n'
+	},
+	{
+		CompletionText: 'ts-script.cmd',
+		ListItemText: 'ts-script.cmd',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Roaming\\npm\\ts-script.cmd'
+	},
+	{
+		CompletionText: 'ts-script.ps1',
+		ListItemText: 'ts-script.ps1',
+		ResultType: 2,
+		ToolTip: 'ts-script.ps1 \\r\\n'
+	},
+	{
+		CompletionText: 'tscon.exe',
+		ListItemText: 'tscon.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\tscon.exe'
+	},
+	{
+		CompletionText: 'tsdiscon.exe',
+		ListItemText: 'tsdiscon.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\tsdiscon.exe'
+	},
+	{
+		CompletionText: 'tskill.exe',
+		ListItemText: 'tskill.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\tskill.exe'
+	},
+	{
+		CompletionText: 'TSTheme.exe',
+		ListItemText: 'TSTheme.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\TSTheme.exe'
+	},
+	{
+		CompletionText: 'TSWbPrxy.exe',
+		ListItemText: 'TSWbPrxy.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\TSWbPrxy.exe'
+	},
+	{
+		CompletionText: 'ttdinject.exe',
+		ListItemText: 'ttdinject.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\ttdinject.exe'
+	},
+	{
+		CompletionText: 'tttracer.exe',
+		ListItemText: 'tttracer.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\tttracer.exe'
+	},
+	{
+		CompletionText: 'type',
+		ListItemText: 'type',
+		ResultType: 2,
+		ToolTip: 'Get-Content'
+	},
+	{
+		CompletionText: 'typeperf.exe',
+		ListItemText: 'typeperf.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\typeperf.exe'
+	},
+	{
+		CompletionText: 'tzsync.exe',
+		ListItemText: 'tzsync.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\tzsync.exe'
+	},
+	{
+		CompletionText: 'tzutil.exe',
+		ListItemText: 'tzutil.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\tzutil.exe'
+	},
+	{
+		CompletionText: 'U:',
+		ListItemText: 'U:',
+		ResultType: 2,
+		ToolTip: '\\r\\nU: \\r\\n'
+	},
+	{
+		CompletionText: 'ubuntu.exe',
+		ListItemText: 'ubuntu.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\ubuntu.exe'
+	},
+	{
+		CompletionText: 'UCPDMgr.exe',
+		ListItemText: 'UCPDMgr.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\UCPDMgr.exe'
+	},
+	{
+		CompletionText: 'ucsvc.exe',
+		ListItemText: 'ucsvc.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\ucsvc.exe'
+	},
+	{
+		CompletionText: 'udres',
+		ListItemText: 'udres',
+		ResultType: 2,
+		ToolTip: 'udres'
+	},
+	{
+		CompletionText: 'udsmbmc',
+		ListItemText: 'udsmbmc',
+		ResultType: 2,
+		ToolTip: 'udsmbmc'
+	},
+	{
+		CompletionText: 'UevAgentPolicyGenerator.exe',
+		ListItemText: 'UevAgentPolicyGenerator.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\UevAgentPolicyGenerator.exe'
+	},
+	{
+		CompletionText: 'UevAppMonitor.exe',
+		ListItemText: 'UevAppMonitor.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\UevAppMonitor.exe'
+	},
+	{
+		CompletionText: 'UevTemplateBaselineGenerator.exe',
+		ListItemText: 'UevTemplateBaselineGenerator.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\UevTemplateBaselineGenerator.exe'
+	},
+	{
+		CompletionText: 'UevTemplateConfigItemGenerator.exe',
+		ListItemText: 'UevTemplateConfigItemGenerator.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\UevTemplateConfigItemGenerator.exe'
+	},
+	{
+		CompletionText: 'UIMgrBroker.exe',
+		ListItemText: 'UIMgrBroker.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\UIMgrBroker.exe'
+	},
+	{
+		CompletionText: 'ulsmba',
+		ListItemText: 'ulsmba',
+		ResultType: 2,
+		ToolTip: 'ulsmba'
+	},
+	{
+		CompletionText: 'ulsmbclas',
+		ListItemText: 'ulsmbclas',
+		ResultType: 2,
+		ToolTip: 'ulsmbclas'
+	},
+	{
+		CompletionText: 'Unblock-File',
+		ListItemText: 'Unblock-File',
+		ResultType: 2,
+		ToolTip: '\\r\\nUnblock-File [-Path] <string[]> [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nUnblock-File -LiteralPath <string[]> [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Unblock-FileShareAccess',
+		ListItemText: 'Unblock-FileShareAccess',
+		ResultType: 2,
+		ToolTip: '\\r\\nUnblock-FileShareAccess \\r\\n'
+	},
+	{
+		CompletionText: 'Unblock-SmbClientAccessToServer',
+		ListItemText: 'Unblock-SmbClientAccessToServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nUnblock-SmbClientAccessToServer \\r\\n'
+	},
+	{
+		CompletionText: 'Unblock-SmbShareAccess',
+		ListItemText: 'Unblock-SmbShareAccess',
+		ResultType: 2,
+		ToolTip: '\\r\\nUnblock-SmbShareAccess \\r\\n'
+	},
+	{
+		CompletionText: 'Unblock-Tpm',
+		ListItemText: 'Unblock-Tpm',
+		ResultType: 2,
+		ToolTip: 'Unblock-Tpm\\r\\n'
+	},
+	{
+		CompletionText: 'Undo-AzCognitiveServicesAccountRemoval',
+		ListItemText: 'Undo-AzCognitiveServicesAccountRemoval',
+		ResultType: 2,
+		ToolTip: 'Undo-AzCognitiveServicesAccountRemoval\\r\\n'
+	},
+	{
+		CompletionText: 'Undo-AzKeyVaultCertificateRemoval',
+		ListItemText: 'Undo-AzKeyVaultCertificateRemoval',
+		ResultType: 2,
+		ToolTip: 'Undo-AzKeyVaultCertificateRemoval\\r\\n'
+	},
+	{
+		CompletionText: 'Undo-AzKeyVaultKeyRemoval',
+		ListItemText: 'Undo-AzKeyVaultKeyRemoval',
+		ResultType: 2,
+		ToolTip: 'Undo-AzKeyVaultKeyRemoval\\r\\n'
+	},
+	{
+		CompletionText: 'Undo-AzKeyVaultManagedHsmRemoval',
+		ListItemText: 'Undo-AzKeyVaultManagedHsmRemoval',
+		ResultType: 2,
+		ToolTip: 'Undo-AzKeyVaultManagedHsmRemoval\\r\\n'
+	},
+	{
+		CompletionText: 'Undo-AzKeyVaultManagedStorageAccountRemoval',
+		ListItemText: 'Undo-AzKeyVaultManagedStorageAccountRemoval',
+		ResultType: 2,
+		ToolTip: 'Undo-AzKeyVaultManagedStorageAccountRemoval\\r\\n'
+	},
+	{
+		CompletionText: 'Undo-AzKeyVaultManagedStorageSasDefinitionRemoval',
+		ListItemText: 'Undo-AzKeyVaultManagedStorageSasDefinitionRemoval',
+		ResultType: 2,
+		ToolTip: 'Undo-AzKeyVaultManagedStorageSasDefinitionRemoval\\r\\n'
+	},
+	{
+		CompletionText: 'Undo-AzKeyVaultRemoval',
+		ListItemText: 'Undo-AzKeyVaultRemoval',
+		ResultType: 2,
+		ToolTip: 'Undo-AzKeyVaultRemoval\\r\\n'
+	},
+	{
+		CompletionText: 'Undo-AzKeyVaultSecretRemoval',
+		ListItemText: 'Undo-AzKeyVaultSecretRemoval',
+		ResultType: 2,
+		ToolTip: 'Undo-AzKeyVaultSecretRemoval\\r\\n'
+	},
+	{
+		CompletionText: 'Undo-AzRecoveryServicesBackupItemDeletion',
+		ListItemText: 'Undo-AzRecoveryServicesBackupItemDeletion',
+		ResultType: 2,
+		ToolTip: 'Undo-AzRecoveryServicesBackupItemDeletion\\r\\n'
+	},
+	{
+		CompletionText: 'Undo-DtcDiagnosticTransaction',
+		ListItemText: 'Undo-DtcDiagnosticTransaction',
+		ResultType: 2,
+		ToolTip: 'Undo-DtcDiagnosticTransaction\\r\\n'
+	},
+	{
+		CompletionText: 'unins000.exe',
+		ListItemText: 'unins000.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Git LFS\\unins000.exe'
+	},
+	{
+		CompletionText: 'Uninstall-AzureRm',
+		ListItemText: 'Uninstall-AzureRm',
+		ResultType: 2,
+		ToolTip: 'Uninstall-AzureRm\\r\\n'
+	},
+	{
+		CompletionText: 'Uninstall-Dtc',
+		ListItemText: 'Uninstall-Dtc',
+		ResultType: 2,
+		ToolTip: '\\r\\nUninstall-Dtc \\r\\n'
+	},
+	{
+		CompletionText: 'Uninstall-Language',
+		ListItemText: 'Uninstall-Language',
+		ResultType: 2,
+		ToolTip: 'Uninstall-Language\\r\\n'
+	},
+	{
+		CompletionText: 'Uninstall-Module',
+		ListItemText: 'Uninstall-Module',
+		ResultType: 2,
+		ToolTip: '\\r\\nUninstall-Module \\r\\n'
+	},
+	{
+		CompletionText: 'Uninstall-Package',
+		ListItemText: 'Uninstall-Package',
+		ResultType: 2,
+		ToolTip: 'Uninstall-Package\\r\\n'
+	},
+	{
+		CompletionText: 'Uninstall-ProvisioningPackage',
+		ListItemText: 'Uninstall-ProvisioningPackage',
+		ResultType: 2,
+		ToolTip: 'Uninstall-ProvisioningPackage\\r\\n'
+	},
+	{
+		CompletionText: 'Uninstall-PSResource',
+		ListItemText: 'Uninstall-PSResource',
+		ResultType: 2,
+		ToolTip: 'Uninstall-PSResource\\r\\n'
+	},
+	{
+		CompletionText: 'Uninstall-Script',
+		ListItemText: 'Uninstall-Script',
+		ResultType: 2,
+		ToolTip: '\\r\\nUninstall-Script \\r\\n'
+	},
+	{
+		CompletionText: 'Uninstall-TrustedProvisioningCertificate',
+		ListItemText: 'Uninstall-TrustedProvisioningCertificate',
+		ResultType: 2,
+		ToolTip: 'Uninstall-TrustedProvisioningCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Unlock-BitLocker',
+		ListItemText: 'Unlock-BitLocker',
+		ResultType: 2,
+		ToolTip: '\\r\\nUnlock-BitLocker \\r\\n'
+	},
+	{
+		CompletionText: 'unlodctr.exe',
+		ListItemText: 'unlodctr.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\unlodctr.exe'
+	},
+	{
+		CompletionText: 'unpack200.exe',
+		ListItemText: 'unpack200.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\unpack200.exe'
+	},
+	{
+		CompletionText: 'Unprotect-CmsMessage',
+		ListItemText: 'Unprotect-CmsMessage',
+		ResultType: 2,
+		ToolTip: 'Unprotect-CmsMessage\\r\\n'
+	},
+	{
+		CompletionText: 'Unregister-AppBackgroundTask',
+		ListItemText: 'Unregister-AppBackgroundTask',
+		ResultType: 2,
+		ToolTip: '\\r\\nUnregister-AppBackgroundTask \\r\\n'
+	},
+	{
+		CompletionText: 'Unregister-AzAutomationDscNode',
+		ListItemText: 'Unregister-AzAutomationDscNode',
+		ResultType: 2,
+		ToolTip: 'Unregister-AzAutomationDscNode\\r\\n'
+	},
+	{
+		CompletionText: 'Unregister-AzAutomationScheduledRunbook',
+		ListItemText: 'Unregister-AzAutomationScheduledRunbook',
+		ResultType: 2,
+		ToolTip: 'Unregister-AzAutomationScheduledRunbook\\r\\n'
+	},
+	{
+		CompletionText: 'Unregister-AzProviderFeature',
+		ListItemText: 'Unregister-AzProviderFeature',
+		ResultType: 2,
+		ToolTip: 'Unregister-AzProviderFeature\\r\\n'
+	},
+	{
+		CompletionText: 'Unregister-AzProviderPreviewFeature',
+		ListItemText: 'Unregister-AzProviderPreviewFeature',
+		ResultType: 2,
+		ToolTip: 'Unregister-AzProviderPreviewFeature\\r\\n'
+	},
+	{
+		CompletionText: 'Unregister-AzRecoveryServicesBackupContainer',
+		ListItemText: 'Unregister-AzRecoveryServicesBackupContainer',
+		ResultType: 2,
+		ToolTip: 'Unregister-AzRecoveryServicesBackupContainer\\r\\n'
+	},
+	{
+		CompletionText: 'Unregister-AzRecoveryServicesBackupManagementServer',
+		ListItemText: 'Unregister-AzRecoveryServicesBackupManagementServer',
+		ResultType: 2,
+		ToolTip: 'Unregister-AzRecoveryServicesBackupManagementServer\\r\\n'
+	},
+	{
+		CompletionText: 'Unregister-AzResourceProvider',
+		ListItemText: 'Unregister-AzResourceProvider',
+		ResultType: 2,
+		ToolTip: 'Unregister-AzResourceProvider\\r\\n'
+	},
+	{
+		CompletionText: 'Unregister-AzStackHCI',
+		ListItemText: 'Unregister-AzStackHCI',
+		ResultType: 2,
+		ToolTip: '\\r\\nUnregister-AzStackHCI \\r\\n'
+	},
+	{
+		CompletionText: 'Unregister-AzStaticWebAppBuildUserProvidedFunctionApp',
+		ListItemText: 'Unregister-AzStaticWebAppBuildUserProvidedFunctionApp',
+		ResultType: 2,
+		ToolTip: '\\r\\nUnregister-AzStaticWebAppBuildUserProvidedFunctionApp \\r\\n'
+	},
+	{
+		CompletionText: 'Unregister-AzStaticWebAppUserProvidedFunctionApp',
+		ListItemText: 'Unregister-AzStaticWebAppUserProvidedFunctionApp',
+		ResultType: 2,
+		ToolTip: '\\r\\nUnregister-AzStaticWebAppUserProvidedFunctionApp \\r\\n'
+	},
+	{
+		CompletionText: 'Unregister-AzStorageMoverAgent',
+		ListItemText: 'Unregister-AzStorageMoverAgent',
+		ResultType: 2,
+		ToolTip: '\\r\\nUnregister-AzStorageMoverAgent \\r\\n'
+	},
+	{
+		CompletionText: 'Unregister-AzStorageSyncServer',
+		ListItemText: 'Unregister-AzStorageSyncServer',
+		ResultType: 2,
+		ToolTip: 'Unregister-AzStorageSyncServer\\r\\n'
+	},
+	{
+		CompletionText: 'Unregister-AzWvdApplicationGroup',
+		ListItemText: 'Unregister-AzWvdApplicationGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nUnregister-AzWvdApplicationGroup \\r\\n'
+	},
+	{
+		CompletionText: 'Unregister-ClusteredScheduledTask',
+		ListItemText: 'Unregister-ClusteredScheduledTask',
+		ResultType: 2,
+		ToolTip: '\\r\\nUnregister-ClusteredScheduledTask \\r\\n'
+	},
+	{
+		CompletionText: 'Unregister-Event',
+		ListItemText: 'Unregister-Event',
+		ResultType: 2,
+		ToolTip: '\\r\\nUnregister-Event [-SourceIdentifier] <string> [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nUnregister-Event [-SubscriptionId] <int> [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Unregister-IscsiSession',
+		ListItemText: 'Unregister-IscsiSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nUnregister-IscsiSession \\r\\n'
+	},
+	{
+		CompletionText: 'Unregister-PackageSource',
+		ListItemText: 'Unregister-PackageSource',
+		ResultType: 2,
+		ToolTip: 'Unregister-PackageSource\\r\\n'
+	},
+	{
+		CompletionText: 'Unregister-PSRepository',
+		ListItemText: 'Unregister-PSRepository',
+		ResultType: 2,
+		ToolTip: '\\r\\nUnregister-PSRepository \\r\\n'
+	},
+	{
+		CompletionText: 'Unregister-PSResourceRepository',
+		ListItemText: 'Unregister-PSResourceRepository',
+		ResultType: 2,
+		ToolTip: 'Unregister-PSResourceRepository\\r\\n'
+	},
+	{
+		CompletionText: 'Unregister-PSSessionConfiguration',
+		ListItemText: 'Unregister-PSSessionConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nUnregister-PSSessionConfiguration [-Name] <string> [-Force] [-NoServiceRestart] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Unregister-ScheduledJob',
+		ListItemText: 'Unregister-ScheduledJob',
+		ResultType: 2,
+		ToolTip: 'Unregister-ScheduledJob\\r\\n'
+	},
+	{
+		CompletionText: 'Unregister-ScheduledTask',
+		ListItemText: 'Unregister-ScheduledTask',
+		ResultType: 2,
+		ToolTip: '\\r\\nUnregister-ScheduledTask \\r\\n'
+	},
+	{
+		CompletionText: 'Unregister-StorageSubsystem',
+		ListItemText: 'Unregister-StorageSubsystem',
+		ResultType: 2,
+		ToolTip: '\\r\\nUnregister-StorageSubsystem \\r\\n'
+	},
+	{
+		CompletionText: 'Unregister-WindowsDeveloperLicense',
+		ListItemText: 'Unregister-WindowsDeveloperLicense',
+		ResultType: 2,
+		ToolTip: 'Unregister-WindowsDeveloperLicense\\r\\n'
+	},
+	{
+		CompletionText: 'unregmp2.exe',
+		ListItemText: 'unregmp2.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\unregmp2.exe'
+	},
+	{
+		CompletionText: 'unsecapp.exe',
+		ListItemText: 'unsecapp.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\System32\\Wbem\\unsecapp.exe'
+	},
+	{
+		CompletionText: 'upcfg',
+		ListItemText: 'upcfg',
+		ResultType: 2,
+		ToolTip: 'upcfg'
+	},
+	{
+		CompletionText: 'Update-AdlAnalyticsComputePolicy',
+		ListItemText: 'Update-AdlAnalyticsComputePolicy',
+		ResultType: 2,
+		ToolTip: 'Update-AdlAnalyticsComputePolicy'
+	},
+	{
+		CompletionText: 'Update-AllBranches',
+		ListItemText: 'Update-AllBranches',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AllBranches \\r\\n'
+	},
+	{
+		CompletionText: 'Update-ASRMobilityService',
+		ListItemText: 'Update-ASRMobilityService',
+		ResultType: 2,
+		ToolTip: 'Update-ASRMobilityService'
+	},
+	{
+		CompletionText: 'Update-ASRPolicy',
+		ListItemText: 'Update-ASRPolicy',
+		ResultType: 2,
+		ToolTip: 'Update-ASRPolicy'
+	},
+	{
+		CompletionText: 'Update-ASRProtectionContainerMapping',
+		ListItemText: 'Update-ASRProtectionContainerMapping',
+		ResultType: 2,
+		ToolTip: 'Update-ASRProtectionContainerMapping'
+	},
+	{
+		CompletionText: 'Update-ASRProtectionDirection',
+		ListItemText: 'Update-ASRProtectionDirection',
+		ResultType: 2,
+		ToolTip: 'Update-ASRProtectionDirection'
+	},
+	{
+		CompletionText: 'Update-ASRRecoveryPlan',
+		ListItemText: 'Update-ASRRecoveryPlan',
+		ResultType: 2,
+		ToolTip: 'Update-ASRRecoveryPlan'
+	},
+	{
+		CompletionText: 'Update-ASRServicesProvider',
+		ListItemText: 'Update-ASRServicesProvider',
+		ResultType: 2,
+		ToolTip: 'Update-ASRServicesProvider'
+	},
+	{
+		CompletionText: 'Update-ASRvCenter',
+		ListItemText: 'Update-ASRvCenter',
+		ResultType: 2,
+		ToolTip: 'Update-ASRvCenter'
+	},
+	{
+		CompletionText: 'Update-AutologgerConfig',
+		ListItemText: 'Update-AutologgerConfig',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AutologgerConfig \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzActivityLogAlert',
+		ListItemText: 'Update-AzActivityLogAlert',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzActivityLogAlert \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzADAppFederatedCredential',
+		ListItemText: 'Update-AzADAppFederatedCredential',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzADAppFederatedCredential \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzADApplication',
+		ListItemText: 'Update-AzADApplication',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzADApplication \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzADGroup',
+		ListItemText: 'Update-AzADGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzADGroup \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzADServicePrincipal',
+		ListItemText: 'Update-AzADServicePrincipal',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzADServicePrincipal \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzADUser',
+		ListItemText: 'Update-AzADUser',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzADUser \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzAksNodePool',
+		ListItemText: 'Update-AzAksNodePool',
+		ResultType: 2,
+		ToolTip: 'Update-AzAksNodePool\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzApiManagementApiRelease',
+		ListItemText: 'Update-AzApiManagementApiRelease',
+		ResultType: 2,
+		ToolTip: 'Update-AzApiManagementApiRelease\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzApiManagementCache',
+		ListItemText: 'Update-AzApiManagementCache',
+		ResultType: 2,
+		ToolTip: 'Update-AzApiManagementCache\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzApiManagementGateway',
+		ListItemText: 'Update-AzApiManagementGateway',
+		ResultType: 2,
+		ToolTip: 'Update-AzApiManagementGateway\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzApiManagementRegion',
+		ListItemText: 'Update-AzApiManagementRegion',
+		ResultType: 2,
+		ToolTip: 'Update-AzApiManagementRegion\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzAppConfigurationStore',
+		ListItemText: 'Update-AzAppConfigurationStore',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzAppConfigurationStore \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzApplicationInsights',
+		ListItemText: 'Update-AzApplicationInsights',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzApplicationInsights \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzApplicationInsightsLinkedStorageAccount',
+		ListItemText: 'Update-AzApplicationInsightsLinkedStorageAccount',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzApplicationInsightsLinkedStorageAccount \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzApplicationInsightsMyWorkbook',
+		ListItemText: 'Update-AzApplicationInsightsMyWorkbook',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzApplicationInsightsMyWorkbook \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzApplicationInsightsWebTestTag',
+		ListItemText: 'Update-AzApplicationInsightsWebTestTag',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzApplicationInsightsWebTestTag \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzApplicationInsightsWorkbook',
+		ListItemText: 'Update-AzApplicationInsightsWorkbook',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzApplicationInsightsWorkbook \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzApplicationInsightsWorkbookTemplate',
+		ListItemText: 'Update-AzApplicationInsightsWorkbookTemplate',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzApplicationInsightsWorkbookTemplate \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzAttestationProvider',
+		ListItemText: 'Update-AzAttestationProvider',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzAttestationProvider \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzAutomanageConfigProfile',
+		ListItemText: 'Update-AzAutomanageConfigProfile',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzAutomanageConfigProfile \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzAutomationSourceControl',
+		ListItemText: 'Update-AzAutomationSourceControl',
+		ResultType: 2,
+		ToolTip: 'Update-AzAutomationSourceControl\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzAutoscaleSetting',
+		ListItemText: 'Update-AzAutoscaleSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzAutoscaleSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzAvailabilitySet',
+		ListItemText: 'Update-AzAvailabilitySet',
+		ResultType: 2,
+		ToolTip: 'Update-AzAvailabilitySet\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCapacityReservation',
+		ListItemText: 'Update-AzCapacityReservation',
+		ResultType: 2,
+		ToolTip: 'Update-AzCapacityReservation\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCapacityReservationGroup',
+		ListItemText: 'Update-AzCapacityReservationGroup',
+		ResultType: 2,
+		ToolTip: 'Update-AzCapacityReservationGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCdnEndpoint',
+		ListItemText: 'Update-AzCdnEndpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzCdnEndpoint \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCdnOrigin',
+		ListItemText: 'Update-AzCdnOrigin',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzCdnOrigin \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCdnOriginGroup',
+		ListItemText: 'Update-AzCdnOriginGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzCdnOriginGroup \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCdnProfile',
+		ListItemText: 'Update-AzCdnProfile',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzCdnProfile \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCloudService',
+		ListItemText: 'Update-AzCloudService',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzCloudService \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCognitiveServicesAccountNetworkRuleSet',
+		ListItemText: 'Update-AzCognitiveServicesAccountNetworkRuleSet',
+		ResultType: 2,
+		ToolTip: 'Update-AzCognitiveServicesAccountNetworkRuleSet\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzConfidentialLedger',
+		ListItemText: 'Update-AzConfidentialLedger',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzConfidentialLedger \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzConfig',
+		ListItemText: 'Update-AzConfig',
+		ResultType: 2,
+		ToolTip: 'Update-AzConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzContainerGroup',
+		ListItemText: 'Update-AzContainerGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzContainerGroup \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzContainerRegistry',
+		ListItemText: 'Update-AzContainerRegistry',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzContainerRegistry \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzContainerRegistryAgentPool',
+		ListItemText: 'Update-AzContainerRegistryAgentPool',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzContainerRegistryAgentPool \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzContainerRegistryCredential',
+		ListItemText: 'Update-AzContainerRegistryCredential',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzContainerRegistryCredential \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzContainerRegistryManifest',
+		ListItemText: 'Update-AzContainerRegistryManifest',
+		ResultType: 2,
+		ToolTip: 'Update-AzContainerRegistryManifest\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzContainerRegistryRepository',
+		ListItemText: 'Update-AzContainerRegistryRepository',
+		ResultType: 2,
+		ToolTip: 'Update-AzContainerRegistryRepository\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzContainerRegistryScopeMap',
+		ListItemText: 'Update-AzContainerRegistryScopeMap',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzContainerRegistryScopeMap \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzContainerRegistryTag',
+		ListItemText: 'Update-AzContainerRegistryTag',
+		ResultType: 2,
+		ToolTip: 'Update-AzContainerRegistryTag\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzContainerRegistryToken',
+		ListItemText: 'Update-AzContainerRegistryToken',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzContainerRegistryToken \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzContainerRegistryWebhook',
+		ListItemText: 'Update-AzContainerRegistryWebhook',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzContainerRegistryWebhook \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCosmosDBAccount',
+		ListItemText: 'Update-AzCosmosDBAccount',
+		ResultType: 2,
+		ToolTip: 'Update-AzCosmosDBAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCosmosDBAccountFailoverPriority',
+		ListItemText: 'Update-AzCosmosDBAccountFailoverPriority',
+		ResultType: 2,
+		ToolTip: 'Update-AzCosmosDBAccountFailoverPriority\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCosmosDBAccountRegion',
+		ListItemText: 'Update-AzCosmosDBAccountRegion',
+		ResultType: 2,
+		ToolTip: 'Update-AzCosmosDBAccountRegion\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCosmosDBCassandraKeyspace',
+		ListItemText: 'Update-AzCosmosDBCassandraKeyspace',
+		ResultType: 2,
+		ToolTip: 'Update-AzCosmosDBCassandraKeyspace\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCosmosDBCassandraKeyspaceThroughput',
+		ListItemText: 'Update-AzCosmosDBCassandraKeyspaceThroughput',
+		ResultType: 2,
+		ToolTip: 'Update-AzCosmosDBCassandraKeyspaceThroughput\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCosmosDBCassandraTable',
+		ListItemText: 'Update-AzCosmosDBCassandraTable',
+		ResultType: 2,
+		ToolTip: 'Update-AzCosmosDBCassandraTable\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCosmosDBCassandraTableThroughput',
+		ListItemText: 'Update-AzCosmosDBCassandraTableThroughput',
+		ResultType: 2,
+		ToolTip: 'Update-AzCosmosDBCassandraTableThroughput\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCosmosDbClientEncryptionKey',
+		ListItemText: 'Update-AzCosmosDbClientEncryptionKey',
+		ResultType: 2,
+		ToolTip: 'Update-AzCosmosDbClientEncryptionKey\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCosmosDBGremlinDatabase',
+		ListItemText: 'Update-AzCosmosDBGremlinDatabase',
+		ResultType: 2,
+		ToolTip: 'Update-AzCosmosDBGremlinDatabase\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCosmosDBGremlinDatabaseThroughput',
+		ListItemText: 'Update-AzCosmosDBGremlinDatabaseThroughput',
+		ResultType: 2,
+		ToolTip: 'Update-AzCosmosDBGremlinDatabaseThroughput\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCosmosDBGremlinGraph',
+		ListItemText: 'Update-AzCosmosDBGremlinGraph',
+		ResultType: 2,
+		ToolTip: 'Update-AzCosmosDBGremlinGraph\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCosmosDBGremlinGraphThroughput',
+		ListItemText: 'Update-AzCosmosDBGremlinGraphThroughput',
+		ResultType: 2,
+		ToolTip: 'Update-AzCosmosDBGremlinGraphThroughput\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCosmosDBMongoDBCollection',
+		ListItemText: 'Update-AzCosmosDBMongoDBCollection',
+		ResultType: 2,
+		ToolTip: 'Update-AzCosmosDBMongoDBCollection\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCosmosDBMongoDBCollectionThroughput',
+		ListItemText: 'Update-AzCosmosDBMongoDBCollectionThroughput',
+		ResultType: 2,
+		ToolTip: 'Update-AzCosmosDBMongoDBCollectionThroughput\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCosmosDBMongoDBDatabase',
+		ListItemText: 'Update-AzCosmosDBMongoDBDatabase',
+		ResultType: 2,
+		ToolTip: 'Update-AzCosmosDBMongoDBDatabase\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCosmosDBMongoDBDatabaseThroughput',
+		ListItemText: 'Update-AzCosmosDBMongoDBDatabaseThroughput',
+		ResultType: 2,
+		ToolTip: 'Update-AzCosmosDBMongoDBDatabaseThroughput\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCosmosDBMongoDBRoleDefinition',
+		ListItemText: 'Update-AzCosmosDBMongoDBRoleDefinition',
+		ResultType: 2,
+		ToolTip: 'Update-AzCosmosDBMongoDBRoleDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCosmosDBMongoDBUserDefinition',
+		ListItemText: 'Update-AzCosmosDBMongoDBUserDefinition',
+		ResultType: 2,
+		ToolTip: 'Update-AzCosmosDBMongoDBUserDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCosmosDBSqlContainer',
+		ListItemText: 'Update-AzCosmosDBSqlContainer',
+		ResultType: 2,
+		ToolTip: 'Update-AzCosmosDBSqlContainer\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCosmosDBSqlContainerThroughput',
+		ListItemText: 'Update-AzCosmosDBSqlContainerThroughput',
+		ResultType: 2,
+		ToolTip: 'Update-AzCosmosDBSqlContainerThroughput\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCosmosDBSqlDatabase',
+		ListItemText: 'Update-AzCosmosDBSqlDatabase',
+		ResultType: 2,
+		ToolTip: 'Update-AzCosmosDBSqlDatabase\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCosmosDBSqlDatabaseThroughput',
+		ListItemText: 'Update-AzCosmosDBSqlDatabaseThroughput',
+		ResultType: 2,
+		ToolTip: 'Update-AzCosmosDBSqlDatabaseThroughput\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCosmosDBSqlRoleAssignment',
+		ListItemText: 'Update-AzCosmosDBSqlRoleAssignment',
+		ResultType: 2,
+		ToolTip: 'Update-AzCosmosDBSqlRoleAssignment\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCosmosDBSqlRoleDefinition',
+		ListItemText: 'Update-AzCosmosDBSqlRoleDefinition',
+		ResultType: 2,
+		ToolTip: 'Update-AzCosmosDBSqlRoleDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCosmosDBSqlStoredProcedure',
+		ListItemText: 'Update-AzCosmosDBSqlStoredProcedure',
+		ResultType: 2,
+		ToolTip: 'Update-AzCosmosDBSqlStoredProcedure\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCosmosDBSqlTrigger',
+		ListItemText: 'Update-AzCosmosDBSqlTrigger',
+		ResultType: 2,
+		ToolTip: 'Update-AzCosmosDBSqlTrigger\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCosmosDBSqlUserDefinedFunction',
+		ListItemText: 'Update-AzCosmosDBSqlUserDefinedFunction',
+		ResultType: 2,
+		ToolTip: 'Update-AzCosmosDBSqlUserDefinedFunction\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCosmosDBTable',
+		ListItemText: 'Update-AzCosmosDBTable',
+		ResultType: 2,
+		ToolTip: 'Update-AzCosmosDBTable\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCosmosDBTableThroughput',
+		ListItemText: 'Update-AzCosmosDBTableThroughput',
+		ResultType: 2,
+		ToolTip: 'Update-AzCosmosDBTableThroughput\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzCustomIpPrefix',
+		ListItemText: 'Update-AzCustomIpPrefix',
+		ResultType: 2,
+		ToolTip: 'Update-AzCustomIpPrefix\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzDatabricksAccessConnector',
+		ListItemText: 'Update-AzDatabricksAccessConnector',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzDatabricksAccessConnector \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzDatabricksVNetPeering',
+		ListItemText: 'Update-AzDatabricksVNetPeering',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzDatabricksVNetPeering \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzDatabricksWorkspace',
+		ListItemText: 'Update-AzDatabricksWorkspace',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzDatabricksWorkspace \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzDataCollectionRule',
+		ListItemText: 'Update-AzDataCollectionRule',
+		ResultType: 2,
+		ToolTip: 'Update-AzDataCollectionRule\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzDataFactoryV2',
+		ListItemText: 'Update-AzDataFactoryV2',
+		ResultType: 2,
+		ToolTip: 'Update-AzDataFactoryV2\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzDataFactoryV2IntegrationRuntime',
+		ListItemText: 'Update-AzDataFactoryV2IntegrationRuntime',
+		ResultType: 2,
+		ToolTip: 'Update-AzDataFactoryV2IntegrationRuntime\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzDataFactoryV2IntegrationRuntimeNode',
+		ListItemText: 'Update-AzDataFactoryV2IntegrationRuntimeNode',
+		ResultType: 2,
+		ToolTip: 'Update-AzDataFactoryV2IntegrationRuntimeNode\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzDataLakeAnalyticsComputePolicy',
+		ListItemText: 'Update-AzDataLakeAnalyticsComputePolicy',
+		ResultType: 2,
+		ToolTip: 'Update-AzDataLakeAnalyticsComputePolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzDataLakeGen2AclRecursive',
+		ListItemText: 'Update-AzDataLakeGen2AclRecursive',
+		ResultType: 2,
+		ToolTip: 'Update-AzDataLakeGen2AclRecursive\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzDataLakeGen2Item',
+		ListItemText: 'Update-AzDataLakeGen2Item',
+		ResultType: 2,
+		ToolTip: 'Update-AzDataLakeGen2Item\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzDataProtectionBackupInstanceAssociatedPolicy',
+		ListItemText: 'Update-AzDataProtectionBackupInstanceAssociatedPolicy',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzDataProtectionBackupInstanceAssociatedPolicy \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzDataProtectionBackupVault',
+		ListItemText: 'Update-AzDataProtectionBackupVault',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzDataProtectionBackupVault \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzDataProtectionResourceGuard',
+		ListItemText: 'Update-AzDataProtectionResourceGuard',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzDataProtectionResourceGuard \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzDisk',
+		ListItemText: 'Update-AzDisk',
+		ResultType: 2,
+		ToolTip: 'Update-AzDisk\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzDiskEncryptionSet',
+		ListItemText: 'Update-AzDiskEncryptionSet',
+		ResultType: 2,
+		ToolTip: 'Update-AzDiskEncryptionSet\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzEventGridChannel',
+		ListItemText: 'Update-AzEventGridChannel',
+		ResultType: 2,
+		ToolTip: 'Update-AzEventGridChannel\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzEventGridPartnerConfiguration',
+		ListItemText: 'Update-AzEventGridPartnerConfiguration',
+		ResultType: 2,
+		ToolTip: 'Update-AzEventGridPartnerConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzEventGridPartnerTopic',
+		ListItemText: 'Update-AzEventGridPartnerTopic',
+		ResultType: 2,
+		ToolTip: 'Update-AzEventGridPartnerTopic\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzEventGridPartnerTopicEventSubscription',
+		ListItemText: 'Update-AzEventGridPartnerTopicEventSubscription',
+		ResultType: 2,
+		ToolTip: 'Update-AzEventGridPartnerTopicEventSubscription\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzEventGridSubscription',
+		ListItemText: 'Update-AzEventGridSubscription',
+		ResultType: 2,
+		ToolTip: 'Update-AzEventGridSubscription\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzEventGridSystemTopic',
+		ListItemText: 'Update-AzEventGridSystemTopic',
+		ResultType: 2,
+		ToolTip: 'Update-AzEventGridSystemTopic\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzEventGridSystemTopicEventSubscription',
+		ListItemText: 'Update-AzEventGridSystemTopicEventSubscription',
+		ResultType: 2,
+		ToolTip: 'Update-AzEventGridSystemTopicEventSubscription\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzFederatedIdentityCredentials',
+		ListItemText: 'Update-AzFederatedIdentityCredentials',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzFederatedIdentityCredentials \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzFrontDoorCdnCustomDomain',
+		ListItemText: 'Update-AzFrontDoorCdnCustomDomain',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzFrontDoorCdnCustomDomain \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzFrontDoorCdnCustomDomainValidationToken',
+		ListItemText: 'Update-AzFrontDoorCdnCustomDomainValidationToken',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzFrontDoorCdnCustomDomainValidationToken \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzFrontDoorCdnEndpoint',
+		ListItemText: 'Update-AzFrontDoorCdnEndpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzFrontDoorCdnEndpoint \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzFrontDoorCdnOrigin',
+		ListItemText: 'Update-AzFrontDoorCdnOrigin',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzFrontDoorCdnOrigin \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzFrontDoorCdnOriginGroup',
+		ListItemText: 'Update-AzFrontDoorCdnOriginGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzFrontDoorCdnOriginGroup \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzFrontDoorCdnProfile',
+		ListItemText: 'Update-AzFrontDoorCdnProfile',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzFrontDoorCdnProfile \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzFrontDoorCdnProfileSku',
+		ListItemText: 'Update-AzFrontDoorCdnProfileSku',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzFrontDoorCdnProfileSku \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzFrontDoorCdnRoute',
+		ListItemText: 'Update-AzFrontDoorCdnRoute',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzFrontDoorCdnRoute \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzFrontDoorCdnRule',
+		ListItemText: 'Update-AzFrontDoorCdnRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzFrontDoorCdnRule \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzFrontDoorCdnSecurityPolicy',
+		ListItemText: 'Update-AzFrontDoorCdnSecurityPolicy',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzFrontDoorCdnSecurityPolicy \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzFrontDoorWafPolicy',
+		ListItemText: 'Update-AzFrontDoorWafPolicy',
+		ResultType: 2,
+		ToolTip: 'Update-AzFrontDoorWafPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzFunctionApp',
+		ListItemText: 'Update-AzFunctionApp',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzFunctionApp \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzFunctionAppPlan',
+		ListItemText: 'Update-AzFunctionAppPlan',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzFunctionAppPlan \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzFunctionAppSetting',
+		ListItemText: 'Update-AzFunctionAppSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzFunctionAppSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzGallery',
+		ListItemText: 'Update-AzGallery',
+		ResultType: 2,
+		ToolTip: 'Update-AzGallery\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzGalleryApplication',
+		ListItemText: 'Update-AzGalleryApplication',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzGalleryApplication \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzGalleryApplicationVersion',
+		ListItemText: 'Update-AzGalleryApplicationVersion',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzGalleryApplicationVersion \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzGalleryImageDefinition',
+		ListItemText: 'Update-AzGalleryImageDefinition',
+		ResultType: 2,
+		ToolTip: 'Update-AzGalleryImageDefinition\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzGalleryImageVersion',
+		ListItemText: 'Update-AzGalleryImageVersion',
+		ResultType: 2,
+		ToolTip: 'Update-AzGalleryImageVersion\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzHealthcareApisService',
+		ListItemText: 'Update-AzHealthcareApisService',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzHealthcareApisService \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzHealthcareApisWorkspace',
+		ListItemText: 'Update-AzHealthcareApisWorkspace',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzHealthcareApisWorkspace \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzHealthcareDicomService',
+		ListItemText: 'Update-AzHealthcareDicomService',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzHealthcareDicomService \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzHealthcareFhirService',
+		ListItemText: 'Update-AzHealthcareFhirService',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzHealthcareFhirService \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzHealthcareIotConnector',
+		ListItemText: 'Update-AzHealthcareIotConnector',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzHealthcareIotConnector \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzImage',
+		ListItemText: 'Update-AzImage',
+		ResultType: 2,
+		ToolTip: 'Update-AzImage\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzInsightsPrivateLinkScope',
+		ListItemText: 'Update-AzInsightsPrivateLinkScope',
+		ResultType: 2,
+		ToolTip: 'Update-AzInsightsPrivateLinkScope\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzIotHub',
+		ListItemText: 'Update-AzIotHub',
+		ResultType: 2,
+		ToolTip: 'Update-AzIotHub\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzIotHubDeviceTwin',
+		ListItemText: 'Update-AzIotHubDeviceTwin',
+		ResultType: 2,
+		ToolTip: 'Update-AzIotHubDeviceTwin\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzIotHubModuleTwin',
+		ListItemText: 'Update-AzIotHubModuleTwin',
+		ResultType: 2,
+		ToolTip: 'Update-AzIotHubModuleTwin\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzIotSecuritySolution',
+		ListItemText: 'Update-AzIotSecuritySolution',
+		ResultType: 2,
+		ToolTip: 'Update-AzIotSecuritySolution\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzKeyVault',
+		ListItemText: 'Update-AzKeyVault',
+		ResultType: 2,
+		ToolTip: 'Update-AzKeyVault\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzKeyVaultCertificate',
+		ListItemText: 'Update-AzKeyVaultCertificate',
+		ResultType: 2,
+		ToolTip: 'Update-AzKeyVaultCertificate\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzKeyVaultKey',
+		ListItemText: 'Update-AzKeyVaultKey',
+		ResultType: 2,
+		ToolTip: 'Update-AzKeyVaultKey\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzKeyVaultManagedHsm',
+		ListItemText: 'Update-AzKeyVaultManagedHsm',
+		ResultType: 2,
+		ToolTip: 'Update-AzKeyVaultManagedHsm\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzKeyVaultManagedStorageAccount',
+		ListItemText: 'Update-AzKeyVaultManagedStorageAccount',
+		ResultType: 2,
+		ToolTip: 'Update-AzKeyVaultManagedStorageAccount\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzKeyVaultManagedStorageAccountKey',
+		ListItemText: 'Update-AzKeyVaultManagedStorageAccountKey',
+		ResultType: 2,
+		ToolTip: 'Update-AzKeyVaultManagedStorageAccountKey\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzKeyVaultNetworkRuleSet',
+		ListItemText: 'Update-AzKeyVaultNetworkRuleSet',
+		ResultType: 2,
+		ToolTip: 'Update-AzKeyVaultNetworkRuleSet\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzKeyVaultSecret',
+		ListItemText: 'Update-AzKeyVaultSecret',
+		ResultType: 2,
+		ToolTip: 'Update-AzKeyVaultSecret\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzKustoCluster',
+		ListItemText: 'Update-AzKustoCluster',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzKustoCluster \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzKustoDatabase',
+		ListItemText: 'Update-AzKustoDatabase',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzKustoDatabase \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzKustoDataConnection',
+		ListItemText: 'Update-AzKustoDataConnection',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzKustoDataConnection \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzKustoManagedPrivateEndpoint',
+		ListItemText: 'Update-AzKustoManagedPrivateEndpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzKustoManagedPrivateEndpoint \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzKustoScript',
+		ListItemText: 'Update-AzKustoScript',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzKustoScript \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzLoad',
+		ListItemText: 'Update-AzLoad',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzLoad \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzMaintenanceConfiguration',
+		ListItemText: 'Update-AzMaintenanceConfiguration',
+		ResultType: 2,
+		ToolTip: 'Update-AzMaintenanceConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzManagedCassandraCluster',
+		ListItemText: 'Update-AzManagedCassandraCluster',
+		ResultType: 2,
+		ToolTip: 'Update-AzManagedCassandraCluster\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzManagedCassandraDataCenter',
+		ListItemText: 'Update-AzManagedCassandraDataCenter',
+		ResultType: 2,
+		ToolTip: 'Update-AzManagedCassandraDataCenter\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzManagementGroup',
+		ListItemText: 'Update-AzManagementGroup',
+		ResultType: 2,
+		ToolTip: 'Update-AzManagementGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzManagementGroupHierarchySetting',
+		ListItemText: 'Update-AzManagementGroupHierarchySetting',
+		ResultType: 2,
+		ToolTip: 'Update-AzManagementGroupHierarchySetting\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzMlCommitmentPlan',
+		ListItemText: 'Update-AzMlCommitmentPlan',
+		ResultType: 2,
+		ToolTip: 'Update-AzMlCommitmentPlan\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzMLServiceQuota',
+		ListItemText: 'Update-AzMLServiceQuota',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzMLServiceQuota \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzMlWebService',
+		ListItemText: 'Update-AzMlWebService',
+		ResultType: 2,
+		ToolTip: 'Update-AzMlWebService\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzMLWorkspace',
+		ListItemText: 'Update-AzMLWorkspace',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzMLWorkspace \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzMLWorkspaceBatchDeployment',
+		ListItemText: 'Update-AzMLWorkspaceBatchDeployment',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzMLWorkspaceBatchDeployment \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzMLWorkspaceBatchEndpoint',
+		ListItemText: 'Update-AzMLWorkspaceBatchEndpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzMLWorkspaceBatchEndpoint \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzMLWorkspaceCompute',
+		ListItemText: 'Update-AzMLWorkspaceCompute',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzMLWorkspaceCompute \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzMLWorkspaceOnlineDeployment',
+		ListItemText: 'Update-AzMLWorkspaceOnlineDeployment',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzMLWorkspaceOnlineDeployment \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzMLWorkspaceOnlineEndpoint',
+		ListItemText: 'Update-AzMLWorkspaceOnlineEndpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzMLWorkspaceOnlineEndpoint \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzMonitorWorkspace',
+		ListItemText: 'Update-AzMonitorWorkspace',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzMonitorWorkspace \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzMySqlConfiguration',
+		ListItemText: 'Update-AzMySqlConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzMySqlConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzMySqlFirewallRule',
+		ListItemText: 'Update-AzMySqlFirewallRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzMySqlFirewallRule \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzMySqlFlexibleServer',
+		ListItemText: 'Update-AzMySqlFlexibleServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzMySqlFlexibleServer \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzMySqlFlexibleServerConfiguration',
+		ListItemText: 'Update-AzMySqlFlexibleServerConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzMySqlFlexibleServerConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzMySqlFlexibleServerFirewallRule',
+		ListItemText: 'Update-AzMySqlFlexibleServerFirewallRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzMySqlFlexibleServerFirewallRule \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzMySqlServer',
+		ListItemText: 'Update-AzMySqlServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzMySqlServer \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzMySqlServerConfigurationsList',
+		ListItemText: 'Update-AzMySqlServerConfigurationsList',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzMySqlServerConfigurationsList \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzMySqlVirtualNetworkRule',
+		ListItemText: 'Update-AzMySqlVirtualNetworkRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzMySqlVirtualNetworkRule \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzNetworkVirtualAppliance',
+		ListItemText: 'Update-AzNetworkVirtualAppliance',
+		ResultType: 2,
+		ToolTip: 'Update-AzNetworkVirtualAppliance\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzOperationalInsightsCluster',
+		ListItemText: 'Update-AzOperationalInsightsCluster',
+		ResultType: 2,
+		ToolTip: 'Update-AzOperationalInsightsCluster\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzOperationalInsightsDataExport',
+		ListItemText: 'Update-AzOperationalInsightsDataExport',
+		ResultType: 2,
+		ToolTip: 'Update-AzOperationalInsightsDataExport\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzOperationalInsightsTable',
+		ListItemText: 'Update-AzOperationalInsightsTable',
+		ResultType: 2,
+		ToolTip: 'Update-AzOperationalInsightsTable\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzOperationalInsightsWorkspaceSharedKey',
+		ListItemText: 'Update-AzOperationalInsightsWorkspaceSharedKey',
+		ResultType: 2,
+		ToolTip: 'Update-AzOperationalInsightsWorkspaceSharedKey\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzP2sVpnGateway',
+		ListItemText: 'Update-AzP2sVpnGateway',
+		ResultType: 2,
+		ToolTip: 'Update-AzP2sVpnGateway\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzPostgreSqlConfiguration',
+		ListItemText: 'Update-AzPostgreSqlConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzPostgreSqlConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzPostgreSqlFirewallRule',
+		ListItemText: 'Update-AzPostgreSqlFirewallRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzPostgreSqlFirewallRule \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzPostgreSqlFlexibleServer',
+		ListItemText: 'Update-AzPostgreSqlFlexibleServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzPostgreSqlFlexibleServer \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzPostgreSqlFlexibleServerConfiguration',
+		ListItemText: 'Update-AzPostgreSqlFlexibleServerConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzPostgreSqlFlexibleServerConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzPostgreSqlFlexibleServerFirewallRule',
+		ListItemText: 'Update-AzPostgreSqlFlexibleServerFirewallRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzPostgreSqlFlexibleServerFirewallRule \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzPostgreSqlServer',
+		ListItemText: 'Update-AzPostgreSqlServer',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzPostgreSqlServer \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzPostgreSqlVirtualNetworkRule',
+		ListItemText: 'Update-AzPostgreSqlVirtualNetworkRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzPostgreSqlVirtualNetworkRule \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzPowerBIEmbeddedCapacity',
+		ListItemText: 'Update-AzPowerBIEmbeddedCapacity',
+		ResultType: 2,
+		ToolTip: 'Update-AzPowerBIEmbeddedCapacity\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzRecoveryServicesAsrMobilityService',
+		ListItemText: 'Update-AzRecoveryServicesAsrMobilityService',
+		ResultType: 2,
+		ToolTip: 'Update-AzRecoveryServicesAsrMobilityService\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzRecoveryServicesAsrNetworkMapping',
+		ListItemText: 'Update-AzRecoveryServicesAsrNetworkMapping',
+		ResultType: 2,
+		ToolTip: 'Update-AzRecoveryServicesAsrNetworkMapping\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzRecoveryServicesAsrPolicy',
+		ListItemText: 'Update-AzRecoveryServicesAsrPolicy',
+		ResultType: 2,
+		ToolTip: 'Update-AzRecoveryServicesAsrPolicy\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzRecoveryServicesAsrProtectionContainerMapping',
+		ListItemText: 'Update-AzRecoveryServicesAsrProtectionContainerMapping',
+		ResultType: 2,
+		ToolTip: 'Update-AzRecoveryServicesAsrProtectionContainerMapping\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzRecoveryServicesAsrProtectionDirection',
+		ListItemText: 'Update-AzRecoveryServicesAsrProtectionDirection',
+		ResultType: 2,
+		ToolTip: 'Update-AzRecoveryServicesAsrProtectionDirection\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzRecoveryServicesAsrRecoveryPlan',
+		ListItemText: 'Update-AzRecoveryServicesAsrRecoveryPlan',
+		ResultType: 2,
+		ToolTip: 'Update-AzRecoveryServicesAsrRecoveryPlan\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzRecoveryServicesAsrServicesProvider',
+		ListItemText: 'Update-AzRecoveryServicesAsrServicesProvider',
+		ResultType: 2,
+		ToolTip: 'Update-AzRecoveryServicesAsrServicesProvider\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzRecoveryServicesAsrvCenter',
+		ListItemText: 'Update-AzRecoveryServicesAsrvCenter',
+		ResultType: 2,
+		ToolTip: 'Update-AzRecoveryServicesAsrvCenter\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzRecoveryServicesVault',
+		ListItemText: 'Update-AzRecoveryServicesVault',
+		ResultType: 2,
+		ToolTip: 'Update-AzRecoveryServicesVault\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzRedisEnterpriseCache',
+		ListItemText: 'Update-AzRedisEnterpriseCache',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzRedisEnterpriseCache \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzRedisEnterpriseCacheDatabase',
+		ListItemText: 'Update-AzRedisEnterpriseCacheDatabase',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzRedisEnterpriseCacheDatabase \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzRelayNamespace',
+		ListItemText: 'Update-AzRelayNamespace',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzRelayNamespace \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzResourceMoverMoveResource',
+		ListItemText: 'Update-AzResourceMoverMoveResource',
+		ResultType: 2,
+		ToolTip: 'Update-AzResourceMoverMoveResource'
+	},
+	{
+		CompletionText: 'Update-AzRestorePointCollection',
+		ListItemText: 'Update-AzRestorePointCollection',
+		ResultType: 2,
+		ToolTip: 'Update-AzRestorePointCollection\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzRmStorageContainer',
+		ListItemText: 'Update-AzRmStorageContainer',
+		ResultType: 2,
+		ToolTip: 'Update-AzRmStorageContainer\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzRmStorageShare',
+		ListItemText: 'Update-AzRmStorageShare',
+		ResultType: 2,
+		ToolTip: 'Update-AzRmStorageShare\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzRoleManagementPolicy',
+		ListItemText: 'Update-AzRoleManagementPolicy',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzRoleManagementPolicy \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzRouteMap',
+		ListItemText: 'Update-AzRouteMap',
+		ResultType: 2,
+		ToolTip: 'Update-AzRouteMap\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzRouteServer',
+		ListItemText: 'Update-AzRouteServer',
+		ResultType: 2,
+		ToolTip: 'Update-AzRouteServer\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzRouteServerPeer',
+		ListItemText: 'Update-AzRouteServerPeer',
+		ResultType: 2,
+		ToolTip: 'Update-AzRouteServerPeer\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzScheduledQueryRule',
+		ListItemText: 'Update-AzScheduledQueryRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzScheduledQueryRule \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSentinelAlertRule',
+		ListItemText: 'Update-AzSentinelAlertRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzSentinelAlertRule \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSentinelAlertRuleAction',
+		ListItemText: 'Update-AzSentinelAlertRuleAction',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzSentinelAlertRuleAction \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSentinelAutomationRule',
+		ListItemText: 'Update-AzSentinelAutomationRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzSentinelAutomationRule \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSentinelBookmark',
+		ListItemText: 'Update-AzSentinelBookmark',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzSentinelBookmark \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSentinelBookmarkRelation',
+		ListItemText: 'Update-AzSentinelBookmarkRelation',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzSentinelBookmarkRelation \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSentinelDataConnector',
+		ListItemText: 'Update-AzSentinelDataConnector',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzSentinelDataConnector \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSentinelEntityQuery',
+		ListItemText: 'Update-AzSentinelEntityQuery',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzSentinelEntityQuery \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSentinelIncident',
+		ListItemText: 'Update-AzSentinelIncident',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzSentinelIncident \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSentinelIncidentComment',
+		ListItemText: 'Update-AzSentinelIncidentComment',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzSentinelIncidentComment \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSentinelIncidentRelation',
+		ListItemText: 'Update-AzSentinelIncidentRelation',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzSentinelIncidentRelation \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSentinelSetting',
+		ListItemText: 'Update-AzSentinelSetting',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzSentinelSetting \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzServiceFabricApplication',
+		ListItemText: 'Update-AzServiceFabricApplication',
+		ResultType: 2,
+		ToolTip: 'Update-AzServiceFabricApplication\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzServiceFabricDurability',
+		ListItemText: 'Update-AzServiceFabricDurability',
+		ResultType: 2,
+		ToolTip: 'Update-AzServiceFabricDurability\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzServiceFabricNodeType',
+		ListItemText: 'Update-AzServiceFabricNodeType',
+		ResultType: 2,
+		ToolTip: 'Update-AzServiceFabricNodeType\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzServiceFabricReliability',
+		ListItemText: 'Update-AzServiceFabricReliability',
+		ResultType: 2,
+		ToolTip: 'Update-AzServiceFabricReliability\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzServiceFabricVmImage',
+		ListItemText: 'Update-AzServiceFabricVmImage',
+		ResultType: 2,
+		ToolTip: 'Update-AzServiceFabricVmImage\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzServiceLinkerForContainerApp',
+		ListItemText: 'Update-AzServiceLinkerForContainerApp',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzServiceLinkerForContainerApp \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzServiceLinkerForSpringCloud',
+		ListItemText: 'Update-AzServiceLinkerForSpringCloud',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzServiceLinkerForSpringCloud \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzServiceLinkerForWebApp',
+		ListItemText: 'Update-AzServiceLinkerForWebApp',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzServiceLinkerForWebApp \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSignalR',
+		ListItemText: 'Update-AzSignalR',
+		ResultType: 2,
+		ToolTip: 'Update-AzSignalR\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSignalRNetworkAcl',
+		ListItemText: 'Update-AzSignalRNetworkAcl',
+		ResultType: 2,
+		ToolTip: 'Update-AzSignalRNetworkAcl\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSnapshot',
+		ListItemText: 'Update-AzSnapshot',
+		ResultType: 2,
+		ToolTip: 'Update-AzSnapshot\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSqlDatabaseAdvancedThreatProtectionSetting',
+		ListItemText: 'Update-AzSqlDatabaseAdvancedThreatProtectionSetting',
+		ResultType: 2,
+		ToolTip: 'Update-AzSqlDatabaseAdvancedThreatProtectionSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSqlDatabaseLongTermRetentionBackup',
+		ListItemText: 'Update-AzSqlDatabaseLongTermRetentionBackup',
+		ResultType: 2,
+		ToolTip: 'Update-AzSqlDatabaseLongTermRetentionBackup\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSqlDatabaseVulnerabilityAssessmentSetting',
+		ListItemText: 'Update-AzSqlDatabaseVulnerabilityAssessmentSetting',
+		ResultType: 2,
+		ToolTip: 'Update-AzSqlDatabaseVulnerabilityAssessmentSetting'
+	},
+	{
+		CompletionText: 'Update-AzSqlInstanceAdvancedThreatProtectionSetting',
+		ListItemText: 'Update-AzSqlInstanceAdvancedThreatProtectionSetting',
+		ResultType: 2,
+		ToolTip: 'Update-AzSqlInstanceAdvancedThreatProtectionSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSqlInstanceDatabaseAdvancedThreatProtectionSetting',
+		ListItemText: 'Update-AzSqlInstanceDatabaseAdvancedThreatProtectionSetting',
+		ResultType: 2,
+		ToolTip: 'Update-AzSqlInstanceDatabaseAdvancedThreatProtectionSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSqlInstanceDatabaseVulnerabilityAssessmentSetting',
+		ListItemText: 'Update-AzSqlInstanceDatabaseVulnerabilityAssessmentSetting',
+		ResultType: 2,
+		ToolTip: 'Update-AzSqlInstanceDatabaseVulnerabilityAssessmentSetting'
+	},
+	{
+		CompletionText: 'Update-AzSqlInstanceLink',
+		ListItemText: 'Update-AzSqlInstanceLink',
+		ResultType: 2,
+		ToolTip: 'Update-AzSqlInstanceLink\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSqlInstanceVulnerabilityAssessmentSetting',
+		ListItemText: 'Update-AzSqlInstanceVulnerabilityAssessmentSetting',
+		ResultType: 2,
+		ToolTip: 'Update-AzSqlInstanceVulnerabilityAssessmentSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSqlServerAdvancedThreatProtectionSetting',
+		ListItemText: 'Update-AzSqlServerAdvancedThreatProtectionSetting',
+		ResultType: 2,
+		ToolTip: 'Update-AzSqlServerAdvancedThreatProtectionSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSqlServerVulnerabilityAssessmentSetting',
+		ListItemText: 'Update-AzSqlServerVulnerabilityAssessmentSetting',
+		ResultType: 2,
+		ToolTip: 'Update-AzSqlServerVulnerabilityAssessmentSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSqlSyncGroup',
+		ListItemText: 'Update-AzSqlSyncGroup',
+		ResultType: 2,
+		ToolTip: 'Update-AzSqlSyncGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSqlSyncMember',
+		ListItemText: 'Update-AzSqlSyncMember',
+		ResultType: 2,
+		ToolTip: 'Update-AzSqlSyncMember\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSqlSyncSchema',
+		ListItemText: 'Update-AzSqlSyncSchema',
+		ResultType: 2,
+		ToolTip: 'Update-AzSqlSyncSchema\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSqlVM',
+		ListItemText: 'Update-AzSqlVM',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzSqlVM \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSqlVMGroup',
+		ListItemText: 'Update-AzSqlVMGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzSqlVMGroup \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSshKey',
+		ListItemText: 'Update-AzSshKey',
+		ResultType: 2,
+		ToolTip: 'Update-AzSshKey\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzStackHciCluster',
+		ListItemText: 'Update-AzStackHciCluster',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzStackHciCluster \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzStaticWebApp',
+		ListItemText: 'Update-AzStaticWebApp',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzStaticWebApp \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzStaticWebAppUser',
+		ListItemText: 'Update-AzStaticWebAppUser',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzStaticWebAppUser \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzStorageAccountNetworkRuleSet',
+		ListItemText: 'Update-AzStorageAccountNetworkRuleSet',
+		ResultType: 2,
+		ToolTip: 'Update-AzStorageAccountNetworkRuleSet\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzStorageBlobServiceProperty',
+		ListItemText: 'Update-AzStorageBlobServiceProperty',
+		ResultType: 2,
+		ToolTip: 'Update-AzStorageBlobServiceProperty\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzStorageEncryptionScope',
+		ListItemText: 'Update-AzStorageEncryptionScope',
+		ResultType: 2,
+		ToolTip: 'Update-AzStorageEncryptionScope\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzStorageFileServiceProperty',
+		ListItemText: 'Update-AzStorageFileServiceProperty',
+		ResultType: 2,
+		ToolTip: 'Update-AzStorageFileServiceProperty\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzStorageMover',
+		ListItemText: 'Update-AzStorageMover',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzStorageMover \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzStorageMoverAgent',
+		ListItemText: 'Update-AzStorageMoverAgent',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzStorageMoverAgent \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzStorageMoverAzStorageContainerEndpoint',
+		ListItemText: 'Update-AzStorageMoverAzStorageContainerEndpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzStorageMoverAzStorageContainerEndpoint \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzStorageMoverJobDefinition',
+		ListItemText: 'Update-AzStorageMoverJobDefinition',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzStorageMoverJobDefinition \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzStorageMoverNfsEndpoint',
+		ListItemText: 'Update-AzStorageMoverNfsEndpoint',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzStorageMoverNfsEndpoint \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzStorageMoverProject',
+		ListItemText: 'Update-AzStorageMoverProject',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzStorageMoverProject \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzStorageServiceProperty',
+		ListItemText: 'Update-AzStorageServiceProperty',
+		ResultType: 2,
+		ToolTip: 'Update-AzStorageServiceProperty\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzStreamAnalyticsCluster',
+		ListItemText: 'Update-AzStreamAnalyticsCluster',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzStreamAnalyticsCluster \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzStreamAnalyticsFunction',
+		ListItemText: 'Update-AzStreamAnalyticsFunction',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzStreamAnalyticsFunction \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzStreamAnalyticsInput',
+		ListItemText: 'Update-AzStreamAnalyticsInput',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzStreamAnalyticsInput \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzStreamAnalyticsJob',
+		ListItemText: 'Update-AzStreamAnalyticsJob',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzStreamAnalyticsJob \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzStreamAnalyticsOutput',
+		ListItemText: 'Update-AzStreamAnalyticsOutput',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzStreamAnalyticsOutput \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzStreamAnalyticsTransformation',
+		ListItemText: 'Update-AzStreamAnalyticsTransformation',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzStreamAnalyticsTransformation \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSupportTicket',
+		ListItemText: 'Update-AzSupportTicket',
+		ResultType: 2,
+		ToolTip: 'Update-AzSupportTicket\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSynapseFirewallRule',
+		ListItemText: 'Update-AzSynapseFirewallRule',
+		ResultType: 2,
+		ToolTip: 'Update-AzSynapseFirewallRule\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSynapseIntegrationRuntime',
+		ListItemText: 'Update-AzSynapseIntegrationRuntime',
+		ResultType: 2,
+		ToolTip: 'Update-AzSynapseIntegrationRuntime\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSynapseIntegrationRuntimeNode',
+		ListItemText: 'Update-AzSynapseIntegrationRuntimeNode',
+		ResultType: 2,
+		ToolTip: 'Update-AzSynapseIntegrationRuntimeNode\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSynapseKustoPool',
+		ListItemText: 'Update-AzSynapseKustoPool',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzSynapseKustoPool \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSynapseKustoPoolDatabase',
+		ListItemText: 'Update-AzSynapseKustoPoolDatabase',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzSynapseKustoPoolDatabase \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSynapseKustoPoolDataConnection',
+		ListItemText: 'Update-AzSynapseKustoPoolDataConnection',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzSynapseKustoPoolDataConnection \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSynapseLinkConnectionLandingZoneCredential',
+		ListItemText: 'Update-AzSynapseLinkConnectionLandingZoneCredential',
+		ResultType: 2,
+		ToolTip: 'Update-AzSynapseLinkConnectionLandingZoneCredential\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSynapseManagedVirtualNetworkConfig',
+		ListItemText: 'Update-AzSynapseManagedVirtualNetworkConfig',
+		ResultType: 2,
+		ToolTip: 'Update-AzSynapseManagedVirtualNetworkConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSynapseSparkPool',
+		ListItemText: 'Update-AzSynapseSparkPool',
+		ResultType: 2,
+		ToolTip: 'Update-AzSynapseSparkPool\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSynapseSqlAdvancedThreatProtectionSetting',
+		ListItemText: 'Update-AzSynapseSqlAdvancedThreatProtectionSetting',
+		ResultType: 2,
+		ToolTip: 'Update-AzSynapseSqlAdvancedThreatProtectionSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSynapseSqlDatabase',
+		ListItemText: 'Update-AzSynapseSqlDatabase',
+		ResultType: 2,
+		ToolTip: 'Update-AzSynapseSqlDatabase\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSynapseSqlPool',
+		ListItemText: 'Update-AzSynapseSqlPool',
+		ResultType: 2,
+		ToolTip: 'Update-AzSynapseSqlPool\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSynapseSqlPoolAdvancedThreatProtectionSetting',
+		ListItemText: 'Update-AzSynapseSqlPoolAdvancedThreatProtectionSetting',
+		ResultType: 2,
+		ToolTip: 'Update-AzSynapseSqlPoolAdvancedThreatProtectionSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSynapseSqlPoolVulnerabilityAssessmentSetting',
+		ListItemText: 'Update-AzSynapseSqlPoolVulnerabilityAssessmentSetting',
+		ResultType: 2,
+		ToolTip: 'Update-AzSynapseSqlPoolVulnerabilityAssessmentSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSynapseSqlVulnerabilityAssessmentSetting',
+		ListItemText: 'Update-AzSynapseSqlVulnerabilityAssessmentSetting',
+		ResultType: 2,
+		ToolTip: 'Update-AzSynapseSqlVulnerabilityAssessmentSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzSynapseWorkspace',
+		ListItemText: 'Update-AzSynapseWorkspace',
+		ResultType: 2,
+		ToolTip: 'Update-AzSynapseWorkspace\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzTag',
+		ListItemText: 'Update-AzTag',
+		ResultType: 2,
+		ToolTip: 'Update-AzTag\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzUserAssignedIdentity',
+		ListItemText: 'Update-AzUserAssignedIdentity',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzUserAssignedIdentity \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzVHubRouteTable',
+		ListItemText: 'Update-AzVHubRouteTable',
+		ResultType: 2,
+		ToolTip: 'Update-AzVHubRouteTable\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzVirtualApplianceSite',
+		ListItemText: 'Update-AzVirtualApplianceSite',
+		ResultType: 2,
+		ToolTip: 'Update-AzVirtualApplianceSite\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzVirtualHub',
+		ListItemText: 'Update-AzVirtualHub',
+		ResultType: 2,
+		ToolTip: 'Update-AzVirtualHub\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzVirtualHubBgpConnection',
+		ListItemText: 'Update-AzVirtualHubBgpConnection',
+		ResultType: 2,
+		ToolTip: 'Update-AzVirtualHubBgpConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzVirtualHubVnetConnection',
+		ListItemText: 'Update-AzVirtualHubVnetConnection',
+		ResultType: 2,
+		ToolTip: 'Update-AzVirtualHubVnetConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzVirtualNetworkGatewayNatRule',
+		ListItemText: 'Update-AzVirtualNetworkGatewayNatRule',
+		ResultType: 2,
+		ToolTip: 'Update-AzVirtualNetworkGatewayNatRule\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzVirtualRouter',
+		ListItemText: 'Update-AzVirtualRouter',
+		ResultType: 2,
+		ToolTip: 'Update-AzVirtualRouter\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzVirtualRouterPeer',
+		ListItemText: 'Update-AzVirtualRouterPeer',
+		ResultType: 2,
+		ToolTip: 'Update-AzVirtualRouterPeer\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzVirtualWan',
+		ListItemText: 'Update-AzVirtualWan',
+		ResultType: 2,
+		ToolTip: 'Update-AzVirtualWan\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzVM',
+		ListItemText: 'Update-AzVM',
+		ResultType: 2,
+		ToolTip: 'Update-AzVM\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzVmss',
+		ListItemText: 'Update-AzVmss',
+		ResultType: 2,
+		ToolTip: 'Update-AzVmss\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzVmssInstance',
+		ListItemText: 'Update-AzVmssInstance',
+		ResultType: 2,
+		ToolTip: 'Update-AzVmssInstance\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzVmssVM',
+		ListItemText: 'Update-AzVmssVM',
+		ResultType: 2,
+		ToolTip: 'Update-AzVmssVM\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzVpnConnection',
+		ListItemText: 'Update-AzVpnConnection',
+		ResultType: 2,
+		ToolTip: 'Update-AzVpnConnection\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzVpnGateway',
+		ListItemText: 'Update-AzVpnGateway',
+		ResultType: 2,
+		ToolTip: 'Update-AzVpnGateway\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzVpnGatewayNatRule',
+		ListItemText: 'Update-AzVpnGatewayNatRule',
+		ResultType: 2,
+		ToolTip: 'Update-AzVpnGatewayNatRule\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzVpnServerConfiguration',
+		ListItemText: 'Update-AzVpnServerConfiguration',
+		ResultType: 2,
+		ToolTip: 'Update-AzVpnServerConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzVpnServerConfigurationPolicyGroup',
+		ListItemText: 'Update-AzVpnServerConfigurationPolicyGroup',
+		ResultType: 2,
+		ToolTip: 'Update-AzVpnServerConfigurationPolicyGroup\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzVpnSite',
+		ListItemText: 'Update-AzVpnSite',
+		ResultType: 2,
+		ToolTip: 'Update-AzVpnSite\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzWebAppAccessRestrictionConfig',
+		ListItemText: 'Update-AzWebAppAccessRestrictionConfig',
+		ResultType: 2,
+		ToolTip: 'Update-AzWebAppAccessRestrictionConfig\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzWebAppTrafficRouting',
+		ListItemText: 'Update-AzWebAppTrafficRouting',
+		ResultType: 2,
+		ToolTip: 'Update-AzWebAppTrafficRouting\\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzWebPubSub',
+		ListItemText: 'Update-AzWebPubSub',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzWebPubSub \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzWvdApplication',
+		ListItemText: 'Update-AzWvdApplication',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzWvdApplication \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzWvdApplicationGroup',
+		ListItemText: 'Update-AzWvdApplicationGroup',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzWvdApplicationGroup \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzWvdDesktop',
+		ListItemText: 'Update-AzWvdDesktop',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzWvdDesktop \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzWvdHostPool',
+		ListItemText: 'Update-AzWvdHostPool',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzWvdHostPool \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzWvdMsixPackage',
+		ListItemText: 'Update-AzWvdMsixPackage',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzWvdMsixPackage \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzWvdScalingPlan',
+		ListItemText: 'Update-AzWvdScalingPlan',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzWvdScalingPlan \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzWvdScalingPlanPooledSchedule',
+		ListItemText: 'Update-AzWvdScalingPlanPooledSchedule',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzWvdScalingPlanPooledSchedule \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzWvdSessionHost',
+		ListItemText: 'Update-AzWvdSessionHost',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzWvdSessionHost \\r\\n'
+	},
+	{
+		CompletionText: 'Update-AzWvdWorkspace',
+		ListItemText: 'Update-AzWvdWorkspace',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-AzWvdWorkspace \\r\\n'
+	},
+	{
+		CompletionText: 'Update-Disk',
+		ListItemText: 'Update-Disk',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-Disk \\r\\n'
+	},
+	{
+		CompletionText: 'Update-DscConfiguration',
+		ListItemText: 'Update-DscConfiguration',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-DscConfiguration \\r\\n'
+	},
+	{
+		CompletionText: 'Update-EtwTraceSession',
+		ListItemText: 'Update-EtwTraceSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-EtwTraceSession \\r\\n'
+	},
+	{
+		CompletionText: 'Update-FormatData',
+		ListItemText: 'Update-FormatData',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-FormatData [[-AppendPath] <string[]>] [-PrependPath <string[]>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Update-Help',
+		ListItemText: 'Update-Help',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-Help [[-Module] <string[]>] [[-SourcePath] <string[]>] [[-UICulture] <cultureinfo[]>] [-FullyQualifiedModule <ModuleSpecification[]>] [-Recurse] [-Credential <pscredential>] [-UseDefaultCredentials] [-Force] [-Scope <UpdateHelpScope>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nUpdate-Help [[-Module] <string[]>] [[-UICulture] <cultureinfo[]>] [-FullyQualifiedModule <ModuleSpecification[]>] [-LiteralPath <string[]>] [-Recurse] [-Credential <pscredential>] [-UseDefaultCredentials] [-Force] [-Scope <UpdateHelpScope>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Update-HostStorageCache',
+		ListItemText: 'Update-HostStorageCache',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-HostStorageCache \\r\\n'
+	},
+	{
+		CompletionText: 'Update-IscsiTarget',
+		ListItemText: 'Update-IscsiTarget',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-IscsiTarget \\r\\n'
+	},
+	{
+		CompletionText: 'Update-IscsiTargetPortal',
+		ListItemText: 'Update-IscsiTargetPortal',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-IscsiTargetPortal \\r\\n'
+	},
+	{
+		CompletionText: 'Update-LapsADSchema',
+		ListItemText: 'Update-LapsADSchema',
+		ResultType: 2,
+		ToolTip: 'Update-LapsADSchema\\r\\n'
+	},
+	{
+		CompletionText: 'Update-List',
+		ListItemText: 'Update-List',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-List [[-Property] <string>] [-Add <Object[]>] [-Remove <Object[]>] [-InputObject <psobject>] [<CommonParameters>]\\r\\n\\r\\nUpdate-List [[-Property] <string>] -Replace <Object[]> [-InputObject <psobject>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Update-Module',
+		ListItemText: 'Update-Module',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-Module \\r\\n'
+	},
+	{
+		CompletionText: 'Update-ModuleManifest',
+		ListItemText: 'Update-ModuleManifest',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-ModuleManifest \\r\\n'
+	},
+	{
+		CompletionText: 'Update-MpSignature',
+		ListItemText: 'Update-MpSignature',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-MpSignature \\r\\n'
+	},
+	{
+		CompletionText: 'Update-NetFirewallDynamicKeywordAddress',
+		ListItemText: 'Update-NetFirewallDynamicKeywordAddress',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-NetFirewallDynamicKeywordAddress \\r\\n'
+	},
+	{
+		CompletionText: 'Update-NetIPsecRule',
+		ListItemText: 'Update-NetIPsecRule',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-NetIPsecRule \\r\\n'
+	},
+	{
+		CompletionText: 'Update-PSModuleManifest',
+		ListItemText: 'Update-PSModuleManifest',
+		ResultType: 2,
+		ToolTip: 'Update-PSModuleManifest\\r\\n'
+	},
+	{
+		CompletionText: 'Update-PSResource',
+		ListItemText: 'Update-PSResource',
+		ResultType: 2,
+		ToolTip: 'Update-PSResource\\r\\n'
+	},
+	{
+		CompletionText: 'Update-PSScriptFileInfo',
+		ListItemText: 'Update-PSScriptFileInfo',
+		ResultType: 2,
+		ToolTip: 'Update-PSScriptFileInfo\\r\\n'
+	},
+	{
+		CompletionText: 'Update-Script',
+		ListItemText: 'Update-Script',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-Script \\r\\n'
+	},
+	{
+		CompletionText: 'Update-ScriptFileInfo',
+		ListItemText: 'Update-ScriptFileInfo',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-ScriptFileInfo \\r\\n'
+	},
+	{
+		CompletionText: 'Update-SmbMultichannelConnection',
+		ListItemText: 'Update-SmbMultichannelConnection',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-SmbMultichannelConnection \\r\\n'
+	},
+	{
+		CompletionText: 'Update-StorageBusCache',
+		ListItemText: 'Update-StorageBusCache',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-StorageBusCache \\r\\n'
+	},
+	{
+		CompletionText: 'Update-StorageFirmware',
+		ListItemText: 'Update-StorageFirmware',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-StorageFirmware \\r\\n'
+	},
+	{
+		CompletionText: 'Update-StoragePool',
+		ListItemText: 'Update-StoragePool',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-StoragePool \\r\\n'
+	},
+	{
+		CompletionText: 'Update-StorageProviderCache',
+		ListItemText: 'Update-StorageProviderCache',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-StorageProviderCache \\r\\n'
+	},
+	{
+		CompletionText: 'Update-TypeData',
+		ListItemText: 'Update-TypeData',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-TypeData [[-AppendPath] <string[]>] [-PrependPath <string[]>] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nUpdate-TypeData -TypeName <string> [-MemberType <PSMemberTypes>] [-MemberName <string>] [-Value <Object>] [-SecondValue <Object>] [-TypeConverter <type>] [-TypeAdapter <type>] [-SerializationMethod <string>] [-TargetTypeForDeserialization <type>] [-SerializationDepth <int>] [-DefaultDisplayProperty <string>] [-InheritPropertySerializationSet <bool>] [-StringSerializationSource <string>] [-DefaultDisplayPropertySet <string[]>] [-DefaultKeyPropertySet <string[]>] [-PropertySerializationSet <string[]>] [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n\\r\\nUpdate-TypeData [-TypeData] <TypeData[]> [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Update-VMVersion',
+		ListItemText: 'Update-VMVersion',
+		ResultType: 2,
+		ToolTip: 'Update-VMVersion\\r\\n'
+	},
+	{
+		CompletionText: 'Update-WIMBootEntry',
+		ListItemText: 'Update-WIMBootEntry',
+		ResultType: 2,
+		ToolTip: 'Update-WIMBootEntry\\r\\n'
+	},
+	{
+		CompletionText: 'upfc.exe',
+		ListItemText: 'upfc.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\upfc.exe'
+	},
+	{
+		CompletionText: 'UpgradeResultsUI.exe',
+		ListItemText: 'UpgradeResultsUI.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\UpgradeResultsUI.exe'
+	},
+	{
+		CompletionText: 'upmo',
+		ListItemText: 'upmo',
+		ResultType: 2,
+		ToolTip: 'upmo'
+	},
+	{
+		CompletionText: 'upnpcont.exe',
+		ListItemText: 'upnpcont.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\upnpcont.exe'
+	},
+	{
+		CompletionText: 'UPPrinterInstaller.exe',
+		ListItemText: 'UPPrinterInstaller.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\UPPrinterInstaller.exe'
+	},
+	{
+		CompletionText: 'Use-AzHDInsightCluster',
+		ListItemText: 'Use-AzHDInsightCluster',
+		ResultType: 2,
+		ToolTip: 'Use-AzHDInsightCluster\\r\\n'
+	},
+	{
+		CompletionText: 'Use-AzSqlDatabaseServerAuditingPolicy',
+		ListItemText: 'Use-AzSqlDatabaseServerAuditingPolicy',
+		ResultType: 2,
+		ToolTip: 'Use-AzSqlDatabaseServerAuditingPolicy'
+	},
+	{
+		CompletionText: 'Use-WindowsUnattend',
+		ListItemText: 'Use-WindowsUnattend',
+		ResultType: 2,
+		ToolTip: 'Use-WindowsUnattend\\r\\n'
+	},
+	{
+		CompletionText: 'UserAccountBroker.exe',
+		ListItemText: 'UserAccountBroker.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\UserAccountBroker.exe'
+	},
+	{
+		CompletionText: 'UserAccountControlSettings.exe',
+		ListItemText: 'UserAccountControlSettings.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\UserAccountControlSettings.exe'
+	},
+	{
+		CompletionText: 'UserDataSource.exe',
+		ListItemText: 'UserDataSource.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\UserDataSource.exe'
+	},
+	{
+		CompletionText: 'userinit.exe',
+		ListItemText: 'userinit.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\userinit.exe'
+	},
+	{
+		CompletionText: 'UsoClient.exe',
+		ListItemText: 'UsoClient.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\UsoClient.exe'
+	},
+	{
+		CompletionText: 'UtcDecoderHost.exe',
+		ListItemText: 'UtcDecoderHost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\UtcDecoderHost.exe'
+	},
+	{
+		CompletionText: 'Utilman.exe',
+		ListItemText: 'Utilman.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\Utilman.exe'
+	},
+	{
+		CompletionText: 'V:',
+		ListItemText: 'V:',
+		ResultType: 2,
+		ToolTip: '\\r\\nV: \\r\\n'
+	},
+	{
+		CompletionText: 'Validate-AzDataShare',
+		ListItemText: 'Validate-AzDataShare',
+		ResultType: 2,
+		ToolTip: 'Validate-AzDataShare'
+	},
+	{
+		CompletionText: 'VaultCmd.exe',
+		ListItemText: 'VaultCmd.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\VaultCmd.exe'
+	},
+	{
+		CompletionText: 'vds.exe',
+		ListItemText: 'vds.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\vds.exe'
+	},
+	{
+		CompletionText: 'vdsldr.exe',
+		ListItemText: 'vdsldr.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\vdsldr.exe'
+	},
+	{
+		CompletionText: 'verclsid.exe',
+		ListItemText: 'verclsid.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\verclsid.exe'
+	},
+	{
+		CompletionText: 'verifier.exe',
+		ListItemText: 'verifier.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\verifier.exe'
+	},
+	{
+		CompletionText: 'verifiergui.exe',
+		ListItemText: 'verifiergui.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\verifiergui.exe'
+	},
+	{
+		CompletionText: 'vfpctrl.exe',
+		ListItemText: 'vfpctrl.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\vfpctrl.exe'
+	},
+	{
+		CompletionText: 'virtmgmt.msc',
+		ListItemText: 'virtmgmt.msc',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\virtmgmt.msc'
+	},
+	{
+		CompletionText: 'vmcompute.exe',
+		ListItemText: 'vmcompute.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\vmcompute.exe'
+	},
+	{
+		CompletionText: 'vmconnect.exe',
+		ListItemText: 'vmconnect.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\vmconnect.exe'
+	},
+	{
+		CompletionText: 'vmms.exe',
+		ListItemText: 'vmms.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\vmms.exe'
+	},
+	{
+		CompletionText: 'vmplatformca.exe',
+		ListItemText: 'vmplatformca.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\vmplatformca.exe'
+	},
+	{
+		CompletionText: 'vmsp.exe',
+		ListItemText: 'vmsp.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\vmsp.exe'
+	},
+	{
+		CompletionText: 'vmwp.exe',
+		ListItemText: 'vmwp.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\vmwp.exe'
+	},
+	{
+		CompletionText: 'VoiceAccess.exe',
+		ListItemText: 'VoiceAccess.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\VoiceAccess.exe'
+	},
+	{
+		CompletionText: 'vsce.cmd',
+		ListItemText: 'vsce.cmd',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Roaming\\npm\\vsce.cmd'
+	},
+	{
+		CompletionText: 'vsce.ps1',
+		ListItemText: 'vsce.ps1',
+		ResultType: 2,
+		ToolTip: 'vsce.ps1 \\r\\n'
+	},
+	{
+		CompletionText: 'vscode-bisect.cmd',
+		ListItemText: 'vscode-bisect.cmd',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Roaming\\npm\\vscode-bisect.cmd'
+	},
+	{
+		CompletionText: 'vscode-bisect.ps1',
+		ListItemText: 'vscode-bisect.ps1',
+		ResultType: 2,
+		ToolTip: 'vscode-bisect.ps1 \\r\\n'
+	},
+	{
+		CompletionText: 'VsGraphicsDesktopEngine.exe',
+		ListItemText: 'VsGraphicsDesktopEngine.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\VsGraphicsDesktopEngine.exe'
+	},
+	{
+		CompletionText: 'VsGraphicsRemoteEngine.exe',
+		ListItemText: 'VsGraphicsRemoteEngine.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\VsGraphicsRemoteEngine.exe'
+	},
+	{
+		CompletionText: 'vssadmin.exe',
+		ListItemText: 'vssadmin.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\vssadmin.exe'
+	},
+	{
+		CompletionText: 'VSSVC.exe',
+		ListItemText: 'VSSVC.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\VSSVC.exe'
+	},
+	{
+		CompletionText: 'vulkaninfo-1-999-0-0-0.exe',
+		ListItemText: 'vulkaninfo-1-999-0-0-0.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\vulkaninfo-1-999-0-0-0.exe'
+	},
+	{
+		CompletionText: 'vulkaninfo.exe',
+		ListItemText: 'vulkaninfo.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\vulkaninfo.exe'
+	},
+	{
+		CompletionText: 'w32tm.exe',
+		ListItemText: 'w32tm.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\w32tm.exe'
+	},
+	{
+		CompletionText: 'W:',
+		ListItemText: 'W:',
+		ResultType: 2,
+		ToolTip: '\\r\\nW: \\r\\n'
+	},
+	{
+		CompletionText: 'Wait-AdlJob',
+		ListItemText: 'Wait-AdlJob',
+		ResultType: 2,
+		ToolTip: 'Wait-AdlJob'
+	},
+	{
+		CompletionText: 'Wait-AzDataLakeAnalyticsJob',
+		ListItemText: 'Wait-AzDataLakeAnalyticsJob',
+		ResultType: 2,
+		ToolTip: 'Wait-AzDataLakeAnalyticsJob\\r\\n'
+	},
+	{
+		CompletionText: 'Wait-AzHDInsightJob',
+		ListItemText: 'Wait-AzHDInsightJob',
+		ResultType: 2,
+		ToolTip: 'Wait-AzHDInsightJob\\r\\n'
+	},
+	{
+		CompletionText: 'Wait-AzRecoveryServicesBackupJob',
+		ListItemText: 'Wait-AzRecoveryServicesBackupJob',
+		ResultType: 2,
+		ToolTip: 'Wait-AzRecoveryServicesBackupJob\\r\\n'
+	},
+	{
+		CompletionText: 'Wait-AzSynapseSparkJob',
+		ListItemText: 'Wait-AzSynapseSparkJob',
+		ResultType: 2,
+		ToolTip: 'Wait-AzSynapseSparkJob\\r\\n'
+	},
+	{
+		CompletionText: 'Wait-Debugger',
+		ListItemText: 'Wait-Debugger',
+		ResultType: 2,
+		ToolTip: '\\r\\nWait-Debugger [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Wait-Event',
+		ListItemText: 'Wait-Event',
+		ResultType: 2,
+		ToolTip: '\\r\\nWait-Event [[-SourceIdentifier] <string>] [-Timeout <int>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Wait-Job',
+		ListItemText: 'Wait-Job',
+		ResultType: 2,
+		ToolTip: '\\r\\nWait-Job [-Id] <int[]> [-Any] [-Timeout <int>] [-Force] [<CommonParameters>]\\r\\n\\r\\nWait-Job [-Job] <Job[]> [-Any] [-Timeout <int>] [-Force] [<CommonParameters>]\\r\\n\\r\\nWait-Job [-Name] <string[]> [-Any] [-Timeout <int>] [-Force] [<CommonParameters>]\\r\\n\\r\\nWait-Job [-InstanceId] <guid[]> [-Any] [-Timeout <int>] [-Force] [<CommonParameters>]\\r\\n\\r\\nWait-Job [-State] <JobState> [-Any] [-Timeout <int>] [-Force] [<CommonParameters>]\\r\\n\\r\\nWait-Job [-Filter] <hashtable> [-Any] [-Timeout <int>] [-Force] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Wait-Process',
+		ListItemText: 'Wait-Process',
+		ResultType: 2,
+		ToolTip: '\\r\\nWait-Process [-Name] <string[]> [[-Timeout] <int>] [-Any] [-PassThru] [<CommonParameters>]\\r\\n\\r\\nWait-Process [-Id] <int[]> [[-Timeout] <int>] [-Any] [-PassThru] [<CommonParameters>]\\r\\n\\r\\nWait-Process [[-Timeout] <int>] -InputObject <Process[]> [-Any] [-PassThru] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Wait-VM',
+		ListItemText: 'Wait-VM',
+		ResultType: 2,
+		ToolTip: 'Wait-VM\\r\\n'
+	},
+	{
+		CompletionText: 'waitfor.exe',
+		ListItemText: 'waitfor.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\waitfor.exe'
+	},
+	{
+		CompletionText: 'WallpaperHost.exe',
+		ListItemText: 'WallpaperHost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\WallpaperHost.exe'
+	},
+	{
+		CompletionText: 'wbadmin.exe',
+		ListItemText: 'wbadmin.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\wbadmin.exe'
+	},
+	{
+		CompletionText: 'wbemtest.exe',
+		ListItemText: 'wbemtest.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\System32\\Wbem\\wbemtest.exe'
+	},
+	{
+		CompletionText: 'wbengine.exe',
+		ListItemText: 'wbengine.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\wbengine.exe'
+	},
+	{
+		CompletionText: 'WdfPerfEnhancedVerifier.cmd',
+		ListItemText: 'WdfPerfEnhancedVerifier.cmd',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files (x86)\\Windows Kits\\10\\Windows Performance Toolkit\\WdfPerfEnhancedVerifier.cmd'
+	},
+	{
+		CompletionText: 'wecutil.exe',
+		ListItemText: 'wecutil.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\wecutil.exe'
+	},
+	{
+		CompletionText: 'WerFault.exe',
+		ListItemText: 'WerFault.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\WerFault.exe'
+	},
+	{
+		CompletionText: 'WerFaultSecure.exe',
+		ListItemText: 'WerFaultSecure.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\WerFaultSecure.exe'
+	},
+	{
+		CompletionText: 'wermgr.exe',
+		ListItemText: 'wermgr.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\wermgr.exe'
+	},
+	{
+		CompletionText: 'wevtutil.exe',
+		ListItemText: 'wevtutil.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\wevtutil.exe'
+	},
+	{
+		CompletionText: 'wextract.exe',
+		ListItemText: 'wextract.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\wextract.exe'
+	},
+	{
+		CompletionText: 'WF.msc',
+		ListItemText: 'WF.msc',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\WF.msc'
+	},
+	{
+		CompletionText: 'WFS.exe',
+		ListItemText: 'WFS.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\WFS.exe'
+	},
+	{
+		CompletionText: 'where',
+		ListItemText: 'where',
+		ResultType: 2,
+		ToolTip: 'Where-Object'
+	},
+	{
+		CompletionText: 'Where-Object',
+		ListItemText: 'Where-Object',
+		ResultType: 2,
+		ToolTip: '\\r\\nWhere-Object [-Property] <string> [[-Value] <Object>] [-InputObject <psobject>] [-EQ] [<CommonParameters>]\\r\\n\\r\\nWhere-Object [-FilterScript] <scriptblock> [-InputObject <psobject>] [<CommonParameters>]\\r\\n\\r\\nWhere-Object [-Property] <string> [[-Value] <Object>] -CEQ [-InputObject <psobject>] [<CommonParameters>]\\r\\n\\r\\nWhere-Object [-Property] <string> [[-Value] <Object>] -NE [-InputObject <psobject>] [<CommonParameters>]\\r\\n\\r\\nWhere-Object [-Property] <string> [[-Value] <Object>] -CNE [-InputObject <psobject>] [<CommonParameters>]\\r\\n\\r\\nWhere-Object [-Property] <string> [[-Value] <Object>] -GT [-InputObject <psobject>] [<CommonParameters>]\\r\\n\\r\\nWhere-Object [-Property] <string> [[-Value] <Object>] -CGT [-InputObject <psobject>] [<CommonParameters>]\\r\\n\\r\\nWhere-Object [-Property] <string> [[-Value] <Object>] -LT [-InputObject <psobject>] [<CommonParameters>]\\r\\n\\r\\nWhere-Object [-Property] <string> [[-Value] <Object>] -CLT [-InputObject <psobject>] [<CommonParameters>]\\r\\n\\r\\nWhere-Object [-Property] <string> [[-Value] <Object>] -GE [-InputObject <psobject>] [<CommonParameters>]\\r\\n\\r\\nWhere-Object [-Property] <string> [[-Value] <Object>] -CGE [-InputObject <psobject>] [<CommonParameters>]\\r\\n\\r\\nWhere-Object [-Property] <string> [[-Value] <Object>] -LE [-InputObject <psobject>] [<CommonParameters>]\\r\\n\\r\\nWhere-Object [-Property] <string> [[-Value] <Object>] -CLE [-InputObject <psobject>] [<CommonParameters>]\\r\\n\\r\\nWhere-Object [-Property] <string> [[-Value] <Object>] -Like [-InputObject <psobject>] [<CommonParameters>]\\r\\n\\r\\nWhere-Object [-Property] <string> [[-Value] <Object>] -CLike [-InputObject <psobject>] [<CommonParameters>]\\r\\n\\r\\nWhere-Object [-Property] <string> [[-Value] <Object>] -NotLike [-InputObject <psobject>] [<CommonParameters>]\\r\\n\\r\\nWhere-Object [-Property] <string> [[-Value] <Object>] -CNotLike [-InputObject <psobject>] [<CommonParameters>]\\r\\n\\r\\nWhere-Object [-Property] <string> [[-Value] <Object>] -Match [-InputObject <psobject>] [<CommonParameters>]\\r\\n\\r\\nWhere-Object [-Property] <string> [[-Value] <Object>] -CMatch [-InputObject <psobject>] [<CommonParameters>]\\r\\n\\r\\nWhere-Object [-Property] <string> [[-Value] <Object>] -NotMatch [-InputObject <psobject>] [<CommonParameters>]\\r\\n\\r\\nWhere-Object [-Property] <string> [[-Value] <Object>] -CNotMatch [-InputObject <psobject>] [<CommonParameters>]\\r\\n\\r\\nWhere-Object [-Property] <string> [[-Value] <Object>] -Contains [-InputObject <psobject>] [<CommonParameters>]\\r\\n\\r\\nWhere-Object [-Property] <string> [[-Value] <Object>] -CContains [-InputObject <psobject>] [<CommonParameters>]\\r\\n\\r\\nWhere-Object [-Property] <string> [[-Value] <Object>] -NotContains [-InputObject <psobject>] [<CommonParameters>]\\r\\n\\r\\nWhere-Object [-Property] <string> [[-Value] <Object>] -CNotContains [-InputObject <psobject>] [<CommonParameters>]\\r\\n\\r\\nWhere-Object [-Property] <string> [[-Value] <Object>] -In [-InputObject <psobject>] [<CommonParameters>]\\r\\n\\r\\nWhere-Object [-Property] <string> [[-Value] <Object>] -CIn [-InputObject <psobject>] [<CommonParameters>]\\r\\n\\r\\nWhere-Object [-Property] <string> [[-Value] <Object>] -NotIn [-InputObject <psobject>] [<CommonParameters>]\\r\\n\\r\\nWhere-Object [-Property] <string> [[-Value] <Object>] -CNotIn [-InputObject <psobject>] [<CommonParameters>]\\r\\n\\r\\nWhere-Object [-Property] <string> [[-Value] <Object>] -Is [-InputObject <psobject>] [<CommonParameters>]\\r\\n\\r\\nWhere-Object [-Property] <string> [[-Value] <Object>] -IsNot [-InputObject <psobject>] [<CommonParameters>]\\r\\n\\r\\nWhere-Object [-Property] <string> -Not [-InputObject <psobject>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'where.exe',
+		ListItemText: 'where.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\where.exe'
+	},
+	{
+		CompletionText: 'whoami.exe',
+		ListItemText: 'whoami.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\whoami.exe'
+	},
+	{
+		CompletionText: 'wiaacmgr.exe',
+		ListItemText: 'wiaacmgr.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\wiaacmgr.exe'
+	},
+	{
+		CompletionText: 'wiawow64.exe',
+		ListItemText: 'wiawow64.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\wiawow64.exe'
+	},
+	{
+		CompletionText: 'wifitask.exe',
+		ListItemText: 'wifitask.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\wifitask.exe'
+	},
+	{
+		CompletionText: 'wimserv.exe',
+		ListItemText: 'wimserv.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\wimserv.exe'
+	},
+	{
+		CompletionText: 'WinBioDataModelOOBE.exe',
+		ListItemText: 'WinBioDataModelOOBE.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\WinBioDataModelOOBE.exe'
+	},
+	{
+		CompletionText: 'Windows.Media.BackgroundPlayback.exe',
+		ListItemText: 'Windows.Media.BackgroundPlayback.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\Windows.Media.BackgroundPlayback.exe'
+	},
+	{
+		CompletionText: 'Windows.WARP.JITService.exe',
+		ListItemText: 'Windows.WARP.JITService.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\Windows.WARP.JITService.exe'
+	},
+	{
+		CompletionText: 'WindowsActionDialog.exe',
+		ListItemText: 'WindowsActionDialog.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\WindowsActionDialog.exe'
+	},
+	{
+		CompletionText: 'WindowsPackageManagerServer.exe',
+		ListItemText: 'WindowsPackageManagerServer.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\WindowsPackageManagerServer.exe'
+	},
+	{
+		CompletionText: 'WindowsUpdateElevatedInstaller.exe',
+		ListItemText: 'WindowsUpdateElevatedInstaller.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\WindowsUpdateElevatedInstaller.exe'
+	},
+	{
+		CompletionText: 'winget.exe',
+		ListItemText: 'winget.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\winget.exe'
+	},
+	{
+		CompletionText: 'winhlp32.exe',
+		ListItemText: 'winhlp32.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\winhlp32.exe'
+	},
+	{
+		CompletionText: 'wininit.exe',
+		ListItemText: 'wininit.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\wininit.exe'
+	},
+	{
+		CompletionText: 'winload.exe',
+		ListItemText: 'winload.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\winload.exe'
+	},
+	{
+		CompletionText: 'winlogon.exe',
+		ListItemText: 'winlogon.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\winlogon.exe'
+	},
+	{
+		CompletionText: 'WinMgmt.exe',
+		ListItemText: 'WinMgmt.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\System32\\Wbem\\WinMgmt.exe'
+	},
+	{
+		CompletionText: 'winresume.exe',
+		ListItemText: 'winresume.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\winresume.exe'
+	},
+	{
+		CompletionText: 'winrm.cmd',
+		ListItemText: 'winrm.cmd',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\winrm.cmd'
+	},
+	{
+		CompletionText: 'winrm.vbs',
+		ListItemText: 'winrm.vbs',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\winrm.vbs'
+	},
+	{
+		CompletionText: 'winrs.exe',
+		ListItemText: 'winrs.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\winrs.exe'
+	},
+	{
+		CompletionText: 'winrshost.exe',
+		ListItemText: 'winrshost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\winrshost.exe'
+	},
+	{
+		CompletionText: 'WinRTNetMUAHostServer.exe',
+		ListItemText: 'WinRTNetMUAHostServer.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\WinRTNetMUAHostServer.exe'
+	},
+	{
+		CompletionText: 'WinSAT.exe',
+		ListItemText: 'WinSAT.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\WinSAT.exe'
+	},
+	{
+		CompletionText: 'winver.exe',
+		ListItemText: 'winver.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\winver.exe'
+	},
+	{
+		CompletionText: 'wjb',
+		ListItemText: 'wjb',
+		ResultType: 2,
+		ToolTip: 'Wait-Job'
+	},
+	{
+		CompletionText: 'wkspbroker.exe',
+		ListItemText: 'wkspbroker.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\wkspbroker.exe'
+	},
+	{
+		CompletionText: 'wksprt.exe',
+		ListItemText: 'wksprt.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\wksprt.exe'
+	},
+	{
+		CompletionText: 'wlanext.exe',
+		ListItemText: 'wlanext.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\wlanext.exe'
+	},
+	{
+		CompletionText: 'wlrmdr.exe',
+		ListItemText: 'wlrmdr.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\wlrmdr.exe'
+	},
+	{
+		CompletionText: 'WMIADAP.exe',
+		ListItemText: 'WMIADAP.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\System32\\Wbem\\WMIADAP.exe'
+	},
+	{
+		CompletionText: 'WmiApSrv.exe',
+		ListItemText: 'WmiApSrv.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\System32\\Wbem\\WmiApSrv.exe'
+	},
+	{
+		CompletionText: 'WMIC.exe',
+		ListItemText: 'WMIC.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\System32\\Wbem\\WMIC.exe'
+	},
+	{
+		CompletionText: 'WmiMgmt.msc',
+		ListItemText: 'WmiMgmt.msc',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\WmiMgmt.msc'
+	},
+	{
+		CompletionText: 'WmiPrvSE.exe',
+		ListItemText: 'WmiPrvSE.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\System32\\Wbem\\WmiPrvSE.exe'
+	},
+	{
+		CompletionText: 'WMPDMC.exe',
+		ListItemText: 'WMPDMC.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\WMPDMC.exe'
+	},
+	{
+		CompletionText: 'WorkFolders.exe',
+		ListItemText: 'WorkFolders.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\WorkFolders.exe'
+	},
+	{
+		CompletionText: 'wowreg32.exe',
+		ListItemText: 'wowreg32.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\wowreg32.exe'
+	},
+	{
+		CompletionText: 'wpa.exe',
+		ListItemText: 'wpa.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files (x86)\\Windows Kits\\10\\Windows Performance Toolkit\\wpa.exe'
+	},
+	{
+		CompletionText: 'wpaexporter.exe',
+		ListItemText: 'wpaexporter.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files (x86)\\Windows Kits\\10\\Windows Performance Toolkit\\wpaexporter.exe'
+	},
+	{
+		CompletionText: 'wpbbin.exe',
+		ListItemText: 'wpbbin.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\wpbbin.exe'
+	},
+	{
+		CompletionText: 'WpcMon.exe',
+		ListItemText: 'WpcMon.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\WpcMon.exe'
+	},
+	{
+		CompletionText: 'WpcTok.exe',
+		ListItemText: 'WpcTok.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\WpcTok.exe'
+	},
+	{
+		CompletionText: 'WPDShextAutoplay.exe',
+		ListItemText: 'WPDShextAutoplay.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\WPDShextAutoplay.exe'
+	},
+	{
+		CompletionText: 'wpnpinst.exe',
+		ListItemText: 'wpnpinst.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\wpnpinst.exe'
+	},
+	{
+		CompletionText: 'wpr.exe',
+		ListItemText: 'wpr.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\wpr.exe'
+	},
+	{
+		CompletionText: 'WPRUI.exe',
+		ListItemText: 'WPRUI.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files (x86)\\Windows Kits\\10\\Windows Performance Toolkit\\WPRUI.exe'
+	},
+	{
+		CompletionText: 'write',
+		ListItemText: 'write',
+		ResultType: 2,
+		ToolTip: 'Write-Output'
+	},
+	{
+		CompletionText: 'Write-Debug',
+		ListItemText: 'Write-Debug',
+		ResultType: 2,
+		ToolTip: '\\r\\nWrite-Debug [-Message] <string> [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Write-DtcTransactionsTraceSession',
+		ListItemText: 'Write-DtcTransactionsTraceSession',
+		ResultType: 2,
+		ToolTip: '\\r\\nWrite-DtcTransactionsTraceSession \\r\\n'
+	},
+	{
+		CompletionText: 'Write-Error',
+		ListItemText: 'Write-Error',
+		ResultType: 2,
+		ToolTip: '\\r\\nWrite-Error [-Message] <string> [-Category <ErrorCategory>] [-ErrorId <string>] [-TargetObject <Object>] [-RecommendedAction <string>] [-CategoryActivity <string>] [-CategoryReason <string>] [-CategoryTargetName <string>] [-CategoryTargetType <string>] [<CommonParameters>]\\r\\n\\r\\nWrite-Error [-Exception] <Exception> [-Message <string>] [-Category <ErrorCategory>] [-ErrorId <string>] [-TargetObject <Object>] [-RecommendedAction <string>] [-CategoryActivity <string>] [-CategoryReason <string>] [-CategoryTargetName <string>] [-CategoryTargetType <string>] [<CommonParameters>]\\r\\n\\r\\nWrite-Error [-ErrorRecord] <ErrorRecord> [-RecommendedAction <string>] [-CategoryActivity <string>] [-CategoryReason <string>] [-CategoryTargetName <string>] [-CategoryTargetType <string>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Write-FileSystemCache',
+		ListItemText: 'Write-FileSystemCache',
+		ResultType: 2,
+		ToolTip: 'Write-FileSystemCache'
+	},
+	{
+		CompletionText: 'Write-GitBranchName',
+		ListItemText: 'Write-GitBranchName',
+		ResultType: 2,
+		ToolTip: '\\r\\nWrite-GitBranchName \\r\\n'
+	},
+	{
+		CompletionText: 'Write-GitBranchStatus',
+		ListItemText: 'Write-GitBranchStatus',
+		ResultType: 2,
+		ToolTip: '\\r\\nWrite-GitBranchStatus \\r\\n'
+	},
+	{
+		CompletionText: 'Write-GitIndexStatus',
+		ListItemText: 'Write-GitIndexStatus',
+		ResultType: 2,
+		ToolTip: '\\r\\nWrite-GitIndexStatus \\r\\n'
+	},
+	{
+		CompletionText: 'Write-GitStashCount',
+		ListItemText: 'Write-GitStashCount',
+		ResultType: 2,
+		ToolTip: '\\r\\nWrite-GitStashCount \\r\\n'
+	},
+	{
+		CompletionText: 'Write-GitStatus',
+		ListItemText: 'Write-GitStatus',
+		ResultType: 2,
+		ToolTip: '\\r\\nWrite-GitStatus \\r\\n'
+	},
+	{
+		CompletionText: 'Write-GitWorkingDirStatus',
+		ListItemText: 'Write-GitWorkingDirStatus',
+		ResultType: 2,
+		ToolTip: '\\r\\nWrite-GitWorkingDirStatus \\r\\n'
+	},
+	{
+		CompletionText: 'Write-GitWorkingDirStatusSummary',
+		ListItemText: 'Write-GitWorkingDirStatusSummary',
+		ResultType: 2,
+		ToolTip: '\\r\\nWrite-GitWorkingDirStatusSummary \\r\\n'
+	},
+	{
+		CompletionText: 'Write-Host',
+		ListItemText: 'Write-Host',
+		ResultType: 2,
+		ToolTip: '\\r\\nWrite-Host [[-Object] <Object>] [-NoNewline] [-Separator <Object>] [-ForegroundColor <ConsoleColor>] [-BackgroundColor <ConsoleColor>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Write-Information',
+		ListItemText: 'Write-Information',
+		ResultType: 2,
+		ToolTip: '\\r\\nWrite-Information [-MessageData] <Object> [[-Tags] <string[]>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Write-Output',
+		ListItemText: 'Write-Output',
+		ResultType: 2,
+		ToolTip: '\\r\\nWrite-Output [-InputObject] <psobject> [-NoEnumerate] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Write-PrinterNfcTag',
+		ListItemText: 'Write-PrinterNfcTag',
+		ResultType: 2,
+		ToolTip: '\\r\\nWrite-PrinterNfcTag \\r\\n'
+	},
+	{
+		CompletionText: 'Write-Progress',
+		ListItemText: 'Write-Progress',
+		ResultType: 2,
+		ToolTip: '\\r\\nWrite-Progress [[-Activity] <string>] [[-Status] <string>] [[-Id] <int>] [-PercentComplete <int>] [-SecondsRemaining <int>] [-CurrentOperation <string>] [-ParentId <int>] [-Completed] [-SourceId <int>] [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Write-Prompt',
+		ListItemText: 'Write-Prompt',
+		ResultType: 2,
+		ToolTip: '\\r\\nWrite-Prompt \\r\\n'
+	},
+	{
+		CompletionText: 'Write-VcsStatus',
+		ListItemText: 'Write-VcsStatus',
+		ResultType: 2,
+		ToolTip: '\\r\\nWrite-VcsStatus \\r\\n'
+	},
+	{
+		CompletionText: 'Write-Verbose',
+		ListItemText: 'Write-Verbose',
+		ResultType: 2,
+		ToolTip: '\\r\\nWrite-Verbose [-Message] <string> [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'Write-VolumeCache',
+		ListItemText: 'Write-VolumeCache',
+		ResultType: 2,
+		ToolTip: '\\r\\nWrite-VolumeCache \\r\\n'
+	},
+	{
+		CompletionText: 'Write-Warning',
+		ListItemText: 'Write-Warning',
+		ResultType: 2,
+		ToolTip: '\\r\\nWrite-Warning [-Message] <string> [<CommonParameters>]\\r\\n'
+	},
+	{
+		CompletionText: 'write.exe',
+		ListItemText: 'write.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\write.exe'
+	},
+	{
+		CompletionText: 'wscadminui.exe',
+		ListItemText: 'wscadminui.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\wscadminui.exe'
+	},
+	{
+		CompletionText: 'WSCollect.exe',
+		ListItemText: 'WSCollect.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\WSCollect.exe'
+	},
+	{
+		CompletionText: 'wscript.exe',
+		ListItemText: 'wscript.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\wscript.exe'
+	},
+	{
+		CompletionText: 'wscui.cpl',
+		ListItemText: 'wscui.cpl',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\wscui.cpl'
+	},
+	{
+		CompletionText: 'wsgen.exe',
+		ListItemText: 'wsgen.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\wsgen.exe'
+	},
+	{
+		CompletionText: 'wsimport.exe',
+		ListItemText: 'wsimport.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\wsimport.exe'
+	},
+	{
+		CompletionText: 'wsl.exe',
+		ListItemText: 'wsl.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\wsl.exe'
+	},
+	{
+		CompletionText: 'wslconfig.exe',
+		ListItemText: 'wslconfig.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\wslconfig.exe'
+	},
+	{
+		CompletionText: 'wslg.exe',
+		ListItemText: 'wslg.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\wslg.exe'
+	},
+	{
+		CompletionText: 'WSManHTTPConfig.exe',
+		ListItemText: 'WSManHTTPConfig.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\WSManHTTPConfig.exe'
+	},
+	{
+		CompletionText: 'wsmprovhost.exe',
+		ListItemText: 'wsmprovhost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\wsmprovhost.exe'
+	},
+	{
+		CompletionText: 'wsqmcons.exe',
+		ListItemText: 'wsqmcons.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\wsqmcons.exe'
+	},
+	{
+		CompletionText: 'WSReset.exe',
+		ListItemText: 'WSReset.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\WSReset.exe'
+	},
+	{
+		CompletionText: 'wt.exe',
+		ListItemText: 'wt.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\wt.exe'
+	},
+	{
+		CompletionText: 'wuapihost.exe',
+		ListItemText: 'wuapihost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\wuapihost.exe'
+	},
+	{
+		CompletionText: 'wuauclt.exe',
+		ListItemText: 'wuauclt.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\wuauclt.exe'
+	},
+	{
+		CompletionText: 'WUDFCompanionHost.exe',
+		ListItemText: 'WUDFCompanionHost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\WUDFCompanionHost.exe'
+	},
+	{
+		CompletionText: 'WUDFHost.exe',
+		ListItemText: 'WUDFHost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\WUDFHost.exe'
+	},
+	{
+		CompletionText: 'wusa.exe',
+		ListItemText: 'wusa.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\wusa.exe'
+	},
+	{
+		CompletionText: 'WWAHost.exe',
+		ListItemText: 'WWAHost.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\WWAHost.exe'
+	},
+	{
+		CompletionText: 'X:',
+		ListItemText: 'X:',
+		ResultType: 2,
+		ToolTip: '\\r\\nX: \\r\\n'
+	},
+	{
+		CompletionText: 'XblGameSaveTask.exe',
+		ListItemText: 'XblGameSaveTask.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\XblGameSaveTask.exe'
+	},
+	{
+		CompletionText: 'xbootmgr.exe',
+		ListItemText: 'xbootmgr.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files (x86)\\Windows Kits\\10\\Windows Performance Toolkit\\xbootmgr.exe'
+	},
+	{
+		CompletionText: 'xbootmgrsleep.exe',
+		ListItemText: 'xbootmgrsleep.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files (x86)\\Windows Kits\\10\\Windows Performance Toolkit\\xbootmgrsleep.exe'
+	},
+	{
+		CompletionText: 'xcopy.exe',
+		ListItemText: 'xcopy.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\xcopy.exe'
+	},
+	{
+		CompletionText: 'xjc.exe',
+		ListItemText: 'xjc.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.345.1-hotspot\\bin\\xjc.exe'
+	},
+	{
+		CompletionText: 'xperf.exe',
+		ListItemText: 'xperf.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files (x86)\\Windows Kits\\10\\Windows Performance Toolkit\\xperf.exe'
+	},
+	{
+		CompletionText: 'xwizard.exe',
+		ListItemText: 'xwizard.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\xwizard.exe'
+	},
+	{
+		CompletionText: 'Y:',
+		ListItemText: 'Y:',
+		ResultType: 2,
+		ToolTip: '\\r\\nY: \\r\\n'
+	},
+	{
+		CompletionText: 'yarn.cmd',
+		ListItemText: 'yarn.cmd',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Roaming\\npm\\yarn.cmd'
+	},
+	{
+		CompletionText: 'yarn.ps1',
+		ListItemText: 'yarn.ps1',
+		ResultType: 2,
+		ToolTip: 'yarn.ps1 \\r\\n'
+	},
+	{
+		CompletionText: 'yarnpkg.cmd',
+		ListItemText: 'yarnpkg.cmd',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Roaming\\npm\\yarnpkg.cmd'
+	},
+	{
+		CompletionText: 'yarnpkg.ps1',
+		ListItemText: 'yarnpkg.ps1',
+		ResultType: 2,
+		ToolTip: 'yarnpkg.ps1 \\r\\n'
+	},
+	{
+		CompletionText: 'yo-complete.cmd',
+		ListItemText: 'yo-complete.cmd',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Roaming\\npm\\yo-complete.cmd'
+	},
+	{
+		CompletionText: 'yo-complete.ps1',
+		ListItemText: 'yo-complete.ps1',
+		ResultType: 2,
+		ToolTip: 'yo-complete.ps1 \\r\\n'
+	},
+	{
+		CompletionText: 'yo.cmd',
+		ListItemText: 'yo.cmd',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Roaming\\npm\\yo.cmd'
+	},
+	{
+		CompletionText: 'yo.ps1',
+		ListItemText: 'yo.ps1',
+		ResultType: 2,
+		ToolTip: 'yo.ps1 \\r\\n'
+	},
+	{
+		CompletionText: 'Z:',
+		ListItemText: 'Z:',
+		ResultType: 2,
+		ToolTip: '\\r\\nZ: \\r\\n'
+	},
+	{
+		CompletionText: '__VSCode-Escape-Value',
+		ListItemText: '__VSCode-Escape-Value',
+		ResultType: 2,
+		ToolTip: '\\r\\n__VSCode-Escape-Value [[-value] <string>]\\r\\n'
+	},
+	{
+		CompletionText: 'Defender\\Add-MpPreference',
+		ListItemText: 'Add-MpPreference',
+		ResultType: 2,
+		ToolTip: '\\r\\nAdd-MpPreference \\r\\n'
+	},
+	{
+		CompletionText: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\bash.exe',
+		ListItemText: 'bash.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\bash.exe'
+	},
+	{
+		CompletionText: 'Az.Sql\\Clear-AzSqlDatabaseVulnerabilityAssessmentSetting',
+		ListItemText: 'Clear-AzSqlDatabaseVulnerabilityAssessmentSetting',
+		ResultType: 2,
+		ToolTip: 'Clear-AzSqlDatabaseVulnerabilityAssessmentSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Az.Sql\\Clear-AzSqlInstanceDatabaseVulnerabilityAssessmentSetting',
+		ListItemText: 'Clear-AzSqlInstanceDatabaseVulnerabilityAssessmentSetting',
+		ResultType: 2,
+		ToolTip: 'Clear-AzSqlInstanceDatabaseVulnerabilityAssessmentSetting\\r\\n'
+	},
+	{
+		CompletionText: 'C:\\Users\\Daniel\\AppData\\Local\\Programs\\Microsoft VS Code\\bin\\code-tunnel.exe',
+		ListItemText: 'code-tunnel.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Programs\\Microsoft VS Code\\bin\\code-tunnel.exe'
+	},
+	{
+		CompletionText: 'C:\\Users\\Daniel\\AppData\\Local\\Programs\\Microsoft VS Code\\bin\\code.cmd',
+		ListItemText: 'code.cmd',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Programs\\Microsoft VS Code\\bin\\code.cmd'
+	},
+	{
+		CompletionText: 'Microsoft.PowerShell.Archive\\Compress-Archive',
+		ListItemText: 'Compress-Archive',
+		ResultType: 2,
+		ToolTip: '\\r\\nCompress-Archive \\r\\n'
+	},
+	{
+		CompletionText: 'VMDirectStorage\\Disable-PhysicalDiskIndication',
+		ListItemText: 'Disable-PhysicalDiskIndication',
+		ResultType: 2,
+		ToolTip: 'VMDirectStorage\\Disable-PhysicalDiskIndication'
+	},
+	{
+		CompletionText: 'PSDiagnostics\\Disable-PSTrace',
+		ListItemText: 'Disable-PSTrace',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-PSTrace \\r\\n'
+	},
+	{
+		CompletionText: 'PSDiagnostics\\Disable-PSWSManCombinedTrace',
+		ListItemText: 'Disable-PSWSManCombinedTrace',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-PSWSManCombinedTrace \\r\\n'
+	},
+	{
+		CompletionText: 'VMDirectStorage\\Disable-StorageDiagnosticLog',
+		ListItemText: 'Disable-StorageDiagnosticLog',
+		ResultType: 2,
+		ToolTip: 'VMDirectStorage\\Disable-StorageDiagnosticLog'
+	},
+	{
+		CompletionText: 'PSDiagnostics\\Disable-WSManTrace',
+		ListItemText: 'Disable-WSManTrace',
+		ResultType: 2,
+		ToolTip: '\\r\\nDisable-WSManTrace \\r\\n'
+	},
+	{
+		CompletionText: 'VMDirectStorage\\Enable-PhysicalDiskIndication',
+		ListItemText: 'Enable-PhysicalDiskIndication',
+		ResultType: 2,
+		ToolTip: 'VMDirectStorage\\Enable-PhysicalDiskIndication'
+	},
+	{
+		CompletionText: 'PSDiagnostics\\Enable-PSTrace',
+		ListItemText: 'Enable-PSTrace',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-PSTrace \\r\\n'
+	},
+	{
+		CompletionText: 'PSDiagnostics\\Enable-PSWSManCombinedTrace',
+		ListItemText: 'Enable-PSWSManCombinedTrace',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-PSWSManCombinedTrace \\r\\n'
+	},
+	{
+		CompletionText: 'VMDirectStorage\\Enable-StorageDiagnosticLog',
+		ListItemText: 'Enable-StorageDiagnosticLog',
+		ResultType: 2,
+		ToolTip: 'VMDirectStorage\\Enable-StorageDiagnosticLog'
+	},
+	{
+		CompletionText: 'PSDiagnostics\\Enable-WSManTrace',
+		ListItemText: 'Enable-WSManTrace',
+		ResultType: 2,
+		ToolTip: '\\r\\nEnable-WSManTrace \\r\\n'
+	},
+	{
+		CompletionText: 'Microsoft.PowerShell.Archive\\Expand-Archive',
+		ListItemText: 'Expand-Archive',
+		ResultType: 2,
+		ToolTip: '\\r\\nExpand-Archive \\r\\n'
+	},
+	{
+		CompletionText: 'VMDirectStorage\\Export-VMCheckpoint',
+		ListItemText: 'Export-VMCheckpoint',
+		ResultType: 2,
+		ToolTip: 'VMDirectStorage\\Export-VMCheckpoint'
+	},
+	{
+		CompletionText: 'PowerShellGet\\fimo',
+		ListItemText: 'fimo',
+		ResultType: 2,
+		ToolTip: 'PowerShellGet\\fimo'
+	},
+	{
+		CompletionText: 'PowerShellGet\\Find-Command',
+		ListItemText: 'Find-Command',
+		ResultType: 2,
+		ToolTip: '\\r\\nFind-Command \\r\\n'
+	},
+	{
+		CompletionText: 'PowerShellGet\\Find-DscResource',
+		ListItemText: 'Find-DscResource',
+		ResultType: 2,
+		ToolTip: '\\r\\nFind-DscResource \\r\\n'
+	},
+	{
+		CompletionText: 'PowerShellGet\\Find-Module',
+		ListItemText: 'Find-Module',
+		ResultType: 2,
+		ToolTip: '\\r\\nFind-Module \\r\\n'
+	},
+	{
+		CompletionText: 'PowerShellGet\\Find-RoleCapability',
+		ListItemText: 'Find-RoleCapability',
+		ResultType: 2,
+		ToolTip: '\\r\\nFind-RoleCapability \\r\\n'
+	},
+	{
+		CompletionText: 'PowerShellGet\\Find-Script',
+		ListItemText: 'Find-Script',
+		ResultType: 2,
+		ToolTip: '\\r\\nFind-Script \\r\\n'
+	},
+	{
+		CompletionText: 'VMDirectStorage\\Flush-Volume',
+		ListItemText: 'Flush-Volume',
+		ResultType: 2,
+		ToolTip: 'VMDirectStorage\\Flush-Volume'
+	},
+	{
+		CompletionText: 'CimCmdlets\\gcai',
+		ListItemText: 'gcai',
+		ResultType: 2,
+		ToolTip: 'CimCmdlets\\gcai'
+	},
+	{
+		CompletionText: 'CimCmdlets\\gcim',
+		ListItemText: 'gcim',
+		ResultType: 2,
+		ToolTip: 'CimCmdlets\\gcim'
+	},
+	{
+		CompletionText: 'CimCmdlets\\gcls',
+		ListItemText: 'gcls',
+		ResultType: 2,
+		ToolTip: 'CimCmdlets\\gcls'
+	},
+	{
+		CompletionText: 'CimCmdlets\\gcms',
+		ListItemText: 'gcms',
+		ResultType: 2,
+		ToolTip: 'CimCmdlets\\gcms'
+	},
+	{
+		CompletionText: 'Az.Sql\\Get-AzSqlDatabaseVulnerabilityAssessmentSetting',
+		ListItemText: 'Get-AzSqlDatabaseVulnerabilityAssessmentSetting',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlDatabaseVulnerabilityAssessmentSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Az.Sql\\Get-AzSqlInstanceDatabaseVulnerabilityAssessmentSetting',
+		ListItemText: 'Get-AzSqlInstanceDatabaseVulnerabilityAssessmentSetting',
+		ResultType: 2,
+		ToolTip: 'Get-AzSqlInstanceDatabaseVulnerabilityAssessmentSetting\\r\\n'
+	},
+	{
+		CompletionText: 'VMDirectStorage\\Get-DiskSNV',
+		ListItemText: 'Get-DiskSNV',
+		ResultType: 2,
+		ToolTip: 'VMDirectStorage\\Get-DiskSNV'
+	},
+	{
+		CompletionText: 'PowerShellGet\\Get-InstalledModule',
+		ListItemText: 'Get-InstalledModule',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-InstalledModule \\r\\n'
+	},
+	{
+		CompletionText: 'PowerShellGet\\Get-InstalledScript',
+		ListItemText: 'Get-InstalledScript',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-InstalledScript \\r\\n'
+	},
+	{
+		CompletionText: 'PSDiagnostics\\Get-LogProperties',
+		ListItemText: 'Get-LogProperties',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-LogProperties \\r\\n'
+	},
+	{
+		CompletionText: 'Defender\\Get-MpComputerStatus',
+		ListItemText: 'Get-MpComputerStatus',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-MpComputerStatus \\r\\n'
+	},
+	{
+		CompletionText: 'DefenderPerformance\\Get-MpPerformanceReport',
+		ListItemText: 'Get-MpPerformanceReport',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-MpPerformanceReport \\r\\n'
+	},
+	{
+		CompletionText: 'Defender\\Get-MpPreference',
+		ListItemText: 'Get-MpPreference',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-MpPreference \\r\\n'
+	},
+	{
+		CompletionText: 'Defender\\Get-MpThreat',
+		ListItemText: 'Get-MpThreat',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-MpThreat \\r\\n'
+	},
+	{
+		CompletionText: 'Defender\\Get-MpThreatCatalog',
+		ListItemText: 'Get-MpThreatCatalog',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-MpThreatCatalog \\r\\n'
+	},
+	{
+		CompletionText: 'Defender\\Get-MpThreatDetection',
+		ListItemText: 'Get-MpThreatDetection',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-MpThreatDetection \\r\\n'
+	},
+	{
+		CompletionText: 'VMDirectStorage\\Get-PhysicalDiskSNV',
+		ListItemText: 'Get-PhysicalDiskSNV',
+		ResultType: 2,
+		ToolTip: 'VMDirectStorage\\Get-PhysicalDiskSNV'
+	},
+	{
+		CompletionText: 'PowerShellGet\\Get-PSRepository',
+		ListItemText: 'Get-PSRepository',
+		ResultType: 2,
+		ToolTip: '\\r\\nGet-PSRepository \\r\\n'
+	},
+	{
+		CompletionText: 'VMDirectStorage\\Get-StorageEnclosureSNV',
+		ListItemText: 'Get-StorageEnclosureSNV',
+		ResultType: 2,
+		ToolTip: 'VMDirectStorage\\Get-StorageEnclosureSNV'
+	},
+	{
+		CompletionText: 'VMDirectStorage\\Get-VMCheckpoint',
+		ListItemText: 'Get-VMCheckpoint',
+		ResultType: 2,
+		ToolTip: 'VMDirectStorage\\Get-VMCheckpoint'
+	},
+	{
+		CompletionText: 'C:\\Program Files\\Git\\cmd\\git-lfs.exe',
+		ListItemText: 'git-lfs.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files\\Git\\cmd\\git-lfs.exe'
+	},
+	{
+		CompletionText: 'Hyper-V\\gvm',
+		ListItemText: 'gvm',
+		ResultType: 2,
+		ToolTip: 'Hyper-V\\gvm'
+	},
+	{
+		CompletionText: 'VMDirectStorage\\gvm',
+		ListItemText: 'gvm',
+		ResultType: 2,
+		ToolTip: 'VMDirectStorage\\gvm'
+	},
+	{
+		CompletionText: 'Hyper-V\\gvmr',
+		ListItemText: 'gvmr',
+		ResultType: 2,
+		ToolTip: 'Hyper-V\\gvmr'
+	},
+	{
+		CompletionText: 'VMDirectStorage\\gvmr',
+		ListItemText: 'gvmr',
+		ResultType: 2,
+		ToolTip: 'VMDirectStorage\\gvmr'
+	},
+	{
+		CompletionText: 'Hyper-V\\gvmrs',
+		ListItemText: 'gvmrs',
+		ResultType: 2,
+		ToolTip: 'Hyper-V\\gvmrs'
+	},
+	{
+		CompletionText: 'VMDirectStorage\\gvmrs',
+		ListItemText: 'gvmrs',
+		ResultType: 2,
+		ToolTip: 'VMDirectStorage\\gvmrs'
+	},
+	{
+		CompletionText: 'CimCmdlets\\icim',
+		ListItemText: 'icim',
+		ResultType: 2,
+		ToolTip: 'CimCmdlets\\icim'
+	},
+	{
+		CompletionText: 'VMDirectStorage\\Initialize-Volume',
+		ListItemText: 'Initialize-Volume',
+		ResultType: 2,
+		ToolTip: 'VMDirectStorage\\Initialize-Volume'
+	},
+	{
+		CompletionText: 'PowerShellGet\\inmo',
+		ListItemText: 'inmo',
+		ResultType: 2,
+		ToolTip: 'PowerShellGet\\inmo'
+	},
+	{
+		CompletionText: 'PowerShellGet\\Install-Module',
+		ListItemText: 'Install-Module',
+		ResultType: 2,
+		ToolTip: '\\r\\nInstall-Module \\r\\n'
+	},
+	{
+		CompletionText: 'PowerShellGet\\Install-Script',
+		ListItemText: 'Install-Script',
+		ResultType: 2,
+		ToolTip: '\\r\\nInstall-Script \\r\\n'
+	},
+	{
+		CompletionText: 'C:\\WINDOWS\\system32\\klist.exe',
+		ListItemText: 'klist.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\klist.exe'
+	},
+	{
+		CompletionText: 'Hyper-V\\mvmr',
+		ListItemText: 'mvmr',
+		ResultType: 2,
+		ToolTip: 'Hyper-V\\mvmr'
+	},
+	{
+		CompletionText: 'VMDirectStorage\\mvmr',
+		ListItemText: 'mvmr',
+		ResultType: 2,
+		ToolTip: 'VMDirectStorage\\mvmr'
+	},
+	{
+		CompletionText: 'CimCmdlets\\ncim',
+		ListItemText: 'ncim',
+		ResultType: 2,
+		ToolTip: 'CimCmdlets\\ncim'
+	},
+	{
+		CompletionText: 'CimCmdlets\\ncms',
+		ListItemText: 'ncms',
+		ResultType: 2,
+		ToolTip: 'CimCmdlets\\ncms'
+	},
+	{
+		CompletionText: 'CimCmdlets\\ncso',
+		ListItemText: 'ncso',
+		ResultType: 2,
+		ToolTip: 'CimCmdlets\\ncso'
+	},
+	{
+		CompletionText: 'DefenderPerformance\\New-MpPerformanceRecording',
+		ListItemText: 'New-MpPerformanceRecording',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-MpPerformanceRecording \\r\\n'
+	},
+	{
+		CompletionText: 'PowerShellGet\\New-ScriptFileInfo',
+		ListItemText: 'New-ScriptFileInfo',
+		ResultType: 2,
+		ToolTip: '\\r\\nNew-ScriptFileInfo \\r\\n'
+	},
+	{
+		CompletionText: 'C:\\WINDOWS\\system32\\notepad.exe',
+		ListItemText: 'notepad.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\notepad.exe'
+	},
+	{
+		CompletionText: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\notepad.exe',
+		ListItemText: 'notepad.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\notepad.exe'
+	},
+	{
+		CompletionText: 'C:\\Users\\Daniel\\AppData\\Local\\Programs\\Python\\Python310\\Scripts\\pip.exe',
+		ListItemText: 'pip.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Programs\\Python\\Python310\\Scripts\\pip.exe'
+	},
+	{
+		CompletionText: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\pip.exe',
+		ListItemText: 'pip.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\pip.exe'
+	},
+	{
+		CompletionText: 'C:\\Users\\Daniel\\AppData\\Local\\Programs\\Python\\Python310\\Scripts\\pip3.exe',
+		ListItemText: 'pip3.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Programs\\Python\\Python310\\Scripts\\pip3.exe'
+	},
+	{
+		CompletionText: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\pip3.exe',
+		ListItemText: 'pip3.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\pip3.exe'
+	},
+	{
+		CompletionText: 'PSReadLine\\PSConsoleHostReadLine',
+		ListItemText: 'PSConsoleHostReadLine',
+		ResultType: 2,
+		ToolTip: '\\r\\nPSConsoleHostReadLine \\r\\n'
+	},
+	{
+		CompletionText: 'PowerShellGet\\Publish-Module',
+		ListItemText: 'Publish-Module',
+		ResultType: 2,
+		ToolTip: '\\r\\nPublish-Module \\r\\n'
+	},
+	{
+		CompletionText: 'PowerShellGet\\Publish-Script',
+		ListItemText: 'Publish-Script',
+		ResultType: 2,
+		ToolTip: '\\r\\nPublish-Script \\r\\n'
+	},
+	{
+		CompletionText: 'PowerShellGet\\pumo',
+		ListItemText: 'pumo',
+		ResultType: 2,
+		ToolTip: 'PowerShellGet\\pumo'
+	},
+	{
+		CompletionText: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\pwsh.exe',
+		ListItemText: 'pwsh.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\pwsh.exe'
+	},
+	{
+		CompletionText: 'C:\\Users\\Daniel\\AppData\\Local\\Programs\\Python\\Python310\\python.exe',
+		ListItemText: 'python.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Programs\\Python\\Python310\\python.exe'
+	},
+	{
+		CompletionText: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\python.exe',
+		ListItemText: 'python.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\python.exe'
+	},
+	{
+		CompletionText: 'C:\\Users\\Daniel\\AppData\\Local\\Programs\\Python\\Python310\\pythonw.exe',
+		ListItemText: 'pythonw.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Programs\\Python\\Python310\\pythonw.exe'
+	},
+	{
+		CompletionText: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\pythonw.exe',
+		ListItemText: 'pythonw.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\pythonw.exe'
+	},
+	{
+		CompletionText: 'CimCmdlets\\rcie',
+		ListItemText: 'rcie',
+		ResultType: 2,
+		ToolTip: 'CimCmdlets\\rcie'
+	},
+	{
+		CompletionText: 'CimCmdlets\\rcim',
+		ListItemText: 'rcim',
+		ResultType: 2,
+		ToolTip: 'CimCmdlets\\rcim'
+	},
+	{
+		CompletionText: 'CimCmdlets\\rcms',
+		ListItemText: 'rcms',
+		ResultType: 2,
+		ToolTip: 'CimCmdlets\\rcms'
+	},
+	{
+		CompletionText: 'PowerShellGet\\Register-PSRepository',
+		ListItemText: 'Register-PSRepository',
+		ResultType: 2,
+		ToolTip: '\\r\\nRegister-PSRepository \\r\\n'
+	},
+	{
+		CompletionText: 'Defender\\Remove-MpPreference',
+		ListItemText: 'Remove-MpPreference',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-MpPreference \\r\\n'
+	},
+	{
+		CompletionText: 'Defender\\Remove-MpThreat',
+		ListItemText: 'Remove-MpThreat',
+		ResultType: 2,
+		ToolTip: '\\r\\nRemove-MpThreat \\r\\n'
+	},
+	{
+		CompletionText: 'VMDirectStorage\\Remove-VMCheckpoint',
+		ListItemText: 'Remove-VMCheckpoint',
+		ResultType: 2,
+		ToolTip: 'VMDirectStorage\\Remove-VMCheckpoint'
+	},
+	{
+		CompletionText: 'VMDirectStorage\\Rename-VMCheckpoint',
+		ListItemText: 'Rename-VMCheckpoint',
+		ResultType: 2,
+		ToolTip: 'VMDirectStorage\\Rename-VMCheckpoint'
+	},
+	{
+		CompletionText: 'VMDirectStorage\\Restore-VMCheckpoint',
+		ListItemText: 'Restore-VMCheckpoint',
+		ResultType: 2,
+		ToolTip: 'VMDirectStorage\\Restore-VMCheckpoint'
+	},
+	{
+		CompletionText: 'PowerShellGet\\Save-Module',
+		ListItemText: 'Save-Module',
+		ResultType: 2,
+		ToolTip: '\\r\\nSave-Module \\r\\n'
+	},
+	{
+		CompletionText: 'PowerShellGet\\Save-Script',
+		ListItemText: 'Save-Script',
+		ResultType: 2,
+		ToolTip: '\\r\\nSave-Script \\r\\n'
+	},
+	{
+		CompletionText: 'Hyper-V\\savm',
+		ListItemText: 'savm',
+		ResultType: 2,
+		ToolTip: 'Hyper-V\\savm'
+	},
+	{
+		CompletionText: 'VMDirectStorage\\savm',
+		ListItemText: 'savm',
+		ResultType: 2,
+		ToolTip: 'VMDirectStorage\\savm'
+	},
+	{
+		CompletionText: 'CimCmdlets\\scim',
+		ListItemText: 'scim',
+		ResultType: 2,
+		ToolTip: 'CimCmdlets\\scim'
+	},
+	{
+		CompletionText: 'PSDiagnostics\\Set-LogProperties',
+		ListItemText: 'Set-LogProperties',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-LogProperties \\r\\n'
+	},
+	{
+		CompletionText: 'Defender\\Set-MpPreference',
+		ListItemText: 'Set-MpPreference',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-MpPreference \\r\\n'
+	},
+	{
+		CompletionText: 'PowerShellGet\\Set-PSRepository',
+		ListItemText: 'Set-PSRepository',
+		ResultType: 2,
+		ToolTip: '\\r\\nSet-PSRepository \\r\\n'
+	},
+	{
+		CompletionText: 'Hyper-V\\spvm',
+		ListItemText: 'spvm',
+		ResultType: 2,
+		ToolTip: 'Hyper-V\\spvm'
+	},
+	{
+		CompletionText: 'VMDirectStorage\\spvm',
+		ListItemText: 'spvm',
+		ResultType: 2,
+		ToolTip: 'VMDirectStorage\\spvm'
+	},
+	{
+		CompletionText: 'Defender\\Start-MpRollback',
+		ListItemText: 'Start-MpRollback',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-MpRollback \\r\\n'
+	},
+	{
+		CompletionText: 'Defender\\Start-MpScan',
+		ListItemText: 'Start-MpScan',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-MpScan \\r\\n'
+	},
+	{
+		CompletionText: 'Defender\\Start-MpWDOScan',
+		ListItemText: 'Start-MpWDOScan',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-MpWDOScan \\r\\n'
+	},
+	{
+		CompletionText: 'PSDiagnostics\\Start-Trace',
+		ListItemText: 'Start-Trace',
+		ResultType: 2,
+		ToolTip: '\\r\\nStart-Trace \\r\\n'
+	},
+	{
+		CompletionText: 'PSDiagnostics\\Stop-Trace',
+		ListItemText: 'Stop-Trace',
+		ResultType: 2,
+		ToolTip: '\\r\\nStop-Trace \\r\\n'
+	},
+	{
+		CompletionText: 'PowerShellGet\\Test-ScriptFileInfo',
+		ListItemText: 'Test-ScriptFileInfo',
+		ResultType: 2,
+		ToolTip: '\\r\\nTest-ScriptFileInfo \\r\\n'
+	},
+	{
+		CompletionText: 'PowerShellGet\\Uninstall-Module',
+		ListItemText: 'Uninstall-Module',
+		ResultType: 2,
+		ToolTip: '\\r\\nUninstall-Module \\r\\n'
+	},
+	{
+		CompletionText: 'PowerShellGet\\Uninstall-Script',
+		ListItemText: 'Uninstall-Script',
+		ResultType: 2,
+		ToolTip: '\\r\\nUninstall-Script \\r\\n'
+	},
+	{
+		CompletionText: 'PowerShellGet\\Unregister-PSRepository',
+		ListItemText: 'Unregister-PSRepository',
+		ResultType: 2,
+		ToolTip: '\\r\\nUnregister-PSRepository \\r\\n'
+	},
+	{
+		CompletionText: 'Az.Sql\\Update-AzSqlDatabaseVulnerabilityAssessmentSetting',
+		ListItemText: 'Update-AzSqlDatabaseVulnerabilityAssessmentSetting',
+		ResultType: 2,
+		ToolTip: 'Update-AzSqlDatabaseVulnerabilityAssessmentSetting\\r\\n'
+	},
+	{
+		CompletionText: 'Az.Sql\\Update-AzSqlInstanceDatabaseVulnerabilityAssessmentSetting',
+		ListItemText: 'Update-AzSqlInstanceDatabaseVulnerabilityAssessmentSetting',
+		ResultType: 2,
+		ToolTip: 'Update-AzSqlInstanceDatabaseVulnerabilityAssessmentSetting\\r\\n'
+	},
+	{
+		CompletionText: 'PSDesiredStateConfiguration\\Update-DscConfiguration',
+		ListItemText: 'Update-DscConfiguration',
+		ResultType: 2,
+		ToolTip: 'Update-DscConfiguration\\r\\n'
+	},
+	{
+		CompletionText: 'PowerShellGet\\Update-Module',
+		ListItemText: 'Update-Module',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-Module \\r\\n'
+	},
+	{
+		CompletionText: 'PowerShellGet\\Update-ModuleManifest',
+		ListItemText: 'Update-ModuleManifest',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-ModuleManifest \\r\\n'
+	},
+	{
+		CompletionText: 'Defender\\Update-MpSignature',
+		ListItemText: 'Update-MpSignature',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-MpSignature \\r\\n'
+	},
+	{
+		CompletionText: 'PowerShellGet\\Update-Script',
+		ListItemText: 'Update-Script',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-Script \\r\\n'
+	},
+	{
+		CompletionText: 'PowerShellGet\\Update-ScriptFileInfo',
+		ListItemText: 'Update-ScriptFileInfo',
+		ResultType: 2,
+		ToolTip: '\\r\\nUpdate-ScriptFileInfo \\r\\n'
+	},
+	{
+		CompletionText: 'PowerShellGet\\upmo',
+		ListItemText: 'upmo',
+		ResultType: 2,
+		ToolTip: 'PowerShellGet\\upmo'
+	},
+	{
+		CompletionText: 'C:\\Program Files (x86)\\Windows Kits\\10\\Windows Performance Toolkit\\wpr.exe',
+		ListItemText: 'wpr.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Program Files (x86)\\Windows Kits\\10\\Windows Performance Toolkit\\wpr.exe'
+	},
+	{
+		CompletionText: 'VMDirectStorage\\Write-FileSystemCache',
+		ListItemText: 'Write-FileSystemCache',
+		ResultType: 2,
+		ToolTip: 'VMDirectStorage\\Write-FileSystemCache'
+	},
+	{
+		CompletionText: 'C:\\WINDOWS\\system32\\write.exe',
+		ListItemText: 'write.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\WINDOWS\\system32\\write.exe'
+	},
+	{
+		CompletionText: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\wsl.exe',
+		ListItemText: 'wsl.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\wsl.exe'
+	},
+	{
+		CompletionText: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\wslconfig.exe',
+		ListItemText: 'wslconfig.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\wslconfig.exe'
+	},
+	{
+		CompletionText: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\wslg.exe',
+		ListItemText: 'wslg.exe',
+		ResultType: 2,
+		ToolTip: 'C:\\Users\\Daniel\\AppData\\Local\\Microsoft\\WindowsApps\\wslg.exe'
+	}
+];
diff --git a/src/vs/workbench/contrib/terminalContrib/typeAhead/browser/terminal.typeAhead.contribution.ts b/src/vs/workbench/contrib/terminalContrib/typeAhead/browser/terminal.typeAhead.contribution.ts
index 6977568149c..93721ab4463 100644
--- a/src/vs/workbench/contrib/terminalContrib/typeAhead/browser/terminal.typeAhead.contribution.ts
+++ b/src/vs/workbench/contrib/terminalContrib/typeAhead/browser/terminal.typeAhead.contribution.ts
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ITerminalContribution, ITerminalInstance, IXtermTerminal } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { registerTerminalContribution } from 'vs/workbench/contrib/terminal/browser/terminalExtensions';
-import { TerminalWidgetManager } from 'vs/workbench/contrib/terminal/browser/widgets/widgetManager';
-import { TypeAheadAddon } from 'vs/workbench/contrib/terminalContrib/typeAhead/browser/terminalTypeAheadAddon';
-import { ITerminalProcessManager, TERMINAL_CONFIG_SECTION } from 'vs/workbench/contrib/terminal/common/terminal';
 import type { Terminal as RawXtermTerminal } from '@xterm/xterm';
-import { TerminalTypeAheadSettingId, type ITerminalTypeAheadConfiguration } from 'vs/workbench/contrib/terminalContrib/typeAhead/common/terminalTypeAheadConfiguration';
+import { DisposableStore, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ITerminalContribution, ITerminalInstance, IXtermTerminal } from '../../../terminal/browser/terminal.js';
+import { registerTerminalContribution, type ITerminalContributionContext } from '../../../terminal/browser/terminalExtensions.js';
+import { TERMINAL_CONFIG_SECTION } from '../../../terminal/common/terminal.js';
+import { TerminalTypeAheadSettingId, type ITerminalTypeAheadConfiguration } from '../common/terminalTypeAheadConfiguration.js';
+import { TypeAheadAddon } from './terminalTypeAheadAddon.js';
 
 class TerminalTypeAheadContribution extends DisposableStore implements ITerminalContribution {
 	static readonly ID = 'terminal.typeAhead';
@@ -24,9 +23,7 @@ class TerminalTypeAheadContribution extends DisposableStore implements ITerminal
 	private _addon: TypeAheadAddon | undefined;
 
 	constructor(
-		instance: ITerminalInstance,
-		private readonly _processManager: ITerminalProcessManager,
-		widgetManager: TerminalWidgetManager,
+		private readonly _ctx: ITerminalContributionContext,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService
 	) {
@@ -43,14 +40,14 @@ class TerminalTypeAheadContribution extends DisposableStore implements ITerminal
 		}));
 
 		// Reset the addon when the terminal launches or relaunches
-		this.add(this._processManager.onProcessReady(() => {
+		this.add(this._ctx.processManager.onProcessReady(() => {
 			this._addon?.reset();
 		}));
 	}
 
 	private _loadTypeAheadAddon(xterm: RawXtermTerminal): void {
 		const enabled = this._configurationService.getValue<ITerminalTypeAheadConfiguration>(TERMINAL_CONFIG_SECTION).localEchoEnabled;
-		const isRemote = !!this._processManager.remoteAuthority;
+		const isRemote = !!this._ctx.processManager.remoteAuthority;
 		if (enabled === 'off' || enabled === 'auto' && !isRemote) {
 			this._addon?.dispose();
 			this._addon = undefined;
@@ -60,7 +57,7 @@ class TerminalTypeAheadContribution extends DisposableStore implements ITerminal
 			return;
 		}
 		if (enabled === 'on' || (enabled === 'auto' && isRemote)) {
-			this._addon = this._instantiationService.createInstance(TypeAheadAddon, this._processManager);
+			this._addon = this._instantiationService.createInstance(TypeAheadAddon, this._ctx.processManager);
 			xterm.loadAddon(this._addon);
 		}
 	}
diff --git a/src/vs/workbench/contrib/terminalContrib/typeAhead/browser/terminalTypeAheadAddon.ts b/src/vs/workbench/contrib/terminalContrib/typeAhead/browser/terminalTypeAheadAddon.ts
index 6a0656d8f1b..e286592242d 100644
--- a/src/vs/workbench/contrib/terminalContrib/typeAhead/browser/terminalTypeAheadAddon.ts
+++ b/src/vs/workbench/contrib/terminalContrib/typeAhead/browser/terminalTypeAheadAddon.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { disposableTimeout } from 'vs/base/common/async';
-import { Color, RGBA } from 'vs/base/common/color';
-import { debounce } from 'vs/base/common/decorators';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { escapeRegExpCharacters } from 'vs/base/common/strings';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { XtermAttributes, IXtermCore } from 'vs/workbench/contrib/terminal/browser/xterm-private';
-import { IBeforeProcessDataEvent, ITerminalProcessManager, TERMINAL_CONFIG_SECTION } from 'vs/workbench/contrib/terminal/common/terminal';
+import { disposableTimeout } from '../../../../../base/common/async.js';
+import { Color, RGBA } from '../../../../../base/common/color.js';
+import { debounce } from '../../../../../base/common/decorators.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { Disposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { escapeRegExpCharacters } from '../../../../../base/common/strings.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { XtermAttributes, IXtermCore } from '../../../terminal/browser/xterm-private.js';
+import { IBeforeProcessDataEvent, ITerminalProcessManager, TERMINAL_CONFIG_SECTION } from '../../../terminal/common/terminal.js';
 import type { IBuffer, IBufferCell, IDisposable, ITerminalAddon, Terminal } from '@xterm/xterm';
-import { DEFAULT_LOCAL_ECHO_EXCLUDE, type ITerminalTypeAheadConfiguration } from 'vs/workbench/contrib/terminalContrib/typeAhead/common/terminalTypeAheadConfiguration';
+import { DEFAULT_LOCAL_ECHO_EXCLUDE, type ITerminalTypeAheadConfiguration } from '../common/terminalTypeAheadConfiguration.js';
 
 const enum VT {
 	Esc = '\x1b',
diff --git a/src/vs/workbench/contrib/terminalContrib/typeAhead/common/terminalTypeAheadConfiguration.ts b/src/vs/workbench/contrib/terminalContrib/typeAhead/common/terminalTypeAheadConfiguration.ts
index 6b4b2d9f917..4f32102b09c 100644
--- a/src/vs/workbench/contrib/terminalContrib/typeAhead/common/terminalTypeAheadConfiguration.ts
+++ b/src/vs/workbench/contrib/terminalContrib/typeAhead/common/terminalTypeAheadConfiguration.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import type { IStringDictionary } from 'vs/base/common/collections';
-import { localize } from 'vs/nls';
-import type { IConfigurationPropertySchema } from 'vs/platform/configuration/common/configurationRegistry';
+import type { IStringDictionary } from '../../../../../base/common/collections.js';
+import { localize } from '../../../../../nls.js';
+import type { IConfigurationPropertySchema } from '../../../../../platform/configuration/common/configurationRegistry.js';
 
 export const DEFAULT_LOCAL_ECHO_EXCLUDE: ReadonlyArray<string> = ['vim', 'vi', 'nano', 'tmux'];
 
diff --git a/src/vs/workbench/contrib/terminalContrib/typeAhead/test/browser/terminalTypeAhead.test.ts b/src/vs/workbench/contrib/terminalContrib/typeAhead/test/browser/terminalTypeAhead.test.ts
index 14f61b9868a..3be5ebd8412 100644
--- a/src/vs/workbench/contrib/terminalContrib/typeAhead/test/browser/terminalTypeAhead.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/typeAhead/test/browser/terminalTypeAhead.test.ts
@@ -6,14 +6,14 @@
 import assert from 'assert';
 import type { IBuffer, Terminal } from '@xterm/xterm';
 import { SinonStub, stub, useFakeTimers } from 'sinon';
-import { Emitter } from 'vs/base/common/event';
-import { CharPredictState, IPrediction, PredictionStats, TypeAheadAddon } from 'vs/workbench/contrib/terminalContrib/typeAhead/browser/terminalTypeAheadAddon';
-import { IBeforeProcessDataEvent, ITerminalProcessManager } from 'vs/workbench/contrib/terminal/common/terminal';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { DEFAULT_LOCAL_ECHO_EXCLUDE, type ITerminalTypeAheadConfiguration } from 'vs/workbench/contrib/terminalContrib/typeAhead/common/terminalTypeAheadConfiguration';
+import { Emitter } from '../../../../../../base/common/event.js';
+import { CharPredictState, IPrediction, PredictionStats, TypeAheadAddon } from '../../browser/terminalTypeAheadAddon.js';
+import { IBeforeProcessDataEvent, ITerminalProcessManager } from '../../../../terminal/common/terminal.js';
+import { ITelemetryService } from '../../../../../../platform/telemetry/common/telemetry.js';
+import { TestConfigurationService } from '../../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { DEFAULT_LOCAL_ECHO_EXCLUDE, type ITerminalTypeAheadConfiguration } from '../../common/terminalTypeAheadConfiguration.js';
 
 const CSI = `\x1b[`;
 
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalWslRecommendationContribution.ts b/src/vs/workbench/contrib/terminalContrib/wslRecommendation/browser/terminal.wslRecommendation.contribution.ts
similarity index 68%
rename from src/vs/workbench/contrib/terminal/browser/terminalWslRecommendationContribution.ts
rename to src/vs/workbench/contrib/terminalContrib/wslRecommendation/browser/terminal.wslRecommendation.contribution.ts
index 18635b3fb13..94b3c58845b 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalWslRecommendationContribution.ts
+++ b/src/vs/workbench/contrib/terminalContrib/wslRecommendation/browser/terminal.wslRecommendation.contribution.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, type IDisposable } from 'vs/base/common/lifecycle';
-import { basename } from 'vs/base/common/path';
-import { isWindows } from 'vs/base/common/platform';
-import { localize } from 'vs/nls';
-import { IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { INotificationService, NeverShowAgainScope, Severity } from 'vs/platform/notification/common/notification';
-import { IProductService } from 'vs/platform/product/common/productService';
-import type { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { InstallRecommendedExtensionAction } from 'vs/workbench/contrib/extensions/browser/extensionsActions';
-import { ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal';
+import { Disposable, type IDisposable } from '../../../../../base/common/lifecycle.js';
+import { basename } from '../../../../../base/common/path.js';
+import { isWindows } from '../../../../../base/common/platform.js';
+import { localize } from '../../../../../nls.js';
+import { IExtensionManagementService } from '../../../../../platform/extensionManagement/common/extensionManagement.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { INotificationService, NeverShowAgainScope, Severity } from '../../../../../platform/notification/common/notification.js';
+import { IProductService } from '../../../../../platform/product/common/productService.js';
+import { registerWorkbenchContribution2, WorkbenchPhase, type IWorkbenchContribution } from '../../../../common/contributions.js';
+import { InstallRecommendedExtensionAction } from '../../../extensions/browser/extensionsActions.js';
+import { ITerminalService } from '../../../terminal/browser/terminal.js';
 
 export class TerminalWslRecommendationContribution extends Disposable implements IWorkbenchContribution {
 	static ID = 'terminalWslRecommendation';
@@ -74,3 +74,5 @@ export class TerminalWslRecommendationContribution extends Disposable implements
 		});
 	}
 }
+
+registerWorkbenchContribution2(TerminalWslRecommendationContribution.ID, TerminalWslRecommendationContribution, WorkbenchPhase.Eventually);
diff --git a/src/vs/workbench/contrib/terminalContrib/zoom/browser/terminal.zoom.contribution.ts b/src/vs/workbench/contrib/terminalContrib/zoom/browser/terminal.zoom.contribution.ts
index 12f2a06f687..166e56710c8 100644
--- a/src/vs/workbench/contrib/terminalContrib/zoom/browser/terminal.zoom.contribution.ts
+++ b/src/vs/workbench/contrib/terminalContrib/zoom/browser/terminal.zoom.contribution.ts
@@ -4,22 +4,20 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type { Terminal as RawXtermTerminal } from '@xterm/xterm';
-import { Event } from 'vs/base/common/event';
-import { IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
-import { MouseWheelClassifier } from 'vs/base/browser/ui/scrollbar/scrollableElement';
-import { Disposable, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { isMacintosh } from 'vs/base/common/platform';
-import { TerminalSettingId } from 'vs/platform/terminal/common/terminal';
-import { IDetachedTerminalInstance, ITerminalContribution, ITerminalInstance, IXtermTerminal } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { registerTerminalContribution } from 'vs/workbench/contrib/terminal/browser/terminalExtensions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ITerminalProcessInfo, ITerminalProcessManager } from 'vs/workbench/contrib/terminal/common/terminal';
-import { TerminalWidgetManager } from 'vs/workbench/contrib/terminal/browser/widgets/widgetManager';
-import { registerTerminalAction } from 'vs/workbench/contrib/terminal/browser/terminalActions';
-import { localize2 } from 'vs/nls';
-import { isNumber } from 'vs/base/common/types';
-import { defaultTerminalFontSize } from 'vs/workbench/contrib/terminal/common/terminalConfiguration';
-import { TerminalZoomCommandId, TerminalZoomSettingId } from 'vs/workbench/contrib/terminalContrib/zoom/common/terminal.zoom';
+import { Event } from '../../../../../base/common/event.js';
+import { IMouseWheelEvent } from '../../../../../base/browser/mouseEvent.js';
+import { MouseWheelClassifier } from '../../../../../base/browser/ui/scrollbar/scrollableElement.js';
+import { Disposable, MutableDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { isMacintosh } from '../../../../../base/common/platform.js';
+import { TerminalSettingId } from '../../../../../platform/terminal/common/terminal.js';
+import { IDetachedTerminalInstance, ITerminalContribution, ITerminalInstance, IXtermTerminal } from '../../../terminal/browser/terminal.js';
+import { registerTerminalContribution, type IDetachedCompatibleTerminalContributionContext, type ITerminalContributionContext } from '../../../terminal/browser/terminalExtensions.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { registerTerminalAction } from '../../../terminal/browser/terminalActions.js';
+import { localize2 } from '../../../../../nls.js';
+import { isNumber } from '../../../../../base/common/types.js';
+import { defaultTerminalFontSize } from '../../../terminal/common/terminalConfiguration.js';
+import { TerminalZoomCommandId, TerminalZoomSettingId } from '../common/terminal.zoom.js';
 
 class TerminalMouseWheelZoomContribution extends Disposable implements ITerminalContribution {
 	static readonly ID = 'terminal.mouseWheelZoom';
@@ -37,9 +35,7 @@ class TerminalMouseWheelZoomContribution extends Disposable implements ITerminal
 	private readonly _listener = this._register(new MutableDisposable());
 
 	constructor(
-		instance: ITerminalInstance | IDetachedTerminalInstance,
-		processManager: ITerminalProcessManager | ITerminalProcessInfo,
-		widgetManager: TerminalWidgetManager,
+		_ctx: ITerminalContributionContext | IDetachedCompatibleTerminalContributionContext,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 	) {
 		super();
diff --git a/src/vs/workbench/contrib/terminalContrib/zoom/common/terminal.zoom.ts b/src/vs/workbench/contrib/terminalContrib/zoom/common/terminal.zoom.ts
index e7da97b2dc4..425267b1d6b 100644
--- a/src/vs/workbench/contrib/terminalContrib/zoom/common/terminal.zoom.ts
+++ b/src/vs/workbench/contrib/terminalContrib/zoom/common/terminal.zoom.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import type { IStringDictionary } from 'vs/base/common/collections';
-import { isMacintosh } from 'vs/base/common/platform';
-import { localize } from 'vs/nls';
-import type { IConfigurationPropertySchema } from 'vs/platform/configuration/common/configurationRegistry';
+import type { IStringDictionary } from '../../../../../base/common/collections.js';
+import { isMacintosh } from '../../../../../base/common/platform.js';
+import { localize } from '../../../../../nls.js';
+import type { IConfigurationPropertySchema } from '../../../../../platform/configuration/common/configurationRegistry.js';
 
 export const enum TerminalZoomCommandId {
 	FontZoomIn = 'workbench.action.terminal.fontZoomIn',
diff --git a/src/vs/workbench/contrib/testing/browser/codeCoverageDecorations.ts b/src/vs/workbench/contrib/testing/browser/codeCoverageDecorations.ts
index a4ba28d6334..9b266139840 100644
--- a/src/vs/workbench/contrib/testing/browser/codeCoverageDecorations.ts
+++ b/src/vs/workbench/contrib/testing/browser/codeCoverageDecorations.ts
@@ -3,53 +3,53 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { ActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { ActionBar, ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
-import { renderIcon } from 'vs/base/browser/ui/iconLabel/iconLabels';
-import { Action } from 'vs/base/common/actions';
-import { mapFindFirst } from 'vs/base/common/arraysFind';
-import { assert, assertNever } from 'vs/base/common/assert';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Codicon } from 'vs/base/common/codicons';
-import { IMarkdownString, MarkdownString } from 'vs/base/common/htmlContent';
-import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Lazy } from 'vs/base/common/lazy';
-import { Disposable, DisposableStore, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { autorun, derived, observableFromEvent } from 'vs/base/common/observable';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { isUriComponents, URI } from 'vs/base/common/uri';
-import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, MouseTargetType, OverlayWidgetPositionPreference } from 'vs/editor/browser/editorBrowser';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { IModelDecorationOptions, InjectedTextCursorStops, InjectedTextOptions, ITextModel } from 'vs/editor/common/model';
-import { localize, localize2 } from 'vs/nls';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ILogService } from 'vs/platform/log/common/log';
-import { observableConfigValue } from 'vs/platform/observable/common/platformObservableUtils';
-import { IQuickInputService, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
-import * as coverUtils from 'vs/workbench/contrib/testing/browser/codeCoverageDisplayUtils';
-import { testingCoverageMissingBranch, testingCoverageReport, testingFilterIcon, testingRerunIcon } from 'vs/workbench/contrib/testing/browser/icons';
-import { ManagedTestCoverageBars } from 'vs/workbench/contrib/testing/browser/testCoverageBars';
-import { getTestingConfiguration, TestingConfigKeys } from 'vs/workbench/contrib/testing/common/configuration';
-import { TestCommandId } from 'vs/workbench/contrib/testing/common/constants';
-import { FileCoverage } from 'vs/workbench/contrib/testing/common/testCoverage';
-import { ITestCoverageService } from 'vs/workbench/contrib/testing/common/testCoverageService';
-import { TestId } from 'vs/workbench/contrib/testing/common/testId';
-import { ITestService } from 'vs/workbench/contrib/testing/common/testService';
-import { CoverageDetails, DetailType, IDeclarationCoverage, IStatementCoverage } from 'vs/workbench/contrib/testing/common/testTypes';
-import { TestingContextKeys } from 'vs/workbench/contrib/testing/common/testingContextKeys';
+import * as dom from '../../../../base/browser/dom.js';
+import { ActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { ActionBar, ActionsOrientation } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { Action } from '../../../../base/common/actions.js';
+import { mapFindFirst } from '../../../../base/common/arraysFind.js';
+import { assert, assertNever } from '../../../../base/common/assert.js';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { IMarkdownString, MarkdownString } from '../../../../base/common/htmlContent.js';
+import { KeyChord, KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { Lazy } from '../../../../base/common/lazy.js';
+import { Disposable, DisposableStore, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { autorun, derived, observableFromEvent } from '../../../../base/common/observable.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { isUriComponents, URI } from '../../../../base/common/uri.js';
+import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, isCodeEditor, MouseTargetType, OverlayWidgetPositionPreference } from '../../../../editor/browser/editorBrowser.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { IEditorContribution } from '../../../../editor/common/editorCommon.js';
+import { IModelDecorationOptions, InjectedTextCursorStops, InjectedTextOptions, ITextModel } from '../../../../editor/common/model.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { observableConfigValue } from '../../../../platform/observable/common/platformObservableUtils.js';
+import { IQuickInputService, QuickPickInput } from '../../../../platform/quickinput/common/quickInput.js';
+import * as coverUtils from './codeCoverageDisplayUtils.js';
+import { testingCoverageMissingBranch, testingCoverageReport, testingFilterIcon, testingRerunIcon } from './icons.js';
+import { ManagedTestCoverageBars } from './testCoverageBars.js';
+import { getTestingConfiguration, TestingConfigKeys } from '../common/configuration.js';
+import { TestCommandId } from '../common/constants.js';
+import { FileCoverage } from '../common/testCoverage.js';
+import { ITestCoverageService } from '../common/testCoverageService.js';
+import { TestId } from '../common/testId.js';
+import { ITestService } from '../common/testService.js';
+import { CoverageDetails, DetailType, IDeclarationCoverage, IStatementCoverage } from '../common/testTypes.js';
+import { TestingContextKeys } from '../common/testingContextKeys.js';
 
 const CLASS_HIT = 'coverage-deco-hit';
 const CLASS_MISS = 'coverage-deco-miss';
@@ -58,8 +58,6 @@ const TOGGLE_INLINE_COMMAND_ID = 'testing.toggleInlineCoverage';
 const BRANCH_MISS_INDICATOR_CHARS = 4;
 
 export class CodeCoverageDecorations extends Disposable implements IEditorContribution {
-	private static readonly fileCoverageDecorations = new WeakMap<FileCoverage, CoverageDetailsModel>();
-
 	private loadingCancellation?: CancellationTokenSource;
 	private readonly displayedStore = this._register(new DisposableStore());
 	private readonly hoveredStore = this._register(new DisposableStore());
@@ -83,8 +81,8 @@ export class CodeCoverageDecorations extends Disposable implements IEditorContri
 
 		this.summaryWidget = new Lazy(() => this._register(instantiationService.createInstance(CoverageToolbarWidget, this.editor)));
 
-		const modelObs = observableFromEvent(editor.onDidChangeModel, () => editor.getModel());
-		const configObs = observableFromEvent(editor.onDidChangeConfiguration, i => i);
+		const modelObs = observableFromEvent(this, editor.onDidChangeModel, () => editor.getModel());
+		const configObs = observableFromEvent(this, editor.onDidChangeConfiguration, i => i);
 
 		const fileCoverage = derived(reader => {
 			const report = coverage.selected.read(reader);
@@ -97,24 +95,19 @@ export class CodeCoverageDecorations extends Disposable implements IEditorContri
 				return;
 			}
 
-			let file = report.getUri(model.uri);
-			if (file) {
-				const testFilter = coverage.filterToTest.read(reader);
-				if (testFilter) {
-					file = file.perTestData?.get(testFilter.toString()) || file;
-				}
-
-				return file;
+			const file = report.getUri(model.uri);
+			if (!file) {
+				return;
 			}
 
 			report.didAddCoverage.read(reader); // re-read if changes when there's no report
-			return undefined;
+			return { file, testId: coverage.filterToTest.read(reader) };
 		});
 
 		this._register(autorun(reader => {
 			const c = fileCoverage.read(reader);
 			if (c) {
-				this.apply(editor.getModel()!, c, coverage.showInline.read(reader));
+				this.apply(editor.getModel()!, c.file, c.testId, coverage.showInline.read(reader));
 			} else {
 				this.clear();
 			}
@@ -124,9 +117,9 @@ export class CodeCoverageDecorations extends Disposable implements IEditorContri
 		this._register(autorun(reader => {
 			const c = fileCoverage.read(reader);
 			if (c && toolbarEnabled.read(reader)) {
-				this.summaryWidget.value.setCoverage(c);
+				this.summaryWidget.value.setCoverage(c.file, c.testId);
 			} else {
-				this.summaryWidget.rawValue?.setCoverage(undefined);
+				this.summaryWidget.rawValue?.clearCoverage();
 			}
 		}));
 
@@ -143,7 +136,7 @@ export class CodeCoverageDecorations extends Disposable implements IEditorContri
 		this._register(editor.onMouseMove(e => {
 			const model = editor.getModel();
 			if (e.target.type === MouseTargetType.GUTTER_LINE_NUMBERS && model) {
-				this.hoverLineNumber(editor.getModel()!, e.target.position.lineNumber);
+				this.hoverLineNumber(editor.getModel()!);
 			} else if (coverage.showInline.get() && e.target.type === MouseTargetType.CONTENT_TEXT && model) {
 				this.hoverInlineDecoration(model, e.target.position);
 			} else {
@@ -202,50 +195,22 @@ export class CodeCoverageDecorations extends Disposable implements IEditorContri
 		}));
 	}
 
-	private hoverLineNumber(model: ITextModel, lineNumber: number) {
-		if (lineNumber === this.hoveredSubject || !this.details) {
+	private hoverLineNumber(model: ITextModel) {
+		if (this.hoveredSubject === 'lineNo' || !this.details || this.coverage.showInline.get()) {
 			return;
 		}
 
 		this.hoveredStore.clear();
-		this.hoveredSubject = lineNumber;
+		this.hoveredSubject = 'lineNo';
 
-		const todo = [{ line: lineNumber, dir: 0 }];
-		const toEnable = new Set<string>();
-		const ranges = this.editor.getVisibleRanges();
-		if (!this.coverage.showInline.get()) {
-			for (let i = 0; i < todo.length; i++) {
-				const { line, dir } = todo[i];
-				if (!ranges.some(r => r.startLineNumber <= line && r.endLineNumber >= line)) {
-					continue; // stop once outside the viewport
-				}
-
-				let found = false;
-				for (const decoration of model.getLineDecorations(line)) {
-					if (this.decorationIds.has(decoration.id)) {
-						toEnable.add(decoration.id);
-						found = true;
-					}
-				}
-				if (found) {
-					if (dir <= 0) {
-						todo.push({ line: line - 1, dir: -1 });
-					}
-					if (dir >= 0) {
-						todo.push({ line: line + 1, dir: 1 });
-					}
-				}
+		model.changeDecorations(e => {
+			for (const [id, decoration] of this.decorationIds) {
+				const { applyHoverOptions, options } = decoration;
+				const dup = { ...options };
+				applyHoverOptions(dup);
+				e.changeDecorationOptions(id, dup);
 			}
-
-			model.changeDecorations(e => {
-				for (const id of toEnable) {
-					const { applyHoverOptions, options } = this.decorationIds.get(id)!;
-					const dup = { ...options };
-					applyHoverOptions(dup);
-					e.changeDecorationOptions(id, dup);
-				}
-			});
-		}
+		});
 
 		this.hoveredStore.add(this.editor.onMouseLeave(() => {
 			this.hoveredStore.clear();
@@ -255,18 +220,15 @@ export class CodeCoverageDecorations extends Disposable implements IEditorContri
 			this.hoveredSubject = undefined;
 
 			model.changeDecorations(e => {
-				for (const id of toEnable) {
-					const deco = this.decorationIds.get(id);
-					if (deco) {
-						e.changeDecorationOptions(id, deco.options);
-					}
+				for (const [id, decoration] of this.decorationIds) {
+					e.changeDecorationOptions(id, decoration.options);
 				}
 			});
 		}));
 	}
 
-	private async apply(model: ITextModel, coverage: FileCoverage, showInlineByDefault: boolean) {
-		const details = this.details = await this.loadDetails(coverage, model);
+	private async apply(model: ITextModel, coverage: FileCoverage, testId: TestId | undefined, showInlineByDefault: boolean) {
+		const details = this.details = await this.loadDetails(coverage, testId, model);
 		if (!details) {
 			return this.clear();
 		}
@@ -351,24 +313,18 @@ export class CodeCoverageDecorations extends Disposable implements IEditorContri
 		this.hoveredStore.clear();
 	}
 
-	private async loadDetails(coverage: FileCoverage, textModel: ITextModel) {
-		const existing = CodeCoverageDecorations.fileCoverageDecorations.get(coverage);
-		if (existing) {
-			return existing;
-		}
-
+	private async loadDetails(coverage: FileCoverage, testId: TestId | undefined, textModel: ITextModel) {
 		const cts = this.loadingCancellation = new CancellationTokenSource();
 		this.displayedStore.add(this.loadingCancellation);
 
 		try {
-			const details = await coverage.details(this.loadingCancellation.token);
+			const details = testId
+				? await coverage.detailsForTest(testId, this.loadingCancellation.token)
+				: await coverage.details(this.loadingCancellation.token);
 			if (cts.token.isCancellationRequested) {
 				return;
 			}
-			const model = CodeCoverageDecorations.fileCoverageDecorations.get(coverage)
-				|| new CoverageDetailsModel(details, textModel);
-			CodeCoverageDecorations.fileCoverageDecorations.set(coverage, model);
-			return model;
+			return new CoverageDetailsModel(details, textModel);
 		} catch (e) {
 			this.log.error('Error loading coverage details', e);
 		}
@@ -538,7 +494,7 @@ function wrapName(functionNameOrCode: string) {
 }
 
 class CoverageToolbarWidget extends Disposable implements IOverlayWidget {
-	private current: FileCoverage | undefined;
+	private current: { coverage: FileCoverage; testId: TestId | undefined } | undefined;
 	private registered = false;
 	private isRunning = false;
 	private readonly showStore = this._register(new DisposableStore());
@@ -613,8 +569,14 @@ class CoverageToolbarWidget extends Disposable implements IOverlayWidget {
 		};
 	}
 
-	public setCoverage(coverage: FileCoverage | undefined) {
-		this.current = coverage;
+	public clearCoverage() {
+		this.current = undefined;
+		this.bars.setCoverageInfo(undefined);
+		this.hide();
+	}
+
+	public setCoverage(coverage: FileCoverage, testId: TestId | undefined) {
+		this.current = { coverage, testId };
 		this.bars.setCoverageInfo(coverage);
 
 		if (!coverage) {
@@ -627,8 +589,8 @@ class CoverageToolbarWidget extends Disposable implements IOverlayWidget {
 
 	private setActions() {
 		this.actionBar.clear();
-		const coverage = this.current;
-		if (!coverage) {
+		const current = this.current;
+		if (!current) {
 			return;
 		}
 
@@ -649,21 +611,21 @@ class CoverageToolbarWidget extends Disposable implements IOverlayWidget {
 
 		this.actionBar.push(toggleAction);
 
-		if (coverage.isForTest) {
-			const testItem = coverage.fromResult.getTestById(coverage.isForTest.id.toString());
+		if (current.testId) {
+			const testItem = current.coverage.fromResult.getTestById(current.testId.toString());
 			assert(!!testItem, 'got coverage for an unreported test');
 			this.actionBar.push(new ActionWithIcon('perTestFilter',
 				coverUtils.labels.showingFilterFor(testItem.label),
 				testingFilterIcon,
 				undefined,
-				() => this.commandService.executeCommand(TestCommandId.CoverageFilterToTestInEditor, this.current),
+				() => this.commandService.executeCommand(TestCommandId.CoverageFilterToTestInEditor, this.current, this.editor),
 			));
-		} else if (coverage.perTestData?.size) {
+		} else if (current.coverage.perTestData?.size) {
 			this.actionBar.push(new ActionWithIcon('perTestFilter',
-				localize('testing.coverageForTestAvailable', "{0} test(s) ran code in this file", coverage.perTestData.size),
+				localize('testing.coverageForTestAvailable', "{0} test(s) ran code in this file", current.coverage.perTestData.size),
 				testingFilterIcon,
 				undefined,
-				() => this.commandService.executeCommand(TestCommandId.CoverageFilterToTestInEditor, this.current),
+				() => this.commandService.executeCommand(TestCommandId.CoverageFilterToTestInEditor, this.current, this.editor),
 			));
 		}
 
@@ -705,8 +667,8 @@ class CoverageToolbarWidget extends Disposable implements IOverlayWidget {
 		}));
 
 		ds.add(this.configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration(TestingConfigKeys.CoverageBarThresholds) || e.affectsConfiguration(TestingConfigKeys.CoveragePercent)) {
-				this.setCoverage(this.current);
+			if (this.current && (e.affectsConfiguration(TestingConfigKeys.CoverageBarThresholds) || e.affectsConfiguration(TestingConfigKeys.CoveragePercent))) {
+				this.setCoverage(this.current.coverage, this.current.testId);
 			}
 		}));
 	}
@@ -716,7 +678,7 @@ class CoverageToolbarWidget extends Disposable implements IOverlayWidget {
 		if (current) {
 			this.isRunning = true;
 			this.setActions();
-			this.testService.runResolvedTests(current.fromResult.request).finally(() => {
+			this.testService.runResolvedTests(current.coverage.fromResult.request).finally(() => {
 				this.isRunning = false;
 				this.setActions();
 			});
@@ -802,10 +764,10 @@ registerAction2(class FilterCoverageToTestInEditor extends Action2 {
 		});
 	}
 
-	run(accessor: ServicesAccessor, coverageOrUri?: FileCoverage | URI): void {
+	run(accessor: ServicesAccessor, coverageOrUri?: FileCoverage | URI, editor?: ICodeEditor): void {
 		const testCoverageService = accessor.get(ITestCoverageService);
 		const quickInputService = accessor.get(IQuickInputService);
-		const activeEditor = accessor.get(ICodeEditorService).getActiveCodeEditor();
+		const activeEditor = isCodeEditor(editor) ? editor : accessor.get(ICodeEditorService).getActiveCodeEditor();
 		let coverage: FileCoverage | undefined;
 		if (coverageOrUri instanceof FileCoverage) {
 			coverage = coverageOrUri;
@@ -816,26 +778,21 @@ registerAction2(class FilterCoverageToTestInEditor extends Action2 {
 			coverage = uri && testCoverageService.selected.get()?.getUri(uri);
 		}
 
-		if (!coverage || !(coverage.isForTest || coverage.perTestData?.size)) {
+		if (!coverage || !coverage.perTestData?.size) {
 			return;
 		}
 
-		const options = coverage?.perTestData ?? coverage?.isForTest?.parent.perTestData;
-		if (!options) {
-			return;
-		}
-
-		const tests = [...options.values()];
-		const commonPrefix = TestId.getLengthOfCommonPrefix(tests.length, i => tests[i].isForTest!.id);
+		const tests = [...coverage.perTestData].map(TestId.fromString);
+		const commonPrefix = TestId.getLengthOfCommonPrefix(tests.length, i => tests[i]);
 		const result = coverage.fromResult;
 		const previousSelection = testCoverageService.filterToTest.get();
 
-		type TItem = { label: string; description?: string; item: FileCoverage | undefined };
+		type TItem = { label: string; testId: TestId | undefined };
 
 		const items: QuickPickInput<TItem>[] = [
-			{ label: coverUtils.labels.allTests, item: undefined },
+			{ label: coverUtils.labels.allTests, testId: undefined },
 			{ type: 'separator' },
-			...tests.map(item => ({ label: coverUtils.getLabelForItem(result, item.isForTest!.id, commonPrefix), description: coverUtils.labels.percentCoverage(item.tpc), item })),
+			...tests.map(id => ({ label: coverUtils.getLabelForItem(result, id, commonPrefix), testId: id })),
 		];
 
 		// These handle the behavior that reveals the start of coverage when the
@@ -848,13 +805,13 @@ registerAction2(class FilterCoverageToTestInEditor extends Action2 {
 			activeItem: items.find((item): item is TItem => 'item' in item && item.item === coverage),
 			placeHolder: coverUtils.labels.pickShowCoverage,
 			onDidFocus: (entry) => {
-				if (!entry.item) {
+				if (!entry.testId) {
 					revealScrollCts.clear();
 					activeEditor?.setScrollTop(scrollTop);
 					testCoverageService.filterToTest.set(undefined, undefined);
 				} else {
 					const cts = revealScrollCts.value = new CancellationTokenSource();
-					entry.item.details(cts.token).then(
+					coverage.detailsForTest(entry.testId, cts.token).then(
 						details => {
 							const first = details.find(d => d.type === DetailType.Statement);
 							if (!cts.token.isCancellationRequested && first) {
@@ -863,7 +820,7 @@ registerAction2(class FilterCoverageToTestInEditor extends Action2 {
 						},
 						() => { /* ignored */ }
 					);
-					testCoverageService.filterToTest.set(entry.item.isForTest!.id, undefined);
+					testCoverageService.filterToTest.set(entry.testId, undefined);
 				}
 			},
 		}).then(selected => {
@@ -872,7 +829,7 @@ registerAction2(class FilterCoverageToTestInEditor extends Action2 {
 			}
 
 			revealScrollCts.dispose();
-			testCoverageService.filterToTest.set(selected ? selected.item?.isForTest!.id : previousSelection, undefined);
+			testCoverageService.filterToTest.set(selected ? selected.testId : previousSelection, undefined);
 		});
 	}
 });
diff --git a/src/vs/workbench/contrib/testing/browser/codeCoverageDisplayUtils.ts b/src/vs/workbench/contrib/testing/browser/codeCoverageDisplayUtils.ts
index d6a02334270..4750ce64a80 100644
--- a/src/vs/workbench/contrib/testing/browser/codeCoverageDisplayUtils.ts
+++ b/src/vs/workbench/contrib/testing/browser/codeCoverageDisplayUtils.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { assertNever } from 'vs/base/common/assert';
-import { clamp } from 'vs/base/common/numbers';
-import { localize } from 'vs/nls';
-import { chartsGreen, chartsRed, chartsYellow } from 'vs/platform/theme/common/colorRegistry';
-import { asCssVariableName } from 'vs/platform/theme/common/colorUtils';
-import { CoverageBarSource } from 'vs/workbench/contrib/testing/browser/testCoverageBars';
-import { ITestingCoverageBarThresholds, TestingDisplayedCoveragePercent } from 'vs/workbench/contrib/testing/common/configuration';
-import { getTotalCoveragePercent } from 'vs/workbench/contrib/testing/common/testCoverage';
-import { TestId } from 'vs/workbench/contrib/testing/common/testId';
-import { LiveTestResult } from 'vs/workbench/contrib/testing/common/testResult';
-import { ICoverageCount } from 'vs/workbench/contrib/testing/common/testTypes';
+import { assertNever } from '../../../../base/common/assert.js';
+import { clamp } from '../../../../base/common/numbers.js';
+import { localize } from '../../../../nls.js';
+import { chartsGreen, chartsRed, chartsYellow } from '../../../../platform/theme/common/colorRegistry.js';
+import { asCssVariableName } from '../../../../platform/theme/common/colorUtils.js';
+import { CoverageBarSource } from './testCoverageBars.js';
+import { ITestingCoverageBarThresholds, TestingDisplayedCoveragePercent } from '../common/configuration.js';
+import { getTotalCoveragePercent } from '../common/testCoverage.js';
+import { TestId } from '../common/testId.js';
+import { LiveTestResult } from '../common/testResult.js';
+import { ICoverageCount } from '../common/testTypes.js';
 
 export const percent = (cc: ICoverageCount) => clamp(cc.total === 0 ? 1 : cc.covered / cc.total, 0, 1);
 
diff --git a/src/vs/workbench/contrib/testing/browser/explorerProjections/index.ts b/src/vs/workbench/contrib/testing/browser/explorerProjections/index.ts
index 29f03a52d11..552bf1a2298 100644
--- a/src/vs/workbench/contrib/testing/browser/explorerProjections/index.ts
+++ b/src/vs/workbench/contrib/testing/browser/explorerProjections/index.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IIdentityProvider } from 'vs/base/browser/ui/list/list';
-import { ObjectTree } from 'vs/base/browser/ui/tree/objectTree';
-import { IObjectTreeElement, ObjectTreeElementCollapseState } from 'vs/base/browser/ui/tree/tree';
-import { Emitter, Event } from 'vs/base/common/event';
-import { FuzzyScore } from 'vs/base/common/filters';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { Iterable } from 'vs/base/common/iterator';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { MarshalledId } from 'vs/base/common/marshallingIds';
-import { ISerializedTestTreeCollapseState, isCollapsedInSerializedTestTree } from 'vs/workbench/contrib/testing/browser/explorerProjections/testingViewState';
-import { ITestItemContext, InternalTestItem, TestItemExpandState, TestResultState } from 'vs/workbench/contrib/testing/common/testTypes';
+import { IIdentityProvider } from '../../../../../base/browser/ui/list/list.js';
+import { ObjectTree } from '../../../../../base/browser/ui/tree/objectTree.js';
+import { IObjectTreeElement, ObjectTreeElementCollapseState } from '../../../../../base/browser/ui/tree/tree.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { FuzzyScore } from '../../../../../base/common/filters.js';
+import { IMarkdownString } from '../../../../../base/common/htmlContent.js';
+import { Iterable } from '../../../../../base/common/iterator.js';
+import { IDisposable } from '../../../../../base/common/lifecycle.js';
+import { MarshalledId } from '../../../../../base/common/marshallingIds.js';
+import { ISerializedTestTreeCollapseState, isCollapsedInSerializedTestTree } from './testingViewState.js';
+import { ITestItemContext, InternalTestItem, TestItemExpandState, TestResultState } from '../../common/testTypes.js';
 
 /**
  * Describes a rendering of tests in the explorer view. Different
diff --git a/src/vs/workbench/contrib/testing/browser/explorerProjections/listProjection.ts b/src/vs/workbench/contrib/testing/browser/explorerProjections/listProjection.ts
index 4b12fc5de75..468121c4c1d 100644
--- a/src/vs/workbench/contrib/testing/browser/explorerProjections/listProjection.ts
+++ b/src/vs/workbench/contrib/testing/browser/explorerProjections/listProjection.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ObjectTree } from 'vs/base/browser/ui/tree/objectTree';
-import { Emitter } from 'vs/base/common/event';
-import { FuzzyScore } from 'vs/base/common/filters';
-import { Iterable } from 'vs/base/common/iterator';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { flatTestItemDelimiter } from 'vs/workbench/contrib/testing/browser/explorerProjections/display';
-import { ITestTreeProjection, TestExplorerTreeElement, TestItemTreeElement, TestTreeErrorMessage, getChildrenForParent, testIdentityProvider } from 'vs/workbench/contrib/testing/browser/explorerProjections/index';
-import { ISerializedTestTreeCollapseState, isCollapsedInSerializedTestTree } from 'vs/workbench/contrib/testing/browser/explorerProjections/testingViewState';
-import { TestId } from 'vs/workbench/contrib/testing/common/testId';
-import { TestResultItemChangeReason } from 'vs/workbench/contrib/testing/common/testResult';
-import { ITestResultService } from 'vs/workbench/contrib/testing/common/testResultService';
-import { ITestService } from 'vs/workbench/contrib/testing/common/testService';
-import { ITestItemUpdate, InternalTestItem, TestDiffOpType, TestItemExpandState, TestResultState, TestsDiff, applyTestItemUpdate } from 'vs/workbench/contrib/testing/common/testTypes';
+import { ObjectTree } from '../../../../../base/browser/ui/tree/objectTree.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { FuzzyScore } from '../../../../../base/common/filters.js';
+import { Iterable } from '../../../../../base/common/iterator.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { flatTestItemDelimiter } from './display.js';
+import { ITestTreeProjection, TestExplorerTreeElement, TestItemTreeElement, TestTreeErrorMessage, getChildrenForParent, testIdentityProvider } from './index.js';
+import { ISerializedTestTreeCollapseState, isCollapsedInSerializedTestTree } from './testingViewState.js';
+import { TestId } from '../../common/testId.js';
+import { TestResultItemChangeReason } from '../../common/testResult.js';
+import { ITestResultService } from '../../common/testResultService.js';
+import { ITestService } from '../../common/testService.js';
+import { ITestItemUpdate, InternalTestItem, TestDiffOpType, TestItemExpandState, TestResultState, TestsDiff, applyTestItemUpdate } from '../../common/testTypes.js';
 
 /**
  * Test tree element element that groups be hierarchy.
diff --git a/src/vs/workbench/contrib/testing/browser/explorerProjections/testItemContextOverlay.ts b/src/vs/workbench/contrib/testing/browser/explorerProjections/testItemContextOverlay.ts
index 0a1af60895c..21e5b4fdbc6 100644
--- a/src/vs/workbench/contrib/testing/browser/explorerProjections/testItemContextOverlay.ts
+++ b/src/vs/workbench/contrib/testing/browser/explorerProjections/testItemContextOverlay.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { InternalTestItem } from 'vs/workbench/contrib/testing/common/testTypes';
-import { capabilityContextKeys } from 'vs/workbench/contrib/testing/common/testProfileService';
-import { TestId } from 'vs/workbench/contrib/testing/common/testId';
-import { TestingContextKeys } from 'vs/workbench/contrib/testing/common/testingContextKeys';
+import { InternalTestItem } from '../../common/testTypes.js';
+import { capabilityContextKeys } from '../../common/testProfileService.js';
+import { TestId } from '../../common/testId.js';
+import { TestingContextKeys } from '../../common/testingContextKeys.js';
 
 export const getTestItemContextOverlay = (test: InternalTestItem | undefined, capabilities: number): [string, unknown][] => {
 	if (!test) {
diff --git a/src/vs/workbench/contrib/testing/browser/explorerProjections/testingObjectTree.ts b/src/vs/workbench/contrib/testing/browser/explorerProjections/testingObjectTree.ts
index 4ec1e65a1b7..3df3a343288 100644
--- a/src/vs/workbench/contrib/testing/browser/explorerProjections/testingObjectTree.ts
+++ b/src/vs/workbench/contrib/testing/browser/explorerProjections/testingObjectTree.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ITreeNode } from 'vs/base/browser/ui/tree/tree';
-import { WorkbenchObjectTree } from 'vs/platform/list/browser/listService';
-import { TestExplorerTreeElement, TestItemTreeElement } from 'vs/workbench/contrib/testing/browser/explorerProjections/index';
-import { ISerializedTestTreeCollapseState } from 'vs/workbench/contrib/testing/browser/explorerProjections/testingViewState';
-import { TestId } from 'vs/workbench/contrib/testing/common/testId';
+import { ITreeNode } from '../../../../../base/browser/ui/tree/tree.js';
+import { WorkbenchObjectTree } from '../../../../../platform/list/browser/listService.js';
+import { TestExplorerTreeElement, TestItemTreeElement } from './index.js';
+import { ISerializedTestTreeCollapseState } from './testingViewState.js';
+import { TestId } from '../../common/testId.js';
 
 
 export class TestingObjectTree<TFilterData = void> extends WorkbenchObjectTree<TestExplorerTreeElement, TFilterData> {
diff --git a/src/vs/workbench/contrib/testing/browser/explorerProjections/testingViewState.ts b/src/vs/workbench/contrib/testing/browser/explorerProjections/testingViewState.ts
index b5dd30c19e5..203f310de6a 100644
--- a/src/vs/workbench/contrib/testing/browser/explorerProjections/testingViewState.ts
+++ b/src/vs/workbench/contrib/testing/browser/explorerProjections/testingViewState.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { TestId } from 'vs/workbench/contrib/testing/common/testId';
+import { TestId } from '../../common/testId.js';
 
 export interface ISerializedTestTreeCollapseState {
 	collapsed?: boolean;
diff --git a/src/vs/workbench/contrib/testing/browser/explorerProjections/treeProjection.ts b/src/vs/workbench/contrib/testing/browser/explorerProjections/treeProjection.ts
index 9e752e5f4ef..054bc7bf954 100644
--- a/src/vs/workbench/contrib/testing/browser/explorerProjections/treeProjection.ts
+++ b/src/vs/workbench/contrib/testing/browser/explorerProjections/treeProjection.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ObjectTree } from 'vs/base/browser/ui/tree/objectTree';
-import { Emitter } from 'vs/base/common/event';
-import { FuzzyScore } from 'vs/base/common/filters';
-import { Iterable } from 'vs/base/common/iterator';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ITestTreeProjection, TestExplorerTreeElement, TestItemTreeElement, TestTreeErrorMessage, getChildrenForParent, testIdentityProvider } from 'vs/workbench/contrib/testing/browser/explorerProjections/index';
-import { ISerializedTestTreeCollapseState, isCollapsedInSerializedTestTree } from 'vs/workbench/contrib/testing/browser/explorerProjections/testingViewState';
-import { IComputedStateAndDurationAccessor, refreshComputedState } from 'vs/workbench/contrib/testing/common/getComputedState';
-import { TestId } from 'vs/workbench/contrib/testing/common/testId';
-import { TestResultItemChangeReason } from 'vs/workbench/contrib/testing/common/testResult';
-import { ITestResultService } from 'vs/workbench/contrib/testing/common/testResultService';
-import { ITestService } from 'vs/workbench/contrib/testing/common/testService';
-import { ITestItemUpdate, InternalTestItem, TestDiffOpType, TestItemExpandState, TestResultState, TestsDiff, applyTestItemUpdate } from 'vs/workbench/contrib/testing/common/testTypes';
+import { ObjectTree } from '../../../../../base/browser/ui/tree/objectTree.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { FuzzyScore } from '../../../../../base/common/filters.js';
+import { Iterable } from '../../../../../base/common/iterator.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { ITestTreeProjection, TestExplorerTreeElement, TestItemTreeElement, TestTreeErrorMessage, getChildrenForParent, testIdentityProvider } from './index.js';
+import { ISerializedTestTreeCollapseState, isCollapsedInSerializedTestTree } from './testingViewState.js';
+import { IComputedStateAndDurationAccessor, refreshComputedState } from '../../common/getComputedState.js';
+import { TestId } from '../../common/testId.js';
+import { TestResultItemChangeReason } from '../../common/testResult.js';
+import { ITestResultService } from '../../common/testResultService.js';
+import { ITestService } from '../../common/testService.js';
+import { ITestItemUpdate, InternalTestItem, TestDiffOpType, TestItemExpandState, TestResultState, TestsDiff, applyTestItemUpdate } from '../../common/testTypes.js';
 
 const computedStateAccessor: IComputedStateAndDurationAccessor<TreeTestItemElement> = {
 	getOwnState: i => i instanceof TestItemTreeElement ? i.ownState : TestResultState.Unset,
diff --git a/src/vs/workbench/contrib/testing/browser/icons.ts b/src/vs/workbench/contrib/testing/browser/icons.ts
index 428ba987914..ecc3f3bebe3 100644
--- a/src/vs/workbench/contrib/testing/browser/icons.ts
+++ b/src/vs/workbench/contrib/testing/browser/icons.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from 'vs/base/common/codicons';
-import { localize } from 'vs/nls';
-import { registerIcon, spinningLoading } from 'vs/platform/theme/common/iconRegistry';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { testingColorRunAction, testStatesToIconColors, testStatesToRetiredIconColors } from 'vs/workbench/contrib/testing/browser/theme';
-import { TestResultState } from 'vs/workbench/contrib/testing/common/testTypes';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { localize } from '../../../../nls.js';
+import { registerIcon, spinningLoading } from '../../../../platform/theme/common/iconRegistry.js';
+import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { testingColorRunAction, testStatesToIconColors, testStatesToRetiredIconColors } from './theme.js';
+import { TestResultState } from '../common/testTypes.js';
 
 export const testingViewIcon = registerIcon('test-view-icon', Codicon.beaker, localize('testViewIcon', 'View icon of the test view.'));
 export const testingResultsIcon = registerIcon('test-results-icon', Codicon.checklist, localize('testingResultsIcon', 'Icons for test results.'));
@@ -71,8 +71,10 @@ registerThemingParticipant((theme, collector) => {
 	}
 
 	collector.addRule(`
-		.monaco-editor ${ThemeIcon.asCSSSelector(testingRunIcon)},
-		.monaco-editor ${ThemeIcon.asCSSSelector(testingRunAllIcon)} {
+		.monaco-editor .glyph-margin-widgets ${ThemeIcon.asCSSSelector(testingRunIcon)},
+		.monaco-editor .glyph-margin-widgets ${ThemeIcon.asCSSSelector(testingRunAllIcon)},
+		.monaco-editor .glyph-margin-widgets ${ThemeIcon.asCSSSelector(testingDebugIcon)},
+		.monaco-editor .glyph-margin-widgets ${ThemeIcon.asCSSSelector(testingDebugAllIcon)} {
 			color: ${theme.getColor(testingColorRunAction)};
 		}
 	`);
diff --git a/src/vs/workbench/contrib/testing/browser/media/testing.css b/src/vs/workbench/contrib/testing/browser/media/testing.css
index 5fa30f14ebd..1ff0bbcec78 100644
--- a/src/vs/workbench/contrib/testing/browser/media/testing.css
+++ b/src/vs/workbench/contrib/testing/browser/media/testing.css
@@ -252,7 +252,8 @@
 
 .test-output-peek-message-container .preview-text {
 	padding: 8px 12px 8px 20px;
-	height: calc(100% - 16px);
+	line-height: normal;
+	white-space: normal;
 }
 
 .test-output-peek-message-container .preview-text p:first-child {
@@ -268,15 +269,9 @@
 }
 
 .testing-followup-action {
-	position: absolute;
-	top: 100%;
-	left: 22px;
-	right: 22px;
-	margin-top: -25px;
 	line-height: 25px;
 	overflow: hidden;
 	pointer-events: none;
-	background: linear-gradient(transparent, var(--vscode-peekViewEditor-background) 50%);
 	display: flex;
 	align-items: center;
 	gap: 14px;
@@ -313,6 +308,10 @@
 	}
 }
 
+.test-output-call-stack {
+	height: 100%;
+}
+
 /** -- filter  */
 .monaco-action-bar.testing-filter-action-bar {
 	flex-shrink: 0;
@@ -400,11 +399,11 @@
 }
 
 .monaco-editor .testing-inline-message-severity-0 {
-	color: var(--vscode-testing-message-error-decorationForeground) !important;
+	background: var(--vscode-testing-message-error-lineBackground) !important;
 }
 
 .monaco-editor .testing-inline-message-severity-1 {
-	color: var(--vscode-testing-message-info-decorationForeground) !important;
+	background: var(--vscode-testing-message-info-lineBackground) !important;
 }
 
 /** -- coverage  */
diff --git a/src/vs/workbench/contrib/testing/browser/testCoverageBars.ts b/src/vs/workbench/contrib/testing/browser/testCoverageBars.ts
index 0c0111ec344..7718f2db145 100644
--- a/src/vs/workbench/contrib/testing/browser/testCoverageBars.ts
+++ b/src/vs/workbench/contrib/testing/browser/testCoverageBars.ts
@@ -3,25 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { h } from 'vs/base/browser/dom';
-import type { IManagedHover, IManagedHoverTooltipMarkdownString } from 'vs/base/browser/ui/hover/hover';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { Lazy } from 'vs/base/common/lazy';
-import { Disposable, DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { ITransaction, autorun, observableValue } from 'vs/base/common/observable';
-import { isDefined } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { ExplorerExtensions, IExplorerFileContribution, IExplorerFileContributionRegistry } from 'vs/workbench/contrib/files/browser/explorerFileContrib';
-import * as coverUtils from 'vs/workbench/contrib/testing/browser/codeCoverageDisplayUtils';
-import { calculateDisplayedStat } from 'vs/workbench/contrib/testing/browser/codeCoverageDisplayUtils';
-import { ITestingCoverageBarThresholds, TestingConfigKeys, getTestingConfiguration, observeTestingConfiguration } from 'vs/workbench/contrib/testing/common/configuration';
-import { AbstractFileCoverage } from 'vs/workbench/contrib/testing/common/testCoverage';
-import { ITestCoverageService } from 'vs/workbench/contrib/testing/common/testCoverageService';
+import { h } from '../../../../base/browser/dom.js';
+import type { IManagedHover, IManagedHoverTooltipMarkdownString } from '../../../../base/browser/ui/hover/hover.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { Lazy } from '../../../../base/common/lazy.js';
+import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { ITransaction, autorun, observableValue } from '../../../../base/common/observable.js';
+import { isDefined } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { localize } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { ExplorerExtensions, IExplorerFileContribution, IExplorerFileContributionRegistry } from '../../files/browser/explorerFileContrib.js';
+import * as coverUtils from './codeCoverageDisplayUtils.js';
+import { ITestingCoverageBarThresholds, TestingConfigKeys, getTestingConfiguration, observeTestingConfiguration } from '../common/configuration.js';
+import { AbstractFileCoverage } from '../common/testCoverage.js';
+import { ITestCoverageService } from '../common/testCoverageService.js';
 
 export interface TestCoverageBarsOptions {
 	/**
@@ -121,7 +120,7 @@ export class ManagedTestCoverageBars extends Disposable {
 
 		const precision = this.options.compact ? 0 : 2;
 		const thresholds = getTestingConfiguration(this.configurationService, TestingConfigKeys.CoverageBarThresholds);
-		const overallStat = calculateDisplayedStat(coverage, getTestingConfiguration(this.configurationService, TestingConfigKeys.CoveragePercent));
+		const overallStat = coverUtils.calculateDisplayedStat(coverage, getTestingConfiguration(this.configurationService, TestingConfigKeys.CoveragePercent));
 		if (this.options.overall !== false) {
 			el.overall.textContent = coverUtils.displayPercent(overallStat, precision);
 		} else {
diff --git a/src/vs/workbench/contrib/testing/browser/testCoverageView.ts b/src/vs/workbench/contrib/testing/browser/testCoverageView.ts
index 8e67eebd282..adfd5046e09 100644
--- a/src/vs/workbench/contrib/testing/browser/testCoverageView.ts
+++ b/src/vs/workbench/contrib/testing/browser/testCoverageView.ts
@@ -3,56 +3,56 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { IIdentityProvider, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { ICompressedTreeElement, ICompressedTreeNode } from 'vs/base/browser/ui/tree/compressedObjectTreeModel';
-import { ICompressibleTreeRenderer } from 'vs/base/browser/ui/tree/objectTree';
-import { ITreeNode, ITreeSorter } from 'vs/base/browser/ui/tree/tree';
-import { findLast } from 'vs/base/common/arraysFind';
-import { assertNever } from 'vs/base/common/assert';
-import { Codicon } from 'vs/base/common/codicons';
-import { memoize } from 'vs/base/common/decorators';
-import { FuzzyScore, createMatches } from 'vs/base/common/filters';
-import { Iterable } from 'vs/base/common/iterator';
-import { Disposable, DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
-import { IObservable, autorun, observableValue } from 'vs/base/common/observable';
-import { IPrefixTreeNode } from 'vs/base/common/prefixTree';
-import { basenameOrAuthority } from 'vs/base/common/resources';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { URI } from 'vs/base/common/uri';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { localize, localize2 } from 'vs/nls';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { EditorOpenSource, TextEditorSelectionRevealType } from 'vs/platform/editor/common/editor';
-import { FileKind } from 'vs/platform/files/common/files';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { WorkbenchCompressibleObjectTree } from 'vs/platform/list/browser/listService';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IQuickInputService, IQuickPickItem, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IResourceLabel, ResourceLabels } from 'vs/workbench/browser/labels';
-import { IViewPaneOptions, ViewAction, ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
-import { IViewDescriptorService } from 'vs/workbench/common/views';
-import * as coverUtils from 'vs/workbench/contrib/testing/browser/codeCoverageDisplayUtils';
-import { testingStatesToIcons, testingWasCovered } from 'vs/workbench/contrib/testing/browser/icons';
-import { CoverageBarSource, ManagedTestCoverageBars } from 'vs/workbench/contrib/testing/browser/testCoverageBars';
-import { TestCommandId, Testing } from 'vs/workbench/contrib/testing/common/constants';
-import { onObservableChange } from 'vs/workbench/contrib/testing/common/observableUtils';
-import { BypassedFileCoverage, ComputedFileCoverage, FileCoverage, TestCoverage, getTotalCoveragePercent } from 'vs/workbench/contrib/testing/common/testCoverage';
-import { ITestCoverageService } from 'vs/workbench/contrib/testing/common/testCoverageService';
-import { TestId } from 'vs/workbench/contrib/testing/common/testId';
-import { TestingContextKeys } from 'vs/workbench/contrib/testing/common/testingContextKeys';
-import { CoverageDetails, DetailType, ICoverageCount, IDeclarationCoverage, TestResultState } from 'vs/workbench/contrib/testing/common/testTypes';
-import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
+import * as dom from '../../../../base/browser/dom.js';
+import { IIdentityProvider, IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
+import { ICompressedTreeElement, ICompressedTreeNode } from '../../../../base/browser/ui/tree/compressedObjectTreeModel.js';
+import { ICompressibleTreeRenderer } from '../../../../base/browser/ui/tree/objectTree.js';
+import { ITreeNode, ITreeSorter } from '../../../../base/browser/ui/tree/tree.js';
+import { findLast } from '../../../../base/common/arraysFind.js';
+import { assertNever } from '../../../../base/common/assert.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { memoize } from '../../../../base/common/decorators.js';
+import { FuzzyScore, createMatches } from '../../../../base/common/filters.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { Disposable, DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { IObservable, autorun, observableValue } from '../../../../base/common/observable.js';
+import { IPrefixTreeNode } from '../../../../base/common/prefixTree.js';
+import { basenameOrAuthority } from '../../../../base/common/resources.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { EditorOpenSource, TextEditorSelectionRevealType } from '../../../../platform/editor/common/editor.js';
+import { FileKind } from '../../../../platform/files/common/files.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { WorkbenchCompressibleObjectTree } from '../../../../platform/list/browser/listService.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IQuickInputService, IQuickPickItem, QuickPickInput } from '../../../../platform/quickinput/common/quickInput.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IResourceLabel, ResourceLabels } from '../../../browser/labels.js';
+import { IViewPaneOptions, ViewAction, ViewPane } from '../../../browser/parts/views/viewPane.js';
+import { IViewDescriptorService } from '../../../common/views.js';
+import * as coverUtils from './codeCoverageDisplayUtils.js';
+import { testingStatesToIcons, testingWasCovered } from './icons.js';
+import { CoverageBarSource, ManagedTestCoverageBars } from './testCoverageBars.js';
+import { TestCommandId, Testing } from '../common/constants.js';
+import { onObservableChange } from '../common/observableUtils.js';
+import { BypassedFileCoverage, ComputedFileCoverage, FileCoverage, TestCoverage, getTotalCoveragePercent } from '../common/testCoverage.js';
+import { ITestCoverageService } from '../common/testCoverageService.js';
+import { TestId } from '../common/testId.js';
+import { TestingContextKeys } from '../common/testingContextKeys.js';
+import { CoverageDetails, DetailType, ICoverageCount, IDeclarationCoverage, TestResultState } from '../common/testTypes.js';
+import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } from '../../../services/editor/common/editorService.js';
 
 const enum CoverageSortOrder {
 	Coverage,
@@ -643,7 +643,7 @@ registerAction2(class TestCoverageChangePerTestFilterAction extends Action2 {
 			return;
 		}
 
-		const tests = [...coverage.perTestCoverageIDs].map(TestId.fromString);
+		const tests = [...coverage.allPerTestIDs()].map(TestId.fromString);
 		const commonPrefix = TestId.getLengthOfCommonPrefix(tests.length, i => tests[i]);
 		const result = coverage.result;
 		const previousSelection = coverageService.filterToTest.get();
@@ -698,13 +698,13 @@ registerAction2(class TestCoverageChangeSortingAction extends ViewAction<TestCov
 		quickInput.placeholder = localize('testing.coverageSortPlaceholder', 'Sort the Test Coverage view...');
 		quickInput.items = items;
 		quickInput.show();
-		quickInput.onDidHide(() => quickInput.dispose());
-		quickInput.onDidAccept(() => {
+		disposables.add(quickInput.onDidHide(() => disposables.dispose()));
+		disposables.add(quickInput.onDidAccept(() => {
 			const picked = quickInput.selectedItems[0]?.value;
 			if (picked !== undefined) {
 				view.sortOrder.set(picked, undefined);
 				quickInput.dispose();
 			}
-		});
+		}));
 	}
 });
diff --git a/src/vs/workbench/contrib/testing/browser/testExplorerActions.ts b/src/vs/workbench/contrib/testing/browser/testExplorerActions.ts
index 37cb8843ff5..5557570e892 100644
--- a/src/vs/workbench/contrib/testing/browser/testExplorerActions.ts
+++ b/src/vs/workbench/contrib/testing/browser/testExplorerActions.ts
@@ -3,55 +3,61 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { distinct } from 'vs/base/common/arrays';
-import { Codicon } from 'vs/base/common/codicons';
-import { Iterable } from 'vs/base/common/iterator';
-import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { isDefined } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { MessageController } from 'vs/editor/contrib/message/browser/messageController';
-import { localize, localize2 } from 'vs/nls';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { Action2, IAction2Options, MenuId } from 'vs/platform/actions/common/actions';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr, ContextKeyExpression, ContextKeyGreaterExpr } from 'vs/platform/contextkey/common/contextkey';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
-import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
-import { widgetClose } from 'vs/platform/theme/common/iconRegistry';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { ViewAction } from 'vs/workbench/browser/parts/views/viewPane';
-import { FocusedViewContext } from 'vs/workbench/common/contextkeys';
-import { ViewContainerLocation } from 'vs/workbench/common/views';
-import { VIEWLET_ID as EXTENSIONS_VIEWLET_ID, IExtensionsViewPaneContainer } from 'vs/workbench/contrib/extensions/common/extensions';
-import { TestExplorerTreeElement, TestItemTreeElement } from 'vs/workbench/contrib/testing/browser/explorerProjections/index';
-import * as icons from 'vs/workbench/contrib/testing/browser/icons';
-import { TestingExplorerView } from 'vs/workbench/contrib/testing/browser/testingExplorerView';
-import { TestResultsView } from 'vs/workbench/contrib/testing/browser/testingOutputPeek';
-import { TestingConfigKeys, getTestingConfiguration } from 'vs/workbench/contrib/testing/common/configuration';
-import { TestCommandId, TestExplorerViewMode, TestExplorerViewSorting, Testing, testConfigurationGroupNames } from 'vs/workbench/contrib/testing/common/constants';
-import { ITestCoverageService } from 'vs/workbench/contrib/testing/common/testCoverageService';
-import { TestId } from 'vs/workbench/contrib/testing/common/testId';
-import { ITestProfileService, canUseProfileWithTest } from 'vs/workbench/contrib/testing/common/testProfileService';
-import { ITestResult } from 'vs/workbench/contrib/testing/common/testResult';
-import { ITestResultService } from 'vs/workbench/contrib/testing/common/testResultService';
-import { IMainThreadTestCollection, IMainThreadTestController, ITestService, expandAndGetTestById, testsInFile, testsUnderUri } from 'vs/workbench/contrib/testing/common/testService';
-import { ExtTestRunProfileKind, ITestRunProfile, InternalTestItem, TestItemExpandState, TestRunProfileBitset } from 'vs/workbench/contrib/testing/common/testTypes';
-import { TestingContextKeys } from 'vs/workbench/contrib/testing/common/testingContextKeys';
-import { ITestingContinuousRunService } from 'vs/workbench/contrib/testing/common/testingContinuousRunService';
-import { ITestingPeekOpener } from 'vs/workbench/contrib/testing/common/testingPeekOpener';
-import { isFailedState } from 'vs/workbench/contrib/testing/common/testingStates';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
+import { distinct } from '../../../../base/common/arrays.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { KeyChord, KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { isDefined } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IActiveCodeEditor, ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { EmbeddedCodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/embeddedCodeEditorWidget.js';
+import { EditorOption, GoToLocationValues } from '../../../../editor/common/config/editorOptions.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { SymbolNavigationAction } from '../../../../editor/contrib/gotoSymbol/browser/goToCommands.js';
+import { ReferencesModel } from '../../../../editor/contrib/gotoSymbol/browser/referencesModel.js';
+import { MessageController } from '../../../../editor/contrib/message/browser/messageController.js';
+import { PeekContext } from '../../../../editor/contrib/peekView/browser/peekView.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { Action2, IAction2Options, MenuId } from '../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr, ContextKeyExpression, ContextKeyGreaterExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { IProgressService, ProgressLocation } from '../../../../platform/progress/common/progress.js';
+import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from '../../../../platform/quickinput/common/quickInput.js';
+import { widgetClose } from '../../../../platform/theme/common/iconRegistry.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { ViewAction } from '../../../browser/parts/views/viewPane.js';
+import { FocusedViewContext } from '../../../common/contextkeys.js';
+import { IExtensionsWorkbenchService } from '../../extensions/common/extensions.js';
+import { TestExplorerTreeElement, TestItemTreeElement } from './explorerProjections/index.js';
+import * as icons from './icons.js';
+import { TestingExplorerView } from './testingExplorerView.js';
+import { TestResultsView } from './testingOutputPeek.js';
+import { TestingConfigKeys, getTestingConfiguration } from '../common/configuration.js';
+import { TestCommandId, TestExplorerViewMode, TestExplorerViewSorting, Testing, testConfigurationGroupNames } from '../common/constants.js';
+import { ITestCoverageService } from '../common/testCoverageService.js';
+import { TestId } from '../common/testId.js';
+import { ITestProfileService, canUseProfileWithTest } from '../common/testProfileService.js';
+import { ITestResult } from '../common/testResult.js';
+import { ITestResultService } from '../common/testResultService.js';
+import { IMainThreadTestCollection, IMainThreadTestController, ITestService, expandAndGetTestById, testsInFile, testsUnderUri } from '../common/testService.js';
+import { ExtTestRunProfileKind, ITestRunProfile, InternalTestItem, TestItemExpandState, TestRunProfileBitset } from '../common/testTypes.js';
+import { TestingContextKeys } from '../common/testingContextKeys.js';
+import { ITestingContinuousRunService } from '../common/testingContinuousRunService.js';
+import { ITestingPeekOpener } from '../common/testingPeekOpener.js';
+import { isFailedState } from '../common/testingStates.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
 
 const category = Categories.Test;
 
@@ -420,8 +426,8 @@ function selectContinuousRunProfiles(
 		for (const profile of profiles) {
 			if (profile.supportsContinuousRun) {
 				items.push({
-					label: profile.label || controller?.label.value || '',
-					description: controller?.label.value,
+					label: profile.label || controller?.label.get() || '',
+					description: controller?.label.get(),
 					profile,
 				});
 			}
@@ -458,22 +464,23 @@ function selectContinuousRunProfiles(
 		}
 	}
 
-	const quickpick = quickInputService.createQuickPick<IQuickPickItem & { profile: ITestRunProfile }>();
+	const disposables = new DisposableStore();
+	const quickpick = disposables.add(quickInputService.createQuickPick<IQuickPickItem & { profile: ITestRunProfile }>({ useSeparators: true }));
 	quickpick.title = localize('testing.selectContinuousProfiles', 'Select profiles to run when files change:');
 	quickpick.canSelectMany = true;
 	quickpick.items = qpItems;
 	quickpick.selectedItems = selectedItems;
 	quickpick.show();
-	return new Promise((resolve, reject) => {
-		quickpick.onDidAccept(() => {
+	return new Promise(resolve => {
+		disposables.add(quickpick.onDidAccept(() => {
 			resolve(quickpick.selectedItems.map(i => i.profile));
-			quickpick.dispose();
-		});
+			disposables.dispose();
+		}));
 
-		quickpick.onDidHide(() => {
+		disposables.add(quickpick.onDidHide(() => {
 			resolve([]);
-			quickpick.dispose();
-		});
+			disposables.dispose();
+		}));
 	});
 }
 
@@ -700,7 +707,7 @@ export class CancelTestRunAction extends Action2 {
 				weight: KeybindingWeight.WorkbenchContrib,
 				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.Semicolon, KeyMod.CtrlCmd | KeyCode.KeyX),
 			},
-			menu: {
+			menu: [{
 				id: MenuId.ViewTitle,
 				order: ActionOrder.Run,
 				group: 'navigation',
@@ -708,19 +715,23 @@ export class CancelTestRunAction extends Action2 {
 					ContextKeyExpr.equals('view', Testing.ExplorerViewId),
 					ContextKeyExpr.equals(TestingContextKeys.isRunning.serialize(), true),
 				)
-			}
+			}]
 		});
 	}
 
 	/**
 	 * @override
 	 */
-	public async run(accessor: ServicesAccessor) {
+	public async run(accessor: ServicesAccessor, resultId?: string, taskId?: string) {
 		const resultService = accessor.get(ITestResultService);
 		const testService = accessor.get(ITestService);
-		for (const run of resultService.results) {
-			if (!run.completedAt) {
-				testService.cancelTestRun(run.id);
+		if (resultId) {
+			testService.cancelTestRun(resultId, taskId);
+		} else {
+			for (const run of resultService.results) {
+				if (!run.completedAt) {
+					testService.cancelTestRun(run.id);
+				}
 			}
 		}
 	}
@@ -963,6 +974,59 @@ export class GoToTest extends Action2 {
 	}
 }
 
+async function getTestsAtCursor(testService: ITestService, uriIdentityService: IUriIdentityService, uri: URI, position: Position, filter?: (test: InternalTestItem) => boolean) {
+	// testsInFile will descend in the test tree. We assume that as we go
+	// deeper, ranges get more specific. We'll want to run all tests whose
+	// range is equal to the most specific range we find (see #133519)
+	//
+	// If we don't find any test whose range contains the position, we pick
+	// the closest one before the position. Again, if we find several tests
+	// whose range is equal to the closest one, we run them all.
+
+	let bestNodes: InternalTestItem[] = [];
+	let bestRange: Range | undefined;
+
+	let bestNodesBefore: InternalTestItem[] = [];
+	let bestRangeBefore: Range | undefined;
+
+	for await (const test of testsInFile(testService, uriIdentityService, uri)) {
+		if (!test.item.range || filter?.(test) === false) {
+			continue;
+		}
+
+		const irange = Range.lift(test.item.range);
+		if (irange.containsPosition(position)) {
+			if (bestRange && Range.equalsRange(test.item.range, bestRange)) {
+				// check that a parent isn't already included (#180760)
+				if (!bestNodes.some(b => TestId.isChild(b.item.extId, test.item.extId))) {
+					bestNodes.push(test);
+				}
+			} else {
+				bestRange = irange;
+				bestNodes = [test];
+			}
+		} else if (Position.isBefore(irange.getStartPosition(), position)) {
+			if (!bestRangeBefore || bestRangeBefore.getStartPosition().isBefore(irange.getStartPosition())) {
+				bestRangeBefore = irange;
+				bestNodesBefore = [test];
+			} else if (irange.equalsRange(bestRangeBefore) && !bestNodesBefore.some(b => TestId.isChild(b.item.extId, test.item.extId))) {
+				bestNodesBefore.push(test);
+			}
+		}
+	}
+
+	return bestNodes.length ? bestNodes : bestNodesBefore;
+}
+
+const enum EditorContextOrder {
+	RunAtCursor,
+	DebugAtCursor,
+	RunInFile,
+	DebugInFile,
+	GoToRelated,
+	PeekRelated,
+}
+
 abstract class ExecuteTestAtCursor extends Action2 {
 	constructor(options: IAction2Options, protected readonly group: TestRunProfileBitset) {
 		super({
@@ -973,7 +1037,7 @@ abstract class ExecuteTestAtCursor extends Action2 {
 			}, {
 				id: MenuId.EditorContext,
 				group: 'testing',
-				order: group === TestRunProfileBitset.Run ? ActionOrder.Run : ActionOrder.Debug,
+				order: group === TestRunProfileBitset.Run ? EditorContextOrder.RunAtCursor : EditorContextOrder.DebugAtCursor,
 				when: ContextKeyExpr.and(TestingContextKeys.activeEditorHasTests, TestingContextKeys.capabilityToContextKey[group]),
 			}]
 		});
@@ -1007,18 +1071,13 @@ abstract class ExecuteTestAtCursor extends Action2 {
 		const progressService = accessor.get(IProgressService);
 		const configurationService = accessor.get(IConfigurationService);
 
-		let bestNodes: InternalTestItem[] = [];
-		let bestRange: Range | undefined;
-
-		let bestNodesBefore: InternalTestItem[] = [];
-		let bestRangeBefore: Range | undefined;
-
 		const saveBeforeTest = getTestingConfiguration(configurationService, TestingConfigKeys.SaveBeforeTest);
 		if (saveBeforeTest) {
 			await editorService.save({ editor: activeEditorPane.input, groupId: activeEditorPane.group.id });
 			await testService.syncTests();
 		}
 
+
 		// testsInFile will descend in the test tree. We assume that as we go
 		// deeper, ranges get more specific. We'll want to run all tests whose
 		// range is equal to the most specific range we find (see #133519)
@@ -1026,41 +1085,28 @@ abstract class ExecuteTestAtCursor extends Action2 {
 		// If we don't find any test whose range contains the position, we pick
 		// the closest one before the position. Again, if we find several tests
 		// whose range is equal to the closest one, we run them all.
-		await showDiscoveringWhile(progressService, (async () => {
-			for await (const test of testsInFile(testService, uriIdentityService, model.uri)) {
-				if (!test.item.range || !(profileService.capabilitiesForTest(test) & this.group)) {
-					continue;
-				}
+		const testsToRun = await showDiscoveringWhile(progressService,
+			getTestsAtCursor(
+				testService,
+				uriIdentityService,
+				model.uri,
+				position,
+				test => !!(profileService.capabilitiesForTest(test.item) & this.group)
+			)
+		);
 
-				const irange = Range.lift(test.item.range);
-				if (irange.containsPosition(position)) {
-					if (bestRange && Range.equalsRange(test.item.range, bestRange)) {
-						// check that a parent isn't already included (#180760)
-						if (!bestNodes.some(b => TestId.isChild(b.item.extId, test.item.extId))) {
-							bestNodes.push(test);
-						}
-					} else {
-						bestRange = irange;
-						bestNodes = [test];
-					}
-				} else if (Position.isBefore(irange.getStartPosition(), position)) {
-					if (!bestRangeBefore || bestRangeBefore.getStartPosition().isBefore(irange.getStartPosition())) {
-						bestRangeBefore = irange;
-						bestNodesBefore = [test];
-					} else if (irange.equalsRange(bestRangeBefore) && !bestNodesBefore.some(b => TestId.isChild(b.item.extId, test.item.extId))) {
-						bestNodesBefore.push(test);
-					}
-				}
-			}
-		})());
-
-		const testsToRun = bestNodes.length ? bestNodes : bestNodesBefore;
 		if (testsToRun.length) {
-			await testService.runTests({
-				group: this.group,
-				tests: bestNodes.length ? bestNodes : bestNodesBefore,
-			});
-		} else if (editor) {
+			await testService.runTests({ group: this.group, tests: testsToRun });
+			return;
+		}
+
+		const relatedTests = await testService.getTestsRelatedToCode(model.uri, position);
+		if (relatedTests.length) {
+			await testService.runTests({ group: this.group, tests: relatedTests });
+			return;
+		}
+
+		if (editor) {
 			MessageController.get(editor)?.showMessage(localize('noTestsAtCursor', "No tests found here"), position);
 		}
 	}
@@ -1182,8 +1228,7 @@ abstract class ExecuteTestsInCurrentFile extends Action2 {
 			}, {
 				id: MenuId.EditorContext,
 				group: 'testing',
-				// add 0.1 to be after the "at cursor" commands
-				order: (group === TestRunProfileBitset.Run ? ActionOrder.Run : ActionOrder.Debug) + 0.1,
+				order: group === TestRunProfileBitset.Run ? EditorContextOrder.RunInFile : EditorContextOrder.DebugInFile,
 				when: ContextKeyExpr.and(TestingContextKeys.activeEditorHasTests, TestingContextKeys.capabilityToContextKey[group]),
 			}],
 		});
@@ -1509,10 +1554,7 @@ export class SearchForTestExtension extends Action2 {
 	}
 
 	public async run(accessor: ServicesAccessor) {
-		const paneCompositeService = accessor.get(IPaneCompositePartService);
-		const viewlet = (await paneCompositeService.openPaneComposite(EXTENSIONS_VIEWLET_ID, ViewContainerLocation.Sidebar, true))?.getViewPaneContainer() as IExtensionsViewPaneContainer;
-		viewlet.search('@category:"testing"');
-		viewlet.focus();
+		accessor.get(IExtensionsWorkbenchService).openSearch('@category:"testing"');
 	}
 }
 
@@ -1684,11 +1726,152 @@ export class OpenCoverage extends Action2 {
 	}
 }
 
+abstract class TestNavigationAction extends SymbolNavigationAction {
+	protected testService!: ITestService; // little hack...
+	protected uriIdentityService!: IUriIdentityService;
+
+	override runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor, ...args: any[]) {
+		this.testService = accessor.get(ITestService);
+		this.uriIdentityService = accessor.get(IUriIdentityService);
+		return super.runEditorCommand(accessor, editor, ...args);
+	}
+
+	protected override _getAlternativeCommand(editor: IActiveCodeEditor): string {
+		return editor.getOption(EditorOption.gotoLocation).alternativeTestsCommand;
+	}
+	protected override _getGoToPreference(editor: IActiveCodeEditor): GoToLocationValues {
+		return editor.getOption(EditorOption.gotoLocation).multipleTests || 'peek';
+	}
+}
+
+abstract class GoToRelatedTestAction extends TestNavigationAction {
+	protected override async _getLocationModel(_languageFeaturesService: unknown, model: ITextModel, position: Position, token: CancellationToken): Promise<ReferencesModel | undefined> {
+		const tests = await this.testService.getTestsRelatedToCode(model.uri, position, token);
+		return new ReferencesModel(
+			tests.map(t => t.item.uri && ({ uri: t.item.uri, range: t.item.range || new Range(1, 1, 1, 1) })).filter(isDefined),
+			localize('relatedTests', 'Related Tests'),
+		);
+	}
+
+	protected override _getNoResultFoundMessage(): string {
+		return localize('noTestFound', 'No related tests found.');
+	}
+}
+
+class GoToRelatedTest extends GoToRelatedTestAction {
+	constructor() {
+		super({
+			openToSide: false,
+			openInPeek: false,
+			muteMessage: false
+		}, {
+			id: TestCommandId.GoToRelatedTest,
+			title: localize2('testing.goToRelatedTest', 'Go to Related Test'),
+			category,
+			precondition: ContextKeyExpr.and(
+				// todo@connor4312: make this more explicit based on cursor position
+				ContextKeyExpr.not(TestingContextKeys.activeEditorHasTests.key), TestingContextKeys.canGoToRelatedTest,
+			),
+			menu: [{
+				id: MenuId.EditorContext,
+				group: 'testing',
+				order: EditorContextOrder.GoToRelated,
+			}]
+		});
+	}
+}
+
+class PeekRelatedTest extends GoToRelatedTestAction {
+	constructor() {
+		super({
+			openToSide: false,
+			openInPeek: true,
+			muteMessage: false
+		}, {
+			id: TestCommandId.PeekRelatedTest,
+			title: localize2('testing.peekToRelatedTest', 'Peek Related Test'),
+			category,
+			precondition: ContextKeyExpr.and(
+				TestingContextKeys.canGoToRelatedTest,
+				// todo@connor4312: make this more explicit based on cursor position
+				ContextKeyExpr.not(TestingContextKeys.activeEditorHasTests.key),
+				PeekContext.notInPeekEditor,
+				EditorContextKeys.isInEmbeddedEditor.toNegated()
+			),
+			menu: [{
+				id: MenuId.EditorContext,
+				group: 'testing',
+				order: EditorContextOrder.PeekRelated,
+			}]
+		});
+	}
+}
+
+abstract class GoToRelatedCodeAction extends TestNavigationAction {
+	protected override async _getLocationModel(_languageFeaturesService: unknown, model: ITextModel, position: Position, token: CancellationToken): Promise<ReferencesModel | undefined> {
+		const testsAtCursor = await getTestsAtCursor(this.testService, this.uriIdentityService, model.uri, position);
+		const code = await Promise.all(testsAtCursor.map(t => this.testService.getCodeRelatedToTest(t)));
+		return new ReferencesModel(code.flat(), localize('relatedCode', 'Related Code'));
+	}
+
+	protected override _getNoResultFoundMessage(): string {
+		return localize('noRelatedCode', 'No related code found.');
+	}
+}
+
+class GoToRelatedCode extends GoToRelatedCodeAction {
+	constructor() {
+		super({
+			openToSide: false,
+			openInPeek: false,
+			muteMessage: false
+		}, {
+			id: TestCommandId.GoToRelatedCode,
+			title: localize2('testing.goToRelatedCode', 'Go to Related Code'),
+			category,
+			precondition: ContextKeyExpr.and(
+				TestingContextKeys.activeEditorHasTests,
+				TestingContextKeys.canGoToRelatedCode,
+			),
+			menu: [{
+				id: MenuId.EditorContext,
+				group: 'testing',
+				order: EditorContextOrder.GoToRelated,
+			}]
+		});
+	}
+}
+
+class PeekRelatedCode extends GoToRelatedCodeAction {
+	constructor() {
+		super({
+			openToSide: false,
+			openInPeek: true,
+			muteMessage: false
+		}, {
+			id: TestCommandId.PeekRelatedCode,
+			title: localize2('testing.peekToRelatedCode', 'Peek Related Code'),
+			category,
+			precondition: ContextKeyExpr.and(
+				TestingContextKeys.activeEditorHasTests,
+				TestingContextKeys.canGoToRelatedCode,
+				PeekContext.notInPeekEditor,
+				EditorContextKeys.isInEmbeddedEditor.toNegated()
+			),
+			menu: [{
+				id: MenuId.EditorContext,
+				group: 'testing',
+				order: EditorContextOrder.PeekRelated,
+			}]
+		});
+	}
+}
+
 export const allTestActions = [
 	CancelTestRefreshAction,
 	CancelTestRunAction,
-	ClearTestResultsAction,
 	CleareCoverage,
+	ClearTestResultsAction,
 	CollapseAllAction,
 	ConfigureTestProfilesAction,
 	ContinuousRunTestAction,
@@ -1710,10 +1893,14 @@ export const allTestActions = [
 	DebugTestsUnderUri,
 	GetExplorerSelection,
 	GetSelectedProfiles,
+	GoToRelatedCode,
+	GoToRelatedTest,
 	GoToTest,
 	HideTestAction,
 	OpenCoverage,
 	OpenOutputPeek,
+	PeekRelatedCode,
+	PeekRelatedTest,
 	RefreshTestsAction,
 	ReRunFailedTests,
 	ReRunLastRun,
diff --git a/src/vs/workbench/contrib/testing/browser/testMessageColorizer.ts b/src/vs/workbench/contrib/testing/browser/testMessageColorizer.ts
index 527d6e5cc32..f722e7805e1 100644
--- a/src/vs/workbench/contrib/testing/browser/testMessageColorizer.ts
+++ b/src/vs/workbench/contrib/testing/browser/testMessageColorizer.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { renderStringAsPlaintext } from 'vs/base/browser/markdownRenderer';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { GraphemeIterator, forAnsiStringParts, removeAnsiEscapeCodes } from 'vs/base/common/strings';
-import 'vs/css!./media/testMessageColorizer';
-import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
+import { renderStringAsPlaintext } from '../../../../base/browser/markdownRenderer.js';
+import { IMarkdownString } from '../../../../base/common/htmlContent.js';
+import { IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { GraphemeIterator, forAnsiStringParts, removeAnsiEscapeCodes } from '../../../../base/common/strings.js';
+import './media/testMessageColorizer.css';
+import { CodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { Range } from '../../../../editor/common/core/range.js';
 
 const colorAttrRe = /^\x1b\[([0-9]+)m$/;
 
diff --git a/src/vs/workbench/contrib/testing/browser/testResultsView/testMessageStack.ts b/src/vs/workbench/contrib/testing/browser/testResultsView/testMessageStack.ts
new file mode 100644
index 00000000000..186df2da453
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/browser/testResultsView/testMessageStack.ts
@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Emitter } from '../../../../../base/common/event.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { ICodeEditor } from '../../../../../editor/browser/editorBrowser.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { AnyStackFrame, CallStackFrame, CallStackWidget } from '../../../debug/browser/callStackWidget.js';
+import { ITestMessageStackFrame } from '../../common/testTypes.js';
+
+export class TestResultStackWidget extends Disposable {
+	private readonly widget: CallStackWidget;
+	private readonly changeStackFrameEmitter = this._register(new Emitter<ITestMessageStackFrame>());
+
+	public readonly onDidChangeStackFrame = this.changeStackFrameEmitter.event;
+
+	constructor(
+		private readonly container: HTMLElement,
+		containingEditor: ICodeEditor | undefined,
+		@IInstantiationService instantiationService: IInstantiationService,
+	) {
+		super();
+
+		this.widget = this._register(instantiationService.createInstance(
+			CallStackWidget,
+			container,
+			containingEditor,
+		));
+	}
+
+	public collapseAll() {
+		this.widget.collapseAll();
+	}
+
+	public update(messageFrame: AnyStackFrame, stack: ITestMessageStackFrame[]) {
+		this.widget.setFrames([messageFrame, ...stack.map(frame => new CallStackFrame(
+			frame.label,
+			frame.uri,
+			frame.position?.lineNumber,
+			frame.position?.column,
+		))]);
+	}
+
+	public layout(height?: number, width?: number) {
+		this.widget.layout(height ?? this.container.clientHeight, width);
+	}
+}
diff --git a/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsOutput.ts b/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsOutput.ts
new file mode 100644
index 00000000000..11350dd2893
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsOutput.ts
@@ -0,0 +1,572 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from '../../../../../base/browser/dom.js';
+import { Delayer } from '../../../../../base/common/async.js';
+import { VSBuffer } from '../../../../../base/common/buffer.js';
+import { Event } from '../../../../../base/common/event.js';
+import { Iterable } from '../../../../../base/common/iterator.js';
+import { Lazy } from '../../../../../base/common/lazy.js';
+import { Disposable, IDisposable, IReference, MutableDisposable, combinedDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ICodeEditor, IDiffEditorConstructionOptions } from '../../../../../editor/browser/editorBrowser.js';
+import { CodeEditorWidget } from '../../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { EmbeddedCodeEditorWidget } from '../../../../../editor/browser/widget/codeEditor/embeddedCodeEditorWidget.js';
+import { DiffEditorWidget } from '../../../../../editor/browser/widget/diffEditor/diffEditorWidget.js';
+import { EmbeddedDiffEditorWidget } from '../../../../../editor/browser/widget/diffEditor/embeddedDiffEditorWidget.js';
+import { MarkdownRenderer } from '../../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import { IDiffEditorOptions, IEditorOptions } from '../../../../../editor/common/config/editorOptions.js';
+import { IResolvedTextEditorModel, ITextModelService } from '../../../../../editor/common/services/resolverService.js';
+import { peekViewResultsBackground } from '../../../../../editor/contrib/peekView/browser/peekView.js';
+import { localize } from '../../../../../nls.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { TerminalCapability } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
+import { TerminalCapabilityStore } from '../../../../../platform/terminal/common/capabilities/terminalCapabilityStore.js';
+import { formatMessageForTerminal } from '../../../../../platform/terminal/common/terminalStrings.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { EditorModel } from '../../../../common/editor/editorModel.js';
+import { PANEL_BACKGROUND, SIDE_BAR_BACKGROUND } from '../../../../common/theme.js';
+import { IViewDescriptorService, ViewContainerLocation } from '../../../../common/views.js';
+import { DetachedProcessInfo } from '../../../terminal/browser/detachedTerminal.js';
+import { IDetachedTerminalInstance, ITerminalService } from '../../../terminal/browser/terminal.js';
+import { getXtermScaledDimensions } from '../../../terminal/browser/xterm/xtermTerminal.js';
+import { TERMINAL_BACKGROUND_COLOR } from '../../../terminal/common/terminalColorRegistry.js';
+import { colorizeTestMessageInEditor } from '../testMessageColorizer.js';
+import { InspectSubject, MessageSubject, TaskSubject, TestOutputSubject } from './testResultsSubject.js';
+import { Testing } from '../../common/constants.js';
+import { MutableObservableValue } from '../../common/observableValue.js';
+import { ITaskRawOutput, ITestResult, ITestRunTaskResults, LiveTestResult, TestResultItemChangeReason } from '../../common/testResult.js';
+import { ITestMessage, TestMessageType, getMarkId } from '../../common/testTypes.js';
+
+
+class SimpleDiffEditorModel extends EditorModel {
+	public readonly original = this._original.object.textEditorModel;
+	public readonly modified = this._modified.object.textEditorModel;
+
+	constructor(
+		private readonly _original: IReference<IResolvedTextEditorModel>,
+		private readonly _modified: IReference<IResolvedTextEditorModel>,
+	) {
+		super();
+	}
+
+	public override dispose() {
+		super.dispose();
+		this._original.dispose();
+		this._modified.dispose();
+	}
+}
+
+
+export interface IPeekOutputRenderer extends IDisposable {
+	onDidContentSizeChange?: Event<void>;
+	/** Updates the displayed test. Should clear if it cannot display the test. */
+	update(subject: InspectSubject): Promise<boolean>;
+	/** Recalculate content layout. Returns the height it should be rendered at. */
+	layout(dimension: dom.IDimension, hasMultipleFrames: boolean): number | undefined;
+	/** Dispose the content provider. */
+	dispose(): void;
+}
+
+const commonEditorOptions: IEditorOptions = {
+	scrollBeyondLastLine: false,
+	links: true,
+	lineNumbers: 'off',
+	glyphMargin: false,
+	scrollbar: {
+		verticalScrollbarSize: 14,
+		horizontal: 'auto',
+		useShadows: false,
+		verticalHasArrows: false,
+		horizontalHasArrows: false,
+		alwaysConsumeMouseWheel: false
+	},
+	overviewRulerLanes: 0,
+	fixedOverflowWidgets: true,
+	readOnly: true,
+	stickyScroll: { enabled: false },
+	minimap: { enabled: false },
+	automaticLayout: false,
+};
+
+const diffEditorOptions: IDiffEditorConstructionOptions = {
+	...commonEditorOptions,
+	enableSplitViewResizing: true,
+	isInEmbeddedEditor: true,
+	renderOverviewRuler: false,
+	ignoreTrimWhitespace: false,
+	renderSideBySide: true,
+	useInlineViewWhenSpaceIsLimited: false,
+	originalAriaLabel: localize('testingOutputExpected', 'Expected result'),
+	modifiedAriaLabel: localize('testingOutputActual', 'Actual result'),
+	diffAlgorithm: 'advanced',
+};
+
+
+export class DiffContentProvider extends Disposable implements IPeekOutputRenderer {
+	private readonly widget = this._register(new MutableDisposable<DiffEditorWidget>());
+	private readonly model = this._register(new MutableDisposable());
+	private dimension?: dom.IDimension;
+
+	public get onDidContentSizeChange() {
+		return this.widget.value?.onDidContentSizeChange || Event.None;
+	}
+
+	constructor(
+		private readonly editor: ICodeEditor | undefined,
+		private readonly container: HTMLElement,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@ITextModelService private readonly modelService: ITextModelService,
+	) {
+		super();
+	}
+
+	public async update(subject: InspectSubject) {
+		if (!(subject instanceof MessageSubject)) {
+			this.clear();
+			return false;
+		}
+		const message = subject.message;
+		if (!ITestMessage.isDiffable(message)) {
+			this.clear();
+			return false;
+		}
+
+		const [original, modified] = await Promise.all([
+			this.modelService.createModelReference(subject.expectedUri),
+			this.modelService.createModelReference(subject.actualUri),
+		]);
+
+		const model = this.model.value = new SimpleDiffEditorModel(original, modified);
+		if (!this.widget.value) {
+			this.widget.value = this.editor ? this.instantiationService.createInstance(
+				EmbeddedDiffEditorWidget,
+				this.container,
+				diffEditorOptions,
+				{},
+				this.editor,
+			) : this.instantiationService.createInstance(
+				DiffEditorWidget,
+				this.container,
+				diffEditorOptions,
+				{},
+			);
+
+			if (this.dimension) {
+				this.widget.value.layout(this.dimension);
+			}
+		}
+
+		this.widget.value.setModel(model);
+		this.widget.value.updateOptions(this.getOptions(
+			isMultiline(message.expected) || isMultiline(message.actual)
+		));
+
+		return true;
+	}
+
+	private clear() {
+		this.model.clear();
+		this.widget.clear();
+	}
+
+	public layout(dimensions: dom.IDimension, hasMultipleFrames: boolean) {
+		this.dimension = dimensions;
+		const editor = this.widget.value;
+		if (!editor) {
+			return;
+		}
+
+		editor.layout(dimensions);
+		if (!hasMultipleFrames) {
+			return dimensions.height;
+		}
+
+		const height = Math.min(10000, Math.max(editor.getOriginalEditor().getContentHeight(), editor.getModifiedEditor().getContentHeight()));
+		editor.layout({ height, width: dimensions.width });
+		return height;
+	}
+
+	protected getOptions(isMultiline: boolean): IDiffEditorOptions {
+		return isMultiline
+			? { ...diffEditorOptions, lineNumbers: 'on' }
+			: { ...diffEditorOptions, lineNumbers: 'off' };
+	}
+}
+
+
+export class MarkdownTestMessagePeek extends Disposable implements IPeekOutputRenderer {
+	private readonly markdown = new Lazy(
+		() => this._register(this.instantiationService.createInstance(MarkdownRenderer, {})),
+	);
+
+	private element?: HTMLElement;
+
+	constructor(private readonly container: HTMLElement, @IInstantiationService private readonly instantiationService: IInstantiationService) {
+		super();
+		this._register(toDisposable(() => this.clear()));
+	}
+
+	public async update(subject: InspectSubject) {
+		if (!(subject instanceof MessageSubject)) {
+			this.clear();
+			return false;
+		}
+
+		const message = subject.message;
+		if (ITestMessage.isDiffable(message) || typeof message.message === 'string') {
+			this.clear();
+			return false;
+		}
+
+
+		const rendered = this._register(this.markdown.value.render(message.message, {}));
+		rendered.element.style.userSelect = 'text';
+		rendered.element.classList.add('preview-text');
+		this.container.appendChild(rendered.element);
+		this.element = rendered.element;
+		return true;
+	}
+
+	public layout(dimension: dom.IDimension): number | undefined {
+		if (!this.element) {
+			return undefined;
+		}
+
+		this.element.style.width = `${dimension.width - 32}px`;
+		return this.element.clientHeight;
+	}
+
+	private clear() {
+		if (this.element) {
+			this.element.remove();
+			this.element = undefined;
+		}
+	}
+}
+
+export class PlainTextMessagePeek extends Disposable implements IPeekOutputRenderer {
+	private readonly widgetDecorations = this._register(new MutableDisposable());
+	private readonly widget = this._register(new MutableDisposable<CodeEditorWidget>());
+	private readonly model = this._register(new MutableDisposable());
+	private dimension?: dom.IDimension;
+
+	public get onDidContentSizeChange() {
+		return this.widget.value?.onDidContentSizeChange || Event.None;
+	}
+
+	constructor(
+		private readonly editor: ICodeEditor | undefined,
+		private readonly container: HTMLElement,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@ITextModelService private readonly modelService: ITextModelService,
+	) {
+		super();
+	}
+
+	public async update(subject: InspectSubject): Promise<boolean> {
+		if (!(subject instanceof MessageSubject)) {
+			this.clear();
+			return false;
+		}
+
+		const message = subject.message;
+		if (ITestMessage.isDiffable(message) || message.type === TestMessageType.Output || typeof message.message !== 'string') {
+			this.clear();
+			return false;
+		}
+
+		const modelRef = this.model.value = await this.modelService.createModelReference(subject.messageUri);
+		if (!this.widget.value) {
+			this.widget.value = this.editor ? this.instantiationService.createInstance(
+				EmbeddedCodeEditorWidget,
+				this.container,
+				commonEditorOptions,
+				{},
+				this.editor,
+			) : this.instantiationService.createInstance(
+				CodeEditorWidget,
+				this.container,
+				commonEditorOptions,
+				{ isSimpleWidget: true }
+			);
+
+			if (this.dimension) {
+				this.widget.value.layout(this.dimension);
+			}
+		}
+
+		this.widget.value.setModel(modelRef.object.textEditorModel);
+		this.widget.value.updateOptions(commonEditorOptions);
+		this.widgetDecorations.value = colorizeTestMessageInEditor(message.message, this.widget.value);
+		return true;
+	}
+
+	private clear() {
+		this.widgetDecorations.clear();
+		this.widget.clear();
+		this.model.clear();
+	}
+
+	public layout(dimensions: dom.IDimension, hasMultipleFrames: boolean) {
+		this.dimension = dimensions;
+		const editor = this.widget.value;
+		if (!editor) {
+			return;
+		}
+
+		editor.layout(dimensions);
+		if (!hasMultipleFrames) {
+			return dimensions.height;
+		}
+
+		const height = editor.getContentHeight();
+		editor.layout({ height, width: dimensions.width });
+		return height;
+	}
+}
+
+export class TerminalMessagePeek extends Disposable implements IPeekOutputRenderer {
+	private dimensions?: dom.IDimension;
+	private readonly terminalCwd = this._register(new MutableObservableValue<string>(''));
+	private readonly xtermLayoutDelayer = this._register(new Delayer(50));
+
+	/** Active terminal instance. */
+	private readonly terminal = this._register(new MutableDisposable<IDetachedTerminalInstance>());
+	/** Listener for streaming result data */
+	private readonly outputDataListener = this._register(new MutableDisposable());
+
+	constructor(
+		private readonly container: HTMLElement,
+		private readonly isInPeekView: boolean,
+		@ITerminalService private readonly terminalService: ITerminalService,
+		@IViewDescriptorService private readonly viewDescriptorService: IViewDescriptorService,
+		@IWorkspaceContextService private readonly workspaceContext: IWorkspaceContextService,
+	) {
+		super();
+	}
+
+	private async makeTerminal() {
+		const prev = this.terminal.value;
+		if (prev) {
+			prev.xterm.clearBuffer();
+			prev.xterm.clearSearchDecorations();
+			// clearBuffer tries to retain the prompt. Reset prompt, scrolling state, etc.
+			prev.xterm.write(`\x1bc`);
+			return prev;
+		}
+
+		const capabilities = new TerminalCapabilityStore();
+		const cwd = this.terminalCwd;
+		capabilities.add(TerminalCapability.CwdDetection, {
+			type: TerminalCapability.CwdDetection,
+			get cwds() { return [cwd.value]; },
+			onDidChangeCwd: cwd.onDidChange,
+			getCwd: () => cwd.value,
+			updateCwd: () => { },
+		});
+
+		return this.terminal.value = await this.terminalService.createDetachedTerminal({
+			rows: 10,
+			cols: 80,
+			readonly: true,
+			capabilities,
+			processInfo: new DetachedProcessInfo({ initialCwd: cwd.value }),
+			colorProvider: {
+				getBackgroundColor: theme => {
+					const terminalBackground = theme.getColor(TERMINAL_BACKGROUND_COLOR);
+					if (terminalBackground) {
+						return terminalBackground;
+					}
+					if (this.isInPeekView) {
+						return theme.getColor(peekViewResultsBackground);
+					}
+					const location = this.viewDescriptorService.getViewLocationById(Testing.ResultsViewId);
+					return location === ViewContainerLocation.Panel
+						? theme.getColor(PANEL_BACKGROUND)
+						: theme.getColor(SIDE_BAR_BACKGROUND);
+				},
+			}
+		});
+	}
+
+	public async update(subject: InspectSubject): Promise<boolean> {
+		this.outputDataListener.clear();
+		if (subject instanceof TaskSubject) {
+			await this.updateForTaskSubject(subject);
+		} else if (subject instanceof TestOutputSubject || (subject instanceof MessageSubject && subject.message.type === TestMessageType.Output)) {
+			await this.updateForTestSubject(subject);
+		} else {
+			this.clear();
+			return false;
+		}
+
+		return true;
+	}
+
+	private async updateForTestSubject(subject: TestOutputSubject | MessageSubject) {
+		const that = this;
+		const testItem = subject instanceof TestOutputSubject ? subject.test.item : subject.test;
+		const terminal = await this.updateGenerically<ITaskRawOutput>({
+			subject,
+			noOutputMessage: localize('caseNoOutput', 'The test case did not report any output.'),
+			getTarget: result => result?.tasks[subject.taskIndex].output,
+			*doInitialWrite(output, results) {
+				that.updateCwd(testItem.uri);
+				const state = subject instanceof TestOutputSubject ? subject.test : results.getStateById(testItem.extId);
+				if (!state) {
+					return;
+				}
+
+				for (const message of state.tasks[subject.taskIndex].messages) {
+					if (message.type === TestMessageType.Output) {
+						yield* output.getRangeIter(message.offset, message.length);
+					}
+				}
+			},
+			doListenForMoreData: (output, result, write) => result.onChange(e => {
+				if (e.reason === TestResultItemChangeReason.NewMessage && e.item.item.extId === testItem.extId && e.message.type === TestMessageType.Output) {
+					for (const chunk of output.getRangeIter(e.message.offset, e.message.length)) {
+						write(chunk.buffer);
+					}
+				}
+			}),
+		});
+
+		if (subject instanceof MessageSubject && subject.message.type === TestMessageType.Output && subject.message.marker !== undefined) {
+			terminal?.xterm.selectMarkedRange(getMarkId(subject.message.marker, true), getMarkId(subject.message.marker, false), /* scrollIntoView= */ true);
+		}
+	}
+
+	private updateForTaskSubject(subject: TaskSubject) {
+		return this.updateGenerically<ITestRunTaskResults>({
+			subject,
+			noOutputMessage: localize('runNoOutput', 'The test run did not record any output.'),
+			getTarget: result => result?.tasks[subject.taskIndex],
+			doInitialWrite: (task, result) => {
+				// Update the cwd and use the first test to try to hint at the correct cwd,
+				// but often this will fall back to the first workspace folder.
+				this.updateCwd(Iterable.find(result.tests, t => !!t.item.uri)?.item.uri);
+				return task.output.buffers;
+			},
+			doListenForMoreData: (task, _result, write) => task.output.onDidWriteData(e => write(e.buffer)),
+		});
+	}
+
+	private async updateGenerically<T>(opts: {
+		subject: InspectSubject;
+		noOutputMessage: string;
+		getTarget: (result: ITestResult) => T | undefined;
+		doInitialWrite: (target: T, result: LiveTestResult) => Iterable<VSBuffer>;
+		doListenForMoreData: (target: T, result: LiveTestResult, write: (s: Uint8Array) => void) => IDisposable;
+	}) {
+		const result = opts.subject.result;
+		const target = opts.getTarget(result);
+		if (!target) {
+			return this.clear();
+		}
+
+		const terminal = await this.makeTerminal();
+		let didWriteData = false;
+
+		const pendingWrites = new MutableObservableValue(0);
+		if (result instanceof LiveTestResult) {
+			for (const chunk of opts.doInitialWrite(target, result)) {
+				didWriteData ||= chunk.byteLength > 0;
+				pendingWrites.value++;
+				terminal.xterm.write(chunk.buffer, () => pendingWrites.value--);
+			}
+		} else {
+			didWriteData = true;
+			this.writeNotice(terminal, localize('runNoOutputForPast', 'Test output is only available for new test runs.'));
+		}
+
+		this.attachTerminalToDom(terminal);
+		this.outputDataListener.clear();
+
+		if (result instanceof LiveTestResult && !result.completedAt) {
+			const l1 = result.onComplete(() => {
+				if (!didWriteData) {
+					this.writeNotice(terminal, opts.noOutputMessage);
+				}
+			});
+			const l2 = opts.doListenForMoreData(target, result, data => {
+				terminal.xterm.write(data);
+				didWriteData ||= data.byteLength > 0;
+			});
+
+			this.outputDataListener.value = combinedDisposable(l1, l2);
+		}
+
+		if (!this.outputDataListener.value && !didWriteData) {
+			this.writeNotice(terminal, opts.noOutputMessage);
+		}
+
+		// Ensure pending writes finish, otherwise the selection in `updateForTestSubject`
+		// can happen before the markers are processed.
+		if (pendingWrites.value > 0) {
+			await new Promise<void>(resolve => {
+				const l = pendingWrites.onDidChange(() => {
+					if (pendingWrites.value === 0) {
+						l.dispose();
+						resolve();
+					}
+				});
+			});
+		}
+
+		return terminal;
+	}
+
+	private updateCwd(testUri?: URI) {
+		const wf = (testUri && this.workspaceContext.getWorkspaceFolder(testUri))
+			|| this.workspaceContext.getWorkspace().folders[0];
+		if (wf) {
+			this.terminalCwd.value = wf.uri.fsPath;
+		}
+	}
+
+	private writeNotice(terminal: IDetachedTerminalInstance, str: string) {
+		terminal.xterm.write(formatMessageForTerminal(str));
+	}
+
+	private attachTerminalToDom(terminal: IDetachedTerminalInstance) {
+		terminal.xterm.write('\x1b[?25l'); // hide cursor
+		dom.scheduleAtNextAnimationFrame(dom.getWindow(this.container), () => this.layoutTerminal(terminal));
+		terminal.attachToElement(this.container, { enableGpu: false });
+	}
+
+	private clear() {
+		this.outputDataListener.clear();
+		this.xtermLayoutDelayer.cancel();
+		this.terminal.clear();
+	}
+
+	public layout(dimensions: dom.IDimension) {
+		this.dimensions = dimensions;
+		if (this.terminal.value) {
+			this.layoutTerminal(this.terminal.value, dimensions.width, dimensions.height);
+			return dimensions.height;
+		}
+
+		return undefined;
+	}
+
+	private layoutTerminal(
+		{ xterm }: IDetachedTerminalInstance,
+		width = this.dimensions?.width ?? this.container.clientWidth,
+		height = this.dimensions?.height ?? this.container.clientHeight
+	) {
+		width -= 10 + 20; // scrollbar width + margin
+		this.xtermLayoutDelayer.trigger(() => {
+			const scaled = getXtermScaledDimensions(dom.getWindow(this.container), xterm.getFont(), width, height);
+			if (scaled) {
+				xterm.resize(scaled.cols, scaled.rows);
+			}
+		});
+	}
+}
+
+const isMultiline = (str: string | undefined) => !!str && str.includes('\n');
diff --git a/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsSubject.ts b/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsSubject.ts
new file mode 100644
index 00000000000..092eec8fff7
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsSubject.ts
@@ -0,0 +1,130 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+
+import { MarshalledId } from '../../../../../base/common/marshallingIds.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { TestId } from '../../common/testId.js';
+import { ITestResult } from '../../common/testResult.js';
+import { IRichLocation, ITestItem, ITestMessage, ITestMessageMenuArgs, ITestRunTask, ITestTaskState, InternalTestItem, TestMessageType, TestResultItem } from '../../common/testTypes.js';
+import { TestUriType, buildTestUri } from '../../common/testingUri.js';
+
+export const getMessageArgs = (test: TestResultItem, message: ITestMessage): ITestMessageMenuArgs => ({
+	$mid: MarshalledId.TestMessageMenuArgs,
+	test: InternalTestItem.serialize(test),
+	message: ITestMessage.serialize(message),
+});
+
+interface ISubjectCommon {
+	controllerId: string;
+}
+
+export const inspectSubjectHasStack = (subject: InspectSubject | undefined) =>
+	subject instanceof MessageSubject && !!subject.stack?.length;
+
+export class MessageSubject implements ISubjectCommon {
+	public readonly test: ITestItem;
+	public readonly message: ITestMessage;
+	public readonly expectedUri: URI;
+	public readonly actualUri: URI;
+	public readonly messageUri: URI;
+	public readonly revealLocation: IRichLocation | undefined;
+	public readonly context: ITestMessageMenuArgs | undefined;
+
+	public get controllerId() {
+		return TestId.root(this.test.extId);
+	}
+
+	public get isDiffable() {
+		return this.message.type === TestMessageType.Error && ITestMessage.isDiffable(this.message);
+	}
+
+	public get contextValue() {
+		return this.message.type === TestMessageType.Error ? this.message.contextValue : undefined;
+	}
+
+	public get stack() {
+		return this.message.type === TestMessageType.Error && this.message.stackTrace?.length ? this.message.stackTrace : undefined;
+	}
+
+	constructor(public readonly result: ITestResult, test: TestResultItem, public readonly taskIndex: number, public readonly messageIndex: number) {
+		this.test = test.item;
+		const messages = test.tasks[taskIndex].messages;
+		this.messageIndex = messageIndex;
+
+		const parts = { messageIndex, resultId: result.id, taskIndex, testExtId: test.item.extId };
+		this.expectedUri = buildTestUri({ ...parts, type: TestUriType.ResultExpectedOutput });
+		this.actualUri = buildTestUri({ ...parts, type: TestUriType.ResultActualOutput });
+		this.messageUri = buildTestUri({ ...parts, type: TestUriType.ResultMessage });
+
+		const message = this.message = messages[this.messageIndex];
+		this.context = getMessageArgs(test, message);
+		this.revealLocation = message.location ?? (test.item.uri && test.item.range ? { uri: test.item.uri, range: Range.lift(test.item.range) } : undefined);
+	}
+}
+
+export class TaskSubject implements ISubjectCommon {
+	public readonly outputUri: URI;
+	public readonly revealLocation: undefined;
+
+	public get controllerId() {
+		return this.result.tasks[this.taskIndex].ctrlId;
+	}
+
+	constructor(public readonly result: ITestResult, public readonly taskIndex: number) {
+		this.outputUri = buildTestUri({ resultId: result.id, taskIndex, type: TestUriType.TaskOutput });
+	}
+}
+
+export class TestOutputSubject implements ISubjectCommon {
+	public readonly outputUri: URI;
+	public readonly revealLocation: undefined;
+	public readonly task: ITestRunTask;
+
+	public get controllerId() {
+		return TestId.root(this.test.item.extId);
+	}
+
+	constructor(public readonly result: ITestResult, public readonly taskIndex: number, public readonly test: TestResultItem) {
+		this.outputUri = buildTestUri({ resultId: this.result.id, taskIndex: this.taskIndex, testExtId: this.test.item.extId, type: TestUriType.TestOutput });
+		this.task = result.tasks[this.taskIndex];
+	}
+}
+
+export type InspectSubject = MessageSubject | TaskSubject | TestOutputSubject;
+
+export const equalsSubject = (a: InspectSubject, b: InspectSubject) => (
+	(a instanceof MessageSubject && b instanceof MessageSubject && a.message === b.message) ||
+	(a instanceof TaskSubject && b instanceof TaskSubject && a.result === b.result && a.taskIndex === b.taskIndex) ||
+	(a instanceof TestOutputSubject && b instanceof TestOutputSubject && a.test === b.test && a.taskIndex === b.taskIndex)
+);
+
+
+export const mapFindTestMessage = <T>(test: TestResultItem, fn: (task: ITestTaskState, message: ITestMessage, messageIndex: number, taskIndex: number) => T | undefined) => {
+	for (let taskIndex = 0; taskIndex < test.tasks.length; taskIndex++) {
+		const task = test.tasks[taskIndex];
+		for (let messageIndex = 0; messageIndex < task.messages.length; messageIndex++) {
+			const r = fn(task, task.messages[messageIndex], messageIndex, taskIndex);
+			if (r !== undefined) {
+				return r;
+			}
+		}
+	}
+
+	return undefined;
+};
+
+export const getSubjectTestItem = (subject: InspectSubject) => {
+	if (subject instanceof MessageSubject) {
+		return subject.test;
+	}
+
+	if (subject instanceof TaskSubject) {
+		return undefined;
+	}
+
+	return subject.test.item;
+};
diff --git a/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsTree.ts b/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsTree.ts
new file mode 100644
index 00000000000..68eb55b6811
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsTree.ts
@@ -0,0 +1,900 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from '../../../../../base/browser/dom.js';
+import { ActionBar } from '../../../../../base/browser/ui/actionbar/actionbar.js';
+import { renderLabelWithIcons } from '../../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { IIdentityProvider } from '../../../../../base/browser/ui/list/list.js';
+import { ICompressedTreeElement, ICompressedTreeNode } from '../../../../../base/browser/ui/tree/compressedObjectTreeModel.js';
+import { ICompressibleTreeRenderer } from '../../../../../base/browser/ui/tree/objectTree.js';
+import { ITreeContextMenuEvent, ITreeNode } from '../../../../../base/browser/ui/tree/tree.js';
+import { Action, IAction, Separator } from '../../../../../base/common/actions.js';
+import { RunOnceScheduler } from '../../../../../base/common/async.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { FuzzyScore } from '../../../../../base/common/filters.js';
+import { Iterable } from '../../../../../base/common/iterator.js';
+import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { MarshalledId } from '../../../../../base/common/marshallingIds.js';
+import { autorun } from '../../../../../base/common/observable.js';
+import { count } from '../../../../../base/common/strings.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { isDefined } from '../../../../../base/common/types.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { localize } from '../../../../../nls.js';
+import { MenuEntryActionViewItem, createAndFillInActionBarActions } from '../../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IMenuService, MenuId, MenuItemAction } from '../../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { WorkbenchCompressibleObjectTree } from '../../../../../platform/list/browser/listService.js';
+import { IProgressService } from '../../../../../platform/progress/common/progress.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { widgetClose } from '../../../../../platform/theme/common/iconRegistry.js';
+import { getTestItemContextOverlay } from '../explorerProjections/testItemContextOverlay.js';
+import * as icons from '../icons.js';
+import { renderTestMessageAsText } from '../testMessageColorizer.js';
+import { InspectSubject, MessageSubject, TaskSubject, TestOutputSubject, getMessageArgs, mapFindTestMessage } from './testResultsSubject.js';
+import { TestCommandId, Testing } from '../../common/constants.js';
+import { ITestCoverageService } from '../../common/testCoverageService.js';
+import { ITestExplorerFilterState } from '../../common/testExplorerFilterState.js';
+import { ITestProfileService } from '../../common/testProfileService.js';
+import { ITestResult, ITestRunTaskResults, LiveTestResult, TestResultItemChangeReason, maxCountPriority } from '../../common/testResult.js';
+import { ITestResultService } from '../../common/testResultService.js';
+import { IRichLocation, ITestItemContext, ITestMessage, ITestMessageMenuArgs, InternalTestItem, TestMessageType, TestResultItem, TestResultState, TestRunProfileBitset, testResultStateToContextValues } from '../../common/testTypes.js';
+import { TestingContextKeys } from '../../common/testingContextKeys.js';
+import { cmpPriority } from '../../common/testingStates.js';
+import { TestUriType, buildTestUri } from '../../common/testingUri.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+
+
+interface ITreeElement {
+	type: string;
+	context: unknown;
+	id: string;
+	label: string;
+	onDidChange: Event<void>;
+	labelWithIcons?: readonly (HTMLSpanElement | string)[];
+	icon?: ThemeIcon;
+	description?: string;
+	ariaLabel?: string;
+}
+
+interface ITreeElement {
+	type: string;
+	context: unknown;
+	id: string;
+	label: string;
+	onDidChange: Event<void>;
+	labelWithIcons?: readonly (HTMLSpanElement | string)[];
+	icon?: ThemeIcon;
+	description?: string;
+	ariaLabel?: string;
+}
+
+class TestResultElement implements ITreeElement {
+	public readonly changeEmitter = new Emitter<void>();
+	public readonly onDidChange = this.changeEmitter.event;
+	public readonly type = 'result';
+	public readonly context = this.value.id;
+	public readonly id = this.value.id;
+	public readonly label = this.value.name;
+
+	public get icon() {
+		return icons.testingStatesToIcons.get(
+			this.value.completedAt === undefined
+				? TestResultState.Running
+				: maxCountPriority(this.value.counts)
+		);
+	}
+
+	constructor(public readonly value: ITestResult) { }
+}
+
+const openCoverageLabel = localize('openTestCoverage', 'View Test Coverage');
+const closeCoverageLabel = localize('closeTestCoverage', 'Close Test Coverage');
+
+class CoverageElement implements ITreeElement {
+	public readonly type = 'coverage';
+	public readonly context: undefined;
+	public readonly id = `coverage-${this.results.id}/${this.task.id}`;
+	public readonly onDidChange: Event<void>;
+
+	public get label() {
+		return this.isOpen ? closeCoverageLabel : openCoverageLabel;
+	}
+
+	public get icon() {
+		return this.isOpen ? widgetClose : icons.testingCoverageReport;
+	}
+
+	public get isOpen() {
+		return this.coverageService.selected.get()?.fromTaskId === this.task.id;
+	}
+
+	constructor(
+		private readonly results: ITestResult,
+		public readonly task: ITestRunTaskResults,
+		private readonly coverageService: ITestCoverageService,
+	) {
+		this.onDidChange = Event.fromObservableLight(coverageService.selected);
+	}
+}
+
+class OlderResultsElement implements ITreeElement {
+	public readonly type = 'older';
+	public readonly context: undefined;
+	public readonly id = `older-${this.n}`;
+	public readonly onDidChange = Event.None;
+	public readonly label: string;
+
+	constructor(private readonly n: number) {
+		this.label = localize('nOlderResults', '{0} older results', n);
+
+	}
+}
+
+class TestCaseElement implements ITreeElement {
+	public readonly type = 'test';
+	public readonly context: ITestItemContext = {
+		$mid: MarshalledId.TestItemContext,
+		tests: [InternalTestItem.serialize(this.test)],
+	};
+	public readonly id = `${this.results.id}/${this.test.item.extId}`;
+	public readonly description?: string;
+
+	public get onDidChange() {
+		if (!(this.results instanceof LiveTestResult)) {
+			return Event.None;
+		}
+
+		return Event.filter(this.results.onChange, e => e.item.item.extId === this.test.item.extId);
+	}
+
+	public get state() {
+		return this.test.tasks[this.taskIndex].state;
+	}
+
+	public get label() {
+		return this.test.item.label;
+	}
+
+	public get labelWithIcons() {
+		return renderLabelWithIcons(this.label);
+	}
+
+	public get icon() {
+		return icons.testingStatesToIcons.get(this.state);
+	}
+
+	public get outputSubject() {
+		return new TestOutputSubject(this.results, this.taskIndex, this.test);
+	}
+
+
+	constructor(
+		public readonly results: ITestResult,
+		public readonly test: TestResultItem,
+		public readonly taskIndex: number,
+	) { }
+}
+
+class TaskElement implements ITreeElement {
+	public readonly changeEmitter = new Emitter<void>();
+	public readonly onDidChange = this.changeEmitter.event;
+	public readonly type = 'task';
+	public readonly context: { resultId: string; taskId: string };
+	public readonly id: string;
+	public readonly label: string;
+	public readonly itemsCache = new CreationCache<TestCaseElement>();
+
+	public get icon() {
+		return this.results.tasks[this.index].running ? icons.testingStatesToIcons.get(TestResultState.Running) : undefined;
+	}
+
+	constructor(public readonly results: ITestResult, public readonly task: ITestRunTaskResults, public readonly index: number) {
+		this.id = `${results.id}/${index}`;
+		this.task = results.tasks[index];
+		this.context = { resultId: results.id, taskId: this.task.id };
+		this.label = this.task.name;
+	}
+}
+
+class TestMessageElement implements ITreeElement {
+	public readonly type = 'message';
+	public readonly id: string;
+	public readonly label: string;
+	public readonly uri: URI;
+	public readonly location?: IRichLocation;
+	public readonly description?: string;
+	public readonly contextValue?: string;
+	public readonly message: ITestMessage;
+
+	public get onDidChange() {
+		if (!(this.result instanceof LiveTestResult)) {
+			return Event.None;
+		}
+
+		// rerender when the test case changes so it gets retired events
+		return Event.filter(this.result.onChange, e => e.item.item.extId === this.test.item.extId);
+	}
+
+	public get context(): ITestMessageMenuArgs {
+		return getMessageArgs(this.test, this.message);
+	}
+
+	public get outputSubject() {
+		return new TestOutputSubject(this.result, this.taskIndex, this.test);
+	}
+
+	constructor(
+		public readonly result: ITestResult,
+		public readonly test: TestResultItem,
+		public readonly taskIndex: number,
+		public readonly messageIndex: number,
+	) {
+		const m = this.message = test.tasks[taskIndex].messages[messageIndex];
+
+		this.location = m.location;
+		this.contextValue = m.type === TestMessageType.Error ? m.contextValue : undefined;
+		this.uri = buildTestUri({
+			type: TestUriType.ResultMessage,
+			messageIndex,
+			resultId: result.id,
+			taskIndex,
+			testExtId: test.item.extId
+		});
+
+		this.id = this.uri.toString();
+
+		const asPlaintext = renderTestMessageAsText(m.message);
+		const lines = count(asPlaintext.trimEnd(), '\n');
+		this.label = firstLine(asPlaintext);
+		if (lines > 0) {
+			this.description = lines > 1
+				? localize('messageMoreLinesN', '+ {0} more lines', lines)
+				: localize('messageMoreLines1', '+ 1 more line');
+		}
+	}
+}
+
+type TreeElement = TestResultElement | TestCaseElement | TestMessageElement | TaskElement | CoverageElement | OlderResultsElement;
+
+export class OutputPeekTree extends Disposable {
+	private disposed = false;
+	private readonly tree: WorkbenchCompressibleObjectTree<TreeElement, FuzzyScore>;
+	private readonly treeActions: TreeActionsProvider;
+	private readonly requestReveal = this._register(new Emitter<InspectSubject>());
+
+	public readonly onDidRequestReview = this.requestReveal.event;
+
+	constructor(
+		container: HTMLElement,
+		onDidReveal: Event<{ subject: InspectSubject; preserveFocus: boolean }>,
+		options: { showRevealLocationOnMessages: boolean; locationForProgress: string },
+		@IContextMenuService private readonly contextMenuService: IContextMenuService,
+		@ITestResultService results: ITestResultService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@ITestExplorerFilterState explorerFilter: ITestExplorerFilterState,
+		@ITestCoverageService coverageService: ITestCoverageService,
+		@IProgressService progressService: IProgressService,
+		@ITelemetryService telemetryService: ITelemetryService,
+	) {
+		super();
+
+		this.treeActions = instantiationService.createInstance(TreeActionsProvider, options.showRevealLocationOnMessages, this.requestReveal,);
+		const diffIdentityProvider: IIdentityProvider<TreeElement> = {
+			getId(e: TreeElement) {
+				return e.id;
+			}
+		};
+
+		this.tree = this._register(instantiationService.createInstance(
+			WorkbenchCompressibleObjectTree,
+			'Test Output Peek',
+			container,
+			{
+				getHeight: () => 22,
+				getTemplateId: () => TestRunElementRenderer.ID,
+			},
+			[instantiationService.createInstance(TestRunElementRenderer, this.treeActions)],
+			{
+				compressionEnabled: true,
+				hideTwistiesOfChildlessElements: true,
+				identityProvider: diffIdentityProvider,
+				sorter: {
+					compare(a, b) {
+						if (a instanceof TestCaseElement && b instanceof TestCaseElement) {
+							return cmpPriority(a.state, b.state);
+						}
+
+						return 0;
+					},
+				},
+				accessibilityProvider: {
+					getAriaLabel(element: ITreeElement) {
+						return element.ariaLabel || element.label;
+					},
+					getWidgetAriaLabel() {
+						return localize('testingPeekLabel', 'Test Result Messages');
+					}
+				}
+			},
+		)) as WorkbenchCompressibleObjectTree<TreeElement, FuzzyScore>;
+
+		const cc = new CreationCache<TreeElement>();
+
+		const getTaskChildren = (taskElem: TaskElement): Iterable<ICompressedTreeElement<TreeElement>> => {
+			const { results, index, itemsCache, task } = taskElem;
+			const tests = Iterable.filter(results.tests, test => test.tasks[index].state >= TestResultState.Running || test.tasks[index].messages.length > 0);
+			let result: Iterable<ICompressedTreeElement<TreeElement>> = Iterable.map(tests, test => ({
+				element: itemsCache.getOrCreate(test, () => new TestCaseElement(results, test, index)),
+				incompressible: true,
+				children: getTestChildren(results, test, index),
+			}));
+
+			if (task.coverage.get()) {
+				result = Iterable.concat(
+					Iterable.single<ICompressedTreeElement<TreeElement>>({
+						element: new CoverageElement(results, task, coverageService),
+						collapsible: true,
+						incompressible: true,
+					}),
+					result,
+				);
+			}
+
+			return result;
+		};
+
+		const getTestChildren = (result: ITestResult, test: TestResultItem, taskIndex: number): Iterable<ICompressedTreeElement<TreeElement>> => {
+			return test.tasks[taskIndex].messages
+				.map((m, messageIndex) =>
+					m.type === TestMessageType.Error
+						? { element: cc.getOrCreate(m, () => new TestMessageElement(result, test, taskIndex, messageIndex)), incompressible: false }
+						: undefined
+				)
+				.filter(isDefined);
+		};
+
+		const getResultChildren = (result: ITestResult): ICompressedTreeElement<TreeElement>[] => {
+			return result.tasks.map((task, taskIndex) => {
+				const taskElem = cc.getOrCreate(task, () => new TaskElement(result, task, taskIndex));
+				return ({
+					element: taskElem,
+					incompressible: false,
+					collapsible: true,
+					children: getTaskChildren(taskElem),
+				});
+			});
+		};
+
+		const getRootChildren = (): Iterable<ICompressedTreeElement<TreeElement>> => {
+			let children: ICompressedTreeElement<TreeElement>[] = [];
+
+			const older = [];
+
+			for (const result of results.results) {
+				if (!children.length && result.tasks.length) {
+					children = getResultChildren(result);
+				} else if (children) {
+					const element = cc.getOrCreate(result, () => new TestResultElement(result));
+					older.push({
+						element,
+						incompressible: true,
+						collapsible: true,
+						collapsed: this.tree.hasElement(element) ? this.tree.isCollapsed(element) : true,
+						children: getResultChildren(result)
+					});
+				}
+			}
+
+			if (!children.length) {
+				return older;
+			}
+
+			if (older.length) {
+				children.push({
+					element: new OlderResultsElement(older.length),
+					incompressible: true,
+					collapsible: true,
+					collapsed: true,
+					children: older,
+				});
+			}
+
+			return children;
+		};
+
+		// Queued result updates to prevent spamming CPU when lots of tests are
+		// completing and messaging quickly (#142514)
+		const taskChildrenToUpdate = new Set<TaskElement>();
+		const taskChildrenUpdate = this._register(new RunOnceScheduler(() => {
+			for (const taskNode of taskChildrenToUpdate) {
+				if (this.tree.hasElement(taskNode)) {
+					this.tree.setChildren(taskNode, getTaskChildren(taskNode), { diffIdentityProvider });
+				}
+			}
+			taskChildrenToUpdate.clear();
+		}, 300));
+
+		const queueTaskChildrenUpdate = (taskNode: TaskElement) => {
+			taskChildrenToUpdate.add(taskNode);
+			if (!taskChildrenUpdate.isScheduled()) {
+				taskChildrenUpdate.schedule();
+			}
+		};
+
+		const attachToResults = (result: LiveTestResult) => {
+			const disposable = new DisposableStore();
+			disposable.add(result.onNewTask(i => {
+				this.tree.setChildren(null, getRootChildren(), { diffIdentityProvider });
+
+				if (result.tasks.length === 1) {
+					this.requestReveal.fire(new TaskSubject(result, 0)); // reveal the first task in new runs
+				}
+
+				// note: tasks are bounded and their lifetime is equivalent to that of
+				// the test result, so this doesn't leak indefinitely.
+				const task = result.tasks[i];
+				disposable.add(autorun(reader => {
+					task.coverage.read(reader); // add it to the autorun
+					queueTaskChildrenUpdate(cc.get(task) as TaskElement);
+				}));
+			}));
+
+			disposable.add(result.onEndTask(index => {
+				(cc.get(result.tasks[index]) as TaskElement | undefined)?.changeEmitter.fire();
+			}));
+
+			disposable.add(result.onChange(e => {
+				// try updating the item in each of its tasks
+				for (const [index, task] of result.tasks.entries()) {
+					const taskNode = cc.get(task) as TaskElement;
+					if (!this.tree.hasElement(taskNode)) {
+						continue;
+					}
+
+					const itemNode = taskNode.itemsCache.get(e.item);
+					if (itemNode && this.tree.hasElement(itemNode)) {
+						if (e.reason === TestResultItemChangeReason.NewMessage && e.message.type === TestMessageType.Error) {
+							this.tree.setChildren(itemNode, getTestChildren(result, e.item, index), { diffIdentityProvider });
+						}
+						return;
+					}
+
+					queueTaskChildrenUpdate(taskNode);
+				}
+			}));
+
+			disposable.add(result.onComplete(() => {
+				(cc.get(result) as TestResultElement | undefined)?.changeEmitter.fire();
+				disposable.dispose();
+			}));
+		};
+
+		this._register(results.onResultsChanged(e => {
+			// little hack here: a result change can cause the peek to be disposed,
+			// but this listener will still be queued. Doing stuff with the tree
+			// will cause errors.
+			if (this.disposed) {
+				return;
+			}
+
+			if ('completed' in e) {
+				(cc.get(e.completed) as TestResultElement | undefined)?.changeEmitter.fire();
+			} else if ('started' in e) {
+				attachToResults(e.started);
+			} else {
+				this.tree.setChildren(null, getRootChildren(), { diffIdentityProvider });
+			}
+		}));
+
+		const revealItem = (element: TreeElement, preserveFocus: boolean) => {
+			this.tree.setFocus([element]);
+			this.tree.setSelection([element]);
+			if (!preserveFocus) {
+				this.tree.domFocus();
+			}
+		};
+
+		this._register(onDidReveal(async ({ subject, preserveFocus = false }) => {
+			if (subject instanceof TaskSubject) {
+				const resultItem = this.tree.getNode(null).children.find(c => {
+					if (c.element instanceof TaskElement) {
+						return c.element.results.id === subject.result.id && c.element.index === subject.taskIndex;
+					}
+					if (c.element instanceof TestResultElement) {
+						return c.element.id === subject.result.id;
+					}
+					return false;
+				});
+
+				if (resultItem) {
+					revealItem(resultItem.element!, preserveFocus);
+				}
+				return;
+			}
+
+			const revealElement = subject instanceof TestOutputSubject
+				? cc.get<TaskElement>(subject.task)?.itemsCache.get(subject.test)
+				: cc.get(subject.message);
+			if (!revealElement || !this.tree.hasElement(revealElement)) {
+				return;
+			}
+
+			const parents: TreeElement[] = [];
+			for (let parent = this.tree.getParentElement(revealElement); parent; parent = this.tree.getParentElement(parent)) {
+				parents.unshift(parent);
+			}
+
+			for (const parent of parents) {
+				this.tree.expand(parent);
+			}
+
+			if (this.tree.getRelativeTop(revealElement) === null) {
+				this.tree.reveal(revealElement, 0.5);
+			}
+
+			revealItem(revealElement, preserveFocus);
+		}));
+
+		this._register(this.tree.onDidOpen(async e => {
+			if (e.element instanceof TestMessageElement) {
+				this.requestReveal.fire(new MessageSubject(e.element.result, e.element.test, e.element.taskIndex, e.element.messageIndex));
+			} else if (e.element instanceof TestCaseElement) {
+				const t = e.element;
+				const message = mapFindTestMessage(e.element.test, (_t, _m, mesasgeIndex, taskIndex) =>
+					new MessageSubject(t.results, t.test, taskIndex, mesasgeIndex));
+				this.requestReveal.fire(message || new TestOutputSubject(t.results, 0, t.test));
+			} else if (e.element instanceof CoverageElement) {
+				const task = e.element.task;
+				if (e.element.isOpen) {
+					return coverageService.closeCoverage();
+				}
+				progressService.withProgress(
+					{ location: options.locationForProgress },
+					() => coverageService.openCoverage(task, true)
+				);
+			}
+		}));
+
+		this._register(this.tree.onDidChangeSelection(evt => {
+			for (const element of evt.elements) {
+				if (element && 'test' in element) {
+					explorerFilter.reveal.value = element.test.item.extId;
+					break;
+				}
+			}
+		}));
+
+
+		this._register(this.tree.onContextMenu(e => this.onContextMenu(e)));
+
+		this._register(this.tree.onDidChangeCollapseState(e => {
+			if (e.node.element instanceof OlderResultsElement && !e.node.collapsed) {
+				telemetryService.publicLog2<{}, {
+					owner: 'connor4312';
+					// we're considering removing or depromoting this feature because we don't think it's used:
+					comment: 'Records that test history was used';
+				}>('testing.expandOlderResults');
+			}
+		}));
+
+		this.tree.setChildren(null, getRootChildren());
+		for (const result of results.results) {
+			if (!result.completedAt && result instanceof LiveTestResult) {
+				attachToResults(result);
+			}
+		}
+	}
+
+	public layout(height: number, width: number) {
+		this.tree.layout(height, width);
+	}
+
+	private onContextMenu(evt: ITreeContextMenuEvent<ITreeElement | null>) {
+		if (!evt.element) {
+			return;
+		}
+
+		const actions = this.treeActions.provideActionBar(evt.element);
+		this.contextMenuService.showContextMenu({
+			getAnchor: () => evt.anchor,
+			getActions: () => actions.secondary.length
+				? [...actions.primary, new Separator(), ...actions.secondary]
+				: actions.primary,
+			getActionsContext: () => evt.element?.context
+		});
+	}
+
+	public override dispose() {
+		super.dispose();
+		this.disposed = true;
+	}
+}
+
+interface TemplateData {
+	label: HTMLElement;
+	icon: HTMLElement;
+	actionBar: ActionBar;
+	elementDisposable: DisposableStore;
+	templateDisposable: DisposableStore;
+}
+
+class TestRunElementRenderer implements ICompressibleTreeRenderer<ITreeElement, FuzzyScore, TemplateData> {
+	public static readonly ID = 'testRunElementRenderer';
+	public readonly templateId = TestRunElementRenderer.ID;
+
+	constructor(
+		private readonly treeActions: TreeActionsProvider,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+	) { }
+
+	/** @inheritdoc */
+	public renderCompressedElements(node: ITreeNode<ICompressedTreeNode<ITreeElement>, FuzzyScore>, _index: number, templateData: TemplateData): void {
+		const chain = node.element.elements;
+		const lastElement = chain[chain.length - 1];
+		if ((lastElement instanceof TaskElement || lastElement instanceof TestMessageElement) && chain.length >= 2) {
+			this.doRender(chain[chain.length - 2], templateData, lastElement);
+		} else {
+			this.doRender(lastElement, templateData);
+		}
+	}
+
+	/** @inheritdoc */
+	public renderTemplate(container: HTMLElement): TemplateData {
+		const templateDisposable = new DisposableStore();
+		const wrapper = dom.append(container, dom.$('.test-peek-item'));
+		const icon = dom.append(wrapper, dom.$('.state'));
+		const label = dom.append(wrapper, dom.$('.name'));
+
+		const actionBar = new ActionBar(wrapper, {
+			actionViewItemProvider: (action, options) =>
+				action instanceof MenuItemAction
+					? this.instantiationService.createInstance(MenuEntryActionViewItem, action, { hoverDelegate: options.hoverDelegate })
+					: undefined
+		});
+
+		const elementDisposable = new DisposableStore();
+		templateDisposable.add(elementDisposable);
+		templateDisposable.add(actionBar);
+
+		return {
+			icon,
+			label,
+			actionBar,
+			elementDisposable,
+			templateDisposable,
+		};
+	}
+
+	/** @inheritdoc */
+	public renderElement(element: ITreeNode<ITreeElement, FuzzyScore>, _index: number, templateData: TemplateData): void {
+		this.doRender(element.element, templateData);
+	}
+
+	/** @inheritdoc */
+	public disposeTemplate(templateData: TemplateData): void {
+		templateData.templateDisposable.dispose();
+	}
+
+	/** Called to render a new element */
+	private doRender(element: ITreeElement, templateData: TemplateData, subjectElement?: ITreeElement) {
+		templateData.elementDisposable.clear();
+		templateData.elementDisposable.add(
+			element.onDidChange(() => this.doRender(element, templateData, subjectElement)),
+		);
+		this.doRenderInner(element, templateData, subjectElement);
+	}
+
+	/** Called, and may be re-called, to render or re-render an element */
+	private doRenderInner(element: ITreeElement, templateData: TemplateData, subjectElement: ITreeElement | undefined) {
+		let { label, labelWithIcons, description } = element;
+		if (subjectElement instanceof TestMessageElement) {
+			description = subjectElement.label;
+		}
+
+		const descriptionElement = description ? dom.$('span.test-label-description', {}, description) : '';
+		if (labelWithIcons) {
+			dom.reset(templateData.label, ...labelWithIcons, descriptionElement);
+		} else {
+			dom.reset(templateData.label, label, descriptionElement);
+		}
+
+		const icon = element.icon;
+		templateData.icon.className = `computed-state ${icon ? ThemeIcon.asClassName(icon) : ''}`;
+
+		const actions = this.treeActions.provideActionBar(element);
+		templateData.actionBar.clear();
+		templateData.actionBar.context = element.context;
+		templateData.actionBar.push(actions.primary, { icon: true, label: false });
+	}
+}
+
+class TreeActionsProvider {
+	constructor(
+		private readonly showRevealLocationOnMessages: boolean,
+		private readonly requestReveal: Emitter<InspectSubject>,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IMenuService private readonly menuService: IMenuService,
+		@ICommandService private readonly commandService: ICommandService,
+		@ITestProfileService private readonly testProfileService: ITestProfileService,
+		@IEditorService private readonly editorService: IEditorService,
+	) { }
+
+	public provideActionBar(element: ITreeElement) {
+		const test = element instanceof TestCaseElement ? element.test : undefined;
+		const capabilities = test ? this.testProfileService.capabilitiesForTest(test.item) : 0;
+
+		const contextKeys: [string, unknown][] = [
+			['peek', Testing.OutputPeekContributionId],
+			[TestingContextKeys.peekItemType.key, element.type],
+		];
+
+		let id = MenuId.TestPeekElement;
+		const primary: IAction[] = [];
+		const secondary: IAction[] = [];
+
+		if (element instanceof TaskElement) {
+			primary.push(new Action(
+				'testing.outputPeek.showResultOutput',
+				localize('testing.showResultOutput', "Show Result Output"),
+				ThemeIcon.asClassName(Codicon.terminal),
+				undefined,
+				() => this.requestReveal.fire(new TaskSubject(element.results, element.index)),
+			));
+			if (element.task.running) {
+				primary.push(new Action(
+					'testing.outputPeek.cancel',
+					localize('testing.cancelRun', 'Cancel Test Run'),
+					ThemeIcon.asClassName(icons.testingCancelIcon),
+					undefined,
+					() => this.commandService.executeCommand(TestCommandId.CancelTestRunAction, element.results.id, element.task.id),
+				));
+			}
+		}
+
+		if (element instanceof TestResultElement) {
+			// only show if there are no collapsed test nodes that have more specific choices
+			if (element.value.tasks.length === 1) {
+				primary.push(new Action(
+					'testing.outputPeek.showResultOutput',
+					localize('testing.showResultOutput', "Show Result Output"),
+					ThemeIcon.asClassName(Codicon.terminal),
+					undefined,
+					() => this.requestReveal.fire(new TaskSubject(element.value, 0)),
+				));
+			}
+
+			primary.push(new Action(
+				'testing.outputPeek.reRunLastRun',
+				localize('testing.reRunLastRun', "Rerun Test Run"),
+				ThemeIcon.asClassName(icons.testingRunIcon),
+				undefined,
+				() => this.commandService.executeCommand('testing.reRunLastRun', element.value.id),
+			));
+
+			if (capabilities & TestRunProfileBitset.Debug) {
+				primary.push(new Action(
+					'testing.outputPeek.debugLastRun',
+					localize('testing.debugLastRun', "Debug Test Run"),
+					ThemeIcon.asClassName(icons.testingDebugIcon),
+					undefined,
+					() => this.commandService.executeCommand('testing.debugLastRun', element.value.id),
+				));
+			}
+		}
+
+		if (element instanceof TestCaseElement || element instanceof TestMessageElement) {
+			contextKeys.push(
+				[TestingContextKeys.testResultOutdated.key, element.test.retired],
+				[TestingContextKeys.testResultState.key, testResultStateToContextValues[element.test.ownComputedState]],
+				...getTestItemContextOverlay(element.test, capabilities),
+			);
+
+			const extId = element.test.item.extId;
+			if (element.test.tasks[element.taskIndex].messages.some(m => m.type === TestMessageType.Output)) {
+				primary.push(new Action(
+					'testing.outputPeek.showResultOutput',
+					localize('testing.showResultOutput', "Show Result Output"),
+					ThemeIcon.asClassName(Codicon.terminal),
+					undefined,
+					() => this.requestReveal.fire(element.outputSubject),
+				));
+			}
+
+			secondary.push(new Action(
+				'testing.outputPeek.revealInExplorer',
+				localize('testing.revealInExplorer', "Reveal in Test Explorer"),
+				ThemeIcon.asClassName(Codicon.listTree),
+				undefined,
+				() => this.commandService.executeCommand('_revealTestInExplorer', extId),
+			));
+
+			if (capabilities & TestRunProfileBitset.Run) {
+				primary.push(new Action(
+					'testing.outputPeek.runTest',
+					localize('run test', 'Run Test'),
+					ThemeIcon.asClassName(icons.testingRunIcon),
+					undefined,
+					() => this.commandService.executeCommand('vscode.runTestsById', TestRunProfileBitset.Run, extId),
+				));
+			}
+
+			if (capabilities & TestRunProfileBitset.Debug) {
+				primary.push(new Action(
+					'testing.outputPeek.debugTest',
+					localize('debug test', 'Debug Test'),
+					ThemeIcon.asClassName(icons.testingDebugIcon),
+					undefined,
+					() => this.commandService.executeCommand('vscode.runTestsById', TestRunProfileBitset.Debug, extId),
+				));
+			}
+
+		}
+
+		if (element instanceof TestMessageElement) {
+			id = MenuId.TestMessageContext;
+			contextKeys.push([TestingContextKeys.testMessageContext.key, element.contextValue]);
+
+			primary.push(new Action(
+				'testing.outputPeek.goToTest',
+				localize('testing.goToTest', "Go to Test"),
+				ThemeIcon.asClassName(Codicon.goToFile),
+				undefined,
+				() => this.commandService.executeCommand('vscode.revealTest', element.test.item.extId),
+			));
+
+			if (this.showRevealLocationOnMessages && element.location) {
+				primary.push(new Action(
+					'testing.outputPeek.goToError',
+					localize('testing.goToError', "Go to Error"),
+					ThemeIcon.asClassName(Codicon.goToFile),
+					undefined,
+					() => this.editorService.openEditor({
+						resource: element.location!.uri,
+						options: {
+							selection: element.location!.range,
+							preserveFocus: true,
+						}
+					}),
+				));
+			}
+		}
+
+
+		const contextOverlay = this.contextKeyService.createOverlay(contextKeys);
+		const result = { primary, secondary };
+		const menu = this.menuService.getMenuActions(id, contextOverlay, { arg: element.context });
+		createAndFillInActionBarActions(menu, result, 'inline');
+		return result;
+	}
+}
+
+class CreationCache<T> {
+	private readonly v = new WeakMap<object, T>();
+
+	public get<T2 extends T = T>(key: object): T2 | undefined {
+		return this.v.get(key) as T2 | undefined;
+	}
+
+	public getOrCreate<T2 extends T>(ref: object, factory: () => T2): T2 {
+		const existing = this.v.get(ref);
+		if (existing) {
+			return existing as T2;
+		}
+
+		const fresh = factory();
+		this.v.set(ref, fresh);
+		return fresh;
+	}
+}
+
+const firstLine = (str: string) => {
+	const index = str.indexOf('\n');
+	return index === -1 ? str : str.slice(0, index);
+};
diff --git a/src/vs/workbench/contrib/testing/browser/testingOutputPeek.css b/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsViewContent.css
similarity index 100%
rename from src/vs/workbench/contrib/testing/browser/testingOutputPeek.css
rename to src/vs/workbench/contrib/testing/browser/testResultsView/testResultsViewContent.css
diff --git a/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsViewContent.ts b/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsViewContent.ts
new file mode 100644
index 00000000000..c43e1ecece7
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsViewContent.ts
@@ -0,0 +1,547 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from '../../../../../base/browser/dom.js';
+import { StandardKeyboardEvent } from '../../../../../base/browser/keyboardEvent.js';
+import { renderLabelWithIcons } from '../../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { Orientation, Sizing, SplitView } from '../../../../../base/browser/ui/splitview/splitview.js';
+import { findAsync } from '../../../../../base/common/arrays.js';
+import { Limiter } from '../../../../../base/common/async.js';
+import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { Emitter, Event, Relay } from '../../../../../base/common/event.js';
+import { KeyCode } from '../../../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { observableValue } from '../../../../../base/common/observable.js';
+import './testResultsViewContent.css';
+import { ICodeEditor } from '../../../../../editor/browser/editorBrowser.js';
+import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
+import { localize } from '../../../../../nls.js';
+import { FloatingClickMenu } from '../../../../../platform/actions/browser/floatingMenu.js';
+import { createActionViewItem } from '../../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { MenuWorkbenchToolBar } from '../../../../../platform/actions/browser/toolbar.js';
+import { Action2, MenuId, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { IContextKey, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
+import { IQuickInputService } from '../../../../../platform/quickinput/common/quickInput.js';
+import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.js';
+import { CustomStackFrame } from '../../../debug/browser/callStackWidget.js';
+import * as icons from '../icons.js';
+import { TestResultStackWidget } from './testMessageStack.js';
+import { DiffContentProvider, IPeekOutputRenderer, MarkdownTestMessagePeek, PlainTextMessagePeek, TerminalMessagePeek } from './testResultsOutput.js';
+import { equalsSubject, getSubjectTestItem, InspectSubject, MessageSubject, TaskSubject, TestOutputSubject } from './testResultsSubject.js';
+import { OutputPeekTree } from './testResultsTree.js';
+import { TestCommandId } from '../../common/constants.js';
+import { IObservableValue } from '../../common/observableValue.js';
+import { capabilityContextKeys, ITestProfileService } from '../../common/testProfileService.js';
+import { LiveTestResult } from '../../common/testResult.js';
+import { ITestFollowup, ITestService } from '../../common/testService.js';
+import { ITestMessageStackFrame, TestRunProfileBitset } from '../../common/testTypes.js';
+import { TestingContextKeys } from '../../common/testingContextKeys.js';
+
+const enum SubView {
+	Diff = 0,
+	History = 1,
+}
+
+/** UI state that can be saved/restored, used to give a nice experience when switching stack frames */
+export interface ITestResultsViewContentUiState {
+	splitViewWidths: number[];
+}
+
+class MessageStackFrame extends CustomStackFrame {
+	public override height = observableValue('MessageStackFrame.height', 100);
+	public override label: string;
+	public override icon = icons.testingViewIcon;
+
+	constructor(
+		private readonly message: HTMLElement,
+		private readonly followup: FollowupActionWidget,
+		private readonly subject: InspectSubject,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@ITestProfileService private readonly profileService: ITestProfileService,
+	) {
+		super();
+
+		this.label = subject instanceof MessageSubject
+			? subject.test.label
+			: subject instanceof TestOutputSubject
+				? subject.test.item.label
+				: subject.result.name;
+	}
+
+	public override render(container: HTMLElement): IDisposable {
+		this.message.style.visibility = 'visible';
+		container.appendChild(this.message);
+		return toDisposable(() => this.message.remove());
+	}
+
+	public override renderActions(container: HTMLElement): IDisposable {
+		const store = new DisposableStore();
+
+		container.appendChild(this.followup.domNode);
+		store.add(toDisposable(() => this.followup.domNode.remove()));
+
+		const test = getSubjectTestItem(this.subject);
+		const capabilities = test && this.profileService.capabilitiesForTest(test);
+		let contextKeyService: IContextKeyService;
+		if (capabilities) {
+			contextKeyService = this.contextKeyService.createOverlay(capabilityContextKeys(capabilities));
+		} else {
+			const profiles = this.profileService.getControllerProfiles(this.subject.controllerId);
+			contextKeyService = this.contextKeyService.createOverlay([
+				[TestingContextKeys.hasRunnableTests.key, profiles.some(p => p.group & TestRunProfileBitset.Run)],
+				[TestingContextKeys.hasDebuggableTests.key, profiles.some(p => p.group & TestRunProfileBitset.Debug)],
+			]);
+		}
+
+		const instaService = store.add(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, contextKeyService])));
+
+		const toolbar = store.add(instaService.createInstance(MenuWorkbenchToolBar, container, MenuId.TestCallStack, {
+			menuOptions: { shouldForwardArgs: true },
+			actionViewItemProvider: (action, options) => createActionViewItem(this.instantiationService, action, options),
+		}));
+		toolbar.context = this.subject;
+		store.add(toolbar);
+
+		return store;
+	}
+}
+
+function runInLast(accessor: ServicesAccessor, bitset: TestRunProfileBitset, subject: InspectSubject) {
+	// Let the full command do its thing if we want to run the whole set of tests
+	if (subject instanceof TaskSubject) {
+		return accessor.get(ICommandService).executeCommand(
+			bitset === TestRunProfileBitset.Debug ? TestCommandId.DebugLastRun : TestCommandId.ReRunLastRun,
+			subject.result.id,
+		);
+	}
+
+	const testService = accessor.get(ITestService);
+	const plainTest = subject instanceof MessageSubject ? subject.test : subject.test.item;
+	const currentTest = testService.collection.getNodeById(plainTest.extId);
+	if (!currentTest) {
+		return;
+	}
+
+	return testService.runTests({
+		group: bitset,
+		tests: [currentTest],
+	});
+}
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'testing.callStack.run',
+			title: localize('testing.callStack.run', "Rerun Test"),
+			icon: icons.testingRunIcon,
+			menu: {
+				id: MenuId.TestCallStack,
+				when: TestingContextKeys.hasRunnableTests,
+				group: 'navigation',
+			},
+		});
+	}
+
+	override run(accessor: ServicesAccessor, subject: InspectSubject): void {
+		runInLast(accessor, TestRunProfileBitset.Run, subject);
+	}
+});
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'testing.callStack.debug',
+			title: localize('testing.callStack.debug', "Debug Test"),
+			icon: icons.testingDebugIcon,
+			menu: {
+				id: MenuId.TestCallStack,
+				when: TestingContextKeys.hasDebuggableTests,
+				group: 'navigation',
+			},
+		});
+	}
+
+	override run(accessor: ServicesAccessor, subject: InspectSubject): void {
+		runInLast(accessor, TestRunProfileBitset.Debug, subject);
+	}
+});
+
+export class TestResultsViewContent extends Disposable {
+	private static lastSplitWidth?: number;
+
+	private readonly didReveal = this._register(new Emitter<{ subject: InspectSubject; preserveFocus: boolean }>());
+	private readonly currentSubjectStore = this._register(new DisposableStore());
+	private readonly onCloseEmitter = this._register(new Relay<void>());
+	private followupWidget!: FollowupActionWidget;
+	private messageContextKeyService!: IContextKeyService;
+	private contextKeyTestMessage!: IContextKey<string>;
+	private contextKeyResultOutdated!: IContextKey<boolean>;
+	private stackContainer!: HTMLElement;
+	private callStackWidget!: TestResultStackWidget;
+	private currentTopFrame?: MessageStackFrame;
+	private isDoingLayoutUpdate?: boolean;
+
+	private dimension?: dom.Dimension;
+	private splitView!: SplitView;
+	private messageContainer!: HTMLElement;
+	private contentProviders!: IPeekOutputRenderer[];
+	private contentProvidersUpdateLimiter = this._register(new Limiter(1));
+
+	public current?: InspectSubject;
+
+	/** Fired when a tree item is selected. Populated only on .fillBody() */
+	public onDidRequestReveal!: Event<InspectSubject>;
+
+	public readonly onClose = this.onCloseEmitter.event;
+
+	public get uiState(): ITestResultsViewContentUiState {
+		return {
+			splitViewWidths: Array.from(
+				{ length: this.splitView.length },
+				(_, i) => this.splitView.getViewSize(i)
+			),
+		};
+	}
+
+	constructor(
+		private readonly editor: ICodeEditor | undefined,
+		private readonly options: {
+			historyVisible: IObservableValue<boolean>;
+			showRevealLocationOnMessages: boolean;
+			locationForProgress: string;
+		},
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@ITextModelService protected readonly modelService: ITextModelService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
+	) {
+		super();
+	}
+
+	public fillBody(containerElement: HTMLElement): void {
+		const initialSpitWidth = TestResultsViewContent.lastSplitWidth;
+		this.splitView = new SplitView(containerElement, { orientation: Orientation.HORIZONTAL });
+
+		const { historyVisible, showRevealLocationOnMessages } = this.options;
+		const isInPeekView = this.editor !== undefined;
+
+		const messageContainer = this.messageContainer = dom.$('.test-output-peek-message-container');
+		this.stackContainer = dom.append(containerElement, dom.$('.test-output-call-stack-container'));
+		this.callStackWidget = this._register(this.instantiationService.createInstance(TestResultStackWidget, this.stackContainer, this.editor));
+		this.followupWidget = this._register(this.instantiationService.createInstance(FollowupActionWidget, this.editor));
+		this.onCloseEmitter.input = this.followupWidget.onClose;
+
+		this.contentProviders = [
+			this._register(this.instantiationService.createInstance(DiffContentProvider, this.editor, messageContainer)),
+			this._register(this.instantiationService.createInstance(MarkdownTestMessagePeek, messageContainer)),
+			this._register(this.instantiationService.createInstance(TerminalMessagePeek, messageContainer, isInPeekView)),
+			this._register(this.instantiationService.createInstance(PlainTextMessagePeek, this.editor, messageContainer)),
+		];
+
+		this.messageContextKeyService = this._register(this.contextKeyService.createScoped(containerElement));
+		this.contextKeyTestMessage = TestingContextKeys.testMessageContext.bindTo(this.messageContextKeyService);
+		this.contextKeyResultOutdated = TestingContextKeys.testResultOutdated.bindTo(this.messageContextKeyService);
+
+		const treeContainer = dom.append(containerElement, dom.$('.test-output-peek-tree'));
+		const tree = this._register(this.instantiationService.createInstance(
+			OutputPeekTree,
+			treeContainer,
+			this.didReveal.event,
+			{ showRevealLocationOnMessages, locationForProgress: this.options.locationForProgress },
+		));
+
+		this.onDidRequestReveal = tree.onDidRequestReview;
+
+		this.splitView.addView({
+			onDidChange: Event.None,
+			element: this.stackContainer,
+			minimumSize: 200,
+			maximumSize: Number.MAX_VALUE,
+			layout: width => {
+				TestResultsViewContent.lastSplitWidth = width;
+
+				if (this.dimension) {
+					this.callStackWidget?.layout(this.dimension.height, width);
+					this.layoutContentWidgets(this.dimension, width);
+				}
+			},
+		}, Sizing.Distribute);
+
+		this.splitView.addView({
+			onDidChange: Event.None,
+			element: treeContainer,
+			minimumSize: 100,
+			maximumSize: Number.MAX_VALUE,
+			layout: width => {
+				if (this.dimension) {
+					tree.layout(this.dimension.height, width);
+				}
+			},
+		}, Sizing.Distribute);
+
+
+		this.splitView.setViewVisible(SubView.History, historyVisible.value);
+		this._register(historyVisible.onDidChange(visible => {
+			this.splitView.setViewVisible(SubView.History, visible);
+		}));
+
+		if (initialSpitWidth) {
+			queueMicrotask(() => this.splitView.resizeView(0, initialSpitWidth));
+		}
+	}
+
+	/**
+	 * Shows a message in-place without showing or changing the peek location.
+	 * This is mostly used if peeking a message without a location.
+	 */
+	public reveal(opts: {
+		subject: InspectSubject;
+		preserveFocus: boolean;
+	}) {
+		this.didReveal.fire(opts);
+
+		if (this.current && equalsSubject(this.current, opts.subject)) {
+			return Promise.resolve();
+		}
+
+		this.current = opts.subject;
+		return this.contentProvidersUpdateLimiter.queue(async () => {
+			this.currentSubjectStore.clear();
+			const callFrames = this.getCallFrames(opts.subject) || [];
+			const topFrame = await this.prepareTopFrame(opts.subject, callFrames);
+			this.callStackWidget.update(topFrame, callFrames);
+
+			this.followupWidget.show(opts.subject);
+			this.populateFloatingClick(opts.subject);
+		});
+	}
+
+	/**
+	 * Collapses all displayed stack frames.
+	 */
+	public collapseStack() {
+		this.callStackWidget.collapseAll();
+	}
+
+	private getCallFrames(subject: InspectSubject) {
+		if (!(subject instanceof MessageSubject)) {
+			return undefined;
+		}
+		const frames = subject.stack;
+		if (!frames?.length || !this.editor) {
+			return frames;
+		}
+
+		// If the test extension just sets the top frame as the same location
+		// where the message is displayed, in the case of a peek in an editor,
+		// don't show it again because it's just a duplicate
+		const topFrame = frames[0];
+		const peekLocation = subject.revealLocation;
+		const isTopFrameSame = peekLocation && topFrame.position && topFrame.uri
+			&& topFrame.position.lineNumber === peekLocation.range.startLineNumber
+			&& topFrame.position.column === peekLocation.range.startColumn
+			&& this.uriIdentityService.extUri.isEqual(topFrame.uri, peekLocation.uri);
+
+		return isTopFrameSame ? frames.slice(1) : frames;
+	}
+
+	private async prepareTopFrame(subject: InspectSubject, callFrames: ITestMessageStackFrame[]) {
+		// ensure the messageContainer is in the DOM so renderers can calculate the
+		// dimensions before it's rendered in the list.
+		this.messageContainer.style.visibility = 'hidden';
+		this.stackContainer.appendChild(this.messageContainer);
+
+		const topFrame = this.currentTopFrame = this.instantiationService.createInstance(MessageStackFrame, this.messageContainer, this.followupWidget, subject);
+
+		const hasMultipleFrames = callFrames.length > 0;
+		topFrame.showHeader.set(hasMultipleFrames, undefined);
+
+		const provider = await findAsync(this.contentProviders, p => p.update(subject));
+		if (provider) {
+			if (this.dimension) {
+				topFrame.height.set(provider.layout(this.dimension, hasMultipleFrames)!, undefined);
+			}
+			if (provider.onDidContentSizeChange) {
+				this.currentSubjectStore.add(provider.onDidContentSizeChange(() => {
+					if (this.dimension && !this.isDoingLayoutUpdate) {
+						this.isDoingLayoutUpdate = true;
+						topFrame.height.set(provider.layout(this.dimension, hasMultipleFrames)!, undefined);
+						this.isDoingLayoutUpdate = false;
+					}
+				}));
+			}
+		}
+
+		return topFrame;
+	}
+
+	private layoutContentWidgets(dimension: dom.Dimension, width = this.splitView.getViewSize(SubView.Diff)) {
+		this.isDoingLayoutUpdate = true;
+		for (const provider of this.contentProviders) {
+			const frameHeight = provider.layout({ height: dimension.height, width }, !!this.currentTopFrame?.showHeader.get());
+			if (frameHeight) {
+				this.currentTopFrame?.height.set(frameHeight, undefined);
+			}
+		}
+		this.isDoingLayoutUpdate = false;
+	}
+
+	private populateFloatingClick(subject: InspectSubject) {
+		if (!(subject instanceof MessageSubject)) {
+			return;
+		}
+
+		this.currentSubjectStore.add(toDisposable(() => {
+			this.contextKeyResultOutdated.reset();
+			this.contextKeyTestMessage.reset();
+		}));
+
+		this.contextKeyTestMessage.set(subject.contextValue || '');
+		if (subject.result instanceof LiveTestResult) {
+			this.contextKeyResultOutdated.set(subject.result.getStateById(subject.test.extId)?.retired ?? false);
+			this.currentSubjectStore.add(subject.result.onChange(ev => {
+				if (ev.item.item.extId === subject.test.extId) {
+					this.contextKeyResultOutdated.set(ev.item.retired ?? false);
+				}
+			}));
+		} else {
+			this.contextKeyResultOutdated.set(true);
+		}
+
+		const instaService = this.currentSubjectStore.add(this.instantiationService
+			.createChild(new ServiceCollection([IContextKeyService, this.messageContextKeyService])));
+
+		this.currentSubjectStore.add(instaService.createInstance(FloatingClickMenu, {
+			container: this.messageContainer,
+			menuId: MenuId.TestMessageContent,
+			getActionArg: () => (subject as MessageSubject).context,
+		}));
+	}
+
+	public onLayoutBody(height: number, width: number) {
+		this.dimension = new dom.Dimension(width, height);
+		this.splitView.layout(width);
+	}
+
+	public onWidth(width: number) {
+		this.splitView.layout(width);
+	}
+}
+
+const FOLLOWUP_ANIMATION_MIN_TIME = 500;
+
+class FollowupActionWidget extends Disposable {
+	private readonly el = dom.h('div.testing-followup-action', []);
+	private readonly visibleStore = this._register(new DisposableStore());
+	private readonly onCloseEmitter = this._register(new Emitter<void>());
+	public readonly onClose = this.onCloseEmitter.event;
+
+	public get domNode() {
+		return this.el.root;
+	}
+
+	constructor(
+		private readonly editor: ICodeEditor | undefined,
+		@ITestService private readonly testService: ITestService,
+		@IQuickInputService private readonly quickInput: IQuickInputService,
+	) {
+		super();
+	}
+
+	public show(subject: InspectSubject) {
+		this.visibleStore.clear();
+		if (subject instanceof MessageSubject) {
+			this.showMessage(subject);
+		}
+	}
+
+	private async showMessage(subject: MessageSubject) {
+		const cts = this.visibleStore.add(new CancellationTokenSource());
+		const start = Date.now();
+
+		// Wait for completion otherwise results will not be available to the ext host:
+		if (subject.result instanceof LiveTestResult && !subject.result.completedAt) {
+			await new Promise(r => Event.once((subject.result as LiveTestResult).onComplete)(r));
+		}
+
+		const followups = await this.testService.provideTestFollowups({
+			extId: subject.test.extId,
+			messageIndex: subject.messageIndex,
+			resultId: subject.result.id,
+			taskIndex: subject.taskIndex,
+		}, cts.token);
+
+
+		if (!followups.followups.length || cts.token.isCancellationRequested) {
+			followups.dispose();
+			return;
+		}
+
+		this.visibleStore.add(followups);
+
+		dom.clearNode(this.el.root);
+		this.el.root.classList.toggle('animated', Date.now() - start > FOLLOWUP_ANIMATION_MIN_TIME);
+
+		this.el.root.appendChild(this.makeFollowupLink(followups.followups[0]));
+		if (followups.followups.length > 1) {
+			this.el.root.appendChild(this.makeMoreLink(followups.followups));
+		}
+
+		this.visibleStore.add(toDisposable(() => {
+			this.el.root.remove();
+		}));
+	}
+
+	private makeFollowupLink(first: ITestFollowup) {
+		const link = this.makeLink(() => this.actionFollowup(link, first));
+		dom.reset(link, ...renderLabelWithIcons(first.message));
+		return link;
+	}
+
+	private makeMoreLink(followups: ITestFollowup[]) {
+		const link = this.makeLink(() =>
+			this.quickInput.pick(followups.map((f, i) => ({
+				label: f.message,
+				index: i
+			}))).then(picked => {
+				if (picked?.length) {
+					followups[picked[0].index].execute();
+				}
+			})
+		);
+
+		link.innerText = localize('testFollowup.more', '+{0} More...', followups.length - 1);
+		return link;
+	}
+
+	private makeLink(onClick: () => void) {
+		const link = document.createElement('a');
+		link.tabIndex = 0;
+		this.visibleStore.add(dom.addDisposableListener(link, 'click', onClick));
+		this.visibleStore.add(dom.addDisposableListener(link, 'keydown', e => {
+			const event = new StandardKeyboardEvent(e);
+			if (event.equals(KeyCode.Space) || event.equals(KeyCode.Enter)) {
+				onClick();
+			}
+		}));
+
+		return link;
+	}
+
+	private actionFollowup(link: HTMLAnchorElement, fu: ITestFollowup) {
+		if (link.ariaDisabled !== 'true') {
+			link.ariaDisabled = 'true';
+			fu.execute();
+
+			if (this.editor) {
+				this.onCloseEmitter.fire();
+			}
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/testing/browser/testing.contribution.ts b/src/vs/workbench/contrib/testing/browser/testing.contribution.ts
index e422256e519..31b4073e7b4 100644
--- a/src/vs/workbench/contrib/testing/browser/testing.contribution.ts
+++ b/src/vs/workbench/contrib/testing/browser/testing.contribution.ts
@@ -3,51 +3,51 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { localize, localize2 } from 'vs/nls';
-import { registerAction2 } from 'vs/platform/actions/common/actions';
-import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
-import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IFileService } from 'vs/platform/files/common/files';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IProgressService } from 'vs/platform/progress/common/progress';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
-import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
-import { IViewContainersRegistry, IViewsRegistry, Extensions as ViewContainerExtensions, ViewContainerLocation } from 'vs/workbench/common/views';
-import { REVEAL_IN_EXPLORER_COMMAND_ID } from 'vs/workbench/contrib/files/browser/fileConstants';
-import { CodeCoverageDecorations } from 'vs/workbench/contrib/testing/browser/codeCoverageDecorations';
-import { testingResultsIcon, testingViewIcon } from 'vs/workbench/contrib/testing/browser/icons';
-import { TestCoverageView } from 'vs/workbench/contrib/testing/browser/testCoverageView';
-import { TestingDecorationService, TestingDecorations } from 'vs/workbench/contrib/testing/browser/testingDecorations';
-import { TestingExplorerView } from 'vs/workbench/contrib/testing/browser/testingExplorerView';
-import { CloseTestPeek, GoToNextMessageAction, GoToPreviousMessageAction, OpenMessageInEditorAction, TestResultsView, TestingOutputPeekController, TestingPeekOpener, ToggleTestingPeekHistory } from 'vs/workbench/contrib/testing/browser/testingOutputPeek';
-import { TestingProgressTrigger } from 'vs/workbench/contrib/testing/browser/testingProgressUiService';
-import { TestingViewPaneContainer } from 'vs/workbench/contrib/testing/browser/testingViewPaneContainer';
-import { testingConfiguration } from 'vs/workbench/contrib/testing/common/configuration';
-import { TestCommandId, Testing } from 'vs/workbench/contrib/testing/common/constants';
-import { ITestCoverageService, TestCoverageService } from 'vs/workbench/contrib/testing/common/testCoverageService';
-import { ITestExplorerFilterState, TestExplorerFilterState } from 'vs/workbench/contrib/testing/common/testExplorerFilterState';
-import { TestId, TestPosition } from 'vs/workbench/contrib/testing/common/testId';
-import { ITestProfileService, TestProfileService } from 'vs/workbench/contrib/testing/common/testProfileService';
-import { ITestResultService, TestResultService } from 'vs/workbench/contrib/testing/common/testResultService';
-import { ITestResultStorage, TestResultStorage } from 'vs/workbench/contrib/testing/common/testResultStorage';
-import { ITestService } from 'vs/workbench/contrib/testing/common/testService';
-import { TestService } from 'vs/workbench/contrib/testing/common/testServiceImpl';
-import { ITestItem, TestRunProfileBitset } from 'vs/workbench/contrib/testing/common/testTypes';
-import { TestingContentProvider } from 'vs/workbench/contrib/testing/common/testingContentProvider';
-import { TestingContextKeys } from 'vs/workbench/contrib/testing/common/testingContextKeys';
-import { ITestingContinuousRunService, TestingContinuousRunService } from 'vs/workbench/contrib/testing/common/testingContinuousRunService';
-import { ITestingDecorationsService } from 'vs/workbench/contrib/testing/common/testingDecorations';
-import { ITestingPeekOpener } from 'vs/workbench/contrib/testing/common/testingPeekOpener';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { allTestActions, discoverAndRunTests } from './testExplorerActions';
-import './testingConfigurationUi';
+import { EditorContributionInstantiation, registerEditorContribution } from '../../../../editor/browser/editorExtensions.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { CommandsRegistry, ICommandService } from '../../../../platform/commands/common/commands.js';
+import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IProgressService } from '../../../../platform/progress/common/progress.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { ViewPaneContainer } from '../../../browser/parts/views/viewPaneContainer.js';
+import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from '../../../common/contributions.js';
+import { IViewContainersRegistry, IViewsRegistry, Extensions as ViewContainerExtensions, ViewContainerLocation } from '../../../common/views.js';
+import { REVEAL_IN_EXPLORER_COMMAND_ID } from '../../files/browser/fileConstants.js';
+import { CodeCoverageDecorations } from './codeCoverageDecorations.js';
+import { testingResultsIcon, testingViewIcon } from './icons.js';
+import { TestCoverageView } from './testCoverageView.js';
+import { TestingDecorationService, TestingDecorations } from './testingDecorations.js';
+import { TestingExplorerView } from './testingExplorerView.js';
+import { CloseTestPeek, CollapsePeekStack, GoToNextMessageAction, GoToPreviousMessageAction, OpenMessageInEditorAction, TestResultsView, TestingOutputPeekController, TestingPeekOpener, ToggleTestingPeekHistory } from './testingOutputPeek.js';
+import { TestingProgressTrigger } from './testingProgressUiService.js';
+import { TestingViewPaneContainer } from './testingViewPaneContainer.js';
+import { testingConfiguration } from '../common/configuration.js';
+import { TestCommandId, Testing } from '../common/constants.js';
+import { ITestCoverageService, TestCoverageService } from '../common/testCoverageService.js';
+import { ITestExplorerFilterState, TestExplorerFilterState } from '../common/testExplorerFilterState.js';
+import { TestId, TestPosition } from '../common/testId.js';
+import { ITestProfileService, TestProfileService } from '../common/testProfileService.js';
+import { ITestResultService, TestResultService } from '../common/testResultService.js';
+import { ITestResultStorage, TestResultStorage } from '../common/testResultStorage.js';
+import { ITestService } from '../common/testService.js';
+import { TestService } from '../common/testServiceImpl.js';
+import { ITestItem, TestRunProfileBitset } from '../common/testTypes.js';
+import { TestingContentProvider } from '../common/testingContentProvider.js';
+import { TestingContextKeys } from '../common/testingContextKeys.js';
+import { ITestingContinuousRunService, TestingContinuousRunService } from '../common/testingContinuousRunService.js';
+import { ITestingDecorationsService } from '../common/testingDecorations.js';
+import { ITestingPeekOpener } from '../common/testingPeekOpener.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { allTestActions, discoverAndRunTests } from './testExplorerActions.js';
+import './testingConfigurationUi.js';
 
 registerSingleton(ITestService, TestService, InstantiationType.Delayed);
 registerSingleton(ITestResultStorage, TestResultStorage, InstantiationType.Delayed);
@@ -136,6 +136,7 @@ registerAction2(GoToPreviousMessageAction);
 registerAction2(GoToNextMessageAction);
 registerAction2(CloseTestPeek);
 registerAction2(ToggleTestingPeekHistory);
+registerAction2(CollapsePeekStack);
 
 Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(TestingContentProvider, LifecyclePhase.Restored);
 Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(TestingPeekOpener, LifecyclePhase.Eventually);
@@ -234,5 +235,15 @@ CommandsRegistry.registerCommand({
 	}
 });
 
+CommandsRegistry.registerCommand({
+	id: 'vscode.testing.getControllersWithTests',
+	handler: async (accessor: ServicesAccessor) => {
+		const testService = accessor.get(ITestService);
+		return [...testService.collection.rootItems]
+			.filter(r => r.children.size > 0)
+			.map(r => r.controllerId);
+	}
+});
+
 Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).registerConfiguration(testingConfiguration);
 
diff --git a/src/vs/workbench/contrib/testing/browser/testingConfigurationUi.ts b/src/vs/workbench/contrib/testing/browser/testingConfigurationUi.ts
index 9f8365fe663..de6bed1413d 100644
--- a/src/vs/workbench/contrib/testing/browser/testingConfigurationUi.ts
+++ b/src/vs/workbench/contrib/testing/browser/testingConfigurationUi.ts
@@ -3,17 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { groupBy } from 'vs/base/common/arrays';
-import { isDefined } from 'vs/base/common/types';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { localize } from 'vs/nls';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { QuickPickInput, IQuickPickItem, IQuickInputService, IQuickPickItemButtonEvent } from 'vs/platform/quickinput/common/quickInput';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { testingUpdateProfiles } from 'vs/workbench/contrib/testing/browser/icons';
-import { testConfigurationGroupNames } from 'vs/workbench/contrib/testing/common/constants';
-import { InternalTestItem, ITestRunProfile, TestRunProfileBitset } from 'vs/workbench/contrib/testing/common/testTypes';
-import { canUseProfileWithTest, ITestProfileService } from 'vs/workbench/contrib/testing/common/testProfileService';
+import { groupBy } from '../../../../base/common/arrays.js';
+import { isDefined } from '../../../../base/common/types.js';
+import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
+import { localize } from '../../../../nls.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { QuickPickInput, IQuickPickItem, IQuickInputService, IQuickPickItemButtonEvent } from '../../../../platform/quickinput/common/quickInput.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { testingUpdateProfiles } from './icons.js';
+import { testConfigurationGroupNames } from '../common/constants.js';
+import { InternalTestItem, ITestRunProfile, TestRunProfileBitset } from '../common/testTypes.js';
+import { canUseProfileWithTest, ITestProfileService } from '../common/testProfileService.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
 
 interface IConfigurationPickerOptions {
 	/** Placeholder text */
@@ -78,11 +79,11 @@ function buildPicker(accessor: ServicesAccessor, {
 		pushItems(profileService.getControllerProfiles(onlyForTest.controllerId).filter(p => canUseProfileWithTest(p, onlyForTest)));
 	} else {
 		for (const { profiles, controller } of profileService.all()) {
-			pushItems(profiles, controller.label.value);
+			pushItems(profiles, controller.label.get());
 		}
 	}
 
-	const quickpick = accessor.get(IQuickInputService).createQuickPick<IQuickPickItem & { profile: ITestRunProfile }>();
+	const quickpick = accessor.get(IQuickInputService).createQuickPick<IQuickPickItem & { profile: ITestRunProfile }>({ useSeparators: true });
 	quickpick.items = items;
 	quickpick.placeholder = placeholder;
 	return quickpick;
@@ -108,6 +109,9 @@ CommandsRegistry.registerCommand({
 			return;
 		}
 
+		const disposables = new DisposableStore();
+		disposables.add(quickpick);
+
 		quickpick.canSelectMany = true;
 		if (options.selected) {
 			quickpick.selectedItems = quickpick.items
@@ -116,16 +120,16 @@ CommandsRegistry.registerCommand({
 		}
 
 		const pick = await new Promise<ITestRunProfile[] | undefined>(resolve => {
-			quickpick.onDidAccept(() => {
+			disposables.add(quickpick.onDidAccept(() => {
 				const selected = quickpick.selectedItems as readonly { profile?: ITestRunProfile }[];
 				resolve(selected.map(s => s.profile).filter(isDefined));
-			});
-			quickpick.onDidHide(() => resolve(undefined));
-			quickpick.onDidTriggerItemButton(triggerButtonHandler(profileService, resolve));
+			}));
+			disposables.add(quickpick.onDidHide(() => resolve(undefined)));
+			disposables.add(quickpick.onDidTriggerItemButton(triggerButtonHandler(profileService, resolve)));
 			quickpick.show();
 		});
 
-		quickpick.dispose();
+		disposables.dispose();
 		return pick;
 	}
 });
@@ -139,14 +143,17 @@ CommandsRegistry.registerCommand({
 			return;
 		}
 
+		const disposables = new DisposableStore();
+		disposables.add(quickpick);
+
 		const pick = await new Promise<ITestRunProfile | undefined>(resolve => {
-			quickpick.onDidAccept(() => resolve((quickpick.selectedItems[0] as { profile?: ITestRunProfile })?.profile));
-			quickpick.onDidHide(() => resolve(undefined));
-			quickpick.onDidTriggerItemButton(triggerButtonHandler(profileService, resolve));
+			disposables.add(quickpick.onDidAccept(() => resolve((quickpick.selectedItems[0] as { profile?: ITestRunProfile })?.profile)));
+			disposables.add(quickpick.onDidHide(() => resolve(undefined)));
+			disposables.add(quickpick.onDidTriggerItemButton(triggerButtonHandler(profileService, resolve)));
 			quickpick.show();
 		});
 
-		quickpick.dispose();
+		disposables.dispose();
 		return pick;
 	}
 });
diff --git a/src/vs/workbench/contrib/testing/browser/testingDecorations.ts b/src/vs/workbench/contrib/testing/browser/testingDecorations.ts
index 9afbdafa192..2ce03d5ece8 100644
--- a/src/vs/workbench/contrib/testing/browser/testingDecorations.ts
+++ b/src/vs/workbench/contrib/testing/browser/testingDecorations.ts
@@ -3,56 +3,58 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { Action, IAction, Separator, SubmenuAction } from 'vs/base/common/actions';
-import { equals } from 'vs/base/common/arrays';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IMarkdownString, MarkdownString } from 'vs/base/common/htmlContent';
-import { stripIcons } from 'vs/base/common/iconLabels';
-import { Iterable } from 'vs/base/common/iterator';
-import { Disposable, DisposableStore, IReference, MutableDisposable } from 'vs/base/common/lifecycle';
-import { ResourceMap } from 'vs/base/common/map';
-import { isMacintosh } from 'vs/base/common/platform';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { Constants } from 'vs/base/common/uint';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { ContentWidgetPositionPreference, ICodeEditor, IContentWidgetPosition, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { overviewRulerError, overviewRulerInfo } from 'vs/editor/common/core/editorColorRegistry';
-import { IRange } from 'vs/editor/common/core/range';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { GlyphMarginLane, IModelDeltaDecoration, ITextModel, OverviewRulerLane, TrackedRangeStickiness } from 'vs/editor/common/model';
-import { IModelService } from 'vs/editor/common/services/model';
-import { localize } from 'vs/nls';
-import { createAndFillInContextMenuActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IMenuService, MenuId } from 'vs/platform/actions/common/actions';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { themeColorFromId } from 'vs/platform/theme/common/themeService';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { EditorLineNumberContextMenu, GutterActionsRegistry } from 'vs/workbench/contrib/codeEditor/browser/editorLineNumberMenu';
-import { getTestItemContextOverlay } from 'vs/workbench/contrib/testing/browser/explorerProjections/testItemContextOverlay';
-import { testingRunAllIcon, testingRunIcon, testingStatesToIcons } from 'vs/workbench/contrib/testing/browser/icons';
-import { renderTestMessageAsText } from 'vs/workbench/contrib/testing/browser/testMessageColorizer';
-import { DefaultGutterClickAction, TestingConfigKeys, getTestingConfiguration } from 'vs/workbench/contrib/testing/common/configuration';
-import { Testing, labelForTestInState } from 'vs/workbench/contrib/testing/common/constants';
-import { TestId } from 'vs/workbench/contrib/testing/common/testId';
-import { ITestProfileService } from 'vs/workbench/contrib/testing/common/testProfileService';
-import { ITestResult, LiveTestResult } from 'vs/workbench/contrib/testing/common/testResult';
-import { ITestResultService } from 'vs/workbench/contrib/testing/common/testResultService';
-import { ITestService, getContextForTestItem, testsInFile } from 'vs/workbench/contrib/testing/common/testService';
-import { IRichLocation, ITestMessage, ITestRunProfile, IncrementalTestCollectionItem, InternalTestItem, TestDiffOpType, TestMessageType, TestResultItem, TestResultState, TestRunProfileBitset } from 'vs/workbench/contrib/testing/common/testTypes';
-import { ITestDecoration as IPublicTestDecoration, ITestingDecorationsService, TestDecorations } from 'vs/workbench/contrib/testing/common/testingDecorations';
-import { ITestingPeekOpener } from 'vs/workbench/contrib/testing/common/testingPeekOpener';
-import { isFailedState, maxPriority } from 'vs/workbench/contrib/testing/common/testingStates';
-import { TestUriType, buildTestUri, parseTestUri } from 'vs/workbench/contrib/testing/common/testingUri';
+import * as dom from '../../../../base/browser/dom.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { Action, IAction, Separator, SubmenuAction } from '../../../../base/common/actions.js';
+import { equals } from '../../../../base/common/arrays.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { IMarkdownString, MarkdownString } from '../../../../base/common/htmlContent.js';
+import { stripIcons } from '../../../../base/common/iconLabels.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore, IReference, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { isMacintosh } from '../../../../base/common/platform.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { Constants } from '../../../../base/common/uint.js';
+import { URI } from '../../../../base/common/uri.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { ContentWidgetPositionPreference, ICodeEditor, IContentWidgetPosition, IEditorMouseEvent, MouseTargetType } from '../../../../editor/browser/editorBrowser.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
+import { overviewRulerError, overviewRulerInfo } from '../../../../editor/common/core/editorColorRegistry.js';
+import { IRange } from '../../../../editor/common/core/range.js';
+import { IEditorContribution } from '../../../../editor/common/editorCommon.js';
+import { GlyphMarginLane, IModelDecorationOptions, IModelDeltaDecoration, ITextModel, OverviewRulerLane, TrackedRangeStickiness } from '../../../../editor/common/model.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { localize } from '../../../../nls.js';
+import { createAndFillInContextMenuActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IMenuService, MenuId } from '../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IQuickInputService, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
+import { themeColorFromId } from '../../../../platform/theme/common/themeService.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { EditorLineNumberContextMenu, GutterActionsRegistry } from '../../codeEditor/browser/editorLineNumberMenu.js';
+import { getTestItemContextOverlay } from './explorerProjections/testItemContextOverlay.js';
+import { testingDebugAllIcon, testingDebugIcon, testingRunAllIcon, testingRunIcon, testingStatesToIcons } from './icons.js';
+import { renderTestMessageAsText } from './testMessageColorizer.js';
+import { DefaultGutterClickAction, TestingConfigKeys, getTestingConfiguration } from '../common/configuration.js';
+import { Testing, labelForTestInState } from '../common/constants.js';
+import { TestId } from '../common/testId.js';
+import { ITestProfileService } from '../common/testProfileService.js';
+import { ITestResult, LiveTestResult } from '../common/testResult.js';
+import { ITestResultService } from '../common/testResultService.js';
+import { ITestService, getContextForTestItem, simplifyTestsToExecute, testsInFile } from '../common/testService.js';
+import { IRichLocation, ITestMessage, ITestRunProfile, IncrementalTestCollectionItem, InternalTestItem, TestDiffOpType, TestMessageType, TestResultItem, TestResultState, TestRunProfileBitset } from '../common/testTypes.js';
+import { ITestDecoration as IPublicTestDecoration, ITestingDecorationsService, TestDecorations } from '../common/testingDecorations.js';
+import { ITestingPeekOpener } from '../common/testingPeekOpener.js';
+import { isFailedState, maxPriority } from '../common/testingStates.js';
+import { TestUriType, buildTestUri, parseTestUri } from '../common/testingUri.js';
 
 const MAX_INLINE_MESSAGE_LENGTH = 128;
 const MAX_TESTS_IN_SUBMENU = 30;
@@ -147,6 +149,7 @@ export class TestingDecorationService extends Disposable implements ITestingDeco
 		rangeUpdateVersionId?: number;
 		/** Counter for the results rendered in the document */
 		generation: number;
+		isAlt?: boolean;
 		value: CachedDecorations;
 	}>();
 
@@ -277,6 +280,29 @@ export class TestingDecorationService extends Disposable implements ITestingDeco
 		this.changeEmitter.fire();
 	}
 
+	/**
+	 * Sets whether alternate actions are shown for the model.
+	 */
+	public updateDecorationsAlternateAction(resource: URI, isAlt: boolean) {
+		const model = this.modelService.getModel(resource);
+		const cached = this.decorationCache.get(resource);
+		if (!model || !cached || cached.isAlt === isAlt) {
+			return;
+		}
+
+		cached.isAlt = isAlt;
+		model.changeDecorations(accessor => {
+			for (const decoration of cached.value) {
+				if (decoration instanceof RunTestDecoration && decoration.editorDecoration.alternate) {
+					accessor.changeDecorationOptions(
+						decoration.id,
+						isAlt ? decoration.editorDecoration.alternate : decoration.editorDecoration.options,
+					);
+				}
+			}
+		});
+	}
+
 	/**
 	 * Applies the current set of test decorations to the given text model.
 	 */
@@ -431,6 +457,29 @@ export class TestingDecorations extends Disposable implements IEditorContributio
 				decorations.syncDecorations(this._currentUri);
 			}
 		}));
+
+		const win = dom.getWindow(editor.getDomNode());
+		this._register(dom.addDisposableListener(win, 'keydown', e => {
+			if (new StandardKeyboardEvent(e).keyCode === KeyCode.Alt && this._currentUri) {
+				decorations.updateDecorationsAlternateAction(this._currentUri, true);
+			}
+		}));
+		this._register(dom.addDisposableListener(win, 'keyup', e => {
+			if (new StandardKeyboardEvent(e).keyCode === KeyCode.Alt && this._currentUri) {
+				decorations.updateDecorationsAlternateAction(this._currentUri, false);
+			}
+		}));
+		this._register(dom.addDisposableListener(win, 'blur', () => {
+			if (this._currentUri) {
+				decorations.updateDecorationsAlternateAction(this._currentUri, false);
+			}
+		}));
+
+		this._register(this.editor.onKeyUp(e => {
+			if (e.keyCode === KeyCode.Alt && this._currentUri) {
+				decorations.updateDecorationsAlternateAction(this._currentUri!, false);
+			}
+		}));
 		this._register(this.editor.onDidChangeModel(e => this.attachModel(e.newModelUrl || undefined)));
 		this._register(this.editor.onMouseDown(e => {
 			if (e.target.position && this.currentUri) {
@@ -531,14 +580,22 @@ const collapseRange = (originalRange: IRange) => ({
 	endColumn: originalRange.startColumn,
 });
 
-const createRunTestDecoration = (tests: readonly IncrementalTestCollectionItem[], states: readonly (TestResultItem | undefined)[], visible: boolean): IModelDeltaDecoration => {
+const createRunTestDecoration = (
+	tests: readonly IncrementalTestCollectionItem[],
+	states: readonly (TestResultItem | undefined)[],
+	visible: boolean,
+	defaultGutterAction: DefaultGutterClickAction,
+): IModelDeltaDecoration & { alternate?: IModelDecorationOptions } => {
 	const range = tests[0]?.item.range;
 	if (!range) {
 		throw new Error('Test decorations can only be created for tests with a range');
 	}
 
 	if (!visible) {
-		return { range: collapseRange(range), options: { isWholeLine: true, description: 'run-test-decoration' } };
+		return {
+			range: collapseRange(range),
+			options: { isWholeLine: true, description: 'run-test-decoration' },
+		};
 	}
 
 	let computedState = TestResultState.Unset;
@@ -560,38 +617,51 @@ const createRunTestDecoration = (tests: readonly IncrementalTestCollectionItem[]
 	}
 
 	const hasMultipleTests = tests.length > 1 || tests[0].children.size > 0;
-	const icon = computedState === TestResultState.Unset
+
+	const primaryIcon = computedState === TestResultState.Unset
 		? (hasMultipleTests ? testingRunAllIcon : testingRunIcon)
 		: testingStatesToIcons.get(computedState)!;
 
+	const alternateIcon = defaultGutterAction === DefaultGutterClickAction.Debug
+		? (hasMultipleTests ? testingRunAllIcon : testingRunIcon)
+		: (hasMultipleTests ? testingDebugAllIcon : testingDebugIcon);
+
 	let hoverMessage: IMarkdownString | undefined;
 
-	let glyphMarginClassName = ThemeIcon.asClassName(icon) + ' testing-run-glyph';
+	let glyphMarginClassName = 'testing-run-glyph';
 	if (retired) {
 		glyphMarginClassName += ' retired';
 	}
 
+	const defaultOptions: IModelDecorationOptions = {
+		description: 'run-test-decoration',
+		showIfCollapsed: true,
+		get hoverMessage() {
+			if (!hoverMessage) {
+				const building = hoverMessage = new MarkdownString('', true).appendText(hoverMessageParts.join(', ') + '.');
+				if (testIdWithMessages) {
+					const args = encodeURIComponent(JSON.stringify([testIdWithMessages]));
+					building.appendMarkdown(` [${localize('peekTestOutout', 'Peek Test Output')}](command:vscode.peekTestError?${args})`);
+				}
+			}
+
+			return hoverMessage;
+		},
+		glyphMargin: { position: GLYPH_MARGIN_LANE },
+		glyphMarginClassName: `${ThemeIcon.asClassName(primaryIcon)} ${glyphMarginClassName}`,
+		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
+		zIndex: 10000,
+	};
+
+	const alternateOptions: IModelDecorationOptions = {
+		...defaultOptions,
+		glyphMarginClassName: `${ThemeIcon.asClassName(alternateIcon)} ${glyphMarginClassName}`,
+	};
+
 	return {
 		range: collapseRange(range),
-		options: {
-			description: 'run-test-decoration',
-			showIfCollapsed: true,
-			get hoverMessage() {
-				if (!hoverMessage) {
-					const building = hoverMessage = new MarkdownString('', true).appendText(hoverMessageParts.join(', ') + '.');
-					if (testIdWithMessages) {
-						const args = encodeURIComponent(JSON.stringify([testIdWithMessages]));
-						building.appendMarkdown(` [${localize('peekTestOutout', 'Peek Test Output')}](command:vscode.peekTestError?${args})`);
-					}
-				}
-
-				return hoverMessage;
-			},
-			glyphMargin: { position: GLYPH_MARGIN_LANE },
-			glyphMarginClassName,
-			stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
-			zIndex: 10000,
-		}
+		options: defaultOptions,
+		alternate: alternateOptions,
 	};
 };
 
@@ -716,7 +786,7 @@ abstract class RunTestDecoration {
 		return this.tests.map(t => t.test.item.extId);
 	}
 
-	public editorDecoration: IModelDeltaDecoration;
+	public editorDecoration: IModelDeltaDecoration & { alternate?: IModelDecorationOptions };
 	public displayedStates: readonly (TestResultState | undefined)[];
 
 	constructor(
@@ -736,7 +806,12 @@ abstract class RunTestDecoration {
 		@IMenuService protected readonly menuService: IMenuService,
 	) {
 		this.displayedStates = tests.map(t => t.resultItem?.computedState);
-		this.editorDecoration = createRunTestDecoration(tests.map(t => t.test), tests.map(t => t.resultItem), visible);
+		this.editorDecoration = createRunTestDecoration(
+			tests.map(t => t.test),
+			tests.map(t => t.resultItem),
+			visible,
+			getTestingConfiguration(this.configurationService, TestingConfigKeys.DefaultGutterClickAction),
+		);
 		this.editorDecoration.options.glyphMarginHoverMessage = new MarkdownString().appendText(this.getGutterLabel());
 	}
 
@@ -787,7 +862,16 @@ abstract class RunTestDecoration {
 		this.tests = newTests;
 		this.displayedStates = displayedStates;
 		this.visible = visible;
-		this.editorDecoration.options = createRunTestDecoration(newTests.map(t => t.test), newTests.map(t => t.resultItem), visible).options;
+
+		const { options, alternate } = createRunTestDecoration(
+			newTests.map(t => t.test),
+			newTests.map(t => t.resultItem),
+			visible,
+			getTestingConfiguration(this.configurationService, TestingConfigKeys.DefaultGutterClickAction)
+		);
+
+		this.editorDecoration.options = options;
+		this.editorDecoration.alternate = alternate;
 		this.editorDecoration.options.glyphMarginHoverMessage = new MarkdownString().appendText(this.getGutterLabel());
 		return true;
 	}
@@ -806,7 +890,7 @@ abstract class RunTestDecoration {
 
 	protected runWith(profile: TestRunProfileBitset) {
 		return this.testService.runTests({
-			tests: this.tests.map(({ test }) => test),
+			tests: simplifyTestsToExecute(this.testService.collection, this.tests.map(({ test }) => test)),
 			group: profile,
 		});
 	}
@@ -835,7 +919,7 @@ abstract class RunTestDecoration {
 	 */
 	protected getTestContextMenuActions(test: InternalTestItem, resultItem?: TestResultItem): IReference<IAction[]> {
 		const testActions: IAction[] = [];
-		const capabilities = this.testProfileService.capabilitiesForTest(test);
+		const capabilities = this.testProfileService.capabilitiesForTest(test.item);
 
 		[
 			{ bitset: TestRunProfileBitset.Run, label: localize('run test', 'Run Test') },
@@ -880,16 +964,12 @@ abstract class RunTestDecoration {
 
 	private getContributedTestActions(test: InternalTestItem, capabilities: number): IAction[] {
 		const contextOverlay = this.contextKeyService.createOverlay(getTestItemContextOverlay(test, capabilities));
-		const menu = this.menuService.createMenu(MenuId.TestItemGutter, contextOverlay);
 
-		try {
-			const target: IAction[] = [];
-			const arg = getContextForTestItem(this.testService.collection, test.item.extId);
-			createAndFillInContextMenuActions(menu, { shouldForwardArgs: true, arg }, target);
-			return target;
-		} finally {
-			menu.dispose();
-		}
+		const target: IAction[] = [];
+		const arg = getContextForTestItem(this.testService.collection, test.item.extId);
+		const menu = this.menuService.getMenuActions(MenuId.TestItemGutter, contextOverlay, { shouldForwardArgs: true, arg });
+		createAndFillInContextMenuActions(menu, target);
+		return target;
 	}
 }
 
@@ -931,7 +1011,7 @@ class MultiRunTestDecoration extends RunTestDecoration implements ITestDecoratio
 			{ bitset: TestRunProfileBitset.Coverage, label: localize('run all test with coverage', 'Run All Tests with Coverage') },
 			{ bitset: TestRunProfileBitset.Debug, label: localize('debug all test', 'Debug All Tests') },
 		].forEach(({ bitset, label }, i) => {
-			const canRun = this.tests.some(({ test }) => this.testProfileService.capabilitiesForTest(test) & bitset);
+			const canRun = this.tests.some(({ test }) => this.testProfileService.capabilitiesForTest(test.item) & bitset);
 			if (canRun) {
 				allActions.push(new Action(`testing.gutter.run${i}`, label, undefined, undefined, () => this.runWith(bitset)));
 			}
@@ -1002,17 +1082,18 @@ class MultiRunTestDecoration extends RunTestDecoration implements ITestDecoratio
 
 	private async pickAndRun(testItems: IMultiRunTest[]) {
 		const doPick = <T extends IQuickPickItem>(items: T[], title: string) => new Promise<T | undefined>(resolve => {
-			const pick = this.quickInputService.createQuickPick<T>();
+			const disposables = new DisposableStore();
+			const pick = disposables.add(this.quickInputService.createQuickPick<T>());
 			pick.placeholder = title;
 			pick.items = items;
-			pick.onDidHide(() => {
+			disposables.add(pick.onDidHide(() => {
 				resolve(undefined);
-				pick.dispose();
-			});
-			pick.onDidAccept(() => {
+				disposables.dispose();
+			}));
+			disposables.add(pick.onDidAccept(() => {
 				resolve(pick.selectedItems[0]);
-				pick.dispose();
-			});
+				disposables.dispose();
+			}));
 			pick.show();
 		});
 
diff --git a/src/vs/workbench/contrib/testing/browser/testingExplorerFilter.ts b/src/vs/workbench/contrib/testing/browser/testingExplorerFilter.ts
index 6f90138b102..0894eeca52b 100644
--- a/src/vs/workbench/contrib/testing/browser/testingExplorerFilter.ts
+++ b/src/vs/workbench/contrib/testing/browser/testingExplorerFilter.ts
@@ -3,31 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { BaseActionViewItem, IActionViewItemOptions, IBaseActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { AnchorAlignment } from 'vs/base/browser/ui/contextview/contextview';
-import { DropdownMenuActionViewItem } from 'vs/base/browser/ui/dropdown/dropdownActionViewItem';
-import { Action, IAction, IActionRunner, Separator } from 'vs/base/common/actions';
-import { Delayer } from 'vs/base/common/async';
-import { Emitter } from 'vs/base/common/event';
-import { Iterable } from 'vs/base/common/iterator';
-import { localize } from 'vs/nls';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { ContextScopedSuggestEnabledInputWithHistory, SuggestEnabledInputWithHistory, SuggestResultsProvider } from 'vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput';
-import { testingFilterIcon } from 'vs/workbench/contrib/testing/browser/icons';
-import { StoredValue } from 'vs/workbench/contrib/testing/common/storedValue';
-import { ITestExplorerFilterState, TestFilterTerm } from 'vs/workbench/contrib/testing/common/testExplorerFilterState';
-import { ITestService } from 'vs/workbench/contrib/testing/common/testService';
-import { denamespaceTestTag } from 'vs/workbench/contrib/testing/common/testTypes';
+import * as dom from '../../../../base/browser/dom.js';
+import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { BaseActionViewItem, IActionViewItemOptions, IBaseActionViewItemOptions } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { AnchorAlignment } from '../../../../base/browser/ui/contextview/contextview.js';
+import { DropdownMenuActionViewItem } from '../../../../base/browser/ui/dropdown/dropdownActionViewItem.js';
+import { Action, IAction, IActionRunner, Separator } from '../../../../base/common/actions.js';
+import { Delayer } from '../../../../base/common/async.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { localize } from '../../../../nls.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { ContextScopedSuggestEnabledInputWithHistory, SuggestEnabledInputWithHistory, SuggestResultsProvider } from '../../codeEditor/browser/suggestEnabledInput/suggestEnabledInput.js';
+import { testingFilterIcon } from './icons.js';
+import { StoredValue } from '../common/storedValue.js';
+import { ITestExplorerFilterState, TestFilterTerm } from '../common/testExplorerFilterState.js';
+import { ITestService } from '../common/testService.js';
+import { denamespaceTestTag } from '../common/testTypes.js';
 
 const testFilterDescriptions: { [K in TestFilterTerm]: string } = {
 	[TestFilterTerm.Failed]: localize('testing.filters.showOnlyFailed', "Show Only Failed Tests"),
 	[TestFilterTerm.Executed]: localize('testing.filters.showOnlyExecuted', "Show Only Executed Tests"),
 	[TestFilterTerm.CurrentDoc]: localize('testing.filters.currentFile', "Show in Active File Only"),
+	[TestFilterTerm.OpenedFiles]: localize('testing.filters.openedFiles', "Show in Opened Files Only"),
 	[TestFilterTerm.Hidden]: localize('testing.filters.showExcludedTests', "Show Hidden Tests"),
 };
 
@@ -201,7 +202,7 @@ class FiltersDropdownMenuActionViewItem extends DropdownMenuActionViewItem {
 
 	private getActions(): IAction[] {
 		return [
-			...[TestFilterTerm.Failed, TestFilterTerm.Executed, TestFilterTerm.CurrentDoc].map(term => ({
+			...[TestFilterTerm.Failed, TestFilterTerm.Executed, TestFilterTerm.CurrentDoc, TestFilterTerm.OpenedFiles].map(term => ({
 				checked: this.filters.isFilteringFor(term),
 				class: undefined,
 				enabled: true,
diff --git a/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts b/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
index b0b0b73cba4..504ec9f9dd1 100644
--- a/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
+++ b/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
@@ -3,82 +3,84 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { IActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { ActionBar, IActionViewItem } from 'vs/base/browser/ui/actionbar/actionbar';
-import { Button } from 'vs/base/browser/ui/button/button';
-import type { IManagedHover } from 'vs/base/browser/ui/hover/hover';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
-import { IIdentityProvider, IKeyboardNavigationLabelProvider, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { DefaultKeyboardNavigationDelegate, IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
-import { ITreeContextMenuEvent, ITreeFilter, ITreeNode, ITreeRenderer, ITreeSorter, TreeFilterResult, TreeVisibility } from 'vs/base/browser/ui/tree/tree';
-import { Action, ActionRunner, IAction, Separator } from 'vs/base/common/actions';
-import { mapFindFirst } from 'vs/base/common/arraysFind';
-import { RunOnceScheduler, disposableTimeout } from 'vs/base/common/async';
-import { Color, RGBA } from 'vs/base/common/color';
-import { Emitter, Event } from 'vs/base/common/event';
-import { FuzzyScore } from 'vs/base/common/filters';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { Disposable, DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
-import { fuzzyContains } from 'vs/base/common/strings';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { isDefined } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import 'vs/css!./media/testing';
-import { MarkdownRenderer } from 'vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
-import { localize } from 'vs/nls';
-import { DropdownWithPrimaryActionViewItem } from 'vs/platform/actions/browser/dropdownWithPrimaryActionViewItem';
-import { MenuEntryActionViewItem, createActionViewItem, createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IMenuService, MenuId, MenuItemAction } from 'vs/platform/actions/common/actions';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { UnmanagedProgress } from 'vs/platform/progress/common/progress';
-import { IStorageService, StorageScope, StorageTarget, WillSaveStateReason } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { defaultButtonStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { foreground } from 'vs/platform/theme/common/colorRegistry';
-import { spinningLoading } from 'vs/platform/theme/common/iconRegistry';
-import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { registerNavigableContainer } from 'vs/workbench/browser/actions/widgetNavigationCommands';
-import { ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
-import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
-import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
-import { IViewDescriptorService } from 'vs/workbench/common/views';
-import { ITestTreeProjection, TestExplorerTreeElement, TestItemTreeElement, TestTreeErrorMessage } from 'vs/workbench/contrib/testing/browser/explorerProjections/index';
-import { ListProjection } from 'vs/workbench/contrib/testing/browser/explorerProjections/listProjection';
-import { getTestItemContextOverlay } from 'vs/workbench/contrib/testing/browser/explorerProjections/testItemContextOverlay';
-import { TestingObjectTree } from 'vs/workbench/contrib/testing/browser/explorerProjections/testingObjectTree';
-import { ISerializedTestTreeCollapseState } from 'vs/workbench/contrib/testing/browser/explorerProjections/testingViewState';
-import { TreeProjection } from 'vs/workbench/contrib/testing/browser/explorerProjections/treeProjection';
-import * as icons from 'vs/workbench/contrib/testing/browser/icons';
-import { DebugLastRun, ReRunLastRun } from 'vs/workbench/contrib/testing/browser/testExplorerActions';
-import { TestingExplorerFilter } from 'vs/workbench/contrib/testing/browser/testingExplorerFilter';
-import { CountSummary, collectTestStateCounts, getTestProgressText } from 'vs/workbench/contrib/testing/browser/testingProgressUiService';
-import { TestingConfigKeys, TestingCountBadge, getTestingConfiguration } from 'vs/workbench/contrib/testing/common/configuration';
-import { TestCommandId, TestExplorerViewMode, TestExplorerViewSorting, Testing, labelForTestInState } from 'vs/workbench/contrib/testing/common/constants';
-import { StoredValue } from 'vs/workbench/contrib/testing/common/storedValue';
-import { ITestExplorerFilterState, TestExplorerFilterState, TestFilterTerm } from 'vs/workbench/contrib/testing/common/testExplorerFilterState';
-import { TestId } from 'vs/workbench/contrib/testing/common/testId';
-import { ITestProfileService, canUseProfileWithTest } from 'vs/workbench/contrib/testing/common/testProfileService';
-import { LiveTestResult, TestResultItemChangeReason } from 'vs/workbench/contrib/testing/common/testResult';
-import { ITestResultService } from 'vs/workbench/contrib/testing/common/testResultService';
-import { IMainThreadTestCollection, ITestService, testCollectionIsEmpty } from 'vs/workbench/contrib/testing/common/testService';
-import { ITestRunProfile, InternalTestItem, TestItemExpandState, TestResultState, TestRunProfileBitset } from 'vs/workbench/contrib/testing/common/testTypes';
-import { TestingContextKeys } from 'vs/workbench/contrib/testing/common/testingContextKeys';
-import { ITestingContinuousRunService } from 'vs/workbench/contrib/testing/common/testingContinuousRunService';
-import { ITestingPeekOpener } from 'vs/workbench/contrib/testing/common/testingPeekOpener';
-import { cmpPriority, isFailedState, isStateWithResult, statesInOrder } from 'vs/workbench/contrib/testing/common/testingStates';
-import { IActivityService, IconBadge, NumberBadge } from 'vs/workbench/services/activity/common/activity';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import * as dom from '../../../../base/browser/dom.js';
+import { IKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { IActionViewItemOptions } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { ActionBar, IActionViewItem } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { Button } from '../../../../base/browser/ui/button/button.js';
+import type { IManagedHover } from '../../../../base/browser/ui/hover/hover.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { IIdentityProvider, IKeyboardNavigationLabelProvider, IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
+import { DefaultKeyboardNavigationDelegate, IListAccessibilityProvider } from '../../../../base/browser/ui/list/listWidget.js';
+import { ITreeContextMenuEvent, ITreeFilter, ITreeNode, ITreeRenderer, ITreeSorter, TreeFilterResult, TreeVisibility } from '../../../../base/browser/ui/tree/tree.js';
+import { Action, ActionRunner, IAction, Separator } from '../../../../base/common/actions.js';
+import { mapFindFirst } from '../../../../base/common/arraysFind.js';
+import { RunOnceScheduler, disposableTimeout } from '../../../../base/common/async.js';
+import { Color, RGBA } from '../../../../base/common/color.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { FuzzyScore } from '../../../../base/common/filters.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { autorun, observableFromEvent } from '../../../../base/common/observable.js';
+import { fuzzyContains } from '../../../../base/common/strings.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { isDefined } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import './media/testing.css';
+import { MarkdownRenderer } from '../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import { localize } from '../../../../nls.js';
+import { DropdownWithPrimaryActionViewItem } from '../../../../platform/actions/browser/dropdownWithPrimaryActionViewItem.js';
+import { MenuEntryActionViewItem, createActionViewItem, createAndFillInActionBarActions, createAndFillInContextMenuActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IMenuService, MenuId, MenuItemAction } from '../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { UnmanagedProgress } from '../../../../platform/progress/common/progress.js';
+import { IStorageService, StorageScope, StorageTarget, WillSaveStateReason } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { defaultButtonStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { foreground } from '../../../../platform/theme/common/colorRegistry.js';
+import { spinningLoading } from '../../../../platform/theme/common/iconRegistry.js';
+import { IThemeService, registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { registerNavigableContainer } from '../../../browser/actions/widgetNavigationCommands.js';
+import { ViewPane } from '../../../browser/parts/views/viewPane.js';
+import { IViewletViewOptions } from '../../../browser/parts/views/viewsViewlet.js';
+import { DiffEditorInput } from '../../../common/editor/diffEditorInput.js';
+import { IViewDescriptorService } from '../../../common/views.js';
+import { ITestTreeProjection, TestExplorerTreeElement, TestItemTreeElement, TestTreeErrorMessage } from './explorerProjections/index.js';
+import { ListProjection } from './explorerProjections/listProjection.js';
+import { getTestItemContextOverlay } from './explorerProjections/testItemContextOverlay.js';
+import { TestingObjectTree } from './explorerProjections/testingObjectTree.js';
+import { ISerializedTestTreeCollapseState } from './explorerProjections/testingViewState.js';
+import { TreeProjection } from './explorerProjections/treeProjection.js';
+import * as icons from './icons.js';
+import { DebugLastRun, ReRunLastRun } from './testExplorerActions.js';
+import { TestingExplorerFilter } from './testingExplorerFilter.js';
+import { CountSummary, collectTestStateCounts, getTestProgressText } from './testingProgressUiService.js';
+import { TestingConfigKeys, TestingCountBadge, getTestingConfiguration } from '../common/configuration.js';
+import { TestCommandId, TestExplorerViewMode, TestExplorerViewSorting, Testing, labelForTestInState } from '../common/constants.js';
+import { StoredValue } from '../common/storedValue.js';
+import { ITestExplorerFilterState, TestExplorerFilterState, TestFilterTerm } from '../common/testExplorerFilterState.js';
+import { TestId } from '../common/testId.js';
+import { ITestProfileService, canUseProfileWithTest } from '../common/testProfileService.js';
+import { LiveTestResult, TestResultItemChangeReason } from '../common/testResult.js';
+import { ITestResultService } from '../common/testResultService.js';
+import { IMainThreadTestCollection, ITestService, testCollectionIsEmpty } from '../common/testService.js';
+import { ITestRunProfile, InternalTestItem, TestControllerCapability, TestItemExpandState, TestResultState, TestRunProfileBitset } from '../common/testTypes.js';
+import { TestingContextKeys } from '../common/testingContextKeys.js';
+import { ITestingContinuousRunService } from '../common/testingContinuousRunService.js';
+import { ITestingPeekOpener } from '../common/testingPeekOpener.js';
+import { cmpPriority, isFailedState, isStateWithResult, statesInOrder } from '../common/testingStates.js';
+import { IActivityService, IconBadge, NumberBadge } from '../../../services/activity/common/activity.js';
+import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
 
 const enum LastFocusState {
 	Input,
@@ -115,6 +117,7 @@ export class TestingExplorerView extends ViewPane {
 		@IHoverService hoverService: IHoverService,
 		@ITestProfileService private readonly testProfileService: ITestProfileService,
 		@ICommandService private readonly commandService: ICommandService,
+		@IMenuService private readonly menuService: IMenuService,
 	) {
 		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
 
@@ -133,7 +136,7 @@ export class TestingExplorerView extends ViewPane {
 	}
 
 	public override shouldShowWelcome() {
-		return this.viewModel?.welcomeExperience === WelcomeExperience.ForWorkspace ?? true;
+		return this.viewModel?.welcomeExperience === WelcomeExperience.ForWorkspace;
 	}
 
 	public override focus() {
@@ -324,7 +327,7 @@ export class TestingExplorerView extends ViewPane {
 				if (!hasAdded) {
 					hasAdded = true;
 					participatingGroups++;
-					profileActions.push(new Action(`${controller.id}.$root`, controller.label.value, undefined, false));
+					profileActions.push(new Action(`${controller.id}.$root`, controller.label.get(), undefined, false));
 				}
 
 				hasConfigurable = hasConfigurable || profile.hasConfigurationHandler;
@@ -349,10 +352,23 @@ export class TestingExplorerView extends ViewPane {
 			}
 		}
 
-		// If there's only one group, don't add a heading for it in the dropdown.
-		if (participatingGroups === 1) {
-			profileActions.shift();
+		const menuActions: IAction[] = [];
+		const contextKeys: [string, unknown][] = [];
+		// allow extension author to define context for when to show the test menu actions for run or debug menus
+		if (group === TestRunProfileBitset.Run) {
+			contextKeys.push(['testing.profile.context.group', 'run']);
 		}
+		if (group === TestRunProfileBitset.Debug) {
+			contextKeys.push(['testing.profile.context.group', 'debug']);
+		}
+		if (group === TestRunProfileBitset.Coverage) {
+			contextKeys.push(['testing.profile.context.group', 'coverage']);
+		}
+		const key = this.contextKeyService.createOverlay(contextKeys);
+		const menu = this.menuService.getMenuActions(MenuId.TestProfilesContext, key);
+
+		// fill if there are any actions
+		createAndFillInContextMenuActions(menu, menuActions);
 
 		const postActions: IAction[] = [];
 		if (profileActions.length > 1) {
@@ -375,7 +391,10 @@ export class TestingExplorerView extends ViewPane {
 			));
 		}
 
-		return Separator.join(profileActions, postActions);
+		// show menu actions if there are any otherwise don't
+		return menuActions.length > 0
+			? Separator.join(profileActions, menuActions, postActions)
+			: Separator.join(profileActions, postActions);
 	}
 
 	/**
@@ -406,7 +425,6 @@ export class TestingExplorerView extends ViewPane {
 			DropdownWithPrimaryActionViewItem,
 			primaryAction, dropdownAction, dropdownActions,
 			'',
-			this.contextMenuService,
 			options
 		);
 	}
@@ -648,6 +666,7 @@ class TestingExplorerViewModel extends Disposable {
 		onDidChangeVisibility: Event<boolean>,
 		@IConfigurationService configurationService: IConfigurationService,
 		@IEditorService editorService: IEditorService,
+		@IEditorGroupsService editorGroupsService: IEditorGroupsService,
 		@IMenuService private readonly menuService: IMenuService,
 		@IContextMenuService private readonly contextMenuService: IContextMenuService,
 		@ITestService private readonly testService: ITestService,
@@ -818,27 +837,38 @@ class TestingExplorerViewModel extends Disposable {
 			this.tree.rerender();
 		}));
 
-		const onEditorChange = () => {
+		const allOpenEditorInputs = observableFromEvent(this,
+			editorService.onDidEditorsChange,
+			() => new Set(editorGroupsService.groups.flatMap(g => g.editors).map(e => e.resource).filter(isDefined)),
+		);
+
+		const activeResource = observableFromEvent(this, editorService.onDidActiveEditorChange, () => {
 			if (editorService.activeEditor instanceof DiffEditorInput) {
-				this.filter.filterToDocumentUri(editorService.activeEditor.primary.resource);
+				return editorService.activeEditor.primary.resource;
 			} else {
-				this.filter.filterToDocumentUri(editorService.activeEditor?.resource);
+				return editorService.activeEditor?.resource;
+			}
+		});
+
+		const filterText = observableFromEvent(this.filterState.text.onDidChange, () => this.filterState.text);
+		this._register(autorun(reader => {
+			filterText.read(reader);
+			if (this.filterState.isFilteringFor(TestFilterTerm.OpenedFiles)) {
+				this.filter.filterToDocumentUri([...allOpenEditorInputs.read(reader)]);
+			} else {
+				this.filter.filterToDocumentUri([activeResource.read(reader)].filter(isDefined));
 			}
 
-			if (this.filterState.isFilteringFor(TestFilterTerm.CurrentDoc)) {
+			if (this.filterState.isFilteringFor(TestFilterTerm.CurrentDoc) || this.filterState.isFilteringFor(TestFilterTerm.OpenedFiles)) {
 				this.tree.refilter();
 			}
-		};
-
-		this._register(editorService.onDidActiveEditorChange(onEditorChange));
+		}));
 
 		this._register(this.storageService.onWillSaveState(({ reason, }) => {
 			if (reason === WillSaveStateReason.SHUTDOWN) {
 				this.lastViewState.store(this.tree.getOptimizedViewState());
 			}
 		}));
-
-		onEditorChange();
 	}
 
 	/**
@@ -1067,7 +1097,7 @@ const hasNodeInOrParentOfUri = (collection: IMainThreadTestCollection, ident: IU
 };
 
 class TestsFilter implements ITreeFilter<TestExplorerTreeElement> {
-	private documentUri: URI | undefined;
+	private documentUris: URI[] = [];
 
 	constructor(
 		private readonly collection: IMainThreadTestCollection,
@@ -1102,8 +1132,8 @@ class TestsFilter implements ITreeFilter<TestExplorerTreeElement> {
 		}
 	}
 
-	public filterToDocumentUri(uri: URI | undefined) {
-		this.documentUri = uri;
+	public filterToDocumentUri(uris: readonly URI[]) {
+		this.documentUris = [...uris];
 	}
 
 	private testTags(element: TestItemTreeElement): FilterResult {
@@ -1131,15 +1161,15 @@ class TestsFilter implements ITreeFilter<TestExplorerTreeElement> {
 	}
 
 	private testLocation(element: TestItemTreeElement): FilterResult {
-		if (!this.documentUri) {
+		if (this.documentUris.length === 0) {
 			return FilterResult.Include;
 		}
 
-		if (!this.state.isFilteringFor(TestFilterTerm.CurrentDoc) || !(element instanceof TestItemTreeElement)) {
+		if ((!this.state.isFilteringFor(TestFilterTerm.CurrentDoc) && !this.state.isFilteringFor(TestFilterTerm.OpenedFiles)) || !(element instanceof TestItemTreeElement)) {
 			return FilterResult.Include;
 		}
 
-		if (hasNodeInOrParentOfUri(this.collection, this.uriIdentityService, this.documentUri, element.test.item.extId)) {
+		if (this.documentUris.some(uri => hasNodeInOrParentOfUri(this.collection, this.uriIdentityService, uri, element.test.item.extId))) {
 			return FilterResult.Include;
 		}
 
@@ -1506,14 +1536,14 @@ const getActionableElementActions = (
 	element: TestItemTreeElement,
 ) => {
 	const test = element instanceof TestItemTreeElement ? element.test : undefined;
-	const contextKeys: [string, unknown][] = getTestItemContextOverlay(test, test ? profiles.capabilitiesForTest(test) : 0);
+	const contextKeys: [string, unknown][] = getTestItemContextOverlay(test, test ? profiles.capabilitiesForTest(test.item) : 0);
 	contextKeys.push(['view', Testing.ExplorerViewId]);
 	if (test) {
 		const ctrl = testService.getTestController(test.controllerId);
 		const supportsCr = !!ctrl && profiles.getControllerProfiles(ctrl.id).some(p => p.supportsContinuousRun);
 		contextKeys.push([
 			TestingContextKeys.canRefreshTests.key,
-			!!ctrl?.canRefresh.value && TestId.isRoot(test.item.extId),
+			ctrl && !!(ctrl.capabilities.get() & TestControllerCapability.Refresh) && TestId.isRoot(test.item.extId),
 		], [
 			TestingContextKeys.testItemIsHidden.key,
 			testService.excluded.contains(test)
@@ -1530,20 +1560,17 @@ const getActionableElementActions = (
 	}
 
 	const contextOverlay = contextKeyService.createOverlay(contextKeys);
-	const menu = menuService.createMenu(MenuId.TestItem, contextOverlay);
+	const menu = menuService.getMenuActions(MenuId.TestItem, contextOverlay, {
+		shouldForwardArgs: true,
+	});
 
-	try {
-		const primary: IAction[] = [];
-		const secondary: IAction[] = [];
-		const result = { primary, secondary };
-		createAndFillInActionBarActions(menu, {
-			shouldForwardArgs: true,
-		}, result, 'inline');
+	const primary: IAction[] = [];
+	const secondary: IAction[] = [];
+	const result = { primary, secondary };
+	createAndFillInActionBarActions(menu, result, 'inline');
+
+	return { actions: result, contextOverlay };
 
-		return { actions: result, contextOverlay };
-	} finally {
-		menu.dispose();
-	}
 };
 
 registerThemingParticipant((theme, collector) => {
diff --git a/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts b/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts
index 35ad3cc3a8c..9e4be7a62fc 100644
--- a/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts
+++ b/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts
@@ -3,178 +3,75 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { alert } from 'vs/base/browser/ui/aria/aria';
-import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
-import { IIdentityProvider } from 'vs/base/browser/ui/list/list';
-import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
-import { Orientation, Sizing, SplitView } from 'vs/base/browser/ui/splitview/splitview';
-import { ICompressedTreeElement, ICompressedTreeNode } from 'vs/base/browser/ui/tree/compressedObjectTreeModel';
-import { ICompressibleTreeRenderer } from 'vs/base/browser/ui/tree/objectTree';
-import { ITreeContextMenuEvent, ITreeNode } from 'vs/base/browser/ui/tree/tree';
-import { Action, IAction, Separator } from 'vs/base/common/actions';
-import { Delayer, Limiter, RunOnceScheduler } from 'vs/base/common/async';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Codicon } from 'vs/base/common/codicons';
-import { Color } from 'vs/base/common/color';
-import { Emitter, Event } from 'vs/base/common/event';
-import { FuzzyScore } from 'vs/base/common/filters';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { stripIcons } from 'vs/base/common/iconLabels';
-import { Iterable } from 'vs/base/common/iterator';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Lazy } from 'vs/base/common/lazy';
-import { Disposable, DisposableStore, IDisposable, IReference, MutableDisposable, combinedDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { MarshalledId } from 'vs/base/common/marshallingIds';
-import { autorun } from 'vs/base/common/observable';
-import { count } from 'vs/base/common/strings';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { isDefined } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import 'vs/css!./testingOutputPeek';
-import { ICodeEditor, IDiffEditorConstructionOptions, isCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction2 } from 'vs/editor/browser/editorExtensions';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget';
-import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditor/diffEditorWidget';
-import { EmbeddedDiffEditorWidget } from 'vs/editor/browser/widget/diffEditor/embeddedDiffEditorWidget';
-import { MarkdownRenderer } from 'vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
-import { IDiffEditorOptions, IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { IEditor, IEditorContribution, ScrollType } from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { IResolvedTextEditorModel, ITextModelService } from 'vs/editor/common/services/resolverService';
-import { IPeekViewService, PeekViewWidget, peekViewResultsBackground, peekViewTitleForeground, peekViewTitleInfoForeground } from 'vs/editor/contrib/peekView/browser/peekView';
-import { localize, localize2 } from 'vs/nls';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { FloatingClickMenu } from 'vs/platform/actions/browser/floatingMenu';
-import { MenuEntryActionViewItem, createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { Action2, IMenuService, MenuId, MenuItemAction } from 'vs/platform/actions/common/actions';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { ITextEditorOptions, TextEditorSelectionRevealType } from 'vs/platform/editor/common/editor';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { WorkbenchCompressibleObjectTree } from 'vs/platform/list/browser/listService';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IProgressService } from 'vs/platform/progress/common/progress';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { TerminalCapabilityStore } from 'vs/platform/terminal/common/capabilities/terminalCapabilityStore';
-import { formatMessageForTerminal } from 'vs/platform/terminal/common/terminalStrings';
-import { editorBackground } from 'vs/platform/theme/common/colorRegistry';
-import { widgetClose } from 'vs/platform/theme/common/iconRegistry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IViewPaneOptions, ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
-import { EditorModel } from 'vs/workbench/common/editor/editorModel';
-import { PANEL_BACKGROUND, SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
-import { IViewDescriptorService, ViewContainerLocation } from 'vs/workbench/common/views';
-import { DetachedProcessInfo } from 'vs/workbench/contrib/terminal/browser/detachedTerminal';
-import { IDetachedTerminalInstance, ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { getXtermScaledDimensions } from 'vs/workbench/contrib/terminal/browser/xterm/xtermTerminal';
-import { TERMINAL_BACKGROUND_COLOR } from 'vs/workbench/contrib/terminal/common/terminalColorRegistry';
-import { getTestItemContextOverlay } from 'vs/workbench/contrib/testing/browser/explorerProjections/testItemContextOverlay';
-import * as icons from 'vs/workbench/contrib/testing/browser/icons';
-import { colorizeTestMessageInEditor, renderTestMessageAsText } from 'vs/workbench/contrib/testing/browser/testMessageColorizer';
-import { testingMessagePeekBorder, testingPeekBorder, testingPeekHeaderBackground, testingPeekMessageHeaderBackground } from 'vs/workbench/contrib/testing/browser/theme';
-import { AutoOpenPeekViewWhen, TestingConfigKeys, getTestingConfiguration } from 'vs/workbench/contrib/testing/common/configuration';
-import { Testing } from 'vs/workbench/contrib/testing/common/constants';
-import { IObservableValue, MutableObservableValue, staticObservableValue } from 'vs/workbench/contrib/testing/common/observableValue';
-import { StoredValue } from 'vs/workbench/contrib/testing/common/storedValue';
-import { ITestCoverageService } from 'vs/workbench/contrib/testing/common/testCoverageService';
-import { ITestExplorerFilterState } from 'vs/workbench/contrib/testing/common/testExplorerFilterState';
-import { ITestProfileService } from 'vs/workbench/contrib/testing/common/testProfileService';
-import { ITaskRawOutput, ITestResult, ITestRunTaskResults, LiveTestResult, TestResultItemChange, TestResultItemChangeReason, maxCountPriority, resultItemParents } from 'vs/workbench/contrib/testing/common/testResult';
-import { ITestResultService, ResultChangeEvent } from 'vs/workbench/contrib/testing/common/testResultService';
-import { ITestFollowup, ITestService } from 'vs/workbench/contrib/testing/common/testService';
-import { IRichLocation, ITestErrorMessage, ITestItem, ITestItemContext, ITestMessage, ITestMessageMenuArgs, ITestRunTask, ITestTaskState, InternalTestItem, TestMessageType, TestResultItem, TestResultState, TestRunProfileBitset, getMarkId, testResultStateToContextValues } from 'vs/workbench/contrib/testing/common/testTypes';
-import { TestingContextKeys } from 'vs/workbench/contrib/testing/common/testingContextKeys';
-import { IShowResultOptions, ITestingPeekOpener } from 'vs/workbench/contrib/testing/common/testingPeekOpener';
-import { cmpPriority, isFailedState } from 'vs/workbench/contrib/testing/common/testingStates';
-import { ParsedTestUri, TestUriType, buildTestUri, parseTestUri } from 'vs/workbench/contrib/testing/common/testingUri';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
+import * as dom from '../../../../base/browser/dom.js';
+import { alert } from '../../../../base/browser/ui/aria/aria.js';
+import { IAction } from '../../../../base/common/actions.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Color } from '../../../../base/common/color.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { stripIcons } from '../../../../base/common/iconLabels.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { Lazy } from '../../../../base/common/lazy.js';
+import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { observableValue } from '../../../../base/common/observable.js';
+import { count } from '../../../../base/common/strings.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ICodeEditor, isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { EditorAction2 } from '../../../../editor/browser/editorExtensions.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { EmbeddedCodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/embeddedCodeEditorWidget.js';
+import { EmbeddedDiffEditorWidget } from '../../../../editor/browser/widget/diffEditor/embeddedDiffEditorWidget.js';
+import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { IEditor, IEditorContribution, ScrollType } from '../../../../editor/common/editorCommon.js';
+import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
+import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { IPeekViewService, PeekViewWidget, peekViewTitleForeground, peekViewTitleInfoForeground } from '../../../../editor/contrib/peekView/browser/peekView.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { createAndFillInActionBarActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { Action2, IMenuService, MenuId } from '../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { ITextEditorOptions, TextEditorSelectionRevealType } from '../../../../platform/editor/common/editor.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { bindContextKey } from '../../../../platform/observable/common/platformObservableUtils.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { editorBackground } from '../../../../platform/theme/common/colorRegistry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IViewPaneOptions, ViewPane } from '../../../browser/parts/views/viewPane.js';
+import { IViewDescriptorService } from '../../../common/views.js';
+import { renderTestMessageAsText } from './testMessageColorizer.js';
+import { InspectSubject, MessageSubject, TaskSubject, TestOutputSubject, inspectSubjectHasStack, mapFindTestMessage } from './testResultsView/testResultsSubject.js';
+import { TestResultsViewContent } from './testResultsView/testResultsViewContent.js';
+import { testingMessagePeekBorder, testingPeekBorder, testingPeekHeaderBackground, testingPeekMessageHeaderBackground } from './theme.js';
+import { AutoOpenPeekViewWhen, TestingConfigKeys, getTestingConfiguration } from '../common/configuration.js';
+import { Testing } from '../common/constants.js';
+import { MutableObservableValue, staticObservableValue } from '../common/observableValue.js';
+import { StoredValue } from '../common/storedValue.js';
+import { ITestResult, TestResultItemChange, TestResultItemChangeReason, resultItemParents } from '../common/testResult.js';
+import { ITestResultService, ResultChangeEvent } from '../common/testResultService.js';
+import { ITestService } from '../common/testService.js';
+import { IRichLocation, ITestMessage, TestMessageType, TestResultItem } from '../common/testTypes.js';
+import { TestingContextKeys } from '../common/testingContextKeys.js';
+import { IShowResultOptions, ITestingPeekOpener } from '../common/testingPeekOpener.js';
+import { isFailedState } from '../common/testingStates.js';
+import { ParsedTestUri, TestUriType, buildTestUri, parseTestUri } from '../common/testingUri.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
 
-const getMessageArgs = (test: TestResultItem, message: ITestMessage): ITestMessageMenuArgs => ({
-	$mid: MarshalledId.TestMessageMenuArgs,
-	test: InternalTestItem.serialize(test),
-	message: ITestMessage.serialize(message),
-});
-
-class MessageSubject {
-	public readonly test: ITestItem;
-	public readonly message: ITestMessage;
-	public readonly expectedUri: URI;
-	public readonly actualUri: URI;
-	public readonly messageUri: URI;
-	public readonly revealLocation: IRichLocation | undefined;
-	public readonly context: ITestMessageMenuArgs | undefined;
-
-	public get isDiffable() {
-		return this.message.type === TestMessageType.Error && isDiffable(this.message);
-	}
-
-	public get contextValue() {
-		return this.message.type === TestMessageType.Error ? this.message.contextValue : undefined;
-	}
-
-	constructor(public readonly result: ITestResult, test: TestResultItem, public readonly taskIndex: number, public readonly messageIndex: number) {
-		this.test = test.item;
-		const messages = test.tasks[taskIndex].messages;
-		this.messageIndex = messageIndex;
-
-		const parts = { messageIndex, resultId: result.id, taskIndex, testExtId: test.item.extId };
-		this.expectedUri = buildTestUri({ ...parts, type: TestUriType.ResultExpectedOutput });
-		this.actualUri = buildTestUri({ ...parts, type: TestUriType.ResultActualOutput });
-		this.messageUri = buildTestUri({ ...parts, type: TestUriType.ResultMessage });
-
-		const message = this.message = messages[this.messageIndex];
-		this.context = getMessageArgs(test, message);
-		this.revealLocation = message.location ?? (test.item.uri && test.item.range ? { uri: test.item.uri, range: Range.lift(test.item.range) } : undefined);
-	}
-}
-
-class TaskSubject {
-	public readonly outputUri: URI;
-	public readonly revealLocation: undefined;
-
-	constructor(public readonly result: ITestResult, public readonly taskIndex: number) {
-		this.outputUri = buildTestUri({ resultId: result.id, taskIndex, type: TestUriType.TaskOutput });
-	}
-}
-
-class TestOutputSubject {
-	public readonly outputUri: URI;
-	public readonly revealLocation: undefined;
-	public readonly task: ITestRunTask;
-
-	constructor(public readonly result: ITestResult, public readonly taskIndex: number, public readonly test: TestResultItem) {
-		this.outputUri = buildTestUri({ resultId: this.result.id, taskIndex: this.taskIndex, testExtId: this.test.item.extId, type: TestUriType.TestOutput });
-		this.task = result.tasks[this.taskIndex];
-	}
-}
-
-type InspectSubject = MessageSubject | TaskSubject | TestOutputSubject;
-
-const equalsSubject = (a: InspectSubject, b: InspectSubject) => (
-	(a instanceof MessageSubject && b instanceof MessageSubject && a.message === b.message) ||
-	(a instanceof TaskSubject && b instanceof TaskSubject && a.result === b.result && a.taskIndex === b.taskIndex) ||
-	(a instanceof TestOutputSubject && b instanceof TestOutputSubject && a.test === b.test && a.taskIndex === b.taskIndex)
-);
 
 /** Iterates through every message in every result */
 function* allMessages(results: readonly ITestResult[]) {
@@ -197,11 +94,11 @@ export class TestingPeekOpener extends Disposable implements ITestingPeekOpener
 	private lastUri?: TestUriWithDocument;
 
 	/** @inheritdoc */
-	public readonly historyVisible = MutableObservableValue.stored(this._register(new StoredValue<boolean>({
+	public readonly historyVisible = this._register(MutableObservableValue.stored(new StoredValue<boolean>({
 		key: 'testHistoryVisibleInPeek',
 		scope: StorageScope.PROFILE,
 		target: StorageTarget.USER,
-	}, this.storageService)), false);
+	}, this.storageService), false));
 
 	constructor(
 		@IConfigurationService private readonly configuration: IConfigurationService,
@@ -501,20 +398,6 @@ export class TestingPeekOpener extends Disposable implements ITestingPeekOpener
 	}
 }
 
-const mapFindTestMessage = <T>(test: TestResultItem, fn: (task: ITestTaskState, message: ITestMessage, messageIndex: number, taskIndex: number) => T | undefined) => {
-	for (let taskIndex = 0; taskIndex < test.tasks.length; taskIndex++) {
-		const task = test.tasks[taskIndex];
-		for (let messageIndex = 0; messageIndex < task.messages.length; messageIndex++) {
-			const r = fn(task, task.messages[messageIndex], messageIndex, taskIndex);
-			if (r !== undefined) {
-				return r;
-			}
-		}
-	}
-
-	return undefined;
-};
-
 /**
  * Adds output/message peek functionality to code editors.
  */
@@ -531,11 +414,6 @@ export class TestingOutputPeekController extends Disposable implements IEditorCo
 	 */
 	private readonly peek = this._register(new MutableDisposable<TestResultsPeek>());
 
-	/**
-	 * URI of the currently-visible peek, if any.
-	 */
-	private currentPeekUri: URI | undefined;
-
 	/**
 	 * Context key updated when the peek is visible/hidden.
 	 */
@@ -562,31 +440,24 @@ export class TestingOutputPeekController extends Disposable implements IEditorCo
 		this._register(testResults.onTestChanged(this.closePeekOnTestChange, this));
 	}
 
-	/**
-	 * Toggles peek visibility for the URI.
-	 */
-	public toggle(uri: URI) {
-		if (this.currentPeekUri?.toString() === uri.toString()) {
-			this.peek.clear();
-		} else {
-			this.show(uri);
-		}
-	}
-
 	/**
 	 * Shows a peek for the message in the editor.
 	 */
 	public async show(uri: URI) {
 		const subject = this.retrieveTest(uri);
-		if (!subject) {
-			return;
+		if (subject) {
+			this.showSubject(subject);
 		}
+	}
 
+	/**
+	 * Shows a peek for the existing inspect subject.
+	 */
+	public async showSubject(subject: InspectSubject) {
 		if (!this.peek.value) {
 			this.peek.value = this.instantiationService.createInstance(TestResultsPeek, this.editor);
 			this.peek.value.onDidClose(() => {
 				this.visible.set(false);
-				this.currentPeekUri = undefined;
 				this.peek.value = undefined;
 			});
 
@@ -599,7 +470,6 @@ export class TestingOutputPeekController extends Disposable implements IEditorCo
 		}
 
 		this.peek.value.setModel(subject);
-		this.currentPeekUri = uri;
 	}
 
 	public async openAndShow(uri: URI) {
@@ -630,6 +500,13 @@ export class TestingOutputPeekController extends Disposable implements IEditorCo
 		this.peek.clear();
 	}
 
+	/**
+	 * Collapses all displayed stack frames.
+	 */
+	public collapseStack() {
+		this.peek.value?.collapseStack();
+	}
+
 	/**
 	 * Shows the next message in the peek, if possible.
 	 */
@@ -772,282 +649,19 @@ export class TestingOutputPeekController extends Disposable implements IEditorCo
 	}
 }
 
-const FOLLOWUP_ANIMATION_MIN_TIME = 500;
-
-class FollowupActionWidget extends Disposable {
-	private readonly el = dom.h('div.testing-followup-action', []);
-	private readonly visibleStore = this._register(new DisposableStore());
-
-	constructor(
-		private readonly container: HTMLElement,
-		@ITestService private readonly testService: ITestService,
-		@IQuickInputService private readonly quickInput: IQuickInputService,
-	) {
-		super();
-	}
-
-	public show(subject: InspectSubject) {
-		this.visibleStore.clear();
-		if (subject instanceof MessageSubject) {
-			this.showMessage(subject);
-		}
-	}
-
-	private async showMessage(subject: MessageSubject) {
-		const cts = this.visibleStore.add(new CancellationTokenSource());
-		const start = Date.now();
-
-		// Wait for completion otherwise results will not be available to the ext host:
-		if (subject.result instanceof LiveTestResult && !subject.result.completedAt) {
-			await new Promise(r => Event.once((subject.result as LiveTestResult).onComplete)(r));
-		}
-
-		const followups = await this.testService.provideTestFollowups({
-			extId: subject.test.extId,
-			messageIndex: subject.messageIndex,
-			resultId: subject.result.id,
-			taskIndex: subject.taskIndex,
-		}, cts.token);
-
-
-		if (!followups.followups.length || cts.token.isCancellationRequested) {
-			followups.dispose();
-			return;
-		}
-
-		this.visibleStore.add(followups);
-
-		dom.clearNode(this.el.root);
-		this.el.root.classList.toggle('animated', Date.now() - start > FOLLOWUP_ANIMATION_MIN_TIME);
-
-		this.el.root.appendChild(this.makeFollowupLink(followups.followups[0]));
-		if (followups.followups.length > 1) {
-			this.el.root.appendChild(this.makeMoreLink(followups.followups));
-		}
-
-		this.container.appendChild(this.el.root);
-		this.visibleStore.add(toDisposable(() => {
-			this.el.root.remove();
-		}));
-	}
-
-	private makeFollowupLink(first: ITestFollowup) {
-		const link = this.makeLink(() => this.actionFollowup(link, first));
-		dom.reset(link, ...renderLabelWithIcons(first.message));
-		return link;
-	}
-
-	private makeMoreLink(followups: ITestFollowup[]) {
-		const link = this.makeLink(() =>
-			this.quickInput.pick(followups.map((f, i) => ({
-				label: f.message,
-				index: i
-			}))).then(picked => {
-				if (picked?.length) {
-					followups[picked[0].index].execute();
-				}
-			})
-		);
-
-		link.innerText = localize('testFollowup.more', '+{0} More...', followups.length - 1);
-		return link;
-	}
-
-	private makeLink(onClick: () => void) {
-		const link = document.createElement('a');
-		link.tabIndex = 0;
-		this.visibleStore.add(dom.addDisposableListener(link, 'click', onClick));
-		this.visibleStore.add(dom.addDisposableListener(link, 'keydown', e => {
-			const event = new StandardKeyboardEvent(e);
-			if (event.equals(KeyCode.Space) || event.equals(KeyCode.Enter)) {
-				onClick();
-			}
-		}));
-
-		return link;
-	}
-
-	private actionFollowup(link: HTMLAnchorElement, fu: ITestFollowup) {
-		if (link.ariaDisabled !== 'true') {
-			link.ariaDisabled = 'true';
-			fu.execute();
-		}
-	}
-}
-
-class TestResultsViewContent extends Disposable {
-	private static lastSplitWidth?: number;
-
-	private readonly didReveal = this._register(new Emitter<{ subject: InspectSubject; preserveFocus: boolean }>());
-	private readonly currentSubjectStore = this._register(new DisposableStore());
-	private followupWidget!: FollowupActionWidget;
-	private messageContextKeyService!: IContextKeyService;
-	private contextKeyTestMessage!: IContextKey<string>;
-	private contextKeyResultOutdated!: IContextKey<boolean>;
-
-	private dimension?: dom.Dimension;
-	private splitView!: SplitView;
-	private messageContainer!: HTMLElement;
-	private contentProviders!: IPeekOutputRenderer[];
-	private contentProvidersUpdateLimiter = this._register(new Limiter(1));
-
-	public current?: InspectSubject;
-
-	/** Fired when a tree item is selected. Populated only on .fillBody() */
-	public onDidRequestReveal!: Event<InspectSubject>;
-
-	constructor(
-		private readonly editor: ICodeEditor | undefined,
-		private readonly options: {
-			historyVisible: IObservableValue<boolean>;
-			showRevealLocationOnMessages: boolean;
-			locationForProgress: string;
-		},
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@ITextModelService protected readonly modelService: ITextModelService,
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
-	) {
-		super();
-	}
-
-	public fillBody(containerElement: HTMLElement): void {
-		const initialSpitWidth = TestResultsViewContent.lastSplitWidth;
-		this.splitView = new SplitView(containerElement, { orientation: Orientation.HORIZONTAL });
-
-		const { historyVisible, showRevealLocationOnMessages } = this.options;
-		const isInPeekView = this.editor !== undefined;
-		const messageContainer = this.messageContainer = dom.append(containerElement, dom.$('.test-output-peek-message-container'));
-		this.followupWidget = this._register(this.instantiationService.createInstance(FollowupActionWidget, messageContainer));
-		this.contentProviders = [
-			this._register(this.instantiationService.createInstance(DiffContentProvider, this.editor, messageContainer)),
-			this._register(this.instantiationService.createInstance(MarkdownTestMessagePeek, messageContainer)),
-			this._register(this.instantiationService.createInstance(TerminalMessagePeek, messageContainer, isInPeekView)),
-			this._register(this.instantiationService.createInstance(PlainTextMessagePeek, this.editor, messageContainer)),
-		];
-
-		this.messageContextKeyService = this._register(this.contextKeyService.createScoped(containerElement));
-		this.contextKeyTestMessage = TestingContextKeys.testMessageContext.bindTo(this.messageContextKeyService);
-		this.contextKeyResultOutdated = TestingContextKeys.testResultOutdated.bindTo(this.messageContextKeyService);
-
-		const treeContainer = dom.append(containerElement, dom.$('.test-output-peek-tree'));
-		const tree = this._register(this.instantiationService.createInstance(
-			OutputPeekTree,
-			treeContainer,
-			this.didReveal.event,
-			{ showRevealLocationOnMessages, locationForProgress: this.options.locationForProgress },
-		));
-
-		this.onDidRequestReveal = tree.onDidRequestReview;
-
-		this.splitView.addView({
-			onDidChange: Event.None,
-			element: messageContainer,
-			minimumSize: 200,
-			maximumSize: Number.MAX_VALUE,
-			layout: width => {
-				TestResultsViewContent.lastSplitWidth = width;
-				if (this.dimension) {
-					for (const provider of this.contentProviders) {
-						provider.layout({ height: this.dimension.height, width });
-					}
-				}
-			},
-		}, Sizing.Distribute);
-
-		this.splitView.addView({
-			onDidChange: Event.None,
-			element: treeContainer,
-			minimumSize: 100,
-			maximumSize: Number.MAX_VALUE,
-			layout: width => {
-				if (this.dimension) {
-					tree.layout(this.dimension.height, width);
-				}
-			},
-		}, Sizing.Distribute);
-
-		const historyViewIndex = 1;
-		this.splitView.setViewVisible(historyViewIndex, historyVisible.value);
-		this._register(historyVisible.onDidChange(visible => {
-			this.splitView.setViewVisible(historyViewIndex, visible);
-		}));
-
-		if (initialSpitWidth) {
-			queueMicrotask(() => this.splitView.resizeView(0, initialSpitWidth));
-		}
-	}
-
-	/**
-	 * Shows a message in-place without showing or changing the peek location.
-	 * This is mostly used if peeking a message without a location.
-	 */
-	public reveal(opts: { subject: InspectSubject; preserveFocus: boolean }) {
-		this.didReveal.fire(opts);
-
-		if (this.current && equalsSubject(this.current, opts.subject)) {
-			return Promise.resolve();
-		}
-
-		this.current = opts.subject;
-		return this.contentProvidersUpdateLimiter.queue(async () => {
-			await Promise.all(this.contentProviders.map(p => p.update(opts.subject)));
-			this.followupWidget.show(opts.subject);
-			this.currentSubjectStore.clear();
-			this.populateFloatingClick(opts.subject);
-		});
-	}
-
-	private populateFloatingClick(subject: InspectSubject) {
-		if (!(subject instanceof MessageSubject)) {
-			return;
-		}
-
-		this.currentSubjectStore.add(toDisposable(() => {
-			this.contextKeyResultOutdated.reset();
-			this.contextKeyTestMessage.reset();
-		}));
-
-		this.contextKeyTestMessage.set(subject.contextValue || '');
-		if (subject.result instanceof LiveTestResult) {
-			this.contextKeyResultOutdated.set(subject.result.getStateById(subject.test.extId)?.retired ?? false);
-			this.currentSubjectStore.add(subject.result.onChange(ev => {
-				if (ev.item.item.extId === subject.test.extId) {
-					this.contextKeyResultOutdated.set(ev.item.retired ?? false);
-				}
-			}));
-		} else {
-			this.contextKeyResultOutdated.set(true);
-		}
-
-
-		const instaService = this.currentSubjectStore.add(this.instantiationService
-			.createChild(new ServiceCollection([IContextKeyService, this.messageContextKeyService])));
-
-		this.currentSubjectStore.add(instaService.createInstance(FloatingClickMenu, {
-			container: this.messageContainer,
-			menuId: MenuId.TestMessageContent,
-			getActionArg: () => (subject as MessageSubject).context,
-		}));
-	}
-
-	public onLayoutBody(height: number, width: number) {
-		this.dimension = new dom.Dimension(width, height);
-		this.splitView.layout(width);
-	}
-
-	public onWidth(width: number) {
-		this.splitView.layout(width);
-	}
-}
 
 class TestResultsPeek extends PeekViewWidget {
 	private static lastHeightInLines?: number;
 
 	private readonly visibilityChange = this._disposables.add(new Emitter<boolean>());
+	private readonly _current = observableValue<InspectSubject | undefined>('testPeekCurrent', undefined);
 	private content!: TestResultsViewContent;
 	private scopedContextKeyService!: IContextKeyService;
 	private dimension?: dom.Dimension;
-	public current?: InspectSubject;
+
+	public get current() {
+		return this._current.get();
+	}
 
 	constructor(
 		editor: ICodeEditor,
@@ -1058,6 +672,8 @@ class TestResultsPeek extends PeekViewWidget {
 		@IMenuService private readonly menuService: IMenuService,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@ITextModelService protected readonly modelService: ITextModelService,
+		@ICodeEditorService protected readonly codeEditorService: ICodeEditorService,
+		@IUriIdentityService protected readonly uriIdentityService: IUriIdentityService,
 	) {
 		super(editor, { showFrame: true, frameWidth: 1, showArrow: true, isResizeable: true, isAccessible: true, className: 'test-output-peek' }, instantiationService);
 
@@ -1087,20 +703,39 @@ class TestResultsPeek extends PeekViewWidget {
 			TestingContextKeys.isInPeek.bindTo(this.scopedContextKeyService).set(true);
 			const instaService = this._disposables.add(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, this.scopedContextKeyService])));
 			this.content = this._disposables.add(instaService.createInstance(TestResultsViewContent, this.editor, { historyVisible: this.testingPeek.historyVisible, showRevealLocationOnMessages: false, locationForProgress: Testing.ResultsViewId }));
+
+			this._disposables.add(this.content.onClose(() => {
+				TestingOutputPeekController.get(this.editor)?.removePeek();
+			}));
 		}
 
 		super._fillContainer(container);
 	}
 
-
 	protected override _fillHead(container: HTMLElement): void {
 		super._fillHead(container);
 
+		const menuContextKeyService = this._disposables.add(this.contextKeyService.createScoped(container));
+		this._disposables.add(bindContextKey(
+			TestingContextKeys.peekHasStack,
+			menuContextKeyService,
+			reader => inspectSubjectHasStack(this._current.read(reader)),
+		));
+
+		const menu = this.menuService.createMenu(MenuId.TestPeekTitle, menuContextKeyService);
+		const actionBar = this._actionbarWidget!;
+		this._disposables.add(menu.onDidChange(() => {
+			actions.length = 0;
+			createAndFillInActionBarActions(menu, undefined, actions);
+			while (actionBar.getAction(1)) {
+				actionBar.pull(0); // remove all but the view's default "close" button
+			}
+			actionBar.push(actions, { label: false, icon: true, index: 0 });
+		}));
+
 		const actions: IAction[] = [];
-		const menu = this.menuService.createMenu(MenuId.TestPeekTitle, this.contextKeyService);
 		createAndFillInActionBarActions(menu, undefined, actions);
-		this._actionbarWidget!.push(actions, { label: false, icon: true, index: 0 });
-		menu.dispose();
+		actionBar.push(actions, { label: false, icon: true, index: 0 });
 	}
 
 	protected override _fillBody(containerElement: HTMLElement): void {
@@ -1117,28 +752,47 @@ class TestResultsPeek extends PeekViewWidget {
 	 */
 	public setModel(subject: InspectSubject): Promise<void> {
 		if (subject instanceof TaskSubject || subject instanceof TestOutputSubject) {
-			this.current = subject;
+			this._current.set(subject, undefined);
 			return this.showInPlace(subject);
 		}
 
 		const message = subject.message;
 		const previous = this.current;
-		if (!subject.revealLocation && !previous) {
+		const revealLocation = subject.revealLocation?.range.getStartPosition();
+		if (!revealLocation && !previous) {
 			return Promise.resolve();
 		}
 
-		this.current = subject;
-		if (!subject.revealLocation) {
+		this._current.set(subject, undefined);
+		if (!revealLocation) {
 			return this.showInPlace(subject);
 		}
 
-		this.show(subject.revealLocation.range, TestResultsPeek.lastHeightInLines || hintMessagePeekHeight(message));
-		const startPosition = subject.revealLocation.range.getStartPosition();
-		this.editor.revealRangeNearTopIfOutsideViewport(Range.fromPositions(startPosition), ScrollType.Smooth);
+		// If there is a stack we want to display, ensure the default size is large-ish
+		const peekLines = TestResultsPeek.lastHeightInLines || Math.max(
+			inspectSubjectHasStack(subject) ? Math.ceil(this.getVisibleEditorLines() / 2) : 0,
+			hintMessagePeekHeight(message)
+		);
+
+		this.show(revealLocation, peekLines);
+		this.editor.revealRangeNearTopIfOutsideViewport(Range.fromPositions(revealLocation), ScrollType.Smooth);
 
 		return this.showInPlace(subject);
 	}
 
+	/**
+	 * Collapses all displayed stack frames.
+	 */
+	public collapseStack() {
+		this.content.collapseStack();
+	}
+
+	private getVisibleEditorLines() {
+		// note that we don't use the view ranges because we don't want to get
+		// thrown off by large wrapping lines. Being approximate here is okay.
+		return Math.round(this.editor.getDomNode()!.clientHeight / this.editor.getOption(EditorOption.lineHeight));
+	}
+
 	/**
 	 * Shows a message in-place without showing or changing the peek location.
 	 * This is mostly used if peeking a message without a location.
@@ -1151,7 +805,7 @@ class TestResultsPeek extends PeekViewWidget {
 			this.setTitle(localize('testOutputTitle', 'Test Output'));
 		}
 		this.applyTheme();
-		await this.content.reveal({ subject: subject, preserveFocus: false });
+		await this.content.reveal({ subject, preserveFocus: false });
 	}
 
 	protected override _relayout(newHeightInLines: number): void {
@@ -1232,7 +886,7 @@ export class TestResultsView extends ViewPane {
 	private renderContent(container: HTMLElement) {
 		const content = this.content.value;
 		content.fillBody(container);
-		content.onDidRequestReveal(subject => content.reveal({ preserveFocus: true, subject }));
+		this._register(content.onDidRequestReveal(subject => content.reveal({ preserveFocus: true, subject })));
 
 		const [lastResult] = this.resultService.results;
 		if (lastResult && lastResult.tasks.length) {
@@ -1241,491 +895,8 @@ export class TestResultsView extends ViewPane {
 	}
 }
 
-interface IPeekOutputRenderer extends IDisposable {
-	/** Updates the displayed test. Should clear if it cannot display the test. */
-	update(subject: InspectSubject): void;
-	/** Recalculate content layout. */
-	layout(dimension: dom.IDimension): void;
-	/** Dispose the content provider. */
-	dispose(): void;
-}
-
-const commonEditorOptions: IEditorOptions = {
-	scrollBeyondLastLine: false,
-	links: true,
-	lineNumbers: 'off',
-	scrollbar: {
-		verticalScrollbarSize: 14,
-		horizontal: 'auto',
-		useShadows: true,
-		verticalHasArrows: false,
-		horizontalHasArrows: false,
-		alwaysConsumeMouseWheel: false
-	},
-	fixedOverflowWidgets: true,
-	readOnly: true,
-	minimap: {
-		enabled: false
-	},
-	wordWrap: 'on',
-};
-
-const diffEditorOptions: IDiffEditorConstructionOptions = {
-	...commonEditorOptions,
-	enableSplitViewResizing: true,
-	isInEmbeddedEditor: true,
-	renderOverviewRuler: false,
-	ignoreTrimWhitespace: false,
-	renderSideBySide: true,
-	useInlineViewWhenSpaceIsLimited: false,
-	originalAriaLabel: localize('testingOutputExpected', 'Expected result'),
-	modifiedAriaLabel: localize('testingOutputActual', 'Actual result'),
-	diffAlgorithm: 'advanced',
-};
-
-const isDiffable = (message: ITestMessage): message is ITestErrorMessage & { actual: string; expected: string } =>
-	message.type === TestMessageType.Error && message.actual !== undefined && message.expected !== undefined;
-
-class DiffContentProvider extends Disposable implements IPeekOutputRenderer {
-	private readonly widget = this._register(new MutableDisposable<DiffEditorWidget>());
-	private readonly model = this._register(new MutableDisposable());
-	private dimension?: dom.IDimension;
-
-	constructor(
-		private readonly editor: ICodeEditor | undefined,
-		private readonly container: HTMLElement,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@ITextModelService private readonly modelService: ITextModelService,
-	) {
-		super();
-	}
-
-	public async update(subject: InspectSubject) {
-		if (!(subject instanceof MessageSubject)) {
-			return this.clear();
-		}
-		const message = subject.message;
-		if (!isDiffable(message)) {
-			return this.clear();
-		}
-
-		const [original, modified] = await Promise.all([
-			this.modelService.createModelReference(subject.expectedUri),
-			this.modelService.createModelReference(subject.actualUri),
-		]);
-
-		const model = this.model.value = new SimpleDiffEditorModel(original, modified);
-		if (!this.widget.value) {
-			this.widget.value = this.editor ? this.instantiationService.createInstance(
-				EmbeddedDiffEditorWidget,
-				this.container,
-				diffEditorOptions,
-				{},
-				this.editor,
-			) : this.instantiationService.createInstance(
-				DiffEditorWidget,
-				this.container,
-				diffEditorOptions,
-				{},
-			);
-
-			if (this.dimension) {
-				this.widget.value.layout(this.dimension);
-			}
-		}
-
-		this.widget.value.setModel(model);
-		this.widget.value.updateOptions(this.getOptions(
-			isMultiline(message.expected) || isMultiline(message.actual)
-		));
-	}
-
-	private clear() {
-		this.model.clear();
-		this.widget.clear();
-	}
-
-	public layout(dimensions: dom.IDimension) {
-		this.dimension = dimensions;
-		this.widget.value?.layout(dimensions);
-	}
-
-	protected getOptions(isMultiline: boolean): IDiffEditorOptions {
-		return isMultiline
-			? { ...diffEditorOptions, lineNumbers: 'on' }
-			: { ...diffEditorOptions, lineNumbers: 'off' };
-	}
-}
-
-class ScrollableMarkdownMessage extends Disposable {
-	private readonly scrollable: DomScrollableElement;
-	private readonly element: HTMLElement;
-
-	constructor(container: HTMLElement, markdown: MarkdownRenderer, message: IMarkdownString) {
-		super();
-
-		const rendered = this._register(markdown.render(message, {}));
-		rendered.element.style.height = '100%';
-		rendered.element.style.userSelect = 'text';
-		container.appendChild(rendered.element);
-		this.element = rendered.element;
-
-		this.scrollable = this._register(new DomScrollableElement(rendered.element, {
-			className: 'preview-text',
-		}));
-		container.appendChild(this.scrollable.getDomNode());
-
-		this._register(toDisposable(() => {
-			this.scrollable.getDomNode().remove();
-		}));
-
-		this.scrollable.scanDomNode();
-	}
-
-	public layout(height: number, width: number) {
-		// Remove padding of `.monaco-editor .zone-widget.test-output-peek .preview-text`
-		this.scrollable.setScrollDimensions({
-			width: width - 32,
-			height: height - 16,
-			scrollWidth: this.element.scrollWidth,
-			scrollHeight: this.element.scrollHeight
-		});
-	}
-}
-
-class MarkdownTestMessagePeek extends Disposable implements IPeekOutputRenderer {
-	private readonly markdown = new Lazy(
-		() => this._register(this.instantiationService.createInstance(MarkdownRenderer, {})),
-	);
-
-	private readonly textPreview = this._register(new MutableDisposable<ScrollableMarkdownMessage>());
-
-	constructor(private readonly container: HTMLElement, @IInstantiationService private readonly instantiationService: IInstantiationService) {
-		super();
-	}
-
-	public update(subject: InspectSubject): void {
-		if (!(subject instanceof MessageSubject)) {
-			return this.textPreview.clear();
-		}
-
-		const message = subject.message;
-		if (isDiffable(message) || typeof message.message === 'string') {
-			return this.textPreview.clear();
-		}
-
-		this.textPreview.value = new ScrollableMarkdownMessage(
-			this.container,
-			this.markdown.value,
-			message.message as IMarkdownString,
-		);
-	}
-
-	public layout(dimension: dom.IDimension): void {
-		this.textPreview.value?.layout(dimension.height, dimension.width);
-	}
-}
-
-class PlainTextMessagePeek extends Disposable implements IPeekOutputRenderer {
-	private readonly widgetDecorations = this._register(new MutableDisposable());
-	private readonly widget = this._register(new MutableDisposable<CodeEditorWidget>());
-	private readonly model = this._register(new MutableDisposable());
-	private dimension?: dom.IDimension;
-
-	constructor(
-		private readonly editor: ICodeEditor | undefined,
-		private readonly container: HTMLElement,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@ITextModelService private readonly modelService: ITextModelService,
-	) {
-		super();
-	}
-
-	public async update(subject: InspectSubject) {
-		if (!(subject instanceof MessageSubject)) {
-			return this.clear();
-		}
-
-		const message = subject.message;
-		if (isDiffable(message) || message.type === TestMessageType.Output || typeof message.message !== 'string') {
-			return this.clear();
-		}
-
-		const modelRef = this.model.value = await this.modelService.createModelReference(subject.messageUri);
-		if (!this.widget.value) {
-			this.widget.value = this.editor ? this.instantiationService.createInstance(
-				EmbeddedCodeEditorWidget,
-				this.container,
-				commonEditorOptions,
-				{},
-				this.editor,
-			) : this.instantiationService.createInstance(
-				CodeEditorWidget,
-				this.container,
-				commonEditorOptions,
-				{ isSimpleWidget: true }
-			);
-
-			if (this.dimension) {
-				this.widget.value.layout(this.dimension);
-			}
-		}
-
-		this.widget.value.setModel(modelRef.object.textEditorModel);
-		this.widget.value.updateOptions(commonEditorOptions);
-		this.widgetDecorations.value = colorizeTestMessageInEditor(message.message, this.widget.value);
-	}
-
-	private clear() {
-		this.widgetDecorations.clear();
-		this.widget.clear();
-		this.model.clear();
-	}
-
-	public layout(dimensions: dom.IDimension) {
-		this.dimension = dimensions;
-		this.widget.value?.layout(dimensions);
-	}
-}
-
-class TerminalMessagePeek extends Disposable implements IPeekOutputRenderer {
-	private dimensions?: dom.IDimension;
-	private readonly terminalCwd = this._register(new MutableObservableValue<string>(''));
-	private readonly xtermLayoutDelayer = this._register(new Delayer(50));
-
-	/** Active terminal instance. */
-	private readonly terminal = this._register(new MutableDisposable<IDetachedTerminalInstance>());
-	/** Listener for streaming result data */
-	private readonly outputDataListener = this._register(new MutableDisposable());
-
-	constructor(
-		private readonly container: HTMLElement,
-		private readonly isInPeekView: boolean,
-		@ITerminalService private readonly terminalService: ITerminalService,
-		@IViewDescriptorService private readonly viewDescriptorService: IViewDescriptorService,
-		@IWorkspaceContextService private readonly workspaceContext: IWorkspaceContextService,
-	) {
-		super();
-	}
-
-	private async makeTerminal() {
-		const prev = this.terminal.value;
-		if (prev) {
-			prev.xterm.clearBuffer();
-			prev.xterm.clearSearchDecorations();
-			// clearBuffer tries to retain the prompt line, but this doesn't exist for tests.
-			// So clear the screen (J) and move to home (H) to ensure previous data is cleaned up.
-			prev.xterm.write(`\x1b[2J\x1b[0;0H`);
-			return prev;
-		}
-
-		const capabilities = new TerminalCapabilityStore();
-		const cwd = this.terminalCwd;
-		capabilities.add(TerminalCapability.CwdDetection, {
-			type: TerminalCapability.CwdDetection,
-			get cwds() { return [cwd.value]; },
-			onDidChangeCwd: cwd.onDidChange,
-			getCwd: () => cwd.value,
-			updateCwd: () => { },
-		});
-
-		return this.terminal.value = await this.terminalService.createDetachedTerminal({
-			rows: 10,
-			cols: 80,
-			readonly: true,
-			capabilities,
-			processInfo: new DetachedProcessInfo({ initialCwd: cwd.value }),
-			colorProvider: {
-				getBackgroundColor: theme => {
-					const terminalBackground = theme.getColor(TERMINAL_BACKGROUND_COLOR);
-					if (terminalBackground) {
-						return terminalBackground;
-					}
-					if (this.isInPeekView) {
-						return theme.getColor(peekViewResultsBackground);
-					}
-					const location = this.viewDescriptorService.getViewLocationById(Testing.ResultsViewId);
-					return location === ViewContainerLocation.Panel
-						? theme.getColor(PANEL_BACKGROUND)
-						: theme.getColor(SIDE_BAR_BACKGROUND);
-				},
-			}
-		});
-	}
-
-	public async update(subject: InspectSubject) {
-		this.outputDataListener.clear();
-		if (subject instanceof TaskSubject) {
-			await this.updateForTaskSubject(subject);
-		} else if (subject instanceof TestOutputSubject || (subject instanceof MessageSubject && subject.message.type === TestMessageType.Output)) {
-			await this.updateForTestSubject(subject);
-		} else {
-			this.clear();
-		}
-	}
-
-	private async updateForTestSubject(subject: TestOutputSubject | MessageSubject) {
-		const that = this;
-		const testItem = subject instanceof TestOutputSubject ? subject.test.item : subject.test;
-		const terminal = await this.updateGenerically<ITaskRawOutput>({
-			subject,
-			noOutputMessage: localize('caseNoOutput', 'The test case did not report any output.'),
-			getTarget: result => result?.tasks[subject.taskIndex].output,
-			*doInitialWrite(output, results) {
-				that.updateCwd(testItem.uri);
-				const state = subject instanceof TestOutputSubject ? subject.test : results.getStateById(testItem.extId);
-				if (!state) {
-					return;
-				}
-
-				for (const message of state.tasks[subject.taskIndex].messages) {
-					if (message.type === TestMessageType.Output) {
-						yield* output.getRangeIter(message.offset, message.length);
-					}
-				}
-			},
-			doListenForMoreData: (output, result, write) => result.onChange(e => {
-				if (e.reason === TestResultItemChangeReason.NewMessage && e.item.item.extId === testItem.extId && e.message.type === TestMessageType.Output) {
-					for (const chunk of output.getRangeIter(e.message.offset, e.message.length)) {
-						write(chunk.buffer);
-					}
-				}
-			}),
-		});
-
-		if (subject instanceof MessageSubject && subject.message.type === TestMessageType.Output && subject.message.marker !== undefined) {
-			terminal?.xterm.selectMarkedRange(getMarkId(subject.message.marker, true), getMarkId(subject.message.marker, false), /* scrollIntoView= */ true);
-		}
-	}
-
-	private updateForTaskSubject(subject: TaskSubject) {
-		return this.updateGenerically<ITestRunTaskResults>({
-			subject,
-			noOutputMessage: localize('runNoOutput', 'The test run did not record any output.'),
-			getTarget: result => result?.tasks[subject.taskIndex],
-			doInitialWrite: (task, result) => {
-				// Update the cwd and use the first test to try to hint at the correct cwd,
-				// but often this will fall back to the first workspace folder.
-				this.updateCwd(Iterable.find(result.tests, t => !!t.item.uri)?.item.uri);
-				return task.output.buffers;
-			},
-			doListenForMoreData: (task, _result, write) => task.output.onDidWriteData(e => write(e.buffer)),
-		});
-	}
-
-	private async updateGenerically<T>(opts: {
-		subject: InspectSubject;
-		noOutputMessage: string;
-		getTarget: (result: ITestResult) => T | undefined;
-		doInitialWrite: (target: T, result: LiveTestResult) => Iterable<VSBuffer>;
-		doListenForMoreData: (target: T, result: LiveTestResult, write: (s: Uint8Array) => void) => IDisposable;
-	}) {
-		const result = opts.subject.result;
-		const target = opts.getTarget(result);
-		if (!target) {
-			return this.clear();
-		}
-
-		const terminal = await this.makeTerminal();
-		let didWriteData = false;
-
-		const pendingWrites = new MutableObservableValue(0);
-		if (result instanceof LiveTestResult) {
-			for (const chunk of opts.doInitialWrite(target, result)) {
-				didWriteData ||= chunk.byteLength > 0;
-				pendingWrites.value++;
-				terminal.xterm.write(chunk.buffer, () => pendingWrites.value--);
-			}
-		} else {
-			didWriteData = true;
-			this.writeNotice(terminal, localize('runNoOutputForPast', 'Test output is only available for new test runs.'));
-		}
-
-		this.attachTerminalToDom(terminal);
-		this.outputDataListener.clear();
-
-		if (result instanceof LiveTestResult && !result.completedAt) {
-			const l1 = result.onComplete(() => {
-				if (!didWriteData) {
-					this.writeNotice(terminal, opts.noOutputMessage);
-				}
-			});
-			const l2 = opts.doListenForMoreData(target, result, data => {
-				terminal.xterm.write(data);
-				didWriteData ||= data.byteLength > 0;
-			});
-
-			this.outputDataListener.value = combinedDisposable(l1, l2);
-		}
-
-		if (!this.outputDataListener.value && !didWriteData) {
-			this.writeNotice(terminal, opts.noOutputMessage);
-		}
-
-		// Ensure pending writes finish, otherwise the selection in `updateForTestSubject`
-		// can happen before the markers are processed.
-		if (pendingWrites.value > 0) {
-			await new Promise<void>(resolve => {
-				const l = pendingWrites.onDidChange(() => {
-					if (pendingWrites.value === 0) {
-						l.dispose();
-						resolve();
-					}
-				});
-			});
-		}
-
-		return terminal;
-	}
-
-	private updateCwd(testUri?: URI) {
-		const wf = (testUri && this.workspaceContext.getWorkspaceFolder(testUri))
-			|| this.workspaceContext.getWorkspace().folders[0];
-		if (wf) {
-			this.terminalCwd.value = wf.uri.fsPath;
-		}
-	}
-
-	private writeNotice(terminal: IDetachedTerminalInstance, str: string) {
-		terminal.xterm.write(formatMessageForTerminal(str));
-	}
-
-	private attachTerminalToDom(terminal: IDetachedTerminalInstance) {
-		terminal.xterm.write('\x1b[?25l'); // hide cursor
-		dom.scheduleAtNextAnimationFrame(dom.getWindow(this.container), () => this.layoutTerminal(terminal));
-		terminal.attachToElement(this.container, { enableGpu: false });
-	}
-
-	private clear() {
-		this.outputDataListener.clear();
-		this.xtermLayoutDelayer.cancel();
-		this.terminal.clear();
-	}
-
-	public layout(dimensions: dom.IDimension) {
-		this.dimensions = dimensions;
-		if (this.terminal.value) {
-			this.layoutTerminal(this.terminal.value, dimensions.width, dimensions.height);
-		}
-	}
-
-	private layoutTerminal(
-		{ xterm }: IDetachedTerminalInstance,
-		width = this.dimensions?.width ?? this.container.clientWidth,
-		height = this.dimensions?.height ?? this.container.clientHeight
-	) {
-		width -= 10 + 20; // scrollbar width + margin
-		this.xtermLayoutDelayer.trigger(() => {
-			const scaled = getXtermScaledDimensions(dom.getWindow(this.container), xterm.getFont(), width, height);
-			if (scaled) {
-				xterm.resize(scaled.cols, scaled.rows);
-			}
-		});
-	}
-}
-
 const hintMessagePeekHeight = (msg: ITestMessage) => {
-	const msgHeight = isDiffable(msg)
+	const msgHeight = ITestMessage.isDiffable(msg)
 		? Math.max(hintPeekStrHeight(msg.actual), hintPeekStrHeight(msg.expected))
 		: hintPeekStrHeight(typeof msg.message === 'string' ? msg.message : msg.message.value);
 
@@ -1738,28 +909,9 @@ const firstLine = (str: string) => {
 	return index === -1 ? str : str.slice(0, index);
 };
 
-const isMultiline = (str: string | undefined) => !!str && str.includes('\n');
 
 const hintPeekStrHeight = (str: string) => Math.min(count(str, '\n'), 24);
 
-class SimpleDiffEditorModel extends EditorModel {
-	public readonly original = this._original.object.textEditorModel;
-	public readonly modified = this._modified.object.textEditorModel;
-
-	constructor(
-		private readonly _original: IReference<IResolvedTextEditorModel>,
-		private readonly _modified: IReference<IResolvedTextEditorModel>,
-	) {
-		super();
-	}
-
-	public override dispose() {
-		super.dispose();
-		this._original.dispose();
-		this._modified.dispose();
-	}
-}
-
 function getOuterEditorFromDiffEditor(codeEditorService: ICodeEditorService): ICodeEditor | null {
 	const diffEditors = codeEditorService.listDiffEditors();
 
@@ -1793,775 +945,6 @@ export class CloseTestPeek extends EditorAction2 {
 	}
 }
 
-interface ITreeElement {
-	type: string;
-	context: unknown;
-	id: string;
-	label: string;
-	onDidChange: Event<void>;
-	labelWithIcons?: readonly (HTMLSpanElement | string)[];
-	icon?: ThemeIcon;
-	description?: string;
-	ariaLabel?: string;
-}
-
-class TestResultElement implements ITreeElement {
-	public readonly changeEmitter = new Emitter<void>();
-	public readonly onDidChange = this.changeEmitter.event;
-	public readonly type = 'result';
-	public readonly context = this.value.id;
-	public readonly id = this.value.id;
-	public readonly label = this.value.name;
-
-	public get icon() {
-		return icons.testingStatesToIcons.get(
-			this.value.completedAt === undefined
-				? TestResultState.Running
-				: maxCountPriority(this.value.counts)
-		);
-	}
-
-	constructor(public readonly value: ITestResult) { }
-}
-
-const openCoverageLabel = localize('openTestCoverage', 'View Test Coverage');
-const closeCoverageLabel = localize('closeTestCoverage', 'Close Test Coverage');
-
-class CoverageElement implements ITreeElement {
-	public readonly type = 'coverage';
-	public readonly context: undefined;
-	public readonly id = `coverage-${this.results.id}/${this.task.id}`;
-	public readonly onDidChange: Event<void>;
-
-	public get label() {
-		return this.isOpen ? closeCoverageLabel : openCoverageLabel;
-	}
-
-	public get icon() {
-		return this.isOpen ? widgetClose : icons.testingCoverageReport;
-	}
-
-	public get isOpen() {
-		return this.coverageService.selected.get()?.fromTaskId === this.task.id;
-	}
-
-	constructor(
-		private readonly results: ITestResult,
-		public readonly task: ITestRunTaskResults,
-		private readonly coverageService: ITestCoverageService,
-	) {
-		this.onDidChange = Event.fromObservableLight(coverageService.selected);
-	}
-
-}
-
-class TestCaseElement implements ITreeElement {
-	public readonly type = 'test';
-	public readonly context: ITestItemContext = {
-		$mid: MarshalledId.TestItemContext,
-		tests: [InternalTestItem.serialize(this.test)],
-	};
-	public readonly id = `${this.results.id}/${this.test.item.extId}`;
-	public readonly description?: string;
-
-	public get onDidChange() {
-		if (!(this.results instanceof LiveTestResult)) {
-			return Event.None;
-		}
-
-		return Event.filter(this.results.onChange, e => e.item.item.extId === this.test.item.extId);
-	}
-
-	public get state() {
-		return this.test.tasks[this.taskIndex].state;
-	}
-
-	public get label() {
-		return this.test.item.label;
-	}
-
-	public get labelWithIcons() {
-		return renderLabelWithIcons(this.label);
-	}
-
-	public get icon() {
-		return icons.testingStatesToIcons.get(this.state);
-	}
-
-	public get outputSubject() {
-		return new TestOutputSubject(this.results, this.taskIndex, this.test);
-	}
-
-
-	constructor(
-		public readonly results: ITestResult,
-		public readonly test: TestResultItem,
-		public readonly taskIndex: number,
-	) { }
-}
-
-class TaskElement implements ITreeElement {
-	public readonly changeEmitter = new Emitter<void>();
-	public readonly onDidChange = this.changeEmitter.event;
-	public readonly type = 'task';
-	public readonly context: string;
-	public readonly id: string;
-	public readonly label: string;
-	public readonly itemsCache = new CreationCache<TestCaseElement>();
-
-	public get icon() {
-		return this.results.tasks[this.index].running ? icons.testingStatesToIcons.get(TestResultState.Running) : undefined;
-	}
-
-	constructor(public readonly results: ITestResult, public readonly task: ITestRunTaskResults, public readonly index: number) {
-		this.id = `${results.id}/${index}`;
-		this.task = results.tasks[index];
-		this.context = String(index);
-		this.label = this.task.name ?? localize('testUnnamedTask', 'Unnamed Task');
-	}
-}
-
-class TestMessageElement implements ITreeElement {
-	public readonly type = 'message';
-	public readonly id: string;
-	public readonly label: string;
-	public readonly uri: URI;
-	public readonly location?: IRichLocation;
-	public readonly description?: string;
-	public readonly contextValue?: string;
-	public readonly message: ITestMessage;
-
-	public get onDidChange() {
-		if (!(this.result instanceof LiveTestResult)) {
-			return Event.None;
-		}
-
-		// rerender when the test case changes so it gets retired events
-		return Event.filter(this.result.onChange, e => e.item.item.extId === this.test.item.extId);
-	}
-
-	public get context(): ITestMessageMenuArgs {
-		return getMessageArgs(this.test, this.message);
-	}
-
-	public get outputSubject() {
-		return new TestOutputSubject(this.result, this.taskIndex, this.test);
-	}
-
-	constructor(
-		public readonly result: ITestResult,
-		public readonly test: TestResultItem,
-		public readonly taskIndex: number,
-		public readonly messageIndex: number,
-	) {
-		const m = this.message = test.tasks[taskIndex].messages[messageIndex];
-
-		this.location = m.location;
-		this.contextValue = m.type === TestMessageType.Error ? m.contextValue : undefined;
-		this.uri = buildTestUri({
-			type: TestUriType.ResultMessage,
-			messageIndex,
-			resultId: result.id,
-			taskIndex,
-			testExtId: test.item.extId
-		});
-
-		this.id = this.uri.toString();
-
-		const asPlaintext = renderTestMessageAsText(m.message);
-		const lines = count(asPlaintext.trimEnd(), '\n');
-		this.label = firstLine(asPlaintext);
-		if (lines > 0) {
-			this.description = lines > 1
-				? localize('messageMoreLinesN', '+ {0} more lines', lines)
-				: localize('messageMoreLines1', '+ 1 more line');
-		}
-	}
-}
-
-type TreeElement = TestResultElement | TestCaseElement | TestMessageElement | TaskElement | CoverageElement;
-
-class OutputPeekTree extends Disposable {
-	private disposed = false;
-	private readonly tree: WorkbenchCompressibleObjectTree<TreeElement, FuzzyScore>;
-	private readonly treeActions: TreeActionsProvider;
-	private readonly requestReveal = this._register(new Emitter<InspectSubject>());
-
-	public readonly onDidRequestReview = this.requestReveal.event;
-
-	constructor(
-		container: HTMLElement,
-		onDidReveal: Event<{ subject: InspectSubject; preserveFocus: boolean }>,
-		options: { showRevealLocationOnMessages: boolean; locationForProgress: string },
-		@IContextMenuService private readonly contextMenuService: IContextMenuService,
-		@ITestResultService results: ITestResultService,
-		@IInstantiationService instantiationService: IInstantiationService,
-		@ITestExplorerFilterState explorerFilter: ITestExplorerFilterState,
-		@ITestCoverageService coverageService: ITestCoverageService,
-		@IProgressService progressService: IProgressService,
-	) {
-		super();
-
-		this.treeActions = instantiationService.createInstance(TreeActionsProvider, options.showRevealLocationOnMessages, this.requestReveal,);
-		const diffIdentityProvider: IIdentityProvider<TreeElement> = {
-			getId(e: TreeElement) {
-				return e.id;
-			}
-		};
-
-		this.tree = this._register(instantiationService.createInstance(
-			WorkbenchCompressibleObjectTree,
-			'Test Output Peek',
-			container,
-			{
-				getHeight: () => 22,
-				getTemplateId: () => TestRunElementRenderer.ID,
-			},
-			[instantiationService.createInstance(TestRunElementRenderer, this.treeActions)],
-			{
-				compressionEnabled: true,
-				hideTwistiesOfChildlessElements: true,
-				identityProvider: diffIdentityProvider,
-				sorter: {
-					compare(a, b) {
-						if (a instanceof TestCaseElement && b instanceof TestCaseElement) {
-							return cmpPriority(a.state, b.state);
-						}
-
-						return 0;
-					},
-				},
-				accessibilityProvider: {
-					getAriaLabel(element: ITreeElement) {
-						return element.ariaLabel || element.label;
-					},
-					getWidgetAriaLabel() {
-						return localize('testingPeekLabel', 'Test Result Messages');
-					}
-				}
-			},
-		)) as WorkbenchCompressibleObjectTree<TreeElement, FuzzyScore>;
-
-		const cc = new CreationCache<TreeElement>();
-		const getTaskChildren = (taskElem: TaskElement): Iterable<ICompressedTreeElement<TreeElement>> => {
-			const { results, index, itemsCache, task } = taskElem;
-			const tests = Iterable.filter(results.tests, test => test.tasks[index].state >= TestResultState.Running || test.tasks[index].messages.length > 0);
-			let result: Iterable<ICompressedTreeElement<TreeElement>> = Iterable.map(tests, test => ({
-				element: itemsCache.getOrCreate(test, () => new TestCaseElement(results, test, index)),
-				incompressible: true,
-				children: getTestChildren(results, test, index),
-			}));
-
-			if (task.coverage.get()) {
-				result = Iterable.concat(
-					Iterable.single<ICompressedTreeElement<TreeElement>>({
-						element: new CoverageElement(results, task, coverageService),
-						collapsible: true,
-						incompressible: true,
-					}),
-					result,
-				);
-			}
-
-			return result;
-		};
-
-		const getTestChildren = (result: ITestResult, test: TestResultItem, taskIndex: number): Iterable<ICompressedTreeElement<TreeElement>> => {
-			return test.tasks[taskIndex].messages
-				.map((m, messageIndex) =>
-					m.type === TestMessageType.Error
-						? { element: cc.getOrCreate(m, () => new TestMessageElement(result, test, taskIndex, messageIndex)), incompressible: false }
-						: undefined
-				)
-				.filter(isDefined);
-		};
-
-		const getResultChildren = (result: ITestResult): Iterable<ICompressedTreeElement<TreeElement>> => {
-			return result.tasks.map((task, taskIndex) => {
-				const taskElem = cc.getOrCreate(task, () => new TaskElement(result, task, taskIndex));
-				return ({
-					element: taskElem,
-					incompressible: false,
-					collapsible: true,
-					children: getTaskChildren(taskElem),
-				});
-			});
-		};
-
-		const getRootChildren = () => results.results.map(result => {
-			const element = cc.getOrCreate(result, () => new TestResultElement(result));
-			return {
-				element,
-				incompressible: true,
-				collapsible: true,
-				collapsed: this.tree.hasElement(element) ? this.tree.isCollapsed(element) : true,
-				children: getResultChildren(result)
-			};
-		});
-
-		// Queued result updates to prevent spamming CPU when lots of tests are
-		// completing and messaging quickly (#142514)
-		const taskChildrenToUpdate = new Set<TaskElement>();
-		const taskChildrenUpdate = this._register(new RunOnceScheduler(() => {
-			for (const taskNode of taskChildrenToUpdate) {
-				if (this.tree.hasElement(taskNode)) {
-					this.tree.setChildren(taskNode, getTaskChildren(taskNode), { diffIdentityProvider });
-				}
-			}
-			taskChildrenToUpdate.clear();
-		}, 300));
-
-		const queueTaskChildrenUpdate = (taskNode: TaskElement) => {
-			taskChildrenToUpdate.add(taskNode);
-			if (!taskChildrenUpdate.isScheduled()) {
-				taskChildrenUpdate.schedule();
-			}
-		};
-
-		const attachToResults = (result: LiveTestResult) => {
-			const resultNode = cc.get(result)! as TestResultElement;
-			const disposable = new DisposableStore();
-			disposable.add(result.onNewTask(i => {
-				if (result.tasks.length === 1) {
-					this.requestReveal.fire(new TaskSubject(result, 0)); // reveal the first task in new runs
-				}
-
-				if (this.tree.hasElement(resultNode)) {
-					this.tree.setChildren(resultNode, getResultChildren(result), { diffIdentityProvider });
-				}
-
-				// note: tasks are bounded and their lifetime is equivalent to that of
-				// the test result, so this doesn't leak indefinitely.
-				const task = result.tasks[i];
-				disposable.add(autorun(reader => {
-					task.coverage.read(reader); // add it to the autorun
-					queueTaskChildrenUpdate(cc.get(task) as TaskElement);
-				}));
-			}));
-			disposable.add(result.onEndTask(index => {
-				(cc.get(result.tasks[index]) as TaskElement | undefined)?.changeEmitter.fire();
-			}));
-
-			disposable.add(result.onChange(e => {
-				// try updating the item in each of its tasks
-				for (const [index, task] of result.tasks.entries()) {
-					const taskNode = cc.get(task) as TaskElement;
-					if (!this.tree.hasElement(taskNode)) {
-						continue;
-					}
-
-					const itemNode = taskNode.itemsCache.get(e.item);
-					if (itemNode && this.tree.hasElement(itemNode)) {
-						if (e.reason === TestResultItemChangeReason.NewMessage && e.message.type === TestMessageType.Error) {
-							this.tree.setChildren(itemNode, getTestChildren(result, e.item, index), { diffIdentityProvider });
-						}
-						return;
-					}
-
-					queueTaskChildrenUpdate(taskNode);
-				}
-			}));
-
-			disposable.add(result.onComplete(() => {
-				resultNode.changeEmitter.fire();
-				disposable.dispose();
-			}));
-
-			return resultNode;
-		};
-
-		this._register(results.onResultsChanged(e => {
-			// little hack here: a result change can cause the peek to be disposed,
-			// but this listener will still be queued. Doing stuff with the tree
-			// will cause errors.
-			if (this.disposed) {
-				return;
-			}
-
-			if ('completed' in e) {
-				(cc.get(e.completed) as TestResultElement | undefined)?.changeEmitter.fire();
-				return;
-			}
-
-			this.tree.setChildren(null, getRootChildren(), { diffIdentityProvider });
-
-			// done after setChildren intentionally so that the ResultElement exists in the cache.
-			if ('started' in e) {
-				for (const child of this.tree.getNode(null).children) {
-					this.tree.collapse(child.element, false);
-				}
-
-				this.tree.expand(attachToResults(e.started), true);
-			}
-		}));
-
-		const revealItem = (element: TreeElement, preserveFocus: boolean) => {
-			this.tree.setFocus([element]);
-			this.tree.setSelection([element]);
-			if (!preserveFocus) {
-				this.tree.domFocus();
-			}
-		};
-
-		this._register(onDidReveal(async ({ subject, preserveFocus = false }) => {
-			if (subject instanceof TaskSubject) {
-				const resultItem = this.tree.getNode(null).children.find(c => {
-					if (c.element instanceof TaskElement) {
-						return c.element.results.id === subject.result.id && c.element.index === subject.taskIndex;
-					}
-					if (c.element instanceof TestResultElement) {
-						return c.element.id === subject.result.id;
-					}
-					return false;
-				});
-
-				if (resultItem) {
-					revealItem(resultItem.element!, preserveFocus);
-				}
-				return;
-			}
-
-			const revealElement = subject instanceof TestOutputSubject
-				? cc.get<TaskElement>(subject.task)?.itemsCache.get(subject.test)
-				: cc.get(subject.message);
-			if (!revealElement || !this.tree.hasElement(revealElement)) {
-				return;
-			}
-
-			const parents: TreeElement[] = [];
-			for (let parent = this.tree.getParentElement(revealElement); parent; parent = this.tree.getParentElement(parent)) {
-				parents.unshift(parent);
-			}
-
-			for (const parent of parents) {
-				this.tree.expand(parent);
-			}
-
-			if (this.tree.getRelativeTop(revealElement) === null) {
-				this.tree.reveal(revealElement, 0.5);
-			}
-
-			revealItem(revealElement, preserveFocus);
-		}));
-
-		this._register(this.tree.onDidOpen(async e => {
-			if (e.element instanceof TestMessageElement) {
-				this.requestReveal.fire(new MessageSubject(e.element.result, e.element.test, e.element.taskIndex, e.element.messageIndex));
-			} else if (e.element instanceof TestCaseElement) {
-				const t = e.element;
-				const message = mapFindTestMessage(e.element.test, (_t, _m, mesasgeIndex, taskIndex) =>
-					new MessageSubject(t.results, t.test, taskIndex, mesasgeIndex));
-				this.requestReveal.fire(message || new TestOutputSubject(t.results, 0, t.test));
-			} else if (e.element instanceof CoverageElement) {
-				const task = e.element.task;
-				if (e.element.isOpen) {
-					return coverageService.closeCoverage();
-				}
-				progressService.withProgress(
-					{ location: options.locationForProgress },
-					() => coverageService.openCoverage(task, true)
-				);
-			}
-		}));
-
-		this._register(this.tree.onDidChangeSelection(evt => {
-			for (const element of evt.elements) {
-				if (element && 'test' in element) {
-					explorerFilter.reveal.value = element.test.item.extId;
-					break;
-				}
-			}
-		}));
-
-
-		this._register(this.tree.onContextMenu(e => this.onContextMenu(e)));
-
-		this.tree.setChildren(null, getRootChildren());
-		for (const result of results.results) {
-			if (!result.completedAt && result instanceof LiveTestResult) {
-				attachToResults(result);
-			}
-		}
-	}
-
-	public layout(height: number, width: number) {
-		this.tree.layout(height, width);
-	}
-
-	private onContextMenu(evt: ITreeContextMenuEvent<ITreeElement | null>) {
-		if (!evt.element) {
-			return;
-		}
-
-		const actions = this.treeActions.provideActionBar(evt.element);
-		this.contextMenuService.showContextMenu({
-			getAnchor: () => evt.anchor,
-			getActions: () => actions.secondary.length
-				? [...actions.primary, new Separator(), ...actions.secondary]
-				: actions.primary,
-			getActionsContext: () => evt.element?.context
-		});
-	}
-
-	public override dispose() {
-		super.dispose();
-		this.disposed = true;
-	}
-}
-
-interface TemplateData {
-	label: HTMLElement;
-	icon: HTMLElement;
-	actionBar: ActionBar;
-	elementDisposable: DisposableStore;
-	templateDisposable: DisposableStore;
-}
-
-class TestRunElementRenderer implements ICompressibleTreeRenderer<ITreeElement, FuzzyScore, TemplateData> {
-	public static readonly ID = 'testRunElementRenderer';
-	public readonly templateId = TestRunElementRenderer.ID;
-
-	constructor(
-		private readonly treeActions: TreeActionsProvider,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-	) { }
-
-	/** @inheritdoc */
-	public renderCompressedElements(node: ITreeNode<ICompressedTreeNode<ITreeElement>, FuzzyScore>, _index: number, templateData: TemplateData): void {
-		const chain = node.element.elements;
-		const lastElement = chain[chain.length - 1];
-		if ((lastElement instanceof TaskElement || lastElement instanceof TestMessageElement) && chain.length >= 2) {
-			this.doRender(chain[chain.length - 2], templateData, lastElement);
-		} else {
-			this.doRender(lastElement, templateData);
-		}
-	}
-
-	/** @inheritdoc */
-	public renderTemplate(container: HTMLElement): TemplateData {
-		const templateDisposable = new DisposableStore();
-		const wrapper = dom.append(container, dom.$('.test-peek-item'));
-		const icon = dom.append(wrapper, dom.$('.state'));
-		const label = dom.append(wrapper, dom.$('.name'));
-
-		const actionBar = new ActionBar(wrapper, {
-			actionViewItemProvider: (action, options) =>
-				action instanceof MenuItemAction
-					? this.instantiationService.createInstance(MenuEntryActionViewItem, action, { hoverDelegate: options.hoverDelegate })
-					: undefined
-		});
-
-		const elementDisposable = new DisposableStore();
-		templateDisposable.add(elementDisposable);
-		templateDisposable.add(actionBar);
-
-		return {
-			icon,
-			label,
-			actionBar,
-			elementDisposable,
-			templateDisposable,
-		};
-	}
-
-	/** @inheritdoc */
-	public renderElement(element: ITreeNode<ITreeElement, FuzzyScore>, _index: number, templateData: TemplateData): void {
-		this.doRender(element.element, templateData);
-	}
-
-	/** @inheritdoc */
-	public disposeTemplate(templateData: TemplateData): void {
-		templateData.templateDisposable.dispose();
-	}
-
-	/** Called to render a new element */
-	private doRender(element: ITreeElement, templateData: TemplateData, subjectElement?: ITreeElement) {
-		templateData.elementDisposable.clear();
-		templateData.elementDisposable.add(
-			element.onDidChange(() => this.doRender(element, templateData, subjectElement)),
-		);
-		this.doRenderInner(element, templateData, subjectElement);
-	}
-
-	/** Called, and may be re-called, to render or re-render an element */
-	private doRenderInner(element: ITreeElement, templateData: TemplateData, subjectElement: ITreeElement | undefined) {
-		let { label, labelWithIcons, description } = element;
-		if (subjectElement instanceof TestMessageElement) {
-			description = subjectElement.label;
-		}
-
-		const descriptionElement = description ? dom.$('span.test-label-description', {}, description) : '';
-		if (labelWithIcons) {
-			dom.reset(templateData.label, ...labelWithIcons, descriptionElement);
-		} else {
-			dom.reset(templateData.label, label, descriptionElement);
-		}
-
-		const icon = element.icon;
-		templateData.icon.className = `computed-state ${icon ? ThemeIcon.asClassName(icon) : ''}`;
-
-		const actions = this.treeActions.provideActionBar(element);
-		templateData.actionBar.clear();
-		templateData.actionBar.context = element.context;
-		templateData.actionBar.push(actions.primary, { icon: true, label: false });
-	}
-}
-
-class TreeActionsProvider {
-	constructor(
-		private readonly showRevealLocationOnMessages: boolean,
-		private readonly requestReveal: Emitter<InspectSubject>,
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
-		@IMenuService private readonly menuService: IMenuService,
-		@ICommandService private readonly commandService: ICommandService,
-		@ITestProfileService private readonly testProfileService: ITestProfileService,
-		@IEditorService private readonly editorService: IEditorService,
-	) { }
-
-	public provideActionBar(element: ITreeElement) {
-		const test = element instanceof TestCaseElement ? element.test : undefined;
-		const capabilities = test ? this.testProfileService.capabilitiesForTest(test) : 0;
-
-		const contextKeys: [string, unknown][] = [
-			['peek', Testing.OutputPeekContributionId],
-			[TestingContextKeys.peekItemType.key, element.type],
-		];
-
-		let id = MenuId.TestPeekElement;
-		const primary: IAction[] = [];
-		const secondary: IAction[] = [];
-
-		if (element instanceof TaskElement) {
-			primary.push(new Action(
-				'testing.outputPeek.showResultOutput',
-				localize('testing.showResultOutput', "Show Result Output"),
-				ThemeIcon.asClassName(Codicon.terminal),
-				undefined,
-				() => this.requestReveal.fire(new TaskSubject(element.results, element.index)),
-			));
-		}
-
-		if (element instanceof TestResultElement) {
-			// only show if there are no collapsed test nodes that have more specific choices
-			if (element.value.tasks.length === 1) {
-				primary.push(new Action(
-					'testing.outputPeek.showResultOutput',
-					localize('testing.showResultOutput', "Show Result Output"),
-					ThemeIcon.asClassName(Codicon.terminal),
-					undefined,
-					() => this.requestReveal.fire(new TaskSubject(element.value, 0)),
-				));
-			}
-
-			primary.push(new Action(
-				'testing.outputPeek.reRunLastRun',
-				localize('testing.reRunLastRun', "Rerun Test Run"),
-				ThemeIcon.asClassName(icons.testingRunIcon),
-				undefined,
-				() => this.commandService.executeCommand('testing.reRunLastRun', element.value.id),
-			));
-
-			if (capabilities & TestRunProfileBitset.Debug) {
-				primary.push(new Action(
-					'testing.outputPeek.debugLastRun',
-					localize('testing.debugLastRun', "Debug Test Run"),
-					ThemeIcon.asClassName(icons.testingDebugIcon),
-					undefined,
-					() => this.commandService.executeCommand('testing.debugLastRun', element.value.id),
-				));
-			}
-		}
-
-		if (element instanceof TestCaseElement || element instanceof TestMessageElement) {
-			contextKeys.push(
-				[TestingContextKeys.testResultOutdated.key, element.test.retired],
-				[TestingContextKeys.testResultState.key, testResultStateToContextValues[element.test.ownComputedState]],
-				...getTestItemContextOverlay(element.test, capabilities),
-			);
-
-			const extId = element.test.item.extId;
-			if (element.test.tasks[element.taskIndex].messages.some(m => m.type === TestMessageType.Output)) {
-				primary.push(new Action(
-					'testing.outputPeek.showResultOutput',
-					localize('testing.showResultOutput', "Show Result Output"),
-					ThemeIcon.asClassName(Codicon.terminal),
-					undefined,
-					() => this.requestReveal.fire(element.outputSubject),
-				));
-			}
-
-			secondary.push(new Action(
-				'testing.outputPeek.revealInExplorer',
-				localize('testing.revealInExplorer', "Reveal in Test Explorer"),
-				ThemeIcon.asClassName(Codicon.listTree),
-				undefined,
-				() => this.commandService.executeCommand('_revealTestInExplorer', extId),
-			));
-
-			if (capabilities & TestRunProfileBitset.Run) {
-				primary.push(new Action(
-					'testing.outputPeek.runTest',
-					localize('run test', 'Run Test'),
-					ThemeIcon.asClassName(icons.testingRunIcon),
-					undefined,
-					() => this.commandService.executeCommand('vscode.runTestsById', TestRunProfileBitset.Run, extId),
-				));
-			}
-
-			if (capabilities & TestRunProfileBitset.Debug) {
-				primary.push(new Action(
-					'testing.outputPeek.debugTest',
-					localize('debug test', 'Debug Test'),
-					ThemeIcon.asClassName(icons.testingDebugIcon),
-					undefined,
-					() => this.commandService.executeCommand('vscode.runTestsById', TestRunProfileBitset.Debug, extId),
-				));
-			}
-
-		}
-
-		if (element instanceof TestMessageElement) {
-			primary.push(new Action(
-				'testing.outputPeek.goToFile',
-				localize('testing.goToFile', "Go to Source"),
-				ThemeIcon.asClassName(Codicon.goToFile),
-				undefined,
-				() => this.commandService.executeCommand('vscode.revealTest', element.test.item.extId),
-			));
-		}
-
-		if (element instanceof TestMessageElement) {
-			id = MenuId.TestMessageContext;
-			contextKeys.push([TestingContextKeys.testMessageContext.key, element.contextValue]);
-			if (this.showRevealLocationOnMessages && element.location) {
-				primary.push(new Action(
-					'testing.outputPeek.goToError',
-					localize('testing.goToError', "Go to Source"),
-					ThemeIcon.asClassName(Codicon.goToFile),
-					undefined,
-					() => this.editorService.openEditor({
-						resource: element.location!.uri,
-						options: {
-							selection: element.location!.range,
-							preserveFocus: true,
-						}
-					}),
-				));
-			}
-		}
-
-
-		const contextOverlay = this.contextKeyService.createOverlay(contextKeys);
-		const result = { primary, secondary };
-		const menu = this.menuService.createMenu(id, contextOverlay);
-		try {
-			createAndFillInActionBarActions(menu, { arg: element.context }, result, 'inline');
-			return result;
-		} finally {
-			menu.dispose();
-		}
-	}
-}
 
 const navWhen = ContextKeyExpr.and(
 	EditorContextKeys.focus,
@@ -2669,6 +1052,31 @@ export class GoToPreviousMessageAction extends Action2 {
 	}
 }
 
+export class CollapsePeekStack extends Action2 {
+	public static readonly ID = 'testing.collapsePeekStack';
+	constructor() {
+		super({
+			id: CollapsePeekStack.ID,
+			title: localize2('testing.collapsePeekStack', 'Collapse Stack Frames'),
+			icon: Codicon.collapseAll,
+			category: Categories.Test,
+			menu: [{
+				id: MenuId.TestPeekTitle,
+				when: TestingContextKeys.peekHasStack,
+				group: 'navigation',
+				order: 4,
+			}],
+		});
+	}
+
+	public override run(accessor: ServicesAccessor) {
+		const editor = getPeekedEditorFromFocus(accessor.get(ICodeEditorService));
+		if (editor) {
+			TestingOutputPeekController.get(editor)?.collapseStack();
+		}
+	}
+}
+
 export class OpenMessageInEditorAction extends Action2 {
 	public static readonly ID = 'testing.openMessageInEditor';
 	constructor() {
@@ -2717,22 +1125,3 @@ export class ToggleTestingPeekHistory extends Action2 {
 		opener.historyVisible.value = !opener.historyVisible.value;
 	}
 }
-
-class CreationCache<T> {
-	private readonly v = new WeakMap<object, T>();
-
-	public get<T2 extends T = T>(key: object): T2 | undefined {
-		return this.v.get(key) as T2 | undefined;
-	}
-
-	public getOrCreate<T2 extends T>(ref: object, factory: () => T2): T2 {
-		const existing = this.v.get(ref);
-		if (existing) {
-			return existing as T2;
-		}
-
-		const fresh = factory();
-		this.v.set(ref, fresh);
-		return fresh;
-	}
-}
diff --git a/src/vs/workbench/contrib/testing/browser/testingProgressUiService.ts b/src/vs/workbench/contrib/testing/browser/testingProgressUiService.ts
index f66099500b6..0910daee70d 100644
--- a/src/vs/workbench/contrib/testing/browser/testingProgressUiService.ts
+++ b/src/vs/workbench/contrib/testing/browser/testingProgressUiService.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { autorun } from 'vs/base/common/observable';
-import { localize } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ExplorerTestCoverageBars } from 'vs/workbench/contrib/testing/browser/testCoverageBars';
-import { AutoOpenTesting, getTestingConfiguration, TestingConfigKeys } from 'vs/workbench/contrib/testing/common/configuration';
-import { Testing } from 'vs/workbench/contrib/testing/common/constants';
-import { ITestCoverageService } from 'vs/workbench/contrib/testing/common/testCoverageService';
-import { isFailedState } from 'vs/workbench/contrib/testing/common/testingStates';
-import { ITestResult, LiveTestResult, TestResultItemChangeReason } from 'vs/workbench/contrib/testing/common/testResult';
-import { ITestResultService } from 'vs/workbench/contrib/testing/common/testResultService';
-import { TestResultState } from 'vs/workbench/contrib/testing/common/testTypes';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { autorun } from '../../../../base/common/observable.js';
+import { localize } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ExplorerTestCoverageBars } from './testCoverageBars.js';
+import { AutoOpenTesting, getTestingConfiguration, TestingConfigKeys } from '../common/configuration.js';
+import { Testing } from '../common/constants.js';
+import { ITestCoverageService } from '../common/testCoverageService.js';
+import { isFailedState } from '../common/testingStates.js';
+import { ITestResult, LiveTestResult, TestResultItemChangeReason } from '../common/testResult.js';
+import { ITestResultService } from '../common/testResultService.js';
+import { TestResultState } from '../common/testTypes.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
 
 /** Workbench contribution that triggers updates in the TestingProgressUi service */
 export class TestingProgressTrigger extends Disposable {
diff --git a/src/vs/workbench/contrib/testing/browser/testingViewPaneContainer.ts b/src/vs/workbench/contrib/testing/browser/testingViewPaneContainer.ts
index 783093f9f78..60f217ad9e4 100644
--- a/src/vs/workbench/contrib/testing/browser/testingViewPaneContainer.ts
+++ b/src/vs/workbench/contrib/testing/browser/testingViewPaneContainer.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
-import { IViewDescriptorService } from 'vs/workbench/common/views';
-import { Testing } from 'vs/workbench/contrib/testing/common/constants';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
+import { localize } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { ViewPaneContainer } from '../../../browser/parts/views/viewPaneContainer.js';
+import { IViewDescriptorService } from '../../../common/views.js';
+import { Testing } from '../common/constants.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
 
 export class TestingViewPaneContainer extends ViewPaneContainer {
 
diff --git a/src/vs/workbench/contrib/testing/browser/theme.ts b/src/vs/workbench/contrib/testing/browser/theme.ts
index 536c03da5f9..ce58627cdc2 100644
--- a/src/vs/workbench/contrib/testing/browser/theme.ts
+++ b/src/vs/workbench/contrib/testing/browser/theme.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Color, RGBA } from 'vs/base/common/color';
-import { localize } from 'vs/nls';
-import { badgeBackground, badgeForeground, chartsGreen, chartsRed, contrastBorder, diffInserted, diffRemoved, editorBackground, editorErrorForeground, editorForeground, editorInfoForeground, opaque, registerColor, transparent } from 'vs/platform/theme/common/colorRegistry';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { TestMessageType, TestResultState } from 'vs/workbench/contrib/testing/common/testTypes';
+import { Color, RGBA } from '../../../../base/common/color.js';
+import { localize } from '../../../../nls.js';
+import { badgeBackground, badgeForeground, chartsGreen, chartsRed, contrastBorder, diffInserted, diffRemoved, editorBackground, editorErrorForeground, editorForeground, editorInfoForeground, opaque, registerColor, transparent } from '../../../../platform/theme/common/colorRegistry.js';
+import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
+import { TestResultState } from '../common/testTypes.js';
 
 export const testingColorIconFailed = registerColor('testing.iconFailed', {
 	dark: '#f14c4c',
@@ -30,33 +30,13 @@ export const testingColorIconPassed = registerColor('testing.iconPassed', {
 	hcLight: '#007100'
 }, localize('testing.iconPassed', "Color for the 'passed' icon in the test explorer."));
 
-export const testingColorRunAction = registerColor('testing.runAction', {
-	dark: testingColorIconPassed,
-	light: testingColorIconPassed,
-	hcDark: testingColorIconPassed,
-	hcLight: testingColorIconPassed
-}, localize('testing.runAction', "Color for 'run' icons in the editor."));
+export const testingColorRunAction = registerColor('testing.runAction', testingColorIconPassed, localize('testing.runAction', "Color for 'run' icons in the editor."));
 
-export const testingColorIconQueued = registerColor('testing.iconQueued', {
-	dark: '#cca700',
-	light: '#cca700',
-	hcDark: '#cca700',
-	hcLight: '#cca700'
-}, localize('testing.iconQueued', "Color for the 'Queued' icon in the test explorer."));
+export const testingColorIconQueued = registerColor('testing.iconQueued', '#cca700', localize('testing.iconQueued', "Color for the 'Queued' icon in the test explorer."));
 
-export const testingColorIconUnset = registerColor('testing.iconUnset', {
-	dark: '#848484',
-	light: '#848484',
-	hcDark: '#848484',
-	hcLight: '#848484'
-}, localize('testing.iconUnset', "Color for the 'Unset' icon in the test explorer."));
+export const testingColorIconUnset = registerColor('testing.iconUnset', '#848484', localize('testing.iconUnset', "Color for the 'Unset' icon in the test explorer."));
 
-export const testingColorIconSkipped = registerColor('testing.iconSkipped', {
-	dark: '#848484',
-	light: '#848484',
-	hcDark: '#848484',
-	hcLight: '#848484'
-}, localize('testing.iconSkipped', "Color for the 'Skipped' icon in the test explorer."));
+export const testingColorIconSkipped = registerColor('testing.iconSkipped', '#848484', localize('testing.iconSkipped', "Color for the 'Skipped' icon in the test explorer."));
 
 export const testingPeekBorder = registerColor('testing.peekBorder', {
 	dark: editorErrorForeground,
@@ -135,51 +115,31 @@ export const testingUncoveredGutterBackground = registerColor('testing.uncovered
 	hcLight: chartsRed
 }, localize('testing.uncoveredGutterBackground', 'Gutter color of regions where code not covered.'));
 
-export const testingCoverCountBadgeBackground = registerColor('testing.coverCountBadgeBackground', {
-	dark: badgeBackground,
-	light: badgeBackground,
-	hcDark: badgeBackground,
-	hcLight: badgeBackground
-}, localize('testing.coverCountBadgeBackground', 'Background for the badge indicating execution count'));
+export const testingCoverCountBadgeBackground = registerColor('testing.coverCountBadgeBackground', badgeBackground, localize('testing.coverCountBadgeBackground', 'Background for the badge indicating execution count'));
 
-export const testingCoverCountBadgeForeground = registerColor('testing.coverCountBadgeForeground', {
-	dark: badgeForeground,
-	light: badgeForeground,
-	hcDark: badgeForeground,
-	hcLight: badgeForeground
-}, localize('testing.coverCountBadgeForeground', 'Foreground for the badge indicating execution count'));
+export const testingCoverCountBadgeForeground = registerColor('testing.coverCountBadgeForeground', badgeForeground, localize('testing.coverCountBadgeForeground', 'Foreground for the badge indicating execution count'));
 
-export const testMessageSeverityColors: {
-	[K in TestMessageType]: {
-		decorationForeground: string;
-		marginBackground: string;
-	};
-} = {
-	[TestMessageType.Error]: {
-		decorationForeground: registerColor(
-			'testing.message.error.decorationForeground',
-			{ dark: editorErrorForeground, light: editorErrorForeground, hcDark: editorForeground, hcLight: editorForeground },
-			localize('testing.message.error.decorationForeground', 'Text color of test error messages shown inline in the editor.')
-		),
-		marginBackground: registerColor(
-			'testing.message.error.lineBackground',
-			{ dark: new Color(new RGBA(255, 0, 0, 0.2)), light: new Color(new RGBA(255, 0, 0, 0.2)), hcDark: null, hcLight: null },
-			localize('testing.message.error.marginBackground', 'Margin color beside error messages shown inline in the editor.')
-		),
-	},
-	[TestMessageType.Output]: {
-		decorationForeground: registerColor(
-			'testing.message.info.decorationForeground',
-			{ dark: transparent(editorForeground, 0.5), light: transparent(editorForeground, 0.5), hcDark: transparent(editorForeground, 0.5), hcLight: transparent(editorForeground, 0.5) },
-			localize('testing.message.info.decorationForeground', 'Text color of test info messages shown inline in the editor.')
-		),
-		marginBackground: registerColor(
-			'testing.message.info.lineBackground',
-			{ dark: null, light: null, hcDark: null, hcLight: null },
-			localize('testing.message.info.marginBackground', 'Margin color beside info messages shown inline in the editor.')
-		),
-	},
-};
+
+registerColor(
+	'testing.message.error.decorationForeground',
+	{ dark: editorErrorForeground, light: editorErrorForeground, hcDark: editorForeground, hcLight: editorForeground },
+	localize('testing.message.error.decorationForeground', 'Text color of test error messages shown inline in the editor.')
+);
+registerColor(
+	'testing.message.error.lineBackground',
+	{ dark: new Color(new RGBA(255, 0, 0, 0.1)), light: new Color(new RGBA(255, 0, 0, 0.1)), hcDark: null, hcLight: null },
+	localize('testing.message.error.marginBackground', 'Margin color beside error messages shown inline in the editor.')
+);
+registerColor(
+	'testing.message.info.decorationForeground',
+	transparent(editorForeground, 0.5),
+	localize('testing.message.info.decorationForeground', 'Text color of test info messages shown inline in the editor.')
+);
+registerColor(
+	'testing.message.info.lineBackground',
+	null,
+	localize('testing.message.info.marginBackground', 'Margin color beside info messages shown inline in the editor.')
+);
 
 export const testStatesToIconColors: { [K in TestResultState]?: string } = {
 	[TestResultState.Errored]: testingColorIconErrored,
@@ -190,47 +150,17 @@ export const testStatesToIconColors: { [K in TestResultState]?: string } = {
 	[TestResultState.Skipped]: testingColorIconSkipped,
 };
 
-export const testingRetiredColorIconErrored = registerColor('testing.iconErrored.retired', {
-	dark: transparent(testingColorIconErrored, 0.7),
-	light: transparent(testingColorIconErrored, 0.7),
-	hcDark: transparent(testingColorIconErrored, 0.7),
-	hcLight: transparent(testingColorIconErrored, 0.7)
-}, localize('testing.iconErrored.retired', "Retired color for the 'Errored' icon in the test explorer."));
+export const testingRetiredColorIconErrored = registerColor('testing.iconErrored.retired', transparent(testingColorIconErrored, 0.7), localize('testing.iconErrored.retired', "Retired color for the 'Errored' icon in the test explorer."));
 
-export const testingRetiredColorIconFailed = registerColor('testing.iconFailed.retired', {
-	dark: transparent(testingColorIconFailed, 0.7),
-	light: transparent(testingColorIconFailed, 0.7),
-	hcDark: transparent(testingColorIconFailed, 0.7),
-	hcLight: transparent(testingColorIconFailed, 0.7)
-}, localize('testing.iconFailed.retired', "Retired color for the 'failed' icon in the test explorer."));
+export const testingRetiredColorIconFailed = registerColor('testing.iconFailed.retired', transparent(testingColorIconFailed, 0.7), localize('testing.iconFailed.retired', "Retired color for the 'failed' icon in the test explorer."));
 
-export const testingRetiredColorIconPassed = registerColor('testing.iconPassed.retired', {
-	dark: transparent(testingColorIconPassed, 0.7),
-	light: transparent(testingColorIconPassed, 0.7),
-	hcDark: transparent(testingColorIconPassed, 0.7),
-	hcLight: transparent(testingColorIconPassed, 0.7)
-}, localize('testing.iconPassed.retired', "Retired color for the 'passed' icon in the test explorer."));
+export const testingRetiredColorIconPassed = registerColor('testing.iconPassed.retired', transparent(testingColorIconPassed, 0.7), localize('testing.iconPassed.retired', "Retired color for the 'passed' icon in the test explorer."));
 
-export const testingRetiredColorIconQueued = registerColor('testing.iconQueued.retired', {
-	dark: transparent(testingColorIconQueued, 0.7),
-	light: transparent(testingColorIconQueued, 0.7),
-	hcDark: transparent(testingColorIconQueued, 0.7),
-	hcLight: transparent(testingColorIconQueued, 0.7)
-}, localize('testing.iconQueued.retired', "Retired color for the 'Queued' icon in the test explorer."));
+export const testingRetiredColorIconQueued = registerColor('testing.iconQueued.retired', transparent(testingColorIconQueued, 0.7), localize('testing.iconQueued.retired', "Retired color for the 'Queued' icon in the test explorer."));
 
-export const testingRetiredColorIconUnset = registerColor('testing.iconUnset.retired', {
-	dark: transparent(testingColorIconUnset, 0.7),
-	light: transparent(testingColorIconUnset, 0.7),
-	hcDark: transparent(testingColorIconUnset, 0.7),
-	hcLight: transparent(testingColorIconUnset, 0.7)
-}, localize('testing.iconUnset.retired', "Retired color for the 'Unset' icon in the test explorer."));
+export const testingRetiredColorIconUnset = registerColor('testing.iconUnset.retired', transparent(testingColorIconUnset, 0.7), localize('testing.iconUnset.retired', "Retired color for the 'Unset' icon in the test explorer."));
 
-export const testingRetiredColorIconSkipped = registerColor('testing.iconSkipped.retired', {
-	dark: transparent(testingColorIconSkipped, 0.7),
-	light: transparent(testingColorIconSkipped, 0.7),
-	hcDark: transparent(testingColorIconSkipped, 0.7),
-	hcLight: transparent(testingColorIconSkipped, 0.7)
-}, localize('testing.iconSkipped.retired', "Retired color for the 'Skipped' icon in the test explorer."));
+export const testingRetiredColorIconSkipped = registerColor('testing.iconSkipped.retired', transparent(testingColorIconSkipped, 0.7), localize('testing.iconSkipped.retired', "Retired color for the 'Skipped' icon in the test explorer."));
 
 export const testStatesToRetiredIconColors: { [K in TestResultState]?: string } = {
 	[TestResultState.Errored]: testingRetiredColorIconErrored,
diff --git a/src/vs/workbench/contrib/testing/common/configuration.ts b/src/vs/workbench/contrib/testing/common/configuration.ts
index 91ca1a2bd18..2912daeabb3 100644
--- a/src/vs/workbench/contrib/testing/common/configuration.ts
+++ b/src/vs/workbench/contrib/testing/common/configuration.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { observableFromEvent } from 'vs/base/common/observable';
-import { localize } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IConfigurationNode } from 'vs/platform/configuration/common/configurationRegistry';
+import { observableFromEvent } from '../../../../base/common/observable.js';
+import { localize } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IConfigurationNode } from '../../../../platform/configuration/common/configurationRegistry.js';
 
 export const enum TestingConfigKeys {
 	AutoRunDelay = 'testing.autoRun.delay',
diff --git a/src/vs/workbench/contrib/testing/common/constants.ts b/src/vs/workbench/contrib/testing/common/constants.ts
index 0c098753237..ab75cdd0b42 100644
--- a/src/vs/workbench/contrib/testing/common/constants.ts
+++ b/src/vs/workbench/contrib/testing/common/constants.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { stripIcons } from 'vs/base/common/iconLabels';
-import { localize } from 'vs/nls';
-import { TestResultState, TestRunProfileBitset } from 'vs/workbench/contrib/testing/common/testTypes';
+import { stripIcons } from '../../../../base/common/iconLabels.js';
+import { localize } from '../../../../nls.js';
+import { TestResultState, TestRunProfileBitset } from './testTypes.js';
 
 export const enum Testing {
 	// marked as "extension" so that any existing test extensions are assigned to it.
@@ -83,6 +83,10 @@ export const enum TestCommandId {
 	GetExplorerSelection = '_testing.getExplorerSelection',
 	GetSelectedProfiles = 'testing.getSelectedProfiles',
 	GoToTest = 'testing.editFocusedTest',
+	GoToRelatedTest = 'testing.goToRelatedTest',
+	PeekRelatedTest = 'testing.peekRelatedTest',
+	GoToRelatedCode = 'testing.goToRelatedCode',
+	PeekRelatedCode = 'testing.peekRelatedCode',
 	HideTestAction = 'testing.hideTest',
 	OpenCoverage = 'testing.openCoverage',
 	OpenOutputPeek = 'testing.openOutputPeek',
diff --git a/src/vs/workbench/contrib/testing/common/getComputedState.ts b/src/vs/workbench/contrib/testing/common/getComputedState.ts
index bcffb8fb522..fe33b38a586 100644
--- a/src/vs/workbench/contrib/testing/common/getComputedState.ts
+++ b/src/vs/workbench/contrib/testing/common/getComputedState.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Iterable } from 'vs/base/common/iterator';
-import { TestResultState } from 'vs/workbench/contrib/testing/common/testTypes';
-import { makeEmptyCounts, maxPriority, statePriority } from 'vs/workbench/contrib/testing/common/testingStates';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { TestResultState } from './testTypes.js';
+import { makeEmptyCounts, maxPriority, statePriority } from './testingStates.js';
 
 /**
  * Accessor for nodes in get and refresh computed state.
diff --git a/src/vs/workbench/contrib/testing/common/mainThreadTestCollection.ts b/src/vs/workbench/contrib/testing/common/mainThreadTestCollection.ts
index 97f2de57063..1a691a3c80f 100644
--- a/src/vs/workbench/contrib/testing/common/mainThreadTestCollection.ts
+++ b/src/vs/workbench/contrib/testing/common/mainThreadTestCollection.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { Iterable } from 'vs/base/common/iterator';
-import { ResourceMap } from 'vs/base/common/map';
-import { URI } from 'vs/base/common/uri';
-import { IMainThreadTestCollection } from 'vs/workbench/contrib/testing/common/testService';
-import { AbstractIncrementalTestCollection, ITestUriCanonicalizer, IncrementalChangeCollector, IncrementalTestCollectionItem, InternalTestItem, TestDiffOpType, TestsDiff } from 'vs/workbench/contrib/testing/common/testTypes';
+import { Emitter } from '../../../../base/common/event.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IMainThreadTestCollection } from './testService.js';
+import { AbstractIncrementalTestCollection, ITestUriCanonicalizer, IncrementalChangeCollector, IncrementalTestCollectionItem, InternalTestItem, TestDiffOpType, TestsDiff } from './testTypes.js';
 
 export class MainThreadTestCollection extends AbstractIncrementalTestCollection<IncrementalTestCollectionItem> implements IMainThreadTestCollection {
 	private testsByUrl = new ResourceMap<Set<IncrementalTestCollectionItem>>();
diff --git a/src/vs/workbench/contrib/testing/common/observableUtils.ts b/src/vs/workbench/contrib/testing/common/observableUtils.ts
index 26c6c087d78..3153f2e5bd8 100644
--- a/src/vs/workbench/contrib/testing/common/observableUtils.ts
+++ b/src/vs/workbench/contrib/testing/common/observableUtils.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { IObservable, IObserver } from 'vs/base/common/observable';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { IObservable, IObserver } from '../../../../base/common/observable.js';
 
 export function onObservableChange<T>(observable: IObservable<unknown, T>, callback: (value: T) => void): IDisposable {
 	const o: IObserver = {
diff --git a/src/vs/workbench/contrib/testing/common/observableValue.ts b/src/vs/workbench/contrib/testing/common/observableValue.ts
index 942a75307e5..6a66ea19b8e 100644
--- a/src/vs/workbench/contrib/testing/common/observableValue.ts
+++ b/src/vs/workbench/contrib/testing/common/observableValue.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { StoredValue } from 'vs/workbench/contrib/testing/common/storedValue';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { StoredValue } from './storedValue.js';
 
 export interface IObservableValue<T> {
 	onDidChange: Event<T>;
diff --git a/src/vs/workbench/contrib/testing/common/storedValue.ts b/src/vs/workbench/contrib/testing/common/storedValue.ts
index dc0255535d5..03d1bcc3533 100644
--- a/src/vs/workbench/contrib/testing/common/storedValue.ts
+++ b/src/vs/workbench/contrib/testing/common/storedValue.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { IStorageService, IStorageValueChangeEvent, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
+import { Event } from '../../../../base/common/event.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { IStorageService, IStorageValueChangeEvent, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 
 export interface IStoredValueSerialization<T> {
 	deserialize(data: string): T;
diff --git a/src/vs/workbench/contrib/testing/common/testCoverage.ts b/src/vs/workbench/contrib/testing/common/testCoverage.ts
index 321434bd602..a5d2f4848d2 100644
--- a/src/vs/workbench/contrib/testing/common/testCoverage.ts
+++ b/src/vs/workbench/contrib/testing/common/testCoverage.ts
@@ -3,20 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { assert } from 'vs/base/common/assert';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { ResourceMap } from 'vs/base/common/map';
-import { deepClone } from 'vs/base/common/objects';
-import { ITransaction, observableSignal } from 'vs/base/common/observable';
-import { IPrefixTreeNode, WellDefinedPrefixTree } from 'vs/base/common/prefixTree';
-import { URI } from 'vs/base/common/uri';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { TestId } from 'vs/workbench/contrib/testing/common/testId';
-import { LiveTestResult } from 'vs/workbench/contrib/testing/common/testResult';
-import { CoverageDetails, ICoverageCount, IFileCoverage } from 'vs/workbench/contrib/testing/common/testTypes';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { deepClone } from '../../../../base/common/objects.js';
+import { ITransaction, observableSignal } from '../../../../base/common/observable.js';
+import { IPrefixTreeNode, WellDefinedPrefixTree } from '../../../../base/common/prefixTree.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { TestId } from './testId.js';
+import { LiveTestResult } from './testResult.js';
+import { CoverageDetails, DetailType, ICoverageCount, IFileCoverage } from './testTypes.js';
 
 export interface ICoverageAccessor {
-	getCoverageDetails: (id: string, token: CancellationToken) => Promise<CoverageDetails[]>;
+	getCoverageDetails: (id: string, testId: string | undefined, token: CancellationToken) => Promise<CoverageDetails[]>;
 }
 
 let incId = 0;
@@ -30,9 +29,6 @@ export class TestCoverage {
 	public readonly tree = new WellDefinedPrefixTree<AbstractFileCoverage>();
 	public readonly associatedData = new Map<unknown, unknown>();
 
-	/** Test IDs that have per-test coverage in this output. */
-	public readonly perTestCoverageIDs = new Set<string>();
-
 	constructor(
 		public readonly result: LiveTestResult,
 		public readonly fromTaskId: string,
@@ -40,6 +36,21 @@ export class TestCoverage {
 		private readonly accessor: ICoverageAccessor,
 	) { }
 
+	/** Gets all test IDs that were included in this test run. */
+	public *allPerTestIDs() {
+		const seen = new Set<string>();
+		for (const root of this.tree.nodes) {
+			if (root.value && root.value.perTestData) {
+				for (const id of root.value.perTestData) {
+					if (!seen.has(id)) {
+						seen.add(id);
+						yield id;
+					}
+				}
+			}
+		}
+	}
+
 	public append(coverage: IFileCoverage, tx: ITransaction | undefined) {
 		const previous = this.getComputedForUri(coverage.uri);
 		const result = this.result;
@@ -59,24 +70,13 @@ export class TestCoverage {
 		// version.
 		const canonical = [...this.treePathForUri(coverage.uri, /* canonical = */ true)];
 		const chain: IPrefixTreeNode<AbstractFileCoverage>[] = [];
-		const isPerTestCoverage = !!coverage.testId;
-		if (coverage.testId) {
-			this.perTestCoverageIDs.add(coverage.testId.toString());
-		}
+
 		this.tree.mutatePath(this.treePathForUri(coverage.uri, /* canonical = */ false), node => {
 			chain.push(node);
 
 			if (chain.length === canonical.length) {
 				// we reached our destination node, apply the coverage as necessary:
-				if (isPerTestCoverage) {
-					const v = node.value ??= new FileCoverage(IFileCoverage.empty(String(incId++), coverage.uri), result, this.accessor);
-					assert(v instanceof FileCoverage, 'coverage is unexpectedly computed');
-					v.perTestData ??= new Map();
-					const perTest = new FileCoverage(coverage, result, this.accessor);
-					perTest.isForTest = { id: coverage.testId!, parent: v };
-					v.perTestData.set(coverage.testId!.toString(), perTest);
-					this.fileCoverage.set(coverage.uri, v);
-				} else if (node.value) {
+				if (node.value) {
 					const v = node.value;
 					// if ID was generated from a test-specific coverage, reassign it to get its real ID in the extension host.
 					v.id = coverage.id;
@@ -87,7 +87,7 @@ export class TestCoverage {
 					const v = node.value = new FileCoverage(coverage, result, this.accessor);
 					this.fileCoverage.set(coverage.uri, v);
 				}
-			} else if (!isPerTestCoverage) {
+			} else {
 				// Otherwise, if this is not a partial per-test coverage, merge the
 				// coverage changes into the chain. Per-test coverages are not complete
 				// and we don't want to consider them for computation.
@@ -104,9 +104,16 @@ export class TestCoverage {
 					node.value.didChange.trigger(tx);
 				}
 			}
+
+			if (coverage.testIds) {
+				node.value!.perTestData ??= new Set();
+				for (const id of coverage.testIds) {
+					node.value!.perTestData.add(id);
+				}
+			}
 		});
 
-		if (chain && !isPerTestCoverage) {
+		if (chain) {
 			this.didAddCoverage.trigger(tx, chain);
 		}
 	}
@@ -118,21 +125,15 @@ export class TestCoverage {
 		const tree = new WellDefinedPrefixTree<AbstractFileCoverage>();
 		for (const node of this.tree.values()) {
 			if (node instanceof FileCoverage) {
-				const fileData = node.perTestData?.get(testId.toString());
-				if (!fileData) {
+				if (!node.perTestData?.has(testId.toString())) {
 					continue;
 				}
 
-				const canonical = [...this.treePathForUri(fileData.uri, /* canonical = */ true)];
+				const canonical = [...this.treePathForUri(node.uri, /* canonical = */ true)];
 				const chain: IPrefixTreeNode<AbstractFileCoverage>[] = [];
-				tree.mutatePath(this.treePathForUri(fileData.uri, /* canonical = */ false), node => {
-					chain.push(node);
-
-					if (chain.length === canonical.length) {
-						node.value = fileData;
-					} else {
-						node.value ??= new BypassedFileCoverage(this.treePathToUri(canonical.slice(0, chain.length)), fileData.fromResult);
-					}
+				tree.mutatePath(this.treePathForUri(node.uri, /* canonical = */ false), n => {
+					chain.push(n);
+					n.value ??= new BypassedFileCoverage(this.treePathToUri(canonical.slice(0, chain.length)), node.fromResult);
 				});
 			}
 		}
@@ -208,6 +209,11 @@ export abstract class AbstractFileCoverage {
 		return getTotalCoveragePercent(this.statement, this.branch, this.declaration);
 	}
 
+	/**
+	 * Per-test coverage data for this file, if available.
+	 */
+	public perTestData?: Set<string>;
+
 	constructor(coverage: IFileCoverage, public readonly fromResult: LiveTestResult) {
 		this.id = coverage.id;
 		this.uri = coverage.uri;
@@ -235,31 +241,46 @@ export class BypassedFileCoverage extends ComputedFileCoverage {
 export class FileCoverage extends AbstractFileCoverage {
 	private _details?: Promise<CoverageDetails[]>;
 	private resolved?: boolean;
+	private _detailsForTest?: Map<string, Promise<CoverageDetails[]>>;
 
 	/** Gets whether details are synchronously available */
 	public get hasSynchronousDetails() {
 		return this._details instanceof Array || this.resolved;
 	}
 
-	/**
-	 * Per-test coverage data for this file, if available.
-	 */
-	public perTestData?: Map<string, FileCoverage>;
-
-	/**
-	 * If this is for a single test item, gets the test item.
-	 */
-	public isForTest?: { id: TestId; parent: FileCoverage };
-
 	constructor(coverage: IFileCoverage, fromResult: LiveTestResult, private readonly accessor: ICoverageAccessor) {
 		super(coverage, fromResult);
 	}
 
+	/**
+	 * Gets per-line coverage details.
+	 */
+	public async detailsForTest(_testId: TestId, token = CancellationToken.None) {
+		this._detailsForTest ??= new Map();
+		const testId = _testId.toString();
+		const prev = this._detailsForTest.get(testId);
+		if (prev) {
+			return prev;
+		}
+
+		const promise = (async () => {
+			try {
+				return await this.accessor.getCoverageDetails(this.id, testId, token);
+			} catch (e) {
+				this._detailsForTest?.delete(testId);
+				throw e;
+			}
+		})();
+
+		this._detailsForTest.set(testId, promise);
+		return promise;
+	}
+
 	/**
 	 * Gets per-line coverage details.
 	 */
 	public async details(token = CancellationToken.None) {
-		this._details ??= this.accessor.getCoverageDetails(this.id, token);
+		this._details ??= this.accessor.getCoverageDetails(this.id, undefined, token);
 
 		try {
 			const d = await this._details;
@@ -271,3 +292,30 @@ export class FileCoverage extends AbstractFileCoverage {
 		}
 	}
 }
+
+export const totalFromCoverageDetails = (uri: URI, details: CoverageDetails[]): IFileCoverage => {
+	const fc: IFileCoverage = {
+		id: '',
+		uri,
+		statement: ICoverageCount.empty(),
+	};
+
+	for (const detail of details) {
+		if (detail.type === DetailType.Statement) {
+			fc.statement.total++;
+			fc.statement.total += detail.count ? 1 : 0;
+
+			for (const branch of detail.branches || []) {
+				fc.branch ??= ICoverageCount.empty();
+				fc.branch.total++;
+				fc.branch.covered += branch.count ? 1 : 0;
+			}
+		} else {
+			fc.declaration ??= ICoverageCount.empty();
+			fc.declaration.total++;
+			fc.declaration.covered += detail.count ? 1 : 0;
+		}
+	}
+
+	return fc;
+};
diff --git a/src/vs/workbench/contrib/testing/common/testCoverageService.ts b/src/vs/workbench/contrib/testing/common/testCoverageService.ts
index 9dfbb798a61..07a3404140c 100644
--- a/src/vs/workbench/contrib/testing/common/testCoverageService.ts
+++ b/src/vs/workbench/contrib/testing/common/testCoverageService.ts
@@ -3,21 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { IObservable, ISettableObservable, observableValue, transaction } from 'vs/base/common/observable';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { bindContextKey, observableConfigValue } from 'vs/platform/observable/common/platformObservableUtils';
-import { TestingConfigKeys } from 'vs/workbench/contrib/testing/common/configuration';
-import { Testing } from 'vs/workbench/contrib/testing/common/constants';
-import { TestCoverage } from 'vs/workbench/contrib/testing/common/testCoverage';
-import { TestId } from 'vs/workbench/contrib/testing/common/testId';
-import { ITestRunTaskResults } from 'vs/workbench/contrib/testing/common/testResult';
-import { ITestResultService } from 'vs/workbench/contrib/testing/common/testResultService';
-import { TestingContextKeys } from 'vs/workbench/contrib/testing/common/testingContextKeys';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { IObservable, ISettableObservable, observableValue, transaction } from '../../../../base/common/observable.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { bindContextKey, observableConfigValue } from '../../../../platform/observable/common/platformObservableUtils.js';
+import { TestingConfigKeys } from './configuration.js';
+import { Testing } from './constants.js';
+import { TestCoverage } from './testCoverage.js';
+import { TestId } from './testId.js';
+import { ITestRunTaskResults } from './testResult.js';
+import { ITestResultService } from './testResultService.js';
+import { TestingContextKeys } from './testingContextKeys.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
 
 export const ITestCoverageService = createDecorator<ITestCoverageService>('testCoverageService');
 
@@ -89,7 +90,7 @@ export class TestCoverageService extends Disposable implements ITestCoverageServ
 		this._register(bindContextKey(
 			TestingContextKeys.hasPerTestCoverage,
 			contextKeyService,
-			reader => !!this.selected.read(reader)?.perTestCoverageIDs.size,
+			reader => !Iterable.isEmpty(this.selected.read(reader)?.allPerTestIDs()),
 		));
 
 		this._register(bindContextKey(
diff --git a/src/vs/workbench/contrib/testing/common/testExclusions.ts b/src/vs/workbench/contrib/testing/common/testExclusions.ts
index 768e931f314..5ac06c15fc1 100644
--- a/src/vs/workbench/contrib/testing/common/testExclusions.ts
+++ b/src/vs/workbench/contrib/testing/common/testExclusions.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { Iterable } from 'vs/base/common/iterator';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { MutableObservableValue } from 'vs/workbench/contrib/testing/common/observableValue';
-import { StoredValue } from 'vs/workbench/contrib/testing/common/storedValue';
-import { InternalTestItem } from 'vs/workbench/contrib/testing/common/testTypes';
+import { Event } from '../../../../base/common/event.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { MutableObservableValue } from './observableValue.js';
+import { StoredValue } from './storedValue.js';
+import { InternalTestItem } from './testTypes.js';
 
 export class TestExclusions extends Disposable {
 	private readonly excluded = this._register(
-		MutableObservableValue.stored(this._register(new StoredValue<ReadonlySet<string>>({
+		MutableObservableValue.stored(new StoredValue<ReadonlySet<string>>({
 			key: 'excludedTestItems',
 			scope: StorageScope.WORKSPACE,
 			target: StorageTarget.MACHINE,
@@ -21,7 +21,7 @@ export class TestExclusions extends Disposable {
 				deserialize: v => new Set(JSON.parse(v)),
 				serialize: v => JSON.stringify([...v])
 			},
-		}, this.storageService)), new Set())
+		}, this.storageService), new Set())
 	);
 
 	constructor(@IStorageService private readonly storageService: IStorageService) {
diff --git a/src/vs/workbench/contrib/testing/common/testExplorerFilterState.ts b/src/vs/workbench/contrib/testing/common/testExplorerFilterState.ts
index 3ab130d114f..fb307fc4443 100644
--- a/src/vs/workbench/contrib/testing/common/testExplorerFilterState.ts
+++ b/src/vs/workbench/contrib/testing/common/testExplorerFilterState.ts
@@ -2,14 +2,14 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { Emitter, Event } from 'vs/base/common/event';
-import { splitGlobAware } from 'vs/base/common/glob';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IObservableValue, MutableObservableValue } from 'vs/workbench/contrib/testing/common/observableValue';
-import { StoredValue } from 'vs/workbench/contrib/testing/common/storedValue';
-import { namespaceTestTag } from 'vs/workbench/contrib/testing/common/testTypes';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { splitGlobAware } from '../../../../base/common/glob.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IObservableValue, MutableObservableValue } from './observableValue.js';
+import { StoredValue } from './storedValue.js';
+import { namespaceTestTag } from './testTypes.js';
 
 export interface ITestExplorerFilterState {
 	_serviceBrand: undefined;
@@ -199,6 +199,7 @@ export const enum TestFilterTerm {
 	Failed = '@failed',
 	Executed = '@executed',
 	CurrentDoc = '@doc',
+	OpenedFiles = '@openedFiles',
 	Hidden = '@hidden',
 }
 
@@ -206,5 +207,6 @@ const allTestFilterTerms: readonly TestFilterTerm[] = [
 	TestFilterTerm.Failed,
 	TestFilterTerm.Executed,
 	TestFilterTerm.CurrentDoc,
+	TestFilterTerm.OpenedFiles,
 	TestFilterTerm.Hidden,
 ];
diff --git a/src/vs/workbench/contrib/testing/common/testId.ts b/src/vs/workbench/contrib/testing/common/testId.ts
index 79fcec77b1d..0b66669342a 100644
--- a/src/vs/workbench/contrib/testing/common/testId.ts
+++ b/src/vs/workbench/contrib/testing/common/testId.ts
@@ -105,7 +105,7 @@ export class TestId {
 	 * todo@connor4312: review usages of this to see if using the WellDefinedPrefixTree is better
 	 */
 	public static isChild(maybeParent: string, maybeChild: string) {
-		return maybeChild.startsWith(maybeParent) && maybeChild[maybeParent.length] === TestIdPathParts.Delimiter;
+		return maybeChild[maybeParent.length] === TestIdPathParts.Delimiter && maybeChild.startsWith(maybeParent);
 	}
 
 	/**
diff --git a/src/vs/workbench/contrib/testing/common/testItemCollection.ts b/src/vs/workbench/contrib/testing/common/testItemCollection.ts
index b048c726402..25531ef78ff 100644
--- a/src/vs/workbench/contrib/testing/common/testItemCollection.ts
+++ b/src/vs/workbench/contrib/testing/common/testItemCollection.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Barrier, isThenable, RunOnceScheduler } from 'vs/base/common/async';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { assertNever } from 'vs/base/common/assert';
-import { applyTestItemUpdate, ITestItem, ITestTag, namespaceTestTag, TestDiffOpType, TestItemExpandState, TestsDiff, TestsDiffOp } from 'vs/workbench/contrib/testing/common/testTypes';
-import { TestId } from 'vs/workbench/contrib/testing/common/testId';
-import { URI } from 'vs/base/common/uri';
+import { Barrier, isThenable, RunOnceScheduler } from '../../../../base/common/async.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { assertNever } from '../../../../base/common/assert.js';
+import { applyTestItemUpdate, ITestItem, ITestTag, namespaceTestTag, TestDiffOpType, TestItemExpandState, TestsDiff, TestsDiffOp } from './testTypes.js';
+import { TestId } from './testId.js';
+import { URI } from '../../../../base/common/uri.js';
 
 /**
  * @private
diff --git a/src/vs/workbench/contrib/testing/common/testProfileService.ts b/src/vs/workbench/contrib/testing/common/testProfileService.ts
index d01101c6919..c37287cb69c 100644
--- a/src/vs/workbench/contrib/testing/common/testProfileService.ts
+++ b/src/vs/workbench/contrib/testing/common/testProfileService.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Iterable } from 'vs/base/common/iterator';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { deepClone } from 'vs/base/common/objects';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { StoredValue } from 'vs/workbench/contrib/testing/common/storedValue';
-import { TestId } from 'vs/workbench/contrib/testing/common/testId';
-import { IMainThreadTestController } from 'vs/workbench/contrib/testing/common/testService';
-import { ITestRunProfile, InternalTestItem, TestRunProfileBitset, testRunProfileBitsetList } from 'vs/workbench/contrib/testing/common/testTypes';
-import { TestingContextKeys } from 'vs/workbench/contrib/testing/common/testingContextKeys';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { deepClone } from '../../../../base/common/objects.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { StoredValue } from './storedValue.js';
+import { TestId } from './testId.js';
+import { IMainThreadTestController } from './testService.js';
+import { ITestItem, ITestRunProfile, InternalTestItem, TestRunProfileBitset, testRunProfileBitsetList } from './testTypes.js';
+import { TestingContextKeys } from './testingContextKeys.js';
 
 export const ITestProfileService = createDecorator<ITestProfileService>('testProfileService');
 
@@ -47,7 +47,7 @@ export interface ITestProfileService {
 	 * there's any usable profiles available for those groups.
 	 * @returns a bitset to use with {@link TestRunProfileBitset}
 	 */
-	capabilitiesForTest(test: InternalTestItem): number;
+	capabilitiesForTest(test: ITestItem): number;
 
 	/**
 	 * Configures a test profile.
@@ -226,15 +226,15 @@ export class TestProfileService extends Disposable implements ITestProfileServic
 	}
 
 	/** @inheritdoc */
-	public capabilitiesForTest(test: InternalTestItem) {
-		const ctrl = this.controllerProfiles.get(test.controllerId);
+	public capabilitiesForTest(test: ITestItem) {
+		const ctrl = this.controllerProfiles.get(TestId.root(test.extId));
 		if (!ctrl) {
 			return 0;
 		}
 
 		let capabilities = 0;
 		for (const profile of ctrl.profiles) {
-			if (!profile.tag || test.item.tags.includes(profile.tag)) {
+			if (!profile.tag || test.tags.includes(profile.tag)) {
 				capabilities |= capabilities & profile.group ? TestRunProfileBitset.HasNonDefaultProfile : profile.group;
 			}
 		}
diff --git a/src/vs/workbench/contrib/testing/common/testResult.ts b/src/vs/workbench/contrib/testing/common/testResult.ts
index 16b78d058cb..53353b58d98 100644
--- a/src/vs/workbench/contrib/testing/common/testResult.ts
+++ b/src/vs/workbench/contrib/testing/common/testResult.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DeferredPromise } from 'vs/base/common/async';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Lazy } from 'vs/base/common/lazy';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IObservable, observableValue } from 'vs/base/common/observable';
-import { language } from 'vs/base/common/platform';
-import { WellDefinedPrefixTree } from 'vs/base/common/prefixTree';
-import { localize } from 'vs/nls';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IComputedStateAccessor, refreshComputedState } from 'vs/workbench/contrib/testing/common/getComputedState';
-import { TestCoverage } from 'vs/workbench/contrib/testing/common/testCoverage';
-import { TestId } from 'vs/workbench/contrib/testing/common/testId';
-import { makeEmptyCounts, maxPriority, statesInOrder, terminalStatePriorities, TestStateCount } from 'vs/workbench/contrib/testing/common/testingStates';
-import { getMarkId, IRichLocation, ISerializedTestResults, ITestItem, ITestMessage, ITestOutputMessage, ITestRunTask, ITestTaskState, ResolvedTestRunRequest, TestItemExpandState, TestMessageType, TestResultItem, TestResultState } from 'vs/workbench/contrib/testing/common/testTypes';
+import { DeferredPromise } from '../../../../base/common/async.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Lazy } from '../../../../base/common/lazy.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IObservable, observableValue } from '../../../../base/common/observable.js';
+import { language } from '../../../../base/common/platform.js';
+import { WellDefinedPrefixTree } from '../../../../base/common/prefixTree.js';
+import { localize } from '../../../../nls.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IComputedStateAccessor, refreshComputedState } from './getComputedState.js';
+import { TestCoverage } from './testCoverage.js';
+import { TestId } from './testId.js';
+import { makeEmptyCounts, maxPriority, statesInOrder, terminalStatePriorities, TestStateCount } from './testingStates.js';
+import { getMarkId, IRichLocation, ISerializedTestResults, ITestItem, ITestMessage, ITestOutputMessage, ITestRunTask, ITestTaskState, ResolvedTestRunRequest, TestItemExpandState, TestMessageType, TestResultItem, TestResultState } from './testTypes.js';
 
 export interface ITestRunTaskResults extends ITestRunTask {
 	/**
@@ -607,7 +607,7 @@ export class LiveTestResult extends Disposable implements ITestResult {
 	private readonly doSerialize = new Lazy((): ISerializedTestResults => ({
 		id: this.id,
 		completedAt: this.completedAt!,
-		tasks: this.tasks.map(t => ({ id: t.id, name: t.name })),
+		tasks: this.tasks.map(t => ({ id: t.id, name: t.name, ctrlId: t.ctrlId, hasCoverage: !!t.coverage.get() })),
 		name: this.name,
 		request: this.request,
 		items: [...this.testById.values()].map(TestResultItem.serializeWithoutMessages),
@@ -616,7 +616,7 @@ export class LiveTestResult extends Disposable implements ITestResult {
 	private readonly doSerializeWithMessages = new Lazy((): ISerializedTestResults => ({
 		id: this.id,
 		completedAt: this.completedAt!,
-		tasks: this.tasks.map(t => ({ id: t.id, name: t.name })),
+		tasks: this.tasks.map(t => ({ id: t.id, name: t.name, ctrlId: t.ctrlId, hasCoverage: !!t.coverage.get() })),
 		name: this.name,
 		request: this.request,
 		items: [...this.testById.values()].map(TestResultItem.serialize),
@@ -675,7 +675,8 @@ export class HydratedTestResult implements ITestResult {
 		this.completedAt = serialized.completedAt;
 		this.tasks = serialized.tasks.map((task, i) => ({
 			id: task.id,
-			name: task.name,
+			name: task.name || localize('testUnnamedTask', 'Unnamed Task'),
+			ctrlId: task.ctrlId,
 			running: false,
 			coverage: observableValue(this, undefined),
 			output: emptyRawOutput,
diff --git a/src/vs/workbench/contrib/testing/common/testResultService.ts b/src/vs/workbench/contrib/testing/common/testResultService.ts
index 88bdd37b5c2..8a836a39086 100644
--- a/src/vs/workbench/contrib/testing/common/testResultService.ts
+++ b/src/vs/workbench/contrib/testing/common/testResultService.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { findFirstIdxMonotonousOrArrLen } from 'vs/base/common/arraysFind';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { Emitter, Event } from 'vs/base/common/event';
-import { createSingleCallFunction } from 'vs/base/common/functional';
-import { Disposable, DisposableStore, dispose, toDisposable } from 'vs/base/common/lifecycle';
-import { generateUuid } from 'vs/base/common/uuid';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { TestingContextKeys } from 'vs/workbench/contrib/testing/common/testingContextKeys';
-import { ITestProfileService } from 'vs/workbench/contrib/testing/common/testProfileService';
-import { ITestResult, LiveTestResult, TestResultItemChange, TestResultItemChangeReason } from 'vs/workbench/contrib/testing/common/testResult';
-import { ITestResultStorage, RETAIN_MAX_RESULTS } from 'vs/workbench/contrib/testing/common/testResultStorage';
-import { ExtensionRunTestsRequest, ITestRunProfile, ResolvedTestRunRequest, TestResultItem, TestResultState, TestRunProfileBitset } from 'vs/workbench/contrib/testing/common/testTypes';
+import { findFirstIdxMonotonousOrArrLen } from '../../../../base/common/arraysFind.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { createSingleCallFunction } from '../../../../base/common/functional.js';
+import { Disposable, DisposableStore, dispose, toDisposable } from '../../../../base/common/lifecycle.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { TestingContextKeys } from './testingContextKeys.js';
+import { ITestProfileService } from './testProfileService.js';
+import { ITestResult, LiveTestResult, TestResultItemChange, TestResultItemChangeReason } from './testResult.js';
+import { ITestResultStorage, RETAIN_MAX_RESULTS } from './testResultStorage.js';
+import { ExtensionRunTestsRequest, ITestRunProfile, ResolvedTestRunRequest, TestResultItem, TestResultState, TestRunProfileBitset } from './testTypes.js';
 
 export type ResultChangeEvent =
 	| { completed: LiveTestResult }
diff --git a/src/vs/workbench/contrib/testing/common/testResultStorage.ts b/src/vs/workbench/contrib/testing/common/testResultStorage.ts
index 6140744e5eb..3796b7c44df 100644
--- a/src/vs/workbench/contrib/testing/common/testResultStorage.ts
+++ b/src/vs/workbench/contrib/testing/common/testResultStorage.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { bufferToStream, newWriteableBufferStream, VSBuffer, VSBufferReadableStream, VSBufferWriteableStream } from 'vs/base/common/buffer';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { isDefined } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IFileService } from 'vs/platform/files/common/files';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { StoredValue } from 'vs/workbench/contrib/testing/common/storedValue';
-import { HydratedTestResult, ITestResult } from 'vs/workbench/contrib/testing/common/testResult';
-import { ISerializedTestResults } from 'vs/workbench/contrib/testing/common/testTypes';
+import { bufferToStream, newWriteableBufferStream, VSBuffer, VSBufferReadableStream, VSBufferWriteableStream } from '../../../../base/common/buffer.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { isDefined } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { StoredValue } from './storedValue.js';
+import { HydratedTestResult, ITestResult } from './testResult.js';
+import { ISerializedTestResults } from './testTypes.js';
 
 export const RETAIN_MAX_RESULTS = 128;
 const RETAIN_MIN_RESULTS = 16;
diff --git a/src/vs/workbench/contrib/testing/common/testService.ts b/src/vs/workbench/contrib/testing/common/testService.ts
index 919fb4dbe1f..fe1d04bc441 100644
--- a/src/vs/workbench/contrib/testing/common/testService.ts
+++ b/src/vs/workbench/contrib/testing/common/testService.ts
@@ -3,36 +3,43 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Event } from 'vs/base/common/event';
-import { Iterable } from 'vs/base/common/iterator';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { MarshalledId } from 'vs/base/common/marshallingIds';
-import { URI } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IObservableValue, MutableObservableValue } from 'vs/workbench/contrib/testing/common/observableValue';
-import { AbstractIncrementalTestCollection, ICallProfileRunHandler, IncrementalTestCollectionItem, InternalTestItem, ITestItemContext, ResolvedTestRunRequest, IStartControllerTests, IStartControllerTestsResult, TestItemExpandState, TestRunProfileBitset, TestsDiff, TestMessageFollowupResponse, TestMessageFollowupRequest } from 'vs/workbench/contrib/testing/common/testTypes';
-import { TestExclusions } from 'vs/workbench/contrib/testing/common/testExclusions';
-import { TestId } from 'vs/workbench/contrib/testing/common/testId';
-import { ITestResult } from 'vs/workbench/contrib/testing/common/testResult';
+import { assert } from '../../../../base/common/assert.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Event } from '../../../../base/common/event.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { MarshalledId } from '../../../../base/common/marshallingIds.js';
+import { IObservable } from '../../../../base/common/observable.js';
+import { IPrefixTreeNode, WellDefinedPrefixTree } from '../../../../base/common/prefixTree.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { Location } from '../../../../editor/common/languages.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { MutableObservableValue } from './observableValue.js';
+import { TestExclusions } from './testExclusions.js';
+import { TestId } from './testId.js';
+import { ITestResult } from './testResult.js';
+import { AbstractIncrementalTestCollection, ICallProfileRunHandler, IncrementalTestCollectionItem, InternalTestItem, IStartControllerTests, IStartControllerTestsResult, ITestItemContext, ResolvedTestRunRequest, TestControllerCapability, TestItemExpandState, TestMessageFollowupRequest, TestMessageFollowupResponse, TestRunProfileBitset, TestsDiff } from './testTypes.js';
 
 export const ITestService = createDecorator<ITestService>('testService');
 
 export interface IMainThreadTestController {
 	readonly id: string;
-	readonly label: IObservableValue<string>;
-	readonly canRefresh: IObservableValue<boolean>;
+	readonly label: IObservable<string>;
+	readonly capabilities: IObservable<TestControllerCapability>;
 	syncTests(token: CancellationToken): Promise<void>;
 	refreshTests(token: CancellationToken): Promise<void>;
 	configureRunProfile(profileId: number): void;
 	expandTest(id: string, levels: number): Promise<void>;
+	getRelatedCode(testId: string, token: CancellationToken): Promise<Location[]>;
 	startContinuousRun(request: ICallProfileRunHandler[], token: CancellationToken): Promise<IStartControllerTestsResult[]>;
 	runTests(request: IStartControllerTests[], token: CancellationToken): Promise<IStartControllerTestsResult[]>;
 }
 
 export interface IMainThreadTestHostProxy {
 	provideTestFollowups(req: TestMessageFollowupRequest, token: CancellationToken): Promise<TestMessageFollowupResponse[]>;
+	getTestsRelatedToCode(uri: URI, position: Position, token: CancellationToken): Promise<string[]>;
 	executeTestFollowup(id: number): Promise<void>;
 	disposeTestFollowups(ids: number[]): void;
 }
@@ -216,6 +223,64 @@ export const testsUnderUri = async function* (testService: ITestService, ident:
 	}
 };
 
+/**
+ * Simplifies the array of tests by preferring test item parents if all of
+ * their children are included.
+ */
+export const simplifyTestsToExecute = (collection: IMainThreadTestCollection, tests: IncrementalTestCollectionItem[]): IncrementalTestCollectionItem[] => {
+	if (tests.length < 2) {
+		return tests;
+	}
+
+	const tree = new WellDefinedPrefixTree<IncrementalTestCollectionItem>();
+	for (const test of tests) {
+		tree.insert(TestId.fromString(test.item.extId).path, test);
+	}
+
+	const out: IncrementalTestCollectionItem[] = [];
+
+	// Returns the node if it and any children should be included. Otherwise
+	// pushes into the `out` any individual children that should be included.
+	const process = (currentId: string[], node: IPrefixTreeNode<IncrementalTestCollectionItem>) => {
+		// directly included, don't try to over-specify, and children should be ignored
+		if (node.value) {
+			return node.value;
+		}
+
+		assert(!!node.children, 'expect to have children');
+
+		const thisChildren: IncrementalTestCollectionItem[] = [];
+		for (const [part, child] of node.children) {
+			currentId.push(part);
+			const c = process(currentId, child);
+			if (c) { thisChildren.push(c); }
+			currentId.pop();
+		}
+
+		if (!thisChildren.length) {
+			return;
+		}
+
+		// If there are multiple children and we have all of them, then tell the
+		// parent this node should be included. Otherwise include children individually.
+		const id = new TestId(currentId);
+		const test = collection.getNodeById(id.toString());
+		if (test?.children.size === thisChildren.length) {
+			return test;
+		}
+
+		out.push(...thisChildren);
+		return;
+	};
+
+	for (const [id, node] of tree.entries) {
+		const n = process([id], node);
+		if (n) { out.push(n); }
+	}
+
+	return out;
+};
+
 /**
  * A run request that expresses the intent of the request and allows the
  * test service to resolve the specifics of the group.
@@ -246,7 +311,7 @@ export interface ITestService {
 	 * Fires when the user requests to cancel a test run -- or all runs, if no
 	 * runId is given.
 	 */
-	readonly onDidCancelTestRun: Event<{ runId: string | undefined }>;
+	readonly onDidCancelTestRun: Event<{ runId: string | undefined; taskId: string | undefined }>;
 
 	/**
 	 * Event that fires when the excluded tests change.
@@ -327,10 +392,20 @@ export interface ITestService {
 	/**
 	 * Cancels an ongoing test run by its ID, or all runs if no ID is given.
 	 */
-	cancelTestRun(runId?: string): void;
+	cancelTestRun(runId?: string, taskId?: string): void;
 
 	/**
 	 * Publishes a test diff for a controller.
 	 */
 	publishDiff(controllerId: string, diff: TestsDiff): void;
+
+	/**
+	 * Gets all tests related to the given code position.
+	 */
+	getTestsRelatedToCode(uri: URI, position: Position, token?: CancellationToken): Promise<InternalTestItem[]>;
+
+	/**
+	 * Gets code related to the given test item.
+	 */
+	getCodeRelatedToTest(test: InternalTestItem, token?: CancellationToken): Promise<Location[]>;
 }
diff --git a/src/vs/workbench/contrib/testing/common/testServiceImpl.ts b/src/vs/workbench/contrib/testing/common/testServiceImpl.ts
index 7b0e47cd891..999a8964a6a 100644
--- a/src/vs/workbench/contrib/testing/common/testServiceImpl.ts
+++ b/src/vs/workbench/contrib/testing/common/testServiceImpl.ts
@@ -3,45 +3,48 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { groupBy } from 'vs/base/common/arrays';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Emitter } from 'vs/base/common/event';
-import { Iterable } from 'vs/base/common/iterator';
-import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { isDefined } from 'vs/base/common/types';
-import { localize } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IWorkspaceTrustRequestService } from 'vs/platform/workspace/common/workspaceTrust';
-import { getTestingConfiguration, TestingConfigKeys } from 'vs/workbench/contrib/testing/common/configuration';
-import { MainThreadTestCollection } from 'vs/workbench/contrib/testing/common/mainThreadTestCollection';
-import { MutableObservableValue } from 'vs/workbench/contrib/testing/common/observableValue';
-import { StoredValue } from 'vs/workbench/contrib/testing/common/storedValue';
-import { TestExclusions } from 'vs/workbench/contrib/testing/common/testExclusions';
-import { TestId } from 'vs/workbench/contrib/testing/common/testId';
-import { TestingContextKeys } from 'vs/workbench/contrib/testing/common/testingContextKeys';
-import { canUseProfileWithTest, ITestProfileService } from 'vs/workbench/contrib/testing/common/testProfileService';
-import { ITestResult } from 'vs/workbench/contrib/testing/common/testResult';
-import { ITestResultService } from 'vs/workbench/contrib/testing/common/testResultService';
-import { AmbiguousRunTestsRequest, IMainThreadTestController, IMainThreadTestHostProxy, ITestFollowups, ITestService } from 'vs/workbench/contrib/testing/common/testService';
-import { InternalTestItem, ITestRunProfile, ResolvedTestRunRequest, TestDiffOpType, TestMessageFollowupRequest, TestsDiff } from 'vs/workbench/contrib/testing/common/testTypes';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { groupBy } from '../../../../base/common/arrays.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { Disposable, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { observableValue } from '../../../../base/common/observable.js';
+import { isDefined } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { Location } from '../../../../editor/common/languages.js';
+import { localize } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { bindContextKey } from '../../../../platform/observable/common/platformObservableUtils.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IWorkspaceTrustRequestService } from '../../../../platform/workspace/common/workspaceTrust.js';
+import { getTestingConfiguration, TestingConfigKeys } from './configuration.js';
+import { MainThreadTestCollection } from './mainThreadTestCollection.js';
+import { MutableObservableValue } from './observableValue.js';
+import { StoredValue } from './storedValue.js';
+import { TestExclusions } from './testExclusions.js';
+import { TestId } from './testId.js';
+import { TestingContextKeys } from './testingContextKeys.js';
+import { canUseProfileWithTest, ITestProfileService } from './testProfileService.js';
+import { ITestResult } from './testResult.js';
+import { ITestResultService } from './testResultService.js';
+import { AmbiguousRunTestsRequest, IMainThreadTestController, IMainThreadTestHostProxy, ITestFollowups, ITestService } from './testService.js';
+import { InternalTestItem, ITestRunProfile, ResolvedTestRunRequest, TestControllerCapability, TestDiffOpType, TestMessageFollowupRequest, TestsDiff } from './testTypes.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
 
 export class TestService extends Disposable implements ITestService {
 	declare readonly _serviceBrand: undefined;
-	private testControllers = new Map<string, IMainThreadTestController>();
+	private testControllers = observableValue<ReadonlyMap<string, IMainThreadTestController>>('testControllers', new Map<string, IMainThreadTestController>());
 	private testExtHosts = new Set<IMainThreadTestHostProxy>();
 
-	private readonly cancelExtensionTestRunEmitter = new Emitter<{ runId: string | undefined }>();
+	private readonly cancelExtensionTestRunEmitter = new Emitter<{ runId: string | undefined; taskId: string | undefined }>();
 	private readonly willProcessDiffEmitter = new Emitter<TestsDiff>();
 	private readonly didProcessDiffEmitter = new Emitter<TestsDiff>();
 	private readonly testRefreshCancellations = new Set<CancellationTokenSource>();
-	private readonly providerCount: IContextKey<number>;
-	private readonly canRefreshTests: IContextKey<boolean>;
 	private readonly isRefreshingTests: IContextKey<boolean>;
 	private readonly activeEditorHasTests: IContextKey<boolean>;
 
@@ -79,11 +82,11 @@ export class TestService extends Disposable implements ITestService {
 	/**
 	 * @inheritdoc
 	 */
-	public readonly showInlineOutput = MutableObservableValue.stored(this._register(new StoredValue<boolean>({
+	public readonly showInlineOutput = this._register(MutableObservableValue.stored(new StoredValue<boolean>({
 		key: 'inlineTestOutputVisible',
 		scope: StorageScope.WORKSPACE,
 		target: StorageTarget.USER
-	}, this.storage)), true);
+	}, this.storage), true));
 
 	constructor(
 		@IContextKeyService contextKeyService: IContextKeyService,
@@ -99,11 +102,24 @@ export class TestService extends Disposable implements ITestService {
 	) {
 		super();
 		this.excluded = instantiationService.createInstance(TestExclusions);
-		this.providerCount = TestingContextKeys.providerCount.bindTo(contextKeyService);
-		this.canRefreshTests = TestingContextKeys.canRefreshTests.bindTo(contextKeyService);
 		this.isRefreshingTests = TestingContextKeys.isRefreshingTests.bindTo(contextKeyService);
 		this.activeEditorHasTests = TestingContextKeys.activeEditorHasTests.bindTo(contextKeyService);
 
+		this._register(bindContextKey(TestingContextKeys.providerCount, contextKeyService,
+			reader => this.testControllers.read(reader).size));
+
+		const bindCapability = (key: RawContextKey<boolean>, capability: TestControllerCapability) =>
+			this._register(bindContextKey(key, contextKeyService, reader =>
+				Iterable.some(
+					this.testControllers.read(reader).values(),
+					ctrl => !!(ctrl.capabilities.read(reader) & capability)
+				),
+			));
+
+		bindCapability(TestingContextKeys.canRefreshTests, TestControllerCapability.Refresh);
+		bindCapability(TestingContextKeys.canGoToRelatedCode, TestControllerCapability.CodeRelatedToTest);
+		bindCapability(TestingContextKeys.canGoToRelatedTest, TestControllerCapability.TestRelatedToCode);
+
 		this._register(editorService.onDidActiveEditorChange(() => this.updateEditorContextKeys()));
 	}
 
@@ -111,20 +127,20 @@ export class TestService extends Disposable implements ITestService {
 	 * @inheritdoc
 	 */
 	public async expandTest(id: string, levels: number) {
-		await this.testControllers.get(TestId.fromString(id).controllerId)?.expandTest(id, levels);
+		await this.testControllers.get().get(TestId.fromString(id).controllerId)?.expandTest(id, levels);
 	}
 
 	/**
 	 * @inheritdoc
 	 */
-	public cancelTestRun(runId?: string) {
-		this.cancelExtensionTestRunEmitter.fire({ runId });
+	public cancelTestRun(runId?: string, taskId?: string) {
+		this.cancelExtensionTestRunEmitter.fire({ runId, taskId });
 
 		if (runId === undefined) {
 			for (const runCts of this.uiRunningTests.values()) {
 				runCts.cancel();
 			}
-		} else {
+		} else if (!taskId) {
 			this.uiRunningTests.get(runId)?.cancel();
 		}
 	}
@@ -208,7 +224,7 @@ export class TestService extends Disposable implements ITestService {
 
 		const byController = groupBy(req.targets, (a, b) => a.controllerId.localeCompare(b.controllerId));
 		const requests = byController.map(
-			group => this.testControllers.get(group[0].controllerId)?.startContinuousRun(
+			group => this.getTestController(group[0].controllerId)?.startContinuousRun(
 				group.map(controlReq => ({
 					excludeExtIds: req.exclude!.filter(t => !controlReq.testIds.includes(t)),
 					profileId: controlReq.profileId,
@@ -251,7 +267,7 @@ export class TestService extends Disposable implements ITestService {
 
 			const byController = groupBy(req.targets, (a, b) => a.controllerId.localeCompare(b.controllerId));
 			const requests = byController.map(
-				group => this.testControllers.get(group[0].controllerId)?.runTests(
+				group => this.getTestController(group[0].controllerId)?.runTests(
 					group.map(controlReq => ({
 						runId: result.id,
 						excludeExtIds: req.exclude!.filter(t => !controlReq.testIds.includes(t)),
@@ -316,7 +332,7 @@ export class TestService extends Disposable implements ITestService {
 	 * @inheritdoc
 	 */
 	public getTestController(id: string) {
-		return this.testControllers.get(id);
+		return this.testControllers.get().get(id);
 	}
 
 	/**
@@ -325,7 +341,7 @@ export class TestService extends Disposable implements ITestService {
 	public async syncTests(): Promise<void> {
 		const cts = new CancellationTokenSource();
 		try {
-			await Promise.all([...this.testControllers.values()].map(c => c.syncTests(cts.token)));
+			await Promise.all([...this.testControllers.get().values()].map(c => c.syncTests(cts.token)));
 		} finally {
 			cts.dispose(true);
 		}
@@ -341,9 +357,9 @@ export class TestService extends Disposable implements ITestService {
 
 		try {
 			if (controllerId) {
-				await this.testControllers.get(controllerId)?.refreshTests(cts.token);
+				await this.getTestController(controllerId)?.refreshTests(cts.token);
 			} else {
-				await Promise.all([...this.testControllers.values()].map(c => c.refreshTests(cts.token)));
+				await Promise.all([...this.testControllers.get().values()].map(c => c.refreshTests(cts.token)));
 			}
 		} finally {
 			this.testRefreshCancellations.delete(cts);
@@ -366,22 +382,27 @@ export class TestService extends Disposable implements ITestService {
 	/**
 	 * @inheritdoc
 	 */
-	registerExtHost(controller: IMainThreadTestHostProxy): IDisposable {
+	public registerExtHost(controller: IMainThreadTestHostProxy): IDisposable {
 		this.testExtHosts.add(controller);
 		return toDisposable(() => this.testExtHosts.delete(controller));
 	}
 
+	/**
+	 * @inheritdoc
+	 */
+	public async getTestsRelatedToCode(uri: URI, position: Position, token: CancellationToken = CancellationToken.None): Promise<InternalTestItem[]> {
+		const testIds = await Promise.all([...this.testExtHosts.values()].map(v => v.getTestsRelatedToCode(uri, position, token)));
+		// ext host will flush diffs before returning, so we should have everything here:
+		return testIds.flatMap(ids => ids.map(id => this.collection.getNodeById(id))).filter(isDefined);
+	}
+
 	/**
 	 * @inheritdoc
 	 */
 	public registerTestController(id: string, controller: IMainThreadTestController): IDisposable {
-		this.testControllers.set(id, controller);
-		this.providerCount.set(this.testControllers.size);
-		this.updateCanRefresh();
+		this.testControllers.set(new Map(this.testControllers.get()).set(id, controller), undefined);
 
-		const disposable = new DisposableStore();
-
-		disposable.add(toDisposable(() => {
+		return toDisposable(() => {
 			const diff: TestsDiff = [];
 			for (const root of this.collection.rootItems) {
 				if (root.controllerId === id) {
@@ -391,15 +412,17 @@ export class TestService extends Disposable implements ITestService {
 
 			this.publishDiff(id, diff);
 
-			if (this.testControllers.delete(id)) {
-				this.providerCount.set(this.testControllers.size);
-				this.updateCanRefresh();
-			}
-		}));
+			const next = new Map(this.testControllers.get());
+			next.delete(id);
+			this.testControllers.set(next, undefined);
+		});
+	}
 
-		disposable.add(controller.canRefresh.onDidChange(this.updateCanRefresh, this));
-
-		return disposable;
+	/**
+	 * @inheritdoc
+	 */
+	public async getCodeRelatedToTest(test: InternalTestItem, token: CancellationToken = CancellationToken.None): Promise<Location[]> {
+		return (await this.testControllers.get().get(test.controllerId)?.getRelatedCode(test.item.extId, token)) || [];
 	}
 
 	private updateEditorContextKeys() {
@@ -421,10 +444,6 @@ export class TestService extends Disposable implements ITestService {
 		}
 		return;
 	}
-
-	private updateCanRefresh() {
-		this.canRefreshTests.set(Iterable.some(this.testControllers.values(), t => t.canRefresh.value));
-	}
 }
 
 
diff --git a/src/vs/workbench/contrib/testing/common/testTypes.ts b/src/vs/workbench/contrib/testing/common/testTypes.ts
index 941ead40611..154b60c639b 100644
--- a/src/vs/workbench/contrib/testing/common/testTypes.ts
+++ b/src/vs/workbench/contrib/testing/common/testTypes.ts
@@ -3,13 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { MarshalledId } from 'vs/base/common/marshallingIds';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { TestId } from 'vs/workbench/contrib/testing/common/testId';
-
+import { IMarkdownString } from '../../../../base/common/htmlContent.js';
+import { MarshalledId } from '../../../../base/common/marshallingIds.js';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
+import { IPosition, Position } from '../../../../editor/common/core/position.js';
+import { IRange, Range } from '../../../../editor/common/core/range.js';
+import { TestId } from './testId.js';
 
 export const enum TestResultState {
 	Unset = 0,
@@ -38,6 +37,12 @@ export const enum ExtTestRunProfileKind {
 	Coverage = 3,
 }
 
+export const enum TestControllerCapability {
+	Refresh = 1 << 1,
+	CodeRelatedToTest = 1 << 2,
+	TestRelatedToCode = 1 << 3,
+}
+
 export const enum TestRunProfileBitset {
 	Run = 1 << 1,
 	Debug = 1 << 2,
@@ -169,6 +174,32 @@ export const enum TestMessageType {
 	Output
 }
 
+export interface ITestMessageStackFrame {
+	label: string;
+	uri: URI | undefined;
+	position: Position | undefined;
+}
+
+export namespace ITestMessageStackFrame {
+	export interface Serialized {
+		label: string;
+		uri: UriComponents | undefined;
+		position: IPosition | undefined;
+	}
+
+	export const serialize = (stack: Readonly<ITestMessageStackFrame>): Serialized => ({
+		label: stack.label,
+		uri: stack.uri?.toJSON(),
+		position: stack.position?.toJSON(),
+	});
+
+	export const deserialize = (uriIdentity: ITestUriCanonicalizer, stack: Serialized): ITestMessageStackFrame => ({
+		label: stack.label,
+		uri: stack.uri ? uriIdentity.asCanonicalUri(URI.revive(stack.uri)) : undefined,
+		position: stack.position ? Position.lift(stack.position) : undefined,
+	});
+}
+
 export interface ITestErrorMessage {
 	message: string | IMarkdownString;
 	type: TestMessageType.Error;
@@ -176,6 +207,7 @@ export interface ITestErrorMessage {
 	actual: string | undefined;
 	contextValue: string | undefined;
 	location: IRichLocation | undefined;
+	stackTrace: undefined | ITestMessageStackFrame[];
 }
 
 export namespace ITestErrorMessage {
@@ -186,6 +218,7 @@ export namespace ITestErrorMessage {
 		actual: string | undefined;
 		contextValue: string | undefined;
 		location: IRichLocation.Serialize | undefined;
+		stackTrace: undefined | ITestMessageStackFrame.Serialized[];
 	}
 
 	export const serialize = (message: Readonly<ITestErrorMessage>): Serialized => ({
@@ -195,6 +228,7 @@ export namespace ITestErrorMessage {
 		actual: message.actual,
 		contextValue: message.contextValue,
 		location: message.location && IRichLocation.serialize(message.location),
+		stackTrace: message.stackTrace?.map(ITestMessageStackFrame.serialize),
 	});
 
 	export const deserialize = (uriIdentity: ITestUriCanonicalizer, message: Serialized): ITestErrorMessage => ({
@@ -204,6 +238,7 @@ export namespace ITestErrorMessage {
 		actual: message.actual,
 		contextValue: message.contextValue,
 		location: message.location && IRichLocation.deserialize(uriIdentity, message.location),
+		stackTrace: message.stackTrace && message.stackTrace.map(s => ITestMessageStackFrame.deserialize(uriIdentity, s)),
 	});
 }
 
@@ -258,6 +293,9 @@ export namespace ITestMessage {
 
 	export const deserialize = (uriIdentity: ITestUriCanonicalizer, message: Serialized): ITestMessage =>
 		message.type === TestMessageType.Error ? ITestErrorMessage.deserialize(uriIdentity, message) : ITestOutputMessage.deserialize(uriIdentity, message);
+
+	export const isDiffable = (message: ITestMessage): message is ITestErrorMessage & { actual: string; expected: string } =>
+		message.type === TestMessageType.Error && message.actual !== undefined && message.expected !== undefined;
 }
 
 export interface ITestTaskState {
@@ -294,8 +332,9 @@ export namespace ITestTaskState {
 
 export interface ITestRunTask {
 	id: string;
-	name: string | undefined;
+	name: string;
 	running: boolean;
+	ctrlId: string;
 }
 
 export interface ITestTag {
@@ -546,7 +585,7 @@ export interface ISerializedTestResults {
 	/** Subset of test result items */
 	items: TestResultItem.Serialized[];
 	/** Tasks involved in the run. */
-	tasks: { id: string; name: string | undefined }[];
+	tasks: { id: string; name: string | undefined; ctrlId: string; hasCoverage: boolean }[];
 	/** Human-readable name of the test run. */
 	name: string;
 	/** Test trigger informaton */
@@ -573,7 +612,7 @@ export namespace ICoverageCount {
 export interface IFileCoverage {
 	id: string;
 	uri: URI;
-	testId?: TestId;
+	testIds?: string[];
 	statement: ICoverageCount;
 	branch?: ICoverageCount;
 	declaration?: ICoverageCount;
@@ -583,7 +622,7 @@ export namespace IFileCoverage {
 	export interface Serialized {
 		id: string;
 		uri: UriComponents;
-		testId: string | undefined;
+		testIds: string[] | undefined;
 		statement: ICoverageCount;
 		branch?: ICoverageCount;
 		declaration?: ICoverageCount;
@@ -594,7 +633,7 @@ export namespace IFileCoverage {
 		statement: original.statement,
 		branch: original.branch,
 		declaration: original.declaration,
-		testId: original.testId?.toString(),
+		testIds: original.testIds,
 		uri: original.uri.toJSON(),
 	});
 
@@ -603,14 +642,13 @@ export namespace IFileCoverage {
 		statement: serialized.statement,
 		branch: serialized.branch,
 		declaration: serialized.declaration,
-		testId: serialized.testId ? TestId.fromString(serialized.testId) : undefined,
+		testIds: serialized.testIds,
 		uri: uriIdentity.asCanonicalUri(URI.revive(serialized.uri)),
 	});
 
 	export const empty = (id: string, uri: URI): IFileCoverage => ({
 		id,
 		uri,
-		testId: undefined,
 		statement: ICoverageCount.empty(),
 	});
 }
diff --git a/src/vs/workbench/contrib/testing/common/testingContentProvider.ts b/src/vs/workbench/contrib/testing/common/testingContentProvider.ts
index 8f4dab17dc1..3ef6281ac64 100644
--- a/src/vs/workbench/contrib/testing/common/testingContentProvider.ts
+++ b/src/vs/workbench/contrib/testing/common/testingContentProvider.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { removeAnsiEscapeCodes } from 'vs/base/common/strings';
-import { URI } from 'vs/base/common/uri';
-import { ILanguageSelection, ILanguageService } from 'vs/editor/common/languages/language';
-import { ITextModel } from 'vs/editor/common/model';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ITextModelContentProvider, ITextModelService } from 'vs/editor/common/services/resolverService';
-import { localize } from 'vs/nls';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { ITestResultService } from 'vs/workbench/contrib/testing/common/testResultService';
-import { TestMessageType } from 'vs/workbench/contrib/testing/common/testTypes';
-import { TEST_DATA_SCHEME, TestUriType, parseTestUri } from 'vs/workbench/contrib/testing/common/testingUri';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { removeAnsiEscapeCodes } from '../../../../base/common/strings.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ILanguageSelection, ILanguageService } from '../../../../editor/common/languages/language.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ITextModelContentProvider, ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { localize } from '../../../../nls.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { ITestResultService } from './testResultService.js';
+import { TestMessageType } from './testTypes.js';
+import { TEST_DATA_SCHEME, TestUriType, parseTestUri } from './testingUri.js';
 
 /**
  * A content provider that returns various outputs for tests. This is used
diff --git a/src/vs/workbench/contrib/testing/common/testingContextKeys.ts b/src/vs/workbench/contrib/testing/common/testingContextKeys.ts
index 1463fb3c1d4..a071624328d 100644
--- a/src/vs/workbench/contrib/testing/common/testingContextKeys.ts
+++ b/src/vs/workbench/contrib/testing/common/testingContextKeys.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { TestExplorerViewMode, TestExplorerViewSorting } from 'vs/workbench/contrib/testing/common/constants';
-import { TestRunProfileBitset } from 'vs/workbench/contrib/testing/common/testTypes';
+import { localize } from '../../../../nls.js';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { TestExplorerViewMode, TestExplorerViewSorting } from './constants.js';
+import { TestRunProfileBitset } from './testTypes.js';
 
 export namespace TestingContextKeys {
 	export const providerCount = new RawContextKey('testing.providerCount', 0);
@@ -21,11 +21,15 @@ export namespace TestingContextKeys {
 	export const supportsContinuousRun = new RawContextKey('testing.supportsContinuousRun', false, { type: 'boolean', description: localize('testing.supportsContinuousRun', 'Indicates whether continous test running is supported') });
 	export const isParentRunningContinuously = new RawContextKey('testing.isParentRunningContinuously', false, { type: 'boolean', description: localize('testing.isParentRunningContinuously', 'Indicates whether the parent of a test is continuously running, set in the menu context of test items') });
 	export const activeEditorHasTests = new RawContextKey('testing.activeEditorHasTests', false, { type: 'boolean', description: localize('testing.activeEditorHasTests', 'Indicates whether any tests are present in the current editor') });
+	export const cursorInsideTestRange = new RawContextKey('testing.cursorInsideTestRange', false, { type: 'boolean', description: localize('testing.cursorInsideTestRange', 'Whether the cursor is currently inside a test range') });
 	export const isTestCoverageOpen = new RawContextKey('testing.isTestCoverageOpen', false, { type: 'boolean', description: localize('testing.isTestCoverageOpen', 'Indicates whether a test coverage report is open') });
 	export const hasPerTestCoverage = new RawContextKey('testing.hasPerTestCoverage', false, { type: 'boolean', description: localize('testing.hasPerTestCoverage', 'Indicates whether per-test coverage is available') });
 	export const isCoverageFilteredToTest = new RawContextKey('testing.isCoverageFilteredToTest', false, { type: 'boolean', description: localize('testing.isCoverageFilteredToTest', 'Indicates whether coverage has been filterd to a single test') });
 	export const coverageToolbarEnabled = new RawContextKey('testing.coverageToolbarEnabled', true, { type: 'boolean', description: localize('testing.coverageToolbarEnabled', 'Indicates whether the coverage toolbar is enabled') });
 	export const inlineCoverageEnabled = new RawContextKey('testing.inlineCoverageEnabled', false, { type: 'boolean', description: localize('testing.inlineCoverageEnabled', 'Indicates whether inline coverage is shown') });
+	export const canGoToRelatedCode = new RawContextKey('testing.canGoToRelatedCode', false, { type: 'boolean', description: localize('testing.canGoToRelatedCode', 'Whether a controller implements a capability to find code related to a test') });
+	export const canGoToRelatedTest = new RawContextKey('testing.canGoToRelatedTest', false, { type: 'boolean', description: localize('testing.canGoToRelatedTest', 'Whether a controller implements a capability to find tests related to code') });
+	export const peekHasStack = new RawContextKey('testing.peekHasStack', false, { type: 'boolean', description: localize('testing.peekHasStack', 'Whether the message shown in a peek view has a stack trace') });
 
 	export const capabilityToContextKey: { [K in TestRunProfileBitset]: RawContextKey<boolean> } = {
 		[TestRunProfileBitset.Run]: hasRunnableTests,
@@ -75,4 +79,8 @@ export namespace TestingContextKeys {
 		type: 'string',
 		description: localize('testing.testResultState', 'Value available testing/item/result indicating the state of the item.')
 	});
+	export const testProfileContextGroup = new RawContextKey<string>('testing.profile.context.group', undefined, {
+		type: 'string',
+		description: localize('testing.profile.context.group', 'Type of menu where the configure testing profile submenu exists. Either "run", "debug", or "coverage"')
+	});
 }
diff --git a/src/vs/workbench/contrib/testing/common/testingContinuousRunService.ts b/src/vs/workbench/contrib/testing/common/testingContinuousRunService.ts
index 47be6dfacba..05172622de3 100644
--- a/src/vs/workbench/contrib/testing/common/testingContinuousRunService.ts
+++ b/src/vs/workbench/contrib/testing/common/testingContinuousRunService.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { StoredValue } from 'vs/workbench/contrib/testing/common/storedValue';
-import { TestingContextKeys } from 'vs/workbench/contrib/testing/common/testingContextKeys';
-import { ITestService } from 'vs/workbench/contrib/testing/common/testService';
-import { TestService } from 'vs/workbench/contrib/testing/common/testServiceImpl';
-import { ITestRunProfile, TestRunProfileBitset } from 'vs/workbench/contrib/testing/common/testTypes';
-import { Emitter, Event } from 'vs/base/common/event';
-import { TestId } from 'vs/workbench/contrib/testing/common/testId';
-import { WellDefinedPrefixTree } from 'vs/base/common/prefixTree';
-import { ITestProfileService } from 'vs/workbench/contrib/testing/common/testProfileService';
-import * as arrays from 'vs/base/common/arrays';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { StoredValue } from './storedValue.js';
+import { TestingContextKeys } from './testingContextKeys.js';
+import { ITestService } from './testService.js';
+import { TestService } from './testServiceImpl.js';
+import { ITestRunProfile, TestRunProfileBitset } from './testTypes.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { TestId } from './testId.js';
+import { WellDefinedPrefixTree } from '../../../../base/common/prefixTree.js';
+import { ITestProfileService } from './testProfileService.js';
+import * as arrays from '../../../../base/common/arrays.js';
 
 export const ITestingContinuousRunService = createDecorator<ITestingContinuousRunService>('testingContinuousRunService');
 
diff --git a/src/vs/workbench/contrib/testing/common/testingDecorations.ts b/src/vs/workbench/contrib/testing/common/testingDecorations.ts
index 80900e00901..0bfa2aa56ff 100644
--- a/src/vs/workbench/contrib/testing/common/testingDecorations.ts
+++ b/src/vs/workbench/contrib/testing/common/testingDecorations.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IAction } from 'vs/base/common/actions';
-import { binarySearch } from 'vs/base/common/arrays';
-import { Event } from 'vs/base/common/event';
-import { URI } from 'vs/base/common/uri';
-import { Position } from 'vs/editor/common/core/position';
-import { IModelDeltaDecoration } from 'vs/editor/common/model';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ITestMessage } from 'vs/workbench/contrib/testing/common/testTypes';
+import { IAction } from '../../../../base/common/actions.js';
+import { binarySearch } from '../../../../base/common/arrays.js';
+import { Event } from '../../../../base/common/event.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { IModelDeltaDecoration } from '../../../../editor/common/model.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { ITestMessage } from './testTypes.js';
 
 export interface ITestingDecorationsService {
 	_serviceBrand: undefined;
@@ -41,6 +41,11 @@ export interface ITestingDecorationsService {
 	 * Returns undefined if there's no such decoration.
 	 */
 	getDecoratedTestPosition(resource: URI, testId: string): Position | undefined;
+
+	/**
+	 * Sets that alternative actions are displayed on the model.
+	 */
+	updateDecorationsAlternateAction(resource: URI, isAlt: boolean): void;
 }
 
 export interface ITestDecoration {
diff --git a/src/vs/workbench/contrib/testing/common/testingPeekOpener.ts b/src/vs/workbench/contrib/testing/common/testingPeekOpener.ts
index c00dbf9ad51..41557f12518 100644
--- a/src/vs/workbench/contrib/testing/common/testingPeekOpener.ts
+++ b/src/vs/workbench/contrib/testing/common/testingPeekOpener.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { ITextEditorOptions } from 'vs/platform/editor/common/editor';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { TestResultItem } from 'vs/workbench/contrib/testing/common/testTypes';
-import { ITestResult } from 'vs/workbench/contrib/testing/common/testResult';
-import { IEditor } from 'vs/editor/common/editorCommon';
-import { MutableObservableValue } from 'vs/workbench/contrib/testing/common/observableValue';
+import { URI } from '../../../../base/common/uri.js';
+import { ITextEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { TestResultItem } from './testTypes.js';
+import { ITestResult } from './testResult.js';
+import { IEditor } from '../../../../editor/common/editorCommon.js';
+import { MutableObservableValue } from './observableValue.js';
 
 export interface IShowResultOptions {
 	/** Reveal the peek, if configured, in the given editor */
diff --git a/src/vs/workbench/contrib/testing/common/testingStates.ts b/src/vs/workbench/contrib/testing/common/testingStates.ts
index bcb75ddd6d7..1773645067a 100644
--- a/src/vs/workbench/contrib/testing/common/testingStates.ts
+++ b/src/vs/workbench/contrib/testing/common/testingStates.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { mapValues } from 'vs/base/common/objects';
-import { TestResultState } from 'vs/workbench/contrib/testing/common/testTypes';
+import { mapValues } from '../../../../base/common/objects.js';
+import { TestResultState } from './testTypes.js';
 
 export type TreeStateNode = { statusNode: true; state: TestResultState; priority: number };
 
diff --git a/src/vs/workbench/contrib/testing/common/testingUri.ts b/src/vs/workbench/contrib/testing/common/testingUri.ts
index e5cf6102843..f6e792c873b 100644
--- a/src/vs/workbench/contrib/testing/common/testingUri.ts
+++ b/src/vs/workbench/contrib/testing/common/testingUri.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { assertNever } from 'vs/base/common/assert';
-import { URI } from 'vs/base/common/uri';
+import { assertNever } from '../../../../base/common/assert.js';
+import { URI } from '../../../../base/common/uri.js';
 
 export const TEST_DATA_SCHEME = 'vscode-test-data';
 
diff --git a/src/vs/workbench/contrib/testing/test/browser/codeCoverageDecorations.test.ts b/src/vs/workbench/contrib/testing/test/browser/codeCoverageDecorations.test.ts
index 38c00c2fb3b..102ce198d80 100644
--- a/src/vs/workbench/contrib/testing/test/browser/codeCoverageDecorations.test.ts
+++ b/src/vs/workbench/contrib/testing/test/browser/codeCoverageDecorations.test.ts
@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 
-import { assertSnapshot } from 'vs/base/test/common/snapshot';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { ITextModel } from 'vs/editor/common/model';
-import { CoverageDetailsModel } from 'vs/workbench/contrib/testing/browser/codeCoverageDecorations';
-import { CoverageDetails, DetailType } from 'vs/workbench/contrib/testing/common/testTypes';
+import { assertSnapshot } from '../../../../../base/test/common/snapshot.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Position } from '../../../../../editor/common/core/position.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
+import { CoverageDetailsModel } from '../../browser/codeCoverageDecorations.js';
+import { CoverageDetails, DetailType } from '../../common/testTypes.js';
 
 suite('Code Coverage Decorations', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/contrib/testing/test/browser/explorerProjections/nameProjection.test.ts b/src/vs/workbench/contrib/testing/test/browser/explorerProjections/nameProjection.test.ts
index f0709ccc4e5..1cb9b6f16bf 100644
--- a/src/vs/workbench/contrib/testing/test/browser/explorerProjections/nameProjection.test.ts
+++ b/src/vs/workbench/contrib/testing/test/browser/explorerProjections/nameProjection.test.ts
@@ -4,14 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Emitter } from 'vs/base/common/event';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ListProjection } from 'vs/workbench/contrib/testing/browser/explorerProjections/listProjection';
-import { TestId } from 'vs/workbench/contrib/testing/common/testId';
-import { TestResultItemChange } from 'vs/workbench/contrib/testing/common/testResult';
-import { TestDiffOpType, TestItemExpandState } from 'vs/workbench/contrib/testing/common/testTypes';
-import { TestTreeTestHarness } from 'vs/workbench/contrib/testing/test/browser/testObjectTree';
-import { TestTestItem } from 'vs/workbench/contrib/testing/test/common/testStubs';
+import { Emitter } from '../../../../../../base/common/event.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { ListProjection } from '../../../browser/explorerProjections/listProjection.js';
+import { TestId } from '../../../common/testId.js';
+import { TestResultItemChange } from '../../../common/testResult.js';
+import { TestDiffOpType, TestItemExpandState } from '../../../common/testTypes.js';
+import { TestTreeTestHarness } from '../testObjectTree.js';
+import { TestTestItem } from '../../common/testStubs.js';
 
 suite('Workbench - Testing Explorer Hierarchal by Name Projection', () => {
 	let harness: TestTreeTestHarness<ListProjection>;
diff --git a/src/vs/workbench/contrib/testing/test/browser/explorerProjections/treeProjection.test.ts b/src/vs/workbench/contrib/testing/test/browser/explorerProjections/treeProjection.test.ts
index d59d15ef1f8..30515da8aa3 100644
--- a/src/vs/workbench/contrib/testing/test/browser/explorerProjections/treeProjection.test.ts
+++ b/src/vs/workbench/contrib/testing/test/browser/explorerProjections/treeProjection.test.ts
@@ -4,15 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Emitter } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { TreeProjection } from 'vs/workbench/contrib/testing/browser/explorerProjections/treeProjection';
-import { TestId } from 'vs/workbench/contrib/testing/common/testId';
-import { TestResultItemChange, TestResultItemChangeReason } from 'vs/workbench/contrib/testing/common/testResult';
-import { TestDiffOpType, TestItemExpandState, TestResultItem, TestResultState } from 'vs/workbench/contrib/testing/common/testTypes';
-import { TestTreeTestHarness } from 'vs/workbench/contrib/testing/test/browser/testObjectTree';
-import { TestTestItem } from 'vs/workbench/contrib/testing/test/common/testStubs';
+import { Emitter } from '../../../../../../base/common/event.js';
+import { DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { TreeProjection } from '../../../browser/explorerProjections/treeProjection.js';
+import { TestId } from '../../../common/testId.js';
+import { TestResultItemChange, TestResultItemChangeReason } from '../../../common/testResult.js';
+import { TestDiffOpType, TestItemExpandState, TestResultItem, TestResultState } from '../../../common/testTypes.js';
+import { TestTreeTestHarness } from '../testObjectTree.js';
+import { TestTestItem } from '../../common/testStubs.js';
 
 class TestHierarchicalByLocationProjection extends TreeProjection {
 }
diff --git a/src/vs/workbench/contrib/testing/test/browser/testObjectTree.ts b/src/vs/workbench/contrib/testing/test/browser/testObjectTree.ts
index 94b282e74b8..74601edb73d 100644
--- a/src/vs/workbench/contrib/testing/test/browser/testObjectTree.ts
+++ b/src/vs/workbench/contrib/testing/test/browser/testObjectTree.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ObjectTree } from 'vs/base/browser/ui/tree/objectTree';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { IWorkspaceFoldersChangeEvent } from 'vs/platform/workspace/common/workspace';
-import { ITestTreeProjection, TestExplorerTreeElement, TestItemTreeElement, TestTreeErrorMessage } from 'vs/workbench/contrib/testing/browser/explorerProjections/index';
-import { MainThreadTestCollection } from 'vs/workbench/contrib/testing/common/mainThreadTestCollection';
-import { TestsDiff, TestsDiffOp } from 'vs/workbench/contrib/testing/common/testTypes';
-import { ITestService } from 'vs/workbench/contrib/testing/common/testService';
-import { testStubs } from 'vs/workbench/contrib/testing/test/common/testStubs';
-import { ITreeRenderer, ITreeSorter } from 'vs/base/browser/ui/tree/tree';
+import { ObjectTree } from '../../../../../base/browser/ui/tree/objectTree.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { IWorkspaceFoldersChangeEvent } from '../../../../../platform/workspace/common/workspace.js';
+import { ITestTreeProjection, TestExplorerTreeElement, TestItemTreeElement, TestTreeErrorMessage } from '../../browser/explorerProjections/index.js';
+import { MainThreadTestCollection } from '../../common/mainThreadTestCollection.js';
+import { TestsDiff, TestsDiffOp } from '../../common/testTypes.js';
+import { ITestService } from '../../common/testService.js';
+import { testStubs } from '../common/testStubs.js';
+import { ITreeRenderer, ITreeSorter } from '../../../../../base/browser/ui/tree/tree.js';
 
 type SerializedTree = { e: string; children?: SerializedTree[]; data?: string };
 
@@ -57,10 +57,6 @@ class TestObjectTree<T> extends ObjectTree<T, any> {
 		this.layout(1000, 200);
 	}
 
-	public getModel() {
-		return this.model;
-	}
-
 	public getRendered(getProperty?: string) {
 		const elements = element.querySelectorAll<HTMLElement>('.monaco-tl-contents');
 		const sorted = [...elements].sort((a, b) => pos(a) - pos(b));
diff --git a/src/vs/workbench/contrib/testing/test/common/testCoverage.test.ts b/src/vs/workbench/contrib/testing/test/common/testCoverage.test.ts
index c4ff9a88753..dccc3e6b6ec 100644
--- a/src/vs/workbench/contrib/testing/test/common/testCoverage.test.ts
+++ b/src/vs/workbench/contrib/testing/test/common/testCoverage.test.ts
@@ -10,14 +10,12 @@
 
 import assert from 'assert';
 import { SinonSandbox, createSandbox } from 'sinon';
-import { Iterable } from 'vs/base/common/iterator';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { onObservableChange } from 'vs/workbench/contrib/testing/common/observableUtils';
-import { ICoverageAccessor, TestCoverage } from 'vs/workbench/contrib/testing/common/testCoverage';
-import { TestId } from 'vs/workbench/contrib/testing/common/testId';
-import { LiveTestResult } from 'vs/workbench/contrib/testing/common/testResult';
-import { IFileCoverage } from 'vs/workbench/contrib/testing/common/testTypes';
+import { URI } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { onObservableChange } from '../../common/observableUtils.js';
+import { ICoverageAccessor, TestCoverage } from '../../common/testCoverage.js';
+import { LiveTestResult } from '../../common/testResult.js';
+import { IFileCoverage } from '../../common/testTypes.js';
 
 suite('TestCoverage', () => {
 	let sandbox: SinonSandbox;
@@ -133,58 +131,4 @@ suite('TestCoverage', () => {
 			],
 		]);
 	});
-
-	test('adds per-test data to files', async () => {
-		const { raw1 } = addTests();
-
-		const raw3: IFileCoverage = {
-			id: '1',
-			testId: TestId.fromString('my-test'),
-			uri: URI.file('/path/to/file'),
-			statement: { covered: 12, total: 24 },
-			branch: { covered: 7, total: 10 },
-			declaration: { covered: 2, total: 5 },
-		};
-		testCoverage.append(raw3, undefined);
-
-		const fileCoverage = testCoverage.getUri(raw1.uri);
-		assert.strictEqual(fileCoverage?.perTestData?.size, 1);
-
-		const perTestCoverage = Iterable.first(fileCoverage!.perTestData!.values());
-		assert.deepStrictEqual(perTestCoverage?.statement, raw3.statement);
-		assert.deepStrictEqual(perTestCoverage?.branch, raw3.branch);
-		assert.deepStrictEqual(perTestCoverage?.declaration, raw3.declaration);
-
-		// should be unchanged:
-		assert.deepEqual(fileCoverage?.statement, { covered: 10, total: 20 });
-		const dirCoverage = testCoverage.getComputedForUri(URI.file('/path/to'));
-		assert.deepEqual(dirCoverage?.statement, { covered: 15, total: 30 });
-	});
-
-	test('works if per-test data is added first', async () => {
-		const raw3: IFileCoverage = {
-			id: '1',
-			testId: TestId.fromString('my-test'),
-			uri: URI.file('/path/to/file'),
-			statement: { covered: 12, total: 24 },
-			branch: { covered: 7, total: 10 },
-			declaration: { covered: 2, total: 5 },
-		};
-		testCoverage.append(raw3, undefined);
-
-		const fileCoverage = testCoverage.getUri(raw3.uri);
-
-		addTests();
-
-		assert.strictEqual(fileCoverage?.perTestData?.size, 1);
-		const perTestCoverage = Iterable.first(fileCoverage!.perTestData!.values());
-		assert.deepStrictEqual(perTestCoverage?.statement, raw3.statement);
-		assert.deepStrictEqual(perTestCoverage?.branch, raw3.branch);
-		assert.deepStrictEqual(perTestCoverage?.declaration, raw3.declaration);
-
-		// should be the expected values:
-		assert.deepEqual(fileCoverage?.statement, { covered: 10, total: 20 });
-		const dirCoverage = testCoverage.getComputedForUri(URI.file('/path/to'));
-		assert.deepEqual(dirCoverage?.statement, { covered: 15, total: 30 });
-	});
 });
diff --git a/src/vs/workbench/contrib/testing/test/common/testExplorerFilterState.test.ts b/src/vs/workbench/contrib/testing/test/common/testExplorerFilterState.test.ts
index 192515892c7..a9693426a60 100644
--- a/src/vs/workbench/contrib/testing/test/common/testExplorerFilterState.test.ts
+++ b/src/vs/workbench/contrib/testing/test/common/testExplorerFilterState.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { InMemoryStorageService } from 'vs/platform/storage/common/storage';
-import { TestExplorerFilterState, TestFilterTerm } from 'vs/workbench/contrib/testing/common/testExplorerFilterState';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { InMemoryStorageService } from '../../../../../platform/storage/common/storage.js';
+import { TestExplorerFilterState, TestFilterTerm } from '../../common/testExplorerFilterState.js';
 
 suite('TestExplorerFilterState', () => {
 	let t: TestExplorerFilterState;
diff --git a/src/vs/workbench/contrib/testing/test/common/testProfileService.test.ts b/src/vs/workbench/contrib/testing/test/common/testProfileService.test.ts
index c83d3e7d3b9..6024ea60723 100644
--- a/src/vs/workbench/contrib/testing/test/common/testProfileService.test.ts
+++ b/src/vs/workbench/contrib/testing/test/common/testProfileService.test.ts
@@ -6,12 +6,12 @@
 
 
 import assert from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { TestProfileService } from 'vs/workbench/contrib/testing/common/testProfileService';
-import { ITestRunProfile, TestRunProfileBitset } from 'vs/workbench/contrib/testing/common/testTypes';
-import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { MockContextKeyService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { TestProfileService } from '../../common/testProfileService.js';
+import { ITestRunProfile, TestRunProfileBitset } from '../../common/testTypes.js';
+import { TestStorageService } from '../../../../test/common/workbenchTestServices.js';
 
 suite('Workbench - TestProfileService', () => {
 	let t: TestProfileService;
diff --git a/src/vs/workbench/contrib/testing/test/common/testResultService.test.ts b/src/vs/workbench/contrib/testing/test/common/testResultService.test.ts
index 4ccd1f6da36..38c0a2c83c2 100644
--- a/src/vs/workbench/contrib/testing/test/common/testResultService.test.ts
+++ b/src/vs/workbench/contrib/testing/test/common/testResultService.test.ts
@@ -4,23 +4,23 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { timeout } from 'vs/base/common/async';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { TestId } from 'vs/workbench/contrib/testing/common/testId';
-import { TestProfileService } from 'vs/workbench/contrib/testing/common/testProfileService';
-import { HydratedTestResult, LiveTestResult, TaskRawOutput, TestResultItemChange, TestResultItemChangeReason, resultItemParents } from 'vs/workbench/contrib/testing/common/testResult';
-import { TestResultService } from 'vs/workbench/contrib/testing/common/testResultService';
-import { ITestResultStorage, InMemoryResultStorage } from 'vs/workbench/contrib/testing/common/testResultStorage';
-import { ITestTaskState, ResolvedTestRunRequest, TestResultItem, TestResultState, TestRunProfileBitset } from 'vs/workbench/contrib/testing/common/testTypes';
-import { makeEmptyCounts } from 'vs/workbench/contrib/testing/common/testingStates';
-import { TestTestCollection, getInitializedMainTestCollection, testStubs } from 'vs/workbench/contrib/testing/test/common/testStubs';
-import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
+import { timeout } from '../../../../../base/common/async.js';
+import { VSBuffer } from '../../../../../base/common/buffer.js';
+import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { MockContextKeyService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { NullLogService } from '../../../../../platform/log/common/log.js';
+import { NullTelemetryService } from '../../../../../platform/telemetry/common/telemetryUtils.js';
+import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.js';
+import { TestId } from '../../common/testId.js';
+import { TestProfileService } from '../../common/testProfileService.js';
+import { HydratedTestResult, LiveTestResult, TaskRawOutput, TestResultItemChange, TestResultItemChangeReason, resultItemParents } from '../../common/testResult.js';
+import { TestResultService } from '../../common/testResultService.js';
+import { ITestResultStorage, InMemoryResultStorage } from '../../common/testResultStorage.js';
+import { ITestTaskState, ResolvedTestRunRequest, TestResultItem, TestResultState, TestRunProfileBitset } from '../../common/testTypes.js';
+import { makeEmptyCounts } from '../../common/testingStates.js';
+import { TestTestCollection, getInitializedMainTestCollection, testStubs } from './testStubs.js';
+import { TestStorageService } from '../../../../test/common/workbenchTestServices.js';
 
 suite('Workbench - Test Results Service', () => {
 	const getLabelsIn = (it: Iterable<TestResultItem>) => [...it].map(t => t.item.label).sort();
@@ -66,7 +66,7 @@ suite('Workbench - Test Results Service', () => {
 		));
 
 		ds.add(r.onChange(e => changed.add(e)));
-		r.addTask({ id: 't', name: undefined, running: true });
+		r.addTask({ id: 't', name: 'n', running: true, ctrlId: 'ctrl' });
 
 		tests = ds.add(testStubs.nested());
 		const cts = ds.add(new CancellationTokenSource());
@@ -293,7 +293,7 @@ suite('Workbench - Test Results Service', () => {
 		} as IUriIdentityService, {
 			completedAt,
 			id: 'some-id',
-			tasks: [{ id: 't', name: undefined }],
+			tasks: [{ id: 't', name: undefined, ctrlId: 'ctrl', hasCoverage: false }],
 			name: 'hello world',
 			request: defaultOpts([]),
 			items: [{
diff --git a/src/vs/workbench/contrib/testing/test/common/testResultStorage.test.ts b/src/vs/workbench/contrib/testing/test/common/testResultStorage.test.ts
index c7c61884c44..01218dbbe72 100644
--- a/src/vs/workbench/contrib/testing/test/common/testResultStorage.test.ts
+++ b/src/vs/workbench/contrib/testing/test/common/testResultStorage.test.ts
@@ -4,17 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { range } from 'vs/base/common/arrays';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { ITestResult, LiveTestResult } from 'vs/workbench/contrib/testing/common/testResult';
-import { InMemoryResultStorage, RETAIN_MAX_RESULTS } from 'vs/workbench/contrib/testing/common/testResultStorage';
-import { TestRunProfileBitset } from 'vs/workbench/contrib/testing/common/testTypes';
-import { testStubs } from 'vs/workbench/contrib/testing/test/common/testStubs';
-import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
+import { range } from '../../../../../base/common/arrays.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { NullLogService } from '../../../../../platform/log/common/log.js';
+import { NullTelemetryService } from '../../../../../platform/telemetry/common/telemetryUtils.js';
+import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.js';
+import { ITestResult, LiveTestResult } from '../../common/testResult.js';
+import { InMemoryResultStorage, RETAIN_MAX_RESULTS } from '../../common/testResultStorage.js';
+import { TestRunProfileBitset } from '../../common/testTypes.js';
+import { testStubs } from './testStubs.js';
+import { TestStorageService } from '../../../../test/common/workbenchTestServices.js';
 
 suite('Workbench - Test Result Storage', () => {
 	let storage: InMemoryResultStorage;
@@ -28,7 +28,7 @@ suite('Workbench - Test Result Storage', () => {
 			NullTelemetryService,
 		));
 
-		t.addTask({ id: taskName, name: undefined, running: true });
+		t.addTask({ id: taskName, name: 'n', running: true, ctrlId: 'ctrlId' });
 		const tests = ds.add(testStubs.nested());
 		tests.expand(tests.root.id, Infinity);
 		t.addTestChainToRun('ctrlId', [
diff --git a/src/vs/workbench/contrib/testing/test/common/testService.test.ts b/src/vs/workbench/contrib/testing/test/common/testService.test.ts
new file mode 100644
index 00000000000..cf47d1556f5
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/test/common/testService.test.ts
@@ -0,0 +1,108 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { TestId } from '../../common/testId.js';
+import { simplifyTestsToExecute } from '../../common/testService.js';
+import { getInitializedMainTestCollection, makeSimpleStubTree } from './testStubs.js';
+
+suite('Workbench - Test Service', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	suite('simplifyTestsToExecute', () => {
+		const tree1 = {
+			a: {
+				b1: {
+					c1: {
+						d: undefined
+					},
+					c2: {
+						d: undefined
+					},
+				},
+				b2: undefined,
+			}
+		} as const;
+
+		test('noop on single item', async () => {
+			const c = await getInitializedMainTestCollection(makeSimpleStubTree(tree1));
+
+			const t = simplifyTestsToExecute(c, [
+				c.getNodeById(new TestId(['ctrlId', 'a', 'b1']).toString())!
+			]);
+
+			assert.deepStrictEqual(t.map(t => t.item.extId.toString()), [
+				new TestId(['ctrlId', 'a', 'b1']).toString()
+			]);
+		});
+
+		test('goes to common root 1', async () => {
+			const c = await getInitializedMainTestCollection(makeSimpleStubTree(tree1));
+
+			const t = simplifyTestsToExecute(c, [
+				c.getNodeById(new TestId(['ctrlId', 'a', 'b1', 'c1', 'd']).toString())!,
+				c.getNodeById(new TestId(['ctrlId', 'a', 'b1', 'c2']).toString())!,
+			]);
+
+			assert.deepStrictEqual(t.map(t => t.item.extId.toString()), [
+				new TestId(['ctrlId', 'a', 'b1']).toString()
+			]);
+		});
+
+		test('goes to common root 2', async () => {
+			const c = await getInitializedMainTestCollection(makeSimpleStubTree(tree1));
+
+			const t = simplifyTestsToExecute(c, [
+				c.getNodeById(new TestId(['ctrlId', 'a', 'b1', 'c1']).toString())!,
+				c.getNodeById(new TestId(['ctrlId', 'a', 'b1']).toString())!,
+			]);
+
+			assert.deepStrictEqual(t.map(t => t.item.extId.toString()), [
+				new TestId(['ctrlId', 'a', 'b1']).toString()
+			]);
+		});
+
+		test('goes to common root 3', async () => {
+			const c = await getInitializedMainTestCollection(makeSimpleStubTree(tree1));
+
+			const t = simplifyTestsToExecute(c, [
+				c.getNodeById(new TestId(['ctrlId', 'a', 'b1', 'c1', 'd']).toString())!,
+				c.getNodeById(new TestId(['ctrlId', 'a', 'b1', 'c2']).toString())!,
+			]);
+
+			assert.deepStrictEqual(t.map(t => t.item.extId.toString()), [
+				new TestId(['ctrlId', 'a', 'b1']).toString()
+			]);
+		});
+
+		test('goes to common root 4', async () => {
+			const c = await getInitializedMainTestCollection(makeSimpleStubTree(tree1));
+
+			const t = simplifyTestsToExecute(c, [
+				c.getNodeById(new TestId(['ctrlId', 'a', 'b2']).toString())!,
+				c.getNodeById(new TestId(['ctrlId', 'a', 'b1']).toString())!,
+			]);
+
+			assert.deepStrictEqual(t.map(t => t.item.extId.toString()), [
+				new TestId(['ctrlId']).toString()
+			]);
+		});
+
+		test('no-op divergent trees', async () => {
+			const c = await getInitializedMainTestCollection(makeSimpleStubTree(tree1));
+
+			const t = simplifyTestsToExecute(c, [
+				c.getNodeById(new TestId(['ctrlId', 'a', 'b1', 'c2']).toString())!,
+				c.getNodeById(new TestId(['ctrlId', 'a', 'b2']).toString())!,
+			]);
+
+			assert.deepStrictEqual(t.map(t => t.item.extId.toString()), [
+				new TestId(['ctrlId', 'a', 'b1', 'c2']).toString(),
+				new TestId(['ctrlId', 'a', 'b2']).toString(),
+			]);
+		});
+	});
+});
diff --git a/src/vs/workbench/contrib/testing/test/common/testStubs.ts b/src/vs/workbench/contrib/testing/test/common/testStubs.ts
index 836fe2143e8..d484c5e4f62 100644
--- a/src/vs/workbench/contrib/testing/test/common/testStubs.ts
+++ b/src/vs/workbench/contrib/testing/test/common/testStubs.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { MainThreadTestCollection } from 'vs/workbench/contrib/testing/common/mainThreadTestCollection';
-import { ITestItem, TestsDiff } from 'vs/workbench/contrib/testing/common/testTypes';
-import { TestId } from 'vs/workbench/contrib/testing/common/testId';
-import { createTestItemChildren, ITestItemApi, ITestItemLike, TestItemCollection, TestItemEventOp } from 'vs/workbench/contrib/testing/common/testItemCollection';
+import { URI } from '../../../../../base/common/uri.js';
+import { MainThreadTestCollection } from '../../common/mainThreadTestCollection.js';
+import { ITestItem, TestsDiff } from '../../common/testTypes.js';
+import { TestId } from '../../common/testId.js';
+import { createTestItemChildren, ITestItemApi, ITestItemLike, TestItemCollection, TestItemEventOp } from '../../common/testItemCollection.js';
 
 export class TestTestItem implements ITestItemLike {
 	private readonly props: ITestItem;
@@ -113,6 +113,26 @@ export const getInitializedMainTestCollection = async (singleUse = testStubs.nes
 	return c;
 };
 
+type StubTreeIds = Readonly<{ [id: string]: StubTreeIds | undefined }>;
+
+export const makeSimpleStubTree = (ids: StubTreeIds): TestTestCollection => {
+	const collection = new TestTestCollection();
+
+	const add = (parent: TestTestItem, children: StubTreeIds, path: readonly string[]) => {
+		for (const id of Object.keys(children)) {
+			const item = new TestTestItem(new TestId([...path, id]), id);
+			parent.children.add(item);
+			if (children[id]) {
+				add(item, children[id]!, [...path, id]);
+			}
+		}
+	};
+
+	add(collection.root, ids, ['ctrlId']);
+
+	return collection;
+};
+
 export const testStubs = {
 	nested: (idPrefix = 'id-') => {
 		const collection = new TestTestCollection();
diff --git a/src/vs/workbench/contrib/testing/test/common/testingUri.test.ts b/src/vs/workbench/contrib/testing/test/common/testingUri.test.ts
index 6e9ce5b745a..3e3c4414182 100644
--- a/src/vs/workbench/contrib/testing/test/common/testingUri.test.ts
+++ b/src/vs/workbench/contrib/testing/test/common/testingUri.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { buildTestUri, ParsedTestUri, parseTestUri, TestUriType } from 'vs/workbench/contrib/testing/common/testingUri';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { buildTestUri, ParsedTestUri, parseTestUri, TestUriType } from '../../common/testingUri.js';
 
 suite('Workbench - Testing URIs', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/contrib/themes/browser/themes.contribution.ts b/src/vs/workbench/contrib/themes/browser/themes.contribution.ts
index def265bcd48..93599087f54 100644
--- a/src/vs/workbench/contrib/themes/browser/themes.contribution.ts
+++ b/src/vs/workbench/contrib/themes/browser/themes.contribution.ts
@@ -3,52 +3,50 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize, localize2 } from 'vs/nls';
-import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes';
-import { MenuRegistry, MenuId, Action2, registerAction2, ISubmenuItem } from 'vs/platform/actions/common/actions';
-import { equalsIgnoreCase } from 'vs/base/common/strings';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { IWorkbenchThemeService, IWorkbenchTheme, ThemeSettingTarget, IWorkbenchColorTheme, IWorkbenchFileIconTheme, IWorkbenchProductIconTheme, ThemeSettings, ThemeSettingDefaults } from 'vs/workbench/services/themes/common/workbenchThemeService';
-import { VIEWLET_ID, IExtensionsViewPaneContainer } from 'vs/workbench/contrib/extensions/common/extensions';
-import { IExtensionGalleryService, IExtensionManagementService, IGalleryExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IColorRegistry, Extensions as ColorRegistryExtensions } from 'vs/platform/theme/common/colorRegistry';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { Color } from 'vs/base/common/color';
-import { ColorScheme, isHighContrast } from 'vs/platform/theme/common/theme';
-import { colorThemeSchemaId } from 'vs/workbench/services/themes/common/colorThemeSchema';
-import { isCancellationError, onUnexpectedError } from 'vs/base/common/errors';
-import { IQuickInputButton, IQuickInputService, IQuickInputToggle, IQuickPick, IQuickPickItem, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
-import { DEFAULT_PRODUCT_ICON_THEME_ID, ProductIconThemeData } from 'vs/workbench/services/themes/browser/productIconThemeData';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { ViewContainerLocation } from 'vs/workbench/common/views';
-import { ThrottledDelayer } from 'vs/base/common/async';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
-import { Codicon } from 'vs/base/common/codicons';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { Emitter } from 'vs/base/common/event';
-import { IExtensionResourceLoaderService } from 'vs/platform/extensionResourceLoader/common/extensionResourceLoader';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
-import { FileIconThemeData } from 'vs/workbench/services/themes/browser/fileIconThemeData';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions } from 'vs/workbench/common/contributions';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { INotificationService, IPromptChoice, Severity } from 'vs/platform/notification/common/notification';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { isWeb } from 'vs/base/common/platform';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { mainWindow } from 'vs/base/browser/window';
-import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
-import { Toggle } from 'vs/base/browser/ui/toggle/toggle';
-import { defaultToggleStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import { localize, localize2 } from '../../../../nls.js';
+import { KeyMod, KeyChord, KeyCode } from '../../../../base/common/keyCodes.js';
+import { MenuRegistry, MenuId, Action2, registerAction2, ISubmenuItem } from '../../../../platform/actions/common/actions.js';
+import { equalsIgnoreCase } from '../../../../base/common/strings.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { IWorkbenchThemeService, IWorkbenchTheme, ThemeSettingTarget, IWorkbenchColorTheme, IWorkbenchFileIconTheme, IWorkbenchProductIconTheme, ThemeSettings, ThemeSettingDefaults } from '../../../services/themes/common/workbenchThemeService.js';
+import { IExtensionsWorkbenchService } from '../../extensions/common/extensions.js';
+import { IExtensionGalleryService, IExtensionManagementService, IGalleryExtension } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { IColorRegistry, Extensions as ColorRegistryExtensions } from '../../../../platform/theme/common/colorRegistry.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { Color } from '../../../../base/common/color.js';
+import { ColorScheme, isHighContrast } from '../../../../platform/theme/common/theme.js';
+import { colorThemeSchemaId } from '../../../services/themes/common/colorThemeSchema.js';
+import { isCancellationError, onUnexpectedError } from '../../../../base/common/errors.js';
+import { IQuickInputButton, IQuickInputService, IQuickInputToggle, IQuickPick, IQuickPickItem, QuickPickInput } from '../../../../platform/quickinput/common/quickInput.js';
+import { DEFAULT_PRODUCT_ICON_THEME_ID, ProductIconThemeData } from '../../../services/themes/browser/productIconThemeData.js';
+import { ThrottledDelayer } from '../../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IProgressService, ProgressLocation } from '../../../../platform/progress/common/progress.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { IExtensionResourceLoaderService } from '../../../../platform/extensionResourceLoader/common/extensionResourceLoader.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { CommandsRegistry, ICommandService } from '../../../../platform/commands/common/commands.js';
+import { FileIconThemeData } from '../../../services/themes/browser/fileIconThemeData.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions } from '../../../common/contributions.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { INotificationService, IPromptChoice, Severity } from '../../../../platform/notification/common/notification.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { isWeb } from '../../../../base/common/platform.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
+import { Toggle } from '../../../../base/browser/ui/toggle/toggle.js';
+import { defaultToggleStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
 
 export const manageExtensionIcon = registerIcon('theme-selection-manage-extension', Codicon.gear, localize('manageExtensionIcon', 'Icon for the \'Manage\' action in the theme selection quick pick.'));
 
@@ -81,7 +79,7 @@ class MarketplaceThemesPicker {
 		@IQuickInputService private readonly quickInputService: IQuickInputService,
 		@ILogService private readonly logService: ILogService,
 		@IProgressService private readonly progressService: IProgressService,
-		@IPaneCompositePartService private readonly paneCompositeService: IPaneCompositePartService,
+		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@IDialogService private readonly dialogService: IDialogService
 	) {
 		this._installedExtensions = extensionManagementService.getInstalled().then(installed => {
@@ -168,8 +166,9 @@ class MarketplaceThemesPicker {
 
 	public openQuickPick(value: string, currentTheme: IWorkbenchTheme | undefined, selectTheme: (theme: IWorkbenchTheme | undefined, applyTheme: boolean) => void): Promise<PickerResult> {
 		let result: PickerResult | undefined = undefined;
+		const disposables = new DisposableStore();
 		return new Promise<PickerResult>((s, _) => {
-			const quickpick = this.quickInputService.createQuickPick<ThemeItem>();
+			const quickpick = disposables.add(this.quickInputService.createQuickPick<ThemeItem>());
 			quickpick.items = [];
 			quickpick.sortByLabel = false;
 			quickpick.matchOnDescription = true;
@@ -177,8 +176,8 @@ class MarketplaceThemesPicker {
 			quickpick.title = 'Marketplace Themes';
 			quickpick.placeholder = localize('themes.selectMarketplaceTheme', "Type to Search More. Select to Install. Up/Down Keys to Preview");
 			quickpick.canSelectMany = false;
-			quickpick.onDidChangeValue(() => this.trigger(quickpick.value));
-			quickpick.onDidAccept(async _ => {
+			disposables.add(quickpick.onDidChangeValue(() => this.trigger(quickpick.value)));
+			disposables.add(quickpick.onDidAccept(async _ => {
 				const themeItem = quickpick.selectedItems[0];
 				if (themeItem?.galleryExtension) {
 					result = 'selected';
@@ -190,42 +189,41 @@ class MarketplaceThemesPicker {
 						selectTheme(currentTheme, true);
 					}
 				}
-			});
+			}));
 
-			quickpick.onDidTriggerItemButton(e => {
+			disposables.add(quickpick.onDidTriggerItemButton(e => {
 				if (isItem(e.item)) {
 					const extensionId = e.item.theme?.extensionData?.extensionId;
 					if (extensionId) {
-						openExtensionViewlet(this.paneCompositeService, `@id:${extensionId}`);
+						this.extensionsWorkbenchService.openSearch(`@id:${extensionId}`);
 					} else {
-						openExtensionViewlet(this.paneCompositeService, `${this.marketplaceQuery} ${quickpick.value}`);
+						this.extensionsWorkbenchService.openSearch(`${this.marketplaceQuery} ${quickpick.value}`);
 					}
 				}
-			});
-			quickpick.onDidChangeActive(themes => {
+			}));
+			disposables.add(quickpick.onDidChangeActive(themes => {
 				if (result === undefined) {
 					selectTheme(themes[0]?.theme, false);
 				}
-			});
+			}));
 
-			quickpick.onDidHide(() => {
+			disposables.add(quickpick.onDidHide(() => {
 				if (result === undefined) {
 					selectTheme(currentTheme, true);
 					result = 'cancelled';
 
 				}
-				quickpick.dispose();
 				s(result);
-			});
+			}));
 
-			quickpick.onDidTriggerButton(e => {
+			disposables.add(quickpick.onDidTriggerButton(e => {
 				if (e === this.quickInputService.backButton) {
 					result = 'back';
 					quickpick.hide();
 				}
-			});
+			}));
 
-			this.onDidChange(() => {
+			disposables.add(this.onDidChange(() => {
 				let items = this.themes;
 				if (this._searchOngoing) {
 					items = items.concat({ label: '$(sync~spin) Searching for themes...', id: undefined, alwaysShow: true });
@@ -239,14 +237,16 @@ class MarketplaceThemesPicker {
 				if (newActiveItem) {
 					quickpick.activeItems = [newActiveItem as ThemeItem];
 				}
-			});
+			}));
 			this.trigger(value);
 			quickpick.show();
+		}).finally(() => {
+			disposables.dispose();
 		});
 	}
 
 	private async installExtension(galleryExtension: IGalleryExtension) {
-		openExtensionViewlet(this.paneCompositeService, `@id:${galleryExtension.identifier.id}`);
+		this.extensionsWorkbenchService.openSearch(`@id:${galleryExtension.identifier.id}`);
 		const result = await this.dialogService.confirm({
 			message: localize('installExtension.confirm', "This will install extension '{0}' published by '{1}'. Do you want to continue?", galleryExtension.displayName, galleryExtension.publisherDisplayName),
 			primaryButton: localize('installExtension.button.ok', "OK")
@@ -291,7 +291,7 @@ interface InstalledThemesPickerOptions {
 	readonly title?: string;
 	readonly description?: string;
 	readonly toggles?: IQuickInputToggle[];
-	readonly onToggle?: (toggle: IQuickInputToggle, quickInput: IQuickPick<ThemeItem>) => Promise<void>;
+	readonly onToggle?: (toggle: IQuickInputToggle, quickInput: IQuickPick<ThemeItem, { useSeparators: boolean }>) => Promise<void>;
 }
 
 class InstalledThemesPicker {
@@ -301,7 +301,7 @@ class InstalledThemesPicker {
 		private readonly getMarketplaceColorThemes: (publisher: string, name: string, version: string) => Promise<IWorkbenchTheme[]>,
 		@IQuickInputService private readonly quickInputService: IQuickInputService,
 		@IExtensionGalleryService private readonly extensionGalleryService: IExtensionGalleryService,
-		@IPaneCompositePartService private readonly paneCompositeService: IPaneCompositePartService,
+		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@IExtensionResourceLoaderService private readonly extensionResourceLoaderService: IExtensionResourceLoaderService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService
 	) {
@@ -338,12 +338,11 @@ class InstalledThemesPicker {
 		};
 
 		const pickInstalledThemes = (activeItemId: string | undefined) => {
+			const disposables = new DisposableStore();
 			return new Promise<void>((s, _) => {
 				let isCompleted = false;
-				const disposables = new DisposableStore();
-
 				const autoFocusIndex = picks.findIndex(p => isItem(p) && p.id === activeItemId);
-				const quickpick = this.quickInputService.createQuickPick<ThemeItem>();
+				const quickpick = disposables.add(this.quickInputService.createQuickPick<ThemeItem>({ useSeparators: true }));
 				quickpick.items = picks;
 				quickpick.title = this.options.title;
 				quickpick.description = this.options.description;
@@ -352,15 +351,15 @@ class InstalledThemesPicker {
 				quickpick.canSelectMany = false;
 				quickpick.toggles = this.options.toggles;
 				quickpick.toggles?.forEach(toggle => {
-					toggle.onChange(() => this.options.onToggle?.(toggle, quickpick), undefined, disposables);
+					disposables.add(toggle.onChange(() => this.options.onToggle?.(toggle, quickpick)));
 				});
 				quickpick.matchOnDescription = true;
-				quickpick.onDidAccept(async _ => {
+				disposables.add(quickpick.onDidAccept(async _ => {
 					isCompleted = true;
 					const theme = quickpick.selectedItems[0];
 					if (!theme || theme.configureItem) { // 'pick in marketplace' entry
 						if (!theme || theme.configureItem === ConfigureItem.EXTENSIONS_VIEW) {
-							openExtensionViewlet(this.paneCompositeService, `${this.options.marketplaceTag} ${quickpick.value}`);
+							this.extensionsWorkbenchService.openSearch(`${this.options.marketplaceTag} ${quickpick.value}`);
 						} else if (theme.configureItem === ConfigureItem.BROWSE_GALLERY) {
 							if (marketplaceThemePicker) {
 								const res = await marketplaceThemePicker.openQuickPick(quickpick.value, currentTheme, selectTheme);
@@ -375,27 +374,28 @@ class InstalledThemesPicker {
 
 					quickpick.hide();
 					s();
-				});
-				quickpick.onDidChangeActive(themes => selectTheme(themes[0]?.theme, false));
-				quickpick.onDidHide(() => {
+				}));
+				disposables.add(quickpick.onDidChangeActive(themes => selectTheme(themes[0]?.theme, false)));
+				disposables.add(quickpick.onDidHide(() => {
 					if (!isCompleted) {
 						selectTheme(currentTheme, true);
 						s();
 					}
 					quickpick.dispose();
-					disposables.dispose();
-				});
-				quickpick.onDidTriggerItemButton(e => {
+				}));
+				disposables.add(quickpick.onDidTriggerItemButton(e => {
 					if (isItem(e.item)) {
 						const extensionId = e.item.theme?.extensionData?.extensionId;
 						if (extensionId) {
-							openExtensionViewlet(this.paneCompositeService, `@id:${extensionId}`);
+							this.extensionsWorkbenchService.openSearch(`@id:${extensionId}`);
 						} else {
-							openExtensionViewlet(this.paneCompositeService, `${this.options.marketplaceTag} ${quickpick.value}`);
+							this.extensionsWorkbenchService.openSearch(`${this.options.marketplaceTag} ${quickpick.value}`);
 						}
 					}
-				});
+				}));
 				quickpick.show();
+			}).finally(() => {
+				disposables.dispose();
 			});
 		};
 		await pickInstalledThemes(currentTheme.id);
@@ -604,14 +604,6 @@ function configurationEntry(label: string, configureItem: ConfigureItem): QuickP
 	};
 }
 
-function openExtensionViewlet(paneCompositeService: IPaneCompositePartService, query: string) {
-	return paneCompositeService.openPaneComposite(VIEWLET_ID, ViewContainerLocation.Sidebar, true).then(viewlet => {
-		if (viewlet) {
-			(viewlet?.getViewPaneContainer() as IExtensionsViewPaneContainer).search(query);
-			viewlet.focus();
-		}
-	});
-}
 interface ThemeItem extends IQuickPickItem {
 	readonly id: string | undefined;
 	readonly theme?: IWorkbenchTheme;
diff --git a/src/vs/workbench/contrib/themes/browser/themes.test.contribution.ts b/src/vs/workbench/contrib/themes/browser/themes.test.contribution.ts
index ba09ebe897f..57e6c944465 100644
--- a/src/vs/workbench/contrib/themes/browser/themes.test.contribution.ts
+++ b/src/vs/workbench/contrib/themes/browser/themes.test.contribution.ts
@@ -3,33 +3,36 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IWorkbenchThemeService, IWorkbenchColorTheme } from 'vs/workbench/services/themes/common/workbenchThemeService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { EditorResourceAccessor } from 'vs/workbench/common/editor';
-import { ITextMateTokenizationService } from 'vs/workbench/services/textMate/browser/textMateTokenizationFeature';
+import { URI } from '../../../../base/common/uri.js';
+import type { Parser } from '@vscode/tree-sitter-wasm';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IWorkbenchThemeService, IWorkbenchColorTheme } from '../../../services/themes/common/workbenchThemeService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { EditorResourceAccessor } from '../../../common/editor.js';
+import { ITextMateTokenizationService } from '../../../services/textMate/browser/textMateTokenizationFeature.js';
 import type { IGrammar, StateStack } from 'vscode-textmate';
-import { TokenizationRegistry } from 'vs/editor/common/languages';
-import { TokenMetadata } from 'vs/editor/common/encodedTokenAttributes';
-import { ThemeRule, findMatchingThemeRule } from 'vs/workbench/services/textMate/common/TMHelper';
-import { Color } from 'vs/base/common/color';
-import { IFileService } from 'vs/platform/files/common/files';
-import { basename } from 'vs/base/common/resources';
-import { Schemas } from 'vs/base/common/network';
-import { splitLines } from 'vs/base/common/strings';
+import { TokenizationRegistry, TreeSitterTokenizationRegistry } from '../../../../editor/common/languages.js';
+import { TokenMetadata } from '../../../../editor/common/encodedTokenAttributes.js';
+import { ThemeRule, findMatchingThemeRule } from '../../../services/textMate/common/TMHelper.js';
+import { Color } from '../../../../base/common/color.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { basename } from '../../../../base/common/resources.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { splitLines } from '../../../../base/common/strings.js';
+import { ITreeSitterParserService } from '../../../../editor/common/services/treeSitterParserService.js';
+import { ColorThemeData, findMetadata } from '../../../services/themes/common/colorThemeData.js';
 
 interface IToken {
-	c: string;
-	t: string;
-	r: { [themeName: string]: string | undefined };
+	c: string; // token
+	t: string; // space separated scopes, most general to most specific
+	r: { [themeName: string]: string | undefined }; // token type: color
 }
 
 interface IThemedToken {
 	text: string;
-	color: Color;
+	color: Color | null;
 }
 
 interface IThemesResult {
@@ -92,7 +95,8 @@ class Snapper {
 	constructor(
 		@ILanguageService private readonly languageService: ILanguageService,
 		@IWorkbenchThemeService private readonly themeService: IWorkbenchThemeService,
-		@ITextMateTokenizationService private readonly textMateService: ITextMateTokenizationService
+		@ITextMateTokenizationService private readonly textMateService: ITextMateTokenizationService,
+		@ITreeSitterParserService private readonly treeSitterParserService: ITreeSitterParserService,
 	) {
 	}
 
@@ -126,6 +130,25 @@ class Snapper {
 		return result;
 	}
 
+	private _themedTokenizeTreeSitter(tokens: IToken[], languageId: string): IThemedToken[] {
+		const colorMap = TokenizationRegistry.getColorMap();
+		const result: IThemedToken[] = Array(tokens.length);
+		const colorThemeData = this.themeService.getColorTheme() as ColorThemeData;
+		for (let i = 0, len = tokens.length; i < len; i++) {
+			const token = tokens[i];
+			const scopes = token.t.split(' ');
+			const metadata = findMetadata(colorThemeData, scopes, this.languageService.languageIdCodec.encodeLanguageId(languageId));
+			const color = TokenMetadata.getForeground(metadata);
+
+			result[i] = {
+				text: token.c,
+				color: colorMap![color]
+			};
+		}
+
+		return result;
+	}
+
 	private _tokenize(grammar: IGrammar, lines: string[]): IToken[] {
 		let state: StateStack | null = null;
 		const result: IToken[] = [];
@@ -195,6 +218,38 @@ class Snapper {
 		return result;
 	}
 
+	private async _getTreeSitterThemesResult(tokens: IToken[], languageId: string): Promise<IThemesResult> {
+		const currentTheme = this.themeService.getColorTheme();
+
+		const getThemeName = (id: string) => {
+			const part = 'vscode-theme-defaults-themes-';
+			const startIdx = id.indexOf(part);
+			if (startIdx !== -1) {
+				return id.substring(startIdx + part.length, id.length - 5);
+			}
+			return undefined;
+		};
+
+		const result: IThemesResult = {};
+
+		const themeDatas = await this.themeService.getColorThemes();
+		const defaultThemes = themeDatas.filter(themeData => !!getThemeName(themeData.id));
+		for (const defaultTheme of defaultThemes) {
+			const themeId = defaultTheme.id;
+			const success = await this.themeService.setColorTheme(themeId, undefined);
+			if (success) {
+				const themeName = getThemeName(themeId);
+				result[themeName!] = {
+					document: new ThemeDocument(this.themeService.getColorTheme()),
+					tokens: this._themedTokenizeTreeSitter(tokens, languageId)
+				};
+			}
+		}
+		await this.themeService.setColorTheme(currentTheme.id, undefined);
+		return result;
+	}
+
+
 	private _enrichResult(result: IToken[], themesResult: IThemesResult): void {
 		const index: { [themeName: string]: number } = {};
 		const themeNames = Object.keys(themesResult);
@@ -209,7 +264,9 @@ class Snapper {
 				const themedToken = themesResult[themeName].tokens[index[themeName]];
 
 				themedToken.text = themedToken.text.substr(token.c.length);
-				token.r[themeName] = themesResult[themeName].document.explainTokenColor(token.t, themedToken.color);
+				if (themedToken.color) {
+					token.r[themeName] = themesResult[themeName].document.explainTokenColor(token.t, themedToken.color);
+				}
 				if (themedToken.text.length === 0) {
 					index[themeName]++;
 				}
@@ -217,6 +274,41 @@ class Snapper {
 		}
 	}
 
+	private _treeSitterTokenize(tree: Parser.Tree, languageId: string): IToken[] {
+		const cursor = tree.walk();
+		cursor.gotoFirstChild();
+		let cursorResult: boolean = true;
+		const tokens: IToken[] = [];
+		const tokenizationSupport = TreeSitterTokenizationRegistry.get(languageId);
+
+		do {
+			if (cursor.currentNode.childCount === 0) {
+				const capture = tokenizationSupport?.captureAtPositionTree(cursor.currentNode.startPosition.row + 1, cursor.currentNode.startPosition.column + 1, tree);
+
+				tokens.push({
+					c: cursor.currentNode.text.replace(/\r\n/g, '\n'),
+					t: capture?.map(cap => cap.name).join(' ') ?? '',
+					r: {
+						dark_plus: undefined,
+						light_plus: undefined,
+						dark_vs: undefined,
+						light_vs: undefined,
+						hc_black: undefined,
+					}
+				});
+
+				while (!(cursorResult = cursor.gotoNextSibling())) {
+					if (!(cursorResult = cursor.gotoParent())) {
+						break;
+					}
+				}
+			} else {
+				cursorResult = cursor.gotoFirstChild();
+			}
+		} while (cursorResult);
+		return tokens;
+	}
+
 	public captureSyntaxTokens(fileName: string, content: string): Promise<IToken[]> {
 		const languageId = this.languageService.guessLanguageIdByFilepathOrFirstLine(URI.file(fileName));
 		return this.textMateService.createTokenizer(languageId!).then((grammar) => {
@@ -232,17 +324,35 @@ class Snapper {
 			});
 		});
 	}
+
+	public async captureTreeSitterSyntaxTokens(fileName: string, content: string): Promise<IToken[]> {
+		const languageId = this.languageService.guessLanguageIdByFilepathOrFirstLine(URI.file(fileName));
+		if (languageId) {
+			const tree = await this.treeSitterParserService.getTree(content, languageId!);
+			if (!tree) {
+				return [];
+			}
+			const result = (await this._treeSitterTokenize(tree, languageId)).filter(t => t.c.length > 0);
+			const themeTokens = await this._getTreeSitterThemesResult(result, languageId);
+			this._enrichResult(result, themeTokens);
+			return result;
+		}
+		return [];
+	}
 }
 
-CommandsRegistry.registerCommand('_workbench.captureSyntaxTokens', function (accessor: ServicesAccessor, resource: URI) {
-
+async function captureTokens(accessor: ServicesAccessor, resource: URI | undefined, treeSitter: boolean = false) {
 	const process = (resource: URI) => {
 		const fileService = accessor.get(IFileService);
 		const fileName = basename(resource);
 		const snapper = accessor.get(IInstantiationService).createInstance(Snapper);
 
 		return fileService.readFile(resource).then(content => {
-			return snapper.captureSyntaxTokens(fileName, content.value.toString());
+			if (treeSitter) {
+				return snapper.captureTreeSitterSyntaxTokens(fileName, content.value.toString());
+			} else {
+				return snapper.captureSyntaxTokens(fileName, content.value.toString());
+			}
 		});
 	};
 
@@ -257,7 +367,17 @@ CommandsRegistry.registerCommand('_workbench.captureSyntaxTokens', function (acc
 			console.log('No file editor active');
 		}
 	} else {
-		return process(resource);
+		const processResult = await process(resource);
+		return processResult;
 	}
 	return undefined;
+
+}
+
+CommandsRegistry.registerCommand('_workbench.captureSyntaxTokens', function (accessor: ServicesAccessor, resource: URI) {
+	return captureTokens(accessor, resource);
+});
+
+CommandsRegistry.registerCommand('_workbench.captureTreeSitterSyntaxTokens', function (accessor: ServicesAccessor, resource: URI) {
+	return captureTokens(accessor, resource, true);
 });
diff --git a/src/vs/workbench/contrib/themes/test/node/colorRegistry.releaseTest.ts b/src/vs/workbench/contrib/themes/test/node/colorRegistry.releaseTest.ts
index 710fb4da3c4..50a4b4b6837 100644
--- a/src/vs/workbench/contrib/themes/test/node/colorRegistry.releaseTest.ts
+++ b/src/vs/workbench/contrib/themes/test/node/colorRegistry.releaseTest.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IColorRegistry, Extensions, ColorContribution, asCssVariableName } from 'vs/platform/theme/common/colorRegistry';
-import { asTextOrError } from 'vs/platform/request/common/request';
-import * as pfs from 'vs/base/node/pfs';
-import * as path from 'vs/base/common/path';
+import * as fs from 'fs';
+import { Registry } from '../../../../../platform/registry/common/platform.js';
+import { IColorRegistry, Extensions, ColorContribution, asCssVariableName } from '../../../../../platform/theme/common/colorRegistry.js';
+import { asTextOrError } from '../../../../../platform/request/common/request.js';
+import * as pfs from '../../../../../base/node/pfs.js';
+import * as path from '../../../../../base/common/path.js';
 import assert from 'assert';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { RequestService } from 'vs/platform/request/node/requestService';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { RequestService } from '../../../../../platform/request/node/requestService.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
 // eslint-disable-next-line local/code-import-patterns
-import 'vs/workbench/workbench.desktop.main';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { mock } from 'vs/base/test/common/mock';
-import { INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-import { FileAccess } from 'vs/base/common/network';
-import { TestLoggerService } from 'vs/workbench/test/common/workbenchTestServices';
+import '../../../../workbench.desktop.main.js';
+import { NullLogService } from '../../../../../platform/log/common/log.js';
+import { mock } from '../../../../../base/test/common/mock.js';
+import { INativeEnvironmentService } from '../../../../../platform/environment/common/environment.js';
+import { FileAccess } from '../../../../../base/common/network.js';
 
 interface ColorInfo {
 	description: string;
@@ -40,7 +40,7 @@ suite('Color Registry', function () {
 
 	test(`update colors in ${knwonVariablesFileName}`, async function () {
 		const varFilePath = FileAccess.asFileUri(`vs/../../build/lib/stylelint/${knwonVariablesFileName}`).fsPath;
-		const content = (await pfs.Promises.readFile(varFilePath)).toString();
+		const content = (await fs.promises.readFile(varFilePath)).toString();
 
 		const variablesInfo = JSON.parse(content);
 
@@ -91,7 +91,7 @@ suite('Color Registry', function () {
 
 		const docUrl = 'https://raw.githubusercontent.com/microsoft/vscode-docs/main/api/references/theme-color.md';
 
-		const reqContext = await new RequestService(new TestConfigurationService(), environmentService, new NullLogService(), new TestLoggerService()).request({ url: docUrl }, CancellationToken.None);
+		const reqContext = await new RequestService(new TestConfigurationService(), environmentService, new NullLogService()).request({ url: docUrl }, CancellationToken.None);
 		const content = (await asTextOrError(reqContext))!;
 
 		const expression = /-\s*\`([\w\.]+)\`: (.*)/g;
@@ -171,7 +171,7 @@ async function getColorsFromExtension(): Promise<{ [id: string]: string }> {
 	const result: { [id: string]: string } = Object.create(null);
 	for (const folder of extFolders) {
 		try {
-			const packageJSON = JSON.parse((await pfs.Promises.readFile(path.join(extPath, folder, 'package.json'))).toString());
+			const packageJSON = JSON.parse((await fs.promises.readFile(path.join(extPath, folder, 'package.json'))).toString());
 			const contributes = packageJSON['contributes'];
 			if (contributes) {
 				const colors = contributes['colors'];
diff --git a/src/vs/workbench/contrib/themes/test/node/colorRegistryExport.test.ts b/src/vs/workbench/contrib/themes/test/node/colorRegistryExport.test.ts
index ccd7af54f75..e00704264ab 100644
--- a/src/vs/workbench/contrib/themes/test/node/colorRegistryExport.test.ts
+++ b/src/vs/workbench/contrib/themes/test/node/colorRegistryExport.test.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Color } from 'vs/base/common/color';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Extensions, IColorRegistry } from 'vs/platform/theme/common/colorRegistry';
+import { Color } from '../../../../../base/common/color.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Registry } from '../../../../../platform/registry/common/platform.js';
+import { Extensions, IColorRegistry } from '../../../../../platform/theme/common/colorRegistry.js';
 
 suite('ColorRegistry', () => {
 	if (process.env.VSCODE_COLOR_REGISTRY_EXPORT) {
diff --git a/src/vs/workbench/contrib/timeline/browser/timeline.contribution.ts b/src/vs/workbench/contrib/timeline/browser/timeline.contribution.ts
index d881b3286f9..5fffc20c8a0 100644
--- a/src/vs/workbench/contrib/timeline/browser/timeline.contribution.ts
+++ b/src/vs/workbench/contrib/timeline/browser/timeline.contribution.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IViewsRegistry, IViewDescriptor, Extensions as ViewExtensions } from 'vs/workbench/common/views';
-import { VIEW_CONTAINER } from 'vs/workbench/contrib/files/browser/explorerViewlet';
-import { ITimelineService, TimelinePaneId } from 'vs/workbench/contrib/timeline/common/timeline';
-import { TimelineHasProviderContext, TimelineService } from 'vs/workbench/contrib/timeline/common/timelineService';
-import { TimelinePane } from './timelinePane';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { ISubmenuItem, MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
-import { ICommandHandler, CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { ExplorerFolderContext } from 'vs/workbench/contrib/files/common/files';
-import { ResourceContextKey } from 'vs/workbench/common/contextkeys';
-import { Codicon } from 'vs/base/common/codicons';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { ILocalizedString } from 'vs/platform/action/common/action';
+import { localize } from '../../../../nls.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IViewsRegistry, IViewDescriptor, Extensions as ViewExtensions } from '../../../common/views.js';
+import { VIEW_CONTAINER } from '../../files/browser/explorerViewlet.js';
+import { ITimelineService, TimelinePaneId } from '../common/timeline.js';
+import { TimelineHasProviderContext, TimelineService } from '../common/timelineService.js';
+import { TimelinePane } from './timelinePane.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { ISubmenuItem, MenuId, MenuRegistry } from '../../../../platform/actions/common/actions.js';
+import { ICommandHandler, CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { ExplorerFolderContext } from '../../files/common/files.js';
+import { ResourceContextKey } from '../../../common/contextkeys.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { ILocalizedString } from '../../../../platform/action/common/action.js';
 
 const timelineViewIcon = registerIcon('timeline-view-icon', Codicon.history, localize('timelineViewIcon', 'View icon of the timeline view.'));
 const timelineOpenIcon = registerIcon('timeline-open', Codicon.history, localize('timelineOpenIcon', 'Icon for the open timeline action.'));
diff --git a/src/vs/workbench/contrib/timeline/browser/timelinePane.ts b/src/vs/workbench/contrib/timeline/browser/timelinePane.ts
index f152f086e9d..8536c4e8e06 100644
--- a/src/vs/workbench/contrib/timeline/browser/timelinePane.ts
+++ b/src/vs/workbench/contrib/timeline/browser/timelinePane.ts
@@ -3,60 +3,60 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/timelinePane';
-import { localize, localize2 } from 'vs/nls';
-import * as DOM from 'vs/base/browser/dom';
-import { IAction, ActionRunner } from 'vs/base/common/actions';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { fromNow } from 'vs/base/common/date';
-import { debounce } from 'vs/base/common/decorators';
-import { Emitter, Event } from 'vs/base/common/event';
-import { FuzzyScore, createMatches } from 'vs/base/common/filters';
-import { Iterable } from 'vs/base/common/iterator';
-import { DisposableStore, IDisposable, Disposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { escapeRegExpCharacters } from 'vs/base/common/strings';
-import { URI } from 'vs/base/common/uri';
-import { IconLabel } from 'vs/base/browser/ui/iconLabel/iconLabel';
-import { IListVirtualDelegate, IIdentityProvider, IKeyboardNavigationLabelProvider } from 'vs/base/browser/ui/list/list';
-import { ITreeNode, ITreeRenderer, ITreeContextMenuEvent, ITreeElement } from 'vs/base/browser/ui/tree/tree';
-import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPane';
-import { WorkbenchObjectTree } from 'vs/platform/list/browser/listService';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { ContextKeyExpr, IContextKeyService, RawContextKey, IContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ITimelineService, TimelineChangeEvent, TimelineItem, TimelineOptions, TimelineProvidersChangeEvent, TimelineRequest, Timeline } from 'vs/workbench/contrib/timeline/common/timeline';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { SideBySideEditor, EditorResourceAccessor } from 'vs/workbench/common/editor';
-import { ICommandService, CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IViewDescriptorService } from 'vs/workbench/common/views';
-import { IProgressService } from 'vs/platform/progress/common/progress';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { ActionBar, IActionViewItemProvider } from 'vs/base/browser/ui/actionbar/actionbar';
-import { createAndFillInContextMenuActions, createActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IMenuService, MenuId, registerAction2, Action2, MenuRegistry } from 'vs/platform/actions/common/actions';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { ActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { ColorScheme } from 'vs/platform/theme/common/theme';
-import { Codicon } from 'vs/base/common/codicons';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { API_OPEN_DIFF_EDITOR_COMMAND_ID, API_OPEN_EDITOR_COMMAND_ID } from 'vs/workbench/browser/parts/editor/editorCommands';
-import { MarshalledId } from 'vs/base/common/marshallingIds';
-import { isString } from 'vs/base/common/types';
-import { renderMarkdownAsPlaintext } from 'vs/base/browser/markdownRenderer';
-import { IHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { AriaRole } from 'vs/base/browser/ui/aria/aria';
-import { ILocalizedString } from 'vs/platform/action/common/action';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import './media/timelinePane.css';
+import { localize, localize2 } from '../../../../nls.js';
+import * as DOM from '../../../../base/browser/dom.js';
+import { IAction, ActionRunner } from '../../../../base/common/actions.js';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { fromNow } from '../../../../base/common/date.js';
+import { debounce } from '../../../../base/common/decorators.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { FuzzyScore, createMatches } from '../../../../base/common/filters.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { DisposableStore, IDisposable, Disposable } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { escapeRegExpCharacters } from '../../../../base/common/strings.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IconLabel } from '../../../../base/browser/ui/iconLabel/iconLabel.js';
+import { IListVirtualDelegate, IIdentityProvider, IKeyboardNavigationLabelProvider } from '../../../../base/browser/ui/list/list.js';
+import { ITreeNode, ITreeRenderer, ITreeContextMenuEvent, ITreeElement } from '../../../../base/browser/ui/tree/tree.js';
+import { ViewPane, IViewPaneOptions } from '../../../browser/parts/views/viewPane.js';
+import { WorkbenchObjectTree } from '../../../../platform/list/browser/listService.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { ContextKeyExpr, IContextKeyService, RawContextKey, IContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IConfigurationService, IConfigurationChangeEvent } from '../../../../platform/configuration/common/configuration.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { ITimelineService, TimelineChangeEvent, TimelineItem, TimelineOptions, TimelineProvidersChangeEvent, TimelineRequest, Timeline } from '../common/timeline.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { SideBySideEditor, EditorResourceAccessor } from '../../../common/editor.js';
+import { ICommandService, CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { IViewDescriptorService } from '../../../common/views.js';
+import { IProgressService } from '../../../../platform/progress/common/progress.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { ActionBar, IActionViewItemProvider } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { createAndFillInContextMenuActions, createActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IMenuService, MenuId, registerAction2, Action2, MenuRegistry } from '../../../../platform/actions/common/actions.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { ActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { ColorScheme } from '../../../../platform/theme/common/theme.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { API_OPEN_DIFF_EDITOR_COMMAND_ID, API_OPEN_EDITOR_COMMAND_ID } from '../../../browser/parts/editor/editorCommands.js';
+import { MarshalledId } from '../../../../base/common/marshallingIds.js';
+import { isString } from '../../../../base/common/types.js';
+import { renderMarkdownAsPlaintext } from '../../../../base/browser/markdownRenderer.js';
+import { IHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegate.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { AriaRole } from '../../../../base/browser/ui/aria/aria.js';
+import { ILocalizedString } from '../../../../platform/action/common/action.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 
 const ItemHeight = 22;
 
@@ -67,7 +67,7 @@ function isLoadMoreCommand(item: TreeElement | undefined): item is LoadMoreComma
 }
 
 function isTimelineItem(item: TreeElement | undefined): item is TimelineItem {
-	return !item?.handle.startsWith('vscode-command:') ?? false;
+	return !!item && !item.handle.startsWith('vscode-command:');
 }
 
 function updateRelativeTime(item: TimelineItem, lastRelativeTime: string | undefined): string | undefined {
@@ -574,6 +574,15 @@ export class TimelinePane extends ViewPane {
 		}
 
 		if (options === undefined) {
+			if (
+				!reset &&
+				timeline !== undefined &&
+				timeline.items.length > 0 &&
+				!timeline.more
+			) {
+				// If we are not resetting, have item(s), and already know there are no more to fetch, we're done here
+				return false;
+			}
 			options = { cursor: reset ? undefined : timeline?.cursor, limit: this.pageSize };
 		}
 
@@ -723,7 +732,7 @@ export class TimelinePane extends ViewPane {
 			timeline.lastRenderedIndex = count - 1;
 		}
 		else {
-			const sources: { timeline: TimelineAggregate; iterator: IterableIterator<TimelineItem>; nextItem: IteratorResult<TimelineItem, TimelineItem> }[] = [];
+			const sources: { timeline: TimelineAggregate; iterator: IterableIterator<TimelineItem>; nextItem: IteratorResult<TimelineItem, undefined> }[] = [];
 
 			let hasAnyItems = false;
 			let mostRecentEnd = 0;
@@ -757,7 +766,7 @@ export class TimelinePane extends ViewPane {
 			function getNextMostRecentSource() {
 				return sources
 					.filter(source => !source.nextItem.done)
-					.reduce((previous, current) => (previous === undefined || current.nextItem.value.timestamp >= previous.nextItem.value.timestamp) ? current : previous, undefined!);
+					.reduce((previous, current) => (previous === undefined || current.nextItem.value!.timestamp >= previous.nextItem.value!.timestamp) ? current : previous, undefined!);
 			}
 
 			let lastRelativeTime: string | undefined;
@@ -765,7 +774,7 @@ export class TimelinePane extends ViewPane {
 			while (nextSource = getNextMostRecentSource()) {
 				nextSource.timeline.lastRenderedIndex++;
 
-				const item = nextSource.nextItem.value;
+				const item = nextSource.nextItem.value!;
 				item.relativeTime = undefined;
 				item.hideRelativeTime = undefined;
 
@@ -1306,13 +1315,11 @@ class TimelinePaneCommands extends Disposable {
 			[context.key, context.value],
 		]);
 
-		const menu = this.menuService.createMenu(menuId, contextKeyService);
+		const menu = this.menuService.getMenuActions(menuId, contextKeyService, { shouldForwardArgs: true });
 		const primary: IAction[] = [];
 		const secondary: IAction[] = [];
 		const result = { primary, secondary };
-		createAndFillInContextMenuActions(menu, { shouldForwardArgs: true }, result, 'inline');
-
-		menu.dispose();
+		createAndFillInContextMenuActions(menu, result, 'inline');
 
 		return result;
 	}
diff --git a/src/vs/workbench/contrib/timeline/common/timeline.ts b/src/vs/workbench/contrib/timeline/common/timeline.ts
index 5620cccb1bd..c1a991668cd 100644
--- a/src/vs/workbench/contrib/timeline/common/timeline.ts
+++ b/src/vs/workbench/contrib/timeline/common/timeline.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Event } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { Command } from 'vs/editor/common/languages';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IAccessibilityInformation } from 'vs/platform/accessibility/common/accessibility';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { Event } from '../../../../base/common/event.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Command } from '../../../../editor/common/languages.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IAccessibilityInformation } from '../../../../platform/accessibility/common/accessibility.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { IMarkdownString } from '../../../../base/common/htmlContent.js';
 
 export function toKey(extension: ExtensionIdentifier | string, source: string) {
 	return `${typeof extension === 'string' ? extension : ExtensionIdentifier.toKey(extension)}|${source}`;
diff --git a/src/vs/workbench/contrib/timeline/common/timelineService.ts b/src/vs/workbench/contrib/timeline/common/timelineService.ts
index 5cc26501d0d..cecaef8b521 100644
--- a/src/vs/workbench/contrib/timeline/common/timelineService.ts
+++ b/src/vs/workbench/contrib/timeline/common/timelineService.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Event, Emitter } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ITimelineService, TimelineChangeEvent, TimelineOptions, TimelineProvidersChangeEvent, TimelineProvider, TimelinePaneId } from './timeline';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { ITimelineService, TimelineChangeEvent, TimelineOptions, TimelineProvidersChangeEvent, TimelineProvider, TimelinePaneId } from './timeline.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 
 export const TimelineHasProviderContext = new RawContextKey<boolean>('timelineHasProvider', false);
 
diff --git a/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution.ts b/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution.ts
index df24b2949de..9a47ac6adcd 100644
--- a/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution.ts
+++ b/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution.ts
@@ -3,27 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Codicon } from 'vs/base/common/codicons';
-import { isCancellationError } from 'vs/base/common/errors';
-import { Event } from 'vs/base/common/event';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction2, EditorContributionInstantiation, registerEditorContribution, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { PeekContext } from 'vs/editor/contrib/peekView/browser/peekView';
-import { localize, localize2 } from 'vs/nls';
-import { MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { TypeHierarchyTreePeekWidget } from 'vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek';
-import { TypeHierarchyDirection, TypeHierarchyModel, TypeHierarchyProviderRegistry } from 'vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { isCancellationError } from '../../../../base/common/errors.js';
+import { Event } from '../../../../base/common/event.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { EditorAction2, EditorContributionInstantiation, registerEditorContribution, ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { IEditorContribution } from '../../../../editor/common/editorCommon.js';
+import { PeekContext } from '../../../../editor/contrib/peekView/browser/peekView.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { TypeHierarchyTreePeekWidget } from './typeHierarchyPeek.js';
+import { TypeHierarchyDirection, TypeHierarchyModel, TypeHierarchyProviderRegistry } from '../common/typeHierarchy.js';
 
 
 const _ctxHasTypeHierarchyProvider = new RawContextKey<boolean>('editorHasTypeHierarchyProvider', false, localize('editorHasTypeHierarchyProvider', 'Whether a type hierarchy provider is available'));
diff --git a/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek.ts b/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek.ts
index d5bf22e671a..2adb2d182ef 100644
--- a/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek.ts
+++ b/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek.ts
@@ -3,37 +3,37 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/typeHierarchy';
-import { Dimension, isKeyboardEvent } from 'vs/base/browser/dom';
-import { Orientation, Sizing, SplitView } from 'vs/base/browser/ui/splitview/splitview';
-import { IAsyncDataTreeViewState } from 'vs/base/browser/ui/tree/asyncDataTree';
-import { ITreeNode, TreeMouseEventTarget } from 'vs/base/browser/ui/tree/tree';
-import { IAction } from 'vs/base/common/actions';
-import { Color } from 'vs/base/common/color';
-import { Event } from 'vs/base/common/event';
-import { FuzzyScore } from 'vs/base/common/filters';
-import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget';
-import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { IPosition } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { ScrollType } from 'vs/editor/common/editorCommon';
-import { IModelDecorationOptions, TrackedRangeStickiness, IModelDeltaDecoration, OverviewRulerLane } from 'vs/editor/common/model';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import * as peekView from 'vs/editor/contrib/peekView/browser/peekView';
-import { localize } from 'vs/nls';
-import { createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IMenuService, MenuId } from 'vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IWorkbenchAsyncDataTreeOptions, WorkbenchAsyncDataTree } from 'vs/platform/list/browser/listService';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IColorTheme, IThemeService, themeColorFromId } from 'vs/platform/theme/common/themeService';
-import * as typeHTree from 'vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree';
-import { TypeHierarchyDirection, TypeHierarchyModel } from 'vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import './media/typeHierarchy.css';
+import { Dimension, isKeyboardEvent } from '../../../../base/browser/dom.js';
+import { Orientation, Sizing, SplitView } from '../../../../base/browser/ui/splitview/splitview.js';
+import { IAsyncDataTreeViewState } from '../../../../base/browser/ui/tree/asyncDataTree.js';
+import { ITreeNode, TreeMouseEventTarget } from '../../../../base/browser/ui/tree/tree.js';
+import { IAction } from '../../../../base/common/actions.js';
+import { Color } from '../../../../base/common/color.js';
+import { Event } from '../../../../base/common/event.js';
+import { FuzzyScore } from '../../../../base/common/filters.js';
+import { DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { EmbeddedCodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/embeddedCodeEditorWidget.js';
+import { IEditorOptions } from '../../../../editor/common/config/editorOptions.js';
+import { IPosition } from '../../../../editor/common/core/position.js';
+import { IRange, Range } from '../../../../editor/common/core/range.js';
+import { ScrollType } from '../../../../editor/common/editorCommon.js';
+import { IModelDecorationOptions, TrackedRangeStickiness, IModelDeltaDecoration, OverviewRulerLane } from '../../../../editor/common/model.js';
+import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import * as peekView from '../../../../editor/contrib/peekView/browser/peekView.js';
+import { localize } from '../../../../nls.js';
+import { createAndFillInActionBarActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IMenuService, MenuId } from '../../../../platform/actions/common/actions.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IWorkbenchAsyncDataTreeOptions, WorkbenchAsyncDataTree } from '../../../../platform/list/browser/listService.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IColorTheme, IThemeService, themeColorFromId } from '../../../../platform/theme/common/themeService.js';
+import * as typeHTree from './typeHierarchyTree.js';
+import { TypeHierarchyDirection, TypeHierarchyModel } from '../common/typeHierarchy.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
 
 // Todo: copied from call hierarchy, to extract
 const enum State {
diff --git a/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree.ts b/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree.ts
index 41cd4a75293..253fb35cc9c 100644
--- a/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree.ts
+++ b/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IAsyncDataSource, ITreeRenderer, ITreeNode, ITreeSorter } from 'vs/base/browser/ui/tree/tree';
-import { TypeHierarchyDirection, TypeHierarchyItem, TypeHierarchyModel } from 'vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IIdentityProvider, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { FuzzyScore, createMatches } from 'vs/base/common/filters';
-import { IconLabel } from 'vs/base/browser/ui/iconLabel/iconLabel';
-import { SymbolKinds, SymbolTag } from 'vs/editor/common/languages';
-import { compare } from 'vs/base/common/strings';
-import { Range } from 'vs/editor/common/core/range';
-import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
-import { localize } from 'vs/nls';
-import { ThemeIcon } from 'vs/base/common/themables';
+import { IAsyncDataSource, ITreeRenderer, ITreeNode, ITreeSorter } from '../../../../base/browser/ui/tree/tree.js';
+import { TypeHierarchyDirection, TypeHierarchyItem, TypeHierarchyModel } from '../common/typeHierarchy.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IIdentityProvider, IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
+import { FuzzyScore, createMatches } from '../../../../base/common/filters.js';
+import { IconLabel } from '../../../../base/browser/ui/iconLabel/iconLabel.js';
+import { SymbolKinds, SymbolTag } from '../../../../editor/common/languages.js';
+import { compare } from '../../../../base/common/strings.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { IListAccessibilityProvider } from '../../../../base/browser/ui/list/listWidget.js';
+import { localize } from '../../../../nls.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
 
 export class Type {
 	constructor(
diff --git a/src/vs/workbench/contrib/typeHierarchy/common/typeHierarchy.ts b/src/vs/workbench/contrib/typeHierarchy/common/typeHierarchy.ts
index 6edb40c71f6..71f4f44687e 100644
--- a/src/vs/workbench/contrib/typeHierarchy/common/typeHierarchy.ts
+++ b/src/vs/workbench/contrib/typeHierarchy/common/typeHierarchy.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { SymbolKind, ProviderResult, SymbolTag } from 'vs/editor/common/languages';
-import { ITextModel } from 'vs/editor/common/model';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import { URI } from 'vs/base/common/uri';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { isNonEmptyArray } from 'vs/base/common/arrays';
-import { onUnexpectedExternalError } from 'vs/base/common/errors';
-import { IDisposable, RefCountedDisposable } from 'vs/base/common/lifecycle';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { assertType } from 'vs/base/common/types';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
+import { IRange, Range } from '../../../../editor/common/core/range.js';
+import { SymbolKind, ProviderResult, SymbolTag } from '../../../../editor/common/languages.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { LanguageFeatureRegistry } from '../../../../editor/common/languageFeatureRegistry.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IPosition, Position } from '../../../../editor/common/core/position.js';
+import { isNonEmptyArray } from '../../../../base/common/arrays.js';
+import { onUnexpectedExternalError } from '../../../../base/common/errors.js';
+import { IDisposable, RefCountedDisposable } from '../../../../base/common/lifecycle.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { assertType } from '../../../../base/common/types.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
 
 export const enum TypeHierarchyDirection {
 	Subtypes = 'subtypes',
diff --git a/src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts b/src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts
index 9f6cc07ba5f..dca1cfd0026 100644
--- a/src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts
+++ b/src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts
@@ -3,37 +3,37 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/releasenoteseditor';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { escapeMarkdownSyntaxTokens } from 'vs/base/common/htmlContent';
-import { KeybindingParser } from 'vs/base/common/keybindingParser';
-import { escape } from 'vs/base/common/strings';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { TokenizationRegistry } from 'vs/editor/common/languages';
-import { generateTokensCSSForColorMap } from 'vs/editor/common/languages/supports/tokenization';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import * as nls from 'vs/nls';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { asTextOrError, IRequestService } from 'vs/platform/request/common/request';
-import { DEFAULT_MARKDOWN_STYLES, renderMarkdownDocument } from 'vs/workbench/contrib/markdown/browser/markdownDocumentRenderer';
-import { WebviewInput } from 'vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
-import { IWebviewWorkbenchService } from 'vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { ACTIVE_GROUP, IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { getTelemetryLevel, supportsTelemetry } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IConfigurationChangeEvent, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { SimpleSettingRenderer } from 'vs/workbench/contrib/markdown/browser/markdownSettingRenderer';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { Schemas } from 'vs/base/common/network';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
+import './media/releasenoteseditor.css';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { escapeMarkdownSyntaxTokens } from '../../../../base/common/htmlContent.js';
+import { KeybindingParser } from '../../../../base/common/keybindingParser.js';
+import { escape } from '../../../../base/common/strings.js';
+import { URI } from '../../../../base/common/uri.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { TokenizationRegistry } from '../../../../editor/common/languages.js';
+import { generateTokensCSSForColorMap } from '../../../../editor/common/languages/supports/tokenization.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import * as nls from '../../../../nls.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { asTextOrError, IRequestService } from '../../../../platform/request/common/request.js';
+import { DEFAULT_MARKDOWN_STYLES, renderMarkdownDocument } from '../../markdown/browser/markdownDocumentRenderer.js';
+import { WebviewInput } from '../../webviewPanel/browser/webviewEditorInput.js';
+import { IWebviewWorkbenchService } from '../../webviewPanel/browser/webviewWorkbenchService.js';
+import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { ACTIVE_GROUP, IEditorService } from '../../../services/editor/common/editorService.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { getTelemetryLevel, supportsTelemetry } from '../../../../platform/telemetry/common/telemetryUtils.js';
+import { IConfigurationChangeEvent, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { TelemetryLevel } from '../../../../platform/telemetry/common/telemetry.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { SimpleSettingRenderer } from '../../markdown/browser/markdownSettingRenderer.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
 
 export class ReleaseNotesManager {
 	private readonly _simpleSettingRenderer: SimpleSettingRenderer;
@@ -203,7 +203,7 @@ export class ReleaseNotesManager {
 				throw new Error('Failed to fetch release notes');
 			}
 
-			if (!text || !/^#\s/.test(text)) { // release notes always starts with `#` followed by whitespace
+			if (!text || (!/^#\s/.test(text) && !useCurrentFile)) { // release notes always starts with `#` followed by whitespace, except when using the current file
 				throw new Error('Invalid release notes');
 			}
 
@@ -249,7 +249,16 @@ export class ReleaseNotesManager {
 
 	private async renderBody(text: string) {
 		const nonce = generateUuid();
-		const content = await renderMarkdownDocument(text, this._extensionService, this._languageService, false, undefined, undefined, this._simpleSettingRenderer);
+
+		const content = await renderMarkdownDocument(text, this._extensionService, this._languageService, {
+			shouldSanitize: false,
+			markedExtensions: [{
+				renderer: {
+					html: this._simpleSettingRenderer.getHtmlRenderer(),
+					codespan: this._simpleSettingRenderer.getCodeSpanRenderer(),
+				}
+			}]
+		});
 		const colorMap = TokenizationRegistry.getColorMap();
 		const css = colorMap ? generateTokensCSSForColorMap(colorMap) : '';
 		const showReleaseNotes = Boolean(this._configurationService.getValue<boolean>('update.showReleaseNotes'));
@@ -266,7 +275,7 @@ export class ReleaseNotesManager {
 
 					/* codesetting */
 
-					code:has(.codesetting)+code {
+					code:has(.codesetting)+code:not(:has(.codesetting)) {
 						display: none;
 					}
 
@@ -384,7 +393,7 @@ export class ReleaseNotesManager {
 					});
 
 					window.addEventListener('click', event => {
-						const href = event.target.href ?? event.target.parentElement.href ?? event.target.parentElement.parentElement?.href;
+						const href = event.target.href ?? event.target.parentElement?.href ?? event.target.parentElement?.parentElement?.href;
 						if (href && (href.startsWith('${Schemas.codeSetting}'))) {
 							vscode.postMessage({ type: 'clickSetting', value: { uri: href, x: event.clientX, y: event.clientY }});
 						}
diff --git a/src/vs/workbench/contrib/update/browser/update.contribution.ts b/src/vs/workbench/contrib/update/browser/update.contribution.ts
index fa3edab7d3a..4baf8e82cc0 100644
--- a/src/vs/workbench/contrib/update/browser/update.contribution.ts
+++ b/src/vs/workbench/contrib/update/browser/update.contribution.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/platform/update/common/update.config.contribution';
-import { localize, localize2 } from 'vs/nls';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { MenuId, registerAction2, Action2 } from 'vs/platform/actions/common/actions';
-import { ProductContribution, UpdateContribution, CONTEXT_UPDATE_STATE, SwitchProductQualityContribution, RELEASE_NOTES_URL, showReleaseNotesInEditor, DOWNLOAD_URL } from 'vs/workbench/contrib/update/browser/update';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import product from 'vs/platform/product/common/product';
-import { IUpdateService, StateType } from 'vs/platform/update/common/update';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { isWindows } from 'vs/base/common/platform';
-import { IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { mnemonicButtonLabel } from 'vs/base/common/labels';
-import { ShowCurrentReleaseNotesActionId, ShowCurrentReleaseNotesFromCurrentFileActionId } from 'vs/workbench/contrib/update/common/update';
-import { IsWebContext } from 'vs/platform/contextkey/common/contextkeys';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { URI } from 'vs/base/common/uri';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
+import '../../../../platform/update/common/update.config.contribution.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from '../../../common/contributions.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { MenuId, registerAction2, Action2 } from '../../../../platform/actions/common/actions.js';
+import { ProductContribution, UpdateContribution, CONTEXT_UPDATE_STATE, SwitchProductQualityContribution, RELEASE_NOTES_URL, showReleaseNotesInEditor, DOWNLOAD_URL } from './update.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import product from '../../../../platform/product/common/product.js';
+import { IUpdateService, StateType } from '../../../../platform/update/common/update.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { isWindows } from '../../../../base/common/platform.js';
+import { IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { mnemonicButtonLabel } from '../../../../base/common/labels.js';
+import { ShowCurrentReleaseNotesActionId, ShowCurrentReleaseNotesFromCurrentFileActionId } from '../common/update.js';
+import { IsWebContext } from '../../../../platform/contextkey/common/contextkeys.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 
 const workbench = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
 
@@ -81,7 +81,6 @@ export class ShowCurrentReleaseNotesFromCurrentFileAction extends Action2 {
 			},
 			category: localize2('developerCategory', "Developer"),
 			f1: true,
-			precondition: RELEASE_NOTES_URL
 		});
 	}
 
diff --git a/src/vs/workbench/contrib/update/browser/update.ts b/src/vs/workbench/contrib/update/browser/update.ts
index af1b3d507c2..2ff75f4594c 100644
--- a/src/vs/workbench/contrib/update/browser/update.ts
+++ b/src/vs/workbench/contrib/update/browser/update.ts
@@ -3,33 +3,33 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import severity from 'vs/base/common/severity';
-import { Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { IActivityService, NumberBadge, IBadge, ProgressBadge } from 'vs/workbench/services/activity/common/activity';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IUpdateService, State as UpdateState, StateType, IUpdate, DisablementReason } from 'vs/platform/update/common/update';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { ReleaseNotesManager } from 'vs/workbench/contrib/update/browser/releaseNotesEditor';
-import { isMacintosh, isWeb, isWindows } from 'vs/base/common/platform';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { RawContextKey, IContextKey, IContextKeyService, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { MenuRegistry, MenuId, registerAction2, Action2 } from 'vs/platform/actions/common/actions';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IUserDataSyncEnablementService, IUserDataSyncService, IUserDataSyncStoreManagementService, SyncStatus, UserDataSyncStoreType } from 'vs/platform/userDataSync/common/userDataSync';
-import { IsWebContext } from 'vs/platform/contextkey/common/contextkeys';
-import { Promises } from 'vs/base/common/async';
-import { IUserDataSyncWorkbenchService } from 'vs/workbench/services/userDataSync/common/userDataSync';
-import { Event } from 'vs/base/common/event';
-import { Action } from 'vs/base/common/actions';
+import * as nls from '../../../../nls.js';
+import severity from '../../../../base/common/severity.js';
+import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IActivityService, NumberBadge, IBadge, ProgressBadge } from '../../../services/activity/common/activity.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IUpdateService, State as UpdateState, StateType, IUpdate, DisablementReason } from '../../../../platform/update/common/update.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IBrowserWorkbenchEnvironmentService } from '../../../services/environment/browser/environmentService.js';
+import { ReleaseNotesManager } from './releaseNotesEditor.js';
+import { isMacintosh, isWeb, isWindows } from '../../../../base/common/platform.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { RawContextKey, IContextKey, IContextKeyService, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { MenuRegistry, MenuId, registerAction2, Action2 } from '../../../../platform/actions/common/actions.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IUserDataSyncEnablementService, IUserDataSyncService, IUserDataSyncStoreManagementService, SyncStatus, UserDataSyncStoreType } from '../../../../platform/userDataSync/common/userDataSync.js';
+import { IsWebContext } from '../../../../platform/contextkey/common/contextkeys.js';
+import { Promises } from '../../../../base/common/async.js';
+import { IUserDataSyncWorkbenchService } from '../../../services/userDataSync/common/userDataSync.js';
+import { Event } from '../../../../base/common/event.js';
+import { Action } from '../../../../base/common/actions.js';
 
 export const CONTEXT_UPDATE_STATE = new RawContextKey<string>('updateState', StateType.Uninitialized);
 export const MAJOR_MINOR_UPDATE_AVAILABLE = new RawContextKey<boolean>('majorMinorUpdateAvailable', false);
diff --git a/src/vs/workbench/contrib/url/browser/externalUriResolver.ts b/src/vs/workbench/contrib/url/browser/externalUriResolver.ts
index e579170fb4d..898dbdebd9d 100644
--- a/src/vs/workbench/contrib/url/browser/externalUriResolver.ts
+++ b/src/vs/workbench/contrib/url/browser/externalUriResolver.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IBrowserWorkbenchEnvironmentService } from '../../../services/environment/browser/environmentService.js';
 
 export class ExternalUriResolverContribution extends Disposable implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/contrib/url/browser/trustedDomainService.ts b/src/vs/workbench/contrib/url/browser/trustedDomainService.ts
index a89f8ceeb54..24a9cf16be2 100644
--- a/src/vs/workbench/contrib/url/browser/trustedDomainService.ts
+++ b/src/vs/workbench/contrib/url/browser/trustedDomainService.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { WindowIdleValue } from 'vs/base/browser/dom';
-import { mainWindow } from 'vs/base/browser/window';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { IInstantiationService, createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
-import { TRUSTED_DOMAINS_STORAGE_KEY, readStaticTrustedDomains } from 'vs/workbench/contrib/url/browser/trustedDomains';
-import { testUrlMatchesGlob } from 'vs/workbench/contrib/url/common/urlGlob';
+import { WindowIdleValue } from '../../../../base/browser/dom.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IInstantiationService, createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService, StorageScope } from '../../../../platform/storage/common/storage.js';
+import { TRUSTED_DOMAINS_STORAGE_KEY, readStaticTrustedDomains } from './trustedDomains.js';
+import { testUrlMatchesGlob } from '../common/urlGlob.js';
 
 export const ITrustedDomainService = createDecorator<ITrustedDomainService>('ITrustedDomainService');
 
diff --git a/src/vs/workbench/contrib/url/browser/trustedDomains.ts b/src/vs/workbench/contrib/url/browser/trustedDomains.ts
index 00e3c342a3b..e4f83a86eb2 100644
--- a/src/vs/workbench/contrib/url/browser/trustedDomains.ts
+++ b/src/vs/workbench/contrib/url/browser/trustedDomains.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { localize, localize2 } from 'vs/nls';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
+import { URI } from '../../../../base/common/uri.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IQuickInputService, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IBrowserWorkbenchEnvironmentService } from '../../../services/environment/browser/environmentService.js';
 
 const TRUSTED_DOMAINS_URI = URI.parse('trustedDomains:/Trusted Domains');
 
diff --git a/src/vs/workbench/contrib/url/browser/trustedDomainsFileSystemProvider.ts b/src/vs/workbench/contrib/url/browser/trustedDomainsFileSystemProvider.ts
index 62ab7f3c167..d508a0d8785 100644
--- a/src/vs/workbench/contrib/url/browser/trustedDomainsFileSystemProvider.ts
+++ b/src/vs/workbench/contrib/url/browser/trustedDomainsFileSystemProvider.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { parse } from 'vs/base/common/json';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { IFileDeleteOptions, IFileOverwriteOptions, FileSystemProviderCapabilities, FileType, IFileWriteOptions, IFileService, IStat, IWatchOptions, IFileSystemProviderWithFileReadWriteCapability } from 'vs/platform/files/common/files';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { readTrustedDomains, TRUSTED_DOMAINS_CONTENT_STORAGE_KEY, TRUSTED_DOMAINS_STORAGE_KEY } from 'vs/workbench/contrib/url/browser/trustedDomains';
-import { assertIsDefined } from 'vs/base/common/types';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { Event } from '../../../../base/common/event.js';
+import { parse } from '../../../../base/common/json.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IFileDeleteOptions, IFileOverwriteOptions, FileSystemProviderCapabilities, FileType, IFileWriteOptions, IFileService, IStat, IWatchOptions, IFileSystemProviderWithFileReadWriteCapability } from '../../../../platform/files/common/files.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { readTrustedDomains, TRUSTED_DOMAINS_CONTENT_STORAGE_KEY, TRUSTED_DOMAINS_STORAGE_KEY } from './trustedDomains.js';
+import { assertIsDefined } from '../../../../base/common/types.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 
 const TRUSTED_DOMAINS_SCHEMA = 'trustedDomains';
 
diff --git a/src/vs/workbench/contrib/url/browser/trustedDomainsValidator.ts b/src/vs/workbench/contrib/url/browser/trustedDomainsValidator.ts
index 5c21822bbe4..dac333694a5 100644
--- a/src/vs/workbench/contrib/url/browser/trustedDomainsValidator.ts
+++ b/src/vs/workbench/contrib/url/browser/trustedDomainsValidator.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Schemas, matchesScheme } from 'vs/base/common/network';
-import Severity from 'vs/base/common/severity';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IOpenerService, OpenOptions } from 'vs/platform/opener/common/opener';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IWorkspaceTrustManagementService } from 'vs/platform/workspace/common/workspaceTrust';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { ITrustedDomainService, isURLDomainTrusted } from 'vs/workbench/contrib/url/browser/trustedDomainService';
-import { configureOpenerTrustedDomainsHandler, readStaticTrustedDomains } from 'vs/workbench/contrib/url/browser/trustedDomains';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { Schemas, matchesScheme } from '../../../../base/common/network.js';
+import Severity from '../../../../base/common/severity.js';
+import { URI } from '../../../../base/common/uri.js';
+import { localize } from '../../../../nls.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IOpenerService, OpenOptions } from '../../../../platform/opener/common/opener.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IWorkspaceTrustManagementService } from '../../../../platform/workspace/common/workspaceTrust.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { ITrustedDomainService, isURLDomainTrusted } from './trustedDomainService.js';
+import { configureOpenerTrustedDomainsHandler, readStaticTrustedDomains } from './trustedDomains.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
 
 export class OpenerValidatorContributions implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/contrib/url/browser/url.contribution.ts b/src/vs/workbench/contrib/url/browser/url.contribution.ts
index abe4ecd5caa..f1d1d3be7c0 100644
--- a/src/vs/workbench/contrib/url/browser/url.contribution.ts
+++ b/src/vs/workbench/contrib/url/browser/url.contribution.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { localize, localize2 } from 'vs/nls';
-import { MenuId, MenuRegistry, Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IURLService } from 'vs/platform/url/common/url';
-import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { ExternalUriResolverContribution } from 'vs/workbench/contrib/url/browser/externalUriResolver';
-import { manageTrustedDomainSettingsCommand } from 'vs/workbench/contrib/url/browser/trustedDomains';
-import { TrustedDomainsFileSystemProvider } from 'vs/workbench/contrib/url/browser/trustedDomainsFileSystemProvider';
-import { OpenerValidatorContributions } from 'vs/workbench/contrib/url/browser/trustedDomainsValidator';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { ConfigurationScope, Extensions as ConfigurationExtensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { workbenchConfigurationNodeBase } from 'vs/workbench/common/configuration';
-import { ITrustedDomainService, TrustedDomainService } from 'vs/workbench/contrib/url/browser/trustedDomainService';
-import { registerSingleton, InstantiationType } from 'vs/platform/instantiation/common/extensions';
+import { URI } from '../../../../base/common/uri.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { MenuId, MenuRegistry, Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IURLService } from '../../../../platform/url/common/url.js';
+import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { ExternalUriResolverContribution } from './externalUriResolver.js';
+import { manageTrustedDomainSettingsCommand } from './trustedDomains.js';
+import { TrustedDomainsFileSystemProvider } from './trustedDomainsFileSystemProvider.js';
+import { OpenerValidatorContributions } from './trustedDomainsValidator.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { ConfigurationScope, Extensions as ConfigurationExtensions, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { workbenchConfigurationNodeBase } from '../../../common/configuration.js';
+import { ITrustedDomainService, TrustedDomainService } from './trustedDomainService.js';
+import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js';
 
 class OpenUrlAction extends Action2 {
 
diff --git a/src/vs/workbench/contrib/url/common/urlGlob.ts b/src/vs/workbench/contrib/url/common/urlGlob.ts
index 9bde5c23ec5..cc44a3dafc4 100644
--- a/src/vs/workbench/contrib/url/common/urlGlob.ts
+++ b/src/vs/workbench/contrib/url/common/urlGlob.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
+import { URI } from '../../../../base/common/uri.js';
 
 // TODO: rewrite this to use URIs directly and validate each part individually
 // instead of relying on memoization of the stringified URI.
diff --git a/src/vs/workbench/contrib/url/test/browser/mockTrustedDomainService.ts b/src/vs/workbench/contrib/url/test/browser/mockTrustedDomainService.ts
index 61c252892ae..020ac3a9331 100644
--- a/src/vs/workbench/contrib/url/test/browser/mockTrustedDomainService.ts
+++ b/src/vs/workbench/contrib/url/test/browser/mockTrustedDomainService.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { isURLDomainTrusted, ITrustedDomainService } from 'vs/workbench/contrib/url/browser/trustedDomainService';
+import { URI } from '../../../../../base/common/uri.js';
+import { isURLDomainTrusted, ITrustedDomainService } from '../../browser/trustedDomainService.js';
 
 export class MockTrustedDomainService implements ITrustedDomainService {
 	_serviceBrand: undefined;
diff --git a/src/vs/workbench/contrib/url/test/browser/trustedDomains.test.ts b/src/vs/workbench/contrib/url/test/browser/trustedDomains.test.ts
index db1c149501f..aef79543d56 100644
--- a/src/vs/workbench/contrib/url/test/browser/trustedDomains.test.ts
+++ b/src/vs/workbench/contrib/url/test/browser/trustedDomains.test.ts
@@ -5,9 +5,9 @@
 
 import assert from 'assert';
 
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { isURLDomainTrusted } from 'vs/workbench/contrib/url/browser/trustedDomainService';
+import { URI } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { isURLDomainTrusted } from '../../browser/trustedDomainService.js';
 
 function linkAllowedByRules(link: string, rules: string[]) {
 	assert.ok(isURLDomainTrusted(URI.parse(link), rules), `Link\n${link}\n should be allowed by rules\n${JSON.stringify(rules)}`);
diff --git a/src/vs/workbench/contrib/userDataProfile/browser/media/userDataProfilesEditor.css b/src/vs/workbench/contrib/userDataProfile/browser/media/userDataProfilesEditor.css
index f1054b365c5..69245662b44 100644
--- a/src/vs/workbench/contrib/userDataProfile/browser/media/userDataProfilesEditor.css
+++ b/src/vs/workbench/contrib/userDataProfile/browser/media/userDataProfilesEditor.css
@@ -6,7 +6,7 @@
 .profiles-editor {
 	height: 100%;
 	overflow: hidden;
-	max-width: 1000px;
+	max-width: 1200px;
 	margin: 20px auto 0px auto;
 }
 
@@ -15,13 +15,12 @@
 	height: 100%;
 }
 
-.profiles-editor .monaco-split-view2 > .sash-container,
-.profiles-editor .monaco-split-view2.separator-border.horizontal > .monaco-scrollable-element > .split-view-container > .split-view-view:not(:first-child)::before {
+.profiles-editor > .monaco-split-view2 > .sash-container,
+.profiles-editor > .monaco-split-view2.separator-border.horizontal > .monaco-scrollable-element > .split-view-container > .split-view-view:not(:first-child)::before {
 	top: 55px;
 }
 
 .profiles-editor .contents-container {
-	padding: 0px 20px;
 	height: 100%;
 }
 
@@ -49,13 +48,13 @@
 
 .profiles-editor .monaco-list-row .profile-tree-item-actions-container {
 	display: none;
+	align-items: center;
 }
 
 .profiles-editor .monaco-list-row.focused .profile-tree-item-actions-container,
 .profiles-editor .monaco-list-row.selected .profile-tree-item-actions-container,
 .profiles-editor .monaco-list-row:hover .profile-tree-item-actions-container {
 	display: flex;
-	align-items: center;
 }
 
 .profiles-editor .sidebar-container .profiles-list {
@@ -72,6 +71,11 @@
 	margin-right: 5px;
 }
 
+.profiles-editor .sidebar-container .profiles-list .profile-list-item > .profile-list-item-label {
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
 .profiles-editor .sidebar-container .profiles-list .profile-list-item > .profile-list-item-label.new-profile {
 	font-style: italic;
 }
@@ -95,50 +99,20 @@
 }
 
 .profiles-editor .contents-container .profile-header {
+	margin-left: 27px;
 	display: flex;
 	height: 40px;
 	align-items: center;
 }
 
 .profiles-editor .contents-container .profile-header .profile-title-container {
-	flex: 1;
-	display: flex;
-	align-items: center;
-	font-size: medium;
-}
-
-.profiles-editor .contents-container .profile-title-container .codicon {
-	cursor: pointer;
-	font-size: large;
-	padding: 4px;
-	margin-right: 8px;
+	font-size: 26px;
+	font-weight: 600;
 }
 
 .profiles-editor .contents-container .profile-title-container .monaco-inputbox {
-	width: 340px;
-}
-
-.profiles-editor .contents-container .profile-header .profile-button-container {
-	display: flex;
-	align-items: center;
-}
-
-.profiles-editor .contents-container .profile-header .profile-button-container .monaco-button {
-	margin-left: 4px;
-}
-
-.profiles-editor .contents-container .profile-header .profile-actions-container {
-	display: flex;
-}
-
-.profiles-editor .contents-container .profile-header .profile-actions-container .profile-button-container {
-	margin-right: 6px;
-	min-width: 120px;
-}
-
-.profiles-editor .contents-container .profile-header .profile-actions-container .profile-button-container .monaco-button {
-	padding-left: 10px;
-	padding-right: 10px;
+	margin-right: 10px;
+	flex: 1;
 }
 
 .profiles-editor .contents-container .profile-header .profile-actions-container .actions-container .action-label {
@@ -146,7 +120,68 @@
 }
 
 .profiles-editor .contents-container .profile-body {
-	margin-top: 20px;
+	margin: 15px 0px 0px 1px
+}
+
+.profiles-editor .contents-container .profile-body .profile-row-container {
+	padding: 12px 0px;
+}
+
+.profiles-editor .contents-container .profile-body .profile-row-container.no-padding-bottom {
+	padding-bottom: 0px;
+}
+
+.profiles-editor .contents-container .profile-body .profile-row-container .profile-label-element {
+	font-weight: 600;
+	padding-bottom: 5px;
+}
+
+.profiles-editor .contents-container .profile-body .profile-row-container .profile-description-element {
+	color: var(--vscode-foreground);
+	opacity: 0.9;
+}
+
+.profiles-editor .contents-container .profile-body .profile-row-container .profile-description-element ul,
+.profiles-editor .contents-container .profile-body .profile-row-container .profile-description-element p {
+	margin: 0px;
+}
+
+.profiles-editor .contents-container .profile-body .profile-row-container .profile-description-element ul {
+	padding-inline-start: 28px;
+}
+
+.profiles-editor .contents-container .profile-body .profile-row-container .profile-description-element ul li {
+	padding-left: 2px;
+}
+
+.profiles-editor .contents-container .profile-body .profile-row-container .monaco-inputbox {
+	width: 400px;
+}
+
+.profiles-editor .contents-container .profile-body .profile-row-container .profile-icon-container {
+	line-height: 22px;
+	display: flex;
+	align-items: center;
+}
+
+.profiles-editor .contents-container .profile-body .profile-row-container .profile-icon-container.disabled .codicon {
+	cursor: default;
+}
+
+.profiles-editor .contents-container .profile-body .profile-row-container .profile-icon-container .codicon {
+	cursor: pointer;
+	margin-right: 4px;
+	padding: 2px;
+	border-radius: 5px;
+}
+
+.profiles-editor .contents-container .profile-body .profile-row-container .profile-icon-container:not(.disabled) .codicon:hover {
+	background-color: var(--vscode-toolbar-hoverBackground);
+	outline: 1px dashed var(--vscode-toolbar-hoverOutline);
+}
+
+.profiles-editor .contents-container .profile-body .profile-row-container .profile-icon-container .profile-description-element {
+	margin-top: -1px;
 }
 
 .profiles-editor .contents-container .profile-select-container {
@@ -163,30 +198,25 @@
 	border-radius: 2px;
 }
 
-.profiles-editor .contents-container .profile-copy-from-container {
-	display: flex;
-	align-items: center;
-	margin: 0px 0px 20px 36px;
-}
-
-.profiles-editor .contents-container .profile-copy-from-container > .profile-copy-from-label {
-	margin-right: 25px;
-	display: inline-flex;
-	align-items: center;
-}
-
-.profiles-editor .contents-container .profile-copy-from-container > .profile-select-container {
+.profiles-editor .contents-container .profile-copy-from-container .profile-select-container {
+	margin-top: 5px;
 	width: 250px;
 }
 
-.profiles-editor .contents-container .profile-use-as-default-container {
+.profiles-editor .contents-container .profile-use-as-default-container,
+.profiles-editor .contents-container .profile-use-for-current-container {
 	display: flex;
 	align-items: center;
-	margin: 0px 20px 15px 6px;
-	cursor: pointer;
+	line-height: 22px;
 }
 
-.profiles-editor .contents-container .profile-use-as-default-container .profile-use-as-default-label {
+.profiles-editor .contents-container .profile-body .profile-row-container .profile-use-as-default-container .profile-description-element,
+.profiles-editor .contents-container .profile-body .profile-row-container .profile-use-for-current-container .profile-description-element {
+	margin-top: -1px;
+}
+
+.profiles-editor .contents-container .profile-use-as-default-container .profile-use-as-default-label,
+.profiles-editor .contents-container .profile-use-for-current-container .profile-use-as-default-label {
 	margin-left: 2px;
 }
 
@@ -194,57 +224,54 @@
 	margin: 0px 0px 10px 20px;
 }
 
-.profiles-editor .contents-container .profile-content-tree-header,
-.profiles-editor .contents-container .profile-content-tree {
-	margin-left: 6px;
-}
-
 .profiles-editor .contents-container .profile-content-tree-header {
 	display: grid;
-	grid-template-columns: 30px repeat(2, 1fr) 100px;
-	height: 24px;
+	grid-template-columns: 30px repeat(2, 1fr) 80px;
+	line-height: 22px;
+	height: 30px;
 	align-items: center;
-	margin-bottom: 2px;
-	background-color: var(--vscode-keybindingTable-headerBackground);
+	margin: 5px 0px 2px 0px;
 	font-weight: bold;
+	border-bottom: 1px solid transparent;
+}
+
+.profiles-editor .profile-associations-table .monaco-table-th,
+.profiles-editor .contents-container .profile-content-tree-header {
+	background-color: var(--vscode-keybindingTable-headerBackground);
+}
+
+.profiles-editor .contents-container .profile-content-tree-header > .options-header {
+	display: flex;
+	align-items: center;
+}
+
+.profiles-editor .contents-container .profile-content-tree-header > .options-header .codicon {
+	cursor: pointer;
+	padding-left: 2px;
+}
+
+.profiles-editor .contents-container .profile-content-tree-header.default-profile {
+	grid-template-columns: 30px repeat(1, 1fr) 80px;
+}
+
+.profiles-editor .contents-container .profile-content-tree-header.default-profile > .options-header {
+	display: none;
 }
 
 .profiles-editor .contents-container .profile-tree-item-container {
-	display: flex;
-	align-items: center;
-}
-
-.profiles-editor .contents-container .profile-tree-item-container.existing-profile-resource-type-container {
 	display: grid;
-	grid-template-columns: repeat(2, 1fr) 100px;
-}
-
-.profiles-editor .contents-container .profile-content-tree-header > .inherit-label,
-.profiles-editor .contents-container .profile-tree-item-container > .inherit-container {
-	justify-content: center;
 	align-items: center;
+	grid-template-columns: repeat(2, 1fr) 80px;
 }
 
-.profiles-editor .contents-container .profile-tree-item-container > .inherit-container {
-	padding-left: 50px;
+.profiles-editor .contents-container .profile-body .profile-tree .monaco-list-row .profile-content-tree-header,
+.profiles-editor .contents-container .profile-body .profile-tree .monaco-list-row .profile-content-tree {
+	margin-right: 1px;
 }
 
-.profiles-editor .contents-container .profile-content-tree-header > .actions-label {
-	display: flex;
-	justify-content: center;
-	align-items: center;
-}
-
-.profiles-editor .contents-container .profile-tree-item-container.profile-resource-child-container > .profile-tree-item-actions-container {
-	width: 100px;
-}
-
-.profiles-editor .contents-container .profile-tree-item-container.new-profile-resource-type-container > .profile-resource-type-label-container {
-	width: 170px;
-}
-
-.profiles-editor .contents-container .profile-tree-item-container.new-profile-resource-type-container > .profile-select-container {
-	width: 170px;
+.profiles-editor .contents-container .profile-tree-item-container.default-profile,
+.profiles-editor .contents-container .profile-tree-item-container.profile-resource-child-container {
+	grid-template-columns: repeat(1, 1fr) 80px;
 }
 
 .profiles-editor .contents-container .profile-tree-item-container .profile-resource-type-description {
@@ -253,10 +280,158 @@
 	opacity: 0.7;
 }
 
-.profiles-editor .contents-container .profile-tree-item-container.profile-resource-child-container > .monaco-icon-label {
-	flex: 1
+.profiles-editor .contents-container .profile-tree-item-container .profile-resource-options-container {
+	height: fit-content;
+	width: fit-content;
 }
 
-.profiles-editor .contents-container .profile-tree-item-container .profile-tree-item-actions-container {
-	justify-content: center;
+.profiles-editor .contents-container .profile-tree-item-container .monaco-custom-radio .monaco-button {
+	outline-offset: -1px !important;
+}
+
+.profiles-editor .contents-container .profile-tree-item-container .profile-resource-actions-container {
+	display: none;
+	justify-self: end;
+	padding-right: 10px;
+}
+
+.profiles-editor .contents-container .profile-content-tree .monaco-list-row.selected .profile-resource-actions-container,
+.profiles-editor .contents-container .profile-content-tree .monaco-list-row.focused .profile-resource-actions-container,
+.profiles-editor .contents-container .profile-content-tree .monaco-list-row:hover .profile-resource-actions-container {
+	display: flex;
+}
+
+.profiles-editor .contents-container .profile-body .profile-row-container.profile-button-container {
+	margin-top: 10px;
+	margin-left: 30px;
+	display: flex;
+	align-items: center;
+}
+
+.profiles-editor .contents-container .profile-body .profile-row-container.profile-button-container .monaco-button {
+	margin-right: 10px;
+	width: inherit;
+	padding: 4px 10px;
+}
+
+.profiles-editor .profile-associations-table {
+	margin-top: 5px;
+}
+
+.profiles-editor .profile-associations-table .monaco-table-th,
+.profiles-editor .profile-associations-table .monaco-table-td {
+	padding: 0px 5px;
+}
+
+.profiles-editor .profile-associations-table .monaco-table-td {
+	display: flex;
+	align-items: center;
+	overflow: hidden;
+}
+
+.profiles-editor .profile-associations-table .monaco-list-row .monaco-table-tr .monaco-table-td .profile-workspaces-actions-container {
+	display: none;
+	justify-content: flex-end;
+	padding-right: 5px;
+}
+
+.profiles-editor .profile-associations-table .monaco-list-row.selected .monaco-table-tr .monaco-table-td .profile-workspaces-actions-container,
+.profiles-editor .profile-associations-table .monaco-list-row.focused .monaco-table-tr .monaco-table-td .profile-workspaces-actions-container,
+.profiles-editor .profile-associations-table .monaco-list-row:hover .monaco-table-tr .monaco-table-td .profile-workspaces-actions-container {
+	display: flex;
+}
+
+.profiles-editor .profile-associations-table .monaco-table-tr .monaco-table-td .host,
+.profiles-editor .profile-associations-table .monaco-table-tr .monaco-table-td .path {
+	width: 100%;
+}
+
+.profiles-editor .profile-associations-table .monaco-table-tr .monaco-table-td .host .host-label,
+.profiles-editor .profile-associations-table .monaco-table-tr .monaco-table-td .path .path-label {
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+.profiles-editor .profile-associations-table .monaco-table-tr .monaco-table-td .current-workspace .path-label,
+.profiles-editor .profile-associations-table .monaco-table-tr .monaco-table-td .current-workspace .host-label {
+	font-weight: bold;
+	font-style: italic;
+}
+
+.profiles-editor .contents-container .profile-body .profile-row-container .profile-workspaces-button-container {
+	display: flex;
+	margin: 8px 4px;
+}
+
+.profiles-editor .contents-container .profile-body .profile-row-container .profile-workspaces-button-container .monaco-button {
+	width: inherit;
+	padding: 2px 14px;
+}
+
+/* Profile Editor Tree Theming */
+
+.profiles-editor .contents-container .profile-body .profile-tree .monaco-list-row.focused {
+	background-color: var(--vscode-settings-focusedRowBackground) !important;
+}
+
+.profiles-editor .contents-container .profile-body .profile-tree .monaco-list-row .profile-associations-table .monaco-list-row[data-parity=odd] .monaco-table-tr {
+	background-color: transparent !important;
+}
+
+.profiles-editor .contents-container .profile-body .profile-tree .monaco-list-row:not(.focused):hover {
+	background-color: var(--vscode-settings-rowHoverBackground) !important;
+}
+
+.profiles-editor .contents-container .profile-body .profile-tree .monaco-list:focus .monaco-list-row.focused {
+	outline: 1px solid var(--vscode-settings-focusedRowBorder) !important;
+}
+
+.profiles-editor .contents-container .profile-body .profile-tree .monaco-list-row {
+	cursor: default;
+}
+
+.profiles-editor .contents-container .profile-body .profile-tree .monaco-list-row .profile-associations-table .monaco-list-row,
+.profiles-editor .contents-container .profile-body .profile-tree .monaco-list-row .profile-content-tree .monaco-list-row {
+	cursor: default;
+}
+
+.profiles-editor .contents-container .profile-body .profile-tree .monaco-list-row .profile-associations-table .monaco-list-row.focused,
+.profiles-editor .contents-container .profile-body .profile-tree .monaco-list-row .profile-associations-table .monaco-list-row.selected:not(:focus),
+.profiles-editor .contents-container .profile-body .profile-tree .monaco-list-row .profile-associations-table .monaco-list-row.selected:focus,
+.profiles-editor .contents-container .profile-body .profile-tree .monaco-list-row .profile-content-tree .monaco-list-row.focused,
+.profiles-editor .contents-container .profile-body .profile-tree .monaco-list-row .profile-content-tree .monaco-list-row.selected:not(:focus),
+.profiles-editor .contents-container .profile-body .profile-tree .monaco-list-row .profile-content-tree .monaco-list-row.selected:focus {
+	background-color: inherit !important;
+	color: inherit !important;
+}
+
+.monaco-workbench:not(.hc-black):not(.hc-light) .profiles-editor .contents-container .profile-body .profile-tree .monaco-list-row .profile-associations-table .monaco-list-row:hover:not(.selected),
+.monaco-workbench:not(.hc-black):not(.hc-light) .profiles-editor .contents-container .profile-body .profile-tree .monaco-list-row .profile-content-tree .monaco-list-row:hover:not(.selected) {
+	background-color: var(--vscode-list-hoverBackground) !important;
+}
+
+.profiles-editor .contents-container .profile-body .profile-tree .monaco-list-row .profile-associations-table .monaco-list-row.selected:focus,
+.profiles-editor .contents-container .profile-body .profile-tree .monaco-list-row .profile-content-tree .monaco-list-row.selected:focus {
+	background-color: var(--vscode-list-activeSelectionBackground) !important;
+	color: var(--vscode-list-activeSelectionForeground) !important;
+}
+
+.profiles-editor .contents-container .profile-body .profile-tree .monaco-list-row .profile-associations-table .monaco-list-row.selected:not(:focus),
+.profiles-editor .contents-container .profile-body .profile-tree .monaco-list-row .profile-content-tree .monaco-list-row.selected:not(:focus) {
+	background-color: var(--vscode-list-inactiveSelectionBackground) !important;
+	color: var(--vscode-list-inactiveSelectionForeground) !important;
+}
+
+.profiles-editor .contents-container .profile-body .profile-tree .monaco-list-row .profile-content-tree .monaco-list-row .monaco-tl-twistie.collapsible {
+	cursor: pointer;
+}
+
+.profiles-editor .contents-container .profile-body .profile-tree .monaco-list-row .codicon,
+.profiles-editor .contents-container .profile-body .profile-tree .monaco-list-row .profile-content-tree .monaco-list-row .codicon {
+	color: inherit !important;
+}
+
+.monaco-workbench:not(.reduce-motion) .profiles-editor .contents-container .profile-body .profile-tree .monaco-list-row:hover .profile-content-tree-header,
+.monaco-workbench:not(.reduce-motion) .profiles-editor .contents-container .profile-body .profile-tree .monaco-list-row:hover .profile-associations-table .monaco-table > .monaco-split-view2 {
+	border-color: var(--vscode-tree-tableColumnsBorder) !important;
 }
diff --git a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfile.contribution.ts b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfile.contribution.ts
index d08a579c6a2..2801765c671 100644
--- a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfile.contribution.ts
+++ b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfile.contribution.ts
@@ -3,13 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IWorkbenchContributionsRegistry, Extensions, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { UserDataProfilesWorkbenchContribution } from 'vs/workbench/contrib/userDataProfile/browser/userDataProfile';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import './userDataProfileActions';
-import { UserDataProfilePreviewContribution } from 'vs/workbench/contrib/userDataProfile/browser/userDataProfilePreview';
+import { WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { UserDataProfilesWorkbenchContribution } from './userDataProfile.js';
+import './userDataProfileActions.js';
 
-const workbenchRegistry = Registry.as<IWorkbenchContributionsRegistry>(Extensions.Workbench);
 registerWorkbenchContribution2(UserDataProfilesWorkbenchContribution.ID, UserDataProfilesWorkbenchContribution, WorkbenchPhase.BlockRestore);
-workbenchRegistry.registerWorkbenchContribution(UserDataProfilePreviewContribution, LifecyclePhase.Restored);
diff --git a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfile.ts b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfile.ts
index db8e52ceaf4..e28044d36f1 100644
--- a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfile.ts
+++ b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfile.ts
@@ -3,45 +3,38 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, DisposableStore, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { isWeb } from 'vs/base/common/platform';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { localize, localize2 } from 'vs/nls';
-import { Action2, IMenuService, MenuId, MenuRegistry, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ContextKeyExpr, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { ILifecycleService, LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { CURRENT_PROFILE_CONTEXT, HAS_PROFILES_CONTEXT, IS_CURRENT_PROFILE_TRANSIENT_CONTEXT, IS_PROFILE_IMPORT_IN_PROGRESS_CONTEXT, IUserDataProfileImportExportService, IUserDataProfileManagementService, IUserDataProfileService, PROFILES_CATEGORY, PROFILE_FILTER, IS_PROFILE_EXPORT_IN_PROGRESS_CONTEXT, ProfilesMenu, PROFILES_ENABLEMENT_CONTEXT, PROFILES_TITLE, IProfileTemplateInfo } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { URI } from 'vs/base/common/uri';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { IWorkspaceTagsService } from 'vs/workbench/contrib/tags/common/workspaceTags';
-import { getErrorMessage } from 'vs/base/common/errors';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { EditorPaneDescriptor, IEditorPaneRegistry } from 'vs/workbench/browser/editor';
-import { EditorExtensions, IEditorFactoryRegistry } from 'vs/workbench/common/editor';
-import { UserDataProfilesEditor, UserDataProfilesEditorInput, UserDataProfilesEditorInputSerializer } from 'vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditor';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IUserDataProfilesEditor } from 'vs/workbench/contrib/userDataProfile/common/userDataProfile';
-import { ConfigurationScope, Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { workbenchConfigurationNodeBase } from 'vs/workbench/common/configuration';
-import { IProductService } from 'vs/platform/product/common/productService';
-
-type IProfileTemplateQuickPickItem = IQuickPickItem & IProfileTemplateInfo;
+import { Disposable, DisposableStore, IDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { isWeb } from '../../../../base/common/platform.js';
+import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { Action2, MenuId, MenuRegistry, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IUserDataProfile, IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { ILifecycleService, LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { CURRENT_PROFILE_CONTEXT, HAS_PROFILES_CONTEXT, IS_CURRENT_PROFILE_TRANSIENT_CONTEXT, IUserDataProfileManagementService, IUserDataProfileService, PROFILES_CATEGORY, PROFILES_ENABLEMENT_CONTEXT, PROFILES_TITLE, isProfileURL } from '../../../services/userDataProfile/common/userDataProfile.js';
+import { IQuickInputService, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { IWorkspaceTagsService } from '../../tags/common/workspaceTags.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { EditorPaneDescriptor, IEditorPaneRegistry } from '../../../browser/editor.js';
+import { EditorExtensions, IEditorFactoryRegistry } from '../../../common/editor.js';
+import { UserDataProfilesEditor, UserDataProfilesEditorInput, UserDataProfilesEditorInputSerializer } from './userDataProfilesEditor.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { IUserDataProfilesEditor } from '../common/userDataProfile.js';
+import { IURLService } from '../../../../platform/url/common/url.js';
+import { IBrowserWorkbenchEnvironmentService } from '../../../services/environment/browser/environmentService.js';
 
 export const OpenProfileMenu = new MenuId('OpenProfile');
-const CONFIG_ENABLE_NEW_PROFILES_UI = 'workbench.experimental.enableNewProfilesUI';
-const CONTEXT_ENABLE_NEW_PROFILES_UI = ContextKeyExpr.equals('config.workbench.experimental.enableNewProfilesUI', true);
+const ProfilesMenu = new MenuId('Profiles');
 
 export class UserDataProfilesWorkbenchContribution extends Disposable implements IWorkbenchContribution {
 
@@ -50,22 +43,20 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 	private readonly currentProfileContext: IContextKey<string>;
 	private readonly isCurrentProfileTransientContext: IContextKey<boolean>;
 	private readonly hasProfilesContext: IContextKey<boolean>;
-	private readonly startTime: number = Date.now();
 
 	constructor(
 		@IUserDataProfileService private readonly userDataProfileService: IUserDataProfileService,
 		@IUserDataProfilesService private readonly userDataProfilesService: IUserDataProfilesService,
 		@IUserDataProfileManagementService private readonly userDataProfileManagementService: IUserDataProfileManagementService,
-		@IUserDataProfileImportExportService private readonly userDataProfileImportExportService: IUserDataProfileImportExportService,
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
 		@IWorkspaceTagsService private readonly workspaceTagsService: IWorkspaceTagsService,
 		@IContextKeyService contextKeyService: IContextKeyService,
-		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IEditorGroupsService private readonly editorGroupsService: IEditorGroupsService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@IProductService private readonly productService: IProductService,
 		@ILifecycleService private readonly lifecycleService: ILifecycleService,
+		@IURLService private readonly urlService: IURLService,
+		@IBrowserWorkbenchEnvironmentService environmentService: IBrowserWorkbenchEnvironmentService,
 	) {
 		super();
 
@@ -84,38 +75,36 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 		this.hasProfilesContext.set(this.userDataProfilesService.profiles.length > 1);
 		this._register(this.userDataProfilesService.onDidChangeProfiles(e => this.hasProfilesContext.set(this.userDataProfilesService.profiles.length > 1)));
 
-		this.registerConfiguration();
 		this.registerEditor();
 		this.registerActions();
 
+		this._register(this.urlService.registerHandler(this));
+
 		if (isWeb) {
 			lifecycleService.when(LifecyclePhase.Eventually).then(() => userDataProfilesService.cleanUp());
 		}
 
 		this.reportWorkspaceProfileInfo();
+
+		if (environmentService.options?.profileToPreview) {
+			lifecycleService.when(LifecyclePhase.Restored).then(() => this.handleURL(URI.revive(environmentService.options!.profileToPreview!)));
+		}
 	}
 
-	private openProfilesEditor(): Promise<IUserDataProfilesEditor | undefined> {
-		return this.editorGroupsService.activeGroup.openEditor(new UserDataProfilesEditorInput(this.instantiationService));
+	async handleURL(uri: URI): Promise<boolean> {
+		if (isProfileURL(uri)) {
+			const editor = await this.openProfilesEditor();
+			if (editor) {
+				editor.createNewProfile(uri);
+				return true;
+			}
+		}
+		return false;
 	}
 
-	private isNewProfilesUIEnabled(): boolean {
-		return this.configurationService.getValue(CONFIG_ENABLE_NEW_PROFILES_UI) === true;
-	}
-
-	private registerConfiguration(): void {
-		Registry.as<IConfigurationRegistry>(Extensions.Configuration)
-			.registerConfiguration({
-				...workbenchConfigurationNodeBase,
-				properties: {
-					[CONFIG_ENABLE_NEW_PROFILES_UI]: {
-						type: 'boolean',
-						description: localize('enable new profiles UI', "Enables the new profiles UI."),
-						default: this.productService.quality !== 'stable',
-						scope: ConfigurationScope.APPLICATION,
-					}
-				}
-			});
+	private async openProfilesEditor(): Promise<IUserDataProfilesEditor | undefined> {
+		const editor = await this.editorGroupsService.activeGroup.openEditor(new UserDataProfilesEditorInput(this.instantiationService));
+		return editor as IUserDataProfilesEditor;
 	}
 
 	private registerEditor(): void {
@@ -138,14 +127,14 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 		this._register(this.registerSwitchProfileAction());
 
 		this.registerOpenProfileSubMenu();
+		this.registerNewWindowWithProfileAction();
 		this.registerProfilesActions();
 		this._register(this.userDataProfilesService.onDidChangeProfiles(() => this.registerProfilesActions()));
 
-		this.registerCurrentProfilesActions();
-		this._register(this.userDataProfileService.onDidChangeCurrentProfile(() => this.registerCurrentProfilesActions()));
+		this._register(this.registerExportCurrentProfileAction());
 
 		this.registerCreateFromCurrentProfileAction();
-		this.registerCreateProfileAction();
+		this.registerNewProfileAction();
 		this.registerDeleteProfileAction();
 
 		this.registerHelpAction();
@@ -155,7 +144,6 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 		const getProfilesTitle = () => {
 			return localize('profiles', "Profile ({0})", this.userDataProfileService.currentProfile.name);
 		};
-		const when = ContextKeyExpr.or(CONTEXT_ENABLE_NEW_PROFILES_UI.negate(), HAS_PROFILES_CONTEXT);
 		MenuRegistry.appendMenuItem(MenuId.GlobalActivity, {
 			get title() {
 				return getProfilesTitle();
@@ -163,7 +151,7 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 			submenu: ProfilesMenu,
 			group: '2_configuration',
 			order: 1,
-			when,
+			when: HAS_PROFILES_CONTEXT
 		});
 		MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
 			get title() {
@@ -172,17 +160,16 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 			submenu: ProfilesMenu,
 			group: '2_configuration',
 			order: 1,
-			when,
+			when: HAS_PROFILES_CONTEXT
 		});
 	}
 
 	private registerOpenProfileSubMenu(): void {
 		MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
-			title: localize('open profile', "Open Profile"),
+			title: localize('New Profile Window', "New Window with Profile"),
 			submenu: OpenProfileMenu,
-			group: '2_open',
+			group: '1_new',
 			order: 4,
-			when: HAS_PROFILES_CONTEXT,
 		});
 	}
 
@@ -216,29 +203,49 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 			}
 			async run(accessor: ServicesAccessor) {
 				if (that.userDataProfileService.currentProfile.id !== profile.id) {
-					if (profile.isDefault && Date.now() - that.startTime < (1000 * 20 /* 20 seconds */)) {
-						type SwitchToDefaultProfileInfoClassification = {
-							owner: 'sandy081';
-							comment: 'Report if the user switches to the default profile.';
-							emptyWindow: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'If the current window is empty window or not' };
-						};
-						type SwitchToDefaultProfileInfoEvent = {
-							emptyWindow: boolean;
-						};
-						that.telemetryService.publicLog2<SwitchToDefaultProfileInfoEvent, SwitchToDefaultProfileInfoClassification>('profiles:newwindowprofile', {
-							emptyWindow: that.workspaceContextService.getWorkbenchState() === WorkbenchState.EMPTY
-						});
-					}
 					return that.userDataProfileManagementService.switchProfile(profile);
 				}
 			}
 		});
 	}
 
+	private registerNewWindowWithProfileAction(): IDisposable {
+		return registerAction2(class NewWindowWithProfileAction extends Action2 {
+			constructor() {
+				super({
+					id: `workbench.profiles.actions.newWindowWithProfile`,
+					title: localize2('newWindowWithProfile', "New Window with Profile..."),
+					category: PROFILES_CATEGORY,
+					precondition: HAS_PROFILES_CONTEXT,
+					f1: true,
+				});
+			}
+			async run(accessor: ServicesAccessor) {
+				const quickInputService = accessor.get(IQuickInputService);
+				const userDataProfilesService = accessor.get(IUserDataProfilesService);
+				const hostService = accessor.get(IHostService);
+
+				const pick = await quickInputService.pick(
+					userDataProfilesService.profiles.map(profile => ({
+						label: profile.name,
+						profile
+					})),
+					{
+						title: localize('new window with profile', "New Window with Profile"),
+						placeHolder: localize('pick profile', "Select Profile"),
+						canPickMany: false
+					});
+				if (pick) {
+					return hostService.openWindow({ remoteAuthority: null, forceProfile: pick.profile.name });
+				}
+			}
+		});
+	}
+
 	private registerNewWindowAction(profile: IUserDataProfile): IDisposable {
 		const disposables = new DisposableStore();
 
-		const id = `workbench.action.openProfile.${profile.name.toLowerCase().replace('/\s+/', '_')}`;
+		const id = `workbench.action.openProfile.${profile.name.replace('/\s+/', '_')}`;
 
 		disposables.add(registerAction2(class NewWindowAction extends Action2 {
 
@@ -248,6 +255,7 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 					title: localize2('openShort', "{0}", profile.name),
 					menu: {
 						id: OpenProfileMenu,
+						group: '0_profiles',
 						when: HAS_PROFILES_CONTEXT
 					}
 				});
@@ -272,6 +280,7 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 	}
 
 	private registerSwitchProfileAction(): IDisposable {
+		const that = this;
 		return registerAction2(class SwitchProfileAction extends Action2 {
 			constructor() {
 				super({
@@ -284,33 +293,26 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 			}
 			async run(accessor: ServicesAccessor) {
 				const quickInputService = accessor.get(IQuickInputService);
-				const menuService = accessor.get(IMenuService);
-				const menu = menuService.createMenu(ProfilesMenu, accessor.get(IContextKeyService));
-				const actions = menu.getActions().find(([group]) => group === '0_profiles')?.[1] ?? [];
-				try {
-					const result = await quickInputService.pick(actions.map(action => ({
-						action,
-						label: action.checked ? `$(check) ${action.label}` : action.label,
-					})), {
-						placeHolder: localize('selectProfile', "Select Profile")
+
+				const items: Array<IQuickPickItem & { profile: IUserDataProfile }> = [];
+				for (const profile of that.userDataProfilesService.profiles) {
+					items.push({
+						id: profile.id,
+						label: profile.id === that.userDataProfileService.currentProfile.id ? `$(check) ${profile.name}` : profile.name,
+						profile,
 					});
-					await result?.action.run();
-				} finally {
-					menu.dispose();
+				}
+
+				const result = await quickInputService.pick(items.sort((a, b) => a.profile.name.localeCompare(b.profile.name)), {
+					placeHolder: localize('selectProfile', "Select Profile")
+				});
+				if (result) {
+					await that.userDataProfileManagementService.switchProfile(result.profile);
 				}
 			}
 		});
 	}
 
-	private readonly currentprofileActionsDisposable = this._register(new MutableDisposable<DisposableStore>());
-	private registerCurrentProfilesActions(): void {
-		this.currentprofileActionsDisposable.value = new DisposableStore();
-		this.currentprofileActionsDisposable.value.add(this.registerEditCurrentProfileAction());
-		this.currentprofileActionsDisposable.value.add(this.registerShowCurrentProfileContentsAction());
-		this.currentprofileActionsDisposable.value.add(this.registerExportCurrentProfileAction());
-		this.currentprofileActionsDisposable.value.add(this.registerImportProfileAction());
-	}
-
 	private registerManageProfilesAction(): IDisposable {
 		const disposables = new DisposableStore();
 		disposables.add(registerAction2(class ManageProfilesAction extends Action2 {
@@ -326,13 +328,18 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 							id: MenuId.GlobalActivity,
 							group: '2_configuration',
 							order: 1,
-							when: CONTEXT_ENABLE_NEW_PROFILES_UI,
+							when: HAS_PROFILES_CONTEXT.negate()
 						},
 						{
 							id: MenuId.MenubarPreferencesMenu,
 							group: '2_configuration',
 							order: 1,
-							when: CONTEXT_ENABLE_NEW_PROFILES_UI,
+							when: HAS_PROFILES_CONTEXT.negate()
+						},
+						{
+							id: ProfilesMenu,
+							group: '1_manage',
+							order: 1,
 						},
 					]
 				});
@@ -348,69 +355,12 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 				id: 'workbench.profiles.actions.manageProfiles',
 				category: Categories.Preferences,
 				title: localize2('open profiles', "Open Profiles (UI)"),
-				precondition: CONTEXT_ENABLE_NEW_PROFILES_UI,
 			},
 		}));
 
 		return disposables;
 	}
 
-	private registerEditCurrentProfileAction(): IDisposable {
-		const that = this;
-		return registerAction2(class RenameCurrentProfileAction extends Action2 {
-			constructor() {
-				const precondition = ContextKeyExpr.and(ContextKeyExpr.notEquals(CURRENT_PROFILE_CONTEXT.key, that.userDataProfilesService.defaultProfile.id), IS_CURRENT_PROFILE_TRANSIENT_CONTEXT.toNegated());
-				super({
-					id: `workbench.profiles.actions.editCurrentProfile`,
-					title: localize2('edit profile', "Edit Profile..."),
-					precondition,
-					f1: true,
-					menu: [
-						{
-							id: ProfilesMenu,
-							group: '2_manage_current',
-							when: ContextKeyExpr.and(precondition, CONTEXT_ENABLE_NEW_PROFILES_UI.negate()),
-							order: 2
-						}
-					]
-				});
-			}
-			run(accessor: ServicesAccessor) {
-				if (that.isNewProfilesUIEnabled()) {
-					return that.openProfilesEditor();
-				} else {
-					return that.userDataProfileImportExportService.editProfile(that.userDataProfileService.currentProfile);
-				}
-			}
-		});
-	}
-
-	private registerShowCurrentProfileContentsAction(): IDisposable {
-		const id = 'workbench.profiles.actions.showProfileContents';
-		return registerAction2(class ShowProfileContentsAction extends Action2 {
-			constructor() {
-				super({
-					id,
-					title: localize2('show profile contents', "Show Profile Contents"),
-					category: PROFILES_CATEGORY,
-					menu: [
-						{
-							id: ProfilesMenu,
-							group: '2_manage_current',
-							order: 3,
-							when: CONTEXT_ENABLE_NEW_PROFILES_UI.negate()
-						}
-					]
-				});
-			}
-
-			async run(accessor: ServicesAccessor) {
-				const userDataProfileImportExportService = accessor.get(IUserDataProfileImportExportService);
-				return userDataProfileImportExportService.showProfileContents();
-			}
-		});
-	}
-
 	private registerExportCurrentProfileAction(): IDisposable {
 		const that = this;
 		const disposables = new DisposableStore();
@@ -421,26 +371,13 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 					id,
 					title: localize2('export profile', "Export Profile..."),
 					category: PROFILES_CATEGORY,
-					precondition: IS_PROFILE_EXPORT_IN_PROGRESS_CONTEXT.toNegated(),
-					menu: [
-						{
-							id: ProfilesMenu,
-							group: '4_import_export_profiles',
-							order: 1,
-							when: CONTEXT_ENABLE_NEW_PROFILES_UI.negate(),
-						}, {
-							id: MenuId.CommandPalette
-						}
-					]
+					f1: true,
 				});
 			}
 
-			async run(accessor: ServicesAccessor) {
-				if (that.isNewProfilesUIEnabled()) {
-					return that.openProfilesEditor();
-				} else {
-					return that.userDataProfileImportExportService.exportProfile2();
-				}
+			async run() {
+				const editor = await that.openProfilesEditor();
+				editor?.selectProfile(that.userDataProfileService.currentProfile);
 			}
 		}));
 		disposables.add(MenuRegistry.appendMenuItem(MenuId.MenubarShare, {
@@ -453,108 +390,6 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 		return disposables;
 	}
 
-	private registerImportProfileAction(): IDisposable {
-		const disposables = new DisposableStore();
-		const id = 'workbench.profiles.actions.importProfile';
-		const that = this;
-		disposables.add(registerAction2(class ImportProfileAction extends Action2 {
-			constructor() {
-				super({
-					id,
-					title: localize2('import profile', "Import Profile..."),
-					category: PROFILES_CATEGORY,
-					precondition: IS_PROFILE_IMPORT_IN_PROGRESS_CONTEXT.toNegated(),
-					menu: [
-						{
-							id: ProfilesMenu,
-							group: '4_import_export_profiles',
-							when: ContextKeyExpr.and(PROFILES_ENABLEMENT_CONTEXT, CONTEXT_ENABLE_NEW_PROFILES_UI.negate()),
-							order: 2
-						}, {
-							id: MenuId.CommandPalette,
-							when: PROFILES_ENABLEMENT_CONTEXT,
-						}
-					]
-				});
-			}
-
-			async run(accessor: ServicesAccessor) {
-				const fileDialogService = accessor.get(IFileDialogService);
-				const quickInputService = accessor.get(IQuickInputService);
-				const userDataProfileImportExportService = accessor.get(IUserDataProfileImportExportService);
-				const notificationService = accessor.get(INotificationService);
-
-				const disposables = new DisposableStore();
-				const quickPick = disposables.add(quickInputService.createQuickPick());
-				const profileTemplateQuickPickItems = await that.getProfileTemplatesQuickPickItems();
-
-				const updateQuickPickItems = (value?: string) => {
-					const quickPickItems: (IQuickPickItem | IQuickPickSeparator)[] = [];
-					if (value) {
-						quickPickItems.push({ label: quickPick.value, description: localize('import from url', "Import from URL") });
-					}
-					quickPickItems.push({ label: localize('import from file', "Select File...") });
-					if (profileTemplateQuickPickItems.length) {
-						quickPickItems.push({
-							type: 'separator',
-							label: localize('templates', "Profile Templates")
-						}, ...profileTemplateQuickPickItems);
-					}
-					quickPick.items = quickPickItems;
-				};
-
-				quickPick.title = localize('import profile quick pick title', "Import from Profile Template...");
-				quickPick.placeholder = localize('import profile placeholder', "Provide Profile Template URL");
-				quickPick.ignoreFocusOut = true;
-				disposables.add(quickPick.onDidChangeValue(updateQuickPickItems));
-				updateQuickPickItems();
-				quickPick.matchOnLabel = false;
-				quickPick.matchOnDescription = false;
-				disposables.add(quickPick.onDidAccept(async () => {
-					quickPick.hide();
-					const selectedItem = quickPick.selectedItems[0];
-					if (!selectedItem) {
-						return;
-					}
-					try {
-						if ((<IProfileTemplateQuickPickItem>selectedItem).url) {
-							return await that.userDataProfileImportExportService.createProfile(URI.parse((<IProfileTemplateQuickPickItem>selectedItem).url));
-						}
-						const profile = selectedItem.label === quickPick.value ? URI.parse(quickPick.value) : await this.getProfileUriFromFileSystem(fileDialogService);
-						if (profile) {
-							await userDataProfileImportExportService.importProfile(profile);
-						}
-					} catch (error) {
-						notificationService.error(localize('profile import error', "Error while creating profile: {0}", getErrorMessage(error)));
-					}
-				}));
-				disposables.add(quickPick.onDidHide(() => disposables.dispose()));
-				quickPick.show();
-			}
-
-			private async getProfileUriFromFileSystem(fileDialogService: IFileDialogService): Promise<URI | null> {
-				const profileLocation = await fileDialogService.showOpenDialog({
-					canSelectFolders: false,
-					canSelectFiles: true,
-					canSelectMany: false,
-					filters: PROFILE_FILTER,
-					title: localize('import profile dialog', "Select Profile Template File"),
-				});
-				if (!profileLocation) {
-					return null;
-				}
-				return profileLocation[0];
-			}
-		}));
-		disposables.add(MenuRegistry.appendMenuItem(MenuId.MenubarShare, {
-			command: {
-				id,
-				title: localize2('import profile share', "Import Profile..."),
-				precondition: PROFILES_ENABLEMENT_CONTEXT,
-			},
-		}));
-		return disposables;
-	}
 
 	private registerCreateFromCurrentProfileAction(): void {
 		const that = this;
@@ -569,27 +404,27 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 				});
 			}
 
-			run(accessor: ServicesAccessor) {
-				return that.userDataProfileImportExportService.createProfile(that.userDataProfileService.currentProfile);
+			async run() {
+				const editor = await that.openProfilesEditor();
+				editor?.createNewProfile(that.userDataProfileService.currentProfile);
 			}
 		}));
 	}
 
-	private registerCreateProfileAction(): void {
+	private registerNewProfileAction(): void {
 		const that = this;
 		this._register(registerAction2(class CreateProfileAction extends Action2 {
 			constructor() {
 				super({
 					id: 'workbench.profiles.actions.createProfile',
-					title: localize2('create profile', "Create Profile..."),
+					title: localize2('create profile', "New Profile..."),
 					category: PROFILES_CATEGORY,
 					precondition: PROFILES_ENABLEMENT_CONTEXT,
 					f1: true,
 					menu: [
 						{
-							id: ProfilesMenu,
-							group: '3_manage_profiles',
-							when: ContextKeyExpr.and(PROFILES_ENABLEMENT_CONTEXT, CONTEXT_ENABLE_NEW_PROFILES_UI.negate()),
+							id: OpenProfileMenu,
+							group: '1_manage_profiles',
 							order: 1
 						}
 					]
@@ -597,11 +432,8 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 			}
 
 			async run(accessor: ServicesAccessor) {
-				if (that.isNewProfilesUIEnabled()) {
-					return that.openProfilesEditor();
-				} else {
-					return that.userDataProfileImportExportService.createProfile();
-				}
+				const editor = await that.openProfilesEditor();
+				return editor?.createNewProfile();
 			}
 		}));
 	}
@@ -615,14 +447,6 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 					category: PROFILES_CATEGORY,
 					f1: true,
 					precondition: ContextKeyExpr.and(PROFILES_ENABLEMENT_CONTEXT, HAS_PROFILES_CONTEXT),
-					menu: [
-						{
-							id: ProfilesMenu,
-							group: '3_manage_profiles',
-							when: ContextKeyExpr.and(PROFILES_ENABLEMENT_CONTEXT, CONTEXT_ENABLE_NEW_PROFILES_UI.negate()),
-							order: 2
-						}
-					]
 				});
 			}
 
@@ -670,26 +494,27 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 					}],
 				});
 			}
-			run(accessor: ServicesAccessor): any {
+			run(accessor: ServicesAccessor): unknown {
 				return accessor.get(IOpenerService).open(URI.parse('https://aka.ms/vscode-profiles-help'));
 			}
 		}));
 	}
 
-	private async getProfileTemplatesQuickPickItems(): Promise<IProfileTemplateQuickPickItem[]> {
-		const quickPickItems: IProfileTemplateQuickPickItem[] = [];
-		const profileTemplates = await this.userDataProfileManagementService.getBuiltinProfileTemplates();
-		for (const template of profileTemplates) {
-			quickPickItems.push({
-				label: template.name,
-				...template
-			});
-		}
-		return quickPickItems;
-	}
-
 	private async reportWorkspaceProfileInfo(): Promise<void> {
 		await this.lifecycleService.when(LifecyclePhase.Eventually);
+
+		type UserProfilesCountClassification = {
+			owner: 'sandy081';
+			comment: 'Report the number of user profiles excluding the default profile';
+			count: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The number of user profiles excluding the default profile' };
+		};
+		type UserProfilesCountEvent = {
+			count: number;
+		};
+		if (this.userDataProfilesService.profiles.length > 1) {
+			this.telemetryService.publicLog2<UserProfilesCountEvent, UserProfilesCountClassification>('profiles:count', { count: this.userDataProfilesService.profiles.length - 1 });
+		}
+
 		const workspaceId = await this.workspaceTagsService.getTelemetryWorkspaceId(this.workspaceContextService.getWorkspace(), this.workspaceContextService.getWorkbenchState());
 		type WorkspaceProfileInfoClassification = {
 			owner: 'sandy081';
diff --git a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfileActions.ts b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfileActions.ts
index a9b85a44e65..fe12e56e395 100644
--- a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfileActions.ts
+++ b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfileActions.ts
@@ -3,19 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IAction, Separator } from 'vs/base/common/actions';
-import { Codicon } from 'vs/base/common/codicons';
-import { localize, localize2 } from 'vs/nls';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { Action2, IMenuService, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IQuickInputService, QuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { HAS_PROFILES_CONTEXT, IUserDataProfileManagementService, IUserDataProfileService, MANAGE_PROFILES_ACTION_ID, PROFILES_CATEGORY, PROFILES_ENABLEMENT_CONTEXT, ProfilesMenu } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
+import { localize2 } from '../../../../nls.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { IUserDataProfileManagementService, PROFILES_CATEGORY, PROFILES_ENABLEMENT_CONTEXT } from '../../../services/userDataProfile/common/userDataProfile.js';
 
 class CreateTransientProfileAction extends Action2 {
 	static readonly ID = 'workbench.profiles.actions.createTemporaryProfile';
@@ -37,112 +30,6 @@ class CreateTransientProfileAction extends Action2 {
 
 registerAction2(CreateTransientProfileAction);
 
-export class RenameProfileAction extends Action2 {
-	static readonly ID = 'workbench.profiles.actions.renameProfile';
-	constructor() {
-		super({
-			id: RenameProfileAction.ID,
-			title: localize2('rename profile', "Rename..."),
-			category: PROFILES_CATEGORY,
-			f1: true,
-			precondition: ContextKeyExpr.and(PROFILES_ENABLEMENT_CONTEXT, HAS_PROFILES_CONTEXT),
-		});
-	}
-
-	async run(accessor: ServicesAccessor, profile?: IUserDataProfile) {
-		const quickInputService = accessor.get(IQuickInputService);
-		const userDataProfileService = accessor.get(IUserDataProfileService);
-		const userDataProfilesService = accessor.get(IUserDataProfilesService);
-		const userDataProfileManagementService = accessor.get(IUserDataProfileManagementService);
-		const notificationService = accessor.get(INotificationService);
-
-		if (!profile) {
-			profile = await this.pickProfile(quickInputService, userDataProfileService, userDataProfilesService);
-		}
-
-		if (!profile || profile.isDefault) {
-			return;
-		}
-
-		const name = await quickInputService.input({
-			value: profile.name,
-			title: localize('select profile to rename', 'Rename {0}', profile.name),
-			validateInput: async (value: string) => {
-				if (profile.name !== value && userDataProfilesService.profiles.some(p => p.name === value)) {
-					return localize('profileExists', "Profile with name {0} already exists.", value);
-				}
-				return undefined;
-			}
-		});
-		if (name && name !== profile.name) {
-			try {
-				await userDataProfileManagementService.updateProfile(profile, { name });
-			} catch (error) {
-				notificationService.error(error);
-			}
-		}
-	}
-
-	private async pickProfile(quickInputService: IQuickInputService, userDataProfileService: IUserDataProfileService, userDataProfilesService: IUserDataProfilesService): Promise<IUserDataProfile | undefined> {
-		const profiles = userDataProfilesService.profiles.filter(p => !p.isDefault && !p.isTransient);
-		if (!profiles.length) {
-			return undefined;
-		}
-		const pick = await quickInputService.pick(
-			profiles.map(profile => ({
-				label: profile.name,
-				description: profile.id === userDataProfileService.currentProfile.id ? localize('current', "Current") : undefined,
-				profile
-			})),
-			{
-				title: localize('rename specific profile', "Rename Profile..."),
-				placeHolder: localize('pick profile to rename', "Select Profile to Rename"),
-			});
-		return pick?.profile;
-	}
-}
-
-registerAction2(RenameProfileAction);
-
-registerAction2(class ManageProfilesAction extends Action2 {
-	constructor() {
-		super({
-			id: MANAGE_PROFILES_ACTION_ID,
-			title: localize2('mange', "Manage..."),
-			category: PROFILES_CATEGORY,
-			precondition: ContextKeyExpr.and(PROFILES_ENABLEMENT_CONTEXT, HAS_PROFILES_CONTEXT),
-		});
-	}
-
-	async run(accessor: ServicesAccessor) {
-		const quickInputService = accessor.get(IQuickInputService);
-		const menuService = accessor.get(IMenuService);
-		const contextKeyService = accessor.get(IContextKeyService);
-		const commandService = accessor.get(ICommandService);
-
-		const menu = menuService.createMenu(ProfilesMenu, contextKeyService);
-		const actions: IAction[] = [];
-		createAndFillInActionBarActions(menu, undefined, actions);
-		menu.dispose();
-
-		if (actions.length) {
-			const picks: QuickPickItem[] = actions.map(action => {
-				if (action instanceof Separator) {
-					return { type: 'separator' };
-				}
-				return {
-					id: action.id,
-					label: `${action.label}${action.checked ? ` $(${Codicon.check.id})` : ''}`,
-				};
-			});
-			const pick = await quickInputService.pick(picks, { canPickMany: false, title: PROFILES_CATEGORY.value });
-			if (pick?.id) {
-				await commandService.executeCommand(pick.id);
-			}
-		}
-	}
-});
-
 // Developer Actions
 
 registerAction2(class CleanupProfilesAction extends Action2 {
diff --git a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilePreview.ts b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilePreview.ts
deleted file mode 100644
index 4dd3d92a761..00000000000
--- a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilePreview.ts
+++ /dev/null
@@ -1,28 +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 { getErrorMessage } from 'vs/base/common/errors';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { IUserDataProfileImportExportService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-
-export class UserDataProfilePreviewContribution extends Disposable implements IWorkbenchContribution {
-
-	constructor(
-		@IBrowserWorkbenchEnvironmentService environmentService: IBrowserWorkbenchEnvironmentService,
-		@IUserDataProfileImportExportService userDataProfileImportExportService: IUserDataProfileImportExportService,
-		@ILogService logService: ILogService
-	) {
-		super();
-		if (environmentService.options?.profileToPreview) {
-			userDataProfileImportExportService.importProfile(URI.revive(environmentService.options.profileToPreview), { mode: 'both' })
-				.then(null, error => logService.error('Error while previewing the profile', getErrorMessage(error)));
-		}
-	}
-
-}
diff --git a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditor.ts b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditor.ts
index 5a1b25de0b1..de0f188a4d7 100644
--- a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditor.ts
+++ b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditor.ts
@@ -3,60 +3,96 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/userDataProfilesEditor';
-import { $, addDisposableListener, append, Dimension, EventHelper, EventType, IDomPosition, trackFocus } from 'vs/base/browser/dom';
-import { Action, IAction, Separator, SubmenuAction } from 'vs/base/common/actions';
-import { Event } from 'vs/base/common/event';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { localize } from 'vs/nls';
-import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IUserDataProfile, IUserDataProfilesService, ProfileResourceType } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
-import { IEditorOpenContext, IEditorSerializer, IUntypedEditorInput } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { IUserDataProfilesEditor } from 'vs/workbench/contrib/userDataProfile/common/userDataProfile';
-import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { defaultUserDataProfileIcon, IProfileTemplateInfo, IUserDataProfileManagementService, PROFILE_FILTER } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { Orientation, Sizing, SplitView } from 'vs/base/browser/ui/splitview/splitview';
-import { Button, ButtonWithDropdown } from 'vs/base/browser/ui/button/button';
-import { defaultButtonStyles, defaultCheckboxStyles, defaultInputBoxStyles, defaultSelectBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { registerColor } from 'vs/platform/theme/common/colorRegistry';
-import { PANEL_BORDER } from 'vs/workbench/common/theme';
-import { WorkbenchAsyncDataTree, WorkbenchList } from 'vs/platform/list/browser/listService';
-import { IListRenderer, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { IAsyncDataSource, ITreeNode, ITreeRenderer } from 'vs/base/browser/ui/tree/tree';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IEditorOptions } from 'vs/platform/editor/common/editor';
-import { Disposable, DisposableStore, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { InputBox, MessageType } from 'vs/base/browser/ui/inputbox/inputBox';
-import { Checkbox } from 'vs/base/browser/ui/toggle/toggle';
-import { DEFAULT_ICON, ICONS } from 'vs/workbench/services/userDataProfile/common/userDataProfileIcons';
-import { WorkbenchIconSelectBox } from 'vs/workbench/services/userDataProfile/browser/iconSelectBox';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { IHoverService, WorkbenchHoverDelegate } from 'vs/platform/hover/browser/hover';
-import { HoverPosition } from 'vs/base/browser/ui/hover/hoverWidget';
-import { IHoverWidget } from 'vs/base/browser/ui/hover/hover';
-import { ISelectOptionItem, SelectBox } from 'vs/base/browser/ui/selectBox/selectBox';
-import { URI } from 'vs/base/common/uri';
-import { IEditorProgressService } from 'vs/platform/progress/common/progress';
-import { isUndefined } from 'vs/base/common/types';
-import { basename } from 'vs/base/common/resources';
-import { RenderIndentGuides } from 'vs/base/browser/ui/tree/abstractTree';
-import { DEFAULT_LABELS_CONTAINER, IResourceLabel, ResourceLabels } from 'vs/workbench/browser/labels';
-import { IHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate';
-import { IDialogService, IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { AbstractUserDataProfileElement, isProfileResourceChildElement, isProfileResourceTypeElement, IProfileChildElement, IProfileResourceTypeChildElement, IProfileResourceTypeElement, NewProfileElement, UserDataProfileElement, UserDataProfilesEditorModel } from 'vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditorModel';
-import { Codicon } from 'vs/base/common/codicons';
-import { WorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
-import { createInstantHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
+import './media/userDataProfilesEditor.css';
+import { $, addDisposableListener, append, clearNode, Dimension, EventHelper, EventType, IDomPosition, trackFocus } from '../../../../base/browser/dom.js';
+import { Action, IAction, IActionChangeEvent, Separator, SubmenuAction } from '../../../../base/common/actions.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { localize } from '../../../../nls.js';
+import { IContextMenuService, IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IUserDataProfile, IUserDataProfilesService, ProfileResourceType } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { EditorPane } from '../../../browser/parts/editor/editorPane.js';
+import { IEditorOpenContext, IEditorSerializer, IUntypedEditorInput } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { IUserDataProfilesEditor } from '../common/userDataProfile.js';
+import { IEditorGroup } from '../../../services/editor/common/editorGroupsService.js';
+import { defaultUserDataProfileIcon, IProfileTemplateInfo, IUserDataProfileService, PROFILE_FILTER } from '../../../services/userDataProfile/common/userDataProfile.js';
+import { Orientation, Sizing, SplitView } from '../../../../base/browser/ui/splitview/splitview.js';
+import { Button, ButtonBar, ButtonWithDropdown } from '../../../../base/browser/ui/button/button.js';
+import { defaultButtonStyles, defaultCheckboxStyles, defaultInputBoxStyles, defaultSelectBoxStyles, getInputBoxStyle, getListStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { editorBackground, foreground, registerColor } from '../../../../platform/theme/common/colorRegistry.js';
+import { PANEL_BORDER } from '../../../common/theme.js';
+import { WorkbenchAsyncDataTree, WorkbenchList, WorkbenchTable } from '../../../../platform/list/browser/listService.js';
+import { CachedListVirtualDelegate, IListRenderer, IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
+import { IAsyncDataSource, ITreeNode, ITreeRenderer } from '../../../../base/browser/ui/tree/tree.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { Disposable, DisposableStore, IDisposable, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { InputBox, MessageType } from '../../../../base/browser/ui/inputbox/inputBox.js';
+import { Checkbox } from '../../../../base/browser/ui/toggle/toggle.js';
+import { DEFAULT_ICON, ICONS } from '../../../services/userDataProfile/common/userDataProfileIcons.js';
+import { WorkbenchIconSelectBox } from '../../../services/userDataProfile/browser/iconSelectBox.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { IHoverService, WorkbenchHoverDelegate } from '../../../../platform/hover/browser/hover.js';
+import { HoverPosition } from '../../../../base/browser/ui/hover/hoverWidget.js';
+import { IHoverWidget, IManagedHover } from '../../../../base/browser/ui/hover/hover.js';
+import { ISelectOptionItem, SelectBox } from '../../../../base/browser/ui/selectBox/selectBox.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IEditorProgressService } from '../../../../platform/progress/common/progress.js';
+import { isString, isUndefined } from '../../../../base/common/types.js';
+import { basename } from '../../../../base/common/resources.js';
+import { RenderIndentGuides } from '../../../../base/browser/ui/tree/abstractTree.js';
+import { DEFAULT_LABELS_CONTAINER, IResourceLabel, ResourceLabels } from '../../../browser/labels.js';
+import { IHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegate.js';
+import { IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IQuickInputService, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
+import { AbstractUserDataProfileElement, isProfileResourceChildElement, isProfileResourceTypeElement, IProfileChildElement, IProfileResourceTypeChildElement, IProfileResourceTypeElement, NewProfileElement, UserDataProfileElement, UserDataProfilesEditorModel } from './userDataProfilesEditorModel.js';
+import { WorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
+import { createInstantHoverDelegate, getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Radio } from '../../../../base/browser/ui/radio/radio.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { settingsTextInputBorder } from '../../preferences/common/settingsEditorColorRegistry.js';
+import { renderMarkdown } from '../../../../base/browser/markdownRenderer.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { ITableRenderer, ITableVirtualDelegate } from '../../../../base/browser/ui/table/table.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { posix, win32 } from '../../../../base/common/path.js';
+import { hasDriveLetter } from '../../../../base/common/extpath.js';
+import { normalizeDriveLetter } from '../../../../base/common/labels.js';
+import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { DropdownMenuActionViewItem } from '../../../../base/browser/ui/dropdown/dropdownActionViewItem.js';
 
-export const profilesSashBorder = registerColor('profiles.sashBorder', { dark: PANEL_BORDER, light: PANEL_BORDER, hcDark: PANEL_BORDER, hcLight: PANEL_BORDER }, localize('profilesSashBorder', "The color of the Profiles editor splitview sash border."));
+const editIcon = registerIcon('profiles-editor-edit-folder', Codicon.edit, localize('editIcon', 'Icon for the edit folder icon in the profiles editor.'));
+
+export const profilesSashBorder = registerColor('profiles.sashBorder', PANEL_BORDER, localize('profilesSashBorder', "The color of the Profiles editor splitview sash border."));
+
+const listStyles = getListStyles({
+	listActiveSelectionBackground: editorBackground,
+	listActiveSelectionForeground: foreground,
+	listFocusAndSelectionBackground: editorBackground,
+	listFocusAndSelectionForeground: foreground,
+	listFocusBackground: editorBackground,
+	listFocusForeground: foreground,
+	listHoverForeground: foreground,
+	listHoverBackground: editorBackground,
+	listHoverOutline: editorBackground,
+	listFocusOutline: editorBackground,
+	listInactiveSelectionBackground: editorBackground,
+	listInactiveSelectionForeground: foreground,
+	listInactiveFocusBackground: editorBackground,
+	listInactiveFocusOutline: editorBackground,
+	treeIndentGuidesStroke: undefined,
+	treeInactiveIndentGuidesStroke: undefined,
+	tableOddRowsBackgroundColor: editorBackground,
+});
 
 export class UserDataProfilesEditor extends EditorPane implements IUserDataProfilesEditor {
 
@@ -68,16 +104,14 @@ export class UserDataProfilesEditor extends EditorPane implements IUserDataProfi
 	private profileWidget: ProfileWidget | undefined;
 
 	private model: UserDataProfilesEditorModel | undefined;
-	private templates: IProfileTemplateInfo[] = [];
+	private templates: readonly IProfileTemplateInfo[] = [];
 
 	constructor(
 		group: IEditorGroup,
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IThemeService themeService: IThemeService,
 		@IStorageService storageService: IStorageService,
-		@IUserDataProfileManagementService private readonly userDataProfileManagementService: IUserDataProfileManagementService,
 		@IQuickInputService private readonly quickInputService: IQuickInputService,
-		@IDialogService private readonly dialogService: IDialogService,
 		@IFileDialogService private readonly fileDialogService: IFileDialogService,
 		@IContextMenuService private readonly contextMenuService: IContextMenuService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
@@ -137,11 +171,7 @@ export class UserDataProfilesEditor extends EditorPane implements IUserDataProfi
 		}, Sizing.Distribute, undefined, true);
 
 		this.registerListeners();
-
-		this.userDataProfileManagementService.getBuiltinProfileTemplates().then(templates => {
-			this.templates = templates;
-			this.profileWidget!.templates = templates;
-		});
+		this.updateStyles();
 	}
 
 	override updateStyles(): void {
@@ -180,7 +210,8 @@ export class UserDataProfilesEditor extends EditorPane implements IUserDataProfi
 						}
 						return e.name;
 					}
-				}
+				},
+				alwaysConsumeMouseWheel: false,
 			}));
 	}
 
@@ -207,9 +238,13 @@ export class UserDataProfilesEditor extends EditorPane implements IUserDataProfi
 	}
 
 	private getCreateFromTemplateActions(): IAction[] {
-		return this.templates.map(template => new Action(`template:${template.url}`, template.name, undefined, true, async () => {
-			this.createNewProfile(URI.parse(template.url));
-		}));
+		return this.templates.map(template =>
+			new Action(
+				`template:${template.url}`,
+				template.name,
+				undefined,
+				true,
+				() => this.createNewProfile(URI.parse(template.url))));
 	}
 
 	private registerListeners(): void {
@@ -291,20 +326,15 @@ export class UserDataProfilesEditor extends EditorPane implements IUserDataProfi
 		quickPick.show();
 	}
 
-	private async createNewProfile(copyFrom?: URI | IUserDataProfile): Promise<void> {
-		if (this.model?.profiles.some(p => p instanceof NewProfileElement)) {
-			const result = await this.dialogService.confirm({
-				type: 'info',
-				message: localize('new profile exists', "A new profile is already being created. Do you want to discard it and create a new one?"),
-				primaryButton: localize('discard', "Discard & Create"),
-				cancelButton: localize('cancel', "Cancel")
-			});
-			if (!result.confirmed) {
-				return;
-			}
-			this.model.revert();
+	async createNewProfile(copyFrom?: URI | IUserDataProfile): Promise<void> {
+		await this.model?.createNewProfile(copyFrom);
+	}
+
+	selectProfile(profile: IUserDataProfile): void {
+		const index = this.model?.profiles.findIndex(p => p instanceof UserDataProfileElement && p.profile.id === profile.id);
+		if (index !== undefined && index >= 0) {
+			this.profilesList?.setSelection([index]);
 		}
-		this.model?.createNewProfile(copyFrom);
 	}
 
 	private async getProfileUriFromFileSystem(): Promise<URI | null> {
@@ -324,10 +354,15 @@ export class UserDataProfilesEditor extends EditorPane implements IUserDataProfi
 	override async setInput(input: UserDataProfilesEditorInput, options: IEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void> {
 		await super.setInput(input, options, context, token);
 		this.model = await input.resolve();
+		this.model.getTemplates().then(templates => {
+			this.templates = templates;
+			if (this.profileWidget) {
+				this.profileWidget.templates = templates;
+			}
+		});
 		this.updateProfilesList();
-		this._register(this.model.onDidChange((element) => {
-			this.updateProfilesList(element);
-		}));
+		this._register(this.model.onDidChange(element =>
+			this.updateProfilesList(element)));
 	}
 
 	override focus(): void {
@@ -365,6 +400,7 @@ export class UserDataProfilesEditor extends EditorPane implements IUserDataProfi
 interface IProfileElementTemplateData {
 	readonly icon: HTMLElement;
 	readonly label: HTMLElement;
+	readonly dirty: HTMLElement;
 	readonly description: HTMLElement;
 	readonly actionBar: WorkbenchToolBar;
 	readonly disposables: DisposableStore;
@@ -394,9 +430,9 @@ class ProfileElementRenderer implements IListRenderer<AbstractUserDataProfileEle
 		container.classList.add('profile-list-item');
 		const icon = append(container, $('.profile-list-item-icon'));
 		const label = append(container, $('.profile-list-item-label'));
+		const dirty = append(container, $(`span${ThemeIcon.asCSSSelector(Codicon.circleFilled)}`));
 		const description = append(container, $('.profile-list-item-description'));
-		append(description, $(`span${ThemeIcon.asCSSSelector(Codicon.check)}`));
-		append(description, $('span', undefined, localize('activeProfile', "In use")));
+		append(description, $(`span${ThemeIcon.asCSSSelector(Codicon.check)}`), $('span', undefined, localize('activeProfile', "Active")));
 
 		const actionsContainer = append(container, $('.profile-tree-item-actions-container'));
 		const actionBar = disposables.add(this.instantiationService.createInstance(WorkbenchToolBar,
@@ -407,7 +443,7 @@ class ProfileElementRenderer implements IListRenderer<AbstractUserDataProfileEle
 			}
 		));
 
-		return { label, icon, description, actionBar, disposables, elementDisposables };
+		return { label, icon, dirty, description, actionBar, disposables, elementDisposables };
 	}
 
 	renderElement(element: AbstractUserDataProfileElement, index: number, templateData: IProfileElementTemplateData, height: number | undefined) {
@@ -415,25 +451,37 @@ class ProfileElementRenderer implements IListRenderer<AbstractUserDataProfileEle
 		templateData.label.textContent = element.name;
 		templateData.label.classList.toggle('new-profile', element instanceof NewProfileElement);
 		templateData.icon.className = ThemeIcon.asClassName(element.icon ? ThemeIcon.fromId(element.icon) : DEFAULT_ICON);
+		templateData.dirty.classList.toggle('hide', !(element instanceof NewProfileElement));
 		templateData.description.classList.toggle('hide', !element.active);
-		if (element.onDidChange) {
-			templateData.elementDisposables.add(element.onDidChange(e => {
-				if (e.name) {
-					templateData.label.textContent = element.name;
+		templateData.elementDisposables.add(element.onDidChange(e => {
+			if (e.name) {
+				templateData.label.textContent = element.name;
+			}
+			if (e.icon) {
+				if (element.icon) {
+					templateData.icon.className = ThemeIcon.asClassName(ThemeIcon.fromId(element.icon));
+				} else {
+					templateData.icon.className = 'hide';
 				}
-				if (e.icon) {
-					if (element.icon) {
-						templateData.icon.className = ThemeIcon.asClassName(ThemeIcon.fromId(element.icon));
-					} else {
-						templateData.icon.className = 'hide';
-					}
-				}
-				if (e.active) {
-					templateData.description.classList.toggle('hide', !element.active);
-				}
-			}));
+			}
+			if (e.active) {
+				templateData.description.classList.toggle('hide', !element.active);
+			}
+		}));
+		const setActions = () => templateData.actionBar.setActions(element.actions[0].filter(a => a.enabled), element.actions[1].filter(a => a.enabled));
+		setActions();
+		const events: Event<IActionChangeEvent>[] = [];
+		for (const action of element.actions.flat()) {
+			if (action instanceof Action) {
+				events.push(action.onDidChange);
+			}
 		}
-		templateData.actionBar.setActions(element.actions[0] ?? []);
+		templateData.elementDisposables.add(Event.any(...events)(e => {
+			if (e.enabled !== undefined) {
+				setActions();
+			}
+		}));
+
 	}
 
 	disposeElement(element: AbstractUserDataProfileElement, index: number, templateData: IProfileElementTemplateData, height: number | undefined): void {
@@ -449,33 +497,22 @@ class ProfileElementRenderer implements IListRenderer<AbstractUserDataProfileEle
 class ProfileWidget extends Disposable {
 
 	private readonly profileTitle: HTMLElement;
-	private readonly toolbar: WorkbenchToolBar;
+	private readonly profileTreeContainer: HTMLElement;
 	private readonly buttonContainer: HTMLElement;
-	private readonly iconElement: HTMLElement;
-	private readonly useAsDefaultProfileContainer: HTMLElement;
-	private readonly useAsDefaultProfileCheckbox: Checkbox;
-	private readonly nameInput: InputBox;
-	private readonly copyFromContainer: HTMLElement;
-	private readonly copyFromSelectBox: SelectBox;
-	private copyFromOptions: (ISelectOptionItem & { id?: string; source?: IUserDataProfile | URI })[] = [];
-
-	private readonly contentsTreeHeader: HTMLElement;
-	private readonly inheritLabelElement: HTMLElement;
-	private readonly resourcesTree: WorkbenchAsyncDataTree<AbstractUserDataProfileElement, ProfileResourceTreeElement>;
-
-	private _templates: IProfileTemplateInfo[] = [];
-	public set templates(templates: IProfileTemplateInfo[]) {
-		this._templates = templates;
-		this.renderSelectBox();
-	}
 
+	private readonly profileTree: WorkbenchAsyncDataTree<AbstractUserDataProfileElement, ProfileTreeElement>;
+	private readonly copyFromProfileRenderer: CopyFromProfileRenderer;
 	private readonly _profileElement = this._register(new MutableDisposable<{ element: AbstractUserDataProfileElement } & IDisposable>());
 
+	private readonly layoutParticipants: { layout: () => void }[] = [];
+
+	public set templates(templates: readonly IProfileTemplateInfo[]) {
+		this.copyFromProfileRenderer.setTemplates(templates);
+		this.profileTree.rerender();
+	}
+
 	constructor(
 		parent: HTMLElement,
-		@IHoverService private readonly hoverService: IHoverService,
-		@IUserDataProfilesService private readonly userDataProfilesService: IUserDataProfilesService,
-		@IContextViewService private readonly contextViewService: IContextViewService,
 		@IEditorProgressService private readonly editorProgressService: IEditorProgressService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 	) {
@@ -483,126 +520,36 @@ class ProfileWidget extends Disposable {
 
 		const header = append(parent, $('.profile-header'));
 		const title = append(header, $('.profile-title-container'));
-		this.iconElement = append(title, $(`${ThemeIcon.asCSSSelector(DEFAULT_ICON)}`, { 'tabindex': '0', 'role': 'button', 'aria-label': localize('icon', "Profile Icon") }));
-		this.renderIconSelectBox(this.iconElement);
 		this.profileTitle = append(title, $(''));
 
-		this.nameInput = this._register(new InputBox(
-			title,
-			undefined,
-			{
-				inputBoxStyles: defaultInputBoxStyles,
-				ariaLabel: localize('profileName', "Profile Name"),
-				placeholder: localize('profileName', "Profile Name"),
-				validationOptions: {
-					validation: (value) => {
-						if (!value) {
-							return {
-								content: localize('name required', "Profile name is required and must be a non-empty value."),
-								type: MessageType.ERROR
-							};
-						}
-						if (this._profileElement.value?.element.disabled) {
-							return null;
-						}
-						const initialName = this._profileElement.value?.element.getInitialName();
-						value = value.trim();
-						if (initialName !== value && this.userDataProfilesService.profiles.some(p => p.name === value)) {
-							return {
-								content: localize('profileExists', "Profile with name {0} already exists.", value),
-								type: MessageType.ERROR
-							};
-						}
-						return null;
-					}
-				}
-			}
-		));
-		this.nameInput.onDidChange(value => {
-			if (this._profileElement.value && value) {
-				this._profileElement.value.element.name = value;
-			}
-		});
-		const focusTracker = this._register(trackFocus(this.nameInput.inputElement));
-		this._register(focusTracker.onDidBlur(() => {
-			if (this._profileElement.value && !this.nameInput.value) {
-				this.nameInput.value = this._profileElement.value.element.name;
-			}
-		}));
-
-		const actionsContainer = append(header, $('.profile-actions-container'));
-		this.buttonContainer = append(actionsContainer, $('.profile-button-container'));
-		this.toolbar = this._register(instantiationService.createInstance(WorkbenchToolBar,
-			actionsContainer,
-			{
-				hoverDelegate: this._register(createInstantHoverDelegate()),
-				highlightToggledItems: true
-			}
-		));
-
 		const body = append(parent, $('.profile-body'));
 
-		this.copyFromContainer = append(body, $('.profile-copy-from-container'));
-		append(this.copyFromContainer, $('.profile-copy-from-label', undefined, localize('create from', "Copy from")));
-		this.copyFromSelectBox = this._register(this.instantiationService.createInstance(SelectBox,
-			[],
-			0,
-			this.contextViewService,
-			defaultSelectBoxStyles,
-			{
-				useCustomDrawn: true,
-				ariaLabel: localize('copy profile from', "Copy profile from"),
-			}
-		));
-		this.copyFromSelectBox.render(append(this.copyFromContainer, $('.profile-select-container')));
-
-		this.useAsDefaultProfileContainer = append(body, $('.profile-use-as-default-container'));
-		const useAsDefaultProfileTitle = localize('enable for new windows', "Use this profile for new windows");
-		this.useAsDefaultProfileCheckbox = this._register(new Checkbox(useAsDefaultProfileTitle, false, defaultCheckboxStyles));
-		append(this.useAsDefaultProfileContainer, this.useAsDefaultProfileCheckbox.domNode);
-		const useAsDefaultProfileLabel = append(this.useAsDefaultProfileContainer, $('.profile-use-as-default-label', undefined, useAsDefaultProfileTitle));
-		this._register(this.useAsDefaultProfileCheckbox.onChange(() => {
-			if (this._profileElement.value?.element instanceof UserDataProfileElement) {
-				this._profileElement.value.element.toggleNewWindowProfile();
-			}
-		}));
-		this._register(addDisposableListener(useAsDefaultProfileLabel, EventType.CLICK, () => {
-			if (this._profileElement.value?.element instanceof UserDataProfileElement) {
-				this._profileElement.value.element.toggleNewWindowProfile();
-			}
-		}));
-
-		this.contentsTreeHeader = append(body, $('.profile-content-tree-header'));
-		this.inheritLabelElement = $('.inherit-label', undefined, localize('default profile', "Use Default Profile"));
-		append(this.contentsTreeHeader,
-			$(''),
-			$(''),
-			this.inheritLabelElement,
-			$('.actions-label', undefined, localize('actions', "Actions")),
-		);
-		const delegate = new ProfileResourceTreeElementDelegate();
-		this.resourcesTree = this._register(this.instantiationService.createInstance(WorkbenchAsyncDataTree<AbstractUserDataProfileElement, ProfileResourceTreeElement>,
-			'ProfileEditor-ResourcesTree',
-			append(body, $('.profile-content-tree.file-icon-themable-tree.show-file-icons')),
+		const delegate = new ProfileTreeDelegate();
+		const contentsRenderer = this._register(this.instantiationService.createInstance(ContentsProfileRenderer));
+		const associationsRenderer = this._register(this.instantiationService.createInstance(ProfileWorkspacesRenderer));
+		this.layoutParticipants.push(associationsRenderer);
+		this.copyFromProfileRenderer = this._register(this.instantiationService.createInstance(CopyFromProfileRenderer));
+		this.profileTreeContainer = append(body, $('.profile-tree'));
+		this.profileTree = this._register(this.instantiationService.createInstance(WorkbenchAsyncDataTree<AbstractUserDataProfileElement, ProfileTreeElement>,
+			'ProfileEditor-Tree',
+			this.profileTreeContainer,
 			delegate,
 			[
-				this.instantiationService.createInstance(ExistingProfileResourceTreeRenderer),
-				this.instantiationService.createInstance(NewProfileResourceTreeRenderer),
-				this.instantiationService.createInstance(ProfileResourceChildTreeItemRenderer),
+				this._register(this.instantiationService.createInstance(ProfileNameRenderer)),
+				this._register(this.instantiationService.createInstance(ProfileIconRenderer)),
+				this._register(this.instantiationService.createInstance(UseForCurrentWindowPropertyRenderer)),
+				this._register(this.instantiationService.createInstance(UseAsDefaultProfileRenderer)),
+				this.copyFromProfileRenderer,
+				contentsRenderer,
+				associationsRenderer,
 			],
-			this.instantiationService.createInstance(ProfileResourceTreeDataSource),
+			this.instantiationService.createInstance(ProfileTreeDataSource),
 			{
 				multipleSelectionSupport: false,
 				horizontalScrolling: false,
 				accessibilityProvider: {
-					getAriaLabel(element: ProfileResourceTreeElement | null): string {
-						if ((<IProfileResourceTypeElement>element?.element).resourceType) {
-							return (<IProfileResourceTypeElement>element?.element).resourceType;
-						}
-						if ((<IProfileResourceTypeChildElement>element?.element).label) {
-							return (<IProfileResourceTypeChildElement>element?.element).label;
-						}
-						return '';
+					getAriaLabel(element: ProfileTreeElement | null): string {
+						return element?.element ?? '';
 					},
 					getWidgetAriaLabel(): string {
 						return '';
@@ -610,120 +557,73 @@ class ProfileWidget extends Disposable {
 				},
 				identityProvider: {
 					getId(element) {
-						if (element?.element.handle) {
-							return element.element.handle;
-						}
-						return '';
+						return element.element;
 					}
 				},
 				expandOnlyOnTwistieClick: true,
 				renderIndentGuides: RenderIndentGuides.None,
 				enableStickyScroll: false,
 				openOnSingleClick: false,
+				setRowLineHeight: false,
+				supportDynamicHeights: true,
+				alwaysConsumeMouseWheel: false,
 			}));
-		this._register(this.resourcesTree.onDidOpen(async (e) => {
-			if (!e.browserEvent) {
-				return;
-			}
-			if (e.browserEvent.target && (e.browserEvent.target as HTMLElement).classList.contains(Checkbox.CLASS_NAME)) {
-				return;
-			}
-			if (e.element?.element.action) {
-				await e.element.element.action.run();
-			}
-		}));
-	}
-
-	private renderIconSelectBox(iconContainer: HTMLElement): void {
-		const iconSelectBox = this._register(this.instantiationService.createInstance(WorkbenchIconSelectBox, { icons: ICONS, inputBoxStyles: defaultInputBoxStyles }));
-		let hoverWidget: IHoverWidget | undefined;
-		const showIconSelectBox = () => {
-			if (this._profileElement.value?.element instanceof UserDataProfileElement && this._profileElement.value.element.profile.isDefault) {
-				return;
-			}
-			if (this._profileElement.value?.element.disabled) {
-				return;
-			}
-			iconSelectBox.clearInput();
-			hoverWidget = this.hoverService.showHover({
-				content: iconSelectBox.domNode,
-				target: iconContainer,
-				position: {
-					hoverPosition: HoverPosition.BELOW,
-				},
-				persistence: {
-					sticky: true,
-				},
-				appearance: {
-					showPointer: true,
-				},
-			}, true);
-
-			if (hoverWidget) {
-				iconSelectBox.layout(new Dimension(486, 260));
-				iconSelectBox.focus();
-			}
-		};
-		this._register(addDisposableListener(iconContainer, EventType.CLICK, (e: MouseEvent) => {
-			EventHelper.stop(e, true);
-			showIconSelectBox();
-		}));
-		this._register(addDisposableListener(iconContainer, EventType.KEY_DOWN, e => {
-			const event = new StandardKeyboardEvent(e);
-			if (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) {
-				EventHelper.stop(event, true);
-				showIconSelectBox();
-			}
-		}));
-		this._register(addDisposableListener(iconSelectBox.domNode, EventType.KEY_DOWN, e => {
-			const event = new StandardKeyboardEvent(e);
-			if (event.equals(KeyCode.Escape)) {
-				EventHelper.stop(event, true);
-				hoverWidget?.dispose();
-				iconContainer.focus();
-			}
-		}));
-		this._register(iconSelectBox.onDidSelect(selectedIcon => {
-			hoverWidget?.dispose();
-			iconContainer.focus();
-			if (this._profileElement.value) {
-				this._profileElement.value.element.icon = selectedIcon.id;
-			}
-		}));
-	}
-
-	private renderSelectBox(): void {
-		this.copyFromSelectBox.setOptions(this.getCopyFromOptions());
-		this._register(this.copyFromSelectBox.onDidSelect(option => {
-			if (this._profileElement.value?.element instanceof NewProfileElement) {
-				this._profileElement.value.element.copyFrom = this.copyFromOptions[option.index].source;
+
+		this.profileTree.style(listStyles);
+
+		this._register(contentsRenderer.onDidChangeContentHeight((e) => this.profileTree.updateElementHeight(e, undefined)));
+		this._register(associationsRenderer.onDidChangeContentHeight((e) => this.profileTree.updateElementHeight(e, undefined)));
+		this._register(contentsRenderer.onDidChangeSelection((e) => {
+			if (e.selected) {
+				this.profileTree.setFocus([]);
+				this.profileTree.setSelection([]);
 			}
 		}));
+
+		this._register(this.profileTree.onDidChangeContentHeight((e) => {
+			if (this.dimension) {
+				this.layout(this.dimension);
+			}
+		}));
+
+		this._register(this.profileTree.onDidChangeSelection((e) => {
+			if (e.elements.length) {
+				contentsRenderer.clearSelection();
+			}
+		}));
+
+		this.buttonContainer = append(body, $('.profile-row-container.profile-button-container'));
 	}
 
+	private dimension: Dimension | undefined;
 	layout(dimension: Dimension): void {
-		this.resourcesTree.layout(dimension.height - 34 - 20 - 25 - 20, dimension.width);
+		this.dimension = dimension;
+		const treeContentHeight = this.profileTree.contentHeight;
+		const height = Math.min(treeContentHeight, dimension.height - (this._profileElement.value?.element instanceof NewProfileElement ? 116 : 54));
+		this.profileTreeContainer.style.height = `${height}px`;
+		this.profileTree.layout(height, dimension.width);
+		for (const participant of this.layoutParticipants) {
+			participant.layout();
+		}
 	}
 
 	render(profileElement: AbstractUserDataProfileElement): void {
+		if (this._profileElement.value?.element === profileElement) {
+			return;
+		}
+
+		if (this._profileElement.value?.element instanceof UserDataProfileElement) {
+			this._profileElement.value.element.reset();
+		}
+		this.profileTree.setInput(profileElement);
+
 		const disposables = new DisposableStore();
 		this._profileElement.value = { element: profileElement, dispose: () => disposables.dispose() };
 
-		this.renderProfileElement(profileElement);
-		disposables.add(profileElement.onDidChange(e => this.renderProfileElement(profileElement)));
-
-		const profile = profileElement instanceof UserDataProfileElement ? profileElement.profile : undefined;
-		this.profileTitle.classList.toggle('hide', !profile?.isDefault);
-		this.nameInput.element.classList.toggle('hide', !!profile?.isDefault);
-
-		this.resourcesTree.setInput(profileElement);
+		this.profileTitle.textContent = profileElement.name;
 		disposables.add(profileElement.onDidChange(e => {
-			if (e.flags || e.copyFrom || e.copyFlags || e.disabled) {
-				const viewState = this.resourcesTree.getViewState();
-				this.resourcesTree.setInput(profileElement, {
-					...viewState,
-					expanded: viewState.expanded?.map(e => e)
-				});
+			if (e.name) {
+				this.profileTitle.textContent = profileElement.name;
 			}
 		}));
 
@@ -744,6 +644,9 @@ class ProfileWidget extends Disposable {
 						if (!isUndefined(e.enabled)) {
 							button.enabled = action.enabled;
 						}
+						if (!isUndefined(e.label)) {
+							button.label = action.label;
+						}
 					}));
 				}
 			}
@@ -760,6 +663,9 @@ class ProfileWidget extends Disposable {
 						if (!isUndefined(e.enabled)) {
 							button.enabled = action.enabled;
 						}
+						if (!isUndefined(e.label)) {
+							button.label = action.label;
+						}
 					}));
 					disposables.add(profileElement.onDidChange(e => {
 						if (e.message) {
@@ -774,80 +680,88 @@ class ProfileWidget extends Disposable {
 			this.buttonContainer.classList.add('hide');
 		}
 
-		this.toolbar.setActions(profileElement.titleActions[0].slice(0), profileElement.titleActions[1].slice(0));
-
 		if (profileElement instanceof NewProfileElement) {
-			this.nameInput.focus();
-			this.nameInput.select();
+			this.profileTree.focusFirst();
+		}
+
+		if (this.dimension) {
+			this.layout(this.dimension);
 		}
 	}
 
-	private renderProfileElement(profileElement: AbstractUserDataProfileElement): void {
-		this.profileTitle.textContent = profileElement.name;
-		this.nameInput.value = profileElement.name;
-		this.nameInput.validate();
-		if (profileElement.disabled) {
-			this.nameInput.disable();
-		} else {
-			this.nameInput.enable();
-		}
-		if (profileElement.icon) {
-			this.iconElement.className = ThemeIcon.asClassName(ThemeIcon.fromId(profileElement.icon));
-		} else {
-			this.iconElement.className = ThemeIcon.asClassName(ThemeIcon.fromId(DEFAULT_ICON.id));
-		}
-		if (profileElement instanceof NewProfileElement) {
-			this.contentsTreeHeader.classList.add('hide');
-			this.useAsDefaultProfileContainer.classList.add('hide');
-			this.copyFromContainer.classList.remove('hide');
-			this.copyFromOptions = this.getCopyFromOptions();
-			const id = profileElement.copyFrom instanceof URI ? profileElement.copyFrom.toString() : profileElement.copyFrom?.id;
-			const index = id
-				? this.copyFromOptions.findIndex(option => option.id === id)
-				: 0;
-			if (index !== -1) {
-				this.copyFromSelectBox.setOptions(this.copyFromOptions);
-				this.copyFromSelectBox.setEnabled(!profileElement.previewProfile && !profileElement.disabled);
-				this.copyFromSelectBox.select(index);
-			} else {
-				this.copyFromSelectBox.setOptions([{ text: basename(profileElement.copyFrom as URI) }]);
-				this.copyFromSelectBox.setEnabled(false);
-			}
-		} else if (profileElement instanceof UserDataProfileElement) {
-			this.contentsTreeHeader.classList.remove('hide');
-			this.inheritLabelElement.textContent = profileElement.profile.isDefault ? '' : localize('default profile', "Use Default Profile");
-			this.useAsDefaultProfileContainer.classList.remove('hide');
-			this.useAsDefaultProfileCheckbox.checked = profileElement.isNewWindowProfile;
-			this.copyFromContainer.classList.add('hide');
-		}
+}
+
+type ProfileProperty = 'name' | 'icon' | 'copyFrom' | 'useForCurrent' | 'useAsDefault' | 'contents' | 'workspaces';
+
+interface ProfileTreeElement {
+	element: ProfileProperty;
+	root: AbstractUserDataProfileElement;
+}
+
+class ProfileTreeDelegate extends CachedListVirtualDelegate<ProfileTreeElement> {
+
+	getTemplateId({ element }: ProfileTreeElement) {
+		return element;
 	}
 
-	private getCopyFromOptions(): (ISelectOptionItem & { id?: string; source?: IUserDataProfile | URI })[] {
-		const separator = { text: '\u2500\u2500\u2500\u2500\u2500\u2500', isDisabled: true };
-		const copyFromOptions: (ISelectOptionItem & { id?: string; source?: IUserDataProfile | URI })[] = [];
-		copyFromOptions.push({ text: localize('empty profile', "None") });
-		if (this._templates.length) {
-			copyFromOptions.push({ ...separator, decoratorRight: localize('from templates', "Profile Templates") });
-			for (const template of this._templates) {
-				copyFromOptions.push({ text: template.name, id: template.url, source: URI.parse(template.url) });
-			}
+	hasDynamicHeight({ element }: ProfileTreeElement): boolean {
+		return element === 'contents' || element === 'workspaces';
+	}
+
+	protected estimateHeight({ element, root }: ProfileTreeElement): number {
+		switch (element) {
+			case 'name':
+				return 72;
+			case 'icon':
+				return 68;
+			case 'copyFrom':
+				return 90;
+			case 'useForCurrent':
+			case 'useAsDefault':
+				return 68;
+			case 'contents':
+				return 258;
+			case 'workspaces':
+				return (root.workspaces ? (root.workspaces.length * 24) + 30 : 0) + 112;
 		}
-		copyFromOptions.push({ ...separator, decoratorRight: localize('from existing profiles', "Existing Profiles") });
-		for (const profile of this.userDataProfilesService.profiles) {
-			copyFromOptions.push({ text: profile.name, id: profile.id, source: profile });
-		}
-		return copyFromOptions;
 	}
 }
 
+class ProfileTreeDataSource implements IAsyncDataSource<AbstractUserDataProfileElement, ProfileTreeElement> {
 
-interface ProfileResourceTreeElement {
+	hasChildren(element: AbstractUserDataProfileElement | ProfileTreeElement): boolean {
+		return element instanceof AbstractUserDataProfileElement;
+	}
+
+	async getChildren(element: AbstractUserDataProfileElement | ProfileTreeElement): Promise<ProfileTreeElement[]> {
+		if (element instanceof AbstractUserDataProfileElement) {
+			const children: ProfileTreeElement[] = [];
+			if (element instanceof NewProfileElement) {
+				children.push({ element: 'name', root: element });
+				children.push({ element: 'icon', root: element });
+				children.push({ element: 'copyFrom', root: element });
+				children.push({ element: 'contents', root: element });
+			} else if (element instanceof UserDataProfileElement) {
+				children.push({ element: 'name', root: element });
+				children.push({ element: 'icon', root: element });
+				children.push({ element: 'useAsDefault', root: element });
+				children.push({ element: 'contents', root: element });
+				children.push({ element: 'workspaces', root: element });
+			}
+			return children;
+		}
+		return [];
+	}
+}
+
+interface ProfileContentTreeElement {
 	element: IProfileChildElement;
 	root: AbstractUserDataProfileElement;
 }
 
-class ProfileResourceTreeElementDelegate implements IListVirtualDelegate<ProfileResourceTreeElement> {
-	getTemplateId(element: ProfileResourceTreeElement) {
+class ProfileContentTreeElementDelegate implements IListVirtualDelegate<ProfileContentTreeElement> {
+
+	getTemplateId(element: ProfileContentTreeElement) {
 		if (!(<IProfileResourceTypeElement>element.element).resourceType) {
 			return ProfileResourceChildTreeItemRenderer.TEMPLATE_ID;
 		}
@@ -856,18 +770,19 @@ class ProfileResourceTreeElementDelegate implements IListVirtualDelegate<Profile
 		}
 		return ExistingProfileResourceTreeRenderer.TEMPLATE_ID;
 	}
-	getHeight(element: ProfileResourceTreeElement) {
-		return 22;
+
+	getHeight(element: ProfileContentTreeElement): number {
+		return 24;
 	}
 }
 
-class ProfileResourceTreeDataSource implements IAsyncDataSource<AbstractUserDataProfileElement, ProfileResourceTreeElement> {
+class ProfileResourceTreeDataSource implements IAsyncDataSource<AbstractUserDataProfileElement, ProfileContentTreeElement> {
 
 	constructor(
 		@IEditorProgressService private readonly editorProgressService: IEditorProgressService,
 	) { }
 
-	hasChildren(element: AbstractUserDataProfileElement | ProfileResourceTreeElement): boolean {
+	hasChildren(element: AbstractUserDataProfileElement | ProfileContentTreeElement): boolean {
 		if (element instanceof AbstractUserDataProfileElement) {
 			return true;
 		}
@@ -895,7 +810,7 @@ class ProfileResourceTreeDataSource implements IAsyncDataSource<AbstractUserData
 		return false;
 	}
 
-	async getChildren(element: AbstractUserDataProfileElement | ProfileResourceTreeElement): Promise<ProfileResourceTreeElement[]> {
+	async getChildren(element: AbstractUserDataProfileElement | ProfileContentTreeElement): Promise<ProfileContentTreeElement[]> {
 		if (element instanceof AbstractUserDataProfileElement) {
 			const children = await element.getChildren();
 			return children.map(e => ({ element: e, root: element }));
@@ -913,29 +828,33 @@ class ProfileResourceTreeDataSource implements IAsyncDataSource<AbstractUserData
 	}
 }
 
-interface IProfileResourceTemplateData {
+interface IProfileRendererTemplate {
 	readonly disposables: DisposableStore;
 	readonly elementDisposables: DisposableStore;
+}
+
+interface IExistingProfileResourceTemplateData extends IProfileRendererTemplate {
+	readonly label: HTMLElement;
+	readonly radio: Radio;
 	readonly actionBar: WorkbenchToolBar;
 }
 
-interface IExistingProfileResourceTemplateData extends IProfileResourceTemplateData {
+interface INewProfileResourceTemplateData extends IProfileRendererTemplate {
 	readonly label: HTMLElement;
-	readonly inheritContainer: HTMLElement;
-	readonly checkbox: Checkbox;
+	readonly radio: Radio;
+	readonly actionBar: WorkbenchToolBar;
 }
 
-interface INewProfileResourceTemplateData extends IProfileResourceTemplateData {
-	readonly label: HTMLElement;
-	readonly selectContainer: HTMLElement;
-	readonly selectBox: SelectBox;
-}
-
-interface IProfileResourceChildTreeItemTemplateData extends IProfileResourceTemplateData {
+interface IProfileResourceChildTreeItemTemplateData extends IProfileRendererTemplate {
+	readonly actionBar: WorkbenchToolBar;
 	readonly checkbox: Checkbox;
 	readonly resourceLabel: IResourceLabel;
 }
 
+interface IProfilePropertyRendererTemplate extends IProfileRendererTemplate {
+	element: ProfileTreeElement;
+}
+
 class AbstractProfileResourceTreeRenderer extends Disposable {
 
 	protected getResourceTypeTitle(resourceType: ProfileResourceType): string {
@@ -945,26 +864,828 @@ class AbstractProfileResourceTreeRenderer extends Disposable {
 			case ProfileResourceType.Keybindings:
 				return localize('keybindings', "Keyboard Shortcuts");
 			case ProfileResourceType.Snippets:
-				return localize('snippets', "User Snippets");
+				return localize('snippets', "Snippets");
 			case ProfileResourceType.Tasks:
-				return localize('tasks', "User Tasks");
+				return localize('tasks', "Tasks");
 			case ProfileResourceType.Extensions:
 				return localize('extensions', "Extensions");
 		}
 		return '';
 	}
 
-	disposeElement(element: ITreeNode<ProfileResourceTreeElement, void>, index: number, templateData: IProfileResourceTemplateData, height: number | undefined): void {
+	disposeElement(element: ITreeNode<ProfileContentTreeElement | ProfileTreeElement, void>, index: number, templateData: IProfileRendererTemplate, height: number | undefined): void {
 		templateData.elementDisposables.clear();
 	}
 
-	disposeTemplate(templateData: IProfileResourceTemplateData): void {
+	disposeTemplate(templateData: IProfileRendererTemplate): void {
 		templateData.disposables.dispose();
 	}
 }
 
+abstract class ProfilePropertyRenderer extends AbstractProfileResourceTreeRenderer implements ITreeRenderer<ProfileTreeElement, void, IProfilePropertyRendererTemplate> {
 
-class ExistingProfileResourceTreeRenderer extends AbstractProfileResourceTreeRenderer implements ITreeRenderer<ProfileResourceTreeElement, void, IExistingProfileResourceTemplateData> {
+	abstract templateId: ProfileProperty;
+	abstract renderTemplate(parent: HTMLElement): IProfilePropertyRendererTemplate;
+
+	renderElement({ element }: ITreeNode<ProfileTreeElement, void>, index: number, templateData: IProfilePropertyRendererTemplate, height: number | undefined): void {
+		templateData.elementDisposables.clear();
+		templateData.element = element;
+	}
+
+}
+
+class ProfileNameRenderer extends ProfilePropertyRenderer {
+
+	readonly templateId: ProfileProperty = 'name';
+
+	constructor(
+		@IUserDataProfilesService private readonly userDataProfilesService: IUserDataProfilesService,
+		@IContextViewService private readonly contextViewService: IContextViewService,
+	) {
+		super();
+	}
+
+	renderTemplate(parent: HTMLElement): IProfilePropertyRendererTemplate {
+		const disposables = new DisposableStore();
+		const elementDisposables = disposables.add(new DisposableStore());
+		let profileElement: ProfileTreeElement | undefined;
+
+		const nameContainer = append(parent, $('.profile-row-container'));
+		append(nameContainer, $('.profile-label-element', undefined, localize('name', "Name")));
+		const nameInput = disposables.add(new InputBox(
+			nameContainer,
+			this.contextViewService,
+			{
+				inputBoxStyles: getInputBoxStyle({
+					inputBorder: settingsTextInputBorder
+				}),
+				ariaLabel: localize('profileName', "Profile Name"),
+				placeholder: localize('profileName', "Profile Name"),
+				validationOptions: {
+					validation: (value) => {
+						if (!value) {
+							return {
+								content: localize('name required', "Profile name is required and must be a non-empty value."),
+								type: MessageType.WARNING
+							};
+						}
+						if (profileElement?.root.disabled) {
+							return null;
+						}
+						if (!profileElement?.root.shouldValidateName()) {
+							return null;
+						}
+						const initialName = profileElement?.root.getInitialName();
+						value = value.trim();
+						if (initialName !== value && this.userDataProfilesService.profiles.some(p => !p.isTransient && p.name === value)) {
+							return {
+								content: localize('profileExists', "Profile with name {0} already exists.", value),
+								type: MessageType.WARNING
+							};
+						}
+						return null;
+					}
+				}
+			}
+		));
+		nameInput.onDidChange(value => {
+			if (profileElement && value) {
+				profileElement.root.name = value;
+			}
+		});
+		const focusTracker = disposables.add(trackFocus(nameInput.inputElement));
+		disposables.add(focusTracker.onDidBlur(() => {
+			if (profileElement && !nameInput.value) {
+				nameInput.value = profileElement.root.name;
+			}
+		}));
+
+		const renderName = (profileElement: ProfileTreeElement) => {
+			nameInput.value = profileElement.root.name;
+			nameInput.validate();
+			const isDefaultProfile = profileElement.root instanceof UserDataProfileElement && profileElement.root.profile.isDefault;
+			if (profileElement.root.disabled || isDefaultProfile) {
+				nameInput.disable();
+			} else {
+				nameInput.enable();
+			}
+			if (isDefaultProfile) {
+				nameInput.setTooltip(localize('defaultProfileName', "Name cannot be changed for the default profile"));
+			} else {
+				nameInput.setTooltip(localize('profileName', "Profile Name"));
+			}
+		};
+
+		return {
+			set element(element: ProfileTreeElement) {
+				profileElement = element;
+				renderName(profileElement);
+				elementDisposables.add(profileElement.root.onDidChange(e => {
+					if (e.name || e.disabled) {
+						renderName(element);
+					}
+					if (e.profile) {
+						nameInput.validate();
+					}
+				}));
+			},
+			disposables,
+			elementDisposables
+		};
+	}
+
+}
+
+class ProfileIconRenderer extends ProfilePropertyRenderer {
+
+	readonly templateId: ProfileProperty = 'icon';
+	private readonly hoverDelegate: IHoverDelegate;
+
+	constructor(
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IHoverService private readonly hoverService: IHoverService,
+	) {
+		super();
+		this.hoverDelegate = getDefaultHoverDelegate('element');
+	}
+
+	renderTemplate(parent: HTMLElement): IProfilePropertyRendererTemplate {
+		const disposables = new DisposableStore();
+		const elementDisposables = disposables.add(new DisposableStore());
+		let profileElement: ProfileTreeElement | undefined;
+
+		const iconContainer = append(parent, $('.profile-row-container'));
+		append(iconContainer, $('.profile-label-element', undefined, localize('icon-label', "Icon")));
+		const iconValueContainer = append(iconContainer, $('.profile-icon-container'));
+		const iconElement = append(iconValueContainer, $(`${ThemeIcon.asCSSSelector(DEFAULT_ICON)}`, { 'tabindex': '0', 'role': 'button', 'aria-label': localize('icon', "Profile Icon") }));
+		const iconHover = disposables.add(this.hoverService.setupManagedHover(this.hoverDelegate, iconElement, ''));
+
+		const iconSelectBox = disposables.add(this.instantiationService.createInstance(WorkbenchIconSelectBox, { icons: ICONS, inputBoxStyles: defaultInputBoxStyles }));
+		let hoverWidget: IHoverWidget | undefined;
+		const showIconSelectBox = () => {
+			if (profileElement?.root instanceof UserDataProfileElement && profileElement.root.profile.isDefault) {
+				return;
+			}
+			if (profileElement?.root.disabled) {
+				return;
+			}
+			if (profileElement?.root instanceof UserDataProfileElement && profileElement.root.profile.isDefault) {
+				return;
+			}
+			iconSelectBox.clearInput();
+			hoverWidget = this.hoverService.showHover({
+				content: iconSelectBox.domNode,
+				target: iconElement,
+				position: {
+					hoverPosition: HoverPosition.BELOW,
+				},
+				persistence: {
+					sticky: true,
+				},
+				appearance: {
+					showPointer: true,
+				},
+			}, true);
+
+			if (hoverWidget) {
+				iconSelectBox.layout(new Dimension(486, 292));
+				iconSelectBox.focus();
+			}
+		};
+		disposables.add(addDisposableListener(iconElement, EventType.CLICK, (e: MouseEvent) => {
+			EventHelper.stop(e, true);
+			showIconSelectBox();
+		}));
+		disposables.add(addDisposableListener(iconElement, EventType.KEY_DOWN, e => {
+			const event = new StandardKeyboardEvent(e);
+			if (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) {
+				EventHelper.stop(event, true);
+				showIconSelectBox();
+			}
+		}));
+		disposables.add(addDisposableListener(iconSelectBox.domNode, EventType.KEY_DOWN, e => {
+			const event = new StandardKeyboardEvent(e);
+			if (event.equals(KeyCode.Escape)) {
+				EventHelper.stop(event, true);
+				hoverWidget?.dispose();
+				iconElement.focus();
+			}
+		}));
+		disposables.add(iconSelectBox.onDidSelect(selectedIcon => {
+			hoverWidget?.dispose();
+			iconElement.focus();
+			if (profileElement) {
+				profileElement.root.icon = selectedIcon.id;
+			}
+		}));
+
+		append(iconValueContainer, $('.profile-description-element', undefined, localize('icon-description', "Profile icon to be shown in the activity bar")));
+
+		const renderIcon = (profileElement: ProfileTreeElement) => {
+			if (profileElement?.root instanceof UserDataProfileElement && profileElement.root.profile.isDefault) {
+				iconValueContainer.classList.add('disabled');
+				iconHover.update(localize('defaultProfileIcon', "Icon cannot be changed for the default profile"));
+			} else {
+				iconHover.update(localize('changeIcon', "Click to change icon"));
+				iconValueContainer.classList.remove('disabled');
+			}
+			if (profileElement.root.icon) {
+				iconElement.className = ThemeIcon.asClassName(ThemeIcon.fromId(profileElement.root.icon));
+			} else {
+				iconElement.className = ThemeIcon.asClassName(ThemeIcon.fromId(DEFAULT_ICON.id));
+			}
+		};
+
+		return {
+			set element(element: ProfileTreeElement) {
+				profileElement = element;
+				renderIcon(profileElement);
+				elementDisposables.add(profileElement.root.onDidChange(e => {
+					if (e.icon) {
+						renderIcon(element);
+					}
+				}));
+			},
+			disposables,
+			elementDisposables
+		};
+	}
+}
+
+class UseForCurrentWindowPropertyRenderer extends ProfilePropertyRenderer {
+
+	readonly templateId: ProfileProperty = 'useForCurrent';
+
+	constructor(
+		@IUserDataProfileService private readonly userDataProfileService: IUserDataProfileService,
+	) {
+		super();
+	}
+
+	renderTemplate(parent: HTMLElement): IProfilePropertyRendererTemplate {
+		const disposables = new DisposableStore();
+		const elementDisposables = disposables.add(new DisposableStore());
+		let profileElement: ProfileTreeElement | undefined;
+
+		const useForCurrentWindowContainer = append(parent, $('.profile-row-container'));
+		append(useForCurrentWindowContainer, $('.profile-label-element', undefined, localize('use for curren window', "Use for Current Window")));
+		const useForCurrentWindowValueContainer = append(useForCurrentWindowContainer, $('.profile-use-for-current-container'));
+		const useForCurrentWindowTitle = localize('enable for current window', "Use this profile for the current window");
+		const useForCurrentWindowCheckbox = disposables.add(new Checkbox(useForCurrentWindowTitle, false, defaultCheckboxStyles));
+		append(useForCurrentWindowValueContainer, useForCurrentWindowCheckbox.domNode);
+		const useForCurrentWindowLabel = append(useForCurrentWindowValueContainer, $('.profile-description-element', undefined, useForCurrentWindowTitle));
+		disposables.add(useForCurrentWindowCheckbox.onChange(() => {
+			if (profileElement?.root instanceof UserDataProfileElement) {
+				profileElement.root.toggleCurrentWindowProfile();
+			}
+		}));
+		disposables.add(addDisposableListener(useForCurrentWindowLabel, EventType.CLICK, () => {
+			if (profileElement?.root instanceof UserDataProfileElement) {
+				profileElement.root.toggleCurrentWindowProfile();
+			}
+		}));
+
+		const renderUseCurrentProfile = (profileElement: ProfileTreeElement) => {
+			useForCurrentWindowCheckbox.checked = profileElement.root instanceof UserDataProfileElement && this.userDataProfileService.currentProfile.id === profileElement.root.profile.id;
+			if (useForCurrentWindowCheckbox.checked && this.userDataProfileService.currentProfile.isDefault) {
+				useForCurrentWindowCheckbox.disable();
+			} else {
+				useForCurrentWindowCheckbox.enable();
+			}
+		};
+
+		const that = this;
+		return {
+			set element(element: ProfileTreeElement) {
+				profileElement = element;
+				renderUseCurrentProfile(profileElement);
+				elementDisposables.add(that.userDataProfileService.onDidChangeCurrentProfile(e => {
+					renderUseCurrentProfile(element);
+				}));
+			},
+			disposables,
+			elementDisposables
+		};
+	}
+}
+
+class UseAsDefaultProfileRenderer extends ProfilePropertyRenderer {
+
+	readonly templateId: ProfileProperty = 'useAsDefault';
+
+	renderTemplate(parent: HTMLElement): IProfilePropertyRendererTemplate {
+		const disposables = new DisposableStore();
+		const elementDisposables = disposables.add(new DisposableStore());
+		let profileElement: ProfileTreeElement | undefined;
+
+		const useAsDefaultProfileContainer = append(parent, $('.profile-row-container'));
+		append(useAsDefaultProfileContainer, $('.profile-label-element', undefined, localize('use for new windows', "Use for New Windows")));
+		const useAsDefaultProfileValueContainer = append(useAsDefaultProfileContainer, $('.profile-use-as-default-container'));
+		const useAsDefaultProfileTitle = localize('enable for new windows', "Use this profile as the default for new windows");
+		const useAsDefaultProfileCheckbox = disposables.add(new Checkbox(useAsDefaultProfileTitle, false, defaultCheckboxStyles));
+		append(useAsDefaultProfileValueContainer, useAsDefaultProfileCheckbox.domNode);
+		const useAsDefaultProfileLabel = append(useAsDefaultProfileValueContainer, $('.profile-description-element', undefined, useAsDefaultProfileTitle));
+		disposables.add(useAsDefaultProfileCheckbox.onChange(() => {
+			if (profileElement?.root instanceof UserDataProfileElement) {
+				profileElement.root.toggleNewWindowProfile();
+			}
+		}));
+		disposables.add(addDisposableListener(useAsDefaultProfileLabel, EventType.CLICK, () => {
+			if (profileElement?.root instanceof UserDataProfileElement) {
+				profileElement.root.toggleNewWindowProfile();
+			}
+		}));
+
+		const renderUseAsDefault = (profileElement: ProfileTreeElement) => {
+			useAsDefaultProfileCheckbox.checked = profileElement.root instanceof UserDataProfileElement && profileElement.root.isNewWindowProfile;
+		};
+
+		return {
+			set element(element: ProfileTreeElement) {
+				profileElement = element;
+				renderUseAsDefault(profileElement);
+				elementDisposables.add(profileElement.root.onDidChange(e => {
+					if (e.newWindowProfile) {
+						renderUseAsDefault(element);
+					}
+				}));
+			},
+			disposables,
+			elementDisposables
+		};
+	}
+}
+
+class CopyFromProfileRenderer extends ProfilePropertyRenderer {
+
+	readonly templateId: ProfileProperty = 'copyFrom';
+
+	private templates: readonly IProfileTemplateInfo[] = [];
+
+	constructor(
+		@IUserDataProfilesService private readonly userDataProfilesService: IUserDataProfilesService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
+		@IContextViewService private readonly contextViewService: IContextViewService,
+	) {
+		super();
+	}
+
+	renderTemplate(parent: HTMLElement): IProfilePropertyRendererTemplate {
+		const disposables = new DisposableStore();
+		const elementDisposables = disposables.add(new DisposableStore());
+		let profileElement: ProfileTreeElement | undefined;
+
+		const copyFromContainer = append(parent, $('.profile-row-container.profile-copy-from-container'));
+		append(copyFromContainer, $('.profile-label-element', undefined, localize('create from', "Copy from")));
+		append(copyFromContainer, $('.profile-description-element', undefined, localize('copy from description', "Select the profile source from which you want to copy contents")));
+		const copyFromSelectBox = disposables.add(this.instantiationService.createInstance(SelectBox,
+			[],
+			0,
+			this.contextViewService,
+			defaultSelectBoxStyles,
+			{
+				useCustomDrawn: true,
+				ariaLabel: localize('copy profile from', "Copy profile from"),
+			}
+		));
+		copyFromSelectBox.render(append(copyFromContainer, $('.profile-select-container')));
+
+		const render = (profileElement: NewProfileElement, copyFromOptions: (ISelectOptionItem & { id?: string; source?: IUserDataProfile | URI })[]) => {
+			copyFromSelectBox.setOptions(copyFromOptions);
+			const id = profileElement.copyFrom instanceof URI ? profileElement.copyFrom.toString() : profileElement.copyFrom?.id;
+			const index = id
+				? copyFromOptions.findIndex(option => option.id === id)
+				: 0;
+			copyFromSelectBox.select(index);
+		};
+
+		const that = this;
+		return {
+			set element(element: ProfileTreeElement) {
+				profileElement = element;
+				if (profileElement.root instanceof NewProfileElement) {
+					const newProfileElement = profileElement.root;
+					let copyFromOptions = that.getCopyFromOptions(newProfileElement);
+					render(newProfileElement, copyFromOptions);
+					copyFromSelectBox.setEnabled(!newProfileElement.previewProfile && !newProfileElement.disabled);
+					elementDisposables.add(profileElement.root.onDidChange(e => {
+						if (e.copyFrom || e.copyFromInfo) {
+							copyFromOptions = that.getCopyFromOptions(newProfileElement);
+							render(newProfileElement, copyFromOptions);
+						}
+						if (e.preview || e.disabled) {
+							copyFromSelectBox.setEnabled(!newProfileElement.previewProfile && !newProfileElement.disabled);
+						}
+					}));
+					elementDisposables.add(copyFromSelectBox.onDidSelect(option => {
+						newProfileElement.copyFrom = copyFromOptions[option.index].source;
+					}));
+				}
+			},
+			disposables,
+			elementDisposables
+		};
+	}
+
+	setTemplates(templates: readonly IProfileTemplateInfo[]): void {
+		this.templates = templates;
+	}
+
+	private getCopyFromOptions(profileElement: NewProfileElement): (ISelectOptionItem & { id?: string; source?: IUserDataProfile | URI })[] {
+		const separator = { text: '\u2500\u2500\u2500\u2500\u2500\u2500', isDisabled: true };
+		const copyFromOptions: (ISelectOptionItem & { id?: string; source?: IUserDataProfile | URI })[] = [];
+
+		copyFromOptions.push({ text: localize('empty profile', "None") });
+		for (const [copyFromTemplate, name] of profileElement.copyFromTemplates) {
+			if (!this.templates.some(template => this.uriIdentityService.extUri.isEqual(URI.parse(template.url), copyFromTemplate))) {
+				copyFromOptions.push({ text: `${name} (${basename(copyFromTemplate)})`, id: copyFromTemplate.toString(), source: copyFromTemplate });
+			}
+		}
+
+		if (this.templates.length) {
+			copyFromOptions.push({ ...separator, decoratorRight: localize('from templates', "Profile Templates") });
+			for (const template of this.templates) {
+				copyFromOptions.push({ text: template.name, id: template.url, source: URI.parse(template.url) });
+			}
+		}
+		copyFromOptions.push({ ...separator, decoratorRight: localize('from existing profiles', "Existing Profiles") });
+		for (const profile of this.userDataProfilesService.profiles) {
+			if (!profile.isTransient) {
+				copyFromOptions.push({ text: profile.name, id: profile.id, source: profile });
+			}
+		}
+		return copyFromOptions;
+	}
+}
+
+class ContentsProfileRenderer extends ProfilePropertyRenderer {
+
+	readonly templateId: ProfileProperty = 'contents';
+
+	private readonly _onDidChangeContentHeight = this._register(new Emitter<ProfileTreeElement>());
+	readonly onDidChangeContentHeight = this._onDidChangeContentHeight.event;
+
+	private readonly _onDidChangeSelection = this._register(new Emitter<{ element: ProfileTreeElement; selected: boolean }>());
+	readonly onDidChangeSelection = this._onDidChangeSelection.event;
+
+	private profilesContentTree: WorkbenchAsyncDataTree<AbstractUserDataProfileElement, ProfileContentTreeElement> | undefined;
+
+	constructor(
+		@IUserDataProfilesService private readonly userDataProfilesService: IUserDataProfilesService,
+		@IContextMenuService private readonly contextMenuService: IContextMenuService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+	) {
+		super();
+	}
+
+	renderTemplate(parent: HTMLElement): IProfilePropertyRendererTemplate {
+		const disposables = new DisposableStore();
+		const elementDisposables = disposables.add(new DisposableStore());
+		let profileElement: ProfileTreeElement | undefined;
+
+		const configureRowContainer = append(parent, $('.profile-row-container'));
+		append(configureRowContainer, $('.profile-label-element', undefined, localize('contents', "Contents")));
+		const contentsDescriptionElement = append(configureRowContainer, $('.profile-description-element'));
+		const contentsTreeHeader = append(configureRowContainer, $('.profile-content-tree-header'));
+		const optionsLabel = $('.options-header', undefined, $('span', undefined, localize('options', "Source")));
+		append(contentsTreeHeader,
+			$(''),
+			$('', undefined, localize('contents', "Contents")),
+			optionsLabel,
+			$(''),
+		);
+
+		const delegate = new ProfileContentTreeElementDelegate();
+		const profilesContentTree = this.profilesContentTree = disposables.add(this.instantiationService.createInstance(WorkbenchAsyncDataTree<AbstractUserDataProfileElement, ProfileContentTreeElement>,
+			'ProfileEditor-ContentsTree',
+			append(configureRowContainer, $('.profile-content-tree.file-icon-themable-tree.show-file-icons')),
+			delegate,
+			[
+				this.instantiationService.createInstance(ExistingProfileResourceTreeRenderer),
+				this.instantiationService.createInstance(NewProfileResourceTreeRenderer),
+				this.instantiationService.createInstance(ProfileResourceChildTreeItemRenderer),
+			],
+			this.instantiationService.createInstance(ProfileResourceTreeDataSource),
+			{
+				multipleSelectionSupport: false,
+				horizontalScrolling: false,
+				accessibilityProvider: {
+					getAriaLabel(element: ProfileContentTreeElement | null): string {
+						if ((<IProfileResourceTypeElement>element?.element).resourceType) {
+							return (<IProfileResourceTypeElement>element?.element).resourceType;
+						}
+						if ((<IProfileResourceTypeChildElement>element?.element).label) {
+							return (<IProfileResourceTypeChildElement>element?.element).label;
+						}
+						return '';
+					},
+					getWidgetAriaLabel(): string {
+						return '';
+					},
+				},
+				identityProvider: {
+					getId(element) {
+						if (element?.element.handle) {
+							return element.element.handle;
+						}
+						return '';
+					}
+				},
+				expandOnlyOnTwistieClick: true,
+				renderIndentGuides: RenderIndentGuides.None,
+				enableStickyScroll: false,
+				openOnSingleClick: false,
+				alwaysConsumeMouseWheel: false,
+			}));
+
+		this.profilesContentTree.style(listStyles);
+
+		disposables.add(toDisposable(() => this.profilesContentTree = undefined));
+
+		disposables.add(this.profilesContentTree.onDidChangeContentHeight(height => {
+			this.profilesContentTree?.layout(height);
+			if (profileElement) {
+				this._onDidChangeContentHeight.fire(profileElement);
+			}
+		}));
+
+		disposables.add(this.profilesContentTree.onDidChangeSelection((e => {
+			if (profileElement) {
+				this._onDidChangeSelection.fire({ element: profileElement, selected: !!e.elements.length });
+			}
+		})));
+
+		disposables.add(this.profilesContentTree.onDidOpen(async (e) => {
+			if (!e.browserEvent) {
+				return;
+			}
+			if (e.element?.element.openAction) {
+				await e.element.element.openAction.run();
+			}
+		}));
+
+		disposables.add(this.profilesContentTree.onContextMenu(async (e) => {
+			if (!e.element?.element.actions?.contextMenu?.length) {
+				return;
+			}
+			this.contextMenuService.showContextMenu({
+				getAnchor: () => e.anchor,
+				getActions: () => e.element?.element?.actions?.contextMenu ?? [],
+				getActionsContext: () => e.element
+			});
+		}));
+
+		const updateDescription = (element: ProfileTreeElement) => {
+			clearNode(contentsDescriptionElement);
+
+			const markdown = new MarkdownString();
+			if (element.root instanceof UserDataProfileElement && element.root.profile.isDefault) {
+				markdown.appendMarkdown(localize('default profile contents description', "Browse contents of this profile\n"));
+			}
+
+			else {
+				markdown.appendMarkdown(localize('contents source description', "Configure source of contents for this profile\n"));
+				if (element.root instanceof NewProfileElement) {
+					const copyFromName = element.root.getCopyFromName();
+					const optionName = copyFromName === this.userDataProfilesService.defaultProfile.name
+						? localize('copy from default', "{0} (Copy)", copyFromName)
+						: copyFromName;
+					if (optionName) {
+						markdown
+							.appendMarkdown(localize('copy info', "- *{0}:* Copy contents from the {1} profile\n", optionName, copyFromName));
+					}
+					markdown
+						.appendMarkdown(localize('default info', "- *Default:* Use contents from the Default profile\n"))
+						.appendMarkdown(localize('none info', "- *None:* Create empty contents\n"));
+				}
+			}
+
+			append(contentsDescriptionElement, elementDisposables.add(renderMarkdown(markdown)).element);
+		};
+
+		const that = this;
+		return {
+			set element(element: ProfileTreeElement) {
+				profileElement = element;
+				updateDescription(element);
+				if (element.root instanceof NewProfileElement) {
+					contentsTreeHeader.classList.remove('default-profile');
+				} else if (element.root instanceof UserDataProfileElement) {
+					contentsTreeHeader.classList.toggle('default-profile', element.root.profile.isDefault);
+				}
+				profilesContentTree.setInput(profileElement.root);
+				elementDisposables.add(profileElement.root.onDidChange(e => {
+					if (e.copyFrom || e.copyFlags || e.flags || e.extensions || e.snippets || e.preview) {
+						profilesContentTree.updateChildren(element.root);
+					}
+					if (e.copyFromInfo) {
+						updateDescription(element);
+						that._onDidChangeContentHeight.fire(element);
+					}
+				}));
+			},
+			disposables,
+			elementDisposables: new DisposableStore()
+		};
+	}
+
+	clearSelection(): void {
+		if (this.profilesContentTree) {
+			this.profilesContentTree.setSelection([]);
+			this.profilesContentTree.setFocus([]);
+		}
+	}
+}
+
+interface WorkspaceTableElement {
+	readonly workspace: URI;
+	readonly profileElement: UserDataProfileElement;
+}
+
+class ProfileWorkspacesRenderer extends ProfilePropertyRenderer {
+
+	readonly templateId: ProfileProperty = 'workspaces';
+
+	private readonly _onDidChangeContentHeight = this._register(new Emitter<ProfileTreeElement>());
+	readonly onDidChangeContentHeight = this._onDidChangeContentHeight.event;
+
+	private readonly _onDidChangeSelection = this._register(new Emitter<{ element: ProfileTreeElement; selected: boolean }>());
+	readonly onDidChangeSelection = this._onDidChangeSelection.event;
+
+	private workspacesTable: WorkbenchTable<WorkspaceTableElement> | undefined;
+
+	constructor(
+		@ILabelService private readonly labelService: ILabelService,
+		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
+		@IFileDialogService private readonly fileDialogService: IFileDialogService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+	) {
+		super();
+	}
+
+	renderTemplate(parent: HTMLElement): IProfilePropertyRendererTemplate {
+		const disposables = new DisposableStore();
+		const elementDisposables = disposables.add(new DisposableStore());
+		let profileElement: ProfileTreeElement | undefined;
+
+		const profileWorkspacesRowContainer = append(parent, $('.profile-row-container'));
+		append(profileWorkspacesRowContainer, $('.profile-label-element', undefined, localize('folders_workspaces', "Folders & Workspaces")));
+		const profileWorkspacesDescriptionElement = append(profileWorkspacesRowContainer, $('.profile-description-element'));
+
+		const workspacesTableContainer = append(profileWorkspacesRowContainer, $('.profile-associations-table'));
+		const table = this.workspacesTable = disposables.add(this.instantiationService.createInstance(WorkbenchTable<WorkspaceTableElement>,
+			'ProfileEditor-AssociationsTable',
+			workspacesTableContainer,
+			new class implements ITableVirtualDelegate<URI> {
+				readonly headerRowHeight = 30;
+				getHeight() { return 24; }
+			},
+			[
+				{
+					label: '',
+					tooltip: '',
+					weight: 1,
+					minimumWidth: 30,
+					maximumWidth: 30,
+					templateId: WorkspaceUriEmptyColumnRenderer.TEMPLATE_ID,
+					project(row: WorkspaceTableElement): WorkspaceTableElement { return row; },
+				},
+				{
+					label: localize('hostColumnLabel', "Host"),
+					tooltip: '',
+					weight: 2,
+					templateId: WorkspaceUriHostColumnRenderer.TEMPLATE_ID,
+					project(row: WorkspaceTableElement): WorkspaceTableElement { return row; },
+				},
+				{
+					label: localize('pathColumnLabel', "Path"),
+					tooltip: '',
+					weight: 7,
+					templateId: WorkspaceUriPathColumnRenderer.TEMPLATE_ID,
+					project(row: WorkspaceTableElement): WorkspaceTableElement { return row; }
+				},
+				{
+					label: '',
+					tooltip: '',
+					weight: 1,
+					minimumWidth: 60,
+					maximumWidth: 60,
+					templateId: WorkspaceUriActionsColumnRenderer.TEMPLATE_ID,
+					project(row: WorkspaceTableElement): WorkspaceTableElement { return row; }
+				},
+			],
+			[
+				new WorkspaceUriEmptyColumnRenderer(),
+				this.instantiationService.createInstance(WorkspaceUriHostColumnRenderer),
+				this.instantiationService.createInstance(WorkspaceUriPathColumnRenderer),
+				this.instantiationService.createInstance(WorkspaceUriActionsColumnRenderer),
+			],
+			{
+				horizontalScrolling: false,
+				alwaysConsumeMouseWheel: false,
+				openOnSingleClick: false,
+				multipleSelectionSupport: false,
+				accessibilityProvider: {
+					getAriaLabel: (item: WorkspaceTableElement) => {
+						const hostLabel = getHostLabel(this.labelService, item.workspace);
+						if (hostLabel === undefined || hostLabel.length === 0) {
+							return localize('trustedFolderAriaLabel', "{0}, trusted", this.labelService.getUriLabel(item.workspace));
+						}
+
+						return localize('trustedFolderWithHostAriaLabel', "{0} on {1}, trusted", this.labelService.getUriLabel(item.workspace), hostLabel);
+					},
+					getWidgetAriaLabel: () => localize('trustedFoldersAndWorkspaces', "Trusted Folders & Workspaces")
+				},
+				identityProvider: {
+					getId(element: WorkspaceTableElement) {
+						return element.workspace.toString();
+					},
+				}
+			}));
+		this.workspacesTable.style(listStyles);
+		disposables.add(toDisposable(() => this.workspacesTable = undefined));
+		disposables.add(this.workspacesTable.onDidChangeSelection((e => {
+			if (profileElement) {
+				this._onDidChangeSelection.fire({ element: profileElement, selected: !!e.elements.length });
+			}
+		})));
+
+		const addButtonBarElement = append(profileWorkspacesRowContainer, $('.profile-workspaces-button-container'));
+		const buttonBar = disposables.add(new ButtonBar(addButtonBarElement));
+		const addButton = this._register(buttonBar.addButton({ title: localize('addButton', "Add Folder"), ...defaultButtonStyles }));
+		addButton.label = localize('addButton', "Add Folder");
+
+		disposables.add(addButton.onDidClick(async () => {
+			const uris = await this.fileDialogService.showOpenDialog({
+				canSelectFiles: false,
+				canSelectFolders: true,
+				canSelectMany: true,
+				openLabel: localize('addFolder', "Add Folder"),
+				title: localize('addFolderTitle', "Select Folders To Add")
+			});
+			if (uris) {
+				if (profileElement?.root instanceof UserDataProfileElement) {
+					profileElement.root.updateWorkspaces(uris, []);
+				}
+			}
+		}));
+
+		disposables.add(table.onDidOpen(item => {
+			if (item?.element) {
+				item.element.profileElement.openWorkspace(item.element.workspace);
+			}
+		}));
+
+		const updateTable = () => {
+			if (profileElement?.root instanceof UserDataProfileElement && profileElement.root.workspaces?.length) {
+				profileWorkspacesDescriptionElement.textContent = localize('folders_workspaces_description', "Following folders and workspaces are using this profile");
+				workspacesTableContainer.classList.remove('hide');
+				table.splice(0, table.length, profileElement.root.workspaces
+					.map(workspace => ({ workspace, profileElement: <UserDataProfileElement>profileElement!.root }))
+					.sort((a, b) => this.uriIdentityService.extUri.compare(a.workspace, b.workspace))
+				);
+				this.layout();
+			} else {
+				profileWorkspacesDescriptionElement.textContent = localize('no_folder_description', "No folders or workspaces are using this profile");
+				workspacesTableContainer.classList.add('hide');
+			}
+		};
+
+		const that = this;
+		return {
+			set element(element: ProfileTreeElement) {
+				profileElement = element;
+				if (element.root instanceof UserDataProfileElement) {
+					updateTable();
+				}
+				elementDisposables.add(profileElement.root.onDidChange(e => {
+					if (profileElement && e.workspaces) {
+						updateTable();
+						that._onDidChangeContentHeight.fire(profileElement);
+					}
+				}));
+			},
+			disposables,
+			elementDisposables: new DisposableStore()
+		};
+	}
+
+	layout(): void {
+		if (this.workspacesTable) {
+			this.workspacesTable.layout((this.workspacesTable.length * 24) + 30, undefined);
+		}
+	}
+
+	clearSelection(): void {
+		if (this.workspacesTable) {
+			this.workspacesTable.setSelection([]);
+			this.workspacesTable.setFocus([]);
+		}
+	}
+}
+
+class ExistingProfileResourceTreeRenderer extends AbstractProfileResourceTreeRenderer implements ITreeRenderer<ProfileContentTreeElement, void, IExistingProfileResourceTemplateData> {
 
 	static readonly TEMPLATE_ID = 'ExistingProfileResourceTemplate';
 
@@ -981,11 +1702,10 @@ class ExistingProfileResourceTreeRenderer extends AbstractProfileResourceTreeRen
 		const container = append(parent, $('.profile-tree-item-container.existing-profile-resource-type-container'));
 		const label = append(container, $('.profile-resource-type-label'));
 
-		const inheritContainer = append(container, $('.inherit-container'));
-		const checkbox = disposables.add(new Checkbox('', false, defaultCheckboxStyles));
-		append(inheritContainer, checkbox.domNode);
+		const radio = disposables.add(new Radio({ items: [] }));
+		append(append(container, $('.profile-resource-options-container')), radio.domNode);
 
-		const actionsContainer = append(container, $('.profile-tree-item-actions-container'));
+		const actionsContainer = append(container, $('.profile-resource-actions-container'));
 		const actionBar = disposables.add(this.instantiationService.createInstance(WorkbenchToolBar,
 			actionsContainer,
 			{
@@ -994,41 +1714,68 @@ class ExistingProfileResourceTreeRenderer extends AbstractProfileResourceTreeRen
 			}
 		));
 
-		return { checkbox, label, inheritContainer, actionBar, disposables, elementDisposables: disposables.add(new DisposableStore()) };
+		return { label, radio, actionBar, disposables, elementDisposables: disposables.add(new DisposableStore()) };
 	}
 
-	renderElement({ element: profileResourceTreeElement }: ITreeNode<ProfileResourceTreeElement, void>, index: number, templateData: IExistingProfileResourceTemplateData, height: number | undefined): void {
+	renderElement({ element: profileResourceTreeElement }: ITreeNode<ProfileContentTreeElement, void>, index: number, templateData: IExistingProfileResourceTemplateData, height: number | undefined): void {
 		templateData.elementDisposables.clear();
 		const { element, root } = profileResourceTreeElement;
 		if (!(root instanceof UserDataProfileElement)) {
 			throw new Error('ExistingProfileResourceTreeRenderer can only render existing profile element');
 		}
-		if (!isProfileResourceTypeElement(element)) {
+		if (isString(element) || !isProfileResourceTypeElement(element)) {
 			throw new Error('Invalid profile resource element');
 		}
 
-		templateData.label.textContent = this.getResourceTypeTitle(element.resourceType);
+		const updateRadioItems = () => {
+			templateData.radio.setItems([{
+				text: localize('default', "Default"),
+				tooltip: localize('default description', "Use {0} from the Default profile", resourceTypeTitle),
+				isActive: root.getFlag(element.resourceType)
+			},
+			{
+				text: root.name,
+				tooltip: localize('current description', "Use {0} from the {1} profile", resourceTypeTitle, root.name),
+				isActive: !root.getFlag(element.resourceType)
+			}]);
+		};
+
+		const resourceTypeTitle = this.getResourceTypeTitle(element.resourceType);
+		templateData.label.textContent = resourceTypeTitle;
+
 		if (root instanceof UserDataProfileElement && root.profile.isDefault) {
-			templateData.checkbox.domNode.classList.add('hide');
+			templateData.radio.domNode.classList.add('hide');
 		} else {
-			templateData.checkbox.domNode.classList.remove('hide');
-			templateData.checkbox.checked = root.getFlag(element.resourceType);
-			templateData.elementDisposables.add(templateData.checkbox.onChange(() => root.setFlag(element.resourceType, templateData.checkbox.checked)));
+			templateData.radio.domNode.classList.remove('hide');
+			updateRadioItems();
+			templateData.elementDisposables.add(root.onDidChange(e => {
+				if (e.name) {
+					updateRadioItems();
+				}
+			}));
+			templateData.elementDisposables.add(templateData.radio.onDidSelect((index) => root.setFlag(element.resourceType, index === 0)));
 		}
 
-		templateData.actionBar.setActions(element.action ? [element.action] : []);
+		const actions: IAction[] = [];
+		if (element.openAction) {
+			actions.push(element.openAction);
+		}
+		if (element.actions?.primary) {
+			actions.push(...element.actions.primary);
+		}
+		templateData.actionBar.setActions(actions);
 	}
 
 }
 
-class NewProfileResourceTreeRenderer extends AbstractProfileResourceTreeRenderer implements ITreeRenderer<ProfileResourceTreeElement, void, INewProfileResourceTemplateData> {
+class NewProfileResourceTreeRenderer extends AbstractProfileResourceTreeRenderer implements ITreeRenderer<ProfileContentTreeElement, void, INewProfileResourceTemplateData> {
 
 	static readonly TEMPLATE_ID = 'NewProfileResourceTemplate';
 
 	readonly templateId = NewProfileResourceTreeRenderer.TEMPLATE_ID;
 
 	constructor(
-		@IContextViewService private readonly contextViewService: IContextViewService,
+		@IUserDataProfilesService private readonly userDataProfilesService: IUserDataProfilesService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 	) {
 		super();
@@ -1039,19 +1786,11 @@ class NewProfileResourceTreeRenderer extends AbstractProfileResourceTreeRenderer
 		const container = append(parent, $('.profile-tree-item-container.new-profile-resource-type-container'));
 		const labelContainer = append(container, $('.profile-resource-type-label-container'));
 		const label = append(labelContainer, $('span.profile-resource-type-label'));
-		const selectBox = this._register(this.instantiationService.createInstance(SelectBox,
-			[],
-			0,
-			this.contextViewService,
-			defaultSelectBoxStyles,
-			{
-				useCustomDrawn: true,
-			}
-		));
-		const selectContainer = append(container, $('.profile-select-container'));
-		selectBox.render(selectContainer);
 
-		const actionsContainer = append(container, $('.profile-tree-item-actions-container'));
+		const radio = disposables.add(new Radio({ items: [] }));
+		append(append(container, $('.profile-resource-options-container')), radio.domNode);
+
+		const actionsContainer = append(container, $('.profile-resource-actions-container'));
 		const actionBar = disposables.add(this.instantiationService.createInstance(WorkbenchToolBar,
 			actionsContainer,
 			{
@@ -1060,47 +1799,83 @@ class NewProfileResourceTreeRenderer extends AbstractProfileResourceTreeRenderer
 			}
 		));
 
-		return { label, selectContainer, selectBox, actionBar, disposables, elementDisposables: disposables.add(new DisposableStore()) };
+		return { label, radio, actionBar, disposables, elementDisposables: disposables.add(new DisposableStore()) };
 	}
 
-	renderElement({ element: profileResourceTreeElement }: ITreeNode<ProfileResourceTreeElement, void>, index: number, templateData: INewProfileResourceTemplateData, height: number | undefined): void {
+	renderElement({ element: profileResourceTreeElement }: ITreeNode<ProfileContentTreeElement, void>, index: number, templateData: INewProfileResourceTemplateData, height: number | undefined): void {
 		templateData.elementDisposables.clear();
 		const { element, root } = profileResourceTreeElement;
 		if (!(root instanceof NewProfileElement)) {
 			throw new Error('NewProfileResourceTreeRenderer can only render new profile element');
 		}
-		if (!isProfileResourceTypeElement(element)) {
+		if (isString(element) || !isProfileResourceTypeElement(element)) {
 			throw new Error('Invalid profile resource element');
 		}
-		templateData.label.textContent = this.getResourceTypeTitle(element.resourceType);
-		if (root.copyFrom && root.hasResource(element.resourceType)) {
+
+		const resourceTypeTitle = this.getResourceTypeTitle(element.resourceType);
+		templateData.label.textContent = resourceTypeTitle;
+
+		const renderRadioItems = () => {
+			const options = [{
+				text: localize('default', "Default"),
+				tooltip: localize('default description', "Use {0} from the Default profile", resourceTypeTitle),
+			},
+			{
+				text: localize('none', "None"),
+				tooltip: localize('none description', "Create empty {0}", resourceTypeTitle)
+			}];
 			const copyFromName = root.getCopyFromName();
-			templateData.selectBox.setOptions([
-				{ text: localize('empty', "Empty") },
-				{ text: copyFromName ? localize('copy from', "Copy ({0})", copyFromName) : localize('copy', "Copy") },
-				{ text: localize('default', "Use Default Profile") }
-			]);
-			templateData.selectBox.select(root.getCopyFlag(element.resourceType) ? 1 : root.getFlag(element.resourceType) ? 2 : 0);
-			templateData.elementDisposables.add(templateData.selectBox.onDidSelect(option => {
-				root.setFlag(element.resourceType, option.index === 2);
-				root.setCopyFlag(element.resourceType, option.index === 1);
+			const name = copyFromName === this.userDataProfilesService.defaultProfile.name
+				? localize('copy from default', "{0} (Copy)", copyFromName)
+				: copyFromName;
+			if (root.copyFrom && name) {
+				templateData.radio.setItems([
+					{
+						text: name,
+						tooltip: name ? localize('copy from profile description', "Copy {0} from the {1} profile", resourceTypeTitle, name) : localize('copy description', "Copy"),
+					},
+					...options
+				]);
+				templateData.radio.setActiveItem(root.getCopyFlag(element.resourceType) ? 0 : root.getFlag(element.resourceType) ? 1 : 2);
+			} else {
+				templateData.radio.setItems(options);
+				templateData.radio.setActiveItem(root.getFlag(element.resourceType) ? 0 : 1);
+			}
+		};
+
+		if (root.copyFrom) {
+			templateData.elementDisposables.add(templateData.radio.onDidSelect(index => {
+				root.setFlag(element.resourceType, index === 1);
+				root.setCopyFlag(element.resourceType, index === 0);
 			}));
 		} else {
-			templateData.selectBox.setOptions([
-				{ text: localize('empty', "Empty") },
-				{ text: localize('default', "Use Default Profile") }
-			]);
-			templateData.selectBox.select(root.getFlag(element.resourceType) ? 1 : 0);
-			templateData.elementDisposables.add(templateData.selectBox.onDidSelect(option => {
-				root.setFlag(element.resourceType, option.index === 1);
+			templateData.elementDisposables.add(templateData.radio.onDidSelect(index => {
+				root.setFlag(element.resourceType, index === 0);
 			}));
 		}
-		templateData.selectBox.setEnabled(!root.disabled);
-		templateData.actionBar.setActions(element.action ? [element.action] : []);
+
+		renderRadioItems();
+		templateData.radio.setEnabled(!root.disabled && !root.previewProfile);
+		templateData.elementDisposables.add(root.onDidChange(e => {
+			if (e.disabled || e.preview) {
+				templateData.radio.setEnabled(!root.disabled && !root.previewProfile);
+			}
+			if (e.copyFrom || e.copyFromInfo) {
+				renderRadioItems();
+			}
+		}));
+		const actions: IAction[] = [];
+		if (element.openAction) {
+			actions.push(element.openAction);
+		}
+		if (element.actions?.primary) {
+			actions.push(...element.actions.primary);
+		}
+		templateData.actionBar.setActions(actions);
 	}
 }
 
-class ProfileResourceChildTreeItemRenderer extends AbstractProfileResourceTreeRenderer implements ITreeRenderer<ProfileResourceTreeElement, void, IProfileResourceChildTreeItemTemplateData> {
+class ProfileResourceChildTreeItemRenderer extends AbstractProfileResourceTreeRenderer implements ITreeRenderer<ProfileContentTreeElement, void, IProfileResourceChildTreeItemTemplateData> {
 
 	static readonly TEMPLATE_ID = 'ProfileResourceChildTreeItemTemplate';
 
@@ -1123,7 +1898,7 @@ class ProfileResourceChildTreeItemRenderer extends AbstractProfileResourceTreeRe
 		append(container, checkbox.domNode);
 		const resourceLabel = disposables.add(this.labels.create(container, { hoverDelegate: this.hoverDelegate }));
 
-		const actionsContainer = append(container, $('.profile-tree-item-actions-container'));
+		const actionsContainer = append(container, $('.profile-resource-actions-container'));
 		const actionBar = disposables.add(this.instantiationService.createInstance(WorkbenchToolBar,
 			actionsContainer,
 			{
@@ -1135,15 +1910,16 @@ class ProfileResourceChildTreeItemRenderer extends AbstractProfileResourceTreeRe
 		return { checkbox, resourceLabel, actionBar, disposables, elementDisposables: disposables.add(new DisposableStore()) };
 	}
 
-	renderElement({ element: profileResourceTreeElement }: ITreeNode<ProfileResourceTreeElement, void>, index: number, templateData: IProfileResourceChildTreeItemTemplateData, height: number | undefined): void {
+	renderElement({ element: profileResourceTreeElement }: ITreeNode<ProfileContentTreeElement, void>, index: number, templateData: IProfileResourceChildTreeItemTemplateData, height: number | undefined): void {
 		templateData.elementDisposables.clear();
 		const { element } = profileResourceTreeElement;
 
-		if (!isProfileResourceChildElement(element)) {
+		if (isString(element) || !isProfileResourceChildElement(element)) {
 			throw new Error('Invalid profile resource element');
 		}
 
 		if (element.checkbox) {
+			templateData.checkbox.domNode.setAttribute('tabindex', '0');
 			templateData.checkbox.domNode.classList.remove('hide');
 			templateData.checkbox.checked = element.checkbox.isChecked;
 			templateData.checkbox.domNode.ariaLabel = element.checkbox.accessibilityInformation?.label ?? '';
@@ -1151,12 +1927,14 @@ class ProfileResourceChildTreeItemRenderer extends AbstractProfileResourceTreeRe
 				templateData.checkbox.domNode.role = element.checkbox.accessibilityInformation.role;
 			}
 		} else {
+			templateData.checkbox.domNode.removeAttribute('tabindex');
 			templateData.checkbox.domNode.classList.add('hide');
 		}
 
 		templateData.resourceLabel.setResource(
 			{
 				name: element.resource ? basename(element.resource) : element.label,
+				description: element.description,
 				resource: element.resource
 			},
 			{
@@ -1164,11 +1942,255 @@ class ProfileResourceChildTreeItemRenderer extends AbstractProfileResourceTreeRe
 				icon: element.icon,
 				hideIcon: !element.resource && !element.icon,
 			});
-		templateData.actionBar.setActions(element.action ? [element.action] : []);
+		const actions: IAction[] = [];
+		if (element.openAction) {
+			actions.push(element.openAction);
+		}
+		if (element.actions?.primary) {
+			actions.push(...element.actions.primary);
+		}
+		templateData.actionBar.setActions(actions);
 	}
 
 }
 
+class WorkspaceUriEmptyColumnRenderer implements ITableRenderer<WorkspaceTableElement, {}> {
+	static readonly TEMPLATE_ID = 'empty';
+
+	readonly templateId: string = WorkspaceUriEmptyColumnRenderer.TEMPLATE_ID;
+
+	renderTemplate(container: HTMLElement): {} {
+		return {};
+	}
+
+	renderElement(item: WorkspaceTableElement, index: number, templateData: {}, height: number | undefined): void {
+	}
+
+	disposeTemplate(): void {
+	}
+
+}
+
+interface IWorkspaceUriHostColumnTemplateData {
+	element: HTMLElement;
+	hostContainer: HTMLElement;
+	buttonBarContainer: HTMLElement;
+	disposables: DisposableStore;
+	renderDisposables: DisposableStore;
+}
+
+class WorkspaceUriHostColumnRenderer implements ITableRenderer<WorkspaceTableElement, IWorkspaceUriHostColumnTemplateData> {
+	static readonly TEMPLATE_ID = 'host';
+
+	readonly templateId: string = WorkspaceUriHostColumnRenderer.TEMPLATE_ID;
+
+	constructor(
+		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
+		@ILabelService private readonly labelService: ILabelService,
+	) { }
+
+	renderTemplate(container: HTMLElement): IWorkspaceUriHostColumnTemplateData {
+		const disposables = new DisposableStore();
+		const renderDisposables = disposables.add(new DisposableStore());
+
+		const element = container.appendChild($('.host'));
+		const hostContainer = element.appendChild($('div.host-label'));
+		const buttonBarContainer = element.appendChild($('div.button-bar'));
+
+		return {
+			element,
+			hostContainer,
+			buttonBarContainer,
+			disposables,
+			renderDisposables
+		};
+	}
+
+	renderElement(item: WorkspaceTableElement, index: number, templateData: IWorkspaceUriHostColumnTemplateData, height: number | undefined): void {
+		templateData.renderDisposables.clear();
+		templateData.renderDisposables.add({ dispose: () => { clearNode(templateData.buttonBarContainer); } });
+
+		templateData.hostContainer.innerText = getHostLabel(this.labelService, item.workspace);
+		templateData.element.classList.toggle('current-workspace', this.uriIdentityService.extUri.isEqual(item.workspace, item.profileElement.getCurrentWorkspace()));
+
+		templateData.hostContainer.style.display = '';
+		templateData.buttonBarContainer.style.display = 'none';
+	}
+
+	disposeTemplate(templateData: IWorkspaceUriHostColumnTemplateData): void {
+		templateData.disposables.dispose();
+	}
+
+}
+
+interface IWorkspaceUriPathColumnTemplateData {
+	element: HTMLElement;
+	pathLabel: HTMLElement;
+	pathHover: IManagedHover;
+	renderDisposables: DisposableStore;
+	disposables: DisposableStore;
+}
+
+class WorkspaceUriPathColumnRenderer implements ITableRenderer<WorkspaceTableElement, IWorkspaceUriPathColumnTemplateData> {
+	static readonly TEMPLATE_ID = 'path';
+
+	readonly templateId: string = WorkspaceUriPathColumnRenderer.TEMPLATE_ID;
+
+	private readonly hoverDelegate: IHoverDelegate;
+
+	constructor(
+		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
+		@IHoverService private readonly hoverService: IHoverService,
+	) {
+		this.hoverDelegate = getDefaultHoverDelegate('mouse');
+	}
+
+	renderTemplate(container: HTMLElement): IWorkspaceUriPathColumnTemplateData {
+		const disposables = new DisposableStore();
+		const element = container.appendChild($('.path'));
+		const pathLabel = element.appendChild($('div.path-label'));
+		const pathHover = disposables.add(this.hoverService.setupManagedHover(this.hoverDelegate, pathLabel, ''));
+		const renderDisposables = disposables.add(new DisposableStore());
+
+		return {
+			element,
+			pathLabel,
+			pathHover,
+			disposables,
+			renderDisposables
+		};
+	}
+
+	renderElement(item: WorkspaceTableElement, index: number, templateData: IWorkspaceUriPathColumnTemplateData, height: number | undefined): void {
+		templateData.renderDisposables.clear();
+		const stringValue = this.formatPath(item.workspace);
+		templateData.pathLabel.innerText = stringValue;
+		templateData.element.classList.toggle('current-workspace', this.uriIdentityService.extUri.isEqual(item.workspace, item.profileElement.getCurrentWorkspace()));
+		templateData.pathHover.update(stringValue);
+	}
+
+	disposeTemplate(templateData: IWorkspaceUriPathColumnTemplateData): void {
+		templateData.disposables.dispose();
+		templateData.renderDisposables.dispose();
+	}
+
+	private formatPath(uri: URI): string {
+		if (uri.scheme === Schemas.file) {
+			return normalizeDriveLetter(uri.fsPath);
+		}
+
+		// If the path is not a file uri, but points to a windows remote, we should create windows fs path
+		// e.g. /c:/user/directory => C:\user\directory
+		if (uri.path.startsWith(posix.sep)) {
+			const pathWithoutLeadingSeparator = uri.path.substring(1);
+			const isWindowsPath = hasDriveLetter(pathWithoutLeadingSeparator, true);
+			if (isWindowsPath) {
+				return normalizeDriveLetter(win32.normalize(pathWithoutLeadingSeparator), true);
+			}
+		}
+
+		return uri.path;
+	}
+
+}
+
+interface IActionsColumnTemplateData {
+	readonly actionBar: ActionBar;
+	readonly disposables: DisposableStore;
+}
+
+class ChangeProfileAction extends Action {
+
+	constructor(
+		private readonly item: WorkspaceTableElement,
+		@IUserDataProfilesService private readonly userDataProfilesService: IUserDataProfilesService,
+	) {
+		super('changeProfile', '', ThemeIcon.asClassName(editIcon));
+		this.tooltip = localize('change profile', "Change Profile");
+	}
+
+	getSwitchProfileActions(): IAction[] {
+		return this.userDataProfilesService.profiles
+			.filter(profile => !profile.isTransient)
+			.sort((a, b) => a.isDefault ? -1 : b.isDefault ? 1 : a.name.localeCompare(b.name))
+			.map<IAction>(profile => ({
+				id: `switchProfileTo${profile.id}`,
+				label: profile.name,
+				class: undefined,
+				enabled: true,
+				checked: profile.id === this.item.profileElement.profile.id,
+				tooltip: '',
+				run: () => {
+					if (profile.id === this.item.profileElement.profile.id) {
+						return;
+					}
+					this.userDataProfilesService.updateProfile(profile, { workspaces: [...(profile.workspaces ?? []), this.item.workspace] });
+				}
+			}));
+	}
+}
+
+class WorkspaceUriActionsColumnRenderer implements ITableRenderer<WorkspaceTableElement, IActionsColumnTemplateData> {
+
+	static readonly TEMPLATE_ID = 'actions';
+
+	readonly templateId: string = WorkspaceUriActionsColumnRenderer.TEMPLATE_ID;
+
+	constructor(
+		@IUserDataProfilesService private readonly userDataProfilesService: IUserDataProfilesService,
+		@IContextMenuService private readonly contextMenuService: IContextMenuService,
+		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
+	) {
+	}
+
+	renderTemplate(container: HTMLElement): IActionsColumnTemplateData {
+		const disposables = new DisposableStore();
+		const element = container.appendChild($('.profile-workspaces-actions-container'));
+		const hoverDelegate = disposables.add(createInstantHoverDelegate());
+		const actionBar = disposables.add(new ActionBar(element, {
+			hoverDelegate,
+			actionViewItemProvider: (action) => {
+				if (action instanceof ChangeProfileAction) {
+					return new DropdownMenuActionViewItem(action, { getActions: () => action.getSwitchProfileActions() }, this.contextMenuService, {
+						classNames: action.class,
+						hoverDelegate,
+					});
+				}
+				return undefined;
+			}
+		}));
+		return { actionBar, disposables };
+	}
+
+	renderElement(item: WorkspaceTableElement, index: number, templateData: IActionsColumnTemplateData, height: number | undefined): void {
+		templateData.actionBar.clear();
+		const actions: IAction[] = [];
+		actions.push(this.createOpenAction(item));
+		actions.push(new ChangeProfileAction(item, this.userDataProfilesService));
+		templateData.actionBar.push(actions, { icon: true });
+	}
+
+	private createOpenAction(item: WorkspaceTableElement): IAction {
+		return {
+			label: '',
+			class: ThemeIcon.asClassName(Codicon.window),
+			enabled: !this.uriIdentityService.extUri.isEqual(item.workspace, item.profileElement.getCurrentWorkspace()),
+			id: 'openWorkspace',
+			tooltip: localize('open', "Open in New Window"),
+			run: () => item.profileElement.openWorkspace(item.workspace)
+		};
+	}
+
+	disposeTemplate(templateData: IActionsColumnTemplateData): void {
+		templateData.disposables.dispose();
+	}
+
+}
+
+function getHostLabel(labelService: ILabelService, workspaceUri: URI): string {
+	return workspaceUri.authority ? labelService.getHostLabel(workspaceUri.scheme, workspaceUri.authority) : localize('localAuthority', "Local");
+}
+
 export class UserDataProfilesEditorInput extends EditorInput {
 	static readonly ID: string = 'workbench.input.userDataProfiles';
 	readonly resource = undefined;
@@ -1197,6 +2219,7 @@ export class UserDataProfilesEditorInput extends EditorInput {
 	override getIcon(): ThemeIcon | undefined { return defaultUserDataProfileIcon; }
 
 	override async resolve(): Promise<UserDataProfilesEditorModel> {
+		await this.model.resolve();
 		return this.model;
 	}
 
@@ -1214,6 +2237,15 @@ export class UserDataProfilesEditorInput extends EditorInput {
 	}
 
 	override matches(otherInput: EditorInput | IUntypedEditorInput): boolean { return otherInput instanceof UserDataProfilesEditorInput; }
+
+	override dispose(): void {
+		for (const profile of this.model.profiles) {
+			if (profile instanceof UserDataProfileElement) {
+				profile.reset();
+			}
+		}
+		super.dispose();
+	}
 }
 
 export class UserDataProfilesEditorInputSerializer implements IEditorSerializer {
diff --git a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditorModel.ts b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditorModel.ts
index 3d2df24343c..6df12b9ad7c 100644
--- a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditorModel.ts
+++ b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditorModel.ts
@@ -3,54 +3,74 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Action, IAction, Separator } from 'vs/base/common/actions';
-import { Emitter } from 'vs/base/common/event';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { localize } from 'vs/nls';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { DidChangeProfilesEvent, isUserDataProfile, IUserDataProfile, IUserDataProfilesService, ProfileResourceType, ProfileResourceTypeFlags, toUserDataProfile, UseDefaultProfileFlags } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IProfileResourceChildTreeItem, IUserDataProfileImportExportService, IUserDataProfileManagementService, IUserDataProfileService, IUserDataProfileTemplate } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { Disposable, DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { equals } from 'vs/base/common/objects';
-import { EditorModel } from 'vs/workbench/common/editor/editorModel';
-import { ExtensionsResourceExportTreeItem, ExtensionsResourceImportTreeItem } from 'vs/workbench/services/userDataProfile/browser/extensionsResource';
-import { SettingsResource, SettingsResourceTreeItem } from 'vs/workbench/services/userDataProfile/browser/settingsResource';
-import { KeybindingsResource, KeybindingsResourceTreeItem } from 'vs/workbench/services/userDataProfile/browser/keybindingsResource';
-import { TasksResource, TasksResourceTreeItem } from 'vs/workbench/services/userDataProfile/browser/tasksResource';
-import { SnippetsResource, SnippetsResourceTreeItem } from 'vs/workbench/services/userDataProfile/browser/snippetsResource';
-import { Codicon } from 'vs/base/common/codicons';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
-import { IFileService } from 'vs/platform/files/common/files';
-import { generateUuid } from 'vs/base/common/uuid';
-import { CancelablePromise, createCancelablePromise, RunOnceScheduler } from 'vs/base/common/async';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { ITreeItemCheckboxState } from 'vs/workbench/common/views';
-import { API_OPEN_EDITOR_COMMAND_ID } from 'vs/workbench/browser/parts/editor/editorCommands';
-import { SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { CONFIG_NEW_WINDOW_PROFILE } from 'vs/workbench/common/configuration';
+import { Action, IAction, Separator } from '../../../../base/common/actions.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { localize } from '../../../../nls.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { DidChangeProfilesEvent, isUserDataProfile, IUserDataProfile, IUserDataProfilesService, ProfileResourceType, ProfileResourceTypeFlags, toUserDataProfile, UseDefaultProfileFlags } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { IProfileResourceChildTreeItem, IProfileTemplateInfo, isProfileURL, IUserDataProfileImportExportService, IUserDataProfileManagementService, IUserDataProfileService, IUserDataProfileTemplate } from '../../../services/userDataProfile/common/userDataProfile.js';
+import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import * as arrays from '../../../../base/common/arrays.js';
+import { equals } from '../../../../base/common/objects.js';
+import { EditorModel } from '../../../common/editor/editorModel.js';
+import { ExtensionsResourceExportTreeItem, ExtensionsResourceImportTreeItem } from '../../../services/userDataProfile/browser/extensionsResource.js';
+import { SettingsResource, SettingsResourceTreeItem } from '../../../services/userDataProfile/browser/settingsResource.js';
+import { KeybindingsResource, KeybindingsResourceTreeItem } from '../../../services/userDataProfile/browser/keybindingsResource.js';
+import { TasksResource, TasksResourceTreeItem } from '../../../services/userDataProfile/browser/tasksResource.js';
+import { SnippetsResource, SnippetsResourceTreeItem } from '../../../services/userDataProfile/browser/snippetsResource.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { InMemoryFileSystemProvider } from '../../../../platform/files/common/inMemoryFilesystemProvider.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { CancelablePromise, createCancelablePromise, RunOnceScheduler } from '../../../../base/common/async.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { ITreeItemCheckboxState } from '../../../common/views.js';
+import { API_OPEN_EDITOR_COMMAND_ID } from '../../../browser/parts/editor/editorCommands.js';
+import { SIDE_GROUP } from '../../../services/editor/common/editorService.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { CONFIG_NEW_WINDOW_PROFILE } from '../../../common/configuration.js';
+import { ResourceMap, ResourceSet } from '../../../../base/common/map.js';
+import { getErrorMessage } from '../../../../base/common/errors.js';
+import { isWeb } from '../../../../base/common/platform.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IWorkspaceContextService, WORKSPACE_SUFFIX } from '../../../../platform/workspace/common/workspace.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { isString } from '../../../../base/common/types.js';
+import { IWorkbenchExtensionManagementService } from '../../../services/extensionManagement/common/extensionManagement.js';
+import { areSameExtensions } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
 
 export type ChangeEvent = {
 	readonly name?: boolean;
 	readonly icon?: boolean;
 	readonly flags?: boolean;
+	readonly workspaces?: boolean;
 	readonly active?: boolean;
 	readonly message?: boolean;
 	readonly copyFrom?: boolean;
+	readonly copyFromInfo?: boolean;
 	readonly copyFlags?: boolean;
 	readonly preview?: boolean;
+	readonly profile?: boolean;
+	readonly extensions?: boolean;
+	readonly snippets?: boolean;
 	readonly disabled?: boolean;
 	readonly newWindowProfile?: boolean;
 };
 
 export interface IProfileChildElement {
 	readonly handle: string;
-	readonly action?: IAction;
+	readonly openAction?: IAction;
+	readonly actions?: {
+		readonly primary?: IAction[];
+		readonly contextMenu?: IAction[];
+	};
 	readonly checkbox?: ITreeItemCheckboxState;
 }
 
@@ -60,6 +80,7 @@ export interface IProfileResourceTypeElement extends IProfileChildElement {
 
 export interface IProfileResourceTypeChildElement extends IProfileChildElement {
 	readonly label: string;
+	readonly description?: string;
 	readonly resource?: URI;
 	readonly icon?: ThemeIcon;
 }
@@ -83,16 +104,23 @@ export abstract class AbstractUserDataProfileElement extends Disposable {
 		name: string,
 		icon: string | undefined,
 		flags: UseDefaultProfileFlags | undefined,
+		workspaces: readonly URI[] | undefined,
 		isActive: boolean,
 		@IUserDataProfileManagementService protected readonly userDataProfileManagementService: IUserDataProfileManagementService,
 		@IUserDataProfilesService protected readonly userDataProfilesService: IUserDataProfilesService,
 		@ICommandService protected readonly commandService: ICommandService,
+		@IWorkspaceContextService protected readonly workspaceContextService: IWorkspaceContextService,
+		@IHostService protected readonly hostService: IHostService,
+		@IUriIdentityService protected readonly uriIdentityService: IUriIdentityService,
+		@IFileService protected readonly fileService: IFileService,
+		@IWorkbenchExtensionManagementService protected readonly extensionManagementService: IWorkbenchExtensionManagementService,
 		@IInstantiationService protected readonly instantiationService: IInstantiationService,
 	) {
 		super();
 		this._name = name;
 		this._icon = icon;
 		this._flags = flags;
+		this._workspaces = workspaces;
 		this._active = isActive;
 		this._register(this.onDidChange(e => {
 			if (!e.message) {
@@ -100,6 +128,24 @@ export abstract class AbstractUserDataProfileElement extends Disposable {
 			}
 			this.save();
 		}));
+		this._register(this.extensionManagementService.onProfileAwareDidInstallExtensions(results => {
+			const profile = this.getProfileToWatch();
+			if (profile && results.some(r => !r.error && (r.applicationScoped || this.uriIdentityService.extUri.isEqual(r.profileLocation, profile.extensionsResource)))) {
+				this._onDidChange.fire({ extensions: true });
+			}
+		}));
+		this._register(this.extensionManagementService.onProfileAwareDidUninstallExtension(e => {
+			const profile = this.getProfileToWatch();
+			if (profile && !e.error && (e.applicationScoped || this.uriIdentityService.extUri.isEqual(e.profileLocation, profile.extensionsResource))) {
+				this._onDidChange.fire({ extensions: true });
+			}
+		}));
+		this._register(this.extensionManagementService.onProfileAwareDidUpdateExtensionMetadata(e => {
+			const profile = this.getProfileToWatch();
+			if (profile && e.local.isApplicationScoped || this.uriIdentityService.extUri.isEqual(e.profileLocation, profile?.extensionsResource)) {
+				this._onDidChange.fire({ extensions: true });
+			}
+		}));
 	}
 
 	private _name = '';
@@ -121,6 +167,15 @@ export abstract class AbstractUserDataProfileElement extends Disposable {
 		}
 	}
 
+	private _workspaces: readonly URI[] | undefined;
+	get workspaces(): readonly URI[] | undefined { return this._workspaces; }
+	set workspaces(workspaces: readonly URI[] | undefined) {
+		if (!arrays.equals(this._workspaces, workspaces, (a, b) => a.toString() === b.toString())) {
+			this._workspaces = workspaces;
+			this._onDidChange.fire({ workspaces: true });
+		}
+	}
+
 	private _flags: UseDefaultProfileFlags | undefined;
 	get flags(): UseDefaultProfileFlags | undefined { return this._flags; }
 	set flags(flags: UseDefaultProfileFlags | undefined) {
@@ -173,10 +228,10 @@ export abstract class AbstractUserDataProfileElement extends Disposable {
 
 	validate(): void {
 		if (!this.name) {
-			this.message = localize('profileNameRequired', "Profile name is required.");
+			this.message = localize('name required', "Profile name is required and must be a non-empty value.");
 			return;
 		}
-		if (this.name !== this.getInitialName() && this.userDataProfilesService.profiles.some(p => p.name === this.name)) {
+		if (this.shouldValidateName() && this.name !== this.getInitialName() && this.userDataProfilesService.profiles.some(p => p.name === this.name)) {
 			this.message = localize('profileExists', "Profile with name {0} already exists.", this.name);
 			return;
 		}
@@ -206,12 +261,12 @@ export abstract class AbstractUserDataProfileElement extends Disposable {
 					handle: r,
 					checkbox: undefined,
 					resourceType: r,
-					action: children.length
+					openAction: children.length
 						? new Action('_open',
 							localize('open', "Open to the Side"),
 							ThemeIcon.asClassName(Codicon.goToFile),
 							true,
-							() => children[0]?.action?.run())
+							() => children[0]?.openAction?.run())
 						: undefined
 				};
 			}));
@@ -246,20 +301,25 @@ export abstract class AbstractUserDataProfileElement extends Disposable {
 		return children.map<IProfileResourceTypeChildElement>(child => this.toUserDataProfileResourceChildElement(child));
 	}
 
-	protected toUserDataProfileResourceChildElement(child: IProfileResourceChildTreeItem): IProfileResourceTypeChildElement {
+	protected toUserDataProfileResourceChildElement(child: IProfileResourceChildTreeItem, primaryActions?: IAction[], contextMenuActions?: IAction[]): IProfileResourceTypeChildElement {
 		return {
 			handle: child.handle,
 			checkbox: child.checkbox,
 			label: child.label?.label ?? '',
+			description: isString(child.description) ? child.description : undefined,
 			resource: URI.revive(child.resourceUri),
 			icon: child.themeIcon,
-			action: new Action('_openChild', localize('open', "Open to the Side"), ThemeIcon.asClassName(Codicon.goToFile), true, async () => {
+			openAction: new Action('_openChild', localize('open', "Open to the Side"), ThemeIcon.asClassName(Codicon.goToFile), true, async () => {
 				if (child.parent.type === ProfileResourceType.Extensions) {
 					await this.commandService.executeCommand('extension.open', child.handle, undefined, true, undefined, true);
 				} else if (child.resourceUri) {
 					await this.commandService.executeCommand(API_OPEN_EDITOR_COMMAND_ID, child.resourceUri, [SIDE_GROUP], undefined);
 				}
-			})
+			}),
+			actions: {
+				primary: primaryActions,
+				contextMenu: contextMenuActions,
+			}
 		};
 
 	}
@@ -268,6 +328,23 @@ export abstract class AbstractUserDataProfileElement extends Disposable {
 		return '';
 	}
 
+	shouldValidateName(): boolean {
+		return true;
+	}
+
+	getCurrentWorkspace(): URI | undefined {
+		const workspace = this.workspaceContextService.getWorkspace();
+		return workspace.configuration ?? workspace.folders[0]?.uri;
+	}
+
+	openWorkspace(workspace: URI): void {
+		if (this.uriIdentityService.extUri.extname(workspace) === WORKSPACE_SUFFIX) {
+			this.hostService.openWindow([{ workspaceUri: workspace }], { forceNewWindow: true });
+		} else {
+			this.hostService.openWindow([{ folderUri: workspace }], { forceNewWindow: true });
+		}
+	}
+
 	save(): void {
 		this.saveScheduler.schedule();
 	}
@@ -282,6 +359,9 @@ export abstract class AbstractUserDataProfileElement extends Disposable {
 		if (!equals(this.flags ?? {}, profile.useDefaultFlags ?? {})) {
 			return true;
 		}
+		if (!arrays.equals(this.workspaces ?? [], profile.workspaces ?? [], (a, b) => a.toString() === b.toString())) {
+			return true;
+		}
 		return false;
 	}
 
@@ -300,15 +380,16 @@ export abstract class AbstractUserDataProfileElement extends Disposable {
 		return await this.userDataProfileManagementService.updateProfile(profile, {
 			name: this.name,
 			icon: this.icon,
-			useDefaultFlags: profile.useDefaultFlags && !useDefaultFlags ? {} : useDefaultFlags
+			useDefaultFlags: profile.useDefaultFlags && !useDefaultFlags ? {} : useDefaultFlags,
+			workspaces: this.workspaces
 		});
 	}
 
 	abstract readonly titleButtons: [Action[], Action[]];
-	abstract readonly titleActions: [IAction[], IAction[]];
 	abstract readonly actions: [IAction[], IAction[]];
 
 	protected abstract doSave(): Promise<void>;
+	protected abstract getProfileToWatch(): IUserDataProfile | undefined;
 }
 
 export class UserDataProfileElement extends AbstractUserDataProfileElement {
@@ -318,23 +399,33 @@ export class UserDataProfileElement extends AbstractUserDataProfileElement {
 	constructor(
 		private _profile: IUserDataProfile,
 		readonly titleButtons: [Action[], Action[]],
-		readonly titleActions: [IAction[], IAction[]],
 		readonly actions: [IAction[], IAction[]],
 		@IUserDataProfileService private readonly userDataProfileService: IUserDataProfileService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IUserDataProfileManagementService userDataProfileManagementService: IUserDataProfileManagementService,
 		@IUserDataProfilesService userDataProfilesService: IUserDataProfilesService,
 		@ICommandService commandService: ICommandService,
+		@IWorkspaceContextService workspaceContextService: IWorkspaceContextService,
+		@IHostService hostService: IHostService,
+		@IUriIdentityService uriIdentityService: IUriIdentityService,
+		@IFileService fileService: IFileService,
+		@IWorkbenchExtensionManagementService extensionManagementService: IWorkbenchExtensionManagementService,
 		@IInstantiationService instantiationService: IInstantiationService,
 	) {
 		super(
 			_profile.name,
 			_profile.icon,
 			_profile.useDefaultFlags,
+			_profile.workspaces,
 			userDataProfileService.currentProfile.id === _profile.id,
 			userDataProfileManagementService,
 			userDataProfilesService,
 			commandService,
+			workspaceContextService,
+			hostService,
+			uriIdentityService,
+			fileService,
+			extensionManagementService,
 			instantiationService,
 		);
 		this._isNewWindowProfile = this.configurationService.getValue(CONFIG_NEW_WINDOW_PROFILE) === this.profile.name;
@@ -345,15 +436,42 @@ export class UserDataProfileElement extends AbstractUserDataProfileElement {
 		}
 		));
 		this._register(this.userDataProfileService.onDidChangeCurrentProfile(() => this.active = this.userDataProfileService.currentProfile.id === this.profile.id));
-		this._register(this.userDataProfilesService.onDidChangeProfiles(() => {
-			const profile = this.userDataProfilesService.profiles.find(p => p.id === this.profile.id);
+		this._register(this.userDataProfilesService.onDidChangeProfiles(({ updated }) => {
+			const profile = updated.find(p => p.id === this.profile.id);
 			if (profile) {
 				this._profile = profile;
-				this.name = profile.name;
-				this.icon = profile.icon;
-				this.flags = profile.useDefaultFlags;
+				this.reset();
+				this._onDidChange.fire({ profile: true });
 			}
 		}));
+		this._register(fileService.watch(this.profile.snippetsHome));
+		this._register(fileService.onDidFilesChange(e => {
+			if (e.affects(this.profile.snippetsHome)) {
+				this._onDidChange.fire({ snippets: true });
+			}
+		}));
+	}
+
+	protected getProfileToWatch(): IUserDataProfile | undefined {
+		return this.profile;
+	}
+
+	reset(): void {
+		this.name = this._profile.name;
+		this.icon = this._profile.icon;
+		this.flags = this._profile.useDefaultFlags;
+		this.workspaces = this._profile.workspaces;
+	}
+
+	public updateWorkspaces(toAdd: URI[], toRemove: URI[]): void {
+		const workspaces = new ResourceSet(this.workspaces ?? []);
+		for (const workspace of toAdd) {
+			workspaces.add(workspace);
+		}
+		for (const workspace of toRemove) {
+			workspaces.delete(workspace);
+		}
+		this.workspaces = [...workspaces.values()];
 	}
 
 	public async toggleNewWindowProfile(): Promise<void> {
@@ -373,11 +491,42 @@ export class UserDataProfileElement extends AbstractUserDataProfileElement {
 		}
 	}
 
+	public async toggleCurrentWindowProfile(): Promise<void> {
+		if (this.userDataProfileService.currentProfile.id === this.profile.id) {
+			await this.userDataProfileManagementService.switchProfile(this.userDataProfilesService.defaultProfile);
+		} else {
+			await this.userDataProfileManagementService.switchProfile(this.profile);
+		}
+	}
+
 	protected override async doSave(): Promise<void> {
 		await this.saveProfile(this.profile);
 	}
 
 	protected override async getChildrenForResourceType(resourceType: ProfileResourceType): Promise<IProfileChildElement[]> {
+		if (resourceType === ProfileResourceType.Extensions) {
+			const children = await this.instantiationService.createInstance(ExtensionsResourceExportTreeItem, this.profile).getChildren();
+			return children.map<IProfileResourceTypeChildElement>(child =>
+				this.toUserDataProfileResourceChildElement(
+					child,
+					undefined,
+					[{
+						id: 'applyToAllProfiles',
+						label: localize('applyToAllProfiles', "Apply Extension to all Profiles"),
+						checked: child.applicationScoped,
+						enabled: true,
+						class: '',
+						tooltip: '',
+						run: async () => {
+							const extensions = await this.extensionManagementService.getInstalled(undefined, this.profile.extensionsResource);
+							const extension = extensions.find(e => areSameExtensions(e.identifier, child.identifier));
+							if (extension) {
+								await this.extensionManagementService.toggleAppliationScope(extension, this.profile.extensionsResource);
+							}
+						}
+					}]
+				));
+		}
 		return this.getChildrenFromProfile(this.profile, resourceType);
 	}
 
@@ -391,36 +540,58 @@ const USER_DATA_PROFILE_TEMPLATE_PREVIEW_SCHEME = 'userdataprofiletemplateprevie
 
 export class NewProfileElement extends AbstractUserDataProfileElement {
 
+	private _copyFromTemplates = new ResourceMap<string>();
+	get copyFromTemplates(): ResourceMap<string> { return this._copyFromTemplates; }
+
 	private templatePromise: CancelablePromise<void> | undefined;
 	private template: IUserDataProfileTemplate | null = null;
 
+	private defaultName: string;
+	private defaultIcon: string | undefined;
+
 	constructor(
 		name: string,
 		copyFrom: URI | IUserDataProfile | undefined,
 		readonly titleButtons: [Action[], Action[]],
-		readonly titleActions: [IAction[], IAction[]],
 		readonly actions: [IAction[], IAction[]],
-		@IFileService private readonly fileService: IFileService,
+
 		@IUserDataProfileImportExportService private readonly userDataProfileImportExportService: IUserDataProfileImportExportService,
 		@IUserDataProfileManagementService userDataProfileManagementService: IUserDataProfileManagementService,
 		@IUserDataProfilesService userDataProfilesService: IUserDataProfilesService,
 		@ICommandService commandService: ICommandService,
+		@IWorkspaceContextService workspaceContextService: IWorkspaceContextService,
+		@IHostService hostService: IHostService,
+		@IUriIdentityService uriIdentityService: IUriIdentityService,
+		@IFileService fileService: IFileService,
+		@IWorkbenchExtensionManagementService extensionManagementService: IWorkbenchExtensionManagementService,
 		@IInstantiationService instantiationService: IInstantiationService,
 	) {
 		super(
 			name,
 			undefined,
 			undefined,
+			undefined,
 			false,
 			userDataProfileManagementService,
 			userDataProfilesService,
 			commandService,
+			workspaceContextService,
+			hostService,
+			uriIdentityService,
+			fileService,
+			extensionManagementService,
 			instantiationService,
 		);
+		this.defaultName = name;
 		this._copyFrom = copyFrom;
 		this._copyFlags = this.getCopyFlagsFrom(copyFrom);
 		this.initialize();
 		this._register(this.fileService.registerProvider(USER_DATA_PROFILE_TEMPLATE_PREVIEW_SCHEME, this._register(new InMemoryFileSystemProvider())));
+		this._register(toDisposable(() => {
+			if (this.previewProfile) {
+				this.userDataProfilesService.removeProfile(this.previewProfile);
+			}
+		}));
 	}
 
 	private _copyFrom: IUserDataProfile | URI | undefined;
@@ -448,15 +619,32 @@ export class NewProfileElement extends AbstractUserDataProfileElement {
 		}
 	}
 
+	private readonly previewProfileWatchDisposables = this._register(new DisposableStore());
 	private _previewProfile: IUserDataProfile | undefined;
 	get previewProfile(): IUserDataProfile | undefined { return this._previewProfile; }
 	set previewProfile(profile: IUserDataProfile | undefined) {
 		if (this._previewProfile !== profile) {
 			this._previewProfile = profile;
 			this._onDidChange.fire({ preview: true });
+			this.previewProfileWatchDisposables.clear();
+			if (this._previewProfile) {
+				this.previewProfileWatchDisposables.add(this.fileService.watch(this._previewProfile.snippetsHome));
+				this.previewProfileWatchDisposables.add(this.fileService.onDidFilesChange(e => {
+					if (!this._previewProfile) {
+						return;
+					}
+					if (e.affects(this._previewProfile.snippetsHome)) {
+						this._onDidChange.fire({ snippets: true });
+					}
+				}));
+			}
 		}
 	}
 
+	protected getProfileToWatch(): IUserDataProfile | undefined {
+		return this.previewProfile;
+	}
+
 	private getCopyFlagsFrom(copyFrom: URI | IUserDataProfile | undefined): ProfileResourceTypeFlags | undefined {
 		return copyFrom ? {
 			settings: true,
@@ -473,35 +661,51 @@ export class NewProfileElement extends AbstractUserDataProfileElement {
 			if (this.copyFrom instanceof URI) {
 				await this.resolveTemplate(this.copyFrom);
 				if (this.template) {
-					this.name = this.template.name ?? '';
-					this.icon = this.template.icon;
+					this.copyFromTemplates.set(this.copyFrom, this.template.name);
+					if (this.defaultName === this.name) {
+						this.name = this.defaultName = this.template.name ?? '';
+					}
+					if (this.defaultIcon === this.icon) {
+						this.icon = this.defaultIcon = this.template.icon;
+					}
 					this.setCopyFlag(ProfileResourceType.Settings, !!this.template.settings);
 					this.setCopyFlag(ProfileResourceType.Keybindings, !!this.template.keybindings);
 					this.setCopyFlag(ProfileResourceType.Tasks, !!this.template.tasks);
 					this.setCopyFlag(ProfileResourceType.Snippets, !!this.template.snippets);
 					this.setCopyFlag(ProfileResourceType.Extensions, !!this.template.extensions);
+					this._onDidChange.fire({ copyFromInfo: true });
 				}
 				return;
 			}
 
 			if (isUserDataProfile(this.copyFrom)) {
-				this.name = `${this.copyFrom.name} (Copy)`;
-				this.icon = this.copyFrom.icon;
+				if (this.defaultName === this.name) {
+					this.name = this.defaultName = localize('copy from', "{0} (Copy)", this.copyFrom.name);
+				}
+				if (this.defaultIcon === this.icon) {
+					this.icon = this.defaultIcon = this.copyFrom.icon;
+				}
 				this.setCopyFlag(ProfileResourceType.Settings, true);
 				this.setCopyFlag(ProfileResourceType.Keybindings, true);
 				this.setCopyFlag(ProfileResourceType.Tasks, true);
 				this.setCopyFlag(ProfileResourceType.Snippets, true);
 				this.setCopyFlag(ProfileResourceType.Extensions, true);
+				this._onDidChange.fire({ copyFromInfo: true });
 				return;
 			}
 
-			this.name = localize('untitled', "Untitled");
-			this.icon = undefined;
+			if (this.defaultName === this.name) {
+				this.name = this.defaultName = localize('untitled', "Untitled");
+			}
+			if (this.defaultIcon === this.icon) {
+				this.icon = this.defaultIcon = undefined;
+			}
 			this.setCopyFlag(ProfileResourceType.Settings, false);
 			this.setCopyFlag(ProfileResourceType.Keybindings, false);
 			this.setCopyFlag(ProfileResourceType.Tasks, false);
 			this.setCopyFlag(ProfileResourceType.Snippets, false);
 			this.setCopyFlag(ProfileResourceType.Extensions, false);
+			this._onDidChange.fire({ copyFromInfo: true });
 		} finally {
 			this.disabled = false;
 		}
@@ -552,8 +756,8 @@ export class NewProfileElement extends AbstractUserDataProfileElement {
 		if (isUserDataProfile(this.copyFrom)) {
 			return this.copyFrom.name;
 		}
-		if (this.template) {
-			return this.template.name;
+		if (this.copyFrom instanceof URI) {
+			return this.copyFromTemplates.get(this.copyFrom);
 		}
 		return undefined;
 	}
@@ -565,6 +769,9 @@ export class NewProfileElement extends AbstractUserDataProfileElement {
 		if (!this.getCopyFlag(resourceType)) {
 			return [];
 		}
+		if (this.previewProfile) {
+			return this.getChildrenFromProfile(this.previewProfile, resourceType);
+		}
 		if (this.copyFrom instanceof URI) {
 			await this.resolveTemplate(this.copyFrom);
 			if (!this.template) {
@@ -615,6 +822,10 @@ export class NewProfileElement extends AbstractUserDataProfileElement {
 		return [];
 	}
 
+	override shouldValidateName(): boolean {
+		return !this.copyFrom;
+	}
+
 	override getInitialName(): string {
 		return this.previewProfile?.name ?? '';
 	}
@@ -665,6 +876,8 @@ export class UserDataProfilesEditorModel extends EditorModel {
 	private _onDidChange = this._register(new Emitter<AbstractUserDataProfileElement | undefined>());
 	readonly onDidChange = this._onDidChange.event;
 
+	private templates: Promise<readonly IProfileTemplateInfo[]> | undefined;
+
 	constructor(
 		@IUserDataProfileService private readonly userDataProfileService: IUserDataProfileService,
 		@IUserDataProfilesService private readonly userDataProfilesService: IUserDataProfilesService,
@@ -673,6 +886,8 @@ export class UserDataProfilesEditorModel extends EditorModel {
 		@IDialogService private readonly dialogService: IDialogService,
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@IHostService private readonly hostService: IHostService,
+		@IProductService private readonly productService: IProductService,
+		@IOpenerService private readonly openerService: IOpenerService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 	) {
 		super();
@@ -686,8 +901,10 @@ export class UserDataProfilesEditorModel extends EditorModel {
 	}
 
 	private onDidChangeProfiles(e: DidChangeProfilesEvent): void {
+		let changed = false;
 		for (const profile of e.added) {
 			if (!profile.isTransient && profile.name !== this.newProfileElement?.name) {
+				changed = true;
 				this._profiles.push(this.createProfileElement(profile));
 			}
 		}
@@ -697,10 +914,20 @@ export class UserDataProfilesEditorModel extends EditorModel {
 			}
 			const index = this._profiles.findIndex(([p]) => p instanceof UserDataProfileElement && p.profile.id === profile.id);
 			if (index !== -1) {
+				changed = true;
 				this._profiles.splice(index, 1).map(([, disposables]) => disposables.dispose());
 			}
 		}
-		this._onDidChange.fire(undefined);
+		if (changed) {
+			this._onDidChange.fire(undefined);
+		}
+	}
+
+	getTemplates(): Promise<readonly IProfileTemplateInfo[]> {
+		if (!this.templates) {
+			this.templates = this.userDataProfileManagementService.getBuiltinProfileTemplates();
+		}
+		return this.templates;
 	}
 
 	private createProfileElement(profile: IUserDataProfile): [UserDataProfileElement, DisposableStore] {
@@ -708,17 +935,17 @@ export class UserDataProfilesEditorModel extends EditorModel {
 
 		const activateAction = disposables.add(new Action(
 			'userDataProfile.activate',
-			localize('active', "Use for Current Window"),
+			localize('active', "Use this Profile for Current Window"),
 			ThemeIcon.asClassName(Codicon.check),
 			true,
-			() => this.userDataProfileManagementService.switchProfile(profile)
+			() => this.userDataProfileManagementService.switchProfile(profileElement.profile)
 		));
 
 		const copyFromProfileAction = disposables.add(new Action(
 			'userDataProfile.copyFromProfile',
 			localize('copyFromProfile', "Duplicate..."),
 			ThemeIcon.asClassName(Codicon.copy),
-			true, () => this.createNewProfile(profile)
+			true, () => this.createNewProfile(profileElement.profile)
 		));
 
 		const exportAction = disposables.add(new Action(
@@ -726,7 +953,7 @@ export class UserDataProfilesEditorModel extends EditorModel {
 			localize('export', "Export..."),
 			ThemeIcon.asClassName(Codicon.export),
 			true,
-			() => this.exportProfile(profile)
+			() => this.userDataProfileImportExportService.exportProfile(profile)
 		));
 
 		const deleteAction = disposables.add(new Action(
@@ -734,40 +961,21 @@ export class UserDataProfilesEditorModel extends EditorModel {
 			localize('delete', "Delete"),
 			ThemeIcon.asClassName(Codicon.trash),
 			true,
-			() => this.removeProfile(profile)
+			() => this.removeProfile(profileElement.profile)
 		));
 
 		const newWindowAction = disposables.add(new Action(
 			'userDataProfile.newWindow',
-			localize('open new window', "Open"),
+			localize('open new window', "Open New Window with this Profile"),
 			ThemeIcon.asClassName(Codicon.emptyWindow),
 			true,
-			() => this.openWindow(profile)
+			() => this.openWindow(profileElement.profile)
 		));
 
-		const useAsNewWindowProfileAction = disposables.add(new Action(
-			'userDataProfile.useAsNewWindowProfile',
-			localize('use as new window', "Use for New Windows", profile.name),
-			undefined,
-			true,
-			() => profileElement.toggleNewWindowProfile()
-		));
-
-		const titlePrimaryActions: IAction[] = [];
-		const titleSecondaryActions: IAction[] = [];
-		titleSecondaryActions.push(copyFromProfileAction);
-		titleSecondaryActions.push(exportAction);
-		if (!profile.isDefault) {
-			titleSecondaryActions.push(new Separator());
-			titleSecondaryActions.push(deleteAction);
-		}
-
 		const primaryActions: IAction[] = [];
+		primaryActions.push(activateAction);
 		primaryActions.push(newWindowAction);
 		const secondaryActions: IAction[] = [];
-		secondaryActions.push(activateAction);
-		secondaryActions.push(useAsNewWindowProfileAction);
-		secondaryActions.push(new Separator());
 		secondaryActions.push(copyFromProfileAction);
 		secondaryActions.push(exportAction);
 		if (!profile.isDefault) {
@@ -777,30 +985,46 @@ export class UserDataProfilesEditorModel extends EditorModel {
 
 		const profileElement = disposables.add(this.instantiationService.createInstance(UserDataProfileElement,
 			profile,
-			[[newWindowAction], []],
-			[titlePrimaryActions, titleSecondaryActions],
+			[[], []],
 			[primaryActions, secondaryActions]
 		));
 
-		activateAction.checked = this.userDataProfileService.currentProfile.id === profile.id;
+		activateAction.enabled = this.userDataProfileService.currentProfile.id !== profileElement.profile.id;
 		disposables.add(this.userDataProfileService.onDidChangeCurrentProfile(() =>
-			activateAction.checked = this.userDataProfileService.currentProfile.id === profile.id));
-
-		useAsNewWindowProfileAction.checked = profileElement.isNewWindowProfile;
-		disposables.add(profileElement.onDidChange(e => {
-			if (e.newWindowProfile) {
-				useAsNewWindowProfileAction.checked = profileElement.isNewWindowProfile;
-			}
-		}));
+			activateAction.enabled = this.userDataProfileService.currentProfile.id !== profileElement.profile.id));
 
 		return [profileElement, disposables];
 	}
 
-	createNewProfile(copyFrom?: URI | IUserDataProfile): AbstractUserDataProfileElement {
+	async createNewProfile(copyFrom?: URI | IUserDataProfile): Promise<AbstractUserDataProfileElement | undefined> {
+		if (this.newProfileElement) {
+			const result = await this.dialogService.confirm({
+				type: 'info',
+				message: localize('new profile exists', "A new profile is already being created. Do you want to discard it and create a new one?"),
+				primaryButton: localize('discard', "Discard & Create"),
+				cancelButton: localize('cancel', "Cancel")
+			});
+			if (!result.confirmed) {
+				return;
+			}
+			this.revert();
+		}
+
+		if (copyFrom instanceof URI) {
+			try {
+				await this.userDataProfileImportExportService.resolveProfileTemplate(copyFrom);
+			} catch (error) {
+				this.dialogService.error(getErrorMessage(error));
+				return;
+			}
+		}
+
 		if (!this.newProfileElement) {
 			const disposables = new DisposableStore();
 			const cancellationTokenSource = new CancellationTokenSource();
 			disposables.add(toDisposable(() => cancellationTokenSource.dispose(true)));
+			const primaryActions: Action[] = [];
+			const secondaryActions: Action[] = [];
 			const createAction = disposables.add(new Action(
 				'userDataProfile.create',
 				localize('create', "Create"),
@@ -808,13 +1032,24 @@ export class UserDataProfilesEditorModel extends EditorModel {
 				true,
 				() => this.saveNewProfile(false, cancellationTokenSource.token)
 			));
+			primaryActions.push(createAction);
+			if (isWeb && copyFrom instanceof URI && isProfileURL(copyFrom)) {
+				primaryActions.push(new Action(
+					'userDataProfile.createInDesktop',
+					localize('import in desktop', "Create in {0}", this.productService.nameLong),
+					undefined,
+					true,
+					() => this.openerService.open(copyFrom, { openExternal: true })
+				));
+			}
 			const cancelAction = disposables.add(new Action(
 				'userDataProfile.cancel',
 				localize('cancel', "Cancel"),
-				ThemeIcon.asClassName(Codicon.close),
+				ThemeIcon.asClassName(Codicon.trash),
 				true,
 				() => this.discardNewProfile()
 			));
+			secondaryActions.push(cancelAction);
 			const previewProfileAction = disposables.add(new Action(
 				'userDataProfile.preview',
 				localize('preview', "Preview"),
@@ -822,21 +1057,44 @@ export class UserDataProfilesEditorModel extends EditorModel {
 				true,
 				() => this.previewNewProfile(cancellationTokenSource.token)
 			));
+			secondaryActions.push(previewProfileAction);
+			const exportAction = disposables.add(new Action(
+				'userDataProfile.export',
+				localize('export', "Export..."),
+				ThemeIcon.asClassName(Codicon.export),
+				isUserDataProfile(copyFrom),
+				() => this.exportNewProfile(cancellationTokenSource.token)
+			));
 			this.newProfileElement = disposables.add(this.instantiationService.createInstance(NewProfileElement,
 				copyFrom ? '' : localize('untitled', "Untitled"),
 				copyFrom,
-				[[createAction], [cancelAction, previewProfileAction]],
-				[[], []],
-				[[cancelAction], []],
+				[primaryActions, secondaryActions],
+				[[cancelAction], [exportAction]],
 			));
+			const updateCreateActionLabel = () => {
+				if (createAction.enabled) {
+					if (this.newProfileElement?.copyFrom && this.userDataProfilesService.profiles.some(p => !p.isTransient && p.name === this.newProfileElement?.name)) {
+						createAction.label = localize('replace', "Replace");
+					} else {
+						createAction.label = localize('create', "Create");
+					}
+				}
+			};
+			updateCreateActionLabel();
 			disposables.add(this.newProfileElement.onDidChange(e => {
-				if (e.preview) {
-					previewProfileAction.checked = !!this.newProfileElement?.previewProfile;
+				if (e.preview || e.disabled || e.message) {
+					createAction.enabled = !this.newProfileElement?.disabled && !this.newProfileElement?.message;
+					previewProfileAction.enabled = !this.newProfileElement?.previewProfile && !this.newProfileElement?.disabled && !this.newProfileElement?.message;
 				}
-				if (e.disabled || e.message) {
-					previewProfileAction.enabled = createAction.enabled = !this.newProfileElement?.disabled && !this.newProfileElement?.message;
+				if (e.name || e.copyFrom) {
+					updateCreateActionLabel();
+					exportAction.enabled = isUserDataProfile(this.newProfileElement?.copyFrom);
 				}
 			}));
+			disposables.add(this.userDataProfilesService.onDidChangeProfiles((e) => {
+				updateCreateActionLabel();
+				this.newProfileElement?.validate();
+			}));
 			this._profiles.push([this.newProfileElement, disposables]);
 			this._onDidChange.fire(this.newProfileElement);
 		}
@@ -868,10 +1126,35 @@ export class UserDataProfilesEditorModel extends EditorModel {
 		const profile = await this.saveNewProfile(true, token);
 		if (profile) {
 			this.newProfileElement.previewProfile = profile;
-			await this.openWindow(profile);
+			if (isWeb) {
+				await this.userDataProfileManagementService.switchProfile(profile);
+			} else {
+				await this.openWindow(profile);
+			}
 		}
 	}
 
+	private async exportNewProfile(token: CancellationToken): Promise<void> {
+		if (!this.newProfileElement) {
+			return;
+		}
+		if (!isUserDataProfile(this.newProfileElement.copyFrom)) {
+			return;
+		}
+		const profile = toUserDataProfile(
+			generateUuid(),
+			this.newProfileElement.name,
+			this.newProfileElement.copyFrom.location,
+			this.newProfileElement.copyFrom.cacheHome,
+			{
+				icon: this.newProfileElement.icon,
+				useDefaultFlags: this.newProfileElement.flags,
+			},
+			this.userDataProfilesService.defaultProfile
+		);
+		await this.userDataProfileImportExportService.exportProfile(profile, this.newProfileElement.copyFlags);
+	}
+
 	async saveNewProfile(transient?: boolean, token?: CancellationToken): Promise<IUserDataProfile | undefined> {
 		if (!this.newProfileElement) {
 			return undefined;
@@ -960,7 +1243,12 @@ export class UserDataProfilesEditorModel extends EditorModel {
 
 		if (profile && !profile.isTransient && this.newProfileElement) {
 			this.removeNewProfile();
-			this.onDidChangeProfiles({ added: [profile], removed: [], updated: [], all: this.userDataProfilesService.profiles });
+			const existing = this._profiles.find(([p]) => p.name === profile.name);
+			if (existing) {
+				this._onDidChange.fire(existing[0]);
+			} else {
+				this.onDidChangeProfiles({ added: [profile], removed: [], updated: [], all: this.userDataProfilesService.profiles });
+			}
 		}
 
 		return profile;
@@ -972,6 +1260,7 @@ export class UserDataProfilesEditorModel extends EditorModel {
 		}
 		if (this.newProfileElement.previewProfile) {
 			await this.userDataProfileManagementService.removeProfile(this.newProfileElement.previewProfile);
+			return;
 		}
 		this.removeNewProfile();
 		this._onDidChange.fire(undefined);
@@ -992,8 +1281,4 @@ export class UserDataProfilesEditorModel extends EditorModel {
 	private async openWindow(profile: IUserDataProfile): Promise<void> {
 		await this.hostService.openWindow({ forceProfile: profile.name });
 	}
-
-	private async exportProfile(profile: IUserDataProfile): Promise<void> {
-		return this.userDataProfileImportExportService.exportProfile(profile);
-	}
 }
diff --git a/src/vs/workbench/contrib/userDataProfile/common/userDataProfile.ts b/src/vs/workbench/contrib/userDataProfile/common/userDataProfile.ts
index d816f4ee1c3..50cb2f0ac8b 100644
--- a/src/vs/workbench/contrib/userDataProfile/common/userDataProfile.ts
+++ b/src/vs/workbench/contrib/userDataProfile/common/userDataProfile.ts
@@ -3,8 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IEditorPane } from 'vs/workbench/common/editor';
+import { URI } from '../../../../base/common/uri.js';
+import { IUserDataProfile } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { IEditorPane } from '../../../common/editor.js';
 
 export interface IUserDataProfilesEditor extends IEditorPane {
-
+	createNewProfile(copyFrom?: URI | IUserDataProfile): Promise<void>;
+	selectProfile(profile: IUserDataProfile): void;
 }
diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.contribution.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.contribution.ts
index 64c68ee02e6..3da71ce186d 100644
--- a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.contribution.ts
+++ b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.contribution.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { UserDataSyncWorkbenchContribution } from 'vs/workbench/contrib/userDataSync/browser/userDataSync';
-import { IUserDataAutoSyncService, UserDataSyncError, UserDataSyncErrorCode } from 'vs/platform/userDataSync/common/userDataSync';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { localize } from 'vs/nls';
-import { isWeb } from 'vs/base/common/platform';
-import { UserDataSyncTrigger } from 'vs/workbench/contrib/userDataSync/browser/userDataSyncTrigger';
-import { Action } from 'vs/base/common/actions';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { SHOW_SYNC_LOG_COMMAND_ID } from 'vs/workbench/services/userDataSync/common/userDataSync';
+import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from '../../../common/contributions.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { UserDataSyncWorkbenchContribution } from './userDataSync.js';
+import { IUserDataAutoSyncService, UserDataSyncError, UserDataSyncErrorCode } from '../../../../platform/userDataSync/common/userDataSync.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { localize } from '../../../../nls.js';
+import { isWeb } from '../../../../base/common/platform.js';
+import { UserDataSyncTrigger } from './userDataSyncTrigger.js';
+import { Action } from '../../../../base/common/actions.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { SHOW_SYNC_LOG_COMMAND_ID } from '../../../services/userDataSync/common/userDataSync.js';
 
 class UserDataSyncReportIssueContribution extends Disposable implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
index 60678809819..6d34c31743d 100644
--- a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
+++ b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
@@ -3,57 +3,57 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Action } from 'vs/base/common/actions';
-import { getErrorMessage, isCancellationError } from 'vs/base/common/errors';
-import { Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore, MutableDisposable, toDisposable, IDisposable } from 'vs/base/common/lifecycle';
-import { isEqual } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import type { ITextModel } from 'vs/editor/common/model';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ITextModelContentProvider, ITextModelService } from 'vs/editor/common/services/resolverService';
-import { localize, localize2 } from 'vs/nls';
-import { MenuId, MenuRegistry, registerAction2, Action2 } from 'vs/platform/actions/common/actions';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { ContextKeyExpr, ContextKeyTrueExpr, IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { QuickPickItem, IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { Action } from '../../../../base/common/actions.js';
+import { getErrorMessage, isCancellationError } from '../../../../base/common/errors.js';
+import { Event } from '../../../../base/common/event.js';
+import { Disposable, DisposableStore, MutableDisposable, toDisposable, IDisposable } from '../../../../base/common/lifecycle.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
+import type { ITextModel } from '../../../../editor/common/model.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { ITextModelContentProvider, ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { MenuId, MenuRegistry, registerAction2, Action2 } from '../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { ContextKeyExpr, ContextKeyTrueExpr, IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { QuickPickItem, IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import {
 	IUserDataAutoSyncService, IUserDataSyncService, registerConfiguration,
 	SyncResource, SyncStatus, UserDataSyncError, UserDataSyncErrorCode, USER_DATA_SYNC_SCHEME, IUserDataSyncEnablementService,
 	IResourcePreview, IUserDataSyncStoreManagementService, UserDataSyncStoreType, IUserDataSyncStore, IUserDataSyncResourceConflicts, IUserDataSyncResource, IUserDataSyncResourceError, USER_DATA_SYNC_LOG_ID
-} from 'vs/platform/userDataSync/common/userDataSync';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { EditorResourceAccessor, SideBySideEditor } from 'vs/workbench/common/editor';
-import { IOutputService } from 'vs/workbench/services/output/common/output';
-import { IActivityService, IBadge, NumberBadge, ProgressBadge } from 'vs/workbench/services/activity/common/activity';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
-import { fromNow } from 'vs/base/common/date';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IAuthenticationService } from 'vs/workbench/services/authentication/common/authentication';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { ViewContainerLocation, IViewContainersRegistry, Extensions, ViewContainer } from 'vs/workbench/common/views';
-import { UserDataSyncDataViews } from 'vs/workbench/contrib/userDataSync/browser/userDataSyncViews';
-import { IUserDataSyncWorkbenchService, getSyncAreaLabel, AccountStatus, CONTEXT_SYNC_STATE, CONTEXT_SYNC_ENABLEMENT, CONTEXT_ACCOUNT_STATE, CONFIGURE_SYNC_COMMAND_ID, SHOW_SYNC_LOG_COMMAND_ID, SYNC_VIEW_CONTAINER_ID, SYNC_TITLE, SYNC_VIEW_ICON, CONTEXT_HAS_CONFLICTS, DOWNLOAD_ACTIVITY_ACTION_DESCRIPTOR } from 'vs/workbench/services/userDataSync/common/userDataSync';
-import { Codicon } from 'vs/base/common/codicons';
-import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { ctxIsMergeResultEditor, ctxMergeBaseUri } from 'vs/workbench/contrib/mergeEditor/common/mergeEditor';
-import { IWorkbenchIssueService } from 'vs/workbench/contrib/issue/common/issue';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { ILocalizedString } from 'vs/platform/action/common/action';
-import { isWeb } from 'vs/base/common/platform';
+} from '../../../../platform/userDataSync/common/userDataSync.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
+import { IOutputService } from '../../../services/output/common/output.js';
+import { IActivityService, IBadge, NumberBadge, ProgressBadge } from '../../../services/activity/common/activity.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
+import { fromNow } from '../../../../base/common/date.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IAuthenticationService } from '../../../services/authentication/common/authentication.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { ViewContainerLocation, IViewContainersRegistry, Extensions, ViewContainer } from '../../../common/views.js';
+import { UserDataSyncDataViews } from './userDataSyncViews.js';
+import { IUserDataSyncWorkbenchService, getSyncAreaLabel, AccountStatus, CONTEXT_SYNC_STATE, CONTEXT_SYNC_ENABLEMENT, CONTEXT_ACCOUNT_STATE, CONFIGURE_SYNC_COMMAND_ID, SHOW_SYNC_LOG_COMMAND_ID, SYNC_VIEW_CONTAINER_ID, SYNC_TITLE, SYNC_VIEW_ICON, CONTEXT_HAS_CONFLICTS, DOWNLOAD_ACTIVITY_ACTION_DESCRIPTOR } from '../../../services/userDataSync/common/userDataSync.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { ViewPaneContainer } from '../../../browser/parts/views/viewPaneContainer.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
+import { ctxIsMergeResultEditor, ctxMergeBaseUri } from '../../mergeEditor/common/mergeEditor.js';
+import { IWorkbenchIssueService } from '../../issue/common/issue.js';
+import { IUserDataProfileService } from '../../../services/userDataProfile/common/userDataProfile.js';
+import { ILocalizedString } from '../../../../platform/action/common/action.js';
+import { isWeb } from '../../../../base/common/platform.js';
 
 type ConfigureSyncQuickPickItem = { id: SyncResource; label: string; description?: string };
 
@@ -899,12 +899,12 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 					],
 				});
 			}
-			run(accessor: ServicesAccessor): any {
+			run(accessor: ServicesAccessor): unknown {
 				return new Promise<void>((c, e) => {
 					const quickInputService = accessor.get(IQuickInputService);
 					const commandService = accessor.get(ICommandService);
 					const disposables = new DisposableStore();
-					const quickPick = quickInputService.createQuickPick();
+					const quickPick = quickInputService.createQuickPick({ useSeparators: true });
 					disposables.add(quickPick);
 					const items: Array<QuickPickItem> = [];
 					if (that.userDataSyncService.conflicts.length) {
@@ -1027,7 +1027,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 					}]
 				});
 			}
-			run(): any { return that.configureSyncOptions(); }
+			run(): unknown { return that.configureSyncOptions(); }
 		}));
 	}
 
@@ -1051,7 +1051,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 					}],
 				});
 			}
-			run(): any { return that.showSyncActivity(); }
+			run(): unknown { return that.showSyncActivity(); }
 		}));
 	}
 
@@ -1068,7 +1068,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 					},
 				});
 			}
-			run(accessor: ServicesAccessor): any {
+			run(accessor: ServicesAccessor): void {
 				accessor.get(IPreferencesService).openUserSettings({ jsonEditor: false, query: '@tag:sync' });
 			}
 		}));
@@ -1088,7 +1088,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 					}],
 				});
 			}
-			run(): any { return that.openerService.open(URI.parse('https://aka.ms/vscode-settings-sync-help')); }
+			run(): unknown { return that.openerService.open(URI.parse('https://aka.ms/vscode-settings-sync-help')); }
 		}));
 		MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
 			command: {
@@ -1181,7 +1181,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 					}],
 				});
 			}
-			run(): any { return that.userDataSyncWorkbenchService.resetSyncedData(); }
+			run(): unknown { return that.userDataSyncWorkbenchService.resetSyncedData(); }
 		}));
 	}
 
diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSyncConflictsView.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSyncConflictsView.ts
index 890ffcf50db..0f644befc33 100644
--- a/src/vs/workbench/contrib/userDataSync/browser/userDataSyncConflictsView.ts
+++ b/src/vs/workbench/contrib/userDataSync/browser/userDataSyncConflictsView.ts
@@ -3,31 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ITreeItem, TreeItemCollapsibleState, TreeViewItemHandleArg, IViewDescriptorService } from 'vs/workbench/common/views';
-import { localize } from 'vs/nls';
-import { TreeViewPane } from 'vs/workbench/browser/parts/views/treeView';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IUserDataSyncService, Change, MergeState, IUserDataSyncResource, IResourcePreview, IUserDataSyncEnablementService } from 'vs/platform/userDataSync/common/userDataSync';
-import { registerAction2, Action2, MenuId } from 'vs/platform/actions/common/actions';
-import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { URI } from 'vs/base/common/uri';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { getSyncAreaLabel, IUserDataSyncConflictsView, IUserDataSyncWorkbenchService, SYNC_CONFLICTS_VIEW_ID } from 'vs/workbench/services/userDataSync/common/userDataSync';
-import { basename, isEqual } from 'vs/base/common/resources';
-import * as DOM from 'vs/base/browser/dom';
-import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { Codicon } from 'vs/base/common/codicons';
-import { IUserDataProfile, IUserDataProfilesService, reviveProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { DEFAULT_EDITOR_ASSOCIATION } from 'vs/workbench/common/editor';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { IAccessibleViewInformationService } from 'vs/workbench/services/accessibility/common/accessibleViewInformationService';
+import { ITreeItem, TreeItemCollapsibleState, TreeViewItemHandleArg, IViewDescriptorService } from '../../../common/views.js';
+import { localize } from '../../../../nls.js';
+import { TreeViewPane } from '../../../browser/parts/views/treeView.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IUserDataSyncService, Change, MergeState, IUserDataSyncResource, IResourcePreview, IUserDataSyncEnablementService } from '../../../../platform/userDataSync/common/userDataSync.js';
+import { registerAction2, Action2, MenuId } from '../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { getSyncAreaLabel, IUserDataSyncConflictsView, IUserDataSyncWorkbenchService, SYNC_CONFLICTS_VIEW_ID } from '../../../services/userDataSync/common/userDataSync.js';
+import { basename, isEqual } from '../../../../base/common/resources.js';
+import * as DOM from '../../../../base/browser/dom.js';
+import { IViewletViewOptions } from '../../../browser/parts/views/viewsViewlet.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { IUserDataProfile, IUserDataProfilesService, reviveProfile } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { DEFAULT_EDITOR_ASSOCIATION } from '../../../common/editor.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IAccessibleViewInformationService } from '../../../services/accessibility/common/accessibleViewInformationService.js';
 
 type UserDataSyncConflictResource = IUserDataSyncResource & IResourcePreview;
 
diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSyncTrigger.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSyncTrigger.ts
index 89a1bbbbd77..0e7f57554ae 100644
--- a/src/vs/workbench/contrib/userDataSync/browser/userDataSyncTrigger.ts
+++ b/src/vs/workbench/contrib/userDataSync/browser/userDataSyncTrigger.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { isWeb } from 'vs/base/common/platform';
-import { isEqual } from 'vs/base/common/resources';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IUserDataAutoSyncService } from 'vs/platform/userDataSync/common/userDataSync';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { VIEWLET_ID } from 'vs/workbench/contrib/extensions/common/extensions';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { KeybindingsEditorInput } from 'vs/workbench/services/preferences/browser/keybindingsEditorInput';
-import { SettingsEditor2Input } from 'vs/workbench/services/preferences/common/preferencesEditorInput';
+import { Event } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { isWeb } from '../../../../base/common/platform.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { IUserDataAutoSyncService } from '../../../../platform/userDataSync/common/userDataSync.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { VIEWLET_ID } from '../../extensions/common/extensions.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { KeybindingsEditorInput } from '../../../services/preferences/browser/keybindingsEditorInput.js';
+import { SettingsEditor2Input } from '../../../services/preferences/common/preferencesEditorInput.js';
 
 export class UserDataSyncTrigger extends Disposable implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSyncViews.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSyncViews.ts
index 22e8f21e168..082c55bda66 100644
--- a/src/vs/workbench/contrib/userDataSync/browser/userDataSyncViews.ts
+++ b/src/vs/workbench/contrib/userDataSync/browser/userDataSyncViews.ts
@@ -3,36 +3,36 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IViewsRegistry, Extensions, ITreeViewDescriptor, ITreeViewDataProvider, ITreeItem, TreeItemCollapsibleState, TreeViewItemHandleArg, ViewContainer } from 'vs/workbench/common/views';
-import { localize, localize2 } from 'vs/nls';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { TreeView, TreeViewPane } from 'vs/workbench/browser/parts/views/treeView';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ALL_SYNC_RESOURCES, IUserDataSyncService, ISyncResourceHandle as IResourceHandle, SyncStatus, IUserDataSyncEnablementService, IUserDataAutoSyncService, UserDataSyncError, UserDataSyncErrorCode, getLastSyncResourceUri, SyncResource, ISyncUserDataProfile, IUserDataSyncResourceProviderService } from 'vs/platform/userDataSync/common/userDataSync';
-import { registerAction2, Action2, MenuId } from 'vs/platform/actions/common/actions';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { URI, UriDto } from 'vs/base/common/uri';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { FolderThemeIcon } from 'vs/platform/theme/common/themeService';
-import { fromNow } from 'vs/base/common/date';
-import { IDialogService, IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { Codicon } from 'vs/base/common/codicons';
-import { Action } from 'vs/base/common/actions';
-import { IUserDataSyncWorkbenchService, CONTEXT_SYNC_STATE, getSyncAreaLabel, CONTEXT_ACCOUNT_STATE, AccountStatus, CONTEXT_ENABLE_ACTIVITY_VIEWS, SYNC_TITLE, SYNC_CONFLICTS_VIEW_ID, CONTEXT_ENABLE_SYNC_CONFLICTS_VIEW, CONTEXT_HAS_CONFLICTS } from 'vs/workbench/services/userDataSync/common/userDataSync';
-import { IUserDataSyncMachinesService, IUserDataSyncMachine, isWebPlatform } from 'vs/platform/userDataSync/common/userDataSyncMachines';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { basename } from 'vs/base/common/resources';
-import { API_OPEN_DIFF_EDITOR_COMMAND_ID, API_OPEN_EDITOR_COMMAND_ID } from 'vs/workbench/browser/parts/editor/editorCommands';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { UserDataSyncConflictsViewPane } from 'vs/workbench/contrib/userDataSync/browser/userDataSyncConflictsView';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IViewsRegistry, Extensions, ITreeViewDescriptor, ITreeViewDataProvider, ITreeItem, TreeItemCollapsibleState, TreeViewItemHandleArg, ViewContainer } from '../../../common/views.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { TreeView, TreeViewPane } from '../../../browser/parts/views/treeView.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { ALL_SYNC_RESOURCES, IUserDataSyncService, ISyncResourceHandle as IResourceHandle, SyncStatus, IUserDataSyncEnablementService, IUserDataAutoSyncService, UserDataSyncError, UserDataSyncErrorCode, getLastSyncResourceUri, SyncResource, ISyncUserDataProfile, IUserDataSyncResourceProviderService } from '../../../../platform/userDataSync/common/userDataSync.js';
+import { registerAction2, Action2, MenuId } from '../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { URI, UriDto } from '../../../../base/common/uri.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { FolderThemeIcon } from '../../../../platform/theme/common/themeService.js';
+import { fromNow } from '../../../../base/common/date.js';
+import { IDialogService, IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { Event } from '../../../../base/common/event.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Action } from '../../../../base/common/actions.js';
+import { IUserDataSyncWorkbenchService, CONTEXT_SYNC_STATE, getSyncAreaLabel, CONTEXT_ACCOUNT_STATE, AccountStatus, CONTEXT_ENABLE_ACTIVITY_VIEWS, SYNC_TITLE, SYNC_CONFLICTS_VIEW_ID, CONTEXT_ENABLE_SYNC_CONFLICTS_VIEW, CONTEXT_HAS_CONFLICTS } from '../../../services/userDataSync/common/userDataSync.js';
+import { IUserDataSyncMachinesService, IUserDataSyncMachine, isWebPlatform } from '../../../../platform/userDataSync/common/userDataSyncMachines.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { basename } from '../../../../base/common/resources.js';
+import { API_OPEN_DIFF_EDITOR_COMMAND_ID, API_OPEN_EDITOR_COMMAND_ID } from '../../../browser/parts/editor/editorCommands.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IUserDataProfile, IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { UserDataSyncConflictsViewPane } from './userDataSyncConflictsView.js';
 
 export class UserDataSyncDataViews extends Disposable {
 
diff --git a/src/vs/workbench/contrib/userDataSync/electron-sandbox/userDataSync.contribution.ts b/src/vs/workbench/contrib/userDataSync/electron-sandbox/userDataSync.contribution.ts
index 441b1dc8f55..6f3cd48be11 100644
--- a/src/vs/workbench/contrib/userDataSync/electron-sandbox/userDataSync.contribution.ts
+++ b/src/vs/workbench/contrib/userDataSync/electron-sandbox/userDataSync.contribution.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { IUserDataSyncUtilService, SyncStatus } from 'vs/platform/userDataSync/common/userDataSync';
-import { ISharedProcessService } from 'vs/platform/ipc/electron-sandbox/services';
-import { registerAction2, Action2, MenuId } from 'vs/platform/actions/common/actions';
-import { localize, localize2 } from 'vs/nls';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IFileService } from 'vs/platform/files/common/files';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { CONTEXT_SYNC_STATE, DOWNLOAD_ACTIVITY_ACTION_DESCRIPTOR, IUserDataSyncWorkbenchService, SYNC_TITLE } from 'vs/workbench/services/userDataSync/common/userDataSync';
-import { Schemas } from 'vs/base/common/network';
-import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
-import { Disposable } from 'vs/base/common/lifecycle';
+import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { IUserDataSyncUtilService, SyncStatus } from '../../../../platform/userDataSync/common/userDataSync.js';
+import { ISharedProcessService } from '../../../../platform/ipc/electron-sandbox/services.js';
+import { registerAction2, Action2, MenuId } from '../../../../platform/actions/common/actions.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { CONTEXT_SYNC_STATE, DOWNLOAD_ACTIVITY_ACTION_DESCRIPTOR, IUserDataSyncWorkbenchService, SYNC_TITLE } from '../../../services/userDataSync/common/userDataSync.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { ProxyChannel } from '../../../../base/parts/ipc/common/ipc.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
 
 class UserDataSyncServicesContribution extends Disposable implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/contrib/webview/browser/overlayWebview.ts b/src/vs/workbench/contrib/webview/browser/overlayWebview.ts
index 6b6be89f393..88f65d9c90e 100644
--- a/src/vs/workbench/contrib/webview/browser/overlayWebview.ts
+++ b/src/vs/workbench/contrib/webview/browser/overlayWebview.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Dimension, getWindowById } from 'vs/base/browser/dom';
-import { FastDomNode } from 'vs/base/browser/fastDomNode';
-import { IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
-import { CodeWindow } from 'vs/base/browser/window';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable, DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { IContextKey, IContextKeyService, IScopedContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
-import { IOverlayWebview, IWebview, IWebviewElement, IWebviewService, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_ENABLED, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE, WebviewContentOptions, WebviewExtensionDescription, WebviewInitInfo, WebviewMessageReceivedEvent, WebviewOptions } from 'vs/workbench/contrib/webview/browser/webview';
+import { Dimension, getWindowById } from '../../../../base/browser/dom.js';
+import { FastDomNode } from '../../../../base/browser/fastDomNode.js';
+import { IMouseWheelEvent } from '../../../../base/browser/mouseEvent.js';
+import { CodeWindow } from '../../../../base/browser/window.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable, DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { IContextKey, IContextKeyService, IScopedContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
+import { IOverlayWebview, IWebview, IWebviewElement, IWebviewService, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_ENABLED, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE, WebviewContentOptions, WebviewExtensionDescription, WebviewInitInfo, WebviewMessageReceivedEvent, WebviewOptions } from './webview.js';
 
 /**
  * Webview that is absolutely positioned over another element and that can creates and destroys an underlying webview as needed.
diff --git a/src/vs/workbench/contrib/webview/browser/pre/index.html b/src/vs/workbench/contrib/webview/browser/pre/index.html
index 7629db38a29..6a1f3d459ab 100644
--- a/src/vs/workbench/contrib/webview/browser/pre/index.html
+++ b/src/vs/workbench/contrib/webview/browser/pre/index.html
@@ -5,7 +5,8 @@
 	<meta charset="UTF-8">
 
 	<meta http-equiv="Content-Security-Policy"
-		content="default-src 'none'; script-src 'sha256-noHVLQsurkONXmA3fcuAmcZ8UPYm/db88mhm9gAXcvk=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
+		content="default-src 'none'; script-src 'sha256-DXeP32g8BdMsVuVabYTmznoTH59F7M7UtV0vXemEFqc=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
+
 
 	<!-- Disable pinch zooming -->
 	<meta name="viewport"
@@ -110,6 +111,10 @@
 				color: var(--vscode-textLink-foreground);
 			}
 
+			p > a {
+				text-decoration: var(--text-link-decoration);
+			}
+
 			a:hover {
 				color: var(--vscode-textLink-activeForeground);
 			}
@@ -791,6 +796,32 @@
 			}
 		}
 
+
+		function handleInnerDragEvent(/** @type {DragEvent} */ e) {
+			/**
+			 * To ensure that the drop event always fires as expected, you should always include a preventDefault() call in the part of your code which handles the dragover event.
+			 * source: https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/drop_event
+			 **/
+			e.preventDefault();
+
+			if (!e.dataTransfer) {
+				return;
+			}
+
+
+			// Only handle drags from outside editor for now
+			if (e.dataTransfer.items.length && Array.prototype.every.call(e.dataTransfer.items, item => item.kind === 'file')) {
+				hostMessaging.postMessage('drag', {
+					shiftKey: e.shiftKey
+				});
+			}
+
+		}
+
+		function handleInnerDropEvent(/**@type {DragEvent} */e) {
+			e.preventDefault();
+		}
+
 		/**
 		 * @param {() => void} callback
 		 */
@@ -881,7 +912,10 @@
 		window.addEventListener('keydown', handleInnerKeydown);
 		window.addEventListener('keyup', handleInnerKeyup);
 		window.addEventListener('dragenter', handleInnerDragStartEvent);
-		window.addEventListener('dragover', handleInnerDragStartEvent);
+		window.addEventListener('dragover', handleInnerDragEvent);
+		window.addEventListener('drag', handleInnerDragEvent);
+		window.addEventListener('drop', handleInnerDropEvent);
+
 
 		onDomReady(() => {
 			if (!document.body) {
@@ -1163,7 +1197,9 @@
 					});
 
 					contentWindow.addEventListener('dragenter', handleInnerDragStartEvent);
-					contentWindow.addEventListener('dragover', handleInnerDragStartEvent);
+					contentWindow.addEventListener('dragover', handleInnerDragEvent);
+					contentWindow.addEventListener('drag', handleInnerDragEvent);
+					contentWindow.addEventListener('drop', handleInnerDropEvent);
 
 					unloadMonitor.onIframeLoaded(newFrame);
 				}
diff --git a/src/vs/workbench/contrib/webview/browser/pre/service-worker.js b/src/vs/workbench/contrib/webview/browser/pre/service-worker.js
index a6e9943b866..e5fa674ea82 100644
--- a/src/vs/workbench/contrib/webview/browser/pre/service-worker.js
+++ b/src/vs/workbench/contrib/webview/browser/pre/service-worker.js
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 // @ts-check
 
-/// <reference no-default-lib="true"/>
 /// <reference lib="webworker" />
 
 const sw = /** @type {ServiceWorkerGlobalScope} */ (/** @type {any} */ (self));
@@ -168,7 +167,7 @@ sw.addEventListener('message', async (event) => {
 
 sw.addEventListener('fetch', (event) => {
 	const requestUrl = new URL(event.request.url);
-	if (requestUrl.protocol === 'https:' && requestUrl.hostname.endsWith('.' + resourceBaseAuthority)) {
+	if (typeof resourceBaseAuthority === 'string' && requestUrl.protocol === 'https:' && requestUrl.hostname.endsWith('.' + resourceBaseAuthority)) {
 		switch (event.request.method) {
 			case 'GET':
 			case 'HEAD': {
diff --git a/src/vs/workbench/contrib/webview/browser/resourceLoading.ts b/src/vs/workbench/contrib/webview/browser/resourceLoading.ts
index 065187469ca..a30e9a24d51 100644
--- a/src/vs/workbench/contrib/webview/browser/resourceLoading.ts
+++ b/src/vs/workbench/contrib/webview/browser/resourceLoading.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBufferReadableStream } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { isUNC } from 'vs/base/common/extpath';
-import { Schemas } from 'vs/base/common/network';
-import { normalize, sep } from 'vs/base/common/path';
-import { URI } from 'vs/base/common/uri';
-import { FileOperationError, FileOperationResult, IFileService, IWriteFileOptions } from 'vs/platform/files/common/files';
-import { ILogService } from 'vs/platform/log/common/log';
-import { getWebviewContentMimeType } from 'vs/platform/webview/common/mimeTypes';
+import { VSBufferReadableStream } from '../../../../base/common/buffer.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { isUNC } from '../../../../base/common/extpath.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { normalize, sep } from '../../../../base/common/path.js';
+import { URI } from '../../../../base/common/uri.js';
+import { FileOperationError, FileOperationResult, IFileService, IWriteFileOptions } from '../../../../platform/files/common/files.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { getWebviewContentMimeType } from '../../../../platform/webview/common/mimeTypes.js';
 
 export namespace WebviewResourceResponse {
 	export enum Type { Success, Failed, AccessDenied, NotModified }
diff --git a/src/vs/workbench/contrib/webview/browser/themeing.ts b/src/vs/workbench/contrib/webview/browser/themeing.ts
index eda7179665f..0c434b830b8 100644
--- a/src/vs/workbench/contrib/webview/browser/themeing.ts
+++ b/src/vs/workbench/contrib/webview/browser/themeing.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DEFAULT_FONT_FAMILY } from 'vs/base/browser/fonts';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { EDITOR_FONT_DEFAULTS, IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import * as colorRegistry from 'vs/platform/theme/common/colorRegistry';
-import { ColorScheme } from 'vs/platform/theme/common/theme';
-import { IWorkbenchColorTheme, IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
-import { WebviewStyles } from 'vs/workbench/contrib/webview/browser/webview';
+import { DEFAULT_FONT_FAMILY } from '../../../../base/browser/fonts.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { EDITOR_FONT_DEFAULTS, IEditorOptions } from '../../../../editor/common/config/editorOptions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import * as colorRegistry from '../../../../platform/theme/common/colorRegistry.js';
+import { ColorScheme } from '../../../../platform/theme/common/theme.js';
+import { IWorkbenchColorTheme, IWorkbenchThemeService } from '../../../services/themes/common/workbenchThemeService.js';
+import { WebviewStyles } from './webview.js';
 
 interface WebviewThemeData {
 	readonly activeTheme: string;
@@ -37,7 +37,7 @@ export class WebviewThemeDataProvider extends Disposable {
 			this._reset();
 		}));
 
-		const webviewConfigurationKeys = ['editor.fontFamily', 'editor.fontWeight', 'editor.fontSize'];
+		const webviewConfigurationKeys = ['editor.fontFamily', 'editor.fontWeight', 'editor.fontSize', 'accessibility.underlineLinks'];
 		this._register(this._configurationService.onDidChangeConfiguration(e => {
 			if (webviewConfigurationKeys.some(key => e.affectsConfiguration(key))) {
 				this._reset();
@@ -55,6 +55,7 @@ export class WebviewThemeDataProvider extends Disposable {
 			const editorFontFamily = configuration.fontFamily || EDITOR_FONT_DEFAULTS.fontFamily;
 			const editorFontWeight = configuration.fontWeight || EDITOR_FONT_DEFAULTS.fontWeight;
 			const editorFontSize = configuration.fontSize || EDITOR_FONT_DEFAULTS.fontSize;
+			const linkUnderlines = this._configurationService.getValue('accessibility.underlineLinks');
 
 			const theme = this._themeService.getColorTheme();
 			const exportedColors = colorRegistry.getColorRegistry().getColors().reduce<Record<string, string>>((colors, entry) => {
@@ -72,6 +73,7 @@ export class WebviewThemeDataProvider extends Disposable {
 				'vscode-editor-font-family': editorFontFamily,
 				'vscode-editor-font-weight': editorFontWeight,
 				'vscode-editor-font-size': editorFontSize + 'px',
+				'text-link-decoration': linkUnderlines ? 'underline' : 'none',
 				...exportedColors
 			};
 
diff --git a/src/vs/workbench/contrib/webview/browser/webview.contribution.ts b/src/vs/workbench/contrib/webview/browser/webview.contribution.ts
index 6fde8271d07..85c3cc4a2bc 100644
--- a/src/vs/workbench/contrib/webview/browser/webview.contribution.ts
+++ b/src/vs/workbench/contrib/webview/browser/webview.contribution.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getActiveElement } from 'vs/base/browser/dom';
-import { MultiCommand, RedoCommand, SelectAllCommand, UndoCommand } from 'vs/editor/browser/editorExtensions';
-import { CopyAction, CutAction, PasteAction } from 'vs/editor/contrib/clipboard/browser/clipboard';
-import * as nls from 'vs/nls';
-import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IWebviewService, IWebview } from 'vs/workbench/contrib/webview/browser/webview';
-import { WebviewInput } from 'vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { getActiveElement } from '../../../../base/browser/dom.js';
+import { MultiCommand, RedoCommand, SelectAllCommand, UndoCommand } from '../../../../editor/browser/editorExtensions.js';
+import { CopyAction, CutAction, PasteAction } from '../../../../editor/contrib/clipboard/browser/clipboard.js';
+import * as nls from '../../../../nls.js';
+import { MenuId, MenuRegistry } from '../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { IWebviewService, IWebview } from './webview.js';
+import { WebviewInput } from '../../webviewPanel/browser/webviewEditorInput.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
 
 
 const PRIORITY = 100;
diff --git a/src/vs/workbench/contrib/webview/browser/webview.ts b/src/vs/workbench/contrib/webview/browser/webview.ts
index 14e925969a1..9f05edb89d6 100644
--- a/src/vs/workbench/contrib/webview/browser/webview.ts
+++ b/src/vs/workbench/contrib/webview/browser/webview.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Dimension } from 'vs/base/browser/dom';
-import { IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
-import { CodeWindow } from 'vs/base/browser/window';
-import { equals } from 'vs/base/common/arrays';
-import { Event } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { isEqual } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IWebviewPortMapping } from 'vs/platform/webview/common/webviewPortMapping';
-import { Memento, MementoObject } from 'vs/workbench/common/memento';
+import { Dimension } from '../../../../base/browser/dom.js';
+import { IMouseWheelEvent } from '../../../../base/browser/mouseEvent.js';
+import { CodeWindow } from '../../../../base/browser/window.js';
+import { equals } from '../../../../base/common/arrays.js';
+import { Event } from '../../../../base/common/event.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IWebviewPortMapping } from '../../../../platform/webview/common/webviewPortMapping.js';
+import { Memento, MementoObject } from '../../../common/memento.js';
 
 /**
  * Set when the find widget in a webview in a webview is visible.
diff --git a/src/vs/workbench/contrib/webview/browser/webview.web.contribution.ts b/src/vs/workbench/contrib/webview/browser/webview.web.contribution.ts
index 9ac2a8ce935..8552d4a9709 100644
--- a/src/vs/workbench/contrib/webview/browser/webview.web.contribution.ts
+++ b/src/vs/workbench/contrib/webview/browser/webview.web.contribution.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IWebviewService } from 'vs/workbench/contrib/webview/browser/webview';
-import { WebviewService } from './webviewService';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IWebviewService } from './webview.js';
+import { WebviewService } from './webviewService.js';
 
 registerSingleton(IWebviewService, WebviewService, InstantiationType.Delayed);
diff --git a/src/vs/workbench/contrib/webview/browser/webviewElement.ts b/src/vs/workbench/contrib/webview/browser/webviewElement.ts
index 3d5d21f080f..1b66babea28 100644
--- a/src/vs/workbench/contrib/webview/browser/webviewElement.ts
+++ b/src/vs/workbench/contrib/webview/browser/webviewElement.ts
@@ -3,41 +3,41 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isFirefox } from 'vs/base/browser/browser';
-import { addDisposableListener, EventType, getWindowById } from 'vs/base/browser/dom';
-import { IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
-import { promiseWithResolvers, ThrottledDelayer } from 'vs/base/common/async';
-import { streamToBuffer, VSBufferReadableStream } from 'vs/base/common/buffer';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { COI } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { localize } from 'vs/nls';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { ITunnelService } from 'vs/platform/tunnel/common/tunnel';
-import { WebviewPortMappingManager } from 'vs/platform/webview/common/webviewPortMapping';
-import { parentOriginHash } from 'vs/base/browser/iframe';
-import { loadLocalResource, WebviewResourceResponse } from 'vs/workbench/contrib/webview/browser/resourceLoading';
-import { WebviewThemeDataProvider } from 'vs/workbench/contrib/webview/browser/themeing';
-import { areWebviewContentOptionsEqual, IWebview, WebviewContentOptions, WebviewExtensionDescription, WebviewInitInfo, WebviewMessageReceivedEvent, WebviewOptions } from 'vs/workbench/contrib/webview/browser/webview';
-import { WebviewFindDelegate, WebviewFindWidget } from 'vs/workbench/contrib/webview/browser/webviewFindWidget';
-import { FromWebviewMessage, KeyEvent, ToWebviewMessage } from 'vs/workbench/contrib/webview/browser/webviewMessages';
-import { decodeAuthority, webviewGenericCspSource, webviewRootResourceAuthority } from 'vs/workbench/contrib/webview/common/webview';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { CodeWindow } from 'vs/base/browser/window';
+import { isFirefox } from '../../../../base/browser/browser.js';
+import { addDisposableListener, EventType, getWindowById } from '../../../../base/browser/dom.js';
+import { IMouseWheelEvent } from '../../../../base/browser/mouseEvent.js';
+import { promiseWithResolvers, ThrottledDelayer } from '../../../../base/common/async.js';
+import { streamToBuffer, VSBufferReadableStream } from '../../../../base/common/buffer.js';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { COI } from '../../../../base/common/network.js';
+import { URI } from '../../../../base/common/uri.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { localize } from '../../../../nls.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IRemoteAuthorityResolverService } from '../../../../platform/remote/common/remoteAuthorityResolver.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { ITunnelService } from '../../../../platform/tunnel/common/tunnel.js';
+import { WebviewPortMappingManager } from '../../../../platform/webview/common/webviewPortMapping.js';
+import { parentOriginHash } from '../../../../base/browser/iframe.js';
+import { loadLocalResource, WebviewResourceResponse } from './resourceLoading.js';
+import { WebviewThemeDataProvider } from './themeing.js';
+import { areWebviewContentOptionsEqual, IWebview, WebviewContentOptions, WebviewExtensionDescription, WebviewInitInfo, WebviewMessageReceivedEvent, WebviewOptions } from './webview.js';
+import { WebviewFindDelegate, WebviewFindWidget } from './webviewFindWidget.js';
+import { FromWebviewMessage, KeyEvent, ToWebviewMessage, WebViewDragEvent } from './webviewMessages.js';
+import { decodeAuthority, webviewGenericCspSource, webviewRootResourceAuthority } from '../common/webview.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { CodeWindow } from '../../../../base/browser/window.js';
 
 interface WebviewContent {
 	readonly html: string;
@@ -265,6 +265,7 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD
 					y: elementBox.y + data.clientY
 				})
 			});
+			this._send('set-context-menu-visible', { visible: true });
 		}));
 
 		this._register(this.on('load-resource', async (entry) => {
@@ -294,7 +295,6 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD
 		this._register(Event.runAndSubscribe(webviewThemeDataProvider.onThemeDataChanged, () => this.style()));
 		this._register(_accessibilityService.onDidChangeReducedMotion(() => this.style()));
 		this._register(_accessibilityService.onDidChangeScreenReaderOptimized(() => this.style()));
-		this._register(contextMenuService.onDidShowContextMenu(() => this._send('set-context-menu-visible', { visible: true })));
 		this._register(contextMenuService.onDidHideContextMenu(() => this._send('set-context-menu-visible', { visible: false })));
 
 		this._confirmBeforeClose = configurationService.getValue<string>('window.confirmBeforeClose');
@@ -310,6 +310,10 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD
 			this._startBlockingIframeDragEvents();
 		}));
 
+		this._register(this.on('drag', (event) => {
+			this.handleDragEvent('drag', event);
+		}));
+
 		if (initInfo.options.enableFindWidget) {
 			this._webviewFindWidget = this._register(instantiationService.createInstance(WebviewFindWidget, this));
 		}
@@ -697,6 +701,17 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD
 		this.window?.dispatchEvent(emulatedKeyboardEvent);
 	}
 
+	private handleDragEvent(type: 'drag', event: WebViewDragEvent) {
+		// Create a fake DragEvent from the data provided
+		const emulatedDragEvent = new DragEvent(type, event);
+		// Force override the target
+		Object.defineProperty(emulatedDragEvent, 'target', {
+			get: () => this.element,
+		});
+		// And re-dispatch
+		this.window?.dispatchEvent(emulatedDragEvent);
+	}
+
 	windowDidDragStart(): void {
 		// Webview break drag and dropping around the main window (no events are generated when you are over them)
 		// Work around this by disabling pointer events during the drag.
diff --git a/src/vs/workbench/contrib/webview/browser/webviewFindWidget.ts b/src/vs/workbench/contrib/webview/browser/webviewFindWidget.ts
index b7e47ea890e..a52aedf2ec1 100644
--- a/src/vs/workbench/contrib/webview/browser/webviewFindWidget.ts
+++ b/src/vs/workbench/contrib/webview/browser/webviewFindWidget.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { SimpleFindWidget } from 'vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget';
-import { KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED } from 'vs/workbench/contrib/webview/browser/webview';
+import { Event } from '../../../../base/common/event.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { SimpleFindWidget } from '../../codeEditor/browser/find/simpleFindWidget.js';
+import { KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED } from './webview.js';
 
 export interface WebviewFindDelegate {
 	readonly hasFindResult: Event<boolean>;
diff --git a/src/vs/workbench/contrib/webview/browser/webviewMessages.d.ts b/src/vs/workbench/contrib/webview/browser/webviewMessages.d.ts
index eae9c80fa68..dde553ec057 100644
--- a/src/vs/workbench/contrib/webview/browser/webviewMessages.d.ts
+++ b/src/vs/workbench/contrib/webview/browser/webviewMessages.d.ts
@@ -17,6 +17,10 @@ type KeyEvent = {
 	repeat: boolean;
 }
 
+type WebViewDragEvent = {
+	shiftKey: boolean;
+}
+
 export type FromWebviewMessage = {
 	'onmessage': { message: any; transfer?: ArrayBuffer[] };
 	'did-click-link': { uri: string };
@@ -36,6 +40,7 @@ export type FromWebviewMessage = {
 	'did-keyup': KeyEvent;
 	'did-context-menu': { clientX: number; clientY: number; context: { [key: string]: unknown } };
 	'drag-start': void;
+	'drag': WebViewDragEvent
 };
 
 interface UpdateContentEvent {
diff --git a/src/vs/workbench/contrib/webview/browser/webviewService.ts b/src/vs/workbench/contrib/webview/browser/webviewService.ts
index 7b75404adf4..b1fb5bf14cc 100644
--- a/src/vs/workbench/contrib/webview/browser/webviewService.ts
+++ b/src/vs/workbench/contrib/webview/browser/webviewService.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { WebviewThemeDataProvider } from 'vs/workbench/contrib/webview/browser/themeing';
-import { IOverlayWebview, IWebview, IWebviewElement, IWebviewService, WebviewInitInfo } from 'vs/workbench/contrib/webview/browser/webview';
-import { WebviewElement } from 'vs/workbench/contrib/webview/browser/webviewElement';
-import { OverlayWebview } from './overlayWebview';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { WebviewThemeDataProvider } from './themeing.js';
+import { IOverlayWebview, IWebview, IWebviewElement, IWebviewService, WebviewInitInfo } from './webview.js';
+import { WebviewElement } from './webviewElement.js';
+import { OverlayWebview } from './overlayWebview.js';
 
 export class WebviewService extends Disposable implements IWebviewService {
 	declare readonly _serviceBrand: undefined;
diff --git a/src/vs/workbench/contrib/webview/browser/webviewWindowDragMonitor.ts b/src/vs/workbench/contrib/webview/browser/webviewWindowDragMonitor.ts
index e4dc5eaf0e9..923f49b2ffd 100644
--- a/src/vs/workbench/contrib/webview/browser/webviewWindowDragMonitor.ts
+++ b/src/vs/workbench/contrib/webview/browser/webviewWindowDragMonitor.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { CodeWindow } from 'vs/base/browser/window';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IWebview } from 'vs/workbench/contrib/webview/browser/webview';
+import * as DOM from '../../../../base/browser/dom.js';
+import { CodeWindow } from '../../../../base/browser/window.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IWebview } from './webview.js';
 
 /**
  * Allows webviews to monitor when an element in the VS Code editor is being dragged/dropped.
@@ -18,19 +18,41 @@ export class WebviewWindowDragMonitor extends Disposable {
 	constructor(targetWindow: CodeWindow, getWebview: () => IWebview | undefined) {
 		super();
 
-		this._register(DOM.addDisposableListener(targetWindow, DOM.EventType.DRAG_START, () => {
+		const onDragStart = () => {
 			getWebview()?.windowDidDragStart();
-		}));
+		};
 
 		const onDragEnd = () => {
 			getWebview()?.windowDidDragEnd();
 		};
 
+		this._register(DOM.addDisposableListener(targetWindow, DOM.EventType.DRAG_START, () => {
+			onDragStart();
+		}));
+
 		this._register(DOM.addDisposableListener(targetWindow, DOM.EventType.DRAG_END, onDragEnd));
+
 		this._register(DOM.addDisposableListener(targetWindow, DOM.EventType.MOUSE_MOVE, currentEvent => {
 			if (currentEvent.buttons === 0) {
 				onDragEnd();
 			}
 		}));
+
+		this._register(DOM.addDisposableListener(targetWindow, DOM.EventType.DRAG, (event) => {
+			if (event.shiftKey) {
+				onDragEnd();
+			} else {
+				onDragStart();
+			}
+		}));
+
+		this._register(DOM.addDisposableListener(targetWindow, DOM.EventType.DRAG_OVER, (event) => {
+			if (event.shiftKey) {
+				onDragEnd();
+			} else {
+				onDragStart();
+			}
+		}));
+
 	}
 }
diff --git a/src/vs/workbench/contrib/webview/common/webview.ts b/src/vs/workbench/contrib/webview/common/webview.ts
index 1db1d451aff..95c65048fcd 100644
--- a/src/vs/workbench/contrib/webview/common/webview.ts
+++ b/src/vs/workbench/contrib/webview/common/webview.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
+import { CharCode } from '../../../../base/common/charCode.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { URI } from '../../../../base/common/uri.js';
 
 export interface WebviewRemoteInfo {
 	readonly isRemote: boolean;
diff --git a/src/vs/workbench/contrib/webview/electron-sandbox/webview.contribution.ts b/src/vs/workbench/contrib/webview/electron-sandbox/webview.contribution.ts
index a19e67cf9c5..26a73e5802a 100644
--- a/src/vs/workbench/contrib/webview/electron-sandbox/webview.contribution.ts
+++ b/src/vs/workbench/contrib/webview/electron-sandbox/webview.contribution.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { registerAction2 } from 'vs/platform/actions/common/actions';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IWebviewService } from 'vs/workbench/contrib/webview/browser/webview';
-import * as webviewCommands from 'vs/workbench/contrib/webview/electron-sandbox/webviewCommands';
-import { ElectronWebviewService } from 'vs/workbench/contrib/webview/electron-sandbox/webviewService';
+import { registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IWebviewService } from '../browser/webview.js';
+import * as webviewCommands from './webviewCommands.js';
+import { ElectronWebviewService } from './webviewService.js';
 
 registerSingleton(IWebviewService, ElectronWebviewService, InstantiationType.Delayed);
 
diff --git a/src/vs/workbench/contrib/webview/electron-sandbox/webviewCommands.ts b/src/vs/workbench/contrib/webview/electron-sandbox/webviewCommands.ts
index 8c3989c2ba8..3396de579b1 100644
--- a/src/vs/workbench/contrib/webview/electron-sandbox/webviewCommands.ts
+++ b/src/vs/workbench/contrib/webview/electron-sandbox/webviewCommands.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { getActiveWindow } from 'vs/base/browser/dom';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { Action2 } from 'vs/platform/actions/common/actions';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { INativeHostService } from 'vs/platform/native/common/native';
+import * as nls from '../../../../nls.js';
+import { getActiveWindow } from '../../../../base/browser/dom.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { Action2 } from '../../../../platform/actions/common/actions.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
 
 export class OpenWebviewDeveloperToolsAction extends Action2 {
 
diff --git a/src/vs/workbench/contrib/webview/electron-sandbox/webviewElement.ts b/src/vs/workbench/contrib/webview/electron-sandbox/webviewElement.ts
index e10b2a6554c..f4fc6b8365f 100644
--- a/src/vs/workbench/contrib/webview/electron-sandbox/webviewElement.ts
+++ b/src/vs/workbench/contrib/webview/electron-sandbox/webviewElement.ts
@@ -3,29 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Delayer } from 'vs/base/common/async';
-import { VSBuffer, VSBufferReadableStream } from 'vs/base/common/buffer';
-import { Schemas } from 'vs/base/common/network';
-import { consumeStream } from 'vs/base/common/stream';
-import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IMainProcessService } from 'vs/platform/ipc/common/mainProcessService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { ITunnelService } from 'vs/platform/tunnel/common/tunnel';
-import { FindInFrameOptions, IWebviewManagerService } from 'vs/platform/webview/common/webviewManagerService';
-import { WebviewThemeDataProvider } from 'vs/workbench/contrib/webview/browser/themeing';
-import { WebviewInitInfo } from 'vs/workbench/contrib/webview/browser/webview';
-import { WebviewElement } from 'vs/workbench/contrib/webview/browser/webviewElement';
-import { WindowIgnoreMenuShortcutsManager } from 'vs/workbench/contrib/webview/electron-sandbox/windowIgnoreMenuShortcutsManager';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
+import { Delayer } from '../../../../base/common/async.js';
+import { VSBuffer, VSBufferReadableStream } from '../../../../base/common/buffer.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { consumeStream } from '../../../../base/common/stream.js';
+import { ProxyChannel } from '../../../../base/parts/ipc/common/ipc.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IMainProcessService } from '../../../../platform/ipc/common/mainProcessService.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IRemoteAuthorityResolverService } from '../../../../platform/remote/common/remoteAuthorityResolver.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { ITunnelService } from '../../../../platform/tunnel/common/tunnel.js';
+import { FindInFrameOptions, IWebviewManagerService } from '../../../../platform/webview/common/webviewManagerService.js';
+import { WebviewThemeDataProvider } from '../browser/themeing.js';
+import { WebviewInitInfo } from '../browser/webview.js';
+import { WebviewElement } from '../browser/webviewElement.js';
+import { WindowIgnoreMenuShortcutsManager } from './windowIgnoreMenuShortcutsManager.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
 
 /**
  * Webview backed by an iframe but that uses Electron APIs to power the webview.
diff --git a/src/vs/workbench/contrib/webview/electron-sandbox/webviewService.ts b/src/vs/workbench/contrib/webview/electron-sandbox/webviewService.ts
index f38e1f1a023..c4666246f87 100644
--- a/src/vs/workbench/contrib/webview/electron-sandbox/webviewService.ts
+++ b/src/vs/workbench/contrib/webview/electron-sandbox/webviewService.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IWebviewElement, WebviewInitInfo } from 'vs/workbench/contrib/webview/browser/webview';
-import { WebviewService } from 'vs/workbench/contrib/webview/browser/webviewService';
-import { ElectronWebviewElement } from 'vs/workbench/contrib/webview/electron-sandbox/webviewElement';
+import { IWebviewElement, WebviewInitInfo } from '../browser/webview.js';
+import { WebviewService } from '../browser/webviewService.js';
+import { ElectronWebviewElement } from './webviewElement.js';
 
 export class ElectronWebviewService extends WebviewService {
 
diff --git a/src/vs/workbench/contrib/webview/electron-sandbox/windowIgnoreMenuShortcutsManager.ts b/src/vs/workbench/contrib/webview/electron-sandbox/windowIgnoreMenuShortcutsManager.ts
index 49345645524..bb01bfb7abc 100644
--- a/src/vs/workbench/contrib/webview/electron-sandbox/windowIgnoreMenuShortcutsManager.ts
+++ b/src/vs/workbench/contrib/webview/electron-sandbox/windowIgnoreMenuShortcutsManager.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isMacintosh } from 'vs/base/common/platform';
-import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IMainProcessService } from 'vs/platform/ipc/common/mainProcessService';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { IWebviewManagerService } from 'vs/platform/webview/common/webviewManagerService';
-import { hasNativeTitlebar } from 'vs/platform/window/common/window';
+import { isMacintosh } from '../../../../base/common/platform.js';
+import { ProxyChannel } from '../../../../base/parts/ipc/common/ipc.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IMainProcessService } from '../../../../platform/ipc/common/mainProcessService.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { IWebviewManagerService } from '../../../../platform/webview/common/webviewManagerService.js';
+import { hasNativeTitlebar } from '../../../../platform/window/common/window.js';
 
 export class WindowIgnoreMenuShortcutsManager {
 
diff --git a/src/vs/workbench/contrib/webviewPanel/browser/webviewCommands.ts b/src/vs/workbench/contrib/webviewPanel/browser/webviewCommands.ts
index 356a852efdb..902104564a3 100644
--- a/src/vs/workbench/contrib/webviewPanel/browser/webviewCommands.ts
+++ b/src/vs/workbench/contrib/webviewPanel/browser/webviewCommands.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import * as nls from 'vs/nls';
-import { Action2, MenuId } from 'vs/platform/actions/common/actions';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { IWebviewService, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_ENABLED, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE, IWebview } from 'vs/workbench/contrib/webview/browser/webview';
-import { WebviewEditor } from 'vs/workbench/contrib/webviewPanel/browser/webviewEditor';
-import { WebviewInput } from 'vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
+import * as nls from '../../../../nls.js';
+import { Action2, MenuId } from '../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { IWebviewService, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_ENABLED, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE, IWebview } from '../../webview/browser/webview.js';
+import { WebviewEditor } from './webviewEditor.js';
+import { WebviewInput } from './webviewEditorInput.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
 
 const webviewActiveContextKeyExpr = ContextKeyExpr.and(ContextKeyExpr.equals('activeEditor', WebviewEditor.ID), EditorContextKeys.focus.toNegated() /* https://github.com/microsoft/vscode/issues/58668 */)!;
 
diff --git a/src/vs/workbench/contrib/webviewPanel/browser/webviewEditor.ts b/src/vs/workbench/contrib/webviewPanel/browser/webviewEditor.ts
index 9a00f58d9ce..5a7de862a35 100644
--- a/src/vs/workbench/contrib/webviewPanel/browser/webviewEditor.ts
+++ b/src/vs/workbench/contrib/webviewPanel/browser/webviewEditor.ts
@@ -3,28 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as DOM from 'vs/base/browser/dom';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { isWeb } from 'vs/base/common/platform';
-import { generateUuid } from 'vs/base/common/uuid';
-import * as nls from 'vs/nls';
-import { IContextKeyService, IScopedContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IEditorOptions } from 'vs/platform/editor/common/editor';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
-import { IEditorOpenContext } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { IOverlayWebview } from 'vs/workbench/contrib/webview/browser/webview';
-import { WebviewWindowDragMonitor } from 'vs/workbench/contrib/webview/browser/webviewWindowDragMonitor';
-import { WebviewInput } from 'vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
-import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/browser/layoutService';
+import * as DOM from '../../../../base/browser/dom.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { DisposableStore, IDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { isWeb } from '../../../../base/common/platform.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import * as nls from '../../../../nls.js';
+import { IContextKeyService, IScopedContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { EditorPane } from '../../../browser/parts/editor/editorPane.js';
+import { IEditorOpenContext } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { IOverlayWebview } from '../../webview/browser/webview.js';
+import { WebviewWindowDragMonitor } from '../../webview/browser/webviewWindowDragMonitor.js';
+import { WebviewInput } from './webviewEditorInput.js';
+import { IEditorGroup, IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { IWorkbenchLayoutService, Parts } from '../../../services/layout/browser/layoutService.js';
 
 /**
  * Tracks the id of the actively focused webview.
diff --git a/src/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput.ts b/src/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput.ts
index d3c972a6c7d..377569b279a 100644
--- a/src/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput.ts
+++ b/src/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CodeWindow } from 'vs/base/browser/window';
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { EditorInputCapabilities, GroupIdentifier, IUntypedEditorInput, Verbosity } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { IOverlayWebview } from 'vs/workbench/contrib/webview/browser/webview';
-import { WebviewIconManager, WebviewIcons } from 'vs/workbench/contrib/webviewPanel/browser/webviewIconManager';
+import { CodeWindow } from '../../../../base/browser/window.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { URI } from '../../../../base/common/uri.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { EditorInputCapabilities, GroupIdentifier, IUntypedEditorInput, Verbosity } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { IOverlayWebview } from '../../webview/browser/webview.js';
+import { WebviewIconManager, WebviewIcons } from './webviewIconManager.js';
 
 export interface WebviewInputInitInfo {
 	readonly viewType: string;
diff --git a/src/vs/workbench/contrib/webviewPanel/browser/webviewEditorInputSerializer.ts b/src/vs/workbench/contrib/webviewPanel/browser/webviewEditorInputSerializer.ts
index 8a590bff082..5e5a6d8912f 100644
--- a/src/vs/workbench/contrib/webviewPanel/browser/webviewEditorInputSerializer.ts
+++ b/src/vs/workbench/contrib/webviewPanel/browser/webviewEditorInputSerializer.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IEditorSerializer } from 'vs/workbench/common/editor';
-import { WebviewContentOptions, WebviewExtensionDescription, WebviewOptions } from 'vs/workbench/contrib/webview/browser/webview';
-import { WebviewIcons } from 'vs/workbench/contrib/webviewPanel/browser/webviewIconManager';
-import { WebviewInput } from './webviewEditorInput';
-import { IWebviewWorkbenchService } from './webviewWorkbenchService';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IEditorSerializer } from '../../../common/editor.js';
+import { WebviewContentOptions, WebviewExtensionDescription, WebviewOptions } from '../../webview/browser/webview.js';
+import { WebviewIcons } from './webviewIconManager.js';
+import { WebviewInput } from './webviewEditorInput.js';
+import { IWebviewWorkbenchService } from './webviewWorkbenchService.js';
 
 export type SerializedWebviewOptions = WebviewOptions & WebviewContentOptions;
 
diff --git a/src/vs/workbench/contrib/webviewPanel/browser/webviewIconManager.ts b/src/vs/workbench/contrib/webviewPanel/browser/webviewIconManager.ts
index f24731711d3..c4e6424d0bb 100644
--- a/src/vs/workbench/contrib/webviewPanel/browser/webviewIconManager.ts
+++ b/src/vs/workbench/contrib/webviewPanel/browser/webviewIconManager.ts
@@ -3,45 +3,42 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ILifecycleService, LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import * as dom from '../../../../base/browser/dom.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ILifecycleService, LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
 
 export interface WebviewIcons {
 	readonly light: URI;
 	readonly dark: URI;
 }
 
-export class WebviewIconManager implements IDisposable {
+export class WebviewIconManager extends Disposable {
 
 	private readonly _icons = new Map<string, WebviewIcons>();
 
 	private _styleElement: HTMLStyleElement | undefined;
-	private _styleElementDisposable: DisposableStore | undefined;
 
 	constructor(
 		@ILifecycleService private readonly _lifecycleService: ILifecycleService,
 		@IConfigurationService private readonly _configService: IConfigurationService,
 	) {
-		this._configService.onDidChangeConfiguration(e => {
+		super();
+		this._register(this._configService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration('workbench.iconTheme')) {
 				this.updateStyleSheet();
 			}
-		});
+		}));
 	}
-
-	dispose() {
-		this._styleElementDisposable?.dispose();
-		this._styleElementDisposable = undefined;
+	override dispose() {
+		super.dispose();
 		this._styleElement = undefined;
 	}
 
 	private get styleElement(): HTMLStyleElement {
 		if (!this._styleElement) {
-			this._styleElementDisposable = new DisposableStore();
-			this._styleElement = dom.createStyleSheet(undefined, undefined, this._styleElementDisposable);
+			this._styleElement = dom.createStyleSheet(undefined, undefined, this._store);
 			this._styleElement.className = 'webview-icons';
 		}
 		return this._styleElement;
diff --git a/src/vs/workbench/contrib/webviewPanel/browser/webviewPanel.contribution.ts b/src/vs/workbench/contrib/webviewPanel/browser/webviewPanel.contribution.ts
index 2d9fd6c87c8..426f2366ae5 100644
--- a/src/vs/workbench/contrib/webviewPanel/browser/webviewPanel.contribution.ts
+++ b/src/vs/workbench/contrib/webviewPanel/browser/webviewPanel.contribution.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { localize } from 'vs/nls';
-import { registerAction2 } from 'vs/platform/actions/common/actions';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { EditorPaneDescriptor, IEditorPaneRegistry } from 'vs/workbench/browser/editor';
-import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { EditorExtensions, IEditorFactoryRegistry } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { HideWebViewEditorFindCommand, ReloadWebviewAction, ShowWebViewEditorFindWidgetAction, WebViewEditorFindNextCommand, WebViewEditorFindPreviousCommand } from './webviewCommands';
-import { WebviewEditor } from './webviewEditor';
-import { WebviewInput } from './webviewEditorInput';
-import { WebviewEditorInputSerializer } from './webviewEditorInputSerializer';
-import { IWebviewWorkbenchService, WebviewEditorService } from './webviewWorkbenchService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { localize } from '../../../../nls.js';
+import { registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { EditorPaneDescriptor, IEditorPaneRegistry } from '../../../browser/editor.js';
+import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { EditorExtensions, IEditorFactoryRegistry } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { IEditorGroup, IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { HideWebViewEditorFindCommand, ReloadWebviewAction, ShowWebViewEditorFindWidgetAction, WebViewEditorFindNextCommand, WebViewEditorFindPreviousCommand } from './webviewCommands.js';
+import { WebviewEditor } from './webviewEditor.js';
+import { WebviewInput } from './webviewEditorInput.js';
+import { WebviewEditorInputSerializer } from './webviewEditorInputSerializer.js';
+import { IWebviewWorkbenchService, WebviewEditorService } from './webviewWorkbenchService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
 
 (Registry.as<IEditorPaneRegistry>(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(
 	WebviewEditor,
diff --git a/src/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.ts b/src/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.ts
index 6a2dc5881e7..65baea83ae6 100644
--- a/src/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.ts
+++ b/src/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancelablePromise, createCancelablePromise, DeferredPromise } from 'vs/base/common/async';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { memoize } from 'vs/base/common/decorators';
-import { isCancellationError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Iterable } from 'vs/base/common/iterator';
-import { combinedDisposable, Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { EditorActivation } from 'vs/platform/editor/common/editor';
-import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { GroupIdentifier } from 'vs/workbench/common/editor';
-import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { IOverlayWebview, IWebviewService, WebviewInitInfo } from 'vs/workbench/contrib/webview/browser/webview';
-import { CONTEXT_ACTIVE_WEBVIEW_PANEL_ID } from 'vs/workbench/contrib/webviewPanel/browser/webviewEditor';
-import { WebviewIconManager, WebviewIcons } from 'vs/workbench/contrib/webviewPanel/browser/webviewIconManager';
-import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { ACTIVE_GROUP_TYPE, IEditorService, SIDE_GROUP_TYPE } from 'vs/workbench/services/editor/common/editorService';
-import { WebviewInput, WebviewInputInitInfo } from './webviewEditorInput';
+import { CancelablePromise, createCancelablePromise, DeferredPromise } from '../../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { memoize } from '../../../../base/common/decorators.js';
+import { isCancellationError } from '../../../../base/common/errors.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { combinedDisposable, Disposable, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { EditorActivation } from '../../../../platform/editor/common/editor.js';
+import { createDecorator, IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { GroupIdentifier } from '../../../common/editor.js';
+import { DiffEditorInput } from '../../../common/editor/diffEditorInput.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { IOverlayWebview, IWebviewService, WebviewInitInfo } from '../../webview/browser/webview.js';
+import { CONTEXT_ACTIVE_WEBVIEW_PANEL_ID } from './webviewEditor.js';
+import { WebviewIconManager, WebviewIcons } from './webviewIconManager.js';
+import { IEditorGroup, IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { ACTIVE_GROUP_TYPE, IEditorService, SIDE_GROUP_TYPE } from '../../../services/editor/common/editorService.js';
+import { WebviewInput, WebviewInputInitInfo } from './webviewEditorInput.js';
 
 export interface IWebViewShowOptions {
 	readonly group?: IEditorGroup | GroupIdentifier | ACTIVE_GROUP_TYPE | SIDE_GROUP_TYPE;
diff --git a/src/vs/workbench/contrib/webviewView/browser/webviewView.contribution.ts b/src/vs/workbench/contrib/webviewView/browser/webviewView.contribution.ts
index 91d7abcc1da..00a681ab536 100644
--- a/src/vs/workbench/contrib/webviewView/browser/webviewView.contribution.ts
+++ b/src/vs/workbench/contrib/webviewView/browser/webviewView.contribution.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IWebviewViewService, WebviewViewService } from 'vs/workbench/contrib/webviewView/browser/webviewViewService';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IWebviewViewService, WebviewViewService } from './webviewViewService.js';
 
 registerSingleton(IWebviewViewService, WebviewViewService, InstantiationType.Delayed);
diff --git a/src/vs/workbench/contrib/webviewView/browser/webviewViewPane.ts b/src/vs/workbench/contrib/webviewView/browser/webviewViewPane.ts
index d740bd229c7..88f4a86cd2f 100644
--- a/src/vs/workbench/contrib/webviewView/browser/webviewViewPane.ts
+++ b/src/vs/workbench/contrib/webviewView/browser/webviewViewPane.ts
@@ -3,33 +3,33 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { addDisposableListener, Dimension, EventType, findParentWithClass, getWindow } from 'vs/base/browser/dom';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Emitter } from 'vs/base/common/event';
-import { DisposableStore, IDisposable, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IProgressService } from 'vs/platform/progress/common/progress';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ViewPane, ViewPaneShowActions } from 'vs/workbench/browser/parts/views/viewPane';
-import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
-import { Memento, MementoObject } from 'vs/workbench/common/memento';
-import { IViewBadge, IViewDescriptorService } from 'vs/workbench/common/views';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { ExtensionKeyedWebviewOriginStore, IOverlayWebview, IWebviewService, WebviewContentPurpose } from 'vs/workbench/contrib/webview/browser/webview';
-import { WebviewWindowDragMonitor } from 'vs/workbench/contrib/webview/browser/webviewWindowDragMonitor';
-import { IWebviewViewService, WebviewView } from 'vs/workbench/contrib/webviewView/browser/webviewViewService';
-import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
+import { addDisposableListener, Dimension, EventType, findParentWithClass, getWindow } from '../../../../base/browser/dom.js';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { DisposableStore, IDisposable, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IProgressService } from '../../../../platform/progress/common/progress.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ViewPane, ViewPaneShowActions } from '../../../browser/parts/views/viewPane.js';
+import { IViewletViewOptions } from '../../../browser/parts/views/viewsViewlet.js';
+import { Memento, MementoObject } from '../../../common/memento.js';
+import { IViewBadge, IViewDescriptorService } from '../../../common/views.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { ExtensionKeyedWebviewOriginStore, IOverlayWebview, IWebviewService, WebviewContentPurpose } from '../../webview/browser/webview.js';
+import { WebviewWindowDragMonitor } from '../../webview/browser/webviewWindowDragMonitor.js';
+import { IWebviewViewService, WebviewView } from './webviewViewService.js';
+import { IActivityService, NumberBadge } from '../../../services/activity/common/activity.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 
 declare const ResizeObserver: any;
 
diff --git a/src/vs/workbench/contrib/webviewView/browser/webviewViewService.ts b/src/vs/workbench/contrib/webviewView/browser/webviewViewService.ts
index 6aef6db005b..fecd4fd572f 100644
--- a/src/vs/workbench/contrib/webviewView/browser/webviewViewService.ts
+++ b/src/vs/workbench/contrib/webviewView/browser/webviewViewService.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { promiseWithResolvers } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IViewBadge } from 'vs/workbench/common/views';
-import { IOverlayWebview } from 'vs/workbench/contrib/webview/browser/webview';
+import { promiseWithResolvers } from '../../../../base/common/async.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IViewBadge } from '../../../common/views.js';
+import { IOverlayWebview } from '../../webview/browser/webview.js';
 
 /**
  * A webview shown in a view pane.
diff --git a/src/vs/workbench/contrib/welcomeBanner/browser/welcomeBanner.contribution.ts b/src/vs/workbench/contrib/welcomeBanner/browser/welcomeBanner.contribution.ts
index 12f828bb91d..51cacf826ff 100644
--- a/src/vs/workbench/contrib/welcomeBanner/browser/welcomeBanner.contribution.ts
+++ b/src/vs/workbench/contrib/welcomeBanner/browser/welcomeBanner.contribution.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
-import { IBannerService } from 'vs/workbench/services/banner/browser/bannerService';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { URI } from 'vs/base/common/uri';
-import { ThemeIcon } from 'vs/base/common/themables';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry } from '../../../common/contributions.js';
+import { IBannerService } from '../../../services/banner/browser/bannerService.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IBrowserWorkbenchEnvironmentService } from '../../../services/environment/browser/environmentService.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
 
 class WelcomeBannerContribution {
 
diff --git a/src/vs/workbench/contrib/welcomeDialog/browser/welcomeDialog.contribution.ts b/src/vs/workbench/contrib/welcomeDialog/browser/welcomeDialog.contribution.ts
index 5829f86670a..ece6304fe9c 100644
--- a/src/vs/workbench/contrib/welcomeDialog/browser/welcomeDialog.contribution.ts
+++ b/src/vs/workbench/contrib/welcomeDialog/browser/welcomeDialog.contribution.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry, IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
-import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { WelcomeWidget } from 'vs/workbench/contrib/welcomeDialog/browser/welcomeWidget';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
-import { localize } from 'vs/nls';
-import { applicationConfigurationNodeBase } from 'vs/workbench/common/configuration';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry, IWorkbenchContribution } from '../../../common/contributions.js';
+import { IStorageService, StorageScope } from '../../../../platform/storage/common/storage.js';
+import { IBrowserWorkbenchEnvironmentService } from '../../../services/environment/browser/environmentService.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { WelcomeWidget } from './welcomeWidget.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { localize } from '../../../../nls.js';
+import { applicationConfigurationNodeBase } from '../../../common/configuration.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
 
 const configurationKey = 'workbench.welcome.experimental.dialog';
 
diff --git a/src/vs/workbench/contrib/welcomeDialog/browser/welcomeWidget.ts b/src/vs/workbench/contrib/welcomeDialog/browser/welcomeWidget.ts
index 4d9159848bd..c33e006b35e 100644
--- a/src/vs/workbench/contrib/welcomeDialog/browser/welcomeWidget.ts
+++ b/src/vs/workbench/contrib/welcomeDialog/browser/welcomeWidget.ts
@@ -3,31 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/welcomeWidget';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, OverlayWidgetPositionPreference } from 'vs/editor/browser/editorBrowser';
-import { $, append, hide } from 'vs/base/browser/dom';
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { MarkdownRenderer } from 'vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ButtonBar } from 'vs/base/browser/ui/button/button';
-import { mnemonicButtonLabel } from 'vs/base/common/labels';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { defaultButtonStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { Action, WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from 'vs/base/common/actions';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { localize } from 'vs/nls';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { Codicon } from 'vs/base/common/codicons';
-import { LinkedText, parseLinkedText } from 'vs/base/common/linkedText';
-import { Link } from 'vs/platform/opener/browser/link';
-import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
-import { renderFormattedText } from 'vs/base/browser/formattedTextRenderer';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { Color } from 'vs/base/common/color';
-import { contrastBorder, editorWidgetBackground, editorWidgetForeground, widgetBorder, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
+import './media/welcomeWidget.css';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, OverlayWidgetPositionPreference } from '../../../../editor/browser/editorBrowser.js';
+import { $, append, hide } from '../../../../base/browser/dom.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { MarkdownRenderer } from '../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ButtonBar } from '../../../../base/browser/ui/button/button.js';
+import { mnemonicButtonLabel } from '../../../../base/common/labels.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { defaultButtonStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { Action, WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from '../../../../base/common/actions.js';
+import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { localize } from '../../../../nls.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { LinkedText, parseLinkedText } from '../../../../base/common/linkedText.js';
+import { Link } from '../../../../platform/opener/browser/link.js';
+import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { renderFormattedText } from '../../../../base/browser/formattedTextRenderer.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
+import { Color } from '../../../../base/common/color.js';
+import { contrastBorder, editorWidgetBackground, editorWidgetForeground, widgetBorder, widgetShadow } from '../../../../platform/theme/common/colorRegistry.js';
 
 export class WelcomeWidget extends Disposable implements IOverlayWidget {
 
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
index c581ac0e4d2..e5b58995fd2 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
@@ -3,35 +3,38 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize, localize2 } from 'vs/nls';
-import { GettingStartedInputSerializer, GettingStartedPage, inWelcomeContext } from 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { EditorExtensions, IEditorFactoryRegistry } from 'vs/workbench/common/editor';
-import { MenuId, registerAction2, Action2 } from 'vs/platform/actions/common/actions';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ContextKeyExpr, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { EditorPaneDescriptor, IEditorPaneRegistry } from 'vs/workbench/browser/editor';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { IWalkthroughsService } from 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService';
-import { GettingStartedEditorOptions, GettingStartedInput } from 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedInput';
-import { registerWorkbenchContribution2, WorkbenchPhase } from 'vs/workbench/common/contributions';
-import { ConfigurationScope, Extensions as ConfigurationExtensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { workbenchConfigurationNodeBase } from 'vs/workbench/common/configuration';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
-import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { isLinux, isMacintosh, isWindows, OperatingSystem as OS } from 'vs/base/common/platform';
-import { IExtensionManagementServerService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { StartupPageEditorResolverContribution, StartupPageRunnerContribution } from 'vs/workbench/contrib/welcomeGettingStarted/browser/startupPage';
-import { ExtensionsInput } from 'vs/workbench/contrib/extensions/common/extensionsInput';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
+import { localize, localize2 } from '../../../../nls.js';
+import { GettingStartedInputSerializer, GettingStartedPage, inWelcomeContext } from './gettingStarted.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { EditorExtensions, IEditorFactoryRegistry } from '../../../common/editor.js';
+import { MenuId, registerAction2, Action2 } from '../../../../platform/actions/common/actions.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { ContextKeyExpr, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IEditorService, SIDE_GROUP } from '../../../services/editor/common/editorService.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { EditorPaneDescriptor, IEditorPaneRegistry } from '../../../browser/editor.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { IWalkthroughsService } from './gettingStartedService.js';
+import { GettingStartedEditorOptions, GettingStartedInput } from './gettingStartedInput.js';
+import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
+import { ConfigurationScope, Extensions as ConfigurationExtensions, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { workbenchConfigurationNodeBase } from '../../../common/configuration.js';
+import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { CommandsRegistry, ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IQuickInputService, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
+import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';
+import { isLinux, isMacintosh, isWindows, OperatingSystem as OS } from '../../../../base/common/platform.js';
+import { IExtensionManagementServerService } from '../../../services/extensionManagement/common/extensionManagement.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { StartupPageEditorResolverContribution, StartupPageRunnerContribution } from './startupPage.js';
+import { ExtensionsInput } from '../../extensions/common/extensionsInput.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { AccessibleViewRegistry } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
+import { GettingStartedAccessibleView } from './gettingStartedAccessibleView.js';
 
-export * as icons from 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedIcons';
+export * as icons from './gettingStartedIcons.js';
 
 registerAction2(class extends Action2 {
 	constructor() {
@@ -63,7 +66,12 @@ registerAction2(class extends Action2 {
 
 		if (walkthroughID) {
 			const selectedCategory = typeof walkthroughID === 'string' ? walkthroughID : walkthroughID.category;
-			const selectedStep = typeof walkthroughID === 'string' ? undefined : walkthroughID.category + '#' + walkthroughID.step;
+			let selectedStep: string | undefined;
+			if (typeof walkthroughID === 'object' && 'category' in walkthroughID && 'step' in walkthroughID) {
+				selectedStep = `${walkthroughID.category}#${walkthroughID.step}`;
+			} else {
+				selectedStep = undefined;
+			}
 
 			// We're trying to open the welcome page from the Help menu
 			if (!selectedCategory && !selectedStep) {
@@ -77,6 +85,8 @@ registerAction2(class extends Action2 {
 			// Try first to select the walkthrough on an active welcome page with no selected walkthrough
 			for (const group of editorGroupsService.groups) {
 				if (group.activeEditor instanceof GettingStartedInput) {
+					const activeEditor = group.activeEditor as GettingStartedInput;
+					activeEditor.showWelcome = false;
 					(group.activeEditorPane as GettingStartedPage).makeCategoryVisibleWhenAvailable(selectedCategory, selectedStep);
 					return;
 				}
@@ -90,6 +100,7 @@ registerAction2(class extends Action2 {
 					if (!editor.selectedCategory && group) {
 						editor.selectedCategory = selectedCategory;
 						editor.selectedStep = selectedStep;
+						editor.showWelcome = false;
 						group.openEditor(editor, { revealIfOpened: true });
 						return;
 					}
@@ -99,6 +110,7 @@ registerAction2(class extends Action2 {
 			const activeEditor = editorService.activeEditor;
 			// If the walkthrough is already open just reveal the step
 			if (selectedStep && activeEditor instanceof GettingStartedInput && activeEditor.selectedCategory === selectedCategory) {
+				activeEditor.showWelcome = false;
 				commandService.executeCommand('walkthroughs.selectStep', selectedStep);
 				return;
 			}
@@ -108,11 +120,11 @@ registerAction2(class extends Action2 {
 				const activeGroup = editorGroupsService.activeGroup;
 				activeGroup.replaceEditors([{
 					editor: activeEditor,
-					replacement: instantiationService.createInstance(GettingStartedInput, { selectedCategory: selectedCategory, selectedStep: selectedStep })
+					replacement: instantiationService.createInstance(GettingStartedInput, { selectedCategory: selectedCategory, selectedStep: selectedStep, showWelcome: false })
 				}]);
 			} else {
 				// else open respecting toSide
-				const options: GettingStartedEditorOptions = { selectedCategory: selectedCategory, selectedStep: selectedStep, preserveFocus: toSide ?? false };
+				const options: GettingStartedEditorOptions = { selectedCategory: selectedCategory, selectedStep: selectedStep, showWelcome: false, preserveFocus: toSide ?? false };
 				editorService.openEditor({
 					resource: GettingStartedInput.RESOURCE,
 					options
@@ -246,21 +258,22 @@ registerAction2(class extends Action2 {
 		const gettingStartedService = accessor.get(IWalkthroughsService);
 		const extensionService = accessor.get(IExtensionService);
 
-		const quickPick = quickInputService.createQuickPick();
+		const disposables = new DisposableStore();
+		const quickPick = disposables.add(quickInputService.createQuickPick());
 		quickPick.canSelectMany = false;
 		quickPick.matchOnDescription = true;
 		quickPick.matchOnDetail = true;
 		quickPick.placeholder = localize('pickWalkthroughs', 'Select a walkthrough to open');
 		quickPick.items = await this.getQuickPickItems(contextService, gettingStartedService);
 		quickPick.busy = true;
-		quickPick.onDidAccept(() => {
+		disposables.add(quickPick.onDidAccept(() => {
 			const selection = quickPick.selectedItems[0];
 			if (selection) {
 				commandService.executeCommand('workbench.action.openWalkthrough', selection.id);
 			}
 			quickPick.hide();
-		});
-		quickPick.onDidHide(() => quickPick.dispose());
+		}));
+		disposables.add(quickPick.onDidHide(() => disposables.dispose()));
 		await extensionService.whenInstalledExtensionsRegistered();
 		gettingStartedService.onDidAddWalkthrough(async () => {
 			quickPick.items = await this.getQuickPickItems(contextService, gettingStartedService);
@@ -345,3 +358,6 @@ configurationRegistry.registerConfiguration({
 registerWorkbenchContribution2(WorkspacePlatformContribution.ID, WorkspacePlatformContribution, WorkbenchPhase.AfterRestored);
 registerWorkbenchContribution2(StartupPageEditorResolverContribution.ID, StartupPageEditorResolverContribution, WorkbenchPhase.BlockRestore);
 registerWorkbenchContribution2(StartupPageRunnerContribution.ID, StartupPageRunnerContribution, WorkbenchPhase.AfterRestored);
+
+AccessibleViewRegistry.register(new GettingStartedAccessibleView());
+
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
index 46bac27a420..4641275f880 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
@@ -3,73 +3,74 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { $, Dimension, addDisposableListener, append, clearNode, reset } from 'vs/base/browser/dom';
-import { renderFormattedText } from 'vs/base/browser/formattedTextRenderer';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { Button } from 'vs/base/browser/ui/button/button';
-import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
-import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
-import { Toggle } from 'vs/base/browser/ui/toggle/toggle';
-import { coalesce, equals } from 'vs/base/common/arrays';
-import { Delayer, Throttler } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Codicon } from 'vs/base/common/codicons';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { splitRecentLabel } from 'vs/base/common/labels';
-import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { ILink, LinkedText } from 'vs/base/common/linkedText';
-import { parse } from 'vs/base/common/marshalling';
-import { Schemas, matchesScheme } from 'vs/base/common/network';
-import { isMacintosh } from 'vs/base/common/platform';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { assertIsDefined } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import 'vs/css!./media/gettingStarted';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { MarkdownRenderer } from 'vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
-import { localize } from 'vs/nls';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr, ContextKeyExpression, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IEditorOptions } from 'vs/platform/editor/common/editor';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ILabelService, Verbosity } from 'vs/platform/label/common/label';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { Link } from 'vs/platform/opener/browser/link';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { IStorageService, StorageScope, StorageTarget, WillSaveStateReason } from 'vs/platform/storage/common/storage';
-import { ITelemetryService, TelemetryLevel, firstSessionDateStorageKey } from 'vs/platform/telemetry/common/telemetry';
-import { getTelemetryLevel } from 'vs/platform/telemetry/common/telemetryUtils';
-import { defaultButtonStyles, defaultToggleStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { IWindowOpenable } from 'vs/platform/window/common/window';
-import { IWorkspaceContextService, UNKNOWN_EMPTY_WINDOW_WORKSPACE } from 'vs/platform/workspace/common/workspace';
-import { IRecentFolder, IRecentWorkspace, IRecentlyOpened, IWorkspacesService, isRecentFolder, isRecentWorkspace } from 'vs/platform/workspaces/common/workspaces';
-import { OpenRecentAction } from 'vs/workbench/browser/actions/windowActions';
-import { OpenFileFolderAction, OpenFolderAction, OpenFolderViaWorkspaceAction } from 'vs/workbench/browser/actions/workspaceActions';
-import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
-import { WorkbenchStateContext } from 'vs/workbench/common/contextkeys';
-import { IEditorOpenContext, IEditorSerializer } from 'vs/workbench/common/editor';
-import { IWebviewElement, IWebviewService } from 'vs/workbench/contrib/webview/browser/webview';
-import 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedColors';
-import { GettingStartedDetailsRenderer } from 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedDetailsRenderer';
-import { gettingStartedCheckedCodicon, gettingStartedUncheckedCodicon } from 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedIcons';
-import { GettingStartedInput } from 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedInput';
-import { IResolvedWalkthrough, IResolvedWalkthroughStep, IWalkthroughsService, hiddenEntriesConfigurationKey, parseDescription } from 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService';
-import { RestoreWalkthroughsConfigurationValue, restoreWalkthroughsConfigurationKey } from 'vs/workbench/contrib/welcomeGettingStarted/browser/startupPage';
-import { startEntries } from 'vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent';
-import { GroupDirection, GroupsOrder, IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
-import { GettingStartedIndexList } from './gettingStartedList';
-import { IWorkbenchAssignmentService } from 'vs/workbench/services/assignment/common/assignmentService';
+import { $, Dimension, addDisposableListener, append, clearNode, reset } from '../../../../base/browser/dom.js';
+import { renderFormattedText } from '../../../../base/browser/formattedTextRenderer.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { Button } from '../../../../base/browser/ui/button/button.js';
+import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { DomScrollableElement } from '../../../../base/browser/ui/scrollbar/scrollableElement.js';
+import { Toggle } from '../../../../base/browser/ui/toggle/toggle.js';
+import { coalesce, equals } from '../../../../base/common/arrays.js';
+import { Delayer, Throttler } from '../../../../base/common/async.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { splitRecentLabel } from '../../../../base/common/labels.js';
+import { DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { ILink, LinkedText } from '../../../../base/common/linkedText.js';
+import { parse } from '../../../../base/common/marshalling.js';
+import { Schemas, matchesScheme } from '../../../../base/common/network.js';
+import { isMacintosh } from '../../../../base/common/platform.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { assertIsDefined } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import './media/gettingStarted.css';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { MarkdownRenderer } from '../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import { localize } from '../../../../nls.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { ConfigurationTarget, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr, ContextKeyExpression, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { ILabelService, Verbosity } from '../../../../platform/label/common/label.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { Link } from '../../../../platform/opener/browser/link.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { IStorageService, StorageScope, StorageTarget, WillSaveStateReason } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService, TelemetryLevel, firstSessionDateStorageKey } from '../../../../platform/telemetry/common/telemetry.js';
+import { getTelemetryLevel } from '../../../../platform/telemetry/common/telemetryUtils.js';
+import { defaultButtonStyles, defaultToggleStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { IWindowOpenable } from '../../../../platform/window/common/window.js';
+import { IWorkspaceContextService, UNKNOWN_EMPTY_WINDOW_WORKSPACE } from '../../../../platform/workspace/common/workspace.js';
+import { IRecentFolder, IRecentWorkspace, IRecentlyOpened, IWorkspacesService, isRecentFolder, isRecentWorkspace } from '../../../../platform/workspaces/common/workspaces.js';
+import { OpenRecentAction } from '../../../browser/actions/windowActions.js';
+import { OpenFileFolderAction, OpenFolderAction, OpenFolderViaWorkspaceAction } from '../../../browser/actions/workspaceActions.js';
+import { EditorPane } from '../../../browser/parts/editor/editorPane.js';
+import { WorkbenchStateContext } from '../../../common/contextkeys.js';
+import { IEditorOpenContext, IEditorSerializer } from '../../../common/editor.js';
+import { IWebviewElement, IWebviewService } from '../../webview/browser/webview.js';
+import './gettingStartedColors.js';
+import { GettingStartedDetailsRenderer } from './gettingStartedDetailsRenderer.js';
+import { gettingStartedCheckedCodicon, gettingStartedUncheckedCodicon } from './gettingStartedIcons.js';
+import { GettingStartedInput } from './gettingStartedInput.js';
+import { IResolvedWalkthrough, IResolvedWalkthroughStep, IWalkthroughsService, hiddenEntriesConfigurationKey, parseDescription } from './gettingStartedService.js';
+import { RestoreWalkthroughsConfigurationValue, restoreWalkthroughsConfigurationKey } from './startupPage.js';
+import { startEntries } from '../common/gettingStartedContent.js';
+import { GroupDirection, GroupsOrder, IEditorGroup, IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { IWorkbenchThemeService } from '../../../services/themes/common/workbenchThemeService.js';
+import { GettingStartedIndexList } from './gettingStartedList.js';
+import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
+import { AccessibleViewAction } from '../../accessibility/browser/accessibleViewActions.js';
 
 const SLIDE_TRANSITION_TIME_MS = 250;
 const configurationKey = 'workbench.startupEditor';
@@ -132,6 +133,7 @@ export class GettingStartedPage extends EditorPane {
 	private gettingStartedCategories!: IResolvedWalkthrough[];
 
 	private currentWalkthrough: IResolvedWalkthrough | undefined;
+	private prevWalkthrough: IResolvedWalkthrough | undefined;
 
 	private categoriesPageScrollbar: DomScrollableElement | undefined;
 	private detailsPageScrollbar: DomScrollableElement | undefined;
@@ -148,7 +150,6 @@ export class GettingStartedPage extends EditorPane {
 	private recentlyOpenedList?: GettingStartedIndexList<RecentEntry>;
 	private startList?: GettingStartedIndexList<IWelcomePageStartEntry>;
 	private gettingStartedList?: GettingStartedIndexList<IResolvedWalkthrough>;
-	private videoList?: GettingStartedIndexList<IWelcomePageStartEntry>;
 
 	private stepsSlide!: HTMLElement;
 	private categoriesSlide!: HTMLElement;
@@ -187,8 +188,7 @@ export class GettingStartedPage extends EditorPane {
 		@IHostService private readonly hostService: IHostService,
 		@IWebviewService private readonly webviewService: IWebviewService,
 		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
-		@IAccessibilityService private readonly accessibilityService: IAccessibilityService,
-		@IWorkbenchAssignmentService private readonly tasExperimentService: IWorkbenchAssignmentService
+		@IAccessibilityService private readonly accessibilityService: IAccessibilityService
 	) {
 
 		super(GettingStartedPage.ID, group, telemetryService, themeService, storageService);
@@ -437,16 +437,13 @@ export class GettingStartedPage extends EditorPane {
 			case 'nextSection': {
 				const next = this.currentWalkthrough?.next;
 				if (next) {
+					this.prevWalkthrough = this.currentWalkthrough;
 					this.scrollToCategory(next);
 				} else {
 					console.error('Error scrolling to next section of', this.currentWalkthrough);
 				}
 				break;
 			}
-			case 'hideVideos': {
-				this.hideVideos();
-				break;
-			}
 			case 'openLink': {
 				this.openerService.open(argument);
 				break;
@@ -465,11 +462,6 @@ export class GettingStartedPage extends EditorPane {
 		this.gettingStartedList?.rerender();
 	}
 
-	private hideVideos() {
-		this.setHiddenCategories([...this.getHiddenCategories().add('getting-started-videos')]);
-		this.videoList?.setEntries(undefined);
-	}
-
 	private markAllStepsComplete() {
 		if (this.currentWalkthrough) {
 			this.currentWalkthrough?.steps.forEach(step => {
@@ -716,6 +708,14 @@ export class GettingStartedPage extends EditorPane {
 		}
 	}
 
+	private provideScreenReaderUpdate(): string {
+		if (this.configurationService.getValue(AccessibilityVerbositySettingId.Walkthrough)) {
+			const kbLabel = this.keybindingService.lookupKeybinding(AccessibleViewAction.id)?.getAriaLabel();
+			return kbLabel ? localize('acessibleViewHint', "Inspect this in the accessible view ({0}).\n", kbLabel) : localize('acessibleViewHintNoKbOpen', "Inspect this in the accessible view via the command Open Accessible View which is currently not triggerable via keybinding.\n");
+		}
+		return '';
+	}
+
 	private async selectStep(id: string | undefined, delayFocus = true) {
 		if (id) {
 			let stepElement = this.container.querySelector<HTMLDivElement>(`[data-step-id="${id}"]`);
@@ -742,6 +742,10 @@ export class GettingStartedPage extends EditorPane {
 			stepElement.setAttribute('aria-expanded', 'true');
 			this.buildMediaComponent(id, true);
 			this.gettingStartedService.progressByEvent('stepSelected:' + id);
+			const step = this.currentWalkthrough?.steps?.find(step => step.id === id);
+			if (step) {
+				stepElement.setAttribute('aria-label', `${this.provideScreenReaderUpdate()} ${step.title}`);
+			}
 		} else {
 			this.editorInput.selectedStep = undefined;
 		}
@@ -762,7 +766,7 @@ export class GettingStartedPage extends EditorPane {
 
 		this.categoriesSlide = $('.gettingStartedSlideCategories.gettingStartedSlide');
 
-		const prevButton = $('button.prev-button.button-link', { 'x-dispatch': 'scrollPrev' }, $('span.scroll-button.codicon.codicon-chevron-left'), $('span.moreText', {}, localize('welcome', "Welcome")));
+		const prevButton = $('button.prev-button.button-link', { 'x-dispatch': 'scrollPrev' }, $('span.scroll-button.codicon.codicon-chevron-left'), $('span.moreText', {}, localize('goBack', "Go Back")));
 		this.stepsSlide = $('.gettingStartedSlideDetails.gettingStartedSlide', {}, prevButton);
 
 		this.stepsContent = $('.gettingStartedDetailsContent', {});
@@ -821,29 +825,6 @@ export class GettingStartedPage extends EditorPane {
 
 		const startList = this.buildStartList();
 		const recentList = this.buildRecentlyOpenedList();
-
-		const showVideoTutorials = await Promise.race([
-			this.tasExperimentService?.getTreatment<boolean>('gettingStarted.showVideoTutorials'),
-			new Promise<boolean | undefined>(resolve => setTimeout(() => resolve(false), 200))
-		]);
-
-		let videoList: GettingStartedIndexList<IWelcomePageStartEntry>;
-		if (showVideoTutorials === true) {
-			this.showFeaturedWalkthrough = false;
-			videoList = this.buildVideosList();
-			const layoutVideos = () => {
-				if (videoList?.itemCount > 0) {
-					reset(rightColumn, videoList?.getDomElement(), gettingStartedList.getDomElement());
-				}
-				else {
-					reset(rightColumn, gettingStartedList.getDomElement());
-				}
-				setTimeout(() => this.categoriesPageScrollbar?.scanDomNode(), 50);
-				layoutRecentList();
-			};
-			videoList.onDidChange(layoutVideos);
-		}
-
 		const gettingStartedList = this.buildGettingStartedWalkthroughsList();
 
 		const footer = $('.footer', {},
@@ -855,31 +836,18 @@ export class GettingStartedPage extends EditorPane {
 		const layoutLists = () => {
 			if (gettingStartedList.itemCount) {
 				this.container.classList.remove('noWalkthroughs');
-				if (videoList?.itemCount > 0) {
-					this.container.classList.remove('noVideos');
-					reset(rightColumn, videoList?.getDomElement(), gettingStartedList.getDomElement());
-				} else {
-					this.container.classList.add('noVideos');
-					reset(rightColumn, gettingStartedList.getDomElement());
-				}
+				reset(rightColumn, gettingStartedList.getDomElement());
 			}
 			else {
 				this.container.classList.add('noWalkthroughs');
-				if (videoList?.itemCount > 0) {
-					this.container.classList.remove('noVideos');
-					reset(rightColumn, videoList?.getDomElement());
-				}
-				else {
-					this.container.classList.add('noVideos');
-					reset(rightColumn);
-				}
+				reset(rightColumn);
 			}
 			setTimeout(() => this.categoriesPageScrollbar?.scanDomNode(), 50);
 			layoutRecentList();
 		};
 
 		const layoutRecentList = () => {
-			if (this.container.classList.contains('noWalkthroughs') && this.container.classList.contains('noVideos')) {
+			if (this.container.classList.contains('noWalkthroughs')) {
 				recentList.setLimit(10);
 				reset(leftColumn, startList.getDomElement());
 				reset(rightColumn, recentList.getDomElement());
@@ -934,7 +902,7 @@ export class GettingStartedPage extends EditorPane {
 					this.currentWalkthrough = first;
 					this.editorInput.selectedCategory = this.currentWalkthrough?.id;
 					this.buildCategorySlide(this.editorInput.selectedCategory, undefined);
-					this.setSlide('details');
+					this.setSlide('details', true /* firstLaunch */);
 					return;
 				}
 			}
@@ -1139,69 +1107,6 @@ export class GettingStartedPage extends EditorPane {
 		return gettingStartedList;
 	}
 
-	private buildVideosList(): GettingStartedIndexList<IWelcomePageStartEntry> {
-
-		const renderFeaturedExtensions = (entry: IWelcomePageStartEntry): HTMLElement => {
-
-			const featuredBadge = $('.featured-badge', {});
-			const descriptionContent = $('.description-content', {},);
-
-			reset(featuredBadge, $('.featured', {}, $('span.featured-icon.codicon.codicon-star-full')));
-			reset(descriptionContent, ...renderLabelWithIcons(entry.description));
-
-			const titleContent = $('h3.category-title.max-lines-3', { 'x-category-title-for': entry.id });
-			reset(titleContent, ...renderLabelWithIcons(entry.title));
-
-			return $('button.getting-started-category' + '.featured',
-				{
-					'x-dispatch': 'openLink:' + entry.command,
-					'title': entry.title
-				},
-				featuredBadge,
-				$('.main-content', {},
-					this.iconWidgetFor(entry),
-					titleContent,
-					$('a.codicon.codicon-close.hide-category-button', {
-						'tabindex': 0,
-						'x-dispatch': 'hideVideos',
-						'title': localize('close', "Hide"),
-						'role': 'button',
-						'aria-label': localize('closeAriaLabel', "Hide"),
-					}),
-				),
-				descriptionContent);
-		};
-
-		if (this.videoList) {
-			this.videoList.dispose();
-		}
-		const videoList = this.videoList = new GettingStartedIndexList(
-			{
-				title: localize('videos', "Videos"),
-				klass: 'getting-started-videos',
-				limit: 1,
-				renderElement: renderFeaturedExtensions,
-				contextService: this.contextService,
-			});
-
-		if (this.getHiddenCategories().has('getting-started-videos')) {
-			return videoList;
-		}
-
-		videoList.setEntries([{
-			id: 'getting-started-videos',
-			title: localize('videos-title', 'Watch Getting Started Tutorials'),
-			description: localize('videos-description', 'Learn VS Code\'s must-have features in short and practical videos'),
-			command: 'https://aka.ms/vscode-getting-started-tutorials',
-			order: 0,
-			icon: { type: 'icon', icon: Codicon.deviceCameraVideo },
-			when: ContextKeyExpr.true(),
-		}]);
-		videoList.onDidChange(() => this.registerDispatchListeners());
-
-		return videoList;
-	}
-
 	layout(size: Dimension) {
 		this.detailsScrollbar?.scanDomNode();
 
@@ -1211,7 +1116,6 @@ export class GettingStartedPage extends EditorPane {
 		this.startList?.layout(size);
 		this.gettingStartedList?.layout(size);
 		this.recentlyOpenedList?.layout(size);
-		this.videoList?.layout(size);
 
 		if (this.editorInput?.selectedStep && this.currentMediaType) {
 			this.mediaDisposables.clear();
@@ -1603,20 +1507,26 @@ export class GettingStartedPage extends EditorPane {
 
 	private async scrollPrev() {
 		this.inProgressScroll = this.inProgressScroll.then(async () => {
-			this.currentWalkthrough = undefined;
-			this.editorInput.selectedCategory = undefined;
-			this.editorInput.selectedStep = undefined;
-			this.editorInput.showTelemetryNotice = false;
+			if (this.prevWalkthrough && this.prevWalkthrough !== this.currentWalkthrough) {
+				this.currentWalkthrough = this.prevWalkthrough;
+				this.prevWalkthrough = undefined;
+				this.makeCategoryVisibleWhenAvailable(this.currentWalkthrough.id);
+			} else {
+				this.currentWalkthrough = undefined;
+				this.editorInput.selectedCategory = undefined;
+				this.editorInput.selectedStep = undefined;
+				this.editorInput.showTelemetryNotice = false;
 
-			if (this.gettingStartedCategories.length !== this.gettingStartedList?.itemCount) {
-				// extensions may have changed in the time since we last displayed the walkthrough list
-				// rebuild the list
-				this.buildCategoriesSlide();
+				if (this.gettingStartedCategories.length !== this.gettingStartedList?.itemCount) {
+					// extensions may have changed in the time since we last displayed the walkthrough list
+					// rebuild the list
+					this.buildCategoriesSlide();
+				}
+
+				this.selectStep(undefined);
+				this.setSlide('categories');
+				this.container.focus();
 			}
-
-			this.selectStep(undefined);
-			this.setSlide('categories');
-			this.container.focus();
 		});
 	}
 
@@ -1632,7 +1542,7 @@ export class GettingStartedPage extends EditorPane {
 		}
 	}
 
-	private setSlide(toEnable: 'details' | 'categories') {
+	private setSlide(toEnable: 'details' | 'categories', firstLaunch: boolean = false) {
 		const slideManager = assertIsDefined(this.container.querySelector('.gettingStarted'));
 		if (toEnable === 'categories') {
 			slideManager.classList.remove('showDetails');
@@ -1644,7 +1554,12 @@ export class GettingStartedPage extends EditorPane {
 		} else {
 			slideManager.classList.add('showDetails');
 			slideManager.classList.remove('showCategories');
-			this.container.querySelector<HTMLButtonElement>('.prev-button.button-link')!.style.display = 'block';
+			const prevButton = this.container.querySelector<HTMLButtonElement>('.prev-button.button-link');
+			prevButton!.style.display = this.editorInput.showWelcome || this.prevWalkthrough ? 'block' : 'none';
+
+			const moreTextElement = prevButton!.querySelector('.moreText');
+			moreTextElement!.textContent = firstLaunch ? localize('welcome', "Welcome") : localize('goBack', "Go Back");
+
 			this.container.querySelector('.gettingStartedSlideDetails')!.querySelectorAll('button').forEach(button => button.disabled = false);
 			this.container.querySelector('.gettingStartedSlideCategories')!.querySelectorAll('button').forEach(button => button.disabled = true);
 			this.container.querySelector('.gettingStartedSlideCategories')!.querySelectorAll('input').forEach(button => button.disabled = true);
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedAccessibleView.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedAccessibleView.ts
new file mode 100644
index 00000000000..ef1d636c682
--- /dev/null
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedAccessibleView.ts
@@ -0,0 +1,108 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import { AccessibleViewType, AccessibleContentProvider, ExtensionContentProvider, IAccessibleViewContentProvider, AccessibleViewProviderId } from '../../../../platform/accessibility/browser/accessibleView.js';
+import { IAccessibleViewImplentation } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { GettingStartedPage, inWelcomeContext } from './gettingStarted.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IResolvedWalkthrough, IResolvedWalkthroughStep, IWalkthroughsService } from './gettingStartedService.js';
+import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { GettingStartedInput } from './gettingStartedInput.js';
+import { localize } from '../../../../nls.js';
+
+export class GettingStartedAccessibleView implements IAccessibleViewImplentation {
+	readonly type = AccessibleViewType.View;
+	readonly priority = 110;
+	readonly name = 'walkthroughs';
+	readonly when = inWelcomeContext;
+
+	getProvider = (accessor: ServicesAccessor): AccessibleContentProvider | ExtensionContentProvider | undefined => {
+		const editorService = accessor.get(IEditorService);
+		const editorPane = editorService.activeEditorPane;
+		if (!(editorPane instanceof GettingStartedPage)) {
+			return;
+		}
+		const gettingStartedInput = editorPane.input;
+		if (!(gettingStartedInput instanceof GettingStartedInput) || !gettingStartedInput.selectedCategory) {
+			return;
+		}
+
+		const gettingStartedService = accessor.get(IWalkthroughsService);
+		const currentWalkthrough = gettingStartedService.getWalkthrough(gettingStartedInput.selectedCategory);
+		const currentStepIds = gettingStartedInput.selectedStep;
+		if (currentWalkthrough) {
+
+			return new GettingStartedAccessibleProvider(accessor.get(IContextKeyService), editorPane, currentWalkthrough, currentStepIds);
+		}
+		return;
+	};
+}
+
+class GettingStartedAccessibleProvider extends Disposable implements IAccessibleViewContentProvider {
+
+	private _currentStepIndex: number = 0;
+	private _activeWalkthroughSteps: IResolvedWalkthroughStep[] = [];
+
+	constructor(
+		private contextService: IContextKeyService,
+		private readonly _gettingStartedPage: GettingStartedPage,
+		private readonly _focusedItem: IResolvedWalkthrough,
+		private readonly _focusedStep?: string | undefined,
+	) {
+		super();
+		this._activeWalkthroughSteps = _focusedItem.steps.filter(step => !step.when || this.contextService.contextMatchesRules(step.when));
+	}
+
+	readonly id = AccessibleViewProviderId.Walkthrough;
+	readonly verbositySettingKey = AccessibilityVerbositySettingId.Walkthrough;
+	readonly options = { type: AccessibleViewType.View };
+
+	provideContent(): string {
+		if (this._focusedStep) {
+			const stepIndex = this._activeWalkthroughSteps.findIndex(step => step.id === this._focusedStep);
+			if (stepIndex !== -1) {
+				this._currentStepIndex = stepIndex;
+			}
+		}
+		return this._getContent(this._currentStepIndex + 1, this._focusedItem, this._activeWalkthroughSteps[this._currentStepIndex]);
+	}
+
+	private _getContent(index: number, waltkrough: IResolvedWalkthrough, step: IResolvedWalkthroughStep): string {
+
+		const stepsContent =
+			localize('gettingStarted.step', 'Step {0}: {1}\nDescription: {2}', index, step.title, step.description.join(' '));
+
+		return [
+			localize('gettingStarted.title', 'Title: {0}', waltkrough.title),
+			localize('gettingStarted.description', 'Description: {0}', waltkrough.description),
+			stepsContent
+		].join('\n\n');
+	}
+
+	provideNextContent(): string | undefined {
+		if (++this._currentStepIndex >= this._activeWalkthroughSteps.length) {
+			--this._currentStepIndex;
+			return;
+		}
+		return this._getContent(this._currentStepIndex + 1, this._focusedItem, this._activeWalkthroughSteps[this._currentStepIndex]);
+	}
+
+	providePreviousContent(): string | undefined {
+		if (--this._currentStepIndex < 0) {
+			++this._currentStepIndex;
+			return;
+		}
+		return this._getContent(this._currentStepIndex + 1, this._focusedItem, this._activeWalkthroughSteps[this._currentStepIndex]);
+	}
+
+	onClose(): void {
+		if (this._currentStepIndex > -1) {
+			const currentStep = this._activeWalkthroughSteps[this._currentStepIndex];
+			this._gettingStartedPage.makeCategoryVisibleWhenAvailable(this._focusedItem.id, currentStep.id);
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedColors.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedColors.ts
index 8e934b891a3..cc10f6cc139 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedColors.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedColors.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { darken, inputBackground, editorWidgetBackground, lighten, registerColor, textLinkForeground, contrastBorder } from 'vs/platform/theme/common/colorRegistry';
-import { localize } from 'vs/nls';
+import { darken, inputBackground, editorWidgetBackground, lighten, registerColor, textLinkForeground, contrastBorder } from '../../../../platform/theme/common/colorRegistry.js';
+import { localize } from '../../../../nls.js';
 
 // Seprate from main module to break dependency cycles between welcomePage and gettingStarted.
-export const welcomePageBackground = registerColor('welcomePage.background', { light: null, dark: null, hcDark: null, hcLight: null }, localize('welcomePage.background', 'Background color for the Welcome page.'));
+export const welcomePageBackground = registerColor('welcomePage.background', null, localize('welcomePage.background', 'Background color for the Welcome page.'));
 
 export const welcomePageTileBackground = registerColor('welcomePage.tileBackground', { dark: editorWidgetBackground, light: editorWidgetBackground, hcDark: '#000', hcLight: editorWidgetBackground }, localize('welcomePage.tileBackground', 'Background color for the tiles on the Welcome page.'));
 export const welcomePageTileHoverBackground = registerColor('welcomePage.tileHoverBackground', { dark: lighten(editorWidgetBackground, .2), light: darken(editorWidgetBackground, .1), hcDark: null, hcLight: null }, localize('welcomePage.tileHoverBackground', 'Hover background color for the tiles on the Welcome.'));
 export const welcomePageTileBorder = registerColor('welcomePage.tileBorder', { dark: '#ffffff1a', light: '#0000001a', hcDark: contrastBorder, hcLight: contrastBorder }, localize('welcomePage.tileBorder', 'Border color for the tiles on the Welcome page.'));
 
 
-export const welcomePageProgressBackground = registerColor('welcomePage.progress.background', { light: inputBackground, dark: inputBackground, hcDark: inputBackground, hcLight: inputBackground }, localize('welcomePage.progress.background', 'Foreground color for the Welcome page progress bars.'));
-export const welcomePageProgressForeground = registerColor('welcomePage.progress.foreground', { light: textLinkForeground, dark: textLinkForeground, hcDark: textLinkForeground, hcLight: textLinkForeground }, localize('welcomePage.progress.foreground', 'Background color for the Welcome page progress bars.'));
+export const welcomePageProgressBackground = registerColor('welcomePage.progress.background', inputBackground, localize('welcomePage.progress.background', 'Foreground color for the Welcome page progress bars.'));
+export const welcomePageProgressForeground = registerColor('welcomePage.progress.foreground', textLinkForeground, localize('welcomePage.progress.foreground', 'Background color for the Welcome page progress bars.'));
 
 export const walkthroughStepTitleForeground = registerColor('walkthrough.stepTitle.foreground', { light: '#000000', dark: '#ffffff', hcDark: null, hcLight: null }, localize('walkthrough.stepTitle.foreground', 'Foreground color of the heading of each walkthrough step'));
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedDetailsRenderer.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedDetailsRenderer.ts
index 869f44526b4..53e8a273940 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedDetailsRenderer.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedDetailsRenderer.ts
@@ -3,20 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { generateUuid } from 'vs/base/common/uuid';
-import { generateTokensCSSForColorMap } from 'vs/editor/common/languages/supports/tokenization';
-import { TokenizationRegistry } from 'vs/editor/common/languages';
-import { DEFAULT_MARKDOWN_STYLES, renderMarkdownDocument } from 'vs/workbench/contrib/markdown/browser/markdownDocumentRenderer';
-import { URI } from 'vs/base/common/uri';
-import { language } from 'vs/base/common/platform';
-import { joinPath } from 'vs/base/common/resources';
-import { assertIsDefined } from 'vs/base/common/types';
-import { asWebviewUri } from 'vs/workbench/contrib/webview/common/webview';
-import { ResourceMap } from 'vs/base/common/map';
-import { IFileService } from 'vs/platform/files/common/files';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { generateTokensCSSForColorMap } from '../../../../editor/common/languages/supports/tokenization.js';
+import { TokenizationRegistry } from '../../../../editor/common/languages.js';
+import { DEFAULT_MARKDOWN_STYLES, renderMarkdownDocument } from '../../markdown/browser/markdownDocumentRenderer.js';
+import { URI } from '../../../../base/common/uri.js';
+import { language } from '../../../../base/common/platform.js';
+import { joinPath } from '../../../../base/common/resources.js';
+import { assertIsDefined } from '../../../../base/common/types.js';
+import { asWebviewUri } from '../../webview/common/webview.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { gettingStartedContentRegistry } from '../common/gettingStartedContent.js';
 
 
 export class GettingStartedDetailsRenderer {
@@ -211,7 +212,7 @@ export class GettingStartedDetailsRenderer {
 	private async readAndCacheStepMarkdown(path: URI, base: URI): Promise<string> {
 		if (!this.mdCache.has(path)) {
 			const contents = await this.readContentsOfPath(path);
-			const markdownContents = await renderMarkdownDocument(transformUris(contents, base), this.extensionService, this.languageService, true, true);
+			const markdownContents = await renderMarkdownDocument(transformUris(contents, base), this.extensionService, this.languageService, { allowUnknownProtocols: true });
 			this.mdCache.set(path, markdownContents);
 		}
 		return assertIsDefined(this.mdCache.get(path));
@@ -221,10 +222,13 @@ export class GettingStartedDetailsRenderer {
 		try {
 			const moduleId = JSON.parse(path.query).moduleId;
 			if (useModuleId && moduleId) {
-				const contents = await new Promise<string>(c => {
-					require([moduleId], content => {
-						c(content.default());
-					});
+				const contents = await new Promise<string>((resolve, reject) => {
+					const provider = gettingStartedContentRegistry.getProvider(moduleId);
+					if (!provider) {
+						reject(`Getting started: no provider registered for ${moduleId}`);
+					} else {
+						resolve(provider());
+					}
 				});
 				return contents;
 			}
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedExtensionPoint.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedExtensionPoint.ts
index 9141402a7f8..3f1c09885f9 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedExtensionPoint.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedExtensionPoint.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { IWalkthrough } from 'vs/platform/extensions/common/extensions';
-import { ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
+import { localize } from '../../../../nls.js';
+import { IWalkthrough } from '../../../../platform/extensions/common/extensions.js';
+import { ExtensionsRegistry } from '../../../services/extensions/common/extensionsRegistry.js';
 
 const titleTranslated = localize('title', "Title");
 
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedIcons.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedIcons.ts
index cb407f56365..4f92d13b883 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedIcons.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedIcons.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls'; import { Codicon } from 'vs/base/common/codicons';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
+import { localize } from '../../../../nls.js'; import { Codicon } from '../../../../base/common/codicons.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 
 export const gettingStartedUncheckedCodicon = registerIcon('getting-started-step-unchecked', Codicon.circleLargeOutline, localize('gettingStartedUnchecked', "Used to represent walkthrough steps which have not been completed"));
 export const gettingStartedCheckedCodicon = registerIcon('getting-started-step-checked', Codicon.passFilled, localize('gettingStartedChecked', "Used to represent walkthrough steps which have been completed"));
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedInput.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedInput.ts
index de0fc8b997a..54cdc003bd8 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedInput.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedInput.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/gettingStarted';
-import { localize } from 'vs/nls';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { URI } from 'vs/base/common/uri';
-import { Schemas } from 'vs/base/common/network';
-import { IUntypedEditorInput } from 'vs/workbench/common/editor';
-import { IEditorOptions } from 'vs/platform/editor/common/editor';
+import './media/gettingStarted.css';
+import { localize } from '../../../../nls.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { IUntypedEditorInput } from '../../../common/editor.js';
+import { IEditorOptions } from '../../../../platform/editor/common/editor.js';
 
 export const gettingStartedInputTypeId = 'workbench.editors.gettingStartedInput';
 
 export interface GettingStartedEditorOptions extends IEditorOptions {
-	selectedCategory?: string; selectedStep?: string; showTelemetryNotice?: boolean;
+	selectedCategory?: string; selectedStep?: string; showTelemetryNotice?: boolean; showWelcome?: boolean;
 }
 
 export class GettingStartedInput extends EditorInput {
@@ -62,6 +62,7 @@ export class GettingStartedInput extends EditorInput {
 		this.selectedCategory = options.selectedCategory;
 		this.selectedStep = options.selectedStep;
 		this.showTelemetryNotice = !!options.showTelemetryNotice;
+		this.showWelcome = options.showWelcome ?? true;
 	}
 
 	override getName() {
@@ -71,4 +72,5 @@ export class GettingStartedInput extends EditorInput {
 	selectedCategory: string | undefined;
 	selectedStep: string | undefined;
 	showTelemetryNotice: boolean;
+	showWelcome: boolean;
 }
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedList.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedList.ts
index caab78fd561..e3213ed92d9 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedList.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedList.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { $, Dimension } from 'vs/base/browser/dom';
-import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
-import { Emitter, Event } from 'vs/base/common/event';
-import { ContextKeyExpression, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { equals } from 'vs/base/common/arrays';
+import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
+import { $, Dimension } from '../../../../base/browser/dom.js';
+import { DomScrollableElement } from '../../../../base/browser/ui/scrollbar/scrollableElement.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { ContextKeyExpression, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { equals } from '../../../../base/common/arrays.js';
 
 type GettingStartedIndexListOptions<T> = {
 	title: string;
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts
index d70c6800b77..a3d6f047f65 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts
@@ -3,37 +3,37 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator, IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { Memento } from 'vs/workbench/common/memento';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { ContextKeyExpr, ContextKeyExpression, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IUserDataSyncEnablementService } from 'vs/platform/userDataSync/common/userDataSync';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { URI } from 'vs/base/common/uri';
-import { joinPath } from 'vs/base/common/resources';
-import { FileAccess } from 'vs/base/common/network';
-import { EXTENSION_INSTALL_DEP_PACK_CONTEXT, EXTENSION_INSTALL_SKIP_WALKTHROUGH_CONTEXT, IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { walkthroughs } from 'vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent';
-import { IWorkbenchAssignmentService } from 'vs/workbench/services/assignment/common/assignmentService';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ILink, LinkedText, parseLinkedText } from 'vs/base/common/linkedText';
-import { walkthroughsExtensionPoint } from 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedExtensionPoint';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { dirname } from 'vs/base/common/path';
-import { coalesce } from 'vs/base/common/arrays';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { localize, localize2 } from 'vs/nls';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { checkGlobFileExists } from 'vs/workbench/services/extensions/common/workspaceContains';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { DefaultIconPath } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
+import { createDecorator, IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { Memento } from '../../../common/memento.js';
+import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { ContextKeyExpr, ContextKeyExpression, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IUserDataSyncEnablementService } from '../../../../platform/userDataSync/common/userDataSync.js';
+import { IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
+import { URI } from '../../../../base/common/uri.js';
+import { joinPath } from '../../../../base/common/resources.js';
+import { FileAccess } from '../../../../base/common/network.js';
+import { EXTENSION_INSTALL_DEP_PACK_CONTEXT, EXTENSION_INSTALL_SKIP_WALKTHROUGH_CONTEXT, IExtensionManagementService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { walkthroughs } from '../common/gettingStartedContent.js';
+import { IWorkbenchAssignmentService } from '../../../services/assignment/common/assignmentService.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ILink, LinkedText, parseLinkedText } from '../../../../base/common/linkedText.js';
+import { walkthroughsExtensionPoint } from './gettingStartedExtensionPoint.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { dirname } from '../../../../base/common/path.js';
+import { coalesce } from '../../../../base/common/arrays.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { checkGlobFileExists } from '../../../services/extensions/common/workspaceContains.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { DefaultIconPath } from '../../../services/extensionManagement/common/extensionManagement.js';
 
 export const HasMultipleNewFileEntries = new RawContextKey<boolean>('hasMultipleNewFileEntries', false);
 
@@ -226,13 +226,12 @@ export class WalkthroughsService extends Disposable implements IWalkthroughsServ
 			installed.forEach(ext => this.progressByEvent(`extensionInstalled:${ext.identifier.id.toLowerCase()}`));
 		});
 
-		this._register(this.extensionManagementService.onDidInstallExtensions(async (result) => {
-			const hadLastFoucs = await this.hostService.hadLastFocus();
+		this._register(this.extensionManagementService.onDidInstallExtensions((result) => {
 			for (const e of result) {
 				const skipWalkthrough = e?.context?.[EXTENSION_INSTALL_SKIP_WALKTHROUGH_CONTEXT] || e?.context?.[EXTENSION_INSTALL_DEP_PACK_CONTEXT];
 				// If the window had last focus and the install didn't specify to skip the walkthrough
 				// Then add it to the sessionInstallExtensions to be opened
-				if (hadLastFoucs && !skipWalkthrough) {
+				if (!skipWalkthrough) {
 					this.sessionInstalledExtensions.add(e.identifier.id.toLowerCase());
 				}
 				this.progressByEvent(`extensionInstalled:${e.identifier.id.toLowerCase()}`);
@@ -408,7 +407,8 @@ export class WalkthroughsService extends Disposable implements IWalkthroughsServ
 
 		this.storageService.store(walkthroughMetadataConfigurationKey, JSON.stringify([...this.metadata.entries()]), StorageScope.PROFILE, StorageTarget.USER);
 
-		if (sectionToOpen && this.configurationService.getValue<string>('workbench.welcomePage.walkthroughs.openOnInstall')) {
+		const hadLastFoucs = await this.hostService.hadLastFocus();
+		if (hadLastFoucs && sectionToOpen && this.configurationService.getValue<string>('workbench.welcomePage.walkthroughs.openOnInstall')) {
 			type GettingStartedAutoOpenClassification = {
 				owner: 'lramos15';
 				comment: 'When a walkthrthrough is opened upon extension installation';
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/media/gettingStarted.css b/src/vs/workbench/contrib/welcomeGettingStarted/browser/media/gettingStarted.css
index 492fd698fb2..485075f30cf 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/media/gettingStarted.css
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/media/gettingStarted.css
@@ -228,7 +228,6 @@
 }
 
 .monaco-workbench .part.editor > .content .gettingStartedContainer .icon-widget,
-.monaco-workbench .part.editor > .content .gettingStartedContainer .gettingStartedSlideCategories .icon-widget:not(.codicon-device-camera-video),
 .monaco-workbench .part.editor > .content .gettingStartedContainer .gettingStartedSlideCategories .featured-icon {
 	font-size: 20px;
 	padding-right: 8px;
@@ -236,13 +235,6 @@
 	top: 3px;
 }
 
-.monaco-workbench .part.editor > .content .gettingStartedContainer .gettingStartedSlideCategories .icon-widget.codicon-device-camera-video {
-	font-size: 20px;
-	padding-right: 8px;
-	position: relative;
-	transform: translateY(+100%);
-}
-
 .monaco-workbench .part.editor > .content .gettingStartedContainer .gettingStartedSlideCategories .codicon:not(.icon-widget, .featured-icon, .hide-category-button) {
 	margin: 0 2px;
 }
@@ -348,7 +340,7 @@
 	right: 8px;
 }
 
-.monaco-workbench .part.editor > .content .gettingStartedContainer .gettingStartedSlide .getting-started-category.featured .icon-widget:not(.codicon-device-camera-video) {
+.monaco-workbench .part.editor > .content .gettingStartedContainer .gettingStartedSlide .getting-started-category.featured .icon-widget {
 	visibility: hidden;
 }
 
@@ -931,12 +923,14 @@
 
 .monaco-workbench .part.editor > .content .gettingStartedContainer .button-link {
 	color: var(--vscode-textLink-foreground);
+	text-decoration: var(--text-link-decoration);
 }
 
-.monaco-workbench .part.editor > .content .gettingStartedContainer .button-link .codicon {
-	color: var(--vscode-textLink-foreground);
+.monaco-workbench .part.editor > .content .gettingStartedContainer .start-container .button-link {
+	line-height: 24px;
 }
 
+
 .monaco-workbench .part.editor > .content .gettingStartedContainer a:not(.hide-category-button):hover {
 	color: var(--vscode-textLink-activeForeground);
 }
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/startupPage.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/startupPage.ts
index 5bf8f08387e..fed10805446 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/startupPage.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/startupPage.ts
@@ -3,31 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import * as arrays from 'vs/base/common/arrays';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { IWorkspaceContextService, UNKNOWN_EMPTY_WINDOW_WORKSPACE, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackup';
-import { ILifecycleService, LifecyclePhase, StartupKind } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IFileService } from 'vs/platform/files/common/files';
-import { joinPath } from 'vs/base/common/resources';
-import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
-import { GettingStartedEditorOptions, GettingStartedInput, gettingStartedInputTypeId } from 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedInput';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { getTelemetryLevel } from 'vs/platform/telemetry/common/telemetryUtils';
-import { TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { localize } from 'vs/nls';
-import { IEditorResolverService, RegisteredEditorPriority } from 'vs/workbench/services/editor/common/editorResolverService';
-import { TerminalCommandId } from 'vs/workbench/contrib/terminal/common/terminal';
+import { URI } from '../../../../base/common/uri.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import * as arrays from '../../../../base/common/arrays.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { IWorkspaceContextService, UNKNOWN_EMPTY_WINDOW_WORKSPACE, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IWorkingCopyBackupService } from '../../../services/workingCopy/common/workingCopyBackup.js';
+import { ILifecycleService, LifecyclePhase, StartupKind } from '../../../services/lifecycle/common/lifecycle.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { joinPath } from '../../../../base/common/resources.js';
+import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
+import { GettingStartedEditorOptions, GettingStartedInput, gettingStartedInputTypeId } from './gettingStartedInput.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { getTelemetryLevel } from '../../../../platform/telemetry/common/telemetryUtils.js';
+import { TelemetryLevel } from '../../../../platform/telemetry/common/telemetry.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { localize } from '../../../../nls.js';
+import { IEditorResolverService, RegisteredEditorPriority } from '../../../services/editor/common/editorResolverService.js';
+import { TerminalCommandId } from '../../terminal/common/terminal.js';
 
 export const restoreWalkthroughsConfigurationKey = 'workbench.welcomePage.restorableWalkthroughs';
 export type RestoreWalkthroughsConfigurationValue = { folder: string; category?: string; step?: string };
@@ -70,7 +71,7 @@ export class StartupPageEditorResolverContribution implements IWorkbenchContribu
 	}
 }
 
-export class StartupPageRunnerContribution implements IWorkbenchContribution {
+export class StartupPageRunnerContribution extends Disposable implements IWorkbenchContribution {
 
 	static readonly ID = 'workbench.contrib.startupPageRunner';
 
@@ -89,7 +90,14 @@ export class StartupPageRunnerContribution implements IWorkbenchContribution {
 		@ILogService private readonly logService: ILogService,
 		@INotificationService private readonly notificationService: INotificationService
 	) {
+		super();
 		this.run().then(undefined, onUnexpectedError);
+		this._register(this.editorService.onDidCloseEditor((e) => {
+			if (e.editor instanceof GettingStartedInput) {
+				e.editor.selectedCategory = undefined;
+				e.editor.selectedStep = undefined;
+			}
+		}));
 	}
 
 	private async run() {
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts b/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
index 8f1449ccb12..0f8c49a9225 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
@@ -3,19 +3,60 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/workbench/contrib/welcomeGettingStarted/common/media/theme_picker';
-import 'vs/workbench/contrib/welcomeGettingStarted/common/media/notebookProfile';
-import { localize } from 'vs/nls';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { NotebookSetting } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import themePickerContent from './media/theme_picker.js';
+import notebookProfileContent from './media/notebookProfile.js';
+import { localize } from '../../../../nls.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { NotebookSetting } from '../../notebook/common/notebookCommon.js';
+import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from '../../../../platform/accessibility/common/accessibility.js';
+import { URI } from '../../../../base/common/uri.js';
 
+interface IGettingStartedContentProvider {
+	(): string;
+}
+
+class GettingStartedContentProviderRegistry {
+
+	private readonly providers = new Map<string, IGettingStartedContentProvider>();
+
+	registerProvider(moduleId: string, provider: IGettingStartedContentProvider): void {
+		this.providers.set(moduleId, provider);
+	}
+
+	getProvider(moduleId: string): IGettingStartedContentProvider | undefined {
+		return this.providers.get(moduleId);
+	}
+}
+export const gettingStartedContentRegistry = new GettingStartedContentProviderRegistry();
+
+export async function moduleToContent(resource: URI): Promise<string> {
+	if (!resource.query) {
+		throw new Error('Getting Started: invalid resource');
+	}
+
+	const query = JSON.parse(resource.query);
+	if (!query.moduleId) {
+		throw new Error('Getting Started: invalid resource');
+	}
+
+	const provider = gettingStartedContentRegistry.getProvider(query.moduleId);
+	if (!provider) {
+		throw new Error(`Getting Started: no provider registered for ${query.moduleId}`);
+	}
+
+	return provider();
+}
+
+gettingStartedContentRegistry.registerProvider('vs/workbench/contrib/welcomeGettingStarted/common/media/theme_picker', themePickerContent);
+gettingStartedContentRegistry.registerProvider('vs/workbench/contrib/welcomeGettingStarted/common/media/notebookProfile', notebookProfileContent);
+// Register empty media for accessibility walkthrough
+gettingStartedContentRegistry.registerProvider('vs/workbench/contrib/welcomeGettingStarted/common/media/empty', () => '');
 
 const setupIcon = registerIcon('getting-started-setup', Codicon.zap, localize('getting-started-setup-icon', "Icon used for the setup category of welcome page"));
 const beginnerIcon = registerIcon('getting-started-beginner', Codicon.lightbulb, localize('getting-started-beginner-icon', "Icon used for the beginner category of welcome page"));
 
-
 export type BuiltinGettingStartedStep = {
 	id: string;
 	title: string;
@@ -353,7 +394,104 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 			]
 		}
 	},
-
+	{
+		id: 'SetupAccessibility',
+		title: localize('gettingStarted.setupAccessibility.title', "Get Started with Accessibility Features"),
+		description: localize('gettingStarted.setupAccessibility.description', "Learn the tools and shortcuts that make VS Code accessible. Note that some actions are not actionable from within the context of the walkthrough."),
+		isFeatured: true,
+		icon: setupIcon,
+		when: CONTEXT_ACCESSIBILITY_MODE_ENABLED.key,
+		next: 'Setup',
+		content: {
+			type: 'steps',
+			steps: [
+				{
+					id: 'accessibilityHelp',
+					title: localize('gettingStarted.accessibilityHelp.title', "Use the accessibility help dialog to learn about features"),
+					description: localize('gettingStarted.accessibilityHelp.description.interpolated', "The accessibility help dialog provides information about what to expect from a feature and the commands/keybindings to operate them.\n With focus in an editor, terminal, notebook, chat response, comment, or debug console, the relevant dialog can be opened with the Open Accessibility Help command.\n{0}", Button(localize('openAccessibilityHelp', "Open Accessibility Help"), 'command:editor.action.accessibilityHelp')),
+					media: {
+						type: 'markdown', path: 'empty'
+					}
+				},
+				{
+					id: 'accessibleView',
+					title: localize('gettingStarted.accessibleView.title', "Screen reader users can inspect content line by line, character by character in the accessible view."),
+					description: localize('gettingStarted.accessibleView.description.interpolated', "The accessible view is available for the terminal, hovers, notifications, comments, notebook output, chat responses, inline completions, and debug console output.\n With focus in any of those features, it can be opened with the Open Accessible View command.\n{0}", Button(localize('openAccessibleView', "Open Accessible View"), 'command:editor.action.accessibleView')),
+					media: {
+						type: 'markdown', path: 'empty'
+					}
+				},
+				{
+					id: 'verbositySettings',
+					title: localize('gettingStarted.verbositySettings.title', "Control the verbosity of aria labels"),
+					description: localize('gettingStarted.verbositySettings.description.interpolated', "Screen reader verbosity settings exist for features around the workbench so that once a user is familiar with a feature, they can avoid hearing hints about how to operate it. For example, features for which an accessibility help dialog exists will indicate how to open the dialog until the verbosity setting for that feature has been disabled.\n These and other accessibility settings can be configured by running the Open Accessibility Settings command.\n{0}", Button(localize('openVerbositySettings', "Open Accessibility Settings"), 'command:workbench.action.openAccessibilitySettings')),
+					media: {
+						type: 'markdown', path: 'empty'
+					}
+				},
+				{
+					id: 'commandPaletteTaskAccessibility',
+					title: localize('gettingStarted.commandPaletteAccessibility.title', "Unlock productivity with the Command Palette "),
+					description: localize('gettingStarted.commandPaletteAccessibility.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in VS Code.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')),
+					media: { type: 'markdown', path: 'empty' },
+				},
+				{
+					id: 'keybindingsAccessibility',
+					title: localize('gettingStarted.keyboardShortcuts.title', "Customize your keyboard shortcuts"),
+					description: localize('gettingStarted.keyboardShortcuts.description.interpolated', "Once you have discovered your favorite commands, create custom keyboard shortcuts for instant access.\n{0}", Button(localize('keyboardShortcuts', "Keyboard Shortcuts"), 'command:toSide:workbench.action.openGlobalKeybindings')),
+					media: {
+						type: 'markdown', path: 'empty',
+					}
+				},
+				{
+					id: 'accessibilitySignals',
+					title: localize('gettingStarted.accessibilitySignals.title', "Fine tune which accessibility signals you want to receive via audio or a braille device"),
+					description: localize('gettingStarted.accessibilitySignals.description.interpolated', "Accessibility sounds and announcements are played around the workbench for different events.\n These can be discovered and configured using the List Signal Sounds and List Signal Announcements commands.\n{0}\n{1}", Button(localize('listSignalSounds', "List Signal Sounds"), 'command:signals.sounds.help'), Button(localize('listSignalAnnouncements', "List Signal Announcements"), 'command:accessibility.announcement.help')),
+					media: {
+						type: 'markdown', path: 'empty'
+					}
+				},
+				{
+					id: 'hover',
+					title: localize('gettingStarted.hover.title', "Access the hover in the editor to get more information on a variable or symbol"),
+					description: localize('gettingStarted.hover.description.interpolated', "While focus is in the editor on a variable or symbol, a hover can be can be focused with the Show or Open Hover command.\n{0}", Button(localize('showOrFocusHover', "Show or Focus Hover"), 'command:editor.action.showHover')),
+					media: {
+						type: 'markdown', path: 'empty'
+					}
+				},
+				{
+					id: 'goToSymbol',
+					title: localize('gettingStarted.goToSymbol.title', "Navigate to symbols in a file"),
+					description: localize('gettingStarted.goToSymbol.description.interpolated', "The Go to Symbol command is useful for navigating between important landmarks in a document.\n{0}", Button(localize('openGoToSymbol', "Go to Symbol"), 'command:editor.action.goToSymbol')),
+					media: {
+						type: 'markdown', path: 'empty'
+					}
+				},
+				{
+					id: 'codeFolding',
+					title: localize('gettingStarted.codeFolding.title', "Use code folding to collapse blocks of code and focus on the code you're interested in."),
+					description: localize('gettingStarted.codeFolding.description.interpolated', "Fold or unfold a code section with the Toggle Fold command.\n{0}\n Fold or unfold recursively with the Toggle Fold Recursively Command\n{1}\n", Button(localize('toggleFold', "Toggle Fold"), 'command:editor.toggleFold'), Button(localize('toggleFoldRecursively', "Toggle Fold Recursively"), 'command:editor.toggleFoldRecursively')),
+					media: {
+						type: 'markdown', path: 'empty'
+					}
+				},
+				{
+					id: 'intellisense',
+					title: localize('gettingStarted.intellisense.title', "Use Intellisense to improve coding efficiency"),
+					description: localize('gettingStarted.intellisense.description.interpolated', "Intellisense suggestions can be opened with the Trigger Intellisense command.\n{0}\n Inline intellisense suggestions can be triggered with Trigger Inline Suggestion\n{1}\n Useful settings include editor.inlineCompletionsAccessibilityVerbose and editor.screenReaderAnnounceInlineSuggestion.", Button(localize('triggerIntellisense', "Trigger Intellisense"), 'command:editor.action.triggerSuggest'), Button(localize('triggerInlineSuggestion', 'Trigger Inline Suggestion'), 'command:editor.action.inlineSuggest.trigger')),
+					media: {
+						type: 'markdown', path: 'empty'
+					}
+				},
+				{
+					id: 'accessibilitySettings',
+					title: localize('gettingStarted.accessibilitySettings.title', "Configure accessibility settings"),
+					description: localize('gettingStarted.accessibilitySettings.description.interpolated', "Accessibility settings can be configured by running the Open Accessibility Settings command.\n{0}", Button(localize('openAccessibilitySettings', "Open Accessibility Settings"), 'command:workbench.action.openAccessibilitySettings')),
+					media: { type: 'markdown', path: 'empty' }
+				}
+			]
+		}
+	},
 	{
 		id: 'Beginner',
 		isFeatured: false,
@@ -450,7 +588,7 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 				{
 					id: 'workspaceTrust',
 					title: localize('gettingStarted.workspaceTrust.title', "Safely browse and edit code"),
-					description: localize('gettingStarted.workspaceTrust.description.interpolated', "{0} lets you decide whether your project folders should **allow or restrict** automatic code execution __(required for extensions, debugging, etc)__.\nOpening a file/folder will prompt to grant trust. You can always {1} later.", Button(localize('workspaceTrust', "Workspace Trust"), 'https://github.com/microsoft/vscode-docs/blob/workspaceTrust/docs/editor/workspace-trust.md'), Button(localize('enableTrust', "enable trust"), 'command:toSide:workbench.action.manageTrustedDomain')),
+					description: localize('gettingStarted.workspaceTrust.description.interpolated', "{0} lets you decide whether your project folders should **allow or restrict** automatic code execution __(required for extensions, debugging, etc)__.\nOpening a file/folder will prompt to grant trust. You can always {1} later.", Button(localize('workspaceTrust', "Workspace Trust"), 'https://code.visualstudio.com/docs/editor/workspace-trust'), Button(localize('enableTrust', "enable trust"), 'command:toSide:workbench.action.manageTrustedDomain')),
 					when: 'workspacePlatform != \'webworker\' && !isWorkspaceTrusted && workspaceFolderCount == 0',
 					media: {
 						type: 'svg', altText: 'Workspace Trust editor in Restricted mode and a primary button for switching to Trusted mode.', path: 'workspaceTrust.svg'
diff --git a/extensions/microsoft-authentication/src/browser/crypto.ts b/src/vs/workbench/contrib/welcomeGettingStarted/common/media/empty.ts
similarity index 89%
rename from extensions/microsoft-authentication/src/browser/crypto.ts
rename to src/vs/workbench/contrib/welcomeGettingStarted/common/media/empty.ts
index 37a1b43361f..086fa08b842 100644
--- a/extensions/microsoft-authentication/src/browser/crypto.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/common/media/empty.ts
@@ -3,4 +3,4 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-export const crypto = globalThis.crypto;
+export default () => ``;
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/common/media/notebookProfile.ts b/src/vs/workbench/contrib/welcomeGettingStarted/common/media/notebookProfile.ts
index 25da8e87165..7882053b69f 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/common/media/notebookProfile.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/common/media/notebookProfile.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { escape } from 'vs/base/common/strings';
-import { localize } from 'vs/nls';
+import { escape } from '../../../../../base/common/strings.js';
+import { localize } from '../../../../../nls.js';
 
 const profileArg = (profile: string) => encodeURIComponent(JSON.stringify({ profile }));
 const imageSize = 400;
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/common/media/theme_picker.ts b/src/vs/workbench/contrib/welcomeGettingStarted/common/media/theme_picker.ts
index 7c204e58519..eb9fbfcb71a 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/common/media/theme_picker.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/common/media/theme_picker.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { escape } from 'vs/base/common/strings';
-import { localize } from 'vs/nls';
-import { ThemeSettingDefaults } from 'vs/workbench/services/themes/common/workbenchThemeService';
+import { escape } from '../../../../../base/common/strings.js';
+import { localize } from '../../../../../nls.js';
+import { ThemeSettingDefaults } from '../../../../services/themes/common/workbenchThemeService.js';
 
 export default () => `
 <checklist>
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/test/browser/gettingStartedMarkdownRenderer.test.ts b/src/vs/workbench/contrib/welcomeGettingStarted/test/browser/gettingStartedMarkdownRenderer.test.ts
index 3a63341f1d8..74f74af49ec 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/test/browser/gettingStartedMarkdownRenderer.test.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/test/browser/gettingStartedMarkdownRenderer.test.ts
@@ -4,14 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { FileAccess } from 'vs/base/common/network';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { LanguageService } from 'vs/editor/common/services/languageService';
-import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
-import { GettingStartedDetailsRenderer } from 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedDetailsRenderer';
-import { convertInternalMediaPathToFileURI } from 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService';
-import { TestFileService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { TestExtensionService } from 'vs/workbench/test/common/workbenchTestServices';
+import { FileAccess } from '../../../../../base/common/network.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { LanguageService } from '../../../../../editor/common/services/languageService.js';
+import { TestNotificationService } from '../../../../../platform/notification/test/common/testNotificationService.js';
+import { GettingStartedDetailsRenderer } from '../../browser/gettingStartedDetailsRenderer.js';
+import { convertInternalMediaPathToFileURI } from '../../browser/gettingStartedService.js';
+import { TestFileService } from '../../../../test/browser/workbenchTestServices.js';
+import { TestExtensionService } from '../../../../test/common/workbenchTestServices.js';
 
 
 suite('Getting Started Markdown Renderer', () => {
diff --git a/src/vs/workbench/contrib/welcomeViews/common/newFile.contribution.ts b/src/vs/workbench/contrib/welcomeViews/common/newFile.contribution.ts
index eae75a6e994..4b6a9aeab73 100644
--- a/src/vs/workbench/contrib/welcomeViews/common/newFile.contribution.ts
+++ b/src/vs/workbench/contrib/welcomeViews/common/newFile.contribution.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { promiseWithResolvers } from 'vs/base/common/async';
-import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { assertIsDefined } from 'vs/base/common/types';
-import { localize, localize2 } from 'vs/nls';
-import { ILocalizedString } from 'vs/platform/action/common/action';
-import { Action2, IMenuService, MenuId, registerAction2, IMenu, MenuRegistry, MenuItemAction } from 'vs/platform/actions/common/actions';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { promiseWithResolvers } from '../../../../base/common/async.js';
+import { KeyMod, KeyCode } from '../../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { assertIsDefined } from '../../../../base/common/types.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { ILocalizedString } from '../../../../platform/action/common/action.js';
+import { Action2, IMenuService, MenuId, registerAction2, IMenu, MenuRegistry, MenuItemAction } from '../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from '../../../../platform/quickinput/common/quickInput.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry } from '../../../common/contributions.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
 
 const builtInSource = localize('Built-In', "Built-In");
 const category: ILocalizedString = localize2('Create', 'Create');
@@ -99,7 +99,7 @@ class NewFileTemplatesManager extends Disposable {
 		const { promise: resultPromise, resolve: resolveResult } = promiseWithResolvers<boolean>();
 
 		const disposables = new DisposableStore();
-		const qp = this.quickInputService.createQuickPick();
+		const qp = this.quickInputService.createQuickPick({ useSeparators: true });
 		qp.title = localize('newFileTitle', "New File...");
 		qp.placeholder = localize('newFilePlaceholder', "Select File Type or Enter File Name...");
 		qp.sortByLabel = false;
diff --git a/src/vs/workbench/contrib/welcomeViews/common/viewsWelcome.contribution.ts b/src/vs/workbench/contrib/welcomeViews/common/viewsWelcome.contribution.ts
index e68958ca71b..7892b9a1dca 100644
--- a/src/vs/workbench/contrib/welcomeViews/common/viewsWelcome.contribution.ts
+++ b/src/vs/workbench/contrib/welcomeViews/common/viewsWelcome.contribution.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
-import { ViewsWelcomeContribution } from 'vs/workbench/contrib/welcomeViews/common/viewsWelcomeContribution';
-import { ViewsWelcomeExtensionPoint, viewsWelcomeExtensionPointDescriptor } from 'vs/workbench/contrib/welcomeViews/common/viewsWelcomeExtensionPoint';
-import { ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry } from '../../../common/contributions.js';
+import { ViewsWelcomeContribution } from './viewsWelcomeContribution.js';
+import { ViewsWelcomeExtensionPoint, viewsWelcomeExtensionPointDescriptor } from './viewsWelcomeExtensionPoint.js';
+import { ExtensionsRegistry } from '../../../services/extensions/common/extensionsRegistry.js';
 
 const extensionPoint = ExtensionsRegistry.registerExtensionPoint<ViewsWelcomeExtensionPoint>(viewsWelcomeExtensionPointDescriptor);
 
diff --git a/src/vs/workbench/contrib/welcomeViews/common/viewsWelcomeContribution.ts b/src/vs/workbench/contrib/welcomeViews/common/viewsWelcomeContribution.ts
index 13b7e3560be..e861a2e116d 100644
--- a/src/vs/workbench/contrib/welcomeViews/common/viewsWelcomeContribution.ts
+++ b/src/vs/workbench/contrib/welcomeViews/common/viewsWelcomeContribution.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IExtensionPoint, IExtensionPointUser } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { ViewsWelcomeExtensionPoint, ViewWelcome, ViewIdentifierMap } from './viewsWelcomeExtensionPoint';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Extensions as ViewContainerExtensions, IViewContentDescriptor, IViewsRegistry } from 'vs/workbench/common/views';
-import { isProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
+import * as nls from '../../../../nls.js';
+import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IExtensionPoint, IExtensionPointUser } from '../../../services/extensions/common/extensionsRegistry.js';
+import { ViewsWelcomeExtensionPoint, ViewWelcome, ViewIdentifierMap } from './viewsWelcomeExtensionPoint.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Extensions as ViewContainerExtensions, IViewContentDescriptor, IViewsRegistry } from '../../../common/views.js';
+import { isProposedApiEnabled } from '../../../services/extensions/common/extensions.js';
 
 const viewsRegistry = Registry.as<IViewsRegistry>(ViewContainerExtensions.ViewsRegistry);
 
diff --git a/src/vs/workbench/contrib/welcomeViews/common/viewsWelcomeExtensionPoint.ts b/src/vs/workbench/contrib/welcomeViews/common/viewsWelcomeExtensionPoint.ts
index 39a48446c2c..f308d0b94fa 100644
--- a/src/vs/workbench/contrib/welcomeViews/common/viewsWelcomeExtensionPoint.ts
+++ b/src/vs/workbench/contrib/welcomeViews/common/viewsWelcomeExtensionPoint.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { IConfigurationPropertySchema } from 'vs/platform/configuration/common/configurationRegistry';
+import * as nls from '../../../../nls.js';
+import { IConfigurationPropertySchema } from '../../../../platform/configuration/common/configurationRegistry.js';
 
 export enum ViewsWelcomeExtensionPointFields {
 	view = 'view',
diff --git a/src/vs/workbench/contrib/welcomeWalkthrough/browser/editor/editorWalkThrough.ts b/src/vs/workbench/contrib/welcomeWalkthrough/browser/editor/editorWalkThrough.ts
index f1c241a759f..ecb31da35b1 100644
--- a/src/vs/workbench/contrib/welcomeWalkthrough/browser/editor/editorWalkThrough.ts
+++ b/src/vs/workbench/contrib/welcomeWalkthrough/browser/editor/editorWalkThrough.ts
@@ -3,16 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/workbench/contrib/welcomeWalkthrough/browser/editor/vs_code_editor_walkthrough';
-import { localize, localize2 } from 'vs/nls';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { WalkThroughInput, WalkThroughInputOptions } from 'vs/workbench/contrib/welcomeWalkthrough/browser/walkThroughInput';
-import { FileAccess, Schemas } from 'vs/base/common/network';
-import { IEditorSerializer } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { Action2 } from 'vs/platform/actions/common/actions';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
+import content from './vs_code_editor_walkthrough.js';
+import { localize, localize2 } from '../../../../../nls.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { WalkThroughInput, WalkThroughInputOptions } from '../walkThroughInput.js';
+import { FileAccess, Schemas } from '../../../../../base/common/network.js';
+import { IEditorSerializer } from '../../../../common/editor.js';
+import { EditorInput } from '../../../../common/editor/editorInput.js';
+import { Action2 } from '../../../../../platform/actions/common/actions.js';
+import { Categories } from '../../../../../platform/action/common/actionCommonCategories.js';
+import { walkThroughContentRegistry } from '../../common/walkThroughContentProvider.js';
+
+walkThroughContentRegistry.registerProvider('vs/workbench/contrib/welcomeWalkthrough/browser/editor/vs_code_editor_walkthrough', content);
 
 const typeId = 'workbench.editors.walkThroughInput';
 const inputOptions: WalkThroughInputOptions = {
diff --git a/src/vs/workbench/contrib/welcomeWalkthrough/browser/editor/vs_code_editor_walkthrough.ts b/src/vs/workbench/contrib/welcomeWalkthrough/browser/editor/vs_code_editor_walkthrough.ts
index e3fe20ccc88..bdd30bf2171 100644
--- a/src/vs/workbench/contrib/welcomeWalkthrough/browser/editor/vs_code_editor_walkthrough.ts
+++ b/src/vs/workbench/contrib/welcomeWalkthrough/browser/editor/vs_code_editor_walkthrough.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as platform from 'vs/base/common/platform';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
+import * as platform from '../../../../../base/common/platform.js';
+import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IWorkbenchEnvironmentService } from '../../../../services/environment/common/environmentService.js';
 
 export default function content(accessor: ServicesAccessor) {
 	const isServerless = platform.isWeb && !accessor.get(IWorkbenchEnvironmentService).remoteAuthority;
 	return `
 ## Interactive Editor Playground
-The core editor in VS Code is packed with features.  This page highlights a number of them and lets you interactively try them out through the use of a number of embedded editors.  For full details on the editor features for VS Code and more head over to our [documentation](command:workbench.action.openDocumentationUrl).
+The core editor in VS Code is packed with features.  This page highlights a number of them and lets you interactively try them out through the use of a number of embedded editors.  For full details on the editor features for VS Code and more head over to our [documentation](https://code.visualstudio.com/docs).
 
 * [Multi-cursor Editing](#multi-cursor-editing) - block selection, select all occurrences, add additional cursors and more.
 * [IntelliSense](#intellisense) - get code assistance and parameter suggestions for your code and external modules.
diff --git a/src/vs/workbench/contrib/welcomeWalkthrough/browser/media/walkThroughPart.css b/src/vs/workbench/contrib/welcomeWalkthrough/browser/media/walkThroughPart.css
index 9622dd1b858..7ab127eaab4 100644
--- a/src/vs/workbench/contrib/welcomeWalkthrough/browser/media/walkThroughPart.css
+++ b/src/vs/workbench/contrib/welcomeWalkthrough/browser/media/walkThroughPart.css
@@ -18,7 +18,7 @@
 }
 
 .monaco-workbench .part.editor > .content .walkThroughContent a {
-	text-decoration: none;
+	text-decoration: var(--text-link-decoration);
 }
 
 .monaco-workbench .part.editor > .content .walkThroughContent a:focus,
diff --git a/src/vs/workbench/contrib/welcomeWalkthrough/browser/walkThrough.contribution.ts b/src/vs/workbench/contrib/welcomeWalkthrough/browser/walkThrough.contribution.ts
index 81029fdd75a..1a1f1e1d8dd 100644
--- a/src/vs/workbench/contrib/welcomeWalkthrough/browser/walkThrough.contribution.ts
+++ b/src/vs/workbench/contrib/welcomeWalkthrough/browser/walkThrough.contribution.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { WalkThroughInput } from 'vs/workbench/contrib/welcomeWalkthrough/browser/walkThroughInput';
-import { WalkThroughPart } from 'vs/workbench/contrib/welcomeWalkthrough/browser/walkThroughPart';
-import { WalkThroughArrowUp, WalkThroughArrowDown, WalkThroughPageUp, WalkThroughPageDown } from 'vs/workbench/contrib/welcomeWalkthrough/browser/walkThroughActions';
-import { WalkThroughSnippetContentProvider } from 'vs/workbench/contrib/welcomeWalkthrough/common/walkThroughContentProvider';
-import { EditorWalkThroughAction, EditorWalkThroughInputSerializer } from 'vs/workbench/contrib/welcomeWalkthrough/browser/editor/editorWalkThrough';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { EditorExtensions, IEditorFactoryRegistry } from 'vs/workbench/common/editor';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { MenuRegistry, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { IEditorPaneRegistry, EditorPaneDescriptor } from 'vs/workbench/browser/editor';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { localize } from '../../../../nls.js';
+import { WalkThroughInput } from './walkThroughInput.js';
+import { WalkThroughPart } from './walkThroughPart.js';
+import { WalkThroughArrowUp, WalkThroughArrowDown, WalkThroughPageUp, WalkThroughPageDown } from './walkThroughActions.js';
+import { WalkThroughSnippetContentProvider } from '../common/walkThroughContentProvider.js';
+import { EditorWalkThroughAction, EditorWalkThroughInputSerializer } from './editor/editorWalkThrough.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { EditorExtensions, IEditorFactoryRegistry } from '../../../common/editor.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { MenuRegistry, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { IEditorPaneRegistry, EditorPaneDescriptor } from '../../../browser/editor.js';
+import { KeybindingsRegistry } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 
 Registry.as<IEditorPaneRegistry>(EditorExtensions.EditorPane)
 	.registerEditorPane(EditorPaneDescriptor.create(
diff --git a/src/vs/workbench/contrib/welcomeWalkthrough/browser/walkThroughActions.ts b/src/vs/workbench/contrib/welcomeWalkthrough/browser/walkThroughActions.ts
index 0be672b8252..251fab3d8cd 100644
--- a/src/vs/workbench/contrib/welcomeWalkthrough/browser/walkThroughActions.ts
+++ b/src/vs/workbench/contrib/welcomeWalkthrough/browser/walkThroughActions.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { WalkThroughPart, WALK_THROUGH_FOCUS } from 'vs/workbench/contrib/welcomeWalkthrough/browser/walkThroughPart';
-import { ICommandAndKeybindingRule, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { KeyCode } from 'vs/base/common/keyCodes';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { WalkThroughPart, WALK_THROUGH_FOCUS } from './walkThroughPart.js';
+import { ICommandAndKeybindingRule, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
 
 export const WalkThroughArrowUp: ICommandAndKeybindingRule = {
 	id: 'workbench.action.interactivePlayground.arrowUp',
diff --git a/src/vs/workbench/contrib/welcomeWalkthrough/browser/walkThroughInput.ts b/src/vs/workbench/contrib/welcomeWalkthrough/browser/walkThroughInput.ts
index 1d6d5c184fe..2e09781b796 100644
--- a/src/vs/workbench/contrib/welcomeWalkthrough/browser/walkThroughInput.ts
+++ b/src/vs/workbench/contrib/welcomeWalkthrough/browser/walkThroughInput.ts
@@ -3,18 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { EditorModel } from 'vs/workbench/common/editor/editorModel';
-import { URI } from 'vs/base/common/uri';
-import { DisposableStore, IReference } from 'vs/base/common/lifecycle';
-import { ITextEditorModel, ITextModelService } from 'vs/editor/common/services/resolverService';
-import { marked } from 'vs/base/common/marked/marked';
-import { isEqual } from 'vs/base/common/resources';
-import { requireToContent } from 'vs/workbench/contrib/welcomeWalkthrough/common/walkThroughContentProvider';
-import { Dimension } from 'vs/base/browser/dom';
-import { EditorInputCapabilities, IUntypedEditorInput } from 'vs/workbench/common/editor';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { Schemas } from 'vs/base/common/network';
+import { Dimension } from '../../../../base/browser/dom.js';
+import { DisposableStore, IReference } from '../../../../base/common/lifecycle.js';
+import * as marked from '../../../../base/common/marked/marked.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ITextEditorModel, ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { EditorInputCapabilities, IUntypedEditorInput } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { EditorModel } from '../../../common/editor/editorModel.js';
+import { markedGfmHeadingIdPlugin } from '../../markdown/browser/markedGfmHeadingIdPlugin.js';
+import { moduleToContent } from '../common/walkThroughContentProvider.js';
 
 class WalkThroughModel extends EditorModel {
 
@@ -107,7 +108,7 @@ export class WalkThroughInput extends EditorInput {
 
 	override resolve(): Promise<WalkThroughModel> {
 		if (!this.promise) {
-			this.promise = requireToContent(this.instantiationService, this.options.resource)
+			this.promise = moduleToContent(this.instantiationService, this.options.resource)
 				.then(content => {
 					if (this.resource.path.endsWith('.html')) {
 						return new WalkThroughModel(content, []);
@@ -115,15 +116,16 @@ export class WalkThroughInput extends EditorInput {
 
 					const snippets: Promise<IReference<ITextEditorModel>>[] = [];
 					let i = 0;
-					const renderer = new marked.Renderer();
-					renderer.code = (code, lang) => {
+					const renderer = new marked.marked.Renderer();
+					renderer.code = ({ lang }: marked.Tokens.Code) => {
 						i++;
 						const resource = this.options.resource.with({ scheme: Schemas.walkThroughSnippet, fragment: `${i}.${lang}` });
 						snippets.push(this.textModelResolverService.createModelReference(resource));
 						return `<div id="snippet-${resource.fragment}" class="walkThroughEditorContainer" ></div>`;
 					};
-					content = marked(content, { renderer });
 
+					const m = new marked.Marked({ renderer }, markedGfmHeadingIdPlugin());
+					content = m.parse(content, { async: false });
 					return Promise.all(snippets)
 						.then(refs => new WalkThroughModel(content, refs));
 				});
diff --git a/src/vs/workbench/contrib/welcomeWalkthrough/browser/walkThroughPart.ts b/src/vs/workbench/contrib/welcomeWalkthrough/browser/walkThroughPart.ts
index 34efe4d154e..27d04d09f01 100644
--- a/src/vs/workbench/contrib/welcomeWalkthrough/browser/walkThroughPart.ts
+++ b/src/vs/workbench/contrib/welcomeWalkthrough/browser/walkThroughPart.ts
@@ -3,40 +3,40 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/workbench/contrib/welcomeWalkthrough/common/walkThroughUtils';
-import 'vs/css!./media/walkThroughPart';
-import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
-import { EventType as TouchEventType, GestureEvent, Gesture } from 'vs/base/browser/touch';
-import { ScrollbarVisibility } from 'vs/base/common/scrollable';
-import * as strings from 'vs/base/common/strings';
-import { URI } from 'vs/base/common/uri';
-import { IDisposable, dispose, toDisposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { IEditorMemento, IEditorOpenContext } from 'vs/workbench/common/editor';
-import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { WalkThroughInput } from 'vs/workbench/contrib/welcomeWalkthrough/browser/walkThroughInput';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { localize } from 'vs/nls';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { RawContextKey, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { isObject } from 'vs/base/common/types';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { IEditorOptions as ICodeEditorOptions, EditorOption } from 'vs/editor/common/config/editorOptions';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { UILabelProvider } from 'vs/base/common/keybindingLabels';
-import { OS, OperatingSystem } from 'vs/base/common/platform';
-import { deepClone } from 'vs/base/common/objects';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { addDisposableListener, Dimension, isHTMLAnchorElement, isHTMLButtonElement, isHTMLElement, safeInnerHtml, size } from 'vs/base/browser/dom';
-import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IEditorOptions } from 'vs/platform/editor/common/editor';
+import '../common/walkThroughUtils.js';
+import './media/walkThroughPart.css';
+import { DomScrollableElement } from '../../../../base/browser/ui/scrollbar/scrollableElement.js';
+import { EventType as TouchEventType, GestureEvent, Gesture } from '../../../../base/browser/touch.js';
+import { ScrollbarVisibility } from '../../../../base/common/scrollable.js';
+import * as strings from '../../../../base/common/strings.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IDisposable, dispose, toDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { IEditorMemento, IEditorOpenContext } from '../../../common/editor.js';
+import { EditorPane } from '../../../browser/parts/editor/editorPane.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { WalkThroughInput } from './walkThroughInput.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { CodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { localize } from '../../../../nls.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { RawContextKey, IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { isObject } from '../../../../base/common/types.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { IEditorOptions as ICodeEditorOptions, EditorOption } from '../../../../editor/common/config/editorOptions.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { UILabelProvider } from '../../../../base/common/keybindingLabels.js';
+import { OS, OperatingSystem } from '../../../../base/common/platform.js';
+import { deepClone } from '../../../../base/common/objects.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { addDisposableListener, Dimension, isHTMLAnchorElement, isHTMLButtonElement, isHTMLElement, safeInnerHtml, size } from '../../../../base/browser/dom.js';
+import { IEditorGroup, IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IEditorOptions } from '../../../../platform/editor/common/editor.js';
 
 export const WALK_THROUGH_FOCUS = new RawContextKey<boolean>('interactivePlaygroundFocus', false);
 
@@ -287,7 +287,7 @@ export class WalkThroughPart extends EditorPane {
 
 				const content = model.main;
 				if (!input.resource.path.endsWith('.md')) {
-					safeInnerHtml(this.content, content);
+					safeInnerHtml(this.content, content, { ALLOW_UNKNOWN_PROTOCOLS: true });
 
 					this.updateSizeClasses();
 					this.decorateContent();
@@ -302,7 +302,7 @@ export class WalkThroughPart extends EditorPane {
 				const innerContent = document.createElement('div');
 				innerContent.classList.add('walkThroughContent'); // only for markdown files
 				const markdown = this.expandMacros(content);
-				safeInnerHtml(innerContent, markdown);
+				safeInnerHtml(innerContent, markdown, { ALLOW_UNKNOWN_PROTOCOLS: true });
 				this.content.appendChild(innerContent);
 
 				model.snippets.forEach((snippet, i) => {
diff --git a/src/vs/workbench/contrib/welcomeWalkthrough/common/walkThroughContentProvider.ts b/src/vs/workbench/contrib/welcomeWalkthrough/common/walkThroughContentProvider.ts
index 24764f1e31a..b7ed7fdb242 100644
--- a/src/vs/workbench/contrib/welcomeWalkthrough/common/walkThroughContentProvider.ts
+++ b/src/vs/workbench/contrib/welcomeWalkthrough/common/walkThroughContentProvider.ts
@@ -3,40 +3,53 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { ITextModelService, ITextModelContentProvider } from 'vs/editor/common/services/resolverService';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ITextModel, DefaultEndOfLine, EndOfLinePreference, ITextBufferFactory } from 'vs/editor/common/model';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { marked } from 'vs/base/common/marked/marked';
-import { Schemas } from 'vs/base/common/network';
-import { Range } from 'vs/editor/common/core/range';
-import { createTextBufferFactory } from 'vs/editor/common/model/textModel';
-import { assertIsDefined } from 'vs/base/common/types';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { URI } from '../../../../base/common/uri.js';
+import { ITextModelService, ITextModelContentProvider } from '../../../../editor/common/services/resolverService.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ITextModel, DefaultEndOfLine, EndOfLinePreference, ITextBufferFactory } from '../../../../editor/common/model.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import * as marked from '../../../../base/common/marked/marked.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { createTextBufferFactory } from '../../../../editor/common/model/textModel.js';
+import { assertIsDefined } from '../../../../base/common/types.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 
-export function requireToContent(instantiationService: IInstantiationService, resource: URI): Promise<string> {
+interface IWalkThroughContentProvider {
+	(accessor: ServicesAccessor): string;
+}
+
+class WalkThroughContentProviderRegistry {
+
+	private readonly providers = new Map<string, IWalkThroughContentProvider>();
+
+	registerProvider(moduleId: string, provider: IWalkThroughContentProvider): void {
+		this.providers.set(moduleId, provider);
+	}
+
+	getProvider(moduleId: string): IWalkThroughContentProvider | undefined {
+		return this.providers.get(moduleId);
+	}
+}
+export const walkThroughContentRegistry = new WalkThroughContentProviderRegistry();
+
+export async function moduleToContent(instantiationService: IInstantiationService, resource: URI): Promise<string> {
 	if (!resource.query) {
-		throw new Error('Welcome: invalid resource');
+		throw new Error('Walkthrough: invalid resource');
 	}
 
 	const query = JSON.parse(resource.query);
 	if (!query.moduleId) {
-		throw new Error('Welcome: invalid resource');
+		throw new Error('Walkthrough: invalid resource');
 	}
 
-	const content: Promise<string> = new Promise<string>((resolve, reject) => {
-		require([query.moduleId], content => {
-			try {
-				resolve(instantiationService.invokeFunction(content.default));
-			} catch (err) {
-				reject(err);
-			}
-		});
-	});
+	const provider = walkThroughContentRegistry.getProvider(query.moduleId);
+	if (!provider) {
+		throw new Error(`Walkthrough: no provider registered for ${query.moduleId}`);
+	}
 
-	return content;
+	return instantiationService.invokeFunction(provider);
 }
 
 export class WalkThroughSnippetContentProvider implements ITextModelContentProvider, IWorkbenchContribution {
@@ -57,7 +70,7 @@ export class WalkThroughSnippetContentProvider implements ITextModelContentProvi
 	private async textBufferFactoryFromResource(resource: URI): Promise<ITextBufferFactory> {
 		let ongoing = this.loads.get(resource.toString());
 		if (!ongoing) {
-			ongoing = requireToContent(this.instantiationService, resource)
+			ongoing = moduleToContent(this.instantiationService, resource)
 				.then(content => createTextBufferFactory(content))
 				.finally(() => this.loads.delete(resource.toString()));
 			this.loads.set(resource.toString(), ongoing);
@@ -71,13 +84,13 @@ export class WalkThroughSnippetContentProvider implements ITextModelContentProvi
 		if (!codeEditorModel) {
 			const j = parseInt(resource.fragment);
 			let i = 0;
-			const renderer = new marked.Renderer();
-			renderer.code = (code, lang) => {
+			const renderer = new marked.marked.Renderer();
+			renderer.code = ({ text, lang }: marked.Tokens.Code) => {
 				i++;
 				const languageId = typeof lang === 'string' ? this.languageService.getLanguageIdByLanguageName(lang) || '' : '';
 				const languageSelection = this.languageService.createById(languageId);
 				// Create all models for this resource in one go... we'll need them all and we don't want to re-parse markdown each time
-				const model = this.modelService.createModel(code, languageSelection, resource.with({ fragment: `${i}.${lang}` }));
+				const model = this.modelService.createModel(text, languageSelection, resource.with({ fragment: `${i}.${lang}` }));
 				if (i === j) { codeEditorModel = model; }
 				return '';
 			};
@@ -85,7 +98,7 @@ export class WalkThroughSnippetContentProvider implements ITextModelContentProvi
 			const lineCount = textBuffer.getLineCount();
 			const range = new Range(1, 1, lineCount, textBuffer.getLineLength(lineCount) + 1);
 			const markdown = textBuffer.getValueInRange(range, EndOfLinePreference.TextDefined);
-			marked(markdown, { renderer });
+			marked.marked(markdown, { renderer });
 		}
 		return assertIsDefined(codeEditorModel);
 	}
diff --git a/src/vs/workbench/contrib/welcomeWalkthrough/common/walkThroughUtils.ts b/src/vs/workbench/contrib/welcomeWalkthrough/common/walkThroughUtils.ts
index 6d44ece22aa..92b8f3c85ad 100644
--- a/src/vs/workbench/contrib/welcomeWalkthrough/common/walkThroughUtils.ts
+++ b/src/vs/workbench/contrib/welcomeWalkthrough/common/walkThroughUtils.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { registerColor } from 'vs/platform/theme/common/colorRegistry';
-import { localize } from 'vs/nls';
-import { Color, RGBA } from 'vs/base/common/color';
+import { registerColor } from '../../../../platform/theme/common/colorRegistry.js';
+import { localize } from '../../../../nls.js';
+import { Color, RGBA } from '../../../../base/common/color.js';
 
 export const embeddedEditorBackground = registerColor('walkThrough.embeddedEditorBackground', { dark: new Color(new RGBA(0, 0, 0, .4)), light: '#f4f4f4', hcDark: null, hcLight: null }, localize('walkThrough.embeddedEditorBackground', 'Background color for the embedded editors on the Interactive Playground.'));
diff --git a/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts b/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts
index 541f119b6ed..0ab68289fb6 100644
--- a/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts
+++ b/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts
@@ -3,53 +3,53 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/workspaceTrustEditor';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { localize, localize2 } from 'vs/nls';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ConfigurationScope, Extensions as ConfigurationExtensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { Severity } from 'vs/platform/notification/common/notification';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService, IWorkspaceTrustRequestService, WorkspaceTrustUriResponse } from 'vs/platform/workspace/common/workspaceTrust';
-import { Extensions as WorkbenchExtensions, IWorkbenchContribution, IWorkbenchContributionsRegistry, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { Codicon } from 'vs/base/common/codicons';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ContextKeyExpr, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment } from 'vs/workbench/services/statusbar/browser/statusbar';
-import { IEditorPaneRegistry, EditorPaneDescriptor } from 'vs/workbench/browser/editor';
-import { shieldIcon, WorkspaceTrustEditor } from 'vs/workbench/contrib/workspace/browser/workspaceTrustEditor';
-import { WorkspaceTrustEditorInput } from 'vs/workbench/services/workspaces/browser/workspaceTrustEditorInput';
-import { WORKSPACE_TRUST_BANNER, WORKSPACE_TRUST_EMPTY_WINDOW, WORKSPACE_TRUST_ENABLED, WORKSPACE_TRUST_STARTUP_PROMPT, WORKSPACE_TRUST_UNTRUSTED_FILES } from 'vs/workbench/services/workspaces/common/workspaceTrust';
-import { IEditorSerializer, IEditorFactoryRegistry, EditorExtensions } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { isEmptyWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, IWorkspaceContextService, IWorkspaceFoldersWillChangeEvent, toWorkspaceIdentifier, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { dirname, resolve } from 'vs/base/common/path';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IMarkdownString, MarkdownString } from 'vs/base/common/htmlContent';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IBannerItem, IBannerService } from 'vs/workbench/services/banner/browser/bannerService';
-import { isVirtualWorkspace } from 'vs/platform/workspace/common/virtualWorkspace';
-import { LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID } from 'vs/workbench/contrib/extensions/common/extensions';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { WORKSPACE_TRUST_SETTING_TAG } from 'vs/workbench/contrib/preferences/common/preferences';
-import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
-import { ILabelService, Verbosity } from 'vs/platform/label/common/label';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { MANAGE_TRUST_COMMAND_ID, WorkspaceTrustContext } from 'vs/workbench/contrib/workspace/common/workspace';
-import { isWeb } from 'vs/base/common/platform';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { securityConfigurationNodeBase } from 'vs/workbench/common/configuration';
-import { basename, dirname as uriDirname } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IFileService } from 'vs/platform/files/common/files';
+import './media/workspaceTrustEditor.css';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { ConfigurationScope, Extensions as ConfigurationExtensions, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { Severity } from '../../../../platform/notification/common/notification.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService, IWorkspaceTrustRequestService, WorkspaceTrustUriResponse } from '../../../../platform/workspace/common/workspaceTrust.js';
+import { Extensions as WorkbenchExtensions, IWorkbenchContribution, IWorkbenchContributionsRegistry, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment } from '../../../services/statusbar/browser/statusbar.js';
+import { IEditorPaneRegistry, EditorPaneDescriptor } from '../../../browser/editor.js';
+import { shieldIcon, WorkspaceTrustEditor } from './workspaceTrustEditor.js';
+import { WorkspaceTrustEditorInput } from '../../../services/workspaces/browser/workspaceTrustEditorInput.js';
+import { WORKSPACE_TRUST_BANNER, WORKSPACE_TRUST_EMPTY_WINDOW, WORKSPACE_TRUST_ENABLED, WORKSPACE_TRUST_STARTUP_PROMPT, WORKSPACE_TRUST_UNTRUSTED_FILES } from '../../../services/workspaces/common/workspaceTrust.js';
+import { IEditorSerializer, IEditorFactoryRegistry, EditorExtensions } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { isEmptyWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, IWorkspaceContextService, IWorkspaceFoldersWillChangeEvent, toWorkspaceIdentifier, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { dirname, resolve } from '../../../../base/common/path.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IMarkdownString, MarkdownString } from '../../../../base/common/htmlContent.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { IBannerItem, IBannerService } from '../../../services/banner/browser/bannerService.js';
+import { isVirtualWorkspace } from '../../../../platform/workspace/common/virtualWorkspace.js';
+import { LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID } from '../../extensions/common/extensions.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { WORKSPACE_TRUST_SETTING_TAG } from '../../preferences/common/preferences.js';
+import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
+import { ILabelService, Verbosity } from '../../../../platform/label/common/label.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { MANAGE_TRUST_COMMAND_ID, WorkspaceTrustContext } from '../common/workspace.js';
+import { isWeb } from '../../../../base/common/platform.js';
+import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';
+import { securityConfigurationNodeBase } from '../../../common/configuration.js';
+import { basename, dirname as uriDirname } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
 
 const BANNER_RESTRICTED_MODE = 'workbench.banner.restrictedMode';
 const STARTUP_PROMPT_SHOWN_KEY = 'workspace.trust.startupPrompt.shown';
diff --git a/src/vs/workbench/contrib/workspace/browser/workspaceTrustEditor.ts b/src/vs/workbench/contrib/workspace/browser/workspaceTrustEditor.ts
index 6ee778a292b..474a87bd92e 100644
--- a/src/vs/workbench/contrib/workspace/browser/workspaceTrustEditor.ts
+++ b/src/vs/workbench/contrib/workspace/browser/workspaceTrustEditor.ts
@@ -3,63 +3,63 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { $, addDisposableListener, addStandardDisposableListener, append, clearNode, Dimension, EventHelper, EventType, isAncestorOfActiveElement } from 'vs/base/browser/dom';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { ButtonBar } from 'vs/base/browser/ui/button/button';
-import { IMessage, InputBox, MessageType } from 'vs/base/browser/ui/inputbox/inputBox';
-import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
-import { ITableRenderer, ITableVirtualDelegate } from 'vs/base/browser/ui/table/table';
-import { Action, IAction } from 'vs/base/common/actions';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Codicon } from 'vs/base/common/codicons';
-import { debounce } from 'vs/base/common/decorators';
-import { Emitter, Event } from 'vs/base/common/event';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { normalizeDriveLetter } from 'vs/base/common/labels';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { parseLinkedText } from 'vs/base/common/linkedText';
-import { Schemas } from 'vs/base/common/network';
-import { ScrollbarVisibility } from 'vs/base/common/scrollable';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { ConfigurationScope, Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { WorkbenchTable } from 'vs/platform/list/browser/listService';
-import { Link } from 'vs/platform/opener/browser/link';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { isVirtualResource, isVirtualWorkspace } from 'vs/platform/workspace/common/virtualWorkspace';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { asCssVariable, buttonBackground, buttonSecondaryBackground, editorErrorForeground } from 'vs/platform/theme/common/colorRegistry';
-import { ISingleFolderWorkspaceIdentifier, IWorkspaceContextService, toWorkspaceIdentifier, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IWorkspaceTrustManagementService } from 'vs/platform/workspace/common/workspaceTrust';
-import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
-import { IEditorOpenContext } from 'vs/workbench/common/editor';
-import { debugIconStartForeground } from 'vs/workbench/contrib/debug/browser/debugColors';
-import { IExtensionsWorkbenchService, LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID } from 'vs/workbench/contrib/extensions/common/extensions';
-import { IWorkbenchConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
-import { IExtensionManifestPropertiesService } from 'vs/workbench/services/extensions/common/extensionManifestPropertiesService';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { WorkspaceTrustEditorInput } from 'vs/workbench/services/workspaces/browser/workspaceTrustEditorInput';
-import { IEditorOptions } from 'vs/platform/editor/common/editor';
-import { getExtensionDependencies } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { EnablementState, IWorkbenchExtensionEnablementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { posix, win32 } from 'vs/base/common/path';
-import { hasDriveLetter, toSlashes } from 'vs/base/common/extpath';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { defaultButtonStyles, defaultInputBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { isMacintosh } from 'vs/base/common/platform';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ResolvedKeybinding } from 'vs/base/common/keybindings';
-import { basename, dirname } from 'vs/base/common/resources';
-import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
+import { $, addDisposableListener, addStandardDisposableListener, append, clearNode, Dimension, EventHelper, EventType, isAncestorOfActiveElement } from '../../../../base/browser/dom.js';
+import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { ButtonBar } from '../../../../base/browser/ui/button/button.js';
+import { IMessage, InputBox, MessageType } from '../../../../base/browser/ui/inputbox/inputBox.js';
+import { DomScrollableElement } from '../../../../base/browser/ui/scrollbar/scrollableElement.js';
+import { ITableRenderer, ITableVirtualDelegate } from '../../../../base/browser/ui/table/table.js';
+import { Action, IAction } from '../../../../base/common/actions.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { debounce } from '../../../../base/common/decorators.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { normalizeDriveLetter } from '../../../../base/common/labels.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { parseLinkedText } from '../../../../base/common/linkedText.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { ScrollbarVisibility } from '../../../../base/common/scrollable.js';
+import { URI } from '../../../../base/common/uri.js';
+import { localize } from '../../../../nls.js';
+import { ConfigurationScope, Extensions, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { WorkbenchTable } from '../../../../platform/list/browser/listService.js';
+import { Link } from '../../../../platform/opener/browser/link.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { isVirtualResource, isVirtualWorkspace } from '../../../../platform/workspace/common/virtualWorkspace.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { asCssVariable, buttonBackground, buttonSecondaryBackground, editorErrorForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import { ISingleFolderWorkspaceIdentifier, IWorkspaceContextService, toWorkspaceIdentifier, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { IWorkspaceTrustManagementService } from '../../../../platform/workspace/common/workspaceTrust.js';
+import { EditorPane } from '../../../browser/parts/editor/editorPane.js';
+import { IEditorOpenContext } from '../../../common/editor.js';
+import { debugIconStartForeground } from '../../debug/browser/debugColors.js';
+import { IExtensionsWorkbenchService, LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID } from '../../extensions/common/extensions.js';
+import { IWorkbenchConfigurationService } from '../../../services/configuration/common/configuration.js';
+import { IExtensionManifestPropertiesService } from '../../../services/extensions/common/extensionManifestPropertiesService.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { WorkspaceTrustEditorInput } from '../../../services/workspaces/browser/workspaceTrustEditorInput.js';
+import { IEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { getExtensionDependencies } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { EnablementState, IWorkbenchExtensionEnablementService } from '../../../services/extensionManagement/common/extensionManagement.js';
+import { posix, win32 } from '../../../../base/common/path.js';
+import { hasDriveLetter, toSlashes } from '../../../../base/common/extpath.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { defaultButtonStyles, defaultInputBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { isMacintosh } from '../../../../base/common/platform.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { ResolvedKeybinding } from '../../../../base/common/keybindings.js';
+import { basename, dirname } from '../../../../base/common/resources.js';
+import { IEditorGroup } from '../../../services/editor/common/editorGroupsService.js';
 
 export const shieldIcon = registerIcon('workspace-trust-banner', Codicon.shield, localize('shieldIcon', 'Icon for workspace trust ion the banner.'));
 
diff --git a/src/vs/workbench/contrib/workspace/common/workspace.ts b/src/vs/workbench/contrib/workspace/common/workspace.ts
index c3aeea2acf0..4e93b0eef52 100644
--- a/src/vs/workbench/contrib/workspace/common/workspace.ts
+++ b/src/vs/workbench/contrib/workspace/common/workspace.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { localize } from '../../../../nls.js';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 
 /**
  * Trust Context Keys
diff --git a/src/vs/workbench/contrib/workspaces/browser/workspaces.contribution.ts b/src/vs/workbench/contrib/workspaces/browser/workspaces.contribution.ts
index 2d965620574..55371fbeea8 100644
--- a/src/vs/workbench/contrib/workspaces/browser/workspaces.contribution.ts
+++ b/src/vs/workbench/contrib/workspaces/browser/workspaces.contribution.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize, localize2 } from 'vs/nls';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry, IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { hasWorkspaceFileExtension, IWorkspaceContextService, WorkbenchState, WORKSPACE_SUFFIX } from 'vs/platform/workspace/common/workspace';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IFileService } from 'vs/platform/files/common/files';
-import { INeverShowAgainOptions, INotificationService, NeverShowAgainScope, NotificationPriority, Severity } from 'vs/platform/notification/common/notification';
-import { URI } from 'vs/base/common/uri';
-import { isEqual, joinPath } from 'vs/base/common/resources';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
-import { isVirtualWorkspace } from 'vs/platform/workspace/common/virtualWorkspace';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { ActiveEditorContext, ResourceContextKey, TemporaryWorkspaceContext } from 'vs/workbench/common/contextkeys';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { TEXT_FILE_EDITOR_ID } from 'vs/workbench/contrib/files/common/files';
+import { localize, localize2 } from '../../../../nls.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry, IWorkbenchContribution } from '../../../common/contributions.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { hasWorkspaceFileExtension, IWorkspaceContextService, WorkbenchState, WORKSPACE_SUFFIX } from '../../../../platform/workspace/common/workspace.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { INeverShowAgainOptions, INotificationService, NeverShowAgainScope, NotificationPriority, Severity } from '../../../../platform/notification/common/notification.js';
+import { URI } from '../../../../base/common/uri.js';
+import { isEqual, joinPath } from '../../../../base/common/resources.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { IQuickInputService, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
+import { IStorageService, StorageScope } from '../../../../platform/storage/common/storage.js';
+import { isVirtualWorkspace } from '../../../../platform/workspace/common/virtualWorkspace.js';
+import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
+import { ActiveEditorContext, ResourceContextKey, TemporaryWorkspaceContext } from '../../../common/contextkeys.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { TEXT_FILE_EDITOR_ID } from '../../files/common/files.js';
 
 /**
  * A workbench contribution that will look for `.code-workspace` files in the root of the
diff --git a/src/vs/workbench/electron-sandbox/actions/developerActions.ts b/src/vs/workbench/electron-sandbox/actions/developerActions.ts
index a15b238b11a..a35b8ebc48d 100644
--- a/src/vs/workbench/electron-sandbox/actions/developerActions.ts
+++ b/src/vs/workbench/electron-sandbox/actions/developerActions.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize2 } from 'vs/nls';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { Action2, MenuId } from 'vs/platform/actions/common/actions';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { IsDevelopmentContext } from 'vs/platform/contextkey/common/contextkeys';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { IFileService } from 'vs/platform/files/common/files';
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
-import { URI } from 'vs/base/common/uri';
-import { getActiveWindow } from 'vs/base/browser/dom';
+import { localize2 } from '../../../nls.js';
+import { INativeHostService } from '../../../platform/native/common/native.js';
+import { IEditorService } from '../../services/editor/common/editorService.js';
+import { Action2, MenuId } from '../../../platform/actions/common/actions.js';
+import { Categories } from '../../../platform/action/common/actionCommonCategories.js';
+import { ServicesAccessor } from '../../../platform/instantiation/common/instantiation.js';
+import { IWorkbenchEnvironmentService } from '../../services/environment/common/environmentService.js';
+import { KeybindingWeight } from '../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IsDevelopmentContext } from '../../../platform/contextkey/common/contextkeys.js';
+import { KeyCode, KeyMod } from '../../../base/common/keyCodes.js';
+import { IFileService } from '../../../platform/files/common/files.js';
+import { INativeWorkbenchEnvironmentService } from '../../services/environment/electron-sandbox/environmentService.js';
+import { URI } from '../../../base/common/uri.js';
+import { getActiveWindow } from '../../../base/browser/dom.js';
 
 export class ToggleDevToolsAction extends Action2 {
 
diff --git a/src/vs/workbench/electron-sandbox/actions/installActions.ts b/src/vs/workbench/electron-sandbox/actions/installActions.ts
index d9332bb4855..dcf8fe676b0 100644
--- a/src/vs/workbench/electron-sandbox/actions/installActions.ts
+++ b/src/vs/workbench/electron-sandbox/actions/installActions.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize, localize2 } from 'vs/nls';
-import { Action2 } from 'vs/platform/actions/common/actions';
-import { ILocalizedString } from 'vs/platform/action/common/action';
-import product from 'vs/platform/product/common/product';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { isCancellationError } from 'vs/base/common/errors';
+import { localize, localize2 } from '../../../nls.js';
+import { Action2 } from '../../../platform/actions/common/actions.js';
+import { ILocalizedString } from '../../../platform/action/common/action.js';
+import product from '../../../platform/product/common/product.js';
+import { IDialogService } from '../../../platform/dialogs/common/dialogs.js';
+import { ServicesAccessor } from '../../../platform/instantiation/common/instantiation.js';
+import { INativeHostService } from '../../../platform/native/common/native.js';
+import { toErrorMessage } from '../../../base/common/errorMessage.js';
+import { IProductService } from '../../../platform/product/common/productService.js';
+import { isCancellationError } from '../../../base/common/errors.js';
 
 const shellCommandCategory: ILocalizedString = localize2('shellCommand', 'Shell Command');
 
diff --git a/src/vs/workbench/electron-sandbox/actions/windowActions.ts b/src/vs/workbench/electron-sandbox/actions/windowActions.ts
index 5693f076eec..ce2a584233d 100644
--- a/src/vs/workbench/electron-sandbox/actions/windowActions.ts
+++ b/src/vs/workbench/electron-sandbox/actions/windowActions.ts
@@ -3,31 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/actions';
-import { URI } from 'vs/base/common/uri';
-import { localize, localize2 } from 'vs/nls';
-import { ApplyZoomTarget, MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL, applyZoom } from 'vs/platform/window/electron-sandbox/window';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { getZoomLevel } from 'vs/base/browser/browser';
-import { FileKind } from 'vs/platform/files/common/files';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IQuickInputService, IQuickInputButton, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { getIconClasses } from 'vs/editor/common/services/getIconClasses';
-import { ICommandHandler } from 'vs/platform/commands/common/commands';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
-import { Action2, IAction2Options, MenuId } from 'vs/platform/actions/common/actions';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { isMacintosh } from 'vs/base/common/platform';
-import { getActiveWindow } from 'vs/base/browser/dom';
-import { IOpenedAuxiliaryWindow, IOpenedMainWindow, isOpenedAuxiliaryWindow } from 'vs/platform/window/common/window';
+import './media/actions.css';
+import { URI } from '../../../base/common/uri.js';
+import { localize, localize2 } from '../../../nls.js';
+import { ApplyZoomTarget, MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL, applyZoom } from '../../../platform/window/electron-sandbox/window.js';
+import { IKeybindingService } from '../../../platform/keybinding/common/keybinding.js';
+import { getZoomLevel } from '../../../base/browser/browser.js';
+import { FileKind } from '../../../platform/files/common/files.js';
+import { IModelService } from '../../../editor/common/services/model.js';
+import { ILanguageService } from '../../../editor/common/languages/language.js';
+import { IQuickInputService, IQuickInputButton, IQuickPickItem, QuickPickInput } from '../../../platform/quickinput/common/quickInput.js';
+import { getIconClasses } from '../../../editor/common/services/getIconClasses.js';
+import { ICommandHandler } from '../../../platform/commands/common/commands.js';
+import { ServicesAccessor } from '../../../platform/instantiation/common/instantiation.js';
+import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
+import { INativeHostService } from '../../../platform/native/common/native.js';
+import { Codicon } from '../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../base/common/themables.js';
+import { isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier } from '../../../platform/workspace/common/workspace.js';
+import { Action2, IAction2Options, MenuId } from '../../../platform/actions/common/actions.js';
+import { Categories } from '../../../platform/action/common/actionCommonCategories.js';
+import { KeyCode, KeyMod } from '../../../base/common/keyCodes.js';
+import { KeybindingWeight } from '../../../platform/keybinding/common/keybindingsRegistry.js';
+import { isMacintosh } from '../../../base/common/platform.js';
+import { getActiveWindow } from '../../../base/browser/dom.js';
+import { IOpenedAuxiliaryWindow, IOpenedMainWindow, isOpenedAuxiliaryWindow } from '../../../platform/window/common/window.js';
 
 export class CloseWindowAction extends Action2 {
 
@@ -253,11 +253,17 @@ abstract class BaseSwitchWindow extends Action2 {
 			readonly windowId: number;
 		}
 
-		const picks: Array<IWindowPickItem> = [];
+		function isWindowPickItem(candidate: unknown): candidate is IWindowPickItem {
+			const windowPickItem = candidate as IWindowPickItem | undefined;
+
+			return typeof windowPickItem?.windowId === 'number';
+		}
+
+		const picks: Array<QuickPickInput<IWindowPickItem>> = [];
 		for (const window of mainWindows) {
 			const auxiliaryWindows = mapMainWindowToAuxiliaryWindows.get(window.id);
 			if (mapMainWindowToAuxiliaryWindows.size > 0) {
-				picks.push({ type: 'separator', payload: -1, label: auxiliaryWindows ? localize('windowGroup', "window group") : undefined } as unknown as IWindowPickItem);
+				picks.push({ type: 'separator', label: auxiliaryWindows ? localize('windowGroup', "window group") : undefined });
 			}
 
 			const resource = window.filename ? URI.file(window.filename) : isSingleFolderWorkspaceIdentifier(window.workspace) ? window.workspace.uri : isWorkspaceIdentifier(window.workspace) ? window.workspace.configPath : undefined;
@@ -286,13 +292,27 @@ abstract class BaseSwitchWindow extends Action2 {
 			}
 		}
 
-		const placeHolder = localize('switchWindowPlaceHolder', "Select a window to switch to");
-		const autoFocusIndex = (picks.indexOf(picks.filter(pick => pick.windowId === currentWindowId)[0]) + 1) % picks.length;
-
 		const pick = await quickInputService.pick(picks, {
 			contextKey: 'inWindowsPicker',
-			activeItem: picks[autoFocusIndex],
-			placeHolder,
+			activeItem: (() => {
+				for (let i = 0; i < picks.length; i++) {
+					const pick = picks[i];
+					if (isWindowPickItem(pick) && pick.windowId === currentWindowId) {
+						let nextPick = picks[i + 1]; // try to select next window unless it's a separator
+						if (isWindowPickItem(nextPick)) {
+							return nextPick;
+						}
+
+						nextPick = picks[i + 2]; // otherwise try to select the next window after the separator
+						if (isWindowPickItem(nextPick)) {
+							return nextPick;
+						}
+					}
+				}
+
+				return undefined;
+			})(),
+			placeHolder: localize('switchWindowPlaceHolder', "Select a window to switch to"),
 			quickNavigate: this.isQuickNavigate() ? { keybindings: keybindingService.lookupKeybindings(this.desc.id) } : undefined,
 			hideInput: this.isQuickNavigate(),
 			onDidTriggerItemButton: async context => {
diff --git a/src/vs/workbench/electron-sandbox/desktop.contribution.ts b/src/vs/workbench/electron-sandbox/desktop.contribution.ts
index 0fbe0079ed1..72527bf9ba5 100644
--- a/src/vs/workbench/electron-sandbox/desktop.contribution.ts
+++ b/src/vs/workbench/electron-sandbox/desktop.contribution.ts
@@ -3,31 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Registry } from 'vs/platform/registry/common/platform';
-import { localize, localize2 } from 'vs/nls';
-import { MenuRegistry, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
-import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
-import { isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
-import { ConfigureRuntimeArgumentsAction, ToggleDevToolsAction, ReloadWindowWithExtensionsDisabledAction, OpenUserDataFolderAction } from 'vs/workbench/electron-sandbox/actions/developerActions';
-import { ZoomResetAction, ZoomOutAction, ZoomInAction, CloseWindowAction, SwitchWindowAction, QuickSwitchWindowAction, NewWindowTabHandler, ShowPreviousWindowTabHandler, ShowNextWindowTabHandler, MoveWindowTabToNewWindowHandler, MergeWindowTabsHandlerHandler, ToggleWindowTabsBarHandler } from 'vs/workbench/electron-sandbox/actions/windowActions';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IsMacContext } from 'vs/platform/contextkey/common/contextkeys';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { IJSONContributionRegistry, Extensions as JSONExtensions } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import { InstallShellScriptAction, UninstallShellScriptAction } from 'vs/workbench/electron-sandbox/actions/installActions';
-import { EditorsVisibleContext, SingleEditorGroupsContext } from 'vs/workbench/common/contextkeys';
-import { TELEMETRY_SETTING_ID } from 'vs/platform/telemetry/common/telemetry';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ShutdownReason } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { NativeWindow } from 'vs/workbench/electron-sandbox/window';
-import { ModifierKeyEmitter } from 'vs/base/browser/dom';
-import { applicationConfigurationNodeBase, securityConfigurationNodeBase } from 'vs/workbench/common/configuration';
-import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from 'vs/platform/window/electron-sandbox/window';
+import { Registry } from '../../platform/registry/common/platform.js';
+import { localize, localize2 } from '../../nls.js';
+import { MenuRegistry, MenuId, registerAction2 } from '../../platform/actions/common/actions.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from '../../platform/configuration/common/configurationRegistry.js';
+import { KeyMod, KeyCode } from '../../base/common/keyCodes.js';
+import { isLinux, isMacintosh, isWindows } from '../../base/common/platform.js';
+import { ConfigureRuntimeArgumentsAction, ToggleDevToolsAction, ReloadWindowWithExtensionsDisabledAction, OpenUserDataFolderAction } from './actions/developerActions.js';
+import { ZoomResetAction, ZoomOutAction, ZoomInAction, CloseWindowAction, SwitchWindowAction, QuickSwitchWindowAction, NewWindowTabHandler, ShowPreviousWindowTabHandler, ShowNextWindowTabHandler, MoveWindowTabToNewWindowHandler, MergeWindowTabsHandlerHandler, ToggleWindowTabsBarHandler } from './actions/windowActions.js';
+import { ContextKeyExpr } from '../../platform/contextkey/common/contextkey.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../platform/keybinding/common/keybindingsRegistry.js';
+import { CommandsRegistry } from '../../platform/commands/common/commands.js';
+import { ServicesAccessor } from '../../platform/instantiation/common/instantiation.js';
+import { IsMacContext } from '../../platform/contextkey/common/contextkeys.js';
+import { INativeHostService } from '../../platform/native/common/native.js';
+import { IJSONContributionRegistry, Extensions as JSONExtensions } from '../../platform/jsonschemas/common/jsonContributionRegistry.js';
+import { IJSONSchema } from '../../base/common/jsonSchema.js';
+import { InstallShellScriptAction, UninstallShellScriptAction } from './actions/installActions.js';
+import { EditorsVisibleContext, SingleEditorGroupsContext } from '../common/contextkeys.js';
+import { TELEMETRY_SETTING_ID } from '../../platform/telemetry/common/telemetry.js';
+import { IConfigurationService } from '../../platform/configuration/common/configuration.js';
+import { ShutdownReason } from '../services/lifecycle/common/lifecycle.js';
+import { NativeWindow } from './window.js';
+import { ModifierKeyEmitter } from '../../base/browser/dom.js';
+import { applicationConfigurationNodeBase, securityConfigurationNodeBase } from '../common/configuration.js';
+import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from '../../platform/window/electron-sandbox/window.js';
 
 // Actions
 (function registerActions(): void {
@@ -226,7 +226,7 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from 'vs/platform/window/electron-sand
 				'type': 'boolean',
 				'default': false,
 				'scope': ConfigurationScope.APPLICATION,
-				'markdownDescription': localize('window.doubleClickIconToClose', "If enabled, this setting will close the window when the application icon in the title bar is double-clicked. The window will not be able to be dragged by the icon. This setting is effective only if `#window.titleBarStyle#` is set to `custom`.")
+				'markdownDescription': localize('window.doubleClickIconToClose', "If enabled, this setting will close the window when the application icon in the title bar is double-clicked. The window will not be able to be dragged by the icon. This setting is effective only if {0} is set to `custom`.", '`#window.titleBarStyle#`')
 			},
 			'window.titleBarStyle': {
 				'type': 'string',
@@ -235,6 +235,12 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from 'vs/platform/window/electron-sand
 				'scope': ConfigurationScope.APPLICATION,
 				'description': localize('titleBarStyle', "Adjust the appearance of the window title bar to be native by the OS or custom. On Linux and Windows, this setting also affects the application and context menu appearances. Changes require a full restart to apply."),
 			},
+			'window.experimentalControlOverlay': {
+				'type': 'boolean',
+				'included': isLinux,
+				'markdownDescription': localize('window.experimentalControlOverlay', "Show the native window controls when {0} is set to `custom` (Linux only).", '`#window.titleBarStyle#`'),
+				'default': true
+			},
 			'window.customTitleBarVisibility': {
 				'type': 'string',
 				'enum': ['auto', 'windowed', 'never'],
@@ -245,7 +251,7 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from 'vs/platform/window/electron-sand
 				],
 				'default': isLinux ? 'never' : 'auto',
 				'scope': ConfigurationScope.APPLICATION,
-				'markdownDescription': localize('window.customTitleBarVisibility', "Adjust when the custom title bar should be shown. The custom title bar can be hidden when in full screen mode with `windowed`. The custom title bar can only be hidden in none full screen mode with `never` when {0} is set to `native`.", '`#window.titleBarStyle#`'),
+				'markdownDescription': localize('window.customTitleBarVisibility', "Adjust when the custom title bar should be shown. The custom title bar can be hidden when in full screen mode with `windowed`. The custom title bar can only be hidden in non full screen mode with `never` when {0} is set to `native`.", '`#window.titleBarStyle#`'),
 			},
 			'window.dialogStyle': {
 				'type': 'string',
@@ -360,6 +366,10 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from 'vs/platform/window/electron-sand
 				type: 'boolean',
 				description: localize('argv.disableLcdText', 'Disables LCD font antialiasing.')
 			},
+			'proxy-bypass-list': {
+				type: 'string',
+				description: localize('argv.proxyBypassList', 'Bypass any specified proxy for the given semi-colon-separated list of hosts. Example value "<local>;*.microsoft.com;*foo.com;1.2.3.4:5678", will use the proxy server for all hosts except for local addresses (localhost, 127.0.0.1 etc.), microsoft.com subdomains, hosts that contain the suffix foo.com and anything at 1.2.3.4:5678')
+			},
 			'disable-hardware-acceleration': {
 				type: 'boolean',
 				description: localize('argv.disableHardwareAcceleration', 'Disables hardware acceleration. ONLY change this option if you encounter graphic issues.')
diff --git a/src/vs/workbench/electron-sandbox/desktop.main.ts b/src/vs/workbench/electron-sandbox/desktop.main.ts
index 90b3fb50616..40cfd9c7ec3 100644
--- a/src/vs/workbench/electron-sandbox/desktop.main.ts
+++ b/src/vs/workbench/electron-sandbox/desktop.main.ts
@@ -3,64 +3,64 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import product from 'vs/platform/product/common/product';
-import { INativeWindowConfiguration, IWindowsConfiguration } from 'vs/platform/window/common/window';
-import { Workbench } from 'vs/workbench/browser/workbench';
-import { NativeWindow } from 'vs/workbench/electron-sandbox/window';
-import { setFullscreen } from 'vs/base/browser/browser';
-import { domContentLoaded } from 'vs/base/browser/dom';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { URI } from 'vs/base/common/uri';
-import { WorkspaceService } from 'vs/workbench/services/configuration/browser/configurationService';
-import { INativeWorkbenchEnvironmentService, NativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { ILoggerService, ILogService, LogLevel } from 'vs/platform/log/common/log';
-import { NativeWorkbenchStorageService } from 'vs/workbench/services/storage/electron-sandbox/storageService';
-import { IWorkspaceContextService, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, IAnyWorkspaceIdentifier, reviveIdentifier, toWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
-import { IWorkbenchConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ISharedProcessService } from 'vs/platform/ipc/electron-sandbox/services';
-import { IMainProcessService } from 'vs/platform/ipc/common/mainProcessService';
-import { SharedProcessService } from 'vs/workbench/services/sharedProcess/electron-sandbox/sharedProcessService';
-import { RemoteAuthorityResolverService } from 'vs/platform/remote/electron-sandbox/remoteAuthorityResolverService';
-import { IRemoteAuthorityResolverService, RemoteConnectionType } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { RemoteAgentService } from 'vs/workbench/services/remote/electron-sandbox/remoteAgentService';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { IFileService } from 'vs/platform/files/common/files';
-import { RemoteFileSystemProviderClient } from 'vs/workbench/services/remote/common/remoteFileSystemProviderClient';
-import { ConfigurationCache } from 'vs/workbench/services/configuration/common/configurationCache';
-import { ISignService } from 'vs/platform/sign/common/sign';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { INativeKeyboardLayoutService, NativeKeyboardLayoutService } from 'vs/workbench/services/keybinding/electron-sandbox/nativeKeyboardLayoutService';
-import { ElectronIPCMainProcessService } from 'vs/platform/ipc/electron-sandbox/mainProcessService';
-import { LoggerChannelClient } from 'vs/platform/log/common/logIpc';
-import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
-import { NativeLogService } from 'vs/workbench/services/log/electron-sandbox/logService';
-import { WorkspaceTrustEnablementService, WorkspaceTrustManagementService } from 'vs/workbench/services/workspaces/common/workspaceTrust';
-import { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService } from 'vs/platform/workspace/common/workspaceTrust';
-import { safeStringify } from 'vs/base/common/objects';
-import { IUtilityProcessWorkerWorkbenchService, UtilityProcessWorkerWorkbenchService } from 'vs/workbench/services/utilityProcess/electron-sandbox/utilityProcessWorkerWorkbenchService';
-import { isBigSurOrNewer, isCI, isMacintosh } from 'vs/base/common/platform';
-import { Schemas } from 'vs/base/common/network';
-import { DiskFileSystemProvider } from 'vs/workbench/services/files/electron-sandbox/diskFileSystemProvider';
-import { FileUserDataProvider } from 'vs/platform/userData/common/fileUserDataProvider';
-import { IUserDataProfilesService, reviveProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { UserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfileIpc';
-import { PolicyChannelClient } from 'vs/platform/policy/common/policyIpc';
-import { IPolicyService, NullPolicyService } from 'vs/platform/policy/common/policy';
-import { UserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfileService';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { BrowserSocketFactory } from 'vs/platform/remote/browser/browserSocketFactory';
-import { RemoteSocketFactoryService, IRemoteSocketFactoryService } from 'vs/platform/remote/common/remoteSocketFactoryService';
-import { ElectronRemoteResourceLoader } from 'vs/platform/remote/electron-sandbox/electronRemoteResourceLoader';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { applyZoom } from 'vs/platform/window/electron-sandbox/window';
-import { mainWindow } from 'vs/base/browser/window';
+import { localize } from '../../nls.js';
+import product from '../../platform/product/common/product.js';
+import { INativeWindowConfiguration, IWindowsConfiguration } from '../../platform/window/common/window.js';
+import { Workbench } from '../browser/workbench.js';
+import { NativeWindow } from './window.js';
+import { setFullscreen } from '../../base/browser/browser.js';
+import { domContentLoaded } from '../../base/browser/dom.js';
+import { onUnexpectedError } from '../../base/common/errors.js';
+import { URI } from '../../base/common/uri.js';
+import { WorkspaceService } from '../services/configuration/browser/configurationService.js';
+import { INativeWorkbenchEnvironmentService, NativeWorkbenchEnvironmentService } from '../services/environment/electron-sandbox/environmentService.js';
+import { ServiceCollection } from '../../platform/instantiation/common/serviceCollection.js';
+import { ILoggerService, ILogService, LogLevel } from '../../platform/log/common/log.js';
+import { NativeWorkbenchStorageService } from '../services/storage/electron-sandbox/storageService.js';
+import { IWorkspaceContextService, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, IAnyWorkspaceIdentifier, reviveIdentifier, toWorkspaceIdentifier } from '../../platform/workspace/common/workspace.js';
+import { IWorkbenchConfigurationService } from '../services/configuration/common/configuration.js';
+import { IStorageService } from '../../platform/storage/common/storage.js';
+import { Disposable } from '../../base/common/lifecycle.js';
+import { ISharedProcessService } from '../../platform/ipc/electron-sandbox/services.js';
+import { IMainProcessService } from '../../platform/ipc/common/mainProcessService.js';
+import { SharedProcessService } from '../services/sharedProcess/electron-sandbox/sharedProcessService.js';
+import { RemoteAuthorityResolverService } from '../../platform/remote/electron-sandbox/remoteAuthorityResolverService.js';
+import { IRemoteAuthorityResolverService, RemoteConnectionType } from '../../platform/remote/common/remoteAuthorityResolver.js';
+import { RemoteAgentService } from '../services/remote/electron-sandbox/remoteAgentService.js';
+import { IRemoteAgentService } from '../services/remote/common/remoteAgentService.js';
+import { FileService } from '../../platform/files/common/fileService.js';
+import { IFileService } from '../../platform/files/common/files.js';
+import { RemoteFileSystemProviderClient } from '../services/remote/common/remoteFileSystemProviderClient.js';
+import { ConfigurationCache } from '../services/configuration/common/configurationCache.js';
+import { ISignService } from '../../platform/sign/common/sign.js';
+import { IProductService } from '../../platform/product/common/productService.js';
+import { IUriIdentityService } from '../../platform/uriIdentity/common/uriIdentity.js';
+import { UriIdentityService } from '../../platform/uriIdentity/common/uriIdentityService.js';
+import { INativeKeyboardLayoutService, NativeKeyboardLayoutService } from '../services/keybinding/electron-sandbox/nativeKeyboardLayoutService.js';
+import { ElectronIPCMainProcessService } from '../../platform/ipc/electron-sandbox/mainProcessService.js';
+import { LoggerChannelClient } from '../../platform/log/common/logIpc.js';
+import { ProxyChannel } from '../../base/parts/ipc/common/ipc.js';
+import { NativeLogService } from '../services/log/electron-sandbox/logService.js';
+import { WorkspaceTrustEnablementService, WorkspaceTrustManagementService } from '../services/workspaces/common/workspaceTrust.js';
+import { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService } from '../../platform/workspace/common/workspaceTrust.js';
+import { safeStringify } from '../../base/common/objects.js';
+import { IUtilityProcessWorkerWorkbenchService, UtilityProcessWorkerWorkbenchService } from '../services/utilityProcess/electron-sandbox/utilityProcessWorkerWorkbenchService.js';
+import { isBigSurOrNewer, isCI, isMacintosh } from '../../base/common/platform.js';
+import { Schemas } from '../../base/common/network.js';
+import { DiskFileSystemProvider } from '../services/files/electron-sandbox/diskFileSystemProvider.js';
+import { FileUserDataProvider } from '../../platform/userData/common/fileUserDataProvider.js';
+import { IUserDataProfilesService, reviveProfile } from '../../platform/userDataProfile/common/userDataProfile.js';
+import { UserDataProfilesService } from '../../platform/userDataProfile/common/userDataProfileIpc.js';
+import { PolicyChannelClient } from '../../platform/policy/common/policyIpc.js';
+import { IPolicyService, NullPolicyService } from '../../platform/policy/common/policy.js';
+import { UserDataProfileService } from '../services/userDataProfile/common/userDataProfileService.js';
+import { IUserDataProfileService } from '../services/userDataProfile/common/userDataProfile.js';
+import { BrowserSocketFactory } from '../../platform/remote/browser/browserSocketFactory.js';
+import { RemoteSocketFactoryService, IRemoteSocketFactoryService } from '../../platform/remote/common/remoteSocketFactoryService.js';
+import { ElectronRemoteResourceLoader } from '../../platform/remote/electron-sandbox/electronRemoteResourceLoader.js';
+import { IConfigurationService } from '../../platform/configuration/common/configuration.js';
+import { applyZoom } from '../../platform/window/electron-sandbox/window.js';
+import { mainWindow } from '../../base/browser/window.js';
 
 export class DesktopMain extends Disposable {
 
@@ -206,7 +206,7 @@ export class DesktopMain extends Disposable {
 			logService.info('workbench#open()'); // marking workbench open helps to diagnose flaky integration/smoke tests
 		}
 		if (logService.getLevel() === LogLevel.Trace) {
-			logService.trace('workbench#open(): with configuration', safeStringify(this.configuration));
+			logService.trace('workbench#open(): with configuration', safeStringify({ ...this.configuration, nls: undefined /* exclude large property */ }));
 		}
 
 		// Shared Process
@@ -397,6 +397,10 @@ export class DesktopMain extends Disposable {
 	}
 }
 
+export interface IDesktopMain {
+	main(configuration: INativeWindowConfiguration): Promise<void>;
+}
+
 export function main(configuration: INativeWindowConfiguration): Promise<void> {
 	const workbench = new DesktopMain(configuration);
 
diff --git a/src/vs/workbench/electron-sandbox/parts/dialogs/dialog.contribution.ts b/src/vs/workbench/electron-sandbox/parts/dialogs/dialog.contribution.ts
index d9493a6453d..41859ad5d3c 100644
--- a/src/vs/workbench/electron-sandbox/parts/dialogs/dialog.contribution.ts
+++ b/src/vs/workbench/electron-sandbox/parts/dialogs/dialog.contribution.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IDialogHandler, IDialogResult, IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { IDialogsModel, IDialogViewItem } from 'vs/workbench/common/dialogs';
-import { BrowserDialogHandler } from 'vs/workbench/browser/parts/dialogs/dialogHandler';
-import { NativeDialogHandler } from 'vs/workbench/electron-sandbox/parts/dialogs/dialogHandler';
-import { DialogService } from 'vs/workbench/services/dialogs/common/dialogService';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { Lazy } from 'vs/base/common/lazy';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IDialogHandler, IDialogResult, IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { ILayoutService } from '../../../../platform/layout/browser/layoutService.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { IDialogsModel, IDialogViewItem } from '../../../common/dialogs.js';
+import { BrowserDialogHandler } from '../../../browser/parts/dialogs/dialogHandler.js';
+import { NativeDialogHandler } from './dialogHandler.js';
+import { DialogService } from '../../../services/dialogs/common/dialogService.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { Lazy } from '../../../../base/common/lazy.js';
 
 export class DialogHandlerContribution extends Disposable implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts b/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
index f2cc82ab8c5..6c61a590324 100644
--- a/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
+++ b/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { fromNow } from 'vs/base/common/date';
-import { isLinuxSnap } from 'vs/base/common/platform';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { AbstractDialogHandler, IConfirmation, IConfirmationResult, IPrompt, IAsyncPromptResult } from 'vs/platform/dialogs/common/dialogs';
-import { ILogService } from 'vs/platform/log/common/log';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { process } from 'vs/base/parts/sandbox/electron-sandbox/globals';
-import { getActiveWindow } from 'vs/base/browser/dom';
+import { localize } from '../../../../nls.js';
+import { fromNow } from '../../../../base/common/date.js';
+import { isLinuxSnap } from '../../../../base/common/platform.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { AbstractDialogHandler, IConfirmation, IConfirmationResult, IPrompt, IAsyncPromptResult } from '../../../../platform/dialogs/common/dialogs.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { process } from '../../../../base/parts/sandbox/electron-sandbox/globals.js';
+import { getActiveWindow } from '../../../../base/browser/dom.js';
 
 export class NativeDialogHandler extends AbstractDialogHandler {
 
diff --git a/src/vs/workbench/electron-sandbox/parts/titlebar/menubarControl.ts b/src/vs/workbench/electron-sandbox/parts/titlebar/menubarControl.ts
index 8d1611b5008..94321c78c77 100644
--- a/src/vs/workbench/electron-sandbox/parts/titlebar/menubarControl.ts
+++ b/src/vs/workbench/electron-sandbox/parts/titlebar/menubarControl.ts
@@ -3,29 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IAction, Separator } from 'vs/base/common/actions';
-import { IMenuService, SubmenuItemAction, MenuItemAction } from 'vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IWorkspacesService } from 'vs/platform/workspaces/common/workspaces';
-import { isMacintosh } from 'vs/base/common/platform';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { IUpdateService } from 'vs/platform/update/common/update';
-import { IOpenRecentAction, MenubarControl } from 'vs/workbench/browser/parts/titlebar/menubarControl';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { IMenubarData, IMenubarMenu, IMenubarKeybinding, IMenubarMenuItemSubmenu, IMenubarMenuItemAction, MenubarMenuItem } from 'vs/platform/menubar/common/menubar';
-import { IMenubarService } from 'vs/platform/menubar/electron-sandbox/menubar';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { OpenRecentAction } from 'vs/workbench/browser/actions/windowActions';
-import { isICommandActionToggleInfo } from 'vs/platform/action/common/action';
-import { createAndFillInContextMenuActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
+import { IAction, Separator } from '../../../../base/common/actions.js';
+import { IMenuService, SubmenuItemAction, MenuItemAction } from '../../../../platform/actions/common/actions.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IWorkspacesService } from '../../../../platform/workspaces/common/workspaces.js';
+import { isMacintosh } from '../../../../base/common/platform.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-sandbox/environmentService.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { IUpdateService } from '../../../../platform/update/common/update.js';
+import { IOpenRecentAction, MenubarControl } from '../../../browser/parts/titlebar/menubarControl.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { IMenubarData, IMenubarMenu, IMenubarKeybinding, IMenubarMenuItemSubmenu, IMenubarMenuItemAction, MenubarMenuItem } from '../../../../platform/menubar/common/menubar.js';
+import { IMenubarService } from '../../../../platform/menubar/electron-sandbox/menubar.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { OpenRecentAction } from '../../../browser/actions/windowActions.js';
+import { isICommandActionToggleInfo } from '../../../../platform/action/common/action.js';
+import { createAndFillInContextMenuActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 
 export class NativeMenubarControl extends MenubarControl {
 
diff --git a/src/vs/workbench/electron-sandbox/parts/titlebar/titlebarPart.ts b/src/vs/workbench/electron-sandbox/parts/titlebar/titlebarPart.ts
index 12609c51916..a4f1a964afe 100644
--- a/src/vs/workbench/electron-sandbox/parts/titlebar/titlebarPart.ts
+++ b/src/vs/workbench/electron-sandbox/parts/titlebar/titlebarPart.ts
@@ -3,30 +3,30 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { getZoomFactor, isWCOEnabled } from 'vs/base/browser/browser';
-import { $, addDisposableListener, append, EventType, getWindow, getWindowId, hide, show } from 'vs/base/browser/dom';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { isMacintosh, isWindows, isLinux, isNative, isBigSurOrNewer } from 'vs/base/common/platform';
-import { IMenuService, MenuId } from 'vs/platform/actions/common/actions';
-import { BrowserTitlebarPart as BrowserTitlebarPart, BrowserTitleService, IAuxiliaryTitlebarPart } from 'vs/workbench/browser/parts/titlebar/titlebarPart';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/browser/layoutService';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { hasNativeTitlebar, useWindowControlsOverlay, DEFAULT_CUSTOM_TITLEBAR_HEIGHT } from 'vs/platform/window/common/window';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { Codicon } from 'vs/base/common/codicons';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { NativeMenubarControl } from 'vs/workbench/electron-sandbox/parts/titlebar/menubarControl';
-import { IEditorGroupsContainer, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { CodeWindow, mainWindow } from 'vs/base/browser/window';
+import { Event } from '../../../../base/common/event.js';
+import { getZoomFactor, isWCOEnabled } from '../../../../base/browser/browser.js';
+import { $, addDisposableListener, append, EventType, getWindow, getWindowId, hide, show } from '../../../../base/browser/dom.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IConfigurationService, IConfigurationChangeEvent } from '../../../../platform/configuration/common/configuration.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-sandbox/environmentService.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { isMacintosh, isWindows, isLinux, isNative, isBigSurOrNewer } from '../../../../base/common/platform.js';
+import { IMenuService, MenuId } from '../../../../platform/actions/common/actions.js';
+import { BrowserTitlebarPart as BrowserTitlebarPart, BrowserTitleService, IAuxiliaryTitlebarPart } from '../../../browser/parts/titlebar/titlebarPart.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IWorkbenchLayoutService, Parts } from '../../../services/layout/browser/layoutService.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { hasNativeTitlebar, useWindowControlsOverlay, DEFAULT_CUSTOM_TITLEBAR_HEIGHT } from '../../../../platform/window/common/window.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { NativeMenubarControl } from './menubarControl.js';
+import { IEditorGroupsContainer, IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { CodeWindow, mainWindow } from '../../../../base/browser/window.js';
 
 export class NativeTitlebarPart extends BrowserTitlebarPart {
 
@@ -156,17 +156,17 @@ export class NativeTitlebarPart extends BrowserTitlebarPart {
 			})));
 		}
 
-		// Window Controls (Native Windows/Linux)
-		if (!isMacintosh && !hasNativeTitlebar(this.configurationService) && !isWCOEnabled() && this.primaryWindowControls) {
+		// Window Controls (Native Linux when WCO is disabled)
+		if (isLinux && !hasNativeTitlebar(this.configurationService) && !isWCOEnabled() && this.windowControlsContainer) {
 
 			// Minimize
-			const minimizeIcon = append(this.primaryWindowControls, $('div.window-icon.window-minimize' + ThemeIcon.asCSSSelector(Codicon.chromeMinimize)));
+			const minimizeIcon = append(this.windowControlsContainer, $('div.window-icon.window-minimize' + ThemeIcon.asCSSSelector(Codicon.chromeMinimize)));
 			this._register(addDisposableListener(minimizeIcon, EventType.CLICK, () => {
 				this.nativeHostService.minimizeWindow({ targetWindowId });
 			}));
 
 			// Restore
-			this.maxRestoreControl = append(this.primaryWindowControls, $('div.window-icon.window-max-restore'));
+			this.maxRestoreControl = append(this.windowControlsContainer, $('div.window-icon.window-max-restore'));
 			this._register(addDisposableListener(this.maxRestoreControl, EventType.CLICK, async () => {
 				const maximized = await this.nativeHostService.isMaximized({ targetWindowId });
 				if (maximized) {
@@ -177,7 +177,7 @@ export class NativeTitlebarPart extends BrowserTitlebarPart {
 			}));
 
 			// Close
-			const closeIcon = append(this.primaryWindowControls, $('div.window-icon.window-close' + ThemeIcon.asCSSSelector(Codicon.chromeClose)));
+			const closeIcon = append(this.windowControlsContainer, $('div.window-icon.window-close' + ThemeIcon.asCSSSelector(Codicon.chromeClose)));
 			this._register(addDisposableListener(closeIcon, EventType.CLICK, () => {
 				this.nativeHostService.closeWindow({ targetWindowId });
 			}));
diff --git a/src/vs/workbench/electron-sandbox/window.ts b/src/vs/workbench/electron-sandbox/window.ts
index 73ebdb1b2a9..90c965412bf 100644
--- a/src/vs/workbench/electron-sandbox/window.ts
+++ b/src/vs/workbench/electron-sandbox/window.ts
@@ -3,83 +3,83 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/window';
-import { localize } from 'vs/nls';
-import { URI } from 'vs/base/common/uri';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { equals } from 'vs/base/common/objects';
-import { EventType, EventHelper, addDisposableListener, ModifierKeyEmitter, getActiveElement, hasWindow, getWindow, getWindowById, getWindows } from 'vs/base/browser/dom';
-import { Action, Separator, WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from 'vs/base/common/actions';
-import { IFileService } from 'vs/platform/files/common/files';
-import { EditorResourceAccessor, IUntitledTextResourceEditorInput, SideBySideEditor, pathsToEditors, IResourceDiffEditorInput, IUntypedEditorInput, IEditorPane, isResourceEditorInput, IResourceMergeEditorInput } from 'vs/workbench/common/editor';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { WindowMinimumSize, IOpenFileRequest, IAddFoldersRequest, INativeRunActionInWindowRequest, INativeRunKeybindingInWindowRequest, INativeOpenFileRequest, hasNativeTitlebar } from 'vs/platform/window/common/window';
-import { ITitleService } from 'vs/workbench/services/title/browser/titleService';
-import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
-import { ApplyZoomTarget, applyZoom } from 'vs/platform/window/electron-sandbox/window';
-import { setFullscreen, getZoomLevel, onDidChangeZoomLevel, getZoomFactor } from 'vs/base/browser/browser';
-import { ICommandService, CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { IResourceEditorInput } from 'vs/platform/editor/common/editor';
-import { ipcRenderer, process } from 'vs/base/parts/sandbox/electron-sandbox/globals';
-import { IWorkspaceEditingService } from 'vs/workbench/services/workspaces/common/workspaceEditing';
-import { IMenuService, MenuId, IMenu, MenuItemAction, MenuRegistry } from 'vs/platform/actions/common/actions';
-import { ICommandAction } from 'vs/platform/action/common/action';
-import { createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { Disposable, DisposableStore, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { LifecyclePhase, ILifecycleService, WillShutdownEvent, ShutdownReason, BeforeShutdownErrorEvent, BeforeShutdownEvent } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IWorkspaceFolderCreationData } from 'vs/platform/workspaces/common/workspaces';
-import { IIntegrityService } from 'vs/workbench/services/integrity/common/integrity';
-import { isWindows, isMacintosh, isCI } from 'vs/base/common/platform';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { INotificationService, NeverShowAgainScope, NotificationPriority, Severity } from 'vs/platform/notification/common/notification';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
-import { IAccessibilityService, AccessibilitySupport } from 'vs/platform/accessibility/common/accessibility';
-import { WorkbenchState, IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { coalesce } from 'vs/base/common/arrays';
-import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { assertIsDefined } from 'vs/base/common/types';
-import { IOpenerService, IResolvedExternalUri, OpenOptions } from 'vs/platform/opener/common/opener';
-import { Schemas } from 'vs/base/common/network';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { posix } from 'vs/base/common/path';
-import { ITunnelService, RemoteTunnel, extractLocalHostUriMetaDataForPortMapping, extractQueryLocalHostUriMetaDataForPortMapping } from 'vs/platform/tunnel/common/tunnel';
-import { IWorkbenchLayoutService, Parts, positionFromString, Position } from 'vs/workbench/services/layout/browser/layoutService';
-import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
-import { WorkingCopyCapabilities } from 'vs/workbench/services/workingCopy/common/workingCopy';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { Event } from 'vs/base/common/event';
-import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { IAddressProvider, IAddress } from 'vs/platform/remote/common/remoteAgentConnection';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { AuthInfo } from 'vs/base/parts/sandbox/electron-sandbox/electronTypes';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { whenEditorClosed } from 'vs/workbench/browser/editor';
-import { ISharedProcessService } from 'vs/platform/ipc/electron-sandbox/services';
-import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { dirname } from 'vs/base/common/resources';
-import { IBannerService } from 'vs/workbench/services/banner/browser/bannerService';
-import { Codicon } from 'vs/base/common/codicons';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
-import { IUtilityProcessWorkerWorkbenchService } from 'vs/workbench/services/utilityProcess/electron-sandbox/utilityProcessWorkerWorkbenchService';
-import { registerWindowDriver } from 'vs/workbench/services/driver/electron-sandbox/driver';
-import { mainWindow } from 'vs/base/browser/window';
-import { BaseWindow } from 'vs/workbench/browser/window';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IStatusbarService, ShowTooltipCommand, StatusbarAlignment } from 'vs/workbench/services/statusbar/browser/statusbar';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { getWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { DynamicWorkbenchSecurityConfiguration } from 'vs/workbench/common/configuration';
-import { nativeHoverDelegate } from 'vs/platform/hover/browser/hover';
+import './media/window.css';
+import { localize } from '../../nls.js';
+import { URI } from '../../base/common/uri.js';
+import { onUnexpectedError } from '../../base/common/errors.js';
+import { equals } from '../../base/common/objects.js';
+import { EventType, EventHelper, addDisposableListener, ModifierKeyEmitter, getActiveElement, hasWindow, getWindow, getWindowById, getWindows } from '../../base/browser/dom.js';
+import { Action, Separator, WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from '../../base/common/actions.js';
+import { IFileService } from '../../platform/files/common/files.js';
+import { EditorResourceAccessor, IUntitledTextResourceEditorInput, SideBySideEditor, pathsToEditors, IResourceDiffEditorInput, IUntypedEditorInput, IEditorPane, isResourceEditorInput, IResourceMergeEditorInput } from '../common/editor.js';
+import { IEditorService } from '../services/editor/common/editorService.js';
+import { ITelemetryService } from '../../platform/telemetry/common/telemetry.js';
+import { WindowMinimumSize, IOpenFileRequest, IAddFoldersRequest, INativeRunActionInWindowRequest, INativeRunKeybindingInWindowRequest, INativeOpenFileRequest, hasNativeTitlebar } from '../../platform/window/common/window.js';
+import { ITitleService } from '../services/title/browser/titleService.js';
+import { IWorkbenchThemeService } from '../services/themes/common/workbenchThemeService.js';
+import { ApplyZoomTarget, applyZoom } from '../../platform/window/electron-sandbox/window.js';
+import { setFullscreen, getZoomLevel, onDidChangeZoomLevel, getZoomFactor } from '../../base/browser/browser.js';
+import { ICommandService, CommandsRegistry } from '../../platform/commands/common/commands.js';
+import { IResourceEditorInput } from '../../platform/editor/common/editor.js';
+import { ipcRenderer, process } from '../../base/parts/sandbox/electron-sandbox/globals.js';
+import { IWorkspaceEditingService } from '../services/workspaces/common/workspaceEditing.js';
+import { IMenuService, MenuId, IMenu, MenuItemAction, MenuRegistry } from '../../platform/actions/common/actions.js';
+import { ICommandAction } from '../../platform/action/common/action.js';
+import { createAndFillInActionBarActions } from '../../platform/actions/browser/menuEntryActionViewItem.js';
+import { RunOnceScheduler } from '../../base/common/async.js';
+import { Disposable, DisposableStore, MutableDisposable, toDisposable } from '../../base/common/lifecycle.js';
+import { LifecyclePhase, ILifecycleService, WillShutdownEvent, ShutdownReason, BeforeShutdownErrorEvent, BeforeShutdownEvent } from '../services/lifecycle/common/lifecycle.js';
+import { IWorkspaceFolderCreationData } from '../../platform/workspaces/common/workspaces.js';
+import { IIntegrityService } from '../services/integrity/common/integrity.js';
+import { isWindows, isMacintosh } from '../../base/common/platform.js';
+import { IProductService } from '../../platform/product/common/productService.js';
+import { INotificationService, NeverShowAgainScope, NotificationPriority, Severity } from '../../platform/notification/common/notification.js';
+import { IKeybindingService } from '../../platform/keybinding/common/keybinding.js';
+import { INativeWorkbenchEnvironmentService } from '../services/environment/electron-sandbox/environmentService.js';
+import { IAccessibilityService, AccessibilitySupport } from '../../platform/accessibility/common/accessibility.js';
+import { WorkbenchState, IWorkspaceContextService } from '../../platform/workspace/common/workspace.js';
+import { coalesce } from '../../base/common/arrays.js';
+import { ConfigurationTarget, IConfigurationService } from '../../platform/configuration/common/configuration.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../platform/storage/common/storage.js';
+import { assertIsDefined } from '../../base/common/types.js';
+import { IOpenerService, IResolvedExternalUri, OpenOptions } from '../../platform/opener/common/opener.js';
+import { Schemas } from '../../base/common/network.js';
+import { INativeHostService } from '../../platform/native/common/native.js';
+import { posix } from '../../base/common/path.js';
+import { ITunnelService, RemoteTunnel, extractLocalHostUriMetaDataForPortMapping, extractQueryLocalHostUriMetaDataForPortMapping } from '../../platform/tunnel/common/tunnel.js';
+import { IWorkbenchLayoutService, Parts, positionFromString, Position } from '../services/layout/browser/layoutService.js';
+import { IWorkingCopyService } from '../services/workingCopy/common/workingCopyService.js';
+import { WorkingCopyCapabilities } from '../services/workingCopy/common/workingCopy.js';
+import { IFilesConfigurationService } from '../services/filesConfiguration/common/filesConfigurationService.js';
+import { Event } from '../../base/common/event.js';
+import { IRemoteAuthorityResolverService } from '../../platform/remote/common/remoteAuthorityResolver.js';
+import { IAddressProvider, IAddress } from '../../platform/remote/common/remoteAgentConnection.js';
+import { IEditorGroupsService, IEditorPart } from '../services/editor/common/editorGroupsService.js';
+import { IDialogService } from '../../platform/dialogs/common/dialogs.js';
+import { AuthInfo } from '../../base/parts/sandbox/electron-sandbox/electronTypes.js';
+import { ILogService } from '../../platform/log/common/log.js';
+import { IInstantiationService } from '../../platform/instantiation/common/instantiation.js';
+import { whenEditorClosed } from '../browser/editor.js';
+import { ISharedProcessService } from '../../platform/ipc/electron-sandbox/services.js';
+import { IProgressService, ProgressLocation } from '../../platform/progress/common/progress.js';
+import { toErrorMessage } from '../../base/common/errorMessage.js';
+import { ILabelService } from '../../platform/label/common/label.js';
+import { dirname } from '../../base/common/resources.js';
+import { IBannerService } from '../services/banner/browser/bannerService.js';
+import { Codicon } from '../../base/common/codicons.js';
+import { IUriIdentityService } from '../../platform/uriIdentity/common/uriIdentity.js';
+import { IPreferencesService } from '../services/preferences/common/preferences.js';
+import { IUtilityProcessWorkerWorkbenchService } from '../services/utilityProcess/electron-sandbox/utilityProcessWorkerWorkbenchService.js';
+import { registerWindowDriver } from '../services/driver/electron-sandbox/driver.js';
+import { mainWindow } from '../../base/browser/window.js';
+import { BaseWindow } from '../browser/window.js';
+import { IHostService } from '../services/host/browser/host.js';
+import { IStatusbarService, ShowTooltipCommand, StatusbarAlignment } from '../services/statusbar/browser/statusbar.js';
+import { ActionBar } from '../../base/browser/ui/actionbar/actionbar.js';
+import { ThemeIcon } from '../../base/common/themables.js';
+import { getWorkbenchContribution } from '../common/contributions.js';
+import { DynamicWorkbenchSecurityConfiguration } from '../common/configuration.js';
+import { nativeHoverDelegate } from '../../platform/hover/browser/hover.js';
 
 export class NativeWindow extends BaseWindow {
 
@@ -90,8 +90,6 @@ export class NativeWindow extends BaseWindow {
 
 	private isDocumentedEdited = false;
 
-	private readonly mainPartEditorService: IEditorService;
-
 	constructor(
 		@IEditorService private readonly editorService: IEditorService,
 		@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService,
@@ -133,8 +131,6 @@ export class NativeWindow extends BaseWindow {
 	) {
 		super(mainWindow, undefined, hostService, nativeEnvironmentService);
 
-		this.mainPartEditorService = editorService.createScoped('main', this._store);
-
 		this.registerListeners();
 		this.create();
 	}
@@ -204,7 +200,10 @@ export class NativeWindow extends BaseWindow {
 				[{
 					label: localize('restart', "Restart"),
 					run: () => this.nativeHostService.relaunch()
-				}]
+				}],
+				{
+					priority: NotificationPriority.URGENT
+				}
 			);
 		});
 
@@ -248,7 +247,7 @@ export class NativeWindow extends BaseWindow {
 			);
 		});
 
-		ipcRenderer.on('vscode:showTranslatedBuildWarning', (event: unknown, message: string) => {
+		ipcRenderer.on('vscode:showTranslatedBuildWarning', () => {
 			this.notificationService.prompt(
 				Severity.Warning,
 				localize("runningTranslated", "You are running an emulated version of {0}. For better performance download the native arm64 version of {0} build for your machine.", this.productService.nameLong),
@@ -260,7 +259,24 @@ export class NativeWindow extends BaseWindow {
 						const insidersURL = 'https://code.visualstudio.com/docs/?dv=osx&build=insiders';
 						this.openerService.open(quality === 'stable' ? stableURL : insidersURL);
 					}
-				}]
+				}],
+				{
+					priority: NotificationPriority.URGENT
+				}
+			);
+		});
+
+		ipcRenderer.on('vscode:showArgvParseWarning', (event: unknown, message: string) => {
+			this.notificationService.prompt(
+				Severity.Warning,
+				localize("showArgvParseWarning", "The runtime arguments file 'argv.json' contains errors. Please correct them and restart."),
+				[{
+					label: localize('showArgvParseWarningAction', "Open File"),
+					run: () => this.editorService.openEditor({ resource: this.nativeEnvironmentService.argvResource })
+				}],
+				{
+					priority: NotificationPriority.URGENT
+				}
 			);
 		});
 
@@ -357,9 +373,11 @@ export class NativeWindow extends BaseWindow {
 
 		this._register(onDidChangeZoomLevel(targetWindowId => this.handleOnDidChangeZoomLevel(targetWindowId)));
 
-		this._register(this.editorGroupService.onDidCreateAuxiliaryEditorPart(({ instantiationService, disposables, part }) => {
-			this.createWindowZoomStatusEntry(instantiationService, part.windowId, disposables);
-		}));
+		for (const part of this.editorGroupService.parts) {
+			this.createWindowZoomStatusEntry(part);
+		}
+
+		this._register(this.editorGroupService.onDidCreateAuxiliaryEditorPart(part => this.createWindowZoomStatusEntry(part)));
 
 		// Listen to visible editor changes (debounced in case a new editor opens immediately after)
 		this._register(Event.debounce(this.editorService.onDidVisibleEditorsChange, () => undefined, 0, undefined, undefined, undefined, this._store)(() => this.maybeCloseWindow()));
@@ -370,26 +388,13 @@ export class NativeWindow extends BaseWindow {
 			this.trackClosedWaitFiles(filesToWait.waitMarkerFileUri, coalesce(filesToWait.paths.map(path => path.fileUri)));
 		}
 
-		// macOS OS integration
+		// macOS OS integration: represented file name
 		if (isMacintosh) {
-			const updateRepresentedFilename = (editorService: IEditorService, targetWindowId: number | undefined) => {
-				const file = EditorResourceAccessor.getOriginalUri(editorService.activeEditor, { supportSideBySide: SideBySideEditor.PRIMARY, filterByScheme: Schemas.file });
+			for (const part of this.editorGroupService.parts) {
+				this.handleRepresentedFilename(part);
+			}
 
-				// Represented Filename
-				this.nativeHostService.setRepresentedFilename(file?.fsPath ?? '', { targetWindowId });
-
-				// Custom title menu (main window only currently)
-				if (typeof targetWindowId !== 'number') {
-					this.provideCustomTitleContextMenu(file?.fsPath);
-				}
-			};
-
-			this._register(this.mainPartEditorService.onDidActiveEditorChange(() => updateRepresentedFilename(this.mainPartEditorService, undefined)));
-
-			this._register(this.editorGroupService.onDidCreateAuxiliaryEditorPart(({ part, disposables }) => {
-				const auxiliaryEditorService = this.editorService.createScoped(part, disposables);
-				disposables.add(auxiliaryEditorService.onDidActiveEditorChange(() => updateRepresentedFilename(auxiliaryEditorService, part.windowId)));
-			}));
+			this._register(this.editorGroupService.onDidCreateAuxiliaryEditorPart(part => this.handleRepresentedFilename(part)));
 		}
 
 		// Maximize/Restore on doubleclick (for macOS custom title)
@@ -436,6 +441,26 @@ export class NativeWindow extends BaseWindow {
 		this._register(this.lifecycleService.onWillShutdown(e => this.onWillShutdown(e)));
 	}
 
+	private handleRepresentedFilename(part: IEditorPart): void {
+		const disposables = new DisposableStore();
+		Event.once(part.onWillDispose)(() => disposables.dispose());
+
+		const scopedEditorService = this.editorGroupService.getScopedInstantiationService(part).invokeFunction(accessor => accessor.get(IEditorService));
+		disposables.add(scopedEditorService.onDidActiveEditorChange(() => this.updateRepresentedFilename(scopedEditorService, part.windowId)));
+	}
+
+	private updateRepresentedFilename(editorService: IEditorService, targetWindowId: number): void {
+		const file = EditorResourceAccessor.getOriginalUri(editorService.activeEditor, { supportSideBySide: SideBySideEditor.PRIMARY, filterByScheme: Schemas.file });
+
+		// Represented Filename
+		this.nativeHostService.setRepresentedFilename(file?.fsPath ?? '', { targetWindowId });
+
+		// Custom title menu (main window only currently)
+		if (targetWindowId === mainWindow.vscodeWindowId) {
+			this.provideCustomTitleContextMenu(file?.fsPath);
+		}
+	}
+
 	//#region Window Lifecycle
 
 	private onBeforeShutdown({ veto, reason }: BeforeShutdownEvent): void {
@@ -626,8 +651,8 @@ export class NativeWindow extends BaseWindow {
 		// Clear old menu
 		this.customTitleContextMenuDisposable.clear();
 
-		// Provide new menu if a file is opened and we are on a custom title
-		if (!filePath || !hasNativeTitlebar(this.configurationService)) {
+		// Only provide a menu when we have a file path and custom titlebar
+		if (!filePath || hasNativeTitlebar(this.configurationService)) {
 			return;
 		}
 
@@ -674,11 +699,6 @@ export class NativeWindow extends BaseWindow {
 		// Touchbar menu (if enabled)
 		this.updateTouchbarMenu();
 
-		// Zoom status
-		for (const { window, disposables } of getWindows()) {
-			this.createWindowZoomStatusEntry(this.instantiationService, window.vscodeWindowId, disposables);
-		}
-
 		// Smoke Test Driver
 		if (this.environmentService.enableSmokeTestDriver) {
 			this.setupDriver();
@@ -687,17 +707,6 @@ export class NativeWindow extends BaseWindow {
 
 	private async handleWarnings(): Promise<void> {
 
-		// Check for cyclic dependencies
-		if (typeof require.hasDependencyCycle === 'function' && require.hasDependencyCycle()) {
-			if (isCI) {
-				this.logService.error('Error: There is a dependency cycle in the AMD modules that needs to be resolved!');
-				this.nativeHostService.exit(37); // running on a build machine, just exit without showing a dialog
-			} else {
-				this.dialogService.error(localize('loaderCycle', "There is a dependency cycle in the AMD modules that needs to be resolved!"));
-				this.nativeHostService.openDevTools();
-			}
-		}
-
 		// After restored phase is fine for the following ones
 		await this.lifecycleService.when(LifecyclePhase.Restored);
 
@@ -837,7 +846,7 @@ export class NativeWindow extends BaseWindow {
 			if (portMappingRequest) {
 				const tunnel = await this.openTunnel(portMappingRequest.address, portMappingRequest.port);
 				if (tunnel && (typeof tunnel !== 'string')) {
-					const addressAsUri = URI.parse(tunnel.localAddress);
+					const addressAsUri = URI.parse(tunnel.localAddress).with({ path: uri.path });
 					const resolved = addressAsUri.scheme.startsWith(uri.scheme) ? addressAsUri : uri.with({ authority: tunnel.localAddress });
 					return {
 						resolved,
@@ -874,7 +883,7 @@ export class NativeWindow extends BaseWindow {
 		// Handle external open() calls
 		this.openerService.setDefaultExternalOpener({
 			openExternal: async (href: string) => {
-				const success = await this.nativeHostService.openExternal(href);
+				const success = await this.nativeHostService.openExternal(href, this.configurationService.getValue<string>('workbench.externalBrowser'));
 				if (!success) {
 					const fileCandidate = URI.parse(href);
 					if (fileCandidate.scheme === Schemas.file) {
@@ -1085,11 +1094,15 @@ export class NativeWindow extends BaseWindow {
 		}
 	}
 
-	private createWindowZoomStatusEntry(instantiationService: IInstantiationService, targetWindowId: number, disposables: DisposableStore): void {
-		this.mapWindowIdToZoomStatusEntry.set(targetWindowId, disposables.add(instantiationService.createInstance(ZoomStatusEntry)));
-		disposables.add(toDisposable(() => this.mapWindowIdToZoomStatusEntry.delete(targetWindowId)));
+	private createWindowZoomStatusEntry(part: IEditorPart): void {
+		const disposables = new DisposableStore();
+		Event.once(part.onWillDispose)(() => disposables.dispose());
 
-		this.updateWindowZoomStatusEntry(targetWindowId);
+		const scopedInstantiationService = this.editorGroupService.getScopedInstantiationService(part);
+		this.mapWindowIdToZoomStatusEntry.set(part.windowId, disposables.add(scopedInstantiationService.createInstance(ZoomStatusEntry)));
+		disposables.add(toDisposable(() => this.mapWindowIdToZoomStatusEntry.delete(part.windowId)));
+
+		this.updateWindowZoomStatusEntry(part.windowId);
 	}
 
 	private updateWindowZoomStatusEntry(targetWindowId: number): void {
@@ -1157,7 +1170,7 @@ class ZoomStatusEntry extends Disposable {
 	updateZoomEntry(visibleOrText: false | string, targetWindowId: number): void {
 		if (typeof visibleOrText === 'string') {
 			if (!this.disposable.value) {
-				this.createZoomEntry(targetWindowId, visibleOrText);
+				this.createZoomEntry(visibleOrText);
 			}
 
 			this.updateZoomLevelLabel(targetWindowId);
@@ -1166,7 +1179,7 @@ class ZoomStatusEntry extends Disposable {
 		}
 	}
 
-	private createZoomEntry(targetWindowId: number, visibleOrText: string) {
+	private createZoomEntry(visibleOrText: string): void {
 		const disposables = new DisposableStore();
 		this.disposable.value = disposables;
 
diff --git a/src/vs/workbench/services/accessibility/common/accessibleViewInformationService.ts b/src/vs/workbench/services/accessibility/common/accessibleViewInformationService.ts
index c5491abee8c..dfec681b44f 100644
--- a/src/vs/workbench/services/accessibility/common/accessibleViewInformationService.ts
+++ b/src/vs/workbench/services/accessibility/common/accessibleViewInformationService.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ACCESSIBLE_VIEW_SHOWN_STORAGE_PREFIX } from 'vs/platform/accessibility/common/accessibility';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ACCESSIBLE_VIEW_SHOWN_STORAGE_PREFIX } from '../../../../platform/accessibility/common/accessibility.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService, StorageScope } from '../../../../platform/storage/common/storage.js';
 
 export interface IAccessibleViewInformationService {
 	_serviceBrand: undefined;
diff --git a/src/vs/workbench/services/accessibility/electron-sandbox/accessibilityService.ts b/src/vs/workbench/services/accessibility/electron-sandbox/accessibilityService.ts
index 77844dcfee0..89f1c861cff 100644
--- a/src/vs/workbench/services/accessibility/electron-sandbox/accessibilityService.ts
+++ b/src/vs/workbench/services/accessibility/electron-sandbox/accessibilityService.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IAccessibilityService, AccessibilitySupport } from 'vs/platform/accessibility/common/accessibility';
-import { isWindows, isLinux } from 'vs/base/common/platform';
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { AccessibilityService } from 'vs/platform/accessibility/browser/accessibilityService';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IJSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditing';
-import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
+import { IAccessibilityService, AccessibilitySupport } from '../../../../platform/accessibility/common/accessibility.js';
+import { isWindows, isLinux } from '../../../../base/common/platform.js';
+import { INativeWorkbenchEnvironmentService } from '../../environment/electron-sandbox/environmentService.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { AccessibilityService } from '../../../../platform/accessibility/browser/accessibilityService.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IJSONEditingService } from '../../configuration/common/jsonEditing.js';
+import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { ILayoutService } from '../../../../platform/layout/browser/layoutService.js';
 
 interface AccessibilityMetrics {
 	enabled: boolean;
diff --git a/src/vs/workbench/services/actions/common/menusExtensionPoint.ts b/src/vs/workbench/services/actions/common/menusExtensionPoint.ts
index 6791e00042c..8698037cdd8 100644
--- a/src/vs/workbench/services/actions/common/menusExtensionPoint.ts
+++ b/src/vs/workbench/services/actions/common/menusExtensionPoint.ts
@@ -3,28 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { isFalsyOrWhitespace } from 'vs/base/common/strings';
-import * as resources from 'vs/base/common/resources';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import { IExtensionPointUser, ExtensionMessageCollector, ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { MenuId, MenuRegistry, IMenuItem, ISubmenuItem } from 'vs/platform/actions/common/actions';
-import { URI } from 'vs/base/common/uri';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { index } from 'vs/base/common/arrays';
-import { isProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
-import { ApiProposalName } from 'vs/workbench/services/extensions/common/extensionsApiProposals';
-import { ILocalizedString } from 'vs/platform/action/common/action';
-import { IExtensionFeatureTableRenderer, IExtensionFeaturesRegistry, IRenderedData, IRowData, ITableData, Extensions as ExtensionFeaturesExtensions } from 'vs/workbench/services/extensionManagement/common/extensionFeatures';
-import { IExtensionManifest, IKeyBinding } from 'vs/platform/extensions/common/extensions';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { platform } from 'vs/base/common/process';
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { ResolvedKeybinding } from 'vs/base/common/keybindings';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { localize } from '../../../../nls.js';
+import { isFalsyOrWhitespace } from '../../../../base/common/strings.js';
+import * as resources from '../../../../base/common/resources.js';
+import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
+import { IExtensionPointUser, ExtensionMessageCollector, ExtensionsRegistry } from '../../extensions/common/extensionsRegistry.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { MenuId, MenuRegistry, IMenuItem, ISubmenuItem } from '../../../../platform/actions/common/actions.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { index } from '../../../../base/common/arrays.js';
+import { isProposedApiEnabled } from '../../extensions/common/extensions.js';
+import { ILocalizedString } from '../../../../platform/action/common/action.js';
+import { IExtensionFeatureTableRenderer, IExtensionFeaturesRegistry, IRenderedData, IRowData, ITableData, Extensions as ExtensionFeaturesExtensions } from '../../extensionManagement/common/extensionFeatures.js';
+import { IExtensionManifest, IKeyBinding } from '../../../../platform/extensions/common/extensions.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { platform } from '../../../../base/common/process.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { ResolvedKeybinding } from '../../../../base/common/keybindings.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { ApiProposalName } from '../../../../platform/extensions/common/extensionsApiProposals.js';
 
 interface IAPIMenu {
 	readonly key: string;
@@ -110,6 +110,12 @@ const apiMenus: IAPIMenu[] = [
 		id: MenuId.DebugToolBar,
 		description: localize('menus.debugToolBar', "The debug toolbar menu")
 	},
+	{
+		key: 'debug/createConfiguration',
+		id: MenuId.DebugCreateConfiguration,
+		proposed: 'contribDebugCreateConfiguration',
+		description: localize('menus.debugCreateConfiguation', "The debug create configuration menu")
+	},
 	{
 		key: 'notebook/variables/context',
 		id: MenuId.NotebookVariablesContext,
@@ -170,51 +176,15 @@ const apiMenus: IAPIMenu[] = [
 		proposed: 'contribSourceControlInputBoxMenu'
 	},
 	{
-		key: 'scm/incomingChanges',
-		id: MenuId.SCMIncomingChanges,
-		description: localize('menus.incomingChanges', "The Source Control incoming changes menu"),
-		proposed: 'contribSourceControlHistoryItemGroupMenu'
+		key: 'scm/history/title',
+		id: MenuId.SCMHistoryTitle,
+		description: localize('menus.scmHistoryTitle', "The Source Control History title menu"),
+		proposed: 'contribSourceControlHistoryTitleMenu'
 	},
 	{
-		key: 'scm/incomingChanges/context',
-		id: MenuId.SCMIncomingChangesContext,
-		description: localize('menus.incomingChangesContext', "The Source Control incoming changes context menu"),
-		proposed: 'contribSourceControlHistoryItemGroupMenu'
-	},
-	{
-		key: 'scm/outgoingChanges',
-		id: MenuId.SCMOutgoingChanges,
-		description: localize('menus.outgoingChanges', "The Source Control outgoing changes menu"),
-		proposed: 'contribSourceControlHistoryItemGroupMenu'
-	},
-	{
-		key: 'scm/outgoingChanges/context',
-		id: MenuId.SCMOutgoingChangesContext,
-		description: localize('menus.outgoingChangesContext', "The Source Control outgoing changes context menu"),
-		proposed: 'contribSourceControlHistoryItemGroupMenu'
-	},
-	{
-		key: 'scm/incomingChanges/allChanges/context',
-		id: MenuId.SCMIncomingChangesAllChangesContext,
-		description: localize('menus.incomingChangesAllChangesContext', "The Source Control all incoming changes context menu"),
-		proposed: 'contribSourceControlHistoryItemMenu'
-	},
-	{
-		key: 'scm/incomingChanges/historyItem/context',
-		id: MenuId.SCMIncomingChangesHistoryItemContext,
-		description: localize('menus.incomingChangesHistoryItemContext', "The Source Control incoming changes history item context menu"),
-		proposed: 'contribSourceControlHistoryItemMenu'
-	},
-	{
-		key: 'scm/outgoingChanges/allChanges/context',
-		id: MenuId.SCMOutgoingChangesAllChangesContext,
-		description: localize('menus.outgoingChangesAllChangesContext', "The Source Control all outgoing changes context menu"),
-		proposed: 'contribSourceControlHistoryItemMenu'
-	},
-	{
-		key: 'scm/outgoingChanges/historyItem/context',
-		id: MenuId.SCMOutgoingChangesHistoryItemContext,
-		description: localize('menus.outgoingChangesHistoryItemContext', "The Source Control outgoing changes history item context menu"),
+		key: 'scm/historyItem/context',
+		id: MenuId.SCMChangesContext,
+		description: localize('menus.historyItemContext', "The Source Control history item context menu"),
 		proposed: 'contribSourceControlHistoryItemMenu'
 	},
 	{
@@ -238,6 +208,12 @@ const apiMenus: IAPIMenu[] = [
 		id: MenuId.ViewTitle,
 		description: localize('view.viewTitle', "The contributed view title menu")
 	},
+	{
+		key: 'viewContainer/title',
+		id: MenuId.ViewContainerTitle,
+		description: localize('view.containerTitle', "The contributed view container title menu"),
+		proposed: 'contribViewContainerTitle'
+	},
 	{
 		key: 'view/item/context',
 		id: MenuId.ViewItemContext,
@@ -264,7 +240,7 @@ const apiMenus: IAPIMenu[] = [
 		key: 'comments/commentThread/additionalActions',
 		id: MenuId.CommentThreadAdditionalActions,
 		description: localize('commentThread.actions', "The contributed comment thread context menu, rendered as buttons below the comment editor"),
-		supportsSubmenus: false,
+		supportsSubmenus: true,
 		proposed: 'contribCommentThreadAdditionalMenu'
 	},
 	{
@@ -343,6 +319,11 @@ const apiMenus: IAPIMenu[] = [
 		id: MenuId.TestItemGutter,
 		description: localize('testing.item.gutter.title', "The menu for a gutter decoration for a test item"),
 	},
+	{
+		key: 'testing/profiles/context',
+		id: MenuId.TestProfilesContext,
+		description: localize('testing.profiles.context.title', "The menu for configuring testing profiles."),
+	},
 	{
 		key: 'testing/item/result',
 		id: MenuId.TestPeekElement,
@@ -1024,6 +1005,12 @@ menusExtensionPoint.setHandler(extensions => {
 					}
 				}
 
+				if (menu.id === MenuId.ViewContainerTitle && !menuItem.when?.includes('viewContainer == workbench.view.debug')) {
+					// Not a perfect check but enough to communicate that this proposed extension point is currently only for the debug view container
+					collector.error(localize('viewContainerTitle.when', "The {0} menu contribution must check {1} in its {2} clause.", '`viewContainer/title`', '`viewContainer == workbench.view.debug`', '"when"'));
+					continue;
+				}
+
 				item.when = ContextKeyExpr.deserialize(menuItem.when);
 				_menuRegistrations.add(MenuRegistry.appendMenuItem(menu.id, item));
 			}
diff --git a/src/vs/workbench/services/activity/browser/activityService.ts b/src/vs/workbench/services/activity/browser/activityService.ts
index 11657360f13..2d6615626fe 100644
--- a/src/vs/workbench/services/activity/browser/activityService.ts
+++ b/src/vs/workbench/services/activity/browser/activityService.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IActivityService, IActivity } from 'vs/workbench/services/activity/common/activity';
-import { IDisposable, Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IViewDescriptorService, ViewContainer } from 'vs/workbench/common/views';
-import { GLOBAL_ACTIVITY_ID, ACCOUNTS_ACTIVITY_ID } from 'vs/workbench/common/activity';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { isUndefined } from 'vs/base/common/types';
+import { IActivityService, IActivity } from '../common/activity.js';
+import { IDisposable, Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IViewDescriptorService, ViewContainer } from '../../../common/views.js';
+import { GLOBAL_ACTIVITY_ID, ACCOUNTS_ACTIVITY_ID } from '../../../common/activity.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { isUndefined } from '../../../../base/common/types.js';
 
 class ViewContainerActivityByView extends Disposable {
 
diff --git a/src/vs/workbench/services/activity/common/activity.ts b/src/vs/workbench/services/activity/common/activity.ts
index d4707b5d695..be1239fc725 100644
--- a/src/vs/workbench/services/activity/common/activity.ts
+++ b/src/vs/workbench/services/activity/common/activity.ts
@@ -3,11 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { Event } from 'vs/base/common/event';
-import { ViewContainer } from 'vs/workbench/common/views';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { Event } from '../../../../base/common/event.js';
+import { ViewContainer } from '../../../common/views.js';
+import { IColorTheme } from '../../../../platform/theme/common/themeService.js';
+import { Color } from '../../../../base/common/color.js';
+import { registerColor } from '../../../../platform/theme/common/colorUtils.js';
+import { localize } from '../../../../nls.js';
+import { Codicon } from '../../../../base/common/codicons.js';
 
 export interface IActivity {
 	readonly badge: IBadge;
@@ -58,23 +63,36 @@ export interface IActivityService {
 
 export interface IBadge {
 	getDescription(): string;
+	getColors(theme: IColorTheme): IBadgeStyles | undefined;
+}
+
+export interface IBadgeStyles {
+	readonly badgeBackground: Color | undefined;
+	readonly badgeForeground: Color | undefined;
+	readonly badgeBorder: Color | undefined;
 }
 
 class BaseBadge implements IBadge {
 
-	constructor(readonly descriptorFn: (arg: any) => string) {
-		this.descriptorFn = descriptorFn;
+	constructor(
+		protected readonly descriptorFn: (arg: any) => string,
+		private readonly stylesFn: ((theme: IColorTheme) => IBadgeStyles | undefined) | undefined,
+	) {
 	}
 
 	getDescription(): string {
 		return this.descriptorFn(null);
 	}
+
+	getColors(theme: IColorTheme): IBadgeStyles | undefined {
+		return this.stylesFn?.(theme);
+	}
 }
 
 export class NumberBadge extends BaseBadge {
 
 	constructor(readonly number: number, descriptorFn: (num: number) => string) {
-		super(descriptorFn);
+		super(descriptorFn, undefined);
 
 		this.number = number;
 	}
@@ -85,9 +103,53 @@ export class NumberBadge extends BaseBadge {
 }
 
 export class IconBadge extends BaseBadge {
-	constructor(readonly icon: ThemeIcon, descriptorFn: () => string) {
-		super(descriptorFn);
+	constructor(
+		readonly icon: ThemeIcon,
+		descriptorFn: () => string,
+		stylesFn?: (theme: IColorTheme) => IBadgeStyles | undefined,
+	) {
+		super(descriptorFn, stylesFn);
 	}
 }
 
-export class ProgressBadge extends BaseBadge { }
+export class ProgressBadge extends BaseBadge {
+	constructor(descriptorFn: () => string) {
+		super(descriptorFn, undefined);
+	}
+}
+
+export class WarningBadge extends IconBadge {
+	constructor(descriptorFn: () => string) {
+		super(Codicon.warning, descriptorFn, (theme: IColorTheme) => ({
+			badgeBackground: theme.getColor(activityWarningBadgeBackground),
+			badgeForeground: theme.getColor(activityWarningBadgeForeground),
+			badgeBorder: undefined,
+		}));
+	}
+}
+
+export class ErrorBadge extends IconBadge {
+	constructor(descriptorFn: () => string) {
+		super(Codicon.error, descriptorFn, (theme: IColorTheme) => ({
+			badgeBackground: theme.getColor(activityErrorBadgeBackground),
+			badgeForeground: theme.getColor(activityErrorBadgeForeground),
+			badgeBorder: undefined,
+		}));
+	}
+}
+
+const activityWarningBadgeForeground = registerColor('activityWarningBadge.foreground',
+	{ dark: Color.black.lighten(0.2), light: Color.white, hcDark: null, hcLight: Color.black.lighten(0.2) },
+	localize('activityWarningBadge.foreground', 'Foreground color of the warning activity badge'));
+
+const activityWarningBadgeBackground = registerColor('activityWarningBadge.background',
+	{ dark: '#CCA700', light: '#BF8803', hcDark: null, hcLight: '#CCA700' },
+	localize('activityWarningBadge.background', 'Background color of the warning activity badge'));
+
+const activityErrorBadgeForeground = registerColor('activityErrorBadge.foreground',
+	{ dark: Color.black.lighten(0.2), light: Color.white, hcDark: null, hcLight: Color.black.lighten(0.2) },
+	localize('activityErrorBadge.foreground', 'Foreground color of the error activity badge'));
+
+const activityErrorBadgeBackground = registerColor('activityErrorBadge.background',
+	{ dark: '#F14C4C', light: '#E51400', hcDark: null, hcLight: '#F14C4C' },
+	localize('activityErrorBadge.background', 'Background color of the error activity badge'));
diff --git a/src/vs/workbench/services/aiEmbeddingVector/common/aiEmbeddingVectorService.ts b/src/vs/workbench/services/aiEmbeddingVector/common/aiEmbeddingVectorService.ts
index bb143a48893..e005d82cab6 100644
--- a/src/vs/workbench/services/aiEmbeddingVector/common/aiEmbeddingVectorService.ts
+++ b/src/vs/workbench/services/aiEmbeddingVector/common/aiEmbeddingVectorService.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { CancelablePromise, createCancelablePromise, raceCancellablePromises, timeout } from 'vs/base/common/async';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { ILogService } from 'vs/platform/log/common/log';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { CancelablePromise, createCancelablePromise, raceCancellablePromises, timeout } from '../../../../base/common/async.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { StopWatch } from '../../../../base/common/stopwatch.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
 
 export const IAiEmbeddingVectorService = createDecorator<IAiEmbeddingVectorService>('IAiEmbeddingVectorService');
 
diff --git a/src/vs/workbench/services/aiRelatedInformation/common/aiRelatedInformation.ts b/src/vs/workbench/services/aiRelatedInformation/common/aiRelatedInformation.ts
index f3b7d9a090f..fcf9806a3b5 100644
--- a/src/vs/workbench/services/aiRelatedInformation/common/aiRelatedInformation.ts
+++ b/src/vs/workbench/services/aiRelatedInformation/common/aiRelatedInformation.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 
 export const IAiRelatedInformationService = createDecorator<IAiRelatedInformationService>('IAiRelatedInformationService');
 
diff --git a/src/vs/workbench/services/aiRelatedInformation/common/aiRelatedInformationService.ts b/src/vs/workbench/services/aiRelatedInformation/common/aiRelatedInformationService.ts
index f973b4aa0eb..e8c148df4c7 100644
--- a/src/vs/workbench/services/aiRelatedInformation/common/aiRelatedInformationService.ts
+++ b/src/vs/workbench/services/aiRelatedInformation/common/aiRelatedInformationService.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { CancelablePromise, createCancelablePromise, raceTimeout } from 'vs/base/common/async';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IAiRelatedInformationService, IAiRelatedInformationProvider, RelatedInformationType, RelatedInformationResult } from 'vs/workbench/services/aiRelatedInformation/common/aiRelatedInformation';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { CancelablePromise, createCancelablePromise, raceTimeout } from '../../../../base/common/async.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { StopWatch } from '../../../../base/common/stopwatch.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IAiRelatedInformationService, IAiRelatedInformationProvider, RelatedInformationType, RelatedInformationResult } from './aiRelatedInformation.js';
 
 export class AiRelatedInformationService implements IAiRelatedInformationService {
 	readonly _serviceBrand: undefined;
diff --git a/src/vs/workbench/services/aiRelatedInformation/test/common/aiRelatedInformationService.test.ts b/src/vs/workbench/services/aiRelatedInformation/test/common/aiRelatedInformationService.test.ts
index db9b4febfbd..c13e3959f1f 100644
--- a/src/vs/workbench/services/aiRelatedInformation/test/common/aiRelatedInformationService.test.ts
+++ b/src/vs/workbench/services/aiRelatedInformation/test/common/aiRelatedInformationService.test.ts
@@ -5,11 +5,11 @@
 
 import assert from 'assert';
 import * as sinon from 'sinon';
-import { AiRelatedInformationService } from 'vs/workbench/services/aiRelatedInformation/common/aiRelatedInformationService';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { CommandInformationResult, IAiRelatedInformationProvider, RelatedInformationType, SettingInformationResult } from 'vs/workbench/services/aiRelatedInformation/common/aiRelatedInformation';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { AiRelatedInformationService } from '../../common/aiRelatedInformationService.js';
+import { NullLogService } from '../../../../../platform/log/common/log.js';
+import { CommandInformationResult, IAiRelatedInformationProvider, RelatedInformationType, SettingInformationResult } from '../../common/aiRelatedInformation.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('AiRelatedInformationService', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/services/assignment/common/assignmentService.ts b/src/vs/workbench/services/assignment/common/assignmentService.ts
index 50c2ddb702c..8e7aa27c14c 100644
--- a/src/vs/workbench/services/assignment/common/assignmentService.ts
+++ b/src/vs/workbench/services/assignment/common/assignmentService.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { localize } from '../../../../nls.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import type { IKeyValueStorage, IExperimentationTelemetry } from 'tas-client-umd';
-import { MementoObject, Memento } from 'vs/workbench/common/memento';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ITelemetryData } from 'vs/base/common/actions';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IAssignmentService } from 'vs/platform/assignment/common/assignment';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { BaseAssignmentService } from 'vs/platform/assignment/common/assignmentService';
-import { workbenchConfigurationNodeBase } from 'vs/workbench/common/configuration';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { MementoObject, Memento } from '../../../common/memento.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryData } from '../../../../base/common/actions.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IAssignmentService } from '../../../../platform/assignment/common/assignment.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { BaseAssignmentService } from '../../../../platform/assignment/common/assignmentService.js';
+import { workbenchConfigurationNodeBase } from '../../../common/configuration.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
 
 export const IWorkbenchAssignmentService = createDecorator<IWorkbenchAssignmentService>('WorkbenchAssignmentService');
 
diff --git a/src/vs/workbench/services/assignment/test/common/nullAssignmentService.ts b/src/vs/workbench/services/assignment/test/common/nullAssignmentService.ts
new file mode 100644
index 00000000000..0a1ff8bb99f
--- /dev/null
+++ b/src/vs/workbench/services/assignment/test/common/nullAssignmentService.ts
@@ -0,0 +1,18 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IWorkbenchAssignmentService } from '../../common/assignmentService.js';
+
+export class NullWorkbenchAssignmentService implements IWorkbenchAssignmentService {
+	_serviceBrand: undefined;
+
+	async getCurrentExperiments(): Promise<string[] | undefined> {
+		return [];
+	}
+
+	async getTreatment<T extends string | number | boolean>(name: string): Promise<T | undefined> {
+		return undefined;
+	}
+}
diff --git a/src/vs/workbench/services/authentication/browser/authenticationAccessService.ts b/src/vs/workbench/services/authentication/browser/authenticationAccessService.ts
index 565821fcb50..bf398288730 100644
--- a/src/vs/workbench/services/authentication/browser/authenticationAccessService.ts
+++ b/src/vs/workbench/services/authentication/browser/authenticationAccessService.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { AllowedExtension } from 'vs/workbench/services/authentication/common/authentication';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { AllowedExtension } from '../common/authentication.js';
 
 export const IAuthenticationAccessService = createDecorator<IAuthenticationAccessService>('IAuthenticationAccessService');
 export interface IAuthenticationAccessService {
diff --git a/src/vs/workbench/services/authentication/browser/authenticationExtensionsService.ts b/src/vs/workbench/services/authentication/browser/authenticationExtensionsService.ts
index 1cdb2d5a5ae..df7c921e67a 100644
--- a/src/vs/workbench/services/authentication/browser/authenticationExtensionsService.ts
+++ b/src/vs/workbench/services/authentication/browser/authenticationExtensionsService.ts
@@ -3,19 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, dispose, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import * as nls from 'vs/nls';
-import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { Severity } from 'vs/platform/notification/common/notification';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity';
-import { IAuthenticationAccessService } from 'vs/workbench/services/authentication/browser/authenticationAccessService';
-import { IAuthenticationUsageService } from 'vs/workbench/services/authentication/browser/authenticationUsageService';
-import { AuthenticationSession, IAuthenticationProvider, IAuthenticationService, IAuthenticationExtensionsService } from 'vs/workbench/services/authentication/common/authentication';
+import { Disposable, DisposableStore, dispose, IDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import * as nls from '../../../../nls.js';
+import { MenuId, MenuRegistry } from '../../../../platform/actions/common/actions.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { Severity } from '../../../../platform/notification/common/notification.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IActivityService, NumberBadge } from '../../activity/common/activity.js';
+import { IAuthenticationAccessService } from './authenticationAccessService.js';
+import { IAuthenticationUsageService } from './authenticationUsageService.js';
+import { AuthenticationSession, IAuthenticationProvider, IAuthenticationService, IAuthenticationExtensionsService, AuthenticationSessionAccount } from '../common/authentication.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
 
 // OAuth2 spec prohibits space in a scope, so use that to join them.
 const SCOPESLIST_SEPARATOR = ' ';
@@ -36,11 +38,23 @@ export class AuthenticationExtensionsService extends Disposable implements IAuth
 	private _sessionAccessRequestItems = new Map<string, { [extensionId: string]: { disposables: IDisposable[]; possibleSessions: AuthenticationSession[] } }>();
 	private readonly _accountBadgeDisposable = this._register(new MutableDisposable());
 
+	private _onDidAccountPreferenceChange: Emitter<{ providerId: string; extensionIds: string[] }> = this._register(new Emitter<{ providerId: string; extensionIds: string[] }>());
+	readonly onDidChangeAccountPreference = this._onDidAccountPreferenceChange.event;
+
+	private _inheritAuthAccountPreferenceParentToChildren: Record<string, string[]> = this._productService.inheritAuthAccountPreference || {};
+	private _inheritAuthAccountPreferenceChildToParent = Object.entries(this._inheritAuthAccountPreferenceParentToChildren).reduce<{ [extensionId: string]: string }>((acc, [parent, children]) => {
+		children.forEach((child: string) => {
+			acc[child] = parent;
+		});
+		return acc;
+	}, {});
+
 	constructor(
 		@IActivityService private readonly activityService: IActivityService,
 		@IStorageService private readonly storageService: IStorageService,
 		@IDialogService private readonly dialogService: IDialogService,
 		@IQuickInputService private readonly quickInputService: IQuickInputService,
+		@IProductService private readonly _productService: IProductService,
 		@IAuthenticationService private readonly _authenticationService: IAuthenticationService,
 		@IAuthenticationUsageService private readonly _authenticationUsageService: IAuthenticationUsageService,
 		@IAuthenticationAccessService private readonly _authenticationAccessService: IAuthenticationAccessService
@@ -136,14 +150,53 @@ export class AuthenticationExtensionsService extends Disposable implements IAuth
 		}
 	}
 
-	//#region Session Preference
+	//#region Account/Session Preference
+
+	updateAccountPreference(extensionId: string, providerId: string, account: AuthenticationSessionAccount): void {
+		const parentExtensionId = this._inheritAuthAccountPreferenceChildToParent[extensionId] ?? extensionId;
+		const key = this._getKey(parentExtensionId, providerId);
+
+		// Store the preference in the workspace and application storage. This allows new workspaces to
+		// have a preference set already to limit the number of prompts that are shown... but also allows
+		// a specific workspace to override the global preference.
+		this.storageService.store(key, account.label, StorageScope.WORKSPACE, StorageTarget.MACHINE);
+		this.storageService.store(key, account.label, StorageScope.APPLICATION, StorageTarget.MACHINE);
+
+		const childrenExtensions = this._inheritAuthAccountPreferenceParentToChildren[parentExtensionId];
+		const extensionIds = childrenExtensions ? [parentExtensionId, ...childrenExtensions] : [parentExtensionId];
+		this._onDidAccountPreferenceChange.fire({ extensionIds, providerId });
+	}
+
+	getAccountPreference(extensionId: string, providerId: string): string | undefined {
+		const key = this._getKey(this._inheritAuthAccountPreferenceChildToParent[extensionId] ?? extensionId, providerId);
+
+		// If a preference is set in the workspace, use that. Otherwise, use the global preference.
+		return this.storageService.get(key, StorageScope.WORKSPACE) ?? this.storageService.get(key, StorageScope.APPLICATION);
+	}
+
+	removeAccountPreference(extensionId: string, providerId: string): void {
+		const key = this._getKey(this._inheritAuthAccountPreferenceChildToParent[extensionId] ?? extensionId, providerId);
+
+		// This won't affect any other workspaces that have a preference set, but it will remove the preference
+		// for this workspace and the global preference. This is only paired with a call to updateSessionPreference...
+		// so we really don't _need_ to remove them as they are about to be overridden anyway... but it's more correct
+		// to remove them first... and in case this gets called from somewhere else in the future.
+		this.storageService.remove(key, StorageScope.WORKSPACE);
+		this.storageService.remove(key, StorageScope.APPLICATION);
+	}
+
+	private _getKey(extensionId: string, providerId: string): string {
+		return `${extensionId}-${providerId}`;
+	}
+
+	// TODO@TylerLeonhardt: Remove all of this after a couple iterations
 
 	updateSessionPreference(providerId: string, extensionId: string, session: AuthenticationSession): void {
 		// The 3 parts of this key are important:
 		// * Extension id: The extension that has a preference
 		// * Provider id: The provider that the preference is for
 		// * The scopes: The subset of sessions that the preference applies to
-		const key = `${extensionId}-${providerId}-${session.scopes.join(' ')}`;
+		const key = `${extensionId}-${providerId}-${session.scopes.join(SCOPESLIST_SEPARATOR)}`;
 
 		// Store the preference in the workspace and application storage. This allows new workspaces to
 		// have a preference set already to limit the number of prompts that are shown... but also allows
@@ -157,7 +210,7 @@ export class AuthenticationExtensionsService extends Disposable implements IAuth
 		// * Extension id: The extension that has a preference
 		// * Provider id: The provider that the preference is for
 		// * The scopes: The subset of sessions that the preference applies to
-		const key = `${extensionId}-${providerId}-${scopes.join(' ')}`;
+		const key = `${extensionId}-${providerId}-${scopes.join(SCOPESLIST_SEPARATOR)}`;
 
 		// If a preference is set in the workspace, use that. Otherwise, use the global preference.
 		return this.storageService.get(key, StorageScope.WORKSPACE) ?? this.storageService.get(key, StorageScope.APPLICATION);
@@ -168,7 +221,7 @@ export class AuthenticationExtensionsService extends Disposable implements IAuth
 		// * Extension id: The extension that has a preference
 		// * Provider id: The provider that the preference is for
 		// * The scopes: The subset of sessions that the preference applies to
-		const key = `${extensionId}-${providerId}-${scopes.join(' ')}`;
+		const key = `${extensionId}-${providerId}-${scopes.join(SCOPESLIST_SEPARATOR)}`;
 
 		// This won't affect any other workspaces that have a preference set, but it will remove the preference
 		// for this workspace and the global preference. This is only paired with a call to updateSessionPreference...
@@ -178,6 +231,11 @@ export class AuthenticationExtensionsService extends Disposable implements IAuth
 		this.storageService.remove(key, StorageScope.APPLICATION);
 	}
 
+	private _updateAccountAndSessionPreferences(providerId: string, extensionId: string, session: AuthenticationSession): void {
+		this.updateAccountPreference(extensionId, providerId, session.account);
+		this.updateSessionPreference(providerId, extensionId, session);
+	}
+
 	//#endregion
 
 	private async showGetSessionPrompt(provider: IAuthenticationProvider, accountName: string, extensionId: string, extensionName: string): Promise<boolean> {
@@ -212,45 +270,56 @@ export class AuthenticationExtensionsService extends Disposable implements IAuth
 		return result === SessionPromptChoice.Allow;
 	}
 
+	/**
+	 * This function should be used only when there are sessions to disambiguate.
+	 */
 	async selectSession(providerId: string, extensionId: string, extensionName: string, scopes: string[], availableSessions: AuthenticationSession[]): Promise<AuthenticationSession> {
-		return new Promise((resolve, reject) => {
-			// This function should be used only when there are sessions to disambiguate.
-			if (!availableSessions.length) {
-				reject('No available sessions');
-				return;
-			}
-
-			const quickPick = this.quickInputService.createQuickPick<{ label: string; session?: AuthenticationSession }>();
-			quickPick.ignoreFocusOut = true;
-			const items: { label: string; session?: AuthenticationSession }[] = availableSessions.map(session => {
+		const allAccounts = await this._authenticationService.getAccounts(providerId);
+		if (!allAccounts.length) {
+			throw new Error('No accounts available');
+		}
+		const disposables = new DisposableStore();
+		const quickPick = disposables.add(this.quickInputService.createQuickPick<{ label: string; session?: AuthenticationSession; account?: AuthenticationSessionAccount }>());
+		quickPick.ignoreFocusOut = true;
+		const accountsWithSessions = new Set<string>();
+		const items: { label: string; session?: AuthenticationSession; account?: AuthenticationSessionAccount }[] = availableSessions
+			// Only grab the first account
+			.filter(session => !accountsWithSessions.has(session.account.label) && accountsWithSessions.add(session.account.label))
+			.map(session => {
 				return {
 					label: session.account.label,
 					session: session
 				};
 			});
 
-			items.push({
-				label: nls.localize('useOtherAccount', "Sign in to another account")
-			});
+		// Add the additional accounts that have been logged into the provider but are
+		// don't have a session yet.
+		allAccounts.forEach(account => {
+			if (!accountsWithSessions.has(account.label)) {
+				items.push({ label: account.label, account });
+			}
+		});
+		items.push({ label: nls.localize('useOtherAccount', "Sign in to another account") });
+		quickPick.items = items;
+		quickPick.title = nls.localize(
+			{
+				key: 'selectAccount',
+				comment: ['The placeholder {0} is the name of an extension. {1} is the name of the type of account, such as Microsoft or GitHub.']
+			},
+			"The extension '{0}' wants to access a {1} account",
+			extensionName,
+			this._authenticationService.getProvider(providerId).label
+		);
+		quickPick.placeholder = nls.localize('getSessionPlateholder', "Select an account for '{0}' to use or Esc to cancel", extensionName);
 
-			quickPick.items = items;
-
-			quickPick.title = nls.localize(
-				{
-					key: 'selectAccount',
-					comment: ['The placeholder {0} is the name of an extension. {1} is the name of the type of account, such as Microsoft or GitHub.']
-				},
-				"The extension '{0}' wants to access a {1} account",
-				extensionName,
-				this._authenticationService.getProvider(providerId).label);
-			quickPick.placeholder = nls.localize('getSessionPlateholder', "Select an account for '{0}' to use or Esc to cancel", extensionName);
-
-			quickPick.onDidAccept(async _ => {
+		return await new Promise((resolve, reject) => {
+			disposables.add(quickPick.onDidAccept(async _ => {
 				quickPick.dispose();
 				let session = quickPick.selectedItems[0].session;
 				if (!session) {
+					const account = quickPick.selectedItems[0].account;
 					try {
-						session = await this._authenticationService.createSession(providerId, scopes);
+						session = await this._authenticationService.createSession(providerId, scopes, { account });
 					} catch (e) {
 						reject(e);
 						return;
@@ -259,18 +328,18 @@ export class AuthenticationExtensionsService extends Disposable implements IAuth
 				const accountName = session.account.label;
 
 				this._authenticationAccessService.updateAllowedExtensions(providerId, accountName, [{ id: extensionId, name: extensionName, allowed: true }]);
-				this.updateSessionPreference(providerId, extensionId, session);
+				this._updateAccountAndSessionPreferences(providerId, extensionId, session);
 				this.removeAccessRequest(providerId, extensionId);
 
 				resolve(session);
-			});
+			}));
 
-			quickPick.onDidHide(_ => {
-				quickPick.dispose();
+			disposables.add(quickPick.onDidHide(_ => {
 				if (!quickPick.selectedItems[0]) {
 					reject('User did not consent to account access');
 				}
-			});
+				disposables.dispose();
+			}));
 
 			quickPick.show();
 		});
@@ -396,7 +465,7 @@ export class AuthenticationExtensionsService extends Disposable implements IAuth
 				const session = await authenticationService.createSession(providerId, scopes);
 
 				this._authenticationAccessService.updateAllowedExtensions(providerId, session.account.label, [{ id: extensionId, name: extensionName, allowed: true }]);
-				this.updateSessionPreference(providerId, extensionId, session);
+				this._updateAccountAndSessionPreferences(providerId, extensionId, session);
 			}
 		});
 
diff --git a/src/vs/workbench/services/authentication/browser/authenticationService.ts b/src/vs/workbench/services/authentication/browser/authenticationService.ts
index 84cc7730f4b..76f95bfd22d 100644
--- a/src/vs/workbench/services/authentication/browser/authenticationService.ts
+++ b/src/vs/workbench/services/authentication/browser/authenticationService.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableMap, DisposableStore, IDisposable, isDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { isFalsyOrWhitespace } from 'vs/base/common/strings';
-import { isString } from 'vs/base/common/types';
-import { localize } from 'vs/nls';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ISecretStorageService } from 'vs/platform/secrets/common/secrets';
-import { IAuthenticationAccessService } from 'vs/workbench/services/authentication/browser/authenticationAccessService';
-import { AuthenticationProviderInformation, AuthenticationSession, AuthenticationSessionsChangeEvent, IAuthenticationCreateSessionOptions, IAuthenticationProvider, IAuthenticationService } from 'vs/workbench/services/authentication/common/authentication';
-import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { ActivationKind, IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, DisposableMap, DisposableStore, IDisposable, isDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { isFalsyOrWhitespace } from '../../../../base/common/strings.js';
+import { isString } from '../../../../base/common/types.js';
+import { localize } from '../../../../nls.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { ISecretStorageService } from '../../../../platform/secrets/common/secrets.js';
+import { IAuthenticationAccessService } from './authenticationAccessService.js';
+import { AuthenticationProviderInformation, AuthenticationSession, AuthenticationSessionAccount, AuthenticationSessionsChangeEvent, IAuthenticationCreateSessionOptions, IAuthenticationProvider, IAuthenticationService } from '../common/authentication.js';
+import { IBrowserWorkbenchEnvironmentService } from '../../environment/browser/environmentService.js';
+import { ActivationKind, IExtensionService } from '../../extensions/common/extensions.js';
 
 export function getAuthenticationProviderActivationEvent(id: string): string { return `onAuthenticationRequest:${id}`; }
 
@@ -164,10 +164,24 @@ export class AuthenticationService extends Disposable implements IAuthentication
 		throw new Error(`No authentication provider '${id}' is currently registered.`);
 	}
 
-	async getSessions(id: string, scopes?: string[], activateImmediate: boolean = false): Promise<ReadonlyArray<AuthenticationSession>> {
+	async getAccounts(id: string): Promise<ReadonlyArray<AuthenticationSessionAccount>> {
+		// TODO: Cache this
+		const sessions = await this.getSessions(id);
+		const accounts = new Array<AuthenticationSessionAccount>();
+		const seenAccounts = new Set<string>();
+		for (const session of sessions) {
+			if (!seenAccounts.has(session.account.label)) {
+				seenAccounts.add(session.account.label);
+				accounts.push(session.account);
+			}
+		}
+		return accounts;
+	}
+
+	async getSessions(id: string, scopes?: string[], account?: AuthenticationSessionAccount, activateImmediate: boolean = false): Promise<ReadonlyArray<AuthenticationSession>> {
 		const authProvider = this._authenticationProviders.get(id) || await this.tryActivateProvider(id, activateImmediate);
 		if (authProvider) {
-			return await authProvider.getSessions(scopes);
+			return await authProvider.getSessions(scopes, { account });
 		} else {
 			throw new Error(`No authentication provider '${id}' is currently registered.`);
 		}
@@ -177,7 +191,7 @@ export class AuthenticationService extends Disposable implements IAuthentication
 		const authProvider = this._authenticationProviders.get(id) || await this.tryActivateProvider(id, !!options?.activateImmediate);
 		if (authProvider) {
 			return await authProvider.createSession(scopes, {
-				sessionToRecreate: options?.sessionToRecreate
+				account: options?.account
 			});
 		} else {
 			throw new Error(`No authentication provider '${id}' is currently registered.`);
diff --git a/src/vs/workbench/services/authentication/browser/authenticationUsageService.ts b/src/vs/workbench/services/authentication/browser/authenticationUsageService.ts
index 8a40ac36958..a261d57ac38 100644
--- a/src/vs/workbench/services/authentication/browser/authenticationUsageService.ts
+++ b/src/vs/workbench/services/authentication/browser/authenticationUsageService.ts
@@ -3,9 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
+import { Queue } from '../../../../base/common/async.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IAuthenticationService } from '../common/authentication.js';
 
 export interface IAccountUsage {
 	extensionId: string;
@@ -16,15 +21,80 @@ export interface IAccountUsage {
 export const IAuthenticationUsageService = createDecorator<IAuthenticationUsageService>('IAuthenticationUsageService');
 export interface IAuthenticationUsageService {
 	readonly _serviceBrand: undefined;
+	/**
+	 * Initializes the cache of extensions that use authentication. Ideally used in a contribution that can be run eventually after the workspace is loaded.
+	 */
+	initializeExtensionUsageCache(): Promise<void>;
+	/**
+	 * Checks if an extension uses authentication
+	 * @param extensionId The id of the extension to check
+	 */
+	extensionUsesAuth(extensionId: string): Promise<boolean>;
+	/**
+	 * Reads the usages for an account
+	 * @param providerId The id of the authentication provider to get usages for
+	 * @param accountName The name of the account to get usages for
+	 */
 	readAccountUsages(providerId: string, accountName: string,): IAccountUsage[];
+	/**
+	 *
+	 * @param providerId The id of the authentication provider to get usages for
+	 * @param accountName The name of the account to get usages for
+	 */
 	removeAccountUsage(providerId: string, accountName: string): void;
+	/**
+	 * Adds a usage for an account
+	 * @param providerId The id of the authentication provider to get usages for
+	 * @param accountName The name of the account to get usages for
+	 * @param extensionId The id of the extension to add a usage for
+	 * @param extensionName The name of the extension to add a usage for
+	 */
 	addAccountUsage(providerId: string, accountName: string, extensionId: string, extensionName: string): void;
 }
 
-export class AuthenticationUsageService implements IAuthenticationUsageService {
+export class AuthenticationUsageService extends Disposable implements IAuthenticationUsageService {
 	_serviceBrand: undefined;
 
-	constructor(@IStorageService private readonly _storageService: IStorageService) { }
+	private _queue = new Queue();
+	private _extensionsUsingAuth = new Set<string>();
+
+	constructor(
+		@IStorageService private readonly _storageService: IStorageService,
+		@IAuthenticationService private readonly _authenticationService: IAuthenticationService,
+		@ILogService private readonly _logService: ILogService,
+		@IProductService productService: IProductService,
+	) {
+		super();
+
+		// If an extension is listed in `trustedExtensionAuthAccess` we should consider it as using auth
+		const trustedExtensionAuthAccess = productService.trustedExtensionAuthAccess;
+		if (Array.isArray(trustedExtensionAuthAccess)) {
+			for (const extensionId of trustedExtensionAuthAccess) {
+				this._extensionsUsingAuth.add(extensionId);
+			}
+		} else if (trustedExtensionAuthAccess) {
+			for (const extensions of Object.values(trustedExtensionAuthAccess)) {
+				for (const extensionId of extensions) {
+					this._extensionsUsingAuth.add(extensionId);
+				}
+			}
+		}
+
+		this._authenticationService.onDidRegisterAuthenticationProvider(
+			provider => this._queue.queue(
+				() => this._addExtensionsToCache(provider.id)
+			)
+		);
+	}
+
+	async initializeExtensionUsageCache(): Promise<void> {
+		await this._queue.queue(() => Promise.all(this._authenticationService.getProviderIds().map(providerId => this._addExtensionsToCache(providerId))));
+	}
+
+	async extensionUsesAuth(extensionId: string): Promise<boolean> {
+		await this._queue.whenIdle();
+		return this._extensionsUsingAuth.has(extensionId);
+	}
 
 	readAccountUsages(providerId: string, accountName: string): IAccountUsage[] {
 		const accountKey = `${providerId}-${accountName}-usages`;
@@ -40,10 +110,12 @@ export class AuthenticationUsageService implements IAuthenticationUsageService {
 
 		return usages;
 	}
+
 	removeAccountUsage(providerId: string, accountName: string): void {
 		const accountKey = `${providerId}-${accountName}-usages`;
 		this._storageService.remove(accountKey, StorageScope.APPLICATION);
 	}
+
 	addAccountUsage(providerId: string, accountName: string, extensionId: string, extensionName: string): void {
 		const accountKey = `${providerId}-${accountName}-usages`;
 		const usages = this.readAccountUsages(providerId, accountName);
@@ -64,6 +136,21 @@ export class AuthenticationUsageService implements IAuthenticationUsageService {
 		}
 
 		this._storageService.store(accountKey, JSON.stringify(usages), StorageScope.APPLICATION, StorageTarget.MACHINE);
+		this._extensionsUsingAuth.add(extensionId);
+	}
+
+	private async _addExtensionsToCache(providerId: string) {
+		try {
+			const accounts = await this._authenticationService.getAccounts(providerId);
+			for (const account of accounts) {
+				const usage = this.readAccountUsages(providerId, account.label);
+				for (const u of usage) {
+					this._extensionsUsingAuth.add(u.extensionId);
+				}
+			}
+		} catch (e) {
+			this._logService.error(e);
+		}
 	}
 }
 
diff --git a/src/vs/workbench/services/authentication/common/authentication.ts b/src/vs/workbench/services/authentication/common/authentication.ts
index 6da6e530237..f3643cf2365 100644
--- a/src/vs/workbench/services/authentication/common/authentication.ts
+++ b/src/vs/workbench/services/authentication/common/authentication.ts
@@ -2,8 +2,8 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { Event } from 'vs/base/common/event';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { Event } from '../../../../base/common/event.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 
 /**
  * Use this if you don't want the onDidChangeSessions event to fire in the extension host
@@ -35,8 +35,12 @@ export interface AuthenticationProviderInformation {
 }
 
 export interface IAuthenticationCreateSessionOptions {
-	sessionToRecreate?: AuthenticationSession;
 	activateImmediate?: boolean;
+	/**
+	 * The account that is being asked about. If this is passed in, the provider should
+	 * attempt to return the sessions that are only related to this account.
+	 */
+	account?: AuthenticationSessionAccount;
 }
 
 export interface AllowedExtension {
@@ -125,13 +129,20 @@ export interface IAuthenticationService {
 	 */
 	getProvider(id: string): IAuthenticationProvider;
 
+	/**
+	 * Gets all accounts that are currently logged in across all sessions
+	 * @param id The id of the provider to ask for accounts
+	 * @returns A promise that resolves to an array of accounts
+	 */
+	getAccounts(id: string): Promise<ReadonlyArray<AuthenticationSessionAccount>>;
+
 	/**
 	 * Gets all sessions that satisfy the given scopes from the provider with the given id
 	 * @param id The id of the provider to ask for a session
 	 * @param scopes The scopes for the session
 	 * @param activateImmediate If true, the provider should activate immediately if it is not already
 	 */
-	getSessions(id: string, scopes?: string[], activateImmediate?: boolean): Promise<ReadonlyArray<AuthenticationSession>>;
+	getSessions(id: string, scopes?: string[], account?: AuthenticationSessionAccount, activateImmediate?: boolean): Promise<ReadonlyArray<AuthenticationSession>>;
 
 	/**
 	 * Creates an AuthenticationSession with the given provider and scopes
@@ -154,16 +165,65 @@ export const IAuthenticationExtensionsService = createDecorator<IAuthenticationE
 export interface IAuthenticationExtensionsService {
 	readonly _serviceBrand: undefined;
 
+	/**
+	 * Fires when an account preference for a specific provider has changed for the specified extensions. Does not fire when:
+	 * * An account preference is removed
+	 * * A session preference is changed (because it's deprecated)
+	 * * A session preference is removed (because it's deprecated)
+	 */
+	onDidChangeAccountPreference: Event<{ extensionIds: string[]; providerId: string }>;
+	/**
+	 * Returns the accountName (also known as account.label) to pair with `IAuthenticationAccessService` to get the account preference
+	 * @param providerId The authentication provider id
+	 * @param extensionId The extension id to get the preference for
+	 * @returns The accountName of the preference, or undefined if there is no preference set
+	 */
+	getAccountPreference(extensionId: string, providerId: string): string | undefined;
+	/**
+	 * Sets the account preference for the given provider and extension
+	 * @param providerId The authentication provider id
+	 * @param extensionId The extension id to set the preference for
+	 * @param account The account to set the preference to
+	 */
+	updateAccountPreference(extensionId: string, providerId: string, account: AuthenticationSessionAccount): void;
+	/**
+	 * Removes the account preference for the given provider and extension
+	 * @param providerId The authentication provider id
+	 * @param extensionId The extension id to remove the preference for
+	 */
+	removeAccountPreference(extensionId: string, providerId: string): void;
+	/**
+	 * @deprecated Sets the session preference for the given provider and extension
+	 * @param providerId
+	 * @param extensionId
+	 * @param session
+	 */
 	updateSessionPreference(providerId: string, extensionId: string, session: AuthenticationSession): void;
+	/**
+	 * @deprecated Gets the session preference for the given provider and extension
+	 * @param providerId
+	 * @param extensionId
+	 * @param scopes
+	 */
 	getSessionPreference(providerId: string, extensionId: string, scopes: string[]): string | undefined;
+	/**
+	 * @deprecated Removes the session preference for the given provider and extension
+	 * @param providerId
+	 * @param extensionId
+	 * @param scopes
+	 */
 	removeSessionPreference(providerId: string, extensionId: string, scopes: string[]): void;
 	selectSession(providerId: string, extensionId: string, extensionName: string, scopes: string[], possibleSessions: readonly AuthenticationSession[]): Promise<AuthenticationSession>;
 	requestSessionAccess(providerId: string, extensionId: string, extensionName: string, scopes: string[], possibleSessions: readonly AuthenticationSession[]): void;
 	requestNewSession(providerId: string, scopes: string[], extensionId: string, extensionName: string): Promise<void>;
 }
 
-export interface IAuthenticationProviderCreateSessionOptions {
-	sessionToRecreate?: AuthenticationSession;
+export interface IAuthenticationProviderSessionOptions {
+	/**
+	 * The account that is being asked about. If this is passed in, the provider should
+	 * attempt to return the sessions that are only related to this account.
+	 */
+	account?: AuthenticationSessionAccount;
 }
 
 /**
@@ -194,9 +254,10 @@ export interface IAuthenticationProvider {
 	/**
 	 * Retrieves a list of authentication sessions.
 	 * @param scopes - An optional list of scopes. If provided, the sessions returned should match these permissions, otherwise all sessions should be returned.
+	 * @param options - Additional options for getting sessions.
 	 * @returns A promise that resolves to an array of authentication sessions.
 	 */
-	getSessions(scopes?: string[]): Promise<readonly AuthenticationSession[]>;
+	getSessions(scopes: string[] | undefined, options: IAuthenticationProviderSessionOptions): Promise<readonly AuthenticationSession[]>;
 
 	/**
 	 * Prompts the user to log in.
@@ -207,7 +268,7 @@ export interface IAuthenticationProvider {
 	 * @param options - Additional options for creating the session.
 	 * @returns A promise that resolves to an authentication session.
 	 */
-	createSession(scopes: string[], options: IAuthenticationProviderCreateSessionOptions): Promise<AuthenticationSession>;
+	createSession(scopes: string[], options: IAuthenticationProviderSessionOptions): Promise<AuthenticationSession>;
 
 	/**
 	 * Removes the session corresponding to the specified session ID.
diff --git a/src/vs/workbench/services/authentication/test/browser/authenticationService.test.ts b/src/vs/workbench/services/authentication/test/browser/authenticationService.test.ts
index 891c718ac73..11e50957b02 100644
--- a/src/vs/workbench/services/authentication/test/browser/authenticationService.test.ts
+++ b/src/vs/workbench/services/authentication/test/browser/authenticationService.test.ts
@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Emitter, Event } from 'vs/base/common/event';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { AuthenticationAccessService } from 'vs/workbench/services/authentication/browser/authenticationAccessService';
-import { AuthenticationService } from 'vs/workbench/services/authentication/browser/authenticationService';
-import { AuthenticationProviderInformation, AuthenticationSessionsChangeEvent, IAuthenticationProvider } from 'vs/workbench/services/authentication/common/authentication';
-import { TestEnvironmentService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { TestExtensionService, TestProductService, TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { AuthenticationAccessService } from '../../browser/authenticationAccessService.js';
+import { AuthenticationService } from '../../browser/authenticationService.js';
+import { AuthenticationProviderInformation, AuthenticationSessionsChangeEvent, IAuthenticationProvider } from '../../common/authentication.js';
+import { TestEnvironmentService } from '../../../../test/browser/workbenchTestServices.js';
+import { TestExtensionService, TestProductService, TestStorageService } from '../../../../test/common/workbenchTestServices.js';
 
 function createSession() {
 	return { id: 'session1', accessToken: 'token1', account: { id: 'account', label: 'Account' }, scopes: ['test'] };
diff --git a/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.ts b/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.ts
index 5178f4c9457..c7fe91bfe1e 100644
--- a/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.ts
+++ b/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.ts
@@ -3,28 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { mark } from 'vs/base/common/performance';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Dimension, EventHelper, EventType, ModifierKeyEmitter, addDisposableListener, cloneGlobalStylesheets, copyAttributes, createLinkElement, createMetaElement, getActiveWindow, getClientArea, getWindowId, isGlobalStylesheet, isHTMLElement, position, registerWindow, sharedMutationObserver, trackAttributes } from 'vs/base/browser/dom';
-import { CodeWindow, ensureCodeWindow, mainWindow } from 'vs/base/browser/window';
-import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { isFirefox, isWeb } from 'vs/base/common/platform';
-import { IRectangle, WindowMinimumSize } from 'vs/platform/window/common/window';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import Severity from 'vs/base/common/severity';
-import { BaseWindow } from 'vs/workbench/browser/window';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { Barrier } from 'vs/base/common/async';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { coalesce } from 'vs/base/common/arrays';
-import { getZoomLevel } from 'vs/base/browser/browser';
+import { getZoomLevel } from '../../../../base/browser/browser.js';
+import { Dimension, EventHelper, EventType, ModifierKeyEmitter, addDisposableListener, cloneGlobalStylesheets, copyAttributes, createLinkElement, createMetaElement, getActiveWindow, getClientArea, getWindowId, isGlobalStylesheet, isHTMLElement, position, registerWindow, sharedMutationObserver, trackAttributes } from '../../../../base/browser/dom.js';
+import { CodeWindow, ensureCodeWindow, mainWindow } from '../../../../base/browser/window.js';
+import { coalesce } from '../../../../base/common/arrays.js';
+import { Barrier } from '../../../../base/common/async.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { mark } from '../../../../base/common/performance.js';
+import { isFirefox, isWeb } from '../../../../base/common/platform.js';
+import Severity from '../../../../base/common/severity.js';
+import { localize } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IRectangle, WindowMinimumSize } from '../../../../platform/window/common/window.js';
+import { BaseWindow } from '../../../browser/window.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { IHostService } from '../../host/browser/host.js';
+import { IWorkbenchLayoutService } from '../../layout/browser/layoutService.js';
 
 export const IAuxiliaryWindowService = createDecorator<IAuxiliaryWindowService>('auxiliaryWindowService');
 
@@ -41,8 +41,12 @@ export enum AuxiliaryWindowMode {
 
 export interface IAuxiliaryWindowOpenOptions {
 	readonly bounds?: Partial<IRectangle>;
+
 	readonly mode?: AuxiliaryWindowMode;
 	readonly zoomLevel?: number;
+
+	readonly nativeTitlebar?: boolean;
+	readonly disableFullscreen?: boolean;
 }
 
 export interface IAuxiliaryWindowService {
@@ -328,8 +332,12 @@ export class BrowserAuxiliaryWindowService extends Disposable implements IAuxili
 			`top=${newWindowBounds.y}`,
 			`width=${newWindowBounds.width}`,
 			`height=${newWindowBounds.height}`,
-			options?.mode === AuxiliaryWindowMode.Maximized ? 'window-maximized=yes' : undefined, 	// non-standard property
-			options?.mode === AuxiliaryWindowMode.Fullscreen ? 'window-fullscreen=yes' : undefined 	// non-standard property
+
+			// non-standard properties
+			options?.nativeTitlebar ? 'window-native-titlebar=yes' : undefined,
+			options?.disableFullscreen ? 'window-disable-fullscreen=yes' : undefined,
+			options?.mode === AuxiliaryWindowMode.Maximized ? 'window-maximized=yes' : undefined,
+			options?.mode === AuxiliaryWindowMode.Fullscreen ? 'window-fullscreen=yes' : undefined
 		]);
 
 		const auxiliaryWindow = mainWindow.open(isFirefox ? '' /* FF immediately fires an unload event if using about:blank */ : 'about:blank', undefined, features.join(','));
diff --git a/src/vs/workbench/services/auxiliaryWindow/electron-sandbox/auxiliaryWindowService.ts b/src/vs/workbench/services/auxiliaryWindow/electron-sandbox/auxiliaryWindowService.ts
index 41d6b89e733..6b98b66e621 100644
--- a/src/vs/workbench/services/auxiliaryWindow/electron-sandbox/auxiliaryWindowService.ts
+++ b/src/vs/workbench/services/auxiliaryWindow/electron-sandbox/auxiliaryWindowService.ts
@@ -3,27 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
-import { AuxiliaryWindow, AuxiliaryWindowMode, BrowserAuxiliaryWindowService, IAuxiliaryWindowOpenOptions, IAuxiliaryWindowService } from 'vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService';
-import { ISandboxGlobals } from 'vs/base/parts/sandbox/electron-sandbox/globals';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { CodeWindow } from 'vs/base/browser/window';
-import { mark } from 'vs/base/common/performance';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ShutdownReason } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { Barrier } from 'vs/base/common/async';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { applyZoom } from 'vs/platform/window/electron-sandbox/window';
-import { getZoomLevel, isFullscreen, setFullscreen } from 'vs/base/browser/browser';
-import { getActiveWindow } from 'vs/base/browser/dom';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { isMacintosh } from 'vs/base/common/platform';
+import { localize } from '../../../../nls.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IWorkbenchLayoutService } from '../../layout/browser/layoutService.js';
+import { AuxiliaryWindow, AuxiliaryWindowMode, BrowserAuxiliaryWindowService, IAuxiliaryWindowOpenOptions, IAuxiliaryWindowService } from '../browser/auxiliaryWindowService.js';
+import { ISandboxGlobals } from '../../../../base/parts/sandbox/electron-sandbox/globals.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { CodeWindow } from '../../../../base/browser/window.js';
+import { mark } from '../../../../base/common/performance.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ShutdownReason } from '../../lifecycle/common/lifecycle.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { Barrier } from '../../../../base/common/async.js';
+import { IHostService } from '../../host/browser/host.js';
+import { applyZoom } from '../../../../platform/window/electron-sandbox/window.js';
+import { getZoomLevel, isFullscreen, setFullscreen } from '../../../../base/browser/browser.js';
+import { getActiveWindow } from '../../../../base/browser/dom.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { isMacintosh } from '../../../../base/common/platform.js';
 
 type NativeCodeWindow = CodeWindow & {
 	readonly vscode: ISandboxGlobals;
diff --git a/src/vs/workbench/services/banner/browser/bannerService.ts b/src/vs/workbench/services/banner/browser/bannerService.ts
index 9c1ab0d4bdd..2db0fa42104 100644
--- a/src/vs/workbench/services/banner/browser/bannerService.ts
+++ b/src/vs/workbench/services/banner/browser/bannerService.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { URI } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ILinkDescriptor } from 'vs/platform/opener/browser/link';
-import { ThemeIcon } from 'vs/base/common/themables';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { URI } from '../../../../base/common/uri.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILinkDescriptor } from '../../../../platform/opener/browser/link.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
 
 export interface IBannerItem {
 	readonly id: string;
diff --git a/src/vs/workbench/services/checksum/electron-sandbox/checksumService.ts b/src/vs/workbench/services/checksum/electron-sandbox/checksumService.ts
index a8c0e3d1f9d..57824e93880 100644
--- a/src/vs/workbench/services/checksum/electron-sandbox/checksumService.ts
+++ b/src/vs/workbench/services/checksum/electron-sandbox/checksumService.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IChecksumService } from 'vs/platform/checksum/common/checksumService';
-import { registerSharedProcessRemoteService } from 'vs/platform/ipc/electron-sandbox/services';
+import { IChecksumService } from '../../../../platform/checksum/common/checksumService.js';
+import { registerSharedProcessRemoteService } from '../../../../platform/ipc/electron-sandbox/services.js';
 
 registerSharedProcessRemoteService(IChecksumService, 'checksum');
diff --git a/src/vs/workbench/services/clipboard/browser/clipboardService.ts b/src/vs/workbench/services/clipboard/browser/clipboardService.ts
index fc2b1b582e6..e312d9e45f9 100644
--- a/src/vs/workbench/services/clipboard/browser/clipboardService.ts
+++ b/src/vs/workbench/services/clipboard/browser/clipboardService.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { BrowserClipboardService as BaseBrowserClipboardService } from 'vs/platform/clipboard/browser/clipboardService';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { Event } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
-import { getActiveWindow } from 'vs/base/browser/dom';
+import { localize } from '../../../../nls.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { BrowserClipboardService as BaseBrowserClipboardService } from '../../../../platform/clipboard/browser/clipboardService.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { Event } from '../../../../base/common/event.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { ILayoutService } from '../../../../platform/layout/browser/layoutService.js';
+import { getActiveWindow } from '../../../../base/browser/dom.js';
 
 export class BrowserClipboardService extends BaseBrowserClipboardService {
 
@@ -28,7 +28,19 @@ export class BrowserClipboardService extends BaseBrowserClipboardService {
 		super(layoutService, logService);
 	}
 
+	override async writeText(text: string, type?: string): Promise<void> {
+		if (!!this.environmentService.extensionTestsLocationURI && typeof type !== 'string') {
+			type = 'vscode-tests'; // force in-memory clipboard for tests to avoid permission issues
+		}
+
+		return super.writeText(text, type);
+	}
+
 	override async readText(type?: string): Promise<string> {
+		if (!!this.environmentService.extensionTestsLocationURI && typeof type !== 'string') {
+			type = 'vscode-tests'; // force in-memory clipboard for tests to avoid permission issues
+		}
+
 		if (type) {
 			return super.readText(type);
 		}
@@ -36,10 +48,6 @@ export class BrowserClipboardService extends BaseBrowserClipboardService {
 		try {
 			return await getActiveWindow().navigator.clipboard.readText();
 		} catch (error) {
-			if (!!this.environmentService.extensionTestsLocationURI) {
-				return ''; // do not ask for input in tests (https://github.com/microsoft/vscode/issues/112264)
-			}
-
 			return new Promise<string>(resolve => {
 
 				// Inform user about permissions problem (https://github.com/microsoft/vscode/issues/112089)
diff --git a/src/vs/workbench/services/clipboard/electron-sandbox/clipboardService.ts b/src/vs/workbench/services/clipboard/electron-sandbox/clipboardService.ts
index f4808d9f3a1..b9a2f688502 100644
--- a/src/vs/workbench/services/clipboard/electron-sandbox/clipboardService.ts
+++ b/src/vs/workbench/services/clipboard/electron-sandbox/clipboardService.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { URI } from 'vs/base/common/uri';
-import { isMacintosh } from 'vs/base/common/platform';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { VSBuffer } from 'vs/base/common/buffer';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { URI } from '../../../../base/common/uri.js';
+import { isMacintosh } from '../../../../base/common/platform.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
 
 export class NativeClipboardService implements IClipboardService {
 
@@ -20,6 +20,10 @@ export class NativeClipboardService implements IClipboardService {
 		@INativeHostService private readonly nativeHostService: INativeHostService
 	) { }
 
+	async readImage(): Promise<Uint8Array> {
+		return this.nativeHostService.readImage();
+	}
+
 	async writeText(text: string, type?: 'selection' | 'clipboard'): Promise<void> {
 		return this.nativeHostService.writeClipboardText(text, type);
 	}
diff --git a/src/vs/workbench/services/commands/common/commandService.ts b/src/vs/workbench/services/commands/common/commandService.ts
index 8a719346c3f..465806d06f0 100644
--- a/src/vs/workbench/services/commands/common/commandService.ts
+++ b/src/vs/workbench/services/commands/common/commandService.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ICommandService, ICommandEvent, CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { Event, Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ILogService } from 'vs/platform/log/common/log';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { timeout } from 'vs/base/common/async';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ICommandService, ICommandEvent, CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { IExtensionService } from '../../extensions/common/extensions.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { timeout } from '../../../../base/common/async.js';
 
 export class CommandService extends Disposable implements ICommandService {
 
diff --git a/src/vs/workbench/services/commands/test/common/commandService.test.ts b/src/vs/workbench/services/commands/test/common/commandService.test.ts
index 0c87ce176e1..b01db886d8b 100644
--- a/src/vs/workbench/services/commands/test/common/commandService.test.ts
+++ b/src/vs/workbench/services/commands/test/common/commandService.test.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { IDisposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { CommandService } from 'vs/workbench/services/commands/common/commandService';
-import { NullExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
-import { NullLogService } from 'vs/platform/log/common/log';
+import { IDisposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { CommandsRegistry } from '../../../../../platform/commands/common/commands.js';
+import { CommandService } from '../../common/commandService.js';
+import { NullExtensionService } from '../../../extensions/common/extensions.js';
+import { InstantiationService } from '../../../../../platform/instantiation/common/instantiationService.js';
+import { NullLogService } from '../../../../../platform/log/common/log.js';
 
 suite('CommandService', function () {
 
diff --git a/src/vs/workbench/services/configuration/browser/configuration.ts b/src/vs/workbench/services/configuration/browser/configuration.ts
index 721aa9ef10e..217084c9e9b 100644
--- a/src/vs/workbench/services/configuration/browser/configuration.ts
+++ b/src/vs/workbench/services/configuration/browser/configuration.ts
@@ -3,31 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { Event, Emitter } from 'vs/base/common/event';
-import * as errors from 'vs/base/common/errors';
-import { Disposable, IDisposable, dispose, toDisposable, MutableDisposable, combinedDisposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { FileChangeType, FileChangesEvent, IFileService, whenProviderRegistered, FileOperationError, FileOperationResult, FileOperation, FileOperationEvent } from 'vs/platform/files/common/files';
-import { ConfigurationModel, ConfigurationModelParser, ConfigurationParseOptions, UserSettings } from 'vs/platform/configuration/common/configurationModels';
-import { WorkspaceConfigurationModelParser, StandaloneConfigurationModelParser } from 'vs/workbench/services/configuration/common/configurationModels';
-import { TASKS_CONFIGURATION_KEY, FOLDER_SETTINGS_NAME, LAUNCH_CONFIGURATION_KEY, IConfigurationCache, ConfigurationKey, REMOTE_MACHINE_SCOPES, FOLDER_SCOPES, WORKSPACE_SCOPES, APPLY_ALL_PROFILES_SETTING } from 'vs/workbench/services/configuration/common/configuration';
-import { IStoredWorkspaceFolder } from 'vs/platform/workspaces/common/workspaces';
-import { WorkbenchState, IWorkspaceFolder, IWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
-import { ConfigurationScope, Extensions, IConfigurationRegistry, OVERRIDE_PROPERTY_REGEX } from 'vs/platform/configuration/common/configurationRegistry';
-import { equals } from 'vs/base/common/objects';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { hash } from 'vs/base/common/hash';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { joinPath } from 'vs/base/common/resources';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { isEmptyObject, isObject } from 'vs/base/common/types';
-import { DefaultConfiguration as BaseDefaultConfiguration } from 'vs/platform/configuration/common/configurations';
-import { IJSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditing';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { URI } from '../../../../base/common/uri.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import * as errors from '../../../../base/common/errors.js';
+import { Disposable, IDisposable, dispose, toDisposable, MutableDisposable, combinedDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { FileChangeType, FileChangesEvent, IFileService, whenProviderRegistered, FileOperationError, FileOperationResult, FileOperation, FileOperationEvent } from '../../../../platform/files/common/files.js';
+import { ConfigurationModel, ConfigurationModelParser, ConfigurationParseOptions, UserSettings } from '../../../../platform/configuration/common/configurationModels.js';
+import { WorkspaceConfigurationModelParser, StandaloneConfigurationModelParser } from '../common/configurationModels.js';
+import { TASKS_CONFIGURATION_KEY, FOLDER_SETTINGS_NAME, LAUNCH_CONFIGURATION_KEY, IConfigurationCache, ConfigurationKey, REMOTE_MACHINE_SCOPES, FOLDER_SCOPES, WORKSPACE_SCOPES, APPLY_ALL_PROFILES_SETTING } from '../common/configuration.js';
+import { IStoredWorkspaceFolder } from '../../../../platform/workspaces/common/workspaces.js';
+import { WorkbenchState, IWorkspaceFolder, IWorkspaceIdentifier } from '../../../../platform/workspace/common/workspace.js';
+import { ConfigurationScope, Extensions, IConfigurationRegistry, OVERRIDE_PROPERTY_REGEX } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { equals } from '../../../../base/common/objects.js';
+import { IRemoteAgentService } from '../../remote/common/remoteAgentService.js';
+import { hash } from '../../../../base/common/hash.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IStringDictionary } from '../../../../base/common/collections.js';
+import { joinPath } from '../../../../base/common/resources.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IBrowserWorkbenchEnvironmentService } from '../../environment/browser/environmentService.js';
+import { isEmptyObject, isObject } from '../../../../base/common/types.js';
+import { DefaultConfiguration as BaseDefaultConfiguration } from '../../../../platform/configuration/common/configurations.js';
+import { IJSONEditingService } from '../common/jsonEditing.js';
+import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
 
 export class DefaultConfiguration extends BaseDefaultConfiguration {
 
@@ -133,7 +133,7 @@ export class ApplicationConfiguration extends UserSettings {
 		uriIdentityService: IUriIdentityService,
 		logService: ILogService,
 	) {
-		super(userDataProfilesService.defaultProfile.settingsResource, { scopes: [ConfigurationScope.APPLICATION] }, uriIdentityService.extUri, fileService, logService);
+		super(userDataProfilesService.defaultProfile.settingsResource, { scopes: [ConfigurationScope.APPLICATION], skipUnregistered: true }, uriIdentityService.extUri, fileService, logService);
 		this._register(this.onDidChange(() => this.reloadConfigurationScheduler.schedule()));
 		this.reloadConfigurationScheduler = this._register(new RunOnceScheduler(() => this.loadConfiguration().then(configurationModel => this._onDidChangeConfiguration.fire(configurationModel)), 50));
 	}
@@ -527,13 +527,15 @@ class FileServiceBasedRemoteUserConfiguration extends Disposable {
 	private handleFileChangesEvent(event: FileChangesEvent): void {
 
 		// Find changes that affect the resource
-		let affectedByChanges = event.contains(this.configurationResource, FileChangeType.UPDATED);
+		let affectedByChanges = false;
 		if (event.contains(this.configurationResource, FileChangeType.ADDED)) {
 			affectedByChanges = true;
 			this.onResourceExists(true);
 		} else if (event.contains(this.configurationResource, FileChangeType.DELETED)) {
 			affectedByChanges = true;
 			this.onResourceExists(false);
+		} else if (event.contains(this.configurationResource, FileChangeType.UPDATED)) {
+			affectedByChanges = true;
 		}
 
 		if (affectedByChanges) {
diff --git a/src/vs/workbench/services/configuration/browser/configurationService.ts b/src/vs/workbench/services/configuration/browser/configurationService.ts
index b44f1e12235..9c9cf5d54fe 100644
--- a/src/vs/workbench/services/configuration/browser/configurationService.ts
+++ b/src/vs/workbench/services/configuration/browser/configurationService.ts
@@ -3,50 +3,50 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { Event, Emitter } from 'vs/base/common/event';
-import { ResourceMap } from 'vs/base/common/map';
-import { equals } from 'vs/base/common/objects';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { Queue, Barrier, Promises, Delayer } from 'vs/base/common/async';
-import { IJSONContributionRegistry, Extensions as JSONExtensions } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
-import { IWorkspaceContextService, Workspace as BaseWorkspace, WorkbenchState, IWorkspaceFolder, IWorkspaceFoldersChangeEvent, WorkspaceFolder, toWorkspaceFolder, isWorkspaceFolder, IWorkspaceFoldersWillChangeEvent, IEmptyWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, IWorkspaceIdentifier, IAnyWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
-import { ConfigurationModel, ConfigurationChangeEvent, mergeChanges } from 'vs/platform/configuration/common/configurationModels';
-import { IConfigurationChangeEvent, ConfigurationTarget, IConfigurationOverrides, isConfigurationOverrides, IConfigurationData, IConfigurationValue, IConfigurationChange, ConfigurationTargetToString, IConfigurationUpdateOverrides, isConfigurationUpdateOverrides, IConfigurationService, IConfigurationUpdateOptions } from 'vs/platform/configuration/common/configuration';
-import { IPolicyConfiguration, NullPolicyConfiguration, PolicyConfiguration } from 'vs/platform/configuration/common/configurations';
-import { Configuration } from 'vs/workbench/services/configuration/common/configurationModels';
-import { FOLDER_CONFIG_FOLDER_NAME, defaultSettingsSchemaId, userSettingsSchemaId, workspaceSettingsSchemaId, folderSettingsSchemaId, IConfigurationCache, machineSettingsSchemaId, LOCAL_MACHINE_SCOPES, IWorkbenchConfigurationService, RestrictedSettings, PROFILE_SCOPES, LOCAL_MACHINE_PROFILE_SCOPES, profileSettingsSchemaId, APPLY_ALL_PROFILES_SETTING } from 'vs/workbench/services/configuration/common/configuration';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IConfigurationRegistry, Extensions, allSettings, windowSettings, resourceSettings, applicationSettings, machineSettings, machineOverridableSettings, ConfigurationScope, IConfigurationPropertySchema, keyFromOverrideIdentifiers, OVERRIDE_PROPERTY_PATTERN, resourceLanguageSettingsSchemaId, configurationDefaultsSchemaId } from 'vs/platform/configuration/common/configurationRegistry';
-import { IStoredWorkspaceFolder, isStoredWorkspaceFolder, IWorkspaceFolderCreationData, getStoredWorkspaceFolder, toWorkspaceFolders } from 'vs/platform/workspaces/common/workspaces';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ConfigurationEditing, EditableConfigurationTarget } from 'vs/workbench/services/configuration/common/configurationEditing';
-import { WorkspaceConfiguration, FolderConfiguration, RemoteUserConfiguration, UserConfiguration, DefaultConfiguration, ApplicationConfiguration } from 'vs/workbench/services/configuration/browser/configuration';
-import { IJSONSchema, IJSONSchemaMap } from 'vs/base/common/jsonSchema';
-import { mark } from 'vs/base/common/performance';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IWorkbenchContribution, IWorkbenchContributionsRegistry, WorkbenchPhase, Extensions as WorkbenchExtensions, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { ILifecycleService, LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { ILogService } from 'vs/platform/log/common/log';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IWorkspaceTrustManagementService } from 'vs/platform/workspace/common/workspaceTrust';
-import { delta, distinct, equals as arrayEquals } from 'vs/base/common/arrays';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IWorkbenchAssignmentService } from 'vs/workbench/services/assignment/common/assignmentService';
-import { isUndefined } from 'vs/base/common/types';
-import { localize } from 'vs/nls';
-import { DidChangeUserDataProfileEvent, IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { IPolicyService, NullPolicyService } from 'vs/platform/policy/common/policy';
-import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IJSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditing';
-import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { workbenchConfigurationNodeBase } from 'vs/workbench/common/configuration';
-import { mainWindow } from 'vs/base/browser/window';
-import { runWhenWindowIdle } from 'vs/base/browser/dom';
+import { URI } from '../../../../base/common/uri.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { equals } from '../../../../base/common/objects.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { Queue, Barrier, Promises, Delayer } from '../../../../base/common/async.js';
+import { IJSONContributionRegistry, Extensions as JSONExtensions } from '../../../../platform/jsonschemas/common/jsonContributionRegistry.js';
+import { IWorkspaceContextService, Workspace as BaseWorkspace, WorkbenchState, IWorkspaceFolder, IWorkspaceFoldersChangeEvent, WorkspaceFolder, toWorkspaceFolder, isWorkspaceFolder, IWorkspaceFoldersWillChangeEvent, IEmptyWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, IWorkspaceIdentifier, IAnyWorkspaceIdentifier } from '../../../../platform/workspace/common/workspace.js';
+import { ConfigurationModel, ConfigurationChangeEvent, mergeChanges } from '../../../../platform/configuration/common/configurationModels.js';
+import { IConfigurationChangeEvent, ConfigurationTarget, IConfigurationOverrides, isConfigurationOverrides, IConfigurationData, IConfigurationValue, IConfigurationChange, ConfigurationTargetToString, IConfigurationUpdateOverrides, isConfigurationUpdateOverrides, IConfigurationService, IConfigurationUpdateOptions } from '../../../../platform/configuration/common/configuration.js';
+import { IPolicyConfiguration, NullPolicyConfiguration, PolicyConfiguration } from '../../../../platform/configuration/common/configurations.js';
+import { Configuration } from '../common/configurationModels.js';
+import { FOLDER_CONFIG_FOLDER_NAME, defaultSettingsSchemaId, userSettingsSchemaId, workspaceSettingsSchemaId, folderSettingsSchemaId, IConfigurationCache, machineSettingsSchemaId, LOCAL_MACHINE_SCOPES, IWorkbenchConfigurationService, RestrictedSettings, PROFILE_SCOPES, LOCAL_MACHINE_PROFILE_SCOPES, profileSettingsSchemaId, APPLY_ALL_PROFILES_SETTING } from '../common/configuration.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IConfigurationRegistry, Extensions, allSettings, windowSettings, resourceSettings, applicationSettings, machineSettings, machineOverridableSettings, ConfigurationScope, IConfigurationPropertySchema, keyFromOverrideIdentifiers, OVERRIDE_PROPERTY_PATTERN, resourceLanguageSettingsSchemaId, configurationDefaultsSchemaId } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { IStoredWorkspaceFolder, isStoredWorkspaceFolder, IWorkspaceFolderCreationData, getStoredWorkspaceFolder, toWorkspaceFolders } from '../../../../platform/workspaces/common/workspaces.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ConfigurationEditing, EditableConfigurationTarget } from '../common/configurationEditing.js';
+import { WorkspaceConfiguration, FolderConfiguration, RemoteUserConfiguration, UserConfiguration, DefaultConfiguration, ApplicationConfiguration } from './configuration.js';
+import { IJSONSchema, IJSONSchemaMap } from '../../../../base/common/jsonSchema.js';
+import { mark } from '../../../../base/common/performance.js';
+import { IRemoteAgentService } from '../../remote/common/remoteAgentService.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { IWorkbenchContribution, IWorkbenchContributionsRegistry, WorkbenchPhase, Extensions as WorkbenchExtensions, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { ILifecycleService, LifecyclePhase } from '../../lifecycle/common/lifecycle.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { toErrorMessage } from '../../../../base/common/errorMessage.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IWorkspaceTrustManagementService } from '../../../../platform/workspace/common/workspaceTrust.js';
+import { delta, distinct, equals as arrayEquals } from '../../../../base/common/arrays.js';
+import { IStringDictionary } from '../../../../base/common/collections.js';
+import { IExtensionService } from '../../extensions/common/extensions.js';
+import { IWorkbenchAssignmentService } from '../../assignment/common/assignmentService.js';
+import { isUndefined } from '../../../../base/common/types.js';
+import { localize } from '../../../../nls.js';
+import { DidChangeUserDataProfileEvent, IUserDataProfileService } from '../../userDataProfile/common/userDataProfile.js';
+import { IPolicyService, NullPolicyService } from '../../../../platform/policy/common/policy.js';
+import { IUserDataProfile, IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { IJSONEditingService } from '../common/jsonEditing.js';
+import { IBrowserWorkbenchEnvironmentService } from '../../environment/browser/environmentService.js';
+import { workbenchConfigurationNodeBase } from '../../../common/configuration.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { runWhenWindowIdle } from '../../../../base/browser/dom.js';
 
 function getLocalUserConfigurationScopes(userDataProfile: IUserDataProfile, hasRemote: boolean): ConfigurationScope[] | undefined {
 	return (userDataProfile.isDefault || userDataProfile.useDefaultFlags?.settings)
@@ -1260,9 +1260,9 @@ class RegisterConfigurationSchemasContribution extends Disposable implements IWo
 			type: 'object',
 			description: localize('configurationDefaults.description', 'Contribute defaults for configurations'),
 			properties: Object.assign({},
-				machineOverridableSettings.properties,
-				windowSettings.properties,
-				resourceSettings.properties
+				this.filterDefaultOverridableProperties(machineOverridableSettings.properties),
+				this.filterDefaultOverridableProperties(windowSettings.properties),
+				this.filterDefaultOverridableProperties(resourceSettings.properties)
 			),
 			patternProperties: {
 				[OVERRIDE_PROPERTY_PATTERN]: {
@@ -1316,6 +1316,16 @@ class RegisterConfigurationSchemasContribution extends Disposable implements IWo
 		});
 		return result;
 	}
+
+	private filterDefaultOverridableProperties(properties: IStringDictionary<IConfigurationPropertySchema>): IStringDictionary<IConfigurationPropertySchema> {
+		const result: IStringDictionary<IConfigurationPropertySchema> = {};
+		Object.entries(properties).forEach(([key, value]) => {
+			if (!value.disallowConfigurationDefault) {
+				result[key] = value;
+			}
+		});
+		return result;
+	}
 }
 
 class ResetConfigurationDefaultsOverridesCache extends Disposable implements IWorkbenchContribution {
@@ -1365,7 +1375,7 @@ class UpdateExperimentalSettingsDefaults extends Disposable implements IWorkbenc
 			} catch (error) {/*ignore */ }
 		}
 		if (Object.keys(overrides).length) {
-			this.configurationRegistry.registerDefaultConfigurations([{ overrides, source: localize('experimental', "Experiments") }]);
+			this.configurationRegistry.registerDefaultConfigurations([{ overrides }]);
 		}
 	}
 }
diff --git a/src/vs/workbench/services/configuration/common/configuration.ts b/src/vs/workbench/services/configuration/common/configuration.ts
index 043add6bd72..a97808cda18 100644
--- a/src/vs/workbench/services/configuration/common/configuration.ts
+++ b/src/vs/workbench/services/configuration/common/configuration.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
-import { URI } from 'vs/base/common/uri';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { refineServiceDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { Event } from 'vs/base/common/event';
-import { ResourceMap } from 'vs/base/common/map';
-import { IAnyWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
+import { ConfigurationScope } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { refineServiceDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { Event } from '../../../../base/common/event.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { IAnyWorkspaceIdentifier } from '../../../../platform/workspace/common/workspace.js';
 
 export const FOLDER_CONFIG_FOLDER_NAME = '.vscode';
 export const FOLDER_SETTINGS_NAME = 'settings';
diff --git a/src/vs/workbench/services/configuration/common/configurationCache.ts b/src/vs/workbench/services/configuration/common/configurationCache.ts
index 9baf8514dac..78525df8934 100644
--- a/src/vs/workbench/services/configuration/common/configurationCache.ts
+++ b/src/vs/workbench/services/configuration/common/configurationCache.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IConfigurationCache, ConfigurationKey } from 'vs/workbench/services/configuration/common/configuration';
-import { URI } from 'vs/base/common/uri';
-import { FileOperationError, FileOperationResult, IFileService } from 'vs/platform/files/common/files';
-import { joinPath } from 'vs/base/common/resources';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { Queue } from 'vs/base/common/async';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { IConfigurationCache, ConfigurationKey } from './configuration.js';
+import { URI } from '../../../../base/common/uri.js';
+import { FileOperationError, FileOperationResult, IFileService } from '../../../../platform/files/common/files.js';
+import { joinPath } from '../../../../base/common/resources.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { Queue } from '../../../../base/common/async.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
 
 export class ConfigurationCache implements IConfigurationCache {
 
diff --git a/src/vs/workbench/services/configuration/common/configurationEditing.ts b/src/vs/workbench/services/configuration/common/configurationEditing.ts
index 721f789dadb..31864ea3105 100644
--- a/src/vs/workbench/services/configuration/common/configurationEditing.ts
+++ b/src/vs/workbench/services/configuration/common/configurationEditing.ts
@@ -3,32 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { URI } from 'vs/base/common/uri';
-import * as json from 'vs/base/common/json';
-import { setProperty } from 'vs/base/common/jsonEdit';
-import { Queue } from 'vs/base/common/async';
-import { Edit, FormattingOptions } from 'vs/base/common/jsonFormatter';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { IConfigurationUpdateOptions, IConfigurationUpdateOverrides } from 'vs/platform/configuration/common/configuration';
-import { FOLDER_SETTINGS_PATH, WORKSPACE_STANDALONE_CONFIGURATIONS, TASKS_CONFIGURATION_KEY, LAUNCH_CONFIGURATION_KEY, USER_STANDALONE_CONFIGURATIONS, TASKS_DEFAULT, FOLDER_SCOPES, IWorkbenchConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
-import { FileOperationError, FileOperationResult, IFileService } from 'vs/platform/files/common/files';
-import { IResolvedTextEditorModel, ITextModelService } from 'vs/editor/common/services/resolverService';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope, keyFromOverrideIdentifiers, OVERRIDE_PROPERTY_REGEX } from 'vs/platform/configuration/common/configurationRegistry';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { IOpenSettingsOptions, IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { ITextModel } from 'vs/editor/common/model';
-import { IReference } from 'vs/base/common/lifecycle';
-import { Range } from 'vs/editor/common/core/range';
-import { EditOperation } from 'vs/editor/common/core/editOperation';
-import { Selection } from 'vs/editor/common/core/selection';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { ErrorNoTelemetry } from 'vs/base/common/errors';
+import * as nls from '../../../../nls.js';
+import { URI } from '../../../../base/common/uri.js';
+import * as json from '../../../../base/common/json.js';
+import { setProperty } from '../../../../base/common/jsonEdit.js';
+import { Queue } from '../../../../base/common/async.js';
+import { Edit, FormattingOptions } from '../../../../base/common/jsonFormatter.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IWorkspaceContextService, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { ITextFileService } from '../../textfile/common/textfiles.js';
+import { IConfigurationUpdateOptions, IConfigurationUpdateOverrides } from '../../../../platform/configuration/common/configuration.js';
+import { FOLDER_SETTINGS_PATH, WORKSPACE_STANDALONE_CONFIGURATIONS, TASKS_CONFIGURATION_KEY, LAUNCH_CONFIGURATION_KEY, USER_STANDALONE_CONFIGURATIONS, TASKS_DEFAULT, FOLDER_SCOPES, IWorkbenchConfigurationService } from './configuration.js';
+import { FileOperationError, FileOperationResult, IFileService } from '../../../../platform/files/common/files.js';
+import { IResolvedTextEditorModel, ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope, keyFromOverrideIdentifiers, OVERRIDE_PROPERTY_REGEX } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { IEditorService } from '../../editor/common/editorService.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { IOpenSettingsOptions, IPreferencesService } from '../../preferences/common/preferences.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { IReference } from '../../../../base/common/lifecycle.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { EditOperation } from '../../../../editor/common/core/editOperation.js';
+import { Selection } from '../../../../editor/common/core/selection.js';
+import { IUserDataProfileService } from '../../userDataProfile/common/userDataProfile.js';
+import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { ErrorNoTelemetry } from '../../../../base/common/errors.js';
 
 export const enum ConfigurationEditingErrorCode {
 
@@ -293,7 +293,7 @@ export class ConfigurationEditing {
 					label: nls.localize('saveAndRetry', "Save and Retry"),
 					run: () => {
 						const key = operation.key ? `${operation.workspaceStandAloneConfigurationKey}.${operation.key}` : operation.workspaceStandAloneConfigurationKey!;
-						this.writeConfiguration(operation.target, { key, value: operation.value }, <IConfigurationEditingOptions>{ handleDirtyFile: 'save', scopes });
+						this.writeConfiguration(operation.target, { key, value: operation.value }, { handleDirtyFile: 'save', scopes });
 					}
 				},
 				{
@@ -305,7 +305,7 @@ export class ConfigurationEditing {
 			this.notificationService.prompt(Severity.Error, error.message,
 				[{
 					label: nls.localize('saveAndRetry', "Save and Retry"),
-					run: () => this.writeConfiguration(operation.target, { key: operation.key, value: operation.value }, <IConfigurationEditingOptions>{ handleDirtyFile: 'save', scopes })
+					run: () => this.writeConfiguration(operation.target, { key: operation.key, value: operation.value }, { handleDirtyFile: 'save', scopes })
 				},
 				{
 					label: nls.localize('open', "Open Settings"),
diff --git a/src/vs/workbench/services/configuration/common/configurationModels.ts b/src/vs/workbench/services/configuration/common/configurationModels.ts
index 3f797312dc7..00ca9f10b88 100644
--- a/src/vs/workbench/services/configuration/common/configurationModels.ts
+++ b/src/vs/workbench/services/configuration/common/configurationModels.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { equals } from 'vs/base/common/objects';
-import { toValuesTree, IConfigurationModel, IConfigurationOverrides, IConfigurationValue, IConfigurationChange } from 'vs/platform/configuration/common/configuration';
-import { Configuration as BaseConfiguration, ConfigurationModelParser, ConfigurationModel, ConfigurationParseOptions } from 'vs/platform/configuration/common/configurationModels';
-import { IStoredWorkspaceFolder } from 'vs/platform/workspaces/common/workspaces';
-import { Workspace } from 'vs/platform/workspace/common/workspace';
-import { ResourceMap } from 'vs/base/common/map';
-import { URI } from 'vs/base/common/uri';
-import { isBoolean } from 'vs/base/common/types';
-import { distinct } from 'vs/base/common/arrays';
-import { ILogService } from 'vs/platform/log/common/log';
+import { equals } from '../../../../base/common/objects.js';
+import { toValuesTree, IConfigurationModel, IConfigurationOverrides, IConfigurationValue, IConfigurationChange } from '../../../../platform/configuration/common/configuration.js';
+import { Configuration as BaseConfiguration, ConfigurationModelParser, ConfigurationModel, ConfigurationParseOptions } from '../../../../platform/configuration/common/configurationModels.js';
+import { IStoredWorkspaceFolder } from '../../../../platform/workspaces/common/workspaces.js';
+import { Workspace } from '../../../../platform/workspace/common/workspace.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { URI } from '../../../../base/common/uri.js';
+import { isBoolean } from '../../../../base/common/types.js';
+import { distinct } from '../../../../base/common/arrays.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
 
 export class WorkspaceConfigurationModelParser extends ConfigurationModelParser {
 
diff --git a/src/vs/workbench/services/configuration/common/jsonEditing.ts b/src/vs/workbench/services/configuration/common/jsonEditing.ts
index ea4e426b1c4..41481d442c7 100644
--- a/src/vs/workbench/services/configuration/common/jsonEditing.ts
+++ b/src/vs/workbench/services/configuration/common/jsonEditing.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { JSONPath } from 'vs/base/common/json';
+import { URI } from '../../../../base/common/uri.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { JSONPath } from '../../../../base/common/json.js';
 
 export const IJSONEditingService = createDecorator<IJSONEditingService>('jsonEditingService');
 
diff --git a/src/vs/workbench/services/configuration/common/jsonEditingService.ts b/src/vs/workbench/services/configuration/common/jsonEditingService.ts
index 13ce581ba64..24dadd330c8 100644
--- a/src/vs/workbench/services/configuration/common/jsonEditingService.ts
+++ b/src/vs/workbench/services/configuration/common/jsonEditingService.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { URI } from 'vs/base/common/uri';
-import * as json from 'vs/base/common/json';
-import { setProperty } from 'vs/base/common/jsonEdit';
-import { Queue } from 'vs/base/common/async';
-import { Edit } from 'vs/base/common/jsonFormatter';
-import { IReference } from 'vs/base/common/lifecycle';
-import { EditOperation } from 'vs/editor/common/core/editOperation';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { IFileService } from 'vs/platform/files/common/files';
-import { ITextModelService, IResolvedTextEditorModel } from 'vs/editor/common/services/resolverService';
-import { IJSONEditingService, IJSONValue, JSONEditingError, JSONEditingErrorCode } from 'vs/workbench/services/configuration/common/jsonEditing';
-import { ITextModel } from 'vs/editor/common/model';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import * as nls from '../../../../nls.js';
+import { URI } from '../../../../base/common/uri.js';
+import * as json from '../../../../base/common/json.js';
+import { setProperty } from '../../../../base/common/jsonEdit.js';
+import { Queue } from '../../../../base/common/async.js';
+import { Edit } from '../../../../base/common/jsonFormatter.js';
+import { IReference } from '../../../../base/common/lifecycle.js';
+import { EditOperation } from '../../../../editor/common/core/editOperation.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { Selection } from '../../../../editor/common/core/selection.js';
+import { ITextFileService } from '../../textfile/common/textfiles.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { ITextModelService, IResolvedTextEditorModel } from '../../../../editor/common/services/resolverService.js';
+import { IJSONEditingService, IJSONValue, JSONEditingError, JSONEditingErrorCode } from './jsonEditing.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
 
 export class JSONEditingService implements IJSONEditingService {
 
diff --git a/src/vs/workbench/services/configuration/test/browser/configuration.test.ts b/src/vs/workbench/services/configuration/test/browser/configuration.test.ts
index 266ccaf978b..b7289653bed 100644
--- a/src/vs/workbench/services/configuration/test/browser/configuration.test.ts
+++ b/src/vs/workbench/services/configuration/test/browser/configuration.test.ts
@@ -4,18 +4,18 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Event } from 'vs/base/common/event';
-import { joinPath } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { DefaultConfiguration } from 'vs/workbench/services/configuration/browser/configuration';
-import { ConfigurationKey, IConfigurationCache } from 'vs/workbench/services/configuration/common/configuration';
-import { BrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { TestEnvironmentService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { TestProductService } from 'vs/workbench/test/common/workbenchTestServices';
+import { Event } from '../../../../../base/common/event.js';
+import { joinPath } from '../../../../../base/common/resources.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Extensions, IConfigurationRegistry } from '../../../../../platform/configuration/common/configurationRegistry.js';
+import { NullLogService } from '../../../../../platform/log/common/log.js';
+import { Registry } from '../../../../../platform/registry/common/platform.js';
+import { DefaultConfiguration } from '../../browser/configuration.js';
+import { ConfigurationKey, IConfigurationCache } from '../../common/configuration.js';
+import { BrowserWorkbenchEnvironmentService } from '../../../environment/browser/environmentService.js';
+import { TestEnvironmentService } from '../../../../test/browser/workbenchTestServices.js';
+import { TestProductService } from '../../../../test/common/workbenchTestServices.js';
 
 class ConfigurationCache implements IConfigurationCache {
 	private readonly cache = new Map<string, string>();
@@ -48,8 +48,7 @@ suite('DefaultConfiguration', () => {
 
 	teardown(() => {
 		configurationRegistry.deregisterConfigurations(configurationRegistry.getConfigurations());
-		const configurationDefaultsOverrides = configurationRegistry.getConfigurationDefaultsOverrides();
-		configurationRegistry.deregisterDefaultConfigurations([...configurationDefaultsOverrides.keys()].map(key => ({ extensionId: configurationDefaultsOverrides.get(key)?.source, overrides: { [key]: configurationDefaultsOverrides.get(key)?.value } })));
+		configurationRegistry.deregisterDefaultConfigurations(configurationRegistry.getRegisteredDefaultConfigurations());
 	});
 
 	test('configuration default overrides are read from environment', async () => {
diff --git a/src/vs/workbench/services/configuration/test/browser/configurationEditing.test.ts b/src/vs/workbench/services/configuration/test/browser/configurationEditing.test.ts
index 8575a047a79..a1b78e0c8ff 100644
--- a/src/vs/workbench/services/configuration/test/browser/configurationEditing.test.ts
+++ b/src/vs/workbench/services/configuration/test/browser/configurationEditing.test.ts
@@ -5,48 +5,48 @@
 
 import * as sinon from 'sinon';
 import assert from 'assert';
-import * as json from 'vs/base/common/json';
-import { Event } from 'vs/base/common/event';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { TestEnvironmentService, TestTextFileService, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
-import * as uuid from 'vs/base/common/uuid';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
-import { WorkspaceService } from 'vs/workbench/services/configuration/browser/configurationService';
-import { ConfigurationEditing, ConfigurationEditingErrorCode, EditableConfigurationTarget } from 'vs/workbench/services/configuration/common/configurationEditing';
-import { WORKSPACE_STANDALONE_CONFIGURATIONS, FOLDER_SETTINGS_PATH, USER_STANDALONE_CONFIGURATIONS, IConfigurationCache } from 'vs/workbench/services/configuration/common/configuration';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { TextModelResolverService } from 'vs/workbench/services/textmodelResolver/common/textModelResolverService';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { CommandService } from 'vs/workbench/services/commands/common/commandService';
-import { URI } from 'vs/base/common/uri';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { Schemas } from 'vs/base/common/network';
-import { IFileService } from 'vs/platform/files/common/files';
-import { KeybindingsEditingService, IKeybindingEditingService } from 'vs/workbench/services/keybinding/common/keybindingEditing';
-import { FileUserDataProvider } from 'vs/platform/userData/common/fileUserDataProvider';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { toDisposable } from 'vs/base/common/lifecycle';
-import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
-import { joinPath } from 'vs/base/common/resources';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { RemoteAgentService } from 'vs/workbench/services/remote/browser/remoteAgentService';
-import { getSingleFolderWorkspaceIdentifier } from 'vs/workbench/services/workspaces/browser/workspaces';
-import { IUserDataProfilesService, UserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { hash } from 'vs/base/common/hash';
-import { FilePolicyService } from 'vs/platform/policy/common/filePolicyService';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { UserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfileService';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import * as json from '../../../../../base/common/json.js';
+import { Event } from '../../../../../base/common/event.js';
+import { Registry } from '../../../../../platform/registry/common/platform.js';
+import { IEnvironmentService } from '../../../../../platform/environment/common/environment.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { TestEnvironmentService, TestTextFileService, workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
+import * as uuid from '../../../../../base/common/uuid.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from '../../../../../platform/configuration/common/configurationRegistry.js';
+import { WorkspaceService } from '../../browser/configurationService.js';
+import { ConfigurationEditing, ConfigurationEditingErrorCode, EditableConfigurationTarget } from '../../common/configurationEditing.js';
+import { WORKSPACE_STANDALONE_CONFIGURATIONS, FOLDER_SETTINGS_PATH, USER_STANDALONE_CONFIGURATIONS, IConfigurationCache } from '../../common/configuration.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { ITextFileService } from '../../../textfile/common/textfiles.js';
+import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
+import { TextModelResolverService } from '../../../textmodelResolver/common/textModelResolverService.js';
+import { INotificationService } from '../../../../../platform/notification/common/notification.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { CommandService } from '../../../commands/common/commandService.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { IRemoteAgentService } from '../../../remote/common/remoteAgentService.js';
+import { FileService } from '../../../../../platform/files/common/fileService.js';
+import { NullLogService } from '../../../../../platform/log/common/log.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { KeybindingsEditingService, IKeybindingEditingService } from '../../../keybinding/common/keybindingEditing.js';
+import { FileUserDataProvider } from '../../../../../platform/userData/common/fileUserDataProvider.js';
+import { UriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentityService.js';
+import { toDisposable } from '../../../../../base/common/lifecycle.js';
+import { InMemoryFileSystemProvider } from '../../../../../platform/files/common/inMemoryFilesystemProvider.js';
+import { joinPath } from '../../../../../base/common/resources.js';
+import { VSBuffer } from '../../../../../base/common/buffer.js';
+import { RemoteAgentService } from '../../../remote/browser/remoteAgentService.js';
+import { getSingleFolderWorkspaceIdentifier } from '../../../workspaces/browser/workspaces.js';
+import { IUserDataProfilesService, UserDataProfilesService } from '../../../../../platform/userDataProfile/common/userDataProfile.js';
+import { hash } from '../../../../../base/common/hash.js';
+import { FilePolicyService } from '../../../../../platform/policy/common/filePolicyService.js';
+import { runWithFakedTimers } from '../../../../../base/test/common/timeTravelScheduler.js';
+import { UserDataProfileService } from '../../../userDataProfile/common/userDataProfileService.js';
+import { IUserDataProfileService } from '../../../userDataProfile/common/userDataProfile.js';
+import { IBrowserWorkbenchEnvironmentService } from '../../../environment/browser/environmentService.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 const ROOT = URI.file('tests').with({ scheme: 'vscode-tests' });
 
diff --git a/src/vs/workbench/services/configuration/test/browser/configurationService.test.ts b/src/vs/workbench/services/configuration/test/browser/configurationService.test.ts
index bd6c6a3d5ef..833dec287e0 100644
--- a/src/vs/workbench/services/configuration/test/browser/configurationService.test.ts
+++ b/src/vs/workbench/services/configuration/test/browser/configurationService.test.ts
@@ -5,53 +5,53 @@
 
 import assert from 'assert';
 import * as sinon from 'sinon';
-import { URI } from 'vs/base/common/uri';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope, keyFromOverrideIdentifiers } from 'vs/platform/configuration/common/configurationRegistry';
-import { WorkspaceService } from 'vs/workbench/services/configuration/browser/configurationService';
-import { ConfigurationEditingErrorCode } from 'vs/workbench/services/configuration/common/configurationEditing';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IWorkspaceContextService, WorkbenchState, IWorkspaceFoldersChangeEvent, ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
-import { ConfigurationTarget, IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
-import { workbenchInstantiationService, RemoteFileSystemProvider, TestEnvironmentService, TestTextFileService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { TextModelResolverService } from 'vs/workbench/services/textmodelResolver/common/textModelResolverService';
-import { IJSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditing';
-import { JSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditingService';
-import { Schemas } from 'vs/base/common/network';
-import { joinPath, dirname, basename } from 'vs/base/common/resources';
-import { isLinux, isMacintosh } from 'vs/base/common/platform';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { IRemoteAgentEnvironment } from 'vs/platform/remote/common/remoteAgentEnvironment';
-import { APPLY_ALL_PROFILES_SETTING, IConfigurationCache } from 'vs/workbench/services/configuration/common/configuration';
-import { SignService } from 'vs/platform/sign/browser/signService';
-import { FileUserDataProvider } from 'vs/platform/userData/common/fileUserDataProvider';
-import { IKeybindingEditingService, KeybindingsEditingService } from 'vs/workbench/services/keybinding/common/keybindingEditing';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { timeout } from 'vs/base/common/async';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { Event } from 'vs/base/common/event';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
-import { BrowserWorkbenchEnvironmentService, IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { RemoteAgentService } from 'vs/workbench/services/remote/browser/remoteAgentService';
-import { RemoteAuthorityResolverService } from 'vs/platform/remote/browser/remoteAuthorityResolverService';
-import { hash } from 'vs/base/common/hash';
-import { TestProductService } from 'vs/workbench/test/common/workbenchTestServices';
-import { IUserDataProfilesService, toUserDataProfile, UserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { NullPolicyService } from 'vs/platform/policy/common/policy';
-import { FilePolicyService } from 'vs/platform/policy/common/filePolicyService';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { UserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfileService';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { TasksSchemaProperties } from 'vs/workbench/contrib/tasks/common/tasks';
-import { RemoteSocketFactoryService } from 'vs/platform/remote/common/remoteSocketFactoryService';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { URI } from '../../../../../base/common/uri.js';
+import { Registry } from '../../../../../platform/registry/common/platform.js';
+import { IEnvironmentService } from '../../../../../platform/environment/common/environment.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope, keyFromOverrideIdentifiers } from '../../../../../platform/configuration/common/configurationRegistry.js';
+import { WorkspaceService } from '../../browser/configurationService.js';
+import { ConfigurationEditingErrorCode } from '../../common/configurationEditing.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { IWorkspaceContextService, WorkbenchState, IWorkspaceFoldersChangeEvent, ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from '../../../../../platform/workspace/common/workspace.js';
+import { ConfigurationTarget, IConfigurationService, IConfigurationChangeEvent } from '../../../../../platform/configuration/common/configuration.js';
+import { workbenchInstantiationService, RemoteFileSystemProvider, TestEnvironmentService, TestTextFileService } from '../../../../test/browser/workbenchTestServices.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { ITextFileService } from '../../../textfile/common/textfiles.js';
+import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
+import { TextModelResolverService } from '../../../textmodelResolver/common/textModelResolverService.js';
+import { IJSONEditingService } from '../../common/jsonEditing.js';
+import { JSONEditingService } from '../../common/jsonEditingService.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { joinPath, dirname, basename } from '../../../../../base/common/resources.js';
+import { isLinux, isMacintosh } from '../../../../../base/common/platform.js';
+import { IRemoteAgentService } from '../../../remote/common/remoteAgentService.js';
+import { FileService } from '../../../../../platform/files/common/fileService.js';
+import { NullLogService } from '../../../../../platform/log/common/log.js';
+import { IRemoteAgentEnvironment } from '../../../../../platform/remote/common/remoteAgentEnvironment.js';
+import { APPLY_ALL_PROFILES_SETTING, IConfigurationCache } from '../../common/configuration.js';
+import { SignService } from '../../../../../platform/sign/browser/signService.js';
+import { FileUserDataProvider } from '../../../../../platform/userData/common/fileUserDataProvider.js';
+import { IKeybindingEditingService, KeybindingsEditingService } from '../../../keybinding/common/keybindingEditing.js';
+import { IWorkbenchEnvironmentService } from '../../../environment/common/environmentService.js';
+import { timeout } from '../../../../../base/common/async.js';
+import { VSBuffer } from '../../../../../base/common/buffer.js';
+import { Event } from '../../../../../base/common/event.js';
+import { UriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentityService.js';
+import { InMemoryFileSystemProvider } from '../../../../../platform/files/common/inMemoryFilesystemProvider.js';
+import { BrowserWorkbenchEnvironmentService, IBrowserWorkbenchEnvironmentService } from '../../../environment/browser/environmentService.js';
+import { RemoteAgentService } from '../../../remote/browser/remoteAgentService.js';
+import { RemoteAuthorityResolverService } from '../../../../../platform/remote/browser/remoteAuthorityResolverService.js';
+import { hash } from '../../../../../base/common/hash.js';
+import { TestProductService } from '../../../../test/common/workbenchTestServices.js';
+import { IUserDataProfilesService, toUserDataProfile, UserDataProfilesService } from '../../../../../platform/userDataProfile/common/userDataProfile.js';
+import { NullPolicyService } from '../../../../../platform/policy/common/policy.js';
+import { FilePolicyService } from '../../../../../platform/policy/common/filePolicyService.js';
+import { runWithFakedTimers } from '../../../../../base/test/common/timeTravelScheduler.js';
+import { UserDataProfileService } from '../../../userDataProfile/common/userDataProfileService.js';
+import { IUserDataProfileService } from '../../../userDataProfile/common/userDataProfile.js';
+import { TasksSchemaProperties } from '../../../../contrib/tasks/common/tasks.js';
+import { RemoteSocketFactoryService } from '../../../../../platform/remote/common/remoteSocketFactoryService.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 function convertToWorkspacePayload(folder: URI): ISingleFolderWorkspaceIdentifier {
 	return {
@@ -1737,6 +1737,12 @@ suite('WorkspaceConfigurationService - Profiles', () => {
 		assert.strictEqual(testObject.getValue('configurationService.profiles.applicationSetting3'), 'defaultProfile');
 	}));
 
+	test('non registering setting should not be read from default profile', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
+		await fileService.writeFile(instantiationService.get(IUserDataProfilesService).defaultProfile.settingsResource, VSBuffer.fromString('{ "configurationService.profiles.nonregistered": "defaultProfile" }'));
+		await testObject.reloadConfiguration();
+		assert.strictEqual(testObject.getValue('configurationService.profiles.nonregistered'), undefined);
+	}));
+
 	test('initialize with custom all profiles settings', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
 		await testObject.updateValue(APPLY_ALL_PROFILES_SETTING, ['configurationService.profiles.testSetting2'], ConfigurationTarget.USER_LOCAL);
 
diff --git a/src/vs/workbench/services/configuration/test/common/configurationModels.test.ts b/src/vs/workbench/services/configuration/test/common/configurationModels.test.ts
index bbfd61cdd7d..e2af59e33aa 100644
--- a/src/vs/workbench/services/configuration/test/common/configurationModels.test.ts
+++ b/src/vs/workbench/services/configuration/test/common/configurationModels.test.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { StandaloneConfigurationModelParser, Configuration } from 'vs/workbench/services/configuration/common/configurationModels';
-import { ConfigurationModelParser, ConfigurationModel, ConfigurationParseOptions } from 'vs/platform/configuration/common/configurationModels';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
-import { ResourceMap } from 'vs/base/common/map';
-import { WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { URI } from 'vs/base/common/uri';
-import { Workspace } from 'vs/platform/workspace/test/common/testWorkspace';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { NullLogService } from 'vs/platform/log/common/log';
+import { Registry } from '../../../../../platform/registry/common/platform.js';
+import { StandaloneConfigurationModelParser, Configuration } from '../../common/configurationModels.js';
+import { ConfigurationModelParser, ConfigurationModel, ConfigurationParseOptions } from '../../../../../platform/configuration/common/configurationModels.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from '../../../../../platform/configuration/common/configurationRegistry.js';
+import { ResourceMap } from '../../../../../base/common/map.js';
+import { WorkspaceFolder } from '../../../../../platform/workspace/common/workspace.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { Workspace } from '../../../../../platform/workspace/test/common/testWorkspace.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { NullLogService } from '../../../../../platform/log/common/log.js';
 
 suite('FolderSettingsModelParser', () => {
 
diff --git a/src/vs/workbench/services/configuration/test/common/testServices.ts b/src/vs/workbench/services/configuration/test/common/testServices.ts
index 3771f39ba66..61ba62b5134 100644
--- a/src/vs/workbench/services/configuration/test/common/testServices.ts
+++ b/src/vs/workbench/services/configuration/test/common/testServices.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { IJSONEditingService, IJSONValue } from 'vs/workbench/services/configuration/common/jsonEditing';
+import { URI } from '../../../../../base/common/uri.js';
+import { IJSONEditingService, IJSONValue } from '../../common/jsonEditing.js';
 
 export class TestJSONEditingService implements IJSONEditingService {
 	_serviceBrand: any;
diff --git a/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.ts b/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.ts
index a7c716da65d..e8d38a377d1 100644
--- a/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.ts
+++ b/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.ts
@@ -2,25 +2,30 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { Queue } from 'vs/base/common/async';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { Schemas } from 'vs/base/common/network';
-import { IProcessEnvironment } from 'vs/base/common/platform';
-import * as Types from 'vs/base/common/types';
-import { URI as uri } from 'vs/base/common/uri';
-import { ICodeEditor, isCodeEditor, isDiffEditor } from 'vs/editor/browser/editorBrowser';
-import * as nls from 'vs/nls';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { ConfigurationTarget, IConfigurationOverrides, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { IInputOptions, IPickOptions, IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { IWorkspaceContextService, IWorkspaceFolder, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { EditorResourceAccessor, SideBySideEditor } from 'vs/workbench/common/editor';
-import { ConfiguredInput } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
-import { AbstractVariableResolverService } from 'vs/workbench/services/configurationResolver/common/variableResolver';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
+import { Queue } from '../../../../base/common/async.js';
+import { IStringDictionary } from '../../../../base/common/collections.js';
+import { LRUCache } from '../../../../base/common/map.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { IProcessEnvironment } from '../../../../base/common/platform.js';
+import * as Types from '../../../../base/common/types.js';
+import { URI as uri } from '../../../../base/common/uri.js';
+import { ICodeEditor, isCodeEditor, isDiffEditor } from '../../../../editor/browser/editorBrowser.js';
+import * as nls from '../../../../nls.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { ConfigurationTarget, IConfigurationOverrides, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { IInputOptions, IPickOptions, IQuickInputService, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IWorkspaceContextService, IWorkspaceFolder, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
+import { ConfiguredInput } from '../common/configurationResolver.js';
+import { AbstractVariableResolverService } from '../common/variableResolver.js';
+import { IEditorService } from '../../editor/common/editorService.js';
+import { IExtensionService } from '../../extensions/common/extensions.js';
+import { IPathService } from '../../path/common/pathService.js';
+
+const LAST_INPUT_STORAGE_KEY = 'configResolveInputLru';
+const LAST_INPUT_CACHE_SIZE = 5;
 
 export abstract class BaseConfigurationResolverService extends AbstractVariableResolverService {
 
@@ -42,6 +47,7 @@ export abstract class BaseConfigurationResolverService extends AbstractVariableR
 		private readonly labelService: ILabelService,
 		private readonly pathService: IPathService,
 		extensionService: IExtensionService,
+		private readonly storageService: IStorageService,
 	) {
 		super({
 			getFolderUri: (folderName: string): uri | undefined => {
@@ -214,7 +220,7 @@ export abstract class BaseConfigurationResolverService extends AbstractVariableR
 			switch (type) {
 
 				case 'input':
-					result = await this.showUserInput(name, inputs);
+					result = await this.showUserInput(section, name, inputs);
 					break;
 
 				case 'command': {
@@ -282,7 +288,7 @@ export abstract class BaseConfigurationResolverService extends AbstractVariableR
 	 * @param variable Name of the input variable.
 	 * @param inputInfos Information about each possible input variable.
 	 */
-	private showUserInput(variable: string, inputInfos: ConfiguredInput[]): Promise<string | undefined> {
+	private showUserInput(section: string | undefined, variable: string, inputInfos: ConfiguredInput[]): Promise<string | undefined> {
 
 		if (!inputInfos) {
 			return Promise.reject(new Error(nls.localize('inputVariable.noInputSection', "Variable '{0}' must be defined in an '{1}' section of the debug or task configuration.", variable, 'inputs')));
@@ -296,13 +302,17 @@ export abstract class BaseConfigurationResolverService extends AbstractVariableR
 				throw new Error(nls.localize('inputVariable.missingAttribute', "Input variable '{0}' is of type '{1}' and must include '{2}'.", variable, info.type, attrName));
 			};
 
+			const defaultValueMap = this.readInputLru();
+			const defaultValueKey = `${section}.${variable}`;
+			const previousPickedValue = defaultValueMap.get(defaultValueKey);
+
 			switch (info.type) {
 
 				case 'promptString': {
 					if (!Types.isString(info.description)) {
 						missingAttribute('description');
 					}
-					const inputOptions: IInputOptions = { prompt: info.description, ignoreFocusLost: true };
+					const inputOptions: IInputOptions = { prompt: info.description, ignoreFocusLost: true, value: previousPickedValue };
 					if (info.default) {
 						inputOptions.value = info.default;
 					}
@@ -310,6 +320,9 @@ export abstract class BaseConfigurationResolverService extends AbstractVariableR
 						inputOptions.password = info.password;
 					}
 					return this.userInputAccessQueue.queue(() => this.quickInputService.input(inputOptions)).then(resolvedInput => {
+						if (typeof resolvedInput === 'string') {
+							this.storeInputLru(defaultValueMap.set(defaultValueKey, resolvedInput));
+						}
 						return resolvedInput as string;
 					});
 				}
@@ -344,6 +357,8 @@ export abstract class BaseConfigurationResolverService extends AbstractVariableR
 						if (value === info.default) {
 							item.description = nls.localize('inputVariable.defaultInputValue', "(Default)");
 							picks.unshift(item);
+						} else if (!info.default && value === previousPickedValue) {
+							picks.unshift(item);
 						} else {
 							picks.push(item);
 						}
@@ -351,7 +366,9 @@ export abstract class BaseConfigurationResolverService extends AbstractVariableR
 					const pickOptions: IPickOptions<PickStringItem> = { placeHolder: info.description, matchOnDetail: true, ignoreFocusLost: true };
 					return this.userInputAccessQueue.queue(() => this.quickInputService.pick(picks, pickOptions, undefined)).then(resolvedInput => {
 						if (resolvedInput) {
-							return (resolvedInput as PickStringItem).value;
+							const value = (resolvedInput as PickStringItem).value;
+							this.storeInputLru(defaultValueMap.set(defaultValueKey, value));
+							return value;
 						}
 						return undefined;
 					});
@@ -375,4 +392,22 @@ export abstract class BaseConfigurationResolverService extends AbstractVariableR
 		}
 		return Promise.reject(new Error(nls.localize('inputVariable.undefinedVariable', "Undefined input variable '{0}' encountered. Remove or define '{0}' to continue.", variable)));
 	}
+
+	private storeInputLru(lru: LRUCache<string, string>): void {
+		this.storageService.store(LAST_INPUT_STORAGE_KEY, JSON.stringify(lru.toJSON()), StorageScope.WORKSPACE, StorageTarget.MACHINE);
+	}
+
+	private readInputLru(): LRUCache<string, string> {
+		const contents = this.storageService.get(LAST_INPUT_STORAGE_KEY, StorageScope.WORKSPACE);
+		const lru = new LRUCache<string, string>(LAST_INPUT_CACHE_SIZE);
+		try {
+			if (contents) {
+				lru.fromJSON(JSON.parse(contents));
+			}
+		} catch {
+			// ignored
+		}
+
+		return lru;
+	}
 }
diff --git a/src/vs/workbench/services/configurationResolver/browser/configurationResolverService.ts b/src/vs/workbench/services/configurationResolver/browser/configurationResolverService.ts
index 70f5d1cd368..c6f3203c875 100644
--- a/src/vs/workbench/services/configurationResolver/browser/configurationResolverService.ts
+++ b/src/vs/workbench/services/configurationResolver/browser/configurationResolverService.ts
@@ -3,17 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { BaseConfigurationResolverService } from 'vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService';
-import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { BaseConfigurationResolverService } from './baseConfigurationResolverService.js';
+import { IConfigurationResolverService } from '../common/configurationResolver.js';
+import { IEditorService } from '../../editor/common/editorService.js';
+import { IExtensionService } from '../../extensions/common/extensions.js';
+import { IPathService } from '../../path/common/pathService.js';
 
 export class ConfigurationResolverService extends BaseConfigurationResolverService {
 
@@ -26,10 +27,11 @@ export class ConfigurationResolverService extends BaseConfigurationResolverServi
 		@ILabelService labelService: ILabelService,
 		@IPathService pathService: IPathService,
 		@IExtensionService extensionService: IExtensionService,
+		@IStorageService storageService: IStorageService,
 	) {
 		super({ getAppRoot: () => undefined, getExecPath: () => undefined },
 			Promise.resolve(Object.create(null)), editorService, configurationService,
-			commandService, workspaceContextService, quickInputService, labelService, pathService, extensionService);
+			commandService, workspaceContextService, quickInputService, labelService, pathService, extensionService, storageService);
 	}
 }
 
diff --git a/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts b/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts
index 7087026e975..fd63a52e332 100644
--- a/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts
+++ b/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts
@@ -3,11 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IStringDictionary } from 'vs/base/common/collections';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
-import { IProcessEnvironment } from 'vs/base/common/platform';
+import { IStringDictionary } from '../../../../base/common/collections.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
+import { ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
+import { IProcessEnvironment } from '../../../../base/common/platform.js';
+import { ErrorNoTelemetry } from '../../../../base/common/errors.js';
 
 export const IConfigurationResolverService = createDecorator<IConfigurationResolverService>('configurationResolverService');
 
@@ -111,7 +112,7 @@ export enum VariableKind {
 	PathSeparatorAlias = '/'
 }
 
-export class VariableError extends Error {
+export class VariableError extends ErrorNoTelemetry {
 	constructor(public readonly variable: VariableKind, message?: string) {
 		super(message);
 	}
diff --git a/src/vs/workbench/services/configurationResolver/common/configurationResolverSchema.ts b/src/vs/workbench/services/configurationResolver/common/configurationResolverSchema.ts
index 2fceba9e4ac..90db04d040e 100644
--- a/src/vs/workbench/services/configurationResolver/common/configurationResolverSchema.ts
+++ b/src/vs/workbench/services/configurationResolver/common/configurationResolverSchema.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
+import * as nls from '../../../../nls.js';
+import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
 
 const idDescription = nls.localize('JsonSchema.input.id', "The input's id is used to associate an input with a variable of the form ${input:id}.");
 const typeDescription = nls.localize('JsonSchema.input.type', "The type of user input prompt to use.");
diff --git a/src/vs/workbench/services/configurationResolver/common/configurationResolverUtils.ts b/src/vs/workbench/services/configurationResolver/common/configurationResolverUtils.ts
index cb0d1eeb3f0..3b811ea020d 100644
--- a/src/vs/workbench/services/configurationResolver/common/configurationResolverUtils.ts
+++ b/src/vs/workbench/services/configurationResolver/common/configurationResolverUtils.ts
@@ -2,8 +2,8 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import * as nls from 'vs/nls';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
+import * as nls from '../../../../nls.js';
+import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
 
 export function applyDeprecatedVariableMessage(schema: IJSONSchema) {
 	schema.pattern = schema.pattern || '^(?!.*\\$\\{(env|config|command)\\.)';
diff --git a/src/vs/workbench/services/configurationResolver/common/variableResolver.ts b/src/vs/workbench/services/configurationResolver/common/variableResolver.ts
index c841b6fcd49..ed21fcd79b2 100644
--- a/src/vs/workbench/services/configurationResolver/common/variableResolver.ts
+++ b/src/vs/workbench/services/configurationResolver/common/variableResolver.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as paths from 'vs/base/common/path';
-import * as process from 'vs/base/common/process';
-import * as types from 'vs/base/common/types';
-import * as objects from 'vs/base/common/objects';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { IProcessEnvironment, isWindows, isMacintosh, isLinux } from 'vs/base/common/platform';
-import { normalizeDriveLetter } from 'vs/base/common/labels';
-import { localize } from 'vs/nls';
-import { URI as uri } from 'vs/base/common/uri';
-import { IConfigurationResolverService, VariableError, VariableKind } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
-import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { replaceAsync } from 'vs/base/common/strings';
+import * as paths from '../../../../base/common/path.js';
+import * as process from '../../../../base/common/process.js';
+import * as types from '../../../../base/common/types.js';
+import * as objects from '../../../../base/common/objects.js';
+import { IStringDictionary } from '../../../../base/common/collections.js';
+import { IProcessEnvironment, isWindows, isMacintosh, isLinux } from '../../../../base/common/platform.js';
+import { normalizeDriveLetter } from '../../../../base/common/labels.js';
+import { localize } from '../../../../nls.js';
+import { URI as uri } from '../../../../base/common/uri.js';
+import { IConfigurationResolverService, VariableError, VariableKind } from './configurationResolver.js';
+import { IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { replaceAsync } from '../../../../base/common/strings.js';
 
 interface IVariableResolveContext {
 	getFolderUri(folderName: string): uri | undefined;
diff --git a/src/vs/workbench/services/configurationResolver/electron-sandbox/configurationResolverService.ts b/src/vs/workbench/services/configurationResolver/electron-sandbox/configurationResolverService.ts
index bb1a8751e6d..0e228ecb9f6 100644
--- a/src/vs/workbench/services/configurationResolver/electron-sandbox/configurationResolverService.ts
+++ b/src/vs/workbench/services/configurationResolver/electron-sandbox/configurationResolverService.ts
@@ -3,19 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { BaseConfigurationResolverService } from 'vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { IShellEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/shellEnvironmentService';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { INativeWorkbenchEnvironmentService } from '../../environment/electron-sandbox/environmentService.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { IEditorService } from '../../editor/common/editorService.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { IConfigurationResolverService } from '../common/configurationResolver.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { BaseConfigurationResolverService } from '../browser/baseConfigurationResolverService.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { IShellEnvironmentService } from '../../environment/electron-sandbox/shellEnvironmentService.js';
+import { IPathService } from '../../path/common/pathService.js';
+import { IExtensionService } from '../../extensions/common/extensions.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
 
 export class ConfigurationResolverService extends BaseConfigurationResolverService {
 
@@ -30,6 +31,7 @@ export class ConfigurationResolverService extends BaseConfigurationResolverServi
 		@IShellEnvironmentService shellEnvironmentService: IShellEnvironmentService,
 		@IPathService pathService: IPathService,
 		@IExtensionService extensionService: IExtensionService,
+		@IStorageService storageService: IStorageService,
 	) {
 		super({
 			getAppRoot: (): string | undefined => {
@@ -39,7 +41,7 @@ export class ConfigurationResolverService extends BaseConfigurationResolverServi
 				return environmentService.execPath;
 			},
 		}, shellEnvironmentService.getShellEnv(), editorService, configurationService, commandService,
-			workspaceContextService, quickInputService, labelService, pathService, extensionService);
+			workspaceContextService, quickInputService, labelService, pathService, extensionService, storageService);
 	}
 }
 
diff --git a/src/vs/workbench/services/configurationResolver/test/electron-sandbox/configurationResolverService.test.ts b/src/vs/workbench/services/configurationResolver/test/electron-sandbox/configurationResolverService.test.ts
index c3636300a65..9140cb41d9e 100644
--- a/src/vs/workbench/services/configurationResolver/test/electron-sandbox/configurationResolverService.test.ts
+++ b/src/vs/workbench/services/configurationResolver/test/electron-sandbox/configurationResolverService.test.ts
@@ -5,29 +5,29 @@
 
 import assert from 'assert';
 import { stub } from 'sinon';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { IPath, normalize } from 'vs/base/common/path';
-import * as platform from 'vs/base/common/platform';
-import { isObject } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Selection } from 'vs/editor/common/core/selection';
-import { EditorType } from 'vs/editor/common/editorCommon';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { IFormatterChangeEvent, ILabelService, ResourceLabelFormatter, Verbosity } from 'vs/platform/label/common/label';
-import { IWorkspace, IWorkspaceFolder, IWorkspaceIdentifier, Workspace } from 'vs/platform/workspace/common/workspace';
-import { testWorkspace } from 'vs/platform/workspace/test/common/testWorkspace';
-import { BaseConfigurationResolverService } from 'vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService';
-import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { TestEditorService, TestQuickInputService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { TestContextService, TestExtensionService } from 'vs/workbench/test/common/workbenchTestServices';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { IPath, normalize } from '../../../../../base/common/path.js';
+import * as platform from '../../../../../base/common/platform.js';
+import { isObject } from '../../../../../base/common/types.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Selection } from '../../../../../editor/common/core/selection.js';
+import { EditorType } from '../../../../../editor/common/editorCommon.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { IExtensionDescription } from '../../../../../platform/extensions/common/extensions.js';
+import { IFormatterChangeEvent, ILabelService, ResourceLabelFormatter, Verbosity } from '../../../../../platform/label/common/label.js';
+import { IWorkspace, IWorkspaceFolder, IWorkspaceIdentifier, Workspace } from '../../../../../platform/workspace/common/workspace.js';
+import { testWorkspace } from '../../../../../platform/workspace/test/common/testWorkspace.js';
+import { BaseConfigurationResolverService } from '../../browser/baseConfigurationResolverService.js';
+import { IConfigurationResolverService } from '../../common/configurationResolver.js';
+import { IExtensionService } from '../../../extensions/common/extensions.js';
+import { IPathService } from '../../../path/common/pathService.js';
+import { TestEditorService, TestQuickInputService } from '../../../../test/browser/workbenchTestServices.js';
+import { TestContextService, TestExtensionService, TestStorageService } from '../../../../test/common/workbenchTestServices.js';
 
 const mockLineNumber = 10;
 class TestEditorServiceWithActiveEditor extends TestEditorService {
@@ -84,7 +84,7 @@ suite('Configuration Resolver Service', () => {
 		extensionService = new TestExtensionService();
 		containingWorkspace = testWorkspace(URI.parse('file:///VSCode/workspaceLocation'));
 		workspace = containingWorkspace.folders[0];
-		configurationResolverService = new TestConfigurationResolverService(nullContext, Promise.resolve(envVariables), editorService, new MockInputsConfigurationService(), mockCommandService, new TestContextService(containingWorkspace), quickInputService, labelService, pathService, extensionService);
+		configurationResolverService = new TestConfigurationResolverService(nullContext, Promise.resolve(envVariables), editorService, new MockInputsConfigurationService(), mockCommandService, new TestContextService(containingWorkspace), quickInputService, labelService, pathService, extensionService, disposables.add(new TestStorageService()));
 	});
 
 	teardown(() => {
@@ -230,7 +230,7 @@ suite('Configuration Resolver Service', () => {
 			}
 		});
 
-		const service = new TestConfigurationResolverService(nullContext, Promise.resolve(envVariables), disposables.add(new TestEditorServiceWithActiveEditor()), configurationService, mockCommandService, new TestContextService(), quickInputService, labelService, pathService, extensionService);
+		const service = new TestConfigurationResolverService(nullContext, Promise.resolve(envVariables), disposables.add(new TestEditorServiceWithActiveEditor()), configurationService, mockCommandService, new TestContextService(), quickInputService, labelService, pathService, extensionService, disposables.add(new TestStorageService()));
 		assert.strictEqual(await service.resolveAsync(workspace, 'abc ${config:editor.fontFamily} xyz'), 'abc foo xyz');
 	});
 
@@ -241,7 +241,7 @@ suite('Configuration Resolver Service', () => {
 			}
 		});
 
-		const service = new TestConfigurationResolverService(nullContext, Promise.resolve(envVariables), disposables.add(new TestEditorServiceWithActiveEditor()), configurationService, mockCommandService, new TestContextService(), quickInputService, labelService, pathService, extensionService);
+		const service = new TestConfigurationResolverService(nullContext, Promise.resolve(envVariables), disposables.add(new TestEditorServiceWithActiveEditor()), configurationService, mockCommandService, new TestContextService(), quickInputService, labelService, pathService, extensionService, disposables.add(new TestStorageService()));
 		assert.strictEqual(await service.resolveAsync(undefined, 'abc ${config:editor.fontFamily} xyz'), 'abc foo xyz');
 	});
 
@@ -257,7 +257,7 @@ suite('Configuration Resolver Service', () => {
 			}
 		});
 
-		const service = new TestConfigurationResolverService(nullContext, Promise.resolve(envVariables), disposables.add(new TestEditorServiceWithActiveEditor()), configurationService, mockCommandService, new TestContextService(), quickInputService, labelService, pathService, extensionService);
+		const service = new TestConfigurationResolverService(nullContext, Promise.resolve(envVariables), disposables.add(new TestEditorServiceWithActiveEditor()), configurationService, mockCommandService, new TestContextService(), quickInputService, labelService, pathService, extensionService, disposables.add(new TestStorageService()));
 		assert.strictEqual(await service.resolveAsync(workspace, 'abc ${config:editor.fontFamily} ${config:terminal.integrated.fontFamily} xyz'), 'abc foo bar xyz');
 	});
 
@@ -273,7 +273,7 @@ suite('Configuration Resolver Service', () => {
 			}
 		});
 
-		const service = new TestConfigurationResolverService(nullContext, Promise.resolve(envVariables), disposables.add(new TestEditorServiceWithActiveEditor()), configurationService, mockCommandService, new TestContextService(), quickInputService, labelService, pathService, extensionService);
+		const service = new TestConfigurationResolverService(nullContext, Promise.resolve(envVariables), disposables.add(new TestEditorServiceWithActiveEditor()), configurationService, mockCommandService, new TestContextService(), quickInputService, labelService, pathService, extensionService, disposables.add(new TestStorageService()));
 		if (platform.isWindows) {
 			assert.strictEqual(await service.resolveAsync(workspace, 'abc ${config:editor.fontFamily} ${workspaceFolder} ${env:key1} xyz'), 'abc foo \\VSCode\\workspaceLocation Value for key1 xyz');
 		} else {
@@ -293,7 +293,7 @@ suite('Configuration Resolver Service', () => {
 			}
 		});
 
-		const service = new TestConfigurationResolverService(nullContext, Promise.resolve(envVariables), disposables.add(new TestEditorServiceWithActiveEditor()), configurationService, mockCommandService, new TestContextService(), quickInputService, labelService, pathService, extensionService);
+		const service = new TestConfigurationResolverService(nullContext, Promise.resolve(envVariables), disposables.add(new TestEditorServiceWithActiveEditor()), configurationService, mockCommandService, new TestContextService(), quickInputService, labelService, pathService, extensionService, disposables.add(new TestStorageService()));
 		if (platform.isWindows) {
 			assert.strictEqual(await service.resolveAsync(workspace, '${config:editor.fontFamily} ${config:terminal.integrated.fontFamily} ${workspaceFolder} - ${workspaceFolder} ${env:key1} - ${env:key2}'), 'foo bar \\VSCode\\workspaceLocation - \\VSCode\\workspaceLocation Value for key1 - Value for key2');
 		} else {
@@ -326,7 +326,7 @@ suite('Configuration Resolver Service', () => {
 			}
 		});
 
-		const service = new TestConfigurationResolverService(nullContext, Promise.resolve(envVariables), disposables.add(new TestEditorServiceWithActiveEditor()), configurationService, mockCommandService, new TestContextService(), quickInputService, labelService, pathService, extensionService);
+		const service = new TestConfigurationResolverService(nullContext, Promise.resolve(envVariables), disposables.add(new TestEditorServiceWithActiveEditor()), configurationService, mockCommandService, new TestContextService(), quickInputService, labelService, pathService, extensionService, disposables.add(new TestStorageService()));
 		assert.strictEqual(await service.resolveAsync(workspace, 'abc ${config:editor.fontFamily} ${config:editor.lineNumbers} ${config:editor.insertSpaces} xyz'), 'abc foo 123 false xyz');
 	});
 
@@ -335,7 +335,7 @@ suite('Configuration Resolver Service', () => {
 			editor: {}
 		});
 
-		const service = new TestConfigurationResolverService(nullContext, Promise.resolve(envVariables), disposables.add(new TestEditorServiceWithActiveEditor()), configurationService, mockCommandService, new TestContextService(), quickInputService, labelService, pathService, extensionService);
+		const service = new TestConfigurationResolverService(nullContext, Promise.resolve(envVariables), disposables.add(new TestEditorServiceWithActiveEditor()), configurationService, mockCommandService, new TestContextService(), quickInputService, labelService, pathService, extensionService, disposables.add(new TestStorageService()));
 		assert.strictEqual(await service.resolveAsync(workspace, 'abc ${unknownVariable} xyz'), 'abc ${unknownVariable} xyz');
 		assert.strictEqual(await service.resolveAsync(workspace, 'abc ${env:unknownVariable} xyz'), 'abc  xyz');
 	});
@@ -347,7 +347,7 @@ suite('Configuration Resolver Service', () => {
 			}
 		});
 
-		const service = new TestConfigurationResolverService(nullContext, Promise.resolve(envVariables), disposables.add(new TestEditorServiceWithActiveEditor()), configurationService, mockCommandService, new TestContextService(), quickInputService, labelService, pathService, extensionService);
+		const service = new TestConfigurationResolverService(nullContext, Promise.resolve(envVariables), disposables.add(new TestEditorServiceWithActiveEditor()), configurationService, mockCommandService, new TestContextService(), quickInputService, labelService, pathService, extensionService, disposables.add(new TestStorageService()));
 
 		assert.rejects(async () => await service.resolveAsync(workspace, 'abc ${env} xyz'));
 		assert.rejects(async () => await service.resolveAsync(workspace, 'abc ${env:} xyz'));
diff --git a/src/vs/workbench/services/contextmenu/electron-sandbox/contextmenuService.ts b/src/vs/workbench/services/contextmenu/electron-sandbox/contextmenuService.ts
index d2bf1284bad..c3328242ee5 100644
--- a/src/vs/workbench/services/contextmenu/electron-sandbox/contextmenuService.ts
+++ b/src/vs/workbench/services/contextmenu/electron-sandbox/contextmenuService.ts
@@ -3,30 +3,30 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IAction, IActionRunner, ActionRunner, WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification, Separator, SubmenuAction } from 'vs/base/common/actions';
-import * as dom from 'vs/base/browser/dom';
-import { IContextMenuMenuDelegate, IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { getZoomFactor } from 'vs/base/browser/browser';
-import { unmnemonicLabel } from 'vs/base/common/labels';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IContextMenuDelegate, IContextMenuEvent } from 'vs/base/browser/contextmenu';
-import { createSingleCallFunction } from 'vs/base/common/functional';
-import { IContextMenuItem } from 'vs/base/parts/contextmenu/common/contextmenu';
-import { popup } from 'vs/base/parts/contextmenu/electron-sandbox/contextmenu';
-import { hasNativeTitlebar } from 'vs/platform/window/common/window';
-import { isMacintosh, isWindows } from 'vs/base/common/platform';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextMenuMenuDelegate, ContextMenuService as HTMLContextMenuService } from 'vs/platform/contextview/browser/contextMenuService';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { stripIcons } from 'vs/base/common/iconLabels';
-import { coalesce } from 'vs/base/common/arrays';
-import { Event, Emitter } from 'vs/base/common/event';
-import { AnchorAlignment, AnchorAxisAlignment, isAnchor } from 'vs/base/browser/ui/contextview/contextview';
-import { IMenuService } from 'vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { Disposable } from 'vs/base/common/lifecycle';
+import { IAction, IActionRunner, ActionRunner, WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification, Separator, SubmenuAction } from '../../../../base/common/actions.js';
+import * as dom from '../../../../base/browser/dom.js';
+import { IContextMenuMenuDelegate, IContextMenuService, IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { getZoomFactor } from '../../../../base/browser/browser.js';
+import { unmnemonicLabel } from '../../../../base/common/labels.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IContextMenuDelegate, IContextMenuEvent } from '../../../../base/browser/contextmenu.js';
+import { createSingleCallFunction } from '../../../../base/common/functional.js';
+import { IContextMenuItem } from '../../../../base/parts/contextmenu/common/contextmenu.js';
+import { popup } from '../../../../base/parts/contextmenu/electron-sandbox/contextmenu.js';
+import { hasNativeTitlebar } from '../../../../platform/window/common/window.js';
+import { isMacintosh, isWindows } from '../../../../base/common/platform.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ContextMenuMenuDelegate, ContextMenuService as HTMLContextMenuService } from '../../../../platform/contextview/browser/contextMenuService.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { stripIcons } from '../../../../base/common/iconLabels.js';
+import { coalesce } from '../../../../base/common/arrays.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { AnchorAlignment, AnchorAxisAlignment, isAnchor } from '../../../../base/browser/ui/contextview/contextview.js';
+import { IMenuService } from '../../../../platform/actions/common/actions.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
 
 export class ContextMenuService implements IContextMenuService {
 
diff --git a/src/vs/workbench/services/decorations/browser/decorationsService.ts b/src/vs/workbench/services/decorations/browser/decorationsService.ts
index 7453c76c816..853e83cf46c 100644
--- a/src/vs/workbench/services/decorations/browser/decorationsService.ts
+++ b/src/vs/workbench/services/decorations/browser/decorationsService.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { Emitter, DebounceEmitter, Event } from 'vs/base/common/event';
-import { IDecorationsService, IDecoration, IResourceDecorationChangeEvent, IDecorationsProvider, IDecorationData } from '../common/decorations';
-import { TernarySearchTree } from 'vs/base/common/ternarySearchTree';
-import { IDisposable, toDisposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { isThenable } from 'vs/base/common/async';
-import { LinkedList } from 'vs/base/common/linkedList';
-import { createStyleSheet, createCSSRule, removeCSSRulesContainingSelector, asCSSPropertyValue } from 'vs/base/browser/dom';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { isFalsyOrWhitespace } from 'vs/base/common/strings';
-import { localize } from 'vs/nls';
-import { isCancellationError } from 'vs/base/common/errors';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { hash } from 'vs/base/common/hash';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { asArray, distinct } from 'vs/base/common/arrays';
-import { asCssVariable, ColorIdentifier } from 'vs/platform/theme/common/colorRegistry';
-import { getIconRegistry } from 'vs/platform/theme/common/iconRegistry';
+import { URI } from '../../../../base/common/uri.js';
+import { Emitter, DebounceEmitter, Event } from '../../../../base/common/event.js';
+import { IDecorationsService, IDecoration, IResourceDecorationChangeEvent, IDecorationsProvider, IDecorationData } from '../common/decorations.js';
+import { TernarySearchTree } from '../../../../base/common/ternarySearchTree.js';
+import { IDisposable, toDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { isThenable } from '../../../../base/common/async.js';
+import { LinkedList } from '../../../../base/common/linkedList.js';
+import { createStyleSheet, createCSSRule, removeCSSRulesContainingSelector, asCSSPropertyValue } from '../../../../base/browser/dom.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { isFalsyOrWhitespace } from '../../../../base/common/strings.js';
+import { localize } from '../../../../nls.js';
+import { isCancellationError } from '../../../../base/common/errors.js';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { hash } from '../../../../base/common/hash.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { asArray, distinct } from '../../../../base/common/arrays.js';
+import { asCssVariable, ColorIdentifier } from '../../../../platform/theme/common/colorRegistry.js';
+import { getIconRegistry } from '../../../../platform/theme/common/iconRegistry.js';
 
 class DecorationRule {
 
diff --git a/src/vs/workbench/services/decorations/common/decorations.ts b/src/vs/workbench/services/decorations/common/decorations.ts
index 5e8cba03661..6ffd62cd03e 100644
--- a/src/vs/workbench/services/decorations/common/decorations.ts
+++ b/src/vs/workbench/services/decorations/common/decorations.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { URI } from 'vs/base/common/uri';
-import { Event } from 'vs/base/common/event';
-import { ColorIdentifier } from 'vs/platform/theme/common/colorRegistry';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { ThemeIcon } from 'vs/base/common/themables';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Event } from '../../../../base/common/event.js';
+import { ColorIdentifier } from '../../../../platform/theme/common/colorRegistry.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
 
 export const IDecorationsService = createDecorator<IDecorationsService>('IFileDecorationsService');
 
diff --git a/src/vs/workbench/services/decorations/test/browser/decorationsService.test.ts b/src/vs/workbench/services/decorations/test/browser/decorationsService.test.ts
index e3e9fbb209e..8786cafe627 100644
--- a/src/vs/workbench/services/decorations/test/browser/decorationsService.test.ts
+++ b/src/vs/workbench/services/decorations/test/browser/decorationsService.test.ts
@@ -4,17 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DecorationsService } from 'vs/workbench/services/decorations/browser/decorationsService';
-import { IDecorationsProvider, IDecorationData } from 'vs/workbench/services/decorations/common/decorations';
-import { URI } from 'vs/base/common/uri';
-import { Event, Emitter } from 'vs/base/common/event';
-import * as resources from 'vs/base/common/resources';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { mock } from 'vs/base/test/common/mock';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { DecorationsService } from '../../browser/decorationsService.js';
+import { IDecorationsProvider, IDecorationData } from '../../common/decorations.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { Event, Emitter } from '../../../../../base/common/event.js';
+import * as resources from '../../../../../base/common/resources.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { mock } from '../../../../../base/test/common/mock.js';
+import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.js';
+import { TestThemeService } from '../../../../../platform/theme/test/common/testThemeService.js';
+import { runWithFakedTimers } from '../../../../../base/test/common/timeTravelScheduler.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('DecorationsService', function () {
 
diff --git a/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts b/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts
index c6a2df09c76..c7e890fce1d 100644
--- a/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts
+++ b/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts
@@ -3,35 +3,35 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { IWindowOpenable, isWorkspaceToOpen, isFileToOpen } from 'vs/platform/window/common/window';
-import { IPickAndOpenOptions, ISaveDialogOptions, IOpenDialogOptions, FileFilter, IFileDialogService, IDialogService, ConfirmResult, getFileNamesMessage } from 'vs/platform/dialogs/common/dialogs';
-import { isSavedWorkspace, isTemporaryWorkspace, IWorkspaceContextService, WorkbenchState, WORKSPACE_EXTENSION } from 'vs/platform/workspace/common/workspace';
-import { IHistoryService } from 'vs/workbench/services/history/common/history';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { URI } from 'vs/base/common/uri';
-import * as resources from 'vs/base/common/resources';
-import { isAbsolute as localPathIsAbsolute, normalize as localPathNormalize } from 'vs/base/common/path';
-import { IInstantiationService, } from 'vs/platform/instantiation/common/instantiation';
-import { ISimpleFileDialog, SimpleFileDialog } from 'vs/workbench/services/dialogs/browser/simpleFileDialog';
-import { IWorkspacesService } from 'vs/platform/workspaces/common/workspaces';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import Severity from 'vs/base/common/severity';
-import { coalesce, distinct } from 'vs/base/common/arrays';
-import { trim } from 'vs/base/common/strings';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { Schemas } from 'vs/base/common/network';
-import { PLAINTEXT_EXTENSION } from 'vs/editor/common/languages/modesRegistry';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { EditorOpenSource } from 'vs/platform/editor/common/editor';
-import { ILogService } from 'vs/platform/log/common/log';
+import * as nls from '../../../../nls.js';
+import { IWindowOpenable, isWorkspaceToOpen, isFileToOpen } from '../../../../platform/window/common/window.js';
+import { IPickAndOpenOptions, ISaveDialogOptions, IOpenDialogOptions, FileFilter, IFileDialogService, IDialogService, ConfirmResult, getFileNamesMessage } from '../../../../platform/dialogs/common/dialogs.js';
+import { isSavedWorkspace, isTemporaryWorkspace, IWorkspaceContextService, WorkbenchState, WORKSPACE_EXTENSION } from '../../../../platform/workspace/common/workspace.js';
+import { IHistoryService } from '../../history/common/history.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { URI } from '../../../../base/common/uri.js';
+import * as resources from '../../../../base/common/resources.js';
+import { isAbsolute as localPathIsAbsolute, normalize as localPathNormalize } from '../../../../base/common/path.js';
+import { IInstantiationService, } from '../../../../platform/instantiation/common/instantiation.js';
+import { ISimpleFileDialog, SimpleFileDialog } from './simpleFileDialog.js';
+import { IWorkspacesService } from '../../../../platform/workspaces/common/workspaces.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IHostService } from '../../host/browser/host.js';
+import Severity from '../../../../base/common/severity.js';
+import { coalesce, distinct } from '../../../../base/common/arrays.js';
+import { trim } from '../../../../base/common/strings.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { IPathService } from '../../path/common/pathService.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { PLAINTEXT_EXTENSION } from '../../../../editor/common/languages/modesRegistry.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { IEditorService } from '../../editor/common/editorService.js';
+import { EditorOpenSource } from '../../../../platform/editor/common/editor.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
 
 export abstract class AbstractFileDialogService implements IFileDialogService {
 
diff --git a/src/vs/workbench/services/dialogs/browser/fileDialogService.ts b/src/vs/workbench/services/dialogs/browser/fileDialogService.ts
index de6a4ad8227..70d9dc6f979 100644
--- a/src/vs/workbench/services/dialogs/browser/fileDialogService.ts
+++ b/src/vs/workbench/services/dialogs/browser/fileDialogService.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IPickAndOpenOptions, ISaveDialogOptions, IOpenDialogOptions, IFileDialogService, FileFilter, IPromptButton } from 'vs/platform/dialogs/common/dialogs';
-import { URI } from 'vs/base/common/uri';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { AbstractFileDialogService } from 'vs/workbench/services/dialogs/browser/abstractFileDialogService';
-import { Schemas } from 'vs/base/common/network';
-import { memoize } from 'vs/base/common/decorators';
-import { HTMLFileSystemProvider } from 'vs/platform/files/browser/htmlFileSystemProvider';
-import { localize } from 'vs/nls';
-import { getMediaOrTextMime } from 'vs/base/common/mime';
-import { basename } from 'vs/base/common/resources';
-import { getActiveWindow, triggerDownload, triggerUpload } from 'vs/base/browser/dom';
-import Severity from 'vs/base/common/severity';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { extractFileListData } from 'vs/platform/dnd/browser/dnd';
-import { Iterable } from 'vs/base/common/iterator';
-import { WebFileSystemAccess } from 'vs/platform/files/browser/webFileSystemAccess';
-import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget';
+import { IPickAndOpenOptions, ISaveDialogOptions, IOpenDialogOptions, IFileDialogService, FileFilter, IPromptButton } from '../../../../platform/dialogs/common/dialogs.js';
+import { URI } from '../../../../base/common/uri.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { AbstractFileDialogService } from './abstractFileDialogService.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { memoize } from '../../../../base/common/decorators.js';
+import { HTMLFileSystemProvider } from '../../../../platform/files/browser/htmlFileSystemProvider.js';
+import { localize } from '../../../../nls.js';
+import { getMediaOrTextMime } from '../../../../base/common/mime.js';
+import { basename } from '../../../../base/common/resources.js';
+import { getActiveWindow, triggerDownload, triggerUpload } from '../../../../base/browser/dom.js';
+import Severity from '../../../../base/common/severity.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { extractFileListData } from '../../../../platform/dnd/browser/dnd.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { WebFileSystemAccess } from '../../../../platform/files/browser/webFileSystemAccess.js';
+import { EmbeddedCodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/embeddedCodeEditorWidget.js';
 
 export class FileDialogService extends AbstractFileDialogService implements IFileDialogService {
 
diff --git a/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts b/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
index 5f3b9cbda7d..843d9ed0a0c 100644
--- a/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
+++ b/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
@@ -3,39 +3,39 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import * as resources from 'vs/base/common/resources';
-import * as objects from 'vs/base/common/objects';
-import { IFileService, IFileStat, FileKind, IFileStatWithPartialMetadata } from 'vs/platform/files/common/files';
-import { IQuickInputService, IQuickPickItem, IQuickPick, ItemActivation } from 'vs/platform/quickinput/common/quickInput';
-import { URI } from 'vs/base/common/uri';
-import { isWindows, OperatingSystem } from 'vs/base/common/platform';
-import { ISaveDialogOptions, IOpenDialogOptions, IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { getIconClasses } from 'vs/editor/common/services/getIconClasses';
-import { Schemas } from 'vs/base/common/network';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { IContextKeyService, IContextKey, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { equalsIgnoreCase, format, startsWithIgnoreCase } from 'vs/base/common/strings';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IRemoteAgentEnvironment } from 'vs/platform/remote/common/remoteAgentEnvironment';
-import { isValidBasename } from 'vs/base/common/extpath';
-import { Emitter } from 'vs/base/common/event';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { createCancelablePromise, CancelablePromise } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { ICommandHandler } from 'vs/platform/commands/common/commands';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { normalizeDriveLetter } from 'vs/base/common/labels';
-import { SaveReason } from 'vs/workbench/common/editor';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { getActiveDocument } from 'vs/base/browser/dom';
+import * as nls from '../../../../nls.js';
+import * as resources from '../../../../base/common/resources.js';
+import * as objects from '../../../../base/common/objects.js';
+import { IFileService, IFileStat, FileKind, IFileStatWithPartialMetadata } from '../../../../platform/files/common/files.js';
+import { IQuickInputService, IQuickPickItem, IQuickPick, ItemActivation } from '../../../../platform/quickinput/common/quickInput.js';
+import { URI } from '../../../../base/common/uri.js';
+import { isWindows, OperatingSystem } from '../../../../base/common/platform.js';
+import { ISaveDialogOptions, IOpenDialogOptions, IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { getIconClasses } from '../../../../editor/common/services/getIconClasses.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { IRemoteAgentService } from '../../remote/common/remoteAgentService.js';
+import { IContextKeyService, IContextKey, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { equalsIgnoreCase, format, startsWithIgnoreCase } from '../../../../base/common/strings.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IRemoteAgentEnvironment } from '../../../../platform/remote/common/remoteAgentEnvironment.js';
+import { isValidBasename } from '../../../../base/common/extpath.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import { createCancelablePromise, CancelablePromise } from '../../../../base/common/async.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { ICommandHandler } from '../../../../platform/commands/common/commands.js';
+import { IEditorService } from '../../editor/common/editorService.js';
+import { normalizeDriveLetter } from '../../../../base/common/labels.js';
+import { SaveReason } from '../../../common/editor.js';
+import { IPathService } from '../../path/common/pathService.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { getActiveDocument } from '../../../../base/browser/dom.js';
 
 export namespace OpenLocalFileCommand {
 	export const ID = 'workbench.action.files.openLocalFile';
@@ -101,12 +101,12 @@ enum UpdateResult {
 
 export const RemoteFileDialogContext = new RawContextKey<boolean>('remoteFileDialogVisible', false);
 
-export interface ISimpleFileDialog {
+export interface ISimpleFileDialog extends IDisposable {
 	showOpenDialog(options: IOpenDialogOptions): Promise<URI | undefined>;
 	showSaveDialog(options: ISaveDialogOptions): Promise<URI | undefined>;
 }
 
-export class SimpleFileDialog implements ISimpleFileDialog {
+export class SimpleFileDialog extends Disposable implements ISimpleFileDialog {
 	private options!: IOpenDialogOptions;
 	private currentFolder!: URI;
 	private filePickBox!: IQuickPick<FileQuickPickItem>;
@@ -127,13 +127,9 @@ export class SimpleFileDialog implements ISimpleFileDialog {
 	private badPath: string | undefined;
 	private remoteAgentEnvironment: IRemoteAgentEnvironment | null | undefined;
 	private separator: string = '/';
-	private readonly onBusyChangeEmitter = new Emitter<boolean>();
+	private readonly onBusyChangeEmitter = this._register(new Emitter<boolean>());
 	private updatingPromise: CancelablePromise<boolean> | undefined;
 
-	protected disposables: IDisposable[] = [
-		this.onBusyChangeEmitter
-	];
-
 	constructor(
 		@IFileService private readonly fileService: IFileService,
 		@IQuickInputService private readonly quickInputService: IQuickInputService,
@@ -150,6 +146,7 @@ export class SimpleFileDialog implements ISimpleFileDialog {
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IAccessibilityService private readonly accessibilityService: IAccessibilityService
 	) {
+		super();
 		this.remoteAuthority = this.environmentService.remoteAuthority;
 		this.contextKey = RemoteFileDialogContext.bindTo(contextKeyService);
 		this.scheme = this.pathService.defaultUriScheme;
@@ -280,7 +277,7 @@ export class SimpleFileDialog implements ISimpleFileDialog {
 		}
 
 		return new Promise<URI | undefined>((resolve) => {
-			this.filePickBox = this.quickInputService.createQuickPick<FileQuickPickItem>();
+			this.filePickBox = this._register(this.quickInputService.createQuickPick<FileQuickPickItem>());
 			this.busy = true;
 			this.filePickBox.matchOnLabel = false;
 			this.filePickBox.sortByLabel = false;
@@ -314,19 +311,18 @@ export class SimpleFileDialog implements ISimpleFileDialog {
 			this.filePickBox.value = this.pathFromUri(this.currentFolder, true);
 			this.filePickBox.valueSelection = [this.filePickBox.value.length, this.filePickBox.value.length];
 
-			function doResolve(dialog: SimpleFileDialog, uri: URI | undefined) {
+			const doResolve = (uri: URI | undefined) => {
 				if (uri) {
-					uri = resources.addTrailingPathSeparator(uri, dialog.separator); // Ensures that c: is c:/ since this comes from user input and can be incorrect.
+					uri = resources.addTrailingPathSeparator(uri, this.separator); // Ensures that c: is c:/ since this comes from user input and can be incorrect.
 					// To be consistent, we should never have a trailing path separator on directories (or anything else). Will not remove from c:/.
 					uri = resources.removeTrailingPathSeparator(uri);
 				}
 				resolve(uri);
-				dialog.contextKey.set(false);
-				dialog.filePickBox.dispose();
-				dispose(dialog.disposables);
-			}
+				this.contextKey.set(false);
+				this.dispose();
+			};
 
-			this.filePickBox.onDidCustom(() => {
+			this._register(this.filePickBox.onDidCustom(() => {
 				if (isAcceptHandled || this.busy) {
 					return;
 				}
@@ -339,21 +335,21 @@ export class SimpleFileDialog implements ISimpleFileDialog {
 				this.filePickBox.hide();
 				if (isSave) {
 					return this.fileDialogService.showSaveDialog(this.options).then(result => {
-						doResolve(this, result);
+						doResolve(result);
 					});
 				} else {
 					return this.fileDialogService.showOpenDialog(this.options).then(result => {
-						doResolve(this, result ? result[0] : undefined);
+						doResolve(result ? result[0] : undefined);
 					});
 				}
-			});
+			}));
 
-			function handleAccept(dialog: SimpleFileDialog) {
-				if (dialog.busy) {
+			const handleAccept = () => {
+				if (this.busy) {
 					// Save the accept until the file picker is not busy.
-					dialog.onBusyChangeEmitter.event((busy: boolean) => {
+					this.onBusyChangeEmitter.event((busy: boolean) => {
 						if (!busy) {
-							handleAccept(dialog);
+							handleAccept();
 						}
 					});
 					return;
@@ -363,24 +359,24 @@ export class SimpleFileDialog implements ISimpleFileDialog {
 
 				isAcceptHandled = true;
 				isResolving++;
-				dialog.onDidAccept().then(resolveValue => {
+				this.onDidAccept().then(resolveValue => {
 					if (resolveValue) {
-						dialog.filePickBox.hide();
-						doResolve(dialog, resolveValue);
-					} else if (dialog.hidden) {
-						doResolve(dialog, undefined);
+						this.filePickBox.hide();
+						doResolve(resolveValue);
+					} else if (this.hidden) {
+						doResolve(undefined);
 					} else {
 						isResolving--;
 						isAcceptHandled = false;
 					}
 				});
-			}
+			};
 
-			this.filePickBox.onDidAccept(_ => {
-				handleAccept(this);
-			});
+			this._register(this.filePickBox.onDidAccept(_ => {
+				handleAccept();
+			}));
 
-			this.filePickBox.onDidChangeActive(i => {
+			this._register(this.filePickBox.onDidChangeActive(i => {
 				isAcceptHandled = false;
 				// update input box to match the first selected item
 				if ((i.length === 1) && this.isSelectionChangeFromUser()) {
@@ -392,17 +388,17 @@ export class SimpleFileDialog implements ISimpleFileDialog {
 					}
 					this.setAutoComplete(userPath, this.userEnteredPathSegment, i[0], true);
 				}
-			});
+			}));
 
-			this.filePickBox.onDidChangeValue(async value => {
+			this._register(this.filePickBox.onDidChangeValue(async value => {
 				return this.handleValueChange(value);
-			});
-			this.filePickBox.onDidHide(() => {
+			}));
+			this._register(this.filePickBox.onDidHide(() => {
 				this.hidden = true;
 				if (isResolving === 0) {
-					doResolve(this, undefined);
+					doResolve(undefined);
 				}
-			});
+			}));
 
 			this.filePickBox.show();
 			this.contextKey.set(true);
@@ -417,6 +413,10 @@ export class SimpleFileDialog implements ISimpleFileDialog {
 		});
 	}
 
+	public override dispose(): void {
+		super.dispose();
+	}
+
 	private async handleValueChange(value: string) {
 		try {
 			// onDidChangeValue can also be triggered by the auto complete, so if it looks like the auto complete, don't do anything
@@ -763,7 +763,8 @@ export class SimpleFileDialog implements ISimpleFileDialog {
 		interface YesNoItem extends IQuickPickItem {
 			value: boolean;
 		}
-		const prompt = this.quickInputService.createQuickPick<YesNoItem>();
+		const disposableStore = new DisposableStore();
+		const prompt = disposableStore.add(this.quickInputService.createQuickPick<YesNoItem>());
 		prompt.title = message;
 		prompt.ignoreFocusOut = true;
 		prompt.ok = true;
@@ -773,25 +774,25 @@ export class SimpleFileDialog implements ISimpleFileDialog {
 
 		let isResolving = false;
 		return new Promise<boolean>(resolve => {
-			prompt.onDidAccept(() => {
+			disposableStore.add(prompt.onDidAccept(() => {
 				isResolving = true;
 				prompt.hide();
 				resolve(true);
-			});
-			prompt.onDidHide(() => {
+			}));
+			disposableStore.add(prompt.onDidHide(() => {
 				if (!isResolving) {
 					resolve(false);
 				}
 				this.filePickBox.show();
 				this.hidden = false;
-				prompt.dispose();
-			});
-			prompt.onDidChangeValue(() => {
+				disposableStore.dispose();
+			}));
+			disposableStore.add(prompt.onDidChangeValue(() => {
 				prompt.hide();
-			});
-			prompt.onDidCustom(() => {
+			}));
+			disposableStore.add(prompt.onDidCustom(() => {
 				prompt.hide();
-			});
+			}));
 			prompt.show();
 		});
 	}
@@ -832,7 +833,7 @@ export class SimpleFileDialog implements ISimpleFileDialog {
 			} else if (!statDirname.isDirectory) {
 				this.filePickBox.validationMessage = nls.localize('remoteFileDialog.validateNonexistentDir', 'Please enter a path that exists.');
 				return Promise.resolve(false);
-			} else if (statDirname.readonly || statDirname.locked) {
+			} else if (statDirname.readonly) {
 				this.filePickBox.validationMessage = nls.localize('remoteFileDialog.validateReadonlyFolder', 'This folder cannot be used as a save destination. Please choose another folder');
 				return Promise.resolve(false);
 			}
diff --git a/src/vs/workbench/services/dialogs/common/dialogService.ts b/src/vs/workbench/services/dialogs/common/dialogService.ts
index d3b1c44eed2..45c82286ee5 100644
--- a/src/vs/workbench/services/dialogs/common/dialogService.ts
+++ b/src/vs/workbench/services/dialogs/common/dialogService.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import Severity from 'vs/base/common/severity';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IAsyncPromptResult, IAsyncPromptResultWithCancel, IConfirmation, IConfirmationResult, IDialogService, IInput, IInputResult, IPrompt, IPromptResult, IPromptResultWithCancel, IPromptWithCustomCancel, IPromptWithDefaultCancel } from 'vs/platform/dialogs/common/dialogs';
-import { DialogsModel } from 'vs/workbench/common/dialogs';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { ILogService } from 'vs/platform/log/common/log';
+import Severity from '../../../../base/common/severity.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IAsyncPromptResult, IAsyncPromptResultWithCancel, IConfirmation, IConfirmationResult, IDialogService, IInput, IInputResult, IPrompt, IPromptResult, IPromptResultWithCancel, IPromptWithCustomCancel, IPromptWithDefaultCancel } from '../../../../platform/dialogs/common/dialogs.js';
+import { DialogsModel } from '../../../common/dialogs.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
 
 export class DialogService extends Disposable implements IDialogService {
 
diff --git a/src/vs/workbench/services/dialogs/electron-sandbox/fileDialogService.ts b/src/vs/workbench/services/dialogs/electron-sandbox/fileDialogService.ts
index fb588d918f0..39511840b21 100644
--- a/src/vs/workbench/services/dialogs/electron-sandbox/fileDialogService.ts
+++ b/src/vs/workbench/services/dialogs/electron-sandbox/fileDialogService.ts
@@ -3,30 +3,30 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SaveDialogOptions, OpenDialogOptions } from 'vs/base/parts/sandbox/common/electronTypes';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IPickAndOpenOptions, ISaveDialogOptions, IOpenDialogOptions, IFileDialogService, IDialogService, INativeOpenDialogOptions } from 'vs/platform/dialogs/common/dialogs';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IHistoryService } from 'vs/workbench/services/history/common/history';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { URI } from 'vs/base/common/uri';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { INativeHostOptions, INativeHostService } from 'vs/platform/native/common/native';
-import { AbstractFileDialogService } from 'vs/workbench/services/dialogs/browser/abstractFileDialogService';
-import { Schemas } from 'vs/base/common/network';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IWorkspacesService } from 'vs/platform/workspaces/common/workspaces';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { getActiveWindow } from 'vs/base/browser/dom';
+import { SaveDialogOptions, OpenDialogOptions } from '../../../../base/parts/sandbox/common/electronTypes.js';
+import { IHostService } from '../../host/browser/host.js';
+import { IPickAndOpenOptions, ISaveDialogOptions, IOpenDialogOptions, IFileDialogService, IDialogService, INativeOpenDialogOptions } from '../../../../platform/dialogs/common/dialogs.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { IHistoryService } from '../../history/common/history.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { INativeHostOptions, INativeHostService } from '../../../../platform/native/common/native.js';
+import { AbstractFileDialogService } from '../browser/abstractFileDialogService.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { IWorkspacesService } from '../../../../platform/workspaces/common/workspaces.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { IPathService } from '../../path/common/pathService.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { IEditorService } from '../../editor/common/editorService.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { getActiveWindow } from '../../../../base/browser/dom.js';
 
 export class FileDialogService extends AbstractFileDialogService implements IFileDialogService {
 
diff --git a/src/vs/workbench/services/dialogs/test/electron-sandbox/fileDialogService.test.ts b/src/vs/workbench/services/dialogs/test/electron-sandbox/fileDialogService.test.ts
index 37db54ee493..f75cd47844e 100644
--- a/src/vs/workbench/services/dialogs/test/electron-sandbox/fileDialogService.test.ts
+++ b/src/vs/workbench/services/dialogs/test/electron-sandbox/fileDialogService.test.ts
@@ -5,36 +5,36 @@
 
 import assert from 'assert';
 import * as sinon from 'sinon';
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { mock } from 'vs/base/test/common/mock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { IDialogService, IFileDialogService, IOpenDialogOptions, ISaveDialogOptions } from 'vs/platform/dialogs/common/dialogs';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { ILogService } from 'vs/platform/log/common/log';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IWorkspacesService } from 'vs/platform/workspaces/common/workspaces';
-import { ISimpleFileDialog } from 'vs/workbench/services/dialogs/browser/simpleFileDialog';
-import { FileDialogService } from 'vs/workbench/services/dialogs/electron-sandbox/fileDialogService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { BrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IHistoryService } from 'vs/workbench/services/history/common/history';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { BrowserWorkspaceEditingService } from 'vs/workbench/services/workspaces/browser/workspaceEditingService';
-import { IWorkspaceEditingService } from 'vs/workbench/services/workspaces/common/workspaceEditing';
-import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
+import { Schemas } from '../../../../../base/common/network.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { mock } from '../../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { ICodeEditorService } from '../../../../../editor/browser/services/codeEditorService.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { IDialogService, IFileDialogService, IOpenDialogOptions, ISaveDialogOptions } from '../../../../../platform/dialogs/common/dialogs.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { ILabelService } from '../../../../../platform/label/common/label.js';
+import { ILogService } from '../../../../../platform/log/common/log.js';
+import { INativeHostService } from '../../../../../platform/native/common/native.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { IWorkspacesService } from '../../../../../platform/workspaces/common/workspaces.js';
+import { ISimpleFileDialog } from '../../browser/simpleFileDialog.js';
+import { FileDialogService } from '../../electron-sandbox/fileDialogService.js';
+import { IEditorService } from '../../../editor/common/editorService.js';
+import { BrowserWorkbenchEnvironmentService } from '../../../environment/browser/environmentService.js';
+import { IWorkbenchEnvironmentService } from '../../../environment/common/environmentService.js';
+import { IHistoryService } from '../../../history/common/history.js';
+import { IHostService } from '../../../host/browser/host.js';
+import { IPathService } from '../../../path/common/pathService.js';
+import { BrowserWorkspaceEditingService } from '../../../workspaces/browser/workspaceEditingService.js';
+import { IWorkspaceEditingService } from '../../../workspaces/common/workspaceEditing.js';
+import { workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
 
 class TestFileDialogService extends FileDialogService {
 	constructor(
@@ -97,6 +97,7 @@ suite('FileDialogService', function () {
 				assert.strictEqual(options.availableFileSystems[0], Schemas.file);
 				return testFile;
 			}
+			dispose(): void { }
 		}
 
 		const dialogService = instantiationService.createInstance(TestFileDialogService, new TestSimpleFileDialog());
@@ -118,6 +119,7 @@ suite('FileDialogService', function () {
 				assert.strictEqual(options.availableFileSystems[0], Schemas.file);
 				return testFile;
 			}
+			dispose(): void { }
 		}
 
 		instantiationService.stub(IPathService, new class {
@@ -145,6 +147,7 @@ suite('FileDialogService', function () {
 				assert.strictEqual(options.availableFileSystems[1], Schemas.file);
 				return testFile;
 			}
+			dispose(): void { }
 		}
 
 		instantiationService.set(IWorkbenchEnvironmentService, new class extends mock<BrowserWorkbenchEnvironmentService>() {
@@ -171,6 +174,7 @@ suite('FileDialogService', function () {
 			async showSaveDialog(): Promise<URI | undefined> {
 				return testFile;
 			}
+			dispose(): void { }
 		}
 		instantiationService.set(IWorkbenchEnvironmentService, new class extends mock<BrowserWorkbenchEnvironmentService>() {
 			override get remoteAuthority() {
diff --git a/src/vs/workbench/services/driver/browser/driver.ts b/src/vs/workbench/services/driver/browser/driver.ts
index 13ddd13f671..d78e55aa973 100644
--- a/src/vs/workbench/services/driver/browser/driver.ts
+++ b/src/vs/workbench/services/driver/browser/driver.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getClientArea, getTopLeftOffset } from 'vs/base/browser/dom';
-import { mainWindow } from 'vs/base/browser/window';
-import { coalesce } from 'vs/base/common/arrays';
-import { language, locale } from 'vs/base/common/platform';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import localizedStrings from 'vs/platform/languagePacks/common/localizedStrings';
-import { ILogFile, getLogs } from 'vs/platform/log/browser/log';
-import { ILogService } from 'vs/platform/log/common/log';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
-import { IWindowDriver, IElement, ILocaleInfo, ILocalizedStrings } from 'vs/workbench/services/driver/common/driver';
-import { ILifecycleService, LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { getClientArea, getTopLeftOffset } from '../../../../base/browser/dom.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { coalesce } from '../../../../base/common/arrays.js';
+import { language, locale } from '../../../../base/common/platform.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import localizedStrings from '../../../../platform/languagePacks/common/localizedStrings.js';
+import { ILogFile, getLogs } from '../../../../platform/log/browser/log.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from '../../../common/contributions.js';
+import { IWindowDriver, IElement, ILocaleInfo, ILocalizedStrings } from '../common/driver.js';
+import { ILifecycleService, LifecyclePhase } from '../../lifecycle/common/lifecycle.js';
 import type { Terminal as XtermTerminal } from '@xterm/xterm';
 
 export class BrowserWindowDriver implements IWindowDriver {
diff --git a/src/vs/workbench/services/driver/electron-sandbox/driver.ts b/src/vs/workbench/services/driver/electron-sandbox/driver.ts
index 955c1201239..79740006134 100644
--- a/src/vs/workbench/services/driver/electron-sandbox/driver.ts
+++ b/src/vs/workbench/services/driver/electron-sandbox/driver.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { mainWindow } from 'vs/base/browser/window';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { BrowserWindowDriver } from 'vs/workbench/services/driver/browser/driver';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { BrowserWindowDriver } from '../browser/driver.js';
+import { ILifecycleService } from '../../lifecycle/common/lifecycle.js';
 
 interface INativeWindowDriverHelper {
 	exitApplication(): Promise<void>;
diff --git a/src/vs/workbench/services/editor/browser/codeEditorService.ts b/src/vs/workbench/services/editor/browser/codeEditorService.ts
index 9930f85f58c..e6926522af8 100644
--- a/src/vs/workbench/services/editor/browser/codeEditorService.ts
+++ b/src/vs/workbench/services/editor/browser/codeEditorService.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ICodeEditor, isCodeEditor, isDiffEditor, isCompositeEditor, getCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { AbstractCodeEditorService } from 'vs/editor/browser/services/abstractCodeEditorService';
-import { ScrollType } from 'vs/editor/common/editorCommon';
-import { IResourceEditorInput } from 'vs/platform/editor/common/editor';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IWorkbenchEditorConfiguration } from 'vs/workbench/common/editor';
-import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { isEqual } from 'vs/base/common/resources';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { applyTextEditorOptions } from 'vs/workbench/common/editor/editorOptions';
+import { ICodeEditor, isCodeEditor, isDiffEditor, isCompositeEditor, getCodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { AbstractCodeEditorService } from '../../../../editor/browser/services/abstractCodeEditorService.js';
+import { ScrollType } from '../../../../editor/common/editorCommon.js';
+import { IResourceEditorInput } from '../../../../platform/editor/common/editor.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IWorkbenchEditorConfiguration } from '../../../common/editor.js';
+import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } from '../common/editorService.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { applyTextEditorOptions } from '../../../common/editor/editorOptions.js';
 
 export class CodeEditorService extends AbstractCodeEditorService {
 
diff --git a/src/vs/workbench/services/editor/browser/editorPaneService.ts b/src/vs/workbench/services/editor/browser/editorPaneService.ts
index 9e1342fce28..182d4a9a5cb 100644
--- a/src/vs/workbench/services/editor/browser/editorPaneService.ts
+++ b/src/vs/workbench/services/editor/browser/editorPaneService.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IEditorPaneService } from 'vs/workbench/services/editor/common/editorPaneService';
-import { EditorPaneDescriptor } from 'vs/workbench/browser/editor';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { IEditorPaneService } from '../common/editorPaneService.js';
+import { EditorPaneDescriptor } from '../../../browser/editor.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
 
 export class EditorPaneService implements IEditorPaneService {
 
diff --git a/src/vs/workbench/services/editor/browser/editorResolverService.ts b/src/vs/workbench/services/editor/browser/editorResolverService.ts
index 8275646f62e..ffb05607ac8 100644
--- a/src/vs/workbench/services/editor/browser/editorResolverService.ts
+++ b/src/vs/workbench/services/editor/browser/editorResolverService.ts
@@ -3,31 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as glob from 'vs/base/common/glob';
-import { distinct, firstOrDefault, insert } from 'vs/base/common/arrays';
-import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { basename, extname, isEqual } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { EditorActivation, EditorResolution, IEditorOptions } from 'vs/platform/editor/common/editor';
-import { DEFAULT_EDITOR_ASSOCIATION, EditorResourceAccessor, EditorInputWithOptions, IResourceSideBySideEditorInput, isEditorInputWithOptions, isEditorInputWithOptionsAndGroup, isResourceDiffEditorInput, isResourceSideBySideEditorInput, isUntitledResourceEditorInput, isResourceMergeEditorInput, IUntypedEditorInput, SideBySideEditor, isResourceMultiDiffEditorInput } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { Schemas } from 'vs/base/common/network';
-import { RegisteredEditorInfo, RegisteredEditorPriority, RegisteredEditorOptions, EditorAssociation, EditorAssociations, editorsAssociationsSettingId, globMatchesResource, IEditorResolverService, priorityToRank, ResolvedEditor, ResolvedStatus, EditorInputFactoryObject } from 'vs/workbench/services/editor/common/editorResolverService';
-import { QuickPickItem, IKeyMods, IQuickInputService, IQuickPickItem, IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
-import { localize } from 'vs/nls';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { ILogService } from 'vs/platform/log/common/log';
-import { findGroup } from 'vs/workbench/services/editor/common/editorGroupFinder';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { PreferredGroup } from 'vs/workbench/services/editor/common/editorService';
-import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditorInput';
-import { PauseableEmitter } from 'vs/base/common/event';
+import * as glob from '../../../../base/common/glob.js';
+import { distinct, insert } from '../../../../base/common/arrays.js';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { basename, extname, isEqual } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { EditorActivation, EditorResolution, IEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { DEFAULT_EDITOR_ASSOCIATION, EditorResourceAccessor, EditorInputWithOptions, IResourceSideBySideEditorInput, isEditorInputWithOptions, isEditorInputWithOptionsAndGroup, isResourceDiffEditorInput, isResourceSideBySideEditorInput, isUntitledResourceEditorInput, isResourceMergeEditorInput, IUntypedEditorInput, SideBySideEditor, isResourceMultiDiffEditorInput } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { IEditorGroup, IEditorGroupsService } from '../common/editorGroupsService.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { RegisteredEditorInfo, RegisteredEditorPriority, RegisteredEditorOptions, EditorAssociation, EditorAssociations, editorsAssociationsSettingId, globMatchesResource, IEditorResolverService, priorityToRank, ResolvedEditor, ResolvedStatus, EditorInputFactoryObject } from '../common/editorResolverService.js';
+import { QuickPickItem, IKeyMods, IQuickInputService, IQuickPickItem, IQuickPickSeparator } from '../../../../platform/quickinput/common/quickInput.js';
+import { localize } from '../../../../nls.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IExtensionService } from '../../extensions/common/extensions.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { findGroup } from '../common/editorGroupFinder.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { PreferredGroup } from '../common/editorService.js';
+import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
+import { PauseableEmitter } from '../../../../base/common/event.js';
 
 interface RegisteredEditor {
 	globPattern: string | glob.IRelativePattern;
@@ -645,7 +645,7 @@ export class EditorResolverService extends Disposable implements IEditorResolver
 	}
 
 	private mapEditorsToQuickPickEntry(resource: URI, showDefaultPicker?: boolean) {
-		const currentEditor = firstOrDefault(this.editorGroupService.activeGroup.findEditors(resource));
+		const currentEditor = this.editorGroupService.activeGroup.findEditors(resource).at(0);
 		// If untitled, we want all registered editors
 		let registeredEditors = resource.scheme === Schemas.untitled ? this._registeredEditors.filter(e => e.editorInfo.priority !== RegisteredEditorPriority.exclusive) : this.findMatchingEditors(resource);
 		// We don't want duplicate Id entries
@@ -716,7 +716,8 @@ export class EditorResolverService extends Disposable implements IEditorResolver
 		const editorPicks = this.mapEditorsToQuickPickEntry(resource, showDefaultPicker);
 
 		// Create the editor picker
-		const editorPicker = this.quickInputService.createQuickPick<IQuickPickItem>();
+		const disposables = new DisposableStore();
+		const editorPicker = disposables.add(this.quickInputService.createQuickPick<IQuickPickItem>({ useSeparators: true }));
 		const placeHolderMessage = showDefaultPicker ?
 			localize('promptOpenWith.updateDefaultPlaceHolder', "Select new default editor for '{0}'", `*${extname(resource)}`) :
 			localize('promptOpenWith.placeHolder', "Select editor for '{0}'", basename(resource));
@@ -730,7 +731,7 @@ export class EditorResolverService extends Disposable implements IEditorResolver
 
 		// Prompt the user to select an editor
 		const picked: EditorPick | undefined = await new Promise<EditorPick | undefined>(resolve => {
-			editorPicker.onDidAccept(e => {
+			disposables.add(editorPicker.onDidAccept(e => {
 				let result: EditorPick | undefined = undefined;
 
 				if (editorPicker.selectedItems.length === 1) {
@@ -747,11 +748,14 @@ export class EditorResolverService extends Disposable implements IEditorResolver
 				}
 
 				resolve(result);
-			});
+			}));
 
-			editorPicker.onDidHide(() => resolve(undefined));
+			disposables.add(editorPicker.onDidHide(() => {
+				disposables.dispose();
+				resolve(undefined);
+			}));
 
-			editorPicker.onDidTriggerItemButton(e => {
+			disposables.add(editorPicker.onDidTriggerItemButton(e => {
 
 				// Trigger opening and close picker
 				resolve({ item: e.item, openInBackground: false });
@@ -760,7 +764,7 @@ export class EditorResolverService extends Disposable implements IEditorResolver
 				if (resource && e.item && e.item.id) {
 					this.updateUserAssociations(`*${extname(resource)}`, e.item.id,);
 				}
-			});
+			}));
 
 			editorPicker.show();
 		});
diff --git a/src/vs/workbench/services/editor/browser/editorService.ts b/src/vs/workbench/services/editor/browser/editorService.ts
index cd6d5c6f86e..61f21fe148b 100644
--- a/src/vs/workbench/services/editor/browser/editorService.ts
+++ b/src/vs/workbench/services/editor/browser/editorService.ts
@@ -3,38 +3,38 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IResourceEditorInput, IEditorOptions, EditorActivation, IResourceEditorInputIdentifier, ITextResourceEditorInput } from 'vs/platform/editor/common/editor';
-import { SideBySideEditor, IEditorPane, GroupIdentifier, IUntitledTextResourceEditorInput, IResourceDiffEditorInput, EditorInputWithOptions, isEditorInputWithOptions, IEditorIdentifier, IEditorCloseEvent, ITextDiffEditorPane, IRevertOptions, SaveReason, EditorsOrder, IWorkbenchEditorConfiguration, EditorResourceAccessor, IVisibleEditorPane, EditorInputCapabilities, isResourceDiffEditorInput, IUntypedEditorInput, isResourceEditorInput, isEditorInput, isEditorInputWithOptionsAndGroup, IFindEditorOptions, isResourceMergeEditorInput, IEditorWillOpenEvent, IEditorControl } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditorInput';
-import { ResourceMap, ResourceSet } from 'vs/base/common/map';
-import { IFileService, FileOperationEvent, FileOperation, FileChangesEvent, FileChangeType } from 'vs/platform/files/common/files';
-import { Event, Emitter } from 'vs/base/common/event';
-import { URI } from 'vs/base/common/uri';
-import { joinPath } from 'vs/base/common/resources';
-import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
-import { SideBySideEditor as SideBySideEditorPane } from 'vs/workbench/browser/parts/editor/sideBySideEditor';
-import { IEditorGroupsService, IEditorGroup, GroupsOrder, IEditorReplacement, isEditorReplacement, ICloseEditorOptions, IEditorGroupsContainer } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IUntypedEditorReplacement, IEditorService, ISaveEditorsOptions, ISaveAllEditorsOptions, IRevertAllEditorsOptions, IBaseSaveRevertAllEditorOptions, IOpenEditorsOptions, PreferredGroup, isPreferredGroup, IEditorsChangeEvent, ISaveEditorsResult } from 'vs/workbench/services/editor/common/editorService';
-import { IConfigurationChangeEvent, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { Disposable, IDisposable, dispose, DisposableStore } from 'vs/base/common/lifecycle';
-import { coalesce, distinct } from 'vs/base/common/arrays';
-import { isCodeEditor, isDiffEditor, ICodeEditor, IDiffEditor, isCompositeEditor } from 'vs/editor/browser/editorBrowser';
-import { IEditorGroupView, EditorServiceImpl } from 'vs/workbench/browser/parts/editor/editor';
-import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { isUndefined } from 'vs/base/common/types';
-import { EditorsObserver } from 'vs/workbench/browser/parts/editor/editorsObserver';
-import { Promises, timeout } from 'vs/base/common/async';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { indexOfPath } from 'vs/base/common/extpath';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IEditorResolverService, ResolvedStatus } from 'vs/workbench/services/editor/common/editorResolverService';
-import { IWorkspaceTrustRequestService, WorkspaceTrustUriResponse } from 'vs/platform/workspace/common/workspaceTrust';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { findGroup } from 'vs/workbench/services/editor/common/editorGroupFinder';
-import { ITextEditorService } from 'vs/workbench/services/textfile/common/textEditorService';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IResourceEditorInput, IEditorOptions, EditorActivation, IResourceEditorInputIdentifier, ITextResourceEditorInput } from '../../../../platform/editor/common/editor.js';
+import { SideBySideEditor, IEditorPane, GroupIdentifier, IUntitledTextResourceEditorInput, IResourceDiffEditorInput, EditorInputWithOptions, isEditorInputWithOptions, IEditorIdentifier, IEditorCloseEvent, ITextDiffEditorPane, IRevertOptions, SaveReason, EditorsOrder, IWorkbenchEditorConfiguration, EditorResourceAccessor, IVisibleEditorPane, EditorInputCapabilities, isResourceDiffEditorInput, IUntypedEditorInput, isResourceEditorInput, isEditorInput, isEditorInputWithOptionsAndGroup, IFindEditorOptions, isResourceMergeEditorInput, IEditorWillOpenEvent, IEditorControl } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
+import { ResourceMap, ResourceSet } from '../../../../base/common/map.js';
+import { IFileService, FileOperationEvent, FileOperation, FileChangesEvent, FileChangeType } from '../../../../platform/files/common/files.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { URI } from '../../../../base/common/uri.js';
+import { joinPath } from '../../../../base/common/resources.js';
+import { DiffEditorInput } from '../../../common/editor/diffEditorInput.js';
+import { SideBySideEditor as SideBySideEditorPane } from '../../../browser/parts/editor/sideBySideEditor.js';
+import { IEditorGroupsService, IEditorGroup, GroupsOrder, IEditorReplacement, isEditorReplacement, ICloseEditorOptions, IEditorGroupsContainer } from '../common/editorGroupsService.js';
+import { IUntypedEditorReplacement, IEditorService, ISaveEditorsOptions, ISaveAllEditorsOptions, IRevertAllEditorsOptions, IBaseSaveRevertAllEditorOptions, IOpenEditorsOptions, PreferredGroup, isPreferredGroup, IEditorsChangeEvent, ISaveEditorsResult } from '../common/editorService.js';
+import { IConfigurationChangeEvent, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { Disposable, IDisposable, dispose, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { coalesce, distinct } from '../../../../base/common/arrays.js';
+import { isCodeEditor, isDiffEditor, ICodeEditor, IDiffEditor, isCompositeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { IEditorGroupView, EditorServiceImpl } from '../../../browser/parts/editor/editor.js';
+import { registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { isUndefined } from '../../../../base/common/types.js';
+import { EditorsObserver } from '../../../browser/parts/editor/editorsObserver.js';
+import { Promises, timeout } from '../../../../base/common/async.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { indexOfPath } from '../../../../base/common/extpath.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IEditorResolverService, ResolvedStatus } from '../common/editorResolverService.js';
+import { IWorkspaceTrustRequestService, WorkspaceTrustUriResponse } from '../../../../platform/workspace/common/workspaceTrust.js';
+import { IHostService } from '../../host/browser/host.js';
+import { findGroup } from '../common/editorGroupFinder.js';
+import { ITextEditorService } from '../../textfile/common/textEditorService.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
 
 export class EditorService extends Disposable implements EditorServiceImpl {
 
diff --git a/src/vs/workbench/services/editor/common/customEditorLabelService.ts b/src/vs/workbench/services/editor/common/customEditorLabelService.ts
index 8264adcbd91..68eda9a9d67 100644
--- a/src/vs/workbench/services/editor/common/customEditorLabelService.ts
+++ b/src/vs/workbench/services/editor/common/customEditorLabelService.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { ParsedPattern, parse as parseGlob } from 'vs/base/common/glob';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { isAbsolute, parse as parsePath, ParsedPath, dirname } from 'vs/base/common/path';
-import { dirname as resourceDirname, relativePath as getRelativePath } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { MRUCache } from 'vs/base/common/map';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { ParsedPattern, parse as parseGlob } from '../../../../base/common/glob.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { isAbsolute, parse as parsePath, ParsedPath, dirname } from '../../../../base/common/path.js';
+import { dirname as resourceDirname, relativePath as getRelativePath } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { MRUCache } from '../../../../base/common/map.js';
 
 interface ICustomEditorLabelObject {
 	readonly [key: string]: string;
@@ -51,10 +51,10 @@ export class CustomEditorLabelService extends Disposable implements ICustomEdito
 		this.storeEnablementState();
 		this.storeCustomPatterns();
 
-		this.registerListernes();
+		this.registerListeners();
 	}
 
-	private registerListernes(): void {
+	private registerListeners(): void {
 		this._register(this.configurationService.onDidChangeConfiguration(e => {
 			// Cache the enabled state
 			if (e.affectsConfiguration(CustomEditorLabelService.SETTING_ID_ENABLED)) {
@@ -148,29 +148,43 @@ export class CustomEditorLabelService extends Disposable implements ICustomEdito
 			}
 
 			if (pattern.parsedPattern(relevantPath)) {
-				return this.applyTempate(pattern.template, resource, relevantPath);
+				return this.applyTemplate(pattern.template, resource, relevantPath);
 			}
 		}
 
 		return undefined;
 	}
 
-	private readonly _parsedTemplateExpression = /\$\{(dirname|filename|extname|dirname\(([-+]?\d+)\))\}/g;
-	private applyTempate(template: string, resource: URI, relevantPath: string): string {
+	private readonly _parsedTemplateExpression = /\$\{(dirname|filename|extname|extname\((?<extnameN>[-+]?\d+)\)|dirname\((?<dirnameN>[-+]?\d+)\))\}/g;
+	private readonly _filenameCaptureExpression = /(?<filename>^\.*[^.]*)/;
+	private applyTemplate(template: string, resource: URI, relevantPath: string): string {
 		let parsedPath: undefined | ParsedPath;
-		return template.replace(this._parsedTemplateExpression, (match: string, variable: string, arg: string) => {
+		return template.replace(this._parsedTemplateExpression, (match: string, variable: string, ...args: any[]) => {
 			parsedPath = parsedPath ?? parsePath(resource.path);
-			switch (variable) {
-				case 'filename':
-					return parsedPath.name;
-				case 'extname':
-					return parsedPath.ext.slice(1);
-				default: { // dirname and dirname(arg)
-					const n = variable === 'dirname' ? 0 : parseInt(arg);
-					const nthDir = this.getNthDirname(dirname(relevantPath), n);
-					if (nthDir) {
-						return nthDir;
-					}
+			// named group matches
+			const { dirnameN = '0', extnameN = '0' }: { dirnameN?: string; extnameN?: string } = args.pop();
+
+			if (variable === 'filename') {
+				const { filename } = this._filenameCaptureExpression.exec(parsedPath.base)?.groups ?? {};
+				if (filename) {
+					return filename;
+				}
+			} else if (variable === 'extname') {
+				const extension = this.getExtnames(parsedPath.base);
+				if (extension) {
+					return extension;
+				}
+			} else if (variable.startsWith('extname')) {
+				const n = parseInt(extnameN);
+				const nthExtname = this.getNthExtname(parsedPath.base, n);
+				if (nthExtname) {
+					return nthExtname;
+				}
+			} else if (variable.startsWith('dirname')) {
+				const n = parseInt(dirnameN);
+				const nthDir = this.getNthDirname(dirname(relevantPath), n);
+				if (nthDir) {
+					return nthDir;
 				}
 			}
 
@@ -178,12 +192,36 @@ export class CustomEditorLabelService extends Disposable implements ICustomEdito
 		});
 	}
 
+	private removeLeadingDot(path: string): string {
+		let withoutLeadingDot = path;
+		while (withoutLeadingDot.startsWith('.')) {
+			withoutLeadingDot = withoutLeadingDot.slice(1);
+		}
+		return withoutLeadingDot;
+	}
+
 	private getNthDirname(path: string, n: number): string | undefined {
 		// grand-parent/parent/filename.ext1.ext2 -> [grand-parent, parent]
 		path = path.startsWith('/') ? path.slice(1) : path;
 		const pathFragments = path.split('/');
 
-		const length = pathFragments.length;
+		return this.getNthFragment(pathFragments, n);
+	}
+
+	private getExtnames(fullFileName: string): string {
+		return this.removeLeadingDot(fullFileName).split('.').slice(1).join('.');
+	}
+
+	private getNthExtname(fullFileName: string, n: number): string | undefined {
+		// file.ext1.ext2.ext3 -> [file, ext1, ext2, ext3]
+		const extensionNameFragments = this.removeLeadingDot(fullFileName).split('.');
+		extensionNameFragments.shift(); // remove the first element which is the file name
+
+		return this.getNthFragment(extensionNameFragments, n);
+	}
+
+	private getNthFragment(fragments: string[], n: number): string | undefined {
+		const length = fragments.length;
 
 		let nth;
 		if (n < 0) {
@@ -192,11 +230,11 @@ export class CustomEditorLabelService extends Disposable implements ICustomEdito
 			nth = length - n - 1;
 		}
 
-		const nthDir = pathFragments[nth];
-		if (nthDir === undefined || nthDir === '') {
+		const nthFragment = fragments[nth];
+		if (nthFragment === undefined || nthFragment === '') {
 			return undefined;
 		}
-		return nthDir;
+		return nthFragment;
 	}
 }
 
diff --git a/src/vs/workbench/services/editor/common/editorGroupColumn.ts b/src/vs/workbench/services/editor/common/editorGroupColumn.ts
index 7cb66600f44..225ea17a314 100644
--- a/src/vs/workbench/services/editor/common/editorGroupColumn.ts
+++ b/src/vs/workbench/services/editor/common/editorGroupColumn.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { GroupIdentifier } from 'vs/workbench/common/editor';
-import { IEditorGroupsService, GroupsOrder, IEditorGroup, preferredSideBySideGroupDirection } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { ACTIVE_GROUP, ACTIVE_GROUP_TYPE, SIDE_GROUP, SIDE_GROUP_TYPE } from 'vs/workbench/services/editor/common/editorService';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { GroupIdentifier } from '../../../common/editor.js';
+import { IEditorGroupsService, GroupsOrder, IEditorGroup, preferredSideBySideGroupDirection } from './editorGroupsService.js';
+import { ACTIVE_GROUP, ACTIVE_GROUP_TYPE, SIDE_GROUP, SIDE_GROUP_TYPE } from './editorService.js';
 
 /**
  * A way to address editor groups through a column based system
diff --git a/src/vs/workbench/services/editor/common/editorGroupFinder.ts b/src/vs/workbench/services/editor/common/editorGroupFinder.ts
index bcae9ca0e58..a39a1224160 100644
--- a/src/vs/workbench/services/editor/common/editorGroupFinder.ts
+++ b/src/vs/workbench/services/editor/common/editorGroupFinder.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { EditorActivation } from 'vs/platform/editor/common/editor';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { EditorInputWithOptions, isEditorInputWithOptions, IUntypedEditorInput, isEditorInput, EditorInputCapabilities } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { IEditorGroup, GroupsOrder, preferredSideBySideGroupDirection, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { AUX_WINDOW_GROUP, AUX_WINDOW_GROUP_TYPE, PreferredGroup, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { EditorActivation } from '../../../../platform/editor/common/editor.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { EditorInputWithOptions, isEditorInputWithOptions, IUntypedEditorInput, isEditorInput, EditorInputCapabilities } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { IEditorGroup, GroupsOrder, preferredSideBySideGroupDirection, IEditorGroupsService } from './editorGroupsService.js';
+import { AUX_WINDOW_GROUP, AUX_WINDOW_GROUP_TYPE, PreferredGroup, SIDE_GROUP } from './editorService.js';
 
 /**
  * Finds the target `IEditorGroup` given the instructions provided
diff --git a/src/vs/workbench/services/editor/common/editorGroupsService.ts b/src/vs/workbench/services/editor/common/editorGroupsService.ts
index b90d84720f0..38194364619 100644
--- a/src/vs/workbench/services/editor/common/editorGroupsService.ts
+++ b/src/vs/workbench/services/editor/common/editorGroupsService.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { IInstantiationService, createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IEditorPane, GroupIdentifier, EditorInputWithOptions, CloseDirection, IEditorPartOptions, IEditorPartOptionsChangeEvent, EditorsOrder, IVisibleEditorPane, IEditorCloseEvent, IUntypedEditorInput, isEditorInput, IEditorWillMoveEvent, IMatchEditorOptions, IActiveEditorChangeEvent, IFindEditorOptions, IToolbarActions } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { IEditorOptions } from 'vs/platform/editor/common/editor';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IDimension } from 'vs/editor/common/core/dimension';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { ContextKeyValue, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { URI } from 'vs/base/common/uri';
-import { IGroupModelChangeEvent } from 'vs/workbench/common/editor/editorGroupModel';
-import { IRectangle } from 'vs/platform/window/common/window';
-import { IMenuChangeEvent } from 'vs/platform/actions/common/actions';
-import { DeepPartial } from 'vs/base/common/types';
+import { Event } from '../../../../base/common/event.js';
+import { IInstantiationService, createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IEditorPane, GroupIdentifier, EditorInputWithOptions, CloseDirection, IEditorPartOptions, IEditorPartOptionsChangeEvent, EditorsOrder, IVisibleEditorPane, IEditorCloseEvent, IUntypedEditorInput, isEditorInput, IEditorWillMoveEvent, IMatchEditorOptions, IActiveEditorChangeEvent, IFindEditorOptions, IToolbarActions } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { IEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IDimension } from '../../../../editor/common/core/dimension.js';
+import { DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import { ContextKeyValue, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IGroupModelChangeEvent } from '../../../common/editor/editorGroupModel.js';
+import { IRectangle } from '../../../../platform/window/common/window.js';
+import { IMenuChangeEvent } from '../../../../platform/actions/common/actions.js';
+import { DeepPartial } from '../../../../base/common/types.js';
 
 export const IEditorGroupsService = createDecorator<IEditorGroupsService>('editorGroupsService');
 
@@ -438,6 +438,11 @@ export interface IEditorPart extends IEditorGroupsContainer {
 	 */
 	readonly onDidScroll: Event<void>;
 
+	/**
+	 * An event for when the editor part is disposed.
+	 */
+	readonly onWillDispose: Event<void>;
+
 	/**
 	 * The identifier of the window the editor part is contained in.
 	 */
@@ -480,12 +485,6 @@ export interface IAuxiliaryEditorPart extends IEditorPart {
 	close(): boolean;
 }
 
-export interface IAuxiliaryEditorPartCreateEvent {
-	readonly part: IAuxiliaryEditorPart;
-	readonly instantiationService: IInstantiationService;
-	readonly disposables: DisposableStore;
-}
-
 export interface IEditorWorkingSet {
 	readonly id: string;
 	readonly name: string;
@@ -523,7 +522,7 @@ export interface IEditorGroupsService extends IEditorGroupsContainer {
 	/**
 	 * An event for when a new auxiliary editor part is created.
 	 */
-	readonly onDidCreateAuxiliaryEditorPart: Event<IAuxiliaryEditorPartCreateEvent>;
+	readonly onDidCreateAuxiliaryEditorPart: Event<IAuxiliaryEditorPart>;
 
 	/**
 	 * Provides access to the main window editor part.
@@ -561,6 +560,14 @@ export interface IEditorGroupsService extends IEditorGroupsContainer {
 	 */
 	createAuxiliaryEditorPart(options?: { bounds?: Partial<IRectangle> }): Promise<IAuxiliaryEditorPart>;
 
+	/**
+	 * Returns the instantiation service that is scoped to the
+	 * provided editor part. Use this method when building UI
+	 * that contributes to auxiliary editor parts to ensure the
+	 * UI is scoped to that part.
+	 */
+	getScopedInstantiationService(part: IEditorPart): IInstantiationService;
+
 	/**
 	 * Save a new editor working set from the currently opened
 	 * editors and group layout.
diff --git a/src/vs/workbench/services/editor/common/editorPaneService.ts b/src/vs/workbench/services/editor/common/editorPaneService.ts
index 28d3b0f1876..26829f877e6 100644
--- a/src/vs/workbench/services/editor/common/editorPaneService.ts
+++ b/src/vs/workbench/services/editor/common/editorPaneService.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IWillInstantiateEditorPaneEvent } from 'vs/workbench/common/editor';
-import { Event } from 'vs/base/common/event';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IWillInstantiateEditorPaneEvent } from '../../../common/editor.js';
+import { Event } from '../../../../base/common/event.js';
 
 export const IEditorPaneService = createDecorator<IEditorPaneService>('editorPaneService');
 
diff --git a/src/vs/workbench/services/editor/common/editorResolverService.ts b/src/vs/workbench/services/editor/common/editorResolverService.ts
index bc3a26d311b..81115126b50 100644
--- a/src/vs/workbench/services/editor/common/editorResolverService.ts
+++ b/src/vs/workbench/services/editor/common/editorResolverService.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as glob from 'vs/base/common/glob';
-import { Event } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { posix } from 'vs/base/common/path';
-import { basename } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { workbenchConfigurationNodeBase } from 'vs/workbench/common/configuration';
-import { Extensions as ConfigurationExtensions, IConfigurationNode, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { IResourceEditorInput, ITextResourceEditorInput } from 'vs/platform/editor/common/editor';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { EditorInputWithOptions, EditorInputWithOptionsAndGroup, IResourceDiffEditorInput, IResourceMultiDiffEditorInput, IResourceMergeEditorInput, IUntitledTextResourceEditorInput, IUntypedEditorInput } from 'vs/workbench/common/editor';
-import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { PreferredGroup } from 'vs/workbench/services/editor/common/editorService';
-import { AtLeastOne } from 'vs/base/common/types';
+import * as glob from '../../../../base/common/glob.js';
+import { Event } from '../../../../base/common/event.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { posix } from '../../../../base/common/path.js';
+import { basename } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { localize } from '../../../../nls.js';
+import { workbenchConfigurationNodeBase } from '../../../common/configuration.js';
+import { Extensions as ConfigurationExtensions, IConfigurationNode, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { IResourceEditorInput, ITextResourceEditorInput } from '../../../../platform/editor/common/editor.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { EditorInputWithOptions, EditorInputWithOptionsAndGroup, IResourceDiffEditorInput, IResourceMultiDiffEditorInput, IResourceMergeEditorInput, IUntitledTextResourceEditorInput, IUntypedEditorInput } from '../../../common/editor.js';
+import { IEditorGroup } from './editorGroupsService.js';
+import { PreferredGroup } from './editorService.js';
+import { AtLeastOne } from '../../../../base/common/types.js';
 
 export const IEditorResolverService = createDecorator<IEditorResolverService>('editorResolverService');
 
diff --git a/src/vs/workbench/services/editor/common/editorService.ts b/src/vs/workbench/services/editor/common/editorService.ts
index a44e9fd4f4f..213a5981ad9 100644
--- a/src/vs/workbench/services/editor/common/editorService.ts
+++ b/src/vs/workbench/services/editor/common/editorService.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IResourceEditorInput, IEditorOptions, IResourceEditorInputIdentifier, ITextResourceEditorInput } from 'vs/platform/editor/common/editor';
-import { IEditorPane, GroupIdentifier, IUntitledTextResourceEditorInput, IResourceDiffEditorInput, ITextDiffEditorPane, IEditorIdentifier, ISaveOptions, IRevertOptions, EditorsOrder, IVisibleEditorPane, IEditorCloseEvent, IUntypedEditorInput, IFindEditorOptions, IEditorWillOpenEvent } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { Event } from 'vs/base/common/event';
-import { IEditor, IDiffEditor } from 'vs/editor/common/editorCommon';
-import { ICloseEditorOptions, IEditorGroup, IEditorGroupsContainer, isEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { URI } from 'vs/base/common/uri';
-import { IGroupModelChangeEvent } from 'vs/workbench/common/editor/editorGroupModel';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IResourceEditorInput, IEditorOptions, IResourceEditorInputIdentifier, ITextResourceEditorInput } from '../../../../platform/editor/common/editor.js';
+import { IEditorPane, GroupIdentifier, IUntitledTextResourceEditorInput, IResourceDiffEditorInput, ITextDiffEditorPane, IEditorIdentifier, ISaveOptions, IRevertOptions, EditorsOrder, IVisibleEditorPane, IEditorCloseEvent, IUntypedEditorInput, IFindEditorOptions, IEditorWillOpenEvent } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { Event } from '../../../../base/common/event.js';
+import { IEditor, IDiffEditor } from '../../../../editor/common/editorCommon.js';
+import { ICloseEditorOptions, IEditorGroup, IEditorGroupsContainer, isEditorGroup } from './editorGroupsService.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IGroupModelChangeEvent } from '../../../common/editor/editorGroupModel.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
 
 export const IEditorService = createDecorator<IEditorService>('editorService');
 
diff --git a/src/vs/workbench/services/editor/test/browser/customEditorLabelService.test.ts b/src/vs/workbench/services/editor/test/browser/customEditorLabelService.test.ts
new file mode 100644
index 00000000000..96182d0967b
--- /dev/null
+++ b/src/vs/workbench/services/editor/test/browser/customEditorLabelService.test.ts
@@ -0,0 +1,234 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { ConfigurationTarget, IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { CustomEditorLabelService } from '../../common/customEditorLabelService.js';
+import { ITestInstantiationService, TestServiceAccessor, workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
+
+suite('Custom Editor Label Service', () => {
+
+	const disposables = new DisposableStore();
+
+	setup(() => { });
+
+	teardown(async () => {
+		disposables.clear();
+	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	async function createCustomLabelService(instantiationService: ITestInstantiationService = workbenchInstantiationService(undefined, disposables)): Promise<[CustomEditorLabelService, TestConfigurationService, TestServiceAccessor]> {
+		const configService = new TestConfigurationService();
+		await configService.setUserConfiguration(CustomEditorLabelService.SETTING_ID_ENABLED, true);
+		instantiationService.stub(IConfigurationService, configService);
+
+		const customLabelService = disposables.add(instantiationService.createInstance(CustomEditorLabelService));
+		return [customLabelService, configService, instantiationService.createInstance(TestServiceAccessor)];
+	}
+
+	async function updatePattern(configService: TestConfigurationService, value: any): Promise<void> {
+		await configService.setUserConfiguration(CustomEditorLabelService.SETTING_ID_PATTERNS, value);
+		configService.onDidChangeConfigurationEmitter.fire({
+			affectsConfiguration: (key: string) => key === CustomEditorLabelService.SETTING_ID_PATTERNS,
+			source: ConfigurationTarget.USER,
+			affectedKeys: new Set(CustomEditorLabelService.SETTING_ID_PATTERNS),
+			change: {
+				keys: [],
+				overrides: []
+			}
+		});
+	}
+
+	test('Custom Labels: filename.extname', async () => {
+		const [customLabelService, configService] = await createCustomLabelService();
+
+		await updatePattern(configService, {
+			'**': '${filename}.${extname}'
+		});
+
+		const filenames = [
+			'file.txt',
+			'file.txt1.tx2',
+			'.file.txt',
+		];
+
+		for (const filename of filenames) {
+			const label = customLabelService.getName(URI.file(filename));
+			assert.strictEqual(label, filename);
+		}
+
+		let label = customLabelService.getName(URI.file('file'));
+		assert.strictEqual(label, 'file.${extname}');
+
+		label = customLabelService.getName(URI.file('.file'));
+		assert.strictEqual(label, '.file.${extname}');
+	});
+
+	test('Custom Labels: filename', async () => {
+		const [customLabelService, configService] = await createCustomLabelService();
+
+		await updatePattern(configService, {
+			'**': '${filename}',
+		});
+
+		assert.strictEqual(customLabelService.getName(URI.file('file')), 'file');
+		assert.strictEqual(customLabelService.getName(URI.file('file.txt')), 'file');
+		assert.strictEqual(customLabelService.getName(URI.file('file.txt1.txt2')), 'file');
+		assert.strictEqual(customLabelService.getName(URI.file('folder/file.txt1.txt2')), 'file');
+
+		assert.strictEqual(customLabelService.getName(URI.file('.file')), '.file');
+		assert.strictEqual(customLabelService.getName(URI.file('.file.txt')), '.file');
+		assert.strictEqual(customLabelService.getName(URI.file('.file.txt1.txt2')), '.file');
+		assert.strictEqual(customLabelService.getName(URI.file('folder/.file.txt1.txt2')), '.file');
+	});
+
+	test('Custom Labels: extname(N)', async () => {
+		const [customLabelService, configService] = await createCustomLabelService();
+
+		await updatePattern(configService, {
+			'**/ext/**': '${extname}',
+			'**/ext0/**': '${extname(0)}',
+			'**/ext1/**': '${extname(1)}',
+			'**/ext2/**': '${extname(2)}',
+			'**/extMinus1/**': '${extname(-1)}',
+			'**/extMinus2/**': '${extname(-2)}',
+		});
+
+		interface IExt {
+			extname?: string;
+			ext0?: string;
+			ext1?: string;
+			ext2?: string;
+			extMinus1?: string;
+			extMinus2?: string;
+		}
+
+		function assertExtname(filename: string, ext: IExt): void {
+			assert.strictEqual(customLabelService.getName(URI.file(`test/ext/${filename}`)), ext.extname ?? '${extname}', filename);
+			assert.strictEqual(customLabelService.getName(URI.file(`test/ext0/${filename}`)), ext.ext0 ?? '${extname(0)}', filename);
+			assert.strictEqual(customLabelService.getName(URI.file(`test/ext1/${filename}`)), ext.ext1 ?? '${extname(1)}', filename);
+			assert.strictEqual(customLabelService.getName(URI.file(`test/ext2/${filename}`)), ext.ext2 ?? '${extname(2)}', filename);
+			assert.strictEqual(customLabelService.getName(URI.file(`test/extMinus1/${filename}`)), ext.extMinus1 ?? '${extname(-1)}', filename);
+			assert.strictEqual(customLabelService.getName(URI.file(`test/extMinus2/${filename}`)), ext.extMinus2 ?? '${extname(-2)}', filename);
+		}
+
+		assertExtname('file.txt', {
+			extname: 'txt',
+			ext0: 'txt',
+			extMinus1: 'txt',
+		});
+
+		assertExtname('file.txt1.txt2', {
+			extname: 'txt1.txt2',
+			ext0: 'txt2',
+			ext1: 'txt1',
+			extMinus1: 'txt1',
+			extMinus2: 'txt2',
+		});
+
+		assertExtname('.file.txt1.txt2', {
+			extname: 'txt1.txt2',
+			ext0: 'txt2',
+			ext1: 'txt1',
+			extMinus1: 'txt1',
+			extMinus2: 'txt2',
+		});
+
+		assertExtname('.file.txt1.txt2.txt3.txt4', {
+			extname: 'txt1.txt2.txt3.txt4',
+			ext0: 'txt4',
+			ext1: 'txt3',
+			ext2: 'txt2',
+			extMinus1: 'txt1',
+			extMinus2: 'txt2',
+		});
+
+		assertExtname('file', {});
+		assertExtname('.file', {});
+	});
+
+	test('Custom Labels: dirname(N)', async () => {
+		const [customLabelService, configService] = await createCustomLabelService();
+
+		await updatePattern(configService, {
+			'**': '${dirname},${dirname(0)},${dirname(1)},${dirname(2)},${dirname(-1)},${dirname(-2)}',
+		});
+
+		interface IDir {
+			dirname?: string;
+			dir0?: string;
+			dir1?: string;
+			dir2?: string;
+			dirMinus1?: string;
+			dirMinus2?: string;
+		}
+
+		function assertDirname(path: string, dir: IDir): void {
+			assert.strictEqual(customLabelService.getName(URI.file(path))?.split(',')[0], dir.dirname ?? '${dirname}', path);
+			assert.strictEqual(customLabelService.getName(URI.file(path))?.split(',')[1], dir.dir0 ?? '${dirname(0)}', path);
+			assert.strictEqual(customLabelService.getName(URI.file(path))?.split(',')[2], dir.dir1 ?? '${dirname(1)}', path);
+			assert.strictEqual(customLabelService.getName(URI.file(path))?.split(',')[3], dir.dir2 ?? '${dirname(2)}', path);
+			assert.strictEqual(customLabelService.getName(URI.file(path))?.split(',')[4], dir.dirMinus1 ?? '${dirname(-1)}', path);
+			assert.strictEqual(customLabelService.getName(URI.file(path))?.split(',')[5], dir.dirMinus2 ?? '${dirname(-2)}', path);
+		}
+
+		assertDirname('folder/file.txt', {
+			dirname: 'folder',
+			dir0: 'folder',
+			dirMinus1: 'folder',
+		});
+
+		assertDirname('root/folder/file.txt', {
+			dirname: 'folder',
+			dir0: 'folder',
+			dir1: 'root',
+			dirMinus1: 'root',
+			dirMinus2: 'folder',
+		});
+
+		assertDirname('root/.folder/file.txt', {
+			dirname: '.folder',
+			dir0: '.folder',
+			dir1: 'root',
+			dirMinus1: 'root',
+			dirMinus2: '.folder',
+		});
+
+		assertDirname('root/parent/folder/file.txt', {
+			dirname: 'folder',
+			dir0: 'folder',
+			dir1: 'parent',
+			dir2: 'root',
+			dirMinus1: 'root',
+			dirMinus2: 'parent',
+		});
+
+		assertDirname('file.txt', {});
+	});
+
+	test('Custom Labels: no pattern match', async () => {
+		const [customLabelService, configService] = await createCustomLabelService();
+
+		await updatePattern(configService, {
+			'**/folder/**': 'folder',
+			'file': 'file',
+		});
+
+		assert.strictEqual(customLabelService.getName(URI.file('file')), undefined);
+		assert.strictEqual(customLabelService.getName(URI.file('file.txt')), undefined);
+		assert.strictEqual(customLabelService.getName(URI.file('file.txt1.txt2')), undefined);
+		assert.strictEqual(customLabelService.getName(URI.file('folder1/file.txt1.txt2')), undefined);
+
+		assert.strictEqual(customLabelService.getName(URI.file('.file')), undefined);
+		assert.strictEqual(customLabelService.getName(URI.file('.file.txt')), undefined);
+		assert.strictEqual(customLabelService.getName(URI.file('.file.txt1.txt2')), undefined);
+		assert.strictEqual(customLabelService.getName(URI.file('folder1/file.txt1.txt2')), undefined);
+	});
+});
diff --git a/src/vs/workbench/services/editor/test/browser/editorGroupsService.test.ts b/src/vs/workbench/services/editor/test/browser/editorGroupsService.test.ts
index e2fd3321cac..8c44dd65409 100644
--- a/src/vs/workbench/services/editor/test/browser/editorGroupsService.test.ts
+++ b/src/vs/workbench/services/editor/test/browser/editorGroupsService.test.ts
@@ -4,24 +4,24 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { workbenchInstantiationService, registerTestEditor, TestFileEditorInput, TestEditorPart, TestServiceAccessor, ITestInstantiationService, workbenchTeardown, createEditorParts, TestEditorParts } from 'vs/workbench/test/browser/workbenchTestServices';
-import { GroupDirection, GroupsOrder, MergeGroupMode, GroupOrientation, GroupLocation, isEditorGroup, IEditorGroupsService, GroupsArrangement, IEditorGroupContextKeyProvider } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { CloseDirection, IEditorPartOptions, EditorsOrder, EditorInputCapabilities, GroupModelChangeKind, SideBySideEditor, IEditorFactoryRegistry, EditorExtensions } from 'vs/workbench/common/editor';
-import { URI } from 'vs/base/common/uri';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { MockScopableContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { ConfirmResult } from 'vs/platform/dialogs/common/dialogs';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditorInput';
-import { IGroupModelChangeEvent, IGroupEditorMoveEvent, IGroupEditorOpenEvent } from 'vs/workbench/common/editor/editorGroupModel';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { Emitter } from 'vs/base/common/event';
-import { isEqual } from 'vs/base/common/resources';
+import { workbenchInstantiationService, registerTestEditor, TestFileEditorInput, TestEditorPart, TestServiceAccessor, ITestInstantiationService, workbenchTeardown, createEditorParts, TestEditorParts } from '../../../../test/browser/workbenchTestServices.js';
+import { GroupDirection, GroupsOrder, MergeGroupMode, GroupOrientation, GroupLocation, isEditorGroup, IEditorGroupsService, GroupsArrangement, IEditorGroupContextKeyProvider } from '../../common/editorGroupsService.js';
+import { CloseDirection, IEditorPartOptions, EditorsOrder, EditorInputCapabilities, GroupModelChangeKind, SideBySideEditor, IEditorFactoryRegistry, EditorExtensions } from '../../../../common/editor.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { SyncDescriptor } from '../../../../../platform/instantiation/common/descriptors.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { MockScopableContextKeyService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { ConfirmResult } from '../../../../../platform/dialogs/common/dialogs.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { SideBySideEditorInput } from '../../../../common/editor/sideBySideEditorInput.js';
+import { IGroupModelChangeEvent, IGroupEditorMoveEvent, IGroupEditorOpenEvent } from '../../../../common/editor/editorGroupModel.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Registry } from '../../../../../platform/registry/common/platform.js';
+import { IContextKeyService, RawContextKey } from '../../../../../platform/contextkey/common/contextkey.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { isEqual } from '../../../../../base/common/resources.js';
 
 suite('EditorGroupsService', () => {
 
diff --git a/src/vs/workbench/services/editor/test/browser/editorResolverService.test.ts b/src/vs/workbench/services/editor/test/browser/editorResolverService.test.ts
index 59ddcd67c57..cdbdb03dc91 100644
--- a/src/vs/workbench/services/editor/test/browser/editorResolverService.test.ts
+++ b/src/vs/workbench/services/editor/test/browser/editorResolverService.test.ts
@@ -4,16 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { EditorPart } from 'vs/workbench/browser/parts/editor/editorPart';
-import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
-import { EditorResolverService } from 'vs/workbench/services/editor/browser/editorResolverService';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorResolverService, ResolvedStatus, RegisteredEditorPriority } from 'vs/workbench/services/editor/common/editorResolverService';
-import { createEditorPart, ITestInstantiationService, TestFileEditorInput, TestServiceAccessor, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { EditorPart } from '../../../../browser/parts/editor/editorPart.js';
+import { DiffEditorInput } from '../../../../common/editor/diffEditorInput.js';
+import { EditorResolverService } from '../../browser/editorResolverService.js';
+import { IEditorGroupsService } from '../../common/editorGroupsService.js';
+import { IEditorResolverService, ResolvedStatus, RegisteredEditorPriority } from '../../common/editorResolverService.js';
+import { createEditorPart, ITestInstantiationService, TestFileEditorInput, TestServiceAccessor, workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
 
 suite('EditorResolverService', () => {
 
diff --git a/src/vs/workbench/services/editor/test/browser/editorService.test.ts b/src/vs/workbench/services/editor/test/browser/editorService.test.ts
index ce6d1a08d6c..fa1b385bb56 100644
--- a/src/vs/workbench/services/editor/test/browser/editorService.test.ts
+++ b/src/vs/workbench/services/editor/test/browser/editorService.test.ts
@@ -4,31 +4,31 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { EditorActivation, IResourceEditorInput } from 'vs/platform/editor/common/editor';
-import { URI } from 'vs/base/common/uri';
-import { Event } from 'vs/base/common/event';
-import { DEFAULT_EDITOR_ASSOCIATION, EditorCloseContext, EditorsOrder, IEditorCloseEvent, EditorInputWithOptions, IEditorPane, IResourceDiffEditorInput, isEditorInputWithOptions, IUntitledTextResourceEditorInput, IUntypedEditorInput, SideBySideEditor, isEditorInput, EditorInputCapabilities } from 'vs/workbench/common/editor';
-import { workbenchInstantiationService, TestServiceAccessor, registerTestEditor, TestFileEditorInput, ITestInstantiationService, registerTestResourceEditor, registerTestSideBySideEditor, createEditorPart, registerTestFileEditor, TestTextFileEditor, TestSingletonFileEditorInput, workbenchTeardown } from 'vs/workbench/test/browser/workbenchTestServices';
-import { EditorService } from 'vs/workbench/services/editor/browser/editorService';
-import { IEditorGroup, IEditorGroupsService, GroupDirection, GroupsArrangement } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { EditorPart } from 'vs/workbench/browser/parts/editor/editorPart';
-import { ACTIVE_GROUP, IBaseSaveRevertAllEditorOptions, IEditorService, PreferredGroup, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { FileEditorInput } from 'vs/workbench/contrib/files/browser/editors/fileEditorInput';
-import { timeout } from 'vs/base/common/async';
-import { FileOperationEvent, FileOperation } from 'vs/platform/files/common/files';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { MockScopableContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { RegisteredEditorPriority } from 'vs/workbench/services/editor/common/editorResolverService';
-import { WorkspaceTrustUriResponse } from 'vs/platform/workspace/common/workspaceTrust';
-import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditorInput';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { ErrorPlaceholderEditor } from 'vs/workbench/browser/parts/editor/editorPlaceholder';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IEditorPaneService } from 'vs/workbench/services/editor/common/editorPaneService';
+import { EditorActivation, IResourceEditorInput } from '../../../../../platform/editor/common/editor.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { Event } from '../../../../../base/common/event.js';
+import { DEFAULT_EDITOR_ASSOCIATION, EditorCloseContext, EditorsOrder, IEditorCloseEvent, EditorInputWithOptions, IEditorPane, IResourceDiffEditorInput, isEditorInputWithOptions, IUntitledTextResourceEditorInput, IUntypedEditorInput, SideBySideEditor, isEditorInput, EditorInputCapabilities } from '../../../../common/editor.js';
+import { workbenchInstantiationService, TestServiceAccessor, registerTestEditor, TestFileEditorInput, ITestInstantiationService, registerTestResourceEditor, registerTestSideBySideEditor, createEditorPart, registerTestFileEditor, TestTextFileEditor, TestSingletonFileEditorInput, workbenchTeardown } from '../../../../test/browser/workbenchTestServices.js';
+import { EditorService } from '../../browser/editorService.js';
+import { IEditorGroup, IEditorGroupsService, GroupDirection, GroupsArrangement } from '../../common/editorGroupsService.js';
+import { EditorPart } from '../../../../browser/parts/editor/editorPart.js';
+import { ACTIVE_GROUP, IBaseSaveRevertAllEditorOptions, IEditorService, PreferredGroup, SIDE_GROUP } from '../../common/editorService.js';
+import { SyncDescriptor } from '../../../../../platform/instantiation/common/descriptors.js';
+import { FileEditorInput } from '../../../../contrib/files/browser/editors/fileEditorInput.js';
+import { timeout } from '../../../../../base/common/async.js';
+import { FileOperationEvent, FileOperation } from '../../../../../platform/files/common/files.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { MockScopableContextKeyService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { RegisteredEditorPriority } from '../../common/editorResolverService.js';
+import { WorkspaceTrustUriResponse } from '../../../../../platform/workspace/common/workspaceTrust.js';
+import { SideBySideEditorInput } from '../../../../common/editor/sideBySideEditorInput.js';
+import { EditorInput } from '../../../../common/editor/editorInput.js';
+import { ErrorPlaceholderEditor } from '../../../../browser/parts/editor/editorPlaceholder.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../../../../../editor/common/languages/modesRegistry.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IEditorPaneService } from '../../common/editorPaneService.js';
 
 suite('EditorService', () => {
 
diff --git a/src/vs/workbench/services/editor/test/browser/editorsObserver.test.ts b/src/vs/workbench/services/editor/test/browser/editorsObserver.test.ts
index b968288e9d2..6df30036ad0 100644
--- a/src/vs/workbench/services/editor/test/browser/editorsObserver.test.ts
+++ b/src/vs/workbench/services/editor/test/browser/editorsObserver.test.ts
@@ -4,22 +4,22 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { IEditorFactoryRegistry, EditorExtensions, EditorInputCapabilities } from 'vs/workbench/common/editor';
-import { URI } from 'vs/base/common/uri';
-import { workbenchInstantiationService, TestFileEditorInput, registerTestEditor, TestEditorPart, createEditorPart, registerTestSideBySideEditor } from 'vs/workbench/test/browser/workbenchTestServices';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { EditorPart } from 'vs/workbench/browser/parts/editor/editorPart';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { GroupDirection, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { EditorActivation } from 'vs/platform/editor/common/editor';
-import { WillSaveStateReason } from 'vs/platform/storage/common/storage';
-import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { EditorsObserver } from 'vs/workbench/browser/parts/editor/editorsObserver';
-import { timeout } from 'vs/base/common/async';
-import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
-import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditorInput';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { IEditorFactoryRegistry, EditorExtensions, EditorInputCapabilities } from '../../../../common/editor.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { workbenchInstantiationService, TestFileEditorInput, registerTestEditor, TestEditorPart, createEditorPart, registerTestSideBySideEditor } from '../../../../test/browser/workbenchTestServices.js';
+import { Registry } from '../../../../../platform/registry/common/platform.js';
+import { EditorPart } from '../../../../browser/parts/editor/editorPart.js';
+import { SyncDescriptor } from '../../../../../platform/instantiation/common/descriptors.js';
+import { GroupDirection, IEditorGroupsService } from '../../common/editorGroupsService.js';
+import { EditorActivation } from '../../../../../platform/editor/common/editor.js';
+import { WillSaveStateReason } from '../../../../../platform/storage/common/storage.js';
+import { DisposableStore, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { EditorsObserver } from '../../../../browser/parts/editor/editorsObserver.js';
+import { timeout } from '../../../../../base/common/async.js';
+import { TestStorageService } from '../../../../test/common/workbenchTestServices.js';
+import { SideBySideEditorInput } from '../../../../common/editor/sideBySideEditorInput.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('EditorsObserver', function () {
 
diff --git a/src/vs/workbench/services/encryption/browser/encryptionService.ts b/src/vs/workbench/services/encryption/browser/encryptionService.ts
index 4641c144771..307abb7dda9 100644
--- a/src/vs/workbench/services/encryption/browser/encryptionService.ts
+++ b/src/vs/workbench/services/encryption/browser/encryptionService.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IEncryptionService, KnownStorageProvider } from 'vs/platform/encryption/common/encryptionService';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { IEncryptionService, KnownStorageProvider } from '../../../../platform/encryption/common/encryptionService.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
 
 export class EncryptionService implements IEncryptionService {
 
diff --git a/src/vs/workbench/services/encryption/electron-sandbox/encryptionService.ts b/src/vs/workbench/services/encryption/electron-sandbox/encryptionService.ts
index a862398ede0..8847433ce45 100644
--- a/src/vs/workbench/services/encryption/electron-sandbox/encryptionService.ts
+++ b/src/vs/workbench/services/encryption/electron-sandbox/encryptionService.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { registerMainProcessRemoteService } from 'vs/platform/ipc/electron-sandbox/services';
-import { IEncryptionService } from 'vs/platform/encryption/common/encryptionService';
+import { registerMainProcessRemoteService } from '../../../../platform/ipc/electron-sandbox/services.js';
+import { IEncryptionService } from '../../../../platform/encryption/common/encryptionService.js';
 
 registerMainProcessRemoteService(IEncryptionService, 'encryption');
diff --git a/src/vs/workbench/services/environment/browser/environmentService.ts b/src/vs/workbench/services/environment/browser/environmentService.ts
index 4a8a93ff8bf..2ac401d7357 100644
--- a/src/vs/workbench/services/environment/browser/environmentService.ts
+++ b/src/vs/workbench/services/environment/browser/environmentService.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Schemas } from 'vs/base/common/network';
-import { joinPath } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { ExtensionKind, IEnvironmentService, IExtensionHostDebugParams } from 'vs/platform/environment/common/environment';
-import { IPath } from 'vs/platform/window/common/window';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IWorkbenchConstructionOptions } from 'vs/workbench/browser/web.api';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { memoize } from 'vs/base/common/decorators';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { parseLineAndColumnAware } from 'vs/base/common/extpath';
-import { LogLevelToString } from 'vs/platform/log/common/log';
-import { isUndefined } from 'vs/base/common/types';
-import { refineServiceDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ITextEditorOptions } from 'vs/platform/editor/common/editor';
-import { EXTENSION_IDENTIFIER_WITH_LOG_REGEX } from 'vs/platform/environment/common/environmentService';
+import { Schemas } from '../../../../base/common/network.js';
+import { joinPath } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ExtensionKind, IEnvironmentService, IExtensionHostDebugParams } from '../../../../platform/environment/common/environment.js';
+import { IPath } from '../../../../platform/window/common/window.js';
+import { IWorkbenchEnvironmentService } from '../common/environmentService.js';
+import { IWorkbenchConstructionOptions } from '../../../browser/web.api.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { memoize } from '../../../../base/common/decorators.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { parseLineAndColumnAware } from '../../../../base/common/extpath.js';
+import { LogLevelToString } from '../../../../platform/log/common/log.js';
+import { isUndefined } from '../../../../base/common/types.js';
+import { refineServiceDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { ITextEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { EXTENSION_IDENTIFIER_WITH_LOG_REGEX } from '../../../../platform/environment/common/environmentService.js';
 
 export const IBrowserWorkbenchEnvironmentService = refineServiceDecorator<IEnvironmentService, IBrowserWorkbenchEnvironmentService>(IEnvironmentService);
 
@@ -257,7 +257,7 @@ export class BrowserWorkbenchEnvironmentService implements IBrowserWorkbenchEnvi
 	get disableWorkspaceTrust(): boolean { return !this.options.enableWorkspaceTrust; }
 
 	@memoize
-	get lastActiveProfile(): string | undefined { return this.payload?.get('lastActiveProfile'); }
+	get profile(): string | undefined { return this.payload?.get('profile'); }
 
 	editSessionId: string | undefined = this.options.editSessionId;
 
diff --git a/src/vs/workbench/services/environment/common/environmentService.ts b/src/vs/workbench/services/environment/common/environmentService.ts
index 4c726446196..6ef143d6d1c 100644
--- a/src/vs/workbench/services/environment/common/environmentService.ts
+++ b/src/vs/workbench/services/environment/common/environmentService.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { refineServiceDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IPath } from 'vs/platform/window/common/window';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { URI } from 'vs/base/common/uri';
+import { refineServiceDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IPath } from '../../../../platform/window/common/window.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { URI } from '../../../../base/common/uri.js';
 
 export const IWorkbenchEnvironmentService = refineServiceDecorator<IEnvironmentService, IWorkbenchEnvironmentService>(IEnvironmentService);
 
diff --git a/src/vs/workbench/services/environment/electron-sandbox/environmentService.ts b/src/vs/workbench/services/environment/electron-sandbox/environmentService.ts
index ce1d79f7751..749c5e0a167 100644
--- a/src/vs/workbench/services/environment/electron-sandbox/environmentService.ts
+++ b/src/vs/workbench/services/environment/electron-sandbox/environmentService.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { PerformanceMark } from 'vs/base/common/performance';
-import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { IColorScheme, INativeWindowConfiguration, IOSConfiguration, IPath, IPathsToWaitFor } from 'vs/platform/window/common/window';
-import { IEnvironmentService, INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-import { refineServiceDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { AbstractNativeEnvironmentService } from 'vs/platform/environment/common/environmentService';
-import { memoize } from 'vs/base/common/decorators';
-import { URI } from 'vs/base/common/uri';
-import { Schemas } from 'vs/base/common/network';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { joinPath } from 'vs/base/common/resources';
+import { PerformanceMark } from '../../../../base/common/performance.js';
+import { IBrowserWorkbenchEnvironmentService } from '../browser/environmentService.js';
+import { IColorScheme, INativeWindowConfiguration, IOSConfiguration, IPath, IPathsToWaitFor } from '../../../../platform/window/common/window.js';
+import { IEnvironmentService, INativeEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { refineServiceDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { AbstractNativeEnvironmentService } from '../../../../platform/environment/common/environmentService.js';
+import { memoize } from '../../../../base/common/decorators.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { joinPath } from '../../../../base/common/resources.js';
 
 export const INativeWorkbenchEnvironmentService = refineServiceDecorator<IEnvironmentService, INativeWorkbenchEnvironmentService>(IEnvironmentService);
 
diff --git a/src/vs/workbench/services/environment/electron-sandbox/shellEnvironmentService.ts b/src/vs/workbench/services/environment/electron-sandbox/shellEnvironmentService.ts
index 71ac3a7fbe6..a05b8eacd24 100644
--- a/src/vs/workbench/services/environment/electron-sandbox/shellEnvironmentService.ts
+++ b/src/vs/workbench/services/environment/electron-sandbox/shellEnvironmentService.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IProcessEnvironment } from 'vs/base/common/platform';
-import { process } from 'vs/base/parts/sandbox/electron-sandbox/globals';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IProcessEnvironment } from '../../../../base/common/platform.js';
+import { process } from '../../../../base/parts/sandbox/electron-sandbox/globals.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
 
 export const IShellEnvironmentService = createDecorator<IShellEnvironmentService>('shellEnvironmentService');
 
diff --git a/src/vs/workbench/services/extensionManagement/browser/builtinExtensionsScannerService.ts b/src/vs/workbench/services/extensionManagement/browser/builtinExtensionsScannerService.ts
index e1913359976..97de43c3060 100644
--- a/src/vs/workbench/services/extensionManagement/browser/builtinExtensionsScannerService.ts
+++ b/src/vs/workbench/services/extensionManagement/browser/builtinExtensionsScannerService.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IBuiltinExtensionsScannerService, ExtensionType, IExtensionManifest, TargetPlatform, IExtension } from 'vs/platform/extensions/common/extensions';
-import { isWeb, Language } from 'vs/base/common/platform';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { getGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { builtinExtensionsPath, FileAccess } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { IExtensionResourceLoaderService } from 'vs/platform/extensionResourceLoader/common/extensionResourceLoader';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ITranslations, localizeManifest } from 'vs/platform/extensionManagement/common/extensionNls';
-import { ILogService } from 'vs/platform/log/common/log';
-import { mainWindow } from 'vs/base/browser/window';
+import { IBuiltinExtensionsScannerService, ExtensionType, IExtensionManifest, TargetPlatform, IExtension } from '../../../../platform/extensions/common/extensions.js';
+import { isWeb, Language } from '../../../../base/common/platform.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { getGalleryExtensionId } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { builtinExtensionsPath, FileAccess } from '../../../../base/common/network.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IExtensionResourceLoaderService } from '../../../../platform/extensionResourceLoader/common/extensionResourceLoader.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { ITranslations, localizeManifest } from '../../../../platform/extensionManagement/common/extensionNls.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { mainWindow } from '../../../../base/browser/window.js';
 
 interface IBundledExtension {
 	extensionPath: string;
diff --git a/src/vs/workbench/services/extensionManagement/browser/extensionBisect.ts b/src/vs/workbench/services/extensionManagement/browser/extensionBisect.ts
index d339e68cfe8..940a4e0ce46 100644
--- a/src/vs/workbench/services/extensionManagement/browser/extensionBisect.ts
+++ b/src/vs/workbench/services/extensionManagement/browser/extensionBisect.ts
@@ -3,27 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize, localize2 } from 'vs/nls';
-import { IExtensionManagementService, IGlobalExtensionEnablementService, ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ExtensionType, IExtension, isResolverExtension } from 'vs/platform/extensions/common/extensions';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { INotificationService, IPromptChoice, NotificationPriority, Severity } from 'vs/platform/notification/common/notification';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { createDecorator, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ContextKeyExpr, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Extensions, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { IWorkbenchExtensionEnablementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
+import { localize, localize2 } from '../../../../nls.js';
+import { IExtensionManagementService, IGlobalExtensionEnablementService, ILocalExtension } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { ExtensionType, IExtension, isResolverExtension } from '../../../../platform/extensions/common/extensions.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { INotificationService, IPromptChoice, NotificationPriority, Severity } from '../../../../platform/notification/common/notification.js';
+import { IHostService } from '../../host/browser/host.js';
+import { createDecorator, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { LifecyclePhase } from '../../lifecycle/common/lifecycle.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Extensions, IWorkbenchContributionsRegistry } from '../../../common/contributions.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { areSameExtensions } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { IWorkbenchExtensionEnablementService } from '../common/extensionManagement.js';
 
 // --- bisect service
 
diff --git a/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts b/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
index bbbd1d0b177..3b4a3c04c4f 100644
--- a/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
+++ b/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
@@ -3,31 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { Event, Emitter } from 'vs/base/common/event';
-import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IExtensionManagementService, IExtensionIdentifier, IGlobalExtensionEnablementService, ENABLED_EXTENSIONS_STORAGE_PATH, DISABLED_EXTENSIONS_STORAGE_PATH, InstallOperation } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IWorkbenchExtensionManagementService, IExtensionManagementServer, ExtensionInstallLocation } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { areSameExtensions, BetterMergeId, getExtensionDependencies } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IExtension, isAuthenticationProviderExtension, isLanguagePackExtension, isResolverExtension } from 'vs/platform/extensions/common/extensions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { StorageManager } from 'vs/platform/extensionManagement/common/extensionEnablementService';
-import { webWorkerExtHostConfig, WebWorkerExtHostConfigValue } from 'vs/workbench/services/extensions/common/extensions';
-import { IUserDataSyncAccountService } from 'vs/platform/userDataSync/common/userDataSyncAccount';
-import { IUserDataSyncEnablementService } from 'vs/platform/userDataSync/common/userDataSync';
-import { ILifecycleService, LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { INotificationService, NotificationPriority, Severity } from 'vs/platform/notification/common/notification';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IExtensionBisectService } from 'vs/workbench/services/extensionManagement/browser/extensionBisect';
-import { IWorkspaceTrustManagementService, IWorkspaceTrustRequestService } from 'vs/platform/workspace/common/workspaceTrust';
-import { IExtensionManifestPropertiesService } from 'vs/workbench/services/extensions/common/extensionManifestPropertiesService';
-import { isVirtualWorkspace } from 'vs/platform/workspace/common/virtualWorkspace';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { localize } from '../../../../nls.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { IExtensionManagementService, IExtensionIdentifier, IGlobalExtensionEnablementService, ENABLED_EXTENSIONS_STORAGE_PATH, DISABLED_EXTENSIONS_STORAGE_PATH, InstallOperation } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IWorkbenchExtensionManagementService, IExtensionManagementServer, ExtensionInstallLocation } from '../common/extensionManagement.js';
+import { areSameExtensions, BetterMergeId, getExtensionDependencies } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { IWorkspaceContextService, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { IStorageService, StorageScope } from '../../../../platform/storage/common/storage.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { IExtension, isAuthenticationProviderExtension, isLanguagePackExtension, isResolverExtension } from '../../../../platform/extensions/common/extensions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { StorageManager } from '../../../../platform/extensionManagement/common/extensionEnablementService.js';
+import { webWorkerExtHostConfig, WebWorkerExtHostConfigValue } from '../../extensions/common/extensions.js';
+import { IUserDataSyncAccountService } from '../../../../platform/userDataSync/common/userDataSyncAccount.js';
+import { IUserDataSyncEnablementService } from '../../../../platform/userDataSync/common/userDataSync.js';
+import { ILifecycleService, LifecyclePhase } from '../../lifecycle/common/lifecycle.js';
+import { INotificationService, NotificationPriority, Severity } from '../../../../platform/notification/common/notification.js';
+import { IHostService } from '../../host/browser/host.js';
+import { IExtensionBisectService } from './extensionBisect.js';
+import { IWorkspaceTrustManagementService, IWorkspaceTrustRequestService } from '../../../../platform/workspace/common/workspaceTrust.js';
+import { IExtensionManifestPropertiesService } from '../../extensions/common/extensionManifestPropertiesService.js';
+import { isVirtualWorkspace } from '../../../../platform/workspace/common/virtualWorkspace.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 
 const SOURCE = 'IWorkbenchExtensionEnablementService';
 
@@ -41,7 +41,8 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 	public readonly onEnablementChanged: Event<readonly IExtension[]> = this._onEnablementChanged.event;
 
 	protected readonly extensionsManager: ExtensionsManager;
-	private readonly storageManger: StorageManager;
+	private readonly storageManager: StorageManager;
+	private extensionsDisabledByExtensionDependency: IExtension[] = [];
 
 	constructor(
 		@IStorageService storageService: IStorageService,
@@ -63,7 +64,7 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 		@IInstantiationService instantiationService: IInstantiationService,
 	) {
 		super();
-		this.storageManger = this._register(new StorageManager(storageService));
+		this.storageManager = this._register(new StorageManager(storageService));
 
 		const uninstallDisposable = this._register(Event.filter(extensionManagementService.onDidUninstallExtension, e => !e.error)(({ identifier }) => this._reset(identifier)));
 		let isDisposed = false;
@@ -71,6 +72,7 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 		this.extensionsManager = this._register(instantiationService.createInstance(ExtensionsManager));
 		this.extensionsManager.whenInitialized().then(() => {
 			if (!isDisposed) {
+				this._onDidChangeExtensions([], [], false);
 				this._register(this.extensionsManager.onDidChangeExtensions(({ added, removed, isProfileSwitch }) => this._onDidChangeExtensions(added, removed, isProfileSwitch)));
 				uninstallDisposable.dispose();
 			}
@@ -161,6 +163,8 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 				throw new Error(localize('cannot change enablement virtual workspace', "Cannot change enablement of {0} extension because it does not support virtual workspaces", extension.manifest.displayName || extension.identifier.id));
 			case EnablementState.DisabledByExtensionKind:
 				throw new Error(localize('cannot change enablement extension kind', "Cannot change enablement of {0} extension because of its extension kind", extension.manifest.displayName || extension.identifier.id));
+			case EnablementState.DisabledByInvalidExtension:
+				throw new Error(localize('cannot change invalid extension enablement', "Cannot change enablement of {0} extension because of it is invalid", extension.manifest.displayName || extension.identifier.id));
 			case EnablementState.DisabledByExtensionDependency:
 				if (donotCheckDependencies) {
 					break;
@@ -170,11 +174,7 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 					if (this.isEnabled(dependency)) {
 						continue;
 					}
-					try {
-						this.throwErrorIfCannotChangeEnablement(dependency, true);
-					} catch (error) {
-						throw new Error(localize('cannot change enablement dependency', "Cannot enable '{0}' extension because it depends on '{1}' extension that cannot be enabled", extension.manifest.displayName || extension.identifier.id, dependency.manifest.displayName || dependency.identifier.id));
-					}
+					throw new Error(localize('cannot change enablement dependency', "Cannot enable '{0}' extension because it depends on '{1}' extension that cannot be enabled", extension.manifest.displayName || extension.identifier.id, dependency.manifest.displayName || dependency.identifier.id));
 				}
 		}
 	}
@@ -334,8 +334,13 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 		}
 
 		enablementState = this._getUserEnablementState(extension.identifier);
+		const isEnabled = this.isEnabledEnablementState(enablementState);
 
-		if (this.extensionBisectService.isDisabledByBisect(extension)) {
+		if (isEnabled && !extension.isValid) {
+			enablementState = EnablementState.DisabledByInvalidExtension;
+		}
+
+		else if (this.extensionBisectService.isDisabledByBisect(extension)) {
 			enablementState = EnablementState.DisabledByEnvironment;
 		}
 
@@ -347,7 +352,7 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 			enablementState = EnablementState.DisabledByVirtualWorkspace;
 		}
 
-		else if (this.isEnabledEnablementState(enablementState) && this._isDisabledByWorkspaceTrust(extension, workspaceType)) {
+		else if (isEnabled && this._isDisabledByWorkspaceTrust(extension, workspaceType)) {
 			enablementState = EnablementState.DisabledByTrustRequirement;
 		}
 
@@ -355,11 +360,11 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 			enablementState = EnablementState.DisabledByExtensionKind;
 		}
 
-		else if (this.isEnabledEnablementState(enablementState) && this._isDisabledByExtensionDependency(extension, extensions, workspaceType, computedEnablementStates)) {
+		else if (isEnabled && this._isDisabledByExtensionDependency(extension, extensions, workspaceType, computedEnablementStates)) {
 			enablementState = EnablementState.DisabledByExtensionDependency;
 		}
 
-		else if (!this.isEnabledEnablementState(enablementState) && this._isEnabledInEnv(extension)) {
+		else if (!isEnabled && this._isEnabledInEnv(extension)) {
 			enablementState = EnablementState.EnabledByEnvironment;
 		}
 
@@ -458,11 +463,15 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 	}
 
 	private _isDisabledByExtensionDependency(extension: IExtension, extensions: ReadonlyArray<IExtension>, workspaceType: WorkspaceType, computedEnablementStates: Map<IExtension, EnablementState>): boolean {
-		// Find dependencies from the same server as of the extension
-		const dependencyExtensions = extension.manifest.extensionDependencies
-			? extensions.filter(e =>
-				extension.manifest.extensionDependencies!.some(id => areSameExtensions(e.identifier, { id }) && this.extensionManagementServerService.getExtensionManagementServer(e) === this.extensionManagementServerService.getExtensionManagementServer(extension)))
-			: [];
+
+		if (!extension.manifest.extensionDependencies) {
+			return false;
+		}
+
+		// Find dependency that is from the same server or does not exports any API
+		const dependencyExtensions = extensions.filter(e =>
+			extension.manifest.extensionDependencies?.some(id => areSameExtensions(e.identifier, { id })
+				&& (this.extensionManagementServerService.getExtensionManagementServer(e) === this.extensionManagementServerService.getExtensionManagementServer(extension) || ((e.manifest.main || e.manifest.browser) && e.manifest.api === 'none'))));
 
 		if (!dependencyExtensions.length) {
 			return false;
@@ -610,11 +619,11 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 		if (!this.hasWorkspace) {
 			return [];
 		}
-		return this.storageManger.get(storageId, StorageScope.WORKSPACE);
+		return this.storageManager.get(storageId, StorageScope.WORKSPACE);
 	}
 
 	private _setExtensions(storageId: string, extensions: IExtensionIdentifier[]): void {
-		this.storageManger.set(storageId, extensions, StorageScope.WORKSPACE);
+		this.storageManager.set(storageId, extensions, StorageScope.WORKSPACE);
 	}
 
 	private async _onDidChangeGloballyDisabledExtensions(extensionIdentifiers: ReadonlyArray<IExtensionIdentifier>, source?: string): Promise<void> {
@@ -626,9 +635,21 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 	}
 
 	private _onDidChangeExtensions(added: ReadonlyArray<IExtension>, removed: ReadonlyArray<IExtension>, isProfileSwitch: boolean): void {
-		const disabledExtensions = added.filter(e => !this.isEnabledEnablementState(this.getEnablementState(e)));
-		if (disabledExtensions.length) {
-			this._onEnablementChanged.fire(disabledExtensions);
+		const changedExtensions: IExtension[] = added.filter(e => !this.isEnabledEnablementState(this.getEnablementState(e)));
+		const existingExtensionsDisabledByExtensionDependency = this.extensionsDisabledByExtensionDependency;
+		this.extensionsDisabledByExtensionDependency = this.extensionsManager.extensions.filter(extension => this.getEnablementState(extension) === EnablementState.DisabledByExtensionDependency);
+		for (const extension of existingExtensionsDisabledByExtensionDependency) {
+			if (this.extensionsDisabledByExtensionDependency.every(e => !areSameExtensions(e.identifier, extension.identifier))) {
+				changedExtensions.push(extension);
+			}
+		}
+		for (const extension of this.extensionsDisabledByExtensionDependency) {
+			if (existingExtensionsDisabledByExtensionDependency.every(e => !areSameExtensions(e.identifier, extension.identifier))) {
+				changedExtensions.push(extension);
+			}
+		}
+		if (changedExtensions.length) {
+			this._onEnablementChanged.fire(changedExtensions);
 		}
 		if (!isProfileSwitch) {
 			removed.forEach(({ identifier }) => this._reset(identifier));
@@ -714,6 +735,13 @@ class ExtensionsManager extends Disposable {
 
 	private updateExtensions(added: IExtension[], identifiers: IExtensionIdentifier[], server: IExtensionManagementServer | undefined, isProfileSwitch: boolean): void {
 		if (added.length) {
+			for (const extension of added) {
+				const extensionServer = this.extensionManagementServerService.getExtensionManagementServer(extension);
+				const index = this._extensions.findIndex(e => areSameExtensions(e.identifier, extension.identifier) && this.extensionManagementServerService.getExtensionManagementServer(e) === extensionServer);
+				if (index !== -1) {
+					this._extensions.splice(index, 1);
+				}
+			}
 			this._extensions.push(...added);
 		}
 		const removed: IExtension[] = [];
diff --git a/src/vs/workbench/services/extensionManagement/browser/extensionsProfileScannerService.ts b/src/vs/workbench/services/extensionManagement/browser/extensionsProfileScannerService.ts
index 23880e570a9..edcd2c4775c 100644
--- a/src/vs/workbench/services/extensionManagement/browser/extensionsProfileScannerService.ts
+++ b/src/vs/workbench/services/extensionManagement/browser/extensionsProfileScannerService.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ILogService } from 'vs/platform/log/common/log';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { AbstractExtensionsProfileScannerService, IExtensionsProfileScannerService } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService';
-import { IFileService } from 'vs/platform/files/common/files';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { AbstractExtensionsProfileScannerService, IExtensionsProfileScannerService } from '../../../../platform/extensionManagement/common/extensionsProfileScannerService.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
 
 export class ExtensionsProfileScannerService extends AbstractExtensionsProfileScannerService {
 	constructor(
diff --git a/src/vs/workbench/services/extensionManagement/browser/webExtensionsScannerService.ts b/src/vs/workbench/services/extensionManagement/browser/webExtensionsScannerService.ts
index 17c6ac2cb10..c03d9ff032a 100644
--- a/src/vs/workbench/services/extensionManagement/browser/webExtensionsScannerService.ts
+++ b/src/vs/workbench/services/extensionManagement/browser/webExtensionsScannerService.ts
@@ -3,46 +3,46 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IBuiltinExtensionsScannerService, ExtensionType, IExtensionIdentifier, IExtension, IExtensionManifest, TargetPlatform } from 'vs/platform/extensions/common/extensions';
-import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { IScannedExtension, IWebExtensionsScannerService, ScanOptions } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { isWeb, Language } from 'vs/base/common/platform';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { joinPath } from 'vs/base/common/resources';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { FileOperationError, FileOperationResult, IFileService } from 'vs/platform/files/common/files';
-import { Queue } from 'vs/base/common/async';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { ILogService } from 'vs/platform/log/common/log';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IExtensionGalleryService, IExtensionInfo, IGalleryExtension, IGalleryMetadata, Metadata } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { areSameExtensions, getGalleryExtensionId, getExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ITranslations, localizeManifest } from 'vs/platform/extensionManagement/common/extensionNls';
-import { localize, localize2 } from 'vs/nls';
-import * as semver from 'vs/base/common/semver/semver';
-import { isString, isUndefined } from 'vs/base/common/types';
-import { getErrorMessage } from 'vs/base/common/errors';
-import { ResourceMap } from 'vs/base/common/map';
-import { IExtensionManifestPropertiesService } from 'vs/workbench/services/extensions/common/extensionManifestPropertiesService';
-import { IExtensionResourceLoaderService, migratePlatformSpecificExtensionGalleryResourceURL } from 'vs/platform/extensionResourceLoader/common/extensionResourceLoader';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { IsWebContext } from 'vs/platform/contextkey/common/contextkeys';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { basename } from 'vs/base/common/path';
-import { IExtensionStorageService } from 'vs/platform/extensionManagement/common/extensionStorage';
-import { isNonEmptyArray } from 'vs/base/common/arrays';
-import { ILifecycleService, LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { validateExtensionManifest } from 'vs/platform/extensions/common/extensionValidator';
-import Severity from 'vs/base/common/severity';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
+import { IBuiltinExtensionsScannerService, ExtensionType, IExtensionIdentifier, IExtension, IExtensionManifest, TargetPlatform, IRelaxedExtensionManifest, parseEnabledApiProposalNames } from '../../../../platform/extensions/common/extensions.js';
+import { IBrowserWorkbenchEnvironmentService } from '../../environment/browser/environmentService.js';
+import { IScannedExtension, IWebExtensionsScannerService, ScanOptions } from '../common/extensionManagement.js';
+import { isWeb, Language } from '../../../../base/common/platform.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { joinPath } from '../../../../base/common/resources.js';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
+import { FileOperationError, FileOperationResult, IFileService } from '../../../../platform/files/common/files.js';
+import { Queue } from '../../../../base/common/async.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IExtensionGalleryService, IExtensionInfo, IGalleryExtension, IGalleryMetadata, Metadata } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { areSameExtensions, getGalleryExtensionId, getExtensionId } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ITranslations, localizeManifest } from '../../../../platform/extensionManagement/common/extensionNls.js';
+import { localize, localize2 } from '../../../../nls.js';
+import * as semver from '../../../../base/common/semver/semver.js';
+import { isString, isUndefined } from '../../../../base/common/types.js';
+import { getErrorMessage } from '../../../../base/common/errors.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { IExtensionManifestPropertiesService } from '../../extensions/common/extensionManifestPropertiesService.js';
+import { IExtensionResourceLoaderService, migratePlatformSpecificExtensionGalleryResourceURL } from '../../../../platform/extensionResourceLoader/common/extensionResourceLoader.js';
+import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { IsWebContext } from '../../../../platform/contextkey/common/contextkeys.js';
+import { IEditorService } from '../../editor/common/editorService.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { basename } from '../../../../base/common/path.js';
+import { IExtensionStorageService } from '../../../../platform/extensionManagement/common/extensionStorage.js';
+import { isNonEmptyArray } from '../../../../base/common/arrays.js';
+import { ILifecycleService, LifecyclePhase } from '../../lifecycle/common/lifecycle.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { validateExtensionManifest } from '../../../../platform/extensions/common/extensionValidator.js';
+import Severity from '../../../../base/common/severity.js';
+import { IStringDictionary } from '../../../../base/common/collections.js';
+import { IUserDataProfileService } from '../../userDataProfile/common/userDataProfile.js';
+import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
 
 type GalleryExtensionInfo = { readonly id: string; preRelease?: boolean; migrateStorageFrom?: string };
 type ExtensionInfo = { readonly id: string; preRelease: boolean };
@@ -99,6 +99,7 @@ export class WebExtensionsScannerService extends Disposable implements IWebExten
 	private readonly systemExtensionsCacheResource: URI | undefined = undefined;
 	private readonly customBuiltinExtensionsCacheResource: URI | undefined = undefined;
 	private readonly resourcesAccessQueueMap = new ResourceMap<Queue<IWebExtension[]>>();
+	private readonly extensionsEnabledWithApiProposalVersion: string[];
 
 	constructor(
 		@IBrowserWorkbenchEnvironmentService private readonly environmentService: IBrowserWorkbenchEnvironmentService,
@@ -123,6 +124,7 @@ export class WebExtensionsScannerService extends Disposable implements IWebExten
 			// Eventually update caches
 			lifecycleService.when(LifecyclePhase.Eventually).then(() => this.updateCaches());
 		}
+		this.extensionsEnabledWithApiProposalVersion = productService.extensionsEnabledWithApiProposalVersion?.map(id => id.toLowerCase()) ?? [];
 	}
 
 	private _customBuiltinExtensionsInfoPromise: Promise<{ extensions: ExtensionInfo[]; extensionsToMigrate: [string, string][]; extensionLocations: URI[]; extensionGalleryResources: URI[] }> | undefined;
@@ -735,7 +737,7 @@ export class WebExtensionsScannerService extends Disposable implements IWebExten
 
 	private async toScannedExtension(webExtension: IWebExtension, isBuiltin: boolean, type: ExtensionType = ExtensionType.User): Promise<IScannedExtension> {
 		const validations: [Severity, string][] = [];
-		let manifest: IExtensionManifest | undefined = webExtension.manifest;
+		let manifest: IRelaxedExtensionManifest | undefined = webExtension.manifest;
 
 		if (!manifest) {
 			try {
@@ -766,7 +768,8 @@ export class WebExtensionsScannerService extends Disposable implements IWebExten
 
 		const uuid = (<IGalleryMetadata | undefined>webExtension.metadata)?.id;
 
-		validations.push(...validateExtensionManifest(this.productService.version, this.productService.date, webExtension.location, manifest, false));
+		const validateApiVersion = this.extensionsEnabledWithApiProposalVersion.includes(webExtension.identifier.id.toLowerCase());
+		validations.push(...validateExtensionManifest(this.productService.version, this.productService.date, webExtension.location, manifest, false, validateApiVersion));
 		let isValid = true;
 		for (const [severity, message] of validations) {
 			if (severity === Severity.Error) {
@@ -775,6 +778,10 @@ export class WebExtensionsScannerService extends Disposable implements IWebExten
 			}
 		}
 
+		if (manifest.enabledApiProposals && validateApiVersion) {
+			manifest.enabledApiProposals = parseEnabledApiProposalNames([...manifest.enabledApiProposals]);
+		}
+
 		return {
 			identifier: { id: webExtension.identifier.id, uuid: webExtension.identifier.uuid || uuid },
 			location: webExtension.location,
@@ -800,7 +807,7 @@ export class WebExtensionsScannerService extends Disposable implements IWebExten
 		return [];
 	}
 
-	private async translateManifest(manifest: IExtensionManifest, nlsURL: ITranslations | URI, fallbackNLS?: ITranslations | URI): Promise<IExtensionManifest> {
+	private async translateManifest(manifest: IExtensionManifest, nlsURL: ITranslations | URI, fallbackNLS?: ITranslations | URI): Promise<IRelaxedExtensionManifest> {
 		try {
 			const translations = URI.isUri(nlsURL) ? await this.getTranslations(nlsURL) : nlsURL;
 			const fallbackTranslations = URI.isUri(fallbackNLS) ? await this.getTranslations(fallbackNLS) : fallbackNLS;
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionFeatures.ts b/src/vs/workbench/services/extensionManagement/common/extensionFeatures.ts
index 11d36376d1e..a44288fd902 100644
--- a/src/vs/workbench/services/extensionManagement/common/extensionFeatures.ts
+++ b/src/vs/workbench/services/extensionManagement/common/extensionFeatures.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { Event } from 'vs/base/common/event';
-import { ExtensionIdentifier, IExtensionManifest } from 'vs/platform/extensions/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import Severity from 'vs/base/common/severity';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { ResolvedKeybinding } from 'vs/base/common/keybindings';
-import { Color } from 'vs/base/common/color';
+import { IMarkdownString } from '../../../../base/common/htmlContent.js';
+import { Event } from '../../../../base/common/event.js';
+import { ExtensionIdentifier, IExtensionManifest } from '../../../../platform/extensions/common/extensions.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import Severity from '../../../../base/common/severity.js';
+import { IStringDictionary } from '../../../../base/common/collections.js';
+import { ResolvedKeybinding } from '../../../../base/common/keybindings.js';
+import { Color } from '../../../../base/common/color.js';
 
 export namespace Extensions {
 	export const ExtensionFeaturesRegistry = 'workbench.registry.extensionFeatures';
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionFeaturesManagemetService.ts b/src/vs/workbench/services/extensionManagement/common/extensionFeaturesManagemetService.ts
index 0e60b30cd13..4eeb0851a4d 100644
--- a/src/vs/workbench/services/extensionManagement/common/extensionFeaturesManagemetService.ts
+++ b/src/vs/workbench/services/extensionManagement/common/extensionFeaturesManagemetService.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { Disposable } from 'vs/base/common/lifecycle';
-import Severity from 'vs/base/common/severity';
-import { Extensions, IExtensionFeatureAccessData, IExtensionFeaturesManagementService, IExtensionFeaturesRegistry } from 'vs/workbench/services/extensionManagement/common/extensionFeatures';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { Mutable, isBoolean } from 'vs/base/common/types';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { localize } from 'vs/nls';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IStorageChangeEvent } from 'vs/base/parts/storage/common/storage';
-import { distinct } from 'vs/base/common/arrays';
-import { equals } from 'vs/base/common/objects';
+import { Emitter } from '../../../../base/common/event.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import Severity from '../../../../base/common/severity.js';
+import { Extensions, IExtensionFeatureAccessData, IExtensionFeaturesManagementService, IExtensionFeaturesRegistry } from './extensionFeatures.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IStringDictionary } from '../../../../base/common/collections.js';
+import { Mutable, isBoolean } from '../../../../base/common/types.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { localize } from '../../../../nls.js';
+import { IExtensionService } from '../../extensions/common/extensions.js';
+import { IStorageChangeEvent } from '../../../../base/parts/storage/common/storage.js';
+import { distinct } from '../../../../base/common/arrays.js';
+import { equals } from '../../../../base/common/objects.js';
 
 interface IExtensionFeatureState {
 	disabled?: boolean;
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagement.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagement.ts
index 4886c6ff699..0244e0aa381 100644
--- a/src/vs/workbench/services/extensionManagement/common/extensionManagement.ts
+++ b/src/vs/workbench/services/extensionManagement/common/extensionManagement.ts
@@ -3,18 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { createDecorator, refineServiceDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IExtension, ExtensionType, IExtensionManifest, IExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { IExtensionManagementService, IGalleryExtension, ILocalExtension, InstallOptions, InstallExtensionEvent, DidUninstallExtensionEvent, InstallExtensionResult, Metadata, UninstallExtensionEvent } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { URI } from 'vs/base/common/uri';
-import { FileAccess } from 'vs/base/common/network';
-import { localize } from 'vs/nls';
+import { Event } from '../../../../base/common/event.js';
+import { createDecorator, refineServiceDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IExtension, ExtensionType, IExtensionManifest, IExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { IExtensionManagementService, IGalleryExtension, ILocalExtension, InstallOptions, InstallExtensionEvent, DidUninstallExtensionEvent, InstallExtensionResult, Metadata, UninstallExtensionEvent, DidUpdateExtensionMetadata } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { URI } from '../../../../base/common/uri.js';
+import { FileAccess } from '../../../../base/common/network.js';
+import { localize } from '../../../../nls.js';
 
 export type DidChangeProfileEvent = { readonly added: ILocalExtension[]; readonly removed: ILocalExtension[] };
 
 export const IProfileAwareExtensionManagementService = refineServiceDecorator<IExtensionManagementService, IProfileAwareExtensionManagementService>(IExtensionManagementService);
 export interface IProfileAwareExtensionManagementService extends IExtensionManagementService {
+	readonly onProfileAwareDidInstallExtensions: Event<readonly InstallExtensionResult[]>;
+	readonly onProfileAwareDidUninstallExtension: Event<DidUninstallExtensionEvent>;
+	readonly onProfileAwareDidUpdateExtensionMetadata: Event<DidUpdateExtensionMetadata>;
 	readonly onDidChangeProfile: Event<DidChangeProfileEvent>;
 }
 
@@ -60,12 +63,16 @@ export const IWorkbenchExtensionManagementService = refineServiceDecorator<IProf
 export interface IWorkbenchExtensionManagementService extends IProfileAwareExtensionManagementService {
 	readonly _serviceBrand: undefined;
 
-	onInstallExtension: Event<InstallExtensionOnServerEvent>;
-	onDidInstallExtensions: Event<readonly InstallExtensionResult[]>;
-	onUninstallExtension: Event<UninstallExtensionOnServerEvent>;
-	onDidUninstallExtension: Event<DidUninstallExtensionOnServerEvent>;
-	onDidChangeProfile: Event<DidChangeProfileForServerEvent>;
-	onDidEnableExtensions: Event<IExtension[]>;
+	readonly onInstallExtension: Event<InstallExtensionOnServerEvent>;
+	readonly onDidInstallExtensions: Event<readonly InstallExtensionResult[]>;
+	readonly onUninstallExtension: Event<UninstallExtensionOnServerEvent>;
+	readonly onDidUninstallExtension: Event<DidUninstallExtensionOnServerEvent>;
+	readonly onDidChangeProfile: Event<DidChangeProfileForServerEvent>;
+	readonly onDidEnableExtensions: Event<IExtension[]>;
+
+	readonly onProfileAwareDidInstallExtensions: Event<readonly InstallExtensionResult[]>;
+	readonly onProfileAwareDidUninstallExtension: Event<DidUninstallExtensionOnServerEvent>;
+	readonly onProfileAwareDidUpdateExtensionMetadata: Event<DidUpdateExtensionMetadata>;
 
 	getExtensions(locations: URI[]): Promise<IResourceExtension[]>;
 	getInstalledWorkspaceExtensionLocations(): URI[];
@@ -94,6 +101,7 @@ export const enum EnablementState {
 	DisabledByEnvironment,
 	EnabledByEnvironment,
 	DisabledByVirtualWorkspace,
+	DisabledByInvalidExtension,
 	DisabledByExtensionDependency,
 	DisabledGlobally,
 	DisabledWorkspace,
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagementChannelClient.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagementChannelClient.ts
index dc87c77cb21..21a60fa1428 100644
--- a/src/vs/workbench/services/extensionManagement/common/extensionManagementChannelClient.ts
+++ b/src/vs/workbench/services/extensionManagement/common/extensionManagementChannelClient.ts
@@ -3,23 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ILocalExtension, IGalleryExtension, InstallOptions, UninstallOptions, Metadata, InstallExtensionResult, InstallExtensionInfo, IProductVersion } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { URI } from 'vs/base/common/uri';
-import { ExtensionIdentifier, ExtensionType, IExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { ExtensionManagementChannelClient as BaseExtensionManagementChannelClient, ExtensionEventResult } from 'vs/platform/extensionManagement/common/extensionManagementIpc';
-import { IChannel } from 'vs/base/parts/ipc/common/ipc';
-import { DidChangeUserDataProfileEvent, IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { Emitter } from 'vs/base/common/event';
-import { delta } from 'vs/base/common/arrays';
-import { compare } from 'vs/base/common/strings';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { DidChangeProfileEvent, IProfileAwareExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
+import { ILocalExtension, IGalleryExtension, InstallOptions, UninstallOptions, Metadata, InstallExtensionResult, InstallExtensionInfo, IProductVersion, UninstallExtensionInfo, DidUninstallExtensionEvent, DidUpdateExtensionMetadata, InstallExtensionEvent, UninstallExtensionEvent } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ExtensionIdentifier, ExtensionType, IExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { ExtensionManagementChannelClient as BaseExtensionManagementChannelClient } from '../../../../platform/extensionManagement/common/extensionManagementIpc.js';
+import { IChannel } from '../../../../base/parts/ipc/common/ipc.js';
+import { DidChangeUserDataProfileEvent, IUserDataProfileService } from '../../userDataProfile/common/userDataProfile.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { delta } from '../../../../base/common/arrays.js';
+import { compare } from '../../../../base/common/strings.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { DidChangeProfileEvent, IProfileAwareExtensionManagementService } from './extensionManagement.js';
 
 export abstract class ProfileAwareExtensionManagementChannelClient extends BaseExtensionManagementChannelClient implements IProfileAwareExtensionManagementService {
 
 	private readonly _onDidChangeProfile = this._register(new Emitter<{ readonly added: ILocalExtension[]; readonly removed: ILocalExtension[] }>());
 	readonly onDidChangeProfile = this._onDidChangeProfile.event;
 
+	private readonly _onDidProfileAwareInstallExtensions = this._register(new Emitter<readonly InstallExtensionResult[]>());
+	get onProfileAwareDidInstallExtensions() { return this._onDidProfileAwareInstallExtensions.event; }
+
+	private readonly _onDidProfileAwareUninstallExtension = this._register(new Emitter<DidUninstallExtensionEvent>());
+	get onProfileAwareDidUninstallExtension() { return this._onDidProfileAwareUninstallExtension.event; }
+
+	private readonly _onDidProfileAwareUpdateExtensionMetadata = this._register(new Emitter<DidUpdateExtensionMetadata>());
+	get onProfileAwareDidUpdateExtensionMetadata() { return this._onDidProfileAwareUpdateExtensionMetadata.event; }
+
 	constructor(channel: IChannel,
 		protected readonly userDataProfileService: IUserDataProfileService,
 		protected readonly uriIdentityService: IUriIdentityService,
@@ -32,30 +41,48 @@ export abstract class ProfileAwareExtensionManagementChannelClient extends BaseE
 		}));
 	}
 
-	protected override async fireEvent<E extends ExtensionEventResult>(event: Emitter<E>, data: E): Promise<void>;
-	protected override async fireEvent<E extends ExtensionEventResult>(event: Emitter<readonly E[]>, data: E[]): Promise<void>;
-	protected override async fireEvent(arg0: any, arg1: any): Promise<void> {
-		if (Array.isArray(arg1)) {
-			const event = arg0 as Emitter<ExtensionEventResult[]>;
-			const data = arg1 as ExtensionEventResult[];
-			const filtered = [];
-			for (const e of data) {
-				const result = this.filterEvent(e.profileLocation, e.applicationScoped ?? e.local?.isApplicationScoped ?? false);
-				if (result instanceof Promise ? await result : result) {
-					filtered.push(e);
-				}
-			}
-			if (filtered.length) {
-				event.fire(filtered);
-			}
-		} else {
-			const event = arg0 as Emitter<ExtensionEventResult>;
-			const data = arg1 as ExtensionEventResult;
-			const result = this.filterEvent(data.profileLocation, data.applicationScoped ?? data.local?.isApplicationScoped ?? false);
+	protected override async onInstallExtensionEvent(data: InstallExtensionEvent): Promise<void> {
+		const result = this.filterEvent(data.profileLocation, data.applicationScoped ?? false);
+		if (result instanceof Promise ? await result : result) {
+			this._onInstallExtension.fire(data);
+		}
+	}
+
+	protected override async onDidInstallExtensionsEvent(results: readonly InstallExtensionResult[]): Promise<void> {
+		const filtered = [];
+		for (const e of results) {
+			const result = this.filterEvent(e.profileLocation, e.applicationScoped ?? e.local?.isApplicationScoped ?? false);
 			if (result instanceof Promise ? await result : result) {
-				event.fire(data);
+				filtered.push(e);
 			}
 		}
+		if (filtered.length) {
+			this._onDidInstallExtensions.fire(filtered);
+		}
+		this._onDidProfileAwareInstallExtensions.fire(results);
+	}
+
+	protected override async onUninstallExtensionEvent(data: UninstallExtensionEvent): Promise<void> {
+		const result = this.filterEvent(data.profileLocation, data.applicationScoped ?? false);
+		if (result instanceof Promise ? await result : result) {
+			this._onUninstallExtension.fire(data);
+		}
+	}
+
+	protected override async onDidUninstallExtensionEvent(data: DidUninstallExtensionEvent): Promise<void> {
+		const result = this.filterEvent(data.profileLocation, data.applicationScoped ?? false);
+		if (result instanceof Promise ? await result : result) {
+			this._onDidUninstallExtension.fire(data);
+		}
+		this._onDidProfileAwareUninstallExtension.fire(data);
+	}
+
+	protected override async onDidUpdateExtensionMetadataEvent(data: DidUpdateExtensionMetadata): Promise<void> {
+		const result = this.filterEvent(data.profileLocation, data.local?.isApplicationScoped ?? false);
+		if (result instanceof Promise ? await result : result) {
+			this._onDidUpdateExtensionMetadata.fire(data);
+		}
+		this._onDidProfileAwareUpdateExtensionMetadata.fire(data);
 	}
 
 	override async install(vsix: URI, installOptions?: InstallOptions): Promise<ILocalExtension> {
@@ -85,6 +112,14 @@ export abstract class ProfileAwareExtensionManagementChannelClient extends BaseE
 		return super.uninstall(extension, options);
 	}
 
+	override async uninstallExtensions(extensions: UninstallExtensionInfo[]): Promise<void> {
+		const infos: UninstallExtensionInfo[] = [];
+		for (const { extension, options } of extensions) {
+			infos.push({ extension, options: { ...options, profileLocation: await this.getProfileLocation(options?.profileLocation) } });
+		}
+		return super.uninstallExtensions(infos);
+	}
+
 	override async getInstalled(type: ExtensionType | null = null, extensionsProfileResource?: URI, productVersion?: IProductVersion): Promise<ILocalExtension[]> {
 		return super.getInstalled(type, await this.getProfileLocation(extensionsProfileResource), productVersion);
 	}
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagementServerService.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagementServerService.ts
index d491d528978..c223621d40d 100644
--- a/src/vs/workbench/services/extensionManagement/common/extensionManagementServerService.ts
+++ b/src/vs/workbench/services/extensionManagement/common/extensionManagementServerService.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { ExtensionInstallLocation, IExtensionManagementServer, IExtensionManagementServerService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { Schemas } from 'vs/base/common/network';
-import { IChannel } from 'vs/base/parts/ipc/common/ipc';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { isWeb } from 'vs/base/common/platform';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { WebExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/webExtensionManagementService';
-import { IExtension } from 'vs/platform/extensions/common/extensions';
-import { RemoteExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/remoteExtensionManagementService';
+import { localize } from '../../../../nls.js';
+import { ExtensionInstallLocation, IExtensionManagementServer, IExtensionManagementServerService } from './extensionManagement.js';
+import { IRemoteAgentService } from '../../remote/common/remoteAgentService.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { IChannel } from '../../../../base/parts/ipc/common/ipc.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { isWeb } from '../../../../base/common/platform.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { WebExtensionManagementService } from './webExtensionManagementService.js';
+import { IExtension } from '../../../../platform/extensions/common/extensions.js';
+import { RemoteExtensionManagementService } from './remoteExtensionManagementService.js';
 
 export class ExtensionManagementServerService implements IExtensionManagementServerService {
 
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
index f6ad4675116..45bd7f09aae 100644
--- a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
+++ b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
@@ -3,43 +3,44 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event, EventMultiplexer } from 'vs/base/common/event';
+import { Emitter, Event, EventMultiplexer } from '../../../../base/common/event.js';
 import {
 	ILocalExtension, IGalleryExtension, IExtensionIdentifier, IExtensionsControlManifest, IExtensionGalleryService, InstallOptions, UninstallOptions, InstallExtensionResult, ExtensionManagementError, ExtensionManagementErrorCode, Metadata, InstallOperation, EXTENSION_INSTALL_SOURCE_CONTEXT, InstallExtensionInfo,
 	IProductVersion,
 	ExtensionInstallSource,
-	DidUpdateExtensionMetadata
-} from 'vs/platform/extensionManagement/common/extensionManagement';
-import { DidChangeProfileForServerEvent, DidUninstallExtensionOnServerEvent, IExtensionManagementServer, IExtensionManagementServerService, InstallExtensionOnServerEvent, IResourceExtension, IWorkbenchExtensionManagementService, UninstallExtensionOnServerEvent } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { ExtensionType, isLanguagePackExtension, IExtensionManifest, getWorkspaceSupportTypeMessage, TargetPlatform } from 'vs/platform/extensions/common/extensions';
-import { URI } from 'vs/base/common/uri';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { areSameExtensions, computeTargetPlatform } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { localize } from 'vs/nls';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { Schemas } from 'vs/base/common/network';
-import { IDownloadService } from 'vs/platform/download/common/download';
-import { coalesce } from 'vs/base/common/arrays';
-import { IDialogService, IPromptButton } from 'vs/platform/dialogs/common/dialogs';
-import Severity from 'vs/base/common/severity';
-import { IUserDataSyncEnablementService, SyncResource } from 'vs/platform/userDataSync/common/userDataSync';
-import { Promises } from 'vs/base/common/async';
-import { IWorkspaceTrustRequestService, WorkspaceTrustRequestButton } from 'vs/platform/workspace/common/workspaceTrust';
-import { IExtensionManifestPropertiesService } from 'vs/workbench/services/extensions/common/extensionManifestPropertiesService';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { isString, isUndefined } from 'vs/base/common/types';
-import { FileChangesEvent, IFileService } from 'vs/platform/files/common/files';
-import { ILogService } from 'vs/platform/log/common/log';
-import { CancellationError, getErrorMessage } from 'vs/base/common/errors';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { IExtensionsScannerService, IScannedExtension } from 'vs/platform/extensionManagement/common/extensionsScannerService';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+	DidUpdateExtensionMetadata,
+	UninstallExtensionInfo
+} from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { DidChangeProfileForServerEvent, DidUninstallExtensionOnServerEvent, IExtensionManagementServer, IExtensionManagementServerService, InstallExtensionOnServerEvent, IResourceExtension, IWorkbenchExtensionManagementService, UninstallExtensionOnServerEvent } from './extensionManagement.js';
+import { ExtensionType, isLanguagePackExtension, IExtensionManifest, getWorkspaceSupportTypeMessage, TargetPlatform } from '../../../../platform/extensions/common/extensions.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { areSameExtensions, computeTargetPlatform } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { localize } from '../../../../nls.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { IDownloadService } from '../../../../platform/download/common/download.js';
+import { coalesce } from '../../../../base/common/arrays.js';
+import { IDialogService, IPromptButton } from '../../../../platform/dialogs/common/dialogs.js';
+import Severity from '../../../../base/common/severity.js';
+import { IUserDataSyncEnablementService, SyncResource } from '../../../../platform/userDataSync/common/userDataSync.js';
+import { Promises } from '../../../../base/common/async.js';
+import { IWorkspaceTrustRequestService, WorkspaceTrustRequestButton } from '../../../../platform/workspace/common/workspaceTrust.js';
+import { IExtensionManifestPropertiesService } from '../../extensions/common/extensionManifestPropertiesService.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { isString, isUndefined } from '../../../../base/common/types.js';
+import { FileChangesEvent, IFileService } from '../../../../platform/files/common/files.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { CancellationError, getErrorMessage } from '../../../../base/common/errors.js';
+import { IUserDataProfileService } from '../../userDataProfile/common/userDataProfile.js';
+import { IWorkspaceContextService, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { IExtensionsScannerService, IScannedExtension } from '../../../../platform/extensionManagement/common/extensionsScannerService.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 
 function isGalleryExtension(extension: IResourceExtension | IGalleryExtension): extension is IGalleryExtension {
 	return extension.type === 'gallery';
@@ -62,6 +63,15 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
 	readonly onDidUninstallExtension: Event<DidUninstallExtensionOnServerEvent>;
 
 	readonly onDidUpdateExtensionMetadata: Event<DidUpdateExtensionMetadata>;
+
+	private readonly _onDidProfileAwareInstallExtensions = this._register(new Emitter<readonly InstallExtensionResult[]>());
+	readonly onProfileAwareDidInstallExtensions: Event<readonly InstallExtensionResult[]>;
+
+	private readonly _onDidProfileAwareUninstallExtension = this._register(new Emitter<DidUninstallExtensionOnServerEvent>());
+	readonly onProfileAwareDidUninstallExtension: Event<DidUninstallExtensionOnServerEvent>;
+
+	readonly onProfileAwareDidUpdateExtensionMetadata: Event<DidUpdateExtensionMetadata>;
+
 	readonly onDidChangeProfile: Event<DidChangeProfileForServerEvent>;
 
 	readonly onDidEnableExtensions: Event<ILocalExtension[]>;
@@ -110,6 +120,10 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
 		this._register(onDidInstallExtensionsEventMultiplexer.add(this._onDidInstallExtensions.event));
 		this.onDidInstallExtensions = onDidInstallExtensionsEventMultiplexer.event;
 
+		const onDidProfileAwareInstallExtensionsEventMultiplexer = this._register(new EventMultiplexer<readonly InstallExtensionResult[]>());
+		this._register(onDidProfileAwareInstallExtensionsEventMultiplexer.add(this._onDidProfileAwareInstallExtensions.event));
+		this.onProfileAwareDidInstallExtensions = onDidProfileAwareInstallExtensionsEventMultiplexer.event;
+
 		const onUninstallExtensionEventMultiplexer = this._register(new EventMultiplexer<UninstallExtensionOnServerEvent>());
 		this._register(onUninstallExtensionEventMultiplexer.add(this._onUninstallExtension.event));
 		this.onUninstallExtension = onUninstallExtensionEventMultiplexer.event;
@@ -118,18 +132,28 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
 		this._register(onDidUninstallExtensionEventMultiplexer.add(this._onDidUninstallExtension.event));
 		this.onDidUninstallExtension = onDidUninstallExtensionEventMultiplexer.event;
 
+		const onDidProfileAwareUninstallExtensionEventMultiplexer = this._register(new EventMultiplexer<DidUninstallExtensionOnServerEvent>());
+		this._register(onDidProfileAwareUninstallExtensionEventMultiplexer.add(this._onDidProfileAwareUninstallExtension.event));
+		this.onProfileAwareDidUninstallExtension = onDidProfileAwareUninstallExtensionEventMultiplexer.event;
+
 		const onDidUpdateExtensionMetadaEventMultiplexer = this._register(new EventMultiplexer<DidUpdateExtensionMetadata>());
 		this.onDidUpdateExtensionMetadata = onDidUpdateExtensionMetadaEventMultiplexer.event;
 
+		const onDidProfileAwareUpdateExtensionMetadaEventMultiplexer = this._register(new EventMultiplexer<DidUpdateExtensionMetadata>());
+		this.onProfileAwareDidUpdateExtensionMetadata = onDidProfileAwareUpdateExtensionMetadaEventMultiplexer.event;
+
 		const onDidChangeProfileEventMultiplexer = this._register(new EventMultiplexer<DidChangeProfileForServerEvent>());
 		this.onDidChangeProfile = onDidChangeProfileEventMultiplexer.event;
 
 		for (const server of this.servers) {
 			this._register(onInstallExtensionEventMultiplexer.add(Event.map(server.extensionManagementService.onInstallExtension, e => ({ ...e, server }))));
 			this._register(onDidInstallExtensionsEventMultiplexer.add(server.extensionManagementService.onDidInstallExtensions));
+			this._register(onDidProfileAwareInstallExtensionsEventMultiplexer.add(server.extensionManagementService.onProfileAwareDidInstallExtensions));
 			this._register(onUninstallExtensionEventMultiplexer.add(Event.map(server.extensionManagementService.onUninstallExtension, e => ({ ...e, server }))));
 			this._register(onDidUninstallExtensionEventMultiplexer.add(Event.map(server.extensionManagementService.onDidUninstallExtension, e => ({ ...e, server }))));
+			this._register(onDidProfileAwareUninstallExtensionEventMultiplexer.add(Event.map(server.extensionManagementService.onProfileAwareDidUninstallExtension, e => ({ ...e, server }))));
 			this._register(onDidUpdateExtensionMetadaEventMultiplexer.add(server.extensionManagementService.onDidUpdateExtensionMetadata));
+			this._register(onDidProfileAwareUpdateExtensionMetadaEventMultiplexer.add(server.extensionManagementService.onProfileAwareDidUpdateExtensionMetadata));
 			this._register(onDidChangeProfileEventMultiplexer.add(Event.map(server.extensionManagementService.onDidChangeProfile, e => ({ ...e, server }))));
 		}
 	}
@@ -147,52 +171,72 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
 		return result;
 	}
 
-	async uninstall(extension: ILocalExtension, options?: UninstallOptions): Promise<void> {
-		if (extension.isWorkspaceScoped) {
-			return this.uninstallExtensionFromWorkspace(extension);
-		}
-		const server = this.getServer(extension);
-		if (!server) {
-			return Promise.reject(`Invalid location ${extension.location.toString()}`);
-		}
-		if (this.servers.length > 1) {
-			if (isLanguagePackExtension(extension.manifest)) {
-				return this.uninstallEverywhere(extension, options);
-			}
-			return this.uninstallInServer(extension, server, options);
-		}
-		return server.extensionManagementService.uninstall(extension, options);
+	uninstall(extension: ILocalExtension, options: UninstallOptions): Promise<void> {
+		return this.uninstallExtensions([{ extension, options }]);
 	}
 
-	private async uninstallEverywhere(extension: ILocalExtension, options?: UninstallOptions): Promise<void> {
-		const server = this.getServer(extension);
-		if (!server) {
-			return Promise.reject(`Invalid location ${extension.location.toString()}`);
-		}
-		const promise = server.extensionManagementService.uninstall(extension, options);
-		const otherServers: IExtensionManagementServer[] = this.servers.filter(s => s !== server);
-		if (otherServers.length) {
-			for (const otherServer of otherServers) {
-				const installed = await otherServer.extensionManagementService.getInstalled();
-				extension = installed.filter(i => !i.isBuiltin && areSameExtensions(i.identifier, extension.identifier))[0];
-				if (extension) {
-					await otherServer.extensionManagementService.uninstall(extension, options);
+	async uninstallExtensions(extensions: UninstallExtensionInfo[]): Promise<void> {
+		const workspaceExtensions: ILocalExtension[] = [];
+		const groupedExtensions = new Map<IExtensionManagementServer, UninstallExtensionInfo[]>();
+
+		const addExtensionToServer = (server: IExtensionManagementServer, extension: ILocalExtension, options?: UninstallOptions) => {
+			let extensions = groupedExtensions.get(server);
+			if (!extensions) {
+				groupedExtensions.set(server, extensions = []);
+			}
+			extensions.push({ extension, options });
+		};
+
+		for (const { extension, options } of extensions) {
+			if (extension.isWorkspaceScoped) {
+				workspaceExtensions.push(extension);
+				continue;
+			}
+
+			const server = this.getServer(extension);
+			if (!server) {
+				throw new Error(`Invalid location ${extension.location.toString()}`);
+			}
+			addExtensionToServer(server, extension, options);
+			if (this.servers.length > 1 && isLanguagePackExtension(extension.manifest)) {
+				const otherServers: IExtensionManagementServer[] = this.servers.filter(s => s !== server);
+				for (const otherServer of otherServers) {
+					const installed = await otherServer.extensionManagementService.getInstalled();
+					const extensionInOtherServer = installed.find(i => !i.isBuiltin && areSameExtensions(i.identifier, extension.identifier));
+					if (extensionInOtherServer) {
+						addExtensionToServer(otherServer, extensionInOtherServer, options);
+					}
 				}
 			}
 		}
-		return promise;
+
+		const promises: Promise<void>[] = [];
+		for (const workspaceExtension of workspaceExtensions) {
+			promises.push(this.uninstallExtensionFromWorkspace(workspaceExtension));
+		}
+		for (const [server, extensions] of groupedExtensions.entries()) {
+			promises.push(this.uninstallInServer(server, extensions));
+		}
+
+		const result = await Promise.allSettled(promises);
+		const errors = result.filter(r => r.status === 'rejected').map(r => r.reason);
+		if (errors.length) {
+			throw new Error(errors.map(e => e.message).join('\n'));
+		}
 	}
 
-	private async uninstallInServer(extension: ILocalExtension, server: IExtensionManagementServer, options?: UninstallOptions): Promise<void> {
-		if (server === this.extensionManagementServerService.localExtensionManagementServer) {
-			const installedExtensions = await this.extensionManagementServerService.remoteExtensionManagementServer!.extensionManagementService.getInstalled(ExtensionType.User);
-			const dependentNonUIExtensions = installedExtensions.filter(i => !this.extensionManifestPropertiesService.prefersExecuteOnUI(i.manifest)
-				&& i.manifest.extensionDependencies && i.manifest.extensionDependencies.some(id => areSameExtensions({ id }, extension.identifier)));
-			if (dependentNonUIExtensions.length) {
-				return Promise.reject(new Error(this.getDependentsErrorMessage(extension, dependentNonUIExtensions)));
+	private async uninstallInServer(server: IExtensionManagementServer, extensions: UninstallExtensionInfo[]): Promise<void> {
+		if (server === this.extensionManagementServerService.localExtensionManagementServer && this.extensionManagementServerService.remoteExtensionManagementServer) {
+			for (const { extension } of extensions) {
+				const installedExtensions = await this.extensionManagementServerService.remoteExtensionManagementServer.extensionManagementService.getInstalled(ExtensionType.User);
+				const dependentNonUIExtensions = installedExtensions.filter(i => !this.extensionManifestPropertiesService.prefersExecuteOnUI(i.manifest)
+					&& i.manifest.extensionDependencies && i.manifest.extensionDependencies.some(id => areSameExtensions({ id }, extension.identifier)));
+				if (dependentNonUIExtensions.length) {
+					throw (new Error(this.getDependentsErrorMessage(extension, dependentNonUIExtensions)));
+				}
 			}
 		}
-		return server.extensionManagementService.uninstall(extension, options);
+		return server.extensionManagementService.uninstallExtensions(extensions);
 	}
 
 	private getDependentsErrorMessage(extension: ILocalExtension, dependents: ILocalExtension[]): string {
@@ -226,6 +270,10 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
 		return Promise.reject(`Invalid location ${extension.location.toString()}`);
 	}
 
+	async resetPinnedStateForAllUserExtensions(pinned: boolean): Promise<void> {
+		await Promise.allSettled(this.servers.map(server => server.extensionManagementService.resetPinnedStateForAllUserExtensions(pinned)));
+	}
+
 	zip(extension: ILocalExtension): Promise<URI> {
 		const server = this.getServer(extension);
 		if (server) {
@@ -234,13 +282,6 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
 		return Promise.reject(`Invalid location ${extension.location.toString()}`);
 	}
 
-	unzip(zipLocation: URI): Promise<IExtensionIdentifier> {
-		return Promises.settled(this.servers
-			// Filter out web server
-			.filter(server => server !== this.extensionManagementServerService.webExtensionManagementServer)
-			.map(({ extensionManagementService }) => extensionManagementService.unzip(zipLocation))).then(([extensionIdentifier]) => extensionIdentifier);
-	}
-
 	download(extension: IGalleryExtension, operation: InstallOperation, donotVerifySignature: boolean): Promise<URI> {
 		if (this.extensionManagementServerService.localExtensionManagementServer) {
 			return this.extensionManagementServerService.localExtensionManagementServer.extensionManagementService.download(extension, operation, donotVerifySignature);
@@ -378,6 +419,7 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
 			servers.push(server);
 		}
 
+		installOptions = { ...(installOptions || {}), isApplicationScoped: extension.isApplicationScoped };
 		return Promises.settled(servers.map(server => server.extensionManagementService.installFromGallery(gallery, installOptions))).then(([local]) => local);
 	}
 
@@ -1012,7 +1054,7 @@ class WorkspaceExtensionsManagementService extends Disposable {
 		if (extension.manifest.main) {
 			if (!(await this.fileService.exists(this.uriIdentityService.extUri.joinPath(extension.location, extension.manifest.main)))) {
 				isValid = false;
-				validations.push([Severity.Error, localize('main.notFound', "Cannot activate, becase {0} not found", extension.manifest.main)]);
+				validations.push([Severity.Error, localize('main.notFound', "Cannot activate because {0} not found", extension.manifest.main)]);
 			}
 		}
 		return {
diff --git a/src/vs/workbench/services/extensionManagement/common/remoteExtensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/remoteExtensionManagementService.ts
index 17643ad3a5e..4d06795a9cc 100644
--- a/src/vs/workbench/services/extensionManagement/common/remoteExtensionManagementService.ts
+++ b/src/vs/workbench/services/extensionManagement/common/remoteExtensionManagementService.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IChannel } from 'vs/base/parts/ipc/common/ipc';
-import { URI } from 'vs/base/common/uri';
-import { DidChangeProfileEvent, IProfileAwareExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IRemoteUserDataProfilesService } from 'vs/workbench/services/userDataProfile/common/remoteUserDataProfiles';
-import { ProfileAwareExtensionManagementChannelClient } from 'vs/workbench/services/extensionManagement/common/extensionManagementChannelClient';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
+import { IChannel } from '../../../../base/parts/ipc/common/ipc.js';
+import { URI } from '../../../../base/common/uri.js';
+import { DidChangeProfileEvent, IProfileAwareExtensionManagementService } from './extensionManagement.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IRemoteUserDataProfilesService } from '../../userDataProfile/common/remoteUserDataProfiles.js';
+import { ProfileAwareExtensionManagementChannelClient } from './extensionManagementChannelClient.js';
+import { IUserDataProfileService } from '../../userDataProfile/common/userDataProfile.js';
+import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
 
 export class RemoteExtensionManagementService extends ProfileAwareExtensionManagementChannelClient implements IProfileAwareExtensionManagementService {
 
diff --git a/src/vs/workbench/services/extensionManagement/common/webExtensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/webExtensionManagementService.ts
index a68f7115fb6..b3c04e94edb 100644
--- a/src/vs/workbench/services/extensionManagement/common/webExtensionManagementService.ts
+++ b/src/vs/workbench/services/extensionManagement/common/webExtensionManagementService.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ExtensionIdentifier, ExtensionType, IExtension, IExtensionIdentifier, IExtensionManifest, TargetPlatform } from 'vs/platform/extensions/common/extensions';
-import { ILocalExtension, IGalleryExtension, InstallOperation, IExtensionGalleryService, Metadata, InstallOptions, IProductVersion } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { URI } from 'vs/base/common/uri';
-import { Emitter, Event } from 'vs/base/common/event';
-import { areSameExtensions, getGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { IProfileAwareExtensionManagementService, IScannedExtension, IWebExtensionsScannerService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { ILogService } from 'vs/platform/log/common/log';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { AbstractExtensionManagementService, AbstractExtensionTask, IInstallExtensionTask, InstallExtensionTaskOptions, IUninstallExtensionTask, toExtensionManagementError, UninstallExtensionTaskOptions } from 'vs/platform/extensionManagement/common/abstractExtensionManagementService';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IExtensionManifestPropertiesService } from 'vs/workbench/services/extensions/common/extensionManifestPropertiesService';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { isBoolean, isUndefined } from 'vs/base/common/types';
-import { DidChangeUserDataProfileEvent, IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { delta } from 'vs/base/common/arrays';
-import { compare } from 'vs/base/common/strings';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import { ExtensionIdentifier, ExtensionType, IExtension, IExtensionIdentifier, IExtensionManifest, TargetPlatform } from '../../../../platform/extensions/common/extensions.js';
+import { ILocalExtension, IGalleryExtension, InstallOperation, IExtensionGalleryService, Metadata, InstallOptions, IProductVersion } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { areSameExtensions, getGalleryExtensionId } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { IProfileAwareExtensionManagementService, IScannedExtension, IWebExtensionsScannerService } from './extensionManagement.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { AbstractExtensionManagementService, AbstractExtensionTask, IInstallExtensionTask, InstallExtensionTaskOptions, IUninstallExtensionTask, toExtensionManagementError, UninstallExtensionTaskOptions } from '../../../../platform/extensionManagement/common/abstractExtensionManagementService.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IExtensionManifestPropertiesService } from '../../extensions/common/extensionManifestPropertiesService.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { isBoolean, isUndefined } from '../../../../base/common/types.js';
+import { DidChangeUserDataProfileEvent, IUserDataProfileService } from '../../userDataProfile/common/userDataProfile.js';
+import { delta } from '../../../../base/common/arrays.js';
+import { compare } from '../../../../base/common/strings.js';
+import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
 
 export class WebExtensionManagementService extends AbstractExtensionManagementService implements IProfileAwareExtensionManagementService {
 
@@ -48,6 +48,8 @@ export class WebExtensionManagementService extends AbstractExtensionManagementSe
 	private readonly _onDidChangeProfile = this._register(new Emitter<{ readonly added: ILocalExtension[]; readonly removed: ILocalExtension[] }>());
 	readonly onDidChangeProfile = this._onDidChangeProfile.event;
 
+	get onProfileAwareDidUpdateExtensionMetadata() { return super.onDidUpdateExtensionMetadata; }
+
 	constructor(
 		@IExtensionGalleryService extensionGalleryService: IExtensionGalleryService,
 		@ITelemetryService telemetryService: ITelemetryService,
@@ -199,7 +201,6 @@ export class WebExtensionManagementService extends AbstractExtensionManagementSe
 	}
 
 	zip(extension: ILocalExtension): Promise<URI> { throw new Error('unsupported'); }
-	unzip(zipLocation: URI): Promise<IExtensionIdentifier> { throw new Error('unsupported'); }
 	getManifest(vsix: URI): Promise<IExtensionManifest> { throw new Error('unsupported'); }
 	download(): Promise<URI> { throw new Error('unsupported'); }
 	reinstallFromGallery(): Promise<ILocalExtension> { throw new Error('unsupported'); }
@@ -306,7 +307,7 @@ class UninstallExtensionTask extends AbstractExtensionTask<void> implements IUni
 
 	constructor(
 		readonly extension: ILocalExtension,
-		private readonly options: UninstallExtensionTaskOptions,
+		readonly options: UninstallExtensionTaskOptions,
 		private readonly webExtensionsScannerService: IWebExtensionsScannerService,
 	) {
 		super();
diff --git a/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionManagementServerService.ts b/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionManagementServerService.ts
index ccb40a9fbcc..eaf010aafef 100644
--- a/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionManagementServerService.ts
+++ b/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionManagementServerService.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { Schemas } from 'vs/base/common/network';
-import { ExtensionInstallLocation, IExtensionManagementServer, IExtensionManagementServerService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { IChannel } from 'vs/base/parts/ipc/common/ipc';
-import { ISharedProcessService } from 'vs/platform/ipc/electron-sandbox/services';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { NativeRemoteExtensionManagementService } from 'vs/workbench/services/extensionManagement/electron-sandbox/remoteExtensionManagementService';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { IExtension } from 'vs/platform/extensions/common/extensions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { NativeExtensionManagementService } from 'vs/workbench/services/extensionManagement/electron-sandbox/nativeExtensionManagementService';
-import { Disposable } from 'vs/base/common/lifecycle';
+import { localize } from '../../../../nls.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { ExtensionInstallLocation, IExtensionManagementServer, IExtensionManagementServerService } from '../common/extensionManagement.js';
+import { IRemoteAgentService } from '../../remote/common/remoteAgentService.js';
+import { IChannel } from '../../../../base/parts/ipc/common/ipc.js';
+import { ISharedProcessService } from '../../../../platform/ipc/electron-sandbox/services.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { NativeRemoteExtensionManagementService } from './remoteExtensionManagementService.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { IExtension } from '../../../../platform/extensions/common/extensions.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { NativeExtensionManagementService } from './nativeExtensionManagementService.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
 
 export class ExtensionManagementServerService extends Disposable implements IExtensionManagementServerService {
 
diff --git a/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionManagementService.ts b/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionManagementService.ts
index 57c4c98a90f..ea710b20160 100644
--- a/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionManagementService.ts
+++ b/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionManagementService.ts
@@ -3,28 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { generateUuid } from 'vs/base/common/uuid';
-import { ILocalExtension, IExtensionGalleryService, InstallOptions } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { URI } from 'vs/base/common/uri';
-import { ExtensionManagementService as BaseExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagementService';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IExtensionManagementServer, IExtensionManagementServerService, IWorkbenchExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { Schemas } from 'vs/base/common/network';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IDownloadService } from 'vs/platform/download/common/download';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
-import { joinPath } from 'vs/base/common/resources';
-import { IUserDataSyncEnablementService } from 'vs/platform/userDataSync/common/userDataSync';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IWorkspaceTrustRequestService } from 'vs/platform/workspace/common/workspaceTrust';
-import { IExtensionManifestPropertiesService } from 'vs/workbench/services/extensions/common/extensionManifestPropertiesService';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IFileService } from 'vs/platform/files/common/files';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { IExtensionsScannerService } from 'vs/platform/extensionManagement/common/extensionsScannerService';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { ILocalExtension, IExtensionGalleryService, InstallOptions } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ExtensionManagementService as BaseExtensionManagementService } from '../common/extensionManagementService.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IExtensionManagementServer, IExtensionManagementServerService, IWorkbenchExtensionManagementService } from '../common/extensionManagement.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IDownloadService } from '../../../../platform/download/common/download.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { INativeWorkbenchEnvironmentService } from '../../environment/electron-sandbox/environmentService.js';
+import { joinPath } from '../../../../base/common/resources.js';
+import { IUserDataSyncEnablementService } from '../../../../platform/userDataSync/common/userDataSync.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IWorkspaceTrustRequestService } from '../../../../platform/workspace/common/workspaceTrust.js';
+import { IExtensionManifestPropertiesService } from '../../extensions/common/extensionManifestPropertiesService.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IUserDataProfileService } from '../../userDataProfile/common/userDataProfile.js';
+import { IExtensionsScannerService } from '../../../../platform/extensionManagement/common/extensionsScannerService.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 
 export class ExtensionManagementService extends BaseExtensionManagementService {
 
diff --git a/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionTipsService.ts b/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionTipsService.ts
index 468793f4f8d..f27ddc63799 100644
--- a/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionTipsService.ts
+++ b/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionTipsService.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ISharedProcessService } from 'vs/platform/ipc/electron-sandbox/services';
-import { IChannel } from 'vs/base/parts/ipc/common/ipc';
-import { IExtensionTipsService, IExecutableBasedExtensionTip, IConfigBasedExtensionTip } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { URI } from 'vs/base/common/uri';
-import { ExtensionTipsService } from 'vs/platform/extensionManagement/common/extensionTipsService';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { Schemas } from 'vs/base/common/network';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ISharedProcessService } from '../../../../platform/ipc/electron-sandbox/services.js';
+import { IChannel } from '../../../../base/parts/ipc/common/ipc.js';
+import { IExtensionTipsService, IExecutableBasedExtensionTip, IConfigBasedExtensionTip } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ExtensionTipsService } from '../../../../platform/extensionManagement/common/extensionTipsService.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { Schemas } from '../../../../base/common/network.js';
 
 class NativeExtensionTipsService extends ExtensionTipsService implements IExtensionTipsService {
 
diff --git a/src/vs/workbench/services/extensionManagement/electron-sandbox/nativeExtensionManagementService.ts b/src/vs/workbench/services/extensionManagement/electron-sandbox/nativeExtensionManagementService.ts
index f5a980a319a..af1a1f1fa7c 100644
--- a/src/vs/workbench/services/extensionManagement/electron-sandbox/nativeExtensionManagementService.ts
+++ b/src/vs/workbench/services/extensionManagement/electron-sandbox/nativeExtensionManagementService.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IChannel } from 'vs/base/parts/ipc/common/ipc';
-import { DidChangeProfileEvent, IProfileAwareExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { URI } from 'vs/base/common/uri';
-import { ILocalExtension, InstallOptions } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { joinPath } from 'vs/base/common/resources';
-import { Schemas } from 'vs/base/common/network';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IDownloadService } from 'vs/platform/download/common/download';
-import { IFileService } from 'vs/platform/files/common/files';
-import { generateUuid } from 'vs/base/common/uuid';
-import { ProfileAwareExtensionManagementChannelClient } from 'vs/workbench/services/extensionManagement/common/extensionManagementChannelClient';
-import { ExtensionIdentifier, ExtensionType, isResolverExtension } from 'vs/platform/extensions/common/extensions';
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
+import { IChannel } from '../../../../base/parts/ipc/common/ipc.js';
+import { DidChangeProfileEvent, IProfileAwareExtensionManagementService } from '../common/extensionManagement.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ILocalExtension, InstallOptions } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IUserDataProfileService } from '../../userDataProfile/common/userDataProfile.js';
+import { joinPath } from '../../../../base/common/resources.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IDownloadService } from '../../../../platform/download/common/download.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { ProfileAwareExtensionManagementChannelClient } from '../common/extensionManagementChannelClient.js';
+import { ExtensionIdentifier, ExtensionType, isResolverExtension } from '../../../../platform/extensions/common/extensions.js';
+import { INativeWorkbenchEnvironmentService } from '../../environment/electron-sandbox/environmentService.js';
 
 export class NativeExtensionManagementService extends ProfileAwareExtensionManagementChannelClient implements IProfileAwareExtensionManagementService {
 
diff --git a/src/vs/workbench/services/extensionManagement/electron-sandbox/remoteExtensionManagementService.ts b/src/vs/workbench/services/extensionManagement/electron-sandbox/remoteExtensionManagementService.ts
index 79cf8b0ad4e..1cd69fbf9f0 100644
--- a/src/vs/workbench/services/extensionManagement/electron-sandbox/remoteExtensionManagementService.ts
+++ b/src/vs/workbench/services/extensionManagement/electron-sandbox/remoteExtensionManagementService.ts
@@ -3,27 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IChannel } from 'vs/base/parts/ipc/common/ipc';
-import { ILocalExtension, IGalleryExtension, IExtensionGalleryService, InstallOperation, InstallOptions, ExtensionManagementError, ExtensionManagementErrorCode, EXTENSION_INSTALL_CLIENT_TARGET_PLATFORM_CONTEXT } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { URI } from 'vs/base/common/uri';
-import { ExtensionType, IExtensionManifest } from 'vs/platform/extensions/common/extensions';
-import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { ILogService } from 'vs/platform/log/common/log';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { isNonEmptyArray } from 'vs/base/common/arrays';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { localize } from 'vs/nls';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IExtensionManagementServer } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { Promises } from 'vs/base/common/async';
-import { IExtensionManifestPropertiesService } from 'vs/workbench/services/extensions/common/extensionManifestPropertiesService';
-import { IFileService } from 'vs/platform/files/common/files';
-import { RemoteExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/remoteExtensionManagementService';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { IRemoteUserDataProfilesService } from 'vs/workbench/services/userDataProfile/common/remoteUserDataProfiles';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
+import { IChannel } from '../../../../base/parts/ipc/common/ipc.js';
+import { ILocalExtension, IGalleryExtension, IExtensionGalleryService, InstallOperation, InstallOptions, ExtensionManagementError, ExtensionManagementErrorCode, EXTENSION_INSTALL_CLIENT_TARGET_PLATFORM_CONTEXT } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ExtensionType, IExtensionManifest } from '../../../../platform/extensions/common/extensions.js';
+import { areSameExtensions } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { toErrorMessage } from '../../../../base/common/errorMessage.js';
+import { isNonEmptyArray } from '../../../../base/common/arrays.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { localize } from '../../../../nls.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IExtensionManagementServer } from '../common/extensionManagement.js';
+import { Promises } from '../../../../base/common/async.js';
+import { IExtensionManifestPropertiesService } from '../../extensions/common/extensionManifestPropertiesService.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { RemoteExtensionManagementService } from '../common/remoteExtensionManagementService.js';
+import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { IUserDataProfileService } from '../../userDataProfile/common/userDataProfile.js';
+import { IRemoteUserDataProfilesService } from '../../userDataProfile/common/remoteUserDataProfiles.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { areApiProposalsCompatible } from '../../../../platform/extensions/common/extensionValidator.js';
+import { isBoolean, isUndefined } from '../../../../base/common/types.js';
 
 export class NativeRemoteExtensionManagementService extends RemoteExtensionManagementService {
 
@@ -50,15 +52,19 @@ export class NativeRemoteExtensionManagementService extends RemoteExtensionManag
 		return local;
 	}
 
-	override async installFromGallery(extension: IGalleryExtension, installOptions?: InstallOptions): Promise<ILocalExtension> {
+	override async installFromGallery(extension: IGalleryExtension, installOptions: InstallOptions = {}): Promise<ILocalExtension> {
+		if (isUndefined(installOptions.donotVerifySignature)) {
+			const value = this.configurationService.getValue('extensions.verifySignature');
+			installOptions.donotVerifySignature = isBoolean(value) ? !value : undefined;
+		}
 		const local = await this.doInstallFromGallery(extension, installOptions);
 		await this.installUIDependenciesAndPackedExtensions(local);
 		return local;
 	}
 
-	private async doInstallFromGallery(extension: IGalleryExtension, installOptions?: InstallOptions): Promise<ILocalExtension> {
+	private async doInstallFromGallery(extension: IGalleryExtension, installOptions: InstallOptions): Promise<ILocalExtension> {
 		if (this.configurationService.getValue('remote.downloadExtensionsLocally')) {
-			return this.downloadAndInstall(extension, installOptions || {});
+			return this.downloadAndInstall(extension, installOptions);
 		}
 		try {
 			const clientTargetPlatform = await this.localExtensionManagementServer.extensionManagementService.getTargetPlatform();
@@ -72,7 +78,7 @@ export class NativeRemoteExtensionManagementService extends RemoteExtensionManag
 				case ExtensionManagementErrorCode.Unknown:
 					try {
 						this.logService.error(`Error while installing '${extension.identifier.id}' extension in the remote server.`, toErrorMessage(error));
-						return await this.downloadAndInstall(extension, installOptions || {});
+						return await this.downloadAndInstall(extension, installOptions);
 					} catch (e) {
 						this.logService.error(e);
 						throw e;
@@ -105,7 +111,7 @@ export class NativeRemoteExtensionManagementService extends RemoteExtensionManag
 		const location = await this.localExtensionManagementServer.extensionManagementService.download(compatible, installed.filter(i => areSameExtensions(i.identifier, compatible.identifier))[0] ? InstallOperation.Update : InstallOperation.Install, !!installOptions.donotVerifySignature);
 		this.logService.info('Downloaded extension:', compatible.identifier.id, location.path);
 		try {
-			const local = await super.install(location, installOptions);
+			const local = await super.install(location, { ...installOptions, keepExisting: true });
 			this.logService.info(`Successfully installed '${compatible.identifier.id}' extension`);
 			return local;
 		} finally {
@@ -134,6 +140,10 @@ export class NativeRemoteExtensionManagementService extends RemoteExtensionManag
 		}
 
 		if (!compatibleExtension) {
+			const incompatibleApiProposalsMessages: string[] = [];
+			if (!areApiProposalsCompatible(extension.properties.enabledApiProposals ?? [], incompatibleApiProposalsMessages)) {
+				throw new ExtensionManagementError(localize('incompatibleAPI', "Can't install '{0}' extension. {1}", extension.displayName ?? extension.identifier.id, incompatibleApiProposalsMessages[0]), ExtensionManagementErrorCode.IncompatibleApi);
+			}
 			/** If no compatible release version is found, check if the extension has a release version or not and throw relevant error */
 			if (!includePreRelease && extension.properties.isPreReleaseVersion && (await this.galleryService.getExtensions([extension.identifier], CancellationToken.None))[0]) {
 				throw new ExtensionManagementError(localize('notFoundReleaseExtension', "Can't install release version of '{0}' extension because it has no release version.", extension.identifier.id), ExtensionManagementErrorCode.ReleaseVersionNotFound);
diff --git a/src/vs/workbench/services/extensionManagement/test/browser/extensionEnablementService.test.ts b/src/vs/workbench/services/extensionManagement/test/browser/extensionEnablementService.test.ts
index 89838969713..002fbc26134 100644
--- a/src/vs/workbench/services/extensionManagement/test/browser/extensionEnablementService.test.ts
+++ b/src/vs/workbench/services/extensionManagement/test/browser/extensionEnablementService.test.ts
@@ -4,42 +4,42 @@
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
 import * as sinon from 'sinon';
-import { IExtensionManagementService, DidUninstallExtensionEvent, ILocalExtension, InstallExtensionEvent, InstallExtensionResult, UninstallExtensionEvent, DidUpdateExtensionMetadata } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionManagementServer, IWorkbenchExtensionManagementService, ExtensionInstallLocation, IProfileAwareExtensionManagementService, DidChangeProfileEvent } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { ExtensionEnablementService } from 'vs/workbench/services/extensionManagement/browser/extensionEnablementService';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { Emitter } from 'vs/base/common/event';
-import { IWorkspace, IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IStorageService, InMemoryStorageService } from 'vs/platform/storage/common/storage';
-import { IExtensionContributions, ExtensionType, IExtension, IExtensionManifest } from 'vs/platform/extensions/common/extensions';
-import { isUndefinedOrNull } from 'vs/base/common/types';
-import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { URI } from 'vs/base/common/uri';
-import { Schemas } from 'vs/base/common/network';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { TestLifecycleService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { GlobalExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionEnablementService';
-import { IUserDataSyncAccountService, UserDataSyncAccountService } from 'vs/platform/userDataSync/common/userDataSyncAccount';
-import { IUserDataSyncEnablementService } from 'vs/platform/userDataSync/common/userDataSync';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { mock } from 'vs/base/test/common/mock';
-import { IExtensionBisectService } from 'vs/workbench/services/extensionManagement/browser/extensionBisect';
-import { IWorkspaceTrustManagementService, IWorkspaceTrustRequestService, WorkspaceTrustRequestOptions } from 'vs/platform/workspace/common/workspaceTrust';
-import { ExtensionManifestPropertiesService, IExtensionManifestPropertiesService } from 'vs/workbench/services/extensions/common/extensionManifestPropertiesService';
-import { TestContextService, TestProductService, TestWorkspaceTrustEnablementService, TestWorkspaceTrustManagementService } from 'vs/workbench/test/common/workbenchTestServices';
-import { TestWorkspace } from 'vs/platform/workspace/test/common/testWorkspace';
-import { ExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagementService';
-import { ILogService, NullLogService } from 'vs/platform/log/common/log';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IFileService } from 'vs/platform/files/common/files';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { IProductService } from 'vs/platform/product/common/productService';
+import { IExtensionManagementService, DidUninstallExtensionEvent, ILocalExtension, InstallExtensionEvent, InstallExtensionResult, UninstallExtensionEvent, DidUpdateExtensionMetadata, InstallOperation } from '../../../../../platform/extensionManagement/common/extensionManagement.js';
+import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionManagementServer, IWorkbenchExtensionManagementService, ExtensionInstallLocation, IProfileAwareExtensionManagementService, DidChangeProfileEvent } from '../../common/extensionManagement.js';
+import { ExtensionEnablementService } from '../../browser/extensionEnablementService.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { IWorkspace, IWorkspaceContextService, WorkbenchState } from '../../../../../platform/workspace/common/workspace.js';
+import { IWorkbenchEnvironmentService } from '../../../environment/common/environmentService.js';
+import { IStorageService, InMemoryStorageService } from '../../../../../platform/storage/common/storage.js';
+import { IExtensionContributions, ExtensionType, IExtension, IExtensionManifest } from '../../../../../platform/extensions/common/extensions.js';
+import { isUndefinedOrNull } from '../../../../../base/common/types.js';
+import { areSameExtensions } from '../../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { TestLifecycleService } from '../../../../test/browser/workbenchTestServices.js';
+import { GlobalExtensionEnablementService } from '../../../../../platform/extensionManagement/common/extensionEnablementService.js';
+import { IUserDataSyncAccountService, UserDataSyncAccountService } from '../../../../../platform/userDataSync/common/userDataSyncAccount.js';
+import { IUserDataSyncEnablementService } from '../../../../../platform/userDataSync/common/userDataSync.js';
+import { ILifecycleService } from '../../../lifecycle/common/lifecycle.js';
+import { INotificationService } from '../../../../../platform/notification/common/notification.js';
+import { TestNotificationService } from '../../../../../platform/notification/test/common/testNotificationService.js';
+import { IHostService } from '../../../host/browser/host.js';
+import { mock } from '../../../../../base/test/common/mock.js';
+import { IExtensionBisectService } from '../../browser/extensionBisect.js';
+import { IWorkspaceTrustManagementService, IWorkspaceTrustRequestService, WorkspaceTrustRequestOptions } from '../../../../../platform/workspace/common/workspaceTrust.js';
+import { ExtensionManifestPropertiesService, IExtensionManifestPropertiesService } from '../../../extensions/common/extensionManifestPropertiesService.js';
+import { TestContextService, TestProductService, TestWorkspaceTrustEnablementService, TestWorkspaceTrustManagementService } from '../../../../test/common/workbenchTestServices.js';
+import { TestWorkspace } from '../../../../../platform/workspace/test/common/testWorkspace.js';
+import { ExtensionManagementService } from '../../common/extensionManagementService.js';
+import { ILogService, NullLogService } from '../../../../../platform/log/common/log.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { FileService } from '../../../../../platform/files/common/fileService.js';
+import { IProductService } from '../../../../../platform/product/common/productService.js';
 
 function createStorageService(instantiationService: TestInstantiationService, disposableStore: DisposableStore): IStorageService {
 	let service = instantiationService.get(IStorageService);
@@ -954,13 +954,33 @@ suite('ExtensionEnablementService Test', () => {
 		assert.strictEqual(testObject.getEnablementState(remoteWorkspaceExtension), EnablementState.EnabledGlobally);
 	});
 
-	test('test canChangeEnablement return true when extension is disabled by dependency if it has a dependency that is disabled by workspace trust', async () => {
+	test('test canChangeEnablement return false when extension is disabled by dependency if it has a dependency that is disabled by workspace trust', async () => {
 		installed.push(...[aLocalExtension2('pub.a', { main: 'hello.js', capabilities: { untrustedWorkspaces: { supported: false, description: '' } } }), aLocalExtension2('pub.b', { extensionDependencies: ['pub.a'], capabilities: { untrustedWorkspaces: { supported: true } } })]);
 		instantiationService.stub(IWorkspaceTrustManagementService, <Partial<IWorkspaceTrustManagementService>>{ isWorkspaceTrusted() { return false; } });
 		testObject = disposableStore.add(new TestExtensionEnablementService(instantiationService));
 		await (<TestExtensionEnablementService>testObject).waitUntilInitialized();
 
-		assert.ok(testObject.canChangeEnablement(installed[1]));
+		assert.deepEqual(testObject.canChangeEnablement(installed[1]), false);
+	});
+
+	test('test canChangeEnablement return false when extension is disabled by dependency if it has a dependency that is disabled globally', async () => {
+		installed.push(...[aLocalExtension2('pub.a', {}), aLocalExtension2('pub.b', { extensionDependencies: ['pub.a'] })]);
+		testObject = disposableStore.add(new TestExtensionEnablementService(instantiationService));
+		await (<TestExtensionEnablementService>testObject).waitUntilInitialized();
+
+		await testObject.setEnablement([installed[0]], EnablementState.DisabledGlobally);
+
+		assert.deepEqual(testObject.canChangeEnablement(installed[1]), false);
+	});
+
+	test('test canChangeEnablement return false when extension is disabled by dependency if it has a dependency that is disabled workspace', async () => {
+		installed.push(...[aLocalExtension2('pub.a', {}), aLocalExtension2('pub.b', { extensionDependencies: ['pub.a'] })]);
+		testObject = disposableStore.add(new TestExtensionEnablementService(instantiationService));
+		await (<TestExtensionEnablementService>testObject).waitUntilInitialized();
+
+		await testObject.setEnablement([installed[0]], EnablementState.DisabledWorkspace);
+
+		assert.deepEqual(testObject.canChangeEnablement(installed[1]), false);
 	});
 
 	test('test extension is not disabled by dependency even if it has a dependency that is disabled when installed extensions are not set', async () => {
@@ -979,6 +999,112 @@ suite('ExtensionEnablementService Test', () => {
 		assert.deepStrictEqual(testObject.getEnablementStates(installed), [EnablementState.DisabledGlobally, EnablementState.DisabledByExtensionDependency]);
 	});
 
+	test('test extension is not disabled when it has a missing dependency', async () => {
+		const target = aLocalExtension2('pub.b', { extensionDependencies: ['pub.a'] });
+		installed.push(target);
+		testObject = disposableStore.add(new TestExtensionEnablementService(instantiationService));
+		await (<TestExtensionEnablementService>testObject).waitUntilInitialized();
+
+		assert.strictEqual(testObject.getEnablementState(target), EnablementState.EnabledGlobally);
+	});
+
+	test('test extension is not disabled when it has a dependency in another server', async () => {
+		instantiationService.stub(IExtensionManagementServerService, aMultiExtensionManagementServerService(instantiationService));
+		const target = aLocalExtension2('pub.a', { extensionDependencies: ['pub.b'], extensionKind: ['ui'] }, { location: URI.file(`pub.a`) });
+		const depdencyOnAnotherServer = aLocalExtension2('pub.b', {}, { location: URI.file(`pub.b`).with({ scheme: Schemas.vscodeRemote }) });
+		installed.push(...[target, depdencyOnAnotherServer]);
+		testObject = disposableStore.add(new TestExtensionEnablementService(instantiationService));
+		await (<TestExtensionEnablementService>testObject).waitUntilInitialized();
+
+		assert.strictEqual(testObject.getEnablementState(target), EnablementState.EnabledGlobally);
+	});
+
+	test('test extension is enabled when it has a dependency in another server which is disabled', async () => {
+		instantiationService.stub(IExtensionManagementServerService, aMultiExtensionManagementServerService(instantiationService));
+		const target = aLocalExtension2('pub.a', { extensionDependencies: ['pub.b'], extensionKind: ['ui'] }, { location: URI.file(`pub.a`) });
+		const depdencyOnAnotherServer = aLocalExtension2('pub.b', {}, { location: URI.file(`pub.b`).with({ scheme: Schemas.vscodeRemote }) });
+		installed.push(...[target, depdencyOnAnotherServer]);
+		testObject = disposableStore.add(new TestExtensionEnablementService(instantiationService));
+		await (<TestExtensionEnablementService>testObject).waitUntilInitialized();
+		await testObject.setEnablement([depdencyOnAnotherServer], EnablementState.DisabledGlobally);
+
+		assert.strictEqual(testObject.getEnablementState(target), EnablementState.EnabledGlobally);
+	});
+
+	test('test extension is enabled when it has a dependency in another server which is disabled and with no exports and no main and no browser entrypoints', async () => {
+		instantiationService.stub(IExtensionManagementServerService, aMultiExtensionManagementServerService(instantiationService));
+		const target = aLocalExtension2('pub.a', { extensionDependencies: ['pub.b'], extensionKind: ['ui'] }, { location: URI.file(`pub.a`) });
+		const depdencyOnAnotherServer = aLocalExtension2('pub.b', { api: 'none' }, { location: URI.file(`pub.b`).with({ scheme: Schemas.vscodeRemote }) });
+		installed.push(...[target, depdencyOnAnotherServer]);
+		testObject = disposableStore.add(new TestExtensionEnablementService(instantiationService));
+		await (<TestExtensionEnablementService>testObject).waitUntilInitialized();
+		await testObject.setEnablement([depdencyOnAnotherServer], EnablementState.DisabledGlobally);
+
+		assert.strictEqual(testObject.getEnablementState(target), EnablementState.EnabledGlobally);
+	});
+
+	test('test extension is disabled by dependency when it has a dependency in another server  which is disabled and with no exports and has main entry point', async () => {
+		instantiationService.stub(IExtensionManagementServerService, aMultiExtensionManagementServerService(instantiationService));
+		const target = aLocalExtension2('pub.a', { extensionDependencies: ['pub.b'], extensionKind: ['ui'] }, { location: URI.file(`pub.a`) });
+		const depdencyOnAnotherServer = aLocalExtension2('pub.b', { api: 'none', main: 'main.js' }, { location: URI.file(`pub.b`).with({ scheme: Schemas.vscodeRemote }) });
+		installed.push(...[target, depdencyOnAnotherServer]);
+		testObject = disposableStore.add(new TestExtensionEnablementService(instantiationService));
+		await (<TestExtensionEnablementService>testObject).waitUntilInitialized();
+		await testObject.setEnablement([depdencyOnAnotherServer], EnablementState.DisabledGlobally);
+
+		assert.strictEqual(testObject.getEnablementState(target), EnablementState.DisabledByExtensionDependency);
+	});
+
+	test('test extension is disabled by dependency when it has a dependency in another server  which is disabled and with no exports and has browser entry point', async () => {
+		instantiationService.stub(IExtensionManagementServerService, aMultiExtensionManagementServerService(instantiationService));
+		const target = aLocalExtension2('pub.a', { extensionDependencies: ['pub.b'] }, { location: URI.file(`pub.a`).with({ scheme: Schemas.vscodeRemote }) });
+		const depdencyOnAnotherServer = aLocalExtension2('pub.b', { api: 'none', browser: 'browser.js', extensionKind: 'ui' }, { location: URI.file(`pub.b`) });
+		installed.push(...[target, depdencyOnAnotherServer]);
+		testObject = disposableStore.add(new TestExtensionEnablementService(instantiationService));
+		await (<TestExtensionEnablementService>testObject).waitUntilInitialized();
+		await testObject.setEnablement([depdencyOnAnotherServer], EnablementState.DisabledGlobally);
+
+		assert.strictEqual(testObject.getEnablementState(target), EnablementState.DisabledByExtensionDependency);
+	});
+
+	test('test extension is disabled by invalidity', async () => {
+		const target = aLocalExtension2('pub.b', {}, { isValid: false });
+		assert.strictEqual(testObject.getEnablementState(target), EnablementState.DisabledByInvalidExtension);
+	});
+
+	test('test extension is disabled by dependency when it has a dependency that is invalid', async () => {
+		const target = aLocalExtension2('pub.b', { extensionDependencies: ['pub.a'] });
+		installed.push(...[target, aLocalExtension2('pub.a', {}, { isValid: false })]);
+		testObject = disposableStore.add(new TestExtensionEnablementService(instantiationService));
+		await (<TestExtensionEnablementService>testObject).waitUntilInitialized();
+
+		assert.strictEqual(testObject.getEnablementState(target), EnablementState.DisabledByExtensionDependency);
+	});
+
+	test('test extension is enabled when its dependency becomes valid', async () => {
+		const extension = aLocalExtension2('pub.b', { extensionDependencies: ['pub.a'] });
+		installed.push(...[extension, aLocalExtension2('pub.a', {}, { isValid: false })]);
+		testObject = disposableStore.add(new TestExtensionEnablementService(instantiationService));
+		await (<TestExtensionEnablementService>testObject).waitUntilInitialized();
+
+		assert.strictEqual(testObject.getEnablementState(extension), EnablementState.DisabledByExtensionDependency);
+
+		const target = sinon.spy();
+		disposableStore.add(testObject.onEnablementChanged(target));
+
+		const validExtension = aLocalExtension2('pub.a');
+		didInstallEvent.fire([{
+			identifier: validExtension.identifier,
+			operation: InstallOperation.Install,
+			source: validExtension.location,
+			profileLocation: validExtension.location,
+			local: validExtension,
+		}]);
+
+		assert.strictEqual(testObject.getEnablementState(extension), EnablementState.EnabledGlobally);
+		assert.deepStrictEqual((<IExtension>target.args[0][0][0]).identifier, { id: 'pub.b' });
+	});
+
 	test('test override workspace to trusted when getting extensions enablements', async () => {
 		const extension = aLocalExtension2('pub.a', { main: 'main.js', capabilities: { untrustedWorkspaces: { supported: false, description: 'hello' } } });
 		instantiationService.stub(IWorkspaceTrustManagementService, <Partial<IWorkspaceTrustManagementService>>{ isWorkspaceTrusted() { return false; } });
@@ -1080,7 +1206,8 @@ function aLocalExtension2(id: string, manifest: Partial<IExtensionManifest> = {}
 		location: URI.file(`pub.${name}`),
 		galleryIdentifier: { id, uuid: undefined },
 		type: ExtensionType.User,
-		...properties
+		...properties,
+		isValid: properties.isValid ?? true,
 	};
 	properties.isBuiltin = properties.type === ExtensionType.System;
 	return <ILocalExtension>Object.create({ manifest, ...properties });
diff --git a/src/vs/workbench/services/extensionRecommendations/common/extensionIgnoredRecommendationsService.ts b/src/vs/workbench/services/extensionRecommendations/common/extensionIgnoredRecommendationsService.ts
index cac094b6679..9f9845e370a 100644
--- a/src/vs/workbench/services/extensionRecommendations/common/extensionIgnoredRecommendationsService.ts
+++ b/src/vs/workbench/services/extensionRecommendations/common/extensionIgnoredRecommendationsService.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { distinct } from 'vs/base/common/arrays';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IExtensionIgnoredRecommendationsService, IgnoredRecommendationChangeNotification } from 'vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
-import { IWorkspaceExtensionsConfigService } from 'vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig';
+import { distinct } from '../../../../base/common/arrays.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IExtensionIgnoredRecommendationsService, IgnoredRecommendationChangeNotification } from './extensionRecommendations.js';
+import { IWorkspaceExtensionsConfigService } from './workspaceExtensionsConfig.js';
 
 const ignoredRecommendationsStorageKey = 'extensionsAssistant/ignored_recommendations';
 
diff --git a/src/vs/workbench/services/extensionRecommendations/common/extensionRecommendations.ts b/src/vs/workbench/services/extensionRecommendations/common/extensionRecommendations.ts
index 72e398b4631..740d77b67aa 100644
--- a/src/vs/workbench/services/extensionRecommendations/common/extensionRecommendations.ts
+++ b/src/vs/workbench/services/extensionRecommendations/common/extensionRecommendations.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { Event } from 'vs/base/common/event';
-import { URI } from 'vs/base/common/uri';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IStringDictionary } from '../../../../base/common/collections.js';
+import { Event } from '../../../../base/common/event.js';
+import { URI } from '../../../../base/common/uri.js';
 
 export const enum ExtensionRecommendationReason {
 	Workspace,
diff --git a/src/vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig.ts b/src/vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig.ts
index 2b6fecc8eaf..fcaf2fd9c41 100644
--- a/src/vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig.ts
+++ b/src/vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { distinct } from 'vs/base/common/arrays';
-import { Emitter, Event } from 'vs/base/common/event';
-import { JSONPath, parse } from 'vs/base/common/json';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { getIconClasses } from 'vs/editor/common/services/getIconClasses';
-import { FileKind, IFileService } from 'vs/platform/files/common/files';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { isWorkspace, IWorkspace, IWorkspaceContextService, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { localize } from 'vs/nls';
-import { URI } from 'vs/base/common/uri';
-import { IJSONEditingService, IJSONValue } from 'vs/workbench/services/configuration/common/jsonEditing';
-import { ResourceMap } from 'vs/base/common/map';
+import { distinct } from '../../../../base/common/arrays.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { JSONPath, parse } from '../../../../base/common/json.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { getIconClasses } from '../../../../editor/common/services/getIconClasses.js';
+import { FileKind, IFileService } from '../../../../platform/files/common/files.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { isWorkspace, IWorkspace, IWorkspaceContextService, IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
+import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from '../../../../platform/quickinput/common/quickInput.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { localize } from '../../../../nls.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IJSONEditingService, IJSONValue } from '../../configuration/common/jsonEditing.js';
+import { ResourceMap } from '../../../../base/common/map.js';
 
 export const EXTENSIONS_CONFIG = '.vscode/extensions.json';
 
diff --git a/src/vs/workbench/services/extensions/browser/extensionService.ts b/src/vs/workbench/services/extensions/browser/extensionService.ts
index a5596ccb66c..818514fdd22 100644
--- a/src/vs/workbench/services/extensions/browser/extensionService.ts
+++ b/src/vs/workbench/services/extensions/browser/extensionService.ts
@@ -3,44 +3,44 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { mainWindow } from 'vs/base/browser/window';
-import { Schemas } from 'vs/base/common/network';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { ExtensionKind } from 'vs/platform/environment/common/environment';
-import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { IFileService } from 'vs/platform/files/common/files';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IAutomatedWindow, getLogs } from 'vs/platform/log/browser/log';
-import { ILogService } from 'vs/platform/log/common/log';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { PersistentConnectionEventType } from 'vs/platform/remote/common/remoteAgentConnection';
-import { IRemoteAuthorityResolverService, RemoteAuthorityResolverError, ResolverResult } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { IRemoteExtensionsScannerService } from 'vs/platform/remote/common/remoteExtensionsScanner';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IWorkspaceTrustManagementService } from 'vs/platform/workspace/common/workspaceTrust';
-import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { IWebExtensionsScannerService, IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { IWebWorkerExtensionHostDataProvider, IWebWorkerExtensionHostInitData, WebWorkerExtensionHost } from 'vs/workbench/services/extensions/browser/webWorkerExtensionHost';
-import { FetchFileSystemProvider } from 'vs/workbench/services/extensions/browser/webWorkerFileSystemProvider';
-import { AbstractExtensionService, IExtensionHostFactory, ResolvedExtensions, checkEnabledAndProposedAPI } from 'vs/workbench/services/extensions/common/abstractExtensionService';
-import { ExtensionDescriptionRegistrySnapshot } from 'vs/workbench/services/extensions/common/extensionDescriptionRegistry';
-import { ExtensionHostKind, ExtensionRunningPreference, IExtensionHostKindPicker, extensionHostKindToString, extensionRunningPreferenceToString } from 'vs/workbench/services/extensions/common/extensionHostKind';
-import { IExtensionManifestPropertiesService } from 'vs/workbench/services/extensions/common/extensionManifestPropertiesService';
-import { ExtensionRunningLocation } from 'vs/workbench/services/extensions/common/extensionRunningLocation';
-import { ExtensionRunningLocationTracker, filterExtensionDescriptions } from 'vs/workbench/services/extensions/common/extensionRunningLocationTracker';
-import { ExtensionHostExtensions, ExtensionHostStartup, IExtensionHost, IExtensionService, toExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
-import { ExtensionsProposedApi } from 'vs/workbench/services/extensions/common/extensionsProposedApi';
-import { dedupExtensions } from 'vs/workbench/services/extensions/common/extensionsUtil';
-import { IRemoteExtensionHostDataProvider, IRemoteExtensionHostInitData, RemoteExtensionHost } from 'vs/workbench/services/extensions/common/remoteExtensionHost';
-import { ILifecycleService, LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { IRemoteExplorerService } from 'vs/workbench/services/remote/common/remoteExplorerService';
-import { IUserDataInitializationService } from 'vs/workbench/services/userData/browser/userDataInit';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { ExtensionKind } from '../../../../platform/environment/common/environment.js';
+import { ExtensionIdentifier, IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IAutomatedWindow, getLogs } from '../../../../platform/log/browser/log.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { PersistentConnectionEventType } from '../../../../platform/remote/common/remoteAgentConnection.js';
+import { IRemoteAuthorityResolverService, RemoteAuthorityResolverError, ResolverResult } from '../../../../platform/remote/common/remoteAuthorityResolver.js';
+import { IRemoteExtensionsScannerService } from '../../../../platform/remote/common/remoteExtensionsScanner.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { IWorkspaceTrustManagementService } from '../../../../platform/workspace/common/workspaceTrust.js';
+import { IBrowserWorkbenchEnvironmentService } from '../../environment/browser/environmentService.js';
+import { IWebExtensionsScannerService, IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService } from '../../extensionManagement/common/extensionManagement.js';
+import { IWebWorkerExtensionHostDataProvider, IWebWorkerExtensionHostInitData, WebWorkerExtensionHost } from './webWorkerExtensionHost.js';
+import { FetchFileSystemProvider } from './webWorkerFileSystemProvider.js';
+import { AbstractExtensionService, IExtensionHostFactory, ResolvedExtensions, checkEnabledAndProposedAPI } from '../common/abstractExtensionService.js';
+import { ExtensionDescriptionRegistrySnapshot } from '../common/extensionDescriptionRegistry.js';
+import { ExtensionHostKind, ExtensionRunningPreference, IExtensionHostKindPicker, extensionHostKindToString, extensionRunningPreferenceToString } from '../common/extensionHostKind.js';
+import { IExtensionManifestPropertiesService } from '../common/extensionManifestPropertiesService.js';
+import { ExtensionRunningLocation } from '../common/extensionRunningLocation.js';
+import { ExtensionRunningLocationTracker, filterExtensionDescriptions } from '../common/extensionRunningLocationTracker.js';
+import { ExtensionHostExtensions, ExtensionHostStartup, IExtensionHost, IExtensionService, toExtensionDescription } from '../common/extensions.js';
+import { ExtensionsProposedApi } from '../common/extensionsProposedApi.js';
+import { dedupExtensions } from '../common/extensionsUtil.js';
+import { IRemoteExtensionHostDataProvider, IRemoteExtensionHostInitData, RemoteExtensionHost } from '../common/remoteExtensionHost.js';
+import { ILifecycleService, LifecyclePhase } from '../../lifecycle/common/lifecycle.js';
+import { IRemoteAgentService } from '../../remote/common/remoteAgentService.js';
+import { IRemoteExplorerService } from '../../remote/common/remoteExplorerService.js';
+import { IUserDataInitializationService } from '../../userData/browser/userDataInit.js';
+import { IUserDataProfileService } from '../../userDataProfile/common/userDataProfile.js';
 
 export class ExtensionService extends AbstractExtensionService implements IExtensionService {
 
@@ -186,7 +186,7 @@ export class ExtensionService extends AbstractExtensionService implements IExten
 
 	protected async _onExtensionHostExit(code: number): Promise<void> {
 		// Dispose everything associated with the extension host
-		this._doStopExtensionHosts();
+		await this._doStopExtensionHosts();
 
 		// If we are running extension tests, forward logs and exit code
 		const automatedWindow = mainWindow as unknown as IAutomatedWindow;
diff --git a/src/vs/workbench/services/extensions/browser/extensionUrlHandler.ts b/src/vs/workbench/services/extensions/browser/extensionUrlHandler.ts
index 696f8227e6e..ac3c7ed5006 100644
--- a/src/vs/workbench/services/extensions/browser/extensionUrlHandler.ts
+++ b/src/vs/workbench/services/extensions/browser/extensionUrlHandler.ts
@@ -3,30 +3,30 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize, localize2 } from 'vs/nls';
-import { IDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { createDecorator, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IURLHandler, IURLService, IOpenURLOptions } from 'vs/platform/url/common/url';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { ActivationKind, IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { IsWebContext } from 'vs/platform/contextkey/common/contextkeys';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { disposableWindowInterval } from 'vs/base/browser/dom';
-import { mainWindow } from 'vs/base/browser/window';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { isCancellationError } from 'vs/base/common/errors';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
+import { localize, localize2 } from '../../../../nls.js';
+import { IDisposable, combinedDisposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { createDecorator, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IURLHandler, IURLService, IOpenURLOptions } from '../../../../platform/url/common/url.js';
+import { IHostService } from '../../host/browser/host.js';
+import { ActivationKind, IExtensionService } from '../common/extensions.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { IQuickInputService, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
+import { IsWebContext } from '../../../../platform/contextkey/common/contextkeys.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { disposableWindowInterval } from '../../../../base/browser/dom.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { isCancellationError } from '../../../../base/common/errors.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
 
 const FIVE_MINUTES = 5 * 60 * 1000;
 const THIRTY_SECONDS = 30 * 1000;
diff --git a/src/vs/workbench/services/extensions/browser/extensionsScannerService.ts b/src/vs/workbench/services/extensions/browser/extensionsScannerService.ts
index 993d8a09fe1..596a40b93dd 100644
--- a/src/vs/workbench/services/extensions/browser/extensionsScannerService.ts
+++ b/src/vs/workbench/services/extensions/browser/extensionsScannerService.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IExtensionsProfileScannerService } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService';
-import { AbstractExtensionsScannerService, IExtensionsScannerService, Translations, } from 'vs/platform/extensionManagement/common/extensionsScannerService';
-import { IFileService } from 'vs/platform/files/common/files';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
+import { IExtensionsProfileScannerService } from '../../../../platform/extensionManagement/common/extensionsProfileScannerService.js';
+import { AbstractExtensionsScannerService, IExtensionsScannerService, Translations, } from '../../../../platform/extensionManagement/common/extensionsScannerService.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { IUserDataProfileService } from '../../userDataProfile/common/userDataProfile.js';
 
 export class ExtensionsScannerService extends AbstractExtensionsScannerService implements IExtensionsScannerService {
 
diff --git a/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts b/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts
index 0c8d2e27317..54fc51bb873 100644
--- a/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts
+++ b/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts
@@ -3,33 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { parentOriginHash } from 'vs/base/browser/iframe';
-import { mainWindow } from 'vs/base/browser/window';
-import { Barrier } from 'vs/base/common/async';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { canceled, onUnexpectedError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { COI, FileAccess } from 'vs/base/common/network';
-import * as platform from 'vs/base/common/platform';
-import { joinPath } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { IMessagePassingProtocol } from 'vs/base/parts/ipc/common/ipc';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
-import { ILogService, ILoggerService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { isLoggingOnly } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { ExtensionHostExitCode, IExtensionHostInitData, MessageType, UIKind, createMessageOfType, isMessageOfType } from 'vs/workbench/services/extensions/common/extensionHostProtocol';
-import { LocalWebWorkerRunningLocation } from 'vs/workbench/services/extensions/common/extensionRunningLocation';
-import { ExtensionHostExtensions, ExtensionHostStartup, IExtensionHost } from 'vs/workbench/services/extensions/common/extensions';
+import * as dom from '../../../../base/browser/dom.js';
+import { parentOriginHash } from '../../../../base/browser/iframe.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { Barrier } from '../../../../base/common/async.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { canceled, onUnexpectedError } from '../../../../base/common/errors.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { AppResourcePath, COI, FileAccess } from '../../../../base/common/network.js';
+import * as platform from '../../../../base/common/platform.js';
+import { joinPath } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { IMessagePassingProtocol } from '../../../../base/parts/ipc/common/ipc.js';
+import { getNLSLanguage, getNLSMessages } from '../../../../nls.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { ILayoutService } from '../../../../platform/layout/browser/layoutService.js';
+import { ILogService, ILoggerService } from '../../../../platform/log/common/log.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { isLoggingOnly } from '../../../../platform/telemetry/common/telemetryUtils.js';
+import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { IWorkspaceContextService, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { IBrowserWorkbenchEnvironmentService } from '../../environment/browser/environmentService.js';
+import { ExtensionHostExitCode, IExtensionHostInitData, MessageType, UIKind, createMessageOfType, isMessageOfType } from '../common/extensionHostProtocol.js';
+import { LocalWebWorkerRunningLocation } from '../common/extensionRunningLocation.js';
+import { ExtensionHostExtensions, ExtensionHostStartup, IExtensionHost } from '../common/extensions.js';
 
 export interface IWebWorkerExtensionHostInitData {
 	readonly extensions: ExtensionHostExtensions;
@@ -85,7 +86,7 @@ export class WebWorkerExtensionHost extends Disposable implements IExtensionHost
 
 		const suffix = `?${suffixSearchParams.toString()}`;
 
-		const iframeModulePath = 'vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html';
+		const iframeModulePath: AppResourcePath = `vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html`;
 		if (platform.isWeb) {
 			const webEndpointUrlTemplate = this._productService.webEndpointUrlTemplate;
 			const commit = this._productService.commit;
@@ -181,6 +182,20 @@ export class WebWorkerExtensionHost extends Disposable implements IExtensionHost
 				err.stack = stack;
 				return rejectBarrier(ExtensionHostExitCode.UnexpectedError, err);
 			}
+			if (event.data.type === 'vscode.bootstrap.nls') {
+				iframe.contentWindow!.postMessage({
+					type: event.data.type,
+					data: {
+						workerUrl: FileAccess.asBrowserUri('vs/workbench/api/worker/extensionHostWorkerMain.js').toString(true),
+						fileRoot: globalThis._VSCODE_FILE_ROOT,
+						nls: {
+							messages: getNLSMessages(),
+							language: getNLSLanguage()
+						}
+					}
+				}, '*');
+				return;
+			}
 			const { data } = event.data;
 			if (barrier.isOpen() || !(data instanceof MessagePort)) {
 				console.warn('UNEXPECTED message', event);
diff --git a/src/vs/workbench/services/extensions/browser/webWorkerFileSystemProvider.ts b/src/vs/workbench/services/extensions/browser/webWorkerFileSystemProvider.ts
index 9fce0ac6ce8..72a5cc0e5f0 100644
--- a/src/vs/workbench/services/extensions/browser/webWorkerFileSystemProvider.ts
+++ b/src/vs/workbench/services/extensions/browser/webWorkerFileSystemProvider.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { FileSystemProviderCapabilities, IStat, FileType, IFileDeleteOptions, IFileOverwriteOptions, IFileWriteOptions, FileSystemProviderErrorCode, IFileSystemProviderWithFileReadWriteCapability, createFileSystemProviderError } from 'vs/platform/files/common/files';
-import { Event } from 'vs/base/common/event';
-import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { NotSupportedError } from 'vs/base/common/errors';
+import { FileSystemProviderCapabilities, IStat, FileType, IFileDeleteOptions, IFileOverwriteOptions, IFileWriteOptions, FileSystemProviderErrorCode, IFileSystemProviderWithFileReadWriteCapability, createFileSystemProviderError } from '../../../../platform/files/common/files.js';
+import { Event } from '../../../../base/common/event.js';
+import { IDisposable, Disposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { NotSupportedError } from '../../../../base/common/errors.js';
 
 export class FetchFileSystemProvider implements IFileSystemProviderWithFileReadWriteCapability {
 
diff --git a/src/vs/workbench/services/extensions/common/abstractExtensionService.ts b/src/vs/workbench/services/extensions/common/abstractExtensionService.ts
index f3a62aa35dc..0479473dcaa 100644
--- a/src/vs/workbench/services/extensions/common/abstractExtensionService.ts
+++ b/src/vs/workbench/services/extensions/common/abstractExtensionService.ts
@@ -3,56 +3,56 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Barrier } from 'vs/base/common/async';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { Emitter } from 'vs/base/common/event';
-import { IMarkdownString, MarkdownString } from 'vs/base/common/htmlContent';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import * as perf from 'vs/base/common/performance';
-import { isCI } from 'vs/base/common/platform';
-import { isEqualOrParent } from 'vs/base/common/resources';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { isDefined } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import * as nls from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { InstallOperation } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { ImplicitActivationEvents } from 'vs/platform/extensionManagement/common/implicitActivationEvents';
-import { ExtensionIdentifier, ExtensionIdentifierMap, IExtension, IExtensionContributions, IExtensionDescription, IExtensionManifest } from 'vs/platform/extensions/common/extensions';
-import { IFileService } from 'vs/platform/files/common/files';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { handleVetos } from 'vs/platform/lifecycle/common/lifecycle';
-import { ILogService } from 'vs/platform/log/common/log';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IRemoteAuthorityResolverService, RemoteAuthorityResolverError, RemoteAuthorityResolverErrorCode, ResolverResult, getRemoteAuthorityPrefix } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { IRemoteExtensionsScannerService } from 'vs/platform/remote/common/remoteExtensionsScanner';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IExtensionFeaturesRegistry, Extensions as ExtensionFeaturesExtensions, IExtensionFeatureMarkdownRenderer, IRenderedData, } from 'vs/workbench/services/extensionManagement/common/extensionFeatures';
-import { IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { ExtensionDescriptionRegistryLock, ExtensionDescriptionRegistrySnapshot, IActivationEventsReader, LockableExtensionDescriptionRegistry } from 'vs/workbench/services/extensions/common/extensionDescriptionRegistry';
-import { parseExtensionDevOptions } from 'vs/workbench/services/extensions/common/extensionDevOptions';
-import { ExtensionHostKind, ExtensionRunningPreference, IExtensionHostKindPicker } from 'vs/workbench/services/extensions/common/extensionHostKind';
-import { ExtensionHostManager } from 'vs/workbench/services/extensions/common/extensionHostManager';
-import { IExtensionHostManager } from 'vs/workbench/services/extensions/common/extensionHostManagers';
-import { IResolveAuthorityErrorResult } from 'vs/workbench/services/extensions/common/extensionHostProxy';
-import { IExtensionManifestPropertiesService } from 'vs/workbench/services/extensions/common/extensionManifestPropertiesService';
-import { ExtensionRunningLocation, LocalProcessRunningLocation, LocalWebWorkerRunningLocation, RemoteRunningLocation } from 'vs/workbench/services/extensions/common/extensionRunningLocation';
-import { ExtensionRunningLocationTracker, filterExtensionIdentifiers } from 'vs/workbench/services/extensions/common/extensionRunningLocationTracker';
-import { ActivationKind, ActivationTimes, ExtensionActivationReason, ExtensionHostStartup, ExtensionPointContribution, IExtensionHost, IExtensionService, IExtensionsStatus, IInternalExtensionService, IMessage, IResponsiveStateChangeEvent, IWillActivateEvent, WillStopExtensionHostsEvent, toExtension, toExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
-import { ExtensionsProposedApi } from 'vs/workbench/services/extensions/common/extensionsProposedApi';
-import { ExtensionMessageCollector, ExtensionPoint, ExtensionsRegistry, IExtensionPoint, IExtensionPointUser } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { LazyCreateExtensionHostManager } from 'vs/workbench/services/extensions/common/lazyCreateExtensionHostManager';
-import { ResponsiveState } from 'vs/workbench/services/extensions/common/rpcProtocol';
-import { IExtensionActivationHost as IWorkspaceContainsActivationHost, checkActivateWorkspaceContainsExtension, checkGlobFileExists } from 'vs/workbench/services/extensions/common/workspaceContains';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IExtensionHostExitInfo, IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
+import { Barrier } from '../../../../base/common/async.js';
+import { toErrorMessage } from '../../../../base/common/errorMessage.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { IMarkdownString, MarkdownString } from '../../../../base/common/htmlContent.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import * as perf from '../../../../base/common/performance.js';
+import { isCI } from '../../../../base/common/platform.js';
+import { isEqualOrParent } from '../../../../base/common/resources.js';
+import { StopWatch } from '../../../../base/common/stopwatch.js';
+import { isDefined } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import * as nls from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { InstallOperation } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { ImplicitActivationEvents } from '../../../../platform/extensionManagement/common/implicitActivationEvents.js';
+import { ExtensionIdentifier, ExtensionIdentifierMap, IExtension, IExtensionContributions, IExtensionDescription, IExtensionManifest } from '../../../../platform/extensions/common/extensions.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { handleVetos } from '../../../../platform/lifecycle/common/lifecycle.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IRemoteAuthorityResolverService, RemoteAuthorityResolverError, RemoteAuthorityResolverErrorCode, ResolverResult, getRemoteAuthorityPrefix } from '../../../../platform/remote/common/remoteAuthorityResolver.js';
+import { IRemoteExtensionsScannerService } from '../../../../platform/remote/common/remoteExtensionsScanner.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { IExtensionFeaturesRegistry, Extensions as ExtensionFeaturesExtensions, IExtensionFeatureMarkdownRenderer, IRenderedData, } from '../../extensionManagement/common/extensionFeatures.js';
+import { IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService } from '../../extensionManagement/common/extensionManagement.js';
+import { ExtensionDescriptionRegistryLock, ExtensionDescriptionRegistrySnapshot, IActivationEventsReader, LockableExtensionDescriptionRegistry } from './extensionDescriptionRegistry.js';
+import { parseExtensionDevOptions } from './extensionDevOptions.js';
+import { ExtensionHostKind, ExtensionRunningPreference, IExtensionHostKindPicker } from './extensionHostKind.js';
+import { ExtensionHostManager } from './extensionHostManager.js';
+import { IExtensionHostManager } from './extensionHostManagers.js';
+import { IResolveAuthorityErrorResult } from './extensionHostProxy.js';
+import { IExtensionManifestPropertiesService } from './extensionManifestPropertiesService.js';
+import { ExtensionRunningLocation, LocalProcessRunningLocation, LocalWebWorkerRunningLocation, RemoteRunningLocation } from './extensionRunningLocation.js';
+import { ExtensionRunningLocationTracker, filterExtensionIdentifiers } from './extensionRunningLocationTracker.js';
+import { ActivationKind, ActivationTimes, ExtensionActivationReason, ExtensionHostStartup, ExtensionPointContribution, IExtensionHost, IExtensionService, IExtensionsStatus, IInternalExtensionService, IMessage, IResponsiveStateChangeEvent, IWillActivateEvent, WillStopExtensionHostsEvent, toExtension, toExtensionDescription } from './extensions.js';
+import { ExtensionsProposedApi } from './extensionsProposedApi.js';
+import { ExtensionMessageCollector, ExtensionPoint, ExtensionsRegistry, IExtensionPoint, IExtensionPointUser } from './extensionsRegistry.js';
+import { LazyCreateExtensionHostManager } from './lazyCreateExtensionHostManager.js';
+import { ResponsiveState } from './rpcProtocol.js';
+import { IExtensionActivationHost as IWorkspaceContainsActivationHost, checkActivateWorkspaceContainsExtension, checkGlobFileExists } from './workspaceContains.js';
+import { ILifecycleService, WillShutdownJoinerOrder } from '../../lifecycle/common/lifecycle.js';
+import { IExtensionHostExitInfo, IRemoteAgentService } from '../../remote/common/remoteAgentService.js';
 
 const hasOwnProperty = Object.hasOwnProperty;
 const NO_OP_VOID_PROMISE = Promise.resolve<void>(undefined);
@@ -195,14 +195,26 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
 			}
 		}));
 
-		this._register(this._lifecycleService.onDidShutdown(() => {
-			// We need to disconnect the management connection before killing the local extension host.
-			// Otherwise, the local extension host might terminate the underlying tunnel before the
-			// management connection has a chance to send its disconnection message.
-			const connection = this._remoteAgentService.getConnection();
-			connection?.dispose();
-
-			this._doStopExtensionHosts();
+		this._register(this._lifecycleService.onWillShutdown(event => {
+			if (this._remoteAgentService.getConnection()) {
+				event.join(async () => {
+					// We need to disconnect the management connection before killing the local extension host.
+					// Otherwise, the local extension host might terminate the underlying tunnel before the
+					// management connection has a chance to send its disconnection message.
+					await this._remoteAgentService.endConnection();
+					await this._doStopExtensionHosts();
+					this._remoteAgentService.getConnection()?.dispose();
+				}, {
+					id: 'join.disconnectRemote',
+					label: nls.localize('disconnectRemote', "Disconnect Remote Agent"),
+					order: WillShutdownJoinerOrder.Last // after others have joined that might depend on a remote connection
+				});
+			} else {
+				event.join(this._doStopExtensionHosts(), {
+					id: 'join.stopExtensionHosts',
+					label: nls.localize('stopExtensionHosts', "Stopping Extension Hosts"),
+				});
+			}
 		}));
 	}
 
@@ -653,11 +665,11 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
 
 	//#region Stopping / Starting / Restarting
 
-	public stopExtensionHosts(reason: string): Promise<boolean> {
-		return this._doStopExtensionHostsWithVeto(reason);
+	public stopExtensionHosts(reason: string, auto?: boolean): Promise<boolean> {
+		return this._doStopExtensionHostsWithVeto(reason, auto);
 	}
 
-	protected _doStopExtensionHosts(): void {
+	protected async _doStopExtensionHosts(): Promise<void> {
 		const previouslyActivatedExtensionIds: ExtensionIdentifier[] = [];
 		for (const extensionStatus of this._extensionStatus.values()) {
 			if (extensionStatus.activationStarted) {
@@ -665,7 +677,7 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
 			}
 		}
 
-		this._extensionHostManagers.disposeAllInReverse();
+		await this._extensionHostManagers.stopAllInReverse();
 		for (const extensionStatus of this._extensionStatus.values()) {
 			extensionStatus.clearRuntimeStatus();
 		}
@@ -675,12 +687,17 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
 		}
 	}
 
-	private async _doStopExtensionHostsWithVeto(reason: string): Promise<boolean> {
+	private async _doStopExtensionHostsWithVeto(reason: string, auto: boolean = false): Promise<boolean> {
+		if (auto && this._environmentService.isExtensionDevelopment) {
+			return false;
+		}
+
 		const vetos: (boolean | Promise<boolean>)[] = [];
 		const vetoReasons = new Set<string>();
 
 		this._onWillStop.fire({
 			reason,
+			auto,
 			veto(value, reason) {
 				vetos.push(value);
 
@@ -702,18 +719,20 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
 
 		const veto = await handleVetos(vetos, error => this._logService.error(error));
 		if (!veto) {
-			this._doStopExtensionHosts();
+			await this._doStopExtensionHosts();
 		} else {
-			const vetoReasonsArray = Array.from(vetoReasons);
+			if (!auto) {
+				const vetoReasonsArray = Array.from(vetoReasons);
 
-			this._logService.warn(`Extension host was not stopped because of veto (stop reason: ${reason}, veto reason: ${vetoReasonsArray.join(', ')})`);
+				this._logService.warn(`Extension host was not stopped because of veto (stop reason: ${reason}, veto reason: ${vetoReasonsArray.join(', ')})`);
+				await this._dialogService.warn(
+					nls.localize('extensionStopVetoMessage', "The following operation was blocked: {0}", reason),
+					vetoReasonsArray.length === 1 ?
+						nls.localize('extensionStopVetoDetailsOne', "The reason for blocking the operation: {0}", vetoReasonsArray[0]) :
+						nls.localize('extensionStopVetoDetailsMany', "The reasons for blocking the operation:\n- {0}", vetoReasonsArray.join('\n -')),
+				);
+			}
 
-			await this._dialogService.warn(
-				nls.localize('extensionStopVetoMessage', "The following operation was blocked: {0}", reason),
-				vetoReasonsArray.length === 1 ?
-					nls.localize('extensionStopVetoDetailsOne', "The reason for blocking the operation: {0}", vetoReasonsArray[0]) :
-					nls.localize('extensionStopVetoDetailsMany', "The reasons for blocking the operation:\n- {0}", vetoReasonsArray.join('\n -')),
-			);
 		}
 
 		return !veto;
@@ -791,7 +810,7 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
 			if (signal) {
 				this._onRemoteExtensionHostCrashed(extensionHost, signal);
 			}
-			this._extensionHostManagers.disposeOne(extensionHost);
+			this._extensionHostManagers.stopOne(extensionHost);
 		}
 	}
 
@@ -856,7 +875,7 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
 	}
 
 	public async startExtensionHosts(updates?: { toAdd: IExtension[]; toRemove: string[] }): Promise<void> {
-		this._doStopExtensionHosts();
+		await this._doStopExtensionHosts();
 
 		if (updates) {
 			await this._handleDeltaExtensions(new DeltaExtensionsQueueItem(updates.toAdd, updates.toRemove));
@@ -1170,7 +1189,7 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
 	//#endregion
 
 	protected abstract _resolveExtensions(): Promise<ResolvedExtensions>;
-	protected abstract _onExtensionHostExit(code: number): void;
+	protected abstract _onExtensionHostExit(code: number): Promise<void>;
 	protected abstract _resolveAuthority(remoteAuthority: string): Promise<ResolverResult>;
 }
 
@@ -1178,8 +1197,13 @@ class ExtensionHostCollection extends Disposable {
 
 	private _extensionHostManagers: ExtensionHostManagerData[] = [];
 
-	public override dispose(): void {
-		this.disposeAllInReverse();
+	public override dispose() {
+		for (let i = this._extensionHostManagers.length - 1; i >= 0; i--) {
+			const manager = this._extensionHostManagers[i];
+			manager.extensionHost.disconnect();
+			manager.dispose();
+		}
+		this._extensionHostManagers = [];
 		super.dispose();
 	}
 
@@ -1187,20 +1211,23 @@ class ExtensionHostCollection extends Disposable {
 		this._extensionHostManagers.push(new ExtensionHostManagerData(extensionHostManager, disposableStore));
 	}
 
-	public disposeAllInReverse(): void {
+	public async stopAllInReverse(): Promise<void> {
 		// See https://github.com/microsoft/vscode/issues/152204
 		// Dispose extension hosts in reverse creation order because the local extension host
 		// might be critical in sustaining a connection to the remote extension host
 		for (let i = this._extensionHostManagers.length - 1; i >= 0; i--) {
-			this._extensionHostManagers[i].dispose();
+			const manager = this._extensionHostManagers[i];
+			await manager.extensionHost.disconnect();
+			manager.dispose();
 		}
 		this._extensionHostManagers = [];
 	}
 
-	public disposeOne(extensionHostManager: IExtensionHostManager): void {
+	public async stopOne(extensionHostManager: IExtensionHostManager): Promise<void> {
 		const index = this._extensionHostManagers.findIndex(el => el.extensionHost === extensionHostManager);
 		if (index >= 0) {
 			this._extensionHostManagers.splice(index, 1);
+			await extensionHostManager.disconnect();
 			extensionHostManager.dispose();
 		}
 	}
diff --git a/src/vs/workbench/services/extensions/common/extHostCustomers.ts b/src/vs/workbench/services/extensions/common/extHostCustomers.ts
index 0d3104fcded..a61dbcff6e6 100644
--- a/src/vs/workbench/services/extensions/common/extHostCustomers.ts
+++ b/src/vs/workbench/services/extensions/common/extHostCustomers.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { BrandedService, IConstructorSignature } from 'vs/platform/instantiation/common/instantiation';
-import { ExtensionHostKind } from 'vs/workbench/services/extensions/common/extensionHostKind';
-import { IExtensionHostProxy } from 'vs/workbench/services/extensions/common/extensionHostProxy';
-import { IInternalExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IRPCProtocol, ProxyIdentifier } from 'vs/workbench/services/extensions/common/proxyIdentifier';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { BrandedService, IConstructorSignature } from '../../../../platform/instantiation/common/instantiation.js';
+import { ExtensionHostKind } from './extensionHostKind.js';
+import { IExtensionHostProxy } from './extensionHostProxy.js';
+import { IInternalExtensionService } from './extensions.js';
+import { IRPCProtocol, ProxyIdentifier } from './proxyIdentifier.js';
 
 export interface IExtHostContext extends IRPCProtocol {
 	readonly remoteAuthority: string | null;
diff --git a/src/vs/workbench/services/extensions/common/extensionDescriptionRegistry.ts b/src/vs/workbench/services/extensions/common/extensionDescriptionRegistry.ts
index f771e88f43a..10486e47ffd 100644
--- a/src/vs/workbench/services/extensions/common/extensionDescriptionRegistry.ts
+++ b/src/vs/workbench/services/extensions/common/extensionDescriptionRegistry.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ExtensionIdentifier, ExtensionIdentifierMap, ExtensionIdentifierSet, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { Emitter } from 'vs/base/common/event';
-import * as path from 'vs/base/common/path';
-import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { promiseWithResolvers } from 'vs/base/common/async';
+import { ExtensionIdentifier, ExtensionIdentifierMap, ExtensionIdentifierSet, IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
+import { Emitter } from '../../../../base/common/event.js';
+import * as path from '../../../../base/common/path.js';
+import { Disposable, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { promiseWithResolvers } from '../../../../base/common/async.js';
 
 export class DeltaExtensionsResult {
 	constructor(
diff --git a/src/vs/workbench/services/extensions/common/extensionDevOptions.ts b/src/vs/workbench/services/extensions/common/extensionDevOptions.ts
index 1d9adf60100..8732cb4a7c4 100644
--- a/src/vs/workbench/services/extensions/common/extensionDevOptions.ts
+++ b/src/vs/workbench/services/extensions/common/extensionDevOptions.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Schemas } from 'vs/base/common/network';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { Schemas } from '../../../../base/common/network.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
 
 export interface IExtensionDevOptions {
 	readonly isExtensionDevHost: boolean;
diff --git a/src/vs/workbench/services/extensions/common/extensionHostEnv.ts b/src/vs/workbench/services/extensions/common/extensionHostEnv.ts
index 9b952930ecd..29d1688385d 100644
--- a/src/vs/workbench/services/extensions/common/extensionHostEnv.ts
+++ b/src/vs/workbench/services/extensions/common/extensionHostEnv.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IProcessEnvironment } from 'vs/base/common/platform';
+import { IProcessEnvironment } from '../../../../base/common/platform.js';
 
 export const enum ExtHostConnectionType {
 	IPC = 1,
diff --git a/src/vs/workbench/services/extensions/common/extensionHostKind.ts b/src/vs/workbench/services/extensions/common/extensionHostKind.ts
index 24d8dcfbeed..9557a9d8ad7 100644
--- a/src/vs/workbench/services/extensions/common/extensionHostKind.ts
+++ b/src/vs/workbench/services/extensions/common/extensionHostKind.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ExtensionKind } from 'vs/platform/environment/common/environment';
-import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
+import { ExtensionKind } from '../../../../platform/environment/common/environment.js';
+import { ExtensionIdentifier, IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
 
 export const enum ExtensionHostKind {
 	LocalProcess = 1,
diff --git a/src/vs/workbench/services/extensions/common/extensionHostManager.ts b/src/vs/workbench/services/extensions/common/extensionHostManager.ts
index f7765f748cd..339094c0286 100644
--- a/src/vs/workbench/services/extensions/common/extensionHostManager.ts
+++ b/src/vs/workbench/services/extensions/common/extensionHostManager.ts
@@ -3,33 +3,33 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IntervalTimer } from 'vs/base/common/async';
-import { VSBuffer } from 'vs/base/common/buffer';
-import * as errors from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { URI } from 'vs/base/common/uri';
-import { IMessagePassingProtocol } from 'vs/base/parts/ipc/common/ipc';
-import * as nls from 'vs/nls';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { RemoteAuthorityResolverErrorCode, getRemoteAuthorityPrefix } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { ExtHostCustomersRegistry, IInternalExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { ExtensionHostKind, extensionHostKindToString } from 'vs/workbench/services/extensions/common/extensionHostKind';
-import { IExtensionHostManager } from 'vs/workbench/services/extensions/common/extensionHostManagers';
-import { IExtensionDescriptionDelta } from 'vs/workbench/services/extensions/common/extensionHostProtocol';
-import { IExtensionHostProxy, IResolveAuthorityResult } from 'vs/workbench/services/extensions/common/extensionHostProxy';
-import { ExtensionRunningLocation } from 'vs/workbench/services/extensions/common/extensionRunningLocation';
-import { ActivationKind, ExtensionActivationReason, ExtensionHostStartup, IExtensionHost, IInternalExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { Proxied, ProxyIdentifier } from 'vs/workbench/services/extensions/common/proxyIdentifier';
-import { IRPCProtocolLogger, RPCProtocol, RequestInitiator, ResponsiveState } from 'vs/workbench/services/extensions/common/rpcProtocol';
+import { IntervalTimer } from '../../../../base/common/async.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import * as errors from '../../../../base/common/errors.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
+import { StopWatch } from '../../../../base/common/stopwatch.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IMessagePassingProtocol } from '../../../../base/parts/ipc/common/ipc.js';
+import * as nls from '../../../../nls.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { ExtensionIdentifier, IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { RemoteAuthorityResolverErrorCode, getRemoteAuthorityPrefix } from '../../../../platform/remote/common/remoteAuthorityResolver.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IEditorService } from '../../editor/common/editorService.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { ExtHostCustomersRegistry, IInternalExtHostContext } from './extHostCustomers.js';
+import { ExtensionHostKind, extensionHostKindToString } from './extensionHostKind.js';
+import { IExtensionHostManager } from './extensionHostManagers.js';
+import { IExtensionDescriptionDelta } from './extensionHostProtocol.js';
+import { IExtensionHostProxy, IResolveAuthorityResult } from './extensionHostProxy.js';
+import { ExtensionRunningLocation } from './extensionRunningLocation.js';
+import { ActivationKind, ExtensionActivationReason, ExtensionHostStartup, IExtensionHost, IInternalExtensionService } from './extensions.js';
+import { Proxied, ProxyIdentifier } from './proxyIdentifier.js';
+import { IRPCProtocolLogger, RPCProtocol, RequestInitiator, ResponsiveState } from './rpcProtocol.js';
 
 // Enable to see detailed message communication between window and extension host
 const LOG_EXTENSION_HOST_COMMUNICATION = false;
@@ -161,13 +161,14 @@ export class ExtensionHostManager extends Disposable implements IExtensionHostMa
 		});
 	}
 
+	public async disconnect(): Promise<void> {
+		await this._extensionHost?.disconnect?.();
+	}
+
 	public override dispose(): void {
-		if (this._extensionHost) {
-			this._extensionHost.dispose();
-		}
-		if (this._rpcProtocol) {
-			this._rpcProtocol.dispose();
-		}
+		this._extensionHost?.dispose();
+		this._rpcProtocol?.dispose();
+
 		for (let i = 0, len = this._customers.length; i < len; i++) {
 			const customer = this._customers[i];
 			try {
diff --git a/src/vs/workbench/services/extensions/common/extensionHostManagers.ts b/src/vs/workbench/services/extensions/common/extensionHostManagers.ts
index 1b3b491ccd6..e80305742c6 100644
--- a/src/vs/workbench/services/extensions/common/extensionHostManagers.ts
+++ b/src/vs/workbench/services/extensions/common/extensionHostManagers.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { URI } from 'vs/base/common/uri';
-import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { ExtensionHostKind } from 'vs/workbench/services/extensions/common/extensionHostKind';
-import { IExtensionDescriptionDelta } from 'vs/workbench/services/extensions/common/extensionHostProtocol';
-import { IResolveAuthorityResult } from 'vs/workbench/services/extensions/common/extensionHostProxy';
-import { ExtensionRunningLocation } from 'vs/workbench/services/extensions/common/extensionRunningLocation';
-import { ActivationKind, ExtensionActivationReason, ExtensionHostStartup } from 'vs/workbench/services/extensions/common/extensions';
-import { ResponsiveState } from 'vs/workbench/services/extensions/common/rpcProtocol';
+import { Event } from '../../../../base/common/event.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ExtensionIdentifier, IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
+import { ExtensionHostKind } from './extensionHostKind.js';
+import { IExtensionDescriptionDelta } from './extensionHostProtocol.js';
+import { IResolveAuthorityResult } from './extensionHostProxy.js';
+import { ExtensionRunningLocation } from './extensionRunningLocation.js';
+import { ActivationKind, ExtensionActivationReason, ExtensionHostStartup } from './extensions.js';
+import { ResponsiveState } from './rpcProtocol.js';
 
 export interface IExtensionHostManager {
 	readonly pid: number | null;
@@ -20,6 +20,7 @@ export interface IExtensionHostManager {
 	readonly friendyName: string;
 	readonly onDidExit: Event<[number, string | null]>;
 	readonly onDidChangeResponsiveState: Event<ResponsiveState>;
+	disconnect(): Promise<void>;
 	dispose(): void;
 	ready(): Promise<void>;
 	representsRunningLocation(runningLocation: ExtensionRunningLocation): boolean;
diff --git a/src/vs/workbench/services/extensions/common/extensionHostProtocol.ts b/src/vs/workbench/services/extensions/common/extensionHostProtocol.ts
index c44205e2453..da967f8262f 100644
--- a/src/vs/workbench/services/extensions/common/extensionHostProtocol.ts
+++ b/src/vs/workbench/services/extensions/common/extensionHostProtocol.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { URI, UriComponents, UriDto } from 'vs/base/common/uri';
-import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { ILoggerResource, LogLevel } from 'vs/platform/log/common/log';
-import { IRemoteConnectionData } from 'vs/platform/remote/common/remoteAuthorityResolver';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { URI, UriComponents, UriDto } from '../../../../base/common/uri.js';
+import { ExtensionIdentifier, IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
+import { ILoggerResource, LogLevel } from '../../../../platform/log/common/log.js';
+import { IRemoteConnectionData } from '../../../../platform/remote/common/remoteAuthorityResolver.js';
 
 export interface IExtensionDescriptionSnapshot {
 	readonly versionId: number;
@@ -83,8 +83,8 @@ export interface IStaticWorkspaceData {
 
 export interface MessagePortLike {
 	postMessage(message: any, transfer?: any[]): void;
-	addEventListener(type: 'message', listener: (e: any) => any): void;
-	removeEventListener(type: 'message', listener: (e: any) => any): void;
+	addEventListener(type: 'message', listener: (e: any) => unknown): void;
+	removeEventListener(type: 'message', listener: (e: any) => unknown): void;
 	start(): void;
 }
 
diff --git a/src/vs/workbench/services/extensions/common/extensionHostProxy.ts b/src/vs/workbench/services/extensions/common/extensionHostProxy.ts
index e1c962a8b40..fc549732650 100644
--- a/src/vs/workbench/services/extensions/common/extensionHostProxy.ts
+++ b/src/vs/workbench/services/extensions/common/extensionHostProxy.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { URI } from 'vs/base/common/uri';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { IRemoteConnectionData, RemoteAuthorityResolverErrorCode, ResolverResult } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { IExtensionDescriptionDelta } from 'vs/workbench/services/extensions/common/extensionHostProtocol';
-import { ActivationKind, ExtensionActivationReason } from 'vs/workbench/services/extensions/common/extensions';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { IRemoteConnectionData, RemoteAuthorityResolverErrorCode, ResolverResult } from '../../../../platform/remote/common/remoteAuthorityResolver.js';
+import { IExtensionDescriptionDelta } from './extensionHostProtocol.js';
+import { ActivationKind, ExtensionActivationReason } from './extensions.js';
 
 export interface IResolveAuthorityErrorResult {
 	type: 'error';
diff --git a/src/vs/workbench/services/extensions/common/extensionManifestPropertiesService.ts b/src/vs/workbench/services/extensions/common/extensionManifestPropertiesService.ts
index 25aca0b0264..23c86b557ab 100644
--- a/src/vs/workbench/services/extensions/common/extensionManifestPropertiesService.ts
+++ b/src/vs/workbench/services/extensions/common/extensionManifestPropertiesService.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IExtensionManifest, ExtensionUntrustedWorkspaceSupportType, ExtensionVirtualWorkspaceSupportType, IExtensionIdentifier, ALL_EXTENSION_KINDS, ExtensionIdentifierMap } from 'vs/platform/extensions/common/extensions';
-import { ExtensionKind } from 'vs/platform/environment/common/environment';
-import { ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { getGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { isNonEmptyArray } from 'vs/base/common/arrays';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ExtensionUntrustedWorkspaceSupport } from 'vs/base/common/product';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { WORKSPACE_TRUST_EXTENSION_SUPPORT } from 'vs/workbench/services/workspaces/common/workspaceTrust';
-import { isBoolean } from 'vs/base/common/types';
-import { IWorkspaceTrustEnablementService } from 'vs/platform/workspace/common/workspaceTrust';
-import { ILogService } from 'vs/platform/log/common/log';
-import { isWeb } from 'vs/base/common/platform';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IExtensionManifest, ExtensionUntrustedWorkspaceSupportType, ExtensionVirtualWorkspaceSupportType, IExtensionIdentifier, ALL_EXTENSION_KINDS, ExtensionIdentifierMap } from '../../../../platform/extensions/common/extensions.js';
+import { ExtensionKind } from '../../../../platform/environment/common/environment.js';
+import { ExtensionsRegistry } from './extensionsRegistry.js';
+import { getGalleryExtensionId } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { isNonEmptyArray } from '../../../../base/common/arrays.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ExtensionUntrustedWorkspaceSupport } from '../../../../base/common/product.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { WORKSPACE_TRUST_EXTENSION_SUPPORT } from '../../workspaces/common/workspaceTrust.js';
+import { isBoolean } from '../../../../base/common/types.js';
+import { IWorkspaceTrustEnablementService } from '../../../../platform/workspace/common/workspaceTrust.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { isWeb } from '../../../../base/common/platform.js';
 
 export const IExtensionManifestPropertiesService = createDecorator<IExtensionManifestPropertiesService>('extensionManifestPropertiesService');
 
diff --git a/src/vs/workbench/services/extensions/common/extensionRunningLocation.ts b/src/vs/workbench/services/extensions/common/extensionRunningLocation.ts
index 90cd548cf4a..13e664c13b8 100644
--- a/src/vs/workbench/services/extensions/common/extensionRunningLocation.ts
+++ b/src/vs/workbench/services/extensions/common/extensionRunningLocation.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ExtensionHostKind } from 'vs/workbench/services/extensions/common/extensionHostKind';
+import { ExtensionHostKind } from './extensionHostKind.js';
 
 export class LocalProcessRunningLocation {
 	public readonly kind = ExtensionHostKind.LocalProcess;
diff --git a/src/vs/workbench/services/extensions/common/extensionRunningLocationTracker.ts b/src/vs/workbench/services/extensions/common/extensionRunningLocationTracker.ts
index 53227e19fe3..48bccc7cd86 100644
--- a/src/vs/workbench/services/extensions/common/extensionRunningLocationTracker.ts
+++ b/src/vs/workbench/services/extensions/common/extensionRunningLocationTracker.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Schemas } from 'vs/base/common/network';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ExtensionKind } from 'vs/platform/environment/common/environment';
-import { ExtensionIdentifier, ExtensionIdentifierMap, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IReadOnlyExtensionDescriptionRegistry } from 'vs/workbench/services/extensions/common/extensionDescriptionRegistry';
-import { ExtensionHostKind, ExtensionRunningPreference, IExtensionHostKindPicker, determineExtensionHostKinds } from 'vs/workbench/services/extensions/common/extensionHostKind';
-import { IExtensionHostManager } from 'vs/workbench/services/extensions/common/extensionHostManagers';
-import { IExtensionManifestPropertiesService } from 'vs/workbench/services/extensions/common/extensionManifestPropertiesService';
-import { ExtensionRunningLocation, LocalProcessRunningLocation, LocalWebWorkerRunningLocation, RemoteRunningLocation } from 'vs/workbench/services/extensions/common/extensionRunningLocation';
+import { Schemas } from '../../../../base/common/network.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ExtensionKind } from '../../../../platform/environment/common/environment.js';
+import { ExtensionIdentifier, ExtensionIdentifierMap, IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { IReadOnlyExtensionDescriptionRegistry } from './extensionDescriptionRegistry.js';
+import { ExtensionHostKind, ExtensionRunningPreference, IExtensionHostKindPicker, determineExtensionHostKinds } from './extensionHostKind.js';
+import { IExtensionHostManager } from './extensionHostManagers.js';
+import { IExtensionManifestPropertiesService } from './extensionManifestPropertiesService.js';
+import { ExtensionRunningLocation, LocalProcessRunningLocation, LocalWebWorkerRunningLocation, RemoteRunningLocation } from './extensionRunningLocation.js';
 
 export class ExtensionRunningLocationTracker {
 
diff --git a/src/vs/workbench/services/extensions/common/extensionStorageMigration.ts b/src/vs/workbench/services/extensions/common/extensionStorageMigration.ts
index fbb28a3f4cc..a7e7a345ffe 100644
--- a/src/vs/workbench/services/extensions/common/extensionStorageMigration.ts
+++ b/src/vs/workbench/services/extensions/common/extensionStorageMigration.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getErrorMessage } from 'vs/base/common/errors';
-import { URI } from 'vs/base/common/uri';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IExtensionStorageService } from 'vs/platform/extensionManagement/common/extensionStorage';
-import { FileSystemProviderError, FileSystemProviderErrorCode, IFileService } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { getErrorMessage } from '../../../../base/common/errors.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { IExtensionStorageService } from '../../../../platform/extensionManagement/common/extensionStorage.js';
+import { FileSystemProviderError, FileSystemProviderErrorCode, IFileService } from '../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
 
 /**
  * An extension storage has following
diff --git a/src/vs/workbench/services/extensions/common/extensions.ts b/src/vs/workbench/services/extensions/common/extensions.ts
index f04ac452275..d6b4204a7b9 100644
--- a/src/vs/workbench/services/extensions/common/extensions.ts
+++ b/src/vs/workbench/services/extensions/common/extensions.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import Severity from 'vs/base/common/severity';
-import { URI } from 'vs/base/common/uri';
-import { IMessagePassingProtocol } from 'vs/base/parts/ipc/common/ipc';
-import { getExtensionId, getGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { ImplicitActivationEvents } from 'vs/platform/extensionManagement/common/implicitActivationEvents';
-import { ExtensionIdentifier, ExtensionIdentifierMap, ExtensionIdentifierSet, ExtensionType, IExtension, IExtensionContributions, IExtensionDescription, TargetPlatform } from 'vs/platform/extensions/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IV8Profile } from 'vs/platform/profiling/common/profiling';
-import { ExtensionHostKind } from 'vs/workbench/services/extensions/common/extensionHostKind';
-import { IExtensionDescriptionDelta, IExtensionDescriptionSnapshot } from 'vs/workbench/services/extensions/common/extensionHostProtocol';
-import { ExtensionRunningLocation } from 'vs/workbench/services/extensions/common/extensionRunningLocation';
-import { ApiProposalName } from 'vs/workbench/services/extensions/common/extensionsApiProposals';
-import { IExtensionPoint } from 'vs/workbench/services/extensions/common/extensionsRegistry';
+import { Event } from '../../../../base/common/event.js';
+import Severity from '../../../../base/common/severity.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IMessagePassingProtocol } from '../../../../base/parts/ipc/common/ipc.js';
+import { getExtensionId, getGalleryExtensionId } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { ImplicitActivationEvents } from '../../../../platform/extensionManagement/common/implicitActivationEvents.js';
+import { ExtensionIdentifier, ExtensionIdentifierMap, ExtensionIdentifierSet, ExtensionType, IExtension, IExtensionContributions, IExtensionDescription, TargetPlatform } from '../../../../platform/extensions/common/extensions.js';
+import { ApiProposalName } from '../../../../platform/extensions/common/extensionsApiProposals.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IV8Profile } from '../../../../platform/profiling/common/profiling.js';
+import { ExtensionHostKind } from './extensionHostKind.js';
+import { IExtensionDescriptionDelta, IExtensionDescriptionSnapshot } from './extensionHostProtocol.js';
+import { ExtensionRunningLocation } from './extensionRunningLocation.js';
+import { IExtensionPoint } from './extensionsRegistry.js';
 
 export const nullExtensionDescription = Object.freeze<IExtensionDescription>({
 	identifier: new ExtensionIdentifier('nullExtensionDescription'),
@@ -28,7 +28,7 @@ export const nullExtensionDescription = Object.freeze<IExtensionDescription>({
 	isBuiltin: false,
 	targetPlatform: TargetPlatform.UNDEFINED,
 	isUserBuiltin: false,
-	isUnderDevelopment: false,
+	isUnderDevelopment: false
 });
 
 export type WebWorkerExtHostConfigValue = boolean | 'auto';
@@ -127,6 +127,7 @@ export interface IExtensionHost {
 	start(): Promise<IMessagePassingProtocol>;
 	getInspectPort(): { port: number; host: string } | undefined;
 	enableInspectPort(): Promise<boolean>;
+	disconnect?(): Promise<void>;
 	dispose(): void;
 }
 
@@ -384,6 +385,11 @@ export interface WillStopExtensionHostsEvent {
 	 */
 	readonly reason: string;
 
+	/**
+	 * A flag to indicate if the operation was triggered automatically
+	 */
+	readonly auto: boolean;
+
 	/**
 	 * Allows to veto the stopping of extension hosts. The veto can be a long running
 	 * operation.
@@ -513,10 +519,12 @@ export interface IExtensionService {
 	 * @param reason a human readable reason for stopping the extension hosts. This maybe
 	 * can be presented to the user when showing dialogs.
 	 *
+	 * @param auto indicates if the operation was triggered by an automatic action
+	 *
 	 * @returns a promise that resolves to `true` if the extension hosts were stopped, `false`
 	 * if the operation was vetoed by listeners of the `onWillStop` event.
 	 */
-	stopExtensionHosts(reason: string): Promise<boolean>;
+	stopExtensionHosts(reason: string, auto?: boolean): Promise<boolean>;
 
 	/**
 	 * Starts the extension hosts. If updates are provided, the extension hosts are started with the given updates.
@@ -567,7 +575,7 @@ export function toExtensionDescription(extension: IExtension, isUnderDevelopment
 		uuid: extension.identifier.uuid,
 		targetPlatform: extension.targetPlatform,
 		publisherDisplayName: extension.publisherDisplayName,
-		...extension.manifest,
+		...extension.manifest
 	};
 }
 
@@ -589,7 +597,7 @@ export class NullExtensionService implements IExtensionService {
 	readExtensionPointContributions<T>(_extPoint: IExtensionPoint<T>): Promise<ExtensionPointContribution<T>[]> { return Promise.resolve(Object.create(null)); }
 	getExtensionsStatus(): { [id: string]: IExtensionsStatus } { return Object.create(null); }
 	getInspectPorts(_extensionHostKind: ExtensionHostKind, _tryEnableInspector: boolean): Promise<{ port: number; host: string }[]> { return Promise.resolve([]); }
-	stopExtensionHosts(): any { }
+	async stopExtensionHosts(): Promise<boolean> { return true; }
 	async startExtensionHosts(): Promise<void> { }
 	async setRemoteEnvironment(_env: { [key: string]: string | null }): Promise<void> { }
 	canAddExtension(): boolean { return false; }
diff --git a/src/vs/workbench/services/extensions/common/extensionsApiProposals.ts b/src/vs/workbench/services/extensions/common/extensionsApiProposals.ts
deleted file mode 100644
index a245c39d11d..00000000000
--- a/src/vs/workbench/services/extensions/common/extensionsApiProposals.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-// THIS IS A GENERATED FILE. DO NOT EDIT DIRECTLY.
-
-export const allApiProposals = Object.freeze({
-	activeComment: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.activeComment.d.ts',
-	aiRelatedInformation: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.aiRelatedInformation.d.ts',
-	aiTextSearchProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.aiTextSearchProvider.d.ts',
-	attributableCoverage: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.attributableCoverage.d.ts',
-	authGetSessions: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.authGetSessions.d.ts',
-	authLearnMore: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.authLearnMore.d.ts',
-	authSession: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.authSession.d.ts',
-	canonicalUriProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.canonicalUriProvider.d.ts',
-	chatParticipantAdditions: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatParticipantAdditions.d.ts',
-	chatParticipantPrivate: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts',
-	chatProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatProvider.d.ts',
-	chatTab: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatTab.d.ts',
-	chatVariableResolver: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatVariableResolver.d.ts',
-	codeActionAI: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.codeActionAI.d.ts',
-	codeActionRanges: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.codeActionRanges.d.ts',
-	codiconDecoration: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.codiconDecoration.d.ts',
-	commentReactor: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.commentReactor.d.ts',
-	commentReveal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.commentReveal.d.ts',
-	commentThreadApplicability: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.commentThreadApplicability.d.ts',
-	commentingRangeHint: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.commentingRangeHint.d.ts',
-	commentsDraftState: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.commentsDraftState.d.ts',
-	contribAccessibilityHelpContent: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribAccessibilityHelpContent.d.ts',
-	contribCommentEditorActionsMenu: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribCommentEditorActionsMenu.d.ts',
-	contribCommentPeekContext: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribCommentPeekContext.d.ts',
-	contribCommentThreadAdditionalMenu: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribCommentThreadAdditionalMenu.d.ts',
-	contribCommentsViewThreadMenus: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribCommentsViewThreadMenus.d.ts',
-	contribDiffEditorGutterToolBarMenus: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribDiffEditorGutterToolBarMenus.d.ts',
-	contribEditSessions: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribEditSessions.d.ts',
-	contribEditorContentMenu: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribEditorContentMenu.d.ts',
-	contribIssueReporter: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribIssueReporter.d.ts',
-	contribLabelFormatterWorkspaceTooltip: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribLabelFormatterWorkspaceTooltip.d.ts',
-	contribMenuBarHome: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribMenuBarHome.d.ts',
-	contribMergeEditorMenus: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribMergeEditorMenus.d.ts',
-	contribMultiDiffEditorMenus: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribMultiDiffEditorMenus.d.ts',
-	contribNotebookStaticPreloads: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribNotebookStaticPreloads.d.ts',
-	contribRemoteHelp: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribRemoteHelp.d.ts',
-	contribShareMenu: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribShareMenu.d.ts',
-	contribSourceControlHistoryItemGroupMenu: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribSourceControlHistoryItemGroupMenu.d.ts',
-	contribSourceControlHistoryItemMenu: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribSourceControlHistoryItemMenu.d.ts',
-	contribSourceControlInputBoxMenu: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribSourceControlInputBoxMenu.d.ts',
-	contribSourceControlTitleMenu: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribSourceControlTitleMenu.d.ts',
-	contribStatusBarItems: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribStatusBarItems.d.ts',
-	contribViewsRemote: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribViewsRemote.d.ts',
-	contribViewsWelcome: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribViewsWelcome.d.ts',
-	createFileSystemWatcher: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.createFileSystemWatcher.d.ts',
-	customEditorMove: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.customEditorMove.d.ts',
-	debugVisualization: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.debugVisualization.d.ts',
-	defaultChatParticipant: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.defaultChatParticipant.d.ts',
-	diffCommand: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.diffCommand.d.ts',
-	diffContentOptions: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.diffContentOptions.d.ts',
-	documentFiltersExclusive: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.documentFiltersExclusive.d.ts',
-	documentPaste: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.documentPaste.d.ts',
-	editSessionIdentityProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.editSessionIdentityProvider.d.ts',
-	editorHoverVerbosityLevel: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.editorHoverVerbosityLevel.d.ts',
-	editorInsets: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.editorInsets.d.ts',
-	embeddings: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.embeddings.d.ts',
-	extensionRuntime: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.extensionRuntime.d.ts',
-	extensionsAny: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.extensionsAny.d.ts',
-	externalUriOpener: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.externalUriOpener.d.ts',
-	fileComments: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.fileComments.d.ts',
-	fileSearchProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.fileSearchProvider.d.ts',
-	findFiles2: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.findFiles2.d.ts',
-	findTextInFiles: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.findTextInFiles.d.ts',
-	fsChunks: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.fsChunks.d.ts',
-	idToken: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.idToken.d.ts',
-	inlineCompletionsAdditions: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts',
-	inlineEdit: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.inlineEdit.d.ts',
-	interactive: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.interactive.d.ts',
-	interactiveWindow: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.interactiveWindow.d.ts',
-	ipc: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.ipc.d.ts',
-	languageModelSystem: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.languageModelSystem.d.ts',
-	languageStatusText: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.languageStatusText.d.ts',
-	lmTools: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.lmTools.d.ts',
-	mappedEditsProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.mappedEditsProvider.d.ts',
-	multiDocumentHighlightProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.multiDocumentHighlightProvider.d.ts',
-	newSymbolNamesProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.newSymbolNamesProvider.d.ts',
-	notebookCellExecution: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookCellExecution.d.ts',
-	notebookCellExecutionState: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookCellExecutionState.d.ts',
-	notebookControllerAffinityHidden: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookControllerAffinityHidden.d.ts',
-	notebookDeprecated: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookDeprecated.d.ts',
-	notebookExecution: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookExecution.d.ts',
-	notebookKernelSource: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookKernelSource.d.ts',
-	notebookLiveShare: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookLiveShare.d.ts',
-	notebookMessaging: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookMessaging.d.ts',
-	notebookMime: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookMime.d.ts',
-	notebookVariableProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookVariableProvider.d.ts',
-	portsAttributes: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.portsAttributes.d.ts',
-	profileContentHandlers: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.profileContentHandlers.d.ts',
-	quickDiffProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.quickDiffProvider.d.ts',
-	quickPickItemTooltip: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.quickPickItemTooltip.d.ts',
-	quickPickSortByLabel: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.quickPickSortByLabel.d.ts',
-	resolvers: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.resolvers.d.ts',
-	scmActionButton: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmActionButton.d.ts',
-	scmHistoryProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmHistoryProvider.d.ts',
-	scmMultiDiffEditor: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmMultiDiffEditor.d.ts',
-	scmSelectedProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmSelectedProvider.d.ts',
-	scmTextDocument: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmTextDocument.d.ts',
-	scmValidation: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmValidation.d.ts',
-	shareProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.shareProvider.d.ts',
-	showLocal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.showLocal.d.ts',
-	speech: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.speech.d.ts',
-	tabInputMultiDiff: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.tabInputMultiDiff.d.ts',
-	tabInputTextMerge: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.tabInputTextMerge.d.ts',
-	taskPresentationGroup: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.taskPresentationGroup.d.ts',
-	telemetry: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.telemetry.d.ts',
-	terminalDataWriteEvent: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalDataWriteEvent.d.ts',
-	terminalDimensions: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalDimensions.d.ts',
-	terminalExecuteCommandEvent: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalExecuteCommandEvent.d.ts',
-	terminalQuickFixProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalQuickFixProvider.d.ts',
-	terminalSelection: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalSelection.d.ts',
-	terminalShellIntegration: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalShellIntegration.d.ts',
-	testObserver: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.testObserver.d.ts',
-	testRunInDebug: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.testRunInDebug.d.ts',
-	textSearchProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.textSearchProvider.d.ts',
-	timeline: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.timeline.d.ts',
-	tokenInformation: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.tokenInformation.d.ts',
-	treeViewActiveItem: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.treeViewActiveItem.d.ts',
-	treeViewMarkdownMessage: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.treeViewMarkdownMessage.d.ts',
-	treeViewReveal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.treeViewReveal.d.ts',
-	tunnelFactory: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.tunnelFactory.d.ts',
-	tunnels: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.tunnels.d.ts',
-	workspaceTrust: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.workspaceTrust.d.ts'
-});
-export type ApiProposalName = keyof typeof allApiProposals;
diff --git a/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts b/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts
index e92c5e0a50e..6de2983bda4 100644
--- a/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts
+++ b/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts
@@ -3,12 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isNonEmptyArray } from 'vs/base/common/arrays';
-import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { ApiProposalName, allApiProposals } from 'vs/workbench/services/extensions/common/extensionsApiProposals';
+import { isNonEmptyArray } from '../../../../base/common/arrays.js';
+import { localize } from '../../../../nls.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ExtensionIdentifier, IExtensionDescription, IExtensionManifest } from '../../../../platform/extensions/common/extensions.js';
+import { allApiProposals, ApiProposalName } from '../../../../platform/extensions/common/extensionsApiProposals.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { Extensions, IExtensionFeatureMarkdownRenderer, IExtensionFeaturesRegistry, IRenderedData } from '../../extensionManagement/common/extensionFeatures.js';
+import { IMarkdownString, MarkdownString } from '../../../../base/common/htmlContent.js';
+import { Mutable } from '../../../../base/common/types.js';
 
 export class ExtensionsProposedApi {
 
@@ -54,12 +61,9 @@ export class ExtensionsProposedApi {
 		}
 	}
 
-	private doUpdateEnabledApiProposals(_extension: IExtensionDescription): void {
+	private doUpdateEnabledApiProposals(extension: Mutable<IExtensionDescription>): void {
 
-		// this is a trick to make the extension description writeable...
-		type Writeable<T> = { -readonly [P in keyof T]: Writeable<T[P]> };
-		const extension = <Writeable<IExtensionDescription>>_extension;
-		const key = ExtensionIdentifier.toKey(_extension.identifier);
+		const key = ExtensionIdentifier.toKey(extension.identifier);
 
 		// warn about invalid proposal and remove them from the list
 		if (isNonEmptyArray(extension.enabledApiProposals)) {
@@ -110,3 +114,35 @@ export class ExtensionsProposedApi {
 		}
 	}
 }
+
+class ApiProposalsMarkdowneRenderer extends Disposable implements IExtensionFeatureMarkdownRenderer {
+
+	readonly type = 'markdown';
+
+	shouldRender(manifest: IExtensionManifest): boolean {
+		return !!manifest.originalEnabledApiProposals?.length || !!manifest.enabledApiProposals?.length;
+	}
+
+	render(manifest: IExtensionManifest): IRenderedData<IMarkdownString> {
+		const enabledApiProposals = manifest.originalEnabledApiProposals ?? manifest.enabledApiProposals ?? [];
+		const data = new MarkdownString();
+		if (enabledApiProposals.length) {
+			for (const proposal of enabledApiProposals) {
+				data.appendMarkdown(`- \`${proposal}\`\n`);
+			}
+		}
+		return {
+			data,
+			dispose: () => { }
+		};
+	}
+}
+
+Registry.as<IExtensionFeaturesRegistry>(Extensions.ExtensionFeaturesRegistry).registerExtensionFeature({
+	id: 'enabledApiProposals',
+	label: localize('enabledProposedAPIs', "API Proposals"),
+	access: {
+		canToggle: false
+	},
+	renderer: new SyncDescriptor(ApiProposalsMarkdowneRenderer),
+});
diff --git a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
index f39fd30b602..03fbc7de836 100644
--- a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
+++ b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import Severity from 'vs/base/common/severity';
-import { EXTENSION_IDENTIFIER_PATTERN } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { Extensions, IJSONContributionRegistry } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IMessage } from 'vs/workbench/services/extensions/common/extensions';
-import { IExtensionDescription, EXTENSION_CATEGORIES, ExtensionIdentifierSet } from 'vs/platform/extensions/common/extensions';
-import { ExtensionKind } from 'vs/platform/environment/common/environment';
-import { allApiProposals } from 'vs/workbench/services/extensions/common/extensionsApiProposals';
-import { productSchemaId } from 'vs/platform/product/common/productService';
-import { ImplicitActivationEvents, IActivationEventsGenerator } from 'vs/platform/extensionManagement/common/implicitActivationEvents';
-import { IDisposable } from 'vs/base/common/lifecycle';
+import * as nls from '../../../../nls.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
+import Severity from '../../../../base/common/severity.js';
+import { EXTENSION_IDENTIFIER_PATTERN } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { Extensions, IJSONContributionRegistry } from '../../../../platform/jsonschemas/common/jsonContributionRegistry.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IMessage } from './extensions.js';
+import { IExtensionDescription, EXTENSION_CATEGORIES, ExtensionIdentifierSet } from '../../../../platform/extensions/common/extensions.js';
+import { ExtensionKind } from '../../../../platform/environment/common/environment.js';
+import { productSchemaId } from '../../../../platform/product/common/productService.js';
+import { ImplicitActivationEvents, IActivationEventsGenerator } from '../../../../platform/extensionManagement/common/implicitActivationEvents.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { allApiProposals } from '../../../../platform/extensions/common/extensionsApiProposals.js';
 
 const schemaRegistry = Registry.as<IJSONContributionRegistry>(Extensions.JSONContribution);
 
@@ -225,7 +225,7 @@ export const schema: IJSONSchema = {
 			type: 'object',
 			properties: {
 				// extensions will fill in
-			} as { [key: string]: any },
+			} as any as { [key: string]: any },
 			default: {}
 		},
 		preview: {
@@ -242,8 +242,8 @@ export const schema: IJSONSchema = {
 			uniqueItems: true,
 			items: {
 				type: 'string',
-				enum: Object.keys(allApiProposals),
-				markdownEnumDescriptions: Object.values(allApiProposals)
+				enum: Object.keys(allApiProposals).map(proposalName => proposalName),
+				markdownEnumDescriptions: Object.values(allApiProposals).map(value => value.proposal)
 			}
 		},
 		api: {
@@ -385,6 +385,16 @@ export const schema: IJSONSchema = {
 						body: 'onIssueReporterOpened',
 						description: nls.localize('vscode.extension.activationEvents.onIssueReporterOpened', 'An activation event emitted when the issue reporter is opened.'),
 					},
+					{
+						label: 'onChatParticipant',
+						body: 'onChatParticipant:${1:participantId}',
+						description: nls.localize('vscode.extension.activationEvents.onChatParticipant', 'An activation event emitted when the specified chat participant is invoked.'),
+					},
+					{
+						label: 'onLanguageModelTool',
+						body: 'onLanguageModelTool:${1:toolId}',
+						description: nls.localize('vscode.extension.activationEvents.onLanguageModelTool', 'An activation event emitted when the specified language model tool is invoked.'),
+					},
 					{
 						label: '*',
 						description: nls.localize('vscode.extension.activationEvents.star', 'An activation event emitted on VS Code startup. To ensure a great end user experience, please use this activation event in your extension only when no other activation events combination works in your use-case.'),
@@ -652,7 +662,7 @@ schemaRegistry.registerSchema(productSchemaId, {
 					items: {
 						type: 'string',
 						enum: Object.keys(allApiProposals),
-						markdownEnumDescriptions: Object.values(allApiProposals)
+						markdownEnumDescriptions: Object.values(allApiProposals).map(value => value.proposal)
 					}
 				}]
 			}
diff --git a/src/vs/workbench/services/extensions/common/extensionsUtil.ts b/src/vs/workbench/services/extensions/common/extensionsUtil.ts
index a1d2090c747..99fa742a2a2 100644
--- a/src/vs/workbench/services/extensions/common/extensionsUtil.ts
+++ b/src/vs/workbench/services/extensions/common/extensionsUtil.ts
@@ -3,10 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ExtensionIdentifierMap, IExtensionDescription, IRelaxedExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { localize } from 'vs/nls';
-import { ILogService } from 'vs/platform/log/common/log';
-import * as semver from 'vs/base/common/semver/semver';
+import { ExtensionIdentifierMap, IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
+import { localize } from '../../../../nls.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import * as semver from '../../../../base/common/semver/semver.js';
+import { Mutable } from '../../../../base/common/types.js';
 
 // TODO: @sandy081 merge this with deduping in extensionsScannerService.ts
 export function dedupExtensions(system: IExtensionDescription[], user: IExtensionDescription[], workspace: IExtensionDescription[], development: IExtensionDescription[], logService: ILogService): IExtensionDescription[] {
@@ -27,7 +28,7 @@ export function dedupExtensions(system: IExtensionDescription[], user: IExtensio
 					return;
 				}
 				// Overwriting a builtin extension inherits the `isBuiltin` property and it doesn't show a warning
-				(<IRelaxedExtensionDescription>userExtension).isBuiltin = true;
+				(<Mutable<IExtensionDescription>>userExtension).isBuiltin = true;
 			} else {
 				logService.warn(localize('overwritingExtension', "Overwriting extension {0} with {1}.", extension.extensionLocation.fsPath, userExtension.extensionLocation.fsPath));
 			}
@@ -50,7 +51,7 @@ export function dedupExtensions(system: IExtensionDescription[], user: IExtensio
 		if (extension) {
 			if (extension.isBuiltin) {
 				// Overwriting a builtin extension inherits the `isBuiltin` property
-				(<IRelaxedExtensionDescription>developedExtension).isBuiltin = true;
+				(<Mutable<IExtensionDescription>>developedExtension).isBuiltin = true;
 			}
 		}
 		result.set(developedExtension.identifier, developedExtension);
diff --git a/src/vs/workbench/services/extensions/common/lazyCreateExtensionHostManager.ts b/src/vs/workbench/services/extensions/common/lazyCreateExtensionHostManager.ts
index f279e796d13..29b7584e662 100644
--- a/src/vs/workbench/services/extensions/common/lazyCreateExtensionHostManager.ts
+++ b/src/vs/workbench/services/extensions/common/lazyCreateExtensionHostManager.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Barrier } from 'vs/base/common/async';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { RemoteAuthorityResolverErrorCode } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { ExtensionHostKind } from 'vs/workbench/services/extensions/common/extensionHostKind';
-import { ExtensionHostManager, friendlyExtHostName } from 'vs/workbench/services/extensions/common/extensionHostManager';
-import { IExtensionHostManager } from 'vs/workbench/services/extensions/common/extensionHostManagers';
-import { IExtensionDescriptionDelta } from 'vs/workbench/services/extensions/common/extensionHostProtocol';
-import { IResolveAuthorityResult } from 'vs/workbench/services/extensions/common/extensionHostProxy';
-import { ExtensionRunningLocation } from 'vs/workbench/services/extensions/common/extensionRunningLocation';
-import { ActivationKind, ExtensionActivationReason, ExtensionHostExtensions, ExtensionHostStartup, IExtensionHost, IInternalExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { ResponsiveState } from 'vs/workbench/services/extensions/common/rpcProtocol';
+import { Barrier } from '../../../../base/common/async.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ExtensionIdentifier, IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { RemoteAuthorityResolverErrorCode } from '../../../../platform/remote/common/remoteAuthorityResolver.js';
+import { ExtensionHostKind } from './extensionHostKind.js';
+import { ExtensionHostManager, friendlyExtHostName } from './extensionHostManager.js';
+import { IExtensionHostManager } from './extensionHostManagers.js';
+import { IExtensionDescriptionDelta } from './extensionHostProtocol.js';
+import { IResolveAuthorityResult } from './extensionHostProxy.js';
+import { ExtensionRunningLocation } from './extensionRunningLocation.js';
+import { ActivationKind, ExtensionActivationReason, ExtensionHostExtensions, ExtensionHostStartup, IExtensionHost, IInternalExtensionService } from './extensions.js';
+import { ResponsiveState } from './rpcProtocol.js';
 
 /**
  * Waits until `start()` and only if it has extensions proceeds to really start.
@@ -90,6 +90,9 @@ export class LazyCreateExtensionHostManager extends Disposable implements IExten
 			await this._actual.ready();
 		}
 	}
+	public async disconnect(): Promise<void> {
+		await this._actual?.disconnect();
+	}
 	public representsRunningLocation(runningLocation: ExtensionRunningLocation): boolean {
 		return this._extensionHost.runningLocation.equals(runningLocation);
 	}
diff --git a/src/vs/workbench/services/extensions/common/lazyPromise.ts b/src/vs/workbench/services/extensions/common/lazyPromise.ts
index 5860ffc2b5e..63411d4bbd1 100644
--- a/src/vs/workbench/services/extensions/common/lazyPromise.ts
+++ b/src/vs/workbench/services/extensions/common/lazyPromise.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationError, onUnexpectedError } from 'vs/base/common/errors';
+import { CancellationError, onUnexpectedError } from '../../../../base/common/errors.js';
 
 export class LazyPromise implements Promise<any> {
 
diff --git a/src/vs/workbench/services/extensions/common/proxyIdentifier.ts b/src/vs/workbench/services/extensions/common/proxyIdentifier.ts
index 42573f28c93..fa4d9772b2a 100644
--- a/src/vs/workbench/services/extensions/common/proxyIdentifier.ts
+++ b/src/vs/workbench/services/extensions/common/proxyIdentifier.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import type { VSBuffer } from 'vs/base/common/buffer';
-import type { CancellationToken } from 'vs/base/common/cancellation';
+import type { VSBuffer } from '../../../../base/common/buffer.js';
+import type { CancellationToken } from '../../../../base/common/cancellation.js';
 
 export interface IRPCProtocol {
 	/**
diff --git a/src/vs/workbench/services/extensions/common/remoteConsoleUtil.ts b/src/vs/workbench/services/extensions/common/remoteConsoleUtil.ts
index 8a1adac24a2..e6bea742d08 100644
--- a/src/vs/workbench/services/extensions/common/remoteConsoleUtil.ts
+++ b/src/vs/workbench/services/extensions/common/remoteConsoleUtil.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IRemoteConsoleLog, parse } from 'vs/base/common/console';
-import { ILogService } from 'vs/platform/log/common/log';
+import { IRemoteConsoleLog, parse } from '../../../../base/common/console.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
 
 export function logRemoteEntry(logService: ILogService, entry: IRemoteConsoleLog, label: string | null = null): void {
 	const args = parse(entry).args;
diff --git a/src/vs/workbench/services/extensions/common/remoteExtensionHost.ts b/src/vs/workbench/services/extensions/common/remoteExtensionHost.ts
index 617256fb123..3e7f83e2056 100644
--- a/src/vs/workbench/services/extensions/common/remoteExtensionHost.ts
+++ b/src/vs/workbench/services/extensions/common/remoteExtensionHost.ts
@@ -3,30 +3,30 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import * as platform from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { IMessagePassingProtocol } from 'vs/base/parts/ipc/common/ipc';
-import { PersistentProtocol } from 'vs/base/parts/ipc/common/ipc.net';
-import { IExtensionHostDebugService } from 'vs/platform/debug/common/extensionHostDebug';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { ILogService, ILoggerService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IConnectionOptions, IRemoteExtensionHostStartParams, connectRemoteAgentExtensionHost } from 'vs/platform/remote/common/remoteAgentConnection';
-import { IRemoteAuthorityResolverService, IRemoteConnectionData } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { IRemoteSocketFactoryService } from 'vs/platform/remote/common/remoteSocketFactoryService';
-import { ISignService } from 'vs/platform/sign/common/sign';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { isLoggingOnly } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { parseExtensionDevOptions } from 'vs/workbench/services/extensions/common/extensionDevOptions';
-import { IExtensionHostInitData, MessageType, UIKind, createMessageOfType, isMessageOfType } from 'vs/workbench/services/extensions/common/extensionHostProtocol';
-import { RemoteRunningLocation } from 'vs/workbench/services/extensions/common/extensionRunningLocation';
-import { ExtensionHostExtensions, ExtensionHostStartup, IExtensionHost } from 'vs/workbench/services/extensions/common/extensions';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import * as platform from '../../../../base/common/platform.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IMessagePassingProtocol } from '../../../../base/parts/ipc/common/ipc.js';
+import { PersistentProtocol } from '../../../../base/parts/ipc/common/ipc.net.js';
+import { IExtensionHostDebugService } from '../../../../platform/debug/common/extensionHostDebug.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { ILogService, ILoggerService } from '../../../../platform/log/common/log.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IConnectionOptions, IRemoteExtensionHostStartParams, connectRemoteAgentExtensionHost } from '../../../../platform/remote/common/remoteAgentConnection.js';
+import { IRemoteAuthorityResolverService, IRemoteConnectionData } from '../../../../platform/remote/common/remoteAuthorityResolver.js';
+import { IRemoteSocketFactoryService } from '../../../../platform/remote/common/remoteSocketFactoryService.js';
+import { ISignService } from '../../../../platform/sign/common/sign.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { isLoggingOnly } from '../../../../platform/telemetry/common/telemetryUtils.js';
+import { IWorkspaceContextService, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { parseExtensionDevOptions } from './extensionDevOptions.js';
+import { IExtensionHostInitData, MessageType, UIKind, createMessageOfType, isMessageOfType } from './extensionHostProtocol.js';
+import { RemoteRunningLocation } from './extensionRunningLocation.js';
+import { ExtensionHostExtensions, ExtensionHostStartup, IExtensionHost } from './extensions.js';
 
 export interface IRemoteExtensionHostInitData {
 	readonly connectionData: IRemoteConnectionData | null;
@@ -56,6 +56,7 @@ export class RemoteExtensionHost extends Disposable implements IExtensionHost {
 	private _protocol: PersistentProtocol | null;
 	private _hasLostConnection: boolean;
 	private _terminating: boolean;
+	private _hasDisconnected = false;
 	private readonly _isExtensionDevHost: boolean;
 
 	constructor(
@@ -264,22 +265,28 @@ export class RemoteExtensionHost extends Disposable implements IExtensionHost {
 		return Promise.resolve(false);
 	}
 
+	async disconnect() {
+		if (this._protocol && !this._hasDisconnected) {
+			this._protocol.send(createMessageOfType(MessageType.Terminate));
+			this._protocol.sendDisconnect();
+			this._hasDisconnected = true;
+			await this._protocol.drain();
+		}
+	}
+
 	override dispose(): void {
 		super.dispose();
 
 		this._terminating = true;
+		this.disconnect();
 
 		if (this._protocol) {
 			// Send the extension host a request to terminate itself
 			// (graceful termination)
 			// setTimeout(() => {
 			// console.log(`SENDING TERMINATE TO REMOTE EXT HOST!`);
-			const socket = this._protocol.getSocket();
-			this._protocol.send(createMessageOfType(MessageType.Terminate));
-			this._protocol.sendDisconnect();
-			this._protocol.dispose();
+			this._protocol.getSocket().end();
 			// this._protocol.drain();
-			socket.end();
 			this._protocol = null;
 			// }, 1000);
 		}
diff --git a/src/vs/workbench/services/extensions/common/rpcProtocol.ts b/src/vs/workbench/services/extensions/common/rpcProtocol.ts
index e936f43f09f..9ac226b0b0d 100644
--- a/src/vs/workbench/services/extensions/common/rpcProtocol.ts
+++ b/src/vs/workbench/services/extensions/common/rpcProtocol.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { CharCode } from 'vs/base/common/charCode';
-import * as errors from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { MarshalledObject } from 'vs/base/common/marshalling';
-import { MarshalledId } from 'vs/base/common/marshallingIds';
-import { IURITransformer, transformIncomingURIs } from 'vs/base/common/uriIpc';
-import { IMessagePassingProtocol } from 'vs/base/parts/ipc/common/ipc';
-import { CanceledLazyPromise, LazyPromise } from 'vs/workbench/services/extensions/common/lazyPromise';
-import { getStringIdentifierForProxy, IRPCProtocol, Proxied, ProxyIdentifier, SerializableObjectWithBuffers } from 'vs/workbench/services/extensions/common/proxyIdentifier';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { CharCode } from '../../../../base/common/charCode.js';
+import * as errors from '../../../../base/common/errors.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import { MarshalledObject } from '../../../../base/common/marshalling.js';
+import { MarshalledId } from '../../../../base/common/marshallingIds.js';
+import { IURITransformer, transformIncomingURIs } from '../../../../base/common/uriIpc.js';
+import { IMessagePassingProtocol } from '../../../../base/parts/ipc/common/ipc.js';
+import { CanceledLazyPromise, LazyPromise } from './lazyPromise.js';
+import { getStringIdentifierForProxy, IRPCProtocol, Proxied, ProxyIdentifier, SerializableObjectWithBuffers } from './proxyIdentifier.js';
 
 export interface JSONStringifyReplacer {
 	(key: string, value: any): any;
diff --git a/src/vs/workbench/services/extensions/common/workspaceContains.ts b/src/vs/workbench/services/extensions/common/workspaceContains.ts
index cc2c6917eb7..09922248378 100644
--- a/src/vs/workbench/services/extensions/common/workspaceContains.ts
+++ b/src/vs/workbench/services/extensions/common/workspaceContains.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as resources from 'vs/base/common/resources';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { CancellationTokenSource, CancellationToken } from 'vs/base/common/cancellation';
-import * as errors from 'vs/base/common/errors';
-import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { QueryBuilder } from 'vs/workbench/services/search/common/queryBuilder';
-import { ISearchService } from 'vs/workbench/services/search/common/search';
-import { toWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { ILogService } from 'vs/platform/log/common/log';
-import { promiseWithResolvers } from 'vs/base/common/async';
+import * as resources from '../../../../base/common/resources.js';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
+import { CancellationTokenSource, CancellationToken } from '../../../../base/common/cancellation.js';
+import * as errors from '../../../../base/common/errors.js';
+import { ExtensionIdentifier, IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { QueryBuilder } from '../../search/common/queryBuilder.js';
+import { ISearchService } from '../../search/common/search.js';
+import { toWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { promiseWithResolvers } from '../../../../base/common/async.js';
 
 const WORKSPACE_CONTAINS_TIMEOUT = 7000;
 
diff --git a/src/vs/workbench/services/extensions/electron-sandbox/cachedExtensionScanner.ts b/src/vs/workbench/services/extensions/electron-sandbox/cachedExtensionScanner.ts
index aaf716dc2bc..04d4ff9703d 100644
--- a/src/vs/workbench/services/extensions/electron-sandbox/cachedExtensionScanner.ts
+++ b/src/vs/workbench/services/extensions/electron-sandbox/cachedExtensionScanner.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as platform from 'vs/base/common/platform';
-import { IExtensionDescription, IExtension } from 'vs/platform/extensions/common/extensions';
-import { dedupExtensions } from 'vs/workbench/services/extensions/common/extensionsUtil';
-import { IExtensionsScannerService, IScannedExtension, toExtensionDescription as toExtensionDescriptionFromScannedExtension } from 'vs/platform/extensionManagement/common/extensionsScannerService';
-import { ILogService } from 'vs/platform/log/common/log';
-import Severity from 'vs/base/common/severity';
-import { localize } from 'vs/nls';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { timeout } from 'vs/base/common/async';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { getErrorMessage } from 'vs/base/common/errors';
-import { IWorkbenchExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { toExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
+import * as platform from '../../../../base/common/platform.js';
+import { IExtensionDescription, IExtension } from '../../../../platform/extensions/common/extensions.js';
+import { dedupExtensions } from '../common/extensionsUtil.js';
+import { IExtensionsScannerService, IScannedExtension, toExtensionDescription as toExtensionDescriptionFromScannedExtension } from '../../../../platform/extensionManagement/common/extensionsScannerService.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import Severity from '../../../../base/common/severity.js';
+import { localize } from '../../../../nls.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IHostService } from '../../host/browser/host.js';
+import { timeout } from '../../../../base/common/async.js';
+import { IUserDataProfileService } from '../../userDataProfile/common/userDataProfile.js';
+import { getErrorMessage } from '../../../../base/common/errors.js';
+import { IWorkbenchExtensionManagementService } from '../../extensionManagement/common/extensionManagement.js';
+import { toExtensionDescription } from '../common/extensions.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
 
 export class CachedExtensionScanner {
 
diff --git a/src/vs/workbench/services/extensions/electron-sandbox/extensionHostProfiler.ts b/src/vs/workbench/services/extensions/electron-sandbox/extensionHostProfiler.ts
index f771fb49129..4a2b0219b0f 100644
--- a/src/vs/workbench/services/extensions/electron-sandbox/extensionHostProfiler.ts
+++ b/src/vs/workbench/services/extensions/electron-sandbox/extensionHostProfiler.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { TernarySearchTree } from 'vs/base/common/ternarySearchTree';
-import { IExtensionHostProfile, IExtensionService, ProfileSegmentId, ProfileSession } from 'vs/workbench/services/extensions/common/extensions';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { IV8InspectProfilingService, IV8Profile, IV8ProfileNode } from 'vs/platform/profiling/common/profiling';
-import { createSingleCallFunction } from 'vs/base/common/functional';
+import { TernarySearchTree } from '../../../../base/common/ternarySearchTree.js';
+import { IExtensionHostProfile, IExtensionService, ProfileSegmentId, ProfileSession } from '../common/extensions.js';
+import { IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IV8InspectProfilingService, IV8Profile, IV8ProfileNode } from '../../../../platform/profiling/common/profiling.js';
+import { createSingleCallFunction } from '../../../../base/common/functional.js';
 
 export class ExtensionHostProfiler {
 
diff --git a/src/vs/workbench/services/extensions/electron-sandbox/extensionHostStarter.ts b/src/vs/workbench/services/extensions/electron-sandbox/extensionHostStarter.ts
index 3c66e49cec5..e8bcaabe8eb 100644
--- a/src/vs/workbench/services/extensions/electron-sandbox/extensionHostStarter.ts
+++ b/src/vs/workbench/services/extensions/electron-sandbox/extensionHostStarter.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { registerMainProcessRemoteService } from 'vs/platform/ipc/electron-sandbox/services';
-import { IExtensionHostStarter, ipcExtensionHostStarterChannelName } from 'vs/platform/extensions/common/extensionHostStarter';
+import { registerMainProcessRemoteService } from '../../../../platform/ipc/electron-sandbox/services.js';
+import { IExtensionHostStarter, ipcExtensionHostStarterChannelName } from '../../../../platform/extensions/common/extensionHostStarter.js';
 
 registerMainProcessRemoteService(IExtensionHostStarter, ipcExtensionHostStarterChannelName);
diff --git a/src/vs/workbench/services/extensions/electron-sandbox/extensionsScannerService.ts b/src/vs/workbench/services/extensions/electron-sandbox/extensionsScannerService.ts
index 3fa901e4466..cf85fe2573a 100644
--- a/src/vs/workbench/services/extensions/electron-sandbox/extensionsScannerService.ts
+++ b/src/vs/workbench/services/extensions/electron-sandbox/extensionsScannerService.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IExtensionsProfileScannerService } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService';
-import { IExtensionsScannerService, NativeExtensionsScannerService, } from 'vs/platform/extensionManagement/common/extensionsScannerService';
-import { IFileService } from 'vs/platform/files/common/files';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
+import { URI } from '../../../../base/common/uri.js';
+import { INativeEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { IExtensionsProfileScannerService } from '../../../../platform/extensionManagement/common/extensionsProfileScannerService.js';
+import { IExtensionsScannerService, NativeExtensionsScannerService, } from '../../../../platform/extensionManagement/common/extensionsScannerService.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { IUserDataProfileService } from '../../userDataProfile/common/userDataProfile.js';
 
 export class ExtensionsScannerService extends NativeExtensionsScannerService implements IExtensionsScannerService {
 
diff --git a/src/vs/workbench/services/extensions/electron-sandbox/localProcessExtensionHost.ts b/src/vs/workbench/services/extensions/electron-sandbox/localProcessExtensionHost.ts
index 0074c58d815..e62e021ae8d 100644
--- a/src/vs/workbench/services/extensions/electron-sandbox/localProcessExtensionHost.ts
+++ b/src/vs/workbench/services/extensions/electron-sandbox/localProcessExtensionHost.ts
@@ -3,41 +3,41 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { timeout } from 'vs/base/common/async';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import * as objects from 'vs/base/common/objects';
-import * as platform from 'vs/base/common/platform';
-import { removeDangerousEnvVariables } from 'vs/base/common/processes';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { URI } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
-import { IMessagePassingProtocol } from 'vs/base/parts/ipc/common/ipc';
-import { BufferedEmitter } from 'vs/base/parts/ipc/common/ipc.net';
-import { acquirePort } from 'vs/base/parts/ipc/electron-sandbox/ipc.mp';
-import * as nls from 'vs/nls';
-import { IExtensionHostDebugService } from 'vs/platform/debug/common/extensionHostDebug';
-import { IExtensionHostProcessOptions, IExtensionHostStarter } from 'vs/platform/extensions/common/extensionHostStarter';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { ILogService, ILoggerService } from 'vs/platform/log/common/log';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { INotificationService, NotificationPriority, Severity } from 'vs/platform/notification/common/notification';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { isLoggingOnly } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IWorkspaceContextService, WorkbenchState, isUntitledWorkspace } from 'vs/platform/workspace/common/workspace';
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
-import { IShellEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/shellEnvironmentService';
-import { MessagePortExtHostConnection, writeExtHostConnection } from 'vs/workbench/services/extensions/common/extensionHostEnv';
-import { IExtensionHostInitData, MessageType, NativeLogMarkers, UIKind, isMessageOfType } from 'vs/workbench/services/extensions/common/extensionHostProtocol';
-import { LocalProcessRunningLocation } from 'vs/workbench/services/extensions/common/extensionRunningLocation';
-import { ExtensionHostExtensions, ExtensionHostStartup, IExtensionHost } from 'vs/workbench/services/extensions/common/extensions';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { ILifecycleService, WillShutdownEvent } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { parseExtensionDevOptions } from '../common/extensionDevOptions';
+import { timeout } from '../../../../base/common/async.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { CancellationError } from '../../../../base/common/errors.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import * as objects from '../../../../base/common/objects.js';
+import * as platform from '../../../../base/common/platform.js';
+import { removeDangerousEnvVariables } from '../../../../base/common/processes.js';
+import { StopWatch } from '../../../../base/common/stopwatch.js';
+import { URI } from '../../../../base/common/uri.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { IMessagePassingProtocol } from '../../../../base/parts/ipc/common/ipc.js';
+import { BufferedEmitter } from '../../../../base/parts/ipc/common/ipc.net.js';
+import { acquirePort } from '../../../../base/parts/ipc/electron-sandbox/ipc.mp.js';
+import * as nls from '../../../../nls.js';
+import { IExtensionHostDebugService } from '../../../../platform/debug/common/extensionHostDebug.js';
+import { IExtensionHostProcessOptions, IExtensionHostStarter } from '../../../../platform/extensions/common/extensionHostStarter.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { ILogService, ILoggerService } from '../../../../platform/log/common/log.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { INotificationService, NotificationPriority, Severity } from '../../../../platform/notification/common/notification.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { isLoggingOnly } from '../../../../platform/telemetry/common/telemetryUtils.js';
+import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { IWorkspaceContextService, WorkbenchState, isUntitledWorkspace } from '../../../../platform/workspace/common/workspace.js';
+import { INativeWorkbenchEnvironmentService } from '../../environment/electron-sandbox/environmentService.js';
+import { IShellEnvironmentService } from '../../environment/electron-sandbox/shellEnvironmentService.js';
+import { MessagePortExtHostConnection, writeExtHostConnection } from '../common/extensionHostEnv.js';
+import { IExtensionHostInitData, MessageType, NativeLogMarkers, UIKind, isMessageOfType } from '../common/extensionHostProtocol.js';
+import { LocalProcessRunningLocation } from '../common/extensionRunningLocation.js';
+import { ExtensionHostExtensions, ExtensionHostStartup, IExtensionHost } from '../common/extensions.js';
+import { IHostService } from '../../host/browser/host.js';
+import { ILifecycleService, WillShutdownEvent } from '../../lifecycle/common/lifecycle.js';
+import { parseExtensionDevOptions } from '../common/extensionDevOptions.js';
 
 export interface ILocalProcessExtensionHostInitData {
 	readonly extensions: ExtensionHostExtensions;
@@ -191,7 +191,7 @@ export class NativeLocalProcessExtensionHost implements IExtensionHost {
 		this._extensionHostProcess = new ExtensionHostProcess(extensionHostCreationResult.id, this._extensionHostStarter);
 
 		const env = objects.mixin(processEnv, {
-			VSCODE_AMD_ENTRYPOINT: 'vs/workbench/api/node/extensionHostProcess',
+			VSCODE_ESM_ENTRYPOINT: 'vs/workbench/api/node/extensionHostProcess',
 			VSCODE_HANDLES_UNCAUGHT_ERRORS: true
 		});
 
@@ -281,7 +281,7 @@ export class NativeLocalProcessExtensionHost implements IExtensionHost {
 
 		// Lifecycle
 
-		this._extensionHostProcess.onExit(({ code, signal }) => this._onExtHostProcessExit(code, signal));
+		this._toDispose.add(this._extensionHostProcess.onExit(({ code, signal }) => this._onExtHostProcessExit(code, signal)));
 
 		// Notify debugger that we are ready to attach to the process if we run a development extension
 		if (portNumber) {
diff --git a/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts b/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts
index b7b77b23e0e..551ea511448 100644
--- a/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts
+++ b/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts
@@ -3,61 +3,61 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { runWhenWindowIdle } from 'vs/base/browser/dom';
-import { mainWindow } from 'vs/base/browser/window';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Schemas } from 'vs/base/common/network';
-import * as performance from 'vs/base/common/performance';
-import { isCI } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import * as nls from 'vs/nls';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { ExtensionKind } from 'vs/platform/environment/common/environment';
-import { IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { IFileService } from 'vs/platform/files/common/files';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { INotificationService, IPromptChoice, NotificationPriority, Severity } from 'vs/platform/notification/common/notification';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { PersistentConnectionEventType } from 'vs/platform/remote/common/remoteAgentConnection';
-import { IRemoteAgentEnvironment } from 'vs/platform/remote/common/remoteAgentEnvironment';
-import { IRemoteAuthorityResolverService, RemoteAuthorityResolverError, RemoteConnectionType, ResolverResult, getRemoteAuthorityPrefix } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { IRemoteExtensionsScannerService } from 'vs/platform/remote/common/remoteExtensionsScanner';
-import { getRemoteName, parseAuthorityWithPort } from 'vs/platform/remote/common/remoteHosts';
-import { updateProxyConfigurationsScope } from 'vs/platform/request/common/request';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IWorkspaceTrustManagementService } from 'vs/platform/workspace/common/workspaceTrust';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { EnablementState, IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { IWebWorkerExtensionHostDataProvider, IWebWorkerExtensionHostInitData, WebWorkerExtensionHost } from 'vs/workbench/services/extensions/browser/webWorkerExtensionHost';
-import { AbstractExtensionService, ExtensionHostCrashTracker, IExtensionHostFactory, ResolvedExtensions, checkEnabledAndProposedAPI, extensionIsEnabled } from 'vs/workbench/services/extensions/common/abstractExtensionService';
-import { ExtensionDescriptionRegistrySnapshot } from 'vs/workbench/services/extensions/common/extensionDescriptionRegistry';
-import { parseExtensionDevOptions } from 'vs/workbench/services/extensions/common/extensionDevOptions';
-import { ExtensionHostKind, ExtensionRunningPreference, IExtensionHostKindPicker, extensionHostKindToString, extensionRunningPreferenceToString } from 'vs/workbench/services/extensions/common/extensionHostKind';
-import { IExtensionHostManager } from 'vs/workbench/services/extensions/common/extensionHostManagers';
-import { ExtensionHostExitCode } from 'vs/workbench/services/extensions/common/extensionHostProtocol';
-import { IExtensionManifestPropertiesService } from 'vs/workbench/services/extensions/common/extensionManifestPropertiesService';
-import { ExtensionRunningLocation, LocalProcessRunningLocation, LocalWebWorkerRunningLocation } from 'vs/workbench/services/extensions/common/extensionRunningLocation';
-import { ExtensionRunningLocationTracker, filterExtensionDescriptions } from 'vs/workbench/services/extensions/common/extensionRunningLocationTracker';
-import { ExtensionHostExtensions, ExtensionHostStartup, IExtensionHost, IExtensionService, WebWorkerExtHostConfigValue, toExtension, webWorkerExtHostConfig } from 'vs/workbench/services/extensions/common/extensions';
-import { ExtensionsProposedApi } from 'vs/workbench/services/extensions/common/extensionsProposedApi';
-import { IRemoteExtensionHostDataProvider, IRemoteExtensionHostInitData, RemoteExtensionHost } from 'vs/workbench/services/extensions/common/remoteExtensionHost';
-import { CachedExtensionScanner } from 'vs/workbench/services/extensions/electron-sandbox/cachedExtensionScanner';
-import { ILocalProcessExtensionHostDataProvider, ILocalProcessExtensionHostInitData, NativeLocalProcessExtensionHost } from 'vs/workbench/services/extensions/electron-sandbox/localProcessExtensionHost';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { ILifecycleService, LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { IRemoteExplorerService } from 'vs/workbench/services/remote/common/remoteExplorerService';
+import { runWhenWindowIdle } from '../../../../base/browser/dom.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Schemas } from '../../../../base/common/network.js';
+import * as performance from '../../../../base/common/performance.js';
+import { isCI } from '../../../../base/common/platform.js';
+import { URI } from '../../../../base/common/uri.js';
+import * as nls from '../../../../nls.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ConfigurationScope } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { ExtensionKind } from '../../../../platform/environment/common/environment.js';
+import { IExtensionGalleryService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { ExtensionIdentifier, IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { INotificationService, IPromptChoice, NotificationPriority, Severity } from '../../../../platform/notification/common/notification.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { PersistentConnectionEventType } from '../../../../platform/remote/common/remoteAgentConnection.js';
+import { IRemoteAgentEnvironment } from '../../../../platform/remote/common/remoteAgentEnvironment.js';
+import { IRemoteAuthorityResolverService, RemoteAuthorityResolverError, RemoteConnectionType, ResolverResult, getRemoteAuthorityPrefix } from '../../../../platform/remote/common/remoteAuthorityResolver.js';
+import { IRemoteExtensionsScannerService } from '../../../../platform/remote/common/remoteExtensionsScanner.js';
+import { getRemoteName, parseAuthorityWithPort } from '../../../../platform/remote/common/remoteHosts.js';
+import { updateProxyConfigurationsScope } from '../../../../platform/request/common/request.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { IWorkspaceTrustManagementService } from '../../../../platform/workspace/common/workspaceTrust.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { EnablementState, IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService } from '../../extensionManagement/common/extensionManagement.js';
+import { IWebWorkerExtensionHostDataProvider, IWebWorkerExtensionHostInitData, WebWorkerExtensionHost } from '../browser/webWorkerExtensionHost.js';
+import { AbstractExtensionService, ExtensionHostCrashTracker, IExtensionHostFactory, ResolvedExtensions, checkEnabledAndProposedAPI, extensionIsEnabled } from '../common/abstractExtensionService.js';
+import { ExtensionDescriptionRegistrySnapshot } from '../common/extensionDescriptionRegistry.js';
+import { parseExtensionDevOptions } from '../common/extensionDevOptions.js';
+import { ExtensionHostKind, ExtensionRunningPreference, IExtensionHostKindPicker, extensionHostKindToString, extensionRunningPreferenceToString } from '../common/extensionHostKind.js';
+import { IExtensionHostManager } from '../common/extensionHostManagers.js';
+import { ExtensionHostExitCode } from '../common/extensionHostProtocol.js';
+import { IExtensionManifestPropertiesService } from '../common/extensionManifestPropertiesService.js';
+import { ExtensionRunningLocation, LocalProcessRunningLocation, LocalWebWorkerRunningLocation } from '../common/extensionRunningLocation.js';
+import { ExtensionRunningLocationTracker, filterExtensionDescriptions } from '../common/extensionRunningLocationTracker.js';
+import { ExtensionHostExtensions, ExtensionHostStartup, IExtensionHost, IExtensionService, WebWorkerExtHostConfigValue, toExtension, webWorkerExtHostConfig } from '../common/extensions.js';
+import { ExtensionsProposedApi } from '../common/extensionsProposedApi.js';
+import { IRemoteExtensionHostDataProvider, IRemoteExtensionHostInitData, RemoteExtensionHost } from '../common/remoteExtensionHost.js';
+import { CachedExtensionScanner } from './cachedExtensionScanner.js';
+import { ILocalProcessExtensionHostDataProvider, ILocalProcessExtensionHostInitData, NativeLocalProcessExtensionHost } from './localProcessExtensionHost.js';
+import { IHostService } from '../../host/browser/host.js';
+import { ILifecycleService, LifecyclePhase } from '../../lifecycle/common/lifecycle.js';
+import { IRemoteAgentService } from '../../remote/common/remoteAgentService.js';
+import { IRemoteExplorerService } from '../../remote/common/remoteExplorerService.js';
 
 export class NativeExtensionService extends AbstractExtensionService implements IExtensionService {
 
@@ -420,9 +420,9 @@ export class NativeExtensionService extends AbstractExtensionService implements
 		return new ResolvedExtensions(await this._scanAllLocalExtensions(), remoteExtensions, /*hasLocalProcess*/true, /*allowRemoteExtensionsInLocalWebWorker*/false);
 	}
 
-	protected _onExtensionHostExit(code: number): void {
+	protected async _onExtensionHostExit(code: number): Promise<void> {
 		// Dispose everything associated with the extension host
-		this._doStopExtensionHosts();
+		await this._doStopExtensionHosts();
 
 		// Dispose the management connection to avoid reconnecting after the extension host exits
 		const connection = this._remoteAgentService.getConnection();
diff --git a/src/vs/workbench/services/extensions/test/browser/extensionService.test.ts b/src/vs/workbench/services/extensions/test/browser/extensionService.test.ts
index b6b2edb844b..5e94ff70590 100644
--- a/src/vs/workbench/services/extensions/test/browser/extensionService.test.ts
+++ b/src/vs/workbench/services/extensions/test/browser/extensionService.test.ts
@@ -4,50 +4,50 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Event } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { mock } from 'vs/base/test/common/mock';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { TestDialogService } from 'vs/platform/dialogs/test/common/testDialogService';
-import { ExtensionKind, IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { ExtensionIdentifier, IExtension, IRelaxedExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { TestInstantiationService, createServices } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { ILogService, NullLogService } from 'vs/platform/log/common/log';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
-import product from 'vs/platform/product/common/product';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { RemoteAuthorityResolverService } from 'vs/platform/remote/browser/remoteAuthorityResolverService';
-import { IRemoteAuthorityResolverService, ResolverResult } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { IRemoteExtensionsScannerService } from 'vs/platform/remote/common/remoteExtensionsScanner';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { IUserDataProfilesService, UserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IWorkspaceTrustEnablementService } from 'vs/platform/workspace/common/workspaceTrust';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IWebExtensionsScannerService, IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { BrowserExtensionHostKindPicker } from 'vs/workbench/services/extensions/browser/extensionService';
-import { AbstractExtensionService, IExtensionHostFactory, ResolvedExtensions } from 'vs/workbench/services/extensions/common/abstractExtensionService';
-import { ExtensionHostKind, ExtensionRunningPreference } from 'vs/workbench/services/extensions/common/extensionHostKind';
-import { IExtensionHostManager } from 'vs/workbench/services/extensions/common/extensionHostManagers';
-import { ExtensionManifestPropertiesService, IExtensionManifestPropertiesService } from 'vs/workbench/services/extensions/common/extensionManifestPropertiesService';
-import { ExtensionRunningLocation } from 'vs/workbench/services/extensions/common/extensionRunningLocation';
-import { ExtensionRunningLocationTracker } from 'vs/workbench/services/extensions/common/extensionRunningLocationTracker';
-import { IExtensionHost, IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { ExtensionsProposedApi } from 'vs/workbench/services/extensions/common/extensionsProposedApi';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { WorkspaceTrustEnablementService } from 'vs/workbench/services/workspaces/common/workspaceTrust';
-import { TestEnvironmentService, TestFileService, TestLifecycleService, TestRemoteAgentService, TestRemoteExtensionsScannerService, TestUserDataProfileService, TestWebExtensionsScannerService, TestWorkbenchExtensionEnablementService, TestWorkbenchExtensionManagementService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { TestContextService } from 'vs/workbench/test/common/workbenchTestServices';
+import { Event } from '../../../../../base/common/event.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { mock } from '../../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { TestDialogService } from '../../../../../platform/dialogs/test/common/testDialogService.js';
+import { ExtensionKind, IEnvironmentService } from '../../../../../platform/environment/common/environment.js';
+import { ExtensionIdentifier, IExtension, IExtensionDescription } from '../../../../../platform/extensions/common/extensions.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { TestInstantiationService, createServices } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { ILogService, NullLogService } from '../../../../../platform/log/common/log.js';
+import { INotificationService } from '../../../../../platform/notification/common/notification.js';
+import { TestNotificationService } from '../../../../../platform/notification/test/common/testNotificationService.js';
+import product from '../../../../../platform/product/common/product.js';
+import { IProductService } from '../../../../../platform/product/common/productService.js';
+import { RemoteAuthorityResolverService } from '../../../../../platform/remote/browser/remoteAuthorityResolverService.js';
+import { IRemoteAuthorityResolverService, ResolverResult } from '../../../../../platform/remote/common/remoteAuthorityResolver.js';
+import { IRemoteExtensionsScannerService } from '../../../../../platform/remote/common/remoteExtensionsScanner.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { NullTelemetryService } from '../../../../../platform/telemetry/common/telemetryUtils.js';
+import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.js';
+import { UriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentityService.js';
+import { IUserDataProfilesService, UserDataProfilesService } from '../../../../../platform/userDataProfile/common/userDataProfile.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { IWorkspaceTrustEnablementService } from '../../../../../platform/workspace/common/workspaceTrust.js';
+import { IWorkbenchEnvironmentService } from '../../../environment/common/environmentService.js';
+import { IWebExtensionsScannerService, IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService } from '../../../extensionManagement/common/extensionManagement.js';
+import { BrowserExtensionHostKindPicker } from '../../browser/extensionService.js';
+import { AbstractExtensionService, IExtensionHostFactory, ResolvedExtensions } from '../../common/abstractExtensionService.js';
+import { ExtensionHostKind, ExtensionRunningPreference } from '../../common/extensionHostKind.js';
+import { IExtensionHostManager } from '../../common/extensionHostManagers.js';
+import { ExtensionManifestPropertiesService, IExtensionManifestPropertiesService } from '../../common/extensionManifestPropertiesService.js';
+import { ExtensionRunningLocation } from '../../common/extensionRunningLocation.js';
+import { ExtensionRunningLocationTracker } from '../../common/extensionRunningLocationTracker.js';
+import { IExtensionHost, IExtensionService } from '../../common/extensions.js';
+import { ExtensionsProposedApi } from '../../common/extensionsProposedApi.js';
+import { ILifecycleService } from '../../../lifecycle/common/lifecycle.js';
+import { IRemoteAgentService } from '../../../remote/common/remoteAgentService.js';
+import { IUserDataProfileService } from '../../../userDataProfile/common/userDataProfile.js';
+import { WorkspaceTrustEnablementService } from '../../../workspaces/common/workspaceTrust.js';
+import { TestEnvironmentService, TestFileService, TestLifecycleService, TestRemoteAgentService, TestRemoteExtensionsScannerService, TestUserDataProfileService, TestWebExtensionsScannerService, TestWorkbenchExtensionEnablementService, TestWorkbenchExtensionManagementService } from '../../../../test/browser/workbenchTestServices.js';
+import { TestContextService } from '../../../../test/common/workbenchTestServices.js';
 
 suite('BrowserExtensionService', () => {
 
@@ -198,6 +198,9 @@ suite('ExtensionService', () => {
 			return new class extends mock<IExtensionHostManager>() {
 				override onDidExit = Event.None;
 				override onDidChangeResponsiveState = Event.None;
+				override disconnect() {
+					return Promise.resolve();
+				}
 				override dispose(): void {
 					order.push(`dispose ${extensionHostId}`);
 				}
@@ -209,10 +212,10 @@ suite('ExtensionService', () => {
 		protected _resolveExtensions(): Promise<ResolvedExtensions> {
 			throw new Error('Method not implemented.');
 		}
-		protected _scanSingleExtension(extension: IExtension): Promise<Readonly<IRelaxedExtensionDescription> | null> {
+		protected _scanSingleExtension(extension: IExtension): Promise<IExtensionDescription | null> {
 			throw new Error('Method not implemented.');
 		}
-		protected _onExtensionHostExit(code: number): void {
+		protected _onExtensionHostExit(code: number): Promise<void> {
 			throw new Error('Method not implemented.');
 		}
 		protected _resolveAuthority(remoteAuthority: string): Promise<ResolverResult> {
@@ -255,7 +258,7 @@ suite('ExtensionService', () => {
 		extService = <MyTestExtensionService>instantiationService.get(IExtensionService);
 	});
 
-	teardown(() => {
+	teardown(async () => {
 		disposables.dispose();
 	});
 
diff --git a/src/vs/workbench/services/extensions/test/browser/extensionStorageMigration.test.ts b/src/vs/workbench/services/extensions/test/browser/extensionStorageMigration.test.ts
index f51e36b151a..b94e10e235b 100644
--- a/src/vs/workbench/services/extensions/test/browser/extensionStorageMigration.test.ts
+++ b/src/vs/workbench/services/extensions/test/browser/extensionStorageMigration.test.ts
@@ -4,25 +4,25 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IFileService } from 'vs/platform/files/common/files';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { IExtensionStorageService, ExtensionStorageService } from 'vs/platform/extensionManagement/common/extensionStorage';
-import { URI } from 'vs/base/common/uri';
-import { joinPath } from 'vs/base/common/resources';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { TestWorkspace } from 'vs/platform/workspace/test/common/testWorkspace';
-import { migrateExtensionStorage } from 'vs/workbench/services/extensions/common/extensionStorageMigration';
-import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
-import { IUserDataProfilesService, UserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { UserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfileService';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { IEnvironmentService } from '../../../../../platform/environment/common/environment.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { FileService } from '../../../../../platform/files/common/fileService.js';
+import { InMemoryFileSystemProvider } from '../../../../../platform/files/common/inMemoryFilesystemProvider.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { NullLogService } from '../../../../../platform/log/common/log.js';
+import { workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
+import { IExtensionStorageService, ExtensionStorageService } from '../../../../../platform/extensionManagement/common/extensionStorage.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { joinPath } from '../../../../../base/common/resources.js';
+import { VSBuffer } from '../../../../../base/common/buffer.js';
+import { TestWorkspace } from '../../../../../platform/workspace/test/common/testWorkspace.js';
+import { migrateExtensionStorage } from '../../common/extensionStorageMigration.js';
+import { IStorageService, StorageScope } from '../../../../../platform/storage/common/storage.js';
+import { IUserDataProfilesService, UserDataProfilesService } from '../../../../../platform/userDataProfile/common/userDataProfile.js';
+import { UserDataProfileService } from '../../../userDataProfile/common/userDataProfileService.js';
+import { IUserDataProfileService } from '../../../userDataProfile/common/userDataProfile.js';
+import { UriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentityService.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('ExtensionStorageMigration', () => {
 
diff --git a/src/vs/workbench/services/extensions/test/common/extensionDescriptionRegistry.test.ts b/src/vs/workbench/services/extensions/test/common/extensionDescriptionRegistry.test.ts
index 7ac88d4cdad..e212c86e60c 100644
--- a/src/vs/workbench/services/extensions/test/common/extensionDescriptionRegistry.test.ts
+++ b/src/vs/workbench/services/extensions/test/common/extensionDescriptionRegistry.test.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ExtensionIdentifier, IExtensionDescription, TargetPlatform } from 'vs/platform/extensions/common/extensions';
-import { ExtensionDescriptionRegistry, IActivationEventsReader } from 'vs/workbench/services/extensions/common/extensionDescriptionRegistry';
+import { URI } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { ExtensionIdentifier, IExtensionDescription, TargetPlatform } from '../../../../../platform/extensions/common/extensions.js';
+import { ExtensionDescriptionRegistry, IActivationEventsReader } from '../../common/extensionDescriptionRegistry.js';
 
 suite('ExtensionDescriptionRegistry', () => {
 
@@ -44,7 +44,8 @@ suite('ExtensionDescriptionRegistry', () => {
 			activationEvents,
 			main: 'index.js',
 			targetPlatform: TargetPlatform.UNDEFINED,
-			extensionDependencies: []
+			extensionDependencies: [],
+			enabledApiProposals: undefined,
 		};
 	}
 });
diff --git a/src/vs/workbench/services/extensions/test/common/extensionManifestPropertiesService.test.ts b/src/vs/workbench/services/extensions/test/common/extensionManifestPropertiesService.test.ts
index 52d7abfebcd..2c0435ad642 100644
--- a/src/vs/workbench/services/extensions/test/common/extensionManifestPropertiesService.test.ts
+++ b/src/vs/workbench/services/extensions/test/common/extensionManifestPropertiesService.test.ts
@@ -4,18 +4,18 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { isWeb } from 'vs/base/common/platform';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { ExtensionUntrustedWorkspaceSupportType, IExtensionManifest } from 'vs/platform/extensions/common/extensions';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IWorkspaceTrustEnablementService } from 'vs/platform/workspace/common/workspaceTrust';
-import { ExtensionManifestPropertiesService } from 'vs/workbench/services/extensions/common/extensionManifestPropertiesService';
-import { TestProductService, TestWorkspaceTrustEnablementService } from 'vs/workbench/test/common/workbenchTestServices';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { isWeb } from '../../../../../base/common/platform.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { ExtensionUntrustedWorkspaceSupportType, IExtensionManifest } from '../../../../../platform/extensions/common/extensions.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { NullLogService } from '../../../../../platform/log/common/log.js';
+import { IProductService } from '../../../../../platform/product/common/productService.js';
+import { IWorkspaceTrustEnablementService } from '../../../../../platform/workspace/common/workspaceTrust.js';
+import { ExtensionManifestPropertiesService } from '../../common/extensionManifestPropertiesService.js';
+import { TestProductService, TestWorkspaceTrustEnablementService } from '../../../../test/common/workbenchTestServices.js';
 
 suite('ExtensionManifestPropertiesService - ExtensionKind', () => {
 
diff --git a/src/vs/workbench/services/extensions/test/common/rpcProtocol.test.ts b/src/vs/workbench/services/extensions/test/common/rpcProtocol.test.ts
index cffda52a238..ab713796a8e 100644
--- a/src/vs/workbench/services/extensions/test/common/rpcProtocol.test.ts
+++ b/src/vs/workbench/services/extensions/test/common/rpcProtocol.test.ts
@@ -4,14 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { IMessagePassingProtocol } from 'vs/base/parts/ipc/common/ipc';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ProxyIdentifier, SerializableObjectWithBuffers } from 'vs/workbench/services/extensions/common/proxyIdentifier';
-import { RPCProtocol } from 'vs/workbench/services/extensions/common/rpcProtocol';
+import { VSBuffer } from '../../../../../base/common/buffer.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { IMessagePassingProtocol } from '../../../../../base/parts/ipc/common/ipc.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { ProxyIdentifier, SerializableObjectWithBuffers } from '../../common/proxyIdentifier.js';
+import { RPCProtocol } from '../../common/rpcProtocol.js';
 
 suite('RPCProtocol', () => {
 
diff --git a/src/vs/workbench/services/extensions/worker/polyfillNestedWorker.ts b/src/vs/workbench/services/extensions/worker/polyfillNestedWorker.ts
index f7888900305..2bb1caf1920 100644
--- a/src/vs/workbench/services/extensions/worker/polyfillNestedWorker.ts
+++ b/src/vs/workbench/services/extensions/worker/polyfillNestedWorker.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { NewWorkerMessage, TerminateWorkerMessage } from 'vs/workbench/services/extensions/common/polyfillNestedWorker.protocol';
+import { NewWorkerMessage, TerminateWorkerMessage } from '../common/polyfillNestedWorker.protocol.js';
 
 declare function postMessage(data: any, transferables?: Transferable[]): void;
 
diff --git a/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html b/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
index 6a16dd10210..88407e89f16 100644
--- a/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
+++ b/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
@@ -4,7 +4,7 @@
 		<meta http-equiv="Content-Security-Policy" content="
 			default-src 'none';
 			child-src 'self' data: blob:;
-			script-src 'self' 'unsafe-eval' 'sha256-75NYUUvf+5++1WbfCZOV3PSWxBhONpaxwx+mkOFRv/Y=' https:;
+			script-src 'self' 'unsafe-eval' 'sha256-xM2KVDKIoeb8vVxk4ezEUsxdTZh5wFnKO3YmFhy9tkk=' https: http://localhost:* blob:;
 			connect-src 'self' https: wss: http://localhost:* http://127.0.0.1:* ws://localhost:* ws://127.0.0.1:*;"/>
 	</head>
 	<body>
@@ -12,7 +12,7 @@
 (function () {
 	const searchParams = new URL(document.location.href).searchParams;
 	const vscodeWebWorkerExtHostId = searchParams.get('vscodeWebWorkerExtHostId') || '';
-	const name = searchParams.get('debugged') ? 'DebugWorkerExtensionHost' : 'WorkerExtensionHost';
+	const name = searchParams.get('debugged') ? 'DebugExtensionHostWorker' : 'ExtensionHostWorker';
 	const parentOrigin = searchParams.get('parentOrigin') || window.origin;
 	const salt = searchParams.get('salt');
 
@@ -66,14 +66,47 @@
 	}
 
 	function start() {
+
+		// Before we can load the worker, we need to get the current set of NLS
+		// configuration into this iframe. We ask the parent window to send it
+		// together with the necessary information to load the worker via Blob.
+
+		const bootstrapNlsType = 'vscode.bootstrap.nls';
+
+		self.onmessage = (event) => {
+			if (event.origin !== parentOrigin || event.data.type !== bootstrapNlsType) {
+				return;
+			}
+			const { data } = event.data;
+			createWorker(data.workerUrl, data.fileRoot, data.nls.messages, data.nls.language);
+		};
+
+		window.parent.postMessage({
+			vscodeWebWorkerExtHostId,
+			type: bootstrapNlsType
+		}, '*');
+	}
+
+	function createWorker(workerUrl, fileRoot, nlsMessages, nlsLanguage) {
 		try {
-			let workerUrl = '../../../../base/worker/workerMain.js';
 			if (globalThis.crossOriginIsolated) {
 				workerUrl += '?vscode-coi=2'; // COEP
 			}
 
-			const worker = new Worker(workerUrl, { name });
-			worker.postMessage('vs/workbench/api/worker/extensionHostWorker');
+			// In below blob code, we are using JSON.stringify to ensure the passed
+			// in values are not breaking our script. The values may contain string
+			// terminating characters (such as ' or ").
+
+			const blob = new Blob([[
+				`/*extensionHostWorker*/`,
+				`globalThis._VSCODE_NLS_MESSAGES = ${JSON.stringify(nlsMessages)};`,
+				`globalThis._VSCODE_NLS_LANGUAGE = ${JSON.stringify(nlsLanguage)};`,
+				`globalThis._VSCODE_FILE_ROOT = ${JSON.stringify(fileRoot)};`,
+				`await import(${JSON.stringify(workerUrl)});`,
+				`/*extensionHostWorker*/`
+			].join('')], { type: 'application/javascript' });
+
+			const worker = new Worker(URL.createObjectURL(blob), { name, type: 'module' });
 			const nestedWorkers = new Map();
 
 			worker.onmessage = (event) => {
diff --git a/src/vs/workbench/services/files/browser/elevatedFileService.ts b/src/vs/workbench/services/files/browser/elevatedFileService.ts
index 3e950a0f417..182a3539c60 100644
--- a/src/vs/workbench/services/files/browser/elevatedFileService.ts
+++ b/src/vs/workbench/services/files/browser/elevatedFileService.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer, VSBufferReadable, VSBufferReadableStream } from 'vs/base/common/buffer';
-import { URI } from 'vs/base/common/uri';
-import { IFileStatWithMetadata, IWriteFileOptions } from 'vs/platform/files/common/files';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IElevatedFileService } from 'vs/workbench/services/files/common/elevatedFileService';
+import { VSBuffer, VSBufferReadable, VSBufferReadableStream } from '../../../../base/common/buffer.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IFileStatWithMetadata, IWriteFileOptions } from '../../../../platform/files/common/files.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IElevatedFileService } from '../common/elevatedFileService.js';
 
 export class BrowserElevatedFileService implements IElevatedFileService {
 
diff --git a/src/vs/workbench/services/files/common/elevatedFileService.ts b/src/vs/workbench/services/files/common/elevatedFileService.ts
index c607b9bebbc..5ba99eb66dc 100644
--- a/src/vs/workbench/services/files/common/elevatedFileService.ts
+++ b/src/vs/workbench/services/files/common/elevatedFileService.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { URI } from 'vs/base/common/uri';
-import { VSBuffer, VSBufferReadable, VSBufferReadableStream } from 'vs/base/common/buffer';
-import { IFileStatWithMetadata, IWriteFileOptions } from 'vs/platform/files/common/files';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { URI } from '../../../../base/common/uri.js';
+import { VSBuffer, VSBufferReadable, VSBufferReadableStream } from '../../../../base/common/buffer.js';
+import { IFileStatWithMetadata, IWriteFileOptions } from '../../../../platform/files/common/files.js';
 
 export const IElevatedFileService = createDecorator<IElevatedFileService>('elevatedFileService');
 
diff --git a/src/vs/workbench/services/files/electron-sandbox/diskFileSystemProvider.ts b/src/vs/workbench/services/files/electron-sandbox/diskFileSystemProvider.ts
index b399f7db908..c037805a6d3 100644
--- a/src/vs/workbench/services/files/electron-sandbox/diskFileSystemProvider.ts
+++ b/src/vs/workbench/services/files/electron-sandbox/diskFileSystemProvider.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { Event } from 'vs/base/common/event';
-import { isLinux } from 'vs/base/common/platform';
-import { FileSystemProviderCapabilities, IFileDeleteOptions, IStat, FileType, IFileReadStreamOptions, IFileWriteOptions, IFileOpenOptions, IFileOverwriteOptions, IFileSystemProviderWithFileReadWriteCapability, IFileSystemProviderWithOpenReadWriteCloseCapability, IFileSystemProviderWithFileReadStreamCapability, IFileSystemProviderWithFileFolderCopyCapability, IFileSystemProviderWithFileAtomicReadCapability, IFileAtomicReadOptions, IFileSystemProviderWithFileCloneCapability, IFileChange } from 'vs/platform/files/common/files';
-import { AbstractDiskFileSystemProvider } from 'vs/platform/files/common/diskFileSystemProvider';
-import { IMainProcessService } from 'vs/platform/ipc/common/mainProcessService';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { ReadableStreamEvents } from 'vs/base/common/stream';
-import { URI } from 'vs/base/common/uri';
-import { DiskFileSystemProviderClient, LOCAL_FILE_SYSTEM_CHANNEL_NAME } from 'vs/platform/files/common/diskFileSystemProviderClient';
-import { ILogMessage, AbstractUniversalWatcherClient } from 'vs/platform/files/common/watcher';
-import { UniversalWatcherClient } from 'vs/workbench/services/files/electron-sandbox/watcherClient';
-import { ILoggerService, ILogService } from 'vs/platform/log/common/log';
-import { IUtilityProcessWorkerWorkbenchService } from 'vs/workbench/services/utilityProcess/electron-sandbox/utilityProcessWorkerWorkbenchService';
-import { LogService } from 'vs/platform/log/common/logService';
+import { localize } from '../../../../nls.js';
+import { Event } from '../../../../base/common/event.js';
+import { isLinux } from '../../../../base/common/platform.js';
+import { FileSystemProviderCapabilities, IFileDeleteOptions, IStat, FileType, IFileReadStreamOptions, IFileWriteOptions, IFileOpenOptions, IFileOverwriteOptions, IFileSystemProviderWithFileReadWriteCapability, IFileSystemProviderWithOpenReadWriteCloseCapability, IFileSystemProviderWithFileReadStreamCapability, IFileSystemProviderWithFileFolderCopyCapability, IFileSystemProviderWithFileAtomicReadCapability, IFileAtomicReadOptions, IFileSystemProviderWithFileCloneCapability, IFileChange } from '../../../../platform/files/common/files.js';
+import { AbstractDiskFileSystemProvider } from '../../../../platform/files/common/diskFileSystemProvider.js';
+import { IMainProcessService } from '../../../../platform/ipc/common/mainProcessService.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { ReadableStreamEvents } from '../../../../base/common/stream.js';
+import { URI } from '../../../../base/common/uri.js';
+import { DiskFileSystemProviderClient, LOCAL_FILE_SYSTEM_CHANNEL_NAME } from '../../../../platform/files/common/diskFileSystemProviderClient.js';
+import { ILogMessage, AbstractUniversalWatcherClient } from '../../../../platform/files/common/watcher.js';
+import { UniversalWatcherClient } from './watcherClient.js';
+import { ILoggerService, ILogService } from '../../../../platform/log/common/log.js';
+import { IUtilityProcessWorkerWorkbenchService } from '../../utilityProcess/electron-sandbox/utilityProcessWorkerWorkbenchService.js';
+import { LogService } from '../../../../platform/log/common/logService.js';
 
 /**
  * A sandbox ready disk file system provider that delegates almost all calls
diff --git a/src/vs/workbench/services/files/electron-sandbox/elevatedFileService.ts b/src/vs/workbench/services/files/electron-sandbox/elevatedFileService.ts
index a3ed755007c..09f67aba17c 100644
--- a/src/vs/workbench/services/files/electron-sandbox/elevatedFileService.ts
+++ b/src/vs/workbench/services/files/electron-sandbox/elevatedFileService.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer, VSBufferReadable, VSBufferReadableStream } from 'vs/base/common/buffer';
-import { randomPath } from 'vs/base/common/extpath';
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { IFileService, IFileStatWithMetadata, IWriteFileOptions } from 'vs/platform/files/common/files';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
-import { IElevatedFileService } from 'vs/workbench/services/files/common/elevatedFileService';
+import { VSBuffer, VSBufferReadable, VSBufferReadableStream } from '../../../../base/common/buffer.js';
+import { randomPath } from '../../../../base/common/extpath.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IFileService, IFileStatWithMetadata, IWriteFileOptions } from '../../../../platform/files/common/files.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { INativeWorkbenchEnvironmentService } from '../../environment/electron-sandbox/environmentService.js';
+import { IElevatedFileService } from '../common/elevatedFileService.js';
 
 export class NativeElevatedFileService implements IElevatedFileService {
 
diff --git a/src/vs/workbench/services/files/electron-sandbox/watcherClient.ts b/src/vs/workbench/services/files/electron-sandbox/watcherClient.ts
index 471938bfb1b..0d59c18c285 100644
--- a/src/vs/workbench/services/files/electron-sandbox/watcherClient.ts
+++ b/src/vs/workbench/services/files/electron-sandbox/watcherClient.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { getDelayedChannel, ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
-import { IFileChange } from 'vs/platform/files/common/files';
-import { AbstractUniversalWatcherClient, ILogMessage, IRecursiveWatcher } from 'vs/platform/files/common/watcher';
-import { IUtilityProcessWorkerWorkbenchService } from 'vs/workbench/services/utilityProcess/electron-sandbox/utilityProcessWorkerWorkbenchService';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { getDelayedChannel, ProxyChannel } from '../../../../base/parts/ipc/common/ipc.js';
+import { IFileChange } from '../../../../platform/files/common/files.js';
+import { AbstractUniversalWatcherClient, ILogMessage, IRecursiveWatcher } from '../../../../platform/files/common/watcher.js';
+import { IUtilityProcessWorkerWorkbenchService } from '../../utilityProcess/electron-sandbox/utilityProcessWorkerWorkbenchService.js';
 
 export class UniversalWatcherClient extends AbstractUniversalWatcherClient {
 
diff --git a/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.ts b/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.ts
index d4c2c6f025e..e9e60430f25 100644
--- a/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.ts
+++ b/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.ts
@@ -3,29 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { Event, Emitter } from 'vs/base/common/event';
-import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { RawContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IFilesConfiguration, AutoSaveConfiguration, HotExitConfiguration, FILES_READONLY_INCLUDE_CONFIG, FILES_READONLY_EXCLUDE_CONFIG, IFileStatWithMetadata, IFileService, IBaseFileStat, hasReadonlyCapability, IFilesConfigurationNode } from 'vs/platform/files/common/files';
-import { equals } from 'vs/base/common/objects';
-import { URI } from 'vs/base/common/uri';
-import { isWeb } from 'vs/base/common/platform';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { ResourceGlobMatcher } from 'vs/workbench/common/resources';
-import { GlobalIdleValue } from 'vs/base/common/async';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { LRUCache, ResourceMap } from 'vs/base/common/map';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { EditorResourceAccessor, SaveReason, SideBySideEditor } from 'vs/workbench/common/editor';
-import { IMarkerService, MarkerSeverity } from 'vs/platform/markers/common/markers';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { IStringDictionary } from 'vs/base/common/collections';
+import { localize } from '../../../../nls.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { Disposable, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { RawContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IFilesConfiguration, AutoSaveConfiguration, HotExitConfiguration, FILES_READONLY_INCLUDE_CONFIG, FILES_READONLY_EXCLUDE_CONFIG, IFileStatWithMetadata, IFileService, IBaseFileStat, hasReadonlyCapability, IFilesConfigurationNode } from '../../../../platform/files/common/files.js';
+import { equals } from '../../../../base/common/objects.js';
+import { URI } from '../../../../base/common/uri.js';
+import { isWeb } from '../../../../base/common/platform.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { ResourceGlobMatcher } from '../../../common/resources.js';
+import { GlobalIdleValue } from '../../../../base/common/async.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { LRUCache, ResourceMap } from '../../../../base/common/map.js';
+import { IMarkdownString } from '../../../../base/common/htmlContent.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { EditorResourceAccessor, SaveReason, SideBySideEditor } from '../../../common/editor.js';
+import { IMarkerService, MarkerSeverity } from '../../../../platform/markers/common/markers.js';
+import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { IStringDictionary } from '../../../../base/common/collections.js';
 
 export const AutoSaveAfterShortDelayContext = new RawContextKey<boolean>('autoSaveAfterShortDelayContext', false, true);
 
@@ -125,7 +125,7 @@ export class FilesConfigurationService extends Disposable implements IFilesConfi
 	private static readonly READONLY_MESSAGES = {
 		providerReadonly: { value: localize('providerReadonly', "Editor is read-only because the file system of the file is read-only."), isTrusted: true },
 		sessionReadonly: { value: localize({ key: 'sessionReadonly', comment: ['Please do not translate the word "command", it is part of our internal syntax which must not change', '{Locked="](command:{0})"}'] }, "Editor is read-only because the file was set read-only in this session. [Click here](command:{0}) to set writeable.", 'workbench.action.files.setActiveEditorWriteableInSession'), isTrusted: true },
-		configuredReadonly: { value: localize({ key: 'configuredReadonly', comment: ['Please do not translate the word "command", it is part of our internal syntax which must not change', '{Locked="](command:{0})"}'] }, "Editor is read-only because the file was set read-only via settings. [Click here](command:{0}) to configure.", `workbench.action.openSettings?${encodeURIComponent('["files.readonly"]')}`), isTrusted: true },
+		configuredReadonly: { value: localize({ key: 'configuredReadonly', comment: ['Please do not translate the word "command", it is part of our internal syntax which must not change', '{Locked="](command:{0})"}'] }, "Editor is read-only because the file was set read-only via settings. [Click here](command:{0}) to configure or [toggle for this session](command:{1}).", `workbench.action.openSettings?${encodeURIComponent('["files.readonly"]')}`, 'workbench.action.files.toggleActiveEditorReadonlyInSession'), isTrusted: true },
 		fileLocked: { value: localize({ key: 'fileLocked', comment: ['Please do not translate the word "command", it is part of our internal syntax which must not change', '{Locked="](command:{0})"}'] }, "Editor is read-only because of file permissions. [Click here](command:{0}) to set writeable anyway.", 'workbench.action.files.setActiveEditorWriteableInSession'), isTrusted: true },
 		fileReadonly: { value: localize('fileReadonly', "Editor is read-only because the file is read-only."), isTrusted: true }
 	};
@@ -143,7 +143,7 @@ export class FilesConfigurationService extends Disposable implements IFilesConfi
 	readonly onDidChangeReadonly = this._onDidChangeReadonly.event;
 
 	private currentGlobalAutoSaveConfiguration: IAutoSaveConfiguration;
-	private currentFilesAssociationConfiguration: IStringDictionary<string>;
+	private currentFilesAssociationConfiguration: IStringDictionary<string> | undefined;
 	private currentHotExitConfiguration: string;
 
 	private readonly autoSaveConfigurationCache = new LRUCache<URI, ICachedAutoSaveConfiguration>(1000);
@@ -317,7 +317,7 @@ export class FilesConfigurationService extends Disposable implements IFilesConfi
 		return this.currentGlobalAutoSaveConfiguration;
 	}
 
-	private computeAutoSaveConfiguration(resource: URI | undefined, filesConfiguration: IFilesConfigurationNode): ICachedAutoSaveConfiguration {
+	private computeAutoSaveConfiguration(resource: URI | undefined, filesConfiguration: IFilesConfigurationNode | undefined): ICachedAutoSaveConfiguration {
 		let autoSave: 'afterDelay' | 'onFocusChange' | 'onWindowChange' | undefined;
 		let autoSaveDelay: number | undefined;
 		let autoSaveWorkspaceFilesOnly: boolean | undefined;
@@ -326,10 +326,10 @@ export class FilesConfigurationService extends Disposable implements IFilesConfi
 		let isOutOfWorkspace: boolean | undefined;
 		let isShortAutoSaveDelay: boolean | undefined;
 
-		switch (filesConfiguration.autoSave ?? FilesConfigurationService.DEFAULT_AUTO_SAVE_MODE) {
+		switch (filesConfiguration?.autoSave ?? FilesConfigurationService.DEFAULT_AUTO_SAVE_MODE) {
 			case AutoSaveConfiguration.AFTER_DELAY: {
 				autoSave = 'afterDelay';
-				autoSaveDelay = typeof filesConfiguration.autoSaveDelay === 'number' && filesConfiguration.autoSaveDelay >= 0 ? filesConfiguration.autoSaveDelay : FilesConfigurationService.DEFAULT_AUTO_SAVE_DELAY;
+				autoSaveDelay = typeof filesConfiguration?.autoSaveDelay === 'number' && filesConfiguration.autoSaveDelay >= 0 ? filesConfiguration.autoSaveDelay : FilesConfigurationService.DEFAULT_AUTO_SAVE_DELAY;
 				isShortAutoSaveDelay = autoSaveDelay <= FilesConfigurationService.DEFAULT_AUTO_SAVE_DELAY;
 				break;
 			}
@@ -343,7 +343,7 @@ export class FilesConfigurationService extends Disposable implements IFilesConfi
 				break;
 		}
 
-		if (filesConfiguration.autoSaveWorkspaceFilesOnly === true) {
+		if (filesConfiguration?.autoSaveWorkspaceFilesOnly === true) {
 			autoSaveWorkspaceFilesOnly = true;
 
 			if (resource && !this.contextService.isInsideWorkspace(resource)) {
@@ -352,7 +352,7 @@ export class FilesConfigurationService extends Disposable implements IFilesConfi
 			}
 		}
 
-		if (filesConfiguration.autoSaveWhenNoErrors === true) {
+		if (filesConfiguration?.autoSaveWhenNoErrors === true) {
 			autoSaveWhenNoErrors = true;
 			isShortAutoSaveDelay = undefined; // this configuration disables short auto save delay
 		}
diff --git a/src/vs/workbench/services/history/browser/historyService.ts b/src/vs/workbench/services/history/browser/historyService.ts
index 00ee57a832a..3106e6791e1 100644
--- a/src/vs/workbench/services/history/browser/historyService.ts
+++ b/src/vs/workbench/services/history/browser/historyService.ts
@@ -3,37 +3,37 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { URI } from 'vs/base/common/uri';
-import { IResourceEditorInput, IEditorOptions } from 'vs/platform/editor/common/editor';
-import { IEditorPane, IEditorCloseEvent, EditorResourceAccessor, IEditorIdentifier, GroupIdentifier, EditorsOrder, SideBySideEditor, IUntypedEditorInput, isResourceEditorInput, isEditorInput, isSideBySideEditorInput, EditorCloseContext, IEditorPaneSelection, EditorPaneSelectionCompareResult, EditorPaneSelectionChangeReason, isEditorPaneWithSelection, IEditorPaneSelectionChangeEvent, IEditorPaneWithSelection, IEditorWillMoveEvent, GroupModelChangeKind } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { GoFilter, GoScope, IHistoryService } from 'vs/workbench/services/history/common/history';
-import { FileChangesEvent, IFileService, FileChangeType, FILES_EXCLUDE_CONFIG, FileOperationEvent, FileOperation } from 'vs/platform/files/common/files';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { dispose, Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { getExcludes, ISearchConfiguration, SEARCH_EXCLUDE_CONFIG } from 'vs/workbench/services/search/common/search';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { EditorServiceImpl } from 'vs/workbench/browser/parts/editor/editor';
-import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
-import { IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { coalesce, remove } from 'vs/base/common/arrays';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { addDisposableListener, EventType, EventHelper, WindowIdleValue } from 'vs/base/browser/dom';
-import { IWorkspacesService } from 'vs/platform/workspaces/common/workspaces';
-import { Schemas } from 'vs/base/common/network';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { ResourceGlobMatcher } from 'vs/workbench/common/resources';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { ILifecycleService, LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { ILogService, LogLevel } from 'vs/platform/log/common/log';
-import { mainWindow } from 'vs/base/browser/window';
+import { localize } from '../../../../nls.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IResourceEditorInput, IEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { IEditorPane, IEditorCloseEvent, EditorResourceAccessor, IEditorIdentifier, GroupIdentifier, EditorsOrder, SideBySideEditor, IUntypedEditorInput, isResourceEditorInput, isEditorInput, isSideBySideEditorInput, EditorCloseContext, IEditorPaneSelection, EditorPaneSelectionCompareResult, EditorPaneSelectionChangeReason, isEditorPaneWithSelection, IEditorPaneSelectionChangeEvent, IEditorPaneWithSelection, IEditorWillMoveEvent, GroupModelChangeKind } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { IEditorService } from '../../editor/common/editorService.js';
+import { GoFilter, GoScope, IHistoryService } from '../common/history.js';
+import { FileChangesEvent, IFileService, FileChangeType, FILES_EXCLUDE_CONFIG, FileOperationEvent, FileOperation } from '../../../../platform/files/common/files.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { dispose, Disposable, DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IEditorGroup, IEditorGroupsService } from '../../editor/common/editorGroupsService.js';
+import { getExcludes, ISearchConfiguration, SEARCH_EXCLUDE_CONFIG } from '../../search/common/search.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { EditorServiceImpl } from '../../../browser/parts/editor/editor.js';
+import { IWorkbenchLayoutService } from '../../layout/browser/layoutService.js';
+import { IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { coalesce, remove } from '../../../../base/common/arrays.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { addDisposableListener, EventType, EventHelper, WindowIdleValue } from '../../../../base/browser/dom.js';
+import { IWorkspacesService } from '../../../../platform/workspaces/common/workspaces.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { ResourceGlobMatcher } from '../../../common/resources.js';
+import { IPathService } from '../../path/common/pathService.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { ILifecycleService, LifecyclePhase } from '../../lifecycle/common/lifecycle.js';
+import { ILogService, LogLevel } from '../../../../platform/log/common/log.js';
+import { mainWindow } from '../../../../base/browser/window.js';
 
 interface ISerializedEditorHistoryEntry {
 	readonly editor: Omit<IResourceEditorInput, 'resource'> & { resource: string };
diff --git a/src/vs/workbench/services/history/common/history.ts b/src/vs/workbench/services/history/common/history.ts
index b5abcd2dad3..5f325842f76 100644
--- a/src/vs/workbench/services/history/common/history.ts
+++ b/src/vs/workbench/services/history/common/history.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IResourceEditorInput } from 'vs/platform/editor/common/editor';
-import { GroupIdentifier } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { URI } from 'vs/base/common/uri';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IResourceEditorInput } from '../../../../platform/editor/common/editor.js';
+import { GroupIdentifier } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { URI } from '../../../../base/common/uri.js';
 
 export const IHistoryService = createDecorator<IHistoryService>('historyService');
 
diff --git a/src/vs/workbench/services/history/test/browser/historyService.test.ts b/src/vs/workbench/services/history/test/browser/historyService.test.ts
index e00cd8ae218..28390d07e2f 100644
--- a/src/vs/workbench/services/history/test/browser/historyService.test.ts
+++ b/src/vs/workbench/services/history/test/browser/historyService.test.ts
@@ -4,31 +4,31 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from 'vs/base/test/common/utils';
-import { URI } from 'vs/base/common/uri';
-import { workbenchInstantiationService, TestFileEditorInput, registerTestEditor, createEditorPart, registerTestFileEditor, TestServiceAccessor, TestTextFileEditor, workbenchTeardown, registerTestSideBySideEditor } from 'vs/workbench/test/browser/workbenchTestServices';
-import { EditorPart } from 'vs/workbench/browser/parts/editor/editorPart';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { IEditorGroupsService, GroupDirection } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { EditorNavigationStack, HistoryService } from 'vs/workbench/services/history/browser/historyService';
-import { IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { EditorService } from 'vs/workbench/services/editor/browser/editorService';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { GoFilter, GoScope, IHistoryService } from 'vs/workbench/services/history/common/history';
-import { DeferredPromise, timeout } from 'vs/base/common/async';
-import { Event } from 'vs/base/common/event';
-import { EditorPaneSelectionChangeReason, isResourceEditorInput, IUntypedEditorInput } from 'vs/workbench/common/editor';
-import { IResourceEditorInput, ITextEditorOptions } from 'vs/platform/editor/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { IResolvedTextFileEditorModel, ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { FileChangesEvent, FileChangeType, FileOperation, FileOperationEvent } from 'vs/platform/files/common/files';
-import { isLinux } from 'vs/base/common/platform';
-import { Selection } from 'vs/editor/common/core/selection';
-import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditorInput';
+import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from '../../../../../base/test/common/utils.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { workbenchInstantiationService, TestFileEditorInput, registerTestEditor, createEditorPart, registerTestFileEditor, TestServiceAccessor, TestTextFileEditor, workbenchTeardown, registerTestSideBySideEditor } from '../../../../test/browser/workbenchTestServices.js';
+import { EditorPart } from '../../../../browser/parts/editor/editorPart.js';
+import { SyncDescriptor } from '../../../../../platform/instantiation/common/descriptors.js';
+import { IEditorGroupsService, GroupDirection } from '../../../editor/common/editorGroupsService.js';
+import { EditorNavigationStack, HistoryService } from '../../browser/historyService.js';
+import { IEditorService, SIDE_GROUP } from '../../../editor/common/editorService.js';
+import { EditorService } from '../../../editor/browser/editorService.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { GoFilter, GoScope, IHistoryService } from '../../common/history.js';
+import { DeferredPromise, timeout } from '../../../../../base/common/async.js';
+import { Event } from '../../../../../base/common/event.js';
+import { EditorPaneSelectionChangeReason, isResourceEditorInput, IUntypedEditorInput } from '../../../../common/editor.js';
+import { IResourceEditorInput, ITextEditorOptions } from '../../../../../platform/editor/common/editor.js';
+import { EditorInput } from '../../../../common/editor/editorInput.js';
+import { IResolvedTextFileEditorModel, ITextFileService } from '../../../textfile/common/textfiles.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { FileChangesEvent, FileChangeType, FileOperation, FileOperationEvent } from '../../../../../platform/files/common/files.js';
+import { isLinux } from '../../../../../base/common/platform.js';
+import { Selection } from '../../../../../editor/common/core/selection.js';
+import { EditorPane } from '../../../../browser/parts/editor/editorPane.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { SideBySideEditorInput } from '../../../../common/editor/sideBySideEditorInput.js';
 
 suite('HistoryService', function () {
 
diff --git a/src/vs/workbench/services/host/browser/browserHostService.ts b/src/vs/workbench/services/host/browser/browserHostService.ts
index 11f6227989f..88d7b0db4c2 100644
--- a/src/vs/workbench/services/host/browser/browserHostService.ts
+++ b/src/vs/workbench/services/host/browser/browserHostService.ts
@@ -3,44 +3,43 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IWindowSettings, IWindowOpenable, IOpenWindowOptions, isFolderToOpen, isWorkspaceToOpen, isFileToOpen, IOpenEmptyWindowOptions, IPathData, IFileToOpen } from 'vs/platform/window/common/window';
-import { isResourceEditorInput, pathsToEditors } from 'vs/workbench/common/editor';
-import { whenEditorClosed } from 'vs/workbench/browser/editor';
-import { IWorkspace, IWorkspaceProvider } from 'vs/workbench/browser/web.api';
-import { IFileService } from 'vs/platform/files/common/files';
-import { ILabelService, Verbosity } from 'vs/platform/label/common/label';
-import { EventType, ModifierKeyEmitter, addDisposableListener, addDisposableThrottledListener, detectFullscreen, disposableWindowInterval, getActiveDocument, getWindowId, onDidRegisterWindow, trackFocus } from 'vs/base/browser/dom';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { memoize } from 'vs/base/common/decorators';
-import { parseLineAndColumnAware } from 'vs/base/common/extpath';
-import { IWorkspaceFolderCreationData } from 'vs/platform/workspaces/common/workspaces';
-import { IWorkspaceEditingService } from 'vs/workbench/services/workspaces/common/workspaceEditing';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILifecycleService, BeforeShutdownEvent, ShutdownReason } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { BrowserLifecycleService } from 'vs/workbench/services/lifecycle/browser/lifecycleService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { getWorkspaceIdentifier } from 'vs/workbench/services/workspaces/browser/workspaces';
-import { localize } from 'vs/nls';
-import Severity from 'vs/base/common/severity';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { DomEmitter } from 'vs/base/browser/event';
-import { isUndefined } from 'vs/base/common/types';
-import { isTemporaryWorkspace, IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { Schemas } from 'vs/base/common/network';
-import { ITextEditorOptions } from 'vs/platform/editor/common/editor';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { coalesce } from 'vs/base/common/arrays';
-import { mainWindow, isAuxiliaryWindow } from 'vs/base/browser/window';
-import { isIOS, isMacintosh } from 'vs/base/common/platform';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { IHostService } from './host.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ILayoutService } from '../../../../platform/layout/browser/layoutService.js';
+import { IEditorService } from '../../editor/common/editorService.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IWindowSettings, IWindowOpenable, IOpenWindowOptions, isFolderToOpen, isWorkspaceToOpen, isFileToOpen, IOpenEmptyWindowOptions, IPathData, IFileToOpen } from '../../../../platform/window/common/window.js';
+import { isResourceEditorInput, pathsToEditors } from '../../../common/editor.js';
+import { whenEditorClosed } from '../../../browser/editor.js';
+import { IWorkspace, IWorkspaceProvider } from '../../../browser/web.api.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { ILabelService, Verbosity } from '../../../../platform/label/common/label.js';
+import { EventType, ModifierKeyEmitter, addDisposableListener, addDisposableThrottledListener, detectFullscreen, disposableWindowInterval, getActiveDocument, getWindowId, onDidRegisterWindow, trackFocus } from '../../../../base/browser/dom.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IBrowserWorkbenchEnvironmentService } from '../../environment/browser/environmentService.js';
+import { memoize } from '../../../../base/common/decorators.js';
+import { parseLineAndColumnAware } from '../../../../base/common/extpath.js';
+import { IWorkspaceFolderCreationData } from '../../../../platform/workspaces/common/workspaces.js';
+import { IWorkspaceEditingService } from '../../workspaces/common/workspaceEditing.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILifecycleService, BeforeShutdownEvent, ShutdownReason } from '../../lifecycle/common/lifecycle.js';
+import { BrowserLifecycleService } from '../../lifecycle/browser/lifecycleService.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { getWorkspaceIdentifier } from '../../workspaces/browser/workspaces.js';
+import { localize } from '../../../../nls.js';
+import Severity from '../../../../base/common/severity.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { DomEmitter } from '../../../../base/browser/event.js';
+import { isUndefined } from '../../../../base/common/types.js';
+import { isTemporaryWorkspace, IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { ITextEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { coalesce } from '../../../../base/common/arrays.js';
+import { mainWindow, isAuxiliaryWindow } from '../../../../base/browser/window.js';
+import { isIOS, isMacintosh } from '../../../../base/common/platform.js';
+import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
 
 enum HostShutdownReason {
 
@@ -79,7 +78,6 @@ export class BrowserHostService extends Disposable implements IHostService {
 		@ILogService private readonly logService: ILogService,
 		@IDialogService private readonly dialogService: IDialogService,
 		@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
-		@IUserDataProfileService private readonly userDataProfileService: IUserDataProfileService,
 		@IUserDataProfilesService private readonly userDataProfilesService: IUserDataProfilesService,
 	) {
 		super();
@@ -238,7 +236,7 @@ export class BrowserHostService extends Disposable implements IHostService {
 	}
 
 	private async doOpenWindow(toOpen: IWindowOpenable[], options?: IOpenWindowOptions): Promise<void> {
-		const payload = this.preservePayload(false /* not an empty window */);
+		const payload = this.preservePayload(false /* not an empty window */, options);
 		const fileOpenables: IFileToOpen[] = [];
 		const foldersToAdd: IWorkspaceFolderCreationData[] = [];
 
@@ -395,7 +393,7 @@ export class BrowserHostService extends Disposable implements IHostService {
 		this.instantiationService.invokeFunction(accessor => fn(accessor));
 	}
 
-	private preservePayload(isEmptyWindow: boolean): Array<unknown> | undefined {
+	private preservePayload(isEmptyWindow: boolean, options?: IOpenWindowOptions): Array<unknown> | undefined {
 
 		// Selectively copy payload: for now only extension debugging properties are considered
 		const newPayload: Array<unknown> = new Array();
@@ -411,12 +409,11 @@ export class BrowserHostService extends Disposable implements IHostService {
 			}
 		}
 
-		const windowConfig = this.configurationService.getValue<IWindowSettings | undefined>('window');
-		const newWindowProfile = (windowConfig?.newWindowProfile
-			? this.userDataProfilesService.profiles.find(profile => profile.name === windowConfig.newWindowProfile)
-			: undefined) ?? this.userDataProfileService.currentProfile;
-		if (!newWindowProfile.isDefault) {
-			newPayload.push(['lastActiveProfile', newWindowProfile.id]);
+		const newWindowProfile = options?.forceProfile
+			? this.userDataProfilesService.profiles.find(profile => profile.name === options?.forceProfile)
+			: undefined;
+		if (newWindowProfile && !newWindowProfile.isDefault) {
+			newPayload.push(['profile', newWindowProfile.name]);
 		}
 
 		return newPayload.length ? newPayload : undefined;
@@ -453,7 +450,7 @@ export class BrowserHostService extends Disposable implements IHostService {
 	private async doOpenEmptyWindow(options?: IOpenEmptyWindowOptions): Promise<void> {
 		return this.doOpen(undefined, {
 			reuse: options?.forceReuseWindow,
-			payload: this.preservePayload(true /* empty window */)
+			payload: this.preservePayload(true /* empty window */, options)
 		});
 	}
 
diff --git a/src/vs/workbench/services/host/browser/host.ts b/src/vs/workbench/services/host/browser/host.ts
index 724bc5a52bf..cfb2f62b8dd 100644
--- a/src/vs/workbench/services/host/browser/host.ts
+++ b/src/vs/workbench/services/host/browser/host.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IWindowOpenable, IOpenWindowOptions, IOpenEmptyWindowOptions, IPoint, IRectangle } from 'vs/platform/window/common/window';
+import { Event } from '../../../../base/common/event.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IWindowOpenable, IOpenWindowOptions, IOpenEmptyWindowOptions, IPoint, IRectangle } from '../../../../platform/window/common/window.js';
 
 export const IHostService = createDecorator<IHostService>('hostService');
 
diff --git a/src/vs/workbench/services/host/electron-sandbox/nativeHostService.ts b/src/vs/workbench/services/host/electron-sandbox/nativeHostService.ts
index 3163d8822b8..3d3bfe46ce8 100644
--- a/src/vs/workbench/services/host/electron-sandbox/nativeHostService.ts
+++ b/src/vs/workbench/services/host/electron-sandbox/nativeHostService.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ILabelService, Verbosity } from 'vs/platform/label/common/label';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IWindowOpenable, IOpenWindowOptions, isFolderToOpen, isWorkspaceToOpen, IOpenEmptyWindowOptions, IPoint, IRectangle } from 'vs/platform/window/common/window';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { NativeHostService } from 'vs/platform/native/common/nativeHostService';
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
-import { IMainProcessService } from 'vs/platform/ipc/common/mainProcessService';
-import { disposableWindowInterval, getActiveDocument, getWindowId, getWindowsCount, hasWindow, onDidRegisterWindow } from 'vs/base/browser/dom';
-import { memoize } from 'vs/base/common/decorators';
-import { isAuxiliaryWindow } from 'vs/base/browser/window';
-import { webUtils } from 'vs/base/parts/sandbox/electron-sandbox/globals';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { IHostService } from '../browser/host.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ILabelService, Verbosity } from '../../../../platform/label/common/label.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { IWindowOpenable, IOpenWindowOptions, isFolderToOpen, isWorkspaceToOpen, IOpenEmptyWindowOptions, IPoint, IRectangle } from '../../../../platform/window/common/window.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { NativeHostService } from '../../../../platform/native/common/nativeHostService.js';
+import { INativeWorkbenchEnvironmentService } from '../../environment/electron-sandbox/environmentService.js';
+import { IMainProcessService } from '../../../../platform/ipc/common/mainProcessService.js';
+import { disposableWindowInterval, getActiveDocument, getWindowId, getWindowsCount, hasWindow, onDidRegisterWindow } from '../../../../base/browser/dom.js';
+import { memoize } from '../../../../base/common/decorators.js';
+import { isAuxiliaryWindow } from '../../../../base/browser/window.js';
+import { webUtils } from '../../../../base/parts/sandbox/electron-sandbox/globals.js';
 
 class WorkbenchNativeHostService extends NativeHostService {
 
diff --git a/src/vs/workbench/services/integrity/browser/integrityService.ts b/src/vs/workbench/services/integrity/browser/integrityService.ts
index e2285f53c04..1f06900ebdd 100644
--- a/src/vs/workbench/services/integrity/browser/integrityService.ts
+++ b/src/vs/workbench/services/integrity/browser/integrityService.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IIntegrityService, IntegrityTestResult } from 'vs/workbench/services/integrity/common/integrity';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { IIntegrityService, IntegrityTestResult } from '../common/integrity.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
 
 export class IntegrityService implements IIntegrityService {
 
diff --git a/src/vs/workbench/services/integrity/common/integrity.ts b/src/vs/workbench/services/integrity/common/integrity.ts
index afbfde91166..9bd785726c8 100644
--- a/src/vs/workbench/services/integrity/common/integrity.ts
+++ b/src/vs/workbench/services/integrity/common/integrity.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { URI } from '../../../../base/common/uri.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 
 export const IIntegrityService = createDecorator<IIntegrityService>('integrityService');
 
diff --git a/src/vs/workbench/services/integrity/electron-sandbox/integrityService.ts b/src/vs/workbench/services/integrity/electron-sandbox/integrityService.ts
index 3789a7c1e97..8050895e5f6 100644
--- a/src/vs/workbench/services/integrity/electron-sandbox/integrityService.ts
+++ b/src/vs/workbench/services/integrity/electron-sandbox/integrityService.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import Severity from 'vs/base/common/severity';
-import { URI } from 'vs/base/common/uri';
-import { ChecksumPair, IIntegrityService, IntegrityTestResult } from 'vs/workbench/services/integrity/common/integrity';
-import { ILifecycleService, LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { INotificationService, NotificationPriority } from 'vs/platform/notification/common/notification';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { FileAccess, AppResourcePath } from 'vs/base/common/network';
-import { IChecksumService } from 'vs/platform/checksum/common/checksumService';
-import { ILogService } from 'vs/platform/log/common/log';
+import { localize } from '../../../../nls.js';
+import Severity from '../../../../base/common/severity.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ChecksumPair, IIntegrityService, IntegrityTestResult } from '../common/integrity.js';
+import { ILifecycleService, LifecyclePhase } from '../../lifecycle/common/lifecycle.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { INotificationService, NotificationPriority } from '../../../../platform/notification/common/notification.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { FileAccess, AppResourcePath } from '../../../../base/common/network.js';
+import { IChecksumService } from '../../../../platform/checksum/common/checksumService.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
 
 interface IStorageData {
 	readonly dontShowPrompt: boolean;
diff --git a/src/vs/workbench/services/keybinding/browser/keybindingService.ts b/src/vs/workbench/services/keybinding/browser/keybindingService.ts
index 76b3fa79a5c..671f9552963 100644
--- a/src/vs/workbench/services/keybinding/browser/keybindingService.ts
+++ b/src/vs/workbench/services/keybinding/browser/keybindingService.ts
@@ -3,58 +3,58 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
+import * as nls from '../../../../nls.js';
 
 // base
-import * as browser from 'vs/base/browser/browser';
-import { BrowserFeatures, KeyboardSupport } from 'vs/base/browser/canIUse';
-import * as dom from 'vs/base/browser/dom';
-import { printKeyboardEvent, printStandardKeyboardEvent, StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { DeferredPromise, RunOnceScheduler } from 'vs/base/common/async';
-import { Emitter, Event } from 'vs/base/common/event';
-import { parse } from 'vs/base/common/json';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import { UserSettingsLabelProvider } from 'vs/base/common/keybindingLabels';
-import { KeybindingParser } from 'vs/base/common/keybindingParser';
-import { Keybinding, KeyCodeChord, ResolvedKeybinding, ScanCodeChord } from 'vs/base/common/keybindings';
-import { IMMUTABLE_CODE_TO_KEY_CODE, KeyCode, KeyCodeUtils, KeyMod, ScanCode, ScanCodeUtils } from 'vs/base/common/keyCodes';
-import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import * as objects from 'vs/base/common/objects';
-import { isMacintosh, OperatingSystem, OS } from 'vs/base/common/platform';
-import { dirname } from 'vs/base/common/resources';
-import { mainWindow } from 'vs/base/browser/window';
+import * as browser from '../../../../base/browser/browser.js';
+import { BrowserFeatures, KeyboardSupport } from '../../../../base/browser/canIUse.js';
+import * as dom from '../../../../base/browser/dom.js';
+import { printKeyboardEvent, printStandardKeyboardEvent, StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { DeferredPromise, RunOnceScheduler } from '../../../../base/common/async.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { parse } from '../../../../base/common/json.js';
+import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
+import { UserSettingsLabelProvider } from '../../../../base/common/keybindingLabels.js';
+import { KeybindingParser } from '../../../../base/common/keybindingParser.js';
+import { Keybinding, KeyCodeChord, ResolvedKeybinding, ScanCodeChord } from '../../../../base/common/keybindings.js';
+import { IMMUTABLE_CODE_TO_KEY_CODE, KeyCode, KeyCodeUtils, KeyMod, ScanCode, ScanCodeUtils } from '../../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import * as objects from '../../../../base/common/objects.js';
+import { isMacintosh, OperatingSystem, OS } from '../../../../base/common/platform.js';
+import { dirname } from '../../../../base/common/resources.js';
+import { mainWindow } from '../../../../base/browser/window.js';
 
 // platform
-import { MenuRegistry } from 'vs/platform/actions/common/actions';
-import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
-import { ContextKeyExpr, ContextKeyExpression, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { FileOperation, IFileService } from 'vs/platform/files/common/files';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { Extensions, IJSONContributionRegistry } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
-import { AbstractKeybindingService } from 'vs/platform/keybinding/common/abstractKeybindingService';
-import { IKeybindingService, IKeyboardEvent, KeybindingsSchemaContribution } from 'vs/platform/keybinding/common/keybinding';
-import { KeybindingResolver } from 'vs/platform/keybinding/common/keybindingResolver';
-import { IExtensionKeybindingRule, IKeybindingItem, KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
-import { IKeyboardLayoutService } from 'vs/platform/keyboardLayout/common/keyboardLayout';
-import { IKeyboardMapper } from 'vs/platform/keyboardLayout/common/keyboardMapper';
-import { ILogService } from 'vs/platform/log/common/log';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { ILocalizedString, isLocalizedString } from 'vs/platform/action/common/action';
+import { MenuRegistry } from '../../../../platform/actions/common/actions.js';
+import { CommandsRegistry, ICommandService } from '../../../../platform/commands/common/commands.js';
+import { ContextKeyExpr, ContextKeyExpression, IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { FileOperation, IFileService } from '../../../../platform/files/common/files.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { Extensions, IJSONContributionRegistry } from '../../../../platform/jsonschemas/common/jsonContributionRegistry.js';
+import { AbstractKeybindingService } from '../../../../platform/keybinding/common/abstractKeybindingService.js';
+import { IKeybindingService, IKeyboardEvent, KeybindingsSchemaContribution } from '../../../../platform/keybinding/common/keybinding.js';
+import { KeybindingResolver } from '../../../../platform/keybinding/common/keybindingResolver.js';
+import { IExtensionKeybindingRule, IKeybindingItem, KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ResolvedKeybindingItem } from '../../../../platform/keybinding/common/resolvedKeybindingItem.js';
+import { IKeyboardLayoutService } from '../../../../platform/keyboardLayout/common/keyboardLayout.js';
+import { IKeyboardMapper } from '../../../../platform/keyboardLayout/common/keyboardMapper.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { ILocalizedString, isLocalizedString } from '../../../../platform/action/common/action.js';
 
 // workbench
-import { commandsExtensionPoint } from 'vs/workbench/services/actions/common/menusExtensionPoint';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { ExtensionMessageCollector, ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IKeyboard, INavigatorWithKeyboard } from 'vs/workbench/services/keybinding/browser/navigatorKeyboard';
-import { getAllUnboundCommands } from 'vs/workbench/services/keybinding/browser/unboundCommands';
-import { IUserKeybindingItem, KeybindingIO, OutputBuilder } from 'vs/workbench/services/keybinding/common/keybindingIO';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
+import { commandsExtensionPoint } from '../../actions/common/menusExtensionPoint.js';
+import { IExtensionService } from '../../extensions/common/extensions.js';
+import { ExtensionMessageCollector, ExtensionsRegistry } from '../../extensions/common/extensionsRegistry.js';
+import { IHostService } from '../../host/browser/host.js';
+import { IKeyboard, INavigatorWithKeyboard } from './navigatorKeyboard.js';
+import { getAllUnboundCommands } from './unboundCommands.js';
+import { IUserKeybindingItem, KeybindingIO, OutputBuilder } from '../common/keybindingIO.js';
+import { IUserDataProfileService } from '../../userDataProfile/common/userDataProfile.js';
 
 interface ContributedKeyBinding {
 	command: string;
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts
index ab8d76f8903..8807b7ef370 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts
@@ -3,33 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { KeymapInfo, IRawMixedKeyboardMapping, IKeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { DispatchConfig, readKeyboardConfig } from 'vs/platform/keyboardLayout/common/keyboardConfig';
-import { IKeyboardMapper, CachedKeyboardMapper } from 'vs/platform/keyboardLayout/common/keyboardMapper';
-import { OS, OperatingSystem, isMacintosh, isWindows } from 'vs/base/common/platform';
-import { WindowsKeyboardMapper } from 'vs/workbench/services/keybinding/common/windowsKeyboardMapper';
-import { FallbackKeyboardMapper } from 'vs/workbench/services/keybinding/common/fallbackKeyboardMapper';
-import { IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding';
-import { MacLinuxKeyboardMapper } from 'vs/workbench/services/keybinding/common/macLinuxKeyboardMapper';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { URI } from 'vs/base/common/uri';
-import { IFileService } from 'vs/platform/files/common/files';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { parse, getNodeType } from 'vs/base/common/json';
-import * as objects from 'vs/base/common/objects';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Extensions as ConfigExtensions, IConfigurationRegistry, IConfigurationNode } from 'vs/platform/configuration/common/configurationRegistry';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { INavigatorWithKeyboard } from 'vs/workbench/services/keybinding/browser/navigatorKeyboard';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { getKeyboardLayoutId, IKeyboardLayoutInfo, IKeyboardLayoutService, IKeyboardMapping, IMacLinuxKeyboardMapping, IWindowsKeyboardMapping } from 'vs/platform/keyboardLayout/common/keyboardLayout';
+import * as nls from '../../../../nls.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { AppResourcePath, FileAccess } from '../../../../base/common/network.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { KeymapInfo, IRawMixedKeyboardMapping, IKeymapInfo } from '../common/keymapInfo.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { DispatchConfig, readKeyboardConfig } from '../../../../platform/keyboardLayout/common/keyboardConfig.js';
+import { IKeyboardMapper, CachedKeyboardMapper } from '../../../../platform/keyboardLayout/common/keyboardMapper.js';
+import { OS, OperatingSystem, isMacintosh, isWindows } from '../../../../base/common/platform.js';
+import { WindowsKeyboardMapper } from '../common/windowsKeyboardMapper.js';
+import { FallbackKeyboardMapper } from '../common/fallbackKeyboardMapper.js';
+import { IKeyboardEvent } from '../../../../platform/keybinding/common/keybinding.js';
+import { MacLinuxKeyboardMapper } from '../common/macLinuxKeyboardMapper.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { parse, getNodeType } from '../../../../base/common/json.js';
+import * as objects from '../../../../base/common/objects.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Extensions as ConfigExtensions, IConfigurationRegistry, IConfigurationNode } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { INavigatorWithKeyboard } from './navigatorKeyboard.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { getKeyboardLayoutId, IKeyboardLayoutInfo, IKeyboardLayoutService, IKeyboardMapping, IMacLinuxKeyboardMapping, IWindowsKeyboardMapping } from '../../../../platform/keyboardLayout/common/keyboardLayout.js';
 
 export class BrowserKeyboardMapperFactoryBase extends Disposable {
 	// keyboard mapper
@@ -455,7 +456,7 @@ export class BrowserKeyboardMapperFactory extends BrowserKeyboardMapperFactoryBa
 
 		const platform = isWindows ? 'win' : isMacintosh ? 'darwin' : 'linux';
 
-		import('vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.' + platform).then((m) => {
+		import(FileAccess.asBrowserUri(`vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.${platform}.js` satisfies AppResourcePath).path).then((m) => {
 			const keymapInfos: IKeymapInfo[] = m.KeyboardLayoutContribution.INSTANCE.layoutInfos;
 			this._keymapInfos.push(...keymapInfos.map(info => (new KeymapInfo(info.layout, info.secondaryLayouts, info.mapping, info.isUserKeyboardLayout))));
 			this._mru = this._keymapInfos;
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution.ts
index 89ef892047a..206efce535a 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IKeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
+import { IKeymapInfo } from '../../common/keymapInfo.js';
 
 export class KeyboardLayoutContribution {
 	public static readonly INSTANCE: KeyboardLayoutContribution = new KeyboardLayoutContribution();
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/cz.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/cz.win.ts
index c187c923cec..11a83d5fe07 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/cz.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/cz.win.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
 	layout: { name: '00000405', id: '', text: 'Czech' },
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de-swiss.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de-swiss.win.ts
index b19d2935e66..8c05560e1f1 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de-swiss.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de-swiss.win.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de.darwin.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de.darwin.ts
index 33d2f5d5e32..21666be9f7e 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de.darwin.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de.darwin.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de.linux.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de.linux.ts
index 4a2adcfc430..652c20510ab 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de.linux.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de.linux.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de.win.ts
index 46bf5981a68..1282969776b 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de.win.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/dk.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/dk.win.ts
index b774622699c..926ff7fc2a1 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/dk.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/dk.win.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/dvorak.darwin.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/dvorak.darwin.ts
index a29ecf334f0..dd4e70610c9 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/dvorak.darwin.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/dvorak.darwin.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
 	layout: { id: 'com.apple.keylayout.Dvorak', localizedName: 'Dvorak', lang: 'en' },
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-belgian.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-belgian.win.ts
index 89e3a27892a..0e3d91f4f46 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-belgian.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-belgian.win.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-ext.darwin.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-ext.darwin.ts
index a12a2338bff..fecb472c0f0 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-ext.darwin.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-ext.darwin.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-in.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-in.win.ts
index a1786f42061..e95f76629e1 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-in.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-in.win.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-intl.darwin.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-intl.darwin.ts
index ceb7b67a878..dd04258f7ba 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-intl.darwin.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-intl.darwin.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-intl.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-intl.win.ts
index 75a2a40b805..17215aadcd5 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-intl.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-intl.win.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-uk.darwin.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-uk.darwin.ts
index 89236337707..ecde7a5c4d6 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-uk.darwin.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-uk.darwin.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
 	layout: { id: 'com.apple.keylayout.British', lang: 'en', localizedName: 'British' },
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-uk.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-uk.win.ts
index 0b07025fa88..65fe7182b15 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-uk.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-uk.win.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.darwin.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.darwin.ts
index f0fca4a9d74..e2e795a73b7 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.darwin.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.darwin.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.linux.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.linux.ts
index 84d50f18c9d..639e7a4a86b 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.linux.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.linux.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.win.ts
index 3d6845dc053..b1d6216120d 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.win.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es-latin.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es-latin.win.ts
index 16531eda212..1db3fb719c8 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es-latin.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es-latin.win.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es.darwin.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es.darwin.ts
index 679dfb36d08..41b9136b841 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es.darwin.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es.darwin.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es.linux.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es.linux.ts
index 29e95a90393..c36844b41de 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es.linux.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es.linux.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es.win.ts
index 3ac96a5dc59..94fc59f4a8a 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es.win.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/fr.darwin.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/fr.darwin.ts
index fa9198b64a0..c00e0a8902a 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/fr.darwin.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/fr.darwin.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/fr.linux.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/fr.linux.ts
index 69dd522b363..e32b06e4a44 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/fr.linux.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/fr.linux.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/fr.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/fr.win.ts
index c9f032d7bee..09f6249595a 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/fr.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/fr.win.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/hu.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/hu.win.ts
index d6b5a4dac06..7785207896b 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/hu.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/hu.win.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/it.darwin.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/it.darwin.ts
index 1dc97d9903f..bb7117b1f55 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/it.darwin.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/it.darwin.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/it.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/it.win.ts
index 573b7b0c6c3..fcbfcb18a60 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/it.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/it.win.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/jp-roman.darwin.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/jp-roman.darwin.ts
index 27328f3d87b..d93f44a3ba8 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/jp-roman.darwin.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/jp-roman.darwin.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/jp.darwin.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/jp.darwin.ts
index 819f96ba5ca..0f5cf81f754 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/jp.darwin.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/jp.darwin.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ko.darwin.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ko.darwin.ts
index 4219a7bd62f..5523bba1ab4 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ko.darwin.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ko.darwin.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.darwin.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.darwin.ts
index a9fbd20de48..a214a791315 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.darwin.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.darwin.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/en.darwin'; // 15%
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/zh-hans.darwin';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/en-uk.darwin';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/es.darwin';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/jp-roman.darwin';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/de.darwin';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/en-intl.darwin';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/en-ext.darwin';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/fr.darwin';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/jp.darwin';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/pl.darwin';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/it.darwin';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/ru.darwin';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/pt.darwin';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/ko.darwin';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/dvorak.darwin';
+import './en.darwin.js'; // 15%
+import './zh-hans.darwin.js';
+import './en-uk.darwin.js';
+import './es.darwin.js';
+import './jp-roman.darwin.js';
+import './de.darwin.js';
+import './en-intl.darwin.js';
+import './en-ext.darwin.js';
+import './fr.darwin.js';
+import './jp.darwin.js';
+import './pl.darwin.js';
+import './it.darwin.js';
+import './ru.darwin.js';
+import './pt.darwin.js';
+import './ko.darwin.js';
+import './dvorak.darwin.js';
 
-export { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+export { KeyboardLayoutContribution } from './_.contribution.js';
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.linux.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.linux.ts
index 6561501fce4..6ac5092bc62 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.linux.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.linux.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/en.linux';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/es.linux';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/de.linux';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/fr.linux';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/ru.linux';
+import './en.linux.js';
+import './es.linux.js';
+import './de.linux.js';
+import './fr.linux.js';
+import './ru.linux.js';
 
-export { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
\ No newline at end of file
+export { KeyboardLayoutContribution } from './_.contribution.js';
\ No newline at end of file
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.win.ts
index bb85b252f90..95c09a75886 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.win.ts
@@ -3,27 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/en.win'; // 40%
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/es-latin.win';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/en-in.win';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/de.win';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/en-uk.win';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/fr.win';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/pt-br.win';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/es.win';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/en-intl.win';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/ru.win';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/pl.win';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/it.win';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/sv.win';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/tr.win';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/pt.win';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/dk.win';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/no.win';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/thai.win';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/hu.win';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/de-swiss.win';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/en-belgian.win';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/cz.win';
+import './en.win.js'; // 40%
+import './es-latin.win.js';
+import './en-in.win.js';
+import './de.win.js';
+import './en-uk.win.js';
+import './fr.win.js';
+import './pt-br.win.js';
+import './es.win.js';
+import './en-intl.win.js';
+import './ru.win.js';
+import './pl.win.js';
+import './it.win.js';
+import './sv.win.js';
+import './tr.win.js';
+import './pt.win.js';
+import './dk.win.js';
+import './no.win.js';
+import './thai.win.js';
+import './hu.win.js';
+import './de-swiss.win.js';
+import './en-belgian.win.js';
+import './cz.win.js';
 
-export { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
\ No newline at end of file
+export { KeyboardLayoutContribution } from './_.contribution.js';
\ No newline at end of file
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/no.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/no.win.ts
index 2c415e8ebff..4b2a1428230 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/no.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/no.win.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pl.darwin.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pl.darwin.ts
index 57577ba513c..622840d62c2 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pl.darwin.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pl.darwin.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pl.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pl.win.ts
index a110111a83f..b31ae38cb34 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pl.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pl.win.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pt-br.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pt-br.win.ts
index 9bb82448a7c..91ce2fa2d00 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pt-br.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pt-br.win.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pt.darwin.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pt.darwin.ts
index 87435fdc0ea..9f3e26d3904 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pt.darwin.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pt.darwin.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pt.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pt.win.ts
index 456a537654b..eefa213ac5e 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pt.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pt.win.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ru.darwin.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ru.darwin.ts
index 5eea5ac38f5..cd848c9f771 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ru.darwin.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ru.darwin.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ru.linux.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ru.linux.ts
index 955772b4ae1..40e5aff1916 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ru.linux.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ru.linux.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ru.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ru.win.ts
index 0da492a10ac..62ccd0b17bf 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ru.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ru.win.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/sv.darwin.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/sv.darwin.ts
index 6d80477a689..7442feb8626 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/sv.darwin.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/sv.darwin.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/sv.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/sv.win.ts
index c7128b5c929..7099ffaa8e4 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/sv.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/sv.win.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/thai.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/thai.win.ts
index be85bfedd9e..27a3851691f 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/thai.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/thai.win.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
 	layout: { name: '0000041E', id: '', text: 'Thai Kedmanee' },
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/tr.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/tr.win.ts
index 955b03f5fc0..9ef6cc00434 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/tr.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/tr.win.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
 	layout: { name: '0000041F', id: '', text: 'Turkish Q' },
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/zh-hans.darwin.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/zh-hans.darwin.ts
index 49d1f60ae0d..715e32bedf1 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/zh-hans.darwin.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/zh-hans.darwin.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
+import { KeyboardLayoutContribution } from './_.contribution.js';
 
 KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
 	layout: { id: 'com.apple.inputmethod.SCIM.ITABC', lang: 'zh-Hans', localizedName: '搜狗拼音' },
diff --git a/src/vs/workbench/services/keybinding/browser/unboundCommands.ts b/src/vs/workbench/services/keybinding/browser/unboundCommands.ts
index 8b2335716f8..66af24d0392 100644
--- a/src/vs/workbench/services/keybinding/browser/unboundCommands.ts
+++ b/src/vs/workbench/services/keybinding/browser/unboundCommands.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CommandsRegistry, ICommandMetadata } from 'vs/platform/commands/common/commands';
-import { isNonEmptyArray } from 'vs/base/common/arrays';
-import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
-import { MenuRegistry, MenuId, isIMenuItem } from 'vs/platform/actions/common/actions';
+import { CommandsRegistry, ICommandMetadata } from '../../../../platform/commands/common/commands.js';
+import { isNonEmptyArray } from '../../../../base/common/arrays.js';
+import { EditorExtensionsRegistry } from '../../../../editor/browser/editorExtensions.js';
+import { MenuRegistry, MenuId, isIMenuItem } from '../../../../platform/actions/common/actions.js';
 
 export function getAllUnboundCommands(boundCommands: Map<string, boolean>): string[] {
 	const unboundCommands: string[] = [];
diff --git a/src/vs/workbench/services/keybinding/common/fallbackKeyboardMapper.ts b/src/vs/workbench/services/keybinding/common/fallbackKeyboardMapper.ts
index e853f657d43..cb82289808b 100644
--- a/src/vs/workbench/services/keybinding/common/fallbackKeyboardMapper.ts
+++ b/src/vs/workbench/services/keybinding/common/fallbackKeyboardMapper.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ResolvedKeybinding, KeyCodeChord, Keybinding } from 'vs/base/common/keybindings';
-import { OperatingSystem } from 'vs/base/common/platform';
-import { IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding';
-import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayoutResolvedKeybinding';
-import { IKeyboardMapper } from 'vs/platform/keyboardLayout/common/keyboardMapper';
+import { ResolvedKeybinding, KeyCodeChord, Keybinding } from '../../../../base/common/keybindings.js';
+import { OperatingSystem } from '../../../../base/common/platform.js';
+import { IKeyboardEvent } from '../../../../platform/keybinding/common/keybinding.js';
+import { USLayoutResolvedKeybinding } from '../../../../platform/keybinding/common/usLayoutResolvedKeybinding.js';
+import { IKeyboardMapper } from '../../../../platform/keyboardLayout/common/keyboardMapper.js';
 
 /**
  * A keyboard mapper to be used when reading the keymap from the OS fails.
diff --git a/src/vs/workbench/services/keybinding/common/keybindingEditing.ts b/src/vs/workbench/services/keybinding/common/keybindingEditing.ts
index 25231d5ad4e..cd001282144 100644
--- a/src/vs/workbench/services/keybinding/common/keybindingEditing.ts
+++ b/src/vs/workbench/services/keybinding/common/keybindingEditing.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { Queue } from 'vs/base/common/async';
-import * as json from 'vs/base/common/json';
-import * as objects from 'vs/base/common/objects';
-import { setProperty } from 'vs/base/common/jsonEdit';
-import { Edit } from 'vs/base/common/jsonFormatter';
-import { Disposable, IReference } from 'vs/base/common/lifecycle';
-import { EditOperation } from 'vs/editor/common/core/editOperation';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ITextModel } from 'vs/editor/common/model';
-import { ITextModelService, IResolvedTextEditorModel } from 'vs/editor/common/services/resolverService';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IFileService } from 'vs/platform/files/common/files';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IUserFriendlyKeybinding } from 'vs/platform/keybinding/common/keybinding';
-import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
+import { localize } from '../../../../nls.js';
+import { Queue } from '../../../../base/common/async.js';
+import * as json from '../../../../base/common/json.js';
+import * as objects from '../../../../base/common/objects.js';
+import { setProperty } from '../../../../base/common/jsonEdit.js';
+import { Edit } from '../../../../base/common/jsonFormatter.js';
+import { Disposable, IReference } from '../../../../base/common/lifecycle.js';
+import { EditOperation } from '../../../../editor/common/core/editOperation.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { Selection } from '../../../../editor/common/core/selection.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { ITextModelService, IResolvedTextEditorModel } from '../../../../editor/common/services/resolverService.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IUserFriendlyKeybinding } from '../../../../platform/keybinding/common/keybinding.js';
+import { ResolvedKeybindingItem } from '../../../../platform/keybinding/common/resolvedKeybindingItem.js';
+import { ITextFileService } from '../../textfile/common/textfiles.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IUserDataProfileService } from '../../userDataProfile/common/userDataProfile.js';
 
 export const IKeybindingEditingService = createDecorator<IKeybindingEditingService>('keybindingEditingService');
 
diff --git a/src/vs/workbench/services/keybinding/common/keybindingIO.ts b/src/vs/workbench/services/keybinding/common/keybindingIO.ts
index 9d6cae2d2f8..91726a3e752 100644
--- a/src/vs/workbench/services/keybinding/common/keybindingIO.ts
+++ b/src/vs/workbench/services/keybinding/common/keybindingIO.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeybindingParser } from 'vs/base/common/keybindingParser';
-import { Keybinding } from 'vs/base/common/keybindings';
-import { ContextKeyExpr, ContextKeyExpression } from 'vs/platform/contextkey/common/contextkey';
-import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
+import { KeybindingParser } from '../../../../base/common/keybindingParser.js';
+import { Keybinding } from '../../../../base/common/keybindings.js';
+import { ContextKeyExpr, ContextKeyExpression } from '../../../../platform/contextkey/common/contextkey.js';
+import { ResolvedKeybindingItem } from '../../../../platform/keybinding/common/resolvedKeybindingItem.js';
 
 export interface IUserKeybindingItem {
 	keybinding: Keybinding | null;
diff --git a/src/vs/workbench/services/keybinding/common/keymapInfo.ts b/src/vs/workbench/services/keybinding/common/keymapInfo.ts
index d5675fae02b..1a75f5259d8 100644
--- a/src/vs/workbench/services/keybinding/common/keymapInfo.ts
+++ b/src/vs/workbench/services/keybinding/common/keymapInfo.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isWindows, isLinux } from 'vs/base/common/platform';
-import { getKeyboardLayoutId, IKeyboardLayoutInfo } from 'vs/platform/keyboardLayout/common/keyboardLayout';
+import { isWindows, isLinux } from '../../../../base/common/platform.js';
+import { getKeyboardLayoutId, IKeyboardLayoutInfo } from '../../../../platform/keyboardLayout/common/keyboardLayout.js';
 
 function deserializeMapping(serializedMapping: ISerializedMapping) {
 	const mapping = serializedMapping;
diff --git a/src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.ts b/src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.ts
index 6e843e8bfd2..a6a9a9f2757 100644
--- a/src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.ts
+++ b/src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
-import { KeyCode, KeyCodeUtils, IMMUTABLE_CODE_TO_KEY_CODE, IMMUTABLE_KEY_CODE_TO_CODE, ScanCode, ScanCodeUtils } from 'vs/base/common/keyCodes';
-import { ResolvedKeybinding, KeyCodeChord, SingleModifierChord, ScanCodeChord, Keybinding, Chord } from 'vs/base/common/keybindings';
-import { OperatingSystem } from 'vs/base/common/platform';
-import { IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding';
-import { IKeyboardMapper } from 'vs/platform/keyboardLayout/common/keyboardMapper';
-import { BaseResolvedKeybinding } from 'vs/platform/keybinding/common/baseResolvedKeybinding';
-import { IMacLinuxKeyboardMapping, IMacLinuxKeyMapping } from 'vs/platform/keyboardLayout/common/keyboardLayout';
+import { CharCode } from '../../../../base/common/charCode.js';
+import { KeyCode, KeyCodeUtils, IMMUTABLE_CODE_TO_KEY_CODE, IMMUTABLE_KEY_CODE_TO_CODE, ScanCode, ScanCodeUtils } from '../../../../base/common/keyCodes.js';
+import { ResolvedKeybinding, KeyCodeChord, SingleModifierChord, ScanCodeChord, Keybinding, Chord } from '../../../../base/common/keybindings.js';
+import { OperatingSystem } from '../../../../base/common/platform.js';
+import { IKeyboardEvent } from '../../../../platform/keybinding/common/keybinding.js';
+import { IKeyboardMapper } from '../../../../platform/keyboardLayout/common/keyboardMapper.js';
+import { BaseResolvedKeybinding } from '../../../../platform/keybinding/common/baseResolvedKeybinding.js';
+import { IMacLinuxKeyboardMapping, IMacLinuxKeyMapping } from '../../../../platform/keyboardLayout/common/keyboardLayout.js';
 
 /**
  * A map from character to key codes.
diff --git a/src/vs/workbench/services/keybinding/common/windowsKeyboardMapper.ts b/src/vs/workbench/services/keybinding/common/windowsKeyboardMapper.ts
index ba476600ac5..732a2504ace 100644
--- a/src/vs/workbench/services/keybinding/common/windowsKeyboardMapper.ts
+++ b/src/vs/workbench/services/keybinding/common/windowsKeyboardMapper.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CharCode } from 'vs/base/common/charCode';
-import { KeyCode, KeyCodeUtils, IMMUTABLE_CODE_TO_KEY_CODE, ScanCode, ScanCodeUtils, NATIVE_WINDOWS_KEY_CODE_TO_KEY_CODE } from 'vs/base/common/keyCodes';
-import { ResolvedKeybinding, KeyCodeChord, SingleModifierChord, ScanCodeChord, Keybinding, Chord } from 'vs/base/common/keybindings';
-import { UILabelProvider } from 'vs/base/common/keybindingLabels';
-import { OperatingSystem } from 'vs/base/common/platform';
-import { IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding';
-import { IKeyboardMapper } from 'vs/platform/keyboardLayout/common/keyboardMapper';
-import { BaseResolvedKeybinding } from 'vs/platform/keybinding/common/baseResolvedKeybinding';
-import { toEmptyArrayIfContainsNull } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
-import { IWindowsKeyboardMapping } from 'vs/platform/keyboardLayout/common/keyboardLayout';
+import { CharCode } from '../../../../base/common/charCode.js';
+import { KeyCode, KeyCodeUtils, IMMUTABLE_CODE_TO_KEY_CODE, ScanCode, ScanCodeUtils, NATIVE_WINDOWS_KEY_CODE_TO_KEY_CODE } from '../../../../base/common/keyCodes.js';
+import { ResolvedKeybinding, KeyCodeChord, SingleModifierChord, ScanCodeChord, Keybinding, Chord } from '../../../../base/common/keybindings.js';
+import { UILabelProvider } from '../../../../base/common/keybindingLabels.js';
+import { OperatingSystem } from '../../../../base/common/platform.js';
+import { IKeyboardEvent } from '../../../../platform/keybinding/common/keybinding.js';
+import { IKeyboardMapper } from '../../../../platform/keyboardLayout/common/keyboardMapper.js';
+import { BaseResolvedKeybinding } from '../../../../platform/keybinding/common/baseResolvedKeybinding.js';
+import { toEmptyArrayIfContainsNull } from '../../../../platform/keybinding/common/resolvedKeybindingItem.js';
+import { IWindowsKeyboardMapping } from '../../../../platform/keyboardLayout/common/keyboardLayout.js';
 
 const LOG = false;
 function log(str: string): void {
diff --git a/src/vs/workbench/services/keybinding/electron-sandbox/nativeKeyboardLayout.ts b/src/vs/workbench/services/keybinding/electron-sandbox/nativeKeyboardLayout.ts
index f3afb1bf3bb..af40ee1a6df 100644
--- a/src/vs/workbench/services/keybinding/electron-sandbox/nativeKeyboardLayout.ts
+++ b/src/vs/workbench/services/keybinding/electron-sandbox/nativeKeyboardLayout.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IKeyboardLayoutInfo, IKeyboardLayoutService, IKeyboardMapping, ILinuxKeyboardLayoutInfo, IMacKeyboardLayoutInfo, IMacLinuxKeyboardMapping, IWindowsKeyboardLayoutInfo, IWindowsKeyboardMapping } from 'vs/platform/keyboardLayout/common/keyboardLayout';
-import { Emitter } from 'vs/base/common/event';
-import { OperatingSystem, OS } from 'vs/base/common/platform';
-import { CachedKeyboardMapper, IKeyboardMapper } from 'vs/platform/keyboardLayout/common/keyboardMapper';
-import { WindowsKeyboardMapper } from 'vs/workbench/services/keybinding/common/windowsKeyboardMapper';
-import { FallbackKeyboardMapper } from 'vs/workbench/services/keybinding/common/fallbackKeyboardMapper';
-import { MacLinuxKeyboardMapper } from 'vs/workbench/services/keybinding/common/macLinuxKeyboardMapper';
-import { DispatchConfig, readKeyboardConfig } from 'vs/platform/keyboardLayout/common/keyboardConfig';
-import { IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { INativeKeyboardLayoutService } from 'vs/workbench/services/keybinding/electron-sandbox/nativeKeyboardLayoutService';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IKeyboardLayoutInfo, IKeyboardLayoutService, IKeyboardMapping, ILinuxKeyboardLayoutInfo, IMacKeyboardLayoutInfo, IMacLinuxKeyboardMapping, IWindowsKeyboardLayoutInfo, IWindowsKeyboardMapping } from '../../../../platform/keyboardLayout/common/keyboardLayout.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { OperatingSystem, OS } from '../../../../base/common/platform.js';
+import { CachedKeyboardMapper, IKeyboardMapper } from '../../../../platform/keyboardLayout/common/keyboardMapper.js';
+import { WindowsKeyboardMapper } from '../common/windowsKeyboardMapper.js';
+import { FallbackKeyboardMapper } from '../common/fallbackKeyboardMapper.js';
+import { MacLinuxKeyboardMapper } from '../common/macLinuxKeyboardMapper.js';
+import { DispatchConfig, readKeyboardConfig } from '../../../../platform/keyboardLayout/common/keyboardConfig.js';
+import { IKeyboardEvent } from '../../../../platform/keybinding/common/keybinding.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { INativeKeyboardLayoutService } from './nativeKeyboardLayoutService.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
 
 export class KeyboardLayoutService extends Disposable implements IKeyboardLayoutService {
 
diff --git a/src/vs/workbench/services/keybinding/electron-sandbox/nativeKeyboardLayoutService.ts b/src/vs/workbench/services/keybinding/electron-sandbox/nativeKeyboardLayoutService.ts
index 68ee8d45ceb..5953c1fbb3d 100644
--- a/src/vs/workbench/services/keybinding/electron-sandbox/nativeKeyboardLayoutService.ts
+++ b/src/vs/workbench/services/keybinding/electron-sandbox/nativeKeyboardLayoutService.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IKeyboardLayoutInfo, IKeyboardMapping, IMacLinuxKeyboardMapping, IWindowsKeyboardMapping, macLinuxKeyboardMappingEquals, windowsKeyboardMappingEquals } from 'vs/platform/keyboardLayout/common/keyboardLayout';
-import { Emitter, Event } from 'vs/base/common/event';
-import { OperatingSystem, OS } from 'vs/base/common/platform';
-import { IMainProcessService } from 'vs/platform/ipc/common/mainProcessService';
-import { INativeKeyboardLayoutService as IBaseNativeKeyboardLayoutService } from 'vs/platform/keyboardLayout/common/keyboardLayoutService';
-import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IKeyboardLayoutInfo, IKeyboardMapping, IMacLinuxKeyboardMapping, IWindowsKeyboardMapping, macLinuxKeyboardMappingEquals, windowsKeyboardMappingEquals } from '../../../../platform/keyboardLayout/common/keyboardLayout.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { OperatingSystem, OS } from '../../../../base/common/platform.js';
+import { IMainProcessService } from '../../../../platform/ipc/common/mainProcessService.js';
+import { INativeKeyboardLayoutService as IBaseNativeKeyboardLayoutService } from '../../../../platform/keyboardLayout/common/keyboardLayoutService.js';
+import { ProxyChannel } from '../../../../base/parts/ipc/common/ipc.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 
 export const INativeKeyboardLayoutService = createDecorator<INativeKeyboardLayoutService>('nativeKeyboardLayoutService');
 
diff --git a/src/vs/workbench/services/keybinding/test/browser/browserKeyboardMapper.test.ts b/src/vs/workbench/services/keybinding/test/browser/browserKeyboardMapper.test.ts
index 7c3e693e96d..433016ff81f 100644
--- a/src/vs/workbench/services/keybinding/test/browser/browserKeyboardMapper.test.ts
+++ b/src/vs/workbench/services/keybinding/test/browser/browserKeyboardMapper.test.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/en.darwin';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/de.darwin';
-import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { BrowserKeyboardMapperFactoryBase } from 'vs/workbench/services/keybinding/browser/keyboardLayoutService';
-import { KeymapInfo, IKeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
-import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import '../../browser/keyboardLayouts/en.darwin.js';
+import '../../browser/keyboardLayouts/de.darwin.js';
+import { KeyboardLayoutContribution } from '../../browser/keyboardLayouts/_.contribution.js';
+import { BrowserKeyboardMapperFactoryBase } from '../../browser/keyboardLayoutService.js';
+import { KeymapInfo, IKeymapInfo } from '../../common/keymapInfo.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { INotificationService } from '../../../../../platform/notification/common/notification.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { IStorageService } from '../../../../../platform/storage/common/storage.js';
+import { TestNotificationService } from '../../../../../platform/notification/test/common/testNotificationService.js';
+import { TestStorageService } from '../../../../test/common/workbenchTestServices.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 class TestKeyboardMapperFactory extends BrowserKeyboardMapperFactoryBase {
 	constructor(configurationService: IConfigurationService, notificationService: INotificationService, storageService: IStorageService, commandService: ICommandService) {
diff --git a/src/vs/workbench/services/keybinding/test/browser/keybindingEditing.test.ts b/src/vs/workbench/services/keybinding/test/browser/keybindingEditing.test.ts
index e2064decab9..e0c19e38865 100644
--- a/src/vs/workbench/services/keybinding/test/browser/keybindingEditing.test.ts
+++ b/src/vs/workbench/services/keybinding/test/browser/keybindingEditing.test.ts
@@ -4,34 +4,34 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import * as json from 'vs/base/common/json';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { KeyCodeChord } from 'vs/base/common/keybindings';
-import { OS } from 'vs/base/common/platform';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IFileService } from 'vs/platform/files/common/files';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { IUserFriendlyKeybinding } from 'vs/platform/keybinding/common/keybinding';
-import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
-import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayoutResolvedKeybinding';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { KeybindingsEditingService } from 'vs/workbench/services/keybinding/common/keybindingEditing';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { TestEnvironmentService, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { FileUserDataProvider } from 'vs/platform/userData/common/fileUserDataProvider';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { joinPath } from 'vs/base/common/resources';
-import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { UserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { UserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfileService';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import * as json from '../../../../../base/common/json.js';
+import { KeyCode } from '../../../../../base/common/keyCodes.js';
+import { KeyCodeChord } from '../../../../../base/common/keybindings.js';
+import { OS } from '../../../../../base/common/platform.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IEnvironmentService } from '../../../../../platform/environment/common/environment.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { IUserFriendlyKeybinding } from '../../../../../platform/keybinding/common/keybinding.js';
+import { ResolvedKeybindingItem } from '../../../../../platform/keybinding/common/resolvedKeybindingItem.js';
+import { USLayoutResolvedKeybinding } from '../../../../../platform/keybinding/common/usLayoutResolvedKeybinding.js';
+import { NullLogService } from '../../../../../platform/log/common/log.js';
+import { KeybindingsEditingService } from '../../common/keybindingEditing.js';
+import { ITextFileService } from '../../../textfile/common/textfiles.js';
+import { TestEnvironmentService, workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
+import { FileService } from '../../../../../platform/files/common/fileService.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { FileUserDataProvider } from '../../../../../platform/userData/common/fileUserDataProvider.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { joinPath } from '../../../../../base/common/resources.js';
+import { InMemoryFileSystemProvider } from '../../../../../platform/files/common/inMemoryFilesystemProvider.js';
+import { VSBuffer } from '../../../../../base/common/buffer.js';
+import { UserDataProfilesService } from '../../../../../platform/userDataProfile/common/userDataProfile.js';
+import { UserDataProfileService } from '../../../userDataProfile/common/userDataProfileService.js';
+import { IUserDataProfileService } from '../../../userDataProfile/common/userDataProfile.js';
+import { UriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentityService.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 interface Modifiers {
 	metaKey?: boolean;
diff --git a/src/vs/workbench/services/keybinding/test/browser/keybindingIO.test.ts b/src/vs/workbench/services/keybinding/test/browser/keybindingIO.test.ts
index 3f7687029a9..77e0d26860f 100644
--- a/src/vs/workbench/services/keybinding/test/browser/keybindingIO.test.ts
+++ b/src/vs/workbench/services/keybinding/test/browser/keybindingIO.test.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { KeyChord, KeyCode, KeyMod, ScanCode } from 'vs/base/common/keyCodes';
-import { KeyCodeChord, decodeKeybinding, ScanCodeChord, Keybinding } from 'vs/base/common/keybindings';
-import { KeybindingParser } from 'vs/base/common/keybindingParser';
-import { OperatingSystem } from 'vs/base/common/platform';
-import { KeybindingIO } from 'vs/workbench/services/keybinding/common/keybindingIO';
-import { createUSLayoutResolvedKeybinding } from 'vs/platform/keybinding/test/common/keybindingsTestUtils';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { KeyChord, KeyCode, KeyMod, ScanCode } from '../../../../../base/common/keyCodes.js';
+import { KeyCodeChord, decodeKeybinding, ScanCodeChord, Keybinding } from '../../../../../base/common/keybindings.js';
+import { KeybindingParser } from '../../../../../base/common/keybindingParser.js';
+import { OperatingSystem } from '../../../../../base/common/platform.js';
+import { KeybindingIO } from '../../common/keybindingIO.js';
+import { createUSLayoutResolvedKeybinding } from '../../../../../platform/keybinding/test/common/keybindingsTestUtils.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('keybindingIO', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/services/keybinding/test/node/fallbackKeyboardMapper.test.ts b/src/vs/workbench/services/keybinding/test/node/fallbackKeyboardMapper.test.ts
index 4af4570f30b..f654e20c475 100644
--- a/src/vs/workbench/services/keybinding/test/node/fallbackKeyboardMapper.test.ts
+++ b/src/vs/workbench/services/keybinding/test/node/fallbackKeyboardMapper.test.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyChord, KeyCode, KeyMod, ScanCode } from 'vs/base/common/keyCodes';
-import { KeyCodeChord, decodeKeybinding, ScanCodeChord, Keybinding } from 'vs/base/common/keybindings';
-import { OperatingSystem } from 'vs/base/common/platform';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { FallbackKeyboardMapper } from 'vs/workbench/services/keybinding/common/fallbackKeyboardMapper';
-import { IResolvedKeybinding, assertResolveKeyboardEvent, assertResolveKeybinding } from 'vs/workbench/services/keybinding/test/node/keyboardMapperTestUtils';
+import { KeyChord, KeyCode, KeyMod, ScanCode } from '../../../../../base/common/keyCodes.js';
+import { KeyCodeChord, decodeKeybinding, ScanCodeChord, Keybinding } from '../../../../../base/common/keybindings.js';
+import { OperatingSystem } from '../../../../../base/common/platform.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { FallbackKeyboardMapper } from '../../common/fallbackKeyboardMapper.js';
+import { IResolvedKeybinding, assertResolveKeyboardEvent, assertResolveKeybinding } from './keyboardMapperTestUtils.js';
 
 suite('keyboardMapper - MAC fallback', () => {
 
diff --git a/src/vs/workbench/services/keybinding/test/node/keyboardMapperTestUtils.ts b/src/vs/workbench/services/keybinding/test/node/keyboardMapperTestUtils.ts
index 1ef7cb70863..31f4c630099 100644
--- a/src/vs/workbench/services/keybinding/test/node/keyboardMapperTestUtils.ts
+++ b/src/vs/workbench/services/keybinding/test/node/keyboardMapperTestUtils.ts
@@ -3,13 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as fs from 'fs';
 import assert from 'assert';
-import * as path from 'vs/base/common/path';
-import { SingleModifierChord, ResolvedKeybinding, Keybinding } from 'vs/base/common/keybindings';
-import { Promises } from 'vs/base/node/pfs';
-import { IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding';
-import { IKeyboardMapper } from 'vs/platform/keyboardLayout/common/keyboardMapper';
-import { FileAccess } from 'vs/base/common/network';
+import * as path from '../../../../../base/common/path.js';
+import { SingleModifierChord, ResolvedKeybinding, Keybinding } from '../../../../../base/common/keybindings.js';
+import { Promises } from '../../../../../base/node/pfs.js';
+import { IKeyboardEvent } from '../../../../../platform/keybinding/common/keybinding.js';
+import { IKeyboardMapper } from '../../../../../platform/keyboardLayout/common/keyboardMapper.js';
+import { FileAccess } from '../../../../../base/common/network.js';
 
 export interface IResolvedKeybinding {
 	label: string | null;
@@ -46,7 +47,7 @@ export function assertResolveKeybinding(mapper: IKeyboardMapper, keybinding: Key
 }
 
 export function readRawMapping<T>(file: string): Promise<T> {
-	return Promises.readFile(FileAccess.asFileUri(`vs/workbench/services/keybinding/test/node/${file}.js`).fsPath).then((buff) => {
+	return fs.promises.readFile(FileAccess.asFileUri(`vs/workbench/services/keybinding/test/node/${file}.js`).fsPath).then((buff) => {
 		const contents = buff.toString();
 		const func = new Function('define', contents);// CodeQL [SM01632] This is used in tests and we read the files as JS to avoid slowing down TS compilation
 		let rawMappings: T | null = null;
@@ -60,7 +61,7 @@ export function readRawMapping<T>(file: string): Promise<T> {
 export function assertMapping(writeFileIfDifferent: boolean, mapper: IKeyboardMapper, file: string): Promise<void> {
 	const filePath = path.normalize(FileAccess.asFileUri(`vs/workbench/services/keybinding/test/node/${file}`).fsPath);
 
-	return Promises.readFile(filePath).then((buff) => {
+	return fs.promises.readFile(filePath).then((buff) => {
 		const expected = buff.toString().replace(/\r\n/g, '\n');
 		const actual = mapper.dumpDebugInfo().replace(/\r\n/g, '\n');
 		if (actual !== expected && writeFileIfDifferent) {
diff --git a/src/vs/workbench/services/keybinding/test/node/macLinuxKeyboardMapper.test.ts b/src/vs/workbench/services/keybinding/test/node/macLinuxKeyboardMapper.test.ts
index 7ca4e5a54fc..e428280388d 100644
--- a/src/vs/workbench/services/keybinding/test/node/macLinuxKeyboardMapper.test.ts
+++ b/src/vs/workbench/services/keybinding/test/node/macLinuxKeyboardMapper.test.ts
@@ -4,15 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { KeyChord, KeyCode, KeyMod, ScanCode, ScanCodeUtils } from 'vs/base/common/keyCodes';
-import { KeyCodeChord, decodeKeybinding, createSimpleKeybinding, ScanCodeChord, Keybinding } from 'vs/base/common/keybindings';
-import { UserSettingsLabelProvider } from 'vs/base/common/keybindingLabels';
-import { OperatingSystem } from 'vs/base/common/platform';
-import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayoutResolvedKeybinding';
-import { MacLinuxKeyboardMapper } from 'vs/workbench/services/keybinding/common/macLinuxKeyboardMapper';
-import { IResolvedKeybinding, assertMapping, assertResolveKeyboardEvent, assertResolveKeybinding, readRawMapping } from 'vs/workbench/services/keybinding/test/node/keyboardMapperTestUtils';
-import { IMacLinuxKeyboardMapping } from 'vs/platform/keyboardLayout/common/keyboardLayout';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { KeyChord, KeyCode, KeyMod, ScanCode, ScanCodeUtils } from '../../../../../base/common/keyCodes.js';
+import { KeyCodeChord, decodeKeybinding, createSimpleKeybinding, ScanCodeChord, Keybinding } from '../../../../../base/common/keybindings.js';
+import { UserSettingsLabelProvider } from '../../../../../base/common/keybindingLabels.js';
+import { OperatingSystem } from '../../../../../base/common/platform.js';
+import { USLayoutResolvedKeybinding } from '../../../../../platform/keybinding/common/usLayoutResolvedKeybinding.js';
+import { MacLinuxKeyboardMapper } from '../../common/macLinuxKeyboardMapper.js';
+import { IResolvedKeybinding, assertMapping, assertResolveKeyboardEvent, assertResolveKeybinding, readRawMapping } from './keyboardMapperTestUtils.js';
+import { IMacLinuxKeyboardMapping } from '../../../../../platform/keyboardLayout/common/keyboardLayout.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 const WRITE_FILE_IF_DIFFERENT = false;
 
diff --git a/src/vs/workbench/services/keybinding/test/node/windowsKeyboardMapper.test.ts b/src/vs/workbench/services/keybinding/test/node/windowsKeyboardMapper.test.ts
index 08bb66b4610..665ef4d79e7 100644
--- a/src/vs/workbench/services/keybinding/test/node/windowsKeyboardMapper.test.ts
+++ b/src/vs/workbench/services/keybinding/test/node/windowsKeyboardMapper.test.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeyChord, KeyCode, KeyMod, ScanCode } from 'vs/base/common/keyCodes';
-import { KeyCodeChord, decodeKeybinding, ScanCodeChord, Keybinding } from 'vs/base/common/keybindings';
-import { OperatingSystem } from 'vs/base/common/platform';
-import { WindowsKeyboardMapper } from 'vs/workbench/services/keybinding/common/windowsKeyboardMapper';
-import { IResolvedKeybinding, assertMapping, assertResolveKeyboardEvent, assertResolveKeybinding, readRawMapping } from 'vs/workbench/services/keybinding/test/node/keyboardMapperTestUtils';
-import { IWindowsKeyboardMapping } from 'vs/platform/keyboardLayout/common/keyboardLayout';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { KeyChord, KeyCode, KeyMod, ScanCode } from '../../../../../base/common/keyCodes.js';
+import { KeyCodeChord, decodeKeybinding, ScanCodeChord, Keybinding } from '../../../../../base/common/keybindings.js';
+import { OperatingSystem } from '../../../../../base/common/platform.js';
+import { WindowsKeyboardMapper } from '../../common/windowsKeyboardMapper.js';
+import { IResolvedKeybinding, assertMapping, assertResolveKeyboardEvent, assertResolveKeybinding, readRawMapping } from './keyboardMapperTestUtils.js';
+import { IWindowsKeyboardMapping } from '../../../../../platform/keyboardLayout/common/keyboardLayout.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 const WRITE_FILE_IF_DIFFERENT = false;
 
diff --git a/src/vs/workbench/services/label/common/labelService.ts b/src/vs/workbench/services/label/common/labelService.ts
index c39c5dad1cc..941b49db19a 100644
--- a/src/vs/workbench/services/label/common/labelService.ts
+++ b/src/vs/workbench/services/label/common/labelService.ts
@@ -3,30 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { URI } from 'vs/base/common/uri';
-import { IDisposable, Disposable, dispose } from 'vs/base/common/lifecycle';
-import { posix, sep, win32 } from 'vs/base/common/path';
-import { Emitter } from 'vs/base/common/event';
-import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry, IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IWorkspaceContextService, IWorkspace, isWorkspace, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, IWorkspaceIdentifier, toWorkspaceIdentifier, WORKSPACE_EXTENSION, isUntitledWorkspace, isTemporaryWorkspace } from 'vs/platform/workspace/common/workspace';
-import { basenameOrAuthority, basename, joinPath, dirname } from 'vs/base/common/resources';
-import { tildify, getPathLabel } from 'vs/base/common/labels';
-import { ILabelService, ResourceLabelFormatter, ResourceLabelFormatting, IFormatterChangeEvent, Verbosity } from 'vs/platform/label/common/label';
-import { ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { match } from 'vs/base/common/glob';
-import { ILifecycleService, LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { isProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
-import { OperatingSystem, OS } from 'vs/base/common/platform';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { Schemas } from 'vs/base/common/network';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { Memento } from 'vs/workbench/common/memento';
-import { firstOrDefault } from 'vs/base/common/arrays';
+import { localize } from '../../../../nls.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IDisposable, Disposable, dispose } from '../../../../base/common/lifecycle.js';
+import { posix, sep, win32 } from '../../../../base/common/path.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry, IWorkbenchContribution } from '../../../common/contributions.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { IWorkspaceContextService, IWorkspace, isWorkspace, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, IWorkspaceIdentifier, toWorkspaceIdentifier, WORKSPACE_EXTENSION, isUntitledWorkspace, isTemporaryWorkspace } from '../../../../platform/workspace/common/workspace.js';
+import { basenameOrAuthority, basename, joinPath, dirname } from '../../../../base/common/resources.js';
+import { tildify, getPathLabel } from '../../../../base/common/labels.js';
+import { ILabelService, ResourceLabelFormatter, ResourceLabelFormatting, IFormatterChangeEvent, Verbosity } from '../../../../platform/label/common/label.js';
+import { ExtensionsRegistry } from '../../extensions/common/extensionsRegistry.js';
+import { match } from '../../../../base/common/glob.js';
+import { ILifecycleService, LifecyclePhase } from '../../lifecycle/common/lifecycle.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IPathService } from '../../path/common/pathService.js';
+import { isProposedApiEnabled } from '../../extensions/common/extensions.js';
+import { OperatingSystem, OS } from '../../../../base/common/platform.js';
+import { IRemoteAgentService } from '../../remote/common/remoteAgentService.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { Memento } from '../../../common/memento.js';
 
 const resourceLabelFormattersExtPoint = ExtensionsRegistry.registerExtensionPoint<ResourceLabelFormatter[]>({
 	extensionPoint: 'resourceLabelFormatters',
@@ -252,7 +251,7 @@ export class LabelService extends Disposable implements ILabelService {
 				// scheme that is workspace contained.
 
 				const workspace = this.contextService.getWorkspace();
-				const firstFolder = firstOrDefault(workspace.folders);
+				const firstFolder = workspace.folders.at(0);
 				if (firstFolder && resource.scheme !== firstFolder.uri.scheme && resource.path.startsWith(posix.sep)) {
 					folder = this.contextService.getWorkspaceFolder(firstFolder.uri.with({ path: resource.path }));
 				}
diff --git a/src/vs/workbench/services/label/test/browser/label.test.ts b/src/vs/workbench/services/label/test/browser/label.test.ts
index 84afcb96d37..d9b6cebb873 100644
--- a/src/vs/workbench/services/label/test/browser/label.test.ts
+++ b/src/vs/workbench/services/label/test/browser/label.test.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as resources from 'vs/base/common/resources';
+import * as resources from '../../../../../base/common/resources.js';
 import assert from 'assert';
-import { TestEnvironmentService, TestLifecycleService, TestPathService, TestRemoteAgentService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { URI } from 'vs/base/common/uri';
-import { LabelService } from 'vs/workbench/services/label/common/labelService';
-import { TestContextService, TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
-import { WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { TestWorkspace, Workspace } from 'vs/platform/workspace/test/common/testWorkspace';
-import { isWindows } from 'vs/base/common/platform';
-import { StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { Memento } from 'vs/workbench/common/memento';
-import { ResourceLabelFormatter } from 'vs/platform/label/common/label';
-import { sep } from 'vs/base/common/path';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import { TestEnvironmentService, TestLifecycleService, TestPathService, TestRemoteAgentService } from '../../../../test/browser/workbenchTestServices.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { LabelService } from '../../common/labelService.js';
+import { TestContextService, TestStorageService } from '../../../../test/common/workbenchTestServices.js';
+import { WorkspaceFolder } from '../../../../../platform/workspace/common/workspace.js';
+import { TestWorkspace, Workspace } from '../../../../../platform/workspace/test/common/testWorkspace.js';
+import { isWindows } from '../../../../../base/common/platform.js';
+import { StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { Memento } from '../../../../common/memento.js';
+import { ResourceLabelFormatter } from '../../../../../platform/label/common/label.js';
+import { sep } from '../../../../../base/common/path.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
 
 suite('URI Label', () => {
 	let labelService: LabelService;
diff --git a/src/vs/workbench/services/label/test/common/mockLabelService.ts b/src/vs/workbench/services/label/test/common/mockLabelService.ts
index 9d46b1dd84b..d2ee200c074 100644
--- a/src/vs/workbench/services/label/test/common/mockLabelService.ts
+++ b/src/vs/workbench/services/label/test/common/mockLabelService.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { basename, normalize } from 'vs/base/common/path';
-import { URI } from 'vs/base/common/uri';
-import { IFormatterChangeEvent, ILabelService, ResourceLabelFormatter, Verbosity } from 'vs/platform/label/common/label';
-import { IWorkspace, IWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { basename, normalize } from '../../../../../base/common/path.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { IFormatterChangeEvent, ILabelService, ResourceLabelFormatter, Verbosity } from '../../../../../platform/label/common/label.js';
+import { IWorkspace, IWorkspaceIdentifier } from '../../../../../platform/workspace/common/workspace.js';
 
 export class MockLabelService implements ILabelService {
 	_serviceBrand: undefined;
diff --git a/src/vs/workbench/services/language/common/languageService.ts b/src/vs/workbench/services/language/common/languageService.ts
index 1eb86cfd2d3..1ab9a920338 100644
--- a/src/vs/workbench/services/language/common/languageService.ts
+++ b/src/vs/workbench/services/language/common/languageService.ts
@@ -3,27 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { clearConfiguredLanguageAssociations, registerConfiguredLanguageAssociation } from 'vs/editor/common/services/languagesAssociations';
-import { joinPath } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { ILanguageExtensionPoint, ILanguageService } from 'vs/editor/common/languages/language';
-import { LanguageService } from 'vs/editor/common/services/languageService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { FILES_ASSOCIATIONS_CONFIG, IFilesConfiguration } from 'vs/platform/files/common/files';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { ExtensionMessageCollector, ExtensionsRegistry, IExtensionPoint, IExtensionPointUser } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IExtensionManifest } from 'vs/platform/extensions/common/extensions';
-import { ILogService } from 'vs/platform/log/common/log';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Extensions, IExtensionFeatureTableRenderer, IExtensionFeaturesRegistry, IRenderedData, IRowData, ITableData } from 'vs/workbench/services/extensionManagement/common/extensionFeatures';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { index } from 'vs/base/common/arrays';
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { isString } from 'vs/base/common/types';
+import { localize } from '../../../../nls.js';
+import { clearConfiguredLanguageAssociations, registerConfiguredLanguageAssociation } from '../../../../editor/common/services/languagesAssociations.js';
+import { joinPath } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ILanguageExtensionPoint, ILanguageService } from '../../../../editor/common/languages/language.js';
+import { LanguageService } from '../../../../editor/common/services/languageService.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { FILES_ASSOCIATIONS_CONFIG, IFilesConfiguration } from '../../../../platform/files/common/files.js';
+import { IExtensionService } from '../../extensions/common/extensions.js';
+import { ExtensionMessageCollector, ExtensionsRegistry, IExtensionPoint, IExtensionPointUser } from '../../extensions/common/extensionsRegistry.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IExtensionManifest } from '../../../../platform/extensions/common/extensions.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Extensions, IExtensionFeatureTableRenderer, IExtensionFeaturesRegistry, IRenderedData, IRowData, ITableData } from '../../extensionManagement/common/extensionFeatures.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { index } from '../../../../base/common/arrays.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { isString } from '../../../../base/common/types.js';
 
 export interface IRawLanguageExtensionPoint {
 	id: string;
@@ -300,7 +300,7 @@ export class WorkbenchLanguageService extends LanguageService {
 		// Register based on settings
 		if (configuration.files?.associations) {
 			Object.keys(configuration.files.associations).forEach(pattern => {
-				const langId = configuration.files.associations[pattern];
+				const langId = configuration.files!.associations[pattern];
 				if (typeof langId !== 'string') {
 					this.logService.warn(`Ignoring configured 'files.associations' for '${pattern}' because its type is not a string but '${typeof langId}'`);
 
diff --git a/src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker.ts b/src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker.ts
index f967fc38127..f9e86fbd6b3 100644
--- a/src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker.ts
+++ b/src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker.ts
@@ -4,39 +4,50 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type { ModelOperations, ModelResult } from '@vscode/vscode-languagedetection';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { IRequestHandler } from 'vs/base/common/worker/simpleWorker';
-import { EditorSimpleWorker } from 'vs/editor/common/services/editorSimpleWorker';
-import { IEditorWorkerHost } from 'vs/editor/common/services/editorWorkerHost';
+import { importAMDNodeModule } from '../../../../amdX.js';
+import { StopWatch } from '../../../../base/common/stopwatch.js';
+import { IRequestHandler, IWorkerServer } from '../../../../base/common/worker/simpleWorker.js';
+import { LanguageDetectionWorkerHost, ILanguageDetectionWorker } from './languageDetectionWorker.protocol.js';
+import { WorkerTextModelSyncServer } from '../../../../editor/common/services/textModelSync/textModelSync.impl.js';
 
 type RegexpModel = { detect: (inp: string, langBiases: Record<string, number>, supportedLangs?: string[]) => string | undefined };
 
 /**
- * Called on the worker side
- * @internal
+ * Defines the worker entry point. Must be exported and named `create`.
+ * @skipMangle
  */
-export function create(host: IEditorWorkerHost): IRequestHandler {
-	return new LanguageDetectionSimpleWorker(host, null);
+export function create(workerServer: IWorkerServer): IRequestHandler {
+	return new LanguageDetectionSimpleWorker(workerServer);
 }
 
 /**
  * @internal
  */
-export class LanguageDetectionSimpleWorker extends EditorSimpleWorker {
+export class LanguageDetectionSimpleWorker implements ILanguageDetectionWorker {
+	_requestHandlerBrand: any;
+
 	private static readonly expectedRelativeConfidence = 0.2;
 	private static readonly positiveConfidenceCorrectionBucket1 = 0.05;
 	private static readonly positiveConfidenceCorrectionBucket2 = 0.025;
 	private static readonly negativeConfidenceCorrection = 0.5;
 
+	private readonly _workerTextModelSyncServer = new WorkerTextModelSyncServer();
+
+	private readonly _host: LanguageDetectionWorkerHost;
 	private _regexpModel: RegexpModel | undefined;
 	private _regexpLoadFailed: boolean = false;
 
 	private _modelOperations: ModelOperations | undefined;
 	private _loadFailed: boolean = false;
 
-	private modelIdToCoreId = new Map<string, string>();
+	private modelIdToCoreId = new Map<string, string | undefined>();
 
-	public async detectLanguage(uri: string, langBiases: Record<string, number> | undefined, preferHistory: boolean, supportedLangs?: string[]): Promise<string | undefined> {
+	constructor(workerServer: IWorkerServer) {
+		this._host = LanguageDetectionWorkerHost.getChannel(workerServer);
+		this._workerTextModelSyncServer.bindToServer(workerServer);
+	}
+
+	public async $detectLanguage(uri: string, langBiases: Record<string, number> | undefined, preferHistory: boolean, supportedLangs?: string[]): Promise<string | undefined> {
 		const languages: string[] = [];
 		const confidences: number[] = [];
 		const stopWatch = new StopWatch();
@@ -46,7 +57,7 @@ export class LanguageDetectionSimpleWorker extends EditorSimpleWorker {
 		const neuralResolver = async () => {
 			for await (const language of this.detectLanguagesImpl(documentTextSample)) {
 				if (!this.modelIdToCoreId.has(language.languageId)) {
-					this.modelIdToCoreId.set(language.languageId, await this._host.fhr('getLanguageId', [language.languageId]));
+					this.modelIdToCoreId.set(language.languageId, await this._host.$getLanguageId(language.languageId));
 				}
 				const coreId = this.modelIdToCoreId.get(language.languageId);
 				if (coreId && (!supportedLangs?.length || supportedLangs.includes(coreId))) {
@@ -57,7 +68,7 @@ export class LanguageDetectionSimpleWorker extends EditorSimpleWorker {
 			stopWatch.stop();
 
 			if (languages.length) {
-				this._host.fhr('sendTelemetryEvent', [languages, confidences, stopWatch.elapsed()]);
+				this._host.$sendTelemetryEvent(languages, confidences, stopWatch.elapsed());
 				return languages[0];
 			}
 			return undefined;
@@ -81,7 +92,7 @@ export class LanguageDetectionSimpleWorker extends EditorSimpleWorker {
 	}
 
 	private getTextForDetection(uri: string): string | undefined {
-		const editorModel = this._getModel(uri);
+		const editorModel = this._workerTextModelSyncServer.getModel(uri);
 		if (!editorModel) { return; }
 
 		const end = editorModel.positionAt(10000);
@@ -101,9 +112,9 @@ export class LanguageDetectionSimpleWorker extends EditorSimpleWorker {
 		if (this._regexpModel) {
 			return this._regexpModel;
 		}
-		const uri: string = await this._host.fhr('getRegexpModelUri', []);
+		const uri: string = await this._host.$getRegexpModelUri();
 		try {
-			this._regexpModel = await import(uri) as RegexpModel;
+			this._regexpModel = await importAMDNodeModule(uri, '') as RegexpModel;
 			return this._regexpModel;
 		} catch (e) {
 			this._regexpLoadFailed = true;
@@ -136,11 +147,11 @@ export class LanguageDetectionSimpleWorker extends EditorSimpleWorker {
 			return this._modelOperations;
 		}
 
-		const uri: string = await this._host.fhr('getIndexJsUri', []);
-		const { ModelOperations } = await import(uri) as typeof import('@vscode/vscode-languagedetection');
+		const uri: string = await this._host.$getIndexJsUri();
+		const { ModelOperations } = await importAMDNodeModule(uri, '') as typeof import('@vscode/vscode-languagedetection');
 		this._modelOperations = new ModelOperations({
 			modelJsonLoaderFunc: async () => {
-				const response = await fetch(await this._host.fhr('getModelJsonUri', []));
+				const response = await fetch(await this._host.$getModelJsonUri());
 				try {
 					const modelJSON = await response.json();
 					return modelJSON;
@@ -150,7 +161,7 @@ export class LanguageDetectionSimpleWorker extends EditorSimpleWorker {
 				}
 			},
 			weightsLoaderFunc: async () => {
-				const response = await fetch(await this._host.fhr('getWeightsUri', []));
+				const response = await fetch(await this._host.$getWeightsUri());
 				const buffer = await response.arrayBuffer();
 				return buffer;
 			}
diff --git a/src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorkerMain.ts b/src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorkerMain.ts
new file mode 100644
index 00000000000..d9ec848d715
--- /dev/null
+++ b/src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorkerMain.ts
@@ -0,0 +1,9 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { create } from './languageDetectionSimpleWorker.js';
+import { bootstrapSimpleWorker } from '../../../../base/common/worker/simpleWorkerBootstrap.js';
+
+bootstrapSimpleWorker(create);
diff --git a/src/vs/workbench/services/languageDetection/browser/languageDetectionWorker.protocol.ts b/src/vs/workbench/services/languageDetection/browser/languageDetectionWorker.protocol.ts
new file mode 100644
index 00000000000..ada9fc9cc6c
--- /dev/null
+++ b/src/vs/workbench/services/languageDetection/browser/languageDetectionWorker.protocol.ts
@@ -0,0 +1,27 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IWorkerClient, IWorkerServer } from '../../../../base/common/worker/simpleWorker.js';
+
+export abstract class LanguageDetectionWorkerHost {
+	public static CHANNEL_NAME = 'languageDetectionWorkerHost';
+	public static getChannel(workerServer: IWorkerServer): LanguageDetectionWorkerHost {
+		return workerServer.getChannel<LanguageDetectionWorkerHost>(LanguageDetectionWorkerHost.CHANNEL_NAME);
+	}
+	public static setChannel(workerClient: IWorkerClient<any>, obj: LanguageDetectionWorkerHost): void {
+		workerClient.setChannel<LanguageDetectionWorkerHost>(LanguageDetectionWorkerHost.CHANNEL_NAME, obj);
+	}
+
+	abstract $getIndexJsUri(): Promise<string>;
+	abstract $getLanguageId(languageIdOrExt: string | undefined): Promise<string | undefined>;
+	abstract $sendTelemetryEvent(languages: string[], confidences: number[], timeSpent: number): Promise<void>;
+	abstract $getRegexpModelUri(): Promise<string>;
+	abstract $getModelJsonUri(): Promise<string>;
+	abstract $getWeightsUri(): Promise<string>;
+}
+
+export interface ILanguageDetectionWorker {
+	$detectLanguage(uri: string, langBiases: Record<string, number> | undefined, preferHistory: boolean, supportedLangs?: string[]): Promise<string | undefined>;
+}
diff --git a/src/vs/workbench/services/languageDetection/browser/languageDetectionWorkerServiceImpl.ts b/src/vs/workbench/services/languageDetection/browser/languageDetectionWorkerServiceImpl.ts
index 1577e10f794..dad48d96187 100644
--- a/src/vs/workbench/services/languageDetection/browser/languageDetectionWorkerServiceImpl.ts
+++ b/src/vs/workbench/services/languageDetection/browser/languageDetectionWorkerServiceImpl.ts
@@ -3,27 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ILanguageDetectionService, ILanguageDetectionStats, LanguageDetectionStatsClassification, LanguageDetectionStatsId } from 'vs/workbench/services/languageDetection/common/languageDetectionWorkerService';
-import { AppResourcePath, FileAccess, nodeModulesAsarPath, nodeModulesPath, Schemas } from 'vs/base/common/network';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { URI } from 'vs/base/common/uri';
-import { isWeb } from 'vs/base/common/platform';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { LanguageDetectionSimpleWorker } from 'vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker';
-import { IModelService } from 'vs/editor/common/services/model';
-import { SimpleWorkerClient } from 'vs/base/common/worker/simpleWorker';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { EditorWorkerClient, EditorWorkerHost } from 'vs/editor/browser/services/editorWorkerService';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { IDiagnosticsService } from 'vs/platform/diagnostics/common/diagnostics';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { LRUCache } from 'vs/base/common/map';
-import { ILogService } from 'vs/platform/log/common/log';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ILanguageDetectionService, ILanguageDetectionStats, LanguageDetectionStatsClassification, LanguageDetectionStatsId } from '../common/languageDetectionWorkerService.js';
+import { AppResourcePath, FileAccess, nodeModulesAsarPath, nodeModulesPath, Schemas } from '../../../../base/common/network.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { URI } from '../../../../base/common/uri.js';
+import { isWeb } from '../../../../base/common/platform.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { IWorkerClient } from '../../../../base/common/worker/simpleWorker.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IDiagnosticsService } from '../../../../platform/diagnostics/common/diagnostics.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { IEditorService } from '../../editor/common/editorService.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { LRUCache } from '../../../../base/common/map.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { canASAR } from '../../../../amdX.js';
+import { createWebWorker } from '../../../../base/browser/defaultWorkerFactory.js';
+import { WorkerTextModelSyncClient } from '../../../../editor/common/services/textModelSync/textModelSync.impl.js';
+import { ILanguageDetectionWorker, LanguageDetectionWorkerHost } from './languageDetectionWorker.protocol.js';
 
 const TOP_LANG_COUNTS = 12;
 
@@ -61,29 +62,28 @@ export class LanguageDetectionService extends Disposable implements ILanguageDet
 		@IEditorService private readonly _editorService: IEditorService,
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IStorageService storageService: IStorageService,
-		@ILogService private readonly _logService: ILogService,
-		@ILanguageConfigurationService languageConfigurationService: ILanguageConfigurationService
+		@ILogService private readonly _logService: ILogService
 	) {
 		super();
 
+		const useAsar = canASAR && this._environmentService.isBuilt && !isWeb;
 		this._languageDetectionWorkerClient = this._register(new LanguageDetectionWorkerClient(
 			modelService,
 			languageService,
 			telemetryService,
-			// TODO: See if it's possible to bundle vscode-languagedetection
-			this._environmentService.isBuilt && !isWeb
+			// TODO See if it's possible to bundle vscode-languagedetection
+			useAsar
 				? FileAccess.asBrowserUri(`${moduleLocationAsar}/dist/lib/index.js`).toString(true)
 				: FileAccess.asBrowserUri(`${moduleLocation}/dist/lib/index.js`).toString(true),
-			this._environmentService.isBuilt && !isWeb
+			useAsar
 				? FileAccess.asBrowserUri(`${moduleLocationAsar}/model/model.json`).toString(true)
 				: FileAccess.asBrowserUri(`${moduleLocation}/model/model.json`).toString(true),
-			this._environmentService.isBuilt && !isWeb
+			useAsar
 				? FileAccess.asBrowserUri(`${moduleLocationAsar}/model/group1-shard1of1.bin`).toString(true)
 				: FileAccess.asBrowserUri(`${moduleLocation}/model/group1-shard1of1.bin`).toString(true),
-			this._environmentService.isBuilt && !isWeb
+			useAsar
 				? FileAccess.asBrowserUri(`${regexpModuleLocationAsar}/dist/index.js`).toString(true)
 				: FileAccess.asBrowserUri(`${regexpModuleLocation}/dist/index.js`).toString(true),
-			languageConfigurationService
 		));
 
 		this.initEditorOpenedListeners(storageService);
@@ -177,80 +177,45 @@ export class LanguageDetectionService extends Disposable implements ILanguageDet
 	}
 }
 
-export interface IWorkerClient<W> {
-	getProxyObject(): Promise<W>;
-	dispose(): void;
-}
-
-export class LanguageDetectionWorkerHost {
-	constructor(
-		private _indexJsUri: string,
-		private _modelJsonUri: string,
-		private _weightsUri: string,
-		private _telemetryService: ITelemetryService,
-	) {
-	}
-
-	async getIndexJsUri() {
-		return this._indexJsUri;
-	}
-
-	async getModelJsonUri() {
-		return this._modelJsonUri;
-	}
-
-	async getWeightsUri() {
-		return this._weightsUri;
-	}
-
-	async sendTelemetryEvent(languages: string[], confidences: number[], timeSpent: number): Promise<void> {
-		type LanguageDetectionStats = { languages: string; confidences: string; timeSpent: number };
-		type LanguageDetectionStatsClassification = {
-			owner: 'TylerLeonhardt';
-			comment: 'Helps understand how effective language detection is via confidences and how long it takes to run';
-			languages: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The languages that are guessed' };
-			confidences: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The confidences of each language guessed' };
-			timeSpent: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The time it took to run language detection' };
-		};
-
-		this._telemetryService.publicLog2<LanguageDetectionStats, LanguageDetectionStatsClassification>('automaticlanguagedetection.stats', {
-			languages: languages.join(','),
-			confidences: confidences.join(','),
-			timeSpent
-		});
-	}
-}
-
-export class LanguageDetectionWorkerClient extends EditorWorkerClient {
-	private workerPromise: Promise<IWorkerClient<LanguageDetectionSimpleWorker>> | undefined;
+export class LanguageDetectionWorkerClient extends Disposable {
+	private worker: {
+		workerClient: IWorkerClient<ILanguageDetectionWorker>;
+		workerTextModelSyncClient: WorkerTextModelSyncClient;
+	} | undefined;
 
 	constructor(
-		modelService: IModelService,
+		private readonly _modelService: IModelService,
 		private readonly _languageService: ILanguageService,
 		private readonly _telemetryService: ITelemetryService,
 		private readonly _indexJsUri: string,
 		private readonly _modelJsonUri: string,
 		private readonly _weightsUri: string,
 		private readonly _regexpModelUri: string,
-		languageConfigurationService: ILanguageConfigurationService,
 	) {
-		super(modelService, true, 'languageDetectionWorkerService', languageConfigurationService);
+		super();
 	}
 
-	private _getOrCreateLanguageDetectionWorker(): Promise<IWorkerClient<LanguageDetectionSimpleWorker>> {
-		if (this.workerPromise) {
-			return this.workerPromise;
-		}
-
-		this.workerPromise = new Promise((resolve, reject) => {
-			resolve(this._register(new SimpleWorkerClient<LanguageDetectionSimpleWorker, EditorWorkerHost>(
-				this._workerFactory,
+	private _getOrCreateLanguageDetectionWorker(): {
+		workerClient: IWorkerClient<ILanguageDetectionWorker>;
+		workerTextModelSyncClient: WorkerTextModelSyncClient;
+	} {
+		if (!this.worker) {
+			const workerClient = this._register(createWebWorker<ILanguageDetectionWorker>(
 				'vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker',
-				new EditorWorkerHost(this)
-			)));
-		});
-
-		return this.workerPromise;
+				'LanguageDetectionWorker'
+			));
+			LanguageDetectionWorkerHost.setChannel(workerClient, {
+				$getIndexJsUri: async () => this.getIndexJsUri(),
+				$getLanguageId: async (languageIdOrExt) => this.getLanguageId(languageIdOrExt),
+				$sendTelemetryEvent: async (languages, confidences, timeSpent) => this.sendTelemetryEvent(languages, confidences, timeSpent),
+				$getRegexpModelUri: async () => this.getRegexpModelUri(),
+				$getModelJsonUri: async () => this.getModelJsonUri(),
+				$getWeightsUri: async () => this.getWeightsUri(),
+			});
+			const workerTextModelSyncClient = WorkerTextModelSyncClient.create(workerClient, this._modelService);
+			this.worker = { workerClient, workerTextModelSyncClient };
+		}
+		return this.worker;
 	}
 
 	private _guessLanguageIdByUri(uri: URI): string | undefined {
@@ -261,30 +226,6 @@ export class LanguageDetectionWorkerClient extends EditorWorkerClient {
 		return undefined;
 	}
 
-	protected override async _getProxy(): Promise<LanguageDetectionSimpleWorker> {
-		return (await this._getOrCreateLanguageDetectionWorker()).getProxyObject();
-	}
-
-	// foreign host request
-	public override async fhr(method: string, args: any[]): Promise<any> {
-		switch (method) {
-			case 'getIndexJsUri':
-				return this.getIndexJsUri();
-			case 'getModelJsonUri':
-				return this.getModelJsonUri();
-			case 'getWeightsUri':
-				return this.getWeightsUri();
-			case 'getRegexpModelUri':
-				return this.getRegexpModelUri();
-			case 'getLanguageId':
-				return this.getLanguageId(args[0]);
-			case 'sendTelemetryEvent':
-				return this.sendTelemetryEvent(args[0], args[1], args[2]);
-			default:
-				return super.fhr(method, args);
-		}
-	}
-
 	async getIndexJsUri() {
 		return this._indexJsUri;
 	}
@@ -330,8 +271,9 @@ export class LanguageDetectionWorkerClient extends EditorWorkerClient {
 			return quickGuess;
 		}
 
-		await this._withSyncedResources([resource]);
-		const modelId = await (await this._getProxy()).detectLanguage(resource.toString(), langBiases, preferHistory, supportedLangs);
+		const { workerClient, workerTextModelSyncClient } = this._getOrCreateLanguageDetectionWorker();
+		await workerTextModelSyncClient.ensureSyncedResources([resource]);
+		const modelId = await workerClient.proxy.$detectLanguage(resource.toString(), langBiases, preferHistory, supportedLangs);
 		const languageId = this.getLanguageId(modelId);
 
 		const LanguageDetectionStatsId = 'automaticlanguagedetection.perf';
diff --git a/src/vs/workbench/services/languageDetection/common/languageDetectionWorkerService.ts b/src/vs/workbench/services/languageDetection/common/languageDetectionWorkerService.ts
index 2ba8696e8e4..8944b02a469 100644
--- a/src/vs/workbench/services/languageDetection/common/languageDetectionWorkerService.ts
+++ b/src/vs/workbench/services/languageDetection/common/languageDetectionWorkerService.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { URI } from '../../../../base/common/uri.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 
 export const ILanguageDetectionService = createDecorator<ILanguageDetectionService>('ILanguageDetectionService');
 
diff --git a/src/vs/workbench/services/languageStatus/common/languageStatusService.ts b/src/vs/workbench/services/languageStatus/common/languageStatusService.ts
index e10d2a3ef1e..74bfa68e6a8 100644
--- a/src/vs/workbench/services/languageStatus/common/languageStatusService.ts
+++ b/src/vs/workbench/services/languageStatus/common/languageStatusService.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Event } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import Severity from 'vs/base/common/severity';
-import { compare } from 'vs/base/common/strings';
-import { ITextModel } from 'vs/editor/common/model';
-import { Command } from 'vs/editor/common/languages';
-import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import { LanguageSelector } from 'vs/editor/common/languageSelector';
-import { IAccessibilityInformation } from 'vs/platform/accessibility/common/accessibility';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Event } from '../../../../base/common/event.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import Severity from '../../../../base/common/severity.js';
+import { compare } from '../../../../base/common/strings.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { Command } from '../../../../editor/common/languages.js';
+import { LanguageFeatureRegistry } from '../../../../editor/common/languageFeatureRegistry.js';
+import { LanguageSelector } from '../../../../editor/common/languageSelector.js';
+import { IAccessibilityInformation } from '../../../../platform/accessibility/common/accessibility.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 
 export interface ILanguageStatus {
 	readonly id: string;
diff --git a/src/vs/workbench/services/layout/browser/layoutService.ts b/src/vs/workbench/services/layout/browser/layoutService.ts
index 3357adabc82..5148f08345e 100644
--- a/src/vs/workbench/services/layout/browser/layoutService.ts
+++ b/src/vs/workbench/services/layout/browser/layoutService.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { refineServiceDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { Event } from 'vs/base/common/event';
-import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
-import { Part } from 'vs/workbench/browser/part';
-import { IDimension } from 'vs/base/browser/dom';
-import { Direction } from 'vs/base/browser/ui/grid/grid';
-import { isMacintosh, isNative, isWeb } from 'vs/base/common/platform';
-import { isAuxiliaryWindow } from 'vs/base/browser/window';
-import { CustomTitleBarVisibility, TitleBarSetting, getMenuBarVisibility, hasCustomTitlebar, hasNativeTitlebar } from 'vs/platform/window/common/window';
-import { isFullscreen, isWCOEnabled } from 'vs/base/browser/browser';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IDisposable } from 'vs/base/common/lifecycle';
+import { refineServiceDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { Event } from '../../../../base/common/event.js';
+import { ILayoutService } from '../../../../platform/layout/browser/layoutService.js';
+import { Part } from '../../../browser/part.js';
+import { IDimension } from '../../../../base/browser/dom.js';
+import { Direction } from '../../../../base/browser/ui/grid/grid.js';
+import { isMacintosh, isNative, isWeb } from '../../../../base/common/platform.js';
+import { isAuxiliaryWindow } from '../../../../base/browser/window.js';
+import { CustomTitleBarVisibility, TitleBarSetting, getMenuBarVisibility, hasCustomTitlebar, hasNativeTitlebar } from '../../../../platform/window/common/window.js';
+import { isFullscreen, isWCOEnabled } from '../../../../base/browser/browser.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
 
 export const IWorkbenchLayoutService = refineServiceDecorator<ILayoutService, IWorkbenchLayoutService>(ILayoutService);
 
@@ -70,7 +70,12 @@ export const enum EditorActionsLocation {
 export const enum Position {
 	LEFT,
 	RIGHT,
-	BOTTOM
+	BOTTOM,
+	TOP
+}
+
+export function isHorizontal(position: Position): boolean {
+	return position === Position.BOTTOM || position === Position.TOP;
 }
 
 export const enum PanelOpensMaximizedOptions {
@@ -86,6 +91,7 @@ export function positionToString(position: Position): string {
 		case Position.LEFT: return 'left';
 		case Position.RIGHT: return 'right';
 		case Position.BOTTOM: return 'bottom';
+		case Position.TOP: return 'top';
 		default: return 'bottom';
 	}
 }
@@ -93,7 +99,8 @@ export function positionToString(position: Position): string {
 const positionsByString: { [key: string]: Position } = {
 	[positionToString(Position.LEFT)]: Position.LEFT,
 	[positionToString(Position.RIGHT)]: Position.RIGHT,
-	[positionToString(Position.BOTTOM)]: Position.BOTTOM
+	[positionToString(Position.BOTTOM)]: Position.BOTTOM,
+	[positionToString(Position.TOP)]: Position.TOP
 };
 
 export function positionFromString(str: string): Position {
@@ -318,7 +325,7 @@ export function shouldShowCustomTitleBar(configurationService: IConfigurationSer
 	}
 
 	if (zenModeActive) {
-		return false;
+		return !configurationService.getValue<boolean>(ZenModeSettings.FULLSCREEN);
 	}
 
 	const inFullscreen = isFullscreen(window);
diff --git a/src/vs/workbench/services/lifecycle/browser/lifecycleService.ts b/src/vs/workbench/services/lifecycle/browser/lifecycleService.ts
index 351cad96bc7..7d00beb7569 100644
--- a/src/vs/workbench/services/lifecycle/browser/lifecycleService.ts
+++ b/src/vs/workbench/services/lifecycle/browser/lifecycleService.ts
@@ -3,17 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ShutdownReason, ILifecycleService, StartupKind } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { ILogService } from 'vs/platform/log/common/log';
-import { AbstractLifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycleService';
-import { localize } from 'vs/nls';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { addDisposableListener, EventType } from 'vs/base/browser/dom';
-import { IStorageService, WillSaveStateReason } from 'vs/platform/storage/common/storage';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { mainWindow } from 'vs/base/browser/window';
-import { firstOrDefault } from 'vs/base/common/arrays';
+import { ShutdownReason, ILifecycleService, StartupKind } from '../common/lifecycle.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { AbstractLifecycleService } from '../common/lifecycleService.js';
+import { localize } from '../../../../nls.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { addDisposableListener, EventType } from '../../../../base/browser/dom.js';
+import { IStorageService, WillSaveStateReason } from '../../../../platform/storage/common/storage.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { mainWindow } from '../../../../base/browser/window.js';
 
 export class BrowserLifecycleService extends AbstractLifecycleService {
 
@@ -205,7 +204,7 @@ export class BrowserLifecycleService extends AbstractLifecycleService {
 	protected override doResolveStartupKind(): StartupKind | undefined {
 		let startupKind = super.doResolveStartupKind();
 		if (typeof startupKind !== 'number') {
-			const timing = firstOrDefault(performance.getEntriesByType('navigation')) as PerformanceNavigationTiming | undefined;
+			const timing = performance.getEntriesByType('navigation').at(0) as PerformanceNavigationTiming | undefined;
 			if (timing?.type === 'reload') {
 				// MDN: https://developer.mozilla.org/en-US/docs/Web/API/PerformanceNavigationTiming/type#value
 				startupKind = StartupKind.ReloadedWindow;
diff --git a/src/vs/workbench/services/lifecycle/common/lifecycle.ts b/src/vs/workbench/services/lifecycle/common/lifecycle.ts
index 7a795423d5d..b976238ba53 100644
--- a/src/vs/workbench/services/lifecycle/common/lifecycle.ts
+++ b/src/vs/workbench/services/lifecycle/common/lifecycle.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Event } from 'vs/base/common/event';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Event } from '../../../../base/common/event.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 
 export const ILifecycleService = createDecorator<ILifecycleService>('lifecycleService');
 
@@ -65,9 +65,34 @@ export interface BeforeShutdownErrorEvent {
 	readonly error: Error;
 }
 
+export enum WillShutdownJoinerOrder {
+
+	/**
+	 * Joiners to run before the `Last` joiners. This is the default order and best for
+	 * most cases. You can be sure that services are still functional at this point.
+	 */
+	Default = 1,
+
+	/**
+	 * The joiners to run last. This should ONLY be used in rare cases when you have no
+	 * dependencies to workbench services or state. The workbench may be in a state where
+	 * resources can no longer be accessed or changed.
+	 */
+	Last
+}
+
 export interface IWillShutdownEventJoiner {
-	id: string;
-	label: string;
+	readonly id: string;
+	readonly label: string;
+	readonly order?: WillShutdownJoinerOrder;
+}
+
+export interface IWillShutdownEventDefaultJoiner extends IWillShutdownEventJoiner {
+	readonly order?: WillShutdownJoinerOrder.Default;
+}
+
+export interface IWillShutdownEventLastJoiner extends IWillShutdownEventJoiner {
+	readonly order: WillShutdownJoinerOrder.Last;
 }
 
 /**
@@ -95,10 +120,21 @@ export interface WillShutdownEvent {
 	 * Allows to join the shutdown. The promise can be a long running operation but it
 	 * will block the application from closing.
 	 *
+	 * @param promise the promise to join the shutdown event.
 	 * @param joiner to identify the join operation in case it takes very long or never
 	 * completes.
 	 */
-	join(promise: Promise<void>, joiner: IWillShutdownEventJoiner): void;
+	join(promise: Promise<void>, joiner: IWillShutdownEventDefaultJoiner): void;
+
+	/**
+	 * Allows to join the shutdown at the end. The promise can be a long running operation but it
+	 * will block the application from closing.
+	 *
+	 * @param promiseFn the promise to join the shutdown event.
+	 * @param joiner to identify the join operation in case it takes very long or never
+	 * completes.
+	 */
+	join(promiseFn: (() => Promise<void>), joiner: IWillShutdownEventLastJoiner): void;
 
 	/**
 	 * Allows to access the joiners that have not finished joining this event.
diff --git a/src/vs/workbench/services/lifecycle/common/lifecycleService.ts b/src/vs/workbench/services/lifecycle/common/lifecycleService.ts
index 09eee478155..c32a14ca9f7 100644
--- a/src/vs/workbench/services/lifecycle/common/lifecycleService.ts
+++ b/src/vs/workbench/services/lifecycle/common/lifecycleService.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { Barrier } from 'vs/base/common/async';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ILifecycleService, WillShutdownEvent, StartupKind, LifecyclePhase, LifecyclePhaseToString, ShutdownReason, BeforeShutdownErrorEvent, InternalBeforeShutdownEvent } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { ILogService } from 'vs/platform/log/common/log';
-import { mark } from 'vs/base/common/performance';
-import { IStorageService, StorageScope, StorageTarget, WillSaveStateReason } from 'vs/platform/storage/common/storage';
+import { Emitter } from '../../../../base/common/event.js';
+import { Barrier } from '../../../../base/common/async.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ILifecycleService, WillShutdownEvent, StartupKind, LifecyclePhase, LifecyclePhaseToString, ShutdownReason, BeforeShutdownErrorEvent, InternalBeforeShutdownEvent } from './lifecycle.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { mark } from '../../../../base/common/performance.js';
+import { IStorageService, StorageScope, StorageTarget, WillSaveStateReason } from '../../../../platform/storage/common/storage.js';
 
 export abstract class AbstractLifecycleService extends Disposable implements ILifecycleService {
 
diff --git a/src/vs/workbench/services/lifecycle/electron-sandbox/lifecycleService.ts b/src/vs/workbench/services/lifecycle/electron-sandbox/lifecycleService.ts
index 9d4d9418201..8508d4c433d 100644
--- a/src/vs/workbench/services/lifecycle/electron-sandbox/lifecycleService.ts
+++ b/src/vs/workbench/services/lifecycle/electron-sandbox/lifecycleService.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { handleVetos } from 'vs/platform/lifecycle/common/lifecycle';
-import { ShutdownReason, ILifecycleService, IWillShutdownEventJoiner } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ipcRenderer } from 'vs/base/parts/sandbox/electron-sandbox/globals';
-import { ILogService } from 'vs/platform/log/common/log';
-import { AbstractLifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycleService';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { Promises, disposableTimeout, raceCancellation } from 'vs/base/common/async';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
+import { handleVetos } from '../../../../platform/lifecycle/common/lifecycle.js';
+import { ShutdownReason, ILifecycleService, IWillShutdownEventJoiner, WillShutdownJoinerOrder } from '../common/lifecycle.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { ipcRenderer } from '../../../../base/parts/sandbox/electron-sandbox/globals.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { AbstractLifecycleService } from '../common/lifecycleService.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { Promises, disposableTimeout, raceCancellation } from '../../../../base/common/async.js';
+import { toErrorMessage } from '../../../../base/common/errorMessage.js';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
 
 export class NativeLifecycleService extends AbstractLifecycleService {
 
@@ -155,19 +155,24 @@ export class NativeLifecycleService extends AbstractLifecycleService {
 
 	protected async handleWillShutdown(reason: ShutdownReason): Promise<void> {
 		const joiners: Promise<void>[] = [];
+		const lastJoiners: (() => Promise<void>)[] = [];
 		const pendingJoiners = new Set<IWillShutdownEventJoiner>();
 		const cts = new CancellationTokenSource();
-
 		this._onWillShutdown.fire({
 			reason,
 			token: cts.token,
 			joiners: () => Array.from(pendingJoiners.values()),
-			join(promise, joiner) {
-				joiners.push(promise);
-
-				// Track promise completion
+			join(promiseOrPromiseFn, joiner) {
 				pendingJoiners.add(joiner);
-				promise.finally(() => pendingJoiners.delete(joiner));
+
+				if (joiner.order === WillShutdownJoinerOrder.Last) {
+					const promiseFn = typeof promiseOrPromiseFn === 'function' ? promiseOrPromiseFn : () => promiseOrPromiseFn;
+					lastJoiners.push(() => promiseFn().finally(() => pendingJoiners.delete(joiner)));
+				} else {
+					const promise = typeof promiseOrPromiseFn === 'function' ? promiseOrPromiseFn() : promiseOrPromiseFn;
+					promise.finally(() => pendingJoiners.delete(joiner));
+					joiners.push(promise);
+				}
 			},
 			force: () => {
 				cts.dispose(true);
@@ -181,10 +186,16 @@ export class NativeLifecycleService extends AbstractLifecycleService {
 		try {
 			await raceCancellation(Promises.settled(joiners), cts.token);
 		} catch (error) {
-			this.logService.error(`[lifecycle]: Error during will-shutdown phase (error: ${toErrorMessage(error)})`); // this error will not prevent the shutdown
-		} finally {
-			longRunningWillShutdownWarning.dispose();
+			this.logService.error(`[lifecycle]: Error during will-shutdown phase in default joiners (error: ${toErrorMessage(error)})`);
 		}
+
+		try {
+			await raceCancellation(Promises.settled(lastJoiners.map(lastJoiner => lastJoiner())), cts.token);
+		} catch (error) {
+			this.logService.error(`[lifecycle]: Error during will-shutdown phase in last joiners (error: ${toErrorMessage(error)})`);
+		}
+
+		longRunningWillShutdownWarning.dispose();
 	}
 
 	shutdown(): Promise<void> {
diff --git a/src/vs/workbench/services/lifecycle/test/electron-sandbox/lifecycleService.test.ts b/src/vs/workbench/services/lifecycle/test/electron-sandbox/lifecycleService.test.ts
index 0d71a208693..be81648bd84 100644
--- a/src/vs/workbench/services/lifecycle/test/electron-sandbox/lifecycleService.test.ts
+++ b/src/vs/workbench/services/lifecycle/test/electron-sandbox/lifecycleService.test.ts
@@ -4,11 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ShutdownReason } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { NativeLifecycleService } from 'vs/workbench/services/lifecycle/electron-sandbox/lifecycleService';
-import { workbenchInstantiationService } from 'vs/workbench/test/electron-sandbox/workbenchTestServices';
+import { timeout } from '../../../../../base/common/async.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { runWithFakedTimers } from '../../../../../base/test/common/timeTravelScheduler.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { ShutdownReason, WillShutdownJoinerOrder } from '../../common/lifecycle.js';
+import { NativeLifecycleService } from '../../electron-sandbox/lifecycleService.js';
+import { workbenchInstantiationService } from '../../../../test/electron-sandbox/workbenchTestServices.js';
 
 suite('Lifecycleservice', function () {
 
@@ -155,5 +157,34 @@ suite('Lifecycleservice', function () {
 		assert.strictEqual(joinCalled, true);
 	});
 
+	test('onWillShutdown - join order', async function () {
+		return runWithFakedTimers({ useFakeTimers: true }, async () => {
+			const order: string[] = [];
+
+			disposables.add(lifecycleService.onWillShutdown(e => {
+				e.join(async () => {
+					order.push('disconnect start');
+					await timeout(1);
+					order.push('disconnect end');
+				}, { id: 'test', label: 'test', order: WillShutdownJoinerOrder.Last });
+
+				e.join((async () => {
+					order.push('default start');
+					await timeout(1);
+					order.push('default end');
+				})(), { id: 'test', label: 'test', order: WillShutdownJoinerOrder.Default });
+			}));
+
+			await lifecycleService.testHandleWillShutdown(ShutdownReason.QUIT);
+
+			assert.deepStrictEqual(order, [
+				'default start',
+				'default end',
+				'disconnect start',
+				'disconnect end'
+			]);
+		});
+	});
+
 	ensureNoDisposablesAreLeakedInTestSuite();
 });
diff --git a/src/vs/workbench/services/localization/browser/localeService.ts b/src/vs/workbench/services/localization/browser/localeService.ts
index 0d9c51c72cf..554ecb2bce9 100644
--- a/src/vs/workbench/services/localization/browser/localeService.ts
+++ b/src/vs/workbench/services/localization/browser/localeService.ts
@@ -3,22 +3,57 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { Language, LANGUAGE_DEFAULT } from 'vs/base/common/platform';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { ILanguagePackItem } from 'vs/platform/languagePacks/common/languagePacks';
-import { IActiveLanguagePackService, ILocaleService } from 'vs/workbench/services/localization/common/locale';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { ILogService } from 'vs/platform/log/common/log';
+import { localize } from '../../../../nls.js';
+import { Language, LANGUAGE_DEFAULT } from '../../../../base/common/platform.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { ILanguagePackItem } from '../../../../platform/languagePacks/common/languagePacks.js';
+import { IActiveLanguagePackService, ILocaleService } from '../common/locale.js';
+import { IHostService } from '../../host/browser/host.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IExtensionGalleryService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+
+const localeStorage = new class LocaleStorage {
+
+	private static readonly LOCAL_STORAGE_LOCALE_KEY = 'vscode.nls.locale';
+	private static readonly LOCAL_STORAGE_EXTENSION_ID_KEY = 'vscode.nls.languagePackExtensionId';
+
+	setLocale(locale: string): void {
+		localStorage.setItem(LocaleStorage.LOCAL_STORAGE_LOCALE_KEY, locale);
+		this.doSetLocaleToCookie(locale);
+	}
+
+	private doSetLocaleToCookie(locale: string): void {
+		document.cookie = `${LocaleStorage.LOCAL_STORAGE_LOCALE_KEY}=${locale};path=/;max-age=3153600000`;
+	}
+
+	clearLocale(): void {
+		localStorage.removeItem(LocaleStorage.LOCAL_STORAGE_LOCALE_KEY);
+		this.doClearLocaleToCookie();
+	}
+
+	private doClearLocaleToCookie(): void {
+		document.cookie = `${LocaleStorage.LOCAL_STORAGE_LOCALE_KEY}=;path=/;max-age=0`;
+	}
+
+	setExtensionId(extensionId: string): void {
+		localStorage.setItem(LocaleStorage.LOCAL_STORAGE_EXTENSION_ID_KEY, extensionId);
+	}
+
+	getExtensionId(): string | null {
+		return localStorage.getItem(LocaleStorage.LOCAL_STORAGE_EXTENSION_ID_KEY);
+	}
+
+	clearExtensionId(): void {
+		localStorage.removeItem(LocaleStorage.LOCAL_STORAGE_EXTENSION_ID_KEY);
+	}
+};
 
 export class WebLocaleService implements ILocaleService {
+
 	declare readonly _serviceBrand: undefined;
-	static readonly _LOCAL_STORAGE_EXTENSION_ID_KEY = 'vscode.nls.languagePackExtensionId';
-	static readonly _LOCAL_STORAGE_LOCALE_KEY = 'vscode.nls.locale';
 
 	constructor(
 		@IDialogService private readonly dialogService: IDialogService,
@@ -32,13 +67,13 @@ export class WebLocaleService implements ILocaleService {
 			return;
 		}
 		if (locale) {
-			localStorage.setItem(WebLocaleService._LOCAL_STORAGE_LOCALE_KEY, locale);
+			localeStorage.setLocale(locale);
 			if (languagePackItem.extensionId) {
-				localStorage.setItem(WebLocaleService._LOCAL_STORAGE_EXTENSION_ID_KEY, languagePackItem.extensionId);
+				localeStorage.setExtensionId(languagePackItem.extensionId);
 			}
 		} else {
-			localStorage.removeItem(WebLocaleService._LOCAL_STORAGE_LOCALE_KEY);
-			localStorage.removeItem(WebLocaleService._LOCAL_STORAGE_EXTENSION_ID_KEY);
+			localeStorage.clearLocale();
+			localeStorage.clearExtensionId();
 		}
 
 		const restartDialog = await this.dialogService.confirm({
@@ -54,8 +89,8 @@ export class WebLocaleService implements ILocaleService {
 	}
 
 	async clearLocalePreference(): Promise<void> {
-		localStorage.removeItem(WebLocaleService._LOCAL_STORAGE_LOCALE_KEY);
-		localStorage.removeItem(WebLocaleService._LOCAL_STORAGE_EXTENSION_ID_KEY);
+		localeStorage.clearLocale();
+		localeStorage.clearExtensionId();
 
 		if (Language.value() === navigator.language.toLowerCase()) {
 			return;
@@ -87,7 +122,7 @@ class WebActiveLanguagePackService implements IActiveLanguagePackService {
 		if (language === LANGUAGE_DEFAULT) {
 			return undefined;
 		}
-		const extensionId = localStorage.getItem(WebLocaleService._LOCAL_STORAGE_EXTENSION_ID_KEY);
+		const extensionId = localeStorage.getExtensionId();
 		if (extensionId) {
 			return extensionId;
 		}
@@ -102,7 +137,7 @@ class WebActiveLanguagePackService implements IActiveLanguagePackService {
 			// Only install extensions that are published by Microsoft and start with vscode-language-pack for extra certainty
 			const extensionToInstall = tagResult.firstPage.find(e => e.publisher === 'MS-CEINTL' && e.name.startsWith('vscode-language-pack'));
 			if (extensionToInstall) {
-				localStorage.setItem(WebLocaleService._LOCAL_STORAGE_EXTENSION_ID_KEY, extensionToInstall.identifier.id);
+				localeStorage.setExtensionId(extensionToInstall.identifier.id);
 				return extensionToInstall.identifier.id;
 			}
 
diff --git a/src/vs/workbench/services/localization/common/locale.ts b/src/vs/workbench/services/localization/common/locale.ts
index f2adc50c917..87cbf00a7c7 100644
--- a/src/vs/workbench/services/localization/common/locale.ts
+++ b/src/vs/workbench/services/localization/common/locale.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ILanguagePackItem } from 'vs/platform/languagePacks/common/languagePacks';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILanguagePackItem } from '../../../../platform/languagePacks/common/languagePacks.js';
 
 export const ILocaleService = createDecorator<ILocaleService>('localizationService');
 
diff --git a/src/vs/workbench/services/localization/electron-sandbox/languagePackService.ts b/src/vs/workbench/services/localization/electron-sandbox/languagePackService.ts
index fd5d89c8574..5c07673518d 100644
--- a/src/vs/workbench/services/localization/electron-sandbox/languagePackService.ts
+++ b/src/vs/workbench/services/localization/electron-sandbox/languagePackService.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ILanguagePackService } from 'vs/platform/languagePacks/common/languagePacks';
-import { registerSharedProcessRemoteService } from 'vs/platform/ipc/electron-sandbox/services';
+import { ILanguagePackService } from '../../../../platform/languagePacks/common/languagePacks.js';
+import { registerSharedProcessRemoteService } from '../../../../platform/ipc/electron-sandbox/services.js';
 
 registerSharedProcessRemoteService(ILanguagePackService, 'languagePacks');
diff --git a/src/vs/workbench/services/localization/electron-sandbox/localeService.ts b/src/vs/workbench/services/localization/electron-sandbox/localeService.ts
index d7124758e38..20223417ff6 100644
--- a/src/vs/workbench/services/localization/electron-sandbox/localeService.ts
+++ b/src/vs/workbench/services/localization/electron-sandbox/localeService.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Language, LANGUAGE_DEFAULT } from 'vs/base/common/platform';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { IJSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditing';
-import { IActiveLanguagePackService, ILocaleService } from 'vs/workbench/services/localization/common/locale';
-import { ILanguagePackItem, ILanguagePackService } from 'vs/platform/languagePacks/common/languagePacks';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { IViewPaneContainer, ViewContainerLocation } from 'vs/workbench/common/views';
-import { IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
-import { localize } from 'vs/nls';
-import { toAction } from 'vs/base/common/actions';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { stripComments } from 'vs/base/common/stripComments';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { Language, LANGUAGE_DEFAULT } from '../../../../base/common/platform.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { IJSONEditingService } from '../../configuration/common/jsonEditing.js';
+import { IActiveLanguagePackService, ILocaleService } from '../common/locale.js';
+import { ILanguagePackItem, ILanguagePackService } from '../../../../platform/languagePacks/common/languagePacks.js';
+import { IPaneCompositePartService } from '../../panecomposite/browser/panecomposite.js';
+import { IViewPaneContainer, ViewContainerLocation } from '../../../common/views.js';
+import { IExtensionManagementService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { IProgressService, ProgressLocation } from '../../../../platform/progress/common/progress.js';
+import { localize } from '../../../../nls.js';
+import { toAction } from '../../../../base/common/actions.js';
+import { ITextFileService } from '../../textfile/common/textfiles.js';
+import { parse } from '../../../../base/common/jsonc.js';
+import { IEditorService } from '../../editor/common/editorService.js';
+import { IHostService } from '../../host/browser/host.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
 
 // duplicate of IExtensionsViewPaneContainer in contrib
 interface IExtensionsViewPaneContainer extends IViewPaneContainer {
@@ -57,7 +57,7 @@ class NativeLocaleService implements ILocaleService {
 
 			// This is the same logic that we do where argv.json is parsed so mirror that:
 			// https://github.com/microsoft/vscode/blob/32d40cf44e893e87ac33ac4f08de1e5f7fe077fc/src/main.js#L238-L246
-			JSON.parse(stripComments(content.value));
+			parse(content.value);
 		} catch (error) {
 			this.notificationService.notify({
 				severity: Severity.Error,
diff --git a/src/vs/workbench/services/log/electron-sandbox/logService.ts b/src/vs/workbench/services/log/electron-sandbox/logService.ts
index 31dbbf54143..31cd8e8b5b0 100644
--- a/src/vs/workbench/services/log/electron-sandbox/logService.ts
+++ b/src/vs/workbench/services/log/electron-sandbox/logService.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ConsoleLogger, ILogger } from 'vs/platform/log/common/log';
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
-import { LoggerChannelClient } from 'vs/platform/log/common/logIpc';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { localize } from 'vs/nls';
-import { windowLogId } from 'vs/workbench/services/log/common/logConstants';
-import { LogService } from 'vs/platform/log/common/logService';
+import { ConsoleLogger, ILogger } from '../../../../platform/log/common/log.js';
+import { INativeWorkbenchEnvironmentService } from '../../environment/electron-sandbox/environmentService.js';
+import { LoggerChannelClient } from '../../../../platform/log/common/logIpc.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { localize } from '../../../../nls.js';
+import { windowLogId } from '../common/logConstants.js';
+import { LogService } from '../../../../platform/log/common/logService.js';
 
 export class NativeLogService extends LogService {
 
diff --git a/src/vs/workbench/services/menubar/electron-sandbox/menubarService.ts b/src/vs/workbench/services/menubar/electron-sandbox/menubarService.ts
index 7a00d4c19ac..7b00164b381 100644
--- a/src/vs/workbench/services/menubar/electron-sandbox/menubarService.ts
+++ b/src/vs/workbench/services/menubar/electron-sandbox/menubarService.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IMenubarService } from 'vs/platform/menubar/electron-sandbox/menubar';
-import { registerMainProcessRemoteService } from 'vs/platform/ipc/electron-sandbox/services';
+import { IMenubarService } from '../../../../platform/menubar/electron-sandbox/menubar.js';
+import { registerMainProcessRemoteService } from '../../../../platform/ipc/electron-sandbox/services.js';
 
 registerMainProcessRemoteService(IMenubarService, 'menubar');
diff --git a/src/vs/workbench/services/model/common/modelService.ts b/src/vs/workbench/services/model/common/modelService.ts
index 570f72df42d..62c37434487 100644
--- a/src/vs/workbench/services/model/common/modelService.ts
+++ b/src/vs/workbench/services/model/common/modelService.ts
@@ -3,27 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ModelService } from 'vs/editor/common/services/modelService';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfiguration';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
+import { URI } from '../../../../base/common/uri.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ModelService } from '../../../../editor/common/services/modelService.js';
+import { ITextResourcePropertiesService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IUndoRedoService } from '../../../../platform/undoRedo/common/undoRedo.js';
+import { IPathService } from '../../path/common/pathService.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 
 export class WorkbenchModelService extends ModelService {
 	constructor(
 		@IConfigurationService configurationService: IConfigurationService,
 		@ITextResourcePropertiesService resourcePropertiesService: ITextResourcePropertiesService,
 		@IUndoRedoService undoRedoService: IUndoRedoService,
-		@ILanguageConfigurationService languageConfigurationService: ILanguageConfigurationService,
-		@ILanguageService languageService: ILanguageService,
 		@IPathService private readonly _pathService: IPathService,
+		@IInstantiationService instantiationService: IInstantiationService,
 	) {
-		super(configurationService, resourcePropertiesService, undoRedoService, languageService, languageConfigurationService);
+		super(configurationService, resourcePropertiesService, undoRedoService, instantiationService);
 	}
 
 	protected override _schemaShouldMaintainUndoRedoElements(resource: URI) {
diff --git a/src/vs/workbench/services/notebook/common/notebookDocumentService.ts b/src/vs/workbench/services/notebook/common/notebookDocumentService.ts
index 96af748ef50..44226f33ebb 100644
--- a/src/vs/workbench/services/notebook/common/notebookDocumentService.ts
+++ b/src/vs/workbench/services/notebook/common/notebookDocumentService.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer, decodeBase64, encodeBase64 } from 'vs/base/common/buffer';
-import { ResourceMap } from 'vs/base/common/map';
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { VSBuffer, decodeBase64, encodeBase64 } from '../../../../base/common/buffer.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { URI } from '../../../../base/common/uri.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 
 export const INotebookDocumentService = createDecorator<INotebookDocumentService>('notebookDocumentService');
 
@@ -51,6 +51,21 @@ export function generate(notebook: URI, handle: number): URI {
 	return notebook.with({ scheme: Schemas.vscodeNotebookCell, fragment });
 }
 
+export function parseMetadataUri(metadata: URI): URI | undefined {
+	if (metadata.scheme !== Schemas.vscodeNotebookMetadata) {
+		return undefined;
+	}
+
+	const _scheme = decodeBase64(metadata.fragment).toString();
+
+	return metadata.with({ scheme: _scheme, fragment: null });
+}
+
+export function generateMetadataUri(notebook: URI): URI {
+	const fragment = `${encodeBase64(VSBuffer.fromString(notebook.scheme), true, true)}`;
+	return notebook.with({ scheme: Schemas.vscodeNotebookMetadata, fragment });
+}
+
 export interface INotebookDocumentService {
 	readonly _serviceBrand: undefined;
 
diff --git a/src/vs/workbench/services/notification/common/notificationService.ts b/src/vs/workbench/services/notification/common/notificationService.ts
index 7187d881639..151edfccf9f 100644
--- a/src/vs/workbench/services/notification/common/notificationService.ts
+++ b/src/vs/workbench/services/notification/common/notificationService.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { INotificationService, INotification, INotificationHandle, Severity, NotificationMessage, INotificationActions, IPromptChoice, IPromptOptions, IStatusMessageOptions, NoOpNotification, NeverShowAgainScope, NotificationsFilter, INeverShowAgainOptions, INotificationSource, INotificationSourceFilter, isNotificationSource } from 'vs/platform/notification/common/notification';
-import { NotificationsModel, ChoiceAction, NotificationChangeType } from 'vs/workbench/common/notifications';
-import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { Emitter, Event } from 'vs/base/common/event';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IAction, Action } from 'vs/base/common/actions';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
+import { localize } from '../../../../nls.js';
+import { INotificationService, INotification, INotificationHandle, Severity, NotificationMessage, INotificationActions, IPromptChoice, IPromptOptions, IStatusMessageOptions, NoOpNotification, NeverShowAgainScope, NotificationsFilter, INeverShowAgainOptions, INotificationSource, INotificationSourceFilter, isNotificationSource } from '../../../../platform/notification/common/notification.js';
+import { NotificationsModel, ChoiceAction, NotificationChangeType } from '../../../common/notifications.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IAction, Action } from '../../../../base/common/actions.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 
 export class NotificationService extends Disposable implements INotificationService {
 
diff --git a/src/vs/workbench/services/outline/browser/outline.ts b/src/vs/workbench/services/outline/browser/outline.ts
index 4a30a3a206d..56d7b77183f 100644
--- a/src/vs/workbench/services/outline/browser/outline.ts
+++ b/src/vs/workbench/services/outline/browser/outline.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { IDataSource, ITreeRenderer } from 'vs/base/browser/ui/tree/tree';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Event } from 'vs/base/common/event';
-import { FuzzyScore } from 'vs/base/common/filters';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { IEditorOptions } from 'vs/platform/editor/common/editor';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IWorkbenchDataTreeOptions } from 'vs/platform/list/browser/listService';
-import { IEditorPane } from 'vs/workbench/common/editor';
+import { IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
+import { IDataSource, ITreeRenderer } from '../../../../base/browser/ui/tree/tree.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Event } from '../../../../base/common/event.js';
+import { FuzzyScore } from '../../../../base/common/filters.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IWorkbenchDataTreeOptions } from '../../../../platform/list/browser/listService.js';
+import { IEditorPane } from '../../../common/editor.js';
 
 export const IOutlineService = createDecorator<IOutlineService>('IOutlineService');
 
diff --git a/src/vs/workbench/services/outline/browser/outlineService.ts b/src/vs/workbench/services/outline/browser/outlineService.ts
index f4707432371..e9077d5f226 100644
--- a/src/vs/workbench/services/outline/browser/outlineService.ts
+++ b/src/vs/workbench/services/outline/browser/outlineService.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { LinkedList } from 'vs/base/common/linkedList';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IEditorPane } from 'vs/workbench/common/editor';
-import { IOutline, IOutlineCreator, IOutlineService, OutlineTarget } from 'vs/workbench/services/outline/browser/outline';
-import { Event, Emitter } from 'vs/base/common/event';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { LinkedList } from '../../../../base/common/linkedList.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IEditorPane } from '../../../common/editor.js';
+import { IOutline, IOutlineCreator, IOutlineService, OutlineTarget } from './outline.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
 
 class OutlineService implements IOutlineService {
 
diff --git a/src/vs/workbench/services/output/common/delayedLogChannel.ts b/src/vs/workbench/services/output/common/delayedLogChannel.ts
index 0b8f54aefa5..970133f266a 100644
--- a/src/vs/workbench/services/output/common/delayedLogChannel.ts
+++ b/src/vs/workbench/services/output/common/delayedLogChannel.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ILogger, ILoggerService, log, LogLevel } from 'vs/platform/log/common/log';
-import { URI } from 'vs/base/common/uri';
+import { ILogger, ILoggerService, log, LogLevel } from '../../../../platform/log/common/log.js';
+import { URI } from '../../../../base/common/uri.js';
 
 export class DelayedLogChannel {
 
diff --git a/src/vs/workbench/services/output/common/output.ts b/src/vs/workbench/services/output/common/output.ts
index 25ec20fe32d..c43058f7970 100644
--- a/src/vs/workbench/services/output/common/output.ts
+++ b/src/vs/workbench/services/output/common/output.ts
@@ -3,22 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event, Emitter } from 'vs/base/common/event';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { URI } from '../../../../base/common/uri.js';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 
 /**
  * Mime type used by the output editor.
  */
 export const OUTPUT_MIME = 'text/x-code-output';
 
-/**
- * Output resource scheme.
- */
-export const OUTPUT_SCHEME = 'output';
-
 /**
  * Id used by the output editor.
  */
diff --git a/src/vs/workbench/services/panecomposite/browser/panecomposite.ts b/src/vs/workbench/services/panecomposite/browser/panecomposite.ts
index 0af1852d31a..c1d430b878a 100644
--- a/src/vs/workbench/services/panecomposite/browser/panecomposite.ts
+++ b/src/vs/workbench/services/panecomposite/browser/panecomposite.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { Event } from 'vs/base/common/event';
-import { PaneCompositeDescriptor } from 'vs/workbench/browser/panecomposite';
-import { IProgressIndicator } from 'vs/platform/progress/common/progress';
-import { IPaneComposite } from 'vs/workbench/common/panecomposite';
-import { ViewContainerLocation } from 'vs/workbench/common/views';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { Event } from '../../../../base/common/event.js';
+import { PaneCompositeDescriptor } from '../../../browser/panecomposite.js';
+import { IProgressIndicator } from '../../../../platform/progress/common/progress.js';
+import { IPaneComposite } from '../../../common/panecomposite.js';
+import { ViewContainerLocation } from '../../../common/views.js';
 
 export const IPaneCompositePartService = createDecorator<IPaneCompositePartService>('paneCompositePartService');
 
diff --git a/src/vs/workbench/services/path/browser/pathService.ts b/src/vs/workbench/services/path/browser/pathService.ts
index 664884d60ba..ac35093bc65 100644
--- a/src/vs/workbench/services/path/browser/pathService.ts
+++ b/src/vs/workbench/services/path/browser/pathService.ts
@@ -3,14 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { IPathService, AbstractPathService } from 'vs/workbench/services/path/common/pathService';
-import { URI } from 'vs/base/common/uri';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { firstOrDefault } from 'vs/base/common/arrays';
-import { dirname } from 'vs/base/common/resources';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IRemoteAgentService } from '../../remote/common/remoteAgentService.js';
+import { IPathService, AbstractPathService } from '../common/pathService.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { dirname } from '../../../../base/common/resources.js';
 
 export class BrowserPathService extends AbstractPathService {
 
@@ -37,7 +36,7 @@ function guessLocalUserHome(environmentService: IWorkbenchEnvironmentService, co
 
 	const workspace = contextService.getWorkspace();
 
-	const firstFolder = firstOrDefault(workspace.folders);
+	const firstFolder = workspace.folders.at(0);
 	if (firstFolder) {
 		return firstFolder.uri;
 	}
diff --git a/src/vs/workbench/services/path/common/pathService.ts b/src/vs/workbench/services/path/common/pathService.ts
index 83baa4126b0..3afbbbbed55 100644
--- a/src/vs/workbench/services/path/common/pathService.ts
+++ b/src/vs/workbench/services/path/common/pathService.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isValidBasename } from 'vs/base/common/extpath';
-import { Schemas } from 'vs/base/common/network';
-import { IPath, win32, posix } from 'vs/base/common/path';
-import { OperatingSystem, OS } from 'vs/base/common/platform';
-import { basename } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { getVirtualWorkspaceScheme } from 'vs/platform/workspace/common/virtualWorkspace';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
+import { isValidBasename } from '../../../../base/common/extpath.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { IPath, win32, posix } from '../../../../base/common/path.js';
+import { OperatingSystem, OS } from '../../../../base/common/platform.js';
+import { basename } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { getVirtualWorkspaceScheme } from '../../../../platform/workspace/common/virtualWorkspace.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { IRemoteAgentService } from '../../remote/common/remoteAgentService.js';
 
 export const IPathService = createDecorator<IPathService>('pathService');
 
diff --git a/src/vs/workbench/services/path/electron-sandbox/pathService.ts b/src/vs/workbench/services/path/electron-sandbox/pathService.ts
index 7888fc6ab71..b2fbd6d92dd 100644
--- a/src/vs/workbench/services/path/electron-sandbox/pathService.ts
+++ b/src/vs/workbench/services/path/electron-sandbox/pathService.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
-import { IPathService, AbstractPathService } from 'vs/workbench/services/path/common/pathService';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IRemoteAgentService } from '../../remote/common/remoteAgentService.js';
+import { INativeWorkbenchEnvironmentService } from '../../environment/electron-sandbox/environmentService.js';
+import { IPathService, AbstractPathService } from '../common/pathService.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
 
 export class NativePathService extends AbstractPathService {
 
diff --git a/src/vs/workbench/services/preferences/browser/keybindingsEditorInput.ts b/src/vs/workbench/services/preferences/browser/keybindingsEditorInput.ts
index b2ef013aeb0..8f02ced1249 100644
--- a/src/vs/workbench/services/preferences/browser/keybindingsEditorInput.ts
+++ b/src/vs/workbench/services/preferences/browser/keybindingsEditorInput.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from 'vs/base/common/codicons';
-import { OS } from 'vs/base/common/platform';
-import { ThemeIcon } from 'vs/base/common/themables';
-import * as nls from 'vs/nls';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { IUntypedEditorInput } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { KeybindingsEditorModel } from 'vs/workbench/services/preferences/browser/keybindingsEditorModel';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { OS } from '../../../../base/common/platform.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import * as nls from '../../../../nls.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { IUntypedEditorInput } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { KeybindingsEditorModel } from './keybindingsEditorModel.js';
 
 export interface IKeybindingsEditorSearchOptions {
 	searchValue: string;
diff --git a/src/vs/workbench/services/preferences/browser/keybindingsEditorModel.ts b/src/vs/workbench/services/preferences/browser/keybindingsEditorModel.ts
index f342e5dabd1..6f20836a584 100644
--- a/src/vs/workbench/services/preferences/browser/keybindingsEditorModel.ts
+++ b/src/vs/workbench/services/preferences/browser/keybindingsEditorModel.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { distinct, coalesce } from 'vs/base/common/arrays';
-import * as strings from 'vs/base/common/strings';
-import { OperatingSystem, Language } from 'vs/base/common/platform';
-import { IMatch, IFilter, or, matchesContiguousSubString, matchesPrefix, matchesCamelCase, matchesWords } from 'vs/base/common/filters';
-import { ResolvedKeybinding, ResolvedChord } from 'vs/base/common/keybindings';
-import { AriaLabelProvider, UserSettingsLabelProvider, UILabelProvider, ModifierLabels as ModLabels } from 'vs/base/common/keybindingLabels';
-import { MenuRegistry } from 'vs/platform/actions/common/actions';
-import { EditorModel } from 'vs/workbench/common/editor/editorModel';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
-import { getAllUnboundCommands } from 'vs/workbench/services/keybinding/browser/unboundCommands';
-import { IKeybindingItemEntry, KeybindingMatches, KeybindingMatch, IKeybindingItem } from 'vs/workbench/services/preferences/common/preferences';
-import { ICommandAction, ILocalizedString } from 'vs/platform/action/common/action';
-import { isEmptyObject, isString } from 'vs/base/common/types';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { ExtensionIdentifier, ExtensionIdentifierMap, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
+import { localize } from '../../../../nls.js';
+import { distinct, coalesce } from '../../../../base/common/arrays.js';
+import * as strings from '../../../../base/common/strings.js';
+import { OperatingSystem, Language } from '../../../../base/common/platform.js';
+import { IMatch, IFilter, or, matchesContiguousSubString, matchesPrefix, matchesCamelCase, matchesWords } from '../../../../base/common/filters.js';
+import { ResolvedKeybinding, ResolvedChord } from '../../../../base/common/keybindings.js';
+import { AriaLabelProvider, UserSettingsLabelProvider, UILabelProvider, ModifierLabels as ModLabels } from '../../../../base/common/keybindingLabels.js';
+import { MenuRegistry } from '../../../../platform/actions/common/actions.js';
+import { EditorModel } from '../../../common/editor/editorModel.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { ResolvedKeybindingItem } from '../../../../platform/keybinding/common/resolvedKeybindingItem.js';
+import { getAllUnboundCommands } from '../../keybinding/browser/unboundCommands.js';
+import { IKeybindingItemEntry, KeybindingMatches, KeybindingMatch, IKeybindingItem } from '../common/preferences.js';
+import { ICommandAction, ILocalizedString } from '../../../../platform/action/common/action.js';
+import { isEmptyObject, isString } from '../../../../base/common/types.js';
+import { IExtensionService } from '../../extensions/common/extensions.js';
+import { ExtensionIdentifier, ExtensionIdentifierMap, IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 
 export const KEYBINDING_ENTRY_TEMPLATE_ID = 'keybinding.entry.template';
 
@@ -85,7 +85,7 @@ export class KeybindingsEditorModel extends EditorModel {
 				}
 			}
 
-			return filteredKeybindingItems.map(keybindingItem => (<IKeybindingItemEntry>{ id: KeybindingsEditorModel.getId(keybindingItem), keybindingItem, templateId: KEYBINDING_ENTRY_TEMPLATE_ID }));
+			return filteredKeybindingItems.map((keybindingItem): IKeybindingItemEntry => ({ id: KeybindingsEditorModel.getId(keybindingItem), keybindingItem, templateId: KEYBINDING_ENTRY_TEMPLATE_ID }));
 		}
 
 		// @source:SOURCE
@@ -110,7 +110,7 @@ export class KeybindingsEditorModel extends EditorModel {
 
 		searchValue = searchValue.trim();
 		if (!searchValue) {
-			return keybindingItems.map(keybindingItem => (<IKeybindingItemEntry>{ id: KeybindingsEditorModel.getId(keybindingItem), keybindingItem, templateId: KEYBINDING_ENTRY_TEMPLATE_ID }));
+			return keybindingItems.map((keybindingItem): IKeybindingItemEntry => ({ id: KeybindingsEditorModel.getId(keybindingItem), keybindingItem, templateId: KEYBINDING_ENTRY_TEMPLATE_ID }));
 		}
 
 		return this.filterByText(keybindingItems, searchValue);
diff --git a/src/vs/workbench/services/preferences/browser/preferencesService.ts b/src/vs/workbench/services/preferences/browser/preferencesService.ts
index 1d8f6e0ebdc..025cc02e964 100644
--- a/src/vs/workbench/services/preferences/browser/preferencesService.ts
+++ b/src/vs/workbench/services/preferences/browser/preferencesService.ts
@@ -3,48 +3,51 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getErrorMessage } from 'vs/base/common/errors';
-import { Emitter } from 'vs/base/common/event';
-import { parse } from 'vs/base/common/json';
-import { Disposable } from 'vs/base/common/lifecycle';
-import * as network from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { CoreEditingCommands } from 'vs/editor/browser/coreCommands';
-import { getCodeEditor, ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IPosition } from 'vs/editor/common/core/position';
-import { ITextModel } from 'vs/editor/common/model';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import * as nls from 'vs/nls';
-import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { Extensions, getDefaultValue, IConfigurationRegistry, OVERRIDE_PROPERTY_REGEX } from 'vs/platform/configuration/common/configurationRegistry';
-import { FileOperationError, FileOperationResult } from 'vs/platform/files/common/files';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { DEFAULT_EDITOR_ASSOCIATION, IEditorPane } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditorInput';
-import { TextResourceEditorInput } from 'vs/workbench/common/editor/textResourceEditorInput';
-import { IJSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditing';
-import { GroupDirection, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorService, SIDE_GROUP, SIDE_GROUP_TYPE } from 'vs/workbench/services/editor/common/editorService';
-import { KeybindingsEditorInput } from 'vs/workbench/services/preferences/browser/keybindingsEditorInput';
-import { DEFAULT_SETTINGS_EDITOR_SETTING, FOLDER_SETTINGS_PATH, IKeybindingsEditorOptions, IKeybindingsEditorPane, IOpenSettingsOptions, IPreferencesEditorModel, IPreferencesService, ISetting, ISettingsEditorOptions, USE_SPLIT_JSON_SETTING, validateSettingsEditorOptions } from 'vs/workbench/services/preferences/common/preferences';
-import { SettingsEditor2Input } from 'vs/workbench/services/preferences/common/preferencesEditorInput';
-import { defaultKeybindingsContents, DefaultKeybindingsEditorModel, DefaultRawSettingsEditorModel, DefaultSettings, DefaultSettingsEditorModel, Settings2EditorModel, SettingsEditorModel, WorkspaceConfigurationEditorModel } from 'vs/workbench/services/preferences/common/preferencesModels';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { ITextEditorService } from 'vs/workbench/services/textfile/common/textEditorService';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { isObject } from 'vs/base/common/types';
-import { SuggestController } from 'vs/editor/contrib/suggest/browser/suggestController';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { getErrorMessage } from '../../../../base/common/errors.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { parse } from '../../../../base/common/json.js';
+import { Disposable, IDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import * as network from '../../../../base/common/network.js';
+import { URI } from '../../../../base/common/uri.js';
+import { CoreEditingCommands } from '../../../../editor/browser/coreCommands.js';
+import { getCodeEditor, ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { IPosition } from '../../../../editor/common/core/position.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import * as nls from '../../../../nls.js';
+import { ConfigurationTarget, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { Extensions, getDefaultValue, IConfigurationRegistry, OVERRIDE_PROPERTY_REGEX } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { FileOperationError, FileOperationResult } from '../../../../platform/files/common/files.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IWorkspaceContextService, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { DEFAULT_EDITOR_ASSOCIATION, IEditorPane } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
+import { IJSONEditingService } from '../../configuration/common/jsonEditing.js';
+import { GroupDirection, IEditorGroupsService } from '../../editor/common/editorGroupsService.js';
+import { IEditorService, SIDE_GROUP, SIDE_GROUP_TYPE } from '../../editor/common/editorService.js';
+import { KeybindingsEditorInput } from './keybindingsEditorInput.js';
+import { DEFAULT_SETTINGS_EDITOR_SETTING, FOLDER_SETTINGS_PATH, IKeybindingsEditorOptions, IKeybindingsEditorPane, IOpenSettingsOptions, IPreferencesEditorModel, IPreferencesService, ISetting, ISettingsEditorOptions, ISettingsGroup, SETTINGS_AUTHORITY, USE_SPLIT_JSON_SETTING, validateSettingsEditorOptions } from '../common/preferences.js';
+import { SettingsEditor2Input } from '../common/preferencesEditorInput.js';
+import { defaultKeybindingsContents, DefaultKeybindingsEditorModel, DefaultRawSettingsEditorModel, DefaultSettings, DefaultSettingsEditorModel, Settings2EditorModel, SettingsEditorModel, WorkspaceConfigurationEditorModel } from '../common/preferencesModels.js';
+import { IRemoteAgentService } from '../../remote/common/remoteAgentService.js';
+import { ITextEditorService } from '../../textfile/common/textEditorService.js';
+import { ITextFileService } from '../../textfile/common/textfiles.js';
+import { isObject } from '../../../../base/common/types.js';
+import { SuggestController } from '../../../../editor/contrib/suggest/browser/suggestController.js';
+import { IUserDataProfileService } from '../../userDataProfile/common/userDataProfile.js';
+import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { ResourceSet } from '../../../../base/common/map.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { IURLService } from '../../../../platform/url/common/url.js';
+import { compareIgnoreCase } from '../../../../base/common/strings.js';
+import { IExtensionService } from '../../extensions/common/extensions.js';
+import { IProgressService, ProgressLocation } from '../../../../platform/progress/common/progress.js';
 
 const emptyEditableSettingsContent = '{\n}';
 
@@ -54,10 +57,19 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 
 	private readonly _onDispose = this._register(new Emitter<void>());
 
+	private readonly _onDidDefaultSettingsContentChanged = this._register(new Emitter<URI>());
+	readonly onDidDefaultSettingsContentChanged = this._onDidDefaultSettingsContentChanged.event;
+
 	private _defaultUserSettingsContentModel: DefaultSettings | undefined;
 	private _defaultWorkspaceSettingsContentModel: DefaultSettings | undefined;
 	private _defaultFolderSettingsContentModel: DefaultSettings | undefined;
 
+	private _defaultRawSettingsEditorModel: DefaultRawSettingsEditorModel | undefined;
+
+	private readonly _requestedDefaultSettings = new ResourceSet();
+
+	private _settingsGroups: ISettingsGroup[] | undefined = undefined;
+
 	constructor(
 		@IEditorService private readonly editorService: IEditorService,
 		@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService,
@@ -70,12 +82,14 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		@IUserDataProfilesService private readonly userDataProfilesService: IUserDataProfilesService,
 		@ITextModelService private readonly textModelResolverService: ITextModelService,
 		@IKeybindingService keybindingService: IKeybindingService,
-		@IModelService private readonly modelService: IModelService,
+		@IModelService modelService: IModelService,
 		@IJSONEditingService private readonly jsonEditingService: IJSONEditingService,
-		@ILanguageService private readonly languageService: ILanguageService,
 		@ILabelService private readonly labelService: ILabelService,
 		@IRemoteAgentService private readonly remoteAgentService: IRemoteAgentService,
-		@ITextEditorService private readonly textEditorService: ITextEditorService
+		@ITextEditorService private readonly textEditorService: ITextEditorService,
+		@IURLService urlService: IURLService,
+		@IExtensionService private readonly extensionService: IExtensionService,
+		@IProgressService private readonly progressService: IProgressService
 	) {
 		super();
 		// The default keybindings.json updates based on keyboard layouts, so here we make sure
@@ -88,6 +102,8 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 			}
 			modelService.updateModel(model, defaultKeybindingsContents(keybindingService));
 		}));
+
+		this._register(urlService.registerHandler(this));
 	}
 
 	readonly defaultKeybindingsResource = URI.from({ scheme: network.Schemas.vscode, authority: 'defaultsettings', path: '/keybindings.json' });
@@ -114,52 +130,39 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		return folder ? folder.toResource(FOLDER_SETTINGS_PATH) : null;
 	}
 
-	resolveModel(uri: URI): ITextModel | null {
+	hasDefaultSettingsContent(uri: URI): boolean {
+		return this.isDefaultSettingsResource(uri) || isEqual(uri, this.defaultSettingsRawResource) || isEqual(uri, this.defaultKeybindingsResource);
+	}
+
+	getDefaultSettingsContent(uri: URI): string | undefined {
 		if (this.isDefaultSettingsResource(uri)) {
 			// We opened a split json editor in this case,
 			// and this half shows the default settings.
+
 			const target = this.getConfigurationTargetFromDefaultSettingsResource(uri);
-			const languageSelection = this.languageService.createById('jsonc');
-			const model = this._register(this.modelService.createModel('', languageSelection, uri));
+			const defaultSettings = this.getDefaultSettings(target);
 
-			let defaultSettings: DefaultSettings | undefined;
-			this.configurationService.onDidChangeConfiguration(e => {
-				if (e.source === ConfigurationTarget.DEFAULT) {
-					const model = this.modelService.getModel(uri);
-					if (!model) {
-						// model has not been given out => nothing to do
-						return;
-					}
-					defaultSettings = this.getDefaultSettings(target);
-					this.modelService.updateModel(model, defaultSettings.getContentWithoutMostCommonlyUsed(true));
-					defaultSettings._onDidChange.fire();
-				}
-			});
-
-			// Check if Default settings is already created and updated in above promise
-			if (!defaultSettings) {
-				defaultSettings = this.getDefaultSettings(target);
-				this.modelService.updateModel(model, defaultSettings.getContentWithoutMostCommonlyUsed(true));
+			if (!this._requestedDefaultSettings.has(uri)) {
+				this._register(defaultSettings.onDidChange(() => this._onDidDefaultSettingsContentChanged.fire(uri)));
+				this._requestedDefaultSettings.add(uri);
 			}
-
-			return model;
+			return defaultSettings.getContentWithoutMostCommonlyUsed(true);
 		}
 
-		if (this.defaultSettingsRawResource.toString() === uri.toString()) {
-			const defaultRawSettingsEditorModel = this.instantiationService.createInstance(DefaultRawSettingsEditorModel, this.getDefaultSettings(ConfigurationTarget.USER_LOCAL));
-			const languageSelection = this.languageService.createById('jsonc');
-			const model = this._register(this.modelService.createModel(defaultRawSettingsEditorModel.content, languageSelection, uri));
-			return model;
+		if (isEqual(uri, this.defaultSettingsRawResource)) {
+			if (!this._defaultRawSettingsEditorModel) {
+				this._defaultRawSettingsEditorModel = this._register(this.instantiationService.createInstance(DefaultRawSettingsEditorModel, this.getDefaultSettings(ConfigurationTarget.USER_LOCAL)));
+				this._register(this._defaultRawSettingsEditorModel.onDidContentChanged(() => this._onDidDefaultSettingsContentChanged.fire(uri)));
+			}
+			return this._defaultRawSettingsEditorModel.content;
 		}
 
-		if (this.defaultKeybindingsResource.toString() === uri.toString()) {
+		if (isEqual(uri, this.defaultKeybindingsResource)) {
 			const defaultKeybindingsEditorModel = this.instantiationService.createInstance(DefaultKeybindingsEditorModel, uri);
-			const languageSelection = this.languageService.createById('jsonc');
-			const model = this._register(this.modelService.createModel(defaultKeybindingsEditorModel.content, languageSelection, uri));
-			return model;
+			return defaultKeybindingsEditorModel.content;
 		}
 
-		return null;
+		return undefined;
 	}
 
 	public async createPreferencesEditorModel(uri: URI): Promise<IPreferencesEditorModel<ISetting> | null> {
@@ -374,7 +377,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 
 	public createSplitJsonEditorInput(configurationTarget: ConfigurationTarget, resource: URI): EditorInput {
 		const editableSettingsEditorInput = this.textEditorService.createTextEditor({ resource });
-		const defaultPreferencesEditorInput = this.instantiationService.createInstance(TextResourceEditorInput, this.getDefaultSettingsResource(configurationTarget), undefined, undefined, undefined, undefined);
+		const defaultPreferencesEditorInput = this.textEditorService.createTextEditor({ resource: this.getDefaultSettingsResource(configurationTarget) });
 		return this.instantiationService.createInstance(SideBySideEditorInput, editableSettingsEditorInput.getName(), undefined, defaultPreferencesEditorInput, editableSettingsEditorInput);
 	}
 
@@ -440,14 +443,14 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 
 	private getDefaultSettings(target: ConfigurationTarget): DefaultSettings {
 		if (target === ConfigurationTarget.WORKSPACE) {
-			this._defaultWorkspaceSettingsContentModel ??= this._register(new DefaultSettings(this.getMostCommonlyUsedSettings(), target));
+			this._defaultWorkspaceSettingsContentModel ??= this._register(new DefaultSettings(this.getMostCommonlyUsedSettings(), target, this.configurationService));
 			return this._defaultWorkspaceSettingsContentModel;
 		}
 		if (target === ConfigurationTarget.WORKSPACE_FOLDER) {
-			this._defaultFolderSettingsContentModel ??= this._register(new DefaultSettings(this.getMostCommonlyUsedSettings(), target));
+			this._defaultFolderSettingsContentModel ??= this._register(new DefaultSettings(this.getMostCommonlyUsedSettings(), target, this.configurationService));
 			return this._defaultFolderSettingsContentModel;
 		}
-		this._defaultUserSettingsContentModel ??= this._register(new DefaultSettings(this.getMostCommonlyUsedSettings(), target));
+		this._defaultUserSettingsContentModel ??= this._register(new DefaultSettings(this.getMostCommonlyUsedSettings(), target, this.configurationService));
 		return this._defaultUserSettingsContentModel;
 	}
 
@@ -593,6 +596,65 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		return position;
 	}
 
+	getSetting(settingId: string): ISetting | undefined {
+		if (!this._settingsGroups) {
+			const defaultSettings = this.getDefaultSettings(ConfigurationTarget.USER);
+			const defaultsChangedDisposable: MutableDisposable<IDisposable> = this._register(new MutableDisposable());
+			defaultsChangedDisposable.value = defaultSettings.onDidChange(() => {
+				this._settingsGroups = undefined;
+				defaultsChangedDisposable.clear();
+			});
+			this._settingsGroups = defaultSettings.getSettingsGroups();
+		}
+
+		for (const group of this._settingsGroups) {
+			for (const section of group.sections) {
+				for (const setting of section.settings) {
+					if (compareIgnoreCase(setting.key, settingId) === 0) {
+						return setting;
+					}
+				}
+			}
+		}
+		return undefined;
+	}
+
+	/**
+	 * Should be of the format:
+	 * 	code://settings/settingName
+	 * Examples:
+	 * 	code://settings/files.autoSave
+	 *
+	 */
+	async handleURL(uri: URI): Promise<boolean> {
+		if (compareIgnoreCase(uri.authority, SETTINGS_AUTHORITY) !== 0) {
+			return false;
+		}
+
+		const settingInfo = uri.path.split('/').filter(part => !!part);
+		const settingId = ((settingInfo.length > 0) ? settingInfo[0] : undefined);
+		if (!settingId) {
+			this.openSettings();
+			return true;
+		}
+
+		let setting = this.getSetting(settingId);
+
+		if (!setting && this.extensionService.extensions.length === 0) {
+			// wait for extension points to be processed
+			await this.progressService.withProgress({ location: ProgressLocation.Window }, () => Event.toPromise(this.extensionService.onDidRegisterExtensions));
+			setting = this.getSetting(settingId);
+		}
+
+		const openSettingsOptions: IOpenSettingsOptions = {};
+		if (setting) {
+			openSettingsOptions.query = settingId;
+		}
+
+		this.openSettings(openSettingsOptions);
+		return true;
+	}
+
 	public override dispose(): void {
 		this._onDispose.fire();
 		super.dispose();
diff --git a/src/vs/workbench/services/preferences/common/preferences.ts b/src/vs/workbench/services/preferences/common/preferences.ts
index 62f01555ef0..ee091a58ea8 100644
--- a/src/vs/workbench/services/preferences/common/preferences.ts
+++ b/src/vs/workbench/services/preferences/common/preferences.ts
@@ -3,24 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IStringDictionary } from 'vs/base/common/collections';
-import { Event } from 'vs/base/common/event';
-import { IMatch } from 'vs/base/common/filters';
-import { IJSONSchema, IJSONSchemaMap } from 'vs/base/common/jsonSchema';
-import { ResolvedKeybinding } from 'vs/base/common/keybindings';
-import { URI } from 'vs/base/common/uri';
-import { IRange } from 'vs/editor/common/core/range';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { ITextModel } from 'vs/editor/common/model';
-import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
-import { ConfigurationScope, EditPresentationTypes, IExtensionInfo } from 'vs/platform/configuration/common/configurationRegistry';
-import { IEditorOptions } from 'vs/platform/editor/common/editor';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
-import { DEFAULT_EDITOR_ASSOCIATION, IEditorPane } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { Settings2EditorModel } from 'vs/workbench/services/preferences/common/preferencesModels';
+import { IStringDictionary } from '../../../../base/common/collections.js';
+import { Event } from '../../../../base/common/event.js';
+import { IMatch } from '../../../../base/common/filters.js';
+import { IJSONSchema, IJSONSchemaMap } from '../../../../base/common/jsonSchema.js';
+import { ResolvedKeybinding } from '../../../../base/common/keybindings.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IRange } from '../../../../editor/common/core/range.js';
+import { IEditorContribution } from '../../../../editor/common/editorCommon.js';
+import { ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
+import { ConfigurationDefaultValueSource, ConfigurationScope, EditPresentationTypes, IExtensionInfo } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { IEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { ResolvedKeybindingItem } from '../../../../platform/keybinding/common/resolvedKeybindingItem.js';
+import { DEFAULT_EDITOR_ASSOCIATION, IEditorPane } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { Settings2EditorModel } from './preferencesModels.js';
 
 export enum SettingValueType {
 	Null = 'null',
@@ -89,16 +88,14 @@ export interface ISetting {
 	extensionInfo?: IExtensionInfo;
 	validator?: (value: any) => string | null;
 	enumItemLabels?: string[];
-	allKeysAreBoolean?: boolean;
 	editPresentation?: EditPresentationTypes;
-	nonLanguageSpecificDefaultValueSource?: string | IExtensionInfo;
+	nonLanguageSpecificDefaultValueSource?: ConfigurationDefaultValueSource;
 	isLanguageTagSetting?: boolean;
 	categoryLabel?: string;
 
 	// Internal properties
+	allKeysAreBoolean?: boolean;
 	displayExtensionId?: string;
-	stableExtensionId?: string;
-	prereleaseExtensionId?: string;
 	title?: string;
 	extensionGroupTitle?: string;
 	internalOrder?: number;
@@ -238,12 +235,15 @@ export const IPreferencesService = createDecorator<IPreferencesService>('prefere
 export interface IPreferencesService {
 	readonly _serviceBrand: undefined;
 
+	readonly onDidDefaultSettingsContentChanged: Event<URI>;
+
 	userSettingsResource: URI;
 	workspaceSettingsResource: URI | null;
 	getFolderSettingsResource(resource: URI): URI | null;
 
 	createPreferencesEditorModel(uri: URI): Promise<IPreferencesEditorModel<ISetting> | null>;
-	resolveModel(uri: URI): ITextModel | null;
+	getDefaultSettingsContent(uri: URI): string | undefined;
+	hasDefaultSettingsContent(uri: URI): boolean;
 	createSettings2EditorModel(): Settings2EditorModel; // TODO
 
 	openRawDefaultSettings(): Promise<IEditorPane | undefined>;
@@ -257,6 +257,7 @@ export interface IPreferencesService {
 	openDefaultKeybindingsFile(): Promise<IEditorPane | undefined>;
 	openLanguageSpecificSettings(languageId: string, options?: IOpenSettingsOptions): Promise<IEditorPane | undefined>;
 	getEditableSettingsURI(configurationTarget: ConfigurationTarget, resource?: URI): Promise<URI | null>;
+	getSetting(settingId: string): ISetting | undefined;
 
 	createSplitJsonEditorInput(configurationTarget: ConfigurationTarget, resource: URI): EditorInput;
 }
@@ -329,3 +330,5 @@ export interface IDefineKeybindingEditorContribution extends IEditorContribution
 export const FOLDER_SETTINGS_PATH = '.vscode/settings.json';
 export const DEFAULT_SETTINGS_EDITOR_SETTING = 'workbench.settings.openDefaultSettings';
 export const USE_SPLIT_JSON_SETTING = 'workbench.settings.useSplitJSON';
+
+export const SETTINGS_AUTHORITY = 'settings';
diff --git a/src/vs/workbench/services/preferences/common/preferencesEditorInput.ts b/src/vs/workbench/services/preferences/common/preferencesEditorInput.ts
index 7d4d6a15abe..21000b0a316 100644
--- a/src/vs/workbench/services/preferences/common/preferencesEditorInput.ts
+++ b/src/vs/workbench/services/preferences/common/preferencesEditorInput.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from 'vs/base/common/codicons';
-import { Schemas } from 'vs/base/common/network';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { URI } from 'vs/base/common/uri';
-import * as nls from 'vs/nls';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { IUntypedEditorInput } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
-import { Settings2EditorModel } from 'vs/workbench/services/preferences/common/preferencesModels';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { URI } from '../../../../base/common/uri.js';
+import * as nls from '../../../../nls.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { IUntypedEditorInput } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { IPreferencesService } from './preferences.js';
+import { Settings2EditorModel } from './preferencesModels.js';
 
 const SettingsEditorIcon = registerIcon('settings-editor-label-icon', Codicon.settings, nls.localize('settingsEditorLabelIcon', 'Icon of the settings editor label.'));
 
diff --git a/src/vs/workbench/services/preferences/common/preferencesModels.ts b/src/vs/workbench/services/preferences/common/preferencesModels.ts
index 507844e02c8..e97874375fa 100644
--- a/src/vs/workbench/services/preferences/common/preferencesModels.ts
+++ b/src/vs/workbench/services/preferences/common/preferencesModels.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { tail, coalesce } from 'vs/base/common/arrays';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { Emitter, Event } from 'vs/base/common/event';
-import { JSONVisitor, visit } from 'vs/base/common/json';
-import { Disposable, IReference } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ITextModel } from 'vs/editor/common/model';
-import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { ITextEditorModel } from 'vs/editor/common/services/resolverService';
-import * as nls from 'vs/nls';
-import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ConfigurationScope, Extensions, IConfigurationNode, IConfigurationPropertySchema, IConfigurationRegistry, IExtensionInfo, IRegisteredConfigurationPropertySchema, OVERRIDE_PROPERTY_REGEX } from 'vs/platform/configuration/common/configurationRegistry';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { EditorModel } from 'vs/workbench/common/editor/editorModel';
-import { IFilterMetadata, IFilterResult, IGroupFilter, IKeybindingsEditorModel, ISearchResultGroup, ISetting, ISettingMatch, ISettingMatcher, ISettingsEditorModel, ISettingsGroup, SettingMatchType } from 'vs/workbench/services/preferences/common/preferences';
-import { FOLDER_SCOPES, WORKSPACE_SCOPES } from 'vs/workbench/services/configuration/common/configuration';
-import { createValidator } from 'vs/workbench/services/preferences/common/preferencesValidation';
+import { tail, coalesce } from '../../../../base/common/arrays.js';
+import { IStringDictionary } from '../../../../base/common/collections.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { JSONVisitor, visit } from '../../../../base/common/json.js';
+import { Disposable, IReference } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IRange, Range } from '../../../../editor/common/core/range.js';
+import { Selection } from '../../../../editor/common/core/selection.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { ISingleEditOperation } from '../../../../editor/common/core/editOperation.js';
+import { ITextEditorModel } from '../../../../editor/common/services/resolverService.js';
+import * as nls from '../../../../nls.js';
+import { ConfigurationTarget, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ConfigurationDefaultValueSource, ConfigurationScope, Extensions, IConfigurationNode, IConfigurationPropertySchema, IConfigurationRegistry, IRegisteredConfigurationPropertySchema, OVERRIDE_PROPERTY_REGEX } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { EditorModel } from '../../../common/editor/editorModel.js';
+import { IFilterMetadata, IFilterResult, IGroupFilter, IKeybindingsEditorModel, ISearchResultGroup, ISetting, ISettingMatch, ISettingMatcher, ISettingsEditorModel, ISettingsGroup, SettingMatchType } from './preferences.js';
+import { FOLDER_SCOPES, WORKSPACE_SCOPES } from '../../configuration/common/configuration.js';
+import { createValidator } from './preferencesValidation.js';
 
 export const nullRange: IRange = { startLineNumber: -1, startColumn: -1, endLineNumber: -1, endColumn: -1 };
 function isNullRange(range: IRange): boolean { return range.startLineNumber === -1 && range.startColumn === -1 && range.endLineNumber === -1 && range.endColumn === -1; }
@@ -217,7 +217,7 @@ export class Settings2EditorModel extends AbstractSettingsModel implements ISett
 	private readonly _onDidChangeGroups: Emitter<void> = this._register(new Emitter<void>());
 	readonly onDidChangeGroups: Event<void> = this._onDidChangeGroups.event;
 
-	private additionalGroups: ISettingsGroup[] | undefined;
+	private additionalGroups: ISettingsGroup[] = [];
 	private dirty = false;
 
 	constructor(
@@ -245,11 +245,8 @@ export class Settings2EditorModel extends AbstractSettingsModel implements ISett
 
 	get settingsGroups(): ISettingsGroup[] {
 		const groups = this._defaultSettings.getSettingsGroups(this.dirty);
-		if (this.additionalGroups?.length) {
-			groups.push(...this.additionalGroups);
-		}
 		this.dirty = false;
-		return groups;
+		return [...groups, ...this.additionalGroups];
 	}
 
 	/** For programmatically added groups outside of registered configurations */
@@ -425,7 +422,8 @@ function parse(model: ITextModel, isSettingsProperty: (currentProperty: string,
 	if (!model.isDisposed()) {
 		visit(model.getValue(), visitor);
 	}
-	return settings.length > 0 ? [<ISettingsGroup>{
+	return settings.length > 0 ? [{
+		id: model.isDisposed() ? '' : model.id,
 		sections: [
 			{
 				settings
@@ -434,7 +432,7 @@ function parse(model: ITextModel, isSettingsProperty: (currentProperty: string,
 		title: '',
 		titleRange: nullRange,
 		range
-	}] : [];
+	} satisfies ISettingsGroup] : [];
 }
 
 export class WorkspaceConfigurationEditorModel extends SettingsEditorModel {
@@ -463,14 +461,21 @@ export class DefaultSettings extends Disposable {
 	private _contentWithoutMostCommonlyUsed: string | undefined;
 	private _settingsByName = new Map<string, ISetting>();
 
-	readonly _onDidChange: Emitter<void> = this._register(new Emitter<void>());
+	private readonly _onDidChange: Emitter<void> = this._register(new Emitter<void>());
 	readonly onDidChange: Event<void> = this._onDidChange.event;
 
 	constructor(
 		private _mostCommonlyUsedSettingsKeys: string[],
 		readonly target: ConfigurationTarget,
+		readonly configurationService: IConfigurationService
 	) {
 		super();
+		this._register(configurationService.onDidChangeConfiguration(e => {
+			if (e.source === ConfigurationTarget.DEFAULT) {
+				this.reset();
+				this._onDidChange.fire();
+			}
+		}));
 	}
 
 	getContent(forceUpdate = false): string {
@@ -503,10 +508,16 @@ export class DefaultSettings extends Disposable {
 		this._contentWithoutMostCommonlyUsed = this.toContent(this._allSettingsGroups, 1);
 	}
 
+	private reset(): void {
+		this._content = undefined;
+		this._contentWithoutMostCommonlyUsed = undefined;
+		this._allSettingsGroups = undefined;
+	}
+
 	private parse(): ISettingsGroup[] {
 		const settingsGroups = this.getRegisteredGroups();
 		this.initAllSettingsMap(settingsGroups);
-		const mostCommonlyUsed = this.getMostCommonlyUsedSettings(settingsGroups);
+		const mostCommonlyUsed = this.getMostCommonlyUsedSettings();
 		return [mostCommonlyUsed, ...settingsGroups];
 	}
 
@@ -539,11 +550,11 @@ export class DefaultSettings extends Disposable {
 		}
 	}
 
-	private getMostCommonlyUsedSettings(allSettingsGroups: ISettingsGroup[]): ISettingsGroup {
+	private getMostCommonlyUsedSettings(): ISettingsGroup {
 		const settings = coalesce(this._mostCommonlyUsedSettingsKeys.map(key => {
 			const setting = this._settingsByName.get(key);
 			if (setting) {
-				return <ISetting>{
+				return {
 					description: setting.description,
 					key: setting.key,
 					value: setting.value,
@@ -556,12 +567,12 @@ export class DefaultSettings extends Disposable {
 					enum: setting.enum,
 					enumDescriptions: setting.enumDescriptions,
 					descriptionRanges: []
-				};
+				} satisfies ISetting;
 			}
 			return null;
 		}));
 
-		return <ISettingsGroup>{
+		return {
 			id: 'mostCommonlyUsed',
 			range: nullRange,
 			title: nls.localize('commonlyUsed', "Commonly Used"),
@@ -571,7 +582,7 @@ export class DefaultSettings extends Disposable {
 					settings
 				}
 			]
-		};
+		} satisfies ISettingsGroup;
 	}
 
 	private parseConfig(config: IConfigurationNode, result: ISettingsGroup[], configurations: IConfigurationNode[], settingsGroup?: ISettingsGroup, seenSettings?: { [key: string]: boolean }): ISettingsGroup[] {
@@ -679,7 +690,7 @@ export class DefaultSettings extends Disposable {
 					isLanguageTagSetting = true;
 				}
 
-				let defaultValueSource: string | IExtensionInfo | undefined;
+				let defaultValueSource: ConfigurationDefaultValueSource | undefined;
 				if (!isLanguageTagSetting) {
 					const registeredConfigurationProp = prop as IRegisteredConfigurationPropertySchema;
 					if (registeredConfigurationProp && registeredConfigurationProp.defaultValueSource) {
@@ -834,7 +845,7 @@ export class DefaultSettingsEditorModel extends AbstractSettingsModel implements
 
 		const metadata = this.collectMetadata(resultGroups);
 		return resultGroups.length ?
-			<IFilterResult>{
+			{
 				allGroups: this.settingsGroups,
 				filteredGroups,
 				matches,
@@ -884,9 +895,10 @@ export class DefaultSettingsEditorModel extends AbstractSettingsModel implements
 		filterMatches = filterMatches
 			.map(filteredMatch => {
 				// Fix match ranges to offset from setting start line
-				return <ISettingMatch>{
+				return {
 					setting: filteredMatch.setting,
 					score: filteredMatch.score,
+					matchType: filteredMatch.matchType,
 					matches: filteredMatch.matches && filteredMatch.matches.map(match => {
 						return new Range(
 							match.startLineNumber - filteredMatch.setting.range.startLineNumber,
@@ -955,7 +967,7 @@ export class DefaultSettingsEditorModel extends AbstractSettingsModel implements
 	}
 
 	private getGroup(resultGroup: ISearchResultGroup): ISettingsGroup {
-		return <ISettingsGroup>{
+		return {
 			id: resultGroup.id,
 			range: nullRange,
 			title: resultGroup.label,
@@ -1125,9 +1137,15 @@ export class DefaultRawSettingsEditorModel extends Disposable {
 
 	private _content: string | null = null;
 
+	private readonly _onDidContentChanged = this._register(new Emitter<void>());
+	readonly onDidContentChanged = this._onDidContentChanged.event;
+
 	constructor(private defaultSettings: DefaultSettings) {
 		super();
-		this._register(defaultSettings.onDidChange(() => this._content = null));
+		this._register(defaultSettings.onDidChange(() => {
+			this._content = null;
+			this._onDidContentChanged.fire();
+		}));
 	}
 
 	get content(): string {
diff --git a/src/vs/workbench/services/preferences/common/preferencesValidation.ts b/src/vs/workbench/services/preferences/common/preferencesValidation.ts
index acc6d371a1e..b0b84f86ad1 100644
--- a/src/vs/workbench/services/preferences/common/preferencesValidation.ts
+++ b/src/vs/workbench/services/preferences/common/preferencesValidation.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { JSONSchemaType } from 'vs/base/common/jsonSchema';
-import { Color } from 'vs/base/common/color';
-import { isObject, isUndefinedOrNull, isString, isStringArray } from 'vs/base/common/types';
-import { IConfigurationPropertySchema } from 'vs/platform/configuration/common/configurationRegistry';
+import * as nls from '../../../../nls.js';
+import { JSONSchemaType } from '../../../../base/common/jsonSchema.js';
+import { Color } from '../../../../base/common/color.js';
+import { isObject, isUndefinedOrNull, isString, isStringArray } from '../../../../base/common/types.js';
+import { IConfigurationPropertySchema } from '../../../../platform/configuration/common/configurationRegistry.js';
 
 type Validator<T> = { enabled: boolean; isValid: (value: T) => boolean; message: string };
 
diff --git a/src/vs/workbench/services/preferences/test/browser/keybindingsEditorModel.test.ts b/src/vs/workbench/services/preferences/test/browser/keybindingsEditorModel.test.ts
index a6009748222..fedcfed869e 100644
--- a/src/vs/workbench/services/preferences/test/browser/keybindingsEditorModel.test.ts
+++ b/src/vs/workbench/services/preferences/test/browser/keybindingsEditorModel.test.ts
@@ -4,23 +4,23 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import * as uuid from 'vs/base/common/uuid';
-import { OS, OperatingSystem } from 'vs/base/common/platform';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { KeyCodeChord } from 'vs/base/common/keybindings';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingsEditorModel } from 'vs/workbench/services/preferences/browser/keybindingsEditorModel';
-import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
-import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayoutResolvedKeybinding';
+import * as uuid from '../../../../../base/common/uuid.js';
+import { OS, OperatingSystem } from '../../../../../base/common/platform.js';
+import { KeyCode } from '../../../../../base/common/keyCodes.js';
+import { KeyCodeChord } from '../../../../../base/common/keybindings.js';
+import { CommandsRegistry } from '../../../../../platform/commands/common/commands.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { IExtensionService } from '../../../extensions/common/extensions.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { KeybindingsEditorModel } from '../../browser/keybindingsEditorModel.js';
+import { ResolvedKeybindingItem } from '../../../../../platform/keybinding/common/resolvedKeybindingItem.js';
+import { USLayoutResolvedKeybinding } from '../../../../../platform/keybinding/common/usLayoutResolvedKeybinding.js';
 
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { IKeybindingItemEntry } from 'vs/workbench/services/preferences/common/preferences';
-import { Action2, MenuRegistry, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { IKeybindingItemEntry } from '../../common/preferences.js';
+import { Action2, MenuRegistry, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { ExtensionIdentifier, IExtensionDescription } from '../../../../../platform/extensions/common/extensions.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 interface Modifiers {
 	metaKey?: boolean;
diff --git a/src/vs/workbench/services/preferences/test/browser/preferencesService.test.ts b/src/vs/workbench/services/preferences/test/browser/preferencesService.test.ts
index af47ad2f8ea..4f1f2493cb4 100644
--- a/src/vs/workbench/services/preferences/test/browser/preferencesService.test.ts
+++ b/src/vs/workbench/services/preferences/test/browser/preferencesService.test.ts
@@ -4,18 +4,19 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { TestCommandService } from 'vs/editor/test/browser/editorTestServices';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { DEFAULT_EDITOR_ASSOCIATION } from 'vs/workbench/common/editor';
-import { IJSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditing';
-import { TestJSONEditingService } from 'vs/workbench/services/configuration/test/common/testServices';
-import { PreferencesService } from 'vs/workbench/services/preferences/browser/preferencesService';
-import { IPreferencesService, ISettingsEditorOptions } from 'vs/workbench/services/preferences/common/preferences';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { TestRemoteAgentService, ITestInstantiationService, TestEditorService, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { TestCommandService } from '../../../../../editor/test/browser/editorTestServices.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { SyncDescriptor } from '../../../../../platform/instantiation/common/descriptors.js';
+import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
+import { IURLService } from '../../../../../platform/url/common/url.js';
+import { DEFAULT_EDITOR_ASSOCIATION } from '../../../../common/editor.js';
+import { IJSONEditingService } from '../../../configuration/common/jsonEditing.js';
+import { TestJSONEditingService } from '../../../configuration/test/common/testServices.js';
+import { PreferencesService } from '../../browser/preferencesService.js';
+import { IPreferencesService, ISettingsEditorOptions } from '../../common/preferences.js';
+import { IRemoteAgentService } from '../../../remote/common/remoteAgentService.js';
+import { TestRemoteAgentService, ITestInstantiationService, TestEditorService, workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
 
 suite('PreferencesService', () => {
 	let testInstantiationService: ITestInstantiationService;
@@ -32,11 +33,12 @@ suite('PreferencesService', () => {
 		testInstantiationService.stub(IJSONEditingService, TestJSONEditingService);
 		testInstantiationService.stub(IRemoteAgentService, TestRemoteAgentService);
 		testInstantiationService.stub(ICommandService, TestCommandService);
+		testInstantiationService.stub(IURLService, { registerHandler: () => { } });
 
 		// PreferencesService creates a PreferencesEditorInput which depends on IPreferencesService, add the real one, not a stub
 		const collection = new ServiceCollection();
 		collection.set(IPreferencesService, new SyncDescriptor(PreferencesService));
-		const instantiationService = testInstantiationService.createChild(collection);
+		const instantiationService = disposables.add(testInstantiationService.createChild(collection));
 		testObject = disposables.add(instantiationService.createInstance(PreferencesService));
 	});
 	test('options are preserved when calling openEditor', async () => {
diff --git a/src/vs/workbench/services/preferences/test/common/preferencesValidation.test.ts b/src/vs/workbench/services/preferences/test/common/preferencesValidation.test.ts
index 85ef6771d84..671583430f4 100644
--- a/src/vs/workbench/services/preferences/test/common/preferencesValidation.test.ts
+++ b/src/vs/workbench/services/preferences/test/common/preferencesValidation.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IConfigurationPropertySchema } from 'vs/platform/configuration/common/configurationRegistry';
-import { createValidator, getInvalidTypeError } from 'vs/workbench/services/preferences/common/preferencesValidation';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IConfigurationPropertySchema } from '../../../../../platform/configuration/common/configurationRegistry.js';
+import { createValidator, getInvalidTypeError } from '../../common/preferencesValidation.js';
 
 
 suite('Preferences Validation', () => {
diff --git a/src/vs/workbench/services/progress/browser/progressIndicator.ts b/src/vs/workbench/services/progress/browser/progressIndicator.ts
index f360fc176c7..184d3b36c03 100644
--- a/src/vs/workbench/services/progress/browser/progressIndicator.ts
+++ b/src/vs/workbench/services/progress/browser/progressIndicator.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
-import { IProgressRunner, IProgressIndicator, emptyProgressRunner } from 'vs/platform/progress/common/progress';
-import { IEditorGroupView } from 'vs/workbench/browser/parts/editor/editor';
-import { GroupModelChangeKind } from 'vs/workbench/common/editor';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ProgressBar } from '../../../../base/browser/ui/progressbar/progressbar.js';
+import { IProgressRunner, IProgressIndicator, emptyProgressRunner } from '../../../../platform/progress/common/progress.js';
+import { IEditorGroupView } from '../../../browser/parts/editor/editor.js';
+import { GroupModelChangeKind } from '../../../common/editor.js';
 
 export class EditorProgressIndicator extends Disposable implements IProgressIndicator {
 
@@ -298,7 +298,7 @@ export class ScopedProgressIndicator extends Disposable implements IProgressIndi
 
 		// Join with existing running promise to ensure progress is accurate
 		if (this.progressState.type === ProgressIndicatorState.Type.While) {
-			promise = Promise.all([promise, this.progressState.whilePromise]);
+			promise = Promise.allSettled([promise, this.progressState.whilePromise]);
 		}
 
 		// Keep Promise in State
diff --git a/src/vs/workbench/services/progress/browser/progressService.ts b/src/vs/workbench/services/progress/browser/progressService.ts
index 87d05f2865c..dd4ee900931 100644
--- a/src/vs/workbench/services/progress/browser/progressService.ts
+++ b/src/vs/workbench/services/progress/browser/progressService.ts
@@ -3,31 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/progressService';
+import './media/progressService.css';
 
-import { localize } from 'vs/nls';
-import { IDisposable, dispose, DisposableStore, Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IProgressService, IProgressOptions, IProgressStep, ProgressLocation, IProgress, Progress, IProgressCompositeOptions, IProgressNotificationOptions, IProgressRunner, IProgressIndicator, IProgressWindowOptions, IProgressDialogOptions } from 'vs/platform/progress/common/progress';
-import { StatusbarAlignment, IStatusbarService, IStatusbarEntryAccessor, IStatusbarEntry } from 'vs/workbench/services/statusbar/browser/statusbar';
-import { DeferredPromise, RunOnceScheduler, timeout } from 'vs/base/common/async';
-import { ProgressBadge, IActivityService } from 'vs/workbench/services/activity/common/activity';
-import { INotificationService, Severity, INotificationHandle, NotificationPriority, isNotificationSource, NotificationsFilter } from 'vs/platform/notification/common/notification';
-import { Action } from 'vs/base/common/actions';
-import { Event, Emitter } from 'vs/base/common/event';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
-import { Dialog } from 'vs/base/browser/ui/dialog/dialog';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { EventHelper } from 'vs/base/browser/dom';
-import { parseLinkedText } from 'vs/base/common/linkedText';
-import { IViewDescriptorService, ViewContainerLocation } from 'vs/workbench/common/views';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { stripIcons } from 'vs/base/common/iconLabels';
-import { defaultButtonStyles, defaultCheckboxStyles, defaultDialogStyles, defaultInputBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { ResultKind } from 'vs/platform/keybinding/common/keybindingResolver';
-import { IUserActivityService } from 'vs/workbench/services/userActivity/common/userActivityService';
+import { localize } from '../../../../nls.js';
+import { IDisposable, dispose, DisposableStore, Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { IProgressService, IProgressOptions, IProgressStep, ProgressLocation, IProgress, Progress, IProgressCompositeOptions, IProgressNotificationOptions, IProgressRunner, IProgressIndicator, IProgressWindowOptions, IProgressDialogOptions } from '../../../../platform/progress/common/progress.js';
+import { StatusbarAlignment, IStatusbarService, IStatusbarEntryAccessor, IStatusbarEntry } from '../../statusbar/browser/statusbar.js';
+import { DeferredPromise, RunOnceScheduler, timeout } from '../../../../base/common/async.js';
+import { ProgressBadge, IActivityService } from '../../activity/common/activity.js';
+import { INotificationService, Severity, INotificationHandle, NotificationPriority, isNotificationSource, NotificationsFilter } from '../../../../platform/notification/common/notification.js';
+import { Action } from '../../../../base/common/actions.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ILayoutService } from '../../../../platform/layout/browser/layoutService.js';
+import { Dialog } from '../../../../base/browser/ui/dialog/dialog.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { EventHelper } from '../../../../base/browser/dom.js';
+import { parseLinkedText } from '../../../../base/common/linkedText.js';
+import { IViewDescriptorService, ViewContainerLocation } from '../../../common/views.js';
+import { IViewsService } from '../../views/common/viewsService.js';
+import { IPaneCompositePartService } from '../../panecomposite/browser/panecomposite.js';
+import { stripIcons } from '../../../../base/common/iconLabels.js';
+import { defaultButtonStyles, defaultCheckboxStyles, defaultDialogStyles, defaultInputBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { ResultKind } from '../../../../platform/keybinding/common/keybindingResolver.js';
+import { IUserActivityService } from '../../userActivity/common/userActivityService.js';
 
 export class ProgressService extends Disposable implements IProgressService {
 
@@ -50,9 +50,13 @@ export class ProgressService extends Disposable implements IProgressService {
 	async withProgress<R = unknown>(options: IProgressOptions, originalTask: (progress: IProgress<IProgressStep>) => Promise<R>, onDidCancel?: (choice?: number) => void): Promise<R> {
 		const { location } = options;
 
-		const task = (progress: IProgress<IProgressStep>) => {
-			const activeLock = this.userActivityService.markActive();
-			return originalTask(progress).finally(() => activeLock.dispose());
+		const task = async (progress: IProgress<IProgressStep>) => {
+			const activeLock = this.userActivityService.markActive({ whenHeldFor: 15_000 });
+			try {
+				return await originalTask(progress);
+			} finally {
+				activeLock.dispose();
+			}
 		};
 
 		const handleStringLocation = (location: string) => {
diff --git a/src/vs/workbench/services/progress/test/browser/progressIndicator.test.ts b/src/vs/workbench/services/progress/test/browser/progressIndicator.test.ts
index 7bc1cec7e49..5ea0812bfe3 100644
--- a/src/vs/workbench/services/progress/test/browser/progressIndicator.test.ts
+++ b/src/vs/workbench/services/progress/test/browser/progressIndicator.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { AbstractProgressScope, ScopedProgressIndicator } from 'vs/workbench/services/progress/browser/progressIndicator';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { AbstractProgressScope, ScopedProgressIndicator } from '../../browser/progressIndicator.js';
 
 class TestProgressBar {
 	fTotal: number = 0;
diff --git a/src/vs/workbench/services/quickinput/browser/quickInputService.ts b/src/vs/workbench/services/quickinput/browser/quickInputService.ts
index 8e09c681660..9be0b08b996 100644
--- a/src/vs/workbench/services/quickinput/browser/quickInputService.ts
+++ b/src/vs/workbench/services/quickinput/browser/quickInputService.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { QuickInputController } from 'vs/platform/quickinput/browser/quickInputController';
-import { QuickInputService as BaseQuickInputService } from 'vs/platform/quickinput/browser/quickInputService';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { InQuickPickContextKey } from 'vs/workbench/browser/quickaccess';
+import { ILayoutService } from '../../../../platform/layout/browser/layoutService.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { QuickInputController } from '../../../../platform/quickinput/browser/quickInputController.js';
+import { QuickInputService as BaseQuickInputService } from '../../../../platform/quickinput/browser/quickInputService.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { InQuickPickContextKey } from '../../../browser/quickaccess.js';
 
 export class QuickInputService extends BaseQuickInputService {
 
diff --git a/src/vs/workbench/services/remote/browser/browserRemoteResourceHandler.ts b/src/vs/workbench/services/remote/browser/browserRemoteResourceHandler.ts
index 54e5f283376..04ceabb0a47 100644
--- a/src/vs/workbench/services/remote/browser/browserRemoteResourceHandler.ts
+++ b/src/vs/workbench/services/remote/browser/browserRemoteResourceHandler.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { getMediaOrTextMime } from 'vs/base/common/mime';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { FileOperationError, FileOperationResult, IFileContent, IFileService } from 'vs/platform/files/common/files';
-import { IRemoteResourceProvider, IResourceUriProvider } from 'vs/workbench/browser/web.api';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { getMediaOrTextMime } from '../../../../base/common/mime.js';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
+import { FileOperationError, FileOperationResult, IFileContent, IFileService } from '../../../../platform/files/common/files.js';
+import { IRemoteResourceProvider, IResourceUriProvider } from '../../../browser/web.api.js';
 
 export class BrowserRemoteResourceLoader extends Disposable {
 	constructor(
diff --git a/src/vs/workbench/services/remote/browser/remoteAgentService.ts b/src/vs/workbench/services/remote/browser/remoteAgentService.ts
index ee12dd5b070..8bf44ae3d3e 100644
--- a/src/vs/workbench/services/remote/browser/remoteAgentService.ts
+++ b/src/vs/workbench/services/remote/browser/remoteAgentService.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { IRemoteAuthorityResolverService, RemoteAuthorityResolverError } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { AbstractRemoteAgentService } from 'vs/workbench/services/remote/common/abstractRemoteAgentService';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ISignService } from 'vs/platform/sign/common/sign';
-import { ILogService } from 'vs/platform/log/common/log';
-import { Severity } from 'vs/platform/notification/common/notification';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { IRemoteSocketFactoryService } from 'vs/platform/remote/common/remoteSocketFactoryService';
+import * as nls from '../../../../nls.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { IRemoteAgentService } from '../common/remoteAgentService.js';
+import { IRemoteAuthorityResolverService, RemoteAuthorityResolverError } from '../../../../platform/remote/common/remoteAuthorityResolver.js';
+import { AbstractRemoteAgentService } from '../common/abstractRemoteAgentService.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { ISignService } from '../../../../platform/sign/common/sign.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { Severity } from '../../../../platform/notification/common/notification.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { IHostService } from '../../host/browser/host.js';
+import { IUserDataProfileService } from '../../userDataProfile/common/userDataProfile.js';
+import { IRemoteSocketFactoryService } from '../../../../platform/remote/common/remoteSocketFactoryService.js';
 
 export class RemoteAgentService extends AbstractRemoteAgentService implements IRemoteAgentService {
 
diff --git a/src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts b/src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts
index 9550c6a76d6..0b8b538db0b 100644
--- a/src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts
+++ b/src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IChannel, IServerChannel, getDelayedChannel, IPCLogger } from 'vs/base/parts/ipc/common/ipc';
-import { Client } from 'vs/base/parts/ipc/common/ipc.net';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { connectRemoteAgentManagement, IConnectionOptions, ManagementPersistentConnection, PersistentConnectionEvent } from 'vs/platform/remote/common/remoteAgentConnection';
-import { IExtensionHostExitInfo, IRemoteAgentConnection, IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { RemoteAgentConnectionContext, IRemoteAgentEnvironment } from 'vs/platform/remote/common/remoteAgentEnvironment';
-import { RemoteExtensionEnvironmentChannelClient } from 'vs/workbench/services/remote/common/remoteAgentEnvironmentChannel';
-import { IDiagnosticInfoOptions, IDiagnosticInfo } from 'vs/platform/diagnostics/common/diagnostics';
-import { Emitter } from 'vs/base/common/event';
-import { ISignService } from 'vs/platform/sign/common/sign';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ITelemetryData, TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { IRemoteSocketFactoryService } from 'vs/platform/remote/common/remoteSocketFactoryService';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IChannel, IServerChannel, getDelayedChannel, IPCLogger } from '../../../../base/parts/ipc/common/ipc.js';
+import { Client } from '../../../../base/parts/ipc/common/ipc.net.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { connectRemoteAgentManagement, IConnectionOptions, ManagementPersistentConnection, PersistentConnectionEvent } from '../../../../platform/remote/common/remoteAgentConnection.js';
+import { IExtensionHostExitInfo, IRemoteAgentConnection, IRemoteAgentService } from './remoteAgentService.js';
+import { IRemoteAuthorityResolverService } from '../../../../platform/remote/common/remoteAuthorityResolver.js';
+import { RemoteAgentConnectionContext, IRemoteAgentEnvironment } from '../../../../platform/remote/common/remoteAgentEnvironment.js';
+import { RemoteExtensionEnvironmentChannelClient } from './remoteAgentEnvironmentChannel.js';
+import { IDiagnosticInfoOptions, IDiagnosticInfo } from '../../../../platform/diagnostics/common/diagnostics.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { ISignService } from '../../../../platform/sign/common/sign.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { ITelemetryData, TelemetryLevel } from '../../../../platform/telemetry/common/telemetry.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IUserDataProfileService } from '../../userDataProfile/common/userDataProfile.js';
+import { IRemoteSocketFactoryService } from '../../../../platform/remote/common/remoteSocketFactoryService.js';
 
 export abstract class AbstractRemoteAgentService extends Disposable implements IRemoteAgentService {
 
@@ -114,6 +114,13 @@ export abstract class AbstractRemoteAgentService extends Disposable implements I
 		);
 	}
 
+	async endConnection(): Promise<void> {
+		if (this._connection) {
+			await this._connection.end();
+			this._connection.dispose();
+		}
+	}
+
 	private _withChannel<R>(callback: (channel: IChannel, connection: IRemoteAgentConnection) => Promise<R>, fallback: R): Promise<R> {
 		const connection = this.getConnection();
 		if (!connection) {
@@ -159,6 +166,8 @@ class RemoteAgentConnection extends Disposable implements IRemoteAgentConnection
 		this._connection = null;
 	}
 
+	end: () => Promise<void> = () => Promise.resolve();
+
 	getChannel<T extends IChannel>(channelName: string): T {
 		return <T>getDelayedChannel(this._getOrCreateConnection().then(c => c.getChannel(channelName)));
 	}
@@ -222,6 +231,10 @@ class RemoteAgentConnection extends Disposable implements IRemoteAgentConnection
 		connection.protocol.onDidDispose(() => {
 			connection.dispose();
 		});
+		this.end = () => {
+			connection.protocol.sendDisconnect();
+			return connection.protocol.drain();
+		};
 		this._register(connection.onDidStateChange(e => this._onDidStateChange.fire(e)));
 		return connection.client;
 	}
diff --git a/src/vs/workbench/services/remote/common/remoteAgentEnvironmentChannel.ts b/src/vs/workbench/services/remote/common/remoteAgentEnvironmentChannel.ts
index 01e7c293a8c..446248ff81b 100644
--- a/src/vs/workbench/services/remote/common/remoteAgentEnvironmentChannel.ts
+++ b/src/vs/workbench/services/remote/common/remoteAgentEnvironmentChannel.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as platform from 'vs/base/common/platform';
-import * as performance from 'vs/base/common/performance';
-import { URI, UriComponents, UriDto } from 'vs/base/common/uri';
-import { IChannel } from 'vs/base/parts/ipc/common/ipc';
-import { IRemoteAgentEnvironment } from 'vs/platform/remote/common/remoteAgentEnvironment';
-import { IDiagnosticInfoOptions, IDiagnosticInfo } from 'vs/platform/diagnostics/common/diagnostics';
-import { ITelemetryData, TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
-import { IExtensionHostExitInfo } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { revive } from 'vs/base/common/marshalling';
-import { IUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
+import * as platform from '../../../../base/common/platform.js';
+import * as performance from '../../../../base/common/performance.js';
+import { URI, UriComponents, UriDto } from '../../../../base/common/uri.js';
+import { IChannel } from '../../../../base/parts/ipc/common/ipc.js';
+import { IRemoteAgentEnvironment } from '../../../../platform/remote/common/remoteAgentEnvironment.js';
+import { IDiagnosticInfoOptions, IDiagnosticInfo } from '../../../../platform/diagnostics/common/diagnostics.js';
+import { ITelemetryData, TelemetryLevel } from '../../../../platform/telemetry/common/telemetry.js';
+import { IExtensionHostExitInfo } from './remoteAgentService.js';
+import { revive } from '../../../../base/common/marshalling.js';
+import { IUserDataProfile } from '../../../../platform/userDataProfile/common/userDataProfile.js';
 
 export interface IGetEnvironmentDataArguments {
 	remoteAuthority: string;
diff --git a/src/vs/workbench/services/remote/common/remoteAgentService.ts b/src/vs/workbench/services/remote/common/remoteAgentService.ts
index db2d598dd8d..dfeb0f73b5f 100644
--- a/src/vs/workbench/services/remote/common/remoteAgentService.ts
+++ b/src/vs/workbench/services/remote/common/remoteAgentService.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { RemoteAgentConnectionContext, IRemoteAgentEnvironment } from 'vs/platform/remote/common/remoteAgentEnvironment';
-import { IChannel, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
-import { IDiagnosticInfoOptions, IDiagnosticInfo } from 'vs/platform/diagnostics/common/diagnostics';
-import { Event } from 'vs/base/common/event';
-import { PersistentConnectionEvent } from 'vs/platform/remote/common/remoteAgentConnection';
-import { ITelemetryData, TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
-import { timeout } from 'vs/base/common/async';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { RemoteAgentConnectionContext, IRemoteAgentEnvironment } from '../../../../platform/remote/common/remoteAgentEnvironment.js';
+import { IChannel, IServerChannel } from '../../../../base/parts/ipc/common/ipc.js';
+import { IDiagnosticInfoOptions, IDiagnosticInfo } from '../../../../platform/diagnostics/common/diagnostics.js';
+import { Event } from '../../../../base/common/event.js';
+import { PersistentConnectionEvent } from '../../../../platform/remote/common/remoteAgentConnection.js';
+import { ITelemetryData, TelemetryLevel } from '../../../../platform/telemetry/common/telemetry.js';
+import { timeout } from '../../../../base/common/async.js';
 
 export const IRemoteAgentService = createDecorator<IRemoteAgentService>('remoteAgentService');
 
@@ -37,6 +37,11 @@ export interface IRemoteAgentService {
 	 */
 	getRoundTripTime(): Promise<number | undefined>;
 
+	/**
+	 * Gracefully ends the current connection, if any.
+	 */
+	endConnection(): Promise<void>;
+
 	getDiagnosticInfo(options: IDiagnosticInfoOptions): Promise<IDiagnosticInfo | undefined>;
 	updateTelemetryLevel(telemetryLevel: TelemetryLevel): Promise<void>;
 	logTelemetry(eventName: string, data?: ITelemetryData): Promise<void>;
@@ -54,6 +59,7 @@ export interface IRemoteAgentConnection {
 	readonly onReconnecting: Event<void>;
 	readonly onDidStateChange: Event<PersistentConnectionEvent>;
 
+	end(): Promise<void>;
 	dispose(): void;
 	getChannel<T extends IChannel>(channelName: string): T;
 	withChannel<T extends IChannel, R>(channelName: string, callback: (channel: T) => Promise<R>): Promise<R>;
diff --git a/src/vs/workbench/services/remote/common/remoteExplorerService.ts b/src/vs/workbench/services/remote/common/remoteExplorerService.ts
index be889244846..cbf78719a20 100644
--- a/src/vs/workbench/services/remote/common/remoteExplorerService.ts
+++ b/src/vs/workbench/services/remote/common/remoteExplorerService.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { Event, Emitter } from 'vs/base/common/event';
-import { IInstantiationService, createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ITunnelService, RemoteTunnel, TunnelProtocol } from 'vs/platform/tunnel/common/tunnel';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { IEditableData } from 'vs/workbench/common/views';
-import { TunnelInformation, TunnelPrivacy } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { URI } from 'vs/base/common/uri';
-import { Attributes, CandidatePort, TunnelCloseReason, TunnelModel, TunnelProperties, TunnelSource } from 'vs/workbench/services/remote/common/tunnelModel';
-import { ExtensionsRegistry, IExtensionPointUser } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
+import * as nls from '../../../../nls.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { IInstantiationService, createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { ITunnelService, RemoteTunnel, TunnelProtocol } from '../../../../platform/tunnel/common/tunnel.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { IEditableData } from '../../../common/views.js';
+import { TunnelInformation, TunnelPrivacy } from '../../../../platform/remote/common/remoteAuthorityResolver.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Attributes, CandidatePort, TunnelCloseReason, TunnelModel, TunnelProperties, TunnelSource } from './tunnelModel.js';
+import { ExtensionsRegistry, IExtensionPointUser } from '../../extensions/common/extensionsRegistry.js';
+import { IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
+import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
 
 export const IRemoteExplorerService = createDecorator<IRemoteExplorerService>('remoteExplorerService');
 export const REMOTE_EXPLORER_TYPE_KEY: string = 'remote.explorerType';
@@ -117,6 +117,12 @@ const remoteHelpExtPoint = ExtensionsRegistry.registerExtensionPoint<HelpInforma
 	}
 });
 
+export enum PortsEnablement {
+	Disabled = 0,
+	ViewOnly = 1,
+	AdditionalFeatures = 2
+}
+
 export interface IRemoteExplorerService {
 	readonly _serviceBrand: undefined;
 	onDidChangeTargetType: Event<string[]>;
@@ -133,9 +139,9 @@ export interface IRemoteExplorerService {
 	setCandidateFilter(filter: ((candidates: CandidatePort[]) => Promise<CandidatePort[]>) | undefined): IDisposable;
 	onFoundNewCandidates(candidates: CandidatePort[]): void;
 	restore(): Promise<void>;
-	enablePortsFeatures(): void;
+	enablePortsFeatures(viewOnly: boolean): void;
 	onEnabledPortsFeatures: Event<void>;
-	portsFeaturesEnabled: boolean;
+	portsFeaturesEnabled: PortsEnablement;
 	readonly namedProcesses: Map<number, string>;
 }
 
@@ -153,7 +159,7 @@ class RemoteExplorerService implements IRemoteExplorerService {
 	public readonly onDidChangeEditable: Event<{ tunnel: ITunnelItem; editId: TunnelEditId } | undefined> = this._onDidChangeEditable.event;
 	private readonly _onEnabledPortsFeatures: Emitter<void> = new Emitter();
 	public readonly onEnabledPortsFeatures: Event<void> = this._onEnabledPortsFeatures.event;
-	private _portsFeaturesEnabled: boolean = false;
+	private _portsFeaturesEnabled: PortsEnablement = PortsEnablement.Disabled;
 	public readonly namedProcesses = new Map<number, string>();
 
 	constructor(
@@ -246,12 +252,12 @@ class RemoteExplorerService implements IRemoteExplorerService {
 		return this.tunnelModel.restoreForwarded();
 	}
 
-	enablePortsFeatures(): void {
-		this._portsFeaturesEnabled = true;
+	enablePortsFeatures(viewOnly: boolean): void {
+		this._portsFeaturesEnabled = viewOnly ? PortsEnablement.ViewOnly : PortsEnablement.AdditionalFeatures;
 		this._onEnabledPortsFeatures.fire();
 	}
 
-	get portsFeaturesEnabled(): boolean {
+	get portsFeaturesEnabled(): PortsEnablement {
 		return this._portsFeaturesEnabled;
 	}
 }
diff --git a/src/vs/workbench/services/remote/common/remoteExtensionsScanner.ts b/src/vs/workbench/services/remote/common/remoteExtensionsScanner.ts
index f1d24829083..0a54b54e489 100644
--- a/src/vs/workbench/services/remote/common/remoteExtensionsScanner.ts
+++ b/src/vs/workbench/services/remote/common/remoteExtensionsScanner.ts
@@ -3,19 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { IRemoteExtensionsScannerService, RemoteExtensionsScannerChannelName } from 'vs/platform/remote/common/remoteExtensionsScanner';
-import * as platform from 'vs/base/common/platform';
-import { IChannel } from 'vs/base/parts/ipc/common/ipc';
-import { IExtensionDescription, IRelaxedExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { URI } from 'vs/base/common/uri';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { IRemoteUserDataProfilesService } from 'vs/workbench/services/userDataProfile/common/remoteUserDataProfiles';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IActiveLanguagePackService } from 'vs/workbench/services/localization/common/locale';
-import { IWorkbenchExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
+import { IRemoteAgentService } from './remoteAgentService.js';
+import { IRemoteExtensionsScannerService, RemoteExtensionsScannerChannelName } from '../../../../platform/remote/common/remoteExtensionsScanner.js';
+import * as platform from '../../../../base/common/platform.js';
+import { IChannel } from '../../../../base/parts/ipc/common/ipc.js';
+import { IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IUserDataProfileService } from '../../userDataProfile/common/userDataProfile.js';
+import { IRemoteUserDataProfilesService } from '../../userDataProfile/common/remoteUserDataProfiles.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IActiveLanguagePackService } from '../../localization/common/locale.js';
+import { IWorkbenchExtensionManagementService } from '../../extensionManagement/common/extensionManagement.js';
+import { Mutable } from '../../../../base/common/types.js';
 
 class RemoteExtensionsScannerService implements IRemoteExtensionsScannerService {
 
@@ -44,7 +45,7 @@ class RemoteExtensionsScannerService implements IRemoteExtensionsScannerService
 			return await this.withChannel(
 				async (channel) => {
 					const profileLocation = this.userDataProfileService.currentProfile.isDefault ? undefined : (await this.remoteUserDataProfilesService.getRemoteProfile(this.userDataProfileService.currentProfile)).extensionsResource;
-					const scannedExtensions = await channel.call<IRelaxedExtensionDescription[]>('scanExtensions', [
+					const scannedExtensions = await channel.call<Mutable<IExtensionDescription>[]>('scanExtensions', [
 						platform.language,
 						profileLocation,
 						this.extensionManagementService.getInstalledWorkspaceExtensionLocations(),
diff --git a/src/vs/workbench/services/remote/common/remoteFileSystemProviderClient.ts b/src/vs/workbench/services/remote/common/remoteFileSystemProviderClient.ts
index 5a3211e6a4a..64ff29a5650 100644
--- a/src/vs/workbench/services/remote/common/remoteFileSystemProviderClient.ts
+++ b/src/vs/workbench/services/remote/common/remoteFileSystemProviderClient.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getErrorMessage } from 'vs/base/common/errors';
-import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { OperatingSystem } from 'vs/base/common/platform';
-import { IFileService } from 'vs/platform/files/common/files';
-import { DiskFileSystemProviderClient } from 'vs/platform/files/common/diskFileSystemProviderClient';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IRemoteAgentEnvironment } from 'vs/platform/remote/common/remoteAgentEnvironment';
-import { IRemoteAgentConnection, IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
+import { getErrorMessage } from '../../../../base/common/errors.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { OperatingSystem } from '../../../../base/common/platform.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { DiskFileSystemProviderClient } from '../../../../platform/files/common/diskFileSystemProviderClient.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IRemoteAgentEnvironment } from '../../../../platform/remote/common/remoteAgentEnvironment.js';
+import { IRemoteAgentConnection, IRemoteAgentService } from './remoteAgentService.js';
 
 export const REMOTE_FILE_SYSTEM_CHANNEL_NAME = 'remoteFilesystem';
 
diff --git a/src/vs/workbench/services/remote/common/tunnelModel.ts b/src/vs/workbench/services/remote/common/tunnelModel.ts
index 14f20e126ad..08389a2302f 100644
--- a/src/vs/workbench/services/remote/common/tunnelModel.ts
+++ b/src/vs/workbench/services/remote/common/tunnelModel.ts
@@ -3,33 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { debounce } from 'vs/base/common/decorators';
-import { Emitter, Event } from 'vs/base/common/event';
-import { hash } from 'vs/base/common/hash';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IAddressProvider } from 'vs/platform/remote/common/remoteAgentConnection';
-import { IRemoteAuthorityResolverService, TunnelDescription } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { RemoteTunnel, ITunnelService, TunnelProtocol, TunnelPrivacyId, LOCALHOST_ADDRESSES, ProvidedPortAttributes, PortAttributesProvider, isLocalhost, isAllInterfaces, ProvidedOnAutoForward, ALL_INTERFACES_ADDRESSES } from 'vs/platform/tunnel/common/tunnel';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { isNumber, isObject, isString } from 'vs/base/common/types';
-import { deepClone } from 'vs/base/common/objects';
-import { IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import * as nls from '../../../../nls.js';
+import { debounce } from '../../../../base/common/decorators.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { hash } from '../../../../base/common/hash.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ConfigurationTarget, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IAddressProvider } from '../../../../platform/remote/common/remoteAgentConnection.js';
+import { IRemoteAuthorityResolverService, TunnelDescription } from '../../../../platform/remote/common/remoteAuthorityResolver.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { RemoteTunnel, ITunnelService, TunnelProtocol, TunnelPrivacyId, LOCALHOST_ADDRESSES, ProvidedPortAttributes, PortAttributesProvider, isLocalhost, isAllInterfaces, ProvidedOnAutoForward, ALL_INTERFACES_ADDRESSES } from '../../../../platform/tunnel/common/tunnel.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { IExtensionService } from '../../extensions/common/extensions.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { isNumber, isObject, isString } from '../../../../base/common/types.js';
+import { deepClone } from '../../../../base/common/objects.js';
+import { IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 
 const MISMATCH_LOCAL_PORT_COOLDOWN = 10 * 1000; // 10 seconds
 const TUNNELS_TO_RESTORE = 'remote.tunnels.toRestore';
 const TUNNELS_TO_RESTORE_EXPIRATION = 'remote.tunnels.toRestoreExpiration';
 const RESTORE_EXPIRATION_TIME = 1000 * 60 * 60 * 24 * 14; // 2 weeks
 export const ACTIVATION_EVENT = 'onTunnel';
-export const forwardedPortsViewEnabled = new RawContextKey<boolean>('forwardedPortsViewEnabled', false, nls.localize('tunnel.forwardedPortsViewEnabled', "Whether the Ports view is enabled."));
+export const forwardedPortsFeaturesEnabled = new RawContextKey<boolean>('forwardedPortsViewEnabled', false, nls.localize('tunnel.forwardedPortsViewEnabled', "Whether the Ports view is enabled."));
+export const forwardedPortsViewEnabled = new RawContextKey<boolean>('forwardedPortsViewOnlyEnabled', false, nls.localize('tunnel.forwardedPortsViewEnabled', "Whether the Ports view is enabled."));
 
 export interface RestorableTunnel {
 	remoteHost: string;
@@ -459,6 +460,7 @@ export class TunnelModel extends Disposable {
 						protocol: attributes?.get(tunnel.tunnelRemotePort)?.protocol ?? TunnelProtocol.Http,
 						localUri: await this.makeLocalUri(tunnel.localAddress, attributes?.get(tunnel.tunnelRemotePort)),
 						localPort: tunnel.tunnelLocalPort,
+						name: attributes?.get(tunnel.tunnelRemotePort)?.label,
 						runningProcess: matchingCandidate?.detail,
 						hasRunningProcess: !!matchingCandidate,
 						pid: matchingCandidate?.pid,
@@ -486,6 +488,7 @@ export class TunnelModel extends Disposable {
 					protocol: attributes?.protocol ?? TunnelProtocol.Http,
 					localUri: await this.makeLocalUri(tunnel.localAddress, attributes),
 					localPort: tunnel.tunnelLocalPort,
+					name: attributes?.label,
 					closeable: true,
 					runningProcess: matchingCandidate?.detail,
 					hasRunningProcess: !!matchingCandidate,
@@ -495,13 +498,14 @@ export class TunnelModel extends Disposable {
 				});
 			}
 			await this.storeForwarded();
+			this.checkExtensionActivationEvents(true);
 			this.remoteTunnels.set(key, tunnel);
 			this._onForwardPort.fire(this.forwarded.get(key)!);
 		}));
 		this._register(this.tunnelService.onTunnelClosed(address => {
 			return this.onTunnelClosed(address, TunnelCloseReason.Other);
 		}));
-		this.checkExtensionActivationEvents();
+		this.checkExtensionActivationEvents(false);
 	}
 
 	private extensionHasActivationEvent() {
@@ -512,7 +516,19 @@ export class TunnelModel extends Disposable {
 		return false;
 	}
 
-	private checkExtensionActivationEvents() {
+	private hasCheckedExtensionsOnTunnelOpened = false;
+	private checkExtensionActivationEvents(tunnelOpened: boolean) {
+		if (this.hasCheckedExtensionsOnTunnelOpened) {
+			return;
+		}
+		if (tunnelOpened) {
+			this.hasCheckedExtensionsOnTunnelOpened = true;
+		}
+		const hasRemote = this.environmentService.remoteAuthority !== undefined;
+		if (hasRemote && !tunnelOpened) {
+			// We don't activate extensions on startup if there is a remote
+			return;
+		}
 		if (this.extensionHasActivationEvent()) {
 			return;
 		}
diff --git a/src/vs/workbench/services/remote/electron-sandbox/remoteAgentService.ts b/src/vs/workbench/services/remote/electron-sandbox/remoteAgentService.ts
index fdc38631ea9..ae6bcf8e30c 100644
--- a/src/vs/workbench/services/remote/electron-sandbox/remoteAgentService.ts
+++ b/src/vs/workbench/services/remote/electron-sandbox/remoteAgentService.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { IRemoteAuthorityResolverService, RemoteConnectionType, RemoteAuthorityResolverError } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { AbstractRemoteAgentService } from 'vs/workbench/services/remote/common/abstractRemoteAgentService';
-import { ISignService } from 'vs/platform/sign/common/sign';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { INotificationService, IPromptChoice, Severity } from 'vs/platform/notification/common/notification';
-import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { URI } from 'vs/base/common/uri';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { IRemoteSocketFactoryService } from 'vs/platform/remote/common/remoteSocketFactoryService';
+import * as nls from '../../../../nls.js';
+import { IRemoteAgentService } from '../common/remoteAgentService.js';
+import { IRemoteAuthorityResolverService, RemoteConnectionType, RemoteAuthorityResolverError } from '../../../../platform/remote/common/remoteAuthorityResolver.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { AbstractRemoteAgentService } from '../common/abstractRemoteAgentService.js';
+import { ISignService } from '../../../../platform/sign/common/sign.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { INotificationService, IPromptChoice, Severity } from '../../../../platform/notification/common/notification.js';
+import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IUserDataProfileService } from '../../userDataProfile/common/userDataProfile.js';
+import { IRemoteSocketFactoryService } from '../../../../platform/remote/common/remoteSocketFactoryService.js';
 
 export class RemoteAgentService extends AbstractRemoteAgentService implements IRemoteAgentService {
 	constructor(
diff --git a/src/vs/workbench/services/request/browser/requestService.ts b/src/vs/workbench/services/request/browser/requestService.ts
index d93c7cb6be4..afa0b0f4358 100644
--- a/src/vs/workbench/services/request/browser/requestService.ts
+++ b/src/vs/workbench/services/request/browser/requestService.ts
@@ -3,29 +3,36 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IRequestOptions, IRequestContext } from 'vs/base/parts/request/common/request';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ILoggerService } from 'vs/platform/log/common/log';
-import { RequestChannelClient } from 'vs/platform/request/common/requestIpc';
-import { IRemoteAgentService, IRemoteAgentConnection } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { RequestService } from 'vs/platform/request/browser/requestService';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
+import { IRequestOptions, IRequestContext } from '../../../../base/parts/request/common/request.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { RequestChannelClient } from '../../../../platform/request/common/requestIpc.js';
+import { IRemoteAgentService, IRemoteAgentConnection } from '../../remote/common/remoteAgentService.js';
+import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { AbstractRequestService, AuthInfo, Credentials, IRequestService } from '../../../../platform/request/common/request.js';
+import { request } from '../../../../base/parts/request/browser/request.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
 
-export class BrowserRequestService extends RequestService {
+export class BrowserRequestService extends AbstractRequestService implements IRequestService {
+
+	declare readonly _serviceBrand: undefined;
 
 	constructor(
 		@IRemoteAgentService private readonly remoteAgentService: IRemoteAgentService,
-		@IConfigurationService configurationService: IConfigurationService,
-		@ILoggerService loggerService: ILoggerService
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@ILogService logService: ILogService,
 	) {
-		super(configurationService, loggerService);
+		super(logService);
 	}
 
-	override async request(options: IRequestOptions, token: CancellationToken): Promise<IRequestContext> {
+	async request(options: IRequestOptions, token: CancellationToken): Promise<IRequestContext> {
 		try {
-			const context = await super.request(options, token);
+			if (!options.proxyAuthorization) {
+				options.proxyAuthorization = this.configurationService.getValue<string>('http.proxyAuthorization');
+			}
+			const context = await this.logAndRequest(options, () => request(options, token));
+
 			const connection = this.remoteAgentService.getConnection();
 			if (connection && context.res.statusCode === 405) {
 				return this._makeRemoteRequest(connection, options, token);
@@ -40,6 +47,22 @@ export class BrowserRequestService extends RequestService {
 		}
 	}
 
+	async resolveProxy(url: string): Promise<string | undefined> {
+		return undefined; // not implemented in the web
+	}
+
+	async lookupAuthorization(authInfo: AuthInfo): Promise<Credentials | undefined> {
+		return undefined; // not implemented in the web
+	}
+
+	async lookupKerberosAuthorization(url: string): Promise<string | undefined> {
+		return undefined; // not implemented in the web
+	}
+
+	async loadCertificates(): Promise<string[]> {
+		return []; // not implemented in the web
+	}
+
 	private _makeRemoteRequest(connection: IRemoteAgentConnection, options: IRequestOptions, token: CancellationToken): Promise<IRequestContext> {
 		return connection.withChannel('request', channel => new RequestChannelClient(channel).request(options, token));
 	}
diff --git a/src/vs/workbench/services/request/electron-sandbox/requestService.ts b/src/vs/workbench/services/request/electron-sandbox/requestService.ts
index 0a249b6eaaa..f0b2a760c56 100644
--- a/src/vs/workbench/services/request/electron-sandbox/requestService.ts
+++ b/src/vs/workbench/services/request/electron-sandbox/requestService.ts
@@ -3,28 +3,47 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ILoggerService } from 'vs/platform/log/common/log';
-import { RequestService } from 'vs/platform/request/browser/requestService';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IRequestService } from 'vs/platform/request/common/request';
-import { INativeHostService } from 'vs/platform/native/common/native';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { AbstractRequestService, AuthInfo, Credentials, IRequestService } from '../../../../platform/request/common/request.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { IRequestContext, IRequestOptions } from '../../../../base/parts/request/common/request.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { request } from '../../../../base/parts/request/browser/request.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
 
-export class NativeRequestService extends RequestService {
+export class NativeRequestService extends AbstractRequestService implements IRequestService {
+
+	declare readonly _serviceBrand: undefined;
 
 	constructor(
-		@IConfigurationService configurationService: IConfigurationService,
-		@ILoggerService loggerService: ILoggerService,
-		@INativeHostService private nativeHostService: INativeHostService
+		@INativeHostService private readonly nativeHostService: INativeHostService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@ILogService logService: ILogService,
 	) {
-		super(configurationService, loggerService);
+		super(logService);
 	}
 
-	override async resolveProxy(url: string): Promise<string | undefined> {
+	async request(options: IRequestOptions, token: CancellationToken): Promise<IRequestContext> {
+		if (!options.proxyAuthorization) {
+			options.proxyAuthorization = this.configurationService.getValue<string>('http.proxyAuthorization');
+		}
+		return this.logAndRequest(options, () => request(options, token));
+	}
+
+	async resolveProxy(url: string): Promise<string | undefined> {
 		return this.nativeHostService.resolveProxy(url);
 	}
 
-	override async loadCertificates(): Promise<string[]> {
+	async lookupAuthorization(authInfo: AuthInfo): Promise<Credentials | undefined> {
+		return this.nativeHostService.lookupAuthorization(authInfo);
+	}
+
+	async lookupKerberosAuthorization(url: string): Promise<string | undefined> {
+		return this.nativeHostService.lookupKerberosAuthorization(url);
+	}
+
+	async loadCertificates(): Promise<string[]> {
 		return this.nativeHostService.loadCertificates();
 	}
 }
diff --git a/src/vs/workbench/services/search/browser/searchService.ts b/src/vs/workbench/services/search/browser/searchService.ts
index f9aea8ee65a..cdefb232d45 100644
--- a/src/vs/workbench/services/search/browser/searchService.ts
+++ b/src/vs/workbench/services/search/browser/searchService.ts
@@ -3,30 +3,30 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IModelService } from 'vs/editor/common/services/model';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IFileMatch, IFileQuery, ISearchComplete, ISearchProgressItem, ISearchResultProvider, ISearchService, ITextQuery, SearchProviderType, TextSearchCompleteMessageType } from 'vs/workbench/services/search/common/search';
-import { SearchService } from 'vs/workbench/services/search/common/searchService';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IWorkerClient, logOnceWebWorkerWarning, SimpleWorkerClient } from 'vs/base/common/worker/simpleWorker';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { DefaultWorkerFactory } from 'vs/base/browser/defaultWorkerFactory';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ILocalFileSearchSimpleWorker, ILocalFileSearchSimpleWorkerHost } from 'vs/workbench/services/search/common/localFileSearchWorkerTypes';
-import { memoize } from 'vs/base/common/decorators';
-import { HTMLFileSystemProvider } from 'vs/platform/files/browser/htmlFileSystemProvider';
-import { Schemas } from 'vs/base/common/network';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { Emitter, Event } from 'vs/base/common/event';
-import { localize } from 'vs/nls';
-import { WebFileSystemAccess } from 'vs/platform/files/browser/webFileSystemAccess';
-import { revive } from 'vs/base/common/marshalling';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IEditorService } from '../../editor/common/editorService.js';
+import { IExtensionService } from '../../extensions/common/extensions.js';
+import { IFileMatch, IFileQuery, ISearchComplete, ISearchProgressItem, ISearchResultProvider, ISearchService, ITextQuery, SearchProviderType, TextSearchCompleteMessageType } from '../common/search.js';
+import { SearchService } from '../common/searchService.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IWorkerClient, logOnceWebWorkerWarning } from '../../../../base/common/worker/simpleWorker.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { createWebWorker } from '../../../../base/browser/defaultWorkerFactory.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ILocalFileSearchSimpleWorker, LocalFileSearchSimpleWorkerHost } from '../common/localFileSearchWorkerTypes.js';
+import { memoize } from '../../../../base/common/decorators.js';
+import { HTMLFileSystemProvider } from '../../../../platform/files/browser/htmlFileSystemProvider.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { localize } from '../../../../nls.js';
+import { WebFileSystemAccess } from '../../../../platform/files/browser/webFileSystemAccess.js';
+import { revive } from '../../../../base/common/marshalling.js';
 
 export class RemoteSearchService extends SearchService {
 	constructor(
@@ -46,10 +46,9 @@ export class RemoteSearchService extends SearchService {
 	}
 }
 
-export class LocalFileSearchWorkerClient extends Disposable implements ISearchResultProvider, ILocalFileSearchSimpleWorkerHost {
+export class LocalFileSearchWorkerClient extends Disposable implements ISearchResultProvider {
 
 	protected _worker: IWorkerClient<ILocalFileSearchSimpleWorker> | null;
-	protected readonly _workerFactory: DefaultWorkerFactory;
 
 	private readonly _onDidReceiveTextSearchMatch = new Emitter<{ match: IFileMatch<UriComponents>; queryId: number }>();
 	readonly onDidReceiveTextSearchMatch: Event<{ match: IFileMatch<UriComponents>; queryId: number }> = this._onDidReceiveTextSearchMatch.event;
@@ -64,7 +63,10 @@ export class LocalFileSearchWorkerClient extends Disposable implements ISearchRe
 	) {
 		super();
 		this._worker = null;
-		this._workerFactory = new DefaultWorkerFactory('localFileSearchWorker');
+	}
+
+	async getAIName(): Promise<string | undefined> {
+		return undefined;
 	}
 
 	sendTextSearchMatch(match: IFileMatch<UriComponents>, queryId: number): void {
@@ -77,15 +79,15 @@ export class LocalFileSearchWorkerClient extends Disposable implements ISearchRe
 	}
 
 	private async cancelQuery(queryId: number) {
-		const proxy = await this._getOrCreateWorker().getProxyObject();
-		proxy.cancelQuery(queryId);
+		const proxy = this._getOrCreateWorker().proxy;
+		proxy.$cancelQuery(queryId);
 	}
 
 	async textSearch(query: ITextQuery, onProgress?: (p: ISearchProgressItem) => void, token?: CancellationToken): Promise<ISearchComplete> {
 		try {
 			const queryDisposables = new DisposableStore();
 
-			const proxy = await this._getOrCreateWorker().getProxyObject();
+			const proxy = this._getOrCreateWorker().proxy;
 			const results: IFileMatch[] = [];
 
 			let limitHit = false;
@@ -114,7 +116,7 @@ export class LocalFileSearchWorkerClient extends Disposable implements ISearchRe
 				}));
 
 				const ignorePathCasing = this.uriIdentityService.extUri.ignorePathCasing(fq.folder);
-				const folderResults = await proxy.searchDirectory(handle, query, fq, ignorePathCasing, queryId);
+				const folderResults = await proxy.$searchDirectory(handle, query, fq, ignorePathCasing, queryId);
 				for (const folderResult of folderResults.results) {
 					results.push(revive(folderResult));
 				}
@@ -144,7 +146,7 @@ export class LocalFileSearchWorkerClient extends Disposable implements ISearchRe
 			const queryDisposables = new DisposableStore();
 			let limitHit = false;
 
-			const proxy = await this._getOrCreateWorker().getProxyObject();
+			const proxy = this._getOrCreateWorker().proxy;
 			const results: IFileMatch[] = [];
 			await Promise.all(query.folderQueries.map(async fq => {
 				const queryId = this.queryId++;
@@ -156,7 +158,7 @@ export class LocalFileSearchWorkerClient extends Disposable implements ISearchRe
 					return;
 				}
 				const caseSensitive = this.uriIdentityService.extUri.ignorePathCasing(fq.folder);
-				const folderResults = await proxy.listDirectory(handle, query, fq, caseSensitive, queryId);
+				const folderResults = await proxy.$listDirectory(handle, query, fq, caseSensitive, queryId);
 				for (const folderResult of folderResults.results) {
 					results.push({ resource: URI.joinPath(fq.folder, folderResult) });
 				}
@@ -185,11 +187,15 @@ export class LocalFileSearchWorkerClient extends Disposable implements ISearchRe
 	private _getOrCreateWorker(): IWorkerClient<ILocalFileSearchSimpleWorker> {
 		if (!this._worker) {
 			try {
-				this._worker = this._register(new SimpleWorkerClient<ILocalFileSearchSimpleWorker, ILocalFileSearchSimpleWorkerHost>(
-					this._workerFactory,
+				this._worker = this._register(createWebWorker<ILocalFileSearchSimpleWorker>(
 					'vs/workbench/services/search/worker/localFileSearch',
-					this,
+					'LocalFileSearchWorker'
 				));
+				LocalFileSearchSimpleWorkerHost.setChannel(this._worker, {
+					$sendTextSearchMatch: (match, queryId) => {
+						return this.sendTextSearchMatch(match, queryId);
+					}
+				});
 			} catch (err) {
 				logOnceWebWorkerWarning(err);
 				throw err;
diff --git a/src/vs/workbench/services/search/common/fileSearchManager.ts b/src/vs/workbench/services/search/common/fileSearchManager.ts
index 1685b1f258f..e195f31bde8 100644
--- a/src/vs/workbench/services/search/common/fileSearchManager.ts
+++ b/src/vs/workbench/services/search/common/fileSearchManager.ts
@@ -3,15 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as path from 'vs/base/common/path';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import * as glob from 'vs/base/common/glob';
-import * as resources from 'vs/base/common/resources';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { URI } from 'vs/base/common/uri';
-import { IFileMatch, IFileSearchProviderStats, IFolderQuery, ISearchCompleteStats, IFileQuery, QueryGlobTester, resolvePatternsForProvider, hasSiblingFn } from 'vs/workbench/services/search/common/search';
-import { FileSearchProvider, FileSearchOptions } from 'vs/workbench/services/search/common/searchExtTypes';
+import * as path from '../../../../base/common/path.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { toErrorMessage } from '../../../../base/common/errorMessage.js';
+import * as glob from '../../../../base/common/glob.js';
+import * as resources from '../../../../base/common/resources.js';
+import { StopWatch } from '../../../../base/common/stopwatch.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IFileMatch, IFileSearchProviderStats, IFolderQuery, ISearchCompleteStats, IFileQuery, QueryGlobTester, resolvePatternsForProvider, hasSiblingFn, excludeToGlobPattern, DEFAULT_MAX_SEARCH_RESULTS } from './search.js';
+import { FileSearchProviderFolderOptions, FileSearchProviderNew, FileSearchProviderOptions } from './searchExtTypes.js';
+import { TernarySearchTree } from '../../../../base/common/ternarySearchTree.js';
+import { OldFileSearchProviderConverter } from './searchExtConversionTypes.js';
 
 interface IInternalFileMatch {
 	base: URI;
@@ -27,6 +29,13 @@ interface IDirectoryEntry {
 	basename: string;
 }
 
+interface FolderQueryInfo {
+	queryTester: QueryGlobTester;
+	noSiblingsClauses: boolean;
+	folder: URI;
+	tree: IDirectoryTree;
+}
+
 interface IDirectoryTree {
 	rootEntries: IDirectoryEntry[];
 	pathToEntries: { [relativePath: string]: IDirectoryEntry[] };
@@ -45,7 +54,7 @@ class FileSearchEngine {
 
 	private globalExcludePattern?: glob.ParsedExpression;
 
-	constructor(private config: IFileQuery, private provider: FileSearchProvider, private sessionToken?: CancellationToken) {
+	constructor(private config: IFileQuery, private provider: FileSearchProviderNew, private sessionLifecycle?: SessionLifecycle) {
 		this.filePattern = config.filePattern;
 		this.includePattern = config.includePattern && glob.parse(config.includePattern);
 		this.maxResults = config.maxResults || undefined;
@@ -90,13 +99,13 @@ class FileSearchEngine {
 					});
 			}
 
-			// For each root folder
-			Promise.all(folderQueries.map(fq => {
-				return this.searchInFolder(fq, onResult);
-			})).then(stats => {
+			// For each root folder'
+
+			// NEW: can just call with an array of folder info
+			this.doSearch(folderQueries, onResult).then(stats => {
 				resolve({
 					limitHit: this.isLimitHit,
-					stats: stats[0] || undefined // Only looking at single-folder workspace stats...
+					stats: stats || undefined // Only looking at single-folder workspace stats...
 				});
 			}, (err: Error) => {
 				reject(new Error(toErrorMessage(err)));
@@ -104,13 +113,25 @@ class FileSearchEngine {
 		});
 	}
 
-	private async searchInFolder(fq: IFolderQuery<URI>, onResult: (match: IInternalFileMatch) => void): Promise<IFileSearchProviderStats | null> {
-		const cancellation = new CancellationTokenSource();
-		const options = this.getSearchOptionsForFolder(fq);
-		const tree = this.initDirectoryTree();
 
-		const queryTester = new QueryGlobTester(this.config, fq);
-		const noSiblingsClauses = !queryTester.hasSiblingExcludeClauses();
+	private async doSearch(fqs: IFolderQuery<URI>[], onResult: (match: IInternalFileMatch) => void): Promise<IFileSearchProviderStats | null> {
+		const cancellation = new CancellationTokenSource();
+		const folderOptions = fqs.map(fq => this.getSearchOptionsForFolder(fq));
+		const session = this.provider instanceof OldFileSearchProviderConverter ? this.sessionLifecycle?.tokenSource.token : this.sessionLifecycle?.obj;
+		const options: FileSearchProviderOptions = {
+			folderOptions,
+			maxResults: this.config.maxResults ?? DEFAULT_MAX_SEARCH_RESULTS,
+			session
+		};
+
+
+		const folderMappings: TernarySearchTree<URI, FolderQueryInfo> = TernarySearchTree.forUris<FolderQueryInfo>();
+		fqs.forEach(fq => {
+			const queryTester = new QueryGlobTester(this.config, fq);
+			const noSiblingsClauses = !queryTester.hasSiblingExcludeClauses();
+			folderMappings.set(fq.folder, { queryTester, noSiblingsClauses, folder: fq.folder, tree: this.initDirectoryTree() });
+		});
+
 
 		let providerSW: StopWatch;
 
@@ -119,9 +140,7 @@ class FileSearchEngine {
 
 			providerSW = StopWatch.create();
 			const results = await this.provider.provideFileSearchResults(
-				{
-					pattern: this.config.filePattern || ''
-				},
+				this.config.filePattern || '',
 				options,
 				cancellation.token);
 			const providerTime = providerSW.elapsed();
@@ -131,19 +150,22 @@ class FileSearchEngine {
 				return null;
 			}
 
+
 			if (results) {
 				results.forEach(result => {
-					const relativePath = path.posix.relative(fq.folder.path, result.path);
 
-					if (noSiblingsClauses) {
+					const fqFolderInfo = folderMappings.findSubstr(result)!;
+					const relativePath = path.posix.relative(fqFolderInfo.folder.path, result.path);
+
+					if (fqFolderInfo.noSiblingsClauses) {
 						const basename = path.basename(result.path);
-						this.matchFile(onResult, { base: fq.folder, relativePath, basename });
+						this.matchFile(onResult, { base: fqFolderInfo.folder, relativePath, basename });
 
 						return;
 					}
 
 					// TODO: Optimize siblings clauses with ripgrep here.
-					this.addDirectoryEntries(tree, fq.folder, relativePath, onResult);
+					this.addDirectoryEntries(fqFolderInfo.tree, fqFolderInfo.folder, relativePath, onResult);
 				});
 			}
 
@@ -151,7 +173,10 @@ class FileSearchEngine {
 				return null;
 			}
 
-			this.matchDirectoryTree(tree, queryTester, onResult);
+			folderMappings.forEach(e => {
+				this.matchDirectoryTree(e.tree, e.queryTester, onResult);
+			});
+
 			return {
 				providerTime,
 				postProcessTime: postProcessSW.elapsed()
@@ -162,20 +187,30 @@ class FileSearchEngine {
 		}
 	}
 
-	private getSearchOptionsForFolder(fq: IFolderQuery<URI>): FileSearchOptions {
+	private getSearchOptionsForFolder(fq: IFolderQuery<URI>): FileSearchProviderFolderOptions {
 		const includes = resolvePatternsForProvider(this.config.includePattern, fq.includePattern);
-		const excludes = resolvePatternsForProvider(this.config.excludePattern, fq.excludePattern);
+		let excludePattern = fq.excludePattern?.map(e => ({
+			folder: e.folder,
+			patterns: resolvePatternsForProvider(this.config.excludePattern, e.pattern)
+		}));
+		if (!excludePattern?.length) {
+			excludePattern = [{
+				folder: undefined,
+				patterns: resolvePatternsForProvider(this.config.excludePattern, undefined)
+			}];
+		}
+		const excludes = excludeToGlobPattern(excludePattern);
 
 		return {
 			folder: fq.folder,
 			excludes,
 			includes,
-			useIgnoreFiles: !fq.disregardIgnoreFiles,
-			useGlobalIgnoreFiles: !fq.disregardGlobalIgnoreFiles,
-			useParentIgnoreFiles: !fq.disregardParentIgnoreFiles,
+			useIgnoreFiles: {
+				local: !fq.disregardIgnoreFiles,
+				parent: !fq.disregardParentIgnoreFiles,
+				global: !fq.disregardGlobalIgnoreFiles
+			},
 			followSymlinks: !fq.ignoreSymlinks,
-			maxResults: this.config.maxResults,
-			session: this.sessionToken
 		};
 	}
 
@@ -268,15 +303,41 @@ interface IInternalSearchComplete {
 	stats?: IFileSearchProviderStats;
 }
 
+/**
+ * For backwards compatibility, store both a cancellation token and a session object. The session object is the new implementation, where
+ */
+class SessionLifecycle {
+	private _obj: object | undefined;
+	public readonly tokenSource: CancellationTokenSource;
+
+	constructor() {
+		this._obj = new Object();
+		this.tokenSource = new CancellationTokenSource();
+	}
+
+	public get obj() {
+		if (this._obj) {
+			return this._obj;
+		}
+
+		throw new Error('Session object has been dereferenced.');
+	}
+
+	cancel() {
+		this.tokenSource.cancel();
+		this._obj = undefined; // dereference
+	}
+}
+
 export class FileSearchManager {
 
 	private static readonly BATCH_SIZE = 512;
 
-	private readonly sessions = new Map<string, CancellationTokenSource>();
+	private readonly sessions = new Map<string, SessionLifecycle>();
 
-	fileSearch(config: IFileQuery, provider: FileSearchProvider, onBatch: (matches: IFileMatch[]) => void, token: CancellationToken): Promise<ISearchCompleteStats> {
+	fileSearch(config: IFileQuery, provider: FileSearchProviderNew, onBatch: (matches: IFileMatch[]) => void, token: CancellationToken): Promise<ISearchCompleteStats> {
 		const sessionTokenSource = this.getSessionTokenSource(config.cacheKey);
-		const engine = new FileSearchEngine(config, provider, sessionTokenSource && sessionTokenSource.token);
+		const engine = new FileSearchEngine(config, provider, sessionTokenSource);
 
 		let resultCount = 0;
 		const onInternalResult = (batch: IInternalFileMatch[]) => {
@@ -300,17 +361,19 @@ export class FileSearchManager {
 	}
 
 	clearCache(cacheKey: string): void {
-		const sessionTokenSource = this.getSessionTokenSource(cacheKey);
-		sessionTokenSource?.cancel();
+		// cancel the token
+		this.sessions.get(cacheKey)?.cancel();
+		// with no reference to this, it will be removed from WeakMaps
+		this.sessions.delete(cacheKey);
 	}
 
-	private getSessionTokenSource(cacheKey: string | undefined): CancellationTokenSource | undefined {
+	private getSessionTokenSource(cacheKey: string | undefined): SessionLifecycle | undefined {
 		if (!cacheKey) {
 			return undefined;
 		}
 
 		if (!this.sessions.has(cacheKey)) {
-			this.sessions.set(cacheKey, new CancellationTokenSource());
+			this.sessions.set(cacheKey, new SessionLifecycle());
 		}
 
 		return this.sessions.get(cacheKey);
diff --git a/src/vs/workbench/services/search/common/getFileResults.ts b/src/vs/workbench/services/search/common/getFileResults.ts
index 366f8b030ef..88b24b6568b 100644
--- a/src/vs/workbench/services/search/common/getFileResults.ts
+++ b/src/vs/workbench/services/search/common/getFileResults.ts
@@ -3,17 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ITextSearchResult } from 'vs/workbench/services/search/common/search';
-import { TextSearchPreviewOptions } from 'vs/workbench/services/search/common/searchExtTypes';
-import { Range } from 'vs/editor/common/core/range';
+import { ITextSearchMatch, ITextSearchPreviewOptions, ITextSearchResult } from './search.js';
+import { Range } from '../../../../editor/common/core/range.js';
 
 export const getFileResults = (
 	bytes: Uint8Array,
 	pattern: RegExp,
 	options: {
-		beforeContext: number;
-		afterContext: number;
-		previewOptions: TextSearchPreviewOptions | undefined;
+		surroundingContext: number;
+		previewOptions: ITextSearchPreviewOptions | undefined;
 		remainingResultQuota: number;
 	}
 ): ITextSearchResult[] => {
@@ -71,8 +69,8 @@ export const getFileResults = (
 				endLine++;
 			}
 
-			if (options.beforeContext) {
-				for (let contextLine = Math.max(0, startLine - options.beforeContext); contextLine < startLine; contextLine++) {
+			if (options.surroundingContext) {
+				for (let contextLine = Math.max(0, startLine - options.surroundingContext); contextLine < startLine; contextLine++) {
 					contextLinesNeeded.add(contextLine);
 				}
 			}
@@ -102,14 +100,18 @@ export const getFileResults = (
 				matchStartIndex + matchedText.length - lineRanges[endLine].start - (endLine === startLine ? offset : 0)
 			);
 
-			const match: ITextSearchResult = {
-				ranges: fileRange,
-				preview: { text: previewText, matches: previewRange },
+			const match: ITextSearchMatch = {
+				rangeLocations: [{
+					source: fileRange,
+					preview: previewRange,
+				}],
+				previewText: previewText
 			};
+
 			results.push(match);
 
-			if (options.afterContext) {
-				for (let contextLine = endLine + 1; contextLine <= Math.min(endLine + options.afterContext, lineRanges.length - 1); contextLine++) {
+			if (options.surroundingContext) {
+				for (let contextLine = endLine + 1; contextLine <= Math.min(endLine + options.surroundingContext, lineRanges.length - 1); contextLine++) {
 					contextLinesNeeded.add(contextLine);
 				}
 			}
diff --git a/src/vs/workbench/services/search/common/ignoreFile.ts b/src/vs/workbench/services/search/common/ignoreFile.ts
index 9de868fdeff..c46a7095d1e 100644
--- a/src/vs/workbench/services/search/common/ignoreFile.ts
+++ b/src/vs/workbench/services/search/common/ignoreFile.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as glob from 'vs/base/common/glob';
+import * as glob from '../../../../base/common/glob.js';
 
 
 export class IgnoreFile {
diff --git a/src/vs/workbench/services/search/common/localFileSearchWorkerTypes.ts b/src/vs/workbench/services/search/common/localFileSearchWorkerTypes.ts
index 8b51e88bedd..64037018e6c 100644
--- a/src/vs/workbench/services/search/common/localFileSearchWorkerTypes.ts
+++ b/src/vs/workbench/services/search/common/localFileSearchWorkerTypes.ts
@@ -3,8 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { UriComponents } from 'vs/base/common/uri';
-import { IFileMatch, IFileQueryProps, IFolderQuery, ITextQueryProps } from 'vs/workbench/services/search/common/search';
+import { UriComponents } from '../../../../base/common/uri.js';
+import { IWorkerClient, IWorkerServer } from '../../../../base/common/worker/simpleWorker.js';
+import { IFileMatch, IFileQueryProps, IFolderQuery, ITextQueryProps } from './search.js';
 
 export interface IWorkerTextSearchComplete {
 	results: IFileMatch<UriComponents>[];
@@ -41,12 +42,20 @@ export interface IWorkerFileSystemFileHandle extends IWorkerFileSystemHandle {
 export interface ILocalFileSearchSimpleWorker {
 	_requestHandlerBrand: any;
 
-	cancelQuery(queryId: number): void;
+	$cancelQuery(queryId: number): void;
 
-	listDirectory(handle: IWorkerFileSystemDirectoryHandle, queryProps: IFileQueryProps<UriComponents>, folderQuery: IFolderQuery, ignorePathCasing: boolean, queryId: number): Promise<IWorkerFileSearchComplete>;
-	searchDirectory(handle: IWorkerFileSystemDirectoryHandle, queryProps: ITextQueryProps<UriComponents>, folderQuery: IFolderQuery, ignorePathCasing: boolean, queryId: number): Promise<IWorkerTextSearchComplete>;
+	$listDirectory(handle: IWorkerFileSystemDirectoryHandle, queryProps: IFileQueryProps<UriComponents>, folderQuery: IFolderQuery, ignorePathCasing: boolean, queryId: number): Promise<IWorkerFileSearchComplete>;
+	$searchDirectory(handle: IWorkerFileSystemDirectoryHandle, queryProps: ITextQueryProps<UriComponents>, folderQuery: IFolderQuery, ignorePathCasing: boolean, queryId: number): Promise<IWorkerTextSearchComplete>;
 }
 
-export interface ILocalFileSearchSimpleWorkerHost {
-	sendTextSearchMatch(match: IFileMatch<UriComponents>, queryId: number): void;
+export abstract class LocalFileSearchSimpleWorkerHost {
+	public static CHANNEL_NAME = 'localFileSearchWorkerHost';
+	public static getChannel(workerServer: IWorkerServer): LocalFileSearchSimpleWorkerHost {
+		return workerServer.getChannel<LocalFileSearchSimpleWorkerHost>(LocalFileSearchSimpleWorkerHost.CHANNEL_NAME);
+	}
+	public static setChannel(workerClient: IWorkerClient<any>, obj: LocalFileSearchSimpleWorkerHost): void {
+		workerClient.setChannel<LocalFileSearchSimpleWorkerHost>(LocalFileSearchSimpleWorkerHost.CHANNEL_NAME, obj);
+	}
+
+	abstract $sendTextSearchMatch(match: IFileMatch<UriComponents>, queryId: number): void;
 }
diff --git a/src/vs/workbench/services/search/common/queryBuilder.ts b/src/vs/workbench/services/search/common/queryBuilder.ts
index 0db88575f27..4b712c6be50 100644
--- a/src/vs/workbench/services/search/common/queryBuilder.ts
+++ b/src/vs/workbench/services/search/common/queryBuilder.ts
@@ -3,25 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as arrays from 'vs/base/common/arrays';
-import * as collections from 'vs/base/common/collections';
-import * as glob from 'vs/base/common/glob';
-import { untildify } from 'vs/base/common/labels';
-import { ResourceMap } from 'vs/base/common/map';
-import { Schemas } from 'vs/base/common/network';
-import * as path from 'vs/base/common/path';
-import { isEqual, basename, relativePath, isAbsolutePath } from 'vs/base/common/resources';
-import * as strings from 'vs/base/common/strings';
-import { assertIsDefined, isDefined } from 'vs/base/common/types';
-import { URI, URI as uri } from 'vs/base/common/uri';
-import { isMultilineRegexSource } from 'vs/editor/common/model/textModelSearch';
-import * as nls from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IWorkspaceContextService, IWorkspaceFolderData, toWorkspaceFolder, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { getExcludes, ICommonQueryProps, IFileQuery, IFolderQuery, IPatternInfo, ISearchConfiguration, ITextQuery, ITextSearchPreviewOptions, pathIncludedInQuery, QueryType } from 'vs/workbench/services/search/common/search';
+import * as arrays from '../../../../base/common/arrays.js';
+import * as collections from '../../../../base/common/collections.js';
+import * as glob from '../../../../base/common/glob.js';
+import { untildify } from '../../../../base/common/labels.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { Schemas } from '../../../../base/common/network.js';
+import * as path from '../../../../base/common/path.js';
+import { isEqual, basename, relativePath, isAbsolutePath } from '../../../../base/common/resources.js';
+import * as strings from '../../../../base/common/strings.js';
+import { assertIsDefined, isDefined } from '../../../../base/common/types.js';
+import { URI, URI as uri, UriComponents } from '../../../../base/common/uri.js';
+import { isMultilineRegexSource } from '../../../../editor/common/model/textModelSearch.js';
+import * as nls from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IWorkspaceContextService, IWorkspaceFolderData, toWorkspaceFolder, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { IEditorGroupsService } from '../../editor/common/editorGroupsService.js';
+import { IPathService } from '../../path/common/pathService.js';
+import { ExcludeGlobPattern, getExcludes, IAITextQuery, ICommonQueryProps, IFileQuery, IFolderQuery, IPatternInfo, ISearchConfiguration, ITextQuery, ITextSearchPreviewOptions, pathIncludedInQuery, QueryType } from './search.js';
+import { GlobPattern } from './searchExtTypes.js';
 
 /**
  * One folder to search and a glob expression that should be applied.
@@ -39,6 +41,31 @@ export interface ISearchPathPattern {
 	pattern?: glob.IExpression;
 }
 
+type ISearchPathPatternBuilder = string | string[];
+
+export interface ISearchPatternBuilder<U extends UriComponents> {
+	uri?: U;
+	pattern: ISearchPathPatternBuilder;
+}
+
+export function isISearchPatternBuilder<U extends UriComponents>(object: ISearchPatternBuilder<U> | ISearchPathPatternBuilder): object is ISearchPatternBuilder<U> {
+	return (typeof object === 'object' && 'uri' in object && 'pattern' in object);
+}
+
+export function globPatternToISearchPatternBuilder(globPattern: GlobPattern): ISearchPatternBuilder<URI> {
+
+	if (typeof globPattern === 'string') {
+		return {
+			pattern: globPattern
+		};
+	}
+
+	return {
+		pattern: globPattern.pattern,
+		uri: globPattern.baseUri
+	};
+}
+
 /**
  * A set of search paths and a set of glob expressions that should be applied.
  */
@@ -47,11 +74,11 @@ export interface ISearchPathsInfo {
 	pattern?: glob.IExpression;
 }
 
-interface ICommonQueryBuilderOptions {
+interface ICommonQueryBuilderOptions<U extends UriComponents = URI> {
 	_reason?: string;
-	excludePattern?: string | string[];
-	includePattern?: string | string[];
-	extraFileResources?: uri[];
+	excludePattern?: ISearchPatternBuilder<U>[];
+	includePattern?: ISearchPathPatternBuilder;
+	extraFileResources?: U[];
 
 	/** Parse the special ./ syntax supported by the searchview, and expand foo to ** /foo */
 	expandPatterns?: boolean;
@@ -65,9 +92,10 @@ interface ICommonQueryBuilderOptions {
 	disregardSearchExcludeSettings?: boolean;
 	ignoreSymlinks?: boolean;
 	onlyOpenEditors?: boolean;
+	onlyFileScheme?: boolean;
 }
 
-export interface IFileQueryBuilderOptions extends ICommonQueryBuilderOptions {
+export interface IFileQueryBuilderOptions<U extends UriComponents = URI> extends ICommonQueryBuilderOptions<U> {
 	filePattern?: string;
 	exists?: boolean;
 	sortByScore?: boolean;
@@ -75,11 +103,10 @@ export interface IFileQueryBuilderOptions extends ICommonQueryBuilderOptions {
 	shouldGlobSearch?: boolean;
 }
 
-export interface ITextQueryBuilderOptions extends ICommonQueryBuilderOptions {
+export interface ITextQueryBuilderOptions<U extends UriComponents = URI> extends ICommonQueryBuilderOptions<U> {
 	previewOptions?: ITextSearchPreviewOptions;
 	fileEncoding?: string;
-	beforeContext?: number;
-	afterContext?: number;
+	surroundingContext?: number;
 	isSmartCase?: boolean;
 	notebookSearchConfig?: {
 		includeMarkupInput: boolean;
@@ -96,10 +123,20 @@ export class QueryBuilder {
 		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
 		@IEditorGroupsService private readonly editorGroupsService: IEditorGroupsService,
 		@ILogService private readonly logService: ILogService,
-		@IPathService private readonly pathService: IPathService
+		@IPathService private readonly pathService: IPathService,
+		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService
 	) {
 	}
 
+	aiText(contentPattern: string, folderResources?: uri[], options: ITextQueryBuilderOptions = {}): IAITextQuery {
+		const commonQuery = this.commonQuery(folderResources?.map(toWorkspaceFolder), options);
+		return {
+			...commonQuery,
+			type: QueryType.aiText,
+			contentPattern,
+		};
+	}
+
 	text(contentPattern: IPatternInfo, folderResources?: uri[], options: ITextQueryBuilderOptions = {}): ITextQuery {
 		contentPattern = this.getContentPattern(contentPattern, options);
 		const searchConfig = this.configurationService.getValue<ISearchConfiguration>();
@@ -117,8 +154,7 @@ export class QueryBuilder {
 			previewOptions: options.previewOptions,
 			maxFileSize: options.maxFileSize,
 			usePCRE2: searchConfig.search.usePCRE2 || fallbackToPCRE || false,
-			beforeContext: options.beforeContext,
-			afterContext: options.afterContext,
+			surroundingContext: options.surroundingContext,
 			userDisabledExcludesAndIgnoreFiles: options.disregardExcludeSettings && options.disregardIgnoreFiles,
 
 		};
@@ -198,15 +234,25 @@ export class QueryBuilder {
 			return {};
 		}
 
-		pattern = Array.isArray(pattern) ? pattern.map(normalizeSlashes) : normalizeSlashes(pattern);
+		if (Array.isArray(pattern)) {
+			pattern = pattern.filter(p => p.length > 0).map(normalizeSlashes);
+			if (!pattern.length) {
+				return {};
+			}
+		} else {
+			pattern = normalizeSlashes(pattern);
+		}
 		return expandPatterns
 			? this.parseSearchPaths(pattern)
 			: { pattern: patternListToIExpression(...(Array.isArray(pattern) ? pattern : [pattern])) };
 	}
 
 	private commonQuery(folderResources: (IWorkspaceFolderData | URI)[] = [], options: ICommonQueryBuilderOptions = {}): ICommonQueryProps<uri> {
+
+		let excludePatterns: string | string[] | undefined = Array.isArray(options.excludePattern) ? options.excludePattern.map(p => p.pattern).flat() : options.excludePattern;
+		excludePatterns = excludePatterns?.length === 1 ? excludePatterns[0] : excludePatterns;
 		const includeSearchPathsInfo: ISearchPathsInfo = this.handleIncludeExclude(options.includePattern, options.expandPatterns);
-		const excludeSearchPathsInfo: ISearchPathsInfo = this.handleIncludeExclude(options.excludePattern, options.expandPatterns);
+		const excludeSearchPathsInfo: ISearchPathsInfo = this.handleIncludeExclude(excludePatterns, options.expandPatterns);
 
 		// Build folderQueries from searchPaths, if given, otherwise folderResources
 		const includeFolderName = folderResources.length > 1;
@@ -224,7 +270,8 @@ export class QueryBuilder {
 			excludePattern: excludeSearchPathsInfo.pattern,
 			includePattern: includeSearchPathsInfo.pattern,
 			onlyOpenEditors: options.onlyOpenEditors,
-			maxResults: options.maxResults
+			maxResults: options.maxResults,
+			onlyFileScheme: options.onlyFileScheme
 		};
 
 		if (options.onlyOpenEditors) {
@@ -254,7 +301,8 @@ export class QueryBuilder {
 			const providerExists = isAbsolutePath(file);
 			// Special case userdata as we don't have a search provider for it, but it can be searched.
 			if (providerExists) {
-				const searchRoot = this.workspaceContextService.getWorkspaceFolder(file)?.uri ?? file.with({ path: path.dirname(file.fsPath) });
+
+				const searchRoot = this.workspaceContextService.getWorkspaceFolder(file)?.uri ?? this.uriIdentityService.extUri.dirname(file);
 
 				let folderQuery = foldersToSearch.get(searchRoot);
 				if (!folderQuery) {
@@ -522,6 +570,18 @@ export class QueryBuilder {
 	private getFolderQueryForRoot(folder: (IWorkspaceFolderData | URI), options: ICommonQueryBuilderOptions, searchPathExcludes: ISearchPathsInfo, includeFolderName: boolean): IFolderQuery | null {
 		let thisFolderExcludeSearchPathPattern: glob.IExpression | undefined;
 		const folderUri = URI.isUri(folder) ? folder : folder.uri;
+
+		// only use exclude root if it is different from the folder root
+		let excludeFolderRoots = options.excludePattern?.map(excludePattern => {
+			const excludeRoot = options.excludePattern && isISearchPatternBuilder(excludePattern) ? excludePattern.uri : undefined;
+			const shouldUseExcludeRoot = (!excludeRoot || !(URI.isUri(folder) && this.uriIdentityService.extUri.isEqual(folder, excludeRoot)));
+			return shouldUseExcludeRoot ? excludeRoot : undefined;
+		});
+
+		if (!excludeFolderRoots?.length) {
+			excludeFolderRoots = [undefined];
+		}
+
 		if (searchPathExcludes.searchPaths) {
 			const thisFolderExcludeSearchPath = searchPathExcludes.searchPaths.filter(sp => isEqual(sp.searchPath, folderUri))[0];
 			if (thisFolderExcludeSearchPath && !thisFolderExcludeSearchPath.pattern) {
@@ -540,10 +600,18 @@ export class QueryBuilder {
 		};
 
 		const folderName = URI.isUri(folder) ? basename(folder) : folder.name;
+
+		const excludePatternRet: ExcludeGlobPattern[] = excludeFolderRoots.map(excludeFolderRoot => {
+			return Object.keys(excludePattern).length > 0 ? {
+				folder: excludeFolderRoot,
+				pattern: excludePattern
+			} satisfies ExcludeGlobPattern : undefined;
+		}).filter((e) => e) as ExcludeGlobPattern[];
+
 		return {
 			folder: folderUri,
 			folderName: includeFolderName ? folderName : undefined,
-			excludePattern: Object.keys(excludePattern).length > 0 ? excludePattern : undefined,
+			excludePattern: excludePatternRet,
 			fileEncoding: folderConfig.files && folderConfig.files.encoding,
 			disregardIgnoreFiles: typeof options.disregardIgnoreFiles === 'boolean' ? options.disregardIgnoreFiles : !folderConfig.search.useIgnoreFiles,
 			disregardGlobalIgnoreFiles: typeof options.disregardGlobalIgnoreFiles === 'boolean' ? options.disregardGlobalIgnoreFiles : !folderConfig.search.useGlobalIgnoreFiles,
diff --git a/src/vs/workbench/services/search/common/replace.ts b/src/vs/workbench/services/search/common/replace.ts
index 73cbaac691d..55c84dffad2 100644
--- a/src/vs/workbench/services/search/common/replace.ts
+++ b/src/vs/workbench/services/search/common/replace.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as strings from 'vs/base/common/strings';
-import { IPatternInfo } from 'vs/workbench/services/search/common/search';
-import { CharCode } from 'vs/base/common/charCode';
-import { buildReplaceStringWithCasePreserved } from 'vs/base/common/search';
+import * as strings from '../../../../base/common/strings.js';
+import { IPatternInfo } from './search.js';
+import { CharCode } from '../../../../base/common/charCode.js';
+import { buildReplaceStringWithCasePreserved } from '../../../../base/common/search.js';
 
 export class ReplacePattern {
 
diff --git a/src/vs/workbench/services/search/common/search.ts b/src/vs/workbench/services/search/common/search.ts
index d03e606db74..04a26c0a549 100644
--- a/src/vs/workbench/services/search/common/search.ts
+++ b/src/vs/workbench/services/search/common/search.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { mapArrayOrNot } from 'vs/base/common/arrays';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import * as glob from 'vs/base/common/glob';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import * as objects from 'vs/base/common/objects';
-import * as extpath from 'vs/base/common/extpath';
-import { fuzzyContains, getNLines } from 'vs/base/common/strings';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { IFilesConfiguration } from 'vs/platform/files/common/files';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ITelemetryData } from 'vs/platform/telemetry/common/telemetry';
-import { Event } from 'vs/base/common/event';
-import * as paths from 'vs/base/common/path';
-import { isCancellationError } from 'vs/base/common/errors';
-import { TextSearchCompleteMessageType } from 'vs/workbench/services/search/common/searchExtTypes';
-import { isThenable } from 'vs/base/common/async';
-import { ResourceSet } from 'vs/base/common/map';
+import { mapArrayOrNot } from '../../../../base/common/arrays.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import * as glob from '../../../../base/common/glob.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import * as objects from '../../../../base/common/objects.js';
+import * as extpath from '../../../../base/common/extpath.js';
+import { fuzzyContains, getNLines } from '../../../../base/common/strings.js';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
+import { IFilesConfiguration } from '../../../../platform/files/common/files.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { ITelemetryData } from '../../../../platform/telemetry/common/telemetry.js';
+import { Event } from '../../../../base/common/event.js';
+import * as paths from '../../../../base/common/path.js';
+import { isCancellationError } from '../../../../base/common/errors.js';
+import { GlobPattern, TextSearchCompleteMessageType } from './searchExtTypes.js';
+import { isThenable } from '../../../../base/common/async.js';
+import { ResourceSet } from '../../../../base/common/map.js';
 
 export { TextSearchCompleteMessageType };
 
@@ -46,6 +46,7 @@ export interface ISearchService {
 	readonly _serviceBrand: undefined;
 	textSearch(query: ITextQuery, token?: CancellationToken, onProgress?: (result: ISearchProgressItem) => void): Promise<ISearchComplete>;
 	aiTextSearch(query: IAITextQuery, token?: CancellationToken, onProgress?: (result: ISearchProgressItem) => void): Promise<ISearchComplete>;
+	getAIName(): Promise<string | undefined>;
 	textSearchSplitSyncAsync(query: ITextQuery, token?: CancellationToken | undefined, onProgress?: ((result: ISearchProgressItem) => void) | undefined, notebookFilesToIgnore?: ResourceSet, asyncNotebookFilesToIgnore?: Promise<ResourceSet>): { syncResults: ISearchComplete; asyncResults: Promise<ISearchComplete> };
 	fileSearch(query: IFileQuery, token?: CancellationToken): Promise<ISearchComplete>;
 	clearCache(cacheKey: string): Promise<void>;
@@ -62,15 +63,22 @@ export const enum SearchProviderType {
 }
 
 export interface ISearchResultProvider {
+	getAIName(): Promise<string | undefined>;
 	textSearch(query: ITextQuery, onProgress?: (p: ISearchProgressItem) => void, token?: CancellationToken): Promise<ISearchComplete>;
 	fileSearch(query: IFileQuery, token?: CancellationToken): Promise<ISearchComplete>;
 	clearCache(cacheKey: string): Promise<void>;
 }
 
+
+export interface ExcludeGlobPattern<U extends UriComponents = URI> {
+	folder?: U;
+	pattern: glob.IExpression;
+}
+
 export interface IFolderQuery<U extends UriComponents = URI> {
 	folder: U;
 	folderName?: string;
-	excludePattern?: glob.IExpression;
+	excludePattern?: ExcludeGlobPattern<U>[];
 	includePattern?: glob.IExpression;
 	fileEncoding?: string;
 	disregardIgnoreFiles?: boolean;
@@ -94,6 +102,7 @@ export interface ICommonQueryProps<U extends UriComponents> {
 
 	maxResults?: number;
 	usingSearchPaths?: boolean;
+	onlyFileScheme?: boolean;
 }
 
 export interface IFileQueryProps<U extends UriComponents> extends ICommonQueryProps<U> {
@@ -120,8 +129,7 @@ export interface ITextQueryProps<U extends UriComponents> extends ICommonQueryPr
 	previewOptions?: ITextSearchPreviewOptions;
 	maxFileSize?: number;
 	usePCRE2?: boolean;
-	afterContext?: number;
-	beforeContext?: number;
+	surroundingContext?: number;
 
 	userDisabledExcludesAndIgnoreFiles?: boolean;
 }
@@ -132,8 +140,7 @@ export interface IAITextQueryProps<U extends UriComponents> extends ICommonQuery
 
 	previewOptions?: ITextSearchPreviewOptions;
 	maxFileSize?: number;
-	afterContext?: number;
-	beforeContext?: number;
+	surroundingContext?: number;
 
 	userDisabledExcludesAndIgnoreFiles?: boolean;
 }
@@ -205,17 +212,12 @@ export interface ISearchRange {
 	readonly endColumn: number;
 }
 
-export interface ITextSearchResultPreview {
-	text: string;
-	matches: ISearchRange | ISearchRange[];
-	cellFragment?: string;
-}
-
 export interface ITextSearchMatch<U extends UriComponents = URI> {
 	uri?: U;
-	ranges: ISearchRange | ISearchRange[];
-	preview: ITextSearchResultPreview;
+	rangeLocations: SearchRangeSetPairing[];
+	previewText: string;
 	webviewIndex?: number;
+	cellFragment?: string;
 }
 
 export interface ITextSearchContext<U extends UriComponents = URI> {
@@ -227,7 +229,7 @@ export interface ITextSearchContext<U extends UriComponents = URI> {
 export type ITextSearchResult<U extends UriComponents = URI> = ITextSearchMatch<U> | ITextSearchContext<U>;
 
 export function resultIsMatch(result: ITextSearchResult): result is ITextSearchMatch {
-	return !!(<ITextSearchMatch>result).preview;
+	return !!(<ITextSearchMatch>result).rangeLocations && !!(<ITextSearchMatch>result).previewText;
 }
 
 export interface IProgressMessage {
@@ -306,20 +308,25 @@ export class FileMatch implements IFileMatch {
 	}
 }
 
+export interface SearchRangeSetPairing {
+	source: ISearchRange;
+	preview: ISearchRange;
+}
+
 export class TextSearchMatch implements ITextSearchMatch {
-	ranges: ISearchRange | ISearchRange[];
-	preview: ITextSearchResultPreview;
+	rangeLocations: SearchRangeSetPairing[] = [];
+	previewText: string;
 	webviewIndex?: number;
 
-	constructor(text: string, range: ISearchRange | ISearchRange[], previewOptions?: ITextSearchPreviewOptions, webviewIndex?: number) {
-		this.ranges = range;
+	constructor(text: string, ranges: ISearchRange | ISearchRange[], previewOptions?: ITextSearchPreviewOptions, webviewIndex?: number) {
 		this.webviewIndex = webviewIndex;
 
 		// Trim preview if this is one match and a single-line match with a preview requested.
 		// Otherwise send the full text, like for replace or for showing multiple previews.
 		// TODO this is fishy.
-		const ranges = Array.isArray(range) ? range : [range];
-		if (previewOptions && previewOptions.matchLines === 1 && isSingleLineRangeList(ranges)) {
+		const rangesArr = Array.isArray(ranges) ? ranges : [ranges];
+
+		if (previewOptions && previewOptions.matchLines === 1 && isSingleLineRangeList(rangesArr)) {
 			// 1 line preview requested
 			text = getNLines(text, previewOptions.matchLines);
 
@@ -327,8 +334,7 @@ export class TextSearchMatch implements ITextSearchMatch {
 			let shift = 0;
 			let lastEnd = 0;
 			const leadingChars = Math.floor(previewOptions.charsPerLine / 5);
-			const matches: ISearchRange[] = [];
-			for (const range of ranges) {
+			for (const range of rangesArr) {
 				const previewStart = Math.max(range.startColumn - leadingChars, 0);
 				const previewEnd = range.startColumn + previewOptions.charsPerLine;
 				if (previewStart > lastEnd + leadingChars + SEARCH_ELIDED_MIN_LEN) {
@@ -339,18 +345,25 @@ export class TextSearchMatch implements ITextSearchMatch {
 					result += text.slice(lastEnd, previewEnd);
 				}
 
-				matches.push(new OneLineRange(0, range.startColumn - shift, range.endColumn - shift));
 				lastEnd = previewEnd;
+				this.rangeLocations.push({
+					source: range,
+					preview: new OneLineRange(0, range.startColumn - shift, range.endColumn - shift)
+				});
+
 			}
 
-			this.preview = { text: result, matches: Array.isArray(this.ranges) ? matches : matches[0] };
+			this.previewText = result;
 		} else {
-			const firstMatchLine = Array.isArray(range) ? range[0].startLineNumber : range.startLineNumber;
+			const firstMatchLine = Array.isArray(ranges) ? ranges[0].startLineNumber : ranges.startLineNumber;
 
-			this.preview = {
-				text,
-				matches: mapArrayOrNot(range, r => new SearchRange(r.startLineNumber - firstMatchLine, r.startColumn, r.endLineNumber - firstMatchLine, r.endColumn))
-			};
+			const rangeLocs = mapArrayOrNot(ranges, r => ({
+				preview: new SearchRange(r.startLineNumber - firstMatchLine, r.startColumn, r.endLineNumber - firstMatchLine, r.endColumn),
+				source: r
+			}));
+
+			this.rangeLocations = Array.isArray(rangeLocs) ? rangeLocs : [rangeLocs];
+			this.previewText = text;
 		}
 	}
 }
@@ -430,6 +443,7 @@ export interface ISearchConfigurationProperties {
 		singleClickBehaviour: 'default' | 'peekDefinition';
 		reusePriorSearchConfiguration: boolean;
 		defaultNumberOfContextLines: number | null;
+		focusResultsOnSearch: boolean;
 		experimental: {};
 	};
 	sortOrder: SearchSortOrder;
@@ -462,7 +476,7 @@ export function getExcludes(configuration: ISearchConfiguration, includeSearchEx
 	}
 
 	if (!fileExcludes || !searchExcludes) {
-		return fileExcludes || searchExcludes;
+		return fileExcludes || searchExcludes || undefined;
 	}
 
 	let allExcludes: glob.IExpression = Object.create(null);
@@ -669,17 +683,26 @@ export function resolvePatternsForProvider(globalPattern: glob.IExpression | und
 
 export class QueryGlobTester {
 
-	private _excludeExpression: glob.IExpression;
-	private _parsedExcludeExpression: glob.ParsedExpression;
+	private _excludeExpression: glob.IExpression[]; // TODO: evaluate globs based on baseURI of pattern
+	private _parsedExcludeExpression: glob.ParsedExpression[];
 
 	private _parsedIncludeExpression: glob.ParsedExpression | null = null;
 
 	constructor(config: ISearchQuery, folderQuery: IFolderQuery) {
-		this._excludeExpression = {
-			...(config.excludePattern || {}),
-			...(folderQuery.excludePattern || {})
-		};
-		this._parsedExcludeExpression = glob.parse(this._excludeExpression);
+		// todo: try to incorporate folderQuery.excludePattern.folder if available
+		this._excludeExpression = folderQuery.excludePattern?.map(excludePattern => {
+			return {
+				...(config.excludePattern || {}),
+				...(excludePattern.pattern || {})
+			} satisfies glob.IExpression;
+		}) ?? [];
+
+		if (this._excludeExpression.length === 0) {
+			// even if there are no folderQueries, we want to observe  the global excludes
+			this._excludeExpression = [config.excludePattern || {}];
+		}
+
+		this._parsedExcludeExpression = this._excludeExpression.map(e => glob.parse(e));
 
 		// Empty includeExpression means include nothing, so no {} shortcuts
 		let includeExpression: glob.IExpression | undefined = config.includePattern;
@@ -699,8 +722,26 @@ export class QueryGlobTester {
 		}
 	}
 
+	private _evalParsedExcludeExpression(testPath: string, basename: string | undefined, hasSibling?: (name: string) => boolean): string | null {
+		// todo: less hacky way of evaluating sync vs async sibling clauses
+		let result: string | null = null;
+
+		for (const folderExclude of this._parsedExcludeExpression) {
+
+			// find first non-null result
+			const evaluation = folderExclude(testPath, basename, hasSibling);
+
+			if (typeof evaluation === 'string') {
+				result = evaluation;
+				break;
+			}
+		}
+		return result;
+	}
+
+
 	matchesExcludesSync(testPath: string, basename?: string, hasSibling?: (name: string) => boolean): boolean {
-		if (this._parsedExcludeExpression && this._parsedExcludeExpression(testPath, basename, hasSibling)) {
+		if (this._parsedExcludeExpression && this._evalParsedExcludeExpression(testPath, basename, hasSibling)) {
 			return true;
 		}
 
@@ -711,7 +752,7 @@ export class QueryGlobTester {
 	 * Guaranteed sync - siblingsFn should not return a promise.
 	 */
 	includedInQuerySync(testPath: string, basename?: string, hasSibling?: (name: string) => boolean): boolean {
-		if (this._parsedExcludeExpression && this._parsedExcludeExpression(testPath, basename, hasSibling)) {
+		if (this._parsedExcludeExpression && this._evalParsedExcludeExpression(testPath, basename, hasSibling)) {
 			return false;
 		}
 
@@ -727,7 +768,6 @@ export class QueryGlobTester {
 	 * unless the expression is async.
 	 */
 	includedInQuery(testPath: string, basename?: string, hasSibling?: (name: string) => boolean | Promise<boolean>): Promise<boolean> | boolean {
-		const excluded = this._parsedExcludeExpression(testPath, basename, hasSibling);
 
 		const isIncluded = () => {
 			return this._parsedIncludeExpression ?
@@ -735,21 +775,27 @@ export class QueryGlobTester {
 				true;
 		};
 
-		if (isThenable(excluded)) {
-			return excluded.then(excluded => {
-				if (excluded) {
-					return false;
-				}
+		return Promise.all(this._parsedExcludeExpression.map(e => {
+			const excluded = e(testPath, basename, hasSibling);
+			if (isThenable(excluded)) {
+				return excluded.then(excluded => {
+					if (excluded) {
+						return false;
+					}
+
+					return isIncluded();
+				});
+			}
+
+			return isIncluded();
+
+		})).then(e => e.some(e => !!e));
 
-				return isIncluded();
-			});
-		}
 
-		return isIncluded();
 	}
 
 	hasSiblingExcludeClauses(): boolean {
-		return hasSiblingClauses(this._excludeExpression);
+		return this._excludeExpression.reduce((prev, curr) => hasSiblingClauses(curr) || prev, false);
 	}
 }
 
@@ -800,3 +846,18 @@ function listToMap(list: string[]) {
 	}
 	return map;
 }
+
+export function excludeToGlobPattern(excludesForFolder: { baseUri?: URI | undefined; patterns: string[] }[]): GlobPattern[] {
+	return excludesForFolder.flatMap(exclude => exclude.patterns.map(pattern => {
+		return exclude.baseUri ?
+			{
+				baseUri: exclude.baseUri,
+				pattern: pattern
+			} : pattern;
+	}));
+}
+
+export const DEFAULT_TEXT_SEARCH_PREVIEW_OPTIONS = {
+	matchLines: 100,
+	charsPerLine: 10000
+};
diff --git a/src/vs/workbench/services/search/common/searchExtConversionTypes.ts b/src/vs/workbench/services/search/common/searchExtConversionTypes.ts
new file mode 100644
index 00000000000..098b56480cb
--- /dev/null
+++ b/src/vs/workbench/services/search/common/searchExtConversionTypes.ts
@@ -0,0 +1,623 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { asArray, coalesce } from '../../../../base/common/arrays.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IProgress } from '../../../../platform/progress/common/progress.js';
+import { DEFAULT_TEXT_SEARCH_PREVIEW_OPTIONS } from './search.js';
+import { Range, FileSearchProviderNew, FileSearchProviderOptions, ProviderResult, TextSearchCompleteNew, TextSearchContextNew, TextSearchMatchNew, TextSearchProviderNew, TextSearchProviderOptions, TextSearchQueryNew, TextSearchResultNew, AITextSearchProviderNew, TextSearchCompleteMessage } from './searchExtTypes.js';
+
+// old types that are retained for backward compatibility
+// TODO: delete this when search apis are adopted by all first-party extensions
+
+/**
+ * A relative pattern is a helper to construct glob patterns that are matched
+ * relatively to a base path. The base path can either be an absolute file path
+ * or a [workspace folder](#WorkspaceFolder).
+ */
+export interface RelativePattern {
+
+	/**
+	 * A base file path to which this pattern will be matched against relatively.
+	 */
+	base: string;
+
+	/**
+	 * A file glob pattern like `*.{ts,js}` that will be matched on file paths
+	 * relative to the base path.
+	 *
+	 * Example: Given a base of `/home/work/folder` and a file path of `/home/work/folder/index.js`,
+	 * the file glob pattern will match on `index.js`.
+	 */
+	pattern: string;
+}
+
+/**
+ * A file glob pattern to match file paths against. This can either be a glob pattern string
+ * (like `** /*.{ts,js}` without space before / or `*.{ts,js}`) or a [relative pattern](#RelativePattern).
+ *
+ * Glob patterns can have the following syntax:
+ * * `*` to match zero or more characters in a path segment
+ * * `?` to match on one character in a path segment
+ * * `**` to match any number of path segments, including none
+ * * `{}` to group conditions (e.g. `** /*.{ts,js}` without space before / matches all TypeScript and JavaScript files)
+ * * `[]` to declare a range of characters to match in a path segment (e.g., `example.[0-9]` to match on `example.0`, `example.1`, …)
+ * * `[!...]` to negate a range of characters to match in a path segment (e.g., `example.[!0-9]` to match on `example.a`, `example.b`, but not `example.0`)
+ *
+ * Note: a backslash (`\`) is not valid within a glob pattern. If you have an existing file
+ * path to match against, consider to use the [relative pattern](#RelativePattern) support
+ * that takes care of converting any backslash into slash. Otherwise, make sure to convert
+ * any backslash to slash when creating the glob pattern.
+ */
+export type GlobPattern = string | RelativePattern;
+
+/**
+ * The parameters of a query for text search.
+ */
+export interface TextSearchQuery {
+	/**
+	 * The text pattern to search for.
+	 */
+	pattern: string;
+
+	/**
+	 * Whether or not `pattern` should match multiple lines of text.
+	 */
+	isMultiline?: boolean;
+
+	/**
+	 * Whether or not `pattern` should be interpreted as a regular expression.
+	 */
+	isRegExp?: boolean;
+
+	/**
+	 * Whether or not the search should be case-sensitive.
+	 */
+	isCaseSensitive?: boolean;
+
+	/**
+	 * Whether or not to search for whole word matches only.
+	 */
+	isWordMatch?: boolean;
+}
+
+/**
+ * A file glob pattern to match file paths against.
+ * TODO@roblou - merge this with the GlobPattern docs/definition in vscode.d.ts.
+ * @see [GlobPattern](#GlobPattern)
+ */
+export type GlobString = string;
+
+/**
+ * Options common to file and text search
+ */
+export interface SearchOptions {
+	/**
+	 * The root folder to search within.
+	 */
+	folder: URI;
+
+	/**
+	 * Files that match an `includes` glob pattern should be included in the search.
+	 */
+	includes: GlobString[];
+
+	/**
+	 * Files that match an `excludes` glob pattern should be excluded from the search.
+	 */
+	excludes: GlobString[];
+
+	/**
+	 * Whether external files that exclude files, like .gitignore, should be respected.
+	 * See the vscode setting `"search.useIgnoreFiles"`.
+	 */
+	useIgnoreFiles: boolean;
+
+	/**
+	 * Whether symlinks should be followed while searching.
+	 * See the vscode setting `"search.followSymlinks"`.
+	 */
+	followSymlinks: boolean;
+
+	/**
+	 * Whether global files that exclude files, like .gitignore, should be respected.
+	 * See the vscode setting `"search.useGlobalIgnoreFiles"`.
+	 */
+	useGlobalIgnoreFiles: boolean;
+
+	/**
+	 * Whether files in parent directories that exclude files, like .gitignore, should be respected.
+	 * See the vscode setting `"search.useParentIgnoreFiles"`.
+	 */
+	useParentIgnoreFiles: boolean;
+}
+
+/**
+ * Options to specify the size of the result text preview.
+ * These options don't affect the size of the match itself, just the amount of preview text.
+ */
+export interface TextSearchPreviewOptions {
+	/**
+	 * The maximum number of lines in the preview.
+	 * Only search providers that support multiline search will ever return more than one line in the match.
+	 */
+	matchLines: number;
+
+	/**
+	 * The maximum number of characters included per line.
+	 */
+	charsPerLine: number;
+}
+
+/**
+ * Options that apply to text search.
+ */
+export interface TextSearchOptions extends SearchOptions {
+	/**
+	 * The maximum number of results to be returned.
+	 */
+	maxResults: number;
+
+	/**
+	 * Options to specify the size of the result text preview.
+	 */
+	previewOptions?: TextSearchPreviewOptions;
+
+	/**
+	 * Exclude files larger than `maxFileSize` in bytes.
+	 */
+	maxFileSize?: number;
+
+	/**
+	 * Interpret files using this encoding.
+	 * See the vscode setting `"files.encoding"`
+	 */
+	encoding?: string;
+
+	/**
+	 * Number of lines of context to include before each match.
+	 */
+	beforeContext?: number;
+
+	/**
+	 * Number of lines of context to include after each match.
+	 */
+	afterContext?: number;
+}
+/**
+ * Options that apply to AI text search.
+ */
+export interface AITextSearchOptions extends SearchOptions {
+	/**
+	 * The maximum number of results to be returned.
+	 */
+	maxResults: number;
+
+	/**
+	 * Options to specify the size of the result text preview.
+	 */
+	previewOptions?: TextSearchPreviewOptions;
+
+	/**
+	 * Exclude files larger than `maxFileSize` in bytes.
+	 */
+	maxFileSize?: number;
+
+	/**
+	 * Number of lines of context to include before each match.
+	 */
+	beforeContext?: number;
+
+	/**
+	 * Number of lines of context to include after each match.
+	 */
+	afterContext?: number;
+}
+
+/**
+ * Information collected when text search is complete.
+ */
+export interface TextSearchComplete {
+	/**
+	 * Whether the search hit the limit on the maximum number of search results.
+	 * `maxResults` on [`TextSearchOptions`](#TextSearchOptions) specifies the max number of results.
+	 * - If exactly that number of matches exist, this should be false.
+	 * - If `maxResults` matches are returned and more exist, this should be true.
+	 * - If search hits an internal limit which is less than `maxResults`, this should be true.
+	 */
+	limitHit?: boolean;
+
+	/**
+	 * Additional information regarding the state of the completed search.
+	 *
+	 * Supports links in markdown syntax:
+	 * - Click to [run a command](command:workbench.action.OpenQuickPick)
+	 * - Click to [open a website](https://aka.ms)
+	 */
+	message?: TextSearchCompleteMessage | TextSearchCompleteMessage[];
+}
+
+/**
+ * The parameters of a query for file search.
+ */
+export interface FileSearchQuery {
+	/**
+	 * The search pattern to match against file paths.
+	 */
+	pattern: string;
+}
+
+/**
+ * Options that apply to file search.
+ */
+export interface FileSearchOptions extends SearchOptions {
+	/**
+	 * The maximum number of results to be returned.
+	 */
+	maxResults?: number;
+
+	/**
+	 * A CancellationToken that represents the session for this search query. If the provider chooses to, this object can be used as the key for a cache,
+	 * and searches with the same session object can search the same cache. When the token is cancelled, the session is complete and the cache can be cleared.
+	 */
+	session?: CancellationToken;
+}
+
+/**
+ * A preview of the text result.
+ */
+export interface TextSearchMatchPreview {
+	/**
+	 * The matching lines of text, or a portion of the matching line that contains the match.
+	 */
+	text: string;
+
+	/**
+	 * The Range within `text` corresponding to the text of the match.
+	 * The number of matches must match the TextSearchMatch's range property.
+	 */
+	matches: Range | Range[];
+}
+
+/**
+ * A match from a text search
+ */
+export interface TextSearchMatch {
+	/**
+	 * The uri for the matching document.
+	 */
+	uri: URI;
+
+	/**
+	 * The range of the match within the document, or multiple ranges for multiple matches.
+	 */
+	ranges: Range | Range[];
+
+	/**
+	 * A preview of the text match.
+	 */
+	preview: TextSearchMatchPreview;
+}
+
+/**
+ * Checks if the given object is of type TextSearchMatch.
+ * @param object The object to check.
+ * @returns True if the object is a TextSearchMatch, false otherwise.
+ */
+function isTextSearchMatch(object: any): object is TextSearchMatch {
+	return 'uri' in object && 'ranges' in object && 'preview' in object;
+}
+
+/**
+ * A line of context surrounding a TextSearchMatch.
+ */
+export interface TextSearchContext {
+	/**
+	 * The uri for the matching document.
+	 */
+	uri: URI;
+
+	/**
+	 * One line of text.
+	 * previewOptions.charsPerLine applies to this
+	 */
+	text: string;
+
+	/**
+	 * The line number of this line of context.
+	 */
+	lineNumber: number;
+}
+
+export type TextSearchResult = TextSearchMatch | TextSearchContext;
+
+/**
+ * A FileSearchProvider provides search results for files in the given folder that match a query string. It can be invoked by quickaccess or other extensions.
+ *
+ * A FileSearchProvider is the more powerful of two ways to implement file search in VS Code. Use a FileSearchProvider if you wish to search within a folder for
+ * all files that match the user's query.
+ *
+ * The FileSearchProvider will be invoked on every keypress in quickaccess. When `workspace.findFiles` is called, it will be invoked with an empty query string,
+ * and in that case, every file in the folder should be returned.
+ */
+export interface FileSearchProvider {
+	/**
+	 * Provide the set of files that match a certain file path pattern.
+	 * @param query The parameters for this query.
+	 * @param options A set of options to consider while searching files.
+	 * @param progress A progress callback that must be invoked for all results.
+	 * @param token A cancellation token.
+	 */
+	provideFileSearchResults(query: FileSearchQuery, options: FileSearchOptions, token: CancellationToken): ProviderResult<URI[]>;
+}
+
+/**
+ * A TextSearchProvider provides search results for text results inside files in the workspace.
+ */
+export interface TextSearchProvider {
+	/**
+	 * Provide results that match the given text pattern.
+	 * @param query The parameters for this query.
+	 * @param options A set of options to consider while searching.
+	 * @param progress A progress callback that must be invoked for all results.
+	 * @param token A cancellation token.
+	 */
+	provideTextSearchResults(query: TextSearchQuery, options: TextSearchOptions, progress: IProgress<TextSearchResult>, token: CancellationToken): ProviderResult<TextSearchComplete>;
+}
+
+export interface AITextSearchProvider {
+	/**
+	 * The name of the AI searcher. Will be displayed as `{name} Results` in the Search View.
+	 */
+	readonly name?: string;
+
+	/**
+	 * Provide results that match the given text pattern.
+	 * @param query The parameter for this query.
+	 * @param options A set of options to consider while searching.
+	 * @param progress A progress callback that must be invoked for all results.
+	 * @param token A cancellation token.
+	 */
+	provideAITextSearchResults(query: string, options: AITextSearchOptions, progress: IProgress<TextSearchResult>, token: CancellationToken): ProviderResult<TextSearchComplete>;
+}
+
+/**
+ * Options that can be set on a findTextInFiles search.
+ */
+export interface FindTextInFilesOptions {
+	/**
+	 * A [glob pattern](#GlobPattern) that defines the files to search for. The glob pattern
+	 * will be matched against the file paths of files relative to their workspace. Use a [relative pattern](#RelativePattern)
+	 * to restrict the search results to a [workspace folder](#WorkspaceFolder).
+	 */
+	include?: GlobPattern;
+
+	/**
+	 * A [glob pattern](#GlobPattern) that defines files and folders to exclude. The glob pattern
+	 * will be matched against the file paths of resulting matches relative to their workspace. When `undefined` only default excludes will
+	 * apply, when `null` no excludes will apply.
+	 */
+	exclude?: GlobPattern | null;
+
+	/**
+	 * The maximum number of results to search for
+	 */
+	maxResults?: number;
+
+	/**
+	 * Whether external files that exclude files, like .gitignore, should be respected.
+	 * See the vscode setting `"search.useIgnoreFiles"`.
+	 */
+	useIgnoreFiles?: boolean;
+
+	/**
+	 * Whether global files that exclude files, like .gitignore, should be respected.
+	 * See the vscode setting `"search.useGlobalIgnoreFiles"`.
+	 */
+	useGlobalIgnoreFiles?: boolean;
+
+	/**
+	 * Whether files in parent directories that exclude files, like .gitignore, should be respected.
+	 * See the vscode setting `"search.useParentIgnoreFiles"`.
+	 */
+	useParentIgnoreFiles: boolean;
+
+	/**
+	 * Whether symlinks should be followed while searching.
+	 * See the vscode setting `"search.followSymlinks"`.
+	 */
+	followSymlinks?: boolean;
+
+	/**
+	 * Interpret files using this encoding.
+	 * See the vscode setting `"files.encoding"`
+	 */
+	encoding?: string;
+
+	/**
+	 * Options to specify the size of the result text preview.
+	 */
+	previewOptions?: TextSearchPreviewOptions;
+
+	/**
+	 * Number of lines of context to include before each match.
+	 */
+	beforeContext?: number;
+
+	/**
+	 * Number of lines of context to include after each match.
+	 */
+	afterContext?: number;
+}
+
+function newToOldFileProviderOptions(options: FileSearchProviderOptions): FileSearchOptions[] {
+	return options.folderOptions.map(folderOption => ({
+		folder: folderOption.folder,
+		excludes: folderOption.excludes.map(e => typeof (e) === 'string' ? e : e.pattern),
+		includes: folderOption.includes,
+		useGlobalIgnoreFiles: folderOption.useIgnoreFiles.global,
+		useIgnoreFiles: folderOption.useIgnoreFiles.local,
+		useParentIgnoreFiles: folderOption.useIgnoreFiles.parent,
+		followSymlinks: folderOption.followSymlinks,
+		maxResults: options.maxResults,
+		session: <CancellationToken | undefined>options.session // TODO: make sure that we actually use a cancellation token here.
+	} satisfies FileSearchOptions));
+}
+
+export class OldFileSearchProviderConverter implements FileSearchProviderNew {
+	constructor(private provider: FileSearchProvider) { }
+
+	provideFileSearchResults(pattern: string, options: FileSearchProviderOptions, token: CancellationToken): ProviderResult<URI[]> {
+		const getResult = async () => {
+			const newOpts = newToOldFileProviderOptions(options);
+			return Promise.all(newOpts.map(
+				o => this.provider.provideFileSearchResults({ pattern }, o, token)));
+		};
+		return getResult().then(e => coalesce(e).flat());
+	}
+}
+
+function newToOldTextProviderOptions(options: TextSearchProviderOptions): TextSearchOptions[] {
+	return options.folderOptions.map(folderOption => ({
+		folder: folderOption.folder,
+		excludes: folderOption.excludes.map(e => typeof (e) === 'string' ? e : e.pattern),
+		includes: folderOption.includes,
+		useGlobalIgnoreFiles: folderOption.useIgnoreFiles.global,
+		useIgnoreFiles: folderOption.useIgnoreFiles.local,
+		useParentIgnoreFiles: folderOption.useIgnoreFiles.parent,
+		followSymlinks: folderOption.followSymlinks,
+		maxResults: options.maxResults,
+		previewOptions: newToOldPreviewOptions(options.previewOptions),
+		maxFileSize: options.maxFileSize,
+		encoding: folderOption.encoding,
+		afterContext: options.surroundingContext,
+		beforeContext: options.surroundingContext
+	} satisfies TextSearchOptions));
+}
+
+export function newToOldPreviewOptions(options: {
+	matchLines?: number;
+	charsPerLine?: number;
+} | undefined
+): {
+	matchLines: number;
+	charsPerLine: number;
+} {
+	return {
+		matchLines: options?.matchLines ?? DEFAULT_TEXT_SEARCH_PREVIEW_OPTIONS.matchLines,
+		charsPerLine: options?.charsPerLine ?? DEFAULT_TEXT_SEARCH_PREVIEW_OPTIONS.charsPerLine
+	};
+}
+
+export function oldToNewTextSearchResult(result: TextSearchResult): TextSearchResultNew {
+	if (isTextSearchMatch(result)) {
+		const ranges = asArray(result.ranges).map((r, i) => {
+			const previewArr = asArray(result.preview.matches);
+			const matchingPreviewRange = previewArr[i];
+			return { sourceRange: r, previewRange: matchingPreviewRange };
+		});
+		return new TextSearchMatchNew(result.uri, ranges, result.preview.text);
+	} else {
+		return new TextSearchContextNew(result.uri, result.text, result.lineNumber);
+	}
+}
+
+export class OldTextSearchProviderConverter implements TextSearchProviderNew {
+	constructor(private provider: TextSearchProvider) { }
+
+	provideTextSearchResults(query: TextSearchQueryNew, options: TextSearchProviderOptions, progress: IProgress<TextSearchResultNew>, token: CancellationToken): ProviderResult<TextSearchCompleteNew> {
+
+		const progressShim = (oldResult: TextSearchResult) => {
+			if (!validateProviderResult(oldResult)) {
+				return;
+			}
+			progress.report(oldToNewTextSearchResult(oldResult));
+		};
+
+		const getResult = async () => {
+			return coalesce(await Promise.all(
+				newToOldTextProviderOptions(options).map(
+					o => this.provider.provideTextSearchResults(query, o, { report: (e) => progressShim(e) }, token))))
+				.reduce(
+					(prev, cur) => ({ limitHit: prev.limitHit || cur.limitHit }),
+					{ limitHit: false }
+				);
+		};
+		const oldResult = getResult();
+		return oldResult.then((e) => {
+			return {
+				limitHit: e.limitHit,
+				message: coalesce(asArray(e.message))
+			} satisfies TextSearchCompleteNew;
+		});
+	}
+}
+
+export class OldAITextSearchProviderConverter implements AITextSearchProviderNew {
+	public readonly name?: string;
+
+	constructor(private provider: AITextSearchProvider) {
+		this.name = this.provider.name;
+	}
+
+	provideAITextSearchResults(query: string, options: TextSearchProviderOptions, progress: IProgress<TextSearchResultNew>, token: CancellationToken): ProviderResult<TextSearchCompleteNew> {
+		const progressShim = (oldResult: TextSearchResult) => {
+			if (!validateProviderResult(oldResult)) {
+				return;
+			}
+			progress.report(oldToNewTextSearchResult(oldResult));
+		};
+
+		const getResult = async () => {
+			return coalesce(await Promise.all(
+				newToOldTextProviderOptions(options).map(
+					o => this.provider.provideAITextSearchResults(query, o, { report: (e) => progressShim(e) }, token))))
+				.reduce(
+					(prev, cur) => ({ limitHit: prev.limitHit || cur.limitHit }),
+					{ limitHit: false }
+				);
+		};
+		const oldResult = getResult();
+		return oldResult.then((e) => {
+			return {
+				limitHit: e.limitHit,
+				message: coalesce(asArray(e.message))
+			} satisfies TextSearchCompleteNew;
+		});
+	}
+}
+
+function validateProviderResult(result: TextSearchResult): boolean {
+	if (extensionResultIsMatch(result)) {
+		if (Array.isArray(result.ranges)) {
+			if (!Array.isArray(result.preview.matches)) {
+				console.warn('INVALID - A text search provider match\'s`ranges` and`matches` properties must have the same type.');
+				return false;
+			}
+
+			if ((<Range[]>result.preview.matches).length !== result.ranges.length) {
+				console.warn('INVALID - A text search provider match\'s`ranges` and`matches` properties must have the same length.');
+				return false;
+			}
+		} else {
+			if (Array.isArray(result.preview.matches)) {
+				console.warn('INVALID - A text search provider match\'s`ranges` and`matches` properties must have the same length.');
+				return false;
+			}
+		}
+	}
+
+	return true;
+}
+
+export function extensionResultIsMatch(data: TextSearchResult): data is TextSearchMatch {
+	return !!(<TextSearchMatch>data).preview;
+}
diff --git a/src/vs/workbench/services/search/common/searchExtTypes.ts b/src/vs/workbench/services/search/common/searchExtTypes.ts
index 48da6b3f96d..285f5a395a4 100644
--- a/src/vs/workbench/services/search/common/searchExtTypes.ts
+++ b/src/vs/workbench/services/search/common/searchExtTypes.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { URI } from 'vs/base/common/uri';
-import { IProgress } from 'vs/platform/progress/common/progress';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IProgress } from '../../../../platform/progress/common/progress.js';
 
 export class Position {
 	constructor(readonly line: number, readonly character: number) { }
@@ -55,9 +55,11 @@ export type ProviderResult<T> = T | undefined | null | Thenable<T | undefined |
 export interface RelativePattern {
 
 	/**
-	 * A base file path to which this pattern will be matched against relatively.
+	 * A base file path to which this pattern will be matched against relatively. The
+	 * file path must be absolute, should not have any trailing path separators and
+	 * not include any relative segments (`.` or `..`).
 	 */
-	base: string;
+	baseUri: URI;
 
 	/**
 	 * A file glob pattern like `*.{ts,js}` that will be matched on file paths
@@ -91,7 +93,7 @@ export type GlobPattern = string | RelativePattern;
 /**
  * The parameters of a query for text search.
  */
-export interface TextSearchQuery {
+export interface TextSearchQueryNew {
 	/**
 	 * The text pattern to search for.
 	 */
@@ -118,17 +120,8 @@ export interface TextSearchQuery {
 	isWordMatch?: boolean;
 }
 
-/**
- * A file glob pattern to match file paths against.
- * TODO@roblou - merge this with the GlobPattern docs/definition in vscode.d.ts.
- * @see [GlobPattern](#GlobPattern)
- */
-export type GlobString = string;
 
-/**
- * Options common to file and text search
- */
-export interface SearchOptions {
+export interface TextSearchProviderFolderOptions {
 	/**
 	 * The root folder to search within.
 	 */
@@ -137,94 +130,51 @@ export interface SearchOptions {
 	/**
 	 * Files that match an `includes` glob pattern should be included in the search.
 	 */
-	includes: GlobString[];
+	includes: string[];
 
 	/**
 	 * Files that match an `excludes` glob pattern should be excluded from the search.
 	 */
-	excludes: GlobString[];
-
-	/**
-	 * Whether external files that exclude files, like .gitignore, should be respected.
-	 * See the vscode setting `"search.useIgnoreFiles"`.
-	 */
-	useIgnoreFiles: boolean;
+	excludes: GlobPattern[];
 
 	/**
 	 * Whether symlinks should be followed while searching.
-	 * See the vscode setting `"search.followSymlinks"`.
+	 * For more info, see the setting description for `search.followSymlinks`.
 	 */
 	followSymlinks: boolean;
 
 	/**
-	 * Whether global files that exclude files, like .gitignore, should be respected.
-	 * See the vscode setting `"search.useGlobalIgnoreFiles"`.
+	 * Which file locations we should look for ignore (.gitignore or .ignore) files to respect.
 	 */
-	useGlobalIgnoreFiles: boolean;
-
-	/**
-	 * Whether files in parent directories that exclude files, like .gitignore, should be respected.
-	 * See the vscode setting `"search.useParentIgnoreFiles"`.
-	 */
-	useParentIgnoreFiles: boolean;
-}
-
-/**
- * Options to specify the size of the result text preview.
- * These options don't affect the size of the match itself, just the amount of preview text.
- */
-export interface TextSearchPreviewOptions {
-	/**
-	 * The maximum number of lines in the preview.
-	 * Only search providers that support multiline search will ever return more than one line in the match.
-	 */
-	matchLines: number;
-
-	/**
-	 * The maximum number of characters included per line.
-	 */
-	charsPerLine: number;
-}
-
-/**
- * Options that apply to text search.
- */
-export interface TextSearchOptions extends SearchOptions {
-	/**
-	 * The maximum number of results to be returned.
-	 */
-	maxResults: number;
-
-	/**
-	 * Options to specify the size of the result text preview.
-	 */
-	previewOptions?: TextSearchPreviewOptions;
-
-	/**
-	 * Exclude files larger than `maxFileSize` in bytes.
-	 */
-	maxFileSize?: number;
+	useIgnoreFiles: {
+		/**
+		 * Use ignore files at the current workspace root.
+		 */
+		local: boolean;
+		/**
+		 * Use ignore files at the parent directory. If set, {@link TextSearchProviderOptions.useIgnoreFiles.local} should also be `true`.
+		 */
+		parent: boolean;
+		/**
+		 * Use global ignore files. If set, {@link TextSearchProviderOptions.useIgnoreFiles.local} should also be `true`.
+		 */
+		global: boolean;
+	};
 
 	/**
 	 * Interpret files using this encoding.
 	 * See the vscode setting `"files.encoding"`
 	 */
-	encoding?: string;
-
-	/**
-	 * Number of lines of context to include before each match.
-	 */
-	beforeContext?: number;
-
-	/**
-	 * Number of lines of context to include after each match.
-	 */
-	afterContext?: number;
+	encoding: string;
 }
+
 /**
- * Options that apply to AI text search.
+ * Options that apply to text search.
  */
-export interface AITextSearchOptions extends SearchOptions {
+export interface TextSearchProviderOptions {
+
+	folderOptions: TextSearchProviderFolderOptions[];
+
 	/**
 	 * The maximum number of results to be returned.
 	 */
@@ -233,32 +183,328 @@ export interface AITextSearchOptions extends SearchOptions {
 	/**
 	 * Options to specify the size of the result text preview.
 	 */
-	previewOptions?: TextSearchPreviewOptions;
+	previewOptions: {
+		/**
+		 * The maximum number of lines in the preview.
+		 * Only search providers that support multiline search will ever return more than one line in the match.
+		 * Defaults to 100.
+		 */
+		matchLines: number;
+
+		/**
+		 * The maximum number of characters included per line.
+		 * Defaults to 10000.
+		 */
+		charsPerLine: number;
+	};
 
 	/**
 	 * Exclude files larger than `maxFileSize` in bytes.
 	 */
-	maxFileSize?: number;
+	maxFileSize: number | undefined;
+
 
 	/**
-	 * Number of lines of context to include before each match.
+	 * Number of lines of context to include before and after each match.
 	 */
-	beforeContext?: number;
+	surroundingContext: number;
+}
+
+
+/**
+ * Information collected when text search is complete.
+ */
+export interface TextSearchCompleteNew {
+	/**
+	 * Whether the search hit the limit on the maximum number of search results.
+	 * `maxResults` on [`TextSearchOptions`](#TextSearchOptions) specifies the max number of results.
+	 * - If exactly that number of matches exist, this should be false.
+	 * - If `maxResults` matches are returned and more exist, this should be true.
+	 * - If search hits an internal limit which is less than `maxResults`, this should be true.
+	 */
+	limitHit?: boolean;
+}
+
+export interface FileSearchProviderFolderOptions {
+	/**
+	 * The root folder to search within.
+	 */
+	folder: URI;
 
 	/**
-	 * Number of lines of context to include after each match.
+	 * Files that match an `includes` glob pattern should be included in the search.
 	 */
-	afterContext?: number;
+	includes: string[];
+
+	/**
+	 * Files that match an `excludes` glob pattern should be excluded from the search.
+	 */
+	excludes: GlobPattern[];
+
+	/**
+	 * Whether symlinks should be followed while searching.
+	 * For more info, see the setting description for `search.followSymlinks`.
+	 */
+	followSymlinks: boolean;
+
+	/**
+	 * Which file locations we should look for ignore (.gitignore or .ignore) files to respect.
+	 */
+	useIgnoreFiles: {
+		/**
+		 * Use ignore files at the current workspace root.
+		 */
+		local: boolean;
+		/**
+		 * Use ignore files at the parent directory. If set, {@link FileSearchProviderOptions.useIgnoreFiles.local} should also be `true`.
+		 */
+		parent: boolean;
+		/**
+		 * Use global ignore files. If set, {@link FileSearchProviderOptions.useIgnoreFiles.local} should also be `true`.
+		 */
+		global: boolean;
+	};
 }
 
 /**
- * Represents the severity of a TextSearchComplete message.
+ * Options that apply to file search.
  */
+export interface FileSearchProviderOptions {
+	folderOptions: FileSearchProviderFolderOptions[];
+
+	/**
+	 * An object with a lifespan that matches the session's lifespan. If the provider chooses to, this object can be used as the key for a cache,
+	 * and searches with the same session object can search the same cache. When the token is cancelled, the session is complete and the cache can be cleared.
+	 */
+	session: unknown;
+
+	/**
+	 * The maximum number of results to be returned.
+	 */
+	maxResults: number;
+}
+
+/**
+ * The main match information for a {@link TextSearchResultNew}.
+ */
+export class TextSearchMatchNew {
+	/**
+	 * @param uri The uri for the matching document.
+	 * @param ranges The ranges associated with this match.
+	 * @param previewText The text that is used to preview the match. The highlighted range in `previewText` is specified in `ranges`.
+	 */
+	constructor(
+		public uri: URI,
+		public ranges: { sourceRange: Range; previewRange: Range }[],
+		public previewText: string) { }
+
+}
+
+/**
+ * The potential context information for a {@link TextSearchResultNew}.
+ */
+export class TextSearchContextNew {
+	/**
+	 * @param uri The uri for the matching document.
+	 * @param text The line of context text.
+	 * @param lineNumber The line number of this line of context.
+	 */
+	constructor(
+		public uri: URI,
+		public text: string,
+		public lineNumber: number) { }
+}
+
+/**
+ * A result payload for a text search, pertaining to matches within a single file.
+ */
+export type TextSearchResultNew = TextSearchMatchNew | TextSearchContextNew;
+
+
+/**
+ * A FileSearchProvider provides search results for files in the given folder that match a query string. It can be invoked by quickaccess or other extensions.
+ *
+ * A FileSearchProvider is the more powerful of two ways to implement file search in VS Code. Use a FileSearchProvider if you wish to search within a folder for
+ * all files that match the user's query.
+ *
+ * The FileSearchProvider will be invoked on every keypress in quickaccess. When `workspace.findFiles` is called, it will be invoked with an empty query string,
+ * and in that case, every file in the folder should be returned.
+ */
+export interface FileSearchProviderNew {
+	/**
+	 * Provide the set of files that match a certain file path pattern.
+	 * @param query The parameters for this query.
+	 * @param options A set of options to consider while searching files.
+	 * @param progress A progress callback that must be invoked for all results.
+	 * @param token A cancellation token.
+	 */
+	provideFileSearchResults(pattern: string, options: FileSearchProviderOptions, token: CancellationToken): ProviderResult<URI[]>;
+}
+
+/**
+ * A TextSearchProvider provides search results for text results inside files in the workspace.
+ */
+export interface TextSearchProviderNew {
+	/**
+	 * Provide results that match the given text pattern.
+	 * @param query The parameters for this query.
+	 * @param options A set of options to consider while searching.
+	 * @param progress A progress callback that must be invoked for all results.
+	 * @param token A cancellation token.
+	 */
+	provideTextSearchResults(query: TextSearchQueryNew, options: TextSearchProviderOptions, progress: IProgress<TextSearchResultNew>, token: CancellationToken): ProviderResult<TextSearchCompleteNew>;
+}
+
+/**
+ * Information collected when text search is complete.
+ */
+export interface TextSearchCompleteNew {
+	/**
+	 * Whether the search hit the limit on the maximum number of search results.
+	 * `maxResults` on {@linkcode TextSearchOptions} specifies the max number of results.
+	 * - If exactly that number of matches exist, this should be false.
+	 * - If `maxResults` matches are returned and more exist, this should be true.
+	 * - If search hits an internal limit which is less than `maxResults`, this should be true.
+	 */
+	limitHit?: boolean;
+
+	/**
+	 * Additional information regarding the state of the completed search.
+	 *
+	 * Messages with "Information" style support links in markdown syntax:
+	 * - Click to [run a command](command:workbench.action.OpenQuickPick)
+	 * - Click to [open a website](https://aka.ms)
+	 *
+	 * Commands may optionally return { triggerSearch: true } to signal to the editor that the original search should run be again.
+	 */
+	message?: TextSearchCompleteMessageNew[];
+}
+
+/**
+ * A message regarding a completed search.
+ */
+export interface TextSearchCompleteMessageNew {
+	/**
+	 * Markdown text of the message.
+	 */
+	text: string;
+	/**
+	 * Whether the source of the message is trusted, command links are disabled for untrusted message sources.
+	 * Messaged are untrusted by default.
+	 */
+	trusted?: boolean;
+	/**
+	 * The message type, this affects how the message will be rendered.
+	 */
+	type: TextSearchCompleteMessageType;
+}
+
+
+/**
+ * A FileSearchProvider provides search results for files in the given folder that match a query string. It can be invoked by quickaccess or other extensions.
+ *
+ * A FileSearchProvider is the more powerful of two ways to implement file search in VS Code. Use a FileSearchProvider if you wish to search within a folder for
+ * all files that match the user's query.
+ *
+ * The FileSearchProvider will be invoked on every keypress in quickaccess. When `workspace.findFiles` is called, it will be invoked with an empty query string,
+ * and in that case, every file in the folder should be returned.
+ */
+export interface FileSearchProviderNew {
+	/**
+	 * Provide the set of files that match a certain file path pattern.
+	 * @param query The parameters for this query.
+	 * @param options A set of options to consider while searching files.
+	 * @param progress A progress callback that must be invoked for all results.
+	 * @param token A cancellation token.
+	 */
+	provideFileSearchResults(pattern: string, options: FileSearchProviderOptions, token: CancellationToken): ProviderResult<URI[]>;
+}
+
+/**
+ * A TextSearchProvider provides search results for text results inside files in the workspace.
+ */
+export interface TextSearchProviderNew {
+	/**
+	 * Provide results that match the given text pattern.
+	 * @param query The parameters for this query.
+	 * @param options A set of options to consider while searching.
+	 * @param progress A progress callback that must be invoked for all results.
+	 * @param token A cancellation token.
+	 */
+	provideTextSearchResults(query: TextSearchQueryNew, options: TextSearchProviderOptions, progress: IProgress<TextSearchResultNew>, token: CancellationToken): ProviderResult<TextSearchCompleteNew>;
+}
+
+/**
+ * Information collected when text search is complete.
+ */
+export interface TextSearchCompleteNew {
+	/**
+	 * Whether the search hit the limit on the maximum number of search results.
+	 * `maxResults` on {@linkcode TextSearchOptions} specifies the max number of results.
+	 * - If exactly that number of matches exist, this should be false.
+	 * - If `maxResults` matches are returned and more exist, this should be true.
+	 * - If search hits an internal limit which is less than `maxResults`, this should be true.
+	 */
+	limitHit?: boolean;
+
+	/**
+	 * Additional information regarding the state of the completed search.
+	 *
+	 * Messages with "Information" style support links in markdown syntax:
+	 * - Click to [run a command](command:workbench.action.OpenQuickPick)
+	 * - Click to [open a website](https://aka.ms)
+	 *
+	 * Commands may optionally return { triggerSearch: true } to signal to the editor that the original search should run be again.
+	 */
+	message?: TextSearchCompleteMessageNew[];
+}
+
+/**
+ * A message regarding a completed search.
+ */
+export interface TextSearchCompleteMessageNew {
+	/**
+	 * Markdown text of the message.
+	 */
+	text: string;
+	/**
+	 * Whether the source of the message is trusted, command links are disabled for untrusted message sources.
+	 * Messaged are untrusted by default.
+	 */
+	trusted?: boolean;
+	/**
+	 * The message type, this affects how the message will be rendered.
+	 */
+	type: TextSearchCompleteMessageType;
+}
+
+/**
+ * Options for following search.exclude and files.exclude settings.
+ */
+export enum ExcludeSettingOptions {
+	/*
+	 * Don't use any exclude settings.
+	 */
+	None = 1,
+	/*
+	 * Use:
+	 * - files.exclude setting
+	 */
+	FilesExclude = 2,
+	/*
+	 * Use:
+	 * - files.exclude setting
+	 * - search.exclude setting
+	 */
+	SearchAndFilesExclude = 3
+}
+
 export enum TextSearchCompleteMessageType {
 	Information = 1,
 	Warning = 2,
 }
 
+
 /**
  * A message regarding a completed search.
  */
@@ -277,224 +523,25 @@ export interface TextSearchCompleteMessage {
 	type: TextSearchCompleteMessageType;
 }
 
+
 /**
- * Information collected when text search is complete.
+ * An AITextSearchProvider provides additional AI text search results in the workspace.
  */
-export interface TextSearchComplete {
-	/**
-	 * Whether the search hit the limit on the maximum number of search results.
-	 * `maxResults` on [`TextSearchOptions`](#TextSearchOptions) specifies the max number of results.
-	 * - If exactly that number of matches exist, this should be false.
-	 * - If `maxResults` matches are returned and more exist, this should be true.
-	 * - If search hits an internal limit which is less than `maxResults`, this should be true.
-	 */
-	limitHit?: boolean;
+export interface AITextSearchProviderNew {
 
 	/**
-	 * Additional information regarding the state of the completed search.
+	 * The name of the AI searcher. Will be displayed as `{name} Results` in the Search View.
+	 */
+	readonly name?: string;
+
+	/**
+	 * WARNING: VERY EXPERIMENTAL.
 	 *
-	 * Supports links in markdown syntax:
-	 * - Click to [run a command](command:workbench.action.OpenQuickPick)
-	 * - Click to [open a website](https://aka.ms)
-	 */
-	message?: TextSearchCompleteMessage | TextSearchCompleteMessage[];
-}
-
-/**
- * The parameters of a query for file search.
- */
-export interface FileSearchQuery {
-	/**
-	 * The search pattern to match against file paths.
-	 */
-	pattern: string;
-}
-
-/**
- * Options that apply to file search.
- */
-export interface FileSearchOptions extends SearchOptions {
-	/**
-	 * The maximum number of results to be returned.
-	 */
-	maxResults?: number;
-
-	/**
-	 * A CancellationToken that represents the session for this search query. If the provider chooses to, this object can be used as the key for a cache,
-	 * and searches with the same session object can search the same cache. When the token is cancelled, the session is complete and the cache can be cleared.
-	 */
-	session?: CancellationToken;
-}
-
-/**
- * A preview of the text result.
- */
-export interface TextSearchMatchPreview {
-	/**
-	 * The matching lines of text, or a portion of the matching line that contains the match.
-	 */
-	text: string;
-
-	/**
-	 * The Range within `text` corresponding to the text of the match.
-	 * The number of matches must match the TextSearchMatch's range property.
-	 */
-	matches: Range | Range[];
-}
-
-/**
- * A match from a text search
- */
-export interface TextSearchMatch {
-	/**
-	 * The uri for the matching document.
-	 */
-	uri: URI;
-
-	/**
-	 * The range of the match within the document, or multiple ranges for multiple matches.
-	 */
-	ranges: Range | Range[];
-
-	/**
-	 * A preview of the text match.
-	 */
-	preview: TextSearchMatchPreview;
-}
-
-/**
- * A line of context surrounding a TextSearchMatch.
- */
-export interface TextSearchContext {
-	/**
-	 * The uri for the matching document.
-	 */
-	uri: URI;
-
-	/**
-	 * One line of text.
-	 * previewOptions.charsPerLine applies to this
-	 */
-	text: string;
-
-	/**
-	 * The line number of this line of context.
-	 */
-	lineNumber: number;
-}
-
-export type TextSearchResult = TextSearchMatch | TextSearchContext;
-
-/**
- * A FileSearchProvider provides search results for files in the given folder that match a query string. It can be invoked by quickaccess or other extensions.
- *
- * A FileSearchProvider is the more powerful of two ways to implement file search in VS Code. Use a FileSearchProvider if you wish to search within a folder for
- * all files that match the user's query.
- *
- * The FileSearchProvider will be invoked on every keypress in quickaccess. When `workspace.findFiles` is called, it will be invoked with an empty query string,
- * and in that case, every file in the folder should be returned.
- */
-export interface FileSearchProvider {
-	/**
-	 * Provide the set of files that match a certain file path pattern.
-	 * @param query The parameters for this query.
-	 * @param options A set of options to consider while searching files.
-	 * @param progress A progress callback that must be invoked for all results.
-	 * @param token A cancellation token.
-	 */
-	provideFileSearchResults(query: FileSearchQuery, options: FileSearchOptions, token: CancellationToken): ProviderResult<URI[]>;
-}
-
-/**
- * A TextSearchProvider provides search results for text results inside files in the workspace.
- */
-export interface TextSearchProvider {
-	/**
-	 * Provide results that match the given text pattern.
-	 * @param query The parameters for this query.
-	 * @param options A set of options to consider while searching.
-	 * @param progress A progress callback that must be invoked for all results.
-	 * @param token A cancellation token.
-	 */
-	provideTextSearchResults(query: TextSearchQuery, options: TextSearchOptions, progress: IProgress<TextSearchResult>, token: CancellationToken): ProviderResult<TextSearchComplete>;
-}
-
-export interface AITextSearchProvider {
-	/**
 	 * Provide results that match the given text pattern.
 	 * @param query The parameter for this query.
 	 * @param options A set of options to consider while searching.
 	 * @param progress A progress callback that must be invoked for all results.
 	 * @param token A cancellation token.
 	 */
-	provideAITextSearchResults(query: string, options: AITextSearchOptions, progress: IProgress<TextSearchResult>, token: CancellationToken): ProviderResult<TextSearchComplete>;
-}
-
-/**
- * Options that can be set on a findTextInFiles search.
- */
-export interface FindTextInFilesOptions {
-	/**
-	 * A [glob pattern](#GlobPattern) that defines the files to search for. The glob pattern
-	 * will be matched against the file paths of files relative to their workspace. Use a [relative pattern](#RelativePattern)
-	 * to restrict the search results to a [workspace folder](#WorkspaceFolder).
-	 */
-	include?: GlobPattern;
-
-	/**
-	 * A [glob pattern](#GlobPattern) that defines files and folders to exclude. The glob pattern
-	 * will be matched against the file paths of resulting matches relative to their workspace. When `undefined` only default excludes will
-	 * apply, when `null` no excludes will apply.
-	 */
-	exclude?: GlobPattern | null;
-
-	/**
-	 * The maximum number of results to search for
-	 */
-	maxResults?: number;
-
-	/**
-	 * Whether external files that exclude files, like .gitignore, should be respected.
-	 * See the vscode setting `"search.useIgnoreFiles"`.
-	 */
-	useIgnoreFiles?: boolean;
-
-	/**
-	 * Whether global files that exclude files, like .gitignore, should be respected.
-	 * See the vscode setting `"search.useGlobalIgnoreFiles"`.
-	 */
-	useGlobalIgnoreFiles?: boolean;
-
-	/**
-	 * Whether files in parent directories that exclude files, like .gitignore, should be respected.
-	 * See the vscode setting `"search.useParentIgnoreFiles"`.
-	 */
-	useParentIgnoreFiles: boolean;
-
-	/**
-	 * Whether symlinks should be followed while searching.
-	 * See the vscode setting `"search.followSymlinks"`.
-	 */
-	followSymlinks?: boolean;
-
-	/**
-	 * Interpret files using this encoding.
-	 * See the vscode setting `"files.encoding"`
-	 */
-	encoding?: string;
-
-	/**
-	 * Options to specify the size of the result text preview.
-	 */
-	previewOptions?: TextSearchPreviewOptions;
-
-	/**
-	 * Number of lines of context to include before each match.
-	 */
-	beforeContext?: number;
-
-	/**
-	 * Number of lines of context to include after each match.
-	 */
-	afterContext?: number;
+	provideAITextSearchResults(query: string, options: TextSearchProviderOptions, progress: IProgress<TextSearchResultNew>, token: CancellationToken): ProviderResult<TextSearchCompleteNew>;
 }
diff --git a/src/vs/workbench/services/search/common/searchExtTypesInternal.ts b/src/vs/workbench/services/search/common/searchExtTypesInternal.ts
index 37ec6163bf5..2dc448383e6 100644
--- a/src/vs/workbench/services/search/common/searchExtTypesInternal.ts
+++ b/src/vs/workbench/services/search/common/searchExtTypesInternal.ts
@@ -2,12 +2,20 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import type { FileSearchOptions, TextSearchOptions } from './searchExtTypes';
+import { FileSearchProviderFolderOptions, FileSearchProviderOptions, TextSearchProviderFolderOptions, TextSearchProviderOptions } from './searchExtTypes.js';
 
 interface RipgrepSearchOptionsCommon {
 	numThreads?: number;
 }
 
-export interface RipgrepTextSearchOptions extends TextSearchOptions, RipgrepSearchOptionsCommon { }
+export type TextSearchProviderOptionsRipgrep = Omit<Partial<TextSearchProviderOptions>, 'folderOptions'> & {
+	folderOptions: TextSearchProviderFolderOptions;
+};
 
-export interface RipgrepFileSearchOptions extends FileSearchOptions, RipgrepSearchOptionsCommon { }
+export type FileSearchProviderOptionsRipgrep = & {
+	folderOptions: FileSearchProviderFolderOptions;
+} & FileSearchProviderOptions;
+
+export interface RipgrepTextSearchOptions extends TextSearchProviderOptionsRipgrep, RipgrepSearchOptionsCommon { }
+
+export interface RipgrepFileSearchOptions extends FileSearchProviderOptionsRipgrep, RipgrepSearchOptionsCommon { }
diff --git a/src/vs/workbench/services/search/common/searchHelpers.ts b/src/vs/workbench/services/search/common/searchHelpers.ts
index fceb65c61a0..f99e1392b4e 100644
--- a/src/vs/workbench/services/search/common/searchHelpers.ts
+++ b/src/vs/workbench/services/search/common/searchHelpers.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Range } from 'vs/editor/common/core/range';
-import { FindMatch, ITextModel } from 'vs/editor/common/model';
-import { ITextSearchPreviewOptions, TextSearchMatch, ITextSearchResult, ITextSearchMatch, ITextQuery } from 'vs/workbench/services/search/common/search';
+import { Range } from '../../../../editor/common/core/range.js';
+import { FindMatch, ITextModel } from '../../../../editor/common/model.js';
+import { ITextSearchPreviewOptions, TextSearchMatch, ITextSearchResult, ITextSearchMatch, ITextQuery } from './search.js';
 
 function editorMatchToTextSearchResult(matches: FindMatch[], model: ITextModel, previewOptions?: ITextSearchPreviewOptions): TextSearchMatch {
 	const firstLine = matches[0].range.startLineNumber;
@@ -50,8 +50,8 @@ export function getTextSearchMatchWithModelContext(matches: ITextSearchMatch[],
 	let prevLine = -1;
 	for (let i = 0; i < matches.length; i++) {
 		const { start: matchStartLine, end: matchEndLine } = getMatchStartEnd(matches[i]);
-		if (typeof query.beforeContext === 'number' && query.beforeContext > 0) {
-			const beforeContextStartLine = Math.max(prevLine + 1, matchStartLine - query.beforeContext);
+		if (typeof query.surroundingContext === 'number' && query.surroundingContext > 0) {
+			const beforeContextStartLine = Math.max(prevLine + 1, matchStartLine - query.surroundingContext);
 			for (let b = beforeContextStartLine; b < matchStartLine; b++) {
 				results.push({
 					text: model.getLineContent(b + 1),
@@ -64,8 +64,8 @@ export function getTextSearchMatchWithModelContext(matches: ITextSearchMatch[],
 
 		const nextMatch = matches[i + 1];
 		const nextMatchStartLine = nextMatch ? getMatchStartEnd(nextMatch).start : Number.MAX_VALUE;
-		if (typeof query.afterContext === 'number' && query.afterContext > 0) {
-			const afterContextToLine = Math.min(nextMatchStartLine - 1, matchEndLine + query.afterContext, model.getLineCount() - 1);
+		if (typeof query.surroundingContext === 'number' && query.surroundingContext > 0) {
+			const afterContextToLine = Math.min(nextMatchStartLine - 1, matchEndLine + query.surroundingContext, model.getLineCount() - 1);
 			for (let a = matchEndLine + 1; a <= afterContextToLine; a++) {
 				results.push({
 					text: model.getLineContent(a + 1),
@@ -81,9 +81,9 @@ export function getTextSearchMatchWithModelContext(matches: ITextSearchMatch[],
 }
 
 function getMatchStartEnd(match: ITextSearchMatch): { start: number; end: number } {
-	const matchRanges = match.ranges;
-	const matchStartLine = Array.isArray(matchRanges) ? matchRanges[0].startLineNumber : matchRanges.startLineNumber;
-	const matchEndLine = Array.isArray(matchRanges) ? matchRanges[matchRanges.length - 1].endLineNumber : matchRanges.endLineNumber;
+	const matchRanges = match.rangeLocations.map(e => e.source);
+	const matchStartLine = matchRanges[0].startLineNumber;
+	const matchEndLine = matchRanges[matchRanges.length - 1].endLineNumber;
 
 	return {
 		start: matchStartLine,
diff --git a/src/vs/workbench/services/search/common/searchService.ts b/src/vs/workbench/services/search/common/searchService.ts
index f4e35c525e1..6873277ee73 100644
--- a/src/vs/workbench/services/search/common/searchService.ts
+++ b/src/vs/workbench/services/search/common/searchService.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as arrays from 'vs/base/common/arrays';
-import { DeferredPromise, raceCancellationError } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { CancellationError } from 'vs/base/common/errors';
-import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { ResourceMap, ResourceSet } from 'vs/base/common/map';
-import { Schemas } from 'vs/base/common/network';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { isNumber } from 'vs/base/common/types';
-import { URI, URI as uri } from 'vs/base/common/uri';
-import { IModelService } from 'vs/editor/common/services/model';
-import { IFileService } from 'vs/platform/files/common/files';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { EditorResourceAccessor, SideBySideEditor } from 'vs/workbench/common/editor';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { DEFAULT_MAX_SEARCH_RESULTS, deserializeSearchError, FileMatch, IAITextQuery, ICachedSearchStats, IFileMatch, IFileQuery, IFileSearchStats, IFolderQuery, IProgressMessage, ISearchComplete, ISearchEngineStats, ISearchProgressItem, ISearchQuery, ISearchResultProvider, ISearchService, isFileMatch, isProgressMessage, ITextQuery, pathIncludedInQuery, QueryType, SEARCH_RESULT_LANGUAGE_ID, SearchError, SearchErrorCode, SearchProviderType } from 'vs/workbench/services/search/common/search';
-import { getTextSearchMatchWithModelContext, editorMatchesToTextSearchResults } from 'vs/workbench/services/search/common/searchHelpers';
+import * as arrays from '../../../../base/common/arrays.js';
+import { DeferredPromise, raceCancellationError } from '../../../../base/common/async.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { CancellationError } from '../../../../base/common/errors.js';
+import { Disposable, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { ResourceMap, ResourceSet } from '../../../../base/common/map.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { StopWatch } from '../../../../base/common/stopwatch.js';
+import { isNumber } from '../../../../base/common/types.js';
+import { URI, URI as uri } from '../../../../base/common/uri.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
+import { IEditorService } from '../../editor/common/editorService.js';
+import { IExtensionService } from '../../extensions/common/extensions.js';
+import { DEFAULT_MAX_SEARCH_RESULTS, deserializeSearchError, FileMatch, IAITextQuery, ICachedSearchStats, IFileMatch, IFileQuery, IFileSearchStats, IFolderQuery, IProgressMessage, ISearchComplete, ISearchEngineStats, ISearchProgressItem, ISearchQuery, ISearchResultProvider, ISearchService, isFileMatch, isProgressMessage, ITextQuery, pathIncludedInQuery, QueryType, SEARCH_RESULT_LANGUAGE_ID, SearchError, SearchErrorCode, SearchProviderType } from './search.js';
+import { getTextSearchMatchWithModelContext, editorMatchesToTextSearchResults } from './searchHelpers.js';
 
 export class SearchService extends Disposable implements ISearchService {
 
@@ -107,6 +107,11 @@ export class SearchService extends Disposable implements ISearchService {
 		return this.doSearch(query, token, onProviderProgress);
 	}
 
+	async getAIName(): Promise<string | undefined> {
+		const provider = this.getSearchProvider(QueryType.aiText).get(Schemas.file);
+		return await provider?.getAIName();
+	}
+
 	textSearchSplitSyncAsync(
 		query: ITextQuery,
 		token?: CancellationToken | undefined,
@@ -271,6 +276,9 @@ export class SearchService extends Disposable implements ISearchService {
 			return [];
 		}
 		await Promise.all([...fqs.keys()].map(async scheme => {
+			if (query.onlyFileScheme && scheme !== Schemas.file) {
+				return;
+			}
 			const schemeFQs = fqs.get(scheme)!;
 			let provider = this.getSearchProvider(query.type).get(scheme);
 
diff --git a/src/vs/workbench/services/search/common/textSearchManager.ts b/src/vs/workbench/services/search/common/textSearchManager.ts
index d135124aa05..6aa06b269e8 100644
--- a/src/vs/workbench/services/search/common/textSearchManager.ts
+++ b/src/vs/workbench/services/search/common/textSearchManager.ts
@@ -3,28 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { mapArrayOrNot } from 'vs/base/common/arrays';
-import { isThenable } from 'vs/base/common/async';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { Schemas } from 'vs/base/common/network';
-import * as path from 'vs/base/common/path';
-import * as resources from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { DEFAULT_MAX_SEARCH_RESULTS, hasSiblingPromiseFn, IAITextQuery, IExtendedExtensionSearchOptions, IFileMatch, IFolderQuery, IPatternInfo, ISearchCompleteStats, ITextQuery, ITextSearchContext, ITextSearchMatch, ITextSearchResult, ITextSearchStats, QueryGlobTester, QueryType, resolvePatternsForProvider } from 'vs/workbench/services/search/common/search';
-import { AITextSearchProvider, Range, TextSearchComplete, TextSearchMatch, TextSearchOptions, TextSearchProvider, TextSearchQuery, TextSearchResult } from 'vs/workbench/services/search/common/searchExtTypes';
+import { isThenable } from '../../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { toErrorMessage } from '../../../../base/common/errorMessage.js';
+import { Schemas } from '../../../../base/common/network.js';
+import * as path from '../../../../base/common/path.js';
+import * as resources from '../../../../base/common/resources.js';
+import { TernarySearchTree } from '../../../../base/common/ternarySearchTree.js';
+import { URI } from '../../../../base/common/uri.js';
+import { DEFAULT_MAX_SEARCH_RESULTS, hasSiblingPromiseFn, IAITextQuery, IExtendedExtensionSearchOptions, IFileMatch, IFolderQuery, excludeToGlobPattern, IPatternInfo, ISearchCompleteStats, ITextQuery, ITextSearchContext, ITextSearchMatch, ITextSearchResult, ITextSearchStats, QueryGlobTester, QueryType, resolvePatternsForProvider, ISearchRange, DEFAULT_TEXT_SEARCH_PREVIEW_OPTIONS } from './search.js';
+import { AITextSearchProviderNew, TextSearchCompleteNew, TextSearchMatchNew, TextSearchProviderFolderOptions, TextSearchProviderNew, TextSearchProviderOptions, TextSearchQueryNew, TextSearchResultNew } from './searchExtTypes.js';
 
 export interface IFileUtils {
 	readdir: (resource: URI) => Promise<string[]>;
 	toCanonicalName: (encoding: string) => string;
 }
 interface IAITextQueryProviderPair {
-	query: IAITextQuery; provider: AITextSearchProvider;
+	query: IAITextQuery; provider: AITextSearchProviderNew;
 }
 
 interface ITextQueryProviderPair {
-	query: ITextQuery; provider: TextSearchProvider;
+	query: ITextQuery; provider: TextSearchProviderNew;
 }
+interface FolderQueryInfo {
+	queryTester: QueryGlobTester;
+	folder: URI;
+	folderIdx: number;
+}
+
 export class TextSearchManager {
 
 	private collector: TextSearchResultsCollector | null = null;
@@ -48,14 +54,14 @@ export class TextSearchManager {
 			this.collector = new TextSearchResultsCollector(onProgress);
 
 			let isCanceled = false;
-			const onResult = (result: TextSearchResult, folderIdx: number) => {
+			const onResult = (result: TextSearchResultNew, folderIdx: number) => {
 				if (isCanceled) {
 					return;
 				}
 
 				if (!this.isLimitHit) {
 					const resultSize = this.resultSize(result);
-					if (extensionResultIsMatch(result) && typeof this.query.maxResults === 'number' && this.resultCount + resultSize > this.query.maxResults) {
+					if (result instanceof TextSearchMatchNew && typeof this.query.maxResults === 'number' && this.resultCount + resultSize > this.query.maxResults) {
 						this.isLimitHit = true;
 						isCanceled = true;
 						tokenSource.cancel();
@@ -65,27 +71,22 @@ export class TextSearchManager {
 
 					const newResultSize = this.resultSize(result);
 					this.resultCount += newResultSize;
-					if (newResultSize > 0 || !extensionResultIsMatch(result)) {
+					const a = result instanceof TextSearchMatchNew;
+
+					if (newResultSize > 0 || !a) {
 						this.collector!.add(result, folderIdx);
 					}
 				}
 			};
 
 			// For each root folder
-			Promise.all(folderQueries.map((fq, i) => {
-				return this.searchInFolder(fq, r => onResult(r, i), tokenSource.token);
-			})).then(results => {
+			this.doSearch(folderQueries, onResult, tokenSource.token).then(result => {
 				tokenSource.dispose();
 				this.collector!.flush();
 
-				const someFolderHitLImit = results.some(result => !!result && !!result.limitHit);
 				resolve({
-					limitHit: this.isLimitHit || someFolderHitLImit,
-					messages: results.flatMap(result => {
-						if (!result?.message) { return []; }
-						if (Array.isArray(result.message)) { return result.message; }
-						else { return [result.message]; }
-					}),
+					limitHit: this.isLimitHit || result?.limitHit,
+					messages: this.getMessagesFromResults(result),
 					stats: {
 						type: this.processType
 					}
@@ -98,8 +99,14 @@ export class TextSearchManager {
 		});
 	}
 
-	private resultSize(result: TextSearchResult): number {
-		if (extensionResultIsMatch(result)) {
+	private getMessagesFromResults(result: TextSearchCompleteNew | null | undefined) {
+		if (!result?.message) { return []; }
+		if (Array.isArray(result.message)) { return result.message; }
+		return [result.message];
+	}
+
+	private resultSize(result: TextSearchResultNew): number {
+		if (result instanceof TextSearchMatchNew) {
 			return Array.isArray(result.ranges) ?
 				result.ranges.length :
 				1;
@@ -110,29 +117,25 @@ export class TextSearchManager {
 		}
 	}
 
-	private trimResultToSize(result: TextSearchMatch, size: number): TextSearchMatch {
-		const rangesArr = Array.isArray(result.ranges) ? result.ranges : [result.ranges];
-		const matchesArr = Array.isArray(result.preview.matches) ? result.preview.matches : [result.preview.matches];
-
-		return {
-			ranges: rangesArr.slice(0, size),
-			preview: {
-				matches: matchesArr.slice(0, size),
-				text: result.preview.text
-			},
-			uri: result.uri
-		};
+	private trimResultToSize(result: TextSearchMatchNew, size: number): TextSearchMatchNew {
+		return new TextSearchMatchNew(result.uri, result.ranges.slice(0, size), result.previewText);
 	}
 
-	private async searchInFolder(folderQuery: IFolderQuery<URI>, onResult: (result: TextSearchResult) => void, token: CancellationToken): Promise<TextSearchComplete | null | undefined> {
-		const queryTester = new QueryGlobTester(this.query, folderQuery);
+	private async doSearch(folderQueries: IFolderQuery<URI>[], onResult: (result: TextSearchResultNew, folderIdx: number) => void, token: CancellationToken): Promise<TextSearchCompleteNew | null | undefined> {
+		const folderMappings: TernarySearchTree<URI, FolderQueryInfo> = TernarySearchTree.forUris<FolderQueryInfo>(() => true);
+		folderQueries.forEach((fq, i) => {
+			const queryTester = new QueryGlobTester(this.query, fq);
+			folderMappings.set(fq.folder, { queryTester, folder: fq.folder, folderIdx: i });
+		});
+
 		const testingPs: Promise<void>[] = [];
 		const progress = {
-			report: (result: TextSearchResult) => {
-				if (!this.validateProviderResult(result)) {
-					return;
-				}
+			report: (result: TextSearchResultNew) => {
 
+				if (result.uri === undefined) {
+					throw Error('Text search result URI is undefined. Please check provider implementation.');
+				}
+				const folderQuery = folderMappings.findSubstr(result.uri)!;
 				const hasSibling = folderQuery.folder.scheme === Schemas.file ?
 					hasSiblingPromiseFn(() => {
 						return this.fileUtils.readdir(resources.dirname(result.uri));
@@ -142,23 +145,32 @@ export class TextSearchManager {
 				const relativePath = resources.relativePath(folderQuery.folder, result.uri);
 				if (relativePath) {
 					// This method is only async when the exclude contains sibling clauses
-					const included = queryTester.includedInQuery(relativePath, path.basename(relativePath), hasSibling);
+					const included = folderQuery.queryTester.includedInQuery(relativePath, path.basename(relativePath), hasSibling);
 					if (isThenable(included)) {
 						testingPs.push(
 							included.then(isIncluded => {
 								if (isIncluded) {
-									onResult(result);
+									onResult(result, folderQuery.folderIdx);
 								}
 							}));
 					} else if (included) {
-						onResult(result);
+						onResult(result, folderQuery.folderIdx);
 					}
 				}
 			}
 		};
 
-		const searchOptions = this.getSearchOptionsForFolder(folderQuery);
-
+		const folderOptions = folderQueries.map(fq => this.getSearchOptionsForFolder(fq));
+		const searchOptions: TextSearchProviderOptions = {
+			folderOptions,
+			maxFileSize: this.query.maxFileSize,
+			maxResults: this.query.maxResults ?? DEFAULT_MAX_SEARCH_RESULTS,
+			previewOptions: this.query.previewOptions ?? DEFAULT_TEXT_SEARCH_PREVIEW_OPTIONS,
+			surroundingContext: this.query.surroundingContext ?? 0,
+		};
+		if ('usePCRE2' in this.query) {
+			(<IExtendedExtensionSearchOptions>searchOptions).usePCRE2 = this.query.usePCRE2;
+		}
 
 		let result;
 		if (this.queryProviderPair.query.type === QueryType.aiText) {
@@ -173,56 +185,39 @@ export class TextSearchManager {
 		return result;
 	}
 
-	private validateProviderResult(result: TextSearchResult): boolean {
-		if (extensionResultIsMatch(result)) {
-			if (Array.isArray(result.ranges)) {
-				if (!Array.isArray(result.preview.matches)) {
-					console.warn('INVALID - A text search provider match\'s`ranges` and`matches` properties must have the same type.');
-					return false;
-				}
-
-				if ((<Range[]>result.preview.matches).length !== result.ranges.length) {
-					console.warn('INVALID - A text search provider match\'s`ranges` and`matches` properties must have the same length.');
-					return false;
-				}
-			} else {
-				if (Array.isArray(result.preview.matches)) {
-					console.warn('INVALID - A text search provider match\'s`ranges` and`matches` properties must have the same length.');
-					return false;
-				}
-			}
-		}
-
-		return true;
-	}
-
-	private getSearchOptionsForFolder(fq: IFolderQuery<URI>): TextSearchOptions {
+	private getSearchOptionsForFolder(fq: IFolderQuery<URI>): TextSearchProviderFolderOptions {
 		const includes = resolvePatternsForProvider(this.query.includePattern, fq.includePattern);
-		const excludes = resolvePatternsForProvider(this.query.excludePattern, fq.excludePattern);
+
+		let excludePattern = fq.excludePattern?.map(e => ({
+			folder: e.folder,
+			patterns: resolvePatternsForProvider(this.query.excludePattern, e.pattern)
+		}));
+
+		if (!excludePattern || excludePattern.length === 0) {
+			excludePattern = [{
+				folder: undefined,
+				patterns: resolvePatternsForProvider(this.query.excludePattern, undefined)
+			}];
+		}
+		const excludes = excludeToGlobPattern(excludePattern);
 
 		const options = {
 			folder: URI.from(fq.folder),
 			excludes,
 			includes,
-			useIgnoreFiles: !fq.disregardIgnoreFiles,
-			useGlobalIgnoreFiles: !fq.disregardGlobalIgnoreFiles,
-			useParentIgnoreFiles: !fq.disregardParentIgnoreFiles,
+			useIgnoreFiles: {
+				local: !fq.disregardIgnoreFiles,
+				parent: !fq.disregardParentIgnoreFiles,
+				global: !fq.disregardGlobalIgnoreFiles
+			},
 			followSymlinks: !fq.ignoreSymlinks,
-			encoding: fq.fileEncoding && this.fileUtils.toCanonicalName(fq.fileEncoding),
-			maxFileSize: this.query.maxFileSize,
-			maxResults: this.query.maxResults ?? DEFAULT_MAX_SEARCH_RESULTS,
-			previewOptions: this.query.previewOptions,
-			afterContext: this.query.afterContext,
-			beforeContext: this.query.beforeContext
+			encoding: (fq.fileEncoding && this.fileUtils.toCanonicalName(fq.fileEncoding)) ?? '',
 		};
-		if ('usePCRE2' in this.query) {
-			(<IExtendedExtensionSearchOptions>options).usePCRE2 = this.query.usePCRE2;
-		}
 		return options;
 	}
 }
 
-function patternInfoToQuery(patternInfo: IPatternInfo): TextSearchQuery {
+function patternInfoToQuery(patternInfo: IPatternInfo): TextSearchQueryNew {
 	return {
 		isCaseSensitive: patternInfo.isCaseSensitive || false,
 		isRegExp: patternInfo.isRegExp || false,
@@ -243,7 +238,7 @@ export class TextSearchResultsCollector {
 		this._batchedCollector = new BatchedCollector<IFileMatch>(512, items => this.sendItems(items));
 	}
 
-	add(data: TextSearchResult, folderIdx: number): void {
+	add(data: TextSearchResultNew, folderIdx: number): void {
 		// Collects TextSearchResults into IInternalFileMatches and collates using BatchedCollector.
 		// This is efficient for ripgrep which sends results back one file at a time. It wouldn't be efficient for other search
 		// providers that send results in random order. We could do this step afterwards instead.
@@ -280,25 +275,25 @@ export class TextSearchResultsCollector {
 	}
 }
 
-function extensionResultToFrontendResult(data: TextSearchResult): ITextSearchResult {
+function extensionResultToFrontendResult(data: TextSearchResultNew): ITextSearchResult {
 	// Warning: result from RipgrepTextSearchEH has fake Range. Don't depend on any other props beyond these...
-	if (extensionResultIsMatch(data)) {
+	if (data instanceof TextSearchMatchNew) {
 		return {
-			preview: {
-				matches: mapArrayOrNot(data.preview.matches, m => ({
-					startLineNumber: m.start.line,
-					startColumn: m.start.character,
-					endLineNumber: m.end.line,
-					endColumn: m.end.character
-				})),
-				text: data.preview.text
-			},
-			ranges: mapArrayOrNot(data.ranges, r => ({
-				startLineNumber: r.start.line,
-				startColumn: r.start.character,
-				endLineNumber: r.end.line,
-				endColumn: r.end.character
-			}))
+			previewText: data.previewText,
+			rangeLocations: data.ranges.map(r => ({
+				preview: {
+					startLineNumber: r.previewRange.start.line,
+					startColumn: r.previewRange.start.character,
+					endLineNumber: r.previewRange.end.line,
+					endColumn: r.previewRange.end.character
+				} satisfies ISearchRange,
+				source: {
+					startLineNumber: r.sourceRange.start.line,
+					startColumn: r.sourceRange.start.character,
+					endLineNumber: r.sourceRange.end.line,
+					endColumn: r.sourceRange.end.character
+				} satisfies ISearchRange,
+			})),
 		} satisfies ITextSearchMatch;
 	} else {
 		return {
@@ -308,9 +303,6 @@ function extensionResultToFrontendResult(data: TextSearchResult): ITextSearchRes
 	}
 }
 
-export function extensionResultIsMatch(data: TextSearchResult): data is TextSearchMatch {
-	return !!(<TextSearchMatch>data).preview;
-}
 
 /**
  * Collects items that have a size - before the cumulative size of collected items reaches START_BATCH_AFTER_COUNT, the callback is called for every
diff --git a/src/vs/workbench/services/search/electron-sandbox/searchService.ts b/src/vs/workbench/services/search/electron-sandbox/searchService.ts
index cf9c6c6fd91..caf75829a0d 100644
--- a/src/vs/workbench/services/search/electron-sandbox/searchService.ts
+++ b/src/vs/workbench/services/search/electron-sandbox/searchService.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ISearchService } from 'vs/workbench/services/search/common/search';
-import { SearchService } from 'vs/workbench/services/search/common/searchService';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ISearchService } from '../common/search.js';
+import { SearchService } from '../common/searchService.js';
 
 registerSingleton(ISearchService, SearchService, InstantiationType.Delayed);
diff --git a/src/vs/workbench/services/search/node/fileSearch.ts b/src/vs/workbench/services/search/node/fileSearch.ts
index a483dd848b0..c23475cb647 100644
--- a/src/vs/workbench/services/search/node/fileSearch.ts
+++ b/src/vs/workbench/services/search/node/fileSearch.ts
@@ -5,23 +5,23 @@
 
 import * as childProcess from 'child_process';
 import * as fs from 'fs';
-import * as path from 'vs/base/common/path';
+import * as path from '../../../../base/common/path.js';
 import { Readable } from 'stream';
 import { StringDecoder } from 'string_decoder';
-import * as arrays from 'vs/base/common/arrays';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import * as glob from 'vs/base/common/glob';
-import * as normalization from 'vs/base/common/normalization';
-import { isEqualOrParent } from 'vs/base/common/extpath';
-import * as platform from 'vs/base/common/platform';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import * as strings from 'vs/base/common/strings';
-import * as types from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { Promises } from 'vs/base/node/pfs';
-import { IFileQuery, IFolderQuery, IProgressMessage, ISearchEngineStats, IRawFileMatch, ISearchEngine, ISearchEngineSuccess, isFilePatternMatch, hasSiblingFn } from 'vs/workbench/services/search/common/search';
-import { spawnRipgrepCmd } from './ripgrepFileSearch';
-import { prepareQuery } from 'vs/base/common/fuzzyScorer';
+import * as arrays from '../../../../base/common/arrays.js';
+import { toErrorMessage } from '../../../../base/common/errorMessage.js';
+import * as glob from '../../../../base/common/glob.js';
+import * as normalization from '../../../../base/common/normalization.js';
+import { isEqualOrParent } from '../../../../base/common/extpath.js';
+import * as platform from '../../../../base/common/platform.js';
+import { StopWatch } from '../../../../base/common/stopwatch.js';
+import * as strings from '../../../../base/common/strings.js';
+import * as types from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Promises } from '../../../../base/node/pfs.js';
+import { IFileQuery, IFolderQuery, IProgressMessage, ISearchEngineStats, IRawFileMatch, ISearchEngine, ISearchEngineSuccess, isFilePatternMatch, hasSiblingFn } from '../common/search.js';
+import { spawnRipgrepCmd } from './ripgrepFileSearch.js';
+import { prepareQuery } from '../../../../base/common/fuzzyScorer.js';
 
 interface IDirectoryEntry extends IRawFileMatch {
 	base: string;
@@ -82,7 +82,15 @@ export class FileWalker {
 		this.folderExcludePatterns = new Map<string, AbsoluteAndRelativeParsedExpression>();
 
 		config.folderQueries.forEach(folderQuery => {
-			const folderExcludeExpression: glob.IExpression = Object.assign({}, folderQuery.excludePattern || {}, this.config.excludePattern || {});
+			const folderExcludeExpression: glob.IExpression = {}; // todo: consider exclude baseURI
+
+			folderQuery.excludePattern?.forEach(excludePattern => {
+				Object.assign(folderExcludeExpression, excludePattern.pattern || {}, this.config.excludePattern || {});
+			});
+
+			if (!folderQuery.excludePattern?.length) {
+				Object.assign(folderExcludeExpression, this.config.excludePattern || {});
+			}
 
 			// Add excludes for other root folders
 			const fqPath = folderQuery.folder.fsPath;
diff --git a/src/vs/workbench/services/search/node/rawSearchService.ts b/src/vs/workbench/services/search/node/rawSearchService.ts
index 61bde71b572..14b0a29ff46 100644
--- a/src/vs/workbench/services/search/node/rawSearchService.ts
+++ b/src/vs/workbench/services/search/node/rawSearchService.ts
@@ -3,19 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as arrays from 'vs/base/common/arrays';
-import { CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { canceled } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { compareItemsByFuzzyScore, FuzzyScorerCache, IItemAccessor, prepareQuery } from 'vs/base/common/fuzzyScorer';
-import { basename, dirname, join, sep } from 'vs/base/common/path';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { ByteSize } from 'vs/platform/files/common/files';
-import { DEFAULT_MAX_SEARCH_RESULTS, ICachedSearchStats, IFileQuery, IFileSearchProgressItem, IFileSearchStats, IFolderQuery, IProgressMessage, IRawFileMatch, IRawFileQuery, IRawQuery, IRawSearchService, IRawTextQuery, ISearchEngine, ISearchEngineSuccess, ISerializedFileMatch, ISerializedSearchComplete, ISerializedSearchProgressItem, ISerializedSearchSuccess, isFilePatternMatch, ITextQuery } from 'vs/workbench/services/search/common/search';
-import { Engine as FileSearchEngine } from 'vs/workbench/services/search/node/fileSearch';
-import { TextSearchEngineAdapter } from 'vs/workbench/services/search/node/textSearchAdapter';
+import * as arrays from '../../../../base/common/arrays.js';
+import { CancelablePromise, createCancelablePromise } from '../../../../base/common/async.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { canceled } from '../../../../base/common/errors.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { compareItemsByFuzzyScore, FuzzyScorerCache, IItemAccessor, prepareQuery } from '../../../../base/common/fuzzyScorer.js';
+import { revive } from '../../../../base/common/marshalling.js';
+import { basename, dirname, join, sep } from '../../../../base/common/path.js';
+import { StopWatch } from '../../../../base/common/stopwatch.js';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
+import { ByteSize } from '../../../../platform/files/common/files.js';
+import { DEFAULT_MAX_SEARCH_RESULTS, ICachedSearchStats, IFileQuery, IFileSearchProgressItem, IFileSearchStats, IFolderQuery, IProgressMessage, IRawFileMatch, IRawFileQuery, IRawQuery, IRawSearchService, IRawTextQuery, ISearchEngine, ISearchEngineSuccess, ISerializedFileMatch, ISerializedSearchComplete, ISerializedSearchProgressItem, ISerializedSearchSuccess, isFilePatternMatch, ITextQuery } from '../common/search.js';
+import { Engine as FileSearchEngine } from './fileSearch.js';
+import { TextSearchEngineAdapter } from './textSearchAdapter.js';
 
 export type IProgressCallback = (p: ISerializedSearchProgressItem) => void;
 type IFileProgressCallback = (p: IFileSearchProgressItem) => void;
@@ -443,8 +444,5 @@ function reviveQuery<U extends IRawQuery>(rawQuery: U): U extends IRawTextQuery
 }
 
 function reviveFolderQuery(rawFolderQuery: IFolderQuery<UriComponents>): IFolderQuery<URI> {
-	return {
-		...rawFolderQuery,
-		folder: URI.revive(rawFolderQuery.folder)
-	};
+	return revive(rawFolderQuery);
 }
diff --git a/src/vs/workbench/services/search/node/ripgrepFileSearch.ts b/src/vs/workbench/services/search/node/ripgrepFileSearch.ts
index f833061c553..29921d5465a 100644
--- a/src/vs/workbench/services/search/node/ripgrepFileSearch.ts
+++ b/src/vs/workbench/services/search/node/ripgrepFileSearch.ts
@@ -4,14 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as cp from 'child_process';
-import * as path from 'vs/base/common/path';
-import * as glob from 'vs/base/common/glob';
-import { normalizeNFD } from 'vs/base/common/normalization';
-import * as extpath from 'vs/base/common/extpath';
-import { isMacintosh as isMac } from 'vs/base/common/platform';
-import * as strings from 'vs/base/common/strings';
-import { IFileQuery, IFolderQuery } from 'vs/workbench/services/search/common/search';
-import { anchorGlob } from 'vs/workbench/services/search/node/ripgrepSearchUtils';
+import * as path from '../../../../base/common/path.js';
+import * as glob from '../../../../base/common/glob.js';
+import { normalizeNFD } from '../../../../base/common/normalization.js';
+import * as extpath from '../../../../base/common/extpath.js';
+import { isMacintosh as isMac } from '../../../../base/common/platform.js';
+import * as strings from '../../../../base/common/strings.js';
+import { IFileQuery, IFolderQuery } from '../common/search.js';
+import { anchorGlob } from './ripgrepSearchUtils.js';
 import { rgPath } from '@vscode/ripgrep';
 
 // If @vscode/ripgrep is in an .asar file, then the binary is unpacked.
diff --git a/src/vs/workbench/services/search/node/ripgrepSearchProvider.ts b/src/vs/workbench/services/search/node/ripgrepSearchProvider.ts
index bff10b050d6..9811308b833 100644
--- a/src/vs/workbench/services/search/node/ripgrepSearchProvider.ts
+++ b/src/vs/workbench/services/search/node/ripgrepSearchProvider.ts
@@ -3,37 +3,52 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationTokenSource, CancellationToken } from 'vs/base/common/cancellation';
-import { OutputChannel } from 'vs/workbench/services/search/node/ripgrepSearchUtils';
-import { RipgrepTextSearchEngine } from 'vs/workbench/services/search/node/ripgrepTextSearchEngine';
-import { TextSearchProvider, TextSearchComplete, TextSearchResult, TextSearchQuery, TextSearchOptions, } from 'vs/workbench/services/search/common/searchExtTypes';
-import { Progress } from 'vs/platform/progress/common/progress';
-import { Schemas } from 'vs/base/common/network';
-import type { RipgrepTextSearchOptions } from 'vs/workbench/services/search/common/searchExtTypesInternal';
+import { CancellationTokenSource, CancellationToken } from '../../../../base/common/cancellation.js';
+import { OutputChannel } from './ripgrepSearchUtils.js';
+import { RipgrepTextSearchEngine } from './ripgrepTextSearchEngine.js';
+import { TextSearchProviderNew, TextSearchCompleteNew, TextSearchResultNew, TextSearchQueryNew, TextSearchProviderOptions, } from '../common/searchExtTypes.js';
+import { Progress } from '../../../../platform/progress/common/progress.js';
+import { Schemas } from '../../../../base/common/network.js';
+import type { RipgrepTextSearchOptions } from '../common/searchExtTypesInternal.js';
 
-export class RipgrepSearchProvider implements TextSearchProvider {
+export class RipgrepSearchProvider implements TextSearchProviderNew {
 	private inProgress: Set<CancellationTokenSource> = new Set();
 
 	constructor(private outputChannel: OutputChannel, private getNumThreads: () => Promise<number | undefined>) {
 		process.once('exit', () => this.dispose());
 	}
 
-	async provideTextSearchResults(query: TextSearchQuery, options: TextSearchOptions, progress: Progress<TextSearchResult>, token: CancellationToken): Promise<TextSearchComplete> {
+	async provideTextSearchResults(query: TextSearchQueryNew, options: TextSearchProviderOptions, progress: Progress<TextSearchResultNew>, token: CancellationToken): Promise<TextSearchCompleteNew> {
 		const numThreads = await this.getNumThreads();
 		const engine = new RipgrepTextSearchEngine(this.outputChannel, numThreads);
-		const extendedOptions: RipgrepTextSearchOptions = {
-			...options,
-			numThreads,
-		};
-		if (options.folder.scheme === Schemas.vscodeUserData) {
-			// Ripgrep search engine can only provide file-scheme results, but we want to use it to search some schemes that are backed by the filesystem, but with some other provider as the frontend,
-			// case in point vscode-userdata. In these cases we translate the query to a file, and translate the results back to the frontend scheme.
-			const translatedOptions = { ...extendedOptions, folder: options.folder.with({ scheme: Schemas.file }) };
-			const progressTranslator = new Progress<TextSearchResult>(data => progress.report({ ...data, uri: data.uri.with({ scheme: options.folder.scheme }) }));
-			return this.withToken(token, token => engine.provideTextSearchResults(query, translatedOptions, progressTranslator, token));
-		} else {
-			return this.withToken(token, token => engine.provideTextSearchResults(query, extendedOptions, progress, token));
-		}
+
+		return Promise.all(options.folderOptions.map(folderOption => {
+
+			const extendedOptions: RipgrepTextSearchOptions = {
+				folderOptions: folderOption,
+				numThreads,
+				maxResults: options.maxResults,
+				previewOptions: options.previewOptions,
+				maxFileSize: options.maxFileSize,
+				surroundingContext: options.surroundingContext
+			};
+			if (folderOption.folder.scheme === Schemas.vscodeUserData) {
+				// Ripgrep search engine can only provide file-scheme results, but we want to use it to search some schemes that are backed by the filesystem, but with some other provider as the frontend,
+				// case in point vscode-userdata. In these cases we translate the query to a file, and translate the results back to the frontend scheme.
+				const translatedOptions = { ...extendedOptions, folder: folderOption.folder.with({ scheme: Schemas.file }) };
+				const progressTranslator = new Progress<TextSearchResultNew>(data => progress.report({ ...data, uri: data.uri.with({ scheme: folderOption.folder.scheme }) }));
+				return this.withToken(token, token => engine.provideTextSearchResultsWithRgOptions(query, translatedOptions, progressTranslator, token));
+			} else {
+				return this.withToken(token, token => engine.provideTextSearchResultsWithRgOptions(query, extendedOptions, progress, token));
+			}
+		})).then((e => {
+			const complete: TextSearchCompleteNew = {
+				// todo: get this to actually check
+				limitHit: e.some(complete => !!complete && complete.limitHit)
+			};
+			return complete;
+		}));
+
 	}
 
 	private async withToken<T>(token: CancellationToken, fn: (token: CancellationToken) => Promise<T>): Promise<T> {
diff --git a/src/vs/workbench/services/search/node/ripgrepSearchUtils.ts b/src/vs/workbench/services/search/node/ripgrepSearchUtils.ts
index f9901923001..dbac34b23b8 100644
--- a/src/vs/workbench/services/search/node/ripgrepSearchUtils.ts
+++ b/src/vs/workbench/services/search/node/ripgrepSearchUtils.ts
@@ -3,11 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { mapArrayOrNot } from 'vs/base/common/arrays';
-import { URI } from 'vs/base/common/uri';
-import { ILogService } from 'vs/platform/log/common/log';
-import { SearchRange, TextSearchMatch } from 'vs/workbench/services/search/common/search';
-import * as searchExtTypes from 'vs/workbench/services/search/common/searchExtTypes';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { SearchRange } from '../common/search.js';
+import * as searchExtTypes from '../common/searchExtTypes.js';
 
 export type Maybe<T> = T | null | undefined;
 
@@ -15,29 +13,11 @@ export function anchorGlob(glob: string): string {
 	return glob.startsWith('**') || glob.startsWith('/') ? glob : `/${glob}`;
 }
 
-/**
- * Create a vscode.TextSearchMatch by using our internal TextSearchMatch type for its previewOptions logic.
- */
-export function createTextSearchResult(uri: URI, text: string, range: searchExtTypes.Range | searchExtTypes.Range[], previewOptions?: searchExtTypes.TextSearchPreviewOptions): searchExtTypes.TextSearchMatch {
-	const searchRange = mapArrayOrNot(range, rangeToSearchRange);
-
-	const internalResult = new TextSearchMatch(text, searchRange, previewOptions);
-	const internalPreviewRange = internalResult.preview.matches;
-	return {
-		ranges: mapArrayOrNot(searchRange, searchRangeToRange),
-		uri,
-		preview: {
-			text: internalResult.preview.text,
-			matches: mapArrayOrNot(internalPreviewRange, searchRangeToRange)
-		}
-	};
-}
-
-function rangeToSearchRange(range: searchExtTypes.Range): SearchRange {
+export function rangeToSearchRange(range: searchExtTypes.Range): SearchRange {
 	return new SearchRange(range.start.line, range.start.character, range.end.line, range.end.character);
 }
 
-function searchRangeToRange(range: SearchRange): searchExtTypes.Range {
+export function searchRangeToRange(range: SearchRange): searchExtTypes.Range {
 	return new searchExtTypes.Range(range.startLineNumber, range.startColumn, range.endLineNumber, range.endColumn);
 }
 
diff --git a/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts b/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts
index 4740a661119..3ab8205f2b1 100644
--- a/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts
+++ b/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts
@@ -6,19 +6,20 @@
 import * as cp from 'child_process';
 import { EventEmitter } from 'events';
 import { StringDecoder } from 'string_decoder';
-import { coalesce } from 'vs/base/common/arrays';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { groupBy } from 'vs/base/common/collections';
-import { splitGlobAware } from 'vs/base/common/glob';
-import { createRegExp, escapeRegExpCharacters } from 'vs/base/common/strings';
-import { URI } from 'vs/base/common/uri';
-import { Progress } from 'vs/platform/progress/common/progress';
-import { IExtendedExtensionSearchOptions, SearchError, SearchErrorCode, serializeSearchError } from 'vs/workbench/services/search/common/search';
-import { Range, TextSearchComplete, TextSearchContext, TextSearchMatch, TextSearchOptions, TextSearchPreviewOptions, TextSearchQuery, TextSearchResult } from 'vs/workbench/services/search/common/searchExtTypes';
+import { coalesce, mapArrayOrNot } from '../../../../base/common/arrays.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { groupBy } from '../../../../base/common/collections.js';
+import { splitGlobAware } from '../../../../base/common/glob.js';
+import { createRegExp, escapeRegExpCharacters } from '../../../../base/common/strings.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Progress } from '../../../../platform/progress/common/progress.js';
+import { DEFAULT_MAX_SEARCH_RESULTS, IExtendedExtensionSearchOptions, ITextSearchPreviewOptions, SearchError, SearchErrorCode, serializeSearchError, TextSearchMatch } from '../common/search.js';
+import { Range, TextSearchCompleteNew, TextSearchContextNew, TextSearchMatchNew, TextSearchProviderOptions, TextSearchQueryNew, TextSearchResultNew } from '../common/searchExtTypes.js';
 import { AST as ReAST, RegExpParser, RegExpVisitor } from 'vscode-regexpp';
 import { rgPath } from '@vscode/ripgrep';
-import { anchorGlob, createTextSearchResult, IOutputChannel, Maybe } from './ripgrepSearchUtils';
-import type { RipgrepTextSearchOptions } from 'vs/workbench/services/search/common/searchExtTypesInternal';
+import { anchorGlob, IOutputChannel, Maybe, rangeToSearchRange, searchRangeToRange } from './ripgrepSearchUtils.js';
+import type { RipgrepTextSearchOptions } from '../common/searchExtTypesInternal.js';
+import { newToOldPreviewOptions } from '../common/searchExtConversionTypes.js';
 
 // If @vscode/ripgrep is in an .asar file, then the binary is unpacked.
 const rgDiskPath = rgPath.replace(/\bnode_modules\.asar\b/, 'node_modules.asar.unpacked');
@@ -27,11 +28,31 @@ export class RipgrepTextSearchEngine {
 
 	constructor(private outputChannel: IOutputChannel, private readonly _numThreads?: number | undefined) { }
 
-	provideTextSearchResults(query: TextSearchQuery, options: TextSearchOptions, progress: Progress<TextSearchResult>, token: CancellationToken): Promise<TextSearchComplete> {
+	provideTextSearchResults(query: TextSearchQueryNew, options: TextSearchProviderOptions, progress: Progress<TextSearchResultNew>, token: CancellationToken): Promise<TextSearchCompleteNew> {
+		return Promise.all(options.folderOptions.map(folderOption => {
+			const extendedOptions: RipgrepTextSearchOptions = {
+				folderOptions: folderOption,
+				numThreads: this._numThreads,
+				maxResults: options.maxResults,
+				previewOptions: options.previewOptions,
+				maxFileSize: options.maxFileSize,
+				surroundingContext: options.surroundingContext
+			};
+			return this.provideTextSearchResultsWithRgOptions(query, extendedOptions, progress, token);
+		})).then((e => {
+			const complete: TextSearchCompleteNew = {
+				// todo: get this to actually check
+				limitHit: e.some(complete => !!complete && complete.limitHit)
+			};
+			return complete;
+		}));
+	}
+
+	provideTextSearchResultsWithRgOptions(query: TextSearchQueryNew, options: RipgrepTextSearchOptions, progress: Progress<TextSearchResultNew>, token: CancellationToken): Promise<TextSearchCompleteNew> {
 		this.outputChannel.appendLine(`provideTextSearchResults ${query.pattern}, ${JSON.stringify({
 			...options,
 			...{
-				folder: options.folder.toString()
+				folder: options.folderOptions.folder.toString()
 			}
 		})}`);
 
@@ -44,7 +65,7 @@ export class RipgrepTextSearchEngine {
 			};
 			const rgArgs = getRgArgs(query, extendedOptions);
 
-			const cwd = options.folder.fsPath;
+			const cwd = options.folderOptions.folder.fsPath;
 
 			const escapedArgs = rgArgs
 				.map(arg => arg.match(/^-/) ? arg : `'${arg}'`)
@@ -59,8 +80,8 @@ export class RipgrepTextSearchEngine {
 			});
 
 			let gotResult = false;
-			const ripgrepParser = new RipgrepParser(options.maxResults, options.folder, options.previewOptions);
-			ripgrepParser.on('result', (match: TextSearchResult) => {
+			const ripgrepParser = new RipgrepParser(options.maxResults ?? DEFAULT_MAX_SEARCH_RESULTS, options.folderOptions.folder, newToOldPreviewOptions(options.previewOptions));
+			ripgrepParser.on('result', (match: TextSearchResultNew) => {
 				gotResult = true;
 				dataWithoutResult = '';
 				progress.report(match);
@@ -188,7 +209,7 @@ export class RipgrepParser extends EventEmitter {
 
 	private numResults = 0;
 
-	constructor(private maxResults: number, private root: URI, private previewOptions?: TextSearchPreviewOptions) {
+	constructor(private maxResults: number, private root: URI, private previewOptions: ITextSearchPreviewOptions) {
 		super();
 		this.stringDecoder = new StringDecoder();
 	}
@@ -202,7 +223,7 @@ export class RipgrepParser extends EventEmitter {
 	}
 
 
-	override on(event: 'result', listener: (result: TextSearchResult) => void): this;
+	override on(event: 'result', listener: (result: TextSearchResultNew) => void): this;
 	override on(event: 'hitLimit', listener: () => void): this;
 	override on(event: string, listener: (...args: any[]) => void): this {
 		super.on(event, listener);
@@ -243,6 +264,7 @@ export class RipgrepParser extends EventEmitter {
 		this.remainder = dataStr.substring(prevIdx);
 	}
 
+
 	private handleLine(outputLine: string): void {
 		if (this.isDone || !outputLine) {
 			return;
@@ -268,12 +290,12 @@ export class RipgrepParser extends EventEmitter {
 		} else if (parsedLine.type === 'context') {
 			const contextPath = bytesOrTextToString(parsedLine.data.path);
 			const uri = URI.joinPath(this.root, contextPath);
-			const result = this.createTextSearchContext(parsedLine.data, uri);
+			const result = this.createTextSearchContexts(parsedLine.data, uri);
 			result.forEach(r => this.onResult(r));
 		}
 	}
 
-	private createTextSearchMatch(data: IRgMatch, uri: URI): TextSearchMatch {
+	private createTextSearchMatch(data: IRgMatch, uri: URI): TextSearchMatchNew {
 		const lineNumber = data.line_number - 1;
 		const fullText = bytesOrTextToString(data.lines);
 		const fullTextBytes = Buffer.from(fullText);
@@ -326,25 +348,30 @@ export class RipgrepParser extends EventEmitter {
 			return new Range(startLineNumber, startCol, endLineNumber, endCol);
 		}));
 
-		return createTextSearchResult(uri, fullText, <Range[]>ranges, this.previewOptions);
+		const searchRange = mapArrayOrNot(<Range[]>ranges, rangeToSearchRange);
+
+		const internalResult = new TextSearchMatch(fullText, searchRange, this.previewOptions);
+		return new TextSearchMatchNew(
+			uri,
+			internalResult.rangeLocations.map(e => (
+				{
+					sourceRange: searchRangeToRange(e.source),
+					previewRange: searchRangeToRange(e.preview),
+				}
+			)),
+			internalResult.previewText);
 	}
 
-	private createTextSearchContext(data: IRgMatch, uri: URI): TextSearchContext[] {
+	private createTextSearchContexts(data: IRgMatch, uri: URI): TextSearchContextNew[] {
 		const text = bytesOrTextToString(data.lines);
 		const startLine = data.line_number;
 		return text
 			.replace(/\r?\n$/, '')
 			.split('\n')
-			.map((line, i) => {
-				return {
-					text: line,
-					uri,
-					lineNumber: startLine + i
-				};
-			});
+			.map((line, i) => new TextSearchContextNew(uri, line, startLine + i));
 	}
 
-	private onResult(match: TextSearchResult): void {
+	private onResult(match: TextSearchResultNew): void {
 		this.emit('result', match);
 	}
 }
@@ -373,12 +400,12 @@ function getNumLinesAndLastNewlineLength(text: string): { numLines: number; last
 }
 
 // exported for testing
-export function getRgArgs(query: TextSearchQuery, options: RipgrepTextSearchOptions): string[] {
+export function getRgArgs(query: TextSearchQueryNew, options: RipgrepTextSearchOptions): string[] {
 	const args = ['--hidden', '--no-require-git'];
 	args.push(query.isCaseSensitive ? '--case-sensitive' : '--ignore-case');
 
 	const { doubleStarIncludes, otherIncludes } = groupBy(
-		options.includes,
+		options.folderOptions.includes,
 		(include: string) => include.startsWith('**') ? 'doubleStarIncludes' : 'otherIncludes');
 
 	if (otherIncludes && otherIncludes.length) {
@@ -402,7 +429,7 @@ export function getRgArgs(query: TextSearchQuery, options: RipgrepTextSearchOpti
 		});
 	}
 
-	options.excludes
+	options.folderOptions.excludes.map(e => typeof (e) === 'string' ? e : e.pattern)
 		.map(anchorGlob)
 		.forEach(rgGlob => args.push('-g', `!${rgGlob}`));
 
@@ -410,8 +437,8 @@ export function getRgArgs(query: TextSearchQuery, options: RipgrepTextSearchOpti
 		args.push('--max-filesize', options.maxFileSize + '');
 	}
 
-	if (options.useIgnoreFiles) {
-		if (!options.useParentIgnoreFiles) {
+	if (options.folderOptions.useIgnoreFiles.local) {
+		if (!options.folderOptions.useIgnoreFiles.parent) {
 			args.push('--no-ignore-parent');
 		}
 	} else {
@@ -419,12 +446,12 @@ export function getRgArgs(query: TextSearchQuery, options: RipgrepTextSearchOpti
 		args.push('--no-ignore');
 	}
 
-	if (options.followSymlinks) {
+	if (options.folderOptions.followSymlinks) {
 		args.push('--follow');
 	}
 
-	if (options.encoding && options.encoding !== 'utf8') {
-		args.push('--encoding', options.encoding);
+	if (options.folderOptions.encoding && options.folderOptions.encoding !== 'utf8') {
+		args.push('--encoding', options.folderOptions.encoding);
 	}
 
 	if (options.numThreads) {
@@ -470,7 +497,7 @@ export function getRgArgs(query: TextSearchQuery, options: RipgrepTextSearchOpti
 	}
 
 	args.push('--no-config');
-	if (!options.useGlobalIgnoreFiles) {
+	if (!options.folderOptions.useIgnoreFiles.global) {
 		args.push('--no-ignore-global');
 	}
 
@@ -480,12 +507,9 @@ export function getRgArgs(query: TextSearchQuery, options: RipgrepTextSearchOpti
 		args.push('--multiline');
 	}
 
-	if (options.beforeContext) {
-		args.push('--before-context', options.beforeContext + '');
-	}
-
-	if (options.afterContext) {
-		args.push('--after-context', options.afterContext + '');
+	if (options.surroundingContext) {
+		args.push('--before-context', options.surroundingContext + '');
+		args.push('--after-context', options.surroundingContext + '');
 	}
 
 	// Folder to search
diff --git a/src/vs/workbench/services/search/node/textSearchAdapter.ts b/src/vs/workbench/services/search/node/textSearchAdapter.ts
index 58145f0af56..5ae310d1eea 100644
--- a/src/vs/workbench/services/search/node/textSearchAdapter.ts
+++ b/src/vs/workbench/services/search/node/textSearchAdapter.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import * as pfs from 'vs/base/node/pfs';
-import { IFileMatch, IProgressMessage, ITextQuery, ITextSearchMatch, ISerializedFileMatch, ISerializedSearchSuccess } from 'vs/workbench/services/search/common/search';
-import { RipgrepTextSearchEngine } from 'vs/workbench/services/search/node/ripgrepTextSearchEngine';
-import { NativeTextSearchManager } from 'vs/workbench/services/search/node/textSearchManager';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import * as pfs from '../../../../base/node/pfs.js';
+import { IFileMatch, IProgressMessage, ITextQuery, ITextSearchMatch, ISerializedFileMatch, ISerializedSearchSuccess, resultIsMatch } from '../common/search.js';
+import { RipgrepTextSearchEngine } from './ripgrepTextSearchEngine.js';
+import { NativeTextSearchManager } from './textSearchManager.js';
 
 export class TextSearchEngineAdapter {
 
@@ -50,9 +50,9 @@ function fileMatchToSerialized(match: IFileMatch): ISerializedFileMatch {
 		path: match.resource && match.resource.fsPath,
 		results: match.results,
 		numMatches: (match.results || []).reduce((sum, r) => {
-			if (!!(<ITextSearchMatch>r).ranges) {
+			if (resultIsMatch(r)) {
 				const m = <ITextSearchMatch>r;
-				return sum + (Array.isArray(m.ranges) ? m.ranges.length : 1);
+				return sum + m.rangeLocations.length;
 			} else {
 				return sum + 1;
 			}
diff --git a/src/vs/workbench/services/search/node/textSearchManager.ts b/src/vs/workbench/services/search/node/textSearchManager.ts
index 34cf4cce311..56744c247b7 100644
--- a/src/vs/workbench/services/search/node/textSearchManager.ts
+++ b/src/vs/workbench/services/search/node/textSearchManager.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { toCanonicalName } from 'vs/workbench/services/textfile/common/encoding';
-import * as pfs from 'vs/base/node/pfs';
-import { ITextQuery, ITextSearchStats } from 'vs/workbench/services/search/common/search';
-import { TextSearchProvider } from 'vs/workbench/services/search/common/searchExtTypes';
-import { TextSearchManager } from 'vs/workbench/services/search/common/textSearchManager';
+import { toCanonicalName } from '../../textfile/common/encoding.js';
+import * as pfs from '../../../../base/node/pfs.js';
+import { ITextQuery, ITextSearchStats } from '../common/search.js';
+import { TextSearchProviderNew } from '../common/searchExtTypes.js';
+import { TextSearchManager } from '../common/textSearchManager.js';
 
 export class NativeTextSearchManager extends TextSearchManager {
 
-	constructor(query: ITextQuery, provider: TextSearchProvider, _pfs: typeof pfs = pfs, processType: ITextSearchStats['type'] = 'searchProcess') {
+	constructor(query: ITextQuery, provider: TextSearchProviderNew, _pfs: typeof pfs = pfs, processType: ITextSearchStats['type'] = 'searchProcess') {
 		super({ query, provider }, {
 			readdir: resource => _pfs.Promises.readdir(resource.fsPath),
 			toCanonicalName: name => toCanonicalName(name)
diff --git a/src/vs/workbench/services/search/test/browser/queryBuilder.test.ts b/src/vs/workbench/services/search/test/browser/queryBuilder.test.ts
index e1172336673..5adf99af9d0 100644
--- a/src/vs/workbench/services/search/test/browser/queryBuilder.test.ts
+++ b/src/vs/workbench/services/search/test/browser/queryBuilder.test.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { IExpression } from 'vs/base/common/glob';
-import { join } from 'vs/base/common/path';
-import { isWindows } from 'vs/base/common/platform';
-import { URI, URI as uri } from 'vs/base/common/uri';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { IWorkspaceContextService, toWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { toWorkspaceFolders } from 'vs/platform/workspaces/common/workspaces';
-import { ISearchPathsInfo, QueryBuilder } from 'vs/workbench/services/search/common/queryBuilder';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { IFileQuery, IFolderQuery, IPatternInfo, ITextQuery, QueryType } from 'vs/workbench/services/search/common/search';
-import { TestPathService, TestEnvironmentService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { TestContextService } from 'vs/workbench/test/common/workbenchTestServices';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { Workspace } from 'vs/platform/workspace/test/common/testWorkspace';
-import { extUriBiasedIgnorePathCase } from 'vs/base/common/resources';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { IExpression } from '../../../../../base/common/glob.js';
+import { join } from '../../../../../base/common/path.js';
+import { isWindows } from '../../../../../base/common/platform.js';
+import { URI, URI as uri } from '../../../../../base/common/uri.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { IWorkspaceContextService, toWorkspaceFolder } from '../../../../../platform/workspace/common/workspace.js';
+import { toWorkspaceFolders } from '../../../../../platform/workspaces/common/workspaces.js';
+import { ISearchPathsInfo, QueryBuilder } from '../../common/queryBuilder.js';
+import { IPathService } from '../../../path/common/pathService.js';
+import { IFileQuery, IFolderQuery, IPatternInfo, ITextQuery, QueryType } from '../../common/search.js';
+import { TestPathService, TestEnvironmentService } from '../../../../test/browser/workbenchTestServices.js';
+import { TestContextService } from '../../../../test/common/workbenchTestServices.js';
+import { IEnvironmentService } from '../../../../../platform/environment/common/environment.js';
+import { Workspace } from '../../../../../platform/workspace/test/common/testWorkspace.js';
+import { extUriBiasedIgnorePathCase } from '../../../../../base/common/resources.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 const DEFAULT_EDITOR_CONFIG = {};
 const DEFAULT_USER_CONFIG = { useRipgrep: true, useIgnoreFiles: true, useGlobalIgnoreFiles: true, useParentIgnoreFiles: true };
@@ -211,12 +211,14 @@ suite('QueryBuilder', () => {
 				contentPattern: PATTERN_INFO,
 				folderQueries: [{
 					folder: ROOT_1_URI,
-					excludePattern: {
-						'bar/**': true,
-						'foo/**': {
-							'when': '$(basename).ts'
+					excludePattern: [{
+						pattern: {
+							'bar/**': true,
+							'foo/**': {
+								'when': '$(basename).ts'
+							}
 						}
-					}
+					}]
 				}],
 				type: QueryType.Text
 			});
@@ -337,12 +339,14 @@ suite('QueryBuilder', () => {
 						'foo': true,
 						'foo/**': true
 					},
-					excludePattern: {
-						'foo/**/*.js': true,
-						'bar/**': {
-							'when': '$(basename).ts'
+					excludePattern: [{
+						pattern: {
+							'foo/**/*.js': true,
+							'bar/**': {
+								'when': '$(basename).ts'
+							}
 						}
-					}
+					}]
 				}],
 				type: QueryType.Text
 			});
@@ -375,8 +379,8 @@ suite('QueryBuilder', () => {
 			{
 				contentPattern: PATTERN_INFO,
 				folderQueries: [
-					{ folder: ROOT_1_URI, excludePattern: patternsToIExpression('foo/**/*.js') },
-					{ folder: ROOT_2_URI, excludePattern: patternsToIExpression('bar') },
+					{ folder: ROOT_1_URI, excludePattern: makeExcludePatternFromPatterns('foo/**/*.js') },
+					{ folder: ROOT_2_URI, excludePattern: makeExcludePatternFromPatterns('bar') },
 					{ folder: ROOT_3_URI }
 				],
 				type: QueryType.Text
@@ -402,9 +406,9 @@ suite('QueryBuilder', () => {
 							'src': true,
 							'src/**': true
 						},
-						excludePattern: {
-							'bar': true
-						},
+						excludePattern: [{
+							pattern: { 'bar': true }
+						}],
 					}
 				],
 				type: QueryType.Text
@@ -418,7 +422,7 @@ suite('QueryBuilder', () => {
 				PATTERN_INFO,
 				[ROOT_1_URI],
 				{
-					excludePattern: 'foo',
+					excludePattern: [{ pattern: 'foo' }],
 					expandPatterns: true
 				}
 			),
@@ -452,7 +456,7 @@ suite('QueryBuilder', () => {
 				PATTERN_INFO,
 				[ROOT_1_URI],
 				{
-					excludePattern: './bar',
+					excludePattern: [{ pattern: './bar' }],
 					expandPatterns: true
 				}
 			),
@@ -460,7 +464,7 @@ suite('QueryBuilder', () => {
 				contentPattern: PATTERN_INFO,
 				folderQueries: [{
 					folder: ROOT_1_URI,
-					excludePattern: patternsToIExpression('bar', 'bar/**'),
+					excludePattern: makeExcludePatternFromPatterns('bar', 'bar/**'),
 				}],
 				type: QueryType.Text
 			});
@@ -470,7 +474,7 @@ suite('QueryBuilder', () => {
 				PATTERN_INFO,
 				[ROOT_1_URI],
 				{
-					excludePattern: './bar/**/*.ts',
+					excludePattern: [{ pattern: './bar/**/*.ts' }],
 					expandPatterns: true
 				}
 			),
@@ -478,7 +482,7 @@ suite('QueryBuilder', () => {
 				contentPattern: PATTERN_INFO,
 				folderQueries: [{
 					folder: ROOT_1_URI,
-					excludePattern: patternsToIExpression('bar/**/*.ts', 'bar/**/*.ts/**'),
+					excludePattern: makeExcludePatternFromPatterns('bar/**/*.ts', 'bar/**/*.ts/**'),
 				}],
 				type: QueryType.Text
 			});
@@ -488,7 +492,7 @@ suite('QueryBuilder', () => {
 				PATTERN_INFO,
 				[ROOT_1_URI],
 				{
-					excludePattern: '.\\bar\\**\\*.ts',
+					excludePattern: [{ pattern: '.\\bar\\**\\*.ts' }],
 					expandPatterns: true
 				}
 			),
@@ -496,7 +500,7 @@ suite('QueryBuilder', () => {
 				contentPattern: PATTERN_INFO,
 				folderQueries: [{
 					folder: ROOT_1_URI,
-					excludePattern: patternsToIExpression('bar/**/*.ts', 'bar/**/*.ts/**'),
+					excludePattern: makeExcludePatternFromPatterns('bar/**/*.ts', 'bar/**/*.ts/**'),
 				}],
 				type: QueryType.Text
 			});
@@ -524,7 +528,7 @@ suite('QueryBuilder', () => {
 				[ROOT_1_URI],
 				{
 					extraFileResources: [getUri('/foo/bar.js')],
-					excludePattern: '*.js',
+					excludePattern: [{ pattern: '*.js' }],
 					expandPatterns: true
 				}
 			),
@@ -1078,7 +1082,133 @@ suite('QueryBuilder', () => {
 			assert(query.sortByScore);
 		});
 	});
+
+	suite('pattern processing', () => {
+		test('text query with comma-separated includes with no workspace', () => {
+			const query = queryBuilder.text(
+				{ pattern: `` },
+				[],
+				{
+					includePattern: '*.js,*.ts',
+					expandPatterns: true
+				}
+			);
+			assert.deepEqual(query.includePattern, {
+				"**/*.js/**": true,
+				"**/*.js": true,
+				"**/*.ts/**": true,
+				"**/*.ts": true,
+			});
+			assert.strictEqual(query.folderQueries.length, 0);
+		});
+		test('text query with comma-separated includes with workspace', () => {
+			const query = queryBuilder.text(
+				{ pattern: `` },
+				[ROOT_1_URI],
+				{
+					includePattern: '*.js,*.ts',
+					expandPatterns: true
+				}
+			);
+			assert.deepEqual(query.includePattern, {
+				"**/*.js/**": true,
+				"**/*.js": true,
+				"**/*.ts/**": true,
+				"**/*.ts": true,
+			});
+			assert.strictEqual(query.folderQueries.length, 1);
+		});
+		test('text query with comma-separated excludes globally', () => {
+			const query = queryBuilder.text(
+				{ pattern: `` },
+				[],
+				{
+					excludePattern: [{ pattern: '*.js,*.ts' }],
+					expandPatterns: true
+				}
+			);
+			assert.deepEqual(query.excludePattern, {
+				"**/*.js/**": true,
+				"**/*.js": true,
+				"**/*.ts/**": true,
+				"**/*.ts": true,
+			});
+			assert.strictEqual(query.folderQueries.length, 0);
+		});
+		test('text query with comma-separated excludes globally in a workspace', () => {
+			const query = queryBuilder.text(
+				{ pattern: `` },
+				[ROOT_1_NAMED_FOLDER.uri],
+				{
+					excludePattern: [{ pattern: '*.js,*.ts' }],
+					expandPatterns: true
+				}
+			);
+			assert.deepEqual(query.excludePattern, {
+				"**/*.js/**": true,
+				"**/*.js": true,
+				"**/*.ts/**": true,
+				"**/*.ts": true,
+			});
+			assert.strictEqual(query.folderQueries.length, 1);
+		});
+		test.skip('text query with multiple comma-separated excludes', () => {
+			// TODO: Fix. Will require `ICommonQueryProps.excludePattern` to support an array.
+			const query = queryBuilder.text(
+				{ pattern: `` },
+				[ROOT_1_NAMED_FOLDER.uri],
+				{
+					excludePattern: [{ pattern: '*.js,*.ts' }, { pattern: 'foo/*,bar/*' }],
+					expandPatterns: true
+				}
+			);
+			assert.deepEqual(query.excludePattern, [
+				{
+
+					"**/*.js/**": true,
+					"**/*.js": true,
+					"**/*.ts/**": true,
+					"**/*.ts": true,
+				},
+				{
+					"**/foo/*/**": true,
+					"**/foo/*": true,
+					"**/bar/*/**": true,
+					"**/bar/*": true,
+				}
+			]);
+			assert.strictEqual(query.folderQueries.length, 1);
+		});
+		test.skip('text query with base URI on exclud', () => {
+			// TODO: Fix. Will require `ICommonQueryProps.excludePattern` to support an baseURI.
+			const query = queryBuilder.text(
+				{ pattern: `` },
+				[ROOT_1_NAMED_FOLDER.uri],
+				{
+					excludePattern: [{ uri: ROOT_1_URI, pattern: '*.js,*.ts' }],
+					expandPatterns: true
+				}
+			);
+			// todo: incorporate the base URI into the pattern
+			assert.deepEqual(query.excludePattern, {
+				uri: ROOT_1_URI,
+				pattern: {
+					"**/*.js/**": true,
+					"**/*.js": true,
+					"**/*.ts/**": true,
+					"**/*.ts": true,
+				}
+			});
+			assert.strictEqual(query.folderQueries.length, 1);
+		});
+	});
 });
+function makeExcludePatternFromPatterns(...patterns: string[]): {
+	pattern: IExpression;
+}[] | undefined {
+	const pattern = patternsToIExpression(...patterns);
+	return pattern ? [{ pattern }] : undefined;
+}
 
 function assertEqualTextQueries(actual: ITextQuery, expected: ITextQuery): void {
 	expected = {
@@ -1096,9 +1226,10 @@ export function assertEqualQueries(actual: ITextQuery | IFileQuery, expected: IT
 	};
 
 	const folderQueryToCompareObject = (fq: IFolderQuery) => {
+		const excludePattern = fq.excludePattern?.map(e => normalizeExpression(e.pattern));
 		return {
 			path: fq.folder.fsPath,
-			excludePattern: normalizeExpression(fq.excludePattern),
+			excludePattern: excludePattern?.length ? excludePattern : undefined,
 			includePattern: normalizeExpression(fq.includePattern),
 			fileEncoding: fq.fileEncoding
 		};
diff --git a/src/vs/workbench/services/search/test/common/ignoreFile.test.ts b/src/vs/workbench/services/search/test/common/ignoreFile.test.ts
index 75a456be6ec..60347f88411 100644
--- a/src/vs/workbench/services/search/test/common/ignoreFile.test.ts
+++ b/src/vs/workbench/services/search/test/common/ignoreFile.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IgnoreFile } from 'vs/workbench/services/search/common/ignoreFile';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IgnoreFile } from '../../common/ignoreFile.js';
 
 function runAssert(input: string, ignoreFile: string, ignoreFileLocation: string, shouldMatch: boolean, traverse: boolean) {
 	return (prefix: string) => {
diff --git a/src/vs/workbench/services/search/test/common/queryBuilder.test.ts b/src/vs/workbench/services/search/test/common/queryBuilder.test.ts
index a4a7ce1cf18..3a5c91e4686 100644
--- a/src/vs/workbench/services/search/test/common/queryBuilder.test.ts
+++ b/src/vs/workbench/services/search/test/common/queryBuilder.test.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { isWindows } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { testWorkspace } from 'vs/platform/workspace/test/common/testWorkspace';
-import { resolveResourcesForSearchIncludes } from 'vs/workbench/services/search/common/queryBuilder';
-import { TestContextService } from 'vs/workbench/test/common/workbenchTestServices';
+import { isWindows } from '../../../../../base/common/platform.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { testWorkspace } from '../../../../../platform/workspace/test/common/testWorkspace.js';
+import { resolveResourcesForSearchIncludes } from '../../common/queryBuilder.js';
+import { TestContextService } from '../../../../test/common/workbenchTestServices.js';
 
 suite('QueryBuilderCommon', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/services/search/test/common/replace.test.ts b/src/vs/workbench/services/search/test/common/replace.test.ts
index 871c7e39f6f..3ca970ad525 100644
--- a/src/vs/workbench/services/search/test/common/replace.test.ts
+++ b/src/vs/workbench/services/search/test/common/replace.test.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ReplacePattern } from 'vs/workbench/services/search/common/replace';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { ReplacePattern } from '../../common/replace.js';
 
 suite('Replace Pattern test', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/services/search/test/common/search.test.ts b/src/vs/workbench/services/search/test/common/search.test.ts
index 5f0ec330f8a..d2ccd94f59c 100644
--- a/src/vs/workbench/services/search/test/common/search.test.ts
+++ b/src/vs/workbench/services/search/test/common/search.test.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ITextSearchPreviewOptions, OneLineRange, TextSearchMatch, SearchRange } from 'vs/workbench/services/search/common/search';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { ITextSearchPreviewOptions, OneLineRange, TextSearchMatch, SearchRange } from '../../common/search.js';
 
 suite('TextSearchResult', () => {
 
@@ -14,59 +14,64 @@ suite('TextSearchResult', () => {
 	};
 
 	function assertOneLinePreviewRangeText(text: string, result: TextSearchMatch): void {
+		assert.strictEqual(result.rangeLocations.length, 1);
 		assert.strictEqual(
-			result.preview.text.substring((<SearchRange>result.preview.matches).startColumn, (<SearchRange>result.preview.matches).endColumn),
+			result.previewText.substring((result.rangeLocations[0].preview).startColumn, (result.rangeLocations[0].preview).endColumn),
 			text);
 	}
 
+	function getFirstSourceFromResult(result: TextSearchMatch): OneLineRange {
+		return result.rangeLocations.map(e => e.source)[0];
+	}
+
 	ensureNoDisposablesAreLeakedInTestSuite();
 
 	test('empty without preview options', () => {
 		const range = new OneLineRange(5, 0, 0);
 		const result = new TextSearchMatch('', range);
-		assert.deepStrictEqual(result.ranges, range);
+		assert.deepStrictEqual(getFirstSourceFromResult(result), range);
 		assertOneLinePreviewRangeText('', result);
 	});
 
 	test('empty with preview options', () => {
 		const range = new OneLineRange(5, 0, 0);
 		const result = new TextSearchMatch('', range, previewOptions1);
-		assert.deepStrictEqual(result.ranges, range);
+		assert.deepStrictEqual(getFirstSourceFromResult(result), range);
 		assertOneLinePreviewRangeText('', result);
 	});
 
 	test('short without preview options', () => {
 		const range = new OneLineRange(5, 4, 7);
 		const result = new TextSearchMatch('foo bar', range);
-		assert.deepStrictEqual(result.ranges, range);
+		assert.deepStrictEqual(getFirstSourceFromResult(result), range);
 		assertOneLinePreviewRangeText('bar', result);
 	});
 
 	test('short with preview options', () => {
 		const range = new OneLineRange(5, 4, 7);
 		const result = new TextSearchMatch('foo bar', range, previewOptions1);
-		assert.deepStrictEqual(result.ranges, range);
+		assert.deepStrictEqual(getFirstSourceFromResult(result), range);
 		assertOneLinePreviewRangeText('bar', result);
 	});
 
 	test('leading', () => {
 		const range = new OneLineRange(5, 25, 28);
 		const result = new TextSearchMatch('long text very long text foo', range, previewOptions1);
-		assert.deepStrictEqual(result.ranges, range);
+		assert.deepStrictEqual(getFirstSourceFromResult(result), range);
 		assertOneLinePreviewRangeText('foo', result);
 	});
 
 	test('trailing', () => {
 		const range = new OneLineRange(5, 0, 3);
 		const result = new TextSearchMatch('foo long text very long text long text very long text long text very long text long text very long text long text very long text', range, previewOptions1);
-		assert.deepStrictEqual(result.ranges, range);
+		assert.deepStrictEqual(getFirstSourceFromResult(result), range);
 		assertOneLinePreviewRangeText('foo', result);
 	});
 
 	test('middle', () => {
 		const range = new OneLineRange(5, 30, 33);
 		const result = new TextSearchMatch('long text very long text long foo text very long text long text very long text long text very long text long text very long text', range, previewOptions1);
-		assert.deepStrictEqual(result.ranges, range);
+		assert.deepStrictEqual(getFirstSourceFromResult(result), range);
 		assertOneLinePreviewRangeText('foo', result);
 	});
 
@@ -78,7 +83,7 @@ suite('TextSearchResult', () => {
 
 		const range = new OneLineRange(0, 4, 7);
 		const result = new TextSearchMatch('foo bar', range, previewOptions);
-		assert.deepStrictEqual(result.ranges, range);
+		assert.deepStrictEqual(getFirstSourceFromResult(result), range);
 		assertOneLinePreviewRangeText('b', result);
 	});
 
@@ -90,12 +95,13 @@ suite('TextSearchResult', () => {
 
 		const range = new SearchRange(5, 4, 6, 3);
 		const result = new TextSearchMatch('foo bar\nfoo bar', range, previewOptions);
-		assert.deepStrictEqual(result.ranges, range);
-		assert.strictEqual(result.preview.text, 'foo bar\nfoo bar');
-		assert.strictEqual((<SearchRange>result.preview.matches).startLineNumber, 0);
-		assert.strictEqual((<SearchRange>result.preview.matches).startColumn, 4);
-		assert.strictEqual((<SearchRange>result.preview.matches).endLineNumber, 1);
-		assert.strictEqual((<SearchRange>result.preview.matches).endColumn, 3);
+		assert.deepStrictEqual(getFirstSourceFromResult(result), range);
+		assert.strictEqual(result.previewText, 'foo bar\nfoo bar');
+		assert.strictEqual(result.rangeLocations.length, 1);
+		assert.strictEqual(result.rangeLocations[0].preview.startLineNumber, 0);
+		assert.strictEqual(result.rangeLocations[0].preview.startColumn, 4);
+		assert.strictEqual(result.rangeLocations[0].preview.endLineNumber, 1);
+		assert.strictEqual(result.rangeLocations[0].preview.endColumn, 3);
 	});
 
 	test('compacts multiple ranges on long lines', () => {
@@ -108,8 +114,8 @@ suite('TextSearchResult', () => {
 		const range2 = new SearchRange(5, 133, 5, 136);
 		const range3 = new SearchRange(5, 141, 5, 144);
 		const result = new TextSearchMatch('foo bar 123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 foo bar baz bar', [range1, range2, range3], previewOptions);
-		assert.deepStrictEqual(result.preview.matches, [new OneLineRange(0, 4, 7), new OneLineRange(0, 42, 45), new OneLineRange(0, 50, 53)]);
-		assert.strictEqual(result.preview.text, 'foo bar 123456⟪ 117 characters skipped ⟫o bar baz bar');
+		assert.deepStrictEqual(result.rangeLocations.map(e => e.preview), [new OneLineRange(0, 4, 7), new OneLineRange(0, 42, 45), new OneLineRange(0, 50, 53)]);
+		assert.strictEqual(result.previewText, 'foo bar 123456⟪ 117 characters skipped ⟫o bar baz bar');
 	});
 
 	test('trims lines endings', () => {
@@ -119,8 +125,8 @@ suite('TextSearchResult', () => {
 			charsPerLine: 10000
 		};
 
-		assert.strictEqual(new TextSearchMatch('foo bar\n', range, previewOptions).preview.text, 'foo bar');
-		assert.strictEqual(new TextSearchMatch('foo bar\r\n', range, previewOptions).preview.text, 'foo bar');
+		assert.strictEqual(new TextSearchMatch('foo bar\n', range, previewOptions).previewText, 'foo bar');
+		assert.strictEqual(new TextSearchMatch('foo bar\r\n', range, previewOptions).previewText, 'foo bar');
 	});
 
 	// test('all lines of multiline match', () => {
diff --git a/src/vs/workbench/services/search/test/common/searchHelpers.test.ts b/src/vs/workbench/services/search/test/common/searchHelpers.test.ts
index 2d9db98c70d..b218a18ebfb 100644
--- a/src/vs/workbench/services/search/test/common/searchHelpers.test.ts
+++ b/src/vs/workbench/services/search/test/common/searchHelpers.test.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Range } from 'vs/editor/common/core/range';
-import { FindMatch, ITextModel } from 'vs/editor/common/model';
-import { ISearchRange, ITextQuery, ITextSearchContext, ITextSearchResult, QueryType } from 'vs/workbench/services/search/common/search';
-import { getTextSearchMatchWithModelContext, editorMatchesToTextSearchResults } from 'vs/workbench/services/search/common/searchHelpers';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { FindMatch, ITextModel } from '../../../../../editor/common/model.js';
+import { ISearchRange, ITextQuery, ITextSearchContext, ITextSearchResult, QueryType } from '../../common/search.js';
+import { getTextSearchMatchWithModelContext, editorMatchesToTextSearchResults } from '../../common/searchHelpers.js';
 
 suite('SearchHelpers', () => {
 	suite('editorMatchesToTextSearchResults', () => {
@@ -39,9 +39,9 @@ suite('SearchHelpers', () => {
 		test('simple', () => {
 			const results = editorMatchesToTextSearchResults([new FindMatch(new Range(6, 1, 6, 2), null)], mockTextModel);
 			assert.strictEqual(results.length, 1);
-			assert.strictEqual(results[0].preview.text, '6\n');
-			assertRangesEqual(results[0].preview.matches, [new Range(0, 0, 0, 1)]);
-			assertRangesEqual(results[0].ranges, [new Range(5, 0, 5, 1)]);
+			assert.strictEqual(results[0].previewText, '6\n');
+			assertRangesEqual(results[0].rangeLocations.map(e => e.preview), [new Range(0, 0, 0, 1)]);
+			assertRangesEqual(results[0].rangeLocations.map(e => e.source), [new Range(5, 0, 5, 1)]);
 		});
 
 		test('multiple', () => {
@@ -53,23 +53,23 @@ suite('SearchHelpers', () => {
 				],
 				mockTextModel);
 			assert.strictEqual(results.length, 2);
-			assertRangesEqual(results[0].preview.matches, [
+			assertRangesEqual(results[0].rangeLocations.map(e => e.preview), [
 				new Range(0, 0, 0, 1),
 				new Range(0, 3, 2, 1),
 			]);
-			assertRangesEqual(results[0].ranges, [
+			assertRangesEqual(results[0].rangeLocations.map(e => e.source), [
 				new Range(5, 0, 5, 1),
 				new Range(5, 3, 7, 1),
 			]);
-			assert.strictEqual(results[0].preview.text, '6\n7\n8\n');
+			assert.strictEqual(results[0].previewText, '6\n7\n8\n');
 
-			assertRangesEqual(results[1].preview.matches, [
+			assertRangesEqual(results[1].rangeLocations.map(e => e.preview), [
 				new Range(0, 0, 1, 2),
 			]);
-			assertRangesEqual(results[1].ranges, [
+			assertRangesEqual(results[1].rangeLocations.map(e => e.source), [
 				new Range(8, 0, 9, 2),
 			]);
-			assert.strictEqual(results[1].preview.text, '9\n10\n');
+			assert.strictEqual(results[1].previewText, '9\n10\n');
 		});
 	});
 
@@ -91,23 +91,24 @@ suite('SearchHelpers', () => {
 			}
 		} as ITextModel;
 
-		function getQuery(beforeContext?: number, afterContext?: number): ITextQuery {
+		function getQuery(surroundingContext?: number): ITextQuery {
 			return {
 				folderQueries: [],
 				type: QueryType.Text,
 				contentPattern: { pattern: 'test' },
-				beforeContext,
-				afterContext
+				surroundingContext,
 			};
 		}
 
 		test('no context', () => {
 			const matches = [{
-				preview: {
-					text: 'foo',
-					matches: new Range(0, 0, 0, 10)
-				},
-				ranges: new Range(0, 0, 0, 10)
+				previewText: 'foo',
+				rangeLocations: [
+					{
+						preview: new Range(0, 0, 0, 10),
+						source: new Range(0, 0, 0, 10)
+					}
+				]
 			}];
 
 			assert.deepStrictEqual(getTextSearchMatchWithModelContext(matches, mockTextModel, getQuery()), matches);
@@ -115,14 +116,17 @@ suite('SearchHelpers', () => {
 
 		test('simple', () => {
 			const matches = [{
-				preview: {
-					text: 'foo',
-					matches: new Range(0, 0, 0, 10)
-				},
-				ranges: new Range(1, 0, 1, 10)
-			}];
+				previewText: 'foo',
+				rangeLocations: [
+					{
+						preview: new Range(0, 0, 0, 10),
+						source: new Range(1, 0, 1, 10)
+					}
+				]
+			}
+			];
 
-			assert.deepStrictEqual(getTextSearchMatchWithModelContext(matches, mockTextModel, getQuery(1, 2)), [
+			assert.deepStrictEqual(getTextSearchMatchWithModelContext(matches, mockTextModel, getQuery(1)), [
 				{
 					text: '1',
 					lineNumber: 1
@@ -132,31 +136,31 @@ suite('SearchHelpers', () => {
 					text: '3',
 					lineNumber: 3
 				},
-				{
-					text: '4',
-					lineNumber: 4
-				},
 			] satisfies ITextSearchResult[]);
 		});
 
 		test('multiple matches next to each other', () => {
 			const matches = [
 				{
-					preview: {
-						text: 'foo',
-						matches: new Range(0, 0, 0, 10)
-					},
-					ranges: new Range(1, 0, 1, 10)
+					previewText: 'foo',
+					rangeLocations: [
+						{
+							preview: new Range(0, 0, 0, 10),
+							source: new Range(1, 0, 1, 10)
+						}
+					]
 				},
 				{
-					preview: {
-						text: 'bar',
-						matches: new Range(0, 0, 0, 10)
-					},
-					ranges: new Range(2, 0, 2, 10)
+					previewText: 'bar',
+					rangeLocations: [
+						{
+							preview: new Range(0, 0, 0, 10),
+							source: new Range(2, 0, 2, 10)
+						}
+					]
 				}];
 
-			assert.deepStrictEqual(getTextSearchMatchWithModelContext(matches, mockTextModel, getQuery(1, 2)), [
+			assert.deepStrictEqual(getTextSearchMatchWithModelContext(matches, mockTextModel, getQuery(1)), [
 				<ITextSearchContext>{
 					text: '1',
 					lineNumber: 1
@@ -166,40 +170,36 @@ suite('SearchHelpers', () => {
 					text: '4',
 					lineNumber: 4
 				},
-				<ITextSearchContext>{
-					text: '5',
-					lineNumber: 5
-				},
 			]);
 		});
 
 		test('boundaries', () => {
 			const matches = [
 				{
-					preview: {
-						text: 'foo',
-						matches: new Range(0, 0, 0, 10)
-					},
-					ranges: new Range(0, 0, 0, 10)
+					previewText: 'foo',
+					rangeLocations: [
+						{
+							preview: new Range(0, 0, 0, 10),
+							source: new Range(0, 0, 0, 10)
+						}
+					]
 				},
 				{
-					preview: {
-						text: 'bar',
-						matches: new Range(0, 0, 0, 10)
-					},
-					ranges: new Range(MOCK_LINE_COUNT - 1, 0, MOCK_LINE_COUNT - 1, 10)
+					previewText: 'bar',
+					rangeLocations: [
+						{
+							preview: new Range(0, 0, 0, 10),
+							source: new Range(MOCK_LINE_COUNT - 1, 0, MOCK_LINE_COUNT - 1, 10)
+						}
+					]
 				}];
 
-			assert.deepStrictEqual(getTextSearchMatchWithModelContext(matches, mockTextModel, getQuery(1, 2)), [
+			assert.deepStrictEqual(getTextSearchMatchWithModelContext(matches, mockTextModel, getQuery(1)), [
 				matches[0],
 				<ITextSearchContext>{
 					text: '2',
 					lineNumber: 2
 				},
-				<ITextSearchContext>{
-					text: '3',
-					lineNumber: 3
-				},
 				<ITextSearchContext>{
 					text: '' + (MOCK_LINE_COUNT - 1),
 					lineNumber: MOCK_LINE_COUNT - 1
diff --git a/src/vs/workbench/services/search/test/node/fileSearch.integrationTest.ts b/src/vs/workbench/services/search/test/node/fileSearch.integrationTest.ts
index 3cfd50a70f5..217625abea3 100644
--- a/src/vs/workbench/services/search/test/node/fileSearch.integrationTest.ts
+++ b/src/vs/workbench/services/search/test/node/fileSearch.integrationTest.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { FileAccess } from 'vs/base/common/network';
-import * as path from 'vs/base/common/path';
-import { URI } from 'vs/base/common/uri';
-import { flakySuite } from 'vs/base/test/node/testUtils';
-import { IFileQuery, IFolderQuery, ISerializedSearchProgressItem, isProgressMessage, QueryType } from 'vs/workbench/services/search/common/search';
-import { SearchService } from 'vs/workbench/services/search/node/rawSearchService';
+import { FileAccess } from '../../../../../base/common/network.js';
+import * as path from '../../../../../base/common/path.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { flakySuite } from '../../../../../base/test/node/testUtils.js';
+import { IFileQuery, IFolderQuery, ISerializedSearchProgressItem, isProgressMessage, QueryType } from '../../common/search.js';
+import { SearchService } from '../../node/rawSearchService.js';
 
 const TEST_FIXTURES = path.normalize(FileAccess.asFileUri('vs/workbench/services/search/test/node/fixtures').fsPath);
 const TEST_FIXTURES2 = path.normalize(FileAccess.asFileUri('vs/workbench/services/search/test/node/fixtures2').fsPath);
diff --git a/src/vs/workbench/services/search/test/node/rawSearchService.integrationTest.ts b/src/vs/workbench/services/search/test/node/rawSearchService.integrationTest.ts
index 7c2a5407a37..3a0f46a6e4d 100644
--- a/src/vs/workbench/services/search/test/node/rawSearchService.integrationTest.ts
+++ b/src/vs/workbench/services/search/test/node/rawSearchService.integrationTest.ts
@@ -4,15 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { FileAccess } from 'vs/base/common/network';
-import * as path from 'vs/base/common/path';
-import { URI } from 'vs/base/common/uri';
-import { flakySuite } from 'vs/base/test/node/testUtils';
-import { IFileQuery, IFileSearchStats, IFolderQuery, IProgressMessage, IRawFileMatch, ISearchEngine, ISearchEngineStats, ISearchEngineSuccess, ISerializedFileMatch, ISerializedSearchComplete, ISerializedSearchProgressItem, ISerializedSearchSuccess, isSerializedSearchComplete, isSerializedSearchSuccess, QueryType } from 'vs/workbench/services/search/common/search';
-import { IProgressCallback, SearchService as RawSearchService } from 'vs/workbench/services/search/node/rawSearchService';
+import { CancelablePromise, createCancelablePromise } from '../../../../../base/common/async.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { IDisposable } from '../../../../../base/common/lifecycle.js';
+import { FileAccess } from '../../../../../base/common/network.js';
+import * as path from '../../../../../base/common/path.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { flakySuite } from '../../../../../base/test/node/testUtils.js';
+import { IFileQuery, IFileSearchStats, IFolderQuery, IProgressMessage, IRawFileMatch, ISearchEngine, ISearchEngineStats, ISearchEngineSuccess, ISerializedFileMatch, ISerializedSearchComplete, ISerializedSearchProgressItem, ISerializedSearchSuccess, isSerializedSearchComplete, isSerializedSearchSuccess, QueryType } from '../../common/search.js';
+import { IProgressCallback, SearchService as RawSearchService } from '../../node/rawSearchService.js';
 
 const TEST_FOLDER_QUERIES = [
 	{ folder: URI.file(path.normalize('/some/where')) }
diff --git a/src/vs/workbench/services/search/test/node/ripgrepFileSearch.test.ts b/src/vs/workbench/services/search/test/node/ripgrepFileSearch.test.ts
index 98d8e8a421d..cf9569c23bd 100644
--- a/src/vs/workbench/services/search/test/node/ripgrepFileSearch.test.ts
+++ b/src/vs/workbench/services/search/test/node/ripgrepFileSearch.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import * as platform from 'vs/base/common/platform';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { fixDriveC, getAbsoluteGlob } from 'vs/workbench/services/search/node/ripgrepFileSearch';
+import * as platform from '../../../../../base/common/platform.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { fixDriveC, getAbsoluteGlob } from '../../node/ripgrepFileSearch.js';
 
 suite('RipgrepFileSearch - etc', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/services/search/test/node/ripgrepTextSearchEngineUtils.test.ts b/src/vs/workbench/services/search/test/node/ripgrepTextSearchEngineUtils.test.ts
index e93c4efb269..59bdb0ca8f6 100644
--- a/src/vs/workbench/services/search/test/node/ripgrepTextSearchEngineUtils.test.ts
+++ b/src/vs/workbench/services/search/test/node/ripgrepTextSearchEngineUtils.test.ts
@@ -4,11 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { joinPath } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { fixRegexNewline, IRgMatch, IRgMessage, RipgrepParser, unicodeEscapesToPCRE2, fixNewline, getRgArgs, performBraceExpansionForRipgrep } from 'vs/workbench/services/search/node/ripgrepTextSearchEngine';
-import { Range, TextSearchOptions, TextSearchQuery, TextSearchResult } from 'vs/workbench/services/search/common/searchExtTypes';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { joinPath } from '../../../../../base/common/resources.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { fixRegexNewline, IRgMatch, IRgMessage, RipgrepParser, unicodeEscapesToPCRE2, fixNewline, getRgArgs, performBraceExpansionForRipgrep } from '../../node/ripgrepTextSearchEngine.js';
+import { Range, TextSearchMatchNew, TextSearchQueryNew, TextSearchResultNew } from '../../common/searchExtTypes.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { RipgrepTextSearchOptions } from '../../common/searchExtTypesInternal.js';
+import { DEFAULT_TEXT_SEARCH_PREVIEW_OPTIONS } from '../../common/search.js';
 
 suite('RipgrepTextSearchEngine', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
@@ -104,10 +106,10 @@ suite('RipgrepTextSearchEngine', () => {
 	suite('RipgrepParser', () => {
 		const TEST_FOLDER = URI.file('/foo/bar');
 
-		function testParser(inputData: string[], expectedResults: TextSearchResult[]): void {
-			const testParser = new RipgrepParser(1000, TEST_FOLDER);
+		function testParser(inputData: string[], expectedResults: TextSearchResultNew[]): void {
+			const testParser = new RipgrepParser(1000, TEST_FOLDER, DEFAULT_TEXT_SEARCH_PREVIEW_OPTIONS);
 
-			const actualResults: TextSearchResult[] = [];
+			const actualResults: TextSearchResultNew[] = [];
 			testParser.on('result', r => {
 				actualResults.push(r);
 			});
@@ -146,14 +148,14 @@ suite('RipgrepTextSearchEngine', () => {
 					makeRgMatch('file1.js', 'foobar', 4, [{ start: 3, end: 6 }])
 				],
 				[
-					{
-						preview: {
-							text: 'foobar',
-							matches: [new Range(0, 3, 0, 6)]
-						},
-						uri: joinPath(TEST_FOLDER, 'file1.js'),
-						ranges: [new Range(3, 3, 3, 6)]
-					}
+					new TextSearchMatchNew(
+						joinPath(TEST_FOLDER, 'file1.js'),
+						[{
+							previewRange: new Range(0, 3, 0, 6),
+							sourceRange: new Range(3, 3, 3, 6),
+						}],
+						'foobar'
+					)
 				]);
 		});
 
@@ -165,30 +167,30 @@ suite('RipgrepTextSearchEngine', () => {
 					makeRgMatch('app2/file3.js', 'foobar', 4, [{ start: 3, end: 6 }]),
 				],
 				[
-					{
-						preview: {
-							text: 'foobar',
-							matches: [new Range(0, 3, 0, 6)]
-						},
-						uri: joinPath(TEST_FOLDER, 'file1.js'),
-						ranges: [new Range(3, 3, 3, 6)]
-					},
-					{
-						preview: {
-							text: 'foobar',
-							matches: [new Range(0, 3, 0, 6)]
-						},
-						uri: joinPath(TEST_FOLDER, 'app/file2.js'),
-						ranges: [new Range(3, 3, 3, 6)]
-					},
-					{
-						preview: {
-							text: 'foobar',
-							matches: [new Range(0, 3, 0, 6)]
-						},
-						uri: joinPath(TEST_FOLDER, 'app2/file3.js'),
-						ranges: [new Range(3, 3, 3, 6)]
-					}
+					new TextSearchMatchNew(
+						joinPath(TEST_FOLDER, 'file1.js'),
+						[{
+							previewRange: new Range(0, 3, 0, 6),
+							sourceRange: new Range(3, 3, 3, 6),
+						}],
+						'foobar'
+					),
+					new TextSearchMatchNew(
+						joinPath(TEST_FOLDER, 'app/file2.js'),
+						[{
+							previewRange: new Range(0, 3, 0, 6),
+							sourceRange: new Range(3, 3, 3, 6),
+						}],
+						'foobar'
+					),
+					new TextSearchMatchNew(
+						joinPath(TEST_FOLDER, 'app2/file3.js'),
+						[{
+							previewRange: new Range(0, 3, 0, 6),
+							sourceRange: new Range(3, 3, 3, 6),
+						}],
+						'foobar'
+					)
 				]);
 		});
 
@@ -210,30 +212,30 @@ suite('RipgrepTextSearchEngine', () => {
 					dataStrs[2].substring(25)
 				],
 				[
-					{
-						preview: {
-							text: 'foo bar',
-							matches: [new Range(0, 3, 0, 7)]
-						},
-						uri: joinPath(TEST_FOLDER, 'file1.js'),
-						ranges: [new Range(3, 3, 3, 7)]
-					},
-					{
-						preview: {
-							text: 'foobar',
-							matches: [new Range(0, 3, 0, 6)]
-						},
-						uri: joinPath(TEST_FOLDER, 'app/file2.js'),
-						ranges: [new Range(3, 3, 3, 6)]
-					},
-					{
-						preview: {
-							text: 'foobar',
-							matches: [new Range(0, 3, 0, 6)]
-						},
-						uri: joinPath(TEST_FOLDER, 'app2/file3.js'),
-						ranges: [new Range(3, 3, 3, 6)]
-					}
+					new TextSearchMatchNew(
+						joinPath(TEST_FOLDER, 'file1.js'),
+						[{
+							previewRange: new Range(0, 3, 0, 7),
+							sourceRange: new Range(3, 3, 3, 7),
+						}],
+						'foo bar'
+					),
+					new TextSearchMatchNew(
+						joinPath(TEST_FOLDER, 'app/file2.js'),
+						[{
+							previewRange: new Range(0, 3, 0, 6),
+							sourceRange: new Range(3, 3, 3, 6),
+						}],
+						'foobar'
+					),
+					new TextSearchMatchNew(
+						joinPath(TEST_FOLDER, 'app2/file3.js'),
+						[{
+							previewRange: new Range(0, 3, 0, 6),
+							sourceRange: new Range(3, 3, 3, 6),
+						}],
+						'foobar'
+					)
 				]);
 		});
 
@@ -245,22 +247,26 @@ suite('RipgrepTextSearchEngine', () => {
 					makeRgMatch('file1.js', '', 5, []),
 				],
 				[
-					{
-						preview: {
-							text: 'foobar',
-							matches: [new Range(0, 0, 0, 1)]
-						},
-						uri: joinPath(TEST_FOLDER, 'file1.js'),
-						ranges: [new Range(3, 0, 3, 1)]
-					},
-					{
-						preview: {
-							text: '',
-							matches: [new Range(0, 0, 0, 0)]
-						},
-						uri: joinPath(TEST_FOLDER, 'file1.js'),
-						ranges: [new Range(4, 0, 4, 0)]
-					}
+					new TextSearchMatchNew(
+						joinPath(TEST_FOLDER, 'file1.js'),
+						[
+							{
+								previewRange: new Range(0, 0, 0, 1),
+								sourceRange: new Range(3, 0, 3, 1),
+							}
+						],
+						'foobar'
+					),
+					new TextSearchMatchNew(
+						joinPath(TEST_FOLDER, 'file1.js'),
+						[
+							{
+								previewRange: new Range(0, 0, 0, 0),
+								sourceRange: new Range(4, 0, 4, 0),
+							}
+						],
+						''
+					)
 				]);
 		});
 
@@ -270,14 +276,20 @@ suite('RipgrepTextSearchEngine', () => {
 					makeRgMatch('file1.js', 'foobarbazquux', 4, [{ start: 0, end: 4 }, { start: 6, end: 10 }]),
 				],
 				[
-					{
-						preview: {
-							text: 'foobarbazquux',
-							matches: [new Range(0, 0, 0, 4), new Range(0, 6, 0, 10)]
-						},
-						uri: joinPath(TEST_FOLDER, 'file1.js'),
-						ranges: [new Range(3, 0, 3, 4), new Range(3, 6, 3, 10)]
-					}
+					new TextSearchMatchNew(
+						joinPath(TEST_FOLDER, 'file1.js'),
+						[
+							{
+								previewRange: new Range(0, 0, 0, 4),
+								sourceRange: new Range(3, 0, 3, 4),
+							},
+							{
+								previewRange: new Range(0, 6, 0, 10),
+								sourceRange: new Range(3, 6, 3, 10),
+							}
+						],
+						'foobarbazquux'
+					)
 				]);
 		});
 
@@ -287,14 +299,20 @@ suite('RipgrepTextSearchEngine', () => {
 					makeRgMatch('file1.js', 'foo\nbar\nbaz\nquux', 4, [{ start: 0, end: 5 }, { start: 8, end: 13 }]),
 				],
 				[
-					{
-						preview: {
-							text: 'foo\nbar\nbaz\nquux',
-							matches: [new Range(0, 0, 1, 1), new Range(2, 0, 3, 1)]
-						},
-						uri: joinPath(TEST_FOLDER, 'file1.js'),
-						ranges: [new Range(3, 0, 4, 1), new Range(5, 0, 6, 1)]
-					}
+					new TextSearchMatchNew(
+						joinPath(TEST_FOLDER, 'file1.js'),
+						[
+							{
+								previewRange: new Range(0, 0, 1, 1),
+								sourceRange: new Range(3, 0, 4, 1),
+							},
+							{
+								previewRange: new Range(2, 0, 3, 1),
+								sourceRange: new Range(5, 0, 6, 1),
+							}
+						],
+						'foo\nbar\nbaz\nquux'
+					)
 				]);
 		});
 	});
@@ -303,19 +321,24 @@ suite('RipgrepTextSearchEngine', () => {
 		test('simple includes', () => {
 			// Only testing the args that come from includes.
 			function testGetRgArgs(includes: string[], expectedFromIncludes: string[]): void {
-				const query: TextSearchQuery = {
+				const query: TextSearchQueryNew = {
 					pattern: 'test'
 				};
 
-				const options: TextSearchOptions = {
-					includes: includes,
-					excludes: [],
+				const options: RipgrepTextSearchOptions = {
+					folderOptions: {
+						includes: includes,
+						excludes: [],
+						useIgnoreFiles: {
+							local: false,
+							global: false,
+							parent: false
+						},
+						followSymlinks: false,
+						folder: URI.file('/some/folder'),
+						encoding: 'utf8',
+					},
 					maxResults: 1000,
-					useIgnoreFiles: false,
-					followSymlinks: false,
-					useGlobalIgnoreFiles: false,
-					useParentIgnoreFiles: false,
-					folder: URI.file('/some/folder')
 				};
 				const expected = [
 					'--hidden',
diff --git a/src/vs/workbench/services/search/test/node/search.integrationTest.ts b/src/vs/workbench/services/search/test/node/search.integrationTest.ts
index ae3a4b4fe74..07610999a5b 100644
--- a/src/vs/workbench/services/search/test/node/search.integrationTest.ts
+++ b/src/vs/workbench/services/search/test/node/search.integrationTest.ts
@@ -4,14 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import * as path from 'vs/base/common/path';
-import * as platform from 'vs/base/common/platform';
-import { joinPath } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { IFolderQuery, QueryType, IRawFileMatch } from 'vs/workbench/services/search/common/search';
-import { Engine as FileSearchEngine, FileWalker } from 'vs/workbench/services/search/node/fileSearch';
-import { flakySuite } from 'vs/base/test/node/testUtils';
-import { FileAccess } from 'vs/base/common/network';
+import * as path from '../../../../../base/common/path.js';
+import * as platform from '../../../../../base/common/platform.js';
+import { joinPath } from '../../../../../base/common/resources.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { IFolderQuery, QueryType, IRawFileMatch } from '../../common/search.js';
+import { Engine as FileSearchEngine, FileWalker } from '../../node/fileSearch.js';
+import { flakySuite } from '../../../../../base/test/node/testUtils.js';
+import { FileAccess } from '../../../../../base/common/network.js';
 
 const TEST_FIXTURES = path.normalize(FileAccess.asFileUri('vs/workbench/services/search/test/node/fixtures').fsPath);
 const EXAMPLES_FIXTURES = URI.file(path.join(TEST_FIXTURES, 'examples'));
@@ -499,15 +499,17 @@ flakySuite('FileSearchEngine', () => {
 		const folderQueries: IFolderQuery[] = [
 			{
 				folder: EXAMPLES_FIXTURES,
-				excludePattern: {
-					'**/anotherfile.txt': true
-				}
+				excludePattern: [{
+					pattern: { '**/anotherfile.txt': true }
+				}]
 			},
 			{
 				folder: MORE_FIXTURES,
-				excludePattern: {
-					'**/file.txt': true
-				}
+				excludePattern: [{
+					pattern: {
+						'**/file.txt': true
+					}
+				}]
 			}
 		];
 
@@ -755,7 +757,9 @@ flakySuite('FileWalker', () => {
 		const folderQueries: IFolderQuery[] = [
 			{
 				folder: URI.file(TEST_FIXTURES),
-				excludePattern: { '**/subfolder': true }
+				excludePattern: [{
+					pattern: { '**/subfolder': true }
+				}]
 			}
 		];
 
diff --git a/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts b/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts
index 503b314ffbe..85ef0f3dbc7 100644
--- a/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts
+++ b/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts
@@ -4,14 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import * as path from 'vs/base/common/path';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import * as glob from 'vs/base/common/glob';
-import { URI } from 'vs/base/common/uri';
-import { deserializeSearchError, IFolderQuery, ISearchRange, ITextQuery, ITextSearchContext, ITextSearchMatch, QueryType, SearchErrorCode, ISerializedFileMatch } from 'vs/workbench/services/search/common/search';
-import { TextSearchEngineAdapter } from 'vs/workbench/services/search/node/textSearchAdapter';
-import { flakySuite } from 'vs/base/test/node/testUtils';
-import { FileAccess } from 'vs/base/common/network';
+import * as path from '../../../../../base/common/path.js';
+import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import * as glob from '../../../../../base/common/glob.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { deserializeSearchError, IFolderQuery, ISearchRange, ITextQuery, ITextSearchContext, ITextSearchMatch, QueryType, SearchErrorCode, ISerializedFileMatch } from '../../common/search.js';
+import { TextSearchEngineAdapter } from '../../node/textSearchAdapter.js';
+import { flakySuite } from '../../../../../base/test/node/testUtils.js';
+import { FileAccess } from '../../../../../base/common/network.js';
 
 const TEST_FIXTURES = path.normalize(FileAccess.asFileUri('vs/workbench/services/search/test/node/fixtures').fsPath);
 const EXAMPLES_FIXTURES = path.join(TEST_FIXTURES, 'examples');
@@ -291,7 +291,11 @@ flakySuite('TextSearch-integration', function () {
 		const config: ITextQuery = {
 			type: QueryType.Text,
 			folderQueries: [
-				{ folder: URI.file(EXAMPLES_FIXTURES), excludePattern: makeExpression('**/e*.js') },
+				{
+					folder: URI.file(EXAMPLES_FIXTURES), excludePattern: [{
+						pattern: makeExpression('**/e*.js')
+					}]
+				},
 				{ folder: URI.file(MORE_FIXTURES) }
 			],
 			contentPattern: { pattern: 'e' }
@@ -308,7 +312,7 @@ flakySuite('TextSearch-integration', function () {
 		};
 
 		return doSearchTest(config, 1).then(results => {
-			const matchRange = (<ITextSearchMatch>results[0].results![0]).ranges;
+			const matchRange = (<ITextSearchMatch>results[0].results![0]).rangeLocations.map(e => e.source);
 			assert.deepStrictEqual(matchRange, [{
 				startLineNumber: 0,
 				startColumn: 1,
@@ -329,7 +333,7 @@ flakySuite('TextSearch-integration', function () {
 			assert.strictEqual(results.length, 3);
 			assert.strictEqual(results[0].results!.length, 1);
 			const match = <ITextSearchMatch>results[0].results![0];
-			assert.strictEqual((<ISearchRange[]>match.ranges).length, 5);
+			assert.strictEqual((<ISearchRange[]>match.rangeLocations.map(e => e.source)).length, 5);
 		});
 	});
 
@@ -338,19 +342,16 @@ flakySuite('TextSearch-integration', function () {
 			type: QueryType.Text,
 			folderQueries: ROOT_FOLDER_QUERY,
 			contentPattern: { pattern: 'compiler.typeCheck();' },
-			beforeContext: 1,
-			afterContext: 2
+			surroundingContext: 1,
 		};
 
-		return doSearchTest(config, 4).then(results => {
-			assert.strictEqual(results.length, 4);
+		return doSearchTest(config, 3).then(results => {
+			assert.strictEqual(results.length, 3);
 			assert.strictEqual((<ITextSearchContext>results[0].results![0]).lineNumber, 24);
 			assert.strictEqual((<ITextSearchContext>results[0].results![0]).text, '        compiler.addUnit(prog,"input.ts");');
 			// assert.strictEqual((<ITextSearchMatch>results[1].results[0]).preview.text, '        compiler.typeCheck();\n'); // See https://github.com/BurntSushi/ripgrep/issues/1095
 			assert.strictEqual((<ITextSearchContext>results[2].results![0]).lineNumber, 26);
 			assert.strictEqual((<ITextSearchContext>results[2].results![0]).text, '        compiler.emit();');
-			assert.strictEqual((<ITextSearchContext>results[3].results![0]).lineNumber, 27);
-			assert.strictEqual((<ITextSearchContext>results[3].results![0]).text, '');
 		});
 	});
 
diff --git a/src/vs/workbench/services/search/test/node/textSearchManager.test.ts b/src/vs/workbench/services/search/test/node/textSearchManager.test.ts
index 1eb64535a8d..eda186aa3e4 100644
--- a/src/vs/workbench/services/search/test/node/textSearchManager.test.ts
+++ b/src/vs/workbench/services/search/test/node/textSearchManager.test.ts
@@ -4,20 +4,20 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { Progress } from 'vs/platform/progress/common/progress';
-import { ITextQuery, QueryType } from 'vs/workbench/services/search/common/search';
-import { ProviderResult, TextSearchComplete, TextSearchOptions, TextSearchProvider, TextSearchQuery, TextSearchResult } from 'vs/workbench/services/search/common/searchExtTypes';
-import { NativeTextSearchManager } from 'vs/workbench/services/search/node/textSearchManager';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Progress } from '../../../../../platform/progress/common/progress.js';
+import { ITextQuery, QueryType } from '../../common/search.js';
+import { ProviderResult, TextSearchCompleteNew, TextSearchProviderOptions, TextSearchProviderNew, TextSearchQueryNew, TextSearchResultNew } from '../../common/searchExtTypes.js';
+import { NativeTextSearchManager } from '../../node/textSearchManager.js';
 
 suite('NativeTextSearchManager', () => {
 	test('fixes encoding', async () => {
 		let correctEncoding = false;
-		const provider: TextSearchProvider = {
-			provideTextSearchResults(query: TextSearchQuery, options: TextSearchOptions, progress: Progress<TextSearchResult>, token: CancellationToken): ProviderResult<TextSearchComplete> {
-				correctEncoding = options.encoding === 'windows-1252';
+		const provider: TextSearchProviderNew = {
+			provideTextSearchResults(query: TextSearchQueryNew, options: TextSearchProviderOptions, progress: Progress<TextSearchResultNew>, token: CancellationToken): ProviderResult<TextSearchCompleteNew> {
+				correctEncoding = options.folderOptions[0].encoding === 'windows-1252';
 
 				return null;
 			}
diff --git a/src/vs/workbench/services/search/worker/localFileSearch.ts b/src/vs/workbench/services/search/worker/localFileSearch.ts
index a49661f0285..4622c34e8d0 100644
--- a/src/vs/workbench/services/search/worker/localFileSearch.ts
+++ b/src/vs/workbench/services/search/worker/localFileSearch.ts
@@ -3,18 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as glob from 'vs/base/common/glob';
-import { UriComponents, URI } from 'vs/base/common/uri';
-import { IRequestHandler } from 'vs/base/common/worker/simpleWorker';
-import { ILocalFileSearchSimpleWorker, ILocalFileSearchSimpleWorkerHost, IWorkerFileSearchComplete, IWorkerFileSystemDirectoryHandle, IWorkerFileSystemHandle, IWorkerTextSearchComplete } from 'vs/workbench/services/search/common/localFileSearchWorkerTypes';
-import { ICommonQueryProps, IFileMatch, IFileQueryProps, IFolderQuery, IPatternInfo, ITextQueryProps, } from 'vs/workbench/services/search/common/search';
-import * as paths from 'vs/base/common/path';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { getFileResults } from 'vs/workbench/services/search/common/getFileResults';
-import { IgnoreFile } from 'vs/workbench/services/search/common/ignoreFile';
-import { createRegExp } from 'vs/base/common/strings';
-import { Promises } from 'vs/base/common/async';
-import { ExtUri } from 'vs/base/common/resources';
+import * as glob from '../../../../base/common/glob.js';
+import { UriComponents, URI } from '../../../../base/common/uri.js';
+import { IRequestHandler, IWorkerServer } from '../../../../base/common/worker/simpleWorker.js';
+import { ILocalFileSearchSimpleWorker, LocalFileSearchSimpleWorkerHost, IWorkerFileSearchComplete, IWorkerFileSystemDirectoryHandle, IWorkerFileSystemHandle, IWorkerTextSearchComplete } from '../common/localFileSearchWorkerTypes.js';
+import { ICommonQueryProps, IFileMatch, IFileQueryProps, IFolderQuery, IPatternInfo, ITextQueryProps, } from '../common/search.js';
+import * as paths from '../../../../base/common/path.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { getFileResults } from '../common/getFileResults.js';
+import { IgnoreFile } from '../common/ignoreFile.js';
+import { createRegExp } from '../../../../base/common/strings.js';
+import { Promises } from '../../../../base/common/async.js';
+import { ExtUri } from '../../../../base/common/resources.js';
+import { revive } from '../../../../base/common/marshalling.js';
 
 const PERF = false;
 
@@ -48,21 +49,24 @@ const time = async <T>(name: string, task: () => Promise<T> | T) => {
 };
 
 /**
- * Called on the worker side
- * @internal
+ * Defines the worker entry point. Must be exported and named `create`.
+ * @skipMangle
  */
-export function create(host: ILocalFileSearchSimpleWorkerHost): IRequestHandler {
-	return new LocalFileSearchSimpleWorker(host);
+export function create(workerServer: IWorkerServer): IRequestHandler {
+	return new LocalFileSearchSimpleWorker(workerServer);
 }
 
 export class LocalFileSearchSimpleWorker implements ILocalFileSearchSimpleWorker, IRequestHandler {
 	_requestHandlerBrand: any;
 
+	private readonly host: LocalFileSearchSimpleWorkerHost;
 	cancellationTokens: Map<number, CancellationTokenSource> = new Map();
 
-	constructor(private host: ILocalFileSearchSimpleWorkerHost) { }
+	constructor(workerServer: IWorkerServer) {
+		this.host = LocalFileSearchSimpleWorkerHost.getChannel(workerServer);
+	}
 
-	cancelQuery(queryId: number): void {
+	$cancelQuery(queryId: number): void {
 		this.cancellationTokens.get(queryId)?.cancel();
 	}
 
@@ -72,7 +76,7 @@ export class LocalFileSearchSimpleWorker implements ILocalFileSearchSimpleWorker
 		return source;
 	}
 
-	async listDirectory(handle: IWorkerFileSystemDirectoryHandle, query: IFileQueryProps<UriComponents>, folderQuery: IFolderQuery<UriComponents>, ignorePathCasing: boolean, queryId: number): Promise<IWorkerFileSearchComplete> {
+	async $listDirectory(handle: IWorkerFileSystemDirectoryHandle, query: IFileQueryProps<UriComponents>, folderQuery: IFolderQuery<UriComponents>, ignorePathCasing: boolean, queryId: number): Promise<IWorkerFileSearchComplete> {
 		const revivedFolderQuery = reviveFolderQuery(folderQuery);
 		const extUri = new ExtUri(() => ignorePathCasing);
 
@@ -107,7 +111,7 @@ export class LocalFileSearchSimpleWorker implements ILocalFileSearchSimpleWorker
 		};
 	}
 
-	async searchDirectory(handle: IWorkerFileSystemDirectoryHandle, query: ITextQueryProps<UriComponents>, folderQuery: IFolderQuery<UriComponents>, ignorePathCasing: boolean, queryId: number): Promise<IWorkerTextSearchComplete> {
+	async $searchDirectory(handle: IWorkerFileSystemDirectoryHandle, query: ITextQueryProps<UriComponents>, folderQuery: IFolderQuery<UriComponents>, ignorePathCasing: boolean, queryId: number): Promise<IWorkerTextSearchComplete> {
 		const revivedQuery = reviveFolderQuery(folderQuery);
 		const extUri = new ExtUri(() => ignorePathCasing);
 
@@ -138,8 +142,7 @@ export class LocalFileSearchSimpleWorker implements ILocalFileSearchSimpleWorker
 
 				const bytes = new Uint8Array(contents);
 				const fileResults = getFileResults(bytes, pattern, {
-					afterContext: query.afterContext ?? 0,
-					beforeContext: query.beforeContext ?? 0,
+					surroundingContext: query.surroundingContext ?? 0,
 					previewOptions: query.previewOptions,
 					remainingResultQuota: query.maxResults ? (query.maxResults - resultCount) : 10000,
 				});
@@ -153,7 +156,7 @@ export class LocalFileSearchSimpleWorker implements ILocalFileSearchSimpleWorker
 						resource: URI.joinPath(revivedQuery.folder, file.path),
 						results: fileResults,
 					};
-					this.host.sendTextSearchMatch(match, queryId);
+					this.host.$sendTextSearchMatch(match, queryId);
 					results.push(match);
 				}
 			};
@@ -176,12 +179,18 @@ export class LocalFileSearchSimpleWorker implements ILocalFileSearchSimpleWorker
 
 	private async walkFolderQuery(handle: IWorkerFileSystemDirectoryHandle, queryProps: ICommonQueryProps<URI>, folderQuery: IFolderQuery<URI>, extUri: ExtUri, onFile: (file: FileNode) => any, token: CancellationToken): Promise<void> {
 
-		const folderExcludes = glob.parse(folderQuery.excludePattern ?? {}, { trimForExclusions: true }) as glob.ParsedExpression;
+		const folderExcludes = folderQuery.excludePattern?.map(excludePattern => glob.parse(excludePattern.pattern ?? {}, { trimForExclusions: true }) as glob.ParsedExpression);
 
+		const evalFolderExcludes = (path: string, basename: string, hasSibling: (query: string) => boolean) => {
+			return folderExcludes?.some(folderExclude => {
+				return folderExclude(path, basename, hasSibling);
+			});
+
+		};
 		// For folders, only check if the folder is explicitly excluded so walking continues.
 		const isFolderExcluded = (path: string, basename: string, hasSibling: (query: string) => boolean) => {
 			path = path.slice(1);
-			if (folderExcludes(path, basename, hasSibling)) { return true; }
+			if (evalFolderExcludes(path, basename, hasSibling)) { return true; }
 			if (pathExcludedInQuery(queryProps, path)) { return true; }
 			return false;
 		};
@@ -189,7 +198,7 @@ export class LocalFileSearchSimpleWorker implements ILocalFileSearchSimpleWorker
 		// For files ensure the full check takes place.
 		const isFileIncluded = (path: string, basename: string, hasSibling: (query: string) => boolean) => {
 			path = path.slice(1);
-			if (folderExcludes(path, basename, hasSibling)) { return false; }
+			if (evalFolderExcludes(path, basename, hasSibling)) { return false; }
 			if (!pathIncludedInQuery(queryProps, path, extUri)) { return false; }
 			return true;
 		};
@@ -303,10 +312,12 @@ function createSearchRegExp(options: IPatternInfo): RegExp {
 }
 
 function reviveFolderQuery(folderQuery: IFolderQuery<UriComponents>): IFolderQuery<URI> {
-	return {
-		...folderQuery,
+	// @todo: andrea - try to see why we can't just call 'revive' here
+	return revive({
+		...revive(folderQuery),
+		excludePattern: folderQuery.excludePattern?.map(ep => ({ folder: URI.revive(ep.folder), pattern: ep.pattern })),
 		folder: URI.revive(folderQuery.folder),
-	};
+	});
 }
 
 function reviveQueryProps(queryProps: ICommonQueryProps<UriComponents>): ICommonQueryProps<URI> {
diff --git a/src/vs/workbench/services/search/worker/localFileSearchMain.ts b/src/vs/workbench/services/search/worker/localFileSearchMain.ts
new file mode 100644
index 00000000000..d293604643e
--- /dev/null
+++ b/src/vs/workbench/services/search/worker/localFileSearchMain.ts
@@ -0,0 +1,9 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { bootstrapSimpleWorker } from '../../../../base/common/worker/simpleWorkerBootstrap.js';
+import { create } from './localFileSearch.js';
+
+bootstrapSimpleWorker(create);
diff --git a/src/vs/workbench/services/secrets/browser/secretStorageService.ts b/src/vs/workbench/services/secrets/browser/secretStorageService.ts
index d07b21a5380..1652cb9928f 100644
--- a/src/vs/workbench/services/secrets/browser/secretStorageService.ts
+++ b/src/vs/workbench/services/secrets/browser/secretStorageService.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SequencerByKey } from 'vs/base/common/async';
-import { IEncryptionService } from 'vs/platform/encryption/common/encryptionService';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ISecretStorageProvider, ISecretStorageService, BaseSecretStorageService } from 'vs/platform/secrets/common/secrets';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
+import { SequencerByKey } from '../../../../base/common/async.js';
+import { IEncryptionService } from '../../../../platform/encryption/common/encryptionService.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { ISecretStorageProvider, ISecretStorageService, BaseSecretStorageService } from '../../../../platform/secrets/common/secrets.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { IBrowserWorkbenchEnvironmentService } from '../../environment/browser/environmentService.js';
 
 export class BrowserSecretStorageService extends BaseSecretStorageService {
 
diff --git a/src/vs/workbench/services/secrets/electron-sandbox/secretStorageService.ts b/src/vs/workbench/services/secrets/electron-sandbox/secretStorageService.ts
index b9bb5be6608..228328d59bb 100644
--- a/src/vs/workbench/services/secrets/electron-sandbox/secretStorageService.ts
+++ b/src/vs/workbench/services/secrets/electron-sandbox/secretStorageService.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createSingleCallFunction } from 'vs/base/common/functional';
-import { isLinux } from 'vs/base/common/platform';
-import Severity from 'vs/base/common/severity';
-import { localize } from 'vs/nls';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IEncryptionService, KnownStorageProvider, PasswordStoreCLIOption, isGnome, isKwallet } from 'vs/platform/encryption/common/encryptionService';
-import { INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ILogService } from 'vs/platform/log/common/log';
-import { INotificationService, IPromptChoice } from 'vs/platform/notification/common/notification';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { BaseSecretStorageService, ISecretStorageService } from 'vs/platform/secrets/common/secrets';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { IJSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditing';
+import { createSingleCallFunction } from '../../../../base/common/functional.js';
+import { isLinux } from '../../../../base/common/platform.js';
+import Severity from '../../../../base/common/severity.js';
+import { localize } from '../../../../nls.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IEncryptionService, KnownStorageProvider, PasswordStoreCLIOption, isGnome, isKwallet } from '../../../../platform/encryption/common/encryptionService.js';
+import { INativeEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { INotificationService, IPromptChoice } from '../../../../platform/notification/common/notification.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { BaseSecretStorageService, ISecretStorageService } from '../../../../platform/secrets/common/secrets.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { IJSONEditingService } from '../../configuration/common/jsonEditing.js';
 
 export class NativeSecretStorageService extends BaseSecretStorageService {
 
diff --git a/src/vs/workbench/services/sharedProcess/electron-sandbox/sharedProcessService.ts b/src/vs/workbench/services/sharedProcess/electron-sandbox/sharedProcessService.ts
index fffa5df2feb..8110886c226 100644
--- a/src/vs/workbench/services/sharedProcess/electron-sandbox/sharedProcessService.ts
+++ b/src/vs/workbench/services/sharedProcess/electron-sandbox/sharedProcessService.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Client as MessagePortClient } from 'vs/base/parts/ipc/common/ipc.mp';
-import { IChannel, IServerChannel, getDelayedChannel } from 'vs/base/parts/ipc/common/ipc';
-import { ILogService } from 'vs/platform/log/common/log';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ISharedProcessService } from 'vs/platform/ipc/electron-sandbox/services';
-import { SharedProcessChannelConnection, SharedProcessRawConnection } from 'vs/platform/sharedProcess/common/sharedProcess';
-import { mark } from 'vs/base/common/performance';
-import { Barrier, timeout } from 'vs/base/common/async';
-import { acquirePort } from 'vs/base/parts/ipc/electron-sandbox/ipc.mp';
+import { Client as MessagePortClient } from '../../../../base/parts/ipc/common/ipc.mp.js';
+import { IChannel, IServerChannel, getDelayedChannel } from '../../../../base/parts/ipc/common/ipc.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ISharedProcessService } from '../../../../platform/ipc/electron-sandbox/services.js';
+import { SharedProcessChannelConnection, SharedProcessRawConnection } from '../../../../platform/sharedProcess/common/sharedProcess.js';
+import { mark } from '../../../../base/common/performance.js';
+import { Barrier, timeout } from '../../../../base/common/async.js';
+import { acquirePort } from '../../../../base/parts/ipc/electron-sandbox/ipc.mp.js';
 
 export class SharedProcessService extends Disposable implements ISharedProcessService {
 
diff --git a/src/vs/workbench/services/statusbar/browser/statusbar.ts b/src/vs/workbench/services/statusbar/browser/statusbar.ts
index 73fac7bb924..3b3f1f1fe17 100644
--- a/src/vs/workbench/services/statusbar/browser/statusbar.ts
+++ b/src/vs/workbench/services/statusbar/browser/statusbar.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { ThemeColor } from 'vs/base/common/themables';
-import { Command } from 'vs/editor/common/languages';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { ColorIdentifier } from 'vs/platform/theme/common/colorRegistry';
-import { IAuxiliaryStatusbarPart, IStatusbarEntryContainer } from 'vs/workbench/browser/parts/statusbar/statusbarPart';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import { ThemeColor } from '../../../../base/common/themables.js';
+import { Command } from '../../../../editor/common/languages.js';
+import { IMarkdownString } from '../../../../base/common/htmlContent.js';
+import { ColorIdentifier } from '../../../../platform/theme/common/colorRegistry.js';
+import { IAuxiliaryStatusbarPart, IStatusbarEntryContainer } from '../../../browser/parts/statusbar/statusbarPart.js';
 
 export const IStatusbarService = createDecorator<IStatusbarService>('statusbarService');
 
diff --git a/src/vs/workbench/services/storage/browser/storageService.ts b/src/vs/workbench/services/storage/browser/storageService.ts
index a77c2db9446..68573404c1e 100644
--- a/src/vs/workbench/services/storage/browser/storageService.ts
+++ b/src/vs/workbench/services/storage/browser/storageService.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BroadcastDataChannel } from 'vs/base/browser/broadcast';
-import { isSafari } from 'vs/base/browser/browser';
-import { getActiveWindow } from 'vs/base/browser/dom';
-import { IndexedDB } from 'vs/base/browser/indexedDB';
-import { DeferredPromise, Promises } from 'vs/base/common/async';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { assertIsDefined } from 'vs/base/common/types';
-import { InMemoryStorageDatabase, isStorageItemsChangeEvent, IStorage, IStorageDatabase, IStorageItemsChangeEvent, IUpdateRequest, Storage } from 'vs/base/parts/storage/common/storage';
-import { ILogService } from 'vs/platform/log/common/log';
-import { AbstractStorageService, isProfileUsingDefaultStorage, IS_NEW_KEY, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { isUserDataProfile, IUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IAnyWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
+import { BroadcastDataChannel } from '../../../../base/browser/broadcast.js';
+import { isSafari } from '../../../../base/browser/browser.js';
+import { getActiveWindow } from '../../../../base/browser/dom.js';
+import { IndexedDB } from '../../../../base/browser/indexedDB.js';
+import { DeferredPromise, Promises } from '../../../../base/common/async.js';
+import { toErrorMessage } from '../../../../base/common/errorMessage.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import { assertIsDefined } from '../../../../base/common/types.js';
+import { InMemoryStorageDatabase, isStorageItemsChangeEvent, IStorage, IStorageDatabase, IStorageItemsChangeEvent, IUpdateRequest, Storage } from '../../../../base/parts/storage/common/storage.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { AbstractStorageService, isProfileUsingDefaultStorage, IS_NEW_KEY, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { isUserDataProfile, IUserDataProfile } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { IAnyWorkspaceIdentifier } from '../../../../platform/workspace/common/workspace.js';
+import { IUserDataProfileService } from '../../userDataProfile/common/userDataProfile.js';
 
 export class BrowserStorageService extends AbstractStorageService {
 
diff --git a/src/vs/workbench/services/storage/electron-sandbox/storageService.ts b/src/vs/workbench/services/storage/electron-sandbox/storageService.ts
index 77af8dbe8d1..f45b3ecdad5 100644
--- a/src/vs/workbench/services/storage/electron-sandbox/storageService.ts
+++ b/src/vs/workbench/services/storage/electron-sandbox/storageService.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IMainProcessService } from 'vs/platform/ipc/common/mainProcessService';
-import { RemoteStorageService } from 'vs/platform/storage/common/storageService';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IAnyWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { IMainProcessService } from '../../../../platform/ipc/common/mainProcessService.js';
+import { RemoteStorageService } from '../../../../platform/storage/common/storageService.js';
+import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { IAnyWorkspaceIdentifier } from '../../../../platform/workspace/common/workspace.js';
+import { IUserDataProfileService } from '../../userDataProfile/common/userDataProfile.js';
 
 export class NativeWorkbenchStorageService extends RemoteStorageService {
 
diff --git a/src/vs/workbench/services/storage/test/browser/storageService.test.ts b/src/vs/workbench/services/storage/test/browser/storageService.test.ts
index 953f54c86d8..f9fae493168 100644
--- a/src/vs/workbench/services/storage/test/browser/storageService.test.ts
+++ b/src/vs/workbench/services/storage/test/browser/storageService.test.ts
@@ -4,22 +4,22 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { strictEqual } from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { joinPath } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { IStorageChangeEvent, Storage } from 'vs/base/parts/storage/common/storage';
-import { flakySuite } from 'vs/base/test/common/testUtils';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { createSuite } from 'vs/platform/storage/test/common/storageService.test';
-import { IUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { BrowserStorageService, IndexedDBStorageDatabase } from 'vs/workbench/services/storage/browser/storageService';
-import { UserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfileService';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { joinPath } from '../../../../../base/common/resources.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { IStorageChangeEvent, Storage } from '../../../../../base/parts/storage/common/storage.js';
+import { flakySuite } from '../../../../../base/test/common/testUtils.js';
+import { runWithFakedTimers } from '../../../../../base/test/common/timeTravelScheduler.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { FileService } from '../../../../../platform/files/common/fileService.js';
+import { InMemoryFileSystemProvider } from '../../../../../platform/files/common/inMemoryFilesystemProvider.js';
+import { NullLogService } from '../../../../../platform/log/common/log.js';
+import { StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { createSuite } from '../../../../../platform/storage/test/common/storageService.test.js';
+import { IUserDataProfile } from '../../../../../platform/userDataProfile/common/userDataProfile.js';
+import { BrowserStorageService, IndexedDBStorageDatabase } from '../../browser/storageService.js';
+import { UserDataProfileService } from '../../../userDataProfile/common/userDataProfileService.js';
 
 async function createStorageService(): Promise<[DisposableStore, BrowserStorageService]> {
 	const disposables = new DisposableStore();
diff --git a/src/vs/workbench/services/suggest/browser/media/suggest.css b/src/vs/workbench/services/suggest/browser/media/suggest.css
index cf39f56b816..b540839efa3 100644
--- a/src/vs/workbench/services/suggest/browser/media/suggest.css
+++ b/src/vs/workbench/services/suggest/browser/media/suggest.css
@@ -8,9 +8,8 @@
  * layer breakers and shipping with the standalone monaco editor.
  */
 
-/* TODO: Position correctly */
 .workbench-suggest-widget {
-	position: absolute;
+	position: fixed;
 	left: 0;
 	top: 0;
 }
diff --git a/src/vs/workbench/services/suggest/browser/simpleCompletionItem.ts b/src/vs/workbench/services/suggest/browser/simpleCompletionItem.ts
index 3aa43e4c727..7f5bf4df73b 100644
--- a/src/vs/workbench/services/suggest/browser/simpleCompletionItem.ts
+++ b/src/vs/workbench/services/suggest/browser/simpleCompletionItem.ts
@@ -3,8 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { FuzzyScore } from 'vs/base/common/filters';
-import { ThemeIcon } from 'vs/base/common/themables';
+import { FuzzyScore } from '../../../../base/common/filters.js';
+import { isWindows } from '../../../../base/common/platform.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
 
 export interface ISimpleCompletion {
 	/**
@@ -20,14 +21,25 @@ export interface ISimpleCompletion {
 	 */
 	detail?: string;
 	/**
-	 * The completion's completion text which is used to actually insert the completion.
+	 * Whether the completion is a file. Files with the same score will be sorted against each other
+	 * first by extension length and then certain extensions will get a boost based on the OS.
 	 */
-	completionText?: string;
+	isFile?: boolean;
+	/**
+	 * Whether the completion is a directory.
+	 */
+	isDirectory?: boolean;
+	/**
+	 * Whether the completion is a keyword.
+	 */
+	isKeyword?: boolean;
 }
 
 export class SimpleCompletionItem {
 	// perf
 	readonly labelLow: string;
+	readonly labelLowExcludeFileExt: string;
+	readonly fileExtLow: string = '';
 
 	// sorting, filtering
 	score: FuzzyScore = FuzzyScore.Default;
@@ -39,5 +51,16 @@ export class SimpleCompletionItem {
 	) {
 		// ensure lower-variants (perf)
 		this.labelLow = this.completion.label.toLowerCase();
+		this.labelLowExcludeFileExt = this.labelLow;
+		if (completion.isFile) {
+			if (isWindows) {
+				this.labelLow = this.labelLow.replaceAll('/', '\\');
+			}
+			const extIndex = this.labelLow.lastIndexOf('.');
+			if (extIndex !== -1) {
+				this.labelLowExcludeFileExt = this.labelLow.substring(0, extIndex);
+				this.fileExtLow = this.labelLow.substring(extIndex + 1);
+			}
+		}
 	}
 }
diff --git a/src/vs/workbench/services/suggest/browser/simpleCompletionModel.ts b/src/vs/workbench/services/suggest/browser/simpleCompletionModel.ts
index 1418e462f00..0f80009bd22 100644
--- a/src/vs/workbench/services/suggest/browser/simpleCompletionModel.ts
+++ b/src/vs/workbench/services/suggest/browser/simpleCompletionModel.ts
@@ -3,10 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SimpleCompletionItem } from 'vs/workbench/services/suggest/browser/simpleCompletionItem';
-import { quickSelect } from 'vs/base/common/arrays';
-import { CharCode } from 'vs/base/common/charCode';
-import { FuzzyScore, fuzzyScore, fuzzyScoreGracefulAggressive, FuzzyScoreOptions, FuzzyScorer } from 'vs/base/common/filters';
+import { SimpleCompletionItem } from './simpleCompletionItem.js';
+import { quickSelect } from '../../../../base/common/arrays.js';
+import { CharCode } from '../../../../base/common/charCode.js';
+import { FuzzyScore, fuzzyScore, fuzzyScoreGracefulAggressive, FuzzyScoreOptions, FuzzyScorer } from '../../../../base/common/filters.js';
+import { isWindows } from '../../../../base/common/platform.js';
 
 export interface ISimpleCompletionStats {
 	pLabelLen: number;
@@ -180,7 +181,38 @@ export class SimpleCompletionModel {
 			labelLengths.push(item.completion.label.length);
 		}
 
-		this._filteredItems = target.sort((a, b) => b.score[0] - a.score[0]);
+		this._filteredItems = target.sort((a, b) => {
+			// Keywords should always appear at the bottom when they are not an exact match
+			let score = 0;
+			if (a.completion.isKeyword && a.labelLow !== wordLow || b.completion.isKeyword && b.labelLow !== wordLow) {
+				score = (a.completion.isKeyword ? 1 : 0) - (b.completion.isKeyword ? 1 : 0);
+				if (score !== 0) {
+					return score;
+				}
+			}
+			// Sort by the score
+			score = b.score[0] - a.score[0];
+			if (score !== 0) {
+				return score;
+			}
+			// Sort files with the same score against each other specially
+			const isArg = leadingLineContent.includes(' ');
+			if (!isArg && a.fileExtLow.length > 0 && b.fileExtLow.length > 0) {
+				// Then by label length ascending (excluding file extension if it's a file)
+				score = a.labelLowExcludeFileExt.length - b.labelLowExcludeFileExt.length;
+				if (score !== 0) {
+					return score;
+				}
+				// If they're files at the start of the command line, boost extensions depending on the operating system
+				score = fileExtScore(b.fileExtLow) - fileExtScore(a.fileExtLow);
+				if (score !== 0) {
+					return score;
+				}
+				// Then by file extension length ascending
+				score = a.fileExtLow.length - b.fileExtLow.length;
+			}
+			return score;
+		});
 		this._refilterKind = Refilter.Nothing;
 
 		this._stats = {
@@ -190,3 +222,45 @@ export class SimpleCompletionModel {
 		};
 	}
 }
+
+// TODO: This should be based on the process OS, not the local OS
+// File score boosts for specific file extensions on Windows. This only applies when the file is the
+// _first_ part of the command line.
+const fileExtScores = new Map<string, number>(isWindows ? [
+	// Windows - .ps1 > .exe > .bat > .cmd. This is the command precedence when running the files
+	//           without an extension, tested manually in pwsh v7.4.4
+	['ps1', 0.09],
+	['exe', 0.08],
+	['bat', 0.07],
+	['cmd', 0.07],
+	// Non-Windows
+	['sh', -0.05],
+	['bash', -0.05],
+	['zsh', -0.05],
+	['fish', -0.05],
+	['csh', -0.06], // C shell
+	['ksh', -0.06], // Korn shell
+	// Scripting language files are excluded here as the standard behavior on Windows will just open
+	// the file in a text editor, not run the file
+] : [
+	// Pwsh
+	['ps1', 0.05],
+	// Windows
+	['bat', -0.05],
+	['cmd', -0.05],
+	['exe', -0.05],
+	// Non-Windows
+	['sh', 0.05],
+	['bash', 0.05],
+	['zsh', 0.05],
+	['fish', 0.05],
+	['csh', 0.04], // C shell
+	['ksh', 0.04], // Korn shell
+	// Scripting languages
+	['py', 0.05], // Python
+	['pl', 0.05], // Perl
+]);
+
+function fileExtScore(ext: string): number {
+	return fileExtScores.get(ext) || 0;
+}
diff --git a/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts b/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
index e0dcd7d02e4..dcdbe64dc83 100644
--- a/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
+++ b/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/suggest';
-import * as dom from 'vs/base/browser/dom';
-import { IListEvent, IListGestureEvent, IListMouseEvent } from 'vs/base/browser/ui/list/list';
-import { List } from 'vs/base/browser/ui/list/listWidget';
-import { ResizableHTMLElement } from 'vs/base/browser/ui/resizable/resizable';
-import { SimpleCompletionItem } from 'vs/workbench/services/suggest/browser/simpleCompletionItem';
-import { LineContext, SimpleCompletionModel } from 'vs/workbench/services/suggest/browser/simpleCompletionModel';
-import { SimpleSuggestWidgetItemRenderer } from 'vs/workbench/services/suggest/browser/simpleSuggestWidgetRenderer';
-import { TimeoutTimer } from 'vs/base/common/async';
-import { Emitter, Event } from 'vs/base/common/event';
-import { MutableDisposable, Disposable } from 'vs/base/common/lifecycle';
-import { clamp } from 'vs/base/common/numbers';
-import { localize } from 'vs/nls';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { SuggestWidgetStatus } from 'vs/editor/contrib/suggest/browser/suggestWidgetStatus';
-import { MenuId } from 'vs/platform/actions/common/actions';
+import './media/suggest.css';
+import * as dom from '../../../../base/browser/dom.js';
+import { IListEvent, IListGestureEvent, IListMouseEvent } from '../../../../base/browser/ui/list/list.js';
+import { List } from '../../../../base/browser/ui/list/listWidget.js';
+import { ResizableHTMLElement } from '../../../../base/browser/ui/resizable/resizable.js';
+import { SimpleCompletionItem } from './simpleCompletionItem.js';
+import { LineContext, SimpleCompletionModel } from './simpleCompletionModel.js';
+import { SimpleSuggestWidgetItemRenderer, type ISimpleSuggestWidgetFontInfo } from './simpleSuggestWidgetRenderer.js';
+import { TimeoutTimer } from '../../../../base/common/async.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { MutableDisposable, Disposable } from '../../../../base/common/lifecycle.js';
+import { clamp } from '../../../../base/common/numbers.js';
+import { localize } from '../../../../nls.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { SuggestWidgetStatus } from '../../../../editor/contrib/suggest/browser/suggestWidgetStatus.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
 
 const $ = dom.$;
 
@@ -84,6 +84,7 @@ export class SimpleSuggestWidget extends Disposable {
 	constructor(
 		private readonly _container: HTMLElement,
 		private readonly _persistedSize: IPersistedWidgetSizeDelegate,
+		private readonly _getFontInfo: () => ISimpleSuggestWidgetFontInfo,
 		options: IWorkbenchSuggestWidgetOptions,
 		@IInstantiationService instantiationService: IInstantiationService
 	) {
@@ -140,7 +141,7 @@ export class SimpleSuggestWidget extends Disposable {
 			state = undefined;
 		}));
 
-		const renderer = new SimpleSuggestWidgetItemRenderer();
+		const renderer = new SimpleSuggestWidgetItemRenderer(_getFontInfo);
 		this._register(renderer);
 		this._listElement = dom.append(this.element.domNode, $('.tree'));
 		this._list = this._register(new List('SuggestWidget', this._listElement, {
@@ -503,11 +504,8 @@ export class SimpleSuggestWidget extends Disposable {
 	}
 
 	private _getLayoutInfo() {
-		const fontInfo = {
-			lineHeight: 20,
-			typicalHalfwidthCharacterWidth: 10
-		}; //this.editor.getOption(EditorOption.fontInfo);
-		const itemHeight = clamp(fontInfo.lineHeight, 8, 1000);
+		const fontInfo = this._getFontInfo();
+		const itemHeight = clamp(Math.ceil(fontInfo.lineHeight), 8, 1000);
 		const statusBarHeight = 0; //!this.editor.getOption(EditorOption.suggest).showStatusBar || this._state === State.Empty || this._state === State.Loading ? 0 : itemHeight;
 		const borderWidth = 1; //this._details.widget.borderWidth;
 		const borderHeight = 2 * borderWidth;
@@ -517,7 +515,7 @@ export class SimpleSuggestWidget extends Disposable {
 			statusBarHeight,
 			borderWidth,
 			borderHeight,
-			typicalHalfwidthCharacterWidth: fontInfo.typicalHalfwidthCharacterWidth,
+			typicalHalfwidthCharacterWidth: 10,
 			verticalPadding: 22,
 			horizontalPadding: 14,
 			defaultSize: new dom.Dimension(430, statusBarHeight + 12 * itemHeight + borderHeight)
diff --git a/src/vs/workbench/services/suggest/browser/simpleSuggestWidgetRenderer.ts b/src/vs/workbench/services/suggest/browser/simpleSuggestWidgetRenderer.ts
index 856ac5b050b..86e0f510b0f 100644
--- a/src/vs/workbench/services/suggest/browser/simpleSuggestWidgetRenderer.ts
+++ b/src/vs/workbench/services/suggest/browser/simpleSuggestWidgetRenderer.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { $, append, show } from 'vs/base/browser/dom';
-import { IconLabel, IIconLabelValueOptions } from 'vs/base/browser/ui/iconLabel/iconLabel';
-import { IListRenderer } from 'vs/base/browser/ui/list/list';
-import { SimpleCompletionItem } from 'vs/workbench/services/suggest/browser/simpleCompletionItem';
-import { Codicon } from 'vs/base/common/codicons';
-import { Emitter, Event } from 'vs/base/common/event';
-import { createMatches } from 'vs/base/common/filters';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ThemeIcon } from 'vs/base/common/themables';
+import { $, append, show } from '../../../../base/browser/dom.js';
+import { IconLabel, IIconLabelValueOptions } from '../../../../base/browser/ui/iconLabel/iconLabel.js';
+import { IListRenderer } from '../../../../base/browser/ui/list/list.js';
+import { SimpleCompletionItem } from './simpleCompletionItem.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { createMatches } from '../../../../base/common/filters.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
 
 export function getAriaId(index: number): string {
 	return `simple-suggest-aria-id:${index}`;
@@ -42,6 +42,14 @@ export interface ISimpleSuggestionTemplateData {
 	readonly disposables: DisposableStore;
 }
 
+export interface ISimpleSuggestWidgetFontInfo {
+	fontFamily: string;
+	fontSize: number;
+	lineHeight: number;
+	fontWeight: string;
+	letterSpacing: number;
+}
+
 export class SimpleSuggestWidgetItemRenderer implements IListRenderer<SimpleCompletionItem, ISimpleSuggestionTemplateData> {
 
 	private readonly _onDidToggleDetails = new Emitter<void>();
@@ -49,6 +57,9 @@ export class SimpleSuggestWidgetItemRenderer implements IListRenderer<SimpleComp
 
 	readonly templateId = 'suggestion';
 
+	constructor(private readonly _getFontInfo: () => ISimpleSuggestWidgetFontInfo) {
+	}
+
 	dispose(): void {
 		this._onDidToggleDetails.dispose();
 	}
@@ -80,15 +91,8 @@ export class SimpleSuggestWidgetItemRenderer implements IListRenderer<SimpleComp
 		// readMore.title = nls.localize('readMore', "Read More");
 
 		const configureFont = () => {
-			// TODO: Implement
-			// const options = this._editor.getOptions();
-			// const fontInfo = options.get(EditorOption.fontInfo);
-			const fontFamily = 'Hack'; //fontInfo.getMassagedFontFamily();
-			const fontFeatureSettings = ''; //fontInfo.fontFeatureSettings;
-			const fontSize = '12'; // = options.get(EditorOption.suggestFontSize) || fontInfo.fontSize;
-			const lineHeight = '20'; // options.get(EditorOption.suggestLineHeight) || fontInfo.lineHeight;
-			const fontWeight = 'normal'; //fontInfo.fontWeight;
-			const letterSpacing = '0'; // fontInfo.letterSpacing;
+			const fontFeatureSettings = '';
+			const { fontFamily, fontSize, lineHeight, fontWeight, letterSpacing } = this._getFontInfo();
 			const fontSizePx = `${fontSize}px`;
 			const lineHeightPx = `${lineHeight}px`;
 			const letterSpacingPx = `${letterSpacing}px`;
diff --git a/src/vs/workbench/services/telemetry/browser/telemetryService.ts b/src/vs/workbench/services/telemetry/browser/telemetryService.ts
index 29418eaed3a..3a376088f8c 100644
--- a/src/vs/workbench/services/telemetry/browser/telemetryService.ts
+++ b/src/vs/workbench/services/telemetry/browser/telemetryService.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ILogService, ILoggerService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { OneDataSystemWebAppender } from 'vs/platform/telemetry/browser/1dsAppender';
-import { ClassifiedEvent, IGDPRProperty, OmitMetadata, StrictPropertyCheck } from 'vs/platform/telemetry/common/gdprTypings';
-import { ITelemetryData, ITelemetryService, TelemetryLevel, TELEMETRY_SETTING_ID } from 'vs/platform/telemetry/common/telemetry';
-import { TelemetryLogAppender } from 'vs/platform/telemetry/common/telemetryLogAppender';
-import { ITelemetryServiceConfig, TelemetryService as BaseTelemetryService } from 'vs/platform/telemetry/common/telemetryService';
-import { getTelemetryLevel, isInternalTelemetry, isLoggingOnly, ITelemetryAppender, NullTelemetryService, supportsTelemetry } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { resolveWorkbenchCommonProperties } from 'vs/workbench/services/telemetry/browser/workbenchCommonProperties';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ILogService, ILoggerService } from '../../../../platform/log/common/log.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { OneDataSystemWebAppender } from '../../../../platform/telemetry/browser/1dsAppender.js';
+import { ClassifiedEvent, IGDPRProperty, OmitMetadata, StrictPropertyCheck } from '../../../../platform/telemetry/common/gdprTypings.js';
+import { ITelemetryData, ITelemetryService, TelemetryLevel, TELEMETRY_SETTING_ID } from '../../../../platform/telemetry/common/telemetry.js';
+import { TelemetryLogAppender } from '../../../../platform/telemetry/common/telemetryLogAppender.js';
+import { ITelemetryServiceConfig, TelemetryService as BaseTelemetryService } from '../../../../platform/telemetry/common/telemetryService.js';
+import { getTelemetryLevel, isInternalTelemetry, isLoggingOnly, ITelemetryAppender, NullTelemetryService, supportsTelemetry } from '../../../../platform/telemetry/common/telemetryUtils.js';
+import { IBrowserWorkbenchEnvironmentService } from '../../environment/browser/environmentService.js';
+import { IRemoteAgentService } from '../../remote/common/remoteAgentService.js';
+import { resolveWorkbenchCommonProperties } from './workbenchCommonProperties.js';
 
 export class TelemetryService extends Disposable implements ITelemetryService {
 
diff --git a/src/vs/workbench/services/telemetry/browser/workbenchCommonProperties.ts b/src/vs/workbench/services/telemetry/browser/workbenchCommonProperties.ts
index 433dadac1a1..5199be0dc2f 100644
--- a/src/vs/workbench/services/telemetry/browser/workbenchCommonProperties.ts
+++ b/src/vs/workbench/services/telemetry/browser/workbenchCommonProperties.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import * as Platform from 'vs/base/common/platform';
-import * as uuid from 'vs/base/common/uuid';
-import { cleanRemoteAuthority } from 'vs/platform/telemetry/common/telemetryUtils';
-import { mixin } from 'vs/base/common/objects';
-import { ICommonProperties, firstSessionDateStorageKey, lastSessionDateStorageKey, machineIdKey } from 'vs/platform/telemetry/common/telemetry';
-import { Gesture } from 'vs/base/browser/touch';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import * as Platform from '../../../../base/common/platform.js';
+import * as uuid from '../../../../base/common/uuid.js';
+import { cleanRemoteAuthority } from '../../../../platform/telemetry/common/telemetryUtils.js';
+import { mixin } from '../../../../base/common/objects.js';
+import { ICommonProperties, firstSessionDateStorageKey, lastSessionDateStorageKey, machineIdKey } from '../../../../platform/telemetry/common/telemetry.js';
+import { Gesture } from '../../../../base/browser/touch.js';
 
 /**
  * General function to help reduce the individuality of user agents
diff --git a/src/vs/workbench/services/telemetry/common/workbenchCommonProperties.ts b/src/vs/workbench/services/telemetry/common/workbenchCommonProperties.ts
index 6d8ec5b211f..5a42e8dfa82 100644
--- a/src/vs/workbench/services/telemetry/common/workbenchCommonProperties.ts
+++ b/src/vs/workbench/services/telemetry/common/workbenchCommonProperties.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
-import { resolveCommonProperties } from 'vs/platform/telemetry/common/commonProperties';
-import { ICommonProperties, firstSessionDateStorageKey, lastSessionDateStorageKey } from 'vs/platform/telemetry/common/telemetry';
-import { cleanRemoteAuthority } from 'vs/platform/telemetry/common/telemetryUtils';
-import { INodeProcess } from 'vs/base/common/platform';
+import { IStorageService, StorageScope } from '../../../../platform/storage/common/storage.js';
+import { resolveCommonProperties } from '../../../../platform/telemetry/common/commonProperties.js';
+import { ICommonProperties, firstSessionDateStorageKey, lastSessionDateStorageKey } from '../../../../platform/telemetry/common/telemetry.js';
+import { cleanRemoteAuthority } from '../../../../platform/telemetry/common/telemetryUtils.js';
+import { INodeProcess } from '../../../../base/common/platform.js';
 
 export function resolveWorkbenchCommonProperties(
 	storageService: IStorageService,
diff --git a/src/vs/workbench/services/telemetry/electron-sandbox/telemetryService.ts b/src/vs/workbench/services/telemetry/electron-sandbox/telemetryService.ts
index 384c53bba07..e49eaefbbab 100644
--- a/src/vs/workbench/services/telemetry/electron-sandbox/telemetryService.ts
+++ b/src/vs/workbench/services/telemetry/electron-sandbox/telemetryService.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ITelemetryService, ITelemetryData, TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
-import { supportsTelemetry, NullTelemetryService, getPiiPathsFromEnvironment, isInternalTelemetry } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ISharedProcessService } from 'vs/platform/ipc/electron-sandbox/services';
-import { TelemetryAppenderClient } from 'vs/platform/telemetry/common/telemetryIpc';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { resolveWorkbenchCommonProperties } from 'vs/workbench/services/telemetry/common/workbenchCommonProperties';
-import { TelemetryService as BaseTelemetryService, ITelemetryServiceConfig } from 'vs/platform/telemetry/common/telemetryService';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ClassifiedEvent, StrictPropertyCheck, OmitMetadata, IGDPRProperty } from 'vs/platform/telemetry/common/gdprTypings';
-import { process } from 'vs/base/parts/sandbox/electron-sandbox/globals';
+import { ITelemetryService, ITelemetryData, TelemetryLevel } from '../../../../platform/telemetry/common/telemetry.js';
+import { supportsTelemetry, NullTelemetryService, getPiiPathsFromEnvironment, isInternalTelemetry } from '../../../../platform/telemetry/common/telemetryUtils.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { INativeWorkbenchEnvironmentService } from '../../environment/electron-sandbox/environmentService.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { ISharedProcessService } from '../../../../platform/ipc/electron-sandbox/services.js';
+import { TelemetryAppenderClient } from '../../../../platform/telemetry/common/telemetryIpc.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { resolveWorkbenchCommonProperties } from '../common/workbenchCommonProperties.js';
+import { TelemetryService as BaseTelemetryService, ITelemetryServiceConfig } from '../../../../platform/telemetry/common/telemetryService.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ClassifiedEvent, StrictPropertyCheck, OmitMetadata, IGDPRProperty } from '../../../../platform/telemetry/common/gdprTypings.js';
+import { process } from '../../../../base/parts/sandbox/electron-sandbox/globals.js';
 
 export class TelemetryService extends Disposable implements ITelemetryService {
 
diff --git a/src/vs/workbench/services/telemetry/test/browser/commonProperties.test.ts b/src/vs/workbench/services/telemetry/test/browser/commonProperties.test.ts
index c11cf658514..0b691a36561 100644
--- a/src/vs/workbench/services/telemetry/test/browser/commonProperties.test.ts
+++ b/src/vs/workbench/services/telemetry/test/browser/commonProperties.test.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { resolveWorkbenchCommonProperties } from 'vs/workbench/services/telemetry/browser/workbenchCommonProperties';
-import { InMemoryStorageService } from 'vs/platform/storage/common/storage';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { resolveWorkbenchCommonProperties } from '../../browser/workbenchCommonProperties.js';
+import { InMemoryStorageService } from '../../../../../platform/storage/common/storage.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('Browser Telemetry - common properties', function () {
 
diff --git a/src/vs/workbench/services/telemetry/test/node/commonProperties.test.ts b/src/vs/workbench/services/telemetry/test/node/commonProperties.test.ts
index bb4004c5419..151d3e090bd 100644
--- a/src/vs/workbench/services/telemetry/test/node/commonProperties.test.ts
+++ b/src/vs/workbench/services/telemetry/test/node/commonProperties.test.ts
@@ -5,10 +5,10 @@
 
 import assert from 'assert';
 import { release, hostname } from 'os';
-import { resolveWorkbenchCommonProperties } from 'vs/workbench/services/telemetry/common/workbenchCommonProperties';
-import { StorageScope, InMemoryStorageService, StorageTarget } from 'vs/platform/storage/common/storage';
-import { timeout } from 'vs/base/common/async';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { resolveWorkbenchCommonProperties } from '../../common/workbenchCommonProperties.js';
+import { StorageScope, InMemoryStorageService, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { timeout } from '../../../../../base/common/async.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('Telemetry - common properties', function () {
 	const commit: string = (undefined)!;
diff --git a/src/vs/workbench/services/terminal/common/embedderTerminalService.ts b/src/vs/workbench/services/terminal/common/embedderTerminalService.ts
index 5e322af7a0f..e976a8617ca 100644
--- a/src/vs/workbench/services/terminal/common/embedderTerminalService.ts
+++ b/src/vs/workbench/services/terminal/common/embedderTerminalService.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IProcessDataEvent, IProcessProperty, IProcessPropertyMap, IProcessReadyEvent, IShellLaunchConfig, ITerminalChildProcess, ITerminalLaunchError, ProcessPropertyType } from 'vs/platform/terminal/common/terminal';
-import { Disposable } from 'vs/base/common/lifecycle';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { IProcessDataEvent, IProcessProperty, IProcessPropertyMap, IProcessReadyEvent, IShellLaunchConfig, ITerminalChildProcess, ITerminalLaunchError, ProcessPropertyType } from '../../../../platform/terminal/common/terminal.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
 
 export const IEmbedderTerminalService = createDecorator<IEmbedderTerminalService>('embedderTerminalService');
 
diff --git a/src/vs/workbench/services/textMate/browser/arrayOperation.ts b/src/vs/workbench/services/textMate/browser/arrayOperation.ts
index 358713a8440..cb3f9e7dd21 100644
--- a/src/vs/workbench/services/textMate/browser/arrayOperation.ts
+++ b/src/vs/workbench/services/textMate/browser/arrayOperation.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { compareBy, numberComparator } from 'vs/base/common/arrays';
+import { compareBy, numberComparator } from '../../../../base/common/arrays.js';
 
 export class ArrayEdit {
 	public readonly edits: readonly SingleArrayEdit[];
diff --git a/src/vs/workbench/services/textMate/browser/backgroundTokenization/textMateWorkerTokenizerController.ts b/src/vs/workbench/services/textMate/browser/backgroundTokenization/textMateWorkerTokenizerController.ts
index 3695379f0e9..fa0f874e7e8 100644
--- a/src/vs/workbench/services/textMate/browser/backgroundTokenization/textMateWorkerTokenizerController.ts
+++ b/src/vs/workbench/services/textMate/browser/backgroundTokenization/textMateWorkerTokenizerController.ts
@@ -3,21 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { importAMDNodeModule } from 'vs/amdX';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IObservable, autorun, keepObserved } from 'vs/base/common/observable';
-import { countEOL } from 'vs/editor/common/core/eolCounter';
-import { LineRange } from 'vs/editor/common/core/lineRange';
-import { Range } from 'vs/editor/common/core/range';
-import { IBackgroundTokenizationStore, ILanguageIdCodec } from 'vs/editor/common/languages';
-import { ITextModel } from 'vs/editor/common/model';
-import { TokenizationStateStore } from 'vs/editor/common/model/textModelTokens';
-import { IModelContentChange, IModelContentChangedEvent } from 'vs/editor/common/textModelEvents';
-import { ContiguousMultilineTokensBuilder } from 'vs/editor/common/tokens/contiguousMultilineTokensBuilder';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { observableConfigValue } from 'vs/platform/observable/common/platformObservableUtils';
-import { ArrayEdit, MonotonousIndexTransformer, SingleArrayEdit } from 'vs/workbench/services/textMate/browser/arrayOperation';
-import type { StateDeltas, TextMateTokenizationWorker } from 'vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker';
+import { importAMDNodeModule } from '../../../../../amdX.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { IObservable, autorun, keepObserved } from '../../../../../base/common/observable.js';
+import { Proxied } from '../../../../../base/common/worker/simpleWorker.js';
+import { countEOL } from '../../../../../editor/common/core/eolCounter.js';
+import { LineRange } from '../../../../../editor/common/core/lineRange.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { IBackgroundTokenizationStore, ILanguageIdCodec } from '../../../../../editor/common/languages.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
+import { TokenizationStateStore } from '../../../../../editor/common/model/textModelTokens.js';
+import { IModelContentChange, IModelContentChangedEvent } from '../../../../../editor/common/textModelEvents.js';
+import { ContiguousMultilineTokensBuilder } from '../../../../../editor/common/tokens/contiguousMultilineTokensBuilder.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { observableConfigValue } from '../../../../../platform/observable/common/platformObservableUtils.js';
+import { ArrayEdit, MonotonousIndexTransformer, SingleArrayEdit } from '../arrayOperation.js';
+import type { StateDeltas, TextMateTokenizationWorker } from './worker/textMateTokenizationWorker.worker.js';
 import type { applyStateStackDiff, StateStack } from 'vscode-textmate';
 
 export class TextMateWorkerTokenizerController extends Disposable {
@@ -39,7 +40,7 @@ export class TextMateWorkerTokenizerController extends Disposable {
 
 	constructor(
 		private readonly _model: ITextModel,
-		private readonly _worker: TextMateTokenizationWorker,
+		private readonly _worker: Proxied<TextMateTokenizationWorker>,
 		private readonly _languageIdCodec: ILanguageIdCodec,
 		private readonly _backgroundTokenizationStore: IBackgroundTokenizationStore,
 		private readonly _configurationService: IConfigurationService,
@@ -56,7 +57,7 @@ export class TextMateWorkerTokenizerController extends Disposable {
 					changes: changesToString(e.changes),
 				});
 			}
-			this._worker.acceptModelChanged(this.controllerId, e);
+			this._worker.$acceptModelChanged(this.controllerId, e);
 			this._pendingChanges.push(e);
 		}));
 
@@ -64,7 +65,7 @@ export class TextMateWorkerTokenizerController extends Disposable {
 			const languageId = this._model.getLanguageId();
 			const encodedLanguageId =
 				this._languageIdCodec.encodeLanguageId(languageId);
-			this._worker.acceptModelLanguageChanged(
+			this._worker.$acceptModelLanguageChanged(
 				this.controllerId,
 				languageId,
 				encodedLanguageId
@@ -73,7 +74,7 @@ export class TextMateWorkerTokenizerController extends Disposable {
 
 		const languageId = this._model.getLanguageId();
 		const encodedLanguageId = this._languageIdCodec.encodeLanguageId(languageId);
-		this._worker.acceptNewModel({
+		this._worker.$acceptNewModel({
 			uri: this._model.uri,
 			versionId: this._model.getVersionId(),
 			lines: this._model.getLinesContent(),
@@ -87,17 +88,17 @@ export class TextMateWorkerTokenizerController extends Disposable {
 		this._register(autorun(reader => {
 			/** @description update maxTokenizationLineLength */
 			const maxTokenizationLineLength = this._maxTokenizationLineLength.read(reader);
-			this._worker.acceptMaxTokenizationLineLength(this.controllerId, maxTokenizationLineLength);
+			this._worker.$acceptMaxTokenizationLineLength(this.controllerId, maxTokenizationLineLength);
 		}));
 	}
 
 	public override dispose(): void {
 		super.dispose();
-		this._worker.acceptRemovedModel(this.controllerId);
+		this._worker.$acceptRemovedModel(this.controllerId);
 	}
 
 	public requestTokens(startLineNumber: number, endLineNumberExclusive: number): void {
-		this._worker.retokenize(this.controllerId, startLineNumber, endLineNumberExclusive);
+		this._worker.$retokenize(this.controllerId, startLineNumber, endLineNumberExclusive);
 	}
 
 	/**
diff --git a/src/vs/workbench/services/textMate/browser/backgroundTokenization/threadedBackgroundTokenizerFactory.ts b/src/vs/workbench/services/textMate/browser/backgroundTokenization/threadedBackgroundTokenizerFactory.ts
index 9558ffdd75e..ea3939b7b91 100644
--- a/src/vs/workbench/services/textMate/browser/backgroundTokenization/threadedBackgroundTokenizerFactory.ts
+++ b/src/vs/workbench/services/textMate/browser/backgroundTokenization/threadedBackgroundTokenizerFactory.ts
@@ -3,33 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { AppResourcePath, FileAccess, nodeModulesAsarPath, nodeModulesPath } from 'vs/base/common/network';
-import { IObservable } from 'vs/base/common/observable';
-import { isWeb } from 'vs/base/common/platform';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { MonacoWebWorker, createWebWorker } from 'vs/editor/browser/services/webWorker';
-import { IBackgroundTokenizationStore, IBackgroundTokenizer } from 'vs/editor/common/languages';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { ITextModel } from 'vs/editor/common/model';
-import { IModelService } from 'vs/editor/common/services/model';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IExtensionResourceLoaderService } from 'vs/platform/extensionResourceLoader/common/extensionResourceLoader';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { ICreateData, ITextMateWorkerHost, StateDeltas, TextMateTokenizationWorker } from 'vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker';
-import { TextMateWorkerTokenizerController } from 'vs/workbench/services/textMate/browser/backgroundTokenization/textMateWorkerTokenizerController';
-import { IValidGrammarDefinition } from 'vs/workbench/services/textMate/common/TMScopeRegistry';
+import { canASAR } from '../../../../../amdX.js';
+import { DisposableStore, IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { AppResourcePath, FileAccess, nodeModulesAsarPath, nodeModulesPath } from '../../../../../base/common/network.js';
+import { IObservable } from '../../../../../base/common/observable.js';
+import { isWeb } from '../../../../../base/common/platform.js';
+import { URI, UriComponents } from '../../../../../base/common/uri.js';
+import { IBackgroundTokenizationStore, IBackgroundTokenizer } from '../../../../../editor/common/languages.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IEnvironmentService } from '../../../../../platform/environment/common/environment.js';
+import { IExtensionResourceLoaderService } from '../../../../../platform/extensionResourceLoader/common/extensionResourceLoader.js';
+import { INotificationService } from '../../../../../platform/notification/common/notification.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { ICreateData, StateDeltas, TextMateTokenizationWorker } from './worker/textMateTokenizationWorker.worker.js';
+import { TextMateWorkerHost } from './worker/textMateWorkerHost.js';
+import { TextMateWorkerTokenizerController } from './textMateWorkerTokenizerController.js';
+import { IValidGrammarDefinition } from '../../common/TMScopeRegistry.js';
 import type { IRawTheme } from 'vscode-textmate';
+import { createWebWorker } from '../../../../../base/browser/defaultWorkerFactory.js';
+import { IWorkerClient, Proxied } from '../../../../../base/common/worker/simpleWorker.js';
 
 export class ThreadedBackgroundTokenizerFactory implements IDisposable {
 	private static _reportedMismatchingTokens = false;
 
-	private _workerProxyPromise: Promise<TextMateTokenizationWorker | null> | null = null;
-	private _worker: MonacoWebWorker<TextMateTokenizationWorker> | null = null;
-	private _workerProxy: TextMateTokenizationWorker | null = null;
+	private _workerProxyPromise: Promise<Proxied<TextMateTokenizationWorker> | null> | null = null;
+	private _worker: IWorkerClient<TextMateTokenizationWorker> | null = null;
+	private _workerProxy: Proxied<TextMateTokenizationWorker> | null = null;
 	private readonly _workerTokenizerControllers = new Map</* backgroundTokenizerId */number, TextMateWorkerTokenizerController>();
 
 	private _currentTheme: IRawTheme | null = null;
@@ -40,8 +41,6 @@ export class ThreadedBackgroundTokenizerFactory implements IDisposable {
 		private readonly _reportTokenizationTime: (timeMs: number, languageId: string, sourceExtensionId: string | undefined, lineLength: number, isRandomSample: boolean) => void,
 		private readonly _shouldTokenizeAsync: () => boolean,
 		@IExtensionResourceLoaderService private readonly _extensionResourceLoaderService: IExtensionResourceLoaderService,
-		@IModelService private readonly _modelService: IModelService,
-		@ILanguageConfigurationService private readonly _languageConfigurationService: ILanguageConfigurationService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@ILanguageService private readonly _languageService: ILanguageService,
 		@IEnvironmentService private readonly _environmentService: IEnvironmentService,
@@ -115,43 +114,39 @@ export class ThreadedBackgroundTokenizerFactory implements IDisposable {
 		this._currentTheme = theme;
 		this._currentTokenColorMap = colorMap;
 		if (this._currentTheme && this._currentTokenColorMap && this._workerProxy) {
-			this._workerProxy.acceptTheme(this._currentTheme, this._currentTokenColorMap);
+			this._workerProxy.$acceptTheme(this._currentTheme, this._currentTokenColorMap);
 		}
 	}
 
-	private _getWorkerProxy(): Promise<TextMateTokenizationWorker | null> {
+	private _getWorkerProxy(): Promise<Proxied<TextMateTokenizationWorker> | null> {
 		if (!this._workerProxyPromise) {
 			this._workerProxyPromise = this._createWorkerProxy();
 		}
 		return this._workerProxyPromise;
 	}
 
-	private async _createWorkerProxy(): Promise<TextMateTokenizationWorker | null> {
-		const textmateModuleLocation: AppResourcePath = `${nodeModulesPath}/vscode-textmate`;
-		const textmateModuleLocationAsar: AppResourcePath = `${nodeModulesAsarPath}/vscode-textmate`;
+	private async _createWorkerProxy(): Promise<Proxied<TextMateTokenizationWorker> | null> {
 		const onigurumaModuleLocation: AppResourcePath = `${nodeModulesPath}/vscode-oniguruma`;
 		const onigurumaModuleLocationAsar: AppResourcePath = `${nodeModulesAsarPath}/vscode-oniguruma`;
 
-		const useAsar = this._environmentService.isBuilt && !isWeb;
-		const textmateLocation: AppResourcePath = useAsar ? textmateModuleLocationAsar : textmateModuleLocation;
+		const useAsar = canASAR && this._environmentService.isBuilt && !isWeb;
 		const onigurumaLocation: AppResourcePath = useAsar ? onigurumaModuleLocationAsar : onigurumaModuleLocation;
-		const textmateMain: AppResourcePath = `${textmateLocation}/release/main.js`;
-		const onigurumaMain: AppResourcePath = `${onigurumaLocation}/release/main.js`;
 		const onigurumaWASM: AppResourcePath = `${onigurumaLocation}/release/onig.wasm`;
-		const uri = FileAccess.asBrowserUri(textmateMain).toString(true);
 
 		const createData: ICreateData = {
 			grammarDefinitions: this._grammarDefinitions,
-			textmateMainUri: uri,
-			onigurumaMainUri: FileAccess.asBrowserUri(onigurumaMain).toString(true),
 			onigurumaWASMUri: FileAccess.asBrowserUri(onigurumaWASM).toString(true),
 		};
-		const host: ITextMateWorkerHost = {
-			readFile: async (_resource: UriComponents): Promise<string> => {
+		const worker = this._worker = createWebWorker<TextMateTokenizationWorker>(
+			'vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker',
+			'TextMateWorker'
+		);
+		TextMateWorkerHost.setChannel(worker, {
+			$readFile: async (_resource: UriComponents): Promise<string> => {
 				const resource = URI.revive(_resource);
 				return this._extensionResourceLoaderService.readExtensionResource(resource);
 			},
-			setTokensAndStates: async (controllerId: number, versionId: number, tokens: Uint8Array, lineEndStateDeltas: StateDeltas[]): Promise<void> => {
+			$setTokensAndStates: async (controllerId: number, versionId: number, tokens: Uint8Array, lineEndStateDeltas: StateDeltas[]): Promise<void> => {
 				const controller = this._workerTokenizerControllers.get(controllerId);
 				// When a model detaches, it is removed synchronously from the map.
 				// However, the worker might still be sending tokens for that model,
@@ -160,27 +155,21 @@ export class ThreadedBackgroundTokenizerFactory implements IDisposable {
 					controller.setTokensAndStates(controllerId, versionId, tokens, lineEndStateDeltas);
 				}
 			},
-			reportTokenizationTime: (timeMs: number, languageId: string, sourceExtensionId: string | undefined, lineLength: number, isRandomSample: boolean): void => {
+			$reportTokenizationTime: (timeMs: number, languageId: string, sourceExtensionId: string | undefined, lineLength: number, isRandomSample: boolean): void => {
 				this._reportTokenizationTime(timeMs, languageId, sourceExtensionId, lineLength, isRandomSample);
 			}
-		};
-		const worker = this._worker = createWebWorker<TextMateTokenizationWorker>(this._modelService, this._languageConfigurationService, {
-			createData,
-			label: 'textMateWorker',
-			moduleId: 'vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker',
-			host,
 		});
-		const proxy = await worker.getProxy();
+		await worker.proxy.$init(createData);
 
 		if (this._worker !== worker) {
 			// disposed in the meantime
 			return null;
 		}
-		this._workerProxy = proxy;
+		this._workerProxy = worker.proxy;
 		if (this._currentTheme && this._currentTokenColorMap) {
-			this._workerProxy.acceptTheme(this._currentTheme, this._currentTokenColorMap);
+			this._workerProxy.$acceptTheme(this._currentTheme, this._currentTokenColorMap);
 		}
-		return proxy;
+		return worker.proxy;
 	}
 
 	private _disposeWorker(): void {
diff --git a/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker.ts b/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker.ts
index 3974d642732..131ad88d91c 100644
--- a/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker.ts
+++ b/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker.ts
@@ -3,32 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { LanguageId } from 'vs/editor/common/encodedTokenAttributes';
-import { IModelChangedEvent } from 'vs/editor/common/model/mirrorTextModel';
-import { IWorkerContext } from 'vs/editor/common/services/editorSimpleWorker';
-import { ICreateGrammarResult, TMGrammarFactory } from 'vs/workbench/services/textMate/common/TMGrammarFactory';
-import { IValidEmbeddedLanguagesMap, IValidGrammarDefinition, IValidTokenTypeMap } from 'vs/workbench/services/textMate/common/TMScopeRegistry';
+import { URI, UriComponents } from '../../../../../../base/common/uri.js';
+import { LanguageId } from '../../../../../../editor/common/encodedTokenAttributes.js';
+import { IModelChangedEvent } from '../../../../../../editor/common/model/mirrorTextModel.js';
+import { ICreateGrammarResult, TMGrammarFactory } from '../../../common/TMGrammarFactory.js';
+import { IValidEmbeddedLanguagesMap, IValidGrammarDefinition, IValidTokenTypeMap } from '../../../common/TMScopeRegistry.js';
 import type { IOnigLib, IRawTheme, StackDiff } from 'vscode-textmate';
-import { TextMateWorkerTokenizer } from './textMateWorkerTokenizer';
+import { TextMateWorkerTokenizer } from './textMateWorkerTokenizer.js';
+import { importAMDNodeModule } from '../../../../../../amdX.js';
+import { IRequestHandler, IWorkerServer } from '../../../../../../base/common/worker/simpleWorker.js';
+import { TextMateWorkerHost } from './textMateWorkerHost.js';
 
 /**
  * Defines the worker entry point. Must be exported and named `create`.
+ * @skipMangle
  */
-export function create(ctx: IWorkerContext<ITextMateWorkerHost>, createData: ICreateData): TextMateTokenizationWorker {
-	return new TextMateTokenizationWorker(ctx, createData);
-}
-
-export interface ITextMateWorkerHost {
-	readFile(_resource: UriComponents): Promise<string>;
-	setTokensAndStates(controllerId: number, versionId: number, tokens: Uint8Array, lineEndStateDeltas: StateDeltas[]): Promise<void>;
-	reportTokenizationTime(timeMs: number, languageId: string, sourceExtensionId: string | undefined, lineLength: number, isRandomSample: boolean): void;
+export function create(workerServer: IWorkerServer): TextMateTokenizationWorker {
+	return new TextMateTokenizationWorker(workerServer);
 }
 
 export interface ICreateData {
 	grammarDefinitions: IValidGrammarDefinitionDTO[];
-	textmateMainUri: string;
-	onigurumaMainUri: string;
 	onigurumaWASMUri: string;
 }
 
@@ -50,17 +45,19 @@ export interface StateDeltas {
 	stateDeltas: (StackDiff | null)[];
 }
 
-export class TextMateTokenizationWorker {
-	private readonly _host: ITextMateWorkerHost;
+export class TextMateTokenizationWorker implements IRequestHandler {
+	_requestHandlerBrand: any;
+
+	private readonly _host: TextMateWorkerHost;
 	private readonly _models = new Map</* controllerId */ number, TextMateWorkerTokenizer>();
 	private readonly _grammarCache: Promise<ICreateGrammarResult>[] = [];
-	private readonly _grammarFactory: Promise<TMGrammarFactory | null>;
+	private _grammarFactory: Promise<TMGrammarFactory | null> = Promise.resolve(null);
 
-	constructor(
-		ctx: IWorkerContext<ITextMateWorkerHost>,
-		private readonly _createData: ICreateData
-	) {
-		this._host = ctx.host;
+	constructor(workerServer: IWorkerServer) {
+		this._host = TextMateWorkerHost.getChannel(workerServer);
+	}
+
+	public async $init(_createData: ICreateData): Promise<void> {
 		const grammarDefinitions = _createData.grammarDefinitions.map<IValidGrammarDefinition>((def) => {
 			return {
 				location: URI.revive(def.location),
@@ -74,14 +71,13 @@ export class TextMateTokenizationWorker {
 				sourceExtensionId: def.sourceExtensionId,
 			};
 		});
-		this._grammarFactory = this._loadTMGrammarFactory(grammarDefinitions);
+		this._grammarFactory = this._loadTMGrammarFactory(grammarDefinitions, _createData.onigurumaWASMUri);
 	}
 
-	private async _loadTMGrammarFactory(grammarDefinitions: IValidGrammarDefinition[]): Promise<TMGrammarFactory> {
-		const uri = this._createData.textmateMainUri;
-		const vscodeTextmate = await import(uri);
-		const vscodeOniguruma = await import(this._createData.onigurumaMainUri);
-		const response = await fetch(this._createData.onigurumaWASMUri);
+	private async _loadTMGrammarFactory(grammarDefinitions: IValidGrammarDefinition[], onigurumaWASMUri: string): Promise<TMGrammarFactory> {
+		const vscodeTextmate = await importAMDNodeModule<typeof import('vscode-textmate')>('vscode-textmate', 'release/main.js');
+		const vscodeOniguruma = await importAMDNodeModule<typeof import('vscode-oniguruma')>('vscode-oniguruma', 'release/main.js');
+		const response = await fetch(onigurumaWASMUri);
 
 		// Using the response directly only works if the server sets the MIME type 'application/wasm'.
 		// Otherwise, a TypeError is thrown when using the streaming compiler.
@@ -97,13 +93,13 @@ export class TextMateTokenizationWorker {
 		return new TMGrammarFactory({
 			logTrace: (msg: string) => {/* console.log(msg) */ },
 			logError: (msg: string, err: any) => console.error(msg, err),
-			readFile: (resource: URI) => this._host.readFile(resource)
+			readFile: (resource: URI) => this._host.$readFile(resource)
 		}, grammarDefinitions, vscodeTextmate, onigLib);
 	}
 
 	// These methods are called by the renderer
 
-	public acceptNewModel(data: IRawModelData): void {
+	public $acceptNewModel(data: IRawModelData): void {
 		const uri = URI.revive(data.uri);
 		const that = this;
 		this._models.set(data.controllerId, new TextMateWorkerTokenizer(uri, data.lines, data.EOL, data.versionId, {
@@ -118,27 +114,27 @@ export class TextMateTokenizationWorker {
 				return that._grammarCache[encodedLanguageId];
 			},
 			setTokensAndStates(versionId: number, tokens: Uint8Array, stateDeltas: StateDeltas[]): void {
-				that._host.setTokensAndStates(data.controllerId, versionId, tokens, stateDeltas);
+				that._host.$setTokensAndStates(data.controllerId, versionId, tokens, stateDeltas);
 			},
 			reportTokenizationTime(timeMs: number, languageId: string, sourceExtensionId: string | undefined, lineLength: number, isRandomSample: boolean): void {
-				that._host.reportTokenizationTime(timeMs, languageId, sourceExtensionId, lineLength, isRandomSample);
+				that._host.$reportTokenizationTime(timeMs, languageId, sourceExtensionId, lineLength, isRandomSample);
 			},
 		}, data.languageId, data.encodedLanguageId, data.maxTokenizationLineLength));
 	}
 
-	public acceptModelChanged(controllerId: number, e: IModelChangedEvent): void {
+	public $acceptModelChanged(controllerId: number, e: IModelChangedEvent): void {
 		this._models.get(controllerId)!.onEvents(e);
 	}
 
-	public retokenize(controllerId: number, startLineNumber: number, endLineNumberExclusive: number): void {
+	public $retokenize(controllerId: number, startLineNumber: number, endLineNumberExclusive: number): void {
 		this._models.get(controllerId)!.retokenize(startLineNumber, endLineNumberExclusive);
 	}
 
-	public acceptModelLanguageChanged(controllerId: number, newLanguageId: string, newEncodedLanguageId: LanguageId): void {
+	public $acceptModelLanguageChanged(controllerId: number, newLanguageId: string, newEncodedLanguageId: LanguageId): void {
 		this._models.get(controllerId)!.onLanguageId(newLanguageId, newEncodedLanguageId);
 	}
 
-	public acceptRemovedModel(controllerId: number): void {
+	public $acceptRemovedModel(controllerId: number): void {
 		const model = this._models.get(controllerId);
 		if (model) {
 			model.dispose();
@@ -146,12 +142,12 @@ export class TextMateTokenizationWorker {
 		}
 	}
 
-	public async acceptTheme(theme: IRawTheme, colorMap: string[]): Promise<void> {
+	public async $acceptTheme(theme: IRawTheme, colorMap: string[]): Promise<void> {
 		const grammarFactory = await this._grammarFactory;
 		grammarFactory?.setTheme(theme, colorMap);
 	}
 
-	public acceptMaxTokenizationLineLength(controllerId: number, value: number): void {
+	public $acceptMaxTokenizationLineLength(controllerId: number, value: number): void {
 		this._models.get(controllerId)!.acceptMaxTokenizationLineLength(value);
 	}
 }
diff --git a/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.workerMain.ts b/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.workerMain.ts
new file mode 100644
index 00000000000..9846a7b64c3
--- /dev/null
+++ b/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.workerMain.ts
@@ -0,0 +1,9 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { create } from './textMateTokenizationWorker.worker.js';
+import { bootstrapSimpleWorker } from '../../../../../../base/common/worker/simpleWorkerBootstrap.js';
+
+bootstrapSimpleWorker(create);
diff --git a/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateWorkerHost.ts b/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateWorkerHost.ts
new file mode 100644
index 00000000000..e5c89236632
--- /dev/null
+++ b/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateWorkerHost.ts
@@ -0,0 +1,22 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { UriComponents } from '../../../../../../base/common/uri.js';
+import { IWorkerServer, IWorkerClient } from '../../../../../../base/common/worker/simpleWorker.js';
+import { StateDeltas } from './textMateTokenizationWorker.worker.js';
+
+export abstract class TextMateWorkerHost {
+	public static CHANNEL_NAME = 'textMateWorkerHost';
+	public static getChannel(workerServer: IWorkerServer): TextMateWorkerHost {
+		return workerServer.getChannel<TextMateWorkerHost>(TextMateWorkerHost.CHANNEL_NAME);
+	}
+	public static setChannel(workerClient: IWorkerClient<any>, obj: TextMateWorkerHost): void {
+		workerClient.setChannel<TextMateWorkerHost>(TextMateWorkerHost.CHANNEL_NAME, obj);
+	}
+
+	abstract $readFile(_resource: UriComponents): Promise<string>;
+	abstract $setTokensAndStates(controllerId: number, versionId: number, tokens: Uint8Array, lineEndStateDeltas: StateDeltas[]): Promise<void>;
+	abstract $reportTokenizationTime(timeMs: number, languageId: string, sourceExtensionId: string | undefined, lineLength: number, isRandomSample: boolean): void;
+}
diff --git a/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateWorkerTokenizer.ts b/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateWorkerTokenizer.ts
index 112d76ec0d9..f3945c5e8fa 100644
--- a/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateWorkerTokenizer.ts
+++ b/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateWorkerTokenizer.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { importAMDNodeModule } from 'vs/amdX';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { observableValue } from 'vs/base/common/observable';
-import { setTimeout0 } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { LineRange } from 'vs/editor/common/core/lineRange';
-import { LanguageId } from 'vs/editor/common/encodedTokenAttributes';
-import { IModelChangedEvent, MirrorTextModel } from 'vs/editor/common/model/mirrorTextModel';
-import { TokenizerWithStateStore } from 'vs/editor/common/model/textModelTokens';
-import { ContiguousMultilineTokensBuilder } from 'vs/editor/common/tokens/contiguousMultilineTokensBuilder';
-import { LineTokens } from 'vs/editor/common/tokens/lineTokens';
-import { TextMateTokenizationSupport } from 'vs/workbench/services/textMate/browser/tokenizationSupport/textMateTokenizationSupport';
-import { TokenizationSupportWithLineLimit } from 'vs/workbench/services/textMate/browser/tokenizationSupport/tokenizationSupportWithLineLimit';
+import { importAMDNodeModule } from '../../../../../../amdX.js';
+import { RunOnceScheduler } from '../../../../../../base/common/async.js';
+import { observableValue } from '../../../../../../base/common/observable.js';
+import { setTimeout0 } from '../../../../../../base/common/platform.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { LineRange } from '../../../../../../editor/common/core/lineRange.js';
+import { LanguageId } from '../../../../../../editor/common/encodedTokenAttributes.js';
+import { IModelChangedEvent, MirrorTextModel } from '../../../../../../editor/common/model/mirrorTextModel.js';
+import { TokenizerWithStateStore } from '../../../../../../editor/common/model/textModelTokens.js';
+import { ContiguousMultilineTokensBuilder } from '../../../../../../editor/common/tokens/contiguousMultilineTokensBuilder.js';
+import { LineTokens } from '../../../../../../editor/common/tokens/lineTokens.js';
+import { TextMateTokenizationSupport } from '../../tokenizationSupport/textMateTokenizationSupport.js';
+import { TokenizationSupportWithLineLimit } from '../../tokenizationSupport/tokenizationSupportWithLineLimit.js';
 import type { StackDiff, StateStack, diffStateStacksRefEq } from 'vscode-textmate';
-import { ICreateGrammarResult } from 'vs/workbench/services/textMate/common/TMGrammarFactory';
-import { StateDeltas } from 'vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker';
-import { Disposable } from 'vs/base/common/lifecycle';
+import { ICreateGrammarResult } from '../../../common/TMGrammarFactory.js';
+import { StateDeltas } from './textMateTokenizationWorker.worker.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
 
 export interface TextMateModelTokenizerHost {
 	getOrCreateGrammar(languageId: string, encodedLanguageId: LanguageId): Promise<ICreateGrammarResult | null>;
diff --git a/src/vs/workbench/services/textMate/browser/textMateTokenizationFeature.contribution.ts b/src/vs/workbench/services/textMate/browser/textMateTokenizationFeature.contribution.ts
index 7003e08847c..f0cf742bc70 100644
--- a/src/vs/workbench/services/textMate/browser/textMateTokenizationFeature.contribution.ts
+++ b/src/vs/workbench/services/textMate/browser/textMateTokenizationFeature.contribution.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { registerSingleton, InstantiationType } from 'vs/platform/instantiation/common/extensions';
-import { ITextMateTokenizationService } from 'vs/workbench/services/textMate/browser/textMateTokenizationFeature';
-import { TextMateTokenizationFeature } from 'vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl';
-import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
+import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js';
+import { ITextMateTokenizationService } from './textMateTokenizationFeature.js';
+import { TextMateTokenizationFeature } from './textMateTokenizationFeatureImpl.js';
+import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
 
 /**
  * Makes sure the ITextMateTokenizationService is instantiated
diff --git a/src/vs/workbench/services/textMate/browser/textMateTokenizationFeature.ts b/src/vs/workbench/services/textMate/browser/textMateTokenizationFeature.ts
index 34cc1cc5ead..b271a9b9e92 100644
--- a/src/vs/workbench/services/textMate/browser/textMateTokenizationFeature.ts
+++ b/src/vs/workbench/services/textMate/browser/textMateTokenizationFeature.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import type { IGrammar } from 'vscode-textmate';
 
 export const ITextMateTokenizationService = createDecorator<ITextMateTokenizationService>('textMateTokenizationFeature');
diff --git a/src/vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.ts b/src/vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.ts
index 02eef664f6f..94a284248bf 100644
--- a/src/vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.ts
+++ b/src/vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.ts
@@ -3,40 +3,40 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { importAMDNodeModule } from 'vs/amdX';
-import * as dom from 'vs/base/browser/dom';
-import { equals as equalArray } from 'vs/base/common/arrays';
-import { Color } from 'vs/base/common/color';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { FileAccess, nodeModulesAsarUnpackedPath, nodeModulesPath } from 'vs/base/common/network';
-import { IObservable, observableFromEvent } from 'vs/base/common/observable';
-import { isWeb } from 'vs/base/common/platform';
-import * as resources from 'vs/base/common/resources';
-import * as types from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
-import { StandardTokenType } from 'vs/editor/common/encodedTokenAttributes';
-import { ITokenizationSupport, LazyTokenizationSupport, TokenizationRegistry } from 'vs/editor/common/languages';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { generateTokensCSSForColorMap } from 'vs/editor/common/languages/supports/tokenization';
-import * as nls from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IExtensionResourceLoaderService } from 'vs/platform/extensionResourceLoader/common/extensionResourceLoader';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { ExtensionMessageCollector, IExtensionPointUser } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { ITextMateTokenizationService } from 'vs/workbench/services/textMate/browser/textMateTokenizationFeature';
-import { TextMateTokenizationSupport } from 'vs/workbench/services/textMate/browser/tokenizationSupport/textMateTokenizationSupport';
-import { TokenizationSupportWithLineLimit } from 'vs/workbench/services/textMate/browser/tokenizationSupport/tokenizationSupportWithLineLimit';
-import { ThreadedBackgroundTokenizerFactory } from 'vs/workbench/services/textMate/browser/backgroundTokenization/threadedBackgroundTokenizerFactory';
-import { TMGrammarFactory, missingTMGrammarErrorMessage } from 'vs/workbench/services/textMate/common/TMGrammarFactory';
-import { ITMSyntaxExtensionPoint, grammarsExtPoint } from 'vs/workbench/services/textMate/common/TMGrammars';
-import { IValidEmbeddedLanguagesMap, IValidGrammarDefinition, IValidTokenTypeMap } from 'vs/workbench/services/textMate/common/TMScopeRegistry';
-import { ITextMateThemingRule, IWorkbenchColorTheme, IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
+import { canASAR, importAMDNodeModule, resolveAmdNodeModulePath } from '../../../../amdX.js';
+import * as dom from '../../../../base/browser/dom.js';
+import { equals as equalArray } from '../../../../base/common/arrays.js';
+import { Color } from '../../../../base/common/color.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import { FileAccess, nodeModulesAsarUnpackedPath, nodeModulesPath } from '../../../../base/common/network.js';
+import { IObservable, observableFromEvent } from '../../../../base/common/observable.js';
+import { isWeb } from '../../../../base/common/platform.js';
+import * as resources from '../../../../base/common/resources.js';
+import * as types from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { StandardTokenType } from '../../../../editor/common/encodedTokenAttributes.js';
+import { ITokenizationSupport, LazyTokenizationSupport, TokenizationRegistry } from '../../../../editor/common/languages.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { generateTokensCSSForColorMap } from '../../../../editor/common/languages/supports/tokenization.js';
+import * as nls from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IExtensionResourceLoaderService } from '../../../../platform/extensionResourceLoader/common/extensionResourceLoader.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IProgressService, ProgressLocation } from '../../../../platform/progress/common/progress.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { ExtensionMessageCollector, IExtensionPointUser } from '../../extensions/common/extensionsRegistry.js';
+import { ITextMateTokenizationService } from './textMateTokenizationFeature.js';
+import { TextMateTokenizationSupport } from './tokenizationSupport/textMateTokenizationSupport.js';
+import { TokenizationSupportWithLineLimit } from './tokenizationSupport/tokenizationSupportWithLineLimit.js';
+import { ThreadedBackgroundTokenizerFactory } from './backgroundTokenization/threadedBackgroundTokenizerFactory.js';
+import { TMGrammarFactory, missingTMGrammarErrorMessage } from '../common/TMGrammarFactory.js';
+import { ITMSyntaxExtensionPoint, grammarsExtPoint } from '../common/TMGrammars.js';
+import { IValidEmbeddedLanguagesMap, IValidGrammarDefinition, IValidTokenTypeMap } from '../common/TMScopeRegistry.js';
+import { ITextMateThemingRule, IWorkbenchColorTheme, IWorkbenchThemeService } from '../../themes/common/workbenchThemeService.js';
 import type { IGrammar, IOnigLib, IRawTheme } from 'vscode-textmate';
 
 export class TextMateTokenizationFeature extends Disposable implements ITextMateTokenizationService {
@@ -371,13 +371,13 @@ export class TextMateTokenizationFeature extends Disposable implements ITextMate
 
 	private async _loadVSCodeOnigurumaWASM(): Promise<Response | ArrayBuffer> {
 		if (isWeb) {
-			const response = await fetch(FileAccess.asBrowserUri('vscode-oniguruma/../onig.wasm').toString(true));
+			const response = await fetch(resolveAmdNodeModulePath('vscode-oniguruma', 'release/onig.wasm'));
 			// Using the response directly only works if the server sets the MIME type 'application/wasm'.
 			// Otherwise, a TypeError is thrown when using the streaming compiler.
 			// We therefore use the non-streaming compiler :(.
 			return await response.arrayBuffer();
 		} else {
-			const response = await fetch(this._environmentService.isBuilt
+			const response = await fetch(canASAR && this._environmentService.isBuilt
 				? FileAccess.asBrowserUri(`${nodeModulesAsarUnpackedPath}/vscode-oniguruma/release/onig.wasm`).toString(true)
 				: FileAccess.asBrowserUri(`${nodeModulesPath}/vscode-oniguruma/release/onig.wasm`).toString(true));
 			return response;
diff --git a/src/vs/workbench/services/textMate/browser/tokenizationSupport/textMateTokenizationSupport.ts b/src/vs/workbench/services/textMate/browser/tokenizationSupport/textMateTokenizationSupport.ts
index 3a3b8078751..35409606cb1 100644
--- a/src/vs/workbench/services/textMate/browser/tokenizationSupport/textMateTokenizationSupport.ts
+++ b/src/vs/workbench/services/textMate/browser/tokenizationSupport/textMateTokenizationSupport.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { StopWatch } from 'vs/base/common/stopwatch';
-import { LanguageId, TokenMetadata } from 'vs/editor/common/encodedTokenAttributes';
-import { EncodedTokenizationResult, IBackgroundTokenizationStore, IBackgroundTokenizer, IState, ITokenizationSupport, TokenizationResult } from 'vs/editor/common/languages';
-import { ITextModel } from 'vs/editor/common/model';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { StopWatch } from '../../../../../base/common/stopwatch.js';
+import { LanguageId, TokenMetadata } from '../../../../../editor/common/encodedTokenAttributes.js';
+import { EncodedTokenizationResult, IBackgroundTokenizationStore, IBackgroundTokenizer, IState, ITokenizationSupport, TokenizationResult } from '../../../../../editor/common/languages.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
 import type { IGrammar, StateStack } from 'vscode-textmate';
 
 export class TextMateTokenizationSupport extends Disposable implements ITokenizationSupport {
diff --git a/src/vs/workbench/services/textMate/browser/tokenizationSupport/tokenizationSupportWithLineLimit.ts b/src/vs/workbench/services/textMate/browser/tokenizationSupport/tokenizationSupportWithLineLimit.ts
index a32113c6e8e..7a46a37cea4 100644
--- a/src/vs/workbench/services/textMate/browser/tokenizationSupport/tokenizationSupportWithLineLimit.ts
+++ b/src/vs/workbench/services/textMate/browser/tokenizationSupport/tokenizationSupportWithLineLimit.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { LanguageId } from 'vs/editor/common/encodedTokenAttributes';
-import { EncodedTokenizationResult, IBackgroundTokenizationStore, IBackgroundTokenizer, IState, ITokenizationSupport, TokenizationResult } from 'vs/editor/common/languages';
-import { nullTokenizeEncoded } from 'vs/editor/common/languages/nullTokenize';
-import { ITextModel } from 'vs/editor/common/model';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { IObservable, keepObserved } from 'vs/base/common/observable';
+import { LanguageId } from '../../../../../editor/common/encodedTokenAttributes.js';
+import { EncodedTokenizationResult, IBackgroundTokenizationStore, IBackgroundTokenizer, IState, ITokenizationSupport, TokenizationResult } from '../../../../../editor/common/languages.js';
+import { nullTokenizeEncoded } from '../../../../../editor/common/languages/nullTokenize.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
+import { Disposable, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { IObservable, keepObserved } from '../../../../../base/common/observable.js';
 
 export class TokenizationSupportWithLineLimit extends Disposable implements ITokenizationSupport {
 	get backgroundTokenizerShouldOnlyVerifyTokens(): boolean | undefined {
diff --git a/src/vs/workbench/services/textMate/common/TMGrammarFactory.ts b/src/vs/workbench/services/textMate/common/TMGrammarFactory.ts
index 9ef0097cead..bfca89fba24 100644
--- a/src/vs/workbench/services/textMate/common/TMGrammarFactory.ts
+++ b/src/vs/workbench/services/textMate/common/TMGrammarFactory.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { IValidEmbeddedLanguagesMap, IValidGrammarDefinition, TMScopeRegistry } from 'vs/workbench/services/textMate/common/TMScopeRegistry';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IValidEmbeddedLanguagesMap, IValidGrammarDefinition, TMScopeRegistry } from './TMScopeRegistry.js';
 import type { IGrammar, IOnigLib, IRawTheme, Registry, StateStack } from 'vscode-textmate';
 
 interface ITMGrammarFactoryHost {
diff --git a/src/vs/workbench/services/textMate/common/TMGrammars.ts b/src/vs/workbench/services/textMate/common/TMGrammars.ts
index 150a91d9120..929732ee7d5 100644
--- a/src/vs/workbench/services/textMate/common/TMGrammars.ts
+++ b/src/vs/workbench/services/textMate/common/TMGrammars.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { ExtensionsRegistry, IExtensionPoint } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { languagesExtPoint } from 'vs/workbench/services/language/common/languageService';
+import * as nls from '../../../../nls.js';
+import { ExtensionsRegistry, IExtensionPoint } from '../../extensions/common/extensionsRegistry.js';
+import { languagesExtPoint } from '../../language/common/languageService.js';
 
 export interface IEmbeddedLanguagesMap {
 	[scopeName: string]: string;
diff --git a/src/vs/workbench/services/textMate/common/TMScopeRegistry.ts b/src/vs/workbench/services/textMate/common/TMScopeRegistry.ts
index a1a0779371e..ace5da0d59a 100644
--- a/src/vs/workbench/services/textMate/common/TMScopeRegistry.ts
+++ b/src/vs/workbench/services/textMate/common/TMScopeRegistry.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as resources from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { LanguageId, StandardTokenType } from 'vs/editor/common/encodedTokenAttributes';
+import * as resources from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { LanguageId, StandardTokenType } from '../../../../editor/common/encodedTokenAttributes.js';
 
 export interface IValidGrammarDefinition {
 	location: URI;
diff --git a/src/vs/workbench/services/textMate/test/browser/arrayOperation.test.ts b/src/vs/workbench/services/textMate/test/browser/arrayOperation.test.ts
index 3844a0f51d1..4b5ddb6467a 100644
--- a/src/vs/workbench/services/textMate/test/browser/arrayOperation.test.ts
+++ b/src/vs/workbench/services/textMate/test/browser/arrayOperation.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ArrayEdit, MonotonousIndexTransformer, SingleArrayEdit } from 'vs/workbench/services/textMate/browser/arrayOperation';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { ArrayEdit, MonotonousIndexTransformer, SingleArrayEdit } from '../../browser/arrayOperation.js';
 
 suite('array operation', () => {
 	function seq(start: number, end: number) {
diff --git a/src/vs/workbench/services/textfile/browser/browserTextFileService.ts b/src/vs/workbench/services/textfile/browser/browserTextFileService.ts
index 188ca299d5f..d84171e4354 100644
--- a/src/vs/workbench/services/textfile/browser/browserTextFileService.ts
+++ b/src/vs/workbench/services/textfile/browser/browserTextFileService.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { AbstractTextFileService } from 'vs/workbench/services/textfile/browser/textFileService';
-import { ITextFileService, TextFileEditorModelState } from 'vs/workbench/services/textfile/common/textfiles';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { IDialogService, IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IElevatedFileService } from 'vs/workbench/services/files/common/elevatedFileService';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { IUntitledTextEditorService } from 'vs/workbench/services/untitled/common/untitledTextEditorService';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IWorkingCopyFileService } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
-import { IDecorationsService } from 'vs/workbench/services/decorations/common/decorations';
+import { AbstractTextFileService } from './textFileService.js';
+import { ITextFileService, TextFileEditorModelState } from '../common/textfiles.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { IDialogService, IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IElevatedFileService } from '../../files/common/elevatedFileService.js';
+import { IFilesConfigurationService } from '../../filesConfiguration/common/filesConfigurationService.js';
+import { ILifecycleService } from '../../lifecycle/common/lifecycle.js';
+import { IPathService } from '../../path/common/pathService.js';
+import { IUntitledTextEditorService } from '../../untitled/common/untitledTextEditorService.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IWorkingCopyFileService } from '../../workingCopy/common/workingCopyFileService.js';
+import { IDecorationsService } from '../../decorations/common/decorations.js';
 
 export class BrowserTextFileService extends AbstractTextFileService {
 
diff --git a/src/vs/workbench/services/textfile/browser/textFileService.ts b/src/vs/workbench/services/textfile/browser/textFileService.ts
index 859fa8a1c1a..fe8816efc16 100644
--- a/src/vs/workbench/services/textfile/browser/textFileService.ts
+++ b/src/vs/workbench/services/textfile/browser/textFileService.ts
@@ -3,47 +3,46 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { URI } from 'vs/base/common/uri';
-import { IEncodingSupport, ITextFileService, ITextFileStreamContent, ITextFileContent, IResourceEncodings, IReadTextFileOptions, IWriteTextFileOptions, toBufferOrReadable, TextFileOperationError, TextFileOperationResult, ITextFileSaveOptions, ITextFileEditorModelManager, IResourceEncoding, stringToSnapshot, ITextFileSaveAsOptions, IReadTextFileEncodingOptions, TextFileEditorModelState } from 'vs/workbench/services/textfile/common/textfiles';
-import { IRevertOptions, SaveSourceRegistry } from 'vs/workbench/common/editor';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IFileService, FileOperationError, FileOperationResult, IFileStatWithMetadata, ICreateFileOptions, IFileStreamContent } from 'vs/platform/files/common/files';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { extname as pathExtname } from 'vs/base/common/path';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IUntitledTextEditorService, IUntitledTextEditorModelManager } from 'vs/workbench/services/untitled/common/untitledTextEditorService';
-import { UntitledTextEditorModel } from 'vs/workbench/services/untitled/common/untitledTextEditorModel';
-import { TextFileEditorModelManager } from 'vs/workbench/services/textfile/common/textFileEditorModelManager';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { Schemas } from 'vs/base/common/network';
-import { createTextBufferFactoryFromSnapshot, createTextBufferFactoryFromStream } from 'vs/editor/common/model/textModel';
-import { IModelService } from 'vs/editor/common/services/model';
-import { joinPath, dirname, basename, toLocalResource, extname, isEqual } from 'vs/base/common/resources';
-import { IDialogService, IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { VSBuffer, VSBufferReadable, bufferToStream, VSBufferReadableStream } from 'vs/base/common/buffer';
-import { ITextSnapshot, ITextModel } from 'vs/editor/common/model';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { IResolvedTextEditorModel } from 'vs/editor/common/services/resolverService';
-import { BaseTextEditorModel } from 'vs/workbench/common/editor/textEditorModel';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { IWorkingCopyFileService, IFileOperationUndoRedoInfo, ICreateFileOperation } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IWorkspaceContextService, WORKSPACE_EXTENSION } from 'vs/platform/workspace/common/workspace';
-import { UTF8, UTF8_with_bom, UTF16be, UTF16le, encodingExists, toEncodeReadable, toDecodeStream, IDecodeStreamResult, DecodeStreamError, DecodeStreamErrorKind } from 'vs/workbench/services/textfile/common/encoding';
-import { consumeStream, ReadableStream } from 'vs/base/common/stream';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ILogService } from 'vs/platform/log/common/log';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { IElevatedFileService } from 'vs/workbench/services/files/common/elevatedFileService';
-import { IDecorationData, IDecorationsProvider, IDecorationsService } from 'vs/workbench/services/decorations/common/decorations';
-import { Emitter } from 'vs/base/common/event';
-import { Codicon } from 'vs/base/common/codicons';
-import { listErrorForeground } from 'vs/platform/theme/common/colorRegistry';
-import { firstOrDefault } from 'vs/base/common/arrays';
+import { localize } from '../../../../nls.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IEncodingSupport, ITextFileService, ITextFileStreamContent, ITextFileContent, IResourceEncodings, IReadTextFileOptions, IWriteTextFileOptions, toBufferOrReadable, TextFileOperationError, TextFileOperationResult, ITextFileSaveOptions, ITextFileEditorModelManager, IResourceEncoding, stringToSnapshot, ITextFileSaveAsOptions, IReadTextFileEncodingOptions, TextFileEditorModelState } from '../common/textfiles.js';
+import { IRevertOptions, SaveSourceRegistry } from '../../../common/editor.js';
+import { ILifecycleService } from '../../lifecycle/common/lifecycle.js';
+import { IFileService, FileOperationError, FileOperationResult, IFileStatWithMetadata, ICreateFileOptions, IFileStreamContent } from '../../../../platform/files/common/files.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { extname as pathExtname } from '../../../../base/common/path.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { IUntitledTextEditorService, IUntitledTextEditorModelManager } from '../../untitled/common/untitledTextEditorService.js';
+import { UntitledTextEditorModel } from '../../untitled/common/untitledTextEditorModel.js';
+import { TextFileEditorModelManager } from '../common/textFileEditorModelManager.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { createTextBufferFactoryFromSnapshot, createTextBufferFactoryFromStream } from '../../../../editor/common/model/textModel.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { joinPath, dirname, basename, toLocalResource, extname, isEqual } from '../../../../base/common/resources.js';
+import { IDialogService, IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { VSBuffer, VSBufferReadable, bufferToStream, VSBufferReadableStream } from '../../../../base/common/buffer.js';
+import { ITextSnapshot, ITextModel } from '../../../../editor/common/model.js';
+import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../../../../editor/common/languages/modesRegistry.js';
+import { IFilesConfigurationService } from '../../filesConfiguration/common/filesConfigurationService.js';
+import { IResolvedTextEditorModel } from '../../../../editor/common/services/resolverService.js';
+import { BaseTextEditorModel } from '../../../common/editor/textEditorModel.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { IPathService } from '../../path/common/pathService.js';
+import { IWorkingCopyFileService, IFileOperationUndoRedoInfo, ICreateFileOperation } from '../../workingCopy/common/workingCopyFileService.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IWorkspaceContextService, WORKSPACE_EXTENSION } from '../../../../platform/workspace/common/workspace.js';
+import { UTF8, UTF8_with_bom, UTF16be, UTF16le, encodingExists, toEncodeReadable, toDecodeStream, IDecodeStreamResult, DecodeStreamError, DecodeStreamErrorKind } from '../common/encoding.js';
+import { consumeStream, ReadableStream } from '../../../../base/common/stream.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { IElevatedFileService } from '../../files/common/elevatedFileService.js';
+import { IDecorationData, IDecorationsProvider, IDecorationsService } from '../../decorations/common/decorations.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { listErrorForeground } from '../../../../platform/theme/common/colorRegistry.js';
 
 export abstract class AbstractTextFileService extends Disposable implements ITextFileService {
 
@@ -657,7 +656,7 @@ export abstract class AbstractTextFileService extends Disposable implements ITex
 			return untitledName; // preserve extension if it is compatible with the mode
 		}
 
-		const primaryExtension = firstOrDefault(extensions);
+		const primaryExtension = extensions.at(0);
 		if (primaryExtension) {
 			if (untitledExtension) {
 				return `${untitledName.substring(0, untitledName.indexOf(untitledExtension))}${primaryExtension}`;
@@ -671,7 +670,7 @@ export abstract class AbstractTextFileService extends Disposable implements ITex
 			return untitledName; // preserve name if it is compatible with the mode
 		}
 
-		return firstOrDefault(filenames) ?? untitledName;
+		return filenames.at(0) ?? untitledName;
 	}
 
 	//#endregion
diff --git a/src/vs/workbench/services/textfile/common/encoding.ts b/src/vs/workbench/services/textfile/common/encoding.ts
index bae27136de4..b653dd7a847 100644
--- a/src/vs/workbench/services/textfile/common/encoding.ts
+++ b/src/vs/workbench/services/textfile/common/encoding.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Readable, ReadableStream, newWriteableStream, listenStream } from 'vs/base/common/stream';
-import { VSBuffer, VSBufferReadable, VSBufferReadableStream } from 'vs/base/common/buffer';
-import { importAMDNodeModule } from 'vs/amdX';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { coalesce } from 'vs/base/common/arrays';
+import { Readable, ReadableStream, newWriteableStream, listenStream } from '../../../../base/common/stream.js';
+import { VSBuffer, VSBufferReadable, VSBufferReadableStream } from '../../../../base/common/buffer.js';
+import { importAMDNodeModule } from '../../../../amdX.js';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { coalesce } from '../../../../base/common/arrays.js';
 
 export const UTF8 = 'utf8';
 export const UTF8_with_bom = 'utf8bom';
diff --git a/src/vs/workbench/services/textfile/common/textEditorService.ts b/src/vs/workbench/services/textfile/common/textEditorService.ts
index d3e6d529e71..27872c9d51a 100644
--- a/src/vs/workbench/services/textfile/common/textEditorService.ts
+++ b/src/vs/workbench/services/textfile/common/textEditorService.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { ResourceMap } from 'vs/base/common/map';
-import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IEditorFactoryRegistry, IFileEditorInput, IUntypedEditorInput, IUntypedFileEditorInput, EditorExtensions, isResourceDiffEditorInput, isResourceSideBySideEditorInput, IUntitledTextResourceEditorInput, DEFAULT_EDITOR_ASSOCIATION, isResourceMergeEditorInput } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { INewUntitledTextEditorOptions, IUntitledTextEditorService } from 'vs/workbench/services/untitled/common/untitledTextEditorService';
-import { Schemas } from 'vs/base/common/network';
-import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
-import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditorInput';
-import { TextResourceEditorInput } from 'vs/workbench/common/editor/textResourceEditorInput';
-import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
-import { IUntitledTextEditorModel } from 'vs/workbench/services/untitled/common/untitledTextEditorModel';
-import { basename } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IEditorResolverService, RegisteredEditorPriority } from 'vs/workbench/services/editor/common/editorResolverService';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { Event } from '../../../../base/common/event.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { createDecorator, IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IEditorFactoryRegistry, IFileEditorInput, IUntypedEditorInput, IUntypedFileEditorInput, EditorExtensions, isResourceDiffEditorInput, isResourceSideBySideEditorInput, IUntitledTextResourceEditorInput, DEFAULT_EDITOR_ASSOCIATION, isResourceMergeEditorInput } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { INewUntitledTextEditorOptions, IUntitledTextEditorService } from '../../untitled/common/untitledTextEditorService.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { DiffEditorInput } from '../../../common/editor/diffEditorInput.js';
+import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
+import { TextResourceEditorInput } from '../../../common/editor/textResourceEditorInput.js';
+import { UntitledTextEditorInput } from '../../untitled/common/untitledTextEditorInput.js';
+import { IUntitledTextEditorModel } from '../../untitled/common/untitledTextEditorModel.js';
+import { basename } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IEditorResolverService, RegisteredEditorPriority } from '../../editor/common/editorResolverService.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
 
 export const ITextEditorService = createDecorator<ITextEditorService>('textEditorService');
 
diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
index 3150fdd7b1d..febcf153c8b 100644
--- a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
+++ b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
@@ -3,37 +3,37 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { Emitter } from 'vs/base/common/event';
-import { URI } from 'vs/base/common/uri';
-import { mark } from 'vs/base/common/performance';
-import { assertIsDefined } from 'vs/base/common/types';
-import { EncodingMode, ITextFileService, TextFileEditorModelState, ITextFileEditorModel, ITextFileStreamContent, ITextFileResolveOptions, IResolvedTextFileEditorModel, TextFileResolveReason, ITextFileEditorModelSaveEvent, ITextFileSaveAsOptions } from 'vs/workbench/services/textfile/common/textfiles';
-import { IRevertOptions, SaveReason, SaveSourceRegistry } from 'vs/workbench/common/editor';
-import { BaseTextEditorModel } from 'vs/workbench/common/editor/textEditorModel';
-import { IWorkingCopyBackupService, IResolvedWorkingCopyBackup } from 'vs/workbench/services/workingCopy/common/workingCopyBackup';
-import { IFileService, FileOperationError, FileOperationResult, FileChangesEvent, FileChangeType, IFileStatWithMetadata, ETAG_DISABLED, NotModifiedSinceFileOperationError } from 'vs/platform/files/common/files';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IModelService } from 'vs/editor/common/services/model';
-import { timeout, TaskSequentializer } from 'vs/base/common/async';
-import { ITextBufferFactory, ITextModel } from 'vs/editor/common/model';
-import { ILogService } from 'vs/platform/log/common/log';
-import { basename } from 'vs/base/common/path';
-import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
-import { IWorkingCopyBackup, WorkingCopyCapabilities, NO_TYPE_ID, IWorkingCopyBackupMeta } from 'vs/workbench/services/workingCopy/common/workingCopy';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { UTF16be, UTF16le, UTF8, UTF8_with_bom } from 'vs/workbench/services/textfile/common/encoding';
-import { createTextBufferFactoryFromStream } from 'vs/editor/common/model/textModel';
-import { ILanguageDetectionService } from 'vs/workbench/services/languageDetection/common/languageDetectionWorkerService';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { extUri } from 'vs/base/common/resources';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { IProgress, IProgressService, IProgressStep, ProgressLocation } from 'vs/platform/progress/common/progress';
+import { localize } from '../../../../nls.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { URI } from '../../../../base/common/uri.js';
+import { mark } from '../../../../base/common/performance.js';
+import { assertIsDefined } from '../../../../base/common/types.js';
+import { EncodingMode, ITextFileService, TextFileEditorModelState, ITextFileEditorModel, ITextFileStreamContent, ITextFileResolveOptions, IResolvedTextFileEditorModel, TextFileResolveReason, ITextFileEditorModelSaveEvent, ITextFileSaveAsOptions } from './textfiles.js';
+import { IRevertOptions, SaveReason, SaveSourceRegistry } from '../../../common/editor.js';
+import { BaseTextEditorModel } from '../../../common/editor/textEditorModel.js';
+import { IWorkingCopyBackupService, IResolvedWorkingCopyBackup } from '../../workingCopy/common/workingCopyBackup.js';
+import { IFileService, FileOperationError, FileOperationResult, FileChangesEvent, FileChangeType, IFileStatWithMetadata, ETAG_DISABLED, NotModifiedSinceFileOperationError } from '../../../../platform/files/common/files.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { timeout, TaskSequentializer } from '../../../../base/common/async.js';
+import { ITextBufferFactory, ITextModel } from '../../../../editor/common/model.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { basename } from '../../../../base/common/path.js';
+import { IWorkingCopyService } from '../../workingCopy/common/workingCopyService.js';
+import { IWorkingCopyBackup, WorkingCopyCapabilities, NO_TYPE_ID, IWorkingCopyBackupMeta } from '../../workingCopy/common/workingCopy.js';
+import { IFilesConfigurationService } from '../../filesConfiguration/common/filesConfigurationService.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { UTF16be, UTF16le, UTF8, UTF8_with_bom } from './encoding.js';
+import { createTextBufferFactoryFromStream } from '../../../../editor/common/model/textModel.js';
+import { ILanguageDetectionService } from '../../languageDetection/common/languageDetectionWorkerService.js';
+import { IPathService } from '../../path/common/pathService.js';
+import { extUri } from '../../../../base/common/resources.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../../../../editor/common/languages/modesRegistry.js';
+import { IExtensionService } from '../../extensions/common/extensions.js';
+import { IMarkdownString } from '../../../../base/common/htmlContent.js';
+import { IProgress, IProgressService, IProgressStep, ProgressLocation } from '../../../../platform/progress/common/progress.js';
 
 interface IBackupMetaData extends IWorkingCopyBackupMeta {
 	mtime: number;
@@ -1013,6 +1013,11 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 			this.lastResolvedFileStat = newFileStat;
 		}
 
+		// In all other cases update only the readonly and locked flags
+		else {
+			this.lastResolvedFileStat = { ...this.lastResolvedFileStat, readonly: newFileStat.readonly, locked: newFileStat.locked };
+		}
+
 		// Signal that the readonly state changed
 		if (this.isReadonly() !== oldReadonly) {
 			this._onDidChangeReadonly.fire();
@@ -1099,8 +1104,8 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 
 		this.logService.info(`Adjusting encoding based on configured language override to '${encoding}' for ${this.resource.toString(true)}.`);
 
-		// Re-open with new encoding
-		return this.setEncodingInternal(encoding, EncodingMode.Decode);
+		// Force resolve to pick up the new encoding
+		return this.forceResolveFromFile();
 	}
 
 	private hasEncodingSetExplicitly: boolean = false;
diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts b/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts
index 773ee118d54..8be051a5821 100644
--- a/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts
+++ b/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts
@@ -3,28 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { Event, Emitter } from 'vs/base/common/event';
-import { URI } from 'vs/base/common/uri';
-import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel';
-import { dispose, IDisposable, Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { ITextFileEditorModel, ITextFileEditorModelManager, ITextFileEditorModelResolveOrCreateOptions, ITextFileResolveEvent, ITextFileSaveEvent, ITextFileSaveParticipant } from 'vs/workbench/services/textfile/common/textfiles';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ResourceMap } from 'vs/base/common/map';
-import { IFileService, FileChangesEvent, FileOperation, FileChangeType, IFileSystemProviderRegistrationEvent, IFileSystemProviderCapabilitiesChangeEvent } from 'vs/platform/files/common/files';
-import { Promises, ResourceQueue } from 'vs/base/common/async';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { TextFileSaveParticipant } from 'vs/workbench/services/textfile/common/textFileSaveParticipant';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IStoredFileWorkingCopySaveParticipantContext, IWorkingCopyFileService, WorkingCopyFileEvent } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
-import { ITextSnapshot } from 'vs/editor/common/model';
-import { extname, joinPath } from 'vs/base/common/resources';
-import { createTextBufferFactoryFromSnapshot } from 'vs/editor/common/model/textModel';
-import { PLAINTEXT_EXTENSION, PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IProgress, IProgressStep } from 'vs/platform/progress/common/progress';
+import { localize } from '../../../../nls.js';
+import { toErrorMessage } from '../../../../base/common/errorMessage.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { URI } from '../../../../base/common/uri.js';
+import { TextFileEditorModel } from './textFileEditorModel.js';
+import { dispose, IDisposable, Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { ITextFileEditorModel, ITextFileEditorModelManager, ITextFileEditorModelResolveOrCreateOptions, ITextFileResolveEvent, ITextFileSaveEvent, ITextFileSaveParticipant } from './textfiles.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { IFileService, FileChangesEvent, FileOperation, FileChangeType, IFileSystemProviderRegistrationEvent, IFileSystemProviderCapabilitiesChangeEvent } from '../../../../platform/files/common/files.js';
+import { Promises, ResourceQueue } from '../../../../base/common/async.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { TextFileSaveParticipant } from './textFileSaveParticipant.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IStoredFileWorkingCopySaveParticipantContext, IWorkingCopyFileService, WorkingCopyFileEvent } from '../../workingCopy/common/workingCopyFileService.js';
+import { ITextSnapshot } from '../../../../editor/common/model.js';
+import { extname, joinPath } from '../../../../base/common/resources.js';
+import { createTextBufferFactoryFromSnapshot } from '../../../../editor/common/model/textModel.js';
+import { PLAINTEXT_EXTENSION, PLAINTEXT_LANGUAGE_ID } from '../../../../editor/common/languages/modesRegistry.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IProgress, IProgressStep } from '../../../../platform/progress/common/progress.js';
 
 export class TextFileEditorModelManager extends Disposable implements ITextFileEditorModelManager {
 
diff --git a/src/vs/workbench/services/textfile/common/textFileSaveParticipant.ts b/src/vs/workbench/services/textfile/common/textFileSaveParticipant.ts
index e9430fd80ad..eb0b443072e 100644
--- a/src/vs/workbench/services/textfile/common/textFileSaveParticipant.ts
+++ b/src/vs/workbench/services/textfile/common/textFileSaveParticipant.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { raceCancellation } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProgress, IProgressStep } from 'vs/platform/progress/common/progress';
-import { ITextFileSaveParticipant, ITextFileEditorModel, ITextFileSaveParticipantContext } from 'vs/workbench/services/textfile/common/textfiles';
-import { IDisposable, Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { insert } from 'vs/base/common/arrays';
+import { raceCancellation } from '../../../../base/common/async.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IProgress, IProgressStep } from '../../../../platform/progress/common/progress.js';
+import { ITextFileSaveParticipant, ITextFileEditorModel, ITextFileSaveParticipantContext } from './textfiles.js';
+import { IDisposable, Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { insert } from '../../../../base/common/arrays.js';
 
 export class TextFileSaveParticipant extends Disposable {
 
diff --git a/src/vs/workbench/services/textfile/common/textfiles.ts b/src/vs/workbench/services/textfile/common/textfiles.ts
index d33c93d5d54..7681f369047 100644
--- a/src/vs/workbench/services/textfile/common/textfiles.ts
+++ b/src/vs/workbench/services/textfile/common/textfiles.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { Event } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { ISaveOptions, IRevertOptions, SaveReason } from 'vs/workbench/common/editor';
-import { ReadableStream } from 'vs/base/common/stream';
-import { IBaseFileStatWithMetadata, IFileStatWithMetadata, IWriteFileOptions, FileOperationError, FileOperationResult, IReadFileStreamOptions, IFileReadLimits } from 'vs/platform/files/common/files';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ITextEditorModel } from 'vs/editor/common/services/resolverService';
-import { ITextBufferFactory, ITextModel, ITextSnapshot } from 'vs/editor/common/model';
-import { VSBuffer, VSBufferReadable, VSBufferReadableStream } from 'vs/base/common/buffer';
-import { areFunctions, isUndefinedOrNull } from 'vs/base/common/types';
-import { IWorkingCopy, IWorkingCopySaveEvent } from 'vs/workbench/services/workingCopy/common/workingCopy';
-import { IUntitledTextEditorModelManager } from 'vs/workbench/services/untitled/common/untitledTextEditorService';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IProgress, IProgressStep } from 'vs/platform/progress/common/progress';
-import { IFileOperationUndoRedoInfo } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
+import { URI } from '../../../../base/common/uri.js';
+import { Event } from '../../../../base/common/event.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { ISaveOptions, IRevertOptions, SaveReason } from '../../../common/editor.js';
+import { ReadableStream } from '../../../../base/common/stream.js';
+import { IBaseFileStatWithMetadata, IFileStatWithMetadata, IWriteFileOptions, FileOperationError, FileOperationResult, IReadFileStreamOptions, IFileReadLimits } from '../../../../platform/files/common/files.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { ITextEditorModel } from '../../../../editor/common/services/resolverService.js';
+import { ITextBufferFactory, ITextModel, ITextSnapshot } from '../../../../editor/common/model.js';
+import { VSBuffer, VSBufferReadable, VSBufferReadableStream } from '../../../../base/common/buffer.js';
+import { areFunctions, isUndefinedOrNull } from '../../../../base/common/types.js';
+import { IWorkingCopy, IWorkingCopySaveEvent } from '../../workingCopy/common/workingCopy.js';
+import { IUntitledTextEditorModelManager } from '../../untitled/common/untitledTextEditorService.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IProgress, IProgressStep } from '../../../../platform/progress/common/progress.js';
+import { IFileOperationUndoRedoInfo } from '../../workingCopy/common/workingCopyFileService.js';
 
 export const ITextFileService = createDecorator<ITextFileService>('textFileService');
 
diff --git a/src/vs/workbench/services/textfile/electron-sandbox/nativeTextFileService.ts b/src/vs/workbench/services/textfile/electron-sandbox/nativeTextFileService.ts
index 7c8cc231a70..7acdc4d22d5 100644
--- a/src/vs/workbench/services/textfile/electron-sandbox/nativeTextFileService.ts
+++ b/src/vs/workbench/services/textfile/electron-sandbox/nativeTextFileService.ts
@@ -3,29 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { AbstractTextFileService } from 'vs/workbench/services/textfile/browser/textFileService';
-import { ITextFileService, ITextFileStreamContent, ITextFileContent, IReadTextFileOptions, TextFileEditorModelState, ITextFileEditorModel } from 'vs/workbench/services/textfile/common/textfiles';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { URI } from 'vs/base/common/uri';
-import { IFileService, IFileReadLimits } from 'vs/platform/files/common/files';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { IUntitledTextEditorService } from 'vs/workbench/services/untitled/common/untitledTextEditorService';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IModelService } from 'vs/editor/common/services/model';
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
-import { IDialogService, IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { IWorkingCopyFileService } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IElevatedFileService } from 'vs/workbench/services/files/common/elevatedFileService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { Promises } from 'vs/base/common/async';
-import { IDecorationsService } from 'vs/workbench/services/decorations/common/decorations';
+import { localize } from '../../../../nls.js';
+import { AbstractTextFileService } from '../browser/textFileService.js';
+import { ITextFileService, ITextFileStreamContent, ITextFileContent, IReadTextFileOptions, TextFileEditorModelState, ITextFileEditorModel } from '../common/textfiles.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IFileService, IFileReadLimits } from '../../../../platform/files/common/files.js';
+import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { IUntitledTextEditorService } from '../../untitled/common/untitledTextEditorService.js';
+import { ILifecycleService } from '../../lifecycle/common/lifecycle.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { INativeWorkbenchEnvironmentService } from '../../environment/electron-sandbox/environmentService.js';
+import { IDialogService, IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IFilesConfigurationService } from '../../filesConfiguration/common/filesConfigurationService.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { IPathService } from '../../path/common/pathService.js';
+import { IWorkingCopyFileService } from '../../workingCopy/common/workingCopyFileService.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { IElevatedFileService } from '../../files/common/elevatedFileService.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { Promises } from '../../../../base/common/async.js';
+import { IDecorationsService } from '../../decorations/common/decorations.js';
 
 export class NativeTextFileService extends AbstractTextFileService {
 
diff --git a/src/vs/workbench/services/textfile/test/browser/browserTextFileService.io.test.ts b/src/vs/workbench/services/textfile/test/browser/browserTextFileService.io.test.ts
index 4ae038ffe92..2e8f11875e7 100644
--- a/src/vs/workbench/services/textfile/test/browser/browserTextFileService.io.test.ts
+++ b/src/vs/workbench/services/textfile/test/browser/browserTextFileService.io.test.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { workbenchInstantiationService, TestInMemoryFileSystemProvider, TestBrowserTextFileServiceWithEncodingOverrides } from 'vs/workbench/test/browser/workbenchTestServices';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { Schemas } from 'vs/base/common/network';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { TextFileEditorModelManager } from 'vs/workbench/services/textfile/common/textFileEditorModelManager';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IFileService, IStat } from 'vs/platform/files/common/files';
-import { URI } from 'vs/base/common/uri';
-import { join } from 'vs/base/common/path';
-import { UTF16le, detectEncodingByBOMFromBuffer, UTF8_with_bom, UTF16be, toCanonicalName } from 'vs/workbench/services/textfile/common/encoding';
-import { VSBuffer } from 'vs/base/common/buffer';
-import files from 'vs/workbench/services/textfile/test/common/fixtures/files';
-import createSuite from 'vs/workbench/services/textfile/test/common/textFileService.io.test';
-import { isWeb } from 'vs/base/common/platform';
-import { IWorkingCopyFileService, WorkingCopyFileService } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
-import { WorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { workbenchInstantiationService, TestInMemoryFileSystemProvider, TestBrowserTextFileServiceWithEncodingOverrides } from '../../../../test/browser/workbenchTestServices.js';
+import { NullLogService } from '../../../../../platform/log/common/log.js';
+import { FileService } from '../../../../../platform/files/common/fileService.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { ITextFileService } from '../../common/textfiles.js';
+import { TextFileEditorModelManager } from '../../common/textFileEditorModelManager.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
+import { IFileService, IStat } from '../../../../../platform/files/common/files.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { join } from '../../../../../base/common/path.js';
+import { UTF16le, detectEncodingByBOMFromBuffer, UTF8_with_bom, UTF16be, toCanonicalName } from '../../common/encoding.js';
+import { VSBuffer } from '../../../../../base/common/buffer.js';
+import files from '../common/fixtures/files.js';
+import createSuite from '../common/textFileService.io.test.js';
+import { isWeb } from '../../../../../base/common/platform.js';
+import { IWorkingCopyFileService, WorkingCopyFileService } from '../../../workingCopy/common/workingCopyFileService.js';
+import { WorkingCopyService } from '../../../workingCopy/common/workingCopyService.js';
+import { UriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentityService.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 // optimization: we don't need to run this suite in native environment,
 // because we have nativeTextFileService.io.test.ts for it,
diff --git a/src/vs/workbench/services/textfile/test/browser/textEditorService.test.ts b/src/vs/workbench/services/textfile/test/browser/textEditorService.test.ts
index af8317daf52..93a6bdb8bcb 100644
--- a/src/vs/workbench/services/textfile/test/browser/textEditorService.test.ts
+++ b/src/vs/workbench/services/textfile/test/browser/textEditorService.test.ts
@@ -4,25 +4,25 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { IResourceDiffEditorInput, IResourceSideBySideEditorInput, isResourceDiffEditorInput, isResourceSideBySideEditorInput, isUntitledResourceEditorInput } from 'vs/workbench/common/editor';
-import { workbenchInstantiationService, registerTestEditor, TestFileEditorInput, registerTestResourceEditor, registerTestSideBySideEditor } from 'vs/workbench/test/browser/workbenchTestServices';
-import { TextResourceEditorInput } from 'vs/workbench/common/editor/textResourceEditorInput';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { FileEditorInput } from 'vs/workbench/contrib/files/browser/editors/fileEditorInput';
-import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
-import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from 'vs/base/test/common/utils';
-import { IFileService } from 'vs/platform/files/common/files';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { UntitledTextEditorModel } from 'vs/workbench/services/untitled/common/untitledTextEditorModel';
-import { NullFileSystemProvider } from 'vs/platform/files/test/common/nullFileSystemProvider';
-import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
-import { isLinux } from 'vs/base/common/platform';
-import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditorInput';
-import { ITextFileEditorModel } from 'vs/workbench/services/textfile/common/textfiles';
-import { TextEditorService } from 'vs/workbench/services/textfile/common/textEditorService';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
+import { URI } from '../../../../../base/common/uri.js';
+import { IResourceDiffEditorInput, IResourceSideBySideEditorInput, isResourceDiffEditorInput, isResourceSideBySideEditorInput, isUntitledResourceEditorInput } from '../../../../common/editor.js';
+import { workbenchInstantiationService, registerTestEditor, TestFileEditorInput, registerTestResourceEditor, registerTestSideBySideEditor } from '../../../../test/browser/workbenchTestServices.js';
+import { TextResourceEditorInput } from '../../../../common/editor/textResourceEditorInput.js';
+import { SyncDescriptor } from '../../../../../platform/instantiation/common/descriptors.js';
+import { FileEditorInput } from '../../../../contrib/files/browser/editors/fileEditorInput.js';
+import { UntitledTextEditorInput } from '../../../untitled/common/untitledTextEditorInput.js';
+import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from '../../../../../base/test/common/utils.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { UntitledTextEditorModel } from '../../../untitled/common/untitledTextEditorModel.js';
+import { NullFileSystemProvider } from '../../../../../platform/files/test/common/nullFileSystemProvider.js';
+import { DiffEditorInput } from '../../../../common/editor/diffEditorInput.js';
+import { isLinux } from '../../../../../base/common/platform.js';
+import { SideBySideEditorInput } from '../../../../common/editor/sideBySideEditorInput.js';
+import { ITextFileEditorModel } from '../../common/textfiles.js';
+import { TextEditorService } from '../../common/textEditorService.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
+import { EditorInput } from '../../../../common/editor/editorInput.js';
 
 suite('TextEditorService', () => {
 
diff --git a/src/vs/workbench/services/textfile/test/browser/textFileEditorModel.integrationTest.ts b/src/vs/workbench/services/textfile/test/browser/textFileEditorModel.integrationTest.ts
index 622f4e90151..cb9def21b19 100644
--- a/src/vs/workbench/services/textfile/test/browser/textFileEditorModel.integrationTest.ts
+++ b/src/vs/workbench/services/textfile/test/browser/textFileEditorModel.integrationTest.ts
@@ -4,16 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel';
-import { workbenchInstantiationService, TestServiceAccessor } from 'vs/workbench/test/browser/workbenchTestServices';
-import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from 'vs/base/test/common/utils';
-import { TextFileEditorModelManager } from 'vs/workbench/services/textfile/common/textFileEditorModelManager';
-import { createTextBufferFactoryFromStream } from 'vs/editor/common/model/textModel';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { URI } from 'vs/base/common/uri';
-import { bufferToStream, VSBuffer } from 'vs/base/common/buffer';
-import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { TextFileEditorModel } from '../../common/textFileEditorModel.js';
+import { workbenchInstantiationService, TestServiceAccessor } from '../../../../test/browser/workbenchTestServices.js';
+import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from '../../../../../base/test/common/utils.js';
+import { TextFileEditorModelManager } from '../../common/textFileEditorModelManager.js';
+import { createTextBufferFactoryFromStream } from '../../../../../editor/common/model/textModel.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { bufferToStream, VSBuffer } from '../../../../../base/common/buffer.js';
+import { DisposableStore, toDisposable } from '../../../../../base/common/lifecycle.js';
 
 suite('Files - TextFileEditorModel (integration)', () => {
 
diff --git a/src/vs/workbench/services/textfile/test/browser/textFileEditorModel.test.ts b/src/vs/workbench/services/textfile/test/browser/textFileEditorModel.test.ts
index e7d56251018..2a7acd660f7 100644
--- a/src/vs/workbench/services/textfile/test/browser/textFileEditorModel.test.ts
+++ b/src/vs/workbench/services/textfile/test/browser/textFileEditorModel.test.ts
@@ -4,22 +4,22 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel';
-import { EncodingMode, TextFileEditorModelState, snapshotToString, isTextFileEditorModel, ITextFileEditorModelSaveEvent } from 'vs/workbench/services/textfile/common/textfiles';
-import { createFileEditorInput, workbenchInstantiationService, TestServiceAccessor, TestReadonlyTextFileEditorModel, getLastResolvedFileStat } from 'vs/workbench/test/browser/workbenchTestServices';
-import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from 'vs/base/test/common/utils';
-import { TextFileEditorModelManager } from 'vs/workbench/services/textfile/common/textFileEditorModelManager';
-import { FileOperationResult, FileOperationError } from 'vs/platform/files/common/files';
-import { DeferredPromise, timeout } from 'vs/base/common/async';
-import { assertIsDefined } from 'vs/base/common/types';
-import { createTextBufferFactory } from 'vs/editor/common/model/textModel';
-import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { SaveReason, SaveSourceRegistry } from 'vs/workbench/common/editor';
-import { isEqual } from 'vs/base/common/resources';
-import { UTF16be } from 'vs/workbench/services/textfile/common/encoding';
-import { isWeb } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { TextFileEditorModel } from '../../common/textFileEditorModel.js';
+import { EncodingMode, TextFileEditorModelState, snapshotToString, isTextFileEditorModel, ITextFileEditorModelSaveEvent } from '../../common/textfiles.js';
+import { createFileEditorInput, workbenchInstantiationService, TestServiceAccessor, TestReadonlyTextFileEditorModel, getLastResolvedFileStat } from '../../../../test/browser/workbenchTestServices.js';
+import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from '../../../../../base/test/common/utils.js';
+import { TextFileEditorModelManager } from '../../common/textFileEditorModelManager.js';
+import { FileOperationResult, FileOperationError, NotModifiedSinceFileOperationError } from '../../../../../platform/files/common/files.js';
+import { DeferredPromise, timeout } from '../../../../../base/common/async.js';
+import { assertIsDefined } from '../../../../../base/common/types.js';
+import { createTextBufferFactory } from '../../../../../editor/common/model/textModel.js';
+import { DisposableStore, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { SaveReason, SaveSourceRegistry } from '../../../../common/editor.js';
+import { isEqual } from '../../../../../base/common/resources.js';
+import { UTF16be } from '../../common/encoding.js';
+import { isWeb } from '../../../../../base/common/platform.js';
+import { URI } from '../../../../../base/common/uri.js';
 
 suite('Files - TextFileEditorModel', () => {
 
@@ -359,9 +359,7 @@ suite('Files - TextFileEditorModel', () => {
 
 		model.setLanguageId(languageId);
 
-		await deferredPromise.p;
-
-		assert.strictEqual(model.getEncoding(), UTF16be);
+		await deferredPromise.p; // this asserts that the model was reloaded due to the language change
 	});
 
 	test('create with language', async function () {
@@ -608,6 +606,22 @@ suite('Files - TextFileEditorModel', () => {
 		assert.strictEqual(getLastModifiedTime(model), mtime);
 	});
 
+	test('stat.readonly and stat.locked can change when decreased mtime is ignored', async function () {
+		const model: TextFileEditorModel = disposables.add(instantiationService.createInstance(TextFileEditorModel, toResource.call(this, '/path/index_async.txt'), 'utf8', undefined));
+
+		await model.resolve();
+
+		const stat = assertIsDefined(getLastResolvedFileStat(model));
+		accessor.textFileService.setReadStreamErrorOnce(new NotModifiedSinceFileOperationError('error', { ...stat, mtime: stat.mtime - 1, readonly: !stat.readonly, locked: !stat.locked }));
+
+		await model.resolve();
+
+		assert.ok(model);
+		assert.strictEqual(getLastModifiedTime(model), stat.mtime, 'mtime should not decrease');
+		assert.notStrictEqual(getLastResolvedFileStat(model)?.readonly, stat.readonly, 'readonly should have changed despite simultaneous attempt to decrease mtime');
+		assert.notStrictEqual(getLastResolvedFileStat(model)?.locked, stat.locked, 'locked should have changed despite simultaneous attempt to decrease mtime');
+	});
+
 	test('Resolve error is handled gracefully if model already exists', async function () {
 		const model: TextFileEditorModel = disposables.add(instantiationService.createInstance(TextFileEditorModel, toResource.call(this, '/path/index_async.txt'), 'utf8', undefined));
 
diff --git a/src/vs/workbench/services/textfile/test/browser/textFileEditorModelManager.test.ts b/src/vs/workbench/services/textfile/test/browser/textFileEditorModelManager.test.ts
index 8c3c0574bf6..52e473530d4 100644
--- a/src/vs/workbench/services/textfile/test/browser/textFileEditorModelManager.test.ts
+++ b/src/vs/workbench/services/textfile/test/browser/textFileEditorModelManager.test.ts
@@ -4,17 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { workbenchInstantiationService, TestServiceAccessor, ITestTextFileEditorModelManager } from 'vs/workbench/test/browser/workbenchTestServices';
-import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel';
-import { FileChangesEvent, FileChangeType, FileOperationError, FileOperationResult } from 'vs/platform/files/common/files';
-import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from 'vs/base/test/common/utils';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { ITextFileEditorModel } from 'vs/workbench/services/textfile/common/textfiles';
-import { createTextBufferFactory } from 'vs/editor/common/model/textModel';
-import { timeout } from 'vs/base/common/async';
-import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
+import { URI } from '../../../../../base/common/uri.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { workbenchInstantiationService, TestServiceAccessor, ITestTextFileEditorModelManager } from '../../../../test/browser/workbenchTestServices.js';
+import { TextFileEditorModel } from '../../common/textFileEditorModel.js';
+import { FileChangesEvent, FileChangeType, FileOperationError, FileOperationResult } from '../../../../../platform/files/common/files.js';
+import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from '../../../../../base/test/common/utils.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../../../../../editor/common/languages/modesRegistry.js';
+import { ITextFileEditorModel } from '../../common/textfiles.js';
+import { createTextBufferFactory } from '../../../../../editor/common/model/textModel.js';
+import { timeout } from '../../../../../base/common/async.js';
+import { DisposableStore, toDisposable } from '../../../../../base/common/lifecycle.js';
 
 suite('Files - TextFileEditorModelManager', () => {
 
diff --git a/src/vs/workbench/services/textfile/test/browser/textFileService.test.ts b/src/vs/workbench/services/textfile/test/browser/textFileService.test.ts
index a1cc6f8bafc..18290d14a85 100644
--- a/src/vs/workbench/services/textfile/test/browser/textFileService.test.ts
+++ b/src/vs/workbench/services/textfile/test/browser/textFileService.test.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { workbenchInstantiationService, TestServiceAccessor, ITestTextFileEditorModelManager } from 'vs/workbench/test/browser/workbenchTestServices';
-import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from 'vs/base/test/common/utils';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel';
-import { FileOperation } from 'vs/platform/files/common/files';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import { workbenchInstantiationService, TestServiceAccessor, ITestTextFileEditorModelManager } from '../../../../test/browser/workbenchTestServices.js';
+import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from '../../../../../base/test/common/utils.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { TextFileEditorModel } from '../../common/textFileEditorModel.js';
+import { FileOperation } from '../../../../../platform/files/common/files.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
 
 suite('Files - TextFileService', () => {
 
diff --git a/src/vs/workbench/services/textfile/test/common/fixtures/files.ts b/src/vs/workbench/services/textfile/test/common/fixtures/files.ts
index 3167d521985..255130f4ea2 100644
--- a/src/vs/workbench/services/textfile/test/common/fixtures/files.ts
+++ b/src/vs/workbench/services/textfile/test/common/fixtures/files.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { range } from 'vs/base/common/arrays';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { UTF8_BOM } from 'vs/workbench/services/textfile/common/encoding';
+import { range } from '../../../../../../base/common/arrays.js';
+import { VSBuffer } from '../../../../../../base/common/buffer.js';
+import { UTF8_BOM } from '../../../common/encoding.js';
 
 const fixtures: { [filename: string]: Uint8Array } = {};
 
diff --git a/src/vs/workbench/services/textfile/test/common/textFileService.io.test.ts b/src/vs/workbench/services/textfile/test/common/textFileService.io.test.ts
index 47aa789ae2a..e206e83699a 100644
--- a/src/vs/workbench/services/textfile/test/common/textFileService.io.test.ts
+++ b/src/vs/workbench/services/textfile/test/common/textFileService.io.test.ts
@@ -4,16 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ITextFileService, snapshotToString, TextFileOperationError, TextFileOperationResult, stringToSnapshot } from 'vs/workbench/services/textfile/common/textfiles';
-import { URI } from 'vs/base/common/uri';
-import { join, basename } from 'vs/base/common/path';
-import { UTF16le, UTF8_with_bom, UTF16be, UTF8, UTF16le_BOM, UTF16be_BOM, UTF8_BOM } from 'vs/workbench/services/textfile/common/encoding';
-import { bufferToStream, VSBuffer } from 'vs/base/common/buffer';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
-import { ITextSnapshot, DefaultEndOfLine } from 'vs/editor/common/model';
-import { isWindows } from 'vs/base/common/platform';
-import { createTextBufferFactoryFromStream } from 'vs/editor/common/model/textModel';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import { ITextFileService, snapshotToString, TextFileOperationError, TextFileOperationResult, stringToSnapshot } from '../../common/textfiles.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { join, basename } from '../../../../../base/common/path.js';
+import { UTF16le, UTF8_with_bom, UTF16be, UTF8, UTF16le_BOM, UTF16be_BOM, UTF8_BOM } from '../../common/encoding.js';
+import { bufferToStream, VSBuffer } from '../../../../../base/common/buffer.js';
+import { createTextModel } from '../../../../../editor/test/common/testTextModel.js';
+import { ITextSnapshot, DefaultEndOfLine } from '../../../../../editor/common/model.js';
+import { isWindows } from '../../../../../base/common/platform.js';
+import { createTextBufferFactoryFromStream } from '../../../../../editor/common/model/textModel.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
 
 export interface Params {
 	setup(): Promise<{
diff --git a/src/vs/workbench/services/textfile/test/electron-sandbox/nativeTextFileService.io.test.ts b/src/vs/workbench/services/textfile/test/electron-sandbox/nativeTextFileService.io.test.ts
index f3b05c01014..9be96d96683 100644
--- a/src/vs/workbench/services/textfile/test/electron-sandbox/nativeTextFileService.io.test.ts
+++ b/src/vs/workbench/services/textfile/test/electron-sandbox/nativeTextFileService.io.test.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { NullLogService } from 'vs/platform/log/common/log';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { Schemas } from 'vs/base/common/network';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { TextFileEditorModelManager } from 'vs/workbench/services/textfile/common/textFileEditorModelManager';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IFileService, IStat } from 'vs/platform/files/common/files';
-import { URI } from 'vs/base/common/uri';
-import { join } from 'vs/base/common/path';
-import { UTF16le, detectEncodingByBOMFromBuffer, UTF8_with_bom, UTF16be, toCanonicalName } from 'vs/workbench/services/textfile/common/encoding';
-import { VSBuffer } from 'vs/base/common/buffer';
-import files from 'vs/workbench/services/textfile/test/common/fixtures/files';
-import createSuite from 'vs/workbench/services/textfile/test/common/textFileService.io.test';
-import { IWorkingCopyFileService, WorkingCopyFileService } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
-import { WorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { TestInMemoryFileSystemProvider } from 'vs/workbench/test/browser/workbenchTestServices';
-import { TestNativeTextFileServiceWithEncodingOverrides, workbenchInstantiationService } from 'vs/workbench/test/electron-sandbox/workbenchTestServices';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { NullLogService } from '../../../../../platform/log/common/log.js';
+import { FileService } from '../../../../../platform/files/common/fileService.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { ITextFileService } from '../../common/textfiles.js';
+import { TextFileEditorModelManager } from '../../common/textFileEditorModelManager.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
+import { IFileService, IStat } from '../../../../../platform/files/common/files.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { join } from '../../../../../base/common/path.js';
+import { UTF16le, detectEncodingByBOMFromBuffer, UTF8_with_bom, UTF16be, toCanonicalName } from '../../common/encoding.js';
+import { VSBuffer } from '../../../../../base/common/buffer.js';
+import files from '../common/fixtures/files.js';
+import createSuite from '../common/textFileService.io.test.js';
+import { IWorkingCopyFileService, WorkingCopyFileService } from '../../../workingCopy/common/workingCopyFileService.js';
+import { WorkingCopyService } from '../../../workingCopy/common/workingCopyService.js';
+import { UriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentityService.js';
+import { TestInMemoryFileSystemProvider } from '../../../../test/browser/workbenchTestServices.js';
+import { TestNativeTextFileServiceWithEncodingOverrides, workbenchInstantiationService } from '../../../../test/electron-sandbox/workbenchTestServices.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('Files - NativeTextFileService i/o', function () {
 	const disposables = new DisposableStore();
diff --git a/src/vs/workbench/services/textfile/test/electron-sandbox/nativeTextFileService.test.ts b/src/vs/workbench/services/textfile/test/electron-sandbox/nativeTextFileService.test.ts
index a767ca64fba..91250289f3a 100644
--- a/src/vs/workbench/services/textfile/test/electron-sandbox/nativeTextFileService.test.ts
+++ b/src/vs/workbench/services/textfile/test/electron-sandbox/nativeTextFileService.test.ts
@@ -4,22 +4,22 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { IFileService } from 'vs/platform/files/common/files';
-import { TextFileEditorModelManager } from 'vs/workbench/services/textfile/common/textFileEditorModelManager';
-import { Schemas } from 'vs/base/common/network';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { TestNativeTextFileServiceWithEncodingOverrides, TestServiceAccessor, workbenchInstantiationService } from 'vs/workbench/test/electron-sandbox/workbenchTestServices';
-import { IWorkingCopyFileService, WorkingCopyFileService } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
-import { WorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel';
-import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from 'vs/base/test/common/utils';
+import { ITextFileService } from '../../common/textfiles.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { TextFileEditorModelManager } from '../../common/textFileEditorModelManager.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { FileService } from '../../../../../platform/files/common/fileService.js';
+import { NullLogService } from '../../../../../platform/log/common/log.js';
+import { TestNativeTextFileServiceWithEncodingOverrides, TestServiceAccessor, workbenchInstantiationService } from '../../../../test/electron-sandbox/workbenchTestServices.js';
+import { IWorkingCopyFileService, WorkingCopyFileService } from '../../../workingCopy/common/workingCopyFileService.js';
+import { WorkingCopyService } from '../../../workingCopy/common/workingCopyService.js';
+import { UriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentityService.js';
+import { InMemoryFileSystemProvider } from '../../../../../platform/files/common/inMemoryFilesystemProvider.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { TextFileEditorModel } from '../../common/textFileEditorModel.js';
+import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from '../../../../../base/test/common/utils.js';
 
 suite('Files - NativeTextFileService', function () {
 	const disposables = new DisposableStore();
diff --git a/src/vs/workbench/services/textfile/test/node/encoding/encoding.integrationTest.ts b/src/vs/workbench/services/textfile/test/node/encoding/encoding.integrationTest.ts
index ebaeb4ab36c..07ad85d6ea7 100644
--- a/src/vs/workbench/services/textfile/test/node/encoding/encoding.integrationTest.ts
+++ b/src/vs/workbench/services/textfile/test/node/encoding/encoding.integrationTest.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import * as terminalEncoding from 'vs/base/node/terminalEncoding';
-import * as encoding from 'vs/workbench/services/textfile/common/encoding';
+import * as terminalEncoding from '../../../../../../base/node/terminalEncoding.js';
+import * as encoding from '../../../common/encoding.js';
 
 suite('Encoding', function () {
 
diff --git a/src/vs/workbench/services/textfile/test/node/encoding/encoding.test.ts b/src/vs/workbench/services/textfile/test/node/encoding/encoding.test.ts
index 6806b4e1c56..ec9420b6c3d 100644
--- a/src/vs/workbench/services/textfile/test/node/encoding/encoding.test.ts
+++ b/src/vs/workbench/services/textfile/test/node/encoding/encoding.test.ts
@@ -5,13 +5,13 @@
 
 import assert from 'assert';
 import * as fs from 'fs';
-import * as encoding from 'vs/workbench/services/textfile/common/encoding';
-import * as streams from 'vs/base/common/stream';
-import { newWriteableBufferStream, VSBuffer, VSBufferReadableStream, streamToBufferReadableStream } from 'vs/base/common/buffer';
-import { splitLines } from 'vs/base/common/strings';
-import { FileAccess } from 'vs/base/common/network';
-import { importAMDNodeModule } from 'vs/amdX';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import * as encoding from '../../../common/encoding.js';
+import * as streams from '../../../../../../base/common/stream.js';
+import { newWriteableBufferStream, VSBuffer, VSBufferReadableStream, streamToBufferReadableStream } from '../../../../../../base/common/buffer.js';
+import { splitLines } from '../../../../../../base/common/strings.js';
+import { FileAccess } from '../../../../../../base/common/network.js';
+import { importAMDNodeModule } from '../../../../../../amdX.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
 
 export async function detectEncodingByBOM(file: string): Promise<typeof encoding.UTF16be | typeof encoding.UTF16le | typeof encoding.UTF8_with_bom | null> {
 	try {
diff --git a/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts b/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts
index 620abdc7e88..1108dbd1337 100644
--- a/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts
+++ b/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ITextModel } from 'vs/editor/common/model';
-import { IDisposable, toDisposable, IReference, ReferenceCollection, Disposable, AsyncReferenceCollection } from 'vs/base/common/lifecycle';
-import { IModelService } from 'vs/editor/common/services/model';
-import { TextResourceEditorModel } from 'vs/workbench/common/editor/textResourceEditorModel';
-import { ITextFileService, TextFileResolveReason } from 'vs/workbench/services/textfile/common/textfiles';
-import { Schemas } from 'vs/base/common/network';
-import { ITextModelService, ITextModelContentProvider, ITextEditorModel, IResolvedTextEditorModel, isResolvedTextEditorModel } from 'vs/editor/common/services/resolverService';
-import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel';
-import { IFileService } from 'vs/platform/files/common/files';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
-import { ModelUndoRedoParticipant } from 'vs/editor/common/services/modelUndoRedoParticipant';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { UntitledTextEditorModel } from 'vs/workbench/services/untitled/common/untitledTextEditorModel';
+import { URI } from '../../../../base/common/uri.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { IDisposable, toDisposable, IReference, ReferenceCollection, Disposable, AsyncReferenceCollection } from '../../../../base/common/lifecycle.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { TextResourceEditorModel } from '../../../common/editor/textResourceEditorModel.js';
+import { ITextFileService, TextFileResolveReason } from '../../textfile/common/textfiles.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { ITextModelService, ITextModelContentProvider, ITextEditorModel, IResolvedTextEditorModel, isResolvedTextEditorModel } from '../../../../editor/common/services/resolverService.js';
+import { TextFileEditorModel } from '../../textfile/common/textFileEditorModel.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IUndoRedoService } from '../../../../platform/undoRedo/common/undoRedo.js';
+import { ModelUndoRedoParticipant } from '../../../../editor/common/services/modelUndoRedoParticipant.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { UntitledTextEditorModel } from '../../untitled/common/untitledTextEditorModel.js';
 
 class ResourceModelCollection extends ReferenceCollection<Promise<IResolvedTextEditorModel>> {
 
diff --git a/src/vs/workbench/services/textmodelResolver/test/browser/textModelResolverService.test.ts b/src/vs/workbench/services/textmodelResolver/test/browser/textModelResolverService.test.ts
index 34d9c854314..5d52910b089 100644
--- a/src/vs/workbench/services/textmodelResolver/test/browser/textModelResolverService.test.ts
+++ b/src/vs/workbench/services/textmodelResolver/test/browser/textModelResolverService.test.ts
@@ -4,21 +4,21 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ITextModel } from 'vs/editor/common/model';
-import { URI } from 'vs/base/common/uri';
-import { TextResourceEditorInput } from 'vs/workbench/common/editor/textResourceEditorInput';
-import { TextResourceEditorModel } from 'vs/workbench/common/editor/textResourceEditorModel';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { workbenchInstantiationService, TestServiceAccessor, ITestTextFileEditorModelManager } from 'vs/workbench/test/browser/workbenchTestServices';
-import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from 'vs/base/test/common/utils';
-import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel';
-import { snapshotToString } from 'vs/workbench/services/textfile/common/textfiles';
-import { TextFileEditorModelManager } from 'vs/workbench/services/textfile/common/textFileEditorModelManager';
-import { Event } from 'vs/base/common/event';
-import { timeout } from 'vs/base/common/async';
-import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
-import { createTextBufferFactory } from 'vs/editor/common/model/textModel';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import { ITextModel } from '../../../../../editor/common/model.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { TextResourceEditorInput } from '../../../../common/editor/textResourceEditorInput.js';
+import { TextResourceEditorModel } from '../../../../common/editor/textResourceEditorModel.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { workbenchInstantiationService, TestServiceAccessor, ITestTextFileEditorModelManager } from '../../../../test/browser/workbenchTestServices.js';
+import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from '../../../../../base/test/common/utils.js';
+import { TextFileEditorModel } from '../../../textfile/common/textFileEditorModel.js';
+import { snapshotToString } from '../../../textfile/common/textfiles.js';
+import { TextFileEditorModelManager } from '../../../textfile/common/textFileEditorModelManager.js';
+import { Event } from '../../../../../base/common/event.js';
+import { timeout } from '../../../../../base/common/async.js';
+import { UntitledTextEditorInput } from '../../../untitled/common/untitledTextEditorInput.js';
+import { createTextBufferFactory } from '../../../../../editor/common/model/textModel.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
 
 suite('Workbench - TextModelResolverService', () => {
 
diff --git a/src/vs/workbench/services/textresourceProperties/common/textResourcePropertiesService.ts b/src/vs/workbench/services/textresourceProperties/common/textResourcePropertiesService.ts
index 0118d3d4e27..e738c3494ec 100644
--- a/src/vs/workbench/services/textresourceProperties/common/textResourcePropertiesService.ts
+++ b/src/vs/workbench/services/textresourceProperties/common/textResourcePropertiesService.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfiguration';
-import { OperatingSystem, OS } from 'vs/base/common/platform';
-import { Schemas } from 'vs/base/common/network';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IRemoteAgentEnvironment } from 'vs/platform/remote/common/remoteAgentEnvironment';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
+import { URI } from '../../../../base/common/uri.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ITextResourcePropertiesService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { OperatingSystem, OS } from '../../../../base/common/platform.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IRemoteAgentEnvironment } from '../../../../platform/remote/common/remoteAgentEnvironment.js';
+import { IRemoteAgentService } from '../../remote/common/remoteAgentService.js';
 
 export class TextResourcePropertiesService implements ITextResourcePropertiesService {
 
diff --git a/src/vs/workbench/services/themes/browser/browserHostColorSchemeService.ts b/src/vs/workbench/services/themes/browser/browserHostColorSchemeService.ts
index ca31f33374f..5d4d12c90e0 100644
--- a/src/vs/workbench/services/themes/browser/browserHostColorSchemeService.ts
+++ b/src/vs/workbench/services/themes/browser/browserHostColorSchemeService.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { addMatchMediaChangeListener } from 'vs/base/browser/browser';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IHostColorSchemeService } from 'vs/workbench/services/themes/common/hostColorSchemeService';
-import { mainWindow } from 'vs/base/browser/window';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { addMatchMediaChangeListener } from '../../../../base/browser/browser.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IHostColorSchemeService } from '../common/hostColorSchemeService.js';
+import { mainWindow } from '../../../../base/browser/window.js';
 
 export class BrowserHostColorSchemeService extends Disposable implements IHostColorSchemeService {
 
diff --git a/src/vs/workbench/services/themes/browser/fileIconThemeData.ts b/src/vs/workbench/services/themes/browser/fileIconThemeData.ts
index ae2c1c6cd0b..f7f38038aeb 100644
--- a/src/vs/workbench/services/themes/browser/fileIconThemeData.ts
+++ b/src/vs/workbench/services/themes/browser/fileIconThemeData.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import * as nls from 'vs/nls';
-import * as paths from 'vs/base/common/path';
-import * as resources from 'vs/base/common/resources';
-import * as Json from 'vs/base/common/json';
-import { ExtensionData, IThemeExtensionPoint, IWorkbenchFileIconTheme } from 'vs/workbench/services/themes/common/workbenchThemeService';
-import { getParseErrorMessage } from 'vs/base/common/jsonErrorMessages';
-import { asCSSUrl } from 'vs/base/browser/dom';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IExtensionResourceLoaderService } from 'vs/platform/extensionResourceLoader/common/extensionResourceLoader';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { mainWindow } from 'vs/base/browser/window';
+import { URI } from '../../../../base/common/uri.js';
+import * as nls from '../../../../nls.js';
+import * as paths from '../../../../base/common/path.js';
+import * as resources from '../../../../base/common/resources.js';
+import * as Json from '../../../../base/common/json.js';
+import { ExtensionData, IThemeExtensionPoint, IWorkbenchFileIconTheme } from '../common/workbenchThemeService.js';
+import { getParseErrorMessage } from '../../../../base/common/jsonErrorMessages.js';
+import { asCSSUrl } from '../../../../base/browser/dom.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IExtensionResourceLoaderService } from '../../../../platform/extensionResourceLoader/common/extensionResourceLoader.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { mainWindow } from '../../../../base/browser/window.js';
 
 export class FileIconThemeData implements IWorkbenchFileIconTheme {
 
@@ -395,23 +395,28 @@ export class FileIconThemeLoader {
 		const fonts = iconThemeDocument.fonts;
 		const fontSizes = new Map<string, string>();
 		if (Array.isArray(fonts)) {
-			const defaultFontSize = fonts[0].size || '150%';
+			const defaultFontSize = this.tryNormalizeFontSize(fonts[0].size) || '150%';
 			fonts.forEach(font => {
 				const src = font.src.map(l => `${asCSSUrl(resolvePath(l.path))} format('${l.format}')`).join(', ');
 				cssRules.push(`@font-face { src: ${src}; font-family: '${font.id}'; font-weight: ${font.weight}; font-style: ${font.style}; font-display: block; }`);
-				if (font.size !== undefined && font.size !== defaultFontSize) {
-					fontSizes.set(font.id, font.size);
+
+				const fontSize = this.tryNormalizeFontSize(font.size);
+				if (fontSize !== undefined && fontSize !== defaultFontSize) {
+					fontSizes.set(font.id, fontSize);
 				}
 			});
 			cssRules.push(`.show-file-icons .file-icon::before, .show-file-icons .folder-icon::before, .show-file-icons .rootfolder-icon::before { font-family: '${fonts[0].id}'; font-size: ${defaultFontSize}; }`);
 		}
 
+		// Use emQuads to prevent the icon from collapsing to zero height for image icons
+		const emQuad = '\\2001';
+
 		for (const defId in selectorByDefinitionId) {
 			const selectors = selectorByDefinitionId[defId];
 			const definition = iconThemeDocument.iconDefinitions[defId];
 			if (definition) {
 				if (definition.iconPath) {
-					cssRules.push(`${selectors.join(', ')} { content: ' '; background-image: ${asCSSUrl(resolvePath(definition.iconPath))}; }`);
+					cssRules.push(`${selectors.join(', ')} { content: '${emQuad}'; background-image: ${asCSSUrl(resolvePath(definition.iconPath))}; }`);
 				} else if (definition.fontCharacter || definition.fontColor) {
 					const body = [];
 					if (definition.fontColor) {
@@ -441,8 +446,8 @@ export class FileIconThemeLoader {
 					const icon = this.languageService.getIcon(languageId);
 					if (icon) {
 						const selector = `.show-file-icons .${escapeCSS(languageId)}-lang-file-icon.file-icon::before`;
-						cssRules.push(`${selector} { content: ' '; background-image: ${asCSSUrl(icon.dark)}; }`);
-						cssRules.push(`.vs ${selector} { content: ' '; background-image: ${asCSSUrl(icon.light)}; }`);
+						cssRules.push(`${selector} { content: '${emQuad}'; background-image: ${asCSSUrl(icon.dark)}; }`);
+						cssRules.push(`.vs ${selector} { content: '${emQuad}'; background-image: ${asCSSUrl(icon.light)}; }`);
 					}
 				}
 			}
@@ -452,6 +457,27 @@ export class FileIconThemeLoader {
 		return result;
 	}
 
+	/**
+	 * Try converting absolute font sizes to relative values.
+	 *
+	 * This allows them to be scaled nicely depending on where they are used.
+	 */
+	private tryNormalizeFontSize(size: string | undefined): string | undefined {
+		if (!size) {
+			return undefined;
+		}
+
+		const defaultFontSizeInPx = 13;
+
+		if (size.endsWith('px')) {
+			const value = parseInt(size, 10);
+			if (!isNaN(value)) {
+				return Math.round((value / defaultFontSizeInPx) * 100) + '%';
+			}
+		}
+
+		return size;
+	}
 }
 
 function handleParentFolder(key: string, selectors: string[]): string {
@@ -465,6 +491,6 @@ function handleParentFolder(key: string, selectors: string[]): string {
 }
 
 function escapeCSS(str: string) {
-	str = str.replace(/[\x11\x12\x14\x15\x40]/g, '/'); // HTML class names can not contain certain whitespace characters, use / instead, which doesn't exist in file names.
+	str = str.replace(/[\s]/g, '/'); // HTML class names can not contain certain whitespace characters (https://dom.spec.whatwg.org/#interface-domtokenlist), use / instead, which doesn't exist in file names.
 	return mainWindow.CSS.escape(str);
 }
diff --git a/src/vs/workbench/services/themes/browser/productIconThemeData.ts b/src/vs/workbench/services/themes/browser/productIconThemeData.ts
index 98de9b94fc8..0781c91a3a0 100644
--- a/src/vs/workbench/services/themes/browser/productIconThemeData.ts
+++ b/src/vs/workbench/services/themes/browser/productIconThemeData.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import * as nls from 'vs/nls';
-import * as Paths from 'vs/base/common/path';
-import * as resources from 'vs/base/common/resources';
-import * as Json from 'vs/base/common/json';
-import { ExtensionData, IThemeExtensionPoint, IWorkbenchProductIconTheme, ThemeSettingDefaults } from 'vs/workbench/services/themes/common/workbenchThemeService';
-import { getParseErrorMessage } from 'vs/base/common/jsonErrorMessages';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { fontIdRegex, fontWeightRegex, fontStyleRegex, fontFormatRegex } from 'vs/workbench/services/themes/common/productIconThemeSchema';
-import { isObject, isString } from 'vs/base/common/types';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IconDefinition, getIconRegistry, IconContribution, IconFontDefinition, IconFontSource } from 'vs/platform/theme/common/iconRegistry';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IExtensionResourceLoaderService } from 'vs/platform/extensionResourceLoader/common/extensionResourceLoader';
+import { URI } from '../../../../base/common/uri.js';
+import * as nls from '../../../../nls.js';
+import * as Paths from '../../../../base/common/path.js';
+import * as resources from '../../../../base/common/resources.js';
+import * as Json from '../../../../base/common/json.js';
+import { ExtensionData, IThemeExtensionPoint, IWorkbenchProductIconTheme, ThemeSettingDefaults } from '../common/workbenchThemeService.js';
+import { getParseErrorMessage } from '../../../../base/common/jsonErrorMessages.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { fontIdRegex, fontWeightRegex, fontStyleRegex, fontFormatRegex } from '../common/productIconThemeSchema.js';
+import { isObject, isString } from '../../../../base/common/types.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IconDefinition, getIconRegistry, IconContribution, IconFontDefinition, IconFontSource } from '../../../../platform/theme/common/iconRegistry.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { IExtensionResourceLoaderService } from '../../../../platform/extensionResourceLoader/common/extensionResourceLoader.js';
 
 export const DEFAULT_PRODUCT_ICON_THEME_ID = ''; // TODO
 
diff --git a/src/vs/workbench/services/themes/browser/workbenchThemeService.ts b/src/vs/workbench/services/themes/browser/workbenchThemeService.ts
index 327b1d9133a..857cf6f5415 100644
--- a/src/vs/workbench/services/themes/browser/workbenchThemeService.ts
+++ b/src/vs/workbench/services/themes/browser/workbenchThemeService.ts
@@ -3,45 +3,45 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import * as types from 'vs/base/common/types';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IWorkbenchThemeService, IWorkbenchColorTheme, IWorkbenchFileIconTheme, ExtensionData, VS_LIGHT_THEME, VS_DARK_THEME, VS_HC_THEME, VS_HC_LIGHT_THEME, ThemeSettings, IWorkbenchProductIconTheme, ThemeSettingTarget, ThemeSettingDefaults, COLOR_THEME_DARK_INITIAL_COLORS, COLOR_THEME_LIGHT_INITIAL_COLORS } from 'vs/workbench/services/themes/common/workbenchThemeService';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { Registry } from 'vs/platform/registry/common/platform';
-import * as errors from 'vs/base/common/errors';
-import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
-import { ColorThemeData } from 'vs/workbench/services/themes/common/colorThemeData';
-import { IColorTheme, Extensions as ThemingExtensions, IThemingRegistry } from 'vs/platform/theme/common/themeService';
-import { Event, Emitter } from 'vs/base/common/event';
-import { registerFileIconThemeSchemas } from 'vs/workbench/services/themes/common/fileIconThemeSchema';
-import { IDisposable, dispose, Disposable } from 'vs/base/common/lifecycle';
-import { FileIconThemeData, FileIconThemeLoader } from 'vs/workbench/services/themes/browser/fileIconThemeData';
-import { createStyleSheet } from 'vs/base/browser/dom';
-import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { IFileService, FileChangeType } from 'vs/platform/files/common/files';
-import { URI } from 'vs/base/common/uri';
-import * as resources from 'vs/base/common/resources';
-import { registerColorThemeSchemas } from 'vs/workbench/services/themes/common/colorThemeSchema';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { getRemoteAuthority } from 'vs/platform/remote/common/remoteHosts';
-import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
-import { IExtensionResourceLoaderService } from 'vs/platform/extensionResourceLoader/common/extensionResourceLoader';
-import { ThemeRegistry, registerColorThemeExtensionPoint, registerFileIconThemeExtensionPoint, registerProductIconThemeExtensionPoint } from 'vs/workbench/services/themes/common/themeExtensionPoints';
-import { updateColorThemeConfigurationSchemas, updateFileIconThemeConfigurationSchemas, ThemeConfiguration, updateProductIconThemeConfigurationSchemas } from 'vs/workbench/services/themes/common/themeConfiguration';
-import { ProductIconThemeData, DEFAULT_PRODUCT_ICON_THEME_ID } from 'vs/workbench/services/themes/browser/productIconThemeData';
-import { registerProductIconThemeSchemas } from 'vs/workbench/services/themes/common/productIconThemeSchema';
-import { ILogService } from 'vs/platform/log/common/log';
-import { isWeb } from 'vs/base/common/platform';
-import { ColorScheme } from 'vs/platform/theme/common/theme';
-import { IHostColorSchemeService } from 'vs/workbench/services/themes/common/hostColorSchemeService';
-import { RunOnceScheduler, Sequencer } from 'vs/base/common/async';
-import { IUserDataInitializationService } from 'vs/workbench/services/userData/browser/userDataInit';
-import { getIconsStyleSheet } from 'vs/platform/theme/browser/iconsStyleSheet';
-import { asCssVariableName, getColorRegistry } from 'vs/platform/theme/common/colorRegistry';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { mainWindow } from 'vs/base/browser/window';
+import * as nls from '../../../../nls.js';
+import * as types from '../../../../base/common/types.js';
+import { IExtensionService } from '../../extensions/common/extensions.js';
+import { IWorkbenchThemeService, IWorkbenchColorTheme, IWorkbenchFileIconTheme, ExtensionData, VS_LIGHT_THEME, VS_DARK_THEME, VS_HC_THEME, VS_HC_LIGHT_THEME, ThemeSettings, IWorkbenchProductIconTheme, ThemeSettingTarget, ThemeSettingDefaults, COLOR_THEME_DARK_INITIAL_COLORS, COLOR_THEME_LIGHT_INITIAL_COLORS } from '../common/workbenchThemeService.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import * as errors from '../../../../base/common/errors.js';
+import { IConfigurationService, ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
+import { ColorThemeData } from '../common/colorThemeData.js';
+import { IColorTheme, Extensions as ThemingExtensions, IThemingRegistry } from '../../../../platform/theme/common/themeService.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { registerFileIconThemeSchemas } from '../common/fileIconThemeSchema.js';
+import { IDisposable, dispose, Disposable } from '../../../../base/common/lifecycle.js';
+import { FileIconThemeData, FileIconThemeLoader } from './fileIconThemeData.js';
+import { createStyleSheet } from '../../../../base/browser/dom.js';
+import { IBrowserWorkbenchEnvironmentService } from '../../environment/browser/environmentService.js';
+import { IFileService, FileChangeType } from '../../../../platform/files/common/files.js';
+import { URI } from '../../../../base/common/uri.js';
+import * as resources from '../../../../base/common/resources.js';
+import { registerColorThemeSchemas } from '../common/colorThemeSchema.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { getRemoteAuthority } from '../../../../platform/remote/common/remoteHosts.js';
+import { IWorkbenchLayoutService } from '../../layout/browser/layoutService.js';
+import { IExtensionResourceLoaderService } from '../../../../platform/extensionResourceLoader/common/extensionResourceLoader.js';
+import { ThemeRegistry, registerColorThemeExtensionPoint, registerFileIconThemeExtensionPoint, registerProductIconThemeExtensionPoint } from '../common/themeExtensionPoints.js';
+import { updateColorThemeConfigurationSchemas, updateFileIconThemeConfigurationSchemas, ThemeConfiguration, updateProductIconThemeConfigurationSchemas } from '../common/themeConfiguration.js';
+import { ProductIconThemeData, DEFAULT_PRODUCT_ICON_THEME_ID } from './productIconThemeData.js';
+import { registerProductIconThemeSchemas } from '../common/productIconThemeSchema.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { isWeb } from '../../../../base/common/platform.js';
+import { ColorScheme } from '../../../../platform/theme/common/theme.js';
+import { IHostColorSchemeService } from '../common/hostColorSchemeService.js';
+import { RunOnceScheduler, Sequencer } from '../../../../base/common/async.js';
+import { IUserDataInitializationService } from '../../userData/browser/userDataInit.js';
+import { getIconsStyleSheet } from '../../../../platform/theme/browser/iconsStyleSheet.js';
+import { asCssVariableName, getColorRegistry } from '../../../../platform/theme/common/colorRegistry.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { mainWindow } from '../../../../base/browser/window.js';
 
 // implementation
 
diff --git a/src/vs/workbench/services/themes/common/colorExtensionPoint.ts b/src/vs/workbench/services/themes/common/colorExtensionPoint.ts
index 9a7bf4aa503..889c61bb08c 100644
--- a/src/vs/workbench/services/themes/common/colorExtensionPoint.ts
+++ b/src/vs/workbench/services/themes/common/colorExtensionPoint.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { IColorRegistry, Extensions as ColorRegistryExtensions } from 'vs/platform/theme/common/colorRegistry';
-import { Color } from 'vs/base/common/color';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Extensions, IExtensionFeatureTableRenderer, IExtensionFeaturesRegistry, IRenderedData, IRowData, ITableData } from 'vs/workbench/services/extensionManagement/common/extensionFeatures';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { IExtensionManifest } from 'vs/platform/extensions/common/extensions';
-import { MarkdownString } from 'vs/base/common/htmlContent';
+import * as nls from '../../../../nls.js';
+import { ExtensionsRegistry } from '../../extensions/common/extensionsRegistry.js';
+import { IColorRegistry, Extensions as ColorRegistryExtensions } from '../../../../platform/theme/common/colorRegistry.js';
+import { Color } from '../../../../base/common/color.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Extensions, IExtensionFeatureTableRenderer, IExtensionFeaturesRegistry, IRenderedData, IRowData, ITableData } from '../../extensionManagement/common/extensionFeatures.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { IExtensionManifest } from '../../../../platform/extensions/common/extensions.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
 
 interface IColorExtensionPoint {
 	id: string;
diff --git a/src/vs/workbench/services/themes/common/colorThemeData.ts b/src/vs/workbench/services/themes/common/colorThemeData.ts
index 6c2bd95258b..d6674cb5ab0 100644
--- a/src/vs/workbench/services/themes/common/colorThemeData.ts
+++ b/src/vs/workbench/services/themes/common/colorThemeData.ts
@@ -3,27 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { basename } from 'vs/base/common/path';
-import * as Json from 'vs/base/common/json';
-import { Color } from 'vs/base/common/color';
-import { ExtensionData, ITokenColorCustomizations, ITextMateThemingRule, IWorkbenchColorTheme, IColorMap, IThemeExtensionPoint, VS_LIGHT_THEME, VS_HC_THEME, IColorCustomizations, ISemanticTokenRules, ISemanticTokenColorizationSetting, ISemanticTokenColorCustomizations, IThemeScopableCustomizations, IThemeScopedCustomizations, THEME_SCOPE_CLOSE_PAREN, THEME_SCOPE_OPEN_PAREN, themeScopeRegex, THEME_SCOPE_WILDCARD, VS_HC_LIGHT_THEME } from 'vs/workbench/services/themes/common/workbenchThemeService';
-import { convertSettings } from 'vs/workbench/services/themes/common/themeCompatibility';
-import * as nls from 'vs/nls';
-import * as types from 'vs/base/common/types';
-import * as resources from 'vs/base/common/resources';
-import { Extensions as ColorRegistryExtensions, IColorRegistry, ColorIdentifier, editorBackground, editorForeground, DEFAULT_COLOR_CONFIG_VALUE } from 'vs/platform/theme/common/colorRegistry';
-import { ITokenStyle, getThemeTypeSelector } from 'vs/platform/theme/common/themeService';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { getParseErrorMessage } from 'vs/base/common/jsonErrorMessages';
-import { URI } from 'vs/base/common/uri';
-import { parse as parsePList } from 'vs/workbench/services/themes/common/plistParser';
-import { TokenStyle, SemanticTokenRule, ProbeScope, getTokenClassificationRegistry, TokenStyleValue, TokenStyleData, parseClassifierString } from 'vs/platform/theme/common/tokenClassificationRegistry';
-import { MatcherWithPriority, Matcher, createMatchers } from 'vs/workbench/services/themes/common/textMateScopeMatcher';
-import { IExtensionResourceLoaderService } from 'vs/platform/extensionResourceLoader/common/extensionResourceLoader';
-import { CharCode } from 'vs/base/common/charCode';
-import { StorageScope, IStorageService, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ThemeConfiguration } from 'vs/workbench/services/themes/common/themeConfiguration';
-import { ColorScheme } from 'vs/platform/theme/common/theme';
+import { basename } from '../../../../base/common/path.js';
+import * as Json from '../../../../base/common/json.js';
+import { Color } from '../../../../base/common/color.js';
+import { ExtensionData, ITokenColorCustomizations, ITextMateThemingRule, IWorkbenchColorTheme, IColorMap, IThemeExtensionPoint, VS_LIGHT_THEME, VS_HC_THEME, IColorCustomizations, ISemanticTokenRules, ISemanticTokenColorizationSetting, ISemanticTokenColorCustomizations, IThemeScopableCustomizations, IThemeScopedCustomizations, THEME_SCOPE_CLOSE_PAREN, THEME_SCOPE_OPEN_PAREN, themeScopeRegex, THEME_SCOPE_WILDCARD, VS_HC_LIGHT_THEME } from './workbenchThemeService.js';
+import { convertSettings } from './themeCompatibility.js';
+import * as nls from '../../../../nls.js';
+import * as types from '../../../../base/common/types.js';
+import * as resources from '../../../../base/common/resources.js';
+import { Extensions as ColorRegistryExtensions, IColorRegistry, ColorIdentifier, editorBackground, editorForeground, DEFAULT_COLOR_CONFIG_VALUE } from '../../../../platform/theme/common/colorRegistry.js';
+import { ITokenStyle, getThemeTypeSelector } from '../../../../platform/theme/common/themeService.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { getParseErrorMessage } from '../../../../base/common/jsonErrorMessages.js';
+import { URI } from '../../../../base/common/uri.js';
+import { parse as parsePList } from './plistParser.js';
+import { TokenStyle, SemanticTokenRule, ProbeScope, getTokenClassificationRegistry, TokenStyleValue, TokenStyleData, parseClassifierString } from '../../../../platform/theme/common/tokenClassificationRegistry.js';
+import { MatcherWithPriority, Matcher, createMatchers } from './textMateScopeMatcher.js';
+import { IExtensionResourceLoaderService } from '../../../../platform/extensionResourceLoader/common/extensionResourceLoader.js';
+import { CharCode } from '../../../../base/common/charCode.js';
+import { StorageScope, IStorageService, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { ThemeConfiguration } from './themeConfiguration.js';
+import { ColorScheme } from '../../../../platform/theme/common/theme.js';
+import { ColorId, FontStyle, MetadataConsts } from '../../../../editor/common/encodedTokenAttributes.js';
+import { toStandardTokenType } from '../../../../editor/common/languages/supports/tokenization.js';
 
 const colorRegistry = Registry.as<IColorRegistry>(ColorRegistryExtensions.ColorContribution);
 
@@ -45,6 +47,10 @@ export type TokenStyleDefinitions = { [P in keyof TokenStyleData]?: TokenStyleDe
 
 export type TextMateThemingRuleDefinitions = { [P in keyof TokenStyleData]?: ITextMateThemingRule | undefined; } & { scope?: ProbeScope };
 
+interface IColorOrDefaultMap {
+	[id: string]: Color | typeof DEFAULT_COLOR_CONFIG_VALUE;
+}
+
 export class ColorThemeData implements IWorkbenchColorTheme {
 
 	static readonly STORAGE_KEY = 'colorThemeData';
@@ -65,7 +71,7 @@ export class ColorThemeData implements IWorkbenchColorTheme {
 	private themeTokenColors: ITextMateThemingRule[] = [];
 	private customTokenColors: ITextMateThemingRule[] = [];
 	private colorMap: IColorMap = {};
-	private customColorMap: IColorMap = {};
+	private customColorMap: IColorOrDefaultMap = {};
 
 	private semanticTokenRules: SemanticTokenRule[] = [];
 	private customSemanticTokenRules: SemanticTokenRule[] = [];
@@ -132,15 +138,20 @@ export class ColorThemeData implements IWorkbenchColorTheme {
 	}
 
 	public getColor(colorId: ColorIdentifier, useDefault?: boolean): Color | undefined {
-		let color: Color | undefined = this.customColorMap[colorId];
-		if (color) {
-			return color;
+		const customColor = this.customColorMap[colorId];
+		if (customColor instanceof Color) {
+			return customColor;
 		}
-		color = this.colorMap[colorId];
-		if (useDefault !== false && types.isUndefined(color)) {
-			color = this.getDefault(colorId);
+		if (customColor === undefined) { /* !== DEFAULT_COLOR_CONFIG_VALUE */
+			const color = this.colorMap[colorId];
+			if (color !== undefined) {
+				return color;
+			}
 		}
-		return color;
+		if (useDefault !== false) {
+			return this.getDefault(colorId);
+		}
+		return undefined;
 	}
 
 	private getTokenStyle(type: string, modifiers: string[], language: string, useDefault = true, definitions: TokenStyleDefinitions = {}): TokenStyle | undefined {
@@ -236,7 +247,7 @@ export class ColorThemeData implements IWorkbenchColorTheme {
 		return undefined;
 	}
 
-	private getTokenColorIndex(): TokenColorIndex {
+	public getTokenColorIndex(): TokenColorIndex {
 		// collect all colors that tokens can have
 		if (!this.tokenColorIndex) {
 			const index = new TokenColorIndex();
@@ -346,7 +357,11 @@ export class ColorThemeData implements IWorkbenchColorTheme {
 	}
 
 	public defines(colorId: ColorIdentifier): boolean {
-		return this.customColorMap.hasOwnProperty(colorId) || this.colorMap.hasOwnProperty(colorId);
+		const customColor = this.customColorMap[colorId];
+		if (customColor instanceof Color) {
+			return true;
+		}
+		return customColor === undefined /* !== DEFAULT_COLOR_CONFIG_VALUE */ && this.colorMap.hasOwnProperty(colorId);
 	}
 
 	public setCustomizations(settings: ThemeConfiguration) {
@@ -373,7 +388,7 @@ export class ColorThemeData implements IWorkbenchColorTheme {
 		for (const id in colors) {
 			const colorVal = colors[id];
 			if (colorVal === DEFAULT_COLOR_CONFIG_VALUE) {
-				delete this.colorMap[id];
+				this.customColorMap[id] = DEFAULT_COLOR_CONFIG_VALUE;
 			} else if (typeof colorVal === 'string') {
 				this.customColorMap[id] = Color.fromHex(colorVal);
 			}
@@ -719,9 +734,9 @@ async function _loadColorTheme(extensionResourceLoaderService: IExtensionResourc
 			// new JSON color themes format
 			for (const colorId in colors) {
 				const colorVal = colors[colorId];
-				if (colorVal === DEFAULT_COLOR_CONFIG_VALUE) {
+				if (colorVal === DEFAULT_COLOR_CONFIG_VALUE) { // ignore colors that are set to to default
 					delete result.colors[colorId];
-				} else if (typeof colorVal === 'string') { // ignore colors that are null
+				} else if (typeof colorVal === 'string') {
 					result.colors[colorId] = Color.fromHex(colors[colorId]);
 				}
 			}
@@ -801,34 +816,25 @@ const defaultThemeColors: { [baseTheme: string]: ITextMateThemingRule[] } = {
 
 const noMatch = (_scope: ProbeScope) => -1;
 
-function nameMatcher(identifers: string[], scope: ProbeScope): number {
-	function findInIdents(s: string, lastIndent: number): number {
-		for (let i = lastIndent - 1; i >= 0; i--) {
-			if (scopesAreMatching(s, identifers[i])) {
-				return i;
-			}
-		}
+function nameMatcher(identifiers: string[], scopes: ProbeScope): number {
+	if (scopes.length < identifiers.length) {
 		return -1;
 	}
-	if (scope.length < identifers.length) {
-		return -1;
-	}
-	let lastScopeIndex = scope.length - 1;
-	let lastIdentifierIndex = findInIdents(scope[lastScopeIndex--], identifers.length);
-	if (lastIdentifierIndex >= 0) {
-		const score = (lastIdentifierIndex + 1) * 0x10000 + identifers[lastIdentifierIndex].length;
-		while (lastScopeIndex >= 0) {
-			lastIdentifierIndex = findInIdents(scope[lastScopeIndex--], lastIdentifierIndex);
-			if (lastIdentifierIndex === -1) {
-				return -1;
+
+	let lastIndex = 0;
+	let score: number | undefined = undefined;
+	const every = identifiers.every((identifier, identifierIndex) => {
+		for (let i = lastIndex; i < scopes.length; i++) {
+			if (scopesAreMatching(scopes[i], identifier)) {
+				score = (identifierIndex + 1) * 0x10000 + identifier.length;
+				lastIndex = i + 1;
+				return true;
 			}
 		}
-		return score;
-	}
-	return -1;
+		return false;
+	});
+	return every && score !== undefined ? score : -1;
 }
-
-
 function scopesAreMatching(thisScopeName: string, scopeName: string): boolean {
 	if (!thisScopeName) {
 		return false;
@@ -885,6 +891,39 @@ function isSemanticTokenColorizationSetting(style: any): style is ISemanticToken
 		|| types.isBoolean(style.underline) || types.isBoolean(style.strikethrough) || types.isBoolean(style.bold));
 }
 
+export function findMetadata(colorThemeData: ColorThemeData, captureNames: string[], languageId: number): number {
+	let metadata = 0;
+
+	metadata |= (languageId << MetadataConsts.LANGUAGEID_OFFSET);
+
+	const definitions: TextMateThemingRuleDefinitions = {};
+	const tokenStyle = colorThemeData.resolveScopes([captureNames], definitions);
+
+	if (captureNames.length > 0) {
+		const standardToken = toStandardTokenType(captureNames[captureNames.length - 1]);
+		metadata |= (standardToken << MetadataConsts.TOKEN_TYPE_OFFSET);
+	}
+
+	switch (definitions.foreground?.settings.fontStyle) {
+		case 'italic':
+			metadata |= FontStyle.Italic | MetadataConsts.ITALIC_MASK;
+			break;
+		case 'bold':
+			metadata |= FontStyle.Bold | MetadataConsts.BOLD_MASK;
+			break;
+		case 'underline':
+			metadata |= FontStyle.Underline | MetadataConsts.UNDERLINE_MASK;
+			break;
+		case 'strikethrough':
+			metadata |= FontStyle.Strikethrough | MetadataConsts.STRIKETHROUGH_MASK;
+			break;
+	}
+	const foreground = tokenStyle?.foreground;
+	const tokenStyleForeground = (foreground !== undefined) ? colorThemeData.getTokenColorIndex().get(foreground) : ColorId.DefaultForeground;
+	metadata |= tokenStyleForeground << MetadataConsts.FOREGROUND_OFFSET;
+
+	return metadata;
+}
 
 class TokenColorIndex {
 
diff --git a/src/vs/workbench/services/themes/common/colorThemeSchema.ts b/src/vs/workbench/services/themes/common/colorThemeSchema.ts
index 4824020a87c..bb0bdeae99d 100644
--- a/src/vs/workbench/services/themes/common/colorThemeSchema.ts
+++ b/src/vs/workbench/services/themes/common/colorThemeSchema.ts
@@ -2,14 +2,14 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import * as nls from 'vs/nls';
+import * as nls from '../../../../nls.js';
 
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Extensions as JSONExtensions, IJSONContributionRegistry } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Extensions as JSONExtensions, IJSONContributionRegistry } from '../../../../platform/jsonschemas/common/jsonContributionRegistry.js';
+import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
 
-import { workbenchColorsSchemaId } from 'vs/platform/theme/common/colorRegistry';
-import { tokenStylingSchemaId } from 'vs/platform/theme/common/tokenClassificationRegistry';
+import { workbenchColorsSchemaId } from '../../../../platform/theme/common/colorRegistry.js';
+import { tokenStylingSchemaId } from '../../../../platform/theme/common/tokenClassificationRegistry.js';
 
 const textMateScopes = [
 	'comment',
diff --git a/src/vs/workbench/services/themes/common/fileIconThemeSchema.ts b/src/vs/workbench/services/themes/common/fileIconThemeSchema.ts
index 30fbddafc32..4d18093f41e 100644
--- a/src/vs/workbench/services/themes/common/fileIconThemeSchema.ts
+++ b/src/vs/workbench/services/themes/common/fileIconThemeSchema.ts
@@ -2,12 +2,12 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import * as nls from 'vs/nls';
+import * as nls from '../../../../nls.js';
 
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Extensions as JSONExtensions, IJSONContributionRegistry } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import { fontWeightRegex, fontStyleRegex, fontSizeRegex, fontIdRegex } from 'vs/workbench/services/themes/common/productIconThemeSchema';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Extensions as JSONExtensions, IJSONContributionRegistry } from '../../../../platform/jsonschemas/common/jsonContributionRegistry.js';
+import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
+import { fontWeightRegex, fontStyleRegex, fontSizeRegex, fontIdRegex } from './productIconThemeSchema.js';
 
 const schemaId = 'vscode://schemas/icon-theme';
 const schema: IJSONSchema = {
@@ -185,7 +185,7 @@ const schema: IJSONSchema = {
 					},
 					size: {
 						type: 'string',
-						description: nls.localize('schema.font-size', 'The default size of the font. See https://developer.mozilla.org/en-US/docs/Web/CSS/font-size for valid values.'),
+						description: nls.localize('schema.font-size', 'The default size of the font. We strongly recommend using a percentage value, for example: 125%.'),
 						pattern: fontSizeRegex
 					}
 				},
diff --git a/src/vs/workbench/services/themes/common/hostColorSchemeService.ts b/src/vs/workbench/services/themes/common/hostColorSchemeService.ts
index 65428bf420b..0739ecd3c31 100644
--- a/src/vs/workbench/services/themes/common/hostColorSchemeService.ts
+++ b/src/vs/workbench/services/themes/common/hostColorSchemeService.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { Event } from '../../../../base/common/event.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 
 export const IHostColorSchemeService = createDecorator<IHostColorSchemeService>('hostColorSchemeService');
 
diff --git a/src/vs/workbench/services/themes/common/iconExtensionPoint.ts b/src/vs/workbench/services/themes/common/iconExtensionPoint.ts
index 23becff8428..29588b66234 100644
--- a/src/vs/workbench/services/themes/common/iconExtensionPoint.ts
+++ b/src/vs/workbench/services/themes/common/iconExtensionPoint.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { IIconRegistry, Extensions as IconRegistryExtensions } from 'vs/platform/theme/common/iconRegistry';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { ThemeIcon } from 'vs/base/common/themables';
-import * as resources from 'vs/base/common/resources';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { extname, posix } from 'vs/base/common/path';
+import * as nls from '../../../../nls.js';
+import { ExtensionsRegistry } from '../../extensions/common/extensionsRegistry.js';
+import { IIconRegistry, Extensions as IconRegistryExtensions } from '../../../../platform/theme/common/iconRegistry.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import * as resources from '../../../../base/common/resources.js';
+import { IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
+import { extname, posix } from '../../../../base/common/path.js';
 
 interface IIconExtensionPoint {
 	[id: string]: {
diff --git a/src/vs/workbench/services/themes/common/productIconThemeSchema.ts b/src/vs/workbench/services/themes/common/productIconThemeSchema.ts
index f401690b666..19a1a0dd684 100644
--- a/src/vs/workbench/services/themes/common/productIconThemeSchema.ts
+++ b/src/vs/workbench/services/themes/common/productIconThemeSchema.ts
@@ -2,12 +2,12 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import * as nls from 'vs/nls';
+import * as nls from '../../../../nls.js';
 
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Extensions as JSONExtensions, IJSONContributionRegistry } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import { iconsSchemaId } from 'vs/platform/theme/common/iconRegistry';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Extensions as JSONExtensions, IJSONContributionRegistry } from '../../../../platform/jsonschemas/common/jsonContributionRegistry.js';
+import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
+import { iconsSchemaId } from '../../../../platform/theme/common/iconRegistry.js';
 
 export const fontIdRegex = '^([\\w_-]+)$';
 export const fontStyleRegex = '^(normal|italic|(oblique[ \\w\\s-]+))$';
diff --git a/src/vs/workbench/services/themes/common/themeCompatibility.ts b/src/vs/workbench/services/themes/common/themeCompatibility.ts
index 21c643584f0..dd982615cdf 100644
--- a/src/vs/workbench/services/themes/common/themeCompatibility.ts
+++ b/src/vs/workbench/services/themes/common/themeCompatibility.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ITextMateThemingRule, IColorMap } from 'vs/workbench/services/themes/common/workbenchThemeService';
-import { Color } from 'vs/base/common/color';
-import * as colorRegistry from 'vs/platform/theme/common/colorRegistry';
+import { ITextMateThemingRule, IColorMap } from './workbenchThemeService.js';
+import { Color } from '../../../../base/common/color.js';
+import * as colorRegistry from '../../../../platform/theme/common/colorRegistry.js';
 
-import * as editorColorRegistry from 'vs/editor/common/core/editorColorRegistry';
+import * as editorColorRegistry from '../../../../editor/common/core/editorColorRegistry.js';
 
 const settingToColorIdMapping: { [settingId: string]: string[] } = {};
 function addSettingMapping(settingId: string, colorId: string) {
diff --git a/src/vs/workbench/services/themes/common/themeConfiguration.ts b/src/vs/workbench/services/themes/common/themeConfiguration.ts
index c9044e760f1..b4a84348fb7 100644
--- a/src/vs/workbench/services/themes/common/themeConfiguration.ts
+++ b/src/vs/workbench/services/themes/common/themeConfiguration.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import * as types from 'vs/base/common/types';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions, IConfigurationPropertySchema, IConfigurationNode, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
+import * as nls from '../../../../nls.js';
+import * as types from '../../../../base/common/types.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions, IConfigurationPropertySchema, IConfigurationNode, ConfigurationScope } from '../../../../platform/configuration/common/configurationRegistry.js';
 
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import { textmateColorsSchemaId, textmateColorGroupSchemaId } from 'vs/workbench/services/themes/common/colorThemeSchema';
-import { workbenchColorsSchemaId } from 'vs/platform/theme/common/colorRegistry';
-import { tokenStylingSchemaId } from 'vs/platform/theme/common/tokenClassificationRegistry';
-import { ThemeSettings, IWorkbenchColorTheme, IWorkbenchFileIconTheme, IColorCustomizations, ITokenColorCustomizations, IWorkbenchProductIconTheme, ISemanticTokenColorCustomizations, ThemeSettingTarget, ThemeSettingDefaults } from 'vs/workbench/services/themes/common/workbenchThemeService';
-import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
-import { isWeb } from 'vs/base/common/platform';
-import { ColorScheme } from 'vs/platform/theme/common/theme';
-import { IHostColorSchemeService } from 'vs/workbench/services/themes/common/hostColorSchemeService';
+import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
+import { textmateColorsSchemaId, textmateColorGroupSchemaId } from './colorThemeSchema.js';
+import { workbenchColorsSchemaId } from '../../../../platform/theme/common/colorRegistry.js';
+import { tokenStylingSchemaId } from '../../../../platform/theme/common/tokenClassificationRegistry.js';
+import { ThemeSettings, IWorkbenchColorTheme, IWorkbenchFileIconTheme, IColorCustomizations, ITokenColorCustomizations, IWorkbenchProductIconTheme, ISemanticTokenColorCustomizations, ThemeSettingTarget, ThemeSettingDefaults } from './workbenchThemeService.js';
+import { IConfigurationService, ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
+import { isWeb } from '../../../../base/common/platform.js';
+import { ColorScheme } from '../../../../platform/theme/common/theme.js';
+import { IHostColorSchemeService } from './hostColorSchemeService.js';
 
 // Configuration: Themes
 const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
diff --git a/src/vs/workbench/services/themes/common/themeExtensionPoints.ts b/src/vs/workbench/services/themes/common/themeExtensionPoints.ts
index 7b2b77c126e..8ab53a63902 100644
--- a/src/vs/workbench/services/themes/common/themeExtensionPoints.ts
+++ b/src/vs/workbench/services/themes/common/themeExtensionPoints.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
+import * as nls from '../../../../nls.js';
 
-import * as types from 'vs/base/common/types';
-import * as resources from 'vs/base/common/resources';
-import { ExtensionMessageCollector, IExtensionPoint, ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { ExtensionData, IThemeExtensionPoint, VS_LIGHT_THEME, VS_DARK_THEME, VS_HC_THEME, VS_HC_LIGHT_THEME } from 'vs/workbench/services/themes/common/workbenchThemeService';
+import * as types from '../../../../base/common/types.js';
+import * as resources from '../../../../base/common/resources.js';
+import { ExtensionMessageCollector, IExtensionPoint, ExtensionsRegistry } from '../../extensions/common/extensionsRegistry.js';
+import { ExtensionData, IThemeExtensionPoint, VS_LIGHT_THEME, VS_DARK_THEME, VS_HC_THEME, VS_HC_LIGHT_THEME } from './workbenchThemeService.js';
 
-import { Event, Emitter } from 'vs/base/common/event';
-import { URI } from 'vs/base/common/uri';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { Extensions, IExtensionFeatureMarkdownRenderer, IExtensionFeaturesRegistry, IRenderedData } from 'vs/workbench/services/extensionManagement/common/extensionFeatures';
-import { IExtensionManifest } from 'vs/platform/extensions/common/extensions';
-import { IMarkdownString, MarkdownString } from 'vs/base/common/htmlContent';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
+import { Extensions, IExtensionFeatureMarkdownRenderer, IExtensionFeaturesRegistry, IRenderedData } from '../../extensionManagement/common/extensionFeatures.js';
+import { IExtensionManifest } from '../../../../platform/extensions/common/extensions.js';
+import { IMarkdownString, MarkdownString } from '../../../../base/common/htmlContent.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
 
 export function registerColorThemeExtensionPoint() {
 	return ExtensionsRegistry.registerExtensionPoint<IThemeExtensionPoint[]>({
diff --git a/src/vs/workbench/services/themes/common/tokenClassificationExtensionPoint.ts b/src/vs/workbench/services/themes/common/tokenClassificationExtensionPoint.ts
index 80f5ee077cb..e10bf30175f 100644
--- a/src/vs/workbench/services/themes/common/tokenClassificationExtensionPoint.ts
+++ b/src/vs/workbench/services/themes/common/tokenClassificationExtensionPoint.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import { ExtensionsRegistry, ExtensionMessageCollector } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { getTokenClassificationRegistry, ITokenClassificationRegistry, typeAndModifierIdPattern } from 'vs/platform/theme/common/tokenClassificationRegistry';
+import * as nls from '../../../../nls.js';
+import { ExtensionsRegistry, ExtensionMessageCollector } from '../../extensions/common/extensionsRegistry.js';
+import { getTokenClassificationRegistry, ITokenClassificationRegistry, typeAndModifierIdPattern } from '../../../../platform/theme/common/tokenClassificationRegistry.js';
 
 interface ITokenTypeExtensionPoint {
 	id: string;
diff --git a/src/vs/workbench/services/themes/common/workbenchThemeService.ts b/src/vs/workbench/services/themes/common/workbenchThemeService.ts
index aac853941a7..ba0808026b4 100644
--- a/src/vs/workbench/services/themes/common/workbenchThemeService.ts
+++ b/src/vs/workbench/services/themes/common/workbenchThemeService.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { refineServiceDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { Event } from 'vs/base/common/event';
-import { Color } from 'vs/base/common/color';
-import { IColorTheme, IThemeService, IFileIconTheme, IProductIconTheme } from 'vs/platform/theme/common/themeService';
-import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
-import { isBoolean, isString } from 'vs/base/common/types';
-import { IconContribution, IconDefinition } from 'vs/platform/theme/common/iconRegistry';
-import { ColorScheme } from 'vs/platform/theme/common/theme';
+import { refineServiceDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { Event } from '../../../../base/common/event.js';
+import { Color } from '../../../../base/common/color.js';
+import { IColorTheme, IThemeService, IFileIconTheme, IProductIconTheme } from '../../../../platform/theme/common/themeService.js';
+import { ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
+import { isBoolean, isString } from '../../../../base/common/types.js';
+import { IconContribution, IconDefinition } from '../../../../platform/theme/common/iconRegistry.js';
+import { ColorScheme } from '../../../../platform/theme/common/theme.js';
 
 export const IWorkbenchThemeService = refineServiceDecorator<IThemeService, IWorkbenchThemeService>(IThemeService);
 
diff --git a/src/vs/workbench/services/themes/electron-sandbox/nativeHostColorSchemeService.ts b/src/vs/workbench/services/themes/electron-sandbox/nativeHostColorSchemeService.ts
index aff2bd1cfa1..2357d240fd7 100644
--- a/src/vs/workbench/services/themes/electron-sandbox/nativeHostColorSchemeService.ts
+++ b/src/vs/workbench/services/themes/electron-sandbox/nativeHostColorSchemeService.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IHostColorSchemeService } from 'vs/workbench/services/themes/common/hostColorSchemeService';
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { isBoolean, isObject } from 'vs/base/common/types';
-import { IColorScheme } from 'vs/platform/window/common/window';
+import { Emitter } from '../../../../base/common/event.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IHostColorSchemeService } from '../common/hostColorSchemeService.js';
+import { INativeWorkbenchEnvironmentService } from '../../environment/electron-sandbox/environmentService.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { isBoolean, isObject } from '../../../../base/common/types.js';
+import { IColorScheme } from '../../../../platform/window/common/window.js';
 
 export class NativeHostColorSchemeService extends Disposable implements IHostColorSchemeService {
 
diff --git a/src/vs/workbench/services/themes/electron-sandbox/themes.contribution.ts b/src/vs/workbench/services/themes/electron-sandbox/themes.contribution.ts
index 212a8da39aa..a373c15e619 100644
--- a/src/vs/workbench/services/themes/electron-sandbox/themes.contribution.ts
+++ b/src/vs/workbench/services/themes/electron-sandbox/themes.contribution.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
-import { ThemeSettings } from 'vs/workbench/services/themes/common/workbenchThemeService';
-import { COLOR_THEME_CONFIGURATION_SETTINGS_TAG, formatSettingAsLink } from 'vs/workbench/services/themes/common/themeConfiguration';
-import { isLinux } from 'vs/base/common/platform';
+import { localize } from '../../../../nls.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { ThemeSettings } from '../common/workbenchThemeService.js';
+import { COLOR_THEME_CONFIGURATION_SETTINGS_TAG, formatSettingAsLink } from '../common/themeConfiguration.js';
+import { isLinux } from '../../../../base/common/platform.js';
 
 const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
 configurationRegistry.registerConfiguration({
diff --git a/src/vs/workbench/services/themes/test/node/tokenStyleResolving.test.ts b/src/vs/workbench/services/themes/test/node/tokenStyleResolving.test.ts
index 3376ac6e47d..13c3b9caf20 100644
--- a/src/vs/workbench/services/themes/test/node/tokenStyleResolving.test.ts
+++ b/src/vs/workbench/services/themes/test/node/tokenStyleResolving.test.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ColorThemeData } from 'vs/workbench/services/themes/common/colorThemeData';
+import { ColorThemeData } from '../../common/colorThemeData.js';
 import assert from 'assert';
-import { ITokenColorCustomizations } from 'vs/workbench/services/themes/common/workbenchThemeService';
-import { TokenStyle, getTokenClassificationRegistry } from 'vs/platform/theme/common/tokenClassificationRegistry';
-import { Color } from 'vs/base/common/color';
-import { isString } from 'vs/base/common/types';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
-import { FileAccess, Schemas } from 'vs/base/common/network';
-import { ExtensionResourceLoaderService } from 'vs/platform/extensionResourceLoader/common/extensionResourceLoaderService';
-import { ITokenStyle } from 'vs/platform/theme/common/themeService';
-import { mock, TestProductService } from 'vs/workbench/test/common/workbenchTestServices';
-import { IRequestService } from 'vs/platform/request/common/request';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { ITokenColorCustomizations } from '../../common/workbenchThemeService.js';
+import { TokenStyle, getTokenClassificationRegistry } from '../../../../../platform/theme/common/tokenClassificationRegistry.js';
+import { Color } from '../../../../../base/common/color.js';
+import { isString } from '../../../../../base/common/types.js';
+import { FileService } from '../../../../../platform/files/common/fileService.js';
+import { NullLogService } from '../../../../../platform/log/common/log.js';
+import { DiskFileSystemProvider } from '../../../../../platform/files/node/diskFileSystemProvider.js';
+import { FileAccess, Schemas } from '../../../../../base/common/network.js';
+import { ExtensionResourceLoaderService } from '../../../../../platform/extensionResourceLoader/common/extensionResourceLoaderService.js';
+import { ITokenStyle } from '../../../../../platform/theme/common/themeService.js';
+import { mock, TestProductService } from '../../../../test/common/workbenchTestServices.js';
+import { IRequestService } from '../../../../../platform/request/common/request.js';
+import { IStorageService } from '../../../../../platform/storage/common/storage.js';
+import { IEnvironmentService } from '../../../../../platform/environment/common/environment.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 const undefinedStyle = { bold: undefined, underline: undefined, italic: undefined };
 const unsetStyle = { bold: false, underline: false, italic: false };
@@ -192,6 +192,9 @@ suite('Themes - TokenStyleResolving', () => {
 		tokenStyle = themeData.resolveScopes([['meta.structure.dictionary.json', 'string.quoted.double.json']]);
 		assertTokenStyle(tokenStyle, ts('#66D9EF', undefined), 'json property');
 
+		tokenStyle = themeData.resolveScopes([['source.json', 'meta.structure.dictionary.json', 'string.quoted.double.json']]);
+		assertTokenStyle(tokenStyle, ts('#66D9EF', undefined), 'json property');
+
 		tokenStyle = themeData.resolveScopes([['keyword'], ['storage.type'], ['entity.name.class']]);
 		assertTokenStyle(tokenStyle, ts('#66D9EF', { italic: true, bold: false, underline: false }), 'storage.type');
 
diff --git a/src/vs/workbench/services/timer/browser/timerService.ts b/src/vs/workbench/services/timer/browser/timerService.ts
index df14ee528cc..77f0d8152bc 100644
--- a/src/vs/workbench/services/timer/browser/timerService.ts
+++ b/src/vs/workbench/services/timer/browser/timerService.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as perf from 'vs/base/common/performance';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IUpdateService } from 'vs/platform/update/common/update';
-import { ILifecycleService, LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { Barrier, timeout } from 'vs/base/common/async';
-import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { ViewContainerLocation } from 'vs/workbench/common/views';
-import { TelemetryTrustedValue } from 'vs/platform/telemetry/common/telemetryUtils';
-import { isWeb } from 'vs/base/common/platform';
-import { createBlobWorker } from 'vs/base/browser/defaultWorkerFactory';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { ITerminalBackendRegistry, TerminalExtensions } from 'vs/platform/terminal/common/terminal';
+import * as perf from '../../../../base/common/performance.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IWorkspaceContextService, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { IExtensionService } from '../../extensions/common/extensions.js';
+import { IUpdateService } from '../../../../platform/update/common/update.js';
+import { ILifecycleService, LifecyclePhase } from '../../lifecycle/common/lifecycle.js';
+import { IEditorService } from '../../editor/common/editorService.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { Barrier, timeout } from '../../../../base/common/async.js';
+import { IWorkbenchLayoutService } from '../../layout/browser/layoutService.js';
+import { IPaneCompositePartService } from '../../panecomposite/browser/panecomposite.js';
+import { ViewContainerLocation } from '../../../common/views.js';
+import { TelemetryTrustedValue } from '../../../../platform/telemetry/common/telemetryUtils.js';
+import { isWeb } from '../../../../base/common/platform.js';
+import { createBlobWorker } from '../../../../base/browser/defaultWorkerFactory.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { ITerminalBackendRegistry, TerminalExtensions } from '../../../../platform/terminal/common/terminal.js';
 
 /* __GDPR__FRAGMENT__
 	"IMemoryInfo" : {
@@ -566,8 +566,7 @@ export abstract class AbstractTimerService implements ITimerService {
 					const t1 = performance.now();
 					fib(24);
 					const value = Math.round(performance.now() - t1);
-					// eslint-disable-next-line no-restricted-globals
-					postMessage({ value: tooSlow ? -1 : value });
+					self.postMessage({ value: tooSlow ? -1 : value });
 
 				}).toString();
 
diff --git a/src/vs/workbench/services/timer/electron-sandbox/timerService.ts b/src/vs/workbench/services/timer/electron-sandbox/timerService.ts
index 5e3f8d5dc05..e992d1fb55c 100644
--- a/src/vs/workbench/services/timer/electron-sandbox/timerService.ts
+++ b/src/vs/workbench/services/timer/electron-sandbox/timerService.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IUpdateService } from 'vs/platform/update/common/update';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { IStartupMetrics, AbstractTimerService, Writeable, ITimerService } from 'vs/workbench/services/timer/browser/timerService';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { process } from 'vs/base/parts/sandbox/electron-sandbox/globals';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { INativeWorkbenchEnvironmentService } from '../../environment/electron-sandbox/environmentService.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { IExtensionService } from '../../extensions/common/extensions.js';
+import { IUpdateService } from '../../../../platform/update/common/update.js';
+import { ILifecycleService } from '../../lifecycle/common/lifecycle.js';
+import { IEditorService } from '../../editor/common/editorService.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { IStartupMetrics, AbstractTimerService, Writeable, ITimerService } from '../browser/timerService.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { process } from '../../../../base/parts/sandbox/electron-sandbox/globals.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IWorkbenchLayoutService } from '../../layout/browser/layoutService.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IPaneCompositePartService } from '../../panecomposite/browser/panecomposite.js';
 
 export class TimerService extends AbstractTimerService {
 
diff --git a/src/vs/workbench/services/title/browser/titleService.ts b/src/vs/workbench/services/title/browser/titleService.ts
index 4cd4ac27d5b..67fd9e7fd7a 100644
--- a/src/vs/workbench/services/title/browser/titleService.ts
+++ b/src/vs/workbench/services/title/browser/titleService.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IAuxiliaryTitlebarPart, ITitlebarPart } from 'vs/workbench/browser/parts/titlebar/titlebarPart';
-import { IEditorGroupsContainer } from 'vs/workbench/services/editor/common/editorGroupsService';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IAuxiliaryTitlebarPart, ITitlebarPart } from '../../../browser/parts/titlebar/titlebarPart.js';
+import { IEditorGroupsContainer } from '../../editor/common/editorGroupsService.js';
 
 export const ITitleService = createDecorator<ITitleService>('titleService');
 
diff --git a/src/vs/workbench/services/title/electron-sandbox/titleService.ts b/src/vs/workbench/services/title/electron-sandbox/titleService.ts
index 6f715854888..00244e14a85 100644
--- a/src/vs/workbench/services/title/electron-sandbox/titleService.ts
+++ b/src/vs/workbench/services/title/electron-sandbox/titleService.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { NativeTitleService } from 'vs/workbench/electron-sandbox/parts/titlebar/titlebarPart';
-import { ITitleService } from 'vs/workbench/services/title/browser/titleService';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { NativeTitleService } from '../../../electron-sandbox/parts/titlebar/titlebarPart.js';
+import { ITitleService } from '../browser/titleService.js';
 
 registerSingleton(ITitleService, NativeTitleService, InstantiationType.Eager);
diff --git a/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.contribution.ts b/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.contribution.ts
new file mode 100644
index 00000000000..b6e4a82fc9a
--- /dev/null
+++ b/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.contribution.ts
@@ -0,0 +1,27 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js';
+import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { TreeSitterTextModelService } from '../../../../editor/browser/services/treeSitter/treeSitterParserService.js';
+import { ITreeSitterParserService } from '../../../../editor/common/services/treeSitterParserService.js';
+import { ITreeSitterTokenizationFeature } from './treeSitterTokenizationFeature.js';
+
+/**
+ * Makes sure the ITreeSitterTokenizationService is instantiated
+ */
+class TreeSitterTokenizationInstantiator implements IWorkbenchContribution {
+
+	static readonly ID = 'workbench.contrib.treeSitterTokenizationInstantiator';
+
+	constructor(
+		@ITreeSitterParserService _treeSitterTokenizationService: ITreeSitterParserService,
+		@ITreeSitterTokenizationFeature _treeSitterTokenizationFeature: ITreeSitterTokenizationFeature
+	) { }
+}
+
+registerSingleton(ITreeSitterParserService, TreeSitterTextModelService, InstantiationType.Eager);
+
+registerWorkbenchContribution2(TreeSitterTokenizationInstantiator.ID, TreeSitterTokenizationInstantiator, WorkbenchPhase.BlockRestore);
diff --git a/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts b/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
new file mode 100644
index 00000000000..0829476700c
--- /dev/null
+++ b/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
@@ -0,0 +1,270 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import type { Parser } from '@vscode/tree-sitter-wasm';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, DisposableMap, DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import { AppResourcePath, FileAccess } from '../../../../base/common/network.js';
+import { ILanguageIdCodec, ITreeSitterTokenizationSupport, LazyTokenizationSupport, TreeSitterTokenizationRegistry } from '../../../../editor/common/languages.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { EDITOR_EXPERIMENTAL_PREFER_TREESITTER, ITreeSitterParserService, ITreeSitterParseResult } from '../../../../editor/common/services/treeSitterParserService.js';
+import { IModelTokensChangedEvent } from '../../../../editor/common/textModelEvents.js';
+import { ColumnRange } from '../../../../editor/contrib/inlineCompletions/browser/utils.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { createDecorator, IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ColorThemeData, findMetadata } from '../../themes/common/colorThemeData.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+
+const ALLOWED_SUPPORT = ['typescript'];
+type TreeSitterQueries = string;
+
+export const ITreeSitterTokenizationFeature = createDecorator<ITreeSitterTokenizationFeature>('treeSitterTokenizationFeature');
+
+export interface ITreeSitterTokenizationFeature {
+	_serviceBrand: undefined;
+}
+
+class TreeSitterTokenizationFeature extends Disposable implements ITreeSitterTokenizationFeature {
+	public _serviceBrand: undefined;
+	private readonly _tokenizersRegistrations: DisposableMap<string, DisposableStore> = new DisposableMap();
+
+	constructor(
+		@ILanguageService private readonly _languageService: ILanguageService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IFileService private readonly _fileService: IFileService
+	) {
+		super();
+
+		this._handleGrammarsExtPoint();
+		this._register(this._configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(EDITOR_EXPERIMENTAL_PREFER_TREESITTER)) {
+				this._handleGrammarsExtPoint();
+			}
+		}));
+	}
+
+	private _getSetting(): string[] {
+		return this._configurationService.getValue<string[]>(EDITOR_EXPERIMENTAL_PREFER_TREESITTER) || [];
+	}
+
+	private _handleGrammarsExtPoint(): void {
+		const setting = this._getSetting();
+
+		// Eventually, this should actually use an extension point to add tree sitter grammars, but for now they are hard coded in core
+		for (const languageId of setting) {
+			if (ALLOWED_SUPPORT.includes(languageId) && !this._tokenizersRegistrations.has(languageId)) {
+				const lazyTokenizationSupport = new LazyTokenizationSupport(() => this._createTokenizationSupport(languageId));
+				const disposableStore = new DisposableStore();
+				disposableStore.add(lazyTokenizationSupport);
+				disposableStore.add(TreeSitterTokenizationRegistry.registerFactory(languageId, lazyTokenizationSupport));
+				this._tokenizersRegistrations.set(languageId, disposableStore);
+				TreeSitterTokenizationRegistry.getOrCreate(languageId);
+			}
+		}
+		const languagesToUnregister = [...this._tokenizersRegistrations.keys()].filter(languageId => !setting.includes(languageId));
+		for (const languageId of languagesToUnregister) {
+			this._tokenizersRegistrations.deleteAndDispose(languageId);
+		}
+	}
+
+	private async _fetchQueries(newLanguage: string): Promise<TreeSitterQueries> {
+		const languageLocation: AppResourcePath = `vs/editor/common/languages/highlights/${newLanguage}.scm`;
+		const query = await this._fileService.readFile(FileAccess.asFileUri(languageLocation));
+		return query.value.toString();
+	}
+
+	private async _createTokenizationSupport(languageId: string): Promise<ITreeSitterTokenizationSupport & IDisposable | null> {
+		const queries = await this._fetchQueries(languageId);
+		return this._instantiationService.createInstance(TreeSitterTokenizationSupport, queries, languageId, this._languageService.languageIdCodec);
+	}
+}
+
+class TreeSitterTokenizationSupport extends Disposable implements ITreeSitterTokenizationSupport {
+	private _query: Parser.Query | undefined;
+	private readonly _onDidChangeTokens: Emitter<{ textModel: ITextModel; changes: IModelTokensChangedEvent }> = new Emitter();
+	public readonly onDidChangeTokens: Event<{ textModel: ITextModel; changes: IModelTokensChangedEvent }> = this._onDidChangeTokens.event;
+	private _colorThemeData!: ColorThemeData;
+	private _languageAddedListener: IDisposable | undefined;
+
+	constructor(
+		private readonly _queries: TreeSitterQueries,
+		private readonly _languageId: string,
+		private readonly _languageIdCodec: ILanguageIdCodec,
+		@ITreeSitterParserService private readonly _treeSitterService: ITreeSitterParserService,
+		@IThemeService private readonly _themeService: IThemeService,
+	) {
+		super();
+		this._register(Event.runAndSubscribe(this._themeService.onDidColorThemeChange, () => this.reset()));
+		this._register(this._treeSitterService.onDidUpdateTree((e) => {
+			const maxLine = e.textModel.getLineCount();
+			this._onDidChangeTokens.fire({
+				textModel: e.textModel,
+				changes: {
+					semanticTokensApplied: false,
+					ranges: e.ranges.map(range => ({ fromLineNumber: range.startLineNumber, toLineNumber: range.endLineNumber < maxLine ? range.endLineNumber : maxLine })),
+				}
+			});
+		}));
+	}
+
+	private _getTree(textModel: ITextModel): ITreeSitterParseResult | undefined {
+		return this._treeSitterService.getParseResult(textModel);
+	}
+
+	private _ensureQuery() {
+		if (!this._query) {
+			const language = this._treeSitterService.getOrInitLanguage(this._languageId);
+			if (!language) {
+				if (!this._languageAddedListener) {
+					this._languageAddedListener = this._register(Event.onceIf(this._treeSitterService.onDidAddLanguage, e => e.id === this._languageId)((e) => {
+						this._query = e.language.query(this._queries);
+					}));
+				}
+				return;
+			}
+			this._query = language.query(this._queries);
+		}
+		return this._query;
+	}
+
+	private reset() {
+		this._colorThemeData = this._themeService.getColorTheme() as ColorThemeData;
+	}
+
+	captureAtPosition(lineNumber: number, column: number, textModel: ITextModel): Parser.QueryCapture[] {
+		const tree = this._getTree(textModel);
+		const captures = this._captureAtRange(lineNumber, new ColumnRange(column, column), tree?.tree);
+		return captures;
+	}
+
+	captureAtPositionTree(lineNumber: number, column: number, tree: Parser.Tree): Parser.QueryCapture[] {
+		const captures = this._captureAtRange(lineNumber, new ColumnRange(column, column), tree);
+		return captures;
+	}
+
+
+	private _captureAtRange(lineNumber: number, columnRange: ColumnRange, tree: Parser.Tree | undefined): Parser.QueryCapture[] {
+		const query = this._ensureQuery();
+		if (!tree || !query) {
+			return [];
+		}
+		// Tree sitter row is 0 based, column is 0 based
+		return query.captures(tree.rootNode, { startPosition: { row: lineNumber - 1, column: columnRange.startColumn - 1 }, endPosition: { row: lineNumber - 1, column: columnRange.endColumnExclusive } });
+	}
+
+	/**
+	 * Gets the tokens for a given line.
+	 * Each token takes 2 elements in the array. The first element is the offset of the end of the token *in the line, not in the document*, and the second element is the metadata.
+	 *
+	 * @param lineNumber
+	 * @returns
+	 */
+	public tokenizeEncoded(lineNumber: number, textModel: ITextModel): Uint32Array | undefined {
+		const lineLength = textModel.getLineMaxColumn(lineNumber);
+		const tree = this._getTree(textModel);
+		const captures = this._captureAtRange(lineNumber, new ColumnRange(1, lineLength), tree?.tree);
+
+		if (captures.length === 0) {
+			return undefined;
+		}
+
+		const endOffsetsAndScopes: { endOffset: number; scopes: string[] }[] = Array(captures.length);
+		endOffsetsAndScopes.fill({ endOffset: 0, scopes: [] });
+		let tokenIndex = 0;
+		const lineStartOffset = textModel.getOffsetAt({ lineNumber: lineNumber, column: 1 });
+
+		const increaseSizeOfTokensByOneToken = () => {
+			endOffsetsAndScopes.push({ endOffset: 0, scopes: [] });
+		};
+
+		const encodedLanguageId = this._languageIdCodec.encodeLanguageId(this._languageId);
+
+		for (let captureIndex = 0; captureIndex < captures.length; captureIndex++) {
+			const capture = captures[captureIndex];
+			const tokenEndIndex = capture.node.endIndex < lineStartOffset + lineLength ? capture.node.endIndex : lineStartOffset + lineLength;
+			const tokenStartIndex = capture.node.startIndex < lineStartOffset ? lineStartOffset : capture.node.startIndex;
+
+			const lineRelativeOffset = tokenEndIndex - lineStartOffset;
+			// Not every character will get captured, so we need to make sure that our current capture doesn't bleed toward the start of the line and cover characters that it doesn't apply to.
+			// We do this by creating a new token in the array if the previous token ends before the current token starts.
+			let previousTokenEnd: number;
+			const currentTokenLength = tokenEndIndex - tokenStartIndex;
+			if (captureIndex > 0) {
+				previousTokenEnd = endOffsetsAndScopes[(tokenIndex - 1)].endOffset;
+			} else {
+				previousTokenEnd = tokenStartIndex - lineStartOffset - 1;
+			}
+			const intermediateTokenOffset = lineRelativeOffset - currentTokenLength;
+			if ((previousTokenEnd >= 0) && (previousTokenEnd < intermediateTokenOffset)) {
+				// Add en empty token to cover the space where there were no captures
+				endOffsetsAndScopes[tokenIndex] = { endOffset: intermediateTokenOffset, scopes: [] };
+				tokenIndex++;
+
+				increaseSizeOfTokensByOneToken();
+			}
+
+			const addCurrentTokenToArray = () => {
+				endOffsetsAndScopes[tokenIndex] = { endOffset: lineRelativeOffset, scopes: [capture.name] };
+				tokenIndex++;
+			};
+
+			if (previousTokenEnd >= lineRelativeOffset) {
+				const previousTokenStartOffset = ((tokenIndex >= 2) ? endOffsetsAndScopes[tokenIndex - 2].endOffset : 0);
+				const originalPreviousTokenEndOffset = endOffsetsAndScopes[tokenIndex - 1].endOffset;
+
+				// Check that the current token doesn't just replace the last token
+				if ((previousTokenStartOffset + currentTokenLength) === originalPreviousTokenEndOffset) {
+					// Current token and previous token span the exact same characters, replace the last scope
+					endOffsetsAndScopes[tokenIndex - 1].scopes[endOffsetsAndScopes[tokenIndex - 1].scopes.length - 1] = capture.name;
+				} else {
+					// The current token is within the previous token. Adjust the end of the previous token.
+					endOffsetsAndScopes[tokenIndex - 1].endOffset = intermediateTokenOffset;
+
+					addCurrentTokenToArray();
+					// Add the rest of the previous token after the current token
+					increaseSizeOfTokensByOneToken();
+					endOffsetsAndScopes[tokenIndex].endOffset = originalPreviousTokenEndOffset;
+					endOffsetsAndScopes[tokenIndex].scopes = endOffsetsAndScopes[tokenIndex - 2].scopes;
+					tokenIndex++;
+				}
+			} else {
+				// Just add the token to the array
+				addCurrentTokenToArray();
+			}
+		}
+
+		// Account for uncaptured characters at the end of the line
+		if (captures[captures.length - 1].node.endPosition.column + 1 < lineLength) {
+			increaseSizeOfTokensByOneToken();
+			endOffsetsAndScopes[tokenIndex].endOffset = lineLength - 1;
+			tokenIndex++;
+		}
+
+		const tokens: Uint32Array = new Uint32Array((tokenIndex) * 2);
+		for (let i = 0; i < tokenIndex; i++) {
+			const token = endOffsetsAndScopes[i];
+			if (token.endOffset === 0 && token.scopes.length === 0) {
+				break;
+			}
+			tokens[i * 2] = token.endOffset;
+			tokens[i * 2 + 1] = findMetadata(this._colorThemeData, token.scopes, encodedLanguageId);
+		}
+
+		return tokens;
+	}
+
+	override dispose() {
+		super.dispose();
+		this._query?.delete();
+		this._query = undefined;
+	}
+}
+
+registerSingleton(ITreeSitterTokenizationFeature, TreeSitterTokenizationFeature, InstantiationType.Eager);
+
diff --git a/src/vs/workbench/services/tunnel/browser/tunnelService.ts b/src/vs/workbench/services/tunnel/browser/tunnelService.ts
index 6a0cf2515b7..4b6cbd9fb4b 100644
--- a/src/vs/workbench/services/tunnel/browser/tunnelService.ts
+++ b/src/vs/workbench/services/tunnel/browser/tunnelService.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IAddressProvider } from 'vs/platform/remote/common/remoteAgentConnection';
-import { AbstractTunnelService, ITunnelProvider, ITunnelService, RemoteTunnel, isTunnelProvider } from 'vs/platform/tunnel/common/tunnel';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
+import { URI } from '../../../../base/common/uri.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IAddressProvider } from '../../../../platform/remote/common/remoteAgentConnection.js';
+import { AbstractTunnelService, ITunnelProvider, ITunnelService, RemoteTunnel, isTunnelProvider } from '../../../../platform/tunnel/common/tunnel.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
 
 export class TunnelService extends AbstractTunnelService {
 	constructor(
diff --git a/src/vs/workbench/services/tunnel/electron-sandbox/tunnelService.ts b/src/vs/workbench/services/tunnel/electron-sandbox/tunnelService.ts
index 794fb8960ce..0706995795a 100644
--- a/src/vs/workbench/services/tunnel/electron-sandbox/tunnelService.ts
+++ b/src/vs/workbench/services/tunnel/electron-sandbox/tunnelService.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ILogService } from 'vs/platform/log/common/log';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { URI } from 'vs/base/common/uri';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ITunnelService, AbstractTunnelService, RemoteTunnel, TunnelPrivacyId, isPortPrivileged, ITunnelProvider, isTunnelProvider } from 'vs/platform/tunnel/common/tunnel';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IAddressProvider } from 'vs/platform/remote/common/remoteAgentConnection';
-import { ISharedProcessTunnelService } from 'vs/platform/remote/common/sharedProcessTunnelService';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
-import { OS } from 'vs/base/common/platform';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { URI } from '../../../../base/common/uri.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ITunnelService, AbstractTunnelService, RemoteTunnel, TunnelPrivacyId, isPortPrivileged, ITunnelProvider, isTunnelProvider } from '../../../../platform/tunnel/common/tunnel.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IAddressProvider } from '../../../../platform/remote/common/remoteAgentConnection.js';
+import { ISharedProcessTunnelService } from '../../../../platform/remote/common/sharedProcessTunnelService.js';
+import { ILifecycleService } from '../../lifecycle/common/lifecycle.js';
+import { IRemoteAuthorityResolverService } from '../../../../platform/remote/common/remoteAuthorityResolver.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { INativeWorkbenchEnvironmentService } from '../../environment/electron-sandbox/environmentService.js';
+import { OS } from '../../../../base/common/platform.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 
 class SharedProcessTunnel extends Disposable implements RemoteTunnel {
 
diff --git a/src/vs/workbench/services/untitled/common/untitledTextEditorHandler.ts b/src/vs/workbench/services/untitled/common/untitledTextEditorHandler.ts
index b9357adb2c1..c9ba5f5d133 100644
--- a/src/vs/workbench/services/untitled/common/untitledTextEditorHandler.ts
+++ b/src/vs/workbench/services/untitled/common/untitledTextEditorHandler.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Schemas } from 'vs/base/common/network';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { IEditorSerializer } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { ITextEditorService } from 'vs/workbench/services/textfile/common/textEditorService';
-import { isEqual, toLocalResource } from 'vs/base/common/resources';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IWorkingCopyIdentifier, NO_TYPE_ID } from 'vs/workbench/services/workingCopy/common/workingCopy';
-import { IWorkingCopyEditorHandler, IWorkingCopyEditorService } from 'vs/workbench/services/workingCopy/common/workingCopyEditorService';
-import { IUntitledTextEditorService } from 'vs/workbench/services/untitled/common/untitledTextEditorService';
+import { Schemas } from '../../../../base/common/network.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
+import { IEditorSerializer } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { ITextEditorService } from '../../textfile/common/textEditorService.js';
+import { isEqual, toLocalResource } from '../../../../base/common/resources.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../../../../editor/common/languages/modesRegistry.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { IFilesConfigurationService } from '../../filesConfiguration/common/filesConfigurationService.js';
+import { IPathService } from '../../path/common/pathService.js';
+import { UntitledTextEditorInput } from './untitledTextEditorInput.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IWorkingCopyIdentifier, NO_TYPE_ID } from '../../workingCopy/common/workingCopy.js';
+import { IWorkingCopyEditorHandler, IWorkingCopyEditorService } from '../../workingCopy/common/workingCopyEditorService.js';
+import { IUntitledTextEditorService } from './untitledTextEditorService.js';
 
 interface ISerializedUntitledTextEditorInput {
 	readonly resourceJSON: UriComponents;
diff --git a/src/vs/workbench/services/untitled/common/untitledTextEditorInput.ts b/src/vs/workbench/services/untitled/common/untitledTextEditorInput.ts
index 67e401fe5fb..9dcd00fc520 100644
--- a/src/vs/workbench/services/untitled/common/untitledTextEditorInput.ts
+++ b/src/vs/workbench/services/untitled/common/untitledTextEditorInput.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { DEFAULT_EDITOR_ASSOCIATION, findViewStateForEditor, isUntitledResourceEditorInput, IUntitledTextResourceEditorInput, IUntypedEditorInput, Verbosity } from 'vs/workbench/common/editor';
-import { EditorInput, IUntypedEditorOptions } from 'vs/workbench/common/editor/editorInput';
-import { AbstractTextResourceEditorInput } from 'vs/workbench/common/editor/textResourceEditorInput';
-import { IUntitledTextEditorModel } from 'vs/workbench/services/untitled/common/untitledTextEditorModel';
-import { EncodingMode, IEncodingSupport, ILanguageSupport, ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IFileService } from 'vs/platform/files/common/files';
-import { isEqual, toLocalResource } from 'vs/base/common/resources';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { ITextEditorOptions } from 'vs/platform/editor/common/editor';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { DisposableStore, dispose, IReference } from 'vs/base/common/lifecycle';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { ICustomEditorLabelService } from 'vs/workbench/services/editor/common/customEditorLabelService';
+import { URI } from '../../../../base/common/uri.js';
+import { DEFAULT_EDITOR_ASSOCIATION, findViewStateForEditor, isUntitledResourceEditorInput, IUntitledTextResourceEditorInput, IUntypedEditorInput, Verbosity } from '../../../common/editor.js';
+import { EditorInput, IUntypedEditorOptions } from '../../../common/editor/editorInput.js';
+import { AbstractTextResourceEditorInput } from '../../../common/editor/textResourceEditorInput.js';
+import { IUntitledTextEditorModel } from './untitledTextEditorModel.js';
+import { EncodingMode, IEncodingSupport, ILanguageSupport, ITextFileService } from '../../textfile/common/textfiles.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { IEditorService } from '../../editor/common/editorService.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { isEqual, toLocalResource } from '../../../../base/common/resources.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { IPathService } from '../../path/common/pathService.js';
+import { ITextEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { IFilesConfigurationService } from '../../filesConfiguration/common/filesConfigurationService.js';
+import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { DisposableStore, dispose, IReference } from '../../../../base/common/lifecycle.js';
+import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { ICustomEditorLabelService } from '../../editor/common/customEditorLabelService.js';
 
 /**
  * An editor input to be used for untitled text buffers.
diff --git a/src/vs/workbench/services/untitled/common/untitledTextEditorModel.ts b/src/vs/workbench/services/untitled/common/untitledTextEditorModel.ts
index 43402bc496c..5a4c357d566 100644
--- a/src/vs/workbench/services/untitled/common/untitledTextEditorModel.ts
+++ b/src/vs/workbench/services/untitled/common/untitledTextEditorModel.ts
@@ -3,31 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ISaveOptions } from 'vs/workbench/common/editor';
-import { BaseTextEditorModel } from 'vs/workbench/common/editor/textEditorModel';
-import { URI } from 'vs/base/common/uri';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IModelService } from 'vs/editor/common/services/model';
-import { Event, Emitter } from 'vs/base/common/event';
-import { IWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackup';
-import { ITextResourceConfigurationChangeEvent, ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { ITextModel } from 'vs/editor/common/model';
-import { createTextBufferFactory, createTextBufferFactoryFromStream } from 'vs/editor/common/model/textModel';
-import { ITextEditorModel } from 'vs/editor/common/services/resolverService';
-import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
-import { IWorkingCopy, WorkingCopyCapabilities, IWorkingCopyBackup, NO_TYPE_ID, IWorkingCopySaveEvent } from 'vs/workbench/services/workingCopy/common/workingCopy';
-import { IEncodingSupport, ILanguageSupport, ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { IModelContentChangedEvent } from 'vs/editor/common/textModelEvents';
-import { assertIsDefined } from 'vs/base/common/types';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { ensureValidWordDefinition } from 'vs/editor/common/core/wordHelper';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { getCharContainingOffset } from 'vs/base/common/strings';
-import { UTF8 } from 'vs/workbench/services/textfile/common/encoding';
-import { bufferToReadable, bufferToStream, VSBuffer, VSBufferReadable, VSBufferReadableStream } from 'vs/base/common/buffer';
-import { ILanguageDetectionService } from 'vs/workbench/services/languageDetection/common/languageDetectionWorkerService';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
+import { ISaveOptions } from '../../../common/editor.js';
+import { BaseTextEditorModel } from '../../../common/editor/textEditorModel.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { IWorkingCopyBackupService } from '../../workingCopy/common/workingCopyBackup.js';
+import { ITextResourceConfigurationChangeEvent, ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { createTextBufferFactory, createTextBufferFactoryFromStream } from '../../../../editor/common/model/textModel.js';
+import { ITextEditorModel } from '../../../../editor/common/services/resolverService.js';
+import { IWorkingCopyService } from '../../workingCopy/common/workingCopyService.js';
+import { IWorkingCopy, WorkingCopyCapabilities, IWorkingCopyBackup, NO_TYPE_ID, IWorkingCopySaveEvent } from '../../workingCopy/common/workingCopy.js';
+import { IEncodingSupport, ILanguageSupport, ITextFileService } from '../../textfile/common/textfiles.js';
+import { IModelContentChangedEvent } from '../../../../editor/common/textModelEvents.js';
+import { assertIsDefined } from '../../../../base/common/types.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { ensureValidWordDefinition } from '../../../../editor/common/core/wordHelper.js';
+import { IEditorService } from '../../editor/common/editorService.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { getCharContainingOffset } from '../../../../base/common/strings.js';
+import { UTF8 } from '../../textfile/common/encoding.js';
+import { bufferToReadable, bufferToStream, VSBuffer, VSBufferReadable, VSBufferReadableStream } from '../../../../base/common/buffer.js';
+import { ILanguageDetectionService } from '../../languageDetection/common/languageDetectionWorkerService.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
 
 export interface IUntitledTextEditorModel extends ITextEditorModel, ILanguageSupport, IEncodingSupport, IWorkingCopy {
 
@@ -70,7 +70,7 @@ export interface IUntitledTextEditorModel extends ITextEditorModel, ILanguageSup
 export class UntitledTextEditorModel extends BaseTextEditorModel implements IUntitledTextEditorModel {
 
 	private static readonly FIRST_LINE_NAME_MAX_LENGTH = 40;
-	private static readonly FIRST_LINE_NAME_CANDIDATE_MAX_LENGTH = UntitledTextEditorModel.FIRST_LINE_NAME_MAX_LENGTH * 10;
+	private static readonly FIRST_LINE_NAME_CANDIDATE_MAX_LENGTH = this.FIRST_LINE_NAME_MAX_LENGTH * 10;
 
 	// Support the special '${activeEditorLanguage}' language by
 	// looking up the language id from the editor that is active
diff --git a/src/vs/workbench/services/untitled/common/untitledTextEditorService.ts b/src/vs/workbench/services/untitled/common/untitledTextEditorService.ts
index dc465ef62fb..5b53a994a37 100644
--- a/src/vs/workbench/services/untitled/common/untitledTextEditorService.ts
+++ b/src/vs/workbench/services/untitled/common/untitledTextEditorService.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { UntitledTextEditorModel, IUntitledTextEditorModel } from 'vs/workbench/services/untitled/common/untitledTextEditorModel';
-import { IFilesConfiguration } from 'vs/platform/files/common/files';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { Event, Emitter } from 'vs/base/common/event';
-import { ResourceMap } from 'vs/base/common/map';
-import { Schemas } from 'vs/base/common/network';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { URI } from '../../../../base/common/uri.js';
+import { createDecorator, IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { UntitledTextEditorModel, IUntitledTextEditorModel } from './untitledTextEditorModel.js';
+import { IFilesConfiguration } from '../../../../platform/files/common/files.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
 
 export const IUntitledTextEditorService = createDecorator<IUntitledTextEditorService>('untitledTextEditorService');
 
diff --git a/src/vs/workbench/services/untitled/test/browser/untitledTextEditor.integrationTest.ts b/src/vs/workbench/services/untitled/test/browser/untitledTextEditor.integrationTest.ts
index 35936c00f50..72a51370749 100644
--- a/src/vs/workbench/services/untitled/test/browser/untitledTextEditor.integrationTest.ts
+++ b/src/vs/workbench/services/untitled/test/browser/untitledTextEditor.integrationTest.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { workbenchInstantiationService, TestServiceAccessor } from 'vs/workbench/test/browser/workbenchTestServices';
-import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { workbenchInstantiationService, TestServiceAccessor } from '../../../../test/browser/workbenchTestServices.js';
+import { UntitledTextEditorInput } from '../../common/untitledTextEditorInput.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('Untitled text editors', () => {
 
diff --git a/src/vs/workbench/services/untitled/test/browser/untitledTextEditor.test.ts b/src/vs/workbench/services/untitled/test/browser/untitledTextEditor.test.ts
index 1ccafa64c81..31562d151c6 100644
--- a/src/vs/workbench/services/untitled/test/browser/untitledTextEditor.test.ts
+++ b/src/vs/workbench/services/untitled/test/browser/untitledTextEditor.test.ts
@@ -4,25 +4,25 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { join } from 'vs/base/common/path';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IUntitledTextEditorService, UntitledTextEditorService } from 'vs/workbench/services/untitled/common/untitledTextEditorService';
-import { workbenchInstantiationService, TestServiceAccessor } from 'vs/workbench/test/browser/workbenchTestServices';
-import { snapshotToString } from 'vs/workbench/services/textfile/common/textfiles';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import { Range } from 'vs/editor/common/core/range';
-import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
-import { IUntitledTextEditorModel, UntitledTextEditorModel } from 'vs/workbench/services/untitled/common/untitledTextEditorModel';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { EditorInputCapabilities } from 'vs/workbench/common/editor';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { isReadable, isReadableStream } from 'vs/base/common/stream';
-import { readableToBuffer, streamToBuffer, VSBufferReadable, VSBufferReadableStream } from 'vs/base/common/buffer';
-import { LanguageDetectionLanguageEventSource } from 'vs/workbench/services/languageDetection/common/languageDetectionWorkerService';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { timeout } from 'vs/base/common/async';
+import { URI } from '../../../../../base/common/uri.js';
+import { join } from '../../../../../base/common/path.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IUntitledTextEditorService, UntitledTextEditorService } from '../../common/untitledTextEditorService.js';
+import { workbenchInstantiationService, TestServiceAccessor } from '../../../../test/browser/workbenchTestServices.js';
+import { snapshotToString } from '../../../textfile/common/textfiles.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../../../../../editor/common/languages/modesRegistry.js';
+import { ISingleEditOperation } from '../../../../../editor/common/core/editOperation.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { UntitledTextEditorInput } from '../../common/untitledTextEditorInput.js';
+import { IUntitledTextEditorModel, UntitledTextEditorModel } from '../../common/untitledTextEditorModel.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { EditorInputCapabilities } from '../../../../common/editor.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { isReadable, isReadableStream } from '../../../../../base/common/stream.js';
+import { readableToBuffer, streamToBuffer, VSBufferReadable, VSBufferReadableStream } from '../../../../../base/common/buffer.js';
+import { LanguageDetectionLanguageEventSource } from '../../../languageDetection/common/languageDetectionWorkerService.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { timeout } from '../../../../../base/common/async.js';
 
 suite('Untitled text editors', () => {
 
diff --git a/src/vs/workbench/services/update/browser/updateService.ts b/src/vs/workbench/services/update/browser/updateService.ts
index 0ceb4cff286..65016e9067b 100644
--- a/src/vs/workbench/services/update/browser/updateService.ts
+++ b/src/vs/workbench/services/update/browser/updateService.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event, Emitter } from 'vs/base/common/event';
-import { IUpdateService, State, UpdateType } from 'vs/platform/update/common/update';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { Disposable } from 'vs/base/common/lifecycle';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { IUpdateService, State, UpdateType } from '../../../../platform/update/common/update.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IBrowserWorkbenchEnvironmentService } from '../../environment/browser/environmentService.js';
+import { IHostService } from '../../host/browser/host.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
 
 export interface IUpdate {
 	version: string;
diff --git a/src/vs/workbench/services/update/electron-sandbox/updateService.ts b/src/vs/workbench/services/update/electron-sandbox/updateService.ts
index 7961b927b12..5ddd452efe4 100644
--- a/src/vs/workbench/services/update/electron-sandbox/updateService.ts
+++ b/src/vs/workbench/services/update/electron-sandbox/updateService.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IUpdateService } from 'vs/platform/update/common/update';
-import { registerMainProcessRemoteService } from 'vs/platform/ipc/electron-sandbox/services';
-import { UpdateChannelClient } from 'vs/platform/update/common/updateIpc';
+import { IUpdateService } from '../../../../platform/update/common/update.js';
+import { registerMainProcessRemoteService } from '../../../../platform/ipc/electron-sandbox/services.js';
+import { UpdateChannelClient } from '../../../../platform/update/common/updateIpc.js';
 
 registerMainProcessRemoteService(IUpdateService, 'update', { channelClientCtor: UpdateChannelClient });
diff --git a/src/vs/workbench/services/url/browser/urlService.ts b/src/vs/workbench/services/url/browser/urlService.ts
index 5c1b1872096..5651c9c69e3 100644
--- a/src/vs/workbench/services/url/browser/urlService.ts
+++ b/src/vs/workbench/services/url/browser/urlService.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IURLService } from 'vs/platform/url/common/url';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { AbstractURLService } from 'vs/platform/url/common/urlService';
-import { Event } from 'vs/base/common/event';
-import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { IOpenerService, IOpener, OpenExternalOptions, OpenInternalOptions } from 'vs/platform/opener/common/opener';
-import { matchesScheme } from 'vs/base/common/network';
-import { IProductService } from 'vs/platform/product/common/productService';
+import { IURLService } from '../../../../platform/url/common/url.js';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { AbstractURLService } from '../../../../platform/url/common/urlService.js';
+import { Event } from '../../../../base/common/event.js';
+import { IBrowserWorkbenchEnvironmentService } from '../../environment/browser/environmentService.js';
+import { IOpenerService, IOpener, OpenExternalOptions, OpenInternalOptions } from '../../../../platform/opener/common/opener.js';
+import { matchesScheme } from '../../../../base/common/network.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
 
 export interface IURLCallbackProvider {
 
diff --git a/src/vs/workbench/services/url/electron-sandbox/urlService.ts b/src/vs/workbench/services/url/electron-sandbox/urlService.ts
index f8ec96c4998..da45a183502 100644
--- a/src/vs/workbench/services/url/electron-sandbox/urlService.ts
+++ b/src/vs/workbench/services/url/electron-sandbox/urlService.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IURLService, IURLHandler, IOpenURLOptions } from 'vs/platform/url/common/url';
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { IMainProcessService } from 'vs/platform/ipc/common/mainProcessService';
-import { URLHandlerChannel } from 'vs/platform/url/common/urlIpc';
-import { IOpenerService, IOpener } from 'vs/platform/opener/common/opener';
-import { matchesScheme } from 'vs/base/common/network';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { NativeURLService } from 'vs/platform/url/common/urlService';
-import { ILogService } from 'vs/platform/log/common/log';
+import { IURLService, IURLHandler, IOpenURLOptions } from '../../../../platform/url/common/url.js';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
+import { IMainProcessService } from '../../../../platform/ipc/common/mainProcessService.js';
+import { URLHandlerChannel } from '../../../../platform/url/common/urlIpc.js';
+import { IOpenerService, IOpener } from '../../../../platform/opener/common/opener.js';
+import { matchesScheme } from '../../../../base/common/network.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ProxyChannel } from '../../../../base/parts/ipc/common/ipc.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { NativeURLService } from '../../../../platform/url/common/urlService.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
 
 export interface IRelayOpenURLOptions extends IOpenURLOptions {
 	openToSide?: boolean;
diff --git a/src/vs/workbench/services/userActivity/browser/domActivityTracker.ts b/src/vs/workbench/services/userActivity/browser/domActivityTracker.ts
index 087b4cb9e98..f55f9dc1661 100644
--- a/src/vs/workbench/services/userActivity/browser/domActivityTracker.ts
+++ b/src/vs/workbench/services/userActivity/browser/domActivityTracker.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from 'vs/base/browser/dom';
-import { mainWindow } from 'vs/base/browser/window';
-import { Event } from 'vs/base/common/event';
-import { Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { IUserActivityService } from 'vs/workbench/services/userActivity/common/userActivityService';
+import * as dom from '../../../../base/browser/dom.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { Event } from '../../../../base/common/event.js';
+import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { IUserActivityService } from '../common/userActivityService.js';
 
 /**
  * This uses a time interval and checks whether there's any activity in that
diff --git a/src/vs/workbench/services/userActivity/browser/userActivityBrowser.ts b/src/vs/workbench/services/userActivity/browser/userActivityBrowser.ts
index d8b870a753c..7e7f9ccf6ef 100644
--- a/src/vs/workbench/services/userActivity/browser/userActivityBrowser.ts
+++ b/src/vs/workbench/services/userActivity/browser/userActivityBrowser.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DomActivityTracker } from 'vs/workbench/services/userActivity/browser/domActivityTracker';
-import { userActivityRegistry } from 'vs/workbench/services/userActivity/common/userActivityRegistry';
+import { DomActivityTracker } from './domActivityTracker.js';
+import { userActivityRegistry } from '../common/userActivityRegistry.js';
 
 userActivityRegistry.add(DomActivityTracker);
diff --git a/src/vs/workbench/services/userActivity/common/userActivityRegistry.ts b/src/vs/workbench/services/userActivity/common/userActivityRegistry.ts
index ea81e92b75d..1af59b8c4d8 100644
--- a/src/vs/workbench/services/userActivity/common/userActivityRegistry.ts
+++ b/src/vs/workbench/services/userActivity/common/userActivityRegistry.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IUserActivityService } from 'vs/workbench/services/userActivity/common/userActivityService';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IUserActivityService } from './userActivityService.js';
 
 class UserActivityRegistry {
-	private todo: { new(s: IUserActivityService, ...args: any[]): any }[] = [];
+	private todo: { new(s: IUserActivityService, ...args: any[]): unknown }[] = [];
 
-	public add = (ctor: { new(s: IUserActivityService, ...args: any[]): any }) => {
+	public add = (ctor: { new(s: IUserActivityService, ...args: any[]): unknown }) => {
 		this.todo.push(ctor);
 	};
 
diff --git a/src/vs/workbench/services/userActivity/common/userActivityService.ts b/src/vs/workbench/services/userActivity/common/userActivityService.ts
index fa572bccdae..c2f01932a8a 100644
--- a/src/vs/workbench/services/userActivity/common/userActivityService.ts
+++ b/src/vs/workbench/services/userActivity/common/userActivityService.ts
@@ -3,12 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { RunOnceScheduler, runWhenGlobalIdle } from 'vs/base/common/async';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IInstantiationService, createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { userActivityRegistry } from 'vs/workbench/services/userActivity/common/userActivityRegistry';
+import { disposableTimeout, RunOnceScheduler, runWhenGlobalIdle } from '../../../../base/common/async.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IInstantiationService, createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { userActivityRegistry } from './userActivityRegistry.js';
+
+export interface IMarkActiveOptions {
+	whenHeldFor?: number;
+}
 
 /**
  * Service that observes user activity in the window.
@@ -31,9 +35,11 @@ export interface IUserActivityService {
 	 * Multiple consumers call this method; the user will only be considered
 	 * inactive once all consumers have disposed of their Disposables.
 	 */
-	markActive(): IDisposable;
+	markActive(opts?: IMarkActiveOptions): IDisposable;
 }
 
+const MARK_INACTIVE_DEBOUNCE = 10_000;
+
 export const IUserActivityService = createDecorator<IUserActivityService>('IUserActivityService');
 
 export class UserActivityService extends Disposable implements IUserActivityService {
@@ -41,7 +47,7 @@ export class UserActivityService extends Disposable implements IUserActivityServ
 	private readonly markInactive = this._register(new RunOnceScheduler(() => {
 		this.isActive = false;
 		this.changeEmitter.fire(false);
-	}, 10_000));
+	}, MARK_INACTIVE_DEBOUNCE));
 
 	private readonly changeEmitter = this._register(new Emitter<boolean>);
 	private active = 0;
@@ -64,7 +70,13 @@ export class UserActivityService extends Disposable implements IUserActivityServ
 	}
 
 	/** @inheritdoc */
-	markActive(): IDisposable {
+	markActive(opts?: IMarkActiveOptions): IDisposable {
+		if (opts?.whenHeldFor) {
+			const store = new DisposableStore();
+			store.add(disposableTimeout(() => store.add(this.markActive()), opts.whenHeldFor));
+			return store;
+		}
+
 		if (++this.active === 1) {
 			this.isActive = true;
 			this.changeEmitter.fire(true);
diff --git a/src/vs/workbench/services/userActivity/test/browser/domActivityTracker.test.ts b/src/vs/workbench/services/userActivity/test/browser/domActivityTracker.test.ts
index 94c72c799df..ab65bfc34b4 100644
--- a/src/vs/workbench/services/userActivity/test/browser/domActivityTracker.test.ts
+++ b/src/vs/workbench/services/userActivity/test/browser/domActivityTracker.test.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { DomActivityTracker } from 'vs/workbench/services/userActivity/browser/domActivityTracker';
-import { UserActivityService } from 'vs/workbench/services/userActivity/common/userActivityService';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { DomActivityTracker } from '../../browser/domActivityTracker.js';
+import { UserActivityService } from '../../common/userActivityService.js';
 import * as sinon from 'sinon';
 import assert from 'assert';
 
diff --git a/src/vs/workbench/services/userActivity/test/common/userActivityService.test.ts b/src/vs/workbench/services/userActivity/test/common/userActivityService.test.ts
new file mode 100644
index 00000000000..49b44ece50c
--- /dev/null
+++ b/src/vs/workbench/services/userActivity/test/common/userActivityService.test.ts
@@ -0,0 +1,74 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+
+import * as assert from 'assert';
+import * as sinon from 'sinon';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { IMarkActiveOptions, IUserActivityService, UserActivityService } from '../../common/userActivityService.js';
+
+const MARK_INACTIVE_DEBOUNCE = 10_000;
+
+suite('UserActivityService', () => {
+	let userActivityService: IUserActivityService;
+	let clock: sinon.SinonFakeTimers;
+
+	const ds = ensureNoDisposablesAreLeakedInTestSuite();
+
+	setup(() => {
+		clock = sinon.useFakeTimers();
+		userActivityService = ds.add(new UserActivityService(ds.add(new TestInstantiationService())));
+	});
+
+	teardown(() => {
+		clock.restore();
+	});
+
+	test('isActive should be true initially', () => {
+		assert.ok(userActivityService.isActive);
+	});
+
+	test('markActive should be inactive when all handles gone', () => {
+		const h1 = userActivityService.markActive();
+		const h2 = userActivityService.markActive();
+		assert.strictEqual(userActivityService.isActive, true);
+		h1.dispose();
+		assert.strictEqual(userActivityService.isActive, true);
+		h2.dispose();
+		clock.tick(MARK_INACTIVE_DEBOUNCE);
+		assert.strictEqual(userActivityService.isActive, false);
+	});
+
+	test('markActive sets active whenHeldFor', async () => {
+		userActivityService.markActive().dispose();
+		clock.tick(MARK_INACTIVE_DEBOUNCE);
+
+		const duration = 100; // milliseconds
+		const opts: IMarkActiveOptions = { whenHeldFor: duration };
+		const handle = userActivityService.markActive(opts);
+		assert.strictEqual(userActivityService.isActive, false);
+		clock.tick(duration - 1);
+		assert.strictEqual(userActivityService.isActive, false);
+		clock.tick(1);
+		assert.strictEqual(userActivityService.isActive, true);
+		handle.dispose();
+
+		clock.tick(MARK_INACTIVE_DEBOUNCE);
+		assert.strictEqual(userActivityService.isActive, false);
+	});
+
+	test('markActive whenHeldFor before triggers', async () => {
+		userActivityService.markActive().dispose();
+		clock.tick(MARK_INACTIVE_DEBOUNCE);
+
+		const duration = 100; // milliseconds
+		const opts: IMarkActiveOptions = { whenHeldFor: duration };
+		userActivityService.markActive(opts).dispose();
+		assert.strictEqual(userActivityService.isActive, false);
+		clock.tick(duration + MARK_INACTIVE_DEBOUNCE);
+		assert.strictEqual(userActivityService.isActive, false);
+	});
+});
diff --git a/src/vs/workbench/services/userData/browser/userDataInit.ts b/src/vs/workbench/services/userData/browser/userDataInit.ts
index 8bcdfacb81f..848219e6530 100644
--- a/src/vs/workbench/services/userData/browser/userDataInit.ts
+++ b/src/vs/workbench/services/userData/browser/userDataInit.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions } from 'vs/workbench/common/contributions';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { isWeb } from 'vs/base/common/platform';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { mark } from 'vs/base/common/performance';
+import { createDecorator, IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions } from '../../../common/contributions.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { LifecyclePhase } from '../../lifecycle/common/lifecycle.js';
+import { isWeb } from '../../../../base/common/platform.js';
+import { IExtensionService } from '../../extensions/common/extensions.js';
+import { mark } from '../../../../base/common/performance.js';
 
 export interface IUserDataInitializer {
 	requiresInitialization(): Promise<boolean>;
diff --git a/src/vs/workbench/services/userDataProfile/browser/extensionsResource.ts b/src/vs/workbench/services/userDataProfile/browser/extensionsResource.ts
index 6173c8498f8..57305bd2583 100644
--- a/src/vs/workbench/services/userDataProfile/browser/extensionsResource.ts
+++ b/src/vs/workbench/services/userDataProfile/browser/extensionsResource.ts
@@ -3,27 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Codicon } from 'vs/base/common/codicons';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { localize } from 'vs/nls';
-import { GlobalExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionEnablementService';
-import { EXTENSION_INSTALL_SKIP_WALKTHROUGH_CONTEXT, IExtensionGalleryService, IExtensionIdentifier, IExtensionManagementService, IGlobalExtensionEnablementService, ILocalExtension, InstallExtensionInfo } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { ExtensionType } from 'vs/platform/extensions/common/extensions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { IUserDataProfile, ProfileResourceType } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IUserDataProfileStorageService } from 'vs/platform/userDataProfile/common/userDataProfileStorageService';
-import { ITreeItemCheckboxState, TreeItemCollapsibleState } from 'vs/workbench/common/views';
-import { IProfileResource, IProfileResourceChildTreeItem, IProfileResourceInitializer, IProfileResourceTreeItem, IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { localize } from '../../../../nls.js';
+import { GlobalExtensionEnablementService } from '../../../../platform/extensionManagement/common/extensionEnablementService.js';
+import { EXTENSION_INSTALL_SKIP_WALKTHROUGH_CONTEXT, IExtensionGalleryService, IExtensionIdentifier, IExtensionManagementService, IGlobalExtensionEnablementService, ILocalExtension, InstallExtensionInfo } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { areSameExtensions } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { ExtensionType } from '../../../../platform/extensions/common/extensions.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { IUserDataProfile, ProfileResourceType } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { IUserDataProfileStorageService } from '../../../../platform/userDataProfile/common/userDataProfileStorageService.js';
+import { ITreeItemCheckboxState, TreeItemCollapsibleState } from '../../../common/views.js';
+import { IProfileResource, IProfileResourceChildTreeItem, IProfileResourceInitializer, IProfileResourceTreeItem, IUserDataProfileService } from '../common/userDataProfile.js';
 
 interface IProfileExtension {
 	identifier: IExtensionIdentifier;
 	displayName?: string;
 	preRelease?: boolean;
+	applicationScoped?: boolean;
 	disabled?: boolean;
 	version?: string;
 }
@@ -236,6 +237,7 @@ export class ExtensionsResource implements IProfileResource {
 				if (!profileExtension.version && preRelease) {
 					profileExtension.preRelease = true;
 				}
+				profileExtension.applicationScoped = extension.isApplicationScoped;
 				result.set(profileExtension.identifier.id.toLowerCase(), profileExtension);
 			}
 			return [...result.values()];
@@ -272,14 +274,15 @@ export abstract class ExtensionsResourceTreeItem implements IProfileResourceTree
 
 	protected readonly excludedExtensions = new Set<string>();
 
-	async getChildren(): Promise<IProfileResourceChildTreeItem[]> {
+	async getChildren(): Promise<Array<IProfileResourceChildTreeItem & IProfileExtension>> {
 		const extensions = (await this.getExtensions()).sort((a, b) => (a.displayName ?? a.identifier.id).localeCompare(b.displayName ?? b.identifier.id));
 		const that = this;
-		return extensions.map<IProfileResourceChildTreeItem>(e => ({
+		return extensions.map<IProfileResourceChildTreeItem & IProfileExtension>(e => ({
+			...e,
 			handle: e.identifier.id.toLowerCase(),
 			parent: this,
 			label: { label: e.displayName || e.identifier.id },
-			description: e.disabled ? localize('disabled', "Disabled") : undefined,
+			description: e.applicationScoped ? localize('all profiles and disabled', "All Profiles") : undefined,
 			collapsibleState: TreeItemCollapsibleState.None,
 			checkbox: that.checkbox ? {
 				get isChecked() { return !that.excludedExtensions.has(e.identifier.id.toLowerCase()); },
diff --git a/src/vs/workbench/services/userDataProfile/browser/globalStateResource.ts b/src/vs/workbench/services/userDataProfile/browser/globalStateResource.ts
index 7697f91bfdd..7f095331b1b 100644
--- a/src/vs/workbench/services/userDataProfile/browser/globalStateResource.ts
+++ b/src/vs/workbench/services/userDataProfile/browser/globalStateResource.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IStringDictionary } from 'vs/base/common/collections';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IStorageEntry, IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IUserDataProfile, ProfileResourceType } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IUserDataProfileStorageService } from 'vs/platform/userDataProfile/common/userDataProfileStorageService';
-import { API_OPEN_EDITOR_COMMAND_ID } from 'vs/workbench/browser/parts/editor/editorCommands';
-import { ITreeItemCheckboxState, TreeItemCollapsibleState } from 'vs/workbench/common/views';
-import { IProfileResource, IProfileResourceChildTreeItem, IProfileResourceInitializer, IProfileResourceTreeItem } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
+import { IStringDictionary } from '../../../../base/common/collections.js';
+import { URI } from '../../../../base/common/uri.js';
+import { localize } from '../../../../nls.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IStorageEntry, IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IUserDataProfile, ProfileResourceType } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { IUserDataProfileStorageService } from '../../../../platform/userDataProfile/common/userDataProfileStorageService.js';
+import { API_OPEN_EDITOR_COMMAND_ID } from '../../../browser/parts/editor/editorCommands.js';
+import { ITreeItemCheckboxState, TreeItemCollapsibleState } from '../../../common/views.js';
+import { IProfileResource, IProfileResourceChildTreeItem, IProfileResourceInitializer, IProfileResourceTreeItem } from '../common/userDataProfile.js';
 
 interface IGlobalState {
 	storage: IStringDictionary<string>;
diff --git a/src/vs/workbench/services/userDataProfile/browser/iconSelectBox.ts b/src/vs/workbench/services/userDataProfile/browser/iconSelectBox.ts
index e74f52687cd..2d41934877a 100644
--- a/src/vs/workbench/services/userDataProfile/browser/iconSelectBox.ts
+++ b/src/vs/workbench/services/userDataProfile/browser/iconSelectBox.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IIconSelectBoxOptions, IconSelectBox } from 'vs/base/browser/ui/icons/iconSelectBox';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import * as dom from 'vs/base/browser/dom';
-import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { IIconSelectBoxOptions, IconSelectBox } from '../../../../base/browser/ui/icons/iconSelectBox.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import * as dom from '../../../../base/browser/dom.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 
 export const WorkbenchIconSelectBoxFocusContextKey = new RawContextKey<boolean>('iconSelectBoxFocus', true);
 export const WorkbenchIconSelectBoxInputFocusContextKey = new RawContextKey<boolean>('iconSelectBoxInputFocus', true);
diff --git a/src/vs/workbench/services/userDataProfile/browser/keybindingsResource.ts b/src/vs/workbench/services/userDataProfile/browser/keybindingsResource.ts
index a99f346d633..de6a027a042 100644
--- a/src/vs/workbench/services/userDataProfile/browser/keybindingsResource.ts
+++ b/src/vs/workbench/services/userDataProfile/browser/keybindingsResource.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { FileOperationError, FileOperationResult, IFileService } from 'vs/platform/files/common/files';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProfileResource, IProfileResourceChildTreeItem, IProfileResourceInitializer, IProfileResourceTreeItem, IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { platform, Platform } from 'vs/base/common/platform';
-import { ITreeItemCheckboxState, TreeItemCollapsibleState } from 'vs/workbench/common/views';
-import { IUserDataProfile, ProfileResourceType } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { API_OPEN_EDITOR_COMMAND_ID } from 'vs/workbench/browser/parts/editor/editorCommands';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { localize } from 'vs/nls';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { FileOperationError, FileOperationResult, IFileService } from '../../../../platform/files/common/files.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IProfileResource, IProfileResourceChildTreeItem, IProfileResourceInitializer, IProfileResourceTreeItem, IUserDataProfileService } from '../common/userDataProfile.js';
+import { platform, Platform } from '../../../../base/common/platform.js';
+import { ITreeItemCheckboxState, TreeItemCollapsibleState } from '../../../common/views.js';
+import { IUserDataProfile, ProfileResourceType } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { API_OPEN_EDITOR_COMMAND_ID } from '../../../browser/parts/editor/editorCommands.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { localize } from '../../../../nls.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
 
 interface IKeybindingsResourceContent {
 	platform: Platform;
diff --git a/src/vs/workbench/services/userDataProfile/browser/settingsResource.ts b/src/vs/workbench/services/userDataProfile/browser/settingsResource.ts
index 06bddb291d5..e268a0b1beb 100644
--- a/src/vs/workbench/services/userDataProfile/browser/settingsResource.ts
+++ b/src/vs/workbench/services/userDataProfile/browser/settingsResource.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { ConfigurationScope, Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { FileOperationError, FileOperationResult, IFileService } from 'vs/platform/files/common/files';
-import { ILogService } from 'vs/platform/log/common/log';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IProfileResource, IProfileResourceChildTreeItem, IProfileResourceInitializer, IProfileResourceTreeItem, IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { updateIgnoredSettings } from 'vs/platform/userDataSync/common/settingsMerge';
-import { IUserDataSyncUtilService } from 'vs/platform/userDataSync/common/userDataSync';
-import { ITreeItemCheckboxState, TreeItemCollapsibleState } from 'vs/workbench/common/views';
-import { IUserDataProfile, ProfileResourceType } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { API_OPEN_EDITOR_COMMAND_ID } from 'vs/workbench/browser/parts/editor/editorCommands';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { localize } from 'vs/nls';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { ConfigurationScope, Extensions, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { FileOperationError, FileOperationResult, IFileService } from '../../../../platform/files/common/files.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IProfileResource, IProfileResourceChildTreeItem, IProfileResourceInitializer, IProfileResourceTreeItem, IUserDataProfileService } from '../common/userDataProfile.js';
+import { updateIgnoredSettings } from '../../../../platform/userDataSync/common/settingsMerge.js';
+import { IUserDataSyncUtilService } from '../../../../platform/userDataSync/common/userDataSync.js';
+import { ITreeItemCheckboxState, TreeItemCollapsibleState } from '../../../common/views.js';
+import { IUserDataProfile, ProfileResourceType } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { API_OPEN_EDITOR_COMMAND_ID } from '../../../browser/parts/editor/editorCommands.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { localize } from '../../../../nls.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
 
 interface ISettingsContent {
 	settings: string | null;
diff --git a/src/vs/workbench/services/userDataProfile/browser/snippetsResource.ts b/src/vs/workbench/services/userDataProfile/browser/snippetsResource.ts
index c4b72833b41..7b29090f272 100644
--- a/src/vs/workbench/services/userDataProfile/browser/snippetsResource.ts
+++ b/src/vs/workbench/services/userDataProfile/browser/snippetsResource.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { ResourceSet } from 'vs/base/common/map';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { FileOperationError, FileOperationResult, IFileService, IFileStat } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IUserDataProfile, ProfileResourceType } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { API_OPEN_EDITOR_COMMAND_ID } from 'vs/workbench/browser/parts/editor/editorCommands';
-import { ITreeItemCheckboxState, TreeItemCollapsibleState } from 'vs/workbench/common/views';
-import { IProfileResource, IProfileResourceChildTreeItem, IProfileResourceInitializer, IProfileResourceTreeItem, IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { IStringDictionary } from '../../../../base/common/collections.js';
+import { ResourceSet } from '../../../../base/common/map.js';
+import { URI } from '../../../../base/common/uri.js';
+import { localize } from '../../../../nls.js';
+import { FileOperationError, FileOperationResult, IFileService, IFileStat } from '../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IUserDataProfile, ProfileResourceType } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { API_OPEN_EDITOR_COMMAND_ID } from '../../../browser/parts/editor/editorCommands.js';
+import { ITreeItemCheckboxState, TreeItemCollapsibleState } from '../../../common/views.js';
+import { IProfileResource, IProfileResourceChildTreeItem, IProfileResourceInitializer, IProfileResourceTreeItem, IUserDataProfileService } from '../common/userDataProfile.js';
 
 interface ISnippetsContent {
 	snippets: IStringDictionary<string>;
diff --git a/src/vs/workbench/services/userDataProfile/browser/tasksResource.ts b/src/vs/workbench/services/userDataProfile/browser/tasksResource.ts
index 510e58bcfe0..b65807be825 100644
--- a/src/vs/workbench/services/userDataProfile/browser/tasksResource.ts
+++ b/src/vs/workbench/services/userDataProfile/browser/tasksResource.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { localize } from 'vs/nls';
-import { FileOperationError, FileOperationResult, IFileService } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IUserDataProfile, ProfileResourceType } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { API_OPEN_EDITOR_COMMAND_ID } from 'vs/workbench/browser/parts/editor/editorCommands';
-import { ITreeItemCheckboxState, TreeItemCollapsibleState } from 'vs/workbench/common/views';
-import { IProfileResource, IProfileResourceChildTreeItem, IProfileResourceInitializer, IProfileResourceTreeItem, IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { localize } from '../../../../nls.js';
+import { FileOperationError, FileOperationResult, IFileService } from '../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IUserDataProfile, ProfileResourceType } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { API_OPEN_EDITOR_COMMAND_ID } from '../../../browser/parts/editor/editorCommands.js';
+import { ITreeItemCheckboxState, TreeItemCollapsibleState } from '../../../common/views.js';
+import { IProfileResource, IProfileResourceChildTreeItem, IProfileResourceInitializer, IProfileResourceTreeItem, IUserDataProfileService } from '../common/userDataProfile.js';
 
 interface ITasksResourceContent {
 	tasks: string | null;
@@ -84,7 +84,7 @@ export class TasksResourceTreeItem implements IProfileResourceTreeItem {
 
 	readonly type = ProfileResourceType.Tasks;
 	readonly handle = ProfileResourceType.Tasks;
-	readonly label = { label: localize('tasks', "User Tasks") };
+	readonly label = { label: localize('tasks', "Tasks") };
 	readonly collapsibleState = TreeItemCollapsibleState.Expanded;
 	checkbox: ITreeItemCheckboxState | undefined;
 
diff --git a/src/vs/workbench/services/userDataProfile/browser/userDataProfileImportExportService.ts b/src/vs/workbench/services/userDataProfile/browser/userDataProfileImportExportService.ts
index 6a28cadf448..183112673fd 100644
--- a/src/vs/workbench/services/userDataProfile/browser/userDataProfileImportExportService.ts
+++ b/src/vs/workbench/services/userDataProfile/browser/userDataProfileImportExportService.ts
@@ -3,84 +3,42 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/userDataProfileView';
-import { localize } from 'vs/nls';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { Emitter, Event } from 'vs/base/common/event';
-import * as DOM from 'vs/base/browser/dom';
-import { IUserDataProfileImportExportService, PROFILE_FILTER, PROFILE_EXTENSION, IUserDataProfileContentHandler, IS_PROFILE_IMPORT_IN_PROGRESS_CONTEXT, PROFILES_TITLE, defaultUserDataProfileIcon, IUserDataProfileService, IProfileResourceTreeItem, PROFILES_CATEGORY, IUserDataProfileManagementService, IS_PROFILE_EXPORT_IN_PROGRESS_CONTEXT, ISaveProfileResult, IProfileImportOptions, PROFILE_URL_AUTHORITY, toUserDataProfileUri, IUserDataProfileCreateOptions } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IDialogService, IFileDialogService, IPromptButton } from 'vs/platform/dialogs/common/dialogs';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { IFileService } from 'vs/platform/files/common/files';
-import { URI } from 'vs/base/common/uri';
-import { Extensions, ITreeItem, ITreeViewDataProvider, ITreeViewDescriptor, IViewContainersRegistry, IViewDescriptorService, IViewsRegistry, TreeItemCollapsibleState, ViewContainer, ViewContainerLocation } from 'vs/workbench/common/views';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { IUserDataProfile, IUserDataProfileOptions, IUserDataProfilesService, ProfileResourceType, ProfileResourceTypeFlags, UseDefaultProfileFlags, isUserDataProfile, toUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { ContextKeyExpr, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
-import { TreeView, TreeViewPane } from 'vs/workbench/browser/parts/views/treeView';
-import { SettingsResource, SettingsResourceTreeItem } from 'vs/workbench/services/userDataProfile/browser/settingsResource';
-import { KeybindingsResource, KeybindingsResourceTreeItem } from 'vs/workbench/services/userDataProfile/browser/keybindingsResource';
-import { SnippetsResource, SnippetsResourceTreeItem } from 'vs/workbench/services/userDataProfile/browser/snippetsResource';
-import { TasksResource, TasksResourceTreeItem } from 'vs/workbench/services/userDataProfile/browser/tasksResource';
-import { ExtensionsResource, ExtensionsResourceExportTreeItem, ExtensionsResourceImportTreeItem, ExtensionsResourceTreeItem } from 'vs/workbench/services/userDataProfile/browser/extensionsResource';
-import { GlobalStateResource, GlobalStateResourceExportTreeItem, GlobalStateResourceImportTreeItem, GlobalStateResourceTreeItem } from 'vs/workbench/services/userDataProfile/browser/globalStateResource';
-import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
-import { Button } from 'vs/base/browser/ui/button/button';
-import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { defaultButtonStyles, defaultInputBoxStyles, defaultSelectBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { generateUuid } from 'vs/base/common/uuid';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { EditorsOrder } from 'vs/workbench/common/editor';
-import { getErrorMessage, onUnexpectedError } from 'vs/base/common/errors';
-import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IQuickInputService, IQuickPickItem, QuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { joinPath } from 'vs/base/common/resources';
-import { escapeRegExpCharacters } from 'vs/base/common/strings';
-import { Schemas } from 'vs/base/common/network';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import Severity from 'vs/base/common/severity';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { IURLHandler, IURLService } from 'vs/platform/url/common/url';
-import { asText, IRequestService } from 'vs/platform/request/common/request';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { Mutable, isUndefined } from 'vs/base/common/types';
-import { Action, ActionRunner, IAction, IActionRunner } from 'vs/base/common/actions';
-import { isWeb } from 'vs/base/common/platform';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { Codicon, getAllCodicons } from 'vs/base/common/codicons';
-import { Barrier, CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
-import { IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { ExtensionType } from 'vs/platform/extensions/common/extensions';
-import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { renderMarkdown } from 'vs/base/browser/markdownRenderer';
-import { showWindowLogActionId } from 'vs/workbench/services/log/common/logConstants';
-import { ISelectOptionItem, SelectBox } from 'vs/base/browser/ui/selectBox/selectBox';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { HoverPosition } from 'vs/base/browser/ui/hover/hoverWidget';
-import { DEFAULT_ICON, ICONS } from 'vs/workbench/services/userDataProfile/common/userDataProfileIcons';
-import { WorkbenchIconSelectBox } from 'vs/workbench/services/userDataProfile/browser/iconSelectBox';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import type { IHoverWidget } from 'vs/base/browser/ui/hover/hover';
-import { IAccessibleViewInformationService } from 'vs/workbench/services/accessibility/common/accessibleViewInformationService';
-import { ILogService } from 'vs/platform/log/common/log';
+import './media/userDataProfileView.css';
+import { localize } from '../../../../nls.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { IUserDataProfileImportExportService, PROFILE_FILTER, PROFILE_EXTENSION, IUserDataProfileContentHandler, IUserDataProfileService, IProfileResourceTreeItem, PROFILES_CATEGORY, IUserDataProfileManagementService, ISaveProfileResult, IProfileImportOptions, PROFILE_URL_AUTHORITY, toUserDataProfileUri, IUserDataProfileCreateOptions, isProfileURL, PROFILE_URL_AUTHORITY_PREFIX } from '../common/userDataProfile.js';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { IDialogService, IFileDialogService, IPromptButton } from '../../../../platform/dialogs/common/dialogs.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { ITextFileService } from '../../textfile/common/textfiles.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ITreeItem, ITreeViewDataProvider } from '../../../common/views.js';
+import { IUserDataProfile, IUserDataProfileOptions, IUserDataProfilesService, ProfileResourceType, ProfileResourceTypeFlags } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { SettingsResource, SettingsResourceTreeItem } from './settingsResource.js';
+import { KeybindingsResource, KeybindingsResourceTreeItem } from './keybindingsResource.js';
+import { SnippetsResource, SnippetsResourceTreeItem } from './snippetsResource.js';
+import { TasksResource, TasksResourceTreeItem } from './tasksResource.js';
+import { ExtensionsResource, ExtensionsResourceExportTreeItem, ExtensionsResourceTreeItem } from './extensionsResource.js';
+import { GlobalStateResource, GlobalStateResourceExportTreeItem, GlobalStateResourceTreeItem } from './globalStateResource.js';
+import { InMemoryFileSystemProvider } from '../../../../platform/files/common/inMemoryFilesystemProvider.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IProgressService, ProgressLocation } from '../../../../platform/progress/common/progress.js';
+import { IExtensionService } from '../../extensions/common/extensions.js';
+import { IQuickInputService, QuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { joinPath } from '../../../../base/common/resources.js';
+import { escapeRegExpCharacters } from '../../../../base/common/strings.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import Severity from '../../../../base/common/severity.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { asText, IRequestService } from '../../../../platform/request/common/request.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { Mutable, isUndefined } from '../../../../base/common/types.js';
+import { CancelablePromise, createCancelablePromise } from '../../../../base/common/async.js';
 
 interface IUserDataProfileTemplate {
 	readonly name: string;
@@ -104,81 +62,31 @@ function isUserDataProfileTemplate(thing: unknown): thing is IUserDataProfileTem
 		&& (isUndefined(candidate.extensions) || typeof candidate.extensions === 'string'));
 }
 
-const EXPORT_PROFILE_PREVIEW_VIEW = 'workbench.views.profiles.export.preview';
-const IMPORT_PROFILE_PREVIEW_VIEW = 'workbench.views.profiles.import.preview';
-
-export class UserDataProfileImportExportService extends Disposable implements IUserDataProfileImportExportService, IURLHandler {
-
-	private static readonly PROFILE_URL_AUTHORITY_PREFIX = 'profile-';
+export class UserDataProfileImportExportService extends Disposable implements IUserDataProfileImportExportService {
 
 	readonly _serviceBrand: undefined;
 
 	private profileContentHandlers = new Map<string, IUserDataProfileContentHandler>();
-	private readonly isProfileExportInProgressContextKey: IContextKey<boolean>;
-	private readonly isProfileImportInProgressContextKey: IContextKey<boolean>;
 
-	private readonly viewContainer: ViewContainer;
 	private readonly fileUserDataProfileContentHandler: FileUserDataProfileContentHandler;
 
 	constructor(
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IUserDataProfileService private readonly userDataProfileService: IUserDataProfileService,
-		@IViewsService private readonly viewsService: IViewsService,
-		@IEditorService private readonly editorService: IEditorService,
-		@IContextKeyService contextKeyService: IContextKeyService,
 		@IUserDataProfileManagementService private readonly userDataProfileManagementService: IUserDataProfileManagementService,
 		@IUserDataProfilesService private readonly userDataProfilesService: IUserDataProfilesService,
 		@IExtensionService private readonly extensionService: IExtensionService,
-		@IExtensionManagementService private readonly extensionManagementService: IExtensionManagementService,
 		@IQuickInputService private readonly quickInputService: IQuickInputService,
-		@INotificationService private readonly notificationService: INotificationService,
 		@IProgressService private readonly progressService: IProgressService,
 		@IDialogService private readonly dialogService: IDialogService,
 		@IClipboardService private readonly clipboardService: IClipboardService,
 		@IOpenerService private readonly openerService: IOpenerService,
 		@IRequestService private readonly requestService: IRequestService,
-		@IURLService urlService: IURLService,
 		@IProductService private readonly productService: IProductService,
 		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
-		@ITelemetryService private readonly telemetryService: ITelemetryService,
-		@IContextViewService private readonly contextViewService: IContextViewService,
-		@IHoverService private readonly hoverService: IHoverService,
-		@ILogService private readonly logService: ILogService,
 	) {
 		super();
 		this.registerProfileContentHandler(Schemas.file, this.fileUserDataProfileContentHandler = instantiationService.createInstance(FileUserDataProfileContentHandler));
-		this.isProfileExportInProgressContextKey = IS_PROFILE_EXPORT_IN_PROGRESS_CONTEXT.bindTo(contextKeyService);
-		this.isProfileImportInProgressContextKey = IS_PROFILE_IMPORT_IN_PROGRESS_CONTEXT.bindTo(contextKeyService);
-
-		this.viewContainer = Registry.as<IViewContainersRegistry>(Extensions.ViewContainersRegistry).registerViewContainer(
-			{
-				id: 'userDataProfiles',
-				title: PROFILES_TITLE,
-				ctorDescriptor: new SyncDescriptor(
-					ViewPaneContainer,
-					['userDataProfiles', { mergeViewWithContainerWhenSingleView: true }]
-				),
-				icon: defaultUserDataProfileIcon,
-				hideIfEmpty: true,
-			}, ViewContainerLocation.Sidebar);
-
-		urlService.registerHandler(this);
-	}
-
-	private isProfileURL(uri: URI): boolean {
-		return uri.authority === PROFILE_URL_AUTHORITY || new RegExp(`^${UserDataProfileImportExportService.PROFILE_URL_AUTHORITY_PREFIX}`).test(uri.authority);
-	}
-
-	async handleURL(uri: URI): Promise<boolean> {
-		if (this.isProfileURL(uri)) {
-			try {
-				await this.importProfile(uri);
-			} catch (error) {
-				this.notificationService.error(localize('profile import error', "Error while importing profile: {0}", getErrorMessage(error)));
-			}
-			return true;
-		}
-		return false;
 	}
 
 	registerProfileContentHandler(id: string, profileContentHandler: IUserDataProfileContentHandler): IDisposable {
@@ -193,55 +101,6 @@ export class UserDataProfileImportExportService extends Disposable implements IU
 		this.profileContentHandlers.delete(id);
 	}
 
-	async exportProfile2(): Promise<void> {
-		if (this.isProfileExportInProgressContextKey.get()) {
-			this.logService.warn('Profile export already in progress.');
-			return;
-		}
-
-		return this.showProfileContents();
-	}
-
-	async importProfile(uri: URI, options?: IProfileImportOptions): Promise<void> {
-		if (this.isProfileImportInProgressContextKey.get()) {
-			this.notificationService.warn('Profile import already in progress.');
-			return;
-		}
-
-		this.isProfileImportInProgressContextKey.set(true);
-		const disposables = new DisposableStore();
-		disposables.add(toDisposable(() => this.isProfileImportInProgressContextKey.set(false)));
-
-		try {
-			const mode = options?.mode ?? 'preview';
-			const profileTemplate = await this.progressService.withProgress({
-				location: ProgressLocation.Window,
-				command: showWindowLogActionId,
-				title: localize('resolving uri', "{0}: Resolving profile content...", options?.mode ? localize('preview profile', "Preview Profile") : localize('import profile', "Create Profile")),
-			}, () => this.resolveProfileTemplate(uri, options));
-			if (!profileTemplate) {
-				return;
-			}
-			if (mode === 'preview') {
-				await this.previewProfile(profileTemplate, options);
-			} else if (mode === 'apply') {
-				await this.createAndSwitch(profileTemplate, !!options?.transient, true, options, localize('create profile', "Create Profile"));
-			} else if (mode === 'both') {
-				await this.importAndPreviewProfile(uri, profileTemplate, options);
-			}
-		} finally {
-			disposables.dispose();
-		}
-	}
-
-	createProfile(from?: IUserDataProfile | URI): Promise<void> {
-		return this.saveProfile(undefined, from);
-	}
-
-	editProfile(profile: IUserDataProfile): Promise<void> {
-		return this.saveProfile(profile);
-	}
-
 	async createFromProfile(from: IUserDataProfile, options: IUserDataProfileCreateOptions, token: CancellationToken): Promise<IUserDataProfile | undefined> {
 		const disposables = new DisposableStore();
 		let creationPromise: CancelablePromise<void>;
@@ -359,371 +218,16 @@ export class UserDataProfileImportExportService extends Disposable implements IU
 		}
 	}
 
-	private saveProfile(profile: IUserDataProfile): Promise<void>;
-	private saveProfile(profile?: IUserDataProfile, source?: IUserDataProfile | URI | IUserDataProfileTemplate): Promise<void>;
-	private async saveProfile(profile?: IUserDataProfile, source?: IUserDataProfile | URI | Mutable<IUserDataProfileTemplate>): Promise<void> {
-
-		type SaveProfileInfoClassification = {
-			owner: 'sandy081';
-			comment: 'Report when profile is about to be saved';
-		};
-		type CreateProfileInfoClassification = {
-			owner: 'sandy081';
-			comment: 'Report when profile is about to be created';
-			source: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Type of profile source' };
-		};
-		type CreateProfileInfoEvent = {
-			source: string | undefined;
-		};
-		const createProfileTelemetryData: CreateProfileInfoEvent = { source: source instanceof URI ? 'template' : isUserDataProfile(source) ? 'profile' : source ? 'external' : undefined };
-
-		if (profile) {
-			this.telemetryService.publicLog2<{}, SaveProfileInfoClassification>('userDataProfile.startEdit');
-		} else {
-			this.telemetryService.publicLog2<CreateProfileInfoEvent, CreateProfileInfoClassification>('userDataProfile.startCreate', createProfileTelemetryData);
-		}
-
-		const disposables = new DisposableStore();
-		const title = profile ? localize('save profile', "Edit {0} Profile...", profile.name) : localize('create new profle', "Create New Profile...");
-
-		const settings: IQuickPickItem & { id: ProfileResourceType } = { id: ProfileResourceType.Settings, label: localize('settings', "Settings"), picked: !profile?.useDefaultFlags?.settings };
-		const keybindings: IQuickPickItem & { id: ProfileResourceType } = { id: ProfileResourceType.Keybindings, label: localize('keybindings', "Keyboard Shortcuts"), picked: !profile?.useDefaultFlags?.keybindings };
-		const snippets: IQuickPickItem & { id: ProfileResourceType } = { id: ProfileResourceType.Snippets, label: localize('snippets', "User Snippets"), picked: !profile?.useDefaultFlags?.snippets };
-		const tasks: IQuickPickItem & { id: ProfileResourceType } = { id: ProfileResourceType.Tasks, label: localize('tasks', "User Tasks"), picked: !profile?.useDefaultFlags?.tasks };
-		const extensions: IQuickPickItem & { id: ProfileResourceType } = { id: ProfileResourceType.Extensions, label: localize('extensions', "Extensions"), picked: !profile?.useDefaultFlags?.extensions };
-		const resources = [settings, keybindings, snippets, tasks, extensions];
-
-		const quickPick = this.quickInputService.createQuickPick();
-		quickPick.title = title;
-		quickPick.placeholder = localize('name placeholder', "Profile name");
-		quickPick.value = profile?.name ?? (isUserDataProfileTemplate(source) ? this.generateProfileName(source.name) : '');
-		quickPick.canSelectMany = true;
-		quickPick.matchOnDescription = false;
-		quickPick.matchOnDetail = false;
-		quickPick.matchOnLabel = false;
-		quickPick.sortByLabel = false;
-		quickPick.hideCountBadge = true;
-		quickPick.ok = false;
-		quickPick.customButton = true;
-		quickPick.hideCheckAll = true;
-		quickPick.ignoreFocusOut = true;
-		quickPick.customLabel = profile ? localize('save', "Save") : localize('create', "Create");
-		quickPick.description = localize('customise the profile', "Choose what to configure in your Profile:");
-		quickPick.items = [...resources];
-
-		const update = () => {
-			quickPick.items = resources;
-			quickPick.selectedItems = resources.filter(item => item.picked);
-		};
-		update();
-
-		const validate = () => {
-			if (!profile && this.userDataProfilesService.profiles.some(p => p.name === quickPick.value)) {
-				quickPick.validationMessage = localize('profileExists', "Profile with name {0} already exists.", quickPick.value);
-				quickPick.severity = Severity.Warning;
-				return;
-			}
-			if (resources.every(resource => !resource.picked)) {
-				quickPick.validationMessage = localize('invalid configurations', "The profile should contain at least one configuration.");
-				quickPick.severity = Severity.Warning;
-				return;
-			}
-			quickPick.severity = Severity.Ignore;
-			quickPick.validationMessage = undefined;
-		};
-
-		disposables.add(quickPick.onDidChangeSelection(items => {
-			let needUpdate = false;
-			for (const resource of resources) {
-				resource.picked = items.includes(resource);
-				const description = resource.picked ? undefined : localize('use default profile', "Using Default Profile");
-				if (resource.description !== description) {
-					resource.description = description;
-					needUpdate = true;
-				}
-			}
-			if (needUpdate) {
-				update();
-			}
-			validate();
-		}));
-
-		disposables.add(quickPick.onDidChangeValue(validate));
-
-		let icon = DEFAULT_ICON;
-		if (profile?.icon) {
-			icon = ThemeIcon.fromId(profile.icon);
-		}
-		if (isUserDataProfileTemplate(source) && source.icon) {
-			icon = ThemeIcon.fromId(source.icon);
-		}
-		if (icon.id !== DEFAULT_ICON.id && !ICONS.some(({ id }) => id === icon.id) && !getAllCodicons().some(({ id }) => id === icon.id)) {
-			icon = DEFAULT_ICON;
-		}
-		let result: { name: string; items: ReadonlyArray<IQuickPickItem>; icon?: string | null } | undefined;
-		disposables.add(Event.any(quickPick.onDidCustom, quickPick.onDidAccept)(() => {
-			const name = quickPick.value.trim();
-			if (!name) {
-				quickPick.validationMessage = localize('name required', "Profile name is required and must be a non-empty value.");
-				quickPick.severity = Severity.Error;
-			}
-			if (quickPick.validationMessage) {
-				return;
-			}
-			result = { name, items: quickPick.selectedItems, icon: icon.id === DEFAULT_ICON.id ? null : icon.id };
-			quickPick.hide();
-			quickPick.severity = Severity.Ignore;
-			quickPick.validationMessage = undefined;
-		}));
-
-		const domNode = DOM.$('.profile-edit-widget');
-
-		const profileIconContainer = DOM.$('.profile-icon-container');
-		DOM.append(profileIconContainer, DOM.$('.profile-icon-label', undefined, localize('icon', "Icon:")));
-		const profileIconElement = DOM.append(profileIconContainer, DOM.$(`.profile-icon${ThemeIcon.asCSSSelector(icon)}`));
-		profileIconElement.tabIndex = 0;
-		profileIconElement.role = 'button';
-		profileIconElement.ariaLabel = localize('select icon', "Icon: {0}", icon.id);
-		const iconSelectBox = disposables.add(this.instantiationService.createInstance(WorkbenchIconSelectBox, { icons: ICONS, inputBoxStyles: defaultInputBoxStyles }));
-		const dimension = new DOM.Dimension(486, 260);
-		iconSelectBox.layout(dimension);
-		let hoverWidget: IHoverWidget | undefined;
-
-		const updateIcon = (updated: ThemeIcon | undefined) => {
-			icon = updated ?? DEFAULT_ICON;
-			profileIconElement.className = `profile-icon ${ThemeIcon.asClassName(icon)}`;
-			profileIconElement.ariaLabel = localize('select icon', "Icon: {0}", icon.id);
-		};
-		disposables.add(iconSelectBox.onDidSelect(selectedIcon => {
-			if (icon.id !== selectedIcon.id) {
-				updateIcon(selectedIcon);
-			}
-			hoverWidget?.dispose();
-			profileIconElement.focus();
-		}));
-		const showIconSelectBox = () => {
-			iconSelectBox.clearInput();
-			hoverWidget = this.hoverService.showHover({
-				content: iconSelectBox.domNode,
-				target: profileIconElement,
-				position: {
-					hoverPosition: HoverPosition.BELOW,
-				},
-				persistence: {
-					sticky: true,
-				},
-				appearance: {
-					showPointer: true,
-				},
-			}, true);
-			if (hoverWidget) {
-				iconSelectBox.layout(dimension);
-				disposables.add(hoverWidget);
-			}
-			iconSelectBox.focus();
-		};
-		disposables.add(DOM.addDisposableListener(profileIconElement, DOM.EventType.CLICK, (e: MouseEvent) => {
-			DOM.EventHelper.stop(e, true);
-			showIconSelectBox();
-		}));
-		disposables.add(DOM.addDisposableListener(profileIconElement, DOM.EventType.KEY_DOWN, e => {
-			const event = new StandardKeyboardEvent(e);
-			if (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) {
-				DOM.EventHelper.stop(event, true);
-				showIconSelectBox();
-			}
-		}));
-		disposables.add(DOM.addDisposableListener(iconSelectBox.domNode, DOM.EventType.KEY_DOWN, e => {
-			const event = new StandardKeyboardEvent(e);
-			if (event.equals(KeyCode.Escape)) {
-				DOM.EventHelper.stop(event, true);
-				hoverWidget?.dispose();
-				profileIconElement.focus();
-			}
-		}));
-
-		if (!profile && !isUserDataProfileTemplate(source)) {
-			const profileTypeContainer = DOM.append(domNode, DOM.$('.profile-type-container'));
-			DOM.append(profileTypeContainer, DOM.$('.profile-type-create-label', undefined, localize('create from', "Copy from:")));
-			const separator = { text: '\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500', isDisabled: true };
-			const profileOptions: (ISelectOptionItem & { id?: string; source?: IUserDataProfile | URI })[] = [];
-			profileOptions.push({ text: localize('empty profile', "None") });
-			const templates = await this.userDataProfileManagementService.getBuiltinProfileTemplates();
-			if (templates.length) {
-				profileOptions.push({ ...separator, decoratorRight: localize('from templates', "Profile Templates") });
-				for (const template of templates) {
-					profileOptions.push({ text: template.name, id: template.url, source: URI.parse(template.url) });
-				}
-			}
-			profileOptions.push({ ...separator, decoratorRight: localize('from existing profiles', "Existing Profiles") });
-			for (const profile of this.userDataProfilesService.profiles) {
-				profileOptions.push({ text: profile.name, id: profile.id, source: profile });
-			}
-
-			const findOptionIndex = () => {
-				const index = profileOptions.findIndex(option => {
-					if (source instanceof URI) {
-						return option.source instanceof URI && this.uriIdentityService.extUri.isEqual(option.source, source);
-					} else if (isUserDataProfile(source)) {
-						return option.id === source.id;
-					}
-					return false;
-				});
-				return index > -1 ? index : 0;
-			};
-
-			const initialIndex = findOptionIndex();
-			const selectBox = disposables.add(this.instantiationService.createInstance(SelectBox,
-				profileOptions,
-				initialIndex,
-				this.contextViewService,
-				defaultSelectBoxStyles,
-				{
-					useCustomDrawn: true,
-					ariaLabel: localize('copy profile from', "Copy profile from"),
-				}
-			));
-			selectBox.render(DOM.append(profileTypeContainer, DOM.$('.profile-type-select-container')));
-
-			if (profileOptions[initialIndex].source) {
-				quickPick.value = this.generateProfileName(profileOptions[initialIndex].text);
-			}
-
-			const updateOptions = () => {
-				const option = profileOptions[findOptionIndex()];
-				for (const resource of resources) {
-					resource.picked = option.source && !(option.source instanceof URI) ? !option.source?.useDefaultFlags?.[resource.id] : true;
-				}
-				updateIcon(!(option.source instanceof URI) && option.source?.icon ? ThemeIcon.fromId(option.source.icon) : undefined);
-				update();
-			};
-
-			updateOptions();
-			disposables.add(selectBox.onDidSelect(({ index }) => {
-				source = profileOptions[index].source;
-				updateOptions();
-			}));
-		}
-
-		DOM.append(domNode, profileIconContainer);
-
-		quickPick.widget = domNode;
-		quickPick.show();
-
-		await new Promise<void>((c, e) => {
-			disposables.add(quickPick.onDidHide(() => {
-				disposables.dispose();
-				c();
-			}));
-		});
-
-		if (!result) {
-			if (profile) {
-				this.telemetryService.publicLog2<{}, SaveProfileInfoClassification>('userDataProfile.cancelEdit');
-			} else {
-				this.telemetryService.publicLog2<CreateProfileInfoEvent, CreateProfileInfoClassification>('userDataProfile.cancelCreate', createProfileTelemetryData);
-			}
-			return;
-		}
-
-		try {
-			const useDefaultFlags: UseDefaultProfileFlags | undefined = result.items.length === resources.length
-				? undefined
-				: {
-					settings: !result.items.includes(settings),
-					keybindings: !result.items.includes(keybindings),
-					snippets: !result.items.includes(snippets),
-					tasks: !result.items.includes(tasks),
-					extensions: !result.items.includes(extensions)
-				};
-			if (profile) {
-				await this.userDataProfileManagementService.updateProfile(profile, { name: result.name, icon: result.icon, useDefaultFlags: profile.useDefaultFlags && !useDefaultFlags ? {} : useDefaultFlags });
-			} else {
-				if (source instanceof URI) {
-					this.telemetryService.publicLog2<CreateProfileInfoEvent, CreateProfileInfoClassification>('userDataProfile.createFromTemplate', createProfileTelemetryData);
-					await this.importProfile(source, { mode: 'apply', name: result.name, useDefaultFlags, icon: result.icon ? result.icon : undefined });
-				} else if (isUserDataProfile(source)) {
-					this.telemetryService.publicLog2<CreateProfileInfoEvent, CreateProfileInfoClassification>('userDataProfile.createFromProfile', createProfileTelemetryData);
-					await this._createFromProfile(source, result.name, { useDefaultFlags, icon: result.icon ? result.icon : undefined });
-				} else if (isUserDataProfileTemplate(source)) {
-					source.name = result.name;
-					this.telemetryService.publicLog2<CreateProfileInfoEvent, CreateProfileInfoClassification>('userDataProfile.createFromExternalTemplate', createProfileTelemetryData);
-					await this.createAndSwitch(source, false, true, { useDefaultFlags, icon: result.icon ? result.icon : undefined }, localize('create profile', "Create Profile"));
-				} else {
-					this.telemetryService.publicLog2<CreateProfileInfoEvent, CreateProfileInfoClassification>('userDataProfile.createEmptyProfile', createProfileTelemetryData);
-					await this.userDataProfileManagementService.createAndEnterProfile(result.name, { useDefaultFlags, icon: result.icon ? result.icon : undefined });
-				}
-			}
-		} catch (error) {
-			this.notificationService.error(error);
-		}
-	}
-
-	async showProfileContents(): Promise<void> {
-		const view = this.viewsService.getViewWithId(EXPORT_PROFILE_PREVIEW_VIEW);
-		if (view) {
-			this.viewsService.openView(view.id, true);
-			return;
-		}
+	async exportProfile(profile: IUserDataProfile, exportFlags?: ProfileResourceTypeFlags): Promise<void> {
 		const disposables = new DisposableStore();
 		try {
-			const userDataProfilesExportState = disposables.add(this.instantiationService.createInstance(UserDataProfileExportState, this.userDataProfileService.currentProfile, undefined));
-			const barrier = new Barrier();
-			const exportAction = new BarrierAction(barrier, new Action('export', localize('export', "Export"), undefined, true, async () => {
-				exportAction.enabled = false;
-				try {
-					await this.doExportProfile(userDataProfilesExportState, EXPORT_PROFILE_PREVIEW_VIEW);
-				} catch (error) {
-					exportAction.enabled = true;
-					this.notificationService.error(error);
-					throw error;
-				}
-			}), this.notificationService);
-			const closeAction = new BarrierAction(barrier, new Action('close', localize('close', "Close")), this.notificationService);
-			await this.showProfilePreviewView(EXPORT_PROFILE_PREVIEW_VIEW, userDataProfilesExportState.profile.name, exportAction, closeAction, true, userDataProfilesExportState);
-			disposables.add(this.userDataProfileService.onDidChangeCurrentProfile(e => barrier.open()));
-			await barrier.wait();
-			await this.hideProfilePreviewView(EXPORT_PROFILE_PREVIEW_VIEW);
-		} finally {
-			disposables.dispose();
-		}
-	}
-
-	async exportProfile(profile: IUserDataProfile): Promise<void> {
-		const disposables = new DisposableStore();
-		try {
-			const userDataProfilesExportState = disposables.add(this.instantiationService.createInstance(UserDataProfileExportState, profile, undefined));
+			const userDataProfilesExportState = disposables.add(this.instantiationService.createInstance(UserDataProfileExportState, profile, exportFlags));
 			await this.doExportProfile(userDataProfilesExportState, ProgressLocation.Notification);
 		} finally {
 			disposables.dispose();
 		}
 	}
 
-	private async _createFromProfile(profile: IUserDataProfile, name: string, options?: IUserDataProfileCreateOptions): Promise<void> {
-		const userDataProfilesExportState = this.instantiationService.createInstance(UserDataProfileExportState, profile, options?.resourceTypeFlags);
-		try {
-			const profileTemplate = await userDataProfilesExportState.getProfileTemplate(name, options?.icon);
-			await this.progressService.withProgress({
-				location: ProgressLocation.Notification,
-				delay: 500,
-				sticky: true,
-			}, async progress => {
-				const reportProgress = (message: string) => progress.report({ message: localize('create from profile', "Create Profile: {0}", message) });
-				const createdProfile = await this.doCreateProfile(profileTemplate, false, false, { useDefaultFlags: options?.useDefaultFlags, icon: options?.icon, transient: options?.transient }, reportProgress);
-				if (createdProfile) {
-					if (options?.resourceTypeFlags?.extensions ?? true) {
-						reportProgress(localize('progress extensions', "Applying Extensions..."));
-						await this.instantiationService.createInstance(ExtensionsResource).copy(profile, createdProfile, false);
-					}
-					reportProgress(localize('switching profile', "Switching Profile..."));
-					await this.userDataProfileManagementService.switchProfile(createdProfile);
-				}
-			});
-		} finally {
-			userDataProfilesExportState.dispose();
-		}
-	}
-
 	async createTroubleshootProfile(): Promise<void> {
 		const userDataProfilesExportState = this.instantiationService.createInstance(UserDataProfileExportState, this.userDataProfileService.currentProfile, undefined);
 		try {
@@ -754,9 +258,7 @@ export class UserDataProfileImportExportService extends Disposable implements IU
 			return;
 		}
 
-		this.isProfileExportInProgressContextKey.set(true);
 		const disposables = new DisposableStore();
-		disposables.add(toDisposable(() => this.isProfileExportInProgressContextKey.set(false)));
 
 		try {
 			await this.progressService.withProgress({
@@ -819,9 +321,16 @@ export class UserDataProfileImportExportService extends Disposable implements IU
 			return null;
 		}
 
-		const profileTemplate: Mutable<IUserDataProfileTemplate> = JSON.parse(profileContent);
+		let profileTemplate: Mutable<IUserDataProfileTemplate>;
+
+		try {
+			profileTemplate = JSON.parse(profileContent);
+		} catch (error) {
+			throw new Error(localize('invalid profile content', "This profile is not valid."));
+		}
+
 		if (!isUserDataProfileTemplate(profileTemplate)) {
-			throw new Error('Invalid profile content.');
+			throw new Error(localize('invalid profile content', "This profile is not valid."));
 		}
 
 		if (options?.name) {
@@ -859,128 +368,6 @@ export class UserDataProfileImportExportService extends Disposable implements IU
 		return profileTemplate;
 	}
 
-	private async importAndPreviewProfile(uri: URI, profileTemplate: IUserDataProfileTemplate, options: IUserDataProfileOptions | undefined): Promise<void> {
-		const disposables = new DisposableStore();
-
-		try {
-			const userDataProfileImportState = disposables.add(this.instantiationService.createInstance(UserDataProfileImportState, profileTemplate));
-			profileTemplate = await userDataProfileImportState.getProfileTemplateToImport();
-
-			const importedProfile = await this.createAndSwitch(profileTemplate, true, false, options, localize('preview profile', "Preview Profile"));
-
-			if (!importedProfile) {
-				return;
-			}
-
-			const barrier = new Barrier();
-			const importAction = this.getCreateAction(barrier, userDataProfileImportState);
-			const primaryAction = isWeb
-				? new Action('importInDesktop', localize('import in desktop', "Create Profile in {0}", this.productService.nameLong), undefined, true, async () => this.openerService.open(uri, { openExternal: true }))
-				: importAction;
-			const secondaryAction = isWeb
-				? importAction
-				: new BarrierAction(barrier, new Action('close', localize('close', "Close")), this.notificationService);
-
-			const view = await this.showProfilePreviewView(IMPORT_PROFILE_PREVIEW_VIEW, importedProfile.name, primaryAction, secondaryAction, false, userDataProfileImportState);
-			const message = new MarkdownString();
-			message.appendMarkdown(localize('preview profile message', "By default, extensions aren't installed when previewing a profile on the web. You can still install them manually before importing the profile. "));
-			message.appendMarkdown(`[${localize('learn more', "Learn more")}](https://aka.ms/vscode-extension-marketplace#_can-i-trust-extensions-from-the-marketplace).`);
-			view.setMessage(message);
-
-			const that = this;
-			const disposable = disposables.add(registerAction2(class extends Action2 {
-				constructor() {
-					super({
-						id: 'previewProfile.installExtensions',
-						title: localize('install extensions title', "Install Extensions"),
-						icon: Codicon.cloudDownload,
-						menu: {
-							id: MenuId.ViewItemContext,
-							group: 'inline',
-							when: ContextKeyExpr.and(ContextKeyExpr.equals('view', IMPORT_PROFILE_PREVIEW_VIEW), ContextKeyExpr.equals('viewItem', ProfileResourceType.Extensions)),
-						}
-					});
-				}
-				override async run(): Promise<void> {
-					return that.progressService.withProgress({
-						location: IMPORT_PROFILE_PREVIEW_VIEW,
-					}, async progress => {
-						view.setMessage(undefined);
-						const profileTemplate = await userDataProfileImportState.getProfileTemplateToImport();
-						if (profileTemplate.extensions) {
-							await that.instantiationService.createInstance(ExtensionsResource).apply(profileTemplate.extensions, importedProfile);
-						}
-						disposable.dispose();
-					});
-				}
-			}));
-			disposables.add(Event.debounce(this.extensionManagementService.onDidInstallExtensions, () => undefined, 100)(async () => {
-				const profileTemplate = await userDataProfileImportState.getProfileTemplateToImport();
-				if (profileTemplate.extensions) {
-					const profileExtensions = await that.instantiationService.createInstance(ExtensionsResource).getProfileExtensions(profileTemplate.extensions);
-					const installed = await this.extensionManagementService.getInstalled(ExtensionType.User);
-					if (profileExtensions.every(e => installed.some(i => areSameExtensions(e.identifier, i.identifier)))) {
-						disposable.dispose();
-					}
-				}
-			}));
-
-			await barrier.wait();
-			await this.hideProfilePreviewView(IMPORT_PROFILE_PREVIEW_VIEW);
-		} finally {
-			disposables.dispose();
-		}
-	}
-
-	private async previewProfile(profileTemplate: IUserDataProfileTemplate, options: IUserDataProfileOptions | undefined): Promise<void> {
-		const disposables = new DisposableStore();
-		try {
-			const userDataProfileImportState = disposables.add(this.instantiationService.createInstance(UserDataProfileImportState, profileTemplate));
-			if (userDataProfileImportState.isEmpty()) {
-				await this.createAndSwitch(profileTemplate, false, true, options, localize('create profile', "Create Profile"));
-			} else {
-				const barrier = new Barrier();
-				const cancelAction = new BarrierAction(barrier, new Action('cancel', localize('cancel', "Cancel")), this.notificationService);
-				const importAction = this.getCreateAction(barrier, userDataProfileImportState, cancelAction);
-				await this.showProfilePreviewView(IMPORT_PROFILE_PREVIEW_VIEW, profileTemplate.name, importAction, cancelAction, false, userDataProfileImportState);
-				await barrier.wait();
-				await this.hideProfilePreviewView(IMPORT_PROFILE_PREVIEW_VIEW);
-			}
-		} finally {
-			disposables.dispose();
-		}
-	}
-
-	private getCreateAction(barrier: Barrier, userDataProfileImportState: UserDataProfileImportState, cancelAction?: IAction): IAction {
-		const importAction = new BarrierAction(barrier, new Action('title', localize('import', "Create Profile"), undefined, true, async () => {
-			importAction.enabled = false;
-			if (cancelAction) {
-				cancelAction.enabled = false;
-			}
-			const profileTemplate = await userDataProfileImportState.getProfileTemplateToImport();
-			return this.saveProfile(undefined, profileTemplate);
-		}), this.notificationService);
-		return importAction;
-	}
-
-	private async createAndSwitch(profileTemplate: IUserDataProfileTemplate, temporaryProfile: boolean, extensions: boolean, options: IUserDataProfileOptions | undefined, title: string): Promise<IUserDataProfile | undefined> {
-		return this.progressService.withProgress({
-			location: ProgressLocation.Notification,
-			delay: 500,
-			sticky: true,
-		}, async (progress) => {
-			title = `${title} (${profileTemplate.name})`;
-			progress.report({ message: title });
-			const reportProgress = (message: string) => progress.report({ message: `${title}: ${message}` });
-			const profile = await this.doCreateProfile(profileTemplate, temporaryProfile, extensions, options, reportProgress);
-			if (profile) {
-				reportProgress(localize('switching profile', "Switching Profile..."));
-				await this.userDataProfileManagementService.switchProfile(profile);
-			}
-			return profile;
-		});
-	}
-
 	private async doCreateProfile(profileTemplate: IUserDataProfileTemplate, temporaryProfile: boolean, extensions: boolean, options: IUserDataProfileOptions | undefined, progress: (message: string) => void): Promise<IUserDataProfile | undefined> {
 		const profile = await this.getProfileToImport(profileTemplate, temporaryProfile, options);
 		if (!profile) {
@@ -1020,13 +407,13 @@ export class UserDataProfileImportExportService extends Disposable implements IU
 			return this.fileUserDataProfileContentHandler.readProfile(resource, CancellationToken.None);
 		}
 
-		if (this.isProfileURL(resource)) {
+		if (isProfileURL(resource)) {
 			let handlerId: string, idOrUri: string | URI;
 			if (resource.authority === PROFILE_URL_AUTHORITY) {
 				idOrUri = this.uriIdentityService.extUri.basename(resource);
 				handlerId = this.uriIdentityService.extUri.basename(this.uriIdentityService.extUri.dirname(resource));
 			} else {
-				handlerId = resource.authority.substring(UserDataProfileImportExportService.PROFILE_URL_AUTHORITY_PREFIX.length);
+				handlerId = resource.authority.substring(PROFILE_URL_AUTHORITY_PREFIX.length);
 				idOrUri = URI.parse(resource.path.substring(1));
 			}
 			await this.extensionService.activateByEvent(`onProfile:${handlerId}`);
@@ -1077,64 +464,20 @@ export class UserDataProfileImportExportService extends Disposable implements IU
 			if (temp) {
 				return this.userDataProfilesService.createNamedProfile(`${profileName} ${this.getProfileNameIndex(profileName)}`, { ...options, transient: temp });
 			}
-
-			enum ImportProfileChoice {
-				Overwrite = 0,
-				CreateNew = 1,
-				Cancel = 2
-			}
-			const { result } = await this.dialogService.prompt<ImportProfileChoice>({
+			const { confirmed } = await this.dialogService.confirm({
 				type: Severity.Info,
-				message: localize('profile already exists', "Profile with name '{0}' already exists. Do you want to overwrite it?", profileName),
-				buttons: [
-					{
-						label: localize({ key: 'overwrite', comment: ['&& denotes a mnemonic'] }, "&&Overwrite"),
-						run: () => ImportProfileChoice.Overwrite
-					},
-					{
-						label: localize({ key: 'create new', comment: ['&& denotes a mnemonic'] }, "&&Create New Profile"),
-						run: () => ImportProfileChoice.CreateNew
-					},
-				],
-				cancelButton: {
-					run: () => ImportProfileChoice.Cancel
-				}
+				message: localize('profile already exists', "Profile with name '{0}' already exists. Do you want to replace its contents?", profileName),
+				primaryButton: localize({ key: 'overwrite', comment: ['&& denotes a mnemonic'] }, "&&Replace")
 			});
-
-			if (result === ImportProfileChoice.Overwrite) {
-				return profile;
-			}
-
-			if (result === ImportProfileChoice.Cancel) {
+			if (!confirmed) {
 				return undefined;
 			}
-
-			// Create new profile
-			const name = await this.quickInputService.input({
-				placeHolder: localize('name', "Profile name"),
-				title: localize('create new title', "Create New Profile"),
-				value: `${profileName} ${this.getProfileNameIndex(profileName)}`,
-				validateInput: async (value: string) => {
-					if (this.userDataProfilesService.profiles.some(p => p.name === value)) {
-						return localize('profileExists', "Profile with name {0} already exists.", value);
-					}
-					return undefined;
-				}
-			});
-			if (!name) {
-				return undefined;
-			}
-			return this.userDataProfilesService.createNamedProfile(name);
+			return profile.isDefault ? profile : this.userDataProfilesService.updateProfile(profile, options);
 		} else {
 			return this.userDataProfilesService.createNamedProfile(profileName, { ...options, transient: temp });
 		}
 	}
 
-	private generateProfileName(profileName: string): string {
-		const existingProfile = this.userDataProfilesService.profiles.find(p => p.name === profileName);
-		return existingProfile ? `${profileName} ${this.getProfileNameIndex(profileName)}` : profileName;
-	}
-
 	private getProfileNameIndex(name: string): number {
 		const nameRegEx = new RegExp(`${escapeRegExpCharacters(name)}\\s(\\d+)`);
 		let nameIndex = 0;
@@ -1146,44 +489,6 @@ export class UserDataProfileImportExportService extends Disposable implements IU
 		return nameIndex + 1;
 	}
 
-	private async showProfilePreviewView(id: string, name: string, primary: IAction, secondary: IAction, refreshAction: boolean, userDataProfilesData: UserDataProfileImportExportState): Promise<UserDataProfilePreviewViewPane> {
-		const viewsRegistry = Registry.as<IViewsRegistry>(Extensions.ViewsRegistry);
-		const treeView = this.instantiationService.createInstance(TreeView, id, name);
-		if (refreshAction) {
-			treeView.showRefreshAction = true;
-		}
-		const actionRunner = new ActionRunner();
-		const descriptor: ITreeViewDescriptor = {
-			id,
-			name: { value: name, original: name },
-			ctorDescriptor: new SyncDescriptor(UserDataProfilePreviewViewPane, [userDataProfilesData, primary, secondary, actionRunner]),
-			canToggleVisibility: false,
-			canMoveView: false,
-			treeView,
-			collapsed: false,
-		};
-
-		viewsRegistry.registerViews([descriptor], this.viewContainer);
-		return (await this.viewsService.openView<UserDataProfilePreviewViewPane>(id, true))!;
-	}
-
-	private async hideProfilePreviewView(id: string): Promise<void> {
-		const viewsRegistry = Registry.as<IViewsRegistry>(Extensions.ViewsRegistry);
-		const viewDescriptor = viewsRegistry.getView(id);
-		if (viewDescriptor) {
-			(viewDescriptor as ITreeViewDescriptor).treeView.dispose();
-			viewsRegistry.deregisterViews([viewDescriptor], this.viewContainer);
-		}
-		await this.closeAllImportExportPreviewEditors();
-	}
-
-	private async closeAllImportExportPreviewEditors(): Promise<void> {
-		const editorsToColse = this.editorService.getEditors(EditorsOrder.SEQUENTIAL).filter(({ editor }) => editor.resource?.scheme === USER_DATA_PROFILE_EXPORT_SCHEME || editor.resource?.scheme === USER_DATA_PROFILE_EXPORT_PREVIEW_SCHEME || editor.resource?.scheme === USER_DATA_PROFILE_IMPORT_PREVIEW_SCHEME);
-		if (editorsToColse.length) {
-			await this.editorService.closeEditors(editorsToColse);
-		}
-	}
-
 }
 
 class FileUserDataProfileContentHandler implements IUserDataProfileContentHandler {
@@ -1195,6 +500,7 @@ class FileUserDataProfileContentHandler implements IUserDataProfileContentHandle
 		@IFileDialogService private readonly fileDialogService: IFileDialogService,
 		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
 		@IFileService private readonly fileService: IFileService,
+		@IProductService private readonly productService: IProductService,
 		@ITextFileService private readonly textFileService: ITextFileService,
 	) { }
 
@@ -1212,7 +518,7 @@ class FileUserDataProfileContentHandler implements IUserDataProfileContentHandle
 	}
 
 	async canHandle(uri: URI): Promise<boolean> {
-		return uri.scheme !== Schemas.http && uri.scheme !== Schemas.https && await this.fileService.canHandleResource(uri);
+		return uri.scheme !== Schemas.http && uri.scheme !== Schemas.https && uri.scheme !== this.productService.urlProtocol && await this.fileService.canHandleResource(uri);
 	}
 
 	async readProfile(uri: URI, token: CancellationToken): Promise<string | null> {
@@ -1235,138 +541,8 @@ class FileUserDataProfileContentHandler implements IUserDataProfileContentHandle
 
 }
 
-class UserDataProfilePreviewViewPane extends TreeViewPane {
-
-	private buttonsContainer!: HTMLElement;
-	private primaryButton!: Button;
-	private secondaryButton!: Button;
-	private messageContainer!: HTMLElement;
-	private dimension: DOM.Dimension | undefined;
-	private totalTreeItemsCount: number = 0;
-
-	constructor(
-		private readonly userDataProfileData: UserDataProfileImportExportState,
-		private readonly primaryAction: Action,
-		private readonly secondaryAction: Action,
-		private readonly actionRunner: IActionRunner,
-		options: IViewletViewOptions,
-		@IKeybindingService keybindingService: IKeybindingService,
-		@IContextMenuService contextMenuService: IContextMenuService,
-		@IConfigurationService configurationService: IConfigurationService,
-		@IContextKeyService contextKeyService: IContextKeyService,
-		@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
-		@IInstantiationService instantiationService: IInstantiationService,
-		@IOpenerService openerService: IOpenerService,
-		@IThemeService themeService: IThemeService,
-		@ITelemetryService telemetryService: ITelemetryService,
-		@INotificationService notificationService: INotificationService,
-		@IHoverService hoverService: IHoverService,
-		@IAccessibleViewInformationService accessibleViewService: IAccessibleViewInformationService,
-	) {
-		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, notificationService, hoverService, accessibleViewService);
-	}
-
-	protected override renderTreeView(container: HTMLElement): void {
-		this.treeView.dataProvider = this.userDataProfileData;
-		super.renderTreeView(DOM.append(container, DOM.$('.profile-view-tree-container')));
-		this.messageContainer = DOM.append(container, DOM.$('.profile-view-message-container.hide'));
-		this.createButtons(container);
-		this._register(this.treeView.onDidChangeCheckboxState(() => this.updateConfirmButtonEnablement()));
-		this.computeAndLayout();
-		this._register(Event.any(this.userDataProfileData.onDidChangeRoots, this.treeView.onDidCollapseItem, this.treeView.onDidExpandItem)(() => this.computeAndLayout()));
-	}
-
-	private async computeAndLayout() {
-		const roots = await this.userDataProfileData.getRoots();
-		const children = await Promise.all(roots.map(async (root) => {
-			let expanded = root.collapsibleState === TreeItemCollapsibleState.Expanded;
-			try {
-				expanded = !this.treeView.isCollapsed(root);
-			} catch (error) { /* Ignore because element might not be added yet */ }
-			if (expanded) {
-				const children = await root.getChildren();
-				return children ?? [];
-			}
-			return [];
-		}));
-		this.totalTreeItemsCount = roots.length + children.flat().length;
-		this.updateConfirmButtonEnablement();
-		if (this.dimension) {
-			this.layoutTreeView(this.dimension.height, this.dimension.width);
-		}
-	}
-
-	private createButtons(container: HTMLElement): void {
-		this.buttonsContainer = DOM.append(container, DOM.$('.profile-view-buttons-container'));
-
-		this.primaryButton = this._register(new Button(this.buttonsContainer, { ...defaultButtonStyles }));
-		this.primaryButton.element.classList.add('profile-view-button');
-		this.primaryButton.label = this.primaryAction.label;
-		this.primaryButton.enabled = this.primaryAction.enabled;
-		this._register(this.primaryButton.onDidClick(() => this.actionRunner.run(this.primaryAction)));
-		this._register(this.primaryAction.onDidChange(e => {
-			if (e.enabled !== undefined) {
-				this.primaryButton.enabled = e.enabled;
-			}
-		}));
-
-		this.secondaryButton = this._register(new Button(this.buttonsContainer, { secondary: true, ...defaultButtonStyles }));
-		this.secondaryButton.label = this.secondaryAction.label;
-		this.secondaryButton.element.classList.add('profile-view-button');
-		this.secondaryButton.enabled = this.secondaryAction.enabled;
-		this._register(this.secondaryButton.onDidClick(() => this.actionRunner.run(this.secondaryAction)));
-		this._register(this.secondaryAction.onDidChange(e => {
-			if (e.enabled !== undefined) {
-				this.secondaryButton.enabled = e.enabled;
-			}
-		}));
-	}
-
-	protected override layoutTreeView(height: number, width: number): void {
-		this.dimension = new DOM.Dimension(width, height);
-
-		let messageContainerHeight = 0;
-		if (!this.messageContainer.classList.contains('hide')) {
-			messageContainerHeight = DOM.getClientArea(this.messageContainer).height;
-		}
-
-		const buttonContainerHeight = 108;
-		this.buttonsContainer.style.height = `${buttonContainerHeight}px`;
-		this.buttonsContainer.style.width = `${width}px`;
-
-		super.layoutTreeView(Math.min(height - buttonContainerHeight - messageContainerHeight, 22 * this.totalTreeItemsCount), width);
-	}
-
-	private updateConfirmButtonEnablement(): void {
-		this.primaryButton.enabled = this.primaryAction.enabled && this.userDataProfileData.isEnabled();
-	}
-
-	private readonly renderDisposables = this._register(new DisposableStore());
-	setMessage(message: MarkdownString | undefined): void {
-		this.messageContainer.classList.toggle('hide', !message);
-		DOM.clearNode(this.messageContainer);
-		if (message) {
-			this.renderDisposables.clear();
-			const rendered = this.renderDisposables.add(renderMarkdown(message, {
-				actionHandler: {
-					callback: (content) => {
-						this.openerService.open(content, { allowCommands: true }).catch(onUnexpectedError);
-					},
-					disposables: this.renderDisposables
-				}
-			}));
-			DOM.append(this.messageContainer, rendered.element);
-		}
-	}
-
-	refresh(): Promise<void> {
-		return this.treeView.refresh();
-	}
-}
-
 const USER_DATA_PROFILE_EXPORT_SCHEME = 'userdataprofileexport';
 const USER_DATA_PROFILE_EXPORT_PREVIEW_SCHEME = 'userdataprofileexportpreview';
-const USER_DATA_PROFILE_IMPORT_PREVIEW_SCHEME = 'userdataprofileimportpreview';
 
 abstract class UserDataProfileImportExportState extends Disposable implements ITreeViewDataProvider {
 
@@ -1604,107 +780,4 @@ class UserDataProfileExportState extends UserDataProfileImportExportState {
 
 }
 
-class UserDataProfileImportState extends UserDataProfileImportExportState {
-
-	private readonly disposables = this._register(new DisposableStore());
-
-	constructor(
-		readonly profile: IUserDataProfileTemplate,
-		@IFileService private readonly fileService: IFileService,
-		@IQuickInputService quickInputService: IQuickInputService,
-		@IInstantiationService private readonly instantiationService: IInstantiationService
-	) {
-		super(quickInputService);
-	}
-
-	protected async fetchRoots(): Promise<IProfileResourceTreeItem[]> {
-		this.disposables.clear();
-
-		const inMemoryProvider = this._register(new InMemoryFileSystemProvider());
-		this.disposables.add(this.fileService.registerProvider(USER_DATA_PROFILE_IMPORT_PREVIEW_SCHEME, inMemoryProvider));
-		const roots: IProfileResourceTreeItem[] = [];
-		const importPreviewProfle = toUserDataProfile(generateUuid(), this.profile.name, URI.file('/root').with({ scheme: USER_DATA_PROFILE_IMPORT_PREVIEW_SCHEME }), URI.file('/cache').with({ scheme: USER_DATA_PROFILE_IMPORT_PREVIEW_SCHEME }));
-
-		if (this.profile.settings) {
-			const settingsResource = this.instantiationService.createInstance(SettingsResource);
-			await settingsResource.apply(this.profile.settings, importPreviewProfle);
-			const settingsResourceTreeItem = this.instantiationService.createInstance(SettingsResourceTreeItem, importPreviewProfle);
-			if (await settingsResourceTreeItem.hasContent()) {
-				roots.push(settingsResourceTreeItem);
-			}
-		}
-
-		if (this.profile.keybindings) {
-			const keybindingsResource = this.instantiationService.createInstance(KeybindingsResource);
-			await keybindingsResource.apply(this.profile.keybindings, importPreviewProfle);
-			const keybindingsResourceTreeItem = this.instantiationService.createInstance(KeybindingsResourceTreeItem, importPreviewProfle);
-			if (await keybindingsResourceTreeItem.hasContent()) {
-				roots.push(keybindingsResourceTreeItem);
-			}
-		}
-
-		if (this.profile.snippets) {
-			const snippetsResource = this.instantiationService.createInstance(SnippetsResource);
-			await snippetsResource.apply(this.profile.snippets, importPreviewProfle);
-			const snippetsResourceTreeItem = this.instantiationService.createInstance(SnippetsResourceTreeItem, importPreviewProfle);
-			if (await snippetsResourceTreeItem.hasContent()) {
-				roots.push(snippetsResourceTreeItem);
-			}
-		}
-
-		if (this.profile.tasks) {
-			const tasksResource = this.instantiationService.createInstance(TasksResource);
-			await tasksResource.apply(this.profile.tasks, importPreviewProfle);
-			const tasksResourceTreeItem = this.instantiationService.createInstance(TasksResourceTreeItem, importPreviewProfle);
-			if (await tasksResourceTreeItem.hasContent()) {
-				roots.push(tasksResourceTreeItem);
-			}
-		}
-
-		if (this.profile.globalState) {
-			const globalStateResource = joinPath(importPreviewProfle.globalStorageHome, 'globalState.json');
-			const content = VSBuffer.fromString(JSON.stringify(JSON.parse(this.profile.globalState), null, '\t'));
-			if (content) {
-				await this.fileService.writeFile(globalStateResource, content);
-				roots.push(this.instantiationService.createInstance(GlobalStateResourceImportTreeItem, this.profile.globalState, globalStateResource));
-			}
-		}
-
-		if (this.profile.extensions) {
-			const extensionsResourceTreeItem = this.instantiationService.createInstance(ExtensionsResourceImportTreeItem, this.profile.extensions);
-			if (await extensionsResourceTreeItem.hasContent()) {
-				roots.push(extensionsResourceTreeItem);
-			}
-		}
-
-		inMemoryProvider.setReadOnly(true);
-
-		return roots;
-	}
-
-	isEmpty(): boolean {
-		return !(this.profile.settings || this.profile.keybindings || this.profile.tasks || this.profile.snippets || this.profile.globalState || this.profile.extensions);
-	}
-
-	async getProfileTemplateToImport(): Promise<IUserDataProfileTemplate> {
-		return this.getProfileTemplate(this.profile.name, this.profile.icon);
-	}
-
-}
-
-class BarrierAction extends Action {
-	constructor(barrier: Barrier, action: Action,
-		notificationService: INotificationService) {
-		super(action.id, action.label, action.class, action.enabled, async () => {
-			try {
-				await action.run();
-			} catch (error) {
-				notificationService.error(error);
-				throw error;
-			}
-			barrier.open();
-		});
-	}
-}
-
 registerSingleton(IUserDataProfileImportExportService, UserDataProfileImportExportService, InstantiationType.Delayed);
diff --git a/src/vs/workbench/services/userDataProfile/browser/userDataProfileInit.ts b/src/vs/workbench/services/userDataProfile/browser/userDataProfileInit.ts
index e946a573bdd..1370762862a 100644
--- a/src/vs/workbench/services/userDataProfile/browser/userDataProfileInit.ts
+++ b/src/vs/workbench/services/userDataProfile/browser/userDataProfileInit.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { Barrier, Promises } from 'vs/base/common/async';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IUserDataInitializer } from 'vs/workbench/services/userData/browser/userDataInit';
-import { IProfileResourceInitializer, IUserDataProfileService, IUserDataProfileTemplate } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { SettingsResourceInitializer } from 'vs/workbench/services/userDataProfile/browser/settingsResource';
-import { GlobalStateResourceInitializer } from 'vs/workbench/services/userDataProfile/browser/globalStateResource';
-import { KeybindingsResourceInitializer } from 'vs/workbench/services/userDataProfile/browser/keybindingsResource';
-import { TasksResourceInitializer } from 'vs/workbench/services/userDataProfile/browser/tasksResource';
-import { SnippetsResourceInitializer } from 'vs/workbench/services/userDataProfile/browser/snippetsResource';
-import { ExtensionsResourceInitializer } from 'vs/workbench/services/userDataProfile/browser/extensionsResource';
-import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { isString } from 'vs/base/common/types';
-import { IRequestService, asJson } from 'vs/platform/request/common/request';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { URI } from 'vs/base/common/uri';
-import { ProfileResourceType } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { IStorageService, StorageScope } from '../../../../platform/storage/common/storage.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { Barrier, Promises } from '../../../../base/common/async.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IUserDataInitializer } from '../../userData/browser/userDataInit.js';
+import { IProfileResourceInitializer, IUserDataProfileService, IUserDataProfileTemplate } from '../common/userDataProfile.js';
+import { SettingsResourceInitializer } from './settingsResource.js';
+import { GlobalStateResourceInitializer } from './globalStateResource.js';
+import { KeybindingsResourceInitializer } from './keybindingsResource.js';
+import { TasksResourceInitializer } from './tasksResource.js';
+import { SnippetsResourceInitializer } from './snippetsResource.js';
+import { ExtensionsResourceInitializer } from './extensionsResource.js';
+import { IBrowserWorkbenchEnvironmentService } from '../../environment/browser/environmentService.js';
+import { isString } from '../../../../base/common/types.js';
+import { IRequestService, asJson } from '../../../../platform/request/common/request.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ProfileResourceType } from '../../../../platform/userDataProfile/common/userDataProfile.js';
 
 export class UserDataProfileInitializer implements IUserDataInitializer {
 
diff --git a/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts b/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts
index ff845818b8d..88b46666077 100644
--- a/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts
+++ b/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts
@@ -3,23 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { CancellationError } from 'vs/base/common/errors';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { equals } from 'vs/base/common/objects';
-import { localize } from 'vs/nls';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IRequestService, asJson } from 'vs/platform/request/common/request';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { DidChangeProfilesEvent, IUserDataProfile, IUserDataProfileOptions, IUserDataProfilesService, IUserDataProfileUpdateOptions } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IWorkspaceContextService, toWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { DidChangeUserDataProfileEvent, IProfileTemplateInfo, IUserDataProfileManagementService, IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { CancellationError } from '../../../../base/common/errors.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { equals } from '../../../../base/common/objects.js';
+import { URI } from '../../../../base/common/uri.js';
+import { localize } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IRequestService, asJson } from '../../../../platform/request/common/request.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IUserDataProfile, IUserDataProfileOptions, IUserDataProfilesService, IUserDataProfileUpdateOptions } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { isEmptyWorkspaceIdentifier, IWorkspaceContextService, toWorkspaceIdentifier } from '../../../../platform/workspace/common/workspace.js';
+import { CONFIG_NEW_WINDOW_PROFILE } from '../../../common/configuration.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { IExtensionService } from '../../extensions/common/extensions.js';
+import { IHostService } from '../../host/browser/host.js';
+import { DidChangeUserDataProfileEvent, IProfileTemplateInfo, IUserDataProfileManagementService, IUserDataProfileService } from '../common/userDataProfile.js';
 
 export type ProfileManagementActionExecutedClassification = {
 	owner: 'sandy081';
@@ -45,40 +49,72 @@ export class UserDataProfileManagementService extends Disposable implements IUse
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@IProductService private readonly productService: IProductService,
 		@IRequestService private readonly requestService: IRequestService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
 		@ILogService private readonly logService: ILogService,
 	) {
 		super();
-		this._register(userDataProfilesService.onDidChangeProfiles(e => this.onDidChangeProfiles(e)));
-		this._register(userDataProfilesService.onDidResetWorkspaces(() => this.onDidResetWorkspaces()));
 		this._register(userDataProfileService.onDidChangeCurrentProfile(e => this.onDidChangeCurrentProfile(e)));
 		this._register(userDataProfilesService.onDidChangeProfiles(e => {
+			if (e.removed.some(profile => profile.id === this.userDataProfileService.currentProfile.id)) {
+				const profileToUse = this.getProfileToUseForCurrentWorkspace();
+				this.switchProfile(profileToUse);
+				this.changeCurrentProfile(profileToUse, localize('reload message when removed', "The current profile has been removed. Please reload to switch back to default profile"));
+				return;
+			}
+
 			const updatedCurrentProfile = e.updated.find(p => this.userDataProfileService.currentProfile.id === p.id);
 			if (updatedCurrentProfile) {
-				this.changeCurrentProfile(updatedCurrentProfile, localize('reload message when updated', "The current profile has been updated. Please reload to switch back to the updated profile"));
+				const profileToUse = this.getProfileToUseForCurrentWorkspace();
+				if (profileToUse?.id !== updatedCurrentProfile.id) {
+					this.switchProfile(profileToUse);
+					this.changeCurrentProfile(profileToUse, localize('reload message when switched', "The current workspace has been removed from the current profile. Please reload to switch back to the updated profile"));
+				} else {
+					this.changeCurrentProfile(updatedCurrentProfile, localize('reload message when updated', "The current profile has been updated. Please reload to switch back to the updated profile"));
+				}
 			}
 		}));
 	}
 
-	private onDidChangeProfiles(e: DidChangeProfilesEvent): void {
-		if (e.removed.some(profile => profile.id === this.userDataProfileService.currentProfile.id)) {
-			this.changeCurrentProfile(this.userDataProfilesService.defaultProfile, localize('reload message when removed', "The current profile has been removed. Please reload to switch back to default profile"));
-			return;
-		}
-	}
-
-	private onDidResetWorkspaces(): void {
-		if (!this.userDataProfileService.currentProfile.isDefault) {
-			this.changeCurrentProfile(this.userDataProfilesService.defaultProfile, localize('reload message when removed', "The current profile has been removed. Please reload to switch back to default profile"));
-			return;
-		}
-	}
-
 	private async onDidChangeCurrentProfile(e: DidChangeUserDataProfileEvent): Promise<void> {
 		if (e.previous.isTransient) {
 			await this.userDataProfilesService.cleanUpTransientProfiles();
 		}
 	}
 
+	private getWorkspaceUri(): URI | undefined {
+		const workspace = this.workspaceContextService.getWorkspace();
+		return workspace.configuration ?? workspace.folders[0]?.uri;
+	}
+
+	private getProfileToUseForCurrentWorkspace(): IUserDataProfile {
+		const workspaceUri = this.getWorkspaceUri();
+		if (workspaceUri) {
+			const profileForWorkspace = this.userDataProfilesService.profiles.find(profile => profile.workspaces?.some(ws => this.uriIdentityService.extUri.isEqual(ws, workspaceUri)));
+			if (profileForWorkspace) {
+				return profileForWorkspace;
+			}
+		} else {
+			// If no workspace is open, use the current profile
+			const currentProfile = this.userDataProfilesService.profiles.find(profile => profile.id === this.userDataProfileService.currentProfile.id);
+			if (currentProfile) {
+				return currentProfile;
+			}
+		}
+		return this.getDefaultProfileToUse();
+	}
+
+	public getDefaultProfileToUse(): IUserDataProfile {
+		const newWindowProfileConfigValue = this.configurationService.getValue(CONFIG_NEW_WINDOW_PROFILE);
+		if (newWindowProfileConfigValue) {
+			const newWindowProfile = this.userDataProfilesService.profiles.find(profile => profile.name === newWindowProfileConfigValue);
+			if (newWindowProfile) {
+				return newWindowProfile;
+			}
+		}
+		return this.userDataProfilesService.defaultProfile;
+	}
+
 	async createProfile(name: string, options?: IUserDataProfileOptions): Promise<IUserDataProfile> {
 		return this.userDataProfilesService.createNamedProfile(name, options);
 	}
@@ -121,16 +157,22 @@ export class UserDataProfileManagementService extends Disposable implements IUse
 	}
 
 	async switchProfile(profile: IUserDataProfile): Promise<void> {
-		const workspaceIdentifier = toWorkspaceIdentifier(this.workspaceContextService.getWorkspace());
 		if (!this.userDataProfilesService.profiles.some(p => p.id === profile.id)) {
 			throw new Error(`Profile ${profile.name} does not exist`);
 		}
 		if (this.userDataProfileService.currentProfile.id === profile.id) {
 			return;
 		}
+		const workspaceUri = this.getWorkspaceUri();
+		if (workspaceUri && profile.workspaces?.some(ws => this.uriIdentityService.extUri.isEqual(ws, workspaceUri))) {
+			return;
+		}
+		const workspaceIdentifier = toWorkspaceIdentifier(this.workspaceContextService.getWorkspace());
 		await this.userDataProfilesService.setProfileForWorkspace(workspaceIdentifier, profile);
-		await this.changeCurrentProfile(profile);
 		this.telemetryService.publicLog2<ProfileManagementActionExecutedEvent, ProfileManagementActionExecutedClassification>('profileManagementActionExecuted', { id: 'switchProfile' });
+		if (isEmptyWorkspaceIdentifier(workspaceIdentifier)) {
+			await this.changeCurrentProfile(profile);
+		}
 	}
 
 	async getBuiltinProfileTemplates(): Promise<IProfileTemplateInfo[]> {
diff --git a/src/vs/workbench/services/userDataProfile/browser/userDataProfileStorageService.ts b/src/vs/workbench/services/userDataProfile/browser/userDataProfileStorageService.ts
index 3dfaaf20e4c..a38952c6479 100644
--- a/src/vs/workbench/services/userDataProfile/browser/userDataProfileStorageService.ts
+++ b/src/vs/workbench/services/userDataProfile/browser/userDataProfileStorageService.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { IStorageDatabase } from 'vs/base/parts/storage/common/storage';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ILogService } from 'vs/platform/log/common/log';
-import { AbstractUserDataProfileStorageService, IProfileStorageChanges, IUserDataProfileStorageService } from 'vs/platform/userDataProfile/common/userDataProfileStorageService';
-import { IProfileStorageValueChangeEvent, isProfileUsingDefaultStorage, IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
-import { IUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IndexedDBStorageDatabase } from 'vs/workbench/services/storage/browser/storageService';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { IStorageDatabase } from '../../../../base/parts/storage/common/storage.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { AbstractUserDataProfileStorageService, IProfileStorageChanges, IUserDataProfileStorageService } from '../../../../platform/userDataProfile/common/userDataProfileStorageService.js';
+import { IProfileStorageValueChangeEvent, isProfileUsingDefaultStorage, IStorageService, StorageScope } from '../../../../platform/storage/common/storage.js';
+import { IUserDataProfile } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { IndexedDBStorageDatabase } from '../../storage/browser/storageService.js';
+import { IUserDataProfileService } from '../common/userDataProfile.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
 
 export class UserDataProfileStorageService extends AbstractUserDataProfileStorageService implements IUserDataProfileStorageService {
 
@@ -24,7 +24,7 @@ export class UserDataProfileStorageService extends AbstractUserDataProfileStorag
 		@IUserDataProfileService private readonly userDataProfileService: IUserDataProfileService,
 		@ILogService private readonly logService: ILogService,
 	) {
-		super(storageService);
+		super(true, storageService);
 		const disposables = this._register(new DisposableStore());
 		this._register(Event.filter(storageService.onDidChangeTarget, e => e.scope === StorageScope.PROFILE, disposables)(() => this.onDidChangeStorageTargetInCurrentProfile()));
 		this._register(storageService.onDidChangeValue(StorageScope.PROFILE, undefined, disposables)(e => this.onDidChangeStorageValueInCurrentProfile(e)));
diff --git a/src/vs/workbench/services/userDataProfile/common/remoteUserDataProfiles.ts b/src/vs/workbench/services/userDataProfile/common/remoteUserDataProfiles.ts
index d3ef612836b..65ca63829ec 100644
--- a/src/vs/workbench/services/userDataProfile/common/remoteUserDataProfiles.ts
+++ b/src/vs/workbench/services/userDataProfile/common/remoteUserDataProfiles.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vs/base/common/lifecycle';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { DidChangeProfilesEvent, IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { distinct } from 'vs/base/common/arrays';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { UserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfileIpc';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { DidChangeProfilesEvent, IUserDataProfile, IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { IRemoteAgentService } from '../../remote/common/remoteAgentService.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IStringDictionary } from '../../../../base/common/collections.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IUserDataProfileService } from './userDataProfile.js';
+import { distinct } from '../../../../base/common/arrays.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { UserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfileIpc.js';
 
 const associatedRemoteProfilesKey = 'associatedRemoteProfiles';
 
diff --git a/src/vs/workbench/services/userDataProfile/common/userDataProfile.ts b/src/vs/workbench/services/userDataProfile/common/userDataProfile.ts
index e5c260e0510..5afa164771d 100644
--- a/src/vs/workbench/services/userDataProfile/common/userDataProfile.ts
+++ b/src/vs/workbench/services/userDataProfile/common/userDataProfile.ts
@@ -3,20 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isUndefined } from 'vs/base/common/types';
-import { Event } from 'vs/base/common/event';
-import { localize, localize2 } from 'vs/nls';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IUserDataProfile, IUserDataProfileOptions, IUserDataProfileUpdateOptions, ProfileResourceType, ProfileResourceTypeFlags } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { URI } from 'vs/base/common/uri';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { Codicon } from 'vs/base/common/codicons';
-import { ITreeItem, ITreeItemLabel } from 'vs/workbench/common/views';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { IProductService } from 'vs/platform/product/common/productService';
+import { isUndefined } from '../../../../base/common/types.js';
+import { Event } from '../../../../base/common/event.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IUserDataProfile, IUserDataProfileOptions, IUserDataProfileUpdateOptions, ProfileResourceType, ProfileResourceTypeFlags } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { URI } from '../../../../base/common/uri.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { ITreeItem, ITreeItemLabel } from '../../../common/views.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
 
 export interface DidChangeUserDataProfileEvent {
 	readonly previous: IUserDataProfile;
@@ -49,7 +48,7 @@ export interface IUserDataProfileManagementService {
 	updateProfile(profile: IUserDataProfile, updateOptions: IUserDataProfileUpdateOptions): Promise<IUserDataProfile>;
 	switchProfile(profile: IUserDataProfile): Promise<void>;
 	getBuiltinProfileTemplates(): Promise<IProfileTemplateInfo[]>;
-
+	getDefaultProfileToUse(): IUserDataProfile;
 }
 
 export interface IUserDataProfileTemplate {
@@ -81,6 +80,11 @@ export function toUserDataProfileUri(path: string, productService: IProductServi
 	});
 }
 
+export const PROFILE_URL_AUTHORITY_PREFIX = 'profile-';
+export function isProfileURL(uri: URI): boolean {
+	return uri.authority === PROFILE_URL_AUTHORITY || new RegExp(`^${PROFILE_URL_AUTHORITY_PREFIX}`).test(uri.authority);
+}
+
 export interface IUserDataProfileCreateOptions extends IUserDataProfileOptions {
 	readonly name?: string;
 	readonly resourceTypeFlags?: ProfileResourceTypeFlags;
@@ -89,7 +93,7 @@ export interface IUserDataProfileCreateOptions extends IUserDataProfileOptions {
 export interface IProfileImportOptions extends IUserDataProfileCreateOptions {
 	readonly name?: string;
 	readonly icon?: string;
-	readonly mode?: 'preview' | 'apply' | 'both';
+	readonly mode?: 'apply';
 }
 
 export const IUserDataProfileImportExportService = createDecorator<IUserDataProfileImportExportService>('IUserDataProfileImportExportService');
@@ -100,12 +104,7 @@ export interface IUserDataProfileImportExportService {
 	unregisterProfileContentHandler(id: string): void;
 
 	resolveProfileTemplate(uri: URI): Promise<IUserDataProfileTemplate | null>;
-	exportProfile(profile: IUserDataProfile): Promise<void>;
-	exportProfile2(): Promise<void>;
-	importProfile(uri: URI, options?: IProfileImportOptions): Promise<void>;
-	showProfileContents(): Promise<void>;
-	createProfile(from?: IUserDataProfile | URI): Promise<void>;
-	editProfile(profile: IUserDataProfile): Promise<void>;
+	exportProfile(profile: IUserDataProfile, exportFlags?: ProfileResourceTypeFlags): Promise<void>;
 	createFromProfile(from: IUserDataProfile, options: IUserDataProfileCreateOptions, token: CancellationToken): Promise<IUserDataProfile | undefined>;
 	createProfileFromTemplate(profileTemplate: IUserDataProfileTemplate, options: IUserDataProfileCreateOptions, token: CancellationToken): Promise<IUserDataProfile | undefined>;
 	createTroubleshootProfile(): Promise<void>;
@@ -147,8 +146,6 @@ export interface IUserDataProfileContentHandler {
 
 export const defaultUserDataProfileIcon = registerIcon('defaultProfile-icon', Codicon.settings, localize('defaultProfileIcon', 'Icon for Default Profile.'));
 
-export const ProfilesMenu = new MenuId('Profiles');
-export const MANAGE_PROFILES_ACTION_ID = 'workbench.profiles.actions.manage';
 export const PROFILES_TITLE = localize2('profiles', 'Profiles');
 export const PROFILES_CATEGORY = { ...PROFILES_TITLE };
 export const PROFILE_EXTENSION = 'code-profile';
@@ -157,5 +154,3 @@ export const PROFILES_ENABLEMENT_CONTEXT = new RawContextKey<boolean>('profiles.
 export const CURRENT_PROFILE_CONTEXT = new RawContextKey<string>('currentProfile', '');
 export const IS_CURRENT_PROFILE_TRANSIENT_CONTEXT = new RawContextKey<boolean>('isCurrentProfileTransient', false);
 export const HAS_PROFILES_CONTEXT = new RawContextKey<boolean>('hasProfiles', false);
-export const IS_PROFILE_EXPORT_IN_PROGRESS_CONTEXT = new RawContextKey<boolean>('isProfileExportInProgress', false);
-export const IS_PROFILE_IMPORT_IN_PROGRESS_CONTEXT = new RawContextKey<boolean>('isProfileImportInProgress', false);
diff --git a/src/vs/workbench/services/userDataProfile/common/userDataProfileIcons.ts b/src/vs/workbench/services/userDataProfile/common/userDataProfileIcons.ts
index 93251b9b1c3..dc19c4c9dd5 100644
--- a/src/vs/workbench/services/userDataProfile/common/userDataProfileIcons.ts
+++ b/src/vs/workbench/services/userDataProfile/common/userDataProfileIcons.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from 'vs/base/common/codicons';
-import { localize } from 'vs/nls';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { localize } from '../../../../nls.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 
 export const DEFAULT_ICON = registerIcon('settings-view-bar-icon', Codicon.settingsGear, localize('settingsViewBarIcon', "Settings icon in the view bar."));
 
@@ -30,10 +30,14 @@ export const ICONS = [
 	Codicon.snake,
 
 	/* project types */
+	Codicon.project,
 	Codicon.window,
 	Codicon.library,
 	Codicon.extensions,
 	Codicon.terminal,
+	Codicon.terminalDebian,
+	Codicon.terminalLinux,
+	Codicon.terminalUbuntu,
 	Codicon.beaker,
 	Codicon.package,
 	Codicon.cloud,
@@ -45,10 +49,16 @@ export const ICONS = [
 	Codicon.game,
 	Codicon.chip,
 	Codicon.music,
+	Codicon.remoteExplorer,
+	Codicon.github,
+	Codicon.azure,
+	Codicon.vscode,
+	Codicon.extensions,
 
 	/* misc */
 	Codicon.gift,
 	Codicon.send,
+	Codicon.bookmark,
 	Codicon.briefcase,
 	Codicon.megaphone,
 	Codicon.comment,
@@ -71,7 +81,7 @@ export const ICONS = [
 	Codicon.pulse,
 	Codicon.radioTower,
 	Codicon.smiley,
-	Codicon.symbolEvent,
+	Codicon.zap,
 	Codicon.squirrel,
 	Codicon.symbolColor,
 	Codicon.mail,
@@ -86,6 +96,8 @@ export const ICONS = [
 	Codicon.dashboard,
 	Codicon.calendar,
 	Codicon.shield,
+	Codicon.verified,
+	Codicon.debug,
 	Codicon.flame,
 	Codicon.compass,
 	Codicon.paintcan,
diff --git a/src/vs/workbench/services/userDataProfile/common/userDataProfileService.ts b/src/vs/workbench/services/userDataProfile/common/userDataProfileService.ts
index 23aff4b0fe5..3010d122d27 100644
--- a/src/vs/workbench/services/userDataProfile/common/userDataProfileService.ts
+++ b/src/vs/workbench/services/userDataProfile/common/userDataProfileService.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Promises } from 'vs/base/common/async';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { equals } from 'vs/base/common/objects';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { defaultUserDataProfileIcon, DidChangeUserDataProfileEvent, IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
+import { Promises } from '../../../../base/common/async.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { equals } from '../../../../base/common/objects.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { IUserDataProfile } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { defaultUserDataProfileIcon, DidChangeUserDataProfileEvent, IUserDataProfileService } from './userDataProfile.js';
 
 export class UserDataProfileService extends Disposable implements IUserDataProfileService {
 
diff --git a/src/vs/workbench/services/userDataSync/browser/userDataSyncEnablementService.ts b/src/vs/workbench/services/userDataSync/browser/userDataSyncEnablementService.ts
index a24838309e6..c6c39578a0d 100644
--- a/src/vs/workbench/services/userDataSync/browser/userDataSyncEnablementService.ts
+++ b/src/vs/workbench/services/userDataSync/browser/userDataSyncEnablementService.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IUserDataSyncEnablementService, SyncResource } from 'vs/platform/userDataSync/common/userDataSync';
-import { UserDataSyncEnablementService as BaseUserDataSyncEnablementService } from 'vs/platform/userDataSync/common/userDataSyncEnablementService';
-import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IUserDataSyncEnablementService, SyncResource } from '../../../../platform/userDataSync/common/userDataSync.js';
+import { UserDataSyncEnablementService as BaseUserDataSyncEnablementService } from '../../../../platform/userDataSync/common/userDataSyncEnablementService.js';
+import { IBrowserWorkbenchEnvironmentService } from '../../environment/browser/environmentService.js';
 
 export class UserDataSyncEnablementService extends BaseUserDataSyncEnablementService implements IUserDataSyncEnablementService {
 
diff --git a/src/vs/workbench/services/userDataSync/browser/userDataSyncInit.ts b/src/vs/workbench/services/userDataSync/browser/userDataSyncInit.ts
index a19eae35e5f..eeefd1b1b05 100644
--- a/src/vs/workbench/services/userDataSync/browser/userDataSyncInit.ts
+++ b/src/vs/workbench/services/userDataSync/browser/userDataSyncInit.ts
@@ -3,38 +3,38 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
-import { AbstractExtensionsInitializer, IExtensionsInitializerPreviewResult } from 'vs/platform/userDataSync/common/extensionsSync';
-import { GlobalStateInitializer, UserDataSyncStoreTypeSynchronizer } from 'vs/platform/userDataSync/common/globalStateSync';
-import { KeybindingsInitializer } from 'vs/platform/userDataSync/common/keybindingsSync';
-import { SettingsInitializer } from 'vs/platform/userDataSync/common/settingsSync';
-import { SnippetsInitializer } from 'vs/platform/userDataSync/common/snippetsSync';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { UserDataSyncStoreClient } from 'vs/platform/userDataSync/common/userDataSyncStoreService';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IRequestService } from 'vs/platform/request/common/request';
-import { IRemoteUserData, IUserData, IUserDataSyncResourceInitializer, IUserDataSyncLogService, IUserDataSyncStoreManagementService, SyncResource } from 'vs/platform/userDataSync/common/userDataSync';
-import { AuthenticationSessionInfo, getCurrentAuthenticationSessionInfo } from 'vs/workbench/services/authentication/browser/authenticationService';
-import { getSyncAreaLabel } from 'vs/workbench/services/userDataSync/common/userDataSync';
-import { isWeb } from 'vs/base/common/platform';
-import { Barrier, Promises } from 'vs/base/common/async';
-import { IExtensionGalleryService, IExtensionManagementService, IGlobalExtensionEnablementService, ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IExtensionService, toExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
-import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { IIgnoredExtensionsManagementService } from 'vs/platform/userDataSync/common/ignoredExtensions';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { isEqual } from 'vs/base/common/resources';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IExtensionStorageService } from 'vs/platform/extensionManagement/common/extensionStorage';
-import { TasksInitializer } from 'vs/platform/userDataSync/common/tasksSync';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { IUserDataInitializer } from 'vs/workbench/services/userData/browser/userDataInit';
-import { ISecretStorageService } from 'vs/platform/secrets/common/secrets';
+import { IStorageService, StorageScope } from '../../../../platform/storage/common/storage.js';
+import { AbstractExtensionsInitializer, IExtensionsInitializerPreviewResult } from '../../../../platform/userDataSync/common/extensionsSync.js';
+import { GlobalStateInitializer, UserDataSyncStoreTypeSynchronizer } from '../../../../platform/userDataSync/common/globalStateSync.js';
+import { KeybindingsInitializer } from '../../../../platform/userDataSync/common/keybindingsSync.js';
+import { SettingsInitializer } from '../../../../platform/userDataSync/common/settingsSync.js';
+import { SnippetsInitializer } from '../../../../platform/userDataSync/common/snippetsSync.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { UserDataSyncStoreClient } from '../../../../platform/userDataSync/common/userDataSyncStoreService.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IRequestService } from '../../../../platform/request/common/request.js';
+import { IRemoteUserData, IUserData, IUserDataSyncResourceInitializer, IUserDataSyncLogService, IUserDataSyncStoreManagementService, SyncResource } from '../../../../platform/userDataSync/common/userDataSync.js';
+import { AuthenticationSessionInfo, getCurrentAuthenticationSessionInfo } from '../../authentication/browser/authenticationService.js';
+import { getSyncAreaLabel } from '../common/userDataSync.js';
+import { isWeb } from '../../../../base/common/platform.js';
+import { Barrier, Promises } from '../../../../base/common/async.js';
+import { IExtensionGalleryService, IExtensionManagementService, IGlobalExtensionEnablementService, ILocalExtension } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { IExtensionService, toExtensionDescription } from '../../extensions/common/extensions.js';
+import { areSameExtensions } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { IIgnoredExtensionsManagementService } from '../../../../platform/userDataSync/common/ignoredExtensions.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IExtensionStorageService } from '../../../../platform/extensionManagement/common/extensionStorage.js';
+import { TasksInitializer } from '../../../../platform/userDataSync/common/tasksSync.js';
+import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { IBrowserWorkbenchEnvironmentService } from '../../environment/browser/environmentService.js';
+import { IUserDataInitializer } from '../../userData/browser/userDataInit.js';
+import { ISecretStorageService } from '../../../../platform/secrets/common/secrets.js';
 
 export class UserDataSyncInitializer implements IUserDataInitializer {
 
diff --git a/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts b/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
index 40cea524423..1eff5f1a2e8 100644
--- a/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
+++ b/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
@@ -3,45 +3,45 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IUserDataSyncService, IAuthenticationProvider, isAuthenticationProvider, IUserDataAutoSyncService, IUserDataSyncStoreManagementService, SyncStatus, IUserDataSyncEnablementService, IUserDataSyncResource, IResourcePreview, USER_DATA_SYNC_SCHEME, USER_DATA_SYNC_LOG_ID, } from 'vs/platform/userDataSync/common/userDataSync';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IUserDataSyncWorkbenchService, IUserDataSyncAccount, AccountStatus, CONTEXT_SYNC_ENABLEMENT, CONTEXT_SYNC_STATE, CONTEXT_ACCOUNT_STATE, SHOW_SYNC_LOG_COMMAND_ID, CONTEXT_ENABLE_ACTIVITY_VIEWS, SYNC_VIEW_CONTAINER_ID, SYNC_TITLE, SYNC_CONFLICTS_VIEW_ID, CONTEXT_ENABLE_SYNC_CONFLICTS_VIEW, CONTEXT_HAS_CONFLICTS, IUserDataSyncConflictsView } from 'vs/workbench/services/userDataSync/common/userDataSync';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { Emitter, Event } from 'vs/base/common/event';
-import { getCurrentAuthenticationSessionInfo } from 'vs/workbench/services/authentication/browser/authenticationService';
-import { AuthenticationSession, AuthenticationSessionsChangeEvent, IAuthenticationService } from 'vs/workbench/services/authentication/common/authentication';
-import { IUserDataSyncAccountService } from 'vs/platform/userDataSync/common/userDataSyncAccount';
-import { IQuickInputService, IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { localize } from 'vs/nls';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { IDialogService, IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
-import { URI } from 'vs/base/common/uri';
-import { IViewDescriptorService } from 'vs/workbench/common/views';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { isWeb } from 'vs/base/common/platform';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { UserDataSyncStoreClient } from 'vs/platform/userDataSync/common/userDataSyncStoreService';
-import { UserDataSyncStoreTypeSynchronizer } from 'vs/platform/userDataSync/common/globalStateSync';
-import { CancellationError } from 'vs/base/common/errors';
-import { raceCancellationError } from 'vs/base/common/async';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { isDiffEditorInput } from 'vs/workbench/common/editor';
-import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { IUserDataInitializationService } from 'vs/workbench/services/userData/browser/userDataInit';
-import { ISecretStorageService } from 'vs/platform/secrets/common/secrets';
-import { IFileService } from 'vs/platform/files/common/files';
-import { escapeRegExpCharacters } from 'vs/base/common/strings';
-import { IUserDataSyncMachinesService } from 'vs/platform/userDataSync/common/userDataSyncMachines';
+import { IUserDataSyncService, IAuthenticationProvider, isAuthenticationProvider, IUserDataAutoSyncService, IUserDataSyncStoreManagementService, SyncStatus, IUserDataSyncEnablementService, IUserDataSyncResource, IResourcePreview, USER_DATA_SYNC_SCHEME, USER_DATA_SYNC_LOG_ID, } from '../../../../platform/userDataSync/common/userDataSync.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IUserDataSyncWorkbenchService, IUserDataSyncAccount, AccountStatus, CONTEXT_SYNC_ENABLEMENT, CONTEXT_SYNC_STATE, CONTEXT_ACCOUNT_STATE, SHOW_SYNC_LOG_COMMAND_ID, CONTEXT_ENABLE_ACTIVITY_VIEWS, SYNC_VIEW_CONTAINER_ID, SYNC_TITLE, SYNC_CONFLICTS_VIEW_ID, CONTEXT_ENABLE_SYNC_CONFLICTS_VIEW, CONTEXT_HAS_CONFLICTS, IUserDataSyncConflictsView } from '../common/userDataSync.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { getCurrentAuthenticationSessionInfo } from '../../authentication/browser/authenticationService.js';
+import { AuthenticationSession, AuthenticationSessionsChangeEvent, IAuthenticationService } from '../../authentication/common/authentication.js';
+import { IUserDataSyncAccountService } from '../../../../platform/userDataSync/common/userDataSyncAccount.js';
+import { IQuickInputService, IQuickPickSeparator } from '../../../../platform/quickinput/common/quickInput.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IExtensionService } from '../../extensions/common/extensions.js';
+import { localize } from '../../../../nls.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { IDialogService, IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IProgressService, ProgressLocation } from '../../../../platform/progress/common/progress.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IViewDescriptorService } from '../../../common/views.js';
+import { IViewsService } from '../../views/common/viewsService.js';
+import { ILifecycleService } from '../../lifecycle/common/lifecycle.js';
+import { isWeb } from '../../../../base/common/platform.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { UserDataSyncStoreClient } from '../../../../platform/userDataSync/common/userDataSyncStoreService.js';
+import { UserDataSyncStoreTypeSynchronizer } from '../../../../platform/userDataSync/common/globalStateSync.js';
+import { CancellationError } from '../../../../base/common/errors.js';
+import { raceCancellationError } from '../../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { IEditorService } from '../../editor/common/editorService.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { isDiffEditorInput } from '../../../common/editor.js';
+import { IBrowserWorkbenchEnvironmentService } from '../../environment/browser/environmentService.js';
+import { IUserDataInitializationService } from '../../userData/browser/userDataInit.js';
+import { ISecretStorageService } from '../../../../platform/secrets/common/secrets.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { escapeRegExpCharacters } from '../../../../base/common/strings.js';
+import { IUserDataSyncMachinesService } from '../../../../platform/userDataSync/common/userDataSyncMachines.js';
 
 type AccountQuickPickItem = { label: string; authenticationProvider: IAuthenticationProvider; account?: UserDataSyncAccount; description?: string };
 
@@ -79,6 +79,9 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
 	private readonly _onDidChangeAccountStatus = this._register(new Emitter<AccountStatus>());
 	readonly onDidChangeAccountStatus = this._onDidChangeAccountStatus.event;
 
+	private readonly _onDidTurnOnSync = this._register(new Emitter<void>());
+	readonly onDidTurnOnSync = this._onDidTurnOnSync.event;
+
 	private _current: UserDataSyncAccount | undefined;
 	get current(): UserDataSyncAccount | undefined { return this._current; }
 
@@ -324,6 +327,7 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
 		}
 
 		this.notificationService.info(localize('sync turned on', "{0} is turned on", SYNC_TITLE.value));
+		this._onDidTurnOnSync.fire();
 	}
 
 	async turnoff(everywhere: boolean): Promise<void> {
@@ -577,7 +581,7 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
 
 		let result: UserDataSyncAccount | IAuthenticationProvider | undefined;
 		const disposables: DisposableStore = new DisposableStore();
-		const quickPick = disposables.add(this.quickInputService.createQuickPick<AccountQuickPickItem>());
+		const quickPick = disposables.add(this.quickInputService.createQuickPick<AccountQuickPickItem>({ useSeparators: true }));
 
 		const promise = new Promise<UserDataSyncAccount | IAuthenticationProvider | undefined>(c => {
 			disposables.add(quickPick.onDidHide(() => {
diff --git a/src/vs/workbench/services/userDataSync/browser/webUserDataSyncEnablementService.ts b/src/vs/workbench/services/userDataSync/browser/webUserDataSyncEnablementService.ts
index 9b230c592cb..73621f422c4 100644
--- a/src/vs/workbench/services/userDataSync/browser/webUserDataSyncEnablementService.ts
+++ b/src/vs/workbench/services/userDataSync/browser/webUserDataSyncEnablementService.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IUserDataSyncEnablementService, SyncResource } from 'vs/platform/userDataSync/common/userDataSync';
-import { UserDataSyncEnablementService } from 'vs/workbench/services/userDataSync/browser/userDataSyncEnablementService';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IUserDataSyncEnablementService, SyncResource } from '../../../../platform/userDataSync/common/userDataSync.js';
+import { UserDataSyncEnablementService } from './userDataSyncEnablementService.js';
 
 export class WebUserDataSyncEnablementService extends UserDataSyncEnablementService implements IUserDataSyncEnablementService {
 
diff --git a/src/vs/workbench/services/userDataSync/common/userDataSync.ts b/src/vs/workbench/services/userDataSync/common/userDataSync.ts
index 9aa88c9e1d0..c3e5e5fa0dd 100644
--- a/src/vs/workbench/services/userDataSync/common/userDataSync.ts
+++ b/src/vs/workbench/services/userDataSync/common/userDataSync.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IAuthenticationProvider, SyncStatus, SyncResource, IUserDataSyncResource, IResourcePreview } from 'vs/platform/userDataSync/common/userDataSync';
-import { Event } from 'vs/base/common/event';
-import { ContextKeyExpr, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { localize, localize2 } from 'vs/nls';
-import { URI } from 'vs/base/common/uri';
-import { Codicon } from 'vs/base/common/codicons';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { IView } from 'vs/workbench/common/views';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { IAction2Options } from 'vs/platform/actions/common/actions';
-import { ILocalizedString } from 'vs/platform/action/common/action';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IAuthenticationProvider, SyncStatus, SyncResource, IUserDataSyncResource, IResourcePreview } from '../../../../platform/userDataSync/common/userDataSync.js';
+import { Event } from '../../../../base/common/event.js';
+import { ContextKeyExpr, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { IView } from '../../../common/views.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { IAction2Options } from '../../../../platform/actions/common/actions.js';
+import { ILocalizedString } from '../../../../platform/action/common/action.js';
 
 export interface IUserDataSyncAccount {
 	readonly authenticationProviderId: string;
@@ -34,6 +34,8 @@ export interface IUserDataSyncWorkbenchService {
 	readonly accountStatus: AccountStatus;
 	readonly onDidChangeAccountStatus: Event<AccountStatus>;
 
+	readonly onDidTurnOnSync: Event<void>;
+
 	turnOn(): Promise<void>;
 	turnoff(everyWhere: boolean): Promise<void>;
 	signIn(): Promise<void>;
@@ -55,8 +57,8 @@ export function getSyncAreaLabel(source: SyncResource): string {
 	switch (source) {
 		case SyncResource.Settings: return localize('settings', "Settings");
 		case SyncResource.Keybindings: return localize('keybindings', "Keyboard Shortcuts");
-		case SyncResource.Snippets: return localize('snippets', "User Snippets");
-		case SyncResource.Tasks: return localize('tasks', "User Tasks");
+		case SyncResource.Snippets: return localize('snippets', "Snippets");
+		case SyncResource.Tasks: return localize('tasks', "Tasks");
 		case SyncResource.Extensions: return localize('extensions', "Extensions");
 		case SyncResource.GlobalState: return localize('ui state label', "UI State");
 		case SyncResource.Profiles: return localize('profiles', "Profiles");
diff --git a/src/vs/workbench/services/userDataSync/common/userDataSyncUtil.ts b/src/vs/workbench/services/userDataSync/common/userDataSyncUtil.ts
index 45329df40c4..dc5f8232d0e 100644
--- a/src/vs/workbench/services/userDataSync/common/userDataSyncUtil.ts
+++ b/src/vs/workbench/services/userDataSync/common/userDataSyncUtil.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IUserDataSyncUtilService, getDefaultIgnoredSettings } from 'vs/platform/userDataSync/common/userDataSync';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { FormattingOptions } from 'vs/base/common/jsonFormatter';
-import { URI } from 'vs/base/common/uri';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { ITextResourcePropertiesService, ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IUserDataSyncUtilService, getDefaultIgnoredSettings } from '../../../../platform/userDataSync/common/userDataSync.js';
+import { IStringDictionary } from '../../../../base/common/collections.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { FormattingOptions } from '../../../../base/common/jsonFormatter.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { ITextResourcePropertiesService, ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
 
 class UserDataSyncUtilService implements IUserDataSyncUtilService {
 
@@ -23,8 +23,8 @@ class UserDataSyncUtilService implements IUserDataSyncUtilService {
 		@ITextResourceConfigurationService private readonly textResourceConfigurationService: ITextResourceConfigurationService,
 	) { }
 
-	async resolveDefaultIgnoredSettings(): Promise<string[]> {
-		return getDefaultIgnoredSettings();
+	async resolveDefaultCoreIgnoredSettings(): Promise<string[]> {
+		return getDefaultIgnoredSettings(true);
 	}
 
 	async resolveUserBindings(userBindings: string[]): Promise<IStringDictionary<string>> {
diff --git a/src/vs/workbench/services/userDataSync/electron-sandbox/userDataAutoSyncService.ts b/src/vs/workbench/services/userDataSync/electron-sandbox/userDataAutoSyncService.ts
index 62da5d44f2e..57065b450ee 100644
--- a/src/vs/workbench/services/userDataSync/electron-sandbox/userDataAutoSyncService.ts
+++ b/src/vs/workbench/services/userDataSync/electron-sandbox/userDataAutoSyncService.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IUserDataAutoSyncService, UserDataSyncError } from 'vs/platform/userDataSync/common/userDataSync';
-import { ISharedProcessService } from 'vs/platform/ipc/electron-sandbox/services';
-import { IChannel } from 'vs/base/parts/ipc/common/ipc';
-import { Event } from 'vs/base/common/event';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { IUserDataAutoSyncService, UserDataSyncError } from '../../../../platform/userDataSync/common/userDataSync.js';
+import { ISharedProcessService } from '../../../../platform/ipc/electron-sandbox/services.js';
+import { IChannel } from '../../../../base/parts/ipc/common/ipc.js';
+import { Event } from '../../../../base/common/event.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
 
 class UserDataAutoSyncService implements IUserDataAutoSyncService {
 
diff --git a/src/vs/workbench/services/userDataSync/electron-sandbox/userDataSyncService.ts b/src/vs/workbench/services/userDataSync/electron-sandbox/userDataSyncService.ts
index 8d9b97c943f..dc701548db8 100644
--- a/src/vs/workbench/services/userDataSync/electron-sandbox/userDataSyncService.ts
+++ b/src/vs/workbench/services/userDataSync/electron-sandbox/userDataSyncService.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IUserDataSyncResourceProviderService, IUserDataSyncService, IUserDataSyncStoreManagementService } from 'vs/platform/userDataSync/common/userDataSync';
-import { registerSharedProcessRemoteService } from 'vs/platform/ipc/electron-sandbox/services';
-import { UserDataSyncServiceChannelClient } from 'vs/platform/userDataSync/common/userDataSyncServiceIpc';
-import { IUserDataSyncMachinesService } from 'vs/platform/userDataSync/common/userDataSyncMachines';
-import { UserDataSyncAccountServiceChannelClient, UserDataSyncStoreManagementServiceChannelClient } from 'vs/platform/userDataSync/common/userDataSyncIpc';
-import { IUserDataSyncAccountService } from 'vs/platform/userDataSync/common/userDataSyncAccount';
+import { IUserDataSyncResourceProviderService, IUserDataSyncService, IUserDataSyncStoreManagementService } from '../../../../platform/userDataSync/common/userDataSync.js';
+import { registerSharedProcessRemoteService } from '../../../../platform/ipc/electron-sandbox/services.js';
+import { UserDataSyncServiceChannelClient } from '../../../../platform/userDataSync/common/userDataSyncServiceIpc.js';
+import { IUserDataSyncMachinesService } from '../../../../platform/userDataSync/common/userDataSyncMachines.js';
+import { UserDataSyncAccountServiceChannelClient, UserDataSyncStoreManagementServiceChannelClient } from '../../../../platform/userDataSync/common/userDataSyncIpc.js';
+import { IUserDataSyncAccountService } from '../../../../platform/userDataSync/common/userDataSyncAccount.js';
 
 registerSharedProcessRemoteService(IUserDataSyncService, 'userDataSync', { channelClientCtor: UserDataSyncServiceChannelClient });
 registerSharedProcessRemoteService(IUserDataSyncResourceProviderService, 'IUserDataSyncResourceProviderService');
diff --git a/src/vs/workbench/services/utilityProcess/electron-sandbox/utilityProcessWorkerWorkbenchService.ts b/src/vs/workbench/services/utilityProcess/electron-sandbox/utilityProcessWorkerWorkbenchService.ts
index d56de04eee4..5851d6a7c43 100644
--- a/src/vs/workbench/services/utilityProcess/electron-sandbox/utilityProcessWorkerWorkbenchService.ts
+++ b/src/vs/workbench/services/utilityProcess/electron-sandbox/utilityProcessWorkerWorkbenchService.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ILogService } from 'vs/platform/log/common/log';
-import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IMainProcessService } from 'vs/platform/ipc/common/mainProcessService';
-import { Client as MessagePortClient } from 'vs/base/parts/ipc/common/ipc.mp';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IPCClient, ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
-import { generateUuid } from 'vs/base/common/uuid';
-import { acquirePort } from 'vs/base/parts/ipc/electron-sandbox/ipc.mp';
-import { IOnDidTerminateUtilityrocessWorkerProcess, ipcUtilityProcessWorkerChannelName, IUtilityProcessWorkerProcess, IUtilityProcessWorkerService } from 'vs/platform/utilityProcess/common/utilityProcessWorkerService';
-import { Barrier, timeout } from 'vs/base/common/async';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { IMainProcessService } from '../../../../platform/ipc/common/mainProcessService.js';
+import { Client as MessagePortClient } from '../../../../base/parts/ipc/common/ipc.mp.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IPCClient, ProxyChannel } from '../../../../base/parts/ipc/common/ipc.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { acquirePort } from '../../../../base/parts/ipc/electron-sandbox/ipc.mp.js';
+import { IOnDidTerminateUtilityrocessWorkerProcess, ipcUtilityProcessWorkerChannelName, IUtilityProcessWorkerProcess, IUtilityProcessWorkerService } from '../../../../platform/utilityProcess/common/utilityProcessWorkerService.js';
+import { Barrier, timeout } from '../../../../base/common/async.js';
 
 export const IUtilityProcessWorkerWorkbenchService = createDecorator<IUtilityProcessWorkerWorkbenchService>('utilityProcessWorkerWorkbenchService');
 
diff --git a/src/vs/workbench/services/views/browser/viewDescriptorService.ts b/src/vs/workbench/services/views/browser/viewDescriptorService.ts
index 0defd074f5e..aa1320d578b 100644
--- a/src/vs/workbench/services/views/browser/viewDescriptorService.ts
+++ b/src/vs/workbench/services/views/browser/viewDescriptorService.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ViewContainerLocation, IViewDescriptorService, ViewContainer, IViewsRegistry, IViewContainersRegistry, IViewDescriptor, Extensions as ViewExtensions, ViewVisibilityState, defaultViewIcon, ViewContainerLocationToString, VIEWS_LOG_ID, VIEWS_LOG_NAME } from 'vs/workbench/common/views';
-import { IContextKey, RawContextKey, IContextKeyService, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { toDisposable, DisposableStore, Disposable, IDisposable, DisposableMap } from 'vs/base/common/lifecycle';
-import { ViewPaneContainer, ViewPaneContainerAction, ViewsSubMenu } from 'vs/workbench/browser/parts/views/viewPaneContainer';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { Event, Emitter } from 'vs/base/common/event';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { generateUuid } from 'vs/base/common/uuid';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { getViewsStateStorageId, ViewContainerModel } from 'vs/workbench/services/views/common/viewContainerModel';
-import { registerAction2, Action2, MenuId } from 'vs/platform/actions/common/actions';
-import { localize, localize2 } from 'vs/nls';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { ILogger, ILoggerService } from 'vs/platform/log/common/log';
-import { Lazy } from 'vs/base/common/lazy';
+import { ViewContainerLocation, IViewDescriptorService, ViewContainer, IViewsRegistry, IViewContainersRegistry, IViewDescriptor, Extensions as ViewExtensions, ViewVisibilityState, defaultViewIcon, ViewContainerLocationToString, VIEWS_LOG_ID, VIEWS_LOG_NAME } from '../../../common/views.js';
+import { IContextKey, RawContextKey, IContextKeyService, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IExtensionService } from '../../extensions/common/extensions.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { toDisposable, DisposableStore, Disposable, IDisposable, DisposableMap } from '../../../../base/common/lifecycle.js';
+import { ViewPaneContainer, ViewPaneContainerAction, ViewsSubMenu } from '../../../browser/parts/views/viewPaneContainer.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { getViewsStateStorageId, ViewContainerModel } from '../common/viewContainerModel.js';
+import { registerAction2, Action2, MenuId } from '../../../../platform/actions/common/actions.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { IStringDictionary } from '../../../../base/common/collections.js';
+import { ILogger, ILoggerService } from '../../../../platform/log/common/log.js';
+import { Lazy } from '../../../../base/common/lazy.js';
 
 interface IViewsCustomizations {
 	viewContainerLocations: IStringDictionary<ViewContainerLocation>;
diff --git a/src/vs/workbench/services/views/browser/viewsService.ts b/src/vs/workbench/services/views/browser/viewsService.ts
index c342e91da15..7970ae8a4ac 100644
--- a/src/vs/workbench/services/views/browser/viewsService.ts
+++ b/src/vs/workbench/services/views/browser/viewsService.ts
@@ -3,37 +3,37 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, IDisposable, toDisposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { IViewDescriptorService, ViewContainer, IViewDescriptor, IView, ViewContainerLocation, IViewPaneContainer } from 'vs/workbench/common/views';
-import { FocusedViewContext, getVisbileViewContextKey } from 'vs/workbench/common/contextkeys';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { Event, Emitter } from 'vs/base/common/event';
-import { isString } from 'vs/base/common/types';
-import { MenuId, registerAction2, Action2, MenuRegistry } from 'vs/platform/actions/common/actions';
-import { localize, localize2 } from 'vs/nls';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IPaneComposite } from 'vs/workbench/common/panecomposite';
-import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { PaneCompositeDescriptor, PaneCompositeRegistry, Extensions as PaneCompositeExtensions, PaneComposite } from 'vs/workbench/browser/panecomposite';
-import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/browser/layoutService';
-import { URI } from 'vs/base/common/uri';
-import { IProgressIndicator } from 'vs/platform/progress/common/progress';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { FilterViewPaneContainer } from 'vs/workbench/browser/parts/views/viewsViewlet';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { ICommandActionTitle, ILocalizedString } from 'vs/platform/action/common/action';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
+import { Disposable, IDisposable, toDisposable, DisposableStore, DisposableMap } from '../../../../base/common/lifecycle.js';
+import { IViewDescriptorService, ViewContainer, IViewDescriptor, IView, ViewContainerLocation, IViewPaneContainer } from '../../../common/views.js';
+import { FocusedViewContext, getVisbileViewContextKey } from '../../../common/contextkeys.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { isString } from '../../../../base/common/types.js';
+import { MenuId, registerAction2, Action2, MenuRegistry } from '../../../../platform/actions/common/actions.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IPaneComposite } from '../../../common/panecomposite.js';
+import { ServicesAccessor, IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ViewPaneContainer } from '../../../browser/parts/views/viewPaneContainer.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IExtensionService } from '../../extensions/common/extensions.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { PaneCompositeDescriptor, PaneCompositeRegistry, Extensions as PaneCompositeExtensions, PaneComposite } from '../../../browser/panecomposite.js';
+import { IWorkbenchLayoutService, Parts } from '../../layout/browser/layoutService.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IProgressIndicator } from '../../../../platform/progress/common/progress.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { IEditorGroupsService } from '../../editor/common/editorGroupsService.js';
+import { FilterViewPaneContainer } from '../../../browser/parts/views/viewsViewlet.js';
+import { IPaneCompositePartService } from '../../panecomposite/browser/panecomposite.js';
+import { ICommandActionTitle, ILocalizedString } from '../../../../platform/action/common/action.js';
+import { IEditorService } from '../../editor/common/editorService.js';
+import { IViewsService } from '../common/viewsService.js';
 
 export class ViewsService extends Disposable implements IViewsService {
 
@@ -51,6 +51,7 @@ export class ViewsService extends Disposable implements IViewsService {
 	private readonly _onDidChangeFocusedView = this._register(new Emitter<void>());
 	readonly onDidChangeFocusedView = this._onDidChangeFocusedView.event;
 
+	private readonly viewContainerDisposables = this._register(new DisposableMap());
 	private readonly enabledViewContainersContextKeys: Map<string, IContextKey<boolean>>;
 	private readonly visibleViewContextKeys: Map<string, IContextKey<boolean>>;
 	private readonly focusedViewContextKey: IContextKey<string>;
@@ -114,7 +115,7 @@ export class ViewsService extends Disposable implements IViewsService {
 
 	private onDidChangeContainers(added: ReadonlyArray<{ container: ViewContainer; location: ViewContainerLocation }>, removed: ReadonlyArray<{ container: ViewContainer; location: ViewContainerLocation }>): void {
 		for (const { container, location } of removed) {
-			this.deregisterPaneComposite(container, location);
+			this.onDidDeregisterViewContainer(container, location);
 		}
 		for (const { container, location } of added) {
 			this.onDidRegisterViewContainer(container, location);
@@ -123,15 +124,24 @@ export class ViewsService extends Disposable implements IViewsService {
 
 	private onDidRegisterViewContainer(viewContainer: ViewContainer, viewContainerLocation: ViewContainerLocation): void {
 		this.registerPaneComposite(viewContainer, viewContainerLocation);
+		const disposables = new DisposableStore();
+
 		const viewContainerModel = this.viewDescriptorService.getViewContainerModel(viewContainer);
 		this.onViewDescriptorsAdded(viewContainerModel.allViewDescriptors, viewContainer);
-		this._register(viewContainerModel.onDidChangeAllViewDescriptors(({ added, removed }) => {
+		disposables.add(viewContainerModel.onDidChangeAllViewDescriptors(({ added, removed }) => {
 			this.onViewDescriptorsAdded(added, viewContainer);
 			this.onViewDescriptorsRemoved(removed);
 		}));
 		this.updateViewContainerEnablementContextKey(viewContainer);
-		this._register(viewContainerModel.onDidChangeActiveViewDescriptors(() => this.updateViewContainerEnablementContextKey(viewContainer)));
-		this._register(this.registerOpenViewContainerAction(viewContainer));
+		disposables.add(viewContainerModel.onDidChangeActiveViewDescriptors(() => this.updateViewContainerEnablementContextKey(viewContainer)));
+		disposables.add(this.registerOpenViewContainerAction(viewContainer));
+
+		this.viewContainerDisposables.set(viewContainer.id, disposables);
+	}
+
+	private onDidDeregisterViewContainer(viewContainer: ViewContainer, viewContainerLocation: ViewContainerLocation): void {
+		this.deregisterPaneComposite(viewContainer, viewContainerLocation);
+		this.viewContainerDisposables.deleteAndDispose(viewContainer.id);
 	}
 
 	private onDidChangeContainerLocation(viewContainer: ViewContainer, from: ViewContainerLocation, to: ViewContainerLocation): void {
@@ -139,7 +149,10 @@ export class ViewsService extends Disposable implements IViewsService {
 		this.registerPaneComposite(viewContainer, to);
 
 		// Open view container if part is visible and there is only one view container in location
-		if (this.layoutService.isVisible(getPartByLocation(to)) && this.viewDescriptorService.getViewContainersByLocation(to).length === 1) {
+		if (
+			this.layoutService.isVisible(getPartByLocation(to)) &&
+			this.viewDescriptorService.getViewContainersByLocation(to).filter(vc => this.isViewContainerActive(vc.id)).length === 1
+		) {
 			this.openViewContainer(viewContainer.id);
 		}
 	}
@@ -186,15 +199,33 @@ export class ViewsService extends Disposable implements IViewsService {
 		return this.paneCompositeService.getPaneComposite(compositeId, location);
 	}
 
+	// One view container can be visible at a time in a location
 	isViewContainerVisible(id: string): boolean {
 		const viewContainer = this.viewDescriptorService.getViewContainerById(id);
-		if (viewContainer) {
-			const viewContainerLocation = this.viewDescriptorService.getViewContainerLocation(viewContainer);
-			if (viewContainerLocation !== null) {
-				return this.paneCompositeService.getActivePaneComposite(viewContainerLocation)?.getId() === id;
-			}
+		if (!viewContainer) {
+			return false;
 		}
-		return false;
+
+		const viewContainerLocation = this.viewDescriptorService.getViewContainerLocation(viewContainer);
+		if (viewContainerLocation === null) {
+			return false;
+		}
+
+		return this.paneCompositeService.getActivePaneComposite(viewContainerLocation)?.getId() === id;
+	}
+
+	// Multiple view containers can be active/inactive at a time in a location
+	isViewContainerActive(id: string): boolean {
+		const viewContainer = this.viewDescriptorService.getViewContainerById(id);
+		if (!viewContainer) {
+			return false;
+		}
+
+		if (!viewContainer.hideIfEmpty) {
+			return true;
+		}
+
+		return this.viewDescriptorService.getViewContainerModel(viewContainer).activeViewDescriptors.length > 0;
 	}
 
 	getVisibleViewContainer(location: ViewContainerLocation): ViewContainer | null {
diff --git a/src/vs/workbench/services/views/common/viewContainerModel.ts b/src/vs/workbench/services/views/common/viewContainerModel.ts
index 801b4c0e065..7125aa7284e 100644
--- a/src/vs/workbench/services/views/common/viewContainerModel.ts
+++ b/src/vs/workbench/services/views/common/viewContainerModel.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ViewContainer, IViewsRegistry, IViewDescriptor, Extensions as ViewExtensions, IViewContainerModel, IAddedViewDescriptorRef, IViewDescriptorRef, IAddedViewDescriptorState, defaultViewIcon, VIEWS_LOG_ID, VIEWS_LOG_NAME } from 'vs/workbench/common/views';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { Event, Emitter } from 'vs/base/common/event';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { URI } from 'vs/base/common/uri';
-import { coalesce, move } from 'vs/base/common/arrays';
-import { isUndefined, isUndefinedOrNull } from 'vs/base/common/types';
-import { isEqual } from 'vs/base/common/resources';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { ILogger, ILoggerService } from 'vs/platform/log/common/log';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { IOutputService } from 'vs/workbench/services/output/common/output';
-import { CounterSet } from 'vs/base/common/map';
-import { localize2 } from 'vs/nls';
-import { Lazy } from 'vs/base/common/lazy';
+import { ViewContainer, IViewsRegistry, IViewDescriptor, Extensions as ViewExtensions, IViewContainerModel, IAddedViewDescriptorRef, IViewDescriptorRef, IAddedViewDescriptorState, defaultViewIcon, VIEWS_LOG_ID, VIEWS_LOG_NAME } from '../../../common/views.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { URI } from '../../../../base/common/uri.js';
+import { coalesce, move } from '../../../../base/common/arrays.js';
+import { isUndefined, isUndefinedOrNull } from '../../../../base/common/types.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { IStringDictionary } from '../../../../base/common/collections.js';
+import { ILogger, ILoggerService } from '../../../../platform/log/common/log.js';
+import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { IOutputService } from '../../output/common/output.js';
+import { CounterSet } from '../../../../base/common/map.js';
+import { localize2 } from '../../../../nls.js';
+import { Lazy } from '../../../../base/common/lazy.js';
 
 registerAction2(class extends Action2 {
 	constructor() {
diff --git a/src/vs/workbench/services/views/common/viewsService.ts b/src/vs/workbench/services/views/common/viewsService.ts
index de2cab29744..393a8292079 100644
--- a/src/vs/workbench/services/views/common/viewsService.ts
+++ b/src/vs/workbench/services/views/common/viewsService.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IProgressIndicator } from 'vs/platform/progress/common/progress';
-import { IPaneComposite } from 'vs/workbench/common/panecomposite';
-import { IView, IViewPaneContainer, ViewContainer, ViewContainerLocation } from 'vs/workbench/common/views';
+import { Event } from '../../../../base/common/event.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IProgressIndicator } from '../../../../platform/progress/common/progress.js';
+import { IPaneComposite } from '../../../common/panecomposite.js';
+import { IView, IViewPaneContainer, ViewContainer, ViewContainerLocation } from '../../../common/views.js';
 
 export const IViewsService = createDecorator<IViewsService>('viewsService');
 export interface IViewsService {
@@ -17,6 +17,7 @@ export interface IViewsService {
 	// View Container APIs
 	readonly onDidChangeViewContainerVisibility: Event<{ id: string; visible: boolean; location: ViewContainerLocation }>;
 	isViewContainerVisible(id: string): boolean;
+	isViewContainerActive(id: string): boolean;
 	openViewContainer(id: string, focus?: boolean): Promise<IPaneComposite | null>;
 	closeViewContainer(id: string): void;
 	getVisibleViewContainer(location: ViewContainerLocation): ViewContainer | null;
diff --git a/src/vs/workbench/services/views/test/browser/viewContainerModel.test.ts b/src/vs/workbench/services/views/test/browser/viewContainerModel.test.ts
index c20ad890065..18e62e12c7e 100644
--- a/src/vs/workbench/services/views/test/browser/viewContainerModel.test.ts
+++ b/src/vs/workbench/services/views/test/browser/viewContainerModel.test.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
+import * as nls from '../../../../../nls.js';
 import assert from 'assert';
 import * as sinon from 'sinon';
-import { IViewsRegistry, IViewDescriptor, IViewContainersRegistry, Extensions as ViewContainerExtensions, ViewContainerLocation, IViewContainerModel, IViewDescriptorService, ViewContainer } from 'vs/workbench/common/views';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { move } from 'vs/base/common/arrays';
-import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { ContextKeyService } from 'vs/platform/contextkey/browser/contextKeyService';
-import { ViewDescriptorService } from 'vs/workbench/services/views/browser/viewDescriptorService';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { Event } from 'vs/base/common/event';
-import { getViewsStateStorageId } from 'vs/workbench/services/views/common/viewContainerModel';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { IViewsRegistry, IViewDescriptor, IViewContainersRegistry, Extensions as ViewContainerExtensions, ViewContainerLocation, IViewContainerModel, IViewDescriptorService, ViewContainer } from '../../../../common/views.js';
+import { IDisposable, dispose } from '../../../../../base/common/lifecycle.js';
+import { move } from '../../../../../base/common/arrays.js';
+import { workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
+import { ContextKeyExpr, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { ContextKeyService } from '../../../../../platform/contextkey/browser/contextKeyService.js';
+import { ViewDescriptorService } from '../../browser/viewDescriptorService.js';
+import { Registry } from '../../../../../platform/registry/common/platform.js';
+import { SyncDescriptor } from '../../../../../platform/instantiation/common/descriptors.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { Event } from '../../../../../base/common/event.js';
+import { getViewsStateStorageId } from '../../common/viewContainerModel.js';
+import { runWithFakedTimers } from '../../../../../base/test/common/timeTravelScheduler.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 const ViewContainerRegistry = Registry.as<IViewContainersRegistry>(ViewContainerExtensions.ViewContainersRegistry);
 const ViewsRegistry = Registry.as<IViewsRegistry>(ViewContainerExtensions.ViewsRegistry);
diff --git a/src/vs/workbench/services/views/test/browser/viewDescriptorService.test.ts b/src/vs/workbench/services/views/test/browser/viewDescriptorService.test.ts
index f9ab97f41e2..97e0c77dd21 100644
--- a/src/vs/workbench/services/views/test/browser/viewDescriptorService.test.ts
+++ b/src/vs/workbench/services/views/test/browser/viewDescriptorService.test.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
+import * as nls from '../../../../../nls.js';
 import assert from 'assert';
-import { IViewsRegistry, IViewDescriptor, IViewContainersRegistry, Extensions as ViewContainerExtensions, ViewContainerLocation, ViewContainer, ViewContainerLocationToString } from 'vs/workbench/common/views';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { ViewDescriptorService } from 'vs/workbench/services/views/browser/viewDescriptorService';
-import { assertIsDefined } from 'vs/base/common/types';
-import { ContextKeyService } from 'vs/platform/contextkey/browser/contextKeyService';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { generateUuid } from 'vs/base/common/uuid';
-import { compare } from 'vs/base/common/strings';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { IViewsRegistry, IViewDescriptor, IViewContainersRegistry, Extensions as ViewContainerExtensions, ViewContainerLocation, ViewContainer, ViewContainerLocationToString } from '../../../../common/views.js';
+import { Registry } from '../../../../../platform/registry/common/platform.js';
+import { workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { SyncDescriptor } from '../../../../../platform/instantiation/common/descriptors.js';
+import { ViewDescriptorService } from '../../browser/viewDescriptorService.js';
+import { assertIsDefined } from '../../../../../base/common/types.js';
+import { ContextKeyService } from '../../../../../platform/contextkey/browser/contextKeyService.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { generateUuid } from '../../../../../base/common/uuid.js';
+import { compare } from '../../../../../base/common/strings.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 const ViewsRegistry = Registry.as<IViewsRegistry>(ViewContainerExtensions.ViewsRegistry);
 const ViewContainersRegistry = Registry.as<IViewContainersRegistry>(ViewContainerExtensions.ViewContainersRegistry);
diff --git a/src/vs/workbench/services/workingCopy/browser/workingCopyBackupService.ts b/src/vs/workbench/services/workingCopy/browser/workingCopyBackupService.ts
index 7854b8de8f1..d39643cc330 100644
--- a/src/vs/workbench/services/workingCopy/browser/workingCopyBackupService.ts
+++ b/src/vs/workbench/services/workingCopy/browser/workingCopyBackupService.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IFileService } from 'vs/platform/files/common/files';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { WorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackupService';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackup';
-import { joinPath } from 'vs/base/common/resources';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { BrowserWorkingCopyBackupTracker } from 'vs/workbench/services/workingCopy/browser/workingCopyBackupTracker';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { WorkingCopyBackupService } from '../common/workingCopyBackupService.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IWorkingCopyBackupService } from '../common/workingCopyBackup.js';
+import { joinPath } from '../../../../base/common/resources.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { BrowserWorkingCopyBackupTracker } from './workingCopyBackupTracker.js';
 
 export class BrowserWorkingCopyBackupService extends WorkingCopyBackupService {
 
diff --git a/src/vs/workbench/services/workingCopy/browser/workingCopyBackupTracker.ts b/src/vs/workbench/services/workingCopy/browser/workingCopyBackupTracker.ts
index 29ca48be967..a0b33b253be 100644
--- a/src/vs/workbench/services/workingCopy/browser/workingCopyBackupTracker.ts
+++ b/src/vs/workbench/services/workingCopy/browser/workingCopyBackupTracker.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackup';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
-import { ILifecycleService, ShutdownReason } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { ILogService } from 'vs/platform/log/common/log';
-import { WorkingCopyBackupTracker } from 'vs/workbench/services/workingCopy/common/workingCopyBackupTracker';
-import { IWorkingCopyEditorService } from 'vs/workbench/services/workingCopy/common/workingCopyEditorService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
+import { IWorkingCopyBackupService } from '../common/workingCopyBackup.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IFilesConfigurationService } from '../../filesConfiguration/common/filesConfigurationService.js';
+import { IWorkingCopyService } from '../common/workingCopyService.js';
+import { ILifecycleService, ShutdownReason } from '../../lifecycle/common/lifecycle.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { WorkingCopyBackupTracker } from '../common/workingCopyBackupTracker.js';
+import { IWorkingCopyEditorService } from '../common/workingCopyEditorService.js';
+import { IEditorService } from '../../editor/common/editorService.js';
+import { IEditorGroupsService } from '../../editor/common/editorGroupsService.js';
 
 export class BrowserWorkingCopyBackupTracker extends WorkingCopyBackupTracker implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/services/workingCopy/browser/workingCopyHistoryService.ts b/src/vs/workbench/services/workingCopy/browser/workingCopyHistoryService.ts
index 8be2e38e3c5..560d4ec235d 100644
--- a/src/vs/workbench/services/workingCopy/browser/workingCopyHistoryService.ts
+++ b/src/vs/workbench/services/workingCopy/browser/workingCopyHistoryService.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IFileService } from 'vs/platform/files/common/files';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IWorkingCopyHistoryModelOptions, WorkingCopyHistoryService } from 'vs/workbench/services/workingCopy/common/workingCopyHistoryService';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IWorkingCopyHistoryService } from 'vs/workbench/services/workingCopy/common/workingCopyHistory';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IRemoteAgentService } from '../../remote/common/remoteAgentService.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IWorkingCopyHistoryModelOptions, WorkingCopyHistoryService } from '../common/workingCopyHistoryService.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IWorkingCopyHistoryService } from '../common/workingCopyHistory.js';
 
 export class BrowserWorkingCopyHistoryService extends WorkingCopyHistoryService {
 
diff --git a/src/vs/workbench/services/workingCopy/common/abstractFileWorkingCopyManager.ts b/src/vs/workbench/services/workingCopy/common/abstractFileWorkingCopyManager.ts
index 5cc96b59be1..a64f7351eb7 100644
--- a/src/vs/workbench/services/workingCopy/common/abstractFileWorkingCopyManager.ts
+++ b/src/vs/workbench/services/workingCopy/common/abstractFileWorkingCopyManager.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { ResourceMap } from 'vs/base/common/map';
-import { Promises } from 'vs/base/common/async';
-import { IFileService } from 'vs/platform/files/common/files';
-import { URI } from 'vs/base/common/uri';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackup';
-import { IFileWorkingCopy, IFileWorkingCopyModel } from 'vs/workbench/services/workingCopy/common/fileWorkingCopy';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, dispose, IDisposable } from '../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { Promises } from '../../../../base/common/async.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IWorkingCopyBackupService } from './workingCopyBackup.js';
+import { IFileWorkingCopy, IFileWorkingCopyModel } from './fileWorkingCopy.js';
 
 export interface IBaseFileWorkingCopyManager<M extends IFileWorkingCopyModel, W extends IFileWorkingCopy<M>> extends IDisposable {
 
diff --git a/src/vs/workbench/services/workingCopy/common/fileWorkingCopy.ts b/src/vs/workbench/services/workingCopy/common/fileWorkingCopy.ts
index 6d08b310fed..e4a56b2a51f 100644
--- a/src/vs/workbench/services/workingCopy/common/fileWorkingCopy.ts
+++ b/src/vs/workbench/services/workingCopy/common/fileWorkingCopy.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { Event } from 'vs/base/common/event';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { VSBufferReadableStream } from 'vs/base/common/buffer';
-import { URI } from 'vs/base/common/uri';
-import { IWorkingCopy } from 'vs/workbench/services/workingCopy/common/workingCopy';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { Event } from '../../../../base/common/event.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { VSBufferReadableStream } from '../../../../base/common/buffer.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IWorkingCopy } from './workingCopy.js';
 
 export interface IFileWorkingCopyModelFactory<M extends IFileWorkingCopyModel> {
 
diff --git a/src/vs/workbench/services/workingCopy/common/fileWorkingCopyManager.ts b/src/vs/workbench/services/workingCopy/common/fileWorkingCopyManager.ts
index 35eb7cf3c8e..80ad8dadfce 100644
--- a/src/vs/workbench/services/workingCopy/common/fileWorkingCopyManager.ts
+++ b/src/vs/workbench/services/workingCopy/common/fileWorkingCopyManager.ts
@@ -3,42 +3,42 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Promises } from 'vs/base/common/async';
-import { VSBufferReadableStream } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { toLocalResource, joinPath, isEqual, basename, dirname } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { IFileDialogService, IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IFileService } from 'vs/platform/files/common/files';
-import { ISaveOptions, SaveSourceRegistry } from 'vs/workbench/common/editor';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel, IStoredFileWorkingCopyModelFactory, IStoredFileWorkingCopyResolveOptions, StoredFileWorkingCopyState } from 'vs/workbench/services/workingCopy/common/storedFileWorkingCopy';
-import { StoredFileWorkingCopyManager, IStoredFileWorkingCopyManager, IStoredFileWorkingCopyManagerResolveOptions } from 'vs/workbench/services/workingCopy/common/storedFileWorkingCopyManager';
-import { IUntitledFileWorkingCopy, IUntitledFileWorkingCopyModel, IUntitledFileWorkingCopyModelFactory, UntitledFileWorkingCopy } from 'vs/workbench/services/workingCopy/common/untitledFileWorkingCopy';
-import { INewOrExistingUntitledFileWorkingCopyOptions, INewUntitledFileWorkingCopyOptions, INewUntitledFileWorkingCopyWithAssociatedResourceOptions, IUntitledFileWorkingCopyManager, UntitledFileWorkingCopyManager } from 'vs/workbench/services/workingCopy/common/untitledFileWorkingCopyManager';
-import { IWorkingCopyFileService } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
-import { IBaseFileWorkingCopyManager } from 'vs/workbench/services/workingCopy/common/abstractFileWorkingCopyManager';
-import { IFileWorkingCopy, SnapshotContext } from 'vs/workbench/services/workingCopy/common/fileWorkingCopy';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { ILogService } from 'vs/platform/log/common/log';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IElevatedFileService } from 'vs/workbench/services/files/common/elevatedFileService';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackup';
-import { IWorkingCopyEditorService } from 'vs/workbench/services/workingCopy/common/workingCopyEditorService';
-import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
-import { Schemas } from 'vs/base/common/network';
-import { IDecorationData, IDecorationsProvider, IDecorationsService } from 'vs/workbench/services/decorations/common/decorations';
-import { Codicon } from 'vs/base/common/codicons';
-import { listErrorForeground } from 'vs/platform/theme/common/colorRegistry';
-import { IProgressService } from 'vs/platform/progress/common/progress';
+import { localize } from '../../../../nls.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Promises } from '../../../../base/common/async.js';
+import { VSBufferReadableStream } from '../../../../base/common/buffer.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { toLocalResource, joinPath, isEqual, basename, dirname } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IFileDialogService, IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { ISaveOptions, SaveSourceRegistry } from '../../../common/editor.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { IPathService } from '../../path/common/pathService.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel, IStoredFileWorkingCopyModelFactory, IStoredFileWorkingCopyResolveOptions, StoredFileWorkingCopyState } from './storedFileWorkingCopy.js';
+import { StoredFileWorkingCopyManager, IStoredFileWorkingCopyManager, IStoredFileWorkingCopyManagerResolveOptions } from './storedFileWorkingCopyManager.js';
+import { IUntitledFileWorkingCopy, IUntitledFileWorkingCopyModel, IUntitledFileWorkingCopyModelFactory, UntitledFileWorkingCopy } from './untitledFileWorkingCopy.js';
+import { INewOrExistingUntitledFileWorkingCopyOptions, INewUntitledFileWorkingCopyOptions, INewUntitledFileWorkingCopyWithAssociatedResourceOptions, IUntitledFileWorkingCopyManager, UntitledFileWorkingCopyManager } from './untitledFileWorkingCopyManager.js';
+import { IWorkingCopyFileService } from './workingCopyFileService.js';
+import { IBaseFileWorkingCopyManager } from './abstractFileWorkingCopyManager.js';
+import { IFileWorkingCopy, SnapshotContext } from './fileWorkingCopy.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IEditorService } from '../../editor/common/editorService.js';
+import { IElevatedFileService } from '../../files/common/elevatedFileService.js';
+import { IFilesConfigurationService } from '../../filesConfiguration/common/filesConfigurationService.js';
+import { ILifecycleService } from '../../lifecycle/common/lifecycle.js';
+import { IWorkingCopyBackupService } from './workingCopyBackup.js';
+import { IWorkingCopyEditorService } from './workingCopyEditorService.js';
+import { IWorkingCopyService } from './workingCopyService.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { IDecorationData, IDecorationsProvider, IDecorationsService } from '../../decorations/common/decorations.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { listErrorForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import { IProgressService } from '../../../../platform/progress/common/progress.js';
 
 export interface IFileWorkingCopyManager<S extends IStoredFileWorkingCopyModel, U extends IUntitledFileWorkingCopyModel> extends IBaseFileWorkingCopyManager<S | U, IFileWorkingCopy<S | U>> {
 
diff --git a/src/vs/workbench/services/workingCopy/common/resourceWorkingCopy.ts b/src/vs/workbench/services/workingCopy/common/resourceWorkingCopy.ts
index 1f9254fd590..9ea4cf46450 100644
--- a/src/vs/workbench/services/workingCopy/common/resourceWorkingCopy.ts
+++ b/src/vs/workbench/services/workingCopy/common/resourceWorkingCopy.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { timeout } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Event, Emitter } from 'vs/base/common/event';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { FileChangesEvent, FileChangeType, IFileService } from 'vs/platform/files/common/files';
-import { ISaveOptions, IRevertOptions } from 'vs/workbench/common/editor';
-import { IWorkingCopy, IWorkingCopyBackup, IWorkingCopySaveEvent, WorkingCopyCapabilities } from 'vs/workbench/services/workingCopy/common/workingCopy';
+import { timeout } from '../../../../base/common/async.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { FileChangesEvent, FileChangeType, IFileService } from '../../../../platform/files/common/files.js';
+import { ISaveOptions, IRevertOptions } from '../../../common/editor.js';
+import { IWorkingCopy, IWorkingCopyBackup, IWorkingCopySaveEvent, WorkingCopyCapabilities } from './workingCopy.js';
 
 /**
  * A resource based `IWorkingCopy` is backed by a `URI` from a
diff --git a/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopy.ts b/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopy.ts
index 0c3532605b9..93d5ac1a0fe 100644
--- a/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopy.ts
+++ b/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopy.ts
@@ -3,33 +3,33 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { URI } from 'vs/base/common/uri';
-import { Event, Emitter } from 'vs/base/common/event';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { ETAG_DISABLED, FileOperationError, FileOperationResult, IFileReadLimits, IFileService, IFileStatWithMetadata, IFileStreamContent, IWriteFileOptions, NotModifiedSinceFileOperationError } from 'vs/platform/files/common/files';
-import { ISaveOptions, IRevertOptions, SaveReason } from 'vs/workbench/common/editor';
-import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
-import { IWorkingCopyBackup, IWorkingCopyBackupMeta, IWorkingCopySaveEvent, WorkingCopyCapabilities } from 'vs/workbench/services/workingCopy/common/workingCopy';
-import { raceCancellation, TaskSequentializer, timeout } from 'vs/base/common/async';
-import { ILogService } from 'vs/platform/log/common/log';
-import { assertIsDefined } from 'vs/base/common/types';
-import { IWorkingCopyFileService } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
-import { VSBufferReadableStream } from 'vs/base/common/buffer';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { IWorkingCopyBackupService, IResolvedWorkingCopyBackup } from 'vs/workbench/services/workingCopy/common/workingCopyBackup';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { hash } from 'vs/base/common/hash';
-import { isErrorWithActions, toErrorMessage } from 'vs/base/common/errorMessage';
-import { IAction, toAction } from 'vs/base/common/actions';
-import { isWindows } from 'vs/base/common/platform';
-import { IWorkingCopyEditorService } from 'vs/workbench/services/workingCopy/common/workingCopyEditorService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IElevatedFileService } from 'vs/workbench/services/files/common/elevatedFileService';
-import { IResourceWorkingCopy, ResourceWorkingCopy } from 'vs/workbench/services/workingCopy/common/resourceWorkingCopy';
-import { IFileWorkingCopy, IFileWorkingCopyModel, IFileWorkingCopyModelFactory, SnapshotContext } from 'vs/workbench/services/workingCopy/common/fileWorkingCopy';
-import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { IProgress, IProgressService, IProgressStep, ProgressLocation } from 'vs/platform/progress/common/progress';
+import { localize } from '../../../../nls.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { ETAG_DISABLED, FileOperationError, FileOperationResult, IFileReadLimits, IFileService, IFileStatWithMetadata, IFileStreamContent, IWriteFileOptions, NotModifiedSinceFileOperationError } from '../../../../platform/files/common/files.js';
+import { ISaveOptions, IRevertOptions, SaveReason } from '../../../common/editor.js';
+import { IWorkingCopyService } from './workingCopyService.js';
+import { IWorkingCopyBackup, IWorkingCopyBackupMeta, IWorkingCopySaveEvent, WorkingCopyCapabilities } from './workingCopy.js';
+import { raceCancellation, TaskSequentializer, timeout } from '../../../../base/common/async.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { assertIsDefined } from '../../../../base/common/types.js';
+import { IWorkingCopyFileService } from './workingCopyFileService.js';
+import { VSBufferReadableStream } from '../../../../base/common/buffer.js';
+import { IFilesConfigurationService } from '../../filesConfiguration/common/filesConfigurationService.js';
+import { IWorkingCopyBackupService, IResolvedWorkingCopyBackup } from './workingCopyBackup.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { hash } from '../../../../base/common/hash.js';
+import { isErrorWithActions, toErrorMessage } from '../../../../base/common/errorMessage.js';
+import { IAction, toAction } from '../../../../base/common/actions.js';
+import { isWindows } from '../../../../base/common/platform.js';
+import { IWorkingCopyEditorService } from './workingCopyEditorService.js';
+import { IEditorService } from '../../editor/common/editorService.js';
+import { IElevatedFileService } from '../../files/common/elevatedFileService.js';
+import { IResourceWorkingCopy, ResourceWorkingCopy } from './resourceWorkingCopy.js';
+import { IFileWorkingCopy, IFileWorkingCopyModel, IFileWorkingCopyModelFactory, SnapshotContext } from './fileWorkingCopy.js';
+import { IMarkdownString } from '../../../../base/common/htmlContent.js';
+import { IProgress, IProgressService, IProgressStep, ProgressLocation } from '../../../../platform/progress/common/progress.js';
 
 /**
  * Stored file specific working copy model factory.
@@ -439,7 +439,7 @@ export class StoredFileWorkingCopy<M extends IStoredFileWorkingCopyModel> extend
 
 	//#region Resolve
 
-	private lastResolvedFileStat: IFileStatWithMetadata | undefined;
+	lastResolvedFileStat: IFileStatWithMetadata | undefined; // !!! DO NOT MARK PRIVATE! USED IN TESTS !!!
 
 	isResolved(): this is IResolvedStoredFileWorkingCopy<M> {
 		return !!this.model;
@@ -1143,7 +1143,7 @@ export class StoredFileWorkingCopy<M extends IStoredFileWorkingCopyModel> extend
 			message = localize('staleSaveError', "Failed to save '{0}': The content of the file is newer. Do you want to overwrite the file with your changes?", this.name);
 
 			primaryActions.push(toAction({ id: 'fileWorkingCopy.overwrite', label: localize('overwrite', "Overwrite"), run: () => this.save({ ...options, ignoreModifiedSince: true, reason: SaveReason.EXPLICIT }) }));
-			primaryActions.push(toAction({ id: 'fileWorkingCopy.revert', label: localize('discard', "Discard"), run: () => this.revert() }));
+			primaryActions.push(toAction({ id: 'fileWorkingCopy.revert', label: localize('revert', "Revert"), run: () => this.revert() }));
 		}
 
 		// Any other save error
@@ -1196,8 +1196,8 @@ export class StoredFileWorkingCopy<M extends IStoredFileWorkingCopyModel> extend
 				}
 			}));
 
-			// Discard
-			primaryActions.push(toAction({ id: 'fileWorkingCopy.revert', label: localize('discard', "Discard"), run: () => this.revert() }));
+			// Revert
+			primaryActions.push(toAction({ id: 'fileWorkingCopy.revert', label: localize('revert', "Revert"), run: () => this.revert() }));
 
 			// Message
 			if (isWriteLocked) {
@@ -1242,6 +1242,11 @@ export class StoredFileWorkingCopy<M extends IStoredFileWorkingCopyModel> extend
 			this.lastResolvedFileStat = newFileStat;
 		}
 
+		// In all other cases update only the readonly and locked flags
+		else {
+			this.lastResolvedFileStat = { ...this.lastResolvedFileStat, readonly: newFileStat.readonly, locked: newFileStat.locked };
+		}
+
 		// Signal that the readonly state changed
 		if (this.isReadonly() !== oldReadonly) {
 			this._onDidChangeReadonly.fire();
diff --git a/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopyManager.ts b/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopyManager.ts
index bbd5aa58f01..5a8f9d88bd3 100644
--- a/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopyManager.ts
+++ b/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopyManager.ts
@@ -3,34 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { DisposableStore, dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { Event, Emitter } from 'vs/base/common/event';
-import { StoredFileWorkingCopy, StoredFileWorkingCopyState, IStoredFileWorkingCopy, IStoredFileWorkingCopyModel, IStoredFileWorkingCopyModelFactory, IStoredFileWorkingCopyResolveOptions, IStoredFileWorkingCopySaveEvent as IBaseStoredFileWorkingCopySaveEvent } from 'vs/workbench/services/workingCopy/common/storedFileWorkingCopy';
-import { ResourceMap } from 'vs/base/common/map';
-import { Promises, ResourceQueue } from 'vs/base/common/async';
-import { FileChangesEvent, FileChangeType, FileOperation, IFileService, IFileSystemProviderCapabilitiesChangeEvent, IFileSystemProviderRegistrationEvent } from 'vs/platform/files/common/files';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { VSBufferReadableStream } from 'vs/base/common/buffer';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { ILogService } from 'vs/platform/log/common/log';
-import { joinPath } from 'vs/base/common/resources';
-import { IWorkingCopyFileService, WorkingCopyFileEvent } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackup';
-import { BaseFileWorkingCopyManager, IBaseFileWorkingCopyManager } from 'vs/workbench/services/workingCopy/common/abstractFileWorkingCopyManager';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IElevatedFileService } from 'vs/workbench/services/files/common/elevatedFileService';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { IWorkingCopyEditorService } from 'vs/workbench/services/workingCopy/common/workingCopyEditorService';
-import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
-import { isWeb } from 'vs/base/common/platform';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { SnapshotContext } from 'vs/workbench/services/workingCopy/common/fileWorkingCopy';
-import { IProgressService } from 'vs/platform/progress/common/progress';
+import { localize } from '../../../../nls.js';
+import { DisposableStore, dispose, IDisposable } from '../../../../base/common/lifecycle.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { StoredFileWorkingCopy, StoredFileWorkingCopyState, IStoredFileWorkingCopy, IStoredFileWorkingCopyModel, IStoredFileWorkingCopyModelFactory, IStoredFileWorkingCopyResolveOptions, IStoredFileWorkingCopySaveEvent as IBaseStoredFileWorkingCopySaveEvent } from './storedFileWorkingCopy.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { Promises, ResourceQueue } from '../../../../base/common/async.js';
+import { FileChangesEvent, FileChangeType, FileOperation, IFileService, IFileSystemProviderCapabilitiesChangeEvent, IFileSystemProviderRegistrationEvent } from '../../../../platform/files/common/files.js';
+import { ILifecycleService } from '../../lifecycle/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { VSBufferReadableStream } from '../../../../base/common/buffer.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { joinPath } from '../../../../base/common/resources.js';
+import { IWorkingCopyFileService, WorkingCopyFileEvent } from './workingCopyFileService.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IWorkingCopyBackupService } from './workingCopyBackup.js';
+import { BaseFileWorkingCopyManager, IBaseFileWorkingCopyManager } from './abstractFileWorkingCopyManager.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IEditorService } from '../../editor/common/editorService.js';
+import { IElevatedFileService } from '../../files/common/elevatedFileService.js';
+import { IFilesConfigurationService } from '../../filesConfiguration/common/filesConfigurationService.js';
+import { IWorkingCopyEditorService } from './workingCopyEditorService.js';
+import { IWorkingCopyService } from './workingCopyService.js';
+import { isWeb } from '../../../../base/common/platform.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { SnapshotContext } from './fileWorkingCopy.js';
+import { IProgressService } from '../../../../platform/progress/common/progress.js';
 
 /**
  * The only one that should be dealing with `IStoredFileWorkingCopy` and handle all
diff --git a/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopySaveParticipant.ts b/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopySaveParticipant.ts
index 240beb17907..07e73acc328 100644
--- a/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopySaveParticipant.ts
+++ b/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopySaveParticipant.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { raceCancellation } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProgress, IProgressStep } from 'vs/platform/progress/common/progress';
-import { IDisposable, Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { insert } from 'vs/base/common/arrays';
-import { IStoredFileWorkingCopySaveParticipant, IStoredFileWorkingCopySaveParticipantContext } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
-import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel } from 'vs/workbench/services/workingCopy/common/storedFileWorkingCopy';
+import { raceCancellation } from '../../../../base/common/async.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IProgress, IProgressStep } from '../../../../platform/progress/common/progress.js';
+import { IDisposable, Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { insert } from '../../../../base/common/arrays.js';
+import { IStoredFileWorkingCopySaveParticipant, IStoredFileWorkingCopySaveParticipantContext } from './workingCopyFileService.js';
+import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel } from './storedFileWorkingCopy.js';
 
 export class StoredFileWorkingCopySaveParticipant extends Disposable {
 
diff --git a/src/vs/workbench/services/workingCopy/common/untitledFileWorkingCopy.ts b/src/vs/workbench/services/workingCopy/common/untitledFileWorkingCopy.ts
index 98cfc839175..08df8feee6c 100644
--- a/src/vs/workbench/services/workingCopy/common/untitledFileWorkingCopy.ts
+++ b/src/vs/workbench/services/workingCopy/common/untitledFileWorkingCopy.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event, Emitter } from 'vs/base/common/event';
-import { VSBufferReadableStream } from 'vs/base/common/buffer';
-import { IWorkingCopyBackup, IWorkingCopySaveEvent, WorkingCopyCapabilities } from 'vs/workbench/services/workingCopy/common/workingCopy';
-import { IFileWorkingCopy, IFileWorkingCopyModel, IFileWorkingCopyModelFactory, SnapshotContext } from 'vs/workbench/services/workingCopy/common/fileWorkingCopy';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { ISaveOptions } from 'vs/workbench/common/editor';
-import { raceCancellation } from 'vs/base/common/async';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackup';
-import { emptyStream } from 'vs/base/common/stream';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { VSBufferReadableStream } from '../../../../base/common/buffer.js';
+import { IWorkingCopyBackup, IWorkingCopySaveEvent, WorkingCopyCapabilities } from './workingCopy.js';
+import { IFileWorkingCopy, IFileWorkingCopyModel, IFileWorkingCopyModelFactory, SnapshotContext } from './fileWorkingCopy.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IWorkingCopyService } from './workingCopyService.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { ISaveOptions } from '../../../common/editor.js';
+import { raceCancellation } from '../../../../base/common/async.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IWorkingCopyBackupService } from './workingCopyBackup.js';
+import { emptyStream } from '../../../../base/common/stream.js';
 
 /**
  * Untitled file specific working copy model factory.
diff --git a/src/vs/workbench/services/workingCopy/common/untitledFileWorkingCopyManager.ts b/src/vs/workbench/services/workingCopy/common/untitledFileWorkingCopyManager.ts
index 1f50142c3d6..371ff18863d 100644
--- a/src/vs/workbench/services/workingCopy/common/untitledFileWorkingCopyManager.ts
+++ b/src/vs/workbench/services/workingCopy/common/untitledFileWorkingCopyManager.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DisposableStore, dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { IUntitledFileWorkingCopy, IUntitledFileWorkingCopyInitialContents, IUntitledFileWorkingCopyModel, IUntitledFileWorkingCopyModelFactory, IUntitledFileWorkingCopySaveDelegate, UntitledFileWorkingCopy } from 'vs/workbench/services/workingCopy/common/untitledFileWorkingCopy';
-import { Event, Emitter } from 'vs/base/common/event';
-import { Schemas } from 'vs/base/common/network';
-import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackup';
-import { IFileService } from 'vs/platform/files/common/files';
-import { BaseFileWorkingCopyManager, IBaseFileWorkingCopyManager } from 'vs/workbench/services/workingCopy/common/abstractFileWorkingCopyManager';
-import { ResourceMap } from 'vs/base/common/map';
+import { DisposableStore, dispose, IDisposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IUntitledFileWorkingCopy, IUntitledFileWorkingCopyInitialContents, IUntitledFileWorkingCopyModel, IUntitledFileWorkingCopyModelFactory, IUntitledFileWorkingCopySaveDelegate, UntitledFileWorkingCopy } from './untitledFileWorkingCopy.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { IWorkingCopyService } from './workingCopyService.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IWorkingCopyBackupService } from './workingCopyBackup.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { BaseFileWorkingCopyManager, IBaseFileWorkingCopyManager } from './abstractFileWorkingCopyManager.js';
+import { ResourceMap } from '../../../../base/common/map.js';
 
 /**
  * The only one that should be dealing with `IUntitledFileWorkingCopy` and
diff --git a/src/vs/workbench/services/workingCopy/common/workingCopy.ts b/src/vs/workbench/services/workingCopy/common/workingCopy.ts
index 500dab7148d..a33cf57efb1 100644
--- a/src/vs/workbench/services/workingCopy/common/workingCopy.ts
+++ b/src/vs/workbench/services/workingCopy/common/workingCopy.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { URI } from 'vs/base/common/uri';
-import { ISaveOptions, IRevertOptions, SaveReason, SaveSource } from 'vs/workbench/common/editor';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { VSBufferReadable, VSBufferReadableStream } from 'vs/base/common/buffer';
+import { Event } from '../../../../base/common/event.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ISaveOptions, IRevertOptions, SaveReason, SaveSource } from '../../../common/editor.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { VSBufferReadable, VSBufferReadableStream } from '../../../../base/common/buffer.js';
 
 export const enum WorkingCopyCapabilities {
 
diff --git a/src/vs/workbench/services/workingCopy/common/workingCopyBackup.ts b/src/vs/workbench/services/workingCopy/common/workingCopyBackup.ts
index af3b551bded..36f2f555c73 100644
--- a/src/vs/workbench/services/workingCopy/common/workingCopyBackup.ts
+++ b/src/vs/workbench/services/workingCopy/common/workingCopyBackup.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { VSBufferReadable, VSBufferReadableStream } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IWorkingCopyBackupMeta, IWorkingCopyIdentifier } from 'vs/workbench/services/workingCopy/common/workingCopy';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { VSBufferReadable, VSBufferReadableStream } from '../../../../base/common/buffer.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IWorkingCopyBackupMeta, IWorkingCopyIdentifier } from './workingCopy.js';
 
 export const IWorkingCopyBackupService = createDecorator<IWorkingCopyBackupService>('workingCopyBackupService');
 
diff --git a/src/vs/workbench/services/workingCopy/common/workingCopyBackupService.ts b/src/vs/workbench/services/workingCopy/common/workingCopyBackupService.ts
index c360206fd3a..5bc0f5c326e 100644
--- a/src/vs/workbench/services/workingCopy/common/workingCopyBackupService.ts
+++ b/src/vs/workbench/services/workingCopy/common/workingCopyBackupService.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { joinPath } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { coalesce } from 'vs/base/common/arrays';
-import { equals, deepClone } from 'vs/base/common/objects';
-import { Promises, ResourceQueue } from 'vs/base/common/async';
-import { IResolvedWorkingCopyBackup, IWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackup';
-import { IFileService, FileOperationError, FileOperationResult } from 'vs/platform/files/common/files';
-import { ResourceMap } from 'vs/base/common/map';
-import { isReadableStream, peekStream } from 'vs/base/common/stream';
-import { bufferToStream, prefixedBufferReadable, prefixedBufferStream, readableToBuffer, streamToBuffer, VSBuffer, VSBufferReadable, VSBufferReadableStream } from 'vs/base/common/buffer';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ILogService } from 'vs/platform/log/common/log';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Schemas } from 'vs/base/common/network';
-import { hash } from 'vs/base/common/hash';
-import { isEmptyObject } from 'vs/base/common/types';
-import { IWorkingCopyBackupMeta, IWorkingCopyIdentifier, NO_TYPE_ID } from 'vs/workbench/services/workingCopy/common/workingCopy';
+import { joinPath } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { coalesce } from '../../../../base/common/arrays.js';
+import { equals, deepClone } from '../../../../base/common/objects.js';
+import { Promises, ResourceQueue } from '../../../../base/common/async.js';
+import { IResolvedWorkingCopyBackup, IWorkingCopyBackupService } from './workingCopyBackup.js';
+import { IFileService, FileOperationError, FileOperationResult } from '../../../../platform/files/common/files.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { isReadableStream, peekStream } from '../../../../base/common/stream.js';
+import { bufferToStream, prefixedBufferReadable, prefixedBufferStream, readableToBuffer, streamToBuffer, VSBuffer, VSBufferReadable, VSBufferReadableStream } from '../../../../base/common/buffer.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { hash } from '../../../../base/common/hash.js';
+import { isEmptyObject } from '../../../../base/common/types.js';
+import { IWorkingCopyBackupMeta, IWorkingCopyIdentifier, NO_TYPE_ID } from './workingCopy.js';
 
 export class WorkingCopyBackupsModel {
 
diff --git a/src/vs/workbench/services/workingCopy/common/workingCopyBackupTracker.ts b/src/vs/workbench/services/workingCopy/common/workingCopyBackupTracker.ts
index 3f75e1e0bfd..ba09b6ec381 100644
--- a/src/vs/workbench/services/workingCopy/common/workingCopyBackupTracker.ts
+++ b/src/vs/workbench/services/workingCopy/common/workingCopyBackupTracker.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackup';
-import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
-import { IWorkingCopy, IWorkingCopyIdentifier, WorkingCopyCapabilities } from 'vs/workbench/services/workingCopy/common/workingCopy';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ShutdownReason, ILifecycleService, LifecyclePhase, InternalBeforeShutdownEvent } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { IWorkingCopyEditorHandler, IWorkingCopyEditorService } from 'vs/workbench/services/workingCopy/common/workingCopyEditorService';
-import { Promises } from 'vs/base/common/async';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { EditorsOrder } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
+import { IWorkingCopyBackupService } from './workingCopyBackup.js';
+import { Disposable, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { IWorkingCopyService } from './workingCopyService.js';
+import { IWorkingCopy, IWorkingCopyIdentifier, WorkingCopyCapabilities } from './workingCopy.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { ShutdownReason, ILifecycleService, LifecyclePhase, InternalBeforeShutdownEvent } from '../../lifecycle/common/lifecycle.js';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { IFilesConfigurationService } from '../../filesConfiguration/common/filesConfigurationService.js';
+import { IWorkingCopyEditorHandler, IWorkingCopyEditorService } from './workingCopyEditorService.js';
+import { Promises } from '../../../../base/common/async.js';
+import { IEditorService } from '../../editor/common/editorService.js';
+import { EditorsOrder } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { IEditorGroupsService } from '../../editor/common/editorGroupsService.js';
 
 /**
  * The working copy backup tracker deals with:
diff --git a/src/vs/workbench/services/workingCopy/common/workingCopyEditorService.ts b/src/vs/workbench/services/workingCopy/common/workingCopyEditorService.ts
index 643d3a3e2b4..ec43a8db58c 100644
--- a/src/vs/workbench/services/workingCopy/common/workingCopyEditorService.ts
+++ b/src/vs/workbench/services/workingCopy/common/workingCopyEditorService.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { EditorsOrder, IEditorIdentifier } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { IWorkingCopy, IWorkingCopyIdentifier } from 'vs/workbench/services/workingCopy/common/workingCopy';
-import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { EditorsOrder, IEditorIdentifier } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { IWorkingCopy, IWorkingCopyIdentifier } from './workingCopy.js';
+import { Disposable, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { IEditorService } from '../../editor/common/editorService.js';
 
 export const IWorkingCopyEditorService = createDecorator<IWorkingCopyEditorService>('workingCopyEditorService');
 
diff --git a/src/vs/workbench/services/workingCopy/common/workingCopyFileOperationParticipant.ts b/src/vs/workbench/services/workingCopy/common/workingCopyFileOperationParticipant.ts
index f3f4dd8f05e..a4ba2e00688 100644
--- a/src/vs/workbench/services/workingCopy/common/workingCopyFileOperationParticipant.ts
+++ b/src/vs/workbench/services/workingCopy/common/workingCopyFileOperationParticipant.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IDisposable, Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IWorkingCopyFileOperationParticipant, SourceTargetPair, IFileOperationUndoRedoInfo } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
-import { FileOperation } from 'vs/platform/files/common/files';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { LinkedList } from 'vs/base/common/linkedList';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IDisposable, Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { IWorkingCopyFileOperationParticipant, SourceTargetPair, IFileOperationUndoRedoInfo } from './workingCopyFileService.js';
+import { FileOperation } from '../../../../platform/files/common/files.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { LinkedList } from '../../../../base/common/linkedList.js';
 
 export class WorkingCopyFileOperationParticipant extends Disposable {
 
diff --git a/src/vs/workbench/services/workingCopy/common/workingCopyFileService.ts b/src/vs/workbench/services/workingCopy/common/workingCopyFileService.ts
index 704be2bbecd..e81cfbd91c0 100644
--- a/src/vs/workbench/services/workingCopy/common/workingCopyFileService.ts
+++ b/src/vs/workbench/services/workingCopy/common/workingCopyFileService.ts
@@ -3,24 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { Event, AsyncEmitter, IWaitUntil } from 'vs/base/common/event';
-import { Promises } from 'vs/base/common/async';
-import { insert } from 'vs/base/common/arrays';
-import { URI } from 'vs/base/common/uri';
-import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IFileService, FileOperation, IFileStatWithMetadata } from 'vs/platform/files/common/files';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
-import { IWorkingCopy } from 'vs/workbench/services/workingCopy/common/workingCopy';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { WorkingCopyFileOperationParticipant } from 'vs/workbench/services/workingCopy/common/workingCopyFileOperationParticipant';
-import { VSBuffer, VSBufferReadable, VSBufferReadableStream } from 'vs/base/common/buffer';
-import { SaveReason } from 'vs/workbench/common/editor';
-import { IProgress, IProgressStep } from 'vs/platform/progress/common/progress';
-import { StoredFileWorkingCopySaveParticipant } from 'vs/workbench/services/workingCopy/common/storedFileWorkingCopySaveParticipant';
-import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel } from 'vs/workbench/services/workingCopy/common/storedFileWorkingCopy';
+import { createDecorator, IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { Event, AsyncEmitter, IWaitUntil } from '../../../../base/common/event.js';
+import { Promises } from '../../../../base/common/async.js';
+import { insert } from '../../../../base/common/arrays.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Disposable, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { IFileService, FileOperation, IFileStatWithMetadata } from '../../../../platform/files/common/files.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IWorkingCopyService } from './workingCopyService.js';
+import { IWorkingCopy } from './workingCopy.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { WorkingCopyFileOperationParticipant } from './workingCopyFileOperationParticipant.js';
+import { VSBuffer, VSBufferReadable, VSBufferReadableStream } from '../../../../base/common/buffer.js';
+import { SaveReason } from '../../../common/editor.js';
+import { IProgress, IProgressStep } from '../../../../platform/progress/common/progress.js';
+import { StoredFileWorkingCopySaveParticipant } from './storedFileWorkingCopySaveParticipant.js';
+import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel } from './storedFileWorkingCopy.js';
 
 export const IWorkingCopyFileService = createDecorator<IWorkingCopyFileService>('workingCopyFileService');
 
diff --git a/src/vs/workbench/services/workingCopy/common/workingCopyHistory.ts b/src/vs/workbench/services/workingCopy/common/workingCopyHistory.ts
index 7c3a9a9af7e..03c2286cfb3 100644
--- a/src/vs/workbench/services/workingCopy/common/workingCopyHistory.ts
+++ b/src/vs/workbench/services/workingCopy/common/workingCopyHistory.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { URI } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { SaveSource } from 'vs/workbench/common/editor';
+import { Event } from '../../../../base/common/event.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { URI } from '../../../../base/common/uri.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { SaveSource } from '../../../common/editor.js';
 
 export const IWorkingCopyHistoryService = createDecorator<IWorkingCopyHistoryService>('workingCopyHistoryService');
 
diff --git a/src/vs/workbench/services/workingCopy/common/workingCopyHistoryService.ts b/src/vs/workbench/services/workingCopy/common/workingCopyHistoryService.ts
index 4e0f74bdc15..3b11c22384d 100644
--- a/src/vs/workbench/services/workingCopy/common/workingCopyHistoryService.ts
+++ b/src/vs/workbench/services/workingCopy/common/workingCopyHistoryService.ts
@@ -3,33 +3,33 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { Event, Emitter } from 'vs/base/common/event';
-import { assertIsDefined } from 'vs/base/common/types';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
-import { ILifecycleService, LifecyclePhase, WillShutdownEvent } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { WorkingCopyHistoryTracker } from 'vs/workbench/services/workingCopy/common/workingCopyHistoryTracker';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IWorkingCopyHistoryEntry, IWorkingCopyHistoryEntryDescriptor, IWorkingCopyHistoryEvent, IWorkingCopyHistoryService, MAX_PARALLEL_HISTORY_IO_OPS } from 'vs/workbench/services/workingCopy/common/workingCopyHistory';
-import { FileOperationError, FileOperationResult, IFileService, IFileStatWithMetadata } from 'vs/platform/files/common/files';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { URI } from 'vs/base/common/uri';
-import { DeferredPromise, Limiter, RunOnceScheduler } from 'vs/base/common/async';
-import { dirname, extname, isEqual, joinPath } from 'vs/base/common/resources';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { hash } from 'vs/base/common/hash';
-import { indexOfPath, randomPath } from 'vs/base/common/extpath';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { ResourceMap } from 'vs/base/common/map';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { ILogService } from 'vs/platform/log/common/log';
-import { SaveSource, SaveSourceRegistry } from 'vs/workbench/common/editor';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { distinct, lastOrDefault } from 'vs/base/common/arrays';
-import { escapeRegExpCharacters } from 'vs/base/common/strings';
+import { localize } from '../../../../nls.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { assertIsDefined } from '../../../../base/common/types.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from '../../../common/contributions.js';
+import { ILifecycleService, LifecyclePhase, WillShutdownEvent } from '../../lifecycle/common/lifecycle.js';
+import { WorkingCopyHistoryTracker } from './workingCopyHistoryTracker.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IWorkingCopyHistoryEntry, IWorkingCopyHistoryEntryDescriptor, IWorkingCopyHistoryEvent, IWorkingCopyHistoryService, MAX_PARALLEL_HISTORY_IO_OPS } from './workingCopyHistory.js';
+import { FileOperationError, FileOperationResult, IFileService, IFileStatWithMetadata } from '../../../../platform/files/common/files.js';
+import { IRemoteAgentService } from '../../remote/common/remoteAgentService.js';
+import { URI } from '../../../../base/common/uri.js';
+import { DeferredPromise, Limiter, RunOnceScheduler } from '../../../../base/common/async.js';
+import { dirname, extname, isEqual, joinPath } from '../../../../base/common/resources.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { hash } from '../../../../base/common/hash.js';
+import { indexOfPath, randomPath } from '../../../../base/common/extpath.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { SaveSource, SaveSourceRegistry } from '../../../common/editor.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { distinct } from '../../../../base/common/arrays.js';
+import { escapeRegExpCharacters } from '../../../../base/common/strings.js';
 
 interface ISerializedWorkingCopyHistoryModel {
 	readonly version: number;
@@ -126,7 +126,7 @@ export class WorkingCopyHistoryModel {
 		// on settings that can define a interval for when an
 		// entry is not added as new entry but should replace.
 		// However, when save source is different, never replace.
-		const lastEntry = lastOrDefault(this.entries);
+		const lastEntry = this.entries.at(-1);
 		if (lastEntry && lastEntry.source === source) {
 			const configuredReplaceInterval = this.configurationService.getValue<number>(WorkingCopyHistoryModel.SETTINGS.MERGE_PERIOD, { resource: this.workingCopyResource });
 			if (timestamp - lastEntry.timestamp <= (configuredReplaceInterval * 1000 /* convert to millies */)) {
diff --git a/src/vs/workbench/services/workingCopy/common/workingCopyHistoryTracker.ts b/src/vs/workbench/services/workingCopy/common/workingCopyHistoryTracker.ts
index 64fbbe78751..d5bb168ca69 100644
--- a/src/vs/workbench/services/workingCopy/common/workingCopyHistoryTracker.ts
+++ b/src/vs/workbench/services/workingCopy/common/workingCopyHistoryTracker.ts
@@ -3,27 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { URI } from 'vs/base/common/uri';
-import { GlobalIdleValue, Limiter } from 'vs/base/common/async';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ResourceMap } from 'vs/base/common/map';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { SaveSource, SaveSourceRegistry } from 'vs/workbench/common/editor';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { isStoredFileWorkingCopySaveEvent, IStoredFileWorkingCopyModel } from 'vs/workbench/services/workingCopy/common/storedFileWorkingCopy';
-import { IStoredFileWorkingCopySaveEvent } from 'vs/workbench/services/workingCopy/common/storedFileWorkingCopyManager';
-import { IWorkingCopy } from 'vs/workbench/services/workingCopy/common/workingCopy';
-import { IWorkingCopyHistoryService, MAX_PARALLEL_HISTORY_IO_OPS } from 'vs/workbench/services/workingCopy/common/workingCopyHistory';
-import { IWorkingCopySaveEvent, IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
-import { Schemas } from 'vs/base/common/network';
-import { ResourceGlobMatcher } from 'vs/workbench/common/resources';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { FileOperation, FileOperationEvent, IFileOperationEventWithMetadata, IFileService, IFileStatWithMetadata } from 'vs/platform/files/common/files';
+import { localize } from '../../../../nls.js';
+import { URI } from '../../../../base/common/uri.js';
+import { GlobalIdleValue, Limiter } from '../../../../base/common/async.js';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IUndoRedoService } from '../../../../platform/undoRedo/common/undoRedo.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { SaveSource, SaveSourceRegistry } from '../../../common/editor.js';
+import { IPathService } from '../../path/common/pathService.js';
+import { isStoredFileWorkingCopySaveEvent, IStoredFileWorkingCopyModel } from './storedFileWorkingCopy.js';
+import { IStoredFileWorkingCopySaveEvent } from './storedFileWorkingCopyManager.js';
+import { IWorkingCopy } from './workingCopy.js';
+import { IWorkingCopyHistoryService, MAX_PARALLEL_HISTORY_IO_OPS } from './workingCopyHistory.js';
+import { IWorkingCopySaveEvent, IWorkingCopyService } from './workingCopyService.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { ResourceGlobMatcher } from '../../../common/resources.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { FileOperation, FileOperationEvent, IFileOperationEventWithMetadata, IFileService, IFileStatWithMetadata } from '../../../../platform/files/common/files.js';
 
 export class WorkingCopyHistoryTracker extends Disposable implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/services/workingCopy/common/workingCopyService.ts b/src/vs/workbench/services/workingCopy/common/workingCopyService.ts
index 6b3fb90c562..87f641fa5ef 100644
--- a/src/vs/workbench/services/workingCopy/common/workingCopyService.ts
+++ b/src/vs/workbench/services/workingCopy/common/workingCopyService.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { Event, Emitter } from 'vs/base/common/event';
-import { URI } from 'vs/base/common/uri';
-import { Disposable, IDisposable, toDisposable, DisposableStore, DisposableMap } from 'vs/base/common/lifecycle';
-import { ResourceMap } from 'vs/base/common/map';
-import { IWorkingCopy, IWorkingCopyIdentifier, IWorkingCopySaveEvent as IBaseWorkingCopySaveEvent } from 'vs/workbench/services/workingCopy/common/workingCopy';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Disposable, IDisposable, toDisposable, DisposableStore, DisposableMap } from '../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { IWorkingCopy, IWorkingCopyIdentifier, IWorkingCopySaveEvent as IBaseWorkingCopySaveEvent } from './workingCopy.js';
 
 export const IWorkingCopyService = createDecorator<IWorkingCopyService>('workingCopyService');
 
diff --git a/src/vs/workbench/services/workingCopy/electron-sandbox/workingCopyBackupService.ts b/src/vs/workbench/services/workingCopy/electron-sandbox/workingCopyBackupService.ts
index 6a5d80f09fd..fa5167d131e 100644
--- a/src/vs/workbench/services/workingCopy/electron-sandbox/workingCopyBackupService.ts
+++ b/src/vs/workbench/services/workingCopy/electron-sandbox/workingCopyBackupService.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { WorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackupService';
-import { URI } from 'vs/base/common/uri';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackup';
-import { IFileService } from 'vs/platform/files/common/files';
-import { ILogService } from 'vs/platform/log/common/log';
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
-import { WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { NativeWorkingCopyBackupTracker } from 'vs/workbench/services/workingCopy/electron-sandbox/workingCopyBackupTracker';
+import { localize } from '../../../../nls.js';
+import { WorkingCopyBackupService } from '../common/workingCopyBackupService.js';
+import { URI } from '../../../../base/common/uri.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IWorkingCopyBackupService } from '../common/workingCopyBackup.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { INativeWorkbenchEnvironmentService } from '../../environment/electron-sandbox/environmentService.js';
+import { WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { ILifecycleService } from '../../lifecycle/common/lifecycle.js';
+import { NativeWorkingCopyBackupTracker } from './workingCopyBackupTracker.js';
 
 export class NativeWorkingCopyBackupService extends WorkingCopyBackupService {
 
diff --git a/src/vs/workbench/services/workingCopy/electron-sandbox/workingCopyBackupTracker.ts b/src/vs/workbench/services/workingCopy/electron-sandbox/workingCopyBackupTracker.ts
index eb982284efd..ff7f0885ed4 100644
--- a/src/vs/workbench/services/workingCopy/electron-sandbox/workingCopyBackupTracker.ts
+++ b/src/vs/workbench/services/workingCopy/electron-sandbox/workingCopyBackupTracker.ts
@@ -3,28 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { IWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackup';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IFilesConfigurationService, AutoSaveMode } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
-import { IWorkingCopy, IWorkingCopyIdentifier, WorkingCopyCapabilities } from 'vs/workbench/services/workingCopy/common/workingCopy';
-import { ILifecycleService, ShutdownReason } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { ConfirmResult, IFileDialogService, IDialogService, getFileNamesMessage } from 'vs/platform/dialogs/common/dialogs';
-import { WorkbenchState, IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { isMacintosh } from 'vs/base/common/platform';
-import { HotExitConfiguration } from 'vs/platform/files/common/files';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { WorkingCopyBackupTracker } from 'vs/workbench/services/workingCopy/common/workingCopyBackupTracker';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { SaveReason } from 'vs/workbench/common/editor';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
-import { Promises, raceCancellation } from 'vs/base/common/async';
-import { IWorkingCopyEditorService } from 'vs/workbench/services/workingCopy/common/workingCopyEditorService';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
+import { localize } from '../../../../nls.js';
+import { IWorkingCopyBackupService } from '../common/workingCopyBackup.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IFilesConfigurationService, AutoSaveMode } from '../../filesConfiguration/common/filesConfigurationService.js';
+import { IWorkingCopyService } from '../common/workingCopyService.js';
+import { IWorkingCopy, IWorkingCopyIdentifier, WorkingCopyCapabilities } from '../common/workingCopy.js';
+import { ILifecycleService, ShutdownReason } from '../../lifecycle/common/lifecycle.js';
+import { ConfirmResult, IFileDialogService, IDialogService, getFileNamesMessage } from '../../../../platform/dialogs/common/dialogs.js';
+import { WorkbenchState, IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { isMacintosh } from '../../../../base/common/platform.js';
+import { HotExitConfiguration } from '../../../../platform/files/common/files.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { WorkingCopyBackupTracker } from '../common/workingCopyBackupTracker.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IEditorService } from '../../editor/common/editorService.js';
+import { SaveReason } from '../../../common/editor.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { IProgressService, ProgressLocation } from '../../../../platform/progress/common/progress.js';
+import { Promises, raceCancellation } from '../../../../base/common/async.js';
+import { IWorkingCopyEditorService } from '../common/workingCopyEditorService.js';
+import { IEditorGroupsService } from '../../editor/common/editorGroupsService.js';
 
 export class NativeWorkingCopyBackupTracker extends WorkingCopyBackupTracker implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/services/workingCopy/electron-sandbox/workingCopyHistoryService.ts b/src/vs/workbench/services/workingCopy/electron-sandbox/workingCopyHistoryService.ts
index adb216e83d3..2de54db6119 100644
--- a/src/vs/workbench/services/workingCopy/electron-sandbox/workingCopyHistoryService.ts
+++ b/src/vs/workbench/services/workingCopy/electron-sandbox/workingCopyHistoryService.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { NativeWorkingCopyHistoryService } from 'vs/workbench/services/workingCopy/common/workingCopyHistoryService';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IWorkingCopyHistoryService } from 'vs/workbench/services/workingCopy/common/workingCopyHistory';
+import { NativeWorkingCopyHistoryService } from '../common/workingCopyHistoryService.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IWorkingCopyHistoryService } from '../common/workingCopyHistory.js';
 
 // Register Service
 registerSingleton(IWorkingCopyHistoryService, NativeWorkingCopyHistoryService, InstantiationType.Delayed);
diff --git a/src/vs/workbench/services/workingCopy/test/browser/fileWorkingCopyManager.test.ts b/src/vs/workbench/services/workingCopy/test/browser/fileWorkingCopyManager.test.ts
index be93a5dea1f..2ca2773a88c 100644
--- a/src/vs/workbench/services/workingCopy/test/browser/fileWorkingCopyManager.test.ts
+++ b/src/vs/workbench/services/workingCopy/test/browser/fileWorkingCopyManager.test.ts
@@ -4,18 +4,18 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { workbenchInstantiationService, TestServiceAccessor, TestInMemoryFileSystemProvider } from 'vs/workbench/test/browser/workbenchTestServices';
-import { StoredFileWorkingCopy, IStoredFileWorkingCopy } from 'vs/workbench/services/workingCopy/common/storedFileWorkingCopy';
-import { bufferToStream, VSBuffer } from 'vs/base/common/buffer';
-import { TestStoredFileWorkingCopyModel, TestStoredFileWorkingCopyModelFactory } from 'vs/workbench/services/workingCopy/test/browser/storedFileWorkingCopy.test';
-import { Schemas } from 'vs/base/common/network';
-import { IFileWorkingCopyManager, FileWorkingCopyManager } from 'vs/workbench/services/workingCopy/common/fileWorkingCopyManager';
-import { TestUntitledFileWorkingCopyModel, TestUntitledFileWorkingCopyModelFactory } from 'vs/workbench/services/workingCopy/test/browser/untitledFileWorkingCopy.test';
-import { UntitledFileWorkingCopy } from 'vs/workbench/services/workingCopy/common/untitledFileWorkingCopy';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { URI } from '../../../../../base/common/uri.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { workbenchInstantiationService, TestServiceAccessor, TestInMemoryFileSystemProvider } from '../../../../test/browser/workbenchTestServices.js';
+import { StoredFileWorkingCopy, IStoredFileWorkingCopy } from '../../common/storedFileWorkingCopy.js';
+import { bufferToStream, VSBuffer } from '../../../../../base/common/buffer.js';
+import { TestStoredFileWorkingCopyModel, TestStoredFileWorkingCopyModelFactory } from './storedFileWorkingCopy.test.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { IFileWorkingCopyManager, FileWorkingCopyManager } from '../../common/fileWorkingCopyManager.js';
+import { TestUntitledFileWorkingCopyModel, TestUntitledFileWorkingCopyModelFactory } from './untitledFileWorkingCopy.test.js';
+import { UntitledFileWorkingCopy } from '../../common/untitledFileWorkingCopy.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('FileWorkingCopyManager', () => {
 
diff --git a/src/vs/workbench/services/workingCopy/test/browser/resourceWorkingCopy.test.ts b/src/vs/workbench/services/workingCopy/test/browser/resourceWorkingCopy.test.ts
index 527e47deac1..b39d860e472 100644
--- a/src/vs/workbench/services/workingCopy/test/browser/resourceWorkingCopy.test.ts
+++ b/src/vs/workbench/services/workingCopy/test/browser/resourceWorkingCopy.test.ts
@@ -4,18 +4,18 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Event } from 'vs/base/common/event';
-import { URI } from 'vs/base/common/uri';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { TestServiceAccessor, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { FileChangesEvent, FileChangeType } from 'vs/platform/files/common/files';
-import { IRevertOptions, ISaveOptions } from 'vs/workbench/common/editor';
-import { ResourceWorkingCopy } from 'vs/workbench/services/workingCopy/common/resourceWorkingCopy';
-import { WorkingCopyCapabilities, IWorkingCopyBackup } from 'vs/workbench/services/workingCopy/common/workingCopy';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { Event } from '../../../../../base/common/event.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { TestServiceAccessor, workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { FileChangesEvent, FileChangeType } from '../../../../../platform/files/common/files.js';
+import { IRevertOptions, ISaveOptions } from '../../../../common/editor.js';
+import { ResourceWorkingCopy } from '../../common/resourceWorkingCopy.js';
+import { WorkingCopyCapabilities, IWorkingCopyBackup } from '../../common/workingCopy.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { runWithFakedTimers } from '../../../../../base/test/common/timeTravelScheduler.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('ResourceWorkingCopy', function () {
 
diff --git a/src/vs/workbench/services/workingCopy/test/browser/storedFileWorkingCopy.test.ts b/src/vs/workbench/services/workingCopy/test/browser/storedFileWorkingCopy.test.ts
index 33c986d3432..7d4a030d363 100644
--- a/src/vs/workbench/services/workingCopy/test/browser/storedFileWorkingCopy.test.ts
+++ b/src/vs/workbench/services/workingCopy/test/browser/storedFileWorkingCopy.test.ts
@@ -4,22 +4,23 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Event, Emitter } from 'vs/base/common/event';
-import { URI } from 'vs/base/common/uri';
-import { StoredFileWorkingCopy, StoredFileWorkingCopyState, IStoredFileWorkingCopyModel, IStoredFileWorkingCopyModelContentChangedEvent, IStoredFileWorkingCopyModelFactory, isStoredFileWorkingCopySaveEvent, IStoredFileWorkingCopySaveEvent } from 'vs/workbench/services/workingCopy/common/storedFileWorkingCopy';
-import { bufferToStream, newWriteableBufferStream, streamToBuffer, VSBuffer, VSBufferReadableStream } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { TestServiceAccessor, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { basename } from 'vs/base/common/resources';
-import { FileChangesEvent, FileChangeType, FileOperationError, FileOperationResult, IFileStatWithMetadata, IWriteFileOptions, NotModifiedSinceFileOperationError } from 'vs/platform/files/common/files';
-import { SaveReason, SaveSourceRegistry } from 'vs/workbench/common/editor';
-import { Promises, timeout } from 'vs/base/common/async';
-import { consumeReadable, consumeStream, isReadableStream } from 'vs/base/common/stream';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { SnapshotContext } from 'vs/workbench/services/workingCopy/common/fileWorkingCopy';
+import { Event, Emitter } from '../../../../../base/common/event.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { StoredFileWorkingCopy, StoredFileWorkingCopyState, IStoredFileWorkingCopyModel, IStoredFileWorkingCopyModelContentChangedEvent, IStoredFileWorkingCopyModelFactory, isStoredFileWorkingCopySaveEvent, IStoredFileWorkingCopySaveEvent } from '../../common/storedFileWorkingCopy.js';
+import { bufferToStream, newWriteableBufferStream, streamToBuffer, VSBuffer, VSBufferReadableStream } from '../../../../../base/common/buffer.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { getLastResolvedFileStat, TestServiceAccessor, workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { basename } from '../../../../../base/common/resources.js';
+import { FileChangesEvent, FileChangeType, FileOperationError, FileOperationResult, IFileStatWithMetadata, IWriteFileOptions, NotModifiedSinceFileOperationError } from '../../../../../platform/files/common/files.js';
+import { SaveReason, SaveSourceRegistry } from '../../../../common/editor.js';
+import { Promises, timeout } from '../../../../../base/common/async.js';
+import { consumeReadable, consumeStream, isReadableStream } from '../../../../../base/common/stream.js';
+import { runWithFakedTimers } from '../../../../../base/test/common/timeTravelScheduler.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { SnapshotContext } from '../../common/fileWorkingCopy.js';
+import { assertIsDefined } from '../../../../../base/common/types.js';
 
 export class TestStoredFileWorkingCopyModel extends Disposable implements IStoredFileWorkingCopyModel {
 
@@ -513,6 +514,23 @@ suite('StoredFileWorkingCopy', function () {
 		});
 	});
 
+	test('stat.readonly and stat.locked can change when decreased mtime is ignored', async function () {
+
+		await workingCopy.resolve();
+
+		const stat = assertIsDefined(getLastResolvedFileStat(workingCopy));
+		try {
+			accessor.fileService.readShouldThrowError = new NotModifiedSinceFileOperationError('error', { ...stat, mtime: stat.mtime - 1, readonly: !stat.readonly, locked: !stat.locked });
+			await workingCopy.resolve();
+		} finally {
+			accessor.fileService.readShouldThrowError = undefined;
+		}
+
+		assert.strictEqual(getLastResolvedFileStat(workingCopy)?.mtime, stat.mtime, 'mtime should not decrease');
+		assert.notStrictEqual(getLastResolvedFileStat(workingCopy)?.readonly, stat.readonly, 'readonly should have changed despite simultaneous attempt to decrease mtime');
+		assert.notStrictEqual(getLastResolvedFileStat(workingCopy)?.locked, stat.locked, 'locked should have changed despite simultaneous attempt to decrease mtime');
+	});
+
 	test('resolve (FILE_NOT_MODIFIED_SINCE can be handled for resolved working copies)', async () => {
 		await workingCopy.resolve();
 
diff --git a/src/vs/workbench/services/workingCopy/test/browser/storedFileWorkingCopyManager.test.ts b/src/vs/workbench/services/workingCopy/test/browser/storedFileWorkingCopyManager.test.ts
index 08dc69d5ae5..12de6215332 100644
--- a/src/vs/workbench/services/workingCopy/test/browser/storedFileWorkingCopyManager.test.ts
+++ b/src/vs/workbench/services/workingCopy/test/browser/storedFileWorkingCopyManager.test.ts
@@ -4,20 +4,20 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { workbenchInstantiationService, TestServiceAccessor, TestWillShutdownEvent } from 'vs/workbench/test/browser/workbenchTestServices';
-import { StoredFileWorkingCopyManager, IStoredFileWorkingCopyManager, IStoredFileWorkingCopySaveEvent } from 'vs/workbench/services/workingCopy/common/storedFileWorkingCopyManager';
-import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel } from 'vs/workbench/services/workingCopy/common/storedFileWorkingCopy';
-import { bufferToStream, VSBuffer } from 'vs/base/common/buffer';
-import { FileChangesEvent, FileChangeType, FileOperationError, FileOperationResult } from 'vs/platform/files/common/files';
-import { timeout } from 'vs/base/common/async';
-import { TestStoredFileWorkingCopyModel, TestStoredFileWorkingCopyModelFactory } from 'vs/workbench/services/workingCopy/test/browser/storedFileWorkingCopy.test';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { isWeb } from 'vs/base/common/platform';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { URI } from '../../../../../base/common/uri.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { workbenchInstantiationService, TestServiceAccessor, TestWillShutdownEvent } from '../../../../test/browser/workbenchTestServices.js';
+import { StoredFileWorkingCopyManager, IStoredFileWorkingCopyManager, IStoredFileWorkingCopySaveEvent } from '../../common/storedFileWorkingCopyManager.js';
+import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel } from '../../common/storedFileWorkingCopy.js';
+import { bufferToStream, VSBuffer } from '../../../../../base/common/buffer.js';
+import { FileChangesEvent, FileChangeType, FileOperationError, FileOperationResult } from '../../../../../platform/files/common/files.js';
+import { timeout } from '../../../../../base/common/async.js';
+import { TestStoredFileWorkingCopyModel, TestStoredFileWorkingCopyModelFactory } from './storedFileWorkingCopy.test.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { InMemoryFileSystemProvider } from '../../../../../platform/files/common/inMemoryFilesystemProvider.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { isWeb } from '../../../../../base/common/platform.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('StoredFileWorkingCopyManager', () => {
 
diff --git a/src/vs/workbench/services/workingCopy/test/browser/untitledFileWorkingCopy.test.ts b/src/vs/workbench/services/workingCopy/test/browser/untitledFileWorkingCopy.test.ts
index 5b9239849f7..bece6c9c175 100644
--- a/src/vs/workbench/services/workingCopy/test/browser/untitledFileWorkingCopy.test.ts
+++ b/src/vs/workbench/services/workingCopy/test/browser/untitledFileWorkingCopy.test.ts
@@ -4,19 +4,19 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { VSBufferReadableStream, newWriteableBufferStream, VSBuffer, streamToBuffer, bufferToStream, readableToBuffer, VSBufferReadable } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { basename } from 'vs/base/common/resources';
-import { consumeReadable, consumeStream, isReadable, isReadableStream } from 'vs/base/common/stream';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { SnapshotContext } from 'vs/workbench/services/workingCopy/common/fileWorkingCopy';
-import { IUntitledFileWorkingCopyModel, IUntitledFileWorkingCopyModelContentChangedEvent, IUntitledFileWorkingCopyModelFactory, UntitledFileWorkingCopy } from 'vs/workbench/services/workingCopy/common/untitledFileWorkingCopy';
-import { TestServiceAccessor, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
+import { VSBufferReadableStream, newWriteableBufferStream, VSBuffer, streamToBuffer, bufferToStream, readableToBuffer, VSBufferReadable } from '../../../../../base/common/buffer.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { basename } from '../../../../../base/common/resources.js';
+import { consumeReadable, consumeStream, isReadable, isReadableStream } from '../../../../../base/common/stream.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { SnapshotContext } from '../../common/fileWorkingCopy.js';
+import { IUntitledFileWorkingCopyModel, IUntitledFileWorkingCopyModelContentChangedEvent, IUntitledFileWorkingCopyModelFactory, UntitledFileWorkingCopy } from '../../common/untitledFileWorkingCopy.js';
+import { TestServiceAccessor, workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
 
 export class TestUntitledFileWorkingCopyModel extends Disposable implements IUntitledFileWorkingCopyModel {
 
diff --git a/src/vs/workbench/services/workingCopy/test/browser/untitledFileWorkingCopyManager.test.ts b/src/vs/workbench/services/workingCopy/test/browser/untitledFileWorkingCopyManager.test.ts
index 45e86fd3d38..8b225035bc1 100644
--- a/src/vs/workbench/services/workingCopy/test/browser/untitledFileWorkingCopyManager.test.ts
+++ b/src/vs/workbench/services/workingCopy/test/browser/untitledFileWorkingCopyManager.test.ts
@@ -4,17 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { bufferToStream, VSBuffer } from 'vs/base/common/buffer';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { FileWorkingCopyManager, IFileWorkingCopyManager } from 'vs/workbench/services/workingCopy/common/fileWorkingCopyManager';
-import { NO_TYPE_ID, WorkingCopyCapabilities } from 'vs/workbench/services/workingCopy/common/workingCopy';
-import { TestStoredFileWorkingCopyModel, TestStoredFileWorkingCopyModelFactory } from 'vs/workbench/services/workingCopy/test/browser/storedFileWorkingCopy.test';
-import { TestUntitledFileWorkingCopyModel, TestUntitledFileWorkingCopyModelFactory } from 'vs/workbench/services/workingCopy/test/browser/untitledFileWorkingCopy.test';
-import { TestInMemoryFileSystemProvider, TestServiceAccessor, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
+import { bufferToStream, VSBuffer } from '../../../../../base/common/buffer.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { FileWorkingCopyManager, IFileWorkingCopyManager } from '../../common/fileWorkingCopyManager.js';
+import { NO_TYPE_ID, WorkingCopyCapabilities } from '../../common/workingCopy.js';
+import { TestStoredFileWorkingCopyModel, TestStoredFileWorkingCopyModelFactory } from './storedFileWorkingCopy.test.js';
+import { TestUntitledFileWorkingCopyModel, TestUntitledFileWorkingCopyModelFactory } from './untitledFileWorkingCopy.test.js';
+import { TestInMemoryFileSystemProvider, TestServiceAccessor, workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
 
 suite('UntitledFileWorkingCopyManager', () => {
 
diff --git a/src/vs/workbench/services/workingCopy/test/browser/untitledScratchpadWorkingCopy.test.ts b/src/vs/workbench/services/workingCopy/test/browser/untitledScratchpadWorkingCopy.test.ts
index 91926cb1774..559de8160c5 100644
--- a/src/vs/workbench/services/workingCopy/test/browser/untitledScratchpadWorkingCopy.test.ts
+++ b/src/vs/workbench/services/workingCopy/test/browser/untitledScratchpadWorkingCopy.test.ts
@@ -4,18 +4,18 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { VSBufferReadableStream, VSBuffer, streamToBuffer, bufferToStream, readableToBuffer, VSBufferReadable } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { basename } from 'vs/base/common/resources';
-import { consumeReadable, consumeStream, isReadable, isReadableStream } from 'vs/base/common/stream';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IUntitledFileWorkingCopyModelFactory, UntitledFileWorkingCopy } from 'vs/workbench/services/workingCopy/common/untitledFileWorkingCopy';
-import { TestUntitledFileWorkingCopyModel } from 'vs/workbench/services/workingCopy/test/browser/untitledFileWorkingCopy.test';
-import { TestServiceAccessor, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
+import { VSBufferReadableStream, VSBuffer, streamToBuffer, bufferToStream, readableToBuffer, VSBufferReadable } from '../../../../../base/common/buffer.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { basename } from '../../../../../base/common/resources.js';
+import { consumeReadable, consumeStream, isReadable, isReadableStream } from '../../../../../base/common/stream.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IUntitledFileWorkingCopyModelFactory, UntitledFileWorkingCopy } from '../../common/untitledFileWorkingCopy.js';
+import { TestUntitledFileWorkingCopyModel } from './untitledFileWorkingCopy.test.js';
+import { TestServiceAccessor, workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
 
 export class TestUntitledFileWorkingCopyModelFactory implements IUntitledFileWorkingCopyModelFactory<TestUntitledFileWorkingCopyModel> {
 
diff --git a/src/vs/workbench/services/workingCopy/test/browser/workingCopyBackupTracker.test.ts b/src/vs/workbench/services/workingCopy/test/browser/workingCopyBackupTracker.test.ts
index 5dff0762979..f86b9a6adec 100644
--- a/src/vs/workbench/services/workingCopy/test/browser/workingCopyBackupTracker.test.ts
+++ b/src/vs/workbench/services/workingCopy/test/browser/workingCopyBackupTracker.test.ts
@@ -4,31 +4,31 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { EditorPart } from 'vs/workbench/browser/parts/editor/editorPart';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { EditorService } from 'vs/workbench/services/editor/browser/editorService';
-import { IUntitledTextResourceEditorInput } from 'vs/workbench/common/editor';
-import { IWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackup';
-import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from 'vs/base/test/common/utils';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
-import { IWorkingCopyBackup } from 'vs/workbench/services/workingCopy/common/workingCopy';
-import { ILogService } from 'vs/platform/log/common/log';
-import { ILifecycleService, LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
-import { createEditorPart, InMemoryTestWorkingCopyBackupService, registerTestResourceEditor, TestServiceAccessor, toTypedWorkingCopyId, toUntypedWorkingCopyId, workbenchInstantiationService, workbenchTeardown } from 'vs/workbench/test/browser/workbenchTestServices';
-import { TestWorkingCopy } from 'vs/workbench/test/common/workbenchTestServices';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { timeout } from 'vs/base/common/async';
-import { BrowserWorkingCopyBackupTracker } from 'vs/workbench/services/workingCopy/browser/workingCopyBackupTracker';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { IWorkingCopyEditorHandler, IWorkingCopyEditorService } from 'vs/workbench/services/workingCopy/common/workingCopyEditorService';
-import { bufferToReadable, VSBuffer } from 'vs/base/common/buffer';
-import { isWindows } from 'vs/base/common/platform';
-import { Schemas } from 'vs/base/common/network';
+import { URI } from '../../../../../base/common/uri.js';
+import { IEditorService } from '../../../editor/common/editorService.js';
+import { EditorPart } from '../../../../browser/parts/editor/editorPart.js';
+import { IEditorGroupsService } from '../../../editor/common/editorGroupsService.js';
+import { EditorService } from '../../../editor/browser/editorService.js';
+import { IUntitledTextResourceEditorInput } from '../../../../common/editor.js';
+import { IWorkingCopyBackupService } from '../../common/workingCopyBackup.js';
+import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from '../../../../../base/test/common/utils.js';
+import { IFilesConfigurationService } from '../../../filesConfiguration/common/filesConfigurationService.js';
+import { IWorkingCopyService } from '../../common/workingCopyService.js';
+import { IWorkingCopyBackup } from '../../common/workingCopy.js';
+import { ILogService } from '../../../../../platform/log/common/log.js';
+import { ILifecycleService, LifecyclePhase } from '../../../lifecycle/common/lifecycle.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { UntitledTextEditorInput } from '../../../untitled/common/untitledTextEditorInput.js';
+import { createEditorPart, InMemoryTestWorkingCopyBackupService, registerTestResourceEditor, TestServiceAccessor, toTypedWorkingCopyId, toUntypedWorkingCopyId, workbenchInstantiationService, workbenchTeardown } from '../../../../test/browser/workbenchTestServices.js';
+import { TestWorkingCopy } from '../../../../test/common/workbenchTestServices.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { timeout } from '../../../../../base/common/async.js';
+import { BrowserWorkingCopyBackupTracker } from '../../browser/workingCopyBackupTracker.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { IWorkingCopyEditorHandler, IWorkingCopyEditorService } from '../../common/workingCopyEditorService.js';
+import { bufferToReadable, VSBuffer } from '../../../../../base/common/buffer.js';
+import { isWindows } from '../../../../../base/common/platform.js';
+import { Schemas } from '../../../../../base/common/network.js';
 
 suite('WorkingCopyBackupTracker (browser)', function () {
 	let accessor: TestServiceAccessor;
diff --git a/src/vs/workbench/services/workingCopy/test/browser/workingCopyEditorService.test.ts b/src/vs/workbench/services/workingCopy/test/browser/workingCopyEditorService.test.ts
index e759ceb0d82..9c9204f44a8 100644
--- a/src/vs/workbench/services/workingCopy/test/browser/workingCopyEditorService.test.ts
+++ b/src/vs/workbench/services/workingCopy/test/browser/workingCopyEditorService.test.ts
@@ -4,15 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { EditorService } from 'vs/workbench/services/editor/browser/editorService';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
-import { IWorkingCopyEditorHandler, WorkingCopyEditorService } from 'vs/workbench/services/workingCopy/common/workingCopyEditorService';
-import { createEditorPart, registerTestResourceEditor, TestEditorService, TestServiceAccessor, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { TestWorkingCopy } from 'vs/workbench/test/common/workbenchTestServices';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { EditorService } from '../../../editor/browser/editorService.js';
+import { IEditorGroupsService } from '../../../editor/common/editorGroupsService.js';
+import { UntitledTextEditorInput } from '../../../untitled/common/untitledTextEditorInput.js';
+import { IWorkingCopyEditorHandler, WorkingCopyEditorService } from '../../common/workingCopyEditorService.js';
+import { createEditorPart, registerTestResourceEditor, TestEditorService, TestServiceAccessor, workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
+import { TestWorkingCopy } from '../../../../test/common/workbenchTestServices.js';
 
 suite('WorkingCopyEditorService', () => {
 
diff --git a/src/vs/workbench/services/workingCopy/test/browser/workingCopyFileService.test.ts b/src/vs/workbench/services/workingCopy/test/browser/workingCopyFileService.test.ts
index a6458af7ac9..12552f06dc8 100644
--- a/src/vs/workbench/services/workingCopy/test/browser/workingCopyFileService.test.ts
+++ b/src/vs/workbench/services/workingCopy/test/browser/workingCopyFileService.test.ts
@@ -4,19 +4,19 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel';
-import { TextFileEditorModelManager } from 'vs/workbench/services/textfile/common/textFileEditorModelManager';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from 'vs/base/test/common/utils';
-import { workbenchInstantiationService, TestServiceAccessor, ITestTextFileEditorModelManager } from 'vs/workbench/test/browser/workbenchTestServices';
-import { URI } from 'vs/base/common/uri';
-import { FileOperation } from 'vs/platform/files/common/files';
-import { TestWorkingCopy } from 'vs/workbench/test/common/workbenchTestServices';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { ICopyOperation } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { timeout } from 'vs/base/common/async';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import { TextFileEditorModel } from '../../../textfile/common/textFileEditorModel.js';
+import { TextFileEditorModelManager } from '../../../textfile/common/textFileEditorModelManager.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from '../../../../../base/test/common/utils.js';
+import { workbenchInstantiationService, TestServiceAccessor, ITestTextFileEditorModelManager } from '../../../../test/browser/workbenchTestServices.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { FileOperation } from '../../../../../platform/files/common/files.js';
+import { TestWorkingCopy } from '../../../../test/common/workbenchTestServices.js';
+import { VSBuffer } from '../../../../../base/common/buffer.js';
+import { ICopyOperation } from '../../common/workingCopyFileService.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { timeout } from '../../../../../base/common/async.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
 
 suite('WorkingCopyFileService', () => {
 
diff --git a/src/vs/workbench/services/workingCopy/test/common/workingCopyService.test.ts b/src/vs/workbench/services/workingCopy/test/common/workingCopyService.test.ts
index e0214cd2d79..5a14816df89 100644
--- a/src/vs/workbench/services/workingCopy/test/common/workingCopyService.test.ts
+++ b/src/vs/workbench/services/workingCopy/test/common/workingCopyService.test.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { IWorkingCopy } from 'vs/workbench/services/workingCopy/common/workingCopy';
-import { URI } from 'vs/base/common/uri';
-import { TestWorkingCopy } from 'vs/workbench/test/common/workbenchTestServices';
-import { IWorkingCopySaveEvent, WorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import { IWorkingCopy } from '../../common/workingCopy.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { TestWorkingCopy } from '../../../../test/common/workbenchTestServices.js';
+import { IWorkingCopySaveEvent, WorkingCopyService } from '../../common/workingCopyService.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
 
 suite('WorkingCopyService', () => {
 
diff --git a/src/vs/workbench/services/workingCopy/test/electron-sandbox/workingCopyBackupService.test.ts b/src/vs/workbench/services/workingCopy/test/electron-sandbox/workingCopyBackupService.test.ts
index 2e70ca1e8b4..a6013924b1b 100644
--- a/src/vs/workbench/services/workingCopy/test/electron-sandbox/workingCopyBackupService.test.ts
+++ b/src/vs/workbench/services/workingCopy/test/electron-sandbox/workingCopyBackupService.test.ts
@@ -4,36 +4,36 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { isWindows } from 'vs/base/common/platform';
-import { insert } from 'vs/base/common/arrays';
-import { hash } from 'vs/base/common/hash';
-import { isEqual, joinPath, dirname } from 'vs/base/common/resources';
-import { join } from 'vs/base/common/path';
-import { URI } from 'vs/base/common/uri';
-import { WorkingCopyBackupsModel, hashIdentifier } from 'vs/workbench/services/workingCopy/common/workingCopyBackupService';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
-import { Schemas } from 'vs/base/common/network';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { LogLevel, NullLogService } from 'vs/platform/log/common/log';
-import { NativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
-import { toBufferOrReadable } from 'vs/workbench/services/textfile/common/textfiles';
-import { IFileService } from 'vs/platform/files/common/files';
-import { NativeWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/electron-sandbox/workingCopyBackupService';
-import { FileUserDataProvider } from 'vs/platform/userData/common/fileUserDataProvider';
-import { bufferToReadable, bufferToStream, streamToBuffer, VSBuffer, VSBufferReadable, VSBufferReadableStream } from 'vs/base/common/buffer';
-import { TestLifecycleService, toTypedWorkingCopyId, toUntypedWorkingCopyId } from 'vs/workbench/test/browser/workbenchTestServices';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { IWorkingCopyBackupMeta, IWorkingCopyIdentifier } from 'vs/workbench/services/workingCopy/common/workingCopy';
-import { consumeStream } from 'vs/base/common/stream';
-import { TestProductService } from 'vs/workbench/test/common/workbenchTestServices';
-import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
-import { generateUuid } from 'vs/base/common/uuid';
-import { INativeWindowConfiguration } from 'vs/platform/window/common/window';
-import product from 'vs/platform/product/common/product';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { UserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
+import { isWindows } from '../../../../../base/common/platform.js';
+import { insert } from '../../../../../base/common/arrays.js';
+import { hash } from '../../../../../base/common/hash.js';
+import { isEqual, joinPath, dirname } from '../../../../../base/common/resources.js';
+import { join } from '../../../../../base/common/path.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { WorkingCopyBackupsModel, hashIdentifier } from '../../common/workingCopyBackupService.js';
+import { createTextModel } from '../../../../../editor/test/common/testTextModel.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { FileService } from '../../../../../platform/files/common/fileService.js';
+import { LogLevel, NullLogService } from '../../../../../platform/log/common/log.js';
+import { NativeWorkbenchEnvironmentService } from '../../../environment/electron-sandbox/environmentService.js';
+import { toBufferOrReadable } from '../../../textfile/common/textfiles.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { NativeWorkingCopyBackupService } from '../../electron-sandbox/workingCopyBackupService.js';
+import { FileUserDataProvider } from '../../../../../platform/userData/common/fileUserDataProvider.js';
+import { bufferToReadable, bufferToStream, streamToBuffer, VSBuffer, VSBufferReadable, VSBufferReadableStream } from '../../../../../base/common/buffer.js';
+import { TestLifecycleService, toTypedWorkingCopyId, toUntypedWorkingCopyId } from '../../../../test/browser/workbenchTestServices.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { IWorkingCopyBackupMeta, IWorkingCopyIdentifier } from '../../common/workingCopy.js';
+import { consumeStream } from '../../../../../base/common/stream.js';
+import { TestProductService } from '../../../../test/common/workbenchTestServices.js';
+import { InMemoryFileSystemProvider } from '../../../../../platform/files/common/inMemoryFilesystemProvider.js';
+import { generateUuid } from '../../../../../base/common/uuid.js';
+import { INativeWindowConfiguration } from '../../../../../platform/window/common/window.js';
+import product from '../../../../../platform/product/common/product.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { UserDataProfilesService } from '../../../../../platform/userDataProfile/common/userDataProfile.js';
+import { UriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentityService.js';
 
 const homeDir = URI.file('home').with({ scheme: Schemas.inMemory });
 const tmpDir = URI.file('tmp').with({ scheme: Schemas.inMemory });
@@ -71,6 +71,10 @@ const TestNativeWindowConfiguration: INativeWindowConfiguration = {
 	tmpDir: tmpDir.fsPath,
 	userDataDir: joinPath(homeDir, product.nameShort).fsPath,
 	profiles: { profile: NULL_PROFILE, all: [NULL_PROFILE], home: homeDir },
+	nls: {
+		messages: [],
+		language: 'en'
+	},
 	_: []
 };
 
diff --git a/src/vs/workbench/services/workingCopy/test/electron-sandbox/workingCopyBackupTracker.test.ts b/src/vs/workbench/services/workingCopy/test/electron-sandbox/workingCopyBackupTracker.test.ts
index ae14f5d12d4..ed1ce98a64c 100644
--- a/src/vs/workbench/services/workingCopy/test/electron-sandbox/workingCopyBackupTracker.test.ts
+++ b/src/vs/workbench/services/workingCopy/test/electron-sandbox/workingCopyBackupTracker.test.ts
@@ -4,47 +4,47 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { isMacintosh, isWindows } from 'vs/base/common/platform';
-import { join } from 'vs/base/common/path';
-import { URI } from 'vs/base/common/uri';
-import { hash } from 'vs/base/common/hash';
-import { NativeWorkingCopyBackupTracker } from 'vs/workbench/services/workingCopy/electron-sandbox/workingCopyBackupTracker';
-import { TextFileEditorModelManager } from 'vs/workbench/services/textfile/common/textFileEditorModelManager';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { EditorPart } from 'vs/workbench/browser/parts/editor/editorPart';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { EditorService } from 'vs/workbench/services/editor/browser/editorService';
-import { IWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackup';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from 'vs/base/test/common/utils';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
-import { ILogService } from 'vs/platform/log/common/log';
-import { HotExitConfiguration } from 'vs/platform/files/common/files';
-import { ShutdownReason, ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IFileDialogService, ConfirmResult, IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { createEditorPart, registerTestFileEditor, TestBeforeShutdownEvent, TestEnvironmentService, TestFilesConfigurationService, TestFileService, TestTextResourceConfigurationService, workbenchTeardown } from 'vs/workbench/test/browser/workbenchTestServices';
-import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { TestWorkspace, Workspace } from 'vs/platform/workspace/test/common/testWorkspace';
-import { IProgressService } from 'vs/platform/progress/common/progress';
-import { IWorkingCopyEditorService } from 'vs/workbench/services/workingCopy/common/workingCopyEditorService';
-import { TestContextService, TestMarkerService, TestWorkingCopy } from 'vs/workbench/test/common/workbenchTestServices';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IWorkingCopyBackup, WorkingCopyCapabilities } from 'vs/workbench/services/workingCopy/common/workingCopy';
-import { Event, Emitter } from 'vs/base/common/event';
-import { generateUuid } from 'vs/base/common/uuid';
-import { Schemas } from 'vs/base/common/network';
-import { joinPath } from 'vs/base/common/resources';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { TestServiceAccessor, workbenchInstantiationService } from 'vs/workbench/test/electron-sandbox/workbenchTestServices';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
+import { isMacintosh, isWindows } from '../../../../../base/common/platform.js';
+import { join } from '../../../../../base/common/path.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { hash } from '../../../../../base/common/hash.js';
+import { NativeWorkingCopyBackupTracker } from '../../electron-sandbox/workingCopyBackupTracker.js';
+import { TextFileEditorModelManager } from '../../../textfile/common/textFileEditorModelManager.js';
+import { IEditorService } from '../../../editor/common/editorService.js';
+import { EditorPart } from '../../../../browser/parts/editor/editorPart.js';
+import { IEditorGroupsService } from '../../../editor/common/editorGroupsService.js';
+import { EditorService } from '../../../editor/browser/editorService.js';
+import { IWorkingCopyBackupService } from '../../common/workingCopyBackup.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from '../../../../../base/test/common/utils.js';
+import { IFilesConfigurationService } from '../../../filesConfiguration/common/filesConfigurationService.js';
+import { IWorkingCopyService } from '../../common/workingCopyService.js';
+import { ILogService } from '../../../../../platform/log/common/log.js';
+import { HotExitConfiguration } from '../../../../../platform/files/common/files.js';
+import { ShutdownReason, ILifecycleService } from '../../../lifecycle/common/lifecycle.js';
+import { IFileDialogService, ConfirmResult, IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { INativeHostService } from '../../../../../platform/native/common/native.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { createEditorPart, registerTestFileEditor, TestBeforeShutdownEvent, TestEnvironmentService, TestFilesConfigurationService, TestFileService, TestTextResourceConfigurationService, workbenchTeardown } from '../../../../test/browser/workbenchTestServices.js';
+import { MockContextKeyService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IEnvironmentService } from '../../../../../platform/environment/common/environment.js';
+import { TestWorkspace, Workspace } from '../../../../../platform/workspace/test/common/testWorkspace.js';
+import { IProgressService } from '../../../../../platform/progress/common/progress.js';
+import { IWorkingCopyEditorService } from '../../common/workingCopyEditorService.js';
+import { TestContextService, TestMarkerService, TestWorkingCopy } from '../../../../test/common/workbenchTestServices.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { IWorkingCopyBackup, WorkingCopyCapabilities } from '../../common/workingCopy.js';
+import { Event, Emitter } from '../../../../../base/common/event.js';
+import { generateUuid } from '../../../../../base/common/uuid.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { joinPath } from '../../../../../base/common/resources.js';
+import { VSBuffer } from '../../../../../base/common/buffer.js';
+import { TestServiceAccessor, workbenchInstantiationService } from '../../../../test/electron-sandbox/workbenchTestServices.js';
+import { UriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentityService.js';
 
 suite('WorkingCopyBackupTracker (native)', function () {
 
diff --git a/src/vs/workbench/services/workingCopy/test/electron-sandbox/workingCopyHistoryService.test.ts b/src/vs/workbench/services/workingCopy/test/electron-sandbox/workingCopyHistoryService.test.ts
index 83bd0aeebad..a0aae9113f4 100644
--- a/src/vs/workbench/services/workingCopy/test/electron-sandbox/workingCopyHistoryService.test.ts
+++ b/src/vs/workbench/services/workingCopy/test/electron-sandbox/workingCopyHistoryService.test.ts
@@ -4,27 +4,26 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { TestContextService, TestStorageService, TestWorkingCopy } from 'vs/workbench/test/common/workbenchTestServices';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { IWorkingCopyHistoryEntry, IWorkingCopyHistoryEntryDescriptor, IWorkingCopyHistoryEvent } from 'vs/workbench/services/workingCopy/common/workingCopyHistory';
-import { IFileService } from 'vs/platform/files/common/files';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { LabelService } from 'vs/workbench/services/label/common/labelService';
-import { TestEnvironmentService, TestLifecycleService, TestPathService, TestRemoteAgentService, TestWillShutdownEvent } from 'vs/workbench/test/browser/workbenchTestServices';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { NativeWorkingCopyHistoryService } from 'vs/workbench/services/workingCopy/common/workingCopyHistoryService';
-import { joinPath, dirname, basename } from 'vs/base/common/resources';
-import { firstOrDefault } from 'vs/base/common/arrays';
-import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
-import { generateUuid } from 'vs/base/common/uuid';
-import { join } from 'vs/base/common/path';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import { TestContextService, TestStorageService, TestWorkingCopy } from '../../../../test/common/workbenchTestServices.js';
+import { NullLogService } from '../../../../../platform/log/common/log.js';
+import { FileService } from '../../../../../platform/files/common/fileService.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { IWorkingCopyHistoryEntry, IWorkingCopyHistoryEntryDescriptor, IWorkingCopyHistoryEvent } from '../../common/workingCopyHistory.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { UriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentityService.js';
+import { LabelService } from '../../../label/common/labelService.js';
+import { TestEnvironmentService, TestLifecycleService, TestPathService, TestRemoteAgentService, TestWillShutdownEvent } from '../../../../test/browser/workbenchTestServices.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { NativeWorkingCopyHistoryService } from '../../common/workingCopyHistoryService.js';
+import { joinPath, dirname, basename } from '../../../../../base/common/resources.js';
+import { InMemoryFileSystemProvider } from '../../../../../platform/files/common/inMemoryFilesystemProvider.js';
+import { generateUuid } from '../../../../../base/common/uuid.js';
+import { join } from '../../../../../base/common/path.js';
+import { VSBuffer } from '../../../../../base/common/buffer.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
 
 export class TestWorkingCopyHistoryService extends NativeWorkingCopyHistoryService {
 
@@ -251,7 +250,7 @@ suite('WorkingCopyHistoryService', () => {
 	test('removeEntry - deletes history entries folder when last entry removed', async () => {
 		const workingCopy1 = disposables.add(new TestWorkingCopy(testFile1Path));
 
-		let entry = await addEntry({ resource: workingCopy1.resource }, CancellationToken.None);
+		let entry: IWorkingCopyHistoryEntry | undefined = await addEntry({ resource: workingCopy1.resource }, CancellationToken.None);
 
 		// Simulate shutdown
 		let event = new TestWillShutdownEvent();
@@ -265,7 +264,7 @@ suite('WorkingCopyHistoryService', () => {
 
 		assert.strictEqual((await fileService.exists(dirname(entry.location))), true);
 
-		entry = firstOrDefault(await service.getEntries(workingCopy1.resource, CancellationToken.None))!;
+		entry = (await service.getEntries(workingCopy1.resource, CancellationToken.None)).at(0);
 		assert.ok(entry);
 
 		await service.removeEntry(entry, CancellationToken.None);
diff --git a/src/vs/workbench/services/workingCopy/test/electron-sandbox/workingCopyHistoryTracker.test.ts b/src/vs/workbench/services/workingCopy/test/electron-sandbox/workingCopyHistoryTracker.test.ts
index b749708ada9..82f53dbd286 100644
--- a/src/vs/workbench/services/workingCopy/test/electron-sandbox/workingCopyHistoryTracker.test.ts
+++ b/src/vs/workbench/services/workingCopy/test/electron-sandbox/workingCopyHistoryTracker.test.ts
@@ -4,30 +4,30 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Event } from 'vs/base/common/event';
-import { TestContextService, TestWorkingCopy } from 'vs/workbench/test/common/workbenchTestServices';
-import { randomPath } from 'vs/base/common/extpath';
-import { join } from 'vs/base/common/path';
-import { URI } from 'vs/base/common/uri';
-import { WorkingCopyHistoryTracker } from 'vs/workbench/services/workingCopy/common/workingCopyHistoryTracker';
-import { WorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { TestFileService, TestPathService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { DeferredPromise } from 'vs/base/common/async';
-import { IFileService } from 'vs/platform/files/common/files';
-import { Schemas } from 'vs/base/common/network';
-import { basename, dirname, isEqual, joinPath } from 'vs/base/common/resources';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { UndoRedoService } from 'vs/platform/undoRedo/common/undoRedoService';
-import { TestDialogService } from 'vs/platform/dialogs/test/common/testDialogService';
-import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IWorkingCopyHistoryEntry, IWorkingCopyHistoryEntryDescriptor } from 'vs/workbench/services/workingCopy/common/workingCopyHistory';
-import { assertIsDefined } from 'vs/base/common/types';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { TestWorkingCopyHistoryService } from 'vs/workbench/services/workingCopy/test/electron-sandbox/workingCopyHistoryService.test';
+import { Event } from '../../../../../base/common/event.js';
+import { TestContextService, TestWorkingCopy } from '../../../../test/common/workbenchTestServices.js';
+import { randomPath } from '../../../../../base/common/extpath.js';
+import { join } from '../../../../../base/common/path.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { WorkingCopyHistoryTracker } from '../../common/workingCopyHistoryTracker.js';
+import { WorkingCopyService } from '../../common/workingCopyService.js';
+import { UriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentityService.js';
+import { TestFileService, TestPathService } from '../../../../test/browser/workbenchTestServices.js';
+import { DeferredPromise } from '../../../../../base/common/async.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { basename, dirname, isEqual, joinPath } from '../../../../../base/common/resources.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { UndoRedoService } from '../../../../../platform/undoRedo/common/undoRedoService.js';
+import { TestDialogService } from '../../../../../platform/dialogs/test/common/testDialogService.js';
+import { TestNotificationService } from '../../../../../platform/notification/test/common/testNotificationService.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { IWorkingCopyHistoryEntry, IWorkingCopyHistoryEntryDescriptor } from '../../common/workingCopyHistory.js';
+import { assertIsDefined } from '../../../../../base/common/types.js';
+import { VSBuffer } from '../../../../../base/common/buffer.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { TestWorkingCopyHistoryService } from './workingCopyHistoryService.test.js';
 
 suite('WorkingCopyHistoryTracker', () => {
 
diff --git a/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.ts b/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.ts
index a3be20f5277..25fd78863cb 100644
--- a/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.ts
+++ b/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.ts
@@ -3,33 +3,33 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IWorkspaceEditingService } from 'vs/workbench/services/workspaces/common/workspaceEditing';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { hasWorkspaceFileExtension, isSavedWorkspace, isUntitledWorkspace, isWorkspaceIdentifier, IWorkspaceContextService, IWorkspaceIdentifier, toWorkspaceIdentifier, WorkbenchState, WORKSPACE_EXTENSION, WORKSPACE_FILTER } from 'vs/platform/workspace/common/workspace';
-import { IJSONEditingService, JSONEditingError, JSONEditingErrorCode } from 'vs/workbench/services/configuration/common/jsonEditing';
-import { IWorkspaceFolderCreationData, IWorkspacesService, rewriteWorkspaceFileForNewLocation, IEnterWorkspaceResult, IStoredWorkspace } from 'vs/platform/workspaces/common/workspaces';
-import { WorkspaceService } from 'vs/workbench/services/configuration/browser/configurationService';
-import { ConfigurationScope, IConfigurationRegistry, Extensions as ConfigurationExtensions, IConfigurationPropertySchema } from 'vs/platform/configuration/common/configurationRegistry';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { distinct, firstOrDefault } from 'vs/base/common/arrays';
-import { basename, isEqual, isEqualAuthority, joinPath, removeTrailingPathSeparator } from 'vs/base/common/resources';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IFileDialogService, IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { mnemonicButtonLabel } from 'vs/base/common/labels';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { Schemas } from 'vs/base/common/network';
-import { SaveReason } from 'vs/workbench/common/editor';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IWorkspaceTrustManagementService } from 'vs/platform/workspace/common/workspaceTrust';
-import { IWorkbenchConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { Disposable } from 'vs/base/common/lifecycle';
+import { IWorkspaceEditingService } from '../common/workspaceEditing.js';
+import { URI } from '../../../../base/common/uri.js';
+import { localize } from '../../../../nls.js';
+import { hasWorkspaceFileExtension, isSavedWorkspace, isUntitledWorkspace, isWorkspaceIdentifier, IWorkspaceContextService, IWorkspaceIdentifier, toWorkspaceIdentifier, WorkbenchState, WORKSPACE_EXTENSION, WORKSPACE_FILTER } from '../../../../platform/workspace/common/workspace.js';
+import { IJSONEditingService, JSONEditingError, JSONEditingErrorCode } from '../../configuration/common/jsonEditing.js';
+import { IWorkspaceFolderCreationData, IWorkspacesService, rewriteWorkspaceFileForNewLocation, IEnterWorkspaceResult, IStoredWorkspace } from '../../../../platform/workspaces/common/workspaces.js';
+import { WorkspaceService } from '../../configuration/browser/configurationService.js';
+import { ConfigurationScope, IConfigurationRegistry, Extensions as ConfigurationExtensions, IConfigurationPropertySchema } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { distinct } from '../../../../base/common/arrays.js';
+import { basename, isEqual, isEqualAuthority, joinPath, removeTrailingPathSeparator } from '../../../../base/common/resources.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { IFileDialogService, IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { mnemonicButtonLabel } from '../../../../base/common/labels.js';
+import { ITextFileService } from '../../textfile/common/textfiles.js';
+import { IHostService } from '../../host/browser/host.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { SaveReason } from '../../../common/editor.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IWorkspaceTrustManagementService } from '../../../../platform/workspace/common/workspaceTrust.js';
+import { IWorkbenchConfigurationService } from '../../configuration/common/configuration.js';
+import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { IUserDataProfileService } from '../../userDataProfile/common/userDataProfile.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
 
 export abstract class AbstractWorkspaceEditingService extends Disposable implements IWorkspaceEditingService {
 
@@ -91,7 +91,7 @@ export abstract class AbstractWorkspaceEditingService extends Disposable impleme
 		}
 
 		// Then fallback to first folder if any
-		const folder = firstOrDefault(this.contextService.getWorkspace().folders);
+		const folder = this.contextService.getWorkspace().folders.at(0);
 		if (folder) {
 			return `${basename(folder.uri)}.${WORKSPACE_EXTENSION}`;
 		}
diff --git a/src/vs/workbench/services/workspaces/browser/workspaceEditingService.ts b/src/vs/workbench/services/workspaces/browser/workspaceEditingService.ts
index 9a90505743f..47a334aedca 100644
--- a/src/vs/workbench/services/workspaces/browser/workspaceEditingService.ts
+++ b/src/vs/workbench/services/workspaces/browser/workspaceEditingService.ts
@@ -3,26 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IJSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditing';
-import { IWorkspacesService } from 'vs/platform/workspaces/common/workspaces';
-import { WorkspaceService } from 'vs/workbench/services/configuration/browser/configurationService';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IFileDialogService, IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { AbstractWorkspaceEditingService } from 'vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService';
-import { IWorkspaceEditingService } from 'vs/workbench/services/workspaces/common/workspaceEditing';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { URI } from 'vs/base/common/uri';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IWorkspaceTrustManagementService } from 'vs/platform/workspace/common/workspaceTrust';
-import { IWorkbenchConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { IJSONEditingService } from '../../configuration/common/jsonEditing.js';
+import { IWorkspacesService } from '../../../../platform/workspaces/common/workspaces.js';
+import { WorkspaceService } from '../../configuration/browser/configurationService.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { IFileDialogService, IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { ITextFileService } from '../../textfile/common/textfiles.js';
+import { IHostService } from '../../host/browser/host.js';
+import { AbstractWorkspaceEditingService } from './abstractWorkspaceEditingService.js';
+import { IWorkspaceEditingService } from '../common/workspaceEditing.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IWorkspaceTrustManagementService } from '../../../../platform/workspace/common/workspaceTrust.js';
+import { IWorkbenchConfigurationService } from '../../configuration/common/configuration.js';
+import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { IUserDataProfileService } from '../../userDataProfile/common/userDataProfile.js';
 
 export class BrowserWorkspaceEditingService extends AbstractWorkspaceEditingService {
 
diff --git a/src/vs/workbench/services/workspaces/browser/workspaceTrustEditorInput.ts b/src/vs/workbench/services/workspaces/browser/workspaceTrustEditorInput.ts
index 973914f6f42..2c9e8f3f8e8 100644
--- a/src/vs/workbench/services/workspaces/browser/workspaceTrustEditorInput.ts
+++ b/src/vs/workbench/services/workspaces/browser/workspaceTrustEditorInput.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from 'vs/base/common/codicons';
-import { Schemas } from 'vs/base/common/network';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { EditorInputCapabilities, IUntypedEditorInput } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { URI } from '../../../../base/common/uri.js';
+import { localize } from '../../../../nls.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { EditorInputCapabilities, IUntypedEditorInput } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
 
 const WorkspaceTrustEditorIcon = registerIcon('workspace-trust-editor-label-icon', Codicon.shield, localize('workspaceTrustEditorLabelIcon', 'Icon of the workspace trust editor label.'));
 
diff --git a/src/vs/workbench/services/workspaces/browser/workspaces.ts b/src/vs/workbench/services/workspaces/browser/workspaces.ts
index d180ef2896c..27fa5abae82 100644
--- a/src/vs/workbench/services/workspaces/browser/workspaces.ts
+++ b/src/vs/workbench/services/workspaces/browser/workspaces.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
-import { URI } from 'vs/base/common/uri';
-import { hash } from 'vs/base/common/hash';
+import { ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from '../../../../platform/workspace/common/workspace.js';
+import { URI } from '../../../../base/common/uri.js';
+import { hash } from '../../../../base/common/hash.js';
 
 // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 // NOTE: DO NOT CHANGE. IDENTIFIERS HAVE TO REMAIN STABLE
diff --git a/src/vs/workbench/services/workspaces/browser/workspacesService.ts b/src/vs/workbench/services/workspaces/browser/workspacesService.ts
index 4daa9cc2af2..125bb9d7a86 100644
--- a/src/vs/workbench/services/workspaces/browser/workspacesService.ts
+++ b/src/vs/workbench/services/workspaces/browser/workspacesService.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IWorkspacesService, IWorkspaceFolderCreationData, IEnterWorkspaceResult, IRecentlyOpened, restoreRecentlyOpened, IRecent, isRecentFile, isRecentFolder, toStoreData, IStoredWorkspaceFolder, getStoredWorkspaceFolder, IStoredWorkspace, isRecentWorkspace } from 'vs/platform/workspaces/common/workspaces';
-import { URI } from 'vs/base/common/uri';
-import { Emitter } from 'vs/base/common/event';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { isTemporaryWorkspace, IWorkspaceContextService, IWorkspaceFoldersChangeEvent, IWorkspaceIdentifier, WorkbenchState, WORKSPACE_EXTENSION } from 'vs/platform/workspace/common/workspace';
-import { ILogService } from 'vs/platform/log/common/log';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { getWorkspaceIdentifier } from 'vs/workbench/services/workspaces/browser/workspaces';
-import { IFileService, FileOperationError, FileOperationResult } from 'vs/platform/files/common/files';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { joinPath } from 'vs/base/common/resources';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IWorkspaceBackupInfo, IFolderBackupInfo } from 'vs/platform/backup/common/backup';
-import { Schemas } from 'vs/base/common/network';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IWorkspacesService, IWorkspaceFolderCreationData, IEnterWorkspaceResult, IRecentlyOpened, restoreRecentlyOpened, IRecent, isRecentFile, isRecentFolder, toStoreData, IStoredWorkspaceFolder, getStoredWorkspaceFolder, IStoredWorkspace, isRecentWorkspace } from '../../../../platform/workspaces/common/workspaces.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { isTemporaryWorkspace, IWorkspaceContextService, IWorkspaceFoldersChangeEvent, IWorkspaceIdentifier, WorkbenchState, WORKSPACE_EXTENSION } from '../../../../platform/workspace/common/workspace.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { getWorkspaceIdentifier } from './workspaces.js';
+import { IFileService, FileOperationError, FileOperationResult } from '../../../../platform/files/common/files.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { joinPath } from '../../../../base/common/resources.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IWorkspaceBackupInfo, IFolderBackupInfo } from '../../../../platform/backup/common/backup.js';
+import { Schemas } from '../../../../base/common/network.js';
 
 export class BrowserWorkspacesService extends Disposable implements IWorkspacesService {
 
diff --git a/src/vs/workbench/services/workspaces/common/canonicalUriService.ts b/src/vs/workbench/services/workspaces/common/canonicalUriService.ts
index bd2a007835c..cd6753234a5 100644
--- a/src/vs/workbench/services/workspaces/common/canonicalUriService.ts
+++ b/src/vs/workbench/services/workspaces/common/canonicalUriService.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ICanonicalUriService, ICanonicalUriProvider } from 'vs/platform/workspace/common/canonicalUri';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ICanonicalUriService, ICanonicalUriProvider } from '../../../../platform/workspace/common/canonicalUri.js';
 
 export class CanonicalUriService implements ICanonicalUriService {
 	declare readonly _serviceBrand: undefined;
diff --git a/src/vs/workbench/services/workspaces/common/editSessionIdentityService.ts b/src/vs/workbench/services/workspaces/common/editSessionIdentityService.ts
index 0e012eeb7ea..a43034fc0e0 100644
--- a/src/vs/workbench/services/workspaces/common/editSessionIdentityService.ts
+++ b/src/vs/workbench/services/workspaces/common/editSessionIdentityService.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { insert } from 'vs/base/common/arrays';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ILogService } from 'vs/platform/log/common/log';
-import { EditSessionIdentityMatch, IEditSessionIdentityCreateParticipant, IEditSessionIdentityProvider, IEditSessionIdentityService } from 'vs/platform/workspace/common/editSessions';
-import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { insert } from '../../../../base/common/arrays.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { EditSessionIdentityMatch, IEditSessionIdentityCreateParticipant, IEditSessionIdentityProvider, IEditSessionIdentityService } from '../../../../platform/workspace/common/editSessions.js';
+import { IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
+import { IExtensionService } from '../../extensions/common/extensions.js';
 
 export class EditSessionIdentityService implements IEditSessionIdentityService {
 	readonly _serviceBrand: undefined;
diff --git a/src/vs/workbench/services/workspaces/common/workspaceEditing.ts b/src/vs/workbench/services/workspaces/common/workspaceEditing.ts
index 8ca4f01f6d4..36dd601e6e2 100644
--- a/src/vs/workbench/services/workspaces/common/workspaceEditing.ts
+++ b/src/vs/workbench/services/workspaces/common/workspaceEditing.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IWorkspaceFolderCreationData } from 'vs/platform/workspaces/common/workspaces';
-import { URI } from 'vs/base/common/uri';
-import { IWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IWorkspaceFolderCreationData } from '../../../../platform/workspaces/common/workspaces.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IWorkspaceIdentifier } from '../../../../platform/workspace/common/workspace.js';
 
 export const IWorkspaceEditingService = createDecorator<IWorkspaceEditingService>('workspaceEditingService');
 
diff --git a/src/vs/workbench/services/workspaces/common/workspaceIdentityService.ts b/src/vs/workbench/services/workspaces/common/workspaceIdentityService.ts
index 78f1109a124..a0cf72cc25c 100644
--- a/src/vs/workbench/services/workspaces/common/workspaceIdentityService.ts
+++ b/src/vs/workbench/services/workspaces/common/workspaceIdentityService.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { isEqualOrParent, joinPath, relativePath } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IWorkspaceStateFolder } from 'vs/platform/userDataSync/common/userDataSync';
-import { EditSessionIdentityMatch, IEditSessionIdentityService } from 'vs/platform/workspace/common/editSessions';
-import { IWorkspaceContextService, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { isEqualOrParent, joinPath, relativePath } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IWorkspaceStateFolder } from '../../../../platform/userDataSync/common/userDataSync.js';
+import { EditSessionIdentityMatch, IEditSessionIdentityService } from '../../../../platform/workspace/common/editSessions.js';
+import { IWorkspaceContextService, IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
 
 export const IWorkspaceIdentityService = createDecorator<IWorkspaceIdentityService>('IWorkspaceIdentityService');
 export interface IWorkspaceIdentityService {
 	_serviceBrand: undefined;
-	matches(folders: IWorkspaceStateFolder[], cancellationToken: CancellationToken): Promise<((obj: any) => any) | false>;
+	matches(folders: IWorkspaceStateFolder[], cancellationToken: CancellationToken): Promise<((obj: any) => unknown) | false>;
 	getWorkspaceStateFolders(cancellationToken: CancellationToken): Promise<IWorkspaceStateFolder[]>;
 }
 
@@ -40,7 +40,7 @@ export class WorkspaceIdentityService implements IWorkspaceIdentityService {
 		return workspaceStateFolders;
 	}
 
-	async matches(incomingWorkspaceFolders: IWorkspaceStateFolder[], cancellationToken: CancellationToken): Promise<((value: any) => any) | false> {
+	async matches(incomingWorkspaceFolders: IWorkspaceStateFolder[], cancellationToken: CancellationToken): Promise<((value: any) => unknown) | false> {
 		const incomingToCurrentWorkspaceFolderUris: { [key: string]: string } = {};
 
 		const incomingIdentitiesToIncomingWorkspaceFolders: { [key: string]: string } = {};
diff --git a/src/vs/workbench/services/workspaces/common/workspaceTrust.ts b/src/vs/workbench/services/workspaces/common/workspaceTrust.ts
index 0c786c3628b..f2186e219a3 100644
--- a/src/vs/workbench/services/workspaces/common/workspaceTrust.ts
+++ b/src/vs/workbench/services/workspaces/common/workspaceTrust.ts
@@ -3,27 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { LinkedList } from 'vs/base/common/linkedList';
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { IPath } from 'vs/platform/window/common/window';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IRemoteAuthorityResolverService, ResolverResult } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { getRemoteAuthority } from 'vs/platform/remote/common/remoteHosts';
-import { isVirtualResource } from 'vs/platform/workspace/common/virtualWorkspace';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ISingleFolderWorkspaceIdentifier, isSavedWorkspace, isSingleFolderWorkspaceIdentifier, isTemporaryWorkspace, IWorkspace, IWorkspaceContextService, IWorkspaceFolder, toWorkspaceIdentifier, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { WorkspaceTrustRequestOptions, IWorkspaceTrustManagementService, IWorkspaceTrustInfo, IWorkspaceTrustUriInfo, IWorkspaceTrustRequestService, IWorkspaceTrustTransitionParticipant, WorkspaceTrustUriResponse, IWorkspaceTrustEnablementService } from 'vs/platform/workspace/common/workspaceTrust';
-import { Memento, MementoObject } from 'vs/workbench/common/memento';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { isEqualAuthority } from 'vs/base/common/resources';
-import { isWeb } from 'vs/base/common/platform';
-import { IFileService } from 'vs/platform/files/common/files';
-import { promiseWithResolvers } from 'vs/base/common/async';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { LinkedList } from '../../../../base/common/linkedList.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IPath } from '../../../../platform/window/common/window.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IRemoteAuthorityResolverService, ResolverResult } from '../../../../platform/remote/common/remoteAuthorityResolver.js';
+import { getRemoteAuthority } from '../../../../platform/remote/common/remoteHosts.js';
+import { isVirtualResource } from '../../../../platform/workspace/common/virtualWorkspace.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { ISingleFolderWorkspaceIdentifier, isSavedWorkspace, isSingleFolderWorkspaceIdentifier, isTemporaryWorkspace, IWorkspace, IWorkspaceContextService, IWorkspaceFolder, toWorkspaceIdentifier, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { WorkspaceTrustRequestOptions, IWorkspaceTrustManagementService, IWorkspaceTrustInfo, IWorkspaceTrustUriInfo, IWorkspaceTrustRequestService, IWorkspaceTrustTransitionParticipant, WorkspaceTrustUriResponse, IWorkspaceTrustEnablementService } from '../../../../platform/workspace/common/workspaceTrust.js';
+import { Memento, MementoObject } from '../../../common/memento.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { isEqualAuthority } from '../../../../base/common/resources.js';
+import { isWeb } from '../../../../base/common/platform.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { promiseWithResolvers } from '../../../../base/common/async.js';
 
 export const WORKSPACE_TRUST_ENABLED = 'security.workspace.trust.enabled';
 export const WORKSPACE_TRUST_STARTUP_PROMPT = 'security.workspace.trust.startupPrompt';
diff --git a/src/vs/workbench/services/workspaces/electron-sandbox/workspaceEditingService.ts b/src/vs/workbench/services/workspaces/electron-sandbox/workspaceEditingService.ts
index a896a9ed6d1..625f69f60b9 100644
--- a/src/vs/workbench/services/workspaces/electron-sandbox/workspaceEditingService.ts
+++ b/src/vs/workbench/services/workspaces/electron-sandbox/workspaceEditingService.ts
@@ -3,37 +3,37 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { IWorkspaceEditingService } from 'vs/workbench/services/workspaces/common/workspaceEditing';
-import { URI } from 'vs/base/common/uri';
-import { hasWorkspaceFileExtension, isUntitledWorkspace, isWorkspaceIdentifier, IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IJSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditing';
-import { IWorkspacesService } from 'vs/platform/workspaces/common/workspaces';
-import { WorkspaceService } from 'vs/workbench/services/configuration/browser/configurationService';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackup';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { basename } from 'vs/base/common/resources';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { IFileService } from 'vs/platform/files/common/files';
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
-import { ILifecycleService, ShutdownReason } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IFileDialogService, IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ILabelService, Verbosity } from 'vs/platform/label/common/label';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { AbstractWorkspaceEditingService } from 'vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import { isMacintosh } from 'vs/base/common/platform';
-import { WorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackupService';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IWorkspaceTrustManagementService } from 'vs/platform/workspace/common/workspaceTrust';
-import { IWorkbenchConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
-import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
+import { localize } from '../../../../nls.js';
+import { IWorkspaceEditingService } from '../common/workspaceEditing.js';
+import { URI } from '../../../../base/common/uri.js';
+import { hasWorkspaceFileExtension, isUntitledWorkspace, isWorkspaceIdentifier, IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { IJSONEditingService } from '../../configuration/common/jsonEditing.js';
+import { IWorkspacesService } from '../../../../platform/workspaces/common/workspaces.js';
+import { WorkspaceService } from '../../configuration/browser/configurationService.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { IExtensionService } from '../../extensions/common/extensions.js';
+import { IWorkingCopyBackupService } from '../../workingCopy/common/workingCopyBackup.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { basename } from '../../../../base/common/resources.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { INativeWorkbenchEnvironmentService } from '../../environment/electron-sandbox/environmentService.js';
+import { ILifecycleService, ShutdownReason } from '../../lifecycle/common/lifecycle.js';
+import { IFileDialogService, IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ILabelService, Verbosity } from '../../../../platform/label/common/label.js';
+import { ITextFileService } from '../../textfile/common/textfiles.js';
+import { IHostService } from '../../host/browser/host.js';
+import { AbstractWorkspaceEditingService } from '../browser/abstractWorkspaceEditingService.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { isMacintosh } from '../../../../base/common/platform.js';
+import { WorkingCopyBackupService } from '../../workingCopy/common/workingCopyBackupService.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IWorkspaceTrustManagementService } from '../../../../platform/workspace/common/workspaceTrust.js';
+import { IWorkbenchConfigurationService } from '../../configuration/common/configuration.js';
+import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { IUserDataProfileService } from '../../userDataProfile/common/userDataProfile.js';
+import { ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
 
 export class NativeWorkspaceEditingService extends AbstractWorkspaceEditingService {
 
diff --git a/src/vs/workbench/services/workspaces/electron-sandbox/workspacesService.ts b/src/vs/workbench/services/workspaces/electron-sandbox/workspacesService.ts
index d4d82c05960..5aacdf29e02 100644
--- a/src/vs/workbench/services/workspaces/electron-sandbox/workspacesService.ts
+++ b/src/vs/workbench/services/workspaces/electron-sandbox/workspacesService.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IWorkspacesService } from 'vs/platform/workspaces/common/workspaces';
-import { IMainProcessService } from 'vs/platform/ipc/common/mainProcessService';
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
-import { INativeHostService } from 'vs/platform/native/common/native';
+import { IWorkspacesService } from '../../../../platform/workspaces/common/workspaces.js';
+import { IMainProcessService } from '../../../../platform/ipc/common/mainProcessService.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ProxyChannel } from '../../../../base/parts/ipc/common/ipc.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
 
 // @ts-ignore: interface is implemented via proxy
 export class NativeWorkspacesService implements IWorkspacesService {
diff --git a/src/vs/workbench/services/workspaces/test/browser/workspaces.test.ts b/src/vs/workbench/services/workspaces/test/browser/workspaces.test.ts
index 166b616d4c5..9087ba341d7 100644
--- a/src/vs/workbench/services/workspaces/test/browser/workspaces.test.ts
+++ b/src/vs/workbench/services/workspaces/test/browser/workspaces.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { getWorkspaceIdentifier, getSingleFolderWorkspaceIdentifier } from 'vs/workbench/services/workspaces/browser/workspaces';
+import { URI } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { getWorkspaceIdentifier, getSingleFolderWorkspaceIdentifier } from '../../browser/workspaces.js';
 
 suite('Workspaces', () => {
 	test('workspace identifiers are stable', function () {
diff --git a/src/vs/workbench/services/workspaces/test/common/workspaceTrust.test.ts b/src/vs/workbench/services/workspaces/test/common/workspaceTrust.test.ts
index 203cde08ee2..ec84971e6ee 100644
--- a/src/vs/workbench/services/workspaces/test/common/workspaceTrust.test.ts
+++ b/src/vs/workbench/services/workspaces/test/common/workspaceTrust.test.ts
@@ -4,25 +4,25 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { mock } from 'vs/base/test/common/mock';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IWorkspaceTrustEnablementService, IWorkspaceTrustInfo } from 'vs/platform/workspace/common/workspaceTrust';
-import { Workspace } from 'vs/platform/workspace/test/common/testWorkspace';
-import { Memento } from 'vs/workbench/common/memento';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { WorkspaceTrustEnablementService, WorkspaceTrustManagementService, WORKSPACE_TRUST_STORAGE_KEY } from 'vs/workbench/services/workspaces/common/workspaceTrust';
-import { TestContextService, TestStorageService, TestWorkspaceTrustEnablementService } from 'vs/workbench/test/common/workbenchTestServices';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { URI } from '../../../../../base/common/uri.js';
+import { mock } from '../../../../../base/test/common/mock.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { FileService } from '../../../../../platform/files/common/fileService.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { NullLogService } from '../../../../../platform/log/common/log.js';
+import { IRemoteAuthorityResolverService } from '../../../../../platform/remote/common/remoteAuthorityResolver.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { IWorkspaceTrustEnablementService, IWorkspaceTrustInfo } from '../../../../../platform/workspace/common/workspaceTrust.js';
+import { Workspace } from '../../../../../platform/workspace/test/common/testWorkspace.js';
+import { Memento } from '../../../../common/memento.js';
+import { IWorkbenchEnvironmentService } from '../../../environment/common/environmentService.js';
+import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.js';
+import { UriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentityService.js';
+import { WorkspaceTrustEnablementService, WorkspaceTrustManagementService, WORKSPACE_TRUST_STORAGE_KEY } from '../../common/workspaceTrust.js';
+import { TestContextService, TestStorageService, TestWorkspaceTrustEnablementService } from '../../../../test/common/workbenchTestServices.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('Workspace Trust', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/test/browser/codeeditor.test.ts b/src/vs/workbench/test/browser/codeeditor.test.ts
index 59ac60e96ff..53f31bfdd95 100644
--- a/src/vs/workbench/test/browser/codeeditor.test.ts
+++ b/src/vs/workbench/test/browser/codeeditor.test.ts
@@ -4,28 +4,28 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { URI } from 'vs/base/common/uri';
-import { workbenchInstantiationService, TestEditorService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { LanguageService } from 'vs/editor/common/services/languageService';
-import { RangeHighlightDecorations } from 'vs/workbench/browser/codeeditor';
-import { TextModel } from 'vs/editor/common/model/textModel';
-import { createTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
-import { Range, IRange } from 'vs/editor/common/core/range';
-import { Position } from 'vs/editor/common/core/position';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { ModelService } from 'vs/editor/common/services/modelService';
-import { CoreNavigationCommands } from 'vs/editor/browser/coreCommands';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { TestInstantiationService } from '../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { URI } from '../../../base/common/uri.js';
+import { workbenchInstantiationService, TestEditorService } from './workbenchTestServices.js';
+import { IModelService } from '../../../editor/common/services/model.js';
+import { ILanguageService } from '../../../editor/common/languages/language.js';
+import { LanguageService } from '../../../editor/common/services/languageService.js';
+import { RangeHighlightDecorations } from '../../browser/codeeditor.js';
+import { TextModel } from '../../../editor/common/model/textModel.js';
+import { createTestCodeEditor } from '../../../editor/test/browser/testCodeEditor.js';
+import { Range, IRange } from '../../../editor/common/core/range.js';
+import { Position } from '../../../editor/common/core/position.js';
+import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../platform/configuration/test/common/testConfigurationService.js';
+import { ModelService } from '../../../editor/common/services/modelService.js';
+import { CoreNavigationCommands } from '../../../editor/browser/coreCommands.js';
+import { ICodeEditor } from '../../../editor/browser/editorBrowser.js';
+import { IEditorService } from '../../services/editor/common/editorService.js';
+import { createTextModel } from '../../../editor/test/common/testTextModel.js';
+import { IThemeService } from '../../../platform/theme/common/themeService.js';
+import { TestThemeService } from '../../../platform/theme/test/common/testThemeService.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../base/test/common/utils.js';
 
 suite('Editor - Range decorations', () => {
 
diff --git a/src/vs/workbench/test/browser/contributions.test.ts b/src/vs/workbench/test/browser/contributions.test.ts
index adb429673b1..6eb3087bbba 100644
--- a/src/vs/workbench/test/browser/contributions.test.ts
+++ b/src/vs/workbench/test/browser/contributions.test.ts
@@ -4,20 +4,20 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DeferredPromise } from 'vs/base/common/async';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { isCI } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { EditorPart } from 'vs/workbench/browser/parts/editor/editorPart';
-import { WorkbenchPhase, WorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
-import { EditorService } from 'vs/workbench/services/editor/browser/editorService';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { ITestInstantiationService, TestFileEditorInput, TestServiceAccessor, TestSingletonFileEditorInput, createEditorPart, registerTestEditor, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
+import { DeferredPromise } from '../../../base/common/async.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { isCI } from '../../../base/common/platform.js';
+import { URI } from '../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../base/test/common/utils.js';
+import { SyncDescriptor } from '../../../platform/instantiation/common/descriptors.js';
+import { ServiceCollection } from '../../../platform/instantiation/common/serviceCollection.js';
+import { EditorPart } from '../../browser/parts/editor/editorPart.js';
+import { WorkbenchPhase, WorkbenchContributionsRegistry } from '../../common/contributions.js';
+import { EditorService } from '../../services/editor/browser/editorService.js';
+import { IEditorGroupsService } from '../../services/editor/common/editorGroupsService.js';
+import { IEditorService, SIDE_GROUP } from '../../services/editor/common/editorService.js';
+import { LifecyclePhase } from '../../services/lifecycle/common/lifecycle.js';
+import { ITestInstantiationService, TestFileEditorInput, TestServiceAccessor, TestSingletonFileEditorInput, createEditorPart, registerTestEditor, workbenchInstantiationService } from './workbenchTestServices.js';
 
 suite('Contributions', () => {
 	const disposables = new DisposableStore();
diff --git a/src/vs/workbench/test/browser/part.test.ts b/src/vs/workbench/test/browser/part.test.ts
index 736ab2610f4..56f7ff4ec26 100644
--- a/src/vs/workbench/test/browser/part.test.ts
+++ b/src/vs/workbench/test/browser/part.test.ts
@@ -4,16 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Part } from 'vs/workbench/browser/part';
-import { isEmptyObject } from 'vs/base/common/types';
-import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
-import { append, $, hide } from 'vs/base/browser/dom';
-import { TestLayoutService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { mainWindow } from 'vs/base/browser/window';
+import { Part } from '../../browser/part.js';
+import { isEmptyObject } from '../../../base/common/types.js';
+import { TestThemeService } from '../../../platform/theme/test/common/testThemeService.js';
+import { append, $, hide } from '../../../base/browser/dom.js';
+import { TestLayoutService } from './workbenchTestServices.js';
+import { StorageScope, StorageTarget } from '../../../platform/storage/common/storage.js';
+import { TestStorageService } from '../common/workbenchTestServices.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../base/test/common/utils.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { mainWindow } from '../../../base/browser/window.js';
 
 suite('Workbench parts', () => {
 
diff --git a/src/vs/workbench/test/browser/parts/editor/breadcrumbModel.test.ts b/src/vs/workbench/test/browser/parts/editor/breadcrumbModel.test.ts
index 2b68bdea2dd..8f672e07764 100644
--- a/src/vs/workbench/test/browser/parts/editor/breadcrumbModel.test.ts
+++ b/src/vs/workbench/test/browser/parts/editor/breadcrumbModel.test.ts
@@ -4,16 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { BreadcrumbsModel, FileElement } from 'vs/workbench/browser/parts/editor/breadcrumbsModel';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { FileKind } from 'vs/platform/files/common/files';
-import { TestContextService } from 'vs/workbench/test/common/workbenchTestServices';
-import { Workspace } from 'vs/platform/workspace/test/common/testWorkspace';
-import { mock } from 'vs/base/test/common/mock';
-import { IOutlineService } from 'vs/workbench/services/outline/browser/outline';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { URI } from '../../../../../base/common/uri.js';
+import { WorkspaceFolder } from '../../../../../platform/workspace/common/workspace.js';
+import { BreadcrumbsModel, FileElement } from '../../../../browser/parts/editor/breadcrumbsModel.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { FileKind } from '../../../../../platform/files/common/files.js';
+import { TestContextService } from '../../../common/workbenchTestServices.js';
+import { Workspace } from '../../../../../platform/workspace/test/common/testWorkspace.js';
+import { mock } from '../../../../../base/test/common/mock.js';
+import { IOutlineService } from '../../../../services/outline/browser/outline.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('Breadcrumb Model', function () {
 
diff --git a/src/vs/workbench/test/browser/parts/editor/diffEditorInput.test.ts b/src/vs/workbench/test/browser/parts/editor/diffEditorInput.test.ts
index 60d9d133981..a58f5d030c6 100644
--- a/src/vs/workbench/test/browser/parts/editor/diffEditorInput.test.ts
+++ b/src/vs/workbench/test/browser/parts/editor/diffEditorInput.test.ts
@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
-import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { EditorResourceAccessor, isDiffEditorInput, isResourceDiffEditorInput, isResourceSideBySideEditorInput, IUntypedEditorInput } from 'vs/workbench/common/editor';
-import { URI } from 'vs/base/common/uri';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { EditorInput } from '../../../../common/editor/editorInput.js';
+import { DiffEditorInput } from '../../../../common/editor/diffEditorInput.js';
+import { workbenchInstantiationService } from '../../workbenchTestServices.js';
+import { EditorResourceAccessor, isDiffEditorInput, isResourceDiffEditorInput, isResourceSideBySideEditorInput, IUntypedEditorInput } from '../../../../common/editor.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('Diff editor input', () => {
 
diff --git a/src/vs/workbench/test/browser/parts/editor/editor.test.ts b/src/vs/workbench/test/browser/parts/editor/editor.test.ts
index 00add777446..0cbe6f40526 100644
--- a/src/vs/workbench/test/browser/parts/editor/editor.test.ts
+++ b/src/vs/workbench/test/browser/parts/editor/editor.test.ts
@@ -4,24 +4,24 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { EditorResourceAccessor, SideBySideEditor, EditorInputWithPreferredResource, EditorInputCapabilities, isEditorIdentifier, IResourceDiffEditorInput, IUntitledTextResourceEditorInput, isResourceEditorInput, isUntitledResourceEditorInput, isResourceDiffEditorInput, isEditorInputWithOptionsAndGroup, EditorInputWithOptions, isEditorInputWithOptions, isEditorInput, EditorInputWithOptionsAndGroup, isResourceSideBySideEditorInput, IResourceSideBySideEditorInput, isTextEditorViewState, isResourceMergeEditorInput, IResourceMergeEditorInput } from 'vs/workbench/common/editor';
-import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
-import { URI } from 'vs/base/common/uri';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { workbenchInstantiationService, TestServiceAccessor, TestEditorInput, registerTestEditor, registerTestFileEditor, registerTestResourceEditor, TestFileEditorInput, createEditorPart, registerTestSideBySideEditor } from 'vs/workbench/test/browser/workbenchTestServices';
-import { Schemas } from 'vs/base/common/network';
-import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from 'vs/base/test/common/utils';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { whenEditorClosed } from 'vs/workbench/browser/editor';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { EditorService } from 'vs/workbench/services/editor/browser/editorService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditorInput';
-import { EditorResolution, IResourceEditorInput } from 'vs/platform/editor/common/editor';
-import { ICodeEditorViewState, IDiffEditorViewState } from 'vs/editor/common/editorCommon';
-import { Position } from 'vs/editor/common/core/position';
+import { EditorResourceAccessor, SideBySideEditor, EditorInputWithPreferredResource, EditorInputCapabilities, isEditorIdentifier, IResourceDiffEditorInput, IUntitledTextResourceEditorInput, isResourceEditorInput, isUntitledResourceEditorInput, isResourceDiffEditorInput, isEditorInputWithOptionsAndGroup, EditorInputWithOptions, isEditorInputWithOptions, isEditorInput, EditorInputWithOptionsAndGroup, isResourceSideBySideEditorInput, IResourceSideBySideEditorInput, isTextEditorViewState, isResourceMergeEditorInput, IResourceMergeEditorInput } from '../../../../common/editor.js';
+import { DiffEditorInput } from '../../../../common/editor/diffEditorInput.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { workbenchInstantiationService, TestServiceAccessor, TestEditorInput, registerTestEditor, registerTestFileEditor, registerTestResourceEditor, TestFileEditorInput, createEditorPart, registerTestSideBySideEditor } from '../../workbenchTestServices.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { UntitledTextEditorInput } from '../../../../services/untitled/common/untitledTextEditorInput.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from '../../../../../base/test/common/utils.js';
+import { SyncDescriptor } from '../../../../../platform/instantiation/common/descriptors.js';
+import { whenEditorClosed } from '../../../../browser/editor.js';
+import { IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
+import { EditorService } from '../../../../services/editor/browser/editorService.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { SideBySideEditorInput } from '../../../../common/editor/sideBySideEditorInput.js';
+import { EditorResolution, IResourceEditorInput } from '../../../../../platform/editor/common/editor.js';
+import { ICodeEditorViewState, IDiffEditorViewState } from '../../../../../editor/common/editorCommon.js';
+import { Position } from '../../../../../editor/common/core/position.js';
 
 suite('Workbench editor utils', () => {
 
diff --git a/src/vs/workbench/test/browser/parts/editor/editorCommandsContext.test.ts b/src/vs/workbench/test/browser/parts/editor/editorCommandsContext.test.ts
new file mode 100644
index 00000000000..dfb6dbb09a2
--- /dev/null
+++ b/src/vs/workbench/test/browser/parts/editor/editorCommandsContext.test.ts
@@ -0,0 +1,188 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { workbenchInstantiationService, TestServiceAccessor, registerTestEditor, registerTestFileEditor, registerTestResourceEditor, TestFileEditorInput, createEditorPart, registerTestSideBySideEditor, TestEditorInput } from '../../workbenchTestServices.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { SyncDescriptor } from '../../../../../platform/instantiation/common/descriptors.js';
+import { GroupDirection, IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
+import { EditorService } from '../../../../services/editor/browser/editorService.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { EditorInput } from '../../../../common/editor/editorInput.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { resolveCommandsContext } from '../../../../browser/parts/editor/editorCommandsContext.js';
+import { IEditorCommandsContext } from '../../../../common/editor.js';
+import { IListService, WorkbenchListWidget } from '../../../../../platform/list/browser/listService.js';
+
+class TestListService implements IListService {
+	declare readonly _serviceBrand: undefined;
+	readonly lastFocusedList: WorkbenchListWidget | undefined = undefined;
+}
+
+suite('Resolving Editor Commands Context', () => {
+
+	const disposables = new DisposableStore();
+
+	const TEST_EDITOR_ID = 'MyTestEditorForEditors';
+
+	let instantiationService: IInstantiationService;
+	let accessor: TestServiceAccessor;
+
+	const testListService = new TestListService();
+
+	setup(() => {
+		instantiationService = workbenchInstantiationService(undefined, disposables);
+		accessor = instantiationService.createInstance(TestServiceAccessor);
+
+		disposables.add(accessor.untitledTextEditorService);
+		disposables.add(registerTestFileEditor());
+		disposables.add(registerTestSideBySideEditor());
+		disposables.add(registerTestResourceEditor());
+		disposables.add(registerTestEditor(TEST_EDITOR_ID, [new SyncDescriptor(TestFileEditorInput)]));
+	});
+
+	teardown(() => {
+		disposables.clear();
+	});
+
+	let index = 0;
+	function input(id = String(index++)): EditorInput {
+		return disposables.add(new TestEditorInput(URI.parse(`file://${id}`), 'testInput'));
+	}
+
+	async function createServices(): Promise<TestServiceAccessor> {
+		const instantiationService = workbenchInstantiationService(undefined, disposables);
+
+		const part = await createEditorPart(instantiationService, disposables);
+		instantiationService.stub(IEditorGroupsService, part);
+
+		const editorService = disposables.add(instantiationService.createInstance(EditorService, undefined));
+		instantiationService.stub(IEditorService, editorService);
+
+		return instantiationService.createInstance(TestServiceAccessor);
+	}
+
+	test('use editor group selection', async () => {
+		const accessor = await createServices();
+		const activeGroup = accessor.editorGroupService.activeGroup;
+
+		const input1 = input();
+		const input2 = input();
+		const input3 = input();
+		activeGroup.openEditor(input1, { pinned: true });
+		activeGroup.openEditor(input2, { pinned: true });
+		activeGroup.openEditor(input3, { pinned: true });
+
+		activeGroup.setSelection(input1, [input2]);
+
+		// use editor commands context
+		const editorCommandContext: IEditorCommandsContext = { groupId: activeGroup.id, editorIndex: activeGroup.getIndexOfEditor(input1), preserveFocus: true };
+		const resolvedContext1 = resolveCommandsContext([editorCommandContext], accessor.editorService, accessor.editorGroupService, testListService);
+
+		assert.strictEqual(resolvedContext1.groupedEditors.length, 1);
+		assert.strictEqual(resolvedContext1.groupedEditors[0].group.id, activeGroup.id);
+		assert.strictEqual(resolvedContext1.groupedEditors[0].editors.length, 2);
+		assert.strictEqual(resolvedContext1.groupedEditors[0].editors[0], input1);
+		assert.strictEqual(resolvedContext1.groupedEditors[0].editors[1], input2);
+		assert.strictEqual(resolvedContext1.preserveFocus, true);
+
+		// use URI
+		const resolvedContext2 = resolveCommandsContext([input2.resource], accessor.editorService, accessor.editorGroupService, testListService);
+
+		assert.strictEqual(resolvedContext2.groupedEditors.length, 1);
+		assert.strictEqual(resolvedContext2.groupedEditors[0].group.id, activeGroup.id);
+		assert.strictEqual(resolvedContext2.groupedEditors[0].editors.length, 2);
+		assert.strictEqual(resolvedContext2.groupedEditors[0].editors[0], input2);
+		assert.strictEqual(resolvedContext2.groupedEditors[0].editors[1], input1);
+		assert.strictEqual(resolvedContext2.preserveFocus, false);
+
+		// use URI and commandContext
+		const editor1CommandContext: IEditorCommandsContext = { groupId: activeGroup.id, editorIndex: activeGroup.getIndexOfEditor(input1), preserveFocus: true };
+		const resolvedContext3 = resolveCommandsContext([editor1CommandContext], accessor.editorService, accessor.editorGroupService, testListService);
+
+		assert.strictEqual(resolvedContext3.groupedEditors.length, 1);
+		assert.strictEqual(resolvedContext3.groupedEditors[0].group.id, activeGroup.id);
+		assert.strictEqual(resolvedContext3.groupedEditors[0].editors.length, 2);
+		assert.strictEqual(resolvedContext3.groupedEditors[0].editors[0], input1);
+		assert.strictEqual(resolvedContext3.groupedEditors[0].editors[1], input2);
+		assert.strictEqual(resolvedContext3.preserveFocus, true);
+	});
+
+	test('don\'t use editor group selection', async () => {
+		const accessor = await createServices();
+		const activeGroup = accessor.editorGroupService.activeGroup;
+
+		const input1 = input();
+		const input2 = input();
+		const input3 = input();
+		activeGroup.openEditor(input1, { pinned: true });
+		activeGroup.openEditor(input2, { pinned: true });
+		activeGroup.openEditor(input3, { pinned: true });
+
+		activeGroup.setSelection(input1, [input2]);
+
+		// use editor commands context
+		const editorCommandContext: IEditorCommandsContext = { groupId: activeGroup.id, editorIndex: activeGroup.getIndexOfEditor(input3), preserveFocus: true };
+		const resolvedContext1 = resolveCommandsContext([editorCommandContext], accessor.editorService, accessor.editorGroupService, testListService);
+
+		assert.strictEqual(resolvedContext1.groupedEditors.length, 1);
+		assert.strictEqual(resolvedContext1.groupedEditors[0].group.id, activeGroup.id);
+		assert.strictEqual(resolvedContext1.groupedEditors[0].editors.length, 1);
+		assert.strictEqual(resolvedContext1.groupedEditors[0].editors[0], input3);
+		assert.strictEqual(resolvedContext1.preserveFocus, true);
+
+		// use URI
+		const resolvedContext2 = resolveCommandsContext([input3.resource], accessor.editorService, accessor.editorGroupService, testListService);
+
+		assert.strictEqual(resolvedContext2.groupedEditors.length, 1);
+		assert.strictEqual(resolvedContext2.groupedEditors[0].group.id, activeGroup.id);
+		assert.strictEqual(resolvedContext2.groupedEditors[0].editors.length, 1);
+		assert.strictEqual(resolvedContext2.groupedEditors[0].editors[0], input3);
+		assert.strictEqual(resolvedContext2.preserveFocus, false);
+	});
+
+	test('inactive edior group command context', async () => {
+		const accessor = await createServices();
+		const editorGroupService = accessor.editorGroupService;
+
+		const group1 = editorGroupService.activeGroup;
+		const group2 = editorGroupService.addGroup(group1, GroupDirection.RIGHT);
+
+		const input11 = input();
+		const input12 = input();
+		group1.openEditor(input11, { pinned: true });
+		group1.openEditor(input12, { pinned: true });
+
+		const input21 = input();
+		group2.openEditor(input21, { pinned: true });
+
+		editorGroupService.activateGroup(group1);
+		group1.setSelection(input11, [input12]);
+
+		// use editor commands context of inactive group with editor index
+		const editorCommandContext1: IEditorCommandsContext = { groupId: group2.id, editorIndex: group2.getIndexOfEditor(input21), preserveFocus: true };
+		const resolvedContext1 = resolveCommandsContext([editorCommandContext1], accessor.editorService, accessor.editorGroupService, testListService);
+
+		assert.strictEqual(resolvedContext1.groupedEditors.length, 1);
+		assert.strictEqual(resolvedContext1.groupedEditors[0].group.id, group2.id);
+		assert.strictEqual(resolvedContext1.groupedEditors[0].editors.length, 1);
+		assert.strictEqual(resolvedContext1.groupedEditors[0].editors[0], input21);
+		assert.strictEqual(resolvedContext1.preserveFocus, true);
+
+		// use editor commands context of inactive group without editor index
+		const editorCommandContext2: IEditorCommandsContext = { groupId: group2.id, preserveFocus: true };
+		const resolvedContext2 = resolveCommandsContext([editorCommandContext2], accessor.editorService, accessor.editorGroupService, testListService);
+
+		assert.strictEqual(resolvedContext2.groupedEditors.length, 1);
+		assert.strictEqual(resolvedContext2.groupedEditors[0].group.id, group2.id);
+		assert.strictEqual(resolvedContext2.groupedEditors[0].editors.length, 1);
+		assert.strictEqual(resolvedContext1.groupedEditors[0].editors[0], input21);
+		assert.strictEqual(resolvedContext2.preserveFocus, true);
+	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+});
diff --git a/src/vs/workbench/test/browser/parts/editor/editorDiffModel.test.ts b/src/vs/workbench/test/browser/parts/editor/editorDiffModel.test.ts
index a2047327ff1..6012e4ee8f0 100644
--- a/src/vs/workbench/test/browser/parts/editor/editorDiffModel.test.ts
+++ b/src/vs/workbench/test/browser/parts/editor/editorDiffModel.test.ts
@@ -4,15 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { TextDiffEditorModel } from 'vs/workbench/common/editor/textDiffEditorModel';
-import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
-import { TextResourceEditorInput } from 'vs/workbench/common/editor/textResourceEditorInput';
-import { URI } from 'vs/base/common/uri';
-import { workbenchInstantiationService, TestServiceAccessor } from 'vs/workbench/test/browser/workbenchTestServices';
-import { ITextModel } from 'vs/editor/common/model';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { TextDiffEditorModel } from '../../../../common/editor/textDiffEditorModel.js';
+import { DiffEditorInput } from '../../../../common/editor/diffEditorInput.js';
+import { TextResourceEditorInput } from '../../../../common/editor/textResourceEditorInput.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { workbenchInstantiationService, TestServiceAccessor } from '../../workbenchTestServices.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('TextDiffEditorModel', () => {
 
diff --git a/src/vs/workbench/test/browser/parts/editor/editorGroupModel.test.ts b/src/vs/workbench/test/browser/parts/editor/editorGroupModel.test.ts
index f87bac4abaa..30c8430e655 100644
--- a/src/vs/workbench/test/browser/parts/editor/editorGroupModel.test.ts
+++ b/src/vs/workbench/test/browser/parts/editor/editorGroupModel.test.ts
@@ -4,27 +4,27 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { EditorGroupModel, IGroupEditorChangeEvent, IGroupEditorCloseEvent, IGroupEditorMoveEvent, IGroupEditorOpenEvent, ISerializedEditorGroupModel, isGroupEditorChangeEvent, isGroupEditorCloseEvent, isGroupEditorMoveEvent, isGroupEditorOpenEvent } from 'vs/workbench/common/editor/editorGroupModel';
-import { EditorExtensions, IEditorFactoryRegistry, IFileEditorInput, IEditorSerializer, CloseDirection, EditorsOrder, IResourceDiffEditorInput, IResourceSideBySideEditorInput, SideBySideEditor, EditorCloseContext, GroupModelChangeKind } from 'vs/workbench/common/editor';
-import { URI } from 'vs/base/common/uri';
-import { TestLifecycleService, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
-import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { TestContextService, TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditorInput';
-import { isEqual } from 'vs/base/common/resources';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { EditorGroupModel, IGroupEditorChangeEvent, IGroupEditorCloseEvent, IGroupEditorMoveEvent, IGroupEditorOpenEvent, ISerializedEditorGroupModel, isGroupEditorChangeEvent, isGroupEditorCloseEvent, isGroupEditorMoveEvent, isGroupEditorOpenEvent } from '../../../../common/editor/editorGroupModel.js';
+import { EditorExtensions, IEditorFactoryRegistry, IFileEditorInput, IEditorSerializer, CloseDirection, EditorsOrder, IResourceDiffEditorInput, IResourceSideBySideEditorInput, SideBySideEditor, EditorCloseContext, GroupModelChangeKind } from '../../../../common/editor.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { TestLifecycleService, workbenchInstantiationService } from '../../workbenchTestServices.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { ILifecycleService } from '../../../../services/lifecycle/common/lifecycle.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { Registry } from '../../../../../platform/registry/common/platform.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { NullTelemetryService } from '../../../../../platform/telemetry/common/telemetryUtils.js';
+import { DiffEditorInput } from '../../../../common/editor/diffEditorInput.js';
+import { IStorageService } from '../../../../../platform/storage/common/storage.js';
+import { DisposableStore, IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { TestContextService, TestStorageService } from '../../../common/workbenchTestServices.js';
+import { EditorInput } from '../../../../common/editor/editorInput.js';
+import { SideBySideEditorInput } from '../../../../common/editor/sideBySideEditorInput.js';
+import { isEqual } from '../../../../../base/common/resources.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('EditorGroupModel', () => {
 
diff --git a/src/vs/workbench/test/browser/parts/editor/editorInput.test.ts b/src/vs/workbench/test/browser/parts/editor/editorInput.test.ts
index e66b98bd3ad..c33c87a80f4 100644
--- a/src/vs/workbench/test/browser/parts/editor/editorInput.test.ts
+++ b/src/vs/workbench/test/browser/parts/editor/editorInput.test.ts
@@ -4,20 +4,20 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { IResourceEditorInput, ITextResourceEditorInput } from 'vs/platform/editor/common/editor';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { DEFAULT_EDITOR_ASSOCIATION, IResourceDiffEditorInput, IResourceMergeEditorInput, IResourceSideBySideEditorInput, isEditorInput, isResourceDiffEditorInput, isResourceEditorInput, isResourceMergeEditorInput, isResourceSideBySideEditorInput, isUntitledResourceEditorInput, IUntitledTextResourceEditorInput } from 'vs/workbench/common/editor';
-import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { TextResourceEditorInput } from 'vs/workbench/common/editor/textResourceEditorInput';
-import { FileEditorInput } from 'vs/workbench/contrib/files/browser/editors/fileEditorInput';
-import { MergeEditorInput, MergeEditorInputData } from 'vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
-import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
-import { TestEditorInput, TestServiceAccessor, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IResourceEditorInput, ITextResourceEditorInput } from '../../../../../platform/editor/common/editor.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { DEFAULT_EDITOR_ASSOCIATION, IResourceDiffEditorInput, IResourceMergeEditorInput, IResourceSideBySideEditorInput, isEditorInput, isResourceDiffEditorInput, isResourceEditorInput, isResourceMergeEditorInput, isResourceSideBySideEditorInput, isUntitledResourceEditorInput, IUntitledTextResourceEditorInput } from '../../../../common/editor.js';
+import { DiffEditorInput } from '../../../../common/editor/diffEditorInput.js';
+import { EditorInput } from '../../../../common/editor/editorInput.js';
+import { TextResourceEditorInput } from '../../../../common/editor/textResourceEditorInput.js';
+import { FileEditorInput } from '../../../../contrib/files/browser/editors/fileEditorInput.js';
+import { MergeEditorInput, MergeEditorInputData } from '../../../../contrib/mergeEditor/browser/mergeEditorInput.js';
+import { UntitledTextEditorInput } from '../../../../services/untitled/common/untitledTextEditorInput.js';
+import { TestEditorInput, TestServiceAccessor, workbenchInstantiationService } from '../../workbenchTestServices.js';
 
 suite('EditorInput', () => {
 
diff --git a/src/vs/workbench/test/browser/parts/editor/editorModel.test.ts b/src/vs/workbench/test/browser/parts/editor/editorModel.test.ts
index 05cc0e521e6..61b31675a4f 100644
--- a/src/vs/workbench/test/browser/parts/editor/editorModel.test.ts
+++ b/src/vs/workbench/test/browser/parts/editor/editorModel.test.ts
@@ -4,39 +4,39 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { BaseTextEditorModel } from 'vs/workbench/common/editor/textEditorModel';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { LanguageService } from 'vs/editor/common/services/languageService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { ModelService } from 'vs/editor/common/services/modelService';
-import { ITextBufferFactory } from 'vs/editor/common/model';
-import { URI } from 'vs/base/common/uri';
-import { createTextBufferFactory } from 'vs/editor/common/model/textModel';
-import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfiguration';
-import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
-import { UndoRedoService } from 'vs/platform/undoRedo/common/undoRedoService';
-import { TestDialogService } from 'vs/platform/dialogs/test/common/testDialogService';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { TestStorageService, TestTextResourcePropertiesService } from 'vs/workbench/test/common/workbenchTestServices';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
-import { EditorModel } from 'vs/workbench/common/editor/editorModel';
-import { Mimes } from 'vs/base/common/mime';
-import { LanguageDetectionService } from 'vs/workbench/services/languageDetection/browser/languageDetectionWorkerServiceImpl';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { TestEditorService, TestEnvironmentService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { TestLanguageConfigurationService } from 'vs/editor/test/common/modes/testLanguageConfigurationService';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { TestAccessibilityService } from 'vs/platform/accessibility/test/common/testAccessibilityService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { BaseTextEditorModel } from '../../../../common/editor/textEditorModel.js';
+import { IModelService } from '../../../../../editor/common/services/model.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
+import { LanguageService } from '../../../../../editor/common/services/languageService.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { ModelService } from '../../../../../editor/common/services/modelService.js';
+import { ITextBufferFactory } from '../../../../../editor/common/model.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { createTextBufferFactory } from '../../../../../editor/common/model/textModel.js';
+import { ITextResourcePropertiesService } from '../../../../../editor/common/services/textResourceConfiguration.js';
+import { IUndoRedoService } from '../../../../../platform/undoRedo/common/undoRedo.js';
+import { UndoRedoService } from '../../../../../platform/undoRedo/common/undoRedoService.js';
+import { TestDialogService } from '../../../../../platform/dialogs/test/common/testDialogService.js';
+import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
+import { TestNotificationService } from '../../../../../platform/notification/test/common/testNotificationService.js';
+import { INotificationService } from '../../../../../platform/notification/common/notification.js';
+import { TestStorageService, TestTextResourcePropertiesService } from '../../../common/workbenchTestServices.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { TestThemeService } from '../../../../../platform/theme/test/common/testThemeService.js';
+import { EditorModel } from '../../../../common/editor/editorModel.js';
+import { Mimes } from '../../../../../base/common/mime.js';
+import { LanguageDetectionService } from '../../../../services/languageDetection/browser/languageDetectionWorkerServiceImpl.js';
+import { IWorkbenchEnvironmentService } from '../../../../services/environment/common/environmentService.js';
+import { TestEditorService, TestEnvironmentService } from '../../workbenchTestServices.js';
+import { TestLanguageConfigurationService } from '../../../../../editor/test/common/modes/testLanguageConfigurationService.js';
+import { ILanguageConfigurationService } from '../../../../../editor/common/languages/languageConfigurationRegistry.js';
+import { TestAccessibilityService } from '../../../../../platform/accessibility/test/common/testAccessibilityService.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { IStorageService } from '../../../../../platform/storage/common/storage.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('EditorModel', () => {
 
diff --git a/src/vs/workbench/test/browser/parts/editor/editorPane.test.ts b/src/vs/workbench/test/browser/parts/editor/editorPane.test.ts
index 2aae30b5243..61a788e39ac 100644
--- a/src/vs/workbench/test/browser/parts/editor/editorPane.test.ts
+++ b/src/vs/workbench/test/browser/parts/editor/editorPane.test.ts
@@ -4,30 +4,30 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { EditorPane, EditorMemento } from 'vs/workbench/browser/parts/editor/editorPane';
-import { WorkspaceTrustRequiredPlaceholderEditor } from 'vs/workbench/browser/parts/editor/editorPlaceholder';
-import { IEditorSerializer, IEditorFactoryRegistry, EditorExtensions, EditorInputCapabilities, IEditorDescriptor, IEditorPane } from 'vs/workbench/common/editor';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
-import { workbenchInstantiationService, TestEditorGroupView, TestEditorGroupsService, registerTestResourceEditor, TestEditorInput, createEditorPart, TestTextResourceConfigurationService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { TextResourceEditorInput } from 'vs/workbench/common/editor/textResourceEditorInput';
-import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
-import { URI } from 'vs/base/common/uri';
-import { EditorPaneDescriptor, EditorPaneRegistry } from 'vs/workbench/browser/editor';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { TestStorageService, TestWorkspaceTrustManagementService } from 'vs/workbench/test/common/workbenchTestServices';
-import { extUri } from 'vs/base/common/resources';
-import { EditorService } from 'vs/workbench/services/editor/browser/editorService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IWorkspaceTrustManagementService } from 'vs/platform/workspace/common/workspaceTrust';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { EditorPane, EditorMemento } from '../../../../browser/parts/editor/editorPane.js';
+import { WorkspaceTrustRequiredPlaceholderEditor } from '../../../../browser/parts/editor/editorPlaceholder.js';
+import { IEditorSerializer, IEditorFactoryRegistry, EditorExtensions, EditorInputCapabilities, IEditorDescriptor, IEditorPane } from '../../../../common/editor.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { Registry } from '../../../../../platform/registry/common/platform.js';
+import { SyncDescriptor } from '../../../../../platform/instantiation/common/descriptors.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { NullTelemetryService } from '../../../../../platform/telemetry/common/telemetryUtils.js';
+import { workbenchInstantiationService, TestEditorGroupView, TestEditorGroupsService, registerTestResourceEditor, TestEditorInput, createEditorPart, TestTextResourceConfigurationService } from '../../workbenchTestServices.js';
+import { TextResourceEditorInput } from '../../../../common/editor/textResourceEditorInput.js';
+import { TestThemeService } from '../../../../../platform/theme/test/common/testThemeService.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { EditorPaneDescriptor, EditorPaneRegistry } from '../../../../browser/editor.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { DisposableStore, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { TestStorageService, TestWorkspaceTrustManagementService } from '../../../common/workbenchTestServices.js';
+import { extUri } from '../../../../../base/common/resources.js';
+import { EditorService } from '../../../../services/editor/browser/editorService.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { IEditorGroup, IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
+import { IWorkspaceTrustManagementService } from '../../../../../platform/workspace/common/workspaceTrust.js';
+import { EditorInput } from '../../../../common/editor/editorInput.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 const NullThemeService = new TestThemeService();
 
diff --git a/src/vs/workbench/test/browser/parts/editor/filteredEditorGroupModel.test.ts b/src/vs/workbench/test/browser/parts/editor/filteredEditorGroupModel.test.ts
index 53db7729f74..c4fef60fd15 100644
--- a/src/vs/workbench/test/browser/parts/editor/filteredEditorGroupModel.test.ts
+++ b/src/vs/workbench/test/browser/parts/editor/filteredEditorGroupModel.test.ts
@@ -4,26 +4,26 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { EditorGroupModel, ISerializedEditorGroupModel } from 'vs/workbench/common/editor/editorGroupModel';
-import { EditorExtensions, IEditorFactoryRegistry, IFileEditorInput, IEditorSerializer, EditorsOrder, GroupModelChangeKind } from 'vs/workbench/common/editor';
-import { URI } from 'vs/base/common/uri';
-import { TestLifecycleService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { TestContextService, TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { isEqual } from 'vs/base/common/resources';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { StickyEditorGroupModel, UnstickyEditorGroupModel } from 'vs/workbench/common/editor/filteredEditorGroupModel';
+import { EditorGroupModel, ISerializedEditorGroupModel } from '../../../../common/editor/editorGroupModel.js';
+import { EditorExtensions, IEditorFactoryRegistry, IFileEditorInput, IEditorSerializer, EditorsOrder, GroupModelChangeKind } from '../../../../common/editor.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { TestLifecycleService } from '../../workbenchTestServices.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { ILifecycleService } from '../../../../services/lifecycle/common/lifecycle.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { Registry } from '../../../../../platform/registry/common/platform.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { NullTelemetryService } from '../../../../../platform/telemetry/common/telemetryUtils.js';
+import { IStorageService } from '../../../../../platform/storage/common/storage.js';
+import { DisposableStore, IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { TestContextService, TestStorageService } from '../../../common/workbenchTestServices.js';
+import { EditorInput } from '../../../../common/editor/editorInput.js';
+import { isEqual } from '../../../../../base/common/resources.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { StickyEditorGroupModel, UnstickyEditorGroupModel } from '../../../../common/editor/filteredEditorGroupModel.js';
 
 suite('FilteredEditorGroupModel', () => {
 
diff --git a/src/vs/workbench/test/browser/parts/editor/resourceEditorInput.test.ts b/src/vs/workbench/test/browser/parts/editor/resourceEditorInput.test.ts
index c3dd4fd67a8..723cd23f391 100644
--- a/src/vs/workbench/test/browser/parts/editor/resourceEditorInput.test.ts
+++ b/src/vs/workbench/test/browser/parts/editor/resourceEditorInput.test.ts
@@ -4,21 +4,21 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { AbstractResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { IFileService } from 'vs/platform/files/common/files';
-import { EditorInputCapabilities, Verbosity } from 'vs/workbench/common/editor';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { CustomEditorLabelService, ICustomEditorLabelService } from 'vs/workbench/services/editor/common/customEditorLabelService';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { URI } from '../../../../../base/common/uri.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { workbenchInstantiationService } from '../../workbenchTestServices.js';
+import { AbstractResourceEditorInput } from '../../../../common/editor/resourceEditorInput.js';
+import { ILabelService } from '../../../../../platform/label/common/label.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { EditorInputCapabilities, Verbosity } from '../../../../common/editor.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { IFilesConfigurationService } from '../../../../services/filesConfiguration/common/filesConfigurationService.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { ITextResourceConfigurationService } from '../../../../../editor/common/services/textResourceConfiguration.js';
+import { ConfigurationTarget, IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { CustomEditorLabelService, ICustomEditorLabelService } from '../../../../services/editor/common/customEditorLabelService.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
 
 suite('ResourceEditorInput', () => {
 
diff --git a/src/vs/workbench/test/browser/parts/editor/sideBySideEditorInput.test.ts b/src/vs/workbench/test/browser/parts/editor/sideBySideEditorInput.test.ts
index 4be1b5c4fc4..dfe9d70f1dd 100644
--- a/src/vs/workbench/test/browser/parts/editor/sideBySideEditorInput.test.ts
+++ b/src/vs/workbench/test/browser/parts/editor/sideBySideEditorInput.test.ts
@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { EditorResourceAccessor, IResourceSideBySideEditorInput, isResourceSideBySideEditorInput, isSideBySideEditorInput, IUntypedEditorInput } from 'vs/workbench/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditorInput';
-import { TestFileEditorInput, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { EditorResourceAccessor, IResourceSideBySideEditorInput, isResourceSideBySideEditorInput, isSideBySideEditorInput, IUntypedEditorInput } from '../../../../common/editor.js';
+import { EditorInput } from '../../../../common/editor/editorInput.js';
+import { SideBySideEditorInput } from '../../../../common/editor/sideBySideEditorInput.js';
+import { TestFileEditorInput, workbenchInstantiationService } from '../../workbenchTestServices.js';
 
 suite('SideBySideEditorInput', () => {
 
diff --git a/src/vs/workbench/test/browser/parts/editor/textEditorPane.test.ts b/src/vs/workbench/test/browser/parts/editor/textEditorPane.test.ts
index a13dc9884dc..cb432e8737b 100644
--- a/src/vs/workbench/test/browser/parts/editor/textEditorPane.test.ts
+++ b/src/vs/workbench/test/browser/parts/editor/textEditorPane.test.ts
@@ -4,18 +4,18 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from 'vs/base/test/common/utils';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { workbenchInstantiationService, TestServiceAccessor, registerTestFileEditor, createEditorPart, TestTextFileEditor } from 'vs/workbench/test/browser/workbenchTestServices';
-import { IResolvedTextFileEditorModel } from 'vs/workbench/services/textfile/common/textfiles';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { EditorService } from 'vs/workbench/services/editor/browser/editorService';
-import { EditorPaneSelectionChangeReason, EditorPaneSelectionCompareResult, IEditorPaneSelectionChangeEvent, isEditorPaneWithSelection } from 'vs/workbench/common/editor';
-import { DeferredPromise } from 'vs/base/common/async';
-import { TextEditorPaneSelection } from 'vs/workbench/browser/parts/editor/textEditor';
-import { Selection } from 'vs/editor/common/core/selection';
-import { IEditorOptions } from 'vs/platform/editor/common/editor';
+import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from '../../../../../base/test/common/utils.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { workbenchInstantiationService, TestServiceAccessor, registerTestFileEditor, createEditorPart, TestTextFileEditor } from '../../workbenchTestServices.js';
+import { IResolvedTextFileEditorModel } from '../../../../services/textfile/common/textfiles.js';
+import { IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { EditorService } from '../../../../services/editor/browser/editorService.js';
+import { EditorPaneSelectionChangeReason, EditorPaneSelectionCompareResult, IEditorPaneSelectionChangeEvent, isEditorPaneWithSelection } from '../../../../common/editor.js';
+import { DeferredPromise } from '../../../../../base/common/async.js';
+import { TextEditorPaneSelection } from '../../../../browser/parts/editor/textEditor.js';
+import { Selection } from '../../../../../editor/common/core/selection.js';
+import { IEditorOptions } from '../../../../../platform/editor/common/editor.js';
 
 suite('TextEditorPane', () => {
 
diff --git a/src/vs/workbench/test/browser/parts/editor/textResourceEditorInput.test.ts b/src/vs/workbench/test/browser/parts/editor/textResourceEditorInput.test.ts
index 24d70f5a76e..7a675a10037 100644
--- a/src/vs/workbench/test/browser/parts/editor/textResourceEditorInput.test.ts
+++ b/src/vs/workbench/test/browser/parts/editor/textResourceEditorInput.test.ts
@@ -4,15 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { URI } from 'vs/base/common/uri';
-import { TextResourceEditorInput } from 'vs/workbench/common/editor/textResourceEditorInput';
-import { TextResourceEditorModel } from 'vs/workbench/common/editor/textResourceEditorModel';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { workbenchInstantiationService, TestServiceAccessor } from 'vs/workbench/test/browser/workbenchTestServices';
-import { snapshotToString } from 'vs/workbench/services/textfile/common/textfiles';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { URI } from '../../../../../base/common/uri.js';
+import { TextResourceEditorInput } from '../../../../common/editor/textResourceEditorInput.js';
+import { TextResourceEditorModel } from '../../../../common/editor/textResourceEditorModel.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { workbenchInstantiationService, TestServiceAccessor } from '../../workbenchTestServices.js';
+import { snapshotToString } from '../../../../services/textfile/common/textfiles.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../../../../../editor/common/languages/modesRegistry.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 suite('TextResourceEditorInput', () => {
 
diff --git a/src/vs/workbench/test/browser/parts/statusbar/statusbarModel.test.ts b/src/vs/workbench/test/browser/parts/statusbar/statusbarModel.test.ts
index 67a0a5140e1..c0a79706de5 100644
--- a/src/vs/workbench/test/browser/parts/statusbar/statusbarModel.test.ts
+++ b/src/vs/workbench/test/browser/parts/statusbar/statusbarModel.test.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { StatusbarViewModel } from 'vs/workbench/browser/parts/statusbar/statusbarModel';
-import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
-import { StatusbarAlignment } from 'vs/workbench/services/statusbar/browser/statusbar';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import { StatusbarViewModel } from '../../../../browser/parts/statusbar/statusbarModel.js';
+import { TestStorageService } from '../../../common/workbenchTestServices.js';
+import { StatusbarAlignment } from '../../../../services/statusbar/browser/statusbar.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
 
 suite('Workbench status bar model', () => {
 
diff --git a/src/vs/workbench/test/browser/quickAccess.test.ts b/src/vs/workbench/test/browser/quickAccess.test.ts
index 49c78111274..49d979098eb 100644
--- a/src/vs/workbench/test/browser/quickAccess.test.ts
+++ b/src/vs/workbench/test/browser/quickAccess.test.ts
@@ -4,22 +4,22 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IQuickAccessRegistry, Extensions, IQuickAccessProvider, QuickAccessRegistry } from 'vs/platform/quickinput/common/quickAccess';
-import { IQuickPick, IQuickPickItem, IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { TestServiceAccessor, workbenchInstantiationService, createEditorPart } from 'vs/workbench/test/browser/workbenchTestServices';
-import { DisposableStore, toDisposable, IDisposable } from 'vs/base/common/lifecycle';
-import { timeout } from 'vs/base/common/async';
-import { PickerQuickAccessProvider, FastAndSlowPicks } from 'vs/platform/quickinput/browser/pickerQuickAccess';
-import { URI } from 'vs/base/common/uri';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { EditorService } from 'vs/workbench/services/editor/browser/editorService';
-import { PickerEditorState } from 'vs/workbench/browser/quickaccess';
-import { EditorsOrder } from 'vs/workbench/common/editor';
-import { Range } from 'vs/editor/common/core/range';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
+import { Registry } from '../../../platform/registry/common/platform.js';
+import { IQuickAccessRegistry, Extensions, IQuickAccessProvider, QuickAccessRegistry } from '../../../platform/quickinput/common/quickAccess.js';
+import { IQuickPick, IQuickPickItem, IQuickInputService } from '../../../platform/quickinput/common/quickInput.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { TestServiceAccessor, workbenchInstantiationService, createEditorPart } from './workbenchTestServices.js';
+import { DisposableStore, toDisposable, IDisposable } from '../../../base/common/lifecycle.js';
+import { timeout } from '../../../base/common/async.js';
+import { PickerQuickAccessProvider, FastAndSlowPicks } from '../../../platform/quickinput/browser/pickerQuickAccess.js';
+import { URI } from '../../../base/common/uri.js';
+import { IEditorGroupsService } from '../../services/editor/common/editorGroupsService.js';
+import { IEditorService } from '../../services/editor/common/editorService.js';
+import { EditorService } from '../../services/editor/browser/editorService.js';
+import { PickerEditorState } from '../../browser/quickaccess.js';
+import { EditorsOrder } from '../../common/editor.js';
+import { Range } from '../../../editor/common/core/range.js';
+import { TestInstantiationService } from '../../../platform/instantiation/test/common/instantiationServiceMock.js';
 
 suite('QuickAccess', () => {
 
@@ -47,7 +47,7 @@ suite('QuickAccess', () => {
 
 		constructor(@IQuickInputService private readonly quickInputService: IQuickInputService, disposables: DisposableStore) { }
 
-		provide(picker: IQuickPick<IQuickPickItem>, token: CancellationToken): IDisposable {
+		provide(picker: IQuickPick<IQuickPickItem, { useSeparators: true }>, token: CancellationToken): IDisposable {
 			assert.ok(picker);
 			providerDefaultCalled = true;
 			token.onCancellationRequested(() => providerDefaultCanceled = true);
@@ -60,7 +60,7 @@ suite('QuickAccess', () => {
 	}
 
 	class TestProvider1 implements IQuickAccessProvider {
-		provide(picker: IQuickPick<IQuickPickItem>, token: CancellationToken): IDisposable {
+		provide(picker: IQuickPick<IQuickPickItem, { useSeparators: true }>, token: CancellationToken): IDisposable {
 			assert.ok(picker);
 			provider1Called = true;
 			token.onCancellationRequested(() => provider1Canceled = true);
@@ -70,7 +70,7 @@ suite('QuickAccess', () => {
 	}
 
 	class TestProvider2 implements IQuickAccessProvider {
-		provide(picker: IQuickPick<IQuickPickItem>, token: CancellationToken): IDisposable {
+		provide(picker: IQuickPick<IQuickPickItem, { useSeparators: true }>, token: CancellationToken): IDisposable {
 			assert.ok(picker);
 			provider2Called = true;
 			token.onCancellationRequested(() => provider2Canceled = true);
@@ -80,7 +80,7 @@ suite('QuickAccess', () => {
 	}
 
 	class TestProvider3 implements IQuickAccessProvider {
-		provide(picker: IQuickPick<IQuickPickItem>, token: CancellationToken): IDisposable {
+		provide(picker: IQuickPick<IQuickPickItem, { useSeparators: true }>, token: CancellationToken): IDisposable {
 			assert.ok(picker);
 			provider3Called = true;
 			token.onCancellationRequested(() => provider3Canceled = true);
diff --git a/src/vs/workbench/test/browser/viewlet.test.ts b/src/vs/workbench/test/browser/viewlet.test.ts
index 0c970c81ce7..3ebeda6a4a1 100644
--- a/src/vs/workbench/test/browser/viewlet.test.ts
+++ b/src/vs/workbench/test/browser/viewlet.test.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { PaneCompositeDescriptor, Extensions, PaneCompositeRegistry, PaneComposite } from 'vs/workbench/browser/panecomposite';
-import { isFunction } from 'vs/base/common/types';
-import { IBoundarySashes } from 'vs/base/browser/ui/sash/sash';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { Registry } from '../../../platform/registry/common/platform.js';
+import { PaneCompositeDescriptor, Extensions, PaneCompositeRegistry, PaneComposite } from '../../browser/panecomposite.js';
+import { isFunction } from '../../../base/common/types.js';
+import { IBoundarySashes } from '../../../base/browser/ui/sash/sash.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../base/test/common/utils.js';
 
 suite('Viewlets', () => {
 
diff --git a/src/vs/workbench/test/browser/webview.test.ts b/src/vs/workbench/test/browser/webview.test.ts
index 31d546e934f..4cc711b8e0b 100644
--- a/src/vs/workbench/test/browser/webview.test.ts
+++ b/src/vs/workbench/test/browser/webview.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { parentOriginHash } from 'vs/base/browser/iframe';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { parentOriginHash } from '../../../base/browser/iframe.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../base/test/common/utils.js';
 
 suite('parentOriginHash', () => {
 
diff --git a/src/vs/workbench/test/browser/window.test.ts b/src/vs/workbench/test/browser/window.test.ts
index fe3c2ff236a..3ca9a390494 100644
--- a/src/vs/workbench/test/browser/window.test.ts
+++ b/src/vs/workbench/test/browser/window.test.ts
@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { IRegisteredCodeWindow } from 'vs/base/browser/dom';
-import { CodeWindow, mainWindow } from 'vs/base/browser/window';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { BaseWindow } from 'vs/workbench/browser/window';
-import { TestEnvironmentService, TestHostService } from 'vs/workbench/test/browser/workbenchTestServices';
+import { IRegisteredCodeWindow } from '../../../base/browser/dom.js';
+import { CodeWindow, mainWindow } from '../../../base/browser/window.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { runWithFakedTimers } from '../../../base/test/common/timeTravelScheduler.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../base/test/common/utils.js';
+import { BaseWindow } from '../../browser/window.js';
+import { TestEnvironmentService, TestHostService } from './workbenchTestServices.js';
 
 suite('Window', () => {
 
diff --git a/src/vs/workbench/test/browser/workbenchTestServices.ts b/src/vs/workbench/test/browser/workbenchTestServices.ts
index 5680778d5c8..b3d9993a23e 100644
--- a/src/vs/workbench/test/browser/workbenchTestServices.ts
+++ b/src/vs/workbench/test/browser/workbenchTestServices.ts
@@ -3,182 +3,185 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { FileEditorInput } from 'vs/workbench/contrib/files/browser/editors/fileEditorInput';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { basename, isEqual } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { ITelemetryData, ITelemetryService, TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { EditorInputWithOptions, IEditorIdentifier, IUntitledTextResourceEditorInput, IResourceDiffEditorInput, IEditorPane, IEditorCloseEvent, IEditorPartOptions, IRevertOptions, GroupIdentifier, EditorsOrder, IFileEditorInput, IEditorFactoryRegistry, IEditorSerializer, EditorExtensions, ISaveOptions, IMoveResult, ITextDiffEditorPane, IVisibleEditorPane, IEditorOpenContext, EditorExtensions as Extensions, EditorInputCapabilities, IUntypedEditorInput, IEditorWillMoveEvent, IEditorWillOpenEvent, IActiveEditorChangeEvent, EditorPaneSelectionChangeReason, IEditorPaneSelection, IToolbarActions } from 'vs/workbench/common/editor';
-import { EditorServiceImpl, IEditorGroupView, IEditorGroupsView, IEditorGroupTitleHeight, DEFAULT_EDITOR_PART_OPTIONS } from 'vs/workbench/browser/parts/editor/editor';
-import { Event, Emitter } from 'vs/base/common/event';
-import { IResolvedWorkingCopyBackup, IWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackup';
-import { IConfigurationService, ConfigurationTarget, IConfigurationValue } from 'vs/platform/configuration/common/configuration';
-import { IWorkbenchLayoutService, PanelAlignment, Parts, Position as PartPosition } from 'vs/workbench/services/layout/browser/layoutService';
-import { TextModelResolverService } from 'vs/workbench/services/textmodelResolver/common/textModelResolverService';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { IEditorOptions, IResourceEditorInput, IResourceEditorInputIdentifier, ITextResourceEditorInput, ITextEditorOptions } from 'vs/platform/editor/common/editor';
-import { IUntitledTextEditorService, UntitledTextEditorService } from 'vs/workbench/services/untitled/common/untitledTextEditorService';
-import { IWorkspaceContextService, IWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
-import { ILifecycleService, ShutdownReason, StartupKind, LifecyclePhase, WillShutdownEvent, BeforeShutdownErrorEvent, InternalBeforeShutdownEvent, IWillShutdownEventJoiner } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { FileOperationEvent, IFileService, IFileStat, IFileStatResult, FileChangesEvent, IResolveFileOptions, ICreateFileOptions, IFileSystemProvider, FileSystemProviderCapabilities, IFileChange, IWatchOptions, IStat, FileType, IFileDeleteOptions, IFileOverwriteOptions, IFileWriteOptions, IFileOpenOptions, IFileStatWithMetadata, IResolveMetadataFileOptions, IWriteFileOptions, IReadFileOptions, IFileContent, IFileStreamContent, FileOperationError, IFileSystemProviderWithFileReadStreamCapability, IFileReadStreamOptions, IReadFileStreamOptions, IFileSystemProviderCapabilitiesChangeEvent, IFileStatWithPartialMetadata, IFileSystemWatcher, IWatchOptionsWithCorrelation, IFileSystemProviderActivationEvent } from 'vs/platform/files/common/files';
-import { IModelService } from 'vs/editor/common/services/model';
-import { LanguageService } from 'vs/editor/common/services/languageService';
-import { ModelService } from 'vs/editor/common/services/modelService';
-import { IResourceEncoding, ITextFileService, IReadTextFileOptions, ITextFileStreamContent, IWriteTextFileOptions, ITextFileEditorModel, ITextFileEditorModelManager } from 'vs/workbench/services/textfile/common/textfiles';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IHistoryService } from 'vs/workbench/services/history/common/history';
-import { IInstantiationService, ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { MenuBarVisibility, IWindowOpenable, IOpenWindowOptions, IOpenEmptyWindowOptions } from 'vs/platform/window/common/window';
-import { TestWorkspace } from 'vs/platform/workspace/test/common/testWorkspace';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
-import { ITextResourceConfigurationService, ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfiguration';
-import { IPosition, Position as EditorPosition } from 'vs/editor/common/core/position';
-import { IMenuService, MenuId, IMenu, IMenuChangeEvent } from 'vs/platform/actions/common/actions';
-import { ContextKeyValue, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { MockContextKeyService, MockKeybindingService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { ITextBufferFactory, DefaultEndOfLine, EndOfLinePreference, ITextSnapshot } from 'vs/editor/common/model';
-import { Range } from 'vs/editor/common/core/range';
-import { IDialogService, IPickAndOpenOptions, ISaveDialogOptions, IOpenDialogOptions, IFileDialogService, ConfirmResult } from 'vs/platform/dialogs/common/dialogs';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IDecorationsService, IResourceDecorationChangeEvent, IDecoration, IDecorationData, IDecorationsProvider } from 'vs/workbench/services/decorations/common/decorations';
-import { IDisposable, toDisposable, Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { IEditorGroupsService, IEditorGroup, GroupsOrder, GroupsArrangement, GroupDirection, IMergeGroupOptions, IEditorReplacement, IFindGroupScope, EditorGroupLayout, ICloseEditorOptions, GroupOrientation, ICloseAllEditorsOptions, ICloseEditorsFilter, IEditorDropTargetDelegate, IEditorPart, IAuxiliaryEditorPart, IEditorGroupsContainer, IAuxiliaryEditorPartCreateEvent, IEditorWorkingSet, IEditorGroupContextKeyProvider, IEditorWorkingSetOptions } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorService, ISaveEditorsOptions, IRevertAllEditorsOptions, PreferredGroup, IEditorsChangeEvent, ISaveEditorsResult } from 'vs/workbench/services/editor/common/editorService';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { IEditorPaneRegistry, EditorPaneDescriptor } from 'vs/workbench/browser/editor';
-import { IDimension } from 'vs/base/browser/dom';
-import { ILoggerService, ILogService, NullLogService } from 'vs/platform/log/common/log';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { DeferredPromise, timeout } from 'vs/base/common/async';
-import { PaneComposite, PaneCompositeDescriptor } from 'vs/workbench/browser/panecomposite';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IProcessEnvironment, isLinux, isWindows, OperatingSystem } from 'vs/base/common/platform';
-import { LabelService } from 'vs/workbench/services/label/common/labelService';
-import { Part } from 'vs/workbench/browser/part';
-import { bufferToStream, VSBuffer, VSBufferReadable, VSBufferReadableStream } from 'vs/base/common/buffer';
-import { Schemas } from 'vs/base/common/network';
-import { IProductService } from 'vs/platform/product/common/productService';
-import product from 'vs/platform/product/common/product';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IWorkingCopyService, WorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
-import { IWorkingCopy, IWorkingCopyBackupMeta, IWorkingCopyIdentifier } from 'vs/workbench/services/workingCopy/common/workingCopy';
-import { IFilesConfigurationService, FilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { BrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { BrowserTextFileService } from 'vs/workbench/services/textfile/browser/browserTextFileService';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { createTextBufferFactoryFromStream } from 'vs/editor/common/model/textModel';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { Direction } from 'vs/base/browser/ui/grid/grid';
-import { IProgressService, IProgressOptions, IProgressWindowOptions, IProgressNotificationOptions, IProgressCompositeOptions, IProgress, IProgressStep, Progress, IProgressDialogOptions, IProgressIndicator } from 'vs/platform/progress/common/progress';
-import { IWorkingCopyFileService, WorkingCopyFileService } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
-import { UndoRedoService } from 'vs/platform/undoRedo/common/undoRedoService';
-import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
-import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { TestDialogService } from 'vs/platform/dialogs/test/common/testDialogService';
-import { CodeEditorService } from 'vs/workbench/services/editor/browser/codeEditorService';
-import { MainEditorPart } from 'vs/workbench/browser/parts/editor/editorPart';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IDiffEditor } from 'vs/editor/common/editorCommon';
-import { IInputBox, IInputOptions, IPickOptions, IQuickInputButton, IQuickInputService, IQuickNavigateConfiguration, IQuickPick, IQuickPickItem, IQuickWidget, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
-import { QuickInputService } from 'vs/workbench/services/quickinput/browser/quickInputService';
-import { IListService } from 'vs/platform/list/browser/listService';
-import { win32, posix } from 'vs/base/common/path';
-import { TestContextService, TestStorageService, TestTextResourcePropertiesService, TestExtensionService, TestProductService, createFileStat, TestLoggerService, TestWorkspaceTrustManagementService, TestWorkspaceTrustRequestService, TestMarkerService, TestHistoryService } from 'vs/workbench/test/common/workbenchTestServices';
-import { IView, ViewContainer, ViewContainerLocation } from 'vs/workbench/common/views';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { IPaneComposite } from 'vs/workbench/common/panecomposite';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
-import { newWriteableStream, ReadableStreamEvents } from 'vs/base/common/stream';
-import { EncodingOracle, IEncodingOverride } from 'vs/workbench/services/textfile/browser/textFileService';
-import { UTF16le, UTF16be, UTF8_with_bom } from 'vs/workbench/services/textfile/common/encoding';
-import { ColorScheme } from 'vs/platform/theme/common/theme';
-import { Iterable } from 'vs/base/common/iterator';
-import { InMemoryWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackupService';
-import { BrowserWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/browser/workingCopyBackupService';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { TextResourceEditor } from 'vs/workbench/browser/parts/editor/textResourceEditor';
-import { TestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
-import { TextFileEditor } from 'vs/workbench/contrib/files/browser/editors/textFileEditor';
-import { TextResourceEditorInput } from 'vs/workbench/common/editor/textResourceEditorInput';
-import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
-import { SideBySideEditor } from 'vs/workbench/browser/parts/editor/sideBySideEditor';
-import { IEnterWorkspaceResult, IRecent, IRecentlyOpened, IWorkspaceFolderCreationData, IWorkspacesService } from 'vs/platform/workspaces/common/workspaces';
-import { IWorkspaceTrustManagementService, IWorkspaceTrustRequestService } from 'vs/platform/workspace/common/workspaceTrust';
-import { IExtensionTerminalProfile, IShellLaunchConfig, ITerminalBackend, ITerminalLogService, ITerminalProfile, TerminalIcon, TerminalLocation, TerminalShellType } from 'vs/platform/terminal/common/terminal';
-import { ICreateTerminalOptions, IDeserializedTerminalEditorInput, ITerminalConfigurationService, ITerminalEditorService, ITerminalGroup, ITerminalGroupService, ITerminalInstance, ITerminalInstanceService, TerminalEditorLocation } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { assertIsDefined } from 'vs/base/common/types';
-import { IRegisterContributedProfileArgs, IShellLaunchConfigResolveOptions, ITerminalProfileProvider, ITerminalProfileResolverService, ITerminalProfileService } from 'vs/workbench/contrib/terminal/common/terminal';
-import { EditorResolverService } from 'vs/workbench/services/editor/browser/editorResolverService';
-import { FILE_EDITOR_INPUT_ID } from 'vs/workbench/contrib/files/common/files';
-import { IEditorResolverService } from 'vs/workbench/services/editor/common/editorResolverService';
-import { IWorkingCopyEditorService, WorkingCopyEditorService } from 'vs/workbench/services/workingCopy/common/workingCopyEditorService';
-import { IElevatedFileService } from 'vs/workbench/services/files/common/elevatedFileService';
-import { BrowserElevatedFileService } from 'vs/workbench/services/files/browser/elevatedFileService';
-import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { ResourceMap } from 'vs/base/common/map';
-import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditorInput';
-import { ITextEditorService, TextEditorService } from 'vs/workbench/services/textfile/common/textEditorService';
-import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { IPaneCompositePart } from 'vs/workbench/browser/parts/paneCompositePart';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { TestLanguageConfigurationService } from 'vs/editor/test/common/modes/testLanguageConfigurationService';
-import { TerminalEditorInput } from 'vs/workbench/contrib/terminal/browser/terminalEditorInput';
-import { IGroupModelChangeEvent } from 'vs/workbench/common/editor/editorGroupModel';
-import { env } from 'vs/base/common/process';
-import { isValidBasename } from 'vs/base/common/extpath';
-import { TestAccessibilityService } from 'vs/platform/accessibility/test/common/testAccessibilityService';
-import { ILanguageFeatureDebounceService, LanguageFeatureDebounceService } from 'vs/editor/common/services/languageFeatureDebounce';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { LanguageFeaturesService } from 'vs/editor/common/services/languageFeaturesService';
-import { TextEditorPaneSelection } from 'vs/workbench/browser/parts/editor/textEditor';
-import { Selection } from 'vs/editor/common/core/selection';
-import { IFolderBackupInfo, IWorkspaceBackupInfo } from 'vs/platform/backup/common/backup';
-import { TestEditorWorkerService } from 'vs/editor/test/common/services/testEditorWorkerService';
-import { IExtensionHostExitInfo, IRemoteAgentConnection, IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { ILanguageDetectionService } from 'vs/workbench/services/languageDetection/common/languageDetectionWorkerService';
-import { IDiagnosticInfoOptions, IDiagnosticInfo } from 'vs/platform/diagnostics/common/diagnostics';
-import { ExtensionType, IExtension, IExtensionDescription, IRelaxedExtensionManifest, TargetPlatform } from 'vs/platform/extensions/common/extensions';
-import { IRemoteAgentEnvironment } from 'vs/platform/remote/common/remoteAgentEnvironment';
-import { ILayoutOffsetInfo } from 'vs/platform/layout/browser/layoutService';
-import { IUserDataProfile, IUserDataProfilesService, toUserDataProfile, UserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { UserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfileService';
-import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { EnablementState, IResourceExtension, IScannedExtension, IWebExtensionsScannerService, IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { ILocalExtension, IGalleryExtension, InstallOptions, IExtensionIdentifier, UninstallOptions, IExtensionsControlManifest, IGalleryMetadata, IExtensionManagementParticipant, Metadata, InstallExtensionResult, InstallExtensionInfo } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { Codicon } from 'vs/base/common/codicons';
-import { IRemoteExtensionsScannerService } from 'vs/platform/remote/common/remoteExtensionsScanner';
-import { IRemoteSocketFactoryService, RemoteSocketFactoryService } from 'vs/platform/remote/common/remoteSocketFactoryService';
-import { EditorParts } from 'vs/workbench/browser/parts/editor/editorParts';
-import { mainWindow } from 'vs/base/browser/window';
-import { IMarkerService } from 'vs/platform/markers/common/markers';
-import { IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { IEditorPaneService } from 'vs/workbench/services/editor/common/editorPaneService';
-import { EditorPaneService } from 'vs/workbench/services/editor/browser/editorPaneService';
-import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { ContextViewService } from 'vs/platform/contextview/browser/contextViewService';
-import { CustomEditorLabelService, ICustomEditorLabelService } from 'vs/workbench/services/editor/common/customEditorLabelService';
-import { TerminalConfigurationService } from 'vs/workbench/contrib/terminal/browser/terminalConfigurationService';
-import { TerminalLogService } from 'vs/platform/terminal/common/terminalLogService';
-import { IEnvironmentVariableService } from 'vs/workbench/contrib/terminal/common/environmentVariable';
-import { EnvironmentVariableService } from 'vs/workbench/contrib/terminal/common/environmentVariableService';
-import { ContextMenuService } from 'vs/platform/contextview/browser/contextMenuService';
+import { FileEditorInput } from '../../contrib/files/browser/editors/fileEditorInput.js';
+import { TestInstantiationService } from '../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { basename, isEqual } from '../../../base/common/resources.js';
+import { URI } from '../../../base/common/uri.js';
+import { ITelemetryData, ITelemetryService, TelemetryLevel } from '../../../platform/telemetry/common/telemetry.js';
+import { NullTelemetryService } from '../../../platform/telemetry/common/telemetryUtils.js';
+import { EditorInput } from '../../common/editor/editorInput.js';
+import { EditorInputWithOptions, IEditorIdentifier, IUntitledTextResourceEditorInput, IResourceDiffEditorInput, IEditorPane, IEditorCloseEvent, IEditorPartOptions, IRevertOptions, GroupIdentifier, EditorsOrder, IFileEditorInput, IEditorFactoryRegistry, IEditorSerializer, EditorExtensions, ISaveOptions, IMoveResult, ITextDiffEditorPane, IVisibleEditorPane, IEditorOpenContext, EditorExtensions as Extensions, EditorInputCapabilities, IUntypedEditorInput, IEditorWillMoveEvent, IEditorWillOpenEvent, IActiveEditorChangeEvent, EditorPaneSelectionChangeReason, IEditorPaneSelection, IToolbarActions } from '../../common/editor.js';
+import { EditorServiceImpl, IEditorGroupView, IEditorGroupsView, IEditorGroupTitleHeight, DEFAULT_EDITOR_PART_OPTIONS } from '../../browser/parts/editor/editor.js';
+import { Event, Emitter } from '../../../base/common/event.js';
+import { IResolvedWorkingCopyBackup, IWorkingCopyBackupService } from '../../services/workingCopy/common/workingCopyBackup.js';
+import { IConfigurationService, ConfigurationTarget, IConfigurationValue } from '../../../platform/configuration/common/configuration.js';
+import { IWorkbenchLayoutService, PanelAlignment, Parts, Position as PartPosition } from '../../services/layout/browser/layoutService.js';
+import { TextModelResolverService } from '../../services/textmodelResolver/common/textModelResolverService.js';
+import { ITextModelService } from '../../../editor/common/services/resolverService.js';
+import { IEditorOptions, IResourceEditorInput, IResourceEditorInputIdentifier, ITextResourceEditorInput, ITextEditorOptions } from '../../../platform/editor/common/editor.js';
+import { IUntitledTextEditorService, UntitledTextEditorService } from '../../services/untitled/common/untitledTextEditorService.js';
+import { IWorkspaceContextService, IWorkspaceIdentifier } from '../../../platform/workspace/common/workspace.js';
+import { ILifecycleService, ShutdownReason, StartupKind, LifecyclePhase, WillShutdownEvent, BeforeShutdownErrorEvent, InternalBeforeShutdownEvent, IWillShutdownEventJoiner } from '../../services/lifecycle/common/lifecycle.js';
+import { ServiceCollection } from '../../../platform/instantiation/common/serviceCollection.js';
+import { FileOperationEvent, IFileService, IFileStat, IFileStatResult, FileChangesEvent, IResolveFileOptions, ICreateFileOptions, IFileSystemProvider, FileSystemProviderCapabilities, IFileChange, IWatchOptions, IStat, FileType, IFileDeleteOptions, IFileOverwriteOptions, IFileWriteOptions, IFileOpenOptions, IFileStatWithMetadata, IResolveMetadataFileOptions, IWriteFileOptions, IReadFileOptions, IFileContent, IFileStreamContent, FileOperationError, IFileSystemProviderWithFileReadStreamCapability, IFileReadStreamOptions, IReadFileStreamOptions, IFileSystemProviderCapabilitiesChangeEvent, IFileStatWithPartialMetadata, IFileSystemWatcher, IWatchOptionsWithCorrelation, IFileSystemProviderActivationEvent } from '../../../platform/files/common/files.js';
+import { IModelService } from '../../../editor/common/services/model.js';
+import { LanguageService } from '../../../editor/common/services/languageService.js';
+import { ModelService } from '../../../editor/common/services/modelService.js';
+import { IResourceEncoding, ITextFileService, IReadTextFileOptions, ITextFileStreamContent, IWriteTextFileOptions, ITextFileEditorModel, ITextFileEditorModelManager } from '../../services/textfile/common/textfiles.js';
+import { ILanguageService } from '../../../editor/common/languages/language.js';
+import { IHistoryService } from '../../services/history/common/history.js';
+import { IInstantiationService, ServiceIdentifier } from '../../../platform/instantiation/common/instantiation.js';
+import { TestConfigurationService } from '../../../platform/configuration/test/common/testConfigurationService.js';
+import { MenuBarVisibility, IWindowOpenable, IOpenWindowOptions, IOpenEmptyWindowOptions } from '../../../platform/window/common/window.js';
+import { TestWorkspace } from '../../../platform/workspace/test/common/testWorkspace.js';
+import { IEnvironmentService } from '../../../platform/environment/common/environment.js';
+import { IThemeService } from '../../../platform/theme/common/themeService.js';
+import { ThemeIcon } from '../../../base/common/themables.js';
+import { TestThemeService } from '../../../platform/theme/test/common/testThemeService.js';
+import { ITextResourceConfigurationService, ITextResourcePropertiesService } from '../../../editor/common/services/textResourceConfiguration.js';
+import { IPosition, Position as EditorPosition } from '../../../editor/common/core/position.js';
+import { IMenuService, MenuId, IMenu, IMenuChangeEvent, IMenuActionOptions, MenuItemAction, SubmenuItemAction } from '../../../platform/actions/common/actions.js';
+import { ContextKeyValue, IContextKeyService } from '../../../platform/contextkey/common/contextkey.js';
+import { MockContextKeyService, MockKeybindingService } from '../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { ITextBufferFactory, DefaultEndOfLine, EndOfLinePreference, ITextSnapshot } from '../../../editor/common/model.js';
+import { Range } from '../../../editor/common/core/range.js';
+import { IDialogService, IPickAndOpenOptions, ISaveDialogOptions, IOpenDialogOptions, IFileDialogService, ConfirmResult } from '../../../platform/dialogs/common/dialogs.js';
+import { INotificationService } from '../../../platform/notification/common/notification.js';
+import { TestNotificationService } from '../../../platform/notification/test/common/testNotificationService.js';
+import { IExtensionService } from '../../services/extensions/common/extensions.js';
+import { IKeybindingService } from '../../../platform/keybinding/common/keybinding.js';
+import { IDecorationsService, IResourceDecorationChangeEvent, IDecoration, IDecorationData, IDecorationsProvider } from '../../services/decorations/common/decorations.js';
+import { IDisposable, toDisposable, Disposable, DisposableStore } from '../../../base/common/lifecycle.js';
+import { IEditorGroupsService, IEditorGroup, GroupsOrder, GroupsArrangement, GroupDirection, IMergeGroupOptions, IEditorReplacement, IFindGroupScope, EditorGroupLayout, ICloseEditorOptions, GroupOrientation, ICloseAllEditorsOptions, ICloseEditorsFilter, IEditorDropTargetDelegate, IEditorPart, IAuxiliaryEditorPart, IEditorGroupsContainer, IEditorWorkingSet, IEditorGroupContextKeyProvider, IEditorWorkingSetOptions } from '../../services/editor/common/editorGroupsService.js';
+import { IEditorService, ISaveEditorsOptions, IRevertAllEditorsOptions, PreferredGroup, IEditorsChangeEvent, ISaveEditorsResult } from '../../services/editor/common/editorService.js';
+import { ICodeEditorService } from '../../../editor/browser/services/codeEditorService.js';
+import { IEditorPaneRegistry, EditorPaneDescriptor } from '../../browser/editor.js';
+import { IDimension } from '../../../base/browser/dom.js';
+import { ILoggerService, ILogService, NullLogService } from '../../../platform/log/common/log.js';
+import { ILabelService } from '../../../platform/label/common/label.js';
+import { DeferredPromise, timeout } from '../../../base/common/async.js';
+import { PaneComposite, PaneCompositeDescriptor } from '../../browser/panecomposite.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../platform/storage/common/storage.js';
+import { IProcessEnvironment, isLinux, isWindows, OperatingSystem } from '../../../base/common/platform.js';
+import { LabelService } from '../../services/label/common/labelService.js';
+import { Part } from '../../browser/part.js';
+import { bufferToStream, VSBuffer, VSBufferReadable, VSBufferReadableStream } from '../../../base/common/buffer.js';
+import { Schemas } from '../../../base/common/network.js';
+import { IProductService } from '../../../platform/product/common/productService.js';
+import product from '../../../platform/product/common/product.js';
+import { IHostService } from '../../services/host/browser/host.js';
+import { IWorkingCopyService, WorkingCopyService } from '../../services/workingCopy/common/workingCopyService.js';
+import { IWorkingCopy, IWorkingCopyBackupMeta, IWorkingCopyIdentifier } from '../../services/workingCopy/common/workingCopy.js';
+import { IFilesConfigurationService, FilesConfigurationService } from '../../services/filesConfiguration/common/filesConfigurationService.js';
+import { IAccessibilityService } from '../../../platform/accessibility/common/accessibility.js';
+import { BrowserWorkbenchEnvironmentService } from '../../services/environment/browser/environmentService.js';
+import { BrowserTextFileService } from '../../services/textfile/browser/browserTextFileService.js';
+import { IWorkbenchEnvironmentService } from '../../services/environment/common/environmentService.js';
+import { createTextBufferFactoryFromStream } from '../../../editor/common/model/textModel.js';
+import { IPathService } from '../../services/path/common/pathService.js';
+import { Direction } from '../../../base/browser/ui/grid/grid.js';
+import { IProgressService, IProgressOptions, IProgressWindowOptions, IProgressNotificationOptions, IProgressCompositeOptions, IProgress, IProgressStep, Progress, IProgressDialogOptions, IProgressIndicator } from '../../../platform/progress/common/progress.js';
+import { IWorkingCopyFileService, WorkingCopyFileService } from '../../services/workingCopy/common/workingCopyFileService.js';
+import { UndoRedoService } from '../../../platform/undoRedo/common/undoRedoService.js';
+import { IUndoRedoService } from '../../../platform/undoRedo/common/undoRedo.js';
+import { TextFileEditorModel } from '../../services/textfile/common/textFileEditorModel.js';
+import { Registry } from '../../../platform/registry/common/platform.js';
+import { EditorPane } from '../../browser/parts/editor/editorPane.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { SyncDescriptor } from '../../../platform/instantiation/common/descriptors.js';
+import { TestDialogService } from '../../../platform/dialogs/test/common/testDialogService.js';
+import { CodeEditorService } from '../../services/editor/browser/codeEditorService.js';
+import { MainEditorPart } from '../../browser/parts/editor/editorPart.js';
+import { ICodeEditor } from '../../../editor/browser/editorBrowser.js';
+import { IDiffEditor } from '../../../editor/common/editorCommon.js';
+import { IInputBox, IInputOptions, IPickOptions, IQuickInputButton, IQuickInputService, IQuickNavigateConfiguration, IQuickPick, IQuickPickItem, IQuickWidget, QuickPickInput } from '../../../platform/quickinput/common/quickInput.js';
+import { QuickInputService } from '../../services/quickinput/browser/quickInputService.js';
+import { IListService } from '../../../platform/list/browser/listService.js';
+import { win32, posix } from '../../../base/common/path.js';
+import { TestContextService, TestStorageService, TestTextResourcePropertiesService, TestExtensionService, TestProductService, createFileStat, TestLoggerService, TestWorkspaceTrustManagementService, TestWorkspaceTrustRequestService, TestMarkerService, TestHistoryService } from '../common/workbenchTestServices.js';
+import { IView, ViewContainer, ViewContainerLocation } from '../../common/views.js';
+import { IViewsService } from '../../services/views/common/viewsService.js';
+import { IPaneComposite } from '../../common/panecomposite.js';
+import { IUriIdentityService } from '../../../platform/uriIdentity/common/uriIdentity.js';
+import { UriIdentityService } from '../../../platform/uriIdentity/common/uriIdentityService.js';
+import { InMemoryFileSystemProvider } from '../../../platform/files/common/inMemoryFilesystemProvider.js';
+import { newWriteableStream, ReadableStreamEvents } from '../../../base/common/stream.js';
+import { EncodingOracle, IEncodingOverride } from '../../services/textfile/browser/textFileService.js';
+import { UTF16le, UTF16be, UTF8_with_bom } from '../../services/textfile/common/encoding.js';
+import { ColorScheme } from '../../../platform/theme/common/theme.js';
+import { Iterable } from '../../../base/common/iterator.js';
+import { InMemoryWorkingCopyBackupService } from '../../services/workingCopy/common/workingCopyBackupService.js';
+import { BrowserWorkingCopyBackupService } from '../../services/workingCopy/browser/workingCopyBackupService.js';
+import { FileService } from '../../../platform/files/common/fileService.js';
+import { TextResourceEditor } from '../../browser/parts/editor/textResourceEditor.js';
+import { TestCodeEditor } from '../../../editor/test/browser/testCodeEditor.js';
+import { TextFileEditor } from '../../contrib/files/browser/editors/textFileEditor.js';
+import { TextResourceEditorInput } from '../../common/editor/textResourceEditorInput.js';
+import { UntitledTextEditorInput } from '../../services/untitled/common/untitledTextEditorInput.js';
+import { SideBySideEditor } from '../../browser/parts/editor/sideBySideEditor.js';
+import { IEnterWorkspaceResult, IRecent, IRecentlyOpened, IWorkspaceFolderCreationData, IWorkspacesService } from '../../../platform/workspaces/common/workspaces.js';
+import { IWorkspaceTrustManagementService, IWorkspaceTrustRequestService } from '../../../platform/workspace/common/workspaceTrust.js';
+import { IExtensionTerminalProfile, IShellLaunchConfig, ITerminalBackend, ITerminalLogService, ITerminalProfile, TerminalIcon, TerminalLocation, TerminalShellType } from '../../../platform/terminal/common/terminal.js';
+import { ICreateTerminalOptions, IDeserializedTerminalEditorInput, ITerminalConfigurationService, ITerminalEditorService, ITerminalGroup, ITerminalGroupService, ITerminalInstance, ITerminalInstanceService, TerminalEditorLocation } from '../../contrib/terminal/browser/terminal.js';
+import { assertIsDefined, upcast } from '../../../base/common/types.js';
+import { IRegisterContributedProfileArgs, IShellLaunchConfigResolveOptions, ITerminalProfileProvider, ITerminalProfileResolverService, ITerminalProfileService, type ITerminalConfiguration } from '../../contrib/terminal/common/terminal.js';
+import { EditorResolverService } from '../../services/editor/browser/editorResolverService.js';
+import { FILE_EDITOR_INPUT_ID } from '../../contrib/files/common/files.js';
+import { IEditorResolverService } from '../../services/editor/common/editorResolverService.js';
+import { IWorkingCopyEditorService, WorkingCopyEditorService } from '../../services/workingCopy/common/workingCopyEditorService.js';
+import { IElevatedFileService } from '../../services/files/common/elevatedFileService.js';
+import { BrowserElevatedFileService } from '../../services/files/browser/elevatedFileService.js';
+import { IEditorWorkerService } from '../../../editor/common/services/editorWorker.js';
+import { ResourceMap } from '../../../base/common/map.js';
+import { SideBySideEditorInput } from '../../common/editor/sideBySideEditorInput.js';
+import { ITextEditorService, TextEditorService } from '../../services/textfile/common/textEditorService.js';
+import { IPaneCompositePartService } from '../../services/panecomposite/browser/panecomposite.js';
+import { IPaneCompositePart } from '../../browser/parts/paneCompositePart.js';
+import { ILanguageConfigurationService } from '../../../editor/common/languages/languageConfigurationRegistry.js';
+import { TestLanguageConfigurationService } from '../../../editor/test/common/modes/testLanguageConfigurationService.js';
+import { TerminalEditorInput } from '../../contrib/terminal/browser/terminalEditorInput.js';
+import { IGroupModelChangeEvent } from '../../common/editor/editorGroupModel.js';
+import { env } from '../../../base/common/process.js';
+import { isValidBasename } from '../../../base/common/extpath.js';
+import { TestAccessibilityService } from '../../../platform/accessibility/test/common/testAccessibilityService.js';
+import { ILanguageFeatureDebounceService, LanguageFeatureDebounceService } from '../../../editor/common/services/languageFeatureDebounce.js';
+import { ILanguageFeaturesService } from '../../../editor/common/services/languageFeatures.js';
+import { LanguageFeaturesService } from '../../../editor/common/services/languageFeaturesService.js';
+import { TextEditorPaneSelection } from '../../browser/parts/editor/textEditor.js';
+import { Selection } from '../../../editor/common/core/selection.js';
+import { IFolderBackupInfo, IWorkspaceBackupInfo } from '../../../platform/backup/common/backup.js';
+import { TestEditorWorkerService } from '../../../editor/test/common/services/testEditorWorkerService.js';
+import { IExtensionHostExitInfo, IRemoteAgentConnection, IRemoteAgentService } from '../../services/remote/common/remoteAgentService.js';
+import { ILanguageDetectionService } from '../../services/languageDetection/common/languageDetectionWorkerService.js';
+import { IDiagnosticInfoOptions, IDiagnosticInfo } from '../../../platform/diagnostics/common/diagnostics.js';
+import { ExtensionType, IExtension, IExtensionDescription, IRelaxedExtensionManifest, TargetPlatform } from '../../../platform/extensions/common/extensions.js';
+import { IRemoteAgentEnvironment } from '../../../platform/remote/common/remoteAgentEnvironment.js';
+import { ILayoutOffsetInfo } from '../../../platform/layout/browser/layoutService.js';
+import { IUserDataProfile, IUserDataProfilesService, toUserDataProfile, UserDataProfilesService } from '../../../platform/userDataProfile/common/userDataProfile.js';
+import { UserDataProfileService } from '../../services/userDataProfile/common/userDataProfileService.js';
+import { IUserDataProfileService } from '../../services/userDataProfile/common/userDataProfile.js';
+import { EnablementState, IResourceExtension, IScannedExtension, IWebExtensionsScannerService, IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService } from '../../services/extensionManagement/common/extensionManagement.js';
+import { ILocalExtension, IGalleryExtension, InstallOptions, UninstallOptions, IExtensionsControlManifest, IGalleryMetadata, IExtensionManagementParticipant, Metadata, InstallExtensionResult, InstallExtensionInfo, UninstallExtensionInfo } from '../../../platform/extensionManagement/common/extensionManagement.js';
+import { Codicon } from '../../../base/common/codicons.js';
+import { IRemoteExtensionsScannerService } from '../../../platform/remote/common/remoteExtensionsScanner.js';
+import { IRemoteSocketFactoryService, RemoteSocketFactoryService } from '../../../platform/remote/common/remoteSocketFactoryService.js';
+import { EditorParts } from '../../browser/parts/editor/editorParts.js';
+import { mainWindow } from '../../../base/browser/window.js';
+import { IMarkerService } from '../../../platform/markers/common/markers.js';
+import { IAccessibilitySignalService } from '../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { IEditorPaneService } from '../../services/editor/common/editorPaneService.js';
+import { EditorPaneService } from '../../services/editor/browser/editorPaneService.js';
+import { IContextMenuService, IContextViewService } from '../../../platform/contextview/browser/contextView.js';
+import { ContextViewService } from '../../../platform/contextview/browser/contextViewService.js';
+import { CustomEditorLabelService, ICustomEditorLabelService } from '../../services/editor/common/customEditorLabelService.js';
+import { TerminalConfigurationService } from '../../contrib/terminal/browser/terminalConfigurationService.js';
+import { TerminalLogService } from '../../../platform/terminal/common/terminalLogService.js';
+import { IEnvironmentVariableService } from '../../contrib/terminal/common/environmentVariable.js';
+import { EnvironmentVariableService } from '../../contrib/terminal/common/environmentVariableService.js';
+import { ContextMenuService } from '../../../platform/contextview/browser/contextMenuService.js';
+import { IHoverService } from '../../../platform/hover/browser/hover.js';
+import { NullHoverService } from '../../../platform/hover/test/browser/nullHoverService.js';
+import { IActionViewItemService, NullActionViewItemService } from '../../../platform/actions/browser/actionViewItemService.js';
 
 export function createFileEditorInput(instantiationService: IInstantiationService, resource: URI): FileEditorInput {
 	return instantiationService.createInstance(FileEditorInput, resource, undefined, undefined, undefined, undefined, undefined, undefined);
@@ -211,7 +214,7 @@ export class TestTextFileEditor extends TextFileEditor {
 	}
 
 	setSelection(selection: Selection | undefined, reason: EditorPaneSelectionChangeReason): void {
-		this._options = selection ? { selection } as IEditorOptions : undefined;
+		this._options = selection ? upcast<IEditorOptions, ITextEditorOptions>({ selection }) : undefined;
 
 		this._onDidChangeSelection.fire({ reason });
 	}
@@ -255,7 +258,10 @@ export function workbenchInstantiationService(
 	},
 	disposables: Pick<DisposableStore, 'add'> = new DisposableStore()
 ): TestInstantiationService {
-	const instantiationService = disposables.add(new TestInstantiationService(new ServiceCollection([ILifecycleService, disposables.add(new TestLifecycleService())])));
+	const instantiationService = disposables.add(new TestInstantiationService(new ServiceCollection(
+		[ILifecycleService, disposables.add(new TestLifecycleService())],
+		[IActionViewItemService, new SyncDescriptor(NullActionViewItemService)],
+	)));
 
 	instantiationService.stub(IProductService, TestProductService);
 	instantiationService.stub(IEditorWorkerService, new TestEditorWorkerService());
@@ -348,15 +354,15 @@ export function workbenchInstantiationService(
 	instantiationService.stub(ITerminalInstanceService, new TestTerminalInstanceService());
 	instantiationService.stub(ITerminalEditorService, new TestTerminalEditorService());
 	instantiationService.stub(ITerminalGroupService, new TestTerminalGroupService());
-	instantiationService.stub(ITerminalInstanceService, new TestTerminalInstanceService());
 	instantiationService.stub(ITerminalProfileService, new TestTerminalProfileService());
 	instantiationService.stub(ITerminalProfileResolverService, new TestTerminalProfileResolverService());
-	instantiationService.stub(ITerminalConfigurationService, disposables.add(instantiationService.createInstance(TerminalConfigurationService)));
+	instantiationService.stub(ITerminalConfigurationService, disposables.add(instantiationService.createInstance(TestTerminalConfigurationService)));
 	instantiationService.stub(ITerminalLogService, disposables.add(instantiationService.createInstance(TerminalLogService)));
 	instantiationService.stub(IEnvironmentVariableService, disposables.add(instantiationService.createInstance(EnvironmentVariableService)));
 	instantiationService.stub(IElevatedFileService, new BrowserElevatedFileService());
 	instantiationService.stub(IRemoteSocketFactoryService, new RemoteSocketFactoryService());
 	instantiationService.stub(ICustomEditorLabelService, disposables.add(new CustomEditorLabelService(configService, workspaceContextService)));
+	instantiationService.stub(IHoverService, NullHoverService);
 
 	return instantiationService;
 }
@@ -556,6 +562,14 @@ export class TestMenuService implements IMenuService {
 		};
 	}
 
+	getMenuActions(id: MenuId, contextKeyService: IContextKeyService, options?: IMenuActionOptions): [string, Array<MenuItemAction | SubmenuItemAction>][] {
+		throw new Error('Method not implemented.');
+	}
+
+	getMenuContexts(id: MenuId): ReadonlySet<string> {
+		throw new Error('Method not implemented.');
+	}
+
 	resetHiddenStates(): void {
 		// nothing
 	}
@@ -785,6 +799,7 @@ export class TestViewsService implements IViewsService {
 
 	onDidChangeViewContainerVisibility = new Emitter<{ id: string; visible: boolean; location: ViewContainerLocation }>().event;
 	isViewContainerVisible(id: string): boolean { return true; }
+	isViewContainerActive(id: string): boolean { return true; }
 	getVisibleViewContainer(): ViewContainer | null { return null; }
 	openViewContainer(id: string, focus?: boolean): Promise<IPaneComposite | null> { return Promise.resolve(null); }
 	closeViewContainer(id: string): void { }
@@ -813,7 +828,7 @@ export class TestEditorGroupsService implements IEditorGroupsService {
 
 	windowId = mainWindow.vscodeWindowId;
 
-	onDidCreateAuxiliaryEditorPart: Event<IAuxiliaryEditorPartCreateEvent> = Event.None;
+	onDidCreateAuxiliaryEditorPart: Event<IAuxiliaryEditorPart> = Event.None;
 	onDidChangeActiveGroup: Event<IEditorGroup> = Event.None;
 	onDidActivateGroup: Event<IEditorGroup> = Event.None;
 	onDidAddGroup: Event<IEditorGroup> = Event.None;
@@ -826,6 +841,7 @@ export class TestEditorGroupsService implements IEditorGroupsService {
 	onDidLayout: Event<IDimension> = Event.None;
 	onDidChangeEditorPartOptions = Event.None;
 	onDidScroll = Event.None;
+	onWillDispose = Event.None;
 
 	orientation = GroupOrientation.HORIZONTAL;
 	isReady = true;
@@ -869,6 +885,7 @@ export class TestEditorGroupsService implements IEditorGroupsService {
 	isLayoutCentered(): boolean { return false; }
 	createEditorDropTarget(container: HTMLElement, delegate: IEditorDropTargetDelegate): IDisposable { return Disposable.None; }
 	registerContextKeyProvider<T extends ContextKeyValue>(_provider: IEditorGroupContextKeyProvider<T>): IDisposable { throw new Error('not implemented'); }
+	getScopedInstantiationService(part: IEditorPart): IInstantiationService { throw new Error('Method not implemented.'); }
 
 	partOptions!: IEditorPartOptions;
 	enforcePartOptions(options: IEditorPartOptions): IDisposable { return Disposable.None; }
@@ -1364,7 +1381,7 @@ export class TestLifecycleService extends Disposable implements ILifecycleServic
 
 		this._onWillShutdown.fire({
 			join: p => {
-				this.shutdownJoiners.push(p);
+				this.shutdownJoiners.push(typeof p === 'function' ? p() : p);
 			},
 			joiners: () => [],
 			force: () => { /* No-Op in tests */ },
@@ -1405,8 +1422,8 @@ export class TestWillShutdownEvent implements WillShutdownEvent {
 	reason = ShutdownReason.CLOSE;
 	token = CancellationToken.None;
 
-	join(promise: Promise<void>, joiner: IWillShutdownEventJoiner): void {
-		this.value.push(promise);
+	join(promise: Promise<void> | (() => Promise<void>), joiner: IWillShutdownEventJoiner): void {
+		this.value.push(typeof promise === 'function' ? promise() : promise);
 	}
 
 	force() { /* No-Op in tests */ }
@@ -1816,7 +1833,7 @@ export class TestEditorPart extends MainEditorPart implements IEditorGroupsServi
 	readonly mainPart = this;
 	readonly parts: readonly IEditorPart[] = [this];
 
-	readonly onDidCreateAuxiliaryEditorPart: Event<IAuxiliaryEditorPartCreateEvent> = Event.None;
+	readonly onDidCreateAuxiliaryEditorPart: Event<IAuxiliaryEditorPart> = Event.None;
 
 	testSaveState(): void {
 		return super.saveState();
@@ -1842,6 +1859,10 @@ export class TestEditorPart extends MainEditorPart implements IEditorGroupsServi
 		throw new Error('Method not implemented.');
 	}
 
+	getScopedInstantiationService(part: IEditorPart): IInstantiationService {
+		throw new Error('Method not implemented.');
+	}
+
 	getPart(group: number | IEditorGroup): IEditorPart { return this; }
 
 	saveWorkingSet(name: string): IEditorWorkingSet { throw new Error('Method not implemented.'); }
@@ -1951,13 +1972,14 @@ export class TestWorkspacesService implements IWorkspacesService {
 
 export class TestTerminalInstanceService implements ITerminalInstanceService {
 	onDidCreateInstance = Event.None;
+	onDidRegisterBackend = Event.None;
 	declare readonly _serviceBrand: undefined;
 
 	convertProfileToShellLaunchConfig(shellLaunchConfigOrProfile?: IShellLaunchConfig | ITerminalProfile, cwd?: string | URI): IShellLaunchConfig { throw new Error('Method not implemented.'); }
 	preparePathForTerminalAsync(path: string, executable: string | undefined, title: string, shellType: TerminalShellType, remoteAuthority: string | undefined): Promise<string> { throw new Error('Method not implemented.'); }
 	createInstance(options: ICreateTerminalOptions, target: TerminalLocation): ITerminalInstance { throw new Error('Method not implemented.'); }
 	async getBackend(remoteAuthority?: string): Promise<ITerminalBackend | undefined> { throw new Error('Method not implemented.'); }
-	didRegisterBackend(remoteAuthority?: string): void { throw new Error('Method not implemented.'); }
+	didRegisterBackend(backend: ITerminalBackend): void { throw new Error('Method not implemented.'); }
 	getRegisteredBackends(): IterableIterator<ITerminalBackend> { throw new Error('Method not implemented.'); }
 }
 
@@ -1979,6 +2001,7 @@ export class TestTerminalEditorService implements ITerminalEditorService {
 	getInputFromResource(resource: URI): TerminalEditorInput { throw new Error('Method not implemented.'); }
 	setActiveInstance(instance: ITerminalInstance): void { throw new Error('Method not implemented.'); }
 	focusActiveInstance(): Promise<void> { throw new Error('Method not implemented.'); }
+	focusInstance(instance: ITerminalInstance): void { throw new Error('Method not implemented.'); }
 	getInstanceFromResource(resource: URI | undefined): ITerminalInstance | undefined { throw new Error('Method not implemented.'); }
 	focusFindWidget(): void { throw new Error('Method not implemented.'); }
 	hideFindWidget(): void { throw new Error('Method not implemented.'); }
@@ -2006,8 +2029,8 @@ export class TestTerminalGroupService implements ITerminalGroupService {
 	onDidChangeInstances = Event.None;
 	createGroup(instance?: any): ITerminalGroup { throw new Error('Method not implemented.'); }
 	getGroupForInstance(instance: ITerminalInstance): ITerminalGroup | undefined { throw new Error('Method not implemented.'); }
-	moveGroup(source: ITerminalInstance, target: ITerminalInstance): void { throw new Error('Method not implemented.'); }
-	moveGroupToEnd(source: ITerminalInstance): void { throw new Error('Method not implemented.'); }
+	moveGroup(source: ITerminalInstance | ITerminalInstance[], target: ITerminalInstance): void { throw new Error('Method not implemented.'); }
+	moveGroupToEnd(source: ITerminalInstance | ITerminalInstance[]): void { throw new Error('Method not implemented.'); }
 	moveInstance(source: ITerminalInstance, target: ITerminalInstance, side: 'before' | 'after'): void { throw new Error('Method not implemented.'); }
 	unsplitInstance(instance: ITerminalInstance): void { throw new Error('Method not implemented.'); }
 	joinInstances(instances: ITerminalInstance[]): void { throw new Error('Method not implemented.'); }
@@ -2024,6 +2047,7 @@ export class TestTerminalGroupService implements ITerminalGroupService {
 	focusHover(): void { throw new Error('Method not implemented.'); }
 	setActiveInstance(instance: ITerminalInstance): void { throw new Error('Method not implemented.'); }
 	focusActiveInstance(): Promise<void> { throw new Error('Method not implemented.'); }
+	focusInstance(instance: ITerminalInstance): void { throw new Error('Method not implemented.'); }
 	getInstanceFromResource(resource: URI | undefined): ITerminalInstance | undefined { throw new Error('Method not implemented.'); }
 	focusFindWidget(): void { throw new Error('Method not implemented.'); }
 	hideFindWidget(): void { throw new Error('Method not implemented.'); }
@@ -2063,6 +2087,11 @@ export class TestTerminalProfileResolverService implements ITerminalProfileResol
 	createProfileFromShellAndShellArgs(shell?: unknown, shellArgs?: unknown): Promise<string | ITerminalProfile> { throw new Error('Method not implemented.'); }
 }
 
+export class TestTerminalConfigurationService extends TerminalConfigurationService {
+	get fontMetrics() { return this._fontMetrics; }
+	setConfig(config: Partial<ITerminalConfiguration>) { this._config = config as any; }
+}
+
 export class TestQuickInputService implements IQuickInputService {
 	declare readonly _serviceBrand: undefined;
 
@@ -2085,7 +2114,7 @@ export class TestQuickInputService implements IQuickInputService {
 
 	async input(options?: IInputOptions, token?: CancellationToken): Promise<string> { return options ? 'resolved' + options.prompt : 'resolved'; }
 
-	createQuickPick<T extends IQuickPickItem>(): IQuickPick<T> { throw new Error('not implemented.'); }
+	createQuickPick<T extends IQuickPickItem>(): IQuickPick<T, { useSeparators: boolean }> { throw new Error('not implemented.'); }
 	createInputBox(): IInputBox { throw new Error('not implemented.'); }
 	createQuickWidget(): IQuickWidget { throw new Error('Method not implemented.'); }
 	focus(): void { throw new Error('not implemented.'); }
@@ -2117,6 +2146,7 @@ export class TestRemoteAgentService implements IRemoteAgentService {
 	async logTelemetry(eventName: string, data?: ITelemetryData): Promise<void> { }
 	async flushTelemetry(): Promise<void> { }
 	async getRoundTripTime(): Promise<number | undefined> { return undefined; }
+	async endConnection(): Promise<void> { }
 }
 
 export class TestRemoteExtensionsScannerService implements IRemoteExtensionsScannerService {
@@ -2151,6 +2181,8 @@ export class TestWorkbenchExtensionManagementService implements IWorkbenchExtens
 	onProfileAwareDidInstallExtensions = Event.None;
 	onProfileAwareUninstallExtension = Event.None;
 	onProfileAwareDidUninstallExtension = Event.None;
+	onDidProfileAwareUninstallExtensions = Event.None;
+	onProfileAwareDidUpdateExtensionMetadata = Event.None;
 	onDidChangeProfile = Event.None;
 	onDidEnableExtensions = Event.None;
 	installVSIX(location: URI, manifest: Readonly<IRelaxedExtensionManifest>, installOptions?: InstallOptions | undefined): Promise<ILocalExtension> {
@@ -2166,9 +2198,6 @@ export class TestWorkbenchExtensionManagementService implements IWorkbenchExtens
 	zip(extension: ILocalExtension): Promise<URI> {
 		throw new Error('Method not implemented.');
 	}
-	unzip(zipLocation: URI): Promise<IExtensionIdentifier> {
-		throw new Error('Method not implemented.');
-	}
 	getManifest(vsix: URI): Promise<Readonly<IRelaxedExtensionManifest>> {
 		throw new Error('Method not implemented.');
 	}
@@ -2182,6 +2211,9 @@ export class TestWorkbenchExtensionManagementService implements IWorkbenchExtens
 	uninstall(extension: ILocalExtension, options?: UninstallOptions | undefined): Promise<void> {
 		throw new Error('Method not implemented.');
 	}
+	uninstallExtensions(extensions: UninstallExtensionInfo[]): Promise<void> {
+		throw new Error('Method not implemented.');
+	}
 	async reinstallFromGallery(extension: ILocalExtension): Promise<ILocalExtension> {
 		throw new Error('Method not implemented.');
 	}
@@ -2204,6 +2236,7 @@ export class TestWorkbenchExtensionManagementService implements IWorkbenchExtens
 	getInstalledWorkspaceExtensions(): Promise<ILocalExtension[]> { throw new Error('Method not implemented.'); }
 	installResourceExtension(): Promise<ILocalExtension> { throw new Error('Method not implemented.'); }
 	getExtensions(): Promise<IResourceExtension[]> { throw new Error('Method not implemented.'); }
+	resetPinnedStateForAllUserExtensions(pinned: boolean): Promise<void> { throw new Error('Method not implemented.'); }
 }
 
 export class TestUserDataProfileService implements IUserDataProfileService {
diff --git a/src/vs/workbench/test/common/memento.test.ts b/src/vs/workbench/test/common/memento.test.ts
index 7850379177f..6b7a565e931 100644
--- a/src/vs/workbench/test/common/memento.test.ts
+++ b/src/vs/workbench/test/common/memento.test.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { StorageScope, IStorageService, StorageTarget } from 'vs/platform/storage/common/storage';
-import { Memento } from 'vs/workbench/common/memento';
-import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../base/test/common/utils.js';
+import { StorageScope, IStorageService, StorageTarget } from '../../../platform/storage/common/storage.js';
+import { Memento } from '../../common/memento.js';
+import { TestStorageService } from './workbenchTestServices.js';
 
 suite('Memento', () => {
 	const disposables = new DisposableStore();
diff --git a/src/vs/workbench/test/common/notifications.test.ts b/src/vs/workbench/test/common/notifications.test.ts
index ac087cde929..510a48dc03c 100644
--- a/src/vs/workbench/test/common/notifications.test.ts
+++ b/src/vs/workbench/test/common/notifications.test.ts
@@ -4,15 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { NotificationsModel, NotificationViewItem, INotificationChangeEvent, NotificationChangeType, NotificationViewItemContentChangeKind, IStatusMessageChangeEvent, StatusMessageChangeType, INotificationsFilter } from 'vs/workbench/common/notifications';
-import { Action } from 'vs/base/common/actions';
-import { INotification, Severity, NotificationsFilter, NotificationPriority } from 'vs/platform/notification/common/notification';
-import { createErrorWithActions } from 'vs/base/common/errorMessage';
-import { NotificationService } from 'vs/workbench/services/notification/common/notificationService';
-import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
-import { timeout } from 'vs/base/common/async';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import { NotificationsModel, NotificationViewItem, INotificationChangeEvent, NotificationChangeType, NotificationViewItemContentChangeKind, IStatusMessageChangeEvent, StatusMessageChangeType, INotificationsFilter } from '../../common/notifications.js';
+import { Action } from '../../../base/common/actions.js';
+import { INotification, Severity, NotificationsFilter, NotificationPriority } from '../../../platform/notification/common/notification.js';
+import { createErrorWithActions } from '../../../base/common/errorMessage.js';
+import { NotificationService } from '../../services/notification/common/notificationService.js';
+import { TestStorageService } from './workbenchTestServices.js';
+import { timeout } from '../../../base/common/async.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../base/test/common/utils.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
 
 suite('Notifications', () => {
 
diff --git a/src/vs/workbench/test/common/resources.test.ts b/src/vs/workbench/test/common/resources.test.ts
index 82cb89a37a3..1f3f97d2c43 100644
--- a/src/vs/workbench/test/common/resources.test.ts
+++ b/src/vs/workbench/test/common/resources.test.ts
@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { ResourceGlobMatcher } from 'vs/workbench/common/resources';
-import { TestContextService } from 'vs/workbench/test/common/workbenchTestServices';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { URI } from '../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../base/test/common/utils.js';
+import { TestConfigurationService } from '../../../platform/configuration/test/common/testConfigurationService.js';
+import { IWorkspaceContextService } from '../../../platform/workspace/common/workspace.js';
+import { ResourceGlobMatcher } from '../../common/resources.js';
+import { TestContextService } from './workbenchTestServices.js';
 
 suite('ResourceGlobMatcher', () => {
 
diff --git a/src/vs/workbench/test/common/utils.ts b/src/vs/workbench/test/common/utils.ts
index 697812f153c..2ff13475ea2 100644
--- a/src/vs/workbench/test/common/utils.ts
+++ b/src/vs/workbench/test/common/utils.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { LanguagesRegistry } from 'vs/editor/common/services/languagesRegistry';
+import { LanguagesRegistry } from '../../../editor/common/services/languagesRegistry.js';
 
 /**
  * This function is called before test running and also again at the end of test running
diff --git a/src/vs/workbench/test/common/workbenchTestServices.ts b/src/vs/workbench/test/common/workbenchTestServices.ts
index 2caf3646a28..cd6e844b2cb 100644
--- a/src/vs/workbench/test/common/workbenchTestServices.ts
+++ b/src/vs/workbench/test/common/workbenchTestServices.ts
@@ -3,34 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { join } from 'vs/base/common/path';
-import { basename, isEqual, isEqualOrParent } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
-import { Event, Emitter } from 'vs/base/common/event';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IWorkspaceContextService, IWorkspace, WorkbenchState, IWorkspaceFolder, IWorkspaceFoldersChangeEvent, Workspace, IWorkspaceFoldersWillChangeEvent, ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
-import { TestWorkspace } from 'vs/platform/workspace/test/common/testWorkspace';
-import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfiguration';
-import { isLinux, isMacintosh } from 'vs/base/common/platform';
-import { InMemoryStorageService, WillSaveStateReason } from 'vs/platform/storage/common/storage';
-import { IWorkingCopy, IWorkingCopyBackup, WorkingCopyCapabilities } from 'vs/workbench/services/workingCopy/common/workingCopy';
-import { NullExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IWorkingCopyFileService, IWorkingCopyFileOperationParticipant, WorkingCopyFileEvent, IDeleteOperation, ICopyOperation, IMoveOperation, IFileOperationUndoRedoInfo, ICreateFileOperation, ICreateOperation, IStoredFileWorkingCopySaveParticipant, IStoredFileWorkingCopySaveParticipantContext } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
-import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
-import { IBaseFileStat, IFileStatWithMetadata } from 'vs/platform/files/common/files';
-import { ISaveOptions, IRevertOptions, SaveReason, GroupIdentifier } from 'vs/workbench/common/editor';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import product from 'vs/platform/product/common/product';
-import { IActivity, IActivityService } from 'vs/workbench/services/activity/common/activity';
-import { IStoredFileWorkingCopySaveEvent } from 'vs/workbench/services/workingCopy/common/storedFileWorkingCopy';
-import { AbstractLoggerService, ILogger, LogLevel, NullLogger } from 'vs/platform/log/common/log';
-import { IResourceEditorInput } from 'vs/platform/editor/common/editor';
-import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { IHistoryService } from 'vs/workbench/services/history/common/history';
-import { IAutoSaveConfiguration, IAutoSaveMode, IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService, IWorkspaceTrustRequestService, IWorkspaceTrustTransitionParticipant, IWorkspaceTrustUriInfo, WorkspaceTrustRequestOptions, WorkspaceTrustUriResponse } from 'vs/platform/workspace/common/workspaceTrust';
-import { IMarker, IMarkerData, IMarkerService, IResourceMarker, MarkerStatistics } from 'vs/platform/markers/common/markers';
-import { IProgress, IProgressStep } from 'vs/platform/progress/common/progress';
+import { join } from '../../../base/common/path.js';
+import { basename, isEqual, isEqualOrParent } from '../../../base/common/resources.js';
+import { URI } from '../../../base/common/uri.js';
+import { Event, Emitter } from '../../../base/common/event.js';
+import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
+import { IWorkspaceContextService, IWorkspace, WorkbenchState, IWorkspaceFolder, IWorkspaceFoldersChangeEvent, Workspace, IWorkspaceFoldersWillChangeEvent, ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from '../../../platform/workspace/common/workspace.js';
+import { TestWorkspace } from '../../../platform/workspace/test/common/testWorkspace.js';
+import { ITextResourcePropertiesService } from '../../../editor/common/services/textResourceConfiguration.js';
+import { isLinux, isMacintosh } from '../../../base/common/platform.js';
+import { InMemoryStorageService, WillSaveStateReason } from '../../../platform/storage/common/storage.js';
+import { IWorkingCopy, IWorkingCopyBackup, WorkingCopyCapabilities } from '../../services/workingCopy/common/workingCopy.js';
+import { NullExtensionService } from '../../services/extensions/common/extensions.js';
+import { IWorkingCopyFileService, IWorkingCopyFileOperationParticipant, WorkingCopyFileEvent, IDeleteOperation, ICopyOperation, IMoveOperation, IFileOperationUndoRedoInfo, ICreateFileOperation, ICreateOperation, IStoredFileWorkingCopySaveParticipant, IStoredFileWorkingCopySaveParticipantContext } from '../../services/workingCopy/common/workingCopyFileService.js';
+import { IDisposable, Disposable } from '../../../base/common/lifecycle.js';
+import { IBaseFileStat, IFileStatWithMetadata } from '../../../platform/files/common/files.js';
+import { ISaveOptions, IRevertOptions, SaveReason, GroupIdentifier } from '../../common/editor.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import product from '../../../platform/product/common/product.js';
+import { IActivity, IActivityService } from '../../services/activity/common/activity.js';
+import { IStoredFileWorkingCopySaveEvent } from '../../services/workingCopy/common/storedFileWorkingCopy.js';
+import { AbstractLoggerService, ILogger, LogLevel, NullLogger } from '../../../platform/log/common/log.js';
+import { IResourceEditorInput } from '../../../platform/editor/common/editor.js';
+import { EditorInput } from '../../common/editor/editorInput.js';
+import { IHistoryService } from '../../services/history/common/history.js';
+import { IAutoSaveConfiguration, IAutoSaveMode, IFilesConfigurationService } from '../../services/filesConfiguration/common/filesConfigurationService.js';
+import { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService, IWorkspaceTrustRequestService, IWorkspaceTrustTransitionParticipant, IWorkspaceTrustUriInfo, WorkspaceTrustRequestOptions, WorkspaceTrustUriResponse } from '../../../platform/workspace/common/workspaceTrust.js';
+import { IMarker, IMarkerData, IMarkerService, IResourceMarker, MarkerStatistics } from '../../../platform/markers/common/markers.js';
+import { IProgress, IProgressStep } from '../../../platform/progress/common/progress.js';
 
 export class TestLoggerService extends AbstractLoggerService {
 	constructor(logsHome?: URI) {
diff --git a/src/vs/workbench/test/electron-sandbox/resolveExternal.test.ts b/src/vs/workbench/test/electron-sandbox/resolveExternal.test.ts
index ff49db5e3c7..530b5eb4ef2 100644
--- a/src/vs/workbench/test/electron-sandbox/resolveExternal.test.ts
+++ b/src/vs/workbench/test/electron-sandbox/resolveExternal.test.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { NativeWindow } from 'vs/workbench/electron-sandbox/window';
-import { ITunnelService, RemoteTunnel } from 'vs/platform/tunnel/common/tunnel';
-import { URI } from 'vs/base/common/uri';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { IAddressProvider } from 'vs/platform/remote/common/remoteAgentConnection';
-import { workbenchInstantiationService } from 'vs/workbench/test/electron-sandbox/workbenchTestServices';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../base/test/common/utils.js';
+import { NativeWindow } from '../../electron-sandbox/window.js';
+import { ITunnelService, RemoteTunnel } from '../../../platform/tunnel/common/tunnel.js';
+import { URI } from '../../../base/common/uri.js';
+import { TestInstantiationService } from '../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { IAddressProvider } from '../../../platform/remote/common/remoteAgentConnection.js';
+import { workbenchInstantiationService } from './workbenchTestServices.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
 
 type PortMap = Record<number, number>;
 
diff --git a/src/vs/workbench/test/electron-sandbox/workbenchTestServices.ts b/src/vs/workbench/test/electron-sandbox/workbenchTestServices.ts
index 45f6d6d98f4..3ae1a6afeab 100644
--- a/src/vs/workbench/test/electron-sandbox/workbenchTestServices.ts
+++ b/src/vs/workbench/test/electron-sandbox/workbenchTestServices.ts
@@ -3,51 +3,52 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
-import { workbenchInstantiationService as browserWorkbenchInstantiationService, ITestInstantiationService, TestEncodingOracle, TestEnvironmentService, TestFileDialogService, TestFilesConfigurationService, TestFileService, TestLifecycleService, TestTextFileService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { ISharedProcessService } from 'vs/platform/ipc/electron-sandbox/services';
-import { INativeHostService, INativeHostOptions, IOSProperties, IOSStatistics } from 'vs/platform/native/common/native';
-import { VSBuffer, VSBufferReadable, VSBufferReadableStream } from 'vs/base/common/buffer';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { IFileDialogService, INativeOpenDialogOptions } from 'vs/platform/dialogs/common/dialogs';
-import { IPartsSplash } from 'vs/platform/theme/common/themeService';
-import { IOpenedMainWindow, IOpenEmptyWindowOptions, IWindowOpenable, IOpenWindowOptions, IColorScheme, IRectangle, IPoint } from 'vs/platform/window/common/window';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IEnvironmentService, INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { ITextEditorService } from 'vs/workbench/services/textfile/common/textEditorService';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { AbstractNativeExtensionTipsService } from 'vs/platform/extensionManagement/common/extensionTipsService';
-import { IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IExtensionRecommendationNotificationService } from 'vs/platform/extensionRecommendations/common/extensionRecommendations';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ModelService } from 'vs/editor/common/services/modelService';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackup';
-import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
-import { TestContextService } from 'vs/workbench/test/common/workbenchTestServices';
-import { NativeTextFileService } from 'vs/workbench/services/textfile/electron-sandbox/nativeTextFileService';
-import { insert } from 'vs/base/common/arrays';
-import { Schemas } from 'vs/base/common/network';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { FileUserDataProvider } from 'vs/platform/userData/common/fileUserDataProvider';
-import { IWorkingCopyIdentifier } from 'vs/workbench/services/workingCopy/common/workingCopy';
-import { NativeWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/electron-sandbox/workingCopyBackupService';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
-import { UserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { Event } from '../../../base/common/event.js';
+import { workbenchInstantiationService as browserWorkbenchInstantiationService, ITestInstantiationService, TestEncodingOracle, TestEnvironmentService, TestFileDialogService, TestFilesConfigurationService, TestFileService, TestLifecycleService, TestTextFileService } from '../browser/workbenchTestServices.js';
+import { ISharedProcessService } from '../../../platform/ipc/electron-sandbox/services.js';
+import { INativeHostService, INativeHostOptions, IOSProperties, IOSStatistics } from '../../../platform/native/common/native.js';
+import { VSBuffer, VSBufferReadable, VSBufferReadableStream } from '../../../base/common/buffer.js';
+import { DisposableStore, IDisposable } from '../../../base/common/lifecycle.js';
+import { URI } from '../../../base/common/uri.js';
+import { IFileDialogService, INativeOpenDialogOptions } from '../../../platform/dialogs/common/dialogs.js';
+import { IPartsSplash } from '../../../platform/theme/common/themeService.js';
+import { IOpenedMainWindow, IOpenEmptyWindowOptions, IWindowOpenable, IOpenWindowOptions, IColorScheme, IRectangle, IPoint } from '../../../platform/window/common/window.js';
+import { TestConfigurationService } from '../../../platform/configuration/test/common/testConfigurationService.js';
+import { IContextKeyService } from '../../../platform/contextkey/common/contextkey.js';
+import { IEnvironmentService, INativeEnvironmentService } from '../../../platform/environment/common/environment.js';
+import { IFileService } from '../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
+import { IEditorService } from '../../services/editor/common/editorService.js';
+import { IPathService } from '../../services/path/common/pathService.js';
+import { ITextEditorService } from '../../services/textfile/common/textEditorService.js';
+import { ITextFileService } from '../../services/textfile/common/textfiles.js';
+import { AbstractNativeExtensionTipsService } from '../../../platform/extensionManagement/common/extensionTipsService.js';
+import { IExtensionManagementService } from '../../../platform/extensionManagement/common/extensionManagement.js';
+import { IExtensionRecommendationNotificationService } from '../../../platform/extensionRecommendations/common/extensionRecommendations.js';
+import { IProductService } from '../../../platform/product/common/productService.js';
+import { IStorageService } from '../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../platform/telemetry/common/telemetry.js';
+import { IModelService } from '../../../editor/common/services/model.js';
+import { ModelService } from '../../../editor/common/services/modelService.js';
+import { IWorkspaceContextService } from '../../../platform/workspace/common/workspace.js';
+import { IFilesConfigurationService } from '../../services/filesConfiguration/common/filesConfigurationService.js';
+import { ILifecycleService } from '../../services/lifecycle/common/lifecycle.js';
+import { IWorkingCopyBackupService } from '../../services/workingCopy/common/workingCopyBackup.js';
+import { IWorkingCopyService } from '../../services/workingCopy/common/workingCopyService.js';
+import { TestContextService } from '../common/workbenchTestServices.js';
+import { NativeTextFileService } from '../../services/textfile/electron-sandbox/nativeTextFileService.js';
+import { insert } from '../../../base/common/arrays.js';
+import { Schemas } from '../../../base/common/network.js';
+import { FileService } from '../../../platform/files/common/fileService.js';
+import { InMemoryFileSystemProvider } from '../../../platform/files/common/inMemoryFilesystemProvider.js';
+import { NullLogService } from '../../../platform/log/common/log.js';
+import { FileUserDataProvider } from '../../../platform/userData/common/fileUserDataProvider.js';
+import { IWorkingCopyIdentifier } from '../../services/workingCopy/common/workingCopy.js';
+import { NativeWorkingCopyBackupService } from '../../services/workingCopy/electron-sandbox/workingCopyBackupService.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { UriIdentityService } from '../../../platform/uriIdentity/common/uriIdentityService.js';
+import { UserDataProfilesService } from '../../../platform/userDataProfile/common/userDataProfile.js';
+import { AuthInfo, Credentials } from '../../../platform/request/common/request.js';
 
 export class TestSharedProcessService implements ISharedProcessService {
 
@@ -83,6 +84,7 @@ export class TestNativeHostService implements INativeHostService {
 
 	async getWindows(): Promise<IOpenedMainWindow[]> { return []; }
 	async getActiveWindowId(): Promise<number | undefined> { return undefined; }
+	async getActiveWindowPosition(): Promise<IRectangle | undefined> { return undefined; }
 
 	openWindow(options?: IOpenEmptyWindowOptions): Promise<void>;
 	openWindow(toOpen: IWindowOpenable[], options?: IOpenWindowOptions): Promise<void>;
@@ -124,7 +126,7 @@ export class TestNativeHostService implements INativeHostService {
 	async getProcessId(): Promise<number> { throw new Error('Method not implemented.'); }
 	async killProcess(): Promise<void> { }
 	async setDocumentEdited(edited: boolean): Promise<void> { }
-	async openExternal(url: string): Promise<boolean> { return false; }
+	async openExternal(url: string, defaultApplication?: string): Promise<boolean> { return false; }
 	async updateTouchBar(): Promise<void> { }
 	async moveItemToTrash(): Promise<void> { }
 	async newWindowTab(): Promise<void> { }
@@ -141,9 +143,11 @@ export class TestNativeHostService implements INativeHostService {
 	async closeWindow(): Promise<void> { }
 	async quit(): Promise<void> { }
 	async exit(code: number): Promise<void> { }
-	async openDevTools(options?: Partial<Electron.OpenDevToolsOptions> & INativeHostOptions | undefined): Promise<void> { }
+	async openDevTools(): Promise<void> { }
 	async toggleDevTools(): Promise<void> { }
 	async resolveProxy(url: string): Promise<string | undefined> { return undefined; }
+	async lookupAuthorization(authInfo: AuthInfo): Promise<Credentials | undefined> { return undefined; }
+	async lookupKerberosAuthorization(url: string): Promise<string | undefined> { return undefined; }
 	async loadCertificates(): Promise<string[]> { return []; }
 	async findFreePort(startPort: number, giveUpAfter: number, timeout: number, stride?: number): Promise<number> { return -1; }
 	async readClipboardText(type?: 'selection' | 'clipboard' | undefined): Promise<string> { return ''; }
@@ -151,6 +155,7 @@ export class TestNativeHostService implements INativeHostService {
 	async readClipboardFindText(): Promise<string> { return ''; }
 	async writeClipboardFindText(text: string): Promise<void> { }
 	async writeClipboardBuffer(format: string, buffer: VSBuffer, type?: 'selection' | 'clipboard' | undefined): Promise<void> { }
+	async readImage(): Promise<Uint8Array> { return Uint8Array.from([]); }
 	async readClipboardBuffer(format: string): Promise<VSBuffer> { return VSBuffer.wrap(Uint8Array.from([])); }
 	async hasClipboard(format: string, type?: 'selection' | 'clipboard' | undefined): Promise<boolean> { return false; }
 	async windowsGetStringRegKey(hive: 'HKEY_CURRENT_USER' | 'HKEY_LOCAL_MACHINE' | 'HKEY_CLASSES_ROOT' | 'HKEY_USERS' | 'HKEY_CURRENT_CONFIG', path: string, name: string): Promise<string | undefined> { return undefined; }
diff --git a/src/vs/workbench/workbench.common.main.ts b/src/vs/workbench/workbench.common.main.ts
index a4e3fa69d6e..285fea2c50e 100644
--- a/src/vs/workbench/workbench.common.main.ts
+++ b/src/vs/workbench/workbench.common.main.ts
@@ -5,146 +5,147 @@
 
 //#region --- editor/workbench core
 
-import 'vs/editor/editor.all';
+import '../editor/editor.all.js';
 
-import 'vs/workbench/api/browser/extensionHost.contribution';
-import 'vs/workbench/browser/workbench.contribution';
+import './api/browser/extensionHost.contribution.js';
+import './browser/workbench.contribution.js';
 
 //#endregion
 
 
 //#region --- workbench actions
 
-import 'vs/workbench/browser/actions/textInputActions';
-import 'vs/workbench/browser/actions/developerActions';
-import 'vs/workbench/browser/actions/helpActions';
-import 'vs/workbench/browser/actions/layoutActions';
-import 'vs/workbench/browser/actions/listCommands';
-import 'vs/workbench/browser/actions/navigationActions';
-import 'vs/workbench/browser/actions/windowActions';
-import 'vs/workbench/browser/actions/workspaceActions';
-import 'vs/workbench/browser/actions/workspaceCommands';
-import 'vs/workbench/browser/actions/quickAccessActions';
-import 'vs/workbench/browser/actions/widgetNavigationCommands';
+import './browser/actions/textInputActions.js';
+import './browser/actions/developerActions.js';
+import './browser/actions/helpActions.js';
+import './browser/actions/layoutActions.js';
+import './browser/actions/listCommands.js';
+import './browser/actions/navigationActions.js';
+import './browser/actions/windowActions.js';
+import './browser/actions/workspaceActions.js';
+import './browser/actions/workspaceCommands.js';
+import './browser/actions/quickAccessActions.js';
+import './browser/actions/widgetNavigationCommands.js';
 
 //#endregion
 
 
 //#region --- API Extension Points
 
-import 'vs/workbench/services/actions/common/menusExtensionPoint';
-import 'vs/workbench/api/common/configurationExtensionPoint';
-import 'vs/workbench/api/browser/viewsExtensionPoint';
+import './services/actions/common/menusExtensionPoint.js';
+import './api/common/configurationExtensionPoint.js';
+import './api/browser/viewsExtensionPoint.js';
 
 //#endregion
 
 
 //#region --- workbench parts
 
-import 'vs/workbench/browser/parts/editor/editor.contribution';
-import 'vs/workbench/browser/parts/editor/editorParts';
-import 'vs/workbench/browser/parts/paneCompositePartService';
-import 'vs/workbench/browser/parts/banner/bannerPart';
-import 'vs/workbench/browser/parts/statusbar/statusbarPart';
+import './browser/parts/editor/editor.contribution.js';
+import './browser/parts/editor/editorParts.js';
+import './browser/parts/paneCompositePartService.js';
+import './browser/parts/banner/bannerPart.js';
+import './browser/parts/statusbar/statusbarPart.js';
 
 //#endregion
 
 
 //#region --- workbench services
 
-import 'vs/platform/actions/common/actions.contribution';
-import 'vs/platform/undoRedo/common/undoRedoService';
-import 'vs/workbench/services/workspaces/common/editSessionIdentityService';
-import 'vs/workbench/services/workspaces/common/canonicalUriService';
-import 'vs/workbench/services/extensions/browser/extensionUrlHandler';
-import 'vs/workbench/services/keybinding/common/keybindingEditing';
-import 'vs/workbench/services/decorations/browser/decorationsService';
-import 'vs/workbench/services/dialogs/common/dialogService';
-import 'vs/workbench/services/progress/browser/progressService';
-import 'vs/workbench/services/editor/browser/codeEditorService';
-import 'vs/workbench/services/preferences/browser/preferencesService';
-import 'vs/workbench/services/configuration/common/jsonEditingService';
-import 'vs/workbench/services/textmodelResolver/common/textModelResolverService';
-import 'vs/workbench/services/editor/browser/editorService';
-import 'vs/workbench/services/editor/browser/editorResolverService';
-import 'vs/workbench/services/aiEmbeddingVector/common/aiEmbeddingVectorService';
-import 'vs/workbench/services/aiRelatedInformation/common/aiRelatedInformationService';
-import 'vs/workbench/services/history/browser/historyService';
-import 'vs/workbench/services/activity/browser/activityService';
-import 'vs/workbench/services/keybinding/browser/keybindingService';
-import 'vs/workbench/services/untitled/common/untitledTextEditorService';
-import 'vs/workbench/services/textresourceProperties/common/textResourcePropertiesService';
-import 'vs/workbench/services/textfile/common/textEditorService';
-import 'vs/workbench/services/language/common/languageService';
-import 'vs/workbench/services/model/common/modelService';
-import 'vs/workbench/services/notebook/common/notebookDocumentService';
-import 'vs/workbench/services/commands/common/commandService';
-import 'vs/workbench/services/themes/browser/workbenchThemeService';
-import 'vs/workbench/services/label/common/labelService';
-import 'vs/workbench/services/extensions/common/extensionManifestPropertiesService';
-import 'vs/workbench/services/extensionManagement/browser/extensionEnablementService';
-import 'vs/workbench/services/extensionManagement/browser/builtinExtensionsScannerService';
-import 'vs/workbench/services/extensionRecommendations/common/extensionIgnoredRecommendationsService';
-import 'vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig';
-import 'vs/workbench/services/extensionManagement/common/extensionFeaturesManagemetService';
-import 'vs/workbench/services/notification/common/notificationService';
-import 'vs/workbench/services/userDataSync/common/userDataSyncUtil';
-import 'vs/workbench/services/userDataProfile/browser/userDataProfileImportExportService';
-import 'vs/workbench/services/userDataProfile/browser/userDataProfileManagement';
-import 'vs/workbench/services/userDataProfile/common/remoteUserDataProfiles';
-import 'vs/workbench/services/remote/common/remoteExplorerService';
-import 'vs/workbench/services/remote/common/remoteExtensionsScanner';
-import 'vs/workbench/services/terminal/common/embedderTerminalService';
-import 'vs/workbench/services/workingCopy/common/workingCopyService';
-import 'vs/workbench/services/workingCopy/common/workingCopyFileService';
-import 'vs/workbench/services/workingCopy/common/workingCopyEditorService';
-import 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import 'vs/workbench/services/views/browser/viewDescriptorService';
-import 'vs/workbench/services/views/browser/viewsService';
-import 'vs/workbench/services/quickinput/browser/quickInputService';
-import 'vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService';
-import 'vs/workbench/services/authentication/browser/authenticationService';
-import 'vs/workbench/services/authentication/browser/authenticationExtensionsService';
-import 'vs/workbench/services/authentication/browser/authenticationUsageService';
-import 'vs/workbench/services/authentication/browser/authenticationAccessService';
-import 'vs/editor/browser/services/hoverService/hoverService';
-import 'vs/workbench/services/assignment/common/assignmentService';
-import 'vs/workbench/services/outline/browser/outlineService';
-import 'vs/workbench/services/languageDetection/browser/languageDetectionWorkerServiceImpl';
-import 'vs/editor/common/services/languageFeaturesService';
-import 'vs/editor/common/services/semanticTokensStylingService';
-import 'vs/editor/common/services/treeViewsDndService';
-import 'vs/workbench/services/textMate/browser/textMateTokenizationFeature.contribution';
-import 'vs/workbench/services/userActivity/common/userActivityService';
-import 'vs/workbench/services/userActivity/browser/userActivityBrowser';
-import 'vs/workbench/services/editor/browser/editorPaneService';
-import 'vs/workbench/services/editor/common/customEditorLabelService';
+import '../platform/actions/common/actions.contribution.js';
+import '../platform/undoRedo/common/undoRedoService.js';
+import './services/workspaces/common/editSessionIdentityService.js';
+import './services/workspaces/common/canonicalUriService.js';
+import './services/extensions/browser/extensionUrlHandler.js';
+import './services/keybinding/common/keybindingEditing.js';
+import './services/decorations/browser/decorationsService.js';
+import './services/dialogs/common/dialogService.js';
+import './services/progress/browser/progressService.js';
+import './services/editor/browser/codeEditorService.js';
+import './services/preferences/browser/preferencesService.js';
+import './services/configuration/common/jsonEditingService.js';
+import './services/textmodelResolver/common/textModelResolverService.js';
+import './services/editor/browser/editorService.js';
+import './services/editor/browser/editorResolverService.js';
+import './services/aiEmbeddingVector/common/aiEmbeddingVectorService.js';
+import './services/aiRelatedInformation/common/aiRelatedInformationService.js';
+import './services/history/browser/historyService.js';
+import './services/activity/browser/activityService.js';
+import './services/keybinding/browser/keybindingService.js';
+import './services/untitled/common/untitledTextEditorService.js';
+import './services/textresourceProperties/common/textResourcePropertiesService.js';
+import './services/textfile/common/textEditorService.js';
+import './services/language/common/languageService.js';
+import './services/model/common/modelService.js';
+import './services/notebook/common/notebookDocumentService.js';
+import './services/commands/common/commandService.js';
+import './services/themes/browser/workbenchThemeService.js';
+import './services/label/common/labelService.js';
+import './services/extensions/common/extensionManifestPropertiesService.js';
+import './services/extensionManagement/browser/extensionEnablementService.js';
+import './services/extensionManagement/browser/builtinExtensionsScannerService.js';
+import './services/extensionRecommendations/common/extensionIgnoredRecommendationsService.js';
+import './services/extensionRecommendations/common/workspaceExtensionsConfig.js';
+import './services/extensionManagement/common/extensionFeaturesManagemetService.js';
+import './services/notification/common/notificationService.js';
+import './services/userDataSync/common/userDataSyncUtil.js';
+import './services/userDataProfile/browser/userDataProfileImportExportService.js';
+import './services/userDataProfile/browser/userDataProfileManagement.js';
+import './services/userDataProfile/common/remoteUserDataProfiles.js';
+import './services/remote/common/remoteExplorerService.js';
+import './services/remote/common/remoteExtensionsScanner.js';
+import './services/terminal/common/embedderTerminalService.js';
+import './services/workingCopy/common/workingCopyService.js';
+import './services/workingCopy/common/workingCopyFileService.js';
+import './services/workingCopy/common/workingCopyEditorService.js';
+import './services/filesConfiguration/common/filesConfigurationService.js';
+import './services/views/browser/viewDescriptorService.js';
+import './services/views/browser/viewsService.js';
+import './services/quickinput/browser/quickInputService.js';
+import './services/userDataSync/browser/userDataSyncWorkbenchService.js';
+import './services/authentication/browser/authenticationService.js';
+import './services/authentication/browser/authenticationExtensionsService.js';
+import './services/authentication/browser/authenticationUsageService.js';
+import './services/authentication/browser/authenticationAccessService.js';
+import '../editor/browser/services/hoverService/hoverService.js';
+import './services/assignment/common/assignmentService.js';
+import './services/outline/browser/outlineService.js';
+import './services/languageDetection/browser/languageDetectionWorkerServiceImpl.js';
+import '../editor/common/services/languageFeaturesService.js';
+import '../editor/common/services/semanticTokensStylingService.js';
+import '../editor/common/services/treeViewsDndService.js';
+import './services/textMate/browser/textMateTokenizationFeature.contribution.js';
+import './services/treeSitter/browser/treeSitterTokenizationFeature.contribution.js';
+import './services/userActivity/common/userActivityService.js';
+import './services/userActivity/browser/userActivityBrowser.js';
+import './services/editor/browser/editorPaneService.js';
+import './services/editor/common/customEditorLabelService.js';
 
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionGalleryService';
-import { GlobalExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionEnablementService';
-import { IExtensionGalleryService, IGlobalExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { ContextViewService } from 'vs/platform/contextview/browser/contextViewService';
-import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IListService, ListService } from 'vs/platform/list/browser/listService';
-import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { EditorWorkerService } from 'vs/editor/browser/services/editorWorkerService';
-import { MarkerDecorationsService } from 'vs/editor/common/services/markerDecorationsService';
-import { IMarkerDecorationsService } from 'vs/editor/common/services/markerDecorations';
-import { IMarkerService } from 'vs/platform/markers/common/markers';
-import { MarkerService } from 'vs/platform/markers/common/markerService';
-import { ContextKeyService } from 'vs/platform/contextkey/browser/contextKeyService';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
-import { TextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfigurationService';
-import { IDownloadService } from 'vs/platform/download/common/download';
-import { DownloadService } from 'vs/platform/download/common/downloadService';
-import { OpenerService } from 'vs/editor/browser/services/openerService';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IgnoredExtensionsManagementService, IIgnoredExtensionsManagementService } from 'vs/platform/userDataSync/common/ignoredExtensions';
-import { ExtensionStorageService, IExtensionStorageService } from 'vs/platform/extensionManagement/common/extensionStorage';
-import { IUserDataSyncLogService } from 'vs/platform/userDataSync/common/userDataSync';
-import { UserDataSyncLogService } from 'vs/platform/userDataSync/common/userDataSyncLog';
+import { InstantiationType, registerSingleton } from '../platform/instantiation/common/extensions.js';
+import { ExtensionGalleryService } from '../platform/extensionManagement/common/extensionGalleryService.js';
+import { GlobalExtensionEnablementService } from '../platform/extensionManagement/common/extensionEnablementService.js';
+import { IExtensionGalleryService, IGlobalExtensionEnablementService } from '../platform/extensionManagement/common/extensionManagement.js';
+import { ContextViewService } from '../platform/contextview/browser/contextViewService.js';
+import { IContextViewService } from '../platform/contextview/browser/contextView.js';
+import { IListService, ListService } from '../platform/list/browser/listService.js';
+import { IEditorWorkerService } from '../editor/common/services/editorWorker.js';
+import { WorkbenchEditorWorkerService } from './contrib/codeEditor/browser/workbenchEditorWorkerService.js';
+import { MarkerDecorationsService } from '../editor/common/services/markerDecorationsService.js';
+import { IMarkerDecorationsService } from '../editor/common/services/markerDecorations.js';
+import { IMarkerService } from '../platform/markers/common/markers.js';
+import { MarkerService } from '../platform/markers/common/markerService.js';
+import { ContextKeyService } from '../platform/contextkey/browser/contextKeyService.js';
+import { IContextKeyService } from '../platform/contextkey/common/contextkey.js';
+import { ITextResourceConfigurationService } from '../editor/common/services/textResourceConfiguration.js';
+import { TextResourceConfigurationService } from '../editor/common/services/textResourceConfigurationService.js';
+import { IDownloadService } from '../platform/download/common/download.js';
+import { DownloadService } from '../platform/download/common/downloadService.js';
+import { OpenerService } from '../editor/browser/services/openerService.js';
+import { IOpenerService } from '../platform/opener/common/opener.js';
+import { IgnoredExtensionsManagementService, IIgnoredExtensionsManagementService } from '../platform/userDataSync/common/ignoredExtensions.js';
+import { ExtensionStorageService, IExtensionStorageService } from '../platform/extensionManagement/common/extensionStorage.js';
+import { IUserDataSyncLogService } from '../platform/userDataSync/common/userDataSync.js';
+import { UserDataSyncLogService } from '../platform/userDataSync/common/userDataSyncLog.js';
 
 registerSingleton(IUserDataSyncLogService, UserDataSyncLogService, InstantiationType.Delayed);
 registerSingleton(IIgnoredExtensionsManagementService, IgnoredExtensionsManagementService, InstantiationType.Delayed);
@@ -153,7 +154,7 @@ registerSingleton(IExtensionStorageService, ExtensionStorageService, Instantiati
 registerSingleton(IExtensionGalleryService, ExtensionGalleryService, InstantiationType.Delayed);
 registerSingleton(IContextViewService, ContextViewService, InstantiationType.Delayed);
 registerSingleton(IListService, ListService, InstantiationType.Delayed);
-registerSingleton(IEditorWorkerService, EditorWorkerService, InstantiationType.Eager /* registers link detection and word based suggestions for any document */);
+registerSingleton(IEditorWorkerService, WorkbenchEditorWorkerService, InstantiationType.Eager /* registers link detection and word based suggestions for any document */);
 registerSingleton(IMarkerDecorationsService, MarkerDecorationsService, InstantiationType.Delayed);
 registerSingleton(IMarkerService, MarkerService, InstantiationType.Delayed);
 registerSingleton(IContextKeyService, ContextKeyService, InstantiationType.Delayed);
@@ -167,231 +168,234 @@ registerSingleton(IOpenerService, OpenerService, InstantiationType.Delayed);
 //#region --- workbench contributions
 
 // Telemetry
-import 'vs/workbench/contrib/telemetry/browser/telemetry.contribution';
+import './contrib/telemetry/browser/telemetry.contribution.js';
 
 // Preferences
-import 'vs/workbench/contrib/preferences/browser/preferences.contribution';
-import 'vs/workbench/contrib/preferences/browser/keybindingsEditorContribution';
-import 'vs/workbench/contrib/preferences/browser/preferencesSearch';
+import './contrib/preferences/browser/preferences.contribution.js';
+import './contrib/preferences/browser/keybindingsEditorContribution.js';
+import './contrib/preferences/browser/preferencesSearch.js';
 
 // Performance
-import 'vs/workbench/contrib/performance/browser/performance.contribution';
+import './contrib/performance/browser/performance.contribution.js';
 
 // Context Menus
-import 'vs/workbench/contrib/contextmenu/browser/contextmenu.contribution';
+import './contrib/contextmenu/browser/contextmenu.contribution.js';
 
 // Notebook
-import 'vs/workbench/contrib/notebook/browser/notebook.contribution';
+import './contrib/notebook/browser/notebook.contribution.js';
 
 // Speech
-import 'vs/workbench/contrib/speech/browser/speech.contribution';
+import './contrib/speech/browser/speech.contribution.js';
 
 // Chat
-import 'vs/workbench/contrib/chat/browser/chat.contribution';
-import 'vs/workbench/contrib/inlineChat/browser/inlineChat.contribution';
+import './contrib/chat/browser/chat.contribution.js';
+import './contrib/inlineChat/browser/inlineChat.contribution.js';
 
 // Interactive
-import 'vs/workbench/contrib/interactive/browser/interactive.contribution';
+import './contrib/interactive/browser/interactive.contribution.js';
+
+// repl
+import './contrib/replNotebook/browser/repl.contribution.js';
 
 // Testing
-import 'vs/workbench/contrib/testing/browser/testing.contribution';
+import './contrib/testing/browser/testing.contribution.js';
 
 // Logs
-import 'vs/workbench/contrib/logs/common/logs.contribution';
+import './contrib/logs/common/logs.contribution.js';
 
 // Quickaccess
-import 'vs/workbench/contrib/quickaccess/browser/quickAccess.contribution';
+import './contrib/quickaccess/browser/quickAccess.contribution.js';
 
 // Explorer
-import 'vs/workbench/contrib/files/browser/explorerViewlet';
-import 'vs/workbench/contrib/files/browser/fileActions.contribution';
-import 'vs/workbench/contrib/files/browser/files.contribution';
+import './contrib/files/browser/explorerViewlet.js';
+import './contrib/files/browser/fileActions.contribution.js';
+import './contrib/files/browser/files.contribution.js';
 
 // Bulk Edit
-import 'vs/workbench/contrib/bulkEdit/browser/bulkEditService';
-import 'vs/workbench/contrib/bulkEdit/browser/preview/bulkEdit.contribution';
+import './contrib/bulkEdit/browser/bulkEditService.js';
+import './contrib/bulkEdit/browser/preview/bulkEdit.contribution.js';
 
 // Search
-import 'vs/workbench/contrib/search/browser/search.contribution';
-import 'vs/workbench/contrib/search/browser/searchView';
+import './contrib/search/browser/search.contribution.js';
+import './contrib/search/browser/searchView.js';
 
 // Search Editor
-import 'vs/workbench/contrib/searchEditor/browser/searchEditor.contribution';
+import './contrib/searchEditor/browser/searchEditor.contribution.js';
 
 // Sash
-import 'vs/workbench/contrib/sash/browser/sash.contribution';
+import './contrib/sash/browser/sash.contribution.js';
 
 // SCM
-import 'vs/workbench/contrib/scm/browser/scm.contribution';
+import './contrib/scm/browser/scm.contribution.js';
 
 // Debug
-import 'vs/workbench/contrib/debug/browser/debug.contribution';
-import 'vs/workbench/contrib/debug/browser/debugEditorContribution';
-import 'vs/workbench/contrib/debug/browser/breakpointEditorContribution';
-import 'vs/workbench/contrib/debug/browser/callStackEditorContribution';
-import 'vs/workbench/contrib/debug/browser/repl';
-import 'vs/workbench/contrib/debug/browser/debugViewlet';
+import './contrib/debug/browser/debug.contribution.js';
+import './contrib/debug/browser/debugEditorContribution.js';
+import './contrib/debug/browser/breakpointEditorContribution.js';
+import './contrib/debug/browser/callStackEditorContribution.js';
+import './contrib/debug/browser/repl.js';
+import './contrib/debug/browser/debugViewlet.js';
 
 // Markers
-import 'vs/workbench/contrib/markers/browser/markers.contribution';
+import './contrib/markers/browser/markers.contribution.js';
 
 // Merge Editor
-import 'vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution';
+import './contrib/mergeEditor/browser/mergeEditor.contribution.js';
 
 // Multi Diff Editor
-import 'vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.contribution';
+import './contrib/multiDiffEditor/browser/multiDiffEditor.contribution.js';
 
 // Mapped Edits
-import 'vs/workbench/contrib/mappedEdits/common/mappedEdits.contribution';
+import './contrib/mappedEdits/common/mappedEdits.contribution.js';
 
 // Commands
-import 'vs/workbench/contrib/commands/common/commands.contribution';
+import './contrib/commands/common/commands.contribution.js';
 
 // Comments
-import 'vs/workbench/contrib/comments/browser/comments.contribution';
+import './contrib/comments/browser/comments.contribution.js';
 
 // URL Support
-import 'vs/workbench/contrib/url/browser/url.contribution';
+import './contrib/url/browser/url.contribution.js';
 
 // Webview
-import 'vs/workbench/contrib/webview/browser/webview.contribution';
-import 'vs/workbench/contrib/webviewPanel/browser/webviewPanel.contribution';
-import 'vs/workbench/contrib/webviewView/browser/webviewView.contribution';
-import 'vs/workbench/contrib/customEditor/browser/customEditor.contribution';
+import './contrib/webview/browser/webview.contribution.js';
+import './contrib/webviewPanel/browser/webviewPanel.contribution.js';
+import './contrib/webviewView/browser/webviewView.contribution.js';
+import './contrib/customEditor/browser/customEditor.contribution.js';
 
 // External Uri Opener
-import 'vs/workbench/contrib/externalUriOpener/common/externalUriOpener.contribution';
+import './contrib/externalUriOpener/common/externalUriOpener.contribution.js';
 
 // Extensions Management
-import 'vs/workbench/contrib/extensions/browser/extensions.contribution';
-import 'vs/workbench/contrib/extensions/browser/extensionsViewlet';
+import './contrib/extensions/browser/extensions.contribution.js';
+import './contrib/extensions/browser/extensionsViewlet.js';
 
 // Output View
-import 'vs/workbench/contrib/output/common/outputChannelModelService';
-import 'vs/workbench/contrib/output/browser/output.contribution';
-import 'vs/workbench/contrib/output/browser/outputView';
+import './contrib/output/common/outputChannelModelService.js';
+import './contrib/output/browser/output.contribution.js';
+import './contrib/output/browser/outputView.js';
 
 // Terminal
-import 'vs/workbench/contrib/terminal/terminal.all';
+import './contrib/terminal/terminal.all.js';
 
 // External terminal
-import 'vs/workbench/contrib/externalTerminal/browser/externalTerminal.contribution';
+import './contrib/externalTerminal/browser/externalTerminal.contribution.js';
 
 // Relauncher
-import 'vs/workbench/contrib/relauncher/browser/relauncher.contribution';
+import './contrib/relauncher/browser/relauncher.contribution.js';
 
 // Tasks
-import 'vs/workbench/contrib/tasks/browser/task.contribution';
+import './contrib/tasks/browser/task.contribution.js';
 
 // Remote
-import 'vs/workbench/contrib/remote/common/remote.contribution';
-import 'vs/workbench/contrib/remote/browser/remote.contribution';
+import './contrib/remote/common/remote.contribution.js';
+import './contrib/remote/browser/remote.contribution.js';
 
 // Emmet
-import 'vs/workbench/contrib/emmet/browser/emmet.contribution';
+import './contrib/emmet/browser/emmet.contribution.js';
 
 // CodeEditor Contributions
-import 'vs/workbench/contrib/codeEditor/browser/codeEditor.contribution';
+import './contrib/codeEditor/browser/codeEditor.contribution.js';
 
 // Keybindings Contributions
-import 'vs/workbench/contrib/keybindings/browser/keybindings.contribution';
+import './contrib/keybindings/browser/keybindings.contribution.js';
 
 // Snippets
-import 'vs/workbench/contrib/snippets/browser/snippets.contribution';
+import './contrib/snippets/browser/snippets.contribution.js';
 
 // Formatter Help
-import 'vs/workbench/contrib/format/browser/format.contribution';
+import './contrib/format/browser/format.contribution.js';
 
 // Folding
-import 'vs/workbench/contrib/folding/browser/folding.contribution';
+import './contrib/folding/browser/folding.contribution.js';
 
 // Limit Indicator
-import 'vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution';
+import './contrib/limitIndicator/browser/limitIndicator.contribution.js';
 
 // Inlay Hint Accessibility
-import 'vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty';
+import './contrib/inlayHints/browser/inlayHintsAccessibilty.js';
 
 // Themes
-import 'vs/workbench/contrib/themes/browser/themes.contribution';
+import './contrib/themes/browser/themes.contribution.js';
 
 // Update
-import 'vs/workbench/contrib/update/browser/update.contribution';
+import './contrib/update/browser/update.contribution.js';
 
 // Surveys
-import 'vs/workbench/contrib/surveys/browser/nps.contribution';
-import 'vs/workbench/contrib/surveys/browser/ces.contribution';
-import 'vs/workbench/contrib/surveys/browser/languageSurveys.contribution';
+import './contrib/surveys/browser/nps.contribution.js';
+import './contrib/surveys/browser/languageSurveys.contribution.js';
 
 // Welcome
-import 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution';
-import 'vs/workbench/contrib/welcomeWalkthrough/browser/walkThrough.contribution';
-import 'vs/workbench/contrib/welcomeViews/common/viewsWelcome.contribution';
-import 'vs/workbench/contrib/welcomeViews/common/newFile.contribution';
+import './contrib/welcomeGettingStarted/browser/gettingStarted.contribution.js';
+import './contrib/welcomeWalkthrough/browser/walkThrough.contribution.js';
+import './contrib/welcomeViews/common/viewsWelcome.contribution.js';
+import './contrib/welcomeViews/common/newFile.contribution.js';
 
 // Call Hierarchy
-import 'vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution';
+import './contrib/callHierarchy/browser/callHierarchy.contribution.js';
 
 // Type Hierarchy
-import 'vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution';
+import './contrib/typeHierarchy/browser/typeHierarchy.contribution.js';
 
 // Outline
-import 'vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsOutline';
-import 'vs/workbench/contrib/outline/browser/outline.contribution';
+import './contrib/codeEditor/browser/outline/documentSymbolsOutline.js';
+import './contrib/outline/browser/outline.contribution.js';
 
 // Language Detection
-import 'vs/workbench/contrib/languageDetection/browser/languageDetection.contribution';
+import './contrib/languageDetection/browser/languageDetection.contribution.js';
 
 // Language Status
-import 'vs/workbench/contrib/languageStatus/browser/languageStatus.contribution';
+import './contrib/languageStatus/browser/languageStatus.contribution.js';
 
 // Authentication
-import 'vs/workbench/contrib/authentication/browser/authentication.contribution';
+import './contrib/authentication/browser/authentication.contribution.js';
 
 // User Data Sync
-import 'vs/workbench/contrib/userDataSync/browser/userDataSync.contribution';
+import './contrib/userDataSync/browser/userDataSync.contribution.js';
 
 // User Data Profiles
-import 'vs/workbench/contrib/userDataProfile/browser/userDataProfile.contribution';
+import './contrib/userDataProfile/browser/userDataProfile.contribution.js';
 
 // Continue Edit Session
-import 'vs/workbench/contrib/editSessions/browser/editSessions.contribution';
+import './contrib/editSessions/browser/editSessions.contribution.js';
 
 // Code Actions
-import 'vs/workbench/contrib/codeActions/browser/codeActions.contribution';
+import './contrib/codeActions/browser/codeActions.contribution.js';
 
 // Timeline
-import 'vs/workbench/contrib/timeline/browser/timeline.contribution';
+import './contrib/timeline/browser/timeline.contribution.js';
 
 // Local History
-import 'vs/workbench/contrib/localHistory/browser/localHistory.contribution';
+import './contrib/localHistory/browser/localHistory.contribution.js';
 
 // Workspace
-import 'vs/workbench/contrib/workspace/browser/workspace.contribution';
+import './contrib/workspace/browser/workspace.contribution.js';
 
 // Workspaces
-import 'vs/workbench/contrib/workspaces/browser/workspaces.contribution';
+import './contrib/workspaces/browser/workspaces.contribution.js';
 
 // List
-import 'vs/workbench/contrib/list/browser/list.contribution';
+import './contrib/list/browser/list.contribution.js';
 
 // Accessibility Signals
-import 'vs/workbench/contrib/accessibilitySignals/browser/accessibilitySignal.contribution';
+import './contrib/accessibilitySignals/browser/accessibilitySignal.contribution.js';
 
 // Deprecated Extension Migrator
-import 'vs/workbench/contrib/deprecatedExtensionMigrator/browser/deprecatedExtensionMigrator.contribution';
+import './contrib/deprecatedExtensionMigrator/browser/deprecatedExtensionMigrator.contribution.js';
 
 // Bracket Pair Colorizer 2 Telemetry
-import 'vs/workbench/contrib/bracketPairColorizer2Telemetry/browser/bracketPairColorizer2Telemetry.contribution';
+import './contrib/bracketPairColorizer2Telemetry/browser/bracketPairColorizer2Telemetry.contribution.js';
 
 // Accessibility
-import 'vs/workbench/contrib/accessibility/browser/accessibility.contribution';
+import './contrib/accessibility/browser/accessibility.contribution.js';
 
 // Share
-import 'vs/workbench/contrib/share/browser/share.contribution';
+import './contrib/share/browser/share.contribution.js';
 
 // Account Entitlements
-import 'vs/workbench/contrib/accountEntitlements/browser/accountsEntitlements.contribution';
+import './contrib/accountEntitlements/browser/accountsEntitlements.contribution.js';
 
 // Synchronized Scrolling
-import 'vs/workbench/contrib/scrollLocking/browser/scrollLocking.contribution';
+import './contrib/scrollLocking/browser/scrollLocking.contribution.js';
+
 //#endregion
diff --git a/src/vs/workbench/workbench.desktop.main.ts b/src/vs/workbench/workbench.desktop.main.ts
index c4b6e9c27d0..57bf9f0167c 100644
--- a/src/vs/workbench/workbench.desktop.main.ts
+++ b/src/vs/workbench/workbench.desktop.main.ts
@@ -12,82 +12,82 @@
 
 //#region --- workbench common
 
-import 'vs/workbench/workbench.common.main';
+import './workbench.common.main.js';
 
 //#endregion
 
 
 //#region --- workbench (desktop main)
 
-import 'vs/workbench/electron-sandbox/desktop.main';
-import 'vs/workbench/electron-sandbox/desktop.contribution';
+import './electron-sandbox/desktop.main.js';
+import './electron-sandbox/desktop.contribution.js';
 
 //#endregion
 
 
 //#region --- workbench parts
 
-import 'vs/workbench/electron-sandbox/parts/dialogs/dialog.contribution';
+import './electron-sandbox/parts/dialogs/dialog.contribution.js';
 
 //#endregion
 
 
 //#region --- workbench services
 
-import 'vs/workbench/services/textfile/electron-sandbox/nativeTextFileService';
-import 'vs/workbench/services/dialogs/electron-sandbox/fileDialogService';
-import 'vs/workbench/services/workspaces/electron-sandbox/workspacesService';
-import 'vs/workbench/services/menubar/electron-sandbox/menubarService';
-import 'vs/workbench/services/update/electron-sandbox/updateService';
-import 'vs/workbench/services/url/electron-sandbox/urlService';
-import 'vs/workbench/services/lifecycle/electron-sandbox/lifecycleService';
-import 'vs/workbench/services/title/electron-sandbox/titleService';
-import 'vs/workbench/services/host/electron-sandbox/nativeHostService';
-import 'vs/workbench/services/request/electron-sandbox/requestService';
-import 'vs/workbench/services/clipboard/electron-sandbox/clipboardService';
-import 'vs/workbench/services/contextmenu/electron-sandbox/contextmenuService';
-import 'vs/workbench/services/workspaces/electron-sandbox/workspaceEditingService';
-import 'vs/workbench/services/configurationResolver/electron-sandbox/configurationResolverService';
-import 'vs/workbench/services/accessibility/electron-sandbox/accessibilityService';
-import 'vs/workbench/services/keybinding/electron-sandbox/nativeKeyboardLayout';
-import 'vs/workbench/services/path/electron-sandbox/pathService';
-import 'vs/workbench/services/themes/electron-sandbox/nativeHostColorSchemeService';
-import 'vs/workbench/services/extensionManagement/electron-sandbox/extensionManagementService';
-import 'vs/workbench/services/encryption/electron-sandbox/encryptionService';
-import 'vs/workbench/services/secrets/electron-sandbox/secretStorageService';
-import 'vs/workbench/services/localization/electron-sandbox/languagePackService';
-import 'vs/workbench/services/telemetry/electron-sandbox/telemetryService';
-import 'vs/workbench/services/extensions/electron-sandbox/extensionHostStarter';
-import 'vs/platform/extensionResourceLoader/common/extensionResourceLoaderService';
-import 'vs/workbench/services/localization/electron-sandbox/localeService';
-import 'vs/workbench/services/extensions/electron-sandbox/extensionsScannerService';
-import 'vs/workbench/services/extensionManagement/electron-sandbox/extensionManagementServerService';
-import 'vs/workbench/services/extensionManagement/electron-sandbox/extensionTipsService';
-import 'vs/workbench/services/userDataSync/electron-sandbox/userDataSyncService';
-import 'vs/workbench/services/userDataSync/electron-sandbox/userDataAutoSyncService';
-import 'vs/workbench/services/timer/electron-sandbox/timerService';
-import 'vs/workbench/services/environment/electron-sandbox/shellEnvironmentService';
-import 'vs/workbench/services/integrity/electron-sandbox/integrityService';
-import 'vs/workbench/services/workingCopy/electron-sandbox/workingCopyBackupService';
-import 'vs/workbench/services/checksum/electron-sandbox/checksumService';
-import 'vs/platform/remote/electron-sandbox/sharedProcessTunnelService';
-import 'vs/workbench/services/tunnel/electron-sandbox/tunnelService';
-import 'vs/platform/diagnostics/electron-sandbox/diagnosticsService';
-import 'vs/platform/profiling/electron-sandbox/profilingService';
-import 'vs/platform/telemetry/electron-sandbox/customEndpointTelemetryService';
-import 'vs/platform/remoteTunnel/electron-sandbox/remoteTunnelService';
-import 'vs/workbench/services/files/electron-sandbox/elevatedFileService';
-import 'vs/workbench/services/search/electron-sandbox/searchService';
-import 'vs/workbench/services/workingCopy/electron-sandbox/workingCopyHistoryService';
-import 'vs/workbench/services/userDataSync/browser/userDataSyncEnablementService';
-import 'vs/workbench/services/extensions/electron-sandbox/nativeExtensionService';
-import 'vs/platform/userDataProfile/electron-sandbox/userDataProfileStorageService';
-import 'vs/workbench/services/auxiliaryWindow/electron-sandbox/auxiliaryWindowService';
-import 'vs/platform/extensionManagement/electron-sandbox/extensionsProfileScannerService';
+import './services/textfile/electron-sandbox/nativeTextFileService.js';
+import './services/dialogs/electron-sandbox/fileDialogService.js';
+import './services/workspaces/electron-sandbox/workspacesService.js';
+import './services/menubar/electron-sandbox/menubarService.js';
+import './services/update/electron-sandbox/updateService.js';
+import './services/url/electron-sandbox/urlService.js';
+import './services/lifecycle/electron-sandbox/lifecycleService.js';
+import './services/title/electron-sandbox/titleService.js';
+import './services/host/electron-sandbox/nativeHostService.js';
+import './services/request/electron-sandbox/requestService.js';
+import './services/clipboard/electron-sandbox/clipboardService.js';
+import './services/contextmenu/electron-sandbox/contextmenuService.js';
+import './services/workspaces/electron-sandbox/workspaceEditingService.js';
+import './services/configurationResolver/electron-sandbox/configurationResolverService.js';
+import './services/accessibility/electron-sandbox/accessibilityService.js';
+import './services/keybinding/electron-sandbox/nativeKeyboardLayout.js';
+import './services/path/electron-sandbox/pathService.js';
+import './services/themes/electron-sandbox/nativeHostColorSchemeService.js';
+import './services/extensionManagement/electron-sandbox/extensionManagementService.js';
+import './services/encryption/electron-sandbox/encryptionService.js';
+import './services/secrets/electron-sandbox/secretStorageService.js';
+import './services/localization/electron-sandbox/languagePackService.js';
+import './services/telemetry/electron-sandbox/telemetryService.js';
+import './services/extensions/electron-sandbox/extensionHostStarter.js';
+import '../platform/extensionResourceLoader/common/extensionResourceLoaderService.js';
+import './services/localization/electron-sandbox/localeService.js';
+import './services/extensions/electron-sandbox/extensionsScannerService.js';
+import './services/extensionManagement/electron-sandbox/extensionManagementServerService.js';
+import './services/extensionManagement/electron-sandbox/extensionTipsService.js';
+import './services/userDataSync/electron-sandbox/userDataSyncService.js';
+import './services/userDataSync/electron-sandbox/userDataAutoSyncService.js';
+import './services/timer/electron-sandbox/timerService.js';
+import './services/environment/electron-sandbox/shellEnvironmentService.js';
+import './services/integrity/electron-sandbox/integrityService.js';
+import './services/workingCopy/electron-sandbox/workingCopyBackupService.js';
+import './services/checksum/electron-sandbox/checksumService.js';
+import '../platform/remote/electron-sandbox/sharedProcessTunnelService.js';
+import './services/tunnel/electron-sandbox/tunnelService.js';
+import '../platform/diagnostics/electron-sandbox/diagnosticsService.js';
+import '../platform/profiling/electron-sandbox/profilingService.js';
+import '../platform/telemetry/electron-sandbox/customEndpointTelemetryService.js';
+import '../platform/remoteTunnel/electron-sandbox/remoteTunnelService.js';
+import './services/files/electron-sandbox/elevatedFileService.js';
+import './services/search/electron-sandbox/searchService.js';
+import './services/workingCopy/electron-sandbox/workingCopyHistoryService.js';
+import './services/userDataSync/browser/userDataSyncEnablementService.js';
+import './services/extensions/electron-sandbox/nativeExtensionService.js';
+import '../platform/userDataProfile/electron-sandbox/userDataProfileStorageService.js';
+import './services/auxiliaryWindow/electron-sandbox/auxiliaryWindowService.js';
+import '../platform/extensionManagement/electron-sandbox/extensionsProfileScannerService.js';
 
-import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IUserDataInitializationService, UserDataInitializationService } from 'vs/workbench/services/userData/browser/userDataInit';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
+import { registerSingleton } from '../platform/instantiation/common/extensions.js';
+import { IUserDataInitializationService, UserDataInitializationService } from './services/userData/browser/userDataInit.js';
+import { SyncDescriptor } from '../platform/instantiation/common/descriptors.js';
 
 registerSingleton(IUserDataInitializationService, new SyncDescriptor(UserDataInitializationService, [[]], true));
 
@@ -98,81 +98,87 @@ registerSingleton(IUserDataInitializationService, new SyncDescriptor(UserDataIni
 //#region --- workbench contributions
 
 // Logs
-import 'vs/workbench/contrib/logs/electron-sandbox/logs.contribution';
+import './contrib/logs/electron-sandbox/logs.contribution.js';
 
 // Localizations
-import 'vs/workbench/contrib/localization/electron-sandbox/localization.contribution';
+import './contrib/localization/electron-sandbox/localization.contribution.js';
 
 // Explorer
-import 'vs/workbench/contrib/files/electron-sandbox/fileActions.contribution';
+import './contrib/files/electron-sandbox/fileActions.contribution.js';
 
 // CodeEditor Contributions
-import 'vs/workbench/contrib/codeEditor/electron-sandbox/codeEditor.contribution';
+import './contrib/codeEditor/electron-sandbox/codeEditor.contribution.js';
 
 // Debug
-import 'vs/workbench/contrib/debug/electron-sandbox/extensionHostDebugService';
+import './contrib/debug/electron-sandbox/extensionHostDebugService.js';
 
 // Extensions Management
-import 'vs/workbench/contrib/extensions/electron-sandbox/extensions.contribution';
+import './contrib/extensions/electron-sandbox/extensions.contribution.js';
 
 // Issues
-import 'vs/workbench/contrib/issue/electron-sandbox/issue.contribution';
+import './contrib/issue/electron-sandbox/issue.contribution.js';
+
+// Process
+import './contrib/issue/electron-sandbox/process.contribution.js';
 
 // Remote
-import 'vs/workbench/contrib/remote/electron-sandbox/remote.contribution';
+import './contrib/remote/electron-sandbox/remote.contribution.js';
 
 // Configuration Exporter
-import 'vs/workbench/contrib/configExporter/electron-sandbox/configurationExportHelper.contribution';
+import './contrib/configExporter/electron-sandbox/configurationExportHelper.contribution.js';
 
 // Terminal
-import 'vs/workbench/contrib/terminal/electron-sandbox/terminal.contribution';
+import './contrib/terminal/electron-sandbox/terminal.contribution.js';
 
 // Themes
-import 'vs/workbench/contrib/themes/browser/themes.test.contribution';
-import 'vs/workbench/services/themes/electron-sandbox/themes.contribution';
+import './contrib/themes/browser/themes.test.contribution.js';
+import './services/themes/electron-sandbox/themes.contribution.js';
 
 // User Data Sync
-import 'vs/workbench/contrib/userDataSync/electron-sandbox/userDataSync.contribution';
+import './contrib/userDataSync/electron-sandbox/userDataSync.contribution.js';
 
 // Tags
-import 'vs/workbench/contrib/tags/electron-sandbox/workspaceTagsService';
-import 'vs/workbench/contrib/tags/electron-sandbox/tags.contribution';
+import './contrib/tags/electron-sandbox/workspaceTagsService.js';
+import './contrib/tags/electron-sandbox/tags.contribution.js';
 
 // Performance
-import 'vs/workbench/contrib/performance/electron-sandbox/performance.contribution';
+import './contrib/performance/electron-sandbox/performance.contribution.js';
 
 // Tasks
-import 'vs/workbench/contrib/tasks/electron-sandbox/taskService';
+import './contrib/tasks/electron-sandbox/taskService.js';
 
 // External terminal
-import 'vs/workbench/contrib/externalTerminal/electron-sandbox/externalTerminal.contribution';
+import './contrib/externalTerminal/electron-sandbox/externalTerminal.contribution.js';
 
 // Webview
-import 'vs/workbench/contrib/webview/electron-sandbox/webview.contribution';
+import './contrib/webview/electron-sandbox/webview.contribution.js';
 
 // Splash
-import 'vs/workbench/contrib/splash/electron-sandbox/splash.contribution';
+import './contrib/splash/electron-sandbox/splash.contribution.js';
 
 // Local History
-import 'vs/workbench/contrib/localHistory/electron-sandbox/localHistory.contribution';
+import './contrib/localHistory/electron-sandbox/localHistory.contribution.js';
 
 // Merge Editor
-import 'vs/workbench/contrib/mergeEditor/electron-sandbox/mergeEditor.contribution';
+import './contrib/mergeEditor/electron-sandbox/mergeEditor.contribution.js';
 
 // Multi Diff Editor
-import 'vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.contribution';
+import './contrib/multiDiffEditor/browser/multiDiffEditor.contribution.js';
 
 // Remote Tunnel
-import 'vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution';
+import './contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.js';
 
 // Chat
-import 'vs/workbench/contrib/chat/electron-sandbox/chat.contribution';
-import 'vs/workbench/contrib/inlineChat/electron-sandbox/inlineChat.contribution';
+import './contrib/chat/electron-sandbox/chat.contribution.js';
+import './contrib/inlineChat/electron-sandbox/inlineChat.contribution.js';
 
 // Encryption
-import 'vs/workbench/contrib/encryption/electron-sandbox/encryption.contribution';
+import './contrib/encryption/electron-sandbox/encryption.contribution.js';
+
+// Emergency Alert
+import './contrib/emergencyAlert/electron-sandbox/emergencyAlert.contribution.js';
 
 //#endregion
 
 
-export { main } from 'vs/workbench/electron-sandbox/desktop.main';
+export { main } from './electron-sandbox/desktop.main.js';
diff --git a/src/vs/workbench/workbench.web.main.css b/src/vs/workbench/workbench.web.main.css
deleted file mode 100644
index 3a0641938d5..00000000000
--- a/src/vs/workbench/workbench.web.main.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-/* NOTE: THIS FILE WILL BE OVERWRITTEN DURING BUILD TIME, DO NOT EDIT */
diff --git a/src/vs/workbench/workbench.web.main.internal.ts b/src/vs/workbench/workbench.web.main.internal.ts
new file mode 100644
index 00000000000..402696a4a83
--- /dev/null
+++ b/src/vs/workbench/workbench.web.main.internal.ts
@@ -0,0 +1,240 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+
+// #######################################################################
+// ###                                                                 ###
+// ### !!! PLEASE ADD COMMON IMPORTS INTO WORKBENCH.COMMON.MAIN.TS !!! ###
+// ###                                                                 ###
+// #######################################################################
+
+
+//#region --- workbench common
+
+import './workbench.common.main.js';
+
+//#endregion
+
+
+//#region --- workbench parts
+
+import './browser/parts/dialogs/dialog.web.contribution.js';
+
+//#endregion
+
+
+//#region --- workbench (web main)
+
+import './browser/web.main.js';
+
+//#endregion
+
+
+//#region --- workbench services
+
+import './services/integrity/browser/integrityService.js';
+import './services/search/browser/searchService.js';
+import './services/textfile/browser/browserTextFileService.js';
+import './services/keybinding/browser/keyboardLayoutService.js';
+import './services/extensions/browser/extensionService.js';
+import './services/extensionManagement/browser/extensionsProfileScannerService.js';
+import './services/extensions/browser/extensionsScannerService.js';
+import './services/extensionManagement/browser/webExtensionsScannerService.js';
+import './services/extensionManagement/common/extensionManagementServerService.js';
+import './services/telemetry/browser/telemetryService.js';
+import './services/url/browser/urlService.js';
+import './services/update/browser/updateService.js';
+import './services/workspaces/browser/workspacesService.js';
+import './services/workspaces/browser/workspaceEditingService.js';
+import './services/dialogs/browser/fileDialogService.js';
+import './services/host/browser/browserHostService.js';
+import './services/lifecycle/browser/lifecycleService.js';
+import './services/clipboard/browser/clipboardService.js';
+import './services/localization/browser/localeService.js';
+import './services/path/browser/pathService.js';
+import './services/themes/browser/browserHostColorSchemeService.js';
+import './services/encryption/browser/encryptionService.js';
+import './services/secrets/browser/secretStorageService.js';
+import './services/workingCopy/browser/workingCopyBackupService.js';
+import './services/tunnel/browser/tunnelService.js';
+import './services/files/browser/elevatedFileService.js';
+import './services/workingCopy/browser/workingCopyHistoryService.js';
+import './services/userDataSync/browser/webUserDataSyncEnablementService.js';
+import './services/userDataProfile/browser/userDataProfileStorageService.js';
+import './services/configurationResolver/browser/configurationResolverService.js';
+import '../platform/extensionResourceLoader/browser/extensionResourceLoaderService.js';
+import './services/auxiliaryWindow/browser/auxiliaryWindowService.js';
+
+import { InstantiationType, registerSingleton } from '../platform/instantiation/common/extensions.js';
+import { IAccessibilityService } from '../platform/accessibility/common/accessibility.js';
+import { IContextMenuService } from '../platform/contextview/browser/contextView.js';
+import { ContextMenuService } from '../platform/contextview/browser/contextMenuService.js';
+import { IExtensionTipsService } from '../platform/extensionManagement/common/extensionManagement.js';
+import { ExtensionTipsService } from '../platform/extensionManagement/common/extensionTipsService.js';
+import { IWorkbenchExtensionManagementService } from './services/extensionManagement/common/extensionManagement.js';
+import { ExtensionManagementService } from './services/extensionManagement/common/extensionManagementService.js';
+import { LogLevel } from '../platform/log/common/log.js';
+import { UserDataSyncMachinesService, IUserDataSyncMachinesService } from '../platform/userDataSync/common/userDataSyncMachines.js';
+import { IUserDataSyncStoreService, IUserDataSyncService, IUserDataAutoSyncService, IUserDataSyncLocalStoreService, IUserDataSyncResourceProviderService } from '../platform/userDataSync/common/userDataSync.js';
+import { UserDataSyncStoreService } from '../platform/userDataSync/common/userDataSyncStoreService.js';
+import { UserDataSyncLocalStoreService } from '../platform/userDataSync/common/userDataSyncLocalStoreService.js';
+import { UserDataSyncService } from '../platform/userDataSync/common/userDataSyncService.js';
+import { IUserDataSyncAccountService, UserDataSyncAccountService } from '../platform/userDataSync/common/userDataSyncAccount.js';
+import { UserDataAutoSyncService } from '../platform/userDataSync/common/userDataAutoSyncService.js';
+import { AccessibilityService } from '../platform/accessibility/browser/accessibilityService.js';
+import { ICustomEndpointTelemetryService } from '../platform/telemetry/common/telemetry.js';
+import { NullEndpointTelemetryService } from '../platform/telemetry/common/telemetryUtils.js';
+import { ITitleService } from './services/title/browser/titleService.js';
+import { BrowserTitleService } from './browser/parts/titlebar/titlebarPart.js';
+import { ITimerService, TimerService } from './services/timer/browser/timerService.js';
+import { IDiagnosticsService, NullDiagnosticsService } from '../platform/diagnostics/common/diagnostics.js';
+import { ILanguagePackService } from '../platform/languagePacks/common/languagePacks.js';
+import { WebLanguagePacksService } from '../platform/languagePacks/browser/languagePacks.js';
+
+registerSingleton(IWorkbenchExtensionManagementService, ExtensionManagementService, InstantiationType.Delayed);
+registerSingleton(IAccessibilityService, AccessibilityService, InstantiationType.Delayed);
+registerSingleton(IContextMenuService, ContextMenuService, InstantiationType.Delayed);
+registerSingleton(IUserDataSyncStoreService, UserDataSyncStoreService, InstantiationType.Delayed);
+registerSingleton(IUserDataSyncMachinesService, UserDataSyncMachinesService, InstantiationType.Delayed);
+registerSingleton(IUserDataSyncLocalStoreService, UserDataSyncLocalStoreService, InstantiationType.Delayed);
+registerSingleton(IUserDataSyncAccountService, UserDataSyncAccountService, InstantiationType.Delayed);
+registerSingleton(IUserDataSyncService, UserDataSyncService, InstantiationType.Delayed);
+registerSingleton(IUserDataSyncResourceProviderService, UserDataSyncResourceProviderService, InstantiationType.Delayed);
+registerSingleton(IUserDataAutoSyncService, UserDataAutoSyncService, InstantiationType.Eager /* Eager to start auto sync */);
+registerSingleton(ITitleService, BrowserTitleService, InstantiationType.Eager);
+registerSingleton(IExtensionTipsService, ExtensionTipsService, InstantiationType.Delayed);
+registerSingleton(ITimerService, TimerService, InstantiationType.Delayed);
+registerSingleton(ICustomEndpointTelemetryService, NullEndpointTelemetryService, InstantiationType.Delayed);
+registerSingleton(IDiagnosticsService, NullDiagnosticsService, InstantiationType.Delayed);
+registerSingleton(ILanguagePackService, WebLanguagePacksService, InstantiationType.Delayed);
+
+//#endregion
+
+
+//#region --- workbench contributions
+
+// Logs
+import './contrib/logs/browser/logs.contribution.js';
+
+// Localization
+import './contrib/localization/browser/localization.contribution.js';
+
+// Performance
+import './contrib/performance/browser/performance.web.contribution.js';
+
+// Preferences
+import './contrib/preferences/browser/keyboardLayoutPicker.js';
+
+// Debug
+import './contrib/debug/browser/extensionHostDebugService.js';
+
+// Welcome Banner
+import './contrib/welcomeBanner/browser/welcomeBanner.contribution.js';
+
+// Welcome Dialog
+import './contrib/welcomeDialog/browser/welcomeDialog.contribution.js';
+
+// Webview
+import './contrib/webview/browser/webview.web.contribution.js';
+
+// Extensions Management
+import './contrib/extensions/browser/extensions.web.contribution.js';
+
+// Terminal
+import './contrib/terminal/browser/terminal.web.contribution.js';
+import './contrib/externalTerminal/browser/externalTerminal.contribution.js';
+import './contrib/terminal/browser/terminalInstanceService.js';
+
+// Tasks
+import './contrib/tasks/browser/taskService.js';
+
+// Tags
+import './contrib/tags/browser/workspaceTagsService.js';
+
+// Issues
+import './contrib/issue/browser/issue.contribution.js';
+
+// Splash
+import './contrib/splash/browser/splash.contribution.js';
+
+// Remote Start Entry for the Web
+import './contrib/remote/browser/remoteStartEntry.contribution.js';
+
+//#endregion
+
+
+//#region --- export workbench factory
+
+// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+//
+// Do NOT change these exports in a way that something is removed unless
+// intentional. These exports are used by web embedders and thus require
+// an adoption when something changes.
+//
+// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+import { create, commands, env, window, workspace, logger } from './browser/web.factory.js';
+import { Menu } from './browser/web.api.js';
+import { URI } from '../base/common/uri.js';
+import { Event, Emitter } from '../base/common/event.js';
+import { Disposable } from '../base/common/lifecycle.js';
+import { GroupOrientation } from './services/editor/common/editorGroupsService.js';
+import { UserDataSyncResourceProviderService } from '../platform/userDataSync/common/userDataSyncResourceProvider.js';
+import { RemoteAuthorityResolverError, RemoteAuthorityResolverErrorCode } from '../platform/remote/common/remoteAuthorityResolver.js';
+
+// TODO@esm remove me once we stop supporting our web-esm-bridge
+if ((globalThis as any).__VSCODE_WEB_ESM_PROMISE) {
+	const exports = {
+
+		// Factory
+		create: create,
+
+		// Basic Types
+		URI: URI,
+		Event: Event,
+		Emitter: Emitter,
+		Disposable: Disposable,
+		// GroupOrientation,
+		LogLevel: LogLevel,
+		RemoteAuthorityResolverError: RemoteAuthorityResolverError,
+		RemoteAuthorityResolverErrorCode: RemoteAuthorityResolverErrorCode,
+
+		// Facade API
+		env: env,
+		window: window,
+		workspace: workspace,
+		commands: commands,
+		logger: logger,
+		Menu: Menu
+	};
+	(globalThis as any).__VSCODE_WEB_ESM_PROMISE(exports);
+	delete (globalThis as any).__VSCODE_WEB_ESM_PROMISE;
+}
+
+export {
+
+	// Factory
+	create,
+
+	// Basic Types
+	URI,
+	Event,
+	Emitter,
+	Disposable,
+	GroupOrientation,
+	LogLevel,
+	RemoteAuthorityResolverError,
+	RemoteAuthorityResolverErrorCode,
+
+	// Facade API
+	env,
+	window,
+	workspace,
+	commands,
+	logger,
+	Menu
+};
+
+//#endregion
diff --git a/src/vs/workbench/workbench.web.main.ts b/src/vs/workbench/workbench.web.main.ts
index e4a0a7e3e72..6673f33d1f2 100644
--- a/src/vs/workbench/workbench.web.main.ts
+++ b/src/vs/workbench/workbench.web.main.ts
@@ -4,208 +4,100 @@
  *--------------------------------------------------------------------------------------------*/
 
 
-// #######################################################################
-// ###                                                                 ###
-// ### !!! PLEASE ADD COMMON IMPORTS INTO WORKBENCH.COMMON.MAIN.TS !!! ###
-// ###                                                                 ###
-// #######################################################################
+// ####################################
+// ###                              ###
+// ### !!! PLEASE DO NOT MODIFY !!! ###
+// ###                              ###
+// ####################################
 
+// TODO@esm remove me once we stop supporting our web-esm-bridge
 
-//#region --- workbench common
+(function () {
 
-import 'vs/workbench/workbench.common.main';
+	// #region Types
+	type IGlobalDefine = {
+		(moduleName: string, dependencies: string[], callback: (...args: any[]) => any): any;
+		(moduleName: string, dependencies: string[], definition: any): any;
+		(moduleName: string, callback: (...args: any[]) => any): any;
+		(moduleName: string, definition: any): any;
+		(dependencies: string[], callback: (...args: any[]) => any): any;
+		(dependencies: string[], definition: any): any;
+	};
 
-//#endregion
+	interface ILoaderPlugin {
+		load: (pluginParam: string, parentRequire: IRelativeRequire, loadCallback: IPluginLoadCallback, options: IConfigurationOptions) => void;
+		write?: (pluginName: string, moduleName: string, write: IPluginWriteCallback) => void;
+		writeFile?: (pluginName: string, moduleName: string, req: IRelativeRequire, write: IPluginWriteFileCallback, config: IConfigurationOptions) => void;
+		finishBuild?: (write: (filename: string, contents: string) => void) => void;
+	}
+	interface IRelativeRequire {
+		(dependencies: string[], callback: Function, errorback?: (error: Error) => void): void;
+		toUrl(id: string): string;
+	}
+	interface IPluginLoadCallback {
+		(value: any): void;
+		error(err: any): void;
+	}
+	interface IConfigurationOptions {
+		isBuild: boolean | undefined;
+		[key: string]: any;
+	}
+	interface IPluginWriteCallback {
+		(contents: string): void;
+		getEntryPoint(): string;
+		asModule(moduleId: string, contents: string): void;
+	}
+	interface IPluginWriteFileCallback {
+		(filename: string, contents: string): void;
+		getEntryPoint(): string;
+		asModule(moduleId: string, contents: string): void;
+	}
 
+	//#endregion
 
-//#region --- workbench parts
+	const define: IGlobalDefine = (globalThis as any).define;
+	const require: { getConfig?(): any } | undefined = (globalThis as any).require;
 
-import 'vs/workbench/browser/parts/dialogs/dialog.web.contribution';
+	if (!define || !require || typeof require.getConfig !== 'function') {
+		throw new Error('Expected global define() and require() functions. Please only load this module in an AMD context!');
+	}
 
-//#endregion
+	let baseUrl = require?.getConfig().baseUrl;
+	if (!baseUrl) {
+		throw new Error('Failed to determine baseUrl for loading AMD modules (tried require.getConfig().baseUrl)');
+	}
+	if (!baseUrl.endsWith('/')) {
+		baseUrl = baseUrl + '/';
+	}
+	globalThis._VSCODE_FILE_ROOT = baseUrl;
 
+	const trustedTypesPolicy: Pick<TrustedTypePolicy<{ createScriptURL(value: string): string }>, 'name' | 'createScriptURL'> | undefined = require.getConfig().trustedTypesPolicy;
+	if (trustedTypesPolicy) {
+		globalThis._VSCODE_WEB_PACKAGE_TTP = trustedTypesPolicy;
+	}
 
-//#region --- workbench (web main)
+	const promise = new Promise(resolve => {
+		(globalThis as any).__VSCODE_WEB_ESM_PROMISE = resolve;
+	});
 
-import 'vs/workbench/browser/web.main';
+	define('vs/web-api', [], (): ILoaderPlugin => {
+		return {
+			load: (_name, _req, _load, _config) => {
+				const script: any = document.createElement('script');
+				script.type = 'module';
+				script.src = trustedTypesPolicy ? trustedTypesPolicy.createScriptURL(`${baseUrl}vs/workbench/workbench.web.main.internal.js`) as any as string : `${baseUrl}vs/workbench/workbench.web.main.internal.js`;
+				document.head.appendChild(script);
 
-//#endregion
+				return promise.then(mod => _load(mod));
+			}
+		};
+	});
 
-
-//#region --- workbench services
-
-import 'vs/workbench/services/integrity/browser/integrityService';
-import 'vs/workbench/services/search/browser/searchService';
-import 'vs/workbench/services/textfile/browser/browserTextFileService';
-import 'vs/workbench/services/keybinding/browser/keyboardLayoutService';
-import 'vs/workbench/services/extensions/browser/extensionService';
-import 'vs/workbench/services/extensionManagement/browser/extensionsProfileScannerService';
-import 'vs/workbench/services/extensions/browser/extensionsScannerService';
-import 'vs/workbench/services/extensionManagement/browser/webExtensionsScannerService';
-import 'vs/workbench/services/extensionManagement/common/extensionManagementServerService';
-import 'vs/workbench/services/telemetry/browser/telemetryService';
-import 'vs/workbench/services/url/browser/urlService';
-import 'vs/workbench/services/update/browser/updateService';
-import 'vs/workbench/services/workspaces/browser/workspacesService';
-import 'vs/workbench/services/workspaces/browser/workspaceEditingService';
-import 'vs/workbench/services/dialogs/browser/fileDialogService';
-import 'vs/workbench/services/host/browser/browserHostService';
-import 'vs/workbench/services/lifecycle/browser/lifecycleService';
-import 'vs/workbench/services/clipboard/browser/clipboardService';
-import 'vs/workbench/services/localization/browser/localeService';
-import 'vs/workbench/services/path/browser/pathService';
-import 'vs/workbench/services/themes/browser/browserHostColorSchemeService';
-import 'vs/workbench/services/encryption/browser/encryptionService';
-import 'vs/workbench/services/secrets/browser/secretStorageService';
-import 'vs/workbench/services/workingCopy/browser/workingCopyBackupService';
-import 'vs/workbench/services/tunnel/browser/tunnelService';
-import 'vs/workbench/services/files/browser/elevatedFileService';
-import 'vs/workbench/services/workingCopy/browser/workingCopyHistoryService';
-import 'vs/workbench/services/userDataSync/browser/webUserDataSyncEnablementService';
-import 'vs/workbench/services/userDataProfile/browser/userDataProfileStorageService';
-import 'vs/workbench/services/configurationResolver/browser/configurationResolverService';
-import 'vs/platform/extensionResourceLoader/browser/extensionResourceLoaderService';
-import 'vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService';
-
-import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { ContextMenuService } from 'vs/platform/contextview/browser/contextMenuService';
-import { IExtensionTipsService } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { ExtensionTipsService } from 'vs/platform/extensionManagement/common/extensionTipsService';
-import { IWorkbenchExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { ExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagementService';
-import { LogLevel } from 'vs/platform/log/common/log';
-import { UserDataSyncMachinesService, IUserDataSyncMachinesService } from 'vs/platform/userDataSync/common/userDataSyncMachines';
-import { IUserDataSyncStoreService, IUserDataSyncService, IUserDataAutoSyncService, IUserDataSyncLocalStoreService, IUserDataSyncResourceProviderService } from 'vs/platform/userDataSync/common/userDataSync';
-import { UserDataSyncStoreService } from 'vs/platform/userDataSync/common/userDataSyncStoreService';
-import { UserDataSyncLocalStoreService } from 'vs/platform/userDataSync/common/userDataSyncLocalStoreService';
-import { UserDataSyncService } from 'vs/platform/userDataSync/common/userDataSyncService';
-import { IUserDataSyncAccountService, UserDataSyncAccountService } from 'vs/platform/userDataSync/common/userDataSyncAccount';
-import { UserDataAutoSyncService } from 'vs/platform/userDataSync/common/userDataAutoSyncService';
-import { AccessibilityService } from 'vs/platform/accessibility/browser/accessibilityService';
-import { ICustomEndpointTelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { NullEndpointTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
-import { ITitleService } from 'vs/workbench/services/title/browser/titleService';
-import { BrowserTitleService } from 'vs/workbench/browser/parts/titlebar/titlebarPart';
-import { ITimerService, TimerService } from 'vs/workbench/services/timer/browser/timerService';
-import { IDiagnosticsService, NullDiagnosticsService } from 'vs/platform/diagnostics/common/diagnostics';
-import { ILanguagePackService } from 'vs/platform/languagePacks/common/languagePacks';
-import { WebLanguagePacksService } from 'vs/platform/languagePacks/browser/languagePacks';
-
-registerSingleton(IWorkbenchExtensionManagementService, ExtensionManagementService, InstantiationType.Delayed);
-registerSingleton(IAccessibilityService, AccessibilityService, InstantiationType.Delayed);
-registerSingleton(IContextMenuService, ContextMenuService, InstantiationType.Delayed);
-registerSingleton(IUserDataSyncStoreService, UserDataSyncStoreService, InstantiationType.Delayed);
-registerSingleton(IUserDataSyncMachinesService, UserDataSyncMachinesService, InstantiationType.Delayed);
-registerSingleton(IUserDataSyncLocalStoreService, UserDataSyncLocalStoreService, InstantiationType.Delayed);
-registerSingleton(IUserDataSyncAccountService, UserDataSyncAccountService, InstantiationType.Delayed);
-registerSingleton(IUserDataSyncService, UserDataSyncService, InstantiationType.Delayed);
-registerSingleton(IUserDataSyncResourceProviderService, UserDataSyncResourceProviderService, InstantiationType.Delayed);
-registerSingleton(IUserDataAutoSyncService, UserDataAutoSyncService, InstantiationType.Eager /* Eager to start auto sync */);
-registerSingleton(ITitleService, BrowserTitleService, InstantiationType.Eager);
-registerSingleton(IExtensionTipsService, ExtensionTipsService, InstantiationType.Delayed);
-registerSingleton(ITimerService, TimerService, InstantiationType.Delayed);
-registerSingleton(ICustomEndpointTelemetryService, NullEndpointTelemetryService, InstantiationType.Delayed);
-registerSingleton(IDiagnosticsService, NullDiagnosticsService, InstantiationType.Delayed);
-registerSingleton(ILanguagePackService, WebLanguagePacksService, InstantiationType.Delayed);
-
-//#endregion
-
-
-//#region --- workbench contributions
-
-// Logs
-import 'vs/workbench/contrib/logs/browser/logs.contribution';
-
-// Localization
-import 'vs/workbench/contrib/localization/browser/localization.contribution';
-
-// Performance
-import 'vs/workbench/contrib/performance/browser/performance.web.contribution';
-
-// Preferences
-import 'vs/workbench/contrib/preferences/browser/keyboardLayoutPicker';
-
-// Debug
-import 'vs/workbench/contrib/debug/browser/extensionHostDebugService';
-
-// Welcome Banner
-import 'vs/workbench/contrib/welcomeBanner/browser/welcomeBanner.contribution';
-
-// Welcome Dialog
-import 'vs/workbench/contrib/welcomeDialog/browser/welcomeDialog.contribution';
-
-// Webview
-import 'vs/workbench/contrib/webview/browser/webview.web.contribution';
-
-// Extensions Management
-import 'vs/workbench/contrib/extensions/browser/extensions.web.contribution';
-
-// Terminal
-import 'vs/workbench/contrib/terminal/browser/terminal.web.contribution';
-import 'vs/workbench/contrib/externalTerminal/browser/externalTerminal.contribution';
-import 'vs/workbench/contrib/terminal/browser/terminalInstanceService';
-
-// Tasks
-import 'vs/workbench/contrib/tasks/browser/taskService';
-
-// Tags
-import 'vs/workbench/contrib/tags/browser/workspaceTagsService';
-
-// Issues
-import 'vs/workbench/contrib/issue/browser/issue.contribution';
-
-// Splash
-import 'vs/workbench/contrib/splash/browser/splash.contribution';
-
-// Remote Start Entry for the Web
-import 'vs/workbench/contrib/remote/browser/remoteStartEntry.contribution';
-
-//#endregion
-
-
-//#region --- export workbench factory
-
-// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-//
-// Do NOT change these exports in a way that something is removed unless
-// intentional. These exports are used by web embedders and thus require
-// an adoption when something changes.
-//
-// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-import { create, commands, env, window, workspace, logger } from 'vs/workbench/browser/web.factory';
-import { Menu } from 'vs/workbench/browser/web.api';
-import { URI } from 'vs/base/common/uri';
-import { Event, Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { GroupOrientation } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { UserDataSyncResourceProviderService } from 'vs/platform/userDataSync/common/userDataSyncResourceProvider';
-import { RemoteAuthorityResolverError, RemoteAuthorityResolverErrorCode } from 'vs/platform/remote/common/remoteAuthorityResolver';
-
-export {
-
-	// Factory
-	create,
-
-	// Basic Types
-	URI,
-	Event,
-	Emitter,
-	Disposable,
-	GroupOrientation,
-	LogLevel,
-	RemoteAuthorityResolverError,
-	RemoteAuthorityResolverErrorCode,
-
-	// Facade API
-	env,
-	window,
-	workspace,
-	commands,
-	logger,
-	Menu
-};
-
-//#endregion
+	define(
+		'vs/workbench/workbench.web.main',
+		['require', 'exports', 'vs/web-api!'],
+		function (_require, exports, webApi) {
+			Object.assign(exports, webApi);
+		}
+	);
+})();
diff --git a/src/vscode-dts/README.md b/src/vscode-dts/README.md
index 9b3640d9208..a161f672a86 100644
--- a/src/vscode-dts/README.md
+++ b/src/vscode-dts/README.md
@@ -14,7 +14,7 @@ This is the place for the stable API and for API proposals.
 ## Add a new proposal
 
 1. create a _new_ file in this directory, its name must follow this pattern `vscode.proposed.[a-zA-Z]+.d.ts`
-1. creating the proposal-file will automatically update `src/vs/workbench/services/extensions/common/extensionsApiProposals.ts` (make sure to run `yarn watch`)
+1. creating the proposal-file will automatically update `src/vs/platform/extensions/common/extensionsApiProposals.ts` (make sure to run `npm run watch`)
 1. declare and implement your proposal
 1. make sure to use the `checkProposedApiEnabled` and/or `isProposedApiEnabled`-utils to enforce the API being proposed. Make sure to invoke them with your proposal's name which got generated into `extensionsApiProposals.ts`
 1. Most likely will need to add your proposed api to vscode-api-tests as well
diff --git a/src/vscode-dts/vscode.d.ts b/src/vscode-dts/vscode.d.ts
index 50e8060b8ee..6400604d843 100644
--- a/src/vscode-dts/vscode.d.ts
+++ b/src/vscode-dts/vscode.d.ts
@@ -157,7 +157,7 @@ declare module 'vscode' {
 		 * that the returned object is *not* live and changes to the
 		 * document are not reflected.
 		 *
-		 * @param line A line number in [0, lineCount).
+		 * @param line A line number in `[0, lineCount)`.
 		 * @returns A {@link TextLine line}.
 		 */
 		lineAt(line: number): TextLine;
@@ -535,7 +535,7 @@ declare module 'vscode' {
 
 	/**
 	 * Represents sources that can cause {@link window.onDidChangeTextEditorSelection selection change events}.
-	*/
+	 */
 	export enum TextEditorSelectionChangeKind {
 		/**
 		 * Selection changed due to typing in the editor.
@@ -4683,7 +4683,7 @@ declare module 'vscode' {
 		/**
 		 * The currently active {@linkcode SignatureHelp}.
 		 *
-		 * The `activeSignatureHelp` has its [`SignatureHelp.activeSignature`] field updated based on
+		 * The `activeSignatureHelp` has its {@linkcode SignatureHelp.activeSignature activeSignature} field updated based on
 		 * the user arrowing through available signatures.
 		 */
 		readonly activeSignatureHelp: SignatureHelp | undefined;
@@ -5186,7 +5186,7 @@ declare module 'vscode' {
 
 		/**
 		 * Creates a new list of inline completion items.
-		*/
+		 */
 		constructor(items: InlineCompletionItem[]);
 	}
 
@@ -5356,22 +5356,22 @@ declare module 'vscode' {
 	export class Color {
 
 		/**
-		 * The red component of this color in the range [0-1].
+		 * The red component of this color in the range `[0-1]`.
 		 */
 		readonly red: number;
 
 		/**
-		 * The green component of this color in the range [0-1].
+		 * The green component of this color in the range `[0-1]`.
 		 */
 		readonly green: number;
 
 		/**
-		 * The blue component of this color in the range [0-1].
+		 * The blue component of this color in the range `[0-1]`.
 		 */
 		readonly blue: number;
 
 		/**
-		 * The alpha component of this color in the range [0-1].
+		 * The alpha component of this color in the range `[0-1]`.
 		 */
 		readonly alpha: number;
 
@@ -6279,7 +6279,9 @@ declare module 'vscode' {
 		 * If the language supports Unicode identifiers (e.g. JavaScript), it is preferable
 		 * to provide a word definition that uses exclusion of known separators.
 		 * e.g.: A regex that matches anything except known separators (and dot is allowed to occur in a floating point number):
-		 *   /(-?\d*\.\d\w*)|([^\`\~\!\@\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g
+		 * ```
+		 * /(-?\d*\.\d\w*)|([^\`\~\!\@\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g
+		 * ```
 		 */
 		wordPattern?: RegExp;
 		/**
@@ -6365,7 +6367,7 @@ declare module 'vscode' {
 	export enum ConfigurationTarget {
 		/**
 		 * Global configuration
-		*/
+		 */
 		Global = 1,
 
 		/**
@@ -7329,6 +7331,18 @@ declare module 'vscode' {
 		 */
 		readonly state: TerminalState;
 
+		/**
+		 * An object that contains [shell integration](https://code.visualstudio.com/docs/terminal/shell-integration)-powered
+		 * features for the terminal. This will always be `undefined` immediately after the terminal
+		 * is created. Listen to {@link window.onDidChangeTerminalShellIntegration} to be notified
+		 * when shell integration is activated for a terminal.
+		 *
+		 * Note that this object may remain undefined if shell integation never activates. For
+		 * example Command Prompt does not support shell integration and a user's shell setup could
+		 * conflict with the automatic shell integration activation.
+		 */
+		readonly shellIntegration: TerminalShellIntegration | undefined;
+
 		/**
 		 * Send text to the terminal. The text is written to the stdin of the underlying pty process
 		 * (shell) of the terminal.
@@ -7422,6 +7436,311 @@ declare module 'vscode' {
 		readonly isInteractedWith: boolean;
 	}
 
+	/**
+	 * [Shell integration](https://code.visualstudio.com/docs/terminal/shell-integration)-powered capabilities owned by a terminal.
+	 */
+	export interface TerminalShellIntegration {
+		/**
+		 * The current working directory of the terminal. This {@link Uri} may represent a file on
+		 * another machine (eg. ssh into another machine). This requires the shell integration to
+		 * support working directory reporting.
+		 */
+		readonly cwd: Uri | undefined;
+
+		/**
+		 * Execute a command, sending ^C as necessary to interrupt any running command if needed.
+		 *
+		 * @param commandLine The command line to execute, this is the exact text that will be sent
+		 * to the terminal.
+		 *
+		 * @example
+		 * // Execute a command in a terminal immediately after being created
+		 * const myTerm = window.createTerminal();
+		 * window.onDidChangeTerminalShellIntegration(async ({ terminal, shellIntegration }) => {
+		 *   if (terminal === myTerm) {
+		 *     const execution = shellIntegration.executeCommand('echo "Hello world"');
+		 *     window.onDidEndTerminalShellExecution(event => {
+		 *       if (event.execution === execution) {
+		 *         console.log(`Command exited with code ${event.exitCode}`);
+		 *       }
+		 *     });
+		 *   }
+		 * }));
+		 * // Fallback to sendText if there is no shell integration within 3 seconds of launching
+		 * setTimeout(() => {
+		 *   if (!myTerm.shellIntegration) {
+		 *     myTerm.sendText('echo "Hello world"');
+		 *     // Without shell integration, we can't know when the command has finished or what the
+		 *     // exit code was.
+		 *   }
+		 * }, 3000);
+		 *
+		 * @example
+		 * // Send command to terminal that has been alive for a while
+		 * const commandLine = 'echo "Hello world"';
+		 * if (term.shellIntegration) {
+		 *   const execution = shellIntegration.executeCommand({ commandLine });
+		 *   window.onDidEndTerminalShellExecution(event => {
+		 *     if (event.execution === execution) {
+		 *       console.log(`Command exited with code ${event.exitCode}`);
+		 *     }
+		 *   });
+		 * } else {
+		 *   term.sendText(commandLine);
+		 *   // Without shell integration, we can't know when the command has finished or what the
+		 *   // exit code was.
+		 * }
+		 */
+		executeCommand(commandLine: string): TerminalShellExecution;
+
+		/**
+		 * Execute a command, sending ^C as necessary to interrupt any running command if needed.
+		 *
+		 * *Note* This is not guaranteed to work as [shell integration](https://code.visualstudio.com/docs/terminal/shell-integration)
+		 * must be activated. Check whether {@link TerminalShellExecution.exitCode} is rejected to
+		 * verify whether it was successful.
+		 *
+		 * @param command A command to run.
+		 * @param args Arguments to launch the executable with which will be automatically escaped
+		 * based on the executable type.
+		 *
+		 * @example
+		 * // Execute a command in a terminal immediately after being created
+		 * const myTerm = window.createTerminal();
+		 * window.onDidChangeTerminalShellIntegration(async ({ terminal, shellIntegration }) => {
+		 *   if (terminal === myTerm) {
+		 *     const command = shellIntegration.executeCommand({
+		 *       command: 'echo',
+		 *       args: ['Hello world']
+		 *     });
+		 *     const code = await command.exitCode;
+		 *     console.log(`Command exited with code ${code}`);
+		 *   }
+		 * }));
+		 * // Fallback to sendText if there is no shell integration within 3 seconds of launching
+		 * setTimeout(() => {
+		 *   if (!myTerm.shellIntegration) {
+		 *     myTerm.sendText('echo "Hello world"');
+		 *     // Without shell integration, we can't know when the command has finished or what the
+		 *     // exit code was.
+		 *   }
+		 * }, 3000);
+		 *
+		 * @example
+		 * // Send command to terminal that has been alive for a while
+		 * const commandLine = 'echo "Hello world"';
+		 * if (term.shellIntegration) {
+		 *   const command = term.shellIntegration.executeCommand({
+		 *     command: 'echo',
+		 *     args: ['Hello world']
+		 *   });
+		 *   const code = await command.exitCode;
+		 *   console.log(`Command exited with code ${code}`);
+		 * } else {
+		 *   term.sendText(commandLine);
+		 *   // Without shell integration, we can't know when the command has finished or what the
+		 *   // exit code was.
+		 * }
+		 */
+		executeCommand(executable: string, args: string[]): TerminalShellExecution;
+	}
+
+	/**
+	 * A command that was executed in a terminal.
+	 */
+	export interface TerminalShellExecution {
+		/**
+		 * The command line that was executed. The {@link TerminalShellExecutionCommandLineConfidence confidence}
+		 * of this value depends on the specific shell's shell integration implementation. This
+		 * value may become more accurate after {@link window.onDidEndTerminalShellExecution} is
+		 * fired.
+		 *
+		 * @example
+		 * // Log the details of the command line on start and end
+		 * window.onDidStartTerminalShellExecution(event => {
+		 *   const commandLine = event.execution.commandLine;
+		 *   console.log(`Command started\n${summarizeCommandLine(commandLine)}`);
+		 * });
+		 * window.onDidEndTerminalShellExecution(event => {
+		 *   const commandLine = event.execution.commandLine;
+		 *   console.log(`Command ended\n${summarizeCommandLine(commandLine)}`);
+		 * });
+		 * function summarizeCommandLine(commandLine: TerminalShellExecutionCommandLine) {
+		 *   return [
+		 *     `  Command line: ${command.commandLine.value}`,
+		 *     `  Confidence: ${command.commandLine.confidence}`,
+		 *     `  Trusted: ${command.commandLine.isTrusted}
+		 *   ].join('\n');
+		 * }
+		 */
+		readonly commandLine: TerminalShellExecutionCommandLine;
+
+		/**
+		 * The working directory that was reported by the shell when this command executed. This
+		 * {@link Uri} may represent a file on another machine (eg. ssh into another machine). This
+		 * requires the shell integration to support working directory reporting.
+		 */
+		readonly cwd: Uri | undefined;
+
+		/**
+		 * Creates a stream of raw data (including escape sequences) that is written to the
+		 * terminal. This will only include data that was written after `read` was called for
+		 * the first time, ie. you must call `read` immediately after the command is executed via
+		 * {@link TerminalShellIntegration.executeCommand} or
+		 * {@link window.onDidStartTerminalShellExecution} to not miss any data.
+		 *
+		 * @example
+		 * // Log all data written to the terminal for a command
+		 * const command = term.shellIntegration.executeCommand({ commandLine: 'echo "Hello world"' });
+		 * const stream = command.read();
+		 * for await (const data of stream) {
+		 *   console.log(data);
+		 * }
+		 */
+		read(): AsyncIterable<string>;
+	}
+
+	/**
+	 * A command line that was executed in a terminal.
+	 */
+	export interface TerminalShellExecutionCommandLine {
+		/**
+		 * The full command line that was executed, including both the command and its arguments.
+		 */
+		readonly value: string;
+
+		/**
+		 * Whether the command line value came from a trusted source and is therefore safe to
+		 * execute without user additional confirmation, such as a notification that asks "Do you
+		 * want to execute (command)?". This verification is likely only needed if you are going to
+		 * execute the command again.
+		 *
+		 * This is `true` only when the command line was reported explicitly by the shell
+		 * integration script (ie. {@link TerminalShellExecutionCommandLineConfidence.High high confidence})
+		 * and it used a nonce for verification.
+		 */
+		readonly isTrusted: boolean;
+
+		/**
+		 * The confidence of the command line value which is determined by how the value was
+		 * obtained. This depends upon the implementation of the shell integration script.
+		 */
+		readonly confidence: TerminalShellExecutionCommandLineConfidence;
+	}
+
+	/**
+	 * The confidence of a {@link TerminalShellExecutionCommandLine} value.
+	 */
+	enum TerminalShellExecutionCommandLineConfidence {
+		/**
+		 * The command line value confidence is low. This means that the value was read from the
+		 * terminal buffer using markers reported by the shell integration script. Additionally one
+		 * of the following conditions will be met:
+		 *
+		 * - The command started on the very left-most column which is unusual, or
+		 * - The command is multi-line which is more difficult to accurately detect due to line
+		 *   continuation characters and right prompts.
+		 * - Command line markers were not reported by the shell integration script.
+		 */
+		Low = 0,
+
+		/**
+		 * The command line value confidence is medium. This means that the value was read from the
+		 * terminal buffer using markers reported by the shell integration script. The command is
+		 * single-line and does not start on the very left-most column (which is unusual).
+		 */
+		Medium = 1,
+
+		/**
+		 * The command line value confidence is high. This means that the value was explicitly sent
+		 * from the shell integration script or the command was executed via the
+		 * {@link TerminalShellIntegration.executeCommand} API.
+		 */
+		High = 2
+	}
+
+	/**
+	 * An event signalling that a terminal's shell integration has changed.
+	 */
+	export interface TerminalShellIntegrationChangeEvent {
+		/**
+		 * The terminal that shell integration has been activated in.
+		 */
+		readonly terminal: Terminal;
+
+		/**
+		 * The shell integration object.
+		 */
+		readonly shellIntegration: TerminalShellIntegration;
+	}
+
+	/**
+	 * An event signalling that an execution has started in a terminal.
+	 */
+	export interface TerminalShellExecutionStartEvent {
+		/**
+		 * The terminal that shell integration has been activated in.
+		 */
+		readonly terminal: Terminal;
+
+		/**
+		 * The shell integration object.
+		 */
+		readonly shellIntegration: TerminalShellIntegration;
+
+		/**
+		 * The terminal shell execution that has ended.
+		 */
+		readonly execution: TerminalShellExecution;
+	}
+
+	/**
+	 * An event signalling that an execution has ended in a terminal.
+	 */
+	export interface TerminalShellExecutionEndEvent {
+		/**
+		 * The terminal that shell integration has been activated in.
+		 */
+		readonly terminal: Terminal;
+
+		/**
+		 * The shell integration object.
+		 */
+		readonly shellIntegration: TerminalShellIntegration;
+
+		/**
+		 * The terminal shell execution that has ended.
+		 */
+		readonly execution: TerminalShellExecution;
+
+		/**
+		 * The exit code reported by the shell.
+		 *
+		 * Note that `undefined` means the shell either did not report an exit  code (ie. the shell
+		 * integration script is misbehaving) or the shell reported a command started before the command
+		 * finished (eg. a sub-shell was opened). Generally this should not happen, depending on the use
+		 * case, it may be best to treat this as a failure.
+		 *
+		 * @example
+		 * const execution = shellIntegration.executeCommand({
+		 *   command: 'echo',
+		 *   args: ['Hello world']
+		 * });
+		 * window.onDidEndTerminalShellExecution(event => {
+		 *   if (event.execution === execution) {
+		 *     if (event.exitCode === undefined) {
+		 * 	     console.log('Command finished but exit code is unknown');
+		 *     } else if (event.exitCode === 0) {
+		 * 	     console.log('Command succeeded');
+		 *     } else {
+		 * 	     console.log('Command failed');
+		 *     }
+		 *   }
+		 * });
+		 */
+		readonly exitCode: number | undefined;
+	}
+
 	/**
 	 * Provides information on a line in a terminal in order to provide links for it.
 	 */
@@ -10457,6 +10776,25 @@ declare module 'vscode' {
 		 */
 		export const onDidChangeTerminalState: Event<Terminal>;
 
+		/**
+		 * Fires when shell integration activates or one of its properties changes in a terminal.
+		 */
+		export const onDidChangeTerminalShellIntegration: Event<TerminalShellIntegrationChangeEvent>;
+
+		/**
+		 * This will be fired when a terminal command is started. This event will fire only when
+		 * [shell integration](https://code.visualstudio.com/docs/terminal/shell-integration) is
+		 * activated for the terminal.
+		 */
+		export const onDidStartTerminalShellExecution: Event<TerminalShellExecutionStartEvent>;
+
+		/**
+		 * This will be fired when a terminal command is ended. This event will fire only when
+		 * [shell integration](https://code.visualstudio.com/docs/terminal/shell-integration) is
+		 * activated for the terminal.
+		 */
+		export const onDidEndTerminalShellExecution: Event<TerminalShellExecutionEndEvent>;
+
 		/**
 		 * Represents the current window's state.
 		 */
@@ -11116,8 +11454,8 @@ declare module 'vscode' {
 		canSelectMany?: boolean;
 
 		/**
-		* An optional interface to implement drag and drop in the tree view.
-		*/
+		 * An optional interface to implement drag and drop in the tree view.
+		 */
 		dragAndDropController?: TreeDragAndDropController<T>;
 
 		/**
@@ -11378,8 +11716,8 @@ declare module 'vscode' {
 	 */
 	export interface TreeCheckboxChangeEvent<T> {
 		/**
-		* The items that were checked or unchecked.
-		*/
+		 * The items that were checked or unchecked.
+		 */
 		readonly items: ReadonlyArray<[T, TreeItemCheckboxState]>;
 	}
 
@@ -11419,8 +11757,8 @@ declare module 'vscode' {
 		readonly onDidChangeVisibility: Event<TreeViewVisibilityChangeEvent>;
 
 		/**
-		* An event to signal that an element or root has either been checked or unchecked.
-		*/
+		 * An event to signal that an element or root has either been checked or unchecked.
+		 */
 		readonly onDidChangeCheckboxState: Event<TreeCheckboxChangeEvent<T>>;
 
 		/**
@@ -11463,15 +11801,15 @@ declare module 'vscode' {
 			/**
 			 * If true, then the element will be selected.
 			 */
-			select?: boolean;
+			readonly select?: boolean;
 			/**
 			 * If true, then the element will be focused.
 			 */
-			focus?: boolean;
+			readonly focus?: boolean;
 			/**
 			 * If true, then the element will be expanded. If a number is passed, then up to that number of levels of children will be expanded
 			 */
-			expand?: boolean | number;
+			readonly expand?: boolean | number;
 		}): Thenable<void>;
 	}
 
@@ -11697,8 +12035,8 @@ declare module 'vscode' {
 	}
 
 	/**
-	* Checkbox state of the tree item
-	*/
+	 * Checkbox state of the tree item
+	 */
 	export enum TreeItemCheckboxState {
 		/**
 		 * Determines an item is unchecked
@@ -11787,8 +12125,8 @@ declare module 'vscode' {
 		color?: ThemeColor;
 
 		/**
-		* The {@link TerminalLocation} or {@link TerminalEditorLocationOptions} or {@link TerminalSplitLocationOptions} for the terminal.
-		*/
+		 * The {@link TerminalLocation} or {@link TerminalEditorLocationOptions} or {@link TerminalSplitLocationOptions} for the terminal.
+		 */
 		location?: TerminalLocation | TerminalEditorLocationOptions | TerminalSplitLocationOptions;
 
 		/**
@@ -12433,7 +12771,7 @@ declare module 'vscode' {
 		buttons: readonly QuickInputButton[];
 
 		/**
-		 * An event signaling when a button in the title bar was triggered.
+		 * An event signaling when a top level button (buttons stored in {@link buttons}) was triggered.
 		 * This event does not fire for buttons on a {@link QuickPickItem}.
 		 */
 		readonly onDidTriggerButton: Event<QuickInputButton>;
@@ -12668,7 +13006,7 @@ declare module 'vscode' {
 		/**
 		 * The reason why the document was changed.
 		 * Is `undefined` if the reason is not known.
-		*/
+		 */
 		readonly reason: TextDocumentChangeReason | undefined;
 	}
 
@@ -13173,8 +13511,9 @@ declare module 'vscode' {
 		 * `**` or path segments), it will be watched recursively and otherwise will be watched
 		 * non-recursively (i.e. only changes to the first level of the path will be reported).
 		 *
-		 * *Note* that paths must exist in the file system to be watched. File watching may stop when
-		 * the watched path is renamed or deleted.
+		 * *Note* that paths that do not exist in the file system will be monitored with a delay until
+		 * created and then watched depending on the parameters provided. If a watched path is deleted,
+		 * the watcher will suspend and not report any events until the path is created again.
 		 *
 		 * If possible, keep the use of recursive watchers to a minimum because recursive file watching
 		 * is quite resource intense.
@@ -13189,26 +13528,13 @@ declare module 'vscode' {
 		 *
 		 * *Note* that file events from recursive file watchers may be excluded based on user configuration.
 		 * The setting `files.watcherExclude` helps to reduce the overhead of file events from folders
-		 * that are known to produce many file changes at once (such as `node_modules` folders). As such,
+		 * that are known to produce many file changes at once (such as `.git` folders). As such,
 		 * it is highly recommended to watch with simple patterns that do not require recursive watchers
 		 * where the exclude settings are ignored and you have full control over the events.
 		 *
 		 * *Note* that symbolic links are not automatically followed for file watching unless the path to
 		 * watch itself is a symbolic link.
 		 *
-		 * *Note* that file changes for the path to be watched may not be delivered when the path itself
-		 * changes. For example, when watching a path `/Users/somename/Desktop` and the path itself is
-		 * being deleted, the watcher may not report an event and may not work anymore from that moment on.
-		 * The underlying behaviour depends on the path that is provided for watching:
-		 * * if the path is within any of the workspace folders, deletions are tracked and reported unless
-		 *   excluded via `files.watcherExclude` setting
-		 * * if the path is equal to any of the workspace folders, deletions are not tracked
-		 * * if the path is outside of any of the workspace folders, deletions are not tracked
-		 *
-		 * If you are interested in being notified when the watched path itself is being deleted, you have
-		 * to watch it's parent folder. Make sure to use a simple `pattern` (such as putting the name of the
-		 * folder) to not accidentally watch all sibling folders recursively.
-		 *
 		 * *Note* that the file paths that are reported for having changed may have a different path casing
 		 * compared to the actual casing on disk on case-insensitive platforms (typically macOS and Windows
 		 * but not Linux). We allow a user to open a workspace folder with any desired path casing and try
@@ -15374,7 +15700,7 @@ declare module 'vscode' {
 		 *
 		 * @param rendererId The renderer ID to communicate with
 		 * @returns A new notebook renderer messaging object.
-		*/
+		 */
 		export function createRendererMessaging(rendererId: string): NotebookRendererMessaging;
 	}
 
@@ -16183,6 +16509,13 @@ declare module 'vscode' {
 		 * When true, the debug viewlet will not be automatically revealed for this session.
 		 */
 		suppressDebugView?: boolean;
+
+		/**
+		 * Signals to the editor that the debug session was started from a test run
+		 * request. This is used to link the lifecycle of the debug session and
+		 * test run in UI actions.
+		 */
+		testRun?: TestRun;
 	}
 
 	/**
@@ -16369,7 +16702,7 @@ declare module 'vscode' {
 		/**
 		 * Add breakpoints.
 		 * @param breakpoints The breakpoints to add.
-		*/
+		 */
 		export function addBreakpoints(breakpoints: readonly Breakpoint[]): void;
 
 		/**
@@ -16873,6 +17206,11 @@ declare module 'vscode' {
 		 * Note: you cannot use this option with any other options that prompt the user like {@link AuthenticationGetSessionOptions.createIfNone createIfNone}.
 		 */
 		silent?: boolean;
+
+		/**
+		 * The account that you would like to get a session for. This is passed down to the Authentication Provider to be used for creating the correct session.
+		 */
+		account?: AuthenticationSessionAccountInformation;
 	}
 
 	/**
@@ -16907,17 +17245,17 @@ declare module 'vscode' {
 		/**
 		 * Whether it is possible to be signed into multiple accounts at once with this provider.
 		 * If not specified, will default to false.
-		*/
+		 */
 		readonly supportsMultipleAccounts?: boolean;
 	}
 
 	/**
-	* An {@link Event} which fires when an {@link AuthenticationSession} is added, removed, or changed.
-	*/
+	 * An {@link Event} which fires when an {@link AuthenticationSession} is added, removed, or changed.
+	 */
 	export interface AuthenticationProviderAuthenticationSessionsChangeEvent {
 		/**
 		 * The {@link AuthenticationSession AuthenticationSessions} of the {@link AuthenticationProvider} that have been added.
-		*/
+		 */
 		readonly added: readonly AuthenticationSession[] | undefined;
 
 		/**
@@ -16933,6 +17271,18 @@ declare module 'vscode' {
 		readonly changed: readonly AuthenticationSession[] | undefined;
 	}
 
+	/**
+	 * The options passed in to the {@link AuthenticationProvider.getSessions} and
+	 * {@link AuthenticationProvider.createSession} call.
+	 */
+	export interface AuthenticationProviderSessionOptions {
+		/**
+		 * The account that is being asked about. If this is passed in, the provider should
+		 * attempt to return the sessions that are only related to this account.
+		 */
+		account?: AuthenticationSessionAccountInformation;
+	}
+
 	/**
 	 * A provider for performing authentication to a service.
 	 */
@@ -16947,9 +17297,10 @@ declare module 'vscode' {
 		 * Get a list of sessions.
 		 * @param scopes An optional list of scopes. If provided, the sessions returned should match
 		 * these permissions, otherwise all sessions should be returned.
+		 * @param options Additional options for getting sessions.
 		 * @returns A promise that resolves to an array of authentication sessions.
 		 */
-		getSessions(scopes?: readonly string[]): Thenable<readonly AuthenticationSession[]>;
+		getSessions(scopes: readonly string[] | undefined, options: AuthenticationProviderSessionOptions): Thenable<AuthenticationSession[]>;
 
 		/**
 		 * Prompts a user to login.
@@ -16962,9 +17313,10 @@ declare module 'vscode' {
 		 * then this should never be called if there is already an existing session matching these
 		 * scopes.
 		 * @param scopes A list of scopes, permissions, that the new session should be created with.
+		 * @param options Additional options for creating a session.
 		 * @returns A promise that resolves to an authentication session.
 		 */
-		createSession(scopes: readonly string[]): Thenable<AuthenticationSession>;
+		createSession(scopes: readonly string[], options: AuthenticationProviderSessionOptions): Thenable<AuthenticationSession>;
 
 		/**
 		 * Removes the session corresponding to session id.
@@ -17027,6 +17379,20 @@ declare module 'vscode' {
 		 */
 		export function getSession(providerId: string, scopes: readonly string[], options?: AuthenticationGetSessionOptions): Thenable<AuthenticationSession | undefined>;
 
+		/**
+		 * Get all accounts that the user is logged in to for the specified provider.
+		 * Use this paired with {@link getSession} in order to get an authentication session for a specific account.
+		 *
+		 * Currently, there are only two authentication providers that are contributed from built in extensions
+		 * to the editor that implement GitHub and Microsoft authentication: their providerId's are 'github' and 'microsoft'.
+		 *
+		 * Note: Getting accounts does not imply that your extension has access to that account or its authentication sessions. You can verify access to the account by calling {@link getSession}.
+		 *
+		 * @param providerId The id of the provider to use
+		 * @returns A thenable that resolves to a readonly array of authentication accounts.
+		 */
+		export function getAccounts(providerId: string): Thenable<readonly AuthenticationSessionAccountInformation[]>;
+
 		/**
 		 * An {@link Event} which fires when the authentication sessions of an authentication provider have
 		 * been added, removed, or changed.
@@ -17144,7 +17510,7 @@ declare module 'vscode' {
 		 * @param id Identifier for the controller, must be globally unique.
 		 * @param label A human-readable label for the controller.
 		 * @returns An instance of the {@link TestController}.
-		*/
+		 */
 		export function createTestController(id: string, label: string): TestController;
 	}
 
@@ -17717,6 +18083,34 @@ declare module 'vscode' {
 		error: string | MarkdownString | undefined;
 	}
 
+	/**
+	 * A stack frame found in the {@link TestMessage.stackTrace}.
+	 */
+	export class TestMessageStackFrame {
+		/**
+		 * The location of this stack frame. This should be provided as a URI if the
+		 * location of the call frame can be accessed by the editor.
+		 */
+		uri?: Uri;
+
+		/**
+		 * Position of the stack frame within the file.
+		 */
+		position?: Position;
+
+		/**
+		 * The name of the stack frame, typically a method or function name.
+		 */
+		label: string;
+
+		/**
+		 * @param label The name of the stack frame
+		 * @param file The file URI of the stack frame
+		 * @param position The position of the stack frame within the file
+		 */
+		constructor(label: string, uri?: Uri, position?: Position);
+	}
+
 	/**
 	 * Message associated with the test state. Can be linked to a specific
 	 * source range -- useful for assertion failures, for example.
@@ -17773,6 +18167,11 @@ declare module 'vscode' {
 		 */
 		contextValue?: string;
 
+		/**
+		 * The stack trace associated with the message or failure.
+		 */
+		stackTrace?: TestMessageStackFrame[];
+
 		/**
 		 * Creates a new TestMessage that will present as a diff in the editor.
 		 * @param message Message to display to the user.
@@ -18611,8 +19010,8 @@ declare module 'vscode' {
 		 * An event that fires whenever feedback for a result is received, e.g. when a user up- or down-votes
 		 * a result.
 		 *
-		 * The passed {@link ChatResultFeedback.result result} is guaranteed to be the same instance that was
-		 * previously returned from this chat participant.
+		 * The passed {@link ChatResultFeedback.result result} is guaranteed to have the same properties as the result that was
+		 * previously returned from this chat participant's handler.
 		 */
 		onDidReceiveFeedback: Event<ChatResultFeedback>;
 
@@ -18701,7 +19100,7 @@ declare module 'vscode' {
 		 * `push(new ChatResponseAnchorPart(value, title))`.
 		 * An anchor is an inline reference to some type of resource.
 		 *
-		 * @param value A uri, location, or symbol information.
+		 * @param value A uri or location.
 		 * @param title An optional title that is rendered with value.
 		 */
 		anchor(value: Uri | Location, title?: string): void;
@@ -18995,7 +19394,7 @@ declare module 'vscode' {
 	 * Represents a language model response.
 	 *
 	 * @see {@link LanguageModelAccess.chatRequest}
-	*/
+	 */
 	export interface LanguageModelChatResponse {
 
 		/**
diff --git a/src/vscode-dts/vscode.proposed.aiTextSearchProvider.d.ts b/src/vscode-dts/vscode.proposed.aiTextSearchProvider.d.ts
index a75d7eb6f7e..f30b87f6097 100644
--- a/src/vscode-dts/vscode.proposed.aiTextSearchProvider.d.ts
+++ b/src/vscode-dts/vscode.proposed.aiTextSearchProvider.d.ts
@@ -40,6 +40,11 @@ declare module 'vscode' {
 	 * An AITextSearchProvider provides additional AI text search results in the workspace.
 	 */
 	export interface AITextSearchProvider {
+		/**
+		 * The name of the AI searcher. Will be displayed as `{name} Results` in the Search View.
+		 */
+		readonly name?: string;
+
 		/**
 		 * Provide results that match the given text pattern.
 		 * @param query The parameter for this query.
@@ -48,6 +53,7 @@ declare module 'vscode' {
 		 * @param token A cancellation token.
 		 */
 		provideAITextSearchResults(query: string, options: AITextSearchOptions, progress: Progress<TextSearchResult>, token: CancellationToken): ProviderResult<TextSearchComplete>;
+
 	}
 
 	export namespace workspace {
diff --git a/src/vscode-dts/vscode.proposed.aiTextSearchProviderNew.d.ts b/src/vscode-dts/vscode.proposed.aiTextSearchProviderNew.d.ts
new file mode 100644
index 00000000000..f54a9ef2b14
--- /dev/null
+++ b/src/vscode-dts/vscode.proposed.aiTextSearchProviderNew.d.ts
@@ -0,0 +1,40 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+declare module 'vscode' {
+	/**
+	 * An AITextSearchProvider provides additional AI text search results in the workspace.
+	 */
+	export interface AITextSearchProviderNew {
+		/**
+		 * The name of the AI searcher. Will be displayed as `{name} Results` in the Search View.
+		 */
+		readonly name?: string;
+
+		/**
+		 * WARNING: VERY EXPERIMENTAL.
+		 *
+		 * Provide results that match the given text pattern.
+		 * @param query The parameter for this query.
+		 * @param options A set of options to consider while searching.
+		 * @param progress A progress callback that must be invoked for all results.
+		 * @param token A cancellation token.
+		 */
+		provideAITextSearchResults(query: string, options: TextSearchProviderOptions, progress: Progress<TextSearchResultNew>, token: CancellationToken): ProviderResult<TextSearchCompleteNew>;
+	}
+
+	export namespace workspace {
+		/**
+		 * Register an AI text search provider.
+		 *
+		 * Only one provider can be registered per scheme.
+		 *
+		 * @param scheme The provider will be invoked for workspace folders that have this file scheme.
+		 * @param provider The provider.
+		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 */
+		export function registerAITextSearchProviderNew(scheme: string, provider: AITextSearchProviderNew): Disposable;
+	}
+}
diff --git a/src/vscode-dts/vscode.proposed.attributableCoverage.d.ts b/src/vscode-dts/vscode.proposed.attributableCoverage.d.ts
index 63000738c0f..b717159885b 100644
--- a/src/vscode-dts/vscode.proposed.attributableCoverage.d.ts
+++ b/src/vscode-dts/vscode.proposed.attributableCoverage.d.ts
@@ -6,23 +6,41 @@
 declare module 'vscode' {
 	export class FileCoverage2 extends FileCoverage {
 		/**
-		 * Test {@link TestItem} this file coverage is generated from. If undefined,
-		 * the editor will assume the coverage is the overall summary coverage for
-		 * the entire file.
-		 *
-		 * If per-test coverage is available, an extension should append multiple
-		 * `FileCoverage` instances with this property set for each test item. It
-		 * must also append a `FileCoverage` instance without this property set to
-		 * represent the overall coverage of the file.
+		 * A list of {@link TestItem test cases} that generated coverage in this
+		 * file. If set, then {@link TestRunProfile.loadDetailedCoverageForTest}
+		 * should also be defined in order to retrieve detailed coverage information.
 		 */
-		testItem?: TestItem;
+		fromTests: TestItem[];
 
 		constructor(
 			uri: Uri,
 			statementCoverage: TestCoverageCount,
 			branchCoverage?: TestCoverageCount,
 			declarationCoverage?: TestCoverageCount,
-			testItem?: TestItem,
+			fromTests?: TestItem[],
 		);
 	}
+
+	export interface TestRunProfile {
+		/**
+		 * An extension-provided function that provides detailed statement and
+		 * function-level coverage for a single test in a file. This is the per-test
+		 * sibling of {@link TestRunProfile.loadDetailedCoverage}, called only if
+		 * a test item is provided in {@link FileCoverage.fromTests} and only for
+		 * files where such data is reported.
+		 *
+		 * The editor will call this when user asks to view coverage for a test in
+		 * a file, and the returned coverage information is used to display exactly
+		 * what code was run by that test.
+		 *
+		 * The {@link FileCoverage} object passed to this function is the same
+		 * instance emitted on {@link TestRun.addCoverage} calls associated with this profile.
+		 *
+		 * @param testRun The test run that generated the coverage data.
+		 * @param fileCoverage The file coverage object to load detailed coverage for.
+		 * @param fromTestItem The test item to request coverage information for.
+		 * @param token A cancellation token that indicates the operation should be cancelled.
+		 */
+		loadDetailedCoverageForTest?: (testRun: TestRun, fileCoverage: FileCoverage, fromTestItem: TestItem, token: CancellationToken) => Thenable<FileCoverageDetail[]>;
+	}
 }
diff --git a/src/vscode-dts/vscode.proposed.authGetSessions.d.ts b/src/vscode-dts/vscode.proposed.authGetSessions.d.ts
deleted file mode 100644
index 20a692c0180..00000000000
--- a/src/vscode-dts/vscode.proposed.authGetSessions.d.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-declare module 'vscode' {
-
-	// https://github.com/microsoft/vscode/issues/152399
-
-	export interface AuthenticationForceNewSessionOptions {
-		/**
-		 * The session that you are asking to be recreated. The Auth Provider can use this to
-		 * help guide the user to log in to the correct account.
-		 */
-		sessionToRecreate?: AuthenticationSession;
-	}
-
-	export namespace authentication {
-		/**
-		 * Get all authentication sessions matching the desired scopes that this extension has access to. In order to request access,
-		 * use {@link getSession}. To request an additional account, specify {@link AuthenticationGetSessionOptions.clearSessionPreference}
-		 * and {@link AuthenticationGetSessionOptions.createIfNone} together.
-		 *
-		 * Currently, there are only two authentication providers that are contributed from built in extensions
-		 * to the editor that implement GitHub and Microsoft authentication: their providerId's are 'github' and 'microsoft'.
-		 *
-		 * @param providerId The id of the provider to use
-		 * @param scopes A list of scopes representing the permissions requested. These are dependent on the authentication provider
-		 * @returns A thenable that resolves to a readonly array of authentication sessions.
-		 */
-		export function getSessions(providerId: string, scopes: readonly string[]): Thenable<readonly AuthenticationSession[]>;
-	}
-
-	/**
-	 * The options passed in to the provider when creating a session.
-	 */
-	export interface AuthenticationProviderCreateSessionOptions {
-		/**
-		 * The session that is being asked to be recreated. If this is passed in, the provider should
-		 * attempt to recreate the session based on the information in this session.
-		 */
-		sessionToRecreate?: AuthenticationSession;
-	}
-
-	export interface AuthenticationProvider {
-		/**
-		 * Prompts a user to login.
-		 *
-		 * If login is successful, the onDidChangeSessions event should be fired.
-		 *
-		 * If login fails, a rejected promise should be returned.
-		 *
-		 * If the provider has specified that it does not support multiple accounts,
-		 * then this should never be called if there is already an existing session matching these
-		 * scopes.
-		 * @param scopes A list of scopes, permissions, that the new session should be created with.
-		 * @param options Additional options for creating a session.
-		 * @returns A promise that resolves to an authentication session.
-		 */
-		createSession(scopes: readonly string[], options: AuthenticationProviderCreateSessionOptions): Thenable<AuthenticationSession>;
-	}
-}
diff --git a/src/vscode-dts/vscode.proposed.chatParticipantAdditions.d.ts b/src/vscode-dts/vscode.proposed.chatParticipantAdditions.d.ts
index cd2ec7ba919..b6eba7e9631 100644
--- a/src/vscode-dts/vscode.proposed.chatParticipantAdditions.d.ts
+++ b/src/vscode-dts/vscode.proposed.chatParticipantAdditions.d.ts
@@ -36,6 +36,11 @@ declare module 'vscode' {
 		constructor(value: string | MarkdownString, vulnerabilities: ChatVulnerability[]);
 	}
 
+	export class ChatResponseCodeblockUriPart {
+		value: Uri;
+		constructor(value: Uri);
+	}
+
 	/**
 	 * Displays a {@link Command command} as a button in the chat response.
 	 */
@@ -59,10 +64,18 @@ declare module 'vscode' {
 		title: string;
 		message: string;
 		data: any;
-		constructor(title: string, message: string, data: any);
+		buttons?: string[];
+		constructor(title: string, message: string, data: any, buttons?: string[]);
 	}
 
-	export type ExtendedChatResponsePart = ChatResponsePart | ChatResponseTextEditPart | ChatResponseDetectedParticipantPart | ChatResponseConfirmationPart;
+	export class ChatResponseCodeCitationPart {
+		value: Uri;
+		license: string;
+		snippet: string;
+		constructor(value: Uri, license: string, snippet: string);
+	}
+
+	export type ExtendedChatResponsePart = ChatResponsePart | ChatResponseTextEditPart | ChatResponseDetectedParticipantPart | ChatResponseConfirmationPart | ChatResponseCodeCitationPart | ChatResponseReferencePart2 | ChatResponseMovePart;
 
 	export class ChatResponseWarningPart {
 		value: MarkdownString;
@@ -75,6 +88,64 @@ declare module 'vscode' {
 		constructor(value: string, task?: (progress: Progress<ChatResponseWarningPart | ChatResponseReferencePart>) => Thenable<string | void>);
 	}
 
+	export class ChatResponseReferencePart2 {
+		/**
+		 * The reference target.
+		 */
+		value: Uri | Location | { variableName: string; value?: Uri | Location } | string;
+
+		/**
+		 * The icon for the reference.
+		 */
+		iconPath?: Uri | ThemeIcon | {
+			/**
+			 * The icon path for the light theme.
+			 */
+			light: Uri;
+			/**
+			 * The icon path for the dark theme.
+			 */
+			dark: Uri;
+		};
+		options?: { status?: { description: string; kind: ChatResponseReferencePartStatusKind } };
+
+		/**
+		 * Create a new ChatResponseReferencePart.
+		 * @param value A uri or location
+		 * @param iconPath Icon for the reference shown in UI
+		 */
+		constructor(value: Uri | Location | { variableName: string; value?: Uri | Location } | string, iconPath?: Uri | ThemeIcon | {
+			/**
+			 * The icon path for the light theme.
+			 */
+			light: Uri;
+			/**
+			 * The icon path for the dark theme.
+			 */
+			dark: Uri;
+		}, options?: { status?: { description: string; kind: ChatResponseReferencePartStatusKind } });
+	}
+
+	export class ChatResponseMovePart {
+
+		readonly uri: Uri;
+		readonly range: Range;
+
+		constructor(uri: Uri, range: Range);
+	}
+
+	// Extended to add `SymbolInformation`. Would also be added to `constructor`.
+	export interface ChatResponseAnchorPart {
+		/**
+		 * The target of this anchor.
+		 *
+		 * If this is a {@linkcode Uri} or {@linkcode Location}, this is rendered as a normal link.
+		 *
+		 * If this is a {@linkcode SymbolInformation}, this is rendered as a symbol link.
+		 */
+		value2: Uri | Location | SymbolInformation;
+	}
+
 	export interface ChatResponseStream {
 
 		/**
@@ -89,6 +160,7 @@ declare module 'vscode' {
 
 		textEdit(target: Uri, edits: TextEdit | TextEdit[]): void;
 		markdownWithVulnerabilities(value: string | MarkdownString, vulnerabilities: ChatVulnerability[]): void;
+		codeblockUri(uri: Uri): void;
 		detectedParticipant(participant: string, command?: ChatCommand): void;
 		push(part: ChatResponsePart | ChatResponseTextEditPart | ChatResponseDetectedParticipantPart | ChatResponseWarningPart | ChatResponseProgressPart2): void;
 
@@ -102,7 +174,7 @@ declare module 'vscode' {
 		 * TODO@API should this be MarkdownString?
 		 * TODO@API should actually be a more generic function that takes an array of buttons
 		 */
-		confirmation(title: string, message: string, data: any): void;
+		confirmation(title: string, message: string, data: any, buttons?: string[]): void;
 
 		/**
 		 * Push a warning to this stream. Short-hand for
@@ -115,9 +187,19 @@ declare module 'vscode' {
 
 		reference(value: Uri | Location | { variableName: string; value?: Uri | Location }, iconPath?: Uri | ThemeIcon | { light: Uri; dark: Uri }): void;
 
+		reference2(value: Uri | Location | string | { variableName: string; value?: Uri | Location }, iconPath?: Uri | ThemeIcon | { light: Uri; dark: Uri }, options?: { status?: { description: string; kind: ChatResponseReferencePartStatusKind } }): void;
+
+		codeCitation(value: Uri, license: string, snippet: string): void;
+
 		push(part: ExtendedChatResponsePart): void;
 	}
 
+	export enum ChatResponseReferencePartStatusKind {
+		Complete = 1,
+		Partial = 2,
+		Omitted = 3
+	}
+
 	/**
 	 * Does this piggy-back on the existing ChatRequest, or is it a different type of request entirely?
 	 * Does it show up in history?
@@ -132,6 +214,8 @@ declare module 'vscode' {
 		 * The `data` for any confirmations that were rejected
 		 */
 		rejectedConfirmationData?: any[];
+
+		userSelectedModel?: LanguageModelChat;
 	}
 
 	// TODO@API fit this into the stream
@@ -166,19 +250,36 @@ declare module 'vscode' {
 
 	export type ChatExtendedRequestHandler = (request: ChatRequest, context: ChatContext, response: ChatResponseStream, token: CancellationToken) => ProviderResult<ChatResult | void>;
 
+	export interface ChatResult {
+		nextQuestion?: {
+			prompt: string;
+			participant?: string;
+			command?: string;
+		};
+	}
+
 	export namespace chat {
 		/**
 		 * Create a chat participant with the extended progress type
 		 */
 		export function createChatParticipant(id: string, handler: ChatExtendedRequestHandler): ChatParticipant;
 
-		/**
-		 * Current version of the proposal. Changes whenever backwards-incompatible changes are made.
-		 * If a new feature is added that doesn't break existing code, the version is not incremented. When the extension uses this new feature, it should set its engines.vscode version appropriately.
-		 * But if a change is made to an existing feature that would break existing code, the version should be incremented.
-		 * The chat extension should not activate if it doesn't support the current version.
-		 */
-		export const _version: 1 | number;
+		export function registerChatParticipantDetectionProvider(participantDetectionProvider: ChatParticipantDetectionProvider): Disposable;
+	}
+
+	export interface ChatParticipantMetadata {
+		participant: string;
+		command?: string;
+		disambiguation: { category: string; description: string; examples: string[] }[];
+	}
+
+	export interface ChatParticipantDetectionResult {
+		participant: string;
+		command?: string;
+	}
+
+	export interface ChatParticipantDetectionProvider {
+		provideParticipantDetection(chatRequest: ChatRequest, context: ChatContext, options: { participants?: ChatParticipantMetadata[]; location: ChatLocation }, token: CancellationToken): ProviderResult<ChatParticipantDetectionResult>;
 	}
 
 	/*
@@ -209,6 +310,15 @@ declare module 'vscode' {
 		newFile?: boolean;
 	}
 
+	export interface ChatApplyAction {
+		// eslint-disable-next-line local/vscode-dts-string-type-literals
+		kind: 'apply';
+		codeBlockIndex: number;
+		totalCharacters: number;
+		newFile?: boolean;
+		codeMapper?: string;
+	}
+
 	export interface ChatTerminalAction {
 		// eslint-disable-next-line local/vscode-dts-string-type-literals
 		kind: 'runInTerminal';
@@ -240,7 +350,7 @@ declare module 'vscode' {
 
 	export interface ChatUserActionEvent {
 		readonly result: ChatResult;
-		readonly action: ChatCopyAction | ChatInsertAction | ChatTerminalAction | ChatCommandAction | ChatFollowupAction | ChatBugReportAction | ChatEditorAction;
+		readonly action: ChatCopyAction | ChatInsertAction | ChatApplyAction | ChatTerminalAction | ChatCommandAction | ChatFollowupAction | ChatBugReportAction | ChatEditorAction;
 	}
 
 	export interface ChatPromptReference {
@@ -249,4 +359,8 @@ declare module 'vscode' {
 		 */
 		readonly name: string;
 	}
+
+	export interface ChatResultFeedback {
+		readonly unhelpfulReason?: string;
+	}
 }
diff --git a/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts b/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts
index 4e328978a9d..b89bdfbed3e 100644
--- a/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts
+++ b/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts
@@ -3,6 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+// version: 2
+
 declare module 'vscode' {
 
 	/**
@@ -24,7 +26,27 @@ declare module 'vscode' {
 		/**
 		 * Code editor inline chat
 		 */
-		Editor = 4
+		Editor = 4,
+		/**
+		 * Chat is happening in an editing session
+		 */
+		EditingSession = 5,
+	}
+
+	export class ChatRequestEditorData {
+		//TODO@API should be the editor
+		document: TextDocument;
+		selection: Selection;
+		wholeRange: Range;
+
+		constructor(document: TextDocument, selection: Selection, wholeRange: Range);
+	}
+
+	export class ChatRequestNotebookData {
+		//TODO@API should be the editor
+		readonly cell: TextDocument;
+
+		constructor(cell: TextDocument);
 	}
 
 	export interface ChatRequest {
@@ -38,10 +60,23 @@ declare module 'vscode' {
 		 */
 		readonly enableCommandDetection: boolean;
 
+		/**
+		 * If the chat participant or command was automatically assigned.
+		 */
+		readonly isParticipantDetected: boolean;
+
 		/**
 		 * The location at which the chat is happening. This will always be one of the supported values
+		 *
+		 * @deprecated
 		 */
 		readonly location: ChatLocation;
+
+		/**
+		 * Information that is specific to the location at which chat is happening, e.g within a document, notebook,
+		 * or terminal. Will be `undefined` for the chat panel.
+		 */
+		readonly location2: ChatRequestEditorData | ChatRequestNotebookData | undefined;
 	}
 
 	export interface ChatParticipant {
diff --git a/src/vscode-dts/vscode.proposed.chatProvider.d.ts b/src/vscode-dts/vscode.proposed.chatProvider.d.ts
index 9abbdc5d1aa..be600018257 100644
--- a/src/vscode-dts/vscode.proposed.chatProvider.d.ts
+++ b/src/vscode-dts/vscode.proposed.chatProvider.d.ts
@@ -12,7 +12,7 @@ declare module 'vscode' {
 
 	export interface ChatResponseFragment2 {
 		index: number;
-		part: LanguageModelChatResponseTextPart | LanguageModelChatResponseFunctionUsePart;
+		part: LanguageModelChatResponseTextPart | LanguageModelChatResponseToolCallPart;
 	}
 
 	// @API extension ship a d.ts files for their options
@@ -63,6 +63,10 @@ declare module 'vscode' {
 		 * Additionally, the extension can provide a label that will be shown in the UI.
 		 */
 		auth?: true | { label: string };
+
+		// TODO@API maybe an enum, LanguageModelChatProviderPickerAvailability?
+		readonly isDefault?: boolean;
+		readonly isUserSelectable?: boolean;
 	}
 
 	export interface ChatResponseProviderMetadata {
diff --git a/src/vscode-dts/vscode.proposed.chatVariableResolver.d.ts b/src/vscode-dts/vscode.proposed.chatVariableResolver.d.ts
index 62f07234bb1..ec386ec928c 100644
--- a/src/vscode-dts/vscode.proposed.chatVariableResolver.d.ts
+++ b/src/vscode-dts/vscode.proposed.chatVariableResolver.d.ts
@@ -77,23 +77,6 @@ declare module 'vscode' {
 		Full = 3
 	}
 
-	export interface ChatVariableValue {
-		/**
-		 * The detail level of this chat variable value. If possible, variable resolvers should try to offer shorter values that will consume fewer tokens in an LLM prompt.
-		 */
-		level: ChatVariableLevel;
-
-		/**
-		 * The variable's value, which can be included in an LLM prompt as-is, or the chat participant may decide to read the value and do something else with it.
-		 */
-		value: string | Uri;
-
-		/**
-		 * A description of this value, which could be provided to the LLM as a hint.
-		 */
-		description?: string;
-	}
-
 	export interface ChatVariableResolverResponseStream {
 		/**
 		 * Push a progress part to this stream. Short-hand for
diff --git a/src/vscode-dts/vscode.proposed.commentReveal.d.ts b/src/vscode-dts/vscode.proposed.commentReveal.d.ts
index 168c4691de5..3aa005d0a99 100644
--- a/src/vscode-dts/vscode.proposed.commentReveal.d.ts
+++ b/src/vscode-dts/vscode.proposed.commentReveal.d.ts
@@ -7,26 +7,39 @@ declare module 'vscode' {
 
 	// @alexr00 https://github.com/microsoft/vscode/issues/167253
 
+	export enum CommentThreadFocus {
+		/**
+		 * Focus the comment editor if the thread supports replying.
+		 */
+		Reply = 1,
+		/**
+		 * Focus the revealed comment.
+		 */
+		Comment = 2
+	}
+
 	/**
 	 * Options to reveal a comment thread in an editor.
 	 */
 	export interface CommentThreadRevealOptions {
-		/**
-		 * By default, the comment thread will be focused. Set `preserveFocus` to `true` to maintain the original focus.
-		 */
-		preserveFocus?: boolean;
 
 		/**
-		 * Focus the comment thread reply editor, if the thread supports replying.
+		 * Where to move the focus to when revealing the comment thread.
+		 * If undefined, the focus will not be changed.
 		 */
-		focusReply?: boolean;
+		focus?: CommentThreadFocus;
 	}
 
-	export interface CommentThread {
+	export interface CommentThread2 {
 		/**
-		 * Reveal the comment thread in an editor.
+		 * Reveal the comment thread in an editor. If no comment is provided, the first comment in the thread will be revealed.
 		 */
-		reveal(options?: CommentThreadRevealOptions): Thenable<void>;
+		reveal(comment?: Comment, options?: CommentThreadRevealOptions): Thenable<void>;
+
+		/**
+		 * Collapse the comment thread in an editor.
+		 */
+		hide(): Thenable<void>;
 	}
 
 }
diff --git a/src/vscode-dts/vscode.proposed.commentThreadApplicability.d.ts b/src/vscode-dts/vscode.proposed.commentThreadApplicability.d.ts
index e09f5a34d6b..fb99abb48bd 100644
--- a/src/vscode-dts/vscode.proposed.commentThreadApplicability.d.ts
+++ b/src/vscode-dts/vscode.proposed.commentThreadApplicability.d.ts
@@ -28,5 +28,13 @@ declare module 'vscode' {
 		 * Worth noting that we already have this problem for the `comments` property.
 		*/
 		state?: CommentThreadState | { resolved?: CommentThreadState; applicability?: CommentThreadApplicability };
+		readonly uri: Uri;
+		range: Range | undefined;
+		comments: readonly Comment[];
+		collapsibleState: CommentThreadCollapsibleState;
+		canReply: boolean;
+		contextValue?: string;
+		label?: string;
+		dispose(): void;
 	}
 }
diff --git a/src/vscode-dts/vscode.proposed.contribChatParticipantDetection.d.ts b/src/vscode-dts/vscode.proposed.contribChatParticipantDetection.d.ts
new file mode 100644
index 00000000000..6de04ce2390
--- /dev/null
+++ b/src/vscode-dts/vscode.proposed.contribChatParticipantDetection.d.ts
@@ -0,0 +1,7 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// empty placeholder declaration for the `chatParticipantDetection`-contribution point
+// https://github.com/microsoft/vscode/issues/227699
diff --git a/src/vs/workbench/workbench.web.main.nls.js b/src/vscode-dts/vscode.proposed.contribDebugCreateConfiguration.d.ts
similarity index 83%
rename from src/vs/workbench/workbench.web.main.nls.js
rename to src/vscode-dts/vscode.proposed.contribDebugCreateConfiguration.d.ts
index 6113d093d5c..9f866269987 100644
--- a/src/vs/workbench/workbench.web.main.nls.js
+++ b/src/vscode-dts/vscode.proposed.contribDebugCreateConfiguration.d.ts
@@ -3,4 +3,4 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-// NOTE: THIS FILE WILL BE OVERWRITTEN DURING BUILD TIME, DO NOT EDIT
+// empty placeholder declaration for the `debugCreateConfiguation` menu
diff --git a/src/vscode-dts/vscode.proposed.contribSourceControlHistoryItemGroupMenu.d.ts b/src/vscode-dts/vscode.proposed.contribSourceControlHistoryItemGroupMenu.d.ts
deleted file mode 100644
index 34315bc14af..00000000000
--- a/src/vscode-dts/vscode.proposed.contribSourceControlHistoryItemGroupMenu.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-// empty placeholder declaration for the `scm/incomingChanges`-menu contribution point
-// empty placeholder declaration for the `scm/incomingChanges/context`-menu contribution point
-// empty placeholder declaration for the `scm/outgoingChanges`-menu contribution point
-// empty placeholder declaration for the `scm/outgoingChanges/context`-menu contribution point
-// https://github.com/microsoft/vscode/issues/201997
diff --git a/src/vscode-dts/vscode.proposed.contribSourceControlHistoryItemMenu.d.ts b/src/vscode-dts/vscode.proposed.contribSourceControlHistoryItemMenu.d.ts
index fc6181be77f..44bfaf17b01 100644
--- a/src/vscode-dts/vscode.proposed.contribSourceControlHistoryItemMenu.d.ts
+++ b/src/vscode-dts/vscode.proposed.contribSourceControlHistoryItemMenu.d.ts
@@ -3,6 +3,5 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-// empty placeholder declaration for the `scm/incomingChanges/historyItem/context`-menu contribution point
-// empty placeholder declaration for the `scm/outgoingChanges/historyItem/context`-menu contribution point
+// empty placeholder declaration for the `scm/historyItem/context`-menu contribution point
 // https://github.com/microsoft/vscode/issues/201997
diff --git a/extensions/markdown-language-features/server/src/util/schemes.ts b/src/vscode-dts/vscode.proposed.contribSourceControlHistoryTitleMenu.d.ts
similarity index 71%
rename from extensions/markdown-language-features/server/src/util/schemes.ts
rename to src/vscode-dts/vscode.proposed.contribSourceControlHistoryTitleMenu.d.ts
index 67b75e0a0d6..605348a6b30 100644
--- a/extensions/markdown-language-features/server/src/util/schemes.ts
+++ b/src/vscode-dts/vscode.proposed.contribSourceControlHistoryTitleMenu.d.ts
@@ -3,6 +3,5 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-export const Schemes = Object.freeze({
-	notebookCell: 'vscode-notebook-cell',
-});
+// empty placeholder declaration for the `scm/history/title`-menu contribution point
+// https://github.com/microsoft/vscode/issues/226144
diff --git a/src/vs/workbench/workbench.desktop.main.css b/src/vscode-dts/vscode.proposed.contribViewContainerTitle.d.ts
similarity index 75%
rename from src/vs/workbench/workbench.desktop.main.css
rename to src/vscode-dts/vscode.proposed.contribViewContainerTitle.d.ts
index 06ed8a197b2..3983df4c509 100644
--- a/src/vs/workbench/workbench.desktop.main.css
+++ b/src/vscode-dts/vscode.proposed.contribViewContainerTitle.d.ts
@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-/* NOTE: THIS FILE WILL BE OVERWRITTEN DURING BUILD TIME, DO NOT EDIT */
+// empty placeholder for view container title menus
 
-div.monaco.main.css {
-}
\ No newline at end of file
+// https://github.com/microsoft/vscode/issues/200880 @roblourens
diff --git a/src/vscode-dts/vscode.proposed.defaultChatParticipant.d.ts b/src/vscode-dts/vscode.proposed.defaultChatParticipant.d.ts
index f4261b5b6fb..927bc7518f4 100644
--- a/src/vscode-dts/vscode.proposed.defaultChatParticipant.d.ts
+++ b/src/vscode-dts/vscode.proposed.defaultChatParticipant.d.ts
@@ -3,12 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+// version: 2
+
 declare module 'vscode' {
 
-	export type ChatWelcomeMessageContent = string | MarkdownString;
+	export interface ChatWelcomeMessageContent {
+		icon: ThemeIcon;
+		title: string;
+		message: MarkdownString;
+	}
 
 	export interface ChatWelcomeMessageProvider {
-		provideWelcomeMessage(location: ChatLocation, token: CancellationToken): ProviderResult<ChatWelcomeMessageContent[]>;
+		provideWelcomeMessage?(token: CancellationToken): ProviderResult<ChatWelcomeMessageContent>;
 		provideSampleQuestions?(location: ChatLocation, token: CancellationToken): ProviderResult<ChatFollowup[]>;
 	}
 
@@ -21,12 +27,14 @@ declare module 'vscode' {
 		icon?: Uri;
 	}
 
-	export interface ChatParticipant {
+	export interface ChatTitleProvider {
 		/**
-		 * When true, this participant is invoked by default when no other participant is being invoked
+		 * TODO@API Should this take a ChatResult like the followup provider, or just take a new ChatContext that includes the current message as history?
 		 */
-		isDefault?: boolean;
+		provideChatTitle(context: ChatContext, token: CancellationToken): ProviderResult<string>;
+	}
 
+	export interface ChatParticipant {
 		/**
 		 * When true, this participant is invoked when the user submits their query using ctrl/cmd+enter
 		 * TODO@API name
@@ -49,6 +57,7 @@ declare module 'vscode' {
 		helpTextPostfix?: string | MarkdownString;
 
 		welcomeMessageProvider?: ChatWelcomeMessageProvider;
+		titleProvider?: ChatTitleProvider;
 		requester?: ChatRequesterInformation;
 	}
 }
diff --git a/src/vscode-dts/vscode.proposed.extensionsAny.d.ts b/src/vscode-dts/vscode.proposed.extensionsAny.d.ts
index c53cd6d89f8..468ffe7b78c 100644
--- a/src/vscode-dts/vscode.proposed.extensionsAny.d.ts
+++ b/src/vscode-dts/vscode.proposed.extensionsAny.d.ts
@@ -28,6 +28,7 @@ declare module 'vscode' {
 		 * @return An extension or `undefined`.
 		 */
 		export function getExtension<T = any>(extensionId: string, includeDifferentExtensionHosts: boolean): Extension<T> | undefined;
+		export function getExtension<T = any>(extensionId: string, includeDifferentExtensionHosts: true): Extension<T | undefined> | undefined;
 
 		/**
 		 * All extensions across all extension hosts.
diff --git a/src/vscode-dts/vscode.proposed.fileComments.d.ts b/src/vscode-dts/vscode.proposed.fileComments.d.ts
index e21b3abfb7a..96e9b181bc6 100644
--- a/src/vscode-dts/vscode.proposed.fileComments.d.ts
+++ b/src/vscode-dts/vscode.proposed.fileComments.d.ts
@@ -6,71 +6,27 @@
 declare module 'vscode' {
 
 	export interface CommentThread2 {
-		/**
-		 * The uri of the document the thread has been created on.
-		 */
-		readonly uri: Uri;
-
 		/**
 		 * The range the comment thread is located within the document. The thread icon will be shown
-		 * at the last line of the range.
+		 * at the last line of the range. When set to undefined, the comment will be associated with the
+		 * file, and not a specific range.
 		 */
 		range: Range | undefined;
+	}
+
+	/**
+	 * The ranges a CommentingRangeProvider enables commenting on.
+	 */
+	export interface CommentingRanges {
+		/**
+		 * Enables comments to be added to a file without a specific range.
+		 */
+		enableFileComments: boolean;
 
 		/**
-		 * The ordered comments of the thread.
+		 * The ranges which allow new comment threads creation.
 		 */
-		comments: readonly Comment[];
-
-		/**
-		 * Whether the thread should be collapsed or expanded when opening the document.
-		 * Defaults to Collapsed.
-		 */
-		collapsibleState: CommentThreadCollapsibleState;
-
-		/**
-		 * Whether the thread supports reply.
-		 * Defaults to true.
-		 */
-		canReply: boolean;
-
-		/**
-		 * Context value of the comment thread. This can be used to contribute thread specific actions.
-		 * For example, a comment thread is given a context value as `editable`. When contributing actions to `comments/commentThread/title`
-		 * using `menus` extension point, you can specify context value for key `commentThread` in `when` expression like `commentThread == editable`.
-		 * ```json
-		 * "contributes": {
-		 *   "menus": {
-		 *     "comments/commentThread/title": [
-		 *       {
-		 *         "command": "extension.deleteCommentThread",
-		 *         "when": "commentThread == editable"
-		 *       }
-		 *     ]
-		 *   }
-		 * }
-		 * ```
-		 * This will show action `extension.deleteCommentThread` only for comment threads with `contextValue` is `editable`.
-		 */
-		contextValue?: string;
-
-		/**
-		 * The optional human-readable label describing the {@link CommentThread Comment Thread}
-		 */
-		label?: string;
-
-		// from the commentThreadRelevance proposal
-		state?: CommentThreadState | { resolved?: CommentThreadState; applicability?: CommentThreadApplicability };
-
-		/**
-		 * Dispose this comment thread.
-		 *
-		 * Once disposed, this comment thread will be removed from visible editors and Comment Panel when appropriate.
-		 */
-		dispose(): void;
-
-		// Part of the comment reveal proposal
-		reveal(options?: CommentThreadRevealOptions): Thenable<void>;
+		ranges?: Range[];
 	}
 
 	export interface CommentController {
@@ -81,6 +37,6 @@ declare module 'vscode' {
 		/**
 		 * Provide a list of ranges which allow new comment threads creation or null for a given document
 		 */
-		provideCommentingRanges(document: TextDocument, token: CancellationToken): ProviderResult<Range[] | { fileComments: boolean; ranges?: Range[] }>;
+		provideCommentingRanges(document: TextDocument, token: CancellationToken): ProviderResult<Range[] | CommentingRanges>;
 	}
 }
diff --git a/src/vscode-dts/vscode.proposed.fileSearchProviderNew.d.ts b/src/vscode-dts/vscode.proposed.fileSearchProviderNew.d.ts
new file mode 100644
index 00000000000..36b0b482313
--- /dev/null
+++ b/src/vscode-dts/vscode.proposed.fileSearchProviderNew.d.ts
@@ -0,0 +1,101 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+declare module 'vscode' {
+
+	// https://github.com/microsoft/vscode/issues/73524
+
+	/**
+	 * Options that apply to file search.
+	 */
+	export interface FileSearchProviderOptions {
+		folderOptions: {
+			/**
+			 * The root folder to search within.
+			 */
+			folder: Uri;
+
+			/**
+			 * Files that match an `includes` glob pattern should be included in the search.
+			 */
+			includes: string[];
+
+			/**
+			 * Files that match an `excludes` glob pattern should be excluded from the search.
+			 */
+			excludes: GlobPattern[];
+
+			/**
+			 * Whether symlinks should be followed while searching.
+			 * For more info, see the setting description for `search.followSymlinks`.
+			 */
+			followSymlinks: boolean;
+
+			/**
+			 * Which file locations we should look for ignore (.gitignore or .ignore) files to respect.
+			 */
+			useIgnoreFiles: {
+				/**
+				 * Use ignore files at the current workspace root.
+				 */
+				local: boolean;
+				/**
+				 * Use ignore files at the parent directory. If set, {@link FileSearchProviderOptions.useIgnoreFiles.local} should also be `true`.
+				 */
+				parent: boolean;
+				/**
+				 * Use global ignore files. If set, {@link FileSearchProviderOptions.useIgnoreFiles.local} should also be `true`.
+				 */
+				global: boolean;
+			};
+		}[];
+
+		/**
+		 * An object with a lifespan that matches the session's lifespan. If the provider chooses to, this object can be used as the key for a cache,
+		 * and searches with the same session object can search the same cache. When the object is garbage-collected, the session is complete and the cache can be cleared.
+		 * Please do not store any references to the session object, except via a weak reference (e.g. `WeakRef` or `WeakMap`).
+		 */
+		session: object;
+
+		/**
+		 * The maximum number of results to be returned.
+		 */
+		maxResults: number;
+	}
+
+	/**
+	 * A FileSearchProvider provides search results for files in the given folder that match a query string. It can be invoked by quickopen or other extensions.
+	 *
+	 * A FileSearchProvider is the more powerful of two ways to implement file search in the editor. Use a FileSearchProvider if you wish to search within a folder for
+	 * all files that match the user's query.
+	 *
+	 * The FileSearchProvider will be invoked on every keypress in quickopen.
+	 */
+	export interface FileSearchProviderNew {
+		/**
+		 * WARNING: VERY EXPERIMENTAL.
+		 *
+		 * Provide the set of files that match a certain file path pattern.
+		 * @param pattern The search pattern to match against file paths.
+		 * @param options A set of options to consider while searching files.
+		 * @param token A cancellation token.
+		 */
+		provideFileSearchResults(pattern: string, options: FileSearchProviderOptions, token: CancellationToken): ProviderResult<Uri[]>;
+	}
+
+	export namespace workspace {
+		/**
+		 *
+		 * Register a search provider.
+		 *
+		 * Only one provider can be registered per scheme.
+		 *
+		 * @param scheme The provider will be invoked for workspace folders that have this file scheme.
+		 * @param provider The provider.
+		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 */
+		export function registerFileSearchProviderNew(scheme: string, provider: FileSearchProviderNew): Disposable;
+	}
+}
diff --git a/src/vscode-dts/vscode.proposed.findFiles2New.d.ts b/src/vscode-dts/vscode.proposed.findFiles2New.d.ts
new file mode 100644
index 00000000000..5ccc4e1bc32
--- /dev/null
+++ b/src/vscode-dts/vscode.proposed.findFiles2New.d.ts
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+declare module 'vscode' {
+
+	export interface FindFiles2OptionsNew {
+		/**
+		 * An array of {@link GlobPattern GlobPattern} that defines files to exclude.
+		 * The glob patterns will be matched against the file paths of files relative to their workspace or {@link RelativePattern.baseUri} if applicable.
+		 *
+		 * If more than one value is used, the values are combined with a logical AND.
+		 * For example, consider the following code:
+		 *
+		 * ```ts
+		 * const ab = findFiles(['**​/*.js'], {exclude: ['*.ts', '*.js']});
+		 * const a = findFiles(['**​/*.js'], {exclude: ['*.ts']});
+		 * const b = findFiles(['**​/*.js'], {exclude: ['*.js']});
+		 * ```
+		 *
+		 * In this, `ab` will be the intersection of results from `a` and `b`.
+		 */
+		exclude?: GlobPattern[];
+
+		/**
+		 * Which settings to follow when searching for files. Defaults to {@link ExcludeSettingOptions.searchAndFilesExclude}.
+		 */
+		useExcludeSettings?: ExcludeSettingOptions;
+
+		/**
+		 * The maximum number of results to search for. Defaults to 20000 results.
+		 */
+		maxResults?: number;
+
+		/**
+		 * Which file locations have ignore (`.gitignore` or `.ignore`) files to follow.
+		 *
+		 * When any of these fields are `undefined`, the value will either be assumed (e.g. if only one is valid),
+		 * or it will follow settings based on the corresponding `search.use*IgnoreFiles` setting.
+		 *
+		 * Will log an error if an invalid combination is set.
+		 *
+		 * Although `.ignore` files are uncommon, they can be leveraged if there are patterns
+		 * that should not be known to git, but should be known to the search providers.
+		 * They should be in the same locations where `.gitignore` files are found, and they follow the same format.
+		 */
+		useIgnoreFiles?: {
+			/**
+			 * Use ignore files at the current workspace root.
+			 * May default to `search.useIgnoreFiles` setting if not set.
+			 */
+			local?: boolean;
+			/**
+			 * Use ignore files at the parent directory. When set to `true`, {@link FindFiles2OptionsNew.useIgnoreFiles.local} must also be `true`.
+			 * May default to `search.useParentIgnoreFiles` setting if not set.
+			 */
+			parent?: boolean;
+			/**
+			 * Use global ignore files. When set to `true`, {@link FindFiles2OptionsNew.useIgnoreFiles.local} must also be `true`.
+			 * May default to `search.useGlobalIgnoreFiles` setting if not set.
+			 */
+			global?: boolean;
+		};
+
+		/**
+		 * Whether symlinks should be followed while searching.
+		 * Defaults to the value for `search.followSymlinks` in settings.
+		 * For more info, see the setting description for `search.followSymlinks`.
+		 */
+		followSymlinks?: boolean;
+	}
+
+	export namespace workspace {
+		/**
+		 * WARNING: VERY EXPERIMENTAL.
+		 *
+		 * Find files across all {@link workspace.workspaceFolders workspace folders} in the workspace.
+		 *
+		 * @example
+		 * findFiles(['**​/*.js'], {exclude: ['**​/out/**'], useIgnoreFiles: true, maxResults: 10})
+		 *
+		 * @param filePattern An array of {@link GlobPattern GlobPattern} that defines the files to search for.
+		 * The glob patterns will be matched against the file paths of files relative to their workspace or {@link baseUri GlobPattern.baseUri} if applicable.
+		 * Use a {@link RelativePattern RelativePatten} to restrict the search results to a {@link WorkspaceFolder workspace folder}.
+		 *
+		 * If more than one value is used, the values are combined with a logical OR.
+		 *
+		 * For example, consider the following code:
+		 *
+		 * ```ts
+		 * const ab = findFiles(['*.ts', '*.js']);
+		 * const a = findFiles(['**​/*.ts']);
+		 * const b = findFiles(['**​/*.js']);
+		 * ```
+		 *
+		 * In this, `ab` will be the union of results from `a` and `b`.
+		 * @param options A set of {@link FindFiles2Options FindFiles2Options} that defines where and how to search (e.g. exclude settings).
+		 * @param token A token that can be used to signal cancellation to the underlying search engine.
+		 * @returns A thenable that resolves to an array of resource identifiers. Will return no results if no
+		 * {@link workspace.workspaceFolders workspace folders} are opened.
+		 */
+		export function findFiles2New(filePattern: GlobPattern[], options?: FindFiles2OptionsNew, token?: CancellationToken): Thenable<Uri[]>;
+	}
+}
diff --git a/src/vscode-dts/vscode.proposed.findTextInFilesNew.d.ts b/src/vscode-dts/vscode.proposed.findTextInFilesNew.d.ts
new file mode 100644
index 00000000000..2756dce1aab
--- /dev/null
+++ b/src/vscode-dts/vscode.proposed.findTextInFilesNew.d.ts
@@ -0,0 +1,164 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+declare module 'vscode' {
+
+	// https://github.com/microsoft/vscode/issues/59924
+
+	export interface FindTextInFilesOptionsNew {
+		/**
+		 * An array of {@link GlobPattern GlobPattern} that defines the files to search for.
+		 * The glob patterns will be matched against the file paths of files relative to their workspace or {@link baseUri GlobPattern.baseUri} if applicable.
+		 * Use a {@link RelativePattern RelativePattern} to restrict the search results to a {@link WorkspaceFolder workspace folder}.
+		 *
+		 * If more than one value is used, the values are combined with a logical OR.
+		 *
+		 * For example, consider the following code:
+		 *
+		 * ```ts
+		 * const ab = findTextInFilesNew('foo', {include: ['*.ts', '*.js']});
+		 * const a = findTextInFilesNew('foo', {include: ['*.ts']});
+		 * const b = findTextInFilesNew('foo', {include: ['*.js']});
+		 * ```
+		 *
+		 * In this, `ab` will be the union of results from `a` and `b`.
+		 */
+		include?: GlobPattern[];
+
+		/**
+		 * An array of {@link GlobPattern GlobPattern} that defines files to exclude.
+		 * The glob patterns will be matched against the file paths of files relative to their workspace or {@link RelativePattern.baseUri} if applicable.
+		 *
+		 * If more than one value is used, the values are combined with a logical AND.
+		 * For example, consider the following code:
+		 *
+		 * ```ts
+		 * const ab = findTextInFilesNew('foo', {exclude: ['*.ts', '*.js']});
+		 * const a = findTextInFilesNew('foo', {exclude: ['*.ts']});
+		 * const b = findTextInFilesNew('foo', {exclude: ['*.js']});
+		 * ```
+		 *
+		 * In this, `ab` will be the intersection of results from `a` and `b`.
+		 */
+		exclude?: GlobPattern[];
+
+		/**
+		 * Which settings to follow when searching for files. Defaults to {@link ExcludeSettingOptions.searchAndFilesExclude}.
+		 */
+		useExcludeSettings?: ExcludeSettingOptions;
+
+		/**
+		 * The maximum number of results to search for. Defaults to 20000 results.
+		 */
+		maxResults?: number;
+
+		/**
+		 * Which file locations have ignore (`.gitignore` or `.ignore`) files to follow.
+		 *
+		 * When any of these fields are `undefined`, the value will either be assumed (e.g. if only one is valid),
+		 * or it will follow settings based on the corresponding `search.use*IgnoreFiles` setting.
+		 *
+		 * Will log an error if an invalid combination is set.
+		 *
+		 * Although `.ignore` files are uncommon, they can be leveraged if there are patterns
+		 * that should not be known to git, but should be known to the search providers.
+		 * They should be in the same locations where `.gitignore` files are found, and they follow the same format.
+		 */
+		useIgnoreFiles?: {
+			/**
+			 * Use ignore files at the current workspace root.
+			 * May default to `search.useIgnoreFiles` setting if not set.
+			 */
+			local?: boolean;
+			/**
+			 * Use ignore files at the parent directory. When set to `true`, {@link FindTextInFilesOptionsNew.useIgnoreFiles.local} must be `true`.
+			 * May default to `search.useParentIgnoreFiles` setting if not set.
+			 */
+			parent?: boolean;
+			/**
+			 * Use global ignore files. When set to `true`, {@link FindTextInFilesOptionsNew.useIgnoreFiles.local} must also be `true`.
+			 * May default to `search.useGlobalIgnoreFiles` setting if not set.
+			 */
+			global?: boolean;
+		};
+
+		/**
+		 * Whether symlinks should be followed while searching.
+		 * Defaults to the value for `search.followSymlinks` in settings.
+		 * For more info, see the setting description for `search.followSymlinks`.
+		 */
+		followSymlinks?: boolean;
+
+		/**
+		 * Interpret files using this encoding.
+		 * See the vscode setting `"files.encoding"`
+		 */
+		encoding?: string;
+
+		/**
+		 * Options to specify the size of the result text preview.
+		 */
+		previewOptions?: {
+			/**
+			 * The maximum number of lines in the preview of the match itself (not including surrounding context lines).
+			 * Only search providers that support multiline search will ever return more than one line in the match.
+			 */
+			numMatchLines?: number;
+
+			/**
+			 * The maximum number of characters included per line.
+			 */
+			charsPerLine?: number;
+		};
+
+		/**
+		 * Number of lines of context to include before and after each match.
+		 */
+		surroundingContext?: number;
+	}
+
+	export interface FindTextInFilesResponse {
+		/**
+		 * The results of the text search, in batches. To get completion information, wait on the `complete` property.
+		 */
+		results: AsyncIterable<TextSearchResultNew>;
+		/**
+		 * The text search completion information. This resolves on completion.
+		 */
+		complete: Thenable<TextSearchCompleteNew>;
+	}
+
+	/**
+	 * Options for following search.exclude and files.exclude settings.
+	 */
+	export enum ExcludeSettingOptions {
+		/**
+		 * Don't use any exclude settings.
+		 */
+		None = 1,
+		/**
+		 * Use the `files.exclude` setting
+		 */
+		FilesExclude = 2,
+		/**
+		 * Use the `files.exclude` and `search.exclude` settings
+		 */
+		SearchAndFilesExclude = 3
+	}
+
+	export namespace workspace {
+		/**
+		 * WARNING: VERY EXPERIMENTAL.
+		 *
+		 * Search text in files across all {@link workspace.workspaceFolders workspace folders} in the workspace.
+		 * @param query The query parameters for the search - the search string, whether it's case-sensitive, or a regex, or matches whole words.
+		 * @param options An optional set of query options.
+		 * @param callback A callback, called for each {@link TextSearchResultNew result}. This can be a direct match, or context that surrounds a match.
+		 * @param token A token that can be used to signal cancellation to the underlying search engine.
+		 * @return A thenable that resolves when the search is complete.
+		 */
+		export function findTextInFilesNew(query: TextSearchQueryNew, options?: FindTextInFilesOptionsNew, token?: CancellationToken): FindTextInFilesResponse;
+	}
+}
diff --git a/src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts b/src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts
index 2715014a0a8..8a71a374846 100644
--- a/src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts
+++ b/src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts
@@ -60,6 +60,12 @@ declare module 'vscode' {
 		 */
 		// eslint-disable-next-line local/vscode-dts-provider-naming
 		handleDidPartiallyAcceptCompletionItem?(completionItem: InlineCompletionItem, info: PartialAcceptInfo): void;
+
+		provideInlineEditsForRange?(document: TextDocument, range: Range, context: InlineCompletionContext, token: CancellationToken): ProviderResult<InlineCompletionItem[] | InlineCompletionList>;
+	}
+
+	export interface InlineCompletionContext {
+		readonly userPrompt?: string;
 	}
 
 	export interface PartialAcceptInfo {
diff --git a/src/vscode-dts/vscode.proposed.interactive.d.ts b/src/vscode-dts/vscode.proposed.interactive.d.ts
index 472f013cca3..d6c4c7b5296 100644
--- a/src/vscode-dts/vscode.proposed.interactive.d.ts
+++ b/src/vscode-dts/vscode.proposed.interactive.d.ts
@@ -6,8 +6,6 @@
 declare module 'vscode' {
 
 	export namespace interactive {
-		// Can be deleted after another insiders
-		export const _version: number;
 		export function transferActiveChat(toWorkspace: Uri): void;
 	}
 }
diff --git a/src/vscode-dts/vscode.proposed.lmTools.d.ts b/src/vscode-dts/vscode.proposed.lmTools.d.ts
index 6aa0ac3a225..89175362934 100644
--- a/src/vscode-dts/vscode.proposed.lmTools.d.ts
+++ b/src/vscode-dts/vscode.proposed.lmTools.d.ts
@@ -3,31 +3,39 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+// version: 7
+// https://github.com/microsoft/vscode/issues/213274
+
 declare module 'vscode' {
 
 	// TODO@API capabilities
 
-	export type JSONSchema = object;
-
 	// API -> LM: an tool/function that is available to the language model
-	export interface LanguageModelChatFunction {
+	export interface LanguageModelChatTool {
+		// TODO@API should use "id" here to match vscode tools, or keep name to match OpenAI?
 		name: string;
 		description: string;
-		parametersSchema: JSONSchema;
+		parametersSchema?: JSONSchema;
 	}
 
 	// API -> LM: add tools as request option
 	export interface LanguageModelChatRequestOptions {
-		// TODO@API this will a heterogeneous array of different types of tools
-		tools?: LanguageModelChatFunction[];
+		// TODO@API this will be a heterogeneous array of different types of tools
+		tools?: LanguageModelChatTool[];
+
+		/**
+		 * Force a specific tool to be used.
+		 */
+		toolChoice?: string;
 	}
 
 	// LM -> USER: function that should be used
-	export class LanguageModelChatResponseFunctionUsePart {
+	export class LanguageModelChatResponseToolCallPart {
 		name: string;
+		toolCallId: string;
 		parameters: any;
 
-		constructor(name: string, parameters: any);
+		constructor(name: string, toolCallId: string, parameters: any);
 	}
 
 	// LM -> USER: text chunk
@@ -38,21 +46,188 @@ declare module 'vscode' {
 	}
 
 	export interface LanguageModelChatResponse {
-
-		stream: AsyncIterable<LanguageModelChatResponseTextPart | LanguageModelChatResponseFunctionUsePart>;
+		stream: AsyncIterable<LanguageModelChatResponseTextPart | LanguageModelChatResponseToolCallPart>;
 	}
 
 
 	// USER -> LM: the result of a function call
-	export class LanguageModelChatMessageFunctionResultPart {
-		name: string;
+	export class LanguageModelChatMessageToolResultPart {
+		toolCallId: string;
 		content: string;
 		isError: boolean;
 
-		constructor(name: string, content: string, isError?: boolean);
+		constructor(toolCallId: string, content: string, isError?: boolean);
 	}
 
 	export interface LanguageModelChatMessage {
-		content2: string | LanguageModelChatMessageFunctionResultPart;
+		/**
+		 * A heterogeneous array of other things that a message can contain as content.
+		 * Some parts would be message-type specific for some models and wouldn't go together,
+		 * but it's up to the chat provider to decide what to do about that.
+		 * Can drop parts that are not valid for the message type.
+		 * LanguageModelChatMessageToolResultPart: only on User messages
+		 * LanguageModelChatResponseToolCallPart: only on Assistant messages
+		 */
+		content2: (string | LanguageModelChatMessageToolResultPart | LanguageModelChatResponseToolCallPart)[];
+	}
+
+	export interface LanguageModelToolResult {
+		/**
+		 * The result can contain arbitrary representations of the content. Use {@link LanguageModelToolInvocationOptions.requested} to request particular types.
+		 * `text/plain` is required to be supported by all tools. Another example might be a `PromptElementJSON` from `@vscode/prompt-tsx`, using the `contentType` exported by that library.
+		 */
+		[contentType: string]: any;
+	}
+
+	// Tool registration/invoking between extensions
+
+	export namespace lm {
+		/**
+		 * Register a LanguageModelTool. The tool must also be registered in the package.json `languageModelTools` contribution point.
+		 */
+		export function registerTool(id: string, tool: LanguageModelTool): Disposable;
+
+		/**
+		 * A list of all available tools.
+		 */
+		export const tools: ReadonlyArray<LanguageModelToolDescription>;
+
+		/**
+		 * Invoke a tool with the given parameters.
+		 */
+		export function invokeTool(id: string, options: LanguageModelToolInvocationOptions, token: CancellationToken): Thenable<LanguageModelToolResult>;
+	}
+
+	export type ChatParticipantToolToken = unknown;
+
+	export interface LanguageModelToolInvocationOptions {
+		/**
+		 * When this tool is being invoked within the context of a chat request, this token should be passed from {@link ChatRequest.toolInvocationToken}.
+		 * In that case, a progress bar will be automatically shown for the tool invocation in the chat response view. If the tool is being invoked
+		 * outside of a chat request, `undefined` should be passed instead.
+		 */
+		toolInvocationToken: ChatParticipantToolToken | undefined;
+
+		/**
+		 * Parameters with which to invoke the tool.
+		 */
+		parameters: Object;
+
+		/**
+		 * A tool invoker can request that particular content types be returned from the tool. All tools are required to support `text/plain`.
+		 */
+		requestedContentTypes: string[];
+
+		/**
+		 * Options to hint at how many tokens the tool should return in its response.
+		 */
+		tokenOptions?: {
+			/**
+			 * If known, the maximum number of tokens the tool should emit in its result.
+			 */
+			tokenBudget: number;
+
+			/**
+			 * Count the number of tokens in a message using the model specific tokenizer-logic.
+			 * @param text A string.
+			 * @param token Optional cancellation token.  See {@link CancellationTokenSource} for how to create one.
+			 * @returns A thenable that resolves to the number of tokens.
+			 */
+			countTokens(text: string, token?: CancellationToken): Thenable<number>;
+		};
+	}
+
+	export type JSONSchema = object;
+
+	export interface LanguageModelToolDescription {
+		/**
+		 * A unique identifier for the tool.
+		 */
+		id: string;
+
+		/**
+		 * A human-readable name for this tool that may be used to describe it in the UI.
+		 */
+		displayName: string | undefined;
+
+		/**
+		 * A description of this tool that may be passed to a language model.
+		 */
+		modelDescription: string;
+
+		/**
+		 * A JSON schema for the parameters this tool accepts.
+		 */
+		parametersSchema?: JSONSchema;
+
+		/**
+		 * The list of content types that the tool has declared support for.
+		 */
+		supportedContentTypes: string[];
+	}
+
+	export interface LanguageModelToolProvideConfirmationMessageOptions {
+		participantName: string;
+		parameters: any;
+	}
+
+	export interface LanguageModelToolConfirmationMessages {
+		title: string;
+		message: string | MarkdownString;
+	}
+
+	export interface LanguageModelTool {
+		invoke(options: LanguageModelToolInvocationOptions, token: CancellationToken): ProviderResult<LanguageModelToolResult>;
+
+		/**
+		 * This can be implemented to customize the message shown to the user when a tool requires confirmation.
+		 */
+		provideToolConfirmationMessages?(options: LanguageModelToolProvideConfirmationMessageOptions, token: CancellationToken): Thenable<LanguageModelToolConfirmationMessages>;
+
+		/**
+		 * This message will be shown with the progress notification when the tool is invoked in a chat session.
+		 */
+		provideToolInvocationMessage?(parameters: any, token: CancellationToken): Thenable<string>;
+	}
+
+	export interface ChatLanguageModelToolReference {
+		/**
+		 * The tool's ID. Refers to a tool listed in {@link lm.tools}.
+		 */
+		readonly id: string;
+
+		/**
+		 * The start and end index of the reference in the {@link ChatRequest.prompt prompt}. When undefined, the reference was not part of the prompt text.
+		 *
+		 * *Note* that the indices take the leading `#`-character into account which means they can
+		 * used to modify the prompt as-is.
+		 */
+		readonly range?: [start: number, end: number];
+	}
+
+	export interface ChatRequest {
+		/**
+		 * The list of tools that the user attached to their request.
+		 *
+		 * *Note* that if tools are referenced in the text of the prompt, using `#`, the prompt contains
+		 * references as authored and that it is up to the participant
+		 * to further modify the prompt, for instance by inlining reference values or creating links to
+		 * headings which contain the resolved values. References are sorted in reverse by their range
+		 * in the prompt. That means the last reference in the prompt is the first in this list. This simplifies
+		 * string-manipulation of the prompt.
+		 */
+		readonly toolReferences: readonly ChatLanguageModelToolReference[];
+
+		/**
+		 * A token that can be passed to {@link lm.invokeTool} when invoking a tool inside the context of handling a chat request.
+		 */
+		readonly toolInvocationToken: ChatParticipantToolToken;
+	}
+
+	export interface ChatRequestTurn {
+		/**
+		 * The list of tools were attached to this request.
+		 */
+		readonly toolReferences?: readonly ChatLanguageModelToolReference[];
 	}
 }
diff --git a/src/vscode-dts/vscode.proposed.mappedEditsProvider.d.ts b/src/vscode-dts/vscode.proposed.mappedEditsProvider.d.ts
index 653f6a2d50d..69061d64ffd 100644
--- a/src/vscode-dts/vscode.proposed.mappedEditsProvider.d.ts
+++ b/src/vscode-dts/vscode.proposed.mappedEditsProvider.d.ts
@@ -11,8 +11,25 @@ declare module 'vscode' {
 		readonly ranges: Range[];
 	}
 
+	export interface ConversationRequest {
+		readonly type: 'request';
+		readonly message: string;
+	}
+
+	export interface ConversationResponse {
+		readonly type: 'response';
+		readonly message: string;
+		readonly result?: ChatResult;
+		readonly references?: DocumentContextItem[];
+	}
+
 	export interface MappedEditsContext {
-		documents: DocumentContextItem[][];
+		readonly documents: DocumentContextItem[][];
+		/**
+		 * The conversation that led to the current code block(s).
+		 * The last conversation part contains the code block(s) for which the code mapper should provide edits.
+		 */
+		readonly conversation?: (ConversationRequest | ConversationResponse)[];
 	}
 
 	/**
@@ -23,7 +40,7 @@ declare module 'vscode' {
 		 * Provide mapped edits for a given document.
 		 * @param document The document to provide mapped edits for.
 		 * @param codeBlocks Code blocks that come from an LLM's reply.
-		 * 						"Insert at cursor" in the panel chat only sends one edit that the user clicks on, but inline chat can send multiple blocks and let the lang server decide what to do with them.
+		 * 						"Apply in Editor" in the panel chat only sends one edit that the user clicks on, but inline chat can send multiple blocks and let the lang server decide what to do with them.
 		 * @param context The context for providing mapped edits.
 		 * @param token A cancellation token.
 		 * @returns A provider result of text edits.
@@ -36,7 +53,33 @@ declare module 'vscode' {
 		): ProviderResult<WorkspaceEdit | null>;
 	}
 
+	export interface MappedEditsRequest {
+		readonly codeBlocks: { code: string; resource: Uri; markdownBeforeBlock?: string }[];
+		readonly conversation: (ConversationRequest | ConversationResponse)[]; // for every prior response that contains codeblocks, make sure we pass the code as well as the resources based on the reported codemapper URIs
+	}
+
+	export interface MappedEditsResponseStream {
+		textEdit(target: Uri, edits: TextEdit | TextEdit[]): void;
+	}
+
+	export interface MappedEditsResult {
+		readonly errorMessage?: string;
+	}
+
+	/**
+	 * Interface for providing mapped edits for a given document.
+	 */
+	export interface MappedEditsProvider2 {
+		provideMappedEdits(
+			request: MappedEditsRequest,
+			result: MappedEditsResponseStream,
+			token: CancellationToken
+		): ProviderResult<MappedEditsResult>;
+	}
+
 	namespace chat {
 		export function registerMappedEditsProvider(documentSelector: DocumentSelector, provider: MappedEditsProvider): Disposable;
+
+		export function registerMappedEditsProvider2(provider: MappedEditsProvider2): Disposable;
 	}
 }
diff --git a/src/vscode-dts/vscode.proposed.notebookReplDocument.d.ts b/src/vscode-dts/vscode.proposed.notebookReplDocument.d.ts
new file mode 100644
index 00000000000..d78450e944a
--- /dev/null
+++ b/src/vscode-dts/vscode.proposed.notebookReplDocument.d.ts
@@ -0,0 +1,33 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+declare module 'vscode' {
+
+	export interface NotebookDocumentShowOptions {
+		/**
+		 * The notebook should be opened in a REPL editor,
+		 * where the last cell of the notebook is an input box and the other cells are the read-only history.
+		 * When the value is a string, it will be used as the label for the editor tab.
+		 */
+		readonly asRepl?: boolean | string | {
+			/**
+			* The label to be used for the editor tab.
+			*/
+			readonly label: string;
+		};
+	}
+
+	export interface NotebookEditor {
+		/**
+		 * Information about the REPL editor if the notebook was opened as a repl.
+		 */
+		replOptions?: {
+			/**
+			 * The index where new cells should be appended.
+			 */
+			appendIndex: number;
+		};
+	}
+}
diff --git a/src/vscode-dts/vscode.proposed.quickInputButtonLocation.d.ts b/src/vscode-dts/vscode.proposed.quickInputButtonLocation.d.ts
new file mode 100644
index 00000000000..5113c5864ff
--- /dev/null
+++ b/src/vscode-dts/vscode.proposed.quickInputButtonLocation.d.ts
@@ -0,0 +1,29 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+declare module 'vscode' {
+
+	// https://github.com/microsoft/vscode/issues/175662
+
+	export enum QuickInputButtonLocation {
+		/**
+		 * In the title bar.
+		 */
+		Title = 1,
+
+		/**
+		 * To the right of the input box.
+		 */
+		Inline = 2
+	}
+
+	export interface QuickInputButton {
+		/**
+		 * Where the button should be rendered. The default is {@link QuickInputButtonLocation.Title}.
+		 * @note This property is ignored if the button was added to a QuickPickItem.
+		 */
+		location?: QuickInputButtonLocation;
+	}
+}
diff --git a/src/vscode-dts/vscode.proposed.scmActionButton.d.ts b/src/vscode-dts/vscode.proposed.scmActionButton.d.ts
index b035aaddc8d..96b8b1c0e53 100644
--- a/src/vscode-dts/vscode.proposed.scmActionButton.d.ts
+++ b/src/vscode-dts/vscode.proposed.scmActionButton.d.ts
@@ -7,9 +7,8 @@ declare module 'vscode' {
 	// https://github.com/microsoft/vscode/issues/133935
 
 	export interface SourceControlActionButton {
-		command: Command;
+		command: Command & { shortTitle?: string };
 		secondaryCommands?: Command[][];
-		description?: string;
 		enabled: boolean;
 	}
 
diff --git a/src/vscode-dts/vscode.proposed.scmHistoryProvider.d.ts b/src/vscode-dts/vscode.proposed.scmHistoryProvider.d.ts
index e7e7ca1c85b..ef2984d9686 100644
--- a/src/vscode-dts/vscode.proposed.scmHistoryProvider.d.ts
+++ b/src/vscode-dts/vscode.proposed.scmHistoryProvider.d.ts
@@ -11,40 +11,32 @@ declare module 'vscode' {
 	}
 
 	export interface SourceControlHistoryProvider {
-		currentHistoryItemGroup?: SourceControlHistoryItemGroup;
+		readonly currentHistoryItemRef: SourceControlHistoryItemRef | undefined;
+		readonly currentHistoryItemRemoteRef: SourceControlHistoryItemRef | undefined;
+		readonly currentHistoryItemBaseRef: SourceControlHistoryItemRef | undefined;
 
 		/**
-		 * Fires when the current history item group changes after
-		 * a user action (ex: commit, checkout, fetch, pull, push)
+		 * Fires when the current history item refs (local, remote, base)
+		 * change after a user action (ex: commit, checkout, fetch, pull, push)
 		 */
-		onDidChangeCurrentHistoryItemGroup: Event<void>;
+		onDidChangeCurrentHistoryItemRefs: Event<void>;
 
 		/**
-		 * Fires when the history item groups change (ex: commit, push, fetch)
+		 * Fires when history item refs change
 		 */
-		// onDidChangeHistoryItemGroups: Event<SourceControlHistoryChangeEvent>;
+		onDidChangeHistoryItemRefs: Event<SourceControlHistoryItemRefsChangeEvent>;
 
-		provideHistoryItems(historyItemGroupId: string, options: SourceControlHistoryOptions, token: CancellationToken): ProviderResult<SourceControlHistoryItem[]>;
-		provideHistoryItemSummary?(historyItemId: string, historyItemParentId: string | undefined, token: CancellationToken): ProviderResult<SourceControlHistoryItem>;
+		provideHistoryItemRefs(historyItemRefs: string[] | undefined, token: CancellationToken): ProviderResult<SourceControlHistoryItemRef[]>;
+		provideHistoryItems(options: SourceControlHistoryOptions, token: CancellationToken): ProviderResult<SourceControlHistoryItem[]>;
 		provideHistoryItemChanges(historyItemId: string, historyItemParentId: string | undefined, token: CancellationToken): ProviderResult<SourceControlHistoryItemChange[]>;
 
-		resolveHistoryItemGroupCommonAncestor(historyItemGroupId1: string, historyItemGroupId2: string | undefined, token: CancellationToken): ProviderResult<{ id: string; ahead: number; behind: number }>;
+		resolveHistoryItemRefsCommonAncestor(historyItemRefs: string[], token: CancellationToken): ProviderResult<string>;
 	}
 
 	export interface SourceControlHistoryOptions {
-		readonly cursor?: string;
+		readonly skip?: number;
 		readonly limit?: number | { id?: string };
-	}
-
-	export interface SourceControlHistoryItemGroup {
-		readonly id: string;
-		readonly name: string;
-		readonly base?: Omit<SourceControlRemoteHistoryItemGroup, 'base'>;
-	}
-
-	export interface SourceControlRemoteHistoryItemGroup {
-		readonly id: string;
-		readonly name: string;
+		readonly historyItemRefs?: readonly string[];
 	}
 
 	export interface SourceControlHistoryItemStatistics {
@@ -57,10 +49,20 @@ declare module 'vscode' {
 		readonly id: string;
 		readonly parentIds: string[];
 		readonly message: string;
+		readonly displayId?: string;
 		readonly author?: string;
-		readonly icon?: Uri | { light: Uri; dark: Uri } | ThemeIcon;
 		readonly timestamp?: number;
 		readonly statistics?: SourceControlHistoryItemStatistics;
+		readonly references?: SourceControlHistoryItemRef[];
+	}
+
+	export interface SourceControlHistoryItemRef {
+		readonly id: string;
+		readonly name: string;
+		readonly description?: string;
+		readonly revision?: string;
+		readonly category?: string;
+		readonly icon?: Uri | { light: Uri; dark: Uri } | ThemeIcon;
 	}
 
 	export interface SourceControlHistoryItemChange {
@@ -70,10 +72,17 @@ declare module 'vscode' {
 		readonly renameUri: Uri | undefined;
 	}
 
-	// export interface SourceControlHistoryChangeEvent {
-	// 	readonly added: Iterable<SourceControlHistoryItemGroup>;
-	// 	readonly removed: Iterable<SourceControlHistoryItemGroup>;
-	// 	readonly modified: Iterable<SourceControlHistoryItemGroup>;
-	// }
+	export interface SourceControlHistoryItemRefsChangeEvent {
+		readonly added: readonly SourceControlHistoryItemRef[];
+		readonly removed: readonly SourceControlHistoryItemRef[];
+		readonly modified: readonly SourceControlHistoryItemRef[];
 
+		/**
+		 * Flag to indicate if the operation that caused the event to trigger was due
+		 * to a user action or a background operation (ex: Auto Fetch). The flag is used
+		 * to determine whether to automatically refresh the user interface or present
+		 * the user with a visual cue that the user interface is outdated.
+		 */
+		readonly silent: boolean;
+	}
 }
diff --git a/src/vscode-dts/vscode.proposed.terminalShellIntegration.d.ts b/src/vscode-dts/vscode.proposed.terminalShellIntegration.d.ts
deleted file mode 100644
index 5876b29643b..00000000000
--- a/src/vscode-dts/vscode.proposed.terminalShellIntegration.d.ts
+++ /dev/null
@@ -1,330 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-declare module 'vscode' {
-
-	// https://github.com/microsoft/vscode/issues/145234
-
-	/**
-	 * A command that was executed in a terminal.
-	 */
-	export interface TerminalShellExecution {
-		/**
-		 * The command line that was executed. The {@link TerminalShellExecutionCommandLineConfidence confidence}
-		 * of this value depends on the specific shell's shell integration implementation. This
-		 * value may become more accurate after {@link window.onDidEndTerminalShellExecution} is
-		 * fired.
-		 *
-		 * @example
-		 * // Log the details of the command line on start and end
-		 * window.onDidStartTerminalShellExecution(event => {
-		 *   const commandLine = event.execution.commandLine;
-		 *   console.log(`Command started\n${summarizeCommandLine(commandLine)}`);
-		 * });
-		 * window.onDidEndTerminalShellExecution(event => {
-		 *   const commandLine = event.execution.commandLine;
-		 *   console.log(`Command ended\n${summarizeCommandLine(commandLine)}`);
-		 * });
-		 * function summarizeCommandLine(commandLine: TerminalShellExecutionCommandLine) {
-		 *   return [
-		 *     `  Command line: ${command.commandLine.value}`,
-		 *     `  Confidence: ${command.commandLine.confidence}`,
-		 *     `  Trusted: ${command.commandLine.isTrusted}
-		 *   ].join('\n');
-		 * }
-		 */
-		readonly commandLine: TerminalShellExecutionCommandLine;
-
-		/**
-		 * The working directory that was reported by the shell when this command executed. This
-		 * {@link Uri} may represent a file on another machine (eg. ssh into another machine). This
-		 * requires the shell integration to support working directory reporting.
-		 */
-		readonly cwd: Uri | undefined;
-
-		/**
-		 * Creates a stream of raw data (including escape sequences) that is written to the
-		 * terminal. This will only include data that was written after `read` was called for
-		 * the first time, ie. you must call `read` immediately after the command is executed via
-		 * {@link TerminalShellIntegration.executeCommand} or
-		 * {@link window.onDidStartTerminalShellExecution} to not miss any data.
-		 *
-		 * @example
-		 * // Log all data written to the terminal for a command
-		 * const command = term.shellIntegration.executeCommand({ commandLine: 'echo "Hello world"' });
-		 * const stream = command.read();
-		 * for await (const data of stream) {
-		 *   console.log(data);
-		 * }
-		 */
-		read(): AsyncIterable<string>;
-	}
-
-	/**
-	 * A command line that was executed in a terminal.
-	 */
-	export interface TerminalShellExecutionCommandLine {
-		/**
-		 * The full command line that was executed, including both the command and its arguments.
-		 */
-		readonly value: string;
-
-		/**
-		 * Whether the command line value came from a trusted source and is therefore safe to
-		 * execute without user additional confirmation, such as a notification that asks "Do you
-		 * want to execute (command)?". This verification is likely only needed if you are going to
-		 * execute the command again.
-		 *
-		 * This is `true` only when the command line was reported explicitly by the shell
-		 * integration script (ie. {@link TerminalShellExecutionCommandLineConfidence.High high confidence})
-		 * and it used a nonce for verification.
-		 */
-		readonly isTrusted: boolean;
-
-		/**
-		 * The confidence of the command line value which is determined by how the value was
-		 * obtained. This depends upon the implementation of the shell integration script.
-		 */
-		readonly confidence: TerminalShellExecutionCommandLineConfidence;
-	}
-
-	/**
-	 * The confidence of a {@link TerminalShellExecutionCommandLine} value.
-	 */
-	enum TerminalShellExecutionCommandLineConfidence {
-		/**
-		 * The command line value confidence is low. This means that the value was read from the
-		 * terminal buffer using markers reported by the shell integration script. Additionally one
-		 * of the following conditions will be met:
-		 *
-		 * - The command started on the very left-most column which is unusual, or
-		 * - The command is multi-line which is more difficult to accurately detect due to line
-		 *   continuation characters and right prompts.
-		 * - Command line markers were not reported by the shell integration script.
-		 */
-		Low = 0,
-
-		/**
-		 * The command line value confidence is medium. This means that the value was read from the
-		 * terminal buffer using markers reported by the shell integration script. The command is
-		 * single-line and does not start on the very left-most column (which is unusual).
-		 */
-		Medium = 1,
-
-		/**
-		 * The command line value confidence is high. This means that the value was explicitly sent
-		 * from the shell integration script or the command was executed via the
-		 * {@link TerminalShellIntegration.executeCommand} API.
-		 */
-		High = 2
-	}
-
-	export interface Terminal {
-		/**
-		 * An object that contains [shell integration](https://code.visualstudio.com/docs/terminal/shell-integration)-powered
-		 * features for the terminal. This will always be `undefined` immediately after the terminal
-		 * is created. Listen to {@link window.onDidActivateTerminalShellIntegration} to be notified
-		 * when shell integration is activated for a terminal.
-		 *
-		 * Note that this object may remain undefined if shell integation never activates. For
-		 * example Command Prompt does not support shell integration and a user's shell setup could
-		 * conflict with the automatic shell integration activation.
-		 */
-		readonly shellIntegration: TerminalShellIntegration | undefined;
-	}
-
-	/**
-	 * [Shell integration](https://code.visualstudio.com/docs/terminal/shell-integration)-powered capabilities owned by a terminal.
-	 */
-	export interface TerminalShellIntegration {
-		/**
-		 * The current working directory of the terminal. This {@link Uri} may represent a file on
-		 * another machine (eg. ssh into another machine). This requires the shell integration to
-		 * support working directory reporting.
-		 */
-		readonly cwd: Uri | undefined;
-
-		/**
-		 * Execute a command, sending ^C as necessary to interrupt any running command if needed.
-		 *
-		 * @param commandLine The command line to execute, this is the exact text that will be sent
-		 * to the terminal.
-		 *
-		 * @example
-		 * // Execute a command in a terminal immediately after being created
-		 * const myTerm = window.createTerminal();
-		 * window.onDidActivateTerminalShellIntegration(async ({ terminal, shellIntegration }) => {
-		 *   if (terminal === myTerm) {
-		 *     const command = shellIntegration.executeCommand('echo "Hello world"');
-		 *     const code = await command.exitCode;
-		 *     console.log(`Command exited with code ${code}`);
-		 *   }
-		 * }));
-		 * // Fallback to sendText if there is no shell integration within 3 seconds of launching
-		 * setTimeout(() => {
-		 *   if (!myTerm.shellIntegration) {
-		 *     myTerm.sendText('echo "Hello world"');
-		 *     // Without shell integration, we can't know when the command has finished or what the
-		 *     // exit code was.
-		 *   }
-		 * }, 3000);
-		 *
-		 * @example
-		 * // Send command to terminal that has been alive for a while
-		 * const commandLine = 'echo "Hello world"';
-		 * if (term.shellIntegration) {
-		 *   const command = term.shellIntegration.executeCommand({ commandLine });
-		 *   const code = await command.exitCode;
-		 *   console.log(`Command exited with code ${code}`);
-		 * } else {
-		 *   term.sendText(commandLine);
-		 *   // Without shell integration, we can't know when the command has finished or what the
-		 *   // exit code was.
-		 * }
-		 */
-		executeCommand(commandLine: string): TerminalShellExecution;
-
-		/**
-		 * Execute a command, sending ^C as necessary to interrupt any running command if needed.
-		 *
-		 * *Note* This is not guaranteed to work as [shell integration](https://code.visualstudio.com/docs/terminal/shell-integration)
-		 * must be activated. Check whether {@link TerminalShellExecution.exitCode} is rejected to
-		 * verify whether it was successful.
-		 *
-		 * @param command A command to run.
-		 * @param args Arguments to launch the executable with which will be automatically escaped
-		 * based on the executable type.
-		 *
-		 * @example
-		 * // Execute a command in a terminal immediately after being created
-		 * const myTerm = window.createTerminal();
-		 * window.onDidActivateTerminalShellIntegration(async ({ terminal, shellIntegration }) => {
-		 *   if (terminal === myTerm) {
-		 *     const command = shellIntegration.executeCommand({
-		 *       command: 'echo',
-		 *       args: ['Hello world']
-		 *     });
-		 *     const code = await command.exitCode;
-		 *     console.log(`Command exited with code ${code}`);
-		 *   }
-		 * }));
-		 * // Fallback to sendText if there is no shell integration within 3 seconds of launching
-		 * setTimeout(() => {
-		 *   if (!myTerm.shellIntegration) {
-		 *     myTerm.sendText('echo "Hello world"');
-		 *     // Without shell integration, we can't know when the command has finished or what the
-		 *     // exit code was.
-		 *   }
-		 * }, 3000);
-		 *
-		 * @example
-		 * // Send command to terminal that has been alive for a while
-		 * const commandLine = 'echo "Hello world"';
-		 * if (term.shellIntegration) {
-		 *   const command = term.shellIntegration.executeCommand({
-		 *     command: 'echo',
-		 *     args: ['Hello world']
-		 *   });
-		 *   const code = await command.exitCode;
-		 *   console.log(`Command exited with code ${code}`);
-		 * } else {
-		 *   term.sendText(commandLine);
-		 *   // Without shell integration, we can't know when the command has finished or what the
-		 *   // exit code was.
-		 * }
-		 */
-		executeCommand(executable: string, args: string[]): TerminalShellExecution;
-	}
-
-	export interface TerminalShellIntegrationChangeEvent {
-		/**
-		 * The terminal that shell integration has been activated in.
-		 */
-		readonly terminal: Terminal;
-
-		/**
-		 * The shell integration object.
-		 */
-		readonly shellIntegration: TerminalShellIntegration;
-	}
-
-	export interface TerminalShellExecutionStartEvent {
-		/**
-		 * The terminal that shell integration has been activated in.
-		 */
-		readonly terminal: Terminal;
-
-		/**
-		 * The shell integration object.
-		 */
-		readonly shellIntegration: TerminalShellIntegration;
-
-		/**
-		 * The terminal shell execution that has ended.
-		 */
-		readonly execution: TerminalShellExecution;
-	}
-
-	export interface TerminalShellExecutionEndEvent {
-		/**
-		 * The terminal that shell integration has been activated in.
-		 */
-		readonly terminal: Terminal;
-
-		/**
-		 * The shell integration object.
-		 */
-		readonly shellIntegration: TerminalShellIntegration;
-
-		/**
-		 * The terminal shell execution that has ended.
-		 */
-		readonly execution: TerminalShellExecution;
-
-		/**
-		 * The exit code reported by the shell. `undefined` means the shell did not report an exit
-		 * code or the shell reported a command started before the command finished.
-		 *
-		 * @example
-		 * const execution = shellIntegration.executeCommand({
-		 *   command: 'echo',
-		 *   args: ['Hello world']
-		 * });
-		 * window.onDidEndTerminalShellExecution(event => {
-		 *   if (event.execution === execution) {
-		 *     if (event.exitCode === undefined) {
-		 * 	     console.log('Command finished but exit code is unknown');
-		 *     } else if (event.exitCode === 0) {
-		 * 	     console.log('Command succeeded');
-		 *     } else {
-		 * 	     console.log('Command failed');
-		 *     }
-		 *   }
-		 * });
-		 */
-		readonly exitCode: number | undefined;
-	}
-
-	export namespace window {
-		/**
-		 * Fires when shell integration activates or one of its properties changes in a terminal.
-		 */
-		export const onDidChangeTerminalShellIntegration: Event<TerminalShellIntegrationChangeEvent>;
-
-		/**
-		 * This will be fired when a terminal command is started. This event will fire only when
-		 * [shell integration](https://code.visualstudio.com/docs/terminal/shell-integration) is
-		 * activated for the terminal.
-		 */
-		export const onDidStartTerminalShellExecution: Event<TerminalShellExecutionStartEvent>;
-
-		/**
-		 * This will be fired when a terminal command is ended. This event will fire only when
-		 * [shell integration](https://code.visualstudio.com/docs/terminal/shell-integration) is
-		 * activated for the terminal.
-		 */
-		export const onDidEndTerminalShellExecution: Event<TerminalShellExecutionEndEvent>;
-	}
-}
diff --git a/src/vscode-dts/vscode.proposed.testObserver.d.ts b/src/vscode-dts/vscode.proposed.testObserver.d.ts
index cb8091c887e..910a61428f7 100644
--- a/src/vscode-dts/vscode.proposed.testObserver.d.ts
+++ b/src/vscode-dts/vscode.proposed.testObserver.d.ts
@@ -102,6 +102,12 @@ declare module 'vscode' {
 		 * were passed in the {@link tests.runTests} method.
 		 */
 		readonly results: ReadonlyArray<Readonly<TestResultSnapshot>>;
+
+		/**
+		 * Gets coverage information for a URI. This function is available only
+		 * when a test run reported coverage.
+		 */
+		getDetailedCoverage?(uri: Uri, token?: CancellationToken): Thenable<FileCoverageDetail[]>;
 	}
 
 	/**
diff --git a/src/vscode-dts/vscode.proposed.testRelatedCode.d.ts b/src/vscode-dts/vscode.proposed.testRelatedCode.d.ts
new file mode 100644
index 00000000000..3d17a26999a
--- /dev/null
+++ b/src/vscode-dts/vscode.proposed.testRelatedCode.d.ts
@@ -0,0 +1,36 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+declare module 'vscode' {
+	export interface TestController {
+		/**
+		 * A provider used for associating code location with tests.
+		 */
+		relatedCodeProvider?: TestRelatedCodeProvider;
+	}
+
+	export interface TestRelatedCodeProvider {
+		/**
+		 * Returns the tests related to the given code location. This may be called
+		 * by the user either explicitly via a "go to test" action, or implicitly
+		 * when running tests at a cursor position.
+		 *
+		 * @param document The document in which the code location is located.
+		 * @param position The position in the document.
+		 * @param token A cancellation token.
+		 * @returns A list of tests related to the position in the code.
+		 */
+		provideRelatedTests?(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<TestItem[]>;
+
+		/**
+		 * Returns the code related to the given test case.
+		 *
+		 * @param test The test for which to provide related code.
+		 * @param token A cancellation token.
+		 * @returns A list of locations related to the test.
+		 */
+		provideRelatedCode?(test: TestItem, token: CancellationToken): ProviderResult<Location[]>;
+	}
+}
diff --git a/src/vscode-dts/vscode.proposed.testRunInDebug.d.ts b/src/vscode-dts/vscode.proposed.testRunInDebug.d.ts
deleted file mode 100644
index 8eb273e2a5e..00000000000
--- a/src/vscode-dts/vscode.proposed.testRunInDebug.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-declare module 'vscode' {
-
-	// https://github.com/microsoft/vscode/issues/214486
-
-	export interface DebugSessionOptions {
-		/**
-		 * Signals to the editor that the debug session was started from a test run
-		 * request. This is used to link the lifecycle of the debug session and
-		 * test run in UI actions.
-		 */
-		testRun?: TestRun;
-	}
-}
diff --git a/src/vscode-dts/vscode.proposed.textSearchCompleteNew.d.ts b/src/vscode-dts/vscode.proposed.textSearchCompleteNew.d.ts
new file mode 100644
index 00000000000..60c3503210f
--- /dev/null
+++ b/src/vscode-dts/vscode.proposed.textSearchCompleteNew.d.ts
@@ -0,0 +1,38 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+declare module 'vscode' {
+	export interface TextSearchCompleteNew {
+		/**
+		 * Additional information regarding the state of the completed search.
+		 *
+		 * Messages with "Information" style support links in markdown syntax:
+		 * - Click to [run a command](command:workbench.action.OpenQuickPick)
+		 * - Click to [open a website](https://aka.ms)
+		 *
+		 * Commands may optionally return { triggerSearch: true } to signal to the editor that the original search should run be again.
+		 */
+		message?: TextSearchCompleteMessageNew[];
+	}
+
+	/**
+	 * A message regarding a completed search.
+	 */
+	export interface TextSearchCompleteMessageNew {
+		/**
+		 * Markdown text of the message.
+		 */
+		text: string;
+		/**
+		 * Whether the source of the message is trusted, command links are disabled for untrusted message sources.
+		 * Messaged are untrusted by default.
+		 */
+		trusted?: boolean;
+		/**
+		 * The message type, this affects how the message will be rendered.
+		 */
+		type: TextSearchCompleteMessageType;
+	}
+}
diff --git a/src/vscode-dts/vscode.proposed.textSearchProviderNew.d.ts b/src/vscode-dts/vscode.proposed.textSearchProviderNew.d.ts
new file mode 100644
index 00000000000..a82ca8f4ae2
--- /dev/null
+++ b/src/vscode-dts/vscode.proposed.textSearchProviderNew.d.ts
@@ -0,0 +1,275 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+declare module 'vscode' {
+
+	// https://github.com/microsoft/vscode/issues/59921
+
+	/**
+	 * The parameters of a query for text search. All optional booleans default to `false`.
+	 */
+	export interface TextSearchQueryNew {
+		/**
+		 * The text pattern to search for.
+		 *
+		 * If explicitly contains a newline character (`\n`), the default search behavior
+		 * will automatically enable {@link isMultiline}.
+		 */
+		pattern: string;
+
+		/**
+		 * Whether or not `pattern` should match multiple lines of text.
+		 *
+		 * If using the default search provider, this will be interpreted as `true` if
+		 * `pattern` contains a newline character (`\n`).
+		 */
+		isMultiline?: boolean;
+
+		/**
+		 * Whether or not `pattern` should be interpreted as a regular expression.
+		 *
+		 * If using the default search provider, this will be interpreted case-insensitively
+		 * if {@link isCaseSensitive} is `false` or not set.
+		 */
+		isRegExp?: boolean;
+
+		/**
+		 * Whether or not the search should be case-sensitive.
+		 *
+		 * If using the default search provider, this can be affected by the `search.smartCase` setting.
+		 * See the setting description for more information.
+		 */
+		isCaseSensitive?: boolean;
+
+		/**
+		 * Whether or not to search for whole word matches only.
+		 *
+		 * If enabled, the default search provider will check for boundary characters
+		 * (regex pattern `\b`) surrounding the {@link pattern} to see whether something
+		 * is a word match.
+		 */
+		isWordMatch?: boolean;
+	}
+
+	/**
+	 * Options that apply to text search.
+	 */
+	export interface TextSearchProviderOptions {
+
+		folderOptions: {
+			/**
+			 * The root folder to search within.
+			 */
+			folder: Uri;
+
+			/**
+			 * Files that match an `includes` glob pattern should be included in the search.
+			 */
+			includes: string[];
+
+			/**
+			 * Files that match an `excludes` glob pattern should be excluded from the search.
+			 */
+			excludes: GlobPattern[];
+
+			/**
+			 * Whether symlinks should be followed while searching.
+			 * For more info, see the setting description for `search.followSymlinks`.
+			 */
+			followSymlinks: boolean;
+
+			/**
+			 * Which file locations we should look for ignore (.gitignore or .ignore) files to respect.
+			 */
+			useIgnoreFiles: {
+				/**
+				 * Use ignore files at the current workspace root.
+				 */
+				local: boolean;
+				/**
+				 * Use ignore files at the parent directory. If set, {@link TextSearchProviderOptions.useIgnoreFiles.local} should also be `true`.
+				 */
+				parent: boolean;
+				/**
+				 * Use global ignore files. If set, {@link TextSearchProviderOptions.useIgnoreFiles.local} should also be `true`.
+				 */
+				global: boolean;
+			};
+
+			/**
+			 * Interpret files using this encoding.
+			 * See the vscode setting `"files.encoding"`
+			 */
+			encoding: string;
+		}[];
+
+		/**
+		 * The maximum number of results to be returned.
+		 */
+		maxResults: number;
+
+		/**
+		 * Options to specify the size of the result text preview.
+		 */
+		previewOptions: {
+			/**
+			 * The maximum number of lines in the preview.
+			 * Only search providers that support multiline search will ever return more than one line in the match.
+			 * Defaults to 100.
+			 */
+			matchLines: number;
+
+			/**
+			 * The maximum number of characters included per line.
+			 * Defaults to 10000.
+			 */
+			charsPerLine: number;
+		};
+
+		/**
+		 * Exclude files larger than `maxFileSize` in bytes.
+		 */
+		maxFileSize: number | undefined;
+
+		/**
+		 * Number of lines of context to include before and after each match.
+		 */
+		surroundingContext: number;
+	}
+
+	/**
+	 * Information collected when text search is complete.
+	 */
+	export interface TextSearchCompleteNew {
+		/**
+		 * Whether the search hit the limit on the maximum number of search results.
+		 * `maxResults` on {@linkcode TextSearchProviderOptions} specifies the max number of results.
+		 * - If exactly that number of matches exist, this should be false.
+		 * - If `maxResults` matches are returned and more exist, this should be true.
+		 * - If search hits an internal limit which is less than `maxResults`, this should be true.
+		 */
+		limitHit?: boolean;
+	}
+
+	/**
+	 * A query match instance in a file.
+	 *
+	 * For example, consider this excerpt:
+	 *
+	 * ```ts
+	 * const bar = 1;
+	 * console.log(bar);
+	 * const foo = bar;
+	 * ```
+	 *
+	 * If the query is `log`, then the line `console.log(bar);` should be represented using a {@link TextSearchMatchNew}.
+	 */
+	export class TextSearchMatchNew {
+		/**
+		 * @param uri The uri for the matching document.
+		 * @param ranges The ranges associated with this match.
+		 * @param previewText The text that is used to preview the match. The highlighted range in `previewText` is specified in `ranges`.
+		 */
+		constructor(uri: Uri, ranges: { sourceRange: Range; previewRange: Range }[], previewText: string);
+
+		/**
+		 * The uri for the matching document.
+		 */
+		uri: Uri;
+
+		/**
+		 * The ranges associated with this match.
+		 */
+		ranges: {
+			/**
+			 * The range of the match within the document, or multiple ranges for multiple matches.
+			 */
+			sourceRange: Range;
+			/**
+			 * The Range within `previewText` corresponding to the text of the match.
+			 */
+			previewRange: Range;
+		}[];
+
+		previewText: string;
+	}
+
+	/**
+	 * The context lines of text that are not a part of a match,
+	 * but that surround a match line of type {@link TextSearchMatchNew}.
+	 *
+	 * For example, consider this excerpt:
+	 *
+	 * ```ts
+	 * const bar = 1;
+	 * console.log(bar);
+	 * const foo = bar;
+	 * ```
+	 *
+	 * If the query is `log`, then the lines `const bar = 1;` and `const foo = bar;`
+	 * should be represented using two separate {@link TextSearchContextNew} for the search instance.
+	 * This example assumes that the finder requests one line of surrounding context.
+	 */
+	export class TextSearchContextNew {
+		/**
+		 * @param uri The uri for the matching document.
+		 * @param text The line of context text.
+		 * @param lineNumber The line number of this line of context.
+		 */
+		constructor(uri: Uri, text: string, lineNumber: number);
+
+		/**
+		 * The uri for the matching document.
+		 */
+		uri: Uri;
+
+		/**
+		 * One line of text.
+		 * previewOptions.charsPerLine applies to this
+		 */
+		text: string;
+
+		/**
+		 * The line number of this line of context.
+		 */
+		lineNumber: number;
+	}
+
+	/**
+	 * A result payload for a text search, pertaining to {@link TextSearchMatchNew matches}
+	 * and its associated {@link TextSearchContextNew context} within a single file.
+	 */
+	export type TextSearchResultNew = TextSearchMatchNew | TextSearchContextNew;
+
+	/**
+	 * A TextSearchProvider provides search results for text results inside files in the workspace.
+	 */
+	export interface TextSearchProviderNew {
+		/**
+		 * WARNING: VERY EXPERIMENTAL.
+		 *
+		 * Provide results that match the given text pattern.
+		 * @param query The parameters for this query.
+		 * @param options A set of options to consider while searching.
+		 * @param progress A progress callback that must be invoked for all {@link TextSearchResultNew results}.
+		 * These results can be direct matches, or context that surrounds matches.
+		 * @param token A cancellation token.
+		 */
+		provideTextSearchResults(query: TextSearchQueryNew, options: TextSearchProviderOptions, progress: Progress<TextSearchResultNew>, token: CancellationToken): ProviderResult<TextSearchCompleteNew>;
+	}
+
+	export namespace workspace {
+		/**
+		 * Register a text search provider.
+		 *
+		 * Only one provider can be registered per scheme.
+		 *
+		 * @param scheme The provider will be invoked for workspace folders that have this file scheme.
+		 * @param provider The provider.
+		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 */
+		export function registerTextSearchProviderNew(scheme: string, provider: TextSearchProviderNew): Disposable;
+	}
+}
diff --git a/test/automation/package-lock.json b/test/automation/package-lock.json
new file mode 100644
index 00000000000..0253b826daf
--- /dev/null
+++ b/test/automation/package-lock.json
@@ -0,0 +1,1044 @@
+{
+  "name": "vscode-automation",
+  "version": "1.71.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "vscode-automation",
+      "version": "1.71.0",
+      "license": "MIT",
+      "dependencies": {
+        "ncp": "^2.0.0",
+        "tmp": "0.2.1",
+        "tree-kill": "1.2.2",
+        "vscode-uri": "3.0.2"
+      },
+      "devDependencies": {
+        "@types/ncp": "2.0.1",
+        "@types/node": "20.x",
+        "@types/tmp": "0.2.2",
+        "cpx2": "3.0.0",
+        "npm-run-all": "^4.1.5",
+        "watch": "^1.0.2"
+      }
+    },
+    "node_modules/@types/ncp": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@types/ncp/-/ncp-2.0.1.tgz",
+      "integrity": "sha512-TeiJ7uvv/92ugSqZ0v9l0eNXzutlki0aK+R1K5bfA5SYUil46ITlxLW4iNTCf55P4L5weCmaOdtxGeGWvudwPg==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "20.11.24",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
+      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/@types/tmp": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/@types/tmp/-/tmp-0.2.2.tgz",
+      "integrity": "sha512-MhSa0yylXtVMsyT8qFpHA1DLHj4DvQGH5ntxrhHSh8PxUVNi35Wk+P5hVgqbO2qZqOotqr9jaoPRL+iRjWYm/A==",
+      "dev": true
+    },
+    "node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/at-least-node": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
+      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c= sha512-9Y0g0Q8rmSt+H33DfKv7FOc3v+iRI+o1lbzt8jGcIosYW37IIW/2XVYq5NPdmaD5NQ59Nk26Kl/vZbwW9Fr8vg=="
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/call-bind": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz",
+      "integrity": "sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ= sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
+      "dev": true,
+      "engines": {
+        "iojs": ">= 1.0.0",
+        "node": ">= 0.12.0"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+    },
+    "node_modules/cpx2": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cpx2/-/cpx2-3.0.0.tgz",
+      "integrity": "sha512-WVI69l0qqlDboGngiggQitRyto20og3YNNZp6ySva9dRMYpy9OQd5ep7mQvkvuBeUkIluOKR6jBOek7FRS7X0w==",
+      "dev": true,
+      "dependencies": {
+        "co": "^4.6.0",
+        "debounce": "^1.2.0",
+        "debug": "^4.1.1",
+        "duplexer": "^0.1.1",
+        "fs-extra": "^9.0.1",
+        "glob": "^7.1.4",
+        "glob2base": "0.0.12",
+        "minimatch": "^3.0.4",
+        "resolve": "^1.12.0",
+        "safe-buffer": "^5.2.0",
+        "shell-quote": "^1.7.1",
+        "subarg": "^1.0.0"
+      },
+      "bin": {
+        "cpx": "bin/index.js"
+      },
+      "engines": {
+        "node": ">=6.5"
+      }
+    },
+    "node_modules/cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "dev": true,
+      "dependencies": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "engines": {
+        "node": ">=4.8"
+      }
+    },
+    "node_modules/debounce": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz",
+      "integrity": "sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==",
+      "dev": true
+    },
+    "node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "dev": true,
+      "dependencies": {
+        "object-keys": "^1.0.12"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/duplexer": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
+      "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
+      "dev": true
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/es-abstract": {
+      "version": "1.18.0-next.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+      "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
+      "dev": true,
+      "dependencies": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.2",
+        "is-negative-zero": "^2.0.0",
+        "is-regex": "^1.1.1",
+        "object-inspect": "^1.8.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.1",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/exec-sh": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.2.tgz",
+      "integrity": "sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==",
+      "dev": true,
+      "dependencies": {
+        "merge": "^1.2.0"
+      }
+    },
+    "node_modules/find-index": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz",
+      "integrity": "sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ= sha512-uJ5vWrfBKMcE6y2Z8834dwEZj9mNGxYa3t3I53OwFeuZ8D9oc2E5zcsrkuhX6h4iYrjhiv0T3szQmxlAV9uxDg==",
+      "dev": true
+    },
+    "node_modules/fs-extra": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+      "dev": true,
+      "dependencies": {
+        "at-least-node": "^1.0.0",
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8= sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.1.tgz",
+      "integrity": "sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/glob": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob2base": {
+      "version": "0.0.12",
+      "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
+      "integrity": "sha1-nUGbPijxLoOjYhZKJ3BVkiycDVY= sha512-ZyqlgowMbfj2NPjxaZZ/EtsXlOch28FRXgMd64vqZWk1bT9+wvSRLYD1om9M7QfQru51zJPAT17qXm4/zd+9QA==",
+      "dev": true,
+      "dependencies": {
+        "find-index": "^0.1.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
+      "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==",
+      "dev": true
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0= sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
+      "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/hosted-git-info": {
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+      "dev": true
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "dev": true
+    },
+    "node_modules/is-callable": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz",
+      "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz",
+      "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==",
+      "dev": true,
+      "dependencies": {
+        "has": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-date-object": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
+      "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
+      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-regex": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
+      "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-symbol": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
+      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "node_modules/json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+      "dev": true
+    },
+    "node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "dev": true,
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/load-json-file": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+      "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs= sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^4.0.0",
+        "pify": "^3.0.0",
+        "strip-bom": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/memorystream": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz",
+      "integrity": "sha1-htcJCzDORV1j+64S3aUaR93K+bI= sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/merge": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
+      "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==",
+      "dev": true
+    },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
+      "dev": true
+    },
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/ncp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
+      "integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M= sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA==",
+      "bin": {
+        "ncp": "bin/ncp"
+      }
+    },
+    "node_modules/nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "dev": true
+    },
+    "node_modules/normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
+    "node_modules/npm-run-all": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.5.tgz",
+      "integrity": "sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "chalk": "^2.4.1",
+        "cross-spawn": "^6.0.5",
+        "memorystream": "^0.3.1",
+        "minimatch": "^3.0.4",
+        "pidtree": "^0.3.0",
+        "read-pkg": "^3.0.0",
+        "shell-quote": "^1.6.1",
+        "string.prototype.padend": "^3.0.0"
+      },
+      "bin": {
+        "npm-run-all": "bin/npm-run-all/index.js",
+        "run-p": "bin/run-p/index.js",
+        "run-s": "bin/run-s/index.js"
+      },
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz",
+      "integrity": "sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.assign": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "has-symbols": "^1.0.1",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E= sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA= sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
+      "dev": true,
+      "dependencies": {
+        "error-ex": "^1.3.1",
+        "json-parse-better-errors": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18= sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+      "dev": true
+    },
+    "node_modules/path-type": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+      "dev": true,
+      "dependencies": {
+        "pify": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/pidtree": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.3.1.tgz",
+      "integrity": "sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==",
+      "dev": true,
+      "bin": {
+        "pidtree": "bin/pidtree.js"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/pify": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/read-pkg": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+      "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k= sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==",
+      "dev": true,
+      "dependencies": {
+        "load-json-file": "^4.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/resolve": {
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
+      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+      "dev": true,
+      "dependencies": {
+        "is-core-module": "^2.2.0",
+        "path-parse": "^1.0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/shell-quote": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz",
+      "integrity": "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==",
+      "dev": true
+    },
+    "node_modules/spdx-correct": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
+      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+      "dev": true,
+      "dependencies": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-exceptions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+      "dev": true
+    },
+    "node_modules/spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dev": true,
+      "dependencies": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-license-ids": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz",
+      "integrity": "sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==",
+      "dev": true
+    },
+    "node_modules/string.prototype.padend": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.1.tgz",
+      "integrity": "sha512-eCzTASPnoCr5Ht+Vn1YXgm8SB015hHKgEIMu9Nr9bQmLhRBxKRfmzSj/IQsxDFc8JInJDDFA0qXwK+xxI7wDkg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.18.0-next.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimend": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz",
+      "integrity": "sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz",
+      "integrity": "sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/subarg": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",
+      "integrity": "sha1-9izxdYHplrSPyWVpn1TAauJouNI= sha512-RIrIdRY0X1xojthNcVtgT9sjpOGagEUKpZdgBUi054OEPFo282yg+zE+t1Rj3+RqKq2xStL7uUHhY+AjbC4BXg==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.1.0"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/tmp": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
+      "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
+      "dependencies": {
+        "rimraf": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8.17.0"
+      }
+    },
+    "node_modules/tree-kill": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
+      "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
+      "bin": {
+        "tree-kill": "cli.js"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    },
+    "node_modules/universalify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
+      "dependencies": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "node_modules/vscode-uri": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.2.tgz",
+      "integrity": "sha512-jkjy6pjU1fxUvI51P+gCsxg1u2n8LSt0W6KrCNQceaziKzff74GoWmjVG46KieVzybO1sttPQmYfrwSHey7GUA=="
+    },
+    "node_modules/watch": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/watch/-/watch-1.0.2.tgz",
+      "integrity": "sha1-NApxe952Vyb6CqB9ch4BR6VR3ww= sha512-1u+Z5n9Jc1E2c7qDO8SinPoZuHj7FgbgU1olSFoyaklduDvvtX7GMMtlE6OC9FTXq4KvNAOfj6Zu4vI1e9bAKA==",
+      "dev": true,
+      "dependencies": {
+        "exec-sh": "^0.2.0",
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "watch": "cli.js"
+      },
+      "engines": {
+        "node": ">=0.1.95"
+      }
+    },
+    "node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+    }
+  }
+}
diff --git a/test/automation/package.json b/test/automation/package.json
index b9dbbec4bb8..4d5dbd02f63 100644
--- a/test/automation/package.json
+++ b/test/automation/package.json
@@ -18,14 +18,12 @@
     "prepublishOnly": "npm run copy-package-version"
   },
   "dependencies": {
-    "mkdirp": "^1.0.4",
     "ncp": "^2.0.0",
     "tmp": "0.2.1",
     "tree-kill": "1.2.2",
     "vscode-uri": "3.0.2"
   },
   "devDependencies": {
-    "@types/mkdirp": "^1.0.1",
     "@types/ncp": "2.0.1",
     "@types/node": "20.x",
     "@types/tmp": "0.2.2",
diff --git a/test/automation/src/application.ts b/test/automation/src/application.ts
index e06eaaf5be4..2a0084e1c1d 100644
--- a/test/automation/src/application.ts
+++ b/test/automation/src/application.ts
@@ -6,6 +6,7 @@
 import { Workbench } from './workbench';
 import { Code, launch, LaunchOptions } from './code';
 import { Logger, measureAndLog } from './logger';
+import { Profiler } from './profiler';
 
 export const enum Quality {
 	Dev,
@@ -63,6 +64,10 @@ export class Application {
 		return this._userDataPath;
 	}
 
+	private _profiler: Profiler | undefined;
+
+	get profiler(): Profiler { return this._profiler!; }
+
 	async start(): Promise<void> {
 		await this._start();
 		await this.code.waitForElement('.explorer-folders-view');
@@ -110,6 +115,7 @@ export class Application {
 		});
 
 		this._workbench = new Workbench(this._code);
+		this._profiler = new Profiler(this.code);
 
 		return code;
 	}
diff --git a/test/automation/src/electron.ts b/test/automation/src/electron.ts
index da2087a8faa..8a9a73974f6 100644
--- a/test/automation/src/electron.ts
+++ b/test/automation/src/electron.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { join } from 'path';
-import * as mkdirp from 'mkdirp';
+import * as fs from 'fs';
 import { copyExtension } from './extensions';
 import { URI } from 'vscode-uri';
 import { measureAndLog } from './logger';
@@ -70,7 +70,7 @@ export async function resolveElectronConfiguration(options: LaunchOptions): Prom
 		}
 		args.push('--enable-proposed-api=vscode.vscode-test-resolver');
 		const remoteDataDir = `${userDataDir}-server`;
-		mkdirp.sync(remoteDataDir);
+		fs.mkdirSync(remoteDataDir, { recursive: true });
 
 		env['TESTRESOLVER_DATA_FOLDER'] = remoteDataDir;
 		env['TESTRESOLVER_LOGS_FOLDER'] = join(logsPath, 'server');
diff --git a/test/automation/src/notebook.ts b/test/automation/src/notebook.ts
index e2760109a54..dff250027db 100644
--- a/test/automation/src/notebook.ts
+++ b/test/automation/src/notebook.ts
@@ -23,7 +23,6 @@ export class Notebook {
 
 		await this.code.waitForElement(activeRowSelector);
 		await this.focusFirstCell();
-		await this.waitForActiveCellEditorContents('code()');
 	}
 
 	async focusNextCell() {
diff --git a/test/automation/src/playwrightBrowser.ts b/test/automation/src/playwrightBrowser.ts
index 7223c49a13b..e36d070cdc9 100644
--- a/test/automation/src/playwrightBrowser.ts
+++ b/test/automation/src/playwrightBrowser.ts
@@ -6,7 +6,7 @@
 import * as playwright from '@playwright/test';
 import { ChildProcess, spawn } from 'child_process';
 import { join } from 'path';
-import * as mkdirp from 'mkdirp';
+import * as fs from 'fs';
 import { URI } from 'vscode-uri';
 import { Logger, measureAndLog } from './logger';
 import type { LaunchOptions } from './code';
@@ -35,7 +35,7 @@ async function launchServer(options: LaunchOptions) {
 	const serverLogsPath = join(logsPath, 'server');
 	const codeServerPath = codePath ?? process.env.VSCODE_REMOTE_SERVER_PATH;
 	const agentFolder = userDataDir;
-	await measureAndLog(() => mkdirp(agentFolder), `mkdirp(${agentFolder})`, logger);
+	await measureAndLog(() => fs.promises.mkdir(agentFolder, { recursive: true }), `mkdirp(${agentFolder})`, logger);
 
 	const env = {
 		VSCODE_REMOTE_SERVER_PATH: codeServerPath,
@@ -72,10 +72,11 @@ async function launchServer(options: LaunchOptions) {
 	logger.log(`Storing log files into '${serverLogsPath}'`);
 
 	logger.log(`Command line: '${serverLocation}' ${args.join(' ')}`);
+	const shell: boolean = (process.platform === 'win32');
 	const serverProcess = spawn(
 		serverLocation,
 		args,
-		{ env }
+		{ env, shell }
 	);
 
 	logger.log(`Started server for browser smoke tests (pid: ${serverProcess.pid})`);
diff --git a/test/automation/src/playwrightDriver.ts b/test/automation/src/playwrightDriver.ts
index 5e77d55e6bf..681ca4ef540 100644
--- a/test/automation/src/playwrightDriver.ts
+++ b/test/automation/src/playwrightDriver.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as playwright from '@playwright/test';
+import type { Protocol } from 'playwright-core/types/protocol';
 import { dirname, join } from 'path';
 import { promises } from 'fs';
 import { IWindowDriver } from './driver';
@@ -83,6 +84,82 @@ export class PlaywrightDriver {
 		await this.whenLoaded;
 	}
 
+	private _cdpSession: playwright.CDPSession | undefined;
+
+	async startCDP() {
+		if (this._cdpSession) {
+			return;
+		}
+
+		this._cdpSession = await this.page.context().newCDPSession(this.page);
+	}
+
+	async collectGarbage() {
+		if (!this._cdpSession) {
+			throw new Error('CDP not started');
+		}
+
+		await this._cdpSession.send('HeapProfiler.collectGarbage');
+	}
+
+	async evaluate(options: Protocol.Runtime.evaluateParameters): Promise<Protocol.Runtime.evaluateReturnValue> {
+		if (!this._cdpSession) {
+			throw new Error('CDP not started');
+		}
+
+		return await this._cdpSession.send('Runtime.evaluate', options);
+	}
+
+	async releaseObjectGroup(parameters: Protocol.Runtime.releaseObjectGroupParameters): Promise<void> {
+		if (!this._cdpSession) {
+			throw new Error('CDP not started');
+		}
+
+		await this._cdpSession.send('Runtime.releaseObjectGroup', parameters);
+	}
+
+	async queryObjects(parameters: Protocol.Runtime.queryObjectsParameters): Promise<Protocol.Runtime.queryObjectsReturnValue> {
+		if (!this._cdpSession) {
+			throw new Error('CDP not started');
+		}
+
+		return await this._cdpSession.send('Runtime.queryObjects', parameters);
+	}
+
+	async callFunctionOn(parameters: Protocol.Runtime.callFunctionOnParameters): Promise<Protocol.Runtime.callFunctionOnReturnValue> {
+		if (!this._cdpSession) {
+			throw new Error('CDP not started');
+		}
+
+		return await this._cdpSession.send('Runtime.callFunctionOn', parameters);
+	}
+
+	async takeHeapSnapshot(): Promise<string> {
+		if (!this._cdpSession) {
+			throw new Error('CDP not started');
+		}
+
+		let snapshot = '';
+		const listener = (c: { chunk: string }) => {
+			snapshot += c.chunk;
+		};
+
+		this._cdpSession.addListener('HeapProfiler.addHeapSnapshotChunk', listener);
+
+		await this._cdpSession.send('HeapProfiler.takeHeapSnapshot');
+
+		this._cdpSession.removeListener('HeapProfiler.addHeapSnapshotChunk', listener);
+		return snapshot;
+	}
+
+	async getProperties(parameters: Protocol.Runtime.getPropertiesParameters): Promise<Protocol.Runtime.getPropertiesReturnValue> {
+		if (!this._cdpSession) {
+			throw new Error('CDP not started');
+		}
+
+		return await this._cdpSession.send('Runtime.getProperties', parameters);
+	}
+
 	private async takeScreenshot(name: string): Promise<void> {
 		try {
 			const persistPath = join(this.options.logsPath, `playwright-screenshot-${PlaywrightDriver.screenShotCounter++}-${name.replace(/\s+/g, '-')}.png`);
@@ -231,7 +308,7 @@ export class PlaywrightDriver {
 		return this.page.evaluate(([driver]) => driver.getLogs(), [await this.getDriverHandle()] as const);
 	}
 
-	private async evaluateWithDriver<T>(pageFunction: PageFunction<playwright.JSHandle<IWindowDriver>[], T>) {
+	private async evaluateWithDriver<T>(pageFunction: PageFunction<IWindowDriver[], T>) {
 		return this.page.evaluate(pageFunction, [await this.getDriverHandle()]);
 	}
 
diff --git a/test/automation/src/profiler.ts b/test/automation/src/profiler.ts
new file mode 100644
index 00000000000..9b3a0107d5e
--- /dev/null
+++ b/test/automation/src/profiler.ts
@@ -0,0 +1,208 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+const { decode_bytes } = require('@vscode/v8-heap-parser');
+import { Code } from './code';
+import { PlaywrightDriver } from './playwrightDriver';
+
+export class Profiler {
+	constructor(private readonly code: Code) {
+	}
+
+	async checkObjectLeaks(classNames: string | string[], fn: () => Promise<void>): Promise<void> {
+		await this.code.driver.startCDP();
+
+		const classNamesArray = Array.isArray(classNames) ? classNames : [classNames];
+		const countsBefore = await getInstances(this.code.driver, classNamesArray);
+
+		await fn();
+
+		const countAfter = await getInstances(this.code.driver, classNamesArray);
+		const leaks: string[] = [];
+		for (const className of classNamesArray) {
+			const count = countAfter[className] ?? 0;
+			const countBefore = countsBefore[className] ?? 0;
+			if (count !== countBefore) {
+				leaks.push(`Leaked ${count - countBefore} ${className}`);
+			}
+		}
+
+		if (leaks.length > 0) {
+			throw new Error(leaks.join('\n'));
+		}
+	}
+
+	async checkHeapLeaks(classNames: string | string[], fn: () => Promise<void>): Promise<void> {
+		await this.code.driver.startCDP();
+		await fn();
+
+		const heapSnapshotAfter = await this.code.driver.takeHeapSnapshot();
+		const buff = Buffer.from(heapSnapshotAfter);
+		const graph = await decode_bytes(buff);
+		const counts: number[] = Array.from(graph.get_class_counts(classNames));
+		const leaks: string[] = [];
+		for (let i = 0; i < classNames.length; i++) {
+			if (counts[i] > 0) {
+				leaks.push(`Leaked ${counts[i]} ${classNames[i]}`);
+			}
+		}
+
+		if (leaks.length > 0) {
+			throw new Error(leaks.join('\n'));
+		}
+	}
+}
+
+function generateUuid() {
+	// use `randomValues` if possible
+	function getRandomValues(bucket: Uint8Array): Uint8Array {
+		for (let i = 0; i < bucket.length; i++) {
+			bucket[i] = Math.floor(Math.random() * 256);
+		}
+		return bucket;
+	}
+
+	// prep-work
+	const _data = new Uint8Array(16);
+	const _hex: string[] = [];
+	for (let i = 0; i < 256; i++) {
+		_hex.push(i.toString(16).padStart(2, '0'));
+	}
+
+	// get data
+	getRandomValues(_data);
+
+	// set version bits
+	_data[6] = (_data[6] & 0x0f) | 0x40;
+	_data[8] = (_data[8] & 0x3f) | 0x80;
+
+	// print as string
+	let i = 0;
+	let result = '';
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += '-';
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += '-';
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += '-';
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += '-';
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	return result;
+}
+
+
+
+/*---------------------------------------------------------------------------------------------
+ *  The MIT License (MIT)
+ *  Copyright (c) 2023-present, Simon Siefke
+ *
+ *  This code is derived from https://github.com/SimonSiefke/vscode-memory-leak-finder
+ *--------------------------------------------------------------------------------------------*/
+
+const getInstances = async (driver: PlaywrightDriver, classNames: string[]): Promise<{ [key: string]: number }> => {
+	await driver.collectGarbage();
+	const objectGroup = `og:${generateUuid()}`;
+	const prototypeDescriptor = await driver.evaluate({
+		expression: 'Object.prototype',
+		returnByValue: false,
+		objectGroup,
+	});
+	const objects = await driver.queryObjects({
+		prototypeObjectId: prototypeDescriptor.result.objectId!,
+		objectGroup,
+	});
+	const fnResult1 = await driver.callFunctionOn({
+		functionDeclaration: `function(){
+	const objects = this
+	const classNames = ${JSON.stringify(classNames)}
+
+	const nativeConstructors = [
+		Object,
+		Array,
+		Function,
+		Set,
+		Map,
+		WeakMap,
+		WeakSet,
+		RegExp,
+		Node,
+		HTMLScriptElement,
+		DOMRectReadOnly,
+		DOMRect,
+		HTMLHtmlElement,
+		Node,
+		DOMTokenList,
+		HTMLUListElement,
+		HTMLStyleElement,
+		HTMLDivElement,
+		HTMLCollection,
+		FocusEvent,
+		Promise,
+		HTMLLinkElement,
+		HTMLLIElement,
+		HTMLAnchorElement,
+		HTMLSpanElement,
+		ArrayBuffer,
+		Uint16Array,
+		HTMLLabelElement,
+		TrustedTypePolicy,
+		Uint8Array,
+		Uint32Array,
+		HTMLHeadingElement,
+		MediaQueryList,
+		HTMLDocument,
+		TextDecoder,
+		TextEncoder,
+		HTMLInputElement,
+		HTMLCanvasElement,
+		HTMLIFrameElement,
+		Int32Array,
+		CSSStyleDeclaration
+	]
+
+	const isNativeConstructor = object => {
+		return nativeConstructors.includes(object.constructor) ||
+			object.constructor.name === 'AsyncFunction' ||
+			object.constructor.name === 'GeneratorFunction' ||
+			object.constructor.name === 'AsyncGeneratorFunction'
+	}
+
+	const isInstance = (object) => {
+		return object && !isNativeConstructor(object)
+	}
+
+	const instances = objects.filter(isInstance)
+
+	const counts = Object.create(null)
+	for(const instance of instances){
+		const name=instance.constructor.name
+		if(classNames.includes(name)){
+			counts[name]||= 0
+			counts[name]++
+		}
+	}
+	return counts
+}`,
+		objectId: objects.objects.objectId,
+		returnByValue: true,
+		objectGroup,
+	});
+
+	const returnObject = fnResult1.result.value;
+	await driver.releaseObjectGroup({ objectGroup: objectGroup });
+	return returnObject;
+};
diff --git a/test/automation/src/terminal.ts b/test/automation/src/terminal.ts
index b40606928f8..8ebcbd68636 100644
--- a/test/automation/src/terminal.ts
+++ b/test/automation/src/terminal.ts
@@ -119,6 +119,7 @@ export class Terminal {
 			// Reset
 			await this.code.dispatchKeybinding('Backspace');
 		}
+		await this.code.wait(100);
 		await this.code.dispatchKeybinding(altKey ? 'Alt+Enter' : 'enter');
 		await this.quickinput.waitForQuickInputClosed();
 		if (commandId === TerminalCommandIdWithValue.NewWithProfile) {
diff --git a/test/automation/tsconfig.json b/test/automation/tsconfig.json
index 96db334b97b..3e1fd8d8541 100644
--- a/test/automation/tsconfig.json
+++ b/test/automation/tsconfig.json
@@ -8,6 +8,7 @@
 		"outDir": "out",
 		"sourceMap": true,
 		"declaration": true,
+		"skipLibCheck": true,
 		"lib": [
 			"esnext", // for #201187
 			"dom"
diff --git a/test/automation/yarn.lock b/test/automation/yarn.lock
deleted file mode 100644
index 57b641d2b61..00000000000
--- a/test/automation/yarn.lock
+++ /dev/null
@@ -1,707 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@types/mkdirp@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@types/mkdirp/-/mkdirp-1.0.1.tgz#0930b948914a78587de35458b86c907b6e98bbf6"
-  integrity sha512-HkGSK7CGAXncr8Qn/0VqNtExEE+PHMWb+qlR1faHMao7ng6P3tAaoWWBMdva0gL5h4zprjIO89GJOLXsMcDm1Q==
-  dependencies:
-    "@types/node" "*"
-
-"@types/ncp@2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@types/ncp/-/ncp-2.0.1.tgz#749432511f6ad747d04e98837b18cca9045567fb"
-  integrity sha512-TeiJ7uvv/92ugSqZ0v9l0eNXzutlki0aK+R1K5bfA5SYUil46ITlxLW4iNTCf55P4L5weCmaOdtxGeGWvudwPg==
-  dependencies:
-    "@types/node" "*"
-
-"@types/node@*":
-  version "12.7.1"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.1.tgz#3b5c3a26393c19b400844ac422bd0f631a94d69d"
-  integrity sha512-aK9jxMypeSrhiYofWWBf/T7O+KwaiAHzM4sveCdWPn71lzUSMimRnKzhXDKfKwV1kWoBo2P1aGgaIYGLf9/ljw==
-
-"@types/node@20.x":
-  version "20.11.24"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792"
-  integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==
-  dependencies:
-    undici-types "~5.26.4"
-
-"@types/tmp@0.2.2":
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/@types/tmp/-/tmp-0.2.2.tgz#424537a3b91828cb26aaf697f21ae3cd1b69f7e7"
-  integrity sha512-MhSa0yylXtVMsyT8qFpHA1DLHj4DvQGH5ntxrhHSh8PxUVNi35Wk+P5hVgqbO2qZqOotqr9jaoPRL+iRjWYm/A==
-
-ansi-styles@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
-  dependencies:
-    color-convert "^1.9.0"
-
-at-least-node@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
-  integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
-
-balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
-
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-call-bind@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.0.tgz#24127054bb3f9bdcb4b1fb82418186072f77b8ce"
-  integrity sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==
-  dependencies:
-    function-bind "^1.1.1"
-    get-intrinsic "^1.0.0"
-
-chalk@^2.4.1:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-co@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
-
-color-convert@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
-  dependencies:
-    color-name "1.1.3"
-
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
-
-cpx2@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/cpx2/-/cpx2-3.0.0.tgz#d02d2526f0d6fd967405ab20b687668aca1f55ea"
-  integrity sha512-WVI69l0qqlDboGngiggQitRyto20og3YNNZp6ySva9dRMYpy9OQd5ep7mQvkvuBeUkIluOKR6jBOek7FRS7X0w==
-  dependencies:
-    co "^4.6.0"
-    debounce "^1.2.0"
-    debug "^4.1.1"
-    duplexer "^0.1.1"
-    fs-extra "^9.0.1"
-    glob "^7.1.4"
-    glob2base "0.0.12"
-    minimatch "^3.0.4"
-    resolve "^1.12.0"
-    safe-buffer "^5.2.0"
-    shell-quote "^1.7.1"
-    subarg "^1.0.0"
-
-cross-spawn@^6.0.5:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
-  dependencies:
-    nice-try "^1.0.4"
-    path-key "^2.0.1"
-    semver "^5.5.0"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
-debounce@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5"
-  integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==
-
-debug@^4.1.1:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
-  dependencies:
-    ms "2.1.2"
-
-define-properties@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
-  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
-  dependencies:
-    object-keys "^1.0.12"
-
-duplexer@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
-  integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
-
-error-ex@^1.3.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
-  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
-  dependencies:
-    is-arrayish "^0.2.1"
-
-es-abstract@^1.18.0-next.1:
-  version "1.18.0-next.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz#6e3a0a4bda717e5023ab3b8e90bec36108d22c68"
-  integrity sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==
-  dependencies:
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-    is-callable "^1.2.2"
-    is-negative-zero "^2.0.0"
-    is-regex "^1.1.1"
-    object-inspect "^1.8.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.1"
-    string.prototype.trimend "^1.0.1"
-    string.prototype.trimstart "^1.0.1"
-
-es-to-primitive@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
-  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
-  dependencies:
-    is-callable "^1.1.4"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.2"
-
-escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-
-exec-sh@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.2.tgz#2a5e7ffcbd7d0ba2755bdecb16e5a427dfbdec36"
-  integrity sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==
-  dependencies:
-    merge "^1.2.0"
-
-find-index@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/find-index/-/find-index-0.1.1.tgz#675d358b2ca3892d795a1ab47232f8b6e2e0dde4"
-  integrity sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ=
-
-fs-extra@^9.0.1:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
-  integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
-  dependencies:
-    at-least-node "^1.0.0"
-    graceful-fs "^4.2.0"
-    jsonfile "^6.0.1"
-    universalify "^2.0.0"
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
-
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
-
-get-intrinsic@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.1.tgz#94a9768fcbdd0595a1c9273aacf4c89d075631be"
-  integrity sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==
-  dependencies:
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-
-glob2base@0.0.12:
-  version "0.0.12"
-  resolved "https://registry.yarnpkg.com/glob2base/-/glob2base-0.0.12.tgz#9d419b3e28f12e83a362164a277055922c9c0d56"
-  integrity sha1-nUGbPijxLoOjYhZKJ3BVkiycDVY=
-  dependencies:
-    find-index "^0.1.1"
-
-glob@^7.1.3:
-  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
-  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.1.4:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
-  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-graceful-fs@^4.1.2:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
-  integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
-
-graceful-fs@^4.1.6, graceful-fs@^4.2.0:
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
-  integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==
-
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
-
-has-symbols@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
-  integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
-
-has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
-  dependencies:
-    function-bind "^1.1.1"
-
-hosted-git-info@^2.1.4:
-  version "2.8.8"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
-  integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-is-arrayish@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
-
-is-callable@^1.1.4, is-callable@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
-  integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==
-
-is-core-module@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
-  integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
-  dependencies:
-    has "^1.0.3"
-
-is-core-module@^2.2.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548"
-  integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==
-  dependencies:
-    has "^1.0.3"
-
-is-date-object@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
-  integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
-
-is-negative-zero@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
-  integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
-
-is-regex@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9"
-  integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==
-  dependencies:
-    has-symbols "^1.0.1"
-
-is-symbol@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
-  integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==
-  dependencies:
-    has-symbols "^1.0.1"
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
-
-json-parse-better-errors@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
-  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
-
-jsonfile@^6.0.1:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
-  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
-  dependencies:
-    universalify "^2.0.0"
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
-load-json-file@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
-  integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs=
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^4.0.0"
-    pify "^3.0.0"
-    strip-bom "^3.0.0"
-
-memorystream@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
-  integrity sha1-htcJCzDORV1j+64S3aUaR93K+bI=
-
-merge@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
-  integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
-
-minimatch@^3.0.4:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimist@^1.1.0, minimist@^1.2.0:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
-  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
-
-mkdirp@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-
-ms@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-ncp@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"
-  integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=
-
-nice-try@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
-  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
-
-normalize-package-data@^2.3.2:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
-  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
-  dependencies:
-    hosted-git-info "^2.1.4"
-    resolve "^1.10.0"
-    semver "2 || 3 || 4 || 5"
-    validate-npm-package-license "^3.0.1"
-
-npm-run-all@^4.1.5:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.5.tgz#04476202a15ee0e2e214080861bff12a51d98fba"
-  integrity sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    chalk "^2.4.1"
-    cross-spawn "^6.0.5"
-    memorystream "^0.3.1"
-    minimatch "^3.0.4"
-    pidtree "^0.3.0"
-    read-pkg "^3.0.0"
-    shell-quote "^1.6.1"
-    string.prototype.padend "^3.0.0"
-
-object-inspect@^1.8.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a"
-  integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==
-
-object-keys@^1.0.12, object-keys@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
-  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
-
-object.assign@^4.1.1:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
-  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
-  dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-    has-symbols "^1.0.1"
-    object-keys "^1.1.1"
-
-once@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
-  dependencies:
-    wrappy "1"
-
-parse-json@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
-  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
-  dependencies:
-    error-ex "^1.3.1"
-    json-parse-better-errors "^1.0.1"
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
-
-path-key@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
-
-path-parse@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
-
-path-type@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
-  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
-  dependencies:
-    pify "^3.0.0"
-
-pidtree@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.1.tgz#ef09ac2cc0533df1f3250ccf2c4d366b0d12114a"
-  integrity sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==
-
-pify@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
-
-read-pkg@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
-  integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=
-  dependencies:
-    load-json-file "^4.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^3.0.0"
-
-resolve@^1.10.0:
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
-  integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
-  dependencies:
-    is-core-module "^2.1.0"
-    path-parse "^1.0.6"
-
-resolve@^1.12.0:
-  version "1.20.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
-  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
-  dependencies:
-    is-core-module "^2.2.0"
-    path-parse "^1.0.6"
-
-rimraf@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
-safe-buffer@^5.2.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
-"semver@2 || 3 || 4 || 5", semver@^5.5.0:
-  version "5.7.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
-  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
-
-shebang-command@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
-  dependencies:
-    shebang-regex "^1.0.0"
-
-shebang-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
-
-shell-quote@^1.6.1:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.1.tgz#3161d969886fb14f9140c65245a5dd19b6f0b06b"
-  integrity sha512-2kUqeAGnMAu6YrTPX4E3LfxacH9gKljzVjlkUeSqY0soGwK4KLl7TURXCem712tkhBCeeaFP9QK4dKn88s3Icg==
-
-shell-quote@^1.7.1:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123"
-  integrity sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==
-
-spdx-correct@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
-  integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
-  dependencies:
-    spdx-expression-parse "^3.0.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-exceptions@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
-  integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
-
-spdx-expression-parse@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
-  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
-  dependencies:
-    spdx-exceptions "^2.1.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-license-ids@^3.0.0:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65"
-  integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==
-
-string.prototype.padend@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.1.1.tgz#824c84265dbac46cade2b957b38b6a5d8d1683c5"
-  integrity sha512-eCzTASPnoCr5Ht+Vn1YXgm8SB015hHKgEIMu9Nr9bQmLhRBxKRfmzSj/IQsxDFc8JInJDDFA0qXwK+xxI7wDkg==
-  dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.1"
-
-string.prototype.trimend@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz#a22bd53cca5c7cf44d7c9d5c732118873d6cd18b"
-  integrity sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==
-  dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-
-string.prototype.trimstart@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz#9b4cb590e123bb36564401d59824298de50fd5aa"
-  integrity sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==
-  dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-
-strip-bom@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
-
-subarg@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2"
-  integrity sha1-9izxdYHplrSPyWVpn1TAauJouNI=
-  dependencies:
-    minimist "^1.1.0"
-
-supports-color@^5.3.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
-  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
-  dependencies:
-    has-flag "^3.0.0"
-
-tmp@0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
-  integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
-  dependencies:
-    rimraf "^3.0.0"
-
-tree-kill@1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
-  integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
-
-universalify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
-  integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
-
-validate-npm-package-license@^3.0.1:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
-  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
-  dependencies:
-    spdx-correct "^3.0.0"
-    spdx-expression-parse "^3.0.0"
-
-vscode-uri@3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.2.tgz#ecfd1d066cb8ef4c3a208decdbab9a8c23d055d0"
-  integrity sha512-jkjy6pjU1fxUvI51P+gCsxg1u2n8LSt0W6KrCNQceaziKzff74GoWmjVG46KieVzybO1sttPQmYfrwSHey7GUA==
-
-watch@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/watch/-/watch-1.0.2.tgz#340a717bde765726fa0aa07d721e0147a551df0c"
-  integrity sha1-NApxe952Vyb6CqB9ch4BR6VR3ww=
-  dependencies:
-    exec-sh "^0.2.0"
-    minimist "^1.2.0"
-
-which@^1.2.9:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
-  dependencies:
-    isexe "^2.0.0"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
diff --git a/test/integration/browser/README.md b/test/integration/browser/README.md
index 8b25994564d..c2a24a4ecf3 100644
--- a/test/integration/browser/README.md
+++ b/test/integration/browser/README.md
@@ -4,8 +4,9 @@
 
 Make sure to run the following commands to compile and install dependencies:
 
-    yarn --cwd test/integration/browser
-    yarn --cwd test/integration/browser compile
+    cd test/integration/browser
+    npm i
+    npm run compile
 
 ## Run (inside Electron)
 
diff --git a/test/integration/browser/package-lock.json b/test/integration/browser/package-lock.json
new file mode 100644
index 00000000000..bdec916fb4b
--- /dev/null
+++ b/test/integration/browser/package-lock.json
@@ -0,0 +1,227 @@
+{
+  "name": "code-oss-dev-integration-test",
+  "version": "0.1.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "code-oss-dev-integration-test",
+      "version": "0.1.0",
+      "license": "MIT",
+      "devDependencies": {
+        "@types/node": "20.x",
+        "@types/rimraf": "^2.0.4",
+        "@types/tmp": "0.1.0",
+        "rimraf": "^2.6.1",
+        "tmp": "0.0.33",
+        "tree-kill": "1.2.2",
+        "vscode-uri": "^3.0.2"
+      }
+    },
+    "node_modules/@types/events": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
+      "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==",
+      "dev": true
+    },
+    "node_modules/@types/glob": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz",
+      "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==",
+      "dev": true,
+      "dependencies": {
+        "@types/events": "*",
+        "@types/minimatch": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/minimatch": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
+      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
+      "dev": true
+    },
+    "node_modules/@types/node": {
+      "version": "20.11.24",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
+      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/@types/rimraf": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@types/rimraf/-/rimraf-2.0.4.tgz",
+      "integrity": "sha512-8gBudvllD2A/c0CcEX/BivIDorHFt5UI5m46TsNj8DjWCCTTZT74kEe4g+QsY7P/B9WdO98d82zZgXO/RQzu2Q==",
+      "dev": true,
+      "dependencies": {
+        "@types/glob": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/tmp": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/@types/tmp/-/tmp-0.1.0.tgz",
+      "integrity": "sha512-6IwZ9HzWbCq6XoQWhxLpDjuADodH/MKXRUIDFudvgjcVdjFknvmR+DNsoUeer4XPrEnrZs04Jj+kfV9pFsrhmA==",
+      "dev": true
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c= sha512-9Y0g0Q8rmSt+H33DfKv7FOc3v+iRI+o1lbzt8jGcIosYW37IIW/2XVYq5NPdmaD5NQ59Nk26Kl/vZbwW9Fr8vg==",
+      "dev": true
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8= sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true
+    },
+    "node_modules/glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E= sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dev": true,
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18= sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "dev": true,
+      "dependencies": {
+        "os-tmpdir": "~1.0.2"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/tree-kill": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
+      "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
+      "dev": true,
+      "bin": {
+        "tree-kill": "cli.js"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    },
+    "node_modules/vscode-uri": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.3.tgz",
+      "integrity": "sha512-EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA==",
+      "dev": true
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "dev": true
+    }
+  }
+}
diff --git a/test/integration/browser/package.json b/test/integration/browser/package.json
index e87c8669983..728d02763d1 100644
--- a/test/integration/browser/package.json
+++ b/test/integration/browser/package.json
@@ -7,7 +7,6 @@
     "compile": "node ../../../node_modules/typescript/bin/tsc"
   },
   "devDependencies": {
-    "@types/mkdirp": "^1.0.1",
     "@types/node": "20.x",
     "@types/rimraf": "^2.0.4",
     "@types/tmp": "0.1.0",
diff --git a/test/integration/browser/src/index.ts b/test/integration/browser/src/index.ts
index 3af2d83bcca..2613f10da62 100644
--- a/test/integration/browser/src/index.ts
+++ b/test/integration/browser/src/index.ts
@@ -105,6 +105,10 @@ async function runTestsInBrowser(browserType: BrowserType, endpoint: url.UrlWith
 			console.error(`Error saving web client logs (${error})`);
 		}
 
+		if (args.debug) {
+			return;
+		}
+
 		try {
 			await browser.close();
 		} catch (error) {
@@ -188,11 +192,11 @@ async function launchServer(browserType: BrowserType): Promise<{ endpoint: url.U
 	serverArgs.push('--logsPath', serverLogsPath);
 
 	const stdio: cp.StdioOptions = args.debug ? 'pipe' : ['ignore', 'pipe', 'ignore'];
-
+	const shell: boolean = (process.platform === 'win32');
 	const serverProcess = cp.spawn(
 		serverLocation,
 		serverArgs,
-		{ env, stdio }
+		{ env, stdio, shell }
 	);
 
 	if (args.debug) {
diff --git a/test/integration/browser/tsconfig.json b/test/integration/browser/tsconfig.json
index 012f1223559..02cd3a44d7c 100644
--- a/test/integration/browser/tsconfig.json
+++ b/test/integration/browser/tsconfig.json
@@ -10,6 +10,7 @@
 		"noUnusedLocals": true,
 		"outDir": "out",
 		"sourceMap": true,
+		"skipLibCheck": true,
 		"lib": [
 			"esnext", // for #201187
 			"dom"
diff --git a/test/integration/browser/yarn.lock b/test/integration/browser/yarn.lock
deleted file mode 100644
index 591b829f1fd..00000000000
--- a/test/integration/browser/yarn.lock
+++ /dev/null
@@ -1,160 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@types/events@*":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
-  integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
-
-"@types/glob@*":
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
-  integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==
-  dependencies:
-    "@types/events" "*"
-    "@types/minimatch" "*"
-    "@types/node" "*"
-
-"@types/minimatch@*":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
-  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
-
-"@types/mkdirp@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@types/mkdirp/-/mkdirp-1.0.1.tgz#0930b948914a78587de35458b86c907b6e98bbf6"
-  integrity sha512-HkGSK7CGAXncr8Qn/0VqNtExEE+PHMWb+qlR1faHMao7ng6P3tAaoWWBMdva0gL5h4zprjIO89GJOLXsMcDm1Q==
-  dependencies:
-    "@types/node" "*"
-
-"@types/node@*":
-  version "13.7.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.7.0.tgz#b417deda18cf8400f278733499ad5547ed1abec4"
-  integrity sha512-GnZbirvmqZUzMgkFn70c74OQpTTUcCzlhQliTzYjQMqg+hVKcDnxdL19Ne3UdYzdMA/+W3eb646FWn/ZaT1NfQ==
-
-"@types/node@20.x":
-  version "20.11.24"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792"
-  integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==
-  dependencies:
-    undici-types "~5.26.4"
-
-"@types/rimraf@^2.0.4":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.4.tgz#403887b0b53c6100a6c35d2ab24f6ccc042fec46"
-  integrity sha512-8gBudvllD2A/c0CcEX/BivIDorHFt5UI5m46TsNj8DjWCCTTZT74kEe4g+QsY7P/B9WdO98d82zZgXO/RQzu2Q==
-  dependencies:
-    "@types/glob" "*"
-    "@types/node" "*"
-
-"@types/tmp@0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@types/tmp/-/tmp-0.1.0.tgz#19cf73a7bcf641965485119726397a096f0049bd"
-  integrity sha512-6IwZ9HzWbCq6XoQWhxLpDjuADodH/MKXRUIDFudvgjcVdjFknvmR+DNsoUeer4XPrEnrZs04Jj+kfV9pFsrhmA==
-
-balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
-
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
-
-glob@^7.1.3:
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
-  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-minimatch@^3.0.4:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-once@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
-  dependencies:
-    wrappy "1"
-
-os-tmpdir@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
-
-rimraf@^2.6.1:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
-  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
-  dependencies:
-    glob "^7.1.3"
-
-tmp@0.0.33:
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
-  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
-  dependencies:
-    os-tmpdir "~1.0.2"
-
-tree-kill@1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
-  integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
-
-vscode-uri@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.3.tgz#a95c1ce2e6f41b7549f86279d19f47951e4f4d84"
-  integrity sha512-EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA==
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
diff --git a/test/leaks/yarn.lock b/test/leaks/yarn.lock
deleted file mode 100644
index ba64535793a..00000000000
--- a/test/leaks/yarn.lock
+++ /dev/null
@@ -1,371 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-accepts@^1.3.5:
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
-  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
-  dependencies:
-    mime-types "~2.1.24"
-    negotiator "0.6.2"
-
-any-promise@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
-  integrity sha1-q8av7tzqUugJzcA3au0845Y10X8=
-
-cache-content-type@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/cache-content-type/-/cache-content-type-1.0.1.tgz#035cde2b08ee2129f4a8315ea8f00a00dba1453c"
-  integrity sha512-IKufZ1o4Ut42YUrZSo8+qnMTrFuKkvyoLXUywKz9GJ5BrhOFGhLdkx9sG4KAnVvbY6kEcSFjLQul+DVmBm2bgA==
-  dependencies:
-    mime-types "^2.1.18"
-    ylru "^1.2.0"
-
-co@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
-
-content-disposition@~0.5.2:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
-  integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
-  dependencies:
-    safe-buffer "5.1.2"
-
-content-type@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
-  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
-
-cookies@~0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/cookies/-/cookies-0.8.0.tgz#1293ce4b391740a8406e3c9870e828c4b54f3f90"
-  integrity sha512-8aPsApQfebXnuI+537McwYsDtjVxGm8gTIzQI3FDW6t5t/DAhERxtnbEPN/8RX+uZthoz4eCOgloXaE5cYyNow==
-  dependencies:
-    depd "~2.0.0"
-    keygrip "~1.1.0"
-
-debug@^3.1.0:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
-  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
-  dependencies:
-    ms "^2.1.1"
-
-debug@^4.0.1, debug@^4.1.1:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
-  dependencies:
-    ms "2.1.2"
-
-debug@~3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
-  dependencies:
-    ms "2.0.0"
-
-deep-equal@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
-  integrity sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=
-
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
-
-depd@^2.0.0, depd@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
-  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
-
-depd@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
-
-destroy@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
-  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
-
-ee-first@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
-  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
-
-encodeurl@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
-  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
-
-escape-html@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
-  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
-
-fresh@~0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
-  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
-
-http-assert@^1.3.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/http-assert/-/http-assert-1.4.1.tgz#c5f725d677aa7e873ef736199b89686cceb37878"
-  integrity sha512-rdw7q6GTlibqVVbXr0CKelfV5iY8G2HqEUkhSk297BMbSpSL8crXC+9rjKoMcZZEsksX30le6f/4ul4E28gegw==
-  dependencies:
-    deep-equal "~1.0.1"
-    http-errors "~1.7.2"
-
-http-errors@^1.6.3, http-errors@^1.7.3:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.0.tgz#75d1bbe497e1044f51e4ee9e704a62f28d336507"
-  integrity sha512-4I8r0C5JDhT5VkvI47QktDW75rNlGVsUf/8hzjCC/wkWI/jdTRmBb9aI7erSG82r1bjKY3F6k28WnsVxB1C73A==
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.4"
-    setprototypeof "1.2.0"
-    statuses ">= 1.5.0 < 2"
-    toidentifier "1.0.0"
-
-http-errors@~1.6.2:
-  version "1.6.3"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
-  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.3"
-    setprototypeof "1.1.0"
-    statuses ">= 1.4.0 < 2"
-
-http-errors@~1.7.2:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
-  integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.4"
-    setprototypeof "1.1.1"
-    statuses ">= 1.5.0 < 2"
-    toidentifier "1.0.0"
-
-inherits@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
-
-inherits@2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-is-generator-function@^1.0.7:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.9.tgz#e5f82c2323673e7fcad3d12858c83c4039f6399c"
-  integrity sha512-ZJ34p1uvIfptHCN7sFTjGibB9/oBg17sHqzDLfuwhvmN/qLVvIQXRQ8licZQ35WJ8KuEQt/etnnzQFI9C9Ue/A==
-
-keygrip@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/keygrip/-/keygrip-1.1.0.tgz#871b1681d5e159c62a445b0c74b615e0917e7226"
-  integrity sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==
-  dependencies:
-    tsscmp "1.0.6"
-
-koa-compose@^3.0.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/koa-compose/-/koa-compose-3.2.1.tgz#a85ccb40b7d986d8e5a345b3a1ace8eabcf54de7"
-  integrity sha1-qFzLQLfZhtjlo0Wzoazo6rz1Tec=
-  dependencies:
-    any-promise "^1.1.0"
-
-koa-compose@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/koa-compose/-/koa-compose-4.1.0.tgz#507306b9371901db41121c812e923d0d67d3e877"
-  integrity sha512-8ODW8TrDuMYvXRwra/Kh7/rJo9BtOfPc6qO8eAfC80CnCvSjSl0bkRM24X6/XBBEyj0v1nRUQ1LyOy3dbqOWXw==
-
-koa-convert@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/koa-convert/-/koa-convert-1.2.0.tgz#da40875df49de0539098d1700b50820cebcd21d0"
-  integrity sha1-2kCHXfSd4FOQmNFwC1CCDOvNIdA=
-  dependencies:
-    co "^4.6.0"
-    koa-compose "^3.0.0"
-
-koa-mount@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/koa-mount/-/koa-mount-4.0.0.tgz#e0265e58198e1a14ef889514c607254ff386329c"
-  integrity sha512-rm71jaA/P+6HeCpoRhmCv8KVBIi0tfGuO/dMKicbQnQW/YJntJ6MnnspkodoA4QstMVEZArsCphmd0bJEtoMjQ==
-  dependencies:
-    debug "^4.0.1"
-    koa-compose "^4.1.0"
-
-koa-send@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/koa-send/-/koa-send-5.0.1.tgz#39dceebfafb395d0d60beaffba3a70b4f543fe79"
-  integrity sha512-tmcyQ/wXXuxpDxyNXv5yNNkdAMdFRqwtegBXUaowiQzUKqJehttS0x2j0eOZDQAyloAth5w6wwBImnFzkUz3pQ==
-  dependencies:
-    debug "^4.1.1"
-    http-errors "^1.7.3"
-    resolve-path "^1.4.0"
-
-koa-static@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/koa-static/-/koa-static-5.0.0.tgz#5e92fc96b537ad5219f425319c95b64772776943"
-  integrity sha512-UqyYyH5YEXaJrf9S8E23GoJFQZXkBVJ9zYYMPGz919MSX1KuvAcycIuS0ci150HCoPf4XQVhQ84Qf8xRPWxFaQ==
-  dependencies:
-    debug "^3.1.0"
-    koa-send "^5.0.0"
-
-koa@^2.13.1:
-  version "2.13.1"
-  resolved "https://registry.yarnpkg.com/koa/-/koa-2.13.1.tgz#6275172875b27bcfe1d454356a5b6b9f5a9b1051"
-  integrity sha512-Lb2Dloc72auj5vK4X4qqL7B5jyDPQaZucc9sR/71byg7ryoD1NCaCm63CShk9ID9quQvDEi1bGR/iGjCG7As3w==
-  dependencies:
-    accepts "^1.3.5"
-    cache-content-type "^1.0.0"
-    content-disposition "~0.5.2"
-    content-type "^1.0.4"
-    cookies "~0.8.0"
-    debug "~3.1.0"
-    delegates "^1.0.0"
-    depd "^2.0.0"
-    destroy "^1.0.4"
-    encodeurl "^1.0.2"
-    escape-html "^1.0.3"
-    fresh "~0.5.2"
-    http-assert "^1.3.0"
-    http-errors "^1.6.3"
-    is-generator-function "^1.0.7"
-    koa-compose "^4.1.0"
-    koa-convert "^1.2.0"
-    on-finished "^2.3.0"
-    only "~0.0.2"
-    parseurl "^1.3.2"
-    statuses "^1.5.0"
-    type-is "^1.6.16"
-    vary "^1.1.2"
-
-media-typer@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
-  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
-
-mime-db@1.47.0:
-  version "1.47.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz#8cb313e59965d3c05cfbf898915a267af46a335c"
-  integrity sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==
-
-mime-types@^2.1.18, mime-types@~2.1.24:
-  version "2.1.30"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz#6e7be8b4c479825f85ed6326695db73f9305d62d"
-  integrity sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg==
-  dependencies:
-    mime-db "1.47.0"
-
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
-
-ms@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-ms@^2.1.1:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
-  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
-
-negotiator@0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
-  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
-
-on-finished@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
-  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
-  dependencies:
-    ee-first "1.1.1"
-
-only@~0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/only/-/only-0.0.2.tgz#2afde84d03e50b9a8edc444e30610a70295edfb4"
-  integrity sha1-Kv3oTQPlC5qO3EROMGEKcCle37Q=
-
-parseurl@^1.3.2:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
-  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
-
-path-is-absolute@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
-
-resolve-path@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/resolve-path/-/resolve-path-1.4.0.tgz#c4bda9f5efb2fce65247873ab36bb4d834fe16f7"
-  integrity sha1-xL2p9e+y/OZSR4c6s2u02DT+Fvc=
-  dependencies:
-    http-errors "~1.6.2"
-    path-is-absolute "1.0.1"
-
-safe-buffer@5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-
-setprototypeof@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
-  integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
-
-setprototypeof@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
-  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
-
-setprototypeof@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
-  integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
-
-"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
-  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
-
-toidentifier@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
-  integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
-
-tsscmp@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.6.tgz#85b99583ac3589ec4bfef825b5000aa911d605eb"
-  integrity sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==
-
-type-is@^1.6.16:
-  version "1.6.18"
-  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
-  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
-  dependencies:
-    media-typer "0.3.0"
-    mime-types "~2.1.24"
-
-vary@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
-  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
-
-ylru@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/ylru/-/ylru-1.2.1.tgz#f576b63341547989c1de7ba288760923b27fe84f"
-  integrity sha512-faQrqNMzcPCHGVC2aaOINk13K+aaBDUPjGWl0teOXywElLjyVAB6Oe2jj62jHYtwsU49jXhScYbvPENK+6zAvQ==
diff --git a/test/monaco/README.md b/test/monaco/README.md
index e55338934f2..7f4a56d44ff 100644
--- a/test/monaco/README.md
+++ b/test/monaco/README.md
@@ -4,10 +4,10 @@ This directory contains scripts that are used to smoke test the Monaco Editor di
 
 ## Setup & Bundle
 
- $test/monaco> yarn
- $test/monaco> yarn run bundle
+ $test/monaco> npm i
+ $test/monaco> npm run bundle
 
 ## Compile and run tests
 
- $test/monaco> yarn run compile
- $test/monaco> yarn test
+ $test/monaco> npm run compile
+ $test/monaco> npm run test
diff --git a/test/monaco/monaco.test.ts b/test/monaco/monaco.test.ts
index 3613a1a7212..078fb2cb69e 100644
--- a/test/monaco/monaco.test.ts
+++ b/test/monaco/monaco.test.ts
@@ -7,6 +7,7 @@ import * as playwright from '@playwright/test';
 import { assert } from 'chai';
 
 const PORT = 8563;
+const TIMEOUT = 20 * 1000;
 
 const APP = `http://127.0.0.1:${PORT}/dist/core.html`;
 
@@ -18,7 +19,7 @@ type BrowserType = 'chromium' | 'firefox' | 'webkit';
 const browserType: BrowserType = process.env.BROWSER as BrowserType || 'chromium';
 
 before(async function () {
-	this.timeout(20 * 1000);
+	this.timeout(TIMEOUT);
 	console.log(`Starting browser: ${browserType}`);
 	browser = await playwright[browserType].launch({
 		headless: process.argv.includes('--headless'),
@@ -26,13 +27,13 @@ before(async function () {
 });
 
 after(async function () {
-	this.timeout(20 * 1000);
+	this.timeout(TIMEOUT);
 	await browser.close();
 });
 
 const pageErrors: any[] = [];
 beforeEach(async function () {
-	this.timeout(20 * 1000);
+	this.timeout(TIMEOUT);
 	page = await browser.newPage({
 		viewport: {
 			width: 800,
@@ -59,7 +60,7 @@ afterEach(async () => {
 });
 
 describe('API Integration Tests', function (): void {
-	this.timeout(20000);
+	this.timeout(TIMEOUT);
 
 	beforeEach(async () => {
 		await page.goto(APP);
diff --git a/test/monaco/package-lock.json b/test/monaco/package-lock.json
new file mode 100644
index 00000000000..224680dd597
--- /dev/null
+++ b/test/monaco/package-lock.json
@@ -0,0 +1,107 @@
+{
+  "name": "test-monaco",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "test-monaco",
+      "version": "1.0.0",
+      "license": "MIT",
+      "devDependencies": {
+        "@types/chai": "^4.2.14",
+        "chai": "^4.2.0",
+        "warnings-to-errors-webpack-plugin": "^2.3.0"
+      }
+    },
+    "node_modules/@types/chai": {
+      "version": "4.2.14",
+      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.2.14.tgz",
+      "integrity": "sha512-G+ITQPXkwTrslfG5L/BksmbLUA0M1iybEsmCWPqzSxsRRhJZimBKJkoMi8fr/CPygPTj4zO5pJH7I2/cm9M7SQ==",
+      "dev": true
+    },
+    "node_modules/assertion-error": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
+      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/chai": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz",
+      "integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==",
+      "dev": true,
+      "dependencies": {
+        "assertion-error": "^1.1.0",
+        "check-error": "^1.0.2",
+        "deep-eql": "^3.0.1",
+        "get-func-name": "^2.0.0",
+        "pathval": "^1.1.0",
+        "type-detect": "^4.0.5"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/check-error": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
+      "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII= sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/deep-eql": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
+      "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
+      "dev": true,
+      "dependencies": {
+        "type-detect": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
+    "node_modules/get-func-name": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
+      "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE= sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/pathval": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
+      "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/warnings-to-errors-webpack-plugin": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/warnings-to-errors-webpack-plugin/-/warnings-to-errors-webpack-plugin-2.3.0.tgz",
+      "integrity": "sha512-fzOyw+Ctr2MqJ+4UXKobDiOLzMMSBAdvGMWvZ4NRgTBCofAL2mmdfr6/Of3Bqz9Sq6R6xT5dLs6nnLLCtmppeQ==",
+      "dev": true,
+      "peerDependencies": {
+        "webpack": "^2.2.0-rc || ^3 || ^4 || ^5"
+      }
+    }
+  }
+}
diff --git a/test/monaco/tsconfig.json b/test/monaco/tsconfig.json
index 411320d8100..dcc46d24c5a 100644
--- a/test/monaco/tsconfig.json
+++ b/test/monaco/tsconfig.json
@@ -7,6 +7,7 @@
 		"noUnusedLocals": true,
 		"outDir": "out",
 		"sourceMap": true,
+		"skipLibCheck": true,
 		"declaration": true,
 		"lib": [
 			"esnext", // for #201187
diff --git a/test/monaco/yarn.lock b/test/monaco/yarn.lock
deleted file mode 100644
index 2af57c52c70..00000000000
--- a/test/monaco/yarn.lock
+++ /dev/null
@@ -1,57 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@types/chai@^4.2.14":
-  version "4.2.14"
-  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.2.14.tgz#44d2dd0b5de6185089375d976b4ec5caf6861193"
-  integrity sha512-G+ITQPXkwTrslfG5L/BksmbLUA0M1iybEsmCWPqzSxsRRhJZimBKJkoMi8fr/CPygPTj4zO5pJH7I2/cm9M7SQ==
-
-assertion-error@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b"
-  integrity sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==
-
-chai@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/chai/-/chai-4.2.0.tgz#760aa72cf20e3795e84b12877ce0e83737aa29e5"
-  integrity sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==
-  dependencies:
-    assertion-error "^1.1.0"
-    check-error "^1.0.2"
-    deep-eql "^3.0.1"
-    get-func-name "^2.0.0"
-    pathval "^1.1.0"
-    type-detect "^4.0.5"
-
-check-error@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
-  integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=
-
-deep-eql@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-3.0.1.tgz#dfc9404400ad1c8fe023e7da1df1c147c4b444df"
-  integrity sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==
-  dependencies:
-    type-detect "^4.0.0"
-
-get-func-name@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
-  integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=
-
-pathval@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.0.tgz#b942e6d4bde653005ef6b71361def8727d0645e0"
-  integrity sha1-uULm1L3mUwBe9rcTYd74cn0GReA=
-
-type-detect@^4.0.0, type-detect@^4.0.5:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
-  integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
-
-warnings-to-errors-webpack-plugin@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/warnings-to-errors-webpack-plugin/-/warnings-to-errors-webpack-plugin-2.3.0.tgz#5f9a58aaec458feafabe0f7a2b88a492db263a30"
-  integrity sha512-fzOyw+Ctr2MqJ+4UXKobDiOLzMMSBAdvGMWvZ4NRgTBCofAL2mmdfr6/Of3Bqz9Sq6R6xT5dLs6nnLLCtmppeQ==
diff --git a/test/package.json b/test/package.json
new file mode 100644
index 00000000000..a0df0c86778
--- /dev/null
+++ b/test/package.json
@@ -0,0 +1,3 @@
+{
+	"type": "commonjs"
+}
diff --git a/test/smoke/README.md b/test/smoke/README.md
index 9b5eb6282b4..68c9515e0a2 100644
--- a/test/smoke/README.md
+++ b/test/smoke/README.md
@@ -6,23 +6,23 @@ Make sure you are on **Node v12.x**.
 
 ```bash
 # Build extensions in the VS Code repo (if needed)
-yarn && yarn compile
+npm i && npm run compile
 
 # Dev (Electron)
-yarn smoketest
+npm run smoketest
 
 # Dev (Web - Must be run on distro)
-yarn smoketest --web --browser [chromium|webkit]
+npm run smoketest -- --web --browser [chromium|webkit]
 
 # Build (Electron)
-yarn smoketest --build <path to latest version>
-example: yarn smoketest --build /Applications/Visual\ Studio\ Code\ -\ Insiders.app
+npm run smoketest -- --build <path to latest version>
+example: npm run smoketest -- --build /Applications/Visual\ Studio\ Code\ -\ Insiders.app
 
 # Build (Web - read instructions below)
-yarn smoketest --build <path to server web build (ends in -web)> --web --browser [chromium|webkit]
+npm run smoketest -- --build <path to server web build (ends in -web)> --web --browser [chromium|webkit]
 
 # Remote (Electron)
-yarn smoketest --build <path to latest version> --remote
+npm run smoketest -- --build <path to latest version> --remote
 ```
 
 \* This step is necessary only when running without `--build` and OSS doesn't already exist in the `.build/electron` directory.
@@ -34,8 +34,9 @@ You must always run the smoketest version that matches the release you are testi
 ```bash
 git fetch
 git checkout release/1.22
-yarn && yarn compile
-yarn --cwd test/smoke
+npm i && npm run compile
+cd test/smoke
+npm i
 ```
 
 #### Web
@@ -63,7 +64,7 @@ xattr -d com.apple.quarantine <path to server with web folder zip>
 
 ```bash
 cd test/smoke
-yarn watch
+npm run watch
 ```
 
 ## Troubleshooting
diff --git a/test/smoke/package-lock.json b/test/smoke/package-lock.json
new file mode 100644
index 00000000000..af2f72d890a
--- /dev/null
+++ b/test/smoke/package-lock.json
@@ -0,0 +1,1000 @@
+{
+  "name": "code-oss-dev-smoke-test",
+  "version": "0.1.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "code-oss-dev-smoke-test",
+      "version": "0.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "ncp": "^2.0.0",
+        "node-fetch": "^2.6.7",
+        "rimraf": "3.0.2"
+      },
+      "devDependencies": {
+        "@types/mocha": "^9.1.1",
+        "@types/ncp": "2.0.1",
+        "@types/node": "20.x",
+        "@types/node-fetch": "^2.5.10",
+        "@types/rimraf": "3.0.2",
+        "npm-run-all": "^4.1.5",
+        "watch": "^1.0.2"
+      }
+    },
+    "node_modules/@types/events": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
+      "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==",
+      "dev": true
+    },
+    "node_modules/@types/glob": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz",
+      "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==",
+      "dev": true,
+      "dependencies": {
+        "@types/events": "*",
+        "@types/minimatch": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/minimatch": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
+      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
+      "dev": true
+    },
+    "node_modules/@types/mocha": {
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.1.tgz",
+      "integrity": "sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==",
+      "dev": true
+    },
+    "node_modules/@types/ncp": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@types/ncp/-/ncp-2.0.1.tgz",
+      "integrity": "sha512-TeiJ7uvv/92ugSqZ0v9l0eNXzutlki0aK+R1K5bfA5SYUil46ITlxLW4iNTCf55P4L5weCmaOdtxGeGWvudwPg==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "20.11.24",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
+      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/@types/node-fetch": {
+      "version": "2.5.10",
+      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.10.tgz",
+      "integrity": "sha512-IpkX0AasN44hgEad0gEF/V6EgR5n69VEqPEgnmoM8GsIGro3PowbWs4tR6IhxUTyPLpOn+fiGG6nrQhcmoCuIQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "form-data": "^3.0.0"
+      }
+    },
+    "node_modules/@types/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-F3OznnSLAUxFrCEu/L5PY8+ny8DtcFRjx7fZZ9bycvXRi3KPTRS9HOitGZwvPg0juRhXFWIeKX58cnX5YqLohQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/glob": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k= sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "dev": true
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c= sha512-9Y0g0Q8rmSt+H33DfKv7FOc3v+iRI+o1lbzt8jGcIosYW37IIW/2XVYq5NPdmaD5NQ59Nk26Kl/vZbwW9Fr8vg=="
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/call-bind": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz",
+      "integrity": "sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true
+    },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+    },
+    "node_modules/cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "dev": true,
+      "dependencies": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "engines": {
+        "node": ">=4.8"
+      }
+    },
+    "node_modules/define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "dev": true,
+      "dependencies": {
+        "object-keys": "^1.0.12"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk= sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/es-abstract": {
+      "version": "1.18.0-next.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+      "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
+      "dev": true,
+      "dependencies": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.2",
+        "is-negative-zero": "^2.0.0",
+        "is-regex": "^1.1.1",
+        "object-inspect": "^1.8.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.1",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/exec-sh": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.2.tgz",
+      "integrity": "sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==",
+      "dev": true,
+      "dependencies": {
+        "merge": "^1.2.0"
+      }
+    },
+    "node_modules/form-data": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
+      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+      "dev": true,
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8= sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.1.tgz",
+      "integrity": "sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+      "dev": true
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0= sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
+      "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/hosted-git-info": {
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+      "dev": true
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "dev": true
+    },
+    "node_modules/is-callable": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz",
+      "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz",
+      "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==",
+      "dev": true,
+      "dependencies": {
+        "has": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-date-object": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
+      "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
+      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-regex": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
+      "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-symbol": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
+      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "node_modules/json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+      "dev": true
+    },
+    "node_modules/load-json-file": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+      "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs= sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^4.0.0",
+        "pify": "^3.0.0",
+        "strip-bom": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/memorystream": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz",
+      "integrity": "sha1-htcJCzDORV1j+64S3aUaR93K+bI= sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/merge": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
+      "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==",
+      "dev": true
+    },
+    "node_modules/mime-db": {
+      "version": "1.48.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz",
+      "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.31",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz",
+      "integrity": "sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==",
+      "dev": true,
+      "dependencies": {
+        "mime-db": "1.48.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
+      "dev": true
+    },
+    "node_modules/ncp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
+      "integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M= sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA==",
+      "bin": {
+        "ncp": "bin/ncp"
+      }
+    },
+    "node_modules/nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "dev": true
+    },
+    "node_modules/node-fetch": {
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
+    "node_modules/npm-run-all": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.5.tgz",
+      "integrity": "sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "chalk": "^2.4.1",
+        "cross-spawn": "^6.0.5",
+        "memorystream": "^0.3.1",
+        "minimatch": "^3.0.4",
+        "pidtree": "^0.3.0",
+        "read-pkg": "^3.0.0",
+        "shell-quote": "^1.6.1",
+        "string.prototype.padend": "^3.0.0"
+      },
+      "bin": {
+        "npm-run-all": "bin/npm-run-all/index.js",
+        "run-p": "bin/run-p/index.js",
+        "run-s": "bin/run-s/index.js"
+      },
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz",
+      "integrity": "sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.assign": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "has-symbols": "^1.0.1",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E= sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA= sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
+      "dev": true,
+      "dependencies": {
+        "error-ex": "^1.3.1",
+        "json-parse-better-errors": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18= sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
+    "node_modules/path-type": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+      "dev": true,
+      "dependencies": {
+        "pify": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/pidtree": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.3.1.tgz",
+      "integrity": "sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==",
+      "dev": true,
+      "bin": {
+        "pidtree": "bin/pidtree.js"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/pify": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/read-pkg": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+      "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k= sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==",
+      "dev": true,
+      "dependencies": {
+        "load-json-file": "^4.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/resolve": {
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
+      "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
+      "dev": true,
+      "dependencies": {
+        "is-core-module": "^2.1.0",
+        "path-parse": "^1.0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/shell-quote": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz",
+      "integrity": "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==",
+      "dev": true
+    },
+    "node_modules/spdx-correct": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
+      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+      "dev": true,
+      "dependencies": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-exceptions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+      "dev": true
+    },
+    "node_modules/spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dev": true,
+      "dependencies": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-license-ids": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz",
+      "integrity": "sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==",
+      "dev": true
+    },
+    "node_modules/string.prototype.padend": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.1.tgz",
+      "integrity": "sha512-eCzTASPnoCr5Ht+Vn1YXgm8SB015hHKgEIMu9Nr9bQmLhRBxKRfmzSj/IQsxDFc8JInJDDFA0qXwK+xxI7wDkg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.18.0-next.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimend": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz",
+      "integrity": "sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz",
+      "integrity": "sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    },
+    "node_modules/validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
+      "dependencies": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "node_modules/watch": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/watch/-/watch-1.0.2.tgz",
+      "integrity": "sha1-NApxe952Vyb6CqB9ch4BR6VR3ww= sha512-1u+Z5n9Jc1E2c7qDO8SinPoZuHj7FgbgU1olSFoyaklduDvvtX7GMMtlE6OC9FTXq4KvNAOfj6Zu4vI1e9bAKA==",
+      "dev": true,
+      "dependencies": {
+        "exec-sh": "^0.2.0",
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "watch": "cli.js"
+      },
+      "engines": {
+        "node": ">=0.1.95"
+      }
+    },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+    },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0= sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+    }
+  }
+}
diff --git a/test/smoke/package.json b/test/smoke/package.json
index f2574aba8e6..90da59a0f53 100644
--- a/test/smoke/package.json
+++ b/test/smoke/package.json
@@ -4,20 +4,18 @@
   "license": "MIT",
   "main": "./src/main.js",
   "scripts": {
-    "compile": "yarn --cwd ../automation compile && node ../../node_modules/typescript/bin/tsc",
-    "watch-automation": "yarn --cwd ../automation watch",
+    "compile": "cd ../automation && npm run compile && cd ../smoke && node ../../node_modules/typescript/bin/tsc",
+    "watch-automation": "cd ../automation && npm run watch",
     "watch-smoke": "node ../../node_modules/typescript/bin/tsc --watch --preserveWatchOutput",
     "watch": "npm-run-all -lp watch-automation watch-smoke",
     "mocha": "node ../node_modules/mocha/bin/mocha"
   },
   "dependencies": {
-    "mkdirp": "^1.0.4",
     "ncp": "^2.0.0",
     "node-fetch": "^2.6.7",
     "rimraf": "3.0.2"
   },
   "devDependencies": {
-    "@types/mkdirp": "^1.0.1",
     "@types/mocha": "^9.1.1",
     "@types/ncp": "2.0.1",
     "@types/node": "20.x",
diff --git a/test/smoke/src/areas/notebook/notebook.test.ts b/test/smoke/src/areas/notebook/notebook.test.ts
index a5251a5f75e..da4d527fe4f 100644
--- a/test/smoke/src/areas/notebook/notebook.test.ts
+++ b/test/smoke/src/areas/notebook/notebook.test.ts
@@ -8,7 +8,7 @@ import { Application, Logger } from '../../../../automation';
 import { installAllHandlers } from '../../utils';
 
 export function setup(logger: Logger) {
-	describe.skip('Notebooks', () => { // https://github.com/microsoft/vscode/issues/140575
+	describe('Notebooks', () => { // https://github.com/microsoft/vscode/issues/140575
 
 		// Shared before/after handling
 		installAllHandlers(logger);
@@ -25,7 +25,25 @@ export function setup(logger: Logger) {
 			cp.execSync('git reset --hard HEAD --quiet', { cwd: app.workspacePathOrFolder });
 		});
 
-		it('inserts/edits code cell', async function () {
+		it.skip('check heap leaks', async function () {
+			const app = this.app as Application;
+			await app.profiler.checkHeapLeaks(['NotebookTextModel', 'NotebookCellTextModel', 'NotebookEventDispatcher'], async () => {
+				await app.workbench.notebook.openNotebook();
+				await app.workbench.quickaccess.runCommand('workbench.action.files.save');
+				await app.workbench.quickaccess.runCommand('workbench.action.closeActiveEditor');
+			});
+		});
+
+		it('check object leaks', async function () {
+			const app = this.app as Application;
+			await app.profiler.checkObjectLeaks(['NotebookTextModel', 'NotebookCellTextModel', 'NotebookEventDispatcher'], async () => {
+				await app.workbench.notebook.openNotebook();
+				await app.workbench.quickaccess.runCommand('workbench.action.files.save');
+				await app.workbench.quickaccess.runCommand('workbench.action.closeActiveEditor');
+			});
+		});
+
+		it.skip('inserts/edits code cell', async function () {
 			const app = this.app as Application;
 			await app.workbench.notebook.openNotebook();
 			await app.workbench.notebook.focusNextCell();
@@ -34,7 +52,7 @@ export function setup(logger: Logger) {
 			await app.workbench.notebook.stopEditingCell();
 		});
 
-		it('inserts/edits markdown cell', async function () {
+		it.skip('inserts/edits markdown cell', async function () {
 			const app = this.app as Application;
 			await app.workbench.notebook.openNotebook();
 			await app.workbench.notebook.focusNextCell();
diff --git a/test/smoke/src/areas/task/task-quick-pick.test.ts b/test/smoke/src/areas/task/task-quick-pick.test.ts
index 106a2da3852..e88b28670bb 100644
--- a/test/smoke/src/areas/task/task-quick-pick.test.ts
+++ b/test/smoke/src/areas/task/task-quick-pick.test.ts
@@ -5,7 +5,7 @@
 
 import { Application, Task, Terminal, TerminalCommandId } from '../../../../automation/';
 
-export function setup() {
+export function setup(options?: { skipSuite: boolean }) {
 	describe('Task Quick Pick', () => {
 		let app: Application;
 		let task: Task;
@@ -39,17 +39,17 @@ export function setup() {
 				await task.configureTask({ type, command, label });
 				await task.assertTasks(label, [{ label }], 'run');
 			});
-			it('icon - icon only', async () => {
+			(options?.skipSuite ? it.skip : it)('icon - icon only', async () => {
 				const config = { label, type, command, icon: { id: "lightbulb" } };
 				await task.configureTask(config);
 				await task.assertTasks(label, [config], 'run');
 			});
-			it('icon - color only', async () => {
+			(options?.skipSuite ? it.skip : it)('icon - color only', async () => {
 				const config = { label, type, command, icon: { color: "terminal.ansiRed" } };
 				await task.configureTask(config);
 				await task.assertTasks(label, [{ label, type, command, icon: { color: "Red" } }], 'run');
 			});
-			it('icon - icon & color', async () => {
+			(options?.skipSuite ? it.skip : it)('icon - icon & color', async () => {
 				const config = { label, type, command, icon: { id: "lightbulb", color: "terminal.ansiRed" } };
 				await task.configureTask(config);
 				await task.assertTasks(label, [{ label, type, command, icon: { id: "lightbulb", color: "Red" } }], 'run');
diff --git a/test/smoke/src/areas/task/task.test.ts b/test/smoke/src/areas/task/task.test.ts
index 871eaabd269..d006ec2b9e8 100644
--- a/test/smoke/src/areas/task/task.test.ts
+++ b/test/smoke/src/areas/task/task.test.ts
@@ -16,7 +16,9 @@ export function setup(logger: Logger) {
 		// Shared before/after handling
 		installAllHandlers(logger);
 
-
-		setupTaskQuickPickTests();
+		// Refs https://github.com/microsoft/vscode/issues/225250
+		// Pty spawning fails with invalid fd error in product CI while development CI
+		// works fine, we need additional logging to investigate.
+		setupTaskQuickPickTests({ skipSuite: process.platform === 'linux' });
 	});
 }
diff --git a/test/smoke/src/areas/terminal/terminal-editors.test.ts b/test/smoke/src/areas/terminal/terminal-editors.test.ts
index 334c9ccdcba..39d1b6ced7f 100644
--- a/test/smoke/src/areas/terminal/terminal-editors.test.ts
+++ b/test/smoke/src/areas/terminal/terminal-editors.test.ts
@@ -6,8 +6,8 @@
 import { Application, Terminal, TerminalCommandId, TerminalCommandIdWithValue, SettingsEditor } from '../../../../automation';
 import { setTerminalTestSettings } from './terminal-helpers';
 
-export function setup() {
-	describe('Terminal Editors', () => {
+export function setup(options?: { skipSuite: boolean }) {
+	(options?.skipSuite ? describe.skip : describe)('Terminal Editors', () => {
 		let app: Application;
 		let terminal: Terminal;
 		let settingsEditor: SettingsEditor;
diff --git a/test/smoke/src/areas/terminal/terminal-input.test.ts b/test/smoke/src/areas/terminal/terminal-input.test.ts
index 5ccc642320a..46fe72ba79f 100644
--- a/test/smoke/src/areas/terminal/terminal-input.test.ts
+++ b/test/smoke/src/areas/terminal/terminal-input.test.ts
@@ -6,8 +6,8 @@
 import { Application, Terminal, SettingsEditor } from '../../../../automation';
 import { setTerminalTestSettings } from './terminal-helpers';
 
-export function setup() {
-	describe('Terminal Input', () => {
+export function setup(options?: { skipSuite: boolean }) {
+	(options?.skipSuite ? describe.skip : describe)('Terminal Input', () => {
 		let terminal: Terminal;
 		let settingsEditor: SettingsEditor;
 
diff --git a/test/smoke/src/areas/terminal/terminal-persistence.test.ts b/test/smoke/src/areas/terminal/terminal-persistence.test.ts
index 6e469ae6d2e..455d1f016d4 100644
--- a/test/smoke/src/areas/terminal/terminal-persistence.test.ts
+++ b/test/smoke/src/areas/terminal/terminal-persistence.test.ts
@@ -6,8 +6,8 @@
 import { Application, Terminal, TerminalCommandId, TerminalCommandIdWithValue, SettingsEditor } from '../../../../automation';
 import { setTerminalTestSettings } from './terminal-helpers';
 
-export function setup() {
-	describe('Terminal Persistence', () => {
+export function setup(options?: { skipSuite: boolean }) {
+	(options?.skipSuite ? describe.skip : describe)('Terminal Persistence', () => {
 		// Acquire automation API
 		let terminal: Terminal;
 		let settingsEditor: SettingsEditor;
@@ -49,7 +49,7 @@ export function setup() {
 				]);
 			});
 
-			it('should persist buffer content', async () => {
+			it.skip('should persist buffer content', async () => {
 				await terminal.createTerminal();
 				// TODO: Handle passing in an actual regex, not string
 				await terminal.assertTerminalGroups([
@@ -75,7 +75,8 @@ export function setup() {
 				await terminal.assertTerminalGroups([
 					[{ name }]
 				]);
-				await terminal.waitForTerminalText(buffer => buffer.some(e => e.includes('terminal_test_content')));
+				// There can be line wrapping, so remove newlines and carriage returns #216464
+				await terminal.waitForTerminalText(buffer => buffer.some(e => e.replaceAll(/[\r\n]/g, '').includes('terminal_test_content')));
 			});
 		});
 	});
diff --git a/test/smoke/src/areas/terminal/terminal-profiles.test.ts b/test/smoke/src/areas/terminal/terminal-profiles.test.ts
index 388c71a53c2..e87509bc8e5 100644
--- a/test/smoke/src/areas/terminal/terminal-profiles.test.ts
+++ b/test/smoke/src/areas/terminal/terminal-profiles.test.ts
@@ -9,8 +9,8 @@ import { setTerminalTestSettings } from './terminal-helpers';
 const CONTRIBUTED_PROFILE_NAME = `JavaScript Debug Terminal`;
 const ANY_PROFILE_NAME = '^((?!JavaScript Debug Terminal).)*$';
 
-export function setup() {
-	describe('Terminal Profiles', () => {
+export function setup(options?: { skipSuite: boolean }) {
+	(options?.skipSuite ? describe.skip : describe)('Terminal Profiles', () => {
 		// Acquire automation API
 		let terminal: Terminal;
 		let settingsEditor: SettingsEditor;
diff --git a/test/smoke/src/areas/terminal/terminal-shellIntegration.test.ts b/test/smoke/src/areas/terminal/terminal-shellIntegration.test.ts
index 823f61f4e31..23f94e89f93 100644
--- a/test/smoke/src/areas/terminal/terminal-shellIntegration.test.ts
+++ b/test/smoke/src/areas/terminal/terminal-shellIntegration.test.ts
@@ -6,8 +6,8 @@
 import { Application, Terminal, SettingsEditor, TerminalCommandIdWithValue, TerminalCommandId } from '../../../../automation';
 import { setTerminalTestSettings } from './terminal-helpers';
 
-export function setup() {
-	describe('Terminal Shell Integration', () => {
+export function setup(options?: { skipSuite: boolean }) {
+	(options?.skipSuite ? describe.skip : describe)('Terminal Shell Integration', () => {
 		let terminal: Terminal;
 		let settingsEditor: SettingsEditor;
 		let app: Application;
diff --git a/test/smoke/src/areas/terminal/terminal-splitCwd.test.ts b/test/smoke/src/areas/terminal/terminal-splitCwd.test.ts
index 750c9f090b4..df6ab27eeec 100644
--- a/test/smoke/src/areas/terminal/terminal-splitCwd.test.ts
+++ b/test/smoke/src/areas/terminal/terminal-splitCwd.test.ts
@@ -6,8 +6,8 @@
 import { Application, Terminal, SettingsEditor } from '../../../../automation';
 import { setTerminalTestSettings } from './terminal-helpers';
 
-export function setup() {
-	describe('Terminal splitCwd', () => {
+export function setup(options?: { skipSuite: boolean }) {
+	(options?.skipSuite ? describe.skip : describe)('Terminal splitCwd', () => {
 		// Acquire automation API
 		let terminal: Terminal;
 		let settingsEditor: SettingsEditor;
diff --git a/test/smoke/src/areas/terminal/terminal-stickyScroll.test.ts b/test/smoke/src/areas/terminal/terminal-stickyScroll.test.ts
index bfd73854956..495a3bf033f 100644
--- a/test/smoke/src/areas/terminal/terminal-stickyScroll.test.ts
+++ b/test/smoke/src/areas/terminal/terminal-stickyScroll.test.ts
@@ -6,8 +6,8 @@
 import { Application, Terminal, SettingsEditor, TerminalCommandIdWithValue } from '../../../../automation';
 import { setTerminalTestSettings } from './terminal-helpers';
 
-export function setup() {
-	describe('Terminal stickyScroll', () => {
+export function setup(options?: { skipSuite: boolean }) {
+	(options?.skipSuite ? describe.skip : describe)('Terminal stickyScroll', () => {
 		// Acquire automation API
 		let app: Application;
 		let terminal: Terminal;
diff --git a/test/smoke/src/areas/terminal/terminal-tabs.test.ts b/test/smoke/src/areas/terminal/terminal-tabs.test.ts
index cbe672bbc1f..0a34a0dfe95 100644
--- a/test/smoke/src/areas/terminal/terminal-tabs.test.ts
+++ b/test/smoke/src/areas/terminal/terminal-tabs.test.ts
@@ -6,8 +6,8 @@
 import { Application, Terminal, TerminalCommandId, TerminalCommandIdWithValue, SettingsEditor } from '../../../../automation';
 import { setTerminalTestSettings } from './terminal-helpers';
 
-export function setup() {
-	describe('Terminal Tabs', () => {
+export function setup(options?: { skipSuite: boolean }) {
+	(options?.skipSuite ? describe.skip : describe)('Terminal Tabs', () => {
 		// Acquire automation API
 		let terminal: Terminal;
 		let settingsEditor: SettingsEditor;
@@ -36,7 +36,8 @@ export function setup() {
 			await terminal.assertSingleTab({ name });
 		});
 
-		it('should reset the tab name to the default value when no name is provided', async () => {
+		// DEBT: Flaky https://github.com/microsoft/vscode/issues/216564
+		it.skip('should reset the tab name to the default value when no name is provided', async () => {
 			await terminal.createTerminal();
 			const defaultName = await terminal.getSingleTabName();
 			const name = 'my terminal name';
diff --git a/test/smoke/src/areas/terminal/terminal.test.ts b/test/smoke/src/areas/terminal/terminal.test.ts
index 97dcb060b88..dc28a7c1190 100644
--- a/test/smoke/src/areas/terminal/terminal.test.ts
+++ b/test/smoke/src/areas/terminal/terminal.test.ts
@@ -36,15 +36,18 @@ export function setup(logger: Logger) {
 			await terminal.runCommand(TerminalCommandId.KillAll);
 		});
 
-		setupTerminalEditorsTests();
-		setupTerminalInputTests();
-		setupTerminalPersistenceTests();
-		setupTerminalProfileTests();
-		setupTerminalTabsTests();
-		setupTerminalShellIntegrationTests();
-		setupTerminalStickyScrollTests();
-		if (!process.platform.startsWith('win')) {
-			setupTerminalSplitCwdTests();
-		}
+		// https://github.com/microsoft/vscode/issues/216564
+		// The pty host can crash on Linux in smoke tests for an unknown reason. We need more user
+		// reports to investigate
+		setupTerminalEditorsTests({ skipSuite: process.platform === 'linux' });
+		setupTerminalInputTests({ skipSuite: process.platform === 'linux' });
+		setupTerminalPersistenceTests({ skipSuite: process.platform === 'linux' });
+		setupTerminalProfileTests({ skipSuite: process.platform === 'linux' });
+		setupTerminalTabsTests({ skipSuite: process.platform === 'linux' });
+		setupTerminalShellIntegrationTests({ skipSuite: process.platform === 'linux' });
+		setupTerminalStickyScrollTests({ skipSuite: process.platform === 'linux' });
+		// https://github.com/microsoft/vscode/pull/141974
+		// Windows is skipped here as well as it was never enabled from the start
+		setupTerminalSplitCwdTests({ skipSuite: process.platform === 'linux' || process.platform === 'win32' });
 	});
 }
diff --git a/test/smoke/src/main.ts b/test/smoke/src/main.ts
index 78e95650db7..d8120ea0675 100644
--- a/test/smoke/src/main.ts
+++ b/test/smoke/src/main.ts
@@ -10,7 +10,6 @@ import * as path from 'path';
 import * as os from 'os';
 import * as minimist from 'minimist';
 import * as rimraf from 'rimraf';
-import * as mkdirp from 'mkdirp';
 import * as vscodetest from '@vscode/test-electron';
 import fetch from 'node-fetch';
 import { Quality, MultiLogger, Logger, ConsoleLogger, FileLogger, measureAndLog, getDevElectronPath, getBuildElectronPath, getBuildVersion } from '../../automation';
@@ -105,7 +104,7 @@ function createLogger(): Logger {
 
 	// Prepare logs rot path
 	fs.rmSync(logsRootPath, { recursive: true, force: true, maxRetries: 3 });
-	mkdirp.sync(logsRootPath);
+	fs.mkdirSync(logsRootPath, { recursive: true });
 
 	// Always log to log file
 	loggers.push(new FileLogger(path.join(logsRootPath, 'smoke-test-runner.log')));
@@ -123,7 +122,7 @@ const testDataPath = path.join(os.tmpdir(), 'vscsmoke');
 if (fs.existsSync(testDataPath)) {
 	rimraf.sync(testDataPath);
 }
-mkdirp.sync(testDataPath);
+fs.mkdirSync(testDataPath, { recursive: true });
 process.once('exit', () => {
 	try {
 		rimraf.sync(testDataPath);
@@ -135,7 +134,7 @@ process.once('exit', () => {
 const testRepoUrl = 'https://github.com/microsoft/vscode-smoketest-express';
 const workspacePath = path.join(testDataPath, 'vscode-smoketest-express');
 const extensionsPath = path.join(testDataPath, 'extensions-dir');
-mkdirp.sync(extensionsPath);
+fs.mkdirSync(extensionsPath, { recursive: true });
 
 function fail(errorMessage): void {
 	logger.log(errorMessage);
@@ -179,7 +178,7 @@ function parseQuality(): Quality {
 //
 if (!opts.web) {
 	let testCodePath = opts.build;
-	let electronPath: string;
+	let electronPath: string | undefined;
 
 	if (testCodePath) {
 		electronPath = getBuildElectronPath(testCodePath);
@@ -400,7 +399,7 @@ describe(`VSCode Smoke Tests (${opts.web ? 'Web' : 'Electron'})`, () => {
 	if (!opts.web) { setupDataLossTests(() => opts['stable-build'] /* Do not change, deferred for a reason! */, logger); }
 	setupPreferencesTests(logger);
 	setupSearchTests(logger);
-	setupNotebookTests(logger);
+	if (!opts.web) { setupNotebookTests(logger); }
 	setupLanguagesTests(logger);
 	setupTerminalTests(logger);
 	setupTaskTests(logger);
diff --git a/test/smoke/tsconfig.json b/test/smoke/tsconfig.json
index 012f1223559..02cd3a44d7c 100644
--- a/test/smoke/tsconfig.json
+++ b/test/smoke/tsconfig.json
@@ -10,6 +10,7 @@
 		"noUnusedLocals": true,
 		"outDir": "out",
 		"sourceMap": true,
+		"skipLibCheck": true,
 		"lib": [
 			"esnext", // for #201187
 			"dom"
diff --git a/test/smoke/yarn.lock b/test/smoke/yarn.lock
deleted file mode 100644
index b2c705923a4..00000000000
--- a/test/smoke/yarn.lock
+++ /dev/null
@@ -1,658 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@types/events@*":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
-  integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
-
-"@types/glob@*":
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
-  integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==
-  dependencies:
-    "@types/events" "*"
-    "@types/minimatch" "*"
-    "@types/node" "*"
-
-"@types/minimatch@*":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
-  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
-
-"@types/mkdirp@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@types/mkdirp/-/mkdirp-1.0.1.tgz#0930b948914a78587de35458b86c907b6e98bbf6"
-  integrity sha512-HkGSK7CGAXncr8Qn/0VqNtExEE+PHMWb+qlR1faHMao7ng6P3tAaoWWBMdva0gL5h4zprjIO89GJOLXsMcDm1Q==
-  dependencies:
-    "@types/node" "*"
-
-"@types/mocha@^9.1.1":
-  version "9.1.1"
-  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-9.1.1.tgz#e7c4f1001eefa4b8afbd1eee27a237fee3bf29c4"
-  integrity sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==
-
-"@types/ncp@2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@types/ncp/-/ncp-2.0.1.tgz#749432511f6ad747d04e98837b18cca9045567fb"
-  integrity sha512-TeiJ7uvv/92ugSqZ0v9l0eNXzutlki0aK+R1K5bfA5SYUil46ITlxLW4iNTCf55P4L5weCmaOdtxGeGWvudwPg==
-  dependencies:
-    "@types/node" "*"
-
-"@types/node-fetch@^2.5.10":
-  version "2.5.10"
-  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.10.tgz#9b4d4a0425562f9fcea70b12cb3fcdd946ca8132"
-  integrity sha512-IpkX0AasN44hgEad0gEF/V6EgR5n69VEqPEgnmoM8GsIGro3PowbWs4tR6IhxUTyPLpOn+fiGG6nrQhcmoCuIQ==
-  dependencies:
-    "@types/node" "*"
-    form-data "^3.0.0"
-
-"@types/node@*":
-  version "13.11.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.11.0.tgz#390ea202539c61c8fa6ba4428b57e05bc36dc47b"
-  integrity sha512-uM4mnmsIIPK/yeO+42F2RQhGUIs39K2RFmugcJANppXe6J1nvH87PvzPZYpza7Xhhs8Yn9yIAVdLZ84z61+0xQ==
-
-"@types/node@20.x":
-  version "20.11.24"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792"
-  integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==
-  dependencies:
-    undici-types "~5.26.4"
-
-"@types/rimraf@3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-3.0.2.tgz#a63d175b331748e5220ad48c901d7bbf1f44eef8"
-  integrity sha512-F3OznnSLAUxFrCEu/L5PY8+ny8DtcFRjx7fZZ9bycvXRi3KPTRS9HOitGZwvPg0juRhXFWIeKX58cnX5YqLohQ==
-  dependencies:
-    "@types/glob" "*"
-    "@types/node" "*"
-
-ansi-styles@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
-  dependencies:
-    color-convert "^1.9.0"
-
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
-
-balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
-
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-call-bind@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.0.tgz#24127054bb3f9bdcb4b1fb82418186072f77b8ce"
-  integrity sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==
-  dependencies:
-    function-bind "^1.1.1"
-    get-intrinsic "^1.0.0"
-
-chalk@^2.4.1:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-color-convert@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
-  dependencies:
-    color-name "1.1.3"
-
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
-
-combined-stream@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
-  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
-  dependencies:
-    delayed-stream "~1.0.0"
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
-
-cross-spawn@^6.0.5:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
-  dependencies:
-    nice-try "^1.0.4"
-    path-key "^2.0.1"
-    semver "^5.5.0"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
-define-properties@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
-  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
-  dependencies:
-    object-keys "^1.0.12"
-
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
-
-error-ex@^1.3.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
-  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
-  dependencies:
-    is-arrayish "^0.2.1"
-
-es-abstract@^1.18.0-next.1:
-  version "1.18.0-next.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz#6e3a0a4bda717e5023ab3b8e90bec36108d22c68"
-  integrity sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==
-  dependencies:
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-    is-callable "^1.2.2"
-    is-negative-zero "^2.0.0"
-    is-regex "^1.1.1"
-    object-inspect "^1.8.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.1"
-    string.prototype.trimend "^1.0.1"
-    string.prototype.trimstart "^1.0.1"
-
-es-to-primitive@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
-  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
-  dependencies:
-    is-callable "^1.1.4"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.2"
-
-escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-
-exec-sh@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.2.tgz#2a5e7ffcbd7d0ba2755bdecb16e5a427dfbdec36"
-  integrity sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==
-  dependencies:
-    merge "^1.2.0"
-
-form-data@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
-  integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.8"
-    mime-types "^2.1.12"
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
-
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
-
-get-intrinsic@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.1.tgz#94a9768fcbdd0595a1c9273aacf4c89d075631be"
-  integrity sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==
-  dependencies:
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-
-glob@^7.1.3:
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
-  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-graceful-fs@^4.1.2:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
-  integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
-
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
-
-has-symbols@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
-  integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
-
-has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
-  dependencies:
-    function-bind "^1.1.1"
-
-hosted-git-info@^2.1.4:
-  version "2.8.9"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
-  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-is-arrayish@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
-
-is-callable@^1.1.4:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"
-  integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==
-
-is-callable@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
-  integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==
-
-is-core-module@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
-  integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
-  dependencies:
-    has "^1.0.3"
-
-is-date-object@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
-  integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
-
-is-negative-zero@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
-  integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
-
-is-regex@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9"
-  integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==
-  dependencies:
-    has-symbols "^1.0.1"
-
-is-symbol@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
-  integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==
-  dependencies:
-    has-symbols "^1.0.1"
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
-
-json-parse-better-errors@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
-  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
-
-load-json-file@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
-  integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs=
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^4.0.0"
-    pify "^3.0.0"
-    strip-bom "^3.0.0"
-
-memorystream@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
-  integrity sha1-htcJCzDORV1j+64S3aUaR93K+bI=
-
-merge@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
-  integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
-
-mime-db@1.48.0:
-  version "1.48.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.48.0.tgz#e35b31045dd7eada3aaad537ed88a33afbef2d1d"
-  integrity sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==
-
-mime-types@^2.1.12:
-  version "2.1.31"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.31.tgz#a00d76b74317c61f9c2db2218b8e9f8e9c5c9e6b"
-  integrity sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==
-  dependencies:
-    mime-db "1.48.0"
-
-minimatch@^3.0.4:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimist@^1.2.0:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
-  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
-
-mkdirp@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-
-ncp@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"
-  integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=
-
-nice-try@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
-  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
-
-node-fetch@^2.6.7:
-  version "2.6.7"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
-  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
-  dependencies:
-    whatwg-url "^5.0.0"
-
-normalize-package-data@^2.3.2:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
-  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
-  dependencies:
-    hosted-git-info "^2.1.4"
-    resolve "^1.10.0"
-    semver "2 || 3 || 4 || 5"
-    validate-npm-package-license "^3.0.1"
-
-npm-run-all@^4.1.5:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.5.tgz#04476202a15ee0e2e214080861bff12a51d98fba"
-  integrity sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    chalk "^2.4.1"
-    cross-spawn "^6.0.5"
-    memorystream "^0.3.1"
-    minimatch "^3.0.4"
-    pidtree "^0.3.0"
-    read-pkg "^3.0.0"
-    shell-quote "^1.6.1"
-    string.prototype.padend "^3.0.0"
-
-object-inspect@^1.8.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a"
-  integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==
-
-object-keys@^1.0.12, object-keys@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
-  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
-
-object.assign@^4.1.1:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
-  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
-  dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-    has-symbols "^1.0.1"
-    object-keys "^1.1.1"
-
-once@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
-  dependencies:
-    wrappy "1"
-
-parse-json@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
-  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
-  dependencies:
-    error-ex "^1.3.1"
-    json-parse-better-errors "^1.0.1"
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
-
-path-key@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
-
-path-parse@^1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
-  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
-
-path-type@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
-  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
-  dependencies:
-    pify "^3.0.0"
-
-pidtree@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.1.tgz#ef09ac2cc0533df1f3250ccf2c4d366b0d12114a"
-  integrity sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==
-
-pify@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
-
-read-pkg@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
-  integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=
-  dependencies:
-    load-json-file "^4.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^3.0.0"
-
-resolve@^1.10.0:
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
-  integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
-  dependencies:
-    is-core-module "^2.1.0"
-    path-parse "^1.0.6"
-
-rimraf@3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
-"semver@2 || 3 || 4 || 5", semver@^5.5.0:
-  version "5.7.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
-  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
-
-shebang-command@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
-  dependencies:
-    shebang-regex "^1.0.0"
-
-shebang-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
-
-shell-quote@^1.6.1:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123"
-  integrity sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==
-
-spdx-correct@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
-  integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
-  dependencies:
-    spdx-expression-parse "^3.0.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-exceptions@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
-  integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
-
-spdx-expression-parse@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
-  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
-  dependencies:
-    spdx-exceptions "^2.1.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-license-ids@^3.0.0:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65"
-  integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==
-
-string.prototype.padend@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.1.1.tgz#824c84265dbac46cade2b957b38b6a5d8d1683c5"
-  integrity sha512-eCzTASPnoCr5Ht+Vn1YXgm8SB015hHKgEIMu9Nr9bQmLhRBxKRfmzSj/IQsxDFc8JInJDDFA0qXwK+xxI7wDkg==
-  dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.1"
-
-string.prototype.trimend@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz#a22bd53cca5c7cf44d7c9d5c732118873d6cd18b"
-  integrity sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==
-  dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-
-string.prototype.trimstart@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz#9b4cb590e123bb36564401d59824298de50fd5aa"
-  integrity sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==
-  dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-
-strip-bom@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
-
-supports-color@^5.3.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
-  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
-  dependencies:
-    has-flag "^3.0.0"
-
-tr46@~0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-  integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
-
-validate-npm-package-license@^3.0.1:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
-  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
-  dependencies:
-    spdx-correct "^3.0.0"
-    spdx-expression-parse "^3.0.0"
-
-watch@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/watch/-/watch-1.0.2.tgz#340a717bde765726fa0aa07d721e0147a551df0c"
-  integrity sha1-NApxe952Vyb6CqB9ch4BR6VR3ww=
-  dependencies:
-    exec-sh "^0.2.0"
-    minimist "^1.2.0"
-
-webidl-conversions@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-  integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
-
-whatwg-url@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
-  integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0=
-  dependencies:
-    tr46 "~0.0.3"
-    webidl-conversions "^3.0.0"
-
-which@^1.2.9:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
-  dependencies:
-    isexe "^2.0.0"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
diff --git a/test/unit/README.md b/test/unit/README.md
index 154f1cf0ad0..2807e47de18 100644
--- a/test/unit/README.md
+++ b/test/unit/README.md
@@ -8,18 +8,18 @@ All unit tests are run inside a Electron renderer environment which access to DO
 
 - use the `--debug` to see an electron window with dev tools which allows for debugging
 - to run only a subset of tests use the `--run` or `--glob` options
-- use `yarn watch` to automatically compile changes
+- use `npm run watch` to automatically compile changes
 
 For instance, `./scripts/test.sh --debug --glob **/extHost*.test.js` runs all tests from `extHost`-files and enables you to debug them.
 
 ## Run (inside browser)
 
-    yarn test-browser --browser webkit --browser chromium
+    npm run test-browser -- --browser webkit --browser chromium
 
 Unit tests from layers `common` and `browser` are run inside `chromium`, `webkit`, and (soon'ish) `firefox` (using playwright). This complements our electron-based unit test runner and adds more coverage of supported platforms. Notes:
 
 - these tests are part of the continuous build, that means you might have test failures that only happen with webkit on _windows_ or _chromium_ on linux
-- you can run these tests locally via yarn `test-browser --browser chromium --browser webkit`
+- you can run these tests locally via `npm run test-browser -- --browser chromium --browser webkit`
 - to debug, open `<vscode>/test/unit/browser/renderer.html` inside a browser and use the `?m=<amd_module>`-query to specify what AMD module to load, e.g `file:///Users/jrieken/Code/vscode/test/unit/browser/renderer.html?m=vs/base/test/common/strings.test` runs all tests from `strings.test.ts`
 - to run only a subset of tests use the `--run` or `--glob` options
 
@@ -27,7 +27,7 @@ Unit tests from layers `common` and `browser` are run inside `chromium`, `webkit
 
 ## Run (with node)
 
-    yarn test-node --run src/vs/editor/test/browser/controller/cursor.test.ts
+    npm run test-node -- --run src/vs/editor/test/browser/controller/cursor.test.ts
 
 ## Coverage
 
diff --git a/test/unit/assert-esm.js b/test/unit/assert-esm.js
new file mode 100644
index 00000000000..170c31382c6
--- /dev/null
+++ b/test/unit/assert-esm.js
@@ -0,0 +1,498 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+
+// UTILITY
+
+// Object.create compatible in IE
+const create = Object.create || function (p) {
+	if (!p) { throw Error('no type'); }
+	function f() { }
+	f.prototype = p;
+	return new f();
+  };
+
+  // UTILITY
+  var util = {
+	inherits: function (ctor, superCtor) {
+	  ctor.super_ = superCtor;
+	  ctor.prototype = create(superCtor.prototype, {
+		constructor: {
+		  value: ctor,
+		  enumerable: false,
+		  writable: true,
+		  configurable: true
+		}
+	  });
+	},
+	isArray: function (ar) {
+	  return Array.isArray(ar);
+	},
+	isBoolean: function (arg) {
+	  return typeof arg === 'boolean';
+	},
+	isNull: function (arg) {
+	  return arg === null;
+	},
+	isNullOrUndefined: function (arg) {
+	  return arg == null;
+	},
+	isNumber: function (arg) {
+	  return typeof arg === 'number';
+	},
+	isString: function (arg) {
+	  return typeof arg === 'string';
+	},
+	isSymbol: function (arg) {
+	  return typeof arg === 'symbol';
+	},
+	isUndefined: function (arg) {
+	  return arg === undefined;
+	},
+	isRegExp: function (re) {
+	  return util.isObject(re) && util.objectToString(re) === '[object RegExp]';
+	},
+	isObject: function (arg) {
+	  return typeof arg === 'object' && arg !== null;
+	},
+	isDate: function (d) {
+	  return util.isObject(d) && util.objectToString(d) === '[object Date]';
+	},
+	isError: function (e) {
+	  return isObject(e) &&
+		(objectToString(e) === '[object Error]' || e instanceof Error);
+	},
+	isFunction: function (arg) {
+	  return typeof arg === 'function';
+	},
+	isPrimitive: function (arg) {
+	  return arg === null ||
+		typeof arg === 'boolean' ||
+		typeof arg === 'number' ||
+		typeof arg === 'string' ||
+		typeof arg === 'symbol' ||  // ES6 symbol
+		typeof arg === 'undefined';
+	},
+	objectToString: function (o) {
+	  return Object.prototype.toString.call(o);
+	}
+  };
+
+  const pSlice = Array.prototype.slice;
+
+  // From https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/keys
+  const Object_keys = typeof Object.keys === 'function' ? Object.keys : (function () {
+	const hasOwnProperty = Object.prototype.hasOwnProperty,
+	  hasDontEnumBug = !({ toString: null }).propertyIsEnumerable('toString'),
+	  dontEnums = [
+		'toString',
+		'toLocaleString',
+		'valueOf',
+		'hasOwnProperty',
+		'isPrototypeOf',
+		'propertyIsEnumerable',
+		'constructor'
+	  ],
+	  dontEnumsLength = dontEnums.length;
+
+	return function (obj) {
+	  if (typeof obj !== 'object' && (typeof obj !== 'function' || obj === null)) {
+		throw new TypeError('Object.keys called on non-object');
+	  }
+
+	  let result = [], prop, i;
+
+	  for (prop in obj) {
+		if (hasOwnProperty.call(obj, prop)) {
+		  result.push(prop);
+		}
+	  }
+
+	  if (hasDontEnumBug) {
+		for (i = 0; i < dontEnumsLength; i++) {
+		  if (hasOwnProperty.call(obj, dontEnums[i])) {
+			result.push(dontEnums[i]);
+		  }
+		}
+	  }
+	  return result;
+	};
+  })();
+
+  // 1. The assert module provides functions that throw
+  // AssertionError's when particular conditions are not met. The
+  // assert module must conform to the following interface.
+
+  const assert = ok;
+
+  // 2. The AssertionError is defined in assert.
+  // new assert.AssertionError({ message: message,
+  //                             actual: actual,
+  //                             expected: expected })
+
+  assert.AssertionError = function AssertionError(options) {
+	this.name = 'AssertionError';
+	this.actual = options.actual;
+	this.expected = options.expected;
+	this.operator = options.operator;
+	if (options.message) {
+	  this.message = options.message;
+	  this.generatedMessage = false;
+	} else {
+	  this.message = getMessage(this);
+	  this.generatedMessage = true;
+	}
+	const stackStartFunction = options.stackStartFunction || fail;
+	if (Error.captureStackTrace) {
+	  Error.captureStackTrace(this, stackStartFunction);
+	} else {
+	  // try to throw an error now, and from the stack property
+	  // work out the line that called in to assert.js.
+	  try {
+		this.stack = (new Error).stack.toString();
+	  } catch (e) { }
+	}
+  };
+
+  // assert.AssertionError instanceof Error
+  util.inherits(assert.AssertionError, Error);
+
+  function replacer(key, value) {
+	if (util.isUndefined(value)) {
+	  return '' + value;
+	}
+	if (util.isNumber(value) && (isNaN(value) || !isFinite(value))) {
+	  return value.toString();
+	}
+	if (util.isFunction(value) || util.isRegExp(value)) {
+	  return value.toString();
+	}
+	return value;
+  }
+
+  function truncate(s, n) {
+	if (util.isString(s)) {
+	  return s.length < n ? s : s.slice(0, n);
+	} else {
+	  return s;
+	}
+  }
+
+  function getMessage(self) {
+	return truncate(JSON.stringify(self.actual, replacer), 128) + ' ' +
+	  self.operator + ' ' +
+	  truncate(JSON.stringify(self.expected, replacer), 128);
+  }
+
+  // At present only the three keys mentioned above are used and
+  // understood by the spec. Implementations or sub modules can pass
+  // other keys to the AssertionError's constructor - they will be
+  // ignored.
+
+  // 3. All of the following functions must throw an AssertionError
+  // when a corresponding condition is not met, with a message that
+  // may be undefined if not provided.  All assertion methods provide
+  // both the actual and expected values to the assertion error for
+  // display purposes.
+
+  export function fail(actual, expected, message, operator, stackStartFunction) {
+	throw new assert.AssertionError({
+	  message: message,
+	  actual: actual,
+	  expected: expected,
+	  operator: operator,
+	  stackStartFunction: stackStartFunction
+	});
+  }
+
+  // EXTENSION! allows for well behaved errors defined elsewhere.
+  assert.fail = fail;
+
+  // 4. Pure assertion tests whether a value is truthy, as determined
+  // by !!guard.
+  // assert.ok(guard, message_opt);
+  // This statement is equivalent to assert.equal(true, !!guard,
+  // message_opt);. To test strictly for the value true, use
+  // assert.strictEqual(true, guard, message_opt);.
+
+  export function ok(value, message) {
+	if (!value) { fail(value, true, message, '==', assert.ok); }
+  }
+  assert.ok = ok;
+
+  // 5. The equality assertion tests shallow, coercive equality with
+  // ==.
+  // assert.equal(actual, expected, message_opt);
+
+  assert.equal = function equal(actual, expected, message) {
+	if (actual != expected) { fail(actual, expected, message, '==', assert.equal); }
+  };
+
+  // 6. The non-equality assertion tests for whether two objects are not equal
+  // with != assert.notEqual(actual, expected, message_opt);
+
+  assert.notEqual = function notEqual(actual, expected, message) {
+	if (actual == expected) {
+	  fail(actual, expected, message, '!=', assert.notEqual);
+	}
+  };
+
+  // 7. The equivalence assertion tests a deep equality relation.
+  // assert.deepEqual(actual, expected, message_opt);
+
+  assert.deepEqual = function deepEqual(actual, expected, message) {
+	if (!_deepEqual(actual, expected, false)) {
+	  fail(actual, expected, message, 'deepEqual', assert.deepEqual);
+	}
+  };
+
+  assert.deepStrictEqual = function deepStrictEqual(actual, expected, message) {
+	if (!_deepEqual(actual, expected, true)) {
+	  fail(actual, expected, message, 'deepStrictEqual', assert.deepStrictEqual);
+	}
+  };
+
+  function _deepEqual(actual, expected, strict) {
+	// 7.1. All identical values are equivalent, as determined by ===.
+	if (actual === expected) {
+	  return true;
+	  // } else if (actual instanceof Buffer && expected instanceof Buffer) {
+	  //   return compare(actual, expected) === 0;
+
+	  // 7.2. If the expected value is a Date object, the actual value is
+	  // equivalent if it is also a Date object that refers to the same time.
+	} else if (util.isDate(actual) && util.isDate(expected)) {
+	  return actual.getTime() === expected.getTime();
+
+	  // 7.3 If the expected value is a RegExp object, the actual value is
+	  // equivalent if it is also a RegExp object with the same source and
+	  // properties (`global`, `multiline`, `lastIndex`, `ignoreCase`).
+	} else if (util.isRegExp(actual) && util.isRegExp(expected)) {
+	  return actual.source === expected.source &&
+		actual.global === expected.global &&
+		actual.multiline === expected.multiline &&
+		actual.lastIndex === expected.lastIndex &&
+		actual.ignoreCase === expected.ignoreCase;
+
+	  // 7.4. Other pairs that do not both pass typeof value == 'object',
+	  // equivalence is determined by ==.
+	} else if ((actual === null || typeof actual !== 'object') &&
+	  (expected === null || typeof expected !== 'object')) {
+	  return strict ? actual === expected : actual == expected;
+
+	  // 7.5 For all other Object pairs, including Array objects, equivalence is
+	  // determined by having the same number of owned properties (as verified
+	  // with Object.prototype.hasOwnProperty.call), the same set of keys
+	  // (although not necessarily the same order), equivalent values for every
+	  // corresponding key, and an identical 'prototype' property. Note: this
+	  // accounts for both named and indexed properties on Arrays.
+	} else {
+	  return objEquiv(actual, expected, strict);
+	}
+  }
+
+  function isArguments(object) {
+	return Object.prototype.toString.call(object) == '[object Arguments]';
+  }
+
+  function objEquiv(a, b, strict) {
+	if (a === null || a === undefined || b === null || b === undefined) { return false; }
+	// if one is a primitive, the other must be same
+	if (util.isPrimitive(a) || util.isPrimitive(b)) { return a === b; }
+	if (strict && Object.getPrototypeOf(a) !== Object.getPrototypeOf(b)) { return false; }
+	const aIsArgs = isArguments(a),
+	  bIsArgs = isArguments(b);
+	if ((aIsArgs && !bIsArgs) || (!aIsArgs && bIsArgs)) { return false; }
+	if (aIsArgs) {
+	  a = pSlice.call(a);
+	  b = pSlice.call(b);
+	  return _deepEqual(a, b, strict);
+	}
+	let ka = Object.keys(a),
+	  kb = Object.keys(b),
+	  key, i;
+	// having the same number of owned properties (keys incorporates
+	// hasOwnProperty)
+	if (ka.length !== kb.length) { return false; }
+	//the same set of keys (although not necessarily the same order),
+	ka.sort();
+	kb.sort();
+	//~~~cheap key test
+	for (i = ka.length - 1; i >= 0; i--) {
+	  if (ka[i] !== kb[i]) { return false; }
+	}
+	//equivalent values for every corresponding key, and
+	//~~~possibly expensive deep test
+	for (i = ka.length - 1; i >= 0; i--) {
+	  key = ka[i];
+	  if (!_deepEqual(a[key], b[key], strict)) { return false; }
+	}
+	return true;
+  }
+
+  // 8. The non-equivalence assertion tests for any deep inequality.
+  // assert.notDeepEqual(actual, expected, message_opt);
+
+  assert.notDeepEqual = function notDeepEqual(actual, expected, message) {
+	if (_deepEqual(actual, expected, false)) {
+	  fail(actual, expected, message, 'notDeepEqual', assert.notDeepEqual);
+	}
+  };
+
+  assert.notDeepStrictEqual = notDeepStrictEqual;
+  export function notDeepStrictEqual(actual, expected, message) {
+	if (_deepEqual(actual, expected, true)) {
+	  fail(actual, expected, message, 'notDeepStrictEqual', notDeepStrictEqual);
+	}
+  }
+
+
+  // 9. The strict equality assertion tests strict equality, as determined by ===.
+  // assert.strictEqual(actual, expected, message_opt);
+
+  assert.strictEqual = function strictEqual(actual, expected, message) {
+	if (actual !== expected) {
+	  fail(actual, expected, message, '===', assert.strictEqual);
+	}
+  };
+
+  // 10. The strict non-equality assertion tests for strict inequality, as
+  // determined by !==.  assert.notStrictEqual(actual, expected, message_opt);
+
+  assert.notStrictEqual = function notStrictEqual(actual, expected, message) {
+	if (actual === expected) {
+	  fail(actual, expected, message, '!==', assert.notStrictEqual);
+	}
+  };
+
+  function expectedException(actual, expected) {
+	if (!actual || !expected) {
+	  return false;
+	}
+
+	if (Object.prototype.toString.call(expected) == '[object RegExp]') {
+	  return expected.test(actual);
+	} else if (actual instanceof expected) {
+	  return true;
+	} else if (expected.call({}, actual) === true) {
+	  return true;
+	}
+
+	return false;
+  }
+
+  function _throws(shouldThrow, block, expected, message) {
+	let actual;
+
+	if (typeof block !== 'function') {
+	  throw new TypeError('block must be a function');
+	}
+
+	if (typeof expected === 'string') {
+	  message = expected;
+	  expected = null;
+	}
+
+	try {
+	  block();
+	} catch (e) {
+	  actual = e;
+	}
+
+	message = (expected && expected.name ? ' (' + expected.name + ').' : '.') +
+	  (message ? ' ' + message : '.');
+
+	if (shouldThrow && !actual) {
+	  fail(actual, expected, 'Missing expected exception' + message);
+	}
+
+	if (!shouldThrow && expectedException(actual, expected)) {
+	  fail(actual, expected, 'Got unwanted exception' + message);
+	}
+
+	if ((shouldThrow && actual && expected &&
+	  !expectedException(actual, expected)) || (!shouldThrow && actual)) {
+	  throw actual;
+	}
+  }
+
+  // 11. Expected to throw an error:
+  // assert.throws(block, Error_opt, message_opt);
+
+  assert.throws = function (block, /*optional*/error, /*optional*/message) {
+	_throws.apply(this, [true].concat(pSlice.call(arguments)));
+  };
+
+  // EXTENSION! This is annoying to write outside this module.
+  assert.doesNotThrow = function (block, /*optional*/message) {
+	_throws.apply(this, [false].concat(pSlice.call(arguments)));
+  };
+
+  assert.ifError = function (err) { if (err) { throw err; } };
+
+  function checkIsPromise(obj) {
+	return (obj !== null && typeof obj === 'object' &&
+	  typeof obj.then === 'function' &&
+	  typeof obj.catch === 'function');
+  }
+
+  const NO_EXCEPTION_SENTINEL = {};
+  async function waitForActual(promiseFn) {
+	let resultPromise;
+	if (typeof promiseFn === 'function') {
+	  // Return a rejected promise if `promiseFn` throws synchronously.
+	  resultPromise = promiseFn();
+	  // Fail in case no promise is returned.
+	  if (!checkIsPromise(resultPromise)) {
+		throw new Error('ERR_INVALID_RETURN_VALUE: promiseFn did not return Promise. ' + resultPromise);
+	  }
+	} else if (checkIsPromise(promiseFn)) {
+	  resultPromise = promiseFn;
+	} else {
+	  throw new Error('ERR_INVALID_ARG_TYPE: promiseFn is not Function or Promise. ' + promiseFn);
+	}
+
+	try {
+	  await resultPromise;
+	} catch (e) {
+	  return e;
+	}
+	return NO_EXCEPTION_SENTINEL;
+  }
+
+  function expectsError(shouldHaveError, actual, message) {
+	if (shouldHaveError && actual === NO_EXCEPTION_SENTINEL) {
+	  fail(undefined, 'Error', `Missing expected rejection${message ? ': ' + message : ''}`)
+	} else if (!shouldHaveError && actual !== NO_EXCEPTION_SENTINEL) {
+	  fail(actual, undefined, `Got unexpected rejection (${actual.message})${message ? ': ' + message : ''}`)
+	}
+  }
+
+  assert.rejects = async function rejects(promiseFn, message) {
+	expectsError(true, await waitForActual(promiseFn), message);
+  };
+
+  assert.doesNotReject = async function doesNotReject(fn, message) {
+	expectsError(false, await waitForActual(fn), message);
+  };
+
+  // ESM export
+  export default assert;
+  export const AssertionError = assert.AssertionError
+  // export const fail = assert.fail
+  // export const ok = assert.ok
+  export const equal = assert.equal
+  export const notEqual = assert.notEqual
+  export const deepEqual = assert.deepEqual
+  export const deepStrictEqual = assert.deepStrictEqual
+  export const notDeepEqual = assert.notDeepEqual
+  // export const notDeepStrictEqual = assert.notDeepStrictEqual
+  export const strictEqual = assert.strictEqual
+  export const notStrictEqual = assert.notStrictEqual
+  export const throws = assert.throws
+  export const doesNotThrow = assert.doesNotThrow
+  export const ifError = assert.ifError
+  export const rejects = assert.rejects
+  export const doesNotReject = assert.doesNotReject
diff --git a/test/unit/browser/index.js b/test/unit/browser/index.js
index 322e5b7d510..f19c21e46c4 100644
--- a/test/unit/browser/index.js
+++ b/test/unit/browser/index.js
@@ -10,7 +10,7 @@ const path = require('path');
 const glob = require('glob');
 const events = require('events');
 const mocha = require('mocha');
-const createStatsCollector = require('../../../node_modules/mocha/lib/stats-collector');
+const createStatsCollector = require('mocha/lib/stats-collector');
 const MochaJUnitReporter = require('mocha-junit-reporter');
 const url = require('url');
 const minimatch = require('minimatch');
@@ -21,6 +21,7 @@ const yaserver = require('yaserver');
 const http = require('http');
 const { randomBytes } = require('crypto');
 const minimist = require('minimist');
+const { promisify } = require('node:util');
 
 /**
  * @type {{
@@ -83,6 +84,8 @@ Options:
 	process.exit(0);
 }
 
+const isDebug = !!args.debug;
+
 const withReporter = (function () {
 	if (args.tfs) {
 		{
@@ -111,7 +114,7 @@ function ensureIsArray(a) {
 
 const testModules = (async function () {
 
-	const excludeGlob = '**/{node,electron-sandbox,electron-main}/**/*.test.js';
+	const excludeGlob = '**/{node,electron-sandbox,electron-main,electron-utility}/**/*.test.js';
 	let isDefaultModules = true;
 	let promise;
 
@@ -183,10 +186,14 @@ async function createServer() {
 			req.on('end', () => resolve(JSON.parse(Buffer.concat(body).toString())));
 			req.on('error', reject);
 		});
-
-		const result = await fn(...params);
-		response.writeHead(200, { 'Content-Type': 'application/json' });
-		response.end(JSON.stringify(result));
+		try {
+			const result = await fn(...params);
+			response.writeHead(200, { 'Content-Type': 'application/json' });
+			response.end(JSON.stringify(result));
+		} catch (err) {
+			response.writeHead(500);
+			response.end(err.message);
+		}
 	};
 
 	const server = http.createServer((request, response) => {
@@ -197,17 +204,24 @@ async function createServer() {
 		// rewrite the URL so the static server can handle the request correctly
 		request.url = request.url.slice(prefix.length);
 
+		function massagePath(p) {
+			// TODO@jrieken FISHY but it enables snapshot
+			// in ESM browser tests
+			p = String(p).replace(/\\/g, '/').replace(prefix, rootDir);
+			return p;
+		}
+
 		switch (request.url) {
 			case '/remoteMethod/__readFileInTests':
-				return remoteMethod(request, response, p => fs.promises.readFile(p, 'utf-8'));
+				return remoteMethod(request, response, p => fs.promises.readFile(massagePath(p), 'utf-8'));
 			case '/remoteMethod/__writeFileInTests':
-				return remoteMethod(request, response, (p, contents) => fs.promises.writeFile(p, contents));
+				return remoteMethod(request, response, (p, contents) => fs.promises.writeFile(massagePath(p), contents));
 			case '/remoteMethod/__readDirInTests':
-				return remoteMethod(request, response, p => fs.promises.readdir(p));
+				return remoteMethod(request, response, p => fs.promises.readdir(massagePath(p)));
 			case '/remoteMethod/__unlinkInTests':
-				return remoteMethod(request, response, p => fs.promises.unlink(p));
+				return remoteMethod(request, response, p => fs.promises.unlink(massagePath(p)));
 			case '/remoteMethod/__mkdirPInTests':
-				return remoteMethod(request, response, p => fs.promises.mkdir(p, { recursive: true }));
+				return remoteMethod(request, response, p => fs.promises.mkdir(massagePath(p), { recursive: true }));
 			default:
 				return serveStatic.handle(request, response);
 		}
@@ -239,6 +253,12 @@ async function runTestsInBrowser(testModules, browserType) {
 		target.searchParams.set('ci', 'true');
 	}
 
+	// append CSS modules as query-param
+	await promisify(require('glob'))('**/*.css', { cwd: out }).then(async cssModules => {
+		const cssData = await new Response((await new Response(cssModules.join(',')).blob()).stream().pipeThrough(new CompressionStream('gzip'))).arrayBuffer();
+		target.searchParams.set('_devCssData', Buffer.from(cssData).toString('base64'));
+	});
+
 	const emitter = new events.EventEmitter();
 	await page.exposeFunction('mocha_report', (type, data1, data2) => {
 		emitter.emit(type, data1, data2);
@@ -246,6 +266,17 @@ async function runTestsInBrowser(testModules, browserType) {
 
 	await page.goto(target.href);
 
+	if (args.build) {
+		const nlsMessages = await fs.promises.readFile(path.join(out, 'nls.messages.json'), 'utf8');
+		await page.evaluate(value => {
+			// when running from `out-build`, ensure to load the default
+			// messages file, because all `nls.localize` calls have their
+			// english values removed and replaced by an index.
+			// @ts-ignore
+			globalThis._VSCODE_NLS_MESSAGES = JSON.parse(value);
+		}, nlsMessages);
+	}
+
 	page.on('console', async msg => {
 		consoleLogFn(msg)(msg.text(), await Promise.all(msg.args().map(async arg => await arg.jsonValue())));
 	});
@@ -279,8 +310,10 @@ async function runTestsInBrowser(testModules, browserType) {
 	} catch (err) {
 		console.error(err);
 	}
-	server.dispose();
-	await browser.close();
+	if (!isDebug) {
+		server?.dispose();
+		await browser.close();
+	}
 
 	if (failingTests.length > 0) {
 		let res = `The followings tests are failing:\n - ${failingTests.map(({ title, message }) => `${title} (reason: ${message})`).join('\n - ')}`;
@@ -367,7 +400,9 @@ testModules.then(async modules => {
 		}
 	} catch (err) {
 		console.error(err);
-		process.exit(1);
+		if (!isDebug) {
+			process.exit(1);
+		}
 	}
 
 	// aftermath
@@ -377,7 +412,9 @@ testModules.then(async modules => {
 			console.log(msg);
 		}
 	}
-	process.exit(didFail ? 1 : 0);
+	if (!isDebug) {
+		process.exit(didFail ? 1 : 0);
+	}
 
 }).catch(err => {
 	console.error(err);
diff --git a/test/unit/browser/renderer.html b/test/unit/browser/renderer.html
index 7187baf7bf6..e2807ca8273 100644
--- a/test/unit/browser/renderer.html
+++ b/test/unit/browser/renderer.html
@@ -40,28 +40,82 @@
 		});
 	</script>
 
-	<!-- Depending on --build or not, load loader from known locations -->
-	<script src="../../../out/vs/loader.js"></script>
-	<script src="../../../out-build/vs/loader.js"></script>
-
 	<script>
 		const isBuild = urlParams.get('build');
+		const out = !!isBuild ? 'out-build' : 'out';
+		const tasks =[];
 
 		// configure loader
 		const baseUrl = window.location.href;
-		require.config({
-			catchError: true,
-			baseUrl: urlParams.get('baseUrl'),
-			paths: {
-				vs: new URL(`../../../${!!isBuild ? 'out-build' : 'out'}/vs`, baseUrl).href,
-				assert: new URL('../assert.js', baseUrl).href,
-				sinon: new URL('../../../node_modules/sinon/pkg/sinon.js', baseUrl).href,
-				'sinon-test': new URL('../../../node_modules/sinon-test/dist/sinon-test.js', baseUrl).href,
+
+		// generate import map
+		const importMapParent = document.currentScript.parentNode;
+		const importMap = {
+			imports: {
+				vs: new URL(`../../../${out}/vs`, baseUrl).href,
+				assert: new URL('../assert-esm.js', baseUrl).href,
+				sinon: new URL('../../../node_modules/sinon/pkg/sinon-esm.js', baseUrl).href,
+				'sinon-test': new URL('../../../node_modules/sinon-test/dist/sinon-test-es.js', baseUrl).href,
 				'@xterm/xterm': new URL('../../../node_modules/@xterm/xterm/lib/xterm.js', baseUrl).href,
 				'@vscode/iconv-lite-umd': new URL('../../../node_modules/@vscode/iconv-lite-umd/lib/iconv-lite-umd.js', baseUrl).href,
 				jschardet: new URL('../../../node_modules/jschardet/dist/jschardet.min.js', baseUrl).href
 			}
+		}
+
+		// ---- CSS tricks
+
+		const cssDataBase64 = urlParams.get('_devCssData');
+		if (typeof cssDataBase64 === 'string') {
+
+			const style = document.createElement('style');
+			style.type = 'text/css';
+			document.head.appendChild(style);
+
+			globalThis._VSCODE_CSS_LOAD = function (url) {
+				// debugger;
+				style.sheet.insertRule(`@import url(${url});`);
+			};
+
+			const cssData = Uint8Array.from(atob(cssDataBase64), c => c.charCodeAt(0));
+			tasks.push(new Response(new Blob([cssData], {type:'application/octet-binary'}).stream().pipeThrough(new DecompressionStream('gzip'))).text().then(value => {
+				const cssModules = value.split(',');
+				for (const cssModule of cssModules) {
+					const cssUrl = new URL(`../../../${out}/${cssModule}`, baseUrl).href;
+					const jsSrc = `globalThis._VSCODE_CSS_LOAD('${cssUrl}');\n`;
+					const blob = new Blob([jsSrc], { type: 'application/javascript' });
+					importMap.imports[cssUrl] = URL.createObjectURL(blob);
+				}
+			}).catch(err => {
+				console.error(err);
+			}));
+		}
+
+		const initPromise = Promise.allSettled(tasks).then(() => {
+
+			const rawImportMap = JSON.stringify(importMap, undefined, 2);
+			const importMapScript = document.createElement('script');
+			importMapScript.type = 'importmap';
+			importMapScript.textContent = rawImportMap;
+			importMapParent.appendChild(importMapScript);
+
+		}).then(() => {
+			const bootstrapScript = document.createElement('script');
+			bootstrapScript.type = 'module';
+			bootstrapScript.textContent = document.getElementById('bootstrap').textContent
+			document.getElementById('bootstrap').remove();
+			document.body.append(bootstrapScript);
 		});
+
+		// set up require
+
+		globalThis._VSCODE_FILE_ROOT = new URL('../../../src', baseUrl).href;
+		globalThis.require = {
+			paths: {
+				xterm: new URL('../../../node_modules/xterm', baseUrl).href,
+				'@vscode/iconv-lite-umd': new URL('../../../node_modules/@vscode/iconv-lite-umd', baseUrl).href,
+				jschardet: new URL('../../../node_modules/jschardet', baseUrl).href
+			}
+		}
 	</script>
 
 	<script>
@@ -137,11 +191,10 @@
 			}
 		}
 
-
 		async function loadModules(modules) {
 			for (const file of modules) {
 				mocha.suite.emit(Mocha.Suite.constants.EVENT_FILE_PRE_REQUIRE, globalThis, file, mocha);
-				const m = await new Promise((resolve, reject) => require([file], resolve, err => {
+				const m = await new Promise((resolve, reject) => import(`../../../${out}/${file}.js`).then(resolve, err => {
 					console.log("BAD " + file + JSON.stringify(err, undefined, '\t'));
 					resolve({});
 				}));
@@ -150,37 +203,43 @@
 			}
 		}
 
-		window.loadAndRun = async function loadAndRun({ modules, grep }, manual = false) {
-			// load
-			await loadModules(modules);
-			// await new Promise((resolve, reject) => {
-			// 	require(modules, resolve, err => {
-			// 		console.log(err);
-			// 		reject(err);
-			// 	});
-			// });
+		let _resolveTestData;
+		let _resolveTestRun;
+		globalThis._VSCODE_TEST_RUN = new Promise(resolve => _resolveTestData = resolve)
 
-			// run
-			return new Promise((resolve, reject) => {
-				if (grep) {
-					mocha.grep(grep);
-				}
-
-				if (!manual) {
-					mocha.reporter(PlaywrightReporter);
-				}
-				mocha.run(failCount => resolve(failCount === 0));
-			});
+		window.loadAndRun = async function loadAndRun(data, manual = false) {
+			_resolveTestData({data, manual})
+			return new Promise(resolve => _resolveTestRun = resolve);
 		}
 
-		const url = new URL(window.location.href);
-		const modules = url.searchParams.getAll('m');
+		const modules = new URL(window.location.href).searchParams.getAll('m');
 		if (Array.isArray(modules) && modules.length > 0) {
 			console.log('MANUALLY running tests', modules);
 
-			loadAndRun({modules}, true).then(() => console.log('done'), err => console.log(err));
+			loadAndRun(modules, true).then(() => console.log('done'), err => console.log(err));
 		}
 	</script>
+
+	<script type="text" id="bootstrap">
+		const {data: {modules, grep}, manual} = await globalThis._VSCODE_TEST_RUN
+
+		// load
+		await loadModules(modules);
+
+		// run
+		await new Promise((resolve, reject) => {
+			if (grep) {
+				mocha.grep(grep);
+			}
+
+			if (!manual) {
+				mocha.reporter(PlaywrightReporter);
+			}
+			mocha.run(failCount => resolve(failCount === 0));
+		});
+
+		_resolveTestRun();
+	</script>
 </body>
 
 </html>
diff --git a/test/unit/electron/index.js b/test/unit/electron/index.js
index 09f573713a9..f69104799ca 100644
--- a/test/unit/electron/index.js
+++ b/test/unit/electron/index.js
@@ -10,7 +10,7 @@
 // come before any mocha imports.
 process.env.MOCHA_COLORS = '1';
 
-const { app, BrowserWindow, ipcMain, crashReporter } = require('electron');
+const { app, BrowserWindow, ipcMain, crashReporter, session } = require('electron');
 const product = require('../../../product.json');
 const { tmpdir } = require('os');
 const { existsSync, mkdirSync } = require('fs');
@@ -218,6 +218,12 @@ class IPCRunner extends events.EventEmitter {
 
 app.on('ready', () => {
 
+	// needed when loading resources from the renderer, e.g xterm.js or the encoding lib
+	session.defaultSession.protocol.registerFileProtocol('vscode-file', (request, callback) => {
+		const path = new URL(request.url).pathname;
+		callback({ path });
+	});
+
 	ipcMain.on('error', (_, err) => {
 		if (!args.dev) {
 			console.error(err);
@@ -249,7 +255,7 @@ app.on('ready', () => {
 		width: 800,
 		show: false,
 		webPreferences: {
-			preload: path.join(__dirname, '..', '..', '..', 'src', 'vs', 'base', 'parts', 'sandbox', 'electron-sandbox', 'preload.js'), // ensure similar environment as VSCode as tests may depend on this
+			preload: path.join(__dirname, 'preload.js'), // ensure similar environment as VSCode as tests may depend on this
 			additionalArguments: [`--vscode-window-config=vscode:test-vscode-window-config`],
 			nodeIntegration: true,
 			contextIsolation: false,
@@ -302,7 +308,9 @@ app.on('ready', () => {
 		win.webContents.send('run', args);
 	}
 
-	win.loadURL(url.format({ pathname: path.join(__dirname, 'renderer.html'), protocol: 'file:', slashes: true }));
+	const target = url.pathToFileURL(path.join(__dirname, 'renderer.html'));
+	target.searchParams.set('argv', JSON.stringify(args));
+	win.loadURL(target.href);
 
 	const runner = new IPCRunner(win);
 	createStatsCollector(runner);
diff --git a/test/unit/electron/preload.js b/test/unit/electron/preload.js
new file mode 100644
index 00000000000..04439d66ea1
--- /dev/null
+++ b/test/unit/electron/preload.js
@@ -0,0 +1,92 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// @ts-check
+(function () {
+	'use strict';
+
+	const { ipcRenderer, webFrame, contextBridge, webUtils } = require('electron');
+
+	const globals = {
+
+		ipcRenderer: {
+
+			send(channel, ...args) {
+				ipcRenderer.send(channel, ...args);
+			},
+
+			invoke(channel, ...args) {
+				return ipcRenderer.invoke(channel, ...args);
+			},
+
+			on(channel, listener) {
+				ipcRenderer.on(channel, listener);
+
+				return this;
+			},
+
+			once(channel, listener) {
+				ipcRenderer.once(channel, listener);
+
+				return this;
+			},
+
+			removeListener(channel, listener) {
+				ipcRenderer.removeListener(channel, listener);
+
+				return this;
+			}
+		},
+
+		webFrame: {
+
+			setZoomLevel(level) {
+				if (typeof level === 'number') {
+					webFrame.setZoomLevel(level);
+				}
+			}
+		},
+
+		webUtils: {
+
+			getPathForFile(file) {
+				return webUtils.getPathForFile(file);
+			}
+		},
+
+		process: {
+			get platform() { return process.platform; },
+			get arch() { return process.arch; },
+			get env() { return { ...process.env }; },
+			get versions() { return process.versions; },
+			get type() { return 'renderer'; },
+			get execPath() { return process.execPath; },
+
+			cwd() {
+				return process.env['VSCODE_CWD'] || process.execPath.substr(0, process.execPath.lastIndexOf(process.platform === 'win32' ? '\\' : '/'));
+			},
+
+			getProcessMemoryInfo() {
+				return process.getProcessMemoryInfo();
+			},
+
+			on(type, callback) {
+				// @ts-ignore
+				process.on(type, callback);
+			}
+		},
+	};
+
+	if (process.contextIsolated) {
+		try {
+			contextBridge.exposeInMainWorld('vscode', globals);
+		} catch (error) {
+			console.error(error);
+		}
+	} else {
+		// @ts-ignore
+		window.vscode = globals;
+	}
+}());
diff --git a/test/unit/electron/renderer.html b/test/unit/electron/renderer.html
index 5fcbc9661aa..9622967c638 100644
--- a/test/unit/electron/renderer.html
+++ b/test/unit/electron/renderer.html
@@ -23,13 +23,109 @@
 		window.alert = function () { throw new Error('window.alert() is not supported in tests!'); }
 		window.confirm = function () { throw new Error('window.confirm() is not supported in tests!'); }
 
+		// Ignore uncaught cancelled promise errors
+		window.addEventListener('unhandledrejection', e => {
+			const name = e && e.reason && e.reason.name;
+
+			if (name === 'Canceled') {
+				e.preventDefault();
+				e.stopPropagation();
+			}
+		});
+
 		mocha.setup({
 			ui: 'tdd',
 			timeout: typeof process.env['BUILD_ARTIFACTSTAGINGDIRECTORY'] === 'string' ? 30000 : 5000,
 			forbidOnly: typeof process.env['BUILD_ARTIFACTSTAGINGDIRECTORY'] === 'string' // disallow .only() when running on build machine
 		});
-		require('./renderer');
 	</script>
+	<script>
+		const urlParams = new URLSearchParams(window.location.search);
+		const argv = JSON.parse(urlParams.get('argv'));
+
+		const outdir = argv.build ? 'out-build' : 'out';
+		const basePath = require('path').join(__dirname, `../../../${outdir}/`);
+		const baseUrl = require('url').pathToFileURL(basePath);
+
+		// Tests run in a renderer that IS node-enabled. Wo we will encounter imports for node-modules which isn't
+		// supported by blink/chromium. To work around this, we generate an import map that maps all node modules
+		// to a blob that exports all properties of the module as named exports and the module itself as default.
+
+		function asRequireBlobUri(name) {
+			let _mod;
+			try {
+				_mod = require(name);
+
+			} catch (err) {
+				// These are somewhat expected because of platform differences (windows vs mac vs linux) or because of node/electron binary differences
+				// console.error(`[ESM] Failed to require ${name}`);
+				// console.error(err);
+				return undefined;
+			}
+
+			// export all properties and the module itself as default
+			let jsSrc = `const _mod = require('${name}')\n`;
+			for (const name of Object.keys(_mod)) {
+				jsSrc += `export const ${name} = _mod['${name}'];\n`;
+			}
+			jsSrc += `export default _mod;\n`;
+
+			const blob = new Blob([jsSrc], { type: 'application/javascript' });
+			const url = URL.createObjectURL(blob);
+			return url;
+		}
+
+		// generate import map
+		const importMap = {
+			imports: {
+				assert: new URL('../test/unit/assert-esm.js', baseUrl).href,
+				sinon: new URL('../node_modules/sinon/pkg/sinon-esm.js', baseUrl).href,
+				'sinon-test': new URL('../node_modules/sinon-test/dist/sinon-test-es.js', baseUrl).href,
+				'electron': asRequireBlobUri('electron'),
+			}
+		};
+
+		const builtin = require('module').builtinModules.filter(mod => !mod.startsWith('_') && !mod.startsWith('electron/js2c/')).sort();
+		const dependencies = Object.keys(require('../../../package.json').dependencies).sort();
+		const optionalDependencies = Object.keys(require('../../../package.json').optionalDependencies).sort();
+		const dependenciesRemote = Object.keys(require('../../../remote/package.json').dependencies).sort();
+
+		for (const name of new Set([].concat(builtin, dependencies, optionalDependencies, dependenciesRemote))) {
+			const url = asRequireBlobUri(name);
+			if(!url) {
+				continue;
+			}
+
+			importMap.imports[name] = url;
+		}
+
+		//2: CSS modules
+		const style = document.createElement('style');
+		style.type = 'text/css';
+		document.head.appendChild(style);
+
+		globalThis._VSCODE_CSS_LOAD = function (url) {
+			style.sheet.insertRule(`@import url(${url});`);
+		};
+
+		const { promisify } = require('util');
+		globalThis._VSCODE_TEST_INIT = promisify(require('glob'))('**/*.css', { cwd: basePath }).then(cssModules => {
+			for (const cssModule of cssModules) {
+				const cssUrl = new URL(cssModule, baseUrl).href;
+				const jsSrc = `globalThis._VSCODE_CSS_LOAD('${cssUrl}');\n`;
+				const blob = new Blob([jsSrc], { type: 'application/javascript' });
+				importMap.imports[cssUrl] = URL.createObjectURL(blob);
+			}
+
+		}).then(() => {
+			const rawImportMap = JSON.stringify(importMap, undefined, 2);
+			const importMapScript = document.createElement('script');
+			importMapScript.type = 'importmap';
+			importMapScript.textContent = rawImportMap;
+			document.head.append(importMapScript);
+		});
+	</script>
+	<script src="./renderer.js"></script>
 </body>
 
 </html>
diff --git a/test/unit/electron/renderer.js b/test/unit/electron/renderer.js
index 8aa50a2b008..b748ae39ee6 100644
--- a/test/unit/electron/renderer.js
+++ b/test/unit/electron/renderer.js
@@ -6,18 +6,17 @@
 /*eslint-env mocha*/
 
 const fs = require('fs');
-const inspector = require('inspector');
 
 (function () {
 	const originals = {};
 	let logging = false;
 	let withStacks = false;
 
-	self.beginLoggingFS = (_withStacks) => {
+	globalThis.beginLoggingFS = (_withStacks) => {
 		logging = true;
 		withStacks = _withStacks || false;
 	};
-	self.endLoggingFS = () => {
+	globalThis.endLoggingFS = () => {
 		logging = false;
 		withStacks = false;
 	};
@@ -66,25 +65,20 @@ const assert = require('assert');
 const path = require('path');
 const glob = require('glob');
 const util = require('util');
-const bootstrap = require('../../../src/bootstrap');
 const coverage = require('../coverage');
-const { takeSnapshotAndCountClasses } = require('../analyzeSnapshot');
+const { pathToFileURL } = require('url');
 
 // Disabled custom inspect. See #38847
 if (util.inspect && util.inspect['defaultOptions']) {
 	util.inspect['defaultOptions'].customInspect = false;
 }
 
-// VSCODE_GLOBALS: node_modules
-globalThis._VSCODE_NODE_MODULES = new Proxy(Object.create(null), { get: (_target, mod) => (require.__$__nodeRequire ?? require)(String(mod)) });
-
 // VSCODE_GLOBALS: package/product.json
-globalThis._VSCODE_PRODUCT_JSON = (require.__$__nodeRequire ?? require)('../../../product.json');
-globalThis._VSCODE_PACKAGE_JSON = (require.__$__nodeRequire ?? require)('../../../package.json');
+globalThis._VSCODE_PRODUCT_JSON = require('../../../product.json');
+globalThis._VSCODE_PACKAGE_JSON = require('../../../package.json');
 
 // Test file operations that are common across platforms. Used for test infra, namely snapshot tests
 Object.assign(globalThis, {
-	__analyzeSnapshotInTests: takeSnapshotAndCountClasses,
 	__readFileInTests: path => fs.promises.readFile(path, 'utf-8'),
 	__writeFileInTests: (path, contents) => fs.promises.writeFile(path, contents),
 	__readDirInTests: path => fs.promises.readdir(path),
@@ -95,36 +89,50 @@ Object.assign(globalThis, {
 const IS_CI = !!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY;
 const _tests_glob = '**/test/**/*.test.js';
 let loader;
+const _loaderErrors = [];
 let _out;
 
+function initNls(opts) {
+	if (opts.build) {
+		// when running from `out-build`, ensure to load the default
+		// messages file, because all `nls.localize` calls have their
+		// english values removed and replaced by an index.
+		globalThis._VSCODE_NLS_MESSAGES = require(`../../../out-build/nls.messages.json`);
+	}
+}
+
 function initLoader(opts) {
 	const outdir = opts.build ? 'out-build' : 'out';
 	_out = path.join(__dirname, `../../../${outdir}`);
 
-	// setup loader
-	loader = require(`${_out}/vs/loader`);
-	const loaderConfig = {
-		nodeRequire: require,
-		catchError: true,
-		baseUrl: bootstrap.fileUriFromPath(path.join(__dirname, '../../../src'), { isWindows: process.platform === 'win32' }),
-		paths: {
-			'vs': `../${outdir}/vs`,
-			'lib': `../${outdir}/lib`,
-			'bootstrap-fork': `../${outdir}/bootstrap-fork`
-		}
-	};
+	const baseUrl = pathToFileURL(path.join(__dirname, `../../../${outdir}/`));
+	globalThis._VSCODE_FILE_ROOT = baseUrl.href;
 
-	if (opts.coverage) {
-		// initialize coverage if requested
-		coverage.initialize(loaderConfig);
+	// set loader
+	/**
+	 * @param {string[]} modules
+	 * @param {(...args:any[]) => void} callback
+	 */
+	function esmRequire(modules, callback, errorback) {
+		const tasks = modules.map(mod => {
+			const url = new URL(`./${mod}.js`, baseUrl).href;
+			return import(url).catch(err => {
+				console.log(mod, url);
+				console.log(err);
+				_loaderErrors.push(err);
+				throw err;
+			});
+		});
+
+		Promise.all(tasks).then(modules => callback(...modules)).catch(errorback);
 	}
 
-	loader.require.config(loaderConfig);
+	loader = { require: esmRequire };
 }
 
 function createCoverageReport(opts) {
 	if (opts.coverage) {
-		return coverage.createReport(opts.run || opts.runGlob, opts.coveragePath, opts.coverageFormats);
+		return coverage.createReport(opts.run || opts.runGlob);
 	}
 	return Promise.resolve(undefined);
 }
@@ -149,9 +157,8 @@ function loadTestModules(opts) {
 	if (opts.run) {
 		const files = Array.isArray(opts.run) ? opts.run : [opts.run];
 		const modules = files.map(file => {
-			file = file.replace(/^src/, 'out');
-			file = file.replace(/\.ts$/, '.js');
-			return path.relative(_out, file).replace(/\.js$/, '');
+			file = file.replace(/^src[\\/]/, '');
+			return file.replace(/\.[jt]s$/, '');
 		});
 		return loadModules(modules);
 	}
@@ -203,13 +210,17 @@ async function loadTests(opts) {
 		'throw ListenerLeakError'
 	]);
 
+	const _allowedSuitesWithOutput = new Set([
+		'InteractiveChatController'
+	]);
+
 	let _testsWithUnexpectedOutput = false;
 
 	for (const consoleFn of [console.log, console.error, console.info, console.warn, console.trace, console.debug]) {
 		console[consoleFn.name] = function (msg) {
 			if (!currentTest) {
 				consoleFn.apply(console, arguments);
-			} else if (!_allowedTestOutput.some(a => a.test(msg)) && !_allowedTestsWithOutput.has(currentTest.title)) {
+			} else if (!_allowedTestOutput.some(a => a.test(msg)) && !_allowedTestsWithOutput.has(currentTest.title) && !_allowedSuitesWithOutput.has(currentTest.parent?.title)) {
 				_testsWithUnexpectedOutput = true;
 				consoleFn.apply(console, arguments);
 			}
@@ -221,7 +232,6 @@ async function loadTests(opts) {
 	//#region Unexpected / Loader Errors
 
 	const _unexpectedErrors = [];
-	const _loaderErrors = [];
 
 	const _allowedTestsWithUnhandledRejections = new Set([
 		// Lifecycle tests
@@ -232,13 +242,6 @@ async function loadTests(opts) {
 		'Search Model: Search reports timed telemetry on search when error is called'
 	]);
 
-	loader.require.config({
-		onError(err) {
-			_loaderErrors.push(err);
-			console.error(err);
-		}
-	});
-
 	loader.require(['vs/base/common/errors'], function (errors) {
 
 		const onUnexpectedError = function (err) {
@@ -433,16 +436,21 @@ function runTests(opts) {
 	});
 }
 
-ipcRenderer.on('run', (e, opts) => {
+ipcRenderer.on('run', async (_e, opts) => {
+	initNls(opts);
 	initLoader(opts);
-	runTests(opts).catch(err => {
+
+	await Promise.resolve(globalThis._VSCODE_TEST_INIT);
+
+	try {
+		await runTests(opts);
+	} catch (err) {
 		if (typeof err !== 'string') {
 			err = JSON.stringify(err);
 		}
-
 		console.error(err);
 		ipcRenderer.send('error', err);
-	});
+	}
 });
 
 class PerTestCoverage {
diff --git a/test/unit/node/index.js b/test/unit/node/index.mjs
similarity index 70%
rename from test/unit/node/index.js
rename to test/unit/node/index.mjs
index e876bd1e007..055272d5731 100644
--- a/test/unit/node/index.js
+++ b/test/unit/node/index.mjs
@@ -8,15 +8,17 @@
 
 process.env.MOCHA_COLORS = '1'; // Force colors (note that this must come before any mocha imports)
 
-const assert = require('assert');
-const Mocha = require('mocha');
-const path = require('path');
-const fs = require('fs');
-const glob = require('glob');
-const minimatch = require('minimatch');
-const coverage = require('../coverage');
-const minimist = require('minimist');
-const { takeSnapshotAndCountClasses } = require('../analyzeSnapshot');
+import * as assert from 'assert';
+import Mocha from 'mocha';
+import * as path from 'path';
+import * as fs from 'fs';
+import glob from 'glob';
+import minimatch from 'minimatch';
+// const coverage = require('../coverage');
+import minimist from 'minimist';
+// const { takeSnapshotAndCountClasses } = require('../analyzeSnapshot');
+import * as module from 'module';
+import { fileURLToPath, pathToFileURL } from 'url';
 
 /**
  * @type {{ build: boolean; run: string; runGlob: string; coverage: boolean; help: boolean; coverageFormats: string | string[]; coveragePath: string; }}
@@ -56,19 +58,19 @@ Options:
 const TEST_GLOB = '**/test/**/*.test.js';
 
 const excludeGlobs = [
-	'**/{browser,electron-sandbox,electron-main}/**/*.test.js',
+	'**/{browser,electron-sandbox,electron-main,electron-utility}/**/*.test.js',
 	'**/vs/platform/environment/test/node/nativeModules.test.js', // native modules are compiled against Electron and this test would fail with node.js
 	'**/vs/base/parts/storage/test/node/storage.test.js', // same as above, due to direct dependency to sqlite native module
 	'**/vs/workbench/contrib/testing/test/**' // flaky (https://github.com/microsoft/vscode/issues/137853)
 ];
 
-const REPO_ROOT = path.join(__dirname, '../../../');
+const REPO_ROOT = fileURLToPath(new URL('../../../', import.meta.url));
 const out = args.build ? 'out-build' : 'out';
-const loader = require(`../../../${out}/vs/loader`);
 const src = path.join(REPO_ROOT, out);
+const baseUrl = pathToFileURL(src);
 
 //@ts-ignore
-const majorRequiredNodeVersion = `v${/^target\s+"([^"]+)"$/m.exec(fs.readFileSync(path.join(REPO_ROOT, 'remote', '.yarnrc'), 'utf8'))[1]}`.substring(0, 3);
+const majorRequiredNodeVersion = `v${/^target="(.*)"$/m.exec(fs.readFileSync(path.join(REPO_ROOT, 'remote', '.npmrc'), 'utf8'))[1]}`.substring(0, 3);
 const currentMajorNodeVersion = process.version.substring(0, 3);
 if (majorRequiredNodeVersion !== currentMajorNodeVersion) {
 	console.error(`node.js unit tests require a major node.js version of ${majorRequiredNodeVersion} (your version is: ${currentMajorNodeVersion})`);
@@ -77,16 +79,24 @@ if (majorRequiredNodeVersion !== currentMajorNodeVersion) {
 
 function main() {
 
-	// VSCODE_GLOBALS: node_modules
-	globalThis._VSCODE_NODE_MODULES = new Proxy(Object.create(null), { get: (_target, mod) => require(String(mod)) });
-
 	// VSCODE_GLOBALS: package/product.json
-	globalThis._VSCODE_PRODUCT_JSON = require(`${REPO_ROOT}/product.json`);
-	globalThis._VSCODE_PACKAGE_JSON = require(`${REPO_ROOT}/package.json`);
+	const _require = module.createRequire(import.meta.url);
+	globalThis._VSCODE_PRODUCT_JSON = _require(`${REPO_ROOT}/product.json`);
+	globalThis._VSCODE_PACKAGE_JSON = _require(`${REPO_ROOT}/package.json`);
+
+	// VSCODE_GLOBALS: file root
+	globalThis._VSCODE_FILE_ROOT = baseUrl.href;
+
+	if (args.build) {
+		// when running from `out-build`, ensure to load the default
+		// messages file, because all `nls.localize` calls have their
+		// english values removed and replaced by an index.
+		globalThis._VSCODE_NLS_MESSAGES = _require(`${REPO_ROOT}/${out}/nls.messages.json`);
+	}
 
 	// Test file operations that are common across platforms. Used for test infra, namely snapshot tests
 	Object.assign(globalThis, {
-		__analyzeSnapshotInTests: takeSnapshotAndCountClasses,
+		// __analyzeSnapshotInTests: takeSnapshotAndCountClasses,
 		__readFileInTests: (/** @type {string} */ path) => fs.promises.readFile(path, 'utf-8'),
 		__writeFileInTests: (/** @type {string} */ path, /** @type {BufferEncoding} */ contents) => fs.promises.writeFile(path, contents),
 		__readDirInTests: (/** @type {string} */ path) => fs.promises.readdir(path),
@@ -99,55 +109,27 @@ function main() {
 	});
 
 	/**
-	 * @param {string} path
-	 * @param {{ isWindows?: boolean, scheme?: string, fallbackAuthority?: string }} config
-	 * @returns {string}
+	 * @param modules
+	 * @param onLoad
+	 * @param onError
 	 */
-	function fileUriFromPath(path, config) {
+	const loader = function (modules, onLoad, onError) {
 
-		// Since we are building a URI, we normalize any backslash
-		// to slashes and we ensure that the path begins with a '/'.
-		let pathName = path.replace(/\\/g, '/');
-		if (pathName.length > 0 && pathName.charAt(0) !== '/') {
-			pathName = `/${pathName}`;
-		}
+		modules = modules.filter(mod => {
+			if (mod.endsWith('css.build.test')) {
+				// AMD ONLY, ignore for ESM
+				return false;
+			}
+			return true;
+		});
 
-		/** @type {string} */
-		let uri;
-
-		// Windows: in order to support UNC paths (which start with '//')
-		// that have their own authority, we do not use the provided authority
-		// but rather preserve it.
-		if (config.isWindows && pathName.startsWith('//')) {
-			uri = encodeURI(`${config.scheme || 'file'}:${pathName}`);
-		}
-
-		// Otherwise we optionally add the provided authority if specified
-		else {
-			uri = encodeURI(`${config.scheme || 'file'}://${config.fallbackAuthority || ''}${pathName}`);
-		}
-
-		return uri.replace(/#/g, '%23');
-	}
-
-	const loaderConfig = {
-		nodeRequire: require,
-		baseUrl: fileUriFromPath(src, { isWindows: process.platform === 'win32' }),
-		catchError: true
+		const loads = modules.map(mod => import(`${baseUrl}/${mod}.js`).catch(err => {
+			console.error(`FAILED to load ${mod} as ${baseUrl}/${mod}.js`);
+			throw err;
+		}));
+		Promise.all(loads).then(onLoad, onError);
 	};
 
-	if (args.coverage) {
-		coverage.initialize(loaderConfig);
-
-		process.on('exit', function (code) {
-			if (code !== 0) {
-				return;
-			}
-			coverage.createReport(args.run || args.runGlob, args.coveragePath, args.coverageFormats);
-		});
-	}
-
-	loader.config(loaderConfig);
 
 	let didErr = false;
 	const write = process.stderr.write;
@@ -162,7 +144,7 @@ function main() {
 	});
 
 	/**
-	 * @param {string[]} modules
+	 * @param modules
 	 */
 	async function loadModules(modules) {
 		for (const file of modules) {
@@ -178,7 +160,7 @@ function main() {
 
 	if (args.runGlob) {
 		loadFunc = (cb) => {
-			const doRun = /** @param {string[]} tests */(tests) => {
+			const doRun = /** @param tests */(tests) => {
 				const modulesToLoad = tests.map(test => {
 					if (path.isAbsolute(test)) {
 						test = path.relative(src, path.resolve(test));
@@ -249,7 +231,7 @@ function main() {
 		});
 
 		// replace the default unexpected error handler to be useful during tests
-		loader(['vs/base/common/errors'], function (errors) {
+		import(`${baseUrl}/vs/base/common/errors.js`).then(errors => {
 			errors.setUnexpectedErrorHandler(function (err) {
 				const stack = (err && err.stack) || (new Error().stack);
 				unexpectedErrors.push((err && err.message ? err.message : err) + '\n' + stack);
diff --git a/yarn.lock b/yarn.lock
deleted file mode 100644
index fa5f0a1f2bd..00000000000
--- a/yarn.lock
+++ /dev/null
@@ -1,10935 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@ampproject/remapping@^2.1.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d"
-  integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==
-  dependencies:
-    "@jridgewell/gen-mapping" "^0.1.0"
-    "@jridgewell/trace-mapping" "^0.3.9"
-
-"@azure-rest/ai-translation-text@^1.0.0-beta.1":
-  version "1.0.0-beta.1"
-  resolved "https://registry.yarnpkg.com/@azure-rest/ai-translation-text/-/ai-translation-text-1.0.0-beta.1.tgz#bf61811d0a3fc7e689e91b5a5452d0128e270b67"
-  integrity sha512-h1xDrmVRbk6eAAqTHxy9Npv543cWteqgop15sVXBQhadOwzHoREn+UqMCzNfvL6/AjiInUlwNSaNQK1ANgobLA==
-  dependencies:
-    "@azure-rest/core-client" "^1.1.0"
-    "@azure/core-auth" "^1.3.0"
-    "@azure/core-rest-pipeline" "^1.8.0"
-    "@azure/logger" "^1.0.0"
-    tslib "^2.2.0"
-
-"@azure-rest/core-client@^1.1.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@azure-rest/core-client/-/core-client-1.4.0.tgz#3be28c02c6c20e49dea73a7f012daeeda4eacb8e"
-  integrity sha512-ozTDPBVUDR5eOnMIwhggbnVmOrka4fXCs8n8mvUo4WLLc38kki6bAOByDoVZZPz/pZy2jMt2kwfpvy/UjALj6w==
-  dependencies:
-    "@azure/abort-controller" "^2.0.0"
-    "@azure/core-auth" "^1.3.0"
-    "@azure/core-rest-pipeline" "^1.5.0"
-    "@azure/core-tracing" "^1.0.1"
-    "@azure/core-util" "^1.0.0"
-    tslib "^2.6.2"
-
-"@azure/abort-controller@^1.0.0":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@azure/abort-controller/-/abort-controller-1.0.4.tgz#fd3c4d46c8ed67aace42498c8e2270960250eafd"
-  integrity sha512-lNUmDRVGpanCsiUN3NWxFTdwmdFI53xwhkTFfHDGTYk46ca7Ind3nanJc+U6Zj9Tv+9nTCWRBscWEW1DyKOpTw==
-  dependencies:
-    tslib "^2.0.0"
-
-"@azure/abort-controller@^2.0.0":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/@azure/abort-controller/-/abort-controller-2.1.2.tgz#42fe0ccab23841d9905812c58f1082d27784566d"
-  integrity sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==
-  dependencies:
-    tslib "^2.6.2"
-
-"@azure/core-asynciterator-polyfill@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@azure/core-asynciterator-polyfill/-/core-asynciterator-polyfill-1.0.0.tgz#dcccebb88406e5c76e0e1d52e8cc4c43a68b3ee7"
-  integrity sha512-kmv8CGrPfN9SwMwrkiBK9VTQYxdFQEGe0BmQk+M8io56P9KNzpAxcWE/1fxJj7uouwN4kXF0BHW8DNlgx+wtCg==
-
-"@azure/core-auth@^1.3.0":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@azure/core-auth/-/core-auth-1.3.2.tgz#6a2c248576c26df365f6c7881ca04b7f6d08e3d0"
-  integrity sha512-7CU6DmCHIZp5ZPiZ9r3J17lTKMmYsm/zGvNkjArQwPkrLlZ1TZ+EUYfGgh2X31OLMVAQCTJZW4cXHJi02EbJnA==
-  dependencies:
-    "@azure/abort-controller" "^1.0.0"
-    tslib "^2.2.0"
-
-"@azure/core-auth@^1.4.0":
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/@azure/core-auth/-/core-auth-1.7.2.tgz#558b7cb7dd12b00beec07ae5df5907d74df1ebd9"
-  integrity sha512-Igm/S3fDYmnMq1uKS38Ae1/m37B3zigdlZw+kocwEhh5GjyKjPrXKO2J6rzpC1wAxrNil/jX9BJRqBshyjnF3g==
-  dependencies:
-    "@azure/abort-controller" "^2.0.0"
-    "@azure/core-util" "^1.1.0"
-    tslib "^2.6.2"
-
-"@azure/core-http@^2.0.0":
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/@azure/core-http/-/core-http-2.2.2.tgz#573798f087d808d39aa71fd7c52b8d7b89f440da"
-  integrity sha512-V1DdoO9V/sFimKpdWoNBgsE+QUjQgpXYnxrTdUp5RyhsTJjvEVn/HKmTQXIHuLUUo6IyIWj+B+Dg4VaXse9dIA==
-  dependencies:
-    "@azure/abort-controller" "^1.0.0"
-    "@azure/core-asynciterator-polyfill" "^1.0.0"
-    "@azure/core-auth" "^1.3.0"
-    "@azure/core-tracing" "1.0.0-preview.13"
-    "@azure/logger" "^1.0.0"
-    "@types/node-fetch" "^2.5.0"
-    "@types/tunnel" "^0.0.3"
-    form-data "^4.0.0"
-    node-fetch "^2.6.0"
-    process "^0.11.10"
-    tough-cookie "^4.0.0"
-    tslib "^2.2.0"
-    tunnel "^0.0.6"
-    uuid "^8.3.0"
-    xml2js "^0.4.19"
-
-"@azure/core-lro@^2.2.0":
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/@azure/core-lro/-/core-lro-2.2.1.tgz#5527b41037c658d3aefc19d68633e51e53d6e6a3"
-  integrity sha512-HE6PBl+mlKa0eBsLwusHqAqjLc5n9ByxeDo3Hz4kF3B1hqHvRkBr4oMgoT6tX7Hc3q97KfDctDUon7EhvoeHPA==
-  dependencies:
-    "@azure/abort-controller" "^1.0.0"
-    "@azure/core-tracing" "1.0.0-preview.13"
-    "@azure/logger" "^1.0.0"
-    tslib "^2.2.0"
-
-"@azure/core-paging@^1.1.1":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@azure/core-paging/-/core-paging-1.2.0.tgz#3754da429e8687bdc3613c750e79a564582e802b"
-  integrity sha512-ZX1bCjm/MjKPCN6kQD/9GJErYSoKA8YWp6YWoo5EIzcTWlSBLXu3gNaBTUl8usGl+UShiKo7b4Gdy1NSTIlpZg==
-  dependencies:
-    "@azure/core-asynciterator-polyfill" "^1.0.0"
-    tslib "^2.2.0"
-
-"@azure/core-rest-pipeline@^1.5.0", "@azure/core-rest-pipeline@^1.8.0":
-  version "1.16.0"
-  resolved "https://registry.yarnpkg.com/@azure/core-rest-pipeline/-/core-rest-pipeline-1.16.0.tgz#631172e2fe0346cf4410d1c8e01ad98d849738e2"
-  integrity sha512-CeuTvsXxCUmEuxH5g/aceuSl6w2EugvNHKAtKKVdiX915EjJJxAwfzNNWZreNnbxHZ2fi0zaM6wwS23x2JVqSQ==
-  dependencies:
-    "@azure/abort-controller" "^2.0.0"
-    "@azure/core-auth" "^1.4.0"
-    "@azure/core-tracing" "^1.0.1"
-    "@azure/core-util" "^1.9.0"
-    "@azure/logger" "^1.0.0"
-    http-proxy-agent "^7.0.0"
-    https-proxy-agent "^7.0.0"
-    tslib "^2.6.2"
-
-"@azure/core-tracing@1.0.0-preview.13":
-  version "1.0.0-preview.13"
-  resolved "https://registry.yarnpkg.com/@azure/core-tracing/-/core-tracing-1.0.0-preview.13.tgz#55883d40ae2042f6f1e12b17dd0c0d34c536d644"
-  integrity sha512-KxDlhXyMlh2Jhj2ykX6vNEU0Vou4nHr025KoSEiz7cS3BNiHNaZcdECk/DmLkEB0as5T7b/TpRcehJ5yV6NeXQ==
-  dependencies:
-    "@opentelemetry/api" "^1.0.1"
-    tslib "^2.2.0"
-
-"@azure/core-tracing@^1.0.1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@azure/core-tracing/-/core-tracing-1.1.2.tgz#065dab4e093fb61899988a1cdbc827d9ad90b4ee"
-  integrity sha512-dawW9ifvWAWmUm9/h+/UQ2jrdvjCJ7VJEuCJ6XVNudzcOwm53BFZH4Q845vjfgoUAM8ZxokvVNxNxAITc502YA==
-  dependencies:
-    tslib "^2.6.2"
-
-"@azure/core-util@^1.0.0", "@azure/core-util@^1.1.0", "@azure/core-util@^1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@azure/core-util/-/core-util-1.9.0.tgz#469afd7e6452d5388b189f90d33f7756b0b210d1"
-  integrity sha512-AfalUQ1ZppaKuxPPMsFEUdX6GZPB3d9paR9d/TTL7Ow2De8cJaC7ibi7kWVlFAVPCYo31OcnGymc0R89DX8Oaw==
-  dependencies:
-    "@azure/abort-controller" "^2.0.0"
-    tslib "^2.6.2"
-
-"@azure/logger@^1.0.0":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@azure/logger/-/logger-1.0.3.tgz#6e36704aa51be7d4a1bae24731ea580836293c96"
-  integrity sha512-aK4s3Xxjrx3daZr3VylxejK3vG5ExXck5WOHDJ8in/k9AqlfIyFMMT1uG7u8mNjX+QRILTIn0/Xgschfh/dQ9g==
-  dependencies:
-    tslib "^2.2.0"
-
-"@azure/storage-blob@^12.8.0":
-  version "12.8.0"
-  resolved "https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.8.0.tgz#97b7ecc6c7b17bcbaf0281c79c16af6f512d6130"
-  integrity sha512-c8+Wz19xauW0bGkTCoqZH4dYfbtBniPiGiRQOn1ca6G5jsjr4azwaTk9gwjVY8r3vY2Taf95eivLzipfIfiS4A==
-  dependencies:
-    "@azure/abort-controller" "^1.0.0"
-    "@azure/core-http" "^2.0.0"
-    "@azure/core-lro" "^2.2.0"
-    "@azure/core-paging" "^1.1.1"
-    "@azure/core-tracing" "1.0.0-preview.13"
-    "@azure/logger" "^1.0.0"
-    events "^3.0.0"
-    tslib "^2.2.0"
-
-"@babel/code-frame@^7.0.0":
-  version "7.12.11"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
-  integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
-  dependencies:
-    "@babel/highlight" "^7.10.4"
-
-"@babel/code-frame@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
-  integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
-  dependencies:
-    "@babel/highlight" "^7.18.6"
-
-"@babel/code-frame@^7.22.13":
-  version "7.22.13"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.13.tgz#e3c1c099402598483b7a8c46a721d1038803755e"
-  integrity sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==
-  dependencies:
-    "@babel/highlight" "^7.22.13"
-    chalk "^2.4.2"
-
-"@babel/compat-data@^7.18.8":
-  version "7.18.8"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.18.8.tgz#2483f565faca607b8535590e84e7de323f27764d"
-  integrity sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ==
-
-"@babel/core@^7.12.3":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.10.tgz#39ad504991d77f1f3da91be0b8b949a5bc466fb8"
-  integrity sha512-JQM6k6ENcBFKVtWvLavlvi/mPcpYZ3+R+2EySDEMSMbp7Mn4FexlbbJVrx2R7Ijhr01T8gyqrOaABWIOgxeUyw==
-  dependencies:
-    "@ampproject/remapping" "^2.1.0"
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.18.10"
-    "@babel/helper-compilation-targets" "^7.18.9"
-    "@babel/helper-module-transforms" "^7.18.9"
-    "@babel/helpers" "^7.18.9"
-    "@babel/parser" "^7.18.10"
-    "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.18.10"
-    "@babel/types" "^7.18.10"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.2"
-    json5 "^2.2.1"
-    semver "^6.3.0"
-
-"@babel/generator@^7.18.10":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.10.tgz#794f328bfabdcbaf0ebf9bf91b5b57b61fa77a2a"
-  integrity sha512-0+sW7e3HjQbiHbj1NeU/vN8ornohYlacAfZIaXhdoGweQqgcNy69COVciYYqEXJ/v+9OBA7Frxm4CVAuNqKeNA==
-  dependencies:
-    "@babel/types" "^7.18.10"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    jsesc "^2.5.1"
-
-"@babel/generator@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.0.tgz#df5c386e2218be505b34837acbcb874d7a983420"
-  integrity sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==
-  dependencies:
-    "@babel/types" "^7.23.0"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    "@jridgewell/trace-mapping" "^0.3.17"
-    jsesc "^2.5.1"
-
-"@babel/helper-compilation-targets@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz#69e64f57b524cde3e5ff6cc5a9f4a387ee5563bf"
-  integrity sha512-tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg==
-  dependencies:
-    "@babel/compat-data" "^7.18.8"
-    "@babel/helper-validator-option" "^7.18.6"
-    browserslist "^4.20.2"
-    semver "^6.3.0"
-
-"@babel/helper-environment-visitor@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be"
-  integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==
-
-"@babel/helper-environment-visitor@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
-  integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
-
-"@babel/helper-function-name@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759"
-  integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==
-  dependencies:
-    "@babel/template" "^7.22.15"
-    "@babel/types" "^7.23.0"
-
-"@babel/helper-hoist-variables@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
-  integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==
-  dependencies:
-    "@babel/types" "^7.22.5"
-
-"@babel/helper-module-imports@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e"
-  integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
-"@babel/helper-module-transforms@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz#5a1079c005135ed627442df31a42887e80fcb712"
-  integrity sha512-KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-simple-access" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/helper-validator-identifier" "^7.18.6"
-    "@babel/template" "^7.18.6"
-    "@babel/traverse" "^7.18.9"
-    "@babel/types" "^7.18.9"
-
-"@babel/helper-simple-access@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz#d6d8f51f4ac2978068df934b569f08f29788c7ea"
-  integrity sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
-"@babel/helper-split-export-declaration@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075"
-  integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
-"@babel/helper-split-export-declaration@^7.22.6":
-  version "7.22.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
-  integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
-  dependencies:
-    "@babel/types" "^7.22.5"
-
-"@babel/helper-string-parser@^7.18.10":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz#181f22d28ebe1b3857fa575f5c290b1aaf659b56"
-  integrity sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==
-
-"@babel/helper-string-parser@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
-  integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
-
-"@babel/helper-validator-identifier@^7.10.4":
-  version "7.12.11"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
-  integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==
-
-"@babel/helper-validator-identifier@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz#9c97e30d31b2b8c72a1d08984f2ca9b574d7a076"
-  integrity sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==
-
-"@babel/helper-validator-identifier@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
-  integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
-
-"@babel/helper-validator-option@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8"
-  integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==
-
-"@babel/helpers@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.18.9.tgz#4bef3b893f253a1eced04516824ede94dcfe7ff9"
-  integrity sha512-Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ==
-  dependencies:
-    "@babel/template" "^7.18.6"
-    "@babel/traverse" "^7.18.9"
-    "@babel/types" "^7.18.9"
-
-"@babel/highlight@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143"
-  integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.10.4"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
-
-"@babel/highlight@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
-  integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.18.6"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
-
-"@babel/highlight@^7.22.13":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.20.tgz#4ca92b71d80554b01427815e06f2df965b9c1f54"
-  integrity sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.22.20"
-    chalk "^2.4.2"
-    js-tokens "^4.0.0"
-
-"@babel/parser@^7.14.7", "@babel/parser@^7.18.10":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.10.tgz#94b5f8522356e69e8277276adf67ed280c90ecc1"
-  integrity sha512-TYk3OA0HKL6qNryUayb5UUEhM/rkOQozIBEA5ITXh5DWrSp0TlUQXMyZmnWxG/DizSWBeeQ0Zbc5z8UGaaqoeg==
-
-"@babel/parser@^7.22.15", "@babel/parser@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719"
-  integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==
-
-"@babel/template@^7.18.10", "@babel/template@^7.18.6":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71"
-  integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==
-  dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/parser" "^7.18.10"
-    "@babel/types" "^7.18.10"
-
-"@babel/template@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38"
-  integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==
-  dependencies:
-    "@babel/code-frame" "^7.22.13"
-    "@babel/parser" "^7.22.15"
-    "@babel/types" "^7.22.15"
-
-"@babel/traverse@^7.18.10", "@babel/traverse@^7.18.9":
-  version "7.23.2"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8"
-  integrity sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==
-  dependencies:
-    "@babel/code-frame" "^7.22.13"
-    "@babel/generator" "^7.23.0"
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-function-name" "^7.23.0"
-    "@babel/helper-hoist-variables" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/parser" "^7.23.0"
-    "@babel/types" "^7.23.0"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.10.tgz#4908e81b6b339ca7c6b7a555a5fc29446f26dde6"
-  integrity sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ==
-  dependencies:
-    "@babel/helper-string-parser" "^7.18.10"
-    "@babel/helper-validator-identifier" "^7.18.6"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb"
-  integrity sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==
-  dependencies:
-    "@babel/helper-string-parser" "^7.22.5"
-    "@babel/helper-validator-identifier" "^7.22.20"
-    to-fast-properties "^2.0.0"
-
-"@bcoe/v8-coverage@^0.2.3":
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
-  integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
-
-"@cspotcode/source-map-support@^0.8.0":
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
-  integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==
-  dependencies:
-    "@jridgewell/trace-mapping" "0.3.9"
-
-"@csstools/selector-specificity@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-3.0.1.tgz#d84597fbc0f897240c12fc0a31e492b036c70e40"
-  integrity sha512-NPljRHkq4a14YzZ3YD406uaxh7s0g6eAq3L9aLOWywoqe8PkYamAvtsh7KNX6c++ihDrJ0RiU+/z7rGnhlZ5ww==
-
-"@discoveryjs/json-ext@^0.5.0":
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz#90420f9f9c6d3987f176a19a7d8e764271a2f55d"
-  integrity sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g==
-
-"@electron/get@^2.0.0", "@electron/get@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@electron/get/-/get-2.0.2.tgz#ae2a967b22075e9c25aaf00d5941cd79c21efd7e"
-  integrity sha512-eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g==
-  dependencies:
-    debug "^4.1.1"
-    env-paths "^2.2.0"
-    fs-extra "^8.1.0"
-    got "^11.8.5"
-    progress "^2.0.3"
-    semver "^6.2.0"
-    sumchecker "^3.0.1"
-  optionalDependencies:
-    global-agent "^3.0.0"
-
-"@es-joy/jsdoccomment@~0.40.1":
-  version "0.40.1"
-  resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.40.1.tgz#13acd77fb372ed1c83b7355edd865a3b370c9ec4"
-  integrity sha512-YORCdZSusAlBrFpZ77pJjc5r1bQs5caPWtAu+WWmiSo+8XaUzseapVrfAtiRFbQWnrBxxLLEwF6f6ZG/UgCQCg==
-  dependencies:
-    comment-parser "1.4.0"
-    esquery "^1.5.0"
-    jsdoc-type-pratt-parser "~4.0.0"
-
-"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
-  integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
-  dependencies:
-    eslint-visitor-keys "^3.3.0"
-
-"@eslint-community/regexpp@^4.4.0":
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.4.1.tgz#087cb8d9d757bb22e9c9946c9c0c2bf8806830f1"
-  integrity sha512-BISJ6ZE4xQsuL/FmsyRaiffpq977bMlsKfGHTQrOGFErfByxIe6iZTxPf/00Zon9b9a7iUykfQwejN3s2ZW/Bw==
-
-"@eslint-community/regexpp@^4.5.1":
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63"
-  integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==
-
-"@eslint/eslintrc@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.0.1.tgz#7888fe7ec8f21bc26d646dbd2c11cd776e21192d"
-  integrity sha512-eFRmABvW2E5Ho6f5fHLqgena46rOj7r7OKHYfLElqcBfGFHHpjBhivyi5+jOEQuSpdc/1phIZJlbC2te+tZNIw==
-  dependencies:
-    ajv "^6.12.4"
-    debug "^4.3.2"
-    espree "^9.5.0"
-    globals "^13.19.0"
-    ignore "^5.2.0"
-    import-fresh "^3.2.1"
-    js-yaml "^4.1.0"
-    minimatch "^3.1.2"
-    strip-json-comments "^3.1.1"
-
-"@eslint/js@8.36.0":
-  version "8.36.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.36.0.tgz#9837f768c03a1e4a30bd304a64fb8844f0e72efe"
-  integrity sha512-lxJ9R5ygVm8ZWgYdUweoq5ownDlJ4upvoWmO4eLxBYHdMo+vZ/Rx0EN6MbKWDJOSUGrqJy2Gt+Dyv/VKml0fjg==
-
-"@gulp-sourcemaps/identity-map@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@gulp-sourcemaps/identity-map/-/identity-map-2.0.1.tgz#a6e8b1abec8f790ec6be2b8c500e6e68037c0019"
-  integrity sha512-Tb+nSISZku+eQ4X1lAkevcQa+jknn/OVUgZ3XCxEKIsLsqYuPoJwJOPQeaOk75X3WPftb29GWY1eqE7GLsXb1Q==
-  dependencies:
-    acorn "^6.4.1"
-    normalize-path "^3.0.0"
-    postcss "^7.0.16"
-    source-map "^0.6.0"
-    through2 "^3.0.1"
-
-"@gulp-sourcemaps/map-sources@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz#890ae7c5d8c877f6d384860215ace9d7ec945bda"
-  integrity sha1-iQrnxdjId/bThIYCFazp1+yUW9o=
-  dependencies:
-    normalize-path "^2.0.1"
-    through2 "^2.0.3"
-
-"@humanwhocodes/config-array@^0.11.8":
-  version "0.11.8"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9"
-  integrity sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==
-  dependencies:
-    "@humanwhocodes/object-schema" "^1.2.1"
-    debug "^4.1.1"
-    minimatch "^3.0.5"
-
-"@humanwhocodes/module-importer@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
-  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
-
-"@humanwhocodes/object-schema@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
-  integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
-
-"@isaacs/cliui@^8.0.2":
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
-  integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==
-  dependencies:
-    string-width "^5.1.2"
-    string-width-cjs "npm:string-width@^4.2.0"
-    strip-ansi "^7.0.1"
-    strip-ansi-cjs "npm:strip-ansi@^6.0.1"
-    wrap-ansi "^8.1.0"
-    wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
-
-"@istanbuljs/schema@^0.1.2":
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
-  integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==
-
-"@istanbuljs/schema@^0.1.3":
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
-  integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
-
-"@jridgewell/gen-mapping@^0.1.0":
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996"
-  integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==
-  dependencies:
-    "@jridgewell/set-array" "^1.0.0"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-
-"@jridgewell/gen-mapping@^0.3.2":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
-  integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==
-  dependencies:
-    "@jridgewell/set-array" "^1.0.1"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-    "@jridgewell/trace-mapping" "^0.3.9"
-
-"@jridgewell/gen-mapping@^0.3.5":
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36"
-  integrity sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==
-  dependencies:
-    "@jridgewell/set-array" "^1.2.1"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-    "@jridgewell/trace-mapping" "^0.3.24"
-
-"@jridgewell/resolve-uri@^3.0.3":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
-  integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
-
-"@jridgewell/resolve-uri@^3.1.0":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721"
-  integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==
-
-"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
-  integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
-
-"@jridgewell/set-array@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.2.1.tgz#558fb6472ed16a4c850b889530e6b36438c49280"
-  integrity sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==
-
-"@jridgewell/source-map@^0.3.3":
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.6.tgz#9d71ca886e32502eb9362c9a74a46787c36df81a"
-  integrity sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==
-  dependencies:
-    "@jridgewell/gen-mapping" "^0.3.5"
-    "@jridgewell/trace-mapping" "^0.3.25"
-
-"@jridgewell/sourcemap-codec@^1.4.10":
-  version "1.4.14"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
-  integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
-
-"@jridgewell/sourcemap-codec@^1.4.14":
-  version "1.4.15"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
-  integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
-
-"@jridgewell/trace-mapping@0.3.9":
-  version "0.3.9"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
-  integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
-  dependencies:
-    "@jridgewell/resolve-uri" "^3.0.3"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-
-"@jridgewell/trace-mapping@^0.3.12":
-  version "0.3.22"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.22.tgz#72a621e5de59f5f1ef792d0793a82ee20f645e4c"
-  integrity sha512-Wf963MzWtA2sjrNt+g18IAln9lKnlRp+K2eH4jjIoF1wYeq3aMREpG09xhlhdzS0EjwU7qmUJYangWa+151vZw==
-  dependencies:
-    "@jridgewell/resolve-uri" "^3.1.0"
-    "@jridgewell/sourcemap-codec" "^1.4.14"
-
-"@jridgewell/trace-mapping@^0.3.17":
-  version "0.3.19"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz#f8a3249862f91be48d3127c3cfe992f79b4b8811"
-  integrity sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==
-  dependencies:
-    "@jridgewell/resolve-uri" "^3.1.0"
-    "@jridgewell/sourcemap-codec" "^1.4.14"
-
-"@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
-  version "0.3.25"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0"
-  integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==
-  dependencies:
-    "@jridgewell/resolve-uri" "^3.1.0"
-    "@jridgewell/sourcemap-codec" "^1.4.14"
-
-"@jridgewell/trace-mapping@^0.3.9":
-  version "0.3.14"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz#b231a081d8f66796e475ad588a1ef473112701ed"
-  integrity sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==
-  dependencies:
-    "@jridgewell/resolve-uri" "^3.0.3"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-
-"@koa/cors@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@koa/cors/-/cors-5.0.0.tgz#0029b5f057fa0d0ae0e37dd2c89ece315a0daffd"
-  integrity sha512-x/iUDjcS90W69PryLDIMgFyV21YLTnG9zOpPXS7Bkt2b8AsY3zZsIpOLBkYr9fBcF3HbkKaER5hOBZLfpLgYNw==
-  dependencies:
-    vary "^1.1.2"
-
-"@koa/router@^12.0.1":
-  version "12.0.1"
-  resolved "https://registry.yarnpkg.com/@koa/router/-/router-12.0.1.tgz#1a66f92a630c02832cf5bbf0db06c9e53e423468"
-  integrity sha512-ribfPYfHb+Uw3b27Eiw6NPqjhIhTpVFzEWLwyc/1Xp+DCdwRRyIlAUODX+9bPARF6aQtUu1+/PHzdNvRzcs/+Q==
-  dependencies:
-    debug "^4.3.4"
-    http-errors "^2.0.0"
-    koa-compose "^4.1.0"
-    methods "^1.1.2"
-    path-to-regexp "^6.2.1"
-
-"@microsoft/1ds-core-js@3.2.13", "@microsoft/1ds-core-js@^3.2.13":
-  version "3.2.13"
-  resolved "https://registry.yarnpkg.com/@microsoft/1ds-core-js/-/1ds-core-js-3.2.13.tgz#0c105ed75091bae3f1555c0334704fa9911c58fb"
-  integrity sha512-CluYTRWcEk0ObG5EWFNWhs87e2qchJUn0p2D21ZUa3PWojPZfPSBs4//WIE0MYV8Qg1Hdif2ZTwlM7TbYUjfAg==
-  dependencies:
-    "@microsoft/applicationinsights-core-js" "2.8.15"
-    "@microsoft/applicationinsights-shims" "^2.0.2"
-    "@microsoft/dynamicproto-js" "^1.1.7"
-
-"@microsoft/1ds-post-js@^3.2.13":
-  version "3.2.13"
-  resolved "https://registry.yarnpkg.com/@microsoft/1ds-post-js/-/1ds-post-js-3.2.13.tgz#560aacac8a92fdbb79e8c2ebcb293d56e19f51aa"
-  integrity sha512-HgS574fdD19Bo2vPguyznL4eDw7Pcm1cVNpvbvBLWiW3x4e1FCQ3VMXChWnAxCae8Hb0XqlA2sz332ZobBavTA==
-  dependencies:
-    "@microsoft/1ds-core-js" "3.2.13"
-    "@microsoft/applicationinsights-shims" "^2.0.2"
-    "@microsoft/dynamicproto-js" "^1.1.7"
-
-"@microsoft/applicationinsights-core-js@2.8.15":
-  version "2.8.15"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.15.tgz#8fa466474260e01967fe649f14dd9e5ff91dcdc8"
-  integrity sha512-yYAs9MyjGr2YijQdUSN9mVgT1ijI1FPMgcffpaPmYbHAVbQmF7bXudrBWHxmLzJlwl5rfep+Zgjli2e67lwUqQ==
-  dependencies:
-    "@microsoft/applicationinsights-shims" "2.0.2"
-    "@microsoft/dynamicproto-js" "^1.1.9"
-
-"@microsoft/applicationinsights-shims@2.0.2", "@microsoft/applicationinsights-shims@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-shims/-/applicationinsights-shims-2.0.2.tgz#92b36a09375e2d9cb2b4203383b05772be837085"
-  integrity sha512-PoHEgsnmcqruLNHZ/amACqdJ6YYQpED0KSRe6J7gIJTtpZC1FfFU9b1fmDKDKtFoUSrPzEh1qzO3kmRZP0betg==
-
-"@microsoft/dynamicproto-js@^1.1.7", "@microsoft/dynamicproto-js@^1.1.9":
-  version "1.1.9"
-  resolved "https://registry.yarnpkg.com/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.9.tgz#7437db7aa061162ee94e4131b69a62b8dad5dea6"
-  integrity sha512-n1VPsljTSkthsAFYdiWfC+DKzK2WwcRp83Y1YAqdX552BstvsDjft9YXppjUzp11BPsapDoO1LDgrDB0XVsfNQ==
-
-"@nodelib/fs.scandir@2.1.3":
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
-  integrity sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==
-  dependencies:
-    "@nodelib/fs.stat" "2.0.3"
-    run-parallel "^1.1.9"
-
-"@nodelib/fs.scandir@2.1.5":
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
-  integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
-  dependencies:
-    "@nodelib/fs.stat" "2.0.5"
-    run-parallel "^1.1.9"
-
-"@nodelib/fs.stat@2.0.3", "@nodelib/fs.stat@^2.0.2":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3"
-  integrity sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==
-
-"@nodelib/fs.stat@2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
-  integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
-
-"@nodelib/fs.walk@^1.2.3":
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz#011b9202a70a6366e436ca5c065844528ab04976"
-  integrity sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==
-  dependencies:
-    "@nodelib/fs.scandir" "2.1.3"
-    fastq "^1.6.0"
-
-"@nodelib/fs.walk@^1.2.8":
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
-  integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
-  dependencies:
-    "@nodelib/fs.scandir" "2.1.5"
-    fastq "^1.6.0"
-
-"@octokit/auth-token@^2.4.4":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-2.5.0.tgz#27c37ea26c205f28443402477ffd261311f21e36"
-  integrity sha512-r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g==
-  dependencies:
-    "@octokit/types" "^6.0.3"
-
-"@octokit/core@^3.5.1":
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/@octokit/core/-/core-3.6.0.tgz#3376cb9f3008d9b3d110370d90e0a1fcd5fe6085"
-  integrity sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q==
-  dependencies:
-    "@octokit/auth-token" "^2.4.4"
-    "@octokit/graphql" "^4.5.8"
-    "@octokit/request" "^5.6.3"
-    "@octokit/request-error" "^2.0.5"
-    "@octokit/types" "^6.0.3"
-    before-after-hook "^2.2.0"
-    universal-user-agent "^6.0.0"
-
-"@octokit/endpoint@^6.0.1":
-  version "6.0.12"
-  resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.12.tgz#3b4d47a4b0e79b1027fb8d75d4221928b2d05658"
-  integrity sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==
-  dependencies:
-    "@octokit/types" "^6.0.3"
-    is-plain-object "^5.0.0"
-    universal-user-agent "^6.0.0"
-
-"@octokit/graphql@^4.5.8":
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-4.8.0.tgz#664d9b11c0e12112cbf78e10f49a05959aa22cc3"
-  integrity sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg==
-  dependencies:
-    "@octokit/request" "^5.6.0"
-    "@octokit/types" "^6.0.3"
-    universal-user-agent "^6.0.0"
-
-"@octokit/openapi-types@^11.2.0":
-  version "11.2.0"
-  resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-11.2.0.tgz#b38d7fc3736d52a1e96b230c1ccd4a58a2f400a6"
-  integrity sha512-PBsVO+15KSlGmiI8QAzaqvsNlZlrDlyAJYcrXBCvVUxCp7VnXjkwPoFHgjEJXx3WF9BAwkA6nfCUA7i9sODzKA==
-
-"@octokit/plugin-paginate-rest@^2.16.8":
-  version "2.17.0"
-  resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.17.0.tgz#32e9c7cab2a374421d3d0de239102287d791bce7"
-  integrity sha512-tzMbrbnam2Mt4AhuyCHvpRkS0oZ5MvwwcQPYGtMv4tUa5kkzG58SVB0fcsLulOZQeRnOgdkZWkRUiyBlh0Bkyw==
-  dependencies:
-    "@octokit/types" "^6.34.0"
-
-"@octokit/plugin-request-log@^1.0.4":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz#5e50ed7083a613816b1e4a28aeec5fb7f1462e85"
-  integrity sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==
-
-"@octokit/plugin-rest-endpoint-methods@^5.12.0":
-  version "5.13.0"
-  resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.13.0.tgz#8c46109021a3412233f6f50d28786f8e552427ba"
-  integrity sha512-uJjMTkN1KaOIgNtUPMtIXDOjx6dGYysdIFhgA52x4xSadQCz3b/zJexvITDVpANnfKPW/+E0xkOvLntqMYpviA==
-  dependencies:
-    "@octokit/types" "^6.34.0"
-    deprecation "^2.3.1"
-
-"@octokit/request-error@^2.0.5", "@octokit/request-error@^2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.1.0.tgz#9e150357831bfc788d13a4fd4b1913d60c74d677"
-  integrity sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==
-  dependencies:
-    "@octokit/types" "^6.0.3"
-    deprecation "^2.0.0"
-    once "^1.4.0"
-
-"@octokit/request@^5.6.0", "@octokit/request@^5.6.3":
-  version "5.6.3"
-  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.6.3.tgz#19a022515a5bba965ac06c9d1334514eb50c48b0"
-  integrity sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==
-  dependencies:
-    "@octokit/endpoint" "^6.0.1"
-    "@octokit/request-error" "^2.1.0"
-    "@octokit/types" "^6.16.1"
-    is-plain-object "^5.0.0"
-    node-fetch "^2.6.7"
-    universal-user-agent "^6.0.0"
-
-"@octokit/rest@^18.0.14":
-  version "18.12.0"
-  resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.12.0.tgz#f06bc4952fc87130308d810ca9d00e79f6988881"
-  integrity sha512-gDPiOHlyGavxr72y0guQEhLsemgVjwRePayJ+FcKc2SJqKUbxbkvf5kAZEWA/MKvsfYlQAMVzNJE3ezQcxMJ2Q==
-  dependencies:
-    "@octokit/core" "^3.5.1"
-    "@octokit/plugin-paginate-rest" "^2.16.8"
-    "@octokit/plugin-request-log" "^1.0.4"
-    "@octokit/plugin-rest-endpoint-methods" "^5.12.0"
-
-"@octokit/types@^6.0.3", "@octokit/types@^6.16.1", "@octokit/types@^6.34.0":
-  version "6.34.0"
-  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.34.0.tgz#c6021333334d1ecfb5d370a8798162ddf1ae8218"
-  integrity sha512-s1zLBjWhdEI2zwaoSgyOFoKSl109CUcVBCc7biPJ3aAf6LGLU6szDvi31JPU7bxfla2lqfhjbbg/5DdFNxOwHw==
-  dependencies:
-    "@octokit/openapi-types" "^11.2.0"
-
-"@opentelemetry/api@^1.0.1":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.0.3.tgz#13a12ae9e05c2a782f7b5e84c3cbfda4225eaf80"
-  integrity sha512-puWxACExDe9nxbBB3lOymQFrLYml2dVOrd7USiVRnSbgXE+KwBu+HxFvxrzfqsiSda9IWsXJG1ef7C1O2/GmKQ==
-
-"@parcel/watcher@2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.1.0.tgz#5f32969362db4893922c526a842d8af7a8538545"
-  integrity sha512-8s8yYjd19pDSsBpbkOHnT6Z2+UJSuLQx61pCFM0s5wSRvKCEMDjd/cHY3/GI1szHIWbpXpsJdg3V6ISGGx9xDw==
-  dependencies:
-    is-glob "^4.0.3"
-    micromatch "^4.0.5"
-    node-addon-api "^3.2.1"
-    node-gyp-build "^4.3.0"
-
-"@pkgjs/parseargs@^0.11.0":
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
-  integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
-
-"@playwright/browser-chromium@^1.40.1":
-  version "1.40.1"
-  resolved "https://registry.yarnpkg.com/@playwright/browser-chromium/-/browser-chromium-1.40.1.tgz#74f3a213f082798c838f2ef1405c5e9cfeeebc99"
-  integrity sha512-uNmjHYXBTYTfJkf89D6zVUcesCFzZ/yjkPj8FvBJQ6yf3na/j1rcjVNzx0PzOAGcWKioB/rnWRBi7b5ojOdCHA==
-  dependencies:
-    playwright-core "1.40.1"
-
-"@playwright/test@^1.40.1":
-  version "1.40.1"
-  resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.40.1.tgz#9e66322d97b1d74b9f8718bacab15080f24cde65"
-  integrity sha512-EaaawMTOeEItCRvfmkI9v6rBkF1svM8wjl/YPRrg2N2Wmp+4qJYkWtJsbew1szfKKDm6fPLy4YAanBhIlf9dWw==
-  dependencies:
-    playwright "1.40.1"
-
-"@sindresorhus/is@^4.0.0":
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f"
-  integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==
-
-"@sinonjs/commons@^1.6.0", "@sinonjs/commons@^1.7.0", "@sinonjs/commons@^1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d"
-  integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==
-  dependencies:
-    type-detect "4.0.8"
-
-"@sinonjs/fake-timers@^7.0.4", "@sinonjs/fake-timers@^7.1.0":
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz#2524eae70c4910edccf99b2f4e6efc5894aff7b5"
-  integrity sha512-iQADsW4LBMISqZ6Ci1dupJL9pprqwcVFTcOsEmQOEhW+KLCVn/Y4Jrvg2k19fIHCp+iFprriYPTdRcQR8NbUPg==
-  dependencies:
-    "@sinonjs/commons" "^1.7.0"
-
-"@sinonjs/fake-timers@^8.1.0":
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz#3fdc2b6cb58935b21bfb8d1625eb1300484316e7"
-  integrity sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==
-  dependencies:
-    "@sinonjs/commons" "^1.7.0"
-
-"@sinonjs/samsam@^6.0.2":
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-6.0.2.tgz#a0117d823260f282c04bff5f8704bdc2ac6910bb"
-  integrity sha512-jxPRPp9n93ci7b8hMfJOFDPRLFYadN6FSpeROFTR4UNF4i5b+EK6m4QXPO46BDhFgRy1JuS87zAnFOzCUwMJcQ==
-  dependencies:
-    "@sinonjs/commons" "^1.6.0"
-    lodash.get "^4.4.2"
-    type-detect "^4.0.8"
-
-"@sinonjs/text-encoding@^0.7.1":
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz#8da5c6530915653f3a1f38fd5f101d8c3f8079c5"
-  integrity sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==
-
-"@swc/core-darwin-arm64@1.3.62":
-  version "1.3.62"
-  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.62.tgz#dafb50bf784c6b7b40dce6d8cf0605f6729812cb"
-  integrity sha512-MmGilibITz68LEje6vJlKzc2gUUSgzvB3wGLSjEORikTNeM7P8jXVxE4A8fgZqDeudJUm9HVWrxCV+pHDSwXhA==
-
-"@swc/core-darwin-x64@1.3.62":
-  version "1.3.62"
-  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.3.62.tgz#324bd144268860338040db64c42c2345fcaaebcf"
-  integrity sha512-Xl93MMB3sCWVlYWuQIB+v6EQgzoiuQYK5tNt9lsHoIEVu2zLdkQjae+5FUHZb1VYqCXIiWcULFfVz0R4Sjb7JQ==
-
-"@swc/core-linux-arm-gnueabihf@1.3.62":
-  version "1.3.62"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.62.tgz#9b5ca188ea3c91827e43e4287bd20ce2a7cb7d81"
-  integrity sha512-nJsp6O7kCtAjTTMcIjVB0g5y1JNiYAa5q630eiwrnaHUusEFoANDdORI3Z9vXeikMkng+6yIv9/V8Rb093xLjQ==
-
-"@swc/core-linux-arm64-gnu@1.3.62":
-  version "1.3.62"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.62.tgz#b208b005223fd9c4c4a12fc0e24070c5e902965f"
-  integrity sha512-XGsV93vpUAopDt5y6vPwbK1Nc/MlL55L77bAZUPIiosWD1cWWPHNtNSpriE6+I+JiMHe0pqtfS/SSTk6ZkFQVw==
-
-"@swc/core-linux-arm64-musl@1.3.62":
-  version "1.3.62"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.62.tgz#bf66add093fa732d3b7f629e00b6ef9bf3c483f2"
-  integrity sha512-ESUmJjSlTTkoBy9dMG49opcNn8BmviqStMhwyeD1G8XRnmRVCZZgoBOKdvCXmJhw8bQXDhZumeaTUB+OFUKVXg==
-
-"@swc/core-linux-x64-gnu@1.3.62":
-  version "1.3.62"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.62.tgz#b97eee374986388b71d87c67d7edb8208356dde2"
-  integrity sha512-wnHJkt3ZBrax3SFnUHDcncG6mrSg9ZZjMhQV9Mc3JL1x1s1Gy9rGZCoBNnV/BUZWTemxIBcQbANRSDut/WO+9A==
-
-"@swc/core-linux-x64-musl@1.3.62":
-  version "1.3.62"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.62.tgz#548ccdef6d7535ee7fea6ec9488322411f10da1a"
-  integrity sha512-9oRbuTC/VshB66Rgwi3pTq3sPxSTIb8k9L1vJjES+dDMKa29DAjPtWCXG/pyZ00ufpFZgkGEuAHH5uqUcr1JQg==
-
-"@swc/core-win32-arm64-msvc@1.3.62":
-  version "1.3.62"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.62.tgz#fc0ca735b23c017fe8ff6f85aa4788ddd1ac583d"
-  integrity sha512-zv14vlF2VRrxS061XkfzGjCYnOrEo5glKJjLK5PwUKysIoVrx/L8nAbFxjkX5cObdlyoqo+ekelyBPAO+4bS0w==
-
-"@swc/core-win32-ia32-msvc@1.3.62":
-  version "1.3.62"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.62.tgz#f8dfbb4f0763d2db5ef420b04da3b5cb73897756"
-  integrity sha512-8MC/PZQSsOP2iA/81tAfNRqMWyEqTS/8zKUI67vPuLvpx6NAjRn3E9qBv7iFqH79iqZNzqSMo3awnLrKZyFbcw==
-
-"@swc/core-win32-x64-msvc@1.3.62":
-  version "1.3.62"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.62.tgz#e661ec99c5ac91f1cd63c02b5f114f73f55e7b15"
-  integrity sha512-GJSmUJ95HKHZXAxiuPUmrcm/S3ivQvEzXhOZaIqYBIwUsm02vFZkClsV7eIKzWjso1t0+I/8MjrnUNaSWqh1rQ==
-
-"@swc/core@1.3.62":
-  version "1.3.62"
-  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.3.62.tgz#bc93ede0981ee69fe17d753e1d693ce3afa6c16b"
-  integrity sha512-J58hWY+/G8vOr4J6ZH9hLg0lMSijZtqIIf4HofZezGog/pVX6sJyBJ40dZ1ploFkDIlWTWvJyqtpesBKS73gkQ==
-  optionalDependencies:
-    "@swc/core-darwin-arm64" "1.3.62"
-    "@swc/core-darwin-x64" "1.3.62"
-    "@swc/core-linux-arm-gnueabihf" "1.3.62"
-    "@swc/core-linux-arm64-gnu" "1.3.62"
-    "@swc/core-linux-arm64-musl" "1.3.62"
-    "@swc/core-linux-x64-gnu" "1.3.62"
-    "@swc/core-linux-x64-musl" "1.3.62"
-    "@swc/core-win32-arm64-msvc" "1.3.62"
-    "@swc/core-win32-ia32-msvc" "1.3.62"
-    "@swc/core-win32-x64-msvc" "1.3.62"
-
-"@szmarczak/http-timer@^4.0.5":
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807"
-  integrity sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==
-  dependencies:
-    defer-to-connect "^2.0.0"
-
-"@tootallnate/once@1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
-  integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
-
-"@tootallnate/once@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-3.0.0.tgz#d52238c9052d746c9689523e650160e70786bc9a"
-  integrity sha512-OAdBVB7rlwvLD+DiecSAyVKzKVmSfXbouCyM5I6wHGi4MGXIyFqErg1IvyJ7PI1e+GYZuZh7cCHV/c4LA8SKMw==
-
-"@trysound/sax@0.2.0":
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad"
-  integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==
-
-"@ts-morph/common@~0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@ts-morph/common/-/common-0.20.0.tgz#3f161996b085ba4519731e4d24c35f6cba5b80af"
-  integrity sha512-7uKjByfbPpwuzkstL3L5MQyuXPSKdoNG93Fmi2JoDcTf3pEP731JdRFAduRVkOs8oqxPsXKA+ScrWkdQ8t/I+Q==
-  dependencies:
-    fast-glob "^3.2.12"
-    minimatch "^7.4.3"
-    mkdirp "^2.1.6"
-    path-browserify "^1.0.1"
-
-"@tsconfig/node10@^1.0.7":
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2"
-  integrity sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==
-
-"@tsconfig/node12@^1.0.7":
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d"
-  integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==
-
-"@tsconfig/node14@^1.0.0":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1"
-  integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==
-
-"@tsconfig/node16@^1.0.2":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.3.tgz#472eaab5f15c1ffdd7f8628bd4c4f753995ec79e"
-  integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==
-
-"@types/cacheable-request@^6.0.1":
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.3.tgz#a430b3260466ca7b5ca5bfd735693b36e7a9d183"
-  integrity sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==
-  dependencies:
-    "@types/http-cache-semantics" "*"
-    "@types/keyv" "^3.1.4"
-    "@types/node" "*"
-    "@types/responselike" "^1.0.0"
-
-"@types/color-name@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
-  integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
-
-"@types/cookie@^0.3.3":
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.3.3.tgz#85bc74ba782fb7aa3a514d11767832b0e3bc6803"
-  integrity sha512-LKVP3cgXBT9RYj+t+9FDKwS5tdI+rPBXaNSkma7hvqy35lc7mAokC2zsqWJH0LaqIt3B962nuYI77hsJoT1gow==
-
-"@types/debug@^4.1.5":
-  version "4.1.9"
-  resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.9.tgz#906996938bc672aaf2fb8c0d3733ae1dda05b005"
-  integrity sha512-8Hz50m2eoS56ldRlepxSBa6PWEVCtzUo/92HgLc2qTMnotJNIm7xP+UZhyWoYsyOdd5dxZ+NZLb24rsKyFs2ow==
-  dependencies:
-    "@types/ms" "*"
-
-"@types/eslint-scope@^3.7.3":
-  version "3.7.4"
-  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16"
-  integrity sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==
-  dependencies:
-    "@types/eslint" "*"
-    "@types/estree" "*"
-
-"@types/eslint@*":
-  version "7.2.13"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.13.tgz#e0ca7219ba5ded402062ad6f926d491ebb29dd53"
-  integrity sha512-LKmQCWAlnVHvvXq4oasNUMTJJb2GwSyTY8+1C7OH5ILR8mPLaljv1jxL1bXW3xB3jFbQxTKxJAvI8PyjB09aBg==
-  dependencies:
-    "@types/estree" "*"
-    "@types/json-schema" "*"
-
-"@types/estree@*":
-  version "0.0.49"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.49.tgz#3facb98ebcd4114a4ecef74e0de2175b56fd4464"
-  integrity sha512-K1AFuMe8a+pXmfHTtnwBvqoEylNKVeaiKYkjmcEAdytMQVJ/i9Fu7sc13GxgXdO49gkE7Hy8SyJonUZUn+eVaw==
-
-"@types/estree@^0.0.51":
-  version "0.0.51"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40"
-  integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==
-
-"@types/estree@^1.0.5":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
-  integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
-
-"@types/expect@^1.20.4":
-  version "1.20.4"
-  resolved "https://registry.yarnpkg.com/@types/expect/-/expect-1.20.4.tgz#8288e51737bf7e3ab5d7c77bfa695883745264e5"
-  integrity sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg==
-
-"@types/glob@^7.1.1":
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183"
-  integrity sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==
-  dependencies:
-    "@types/minimatch" "*"
-    "@types/node" "*"
-
-"@types/gulp-svgmin@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@types/gulp-svgmin/-/gulp-svgmin-1.2.1.tgz#e18f344ea09560554652406b37e1dc3253a6bda2"
-  integrity sha512-qT/Y+C2uWJZoGw4oAjuJGZk+ImmTrx+QZbMGSzf8a1absW3wztrmMPvCF64pdogATDVUSPQDLzPWAFeIxylJTA==
-  dependencies:
-    "@types/node" "*"
-    "@types/svgo" "^1"
-    "@types/vinyl" "*"
-
-"@types/http-cache-semantics@*":
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812"
-  integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==
-
-"@types/http-proxy-agent@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@types/http-proxy-agent/-/http-proxy-agent-2.0.1.tgz#2f95077f6bfe7adc39cc0f0042da85997ae77fc7"
-  integrity sha512-dgsgbsgI3t+ZkdzF9H19uBaLsurIZJJjJsVpj4mCLp8B6YghQ7jVwyqhaL0PcVtuC3nOi0ZBhAi2Dd9jCUwdFA==
-  dependencies:
-    "@types/node" "*"
-
-"@types/istanbul-lib-coverage@^2.0.1":
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz#7739c232a1fee9b4d3ce8985f314c0c6d33549d7"
-  integrity sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==
-
-"@types/json-schema@*":
-  version "7.0.7"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
-  integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==
-
-"@types/json-schema@^7.0.12":
-  version "7.0.15"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
-  integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
-
-"@types/json-schema@^7.0.6":
-  version "7.0.6"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0"
-  integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==
-
-"@types/json-schema@^7.0.8":
-  version "7.0.11"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
-  integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
-
-"@types/json-schema@^7.0.9":
-  version "7.0.9"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
-  integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
-
-"@types/kerberos@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@types/kerberos/-/kerberos-1.1.2.tgz#2a774abd48f727852f697d74241e9de3aea8e646"
-  integrity sha512-cLixfcXjdj7qohLasmC1G4fh+en4e4g7mFZiG38D+K9rS9BRKFlq1JH5dGkQzICckbu4wM+RcwSa4VRHlBg7Rg==
-
-"@types/keyv@^3.1.4":
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz#3ccdb1c6751b0c7e52300bcdacd5bcbf8faa75b6"
-  integrity sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==
-  dependencies:
-    "@types/node" "*"
-
-"@types/minimatch@*":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
-  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
-
-"@types/minimist@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.1.tgz#283f669ff76d7b8260df8ab7a4262cc83d988256"
-  integrity sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==
-
-"@types/mocha@^10.0.2":
-  version "10.0.2"
-  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-10.0.2.tgz#96d63314255540a36bf24da094cce7a13668d73b"
-  integrity sha512-NaHL0+0lLNhX6d9rs+NSt97WH/gIlRHmszXbQ/8/MV/eVcFNdeJ/GYhrFuUc8K7WuPhRhTSdMkCp8VMzhUq85w==
-
-"@types/mocha@^9.1.1":
-  version "9.1.1"
-  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-9.1.1.tgz#e7c4f1001eefa4b8afbd1eee27a237fee3bf29c4"
-  integrity sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==
-
-"@types/ms@*":
-  version "0.7.32"
-  resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.32.tgz#f6cd08939ae3ad886fcc92ef7f0109dacddf61ab"
-  integrity sha512-xPSg0jm4mqgEkNhowKgZFBNtwoEwF6gJ4Dhww+GFpm3IgtNseHQZ5IqdNwnquZEoANxyDAKDRAdVo4Z72VvD/g==
-
-"@types/node-fetch@^2.5.0":
-  version "2.5.12"
-  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.12.tgz#8a6f779b1d4e60b7a57fb6fd48d84fb545b9cc66"
-  integrity sha512-MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw==
-  dependencies:
-    "@types/node" "*"
-    form-data "^3.0.0"
-
-"@types/node@*":
-  version "4.2.22"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-4.2.22.tgz#cf488a0f6b4a9c245d09927f4f757ca278b9c8ce"
-  integrity sha512-LXRap3bb4AjtLZ5NOFc4ssVZrQPTgdPcNm++0SEJuJZaOA+xHkojJNYqy33A5q/94BmG5tA6yaMeD4VdCv5aSA==
-
-"@types/node@20.x", "@types/node@^20.9.0":
-  version "20.11.24"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792"
-  integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==
-  dependencies:
-    undici-types "~5.26.4"
-
-"@types/node@^10.11.7":
-  version "10.12.21"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.21.tgz#7e8a0c34cf29f4e17a36e9bd0ea72d45ba03908e"
-  integrity sha512-CBgLNk4o3XMnqMc0rhb6lc77IwShMEglz05deDcn2lQxyXEZivfwgYJu7SMha9V5XcrP6qZuevTHV/QrN2vjKQ==
-
-"@types/responselike@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29"
-  integrity sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==
-  dependencies:
-    "@types/node" "*"
-
-"@types/semver@^5.5.0":
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45"
-  integrity sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ==
-
-"@types/semver@^7.3.12":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.0.tgz#591c1ce3a702c45ee15f47a42ade72c2fd78978a"
-  integrity sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==
-
-"@types/semver@^7.5.0":
-  version "7.5.8"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e"
-  integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==
-
-"@types/sinon-test@^2.4.2":
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/@types/sinon-test/-/sinon-test-2.4.2.tgz#f55bdf5486e7b7a4dd7257789fcc2b7b125c4164"
-  integrity sha512-3BX9mk5+o//Xzs5N4bFYxPT+QlPLrqbyNfDWkIGtk9pVIp2Nl8ctsIGXsY3F01DsCd1Zlin3FqAk6V5XqkCyJA==
-  dependencies:
-    "@types/sinon" "*"
-
-"@types/sinon@*", "@types/sinon@^10.0.2":
-  version "10.0.2"
-  resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-10.0.2.tgz#f360d2f189c0fd433d14aeb97b9d705d7e4cc0e4"
-  integrity sha512-BHn8Bpkapj8Wdfxvh2jWIUoaYB/9/XhsL0oOvBfRagJtKlSl9NWPcFOz2lRukI9szwGxFtYZCTejJSqsGDbdmw==
-  dependencies:
-    "@sinonjs/fake-timers" "^7.1.0"
-
-"@types/svgo@^1":
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/@types/svgo/-/svgo-1.3.6.tgz#9db00a7ddf9b26ad2feb6b834bef1818677845e1"
-  integrity sha512-AZU7vQcy/4WFEuwnwsNsJnFwupIpbllH1++LXScN6uxT1Z4zPzdrWG97w4/I7eFKFTvfy/bHFStWjdBAg2Vjug==
-
-"@types/trusted-types@^1.0.6":
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-1.0.6.tgz#569b8a08121d3203398290d602d84d73c8dcf5da"
-  integrity sha512-230RC8sFeHoT6sSUlRO6a8cAnclO06eeiq1QDfiv2FGCLWFvvERWgwIQD4FWqD9A69BN7Lzee4OXwoMVnnsWDw==
-
-"@types/tunnel@^0.0.3":
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/@types/tunnel/-/tunnel-0.0.3.tgz#f109e730b072b3136347561fc558c9358bb8c6e9"
-  integrity sha512-sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA==
-  dependencies:
-    "@types/node" "*"
-
-"@types/vinyl@*":
-  version "2.0.12"
-  resolved "https://registry.yarnpkg.com/@types/vinyl/-/vinyl-2.0.12.tgz#17642ca9a8ae10f3db018e9f885da4188db4c6e6"
-  integrity sha512-Sr2fYMBUVGYq8kj3UthXFAu5UN6ZW+rYr4NACjZQJvHvj+c8lYv0CahmZ2P/r7iUkN44gGUBwqxZkrKXYPb7cw==
-  dependencies:
-    "@types/expect" "^1.20.4"
-    "@types/node" "*"
-
-"@types/vscode-notebook-renderer@^1.72.0":
-  version "1.72.0"
-  resolved "https://registry.yarnpkg.com/@types/vscode-notebook-renderer/-/vscode-notebook-renderer-1.72.0.tgz#8943dc3cef0ced2dfb1e04c0a933bd289e7d5199"
-  integrity sha512-5iTjb39DpLn03ULUwrDR3L2Dy59RV4blSUHy0oLdQuIY11PhgWO4mXIcoFS0VxY1GZQ4IcjSf3ooT2Jrrcahnw==
-
-"@types/webpack@^5.28.5":
-  version "5.28.5"
-  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-5.28.5.tgz#0e9d9a15efa09bbda2cef41356ca4ac2031ea9a2"
-  integrity sha512-wR87cgvxj3p6D0Crt1r5avwqffqPXUkNlnQ1mjU93G7gCuFjufZR4I6j8cz5g1F1tTYpfOOFvly+cmIQwL9wvw==
-  dependencies:
-    "@types/node" "*"
-    tapable "^2.2.0"
-    webpack "^5"
-
-"@types/wicg-file-system-access@^2020.9.6":
-  version "2020.9.6"
-  resolved "https://registry.yarnpkg.com/@types/wicg-file-system-access/-/wicg-file-system-access-2020.9.6.tgz#da34476b1e29451c8b7aa1a6db86b185647cd970"
-  integrity sha512-6hogE75Hl2Ov/jgp8ZhDaGmIF/q3J07GtXf8nCJCwKTHq7971po5+DId7grft09zG7plBwpF6ZU0yx9Du4/e1A==
-
-"@types/windows-foreground-love@^0.3.0":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@types/windows-foreground-love/-/windows-foreground-love-0.3.0.tgz#26bc230b2568aa7ab7c56d35bb5653c0a6965a42"
-  integrity sha512-tFUVA/fiofNqOh6lZlymvQiQYPY+cZXZPR9mn9wN6/KS8uwx0zgH4Ij/jmFyRYr+x+DGZWEIeknS2BMi7FZJAQ==
-
-"@types/winreg@^1.2.30":
-  version "1.2.30"
-  resolved "https://registry.yarnpkg.com/@types/winreg/-/winreg-1.2.30.tgz#91d6710e536d345b9c9b017c574cf6a8da64c518"
-  integrity sha1-kdZxDlNtNFucmwF8V0z2qNpkxRg=
-
-"@types/yauzl@^2.10.0":
-  version "2.10.3"
-  resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.3.tgz#e9b2808b4f109504a03cda958259876f61017999"
-  integrity sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==
-  dependencies:
-    "@types/node" "*"
-
-"@types/yauzl@^2.9.1":
-  version "2.9.1"
-  resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.1.tgz#d10f69f9f522eef3cf98e30afb684a1e1ec923af"
-  integrity sha512-A1b8SU4D10uoPjwb0lnHmmu8wZhR9d+9o2PKBQT2jU5YPTKsxac6M2qGAdY7VcL+dHHhARVUDmeg0rOrcd9EjA==
-  dependencies:
-    "@types/node" "*"
-
-"@types/yazl@^2.4.2":
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/@types/yazl/-/yazl-2.4.2.tgz#d5f8a4752261badbf1a36e8b49e042dc18ec84bc"
-  integrity sha512-T+9JH8O2guEjXNxqmybzQ92mJUh2oCwDDMSSimZSe1P+pceZiFROZLYmcbqkzV5EUwz6VwcKXCO2S2yUpra6XQ==
-  dependencies:
-    "@types/node" "*"
-
-"@typescript-eslint/eslint-plugin@^6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz#30830c1ca81fd5f3c2714e524c4303e0194f9cd3"
-  integrity sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA==
-  dependencies:
-    "@eslint-community/regexpp" "^4.5.1"
-    "@typescript-eslint/scope-manager" "6.21.0"
-    "@typescript-eslint/type-utils" "6.21.0"
-    "@typescript-eslint/utils" "6.21.0"
-    "@typescript-eslint/visitor-keys" "6.21.0"
-    debug "^4.3.4"
-    graphemer "^1.4.0"
-    ignore "^5.2.4"
-    natural-compare "^1.4.0"
-    semver "^7.5.4"
-    ts-api-utils "^1.0.1"
-
-"@typescript-eslint/experimental-utils@^5.57.0":
-  version "5.57.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.57.0.tgz#e4ddb5f1c77f5be73e7d0435c8d0bf3196b9d2ed"
-  integrity sha512-0RnrwGQ7MmgtOSnzB/rSGYr2iXENi6L+CtPzX3g5ovo0HlruLukSEKcc4s+q0IEc+DLTDc7Edan0Y4WSQ/bFhw==
-  dependencies:
-    "@typescript-eslint/utils" "5.57.0"
-
-"@typescript-eslint/parser@^6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.21.0.tgz#af8fcf66feee2edc86bc5d1cf45e33b0630bf35b"
-  integrity sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==
-  dependencies:
-    "@typescript-eslint/scope-manager" "6.21.0"
-    "@typescript-eslint/types" "6.21.0"
-    "@typescript-eslint/typescript-estree" "6.21.0"
-    "@typescript-eslint/visitor-keys" "6.21.0"
-    debug "^4.3.4"
-
-"@typescript-eslint/scope-manager@5.57.0":
-  version "5.57.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.57.0.tgz#79ccd3fa7bde0758059172d44239e871e087ea36"
-  integrity sha512-NANBNOQvllPlizl9LatX8+MHi7bx7WGIWYjPHDmQe5Si/0YEYfxSljJpoTyTWFTgRy3X8gLYSE4xQ2U+aCozSw==
-  dependencies:
-    "@typescript-eslint/types" "5.57.0"
-    "@typescript-eslint/visitor-keys" "5.57.0"
-
-"@typescript-eslint/scope-manager@6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz#ea8a9bfc8f1504a6ac5d59a6df308d3a0630a2b1"
-  integrity sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==
-  dependencies:
-    "@typescript-eslint/types" "6.21.0"
-    "@typescript-eslint/visitor-keys" "6.21.0"
-
-"@typescript-eslint/type-utils@6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.21.0.tgz#6473281cfed4dacabe8004e8521cee0bd9d4c01e"
-  integrity sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==
-  dependencies:
-    "@typescript-eslint/typescript-estree" "6.21.0"
-    "@typescript-eslint/utils" "6.21.0"
-    debug "^4.3.4"
-    ts-api-utils "^1.0.1"
-
-"@typescript-eslint/types@5.57.0":
-  version "5.57.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.57.0.tgz#727bfa2b64c73a4376264379cf1f447998eaa132"
-  integrity sha512-mxsod+aZRSyLT+jiqHw1KK6xrANm19/+VFALVFP5qa/aiJnlP38qpyaTd0fEKhWvQk6YeNZ5LGwI1pDpBRBhtQ==
-
-"@typescript-eslint/types@6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.21.0.tgz#205724c5123a8fef7ecd195075fa6e85bac3436d"
-  integrity sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==
-
-"@typescript-eslint/typescript-estree@5.57.0":
-  version "5.57.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.57.0.tgz#ebcd0ee3e1d6230e888d88cddf654252d41e2e40"
-  integrity sha512-LTzQ23TV82KpO8HPnWuxM2V7ieXW8O142I7hQTxWIHDcCEIjtkat6H96PFkYBQqGFLW/G/eVVOB9Z8rcvdY/Vw==
-  dependencies:
-    "@typescript-eslint/types" "5.57.0"
-    "@typescript-eslint/visitor-keys" "5.57.0"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
-
-"@typescript-eslint/typescript-estree@6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz#c47ae7901db3b8bddc3ecd73daff2d0895688c46"
-  integrity sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==
-  dependencies:
-    "@typescript-eslint/types" "6.21.0"
-    "@typescript-eslint/visitor-keys" "6.21.0"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    minimatch "9.0.3"
-    semver "^7.5.4"
-    ts-api-utils "^1.0.1"
-
-"@typescript-eslint/utils@5.57.0":
-  version "5.57.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.57.0.tgz#eab8f6563a2ac31f60f3e7024b91bf75f43ecef6"
-  integrity sha512-ps/4WohXV7C+LTSgAL5CApxvxbMkl9B9AUZRtnEFonpIxZDIT7wC1xfvuJONMidrkB9scs4zhtRyIwHh4+18kw==
-  dependencies:
-    "@eslint-community/eslint-utils" "^4.2.0"
-    "@types/json-schema" "^7.0.9"
-    "@types/semver" "^7.3.12"
-    "@typescript-eslint/scope-manager" "5.57.0"
-    "@typescript-eslint/types" "5.57.0"
-    "@typescript-eslint/typescript-estree" "5.57.0"
-    eslint-scope "^5.1.1"
-    semver "^7.3.7"
-
-"@typescript-eslint/utils@6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.21.0.tgz#4714e7a6b39e773c1c8e97ec587f520840cd8134"
-  integrity sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==
-  dependencies:
-    "@eslint-community/eslint-utils" "^4.4.0"
-    "@types/json-schema" "^7.0.12"
-    "@types/semver" "^7.5.0"
-    "@typescript-eslint/scope-manager" "6.21.0"
-    "@typescript-eslint/types" "6.21.0"
-    "@typescript-eslint/typescript-estree" "6.21.0"
-    semver "^7.5.4"
-
-"@typescript-eslint/visitor-keys@5.57.0":
-  version "5.57.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.57.0.tgz#e2b2f4174aff1d15eef887ce3d019ecc2d7a8ac1"
-  integrity sha512-ery2g3k0hv5BLiKpPuwYt9KBkAp2ugT6VvyShXdLOkax895EC55sP0Tx5L0fZaQueiK3fBLvHVvEl3jFS5ia+g==
-  dependencies:
-    "@typescript-eslint/types" "5.57.0"
-    eslint-visitor-keys "^3.3.0"
-
-"@typescript-eslint/visitor-keys@6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz#87a99d077aa507e20e238b11d56cc26ade45fe47"
-  integrity sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==
-  dependencies:
-    "@typescript-eslint/types" "6.21.0"
-    eslint-visitor-keys "^3.4.1"
-
-"@vscode/deviceid@^0.1.1":
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/@vscode/deviceid/-/deviceid-0.1.1.tgz#750e2930a3a8fbf3fd610096a8b915dfdb493c89"
-  integrity sha512-ErpoMeKKNYAkR1IT3zxB5RtiTqEECdh8fxggupWvzuxpTAX77hwOI2NdJ7um+vupnXRBZVx4ugo0+dVHJWUkag==
-  dependencies:
-    fs-extra "^11.2.0"
-    uuid "^9.0.1"
-
-"@vscode/gulp-electron@^1.36.0":
-  version "1.36.0"
-  resolved "https://registry.yarnpkg.com/@vscode/gulp-electron/-/gulp-electron-1.36.0.tgz#b2895c4bafaa0cf2b13042aa654e9fdd1f3a90cd"
-  integrity sha512-zGNnxN2mccAa0fgyjUn0+HUX4sv4syUfoLQru3/QAQYki1oeqnkPpCXZxhismFmWpXwTwsf5sXeh1AOs8uyU0g==
-  dependencies:
-    "@electron/get" "^2.0.2"
-    "@octokit/rest" "^18.0.14"
-    event-stream "3.3.4"
-    gulp-filter "^5.1.0"
-    gulp-rename "1.2.2"
-    gulp-symdest "^1.2.0"
-    gulp-vinyl-zip "^2.1.2"
-    mkdirp "^0.5.1"
-    plist "^3.0.1"
-    progress "^1.1.8"
-    rcedit "^0.3.0"
-    rimraf "^2.4.2"
-    semver "^4.3.4"
-    sumchecker "^3.0.1"
-    temp "^0.8.3"
-    vinyl "^3.0.0"
-    vinyl-fs "^3.0.3"
-
-"@vscode/iconv-lite-umd@0.7.0":
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz#d2f1e0664ee6036408f9743fee264ea0699b0e48"
-  integrity sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg==
-
-"@vscode/l10n-dev@0.0.35":
-  version "0.0.35"
-  resolved "https://registry.yarnpkg.com/@vscode/l10n-dev/-/l10n-dev-0.0.35.tgz#cdd8106a56b7dc8feef62d10c413d6d8d94b2d5c"
-  integrity sha512-s6uzBXsVDSL69Z85HSqpc5dfKswQkeucY8L00t1TWzGalw7wkLQUKMRwuzqTq+AMwQKrRd7Po14cMoTcd11iDw==
-  dependencies:
-    "@azure-rest/ai-translation-text" "^1.0.0-beta.1"
-    debug "^4.3.4"
-    deepmerge-json "^1.5.0"
-    glob "^10.0.0"
-    markdown-it "^14.0.0"
-    node-html-markdown "^1.3.0"
-    pseudo-localization "^2.4.0"
-    web-tree-sitter "^0.20.8"
-    xml2js "^0.5.0"
-    yargs "^17.7.1"
-
-"@vscode/policy-watcher@^1.1.4":
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/@vscode/policy-watcher/-/policy-watcher-1.1.6.tgz#5867ff8297507dc1cc7c6f826a67bb2536a5cafe"
-  integrity sha512-EoJizB6aq/mgsL42mcNLGZ5vOwdZs/EHcLQkdY6Rg4uzcRkCapQdNy20wnCsrBpv3QntgBibsS6m+JXm8efY/Q==
-  dependencies:
-    bindings "^1.5.0"
-    node-addon-api "^6.0.0"
-
-"@vscode/proxy-agent@^0.19.0":
-  version "0.19.1"
-  resolved "https://registry.yarnpkg.com/@vscode/proxy-agent/-/proxy-agent-0.19.1.tgz#d9640d85df1c48885580b68bb4b2b54e17f5332c"
-  integrity sha512-cs1VOx6d5n69HhgzK0cWeyfudJt+9LdJi/vtgRRxxwisWKg4h83B3+EUJ4udF5SEkJgMBp3oU0jheZVt43ImnQ==
-  dependencies:
-    "@tootallnate/once" "^3.0.0"
-    agent-base "^7.0.1"
-    debug "^4.3.4"
-    http-proxy-agent "^7.0.0"
-    https-proxy-agent "^7.0.2"
-    socks-proxy-agent "^8.0.1"
-  optionalDependencies:
-    "@vscode/windows-ca-certs" "^0.3.1"
-
-"@vscode/ripgrep@^1.15.9":
-  version "1.15.9"
-  resolved "https://registry.yarnpkg.com/@vscode/ripgrep/-/ripgrep-1.15.9.tgz#92279f7f28e1e49ad9a89603e10b17a4c7f9f5f1"
-  integrity sha512-4q2PXRvUvr3bF+LsfrifmUZgSPmCNcUZo6SbEAZgArIChchkezaxLoIeQMJe/z3CCKStvaVKpBXLxN3Z8lQjFQ==
-  dependencies:
-    https-proxy-agent "^7.0.2"
-    proxy-from-env "^1.1.0"
-    yauzl "^2.9.2"
-
-"@vscode/spdlog@^0.15.0":
-  version "0.15.0"
-  resolved "https://registry.yarnpkg.com/@vscode/spdlog/-/spdlog-0.15.0.tgz#37896541410ff036dc01c54e16bf131c522a057e"
-  integrity sha512-5UFcQXM/G6bTRF49zJJJH3A3+47nxaXuKzT26vhTXVIiMFoV1oI9559mWOzapLEmvrntAdYtjE7Jh74lSAuMcA==
-  dependencies:
-    bindings "^1.5.0"
-    mkdirp "^1.0.4"
-    node-addon-api "7.1.0"
-
-"@vscode/sqlite3@5.1.6-vscode":
-  version "5.1.6-vscode"
-  resolved "https://registry.yarnpkg.com/@vscode/sqlite3/-/sqlite3-5.1.6-vscode.tgz#2f20e80fe2af59f3e81bf777f5fe2da5a6ec8329"
-  integrity sha512-SzNUiijrRyJr1ly6eHIs5UcCqH/V8aaoz9mHNm5SdnJCJOX5T9RcHqO1AJ9VreHcPcRPKuG2paUpMkTeyynmYQ==
-  dependencies:
-    node-addon-api "^4.2.0"
-    tar "^6.1.11"
-
-"@vscode/sudo-prompt@9.3.1":
-  version "9.3.1"
-  resolved "https://registry.yarnpkg.com/@vscode/sudo-prompt/-/sudo-prompt-9.3.1.tgz#c562334bc6647733649fd42afc96c0eea8de3b65"
-  integrity sha512-9ORTwwS74VaTn38tNbQhsA5U44zkJfcb0BdTSyyG6frP4e8KMtHuTXYmwefe5dpL8XB1aGSIVTaLjD3BbWb5iA==
-
-"@vscode/telemetry-extractor@^1.10.2":
-  version "1.10.2"
-  resolved "https://registry.yarnpkg.com/@vscode/telemetry-extractor/-/telemetry-extractor-1.10.2.tgz#b1ec2296dac1923d400bf98b3242d9b7d792fe83"
-  integrity sha512-hn+KDSwIRj7LzDSFd9HALkc80UY1g16nQgWztHml+nxAZU3Hw/EoWEEDxOncvDYq9YcV+tX/cVHrVjbNL2Dg0g==
-  dependencies:
-    "@vscode/ripgrep" "^1.15.9"
-    command-line-args "^5.2.1"
-    ts-morph "^19.0.0"
-
-"@vscode/test-cli@^0.0.6":
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/@vscode/test-cli/-/test-cli-0.0.6.tgz#13fe86902b2e8af3f9b67ff7cf66453ea0c24999"
-  integrity sha512-4i61OUv5PQr3GxhHOuUgHdgBDfIO/kXTPCsEyFiMaY4SOqQTgkTmyZLagHehjOgCfsXdcrJa3zgQ7zoc+Dh6hQ==
-  dependencies:
-    "@types/mocha" "^10.0.2"
-    c8 "^9.1.0"
-    chokidar "^3.5.3"
-    enhanced-resolve "^5.15.0"
-    glob "^10.3.10"
-    minimatch "^9.0.3"
-    mocha "^10.2.0"
-    supports-color "^9.4.0"
-    yargs "^17.7.2"
-
-"@vscode/test-electron@^2.3.8":
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/@vscode/test-electron/-/test-electron-2.3.8.tgz#06a7c50b38cfac0ede833905e088d55c61cd12d3"
-  integrity sha512-b4aZZsBKtMGdDljAsOPObnAi7+VWIaYl3ylCz1jTs+oV6BZ4TNHcVNC3xUn0azPeszBmwSBDQYfFESIaUQnrOg==
-  dependencies:
-    http-proxy-agent "^4.0.1"
-    https-proxy-agent "^5.0.0"
-    jszip "^3.10.1"
-    semver "^7.5.2"
-
-"@vscode/test-web@^0.0.50":
-  version "0.0.50"
-  resolved "https://registry.yarnpkg.com/@vscode/test-web/-/test-web-0.0.50.tgz#fe6a9f5a50f3d8fd9379593a44173696ea75c20c"
-  integrity sha512-aFcwTyA3qirjfr6f5oKEV/07MbsbNeJEqElIh/ceNPEnJIyKYQeffbU7Cia9XtTKk1Ue1qMqwhdIO8OnUa9QBg==
-  dependencies:
-    "@koa/cors" "^5.0.0"
-    "@koa/router" "^12.0.1"
-    "@playwright/browser-chromium" "^1.40.1"
-    gunzip-maybe "^1.4.2"
-    http-proxy-agent "^7.0.0"
-    https-proxy-agent "^7.0.2"
-    koa "^2.14.2"
-    koa-morgan "^1.0.1"
-    koa-mount "^4.0.0"
-    koa-static "^5.0.0"
-    minimist "^1.2.8"
-    playwright "^1.40.1"
-    tar-fs "^3.0.4"
-    vscode-uri "^3.0.8"
-
-"@vscode/v8-heap-parser@^0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@vscode/v8-heap-parser/-/v8-heap-parser-0.1.0.tgz#f3fe61ce954cc3dd78ed42e09f865450685e351f"
-  integrity sha512-3EvQak7EIOLyIGz+IP9qSwRmP08ZRWgTeoRgAXPVkkDXZ8riqJ7LDtkgx++uHBiJ3MUaSdlUYPZcLFFw7E6zGg==
-
-"@vscode/vscode-languagedetection@1.0.21":
-  version "1.0.21"
-  resolved "https://registry.yarnpkg.com/@vscode/vscode-languagedetection/-/vscode-languagedetection-1.0.21.tgz#89b48f293f6aa3341bb888c1118d16ff13b032d3"
-  integrity sha512-zSUH9HYCw5qsCtd7b31yqkpaCU6jhtkKLkvOOA8yTrIRfBSOFb8PPhgmMicD7B/m+t4PwOJXzU1XDtrM9Fd3/g==
-
-"@vscode/vscode-perf@^0.0.14":
-  version "0.0.14"
-  resolved "https://registry.yarnpkg.com/@vscode/vscode-perf/-/vscode-perf-0.0.14.tgz#0bc8d5fc02419df98e120ad4dc137c123191f7b1"
-  integrity sha512-mDJOIAVU3Ufj1FUX2/LZtLHobjl7zRA+oDKH3GSJYQ+RlfEvpFRoU1CRSwbE3u9fsKMX//uBDI4Q4B8+3s86uA==
-  dependencies:
-    chalk "^4.x"
-    commander "^9.4.0"
-    cookie "^0.5.0"
-    js-base64 "^3.7.4"
-    node-fetch "2.6.8"
-    playwright "^1.29.2"
-
-"@vscode/windows-ca-certs@^0.3.1":
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/@vscode/windows-ca-certs/-/windows-ca-certs-0.3.1.tgz#35c88b2d2a52f7759bfb6878906c3d40421ec6a3"
-  integrity sha512-1B6hZAsqg125wuMsXiKIFkBgKx/J7YR4RT/ccYGkWAToPU9MVa40PRe+evLFUmLPH6NmPohEPlCzZLbqgvHCcQ==
-  dependencies:
-    node-addon-api "^3.0.2"
-
-"@vscode/windows-mutex@^0.5.0":
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/@vscode/windows-mutex/-/windows-mutex-0.5.0.tgz#509f961704c6615bfab1a081c522bf1beb15bb3f"
-  integrity sha512-iD29L9AUscpn07aAvhP2QuhrXzuKc1iQpPF6u7ybtvRbR+o+RotfbuKqqF1RDlDDrJZkL+3AZTy4D01U4nEe5A==
-  dependencies:
-    bindings "^1.5.0"
-    node-addon-api "7.1.0"
-
-"@vscode/windows-process-tree@^0.6.0":
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/@vscode/windows-process-tree/-/windows-process-tree-0.6.0.tgz#a62400c689b27688fd689e8cac71d63c6d1956da"
-  integrity sha512-7/DjBKKUtlmKNiAet2GRbdvfjgMKmfBeWVClIgONv8aqxGnaKca5N85eIDxh6rLMy2hKvFqIIsqgxs1Q26TWwg==
-  dependencies:
-    node-addon-api "7.1.0"
-
-"@vscode/windows-registry@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@vscode/windows-registry/-/windows-registry-1.1.0.tgz#03dace7c29c46f658588b9885b9580e453ad21f9"
-  integrity sha512-5AZzuWJpGscyiMOed0IuyEwt6iKmV5Us7zuwCDCFYMIq7tsvooO9BUiciywsvuthGz6UG4LSpeDeCxvgMVhnIw==
-
-"@webassemblyjs/ast@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"
-  integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==
-  dependencies:
-    "@webassemblyjs/helper-numbers" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-
-"@webassemblyjs/ast@1.12.1", "@webassemblyjs/ast@^1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.12.1.tgz#bb16a0e8b1914f979f45864c23819cc3e3f0d4bb"
-  integrity sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==
-  dependencies:
-    "@webassemblyjs/helper-numbers" "1.11.6"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-
-"@webassemblyjs/floating-point-hex-parser@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f"
-  integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==
-
-"@webassemblyjs/floating-point-hex-parser@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz#dacbcb95aff135c8260f77fa3b4c5fea600a6431"
-  integrity sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==
-
-"@webassemblyjs/helper-api-error@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16"
-  integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==
-
-"@webassemblyjs/helper-api-error@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768"
-  integrity sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==
-
-"@webassemblyjs/helper-buffer@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5"
-  integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==
-
-"@webassemblyjs/helper-buffer@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz#6df20d272ea5439bf20ab3492b7fb70e9bfcb3f6"
-  integrity sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==
-
-"@webassemblyjs/helper-numbers@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae"
-  integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==
-  dependencies:
-    "@webassemblyjs/floating-point-hex-parser" "1.11.1"
-    "@webassemblyjs/helper-api-error" "1.11.1"
-    "@xtuc/long" "4.2.2"
-
-"@webassemblyjs/helper-numbers@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz#cbce5e7e0c1bd32cf4905ae444ef64cea919f1b5"
-  integrity sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==
-  dependencies:
-    "@webassemblyjs/floating-point-hex-parser" "1.11.6"
-    "@webassemblyjs/helper-api-error" "1.11.6"
-    "@xtuc/long" "4.2.2"
-
-"@webassemblyjs/helper-wasm-bytecode@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1"
-  integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==
-
-"@webassemblyjs/helper-wasm-bytecode@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9"
-  integrity sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==
-
-"@webassemblyjs/helper-wasm-section@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a"
-  integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-buffer" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-    "@webassemblyjs/wasm-gen" "1.11.1"
-
-"@webassemblyjs/helper-wasm-section@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz#3da623233ae1a60409b509a52ade9bc22a37f7bf"
-  integrity sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==
-  dependencies:
-    "@webassemblyjs/ast" "1.12.1"
-    "@webassemblyjs/helper-buffer" "1.12.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/wasm-gen" "1.12.1"
-
-"@webassemblyjs/ieee754@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614"
-  integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==
-  dependencies:
-    "@xtuc/ieee754" "^1.2.0"
-
-"@webassemblyjs/ieee754@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz#bb665c91d0b14fffceb0e38298c329af043c6e3a"
-  integrity sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==
-  dependencies:
-    "@xtuc/ieee754" "^1.2.0"
-
-"@webassemblyjs/leb128@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5"
-  integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==
-  dependencies:
-    "@xtuc/long" "4.2.2"
-
-"@webassemblyjs/leb128@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz#70e60e5e82f9ac81118bc25381a0b283893240d7"
-  integrity sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==
-  dependencies:
-    "@xtuc/long" "4.2.2"
-
-"@webassemblyjs/utf8@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff"
-  integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==
-
-"@webassemblyjs/utf8@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a"
-  integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==
-
-"@webassemblyjs/wasm-edit@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6"
-  integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-buffer" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-    "@webassemblyjs/helper-wasm-section" "1.11.1"
-    "@webassemblyjs/wasm-gen" "1.11.1"
-    "@webassemblyjs/wasm-opt" "1.11.1"
-    "@webassemblyjs/wasm-parser" "1.11.1"
-    "@webassemblyjs/wast-printer" "1.11.1"
-
-"@webassemblyjs/wasm-edit@^1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz#9f9f3ff52a14c980939be0ef9d5df9ebc678ae3b"
-  integrity sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==
-  dependencies:
-    "@webassemblyjs/ast" "1.12.1"
-    "@webassemblyjs/helper-buffer" "1.12.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/helper-wasm-section" "1.12.1"
-    "@webassemblyjs/wasm-gen" "1.12.1"
-    "@webassemblyjs/wasm-opt" "1.12.1"
-    "@webassemblyjs/wasm-parser" "1.12.1"
-    "@webassemblyjs/wast-printer" "1.12.1"
-
-"@webassemblyjs/wasm-gen@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76"
-  integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-    "@webassemblyjs/ieee754" "1.11.1"
-    "@webassemblyjs/leb128" "1.11.1"
-    "@webassemblyjs/utf8" "1.11.1"
-
-"@webassemblyjs/wasm-gen@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz#a6520601da1b5700448273666a71ad0a45d78547"
-  integrity sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==
-  dependencies:
-    "@webassemblyjs/ast" "1.12.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/ieee754" "1.11.6"
-    "@webassemblyjs/leb128" "1.11.6"
-    "@webassemblyjs/utf8" "1.11.6"
-
-"@webassemblyjs/wasm-opt@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2"
-  integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-buffer" "1.11.1"
-    "@webassemblyjs/wasm-gen" "1.11.1"
-    "@webassemblyjs/wasm-parser" "1.11.1"
-
-"@webassemblyjs/wasm-opt@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz#9e6e81475dfcfb62dab574ac2dda38226c232bc5"
-  integrity sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==
-  dependencies:
-    "@webassemblyjs/ast" "1.12.1"
-    "@webassemblyjs/helper-buffer" "1.12.1"
-    "@webassemblyjs/wasm-gen" "1.12.1"
-    "@webassemblyjs/wasm-parser" "1.12.1"
-
-"@webassemblyjs/wasm-parser@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199"
-  integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-api-error" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-    "@webassemblyjs/ieee754" "1.11.1"
-    "@webassemblyjs/leb128" "1.11.1"
-    "@webassemblyjs/utf8" "1.11.1"
-
-"@webassemblyjs/wasm-parser@1.12.1", "@webassemblyjs/wasm-parser@^1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz#c47acb90e6f083391e3fa61d113650eea1e95937"
-  integrity sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==
-  dependencies:
-    "@webassemblyjs/ast" "1.12.1"
-    "@webassemblyjs/helper-api-error" "1.11.6"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/ieee754" "1.11.6"
-    "@webassemblyjs/leb128" "1.11.6"
-    "@webassemblyjs/utf8" "1.11.6"
-
-"@webassemblyjs/wast-printer@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0"
-  integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@xtuc/long" "4.2.2"
-
-"@webassemblyjs/wast-printer@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz#bcecf661d7d1abdaf989d8341a4833e33e2b31ac"
-  integrity sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==
-  dependencies:
-    "@webassemblyjs/ast" "1.12.1"
-    "@xtuc/long" "4.2.2"
-
-"@webpack-cli/configtest@^2.1.1":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.1.1.tgz#3b2f852e91dac6e3b85fb2a314fb8bef46d94646"
-  integrity sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==
-
-"@webpack-cli/info@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.2.tgz#cc3fbf22efeb88ff62310cf885c5b09f44ae0fdd"
-  integrity sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==
-
-"@webpack-cli/serve@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.5.tgz#325db42395cd49fe6c14057f9a900e427df8810e"
-  integrity sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==
-
-"@xterm/addon-clipboard@0.2.0-beta.4":
-  version "0.2.0-beta.4"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.4.tgz#9911baaebfbc07a698ae62366a596bfdeac8fa7e"
-  integrity sha512-p2KGTFUDK4YFthCgfsv2wT66JDTZPcIuoWeDT+TmSFbS1smDPTMCyM/rDDkGY+duHRcQsIMVzGC+2NRb/exX6A==
-  dependencies:
-    js-base64 "^3.7.5"
-
-"@xterm/addon-image@0.9.0-beta.21":
-  version "0.9.0-beta.21"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.9.0-beta.21.tgz#64fe50ee623f3e518574e1cbbe649cc0c0d60265"
-  integrity sha512-kTArrrS7K5+WYTTO8Ktt1aYxKTO4/jUm3KmyvPVjf9iw7OhLtG9mU+X9dXo56DTAqmbIUfJgY3OQbWffcyNk7w==
-
-"@xterm/addon-search@0.16.0-beta.21":
-  version "0.16.0-beta.21"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.16.0-beta.21.tgz#b8a20e83c1ff24afa675c3723244b2068255688d"
-  integrity sha512-RVn8yRx+w6R7abWiIttyAR0+Myh+XCYOLAkwco3iIYgzlztmox3Qp6YNzWJj0G8iwSvzxaSu7Fbjbb2PXTOSIg==
-
-"@xterm/addon-serialize@0.14.0-beta.21":
-  version "0.14.0-beta.21"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.21.tgz#a074c5fdd2105c07574e6848babefef2905d84cb"
-  integrity sha512-Eg1QT2WG0pAIV+RrPv921+dVQvQqMhoFv2DQfMYDcqNbD2mTvIbX/ecEMb1bmn3WI0jNNomQ8UHZRFNRbDA+BA==
-
-"@xterm/addon-unicode11@0.9.0-beta.21":
-  version "0.9.0-beta.21"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.21.tgz#dc843df701e518bc459e77dcd4fd65fe49adbb4b"
-  integrity sha512-IiHYZ+88m5MCoAyOHWQ4xXzecOh6FsDDr8lZpJktbFHyzYjBlIDQ6z9cJg+3ApApfo5Xosnmzjs27kf7wG2L0w==
-
-"@xterm/addon-webgl@0.19.0-beta.21":
-  version "0.19.0-beta.21"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.21.tgz#68b92a47bf6768babd57bfbaf3ac97a7c670d8df"
-  integrity sha512-YV8Aaxp4QokXXehSCJ7NvudZKPDyBiXv4HqENqDpQllCj4hOWC5xJYSoFoPtu5+UhlzfqqvYRX/Il7QegPFPDg==
-
-"@xterm/headless@5.6.0-beta.21":
-  version "5.6.0-beta.21"
-  resolved "https://registry.yarnpkg.com/@xterm/headless/-/headless-5.6.0-beta.21.tgz#110fa33b59f4bf2d1de188e318bb944c8d774e97"
-  integrity sha512-RtKsv7KZb/ee8hwkvMNYuUofDoBR/KWUjoB5mo10C+dHyDJcMYiG2k48cAvcaJRjPH721iOELORKQk3NAlowkg==
-
-"@xterm/xterm@5.6.0-beta.21":
-  version "5.6.0-beta.21"
-  resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.6.0-beta.21.tgz#87a4e45752e5708cffc5c583d7f15e107313eb4e"
-  integrity sha512-1tLJaGudNSg1hEC+ZwUU7PiUvzURzKB5v1IRaJdmZK81ZCxvEF6Qfo281pTZsZFnv2iOWqFEC0C5uRmBXLm0lQ==
-
-"@xtuc/ieee754@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
-  integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
-
-"@xtuc/long@4.2.2":
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
-  integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
-
-abbrev@1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
-
-accepts@^1.3.5:
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
-  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
-  dependencies:
-    mime-types "~2.1.24"
-    negotiator "0.6.2"
-
-acorn-import-assertions@^1.7.6:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
-  integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
-
-acorn-import-assertions@^1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac"
-  integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==
-
-acorn-jsx@^5.0.0:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
-  integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==
-
-acorn-jsx@^5.3.2:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
-  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
-
-acorn-walk@^8.1.1:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
-  integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
-
-acorn@^6.0.7, acorn@^6.4.1:
-  version "6.4.2"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
-  integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
-
-acorn@^8.4.1:
-  version "8.4.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz#56c36251fc7cabc7096adc18f05afe814321a28c"
-  integrity sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==
-
-acorn@^8.7.1, acorn@^8.8.0:
-  version "8.8.2"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
-  integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
-
-acorn@^8.8.2:
-  version "8.11.3"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a"
-  integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
-
-agent-base@6:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.1.tgz#808007e4e5867decb0ab6ab2f928fbdb5a596db4"
-  integrity sha512-01q25QQDwLSsyfhrKbn8yuur+JNw0H+0Y4JiGIKd3z9aYk/w/2kxD/Upc+t2ZBBSUNff50VjPsSW2YxM8QYKVg==
-  dependencies:
-    debug "4"
-
-agent-base@^7.0.1, agent-base@^7.0.2, agent-base@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.0.tgz#536802b76bc0b34aa50195eb2442276d613e3434"
-  integrity sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==
-  dependencies:
-    debug "^4.3.4"
-
-ajv-formats@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520"
-  integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==
-  dependencies:
-    ajv "^8.0.0"
-
-ajv-keywords@^3.5.2:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
-  integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
-
-ajv-keywords@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16"
-  integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==
-  dependencies:
-    fast-deep-equal "^3.1.3"
-
-ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5, ajv@^6.9.1:
-  version "6.12.6"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
-  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-ajv@^8.0.0, ajv@^8.8.0:
-  version "8.12.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1"
-  integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    json-schema-traverse "^1.0.0"
-    require-from-string "^2.0.2"
-    uri-js "^4.2.2"
-
-amdefine@>=0.0.4:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
-  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
-
-ansi-colors@4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
-  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
-
-ansi-colors@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9"
-  integrity sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==
-  dependencies:
-    ansi-wrap "^0.1.0"
-
-ansi-colors@^3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.3.tgz#57d35b8686e851e2cc04c403f1c00203976a1813"
-  integrity sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==
-
-ansi-cyan@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-cyan/-/ansi-cyan-0.1.1.tgz#538ae528af8982f28ae30d86f2f17456d2609873"
-  integrity sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM=
-  dependencies:
-    ansi-wrap "0.1.0"
-
-ansi-escapes@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
-  integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
-
-ansi-gray@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"
-  integrity sha1-KWLPVOyXksSFEKPetSRDaGHvclE=
-  dependencies:
-    ansi-wrap "0.1.0"
-
-ansi-red@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-red/-/ansi-red-0.1.1.tgz#8c638f9d1080800a353c9c28c8a81ca4705d946c"
-  integrity sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw=
-  dependencies:
-    ansi-wrap "0.1.0"
-
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
-
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
-
-ansi-regex@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
-  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
-
-ansi-regex@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
-  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
-
-ansi-regex@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
-  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
-
-ansi-regex@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
-  integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
-
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
-
-ansi-styles@^3.2.0, ansi-styles@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
-  dependencies:
-    color-convert "^1.9.0"
-
-ansi-styles@^4.0.0, ansi-styles@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359"
-  integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==
-  dependencies:
-    "@types/color-name" "^1.1.1"
-    color-convert "^2.0.1"
-
-ansi-styles@^6.1.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
-  integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
-
-ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
-  integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768=
-
-any-promise@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
-  integrity sha1-q8av7tzqUugJzcA3au0845Y10X8=
-
-anymatch@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
-  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
-  dependencies:
-    micromatch "^3.1.4"
-    normalize-path "^2.1.1"
-
-anymatch@~3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
-  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
-  dependencies:
-    normalize-path "^3.0.0"
-    picomatch "^2.0.4"
-
-append-buffer@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/append-buffer/-/append-buffer-1.0.2.tgz#d8220cf466081525efea50614f3de6514dfa58f1"
-  integrity sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=
-  dependencies:
-    buffer-equal "^1.0.0"
-
-archy@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
-  integrity sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=
-
-are-docs-informative@^0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/are-docs-informative/-/are-docs-informative-0.0.2.tgz#387f0e93f5d45280373d387a59d34c96db321963"
-  integrity sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==
-
-arg@^4.1.0:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
-  integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
-
-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  dependencies:
-    sprintf-js "~1.0.2"
-
-argparse@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
-  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
-
-arr-diff@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-1.1.0.tgz#687c32758163588fef7de7b36fabe495eb1a399a"
-  integrity sha1-aHwydYFjWI/vfeezb6vklesaOZo=
-  dependencies:
-    arr-flatten "^1.0.1"
-    array-slice "^0.2.3"
-
-arr-diff@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
-  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
-
-arr-filter@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/arr-filter/-/arr-filter-1.1.2.tgz#43fdddd091e8ef11aa4c45d9cdc18e2dff1711ee"
-  integrity sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=
-  dependencies:
-    make-iterator "^1.0.0"
-
-arr-flatten@^1.0.1, arr-flatten@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
-  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
-
-arr-map@^2.0.0, arr-map@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/arr-map/-/arr-map-2.0.2.tgz#3a77345ffc1cf35e2a91825601f9e58f2e24cac4"
-  integrity sha1-Onc0X/wc814qkYJWAfnljy4kysQ=
-  dependencies:
-    make-iterator "^1.0.0"
-
-arr-union@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-2.1.0.tgz#20f9eab5ec70f5c7d215b1077b1c39161d292c7d"
-  integrity sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=
-
-arr-union@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
-  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
-
-array-back@^3.0.1, array-back@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/array-back/-/array-back-3.1.0.tgz#b8859d7a508871c9a7b2cf42f99428f65e96bfb0"
-  integrity sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==
-
-array-differ@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
-  integrity sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=
-
-array-each@^1.0.0, array-each@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f"
-  integrity sha1-p5SvDAWrF1KEbudTofIRoFugxE8=
-
-array-initial@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/array-initial/-/array-initial-1.1.0.tgz#2fa74b26739371c3947bd7a7adc73be334b3d795"
-  integrity sha1-L6dLJnOTccOUe9enrcc74zSz15U=
-  dependencies:
-    array-slice "^1.0.0"
-    is-number "^4.0.0"
-
-array-last@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/array-last/-/array-last-1.3.0.tgz#7aa77073fec565ddab2493f5f88185f404a9d336"
-  integrity sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==
-  dependencies:
-    is-number "^4.0.0"
-
-array-slice@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
-  integrity sha1-3Tz7gO15c6dRF82sabC5nshhhvU=
-
-array-slice@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4"
-  integrity sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==
-
-array-sort@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-sort/-/array-sort-1.0.0.tgz#e4c05356453f56f53512a7d1d6123f2c54c0a88a"
-  integrity sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==
-  dependencies:
-    default-compare "^1.0.0"
-    get-value "^2.0.6"
-    kind-of "^5.0.2"
-
-array-union@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
-  dependencies:
-    array-uniq "^1.0.1"
-
-array-union@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
-  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
-
-array-uniq@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
-
-array-unique@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
-  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
-
-arrify@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
-  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
-
-asar@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/asar/-/asar-3.0.3.tgz#1fef03c2d6d2de0cbad138788e4f7ae03b129c7b"
-  integrity sha512-k7zd+KoR+n8pl71PvgElcoKHrVNiSXtw7odKbyNpmgKe7EGRF9Pnu3uLOukD37EvavKwVFxOUpqXTIZC5B5Pmw==
-  dependencies:
-    chromium-pickle-js "^0.2.0"
-    commander "^5.0.0"
-    glob "^7.1.6"
-    minimatch "^3.0.4"
-  optionalDependencies:
-    "@types/glob" "^7.1.1"
-
-assign-symbols@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
-  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
-
-astral-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
-  integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
-
-async-done@^1.2.0, async-done@^1.2.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/async-done/-/async-done-1.3.2.tgz#5e15aa729962a4b07414f528a88cdf18e0b290a2"
-  integrity sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.2"
-    process-nextick-args "^2.0.0"
-    stream-exhaust "^1.0.1"
-
-async-each@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
-  integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
-
-async-settle@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/async-settle/-/async-settle-1.0.0.tgz#1d0a914bb02575bec8a8f3a74e5080f72b2c0c6b"
-  integrity sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=
-  dependencies:
-    async-done "^1.2.2"
-
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
-
-atob@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
-  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
-
-available-typed-arrays@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
-  integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
-
-b4a@^1.6.4:
-  version "1.6.4"
-  resolved "https://registry.yarnpkg.com/b4a/-/b4a-1.6.4.tgz#ef1c1422cae5ce6535ec191baeed7567443f36c9"
-  integrity sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw==
-
-bach@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/bach/-/bach-1.2.0.tgz#4b3ce96bf27134f79a1b414a51c14e34c3bd9880"
-  integrity sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=
-  dependencies:
-    arr-filter "^1.1.1"
-    arr-flatten "^1.0.1"
-    arr-map "^2.0.0"
-    array-each "^1.0.0"
-    array-initial "^1.0.0"
-    array-last "^1.1.1"
-    async-done "^1.2.2"
-    async-settle "^1.0.0"
-    now-and-later "^2.0.0"
-
-balanced-match@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
-  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
-
-base64-js@^1.3.1, base64-js@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
-  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
-
-base@^0.11.1:
-  version "0.11.2"
-  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
-  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
-  dependencies:
-    cache-base "^1.0.1"
-    class-utils "^0.3.5"
-    component-emitter "^1.2.1"
-    define-property "^1.0.0"
-    isobject "^3.0.1"
-    mixin-deep "^1.2.0"
-    pascalcase "^0.1.1"
-
-basic-auth@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a"
-  integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==
-  dependencies:
-    safe-buffer "5.1.2"
-
-before-after-hook@^2.2.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.2.tgz#a6e8ca41028d90ee2c24222f201c90956091613e"
-  integrity sha512-3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ==
-
-big.js@^5.2.2:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
-  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
-
-binary-extensions@^1.0.0:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
-  integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
-
-binary-extensions@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
-  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
-
-binaryextensions@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-1.0.1.tgz#1e637488b35b58bda5f4774bf96a5212a8c90755"
-  integrity sha1-HmN0iLNbWL2l9HdL+WpSEqjJB1U=
-
-bindings@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
-  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
-  dependencies:
-    file-uri-to-path "1.0.0"
-
-bl@^4.0.2, bl@^4.0.3:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
-  integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
-  dependencies:
-    buffer "^5.5.0"
-    inherits "^2.0.4"
-    readable-stream "^3.4.0"
-
-block-stream@*:
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
-  integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=
-  dependencies:
-    inherits "~2.0.0"
-
-boolbase@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
-  integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
-
-boolean@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.0.2.tgz#df1baa18b6a2b0e70840475e1d93ec8fe75b2570"
-  integrity sha512-RwywHlpCRc3/Wh81MiCKun4ydaIFyW5Ea6JbL6sRCVx5q5irDw7pMXBUFYF/jArQ6YrG36q0kpovc9P/Kd3I4g==
-
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-brace-expansion@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
-  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
-  dependencies:
-    balanced-match "^1.0.0"
-
-braces@^2.3.1, braces@^2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
-  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
-  dependencies:
-    arr-flatten "^1.1.0"
-    array-unique "^0.3.2"
-    extend-shallow "^2.0.1"
-    fill-range "^4.0.0"
-    isobject "^3.0.1"
-    repeat-element "^1.1.2"
-    snapdragon "^0.8.1"
-    snapdragon-node "^2.0.1"
-    split-string "^3.0.2"
-    to-regex "^3.0.1"
-
-braces@^3.0.1, braces@^3.0.2, braces@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
-  dependencies:
-    fill-range "^7.0.1"
-
-browser-stdout@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
-  integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
-
-browserify-zlib@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.1.4.tgz#bb35f8a519f600e0fa6b8485241c979d0141fb2d"
-  integrity sha512-19OEpq7vWgsH6WkvkBJQDFvJS1uPcbFOQ4v9CU839dO+ZZXUZO6XpE6hNCqvlIIj+4fZvRiJ6DsAQ382GwiyTQ==
-  dependencies:
-    pako "~0.2.0"
-
-browserslist@^4.0.0, browserslist@^4.14.5:
-  version "4.16.6"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
-  integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
-  dependencies:
-    caniuse-lite "^1.0.30001219"
-    colorette "^1.2.2"
-    electron-to-chromium "^1.3.723"
-    escalade "^3.1.1"
-    node-releases "^1.1.71"
-
-browserslist@^4.20.2:
-  version "4.21.3"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.3.tgz#5df277694eb3c48bc5c4b05af3e8b7e09c5a6d1a"
-  integrity sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==
-  dependencies:
-    caniuse-lite "^1.0.30001370"
-    electron-to-chromium "^1.4.202"
-    node-releases "^2.0.6"
-    update-browserslist-db "^1.0.5"
-
-browserslist@^4.21.10:
-  version "4.23.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.0.tgz#8f3acc2bbe73af7213399430890f86c63a5674ab"
-  integrity sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==
-  dependencies:
-    caniuse-lite "^1.0.30001587"
-    electron-to-chromium "^1.4.668"
-    node-releases "^2.0.14"
-    update-browserslist-db "^1.0.13"
-
-browserslist@^4.22.2:
-  version "4.22.3"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.3.tgz#299d11b7e947a6b843981392721169e27d60c5a6"
-  integrity sha512-UAp55yfwNv0klWNapjs/ktHoguxuQNGnOzxYmfnXIS+8AsRDZkSDxg7R1AX3GKzn078SBI5dzwzj/Yx0Or0e3A==
-  dependencies:
-    caniuse-lite "^1.0.30001580"
-    electron-to-chromium "^1.4.648"
-    node-releases "^2.0.14"
-    update-browserslist-db "^1.0.13"
-
-buffer-crc32@~0.2.3:
-  version "0.2.13"
-  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
-  integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
-
-buffer-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe"
-  integrity sha1-WWFrSYME1Var1GaWayLu2j7KX74=
-
-buffer-from@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
-  integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
-
-buffer@^5.5.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
-  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
-  dependencies:
-    base64-js "^1.3.1"
-    ieee754 "^1.1.13"
-
-builtin-modules@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6"
-  integrity sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==
-
-bytes@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
-  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
-
-c8@^9.1.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/c8/-/c8-9.1.0.tgz#0e57ba3ab9e5960ab1d650b4a86f71e53cb68112"
-  integrity sha512-mBWcT5iqNir1zIkzSPyI3NCR9EZCVI3WUD+AVO17MVWTSFNyUueXE82qTeampNtTr+ilN/5Ua3j24LgbCKjDVg==
-  dependencies:
-    "@bcoe/v8-coverage" "^0.2.3"
-    "@istanbuljs/schema" "^0.1.3"
-    find-up "^5.0.0"
-    foreground-child "^3.1.1"
-    istanbul-lib-coverage "^3.2.0"
-    istanbul-lib-report "^3.0.1"
-    istanbul-reports "^3.1.6"
-    test-exclude "^6.0.0"
-    v8-to-istanbul "^9.0.0"
-    yargs "^17.7.2"
-    yargs-parser "^21.1.1"
-
-cache-base@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
-  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
-  dependencies:
-    collection-visit "^1.0.0"
-    component-emitter "^1.2.1"
-    get-value "^2.0.6"
-    has-value "^1.0.0"
-    isobject "^3.0.1"
-    set-value "^2.0.0"
-    to-object-path "^0.3.0"
-    union-value "^1.0.0"
-    unset-value "^1.0.0"
-
-cache-content-type@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/cache-content-type/-/cache-content-type-1.0.1.tgz#035cde2b08ee2129f4a8315ea8f00a00dba1453c"
-  integrity sha512-IKufZ1o4Ut42YUrZSo8+qnMTrFuKkvyoLXUywKz9GJ5BrhOFGhLdkx9sG4KAnVvbY6kEcSFjLQul+DVmBm2bgA==
-  dependencies:
-    mime-types "^2.1.18"
-    ylru "^1.2.0"
-
-cacheable-lookup@^5.0.3:
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005"
-  integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==
-
-cacheable-request@^7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz#ea0d0b889364a25854757301ca12b2da77f91d27"
-  integrity sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==
-  dependencies:
-    clone-response "^1.0.2"
-    get-stream "^5.1.0"
-    http-cache-semantics "^4.0.0"
-    keyv "^4.0.0"
-    lowercase-keys "^2.0.0"
-    normalize-url "^6.0.1"
-    responselike "^2.0.0"
-
-call-bind@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.0.tgz#24127054bb3f9bdcb4b1fb82418186072f77b8ce"
-  integrity sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==
-  dependencies:
-    function-bind "^1.1.1"
-    get-intrinsic "^1.0.0"
-
-call-bind@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
-  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
-  dependencies:
-    function-bind "^1.1.1"
-    get-intrinsic "^1.0.2"
-
-callsites@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
-  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
-
-camelcase@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
-  integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo=
-
-camelcase@^5.0.0:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
-  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
-
-camelcase@^6.0.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
-  integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
-
-caniuse-api@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0"
-  integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==
-  dependencies:
-    browserslist "^4.0.0"
-    caniuse-lite "^1.0.0"
-    lodash.memoize "^4.1.2"
-    lodash.uniq "^4.5.0"
-
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001219:
-  version "1.0.30001228"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz#bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa"
-  integrity sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==
-
-caniuse-lite@^1.0.30001370:
-  version "1.0.30001373"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001373.tgz#2dc3bc3bfcb5d5a929bec11300883040d7b4b4be"
-  integrity sha512-pJYArGHrPp3TUqQzFYRmP/lwJlj8RCbVe3Gd3eJQkAV8SAC6b19XS9BjMvRdvaS8RMkaTN8ZhoHP6S1y8zzwEQ==
-
-caniuse-lite@^1.0.30001580:
-  version "1.0.30001581"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001581.tgz#0dfd4db9e94edbdca67d57348ebc070dece279f4"
-  integrity sha512-whlTkwhqV2tUmP3oYhtNfaWGYHDdS3JYFQBKXxcUR9qqPWsRhFHhoISO2Xnl/g0xyKzht9mI1LZpiNWfMzHixQ==
-
-caniuse-lite@^1.0.30001587:
-  version "1.0.30001600"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001600.tgz#93a3ee17a35aa6a9f0c6ef1b2ab49507d1ab9079"
-  integrity sha512-+2S9/2JFhYmYaDpZvo0lKkfvuKIglrx68MwOBqMGHhQsNkLjB5xtc/TGoEPs+MxjSyN/72qer2g97nzR641mOQ==
-
-chalk@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
-chalk@^2.0.0, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-chalk@^4.0.0, chalk@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
-  integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
-chalk@^4.x:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
-  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
-chardet@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
-  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
-
-charenc@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
-  integrity sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==
-
-chokidar@3.5.3, chokidar@^3.5.3:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
-  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
-  dependencies:
-    anymatch "~3.1.2"
-    braces "~3.0.2"
-    glob-parent "~5.1.2"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.6.0"
-  optionalDependencies:
-    fsevents "~2.3.2"
-
-chokidar@^2.0.0:
-  version "2.1.8"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
-  integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
-  dependencies:
-    anymatch "^2.0.0"
-    async-each "^1.0.1"
-    braces "^2.3.2"
-    glob-parent "^3.1.0"
-    inherits "^2.0.3"
-    is-binary-path "^1.0.0"
-    is-glob "^4.0.0"
-    normalize-path "^3.0.0"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.2.1"
-    upath "^1.1.1"
-  optionalDependencies:
-    fsevents "^1.2.7"
-
-chownr@^1.1.1:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
-  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
-
-chownr@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
-  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
-
-chrome-remote-interface@^0.33.0:
-  version "0.33.0"
-  resolved "https://registry.yarnpkg.com/chrome-remote-interface/-/chrome-remote-interface-0.33.0.tgz#9140b5612ee5cdc39212cd0296d3b61ea881c47a"
-  integrity sha512-tv/SgeBfShXk43fwFpQ9wnS7mOCPzETnzDXTNxCb6TqKOiOeIfbrJz+2NAp8GmzwizpKa058wnU1Te7apONaYg==
-  dependencies:
-    commander "2.11.x"
-    ws "^7.2.0"
-
-chrome-trace-event@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4"
-  integrity sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==
-  dependencies:
-    tslib "^1.9.0"
-
-chromium-pickle-js@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205"
-  integrity sha1-BKEGZywYsIWrd02YPfo+oTjyIgU=
-
-ci-info@^1.5.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497"
-  integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==
-
-class-utils@^0.3.5:
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
-  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
-  dependencies:
-    arr-union "^3.1.0"
-    define-property "^0.2.5"
-    isobject "^3.0.0"
-    static-extend "^0.1.1"
-
-cli-cursor@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
-  integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
-  dependencies:
-    restore-cursor "^2.0.0"
-
-cli-width@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
-  integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==
-
-cliui@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
-  integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=
-  dependencies:
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wrap-ansi "^2.0.0"
-
-cliui@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
-  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
-  dependencies:
-    string-width "^3.1.0"
-    strip-ansi "^5.2.0"
-    wrap-ansi "^5.1.0"
-
-cliui@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
-  integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
-  dependencies:
-    string-width "^4.2.0"
-    strip-ansi "^6.0.0"
-    wrap-ansi "^6.2.0"
-
-cliui@^7.0.2:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
-  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
-  dependencies:
-    string-width "^4.2.0"
-    strip-ansi "^6.0.0"
-    wrap-ansi "^7.0.0"
-
-cliui@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
-  integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
-  dependencies:
-    string-width "^4.2.0"
-    strip-ansi "^6.0.1"
-    wrap-ansi "^7.0.0"
-
-clone-buffer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
-  integrity sha1-4+JbIHrE5wGvch4staFnksrD3Fg=
-
-clone-deep@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
-  integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==
-  dependencies:
-    is-plain-object "^2.0.4"
-    kind-of "^6.0.2"
-    shallow-clone "^3.0.0"
-
-clone-response@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
-  integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=
-  dependencies:
-    mimic-response "^1.0.0"
-
-clone-stats@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1"
-  integrity sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=
-
-clone-stats@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680"
-  integrity sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=
-
-clone@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
-  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
-
-clone@^2.1.1, clone@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
-  integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
-
-cloneable-readable@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz#120a00cb053bfb63a222e709f9683ea2e11d8cec"
-  integrity sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==
-  dependencies:
-    inherits "^2.0.1"
-    process-nextick-args "^2.0.0"
-    readable-stream "^2.3.5"
-
-co@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
-
-code-block-writer@^12.0.0:
-  version "12.0.0"
-  resolved "https://registry.yarnpkg.com/code-block-writer/-/code-block-writer-12.0.0.tgz#4dd58946eb4234105aff7f0035977b2afdc2a770"
-  integrity sha512-q4dMFMlXtKR3XNBHyMHt/3pwYNA69EDk00lloMOaaUMKPUXBw6lpXtbu3MMVG6/uOihGnRDOlkyqsONEUj60+w==
-
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
-
-collection-map@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/collection-map/-/collection-map-1.0.0.tgz#aea0f06f8d26c780c2b75494385544b2255af18c"
-  integrity sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=
-  dependencies:
-    arr-map "^2.0.2"
-    for-own "^1.0.0"
-    make-iterator "^1.0.0"
-
-collection-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
-  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
-  dependencies:
-    map-visit "^1.0.0"
-    object-visit "^1.0.0"
-
-color-convert@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
-  dependencies:
-    color-name "1.1.3"
-
-color-convert@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
-  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
-  dependencies:
-    color-name "~1.1.4"
-
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
-
-color-name@~1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
-  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-
-color-support@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
-  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
-
-colord@^2.9.1:
-  version "2.9.3"
-  resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43"
-  integrity sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==
-
-colorette@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
-  integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
-
-colorette@^2.0.14:
-  version "2.0.19"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798"
-  integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==
-
-combined-stream@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
-  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
-  dependencies:
-    delayed-stream "~1.0.0"
-
-command-line-args@^5.2.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/command-line-args/-/command-line-args-5.2.1.tgz#c44c32e437a57d7c51157696893c5909e9cec42e"
-  integrity sha512-H4UfQhZyakIjC74I9d34fGYDwk3XpSr17QhEd0Q3I9Xq1CETHo4Hcuo87WyWHpAF1aSLjLRf5lD9ZGX2qStUvg==
-  dependencies:
-    array-back "^3.1.0"
-    find-replace "^3.0.0"
-    lodash.camelcase "^4.3.0"
-    typical "^4.0.0"
-
-commander@2.11.x:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
-  integrity sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==
-
-commander@^10.0.1:
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06"
-  integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==
-
-commander@^2.19.0, commander@^2.20.0:
-  version "2.20.3"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
-  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
-
-commander@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
-  integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
-
-commander@^7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
-  integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
-
-commander@^9.4.0:
-  version "9.5.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-9.5.0.tgz#bc08d1eb5cedf7ccb797a96199d41c7bc3e60d30"
-  integrity sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==
-
-comment-parser@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.4.0.tgz#0f8c560f59698193854f12884c20c0e39a26d32c"
-  integrity sha512-QLyTNiZ2KDOibvFPlZ6ZngVsZ/0gYnE6uTXi5aoDg8ed3AkJAz4sEje3Y8a29hQ1s6A99MZXe47fLAXQ1rTqaw==
-
-component-emitter@^1.2.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
-  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
-
-concat-stream@^1.6.0:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
-  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
-  dependencies:
-    buffer-from "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^2.2.2"
-    typedarray "^0.0.6"
-
-concat-with-sourcemaps@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e"
-  integrity sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==
-  dependencies:
-    source-map "^0.6.1"
-
-config-chain@^1.1.12:
-  version "1.1.12"
-  resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa"
-  integrity sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==
-  dependencies:
-    ini "^1.3.4"
-    proto-list "~1.2.1"
-
-content-disposition@~0.5.2:
-  version "0.5.4"
-  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
-  integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==
-  dependencies:
-    safe-buffer "5.2.1"
-
-content-type@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
-  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
-
-convert-source-map@^1.0.0, convert-source-map@^1.5.0, convert-source-map@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
-  integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
-  dependencies:
-    safe-buffer "~5.1.1"
-
-convert-source-map@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
-  integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
-
-cookie@^0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
-  integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
-
-cookie@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
-  integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
-
-cookies@~0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/cookies/-/cookies-0.8.0.tgz#1293ce4b391740a8406e3c9870e828c4b54f3f90"
-  integrity sha512-8aPsApQfebXnuI+537McwYsDtjVxGm8gTIzQI3FDW6t5t/DAhERxtnbEPN/8RX+uZthoz4eCOgloXaE5cYyNow==
-  dependencies:
-    depd "~2.0.0"
-    keygrip "~1.1.0"
-
-copy-descriptor@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
-  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
-
-copy-props@^2.0.1:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/copy-props/-/copy-props-2.0.5.tgz#03cf9ae328d4ebb36f8f1d804448a6af9ee3f2d2"
-  integrity sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw==
-  dependencies:
-    each-props "^1.3.2"
-    is-plain-object "^5.0.0"
-
-copy-webpack-plugin@^11.0.0:
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz#96d4dbdb5f73d02dd72d0528d1958721ab72e04a"
-  integrity sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==
-  dependencies:
-    fast-glob "^3.2.11"
-    glob-parent "^6.0.1"
-    globby "^13.1.1"
-    normalize-path "^3.0.0"
-    schema-utils "^4.0.0"
-    serialize-javascript "^6.0.0"
-
-core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
-
-create-require@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
-  integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
-
-cross-spawn@^6.0.0, cross-spawn@^6.0.5:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
-  dependencies:
-    nice-try "^1.0.4"
-    path-key "^2.0.1"
-    semver "^5.5.0"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
-cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
-  dependencies:
-    path-key "^3.1.0"
-    shebang-command "^2.0.0"
-    which "^2.0.1"
-
-crypt@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
-  integrity sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==
-
-css-declaration-sorter@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-7.1.1.tgz#9796bcc257b4647c39993bda8d431ce32b666f80"
-  integrity sha512-dZ3bVTEEc1vxr3Bek9vGwfB5Z6ESPULhcRvO472mfjVnj8jRcTnKO8/JTczlvxM10Myb+wBM++1MtdO76eWcaQ==
-
-css-loader@^6.9.1:
-  version "6.9.1"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.9.1.tgz#9ec9a434368f2bdfeffbf8f6901a1ce773586c6b"
-  integrity sha512-OzABOh0+26JKFdMzlK6PY1u5Zx8+Ck7CVRlcGNZoY9qwJjdfu2VWFuprTIpPW+Av5TZTVViYWcFQaEEQURLknQ==
-  dependencies:
-    icss-utils "^5.1.0"
-    postcss "^8.4.33"
-    postcss-modules-extract-imports "^3.0.0"
-    postcss-modules-local-by-default "^4.0.4"
-    postcss-modules-scope "^3.1.1"
-    postcss-modules-values "^4.0.0"
-    postcss-value-parser "^4.2.0"
-    semver "^7.5.4"
-
-css-select@^4.1.3:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.2.1.tgz#9e665d6ae4c7f9d65dbe69d0316e3221fb274cdd"
-  integrity sha512-/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ==
-  dependencies:
-    boolbase "^1.0.0"
-    css-what "^5.1.0"
-    domhandler "^4.3.0"
-    domutils "^2.8.0"
-    nth-check "^2.0.1"
-
-css-select@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-5.1.0.tgz#b8ebd6554c3637ccc76688804ad3f6a6fdaea8a6"
-  integrity sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==
-  dependencies:
-    boolbase "^1.0.0"
-    css-what "^6.1.0"
-    domhandler "^5.0.2"
-    domutils "^3.0.1"
-    nth-check "^2.0.1"
-
-css-tree@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.2.tgz#9ae393b5dafd7dae8a622475caec78d3d8fbd7b5"
-  integrity sha512-wCoWush5Aeo48GLhfHPbmvZs59Z+M7k5+B1xDnXbdWNcEF423DoFdqSWE0PM5aNk5nI5cp1q7ms36zGApY/sKQ==
-  dependencies:
-    mdn-data "2.0.14"
-    source-map "^0.6.1"
-
-css-tree@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d"
-  integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==
-  dependencies:
-    mdn-data "2.0.14"
-    source-map "^0.6.1"
-
-css-tree@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.3.1.tgz#10264ce1e5442e8572fc82fbe490644ff54b5c20"
-  integrity sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==
-  dependencies:
-    mdn-data "2.0.30"
-    source-map-js "^1.0.1"
-
-css-tree@~2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.2.1.tgz#36115d382d60afd271e377f9c5f67d02bd48c032"
-  integrity sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==
-  dependencies:
-    mdn-data "2.0.28"
-    source-map-js "^1.0.1"
-
-css-what@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe"
-  integrity sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==
-
-css-what@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4"
-  integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==
-
-css@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/css/-/css-3.0.0.tgz#4447a4d58fdd03367c516ca9f64ae365cee4aa5d"
-  integrity sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==
-  dependencies:
-    inherits "^2.0.4"
-    source-map "^0.6.1"
-    source-map-resolve "^0.6.0"
-
-cssesc@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
-  integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
-
-cssnano-preset-default@^6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-6.0.3.tgz#b4ce755974f4dc8d3d09ac13bb6281cce3ced45e"
-  integrity sha512-4y3H370aZCkT9Ev8P4SO4bZbt+AExeKhh8wTbms/X7OLDo5E7AYUUy6YPxa/uF5Grf+AJwNcCnxKhZynJ6luBA==
-  dependencies:
-    css-declaration-sorter "^7.1.1"
-    cssnano-utils "^4.0.1"
-    postcss-calc "^9.0.1"
-    postcss-colormin "^6.0.2"
-    postcss-convert-values "^6.0.2"
-    postcss-discard-comments "^6.0.1"
-    postcss-discard-duplicates "^6.0.1"
-    postcss-discard-empty "^6.0.1"
-    postcss-discard-overridden "^6.0.1"
-    postcss-merge-longhand "^6.0.2"
-    postcss-merge-rules "^6.0.3"
-    postcss-minify-font-values "^6.0.1"
-    postcss-minify-gradients "^6.0.1"
-    postcss-minify-params "^6.0.2"
-    postcss-minify-selectors "^6.0.2"
-    postcss-normalize-charset "^6.0.1"
-    postcss-normalize-display-values "^6.0.1"
-    postcss-normalize-positions "^6.0.1"
-    postcss-normalize-repeat-style "^6.0.1"
-    postcss-normalize-string "^6.0.1"
-    postcss-normalize-timing-functions "^6.0.1"
-    postcss-normalize-unicode "^6.0.2"
-    postcss-normalize-url "^6.0.1"
-    postcss-normalize-whitespace "^6.0.1"
-    postcss-ordered-values "^6.0.1"
-    postcss-reduce-initial "^6.0.2"
-    postcss-reduce-transforms "^6.0.1"
-    postcss-svgo "^6.0.2"
-    postcss-unique-selectors "^6.0.2"
-
-cssnano-utils@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-4.0.1.tgz#fd18b42f95938bf55ab47967705355d6047bf1da"
-  integrity sha512-6qQuYDqsGoiXssZ3zct6dcMxiqfT6epy7x4R0TQJadd4LWO3sPR6JH6ZByOvVLoZ6EdwPGgd7+DR1EmX3tiXQQ==
-
-cssnano@^6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-6.0.3.tgz#46db972da71aa159437287fb4c6bc9c5d3cc5d93"
-  integrity sha512-MRq4CIj8pnyZpcI2qs6wswoYoDD1t0aL28n+41c1Ukcpm56m1h6mCexIHBGjfZfnTqtGSSCP4/fB1ovxgjBOiw==
-  dependencies:
-    cssnano-preset-default "^6.0.3"
-    lilconfig "^3.0.0"
-
-csso@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529"
-  integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==
-  dependencies:
-    css-tree "^1.1.2"
-
-csso@^5.0.5:
-  version "5.0.5"
-  resolved "https://registry.yarnpkg.com/csso/-/csso-5.0.5.tgz#f9b7fe6cc6ac0b7d90781bb16d5e9874303e2ca6"
-  integrity sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==
-  dependencies:
-    css-tree "~2.2.0"
-
-d@1, d@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a"
-  integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==
-  dependencies:
-    es5-ext "^0.10.50"
-    type "^1.0.1"
-
-debounce@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.1.0.tgz#6a1a4ee2a9dc4b7c24bb012558dbcdb05b37f408"
-  integrity sha512-ZQVKfRVlwRfD150ndzEK8M90ABT+Y/JQKs4Y7U4MXdpuoUkkrr4DwKbVux3YjylA5bUMUj0Nc3pMxPJX6N2QQQ==
-
-debug-fabulous@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/debug-fabulous/-/debug-fabulous-1.1.0.tgz#af8a08632465224ef4174a9f06308c3c2a1ebc8e"
-  integrity sha512-GZqvGIgKNlUnHUPQhepnUZFIMoi3dgZKQBzKDeL2g7oJF9SNAji/AAu36dusFUas0O+pae74lNeoIPHqXWDkLg==
-  dependencies:
-    debug "3.X"
-    memoizee "0.4.X"
-    object-assign "4.X"
-
-debug@2.6.9, debug@^2.2.0, debug@^2.3.3:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
-  dependencies:
-    ms "2.0.0"
-
-debug@3.X, debug@^3.1.0:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
-  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
-  dependencies:
-    ms "^2.1.1"
-
-debug@4, debug@4.3.4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
-  dependencies:
-    ms "2.1.2"
-
-decamelize@^1.1.1, decamelize@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
-
-decamelize@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837"
-  integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==
-
-decode-uri-component@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
-  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
-
-decompress-response@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc"
-  integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==
-  dependencies:
-    mimic-response "^3.1.0"
-
-deemon@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/deemon/-/deemon-1.8.0.tgz#7b9498905634a89bfe6db11b5edf779e2fac5248"
-  integrity sha512-qcuSMls/W5DdoEKKAF0PiNQrc8+tItFjvszfjNm1YqNv1p5wwEt+6qILA9sws6eM81nmNwD38ducqlgIXzQlsQ==
-  dependencies:
-    bl "^4.0.2"
-    tree-kill "^1.2.2"
-
-deep-equal@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
-  integrity sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=
-
-deep-extend@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
-  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
-
-deep-is@^0.1.3:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
-  integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
-
-deep-is@~0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
-  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
-
-deepmerge-json@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/deepmerge-json/-/deepmerge-json-1.5.0.tgz#6daa3600d53fc1f646604853bc99e95e260fbda0"
-  integrity sha512-jZRrDmBKjmGcqMFEUJ14FjMJwm05Qaked+1vxaALRtF0UAl7lPU8OLWXFxvoeg3jbQM249VPFVn8g2znaQkEtA==
-
-deepmerge@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-3.1.0.tgz#a612626ce4803da410d77554bfd80361599c034d"
-  integrity sha512-/TnecbwXEdycfbsM2++O3eGiatEFHjjNciHEwJclM+T5Kd94qD1AP+2elP/Mq0L5b9VZJao5znR01Mz6eX8Seg==
-
-default-compare@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/default-compare/-/default-compare-1.0.0.tgz#cb61131844ad84d84788fb68fd01681ca7781a2f"
-  integrity sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==
-  dependencies:
-    kind-of "^5.0.2"
-
-default-resolution@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/default-resolution/-/default-resolution-2.0.0.tgz#bcb82baa72ad79b426a76732f1a81ad6df26d684"
-  integrity sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=
-
-defer-to-connect@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587"
-  integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==
-
-define-properties@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
-  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
-  dependencies:
-    object-keys "^1.0.12"
-
-define-property@^0.2.5:
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
-  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
-  dependencies:
-    is-descriptor "^0.1.0"
-
-define-property@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
-  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
-  dependencies:
-    is-descriptor "^1.0.0"
-
-define-property@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
-  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
-  dependencies:
-    is-descriptor "^1.0.2"
-    isobject "^3.0.1"
-
-delayed-stream@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-0.0.6.tgz#a2646cb7ec3d5d7774614670a7a65de0c173edbc"
-  integrity sha1-omRst+w9XXd0YUZwp6Zd4MFz7bw=
-
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
-
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
-
-depd@2.0.0, depd@^2.0.0, depd@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
-  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
-
-depd@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
-
-deprecation@^2.0.0, deprecation@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
-  integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
-
-destroy@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
-  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
-
-detect-file@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
-  integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
-
-detect-indent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
-  integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50=
-
-detect-libc@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd"
-  integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==
-
-detect-newline@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
-  integrity sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=
-
-detect-node@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
-  integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
-
-diff@5.0.0, diff@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b"
-  integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==
-
-diff@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
-  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
-
-dir-glob@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
-  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
-  dependencies:
-    path-type "^4.0.0"
-
-doctrine@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
-  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
-  dependencies:
-    esutils "^2.0.2"
-
-dom-serializer@^1.0.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91"
-  integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==
-  dependencies:
-    domelementtype "^2.0.1"
-    domhandler "^4.2.0"
-    entities "^2.0.0"
-
-dom-serializer@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53"
-  integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==
-  dependencies:
-    domelementtype "^2.3.0"
-    domhandler "^5.0.2"
-    entities "^4.2.0"
-
-domelementtype@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.1.0.tgz#a851c080a6d1c3d94344aed151d99f669edf585e"
-  integrity sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==
-
-domelementtype@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57"
-  integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==
-
-domelementtype@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
-  integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
-
-domhandler@^4.2.0, domhandler@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.0.tgz#16c658c626cf966967e306f966b431f77d4a5626"
-  integrity sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==
-  dependencies:
-    domelementtype "^2.2.0"
-
-domhandler@^5.0.2, domhandler@^5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31"
-  integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==
-  dependencies:
-    domelementtype "^2.3.0"
-
-domutils@^2.8.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
-  integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==
-  dependencies:
-    dom-serializer "^1.0.1"
-    domelementtype "^2.2.0"
-    domhandler "^4.2.0"
-
-domutils@^3.0.1:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.1.0.tgz#c47f551278d3dc4b0b1ab8cbb42d751a6f0d824e"
-  integrity sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==
-  dependencies:
-    dom-serializer "^2.0.0"
-    domelementtype "^2.3.0"
-    domhandler "^5.0.3"
-
-duplexer@^0.1.1, duplexer@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
-  integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=
-
-duplexify@^3.5.0, duplexify@^3.6.0:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
-  integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
-  dependencies:
-    end-of-stream "^1.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-    stream-shift "^1.0.0"
-
-each-props@^1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/each-props/-/each-props-1.3.2.tgz#ea45a414d16dd5cfa419b1a81720d5ca06892333"
-  integrity sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==
-  dependencies:
-    is-plain-object "^2.0.1"
-    object.defaults "^1.1.0"
-
-eastasianwidth@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
-  integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
-
-editorconfig@^0.15.2:
-  version "0.15.2"
-  resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.2.tgz#047be983abb9ab3c2eefe5199cb2b7c5689f0702"
-  integrity sha512-GWjSI19PVJAM9IZRGOS+YKI8LN+/sjkSjNyvxL5ucqP9/IqtYNXBaQ/6c/hkPNYQHyOHra2KoXZI/JVpuqwmcQ==
-  dependencies:
-    "@types/node" "^10.11.7"
-    "@types/semver" "^5.5.0"
-    commander "^2.19.0"
-    lru-cache "^4.1.3"
-    semver "^5.6.0"
-    sigmund "^1.0.1"
-
-ee-first@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
-  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
-
-electron-to-chromium@^1.3.723:
-  version "1.3.737"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.737.tgz#196f2e9656f4f3c31930750e1899c091b72d36b5"
-  integrity sha512-P/B84AgUSQXaum7a8m11HUsYL8tj9h/Pt5f7Hg7Ty6bm5DxlFq+e5+ouHUoNQMsKDJ7u4yGfI8mOErCmSH9wyg==
-
-electron-to-chromium@^1.4.202:
-  version "1.4.207"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.207.tgz#9c3310ebace2952903d05dcaba8abe3a4ed44c01"
-  integrity sha512-piH7MJDJp4rJCduWbVvmUd59AUne1AFBJ8JaRQvk0KzNTSUnZrVXHCZc+eg+CGE4OujkcLJznhGKD6tuAshj5Q==
-
-electron-to-chromium@^1.4.648:
-  version "1.4.648"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.648.tgz#c7b46c9010752c37bb4322739d6d2dd82354fbe4"
-  integrity sha512-EmFMarXeqJp9cUKu/QEciEApn0S/xRcpZWuAm32U7NgoZCimjsilKXHRO9saeEW55eHZagIDg6XTUOv32w9pjg==
-
-electron-to-chromium@^1.4.668:
-  version "1.4.717"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.717.tgz#99db370cae8cd090d5b01f8748e9ad369924d0f8"
-  integrity sha512-6Fmg8QkkumNOwuZ/5mIbMU9WI3H2fmn5ajcVya64I5Yr5CcNmO7vcLt0Y7c96DCiMO5/9G+4sI2r6eEvdg1F7A==
-
-electron@29.4.0:
-  version "29.4.0"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-29.4.0.tgz#5dcd5a977414337a2518619e9166c0e86a5a3bae"
-  integrity sha512-4DTO8U66oiI8rShrDSu2zDPW6GWRiCebyb1MHSfQkLWCNI/PnLyGKeqYPUoVgc0FWaNN2sCBn8NKJHb++hE2LQ==
-  dependencies:
-    "@electron/get" "^2.0.0"
-    "@types/node" "^20.9.0"
-    extract-zip "^2.0.1"
-
-emoji-regex@^7.0.1:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
-  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
-
-emoji-regex@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
-  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
-
-emoji-regex@^9.2.2:
-  version "9.2.2"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
-  integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
-
-emojis-list@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
-  integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
-
-encodeurl@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
-  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
-
-end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
-  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
-  dependencies:
-    once "^1.4.0"
-
-enhanced-resolve@^5.0.0:
-  version "5.8.2"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz#15ddc779345cbb73e97c611cd00c01c1e7bf4d8b"
-  integrity sha512-F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA==
-  dependencies:
-    graceful-fs "^4.2.4"
-    tapable "^2.2.0"
-
-enhanced-resolve@^5.10.0:
-  version "5.12.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634"
-  integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==
-  dependencies:
-    graceful-fs "^4.2.4"
-    tapable "^2.2.0"
-
-enhanced-resolve@^5.15.0:
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz#1af946c7d93603eb88e9896cee4904dc012e9c35"
-  integrity sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==
-  dependencies:
-    graceful-fs "^4.2.4"
-    tapable "^2.2.0"
-
-enhanced-resolve@^5.16.0:
-  version "5.16.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.16.0.tgz#65ec88778083056cb32487faa9aef82ed0864787"
-  integrity sha512-O+QWCviPNSSLAD9Ucn8Awv+poAkqn3T1XY5/N7kR7rQO9yfSGWkYZDwpJ+iKF7B8rxaQKWngSqACpgzeapSyoA==
-  dependencies:
-    graceful-fs "^4.2.4"
-    tapable "^2.2.0"
-
-entities@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
-  integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==
-
-entities@^4.2.0, entities@^4.4.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
-  integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
-
-env-paths@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43"
-  integrity sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==
-
-envinfo@^7.7.3:
-  version "7.8.1"
-  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475"
-  integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==
-
-errno@^0.1.3:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f"
-  integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==
-  dependencies:
-    prr "~1.0.1"
-
-error-ex@^1.2.0, error-ex@^1.3.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
-  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
-  dependencies:
-    is-arrayish "^0.2.1"
-
-es-abstract@^1.18.0-next.1:
-  version "1.18.0-next.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz#6e3a0a4bda717e5023ab3b8e90bec36108d22c68"
-  integrity sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==
-  dependencies:
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-    is-callable "^1.2.2"
-    is-negative-zero "^2.0.0"
-    is-regex "^1.1.1"
-    object-inspect "^1.8.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.1"
-    string.prototype.trimend "^1.0.1"
-    string.prototype.trimstart "^1.0.1"
-
-es-module-lexer@^0.9.0:
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19"
-  integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==
-
-es-module-lexer@^1.2.1:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.5.0.tgz#4878fee3789ad99e065f975fdd3c645529ff0236"
-  integrity sha512-pqrTKmwEIgafsYZAGw9kszYzmagcE/n4dbgwGWLEXg7J4QFJVQRBld8j3Q3GNez79jzxZshq0bcT962QHOghjw==
-
-es-to-primitive@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
-  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
-  dependencies:
-    is-callable "^1.1.4"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.2"
-
-es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@^0.10.53, es5-ext@^0.10.62, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46:
-  version "0.10.63"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.63.tgz#9c222a63b6a332ac80b1e373b426af723b895bd6"
-  integrity sha512-hUCZd2Byj/mNKjfP9jXrdVZ62B8KuA/VoK7X8nUh5qT+AxDmcbvZz041oDVZdbIN1qW6XY9VDNwzkvKnZvK2TQ==
-  dependencies:
-    es6-iterator "^2.0.3"
-    es6-symbol "^3.1.3"
-    esniff "^2.0.1"
-    next-tick "^1.1.0"
-
-es6-error@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
-  integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==
-
-es6-iterator@^2.0.1, es6-iterator@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
-  integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c=
-  dependencies:
-    d "1"
-    es5-ext "^0.10.35"
-    es6-symbol "^3.1.1"
-
-es6-symbol@^3.1.1, es6-symbol@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18"
-  integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==
-  dependencies:
-    d "^1.0.1"
-    ext "^1.1.2"
-
-es6-weak-map@^2.0.1, es6-weak-map@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.3.tgz#b6da1f16cc2cc0d9be43e6bdbfc5e7dfcdf31d53"
-  integrity sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==
-  dependencies:
-    d "1"
-    es5-ext "^0.10.46"
-    es6-iterator "^2.0.3"
-    es6-symbol "^3.1.1"
-
-escalade@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
-  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
-
-escape-html@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
-  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
-
-escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
-  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
-
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.3, escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-
-eslint-plugin-header@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-header/-/eslint-plugin-header-3.1.1.tgz#6ce512432d57675265fac47292b50d1eff11acd6"
-  integrity sha512-9vlKxuJ4qf793CmeeSrZUvVClw6amtpghq3CuWcB5cUNnWHQhgcqy5eF8oVKFk1G3Y/CbchGfEaw3wiIJaNmVg==
-
-eslint-plugin-jsdoc@^46.5.0:
-  version "46.5.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-46.5.0.tgz#02e7945701a01fab76e7ced850d4d1eea63c23c0"
-  integrity sha512-aulXdA4I1dyWpzyS1Nh/GNoS6PavzeucxEapnMR4JUERowWvaEk2Y4A5irpHAcdXtBBHLVe8WIhdXNjoAlGQgA==
-  dependencies:
-    "@es-joy/jsdoccomment" "~0.40.1"
-    are-docs-informative "^0.0.2"
-    comment-parser "1.4.0"
-    debug "^4.3.4"
-    escape-string-regexp "^4.0.0"
-    esquery "^1.5.0"
-    is-builtin-module "^3.2.1"
-    semver "^7.5.4"
-    spdx-expression-parse "^3.0.1"
-
-eslint-plugin-local@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-local/-/eslint-plugin-local-1.0.0.tgz#f0c07011c95fec42bfb4d909debb6ea035f3b2a4"
-  integrity sha512-bcwcQnKL/Iw5Vi/F2lG1he5oKD2OGjhsLmrcctkWrWq5TujgiaYb0cj3pZgr3XI54inNVnneOFdAx1daLoYLJQ==
-
-eslint-scope@5.1.1, eslint-scope@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
-  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
-  dependencies:
-    esrecurse "^4.3.0"
-    estraverse "^4.1.1"
-
-eslint-scope@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
-  integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==
-  dependencies:
-    esrecurse "^4.1.0"
-    estraverse "^4.1.1"
-
-eslint-scope@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642"
-  integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==
-  dependencies:
-    esrecurse "^4.3.0"
-    estraverse "^5.2.0"
-
-eslint-utils@^1.3.1:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
-  integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==
-  dependencies:
-    eslint-visitor-keys "^1.1.0"
-
-eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
-  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
-
-eslint-visitor-keys@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
-  integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
-
-eslint-visitor-keys@^3.4.1:
-  version "3.4.3"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
-  integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
-
-eslint@8.36.0:
-  version "8.36.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.36.0.tgz#1bd72202200a5492f91803b113fb8a83b11285cf"
-  integrity sha512-Y956lmS7vDqomxlaaQAHVmeb4tNMp2FWIvU/RnU5BD3IKMD/MJPr76xdyr68P8tV1iNMvN2mRK0yy3c+UjL+bw==
-  dependencies:
-    "@eslint-community/eslint-utils" "^4.2.0"
-    "@eslint-community/regexpp" "^4.4.0"
-    "@eslint/eslintrc" "^2.0.1"
-    "@eslint/js" "8.36.0"
-    "@humanwhocodes/config-array" "^0.11.8"
-    "@humanwhocodes/module-importer" "^1.0.1"
-    "@nodelib/fs.walk" "^1.2.8"
-    ajv "^6.10.0"
-    chalk "^4.0.0"
-    cross-spawn "^7.0.2"
-    debug "^4.3.2"
-    doctrine "^3.0.0"
-    escape-string-regexp "^4.0.0"
-    eslint-scope "^7.1.1"
-    eslint-visitor-keys "^3.3.0"
-    espree "^9.5.0"
-    esquery "^1.4.2"
-    esutils "^2.0.2"
-    fast-deep-equal "^3.1.3"
-    file-entry-cache "^6.0.1"
-    find-up "^5.0.0"
-    glob-parent "^6.0.2"
-    globals "^13.19.0"
-    grapheme-splitter "^1.0.4"
-    ignore "^5.2.0"
-    import-fresh "^3.0.0"
-    imurmurhash "^0.1.4"
-    is-glob "^4.0.0"
-    is-path-inside "^3.0.3"
-    js-sdsl "^4.1.4"
-    js-yaml "^4.1.0"
-    json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.4.1"
-    lodash.merge "^4.6.2"
-    minimatch "^3.1.2"
-    natural-compare "^1.4.0"
-    optionator "^0.9.1"
-    strip-ansi "^6.0.1"
-    strip-json-comments "^3.1.0"
-    text-table "^0.2.0"
-
-eslint@^5.0.1:
-  version "5.16.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea"
-  integrity sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    ajv "^6.9.1"
-    chalk "^2.1.0"
-    cross-spawn "^6.0.5"
-    debug "^4.0.1"
-    doctrine "^3.0.0"
-    eslint-scope "^4.0.3"
-    eslint-utils "^1.3.1"
-    eslint-visitor-keys "^1.0.0"
-    espree "^5.0.1"
-    esquery "^1.0.1"
-    esutils "^2.0.2"
-    file-entry-cache "^5.0.1"
-    functional-red-black-tree "^1.0.1"
-    glob "^7.1.2"
-    globals "^11.7.0"
-    ignore "^4.0.6"
-    import-fresh "^3.0.0"
-    imurmurhash "^0.1.4"
-    inquirer "^6.2.2"
-    js-yaml "^3.13.0"
-    json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.3.0"
-    lodash "^4.17.11"
-    minimatch "^3.0.4"
-    mkdirp "^0.5.1"
-    natural-compare "^1.4.0"
-    optionator "^0.8.2"
-    path-is-inside "^1.0.2"
-    progress "^2.0.0"
-    regexpp "^2.0.1"
-    semver "^5.5.1"
-    strip-ansi "^4.0.0"
-    strip-json-comments "^2.0.1"
-    table "^5.2.3"
-    text-table "^0.2.0"
-
-esniff@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/esniff/-/esniff-2.0.1.tgz#a4d4b43a5c71c7ec51c51098c1d8a29081f9b308"
-  integrity sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==
-  dependencies:
-    d "^1.0.1"
-    es5-ext "^0.10.62"
-    event-emitter "^0.3.5"
-    type "^2.7.2"
-
-espree@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz#5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a"
-  integrity sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==
-  dependencies:
-    acorn "^6.0.7"
-    acorn-jsx "^5.0.0"
-    eslint-visitor-keys "^1.0.0"
-
-espree@^9.5.0:
-  version "9.5.0"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.5.0.tgz#3646d4e3f58907464edba852fa047e6a27bdf113"
-  integrity sha512-JPbJGhKc47++oo4JkEoTe2wjy4fmMwvFpgJT9cQzmfXKp22Dr6Hf1tdCteLz1h0P3t+mGvWZ+4Uankvh8+c6zw==
-  dependencies:
-    acorn "^8.8.0"
-    acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^3.3.0"
-
-esprima@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
-esquery@^1.0.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57"
-  integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==
-  dependencies:
-    estraverse "^5.1.0"
-
-esquery@^1.4.2, esquery@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
-  integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
-  dependencies:
-    estraverse "^5.1.0"
-
-esrecurse@^4.1.0, esrecurse@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
-  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
-  dependencies:
-    estraverse "^5.2.0"
-
-estraverse@^4.1.1:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
-  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
-
-estraverse@^5.1.0, estraverse@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
-  integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
-
-esutils@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
-  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
-
-event-emitter@^0.3.5:
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
-  integrity sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=
-  dependencies:
-    d "1"
-    es5-ext "~0.10.14"
-
-event-stream@3.3.4, event-stream@^3.3.4:
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"
-  integrity sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=
-  dependencies:
-    duplexer "~0.1.1"
-    from "~0"
-    map-stream "~0.1.0"
-    pause-stream "0.0.11"
-    split "0.3"
-    stream-combiner "~0.0.4"
-    through "~2.3.1"
-
-event-stream@~3.3.4:
-  version "3.3.5"
-  resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.5.tgz#e5dd8989543630d94c6cf4d657120341fa31636b"
-  integrity sha512-vyibDcu5JL20Me1fP734QBH/kenBGLZap2n0+XXM7mvuUPzJ20Ydqj1aKcIeMdri1p+PU+4yAKugjN8KCVst+g==
-  dependencies:
-    duplexer "^0.1.1"
-    from "^0.1.7"
-    map-stream "0.0.7"
-    pause-stream "^0.0.11"
-    split "^1.0.1"
-    stream-combiner "^0.2.2"
-    through "^2.3.8"
-
-events@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379"
-  integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==
-
-events@^3.2.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
-  integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
-
-execa@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
-  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
-  dependencies:
-    cross-spawn "^6.0.0"
-    get-stream "^4.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
-expand-brackets@^2.1.4:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
-  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
-  dependencies:
-    debug "^2.3.3"
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    posix-character-classes "^0.1.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-expand-template@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c"
-  integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==
-
-expand-tilde@^2.0.0, expand-tilde@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
-  integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=
-  dependencies:
-    homedir-polyfill "^1.0.1"
-
-ext@^1.1.2:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz#89ae7a07158f79d35517882904324077e4379244"
-  integrity sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==
-  dependencies:
-    type "^2.0.0"
-
-extend-shallow@^1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-1.1.4.tgz#19d6bf94dfc09d76ba711f39b872d21ff4dd9071"
-  integrity sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=
-  dependencies:
-    kind-of "^1.1.0"
-
-extend-shallow@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
-  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
-  dependencies:
-    is-extendable "^0.1.0"
-
-extend-shallow@^3.0.0, extend-shallow@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
-  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
-  dependencies:
-    assign-symbols "^1.0.0"
-    is-extendable "^1.0.1"
-
-extend@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-
-external-editor@^3.0.3:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
-  integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
-  dependencies:
-    chardet "^0.7.0"
-    iconv-lite "^0.4.24"
-    tmp "^0.0.33"
-
-extglob@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
-  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
-  dependencies:
-    array-unique "^0.3.2"
-    define-property "^1.0.0"
-    expand-brackets "^2.1.4"
-    extend-shallow "^2.0.1"
-    fragment-cache "^0.2.1"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-extract-zip@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a"
-  integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==
-  dependencies:
-    debug "^4.1.1"
-    get-stream "^5.1.0"
-    yauzl "^2.10.0"
-  optionalDependencies:
-    "@types/yauzl" "^2.9.1"
-
-fancy-log@^1.3.2, fancy-log@^1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7"
-  integrity sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==
-  dependencies:
-    ansi-gray "^0.1.1"
-    color-support "^1.1.3"
-    parse-node-version "^1.0.0"
-    time-stamp "^1.0.0"
-
-fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
-  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
-
-fast-fifo@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.2.0.tgz#2ee038da2468e8623066dee96958b0c1763aa55a"
-  integrity sha512-NcvQXt7Cky1cNau15FWy64IjuO8X0JijhTBBrJj1YlxlDfRkJXNaK9RFUjwpfDPzMdv7wB38jr53l9tkNLxnWg==
-
-fast-fifo@^1.2.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.3.2.tgz#286e31de96eb96d38a97899815740ba2a4f3640c"
-  integrity sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==
-
-fast-glob@^3.2.11, fast-glob@^3.2.9:
-  version "3.2.11"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9"
-  integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==
-  dependencies:
-    "@nodelib/fs.stat" "^2.0.2"
-    "@nodelib/fs.walk" "^1.2.3"
-    glob-parent "^5.1.2"
-    merge2 "^1.3.0"
-    micromatch "^4.0.4"
-
-fast-glob@^3.2.12:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4"
-  integrity sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==
-  dependencies:
-    "@nodelib/fs.stat" "^2.0.2"
-    "@nodelib/fs.walk" "^1.2.3"
-    glob-parent "^5.1.2"
-    merge2 "^1.3.0"
-    micromatch "^4.0.4"
-
-fast-json-stable-stringify@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
-  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
-
-fast-levenshtein@^1.0.0:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz#e6a754cc8f15e58987aa9cbd27af66fd6f4e5af9"
-  integrity sha1-5qdUzI8V5YmHqpy9J69m/W9OWvk=
-
-fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
-  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
-
-fastest-levenshtein@^1.0.12:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2"
-  integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==
-
-fastq@^1.6.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.9.0.tgz#e16a72f338eaca48e91b5c23593bcc2ef66b7947"
-  integrity sha512-i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w==
-  dependencies:
-    reusify "^1.0.4"
-
-fd-slicer@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"
-  integrity sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=
-  dependencies:
-    pend "~1.2.0"
-
-fd-slicer@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
-  integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=
-  dependencies:
-    pend "~1.2.0"
-
-figures@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
-  integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
-  dependencies:
-    escape-string-regexp "^1.0.5"
-
-file-entry-cache@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
-  integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==
-  dependencies:
-    flat-cache "^2.0.1"
-
-file-entry-cache@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
-  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
-  dependencies:
-    flat-cache "^3.0.4"
-
-file-loader@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d"
-  integrity sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==
-  dependencies:
-    loader-utils "^2.0.0"
-    schema-utils "^3.0.0"
-
-file-uri-to-path@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
-  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
-
-fill-range@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
-  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-number "^3.0.0"
-    repeat-string "^1.6.1"
-    to-regex-range "^2.1.0"
-
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
-  dependencies:
-    to-regex-range "^5.0.1"
-
-find-parent-dir@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.1.tgz#c5c385b96858c3351f95d446cab866cbf9f11125"
-  integrity sha512-o4UcykWV/XN9wm+jMEtWLPlV8RXCZnMhQI6F6OdHeSez7iiJWePw8ijOlskJZMsaQoGR/b7dH6lO02HhaTN7+A==
-
-find-replace@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-replace/-/find-replace-3.0.0.tgz#3e7e23d3b05167a76f770c9fbd5258b0def68c38"
-  integrity sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==
-  dependencies:
-    array-back "^3.0.1"
-
-find-up@5.0.0, find-up@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
-  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
-  dependencies:
-    locate-path "^6.0.0"
-    path-exists "^4.0.0"
-
-find-up@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
-  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
-  dependencies:
-    path-exists "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-find-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
-  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
-  dependencies:
-    locate-path "^3.0.0"
-
-find-up@^4.0.0, find-up@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
-  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
-  dependencies:
-    locate-path "^5.0.0"
-    path-exists "^4.0.0"
-
-findup-sync@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
-  integrity sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=
-  dependencies:
-    detect-file "^1.0.0"
-    is-glob "^3.1.0"
-    micromatch "^3.0.4"
-    resolve-dir "^1.0.1"
-
-findup-sync@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz#17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1"
-  integrity sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==
-  dependencies:
-    detect-file "^1.0.0"
-    is-glob "^4.0.0"
-    micromatch "^3.0.4"
-    resolve-dir "^1.0.1"
-
-fined@^1.0.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/fined/-/fined-1.2.0.tgz#d00beccf1aa2b475d16d423b0238b713a2c4a37b"
-  integrity sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==
-  dependencies:
-    expand-tilde "^2.0.2"
-    is-plain-object "^2.0.3"
-    object.defaults "^1.1.0"
-    object.pick "^1.2.0"
-    parse-filepath "^1.0.1"
-
-flagged-respawn@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41"
-  integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==
-
-flat-cache@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
-  integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==
-  dependencies:
-    flatted "^2.0.0"
-    rimraf "2.6.3"
-    write "1.0.3"
-
-flat-cache@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
-  integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
-  dependencies:
-    flatted "^3.1.0"
-    rimraf "^3.0.2"
-
-flat@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
-  integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
-
-flatted@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
-  integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
-
-flatted@^3.1.0:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.4.tgz#28d9969ea90661b5134259f312ab6aa7929ac5e2"
-  integrity sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw==
-
-flush-write-stream@^1.0.2:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
-  integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==
-  dependencies:
-    inherits "^2.0.3"
-    readable-stream "^2.3.6"
-
-for-each@^0.3.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
-  integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==
-  dependencies:
-    is-callable "^1.1.3"
-
-for-in@^1.0.1, for-in@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
-
-for-own@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
-  integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=
-  dependencies:
-    for-in "^1.0.1"
-
-foreground-child@^3.1.0, foreground-child@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d"
-  integrity sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==
-  dependencies:
-    cross-spawn "^7.0.0"
-    signal-exit "^4.0.1"
-
-form-data@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
-  integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.8"
-    mime-types "^2.1.12"
-
-form-data@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
-  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.8"
-    mime-types "^2.1.12"
-
-fragment-cache@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
-  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
-  dependencies:
-    map-cache "^0.2.2"
-
-fresh@~0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
-  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
-
-from@^0.1.7, from@~0:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe"
-  integrity sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=
-
-fs-constants@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
-  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
-
-fs-extra@^11.2.0:
-  version "11.2.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b"
-  integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==
-  dependencies:
-    graceful-fs "^4.2.0"
-    jsonfile "^6.0.1"
-    universalify "^2.0.0"
-
-fs-extra@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
-  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
-  dependencies:
-    graceful-fs "^4.2.0"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
-fs-minipass@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
-  integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
-  dependencies:
-    minipass "^3.0.0"
-
-fs-mkdirp-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz#0b7815fc3201c6a69e14db98ce098c16935259eb"
-  integrity sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=
-  dependencies:
-    graceful-fs "^4.1.11"
-    through2 "^2.0.3"
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
-
-fsevents@2.3.2, fsevents@~2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
-  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
-
-fsevents@^1.2.7:
-  version "1.2.13"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38"
-  integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==
-  dependencies:
-    bindings "^1.5.0"
-    nan "^2.12.1"
-
-fstream@^1.0.12:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
-  integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==
-  dependencies:
-    graceful-fs "^4.1.2"
-    inherits "~2.0.0"
-    mkdirp ">=0.5 0"
-    rimraf "2"
-
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
-
-functional-red-black-tree@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
-
-gensync@^1.0.0-beta.2:
-  version "1.0.0-beta.2"
-  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
-  integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
-
-get-caller-file@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
-  integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
-
-get-caller-file@^2.0.1, get-caller-file@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
-  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
-
-get-intrinsic@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.1.tgz#94a9768fcbdd0595a1c9273aacf4c89d075631be"
-  integrity sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==
-  dependencies:
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-
-get-intrinsic@^1.0.2, get-intrinsic@^1.1.3:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82"
-  integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==
-  dependencies:
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-proto "^1.0.1"
-    has-symbols "^1.0.3"
-
-get-stdin@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-7.0.0.tgz#8d5de98f15171a125c5e516643c7a6d0ea8a96f6"
-  integrity sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ==
-
-get-stream@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
-  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
-  dependencies:
-    pump "^3.0.0"
-
-get-stream@^5.1.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
-  integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
-  dependencies:
-    pump "^3.0.0"
-
-get-value@^2.0.3, get-value@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
-  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
-
-github-from-package@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
-  integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=
-
-glob-parent@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
-  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
-  dependencies:
-    is-glob "^3.1.0"
-    path-dirname "^1.0.0"
-
-glob-parent@^5.1.2, glob-parent@~5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
-  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
-  dependencies:
-    is-glob "^4.0.1"
-
-glob-parent@^6.0.1, glob-parent@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
-  integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
-  dependencies:
-    is-glob "^4.0.3"
-
-glob-stream@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-6.1.0.tgz#7045c99413b3eb94888d83ab46d0b404cc7bdde4"
-  integrity sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=
-  dependencies:
-    extend "^3.0.0"
-    glob "^7.1.1"
-    glob-parent "^3.1.0"
-    is-negated-glob "^1.0.0"
-    ordered-read-streams "^1.0.0"
-    pumpify "^1.3.5"
-    readable-stream "^2.1.5"
-    remove-trailing-separator "^1.0.1"
-    to-absolute-glob "^2.0.0"
-    unique-stream "^2.0.2"
-
-glob-to-regexp@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
-  integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
-
-glob-watcher@^5.0.3:
-  version "5.0.5"
-  resolved "https://registry.yarnpkg.com/glob-watcher/-/glob-watcher-5.0.5.tgz#aa6bce648332924d9a8489be41e3e5c52d4186dc"
-  integrity sha512-zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw==
-  dependencies:
-    anymatch "^2.0.0"
-    async-done "^1.2.0"
-    chokidar "^2.0.0"
-    is-negated-glob "^1.0.0"
-    just-debounce "^1.0.0"
-    normalize-path "^3.0.0"
-    object.defaults "^1.1.0"
-
-glob@7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
-  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^10.0.0, glob@^10.3.10:
-  version "10.3.10"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.10.tgz#0351ebb809fd187fe421ab96af83d3a70715df4b"
-  integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==
-  dependencies:
-    foreground-child "^3.1.0"
-    jackspeak "^2.3.5"
-    minimatch "^9.0.1"
-    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
-    path-scurry "^1.10.1"
-
-glob@^5.0.13:
-  version "5.0.15"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
-  integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "2 || 3"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.1.1, glob@^7.1.2, glob@^7.1.6:
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
-  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.1.3:
-  version "7.1.7"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
-  integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.1.4:
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
-  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.1.1"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-global-agent@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6"
-  integrity sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==
-  dependencies:
-    boolean "^3.0.1"
-    es6-error "^4.1.1"
-    matcher "^3.0.0"
-    roarr "^2.15.3"
-    semver "^7.3.2"
-    serialize-error "^7.0.1"
-
-global-modules@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
-  integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==
-  dependencies:
-    global-prefix "^1.0.1"
-    is-windows "^1.0.1"
-    resolve-dir "^1.0.0"
-
-global-prefix@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
-  integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=
-  dependencies:
-    expand-tilde "^2.0.2"
-    homedir-polyfill "^1.0.1"
-    ini "^1.3.4"
-    is-windows "^1.0.1"
-    which "^1.2.14"
-
-globals@^11.1.0, globals@^11.7.0:
-  version "11.12.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
-  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
-
-globals@^13.19.0:
-  version "13.20.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.20.0.tgz#ea276a1e508ffd4f1612888f9d1bad1e2717bf82"
-  integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==
-  dependencies:
-    type-fest "^0.20.2"
-
-globalthis@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.1.tgz#40116f5d9c071f9e8fb0037654df1ab3a83b7ef9"
-  integrity sha512-mJPRTc/P39NH/iNG4mXa9aIhNymaQikTrnspeCa2ZuJ+mH2QN/rXwtX3XwKrHqWgUQFbNZKtHM105aHzJalElw==
-  dependencies:
-    define-properties "^1.1.3"
-
-globby@^11.1.0:
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
-  integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
-  dependencies:
-    array-union "^2.1.0"
-    dir-glob "^3.0.1"
-    fast-glob "^3.2.9"
-    ignore "^5.2.0"
-    merge2 "^1.4.1"
-    slash "^3.0.0"
-
-globby@^13.1.1:
-  version "13.1.3"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-13.1.3.tgz#f62baf5720bcb2c1330c8d4ef222ee12318563ff"
-  integrity sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw==
-  dependencies:
-    dir-glob "^3.0.1"
-    fast-glob "^3.2.11"
-    ignore "^5.2.0"
-    merge2 "^1.4.1"
-    slash "^4.0.0"
-
-glogg@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.2.tgz#2d7dd702beda22eb3bffadf880696da6d846313f"
-  integrity sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==
-  dependencies:
-    sparkles "^1.0.0"
-
-gopd@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
-  integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==
-  dependencies:
-    get-intrinsic "^1.1.3"
-
-got@^11.8.5:
-  version "11.8.5"
-  resolved "https://registry.yarnpkg.com/got/-/got-11.8.5.tgz#ce77d045136de56e8f024bebb82ea349bc730046"
-  integrity sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==
-  dependencies:
-    "@sindresorhus/is" "^4.0.0"
-    "@szmarczak/http-timer" "^4.0.5"
-    "@types/cacheable-request" "^6.0.1"
-    "@types/responselike" "^1.0.0"
-    cacheable-lookup "^5.0.3"
-    cacheable-request "^7.0.2"
-    decompress-response "^6.0.0"
-    http2-wrapper "^1.0.0-beta.5.2"
-    lowercase-keys "^2.0.0"
-    p-cancelable "^2.0.0"
-    responselike "^2.0.0"
-
-graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.6, graceful-fs@^4.2.0:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
-  integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
-
-graceful-fs@^4.1.2, graceful-fs@^4.2.4:
-  version "4.2.6"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
-  integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
-
-graceful-fs@^4.2.11:
-  version "4.2.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
-  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
-
-graceful-fs@^4.2.9:
-  version "4.2.10"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
-  integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
-
-grapheme-splitter@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
-  integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
-
-graphemer@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
-  integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
-
-gulp-azure-storage@^0.12.1:
-  version "0.12.1"
-  resolved "https://registry.yarnpkg.com/gulp-azure-storage/-/gulp-azure-storage-0.12.1.tgz#be2be1268af7dea6fdf56045b3eb3f090335de4a"
-  integrity sha512-n/hx8bbGsqrcizruqDTX6zy2FUdkTDGAz04IdopNxNTZivZmizf8u9WLYJreUE6/qCnSJnyjS1HP82+mLk7rjg==
-  dependencies:
-    "@azure/storage-blob" "^12.8.0"
-    delayed-stream "0.0.6"
-    event-stream "3.3.4"
-    mime "^1.3.4"
-    progress "^1.1.8"
-    queue "^3.0.10"
-    streamifier "^0.1.1"
-    vinyl "^2.2.0"
-    vinyl-fs "^3.0.3"
-    yargs "^15.3.0"
-
-gulp-bom@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/gulp-bom/-/gulp-bom-3.0.0.tgz#b2f1ab0ef304ff5e593665b776ba517ef7ffb4ad"
-  integrity sha512-iw/J94F+MVlxG64Q17BSkHsyjpY17qHl3N3A/jDdrL77zQBkhKtTiKLqM4di9CUX/qFToyyeDsOWwH+rESBgmA==
-  dependencies:
-    plugin-error "^1.0.1"
-    through2 "^3.0.1"
-
-gulp-buffer@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/gulp-buffer/-/gulp-buffer-0.0.2.tgz#af81b4346101736b49942ec6c9fa867ffe737036"
-  integrity sha1-r4G0NGEBc2tJlC7GyfqGf/5zcDY=
-  dependencies:
-    through2 "~0.4.0"
-
-gulp-cli@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-2.3.0.tgz#ec0d380e29e52aa45e47977f0d32e18fd161122f"
-  integrity sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==
-  dependencies:
-    ansi-colors "^1.0.1"
-    archy "^1.0.0"
-    array-sort "^1.0.0"
-    color-support "^1.1.3"
-    concat-stream "^1.6.0"
-    copy-props "^2.0.1"
-    fancy-log "^1.3.2"
-    gulplog "^1.0.0"
-    interpret "^1.4.0"
-    isobject "^3.0.1"
-    liftoff "^3.1.0"
-    matchdep "^2.0.0"
-    mute-stdout "^1.0.0"
-    pretty-hrtime "^1.0.0"
-    replace-homedir "^1.0.0"
-    semver-greatest-satisfied-range "^1.1.0"
-    v8flags "^3.2.0"
-    yargs "^7.1.0"
-
-gulp-concat@^2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/gulp-concat/-/gulp-concat-2.6.1.tgz#633d16c95d88504628ad02665663cee5a4793353"
-  integrity sha1-Yz0WyV2IUEYorQJmVmPO5aR5M1M=
-  dependencies:
-    concat-with-sourcemaps "^1.0.0"
-    through2 "^2.0.0"
-    vinyl "^2.0.0"
-
-gulp-eslint@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/gulp-eslint/-/gulp-eslint-5.0.0.tgz#2a2684095f774b2cf79310262078c56cc7a12b52"
-  integrity sha512-9GUqCqh85C7rP9120cpxXuZz2ayq3BZc85pCTuPJS03VQYxne0aWPIXWx6LSvsGPa3uRqtSO537vaugOh+5cXg==
-  dependencies:
-    eslint "^5.0.1"
-    fancy-log "^1.3.2"
-    plugin-error "^1.0.1"
-
-gulp-filter@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/gulp-filter/-/gulp-filter-5.1.0.tgz#a05e11affb07cf7dcf41a7de1cb7b63ac3783e73"
-  integrity sha1-oF4Rr/sHz33PQafeHLe2OsN4PnM=
-  dependencies:
-    multimatch "^2.0.0"
-    plugin-error "^0.1.2"
-    streamfilter "^1.0.5"
-
-gulp-flatmap@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/gulp-flatmap/-/gulp-flatmap-1.0.2.tgz#b515ae6081d66af99daf56c612e2d92502720133"
-  integrity sha512-xm+Ax2vPL/xiMBqLFI++wUyPtncm3b55ztGHewmRcoG/sYb0OUTatjSacOud3fee77rnk+jOgnDEHhwBtMHgFA==
-  dependencies:
-    plugin-error "0.1.2"
-    through2 "2.0.3"
-
-gulp-gunzip@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/gulp-gunzip/-/gulp-gunzip-1.1.0.tgz#56f81b4ed8106ba3c905e310661ee7f11eb5ac03"
-  integrity sha512-3INeprGyz5fUtAs75k6wVslGuRZIjKAoQp39xA7Bz350ReqkrfYaLYqjZ67XyIfLytRXdzeX04f+DnBduYhQWw==
-  dependencies:
-    through2 "~2.0.3"
-    vinyl "~2.0.1"
-
-gulp-gzip@^1.4.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/gulp-gzip/-/gulp-gzip-1.4.2.tgz#0422a94014248655b5b1a9eea1c2abee1d4f4337"
-  integrity sha512-ZIxfkUwk2XmZPTT9pPHrHUQlZMyp9nPhg2sfoeN27mBGpi7OaHnOD+WCN41NXjfJQ69lV1nQ9LLm1hYxx4h3UQ==
-  dependencies:
-    ansi-colors "^1.0.1"
-    bytes "^3.0.0"
-    fancy-log "^1.3.2"
-    plugin-error "^1.0.0"
-    stream-to-array "^2.3.0"
-    through2 "^2.0.3"
-
-gulp-json-editor@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/gulp-json-editor/-/gulp-json-editor-2.5.0.tgz#23aaa7d30f8425cf60cf1aefae098c257da11ada"
-  integrity sha512-HyrBSaE+Di6oQbKsfNM6X7dPFowOuTTuVYjxratU8QAiW7LR7Rydm+/fSS3OehdnuP++A/07q/nksihuD5FZSA==
-  dependencies:
-    deepmerge "^3.0.0"
-    detect-indent "^5.0.0"
-    js-beautify "^1.8.9"
-    plugin-error "^1.0.1"
-    through2 "^3.0.0"
-
-gulp-plumber@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/gulp-plumber/-/gulp-plumber-1.2.0.tgz#18ea03912c9ee483f8a5499973b5954cd90f6ad8"
-  integrity sha512-L/LJftsbKoHbVj6dN5pvMsyJn9jYI0wT0nMg3G6VZhDac4NesezecYTi8/48rHi+yEic3sUpw6jlSc7qNWh32A==
-  dependencies:
-    chalk "^1.1.3"
-    fancy-log "^1.3.2"
-    plugin-error "^0.1.2"
-    through2 "^2.0.3"
-
-gulp-rename@1.2.2, gulp-rename@^1.2.0:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/gulp-rename/-/gulp-rename-1.2.2.tgz#3ad4428763f05e2764dec1c67d868db275687817"
-  integrity sha1-OtRCh2PwXidk3sHGfYaNsnVoeBc=
-
-gulp-replace@^0.5.4:
-  version "0.5.4"
-  resolved "https://registry.yarnpkg.com/gulp-replace/-/gulp-replace-0.5.4.tgz#69a67914bbd13c562bff14f504a403796aa0daa9"
-  integrity sha1-aaZ5FLvRPFYr/xT1BKQDeWqg2qk=
-  dependencies:
-    istextorbinary "1.0.2"
-    readable-stream "^2.0.1"
-    replacestream "^4.0.0"
-
-gulp-sourcemaps@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/gulp-sourcemaps/-/gulp-sourcemaps-3.0.0.tgz#2e154e1a2efed033c0e48013969e6f30337b2743"
-  integrity sha512-RqvUckJkuYqy4VaIH60RMal4ZtG0IbQ6PXMNkNsshEGJ9cldUPRb/YCgboYae+CLAs1HQNb4ADTKCx65HInquQ==
-  dependencies:
-    "@gulp-sourcemaps/identity-map" "^2.0.1"
-    "@gulp-sourcemaps/map-sources" "^1.0.0"
-    acorn "^6.4.1"
-    convert-source-map "^1.0.0"
-    css "^3.0.0"
-    debug-fabulous "^1.0.0"
-    detect-newline "^2.0.0"
-    graceful-fs "^4.0.0"
-    source-map "^0.6.0"
-    strip-bom-string "^1.0.0"
-    through2 "^2.0.0"
-
-gulp-svgmin@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/gulp-svgmin/-/gulp-svgmin-4.1.0.tgz#38c7928663b036a676c56e78cc62fd3f906a0133"
-  integrity sha512-WKpif+yu3+oIlp1e11CQi5F64YddP699l2mFmxpz8swv8/P8dhxVcMKdCPFWouArlVyn7Ma1eWCJHw5gx4NMtw==
-  dependencies:
-    lodash.clonedeep "^4.5.0"
-    plugin-error "^1.0.1"
-    svgo "^2.7.0"
-
-gulp-symdest@^1.2.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/gulp-symdest/-/gulp-symdest-1.3.0.tgz#b9225a734748c9e0bdda86ff4b8a94ccd0b356e3"
-  integrity sha512-n1VaNYMpyOq4GfyQyIwRZhXOOsQVdEy56BCFxL4hu+stKwYeSQcZxLX5FOZL6jZUlBYXCWlXL+E5JU13ZMldIw==
-  dependencies:
-    event-stream "3.3.4"
-    mkdirp "^0.5.1"
-    queue "^3.1.0"
-    vinyl-fs "^3.0.3"
-
-gulp-untar@^0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/gulp-untar/-/gulp-untar-0.0.7.tgz#92067d79e0fa1e92d60562a100233a44a5aa08b4"
-  integrity sha512-0QfbCH2a1k2qkTLWPqTX+QO4qNsHn3kC546YhAP3/n0h+nvtyGITDuDrYBMDZeW4WnFijmkOvBWa5HshTic1tw==
-  dependencies:
-    event-stream "~3.3.4"
-    streamifier "~0.1.1"
-    tar "^2.2.1"
-    through2 "~2.0.3"
-    vinyl "^1.2.0"
-
-gulp-vinyl-zip@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/gulp-vinyl-zip/-/gulp-vinyl-zip-2.1.2.tgz#b79cc1a0e2c3b158ffee294590ade1e9caaf5e7b"
-  integrity sha512-wJn09jsb8PyvUeyFF7y7ImEJqJwYy40BqL9GKfJs6UGpaGW9A+N68Q+ajsIpb9AeR6lAdjMbIdDPclIGo1/b7Q==
-  dependencies:
-    event-stream "3.3.4"
-    queue "^4.2.1"
-    through2 "^2.0.3"
-    vinyl "^2.0.2"
-    vinyl-fs "^3.0.3"
-    yauzl "^2.2.1"
-    yazl "^2.2.1"
-
-gulp@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/gulp/-/gulp-4.0.2.tgz#543651070fd0f6ab0a0650c6a3e6ff5a7cb09caa"
-  integrity sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==
-  dependencies:
-    glob-watcher "^5.0.3"
-    gulp-cli "^2.2.0"
-    undertaker "^1.2.1"
-    vinyl-fs "^3.0.0"
-
-gulplog@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5"
-  integrity sha1-4oxNRdBey77YGDY86PnFkmIp/+U=
-  dependencies:
-    glogg "^1.0.0"
-
-gunzip-maybe@^1.4.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/gunzip-maybe/-/gunzip-maybe-1.4.2.tgz#b913564ae3be0eda6f3de36464837a9cd94b98ac"
-  integrity sha512-4haO1M4mLO91PW57BMsDFf75UmwoRX0GkdD+Faw+Lr+r/OZrOCS0pIBwOL1xCKQqnQzbNFGgK2V2CpBUPeFNTw==
-  dependencies:
-    browserify-zlib "^0.1.4"
-    is-deflate "^1.0.0"
-    is-gzip "^1.0.0"
-    peek-stream "^1.1.0"
-    pumpify "^1.3.3"
-    through2 "^2.0.3"
-
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
-  dependencies:
-    ansi-regex "^2.0.0"
-
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
-
-has-flag@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
-  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
-
-has-proto@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0"
-  integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==
-
-has-symbols@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
-  integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
-
-has-symbols@^1.0.2, has-symbols@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
-  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
-
-has-tostringtag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
-  integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==
-  dependencies:
-    has-symbols "^1.0.2"
-
-has-value@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
-  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
-  dependencies:
-    get-value "^2.0.3"
-    has-values "^0.1.4"
-    isobject "^2.0.0"
-
-has-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
-  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
-  dependencies:
-    get-value "^2.0.6"
-    has-values "^1.0.0"
-    isobject "^3.0.0"
-
-has-values@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
-  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
-
-has-values@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
-  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
-  dependencies:
-    is-number "^3.0.0"
-    kind-of "^4.0.0"
-
-has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
-  dependencies:
-    function-bind "^1.1.1"
-
-he@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
-  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
-
-homedir-polyfill@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
-  integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==
-  dependencies:
-    parse-passwd "^1.0.0"
-
-hosted-git-info@^2.1.4:
-  version "2.8.9"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
-  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
-
-html-escaper@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.0.tgz#71e87f931de3fe09e56661ab9a29aadec707b491"
-  integrity sha512-a4u9BeERWGu/S8JiWEAQcdrg9v4QArtP9keViQjGMdff20fBdd8waotXaNmODqBe6uZ3Nafi7K/ho4gCQHV3Ig==
-
-http-assert@^1.3.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/http-assert/-/http-assert-1.5.0.tgz#c389ccd87ac16ed2dfa6246fd73b926aa00e6b8f"
-  integrity sha512-uPpH7OKX4H25hBmU6G1jWNaqJGpTXxey+YOUizJUAgu0AjLUeC8D73hTrhvDS5D+GJN1DN1+hhc/eF/wpxtp0w==
-  dependencies:
-    deep-equal "~1.0.1"
-    http-errors "~1.8.0"
-
-http-cache-semantics@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
-  integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
-
-http-errors@^1.6.3, http-errors@^1.7.3, http-errors@~1.8.0:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c"
-  integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.4"
-    setprototypeof "1.2.0"
-    statuses ">= 1.5.0 < 2"
-    toidentifier "1.0.1"
-
-http-errors@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3"
-  integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==
-  dependencies:
-    depd "2.0.0"
-    inherits "2.0.4"
-    setprototypeof "1.2.0"
-    statuses "2.0.1"
-    toidentifier "1.0.1"
-
-http-errors@~1.6.2:
-  version "1.6.3"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
-  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.3"
-    setprototypeof "1.1.0"
-    statuses ">= 1.4.0 < 2"
-
-http-proxy-agent@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
-  integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==
-  dependencies:
-    "@tootallnate/once" "1"
-    agent-base "6"
-    debug "4"
-
-http-proxy-agent@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz#e9096c5afd071a3fce56e6252bb321583c124673"
-  integrity sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==
-  dependencies:
-    agent-base "^7.1.0"
-    debug "^4.3.4"
-
-http2-wrapper@^1.0.0-beta.5.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d"
-  integrity sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==
-  dependencies:
-    quick-lru "^5.1.1"
-    resolve-alpn "^1.0.0"
-
-https-proxy-agent@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
-  integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
-  dependencies:
-    agent-base "6"
-    debug "4"
-
-https-proxy-agent@^7.0.0:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz#8e97b841a029ad8ddc8731f26595bad868cb4168"
-  integrity sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==
-  dependencies:
-    agent-base "^7.0.2"
-    debug "4"
-
-https-proxy-agent@^7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz#e2645b846b90e96c6e6f347fb5b2e41f1590b09b"
-  integrity sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==
-  dependencies:
-    agent-base "^7.0.2"
-    debug "4"
-
-husky@^0.13.1:
-  version "0.13.4"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-0.13.4.tgz#48785c5028de3452a51c48c12c4f94b2124a1407"
-  integrity sha512-kafsK/82ndSVKJe1IoR/z7NKkiI2LYM6H+VNI/YlKOeoOXEJTpD65TNu05Zx7pzSZzLuAdMt4fHgpUsnd6HJ7A==
-  dependencies:
-    chalk "^1.1.3"
-    find-parent-dir "^0.3.0"
-    is-ci "^1.0.9"
-    normalize-path "^1.0.0"
-
-iconv-lite@^0.4.19:
-  version "0.4.19"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
-  integrity sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==
-
-iconv-lite@^0.4.24:
-  version "0.4.24"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
-  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3"
-
-icss-utils@^5.0.0, icss-utils@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
-  integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==
-
-ieee754@^1.1.13:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
-  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
-
-ignore@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
-  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
-
-ignore@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
-  integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
-
-ignore@^5.2.4:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef"
-  integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==
-
-immediate@~3.0.5:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
-  integrity sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==
-
-import-fresh@^3.0.0, import-fresh@^3.2.1:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
-  integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
-  dependencies:
-    parent-module "^1.0.0"
-    resolve-from "^4.0.0"
-
-import-local@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6"
-  integrity sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==
-  dependencies:
-    pkg-dir "^4.2.0"
-    resolve-cwd "^3.0.0"
-
-imurmurhash@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
-
-indexes-of@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
-  integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc=
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-inherits@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
-
-ini@^1.3.4, ini@~1.3.0:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
-  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
-
-innosetup@6.0.5:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/innosetup/-/innosetup-6.0.5.tgz#3001e54c638e4e19edd9ebdc6b1855b9ba8b0bbf"
-  integrity sha512-XRvidEN0dcxe7NrGXBjl/clfNRfmyakSDtgKaJgvZ3ciKE5ArQOVGqUJcLyPhllqHhMzYGpbUF3ZTZvtKVDP2g==
-
-inquirer@^6.2.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca"
-  integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==
-  dependencies:
-    ansi-escapes "^3.2.0"
-    chalk "^2.4.2"
-    cli-cursor "^2.1.0"
-    cli-width "^2.0.0"
-    external-editor "^3.0.3"
-    figures "^2.0.0"
-    lodash "^4.17.12"
-    mute-stream "0.0.7"
-    run-async "^2.2.0"
-    rxjs "^6.4.0"
-    string-width "^2.1.0"
-    strip-ansi "^5.1.0"
-    through "^2.3.6"
-
-interpret@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
-  integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
-
-interpret@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4"
-  integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==
-
-invert-kv@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
-  integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY=
-
-invert-kv@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
-  integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
-
-ip@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.1.tgz#e8f3595d33a3ea66490204234b77636965307105"
-  integrity sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==
-
-is-absolute@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
-  integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==
-  dependencies:
-    is-relative "^1.0.0"
-    is-windows "^1.0.1"
-
-is-accessor-descriptor@^0.1.6:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
-  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-accessor-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
-  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
-  dependencies:
-    kind-of "^6.0.0"
-
-is-arguments@^1.0.4:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b"
-  integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==
-  dependencies:
-    call-bind "^1.0.2"
-    has-tostringtag "^1.0.0"
-
-is-arrayish@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
-
-is-binary-path@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
-  integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
-  dependencies:
-    binary-extensions "^1.0.0"
-
-is-binary-path@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
-  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
-  dependencies:
-    binary-extensions "^2.0.0"
-
-is-buffer@^1.1.5, is-buffer@~1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-
-is-builtin-module@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-3.2.1.tgz#f03271717d8654cfcaf07ab0463faa3571581169"
-  integrity sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==
-  dependencies:
-    builtin-modules "^3.3.0"
-
-is-callable@^1.1.3:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
-  integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
-
-is-callable@^1.1.4, is-callable@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
-  integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==
-
-is-ci@^1.0.9:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c"
-  integrity sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==
-  dependencies:
-    ci-info "^1.5.0"
-
-is-core-module@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
-  integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
-  dependencies:
-    has "^1.0.3"
-
-is-core-module@^2.9.0:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"
-  integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==
-  dependencies:
-    has "^1.0.3"
-
-is-data-descriptor@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
-  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-data-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
-  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
-  dependencies:
-    kind-of "^6.0.0"
-
-is-date-object@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
-  integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
-
-is-deflate@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-deflate/-/is-deflate-1.0.0.tgz#c862901c3c161fb09dac7cdc7e784f80e98f2f14"
-  integrity sha512-YDoFpuZWu1VRXlsnlYMzKyVRITXj7Ej/V9gXQ2/pAe7X1J7M/RNOqaIYi6qUn+B7nGyB9pDXrv02dsB58d2ZAQ==
-
-is-descriptor@^0.1.0:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
-  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
-  dependencies:
-    is-accessor-descriptor "^0.1.6"
-    is-data-descriptor "^0.1.4"
-    kind-of "^5.0.0"
-
-is-descriptor@^1.0.0, is-descriptor@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
-  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
-  dependencies:
-    is-accessor-descriptor "^1.0.0"
-    is-data-descriptor "^1.0.0"
-    kind-of "^6.0.2"
-
-is-extendable@^0.1.0, is-extendable@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
-
-is-extendable@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
-  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
-  dependencies:
-    is-plain-object "^2.0.4"
-
-is-extglob@^2.1.0, is-extglob@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
-
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
-  dependencies:
-    number-is-nan "^1.0.0"
-
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
-
-is-fullwidth-code-point@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
-  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
-
-is-generator-function@^1.0.7:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.9.tgz#e5f82c2323673e7fcad3d12858c83c4039f6399c"
-  integrity sha512-ZJ34p1uvIfptHCN7sFTjGibB9/oBg17sHqzDLfuwhvmN/qLVvIQXRQ8licZQ35WJ8KuEQt/etnnzQFI9C9Ue/A==
-
-is-glob@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
-  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
-  dependencies:
-    is-extglob "^2.1.0"
-
-is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
-  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
-  dependencies:
-    is-extglob "^2.1.1"
-
-is-glob@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
-  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
-  dependencies:
-    is-extglob "^2.1.1"
-
-is-gzip@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-gzip/-/is-gzip-1.0.0.tgz#6ca8b07b99c77998025900e555ced8ed80879a83"
-  integrity sha512-rcfALRIb1YewtnksfRIHGcIY93QnK8BIQ/2c9yDYcG/Y6+vRoJuTWBmmSEbyLLYtXm7q35pHOHbZFQBaLrhlWQ==
-
-is-negated-glob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2"
-  integrity sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=
-
-is-negative-zero@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
-  integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
-
-is-number@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
-  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-number@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
-  integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
-
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-
-is-path-inside@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
-  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
-
-is-plain-obj@^1.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
-  integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==
-
-is-plain-obj@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
-  integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
-
-is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
-  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
-  dependencies:
-    isobject "^3.0.1"
-
-is-plain-object@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
-  integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
-
-is-promise@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
-  integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==
-
-is-regex@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9"
-  integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==
-  dependencies:
-    has-symbols "^1.0.1"
-
-is-relative@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
-  integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==
-  dependencies:
-    is-unc-path "^1.0.0"
-
-is-stream@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
-
-is-symbol@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
-  integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==
-  dependencies:
-    has-symbols "^1.0.1"
-
-is-typed-array@^1.1.3:
-  version "1.1.12"
-  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.12.tgz#d0bab5686ef4a76f7a73097b95470ab199c57d4a"
-  integrity sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==
-  dependencies:
-    which-typed-array "^1.1.11"
-
-is-unc-path@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
-  integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==
-  dependencies:
-    unc-path-regex "^0.1.2"
-
-is-unicode-supported@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
-  integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
-
-is-utf8@^0.2.0, is-utf8@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
-  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
-
-is-valid-glob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz#29bf3eff701be2d4d315dbacc39bc39fe8f601aa"
-  integrity sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=
-
-is-windows@^1.0.1, is-windows@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
-  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
-
-is-wsl@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
-  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
-
-is@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/is/-/is-3.2.1.tgz#d0ac2ad55eb7b0bec926a5266f6c662aaa83dca5"
-  integrity sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU=
-
-isarray@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
-
-isarray@1.0.0, isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
-
-isobject@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
-  dependencies:
-    isarray "1.0.0"
-
-isobject@^3.0.0, isobject@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
-
-istanbul-lib-coverage@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec"
-  integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==
-
-istanbul-lib-coverage@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3"
-  integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==
-
-istanbul-lib-instrument@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.1.tgz#71e87707e8041428732518c6fb5211761753fbdf"
-  integrity sha512-EAMEJBsYuyyztxMxW3g7ugGPkrZsV57v0Hmv3mm1uQsmB+QnZuepg731CRaIgeUVSdmsTngOkSnauNF8p7FIhA==
-  dependencies:
-    "@babel/core" "^7.12.3"
-    "@babel/parser" "^7.14.7"
-    "@istanbuljs/schema" "^0.1.2"
-    istanbul-lib-coverage "^3.2.0"
-    semver "^7.5.4"
-
-istanbul-lib-report@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6"
-  integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==
-  dependencies:
-    istanbul-lib-coverage "^3.0.0"
-    make-dir "^3.0.0"
-    supports-color "^7.1.0"
-
-istanbul-lib-report@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz#908305bac9a5bd175ac6a74489eafd0fc2445a7d"
-  integrity sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==
-  dependencies:
-    istanbul-lib-coverage "^3.0.0"
-    make-dir "^4.0.0"
-    supports-color "^7.1.0"
-
-istanbul-lib-source-maps@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz#895f3a709fcfba34c6de5a42939022f3e4358551"
-  integrity sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==
-  dependencies:
-    debug "^4.1.1"
-    istanbul-lib-coverage "^3.0.0"
-    source-map "^0.6.1"
-
-istanbul-reports@^3.1.5:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.5.tgz#cc9a6ab25cb25659810e4785ed9d9fb742578bae"
-  integrity sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==
-  dependencies:
-    html-escaper "^2.0.0"
-    istanbul-lib-report "^3.0.0"
-
-istanbul-reports@^3.1.6:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.6.tgz#2544bcab4768154281a2f0870471902704ccaa1a"
-  integrity sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==
-  dependencies:
-    html-escaper "^2.0.0"
-    istanbul-lib-report "^3.0.0"
-
-istextorbinary@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-1.0.2.tgz#ace19354d1a9a0173efeb1084ce0f87b0ad7decf"
-  integrity sha1-rOGTVNGpoBc+/rEITOD4ewrX3s8=
-  dependencies:
-    binaryextensions "~1.0.0"
-    textextensions "~1.0.0"
-
-jackspeak@^2.3.5:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8"
-  integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==
-  dependencies:
-    "@isaacs/cliui" "^8.0.2"
-  optionalDependencies:
-    "@pkgjs/parseargs" "^0.11.0"
-
-jest-worker@^27.0.2:
-  version "27.0.6"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.0.6.tgz#a5fdb1e14ad34eb228cfe162d9f729cdbfa28aed"
-  integrity sha512-qupxcj/dRuA3xHPMUd40gr2EaAurFbkwzOh7wfPaeE9id7hyjURRQoqNfHifHK3XjJU6YJJUQKILGUnwGPEOCA==
-  dependencies:
-    "@types/node" "*"
-    merge-stream "^2.0.0"
-    supports-color "^8.0.0"
-
-jest-worker@^27.4.5:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0"
-  integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==
-  dependencies:
-    "@types/node" "*"
-    merge-stream "^2.0.0"
-    supports-color "^8.0.0"
-
-js-base64@^3.7.4:
-  version "3.7.4"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-3.7.4.tgz#af95b20f23efc8034afd2d1cc5b9d0adf7419037"
-  integrity sha512-wpM/wi20Tl+3ifTyi0RdDckS4YTD4Lf953mBRrpG8547T7hInHNPEj8+ck4gB8VDcGyeAWFK++Wb/fU1BeavKQ==
-
-js-base64@^3.7.5:
-  version "3.7.7"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-3.7.7.tgz#e51b84bf78fbf5702b9541e2cb7bfcb893b43e79"
-  integrity sha512-7rCnleh0z2CkXhH67J8K1Ytz0b2Y+yxTPL+/KOJoa20hfnVQ/3/T6W/KflYI4bRHRagNeXeU2bkNGI3v1oS/lw==
-
-js-beautify@^1.8.9:
-  version "1.8.9"
-  resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.8.9.tgz#08e3c05ead3ecfbd4f512c3895b1cda76c87d523"
-  integrity sha512-MwPmLywK9RSX0SPsUJjN7i+RQY9w/yC17Lbrq9ViEefpLRgqAR2BgrMN2AbifkUuhDV8tRauLhLda/9+bE0YQA==
-  dependencies:
-    config-chain "^1.1.12"
-    editorconfig "^0.15.2"
-    glob "^7.1.3"
-    mkdirp "~0.5.0"
-    nopt "~4.0.1"
-
-js-sdsl@^4.1.4:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.4.0.tgz#8b437dbe642daa95760400b602378ed8ffea8430"
-  integrity sha512-FfVSdx6pJ41Oa+CF7RDaFmTnCaFhua+SNYQX74riGOpl96x+2jQCqEfQ2bnXu/5DPCqlRuiqyvTJM0Qjz26IVg==
-
-js-tokens@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
-  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
-
-js-yaml@4.1.0, js-yaml@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
-  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
-  dependencies:
-    argparse "^2.0.1"
-
-js-yaml@^3.13.0:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
-  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-jschardet@3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-3.1.2.tgz#9bf4364deba0677fe9e3bd9e29eda57febf2e9db"
-  integrity sha512-mw3CBZGzW8nUBPYhFU2ztZ/kJ6NClQUQVpyzvFMfznZsoC///ZQ30J2RCUanNsr5yF22LqhgYr/lj807/ZleWA==
-
-jsdoc-type-pratt-parser@~4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz#136f0571a99c184d84ec84662c45c29ceff71114"
-  integrity sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==
-
-jsesc@^2.5.1:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
-  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
-
-json-buffer@3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
-  integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
-
-json-parse-better-errors@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
-  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
-
-json-parse-even-better-errors@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
-  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
-
-json-schema-traverse@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
-  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
-
-json-schema-traverse@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
-  integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
-
-json-stable-stringify-without-jsonify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
-  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
-
-json-stringify-safe@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
-
-json5@^2.1.2, json5@^2.2.1:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
-  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
-
-jsonfile@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
-  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
-jsonfile@^6.0.1:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
-  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
-  dependencies:
-    universalify "^2.0.0"
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
-jszip@^3.10.1:
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.10.1.tgz#34aee70eb18ea1faec2f589208a157d1feb091c2"
-  integrity sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==
-  dependencies:
-    lie "~3.3.0"
-    pako "~1.0.2"
-    readable-stream "~2.3.6"
-    setimmediate "^1.0.5"
-
-just-debounce@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/just-debounce/-/just-debounce-1.0.0.tgz#87fccfaeffc0b68cd19d55f6722943f929ea35ea"
-  integrity sha1-h/zPrv/AtozRnVX2cilD+SnqNeo=
-
-just-extend@^4.0.2:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-4.2.1.tgz#ef5e589afb61e5d66b24eca749409a8939a8c744"
-  integrity sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==
-
-kerberos@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/kerberos/-/kerberos-2.0.1.tgz#663b0b46883b4da84495f60f2e9e399a43a33ef5"
-  integrity sha512-O/jIgbdGK566eUhFwIcgalbqirYU/r76MW7/UFw06Fd9x5bSwgyZWL/Vm26aAmezQww/G9KYkmmJBkEkPk5HLw==
-  dependencies:
-    bindings "^1.5.0"
-    node-addon-api "^4.3.0"
-    prebuild-install "7.1.1"
-
-keygrip@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/keygrip/-/keygrip-1.1.0.tgz#871b1681d5e159c62a445b0c74b615e0917e7226"
-  integrity sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==
-  dependencies:
-    tsscmp "1.0.6"
-
-keyv@^4.0.0:
-  version "4.5.2"
-  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.2.tgz#0e310ce73bf7851ec702f2eaf46ec4e3805cce56"
-  integrity sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==
-  dependencies:
-    json-buffer "3.0.1"
-
-kind-of@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-1.1.0.tgz#140a3d2d41a36d2efcfa9377b62c24f8495a5c44"
-  integrity sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=
-
-kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
-  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^5.0.0, kind-of@^5.0.2:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
-  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
-
-kind-of@^6.0.0, kind-of@^6.0.2:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
-  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
-
-koa-compose@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/koa-compose/-/koa-compose-4.1.0.tgz#507306b9371901db41121c812e923d0d67d3e877"
-  integrity sha512-8ODW8TrDuMYvXRwra/Kh7/rJo9BtOfPc6qO8eAfC80CnCvSjSl0bkRM24X6/XBBEyj0v1nRUQ1LyOy3dbqOWXw==
-
-koa-convert@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/koa-convert/-/koa-convert-2.0.0.tgz#86a0c44d81d40551bae22fee6709904573eea4f5"
-  integrity sha512-asOvN6bFlSnxewce2e/DK3p4tltyfC4VM7ZwuTuepI7dEQVcvpyFuBcEARu1+Hxg8DIwytce2n7jrZtRlPrARA==
-  dependencies:
-    co "^4.6.0"
-    koa-compose "^4.1.0"
-
-koa-morgan@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/koa-morgan/-/koa-morgan-1.0.1.tgz#08052e0ce0d839d3c43178b90a5bb3424bef1f99"
-  integrity sha1-CAUuDODYOdPEMXi5CluzQkvvH5k=
-  dependencies:
-    morgan "^1.6.1"
-
-koa-mount@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/koa-mount/-/koa-mount-4.0.0.tgz#e0265e58198e1a14ef889514c607254ff386329c"
-  integrity sha512-rm71jaA/P+6HeCpoRhmCv8KVBIi0tfGuO/dMKicbQnQW/YJntJ6MnnspkodoA4QstMVEZArsCphmd0bJEtoMjQ==
-  dependencies:
-    debug "^4.0.1"
-    koa-compose "^4.1.0"
-
-koa-send@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/koa-send/-/koa-send-5.0.1.tgz#39dceebfafb395d0d60beaffba3a70b4f543fe79"
-  integrity sha512-tmcyQ/wXXuxpDxyNXv5yNNkdAMdFRqwtegBXUaowiQzUKqJehttS0x2j0eOZDQAyloAth5w6wwBImnFzkUz3pQ==
-  dependencies:
-    debug "^4.1.1"
-    http-errors "^1.7.3"
-    resolve-path "^1.4.0"
-
-koa-static@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/koa-static/-/koa-static-5.0.0.tgz#5e92fc96b537ad5219f425319c95b64772776943"
-  integrity sha512-UqyYyH5YEXaJrf9S8E23GoJFQZXkBVJ9zYYMPGz919MSX1KuvAcycIuS0ci150HCoPf4XQVhQ84Qf8xRPWxFaQ==
-  dependencies:
-    debug "^3.1.0"
-    koa-send "^5.0.0"
-
-koa@^2.14.2:
-  version "2.14.2"
-  resolved "https://registry.yarnpkg.com/koa/-/koa-2.14.2.tgz#a57f925c03931c2b4d94b19d2ebf76d3244863fc"
-  integrity sha512-VFI2bpJaodz6P7x2uyLiX6RLYpZmOJqNmoCst/Yyd7hQlszyPwG/I9CQJ63nOtKSxpt5M7NH67V6nJL2BwCl7g==
-  dependencies:
-    accepts "^1.3.5"
-    cache-content-type "^1.0.0"
-    content-disposition "~0.5.2"
-    content-type "^1.0.4"
-    cookies "~0.8.0"
-    debug "^4.3.2"
-    delegates "^1.0.0"
-    depd "^2.0.0"
-    destroy "^1.0.4"
-    encodeurl "^1.0.2"
-    escape-html "^1.0.3"
-    fresh "~0.5.2"
-    http-assert "^1.3.0"
-    http-errors "^1.6.3"
-    is-generator-function "^1.0.7"
-    koa-compose "^4.1.0"
-    koa-convert "^2.0.0"
-    on-finished "^2.3.0"
-    only "~0.0.2"
-    parseurl "^1.3.2"
-    statuses "^1.5.0"
-    type-is "^1.6.16"
-    vary "^1.1.2"
-
-last-run@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/last-run/-/last-run-1.1.1.tgz#45b96942c17b1c79c772198259ba943bebf8ca5b"
-  integrity sha1-RblpQsF7HHnHchmCWbqUO+v4yls=
-  dependencies:
-    default-resolution "^2.0.0"
-    es6-weak-map "^2.0.1"
-
-lazy.js@^0.4.2:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/lazy.js/-/lazy.js-0.4.3.tgz#87f67a07ad36555121e4fff1520df31be66786d8"
-  integrity sha1-h/Z6B602VVEh5P/xUg3zG+Znhtg=
-
-lazystream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4"
-  integrity sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=
-  dependencies:
-    readable-stream "^2.0.5"
-
-lcid@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
-  integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=
-  dependencies:
-    invert-kv "^1.0.0"
-
-lcid@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
-  integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==
-  dependencies:
-    invert-kv "^2.0.0"
-
-lead@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lead/-/lead-1.0.0.tgz#6f14f99a37be3a9dd784f5495690e5903466ee42"
-  integrity sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=
-  dependencies:
-    flush-write-stream "^1.0.2"
-
-levn@^0.3.0, levn@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
-  dependencies:
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-
-levn@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
-  integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
-  dependencies:
-    prelude-ls "^1.2.1"
-    type-check "~0.4.0"
-
-lie@~3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/lie/-/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a"
-  integrity sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==
-  dependencies:
-    immediate "~3.0.5"
-
-liftoff@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-3.1.0.tgz#c9ba6081f908670607ee79062d700df062c52ed3"
-  integrity sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==
-  dependencies:
-    extend "^3.0.0"
-    findup-sync "^3.0.0"
-    fined "^1.0.1"
-    flagged-respawn "^1.0.0"
-    is-plain-object "^2.0.4"
-    object.map "^1.0.0"
-    rechoir "^0.6.2"
-    resolve "^1.1.7"
-
-lilconfig@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-3.0.0.tgz#f8067feb033b5b74dab4602a5f5029420be749bc"
-  integrity sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g==
-
-linkify-it@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-5.0.0.tgz#9ef238bfa6dc70bd8e7f9572b52d369af569b421"
-  integrity sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==
-  dependencies:
-    uc.micro "^2.0.0"
-
-load-json-file@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
-  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^2.2.0"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    strip-bom "^2.0.0"
-
-load-json-file@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
-  integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs=
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^4.0.0"
-    pify "^3.0.0"
-    strip-bom "^3.0.0"
-
-loader-runner@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384"
-  integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==
-
-loader-utils@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c"
-  integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==
-  dependencies:
-    big.js "^5.2.2"
-    emojis-list "^3.0.0"
-    json5 "^2.1.2"
-
-locate-path@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
-  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
-  dependencies:
-    p-locate "^3.0.0"
-    path-exists "^3.0.0"
-
-locate-path@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
-  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
-  dependencies:
-    p-locate "^4.1.0"
-
-locate-path@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
-  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
-  dependencies:
-    p-locate "^5.0.0"
-
-lodash.camelcase@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
-  integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY=
-
-lodash.clone@^4.3.2:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6"
-  integrity sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y=
-
-lodash.clonedeep@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
-  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
-
-lodash.get@^4.4.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
-  integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
-
-lodash.memoize@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
-  integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
-
-lodash.merge@^4.6.2:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
-  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
-
-lodash.some@^4.2.2:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d"
-  integrity sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=
-
-lodash.uniq@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
-  integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
-
-lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15:
-  version "4.17.21"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
-  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
-
-log-symbols@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
-  integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
-  dependencies:
-    chalk "^4.1.0"
-    is-unicode-supported "^0.1.0"
-
-lowercase-keys@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
-  integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
-
-lru-cache@^4.1.3:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
-  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
-  dependencies:
-    pseudomap "^1.0.2"
-    yallist "^2.1.2"
-
-lru-cache@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
-  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
-  dependencies:
-    yallist "^4.0.0"
-
-"lru-cache@^9.1.1 || ^10.0.0":
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.1.tgz#0a3be479df549cca0e5d693ac402ff19537a6b7a"
-  integrity sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==
-
-lru-queue@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/lru-queue/-/lru-queue-0.1.0.tgz#2738bd9f0d3cf4f84490c5736c48699ac632cda3"
-  integrity sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=
-  dependencies:
-    es5-ext "~0.10.2"
-
-make-dir@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.0.0.tgz#1b5f39f6b9270ed33f9f054c5c0f84304989f801"
-  integrity sha512-grNJDhb8b1Jm1qeqW5R/O63wUo4UXo2v2HMic6YT9i/HBlF93S8jkMgH7yugvY9ABDShH4VZMn8I+U8+fCNegw==
-  dependencies:
-    semver "^6.0.0"
-
-make-dir@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-4.0.0.tgz#c3c2307a771277cd9638305f915c29ae741b614e"
-  integrity sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==
-  dependencies:
-    semver "^7.5.3"
-
-make-error@^1.1.1:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
-  integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
-
-make-iterator@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6"
-  integrity sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==
-  dependencies:
-    kind-of "^6.0.2"
-
-map-age-cleaner@^0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
-  integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==
-  dependencies:
-    p-defer "^1.0.0"
-
-map-cache@^0.2.0, map-cache@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
-  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
-
-map-stream@0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.0.7.tgz#8a1f07896d82b10926bd3744a2420009f88974a8"
-  integrity sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=
-
-map-stream@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
-  integrity sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=
-
-map-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
-  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
-  dependencies:
-    object-visit "^1.0.0"
-
-markdown-it@^14.0.0:
-  version "14.1.0"
-  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-14.1.0.tgz#3c3c5992883c633db4714ccb4d7b5935d98b7d45"
-  integrity sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==
-  dependencies:
-    argparse "^2.0.1"
-    entities "^4.4.0"
-    linkify-it "^5.0.0"
-    mdurl "^2.0.0"
-    punycode.js "^2.3.1"
-    uc.micro "^2.1.0"
-
-matchdep@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/matchdep/-/matchdep-2.0.0.tgz#c6f34834a0d8dbc3b37c27ee8bbcb27c7775582e"
-  integrity sha1-xvNINKDY28OzfCfui7yyfHd1WC4=
-  dependencies:
-    findup-sync "^2.0.0"
-    micromatch "^3.0.4"
-    resolve "^1.4.0"
-    stack-trace "0.0.10"
-
-matcher@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca"
-  integrity sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==
-  dependencies:
-    escape-string-regexp "^4.0.0"
-
-md5@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/md5/-/md5-2.3.0.tgz#c3da9a6aae3a30b46b7b0c349b87b110dc3bda4f"
-  integrity sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==
-  dependencies:
-    charenc "0.0.2"
-    crypt "0.0.2"
-    is-buffer "~1.1.6"
-
-mdn-data@2.0.14:
-  version "2.0.14"
-  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
-  integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==
-
-mdn-data@2.0.28:
-  version "2.0.28"
-  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.28.tgz#5ec48e7bef120654539069e1ae4ddc81ca490eba"
-  integrity sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==
-
-mdn-data@2.0.30:
-  version "2.0.30"
-  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.30.tgz#ce4df6f80af6cfbe218ecd5c552ba13c4dfa08cc"
-  integrity sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==
-
-mdurl@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-2.0.0.tgz#80676ec0433025dd3e17ee983d0fe8de5a2237e0"
-  integrity sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==
-
-media-typer@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
-  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
-
-mem@^4.0.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
-  integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==
-  dependencies:
-    map-age-cleaner "^0.1.1"
-    mimic-fn "^2.0.0"
-    p-is-promise "^2.0.0"
-
-memoizee@0.4.X:
-  version "0.4.15"
-  resolved "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.15.tgz#e6f3d2da863f318d02225391829a6c5956555b72"
-  integrity sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==
-  dependencies:
-    d "^1.0.1"
-    es5-ext "^0.10.53"
-    es6-weak-map "^2.0.3"
-    event-emitter "^0.3.5"
-    is-promise "^2.2.2"
-    lru-queue "^0.1.0"
-    next-tick "^1.1.0"
-    timers-ext "^0.1.7"
-
-memory-fs@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c"
-  integrity sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==
-  dependencies:
-    errno "^0.1.3"
-    readable-stream "^2.0.1"
-
-memorystream@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
-  integrity sha1-htcJCzDORV1j+64S3aUaR93K+bI=
-
-merge-options@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/merge-options/-/merge-options-1.0.1.tgz#2a64b24457becd4e4dc608283247e94ce589aa32"
-  integrity sha512-iuPV41VWKWBIOpBsjoxjDZw8/GbSfZ2mk7N1453bwMrfzdrIk7EzBd+8UVR6rkw67th7xnk9Dytl3J+lHPdxvg==
-  dependencies:
-    is-plain-obj "^1.1"
-
-merge-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
-  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
-
-merge2@^1.3.0, merge2@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
-  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
-
-methods@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
-  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
-
-micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
-  version "3.1.10"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
-  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
-  dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    braces "^2.3.1"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    extglob "^2.0.4"
-    fragment-cache "^0.2.1"
-    kind-of "^6.0.2"
-    nanomatch "^1.2.9"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.2"
-
-micromatch@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
-  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
-  dependencies:
-    braces "^3.0.1"
-    picomatch "^2.0.5"
-
-micromatch@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
-  integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
-  dependencies:
-    braces "^3.0.1"
-    picomatch "^2.2.3"
-
-micromatch@^4.0.5:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
-  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
-  dependencies:
-    braces "^3.0.2"
-    picomatch "^2.3.1"
-
-mime-db@1.45.0:
-  version "1.45.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea"
-  integrity sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==
-
-mime-db@1.48.0:
-  version "1.48.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.48.0.tgz#e35b31045dd7eada3aaad537ed88a33afbef2d1d"
-  integrity sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==
-
-mime-db@1.51.0:
-  version "1.51.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c"
-  integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==
-
-mime-types@^2.1.12:
-  version "2.1.28"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.28.tgz#1160c4757eab2c5363888e005273ecf79d2a0ecd"
-  integrity sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==
-  dependencies:
-    mime-db "1.45.0"
-
-mime-types@^2.1.18, mime-types@~2.1.24:
-  version "2.1.34"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24"
-  integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==
-  dependencies:
-    mime-db "1.51.0"
-
-mime-types@^2.1.27:
-  version "2.1.31"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.31.tgz#a00d76b74317c61f9c2db2218b8e9f8e9c5c9e6b"
-  integrity sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==
-  dependencies:
-    mime-db "1.48.0"
-
-mime@^1.3.4:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
-  integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
-
-mime@^1.4.1:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
-  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
-
-mimic-fn@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
-  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
-
-mimic-fn@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
-  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
-
-mimic-response@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
-  integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
-
-mimic-response@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
-  integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==
-
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimatch@5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.0.1.tgz#fb9022f7528125187c92bd9e9b6366be1cf3415b"
-  integrity sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==
-  dependencies:
-    brace-expansion "^2.0.1"
-
-minimatch@9.0.3, minimatch@^9.0.1, minimatch@^9.0.3:
-  version "9.0.3"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
-  integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
-  dependencies:
-    brace-expansion "^2.0.1"
-
-minimatch@^7.4.3:
-  version "7.4.6"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-7.4.6.tgz#845d6f254d8f4a5e4fd6baf44d5f10c8448365fb"
-  integrity sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw==
-  dependencies:
-    brace-expansion "^2.0.1"
-
-minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
-  integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
-
-minimist@^1.2.8:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
-  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
-
-minipass@^3.0.0:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd"
-  integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==
-  dependencies:
-    yallist "^4.0.0"
-
-minipass@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
-  integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
-
-"minipass@^5.0.0 || ^6.0.2 || ^7.0.0":
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c"
-  integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==
-
-minizlib@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
-  integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
-  dependencies:
-    minipass "^3.0.0"
-    yallist "^4.0.0"
-
-mixin-deep@^1.2.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
-  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
-  dependencies:
-    for-in "^1.0.2"
-    is-extendable "^1.0.1"
-
-mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
-  integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
-
-"mkdirp@>=0.5 0", mkdirp@^0.5.1, mkdirp@~0.5.0:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
-  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
-  dependencies:
-    minimist "^1.2.5"
-
-mkdirp@^1.0.3, mkdirp@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-
-mkdirp@^2.1.6:
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-2.1.6.tgz#964fbcb12b2d8c5d6fbc62a963ac95a273e2cc19"
-  integrity sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A==
-
-mkdirp@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-3.0.1.tgz#e44e4c5607fb279c168241713cc6e0fea9adcb50"
-  integrity sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==
-
-mocha-junit-reporter@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-2.2.1.tgz#739f5595d0f051d07af9d74e32c416e13a41cde5"
-  integrity sha512-iDn2tlKHn8Vh8o4nCzcUVW4q7iXp7cC4EB78N0cDHIobLymyHNwe0XG8HEHHjc3hJlXm0Vy6zcrxaIhnI2fWmw==
-  dependencies:
-    debug "^4.3.4"
-    md5 "^2.3.0"
-    mkdirp "^3.0.0"
-    strip-ansi "^6.0.1"
-    xml "^1.0.1"
-
-mocha-multi-reporters@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/mocha-multi-reporters/-/mocha-multi-reporters-1.5.1.tgz#c73486bed5519e1d59c9ce39ac7a9792600e5676"
-  integrity sha512-Yb4QJOaGLIcmB0VY7Wif5AjvLMUFAdV57D2TWEva1Y0kU/3LjKpeRVmlMIfuO1SVbauve459kgtIizADqxMWPg==
-  dependencies:
-    debug "^4.1.1"
-    lodash "^4.17.15"
-
-mocha@^10.2.0:
-  version "10.2.0"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.2.0.tgz#1fd4a7c32ba5ac372e03a17eef435bd00e5c68b8"
-  integrity sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg==
-  dependencies:
-    ansi-colors "4.1.1"
-    browser-stdout "1.3.1"
-    chokidar "3.5.3"
-    debug "4.3.4"
-    diff "5.0.0"
-    escape-string-regexp "4.0.0"
-    find-up "5.0.0"
-    glob "7.2.0"
-    he "1.2.0"
-    js-yaml "4.1.0"
-    log-symbols "4.1.0"
-    minimatch "5.0.1"
-    ms "2.1.3"
-    nanoid "3.3.3"
-    serialize-javascript "6.0.0"
-    strip-json-comments "3.1.1"
-    supports-color "8.1.1"
-    workerpool "6.2.1"
-    yargs "16.2.0"
-    yargs-parser "20.2.4"
-    yargs-unparser "2.0.0"
-
-morgan@^1.6.1:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz#091778abc1fc47cd3509824653dae1faab6b17d7"
-  integrity sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==
-  dependencies:
-    basic-auth "~2.0.1"
-    debug "2.6.9"
-    depd "~2.0.0"
-    on-finished "~2.3.0"
-    on-headers "~1.0.2"
-
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
-
-ms@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-ms@2.1.3, ms@^2.1.1:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
-  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
-
-multimatch@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
-  integrity sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=
-  dependencies:
-    array-differ "^1.0.0"
-    array-union "^1.0.1"
-    arrify "^1.0.0"
-    minimatch "^3.0.0"
-
-mute-stdout@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/mute-stdout/-/mute-stdout-1.0.1.tgz#acb0300eb4de23a7ddeec014e3e96044b3472331"
-  integrity sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==
-
-mute-stream@0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
-  integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
-
-nan@^2.12.1:
-  version "2.14.2"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
-  integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==
-
-nanoid@3.3.3:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25"
-  integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==
-
-nanoid@^3.3.7:
-  version "3.3.7"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
-  integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
-
-nanomatch@^1.2.9:
-  version "1.2.13"
-  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
-  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
-  dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    fragment-cache "^0.2.1"
-    is-windows "^1.0.2"
-    kind-of "^6.0.2"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-napi-build-utils@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806"
-  integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==
-
-native-is-elevated@0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/native-is-elevated/-/native-is-elevated-0.7.0.tgz#77499639e232edad1886403969e2bf236294e7af"
-  integrity sha512-tp8hUqK7vexBiyIWKMvmRxdG6kqUtO+3eay9iB0i16NYgvCqE5wMe1Y0guHilpkmRgvVXEWNW4et1+qqcwpLBA==
-
-native-keymap@^3.3.5:
-  version "3.3.5"
-  resolved "https://registry.yarnpkg.com/native-keymap/-/native-keymap-3.3.5.tgz#b1da65d32e42bf65e3ff9db05bed319927dc2b01"
-  integrity sha512-7XDOLPNX1FnUFC/cX3cioBz2M+dO212ai9DuwpfKFzkPu3xTmEzOm5xewOMLXE4V9YoRhNPxvq1H2YpPWDgSsg==
-
-native-watchdog@^1.4.1:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/native-watchdog/-/native-watchdog-1.4.2.tgz#cf9f913157ee992723aa372b6137293c663be9b7"
-  integrity sha512-iT3Uj6FFdrW5vHbQ/ybiznLus9oiUoMJ8A8nyugXv9rV3EBhIodmGs+mztrwQyyBc+PB5/CrskAH/WxaUVRRSQ==
-
-natural-compare@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
-  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
-
-negotiator@0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
-  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
-
-neo-async@^2.6.2:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
-  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
-
-next-tick@1, next-tick@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb"
-  integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==
-
-nice-try@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
-  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
-
-nise@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/nise/-/nise-5.1.0.tgz#713ef3ed138252daef20ec035ab62b7a28be645c"
-  integrity sha512-W5WlHu+wvo3PaKLsJJkgPup2LrsXCcm7AWwyNZkUnn5rwPkuPBi3Iwk5SQtN0mv+K65k7nKKjwNQ30wg3wLAQQ==
-  dependencies:
-    "@sinonjs/commons" "^1.7.0"
-    "@sinonjs/fake-timers" "^7.0.4"
-    "@sinonjs/text-encoding" "^0.7.1"
-    just-extend "^4.0.2"
-    path-to-regexp "^1.7.0"
-
-node-abi@^3.3.0:
-  version "3.8.0"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.8.0.tgz#679957dc8e7aa47b0a02589dbfde4f77b29ccb32"
-  integrity sha512-tzua9qWWi7iW4I42vUPKM+SfaF0vQSLAm4yO5J83mSwB7GeoWrDKC/K+8YCnYNwqP5duwazbw2X9l4m8SC2cUw==
-  dependencies:
-    semver "^7.3.5"
-
-node-addon-api@7.1.0, node-addon-api@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.1.0.tgz#71f609369379c08e251c558527a107107b5e0fdb"
-  integrity sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==
-
-node-addon-api@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.1.0.tgz#98b21931557466c6729e51cb77cd39c965f42239"
-  integrity sha512-flmrDNB06LIl5lywUz7YlNGZH/5p0M7W28k8hzd9Lshtdh1wshD2Y+U4h9LD6KObOy1f+fEVdgprPrEymjM5uw==
-
-node-addon-api@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
-  integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
-
-node-addon-api@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.2.0.tgz#117cbb5a959dff0992e1c586ae0393573e4d2a87"
-  integrity sha512-eazsqzwG2lskuzBqCGPi7Ac2UgOoMz8JVOXVhTvvPDYhthvNpefx8jWD8Np7Gv+2Sz0FlPWZk0nJV0z598Wn8Q==
-
-node-addon-api@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f"
-  integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==
-
-node-addon-api@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-6.0.0.tgz#cfb3574e6df708ff71a30db6c4762d9e06e11c27"
-  integrity sha512-GyHvgPvUXBvAkXa0YvYnhilSB1A+FRYMpIVggKzPZqdaZfevZOuzfWzyvgzOwRLHBeo/MMswmJFsrNF4Nw1pmA==
-
-node-fetch@2.6.8:
-  version "2.6.8"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.8.tgz#a68d30b162bc1d8fd71a367e81b997e1f4d4937e"
-  integrity sha512-RZ6dBYuj8dRSfxpUSu+NsdF1dpPpluJxwOp+6IoDp/sH2QNDSvurYsAa+F1WxY2RjA1iP93xhcsUoYbF2XBqVg==
-  dependencies:
-    whatwg-url "^5.0.0"
-
-node-fetch@^2.6.0, node-fetch@^2.6.7:
-  version "2.6.7"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
-  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
-  dependencies:
-    whatwg-url "^5.0.0"
-
-node-gyp-build@4.8.1, node-gyp-build@^4.3.0:
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.8.1.tgz#976d3ad905e71b76086f4f0b0d3637fe79b6cda5"
-  integrity sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw==
-
-node-html-markdown@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/node-html-markdown/-/node-html-markdown-1.3.0.tgz#ef0b19a3bbfc0f1a880abb9ff2a0c9aa6bbff2a9"
-  integrity sha512-OeFi3QwC/cPjvVKZ114tzzu+YoR+v9UXW5RwSXGUqGb0qCl0DvP406tzdL7SFn8pZrMyzXoisfG2zcuF9+zw4g==
-  dependencies:
-    node-html-parser "^6.1.1"
-
-node-html-parser@^6.1.1:
-  version "6.1.13"
-  resolved "https://registry.yarnpkg.com/node-html-parser/-/node-html-parser-6.1.13.tgz#a1df799b83df5c6743fcd92740ba14682083b7e4"
-  integrity sha512-qIsTMOY4C/dAa5Q5vsobRpOOvPfC4pB61UVW2uSwZNUp0QU/jCekTal1vMmbO0DgdHeLUJpv/ARmDqErVxA3Sg==
-  dependencies:
-    css-select "^5.1.0"
-    he "1.2.0"
-
-node-pty@1.1.0-beta11:
-  version "1.1.0-beta11"
-  resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-1.1.0-beta11.tgz#909d5dd8f9aa2a7857e7b632fd4d2d4768bdf69f"
-  integrity sha512-vTjF+VrvSCfPDILUkIT+YrG1Fdn06/eBRS2fc9a3JzYAvknMB1Ip8aoJhxl8hNpjWAbprmCEiV91mlfNpCD+GQ==
-  dependencies:
-    node-addon-api "^7.1.0"
-
-node-releases@^1.1.71:
-  version "1.1.72"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.72.tgz#14802ab6b1039a79a0c7d662b610a5bbd76eacbe"
-  integrity sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==
-
-node-releases@^2.0.14:
-  version "2.0.14"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b"
-  integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==
-
-node-releases@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
-  integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==
-
-nopt@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
-  integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
-  dependencies:
-    abbrev "1"
-    osenv "^0.1.4"
-
-normalize-package-data@^2.3.2:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
-  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
-  dependencies:
-    hosted-git-info "^2.1.4"
-    resolve "^1.10.0"
-    semver "2 || 3 || 4 || 5"
-    validate-npm-package-license "^3.0.1"
-
-normalize-path@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379"
-  integrity sha512-7WyT0w8jhpDStXRq5836AMmihQwq2nrUVQrgjvUo/p/NZf9uy/MeJ246lBJVmWuYXMlJuG9BNZHF0hWjfTbQUA==
-
-normalize-path@^2.0.1, normalize-path@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
-  dependencies:
-    remove-trailing-separator "^1.0.1"
-
-normalize-path@^3.0.0, normalize-path@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
-  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
-
-normalize-url@^6.0.1:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
-  integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
-
-now-and-later@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/now-and-later/-/now-and-later-2.0.1.tgz#8e579c8685764a7cc02cb680380e94f43ccb1f7c"
-  integrity sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==
-  dependencies:
-    once "^1.3.2"
-
-npm-run-all@^4.1.5:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.5.tgz#04476202a15ee0e2e214080861bff12a51d98fba"
-  integrity sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    chalk "^2.4.1"
-    cross-spawn "^6.0.5"
-    memorystream "^0.3.1"
-    minimatch "^3.0.4"
-    pidtree "^0.3.0"
-    read-pkg "^3.0.0"
-    shell-quote "^1.6.1"
-    string.prototype.padend "^3.0.0"
-
-npm-run-path@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
-  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
-  dependencies:
-    path-key "^2.0.0"
-
-nth-check@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2"
-  integrity sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==
-  dependencies:
-    boolbase "^1.0.0"
-
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
-
-object-assign@4.X, object-assign@^4.0.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
-
-object-copy@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
-  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
-  dependencies:
-    copy-descriptor "^0.1.0"
-    define-property "^0.2.5"
-    kind-of "^3.0.3"
-
-object-inspect@^1.8.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a"
-  integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==
-
-object-keys@^1.0.12, object-keys@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
-  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
-
-object-keys@~0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-0.4.0.tgz#28a6aae7428dd2c3a92f3d95f21335dd204e0336"
-  integrity sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=
-
-object-visit@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
-  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
-  dependencies:
-    isobject "^3.0.0"
-
-object.assign@^4.0.4, object.assign@^4.1.0, object.assign@^4.1.1:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
-  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
-  dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-    has-symbols "^1.0.1"
-    object-keys "^1.1.1"
-
-object.defaults@^1.0.0, object.defaults@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf"
-  integrity sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=
-  dependencies:
-    array-each "^1.0.1"
-    array-slice "^1.0.0"
-    for-own "^1.0.0"
-    isobject "^3.0.0"
-
-object.map@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"
-  integrity sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=
-  dependencies:
-    for-own "^1.0.0"
-    make-iterator "^1.0.0"
-
-object.pick@^1.2.0, object.pick@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
-  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
-  dependencies:
-    isobject "^3.0.1"
-
-object.reduce@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/object.reduce/-/object.reduce-1.0.1.tgz#6fe348f2ac7fa0f95ca621226599096825bb03ad"
-  integrity sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=
-  dependencies:
-    for-own "^1.0.0"
-    make-iterator "^1.0.0"
-
-on-finished@^2.3.0, on-finished@~2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
-  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
-  dependencies:
-    ee-first "1.1.1"
-
-on-headers@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
-  integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
-
-once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
-  dependencies:
-    wrappy "1"
-
-onetime@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
-  integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
-  dependencies:
-    mimic-fn "^1.0.0"
-
-only@~0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/only/-/only-0.0.2.tgz#2afde84d03e50b9a8edc444e30610a70295edfb4"
-  integrity sha1-Kv3oTQPlC5qO3EROMGEKcCle37Q=
-
-opn@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-6.0.0.tgz#3c5b0db676d5f97da1233d1ed42d182bc5a27d2d"
-  integrity sha512-I9PKfIZC+e4RXZ/qr1RhgyCnGgYX0UEIlXgWnCOVACIvFgaC9rz6Won7xbdhoHrd8IIhV7YEpHjreNUNkqCGkQ==
-  dependencies:
-    is-wsl "^1.1.0"
-
-optionator@^0.8.2:
-  version "0.8.3"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
-  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
-  dependencies:
-    deep-is "~0.1.3"
-    fast-levenshtein "~2.0.6"
-    levn "~0.3.0"
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-    word-wrap "~1.2.3"
-
-optionator@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
-  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
-  dependencies:
-    deep-is "^0.1.3"
-    fast-levenshtein "^2.0.6"
-    levn "^0.4.1"
-    prelude-ls "^1.2.1"
-    type-check "^0.4.0"
-    word-wrap "^1.2.3"
-
-ordered-read-streams@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz#77c0cb37c41525d64166d990ffad7ec6a0e1363e"
-  integrity sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=
-  dependencies:
-    readable-stream "^2.0.1"
-
-os-homedir@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
-
-os-locale@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
-  integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=
-  dependencies:
-    lcid "^1.0.0"
-
-os-locale@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
-  integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
-  dependencies:
-    execa "^1.0.0"
-    lcid "^2.0.0"
-    mem "^4.0.0"
-
-os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
-
-osenv@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
-  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.0"
-
-p-all@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-all/-/p-all-1.0.0.tgz#93bdf53a55a23821fdfa98b4174a99bf7f31df8d"
-  integrity sha1-k731OlWiOCH9+pi0F0qZv38x340=
-  dependencies:
-    p-map "^1.0.0"
-
-p-cancelable@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf"
-  integrity sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==
-
-p-defer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
-  integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
-
-p-finally@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
-
-p-is-promise@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
-  integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
-
-p-limit@^2.0.0, p-limit@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
-  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
-  dependencies:
-    p-try "^2.0.0"
-
-p-limit@^3.0.2, p-limit@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
-  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
-  dependencies:
-    yocto-queue "^0.1.0"
-
-p-locate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
-  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
-  dependencies:
-    p-limit "^2.0.0"
-
-p-locate@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
-  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
-  dependencies:
-    p-limit "^2.2.0"
-
-p-locate@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
-  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
-  dependencies:
-    p-limit "^3.0.2"
-
-p-map@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
-  integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
-
-p-try@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
-  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
-
-pako@~0.2.0:
-  version "0.2.9"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
-  integrity sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==
-
-pako@~1.0.2:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
-  integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
-
-parent-module@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
-  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
-  dependencies:
-    callsites "^3.0.0"
-
-parse-filepath@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891"
-  integrity sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=
-  dependencies:
-    is-absolute "^1.0.0"
-    map-cache "^0.2.0"
-    path-root "^0.1.1"
-
-parse-json@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
-  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
-  dependencies:
-    error-ex "^1.2.0"
-
-parse-json@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
-  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
-  dependencies:
-    error-ex "^1.3.1"
-    json-parse-better-errors "^1.0.1"
-
-parse-node-version@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
-  integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==
-
-parse-passwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
-  integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
-
-parseurl@^1.3.2:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
-  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
-
-pascalcase@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
-  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
-
-path-browserify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd"
-  integrity sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==
-
-path-dirname@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
-  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
-
-path-exists@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
-  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
-  dependencies:
-    pinkie-promise "^2.0.0"
-
-path-exists@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
-
-path-exists@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
-  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
-
-path-is-absolute@1.0.1, path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
-
-path-is-inside@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
-  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
-
-path-key@^2.0.0, path-key@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
-
-path-key@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
-  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
-
-path-parse@^1.0.6, path-parse@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
-  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
-
-path-root-regex@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
-  integrity sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=
-
-path-root@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
-  integrity sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=
-  dependencies:
-    path-root-regex "^0.1.0"
-
-path-scurry@^1.10.1:
-  version "1.10.1"
-  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.1.tgz#9ba6bf5aa8500fe9fd67df4f0d9483b2b0bfc698"
-  integrity sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==
-  dependencies:
-    lru-cache "^9.1.1 || ^10.0.0"
-    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
-
-path-to-regexp@^1.7.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a"
-  integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==
-  dependencies:
-    isarray "0.0.1"
-
-path-to-regexp@^6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-6.2.1.tgz#d54934d6798eb9e5ef14e7af7962c945906918e5"
-  integrity sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw==
-
-path-type@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
-  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
-  dependencies:
-    graceful-fs "^4.1.2"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-path-type@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
-  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
-  dependencies:
-    pify "^3.0.0"
-
-path-type@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
-  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
-
-pause-stream@0.0.11, pause-stream@^0.0.11:
-  version "0.0.11"
-  resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"
-  integrity sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=
-  dependencies:
-    through "~2.3"
-
-peek-stream@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/peek-stream/-/peek-stream-1.1.3.tgz#3b35d84b7ccbbd262fff31dc10da56856ead6d67"
-  integrity sha512-FhJ+YbOSBb9/rIl2ZeE/QHEsWn7PqNYt8ARAY3kIgNGOk13g9FGyIY6JIl/xB/3TFRVoTv5as0l11weORrTekA==
-  dependencies:
-    buffer-from "^1.0.0"
-    duplexify "^3.5.0"
-    through2 "^2.0.3"
-
-pend@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
-  integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=
-
-picocolors@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
-  integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==
-
-picocolors@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
-  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
-
-picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
-  integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
-
-picomatch@^2.2.3:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
-  integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==
-
-picomatch@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
-  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
-
-pidtree@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.1.tgz#ef09ac2cc0533df1f3250ccf2c4d366b0d12114a"
-  integrity sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==
-
-pify@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-  integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==
-
-pify@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
-
-pinkie-promise@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
-  dependencies:
-    pinkie "^2.0.0"
-
-pinkie@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
-
-pkg-dir@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
-  integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
-  dependencies:
-    find-up "^4.0.0"
-
-playwright-core@1.30.0:
-  version "1.30.0"
-  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.30.0.tgz#de987cea2e86669e3b85732d230c277771873285"
-  integrity sha512-7AnRmTCf+GVYhHbLJsGUtskWTE33SwMZkybJ0v6rqR1boxq2x36U7p1vDRV7HO2IwTZgmycracLxPEJI49wu4g==
-
-playwright-core@1.40.1:
-  version "1.40.1"
-  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.40.1.tgz#442d15e86866a87d90d07af528e0afabe4c75c05"
-  integrity sha512-+hkOycxPiV534c4HhpfX6yrlawqVUzITRKwHAmYfmsVreltEl6fAZJ3DPfLMOODw0H3s1Itd6MDCWmP1fl/QvQ==
-
-playwright@1.40.1, playwright@^1.40.1:
-  version "1.40.1"
-  resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.40.1.tgz#a11bf8dca15be5a194851dbbf3df235b9f53d7ae"
-  integrity sha512-2eHI7IioIpQ0bS1Ovg/HszsN/XKNwEG1kbzSDDmADpclKc7CyqkHw7Mg2JCz/bbCxg25QUPcjksoMW7JcIFQmw==
-  dependencies:
-    playwright-core "1.40.1"
-  optionalDependencies:
-    fsevents "2.3.2"
-
-playwright@^1.29.2:
-  version "1.30.0"
-  resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.30.0.tgz#b1d7be2d45d97fbb59f829f36f521f12010fe072"
-  integrity sha512-ENbW5o75HYB3YhnMTKJLTErIBExrSlX2ZZ1C/FzmHjUYIfxj/UnI+DWpQr992m+OQVSg0rCExAOlRwB+x+yyIg==
-  dependencies:
-    playwright-core "1.30.0"
-
-plist@^3.0.1:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.5.tgz#2cbeb52d10e3cdccccf0c11a63a85d830970a987"
-  integrity sha512-83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA==
-  dependencies:
-    base64-js "^1.5.1"
-    xmlbuilder "^9.0.7"
-
-plugin-error@0.1.2, plugin-error@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-0.1.2.tgz#3b9bb3335ccf00f425e07437e19276967da47ace"
-  integrity sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=
-  dependencies:
-    ansi-cyan "^0.1.1"
-    ansi-red "^0.1.1"
-    arr-diff "^1.0.1"
-    arr-union "^2.0.1"
-    extend-shallow "^1.1.2"
-
-plugin-error@^1.0.0, plugin-error@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-1.0.1.tgz#77016bd8919d0ac377fdcdd0322328953ca5781c"
-  integrity sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==
-  dependencies:
-    ansi-colors "^1.0.1"
-    arr-diff "^4.0.0"
-    arr-union "^3.1.0"
-    extend-shallow "^3.0.2"
-
-posix-character-classes@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
-  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
-
-postcss-calc@^9.0.1:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-9.0.1.tgz#a744fd592438a93d6de0f1434c572670361eb6c6"
-  integrity sha512-TipgjGyzP5QzEhsOZUaIkeO5mKeMFpebWzRogWG/ysonUlnHcq5aJe0jOjpfzUU8PeSaBQnrE8ehR0QA5vs8PQ==
-  dependencies:
-    postcss-selector-parser "^6.0.11"
-    postcss-value-parser "^4.2.0"
-
-postcss-colormin@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-6.0.2.tgz#2af9ce753937b08e058dbc6879e4aedfab42806b"
-  integrity sha512-TXKOxs9LWcdYo5cgmcSHPkyrLAh86hX1ijmyy6J8SbOhyv6ua053M3ZAM/0j44UsnQNIWdl8gb5L7xX2htKeLw==
-  dependencies:
-    browserslist "^4.22.2"
-    caniuse-api "^3.0.0"
-    colord "^2.9.1"
-    postcss-value-parser "^4.2.0"
-
-postcss-convert-values@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-6.0.2.tgz#c4a7509aeb1cc7ac3f6948fcbffc2bf8cac7c56a"
-  integrity sha512-aeBmaTnGQ+NUSVQT8aY0sKyAD/BaLJenEKZ03YK0JnDE1w1Rr8XShoxdal2V2H26xTJKr3v5haByOhJuyT4UYw==
-  dependencies:
-    browserslist "^4.22.2"
-    postcss-value-parser "^4.2.0"
-
-postcss-discard-comments@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-6.0.1.tgz#46176212bd9c3e5f48aa4b8b4868786726c41d36"
-  integrity sha512-f1KYNPtqYLUeZGCHQPKzzFtsHaRuECe6jLakf/RjSRqvF5XHLZnM2+fXLhb8Qh/HBFHs3M4cSLb1k3B899RYIg==
-
-postcss-discard-duplicates@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-6.0.1.tgz#112b1a95948e69b3484fdd43584dda6930977939"
-  integrity sha512-1hvUs76HLYR8zkScbwyJ8oJEugfPV+WchpnA+26fpJ7Smzs51CzGBHC32RS03psuX/2l0l0UKh2StzNxOrKCYg==
-
-postcss-discard-empty@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-6.0.1.tgz#b34cb45ec891246da4506b53e352390fdef126c4"
-  integrity sha512-yitcmKwmVWtNsrrRqGJ7/C0YRy53i0mjexBDQ9zYxDwTWVBgbU4+C9jIZLmQlTDT9zhml+u0OMFJh8+31krmOg==
-
-postcss-discard-overridden@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-6.0.1.tgz#c63c559237758d74bc505452393a64dda9b19ef4"
-  integrity sha512-qs0ehZMMZpSESbRkw1+inkf51kak6OOzNRaoLd/U7Fatp0aN2HQ1rxGOrJvYcRAN9VpX8kUF13R2ofn8OlvFVA==
-
-postcss-merge-longhand@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-6.0.2.tgz#cd4e83014851da59545e9a906b245615550f4064"
-  integrity sha512-+yfVB7gEM8SrCo9w2lCApKIEzrTKl5yS1F4yGhV3kSim6JzbfLGJyhR1B6X+6vOT0U33Mgx7iv4X9MVWuaSAfw==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-    stylehacks "^6.0.2"
-
-postcss-merge-rules@^6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-6.0.3.tgz#08fcf714faaad75b1980ecd961b080ae2f8ddeb3"
-  integrity sha512-yfkDqSHGohy8sGYIJwBmIGDv4K4/WrJPX355XrxQb/CSsT4Kc/RxDi6akqn5s9bap85AWgv21ArcUWwWdGNSHA==
-  dependencies:
-    browserslist "^4.22.2"
-    caniuse-api "^3.0.0"
-    cssnano-utils "^4.0.1"
-    postcss-selector-parser "^6.0.15"
-
-postcss-minify-font-values@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-6.0.1.tgz#788eb930168be90225f3937f0b70aa19d8b532b2"
-  integrity sha512-tIwmF1zUPoN6xOtA/2FgVk1ZKrLcCvE0dpZLtzyyte0j9zUeB8RTbCqrHZGjJlxOvNWKMYtunLrrl7HPOiR46w==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-postcss-minify-gradients@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-6.0.1.tgz#4faf1880b483dc37016658aa186b42194ff9b5bc"
-  integrity sha512-M1RJWVjd6IOLPl1hYiOd5HQHgpp6cvJVLrieQYS9y07Yo8itAr6jaekzJphaJFR0tcg4kRewCk3kna9uHBxn/w==
-  dependencies:
-    colord "^2.9.1"
-    cssnano-utils "^4.0.1"
-    postcss-value-parser "^4.2.0"
-
-postcss-minify-params@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-6.0.2.tgz#bd64af642fa5610281b8a9461598bbb91f92ae05"
-  integrity sha512-zwQtbrPEBDj+ApELZ6QylLf2/c5zmASoOuA4DzolyVGdV38iR2I5QRMsZcHkcdkZzxpN8RS4cN7LPskOkTwTZw==
-  dependencies:
-    browserslist "^4.22.2"
-    cssnano-utils "^4.0.1"
-    postcss-value-parser "^4.2.0"
-
-postcss-minify-selectors@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-6.0.2.tgz#62065b38d3453ddc6627ba50e4f4a2154b031aa0"
-  integrity sha512-0b+m+w7OAvZejPQdN2GjsXLv5o0jqYHX3aoV0e7RBKPCsB7TYG5KKWBFhGnB/iP3213Ts8c5H4wLPLMm7z28Sg==
-  dependencies:
-    postcss-selector-parser "^6.0.15"
-
-postcss-modules-extract-imports@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d"
-  integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==
-
-postcss-modules-local-by-default@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.4.tgz#7cbed92abd312b94aaea85b68226d3dec39a14e6"
-  integrity sha512-L4QzMnOdVwRm1Qb8m4x8jsZzKAaPAgrUF1r/hjDR2Xj7R+8Zsf97jAlSQzWtKx5YNiNGN8QxmPFIc/sh+RQl+Q==
-  dependencies:
-    icss-utils "^5.0.0"
-    postcss-selector-parser "^6.0.2"
-    postcss-value-parser "^4.1.0"
-
-postcss-modules-scope@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.1.1.tgz#32cfab55e84887c079a19bbb215e721d683ef134"
-  integrity sha512-uZgqzdTleelWjzJY+Fhti6F3C9iF1JR/dODLs/JDefozYcKTBCdD8BIl6nNPbTbcLnGrk56hzwZC2DaGNvYjzA==
-  dependencies:
-    postcss-selector-parser "^6.0.4"
-
-postcss-modules-values@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c"
-  integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==
-  dependencies:
-    icss-utils "^5.0.0"
-
-postcss-nesting@^12.0.2:
-  version "12.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-12.0.2.tgz#cb92061347db3e7c38c174c97cb01feff2eef439"
-  integrity sha512-63PpJHSeNs93S3ZUIyi+7kKx4JqOIEJ6QYtG3x+0qA4J03+4n0iwsyA1GAHyWxsHYljQS4/4ZK1o2sMi70b5wQ==
-  dependencies:
-    "@csstools/selector-specificity" "^3.0.1"
-    postcss-selector-parser "^6.0.13"
-
-postcss-normalize-charset@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-6.0.1.tgz#5f70e1eb8bbdbcfcbed060ef70f179e8fef57d0c"
-  integrity sha512-aW5LbMNRZ+oDV57PF9K+WI1Z8MPnF+A8qbajg/T8PP126YrGX1f9IQx21GI2OlGz7XFJi/fNi0GTbY948XJtXg==
-
-postcss-normalize-display-values@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-6.0.1.tgz#ff9aa30bbf1283294bfd9cc8b6fb81ff060a7f2d"
-  integrity sha512-mc3vxp2bEuCb4LgCcmG1y6lKJu1Co8T+rKHrcbShJwUmKJiEl761qb/QQCfFwlrvSeET3jksolCR/RZuMURudw==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-postcss-normalize-positions@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-6.0.1.tgz#41ffdc72994f024c6cd6e91dbfb40ab9abe6fe90"
-  integrity sha512-HRsq8u/0unKNvm0cvwxcOUEcakFXqZ41fv3FOdPn916XFUrympjr+03oaLkuZENz3HE9RrQE9yU0Xv43ThWjQg==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-postcss-normalize-repeat-style@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-6.0.1.tgz#55dc54b6f80305b280a379899a6626e0a07b04a8"
-  integrity sha512-Gbb2nmCy6tTiA7Sh2MBs3fj9W8swonk6lw+dFFeQT68B0Pzwp1kvisJQkdV6rbbMSd9brMlS8I8ts52tAGWmGQ==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-postcss-normalize-string@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-6.0.1.tgz#7605e0fb4ec7bf2709709991d13a949e4419db1d"
-  integrity sha512-5Fhx/+xzALJD9EI26Aq23hXwmv97Zfy2VFrt5PLT8lAhnBIZvmaT5pQk+NuJ/GWj/QWaKSKbnoKDGLbV6qnhXg==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-postcss-normalize-timing-functions@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-6.0.1.tgz#ef937b7ca2fd62ed0b46645ea5728b842a3600db"
-  integrity sha512-4zcczzHqmCU7L5dqTB9rzeqPWRMc0K2HoR+Bfl+FSMbqGBUcP5LRfgcH4BdRtLuzVQK1/FHdFoGT3F7rkEnY+g==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-postcss-normalize-unicode@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-6.0.2.tgz#361026744ff11baebaec771b60c2a5f36f274fd0"
-  integrity sha512-Ff2VdAYCTGyMUwpevTZPZ4w0+mPjbZzLLyoLh/RMpqUqeQKZ+xMm31hkxBavDcGKcxm6ACzGk0nBfZ8LZkStKA==
-  dependencies:
-    browserslist "^4.22.2"
-    postcss-value-parser "^4.2.0"
-
-postcss-normalize-url@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-6.0.1.tgz#eae58cb4f5f9a4fa5bbbf6d4222dff534ad46186"
-  integrity sha512-jEXL15tXSvbjm0yzUV7FBiEXwhIa9H88JOXDGQzmcWoB4mSjZIsmtto066s2iW9FYuIrIF4k04HA2BKAOpbsaQ==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-postcss-normalize-whitespace@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-6.0.1.tgz#b5933750b938814c028d3d2b2e5c0199e0037b53"
-  integrity sha512-76i3NpWf6bB8UHlVuLRxG4zW2YykF9CTEcq/9LGAiz2qBuX5cBStadkk0jSkg9a9TCIXbMQz7yzrygKoCW9JuA==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-postcss-ordered-values@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-6.0.1.tgz#553e735d009065b362da93340e57f43d5f2d0fbc"
-  integrity sha512-XXbb1O/MW9HdEhnBxitZpPFbIvDgbo9NK4c/5bOfiKpnIGZDoL2xd7/e6jW5DYLsWxBbs+1nZEnVgnjnlFViaA==
-  dependencies:
-    cssnano-utils "^4.0.1"
-    postcss-value-parser "^4.2.0"
-
-postcss-reduce-initial@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-6.0.2.tgz#763d25902406c872264041df69f182eb15a5d9be"
-  integrity sha512-YGKalhNlCLcjcLvjU5nF8FyeCTkCO5UtvJEt0hrPZVCTtRLSOH4z00T1UntQPj4dUmIYZgMj8qK77JbSX95hSw==
-  dependencies:
-    browserslist "^4.22.2"
-    caniuse-api "^3.0.0"
-
-postcss-reduce-transforms@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-6.0.1.tgz#7bf59d7c6e7066e3b18ef17237d2344bd3da6d75"
-  integrity sha512-fUbV81OkUe75JM+VYO1gr/IoA2b/dRiH6HvMwhrIBSUrxq3jNZQZitSnugcTLDi1KkQh1eR/zi+iyxviUNBkcQ==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.13, postcss-selector-parser@^6.0.15:
-  version "6.0.15"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.15.tgz#11cc2b21eebc0b99ea374ffb9887174855a01535"
-  integrity sha512-rEYkQOMUCEMhsKbK66tbEU9QVIxbhN18YiniAwA7XQYTVBqrBy+P2p5JcdqsHgKM2zWylp8d7J6eszocfds5Sw==
-  dependencies:
-    cssesc "^3.0.0"
-    util-deprecate "^1.0.2"
-
-postcss-selector-parser@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c"
-  integrity sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==
-  dependencies:
-    cssesc "^3.0.0"
-    indexes-of "^1.0.1"
-    uniq "^1.0.1"
-
-postcss-selector-parser@^6.0.4:
-  version "6.0.11"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz#2e41dc39b7ad74046e1615185185cd0b17d0c8dc"
-  integrity sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==
-  dependencies:
-    cssesc "^3.0.0"
-    util-deprecate "^1.0.2"
-
-postcss-svgo@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-6.0.2.tgz#dbc9d03e7f346bc0d82443078602a951e0214836"
-  integrity sha512-IH5R9SjkTkh0kfFOQDImyy1+mTCb+E830+9SV1O+AaDcoHTvfsvt6WwJeo7KwcHbFnevZVCsXhDmjFiGVuwqFQ==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-    svgo "^3.2.0"
-
-postcss-unique-selectors@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-6.0.2.tgz#09a34a5a31a649d3e9bca5962af0616f39d071d2"
-  integrity sha512-8IZGQ94nechdG7Y9Sh9FlIY2b4uS8/k8kdKRX040XHsS3B6d1HrJAkXrBSsSu4SuARruSsUjW3nlSw8BHkaAYQ==
-  dependencies:
-    postcss-selector-parser "^6.0.15"
-
-postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
-  integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
-
-postcss@^7.0.16:
-  version "7.0.39"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.39.tgz#9624375d965630e2e1f2c02a935c82a59cb48309"
-  integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==
-  dependencies:
-    picocolors "^0.2.1"
-    source-map "^0.6.1"
-
-postcss@^8.4.33:
-  version "8.4.38"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e"
-  integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==
-  dependencies:
-    nanoid "^3.3.7"
-    picocolors "^1.0.0"
-    source-map-js "^1.2.0"
-
-prebuild-install@7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.1.tgz#de97d5b34a70a0c81334fd24641f2a1702352e45"
-  integrity sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==
-  dependencies:
-    detect-libc "^2.0.0"
-    expand-template "^2.0.3"
-    github-from-package "0.0.0"
-    minimist "^1.2.3"
-    mkdirp-classic "^0.5.3"
-    napi-build-utils "^1.0.1"
-    node-abi "^3.3.0"
-    pump "^3.0.0"
-    rc "^1.2.7"
-    simple-get "^4.0.0"
-    tar-fs "^2.0.0"
-    tunnel-agent "^0.6.0"
-
-prelude-ls@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
-  integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
-
-prelude-ls@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
-  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
-
-pretty-hrtime@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
-  integrity sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=
-
-process-nextick-args@^2.0.0, process-nextick-args@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
-  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
-
-process@^0.11.10:
-  version "0.11.10"
-  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
-  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
-
-progress@^1.1.8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
-  integrity sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=
-
-progress@^2.0.0, progress@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
-  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
-
-proto-list@~1.2.1:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
-  integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=
-
-proxy-from-env@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
-  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
-
-prr@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
-  integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
-
-pseudo-localization@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/pseudo-localization/-/pseudo-localization-2.4.0.tgz#5c19da35bc182ad7fc00d82d33dd42e88005e241"
-  integrity sha512-ISYMOKY8+f+PmiXMFw2y6KLY74LBrv/8ml/VjjoVEV2k+MS+OJZz7ydciK5ntJwxPrKQPTU1+oXq9Mx2b0zEzg==
-  dependencies:
-    flat "^5.0.2"
-    get-stdin "^7.0.0"
-    typescript "^4.7.4"
-    yargs "^17.2.1"
-
-pseudomap@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
-  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
-
-psl@^1.1.33:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
-  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
-
-pump@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.2.tgz#3b3ee6512f94f0e575538c17995f9f16990a5d51"
-  integrity sha1-Oz7mUS+U8OV1U4wXmV+fFpkKXVE=
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
-pump@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
-  integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
-pump@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
-  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
-pumpify@^1.3.3, pumpify@^1.3.5:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
-  integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
-  dependencies:
-    duplexify "^3.6.0"
-    inherits "^2.0.3"
-    pump "^2.0.0"
-
-punycode.js@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/punycode.js/-/punycode.js-2.3.1.tgz#6b53e56ad75588234e79f4affa90972c7dd8cdb7"
-  integrity sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==
-
-punycode@^2.1.0, punycode@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
-
-querystringify@^2.1.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
-  integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
-
-queue-tick@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/queue-tick/-/queue-tick-1.0.1.tgz#f6f07ac82c1fd60f82e098b417a80e52f1f4c142"
-  integrity sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==
-
-queue@^3.0.10, queue@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/queue/-/queue-3.1.0.tgz#6c49d01f009e2256788789f2bffac6b8b9990585"
-  integrity sha1-bEnQHwCeIlZ4h4nyv/rGuLmZBYU=
-  dependencies:
-    inherits "~2.0.0"
-
-queue@^4.2.1:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/queue/-/queue-4.5.0.tgz#0f125191a983e3c38fcc0c0c75087d358d0857f4"
-  integrity sha512-DwxpAnqJuoQa+wyDgQuwkSshkhlqIlWEvwvdAY27fDPunZ2cVJzXU4JyjY+5l7zs7oGLaYAQm4MbLOVFAHFBzA==
-  dependencies:
-    inherits "~2.0.0"
-
-quick-lru@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
-  integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==
-
-randombytes@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
-  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
-  dependencies:
-    safe-buffer "^5.1.0"
-
-rc@^1.2.7:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
-  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
-  dependencies:
-    deep-extend "^0.6.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
-
-rcedit@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/rcedit/-/rcedit-0.3.0.tgz#cb5eee185e546f9eda597c248c9906186fa96bce"
-  integrity sha1-y17uGF5Ub57aWXwkjJkGGG+pa84=
-
-rcedit@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/rcedit/-/rcedit-1.1.0.tgz#ae21c28d4efdd78e95fcab7309a5dd084920b16a"
-  integrity sha512-JkXJ0IrUcdupLoIx6gE4YcFaMVSGtu7kQf4NJoDJUnfBZGuATmJ2Yal2v55KTltp+WV8dGr7A0RtOzx6jmtM6Q==
-
-read-pkg-up@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
-  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
-  dependencies:
-    find-up "^1.0.0"
-    read-pkg "^1.0.0"
-
-read-pkg@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
-  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
-  dependencies:
-    load-json-file "^1.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^1.0.0"
-
-read-pkg@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
-  integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=
-  dependencies:
-    load-json-file "^4.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^3.0.0"
-
-"readable-stream@2 || 3":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.1.1.tgz#ed6bbc6c5ba58b090039ff18ce670515795aeb06"
-  integrity sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
-readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6:
-  version "2.3.7"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
-  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
-readable-stream@^3.1.1, readable-stream@^3.4.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
-  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
-readable-stream@~1.0.17:
-  version "1.0.34"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
-  integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
-readdirp@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
-  integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
-  dependencies:
-    graceful-fs "^4.1.11"
-    micromatch "^3.1.10"
-    readable-stream "^2.0.2"
-
-readdirp@~3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
-  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
-  dependencies:
-    picomatch "^2.2.1"
-
-rechoir@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
-  integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=
-  dependencies:
-    resolve "^1.1.6"
-
-rechoir@^0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.8.0.tgz#49f866e0d32146142da3ad8f0eff352b3215ff22"
-  integrity sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==
-  dependencies:
-    resolve "^1.20.0"
-
-regex-not@^1.0.0, regex-not@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
-  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
-  dependencies:
-    extend-shallow "^3.0.2"
-    safe-regex "^1.1.0"
-
-regexpp@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
-  integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
-
-remove-bom-buffer@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz#c2bf1e377520d324f623892e33c10cac2c252b53"
-  integrity sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==
-  dependencies:
-    is-buffer "^1.1.5"
-    is-utf8 "^0.2.1"
-
-remove-bom-stream@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz#05f1a593f16e42e1fb90ebf59de8e569525f9523"
-  integrity sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=
-  dependencies:
-    remove-bom-buffer "^3.0.0"
-    safe-buffer "^5.1.0"
-    through2 "^2.0.3"
-
-remove-trailing-separator@^1.0.1, remove-trailing-separator@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
-  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
-
-repeat-element@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
-  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
-
-repeat-string@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
-
-replace-ext@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924"
-  integrity sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=
-
-replace-ext@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a"
-  integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==
-
-replace-ext@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-2.0.0.tgz#9471c213d22e1bcc26717cd6e50881d88f812b06"
-  integrity sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==
-
-replace-homedir@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/replace-homedir/-/replace-homedir-1.0.0.tgz#e87f6d513b928dde808260c12be7fec6ff6e798c"
-  integrity sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=
-  dependencies:
-    homedir-polyfill "^1.0.1"
-    is-absolute "^1.0.0"
-    remove-trailing-separator "^1.1.0"
-
-replacestream@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/replacestream/-/replacestream-4.0.3.tgz#3ee5798092be364b1cdb1484308492cb3dff2f36"
-  integrity sha512-AC0FiLS352pBBiZhd4VXB1Ab/lh0lEgpP+GGvZqbQh8a5cmXVoTe5EX/YeTFArnp4SRGTHh1qCHu9lGs1qG8sA==
-  dependencies:
-    escape-string-regexp "^1.0.3"
-    object-assign "^4.0.1"
-    readable-stream "^2.0.2"
-
-require-directory@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
-
-require-from-string@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
-  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
-
-require-main-filename@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
-  integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
-
-require-main-filename@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
-  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
-
-requires-port@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-  integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
-
-resolve-alpn@^1.0.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9"
-  integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==
-
-resolve-cwd@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
-  integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==
-  dependencies:
-    resolve-from "^5.0.0"
-
-resolve-dir@^1.0.0, resolve-dir@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
-  integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=
-  dependencies:
-    expand-tilde "^2.0.0"
-    global-modules "^1.0.0"
-
-resolve-from@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
-  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
-
-resolve-from@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
-  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
-
-resolve-options@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/resolve-options/-/resolve-options-1.1.0.tgz#32bb9e39c06d67338dc9378c0d6d6074566ad131"
-  integrity sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=
-  dependencies:
-    value-or-function "^3.0.0"
-
-resolve-path@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/resolve-path/-/resolve-path-1.4.0.tgz#c4bda9f5efb2fce65247873ab36bb4d834fe16f7"
-  integrity sha1-xL2p9e+y/OZSR4c6s2u02DT+Fvc=
-  dependencies:
-    http-errors "~1.6.2"
-    path-is-absolute "1.0.1"
-
-resolve-url@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
-  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
-
-resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.4.0:
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
-  integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
-  dependencies:
-    is-core-module "^2.1.0"
-    path-parse "^1.0.6"
-
-resolve@^1.20.0:
-  version "1.22.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
-  integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
-  dependencies:
-    is-core-module "^2.9.0"
-    path-parse "^1.0.7"
-    supports-preserve-symlinks-flag "^1.0.0"
-
-responselike@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc"
-  integrity sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==
-  dependencies:
-    lowercase-keys "^2.0.0"
-
-restore-cursor@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
-  integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
-  dependencies:
-    onetime "^2.0.0"
-    signal-exit "^3.0.2"
-
-ret@~0.1.10:
-  version "0.1.15"
-  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
-  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
-
-reusify@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
-  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
-
-rimraf@2, rimraf@^2.2.8, rimraf@^2.4.2:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
-  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
-  dependencies:
-    glob "^7.1.3"
-
-rimraf@2.6.3, rimraf@~2.6.2:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
-  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
-  dependencies:
-    glob "^7.1.3"
-
-rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
-roarr@^2.15.3:
-  version "2.15.4"
-  resolved "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz#f5fe795b7b838ccfe35dc608e0282b9eba2e7afd"
-  integrity sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==
-  dependencies:
-    boolean "^3.0.1"
-    detect-node "^2.0.4"
-    globalthis "^1.0.1"
-    json-stringify-safe "^5.0.1"
-    semver-compare "^1.0.0"
-    sprintf-js "^1.1.2"
-
-run-async@^2.2.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
-  integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
-
-run-parallel@^1.1.9:
-  version "1.1.10"
-  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.10.tgz#60a51b2ae836636c81377df16cb107351bcd13ef"
-  integrity sha512-zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw==
-
-rxjs@^6.4.0:
-  version "6.6.3"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552"
-  integrity sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==
-  dependencies:
-    tslib "^1.9.0"
-
-safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-
-safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
-safe-regex@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
-  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
-  dependencies:
-    ret "~0.1.10"
-
-"safer-buffer@>= 2.1.2 < 3":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-
-sax@>=0.6.0:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
-  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
-
-schema-utils@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz#67502f6aa2b66a2d4032b4279a2944978a0913ef"
-  integrity sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==
-  dependencies:
-    "@types/json-schema" "^7.0.6"
-    ajv "^6.12.5"
-    ajv-keywords "^3.5.2"
-
-schema-utils@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
-  integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
-  dependencies:
-    "@types/json-schema" "^7.0.8"
-    ajv "^6.12.5"
-    ajv-keywords "^3.5.2"
-
-schema-utils@^3.1.1, schema-utils@^3.2.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe"
-  integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==
-  dependencies:
-    "@types/json-schema" "^7.0.8"
-    ajv "^6.12.5"
-    ajv-keywords "^3.5.2"
-
-schema-utils@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7"
-  integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==
-  dependencies:
-    "@types/json-schema" "^7.0.9"
-    ajv "^8.8.0"
-    ajv-formats "^2.1.1"
-    ajv-keywords "^5.0.0"
-
-semver-compare@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
-  integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
-
-semver-greatest-satisfied-range@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz#13e8c2658ab9691cb0cd71093240280d36f77a5b"
-  integrity sha1-E+jCZYq5aRywzXEJMkAoDTb3els=
-  dependencies:
-    sver-compat "^1.5.0"
-
-"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
-  version "5.7.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
-  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
-
-semver@^4.3.4:
-  version "4.3.6"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
-  integrity sha512-IrpJ+yoG4EOH8DFWuVg+8H1kW1Oaof0Wxe7cPcXW3x9BjkN/eVo54F15LyqemnDIUYskQWr9qvl/RihmSy6+xQ==
-
-semver@^6.0.0, semver@^6.2.0, semver@^6.3.0:
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
-  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
-
-semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.5.2, semver@^7.5.4:
-  version "7.5.4"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
-  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
-  dependencies:
-    lru-cache "^6.0.0"
-
-semver@^7.5.3:
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
-  integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
-  dependencies:
-    lru-cache "^6.0.0"
-
-serialize-error@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18"
-  integrity sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==
-  dependencies:
-    type-fest "^0.13.1"
-
-serialize-javascript@6.0.0, serialize-javascript@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8"
-  integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==
-  dependencies:
-    randombytes "^2.1.0"
-
-serialize-javascript@^6.0.1:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2"
-  integrity sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==
-  dependencies:
-    randombytes "^2.1.0"
-
-set-blocking@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
-
-set-value@^2.0.0, set-value@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
-  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-extendable "^0.1.1"
-    is-plain-object "^2.0.3"
-    split-string "^3.0.1"
-
-setimmediate@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-  integrity sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==
-
-setprototypeof@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
-  integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
-
-setprototypeof@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
-  integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
-
-shallow-clone@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
-  integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==
-  dependencies:
-    kind-of "^6.0.2"
-
-shebang-command@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
-  dependencies:
-    shebang-regex "^1.0.0"
-
-shebang-command@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
-  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
-  dependencies:
-    shebang-regex "^3.0.0"
-
-shebang-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
-
-shebang-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
-  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
-
-shell-quote@^1.6.1:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123"
-  integrity sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==
-
-sigmund@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
-  integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=
-
-signal-exit@^3.0.0, signal-exit@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
-  integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
-
-signal-exit@^4.0.1:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
-  integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
-
-simple-concat@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f"
-  integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==
-
-simple-get@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.1.tgz#4a39db549287c979d352112fa03fd99fd6bc3543"
-  integrity sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==
-  dependencies:
-    decompress-response "^6.0.0"
-    once "^1.3.1"
-    simple-concat "^1.0.0"
-
-sinon-test@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/sinon-test/-/sinon-test-3.1.3.tgz#b261e0efd0b479891a243201387f957d7ca61daa"
-  integrity sha512-jBDvPVW2z8uAoiud3Nqc6+e8+WX6UTB1gPQuYXK00mSnp9m/JYyeLdBjLlqbnk1DVmsgRCAHSoXYPNLHp0t56Q==
-
-sinon@^12.0.1:
-  version "12.0.1"
-  resolved "https://registry.yarnpkg.com/sinon/-/sinon-12.0.1.tgz#331eef87298752e1b88a662b699f98e403c859e9"
-  integrity sha512-iGu29Xhym33ydkAT+aNQFBINakjq69kKO6ByPvTsm3yyIACfyQttRTP03aBP/I8GfhFmLzrnKwNNkr0ORb1udg==
-  dependencies:
-    "@sinonjs/commons" "^1.8.3"
-    "@sinonjs/fake-timers" "^8.1.0"
-    "@sinonjs/samsam" "^6.0.2"
-    diff "^5.0.0"
-    nise "^5.1.0"
-    supports-color "^7.2.0"
-
-slash@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
-  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
-
-slash@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7"
-  integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==
-
-slice-ansi@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
-  integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==
-  dependencies:
-    ansi-styles "^3.2.0"
-    astral-regex "^1.0.0"
-    is-fullwidth-code-point "^2.0.0"
-
-smart-buffer@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
-  integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
-
-snapdragon-node@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
-  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
-  dependencies:
-    define-property "^1.0.0"
-    isobject "^3.0.0"
-    snapdragon-util "^3.0.1"
-
-snapdragon-util@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
-  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
-  dependencies:
-    kind-of "^3.2.0"
-
-snapdragon@^0.8.1:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
-  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
-  dependencies:
-    base "^0.11.1"
-    debug "^2.2.0"
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    map-cache "^0.2.2"
-    source-map "^0.5.6"
-    source-map-resolve "^0.5.0"
-    use "^3.1.0"
-
-socks-proxy-agent@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-8.0.1.tgz#ffc5859a66dac89b0c4dab90253b96705f3e7120"
-  integrity sha512-59EjPbbgg8U3x62hhKOFVAmySQUcfRQ4C7Q/D5sEHnZTQRrQlNKINks44DMR1gwXp0p4LaVIeccX2KHTTcHVqQ==
-  dependencies:
-    agent-base "^7.0.1"
-    debug "^4.3.4"
-    socks "^2.7.1"
-
-socks@^2.7.1:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55"
-  integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==
-  dependencies:
-    ip "^2.0.0"
-    smart-buffer "^4.2.0"
-
-source-map-js@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
-  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
-
-source-map-js@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af"
-  integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==
-
-source-map-resolve@^0.5.0:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
-  integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
-  dependencies:
-    atob "^2.1.2"
-    decode-uri-component "^0.2.0"
-    resolve-url "^0.2.1"
-    source-map-url "^0.4.0"
-    urix "^0.1.0"
-
-source-map-resolve@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz#3d9df87e236b53f16d01e58150fc7711138e5ed2"
-  integrity sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==
-  dependencies:
-    atob "^2.1.2"
-    decode-uri-component "^0.2.0"
-
-source-map-support@^0.3.2:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.3.3.tgz#34900977d5ba3f07c7757ee72e73bb1a9b53754f"
-  integrity sha1-NJAJd9W6PwfHdX7nLnO7GptTdU8=
-  dependencies:
-    source-map "0.1.32"
-
-source-map-support@~0.5.19, source-map-support@~0.5.20:
-  version "0.5.21"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
-  integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map-url@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
-  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
-
-source-map@0.1.32:
-  version "0.1.32"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.32.tgz#c8b6c167797ba4740a8ea33252162ff08591b266"
-  integrity sha1-yLbBZ3l7pHQKjqMyUhYv8IWRsmY=
-  dependencies:
-    amdefine ">=0.0.4"
-
-source-map@0.6.1, source-map@^0.6.0, source-map@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-
-source-map@^0.5.6:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
-
-source-map@~0.7.2:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
-  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
-
-sparkles@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz#008db65edce6c50eec0c5e228e1945061dd0437c"
-  integrity sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==
-
-spdx-correct@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
-  integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
-  dependencies:
-    spdx-expression-parse "^3.0.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-exceptions@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977"
-  integrity sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==
-
-spdx-expression-parse@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
-  integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==
-  dependencies:
-    spdx-exceptions "^2.1.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-expression-parse@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
-  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
-  dependencies:
-    spdx-exceptions "^2.1.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-license-ids@^3.0.0:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654"
-  integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==
-
-split-string@^3.0.1, split-string@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
-  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
-  dependencies:
-    extend-shallow "^3.0.0"
-
-split@0.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"
-  integrity sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=
-  dependencies:
-    through "2"
-
-split@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9"
-  integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==
-  dependencies:
-    through "2"
-
-sprintf-js@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
-  integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
-
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
-
-stable@^0.1.8:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
-  integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
-
-stack-trace@0.0.10:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
-  integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=
-
-static-extend@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
-  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
-  dependencies:
-    define-property "^0.2.5"
-    object-copy "^0.1.0"
-
-statuses@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
-  integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
-
-"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
-  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
-
-stream-combiner@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.2.2.tgz#aec8cbac177b56b6f4fa479ced8c1912cee52858"
-  integrity sha1-rsjLrBd7Vrb0+kec7YwZEs7lKFg=
-  dependencies:
-    duplexer "~0.1.1"
-    through "~2.3.4"
-
-stream-combiner@~0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14"
-  integrity sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=
-  dependencies:
-    duplexer "~0.1.1"
-
-stream-exhaust@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/stream-exhaust/-/stream-exhaust-1.0.2.tgz#acdac8da59ef2bc1e17a2c0ccf6c320d120e555d"
-  integrity sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==
-
-stream-shift@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
-  integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
-
-stream-to-array@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/stream-to-array/-/stream-to-array-2.3.0.tgz#bbf6b39f5f43ec30bc71babcb37557acecf34353"
-  integrity sha1-u/azn19D7DC8cbq8s3VXrOzzQ1M=
-  dependencies:
-    any-promise "^1.1.0"
-
-streamfilter@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/streamfilter/-/streamfilter-1.0.5.tgz#87507111beb8e298451717b511cfed8f002abf53"
-  integrity sha1-h1BxEb644phFFxe1Ec/tjwAqv1M=
-  dependencies:
-    readable-stream "^2.0.2"
-
-streamifier@^0.1.1, streamifier@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/streamifier/-/streamifier-0.1.1.tgz#97e98d8fa4d105d62a2691d1dc07e820db8dfc4f"
-  integrity sha1-l+mNj6TRBdYqJpHR3AfoINuN/E8=
-
-streamx@^2.12.5:
-  version "2.13.2"
-  resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.13.2.tgz#9de43569a1cd54980d128673b3c1429b79afff1c"
-  integrity sha512-+TWqixPhGDXEG9L/XczSbhfkmwAtGs3BJX5QNU6cvno+pOLKeszByWcnaTu6dg8efsTYqR8ZZuXWHhZfgrxMvA==
-  dependencies:
-    fast-fifo "^1.1.0"
-    queue-tick "^1.0.1"
-
-streamx@^2.15.0:
-  version "2.15.6"
-  resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.15.6.tgz#28bf36997ebc7bf6c08f9eba958735231b833887"
-  integrity sha512-q+vQL4AAz+FdfT137VF69Cc/APqUbxy+MDOImRrMvchJpigHj9GksgDU2LYbO9rx7RX6osWgxJB2WxhYv4SZAw==
-  dependencies:
-    fast-fifo "^1.1.0"
-    queue-tick "^1.0.1"
-
-"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-string-width@^1.0.1, string-width@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
-
-string-width@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^4.0.0"
-
-string-width@^3.0.0, string-width@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
-  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
-  dependencies:
-    emoji-regex "^7.0.1"
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^5.1.0"
-
-string-width@^4.1.0, string-width@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
-  integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.0"
-
-string-width@^5.0.1, string-width@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
-  integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
-  dependencies:
-    eastasianwidth "^0.2.0"
-    emoji-regex "^9.2.2"
-    strip-ansi "^7.0.1"
-
-string.prototype.padend@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.1.1.tgz#824c84265dbac46cade2b957b38b6a5d8d1683c5"
-  integrity sha512-eCzTASPnoCr5Ht+Vn1YXgm8SB015hHKgEIMu9Nr9bQmLhRBxKRfmzSj/IQsxDFc8JInJDDFA0qXwK+xxI7wDkg==
-  dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.1"
-
-string.prototype.trimend@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz#a22bd53cca5c7cf44d7c9d5c732118873d6cd18b"
-  integrity sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==
-  dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-
-string.prototype.trimstart@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz#9b4cb590e123bb36564401d59824298de50fd5aa"
-  integrity sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==
-  dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-
-string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
-  dependencies:
-    safe-buffer "~5.2.0"
-
-string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
-
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
-  dependencies:
-    safe-buffer "~5.1.0"
-
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-ansi@^3.0.0, strip-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
-  dependencies:
-    ansi-regex "^2.0.0"
-
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
-  dependencies:
-    ansi-regex "^3.0.0"
-
-strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
-  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
-  dependencies:
-    ansi-regex "^4.1.0"
-
-strip-ansi@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
-  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
-  dependencies:
-    ansi-regex "^5.0.0"
-
-strip-ansi@^7.0.1:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
-  integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==
-  dependencies:
-    ansi-regex "^6.0.1"
-
-strip-bom-string@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom-string/-/strip-bom-string-1.0.0.tgz#e5211e9224369fbb81d633a2f00044dc8cedad92"
-  integrity sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI=
-
-strip-bom@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
-  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
-  dependencies:
-    is-utf8 "^0.2.0"
-
-strip-bom@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
-
-strip-eof@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
-
-strip-json-comments@3.1.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
-  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
-
-strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
-
-style-loader@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.2.tgz#eaebca714d9e462c19aa1e3599057bc363924899"
-  integrity sha512-RHs/vcrKdQK8wZliteNK4NKzxvLBzpuHMqYmUVWeKa6MkaIQ97ZTOS0b+zapZhy6GcrgWnvWYCMHRirC3FsUmw==
-
-stylehacks@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-6.0.2.tgz#5bf2654561752547d4548765f35c9a49659b3742"
-  integrity sha512-00zvJGnCu64EpMjX8b5iCZ3us2Ptyw8+toEkb92VdmkEaRaSGBNKAoK6aWZckhXxmQP8zWiTaFaiMGIU8Ve8sg==
-  dependencies:
-    browserslist "^4.22.2"
-    postcss-selector-parser "^6.0.15"
-
-sumchecker@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz#6377e996795abb0b6d348e9b3e1dfb24345a8e42"
-  integrity sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==
-  dependencies:
-    debug "^4.1.0"
-
-supports-color@8.1.1, supports-color@^8.0.0, supports-color@^8.1.1:
-  version "8.1.1"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
-  integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
-  dependencies:
-    has-flag "^4.0.0"
-
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
-
-supports-color@^5.3.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
-  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
-  dependencies:
-    has-flag "^3.0.0"
-
-supports-color@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
-  integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
-  dependencies:
-    has-flag "^4.0.0"
-
-supports-color@^7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
-  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
-  dependencies:
-    has-flag "^4.0.0"
-
-supports-color@^9.4.0:
-  version "9.4.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-9.4.0.tgz#17bfcf686288f531db3dea3215510621ccb55954"
-  integrity sha512-VL+lNrEoIXww1coLPOmiEmK/0sGigko5COxI09KzHc2VJXJsQ37UaQ+8quuxjDeA7+KnLGTWRyOXSLLR2Wb4jw==
-
-supports-preserve-symlinks-flag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
-  integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
-
-sver-compat@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/sver-compat/-/sver-compat-1.5.0.tgz#3cf87dfeb4d07b4a3f14827bc186b3fd0c645cd8"
-  integrity sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=
-  dependencies:
-    es6-iterator "^2.0.1"
-    es6-symbol "^3.1.1"
-
-svgo@^2.7.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24"
-  integrity sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==
-  dependencies:
-    "@trysound/sax" "0.2.0"
-    commander "^7.2.0"
-    css-select "^4.1.3"
-    css-tree "^1.1.3"
-    csso "^4.2.0"
-    picocolors "^1.0.0"
-    stable "^0.1.8"
-
-svgo@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/svgo/-/svgo-3.2.0.tgz#7a5dff2938d8c6096e00295c2390e8e652fa805d"
-  integrity sha512-4PP6CMW/V7l/GmKRKzsLR8xxjdHTV4IMvhTnpuHwwBazSIlw5W/5SmPjN8Dwyt7lKbSJrRDgp4t9ph0HgChFBQ==
-  dependencies:
-    "@trysound/sax" "0.2.0"
-    commander "^7.2.0"
-    css-select "^5.1.0"
-    css-tree "^2.3.1"
-    css-what "^6.1.0"
-    csso "^5.0.5"
-    picocolors "^1.0.0"
-
-table@^5.2.3:
-  version "5.4.6"
-  resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
-  integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==
-  dependencies:
-    ajv "^6.10.2"
-    lodash "^4.17.14"
-    slice-ansi "^2.1.0"
-    string-width "^3.0.0"
-
-tapable@^2.1.1, tapable@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.0.tgz#5c373d281d9c672848213d0e037d1c4165ab426b"
-  integrity sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw==
-
-tar-fs@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"
-  integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==
-  dependencies:
-    chownr "^1.1.1"
-    mkdirp-classic "^0.5.2"
-    pump "^3.0.0"
-    tar-stream "^2.1.4"
-
-tar-fs@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-3.0.4.tgz#a21dc60a2d5d9f55e0089ccd78124f1d3771dbbf"
-  integrity sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==
-  dependencies:
-    mkdirp-classic "^0.5.2"
-    pump "^3.0.0"
-    tar-stream "^3.1.5"
-
-tar-stream@^2.1.4:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
-  integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
-  dependencies:
-    bl "^4.0.3"
-    end-of-stream "^1.4.1"
-    fs-constants "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^3.1.1"
-
-tar-stream@^3.1.5:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-3.1.6.tgz#6520607b55a06f4a2e2e04db360ba7d338cc5bab"
-  integrity sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg==
-  dependencies:
-    b4a "^1.6.4"
-    fast-fifo "^1.2.0"
-    streamx "^2.15.0"
-
-tar@^2.2.1:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40"
-  integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==
-  dependencies:
-    block-stream "*"
-    fstream "^1.0.12"
-    inherits "2"
-
-tar@^6.1.11:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a"
-  integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==
-  dependencies:
-    chownr "^2.0.0"
-    fs-minipass "^2.0.0"
-    minipass "^5.0.0"
-    minizlib "^2.1.1"
-    mkdirp "^1.0.3"
-    yallist "^4.0.0"
-
-tas-client-umd@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/tas-client-umd/-/tas-client-umd-0.2.0.tgz#b71cc28f4c9b14f7b62f1ca4669886aa197e390c"
-  integrity sha512-oezN7mJVm5qZDVEby7OzxCLKUpUN5of0rY4dvOWaDF2JZBlGpd3BXceFN8B53qlTaIkVSzP65aAMT0Vc+/N25Q==
-
-teex@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/teex/-/teex-1.0.1.tgz#b8fa7245ef8e8effa8078281946c85ab780a0b12"
-  integrity sha512-eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg==
-  dependencies:
-    streamx "^2.12.5"
-
-temp@^0.8.3:
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.4.tgz#8c97a33a4770072e0a05f919396c7665a7dd59f2"
-  integrity sha512-s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg==
-  dependencies:
-    rimraf "~2.6.2"
-
-terser-webpack-plugin@^5.1.3:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.1.4.tgz#c369cf8a47aa9922bd0d8a94fe3d3da11a7678a1"
-  integrity sha512-C2WkFwstHDhVEmsmlCxrXUtVklS+Ir1A7twrYzrDrQQOIMOaVAYykaoo/Aq1K0QRkMoY2hhvDQY1cm4jnIMFwA==
-  dependencies:
-    jest-worker "^27.0.2"
-    p-limit "^3.1.0"
-    schema-utils "^3.0.0"
-    serialize-javascript "^6.0.0"
-    source-map "^0.6.1"
-    terser "^5.7.0"
-
-terser-webpack-plugin@^5.3.10:
-  version "5.3.10"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz#904f4c9193c6fd2a03f693a2150c62a92f40d199"
-  integrity sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==
-  dependencies:
-    "@jridgewell/trace-mapping" "^0.3.20"
-    jest-worker "^27.4.5"
-    schema-utils "^3.1.1"
-    serialize-javascript "^6.0.1"
-    terser "^5.26.0"
-
-terser@^5.26.0:
-  version "5.30.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.30.0.tgz#64cb2af71e16ea3d32153f84d990f9be0cdc22bf"
-  integrity sha512-Y/SblUl5kEyEFzhMAQdsxVHh+utAxd4IuRNJzKywY/4uzSogh3G219jqbDDxYu4MXO9CzY3tSEqmZvW6AoEDJw==
-  dependencies:
-    "@jridgewell/source-map" "^0.3.3"
-    acorn "^8.8.2"
-    commander "^2.20.0"
-    source-map-support "~0.5.20"
-
-terser@^5.7.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.7.1.tgz#2dc7a61009b66bb638305cb2a824763b116bf784"
-  integrity sha512-b3e+d5JbHAe/JSjwsC3Zn55wsBIM7AsHLjKxT31kGCldgbpFePaFo+PiddtO6uwRZWRw7sPXmAN8dTW61xmnSg==
-  dependencies:
-    commander "^2.20.0"
-    source-map "~0.7.2"
-    source-map-support "~0.5.19"
-
-test-exclude@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
-  integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==
-  dependencies:
-    "@istanbuljs/schema" "^0.1.2"
-    glob "^7.1.4"
-    minimatch "^3.0.4"
-
-text-table@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
-
-textextensions@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-1.0.2.tgz#65486393ee1f2bb039a60cbba05b0b68bd9501d2"
-  integrity sha1-ZUhjk+4fK7A5pgy7oFsLaL2VAdI=
-
-through2-filter@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz#700e786df2367c2c88cd8aa5be4cf9c1e7831254"
-  integrity sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==
-  dependencies:
-    through2 "~2.0.0"
-    xtend "~4.0.0"
-
-through2@2.0.3, through2@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
-  integrity sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=
-  dependencies:
-    readable-stream "^2.1.5"
-    xtend "~4.0.1"
-
-through2@^2.0.0, through2@^2.0.3, through2@~2.0.0:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
-  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
-  dependencies:
-    readable-stream "~2.3.6"
-    xtend "~4.0.1"
-
-through2@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.0.tgz#468b461df9cd9fcc170f22ebf6852e467e578ff2"
-  integrity sha512-8B+sevlqP4OiCjonI1Zw03Sf8PuV1eRsYQgLad5eonILOdyeRsY27A/2Ze8IlvlMvq31OH+3fz/styI7Ya62yQ==
-  dependencies:
-    readable-stream "2 || 3"
-    xtend "~4.0.1"
-
-through2@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.2.tgz#99f88931cfc761ec7678b41d5d7336b5b6a07bf4"
-  integrity sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==
-  dependencies:
-    inherits "^2.0.4"
-    readable-stream "2 || 3"
-
-through2@~0.4.0:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-0.4.2.tgz#dbf5866031151ec8352bb6c4db64a2292a840b9b"
-  integrity sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=
-  dependencies:
-    readable-stream "~1.0.17"
-    xtend "~2.1.1"
-
-through@2, through@^2.3.6, through@^2.3.8, through@~2.3, through@~2.3.1, through@~2.3.4:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
-
-time-stamp@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
-  integrity sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=
-
-timers-ext@^0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/timers-ext/-/timers-ext-0.1.7.tgz#6f57ad8578e07a3fb9f91d9387d65647555e25c6"
-  integrity sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==
-  dependencies:
-    es5-ext "~0.10.46"
-    next-tick "1"
-
-tmp@^0.0.33:
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
-  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
-  dependencies:
-    os-tmpdir "~1.0.2"
-
-to-absolute-glob@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz#1865f43d9e74b0822db9f145b78cff7d0f7c849b"
-  integrity sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=
-  dependencies:
-    is-absolute "^1.0.0"
-    is-negated-glob "^1.0.0"
-
-to-fast-properties@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
-  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
-
-to-object-path@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
-  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
-  dependencies:
-    kind-of "^3.0.2"
-
-to-regex-range@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
-  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
-  dependencies:
-    is-number "^3.0.0"
-    repeat-string "^1.6.1"
-
-to-regex-range@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-  dependencies:
-    is-number "^7.0.0"
-
-to-regex@^3.0.1, to-regex@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
-  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
-  dependencies:
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    regex-not "^1.0.2"
-    safe-regex "^1.1.0"
-
-to-through@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/to-through/-/to-through-2.0.0.tgz#fc92adaba072647bc0b67d6b03664aa195093af6"
-  integrity sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=
-  dependencies:
-    through2 "^2.0.3"
-
-toidentifier@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
-  integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
-
-tough-cookie@^4.0.0:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf"
-  integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==
-  dependencies:
-    psl "^1.1.33"
-    punycode "^2.1.1"
-    universalify "^0.2.0"
-    url-parse "^1.5.3"
-
-tr46@~0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-  integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
-
-tree-kill@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
-  integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
-
-ts-api-utils@^1.0.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1"
-  integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==
-
-ts-loader@^9.4.2:
-  version "9.4.2"
-  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.4.2.tgz#80a45eee92dd5170b900b3d00abcfa14949aeb78"
-  integrity sha512-OmlC4WVmFv5I0PpaxYb+qGeGOdm5giHU7HwDDUjw59emP2UYMHy9fFSDcYgSNoH8sXcj4hGCSEhlDZ9ULeDraA==
-  dependencies:
-    chalk "^4.1.0"
-    enhanced-resolve "^5.0.0"
-    micromatch "^4.0.0"
-    semver "^7.3.4"
-
-ts-morph@^19.0.0:
-  version "19.0.0"
-  resolved "https://registry.yarnpkg.com/ts-morph/-/ts-morph-19.0.0.tgz#43e95fb0156c3fe3c77c814ac26b7d0be2f93169"
-  integrity sha512-D6qcpiJdn46tUqV45vr5UGM2dnIEuTGNxVhg0sk5NX11orcouwj6i1bMqZIz2mZTZB1Hcgy7C3oEVhAT+f6mbQ==
-  dependencies:
-    "@ts-morph/common" "~0.20.0"
-    code-block-writer "^12.0.0"
-
-ts-node@^10.9.1:
-  version "10.9.1"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b"
-  integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==
-  dependencies:
-    "@cspotcode/source-map-support" "^0.8.0"
-    "@tsconfig/node10" "^1.0.7"
-    "@tsconfig/node12" "^1.0.7"
-    "@tsconfig/node14" "^1.0.0"
-    "@tsconfig/node16" "^1.0.2"
-    acorn "^8.4.1"
-    acorn-walk "^8.1.1"
-    arg "^4.1.0"
-    create-require "^1.1.0"
-    diff "^4.0.1"
-    make-error "^1.1.1"
-    v8-compile-cache-lib "^3.0.1"
-    yn "3.1.1"
-
-tsec@0.2.7:
-  version "0.2.7"
-  resolved "https://registry.yarnpkg.com/tsec/-/tsec-0.2.7.tgz#be530025907037ed57f37fc7625b6a7e3658fe43"
-  integrity sha512-Pj9DuBBWLEo8p7QsbrEdXzW/u6QJBcib0ZGOTXkeSDx+PLXFY7hwyZE9Tfhp3TA3LQNpYouyT0WmzXRyUW4otQ==
-  dependencies:
-    glob "^7.1.1"
-    minimatch "^3.0.3"
-
-tslib@^1.8.1:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
-  integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
-
-tslib@^1.9.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
-  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
-
-tslib@^2.0.0, tslib@^2.2.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
-  integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
-
-tslib@^2.6.2:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
-  integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
-
-tsscmp@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.6.tgz#85b99583ac3589ec4bfef825b5000aa911d605eb"
-  integrity sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==
-
-tsutils@^3.21.0:
-  version "3.21.0"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
-  integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
-  dependencies:
-    tslib "^1.8.1"
-
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
-  dependencies:
-    safe-buffer "^5.0.1"
-
-tunnel@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
-  integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
-
-type-check@^0.4.0, type-check@~0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
-  integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
-  dependencies:
-    prelude-ls "^1.2.1"
-
-type-check@~0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
-  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
-  dependencies:
-    prelude-ls "~1.1.2"
-
-type-detect@4.0.8, type-detect@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
-  integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
-
-type-fest@^0.13.1:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934"
-  integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==
-
-type-fest@^0.20.2:
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
-  integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
-
-type-is@^1.6.16:
-  version "1.6.18"
-  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
-  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
-  dependencies:
-    media-typer "0.3.0"
-    mime-types "~2.1.24"
-
-type@^1.0.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0"
-  integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
-
-type@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/type/-/type-2.1.0.tgz#9bdc22c648cf8cf86dd23d32336a41cfb6475e3f"
-  integrity sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA==
-
-type@^2.7.2:
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/type/-/type-2.7.2.tgz#2376a15a3a28b1efa0f5350dcf72d24df6ef98d0"
-  integrity sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==
-
-typedarray@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
-  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
-
-typescript@^2.6.2:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4"
-  integrity sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q=
-
-typescript@^4.7.4:
-  version "4.8.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6"
-  integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==
-
-typescript@^5.5.0-dev.20240603:
-  version "5.5.0-dev.20240603"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.0-dev.20240603.tgz#a1b7311df5039a8abbaaa2213c21cac6ec547490"
-  integrity sha512-gdm3Sh1A+Pjj9ZlfBEJY3o2rs3tvpcSbu3vYqcCijMe09BePQBtZlsuShuPn+zCnP+qBLxdKjFiw5v1tkna3tA==
-
-typical@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/typical/-/typical-4.0.0.tgz#cbeaff3b9d7ae1e2bbfaf5a4e6f11eccfde94fc4"
-  integrity sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==
-
-uc.micro@^2.0.0, uc.micro@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-2.1.0.tgz#f8d3f7d0ec4c3dea35a7e3c8efa4cb8b45c9e7ee"
-  integrity sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==
-
-unc-path-regex@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
-  integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo=
-
-undertaker-registry@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/undertaker-registry/-/undertaker-registry-1.0.1.tgz#5e4bda308e4a8a2ae584f9b9a4359a499825cc50"
-  integrity sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=
-
-undertaker@^1.2.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/undertaker/-/undertaker-1.3.0.tgz#363a6e541f27954d5791d6fa3c1d321666f86d18"
-  integrity sha512-/RXwi5m/Mu3H6IHQGww3GNt1PNXlbeCuclF2QYR14L/2CHPz3DFZkvB5hZ0N/QUkiXWCACML2jXViIQEQc2MLg==
-  dependencies:
-    arr-flatten "^1.0.1"
-    arr-map "^2.0.0"
-    bach "^1.0.0"
-    collection-map "^1.0.0"
-    es6-weak-map "^2.0.1"
-    fast-levenshtein "^1.0.0"
-    last-run "^1.1.0"
-    object.defaults "^1.0.0"
-    object.reduce "^1.0.0"
-    undertaker-registry "^1.0.0"
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
-
-union-value@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
-  integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
-  dependencies:
-    arr-union "^3.1.0"
-    get-value "^2.0.6"
-    is-extendable "^0.1.1"
-    set-value "^2.0.1"
-
-uniq@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
-  integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
-
-unique-stream@^2.0.2:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.3.1.tgz#c65d110e9a4adf9a6c5948b28053d9a8d04cbeac"
-  integrity sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==
-  dependencies:
-    json-stable-stringify-without-jsonify "^1.0.1"
-    through2-filter "^3.0.0"
-
-universal-user-agent@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-6.0.0.tgz#3381f8503b251c0d9cd21bc1de939ec9df5480ee"
-  integrity sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==
-
-universalify@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
-  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
-
-universalify@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"
-  integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==
-
-universalify@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d"
-  integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==
-
-unset-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
-  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
-  dependencies:
-    has-value "^0.3.1"
-    isobject "^3.0.0"
-
-upath@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
-  integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
-
-update-browserslist-db@^1.0.13:
-  version "1.0.13"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4"
-  integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==
-  dependencies:
-    escalade "^3.1.1"
-    picocolors "^1.0.0"
-
-update-browserslist-db@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz#be06a5eedd62f107b7c19eb5bcefb194411abf38"
-  integrity sha512-dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q==
-  dependencies:
-    escalade "^3.1.1"
-    picocolors "^1.0.0"
-
-uri-js@^4.2.2:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
-  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
-  dependencies:
-    punycode "^2.1.0"
-
-urix@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
-  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
-
-url-parse@^1.5.3:
-  version "1.5.10"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
-  integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
-  dependencies:
-    querystringify "^2.1.1"
-    requires-port "^1.0.0"
-
-use@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
-  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
-
-util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
-
-util@^0.12.4:
-  version "0.12.5"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.12.5.tgz#5f17a6059b73db61a875668781a1c2b136bd6fbc"
-  integrity sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==
-  dependencies:
-    inherits "^2.0.3"
-    is-arguments "^1.0.4"
-    is-generator-function "^1.0.7"
-    is-typed-array "^1.1.3"
-    which-typed-array "^1.1.2"
-
-uuid@^8.3.0:
-  version "8.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
-  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
-
-uuid@^9.0.1:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30"
-  integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==
-
-v8-compile-cache-lib@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
-  integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
-
-v8-inspect-profiler@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/v8-inspect-profiler/-/v8-inspect-profiler-0.1.1.tgz#52fd9f1234dca2f650063c6cd39bdaef47b49396"
-  integrity sha512-GB3X9w7w+y9v4gq85olmf/bM3F2hj2DjjwvVpDXIziW5JBy8cDcIQ/K7m8xJVDWiFemxRX2Dxoo1k6JDvLMTig==
-  dependencies:
-    chrome-remote-interface "^0.33.0"
-
-v8-to-istanbul@^9.0.0:
-  version "9.2.0"
-  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.2.0.tgz#2ed7644a245cddd83d4e087b9b33b3e62dfd10ad"
-  integrity sha512-/EH/sDgxU2eGxajKdwLCDmQ4FWq+kpi3uCmBGpw1xJtnAxEjlD8j8PEiGWpCIMIs3ciNAgH0d3TTJiUkYzyZjA==
-  dependencies:
-    "@jridgewell/trace-mapping" "^0.3.12"
-    "@types/istanbul-lib-coverage" "^2.0.1"
-    convert-source-map "^2.0.0"
-
-v8flags@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.2.0.tgz#b243e3b4dfd731fa774e7492128109a0fe66d656"
-  integrity sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==
-  dependencies:
-    homedir-polyfill "^1.0.1"
-
-validate-npm-package-license@^3.0.1:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
-  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
-  dependencies:
-    spdx-correct "^3.0.0"
-    spdx-expression-parse "^3.0.0"
-
-value-or-function@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/value-or-function/-/value-or-function-3.0.0.tgz#1c243a50b595c1be54a754bfece8563b9ff8d813"
-  integrity sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=
-
-vary@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
-  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
-
-vinyl-fs@^3.0.0, vinyl-fs@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-3.0.3.tgz#c85849405f67428feabbbd5c5dbdd64f47d31bc7"
-  integrity sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==
-  dependencies:
-    fs-mkdirp-stream "^1.0.0"
-    glob-stream "^6.1.0"
-    graceful-fs "^4.0.0"
-    is-valid-glob "^1.0.0"
-    lazystream "^1.0.0"
-    lead "^1.0.0"
-    object.assign "^4.0.4"
-    pumpify "^1.3.5"
-    readable-stream "^2.3.3"
-    remove-bom-buffer "^3.0.0"
-    remove-bom-stream "^1.2.0"
-    resolve-options "^1.1.0"
-    through2 "^2.0.0"
-    to-through "^2.0.0"
-    value-or-function "^3.0.0"
-    vinyl "^2.0.0"
-    vinyl-sourcemap "^1.1.0"
-
-vinyl-sourcemap@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz#92a800593a38703a8cdb11d8b300ad4be63b3e16"
-  integrity sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=
-  dependencies:
-    append-buffer "^1.0.2"
-    convert-source-map "^1.5.0"
-    graceful-fs "^4.1.6"
-    normalize-path "^2.1.1"
-    now-and-later "^2.0.0"
-    remove-bom-buffer "^3.0.0"
-    vinyl "^2.0.0"
-
-vinyl@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-1.2.0.tgz#5c88036cf565e5df05558bfc911f8656df218884"
-  integrity sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=
-  dependencies:
-    clone "^1.0.0"
-    clone-stats "^0.0.1"
-    replace-ext "0.0.1"
-
-vinyl@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.1.0.tgz#021f9c2cf951d6b939943c89eb5ee5add4fd924c"
-  integrity sha1-Ah+cLPlR1rk5lDyJ617lrdT9kkw=
-  dependencies:
-    clone "^2.1.1"
-    clone-buffer "^1.0.0"
-    clone-stats "^1.0.0"
-    cloneable-readable "^1.0.0"
-    remove-trailing-separator "^1.0.1"
-    replace-ext "^1.0.0"
-
-vinyl@^2.0.2:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz#d85b07da96e458d25b2ffe19fece9f2caa13ed86"
-  integrity sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==
-  dependencies:
-    clone "^2.1.1"
-    clone-buffer "^1.0.0"
-    clone-stats "^1.0.0"
-    cloneable-readable "^1.0.0"
-    remove-trailing-separator "^1.0.1"
-    replace-ext "^1.0.0"
-
-vinyl@^2.1.0, vinyl@^2.2.0, vinyl@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.1.tgz#23cfb8bbab5ece3803aa2c0a1eb28af7cbba1974"
-  integrity sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==
-  dependencies:
-    clone "^2.1.1"
-    clone-buffer "^1.0.0"
-    clone-stats "^1.0.0"
-    cloneable-readable "^1.0.0"
-    remove-trailing-separator "^1.0.1"
-    replace-ext "^1.0.0"
-
-vinyl@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-3.0.0.tgz#11e14732bf56e2faa98ffde5157fe6c13259ff30"
-  integrity sha512-rC2VRfAVVCGEgjnxHUnpIVh3AGuk62rP3tqVrn+yab0YH7UULisC085+NYH+mnqf3Wx4SpSi1RQMwudL89N03g==
-  dependencies:
-    clone "^2.1.2"
-    clone-stats "^1.0.0"
-    remove-trailing-separator "^1.1.0"
-    replace-ext "^2.0.0"
-    teex "^1.0.1"
-
-vinyl@~2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.0.2.tgz#0a3713d8d4e9221c58f10ca16c0116c9e25eda7c"
-  integrity sha1-CjcT2NTpIhxY8QyhbAEWyeJe2nw=
-  dependencies:
-    clone "^1.0.0"
-    clone-buffer "^1.0.0"
-    clone-stats "^1.0.0"
-    cloneable-readable "^1.0.0"
-    is-stream "^1.1.0"
-    remove-trailing-separator "^1.0.1"
-    replace-ext "^1.0.0"
-
-vscode-nls-dev@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/vscode-nls-dev/-/vscode-nls-dev-3.3.1.tgz#15fc03e0c9ca5a150abb838690d9554ac06f77e4"
-  integrity sha512-fug18D7CXb8pv8JoQ0D0JmZaIYDQoKLiyZxkAy5P8Cln/FwlNsdzwQILDph62EdGY5pvsJ2Jd1T5qgHAExe/tg==
-  dependencies:
-    ansi-colors "^3.2.3"
-    clone "^2.1.1"
-    event-stream "^3.3.4"
-    fancy-log "^1.3.3"
-    glob "^7.1.2"
-    iconv-lite "^0.4.19"
-    is "^3.2.1"
-    source-map "^0.6.1"
-    typescript "^2.6.2"
-    vinyl "^2.1.0"
-    xml2js "^0.4.19"
-    yargs "^13.2.4"
-
-vscode-oniguruma@1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/vscode-oniguruma/-/vscode-oniguruma-1.7.0.tgz#439bfad8fe71abd7798338d1cd3dc53a8beea94b"
-  integrity sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA==
-
-vscode-regexpp@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/vscode-regexpp/-/vscode-regexpp-3.1.0.tgz#42d059b6fffe99bd42939c0d013f632f0cad823f"
-  integrity sha512-pqtN65VC1jRLawfluX4Y80MMG0DHJydWhe5ZwMHewZD6sys4LbU6lHwFAHxeuaVE6Y6+xZOtAw+9hvq7/0ejkg==
-
-vscode-textmate@9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-9.0.0.tgz#313c6c8792b0507aef35aeb81b6b370b37c44d6c"
-  integrity sha512-Cl65diFGxz7gpwbav10HqiY/eVYTO1sjQpmRmV991Bj7wAoOAjGQ97PpQcXorDE2Uc4hnGWLY17xme+5t6MlSg==
-
-vscode-uri@^3.0.8:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.8.tgz#1770938d3e72588659a172d0fd4642780083ff9f"
-  integrity sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==
-
-watchpack@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
-  integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==
-  dependencies:
-    glob-to-regexp "^0.4.1"
-    graceful-fs "^4.1.2"
-
-watchpack@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.1.tgz#29308f2cac150fa8e4c92f90e0ec954a9fed7fff"
-  integrity sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==
-  dependencies:
-    glob-to-regexp "^0.4.1"
-    graceful-fs "^4.1.2"
-
-web-tree-sitter@^0.20.8:
-  version "0.20.8"
-  resolved "https://registry.yarnpkg.com/web-tree-sitter/-/web-tree-sitter-0.20.8.tgz#1e371cb577584789cadd75cb49c7ddfbc99d04c8"
-  integrity sha512-weOVgZ3aAARgdnb220GqYuh7+rZU0Ka9k9yfKtGAzEYMa6GgiCzW9JjQRJyCJakvibQW+dfjJdihjInKuuCAUQ==
-
-webidl-conversions@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-  integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
-
-webpack-cli@^5.1.4:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.1.4.tgz#c8e046ba7eaae4911d7e71e2b25b776fcc35759b"
-  integrity sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==
-  dependencies:
-    "@discoveryjs/json-ext" "^0.5.0"
-    "@webpack-cli/configtest" "^2.1.1"
-    "@webpack-cli/info" "^2.0.2"
-    "@webpack-cli/serve" "^2.0.5"
-    colorette "^2.0.14"
-    commander "^10.0.1"
-    cross-spawn "^7.0.3"
-    envinfo "^7.7.3"
-    fastest-levenshtein "^1.0.12"
-    import-local "^3.0.2"
-    interpret "^3.1.1"
-    rechoir "^0.8.0"
-    webpack-merge "^5.7.3"
-
-webpack-merge@^5.7.3:
-  version "5.8.0"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61"
-  integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==
-  dependencies:
-    clone-deep "^4.0.1"
-    wildcard "^2.0.0"
-
-webpack-sources@^3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
-  integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
-
-webpack-stream@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/webpack-stream/-/webpack-stream-7.0.0.tgz#e6a1edb9568198499af872678e95031752d72f00"
-  integrity sha512-XoAQTHyCaYMo6TS7Atv1HYhtmBgKiVLONJbzLBl2V3eibXQ2IT/MCRM841RW/r3vToKD5ivrTJFWgd/ghoxoRg==
-  dependencies:
-    fancy-log "^1.3.3"
-    lodash.clone "^4.3.2"
-    lodash.some "^4.2.2"
-    memory-fs "^0.5.0"
-    plugin-error "^1.0.1"
-    supports-color "^8.1.1"
-    through "^2.3.8"
-    vinyl "^2.2.1"
-
-webpack@^5:
-  version "5.76.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.76.1.tgz#7773de017e988bccb0f13c7d75ec245f377d295c"
-  integrity sha512-4+YIK4Abzv8172/SGqObnUjaIHjLEuUasz9EwQj/9xmPPkYJy2Mh03Q/lJfSD3YLzbxy5FeTq5Uw0323Oh6SJQ==
-  dependencies:
-    "@types/eslint-scope" "^3.7.3"
-    "@types/estree" "^0.0.51"
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/wasm-edit" "1.11.1"
-    "@webassemblyjs/wasm-parser" "1.11.1"
-    acorn "^8.7.1"
-    acorn-import-assertions "^1.7.6"
-    browserslist "^4.14.5"
-    chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.10.0"
-    es-module-lexer "^0.9.0"
-    eslint-scope "5.1.1"
-    events "^3.2.0"
-    glob-to-regexp "^0.4.1"
-    graceful-fs "^4.2.9"
-    json-parse-even-better-errors "^2.3.1"
-    loader-runner "^4.2.0"
-    mime-types "^2.1.27"
-    neo-async "^2.6.2"
-    schema-utils "^3.1.0"
-    tapable "^2.1.1"
-    terser-webpack-plugin "^5.1.3"
-    watchpack "^2.4.0"
-    webpack-sources "^3.2.3"
-
-webpack@^5.91.0:
-  version "5.91.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.91.0.tgz#ffa92c1c618d18c878f06892bbdc3373c71a01d9"
-  integrity sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw==
-  dependencies:
-    "@types/eslint-scope" "^3.7.3"
-    "@types/estree" "^1.0.5"
-    "@webassemblyjs/ast" "^1.12.1"
-    "@webassemblyjs/wasm-edit" "^1.12.1"
-    "@webassemblyjs/wasm-parser" "^1.12.1"
-    acorn "^8.7.1"
-    acorn-import-assertions "^1.9.0"
-    browserslist "^4.21.10"
-    chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.16.0"
-    es-module-lexer "^1.2.1"
-    eslint-scope "5.1.1"
-    events "^3.2.0"
-    glob-to-regexp "^0.4.1"
-    graceful-fs "^4.2.11"
-    json-parse-even-better-errors "^2.3.1"
-    loader-runner "^4.2.0"
-    mime-types "^2.1.27"
-    neo-async "^2.6.2"
-    schema-utils "^3.2.0"
-    tapable "^2.1.1"
-    terser-webpack-plugin "^5.3.10"
-    watchpack "^2.4.1"
-    webpack-sources "^3.2.3"
-
-whatwg-url@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
-  integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0=
-  dependencies:
-    tr46 "~0.0.3"
-    webidl-conversions "^3.0.0"
-
-which-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
-  integrity sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=
-
-which-module@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
-
-which-typed-array@^1.1.11, which-typed-array@^1.1.2:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.11.tgz#99d691f23c72aab6768680805a271b69761ed61a"
-  integrity sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==
-  dependencies:
-    available-typed-arrays "^1.0.5"
-    call-bind "^1.0.2"
-    for-each "^0.3.3"
-    gopd "^1.0.1"
-    has-tostringtag "^1.0.0"
-
-which@^1.2.14, which@^1.2.9:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
-  dependencies:
-    isexe "^2.0.0"
-
-which@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
-  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
-  dependencies:
-    isexe "^2.0.0"
-
-wildcard@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"
-  integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==
-
-windows-foreground-love@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/windows-foreground-love/-/windows-foreground-love-0.5.0.tgz#7672b04eb05f934a6543cacdc3cd16ff34e3cb10"
-  integrity sha512-yjBwmKEmQBDk3Z7yg/U9hizGWat8C6Pe4MQWl5bN6mvPU81Bt6HV2k/6mGlK3ETJLW1hCLhYx2wcGh+ykUUCyA==
-
-word-wrap@^1.2.3, word-wrap@~1.2.3:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f"
-  integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==
-
-workerpool@6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343"
-  integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==
-
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
-wrap-ansi@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
-  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
-  dependencies:
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-
-wrap-ansi@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
-  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
-  dependencies:
-    ansi-styles "^3.2.0"
-    string-width "^3.0.0"
-    strip-ansi "^5.0.0"
-
-wrap-ansi@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
-  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
-wrap-ansi@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
-  integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==
-  dependencies:
-    ansi-styles "^6.1.0"
-    string-width "^5.0.1"
-    strip-ansi "^7.0.1"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
-
-write@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
-  integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
-  dependencies:
-    mkdirp "^0.5.1"
-
-ws@^7.2.0:
-  version "7.4.6"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
-  integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
-
-xml2js@^0.4.19:
-  version "0.4.23"
-  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66"
-  integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==
-  dependencies:
-    sax ">=0.6.0"
-    xmlbuilder "~11.0.0"
-
-xml2js@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.5.0.tgz#d9440631fbb2ed800203fad106f2724f62c493b7"
-  integrity sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==
-  dependencies:
-    sax ">=0.6.0"
-    xmlbuilder "~11.0.0"
-
-xml@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
-  integrity sha512-huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw==
-
-xmlbuilder@^9.0.7:
-  version "9.0.7"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
-  integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
-
-xmlbuilder@~11.0.0:
-  version "11.0.1"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
-  integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
-
-xtend@~2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-2.1.2.tgz#6efecc2a4dad8e6962c4901b337ce7ba87b5d28b"
-  integrity sha1-bv7MKk2tjmlixJAbM3znuoe10os=
-  dependencies:
-    object-keys "~0.4.0"
-
-xtend@~4.0.0, xtend@~4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
-  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
-
-y18n@^3.2.1:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696"
-  integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==
-
-y18n@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4"
-  integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==
-
-y18n@^5.0.5:
-  version "5.0.8"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
-  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
-
-yallist@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
-  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
-
-yallist@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
-  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
-
-yargs-parser@20.2.4:
-  version "20.2.4"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
-  integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
-
-yargs-parser@5.0.0-security.0:
-  version "5.0.0-security.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0-security.0.tgz#4ff7271d25f90ac15643b86076a2ab499ec9ee24"
-  integrity sha512-T69y4Ps64LNesYxeYGYPvfoMTt/7y1XtfpIslUeK4um+9Hu7hlGoRtaDLvdXb7+/tfq4opVa2HRY5xGip022rQ==
-  dependencies:
-    camelcase "^3.0.0"
-    object.assign "^4.1.0"
-
-yargs-parser@^13.1.0:
-  version "13.1.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0"
-  integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
-yargs-parser@^18.1.2:
-  version "18.1.3"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
-  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
-yargs-parser@^20.2.2:
-  version "20.2.9"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
-  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
-
-yargs-parser@^21.0.0, yargs-parser@^21.1.1:
-  version "21.1.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
-  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
-
-yargs-unparser@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb"
-  integrity sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==
-  dependencies:
-    camelcase "^6.0.0"
-    decamelize "^4.0.0"
-    flat "^5.0.2"
-    is-plain-obj "^2.1.0"
-
-yargs@16.2.0:
-  version "16.2.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
-  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
-  dependencies:
-    cliui "^7.0.2"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.0"
-    y18n "^5.0.5"
-    yargs-parser "^20.2.2"
-
-yargs@^13.2.4:
-  version "13.2.4"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83"
-  integrity sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==
-  dependencies:
-    cliui "^5.0.0"
-    find-up "^3.0.0"
-    get-caller-file "^2.0.1"
-    os-locale "^3.1.0"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^3.0.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^13.1.0"
-
-yargs@^15.3.0:
-  version "15.4.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
-  integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
-  dependencies:
-    cliui "^6.0.0"
-    decamelize "^1.2.0"
-    find-up "^4.1.0"
-    get-caller-file "^2.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^4.2.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^18.1.2"
-
-yargs@^17.2.1:
-  version "17.6.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.0.tgz#e134900fc1f218bc230192bdec06a0a5f973e46c"
-  integrity sha512-8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g==
-  dependencies:
-    cliui "^8.0.1"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.3"
-    y18n "^5.0.5"
-    yargs-parser "^21.0.0"
-
-yargs@^17.7.1, yargs@^17.7.2:
-  version "17.7.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
-  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
-  dependencies:
-    cliui "^8.0.1"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.3"
-    y18n "^5.0.5"
-    yargs-parser "^21.1.1"
-
-yargs@^7.1.0:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.1.tgz#67f0ef52e228d4ee0d6311acede8850f53464df6"
-  integrity sha512-huO4Fr1f9PmiJJdll5kwoS2e4GqzGSsMT3PPMpOwoVkOK8ckqAewMTZyA6LXVQWflleb/Z8oPBEvNsMft0XE+g==
-  dependencies:
-    camelcase "^3.0.0"
-    cliui "^3.2.0"
-    decamelize "^1.1.1"
-    get-caller-file "^1.0.1"
-    os-locale "^1.4.0"
-    read-pkg-up "^1.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^1.0.2"
-    which-module "^1.0.0"
-    y18n "^3.2.1"
-    yargs-parser "5.0.0-security.0"
-
-yaserver@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/yaserver/-/yaserver-0.4.0.tgz#71b5fc53fb14c0f241d2dcfb3910707feeb619da"
-  integrity sha512-98Vj4sgqB1fLcpf2wK7h3dFCaabISHU9CXZHaAx3QLkvTTCD31MzMcNbw5V5jZFBK7ffkFqfWig6B20KQt4wtA==
-
-yauzl@^2.10.0, yauzl@^2.9.2:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
-  integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=
-  dependencies:
-    buffer-crc32 "~0.2.3"
-    fd-slicer "~1.1.0"
-
-yauzl@^2.2.1:
-  version "2.9.1"
-  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.9.1.tgz#a81981ea70a57946133883f029c5821a89359a7f"
-  integrity sha1-qBmB6nCleUYTOIPwKcWCGok1mn8=
-  dependencies:
-    buffer-crc32 "~0.2.3"
-    fd-slicer "~1.0.1"
-
-yauzl@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-3.1.1.tgz#d85503cc34933c0bcb3646ee2b97afedbebe32e7"
-  integrity sha512-MPxA7oN5cvGV0wzfkeHKF2/+Q4TkMpHSWGRy/96I4Cozljmx0ph91+Muxh6HegEtDC4GftJ8qYDE51vghFiEYA==
-  dependencies:
-    buffer-crc32 "~0.2.3"
-    pend "~1.2.0"
-
-yazl@^2.2.1, yazl@^2.4.3:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/yazl/-/yazl-2.4.3.tgz#ec26e5cc87d5601b9df8432dbdd3cd2e5173a071"
-  integrity sha1-7CblzIfVYBud+EMtvdPNLlFzoHE=
-  dependencies:
-    buffer-crc32 "~0.2.3"
-
-ylru@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/ylru/-/ylru-1.2.1.tgz#f576b63341547989c1de7ba288760923b27fe84f"
-  integrity sha512-faQrqNMzcPCHGVC2aaOINk13K+aaBDUPjGWl0teOXywElLjyVAB6Oe2jj62jHYtwsU49jXhScYbvPENK+6zAvQ==
-
-yn@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
-  integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
-
-yocto-queue@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
-  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==